From 11dad7bf746820b56fa426f63f8582062de52a6d Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Wed, 10 Oct 2018 16:46:02 +0200
Subject: [PATCH 00001/10326] filter beatmaps by star range

---
 .../Visual/TestCaseBeatmapCarousel.cs         | 49 +++++++++++++++++++
 .../Select/Carousel/CarouselBeatmap.cs        |  6 +++
 osu.Game/Screens/Select/FilterControl.cs      | 40 +++++++++------
 osu.Game/Screens/Select/FilterCriteria.cs     |  2 +
 4 files changed, 81 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs b/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
index db66c01814..df42ba9d16 100644
--- a/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
@@ -77,6 +77,7 @@ namespace osu.Game.Tests.Visual
             testEmptyTraversal();
             testHiding();
             testSelectingFilteredRuleset();
+            testFilterByStarRange();
             testCarouselRootIsRandom();
         }
 
@@ -245,6 +246,54 @@ namespace osu.Game.Tests.Visual
             AddAssert("Selection is non-null", () => currentSelection != null);
         }
 
+        /// <summary>
+        /// Test filtering by restricting the desired star range
+        /// </summary>
+        private void testFilterByStarRange()
+        {
+            var manyStarDiffs = createTestBeatmapSet(set_count + 1);
+            manyStarDiffs.Beatmaps.Clear();
+
+            for (int i = 0; i < 12; i++)
+            {
+                manyStarDiffs.Beatmaps.Add(new BeatmapInfo
+                {
+                    OnlineBeatmapID = manyStarDiffs.ID * 10 + i,
+                    Path = $"randomDiff{i}.osu",
+                    Version = $"Totally Normal {i}",
+                    StarDifficulty = i,
+                    BaseDifficulty = new BeatmapDifficulty
+                    {
+                        OverallDifficulty = 5,
+                    }
+                });
+            }
+
+            AddStep("add set with many stars", () => carousel.UpdateBeatmapSet(manyStarDiffs));
+
+            AddStep("select added set", () => carousel.SelectBeatmap(manyStarDiffs.Beatmaps[0], false));
+
+            AddStep("Filter to 1-3 stars", () => carousel.Filter(new FilterCriteria { DisplayStarsMinimum = 1, DisplayStarsMaximum = 3 }, false));
+            checkVisibleItemCount(diff: false, count: 1);
+            checkVisibleItemCount(diff: true, count: 3);
+
+            AddStep("Filter to 3-3 stars", () => carousel.Filter(new FilterCriteria { DisplayStarsMinimum = 3, DisplayStarsMaximum = 3 }, false));
+            checkVisibleItemCount(diff: false, count: 1);
+            checkVisibleItemCount(diff: true, count: 1);
+
+            AddStep("Filter to 4-2 stars", () => carousel.Filter(new FilterCriteria { DisplayStarsMinimum = 4, DisplayStarsMaximum = 2 }, false));
+            checkVisibleItemCount(diff: false, count: 0);
+            checkVisibleItemCount(diff: true, count: 0);
+
+            AddStep("remove added set", () =>
+            {
+                carousel.RemoveBeatmapSet(manyStarDiffs);
+                manyStarDiffs = null;
+            });
+
+            AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
+        }
+
         /// <summary>
         /// Test random non-repeating algorithm
         /// </summary>
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 272332f1ce..c9ed2f3573 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -26,6 +26,12 @@ namespace osu.Game.Screens.Select.Carousel
 
             bool match = criteria.Ruleset == null || Beatmap.RulesetID == criteria.Ruleset.ID || Beatmap.RulesetID == 0 && criteria.Ruleset.ID > 0 && criteria.AllowConvertedBeatmaps;
 
+            if(criteria.DisplayStarsMinimum.HasValue)
+                match &= Beatmap.StarDifficulty >= criteria.DisplayStarsMinimum;
+
+            if (criteria.DisplayStarsMaximum.HasValue)
+                match &= Beatmap.StarDifficulty <= criteria.DisplayStarsMaximum;
+
             if (!string.IsNullOrEmpty(criteria.SearchText))
                 match &=
                     Beatmap.Metadata.SearchableTerms.Any(term => term.IndexOf(criteria.SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0) ||
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index fce7af1400..78b452b6f5 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -32,14 +32,13 @@ namespace osu.Game.Screens.Select
 
         public SortMode Sort
         {
-            get { return sort; }
+            get => sort;
             set
             {
-                if (sort != value)
-                {
-                    sort = value;
-                    FilterChanged?.Invoke(CreateCriteria());
-                }
+                if (sort == value) return;
+
+                sort = value;
+                FilterChanged?.Invoke(CreateCriteria());
             }
         }
 
@@ -47,14 +46,13 @@ namespace osu.Game.Screens.Select
 
         public GroupMode Group
         {
-            get { return group; }
+            get => group;
             set
             {
-                if (group != value)
-                {
-                    group = value;
-                    FilterChanged?.Invoke(CreateCriteria());
-                }
+                if (group == value) return;
+
+                group = value;
+                FilterChanged?.Invoke(CreateCriteria());
             }
         }
 
@@ -64,7 +62,9 @@ namespace osu.Game.Screens.Select
             Sort = sort,
             SearchText = searchTextBox.Text,
             AllowConvertedBeatmaps = showConverted,
-            Ruleset = ruleset.Value
+            Ruleset = ruleset.Value,
+            DisplayStarsMinimum = minimumStars,
+            DisplayStarsMaximum = maximumStars,
         };
 
         public Action Exit;
@@ -168,7 +168,9 @@ namespace osu.Game.Screens.Select
 
         private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
-        private Bindable<bool> showConverted;
+        private readonly Bindable<bool> showConverted = new Bindable<bool>();
+        private readonly Bindable<double> minimumStars = new Bindable<double>();
+        private readonly Bindable<double> maximumStars = new Bindable<double>();
 
         public readonly Box Background;
 
@@ -177,8 +179,14 @@ namespace osu.Game.Screens.Select
         {
             sortTabs.AccentColour = colours.GreenLight;
 
-            showConverted = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps);
-            showConverted.ValueChanged += val => updateCriteria();
+            config.BindWith(OsuSetting.ShowConvertedBeatmaps, showConverted);
+            showConverted.ValueChanged += _ => updateCriteria();
+
+            config.BindWith(OsuSetting.DisplayStarsMinimum, minimumStars);
+            minimumStars.ValueChanged += _ => updateCriteria();
+
+            config.BindWith(OsuSetting.DisplayStarsMaximum, maximumStars);
+            maximumStars.ValueChanged += _ => updateCriteria();
 
             ruleset.BindTo(parentRuleset);
             ruleset.BindValueChanged(_ => updateCriteria(), true);
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index bea806f00f..f97eb1bea1 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -13,5 +13,7 @@ namespace osu.Game.Screens.Select
         public string SearchText;
         public RulesetInfo Ruleset;
         public bool AllowConvertedBeatmaps;
+        public double? DisplayStarsMinimum;
+        public double? DisplayStarsMaximum;
     }
 }

From d83ce7e4bb35b352f112d1353c4766b4006281be Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Fri, 19 Oct 2018 12:22:05 +0200
Subject: [PATCH 00002/10326] don't allow null values in FilterCriteria, ensure
 values in test instead

---
 .../Visual/TestCaseBeatmapCarousel.cs         | 51 +++++++++++--------
 .../Select/Carousel/CarouselBeatmap.cs        |  7 +--
 osu.Game/Screens/Select/FilterCriteria.cs     |  4 +-
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs b/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
index df42ba9d16..a57ef21dd9 100644
--- a/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
@@ -65,6 +65,10 @@ namespace osu.Game.Tests.Visual
 
             carousel.SelectionChanged = s => currentSelection = s;
 
+            // not being hooked up to the config leads to the SR filter only showing 0 to 0 SR maps
+            // thus "filter" once to assume a 0 to 10 range
+            carousel.Filter(new TestCriteria());
+
             loadBeatmaps(beatmapSets);
 
             testTraversal();
@@ -150,9 +154,7 @@ namespace osu.Game.Tests.Visual
         private bool selectedBeatmapVisible()
         {
             var currentlySelected = carousel.Items.FirstOrDefault(s => s.Item is CarouselBeatmap && s.Item.State == CarouselItemState.Selected);
-            if (currentlySelected == null)
-                return true;
-            return currentlySelected.Item.Visible;
+            return currentlySelected?.Item.Visible ?? true;
         }
 
         private void checkInvisibleDifficultiesUnselectable()
@@ -165,8 +167,8 @@ namespace osu.Game.Tests.Visual
         {
             AddStep("Toggle non-matching filter", () =>
             {
-                carousel.Filter(new FilterCriteria { SearchText = "Dingo" }, false);
-                carousel.Filter(new FilterCriteria(), false);
+                carousel.Filter(new TestCriteria { SearchText = "Dingo" }, false);
+                carousel.Filter(new TestCriteria(), false);
                 eagerSelectedIDs.Add(carousel.SelectedBeatmapSet.ID);
             }
             );
@@ -207,7 +209,7 @@ namespace osu.Game.Tests.Visual
 
             setSelected(1, 1);
 
-            AddStep("Filter", () => carousel.Filter(new FilterCriteria { SearchText = "set #3!" }, false));
+            AddStep("Filter", () => carousel.Filter(new TestCriteria { SearchText = "set #3!" }, false));
             checkVisibleItemCount(diff: false, count: 1);
             checkVisibleItemCount(diff: true, count: 3);
             checkSelected(3, 1);
@@ -215,7 +217,7 @@ namespace osu.Game.Tests.Visual
             advanceSelection(diff: true, count: 4);
             checkSelected(3, 2);
 
-            AddStep("Un-filter (debounce)", () => carousel.Filter(new FilterCriteria()));
+            AddStep("Un-filter (debounce)", () => carousel.Filter(new TestCriteria()));
             AddUntilStep(() => !carousel.PendingFilterTask, "Wait for debounce");
             checkVisibleItemCount(diff: false, count: set_count);
             checkVisibleItemCount(diff: true, count: 3);
@@ -223,13 +225,13 @@ namespace osu.Game.Tests.Visual
             // test filtering some difficulties (and keeping current beatmap set selected).
 
             setSelected(1, 2);
-            AddStep("Filter some difficulties", () => carousel.Filter(new FilterCriteria { SearchText = "Normal" }, false));
+            AddStep("Filter some difficulties", () => carousel.Filter(new TestCriteria { SearchText = "Normal" }, false));
             checkSelected(1, 1);
 
-            AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
+            AddStep("Un-filter", () => carousel.Filter(new TestCriteria(), false));
             checkSelected(1, 1);
 
-            AddStep("Filter all", () => carousel.Filter(new FilterCriteria { SearchText = "Dingo" }, false));
+            AddStep("Filter all", () => carousel.Filter(new TestCriteria { SearchText = "Dingo" }, false));
 
             checkVisibleItemCount(false, 0);
             checkVisibleItemCount(true, 0);
@@ -241,7 +243,7 @@ namespace osu.Game.Tests.Visual
             advanceSelection(false);
             AddAssert("Selection is null", () => currentSelection == null);
 
-            AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
+            AddStep("Un-filter", () => carousel.Filter(new TestCriteria(), false));
 
             AddAssert("Selection is non-null", () => currentSelection != null);
         }
@@ -273,15 +275,15 @@ namespace osu.Game.Tests.Visual
 
             AddStep("select added set", () => carousel.SelectBeatmap(manyStarDiffs.Beatmaps[0], false));
 
-            AddStep("Filter to 1-3 stars", () => carousel.Filter(new FilterCriteria { DisplayStarsMinimum = 1, DisplayStarsMaximum = 3 }, false));
+            AddStep("Filter to 1-3 stars", () => carousel.Filter(new TestCriteria { DisplayStarsMinimum = 1, DisplayStarsMaximum = 3 }, false));
             checkVisibleItemCount(diff: false, count: 1);
             checkVisibleItemCount(diff: true, count: 3);
 
-            AddStep("Filter to 3-3 stars", () => carousel.Filter(new FilterCriteria { DisplayStarsMinimum = 3, DisplayStarsMaximum = 3 }, false));
+            AddStep("Filter to 3-3 stars", () => carousel.Filter(new TestCriteria { DisplayStarsMinimum = 3, DisplayStarsMaximum = 3 }, false));
             checkVisibleItemCount(diff: false, count: 1);
             checkVisibleItemCount(diff: true, count: 1);
 
-            AddStep("Filter to 4-2 stars", () => carousel.Filter(new FilterCriteria { DisplayStarsMinimum = 4, DisplayStarsMaximum = 2 }, false));
+            AddStep("Filter to 4-2 stars", () => carousel.Filter(new TestCriteria { DisplayStarsMinimum = 4, DisplayStarsMaximum = 2 }, false));
             checkVisibleItemCount(diff: false, count: 0);
             checkVisibleItemCount(diff: true, count: 0);
 
@@ -291,7 +293,7 @@ namespace osu.Game.Tests.Visual
                 manyStarDiffs = null;
             });
 
-            AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
+            AddStep("Un-filter", () => carousel.Filter(new TestCriteria(), false));
         }
 
         /// <summary>
@@ -322,13 +324,13 @@ namespace osu.Game.Tests.Visual
             AddAssert("ensure repeat", () => selectedSets.Contains(carousel.SelectedBeatmapSet));
 
             AddStep("Add set with 100 difficulties", () => carousel.UpdateBeatmapSet(createTestBeatmapSetWithManyDifficulties(set_count + 1)));
-            AddStep("Filter Extra", () => carousel.Filter(new FilterCriteria { SearchText = "Extra 10" }, false));
+            AddStep("Filter Extra", () => carousel.Filter(new TestCriteria { SearchText = "Extra 10" }, false));
             checkInvisibleDifficultiesUnselectable();
             checkInvisibleDifficultiesUnselectable();
             checkInvisibleDifficultiesUnselectable();
             checkInvisibleDifficultiesUnselectable();
             checkInvisibleDifficultiesUnselectable();
-            AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
+            AddStep("Un-filter", () => carousel.Filter(new TestCriteria(), false));
         }
 
         /// <summary>
@@ -359,9 +361,9 @@ namespace osu.Game.Tests.Visual
         /// </summary>
         private void testSorting()
         {
-            AddStep("Sort by author", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Author }, false));
+            AddStep("Sort by author", () => carousel.Filter(new TestCriteria { Sort = SortMode.Author }, false));
             AddAssert("Check zzzzz is at bottom", () => carousel.BeatmapSets.Last().Metadata.AuthorString == "zzzzz");
-            AddStep("Sort by artist", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Artist }, false));
+            AddStep("Sort by artist", () => carousel.Filter(new TestCriteria { Sort = SortMode.Artist }, false));
             AddAssert($"Check #{set_count} is at bottom", () => carousel.BeatmapSets.Last().Metadata.Title.EndsWith($"#{set_count}!"));
         }
 
@@ -451,7 +453,7 @@ namespace osu.Game.Tests.Visual
                 carousel.UpdateBeatmapSet(testMixed);
             });
             AddStep("filter to ruleset 0", () =>
-                carousel.Filter(new FilterCriteria { Ruleset = rulesets.AvailableRulesets.ElementAt(0) }, false));
+                carousel.Filter(new TestCriteria { 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]));
 
@@ -581,5 +583,14 @@ namespace osu.Game.Tests.Visual
 
             public bool PendingFilterTask => PendingFilter != null;
         }
+
+        private class TestCriteria : FilterCriteria
+        {
+            public TestCriteria()
+            {
+                DisplayStarsMinimum = 0;
+                DisplayStarsMaximum = 10;
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index c9ed2f3573..2e1adaf66f 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -25,12 +25,7 @@ namespace osu.Game.Screens.Select.Carousel
             base.Filter(criteria);
 
             bool match = criteria.Ruleset == null || Beatmap.RulesetID == criteria.Ruleset.ID || Beatmap.RulesetID == 0 && criteria.Ruleset.ID > 0 && criteria.AllowConvertedBeatmaps;
-
-            if(criteria.DisplayStarsMinimum.HasValue)
-                match &= Beatmap.StarDifficulty >= criteria.DisplayStarsMinimum;
-
-            if (criteria.DisplayStarsMaximum.HasValue)
-                match &= Beatmap.StarDifficulty <= criteria.DisplayStarsMaximum;
+            match &= Beatmap.StarDifficulty >= criteria.DisplayStarsMinimum && Beatmap.StarDifficulty <= criteria.DisplayStarsMaximum;
 
             if (!string.IsNullOrEmpty(criteria.SearchText))
                 match &=
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index f97eb1bea1..bd8bb22e1c 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Select
         public string SearchText;
         public RulesetInfo Ruleset;
         public bool AllowConvertedBeatmaps;
-        public double? DisplayStarsMinimum;
-        public double? DisplayStarsMaximum;
+        public double DisplayStarsMinimum;
+        public double DisplayStarsMaximum;
     }
 }

From f38b68a590d53c41ad0a2550d048e808da3bc127 Mon Sep 17 00:00:00 2001
From: WebFreak001 <gh@webfreak.org>
Date: Sun, 25 Nov 2018 03:50:26 +0100
Subject: [PATCH 00003/10326] Add action to pick random skin

---
 .../Overlays/Settings/Sections/SkinSection.cs | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 938e2ca2c3..9b190c6862 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -1,6 +1,8 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
@@ -24,7 +26,12 @@ namespace osu.Game.Overlays.Settings.Sections
         private readonly Bindable<SkinInfo> dropdownBindable = new Bindable<SkinInfo>();
         private readonly Bindable<int> configBindable = new Bindable<int>();
 
+        private static readonly SkinInfo randomSkinInfo = new RandomSkinInfo();
+
         private SkinManager skins;
+        private SkinInfo[] usableSkins;
+
+        private Random random = new Random();
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, SkinManager skins)
@@ -59,15 +66,32 @@ namespace osu.Game.Overlays.Settings.Sections
 
             config.BindWith(OsuSetting.Skin, configBindable);
 
+            usableSkins = skins.GetAllUsableSkins().ToArray();
+
             skinDropdown.Bindable = dropdownBindable;
-            skinDropdown.Items = skins.GetAllUsableSkins().ToArray();
+            skinDropdown.Items = usableSkins.Concat(new[] { randomSkinInfo });
 
             // Todo: This should not be necessary when OsuConfigManager is databased
             if (skinDropdown.Items.All(s => s.ID != configBindable.Value))
                 configBindable.Value = 0;
 
             configBindable.BindValueChanged(v => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == v), true);
-            dropdownBindable.BindValueChanged(v => configBindable.Value = v.ID);
+            dropdownBindable.BindValueChanged(v =>
+            {
+                if (v == randomSkinInfo)
+                    randomizeSkin();
+                else
+                    configBindable.Value = v.ID;
+            });
+        }
+
+        private void randomizeSkin()
+        {
+            int n = usableSkins.Count();
+            if (n > 1)
+                configBindable.Value = (configBindable.Value + random.Next(n - 1) + 1) % n; // make sure it's always a different one
+            else
+                configBindable.Value = 0;
         }
 
         private void itemRemoved(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != s.ID).ToArray());
@@ -98,5 +122,16 @@ namespace osu.Game.Overlays.Settings.Sections
                 protected override string GenerateItemText(SkinInfo item) => item.ToString();
             }
         }
+
+        private class RandomSkinInfo : SkinInfo
+        {
+            public RandomSkinInfo()
+            {
+                Name = "<Random Skin>";
+                ID = -1;
+            }
+
+            public override string ToString() => Name;
+        }
     }
 }

From 6a9187ece061aebac08d949c19b8f95feeb477e5 Mon Sep 17 00:00:00 2001
From: WebFreak001 <gh@webfreak.org>
Date: Sun, 25 Nov 2018 04:01:30 +0100
Subject: [PATCH 00004/10326] Fixed style warnings

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 9b190c6862..0802db821e 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
@@ -26,12 +25,12 @@ namespace osu.Game.Overlays.Settings.Sections
         private readonly Bindable<SkinInfo> dropdownBindable = new Bindable<SkinInfo>();
         private readonly Bindable<int> configBindable = new Bindable<int>();
 
-        private static readonly SkinInfo randomSkinInfo = new RandomSkinInfo();
+        private static readonly SkinInfo random_skin_info = new RandomSkinInfo();
 
         private SkinManager skins;
         private SkinInfo[] usableSkins;
 
-        private Random random = new Random();
+        private readonly Random random = new Random();
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, SkinManager skins)
@@ -69,7 +68,7 @@ namespace osu.Game.Overlays.Settings.Sections
             usableSkins = skins.GetAllUsableSkins().ToArray();
 
             skinDropdown.Bindable = dropdownBindable;
-            skinDropdown.Items = usableSkins.Concat(new[] { randomSkinInfo });
+            skinDropdown.Items = usableSkins.Concat(new[] { random_skin_info });
 
             // Todo: This should not be necessary when OsuConfigManager is databased
             if (skinDropdown.Items.All(s => s.ID != configBindable.Value))
@@ -78,7 +77,7 @@ namespace osu.Game.Overlays.Settings.Sections
             configBindable.BindValueChanged(v => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == v), true);
             dropdownBindable.BindValueChanged(v =>
             {
-                if (v == randomSkinInfo)
+                if (v == random_skin_info)
                     randomizeSkin();
                 else
                     configBindable.Value = v.ID;
@@ -87,7 +86,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private void randomizeSkin()
         {
-            int n = usableSkins.Count();
+            int n = usableSkins.Length;
             if (n > 1)
                 configBindable.Value = (configBindable.Value + random.Next(n - 1) + 1) % n; // make sure it's always a different one
             else

From edb45e4e47ff8d6f76969425ceefd80366223d99 Mon Sep 17 00:00:00 2001
From: WebFreak001 <gh@webfreak.org>
Date: Sun, 25 Nov 2018 14:23:53 +0100
Subject: [PATCH 00005/10326] Only show random skin button with more than one
 skin

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 0802db821e..cd109706cc 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -68,7 +68,10 @@ namespace osu.Game.Overlays.Settings.Sections
             usableSkins = skins.GetAllUsableSkins().ToArray();
 
             skinDropdown.Bindable = dropdownBindable;
-            skinDropdown.Items = usableSkins.Concat(new[] { random_skin_info });
+            if (usableSkins.Length > 1)
+                skinDropdown.Items = usableSkins.Concat(new[] { random_skin_info });
+            else
+                skinDropdown.Items = usableSkins;
 
             // Todo: This should not be necessary when OsuConfigManager is databased
             if (skinDropdown.Items.All(s => s.ID != configBindable.Value))

From 2b05a618066b4bdb50104011a2944173ef256d5f Mon Sep 17 00:00:00 2001
From: WebFreak001 <gh@webfreak.org>
Date: Sun, 25 Nov 2018 14:24:20 +0100
Subject: [PATCH 00006/10326] Fix crash when reseting skin while in dropdown

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

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index cd109706cc..46810184d7 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Overlays.Settings.Sections
                 if (v == random_skin_info)
                     randomizeSkin();
                 else
-                    configBindable.Value = v.ID;
+                    configBindable.Value = v?.ID ?? 0;
             });
         }
 

From 17a11212e802d0659d3a5e4904609624be19f3b3 Mon Sep 17 00:00:00 2001
From: WebFreak001 <gh@webfreak.org>
Date: Sun, 25 Nov 2018 14:41:39 +0100
Subject: [PATCH 00007/10326] Style fixes

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 46810184d7..56f61efa2a 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -68,10 +68,7 @@ namespace osu.Game.Overlays.Settings.Sections
             usableSkins = skins.GetAllUsableSkins().ToArray();
 
             skinDropdown.Bindable = dropdownBindable;
-            if (usableSkins.Length > 1)
-                skinDropdown.Items = usableSkins.Concat(new[] { random_skin_info });
-            else
-                skinDropdown.Items = usableSkins;
+            skinDropdown.Items = usableSkins.Length > 1 ? usableSkins.Concat(new[] { random_skin_info }) : usableSkins;
 
             // Todo: This should not be necessary when OsuConfigManager is databased
             if (skinDropdown.Items.All(s => s.ID != configBindable.Value))

From c4c2191500b81bed98918ed00b0536373253dc1f Mon Sep 17 00:00:00 2001
From: WebFreak001 <gh@webfreak.org>
Date: Wed, 28 Nov 2018 12:36:21 +0100
Subject: [PATCH 00008/10326] Apply requested changes

---
 .../Overlays/Settings/Sections/SkinSection.cs | 32 +++++++++++++------
 osu.Game/Skinning/SkinManager.cs              |  4 +--
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 56f61efa2a..225e8024e3 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -2,10 +2,12 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.MathUtils;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
@@ -28,9 +30,7 @@ namespace osu.Game.Overlays.Settings.Sections
         private static readonly SkinInfo random_skin_info = new RandomSkinInfo();
 
         private SkinManager skins;
-        private SkinInfo[] usableSkins;
-
-        private readonly Random random = new Random();
+        private List<SkinInfo> usableSkins;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, SkinManager skins)
@@ -65,10 +65,10 @@ namespace osu.Game.Overlays.Settings.Sections
 
             config.BindWith(OsuSetting.Skin, configBindable);
 
-            usableSkins = skins.GetAllUsableSkins().ToArray();
+            usableSkins = skins.GetAllUsableSkins();
 
             skinDropdown.Bindable = dropdownBindable;
-            skinDropdown.Items = usableSkins.Length > 1 ? usableSkins.Concat(new[] { random_skin_info }) : usableSkins;
+            resetSkinButtons();
 
             // Todo: This should not be necessary when OsuConfigManager is databased
             if (skinDropdown.Items.All(s => s.ID != configBindable.Value))
@@ -86,15 +86,29 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private void randomizeSkin()
         {
-            int n = usableSkins.Length;
+            int n = usableSkins.Count();
             if (n > 1)
-                configBindable.Value = (configBindable.Value + random.Next(n - 1) + 1) % n; // make sure it's always a different one
+                configBindable.Value = (configBindable.Value + RNG.Next(n - 1) + 1) % n; // make sure it's always a different one
             else
                 configBindable.Value = 0;
         }
 
-        private void itemRemoved(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != s.ID).ToArray());
-        private void itemAdded(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Append(s).ToArray());
+        private void itemRemoved(SkinInfo s) => Schedule(() =>
+        {
+            usableSkins.RemoveAll(i => i.ID == s.ID);
+            resetSkinButtons();
+        });
+
+        private void itemAdded(SkinInfo s) => Schedule(() =>
+        {
+            usableSkins.Add(s);
+            resetSkinButtons();
+        });
+
+        private void resetSkinButtons()
+        {
+            skinDropdown.Items = usableSkins.Count() > 1 ? usableSkins.Concat(new[] { random_skin_info }) : usableSkins;
+        }
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index bd694e443a..5ea205d2f3 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Returns a list of all usable <see cref="SkinInfo"/>s. Includes the special default skin plus all skins from <see cref="GetAllUserSkins"/>.
         /// </summary>
-        /// <returns>A list of available <see cref="SkinInfo"/>.</returns>
+        /// <returns>A newly allocated list of available <see cref="SkinInfo"/>.</returns>
         public List<SkinInfo> GetAllUsableSkins()
         {
             var userSkins = GetAllUserSkins();
@@ -42,7 +42,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Returns a list of all usable <see cref="SkinInfo"/>s that have been loaded by the user.
         /// </summary>
-        /// <returns>A list of available <see cref="SkinInfo"/>.</returns>
+        /// <returns>A newly allocated list of available <see cref="SkinInfo"/>.</returns>
         public List<SkinInfo> GetAllUserSkins() => ModelStore.ConsumableItems.Where(s => !s.DeletePending).ToList();
 
         protected override SkinInfo CreateModel(ArchiveReader archive) => new SkinInfo

From 89ded824b3a6554d30b14149947f0a28969d010e Mon Sep 17 00:00:00 2001
From: WebFreak001 <gh@webfreak.org>
Date: Wed, 28 Nov 2018 12:49:17 +0100
Subject: [PATCH 00009/10326] Style fixes

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

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 225e8024e3..3073e2067e 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -86,7 +85,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private void randomizeSkin()
         {
-            int n = usableSkins.Count();
+            int n = usableSkins.Count;
             if (n > 1)
                 configBindable.Value = (configBindable.Value + RNG.Next(n - 1) + 1) % n; // make sure it's always a different one
             else
@@ -107,7 +106,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private void resetSkinButtons()
         {
-            skinDropdown.Items = usableSkins.Count() > 1 ? usableSkins.Concat(new[] { random_skin_info }) : usableSkins;
+            skinDropdown.Items = usableSkins.Count > 1 ? usableSkins.Concat(new[] { random_skin_info }) : usableSkins;
         }
 
         protected override void Dispose(bool isDisposing)

From b51a457e5a7231795708e1060c1557cc3809233a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 6 Mar 2019 14:36:30 +0900
Subject: [PATCH 00010/10326] Implement sorcerer's diffcalc changes

---
 .../Difficulty/CatchDifficultyCalculator.cs   |  2 +-
 .../Preprocessing/CatchDifficultyHitObject.cs |  6 +--
 .../Difficulty/Skills/Movement.cs             | 46 ++++++++++++++-----
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 8cfda5d532..2cb71428b9 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 {
     public class CatchDifficultyCalculator : DifficultyCalculator
     {
-        private const double star_scaling_factor = 0.145;
+        private const double star_scaling_factor = 0.15;
 
         protected override int SectionLength => 750;
 
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
index 24e526ed19..f0c68e4392 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
         public readonly float LastNormalizedPosition;
 
         /// <summary>
-        /// Milliseconds elapsed since the start time of the previous <see cref="CatchDifficultyHitObject"/>, with a minimum of 25ms.
+        /// Milliseconds elapsed since the start time of the previous <see cref="CatchDifficultyHitObject"/>, with a minimum of 40ms.
         /// </summary>
         public readonly double StrainTime;
 
@@ -34,8 +34,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
             NormalizedPosition = BaseObject.X * CatchPlayfield.BASE_WIDTH * scalingFactor;
             LastNormalizedPosition = LastObject.X * CatchPlayfield.BASE_WIDTH * scalingFactor;
 
-            // Every strain interval is hard capped at the equivalent of 600 BPM streaming speed as a safety measure
-            StrainTime = Math.Max(25, DeltaTime);
+            // Every strain interval is hard capped at the equivalent of 375 BPM streaming speed as a safety measure
+            StrainTime = Math.Max(40, DeltaTime);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index d146153294..b1b5ba0312 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -14,7 +14,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
     {
         private const float absolute_player_positioning_error = 16f;
         private const float normalized_hitobject_radius = 41.0f;
-        private const double direction_change_bonus = 12.5;
+        private const double direction_change_bonus = 9.5;
+        private const double antiflow_bonus = 25.0;
 
         protected override double SkillMultiplier => 850;
         protected override double StrainDecayBase => 0.2;
@@ -23,6 +24,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 
         private float? lastPlayerPosition;
         private float lastDistanceMoved;
+        private double lastStrainTime;
 
         protected override double StrainValueOf(DifficultyHitObject current)
         {
@@ -39,8 +41,11 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 
             float distanceMoved = playerPosition - lastPlayerPosition.Value;
 
-            double distanceAddition = Math.Pow(Math.Abs(distanceMoved), 1.3) / 500;
-            double sqrtStrain = Math.Sqrt(catchCurrent.StrainTime);
+            // Reduce speed scaling
+            double weightedStrainTime = catchCurrent.StrainTime + 20;
+
+            double distanceAddition = Math.Pow(Math.Abs(distanceMoved), 1.3) / 600;
+            double sqrtStrain = Math.Sqrt(weightedStrainTime);
 
             double bonus = 0;
 
@@ -53,33 +58,50 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 
                     distanceAddition += direction_change_bonus / sqrtStrain * bonusFactor;
 
-                    // Bonus for tougher direction switches and "almost" hyperdashes at this point
-                    if (catchCurrent.LastObject.DistanceToHyperDash <= 10 / CatchPlayfield.BASE_WIDTH)
-                        bonus = 0.3 * bonusFactor;
+                    // Direction changes after jumps (antiflow) are harder
+                    double antiflowBonusFactor = Math.Min(Math.Sqrt(Math.Abs(distanceMoved)) / 10, 1);
+
+                    distanceAddition += (antiflow_bonus / sqrtStrain) * (Math.Sqrt(Math.Abs(lastDistanceMoved)) / (lastStrainTime / 40 + 10.0)) * antiflowBonusFactor;
                 }
 
                 // Base bonus for every movement, giving some weight to streams.
-                distanceAddition += 7.5 * Math.Min(Math.Abs(distanceMoved), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtStrain;
+                distanceAddition += 10.0 * Math.Min(Math.Abs(distanceMoved), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtStrain;
             }
 
-            // Bonus for "almost" hyperdashes at corner points
-            if (catchCurrent.LastObject.DistanceToHyperDash <= 10.0f / CatchPlayfield.BASE_WIDTH)
+            // Big bonus for edge hyperdashes
+            if (catchCurrent.LastObject.DistanceToHyperDash <= 14.0f / CatchPlayfield.BASE_WIDTH)
             {
                 if (!catchCurrent.LastObject.HyperDash)
-                    bonus += 1.0;
+                    bonus += 5.0;
                 else
                 {
                     // After a hyperdash we ARE in the correct position. Always!
                     playerPosition = catchCurrent.NormalizedPosition;
                 }
 
-                distanceAddition *= 1.0 + bonus * ((10 - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 10);
+                distanceAddition *= 1.0 + bonus * (14 - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 14 * (Math.Min(catchCurrent.StrainTime, 180) / 180); // Edge dashes are easier at lower ms values
+            }
+
+            // Prevent wide, dense stacks of notes which fit on the catcher from greatly increasing SR
+            if (Math.Abs(distanceMoved) > 0.1)
+            {
+                if (Math.Abs(lastDistanceMoved) > 0.1 && Math.Sign(distanceMoved) != Math.Sign(lastDistanceMoved))
+                {
+                    if (Math.Abs(distanceMoved) <= (CatcherArea.CATCHER_SIZE) && Math.Abs(lastDistanceMoved) == Math.Abs(distanceMoved))
+                    {
+                        if (catchCurrent.StrainTime <= 80 && lastStrainTime == catchCurrent.StrainTime)
+                        {
+                            distanceAddition *= Math.Max(((catchCurrent.StrainTime / 80) - 0.75) * 4, 0);
+                        }
+                    }
+                }
             }
 
             lastPlayerPosition = playerPosition;
             lastDistanceMoved = distanceMoved;
+            lastStrainTime = catchCurrent.StrainTime;
 
-            return distanceAddition / catchCurrent.StrainTime;
+            return distanceAddition / weightedStrainTime;
         }
     }
 }

From 24fb25f1cdc770ecb7c016a8fba472c00507484d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 14 Mar 2019 23:39:45 +0900
Subject: [PATCH 00011/10326] Use fresh mods for each difficulty calculation

---
 .../Difficulty/CatchDifficultyCalculator.cs   | 10 +++---
 .../Difficulty/ManiaDifficultyCalculator.cs   | 33 ++++++++++---------
 .../Difficulty/OsuDifficultyCalculator.cs     | 10 +++---
 .../Difficulty/TaikoDifficultyCalculator.cs   | 11 ++++---
 ...DifficultyAdjustmentModCombinationsTest.cs | 14 ++++----
 .../Difficulty/DifficultyCalculator.cs        | 10 +++---
 6 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index f3b88bd928..d73ee19d41 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -90,12 +90,12 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             new Movement(),
         };
 
-        protected override Mod[] DifficultyAdjustmentMods => new Mod[]
+        protected override Type[] DifficultyAdjustmentMods => new[]
         {
-            new CatchModDoubleTime(),
-            new CatchModHalfTime(),
-            new CatchModHardRock(),
-            new CatchModEasy(),
+            typeof(CatchModDoubleTime),
+            typeof(CatchModHalfTime),
+            typeof(CatchModHardRock),
+            typeof(CatchModEasy),
         };
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index 59fed1031f..bff3bfdb23 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -91,33 +92,33 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             return skills.ToArray();
         }
 
-        protected override Mod[] DifficultyAdjustmentMods
+        protected override Type[] DifficultyAdjustmentMods
         {
             get
             {
-                var mods = new Mod[]
+                var mods = new[]
                 {
-                    new ManiaModDoubleTime(),
-                    new ManiaModHalfTime(),
-                    new ManiaModEasy(),
-                    new ManiaModHardRock(),
+                    typeof(ManiaModDoubleTime),
+                    typeof(ManiaModHalfTime),
+                    typeof(ManiaModEasy),
+                    typeof(ManiaModHardRock)
                 };
 
                 if (isForCurrentRuleset)
                     return mods;
 
                 // if we are a convert, we can be played in any key mod.
-                return mods.Concat(new Mod[]
+                return mods.Concat(new[]
                 {
-                    new ManiaModKey1(),
-                    new ManiaModKey2(),
-                    new ManiaModKey3(),
-                    new ManiaModKey4(),
-                    new ManiaModKey5(),
-                    new ManiaModKey6(),
-                    new ManiaModKey7(),
-                    new ManiaModKey8(),
-                    new ManiaModKey9(),
+                    typeof(ManiaModKey1),
+                    typeof(ManiaModKey2),
+                    typeof(ManiaModKey3),
+                    typeof(ManiaModKey4),
+                    typeof(ManiaModKey5),
+                    typeof(ManiaModKey6),
+                    typeof(ManiaModKey7),
+                    typeof(ManiaModKey8),
+                    typeof(ManiaModKey9),
                 }).ToArray();
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index e2a1542574..9c44eb6f97 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -74,12 +74,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             new Speed()
         };
 
-        protected override Mod[] DifficultyAdjustmentMods => new Mod[]
+        protected override Type[] DifficultyAdjustmentMods => new[]
         {
-            new OsuModDoubleTime(),
-            new OsuModHalfTime(),
-            new OsuModEasy(),
-            new OsuModHardRock(),
+            typeof(OsuModDoubleTime),
+            typeof(OsuModHalfTime),
+            typeof(OsuModEasy),
+            typeof(OsuModHardRock),
         };
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 685ad9949b..ad1fb4c2e5 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -47,12 +48,12 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[] { new Strain() };
 
-        protected override Mod[] DifficultyAdjustmentMods => new Mod[]
+        protected override Type[] DifficultyAdjustmentMods => new[]
         {
-            new TaikoModDoubleTime(),
-            new TaikoModHalfTime(),
-            new TaikoModEasy(),
-            new TaikoModHardRock(),
+            typeof(TaikoModDoubleTime),
+            typeof(TaikoModHalfTime),
+            typeof(TaikoModEasy),
+            typeof(TaikoModHardRock),
         };
     }
 }
diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index 760a033aff..3bce6fedbb 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestSingleMod()
         {
-            var combinations = new TestLegacyDifficultyCalculator(new ModA()).CreateDifficultyAdjustmentModCombinations();
+            var combinations = new TestLegacyDifficultyCalculator(typeof(ModA)).CreateDifficultyAdjustmentModCombinations();
 
             Assert.AreEqual(2, combinations.Length);
             Assert.IsTrue(combinations[0] is ModNoMod);
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestDoubleMod()
         {
-            var combinations = new TestLegacyDifficultyCalculator(new ModA(), new ModB()).CreateDifficultyAdjustmentModCombinations();
+            var combinations = new TestLegacyDifficultyCalculator(typeof(ModA), typeof(ModB)).CreateDifficultyAdjustmentModCombinations();
 
             Assert.AreEqual(4, combinations.Length);
             Assert.IsTrue(combinations[0] is ModNoMod);
@@ -52,7 +52,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestIncompatibleMods()
         {
-            var combinations = new TestLegacyDifficultyCalculator(new ModA(), new ModIncompatibleWithA()).CreateDifficultyAdjustmentModCombinations();
+            var combinations = new TestLegacyDifficultyCalculator(typeof(ModA), typeof(ModIncompatibleWithA)).CreateDifficultyAdjustmentModCombinations();
 
             Assert.AreEqual(3, combinations.Length);
             Assert.IsTrue(combinations[0] is ModNoMod);
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestDoubleIncompatibleMods()
         {
-            var combinations = new TestLegacyDifficultyCalculator(new ModA(), new ModB(), new ModIncompatibleWithA(), new ModIncompatibleWithAAndB()).CreateDifficultyAdjustmentModCombinations();
+            var combinations = new TestLegacyDifficultyCalculator(typeof(ModA), typeof(ModB), typeof(ModIncompatibleWithA), typeof(ModIncompatibleWithAAndB)).CreateDifficultyAdjustmentModCombinations();
 
             Assert.AreEqual(8, combinations.Length);
             Assert.IsTrue(combinations[0] is ModNoMod);
@@ -86,7 +86,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestIncompatibleThroughBaseType()
         {
-            var combinations = new TestLegacyDifficultyCalculator(new ModAofA(), new ModIncompatibleWithAofA()).CreateDifficultyAdjustmentModCombinations();
+            var combinations = new TestLegacyDifficultyCalculator(typeof(ModAofA), typeof(ModIncompatibleWithAofA)).CreateDifficultyAdjustmentModCombinations();
 
             Assert.AreEqual(3, combinations.Length);
             Assert.IsTrue(combinations[0] is ModNoMod);
@@ -141,13 +141,13 @@ namespace osu.Game.Tests.NonVisual
 
         private class TestLegacyDifficultyCalculator : DifficultyCalculator
         {
-            public TestLegacyDifficultyCalculator(params Mod[] mods)
+            public TestLegacyDifficultyCalculator(params Type[] mods)
                 : base(null, null)
             {
                 DifficultyAdjustmentMods = mods;
             }
 
-            protected override Mod[] DifficultyAdjustmentMods { get; }
+            protected override Type[] DifficultyAdjustmentMods { get; }
 
             protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
             {
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index db8bdde6bb..47ffa48b91 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Rulesets.Difficulty
         {
             return createDifficultyAdjustmentModCombinations(Enumerable.Empty<Mod>(), DifficultyAdjustmentMods).ToArray();
 
-            IEnumerable<Mod> createDifficultyAdjustmentModCombinations(IEnumerable<Mod> currentSet, Mod[] adjustmentSet, int currentSetCount = 0, int adjustmentSetStart = 0)
+            IEnumerable<Mod> createDifficultyAdjustmentModCombinations(IEnumerable<Mod> currentSet, Type[] adjustmentSet, int currentSetCount = 0, int adjustmentSetStart = 0)
             {
                 switch (currentSetCount)
                 {
@@ -129,12 +129,14 @@ namespace osu.Game.Rulesets.Difficulty
                 // combinations in further recursions, so a moving subset is used to eliminate this effect
                 for (int i = adjustmentSetStart; i < adjustmentSet.Length; i++)
                 {
-                    var adjustmentMod = adjustmentSet[i];
+                    var adjustmentMod = createMod();
                     if (currentSet.Any(c => c.IncompatibleMods.Any(m => m.IsInstanceOfType(adjustmentMod))))
                         continue;
 
-                    foreach (var combo in createDifficultyAdjustmentModCombinations(currentSet.Append(adjustmentMod), adjustmentSet, currentSetCount + 1, i + 1))
+                    foreach (var combo in createDifficultyAdjustmentModCombinations(currentSet.Append(createMod()), adjustmentSet, currentSetCount + 1, i + 1))
                         yield return combo;
+
+                    Mod createMod() => (Mod)Activator.CreateInstance(adjustmentSet[i]);
                 }
             }
         }
@@ -142,7 +144,7 @@ namespace osu.Game.Rulesets.Difficulty
         /// <summary>
         /// Retrieves all <see cref="Mod"/>s which adjust the <see cref="Beatmap"/> difficulty.
         /// </summary>
-        protected virtual Mod[] DifficultyAdjustmentMods => Array.Empty<Mod>();
+        protected virtual Type[] DifficultyAdjustmentMods => Array.Empty<Type>();
 
         /// <summary>
         /// Creates <see cref="DifficultyAttributes"/> to describe beatmap's calculated difficulty.

From f959a2ee373f13a998bb8e752bc42d614ae12cd3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 16 Mar 2019 10:12:05 +0900
Subject: [PATCH 00012/10326] Update antiflow bonus

---
 osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index b1b5ba0312..d06813f160 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -59,9 +59,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
                     distanceAddition += direction_change_bonus / sqrtStrain * bonusFactor;
 
                     // Direction changes after jumps (antiflow) are harder
-                    double antiflowBonusFactor = Math.Min(Math.Sqrt(Math.Abs(distanceMoved)) / 10, 1);
+                    double antiflowBonusFactor = Math.Min(Math.Abs(distanceMoved) / 70, 1);
 
-                    distanceAddition += (antiflow_bonus / sqrtStrain) * (Math.Sqrt(Math.Abs(lastDistanceMoved)) / (lastStrainTime / 40 + 10.0)) * antiflowBonusFactor;
+                    distanceAddition += (antiflow_bonus / (catchCurrent.StrainTime / 40 + 10)) * (Math.Sqrt(Math.Abs(lastDistanceMoved)) / Math.Sqrt(lastStrainTime + 20)) * antiflowBonusFactor;
                 }
 
                 // Base bonus for every movement, giving some weight to streams.

From 9ae6cde837470d8e5708788bd224631f82af8243 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Mar 2019 12:14:26 +0900
Subject: [PATCH 00013/10326] Nerf back-and-forth hyperdash chains

---
 .../Difficulty/Skills/Movement.cs               | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index d06813f160..d8e359bb48 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -15,9 +15,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
         private const float absolute_player_positioning_error = 16f;
         private const float normalized_hitobject_radius = 41.0f;
         private const double direction_change_bonus = 9.5;
-        private const double antiflow_bonus = 25.0;
+        private const double antiflow_bonus = 26.0;
 
-        protected override double SkillMultiplier => 850;
+        protected override double SkillMultiplier => 860;
         protected override double StrainDecayBase => 0.2;
 
         protected override double DecayWeight => 0.94;
@@ -25,6 +25,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
         private float? lastPlayerPosition;
         private float lastDistanceMoved;
         private double lastStrainTime;
+        private bool lastHyperdash;
 
         protected override double StrainValueOf(DifficultyHitObject current)
         {
@@ -44,7 +45,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
             // Reduce speed scaling
             double weightedStrainTime = catchCurrent.StrainTime + 20;
 
-            double distanceAddition = Math.Pow(Math.Abs(distanceMoved), 1.3) / 600;
+            double distanceAddition = Math.Pow(Math.Abs(distanceMoved), 1.2) / 340;
             double sqrtStrain = Math.Sqrt(weightedStrainTime);
 
             double bonus = 0;
@@ -61,7 +62,14 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
                     // Direction changes after jumps (antiflow) are harder
                     double antiflowBonusFactor = Math.Min(Math.Abs(distanceMoved) / 70, 1);
 
-                    distanceAddition += (antiflow_bonus / (catchCurrent.StrainTime / 40 + 10)) * (Math.Sqrt(Math.Abs(lastDistanceMoved)) / Math.Sqrt(lastStrainTime + 20)) * antiflowBonusFactor;
+                    distanceAddition += (antiflow_bonus / (catchCurrent.StrainTime / 17.5 + 10)) * (Math.Sqrt(Math.Abs(lastDistanceMoved)) / Math.Sqrt(lastStrainTime + 25)) * antiflowBonusFactor;
+
+                    // Reduce strain slightly for Hyperdash chains
+                    if (catchCurrent.LastObject.HyperDash && lastHyperdash)
+                        distanceAddition *= 0.95;
+
+                    if (catchCurrent.LastObject.DistanceToHyperDash <= 14.0f / CatchPlayfield.BASE_WIDTH && !catchCurrent.LastObject.HyperDash)
+                        bonus += 3.0;
                 }
 
                 // Base bonus for every movement, giving some weight to streams.
@@ -100,6 +108,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
             lastPlayerPosition = playerPosition;
             lastDistanceMoved = distanceMoved;
             lastStrainTime = catchCurrent.StrainTime;
+            lastHyperdash = catchCurrent.LastObject.HyperDash;
 
             return distanceAddition / weightedStrainTime;
         }

From 9f12a36598f504539644674a89a33f370f9ef3c5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Mar 2019 12:14:53 +0900
Subject: [PATCH 00014/10326] Buff slower edge dashes, nerf faster ones

---
 osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index d8e359bb48..d06ab2f928 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
     {
         private const float absolute_player_positioning_error = 16f;
         private const float normalized_hitobject_radius = 41.0f;
-        private const double direction_change_bonus = 9.5;
+        private const double direction_change_bonus = 9.8;
         private const double antiflow_bonus = 26.0;
 
         protected override double SkillMultiplier => 860;
@@ -76,18 +76,18 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
                 distanceAddition += 10.0 * Math.Min(Math.Abs(distanceMoved), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtStrain;
             }
 
-            // Big bonus for edge hyperdashes
+            // Big bonus for edge dashes
             if (catchCurrent.LastObject.DistanceToHyperDash <= 14.0f / CatchPlayfield.BASE_WIDTH)
             {
                 if (!catchCurrent.LastObject.HyperDash)
-                    bonus += 5.0;
+                    bonus += 4.5;
                 else
                 {
                     // After a hyperdash we ARE in the correct position. Always!
                     playerPosition = catchCurrent.NormalizedPosition;
                 }
 
-                distanceAddition *= 1.0 + bonus * (14 - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 14 * (Math.Min(catchCurrent.StrainTime, 180) / 180); // Edge dashes are easier at lower ms values
+                distanceAddition *= 1.0 + bonus * (14.0f - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 14.0f * (Math.Min(catchCurrent.StrainTime, 250) / 250); // Edge dashes are easier at lower ms values
             }
 
             // Prevent wide, dense stacks of notes which fit on the catcher from greatly increasing SR

From 839dd7343f1cc6411077616ce0b2965e29130584 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 23 Mar 2019 15:57:22 +0900
Subject: [PATCH 00015/10326] Revert "Use fresh mods for each difficulty
 calculation"

This reverts commit 24fb25f1cdc770ecb7c016a8fba472c00507484d.
---
 .../Difficulty/CatchDifficultyCalculator.cs   | 10 +++---
 .../Difficulty/ManiaDifficultyCalculator.cs   | 33 +++++++++----------
 .../Difficulty/OsuDifficultyCalculator.cs     | 10 +++---
 .../Difficulty/TaikoDifficultyCalculator.cs   | 11 +++----
 ...DifficultyAdjustmentModCombinationsTest.cs | 14 ++++----
 .../Difficulty/DifficultyCalculator.cs        | 10 +++---
 6 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 289deab8cd..47e2bc5259 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -91,12 +91,12 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             new Movement(),
         };
 
-        protected override Type[] DifficultyAdjustmentMods => new[]
+        protected override Mod[] DifficultyAdjustmentMods => new Mod[]
         {
-            typeof(CatchModDoubleTime),
-            typeof(CatchModHalfTime),
-            typeof(CatchModHardRock),
-            typeof(CatchModEasy),
+            new CatchModDoubleTime(),
+            new CatchModHalfTime(),
+            new CatchModHardRock(),
+            new CatchModEasy(),
         };
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index bff3bfdb23..59fed1031f 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.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.Linq;
 using osu.Game.Beatmaps;
@@ -92,33 +91,33 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             return skills.ToArray();
         }
 
-        protected override Type[] DifficultyAdjustmentMods
+        protected override Mod[] DifficultyAdjustmentMods
         {
             get
             {
-                var mods = new[]
+                var mods = new Mod[]
                 {
-                    typeof(ManiaModDoubleTime),
-                    typeof(ManiaModHalfTime),
-                    typeof(ManiaModEasy),
-                    typeof(ManiaModHardRock)
+                    new ManiaModDoubleTime(),
+                    new ManiaModHalfTime(),
+                    new ManiaModEasy(),
+                    new ManiaModHardRock(),
                 };
 
                 if (isForCurrentRuleset)
                     return mods;
 
                 // if we are a convert, we can be played in any key mod.
-                return mods.Concat(new[]
+                return mods.Concat(new Mod[]
                 {
-                    typeof(ManiaModKey1),
-                    typeof(ManiaModKey2),
-                    typeof(ManiaModKey3),
-                    typeof(ManiaModKey4),
-                    typeof(ManiaModKey5),
-                    typeof(ManiaModKey6),
-                    typeof(ManiaModKey7),
-                    typeof(ManiaModKey8),
-                    typeof(ManiaModKey9),
+                    new ManiaModKey1(),
+                    new ManiaModKey2(),
+                    new ManiaModKey3(),
+                    new ManiaModKey4(),
+                    new ManiaModKey5(),
+                    new ManiaModKey6(),
+                    new ManiaModKey7(),
+                    new ManiaModKey8(),
+                    new ManiaModKey9(),
                 }).ToArray();
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 9c44eb6f97..e2a1542574 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -74,12 +74,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             new Speed()
         };
 
-        protected override Type[] DifficultyAdjustmentMods => new[]
+        protected override Mod[] DifficultyAdjustmentMods => new Mod[]
         {
-            typeof(OsuModDoubleTime),
-            typeof(OsuModHalfTime),
-            typeof(OsuModEasy),
-            typeof(OsuModHardRock),
+            new OsuModDoubleTime(),
+            new OsuModHalfTime(),
+            new OsuModEasy(),
+            new OsuModHardRock(),
         };
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index ad1fb4c2e5..685ad9949b 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.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.Linq;
 using osu.Game.Beatmaps;
@@ -48,12 +47,12 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[] { new Strain() };
 
-        protected override Type[] DifficultyAdjustmentMods => new[]
+        protected override Mod[] DifficultyAdjustmentMods => new Mod[]
         {
-            typeof(TaikoModDoubleTime),
-            typeof(TaikoModHalfTime),
-            typeof(TaikoModEasy),
-            typeof(TaikoModHardRock),
+            new TaikoModDoubleTime(),
+            new TaikoModHalfTime(),
+            new TaikoModEasy(),
+            new TaikoModHardRock(),
         };
     }
 }
diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index 3bce6fedbb..760a033aff 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestSingleMod()
         {
-            var combinations = new TestLegacyDifficultyCalculator(typeof(ModA)).CreateDifficultyAdjustmentModCombinations();
+            var combinations = new TestLegacyDifficultyCalculator(new ModA()).CreateDifficultyAdjustmentModCombinations();
 
             Assert.AreEqual(2, combinations.Length);
             Assert.IsTrue(combinations[0] is ModNoMod);
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestDoubleMod()
         {
-            var combinations = new TestLegacyDifficultyCalculator(typeof(ModA), typeof(ModB)).CreateDifficultyAdjustmentModCombinations();
+            var combinations = new TestLegacyDifficultyCalculator(new ModA(), new ModB()).CreateDifficultyAdjustmentModCombinations();
 
             Assert.AreEqual(4, combinations.Length);
             Assert.IsTrue(combinations[0] is ModNoMod);
@@ -52,7 +52,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestIncompatibleMods()
         {
-            var combinations = new TestLegacyDifficultyCalculator(typeof(ModA), typeof(ModIncompatibleWithA)).CreateDifficultyAdjustmentModCombinations();
+            var combinations = new TestLegacyDifficultyCalculator(new ModA(), new ModIncompatibleWithA()).CreateDifficultyAdjustmentModCombinations();
 
             Assert.AreEqual(3, combinations.Length);
             Assert.IsTrue(combinations[0] is ModNoMod);
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestDoubleIncompatibleMods()
         {
-            var combinations = new TestLegacyDifficultyCalculator(typeof(ModA), typeof(ModB), typeof(ModIncompatibleWithA), typeof(ModIncompatibleWithAAndB)).CreateDifficultyAdjustmentModCombinations();
+            var combinations = new TestLegacyDifficultyCalculator(new ModA(), new ModB(), new ModIncompatibleWithA(), new ModIncompatibleWithAAndB()).CreateDifficultyAdjustmentModCombinations();
 
             Assert.AreEqual(8, combinations.Length);
             Assert.IsTrue(combinations[0] is ModNoMod);
@@ -86,7 +86,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestIncompatibleThroughBaseType()
         {
-            var combinations = new TestLegacyDifficultyCalculator(typeof(ModAofA), typeof(ModIncompatibleWithAofA)).CreateDifficultyAdjustmentModCombinations();
+            var combinations = new TestLegacyDifficultyCalculator(new ModAofA(), new ModIncompatibleWithAofA()).CreateDifficultyAdjustmentModCombinations();
 
             Assert.AreEqual(3, combinations.Length);
             Assert.IsTrue(combinations[0] is ModNoMod);
@@ -141,13 +141,13 @@ namespace osu.Game.Tests.NonVisual
 
         private class TestLegacyDifficultyCalculator : DifficultyCalculator
         {
-            public TestLegacyDifficultyCalculator(params Type[] mods)
+            public TestLegacyDifficultyCalculator(params Mod[] mods)
                 : base(null, null)
             {
                 DifficultyAdjustmentMods = mods;
             }
 
-            protected override Type[] DifficultyAdjustmentMods { get; }
+            protected override Mod[] DifficultyAdjustmentMods { get; }
 
             protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
             {
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 9b630865c2..aad55f8a38 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Difficulty
         {
             return createDifficultyAdjustmentModCombinations(Enumerable.Empty<Mod>(), DifficultyAdjustmentMods).ToArray();
 
-            IEnumerable<Mod> createDifficultyAdjustmentModCombinations(IEnumerable<Mod> currentSet, Type[] adjustmentSet, int currentSetCount = 0, int adjustmentSetStart = 0)
+            IEnumerable<Mod> createDifficultyAdjustmentModCombinations(IEnumerable<Mod> currentSet, Mod[] adjustmentSet, int currentSetCount = 0, int adjustmentSetStart = 0)
             {
                 switch (currentSetCount)
                 {
@@ -131,14 +131,12 @@ namespace osu.Game.Rulesets.Difficulty
                 // combinations in further recursions, so a moving subset is used to eliminate this effect
                 for (int i = adjustmentSetStart; i < adjustmentSet.Length; i++)
                 {
-                    var adjustmentMod = createMod();
+                    var adjustmentMod = adjustmentSet[i];
                     if (currentSet.Any(c => c.IncompatibleMods.Any(m => m.IsInstanceOfType(adjustmentMod))))
                         continue;
 
-                    foreach (var combo in createDifficultyAdjustmentModCombinations(currentSet.Append(createMod()), adjustmentSet, currentSetCount + 1, i + 1))
+                    foreach (var combo in createDifficultyAdjustmentModCombinations(currentSet.Append(adjustmentMod), adjustmentSet, currentSetCount + 1, i + 1))
                         yield return combo;
-
-                    Mod createMod() => (Mod)Activator.CreateInstance(adjustmentSet[i]);
                 }
             }
         }
@@ -146,7 +144,7 @@ namespace osu.Game.Rulesets.Difficulty
         /// <summary>
         /// Retrieves all <see cref="Mod"/>s which adjust the <see cref="Beatmap"/> difficulty.
         /// </summary>
-        protected virtual Type[] DifficultyAdjustmentMods => Array.Empty<Type>();
+        protected virtual Mod[] DifficultyAdjustmentMods => Array.Empty<Mod>();
 
         /// <summary>
         /// Creates <see cref="DifficultyAttributes"/> to describe beatmap's calculated difficulty.

From be5ffdbf22cd5a8dc5fca3c87306042741e2dafa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 23 Mar 2019 16:01:14 +0900
Subject: [PATCH 00016/10326] Adjust edge bonuses to consider clock rate

---
 .../Preprocessing/CatchDifficultyHitObject.cs |  2 ++
 .../Difficulty/Skills/Movement.cs             | 21 +++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
index f0c68e4392..b2b4129c8a 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
         /// Milliseconds elapsed since the start time of the previous <see cref="CatchDifficultyHitObject"/>, with a minimum of 40ms.
         /// </summary>
         public readonly double StrainTime;
+        public readonly double ClockRate;
 
         public CatchDifficultyHitObject(HitObject hitObject, HitObject lastObject, double clockRate, float halfCatcherWidth)
             : base(hitObject, lastObject, clockRate)
@@ -36,6 +37,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
 
             // Every strain interval is hard capped at the equivalent of 375 BPM streaming speed as a safety measure
             StrainTime = Math.Max(40, DeltaTime);
+            ClockRate = clockRate;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index d06ab2f928..227fb2820c 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
         private const double direction_change_bonus = 9.8;
         private const double antiflow_bonus = 26.0;
 
-        protected override double SkillMultiplier => 860;
+        protected override double SkillMultiplier => 850;
         protected override double StrainDecayBase => 0.2;
 
         protected override double DecayWeight => 0.94;
@@ -25,7 +25,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
         private float? lastPlayerPosition;
         private float lastDistanceMoved;
         private double lastStrainTime;
-        private bool lastHyperdash;
 
         protected override double StrainValueOf(DifficultyHitObject current)
         {
@@ -62,35 +61,32 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
                     // Direction changes after jumps (antiflow) are harder
                     double antiflowBonusFactor = Math.Min(Math.Abs(distanceMoved) / 70, 1);
 
-                    distanceAddition += (antiflow_bonus / (catchCurrent.StrainTime / 17.5 + 10)) * (Math.Sqrt(Math.Abs(lastDistanceMoved)) / Math.Sqrt(lastStrainTime + 25)) * antiflowBonusFactor;
-
-                    // Reduce strain slightly for Hyperdash chains
-                    if (catchCurrent.LastObject.HyperDash && lastHyperdash)
-                        distanceAddition *= 0.95;
+                    distanceAddition += (antiflow_bonus / (catchCurrent.StrainTime / 17.5 + 10)) * (Math.Sqrt(Math.Abs(lastDistanceMoved)) / Math.Sqrt(lastStrainTime + 20)) * antiflowBonusFactor;
 
+                    // Bonus for edge dashes on direction change
                     if (catchCurrent.LastObject.DistanceToHyperDash <= 14.0f / CatchPlayfield.BASE_WIDTH && !catchCurrent.LastObject.HyperDash)
-                        bonus += 3.0;
+                        bonus += 1.0;
                 }
 
                 // Base bonus for every movement, giving some weight to streams.
                 distanceAddition += 10.0 * Math.Min(Math.Abs(distanceMoved), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtStrain;
             }
 
-            // Big bonus for edge dashes
+            // Bonus for edge dashes regardless of direction change
             if (catchCurrent.LastObject.DistanceToHyperDash <= 14.0f / CatchPlayfield.BASE_WIDTH)
             {
                 if (!catchCurrent.LastObject.HyperDash)
-                    bonus += 4.5;
+                    bonus += 0.9;
                 else
                 {
                     // After a hyperdash we ARE in the correct position. Always!
                     playerPosition = catchCurrent.NormalizedPosition;
                 }
 
-                distanceAddition *= 1.0 + bonus * (14.0f - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 14.0f * (Math.Min(catchCurrent.StrainTime, 250) / 250); // Edge dashes are easier at lower ms values
+                distanceAddition *= 1.0 + bonus * Math.Pow(14.0f - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH, 1.6f) / 14.0f * (Math.Min(catchCurrent.StrainTime * catchCurrent.ClockRate, 250) / 250); // Edge dashes are easier at lower ms values
             }
 
-            // Prevent wide, dense stacks of notes which fit on the catcher from greatly increasing SR
+            // Prevent wide dense stacks of notes which fit on the catcher from greatly increasing SR
             if (Math.Abs(distanceMoved) > 0.1)
             {
                 if (Math.Abs(lastDistanceMoved) > 0.1 && Math.Sign(distanceMoved) != Math.Sign(lastDistanceMoved))
@@ -108,7 +104,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
             lastPlayerPosition = playerPosition;
             lastDistanceMoved = distanceMoved;
             lastStrainTime = catchCurrent.StrainTime;
-            lastHyperdash = catchCurrent.LastObject.HyperDash;
 
             return distanceAddition / weightedStrainTime;
         }

From 2705263145b1dcae03bc5b58304eebe9aebfa7f3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 Mar 2019 13:25:52 +0900
Subject: [PATCH 00017/10326] Scale edge dash threshold with clock rate

---
 .../Difficulty/Skills/Movement.cs                  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 227fb2820c..27558838f4 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -62,28 +62,26 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
                     double antiflowBonusFactor = Math.Min(Math.Abs(distanceMoved) / 70, 1);
 
                     distanceAddition += (antiflow_bonus / (catchCurrent.StrainTime / 17.5 + 10)) * (Math.Sqrt(Math.Abs(lastDistanceMoved)) / Math.Sqrt(lastStrainTime + 20)) * antiflowBonusFactor;
-
-                    // Bonus for edge dashes on direction change
-                    if (catchCurrent.LastObject.DistanceToHyperDash <= 14.0f / CatchPlayfield.BASE_WIDTH && !catchCurrent.LastObject.HyperDash)
-                        bonus += 1.0;
                 }
 
                 // Base bonus for every movement, giving some weight to streams.
                 distanceAddition += 10.0 * Math.Min(Math.Abs(distanceMoved), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtStrain;
             }
 
-            // Bonus for edge dashes regardless of direction change
-            if (catchCurrent.LastObject.DistanceToHyperDash <= 14.0f / CatchPlayfield.BASE_WIDTH)
+            // Bonus for edge dashes
+            double edgeDashThreshold = 15.5f * ((Math.Min(catchCurrent.StrainTime * catchCurrent.ClockRate, 250) * 0.9 + 25) / 250);
+
+            if (catchCurrent.LastObject.DistanceToHyperDash <= edgeDashThreshold / CatchPlayfield.BASE_WIDTH)
             {
                 if (!catchCurrent.LastObject.HyperDash)
-                    bonus += 0.9;
+                    bonus += 2.3;
                 else
                 {
                     // After a hyperdash we ARE in the correct position. Always!
                     playerPosition = catchCurrent.NormalizedPosition;
                 }
 
-                distanceAddition *= 1.0 + bonus * Math.Pow(14.0f - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH, 1.6f) / 14.0f * (Math.Min(catchCurrent.StrainTime * catchCurrent.ClockRate, 250) / 250); // Edge dashes are easier at lower ms values
+                distanceAddition *= 1.0 + bonus * Math.Pow(edgeDashThreshold - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH, 1.6f) / edgeDashThreshold * (Math.Min(catchCurrent.StrainTime * catchCurrent.ClockRate, 265) / 265); // Edge dashes are easier at lower ms values
             }
 
             // Prevent wide dense stacks of notes which fit on the catcher from greatly increasing SR

From 9d0d402336e6b7123ee715105d953979797cc44c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Mar 2019 17:21:57 +0900
Subject: [PATCH 00018/10326] Apply pp calculator changes

(Backported from https://github.com/ppy/osu-performance/compare/master...smoogipoo:sorcerer-catch-changes)
---
 .../Difficulty/CatchPerformanceCalculator.cs       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
index 5a640f6d1a..28da047187 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
@@ -55,8 +55,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             // Longer maps are worth more
             float lengthBonus =
-                0.95f + 0.4f * Math.Min(1.0f, numTotalHits / 3000.0f) +
-                (numTotalHits > 3000 ? (float)Math.Log10(numTotalHits / 3000.0f) * 0.5f : 0.0f);
+                0.95f + 0.3f * Math.Min(1.0f, numTotalHits / 2500.0f) +
+                (numTotalHits > 2500 ? (float)Math.Log10(numTotalHits / 2500.0f) * 0.475f : 0.0f);
 
             // Longer maps are worth more
             value *= lengthBonus;
@@ -73,14 +73,22 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             float approachRateFactor = 1.0f;
             if (approachRate > 9.0f)
                 approachRateFactor += 0.1f * (approachRate - 9.0f); // 10% for each AR above 9
+            if (approachRate > 10.0f)
+                approachRateFactor += 0.2f * (float)Math.Pow(approachRate - 10.0f, 1.5f); // Additional 20% at AR 11, 40% total
             else if (approachRate < 8.0f)
                 approachRateFactor += 0.025f * (8.0f - approachRate); // 2.5% for each AR below 8
 
             value *= approachRateFactor;
 
             if (mods.Any(m => m is ModHidden))
-                // Hiddens gives nothing on max approach rate, and more the lower it is
+            {
                 value *= 1.05f + 0.075f * (10.0f - Math.Min(10.0f, approachRate)); // 7.5% for each AR below 10
+                // Hiddens gives almost nothing on max approach rate, and more the lower it is
+                if (approachRate <= 10.0f)
+                    value *= 1.05f + 0.075f * (10.0f - approachRate); // 7.5% for each AR below 10
+                else if (approachRate > 10.0f)
+                    value *= 1.01f + 0.04f * (11.0f - Math.Min(11.0f, approachRate)); // 5% at AR 10, 1% at AR 11
+            }
 
             if (mods.Any(m => m is ModFlashlight))
                 // Apply length bonus again if flashlight is on simply because it becomes a lot harder on longer maps.

From b402981fc644c85422d52449c90cd3120a3bd44d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Apr 2019 10:57:01 +0900
Subject: [PATCH 00019/10326] Buff CS > 5

---
 .../Difficulty/CatchDifficultyCalculator.cs                    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 47e2bc5259..a475aefd71 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -52,7 +52,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             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.
+                // We're only using 80% of the catcher's width to simulate imperfect gameplay.
+                halfCatchWidth *= Math.Min(1.05f - (0.05f * beatmap.BeatmapInfo.BaseDifficulty.CircleSize), 0.8f); // Reduce the catcher's width further at circle sizes above 5.
             }
 
             CatchHitObject lastObject = null;

From b2396b82a5bf218ac61786f9e38ae8a6976d91c8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Apr 2019 10:58:26 +0900
Subject: [PATCH 00020/10326] Change edge dashes to scale linearly once again

---
 .../Preprocessing/CatchDifficultyHitObject.cs          |  3 +++
 osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs  | 10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
index b2b4129c8a..9f6de35605 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
         /// </summary>
         public readonly double StrainTime;
         public readonly double ClockRate;
+        public readonly double HalfCatcherWidth;
 
         public CatchDifficultyHitObject(HitObject hitObject, HitObject lastObject, double clockRate, float halfCatcherWidth)
             : base(hitObject, lastObject, clockRate)
@@ -38,6 +39,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
             // Every strain interval is hard capped at the equivalent of 375 BPM streaming speed as a safety measure
             StrainTime = Math.Max(40, DeltaTime);
             ClockRate = clockRate;
+            HalfCatcherWidth = halfCatcherWidth;
         }
     }
 }
+
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 27558838f4..473b254d5b 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -68,20 +68,18 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
                 distanceAddition += 10.0 * Math.Min(Math.Abs(distanceMoved), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtStrain;
             }
 
-            // Bonus for edge dashes
-            double edgeDashThreshold = 15.5f * ((Math.Min(catchCurrent.StrainTime * catchCurrent.ClockRate, 250) * 0.9 + 25) / 250);
-
-            if (catchCurrent.LastObject.DistanceToHyperDash <= edgeDashThreshold / CatchPlayfield.BASE_WIDTH)
+            // Bonus for "almost" hyperdashes at corner points
+            if (catchCurrent.LastObject.DistanceToHyperDash <= 20.0f / CatchPlayfield.BASE_WIDTH)
             {
                 if (!catchCurrent.LastObject.HyperDash)
-                    bonus += 2.3;
+                    bonus += 5.7;
                 else
                 {
                     // After a hyperdash we ARE in the correct position. Always!
                     playerPosition = catchCurrent.NormalizedPosition;
                 }
 
-                distanceAddition *= 1.0 + bonus * Math.Pow(edgeDashThreshold - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH, 1.6f) / edgeDashThreshold * (Math.Min(catchCurrent.StrainTime * catchCurrent.ClockRate, 265) / 265); // Edge dashes are easier at lower ms values
+                distanceAddition *= 1.0 + bonus * ((20 - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 20) * Math.Pow((Math.Min(catchCurrent.StrainTime, 265) / 265), 1.5);
             }
 
             // Prevent wide dense stacks of notes which fit on the catcher from greatly increasing SR

From efee2fb283903f00b4039330117836c271016eb0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Apr 2019 11:00:26 +0900
Subject: [PATCH 00021/10326] Adjust antiflow calculations

---
 .../Difficulty/Skills/Movement.cs             | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 473b254d5b..e78e5c0a58 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -14,10 +14,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
     {
         private const float absolute_player_positioning_error = 16f;
         private const float normalized_hitobject_radius = 41.0f;
-        private const double direction_change_bonus = 9.8;
-        private const double antiflow_bonus = 26.0;
+        private const double direction_change_bonus = 21.0;
 
-        protected override double SkillMultiplier => 850;
+        protected override double SkillMultiplier => 900;
         protected override double StrainDecayBase => 0.2;
 
         protected override double DecayWeight => 0.94;
@@ -29,6 +28,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             var catchCurrent = (CatchDifficultyHitObject)current;
+            double halfCatcherWidth = catchCurrent.HalfCatcherWidth;
 
             if (lastPlayerPosition == null)
                 lastPlayerPosition = catchCurrent.LastNormalizedPosition;
@@ -41,10 +41,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 
             float distanceMoved = playerPosition - lastPlayerPosition.Value;
 
-            // Reduce speed scaling
-            double weightedStrainTime = catchCurrent.StrainTime + 20;
+            double weightedStrainTime = catchCurrent.StrainTime + 18;
 
-            double distanceAddition = Math.Pow(Math.Abs(distanceMoved), 1.2) / 340;
+            double distanceAddition = (Math.Pow(Math.Abs(distanceMoved), 1.3) / 510);
             double sqrtStrain = Math.Sqrt(weightedStrainTime);
 
             double bonus = 0;
@@ -54,18 +53,14 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
             {
                 if (Math.Abs(lastDistanceMoved) > 0.1 && Math.Sign(distanceMoved) != Math.Sign(lastDistanceMoved))
                 {
-                    double bonusFactor = Math.Min(absolute_player_positioning_error, Math.Abs(distanceMoved)) / absolute_player_positioning_error;
+                    double bonusFactor = Math.Min(halfCatcherWidth, Math.Abs(distanceMoved)) / halfCatcherWidth;
+                    double antiflowFactor = Math.Max(Math.Min(halfCatcherWidth, Math.Abs(lastDistanceMoved)) / halfCatcherWidth, 0.3);
 
-                    distanceAddition += direction_change_bonus / sqrtStrain * bonusFactor;
-
-                    // Direction changes after jumps (antiflow) are harder
-                    double antiflowBonusFactor = Math.Min(Math.Abs(distanceMoved) / 70, 1);
-
-                    distanceAddition += (antiflow_bonus / (catchCurrent.StrainTime / 17.5 + 10)) * (Math.Sqrt(Math.Abs(lastDistanceMoved)) / Math.Sqrt(lastStrainTime + 20)) * antiflowBonusFactor;
+                    distanceAddition += direction_change_bonus / Math.Sqrt(lastStrainTime + 18) * bonusFactor * antiflowFactor * Math.Max(1 - Math.Pow(weightedStrainTime / 1000, 2), 0);
                 }
 
                 // Base bonus for every movement, giving some weight to streams.
-                distanceAddition += 10.0 * Math.Min(Math.Abs(distanceMoved), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtStrain;
+                distanceAddition += 12.5 * Math.Min(Math.Abs(distanceMoved), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtStrain;
             }
 
             // Bonus for "almost" hyperdashes at corner points

From 21e62c37d8d2fcacb49a1f475ae65d73f04b4abf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Apr 2019 07:28:04 +0900
Subject: [PATCH 00022/10326] General fixes

---
 .../Difficulty/CatchDifficultyCalculator.cs         |  2 +-
 .../Preprocessing/CatchDifficultyHitObject.cs       |  3 ---
 .../Difficulty/Skills/Movement.cs                   | 13 ++++++-------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index a475aefd71..4cd297478a 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 {
     public class CatchDifficultyCalculator : DifficultyCalculator
     {
-        private const double star_scaling_factor = 0.15;
+        private const double star_scaling_factor = 0.153;
 
         protected override int SectionLength => 750;
 
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
index 9f6de35605..b2b4129c8a 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
@@ -25,7 +25,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
         /// </summary>
         public readonly double StrainTime;
         public readonly double ClockRate;
-        public readonly double HalfCatcherWidth;
 
         public CatchDifficultyHitObject(HitObject hitObject, HitObject lastObject, double clockRate, float halfCatcherWidth)
             : base(hitObject, lastObject, clockRate)
@@ -39,8 +38,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
             // Every strain interval is hard capped at the equivalent of 375 BPM streaming speed as a safety measure
             StrainTime = Math.Max(40, DeltaTime);
             ClockRate = clockRate;
-            HalfCatcherWidth = halfCatcherWidth;
         }
     }
 }
-
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index e78e5c0a58..4ea5135c4f 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             var catchCurrent = (CatchDifficultyHitObject)current;
-            double halfCatcherWidth = catchCurrent.HalfCatcherWidth;
 
             if (lastPlayerPosition == null)
                 lastPlayerPosition = catchCurrent.LastNormalizedPosition;
@@ -46,17 +45,17 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
             double distanceAddition = (Math.Pow(Math.Abs(distanceMoved), 1.3) / 510);
             double sqrtStrain = Math.Sqrt(weightedStrainTime);
 
-            double bonus = 0;
+            double edgeDashBonus = 0;
 
             // Direction changes give an extra point!
             if (Math.Abs(distanceMoved) > 0.1)
             {
                 if (Math.Abs(lastDistanceMoved) > 0.1 && Math.Sign(distanceMoved) != Math.Sign(lastDistanceMoved))
                 {
-                    double bonusFactor = Math.Min(halfCatcherWidth, Math.Abs(distanceMoved)) / halfCatcherWidth;
-                    double antiflowFactor = Math.Max(Math.Min(halfCatcherWidth, Math.Abs(lastDistanceMoved)) / halfCatcherWidth, 0.3);
+                    double bonusFactor = Math.Min(50, Math.Abs(distanceMoved)) / 50;
+                    double antiflowFactor = Math.Max(Math.Min(70, Math.Abs(lastDistanceMoved)) / 70, 0.3);
 
-                    distanceAddition += direction_change_bonus / Math.Sqrt(lastStrainTime + 18) * bonusFactor * antiflowFactor * Math.Max(1 - Math.Pow(weightedStrainTime / 1000, 2), 0);
+                    distanceAddition += direction_change_bonus / Math.Sqrt(lastStrainTime + 18) * bonusFactor * antiflowFactor * Math.Max(1 - Math.Pow(weightedStrainTime / 1000, 3), 0);
                 }
 
                 // Base bonus for every movement, giving some weight to streams.
@@ -67,14 +66,14 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
             if (catchCurrent.LastObject.DistanceToHyperDash <= 20.0f / CatchPlayfield.BASE_WIDTH)
             {
                 if (!catchCurrent.LastObject.HyperDash)
-                    bonus += 5.7;
+                    edgeDashBonus += 5.7;
                 else
                 {
                     // After a hyperdash we ARE in the correct position. Always!
                     playerPosition = catchCurrent.NormalizedPosition;
                 }
 
-                distanceAddition *= 1.0 + bonus * ((20 - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 20) * Math.Pow((Math.Min(catchCurrent.StrainTime, 265) / 265), 1.5);
+                distanceAddition *= 1.0 + edgeDashBonus * ((20 - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 20) * Math.Pow((Math.Min(catchCurrent.StrainTime * catchCurrent.ClockRate, 265) / 265), 1.5); // Edge Dashes are easier at lower ms values
             }
 
             // Prevent wide dense stacks of notes which fit on the catcher from greatly increasing SR

From 5566c4881a25af18e2b34407260966d148f51ff0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Apr 2019 11:38:48 +0900
Subject: [PATCH 00023/10326] Buff DT

---
 osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 4ea5135c4f..7d5a7b4007 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 
             float distanceMoved = playerPosition - lastPlayerPosition.Value;
 
-            double weightedStrainTime = catchCurrent.StrainTime + 18;
+            double weightedStrainTime = catchCurrent.StrainTime + 10 + (8 / catchCurrent.ClockRate);
 
             double distanceAddition = (Math.Pow(Math.Abs(distanceMoved), 1.3) / 510);
             double sqrtStrain = Math.Sqrt(weightedStrainTime);

From 2824a32db60b99222ac2f862e1f54c980af0aab7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Apr 2019 11:39:13 +0900
Subject: [PATCH 00024/10326] Adjust circle-size bonus point

---
 .../Difficulty/CatchDifficultyCalculator.cs                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 4cd297478a..c56881ba51 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -52,8 +52,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             using (var catcher = new CatcherArea.Catcher(beatmap.BeatmapInfo.BaseDifficulty))
             {
                 halfCatchWidth = catcher.CatchWidth * 0.5f;
-                // We're only using 80% of the catcher's width to simulate imperfect gameplay.
-                halfCatchWidth *= Math.Min(1.05f - (0.05f * beatmap.BeatmapInfo.BaseDifficulty.CircleSize), 0.8f); // Reduce the catcher's width further at circle sizes above 5.
+                // We're only using 80% of the catcher's width to simulate imperfect gameplay, reduced further at circle sizes above 5.5
+                halfCatchWidth *= Math.Min(1.075f - (0.05f * beatmap.BeatmapInfo.BaseDifficulty.CircleSize), 0.8f);
             }
 
             CatchHitObject lastObject = null;

From 9d116efdbd8731443e46195f666aa1c21752aec5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Apr 2019 10:57:27 +0900
Subject: [PATCH 00025/10326] Limit to 10000 tiny ticks per slider

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 2adc156efd..9baa6a8531 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -55,6 +55,8 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             SliderEventDescriptor? lastEvent = null;
 
+            int ticksGenerated = 0;
+
             foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset))
             {
                 // generate tiny droplets since the last point
@@ -70,6 +72,9 @@ namespace osu.Game.Rulesets.Catch.Objects
 
                         for (double t = timeBetweenTiny; t < sinceLastTick; t += timeBetweenTiny)
                         {
+                            if (ticksGenerated++ >= 10000)
+                                break;
+
                             AddNested(new TinyDroplet
                             {
                                 Samples = tickSamples,

From 608223cbb408d33b27c45c8183c13c0d49172c4f Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Thu, 4 Jul 2019 11:59:38 +0200
Subject: [PATCH 00026/10326] Add setting to collapse the song progress graph

---
 .../Visual/Gameplay/TestSceneSongProgress.cs  | 16 +++-
 osu.Game/Configuration/OsuConfigManager.cs    |  2 +
 .../Sections/Gameplay/GeneralSettings.cs      |  5 +
 osu.Game/Screens/Play/SongProgress.cs         | 93 +++++++++++--------
 osu.Game/Screens/Play/SongProgressBar.cs      |  5 +-
 5 files changed, 77 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index af21007efe..eef7a25c7a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -15,6 +16,11 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneSongProgress : OsuTestScene
     {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(SongProgressBar),
+        };
+
         private readonly SongProgress progress;
         private readonly TestSongProgressGraph graph;
 
@@ -46,24 +52,26 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Origin = Anchor.TopLeft,
             });
 
-            AddWaitStep("wait some", 5);
             AddAssert("ensure not created", () => graph.CreationCount == 0);
 
             AddStep("display values", displayNewValues);
-            AddWaitStep("wait some", 5);
             AddUntilStep("wait for creation count", () => graph.CreationCount == 1);
 
             AddStep("Toggle Bar", () => progress.AllowSeeking = !progress.AllowSeeking);
-            AddWaitStep("wait some", 5);
             AddUntilStep("wait for creation count", () => graph.CreationCount == 1);
 
             AddStep("Toggle Bar", () => progress.AllowSeeking = !progress.AllowSeeking);
-            AddWaitStep("wait some", 5);
             AddUntilStep("wait for creation count", () => graph.CreationCount == 1);
             AddRepeatStep("New Values", displayNewValues, 5);
 
             AddWaitStep("wait some", 5);
             AddAssert("ensure debounced", () => graph.CreationCount == 2);
+
+            AddStep("hide graph", () => progress.CollapseGraph.Value = true);
+            AddStep("show graph", () => progress.CollapseGraph.Value = false);
+
+            AddStep("start", clock.Start);
+            AddStep("pause", clock.Stop);
         }
 
         private void displayNewValues()
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 795f0b43f7..f3792fcb7f 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -77,6 +77,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
 
             Set(OsuSetting.ShowInterface, true);
+            Set(OsuSetting.CollapseProgressGraph, false);
             Set(OsuSetting.KeyOverlay, false);
 
             Set(OsuSetting.FloatingComments, false);
@@ -131,6 +132,7 @@ namespace osu.Game.Configuration
         KeyOverlay,
         FloatingComments,
         ShowInterface,
+        CollapseProgressGraph,
         MouseDisableButtons,
         MouseDisableWheel,
         AudioOffset,
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 997d1354b3..e365973c4b 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -35,6 +35,11 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     Bindable = config.GetBindable<bool>(OsuSetting.ShowInterface)
                 },
                 new SettingsCheckbox
+                {
+                    LabelText = "Collapse song progress graph",
+                    Bindable = config.GetBindable<bool>(OsuSetting.CollapseProgressGraph)
+                },
+                new SettingsCheckbox
                 {
                     LabelText = "Always show key overlay",
                     Bindable = config.GetBindable<bool>(OsuSetting.KeyOverlay)
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 6642efdf8b..a535dc3333 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI;
@@ -20,7 +21,7 @@ namespace osu.Game.Screens.Play
     public class SongProgress : OverlayContainer
     {
         private const int bottom_bar_height = 5;
-
+        private const float graph_height = SquareGraph.Column.WIDTH * 6;
         private static readonly Vector2 handle_size = new Vector2(10, 18);
 
         private const float transition_duration = 200;
@@ -30,13 +31,13 @@ namespace osu.Game.Screens.Play
         private readonly SongProgressInfo info;
 
         public Action<double> RequestSeek;
+        public readonly Bindable<bool> CollapseGraph = new Bindable<bool>();
 
         public override bool HandleNonPositionalInput => AllowSeeking;
         public override bool HandlePositionalInput => AllowSeeking;
 
-        private double lastHitTime => ((objects.Last() as IHasEndTime)?.EndTime ?? objects.Last().StartTime) + 1;
-
         private double firstHitTime => objects.First().StartTime;
+        private double lastHitTime => ((objects.Last() as IHasEndTime)?.EndTime ?? objects.Last().StartTime) + 1;
 
         private IEnumerable<HitObject> objects;
 
@@ -54,25 +55,28 @@ namespace osu.Game.Screens.Play
             }
         }
 
+        private bool allowSeeking;
+
+        public bool AllowSeeking
+        {
+            get => allowSeeking;
+            set
+            {
+                if (allowSeeking == value) return;
+
+                allowSeeking = value;
+                updateBarVisibility();
+            }
+        }
+
         private readonly BindableBool replayLoaded = new BindableBool();
 
         public IClock ReferenceClock;
 
         private IClock gameplayClock;
 
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, GameplayClock clock)
-        {
-            if (clock != null)
-                gameplayClock = clock;
-
-            graph.FillColour = bar.FillColour = colours.BlueLighter;
-        }
-
         public SongProgress()
         {
-            const float graph_height = SquareGraph.Column.WIDTH * 6;
-
             Height = bottom_bar_height + graph_height + handle_size.Y;
             Y = bottom_bar_height;
 
@@ -104,12 +108,23 @@ namespace osu.Game.Screens.Play
             };
         }
 
+        [BackgroundDependencyLoader(true)]
+        private void load(OsuColour colours, GameplayClock clock, OsuConfigManager config)
+        {
+            if (clock != null)
+                gameplayClock = clock;
+
+            config.BindWith(OsuSetting.CollapseProgressGraph, CollapseGraph);
+
+            graph.FillColour = bar.FillColour = colours.BlueLighter;
+        }
+
         protected override void LoadComplete()
         {
             Show();
 
-            replayLoaded.ValueChanged += loaded => AllowSeeking = loaded.NewValue;
-            replayLoaded.TriggerChange();
+            replayLoaded.BindValueChanged(loaded => AllowSeeking = loaded.NewValue, true);
+            CollapseGraph.BindValueChanged(_ => updateGraphVisibility(), true);
         }
 
         public void BindDrawableRuleset(DrawableRuleset drawableRuleset)
@@ -117,28 +132,6 @@ namespace osu.Game.Screens.Play
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
         }
 
-        private bool allowSeeking;
-
-        public bool AllowSeeking
-        {
-            get => allowSeeking;
-            set
-            {
-                if (allowSeeking == value) return;
-
-                allowSeeking = value;
-                updateBarVisibility();
-            }
-        }
-
-        private void updateBarVisibility()
-        {
-            bar.FadeTo(allowSeeking ? 1 : 0, transition_duration, Easing.In);
-            this.MoveTo(new Vector2(0, allowSeeking ? 0 : bottom_bar_height), transition_duration, Easing.In);
-
-            info.Margin = new MarginPadding { Bottom = Height - (allowSeeking ? 0 : handle_size.Y) };
-        }
-
         protected override void PopIn()
         {
             updateBarVisibility();
@@ -165,5 +158,29 @@ namespace osu.Game.Screens.Play
             bar.CurrentTime = gameplayTime;
             graph.Progress = (int)(graph.ColumnCount * progress);
         }
+
+        private void updateBarVisibility()
+        {
+            bar.FadeTo(allowSeeking ? 1 : 0, transition_duration, Easing.In);
+            this.MoveTo(new Vector2(0, allowSeeking ? 0 : bottom_bar_height), transition_duration, Easing.In);
+
+            updateInfoMargin();
+        }
+
+        private void updateGraphVisibility()
+        {
+            float barHeight = bottom_bar_height + handle_size.Y;
+
+            bar.ResizeHeightTo(CollapseGraph.Value ? barHeight : barHeight + graph_height, transition_duration, Easing.In);
+            graph.MoveToY(CollapseGraph.Value ? graph_height : 0, transition_duration, Easing.In);
+
+            updateInfoMargin();
+        }
+
+        private void updateInfoMargin()
+        {
+            float finalMargin = bottom_bar_height + (allowSeeking ? handle_size.Y : 0) + (CollapseGraph.Value ? 0 : graph_height);
+            info.TransformTo(nameof(info.Margin), new MarginPadding { Bottom = finalMargin }, transition_duration, Easing.In);
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/SongProgressBar.cs b/osu.Game/Screens/Play/SongProgressBar.cs
index dd7b5826d5..0a906845fc 100644
--- a/osu.Game/Screens/Play/SongProgressBar.cs
+++ b/osu.Game/Screens/Play/SongProgressBar.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Screens.Play
 
         private readonly Box fill;
         private readonly Container handleBase;
+        private readonly Container handleContainer;
 
         public Color4 FillColour
         {
@@ -73,7 +74,6 @@ namespace osu.Game.Screens.Play
                     Origin = Anchor.BottomLeft,
                     Anchor = Anchor.BottomLeft,
                     Width = 2,
-                    Height = barHeight + handleBarHeight,
                     Colour = Color4.White,
                     Position = new Vector2(2, 0),
                     Children = new Drawable[]
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.Play
                             Name = "HandleBar box",
                             RelativeSizeAxes = Axes.Both,
                         },
-                        new Container
+                        handleContainer = new Container
                         {
                             Name = "Handle container",
                             Origin = Anchor.BottomCentre,
@@ -115,6 +115,7 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
+            handleBase.Height = Height - handleContainer.Height;
             float newX = (float)Interpolation.Lerp(handleBase.X, NormalizedValue * UsableWidth, MathHelper.Clamp(Time.Elapsed / 40, 0, 1));
 
             fill.Width = newX;

From e69160a0ce1f80bee073cc618c7205106ac5a206 Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Fri, 5 Jul 2019 08:05:18 +0200
Subject: [PATCH 00027/10326] fix graph not completely hiding

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

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index a535dc3333..a201b04864 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Screens.Play
             float barHeight = bottom_bar_height + handle_size.Y;
 
             bar.ResizeHeightTo(CollapseGraph.Value ? barHeight : barHeight + graph_height, transition_duration, Easing.In);
-            graph.MoveToY(CollapseGraph.Value ? graph_height : 0, transition_duration, Easing.In);
+            graph.MoveToY(CollapseGraph.Value ? bottom_bar_height + graph_height : 0, transition_duration, Easing.In);
 
             updateInfoMargin();
         }

From c22667bdf79eed3048331c1350526041553761f5 Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Fri, 5 Jul 2019 08:05:23 +0200
Subject: [PATCH 00028/10326] reorganise tests

---
 .../Visual/Gameplay/TestSceneSongProgress.cs  | 128 ++++++++++++------
 1 file changed, 84 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index eef7a25c7a..810659233b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.MathUtils;
+using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Play;
@@ -21,65 +22,104 @@ namespace osu.Game.Tests.Visual.Gameplay
             typeof(SongProgressBar),
         };
 
-        private readonly SongProgress progress;
-        private readonly TestSongProgressGraph graph;
+        private SongProgress progress;
+        private TestSongProgressGraph graph;
 
         private readonly StopwatchClock clock;
+        private readonly FramedClock framedClock;
 
         [Cached]
         private readonly GameplayClock gameplayClock;
 
-        private readonly FramedClock framedClock;
-
         public TestSceneSongProgress()
         {
-            clock = new StopwatchClock(true);
-
+            clock = new StopwatchClock();
             gameplayClock = new GameplayClock(framedClock = new FramedClock(clock));
-
-            Add(progress = new SongProgress
-            {
-                RelativeSizeAxes = Axes.X,
-                Anchor = Anchor.BottomLeft,
-                Origin = Anchor.BottomLeft,
-            });
-
-            Add(graph = new TestSongProgressGraph
-            {
-                RelativeSizeAxes = Axes.X,
-                Height = 200,
-                Anchor = Anchor.TopLeft,
-                Origin = Anchor.TopLeft,
-            });
-
-            AddAssert("ensure not created", () => graph.CreationCount == 0);
-
-            AddStep("display values", displayNewValues);
-            AddUntilStep("wait for creation count", () => graph.CreationCount == 1);
-
-            AddStep("Toggle Bar", () => progress.AllowSeeking = !progress.AllowSeeking);
-            AddUntilStep("wait for creation count", () => graph.CreationCount == 1);
-
-            AddStep("Toggle Bar", () => progress.AllowSeeking = !progress.AllowSeeking);
-            AddUntilStep("wait for creation count", () => graph.CreationCount == 1);
-            AddRepeatStep("New Values", displayNewValues, 5);
-
-            AddWaitStep("wait some", 5);
-            AddAssert("ensure debounced", () => graph.CreationCount == 2);
-
-            AddStep("hide graph", () => progress.CollapseGraph.Value = true);
-            AddStep("show graph", () => progress.CollapseGraph.Value = false);
-
-            AddStep("start", clock.Start);
-            AddStep("pause", clock.Stop);
         }
 
-        private void displayNewValues()
+        [SetUpSteps]
+        public void SetupSteps()
         {
-            List<HitObject> objects = new List<HitObject>();
+            AddStep("add new song progress", () =>
+            {
+                if (progress != null)
+                {
+                    progress.Expire();
+                    progress = null;
+                }
+
+                Add(progress = new SongProgress
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                });
+            });
+
+            AddStep("add new big graph", () =>
+            {
+                if (graph != null)
+                {
+                    graph.Expire();
+                    graph = null;
+                }
+
+                Add(graph = new TestSongProgressGraph
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 200,
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                });
+            });
+
+            AddStep("reset clock", clock.Reset);
+        }
+
+        [Test]
+        public void TestGraphRecreation()
+        {
+            AddAssert("ensure not created", () => graph.CreationCount == 0);
+            AddStep("display values", displayRandomValues);
+            AddUntilStep("wait for creation count", () => graph.CreationCount == 1);
+            AddRepeatStep("new values", displayRandomValues, 5);
+            AddWaitStep("wait some", 5);
+            AddAssert("ensure recreation debounced", () => graph.CreationCount == 2);
+        }
+
+        [Test]
+        public void TestDisplay()
+        {
+            AddStep("display max values", displayMaxValues);
+            AddStep("start", clock.Start);
+            AddStep("show bar", () => progress.AllowSeeking = true);
+            AddStep("hide graph", () => progress.CollapseGraph.Value = true);
+            AddStep("hide Bar", () => progress.AllowSeeking = false);
+            AddStep("show bar", () => progress.AllowSeeking = true);
+            AddStep("show graph", () => progress.CollapseGraph.Value = false);
+            AddStep("stop", clock.Stop);
+        }
+
+        private void displayRandomValues()
+        {
+            var objects = new List<HitObject>();
             for (double i = 0; i < 5000; i += RNG.NextDouble() * 10 + i / 1000)
                 objects.Add(new HitObject { StartTime = i });
 
+            replaceObjects(objects);
+        }
+
+        private void displayMaxValues()
+        {
+            var objects = new List<HitObject>();
+            for (double i = 0; i < 5000; i++)
+                objects.Add(new HitObject { StartTime = i });
+
+            replaceObjects(objects);
+        }
+
+        private void replaceObjects(List<HitObject> objects)
+        {
             progress.Objects = objects;
             graph.Objects = objects;
 

From 1cb7a9617be89f5f01f6b21bc6ce280fdf8e2c95 Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Fri, 5 Jul 2019 08:29:57 +0200
Subject: [PATCH 00029/10326] move songprogress up to be able to see below for
 masking

---
 .../Visual/Gameplay/TestSceneSongProgress.cs  | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index 810659233b..550115846b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -6,9 +6,12 @@ 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.Framework.MathUtils;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Play;
 
@@ -24,6 +27,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private SongProgress progress;
         private TestSongProgressGraph graph;
+        private readonly Container progressContainer;
 
         private readonly StopwatchClock clock;
         private readonly FramedClock framedClock;
@@ -35,6 +39,20 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             clock = new StopwatchClock();
             gameplayClock = new GameplayClock(framedClock = new FramedClock(clock));
+
+            Add(progressContainer = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.BottomCentre,
+                Height = 100,
+                Y = -100,
+                Child = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = OsuColour.Gray(1),
+                }
+            });
         }
 
         [SetUpSteps]
@@ -48,7 +66,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     progress = null;
                 }
 
-                Add(progress = new SongProgress
+                progressContainer.Add(progress = new SongProgress
                 {
                     RelativeSizeAxes = Axes.X,
                     Anchor = Anchor.BottomLeft,
@@ -91,6 +109,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestDisplay()
         {
             AddStep("display max values", displayMaxValues);
+            AddUntilStep("wait for graph", () => graph.CreationCount == 1);
             AddStep("start", clock.Start);
             AddStep("show bar", () => progress.AllowSeeking = true);
             AddStep("hide graph", () => progress.CollapseGraph.Value = true);

From ed22c23f37bf57a9d1de77db3a905a718a5394db Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Fri, 5 Jul 2019 08:30:32 +0200
Subject: [PATCH 00030/10326] mask SongProgress

---
 osu.Game/Screens/Play/SongProgress.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index a201b04864..9ebfeb5c82 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -77,8 +77,8 @@ namespace osu.Game.Screens.Play
 
         public SongProgress()
         {
-            Height = bottom_bar_height + graph_height + handle_size.Y;
-            Y = bottom_bar_height;
+            Masking = true;
+            Height = bottom_bar_height + graph_height + handle_size.Y + OsuFont.Numeric.Size;
 
             Children = new Drawable[]
             {
@@ -88,7 +88,6 @@ namespace osu.Game.Screens.Play
                     Anchor = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Margin = new MarginPadding { Bottom = bottom_bar_height + graph_height },
                 },
                 graph = new SongProgressGraph
                 {

From b425df6c75afa792aa97165a798d3a884c6a8c04 Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Fri, 5 Jul 2019 08:48:40 +0200
Subject: [PATCH 00031/10326] various fixes

- make AllowSeeking a Bindable which fixes incorrect initial position and removes unnecessary variables
- make SongProgressInfo fixed height
---
 .../Visual/Gameplay/TestSceneSongProgress.cs  |  6 +--
 osu.Game/Screens/Play/SongProgress.cs         | 45 ++++++++-----------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index 550115846b..e16ad42558 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -111,10 +111,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("display max values", displayMaxValues);
             AddUntilStep("wait for graph", () => graph.CreationCount == 1);
             AddStep("start", clock.Start);
-            AddStep("show bar", () => progress.AllowSeeking = true);
+            AddStep("show bar", () => progress.AllowSeeking.Value = true);
             AddStep("hide graph", () => progress.CollapseGraph.Value = true);
-            AddStep("hide Bar", () => progress.AllowSeeking = false);
-            AddStep("show bar", () => progress.AllowSeeking = true);
+            AddStep("hide Bar", () => progress.AllowSeeking.Value = false);
+            AddStep("show bar", () => progress.AllowSeeking.Value = true);
             AddStep("show graph", () => progress.CollapseGraph.Value = false);
             AddStep("stop", clock.Stop);
         }
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 9ebfeb5c82..9d1978e4cd 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Screens.Play
 {
     public class SongProgress : OverlayContainer
     {
+        private const int info_height = 20;
         private const int bottom_bar_height = 5;
         private const float graph_height = SquareGraph.Column.WIDTH * 6;
         private static readonly Vector2 handle_size = new Vector2(10, 18);
@@ -31,10 +32,19 @@ namespace osu.Game.Screens.Play
         private readonly SongProgressInfo info;
 
         public Action<double> RequestSeek;
+
+        /// <summary>
+        /// Whether seeking is allowed and the progress bar should be shown.
+        /// </summary>
+        public readonly Bindable<bool> AllowSeeking = new Bindable<bool>();
+
+        /// <summary>
+        /// Whether the difficulty graph should be shown.
+        /// </summary>
         public readonly Bindable<bool> CollapseGraph = new Bindable<bool>();
 
-        public override bool HandleNonPositionalInput => AllowSeeking;
-        public override bool HandlePositionalInput => AllowSeeking;
+        public override bool HandleNonPositionalInput => AllowSeeking.Value;
+        public override bool HandlePositionalInput => AllowSeeking.Value;
 
         private double firstHitTime => objects.First().StartTime;
         private double lastHitTime => ((objects.Last() as IHasEndTime)?.EndTime ?? objects.Last().StartTime) + 1;
@@ -55,22 +65,6 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private bool allowSeeking;
-
-        public bool AllowSeeking
-        {
-            get => allowSeeking;
-            set
-            {
-                if (allowSeeking == value) return;
-
-                allowSeeking = value;
-                updateBarVisibility();
-            }
-        }
-
-        private readonly BindableBool replayLoaded = new BindableBool();
-
         public IClock ReferenceClock;
 
         private IClock gameplayClock;
@@ -78,7 +72,7 @@ namespace osu.Game.Screens.Play
         public SongProgress()
         {
             Masking = true;
-            Height = bottom_bar_height + graph_height + handle_size.Y + OsuFont.Numeric.Size;
+            Height = bottom_bar_height + graph_height + handle_size.Y + info_height;
 
             Children = new Drawable[]
             {
@@ -87,7 +81,7 @@ namespace osu.Game.Screens.Play
                     Origin = Anchor.BottomLeft,
                     Anchor = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
+                    Height = info_height,
                 },
                 graph = new SongProgressGraph
                 {
@@ -122,18 +116,17 @@ namespace osu.Game.Screens.Play
         {
             Show();
 
-            replayLoaded.BindValueChanged(loaded => AllowSeeking = loaded.NewValue, true);
+            AllowSeeking.BindValueChanged(_ => updateBarVisibility(), true);
             CollapseGraph.BindValueChanged(_ => updateGraphVisibility(), true);
         }
 
         public void BindDrawableRuleset(DrawableRuleset drawableRuleset)
         {
-            replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
+            AllowSeeking.BindTo(drawableRuleset.HasReplayLoaded);
         }
 
         protected override void PopIn()
         {
-            updateBarVisibility();
             this.FadeIn(500, Easing.OutQuint);
         }
 
@@ -160,8 +153,8 @@ namespace osu.Game.Screens.Play
 
         private void updateBarVisibility()
         {
-            bar.FadeTo(allowSeeking ? 1 : 0, transition_duration, Easing.In);
-            this.MoveTo(new Vector2(0, allowSeeking ? 0 : bottom_bar_height), transition_duration, Easing.In);
+            bar.FadeTo(AllowSeeking.Value ? 1 : 0, transition_duration, Easing.In);
+            this.MoveTo(new Vector2(0, AllowSeeking.Value ? 0 : bottom_bar_height), transition_duration, Easing.In);
 
             updateInfoMargin();
         }
@@ -178,7 +171,7 @@ namespace osu.Game.Screens.Play
 
         private void updateInfoMargin()
         {
-            float finalMargin = bottom_bar_height + (allowSeeking ? handle_size.Y : 0) + (CollapseGraph.Value ? 0 : graph_height);
+            float finalMargin = bottom_bar_height + (AllowSeeking.Value ? handle_size.Y : 0) + (CollapseGraph.Value ? 0 : graph_height);
             info.TransformTo(nameof(info.Margin), new MarginPadding { Bottom = finalMargin }, transition_duration, Easing.In);
         }
     }

From 2d5fd7f1c4fc789daabbebd0dad891ed3033a8f2 Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Fri, 5 Jul 2019 08:49:56 +0200
Subject: [PATCH 00032/10326] remove unnecessarily setting value of bindable
 that was already bound to

---
 osu.Game/Screens/Play/HUDOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 017bf70133..e0036cdeb9 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -106,7 +106,6 @@ namespace osu.Game.Screens.Play
             BindDrawableRuleset(drawableRuleset);
 
             Progress.Objects = drawableRuleset.Objects;
-            Progress.AllowSeeking = drawableRuleset.HasReplayLoaded.Value;
             Progress.RequestSeek = time => RequestSeek(time);
             Progress.ReferenceClock = drawableRuleset.FrameStableClock;
 

From ee44caf964c59439449e8d65dfa4bf73ea9fb887 Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Fri, 5 Jul 2019 08:52:44 +0200
Subject: [PATCH 00033/10326] better setting description

---
 osu.Game/Configuration/OsuConfigManager.cs                    | 4 ++--
 .../Overlays/Settings/Sections/Gameplay/GeneralSettings.cs    | 4 ++--
 osu.Game/Screens/Play/SongProgress.cs                         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index f3792fcb7f..c055d7d321 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
 
             Set(OsuSetting.ShowInterface, true);
-            Set(OsuSetting.CollapseProgressGraph, false);
+            Set(OsuSetting.ShowProgressGraph, true);
             Set(OsuSetting.KeyOverlay, false);
 
             Set(OsuSetting.FloatingComments, false);
@@ -132,7 +132,7 @@ namespace osu.Game.Configuration
         KeyOverlay,
         FloatingComments,
         ShowInterface,
-        CollapseProgressGraph,
+        ShowProgressGraph,
         MouseDisableButtons,
         MouseDisableWheel,
         AudioOffset,
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index e365973c4b..2169fc69cc 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -36,8 +36,8 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = "Collapse song progress graph",
-                    Bindable = config.GetBindable<bool>(OsuSetting.CollapseProgressGraph)
+                    LabelText = "Show difficulty graph on progress bar",
+                    Bindable = config.GetBindable<bool>(OsuSetting.ShowProgressGraph)
                 },
                 new SettingsCheckbox
                 {
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 9d1978e4cd..7411afb688 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Play
             if (clock != null)
                 gameplayClock = clock;
 
-            config.BindWith(OsuSetting.CollapseProgressGraph, CollapseGraph);
+            config.BindWith(OsuSetting.ShowProgressGraph, CollapseGraph);
 
             graph.FillColour = bar.FillColour = colours.BlueLighter;
         }

From d05512a12a3d7c41f8276473d0fb08c31e2ba092 Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Fri, 5 Jul 2019 09:16:50 +0200
Subject: [PATCH 00034/10326] invert usage corresponding to previous
 description change

---
 .../Visual/Gameplay/TestSceneSongProgress.cs      |  4 ++--
 osu.Game/Screens/Play/SongProgress.cs             | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index e16ad42558..15bf907b4f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -112,10 +112,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for graph", () => graph.CreationCount == 1);
             AddStep("start", clock.Start);
             AddStep("show bar", () => progress.AllowSeeking.Value = true);
-            AddStep("hide graph", () => progress.CollapseGraph.Value = true);
+            AddStep("hide graph", () => progress.ShowGraph.Value = false);
             AddStep("hide Bar", () => progress.AllowSeeking.Value = false);
             AddStep("show bar", () => progress.AllowSeeking.Value = true);
-            AddStep("show graph", () => progress.CollapseGraph.Value = false);
+            AddStep("show graph", () => progress.ShowGraph.Value = true);
             AddStep("stop", clock.Stop);
         }
 
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 7411afb688..727fad84c9 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -38,10 +38,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public readonly Bindable<bool> AllowSeeking = new Bindable<bool>();
 
-        /// <summary>
-        /// Whether the difficulty graph should be shown.
-        /// </summary>
-        public readonly Bindable<bool> CollapseGraph = new Bindable<bool>();
+        public readonly Bindable<bool> ShowGraph = new Bindable<bool>();
 
         public override bool HandleNonPositionalInput => AllowSeeking.Value;
         public override bool HandlePositionalInput => AllowSeeking.Value;
@@ -107,7 +104,7 @@ namespace osu.Game.Screens.Play
             if (clock != null)
                 gameplayClock = clock;
 
-            config.BindWith(OsuSetting.ShowProgressGraph, CollapseGraph);
+            config.BindWith(OsuSetting.ShowProgressGraph, ShowGraph);
 
             graph.FillColour = bar.FillColour = colours.BlueLighter;
         }
@@ -117,7 +114,7 @@ namespace osu.Game.Screens.Play
             Show();
 
             AllowSeeking.BindValueChanged(_ => updateBarVisibility(), true);
-            CollapseGraph.BindValueChanged(_ => updateGraphVisibility(), true);
+            ShowGraph.BindValueChanged(_ => updateGraphVisibility(), true);
         }
 
         public void BindDrawableRuleset(DrawableRuleset drawableRuleset)
@@ -163,15 +160,15 @@ namespace osu.Game.Screens.Play
         {
             float barHeight = bottom_bar_height + handle_size.Y;
 
-            bar.ResizeHeightTo(CollapseGraph.Value ? barHeight : barHeight + graph_height, transition_duration, Easing.In);
-            graph.MoveToY(CollapseGraph.Value ? bottom_bar_height + graph_height : 0, transition_duration, Easing.In);
+            bar.ResizeHeightTo(ShowGraph.Value ? barHeight + graph_height : barHeight, transition_duration, Easing.In);
+            graph.MoveToY(ShowGraph.Value ? 0 : bottom_bar_height + graph_height, transition_duration, Easing.In);
 
             updateInfoMargin();
         }
 
         private void updateInfoMargin()
         {
-            float finalMargin = bottom_bar_height + (AllowSeeking.Value ? handle_size.Y : 0) + (CollapseGraph.Value ? 0 : graph_height);
+            float finalMargin = bottom_bar_height + (AllowSeeking.Value ? handle_size.Y : 0) + (ShowGraph.Value ? graph_height : 0);
             info.TransformTo(nameof(info.Margin), new MarginPadding { Bottom = finalMargin }, transition_duration, Easing.In);
         }
     }

From d467dd57472ebc001ee28eb6f01d6b468702e735 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Mon, 29 Jul 2019 06:51:44 +0300
Subject: [PATCH 00035/10326] Add simple implementation of in-game leaderboard

---
 osu.Game/Screens/Play/InGameLeaderboard.cs    |  42 ++++
 osu.Game/Screens/Play/InGameScoreContainer.cs | 206 ++++++++++++++++++
 2 files changed, 248 insertions(+)
 create mode 100644 osu.Game/Screens/Play/InGameLeaderboard.cs
 create mode 100644 osu.Game/Screens/Play/InGameScoreContainer.cs

diff --git a/osu.Game/Screens/Play/InGameLeaderboard.cs b/osu.Game/Screens/Play/InGameLeaderboard.cs
new file mode 100644
index 0000000000..c8f5cf5fd7
--- /dev/null
+++ b/osu.Game/Screens/Play/InGameLeaderboard.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 osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Users;
+
+namespace osu.Game.Screens.Play
+{
+    public class InGameLeaderboard : CompositeDrawable
+    {
+        protected readonly InGameScoreContainer ScoresContainer;
+
+        public readonly BindableDouble PlayerCurrentScore = new BindableDouble();
+
+        private bool playerItemCreated;
+        private User playerUser;
+
+        public User PlayerUser
+        {
+            get => playerUser;
+            set
+            {
+                playerUser = value;
+
+                if (playerItemCreated)
+                    return;
+
+                ScoresContainer.AddRealTimePlayer(PlayerCurrentScore, playerUser);
+                playerItemCreated = true;
+            }
+        }
+
+        public InGameLeaderboard()
+        {
+            AutoSizeAxes = Axes.Y;
+
+            InternalChild = ScoresContainer = new InGameScoreContainer();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
new file mode 100644
index 0000000000..eb4a0a2f38
--- /dev/null
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -0,0 +1,206 @@
+// Copyright (c) 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 Humanizer;
+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.Scoring;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Screens.Play
+{
+    public class InGameScoreContainer : FillFlowContainer<InGameScoreItem>
+    {
+        /// <summary>
+        /// Whether to declare a new position for un-positioned players.
+        /// Must be disabled for online leaderboards with top 50 scores only.
+        /// </summary>
+        public bool DeclareNewPosition = true;
+
+        public InGameScoreContainer()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+            Spacing = new Vector2(2.5f);
+            LayoutDuration = 500;
+            LayoutEasing = Easing.OutQuint;
+        }
+
+        public void AddRealTimePlayer(BindableDouble currentScore, User user = null)
+        {
+            if (currentScore == null)
+                return;
+
+            var scoreItem = addScore(currentScore.Value, user);
+            currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
+        }
+
+        public void AddScore(ScoreInfo score, int? position = null)
+        {
+            if (score != null)
+                addScore(score.TotalScore, score.User, position);
+        }
+
+        private int maxPosition => this.Where(i => i.ScorePosition.HasValue).Max(i => i.ScorePosition) ?? 0;
+
+        private InGameScoreItem addScore(double totalScore, User user = null, int? position = null)
+        {
+            var scoreItem = new InGameScoreItem
+            {
+                User = user,
+                TotalScore = totalScore,
+                ScorePosition = position,
+                OnScoreChange = updateScores,
+            };
+
+            Add(scoreItem);
+            SetLayoutPosition(scoreItem, position ?? maxPosition + 1);
+
+            updateScores();
+
+            return scoreItem;
+        }
+
+        private void updateScores()
+        {
+            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
+            var orderedPositions = this.OrderByDescending(i => i.ScorePosition.HasValue).ThenBy(i => i.ScorePosition).Select(i => i.ScorePosition).ToList();
+
+            for (int i = 0; i < Count; i++)
+            {
+                int newPosition = orderedPositions[i] ?? maxPosition + 1;
+
+                SetLayoutPosition(orderedByScore[i], newPosition);
+                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
+            }
+        }
+    }
+
+    public class InGameScoreItem : CompositeDrawable
+    {
+        private readonly OsuSpriteText positionText, positionSymbol, userString;
+        private readonly GlowingSpriteText scoreText;
+
+        public Action OnScoreChange;
+
+        private int? scorePosition;
+
+        public int? ScorePosition
+        {
+            get => scorePosition;
+            set
+            {
+                scorePosition = value;
+
+                if (scorePosition.HasValue)
+                    positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}";
+
+                positionText.FadeTo(scorePosition.HasValue ? 1 : 0, 100);
+                positionSymbol.FadeTo(scorePosition.HasValue ? 1 : 0, 100);
+            }
+        }
+
+        private double totalScore;
+
+        public double TotalScore
+        {
+            get => totalScore;
+            set
+            {
+                totalScore = value;
+                scoreText.Text = totalScore.ToString("N0");
+
+                OnScoreChange?.Invoke();
+            }
+        }
+
+        private User user;
+
+        public User User
+        {
+            get => user;
+            set
+            {
+                user = value;
+                userString.Text = user?.Username;
+            }
+        }
+
+        public InGameScoreItem()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            InternalChild = new Container
+            {
+                Masking = true,
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopRight,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Margin = new MarginPadding { Right = 2.5f },
+                        Spacing = new Vector2(2.5f),
+                        Children = new[]
+                        {
+                            positionText = new OsuSpriteText
+                            {
+                                Alpha = 0,
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
+                            },
+                            positionSymbol = new OsuSpriteText
+                            {
+                                Alpha = 0,
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
+                                Text = ">",
+                            },
+                        }
+                    },
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopLeft,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Margin = new MarginPadding { Left = 2.5f },
+                        Spacing = new Vector2(2.5f),
+                        Children = new Drawable[]
+                        {
+                            userString = new OsuSpriteText
+                            {
+                                Size = new Vector2(80, 16),
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+                            },
+                            scoreText = new GlowingSpriteText
+                            {
+                                GlowColour = OsuColour.FromHex(@"83ccfa"),
+                                Font = OsuFont.Numeric.With(size: 14),
+                            }
+                        }
+                    },
+                },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            positionText.Colour = colours.YellowLight;
+            positionSymbol.Colour = colours.Yellow;
+        }
+    }
+}

From 6233dc22e0b76bda53722e0aca270d67e0e39c8c Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Mon, 29 Jul 2019 06:52:42 +0300
Subject: [PATCH 00036/10326] Add simple tests for current implementation

---
 .../Gameplay/TestSceneInGameLeaderboard.cs    | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
new file mode 100644
index 0000000000..36ed8f9b4c
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -0,0 +1,79 @@
+// Copyright (c) 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Play;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    [TestFixture]
+    public class TestSceneInGameLeaderboard : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(InGameLeaderboard),
+            typeof(InGameScoreContainer),
+        };
+
+        private readonly TestInGameLeaderboard leaderboard;
+        private readonly BindableDouble playerScore;
+
+        public TestSceneInGameLeaderboard()
+        {
+            Add(leaderboard = new TestInGameLeaderboard
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(2),
+                RelativeSizeAxes = Axes.X,
+                PlayerCurrentScore = { BindTarget = playerScore = new BindableDouble(1222333) }
+            });
+
+            AddStep("add player user", () => leaderboard.PlayerUser = new User { Username = "You" });
+            AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
+        }
+
+        [Test]
+        public void TestPlayerScore()
+        {
+            var player2Score = new BindableDouble(1234567);
+            var player3Score = new BindableDouble(1111111);
+
+            AddStep("add player 2", () => leaderboard.AddDummyPlayer(player2Score, "Player 2"));
+            AddStep("add player 3", () => leaderboard.AddDummyPlayer(player3Score, "Player 3"));
+
+            AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
+            AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
+            AddAssert("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
+
+            AddStep("set score above player 3", () => player2Score.Value = playerScore.Value - 500);
+            AddAssert("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
+            AddAssert("is player 2 position #2", () => leaderboard.CheckPositionByUsername("Player 2", 2));
+            AddAssert("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
+
+            AddStep("set score below players", () => player2Score.Value = playerScore.Value - 123456);
+            AddAssert("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
+            AddAssert("is player 3 position #2", () => leaderboard.CheckPositionByUsername("Player 3", 2));
+            AddAssert("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
+        }
+
+        private class TestInGameLeaderboard : InGameLeaderboard
+        {
+            public bool CheckPositionByUsername(string username, int? estimatedPosition)
+            {
+                var scoreItem = ScoresContainer.Where(i => i.User.Username == username).FirstOrDefault();
+
+                return scoreItem != null && scoreItem.ScorePosition == estimatedPosition;
+            }
+
+            public void AddDummyPlayer(BindableDouble currentScore, string username) => ScoresContainer.AddRealTimePlayer(currentScore, new User { Username = username });
+        }
+    }
+}

From 4874746525615cb5aaffbe6195d8038b7766543b Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 30 Jul 2019 12:32:12 +0300
Subject: [PATCH 00037/10326] Add OnScoreChange event

For use in scrolling system on a later PR
---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index eb4a0a2f38..985e867510 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -18,6 +18,12 @@ namespace osu.Game.Screens.Play
 {
     public class InGameScoreContainer : FillFlowContainer<InGameScoreItem>
     {
+        /// <summary>
+        /// Called once an item's score has changed.
+        /// Useful for doing calculations on what score to show or hide next. (scrolling system)
+        /// </summary>
+        public event Action OnScoreChange;
+
         /// <summary>
         /// Whether to declare a new position for un-positioned players.
         /// Must be disabled for online leaderboards with top 50 scores only.
@@ -64,12 +70,12 @@ namespace osu.Game.Screens.Play
             Add(scoreItem);
             SetLayoutPosition(scoreItem, position ?? maxPosition + 1);
 
-            updateScores();
+            reorderPositions();
 
             return scoreItem;
         }
 
-        private void updateScores()
+        private void reorderPositions()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
             var orderedPositions = this.OrderByDescending(i => i.ScorePosition.HasValue).ThenBy(i => i.ScorePosition).Select(i => i.ScorePosition).ToList();
@@ -82,6 +88,13 @@ namespace osu.Game.Screens.Play
                 orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
             }
         }
+
+        private void updateScores()
+        {
+            reorderPositions();
+
+            OnScoreChange?.Invoke();
+        }
     }
 
     public class InGameScoreItem : CompositeDrawable

From 32498d5d5088f4b009eec5d7304ea10f96dbb515 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 30 Jul 2019 12:35:49 +0300
Subject: [PATCH 00038/10326] Add xmldocs and return score items.

Return for usage in later PR
---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index 985e867510..0ebf475e18 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -40,20 +40,30 @@ namespace osu.Game.Screens.Play
             LayoutEasing = Easing.OutQuint;
         }
 
-        public void AddRealTimePlayer(BindableDouble currentScore, User user = null)
+        /// <summary>
+        /// Adds a real-time player score item whose score is updated via a <see cref="BindableDouble"/>.
+        /// </summary>
+        /// <param name="currentScore">The bindable current score of the player.</param>
+        /// <param name="user">The player user.</param>
+        /// <returns>Returns the drawable score item of that player.</returns>
+        public InGameScoreItem AddRealTimePlayer(BindableDouble currentScore, User user = null)
         {
             if (currentScore == null)
-                return;
+                return null;
 
             var scoreItem = addScore(currentScore.Value, user);
             currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
+
+            return scoreItem;
         }
 
-        public void AddScore(ScoreInfo score, int? position = null)
-        {
-            if (score != null)
-                addScore(score.TotalScore, score.User, position);
-        }
+        /// <summary>
+        /// Adds a score item based off a <see cref="ScoreInfo"/> with an initial position.
+        /// </summary>
+        /// <param name="score">The score info to use for this item.</param>
+        /// <param name="position">The initial position of this item.</param>
+        /// <returns>Returns the drawable score item of that player.</returns>
+        public InGameScoreItem AddScore(ScoreInfo score, int? position = null) => score != null ? addScore(score.TotalScore, score.User, position) : null;
 
         private int maxPosition => this.Where(i => i.ScorePosition.HasValue).Max(i => i.ScorePosition) ?? 0;
 

From 77aa3a9fe56437c3b4aca91b12e87ee5880a8b39 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 30 Jul 2019 12:37:01 +0300
Subject: [PATCH 00039/10326] Clear previous score items on SetUp

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 36ed8f9b4c..4a861428de 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -40,6 +40,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
+        [SetUp]
+        public void SetUp() => leaderboard.ClearScores();
+
         [Test]
         public void TestPlayerScore()
         {
@@ -66,6 +69,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class TestInGameLeaderboard : InGameLeaderboard
         {
+            public void ClearScores() => ScoresContainer.RemoveAll(s => s.User.Username != PlayerUser.Username);
+
             public bool CheckPositionByUsername(string username, int? estimatedPosition)
             {
                 var scoreItem = ScoresContainer.Where(i => i.User.Username == username).FirstOrDefault();

From 7675c679db84f0fa422b6f9034407527f36484af Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Wed, 31 Jul 2019 16:09:40 +0300
Subject: [PATCH 00040/10326] Fix reordering not declaring new position
 properly

Small bug fix
---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index 0ebf475e18..edccf6c45b 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -90,9 +90,11 @@ namespace osu.Game.Screens.Play
             var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
             var orderedPositions = this.OrderByDescending(i => i.ScorePosition.HasValue).ThenBy(i => i.ScorePosition).Select(i => i.ScorePosition).ToList();
 
+            var newDeclaredPosition = maxPosition + 1;
+
             for (int i = 0; i < Count; i++)
             {
-                int newPosition = orderedPositions[i] ?? maxPosition + 1;
+                int newPosition = orderedPositions[i] ?? newDeclaredPosition;
 
                 SetLayoutPosition(orderedByScore[i], newPosition);
                 orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];

From 5e4e15033025258a2ec6212c782c8cd72380d5f9 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:20:45 +0300
Subject: [PATCH 00041/10326] Use normal Action

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

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index edccf6c45b..2d45158095 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Play
         /// Called once an item's score has changed.
         /// Useful for doing calculations on what score to show or hide next. (scrolling system)
         /// </summary>
-        public event Action OnScoreChange;
+        public Action OnScoreChange;
 
         /// <summary>
         /// Whether to declare a new position for un-positioned players.

From 9325c024bb08dcd468cc41a0f70d3df7f09f5d78 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:26:01 +0300
Subject: [PATCH 00042/10326] Add InitialPosition field

---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index 2d45158095..36dbec7fce 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -61,19 +61,18 @@ namespace osu.Game.Screens.Play
         /// Adds a score item based off a <see cref="ScoreInfo"/> with an initial position.
         /// </summary>
         /// <param name="score">The score info to use for this item.</param>
-        /// <param name="position">The initial position of this item.</param>
+        /// <param name="initialPosition">The initial position of this item.</param>
         /// <returns>Returns the drawable score item of that player.</returns>
-        public InGameScoreItem AddScore(ScoreInfo score, int? position = null) => score != null ? addScore(score.TotalScore, score.User, position) : null;
+        public InGameScoreItem AddScore(ScoreInfo score, int? initialPosition = null) => score != null ? addScore(score.TotalScore, score.User, initialPosition) : null;
 
         private int maxPosition => this.Where(i => i.ScorePosition.HasValue).Max(i => i.ScorePosition) ?? 0;
 
         private InGameScoreItem addScore(double totalScore, User user = null, int? position = null)
         {
-            var scoreItem = new InGameScoreItem
+            var scoreItem = new InGameScoreItem(position)
             {
                 User = user,
                 TotalScore = totalScore,
-                ScorePosition = position,
                 OnScoreChange = updateScores,
             };
 
@@ -117,6 +116,7 @@ namespace osu.Game.Screens.Play
         public Action OnScoreChange;
 
         private int? scorePosition;
+        public int? InitialPosition;
 
         public int? ScorePosition
         {
@@ -159,7 +159,7 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public InGameScoreItem()
+        public InGameScoreItem(int? initialPosition)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -219,6 +219,8 @@ namespace osu.Game.Screens.Play
                     },
                 },
             };
+
+            InitialPosition = ScorePosition = initialPosition;
         }
 
         [BackgroundDependencyLoader]

From 91f35dde58a3815ba25d731c6ed5fad8da1e98ab Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:27:49 +0300
Subject: [PATCH 00043/10326] Actual fix of position declaring bug

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

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index 36dbec7fce..3949307dca 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Play
         /// <returns>Returns the drawable score item of that player.</returns>
         public InGameScoreItem AddScore(ScoreInfo score, int? initialPosition = null) => score != null ? addScore(score.TotalScore, score.User, initialPosition) : null;
 
-        private int maxPosition => this.Where(i => i.ScorePosition.HasValue).Max(i => i.ScorePosition) ?? 0;
+        private int maxPosition => this.Max(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition) ?? 0;
 
         private InGameScoreItem addScore(double totalScore, User user = null, int? position = null)
         {
@@ -87,13 +87,11 @@ namespace osu.Game.Screens.Play
         private void reorderPositions()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
-            var orderedPositions = this.OrderByDescending(i => i.ScorePosition.HasValue).ThenBy(i => i.ScorePosition).Select(i => i.ScorePosition).ToList();
-
-            var newDeclaredPosition = maxPosition + 1;
+            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
 
             for (int i = 0; i < Count; i++)
             {
-                int newPosition = orderedPositions[i] ?? newDeclaredPosition;
+                int newPosition = orderedPositions[i] ?? maxPosition + 1;
 
                 SetLayoutPosition(orderedByScore[i], newPosition);
                 orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];

From f5daf98aa530173f9e83dfc5a1b90b1fb2fd1591 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:28:40 +0300
Subject: [PATCH 00044/10326] Reset player state on setup

---
 .../Visual/Gameplay/TestSceneInGameLeaderboard.cs          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 4a861428de..096b29d496 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -41,7 +41,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [SetUp]
-        public void SetUp() => leaderboard.ClearScores();
+        public void SetUp()
+        {
+            leaderboard.ClearScores();
+            leaderboard.PlayerPosition = 1;
+            playerScore.Value = 1222333;
+        }
 
         [Test]
         public void TestPlayerScore()

From 598c02f8b9f266c1dbd3d0d2ee196a2ee7a28d73 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:31:32 +0300
Subject: [PATCH 00045/10326] Shorten Where().FirstOrDefault()

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 096b29d496..24b8033fbc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public bool CheckPositionByUsername(string username, int? estimatedPosition)
             {
-                var scoreItem = ScoresContainer.Where(i => i.User.Username == username).FirstOrDefault();
+                var scoreItem = ScoresContainer.FirstOrDefault(i => i.User.Username == username);
 
                 return scoreItem != null && scoreItem.ScorePosition == estimatedPosition;
             }

From fdd00c0820355b10b8450e449512cd8067fb77ff Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:35:53 +0300
Subject: [PATCH 00046/10326] Remove position fading

Unnecessary effect
---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index 3949307dca..f548b3de3f 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -126,8 +126,8 @@ namespace osu.Game.Screens.Play
                 if (scorePosition.HasValue)
                     positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}";
 
-                positionText.FadeTo(scorePosition.HasValue ? 1 : 0, 100);
-                positionSymbol.FadeTo(scorePosition.HasValue ? 1 : 0, 100);
+                positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
+                positionSymbol.FadeTo(scorePosition.HasValue ? 1 : 0);
             }
         }
 

From ca7a812e1cc822152ceff303d1323a608b6e141a Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:39:42 +0300
Subject: [PATCH 00047/10326] Add PlayerPosition property

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 24b8033fbc..cd211d06ec 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -75,6 +75,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         private class TestInGameLeaderboard : InGameLeaderboard
         {
             public void ClearScores() => ScoresContainer.RemoveAll(s => s.User.Username != PlayerUser.Username);
+            public int? PlayerPosition
+            {
+                get => PlayerScoreItem.ScorePosition;
+                set => PlayerScoreItem.ScorePosition = value;
+            }
 
             public bool CheckPositionByUsername(string username, int? estimatedPosition)
             {

From 472af16015c40745f59fa759e362f637f57e0f44 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 19:17:45 +0300
Subject: [PATCH 00048/10326] Revert unintended change

---
 .../Visual/Gameplay/TestSceneInGameLeaderboard.cs           | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index cd211d06ec..0019212dfa 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void SetUp()
         {
             leaderboard.ClearScores();
-            leaderboard.PlayerPosition = 1;
             playerScore.Value = 1222333;
         }
 
@@ -75,11 +74,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         private class TestInGameLeaderboard : InGameLeaderboard
         {
             public void ClearScores() => ScoresContainer.RemoveAll(s => s.User.Username != PlayerUser.Username);
-            public int? PlayerPosition
-            {
-                get => PlayerScoreItem.ScorePosition;
-                set => PlayerScoreItem.ScorePosition = value;
-            }
 
             public bool CheckPositionByUsername(string username, int? estimatedPosition)
             {

From ee1c3d42d884167d1657027ca9dad17704df7231 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 20 Aug 2019 21:11:26 +0300
Subject: [PATCH 00049/10326] Add spinner tick judgement

---
 .../Judgements/OsuSpinnerTickJudgement.cs      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Judgements/OsuSpinnerTickJudgement.cs

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerTickJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerTickJudgement.cs
new file mode 100644
index 0000000000..f9cac7a2c1
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerTickJudgement.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.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Judgements
+{
+    public class OsuSpinnerTickJudgement : OsuJudgement
+    {
+        internal bool HasBonusPoints;
+
+        public override bool AffectsCombo => false;
+
+        protected override int NumericResultFor(HitResult result) => 100 + (HasBonusPoints ? 1000 : 0);
+
+        protected override double HealthIncreaseFor(HitResult result) => 0;
+    }
+}

From bb4178fa037a2b9a4d361b7a89715958d773db3e Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 20 Aug 2019 21:17:27 +0300
Subject: [PATCH 00050/10326] Add drawable spinner ticks implementation

---
 .../Objects/Drawables/DrawableSpinnerTick.cs  | 49 +++++++++++++++++++
 osu.Game.Rulesets.Osu/Objects/Spinner.cs      | 11 +++++
 osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs  | 19 +++++++
 .../Replays/OsuAutoGeneratorBase.cs           |  2 +-
 4 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
 create mode 100644 osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
new file mode 100644
index 0000000000..9c316591a9
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.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.Audio;
+using osu.Framework.Bindables;
+using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
+{
+    public class DrawableSpinnerTick : DrawableOsuHitObject
+    {
+        private readonly BindableDouble bonusSampleVolume = new BindableDouble();
+
+        private bool hasBonusPoints;
+
+        /// <summary>
+        /// Whether this judgement has a bonus of 1,000 points additional to the numeric result.
+        /// Should be set when a spin occured after the spinner has completed.
+        /// </summary>
+        public bool HasBonusPoints
+        {
+            get => hasBonusPoints;
+            internal set
+            {
+                hasBonusPoints = value;
+
+                bonusSampleVolume.Value = value ? 1 : 0;
+                ((OsuSpinnerTickJudgement)Result.Judgement).HasBonusPoints = value;
+            }
+        }
+
+        public override bool DisplayResult => false;
+
+        public DrawableSpinnerTick(SpinnerTick spinnerTick)
+            : base(spinnerTick)
+        {
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Samples.AddAdjustment(AdjustableProperty.Volume, bonusSampleVolume);
+        }
+
+        public void TriggerResult(HitResult result) => ApplyResult(r => r.Type = result);
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 8a2fd3b7aa..c32ec7be1c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -7,6 +7,8 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.Replays;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
@@ -30,6 +32,15 @@ namespace osu.Game.Rulesets.Osu.Objects
             SpinsRequired = (int)Math.Max(1, SpinsRequired * 0.6);
         }
 
+        protected override void CreateNestedHitObjects()
+        {
+            base.CreateNestedHitObjects();
+
+            var maximumSpins = OsuAutoGeneratorBase.SPIN_RADIUS * (Duration / 1000) / MathHelper.TwoPi;
+            for (int i = 0; i < maximumSpins; i++)
+                AddNested(new SpinnerTick());
+        }
+
         public override Judgement CreateJudgement() => new OsuJudgement();
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
new file mode 100644
index 0000000000..18a3dc771b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.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.Audio;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Judgements;
+
+namespace osu.Game.Rulesets.Osu.Objects
+{
+    public class SpinnerTick : OsuHitObject
+    {
+        public SpinnerTick()
+        {
+            Samples.Add(new HitSampleInfo { Name = "spinnerbonus" });
+        }
+
+        public override Judgement CreateJudgement() => new OsuSpinnerTickJudgement();
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
index 9ab358ee12..3356a0fbe0 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Replays
         /// </summary>
         protected static readonly Vector2 SPINNER_CENTRE = OsuPlayfield.BASE_SIZE / 2;
 
-        protected const float SPIN_RADIUS = 50;
+        public const float SPIN_RADIUS = 50;
 
         /// <summary>
         /// The time in ms between each ReplayFrame.

From 07795c9922cc4b3ce5197010b03fc53e0b1f565b Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 20 Aug 2019 21:50:49 +0300
Subject: [PATCH 00051/10326] Add logic to gain bonus score from spinner ticks

---
 .../Objects/Drawables/DrawableSpinner.cs      | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index a0bd301fdb..d166d6b845 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -12,7 +12,9 @@ using osu.Game.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Ranking;
 using osu.Game.Rulesets.Scoring;
 
@@ -22,6 +24,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         protected readonly Spinner Spinner;
 
+        private readonly Container<DrawableSpinnerTick> ticks;
+        private readonly OsuSpriteText bonusCounter;
+
         public readonly SpinnerDisc Disc;
         public readonly SpinnerTicks Ticks;
         private readonly SpinnerSpmCounter spmCounter;
@@ -58,6 +63,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             InternalChildren = new Drawable[]
             {
+                ticks = new Container<DrawableSpinnerTick>(),
                 circleContainer = new Container
                 {
                     AutoSizeAxes = Axes.Both,
@@ -115,8 +121,24 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Origin = Anchor.Centre,
                     Y = 120,
                     Alpha = 0
+                },
+                bonusCounter = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Y = -120,
+                    Font = OsuFont.Numeric.With(size: 24),
+                    Alpha = 0,
                 }
             };
+
+            foreach (var tick in Spinner.NestedHitObjects.OfType<SpinnerTick>())
+            {
+                var drawableTick = new DrawableSpinnerTick(tick);
+
+                ticks.Add(drawableTick);
+                AddNested(drawableTick);
+            }
         }
 
         [BackgroundDependencyLoader]
@@ -182,6 +204,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.Update();
         }
 
+        private int currentSpins;
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
@@ -190,6 +214,22 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Ticks.Rotation = Disc.Rotation;
             spmCounter.SetRotation(Disc.RotationAbsolute);
 
+            var newSpins = (int)(Disc.RotationAbsolute / 360) - currentSpins;
+
+            for (int i = currentSpins; i < currentSpins + newSpins; i++)
+            {
+                if (i < 0 || i >= ticks.Count)
+                    break;
+
+                var tick = ticks[i];
+
+                tick.HasBonusPoints = Progress >= 1 && i > Spinner.SpinsRequired;
+
+                tick.TriggerResult(HitResult.Great);
+            }
+
+            currentSpins += newSpins;
+
             float relativeCircleScale = Spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight;
             Disc.ScaleTo(relativeCircleScale + (1 - relativeCircleScale) * Progress, 200, Easing.OutQuint);
 
@@ -232,6 +272,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     break;
             }
 
+            if (state != ArmedState.Idle)
+                Schedule(() => NestedHitObjects.Where(t => !t.IsHit).OfType<DrawableSpinnerTick>().ForEach(t => t.TriggerResult(HitResult.Miss)));
+
             Expire();
         }
     }

From e4179fe4403232aa5663c80c7ee21800a20bd204 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 20 Aug 2019 21:51:32 +0300
Subject: [PATCH 00052/10326] Show bonus text if contains bonus points (1,000)

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index d166d6b845..b97f4e0a57 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -225,6 +225,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
                 tick.HasBonusPoints = Progress >= 1 && i > Spinner.SpinsRequired;
 
+                if (tick.HasBonusPoints)
+                    bonusCounter
+                        .TransformTextTo($"{(i - Spinner.SpinsRequired) * 1000}")
+                        .FadeOutFromOne(1500)
+                        .ScaleTo(1.5f).ScaleTo(1f, 1000, Easing.OutQuint);
+
                 tick.TriggerResult(HitResult.Great);
             }
 

From dbf4884cbc64c736b16d334a2ed29e3f7780ce5b Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 20 Aug 2019 21:52:13 +0300
Subject: [PATCH 00053/10326] Adjust test spinner rotation

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 3ed3f3e981..6e0745d125 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private class TestDrawableSpinner : DrawableSpinner
         {
-            private bool auto;
+            private readonly bool auto;
 
             public TestDrawableSpinner(Spinner s, bool auto)
                 : base(s)
@@ -74,12 +74,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (auto && !userTriggered && Time.Current > Spinner.StartTime + Spinner.Duration / 2 && Progress < 1)
-                {
-                    // force completion only once to not break human interaction
-                    Disc.RotationAbsolute = Spinner.SpinsRequired * 360;
-                    auto = false;
-                }
+                if (auto && !userTriggered && Time.Current > Spinner.StartTime)
+                    Disc.RotationAbsolute += Progress >= 1 ? 10 : (float)(Spinner.Duration / 120);
 
                 base.CheckForResult(userTriggered, timeOffset);
             }

From 6b7cb46ddaf9518e9f876535a86f385ed0db1a26 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sat, 7 Sep 2019 17:27:02 +0300
Subject: [PATCH 00054/10326] Add null hit windows

---
 osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
index 18a3dc771b..c2104e68ee 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
@@ -4,6 +4,7 @@
 using osu.Game.Audio;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
@@ -15,5 +16,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         }
 
         public override Judgement CreateJudgement() => new OsuSpinnerTickJudgement();
+
+        protected override HitWindows CreateHitWindows() => null;
     }
 }

From 33f4a6897cd315ba7e3790378a586a9adf424b1d Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sat, 7 Sep 2019 18:01:15 +0300
Subject: [PATCH 00055/10326] Assign to the text property directly

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index fc1e410d5f..62cec0f124 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -226,10 +226,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 tick.HasBonusPoints = Progress >= 1 && i > Spinner.SpinsRequired;
 
                 if (tick.HasBonusPoints)
+                {
+                    bonusCounter.Text = $"{(i - Spinner.SpinsRequired) * 1000}";
                     bonusCounter
-                        .TransformTextTo($"{(i - Spinner.SpinsRequired) * 1000}")
                         .FadeOutFromOne(1500)
                         .ScaleTo(1.5f).ScaleTo(1f, 1000, Easing.OutQuint);
+                }
 
                 tick.TriggerResult(HitResult.Great);
             }

From 812d33f850c1f83351f8a6c17376e11f178f7c22 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 1 Oct 2019 08:09:01 +0300
Subject: [PATCH 00056/10326] Add ExpandNumberPiece configuration with
 OsuLegacySkinTransformer

---
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs | 4 ++++
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 479c250eab..c9ed313593 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -123,6 +123,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
                                 return SkinUtils.As<TValue>(new BindableFloat(legacy_circle_radius));
 
                             break;
+
+                        case OsuSkinConfiguration.ExpandNumberPiece:
+                            string legacyVersion = source.GetConfig<string, string>("Version")?.Value ?? "1";
+                            return SkinUtils.As<TValue>(new BindableBool(double.TryParse(legacyVersion, out double version) && version < 2.0));
                     }
 
                     break;
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index 98219cafe8..85a7f5b0cd 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -7,6 +7,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
     {
         HitCirclePrefix,
         HitCircleOverlap,
+        ExpandNumberPiece,
         SliderBorderSize,
         SliderPathRadius,
         AllowSliderBallTint,

From 6ba1bc381c07d68d7af35d3e631dbe6cac7b9b93 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 1 Oct 2019 08:14:15 +0300
Subject: [PATCH 00057/10326] Add version value to the DefaultSkinConfiguration
 dictionary

---
 osu.Game/Skinning/DefaultSkinConfiguration.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Skinning/DefaultSkinConfiguration.cs b/osu.Game/Skinning/DefaultSkinConfiguration.cs
index f52fac6077..481360beb9 100644
--- a/osu.Game/Skinning/DefaultSkinConfiguration.cs
+++ b/osu.Game/Skinning/DefaultSkinConfiguration.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Skinning
                 new Color4(204, 102, 0, 255),
                 new Color4(121, 9, 13, 255)
             });
+
+            ConfigDictionary.Add(@"Version", "latest");
         }
     }
 }

From 9e314cd664991c1836d0cb258405b6652e5f4a03 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 1 Oct 2019 08:15:48 +0300
Subject: [PATCH 00058/10326] Add expand number piece bindable to hit circle

---
 .../Objects/Drawables/DrawableHitCircle.cs         | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index bb227d76df..15c768fff9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -10,9 +10,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Scoring;
-using osuTK;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -20,6 +21,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public ApproachCircle ApproachCircle { get; }
 
+        public IBindable<bool> ExpandNumberPiece => expandNumberPiece;
+
+        private readonly BindableBool expandNumberPiece = new BindableBool();
+
         private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
         private readonly IBindable<int> stackHeightBindable = new Bindable<int>();
         private readonly IBindable<float> scaleBindable = new Bindable<float>();
@@ -106,6 +111,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        protected override void ApplySkin(ISkinSource skin, bool allowFallback)
+        {
+            base.ApplySkin(skin, allowFallback);
+
+            expandNumberPiece.Value = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece).Value;
+        }
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             Debug.Assert(HitObject.HitWindows != null);

From 5aa85968c232927d42a35344437a5f3376fe3321 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 1 Oct 2019 08:23:41 +0300
Subject: [PATCH 00059/10326] Expand number piece for old skins in legacy
 circle pieces

---
 .../Skinning/LegacyMainCirclePiece.cs         | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 93ae0371df..d93d0506c3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -10,9 +10,12 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -23,17 +26,24 @@ namespace osu.Game.Rulesets.Osu.Skinning
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
         }
 
+        private Sprite hitCircleSprite;
+        private SkinnableSpriteText hitCircleText;
+
+        private List<Drawable> scalables;
+
         private readonly IBindable<ArmedState> state = new Bindable<ArmedState>();
         private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
         private readonly IBindable<int> indexInCurrentCombo = new Bindable<int>();
+        private readonly IBindable<bool> expandNumberPiece = new BindableBool();
+
+        [Resolved]
+        private DrawableHitObject drawableObject { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableObject, ISkinSource skin)
+        private void load(ISkinSource skin)
         {
             OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
-
-            Sprite hitCircleSprite;
-            SkinnableSpriteText hitCircleText;
+            DrawableHitCircle drawableCircle = (DrawableHitCircle)drawableObject;
 
             InternalChildren = new Drawable[]
             {
@@ -58,13 +68,25 @@ namespace osu.Game.Rulesets.Osu.Skinning
             };
 
             state.BindTo(drawableObject.State);
-            state.BindValueChanged(updateState, true);
-
             accentColour.BindTo(drawableObject.AccentColour);
-            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue, true);
-
             indexInCurrentCombo.BindTo(osuObject.IndexInCurrentComboBindable);
+            expandNumberPiece.BindTo(drawableCircle.ExpandNumberPiece);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            state.BindValueChanged(updateState, true);
+            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue, true);
             indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
+            expandNumberPiece.BindValueChanged(expand =>
+            {
+                scalables = InternalChildren.ToList();
+
+                if (!expand.NewValue)
+                    scalables.Remove(hitCircleText);
+            }, true);
         }
 
         private void updateState(ValueChangedEvent<ArmedState> state)
@@ -75,7 +97,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             {
                 case ArmedState.Hit:
                     this.FadeOut(legacy_fade_duration, Easing.Out);
-                    this.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+                    scalables.ForEach(d => d.ScaleTo(1.4f, legacy_fade_duration, Easing.Out));
                     break;
             }
         }

From ef8f9aa276f9359b1c1f81df3644f52917b7dbfb Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 1 Oct 2019 08:43:03 +0300
Subject: [PATCH 00060/10326] Fix possible nullref exception

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 15c768fff9..bd4cb1f112 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.ApplySkin(skin, allowFallback);
 
-            expandNumberPiece.Value = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece).Value;
+            expandNumberPiece.Value = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece)?.Value ?? false;
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)

From 957bbee3e4eb4569310eacf11c59f7e167795efe Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Thu, 3 Oct 2019 05:58:20 +0300
Subject: [PATCH 00061/10326] Scale pieces individually and use skin source
 directly

---
 .../Objects/Drawables/DrawableHitCircle.cs    | 11 -------
 .../Skinning/LegacyMainCirclePiece.cs         | 30 ++++++++-----------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index bd4cb1f112..c37535521d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -21,10 +21,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public ApproachCircle ApproachCircle { get; }
 
-        public IBindable<bool> ExpandNumberPiece => expandNumberPiece;
-
-        private readonly BindableBool expandNumberPiece = new BindableBool();
-
         private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
         private readonly IBindable<int> stackHeightBindable = new Bindable<int>();
         private readonly IBindable<float> scaleBindable = new Bindable<float>();
@@ -111,13 +107,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        protected override void ApplySkin(ISkinSource skin, bool allowFallback)
-        {
-            base.ApplySkin(skin, allowFallback);
-
-            expandNumberPiece.Value = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece)?.Value ?? false;
-        }
-
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             Debug.Assert(HitObject.HitWindows != null);
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index d93d0506c3..8ba21d9f89 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -14,8 +14,6 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -26,21 +24,21 @@ namespace osu.Game.Rulesets.Osu.Skinning
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
         }
 
-        private Sprite hitCircleSprite;
+        private Sprite hitCircleSprite, hitCircleOverlay;
         private SkinnableSpriteText hitCircleText;
 
-        private List<Drawable> scalables;
-
         private readonly IBindable<ArmedState> state = new Bindable<ArmedState>();
         private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
         private readonly IBindable<int> indexInCurrentCombo = new Bindable<int>();
-        private readonly IBindable<bool> expandNumberPiece = new BindableBool();
 
         [Resolved]
         private DrawableHitObject drawableObject { get; set; }
 
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        private void load()
         {
             OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
             DrawableHitCircle drawableCircle = (DrawableHitCircle)drawableObject;
@@ -59,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Font = OsuFont.Numeric.With(size: 40),
                     UseFullGlyphHeight = false,
                 }, confineMode: ConfineMode.NoScaling),
-                new Sprite
+                hitCircleOverlay = new Sprite
                 {
                     Texture = skin.GetTexture("hitcircleoverlay"),
                     Anchor = Anchor.Centre,
@@ -70,7 +68,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             state.BindTo(drawableObject.State);
             accentColour.BindTo(drawableObject.AccentColour);
             indexInCurrentCombo.BindTo(osuObject.IndexInCurrentComboBindable);
-            expandNumberPiece.BindTo(drawableCircle.ExpandNumberPiece);
         }
 
         protected override void LoadComplete()
@@ -80,13 +77,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             state.BindValueChanged(updateState, true);
             accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue, true);
             indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
-            expandNumberPiece.BindValueChanged(expand =>
-            {
-                scalables = InternalChildren.ToList();
-
-                if (!expand.NewValue)
-                    scalables.Remove(hitCircleText);
-            }, true);
         }
 
         private void updateState(ValueChangedEvent<ArmedState> state)
@@ -97,7 +87,13 @@ namespace osu.Game.Rulesets.Osu.Skinning
             {
                 case ArmedState.Hit:
                     this.FadeOut(legacy_fade_duration, Easing.Out);
-                    scalables.ForEach(d => d.ScaleTo(1.4f, legacy_fade_duration, Easing.Out));
+
+                    hitCircleSprite.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+                    hitCircleOverlay.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+
+                    if (skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece).Value)
+                        hitCircleText.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+
                     break;
             }
         }

From 023c4d64d811e1abc49655ba37b766568117333f Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Thu, 3 Oct 2019 06:00:22 +0300
Subject: [PATCH 00062/10326] Remove redundant using directive

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index c37535521d..4579e5cb59 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
-using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osuTK;

From a73f6c6a5a3dfc12518a85442732a4c2469d0535 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Thu, 3 Oct 2019 06:46:13 +0300
Subject: [PATCH 00063/10326] Specify version of osu!classic skin

---
 osu.Game/Skinning/DefaultLegacySkin.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 4b6eea6b6e..8370b5e8ee 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Skinning
                 new Color4(18, 124, 255, 255),
                 new Color4(242, 24, 57, 255),
             });
+
+            Configuration.ConfigDictionary["Version"] = "2";
         }
 
         public static SkinInfo Info { get; } = new SkinInfo

From 89075c5655618c70b2d05f4943a11dca18350b89 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Thu, 3 Oct 2019 06:48:07 +0300
Subject: [PATCH 00064/10326] Set version of not-configured skins to latest
 only

---
 osu.Game/Skinning/DefaultSkinConfiguration.cs | 9 +++++++--
 osu.Game/Skinning/LegacySkin.cs               | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/DefaultSkinConfiguration.cs b/osu.Game/Skinning/DefaultSkinConfiguration.cs
index 481360beb9..1d22ce8c1d 100644
--- a/osu.Game/Skinning/DefaultSkinConfiguration.cs
+++ b/osu.Game/Skinning/DefaultSkinConfiguration.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Skinning
     /// </summary>
     public class DefaultSkinConfiguration : SkinConfiguration
     {
-        public DefaultSkinConfiguration()
+        public DefaultSkinConfiguration(string version)
         {
             ComboColours.AddRange(new[]
             {
@@ -20,7 +20,12 @@ namespace osu.Game.Skinning
                 new Color4(121, 9, 13, 255)
             });
 
-            ConfigDictionary.Add(@"Version", "latest");
+            ConfigDictionary["Version"] = version;
+        }
+
+        public DefaultSkinConfiguration()
+            : this("1")
+        {
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 0b1076be01..0f80aade1e 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Skinning
                 using (StreamReader reader = new StreamReader(stream))
                     Configuration = new LegacySkinDecoder().Decode(reader);
             else
-                Configuration = new DefaultSkinConfiguration();
+                Configuration = new DefaultSkinConfiguration("latest");
 
             if (storage != null)
             {

From 3fe56117005f375a8dcbea223cd48a0365d0af85 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Thu, 3 Oct 2019 06:48:59 +0300
Subject: [PATCH 00065/10326] Retrieve numeric version value from legacy
 configuration

---
 .../Skinning/OsuLegacySkinTransformer.cs            |  3 +--
 osu.Game/Skinning/LegacySkin.cs                     | 13 +++++++++++++
 osu.Game/Skinning/LegacySkinConfiguration.cs        | 10 ++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Skinning/LegacySkinConfiguration.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index c9ed313593..539b3d7d34 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -125,8 +125,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                             break;
 
                         case OsuSkinConfiguration.ExpandNumberPiece:
-                            string legacyVersion = source.GetConfig<string, string>("Version")?.Value ?? "1";
-                            return SkinUtils.As<TValue>(new BindableBool(double.TryParse(legacyVersion, out double version) && version < 2.0));
+                            return SkinUtils.As<TValue>(new BindableBool(source.GetConfig<LegacySkinConfiguration, double>(LegacySkinConfiguration.LegacyVersion).Value < 2.0));
                     }
 
                     break;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 0f80aade1e..90265ec066 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -70,6 +70,19 @@ namespace osu.Game.Skinning
                 case GlobalSkinColour colour:
                     return SkinUtils.As<TValue>(getCustomColour(colour.ToString()));
 
+                case LegacySkinConfiguration legacy:
+                    switch (legacy)
+                    {
+                        case LegacySkinConfiguration.LegacyVersion:
+                            var versionString = GetConfig<string, string>("Version").Value;
+                            if (!double.TryParse(versionString, out double version))
+                                version = versionString == "latest" ? 2.7 : 1;
+
+                            return SkinUtils.As<TValue>(new BindableDouble(version));
+                    }
+
+                    break;
+
                 case SkinCustomColourLookup customColour:
                     return SkinUtils.As<TValue>(getCustomColour(customColour.Lookup.ToString()));
 
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
new file mode 100644
index 0000000000..2e75313d0c
--- /dev/null
+++ b/osu.Game/Skinning/LegacySkinConfiguration.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.Skinning
+{
+    public enum LegacySkinConfiguration
+    {
+        LegacyVersion,
+    }
+}

From dabc22403009b8d976ce4971c309ca4fea709cea Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Thu, 3 Oct 2019 06:49:32 +0300
Subject: [PATCH 00066/10326] Fix hit circle positioning

---
 osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 8ba21d9f89..705828131d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -56,7 +56,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 {
                     Font = OsuFont.Numeric.With(size: 40),
                     UseFullGlyphHeight = false,
-                }, confineMode: ConfineMode.NoScaling),
+                }, confineMode: ConfineMode.NoScaling)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
                 hitCircleOverlay = new Sprite
                 {
                     Texture = skin.GetTexture("hitcircleoverlay"),

From 2d7acef0800903e3d6f52ce98de724576f107bbf Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Thu, 3 Oct 2019 11:06:38 +0300
Subject: [PATCH 00067/10326] Fix CI issues

---
 osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs    | 4 +---
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs | 3 ++-
 osu.Game/Skinning/LegacySkin.cs                            | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 705828131d..89c8ea9d6c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -10,7 +10,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -41,7 +40,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private void load()
         {
             OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
-            DrawableHitCircle drawableCircle = (DrawableHitCircle)drawableObject;
 
             InternalChildren = new Drawable[]
             {
@@ -95,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     hitCircleSprite.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
                     hitCircleOverlay.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
 
-                    if (skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece).Value)
+                    if (skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece)?.Value ?? true)
                         hitCircleText.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
 
                     break;
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 539b3d7d34..1303e2cace 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -125,7 +125,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
                             break;
 
                         case OsuSkinConfiguration.ExpandNumberPiece:
-                            return SkinUtils.As<TValue>(new BindableBool(source.GetConfig<LegacySkinConfiguration, double>(LegacySkinConfiguration.LegacyVersion).Value < 2.0));
+                            double legacyVersion = source.GetConfig<LegacySkinConfiguration, double>(LegacySkinConfiguration.LegacyVersion)?.Value ?? 1.0;
+                            return SkinUtils.As<TValue>(new BindableBool(legacyVersion < 2.0));
                     }
 
                     break;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 90265ec066..af5309eecd 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -74,9 +74,9 @@ namespace osu.Game.Skinning
                     switch (legacy)
                     {
                         case LegacySkinConfiguration.LegacyVersion:
-                            var versionString = GetConfig<string, string>("Version").Value;
+                            var versionString = GetConfig<string, string>("Version")?.Value ?? "1";
                             if (!double.TryParse(versionString, out double version))
-                                version = versionString == "latest" ? 2.7 : 1;
+                                version = versionString == "latest" ? 2.7 : 1.0;
 
                             return SkinUtils.As<TValue>(new BindableDouble(version));
                     }

From 5d2fe8733997295bbbecee0cdbc947440e305d06 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Mon, 14 Oct 2019 00:38:45 +0300
Subject: [PATCH 00068/10326] Use empty hit windows for spinner ticks

---
 osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
index c2104e68ee..318e8e71a2 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
@@ -17,6 +17,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public override Judgement CreateJudgement() => new OsuSpinnerTickJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

From 68e370ce7cd72c51a7eda6f9863ed37b0f86b3d5 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Mon, 14 Oct 2019 00:39:20 +0300
Subject: [PATCH 00069/10326] Set spinner tick start time to allow result
 reverting

---
 .../Objects/Drawables/DrawableSpinnerTick.cs                | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 9c316591a9..21cf7b3acb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -44,6 +44,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Samples.AddAdjustment(AdjustableProperty.Volume, bonusSampleVolume);
         }
 
-        public void TriggerResult(HitResult result) => ApplyResult(r => r.Type = result);
+        public void TriggerResult(HitResult result)
+        {
+            HitObject.StartTime = Time.Current;
+            ApplyResult(r => r.Type = result);
+        }
     }
 }

From a75ae14cb20efca1673d863001736361c29c07f8 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Mon, 14 Oct 2019 00:40:36 +0300
Subject: [PATCH 00070/10326] Use foreach loop to avoid too long lines

---
 .../Objects/Drawables/DrawableSpinner.cs                 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 08e64b7ecf..965303ba7a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -12,7 +12,6 @@ using osu.Game.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
@@ -279,7 +278,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
 
             if (state != ArmedState.Idle)
-                Schedule(() => NestedHitObjects.Where(t => !t.IsHit).OfType<DrawableSpinnerTick>().ForEach(t => t.TriggerResult(HitResult.Miss)));
+            {
+                Schedule(() =>
+                {
+                    foreach (var tick in ticks.Where(t => !t.IsHit))
+                        tick.TriggerResult(HitResult.Miss);
+                });
+            }
         }
     }
 }

From a8514ecd0f220f39c214e13cd89409f1a6694c3e Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Mon, 14 Oct 2019 00:43:46 +0300
Subject: [PATCH 00071/10326] Add tests ensuring correct spinner ticks score
 results

---
 .../TestSceneSpinnerRotation.cs               | 45 ++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index cded7f0e95..b03788a7d6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -15,6 +15,8 @@ using osu.Game.Tests.Visual;
 using osuTK;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play;
 using static osu.Game.Tests.Visual.OsuTestScene.ClockBackedTestWorkingBeatmap;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -28,6 +30,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         protected override bool Autoplay => true;
 
+        protected override Player CreatePlayer(Ruleset ruleset) => new ScoreExposedPlayer();
+
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap)
         {
             var working = new ClockBackedTestWorkingBeatmap(beatmap, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
@@ -69,6 +73,32 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("is rotation absolute almost same", () => Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, estimatedRotation, 100));
         }
 
+        [Test]
+        public void TestSpinnerNormalBonusRewinding()
+        {
+            addSeekStep(1000);
+
+            AddAssert("player score matching expected bonus score", () =>
+            {
+                // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
+                var totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value * 2;
+                return totalScore == (int)(drawableSpinner.Disc.RotationAbsolute / 360) * 100;
+            });
+
+            addSeekStep(0);
+
+            AddAssert("player score is 0", () => ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value == 0);
+        }
+
+        [Test]
+        public void TestSpinnerCompleteBonusRewinding()
+        {
+            addSeekStep(2500);
+            addSeekStep(0);
+
+            AddAssert("player score is 0", () => ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value == 0);
+        }
+
         private void addSeekStep(double time)
         {
             AddStep($"seek to {time}", () => track.Seek(time));
@@ -85,12 +115,17 @@ namespace osu.Game.Rulesets.Osu.Tests
                     Position = new Vector2(256, 192),
                     EndTime = 5000,
                 },
-                // placeholder object to avoid hitting the results screen
-                new HitObject
-                {
-                    StartTime = 99999,
-                }
             }
         };
+
+        private class ScoreExposedPlayer : TestPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            public ScoreExposedPlayer()
+                : base(false, false)
+            {
+            }
+        }
     }
 }

From f54eb448fa245c2fde8e5b23b3f526f25560122a Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 15 Oct 2019 22:00:34 +0300
Subject: [PATCH 00072/10326] Revert skin legacy version changes

---
 osu.Game/Skinning/DefaultLegacySkin.cs        |  2 --
 osu.Game/Skinning/DefaultSkinConfiguration.cs |  9 +--------
 osu.Game/Skinning/LegacySkin.cs               | 15 +--------------
 osu.Game/Skinning/LegacySkinConfiguration.cs  | 10 ----------
 4 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 osu.Game/Skinning/LegacySkinConfiguration.cs

diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 8370b5e8ee..4b6eea6b6e 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Skinning
                 new Color4(18, 124, 255, 255),
                 new Color4(242, 24, 57, 255),
             });
-
-            Configuration.ConfigDictionary["Version"] = "2";
         }
 
         public static SkinInfo Info { get; } = new SkinInfo
diff --git a/osu.Game/Skinning/DefaultSkinConfiguration.cs b/osu.Game/Skinning/DefaultSkinConfiguration.cs
index 8c87e1d054..cd5975edac 100644
--- a/osu.Game/Skinning/DefaultSkinConfiguration.cs
+++ b/osu.Game/Skinning/DefaultSkinConfiguration.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Skinning
     /// </summary>
     public class DefaultSkinConfiguration : SkinConfiguration
     {
-        public DefaultSkinConfiguration(string version)
+        public DefaultSkinConfiguration()
         {
             ComboColours.AddRange(new[]
             {
@@ -19,13 +19,6 @@ namespace osu.Game.Skinning
                 new Color4(18, 124, 255, 255),
                 new Color4(242, 24, 57, 255),
             });
-
-            ConfigDictionary["Version"] = version;
-        }
-
-        public DefaultSkinConfiguration()
-            : this("1")
-        {
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index cbebdd9bd6..fea15458e4 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
                 using (LineBufferedReader reader = new LineBufferedReader(stream))
                     Configuration = new LegacySkinDecoder().Decode(reader);
             else
-                Configuration = new DefaultSkinConfiguration("latest");
+                Configuration = new DefaultSkinConfiguration();
 
             if (storage != null)
             {
@@ -71,19 +71,6 @@ namespace osu.Game.Skinning
                 case GlobalSkinColour colour:
                     return SkinUtils.As<TValue>(getCustomColour(colour.ToString()));
 
-                case LegacySkinConfiguration legacy:
-                    switch (legacy)
-                    {
-                        case LegacySkinConfiguration.LegacyVersion:
-                            var versionString = GetConfig<string, string>("Version")?.Value ?? "1";
-                            if (!double.TryParse(versionString, out double version))
-                                version = versionString == "latest" ? 2.7 : 1.0;
-
-                            return SkinUtils.As<TValue>(new BindableDouble(version));
-                    }
-
-                    break;
-
                 case SkinCustomColourLookup customColour:
                     return SkinUtils.As<TValue>(getCustomColour(customColour.Lookup.ToString()));
 
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
deleted file mode 100644
index 2e75313d0c..0000000000
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ /dev/null
@@ -1,10 +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.Skinning
-{
-    public enum LegacySkinConfiguration
-    {
-        LegacyVersion,
-    }
-}

From 9dcbef49d300458c897f3f40c77c9dddaf3bb5b4 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 15 Oct 2019 22:28:50 +0300
Subject: [PATCH 00073/10326] Resolve DHO inside load()

---
 osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 89c8ea9d6c..f9e6400b18 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -30,14 +30,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
         private readonly IBindable<int> indexInCurrentCombo = new Bindable<int>();
 
-        [Resolved]
-        private DrawableHitObject drawableObject { get; set; }
-
         [Resolved]
         private ISkinSource skin { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(DrawableHitObject drawableObject)
         {
             OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
 

From 10e1e512fd45abf199bea01c8d70ebfa2337df4c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 12 Dec 2019 15:15:16 +0300
Subject: [PATCH 00074/10326] Update the nested hitobject logic inline with new
 implementation

---
 .../Objects/Drawables/DrawableSpinner.cs      | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 39330f08c3..2c21b4244a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -15,6 +15,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;
 
@@ -131,16 +132,37 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Alpha = 0,
                 }
             };
+        }
 
-            foreach (var tick in Spinner.NestedHitObjects.OfType<SpinnerTick>())
+        protected override void AddNestedHitObject(DrawableHitObject hitObject)
+        {
+            base.AddNestedHitObject(hitObject);
+
+            switch (hitObject)
             {
-                var drawableTick = new DrawableSpinnerTick(tick);
-
-                ticks.Add(drawableTick);
-                AddNestedHitObject(drawableTick);
+                case DrawableSpinnerTick tick:
+                    ticks.Add(tick);
+                    break;
             }
         }
 
+        protected override void ClearNestedHitObjects()
+        {
+            base.ClearNestedHitObjects();
+            ticks.Clear();
+        }
+
+        protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case SpinnerTick tick:
+                    return new DrawableSpinnerTick(tick);
+            }
+
+            return base.CreateNestedHitObject(hitObject);
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {

From d6fb2283385c9cec966d01dcf684cb402ab1e7e1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 12 Dec 2019 16:02:53 +0300
Subject: [PATCH 00075/10326] Update version retrieval logic in-line with new
 implementation

---
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 1303e2cace..1c716b3ee9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Skinning;
 using osuTK;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -125,8 +126,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
                             break;
 
                         case OsuSkinConfiguration.ExpandNumberPiece:
-                            double legacyVersion = source.GetConfig<LegacySkinConfiguration, double>(LegacySkinConfiguration.LegacyVersion)?.Value ?? 1.0;
-                            return SkinUtils.As<TValue>(new BindableBool(legacyVersion < 2.0));
+                            decimal legacyVersion = source.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value ?? 1.0m;
+                            return SkinUtils.As<TValue>(new BindableBool(legacyVersion < 2.0m));
                     }
 
                     break;

From c06e558f874fe975502894658617d00214731777 Mon Sep 17 00:00:00 2001
From: unknown <n20gaming2000@gmail.com>
Date: Sun, 15 Dec 2019 18:12:37 +0800
Subject: [PATCH 00076/10326] add setting to start fully wounded

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 133f9ceb39..d21990ae91 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The final speed to ramp to")]
         public abstract BindableNumber<double> FinalRate { get; }
 
+        [SettingSource("Start wounded", "Start at 100% of the final rate")]
+        public BindableBool Reverse { get; } = new BindableBool();
+
         private double finalRateTime;
         private double beginRampTime;
 
@@ -61,7 +64,10 @@ namespace osu.Game.Rulesets.Mods
 
         public virtual void Update(Playfield playfield)
         {
-            applyAdjustment((track.CurrentTime - beginRampTime) / finalRateTime);
+            if (!Reverse.Value)
+                applyAdjustment((track.CurrentTime - beginRampTime) / finalRateTime);
+            else
+                applyAdjustment(1 - ((track.CurrentTime - beginRampTime) / finalRateTime));
         }
 
         /// <summary>

From 41ca084fa591253d6406253c76cef99cc1196305 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Tue, 17 Dec 2019 22:00:21 +0300
Subject: [PATCH 00077/10326] Simplify expand number check

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

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 1c716b3ee9..5926332ea5 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -126,8 +126,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
                             break;
 
                         case OsuSkinConfiguration.ExpandNumberPiece:
-                            decimal legacyVersion = source.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value ?? 1.0m;
-                            return SkinUtils.As<TValue>(new BindableBool(legacyVersion < 2.0m));
+                            bool expand = source.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value < 2.0m;
+                            return SkinUtils.As<TValue>(new BindableBool(expand));
                     }
 
                     break;

From 121ce2c3df5b95f48fec3546caee2e0d257b1d8b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 19 Dec 2019 14:44:52 +0300
Subject: [PATCH 00078/10326] Fix checking for expand incorrectly

---
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 5926332ea5..3e41dc08d7 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                             break;
 
                         case OsuSkinConfiguration.ExpandNumberPiece:
-                            bool expand = source.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value < 2.0m;
+                            bool expand = !(source.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value >= 2.0m);
                             return SkinUtils.As<TValue>(new BindableBool(expand));
                     }
 

From c69e88eb97b90c73b3e2dcd2bebe18c8aa4b8540 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Dec 2019 13:32:25 +0300
Subject: [PATCH 00079/10326] Add more types to dropdown

---
 osu.Game/Configuration/ScoreMeterType.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Configuration/ScoreMeterType.cs b/osu.Game/Configuration/ScoreMeterType.cs
index b85ef9309d..156c4b1377 100644
--- a/osu.Game/Configuration/ScoreMeterType.cs
+++ b/osu.Game/Configuration/ScoreMeterType.cs
@@ -18,5 +18,14 @@ namespace osu.Game.Configuration
 
         [Description("Hit Error (both)")]
         HitErrorBoth,
+
+        [Description("Colour (left)")]
+        ColourLeft,
+
+        [Description("Colour (right)")]
+        ColourRight,
+
+        [Description("Colour (both)")]
+        ColourBoth,
     }
 }

From 5b115d8d8a94fff0f265d8a5aba113c0c1b1ad53 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Dec 2019 13:41:50 +0300
Subject: [PATCH 00080/10326] Implement basic logic

---
 osu.Game/Screens/Play/HUD/HitErrorDisplay.cs  | 31 +++++++++++++++++
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 33 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs

diff --git a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
index 6196ce4026..4d28f00f39 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
@@ -77,6 +77,19 @@ namespace osu.Game.Screens.Play.HUD
                 case ScoreMeterType.HitErrorRight:
                     createBar(true);
                     break;
+
+                case ScoreMeterType.ColourBoth:
+                    createColour(false);
+                    createColour(true);
+                    break;
+
+                case ScoreMeterType.ColourLeft:
+                    createColour(false);
+                    break;
+
+                case ScoreMeterType.ColourRight:
+                    createColour(true);
+                    break;
             }
         }
 
@@ -90,6 +103,24 @@ namespace osu.Game.Screens.Play.HUD
                 Alpha = 0,
             };
 
+            completeDisplayLoading(display);
+        }
+
+        private void createColour(bool rightAligned)
+        {
+            var display = new ColourHitErrorMeter(hitWindows)
+            {
+                Margin = new MarginPadding(margin),
+                Anchor = rightAligned ? Anchor.CentreRight : Anchor.CentreLeft,
+                Origin = rightAligned ? Anchor.CentreRight : Anchor.CentreLeft,
+                Alpha = 0,
+            };
+
+            completeDisplayLoading(display);
+        }
+
+        private void completeDisplayLoading(HitErrorMeter display)
+        {
             Add(display);
             display.FadeInFromZero(fade_duration, Easing.OutQuint);
         }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
new file mode 100644
index 0000000000..95d4940b17
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.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.Linq;
+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;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Play.HUD.HitErrorMeters
+{
+    public class ColourHitErrorMeter : HitErrorMeter
+    {
+        public ColourHitErrorMeter(HitWindows hitWindows)
+            : base(hitWindows)
+        {
+
+        }
+
+        public override void OnNewJudgement(JudgementResult judgement)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}

From 5e3c3f2a90190b9a785800627b44e4af136d6dba Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Dec 2019 14:30:41 +0300
Subject: [PATCH 00081/10326] Make judgements work

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 70 +++++++++++++++++--
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 95d4940b17..41401a0048 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -1,33 +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.Linq;
 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;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
     public class ColourHitErrorMeter : HitErrorMeter
     {
+        private const int bar_height = 200;
+
+        private readonly FillFlowContainer judgementsFlow;
+
         public ColourHitErrorMeter(HitWindows hitWindows)
             : base(hitWindows)
         {
-
+            AutoSizeAxes = Axes.Both;
+            InternalChild = judgementsFlow = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.X,
+                Height = bar_height,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 2),
+                Masking = true,
+            };
         }
 
         public override void OnNewJudgement(JudgementResult judgement)
         {
-            throw new System.NotImplementedException();
+            judgementsFlow.Add(new DrawableJudgement(HitWindows.ResultFor(judgement.TimeOffset)));
+        }
+
+        private class DrawableJudgement : CircularContainer
+        {
+            private readonly Box background;
+            private readonly HitResult result;
+
+            public DrawableJudgement(HitResult result)
+            {
+                this.result = result;
+
+                Masking = true;
+                Size = new Vector2(8);
+                Child = background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                switch (result)
+                {
+                    case HitResult.Miss:
+                        background.Colour = colours.Red;
+                        break;
+
+                    case HitResult.Meh:
+                        background.Colour = colours.Yellow;
+                        break;
+
+                    case HitResult.Ok:
+                        background.Colour = colours.Green;
+                        break;
+
+                    case HitResult.Good:
+                        background.Colour = colours.GreenLight;
+                        break;
+
+                    case HitResult.Great:
+                        background.Colour = colours.Blue;
+                        break;
+
+                    default:
+                        background.Colour = colours.BlueLight;
+                        break;
+                }
+            }
         }
     }
 }

From 5af126009488554a4322fa292c24e39f8ef0f898 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Dec 2019 14:30:49 +0300
Subject: [PATCH 00082/10326] Improve testing

---
 ...rrorMeter.cs => TestSceneHitErrorMeter.cs} | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestSceneBarHitErrorMeter.cs => TestSceneHitErrorMeter.cs} (75%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBarHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
similarity index 75%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneBarHitErrorMeter.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index e3688c276f..b208a2e0e7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBarHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -19,18 +19,22 @@ using osu.Game.Screens.Play.HUD.HitErrorMeters;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneBarHitErrorMeter : OsuTestScene
+    public class TestSceneHitErrorMeter : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(HitErrorMeter),
+            typeof(BarHitErrorMeter),
+            typeof(ColourHitErrorMeter)
         };
 
-        private HitErrorMeter meter;
-        private HitErrorMeter meter2;
+        private BarHitErrorMeter barMeter;
+        private BarHitErrorMeter barMeter2;
+        private ColourHitErrorMeter colourMeter;
+        private ColourHitErrorMeter colourMeter2;
         private HitWindows hitWindows;
 
-        public TestSceneBarHitErrorMeter()
+        public TestSceneHitErrorMeter()
         {
             recreateDisplay(new OsuHitWindows(), 5);
 
@@ -91,17 +95,31 @@ namespace osu.Game.Tests.Visual.Gameplay
                 }
             });
 
-            Add(meter = new BarHitErrorMeter(hitWindows, true)
+            Add(barMeter = new BarHitErrorMeter(hitWindows, true)
             {
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreRight,
             });
 
-            Add(meter2 = new BarHitErrorMeter(hitWindows, false)
+            Add(barMeter2 = new BarHitErrorMeter(hitWindows, false)
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
             });
+
+            Add(colourMeter = new ColourHitErrorMeter(hitWindows)
+            {
+                Anchor = Anchor.CentreRight,
+                Origin = Anchor.CentreRight,
+                Margin = new MarginPadding { Right = 50 }
+            });
+
+            Add(colourMeter2 = new ColourHitErrorMeter(hitWindows)
+            {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Margin = new MarginPadding { Left = 50 }
+            });
         }
 
         private void newJudgement(double offset = 0)
@@ -112,8 +130,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Type = HitResult.Perfect,
             };
 
-            meter.OnNewJudgement(judgement);
-            meter2.OnNewJudgement(judgement);
+            barMeter.OnNewJudgement(judgement);
+            barMeter2.OnNewJudgement(judgement);
+            colourMeter.OnNewJudgement(judgement);
+            colourMeter2.OnNewJudgement(judgement);
         }
     }
 }

From b61aa660c63f0e126f32643ef17e7bb458d2a1ae Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Dec 2019 14:52:53 +0300
Subject: [PATCH 00083/10326] Move colours to HitErrorMeter class

---
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    | 25 +---------
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 46 ++-----------------
 .../Play/HUD/HitErrorMeters/HitErrorMeter.cs  | 30 ++++++++++++
 3 files changed, 37 insertions(+), 64 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 03a0f23fb6..208bdd17ad 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -163,30 +163,9 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             centre.Width = 2.5f;
             colourBars.Add(centre);
 
-            Color4 getColour(HitResult result)
-            {
-                switch (result)
-                {
-                    case HitResult.Meh:
-                        return colours.Yellow;
-
-                    case HitResult.Ok:
-                        return colours.Green;
-
-                    case HitResult.Good:
-                        return colours.GreenLight;
-
-                    case HitResult.Great:
-                        return colours.Blue;
-
-                    default:
-                        return colours.BlueLight;
-                }
-            }
-
             Drawable createColourBar(HitResult result, float height, bool first = false)
             {
-                var colour = getColour(result);
+                var colour = GetColourForHitResult(result);
 
                 if (first)
                 {
@@ -201,7 +180,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = getColour(result),
+                                Colour = colour,
                                 Height = height * gradient_start
                             },
                             new Box
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 41401a0048..6775b98f84 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
@@ -34,56 +33,21 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         public override void OnNewJudgement(JudgementResult judgement)
         {
-            judgementsFlow.Add(new DrawableJudgement(HitWindows.ResultFor(judgement.TimeOffset)));
+            judgementsFlow.Add(new DrawableJudgement(GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset))));
         }
 
         private class DrawableJudgement : CircularContainer
         {
-            private readonly Box background;
-            private readonly HitResult result;
-
-            public DrawableJudgement(HitResult result)
+            public DrawableJudgement(Color4 colour)
             {
-                this.result = result;
-
                 Masking = true;
                 Size = new Vector2(8);
-                Child = background = new Box
+                Child = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Colour = colour
                 };
             }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                switch (result)
-                {
-                    case HitResult.Miss:
-                        background.Colour = colours.Red;
-                        break;
-
-                    case HitResult.Meh:
-                        background.Colour = colours.Yellow;
-                        break;
-
-                    case HitResult.Ok:
-                        background.Colour = colours.Green;
-                        break;
-
-                    case HitResult.Good:
-                        background.Colour = colours.GreenLight;
-                        break;
-
-                    case HitResult.Great:
-                        background.Colour = colours.Blue;
-                        break;
-
-                    default:
-                        background.Colour = colours.BlueLight;
-                        break;
-                }
-            }
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index dee25048ed..b3edfdedec 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.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 osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
@@ -11,11 +14,38 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
     {
         protected readonly HitWindows HitWindows;
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         protected HitErrorMeter(HitWindows hitWindows)
         {
             HitWindows = hitWindows;
         }
 
         public abstract void OnNewJudgement(JudgementResult judgement);
+
+        protected Color4 GetColourForHitResult(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.Miss:
+                    return colours.Red;
+
+                case HitResult.Meh:
+                    return colours.Yellow;
+
+                case HitResult.Ok:
+                    return colours.Green;
+
+                case HitResult.Good:
+                    return colours.GreenLight;
+
+                case HitResult.Great:
+                    return colours.Blue;
+
+                default:
+                    return colours.BlueLight;
+            }
+        }
     }
 }

From 14a77a8f16d849483a59c68cf726e7784966052a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Dec 2019 16:08:28 +0300
Subject: [PATCH 00084/10326] Improve animations

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 83 +++++++++++++++----
 1 file changed, 69 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 6775b98f84..649f29810e 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.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 System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -13,35 +17,86 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
     public class ColourHitErrorMeter : HitErrorMeter
     {
-        private const int bar_height = 200;
+        private const int max_available_judgements = 20;
 
-        private readonly FillFlowContainer judgementsFlow;
+        private readonly JudgementFlow judgementsFlow;
+        private readonly BindableList<(Color4 colour, JudgementResult result)> judgements = new BindableList<(Color4 colour, JudgementResult result)>();
 
         public ColourHitErrorMeter(HitWindows hitWindows)
             : base(hitWindows)
         {
             AutoSizeAxes = Axes.Both;
-            InternalChild = judgementsFlow = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.X,
-                Height = bar_height,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 2),
-                Masking = true,
-            };
+            InternalChild = judgementsFlow = new JudgementFlow();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            judgementsFlow.Judgements.BindTo(judgements);
         }
 
         public override void OnNewJudgement(JudgementResult judgement)
         {
-            judgementsFlow.Add(new DrawableJudgement(GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset))));
+            judgements.Add((GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)), judgement));
+
+            if (judgements.Count > max_available_judgements)
+                judgements.RemoveAt(0);
         }
 
-        private class DrawableJudgement : CircularContainer
+        private class JudgementFlow : Container<DrawableResult>
         {
-            public DrawableJudgement(Color4 colour)
+            private const int drawable_judgement_size = 8;
+            private const int spacing = 2;
+            private const int animation_duration = 200;
+
+            public readonly BindableList<(Color4 colour, JudgementResult result)> Judgements = new BindableList<(Color4 colour, JudgementResult result)>();
+
+            public JudgementFlow()
             {
+                AutoSizeAxes = Axes.X;
+                Height = max_available_judgements * (drawable_judgement_size + spacing);
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                Judgements.ItemsAdded += push;
+                Judgements.ItemsRemoved += pop;
+            }
+
+            private void push(IEnumerable<(Color4 colour, JudgementResult result)> judgements)
+            {
+                Children.ForEach(c => c.FinishTransforms());
+
+                var (colour, result) = judgements.Single();
+                var drawableJudgement = new DrawableResult(colour, result, drawable_judgement_size)
+                {
+                    Alpha = 0,
+                    Y = -(drawable_judgement_size + spacing)
+                };
+
+                Add(drawableJudgement);
+                drawableJudgement.FadeInFromZero(animation_duration, Easing.OutQuint);
+
+                Children.ForEach(c => c.MoveToOffset(new Vector2(0, drawable_judgement_size + spacing), animation_duration, Easing.OutQuint));
+            }
+
+            private void pop(IEnumerable<(Color4 colour, JudgementResult result)> judgements)
+            {
+                Children.FirstOrDefault(c => c.Result == judgements.Single().result).FadeOut(animation_duration, Easing.OutQuint).Expire();
+            }
+        }
+
+        private class DrawableResult : CircularContainer
+        {
+            public JudgementResult Result { get; private set; }
+
+            public DrawableResult(Color4 colour, JudgementResult result, int size)
+            {
+                Result = result;
+
                 Masking = true;
-                Size = new Vector2(8);
+                Size = new Vector2(size);
                 Child = new Box
                 {
                     RelativeSizeAxes = Axes.Both,

From 46501cf0ac2984537d8a96b885fc87804d4ece15 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Dec 2019 03:06:57 +0300
Subject: [PATCH 00085/10326] Use FillFlowContainer

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 649f29810e..d730a8d321 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -43,7 +42,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 judgements.RemoveAt(0);
         }
 
-        private class JudgementFlow : Container<DrawableResult>
+        private class JudgementFlow : FillFlowContainer<DrawableResult>
         {
             private const int drawable_judgement_size = 8;
             private const int spacing = 2;
@@ -51,10 +50,16 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
             public readonly BindableList<(Color4 colour, JudgementResult result)> Judgements = new BindableList<(Color4 colour, JudgementResult result)>();
 
+            private int runningDepth;
+
             public JudgementFlow()
             {
                 AutoSizeAxes = Axes.X;
                 Height = max_available_judgements * (drawable_judgement_size + spacing);
+                Spacing = new Vector2(0, spacing);
+                Direction = FillDirection.Vertical;
+                LayoutDuration = animation_duration;
+                LayoutEasing = Easing.OutQuint;
             }
 
             protected override void LoadComplete()
@@ -66,24 +71,20 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
             private void push(IEnumerable<(Color4 colour, JudgementResult result)> judgements)
             {
-                Children.ForEach(c => c.FinishTransforms());
-
                 var (colour, result) = judgements.Single();
                 var drawableJudgement = new DrawableResult(colour, result, drawable_judgement_size)
                 {
                     Alpha = 0,
-                    Y = -(drawable_judgement_size + spacing)
                 };
 
-                Add(drawableJudgement);
+                Insert(runningDepth--, drawableJudgement);
                 drawableJudgement.FadeInFromZero(animation_duration, Easing.OutQuint);
-
-                Children.ForEach(c => c.MoveToOffset(new Vector2(0, drawable_judgement_size + spacing), animation_duration, Easing.OutQuint));
             }
 
             private void pop(IEnumerable<(Color4 colour, JudgementResult result)> judgements)
             {
-                Children.FirstOrDefault(c => c.Result == judgements.Single().result).FadeOut(animation_duration, Easing.OutQuint).Expire();
+                var (colour, result) = judgements.Single();
+                Children.FirstOrDefault(c => c.Result == result).FadeOut(animation_duration, Easing.OutQuint).Expire();
             }
         }
 

From eb75c6c70f342ff84d50b038af92e6873f1d080c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Dec 2019 03:17:56 +0300
Subject: [PATCH 00086/10326] Update FadeIn animation for new judgement

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index d730a8d321..b76f2c7817 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
     public class ColourHitErrorMeter : HitErrorMeter
     {
         private const int max_available_judgements = 20;
+        private const int animation_duration = 200;
 
         private readonly JudgementFlow judgementsFlow;
         private readonly BindableList<(Color4 colour, JudgementResult result)> judgements = new BindableList<(Color4 colour, JudgementResult result)>();
@@ -46,7 +47,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             private const int drawable_judgement_size = 8;
             private const int spacing = 2;
-            private const int animation_duration = 200;
 
             public readonly BindableList<(Color4 colour, JudgementResult result)> Judgements = new BindableList<(Color4 colour, JudgementResult result)>();
 
@@ -72,13 +72,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             private void push(IEnumerable<(Color4 colour, JudgementResult result)> judgements)
             {
                 var (colour, result) = judgements.Single();
-                var drawableJudgement = new DrawableResult(colour, result, drawable_judgement_size)
-                {
-                    Alpha = 0,
-                };
-
-                Insert(runningDepth--, drawableJudgement);
-                drawableJudgement.FadeInFromZero(animation_duration, Easing.OutQuint);
+                Insert(runningDepth--, new DrawableResult(colour, result, drawable_judgement_size));
             }
 
             private void pop(IEnumerable<(Color4 colour, JudgementResult result)> judgements)
@@ -88,22 +82,37 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             }
         }
 
-        private class DrawableResult : CircularContainer
+        private class DrawableResult : Container
         {
             public JudgementResult Result { get; private set; }
 
+            private readonly CircularContainer content;
+
             public DrawableResult(Color4 colour, JudgementResult result, int size)
             {
                 Result = result;
 
-                Masking = true;
                 Size = new Vector2(size);
-                Child = new Box
+                Child = content = new CircularContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colour
+                    Masking = true,
+                    Alpha = 0,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colour
+                    },
                 };
             }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                content.FadeInFromZero(animation_duration, Easing.OutQuint);
+                content.MoveToY(-DrawSize.Y);
+                content.MoveToY(0, animation_duration, Easing.OutQuint);
+            }
         }
     }
 }

From aded12af9e157ea0535dfbf8da48ed7fe3a8c2f0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Dec 2019 03:30:17 +0300
Subject: [PATCH 00087/10326] Refactoor to avoid bindable usage

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 54 ++++++-------------
 1 file changed, 15 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index b76f2c7817..196eb23da6 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -1,9 +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 System.Linq;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -16,11 +14,9 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
     public class ColourHitErrorMeter : HitErrorMeter
     {
-        private const int max_available_judgements = 20;
         private const int animation_duration = 200;
 
         private readonly JudgementFlow judgementsFlow;
-        private readonly BindableList<(Color4 colour, JudgementResult result)> judgements = new BindableList<(Color4 colour, JudgementResult result)>();
 
         public ColourHitErrorMeter(HitWindows hitWindows)
             : base(hitWindows)
@@ -29,69 +25,43 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             InternalChild = judgementsFlow = new JudgementFlow();
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            judgementsFlow.Judgements.BindTo(judgements);
-        }
-
-        public override void OnNewJudgement(JudgementResult judgement)
-        {
-            judgements.Add((GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)), judgement));
-
-            if (judgements.Count > max_available_judgements)
-                judgements.RemoveAt(0);
-        }
+        public override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
 
         private class JudgementFlow : FillFlowContainer<DrawableResult>
         {
+            private const int max_available_judgements = 20;
             private const int drawable_judgement_size = 8;
             private const int spacing = 2;
 
-            public readonly BindableList<(Color4 colour, JudgementResult result)> Judgements = new BindableList<(Color4 colour, JudgementResult result)>();
-
             private int runningDepth;
 
             public JudgementFlow()
             {
                 AutoSizeAxes = Axes.X;
-                Height = max_available_judgements * (drawable_judgement_size + spacing);
+                Height = max_available_judgements * (drawable_judgement_size + spacing) - spacing;
                 Spacing = new Vector2(0, spacing);
                 Direction = FillDirection.Vertical;
                 LayoutDuration = animation_duration;
                 LayoutEasing = Easing.OutQuint;
             }
 
-            protected override void LoadComplete()
+            public void Push(Color4 colour)
             {
-                base.LoadComplete();
-                Judgements.ItemsAdded += push;
-                Judgements.ItemsRemoved += pop;
-            }
+                Insert(runningDepth--, new DrawableResult(colour, drawable_judgement_size));
 
-            private void push(IEnumerable<(Color4 colour, JudgementResult result)> judgements)
-            {
-                var (colour, result) = judgements.Single();
-                Insert(runningDepth--, new DrawableResult(colour, result, drawable_judgement_size));
-            }
-
-            private void pop(IEnumerable<(Color4 colour, JudgementResult result)> judgements)
-            {
-                var (colour, result) = judgements.Single();
-                Children.FirstOrDefault(c => c.Result == result).FadeOut(animation_duration, Easing.OutQuint).Expire();
+                if (Children.Count > max_available_judgements)
+                    Children.FirstOrDefault(c => !c.IsRemoved).Remove();
             }
         }
 
         private class DrawableResult : Container
         {
-            public JudgementResult Result { get; private set; }
+            public bool IsRemoved { get; private set; }
 
             private readonly CircularContainer content;
 
-            public DrawableResult(Color4 colour, JudgementResult result, int size)
+            public DrawableResult(Color4 colour, int size)
             {
-                Result = result;
-
                 Size = new Vector2(size);
                 Child = content = new CircularContainer
                 {
@@ -113,6 +83,12 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 content.MoveToY(-DrawSize.Y);
                 content.MoveToY(0, animation_duration, Easing.OutQuint);
             }
+
+            public void Remove()
+            {
+                IsRemoved = true;
+                this.FadeOut(animation_duration, Easing.OutQuint).Expire();
+            }
         }
     }
 }

From 7a0d76ae77e5b830f158dcde6bfdb80797165e70 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Dec 2019 03:41:19 +0300
Subject: [PATCH 00088/10326] Fix nullref

---
 osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 196eb23da6..d18f6f3743 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 Insert(runningDepth--, new DrawableResult(colour, drawable_judgement_size));
 
                 if (Children.Count > max_available_judgements)
-                    Children.FirstOrDefault(c => !c.IsRemoved).Remove();
+                    Children.FirstOrDefault(c => !c.IsRemoved)?.Remove();
             }
         }
 

From 949ab4e0d3889e4ea88850b49715c1e3f8cc46d2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 25 Dec 2019 05:34:12 +0300
Subject: [PATCH 00089/10326] Move spinner bonus scoring to it's own component
 class

Also fixes counter rewinding issue and does optimizations.
---
 .../Objects/Drawables/DrawableSpinner.cs      | 42 +--------
 .../Objects/Drawables/DrawableSpinnerTick.cs  | 10 ++-
 .../Drawables/Pieces/SpinnerBonusComponent.cs | 90 +++++++++++++++++++
 3 files changed, 100 insertions(+), 42 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index f7f4275d2a..86e8840425 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -26,11 +26,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected readonly Spinner Spinner;
 
         private readonly Container<DrawableSpinnerTick> ticks;
-        private readonly OsuSpriteText bonusCounter;
 
         public readonly SpinnerDisc Disc;
         public readonly SpinnerTicks Ticks;
         public readonly SpinnerSpmCounter SpmCounter;
+        private readonly SpinnerBonusComponent bonusComponent;
 
         private readonly Container mainContainer;
 
@@ -123,13 +123,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Y = 120,
                     Alpha = 0
                 },
-                bonusCounter = new OsuSpriteText
+                bonusComponent = new SpinnerBonusComponent(this, ticks)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Y = -120,
-                    Font = OsuFont.Numeric.With(size: 24),
-                    Alpha = 0,
                 }
             };
         }
@@ -226,8 +224,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.Update();
         }
 
-        private int currentSpins;
-
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
@@ -235,30 +231,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             circle.Rotation = Disc.Rotation;
             Ticks.Rotation = Disc.Rotation;
             SpmCounter.SetRotation(Disc.RotationAbsolute);
-
-            var newSpins = (int)(Disc.RotationAbsolute / 360) - currentSpins;
-
-            for (int i = currentSpins; i < currentSpins + newSpins; i++)
-            {
-                if (i < 0 || i >= ticks.Count)
-                    break;
-
-                var tick = ticks[i];
-
-                tick.HasBonusPoints = Progress >= 1 && i > Spinner.SpinsRequired;
-
-                if (tick.HasBonusPoints)
-                {
-                    bonusCounter.Text = $"{(i - Spinner.SpinsRequired) * 1000}";
-                    bonusCounter
-                        .FadeOutFromOne(1500)
-                        .ScaleTo(1.5f).ScaleTo(1f, 1000, Easing.OutQuint);
-                }
-
-                tick.TriggerResult(HitResult.Great);
-            }
-
-            currentSpins += newSpins;
+            bonusComponent.UpdateRotation(Disc.RotationAbsolute);
 
             float relativeCircleScale = Spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight;
             Disc.ScaleTo(relativeCircleScale + (1 - relativeCircleScale) * Progress, 200, Easing.OutQuint);
@@ -299,15 +272,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     sequence.ScaleTo(Scale * 0.8f, 320, Easing.In);
                     break;
             }
-
-            if (state != ArmedState.Idle)
-            {
-                Schedule(() =>
-                {
-                    foreach (var tick in ticks.Where(t => !t.IsHit))
-                        tick.TriggerResult(HitResult.Miss);
-                });
-            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 21cf7b3acb..6512a9526e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         /// <summary>
         /// Whether this judgement has a bonus of 1,000 points additional to the numeric result.
-        /// Should be set when a spin occured after the spinner has completed.
+        /// Set when a spin occured after the spinner has completed.
         /// </summary>
         public bool HasBonusPoints
         {
@@ -44,10 +44,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Samples.AddAdjustment(AdjustableProperty.Volume, bonusSampleVolume);
         }
 
-        public void TriggerResult(HitResult result)
+        /// <summary>
+        /// Apply a judgement result.
+        /// </summary>
+        /// <param name="hit">Whether to apply a <see cref="HitResult.Great"/> result, <see cref="HitResult.Miss"/> otherwise.</param>
+        internal void TriggerResult(bool hit)
         {
             HitObject.StartTime = Time.Current;
-            ApplyResult(r => r.Type = result);
+            ApplyResult(r => r.Type = hit ? HitResult.Great : HitResult.Miss);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs
new file mode 100644
index 0000000000..5c96751b3a
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs
@@ -0,0 +1,90 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+{
+    /// <summary>
+    /// A component that tracks spinner spins and add bonus score for it.
+    /// </summary>
+    public class SpinnerBonusComponent : CompositeDrawable
+    {
+        private readonly DrawableSpinner drawableSpinner;
+        private readonly Container<DrawableSpinnerTick> ticks;
+        private readonly OsuSpriteText bonusCounter;
+
+        public SpinnerBonusComponent(DrawableSpinner drawableSpinner, Container<DrawableSpinnerTick> ticks)
+        {
+            this.drawableSpinner = drawableSpinner;
+            this.ticks = ticks;
+
+            drawableSpinner.OnNewResult += onNewResult;
+
+            AutoSizeAxes = Axes.Both;
+            InternalChild = bonusCounter = new OsuSpriteText
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Font = OsuFont.Numeric.With(size: 24),
+                Alpha = 0,
+            };
+        }
+
+        private int currentSpins;
+
+        public void UpdateRotation(double rotation)
+        {
+            if (ticks.Count == 0)
+                return;
+
+            int spinsRequired = ((Spinner)drawableSpinner.HitObject).SpinsRequired;
+
+            int newSpins = Math.Clamp((int)(rotation / 360), 0, ticks.Count - 1);
+            int direction = Math.Sign(newSpins - currentSpins);
+
+            while (currentSpins != newSpins)
+            {
+                var tick = ticks[currentSpins];
+
+                if (direction >= 0)
+                {
+                    tick.HasBonusPoints = currentSpins > spinsRequired;
+                    tick.TriggerResult(true);
+                }
+
+                if (tick.HasBonusPoints)
+                {
+                    bonusCounter.Text = $"{1000 * (currentSpins - spinsRequired)}";
+                    bonusCounter.FadeOutFromOne(1500);
+                    bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+                }
+
+                currentSpins += direction;
+            }
+        }
+
+        private void onNewResult(DrawableHitObject hitObject, JudgementResult result)
+        {
+            if (!result.HasResult || hitObject != drawableSpinner)
+                return;
+
+            // Trigger a miss result for remaining ticks to avoid infinite gameplay.
+            foreach (var tick in ticks.Where(t => !t.IsHit))
+                tick.TriggerResult(false);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            drawableSpinner.OnNewResult -= onNewResult;
+        }
+    }
+}

From b7565f5943f05247b6469491f052dd6287c95db3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 25 Dec 2019 05:36:58 +0300
Subject: [PATCH 00090/10326] Remove unnecessary using directive

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 86e8840425..edcaa947ac 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -14,7 +14,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;

From 2c1a65d90acfa70f206cf46a00b26da5d93111c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Dec 2019 19:37:55 +0900
Subject: [PATCH 00091/10326] Add simple test

---
 .../Editor/TestSceneBlueprintContainer.cs     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs

diff --git a/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs b/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs
new file mode 100644
index 0000000000..5ccce5b3c6
--- /dev/null
+++ b/osu.Game.Tests/Editor/TestSceneBlueprintContainer.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 NUnit.Framework;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Editor
+{
+    public class TestSceneBlueprintContainer : EditorClockTestScene
+    {
+        private BlueprintContainer blueprintContainer;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Child = blueprintContainer = new BlueprintContainer();
+        });
+    }
+}

From b3d32710df2cf43bc3a969f88ea43b6cc7a5ed30 Mon Sep 17 00:00:00 2001
From: Viktor Rosvall <virosen@yahoo.se>
Date: Sun, 29 Dec 2019 00:19:51 +0100
Subject: [PATCH 00092/10326] Centered button mods by adding padding to
 FillFlowContainer

---
 osu.Game/Screens/Select/FooterButtonMods.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index 8419ee0c2a..bb733f10ed 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -54,11 +54,10 @@ namespace osu.Game.Screens.Select
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                        Margin = new MarginPadding { Right = 10 }
                     }
                 },
                 AutoSizeAxes = Axes.Both,
-                Margin = new MarginPadding { Left = 70 }
+                Margin = new MarginPadding { Left = 70, Right = 15 }
             });
         }
 

From bf463fe5e0c13f2d07b257a2a21060620cb672b5 Mon Sep 17 00:00:00 2001
From: Viktor Rosvall <virosen@yahoo.se>
Date: Sun, 29 Dec 2019 08:57:14 +0100
Subject: [PATCH 00093/10326] adjusted the margin values

---
 .../Visual/UserInterface/TestSceneFooterButtonMods.cs      | 7 +++++++
 osu.Game/Screens/Select/FooterButtonMods.cs                | 1 +
 2 files changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
index 6eb621ca3b..de67968fbc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
@@ -45,6 +45,13 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep(@"Add multiple Mods", () => changeMods(mutlipleIncrementMods));
             AddAssert(@"Check multiple mod multiplier", () => assertModsMultiplier(mutlipleIncrementMods));
         }
+        
+        [Test]
+        public void Temporary()
+        {
+            var hiddenMod = new Mod[] { new OsuModRelax() };
+            AddStep(@"Add Hidden", () => changeMods(hiddenMod));
+        }
 
         [Test]
         public void TestDecrementMultiplier()
diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index bb733f10ed..d533d5444c 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -54,6 +54,7 @@ namespace osu.Game.Screens.Select
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                        Margin = new MarginPadding { Right = 6 }
                     }
                 },
                 AutoSizeAxes = Axes.Both,

From 875a25c5297b0797b84af4974c2bf5e0d68ed6c6 Mon Sep 17 00:00:00 2001
From: Viktor Rosvall <virosen@yahoo.se>
Date: Sun, 29 Dec 2019 08:57:14 +0100
Subject: [PATCH 00094/10326] adjusted the margin values

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

diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index bb733f10ed..d533d5444c 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -54,6 +54,7 @@ namespace osu.Game.Screens.Select
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                        Margin = new MarginPadding { Right = 6 }
                     }
                 },
                 AutoSizeAxes = Axes.Both,

From e85910c4e465ab174ee8d328b75442d8886c8cb9 Mon Sep 17 00:00:00 2001
From: Viktor Rosvall <virosen@yahoo.se>
Date: Sun, 29 Dec 2019 09:18:27 +0100
Subject: [PATCH 00095/10326] removed unnecessary test code

---
 .../Visual/UserInterface/TestSceneFooterButtonMods.cs      | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
index de67968fbc..6eb621ca3b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
@@ -45,13 +45,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep(@"Add multiple Mods", () => changeMods(mutlipleIncrementMods));
             AddAssert(@"Check multiple mod multiplier", () => assertModsMultiplier(mutlipleIncrementMods));
         }
-        
-        [Test]
-        public void Temporary()
-        {
-            var hiddenMod = new Mod[] { new OsuModRelax() };
-            AddStep(@"Add Hidden", () => changeMods(hiddenMod));
-        }
 
         [Test]
         public void TestDecrementMultiplier()

From b0bcbf8b93ab24b96a2fe3f73491c2703b31675b Mon Sep 17 00:00:00 2001
From: Viktor Rosvall <virosen@yahoo.se>
Date: Mon, 30 Dec 2019 21:55:09 +0100
Subject: [PATCH 00096/10326] Adjusted margin to fix the 1 px increase

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

diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index d533d5444c..a0e34a7f87 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Select
                     }
                 },
                 AutoSizeAxes = Axes.Both,
-                Margin = new MarginPadding { Left = 70, Right = 15 }
+                Margin = new MarginPadding { Left = 70, Right = 14 }
             });
         }
 

From f40ebc83caea08d02810065d7150c30c8fe60ffb Mon Sep 17 00:00:00 2001
From: Viktor Rosvall <virosen@yahoo.se>
Date: Mon, 30 Dec 2019 23:58:49 +0100
Subject: [PATCH 00097/10326] Begun refractorization process of wrapping Button
 text in a FillFlowContainer

---
 .../TestSceneFooterButtonMods.cs              |  3 +-
 osu.Game/Screens/Select/FooterButton.cs       | 23 +++++++----
 osu.Game/Screens/Select/FooterButtonMods.cs   | 38 +++++++------------
 3 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
index 6eb621ca3b..63197ed26a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
@@ -16,7 +16,8 @@ namespace osu.Game.Tests.Visual.UserInterface
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(FooterButtonMods)
+            typeof(FooterButtonMods),
+            typeof(FooterButton)
         };
 
         private readonly TestFooterButtonMods footerButtonMods;
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index b77da36748..18c9d1091c 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        protected readonly Container TextContainer;
+        protected FillFlowContainer TextContainer;
         protected readonly SpriteText SpriteText;
         private readonly Box box;
         private readonly Box light;
@@ -80,15 +80,24 @@ namespace osu.Game.Screens.Select
                     EdgeSmoothness = new Vector2(2, 0),
                     RelativeSizeAxes = Axes.X,
                 },
-                TextContainer = new Container
+                TextContainer = new FillFlowContainer
                 {
-                    Size = new Vector2(100 - SHEAR_WIDTH, 50),
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Direction = FillDirection.Horizontal,
                     Shear = -SHEAR,
-                    Child = SpriteText = new OsuSpriteText
+                    Children = new Drawable[]
                     {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    }
+                        SpriteText = new OsuSpriteText
+                        {
+                            Size = new Vector2(100 - SHEAR_WIDTH, 50),
+                            Shear = -SHEAR,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        }
+                    },
+                    AutoSizeAxes = Axes.Both,
+                    // Margin = new MarginPadding { Left = 70, Right = 14 }
                 },
             };
         }
diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index a0e34a7f87..2141c04cd6 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+// using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Rulesets.Mods;
 using System.Collections.Generic;
@@ -34,31 +34,19 @@ namespace osu.Game.Screens.Select
 
         public FooterButtonMods()
         {
-            Add(new FillFlowContainer
+            TextContainer.Add(modDisplay = new FooterModDisplay
             {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                Direction = FillDirection.Horizontal,
-                Shear = -SHEAR,
-                Children = new Drawable[]
-                {
-                    modDisplay = new FooterModDisplay
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        DisplayUnrankedText = false,
-                        Scale = new Vector2(0.8f)
-                    },
-                    MultiplierText = new OsuSpriteText
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                        Margin = new MarginPadding { Right = 6 }
-                    }
-                },
-                AutoSizeAxes = Axes.Both,
-                Margin = new MarginPadding { Left = 70, Right = 14 }
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                DisplayUnrankedText = false,
+                Scale = new Vector2(0.8f)
+            });
+            TextContainer.Add(MultiplierText = new OsuSpriteText
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                Margin = new MarginPadding { Right = 6 }
             });
         }
 

From 8695e57f627aa2dc6da22c4eb53836265328cc30 Mon Sep 17 00:00:00 2001
From: Viktor Rosvall <virosen@yahoo.se>
Date: Tue, 31 Dec 2019 12:21:55 +0100
Subject: [PATCH 00098/10326] Hides mod display when no mods are active to fix
 issue of invisible margin

---
 osu.Game/Screens/Select/FooterButton.cs     | 2 +-
 osu.Game/Screens/Select/FooterButtonMods.cs | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 18c9d1091c..7acb2fd221 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Select
                         SpriteText = new OsuSpriteText
                         {
                             Size = new Vector2(100 - SHEAR_WIDTH, 50),
-                            Shear = -SHEAR,
+                            Shear = SHEAR,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         }
diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index 2141c04cd6..a3453fee05 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Select
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                Margin = new MarginPadding { Right = 6 }
+                // Margin = new MarginPadding { Right = 6 }
             });
         }
 
@@ -80,6 +80,11 @@ namespace osu.Game.Screens.Select
                 MultiplierText.FadeColour(lowMultiplierColour, 200);
             else
                 MultiplierText.FadeColour(Color4.White, 200);
+
+            if (Current.Value?.Count > 0)
+                modDisplay.FadeIn(0);
+            else
+                modDisplay.FadeOut(0);
         }
 
         private class FooterModDisplay : ModDisplay

From ddec59ec9158c0f88ca9a35048de161f232c5bd6 Mon Sep 17 00:00:00 2001
From: Viktor Rosvall <virosen@yahoo.se>
Date: Wed, 1 Jan 2020 12:22:19 +0100
Subject: [PATCH 00099/10326] Further refactoring. I think this may have
 polluted the FooterButton too much. Not sure what to do about the centering.

---
 osu.Game/Screens/Select/FooterButton.cs     | 40 +++++++++++++--------
 osu.Game/Screens/Select/FooterButtonMods.cs |  6 ++--
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 7acb2fd221..869e9e8aa4 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -56,7 +56,8 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        protected FillFlowContainer TextContainer;
+        protected FillFlowContainer ButtonContentContainer;
+        protected readonly Container TextContainer;
         protected readonly SpriteText SpriteText;
         private readonly Box box;
         private readonly Box light;
@@ -80,24 +81,35 @@ namespace osu.Game.Screens.Select
                     EdgeSmoothness = new Vector2(2, 0),
                     RelativeSizeAxes = Axes.X,
                 },
-                TextContainer = new FillFlowContainer
+                new Container
                 {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    Direction = FillDirection.Horizontal,
-                    Shear = -SHEAR,
+                    AutoSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
-                        SpriteText = new OsuSpriteText
+                        ButtonContentContainer = new FillFlowContainer
                         {
-                            Size = new Vector2(100 - SHEAR_WIDTH, 50),
-                            Shear = SHEAR,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        }
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Direction = FillDirection.Horizontal,
+                            Shear = -SHEAR,
+                            AutoSizeAxes = Axes.Both,
+                            Margin = new MarginPadding { Horizontal = SHEAR_WIDTH / 4 },
+                            Children = new Drawable[]
+                            {
+                                TextContainer = new Container
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Size = new Vector2(100 - SHEAR_WIDTH, 50),
+                                    Child = SpriteText = new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                    }
+                                },
+                            },
+                        },
                     },
-                    AutoSizeAxes = Axes.Both,
-                    // Margin = new MarginPadding { Left = 70, Right = 14 }
                 },
             };
         }
diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index a3453fee05..67b491cf9e 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -34,19 +34,19 @@ namespace osu.Game.Screens.Select
 
         public FooterButtonMods()
         {
-            TextContainer.Add(modDisplay = new FooterModDisplay
+            ButtonContentContainer.Add(modDisplay = new FooterModDisplay
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 DisplayUnrankedText = false,
                 Scale = new Vector2(0.8f)
             });
-            TextContainer.Add(MultiplierText = new OsuSpriteText
+            ButtonContentContainer.Add(MultiplierText = new OsuSpriteText
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                // Margin = new MarginPadding { Right = 6 }
+                Margin = new MarginPadding { Right = 10 }
             });
         }
 

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 00100/10326] 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 00101/10326] 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 00102/10326] 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 ee332e0d424b0a8a76efc28b413208e14f8b1f6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Jan 2020 11:46:18 +0900
Subject: [PATCH 00103/10326] Split out BlueprintContainer functionality
 further

---
 .../Edit/ManiaBlueprintContainer.cs           | 28 +++++++++++++++
 .../Edit/ManiaHitObjectComposer.cs            | 21 ++---------
 .../Edit/OsuBlueprintContainer.cs             | 35 +++++++++++++++++++
 .../Edit/OsuHitObjectComposer.cs              | 24 +------------
 .../Editor/TestSceneBlueprintContainer.cs     |  4 +--
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 15 ++------
 .../Compose/Components/BlueprintContainer.cs  | 23 +++++++++---
 .../Components/ComposeBlueprintContainer.cs   | 12 +++++++
 8 files changed, 101 insertions(+), 61 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
 create mode 100644 osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
new file mode 100644
index 0000000000..9cb4e54234
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.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.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Edit.Blueprints;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Screens.Edit.Compose.Components;
+
+namespace osu.Game.Rulesets.Mania.Edit
+{
+    public class ManiaBlueprintContainer : ComposeBlueprintContainer
+    {
+        public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case DrawableNote note:
+                    return new NoteSelectionBlueprint(note);
+
+                case DrawableHoldNote holdNote:
+                    return new HoldNoteSelectionBlueprint(holdNote);
+            }
+
+            return base.CreateBlueprintFor(hitObject);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 1632b6a583..824c92184a 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -5,11 +5,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Drawables;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -52,26 +49,12 @@ namespace osu.Game.Rulesets.Mania.Edit
             return drawableRuleset;
         }
 
+        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new ManiaBlueprintContainer();
+
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
             new NoteCompositionTool(),
             new HoldNoteCompositionTool()
         };
-
-        public override SelectionHandler CreateSelectionHandler() => new ManiaSelectionHandler();
-
-        public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
-        {
-            switch (hitObject)
-            {
-                case DrawableNote note:
-                    return new NoteSelectionBlueprint(note);
-
-                case DrawableHoldNote holdNote:
-                    return new HoldNoteSelectionBlueprint(holdNote);
-            }
-
-            return base.CreateBlueprintFor(hitObject);
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
new file mode 100644
index 0000000000..a6a7d9bcc0
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.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.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Screens.Edit.Compose.Components;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public class OsuBlueprintContainer : ComposeBlueprintContainer
+    {
+        public override SelectionHandler CreateSelectionHandler() => new OsuSelectionHandler();
+
+        public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case DrawableHitCircle circle:
+                    return new HitCircleSelectionBlueprint(circle);
+
+                case DrawableSlider slider:
+                    return new SliderSelectionBlueprint(slider);
+
+                case DrawableSpinner spinner:
+                    return new SpinnerSelectionBlueprint(spinner);
+            }
+
+            return base.CreateBlueprintFor(hitObject);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 49624ea733..28f7768aac 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -9,12 +9,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
-using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
-using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -37,24 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             new SpinnerCompositionTool()
         };
 
-        public override SelectionHandler CreateSelectionHandler() => new OsuSelectionHandler();
-
-        public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
-        {
-            switch (hitObject)
-            {
-                case DrawableHitCircle circle:
-                    return new HitCircleSelectionBlueprint(circle);
-
-                case DrawableSlider slider:
-                    return new SliderSelectionBlueprint(slider);
-
-                case DrawableSpinner spinner:
-                    return new SpinnerSelectionBlueprint(spinner);
-            }
-
-            return base.CreateBlueprintFor(hitObject);
-        }
+        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new OsuBlueprintContainer();
 
         protected override DistanceSnapGrid CreateDistanceSnapGrid(IEnumerable<HitObject> selectedHitObjects)
         {
diff --git a/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs b/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs
index 5ccce5b3c6..67b0b61545 100644
--- a/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs
+++ b/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs
@@ -9,12 +9,10 @@ namespace osu.Game.Tests.Editor
 {
     public class TestSceneBlueprintContainer : EditorClockTestScene
     {
-        private BlueprintContainer blueprintContainer;
-
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Child = blueprintContainer = new BlueprintContainer();
+            Child = new ComposeBlueprintContainer();
         });
     }
 }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index bfaa7e8872..536c7767b7 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Edit
                 new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
             });
 
-            var layerAboveRuleset = drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChild(blueprintContainer = new BlueprintContainer());
+            var layerAboveRuleset = drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChild(blueprintContainer = CreateBlueprintContainer());
 
             layerContainers.Add(layerBelowRuleset);
             layerContainers.Add(layerAboveRuleset);
@@ -147,6 +147,8 @@ namespace osu.Game.Rulesets.Edit
             blueprintContainer.SelectionChanged += selectionChanged;
         }
 
+        protected abstract ComposeBlueprintContainer CreateBlueprintContainer();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -323,17 +325,6 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public abstract bool CursorInPlacementArea { get; }
 
-        /// <summary>
-        /// Creates a <see cref="SelectionBlueprint"/> for a specific <see cref="DrawableHitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to create the overlay for.</param>
-        public virtual SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
-
-        /// <summary>
-        /// Creates a <see cref="SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
-        /// </summary>
-        public virtual SelectionHandler CreateSelectionHandler() => new SelectionHandler();
-
         /// <summary>
         /// Creates the <see cref="DistanceSnapGrid"/> applicable for a <see cref="HitObject"/> selection.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index cafaddc39e..39ec42ba96 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -22,7 +22,11 @@ using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
-    public class BlueprintContainer : CompositeDrawable, IKeyBindingHandler<PlatformAction>
+    /// <summary>
+    /// A container which provides a "blueprint" display of hitobjects.
+    /// Includes selection and manipulation support via a <see cref="SelectionHandler"/>.
+    /// </summary>
+    public abstract class BlueprintContainer : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
         public event Action<IEnumerable<HitObject>> SelectionChanged;
 
@@ -42,15 +46,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
-        public BlueprintContainer()
+        protected BlueprintContainer()
         {
             RelativeSizeAxes = Axes.Both;
         }
 
+        /// <summary>
+        /// Creates a <see cref="SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
+        /// </summary>
+        public virtual SelectionHandler CreateSelectionHandler() => new SelectionHandler();
+
+        /// <summary>
+        /// Creates a <see cref="SelectionBlueprint"/> for a specific <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to create the overlay for.</param>
+        public virtual SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            selectionHandler = composer.CreateSelectionHandler();
+            selectionHandler = CreateSelectionHandler();
             selectionHandler.DeselectAll = deselectAll;
 
             InternalChildren = new[]
@@ -259,7 +274,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             refreshTool();
 
-            var blueprint = composer.CreateBlueprintFor(hitObject);
+            var blueprint = CreateBlueprintFor(hitObject);
             if (blueprint == null)
                 return;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
new file mode 100644
index 0000000000..9267006e4c
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.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.Screens.Edit.Compose.Components
+{
+    /// <summary>
+    /// A blueprint container generally displayed as an overlay to a ruleset's playfield.
+    /// </summary>
+    public class ComposeBlueprintContainer : BlueprintContainer
+    {
+    }
+}

From d8d12cbbddfe864f96467e22a8b672f8ef4d22c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Jan 2020 19:09:37 +0900
Subject: [PATCH 00104/10326] wip: Move more functionality into
 ComposeBlueprintContainer

---
 .../Timelines/Summary/Parts/TimelinePart.cs          |  4 ++--
 .../Edit/Compose/Components/BlueprintContainer.cs    |  5 +----
 .../Components/Timeline/TimelineHitObjectDisplay.cs  | 12 ++++++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index 7706e33179..119635ccd5 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// <summary>
     /// Represents a part of the summary timeline..
     /// </summary>
-    public abstract class TimelinePart : Container
+    public class TimelinePart : Container
     {
         protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 
         protected override Container<Drawable> Content => timeline;
 
-        protected TimelinePart()
+        public TimelinePart()
         {
             AddInternal(timeline = new Container { RelativeSizeAxes = Axes.Both });
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 39ec42ba96..a8fb87c1b0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -40,9 +40,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved]
         private IAdjustableClock adjustableClock { get; set; }
 
-        [Resolved]
-        private HitObjectComposer composer { get; set; }
-
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
@@ -77,7 +74,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 dragBox.CreateProxy()
             };
 
-            foreach (var obj in composer.HitObjects)
+            foreach (var obj in beatmap.HitObjects)
                 addBlueprintFor(obj);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index b20f2fa11d..12909f257d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -14,15 +14,19 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    internal class TimelineHitObjectDisplay : TimelinePart
+    internal class TimelineHitObjectDisplay : BlueprintContainer
     {
         private EditorBeatmap beatmap { get; }
 
+        private readonly TimelinePart content;
+
         public TimelineHitObjectDisplay(EditorBeatmap beatmap)
         {
             RelativeSizeAxes = Axes.Both;
 
             this.beatmap = beatmap;
+
+            AddInternal(content = new TimelinePart());
         }
 
         [BackgroundDependencyLoader]
@@ -42,15 +46,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void remove(HitObject h)
         {
-            foreach (var d in Children.OfType<TimelineHitObjectRepresentation>().Where(c => c.HitObject == h))
+            foreach (var d in content.OfType<TimelineHitObjectRepresentation>().Where(c => c.HitObject == h))
                 d.Expire();
         }
 
         private void add(HitObject h)
         {
-            var yOffset = Children.Count(d => d.X == h.StartTime);
+            var yOffset = content.Count(d => d.X == h.StartTime);
 
-            Add(new TimelineHitObjectRepresentation(h) { Y = -yOffset * TimelineHitObjectRepresentation.THICKNESS });
+            content.Add(new TimelineHitObjectRepresentation(h) { Y = -yOffset * TimelineHitObjectRepresentation.THICKNESS });
         }
 
         private class TimelineHitObjectRepresentation : CompositeDrawable

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 00105/10326] 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 00106/10326] 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 00107/10326] 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 264523bc8babe7c9a5cdfd338b7c86ced3accd5f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 3 Jan 2020 23:22:19 +0300
Subject: [PATCH 00108/10326] Split ControllableOverlayHeader from base class

---
 .../BreadcrumbControlOverlayHeader.cs         |  2 +-
 .../Overlays/ControllableOverlayHeader.cs     | 41 +++++++++++
 osu.Game/Overlays/OverlayHeader.cs            | 71 ++++++++-----------
 osu.Game/Overlays/TabControlOverlayHeader.cs  |  2 +-
 4 files changed, 72 insertions(+), 44 deletions(-)
 create mode 100644 osu.Game/Overlays/ControllableOverlayHeader.cs

diff --git a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
index 8a82b1f0c0..d7fa346c15 100644
--- a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
+++ b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
@@ -7,7 +7,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays
 {
-    public abstract class BreadcrumbControlOverlayHeader : OverlayHeader
+    public abstract class BreadcrumbControlOverlayHeader : ControllableOverlayHeader
     {
         protected OverlayHeaderBreadcrumbControl BreadcrumbControl;
 
diff --git a/osu.Game/Overlays/ControllableOverlayHeader.cs b/osu.Game/Overlays/ControllableOverlayHeader.cs
new file mode 100644
index 0000000000..30509995dd
--- /dev/null
+++ b/osu.Game/Overlays/ControllableOverlayHeader.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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays
+{
+    public abstract class ControllableOverlayHeader : OverlayHeader
+    {
+        protected Color4 ControlBackgroundColour
+        {
+            set => controlBackground.Colour = value;
+        }
+
+        private readonly Box controlBackground;
+
+        protected ControllableOverlayHeader()
+        {
+            HeaderInfo.Add(new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Children = new Drawable[]
+                {
+                    controlBackground = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Gray,
+                    },
+                    CreateTabControl().With(control => control.Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN })
+                }
+            });
+        }
+
+        protected abstract TabControl<string> CreateTabControl();
+    }
+}
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index 53da2da634..8c36e8cc9b 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -5,7 +5,6 @@ using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osuTK.Graphics;
 
@@ -14,19 +13,14 @@ namespace osu.Game.Overlays
     public abstract class OverlayHeader : Container
     {
         private readonly Box titleBackground;
-        private readonly Box controlBackground;
         private readonly Container background;
+        protected readonly FillFlowContainer HeaderInfo;
 
         protected Color4 TitleBackgroundColour
         {
             set => titleBackground.Colour = value;
         }
 
-        protected Color4 ControlBackgroundColour
-        {
-            set => controlBackground.Colour = value;
-        }
-
         protected float BackgroundHeight
         {
             set => background.Height = value;
@@ -44,47 +38,42 @@ namespace osu.Game.Overlays
                 Direction = FillDirection.Vertical,
                 Children = new[]
                 {
-                    background = new Container
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 80,
-                        Masking = true,
-                        Child = CreateBackground()
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Children = new Drawable[]
-                        {
-                            titleBackground = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.Gray,
-                            },
-                            CreateTitle().With(title =>
-                            {
-                                title.Margin = new MarginPadding
-                                {
-                                    Vertical = 10,
-                                    Left = UserProfileOverlay.CONTENT_X_MARGIN
-                                };
-                            })
-                        }
-                    },
-                    new Container
+                    HeaderInfo = new FillFlowContainer
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
                         Depth = -float.MaxValue,
                         Children = new Drawable[]
                         {
-                            controlBackground = new Box
+                            background = new Container
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.Gray,
+                                RelativeSizeAxes = Axes.X,
+                                Height = 80,
+                                Masking = true,
+                                Child = CreateBackground()
+                            },
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Children = new Drawable[]
+                                {
+                                    titleBackground = new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Colour = Color4.Gray,
+                                    },
+                                    CreateTitle().With(title =>
+                                    {
+                                        title.Margin = new MarginPadding
+                                        {
+                                            Vertical = 10,
+                                            Left = UserProfileOverlay.CONTENT_X_MARGIN
+                                        };
+                                    })
+                                }
                             },
-                            CreateTabControl().With(control => control.Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN })
                         }
                     },
                     CreateContent()
@@ -98,7 +87,5 @@ namespace osu.Game.Overlays
         protected virtual Drawable CreateContent() => new Container();
 
         protected abstract ScreenTitle CreateTitle();
-
-        protected abstract TabControl<string> CreateTabControl();
     }
 }
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index f3521b66c8..1e6be9422d 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -9,7 +9,7 @@ using osuTK;
 
 namespace osu.Game.Overlays
 {
-    public abstract class TabControlOverlayHeader : OverlayHeader
+    public abstract class TabControlOverlayHeader : ControllableOverlayHeader
     {
         protected OverlayHeaderTabControl TabControl;
 

From 53c8592cb9932d96fd1b4ab2894159c8df34052b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 3 Jan 2020 23:54:56 +0300
Subject: [PATCH 00109/10326] Add test scene

---
 .../UserInterface/TestSceneOverlayHeaders.cs  | 168 ++++++++++++++++++
 1 file changed, 168 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs
new file mode 100644
index 0000000000..60cf0f6885
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs
@@ -0,0 +1,168 @@
+// Copyright (c) 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.Overlays;
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneOverlayHeaders : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OverlayHeader),
+            typeof(ControllableOverlayHeader),
+            typeof(TabControlOverlayHeader),
+            typeof(BreadcrumbControlOverlayHeader),
+            typeof(TestNoControlHeader),
+            typeof(TestTabControlHeader),
+            typeof(TestBreadcrumbControlHeader),
+        };
+
+        private readonly FillFlowContainer flow;
+
+        public TestSceneOverlayHeaders()
+        {
+            AddRange(new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                new BasicScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = flow = new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Direction = FillDirection.Vertical
+                    }
+                }
+            });
+
+            addHeader("OverlayHeader", new TestNoControlHeader());
+            addHeader("TabControlOverlayHeader", new TestTabControlHeader());
+            addHeader("BreadcrumbControlOverlayHeader", new TestBreadcrumbControlHeader());
+        }
+
+        private void addHeader(string name, OverlayHeader header)
+        {
+            flow.Add(new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Margin = new MarginPadding(20),
+                        Text = name,
+                    },
+                    header
+                }
+            });
+        }
+
+        private class TestNoControlHeader : OverlayHeader
+        {
+            protected override Drawable CreateBackground() => new TestBackground();
+
+            protected override ScreenTitle CreateTitle() => new TestTitle();
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                TitleBackgroundColour = colours.GreyVioletDarker;
+            }
+        }
+
+        private class TestTabControlHeader : TabControlOverlayHeader
+        {
+            protected override Drawable CreateBackground() => new TestBackground();
+
+            protected override ScreenTitle CreateTitle() => new TestTitle();
+
+            public TestTabControlHeader()
+            {
+                TabControl.AddItem("tab1");
+                TabControl.AddItem("tab2");
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                TitleBackgroundColour = colours.GreyVioletDarker;
+                ControlBackgroundColour = colours.GreyVioletDark;
+                TabControl.AccentColour = colours.Violet;
+            }
+        }
+
+        private class TestBreadcrumbControlHeader : BreadcrumbControlOverlayHeader
+        {
+            protected override Drawable CreateBackground() => new TestBackground();
+
+            protected override ScreenTitle CreateTitle() => new TestTitle();
+
+            public TestBreadcrumbControlHeader()
+            {
+                BreadcrumbControl.AddItem("tab1");
+                BreadcrumbControl.AddItem("tab2");
+                BreadcrumbControl.Current.Value = "tab2";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                TitleBackgroundColour = colours.GreyVioletDarker;
+                ControlBackgroundColour = colours.GreyVioletDark;
+                BreadcrumbControl.AccentColour = colours.Violet;
+            }
+        }
+
+        private class TestBackground : Sprite
+        {
+            public TestBackground()
+            {
+                RelativeSizeAxes = Axes.Both;
+                FillMode = FillMode.Fill;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                Texture = textures.Get(@"Headers/changelog");
+            }
+        }
+
+        private class TestTitle : ScreenTitle
+        {
+            public TestTitle()
+            {
+                Title = "title";
+                Section = "section";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                AccentColour = colours.Violet;
+            }
+
+            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/changelog");
+        }
+    }
+}

From e0f66928e6e76dfeef068327a4296d1482baff97 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 7 Jan 2020 01:07:50 +0300
Subject: [PATCH 00110/10326] Allow CommentsContainer refetch comments using a
 method

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 86bd0ddd11..8134c10750 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -30,29 +30,23 @@ namespace osu.Game.Tests.Visual.Online
 
         public TestSceneCommentsContainer()
         {
-            BasicScrollContainer scrollFlow;
+            BasicScrollContainer scroll;
+            CommentsContainer comments;
 
-            Add(scrollFlow = new BasicScrollContainer
+            Add(scroll = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
+                Child = comments = new CommentsContainer()
             });
 
-            AddStep("Big Black comments", () =>
+            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("Idle state", () =>
             {
-                scrollFlow.Clear();
-                scrollFlow.Add(new CommentsContainer(CommentableType.Beatmapset, 41823));
-            });
-
-            AddStep("Airman comments", () =>
-            {
-                scrollFlow.Clear();
-                scrollFlow.Add(new CommentsContainer(CommentableType.Beatmapset, 24313));
-            });
-
-            AddStep("lazer build comments", () =>
-            {
-                scrollFlow.Clear();
-                scrollFlow.Add(new CommentsContainer(CommentableType.Build, 4772));
+                scroll.Clear();
+                scroll.Add(comments = new CommentsContainer());
             });
         }
     }
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 560123eb55..584f658673 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 readonly CommentableType type;
-        private readonly long id;
+        private CommentableType type;
+        private long id;
 
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
         public readonly BindableBool ShowDeleted = new BindableBool();
@@ -39,11 +39,8 @@ namespace osu.Game.Overlays.Comments
         private readonly DeletedChildrenPlaceholder deletedChildrenPlaceholder;
         private readonly CommentsShowMoreButton moreButton;
 
-        public CommentsContainer(CommentableType type, long id)
+        public CommentsContainer()
         {
-            this.type = type;
-            this.id = id;
-
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             AddRangeInternal(new Drawable[]
@@ -101,7 +98,8 @@ namespace osu.Game.Overlays.Comments
                                                 Anchor = Anchor.Centre,
                                                 Origin = Anchor.Centre,
                                                 Margin = new MarginPadding(5),
-                                                Action = getComments
+                                                Action = getComments,
+                                                IsLoading = true,
                                             }
                                         }
                                     }
@@ -121,12 +119,24 @@ namespace osu.Game.Overlays.Comments
 
         protected override void LoadComplete()
         {
-            Sort.BindValueChanged(onSortChanged, true);
+            Sort.BindValueChanged(_ => resetComments());
             base.LoadComplete();
         }
 
-        private void onSortChanged(ValueChangedEvent<CommentsSortCriteria> sort)
+        /// <param name="type">The type of resource to get comments for.</param>
+        /// <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;
+            Sort.TriggerChange();
+        }
+
+        private void resetComments()
+        {
+            if (id == default)
+                return;
+
             clearComments();
             getComments();
         }
@@ -152,7 +162,7 @@ namespace osu.Game.Overlays.Comments
         {
             loadCancellation = new CancellationTokenSource();
 
-            FillFlowContainer page = new FillFlowContainer
+            var page = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,

From 6adf5ba3813482e40cf3e0c391d136e7e9c596e9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 7 Jan 2020 12:29:21 +0300
Subject: [PATCH 00111/10326] Use nullable long type for id value

---
 osu.Game/Overlays/Comments/CommentsContainer.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 584f658673..97bd0a75e9 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Comments
     public class CommentsContainer : CompositeDrawable
     {
         private CommentableType type;
-        private long id;
+        private long? id;
 
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
         public readonly BindableBool ShowDeleted = new BindableBool();
@@ -134,18 +134,18 @@ namespace osu.Game.Overlays.Comments
 
         private void resetComments()
         {
-            if (id == default)
-                return;
-
             clearComments();
             getComments();
         }
 
         private void getComments()
         {
+            if (!id.HasValue)
+                return;
+
             request?.Cancel();
             loadCancellation?.Cancel();
-            request = new GetCommentsRequest(type, id, Sort.Value, currentPage++);
+            request = new GetCommentsRequest(type, id.Value, Sort.Value, currentPage++);
             request.Success += onSuccess;
             api.Queue(request);
         }

From 7dc03a1335f860ea0e190901bdc27827352e7286 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 7 Jan 2020 12:30:06 +0300
Subject: [PATCH 00112/10326] resetComments -> refetchComments

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

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 97bd0a75e9..99f79cd940 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Overlays.Comments
 
         protected override void LoadComplete()
         {
-            Sort.BindValueChanged(_ => resetComments());
+            Sort.BindValueChanged(_ => refetchComments());
             base.LoadComplete();
         }
 
@@ -132,7 +132,7 @@ namespace osu.Game.Overlays.Comments
             Sort.TriggerChange();
         }
 
-        private void resetComments()
+        private void refetchComments()
         {
             clearComments();
             getComments();

From eb828154eeb6a38c45b52d7a48c582122df3fef3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 8 Jan 2020 00:41:52 +0300
Subject: [PATCH 00113/10326] Allow any type to be used to create TabControl

---
 .../Online/TestSceneUserProfileHeader.cs      |  2 +-
 .../UserInterface/TestSceneOverlayHeaders.cs  | 44 ++++++++++++++++---
 .../BreadcrumbControlOverlayHeader.cs         |  2 +-
 .../Overlays/ControllableOverlayHeader.cs     |  5 ++-
 osu.Game/Overlays/Profile/ProfileHeader.cs    |  2 +-
 osu.Game/Overlays/TabControlOverlayHeader.cs  | 19 +++++---
 6 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
index 63b46c991f..b4408343c4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
             typeof(ProfileHeader),
             typeof(RankGraph),
             typeof(LineGraph),
-            typeof(TabControlOverlayHeader.OverlayHeaderTabControl),
+            typeof(TabControlOverlayHeader<>.OverlayHeaderTabControl),
             typeof(CentreHeaderContainer),
             typeof(BottomHeaderContainer),
             typeof(DetailHeaderContainer),
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs
index 60cf0f6885..3ed5e53260 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs
@@ -22,11 +22,12 @@ namespace osu.Game.Tests.Visual.UserInterface
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(OverlayHeader),
-            typeof(ControllableOverlayHeader),
-            typeof(TabControlOverlayHeader),
+            typeof(ControllableOverlayHeader<>),
+            typeof(TabControlOverlayHeader<>),
             typeof(BreadcrumbControlOverlayHeader),
             typeof(TestNoControlHeader),
-            typeof(TestTabControlHeader),
+            typeof(TestStringTabControlHeader),
+            typeof(TestEnumTabControlHeader),
             typeof(TestBreadcrumbControlHeader),
         };
 
@@ -54,7 +55,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             addHeader("OverlayHeader", new TestNoControlHeader());
-            addHeader("TabControlOverlayHeader", new TestTabControlHeader());
+            addHeader("TabControlOverlayHeader (string)", new TestStringTabControlHeader());
+            addHeader("TabControlOverlayHeader (enum)", new TestEnumTabControlHeader());
             addHeader("BreadcrumbControlOverlayHeader", new TestBreadcrumbControlHeader());
         }
 
@@ -69,10 +71,16 @@ namespace osu.Game.Tests.Visual.UserInterface
                 {
                     new OsuSpriteText
                     {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
                         Margin = new MarginPadding(20),
                         Text = name,
                     },
-                    header
+                    header.With(header =>
+                    {
+                        header.Anchor = Anchor.TopCentre;
+                        header.Origin = Anchor.TopCentre;
+                    })
                 }
             });
         }
@@ -90,13 +98,13 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
         }
 
-        private class TestTabControlHeader : TabControlOverlayHeader
+        private class TestStringTabControlHeader : TabControlOverlayHeader<string>
         {
             protected override Drawable CreateBackground() => new TestBackground();
 
             protected override ScreenTitle CreateTitle() => new TestTitle();
 
-            public TestTabControlHeader()
+            public TestStringTabControlHeader()
             {
                 TabControl.AddItem("tab1");
                 TabControl.AddItem("tab2");
@@ -111,6 +119,28 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
         }
 
+        private class TestEnumTabControlHeader : TabControlOverlayHeader<TestEnum>
+        {
+            protected override Drawable CreateBackground() => new TestBackground();
+
+            protected override ScreenTitle CreateTitle() => new TestTitle();
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                TitleBackgroundColour = colours.GreyVioletDarker;
+                ControlBackgroundColour = colours.GreyVioletDark;
+                TabControl.AccentColour = colours.Violet;
+            }
+        }
+
+        private enum TestEnum
+        {
+            Some,
+            Cool,
+            Tabs
+        }
+
         private class TestBreadcrumbControlHeader : BreadcrumbControlOverlayHeader
         {
             protected override Drawable CreateBackground() => new TestBackground();
diff --git a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
index d7fa346c15..a82ff44505 100644
--- a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
+++ b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
@@ -7,7 +7,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays
 {
-    public abstract class BreadcrumbControlOverlayHeader : ControllableOverlayHeader
+    public abstract class BreadcrumbControlOverlayHeader : ControllableOverlayHeader<string>
     {
         protected OverlayHeaderBreadcrumbControl BreadcrumbControl;
 
diff --git a/osu.Game/Overlays/ControllableOverlayHeader.cs b/osu.Game/Overlays/ControllableOverlayHeader.cs
index 30509995dd..9b2bf526ca 100644
--- a/osu.Game/Overlays/ControllableOverlayHeader.cs
+++ b/osu.Game/Overlays/ControllableOverlayHeader.cs
@@ -9,7 +9,8 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public abstract class ControllableOverlayHeader : OverlayHeader
+    /// <typeparam name="T">The type of item to be represented by tabs in <see cref="TabControl{T}"/>.</typeparam>
+    public abstract class ControllableOverlayHeader<T> : OverlayHeader
     {
         protected Color4 ControlBackgroundColour
         {
@@ -36,6 +37,6 @@ namespace osu.Game.Overlays
             });
         }
 
-        protected abstract TabControl<string> CreateTabControl();
+        protected abstract TabControl<T> CreateTabControl();
     }
 }
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 59e64dfc26..768344dfee 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -15,7 +15,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.Profile
 {
-    public class ProfileHeader : TabControlOverlayHeader
+    public class ProfileHeader : TabControlOverlayHeader<string>
     {
         private UserCoverBackground coverContainer;
 
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index 1e6be9422d..d108af4348 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
@@ -9,13 +10,13 @@ using osuTK;
 
 namespace osu.Game.Overlays
 {
-    public abstract class TabControlOverlayHeader : ControllableOverlayHeader
+    public abstract class TabControlOverlayHeader<T> : ControllableOverlayHeader<T>
     {
         protected OverlayHeaderTabControl TabControl;
 
-        protected override TabControl<string> CreateTabControl() => TabControl = new OverlayHeaderTabControl();
+        protected override TabControl<T> CreateTabControl() => TabControl = new OverlayHeaderTabControl();
 
-        public class OverlayHeaderTabControl : OverlayTabControl<string>
+        public class OverlayHeaderTabControl : OverlayTabControl<T>
         {
             public OverlayHeaderTabControl()
             {
@@ -25,9 +26,15 @@ namespace osu.Game.Overlays
                 Anchor = Anchor.BottomLeft;
                 Origin = Anchor.BottomLeft;
                 Height = 35;
+
+                if (typeof(T).IsEnum)
+                {
+                    foreach (var val in (T[])Enum.GetValues(typeof(T)))
+                        AddItem(val);
+                }
             }
 
-            protected override TabItem<string> CreateTabItem(string value) => new OverlayHeaderTabItem(value)
+            protected override TabItem<T> CreateTabItem(T value) => new OverlayHeaderTabItem(value)
             {
                 AccentColour = AccentColour,
             };
@@ -42,10 +49,10 @@ namespace osu.Game.Overlays
 
             private class OverlayHeaderTabItem : OverlayTabItem
             {
-                public OverlayHeaderTabItem(string value)
+                public OverlayHeaderTabItem(T value)
                     : base(value)
                 {
-                    Text.Text = value;
+                    Text.Text = value.ToString().ToLowerInvariant();
                     Text.Font = OsuFont.GetFont(size: 14);
                     Bar.ExpandedSize = 5;
                 }

From 351aaf41d93765cb7e85a7299e18deffc10df473 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 8 Jan 2020 00:54:02 +0300
Subject: [PATCH 00114/10326] Fix parameter naming

---
 .../Visual/UserInterface/TestSceneOverlayHeaders.cs         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs
index 3ed5e53260..bede4e38b8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs
@@ -76,10 +76,10 @@ namespace osu.Game.Tests.Visual.UserInterface
                         Margin = new MarginPadding(20),
                         Text = name,
                     },
-                    header.With(header =>
+                    header.With(h =>
                     {
-                        header.Anchor = Anchor.TopCentre;
-                        header.Origin = Anchor.TopCentre;
+                        h.Anchor = Anchor.TopCentre;
+                        h.Origin = Anchor.TopCentre;
                     })
                 }
             });

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 00115/10326] 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 00116/10326] 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 00117/10326] 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 00118/10326] 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 00119/10326] 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 00120/10326] 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 6500cc967fff845a8e65cd3fc1a7a666be43669e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jan 2020 06:58:35 +0300
Subject: [PATCH 00121/10326] Implement SongTicker component

---
 osu.Game/Screens/Menu/MainMenu.cs   |  7 +++
 osu.Game/Screens/Menu/SongTicker.cs | 66 +++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 osu.Game/Screens/Menu/SongTicker.cs

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index b28d572b5c..47c86fc1ae 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -75,6 +75,13 @@ namespace osu.Game.Screens.Menu
             holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
 
+            AddInternal(new SongTicker
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                Margin = new MarginPadding { Right = 15 }
+            });
+
             if (host.CanExit)
             {
                 AddInternal(exitConfirmOverlay = new ExitConfirmOverlay
diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
new file mode 100644
index 0000000000..504b016019
--- /dev/null
+++ b/osu.Game/Screens/Menu/SongTicker.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+using osu.Game.Graphics;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Screens.Menu
+{
+    public class SongTicker : Container
+    {
+        private const int duration = 500;
+
+        [Resolved]
+        private Bindable<WorkingBeatmap> beatmap { get; set; }
+
+        private readonly Bindable<WorkingBeatmap> workingBeatmap = new Bindable<WorkingBeatmap>();
+        private readonly OsuSpriteText title, artist;
+
+        public SongTicker()
+        {
+            AutoSizeAxes = Axes.Both;
+            Child = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 3),
+                Children = new Drawable[]
+                {
+                    title = new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Font = OsuFont.GetFont(size: 24, weight: FontWeight.Light, italics: true)
+                    },
+                    artist = new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Font = OsuFont.GetFont(size: 16)
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            workingBeatmap.BindTo(beatmap);
+            workingBeatmap.BindValueChanged(onBeatmapChanged);
+        }
+
+        private void onBeatmapChanged(ValueChangedEvent<WorkingBeatmap> working)
+        {
+            title.Text = working.NewValue?.Metadata?.Title;
+            artist.Text = working.NewValue?.Metadata?.Artist;
+
+            this.FadeIn(duration, Easing.OutQuint).Delay(4000).Then().FadeOut(duration, Easing.OutQuint);
+        }
+    }
+}

From 7716a555ecb71fd5d3ad290bc22d89daf4a281c1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jan 2020 07:08:00 +0300
Subject: [PATCH 00122/10326] Move only ButtonSystem on screen changes rather
 than everything

---
 osu.Game/Screens/Menu/MainMenu.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 47c86fc1ae..c4465dce17 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -69,6 +69,8 @@ namespace osu.Game.Screens.Menu
 
         private ExitConfirmOverlay exitConfirmOverlay;
 
+        private ParallaxContainer buttonsContainer;
+
         [BackgroundDependencyLoader(true)]
         private void load(DirectOverlay direct, SettingsOverlay settings, OsuConfigManager config, SessionStatics statics)
         {
@@ -79,7 +81,7 @@ namespace osu.Game.Screens.Menu
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
-                Margin = new MarginPadding { Right = 15 }
+                Margin = new MarginPadding { Right = 15, Top = 5 }
             });
 
             if (host.CanExit)
@@ -98,7 +100,7 @@ namespace osu.Game.Screens.Menu
 
             AddRangeInternal(new Drawable[]
             {
-                new ParallaxContainer
+                buttonsContainer = new ParallaxContainer
                 {
                     ParallaxAmount = 0.01f,
                     Children = new Drawable[]
@@ -197,7 +199,7 @@ namespace osu.Game.Screens.Menu
                 buttons.State = ButtonSystemState.TopLevel;
 
                 this.FadeIn(FADE_IN_DURATION, Easing.OutQuint);
-                this.MoveTo(new Vector2(0, 0), FADE_IN_DURATION, Easing.OutQuint);
+                buttonsContainer.MoveTo(new Vector2(0, 0), FADE_IN_DURATION, Easing.OutQuint);
 
                 sideFlashes.Delay(FADE_IN_DURATION).FadeIn(64, Easing.InQuint);
             }
@@ -234,7 +236,7 @@ namespace osu.Game.Screens.Menu
             buttons.State = ButtonSystemState.EnteringMode;
 
             this.FadeOut(FADE_OUT_DURATION, Easing.InSine);
-            this.MoveTo(new Vector2(-800, 0), FADE_OUT_DURATION, Easing.InSine);
+            buttonsContainer.MoveTo(new Vector2(-800, 0), FADE_OUT_DURATION, Easing.InSine);
 
             sideFlashes.FadeOut(64, Easing.OutQuint);
         }

From d59cae33d3f0ff67fc5f6a38a7a2c02449bcb110 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jan 2020 07:17:13 +0300
Subject: [PATCH 00123/10326] Some animation adjustments

---
 osu.Game/Screens/Menu/MainMenu.cs   | 6 +++++-
 osu.Game/Screens/Menu/SongTicker.cs | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index c4465dce17..0b267731d8 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -70,6 +70,7 @@ namespace osu.Game.Screens.Menu
         private ExitConfirmOverlay exitConfirmOverlay;
 
         private ParallaxContainer buttonsContainer;
+        private SongTicker songTicker;
 
         [BackgroundDependencyLoader(true)]
         private void load(DirectOverlay direct, SettingsOverlay settings, OsuConfigManager config, SessionStatics statics)
@@ -77,7 +78,7 @@ namespace osu.Game.Screens.Menu
             holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
 
-            AddInternal(new SongTicker
+            AddInternal(songTicker = new SongTicker
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
@@ -235,6 +236,7 @@ namespace osu.Game.Screens.Menu
 
             buttons.State = ButtonSystemState.EnteringMode;
 
+            songTicker.Hide();
             this.FadeOut(FADE_OUT_DURATION, Easing.InSine);
             buttonsContainer.MoveTo(new Vector2(-800, 0), FADE_OUT_DURATION, Easing.InSine);
 
@@ -244,6 +246,7 @@ namespace osu.Game.Screens.Menu
         public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
+            songTicker.Hide();
 
             (Background as BackgroundScreenDefault)?.Next();
 
@@ -272,6 +275,7 @@ namespace osu.Game.Screens.Menu
 
             buttons.State = ButtonSystemState.Exit;
             this.FadeOut(3000);
+            songTicker.Hide();
             return base.OnExiting(next);
         }
 
diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index 504b016019..eb7012a150 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Menu
 {
     public class SongTicker : Container
     {
-        private const int duration = 500;
+        private const int fade_duration = 800;
 
         [Resolved]
         private Bindable<WorkingBeatmap> beatmap { get; set; }
@@ -60,7 +60,7 @@ namespace osu.Game.Screens.Menu
             title.Text = working.NewValue?.Metadata?.Title;
             artist.Text = working.NewValue?.Metadata?.Artist;
 
-            this.FadeIn(duration, Easing.OutQuint).Delay(4000).Then().FadeOut(duration, Easing.OutQuint);
+            this.FadeIn(fade_duration, Easing.OutQuint).Delay(4000).Then().FadeOut(fade_duration, Easing.OutQuint);
         }
     }
 }

From e6210f10b7de81a12ef03148202ae14933a77fb7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jan 2020 07:32:40 +0300
Subject: [PATCH 00124/10326] Add unicode metadata support

---
 osu.Game/Screens/Menu/SongTicker.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index eb7012a150..d9b66d06e9 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -9,6 +9,7 @@ using osuTK;
 using osu.Game.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Screens.Menu
 {
@@ -57,8 +58,13 @@ namespace osu.Game.Screens.Menu
 
         private void onBeatmapChanged(ValueChangedEvent<WorkingBeatmap> working)
         {
-            title.Text = working.NewValue?.Metadata?.Title;
-            artist.Text = working.NewValue?.Metadata?.Artist;
+            if (working.NewValue?.Beatmap == null)
+                return;
+
+            var metadata = working.NewValue?.Metadata;
+
+            title.Text = new LocalisedString((metadata.TitleUnicode, metadata.Title));
+            artist.Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist));
 
             this.FadeIn(fade_duration, Easing.OutQuint).Delay(4000).Then().FadeOut(fade_duration, Easing.OutQuint);
         }

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 00125/10326] 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 d25ef1966d32bda80e258da550a6c87768ca0eeb Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jan 2020 17:48:09 +0300
Subject: [PATCH 00126/10326] Remove unnecessary local bindable

---
 osu.Game/Screens/Menu/SongTicker.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index d9b66d06e9..f2c861a296 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private Bindable<WorkingBeatmap> beatmap { get; set; }
 
-        private readonly Bindable<WorkingBeatmap> workingBeatmap = new Bindable<WorkingBeatmap>();
         private readonly OsuSpriteText title, artist;
 
         public SongTicker()
@@ -52,8 +51,7 @@ namespace osu.Game.Screens.Menu
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            workingBeatmap.BindTo(beatmap);
-            workingBeatmap.BindValueChanged(onBeatmapChanged);
+            beatmap.BindValueChanged(onBeatmapChanged);
         }
 
         private void onBeatmapChanged(ValueChangedEvent<WorkingBeatmap> working)

From 81948744d056acd6ca24d0f6875236fcef3f034a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jan 2020 17:50:13 +0300
Subject: [PATCH 00127/10326] remove unnecessary null checks

---
 osu.Game/Screens/Menu/SongTicker.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index f2c861a296..8eae94ae1d 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -56,10 +56,7 @@ namespace osu.Game.Screens.Menu
 
         private void onBeatmapChanged(ValueChangedEvent<WorkingBeatmap> working)
         {
-            if (working.NewValue?.Beatmap == null)
-                return;
-
-            var metadata = working.NewValue?.Metadata;
+            var metadata = working.NewValue.Metadata;
 
             title.Text = new LocalisedString((metadata.TitleUnicode, metadata.Title));
             artist.Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist));

From bd33687f533a969d7bd855054b50f840614ef754 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jan 2020 18:27:22 +0300
Subject: [PATCH 00128/10326] Add AllowUpdates flag to SongTicker

---
 osu.Game/Screens/Menu/MainMenu.cs   | 5 ++++-
 osu.Game/Screens/Menu/SongTicker.cs | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 0b267731d8..72b61eb05c 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -237,6 +237,8 @@ namespace osu.Game.Screens.Menu
             buttons.State = ButtonSystemState.EnteringMode;
 
             songTicker.Hide();
+            songTicker.AllowUpdates = false;
+
             this.FadeOut(FADE_OUT_DURATION, Easing.InSine);
             buttonsContainer.MoveTo(new Vector2(-800, 0), FADE_OUT_DURATION, Easing.InSine);
 
@@ -246,7 +248,8 @@ namespace osu.Game.Screens.Menu
         public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
-            songTicker.Hide();
+
+            songTicker.AllowUpdates = true;
 
             (Background as BackgroundScreenDefault)?.Next();
 
diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index 8eae94ae1d..f858d162d2 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Screens.Menu
     {
         private const int fade_duration = 800;
 
+        public bool AllowUpdates { get; set; } = true;
+
         [Resolved]
         private Bindable<WorkingBeatmap> beatmap { get; set; }
 
@@ -56,6 +58,9 @@ namespace osu.Game.Screens.Menu
 
         private void onBeatmapChanged(ValueChangedEvent<WorkingBeatmap> working)
         {
+            if (!AllowUpdates)
+                return;
+
             var metadata = working.NewValue.Metadata;
 
             title.Text = new LocalisedString((metadata.TitleUnicode, metadata.Title));

From 730cc92bf36ddf5c7a2eb53d5c7042b422708de5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jan 2020 22:43:07 +0300
Subject: [PATCH 00129/10326] Fade out instead of insta hiding on menu
 suspending

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

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 72b61eb05c..2de31cf399 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -236,7 +236,7 @@ namespace osu.Game.Screens.Menu
 
             buttons.State = ButtonSystemState.EnteringMode;
 
-            songTicker.Hide();
+            songTicker.FadeOut(100, Easing.OutQuint);
             songTicker.AllowUpdates = false;
 
             this.FadeOut(FADE_OUT_DURATION, Easing.InSine);

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 00130/10326] 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 00131/10326] 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 00132/10326] 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 00133/10326] 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 00134/10326] 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 00135/10326] 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 00136/10326] 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 00137/10326] 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 00138/10326] 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 c08fc62e00f5bce2b19c46f0f21573d36f477626 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 14 Jan 2020 19:59:43 +0800
Subject: [PATCH 00139/10326] expose setter of Mod

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

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 945dbe4cc9..41bf81ac05 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.UI
 
         public virtual string TooltipText { get; }
 
-        protected Mod Mod { get; private set; }
+        protected Mod Mod { get; set; }
 
         public ModIcon(Mod mod)
         {

From abdebcfddc653057d42118799185f1d02bf0c08b Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 14 Jan 2020 20:11:32 +0800
Subject: [PATCH 00140/10326] switch to changing Mod property

---
 osu.Game/Overlays/Mods/ModButton.cs | 6 +++---
 osu.Game/Rulesets/UI/ModIcon.cs     | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 69a4a4181a..77ef08f52d 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Mods
                 foregroundIcon.RotateTo(rotate_angle * direction, mod_switch_duration, mod_switch_easing);
                 backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
 
-                backgroundIcon.Icon = modAfter.Icon;
+                backgroundIcon.Mod = modAfter;
 
                 using (BeginDelayedSequence(mod_switch_duration, true))
                 {
@@ -218,8 +218,8 @@ namespace osu.Game.Overlays.Mods
         private void displayMod(Mod mod)
         {
             if (backgroundIcon != null)
-                backgroundIcon.Icon = foregroundIcon.Icon;
-            foregroundIcon.Icon = mod.Icon;
+                backgroundIcon.Mod = foregroundIcon.Mod;
+            foregroundIcon.Mod = mod;
             text.Text = mod.Name;
             Colour = mod.HasImplementation ? Color4.White : Color4.Gray;
         }
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 41bf81ac05..9a834a54af 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -34,7 +34,13 @@ namespace osu.Game.Rulesets.UI
 
         public virtual string TooltipText { get; }
 
-        protected Mod Mod { get; set; }
+        private Mod mod;
+
+        public Mod Mod
+        {
+            get => mod;
+            set => mod = value;
+        }
 
         public ModIcon(Mod mod)
         {

From 5d160376c06fd339721d2491f1d9b6217699c081 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 14 Jan 2020 21:22:00 +0800
Subject: [PATCH 00141/10326] nullable-ize Mod.Icon

---
 .../Mods/ManiaModFadeIn.cs                    |  2 +-
 .../Mods/ManiaModRandom.cs                    |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs    |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs   |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs      |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs    |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs   |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs    |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs    |  2 +-
 osu.Game/Rulesets/Mods/Mod.cs                 |  2 +-
 osu.Game/Rulesets/Mods/ModAutoplay.cs         |  2 +-
 osu.Game/Rulesets/Mods/ModCinema.cs           |  2 +-
 osu.Game/Rulesets/Mods/ModDaycore.cs          |  2 +-
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs |  2 +-
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       |  2 +-
 osu.Game/Rulesets/Mods/ModEasy.cs             |  2 +-
 osu.Game/Rulesets/Mods/ModFlashlight.cs       |  2 +-
 osu.Game/Rulesets/Mods/ModHalfTime.cs         |  2 +-
 osu.Game/Rulesets/Mods/ModHardRock.cs         |  2 +-
 osu.Game/Rulesets/Mods/ModHidden.cs           |  2 +-
 osu.Game/Rulesets/Mods/ModNightcore.cs        |  2 +-
 osu.Game/Rulesets/Mods/ModNoFail.cs           |  2 +-
 osu.Game/Rulesets/Mods/ModNoMod.cs            |  2 +-
 osu.Game/Rulesets/Mods/ModPerfect.cs          |  2 +-
 osu.Game/Rulesets/Mods/ModRelax.cs            |  2 +-
 osu.Game/Rulesets/Mods/ModSuddenDeath.cs      |  2 +-
 osu.Game/Rulesets/Mods/ModWindDown.cs         |  2 +-
 osu.Game/Rulesets/Mods/ModWindUp.cs           |  2 +-
 osu.Game/Rulesets/UI/ModIcon.cs               | 47 +++++++++++++++----
 32 files changed, 69 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index 39185e6a57..4c125ad6ef 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mania.Mods
     {
         public override string Name => "Fade In";
         public override string Acronym => "FI";
-        public override IconUsage Icon => OsuIcon.ModHidden;
+        public override IconUsage? Icon => OsuIcon.ModHidden;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => @"Keys appear out of nowhere!";
         public override double ScoreMultiplier => 1;
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs
index b12d3a7a70..14b36fb765 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Random";
         public override string Acronym => "RD";
         public override ModType Type => ModType.Conversion;
-        public override IconUsage Icon => OsuIcon.Dice;
+        public override IconUsage? Icon => OsuIcon.Dice;
         public override string Description => @"Shuffle around the keys!";
         public override double ScoreMultiplier => 1;
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 65d7acc911..fe46876050 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Autopilot";
         public override string Acronym => "AP";
-        public override IconUsage Icon => OsuIcon.ModAutopilot;
+        public override IconUsage? Icon => OsuIcon.ModAutopilot;
         public override ModType Type => ModType.Automation;
         public override string Description => @"Automatic cursor movement - just follow the rhythm.";
         public override double ScoreMultiplier => 1;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
index 831e4a700f..937473e824 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Description => "Play with blinds on your screen.";
         public override string Acronym => "BL";
 
-        public override IconUsage Icon => FontAwesome.Solid.Adjust;
+        public override IconUsage? Icon => FontAwesome.Solid.Adjust;
         public override ModType Type => ModType.DifficultyIncrease;
 
         public override bool Ranked => false;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
index 9bf7525d33..73cb483ef0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Acronym => "DF";
 
-        public override IconUsage Icon => FontAwesome.Solid.CompressArrowsAlt;
+        public override IconUsage? Icon => FontAwesome.Solid.CompressArrowsAlt;
 
         public override string Description => "Hit them at the right size!";
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
index 76676ce888..f08d4e8f5e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Acronym => "GR";
 
-        public override IconUsage Icon => FontAwesome.Solid.ArrowsAltV;
+        public override IconUsage? Icon => FontAwesome.Solid.ArrowsAltV;
 
         public override string Description => "Hit them at the right size!";
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
index eae218509e..940c888f3a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Spin In";
         public override string Acronym => "SI";
-        public override IconUsage Icon => FontAwesome.Solid.Undo;
+        public override IconUsage? Icon => FontAwesome.Solid.Undo;
         public override ModType Type => ModType.Fun;
         public override string Description => "Circles spin in. No approach circles.";
         public override double ScoreMultiplier => 1;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 1cdcddbd33..9d5d300a9e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Spun Out";
         public override string Acronym => "SO";
-        public override IconUsage Icon => OsuIcon.ModSpunout;
+        public override IconUsage? Icon => OsuIcon.ModSpunout;
         public override ModType Type => ModType.DifficultyReduction;
         public override string Description => @"Spinners will be automatically completed.";
         public override double ScoreMultiplier => 0.9;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs
index 8360e2692e..2464308347 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Name => "Target";
         public override string Acronym => "TP";
         public override ModType Type => ModType.Conversion;
-        public override IconUsage Icon => OsuIcon.ModTarget;
+        public override IconUsage? Icon => OsuIcon.ModTarget;
         public override string Description => @"Practice keeping up with the beat of the song.";
         public override double ScoreMultiplier => 1;
     }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index dff9a77807..46df963a39 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Traceable";
         public override string Acronym => "TC";
-        public override IconUsage Icon => FontAwesome.Brands.SnapchatGhost;
+        public override IconUsage? Icon => FontAwesome.Brands.SnapchatGhost;
         public override ModType Type => ModType.Fun;
         public override string Description => "Put your faith in the approach circles...";
         public override double ScoreMultiplier => 1;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
index a9475af638..cc664ae72e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Transform";
         public override string Acronym => "TR";
-        public override IconUsage Icon => FontAwesome.Solid.ArrowsAlt;
+        public override IconUsage? Icon => FontAwesome.Solid.ArrowsAlt;
         public override ModType Type => ModType.Fun;
         public override string Description => "Everything rotates. EVERYTHING.";
         public override double ScoreMultiplier => 1;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
index 1664a37a66..cc2f4c3f70 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Wiggle";
         public override string Acronym => "WG";
-        public override IconUsage Icon => FontAwesome.Solid.Certificate;
+        public override IconUsage? Icon => FontAwesome.Solid.Certificate;
         public override ModType Type => ModType.Fun;
         public override string Description => "They just won't stay still...";
         public override double ScoreMultiplier => 1;
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b780ec9e76..e168171186 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mods
         /// The icon of this mod.
         /// </summary>
         [JsonIgnore]
-        public virtual IconUsage Icon => FontAwesome.Solid.Question;
+        public virtual IconUsage? Icon => null;
 
         /// <summary>
         /// The type of this mod.
diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index 070a10b1c8..e51b8b6457 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Autoplay";
         public override string Acronym => "AT";
-        public override IconUsage Icon => OsuIcon.ModAuto;
+        public override IconUsage? Icon => OsuIcon.ModAuto;
         public override ModType Type => ModType.Automation;
         public override string Description => "Watch a perfect automated play through the song.";
         public override double ScoreMultiplier => 1;
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index 3487d49e08..cd08aee453 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Cinema";
         public override string Acronym => "CN";
-        public override IconUsage Icon => OsuIcon.ModCinema;
+        public override IconUsage? Icon => OsuIcon.ModCinema;
         public override string Description => "Watch the video without visual distractions.";
 
         public void ApplyToHUD(HUDOverlay overlay)
diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index 71a666414f..f3a4fd535c 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Daycore";
         public override string Acronym => "DC";
-        public override IconUsage Icon => FontAwesome.Solid.Question;
+        public override IconUsage? Icon => FontAwesome.Solid.Question;
         public override string Description => "Whoaaaaa...";
 
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index c5b8a1bc73..b74bf01d1b 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override ModType Type => ModType.Conversion;
 
-        public override IconUsage Icon => FontAwesome.Solid.Hammer;
+        public override IconUsage? Icon => FontAwesome.Solid.Hammer;
 
         public override double ScoreMultiplier => 1.0;
 
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 7015460c51..152657da33 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Double Time";
         public override string Acronym => "DT";
-        public override IconUsage Icon => OsuIcon.ModDoubletime;
+        public override IconUsage? Icon => OsuIcon.ModDoubletime;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => "Zoooooooooom...";
         public override bool Ranked => true;
diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index ec0f50c0be..b56be95dfe 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Easy";
         public override string Acronym => "EZ";
-        public override IconUsage Icon => OsuIcon.ModEasy;
+        public override IconUsage? Icon => OsuIcon.ModEasy;
         public override ModType Type => ModType.DifficultyReduction;
         public override double ScoreMultiplier => 0.5;
         public override bool Ranked => true;
diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 4f939362bb..35a8334237 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Flashlight";
         public override string Acronym => "FL";
-        public override IconUsage Icon => OsuIcon.ModFlashlight;
+        public override IconUsage? Icon => OsuIcon.ModFlashlight;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => "Restricted view area.";
         public override bool Ranked => true;
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 15f7afa312..203b88951c 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Half Time";
         public override string Acronym => "HT";
-        public override IconUsage Icon => OsuIcon.ModHalftime;
+        public override IconUsage? Icon => OsuIcon.ModHalftime;
         public override ModType Type => ModType.DifficultyReduction;
         public override string Description => "Less zoom...";
         public override bool Ranked => true;
diff --git a/osu.Game/Rulesets/Mods/ModHardRock.cs b/osu.Game/Rulesets/Mods/ModHardRock.cs
index a613d41cf4..58c9a58408 100644
--- a/osu.Game/Rulesets/Mods/ModHardRock.cs
+++ b/osu.Game/Rulesets/Mods/ModHardRock.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Hard Rock";
         public override string Acronym => "HR";
-        public override IconUsage Icon => OsuIcon.ModHardrock;
+        public override IconUsage? Icon => OsuIcon.ModHardrock;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => "Everything just got a bit harder...";
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModDifficultyAdjust) };
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 0934992f55..4e4a75db82 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Hidden";
         public override string Acronym => "HD";
-        public override IconUsage Icon => OsuIcon.ModHidden;
+        public override IconUsage? Icon => OsuIcon.ModHidden;
         public override ModType Type => ModType.DifficultyIncrease;
         public override bool Ranked => true;
 
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index a8c79bb896..1df2aeb348 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Nightcore";
         public override string Acronym => "NC";
-        public override IconUsage Icon => OsuIcon.ModNightcore;
+        public override IconUsage? Icon => OsuIcon.ModNightcore;
         public override string Description => "Uguuuuuuuu...";
 
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);
diff --git a/osu.Game/Rulesets/Mods/ModNoFail.cs b/osu.Game/Rulesets/Mods/ModNoFail.cs
index 49ee3354c3..b95ec7490e 100644
--- a/osu.Game/Rulesets/Mods/ModNoFail.cs
+++ b/osu.Game/Rulesets/Mods/ModNoFail.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "No Fail";
         public override string Acronym => "NF";
-        public override IconUsage Icon => OsuIcon.ModNofail;
+        public override IconUsage? Icon => OsuIcon.ModNofail;
         public override ModType Type => ModType.DifficultyReduction;
         public override string Description => "You can't fail, no matter what.";
         public override double ScoreMultiplier => 0.5;
diff --git a/osu.Game/Rulesets/Mods/ModNoMod.cs b/osu.Game/Rulesets/Mods/ModNoMod.cs
index 487985b2b3..379a2122f2 100644
--- a/osu.Game/Rulesets/Mods/ModNoMod.cs
+++ b/osu.Game/Rulesets/Mods/ModNoMod.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "No Mod";
         public override string Acronym => "NM";
         public override double ScoreMultiplier => 1;
-        public override IconUsage Icon => FontAwesome.Solid.Ban;
+        public override IconUsage? Icon => FontAwesome.Solid.Ban;
         public override ModType Type => ModType.System;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModPerfect.cs b/osu.Game/Rulesets/Mods/ModPerfect.cs
index afa263f1c9..882d3ebd6a 100644
--- a/osu.Game/Rulesets/Mods/ModPerfect.cs
+++ b/osu.Game/Rulesets/Mods/ModPerfect.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Perfect";
         public override string Acronym => "PF";
-        public override IconUsage Icon => OsuIcon.ModPerfect;
+        public override IconUsage? Icon => OsuIcon.ModPerfect;
         public override string Description => "SS or quit.";
 
         protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result) => result.Type != result.Judgement.MaxResult;
diff --git a/osu.Game/Rulesets/Mods/ModRelax.cs b/osu.Game/Rulesets/Mods/ModRelax.cs
index 7c355577d4..b6fec42f43 100644
--- a/osu.Game/Rulesets/Mods/ModRelax.cs
+++ b/osu.Game/Rulesets/Mods/ModRelax.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Relax";
         public override string Acronym => "RX";
-        public override IconUsage Icon => OsuIcon.ModRelax;
+        public override IconUsage? Icon => OsuIcon.ModRelax;
         public override ModType Type => ModType.Automation;
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModSuddenDeath) };
diff --git a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
index a4d0631d8c..8799431f1d 100644
--- a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
+++ b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Sudden Death";
         public override string Acronym => "SD";
-        public override IconUsage Icon => OsuIcon.ModSuddendeath;
+        public override IconUsage? Icon => OsuIcon.ModSuddendeath;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => "Miss and fail.";
         public override double ScoreMultiplier => 1;
diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index 5416f1ac22..da3bd75b44 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "Wind Down";
         public override string Acronym => "WD";
         public override string Description => "Sloooow doooown...";
-        public override IconUsage Icon => FontAwesome.Solid.ChevronCircleDown;
+        public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleDown;
         public override double ScoreMultiplier => 1.0;
 
         [SettingSource("Final rate", "The speed increase to ramp towards")]
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 3cf584f3dd..3f456a42a5 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "Wind Up";
         public override string Acronym => "WU";
         public override string Description => "Can you keep up?";
-        public override IconUsage Icon => FontAwesome.Solid.ChevronCircleUp;
+        public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleUp;
         public override double ScoreMultiplier => 1.0;
 
         [SettingSource("Final rate", "The speed increase to ramp towards")]
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 9a834a54af..6d4324f6a5 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osuTK;
 using osu.Framework.Bindables;
@@ -20,16 +21,11 @@ namespace osu.Game.Rulesets.UI
         public readonly BindableBool Selected = new BindableBool();
 
         private readonly SpriteIcon modIcon;
+        private readonly SpriteText modAcronym;
         private readonly SpriteIcon background;
 
         private const float size = 80;
 
-        public IconUsage Icon
-        {
-            get => modIcon.Icon;
-            set => modIcon.Icon = value;
-        }
-
         private readonly ModType type;
 
         public virtual string TooltipText { get; }
@@ -39,12 +35,16 @@ namespace osu.Game.Rulesets.UI
         public Mod Mod
         {
             get => mod;
-            set => mod = value;
+            set
+            {
+                mod = value;
+                updateMod(value);
+            }
         }
 
         public ModIcon(Mod mod)
         {
-            Mod = mod ?? throw new ArgumentNullException(nameof(mod));
+            this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
 
             type = mod.Type;
 
@@ -62,15 +62,44 @@ namespace osu.Game.Rulesets.UI
                     Icon = OsuIcon.ModBg,
                     Shadow = true,
                 },
+                modAcronym = new OsuSpriteText
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Colour = OsuColour.Gray(84),
+                    Alpha = 0,
+
+                    Font = OsuFont.Numeric.With(null, size - 55),
+                    UseFullGlyphHeight = false,
+                    Text = mod.Acronym
+                },
                 modIcon = new SpriteIcon
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
                     Colour = OsuColour.Gray(84),
                     Size = new Vector2(size - 35),
-                    Icon = mod.Icon
+                    Icon = FontAwesome.Solid.Question
                 },
             };
+
+            updateMod(mod);
+        }
+
+        private void updateMod(Mod value)
+        {
+            modAcronym.Text = value.Acronym;
+            modIcon.Icon = value.Icon ?? FontAwesome.Solid.Question;
+
+            if (value.Icon is null)
+            {
+                modIcon.FadeOut();
+                modAcronym.FadeIn();
+                return;
+            }
+
+            modIcon.FadeIn();
+            modAcronym.FadeOut();
         }
 
         private Color4 backgroundColour;

From 12cf30459808c0a9ab04043693d87b6cd21d5505 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 14 Jan 2020 21:23:09 +0800
Subject: [PATCH 00142/10326] Update ModDaycore icon

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

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

From a0b6cadab58a9c733469785619221b11610e9c58 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 15 Jan 2020 17:36:27 +0800
Subject: [PATCH 00143/10326] add test scene

---
 .../UserInterface/TestSceneModButton.cs       | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
new file mode 100644
index 0000000000..0cc7f6a399
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
@@ -0,0 +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 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.Sprites;
+using osu.Framework.Testing;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Mods;
+using osu.Game.Overlays.Mods.Sections;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneModButton : OsuTestScene
+    {
+        private ModButton modButton;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Children = new Drawable[]
+            {
+                modButton = new ModButton(new MultiMod(new TestMod1(), new TestMod2(), new TestMod3(), new TestMod4()))
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                }
+            };
+        });
+
+        private class TestMod1 : TestMod
+        {
+            public override string Name => "Test mod 1";
+
+            public override string Acronym => "M1";
+        }
+        
+        private class TestMod2 : TestMod
+        {
+            public override string Name => "Test mod 2";
+
+            public override string Acronym => "M2";
+
+            public override IconUsage? Icon => FontAwesome.Solid.Exclamation;
+        }
+        
+        private class TestMod3 : TestMod
+        {
+            public override string Name => "Test mod 3";
+
+            public override string Acronym => "M3";
+
+            public override IconUsage? Icon => FontAwesome.Solid.ArrowRight;
+        }
+
+        private class TestMod4 : TestMod
+        {
+            public override string Name => "Test mod 4";
+
+            public override string Acronym => "M4";
+        }
+
+        private abstract class TestMod : Mod, IApplicableMod
+        {
+            public override double ScoreMultiplier => 1.0;
+        }
+    }
+}
\ No newline at end of file

From 970653470cac52f1241ce6a88e193c9a442ad920 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 15 Jan 2020 17:49:45 +0800
Subject: [PATCH 00144/10326] format

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

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 6d4324f6a5..7e22fd2946 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.UI
                     Colour = OsuColour.Gray(84),
                     Alpha = 0,
 
-                    Font = OsuFont.Numeric.With(null, size - 55),
+                    Font = OsuFont.Numeric.With(null, size - 57.5f),
                     UseFullGlyphHeight = false,
                     Text = mod.Acronym
                 },

From 62615fb8c1e301dcb55af073cc738afe07ea9ec0 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 15 Jan 2020 18:00:14 +0800
Subject: [PATCH 00145/10326] format

---
 osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
index 0cc7f6a399..856422016d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             public override string Acronym => "M1";
         }
-        
+
         private class TestMod2 : TestMod
         {
             public override string Name => "Test mod 2";
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             public override IconUsage? Icon => FontAwesome.Solid.Exclamation;
         }
-        
+
         private class TestMod3 : TestMod
         {
             public override string Name => "Test mod 3";
@@ -81,4 +81,4 @@ namespace osu.Game.Tests.Visual.UserInterface
             public override double ScoreMultiplier => 1.0;
         }
     }
-}
\ No newline at end of file
+}

From d57f55f053d2da94b7816ba16d5a603102147e67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Jan 2020 19:09:49 +0900
Subject: [PATCH 00146/10326] Apply remaining changes required to restore
 previous functionality

---
 .../Edit/ManiaBlueprintContainer.cs           |   6 +
 .../Edit/ManiaHitObjectComposer.cs            |   2 +-
 .../Edit/OsuBlueprintContainer.cs             |   8 +-
 .../Edit/OsuHitObjectComposer.cs              |   2 +-
 .../Editor/TestSceneBlueprintContainer.cs     |   4 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |   2 +-
 .../Compose/Components/BlueprintContainer.cs  | 136 ++++-------------
 .../Components/ComposeBlueprintContainer.cs   | 137 ++++++++++++++++++
 .../Edit/Compose/Components/DragBox.cs        |   8 +-
 .../Compose/Components/SelectionHandler.cs    |   2 +-
 .../Timeline/TimelineHitObjectDisplay.cs      |  30 +++-
 11 files changed, 221 insertions(+), 116 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
index 9cb4e54234..5f66ae7491 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.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.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -11,6 +12,11 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public class ManiaBlueprintContainer : ComposeBlueprintContainer
     {
+        public ManiaBlueprintContainer(IEnumerable<DrawableHitObject> drawableHitObjects)
+            : base(drawableHitObjects)
+        {
+        }
+
         public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
         {
             switch (hitObject)
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 824c92184a..62b609610f 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             return drawableRuleset;
         }
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new ManiaBlueprintContainer();
+        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new ManiaBlueprintContainer(drawableRuleset.Playfield.AllHitObjects);
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
index a6a7d9bcc0..fc856d9810 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.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.Edit;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
@@ -13,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuBlueprintContainer : ComposeBlueprintContainer
     {
-        public override SelectionHandler CreateSelectionHandler() => new OsuSelectionHandler();
+        protected override SelectionHandler CreateSelectionHandler() => new OsuSelectionHandler();
 
         public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
         {
@@ -31,5 +32,10 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             return base.CreateBlueprintFor(hitObject);
         }
+
+        public OsuBlueprintContainer(IEnumerable<DrawableHitObject> drawableHitObjects)
+            : base(drawableHitObjects)
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 28f7768aac..b01488e7c2 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             new SpinnerCompositionTool()
         };
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new OsuBlueprintContainer();
+        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new OsuBlueprintContainer(HitObjects);
 
         protected override DistanceSnapGrid CreateDistanceSnapGrid(IEnumerable<HitObject> selectedHitObjects)
         {
diff --git a/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs b/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs
index 67b0b61545..a230e5221f 100644
--- a/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs
+++ b/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Tests.Visual;
 
@@ -12,7 +14,7 @@ namespace osu.Game.Tests.Editor
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Child = new ComposeBlueprintContainer();
+            Child = new ComposeBlueprintContainer(new List<DrawableHitObject>());
         });
     }
 }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 536c7767b7..52c0701f4f 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Edit
         private IBeatmapProcessor beatmapProcessor;
 
         private DrawableEditRulesetWrapper<TObject> drawableRulesetWrapper;
-        private BlueprintContainer blueprintContainer;
+        private ComposeBlueprintContainer blueprintContainer;
         private Container distanceSnapGridContainer;
         private DistanceSnapGrid distanceSnapGrid;
         private readonly List<Container> layerContainers = new List<Container>();
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index a8fb87c1b0..7944476100 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -14,7 +14,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
@@ -30,12 +29,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
     {
         public event Action<IEnumerable<HitObject>> SelectionChanged;
 
-        private DragBox dragBox;
+        protected DragBox DragBox;
+
         private SelectionBlueprintContainer selectionBlueprints;
-        private Container<PlacementBlueprint> placementBlueprintContainer;
-        private PlacementBlueprint currentPlacement;
+
         private SelectionHandler selectionHandler;
-        private InputManager inputManager;
 
         [Resolved]
         private IAdjustableClock adjustableClock { get; set; }
@@ -43,6 +41,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private IDistanceSnapProvider snapProvider { get; set; }
+
         protected BlueprintContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -51,13 +52,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Creates a <see cref="SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
         /// </summary>
-        public virtual SelectionHandler CreateSelectionHandler() => new SelectionHandler();
+        protected virtual SelectionHandler CreateSelectionHandler() => new SelectionHandler();
 
         /// <summary>
         /// Creates a <see cref="SelectionBlueprint"/> for a specific <see cref="DrawableHitObject"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="DrawableHitObject"/> to create the overlay for.</param>
-        public virtual SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
+        protected virtual SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => null;
+
+        protected virtual DragBox CreateDragBox(Action<RectangleF> performSelect) => new DragBox(performSelect);
 
         [BackgroundDependencyLoader]
         private void load()
@@ -65,46 +68,24 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectionHandler = CreateSelectionHandler();
             selectionHandler.DeselectAll = deselectAll;
 
-            InternalChildren = new[]
+            AddRangeInternal(new[]
             {
-                dragBox = new DragBox(select),
+                DragBox = CreateDragBox(select),
                 selectionHandler,
                 selectionBlueprints = new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both },
-                placementBlueprintContainer = new Container<PlacementBlueprint> { RelativeSizeAxes = Axes.Both },
-                dragBox.CreateProxy()
-            };
+                DragBox.CreateProxy().With(p => p.Depth = int.MinValue)
+            });
 
             foreach (var obj in beatmap.HitObjects)
-                addBlueprintFor(obj);
+                AddBlueprintFor(obj);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            beatmap.HitObjectAdded += addBlueprintFor;
+            beatmap.HitObjectAdded += AddBlueprintFor;
             beatmap.HitObjectRemoved += removeBlueprintFor;
-
-            inputManager = GetContainingInputManager();
-        }
-
-        private HitObjectCompositionTool currentTool;
-
-        /// <summary>
-        /// The current placement tool.
-        /// </summary>
-        public HitObjectCompositionTool CurrentTool
-        {
-            get => currentTool;
-            set
-            {
-                if (currentTool == value)
-                    return;
-
-                currentTool = value;
-
-                refreshTool();
-            }
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)
@@ -148,17 +129,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return e.Button == MouseButton.Left;
         }
 
-        protected override bool OnMouseMove(MouseMoveEvent e)
-        {
-            if (currentPlacement != null)
-            {
-                updatePlacementPosition(e.ScreenSpaceMousePosition);
-                return true;
-            }
-
-            return base.OnMouseMove(e);
-        }
-
         protected override bool OnDragStart(DragStartEvent e)
         {
             if (e.Button == MouseButton.Right)
@@ -166,8 +136,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (!beginSelectionMovement())
             {
-                dragBox.UpdateDrag(e);
-                dragBox.FadeIn(250, Easing.OutQuint);
+                if (!DragBox.UpdateDrag(e))
+                    return false;
+
+                DragBox.FadeIn(250, Easing.OutQuint);
             }
 
             return true;
@@ -179,7 +151,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
 
             if (!moveCurrentSelection(e))
-                dragBox.UpdateDrag(e);
+            {
+                if (!DragBox.UpdateDrag(e))
+                    return false;
+            }
 
             return true;
         }
@@ -191,7 +166,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (!finishSelectionMovement())
             {
-                dragBox.FadeOut(250, Easing.OutQuint);
+                DragBox.FadeOut(250, Easing.OutQuint);
                 selectionHandler.UpdateVisibility();
             }
 
@@ -229,30 +204,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public bool OnReleased(PlatformAction action) => false;
 
-        protected override void Update()
-        {
-            base.Update();
-
-            if (currentPlacement != null)
-            {
-                if (composer.CursorInPlacementArea)
-                    currentPlacement.State = PlacementState.Shown;
-                else if (currentPlacement?.PlacementBegun == false)
-                    currentPlacement.State = PlacementState.Hidden;
-            }
-        }
-
         #region Blueprint Addition/Removal
 
-        private void addBlueprintFor(HitObject hitObject)
-        {
-            var drawable = composer.HitObjects.FirstOrDefault(d => d.HitObject == hitObject);
-            if (drawable == null)
-                return;
-
-            addBlueprintFor(drawable);
-        }
-
         private void removeBlueprintFor(HitObject hitObject)
         {
             var blueprint = selectionBlueprints.Single(m => m.DrawableObject.HitObject == hitObject);
@@ -267,10 +220,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectionBlueprints.Remove(blueprint);
         }
 
-        private void addBlueprintFor(DrawableHitObject hitObject)
+        protected virtual void AddBlueprintFor(HitObject hitObject)
         {
-            refreshTool();
-
             var blueprint = CreateBlueprintFor(hitObject);
             if (blueprint == null)
                 return;
@@ -283,37 +234,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #endregion
 
-        #region Placement
-
-        /// <summary>
-        /// Refreshes the current placement tool.
-        /// </summary>
-        private void refreshTool()
-        {
-            placementBlueprintContainer.Clear();
-            currentPlacement = null;
-
-            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 updatePlacementPosition(Vector2 screenSpacePosition)
-        {
-            Vector2 snappedGridPosition = composer.GetSnappedPosition(ToLocalSpace(screenSpacePosition), 0).position;
-            Vector2 snappedScreenSpacePosition = ToScreenSpace(snappedGridPosition);
-
-            currentPlacement.UpdatePosition(snappedScreenSpacePosition);
-        }
-
-        #endregion
-
         #region Selection
 
         /// <summary>
@@ -449,7 +369,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // The final movement position, relative to screenSpaceMovementStartPosition
             Vector2 movePosition = startPosition + e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
-            (Vector2 snappedPosition, double snappedTime) = composer.GetSnappedPosition(ToLocalSpace(movePosition), draggedObject.StartTime);
+            (Vector2 snappedPosition, double snappedTime) = snapProvider.GetSnappedPosition(ToLocalSpace(movePosition), draggedObject.StartTime);
 
             // Move the hitobjects
             if (!selectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, startPosition, ToScreenSpace(snappedPosition))))
@@ -486,7 +406,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (beatmap != null)
             {
-                beatmap.HitObjectAdded -= addBlueprintFor;
+                beatmap.HitObjectAdded -= AddBlueprintFor;
                 beatmap.HitObjectRemoved -= removeBlueprintFor;
             }
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 9267006e4c..1576def38e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -1,6 +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.Collections.Generic;
+using System.Linq;
+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;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
@@ -8,5 +21,129 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public class ComposeBlueprintContainer : BlueprintContainer
     {
+        [Resolved]
+        private HitObjectComposer composer { get; set; }
+
+        private PlacementBlueprint currentPlacement;
+
+        private readonly Container<PlacementBlueprint> placementBlueprintContainer;
+
+        private InputManager inputManager;
+
+        private readonly IEnumerable<DrawableHitObject> drawableHitObjects;
+
+        public ComposeBlueprintContainer(IEnumerable<DrawableHitObject> drawableHitObjects)
+        {
+            this.drawableHitObjects = drawableHitObjects;
+
+            placementBlueprintContainer = new Container<PlacementBlueprint>
+            {
+                RelativeSizeAxes = Axes.Both
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(placementBlueprintContainer);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            inputManager = GetContainingInputManager();
+        }
+
+        #region Placement
+
+        /// <summary>
+        /// Refreshes the current placement tool.
+        /// </summary>
+        private void refreshTool()
+        {
+            placementBlueprintContainer.Clear();
+            currentPlacement = null;
+
+            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 updatePlacementPosition(Vector2 screenSpacePosition)
+        {
+            Vector2 snappedGridPosition = composer.GetSnappedPosition(ToLocalSpace(screenSpacePosition), 0).position;
+            Vector2 snappedScreenSpacePosition = ToScreenSpace(snappedGridPosition);
+
+            currentPlacement.UpdatePosition(snappedScreenSpacePosition);
+        }
+
+        #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();
+
+            if (currentPlacement != null)
+            {
+                if (composer.CursorInPlacementArea)
+                    currentPlacement.State = PlacementState.Shown;
+                else if (currentPlacement?.PlacementBegun == false)
+                    currentPlacement.State = PlacementState.Hidden;
+            }
+        }
+
+        protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
+        {
+            var drawable = drawableHitObjects.FirstOrDefault(d => d.HitObject == hitObject);
+            if (drawable == null)
+                return null;
+
+            return CreateBlueprintFor(drawable);
+        }
+
+        public virtual SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
+
+        protected override void AddBlueprintFor(HitObject hitObject)
+        {
+            refreshTool();
+            base.AddBlueprintFor(hitObject);
+        }
+
+        private HitObjectCompositionTool currentTool;
+
+        /// <summary>
+        /// The current placement tool.
+        /// </summary>
+        public HitObjectCompositionTool CurrentTool
+        {
+            get => currentTool;
+            set
+            {
+                if (currentTool == value)
+                    return;
+
+                currentTool = value;
+
+                refreshTool();
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
index 2a510e74fd..f522ca356f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
@@ -50,7 +50,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
         }
 
-        public void UpdateDrag(MouseButtonEvent e)
+        /// <summary>
+        /// Handle a forwarded mouse event.
+        /// </summary>
+        /// <param name="e">The mouse event.</param>
+        /// <returns>Whether the event should be handled and blocking.</returns>
+        public virtual bool UpdateDrag(MouseButtonEvent e)
         {
             var dragPosition = e.ScreenSpaceMousePosition;
             var dragStartPosition = e.ScreenSpaceMouseDownPosition;
@@ -67,6 +72,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             box.Size = bottomRight - topLeft;
 
             performSelection?.Invoke(dragRectangle);
+            return true;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index e2d7855eb5..bff94e66ed 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private Drawable outline;
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private IPlacementHandler placementHandler { get; set; }
 
         public SelectionHandler()
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index 12909f257d..f521d08ada 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -1,11 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Linq;
 using osu.Framework.Allocation;
 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.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -26,7 +29,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             this.beatmap = beatmap;
 
-            AddInternal(content = new TimelinePart());
+            AddInternal(content = new TimelinePart { RelativeSizeAxes = Axes.Both });
         }
 
         [BackgroundDependencyLoader]
@@ -44,6 +47,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            DragBox.Alpha = 0;
+        }
+
         private void remove(HitObject h)
         {
             foreach (var d in content.OfType<TimelineHitObjectRepresentation>().Where(c => c.HitObject == h))
@@ -57,6 +66,25 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             content.Add(new TimelineHitObjectRepresentation(h) { Y = -yOffset * TimelineHitObjectRepresentation.THICKNESS });
         }
 
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            base.OnMouseDown(e);
+
+            return false; // tempoerary until we correctly handle selections.
+        }
+
+        protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new NoDragDragBox(performSelect);
+
+        internal class NoDragDragBox : DragBox
+        {
+            public NoDragDragBox(Action<RectangleF> performSelect)
+                : base(performSelect)
+            {
+            }
+
+            public override bool UpdateDrag(MouseButtonEvent e) => false;
+        }
+
         private class TimelineHitObjectRepresentation : CompositeDrawable
         {
             public const float THICKNESS = 3;

From 052772cce7423d3b67bbcd7ebb2e0ef6cd8ae842 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 15 Jan 2020 18:15:56 +0800
Subject: [PATCH 00147/10326] add test case

---
 .../Visual/UserInterface/TestSceneModButton.cs | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
index 856422016d..b1dccdaeea 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
@@ -1,29 +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.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Testing;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
-using osu.Game.Overlays.Mods.Sections;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mania;
-using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play.HUD;
-using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {

From 4c18a67268d6aae90ed25c35d2f44fb7e5318cbe Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 15 Jan 2020 18:24:43 +0800
Subject: [PATCH 00148/10326] add test step

---
 osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
index b1dccdaeea..7560ad2ce0 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Mods;
@@ -13,8 +12,7 @@ namespace osu.Game.Tests.Visual.UserInterface
     {
         private ModButton modButton;
 
-        [SetUp]
-        public void SetUp() => Schedule(() =>
+        public TestSceneModButton()
         {
             Children = new Drawable[]
             {
@@ -24,7 +22,9 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Origin = Anchor.Centre
                 }
             };
-        });
+
+            AddStep("left click", () => modButton.SelectNext(1));
+        }
 
         private class TestMod1 : TestMod
         {

From 02af546d3c60a6cb8c534f508a4c678d60f5204f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 15 Jan 2020 22:22:13 +0300
Subject: [PATCH 00149/10326] Implement web colour schemes

---
 osu.Game/Graphics/OsuColour.cs | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 2dc12b3e67..8775b3e1b8 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Game.Beatmaps;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Graphics
@@ -63,6 +64,24 @@ namespace osu.Game.Graphics
             }
         }
 
+        public Color4 ForOverlayElement(OverlayColourScheme colourScheme, float saturation, float lightness, float opacity = 1) => Color4.FromHsl(new Vector4(getBaseHue(colourScheme), saturation, lightness, opacity));
+
+        private static float getBaseHue(OverlayColourScheme colourScheme)
+        {
+            var hue = colourScheme switch
+            {
+                OverlayColourScheme.Red => 0,
+                OverlayColourScheme.Pink => 333,
+                OverlayColourScheme.Orange => 46,
+                OverlayColourScheme.Green => 115,
+                OverlayColourScheme.Purple => 255,
+                OverlayColourScheme.Blue => 200,
+                _ => 0,
+            };
+
+            return hue / 360f;
+        }
+
         // 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");
@@ -165,4 +184,14 @@ namespace osu.Game.Graphics
 
         public readonly Color4 ContextMenuGray = FromHex(@"223034");
     }
+
+    public enum OverlayColourScheme
+    {
+        Red,
+        Pink,
+        Orange,
+        Green,
+        Purple,
+        Blue
+    }
 }

From 476717e181d233e4eb73868acd5e1603e9de6bf9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 15 Jan 2020 22:41:22 +0300
Subject: [PATCH 00150/10326] Make OverlayHeader use colour schemes

---
 .../BreadcrumbControlOverlayHeader.cs         | 13 ++++++++
 .../Overlays/Changelog/ChangelogHeader.cs     | 15 +---------
 osu.Game/Overlays/News/NewsHeader.cs          | 15 +---------
 osu.Game/Overlays/OverlayHeader.cs            | 30 +++++++++++--------
 osu.Game/Overlays/Profile/ProfileHeader.cs    | 16 +---------
 osu.Game/Overlays/TabControlOverlayHeader.cs  | 12 ++++++++
 6 files changed, 45 insertions(+), 56 deletions(-)

diff --git a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
index 8a82b1f0c0..2e50c19729 100644
--- a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
+++ b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.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.UserInterface;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays
@@ -13,6 +15,17 @@ namespace osu.Game.Overlays
 
         protected override TabControl<string> CreateTabControl() => BreadcrumbControl = new OverlayHeaderBreadcrumbControl();
 
+        protected BreadcrumbControlOverlayHeader(OverlayColourScheme colourScheme)
+            : base(colourScheme)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            BreadcrumbControl.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.75f);
+        }
+
         public class OverlayHeaderBreadcrumbControl : BreadcrumbControl<string>
         {
             public OverlayHeaderBreadcrumbControl()
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 7e47a3e29f..d5e0890b4d 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Overlays.Changelog
         private const string listing_string = "listing";
 
         public ChangelogHeader()
+            : base(OverlayColourScheme.Purple)
         {
             BreadcrumbControl.AddItem(listing_string);
             BreadcrumbControl.Current.ValueChanged += e =>
@@ -43,14 +44,6 @@ namespace osu.Game.Overlays.Changelog
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            BreadcrumbControl.AccentColour = colours.Violet;
-            TitleBackgroundColour = colours.GreyVioletDarker;
-            ControlBackgroundColour = colours.GreyVioletDark;
-        }
-
         private ChangelogHeaderTitle title;
 
         private void showBuild(ValueChangedEvent<APIChangelogBuild> e)
@@ -117,12 +110,6 @@ namespace osu.Game.Overlays.Changelog
                 Version = null;
             }
 
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                AccentColour = colours.Violet;
-            }
-
             protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/changelog");
         }
     }
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index fc88c86df2..03dc64b3bd 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Overlays.News
         public Action ShowFrontPage;
 
         public NewsHeader()
+            : base(OverlayColourScheme.Purple)
         {
             BreadcrumbControl.AddItem(front_page_string);
 
@@ -35,14 +36,6 @@ namespace osu.Game.Overlays.News
             Current.ValueChanged += showPost;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            BreadcrumbControl.AccentColour = colours.Violet;
-            TitleBackgroundColour = colours.GreyVioletDarker;
-            ControlBackgroundColour = colours.GreyVioletDark;
-        }
-
         private void showPost(ValueChangedEvent<string> e)
         {
             if (e.OldValue != null)
@@ -97,12 +90,6 @@ namespace osu.Game.Overlays.News
             }
 
             protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/news");
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                AccentColour = colours.Violet;
-            }
         }
     }
 }
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index 53da2da634..1c787ec0e7 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using JetBrains.Annotations;
+using osu.Framework.Allocation;
 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.UserInterface;
 using osuTK.Graphics;
 
@@ -16,24 +18,19 @@ namespace osu.Game.Overlays
         private readonly Box titleBackground;
         private readonly Box controlBackground;
         private readonly Container background;
-
-        protected Color4 TitleBackgroundColour
-        {
-            set => titleBackground.Colour = value;
-        }
-
-        protected Color4 ControlBackgroundColour
-        {
-            set => controlBackground.Colour = value;
-        }
+        private readonly ScreenTitle title;
 
         protected float BackgroundHeight
         {
             set => background.Height = value;
         }
 
-        protected OverlayHeader()
+        protected OverlayColourScheme ColourScheme { get; private set; }
+
+        protected OverlayHeader(OverlayColourScheme colourScheme)
         {
+            ColourScheme = colourScheme;
+
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
@@ -60,9 +57,8 @@ namespace osu.Game.Overlays
                             titleBackground = new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.Gray,
                             },
-                            CreateTitle().With(title =>
+                            title = CreateTitle().With(title =>
                             {
                                 title.Margin = new MarginPadding
                                 {
@@ -92,6 +88,14 @@ namespace osu.Game.Overlays
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            titleBackground.Colour = colours.ForOverlayElement(ColourScheme, 0.2f, 0.15f);
+            title.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.7f);
+            controlBackground.Colour = colours.ForOverlayElement(ColourScheme, 0.2f, 0.2f);
+        }
+
         protected abstract Drawable CreateBackground();
 
         [NotNull]
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 59e64dfc26..b550d7d823 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -25,6 +24,7 @@ namespace osu.Game.Overlays.Profile
         private DetailHeaderContainer detailHeaderContainer;
 
         public ProfileHeader()
+            : base(OverlayColourScheme.Green)
         {
             BackgroundHeight = 150;
 
@@ -36,14 +36,6 @@ namespace osu.Game.Overlays.Profile
             centreHeaderContainer.DetailsVisible.BindValueChanged(visible => detailHeaderContainer.Expanded = visible.NewValue, true);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            TabControl.AccentColour = colours.Seafoam;
-            TitleBackgroundColour = colours.GreySeafoamDarker;
-            ControlBackgroundColour = colours.GreySeafoam;
-        }
-
         protected override Drawable CreateBackground() =>
             new Container
             {
@@ -109,12 +101,6 @@ namespace osu.Game.Overlays.Profile
                 Section = "info";
             }
 
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                AccentColour = colours.Seafoam;
-            }
-
             protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/profile");
         }
     }
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index f3521b66c8..8f3aa896ee 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.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;
@@ -15,6 +16,17 @@ namespace osu.Game.Overlays
 
         protected override TabControl<string> CreateTabControl() => TabControl = new OverlayHeaderTabControl();
 
+        protected TabControlOverlayHeader(OverlayColourScheme colourScheme)
+            : base(colourScheme)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            TabControl.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.75f);
+        }
+
         public class OverlayHeaderTabControl : OverlayTabControl<string>
         {
             public OverlayHeaderTabControl()

From 5d4b9d11cffdb4de8cc60c3b4683ccc6cd212917 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 15 Jan 2020 23:35:40 +0300
Subject: [PATCH 00151/10326] Throw an excepion for incorerect colourScheme
 values

---
 osu.Game/Graphics/OsuColour.cs | 39 ++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 8775b3e1b8..15c213b034 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -68,16 +68,37 @@ namespace osu.Game.Graphics
 
         private static float getBaseHue(OverlayColourScheme colourScheme)
         {
-            var hue = colourScheme switch
+            float hue;
+
+            switch (colourScheme)
             {
-                OverlayColourScheme.Red => 0,
-                OverlayColourScheme.Pink => 333,
-                OverlayColourScheme.Orange => 46,
-                OverlayColourScheme.Green => 115,
-                OverlayColourScheme.Purple => 255,
-                OverlayColourScheme.Blue => 200,
-                _ => 0,
-            };
+                default:
+                    throw new ArgumentException(@"Used colourScheme has no hue value!");
+
+                case OverlayColourScheme.Red:
+                    hue = 0;
+                    break;
+
+                case OverlayColourScheme.Pink:
+                    hue = 333;
+                    break;
+
+                case OverlayColourScheme.Orange:
+                    hue = 46;
+                    break;
+
+                case OverlayColourScheme.Green:
+                    hue = 115;
+                    break;
+
+                case OverlayColourScheme.Purple:
+                    hue = 255;
+                    break;
+
+                case OverlayColourScheme.Blue:
+                    hue = 200;
+                    break;
+            }
 
             return hue / 360f;
         }

From 5f178b77554d1fbd158b66bdd441f588c590c152 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jan 2020 11:54:03 +0900
Subject: [PATCH 00152/10326] General refactorings

---
 .../Edit/OsuBlueprintContainer.cs             | 10 +++----
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  4 +--
 .../Compose/Components/BlueprintContainer.cs  | 30 +++++++++----------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
index fc856d9810..30682616e6 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuBlueprintContainer : ComposeBlueprintContainer
     {
+        public OsuBlueprintContainer(IEnumerable<DrawableHitObject> drawableHitObjects)
+            : base(drawableHitObjects)
+        {
+        }
+
         protected override SelectionHandler CreateSelectionHandler() => new OsuSelectionHandler();
 
         public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
@@ -32,10 +37,5 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             return base.CreateBlueprintFor(hitObject);
         }
-
-        public OsuBlueprintContainer(IEnumerable<DrawableHitObject> drawableHitObjects)
-            : base(drawableHitObjects)
-        {
-        }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 52c0701f4f..5eba31d149 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -147,8 +147,6 @@ namespace osu.Game.Rulesets.Edit
             blueprintContainer.SelectionChanged += selectionChanged;
         }
 
-        protected abstract ComposeBlueprintContainer CreateBlueprintContainer();
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -235,6 +233,8 @@ namespace osu.Game.Rulesets.Edit
 
         protected abstract IReadOnlyList<HitObjectCompositionTool> CompositionTools { get; }
 
+        protected abstract ComposeBlueprintContainer CreateBlueprintContainer();
+
         protected abstract DrawableRuleset<TObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null);
 
         public void BeginPlacement(HitObject hitObject)
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7944476100..c356f1d4e0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     {
         public event Action<IEnumerable<HitObject>> SelectionChanged;
 
-        protected DragBox DragBox;
+        protected DragBox DragBox { get; private set; }
 
         private SelectionBlueprintContainer selectionBlueprints;
 
@@ -49,19 +49,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             RelativeSizeAxes = Axes.Both;
         }
 
-        /// <summary>
-        /// Creates a <see cref="SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
-        /// </summary>
-        protected virtual SelectionHandler CreateSelectionHandler() => new SelectionHandler();
-
-        /// <summary>
-        /// Creates a <see cref="SelectionBlueprint"/> for a specific <see cref="DrawableHitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to create the overlay for.</param>
-        protected virtual SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => null;
-
-        protected virtual DragBox CreateDragBox(Action<RectangleF> performSelect) => new DragBox(performSelect);
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -73,7 +60,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DragBox = CreateDragBox(select),
                 selectionHandler,
                 selectionBlueprints = new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both },
-                DragBox.CreateProxy().With(p => p.Depth = int.MinValue)
+                DragBox.CreateProxy().With(p => p.Depth = float.MinValue)
             });
 
             foreach (var obj in beatmap.HitObjects)
@@ -88,6 +75,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
             beatmap.HitObjectRemoved += removeBlueprintFor;
         }
 
+        /// <summary>
+        /// Creates a <see cref="SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
+        /// </summary>
+        protected virtual SelectionHandler CreateSelectionHandler() => new SelectionHandler();
+
+        /// <summary>
+        /// Creates a <see cref="SelectionBlueprint"/> for a specific <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to create the overlay for.</param>
+        protected virtual SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => null;
+
+        protected virtual DragBox CreateDragBox(Action<RectangleF> performSelect) => new DragBox(performSelect);
+
         protected override bool OnMouseDown(MouseDownEvent e)
         {
             beginClickSelection(e);

From 9535b3eeba97df727471c4f947323cf20f172563 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jan 2020 12:00:36 +0900
Subject: [PATCH 00153/10326] Fix possible nullref on blueprint removal

---
 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 c356f1d4e0..81b0fb247f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void removeBlueprintFor(HitObject hitObject)
         {
-            var blueprint = selectionBlueprints.Single(m => m.DrawableObject.HitObject == hitObject);
+            var blueprint = selectionBlueprints.SingleOrDefault(m => m.DrawableObject.HitObject == hitObject);
             if (blueprint == null)
                 return;
 

From d01cc3796899c54f85343e40e0f6fbda70ee20f4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jan 2020 18:34:56 +0900
Subject: [PATCH 00154/10326] Fix channel tab control test scene

---
 .../Online/TestSceneChannelTabControl.cs      | 42 ++++++++++++-------
 .../Overlays/Chat/Tabs/ChannelTabControl.cs   |  5 ++-
 2 files changed, 32 insertions(+), 15 deletions(-)

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

From e096688ac80056e87ea3cbfcc73084627e5ac9f4 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Thu, 16 Jan 2020 17:58:47 +0800
Subject: [PATCH 00155/10326] simplify some stuff

---
 osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs | 6 +-----
 osu.Game/Rulesets/UI/ModIcon.cs                           | 5 ++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
index 7560ad2ce0..443cf59003 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
@@ -10,20 +10,16 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneModButton : OsuTestScene
     {
-        private ModButton modButton;
-
         public TestSceneModButton()
         {
             Children = new Drawable[]
             {
-                modButton = new ModButton(new MultiMod(new TestMod1(), new TestMod2(), new TestMod3(), new TestMod4()))
+                new ModButton(new MultiMod(new TestMod1(), new TestMod2(), new TestMod3(), new TestMod4()))
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre
                 }
             };
-
-            AddStep("left click", () => modButton.SelectNext(1));
         }
 
         private class TestMod1 : TestMod
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 7e22fd2946..3edab0745d 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -68,8 +68,7 @@ namespace osu.Game.Rulesets.UI
                     Anchor = Anchor.Centre,
                     Colour = OsuColour.Gray(84),
                     Alpha = 0,
-
-                    Font = OsuFont.Numeric.With(null, size - 57.5f),
+                    Font = OsuFont.Numeric.With(null, 22f),
                     UseFullGlyphHeight = false,
                     Text = mod.Acronym
                 },
@@ -78,7 +77,7 @@ namespace osu.Game.Rulesets.UI
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
                     Colour = OsuColour.Gray(84),
-                    Size = new Vector2(size - 35),
+                    Size = new Vector2(45),
                     Icon = FontAwesome.Solid.Question
                 },
             };

From 2bc7458abf98113f38d43212201193caa01cb54f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Jan 2020 13:27:47 +0900
Subject: [PATCH 00156/10326] Add mod setting (de)serialization support

---
 .../Online/TestAPIModSerialization.cs         | 82 +++++++++++++++++++
 .../Configuration/SettingSourceAttribute.cs   | 26 ++++--
 osu.Game/Online/API/APIMod.cs                 | 56 +++++++++++++
 .../Online/API/Requests/Responses/APIMod.cs   | 14 ----
 osu.Game/Online/Multiplayer/PlaylistItem.cs   | 11 ++-
 5 files changed, 162 insertions(+), 27 deletions(-)
 create mode 100644 osu.Game.Tests/Online/TestAPIModSerialization.cs
 create mode 100644 osu.Game/Online/API/APIMod.cs
 delete mode 100644 osu.Game/Online/API/Requests/Responses/APIMod.cs

diff --git a/osu.Game.Tests/Online/TestAPIModSerialization.cs b/osu.Game.Tests/Online/TestAPIModSerialization.cs
new file mode 100644
index 0000000000..845f57136a
--- /dev/null
+++ b/osu.Game.Tests/Online/TestAPIModSerialization.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 System.Collections.Generic;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Online.API;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Tests.Online
+{
+    [TestFixture]
+    public class TestAPIModSerialization
+    {
+        [Test]
+        public void TestAcronymIsPreserved()
+        {
+            var apiMod = new APIMod(new TestMod());
+
+            var deserialized = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
+
+            Assert.That(deserialized.Acronym, Is.EqualTo(apiMod.Acronym));
+        }
+
+        [Test]
+        public void TestRawSettingIsPreserved()
+        {
+            var apiMod = new APIMod(new TestMod { TestSetting = { Value = 2 } });
+
+            var deserialized = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
+
+            Assert.That(deserialized.Settings, Contains.Key("test_setting").With.ContainValue(2.0));
+        }
+
+        [Test]
+        public void TestConvertedModHasCorrectSetting()
+        {
+            var apiMod = new APIMod(new TestMod { TestSetting = { Value = 2 } });
+
+            var deserialized = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
+            var converted = (TestMod)deserialized.ToMod(new TestRuleset());
+
+            Assert.That(converted.TestSetting.Value, Is.EqualTo(2));
+        }
+
+        private class TestRuleset : Ruleset
+        {
+            public override IEnumerable<Mod> GetModsFor(ModType type) => new[] { new TestMod() };
+
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new System.NotImplementedException();
+
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => throw new System.NotImplementedException();
+
+            public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => throw new System.NotImplementedException();
+
+            public override string Description { get; }
+            public override string ShortName { get; }
+        }
+
+        private class TestMod : Mod
+        {
+            public override string Name => "Test Mod";
+            public override string Acronym => "TM";
+            public override double ScoreMultiplier => 1;
+
+            [SettingSource("Test")]
+            public BindableNumber<double> TestSetting { get; } = new BindableDouble
+            {
+                MinValue = 0,
+                MaxValue = 10,
+                Default = 5,
+                Precision = 0.01,
+            };
+        }
+    }
+}
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 056fa8bcc0..f859dccc80 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -35,16 +35,11 @@ namespace osu.Game.Configuration
     {
         public static IEnumerable<Drawable> CreateSettingsControls(this object obj)
         {
-            foreach (var property in obj.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))
+            foreach (var (attr, property) in obj.GetSettingsSourceProperties())
             {
-                var attr = property.GetCustomAttribute<SettingSourceAttribute>(true);
+                object value = property.GetValue(obj);
 
-                if (attr == null)
-                    continue;
-
-                var prop = property.GetValue(obj);
-
-                switch (prop)
+                switch (value)
                 {
                     case BindableNumber<float> bNumber:
                         yield return new SettingsSlider<float>
@@ -102,9 +97,22 @@ namespace osu.Game.Configuration
                         break;
 
                     default:
-                        throw new InvalidOperationException($"{nameof(SettingSourceAttribute)} was attached to an unsupported type ({prop})");
+                        throw new InvalidOperationException($"{nameof(SettingSourceAttribute)} was attached to an unsupported type ({value})");
                 }
             }
         }
+
+        public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourceProperties(this object obj)
+        {
+            foreach (var property in obj.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))
+            {
+                var attr = property.GetCustomAttribute<SettingSourceAttribute>(true);
+
+                if (attr == null)
+                    continue;
+
+                yield return (attr, property);
+            }
+        }
     }
 }
diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
new file mode 100644
index 0000000000..30336d16a3
--- /dev/null
+++ b/osu.Game/Online/API/APIMod.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 System.Linq;
+using Humanizer;
+using Newtonsoft.Json;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Online.API
+{
+    public class APIMod : IMod
+    {
+        [JsonProperty("acronym")]
+        public string Acronym { get; set; }
+
+        [JsonProperty("settings")]
+        public Dictionary<string, object> Settings { get; set; } = new Dictionary<string, object>();
+
+        [JsonConstructor]
+        private APIMod()
+        {
+        }
+
+        public APIMod(Mod mod)
+        {
+            Acronym = mod.Acronym;
+
+            foreach (var (_, property) in mod.GetSettingsSourceProperties())
+                Settings.Add(property.Name.Underscore(), property.GetValue(mod));
+        }
+
+        public Mod ToMod(Ruleset ruleset)
+        {
+            Mod resultMod = ruleset.GetAllMods().FirstOrDefault(m => m.Acronym == Acronym);
+
+            if (resultMod == null)
+                return null; // Todo: Maybe throw exception?
+
+            foreach (var (_, property) in resultMod.GetSettingsSourceProperties())
+            {
+                if (!Settings.TryGetValue(property.Name.Underscore(), out object settingValue))
+                    continue;
+
+                ((IBindable)property.GetValue(resultMod)).Parse(settingValue);
+            }
+
+            return resultMod;
+        }
+
+        public bool Equals(IMod other) => Acronym == other?.Acronym;
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/APIMod.cs b/osu.Game/Online/API/Requests/Responses/APIMod.cs
deleted file mode 100644
index b9da4f49ee..0000000000
--- a/osu.Game/Online/API/Requests/Responses/APIMod.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.Mods;
-
-namespace osu.Game.Online.API.Requests.Responses
-{
-    public class APIMod : IMod
-    {
-        public string Acronym { get; set; }
-
-        public bool Equals(IMod other) => Acronym == other?.Acronym;
-    }
-}
diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Multiplayer/PlaylistItem.cs
index d13e8b31e6..5f8edc607b 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Multiplayer/PlaylistItem.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -50,7 +51,7 @@ namespace osu.Game.Online.Multiplayer
         [JsonProperty("allowed_mods")]
         private APIMod[] allowedMods
         {
-            get => AllowedMods.Select(m => new APIMod { Acronym = m.Acronym }).ToArray();
+            get => AllowedMods.Select(m => new APIMod(m)).ToArray();
             set => allowedModsBacking = value;
         }
 
@@ -59,7 +60,7 @@ namespace osu.Game.Online.Multiplayer
         [JsonProperty("required_mods")]
         private APIMod[] requiredMods
         {
-            get => RequiredMods.Select(m => new APIMod { Acronym = m.Acronym }).ToArray();
+            get => RequiredMods.Select(m => new APIMod(m)).ToArray();
             set => requiredModsBacking = value;
         }
 
@@ -72,10 +73,12 @@ namespace osu.Game.Online.Multiplayer
             Beatmap = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
             Ruleset = rulesets.GetRuleset(RulesetID);
 
+            Ruleset rulesetInstance = Ruleset.CreateInstance();
+
             if (allowedModsBacking != null)
             {
                 AllowedMods.Clear();
-                AllowedMods.AddRange(Ruleset.CreateInstance().GetAllMods().Where(mod => allowedModsBacking.Any(m => m.Acronym == mod.Acronym)));
+                AllowedMods.AddRange(allowedModsBacking.Select(m => m.ToMod(rulesetInstance)));
 
                 allowedModsBacking = null;
             }
@@ -83,7 +86,7 @@ namespace osu.Game.Online.Multiplayer
             if (requiredModsBacking != null)
             {
                 RequiredMods.Clear();
-                RequiredMods.AddRange(Ruleset.CreateInstance().GetAllMods().Where(mod => requiredModsBacking.Any(m => m.Acronym == mod.Acronym)));
+                RequiredMods.AddRange(requiredModsBacking.Select(m => m.ToMod(rulesetInstance)));
 
                 requiredModsBacking = null;
             }

From 4fa2c5c8c1fdcb9b51b629832bedd25f992a5284 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Jan 2020 18:52:13 +0900
Subject: [PATCH 00157/10326] Resolve unassigned properties

---
 osu.Game.Tests/Online/TestAPIModSerialization.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Online/TestAPIModSerialization.cs b/osu.Game.Tests/Online/TestAPIModSerialization.cs
index 845f57136a..d9318aa822 100644
--- a/osu.Game.Tests/Online/TestAPIModSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModSerialization.cs
@@ -59,8 +59,8 @@ namespace osu.Game.Tests.Online
 
             public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => throw new System.NotImplementedException();
 
-            public override string Description { get; }
-            public override string ShortName { get; }
+            public override string Description { get; } = string.Empty;
+            public override string ShortName { get; } = string.Empty;
         }
 
         private class TestMod : Mod

From 2187523bf3950af6dec5bc113c75a92920130830 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Jan 2020 19:21:27 +0900
Subject: [PATCH 00158/10326] Fix json web requests having incorrect user
 agents

---
 osu.Game/Online/API/APIRequest.cs        | 12 +-----------
 osu.Game/Online/API/OAuth.cs             |  3 +--
 osu.Game/Online/API/OsuJsonWebRequest.cs | 21 +++++++++++++++++++++
 osu.Game/Updater/SimpleUpdateManager.cs  |  4 ++--
 4 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 osu.Game/Online/API/OsuJsonWebRequest.cs

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 6c9356a9b7..30c1018c1e 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Online.API
     {
         protected override WebRequest CreateWebRequest() => new OsuJsonWebRequest<T>(Uri);
 
-        public T Result => ((JsonWebRequest<T>)WebRequest).ResponseObject;
+        public T Result => ((OsuJsonWebRequest<T>)WebRequest).ResponseObject;
 
         protected APIRequest()
         {
@@ -30,16 +30,6 @@ namespace osu.Game.Online.API
         /// This will be scheduled to the API's internal scheduler (run on update thread automatically).
         /// </summary>
         public new event APISuccessHandler<T> Success;
-
-        private class OsuJsonWebRequest<U> : JsonWebRequest<U>
-        {
-            public OsuJsonWebRequest(string uri)
-                : base(uri)
-            {
-            }
-
-            protected override string UserAgent => "osu!";
-        }
     }
 
     /// <summary>
diff --git a/osu.Game/Online/API/OAuth.cs b/osu.Game/Online/API/OAuth.cs
index baf494ebf9..bdc47aab8d 100644
--- a/osu.Game/Online/API/OAuth.cs
+++ b/osu.Game/Online/API/OAuth.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Net.Http;
 using osu.Framework.Bindables;
-using osu.Framework.IO.Network;
 
 namespace osu.Game.Online.API
 {
@@ -166,7 +165,7 @@ namespace osu.Game.Online.API
             }
         }
 
-        private class AccessTokenRequest : JsonWebRequest<OAuthToken>
+        private class AccessTokenRequest : OsuJsonWebRequest<OAuthToken>
         {
             protected string GrantType;
 
diff --git a/osu.Game/Online/API/OsuJsonWebRequest.cs b/osu.Game/Online/API/OsuJsonWebRequest.cs
new file mode 100644
index 0000000000..4a45a8b261
--- /dev/null
+++ b/osu.Game/Online/API/OsuJsonWebRequest.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.IO.Network;
+
+namespace osu.Game.Online.API
+{
+    public class OsuJsonWebRequest<T> : JsonWebRequest<T>
+    {
+        public OsuJsonWebRequest(string uri)
+            : base(uri)
+        {
+        }
+
+        public OsuJsonWebRequest()
+        {
+        }
+
+        protected override string UserAgent => "osu!";
+    }
+}
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index f76cba7f41..5412b11b33 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -7,8 +7,8 @@ using Newtonsoft.Json;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.IO.Network;
 using osu.Framework.Platform;
+using osu.Game.Online.API;
 using osu.Game.Overlays.Notifications;
 
 namespace osu.Game.Updater
@@ -36,7 +36,7 @@ namespace osu.Game.Updater
         {
             try
             {
-                var releases = new JsonWebRequest<GitHubRelease>("https://api.github.com/repos/ppy/osu/releases/latest");
+                var releases = new OsuJsonWebRequest<GitHubRelease>("https://api.github.com/repos/ppy/osu/releases/latest");
 
                 await releases.PerformAsync();
 

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 00159/10326] 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 00160/10326] 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 00161/10326] 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 59cb93321fbdffaf271021a8b6ede430e0eee10d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jan 2020 01:36:14 +0300
Subject: [PATCH 00162/10326] Implement ProfileItemBackground component

---
 .../Historical/DrawableMostPlayedBeatmap.cs   | 81 +++++++++----------
 .../Profile/Sections/ProfileItemBackground.cs | 49 +++++++++++
 2 files changed, 85 insertions(+), 45 deletions(-)
 create mode 100644 osu.Game/Overlays/Profile/Sections/ProfileItemBackground.cs

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index 0206c4e13b..9040af3384 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -4,7 +4,6 @@
 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.Framework.Localisation;
 using osu.Game.Beatmaps;
@@ -13,32 +12,25 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
-using System.Collections.Generic;
 using osu.Framework.Graphics.Cursor;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
-    public class DrawableMostPlayedBeatmap : OsuHoverContainer
+    public class DrawableMostPlayedBeatmap : CompositeDrawable
     {
         private const int cover_width = 100;
         private const int corner_radius = 6;
-        private const int height = 50;
 
         private readonly BeatmapInfo beatmap;
         private readonly int playCount;
 
-        private Box background;
-
-        protected override IEnumerable<Drawable> EffectTargets => new[] { background };
-
         public DrawableMostPlayedBeatmap(BeatmapInfo beatmap, int playCount)
         {
             this.beatmap = beatmap;
             this.playCount = playCount;
-            Enabled.Value = true; //manually enabled, because we have no action
 
             RelativeSizeAxes = Axes.X;
-            Height = height;
+            Height = 50;
 
             Masking = true;
             CornerRadius = corner_radius;
@@ -47,10 +39,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            IdleColour = colours.GreySeafoam;
-            HoverColour = colours.GreySeafoamLight;
-
-            Children = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 new UpdateableBeatmapSetCover
                 {
@@ -72,46 +61,48 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                             CornerRadius = corner_radius,
                             Children = new Drawable[]
                             {
-                                background = new Box { RelativeSizeAxes = Axes.Both },
-                                new Container
+                                new ProfileItemBackground
                                 {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Padding = new MarginPadding(10),
-                                    Children = new Drawable[]
+                                    Child = new Container
                                     {
-                                        new FillFlowContainer
+                                        RelativeSizeAxes = Axes.Both,
+                                        Padding = new MarginPadding(10),
+                                        Children = new Drawable[]
                                         {
-                                            Anchor = Anchor.CentreLeft,
-                                            Origin = Anchor.CentreLeft,
-                                            AutoSizeAxes = Axes.Both,
-                                            Direction = FillDirection.Vertical,
-                                            Children = new Drawable[]
+                                            new FillFlowContainer
                                             {
-                                                new MostPlayedBeatmapMetadataContainer(beatmap),
-                                                new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular))
+                                                Anchor = Anchor.CentreLeft,
+                                                Origin = Anchor.CentreLeft,
+                                                AutoSizeAxes = Axes.Both,
+                                                Direction = FillDirection.Vertical,
+                                                Children = new Drawable[]
                                                 {
-                                                    AutoSizeAxes = Axes.Both,
-                                                    Direction = FillDirection.Horizontal,
-                                                    Colour = colours.GreySeafoamLighter
-                                                }.With(d =>
-                                                {
-                                                    d.AddText("mapped by ");
-                                                    d.AddUserLink(beatmap.Metadata.Author);
-                                                }),
-                                            }
-                                        },
-                                        new PlayCountText(playCount)
-                                        {
-                                            Anchor = Anchor.CentreRight,
-                                            Origin = Anchor.CentreRight
-                                        },
-                                    }
-                                },
+                                                    new MostPlayedBeatmapMetadataContainer(beatmap),
+                                                    new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular))
+                                                    {
+                                                        AutoSizeAxes = Axes.Both,
+                                                        Direction = FillDirection.Horizontal,
+                                                        Colour = colours.GreySeafoamLighter
+                                                    }.With(d =>
+                                                    {
+                                                        d.AddText("mapped by ");
+                                                        d.AddUserLink(beatmap.Metadata.Author);
+                                                    }),
+                                                }
+                                            },
+                                            new PlayCountText(playCount)
+                                            {
+                                                Anchor = Anchor.CentreRight,
+                                                Origin = Anchor.CentreRight
+                                            },
+                                        }
+                                    },
+                                }
                             }
                         }
                     }
                 }
-            };
+            });
         }
 
         private class MostPlayedBeatmapMetadataContainer : BeatmapMetadataContainer
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileItemBackground.cs b/osu.Game/Overlays/Profile/Sections/ProfileItemBackground.cs
new file mode 100644
index 0000000000..4f8630c92d
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/ProfileItemBackground.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 osu.Game.Graphics.Containers;
+using System.Collections.Generic;
+
+namespace osu.Game.Overlays.Profile.Sections
+{
+    public class ProfileItemBackground : OsuHoverContainer
+    {
+        protected override IEnumerable<Drawable> EffectTargets => new[] { background };
+        protected override Container<Drawable> Content => content;
+
+        private readonly Box background;
+        private readonly Container content;
+
+        public ProfileItemBackground()
+        {
+            RelativeSizeAxes = Axes.Both;
+            Enabled.Value = true; //manually enabled, because we have no action
+            Masking = true;
+            CornerRadius = 6;
+
+            base.Content.AddRange(new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                }
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            IdleColour = colours.GreySeafoam;
+            HoverColour = colours.GreySeafoamLight;
+        }
+    }
+}

From 4cdaebb42bf681a04e2e4043fd18f204c928fa6e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jan 2020 02:58:10 +0300
Subject: [PATCH 00163/10326] Implement ProfileScore component

---
 .../Online/TestSceneUserProfileScores.cs      |  82 ++++++
 osu.Game/Graphics/DrawableDate.cs             |   4 +-
 .../Profile/Sections/Ranks/ProfileScore.cs    | 242 ++++++++++++++++++
 3 files changed, 326 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
 create mode 100644 osu.Game/Overlays/Profile/Sections/Ranks/ProfileScore.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
new file mode 100644
index 0000000000..f8e3da5241
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.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 System;
+using System.Collections.Generic;
+using osu.Game.Overlays.Profile.Sections;
+using osu.Game.Overlays.Profile.Sections.Ranks;
+using osu.Framework.Graphics;
+using osu.Game.Scoring;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneUserProfileScores : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ProfileScore),
+            typeof(ProfileItemBackground),
+        };
+
+        public TestSceneUserProfileScores()
+        {
+            var score = new ScoreInfo
+            {
+                PP = 134.32,
+                Rank = ScoreRank.A,
+                Beatmap = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = "Triumph & Regret",
+                        Artist = "typeMARS"
+                    },
+                    Version = "[4K] Regret"
+                },
+                Date = DateTimeOffset.Now,
+                Mods = new Mod[]
+                {
+                    new OsuModHardRock(),
+                    new OsuModDoubleTime(),
+                },
+                Accuracy = 0.998546
+            };
+
+            var noPPScore = new ScoreInfo
+            {
+                Rank = ScoreRank.B,
+                Beatmap = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = "C18H27NO3(extend)",
+                        Artist = "Team Grimoire"
+                    },
+                    Version = "[4K] Cataclysmic Hypernova"
+                },
+                Date = DateTimeOffset.Now,
+                Accuracy = 0.55879
+            };
+
+            Add(new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new[]
+                {
+                    new ProfileScore(score),
+                    new ProfileScore(noPPScore),
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs
index 533f02af7b..925c7981e0 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)
+        public DrawableDate(DateTimeOffset date, float textSize = OsuFont.DEFAULT_FONT_SIZE)
         {
-            Font = OsuFont.GetFont(weight: FontWeight.Regular, italics: true);
+            Font = OsuFont.GetFont(weight: FontWeight.Regular, size: textSize, italics: true);
             Date = date;
         }
 
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/ProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/ProfileScore.cs
new file mode 100644
index 0000000000..c30c13d52e
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/ProfileScore.cs
@@ -0,0 +1,242 @@
+// Copyright (c) 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.Shapes;
+using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+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 ProfileScore : CompositeDrawable
+    {
+        private const int performance_width = 80;
+        private const int content_padding = 10;
+
+        protected readonly ScoreInfo Score;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public ProfileScore(ScoreInfo score)
+        {
+            Score = score;
+
+            RelativeSizeAxes = Axes.X;
+            Height = 40;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(new ProfileItemBackground
+            {
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Left = content_padding, Right = performance_width + content_padding },
+                        Children = new Drawable[]
+                        {
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
+                                Spacing = new Vector2(8, 0),
+                                Children = new Drawable[]
+                                {
+                                    new UpdateableRank(Score.Rank)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Size = new Vector2(50, 20),
+                                    },
+                                    new FillFlowContainer
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Vertical,
+                                        Spacing = new Vector2(0, 2),
+                                        Children = new Drawable[]
+                                        {
+                                            new ScoreBeatmapMetadataContainer(Score.Beatmap),
+                                            new FillFlowContainer
+                                            {
+                                                AutoSizeAxes = Axes.Both,
+                                                Direction = FillDirection.Horizontal,
+                                                Spacing = new Vector2(5, 0),
+                                                Children = new Drawable[]
+                                                {
+                                                    new OsuSpriteText
+                                                    {
+                                                        Text = $"{Score.Beatmap.Version}",
+                                                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
+                                                        Colour = colours.Yellow
+                                                    },
+                                                    new DrawableDate(Score.Date, 12)
+                                                    {
+                                                        Colour = colours.GreySeafoamLighter
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
+                                Spacing = new Vector2(10),
+                                Children = new Drawable[]
+                                {
+                                    CreateRightContent().With(c =>
+                                    {
+                                        c.Anchor = Anchor.CentreRight;
+                                        c.Origin = Anchor.CentreRight;
+                                    }),
+                                    new FillFlowContainer
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                        Anchor = Anchor.CentreRight,
+                                        Origin = Anchor.CentreRight,
+                                        Direction = FillDirection.Horizontal,
+                                        Spacing = new Vector2(2),
+                                        Children = Score.Mods.Select(mod => new ModIcon(mod)
+                                        {
+                                            Scale = new Vector2(0.35f)
+                                        }).ToList(),
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        Width = performance_width,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Children = new[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Size = new Vector2(1, 0.5f),
+                                Colour = Color4.Black.Opacity(0.5f),
+                                Shear = new Vector2(-0.45f, 0),
+                                EdgeSmoothness = new Vector2(2, 0),
+                            },
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RelativePositionAxes = Axes.Y,
+                                Size = new Vector2(1, -0.5f),
+                                Position = new Vector2(0, 1),
+                                Colour = Color4.Black.Opacity(0.5f),
+                                Shear = new Vector2(0.45f, 0),
+                                EdgeSmoothness = new Vector2(2, 0),
+                            },
+                            createDrawablePerformance().With(d =>
+                            {
+                                d.Anchor = Anchor.Centre;
+                                d.Origin = Anchor.Centre;
+                            })
+                        }
+                    }
+                }
+            });
+        }
+
+        protected virtual Drawable CreateRightContent() => CreateDrawableAccuracy();
+
+        protected OsuSpriteText CreateDrawableAccuracy(float textSize = 16) => new OsuSpriteText
+        {
+            Text = $"{Score.Accuracy:P2}",
+            Font = OsuFont.GetFont(size: textSize, weight: FontWeight.Bold, italics: true),
+            Colour = colours.Yellow,
+        };
+
+        private Drawable createDrawablePerformance()
+        {
+            if (Score.PP.HasValue)
+            {
+                return new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Children = new[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                            Text = $"{Score.PP:0}",
+                            Colour = colours.GreenLight
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                            Text = "pp",
+                            Colour = colours.Green
+                        }
+                    }
+                };
+            }
+
+            return new OsuSpriteText
+            {
+                Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                Text = "-",
+                Colour = colours.GreenLight
+            };
+        }
+
+        private class ScoreBeatmapMetadataContainer : BeatmapMetadataContainer
+        {
+            public ScoreBeatmapMetadataContainer(BeatmapInfo beatmap)
+                : base(beatmap)
+            {
+            }
+
+            protected override Drawable[] CreateText(BeatmapInfo beatmap) => new Drawable[]
+            {
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Text = new LocalisedString((
+                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} ",
+                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} ")),
+                    Font = OsuFont.GetFont(weight: FontWeight.SemiBold, italics: true)
+                },
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Text = "by " + new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
+                    Font = OsuFont.GetFont(size: 14, italics: true)
+                },
+            };
+        }
+    }
+}

From 4964505c3e3bbbf037dad273b6d1ee1cacd382f4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jan 2020 03:19:28 +0300
Subject: [PATCH 00164/10326] Implement ProfileWeightedScore component

---
 .../Online/TestSceneUserProfileScores.cs      |  2 +
 .../Profile/Sections/Ranks/ProfileScore.cs    |  9 ++-
 .../Sections/Ranks/ProfileWeightedScore.cs    | 70 +++++++++++++++++++
 3 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Overlays/Profile/Sections/Ranks/ProfileWeightedScore.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
index f8e3da5241..4af024052e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Tests.Visual.Online
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(ProfileScore),
+            typeof(ProfileWeightedScore),
             typeof(ProfileItemBackground),
         };
 
@@ -75,6 +76,7 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     new ProfileScore(score),
                     new ProfileScore(noPPScore),
+                    new ProfileWeightedScore(score, 0.85),
                 }
             });
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/ProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/ProfileScore.cs
index c30c13d52e..bd49c59523 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/ProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/ProfileScore.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -104,7 +105,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                 Origin = Anchor.CentreRight,
                                 AutoSizeAxes = Axes.Both,
                                 Direction = FillDirection.Horizontal,
-                                Spacing = new Vector2(10),
+                                Spacing = new Vector2(15),
                                 Children = new Drawable[]
                                 {
                                     CreateRightContent().With(c =>
@@ -165,12 +166,13 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             });
         }
 
+        [NotNull]
         protected virtual Drawable CreateRightContent() => CreateDrawableAccuracy();
 
-        protected OsuSpriteText CreateDrawableAccuracy(float textSize = 16) => new OsuSpriteText
+        protected OsuSpriteText CreateDrawableAccuracy() => new OsuSpriteText
         {
             Text = $"{Score.Accuracy:P2}",
-            Font = OsuFont.GetFont(size: textSize, weight: FontWeight.Bold, italics: true),
+            Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true),
             Colour = colours.Yellow,
         };
 
@@ -181,6 +183,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                 return new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
                     Children = new[]
                     {
                         new OsuSpriteText
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/ProfileWeightedScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/ProfileWeightedScore.cs
new file mode 100644
index 0000000000..aaf3664403
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/ProfileWeightedScore.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 osu.Framework.Graphics;
+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
+{
+    public class ProfileWeightedScore : ProfileScore
+    {
+        private readonly double weight;
+
+        public ProfileWeightedScore(ScoreInfo score, double weight)
+            : base(score)
+        {
+            this.weight = weight;
+        }
+
+        protected override Drawable CreateRightContent() => new FillFlowContainer
+        {
+            AutoSizeAxes = Axes.Both,
+            Direction = FillDirection.Vertical,
+            Spacing = new Vector2(0, 2),
+            Children = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(15, 0),
+                    Children = new Drawable[]
+                    {
+                        CreateDrawableAccuracy(),
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Children = new[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true),
+                                    Text = $"{Score.PP * weight:0}",
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+                                    Text = "pp",
+                                }
+                            }
+                        }
+                    }
+                },
+                new OsuSpriteText
+                {
+                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                    Text = $@"weighted {weight:P0}"
+                }
+            }
+        };
+    }
+}

From 6e776d02f817563ad9299dd204e03dcecb937e70 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jan 2020 03:33:02 +0300
Subject: [PATCH 00165/10326] Refactor PaginatedScoreContainer to use new
 components

---
 .../Profile/Sections/Ranks/PaginatedScoreContainer.cs  | 10 ++++------
 .../Profile/Sections/Ranks/ProfileWeightedScore.cs     |  7 ++++++-
 osu.Game/Overlays/Profile/Sections/RanksSection.cs     |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index e0f1c935da..ad6621696d 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -15,14 +15,12 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
     public class PaginatedScoreContainer : PaginatedContainer<APILegacyScoreInfo>
     {
-        private readonly bool includeWeight;
         private readonly ScoreType type;
 
-        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string header, string missing, bool includeWeight = false)
+        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string header, string missing)
             : base(user, header, missing)
         {
             this.type = type;
-            this.includeWeight = includeWeight;
 
             ItemsPerPage = 5;
 
@@ -43,10 +41,10 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             switch (type)
             {
                 default:
-                    return new DrawablePerformanceScore(model.CreateScoreInfo(Rulesets), includeWeight ? Math.Pow(0.95, ItemsContainer.Count) : (double?)null);
+                    return new ProfileScore(model.CreateScoreInfo(Rulesets));
 
-                case ScoreType.Recent:
-                    return new DrawableTotalScore(model.CreateScoreInfo(Rulesets));
+                case ScoreType.Best:
+                    return new ProfileWeightedScore(model.CreateScoreInfo(Rulesets), Math.Pow(0.95, ItemsContainer.Count));
             }
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/ProfileWeightedScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/ProfileWeightedScore.cs
index aaf3664403..5f080f2589 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/ProfileWeightedScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/ProfileWeightedScore.cs
@@ -34,7 +34,12 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                     Spacing = new Vector2(15, 0),
                     Children = new Drawable[]
                     {
-                        CreateDrawableAccuracy(),
+                        new Container
+                        {
+                            AutoSizeAxes = Axes.Y,
+                            Width = 60,
+                            Child = CreateDrawableAccuracy()
+                        },
                         new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
diff --git a/osu.Game/Overlays/Profile/Sections/RanksSection.cs b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
index c4b933593e..dbdff3a273 100644
--- a/osu.Game/Overlays/Profile/Sections/RanksSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new[]
             {
-                new PaginatedScoreContainer(ScoreType.Best, User, "Best Performance", "No performance records. :(", true),
+                new PaginatedScoreContainer(ScoreType.Best, User, "Best Performance", "No performance records. :("),
                 new PaginatedScoreContainer(ScoreType.Firsts, User, "First Place Ranks", "No awesome performance records yet. :("),
             };
         }

From d5a3d8dbaa9f21d75a46150f55b048a0972c76cb Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jan 2020 03:35:47 +0300
Subject: [PATCH 00166/10326] Remove no longer used components

---
 .../Visual/Online/TestSceneUserRanks.cs       |  7 +-
 .../Ranks/DrawablePerformanceScore.cs         | 47 ---------
 .../Sections/Ranks/DrawableProfileScore.cs    | 96 -------------------
 .../Sections/Ranks/DrawableTotalScore.cs      | 31 ------
 4 files changed, 6 insertions(+), 175 deletions(-)
 delete mode 100644 osu.Game/Overlays/Profile/Sections/Ranks/DrawablePerformanceScore.cs
 delete mode 100644 osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
 delete mode 100644 osu.Game/Overlays/Profile/Sections/Ranks/DrawableTotalScore.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs b/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
index 2951f6b63e..9779343c07 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
@@ -20,7 +20,12 @@ namespace osu.Game.Tests.Visual.Online
     {
         protected override bool UseOnlineAPI => true;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(DrawableProfileScore), typeof(RanksSection) };
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ProfileScore),
+            typeof(ProfileWeightedScore),
+            typeof(RanksSection)
+        };
 
         public TestSceneUserRanks()
         {
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawablePerformanceScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawablePerformanceScore.cs
deleted file mode 100644
index 843f9b7ef2..0000000000
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawablePerformanceScore.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.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Scoring;
-
-namespace osu.Game.Overlays.Profile.Sections.Ranks
-{
-    public class DrawablePerformanceScore : DrawableProfileScore
-    {
-        private readonly double? weight;
-
-        public DrawablePerformanceScore(ScoreInfo score, double? weight = null)
-            : base(score)
-        {
-            this.weight = weight;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colour)
-        {
-            double pp = Score.PP ?? 0;
-            RightFlowContainer.Add(new OsuSpriteText
-            {
-                Text = $"{pp:0}pp",
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
-            });
-
-            if (weight.HasValue)
-            {
-                RightFlowContainer.Add(new OsuSpriteText
-                {
-                    Text = $"weighted: {pp * weight:0}pp ({weight:P0})",
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    Colour = colour.GrayA,
-                    Font = OsuFont.GetFont(size: 11, weight: FontWeight.Regular, italics: true)
-                });
-            }
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
deleted file mode 100644
index 6362d3dfb0..0000000000
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ /dev/null
@@ -1,96 +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 osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Online.Leaderboards;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.UI;
-using osu.Game.Scoring;
-using osu.Game.Beatmaps;
-using osu.Framework.Localisation;
-using osu.Framework.Graphics.Containers;
-
-namespace osu.Game.Overlays.Profile.Sections.Ranks
-{
-    public abstract class DrawableProfileScore : DrawableProfileRow
-    {
-        private readonly FillFlowContainer modsContainer;
-        protected readonly ScoreInfo Score;
-
-        protected DrawableProfileScore(ScoreInfo score)
-        {
-            Score = score;
-
-            RelativeSizeAxes = Axes.X;
-            Height = 60;
-            Children = new Drawable[]
-            {
-                modsContainer = new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Spacing = new Vector2(1),
-                    Margin = new MarginPadding { Right = 160 }
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colour)
-        {
-            var text = new OsuSpriteText
-            {
-                Text = $"accuracy: {Score.Accuracy:P2}",
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                Colour = colour.GrayA,
-                Font = OsuFont.GetFont(size: 11, weight: FontWeight.Regular, italics: true)
-            };
-
-            RightFlowContainer.Insert(1, text);
-
-            LeftFlowContainer.Add(new ProfileScoreBeatmapMetadataContainer(Score.Beatmap));
-            LeftFlowContainer.Add(new DrawableDate(Score.Date));
-
-            foreach (Mod mod in Score.Mods)
-                modsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.5f) });
-        }
-
-        protected override Drawable CreateLeftVisual() => new UpdateableRank(Score.Rank)
-        {
-            RelativeSizeAxes = Axes.Y,
-            Width = 60,
-            FillMode = FillMode.Fit,
-        };
-
-        private class ProfileScoreBeatmapMetadataContainer : BeatmapMetadataContainer
-        {
-            public ProfileScoreBeatmapMetadataContainer(BeatmapInfo beatmap)
-                : base(beatmap)
-            {
-            }
-
-            protected override Drawable[] CreateText(BeatmapInfo beatmap) => new Drawable[]
-            {
-                new OsuSpriteText
-                {
-                    Text = new LocalisedString((
-                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] ",
-                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] ")),
-                    Font = OsuFont.GetFont(size: 15, weight: FontWeight.SemiBold, italics: true)
-                },
-                new OsuSpriteText
-                {
-                    Text = new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
-                    Padding = new MarginPadding { Top = 3 },
-                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular, italics: true)
-                },
-            };
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableTotalScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableTotalScore.cs
deleted file mode 100644
index 8bfca08fe7..0000000000
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableTotalScore.cs
+++ /dev/null
@@ -1,31 +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.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Scoring;
-
-namespace osu.Game.Overlays.Profile.Sections.Ranks
-{
-    public class DrawableTotalScore : DrawableProfileScore
-    {
-        public DrawableTotalScore(ScoreInfo score)
-            : base(score)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            RightFlowContainer.Add(new OsuSpriteText
-            {
-                Text = Score.TotalScore.ToString("#,###"),
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
-            });
-        }
-    }
-}

From 16cfb9310b4edda6055eea3079d7a60cb94b3c04 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jan 2020 03:40:31 +0300
Subject: [PATCH 00167/10326] Naming adjustments

---
 .../Visual/Online/TestSceneUserProfileScores.cs        | 10 +++++-----
 osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs     |  4 ++--
 .../Ranks/{ProfileScore.cs => DrawableProfileScore.cs} |  4 ++--
 ...eightedScore.cs => DrawableProfileWeightedScore.cs} |  4 ++--
 .../Profile/Sections/Ranks/PaginatedScoreContainer.cs  |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename osu.Game/Overlays/Profile/Sections/Ranks/{ProfileScore.cs => DrawableProfileScore.cs} (98%)
 rename osu.Game/Overlays/Profile/Sections/Ranks/{ProfileWeightedScore.cs => DrawableProfileWeightedScore.cs} (94%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
index 4af024052e..ff26611311 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Tests.Visual.Online
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(ProfileScore),
-            typeof(ProfileWeightedScore),
+            typeof(DrawableProfileScore),
+            typeof(DrawableProfileWeightedScore),
             typeof(ProfileItemBackground),
         };
 
@@ -74,9 +74,9 @@ namespace osu.Game.Tests.Visual.Online
                 Spacing = new Vector2(0, 10),
                 Children = new[]
                 {
-                    new ProfileScore(score),
-                    new ProfileScore(noPPScore),
-                    new ProfileWeightedScore(score, 0.85),
+                    new DrawableProfileScore(score),
+                    new DrawableProfileScore(noPPScore),
+                    new DrawableProfileWeightedScore(score, 0.85),
                 }
             });
         }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs b/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
index 9779343c07..5cbdfb561e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Tests.Visual.Online
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(ProfileScore),
-            typeof(ProfileWeightedScore),
+            typeof(DrawableProfileScore),
+            typeof(DrawableProfileWeightedScore),
             typeof(RanksSection)
         };
 
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/ProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
similarity index 98%
rename from osu.Game/Overlays/Profile/Sections/Ranks/ProfileScore.cs
rename to osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index bd49c59523..13bdb523d2 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/ProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -20,7 +20,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
-    public class ProfileScore : CompositeDrawable
+    public class DrawableProfileScore : CompositeDrawable
     {
         private const int performance_width = 80;
         private const int content_padding = 10;
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         [Resolved]
         private OsuColour colours { get; set; }
 
-        public ProfileScore(ScoreInfo score)
+        public DrawableProfileScore(ScoreInfo score)
         {
             Score = score;
 
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/ProfileWeightedScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
similarity index 94%
rename from osu.Game/Overlays/Profile/Sections/Ranks/ProfileWeightedScore.cs
rename to osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
index 5f080f2589..bacfc0fd83 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/ProfileWeightedScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
@@ -10,11 +10,11 @@ using osuTK;
 
 namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
-    public class ProfileWeightedScore : ProfileScore
+    public class DrawableProfileWeightedScore : DrawableProfileScore
     {
         private readonly double weight;
 
-        public ProfileWeightedScore(ScoreInfo score, double weight)
+        public DrawableProfileWeightedScore(ScoreInfo score, double weight)
             : base(score)
         {
             this.weight = weight;
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index ad6621696d..64494f9814 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -41,10 +41,10 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             switch (type)
             {
                 default:
-                    return new ProfileScore(model.CreateScoreInfo(Rulesets));
+                    return new DrawableProfileScore(model.CreateScoreInfo(Rulesets));
 
                 case ScoreType.Best:
-                    return new ProfileWeightedScore(model.CreateScoreInfo(Rulesets), Math.Pow(0.95, ItemsContainer.Count));
+                    return new DrawableProfileWeightedScore(model.CreateScoreInfo(Rulesets), Math.Pow(0.95, ItemsContainer.Count));
             }
         }
     }

From bab67eb399149c5ed638fafff8118a971dd7f11e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jan 2020 04:12:17 +0300
Subject: [PATCH 00168/10326] CI fix

---
 .../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 13bdb523d2..4d2334df5e 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                 AutoSizeAxes = Axes.Both,
                                 Direction = FillDirection.Horizontal,
                                 Spacing = new Vector2(15),
-                                Children = new Drawable[]
+                                Children = new[]
                                 {
                                     CreateRightContent().With(c =>
                                     {

From 5b7fd7e3ecc959f12bdd735935bd4214000fe1cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Jan 2020 14:42:22 +0900
Subject: [PATCH 00169/10326] 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 f3838644d1..9c0da1e9fd 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.111.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.118.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4fc9e47119..f41c5fee7f 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.111.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.118.0" />
     <PackageReference Include="Sentry" Version="1.2.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 760600e6d4..bb4a59a601 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.111.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.118.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.111.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.118.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 969cb23671a65ed9b0b7b1f0719b1c611bf6b73c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jan 2020 08:55:29 +0300
Subject: [PATCH 00170/10326] Add reference comment

---
 osu.Game/Graphics/OsuColour.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 15c213b034..9333e1326d 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -66,6 +66,7 @@ namespace osu.Game.Graphics
 
         public Color4 ForOverlayElement(OverlayColourScheme colourScheme, float saturation, float lightness, float opacity = 1) => Color4.FromHsl(new Vector4(getBaseHue(colourScheme), saturation, lightness, opacity));
 
+        // See https://github.com/ppy/osu-web/blob/4218c288292d7c810b619075471eaea8bbb8f9d8/app/helpers.php#L1463
         private static float getBaseHue(OverlayColourScheme colourScheme)
         {
             float hue;

From 9a2d85e7d9485aad05eec5703b4a57f67d897428 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Jan 2020 14:52:03 +0900
Subject: [PATCH 00171/10326] Remove usage of snapchat icon

---
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs | 2 --
 1 file changed, 2 deletions(-)

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

From e8e68976030b3e302fbdb82cc68023fc365eae32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Jan 2020 15:27:21 +0900
Subject: [PATCH 00172/10326] Remove unnecessary linq count usage

---
 .../Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs   | 3 +--
 .../Visual/UserInterface/TestSceneToolbarRulesetSelector.cs    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs
index 0cb8683d72..7386e0fa1f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -62,7 +61,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             waitForCurrent();
             pushNext();
             waitForCurrent();
-            AddAssert(@"only 2 items", () => breadcrumbs.Items.Count() == 2);
+            AddAssert(@"only 2 items", () => breadcrumbs.Items.Count == 2);
             AddStep(@"exit current", () => screenStack.CurrentScreen.Exit());
             AddAssert(@"current screen is first", () => startScreen == screenStack.CurrentScreen);
         }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs
index e6589fa823..9738f73548 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("Select random", () =>
             {
-                selector.Current.Value = selector.Items.ElementAt(RNG.Next(selector.Items.Count()));
+                selector.Current.Value = selector.Items.ElementAt(RNG.Next(selector.Items.Count));
             });
             AddStep("Toggle disabled state", () => selector.Current.Disabled = !selector.Current.Disabled);
         }

From a2a2df09735ef00e3eef8ba2d49eb51824d6fdd0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jan 2020 23:57:20 +0300
Subject: [PATCH 00173/10326] Make exception message more descriptive

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

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 9333e1326d..6767104576 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Graphics
             switch (colourScheme)
             {
                 default:
-                    throw new ArgumentException(@"Used colourScheme has no hue value!");
+                    throw new ArgumentException($@"{colourScheme} colour scheme does not provide a hue value in {nameof(getBaseHue)}.");
 
                 case OverlayColourScheme.Red:
                     hue = 0;

From 55ed823c882a38f21b14ca5644a2ef4f3efd35ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Jan 2020 22:26:15 +0900
Subject: [PATCH 00174/10326] Fix hard crashes on tournament client if a round
 contains an empty beatmap

---
 osu.Game.Tournament/TournamentGameBase.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index bd91ad9704..8f9acfd5be 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -223,15 +223,22 @@ namespace osu.Game.Tournament
 
             foreach (var r in ladder.Rounds)
             {
-                foreach (var b in r.Beatmaps)
+                foreach (var b in r.Beatmaps.ToList())
                 {
-                    if (b.BeatmapInfo == null && b.ID > 0)
+                    if (b.BeatmapInfo == null)
                     {
-                        var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = b.ID });
-                        API.Perform(req);
-                        b.BeatmapInfo = req.Result?.ToBeatmap(RulesetStore);
+                        if (b.ID > 0)
+                        {
+                            var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = b.ID });
+                            API.Perform(req);
+                            b.BeatmapInfo = req.Result?.ToBeatmap(RulesetStore);
 
-                        addedInfo = true;
+                            addedInfo = true;
+                        }
+
+                        if (b.BeatmapInfo == null)
+                            // if online population couldn't be performed, ensure we don't leave a null value behind
+                            r.Beatmaps.Remove(b);
                     }
                 }
             }

From 8906416294b21aa72ac2a1c574ed165651a12de6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 19 Jan 2020 22:48:11 +0300
Subject: [PATCH 00175/10326] ProfileItemBackground -> ProfileItemContainer

---
 osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs    | 2 +-
 .../Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs  | 2 +-
 .../{ProfileItemBackground.cs => ProfileItemContainer.cs}     | 4 ++--
 .../Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game/Overlays/Profile/Sections/{ProfileItemBackground.cs => ProfileItemContainer.cs} (93%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
index ff26611311..a303d88037 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             typeof(DrawableProfileScore),
             typeof(DrawableProfileWeightedScore),
-            typeof(ProfileItemBackground),
+            typeof(ProfileItemContainer),
         };
 
         public TestSceneUserProfileScores()
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index 9040af3384..e75ad2f161 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                             CornerRadius = corner_radius,
                             Children = new Drawable[]
                             {
-                                new ProfileItemBackground
+                                new ProfileItemContainer
                                 {
                                     Child = new Container
                                     {
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileItemBackground.cs b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
similarity index 93%
rename from osu.Game/Overlays/Profile/Sections/ProfileItemBackground.cs
rename to osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
index 4f8630c92d..8b6d4ea97d 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileItemBackground.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 
 namespace osu.Game.Overlays.Profile.Sections
 {
-    public class ProfileItemBackground : OsuHoverContainer
+    public class ProfileItemContainer : OsuHoverContainer
     {
         protected override IEnumerable<Drawable> EffectTargets => new[] { background };
         protected override Container<Drawable> Content => content;
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections
         private readonly Box background;
         private readonly Container content;
 
-        public ProfileItemBackground()
+        public ProfileItemContainer()
         {
             RelativeSizeAxes = Axes.Both;
             Enabled.Value = true; //manually enabled, because we have no action
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 4d2334df5e..722b4d2dae 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(new ProfileItemBackground
+            AddInternal(new ProfileItemContainer
             {
                 Children = new Drawable[]
                 {

From 5f11084aedc4a6896f50d0e5a32ca7cf8540e653 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 19 Jan 2020 22:57:39 +0300
Subject: [PATCH 00176/10326] Refactor ProfileItemContainer to not use sounds

---
 .../Profile/Sections/ProfileItemContainer.cs  | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
index 8b6d4ea97d..99cad26a64 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
@@ -5,28 +5,31 @@ using osu.Framework.Allocation;
 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.Containers;
-using System.Collections.Generic;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Profile.Sections
 {
-    public class ProfileItemContainer : OsuHoverContainer
+    public class ProfileItemContainer : Container
     {
-        protected override IEnumerable<Drawable> EffectTargets => new[] { background };
+        private const int hover_duration = 200;
+
         protected override Container<Drawable> Content => content;
 
+        private Color4 idleColour;
+        private Color4 hoverColour;
+
         private readonly Box background;
         private readonly Container content;
 
         public ProfileItemContainer()
         {
             RelativeSizeAxes = Axes.Both;
-            Enabled.Value = true; //manually enabled, because we have no action
             Masking = true;
             CornerRadius = 6;
 
-            base.Content.AddRange(new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 background = new Box
                 {
@@ -42,8 +45,20 @@ namespace osu.Game.Overlays.Profile.Sections
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            IdleColour = colours.GreySeafoam;
-            HoverColour = colours.GreySeafoamLight;
+            background.Colour = idleColour = colours.GreySeafoam;
+            hoverColour = colours.GreySeafoamLight;
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            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);
         }
     }
 }

From 5a2ed5391d758674b63ed689b514240305add30e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 19 Jan 2020 23:51:10 +0300
Subject: [PATCH 00177/10326] Update license year

---
 Directory.Build.props  | 2 +-
 LICENCE                | 2 +-
 osu.Desktop/osu.nuspec | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 27a0bd0d48..21b8b402e0 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -40,7 +40,7 @@
     <RepositoryUrl>https://github.com/ppy/osu</RepositoryUrl>
     <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
     <Company>ppy Pty Ltd</Company>
-    <Copyright>Copyright (c) 2019 ppy Pty Ltd</Copyright>
+    <Copyright>Copyright (c) 2020 ppy Pty Ltd</Copyright>
     <PackageTags>osu game</PackageTags>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/LICENCE b/LICENCE
index 21c6a7090f..2435c23545 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,4 +1,4 @@
-Copyright (c) 2019 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2020 ppy Pty Ltd <contact@ppy.sh>.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/osu.Desktop/osu.nuspec b/osu.Desktop/osu.nuspec
index a26b35fcd5..a919d54f38 100644
--- a/osu.Desktop/osu.nuspec
+++ b/osu.Desktop/osu.nuspec
@@ -12,7 +12,7 @@
         <description>click the circles. to the beat.</description>
         <summary>click the circles.</summary>
         <releaseNotes>testing</releaseNotes>
-        <copyright>Copyright (c) 2019 ppy Pty Ltd</copyright>
+        <copyright>Copyright (c) 2020 ppy Pty Ltd</copyright>
         <language>en-AU</language>
     </metadata>
     <files>

From 43f144cd6a683abc85a6e51d47fc0f7471c8bd2b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 20 Jan 2020 11:48:56 +0900
Subject: [PATCH 00178/10326] Invert condition

---
 osu.Game.Tournament/TournamentGameBase.cs | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 8f9acfd5be..17d7dc0245 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -225,21 +225,21 @@ namespace osu.Game.Tournament
             {
                 foreach (var b in r.Beatmaps.ToList())
                 {
-                    if (b.BeatmapInfo == null)
+                    if (b.BeatmapInfo != null)
+                        continue;
+
+                    if (b.ID > 0)
                     {
-                        if (b.ID > 0)
-                        {
-                            var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = b.ID });
-                            API.Perform(req);
-                            b.BeatmapInfo = req.Result?.ToBeatmap(RulesetStore);
+                        var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = b.ID });
+                        API.Perform(req);
+                        b.BeatmapInfo = req.Result?.ToBeatmap(RulesetStore);
 
-                            addedInfo = true;
-                        }
-
-                        if (b.BeatmapInfo == null)
-                            // if online population couldn't be performed, ensure we don't leave a null value behind
-                            r.Beatmaps.Remove(b);
+                        addedInfo = true;
                     }
+
+                    if (b.BeatmapInfo == null)
+                        // if online population couldn't be performed, ensure we don't leave a null value behind
+                        r.Beatmaps.Remove(b);
                 }
             }
 

From 6875b41f747c5d3ddfca05049e191c65c8bf1a8c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 20 Jan 2020 07:47:49 +0300
Subject: [PATCH 00179/10326] Remove unnecessary setter

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

diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index 1c787ec0e7..c9547bb5b8 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays
             set => background.Height = value;
         }
 
-        protected OverlayColourScheme ColourScheme { get; private set; }
+        protected OverlayColourScheme ColourScheme { get; }
 
         protected OverlayHeader(OverlayColourScheme colourScheme)
         {

From cd5290b03007d24d42c54d64558cd5b9f0528115 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Jan 2020 13:50:27 +0900
Subject: [PATCH 00180/10326] Enforce using get-only auto property where
 possible

---
 .../Screens/Ladder/Components/ProgressionPath.cs             | 4 ++--
 osu.Game/Screens/Ranking/ResultModeButton.cs                 | 2 +-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs                  | 2 +-
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs         | 2 +-
 .../Storyboards/Drawables/DrawableStoryboardAnimation.cs     | 2 +-
 osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs    | 2 +-
 osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs   | 2 +-
 osu.sln.DotSettings                                          | 5 +++--
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs b/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
index 84a329085a..cb73985b11 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 {
     public class ProgressionPath : Path
     {
-        public DrawableTournamentMatch Source { get; private set; }
-        public DrawableTournamentMatch Destination { get; private set; }
+        public DrawableTournamentMatch Source { get; }
+        public DrawableTournamentMatch Destination { get; }
 
         public ProgressionPath(DrawableTournamentMatch source, DrawableTournamentMatch destination)
         {
diff --git a/osu.Game/Screens/Ranking/ResultModeButton.cs b/osu.Game/Screens/Ranking/ResultModeButton.cs
index 38636b0c3b..d7eb5db125 100644
--- a/osu.Game/Screens/Ranking/ResultModeButton.cs
+++ b/osu.Game/Screens/Ranking/ResultModeButton.cs
@@ -92,6 +92,6 @@ namespace osu.Game.Screens.Ranking
 
         protected override void OnDeactivated() => colouredPart.FadeColour(inactiveColour, 200, Easing.OutQuint);
 
-        public string TooltipText { get; private set; }
+        public string TooltipText { get; }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 451708c1cf..b0d5be8140 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -363,7 +363,7 @@ namespace osu.Game.Screens.Select
 
             public class InfoLabel : Container, IHasTooltip
             {
-                public string TooltipText { get; private set; }
+                public string TooltipText { get; }
 
                 public InfoLabel(BeatmapStatistic statistic)
                 {
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 7a84ac009a..94d7395ecf 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Storyboards.Drawables
 {
     public class DrawableStoryboard : Container<DrawableStoryboardLayer>
     {
-        public Storyboard Storyboard { get; private set; }
+        public Storyboard Storyboard { get; }
 
         protected override Container<DrawableStoryboardLayer> Content { get; }
 
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index ced3b9c1b6..eabb78bac5 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Storyboards.Drawables
 {
     public class DrawableStoryboardAnimation : TextureAnimation, IFlippable, IVectorScalable
     {
-        public StoryboardAnimation Animation { get; private set; }
+        public StoryboardAnimation Animation { get; }
 
         private bool flipH;
 
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
index fd2d441f34..39f5418902 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Storyboards.Drawables
 {
     public class DrawableStoryboardLayer : LifetimeManagementContainer
     {
-        public StoryboardLayer Layer { get; private set; }
+        public StoryboardLayer Layer { get; }
         public bool Enabled;
 
         public override bool IsPresent => Enabled && base.IsPresent;
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index c0da0e9c0e..d8d3248659 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Storyboards.Drawables
 {
     public class DrawableStoryboardSprite : Sprite, IFlippable, IVectorScalable
     {
-        public StoryboardSprite Sprite { get; private set; }
+        public StoryboardSprite Sprite { get; }
 
         private bool flipH;
 
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 12571be31d..15ea20084d 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -19,8 +19,8 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentIsFullyDiscarded/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
@@ -765,6 +765,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

From a27e2c574d003f72a956b892d195e1d416d6d6f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Jan 2020 13:53:46 +0900
Subject: [PATCH 00181/10326] Update fastlane and plugins

---
 Gemfile.lock | 74 +++++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ab594aee74..e3954c2681 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.1)
+    CFPropertyList (3.0.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
@@ -18,8 +18,8 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.5)
     emoji_regex (1.0.1)
-    excon (0.67.0)
-    faraday (0.15.4)
+    excon (0.71.1)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
@@ -27,7 +27,7 @@ GEM
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.7)
-    fastlane (2.133.0)
+    fastlane (2.140.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -36,13 +36,13 @@ GEM
       commander-fastlane (>= 4.4.6, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 2.0)
-      excon (>= 0.45.0, < 1.0.0)
-      faraday (< 0.16.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 0.17)
       faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (< 0.16.0)
+      faraday_middleware (~> 0.13.1)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.21.2, < 0.24.0)
+      google-api-client (>= 0.29.2, < 0.37.0)
       google-cloud-storage (>= 1.15.0, < 2.0.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
@@ -61,56 +61,58 @@ GEM
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.8.1, < 2.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-clean_testflight_testers (0.3.0)
-    fastlane-plugin-souyuz (0.8.1)
-      souyuz (>= 0.8.1)
+    fastlane-plugin-souyuz (0.9.1)
+      souyuz (= 0.9.1)
     fastlane-plugin-xamarin (0.6.3)
     gh_inspector (1.1.3)
-    google-api-client (0.23.9)
+    google-api-client (0.36.4)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
+      googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
+      mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-      signet (~> 0.9)
-    google-cloud-core (1.3.1)
+      signet (~> 0.12)
+    google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
-    google-cloud-env (1.2.1)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.3.0)
       faraday (~> 0.11)
-    google-cloud-storage (1.16.0)
+    google-cloud-errors (1.0.0)
+    google-cloud-storage (1.25.1)
+      addressable (~> 2.5)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.23)
+      google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
-      googleauth (>= 0.6.2, < 0.10.0)
-    googleauth (0.6.7)
+      googleauth (~> 0.9)
+      mini_mime (~> 1.0)
+    googleauth (0.10.0)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.7)
+      signet (~> 0.12)
     highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    json (2.2.0)
+    json (2.3.0)
     jwt (2.1.0)
-    memoist (0.16.0)
-    mime-types (3.3)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_magick (4.9.5)
+    memoist (0.16.2)
+    mini_magick (4.10.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nanaimo (0.2.6)
     naturally (2.2.0)
-    nokogiri (1.10.4)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     os (1.0.1)
     plist (3.5.0)
@@ -128,12 +130,12 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.6)
+    simctl (1.6.7)
       CFPropertyList
       naturally
     slack-notifier (2.3.2)
-    souyuz (0.8.1)
-      fastlane (>= 2.29.0)
+    souyuz (0.9.1)
+      fastlane (>= 1.103.0)
       highline (~> 1.7)
       nokogiri (~> 1.7)
     terminal-notifier (2.0.0)
@@ -141,15 +143,15 @@ GEM
       unicode-display_width (~> 1.1, >= 1.1.1)
     tty-cursor (0.7.0)
     tty-screen (0.7.0)
-    tty-spinner (0.9.1)
+    tty-spinner (0.9.2)
       tty-cursor (~> 0.7)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     word_wrap (1.0.0)
-    xcodeproj (1.12.0)
+    xcodeproj (1.14.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

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 00182/10326] 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 bfb056c612029c78fcb2676645a5fb1cda97884d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 20 Jan 2020 18:17:21 +0900
Subject: [PATCH 00183/10326] Apply input method signature refactorings

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs |  4 ++--
 .../Edit/Blueprints/ManiaSelectionBlueprint.cs |  6 ++----
 .../Components/PathControlPointPiece.cs        |  8 +-------
 .../Sliders/SliderPlacementBlueprint.cs        |  4 ++--
 .../Sliders/SliderSelectionBlueprint.cs        |  7 ++-----
 .../Components/DrawableTournamentMatch.cs      |  5 ++---
 .../Screens/Ladder/LadderDragContainer.cs      |  3 +--
 .../Containers/OsuFocusedOverlayContainer.cs   |  4 ++--
 .../Graphics/Containers/OsuScrollContainer.cs  | 18 +++++++++---------
 osu.Game/Graphics/Cursor/MenuCursor.cs         |  4 ++--
 .../Graphics/UserInterface/DialogButton.cs     |  4 ++--
 .../UserInterface/OsuAnimatedButton.cs         |  4 ++--
 osu.Game/Graphics/UserInterface/OsuButton.cs   |  4 ++--
 .../Graphics/UserInterface/OsuSliderBar.cs     |  4 ++--
 .../RetrievalFailurePlaceholder.cs             |  4 ++--
 .../Online/Placeholders/LoginPlaceholder.cs    |  4 ++--
 osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs  |  7 ++-----
 osu.Game/Overlays/Chat/Tabs/TabCloseButton.cs  |  4 ++--
 osu.Game/Overlays/ChatOverlay.cs               |  8 +++-----
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs  | 16 +++++-----------
 osu.Game/Overlays/Mods/ModButton.cs            |  4 +---
 osu.Game/Overlays/Music/PlaylistItem.cs        |  4 ++--
 osu.Game/Overlays/Music/PlaylistList.cs        | 16 ++++++++--------
 osu.Game/Overlays/NowPlayingOverlay.cs         |  7 +++----
 .../Timelines/Summary/Parts/MarkerPart.cs      |  8 +++++---
 .../Compose/Components/BeatDivisorControl.cs   |  7 +++----
 .../Compose/Components/BlueprintContainer.cs   | 15 +++++----------
 .../Compose/Components/Timeline/Timeline.cs    |  4 ++--
 osu.Game/Screens/Menu/Button.cs                |  4 ++--
 osu.Game/Screens/Menu/OsuLogo.cs               |  5 ++---
 osu.Game/Screens/Play/GameplayMenuOverlay.cs   |  4 +++-
 osu.Game/Screens/Play/HUD/HoldForMenuButton.cs |  3 +--
 osu.Game/Screens/Play/KeyCounterMouse.cs       |  4 ++--
 osu.Game/Screens/Play/SkipOverlay.cs           |  7 +++----
 osu.Game/Screens/Select/FooterButton.cs        |  4 ++--
 .../Select/Options/BeatmapOptionsButton.cs     |  4 ++--
 36 files changed, 95 insertions(+), 127 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index b28d8bb0e6..7a3b42914e 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -54,10 +54,10 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             return true;
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             EndPlacement();
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         public override void UpdatePosition(Vector2 screenSpacePosition)
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 3bd7fb2d49..ff3dbe614a 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -55,14 +55,12 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnDrag(DragEvent e)
+        protected override void OnDrag(DragEvent e)
         {
-            var result = base.OnDrag(e);
+            base.OnDrag(e);
 
             ScreenSpaceDragPosition = e.ScreenSpaceMousePosition;
             DragPosition = DrawableObject.ToLocalSpace(e.ScreenSpaceMousePosition);
-
-            return result;
         }
 
         public override void Show()
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 6a0730db91..af4da5e853 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -135,13 +135,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             return false;
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e) => RequestSelection != null;
-
         protected override bool OnClick(ClickEvent e) => RequestSelection != null;
 
         protected override bool OnDragStart(DragStartEvent e) => e.Button == MouseButton.Left;
 
-        protected override bool OnDrag(DragEvent e)
+        protected override void OnDrag(DragEvent e)
         {
             if (ControlPoint == slider.Path.ControlPoints[0])
             {
@@ -158,12 +156,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
             else
                 ControlPoint.Position.Value += e.Delta;
-
-            return true;
         }
 
-        protected override bool OnDragEnd(DragEndEvent e) => true;
-
         /// <summary>
         /// Updates the state of the circular control point marker.
         /// </summary>
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 2497e428fc..90512849d4 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -106,11 +106,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             return true;
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             if (state == PlacementState.Body && e.Button == MouseButton.Right)
                 endCurve();
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         protected override bool OnDoubleClick(DoubleClickEvent e)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 3165c441fb..4fdead512a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -90,19 +90,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         protected override bool OnDragStart(DragStartEvent e) => placementControlPointIndex != null;
 
-        protected override bool OnDrag(DragEvent e)
+        protected override void OnDrag(DragEvent e)
         {
             Debug.Assert(placementControlPointIndex != null);
 
             HitObject.Path.ControlPoints[placementControlPointIndex.Value].Position.Value = e.MousePosition - HitObject.Position;
-
-            return true;
         }
 
-        protected override bool OnDragEnd(DragEndEvent e)
+        protected override void OnDragEnd(DragEndEvent e)
         {
             placementControlPointIndex = null;
-            return true;
         }
 
         private BindableList<PathControlPoint> controlPoints => HitObject.Path.ControlPoints;
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index dde280ccd8..c4b670f059 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -289,16 +289,15 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             return true;
         }
 
-        protected override bool OnDrag(DragEvent e)
+        protected override void OnDrag(DragEvent e)
         {
-            if (base.OnDrag(e)) return true;
+            base.OnDrag(e);
 
             Selected = true;
             this.MoveToOffset(e.Delta);
 
             var pos = Position;
             Match.Position.Value = new Point((int)pos.X, (int)pos.Y);
-            return true;
         }
 
         public void Remove()
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs b/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
index 0c450a66b4..bdaa1ae7fd 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
@@ -22,10 +22,9 @@ namespace osu.Game.Tournament.Screens.Ladder
 
         protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
 
-        protected override bool OnDrag(DragEvent e)
+        protected override void OnDrag(DragEvent e)
         {
             this.MoveTo(target += e.Delta, 1000, Easing.OutQuint);
-            return true;
         }
 
         private const float min_scale = 0.6f;
diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index facf70b47a..7c2c1e5c67 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -76,12 +76,12 @@ namespace osu.Game.Graphics.Containers
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             if (closeOnMouseUp && !base.ReceivePositionalInputAt(e.ScreenSpaceMousePosition))
                 Hide();
 
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         public virtual bool OnPressed(GlobalAction action)
diff --git a/osu.Game/Graphics/Containers/OsuScrollContainer.cs b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
index cfd459da5e..6d531887ed 100644
--- a/osu.Game/Graphics/Containers/OsuScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
@@ -50,15 +50,15 @@ namespace osu.Game.Graphics.Containers
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnDrag(DragEvent e)
+        protected override void OnDrag(DragEvent e)
         {
             if (rightMouseDragging)
             {
                 scrollFromMouseEvent(e);
-                return true;
+                return;
             }
 
-            return base.OnDrag(e);
+            base.OnDrag(e);
         }
 
         protected override bool OnDragStart(DragStartEvent e)
@@ -72,15 +72,15 @@ namespace osu.Game.Graphics.Containers
             return base.OnDragStart(e);
         }
 
-        protected override bool OnDragEnd(DragEndEvent e)
+        protected override void OnDragEnd(DragEndEvent e)
         {
             if (rightMouseDragging)
             {
                 rightMouseDragging = false;
-                return true;
+                return;
             }
 
-            return base.OnDragEnd(e);
+            base.OnDragEnd(e);
         }
 
         protected override bool OnScroll(ScrollEvent e)
@@ -162,13 +162,13 @@ namespace osu.Game.Graphics.Containers
                 return true;
             }
 
-            protected override bool OnMouseUp(MouseUpEvent e)
+            protected override void OnMouseUp(MouseUpEvent e)
             {
-                if (e.Button != MouseButton.Left) return false;
+                if (e.Button != MouseButton.Left) return;
 
                 box.FadeColour(Color4.White, 100);
 
-                return base.OnMouseUp(e);
+                base.OnMouseUp(e);
             }
         }
     }
diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 170ea63059..580177d17a 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Graphics.Cursor
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             if (!e.IsPressed(MouseButton.Left) && !e.IsPressed(MouseButton.Right))
             {
@@ -107,7 +107,7 @@ namespace osu.Game.Graphics.Cursor
                 dragRotationState = DragRotationState.NotDragging;
             }
 
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         protected override void PopIn()
diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs
index aed07e56ee..9b53ee7b2d 100644
--- a/osu.Game/Graphics/UserInterface/DialogButton.cs
+++ b/osu.Game/Graphics/UserInterface/DialogButton.cs
@@ -232,11 +232,11 @@ namespace osu.Game.Graphics.UserInterface
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             if (Selected.Value)
                 colourContainer.ResizeWidthTo(hover_width, click_duration, Easing.In);
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
index 660bd7979f..cfcf034d1c 100644
--- a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
@@ -107,10 +107,10 @@ namespace osu.Game.Graphics.UserInterface
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             Content.ScaleTo(1, 1000, Easing.OutElastic);
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs
index c6a9aa1c97..9cf8f02024 100644
--- a/osu.Game/Graphics/UserInterface/OsuButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuButton.cs
@@ -129,10 +129,10 @@ namespace osu.Game.Graphics.UserInterface
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             Content.ScaleTo(1, 1000, Easing.OutElastic);
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         protected virtual SpriteText CreateText() => new OsuSpriteText
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 958390d5d2..2112aac6a3 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -128,10 +128,10 @@ namespace osu.Game.Graphics.UserInterface
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             Nub.Current.Value = false;
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         protected override void OnUserChange(T value)
diff --git a/osu.Game/Online/Leaderboards/RetrievalFailurePlaceholder.cs b/osu.Game/Online/Leaderboards/RetrievalFailurePlaceholder.cs
index 15d7dabe65..d109f28e72 100644
--- a/osu.Game/Online/Leaderboards/RetrievalFailurePlaceholder.cs
+++ b/osu.Game/Online/Leaderboards/RetrievalFailurePlaceholder.cs
@@ -55,10 +55,10 @@ namespace osu.Game.Online.Leaderboards
                 return base.OnMouseDown(e);
             }
 
-            protected override bool OnMouseUp(MouseUpEvent e)
+            protected override void OnMouseUp(MouseUpEvent e)
             {
                 icon.ScaleTo(1, 1000, Easing.OutElastic);
-                return base.OnMouseUp(e);
+                base.OnMouseUp(e);
             }
         }
     }
diff --git a/osu.Game/Online/Placeholders/LoginPlaceholder.cs b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
index ffc6623229..591eb976e2 100644
--- a/osu.Game/Online/Placeholders/LoginPlaceholder.cs
+++ b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
@@ -31,10 +31,10 @@ namespace osu.Game.Online.Placeholders
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             this.ScaleTo(1, 1000, Easing.OutElastic);
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         protected override bool OnClick(ClickEvent e)
diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs
index 266e68f17e..09dc06b95f 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs
@@ -141,16 +141,13 @@ namespace osu.Game.Overlays.Chat.Tabs
             updateState();
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             switch (e.Button)
             {
                 case MouseButton.Middle:
                     CloseButton.Click();
-                    return true;
-
-                default:
-                    return false;
+                    break;
             }
         }
 
diff --git a/osu.Game/Overlays/Chat/Tabs/TabCloseButton.cs b/osu.Game/Overlays/Chat/Tabs/TabCloseButton.cs
index bde930d4fb..178afda5ac 100644
--- a/osu.Game/Overlays/Chat/Tabs/TabCloseButton.cs
+++ b/osu.Game/Overlays/Chat/Tabs/TabCloseButton.cs
@@ -34,10 +34,10 @@ namespace osu.Game.Overlays.Chat.Tabs
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             icon.ScaleTo(0.75f, 1000, Easing.OutElastic);
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 45d311df28..2c0fa49b5d 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -299,7 +299,7 @@ namespace osu.Game.Overlays
             return true;
         }
 
-        protected override bool OnDrag(DragEvent e)
+        protected override void OnDrag(DragEvent e)
         {
             if (isDragging)
             {
@@ -311,14 +311,12 @@ namespace osu.Game.Overlays
 
                 ChatHeight.Value = targetChatHeight;
             }
-
-            return true;
         }
 
-        protected override bool OnDragEnd(DragEndEvent e)
+        protected override void OnDragEnd(DragEndEvent e)
         {
             isDragging = false;
-            return base.OnDragEnd(e);
+            base.OnDragEnd(e);
         }
 
         private void selectTab(int index)
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 8317951c8a..a35fa016a9 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -177,17 +177,19 @@ namespace osu.Game.Overlays.KeyBinding
             return true;
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             // don't do anything until the last button is released.
             if (!HasFocus || e.HasAnyButtonPressed)
-                return base.OnMouseUp(e);
+            {
+                base.OnMouseUp(e);
+                return;
+            }
 
             if (bindTarget.IsHovered)
                 finalise();
             else
                 updateBindTarget();
-            return true;
         }
 
         protected override bool OnScroll(ScrollEvent e)
@@ -313,14 +315,6 @@ namespace osu.Game.Overlays.KeyBinding
                 Size = new Vector2(80, 20);
             }
 
-            protected override bool OnMouseUp(MouseUpEvent e)
-            {
-                base.OnMouseUp(e);
-
-                // without this, the mouse up triggers a finalise (and deselection) of the current binding target.
-                return true;
-            }
-
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 77ef08f52d..e574828cd2 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Overlays.Mods
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             scaleContainer.ScaleTo(1, 500, Easing.OutElastic);
 
@@ -172,8 +172,6 @@ namespace osu.Game.Overlays.Mods
                         break;
                 }
             }
-
-            return true;
         }
 
         protected override bool OnClick(ClickEvent e)
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 29b6ae00f3..d40f391982 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -43,10 +43,10 @@ namespace osu.Game.Overlays.Music
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             IsDraggable = false;
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         private bool selected;
diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index 3cd04ac809..7bdcab6dff 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -136,29 +136,29 @@ namespace osu.Game.Overlays.Music
                 return draggedItem != null || base.OnDragStart(e);
             }
 
-            protected override bool OnDrag(DragEvent e)
+            protected override void OnDrag(DragEvent e)
             {
                 nativeDragPosition = e.ScreenSpaceMousePosition;
-                if (draggedItem == null)
-                    return base.OnDrag(e);
 
-                return true;
+                if (draggedItem == null)
+                    base.OnDrag(e);
             }
 
-            protected override bool OnDragEnd(DragEndEvent e)
+            protected override void OnDragEnd(DragEndEvent e)
             {
                 nativeDragPosition = e.ScreenSpaceMousePosition;
 
                 if (draggedItem == null)
-                    return base.OnDragEnd(e);
+                {
+                    base.OnDragEnd(e);
+                    return;
+                }
 
                 if (dragDestination != null)
                     musicController.ChangeBeatmapSetPosition(draggedItem.BeatmapSetInfo, dragDestination.Value);
 
                 draggedItem = null;
                 dragDestination = null;
-
-                return true;
             }
 
             protected override void Update()
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index a8ba7fa427..042e95c6d7 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -385,7 +385,7 @@ namespace osu.Game.Overlays
                 return true;
             }
 
-            protected override bool OnDrag(DragEvent e)
+            protected override void OnDrag(DragEvent e)
             {
                 Vector2 change = e.MousePosition - e.MouseDownPosition;
 
@@ -393,13 +393,12 @@ namespace osu.Game.Overlays
                 change *= change.Length <= 0 ? 0 : MathF.Pow(change.Length, 0.7f) / change.Length;
 
                 this.MoveTo(change);
-                return true;
             }
 
-            protected override bool OnDragEnd(DragEndEvent e)
+            protected override void OnDragEnd(DragEndEvent e)
             {
                 this.MoveTo(Vector2.Zero, 800, Easing.OutElastic);
-                return base.OnDragEnd(e);
+                base.OnDragEnd(e);
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
index 79ada40a89..d03cc8a0e8 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
@@ -32,12 +32,14 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         }
 
         protected override bool OnDragStart(DragStartEvent e) => true;
-        protected override bool OnDragEnd(DragEndEvent e) => true;
 
-        protected override bool OnDrag(DragEvent e)
+        protected override void OnDragEnd(DragEndEvent e)
+        {
+        }
+
+        protected override void OnDrag(DragEvent e)
         {
             seekToPosition(e.ScreenSpaceMousePosition);
-            return true;
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 42773ef687..8201ec2710 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -262,10 +262,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return base.OnMouseDown(e);
             }
 
-            protected override bool OnMouseUp(MouseUpEvent e)
+            protected override void OnMouseUp(MouseUpEvent e)
             {
                 marker.Active = false;
-                return base.OnMouseUp(e);
+                base.OnMouseUp(e);
             }
 
             protected override bool OnClick(ClickEvent e)
@@ -274,10 +274,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return true;
             }
 
-            protected override bool OnDrag(DragEvent e)
+            protected override void OnDrag(DragEvent e)
             {
                 handleMouseInput(e.ScreenSpaceMousePosition);
-                return true;
             }
 
             private void handleMouseInput(Vector2 screenSpaceMousePosition)
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index cafaddc39e..0679174fc8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -129,11 +129,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return true;
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             // Special case for when a drag happened instead of a click
             Schedule(() => endClickSelection());
-            return e.Button == MouseButton.Left;
         }
 
         protected override bool OnMouseMove(MouseMoveEvent e)
@@ -161,29 +160,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return true;
         }
 
-        protected override bool OnDrag(DragEvent e)
+        protected override void OnDrag(DragEvent e)
         {
             if (e.Button == MouseButton.Right)
-                return false;
+                return;
 
             if (!moveCurrentSelection(e))
                 dragBox.UpdateDrag(e);
-
-            return true;
         }
 
-        protected override bool OnDragEnd(DragEndEvent e)
+        protected override void OnDragEnd(DragEndEvent e)
         {
             if (e.Button == MouseButton.Right)
-                return false;
+                return;
 
             if (!finishSelectionMovement())
             {
                 dragBox.FadeOut(250, Easing.OutQuint);
                 selectionHandler.UpdateVisibility();
             }
-
-            return true;
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index b4f3b1f610..b8acc1ab44 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -143,10 +143,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             return false;
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             endUserDrag();
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         private void beginUserDrag()
diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs
index fac6b69e1f..6708ce0ba0 100644
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@@ -194,10 +194,10 @@ namespace osu.Game.Screens.Menu
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             boxHoverLayer.FadeTo(0, 1000, Easing.OutQuint);
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         protected override bool OnClick(ClickEvent e)
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 33b6ee8025..be2f29cbe9 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -353,12 +353,11 @@ namespace osu.Game.Screens.Menu
             return true;
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
-            if (e.Button != MouseButton.Left) return false;
+            if (e.Button != MouseButton.Left) return;
 
             logoBounceContainer.ScaleTo(1f, 500, Easing.OutElastic);
-            return true;
         }
 
         protected override bool OnClick(ClickEvent e)
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index adfbe977a4..b968f96414 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -163,7 +163,9 @@ namespace osu.Game.Screens.Play
         // Don't let mouse down events through the overlay or people can click circles while paused.
         protected override bool OnMouseDown(MouseDownEvent e) => true;
 
-        protected override bool OnMouseUp(MouseUpEvent e) => true;
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+        }
 
         protected override bool OnMouseMove(MouseMoveEvent e) => true;
 
diff --git a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
index 7946e6d322..5d7b2a084d 100644
--- a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
+++ b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
@@ -278,11 +278,10 @@ namespace osu.Game.Screens.Play.HUD
                 return true;
             }
 
-            protected override bool OnMouseUp(MouseUpEvent e)
+            protected override void OnMouseUp(MouseUpEvent e)
             {
                 if (!e.HasAnyButtonPressed)
                     AbortConfirm();
-                return true;
             }
         }
     }
diff --git a/osu.Game/Screens/Play/KeyCounterMouse.cs b/osu.Game/Screens/Play/KeyCounterMouse.cs
index 828441de6e..e55525c5e8 100644
--- a/osu.Game/Screens/Play/KeyCounterMouse.cs
+++ b/osu.Game/Screens/Play/KeyCounterMouse.cs
@@ -45,10 +45,10 @@ namespace osu.Game.Screens.Play
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             if (e.Button == Button) IsLit = false;
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 772d326c7f..c6324b6db5 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -202,10 +202,9 @@ namespace osu.Game.Screens.Play
                 return true;
             }
 
-            protected override bool OnMouseUp(MouseUpEvent e)
+            protected override void OnMouseUp(MouseUpEvent e)
             {
                 Show();
-                return true;
             }
 
             public override void Hide() => State = Visibility.Hidden;
@@ -311,10 +310,10 @@ namespace osu.Game.Screens.Play
                 return base.OnMouseDown(e);
             }
 
-            protected override bool OnMouseUp(MouseUpEvent e)
+            protected override void OnMouseUp(MouseUpEvent e)
             {
                 aspect.ScaleTo(1, 1000, Easing.OutElastic);
-                return base.OnMouseUp(e);
+                base.OnMouseUp(e);
             }
 
             protected override bool OnClick(ClickEvent e)
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index b77da36748..4dcab60548 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -118,10 +118,10 @@ namespace osu.Game.Screens.Select
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             box.FadeOut(Footer.TRANSITION_LENGTH, Easing.OutQuint);
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         protected override bool OnClick(ClickEvent e)
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
index ff9beafb23..4e4653cb57 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
@@ -60,10 +60,10 @@ namespace osu.Game.Screens.Select.Options
             return base.OnMouseDown(e);
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
             flash.FadeTo(0, 1000, Easing.OutQuint);
-            return base.OnMouseUp(e);
+            base.OnMouseUp(e);
         }
 
         protected override bool OnClick(ClickEvent e)

From 4a5e8559537f696a2d27f96ec0475f27a7080736 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 20 Jan 2020 12:21:21 +0300
Subject: [PATCH 00184/10326] Rename test scene

---
 .../{TestSceneOverlayHeaders.cs => TestSceneOverlayHeader.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/UserInterface/{TestSceneOverlayHeaders.cs => TestSceneOverlayHeader.cs} (98%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
similarity index 98%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index 09326247f3..b015007f69 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaders.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneOverlayHeaders : OsuTestScene
+    public class TestSceneOverlayHeader : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private readonly FillFlowContainer flow;
 
-        public TestSceneOverlayHeaders()
+        public TestSceneOverlayHeader()
         {
             AddRange(new Drawable[]
             {

From 843feb4e0879d98e852c4f780a5c17ff8d807aca Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 20 Jan 2020 12:26:14 +0300
Subject: [PATCH 00185/10326] Add more xmldoc to ControllableOverlayHeader

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

diff --git a/osu.Game/Overlays/ControllableOverlayHeader.cs b/osu.Game/Overlays/ControllableOverlayHeader.cs
index 3117990699..de0431340f 100644
--- a/osu.Game/Overlays/ControllableOverlayHeader.cs
+++ b/osu.Game/Overlays/ControllableOverlayHeader.cs
@@ -11,6 +11,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
+    /// <summary>
+    /// <see cref="OverlayHeader"/> which contains <see cref="TabControl{T}"/>.
+    /// </summary>
     /// <typeparam name="T">The type of item to be represented by tabs in <see cref="TabControl{T}"/>.</typeparam>
     public abstract class ControllableOverlayHeader<T> : OverlayHeader
     {

From 1b1003bd731bf3797b5c47ed9eb6eacea7db595a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 20 Jan 2020 18:31:25 +0900
Subject: [PATCH 00186/10326] Refactor

---
 .../Edit/Components/Timelines/Summary/Parts/MarkerPart.cs     | 4 ----
 osu.Game/Screens/Play/GameplayMenuOverlay.cs                  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
index d03cc8a0e8..5d638d7919 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
@@ -33,10 +33,6 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 
         protected override bool OnDragStart(DragStartEvent e) => true;
 
-        protected override void OnDragEnd(DragEndEvent e)
-        {
-        }
-
         protected override void OnDrag(DragEvent e)
         {
             seekToPosition(e.ScreenSpaceMousePosition);
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index b968f96414..f0fec41e46 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -163,10 +163,6 @@ namespace osu.Game.Screens.Play
         // Don't let mouse down events through the overlay or people can click circles while paused.
         protected override bool OnMouseDown(MouseDownEvent e) => true;
 
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-        }
-
         protected override bool OnMouseMove(MouseMoveEvent e) => true;
 
         protected void AddButton(string text, Color4 colour, Action action)

From 40f502c6d13e163cf2d93ebedf5b2ae6ab38d57d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 20 Jan 2020 19:35:37 +0900
Subject: [PATCH 00187/10326] Apply input method signature refactorings

---
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs            | 9 ++++++---
 .../Edit/Compose/Components/BlueprintContainer.cs        | 2 --
 osu.Game/Screens/Play/KeyCounterKeyboard.cs              | 4 ++--
 osu.Game/Screens/Select/FooterButtonRandom.cs            | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 8317951c8a..02ddd1505e 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -216,12 +216,15 @@ namespace osu.Game.Overlays.KeyBinding
             return true;
         }
 
-        protected override bool OnKeyUp(KeyUpEvent e)
+        protected override void OnKeyUp(KeyUpEvent e)
         {
-            if (!HasFocus) return base.OnKeyUp(e);
+            if (!HasFocus)
+            {
+                base.OnKeyUp(e);
+                return;
+            }
 
             finalise();
-            return true;
         }
 
         protected override bool OnJoystickPress(JoystickPressEvent e)
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index cafaddc39e..43e8cd96f8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -201,8 +201,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return false;
         }
 
-        protected override bool OnKeyUp(KeyUpEvent e) => false;
-
         public bool OnPressed(PlatformAction action)
         {
             switch (action.ActionType)
diff --git a/osu.Game/Screens/Play/KeyCounterKeyboard.cs b/osu.Game/Screens/Play/KeyCounterKeyboard.cs
index 29188b6b59..187dcc1264 100644
--- a/osu.Game/Screens/Play/KeyCounterKeyboard.cs
+++ b/osu.Game/Screens/Play/KeyCounterKeyboard.cs
@@ -27,10 +27,10 @@ namespace osu.Game.Screens.Play
             return base.OnKeyDown(e);
         }
 
-        protected override bool OnKeyUp(KeyUpEvent e)
+        protected override void OnKeyUp(KeyUpEvent e)
         {
             if (e.Key == Key) IsLit = false;
-            return base.OnKeyUp(e);
+            base.OnKeyUp(e);
         }
     }
 }
diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 14c9eb2035..9bc5181f6f 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -44,11 +44,11 @@ namespace osu.Game.Screens.Select
             return base.OnKeyDown(e);
         }
 
-        protected override bool OnKeyUp(KeyUpEvent e)
+        protected override void OnKeyUp(KeyUpEvent e)
         {
             secondaryActive = e.ShiftPressed;
             updateText();
-            return base.OnKeyUp(e);
+            base.OnKeyUp(e);
         }
 
         private void updateText()

From b62e3addf378ad05bbb3733d22ad347c594f3e82 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 20 Jan 2020 20:30:25 +0900
Subject: [PATCH 00188/10326] Apply input method signature refactorings

---
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 8317951c8a..cbaa9fb718 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -235,13 +235,15 @@ namespace osu.Game.Overlays.KeyBinding
             return true;
         }
 
-        protected override bool OnJoystickRelease(JoystickReleaseEvent e)
+        protected override void OnJoystickRelease(JoystickReleaseEvent e)
         {
             if (!HasFocus)
-                return base.OnJoystickRelease(e);
+            {
+                base.OnJoystickRelease(e);
+                return;
+            }
 
             finalise();
-            return true;
         }
 
         private void clear()

From 1becbb072efa33543373fa14bad51b9aab287078 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Jan 2020 23:26:21 +0900
Subject: [PATCH 00189/10326] Remove broken test

---
 .../Editor/TestSceneBlueprintContainer.cs     | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs

diff --git a/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs b/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs
deleted file mode 100644
index a230e5221f..0000000000
--- a/osu.Game.Tests/Editor/TestSceneBlueprintContainer.cs
+++ /dev/null
@@ -1,20 +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 NUnit.Framework;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Tests.Editor
-{
-    public class TestSceneBlueprintContainer : EditorClockTestScene
-    {
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            Child = new ComposeBlueprintContainer(new List<DrawableHitObject>());
-        });
-    }
-}

From 740bdee125ca7b8ed7bd32c21026b31b19a36333 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Jan 2020 23:59:21 +0900
Subject: [PATCH 00190/10326] Apply remaining uncaught changes

---
 osu.Game/Audio/SampleInfo.cs                    | 2 +-
 osu.Game/Graphics/UserInterface/HoverSounds.cs  | 2 +-
 osu.Game/Graphics/UserInterface/ScoreCounter.cs | 6 +-----
 osu.Game/Storyboards/StoryboardSprite.cs        | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Audio/SampleInfo.cs b/osu.Game/Audio/SampleInfo.cs
index 66c07209f3..2406b0bef2 100644
--- a/osu.Game/Audio/SampleInfo.cs
+++ b/osu.Game/Audio/SampleInfo.cs
@@ -19,6 +19,6 @@ namespace osu.Game.Audio
 
         public IEnumerable<string> LookupNames => new[] { sampleName };
 
-        public int Volume { get; set; } = 100;
+        public int Volume { get; } = 100;
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index fcd8940348..40899e7e95 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface
         /// <summary>
         /// Length of debounce for hover sound playback, in milliseconds. Default is 50ms.
         /// </summary>
-        public double HoverDebounceTime { get; set; } = 50;
+        public double HoverDebounceTime { get; } = 50;
 
         protected readonly HoverSampleSet SampleSet;
 
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index 24d8009f40..01d8edaecf 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
@@ -16,11 +16,7 @@ namespace osu.Game.Graphics.UserInterface
         /// <summary>
         /// How many leading zeroes the counter has.
         /// </summary>
-        public uint LeadingZeroes
-        {
-            get;
-            protected set;
-        }
+        public uint LeadingZeroes { get; }
 
         /// <summary>
         /// Displays score.
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 22e1929419..f411ad04f3 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Storyboards
         private readonly List<CommandLoop> loops = new List<CommandLoop>();
         private readonly List<CommandTrigger> triggers = new List<CommandTrigger>();
 
-        public string Path { get; set; }
+        public string Path { get; }
         public bool IsDrawable => HasCommands;
 
         public Anchor Origin;

From 41295bc27cb5100376a9007230d84e299bb18156 Mon Sep 17 00:00:00 2001
From: ProTheory8 <editaw5@gmail.com>
Date: Mon, 20 Jan 2020 16:06:36 +0000
Subject: [PATCH 00191/10326] Difficulty Adjust mod customisation menu opens
 automatically now

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 1 +
 osu.Game/Rulesets/Mods/Mod.cs                 | 6 ++++++
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 7f07ce620c..cdc4a42b33 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -474,6 +474,7 @@ namespace osu.Game.Overlays.Mods
             {
                 if (State.Value == Visibility.Visible) sampleOn?.Play();
                 DeselectTypes(selectedMod.IncompatibleMods, true);
+                if (selectedMod.RequiresConfiguration) ModSettingsContainer.Alpha = 1;
             }
             else
             {
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index e168171186..9ee19a433b 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -60,6 +60,12 @@ namespace osu.Game.Rulesets.Mods
         [JsonIgnore]
         public virtual bool Ranked => false;
 
+        /// <summary>
+        /// Returns true if this mod requires configuration. If true, opens mod customisation menu every time user enables mod.
+        /// </summary>
+        [JsonIgnore]
+        public virtual bool RequiresConfiguration => false;
+
         /// <summary>
         /// The mods this mod cannot be enabled with.
         /// </summary>
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index b74bf01d1b..d74e2ce2bc 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Rulesets.Mods
 
         public override double ScoreMultiplier => 1.0;
 
+        public override bool RequiresConfiguration => true;
+
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModHardRock) };
 
         [SettingSource("Drain Rate", "Override a beatmap's set HP.")]

From 178a72f9b8dc4da9e5e30397869ddbfa466ae9c1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 21 Jan 2020 05:24:49 +0300
Subject: [PATCH 00192/10326] Make OverlayTabControl inherited from
 OsuTabControl

---
 osu.Game/Overlays/OverlayTabControl.cs | 30 +++++---------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index 812f8963c9..000cc4b113 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.cs
@@ -13,34 +13,14 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public abstract class OverlayTabControl<T> : TabControl<T>
+    public abstract class OverlayTabControl<T> : OsuTabControl<T>
     {
         private readonly Box bar;
 
-        private Color4 accentColour = Color4.White;
-
-        public Color4 AccentColour
+        public new Color4 AccentColour
         {
-            get => accentColour;
-            set
-            {
-                if (accentColour == value)
-                    return;
-
-                accentColour = value;
-                bar.Colour = value;
-
-                foreach (TabItem<T> tabItem in TabContainer)
-                {
-                    ((OverlayTabItem)tabItem).AccentColour = value;
-                }
-            }
-        }
-
-        public new MarginPadding Padding
-        {
-            get => TabContainer.Padding;
-            set => TabContainer.Padding = value;
+            get => base.AccentColour;
+            set => base.AccentColour = bar.Colour = value;
         }
 
         protected float BarHeight
@@ -66,7 +46,7 @@ namespace osu.Game.Overlays
 
         protected override TabItem<T> CreateTabItem(T value) => new OverlayTabItem(value);
 
-        protected class OverlayTabItem : TabItem<T>
+        protected class OverlayTabItem : TabItem<T>, IHasAccentColour
         {
             protected readonly ExpandingBar Bar;
             protected readonly OsuSpriteText Text;

From 30edd80c8c9582e4607f300ebdf3de23b060f261 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 21 Jan 2020 06:00:12 +0300
Subject: [PATCH 00193/10326] Refactor OverlayHeader hierarchy

---
 .../UserInterface/TestSceneOverlayHeader.cs   |  7 ++-
 .../Graphics/UserInterface/OsuTabControl.cs   |  2 +
 .../BreadcrumbControlOverlayHeader.cs         | 13 +----
 .../Overlays/Changelog/ChangelogHeader.cs     | 12 ++---
 .../Overlays/ControllableOverlayHeader.cs     | 49 -------------------
 osu.Game/Overlays/News/NewsHeader.cs          | 12 ++---
 osu.Game/Overlays/OverlayTabControl.cs        | 30 +++++++++---
 osu.Game/Overlays/TabControlOverlayHeader.cs  | 39 ++++++++++-----
 8 files changed, 67 insertions(+), 97 deletions(-)
 delete mode 100644 osu.Game/Overlays/ControllableOverlayHeader.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index b015007f69..814a9ebf10 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(OverlayHeader),
-            typeof(ControllableOverlayHeader<>),
             typeof(TabControlOverlayHeader<>),
             typeof(BreadcrumbControlOverlayHeader),
             typeof(TestNoControlHeader),
@@ -139,9 +138,9 @@ namespace osu.Game.Tests.Visual.UserInterface
             public TestBreadcrumbControlHeader(OverlayColourScheme colourScheme)
                 : base(colourScheme)
             {
-                BreadcrumbControl.AddItem("tab1");
-                BreadcrumbControl.AddItem("tab2");
-                BreadcrumbControl.Current.Value = "tab2";
+                TabControl.AddItem("tab1");
+                TabControl.AddItem("tab2");
+                TabControl.Current.Value = "tab2";
             }
         }
 
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 6a7998d5fb..ca18ab83a0 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -17,6 +17,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
+using osu.Framework.Extensions.IEnumerableExtensions;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -75,6 +76,7 @@ namespace osu.Game.Graphics.UserInterface
                     dropdown.AccentColour = value;
                 foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
                     i.AccentColour = value;
+                InternalChildren.OfType<IHasAccentColour>().ForEach(c => c.AccentColour = value);
             }
         }
 
diff --git a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
index 2456568252..bc9108929d 100644
--- a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
+++ b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.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.Graphics;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
@@ -9,23 +8,15 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays
 {
-    public abstract class BreadcrumbControlOverlayHeader : ControllableOverlayHeader<string>
+    public abstract class BreadcrumbControlOverlayHeader : TabControlOverlayHeader<string>
     {
-        protected OverlayHeaderBreadcrumbControl BreadcrumbControl;
-
-        protected override TabControl<string> CreateTabControl() => BreadcrumbControl = new OverlayHeaderBreadcrumbControl();
+        protected override OsuTabControl<string> CreateTabControl() => new OverlayHeaderBreadcrumbControl();
 
         protected BreadcrumbControlOverlayHeader(OverlayColourScheme colourScheme)
             : base(colourScheme)
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            BreadcrumbControl.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.75f);
-        }
-
         public class OverlayHeaderBreadcrumbControl : BreadcrumbControl<string>
         {
             public OverlayHeaderBreadcrumbControl()
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index d5e0890b4d..484a800992 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -28,8 +28,8 @@ namespace osu.Game.Overlays.Changelog
         public ChangelogHeader()
             : base(OverlayColourScheme.Purple)
         {
-            BreadcrumbControl.AddItem(listing_string);
-            BreadcrumbControl.Current.ValueChanged += e =>
+            TabControl.AddItem(listing_string);
+            TabControl.Current.ValueChanged += e =>
             {
                 if (e.NewValue == listing_string)
                     ListingSelected?.Invoke();
@@ -49,12 +49,12 @@ namespace osu.Game.Overlays.Changelog
         private void showBuild(ValueChangedEvent<APIChangelogBuild> e)
         {
             if (e.OldValue != null)
-                BreadcrumbControl.RemoveItem(e.OldValue.ToString());
+                TabControl.RemoveItem(e.OldValue.ToString());
 
             if (e.NewValue != null)
             {
-                BreadcrumbControl.AddItem(e.NewValue.ToString());
-                BreadcrumbControl.Current.Value = e.NewValue.ToString();
+                TabControl.AddItem(e.NewValue.ToString());
+                TabControl.Current.Value = e.NewValue.ToString();
 
                 Streams.Current.Value = Streams.Items.FirstOrDefault(s => s.Name == e.NewValue.UpdateStream.Name);
 
@@ -62,7 +62,7 @@ namespace osu.Game.Overlays.Changelog
             }
             else
             {
-                BreadcrumbControl.Current.Value = listing_string;
+                TabControl.Current.Value = listing_string;
                 Streams.Current.Value = null;
                 title.Version = null;
             }
diff --git a/osu.Game/Overlays/ControllableOverlayHeader.cs b/osu.Game/Overlays/ControllableOverlayHeader.cs
deleted file mode 100644
index de0431340f..0000000000
--- a/osu.Game/Overlays/ControllableOverlayHeader.cs
+++ /dev/null
@@ -1,49 +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.UserInterface;
-using osu.Game.Graphics;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays
-{
-    /// <summary>
-    /// <see cref="OverlayHeader"/> which contains <see cref="TabControl{T}"/>.
-    /// </summary>
-    /// <typeparam name="T">The type of item to be represented by tabs in <see cref="TabControl{T}"/>.</typeparam>
-    public abstract class ControllableOverlayHeader<T> : OverlayHeader
-    {
-        private readonly Box controlBackground;
-
-        protected ControllableOverlayHeader(OverlayColourScheme colourScheme)
-            : base(colourScheme)
-        {
-            HeaderInfo.Add(new Container
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Children = new Drawable[]
-                {
-                    controlBackground = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Gray,
-                    },
-                    CreateTabControl().With(control => control.Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN })
-                }
-            });
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            controlBackground.Colour = colours.ForOverlayElement(ColourScheme, 0.2f, 0.2f);
-        }
-
-        protected abstract TabControl<T> CreateTabControl();
-    }
-}
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index 03dc64b3bd..7d9fce11f1 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -25,9 +25,9 @@ namespace osu.Game.Overlays.News
         public NewsHeader()
             : base(OverlayColourScheme.Purple)
         {
-            BreadcrumbControl.AddItem(front_page_string);
+            TabControl.AddItem(front_page_string);
 
-            BreadcrumbControl.Current.ValueChanged += e =>
+            TabControl.Current.ValueChanged += e =>
             {
                 if (e.NewValue == front_page_string)
                     ShowFrontPage?.Invoke();
@@ -39,18 +39,18 @@ namespace osu.Game.Overlays.News
         private void showPost(ValueChangedEvent<string> e)
         {
             if (e.OldValue != null)
-                BreadcrumbControl.RemoveItem(e.OldValue);
+                TabControl.RemoveItem(e.OldValue);
 
             if (e.NewValue != null)
             {
-                BreadcrumbControl.AddItem(e.NewValue);
-                BreadcrumbControl.Current.Value = e.NewValue;
+                TabControl.AddItem(e.NewValue);
+                TabControl.Current.Value = e.NewValue;
 
                 title.IsReadingPost = true;
             }
             else
             {
-                BreadcrumbControl.Current.Value = front_page_string;
+                TabControl.Current.Value = front_page_string;
                 title.IsReadingPost = false;
             }
         }
diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index 000cc4b113..a58ac87a11 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.cs
@@ -2,6 +2,7 @@
 // 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.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
@@ -15,13 +16,7 @@ namespace osu.Game.Overlays
 {
     public abstract class OverlayTabControl<T> : OsuTabControl<T>
     {
-        private readonly Box bar;
-
-        public new Color4 AccentColour
-        {
-            get => base.AccentColour;
-            set => base.AccentColour = bar.Colour = value;
-        }
+        private readonly Bar bar;
 
         protected float BarHeight
         {
@@ -33,7 +28,7 @@ namespace osu.Game.Overlays
             TabContainer.Masking = false;
             TabContainer.Spacing = new Vector2(15, 0);
 
-            AddInternal(bar = new Box
+            AddInternal(bar = new Bar
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 2,
@@ -143,5 +138,24 @@ namespace osu.Game.Overlays
                 Text.FadeColour(AccentColour, 120, Easing.InQuad);
             }
         }
+
+        private class Bar : CompositeDrawable, IHasAccentColour
+        {
+            public Color4 AccentColour
+            {
+                get => background.Colour;
+                set => background.Colour = value;
+            }
+
+            private readonly Box background;
+
+            public Bar()
+            {
+                AddInternal(background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                });
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index a4bf423e46..defd6d6b05 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -5,29 +5,51 @@ using System;
 using osu.Framework.Allocation;
 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.UserInterface;
 using osuTK;
 
 namespace osu.Game.Overlays
 {
-    public abstract class TabControlOverlayHeader<T> : ControllableOverlayHeader<T>
+    /// <summary>
+    /// <see cref="OverlayHeader"/> which contains <see cref="OsuTabControl{T}"/>.
+    /// </summary>
+    /// <typeparam name="T">The type of item to be represented by tabs in <see cref="OsuTabControl{T}"/>.</typeparam>
+    public abstract class TabControlOverlayHeader<T> : OverlayHeader
     {
-        protected OverlayHeaderTabControl TabControl;
+        protected OsuTabControl<T> TabControl;
 
-        protected override TabControl<T> CreateTabControl() => TabControl = new OverlayHeaderTabControl();
+        private readonly Box controlBackground;
 
         protected TabControlOverlayHeader(OverlayColourScheme colourScheme)
             : base(colourScheme)
         {
+            HeaderInfo.Add(new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Children = new Drawable[]
+                {
+                    controlBackground = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    TabControl = CreateTabControl().With(control => control.Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN })
+                }
+            });
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
             TabControl.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.75f);
+            controlBackground.Colour = colours.ForOverlayElement(ColourScheme, 0.2f, 0.2f);
         }
 
+        protected virtual OsuTabControl<T> CreateTabControl() => new OverlayHeaderTabControl();
+
         public class OverlayHeaderTabControl : OverlayTabControl<T>
         {
             public OverlayHeaderTabControl()
@@ -38,18 +60,9 @@ namespace osu.Game.Overlays
                 Anchor = Anchor.BottomLeft;
                 Origin = Anchor.BottomLeft;
                 Height = 35;
-
-                if (typeof(T).IsEnum)
-                {
-                    foreach (var val in (T[])Enum.GetValues(typeof(T)))
-                        AddItem(val);
-                }
             }
 
-            protected override TabItem<T> CreateTabItem(T value) => new OverlayHeaderTabItem(value)
-            {
-                AccentColour = AccentColour,
-            };
+            protected override TabItem<T> CreateTabItem(T value) => new OverlayHeaderTabItem(value);
 
             protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
             {

From 8bf19913c05e71110a90f07d50982ffc7832593b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 21 Jan 2020 06:03:48 +0300
Subject: [PATCH 00194/10326] Add NotNull attribute

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

diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index defd6d6b05..11f93bb373 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.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 System;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -48,6 +48,7 @@ namespace osu.Game.Overlays
             controlBackground.Colour = colours.ForOverlayElement(ColourScheme, 0.2f, 0.2f);
         }
 
+        [NotNull]
         protected virtual OsuTabControl<T> CreateTabControl() => new OverlayHeaderTabControl();
 
         public class OverlayHeaderTabControl : OverlayTabControl<T>

From 327d8c213bac61abd4801720684cf8d2d4dd6a6e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 21 Jan 2020 06:25:13 +0300
Subject: [PATCH 00195/10326] Rename Bar to TabControlBar

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

diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index a58ac87a11..839136d37c 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays
 {
     public abstract class OverlayTabControl<T> : OsuTabControl<T>
     {
-        private readonly Bar bar;
+        private readonly TabControlBar bar;
 
         protected float BarHeight
         {
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays
             TabContainer.Masking = false;
             TabContainer.Spacing = new Vector2(15, 0);
 
-            AddInternal(bar = new Bar
+            AddInternal(bar = new TabControlBar
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 2,
@@ -139,7 +139,7 @@ namespace osu.Game.Overlays
             }
         }
 
-        private class Bar : CompositeDrawable, IHasAccentColour
+        private class TabControlBar : CompositeDrawable, IHasAccentColour
         {
             public Color4 AccentColour
             {
@@ -149,7 +149,7 @@ namespace osu.Game.Overlays
 
             private readonly Box background;
 
-            public Bar()
+            public TabControlBar()
             {
                 AddInternal(background = new Box
                 {

From 02f26e4a4d02a1aba90aa88829d694631aba4cce Mon Sep 17 00:00:00 2001
From: ProTheory8 <59506423+ProTheory8@users.noreply.github.com>
Date: Tue, 21 Jan 2020 08:44:22 +0500
Subject: [PATCH 00196/10326] Update comment

Co-Authored-By: Salman Ahmed <email@iisalman.me>
---
 osu.Game/Rulesets/Mods/Mod.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 9ee19a433b..46c0c1da07 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Mods
         public virtual bool Ranked => false;
 
         /// <summary>
-        /// Returns true if this mod requires configuration. If true, opens mod customisation menu every time user enables mod.
+        /// Whether this mod requires configuration to apply changes to the game.
         /// </summary>
         [JsonIgnore]
         public virtual bool RequiresConfiguration => false;

From bd96cf94a6284f1d6b9be30e054fda5cfa6c4c62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 00:53:59 +0900
Subject: [PATCH 00197/10326] Begin refactoring SelectionBlueprint to handle
 non-drawable HitObjects

---
 .../Blueprints/ManiaSelectionBlueprint.cs     |  2 +-
 .../Edit/ManiaBlueprintContainer.cs           |  2 +-
 .../Edit/ManiaSelectionHandler.cs             |  5 +-
 .../Edit/Masks/ManiaSelectionBlueprint.cs     |  2 +-
 .../Edit/Blueprints/OsuSelectionBlueprint.cs  |  4 +-
 .../Edit/OsuBlueprintContainer.cs             |  2 +-
 .../Edit/OverlaySelectionBlueprint.cs         | 32 ++++++++++++
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs  | 35 +++++--------
 .../Timelines/Summary/Parts/TimelinePart.cs   | 20 +++++---
 .../Compose/Components/BlueprintContainer.cs  | 38 ++++----------
 .../Components/ComposeBlueprintContainer.cs   |  2 +-
 .../Compose/Components/MoveSelectionEvent.cs  |  8 +--
 .../Compose/Components/SelectionHandler.cs    |  4 +-
 .../Timeline/TimelineHitObjectDisplay.cs      | 51 ++++++-------------
 .../Visual/SelectionBlueprintTestScene.cs     |  2 +-
 15 files changed, 102 insertions(+), 107 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 3bd7fb2d49..63e3d0fcc1 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public class ManiaSelectionBlueprint : SelectionBlueprint
+    public class ManiaSelectionBlueprint : OverlaySelectionBlueprint
     {
         public Vector2 ScreenSpaceDragPosition { get; private set; }
         public Vector2 DragPosition { get; private set; }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
index 5f66ae7491..d744036b4c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
-        public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
+        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
         {
             switch (hitObject)
             {
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 618af3e772..f33fd3c640 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Timing;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.UI;
@@ -72,8 +73,10 @@ namespace osu.Game.Rulesets.Mania.Edit
             if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
                 delta -= moveEvent.Blueprint.DrawableObject.Parent.DrawHeight;
 
-            foreach (var b in SelectedBlueprints)
+            foreach (var selectionBlueprint in SelectedBlueprints)
             {
+                var b = (OverlaySelectionBlueprint)selectionBlueprint;
+
                 var hitObject = b.DrawableObject;
                 var objectParent = (HitObjectContainer)hitObject.Parent;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Masks/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Masks/ManiaSelectionBlueprint.cs
index ff8882124f..433db79ae0 100644
--- a/osu.Game.Rulesets.Mania/Edit/Masks/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Masks/ManiaSelectionBlueprint.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Edit.Masks
 {
-    public abstract class ManiaSelectionBlueprint : SelectionBlueprint
+    public abstract class ManiaSelectionBlueprint : OverlaySelectionBlueprint
     {
         protected ManiaSelectionBlueprint(DrawableHitObject drawableObject)
             : base(drawableObject)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
index a864257274..b0e13808a5 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
@@ -7,10 +7,10 @@ using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints
 {
-    public abstract class OsuSelectionBlueprint<T> : SelectionBlueprint
+    public abstract class OsuSelectionBlueprint<T> : OverlaySelectionBlueprint
         where T : OsuHitObject
     {
-        protected T HitObject => (T)DrawableObject.HitObject;
+        protected new T HitObject => (T)DrawableObject.HitObject;
 
         protected OsuSelectionBlueprint(DrawableHitObject drawableObject)
             : base(drawableObject)
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
index 30682616e6..330f34b85c 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         protected override SelectionHandler CreateSelectionHandler() => new OsuSelectionHandler();
 
-        public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
+        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
         {
             switch (hitObject)
             {
diff --git a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
new file mode 100644
index 0000000000..4c3898aa04
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.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.Primitives;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public abstract class OverlaySelectionBlueprint : SelectionBlueprint
+    {
+        /// <summary>
+        /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
+        /// </summary>
+        public readonly DrawableHitObject DrawableObject;
+
+        protected override bool ShouldBeAlive => (DrawableObject.IsAlive && DrawableObject.IsPresent) || State == SelectionState.Selected;
+
+        protected OverlaySelectionBlueprint(DrawableHitObject drawableObject)
+            : base(drawableObject.HitObject)
+        {
+            DrawableObject = drawableObject;
+        }
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.ReceivePositionalInputAt(screenSpacePos);
+
+        public override Vector2 SelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
+
+        public override Quad SelectionQuad => DrawableObject.ScreenSpaceDrawQuad;
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index bf99f83e0b..d8952a3932 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.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;
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public abstract class SelectionBlueprint : CompositeDrawable, IStateful<SelectionState>
     {
+        public readonly HitObject HitObject;
+
         /// <summary>
         /// Invoked when this <see cref="SelectionBlueprint"/> has been selected.
         /// </summary>
@@ -30,22 +32,15 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public event Action<SelectionBlueprint> Deselected;
 
-        /// <summary>
-        /// The <see cref="DrawableHitObject"/> which this <see cref="SelectionBlueprint"/> applies to.
-        /// </summary>
-        public readonly DrawableHitObject DrawableObject;
-
-        protected override bool ShouldBeAlive => (DrawableObject.IsAlive && DrawableObject.IsPresent) || State == SelectionState.Selected;
         public override bool HandlePositionalInput => ShouldBeAlive;
         public override bool RemoveWhenNotAlive => false;
 
         [Resolved(CanBeNull = true)]
         private HitObjectComposer composer { get; set; }
 
-        protected SelectionBlueprint(DrawableHitObject drawableObject)
+        protected SelectionBlueprint(HitObject hitObject)
         {
-            DrawableObject = drawableObject;
-
+            this.HitObject = hitObject;
             RelativeSizeAxes = Axes.Both;
 
             AlwaysPresent = true;
@@ -87,37 +82,35 @@ namespace osu.Game.Rulesets.Edit
         protected override bool ShouldBeConsideredForInput(Drawable child) => State == SelectionState.Selected;
 
         /// <summary>
-        /// Selects this <see cref="SelectionBlueprint"/>, causing it to become visible.
+        /// Selects this <see cref="OverlaySelectionBlueprint"/>, causing it to become visible.
         /// </summary>
         public void Select() => State = SelectionState.Selected;
 
         /// <summary>
-        /// Deselects this <see cref="SelectionBlueprint"/>, causing it to become invisible.
+        /// Deselects this <see cref="OverlaySelectionBlueprint"/>, causing it to become invisible.
         /// </summary>
         public void Deselect() => State = SelectionState.NotSelected;
 
         public bool IsSelected => State == SelectionState.Selected;
 
         /// <summary>
-        /// Updates the <see cref="HitObject"/>, invoking <see cref="HitObject.ApplyDefaults"/> and re-processing the beatmap.
+        /// Updates the <see cref="Objects.HitObject"/>, invoking <see cref="Objects.HitObject.ApplyDefaults"/> and re-processing the beatmap.
         /// </summary>
-        protected void UpdateHitObject() => composer?.UpdateHitObject(DrawableObject.HitObject);
-
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.ReceivePositionalInputAt(screenSpacePos);
+        protected void UpdateHitObject() => composer?.UpdateHitObject(HitObject);
 
         /// <summary>
-        /// The <see cref="MenuItem"/>s to be displayed in the context menu for this <see cref="SelectionBlueprint"/>.
+        /// The <see cref="MenuItem"/>s to be displayed in the context menu for this <see cref="OverlaySelectionBlueprint"/>.
         /// </summary>
         public virtual MenuItem[] ContextMenuItems => Array.Empty<MenuItem>();
 
         /// <summary>
-        /// The screen-space point that causes this <see cref="SelectionBlueprint"/> to be selected.
+        /// The screen-space point that causes this <see cref="OverlaySelectionBlueprint"/> to be selected.
         /// </summary>
-        public virtual Vector2 SelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
+        public virtual Vector2 SelectionPoint => ScreenSpaceDrawQuad.Centre;
 
         /// <summary>
-        /// The screen-space quad that outlines this <see cref="SelectionBlueprint"/> for selections.
+        /// The screen-space quad that outlines this <see cref="OverlaySelectionBlueprint"/> for selections.
         /// </summary>
-        public virtual Quad SelectionQuad => DrawableObject.ScreenSpaceDrawQuad;
+        public virtual Quad SelectionQuad => ScreenSpaceDrawQuad;
     }
 }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index 119635ccd5..4a7c3f26bc 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -11,20 +11,24 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 {
+    public class TimelinePart : TimelinePart<Drawable>
+    {
+    }
+
     /// <summary>
     /// Represents a part of the summary timeline..
     /// </summary>
-    public class TimelinePart : Container
+    public class TimelinePart<T> : Container<T> where T : Drawable
     {
         protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
-        private readonly Container timeline;
+        private readonly Container<T> content;
 
-        protected override Container<Drawable> Content => timeline;
+        protected override Container<T> Content => content;
 
-        public TimelinePart()
+        public TimelinePart(Container<T> content = null)
         {
-            AddInternal(timeline = new Container { RelativeSizeAxes = Axes.Both });
+            AddInternal(this.content = content ?? new Container<T> { RelativeSizeAxes = Axes.Both });
 
             Beatmap.ValueChanged += b =>
             {
@@ -44,17 +48,17 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
             // the track may not be loaded completely (only has a length once it is).
             if (!Beatmap.Value.Track.IsLoaded)
             {
-                timeline.RelativeChildSize = Vector2.One;
+                content.RelativeChildSize = Vector2.One;
                 Schedule(updateRelativeChildSize);
                 return;
             }
 
-            timeline.RelativeChildSize = new Vector2((float)Math.Max(1, Beatmap.Value.Track.Length), 1);
+            content.RelativeChildSize = new Vector2((float)Math.Max(1, Beatmap.Value.Track.Length), 1);
         }
 
         protected virtual void LoadBeatmap(WorkingBeatmap beatmap)
         {
-            timeline.Clear();
+            content.Clear();
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 81b0fb247f..e945955db6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 DragBox = CreateDragBox(select),
                 selectionHandler,
-                selectionBlueprints = new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both },
+                selectionBlueprints = CreateSelectionBlueprintContainer(),
                 DragBox.CreateProxy().With(p => p.Depth = float.MinValue)
             });
 
@@ -67,6 +67,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 AddBlueprintFor(obj);
         }
 
+        protected virtual SelectionBlueprintContainer CreateSelectionBlueprintContainer() => new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -118,7 +120,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (clickedBlueprint == null)
                 return false;
 
-            adjustableClock?.Seek(clickedBlueprint.DrawableObject.HitObject.StartTime);
+            adjustableClock?.Seek(clickedBlueprint.HitObject.StartTime);
             return true;
         }
 
@@ -208,7 +210,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void removeBlueprintFor(HitObject hitObject)
         {
-            var blueprint = selectionBlueprints.SingleOrDefault(m => m.DrawableObject.HitObject == hitObject);
+            var blueprint = selectionBlueprints.SingleOrDefault(m => m.HitObject == hitObject);
             if (blueprint == null)
                 return;
 
@@ -346,8 +348,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
 
             // Movement is tracked from the blueprint of the earliest hitobject, since it only makes sense to distance snap from that hitobject
-            movementBlueprint = selectionHandler.SelectedBlueprints.OrderBy(b => b.DrawableObject.HitObject.StartTime).First();
-            screenSpaceMovementStartPosition = movementBlueprint.DrawableObject.ToScreenSpace(movementBlueprint.DrawableObject.OriginPosition);
+            movementBlueprint = selectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime).First();
+            screenSpaceMovementStartPosition = movementBlueprint.SelectionPoint; // todo: unsure if correct
 
             return true;
         }
@@ -365,14 +367,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             Debug.Assert(screenSpaceMovementStartPosition != null);
 
             Vector2 startPosition = screenSpaceMovementStartPosition.Value;
-            HitObject draggedObject = movementBlueprint.DrawableObject.HitObject;
+            HitObject draggedObject = movementBlueprint.HitObject;
 
             // The final movement position, relative to screenSpaceMovementStartPosition
             Vector2 movePosition = startPosition + e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
             (Vector2 snappedPosition, double snappedTime) = snapProvider.GetSnappedPosition(ToLocalSpace(movePosition), draggedObject.StartTime);
 
             // Move the hitobjects
-            if (!selectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, startPosition, ToScreenSpace(snappedPosition))))
+            if (!selectionHandler.HandleMovement(new MoveSelectionEvent((OverlaySelectionBlueprint)movementBlueprint, startPosition, ToScreenSpace(snappedPosition))))
                 return true;
 
             // Apply the start time at the newly snapped-to position
@@ -411,29 +413,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private class SelectionBlueprintContainer : Container<SelectionBlueprint>
+        protected class SelectionBlueprintContainer : Container<SelectionBlueprint>
         {
             public IEnumerable<SelectionBlueprint> AliveBlueprints => AliveInternalChildren.Cast<SelectionBlueprint>();
-
-            protected override int Compare(Drawable x, Drawable y)
-            {
-                if (!(x is SelectionBlueprint xBlueprint) || !(y is SelectionBlueprint yBlueprint))
-                    return base.Compare(x, y);
-
-                return Compare(xBlueprint, yBlueprint);
-            }
-
-            public int Compare(SelectionBlueprint x, SelectionBlueprint y)
-            {
-                // dpeth is used to denote selected status (we always want selected blueprints to handle input first).
-                int d = x.Depth.CompareTo(y.Depth);
-                if (d != 0)
-                    return d;
-
-                // Put earlier hitobjects towards the end of the list, so they handle input first
-                int i = y.DrawableObject.HitObject.StartTime.CompareTo(x.DrawableObject.HitObject.StartTime);
-                return i == 0 ? CompareReverseChildID(x, y) : i;
-            }
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 1576def38e..3c41dead5d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return CreateBlueprintFor(drawable);
         }
 
-        public virtual SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
+        public virtual OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
 
         protected override void AddBlueprintFor(HitObject hitObject)
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index fe0a47aec8..8662347aeb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -7,14 +7,14 @@ using osuTK;
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// An event which occurs when a <see cref="SelectionBlueprint"/> is moved.
+    /// An event which occurs when a <see cref="OverlaySelectionBlueprint"/> is moved.
     /// </summary>
     public class MoveSelectionEvent
     {
         /// <summary>
-        /// The <see cref="SelectionBlueprint"/> that triggered this <see cref="MoveSelectionEvent"/>.
+        /// The <see cref="OverlaySelectionBlueprint"/> that triggered this <see cref="MoveSelectionEvent"/>.
         /// </summary>
-        public readonly SelectionBlueprint Blueprint;
+        public readonly OverlaySelectionBlueprint Blueprint;
 
         /// <summary>
         /// The starting screen-space position of the hitobject.
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </remarks>
         public readonly Vector2 InstantDelta;
 
-        public MoveSelectionEvent(SelectionBlueprint blueprint, Vector2 screenSpaceStartPosition, Vector2 screenSpacePosition)
+        public MoveSelectionEvent(OverlaySelectionBlueprint blueprint, Vector2 screenSpaceStartPosition, Vector2 screenSpacePosition)
         {
             Blueprint = blueprint;
             ScreenSpaceStartPosition = screenSpaceStartPosition;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index bff94e66ed..907a22b9ce 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
         private readonly List<SelectionBlueprint> selectedBlueprints;
 
-        public IEnumerable<HitObject> SelectedHitObjects => selectedBlueprints.Select(b => b.DrawableObject.HitObject);
+        public IEnumerable<HitObject> SelectedHitObjects => selectedBlueprints.Select(b => b.HitObject);
 
         private Drawable outline;
 
@@ -146,7 +146,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void deleteSelected()
         {
             foreach (var h in selectedBlueprints.ToList())
-                placementHandler.Delete(h.DrawableObject.HitObject);
+                placementHandler.Delete(h.HitObject);
         }
 
         #endregion
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index f521d08ada..e1acaa34cb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -2,13 +2,12 @@
 // 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.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;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -19,32 +18,21 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     internal class TimelineHitObjectDisplay : BlueprintContainer
     {
-        private EditorBeatmap beatmap { get; }
-
-        private readonly TimelinePart content;
-
         public TimelineHitObjectDisplay(EditorBeatmap beatmap)
         {
             RelativeSizeAxes = Axes.Both;
-
-            this.beatmap = beatmap;
-
-            AddInternal(content = new TimelinePart { RelativeSizeAxes = Axes.Both });
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            foreach (var h in beatmap.HitObjects)
-                add(h);
+        protected override SelectionBlueprintContainer CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
 
-            beatmap.HitObjectAdded += add;
-            beatmap.HitObjectRemoved += remove;
-            beatmap.StartTimeChanged += h =>
+        protected class TimelineSelectionBlueprintContainer : SelectionBlueprintContainer
+        {
+            protected override Container<SelectionBlueprint> Content { get; }
+
+            public TimelineSelectionBlueprintContainer()
             {
-                remove(h);
-                add(h);
-            };
+                AddInternal(new TimelinePart<SelectionBlueprint>(Content = new Container<SelectionBlueprint> { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
+            }
         }
 
         protected override void LoadComplete()
@@ -53,24 +41,19 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             DragBox.Alpha = 0;
         }
 
-        private void remove(HitObject h)
+        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
         {
-            foreach (var d in content.OfType<TimelineHitObjectRepresentation>().Where(c => c.HitObject == h))
-                d.Expire();
-        }
+            //var yOffset = content.Count(d => d.X == h.StartTime);
+            var yOffset = 0;
 
-        private void add(HitObject h)
-        {
-            var yOffset = content.Count(d => d.X == h.StartTime);
-
-            content.Add(new TimelineHitObjectRepresentation(h) { Y = -yOffset * TimelineHitObjectRepresentation.THICKNESS });
+            return new TimelineHitObjectRepresentation(hitObject) { Y = -yOffset * TimelineHitObjectRepresentation.THICKNESS };
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
             base.OnMouseDown(e);
 
-            return false; // tempoerary until we correctly handle selections.
+            return false; // temporary until we correctly handle selections.
         }
 
         protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new NoDragDragBox(performSelect);
@@ -85,15 +68,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             public override bool UpdateDrag(MouseButtonEvent e) => false;
         }
 
-        private class TimelineHitObjectRepresentation : CompositeDrawable
+        private class TimelineHitObjectRepresentation : SelectionBlueprint
         {
             public const float THICKNESS = 3;
 
-            public readonly HitObject HitObject;
-
             public TimelineHitObjectRepresentation(HitObject hitObject)
+                : base(hitObject)
             {
-                HitObject = hitObject;
                 Anchor = Anchor.CentreLeft;
                 Origin = Anchor.CentreLeft;
 
diff --git a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
index 3233ee160d..6565f98666 100644
--- a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual
             });
         }
 
-        protected void AddBlueprint(SelectionBlueprint blueprint)
+        protected void AddBlueprint(OverlaySelectionBlueprint blueprint)
         {
             Add(blueprint.With(d =>
             {

From 61d7b63914c2c806f1ae6eab113f01a7193036d1 Mon Sep 17 00:00:00 2001
From: ProTheory8 <59506423+ProTheory8@users.noreply.github.com>
Date: Tue, 21 Jan 2020 09:30:11 +0500
Subject: [PATCH 00198/10326] Readability Improvement

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index cdc4a42b33..38f5d54714 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -473,7 +473,9 @@ namespace osu.Game.Overlays.Mods
             if (selectedMod != null)
             {
                 if (State.Value == Visibility.Visible) sampleOn?.Play();
+
                 DeselectTypes(selectedMod.IncompatibleMods, true);
+
                 if (selectedMod.RequiresConfiguration) ModSettingsContainer.Alpha = 1;
             }
             else

From 53fe0ce79086351260002e3162baccf63840c17d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 14:20:52 +0900
Subject: [PATCH 00199/10326] Use AliveChildren

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index e945955db6..438be6ab54 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -258,7 +258,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (!allowDeselection && selectionHandler.SelectedBlueprints.Any(s => s.IsHovered))
                 return;
 
-            foreach (SelectionBlueprint blueprint in selectionBlueprints.AliveBlueprints)
+            foreach (SelectionBlueprint blueprint in selectionBlueprints.AliveChildren)
             {
                 if (blueprint.IsHovered)
                 {
@@ -415,7 +415,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected class SelectionBlueprintContainer : Container<SelectionBlueprint>
         {
-            public IEnumerable<SelectionBlueprint> AliveBlueprints => AliveInternalChildren.Cast<SelectionBlueprint>();
+            //todo: remove
         }
     }
 }

From 8f16c1cb049813cce2e1dabc07aa52e44e894038 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 14:21:00 +0900
Subject: [PATCH 00200/10326] Add non-hiding selection state

---
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs           | 10 +++++++---
 .../Components/Timeline/TimelineHitObjectDisplay.cs    |  8 +++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index d8952a3932..d50a9dce16 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Edit
             RelativeSizeAxes = Axes.Both;
 
             AlwaysPresent = true;
-            Alpha = 0;
+            OnDeselected();
         }
 
         private SelectionState state;
@@ -64,12 +64,12 @@ namespace osu.Game.Rulesets.Edit
                 switch (state)
                 {
                     case SelectionState.Selected:
-                        Show();
+                        OnSelected();
                         Selected?.Invoke(this);
                         break;
 
                     case SelectionState.NotSelected:
-                        Hide();
+                        OnDeselected();
                         Deselected?.Invoke(this);
                         break;
                 }
@@ -78,6 +78,10 @@ namespace osu.Game.Rulesets.Edit
             }
         }
 
+        protected virtual void OnDeselected() => Hide();
+
+        protected virtual void OnSelected() => Show();
+
         // When not selected, input is only required for the blueprint itself to receive IsHovering
         protected override bool ShouldBeConsideredForInput(Drawable child) => State == SelectionState.Selected;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index e1acaa34cb..5d1c4eeeae 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -70,6 +70,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private class TimelineHitObjectRepresentation : SelectionBlueprint
         {
+            private Circle circle;
+
             public const float THICKNESS = 3;
 
             public TimelineHitObjectRepresentation(HitObject hitObject)
@@ -104,7 +106,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     });
                 }
 
-                AddInternal(new Circle
+                AddInternal(circle = new Circle
                 {
                     Size = new Vector2(16),
                     Anchor = Anchor.CentreLeft,
@@ -116,6 +118,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     BorderThickness = THICKNESS,
                 });
             }
+
+            protected override void OnSelected() => circle.BorderColour = Color4.Orange;
+
+            protected override void OnDeselected() => circle.BorderColour = Color4.Black;
         }
     }
 }

From 195068ba9a9f6d35708159b2276ec74e70568456 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 17:35:36 +0900
Subject: [PATCH 00201/10326] Cache EditorBeatmap in test

---
 osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
index 29575cb42e..e9372bd134 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Tests.Visual.Editor
 
             var editorBeatmap = new EditorBeatmap((Beatmap<HitObject>)Beatmap.Value.Beatmap);
 
+            Dependencies.Cache(editorBeatmap);
+
             Children = new Drawable[]
             {
                 new FillFlowContainer

From 24a466ab249e6a88790a9f067f34ce44388e4521 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 17:36:21 +0900
Subject: [PATCH 00202/10326] Avoid null by calling initial OnDeselected later

---
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index d50a9dce16..1c82a8287b 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -40,11 +40,15 @@ namespace osu.Game.Rulesets.Edit
 
         protected SelectionBlueprint(HitObject hitObject)
         {
-            this.HitObject = hitObject;
+            HitObject = hitObject;
             RelativeSizeAxes = Axes.Both;
+        }
 
-            AlwaysPresent = true;
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             OnDeselected();
+            AlwaysPresent = true;
         }
 
         private SelectionState state;
@@ -116,5 +120,7 @@ namespace osu.Game.Rulesets.Edit
         /// The screen-space quad that outlines this <see cref="OverlaySelectionBlueprint"/> for selections.
         /// </summary>
         public virtual Quad SelectionQuad => ScreenSpaceDrawQuad;
+
+        public Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Parent.ToLocalSpace(screenSpacePosition) - Position;
     }
 }

From 79351976d5bc3eed44859e1a2f357d0f1b59f8e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 17:37:05 +0900
Subject: [PATCH 00203/10326] Allow timeline content to get more localised
 dependencies

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

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index aa8d99b517..8967f24185 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Edit
 
         private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
 
-        private TimelineArea timelineArea;
+        private Container timelineContainer;
 
         [BackgroundDependencyLoader(true)]
         private void load([CanBeNull] BindableBeatDivisor beatDivisor)
@@ -62,11 +62,10 @@ namespace osu.Game.Screens.Edit
                                             {
                                                 new Drawable[]
                                                 {
-                                                    new Container
+                                                    timelineContainer = new Container
                                                     {
                                                         RelativeSizeAxes = Axes.Both,
                                                         Padding = new MarginPadding { Right = 5 },
-                                                        Child = timelineArea = CreateTimelineArea()
                                                     },
                                                     new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
                                                 },
@@ -100,14 +99,16 @@ namespace osu.Game.Screens.Edit
                 mainContent.Add(content);
                 content.FadeInFromZero(300, Easing.OutQuint);
 
-                LoadComponentAsync(CreateTimelineContent(), timelineArea.Add);
+                LoadComponentAsync(new TimelineArea
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = CreateTimelineContent()
+                }, timelineContainer.Add);
             });
         }
 
         protected abstract Drawable CreateMainContent();
 
         protected virtual Drawable CreateTimelineContent() => new Container();
-
-        protected TimelineArea CreateTimelineArea() => new TimelineArea { RelativeSizeAxes = Axes.Both };
     }
 }

From 353b74b04a81331a9343e5cd0f3ba41ba129a64e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 17:37:35 +0900
Subject: [PATCH 00204/10326] Handle selection events in timeline

---
 .../Components/Timeline/TimelineHitObjectDisplay.cs   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index 5d1c4eeeae..32efdd42a3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -49,15 +49,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             return new TimelineHitObjectRepresentation(hitObject) { Y = -yOffset * TimelineHitObjectRepresentation.THICKNESS };
         }
 
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            base.OnMouseDown(e);
-
-            return false; // temporary until we correctly handle selections.
-        }
-
-        protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new NoDragDragBox(performSelect);
-
         internal class NoDragDragBox : DragBox
         {
             public NoDragDragBox(Action<RectangleF> performSelect)
@@ -74,6 +65,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             public const float THICKNESS = 3;
 
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) || circle.ReceivePositionalInputAt(screenSpacePos);
+
             public TimelineHitObjectRepresentation(HitObject hitObject)
                 : base(hitObject)
             {

From 6dd50572d242993a9c1a174ea4e5cf4344c0996a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 17:37:43 +0900
Subject: [PATCH 00205/10326] Break mania more

---
 osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index f33fd3c640..9069a636a8 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             // When scrolling downwards the anchor position is at the bottom of the screen, however the movement event assumes the anchor is at the top of the screen.
             // This causes the delta to assume a positive hitobject position, and which can be corrected for by subtracting the parent height.
             if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
-                delta -= moveEvent.Blueprint.DrawableObject.Parent.DrawHeight;
+                delta -= moveEvent.Blueprint.Parent.DrawHeight; // todo: probably wrong
 
             foreach (var selectionBlueprint in SelectedBlueprints)
             {

From 6187b2e77cad79cb899af96adb66d400081bf9fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 18:00:36 +0900
Subject: [PATCH 00206/10326] Implement IDistanceSnapProvider in timeline for
 now

---
 .../Compose/Components/Timeline/Timeline.cs   | 52 ++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index b4f3b1f610..c866fb38c8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -10,11 +10,15 @@ using osu.Framework.Graphics.Audio;
 using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Edit;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    public class Timeline : ZoomableScrollContainer
+    [Cached(typeof(IDistanceSnapProvider))]
+    public class Timeline : ZoomableScrollContainer, IDistanceSnapProvider
     {
         public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
         public readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
@@ -162,5 +166,51 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (trackWasPlaying)
                 adjustableClock.Start();
         }
+
+        [Resolved]
+        private BindableBeatDivisor beatDivisor { get; set; }
+
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; }
+
+        public (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time) => (position, time);
+
+        public float GetBeatSnapDistanceAt(double referenceTime)
+        {
+            DifficultyControlPoint difficultyPoint = beatmap.ControlPointInfo.DifficultyPointAt(referenceTime);
+            return (float)(100 * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier / beatDivisor.Value);
+        }
+
+        public float DurationToDistance(double referenceTime, double duration)
+        {
+            double beatLength = beatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
+            return (float)(duration / beatLength * GetBeatSnapDistanceAt(referenceTime));
+        }
+
+        public double DistanceToDuration(double referenceTime, float distance)
+        {
+            double beatLength = beatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
+            return distance / GetBeatSnapDistanceAt(referenceTime) * beatLength;
+        }
+
+        public double GetSnappedDurationFromDistance(double referenceTime, float distance)
+            => beatSnap(referenceTime, DistanceToDuration(referenceTime, distance));
+
+        public float GetSnappedDistanceFromDistance(double referenceTime, float distance)
+            => DurationToDistance(referenceTime, beatSnap(referenceTime, DistanceToDuration(referenceTime, distance)));
+
+        /// <summary>
+        /// Snaps a duration to the closest beat of a timing point applicable at the reference time.
+        /// </summary>
+        /// <param name="referenceTime">The time of the timing point which <paramref name="duration"/> resides in.</param>
+        /// <param name="duration">The duration to snap.</param>
+        /// <returns>A value that represents <paramref name="duration"/> snapped to the closest beat of the timing point.</returns>
+        private double beatSnap(double referenceTime, double duration)
+        {
+            double beatLength = beatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
+
+            // A 1ms offset prevents rounding errors due to minute variations in duration
+            return (int)((duration + 1) / beatLength) * beatLength;
+        }
     }
 }

From a888d148b653477e11ea7b5a292faf5a2c63b39d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 18:01:10 +0900
Subject: [PATCH 00207/10326] Remove remaining cast

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs | 2 +-
 .../Screens/Edit/Compose/Components/MoveSelectionEvent.cs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 438be6ab54..b792065b43 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -374,7 +374,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             (Vector2 snappedPosition, double snappedTime) = snapProvider.GetSnappedPosition(ToLocalSpace(movePosition), draggedObject.StartTime);
 
             // Move the hitobjects
-            if (!selectionHandler.HandleMovement(new MoveSelectionEvent((OverlaySelectionBlueprint)movementBlueprint, startPosition, ToScreenSpace(snappedPosition))))
+            if (!selectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, startPosition, ToScreenSpace(snappedPosition))))
                 return true;
 
             // Apply the start time at the newly snapped-to position
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index 8662347aeb..48cb702c78 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -12,9 +12,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
     public class MoveSelectionEvent
     {
         /// <summary>
-        /// The <see cref="OverlaySelectionBlueprint"/> that triggered this <see cref="MoveSelectionEvent"/>.
+        /// The <see cref="SelectionBlueprint"/> that triggered this <see cref="MoveSelectionEvent"/>.
         /// </summary>
-        public readonly OverlaySelectionBlueprint Blueprint;
+        public readonly SelectionBlueprint Blueprint;
 
         /// <summary>
         /// The starting screen-space position of the hitobject.
@@ -34,13 +34,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </remarks>
         public readonly Vector2 InstantDelta;
 
-        public MoveSelectionEvent(OverlaySelectionBlueprint blueprint, Vector2 screenSpaceStartPosition, Vector2 screenSpacePosition)
+        public MoveSelectionEvent(SelectionBlueprint blueprint, Vector2 screenSpaceStartPosition, Vector2 screenSpacePosition)
         {
             Blueprint = blueprint;
             ScreenSpaceStartPosition = screenSpaceStartPosition;
             ScreenSpacePosition = screenSpacePosition;
 
-            InstantDelta = Blueprint.DrawableObject.Parent.ToLocalSpace(ScreenSpacePosition) - Blueprint.DrawableObject.Position;
+            InstantDelta = Blueprint.GetInstantDelta(ScreenSpacePosition);
         }
     }
 }

From f582c42bbd3a248c98d47bcc27470a94c7e7b6d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 18:56:09 +0900
Subject: [PATCH 00208/10326] Perform deletion directly via EditorBeatmap

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 907a22b9ce..9d9685af8a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private Drawable outline;
 
         [Resolved(CanBeNull = true)]
-        private IPlacementHandler placementHandler { get; set; }
+        private EditorBeatmap editorBeatmap { get; set; }
 
         public SelectionHandler()
         {
@@ -146,7 +146,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void deleteSelected()
         {
             foreach (var h in selectedBlueprints.ToList())
-                placementHandler.Delete(h.HitObject);
+                editorBeatmap.Remove(h.HitObject);
         }
 
         #endregion

From b8d2012fc3fa5a02315ff9f394e6f3eda2d320be Mon Sep 17 00:00:00 2001
From: ProTheory8 <editaw5@gmail.com>
Date: Tue, 21 Jan 2020 10:26:51 +0000
Subject: [PATCH 00209/10326] Added test

---
 .../UserInterface/TestSceneModSettings.cs     | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 8dcb7dcbf8..c7744129cb 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private readonly Mod testCustomisableMod = new TestModCustomisable1();
 
+        private readonly Mod testCustomisableAutoOpenMod = new TestModCustomisable3();
+
         [Test]
         public void TestButtonShowsOnCustomisableMod()
         {
@@ -53,6 +55,16 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("button enabled", () => modSelect.CustomiseButton.Enabled.Value);
         }
 
+        [Test]
+        public void TestCustomisationOpensOnModSelect()
+        {
+            createModSelect();
+
+            AddStep("open", () => modSelect.Show());
+            AddStep("select mod", () => modSelect.SelectMod(testCustomisableAutoOpenMod));
+            AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.Alpha == 1);
+        }
+
         private void createModSelect()
         {
             AddStep("create mod select", () =>
@@ -98,7 +110,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                         return new Mod[]
                         {
                             new TestModCustomisable1(),
-                            new TestModCustomisable2()
+                            new TestModCustomisable2(),
+                            new TestModCustomisable3()
                         };
                     }
 
@@ -130,6 +143,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             public override string Acronym => "CM2";
         }
 
+        private class TestModCustomisable3 : TestModCustomisable
+        {
+            public override string Name => "Customisable Mod 3";
+
+            public override string Acronym => "CM3";
+
+            public override bool RequiresConfiguration => true;
+        }
+
         private abstract class TestModCustomisable : Mod, IApplicableMod
         {
             public override double ScoreMultiplier => 1.0;

From 1ce78afa9872008ceed0a428366eedb4da9472d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 19:51:44 +0900
Subject: [PATCH 00210/10326] Disable y offset for now

---
 .../Compose/Components/Timeline/TimelineHitObjectDisplay.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index 32efdd42a3..d83336b21b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -44,9 +44,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
         {
             //var yOffset = content.Count(d => d.X == h.StartTime);
-            var yOffset = 0;
+            //var yOffset = 0;
 
-            return new TimelineHitObjectRepresentation(hitObject) { Y = -yOffset * TimelineHitObjectRepresentation.THICKNESS };
+            return new TimelineHitObjectRepresentation(hitObject);
         }
 
         internal class NoDragDragBox : DragBox

From c88bdbd4a0264f766de60f88af736d1da4b6a998 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 20:46:39 +0900
Subject: [PATCH 00211/10326] Share selected hitobjects across multiple
 blueprint containers

---
 .../Compose/Components/BlueprintContainer.cs   | 18 ++++++++++++++++++
 .../Compose/Components/SelectionHandler.cs     |  7 ++++++-
 osu.Game/Screens/Edit/EditorBeatmap.cs         |  2 ++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index b792065b43..c5414542e4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -41,6 +42,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
+        private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
+
         [Resolved(canBeNull: true)]
         private IDistanceSnapProvider snapProvider { get; set; }
 
@@ -65,6 +68,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             foreach (var obj in beatmap.HitObjects)
                 AddBlueprintFor(obj);
+
+            selectedHitObjects.BindTo(beatmap.SelectedHitObjects);
+            selectedHitObjects.ItemsAdded += objects =>
+            {
+                foreach (var o in objects)
+                    selectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
+            };
+
+            selectedHitObjects.ItemsRemoved += objects =>
+            {
+                foreach (var o in objects)
+                    selectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
+            };
         }
 
         protected virtual SelectionBlueprintContainer CreateSelectionBlueprintContainer() => new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
@@ -315,6 +331,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             selectionHandler.HandleSelected(blueprint);
             selectionBlueprints.ChangeChildDepth(blueprint, 1);
+            beatmap.SelectedHitObjects.Add(blueprint.HitObject);
 
             SelectionChanged?.Invoke(selectionHandler.SelectedHitObjects);
         }
@@ -323,6 +340,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             selectionHandler.HandleDeselected(blueprint);
             selectionBlueprints.ChangeChildDepth(blueprint, 0);
+            beatmap.SelectedHitObjects.Remove(blueprint.HitObject);
 
             SelectionChanged?.Invoke(selectionHandler.SelectedHitObjects);
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 9d9685af8a..6ca110e518 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -102,7 +102,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Handle a blueprint becoming selected.
         /// </summary>
         /// <param name="blueprint">The blueprint.</param>
-        internal void HandleSelected(SelectionBlueprint blueprint) => selectedBlueprints.Add(blueprint);
+        internal void HandleSelected(SelectionBlueprint blueprint)
+        {
+            selectedBlueprints.Add(blueprint);
+            editorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
+        }
 
         /// <summary>
         /// Handle a blueprint becoming deselected.
@@ -111,6 +115,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         internal void HandleDeselected(SelectionBlueprint blueprint)
         {
             selectedBlueprints.Remove(blueprint);
+            editorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
 
             // We don't want to update visibility if > 0, since we may be deselecting blueprints during drag-selection
             if (selectedBlueprints.Count == 0)
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 6ed74dfdb0..2ff7563a88 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         public event Action<HitObject> StartTimeChanged;
 
+        public BindableList<HitObject> SelectedHitObjects { get; } = new BindableList<HitObject>();
+
         public readonly IBeatmap PlayableBeatmap;
 
         private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();

From a963d652bc1caee47081b5d4a8dc0ae93134a246 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 20:54:50 +0900
Subject: [PATCH 00212/10326] Mark readonly

---
 .../Compose/Components/Timeline/TimelineHitObjectDisplay.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index d83336b21b..b2ff9eee12 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private class TimelineHitObjectRepresentation : SelectionBlueprint
         {
-            private Circle circle;
+            private readonly Circle circle;
 
             public const float THICKNESS = 3;
 

From 83fa4a9bb34d74e362cd7e684f0879c9d385a812 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 22:24:04 +0900
Subject: [PATCH 00213/10326] Move circle size to a constant

---
 .../Compose/Components/Timeline/TimelineHitObjectDisplay.cs   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index b2ff9eee12..7932813bbc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -65,6 +65,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             public const float THICKNESS = 3;
 
+            private const float circle_size = 16;
+
             public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) || circle.ReceivePositionalInputAt(screenSpacePos);
 
             public TimelineHitObjectRepresentation(HitObject hitObject)
@@ -101,7 +103,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 AddInternal(circle = new Circle
                 {
-                    Size = new Vector2(16),
+                    Size = new Vector2(circle_size),
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.Centre,
                     RelativePositionAxes = Axes.X,

From 9de4424aec08a26e5d179d5015e4fef93de25990 Mon Sep 17 00:00:00 2001
From: ProTheory8 <editaw5@gmail.com>
Date: Tue, 21 Jan 2020 14:32:53 +0000
Subject: [PATCH 00214/10326] Removed TestModCustomisable3

---
 .../Visual/UserInterface/TestSceneModSettings.cs    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index c7744129cb..e2ce2341e5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private readonly Mod testCustomisableMod = new TestModCustomisable1();
 
-        private readonly Mod testCustomisableAutoOpenMod = new TestModCustomisable3();
+        private readonly Mod testCustomisableAutoOpenMod = new TestModCustomisable2();
 
         [Test]
         public void TestButtonShowsOnCustomisableMod()
@@ -61,6 +61,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             createModSelect();
 
             AddStep("open", () => modSelect.Show());
+            AddAssert("Customisation closed", () => modSelect.ModSettingsContainer.Alpha == 0);
             AddStep("select mod", () => modSelect.SelectMod(testCustomisableAutoOpenMod));
             AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.Alpha == 1);
         }
@@ -110,8 +111,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                         return new Mod[]
                         {
                             new TestModCustomisable1(),
-                            new TestModCustomisable2(),
-                            new TestModCustomisable3()
+                            new TestModCustomisable2()
                         };
                     }
 
@@ -141,13 +141,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             public override string Name => "Customisable Mod 2";
 
             public override string Acronym => "CM2";
-        }
-
-        private class TestModCustomisable3 : TestModCustomisable
-        {
-            public override string Name => "Customisable Mod 3";
-
-            public override string Acronym => "CM3";
 
             public override bool RequiresConfiguration => true;
         }

From 98aaf3864953f31a942184bdc6adce5e3781e782 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 23:58:51 +0900
Subject: [PATCH 00215/10326] Fix playfield movement regressing

---
 osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs | 2 ++
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
index 4c3898aa04..b4ae3f3fba 100644
--- a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
@@ -28,5 +28,7 @@ namespace osu.Game.Rulesets.Edit
         public override Vector2 SelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
 
         public override Quad SelectionQuad => DrawableObject.ScreenSpaceDrawQuad;
+
+        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => DrawableObject.Parent.ToLocalSpace(screenSpacePosition) - DrawableObject.Position;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 1c82a8287b..9998254f76 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -121,6 +121,6 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public virtual Quad SelectionQuad => ScreenSpaceDrawQuad;
 
-        public Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Parent.ToLocalSpace(screenSpacePosition) - Position;
+        public virtual Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Parent.ToLocalSpace(screenSpacePosition) - Position;
     }
 }

From e3a2b20f631532dece1d51a4eabd89cc4c05bdff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 01:32:11 +0900
Subject: [PATCH 00216/10326] Fix SelectionHandler visibility on remote
 selection

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 6ca110e518..0aced5f957 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -106,6 +106,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             selectedBlueprints.Add(blueprint);
             editorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
+
+            UpdateVisibility();
         }
 
         /// <summary>
@@ -144,8 +146,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DeselectAll?.Invoke();
                 blueprint.Select();
             }
-
-            UpdateVisibility();
         }
 
         private void deleteSelected()

From 03b6a3ddc3fabdffc6fb7c8a76dc6999ba7c2cca Mon Sep 17 00:00:00 2001
From: raouls555 <30951475+raouls555@users.noreply.github.com>
Date: Tue, 21 Jan 2020 23:22:08 +0100
Subject: [PATCH 00217/10326] Allow parsing hex colour codes with alpha

---
 osu.Game/Graphics/OsuColour.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 6767104576..53a40f5613 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -36,6 +36,20 @@ namespace osu.Game.Graphics
                         Convert.ToByte(hex.Substring(2, 2), 16),
                         Convert.ToByte(hex.Substring(4, 2), 16),
                         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));
+
+                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));
             }
         }
 

From 14a961c95b3a6bb17f303c168bb5ed26e9f1192c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 22 Jan 2020 04:41:10 +0300
Subject: [PATCH 00218/10326] Remove invariance in the OverlayTabItem

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

diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index 11f93bb373..0837bf0db4 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays
                 public OverlayHeaderTabItem(T value)
                     : base(value)
                 {
-                    Text.Text = value.ToString().ToLowerInvariant();
+                    Text.Text = value.ToString().ToLower();
                     Text.Font = OsuFont.GetFont(size: 14);
                     Bar.ExpandedSize = 5;
                 }

From 7b2f58eb305bd27c8183c9f0405b97c07569708a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jan 2020 13:22:34 +0900
Subject: [PATCH 00219/10326] Apply OnRelease method signature refactorings

---
 osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs      |  5 ++++-
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs          | 14 +++++++-------
 .../Objects/Drawables/DrawableHoldNote.cs          | 10 ++++------
 .../Objects/Drawables/DrawableHoldNoteHead.cs      |  4 +++-
 .../Objects/Drawables/DrawableHoldNoteTail.cs      |  4 +++-
 .../Objects/Drawables/DrawableNote.cs              |  4 +++-
 osu.Game.Rulesets.Mania/UI/Column.cs               |  4 +++-
 .../UI/Components/ColumnBackground.cs              |  3 +--
 .../UI/Components/ColumnKeyArea.cs                 |  3 +--
 .../Components/PathControlPointVisualiser.cs       |  4 +++-
 .../Objects/Drawables/DrawableHitCircle.cs         |  4 +++-
 .../UI/Cursor/OsuCursorContainer.cs                |  4 +---
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs       |  4 +++-
 .../Objects/Drawables/DrawableHit.cs               |  5 +++--
 .../Objects/Drawables/DrawableTaikoHitObject.cs    |  5 ++++-
 osu.Game.Rulesets.Taiko/UI/InputDrum.cs            |  4 +++-
 .../Containers/OsuFocusedOverlayContainer.cs       |  4 +++-
 osu.Game/Graphics/ScreenshotManager.cs             |  4 +++-
 osu.Game/Graphics/UserInterface/BackButton.cs      |  4 +++-
 osu.Game/Graphics/UserInterface/FocusedTextBox.cs  |  4 +++-
 osu.Game/Input/IdleTracker.cs                      |  2 +-
 osu.Game/OsuGame.cs                                |  4 +++-
 osu.Game/Overlays/MusicController.cs               |  4 +++-
 osu.Game/Overlays/Volume/VolumeControlReceptor.cs  |  5 ++++-
 osu.Game/Rulesets/UI/RulesetInputManager.cs        |  6 +++++-
 .../UI/Scrolling/DrawableScrollingRuleset.cs       |  4 +++-
 .../Edit/Compose/Components/BlueprintContainer.cs  |  4 +++-
 .../Edit/Compose/Components/SelectionHandler.cs    |  4 +++-
 osu.Game/Screens/Edit/Editor.cs                    |  4 +++-
 osu.Game/Screens/Menu/ButtonSystem.cs              |  4 +++-
 osu.Game/Screens/Menu/ExitConfirmOverlay.cs        |  5 +----
 osu.Game/Screens/Play/GameplayMenuOverlay.cs       | 10 +---------
 osu.Game/Screens/Play/HUD/HoldForMenuButton.cs     |  6 ++----
 osu.Game/Screens/Play/HotkeyExitOverlay.cs         |  5 ++---
 osu.Game/Screens/Play/HotkeyRetryOverlay.cs        |  5 ++---
 osu.Game/Screens/Play/KeyCounterAction.cs          |  5 ++---
 osu.Game/Screens/Play/SkipOverlay.cs               |  4 +++-
 osu.Game/Screens/Select/SongSelect.cs              |  4 +++-
 38 files changed, 108 insertions(+), 74 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
index a47efcc10a..4c72b9fd3e 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
@@ -36,7 +36,10 @@ namespace osu.Game.Rulesets.Catch.Mods
 
             //disable keyboard controls
             public bool OnPressed(CatchAction action) => true;
-            public bool OnReleased(CatchAction action) => true;
+
+            public void OnReleased(CatchAction action)
+            {
+            }
 
             protected override bool OnMouseMove(MouseMoveEvent e)
             {
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 0c8c483048..1de0b6bfa3 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -103,7 +103,9 @@ namespace osu.Game.Rulesets.Catch.UI
                 MovableCatcher.X = state.CatcherX.Value;
         }
 
-        public bool OnReleased(CatchAction action) => false;
+        public void OnReleased(CatchAction action)
+        {
+        }
 
         public bool AttemptCatch(CatchHitObject obj) => MovableCatcher.AttemptCatch(obj);
 
@@ -341,24 +343,22 @@ namespace osu.Game.Rulesets.Catch.UI
                 return false;
             }
 
-            public bool OnReleased(CatchAction action)
+            public void OnReleased(CatchAction action)
             {
                 switch (action)
                 {
                     case CatchAction.MoveLeft:
                         currentDirection++;
-                        return true;
+                        break;
 
                     case CatchAction.MoveRight:
                         currentDirection--;
-                        return true;
+                        break;
 
                     case CatchAction.Dash:
                         Dashing = false;
-                        return true;
+                        break;
                 }
-
-                return false;
             }
 
             /// <summary>
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 155adb958b..14a7c5fda3 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -171,17 +171,17 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             bodyPiece.Hitting = true;
         }
 
-        public bool OnReleased(ManiaAction action)
+        public void OnReleased(ManiaAction action)
         {
             if (AllJudged)
-                return false;
+                return;
 
             if (action != Action.Value)
-                return false;
+                return;
 
             // Make sure a hold was started
             if (HoldStartTime == null)
-                return false;
+                return;
 
             Tail.UpdateResult();
             endHold();
@@ -189,8 +189,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // If the key has been released too early, the user should not receive full score for the release
             if (!Tail.IsHit)
                 HasBroken = true;
-
-            return true;
         }
 
         private void endHold()
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
index a5d03bf765..390c64c5e2 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public override bool OnPressed(ManiaAction action) => false; // Handled by the hold note
 
-        public override bool OnReleased(ManiaAction action) => false; // Handled by the hold note
+        public override void OnReleased(ManiaAction action)
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index a660144dd1..568b07c958 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -59,6 +59,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public override bool OnPressed(ManiaAction action) => false; // Handled by the hold note
 
-        public override bool OnReleased(ManiaAction action) => false; // Handled by the hold note
+        public override void OnReleased(ManiaAction action)
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 8f353ae138..85613d3afb 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -77,6 +77,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             return UpdateResult(true);
         }
 
-        public virtual bool OnReleased(ManiaAction action) => false;
+        public virtual void OnReleased(ManiaAction action)
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 3d2a070b0f..63c573d344 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -191,7 +191,9 @@ namespace osu.Game.Rulesets.Mania.UI
             return true;
         }
 
-        public bool OnReleased(ManiaAction action) => false;
+        public void OnReleased(ManiaAction action)
+        {
+        }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
             // This probably shouldn't exist as is, but the columns in the stage are separated by a 1px border
diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs
index 57241da564..75cc351310 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs
@@ -98,11 +98,10 @@ namespace osu.Game.Rulesets.Mania.UI.Components
             return false;
         }
 
-        public bool OnReleased(ManiaAction action)
+        public void OnReleased(ManiaAction action)
         {
             if (action == this.action.Value)
                 backgroundOverlay.FadeTo(0, 250, Easing.OutQuint);
-            return false;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnKeyArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnKeyArea.cs
index 85880222d7..60fc2713b3 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnKeyArea.cs
@@ -115,11 +115,10 @@ namespace osu.Game.Rulesets.Mania.UI.Components
             return false;
         }
 
-        public bool OnReleased(ManiaAction action)
+        public void OnReleased(ManiaAction action)
         {
             if (action == this.action.Value)
                 keyIcon.ScaleTo(1f, 125, Easing.OutQuint);
-            return false;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 6f583d7983..e293eba9d7 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -108,7 +108,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             return false;
         }
 
-        public bool OnReleased(PlatformAction action) => action.ActionMethod == PlatformActionMethod.Delete;
+        public void OnReleased(PlatformAction action)
+        {
+        }
 
         private void selectPiece(PathControlPointPiece piece, MouseButtonEvent e)
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index f74f2d7bc5..3162f4b379 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -205,7 +205,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 return false;
             }
 
-            public bool OnReleased(OsuAction action) => false;
+            public void OnReleased(OsuAction action)
+            {
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index 6433ced624..a463542e64 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             return false;
         }
 
-        public bool OnReleased(OsuAction action)
+        public void OnReleased(OsuAction action)
         {
             switch (action)
             {
@@ -120,8 +120,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         updateExpandedState();
                     break;
             }
-
-            return false;
         }
 
         public override bool HandlePositionalInput => true; // OverlayContainer will set this false when we go hidden, but we always want to receive input.
diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index 3b18e41f30..ca3030db3e 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -107,7 +107,9 @@ namespace osu.Game.Rulesets.Osu.UI
                 return false;
             }
 
-            public bool OnReleased(OsuAction action) => false;
+            public void OnReleased(OsuAction action)
+            {
+            }
 
             public void Appear() => Schedule(() =>
             {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 4b25ff0ecc..85dfc8d5e0 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -77,11 +77,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return result;
         }
 
-        public override bool OnReleased(TaikoAction action)
+        public override void OnReleased(TaikoAction action)
         {
             if (action == HitAction)
                 HitAction = null;
-            return base.OnReleased(action);
+
+            base.OnReleased(action);
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index b9d31ff906..5f892dd2fa 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -77,7 +77,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         public Drawable CreateProxiedContent() => proxiedContent.CreateProxy();
 
         public abstract bool OnPressed(TaikoAction action);
-        public virtual bool OnReleased(TaikoAction action) => false;
+
+        public virtual void OnReleased(TaikoAction action)
+        {
+        }
 
         public override double LifetimeStart
         {
diff --git a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
index 5234ae1f69..d26ccfe867 100644
--- a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
@@ -187,7 +187,9 @@ namespace osu.Game.Rulesets.Taiko.UI
                 return false;
             }
 
-            public bool OnReleased(TaikoAction action) => false;
+            public void OnReleased(TaikoAction action)
+            {
+            }
         }
     }
 }
diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index facf70b47a..652b693b86 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -99,7 +99,9 @@ namespace osu.Game.Graphics.Containers
             return false;
         }
 
-        public bool OnReleased(GlobalAction action) => false;
+        public void OnReleased(GlobalAction action)
+        {
+        }
 
         protected override void UpdateState(ValueChangedEvent<Visibility> state)
         {
diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index b9151b7393..7f20c30048 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -67,7 +67,9 @@ namespace osu.Game.Graphics
             return false;
         }
 
-        public bool OnReleased(GlobalAction action) => false;
+        public void OnReleased(GlobalAction action)
+        {
+        }
 
         private volatile int screenShotTasks;
 
diff --git a/osu.Game/Graphics/UserInterface/BackButton.cs b/osu.Game/Graphics/UserInterface/BackButton.cs
index 23565e8742..88ba7ede6e 100644
--- a/osu.Game/Graphics/UserInterface/BackButton.cs
+++ b/osu.Game/Graphics/UserInterface/BackButton.cs
@@ -67,7 +67,9 @@ namespace osu.Game.Graphics.UserInterface
                 return false;
             }
 
-            public bool OnReleased(GlobalAction action) => action == GlobalAction.Back;
+            public void OnReleased(GlobalAction action)
+            {
+            }
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
index 0b183c0ec9..e59353a480 100644
--- a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
@@ -80,7 +80,9 @@ namespace osu.Game.Graphics.UserInterface
             return false;
         }
 
-        public bool OnReleased(GlobalAction action) => false;
+        public void OnReleased(GlobalAction action)
+        {
+        }
 
         public override bool RequestsFocus => HoldFocus;
     }
diff --git a/osu.Game/Input/IdleTracker.cs b/osu.Game/Input/IdleTracker.cs
index 39ccf9fe1c..63a6348b57 100644
--- a/osu.Game/Input/IdleTracker.cs
+++ b/osu.Game/Input/IdleTracker.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Input
 
         public bool OnPressed(PlatformAction action) => updateLastInteractionTime();
 
-        public bool OnReleased(PlatformAction action) => updateLastInteractionTime();
+        public void OnReleased(PlatformAction action) => updateLastInteractionTime();
 
         protected override bool Handle(UIEvent e)
         {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 9df854d178..ff46c6d849 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -881,7 +881,9 @@ namespace osu.Game
 
         #endregion
 
-        public bool OnReleased(GlobalAction action) => false;
+        public void OnReleased(GlobalAction action)
+        {
+        }
 
         private Container overlayContent;
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 3c0f6468bc..19f06e99f1 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -326,7 +326,9 @@ namespace osu.Game.Overlays
             return false;
         }
 
-        public bool OnReleased(GlobalAction action) => false;
+        public void OnReleased(GlobalAction action)
+        {
+        }
 
         public class MusicControllerToast : Toast
         {
diff --git a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
index 9cd3aac2cb..76fad945cc 100644
--- a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
@@ -16,6 +16,9 @@ namespace osu.Game.Overlays.Volume
 
         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 OnReleased(GlobalAction action) => false;
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 5cc213be41..41b2739fc5 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -139,7 +139,11 @@ namespace osu.Game.Rulesets.UI
 
             public bool OnPressed(T action) => Target.Children.OfType<KeyCounterAction<T>>().Any(c => c.OnPressed(action, Clock.Rate >= 0));
 
-            public bool OnReleased(T action) => Target.Children.OfType<KeyCounterAction<T>>().Any(c => c.OnReleased(action, Clock.Rate >= 0));
+            public void OnReleased(T action)
+            {
+                foreach (var c in Target.Children.OfType<KeyCounterAction<T>>())
+                    c.OnReleased(action, Clock.Rate >= 0);
+            }
         }
 
         #endregion
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index fda1d7c723..8bcdfff2fd 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -201,7 +201,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 throw new ArgumentException($"{nameof(Playfield)} must be a {nameof(ScrollingPlayfield)} when using {nameof(DrawableScrollingRuleset<TObject>)}.");
         }
 
-        public bool OnReleased(GlobalAction action) => false;
+        public void OnReleased(GlobalAction action)
+        {
+        }
 
         private class LocalScrollingInfo : IScrollingInfo
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index cafaddc39e..11fbd8ce04 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -215,7 +215,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return false;
         }
 
-        public bool OnReleased(PlatformAction action) => false;
+        public void OnReleased(PlatformAction action)
+        {
+        }
 
         protected override void Update()
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index e2d7855eb5..1473a1a2da 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -87,7 +87,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return false;
         }
 
-        public bool OnReleased(PlatformAction action) => action.ActionMethod == PlatformActionMethod.Delete;
+        public void OnReleased(PlatformAction action)
+        {
+        }
 
         #endregion
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index e212b429b9..e5cb319fb9 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -253,7 +253,9 @@ namespace osu.Game.Screens.Edit
             return false;
         }
 
-        public bool OnReleased(GlobalAction action) => action == GlobalAction.Back;
+        public void OnReleased(GlobalAction action)
+        {
+        }
 
         public override void OnResuming(IScreen last)
         {
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index ed8e4c70f9..d94f8aa11a 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -211,7 +211,9 @@ namespace osu.Game.Screens.Menu
             }
         }
 
-        public bool OnReleased(GlobalAction action) => false;
+        public void OnReleased(GlobalAction action)
+        {
+        }
 
         private bool goBack()
         {
diff --git a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
index aaa3a77e74..db2faeb60a 100644
--- a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
+++ b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
@@ -24,16 +24,13 @@ namespace osu.Game.Screens.Menu
             return false;
         }
 
-        public bool OnReleased(GlobalAction action)
+        public void OnReleased(GlobalAction action)
         {
             if (action == GlobalAction.Back)
             {
                 if (!Fired)
                     AbortConfirm();
-                return true;
             }
-
-            return false;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index adfbe977a4..0c94e04cf6 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -247,16 +247,8 @@ namespace osu.Game.Screens.Play
             return false;
         }
 
-        public bool OnReleased(GlobalAction action)
+        public void OnReleased(GlobalAction action)
         {
-            switch (action)
-            {
-                case GlobalAction.Back:
-                case GlobalAction.Select:
-                    return true;
-            }
-
-            return false;
         }
 
         private void buttonSelectionChanged(DialogButton button, bool isSelected)
diff --git a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
index 7946e6d322..f209d5ea6c 100644
--- a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
+++ b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
@@ -259,16 +259,14 @@ namespace osu.Game.Screens.Play.HUD
                 return false;
             }
 
-            public bool OnReleased(GlobalAction action)
+            public void OnReleased(GlobalAction action)
             {
                 switch (action)
                 {
                     case GlobalAction.Back:
                         AbortConfirm();
-                        return true;
+                        break;
                 }
-
-                return false;
             }
 
             protected override bool OnMouseDown(MouseDownEvent e)
diff --git a/osu.Game/Screens/Play/HotkeyExitOverlay.cs b/osu.Game/Screens/Play/HotkeyExitOverlay.cs
index c18aecda55..8d7e2481bf 100644
--- a/osu.Game/Screens/Play/HotkeyExitOverlay.cs
+++ b/osu.Game/Screens/Play/HotkeyExitOverlay.cs
@@ -17,12 +17,11 @@ namespace osu.Game.Screens.Play
             return true;
         }
 
-        public bool OnReleased(GlobalAction action)
+        public void OnReleased(GlobalAction action)
         {
-            if (action != GlobalAction.QuickExit) return false;
+            if (action != GlobalAction.QuickExit) return;
 
             AbortConfirm();
-            return true;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
index f1b851f2d5..58fd941f36 100644
--- a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
+++ b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
@@ -17,12 +17,11 @@ namespace osu.Game.Screens.Play
             return true;
         }
 
-        public bool OnReleased(GlobalAction action)
+        public void OnReleased(GlobalAction action)
         {
-            if (action != GlobalAction.QuickRetry) return false;
+            if (action != GlobalAction.QuickRetry) return;
 
             AbortConfirm();
-            return true;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/KeyCounterAction.cs b/osu.Game/Screens/Play/KeyCounterAction.cs
index 33d675358c..00eddcc776 100644
--- a/osu.Game/Screens/Play/KeyCounterAction.cs
+++ b/osu.Game/Screens/Play/KeyCounterAction.cs
@@ -27,15 +27,14 @@ namespace osu.Game.Screens.Play
             return false;
         }
 
-        public bool OnReleased(T action, bool forwards)
+        public void OnReleased(T action, bool forwards)
         {
             if (!EqualityComparer<T>.Default.Equals(action, Action))
-                return false;
+                return;
 
             IsLit = false;
             if (!forwards)
                 Decrement();
-            return false;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 772d326c7f..d06e72bfa0 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -143,7 +143,9 @@ namespace osu.Game.Screens.Play
             return false;
         }
 
-        public bool OnReleased(GlobalAction action) => false;
+        public void OnReleased(GlobalAction action)
+        {
+        }
 
         private class FadeContainer : Container, IStateful<Visibility>
         {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 8f7ad2022d..bf57def700 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -681,7 +681,9 @@ namespace osu.Game.Screens.Select
             return false;
         }
 
-        public bool OnReleased(GlobalAction action) => action == GlobalAction.Select;
+        public void OnReleased(GlobalAction action)
+        {
+        }
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {

From bf2b71f7dd9cf1967d71c94872af1892c732ec14 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 22 Jan 2020 09:36:16 +0300
Subject: [PATCH 00220/10326] Cleanup OsuTabControl.AccentColour

---
 .../Graphics/UserInterface/OsuTabControl.cs   | 35 +++++++++++--------
 osu.Game/Overlays/OverlayTabControl.cs        | 31 +++++-----------
 2 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index ca18ab83a0..c0129c921e 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -17,12 +17,19 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
-using osu.Framework.Extensions.IEnumerableExtensions;
 
 namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
+        private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
+
+        public Color4 AccentColour
+        {
+            get => accentColour.Value;
+            set => accentColour.Value = value;
+        }
+
         private readonly Box strip;
 
         protected override Dropdown<T> CreateDropdown() => new OsuTabDropdown();
@@ -60,24 +67,22 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            if (accentColour == default)
+            if (accentColour.Value == default)
                 AccentColour = colours.Blue;
         }
 
-        private Color4 accentColour;
-
-        public Color4 AccentColour
+        protected override void LoadComplete()
         {
-            get => accentColour;
-            set
-            {
-                accentColour = value;
-                if (Dropdown is IHasAccentColour dropdown)
-                    dropdown.AccentColour = value;
-                foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
-                    i.AccentColour = value;
-                InternalChildren.OfType<IHasAccentColour>().ForEach(c => c.AccentColour = value);
-            }
+            base.LoadComplete();
+            accentColour.BindValueChanged(OnAccentColourChanged, true);
+        }
+
+        protected virtual void OnAccentColourChanged(ValueChangedEvent<Color4> colour)
+        {
+            if (Dropdown is IHasAccentColour dropdown)
+                dropdown.AccentColour = colour.NewValue;
+            foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
+                i.AccentColour = colour.NewValue;
         }
 
         public Color4 StripColour
diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index 839136d37c..72977d6bff 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.cs
@@ -1,8 +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.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays
 {
     public abstract class OverlayTabControl<T> : OsuTabControl<T>
     {
-        private readonly TabControlBar bar;
+        private readonly Box bar;
 
         protected float BarHeight
         {
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays
             TabContainer.Masking = false;
             TabContainer.Spacing = new Vector2(15, 0);
 
-            AddInternal(bar = new TabControlBar
+            AddInternal(bar = new Box
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 2,
@@ -37,6 +37,12 @@ namespace osu.Game.Overlays
             });
         }
 
+        protected override void OnAccentColourChanged(ValueChangedEvent<Color4> colour)
+        {
+            base.OnAccentColourChanged(colour);
+            bar.Colour = colour.NewValue;
+        }
+
         protected override Dropdown<T> CreateDropdown() => null;
 
         protected override TabItem<T> CreateTabItem(T value) => new OverlayTabItem(value);
@@ -138,24 +144,5 @@ namespace osu.Game.Overlays
                 Text.FadeColour(AccentColour, 120, Easing.InQuad);
             }
         }
-
-        private class TabControlBar : CompositeDrawable, IHasAccentColour
-        {
-            public Color4 AccentColour
-            {
-                get => background.Colour;
-                set => background.Colour = value;
-            }
-
-            private readonly Box background;
-
-            public TabControlBar()
-            {
-                AddInternal(background = new Box
-                {
-                    RelativeSizeAxes = Axes.Both
-                });
-            }
-        }
     }
 }

From 03b61e4a5a5e3338400882776b99be6a221e6679 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jan 2020 20:00:36 +0900
Subject: [PATCH 00221/10326] Throw exception rather than returning nulls

---
 osu.Game/Online/API/APIMod.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 30336d16a3..46a8db31b7 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Humanizer;
@@ -38,7 +39,7 @@ namespace osu.Game.Online.API
             Mod resultMod = ruleset.GetAllMods().FirstOrDefault(m => m.Acronym == Acronym);
 
             if (resultMod == null)
-                return null; // Todo: Maybe throw exception?
+                throw new InvalidOperationException($"There is no mod in the ruleset ({ruleset.ShortName}) matching the acronym {Acronym}.");
 
             foreach (var (_, property) in resultMod.GetSettingsSourceProperties())
             {

From e2c4cffc9a23860bbebfd13405ffc33fc52e986c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 22:57:09 +0900
Subject: [PATCH 00222/10326] 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 9c0da1e9fd..2ccba60424 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.118.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.122.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f41c5fee7f..9b431e6425 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.118.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.122.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 bb4a59a601..4dc7403553 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.118.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.122.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.118.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.122.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 8ea354571cd48f010c6d0ca68f99fd5f2128e35e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 23:04:37 +0900
Subject: [PATCH 00223/10326] Update naming

---
 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 0819642d2d..07c9d37a86 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -330,7 +330,7 @@ namespace osu.Game
 
         private class OsuUserInputManager : UserInputManager
         {
-            protected override MouseButtonEventManager CreateButtonManagerFor(MouseButton button)
+            protected override MouseButtonEventManager CreateButtonEventManagerFor(MouseButton button)
             {
                 switch (button)
                 {
@@ -338,7 +338,7 @@ namespace osu.Game
                         return new RightMouseManager(button);
                 }
 
-                return base.CreateButtonManagerFor(button);
+                return base.CreateButtonEventManagerFor(button);
             }
 
             private class RightMouseManager : MouseButtonEventManager

From c0935b9b86e9977c100090944c1d5528449eb379 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 23:13:21 +0900
Subject: [PATCH 00224/10326] Update naming in tournament

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

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 17d7dc0245..1c94856a4e 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -303,7 +303,7 @@ namespace osu.Game.Tournament
 
         private class TournamentInputManager : UserInputManager
         {
-            protected override MouseButtonEventManager CreateButtonManagerFor(MouseButton button)
+            protected override MouseButtonEventManager CreateButtonEventManagerFor(MouseButton button)
             {
                 switch (button)
                 {
@@ -311,7 +311,7 @@ namespace osu.Game.Tournament
                         return new RightMouseManager(button);
                 }
 
-                return base.CreateButtonManagerFor(button);
+                return base.CreateButtonEventManagerFor(button);
             }
 
             private class RightMouseManager : MouseButtonEventManager

From a6775d1bd3a0432e5e2b3b907d3bb14851fc26fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 14:58:15 +0900
Subject: [PATCH 00225/10326] Implement custom drag box and allow drag seeking
 once again

---
 .../Edit/Compose/Components/DragBox.cs        | 36 ++++++++++---------
 .../Timeline/TimelineHitObjectDisplay.cs      | 35 ++++++++++++++++--
 2 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
index f522ca356f..adbab1767b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
@@ -17,9 +17,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public class DragBox : CompositeDrawable
     {
-        private readonly Action<RectangleF> performSelection;
+        protected readonly Action<RectangleF> PerformSelection;
 
-        private Drawable box;
+        protected Drawable Box;
 
         /// <summary>
         /// Creates a new <see cref="DragBox"/>.
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="performSelection">A delegate that performs drag selection.</param>
         public DragBox(Action<RectangleF> performSelection)
         {
-            this.performSelection = performSelection;
+            PerformSelection = performSelection;
 
             RelativeSizeAxes = Axes.Both;
             AlwaysPresent = true;
@@ -37,19 +37,21 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = box = new Container
-            {
-                Masking = true,
-                BorderColour = Color4.White,
-                BorderThickness = SelectionHandler.BORDER_RADIUS,
-                Child = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0.1f
-                }
-            };
+            InternalChild = Box = CreateBox();
         }
 
+        protected virtual Drawable CreateBox() => new Container
+        {
+            Masking = true,
+            BorderColour = Color4.White,
+            BorderThickness = SelectionHandler.BORDER_RADIUS,
+            Child = new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Alpha = 0.1f
+            }
+        };
+
         /// <summary>
         /// Handle a forwarded mouse event.
         /// </summary>
@@ -68,10 +70,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             var topLeft = ToLocalSpace(dragRectangle.TopLeft);
             var bottomRight = ToLocalSpace(dragRectangle.BottomRight);
 
-            box.Position = topLeft;
-            box.Size = bottomRight - topLeft;
+            Box.Position = topLeft;
+            Box.Size = bottomRight - topLeft;
 
-            performSelection?.Invoke(dragRectangle);
+            PerformSelection?.Invoke(dragRectangle);
             return true;
         }
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index 7932813bbc..e68b088d78 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -21,6 +21,17 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         public TimelineHitObjectDisplay(EditorBeatmap beatmap)
         {
             RelativeSizeAxes = Axes.Both;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Height = 0.4f;
+
+            AddInternal(new Box
+            {
+                Colour = Color4.Black,
+                RelativeSizeAxes = Axes.Both,
+                Alpha = 0.1f,
+            });
         }
 
         protected override SelectionBlueprintContainer CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
@@ -49,14 +60,32 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             return new TimelineHitObjectRepresentation(hitObject);
         }
 
-        internal class NoDragDragBox : DragBox
+        protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new CustomDragBox(performSelect);
+
+        internal class CustomDragBox : DragBox
         {
-            public NoDragDragBox(Action<RectangleF> performSelect)
+            public CustomDragBox(Action<RectangleF> performSelect)
                 : base(performSelect)
             {
             }
 
-            public override bool UpdateDrag(MouseButtonEvent e) => false;
+            protected override Drawable CreateBox() => new Box
+            {
+                RelativeSizeAxes = Axes.Y,
+                Alpha = 0.3f
+            };
+
+            public override bool UpdateDrag(MouseButtonEvent e)
+            {
+                float selection1 = e.MouseDownPosition.X;
+                float selection2 = e.MousePosition.X;
+
+                Box.X = Math.Min(selection1, selection2);
+                Box.Width = Math.Abs(selection1 - selection2);
+
+                PerformSelection?.Invoke(Box.ScreenSpaceDrawQuad.AABBFloat);
+                return true;
+            }
         }
 
         private class TimelineHitObjectRepresentation : SelectionBlueprint

From 482409e776cd9def6f45af0106b1fd5367aff221 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 15:31:58 +0900
Subject: [PATCH 00226/10326] Colour extension bars of long objects

---
 .../Timeline/TimelineHitObjectDisplay.cs      | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index e68b088d78..b09c1a5597 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -92,6 +92,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             private readonly Circle circle;
 
+            private Container extensionBar;
+
             public const float THICKNESS = 3;
 
             private const float circle_size = 16;
@@ -109,11 +111,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 X = (float)hitObject.StartTime;
 
                 RelativePositionAxes = Axes.X;
+
                 RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
 
                 if (hitObject is IHasEndTime)
                 {
-                    AddInternal(new Container
+                    AddInternal(extensionBar = new Container
                     {
                         CornerRadius = 2,
                         Masking = true,
@@ -143,9 +147,32 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 });
             }
 
-            protected override void OnSelected() => circle.BorderColour = Color4.Orange;
+            protected override void OnSelected()
+            {
+                circle.BorderColour = Color4.Orange;
+                if (extensionBar != null)
+                    extensionBar.Colour = Color4.Orange;
+            }
 
-            protected override void OnDeselected() => circle.BorderColour = Color4.Black;
+            protected override void OnDeselected()
+            {
+                circle.BorderColour = Color4.Black;
+                if (extensionBar != null)
+                    extensionBar.Colour = 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));
+                }
+            }
         }
     }
 }

From c4395b1cea45b242e2f19816a92b9aa4df2c727a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 15:42:49 +0900
Subject: [PATCH 00227/10326] Clean up nested class implementations

---
 .../Timeline/TimelineHitObjectDisplay.cs      | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index b09c1a5597..397c74b193 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -36,33 +36,32 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override SelectionBlueprintContainer CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
 
-        protected class TimelineSelectionBlueprintContainer : SelectionBlueprintContainer
-        {
-            protected override Container<SelectionBlueprint> Content { get; }
-
-            public TimelineSelectionBlueprintContainer()
-            {
-                AddInternal(new TimelinePart<SelectionBlueprint>(Content = new Container<SelectionBlueprint> { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
-            }
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
             DragBox.Alpha = 0;
         }
 
-        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
+        protected override bool OnDrag(DragEvent e)
         {
-            //var yOffset = content.Count(d => d.X == h.StartTime);
-            //var yOffset = 0;
-
-            return new TimelineHitObjectRepresentation(hitObject);
+            lastDragEvent = e;
+            return base.OnDrag(e);
         }
 
+        protected override void Update()
+        {
+            if (IsDragged && lastDragEvent != null)
+                // trigger every frame so drags continue to update selection while playback is scrolling the timeline.
+                DragBox.UpdateDrag(lastDragEvent);
+
+            base.Update();
+        }
+
+        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => new TimelineHitObjectRepresentation(hitObject);
+
         protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new CustomDragBox(performSelect);
 
-        internal class CustomDragBox : DragBox
+        private class CustomDragBox : DragBox
         {
             public CustomDragBox(Action<RectangleF> performSelect)
                 : base(performSelect)
@@ -88,11 +87,21 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
+        protected class TimelineSelectionBlueprintContainer : SelectionBlueprintContainer
+        {
+            protected override Container<SelectionBlueprint> Content { get; }
+
+            public TimelineSelectionBlueprintContainer()
+            {
+                AddInternal(new TimelinePart<SelectionBlueprint>(Content = new Container<SelectionBlueprint> { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
+            }
+        }
+
         private class TimelineHitObjectRepresentation : SelectionBlueprint
         {
             private readonly Circle circle;
 
-            private Container extensionBar;
+            private readonly Container extensionBar;
 
             public const float THICKNESS = 3;
 

From a8ec4907c410dedb4d8c71bc5348db3c096d73ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 15:58:03 +0900
Subject: [PATCH 00228/10326] Fix selections while scrolling timeline

---
 .../Components/Timeline/TimelineHitObjectDisplay.cs  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index 397c74b193..d50616a66f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -63,6 +63,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private class CustomDragBox : DragBox
         {
+            private Vector2 lastMouseDown;
+            private float localMouseDown;
+
             public CustomDragBox(Action<RectangleF> performSelect)
                 : base(performSelect)
             {
@@ -76,7 +79,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             public override bool UpdateDrag(MouseButtonEvent e)
             {
-                float selection1 = e.MouseDownPosition.X;
+                // store the original position of the mouse down, as we may be scrolled during selection.
+                if (lastMouseDown != e.ScreenSpaceMouseDownPosition)
+                {
+                    lastMouseDown = e.ScreenSpaceMouseDownPosition;
+                    localMouseDown = e.MouseDownPosition.X;
+                }
+
+                float selection1 = localMouseDown;
                 float selection2 = e.MousePosition.X;
 
                 Box.X = Math.Min(selection1, selection2);

From 89d90fdfa054620811404ab60c694d6cb12098c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 16:33:23 +0900
Subject: [PATCH 00229/10326] Fix drag not updating until mouse is moved while
 scrolling timeline

---
 .../Components/Timeline/TimelineHitObjectDisplay.cs       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index d50616a66f..f812095a35 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     internal class TimelineHitObjectDisplay : BlueprintContainer
     {
+        private DragEvent lastDragEvent;
+
         public TimelineHitObjectDisplay(EditorBeatmap beatmap)
         {
             RelativeSizeAxes = Axes.Both;
@@ -50,9 +52,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override void Update()
         {
-            if (IsDragged && lastDragEvent != null)
-                // trigger every frame so drags continue to update selection while playback is scrolling the timeline.
-                DragBox.UpdateDrag(lastDragEvent);
+            // trigger every frame so drags continue to update selection while playback is scrolling the timeline.
+            if (IsDragged)
+                OnDrag(lastDragEvent);
 
             base.Update();
         }

From 63cef8b8b7189bb4c9215c26e90d532ffd5d83ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 16:58:33 +0900
Subject: [PATCH 00230/10326] Rename nested classes to be more appropriate

---
 .../Components/Timeline/TimelineHitObjectDisplay.cs  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index f812095a35..10b470e4b7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -59,16 +59,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             base.Update();
         }
 
-        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => new TimelineHitObjectRepresentation(hitObject);
+        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => new TimelineHitObjectBlueprint(hitObject);
 
-        protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new CustomDragBox(performSelect);
+        protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect);
 
-        private class CustomDragBox : DragBox
+        private class TimelineDragBox : DragBox
         {
             private Vector2 lastMouseDown;
             private float localMouseDown;
 
-            public CustomDragBox(Action<RectangleF> performSelect)
+            public TimelineDragBox(Action<RectangleF> performSelect)
                 : base(performSelect)
             {
             }
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        private class TimelineHitObjectRepresentation : SelectionBlueprint
+        private class TimelineHitObjectBlueprint : SelectionBlueprint
         {
             private readonly Circle circle;
 
@@ -121,7 +121,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) || circle.ReceivePositionalInputAt(screenSpacePos);
 
-            public TimelineHitObjectRepresentation(HitObject hitObject)
+            public TimelineHitObjectBlueprint(HitObject hitObject)
                 : base(hitObject)
             {
                 Anchor = Anchor.CentreLeft;

From f0d810fe2098a94a15ad34e439a98ca36e42b59b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 17:11:37 +0900
Subject: [PATCH 00231/10326] Follow start time and duration changes

---
 .../Timeline/TimelineHitObjectDisplay.cs       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index 10b470e4b7..a11958c8c9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -115,6 +117,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             private readonly Container extensionBar;
 
+            [UsedImplicitly]
+            private readonly Bindable<double> startTime;
+
             public const float THICKNESS = 3;
 
             private const float circle_size = 16;
@@ -127,9 +132,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 Anchor = Anchor.CentreLeft;
                 Origin = Anchor.CentreLeft;
 
-                Width = (float)(hitObject.GetEndTime() - hitObject.StartTime);
-
-                X = (float)hitObject.StartTime;
+                startTime = hitObject.StartTimeBindable.GetBoundCopy();
+                startTime.BindValueChanged(time => X = (float)time.NewValue, true);
 
                 RelativePositionAxes = Axes.X;
 
@@ -168,6 +172,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 });
             }
 
+            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;

From cb6e7425aebc9789ac80af0a21f29fd25bad2205 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 17:54:11 +0900
Subject: [PATCH 00232/10326] Make dragbox stateful to fix blueprint movement

---
 .../Compose/Components/BlueprintContainer.cs  | 29 +++++++++----------
 .../Edit/Compose/Components/DragBox.cs        | 26 +++++++++++++++--
 .../Timeline/TimelineHitObjectDisplay.cs      |  8 ++++-
 3 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index c5414542e4..583627f78e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -152,15 +152,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (e.Button == MouseButton.Right)
                 return false;
 
-            if (!beginSelectionMovement())
-            {
-                if (!DragBox.UpdateDrag(e))
-                    return false;
+            if (beginSelectionMovement())
+                return true;
 
-                DragBox.FadeIn(250, Easing.OutQuint);
+            if (DragBox.HandleDrag(e))
+            {
+                DragBox.Show();
+                return true;
             }
 
-            return true;
+            return false;
         }
 
         protected override bool OnDrag(DragEvent e)
@@ -168,13 +169,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (e.Button == MouseButton.Right)
                 return false;
 
-            if (!moveCurrentSelection(e))
-            {
-                if (!DragBox.UpdateDrag(e))
-                    return false;
-            }
+            if (DragBox.State == Visibility.Visible)
+                return DragBox.HandleDrag(e);
 
-            return true;
+            return moveCurrentSelection(e);
         }
 
         protected override bool OnDragEnd(DragEndEvent e)
@@ -182,13 +180,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (e.Button == MouseButton.Right)
                 return false;
 
-            if (!finishSelectionMovement())
+            if (DragBox.State == Visibility.Visible)
             {
-                DragBox.FadeOut(250, Easing.OutQuint);
+                DragBox.Hide();
                 selectionHandler.UpdateVisibility();
+                return true;
             }
 
-            return true;
+            return finishSelectionMovement();
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
diff --git a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
index adbab1767b..c5f1bd1575 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -15,7 +16,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// A box that displays the drag selection and provides selection events for users to handle.
     /// </summary>
-    public class DragBox : CompositeDrawable
+    public class DragBox : CompositeDrawable, IStateful<Visibility>
     {
         protected readonly Action<RectangleF> PerformSelection;
 
@@ -57,7 +58,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         /// <param name="e">The mouse event.</param>
         /// <returns>Whether the event should be handled and blocking.</returns>
-        public virtual bool UpdateDrag(MouseButtonEvent e)
+        public virtual bool HandleDrag(MouseButtonEvent e)
         {
             var dragPosition = e.ScreenSpaceMousePosition;
             var dragStartPosition = e.ScreenSpaceMouseDownPosition;
@@ -76,5 +77,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
             PerformSelection?.Invoke(dragRectangle);
             return true;
         }
+
+        private Visibility state;
+
+        public Visibility State
+        {
+            get => state;
+            set
+            {
+                if (value == state) return;
+
+                state = value;
+                this.FadeTo(state == Visibility.Hidden ? 0 : 1, 250, Easing.OutQuint);
+                StateChanged?.Invoke(state);
+            }
+        }
+
+        public override void Hide() => State = Visibility.Hidden;
+
+        public override void Show() => State = Visibility.Visible;
+
+        public event Action<Visibility> StateChanged;
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index a11958c8c9..7101fac310 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -52,6 +52,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             return base.OnDrag(e);
         }
 
+        protected override bool OnDragEnd(DragEndEvent e)
+        {
+            lastDragEvent = null;
+            return base.OnDragEnd(e);
+        }
+
         protected override void Update()
         {
             // trigger every frame so drags continue to update selection while playback is scrolling the timeline.
@@ -81,7 +87,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 Alpha = 0.3f
             };
 
-            public override bool UpdateDrag(MouseButtonEvent e)
+            public override bool HandleDrag(MouseButtonEvent e)
             {
                 // store the original position of the mouse down, as we may be scrolled during selection.
                 if (lastMouseDown != e.ScreenSpaceMouseDownPosition)

From 53bdf72592ba86418da460560515553e63401437 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 21:37:06 +0900
Subject: [PATCH 00233/10326] Allow basic timeline selection temporal movement

---
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 .../Components/Timeline/TimelineHitObjectDisplay.cs      | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index c866fb38c8..21eb4b08b0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
-        public (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time) => (position, time);
+        public (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time) => (position, (position.X / Content.DrawWidth) * track.Length);
 
         public float GetBeatSnapDistanceAt(double referenceTime)
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
index 7101fac310..5e6403bb05 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
@@ -67,6 +67,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             base.Update();
         }
 
+        protected override SelectionHandler CreateSelectionHandler() => new TimelineSelectionHandler();
+
+        internal class TimelineSelectionHandler : SelectionHandler
+        {
+            public override bool HandleMovement(MoveSelectionEvent moveEvent) => true;
+        }
+
         protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => new TimelineHitObjectBlueprint(hitObject);
 
         protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect);
@@ -212,6 +219,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         circleQuad.BottomLeft, Vector2.ComponentMax(actualQuad.BottomRight, circleQuad.BottomRight));
                 }
             }
+
+            public override Vector2 SelectionPoint => ScreenSpaceDrawQuad.TopLeft;
         }
     }
 }

From aa1a226ab7522b3207d3c3a949fbec1a905be345 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 21:37:57 +0900
Subject: [PATCH 00234/10326] Remove unused ScreenSpaceStartPosition field

---
 .../Edit/Compose/Components/BlueprintContainer.cs     |  2 +-
 .../Edit/Compose/Components/MoveSelectionEvent.cs     | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 583627f78e..58cd4d0974 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -391,7 +391,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             (Vector2 snappedPosition, double snappedTime) = snapProvider.GetSnappedPosition(ToLocalSpace(movePosition), draggedObject.StartTime);
 
             // Move the hitobjects
-            if (!selectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, startPosition, ToScreenSpace(snappedPosition))))
+            if (!selectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, ToScreenSpace(snappedPosition))))
                 return true;
 
             // Apply the start time at the newly snapped-to position
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index 48cb702c78..0792d0f80e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -16,11 +16,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         public readonly SelectionBlueprint Blueprint;
 
-        /// <summary>
-        /// The starting screen-space position of the hitobject.
-        /// </summary>
-        public readonly Vector2 ScreenSpaceStartPosition;
-
         /// <summary>
         /// The expected screen-space position of the hitobject at the current cursor position.
         /// </summary>
@@ -29,15 +24,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// The distance between <see cref="ScreenSpacePosition"/> and the hitobject's current position, in the coordinate-space of the hitobject's parent.
         /// </summary>
-        /// <remarks>
-        /// This does not use <see cref="ScreenSpaceStartPosition"/> and does not represent the cumulative movement distance.
-        /// </remarks>
         public readonly Vector2 InstantDelta;
 
-        public MoveSelectionEvent(SelectionBlueprint blueprint, Vector2 screenSpaceStartPosition, Vector2 screenSpacePosition)
+        public MoveSelectionEvent(SelectionBlueprint blueprint, Vector2 screenSpacePosition)
         {
             Blueprint = blueprint;
-            ScreenSpaceStartPosition = screenSpaceStartPosition;
             ScreenSpacePosition = screenSpacePosition;
 
             InstantDelta = Blueprint.GetInstantDelta(ScreenSpacePosition);

From c76f76e5aa441c526278345a706f34487e6c1eaa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 21:43:02 +0900
Subject: [PATCH 00235/10326] Fix being able to drag out of the blueprint
 intending to be moved

---
 .../Compose/Components/BlueprintContainer.cs  | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 58cd4d0974..ef4a06879e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -109,6 +109,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override bool OnMouseDown(MouseDownEvent e)
         {
             beginClickSelection(e);
+
+            prepareSelectionMovement();
+
             return e.Button == MouseButton.Left;
         }
 
@@ -144,6 +147,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             // Special case for when a drag happened instead of a click
             Schedule(() => endClickSelection());
+
+            finishSelectionMovement();
+
             return e.Button == MouseButton.Left;
         }
 
@@ -152,7 +158,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (e.Button == MouseButton.Right)
                 return false;
 
-            if (beginSelectionMovement())
+            if (movementBlueprint != null)
                 return true;
 
             if (DragBox.HandleDrag(e))
@@ -184,10 +190,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 DragBox.Hide();
                 selectionHandler.UpdateVisibility();
-                return true;
             }
 
-            return finishSelectionMovement();
+            return true;
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
@@ -348,14 +353,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #region Selection Movement
 
-        private Vector2? screenSpaceMovementStartPosition;
+        private Vector2? movementBlueprintOriginalPosition;
         private SelectionBlueprint movementBlueprint;
 
         /// <summary>
         /// Attempts to begin the movement of any selected blueprints.
         /// </summary>
         /// <returns>Whether movement began.</returns>
-        private bool beginSelectionMovement()
+        private bool prepareSelectionMovement()
         {
             Debug.Assert(movementBlueprint == null);
 
@@ -366,7 +371,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // Movement is tracked from the blueprint of the earliest hitobject, since it only makes sense to distance snap from that hitobject
             movementBlueprint = selectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime).First();
-            screenSpaceMovementStartPosition = movementBlueprint.SelectionPoint; // todo: unsure if correct
+            movementBlueprintOriginalPosition = movementBlueprint.SelectionPoint; // todo: unsure if correct
 
             return true;
         }
@@ -381,13 +386,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (movementBlueprint == null)
                 return false;
 
-            Debug.Assert(screenSpaceMovementStartPosition != null);
+            Debug.Assert(movementBlueprintOriginalPosition != null);
 
-            Vector2 startPosition = screenSpaceMovementStartPosition.Value;
             HitObject draggedObject = movementBlueprint.HitObject;
 
             // The final movement position, relative to screenSpaceMovementStartPosition
-            Vector2 movePosition = startPosition + e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
+            Vector2 movePosition = movementBlueprintOriginalPosition.Value + e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
+
             (Vector2 snappedPosition, double snappedTime) = snapProvider.GetSnappedPosition(ToLocalSpace(movePosition), draggedObject.StartTime);
 
             // Move the hitobjects
@@ -411,7 +416,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (movementBlueprint == null)
                 return false;
 
-            screenSpaceMovementStartPosition = null;
+            movementBlueprintOriginalPosition = null;
             movementBlueprint = null;
 
             return true;

From 9d2a46df892587185343b8ebb7723823df750c33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jan 2020 21:46:24 +0900
Subject: [PATCH 00236/10326] Add beat snapping to timeline movement

---
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 21eb4b08b0..98fb754931 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -173,7 +173,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
-        public (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time) => (position, (position.X / Content.DrawWidth) * track.Length);
+        public (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time)
+        {
+            var targetTime = (position.X / Content.DrawWidth) * track.Length;
+            return (position, beatSnap(targetTime, targetTime));
+        }
 
         public float GetBeatSnapDistanceAt(double referenceTime)
         {

From 477e1b7d278a9b1b490a43d4291c5c0af00b05f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jan 2020 12:17:46 +0900
Subject: [PATCH 00237/10326] Rename TimelineHitObjectDisplay to
 TimelineBlueprintContainer

---
 .../Visual/Editor/TestSceneEditorComposeTimeline.cs           | 4 ++--
 ...elineHitObjectDisplay.cs => TimelineBlueprintContainer.cs} | 4 ++--
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game/Screens/Edit/Compose/Components/Timeline/{TimelineHitObjectDisplay.cs => TimelineBlueprintContainer.cs} (98%)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
index e9372bd134..78cdeb3ac8 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Editor
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(TimelineArea),
-            typeof(TimelineHitObjectDisplay),
+            typeof(TimelineBlueprintContainer),
             typeof(Timeline),
             typeof(TimelineButton),
             typeof(CentreMarker)
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Editor
                 },
                 new TimelineArea
                 {
-                    Child = new TimelineHitObjectDisplay(editorBeatmap),
+                    Child = new TimelineBlueprintContainer(editorBeatmap),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
similarity index 98%
rename from osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
rename to osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 5e6403bb05..c5603c0f67 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -18,11 +18,11 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    internal class TimelineHitObjectDisplay : BlueprintContainer
+    internal class TimelineBlueprintContainer : BlueprintContainer
     {
         private DragEvent lastDragEvent;
 
-        public TimelineHitObjectDisplay(EditorBeatmap beatmap)
+        public TimelineBlueprintContainer(EditorBeatmap beatmap)
         {
             RelativeSizeAxes = Axes.Both;
             Anchor = Anchor.Centre;
diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 1a6aae294a..20e1ef95d3 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -32,6 +32,6 @@ namespace osu.Game.Screens.Edit.Compose
             return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(composer));
         }
 
-        protected override Drawable CreateTimelineContent() => composer == null ? base.CreateTimelineContent() : new TimelineHitObjectDisplay(EditorBeatmap);
+        protected override Drawable CreateTimelineContent() => composer == null ? base.CreateTimelineContent() : new TimelineBlueprintContainer(EditorBeatmap);
     }
 }

From cb09c2e1449ee26285d14a27a9f40c3fb0f937d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jan 2020 12:29:32 +0900
Subject: [PATCH 00238/10326] Add support for dragging outside visible extents

---
 .../Edit/Compose/Components/Timeline/Timeline.cs |  1 +
 .../Timeline/TimelineBlueprintContainer.cs       | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 98fb754931..804c2f1e65 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -18,6 +18,7 @@ using osuTK;
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     [Cached(typeof(IDistanceSnapProvider))]
+    [Cached]
     public class Timeline : ZoomableScrollContainer, IDistanceSnapProvider
     {
         public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index c5603c0f67..16e1793c8c 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 JetBrains.Annotations;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -20,6 +21,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     internal class TimelineBlueprintContainer : BlueprintContainer
     {
+        [Resolved(CanBeNull = true)]
+        private Timeline timeline { get; set; }
+
         private DragEvent lastDragEvent;
 
         public TimelineBlueprintContainer(EditorBeatmap beatmap)
@@ -48,6 +52,18 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool 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));
+            }
+
             lastDragEvent = e;
             return base.OnDrag(e);
         }

From 56c044c44ac6cc6ea460fef8883d99fb9a88aadc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jan 2020 13:33:55 +0900
Subject: [PATCH 00239/10326] Move beat snapping to its own interface

---
 ...tSceneHitObjectComposerDistanceSnapping.cs |  9 +++-
 .../Visual/Editor/TestSceneComposeScreen.cs   |  2 +
 .../Editor/TestSceneEditorComposeTimeline.cs  |  4 +-
 .../Editor/TestSceneHitObjectComposer.cs      |  1 +
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 26 +++--------
 osu.Game/Rulesets/Edit/IBeatSnapProvider.cs   | 30 ++++++++++++
 .../Compose/Components/Timeline/Timeline.cs   | 46 ++++---------------
 osu.Game/Screens/Edit/Editor.cs               | 15 +++++-
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 20 +++++++-
 9 files changed, 90 insertions(+), 63 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/IBeatSnapProvider.cs

diff --git a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
index 2d336bd19c..e825df5a3f 100644
--- a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Edit;
@@ -19,7 +20,13 @@ namespace osu.Game.Tests.Editor
         private TestHitObjectComposer composer;
 
         [Cached(typeof(EditorBeatmap))]
-        private readonly EditorBeatmap editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+        [Cached(typeof(IBeatSnapProvider))]
+        private readonly EditorBeatmap editorBeatmap;
+
+        public TestSceneHitObjectComposerDistanceSnapping()
+        {
+            editorBeatmap = new EditorBeatmap(new OsuBeatmap(), BeatDivisor);
+        }
 
         [SetUp]
         public void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs b/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
index 3562689482..a8830824c0 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
@@ -14,6 +15,7 @@ namespace osu.Game.Tests.Visual.Editor
     public class TestSceneComposeScreen : EditorClockTestScene
     {
         [Cached(typeof(EditorBeatmap))]
+        [Cached(typeof(IBeatSnapProvider))]
         private readonly EditorBeatmap editorBeatmap =
             new EditorBeatmap(new OsuBeatmap
             {
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
index 78cdeb3ac8..5b0408268f 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 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;
@@ -38,9 +39,10 @@ namespace osu.Game.Tests.Visual.Editor
         {
             Beatmap.Value = new WaveformTestBeatmap(audio);
 
-            var editorBeatmap = new EditorBeatmap((Beatmap<HitObject>)Beatmap.Value.Beatmap);
+            var editorBeatmap = new EditorBeatmap((Beatmap<HitObject>)Beatmap.Value.Beatmap, BeatDivisor);
 
             Dependencies.Cache(editorBeatmap);
+            Dependencies.CacheAs<IBeatSnapProvider>(editorBeatmap);
 
             Children = new Drawable[]
             {
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
index c001c83877..e41c2427fb 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
@@ -66,6 +66,7 @@ namespace osu.Game.Tests.Visual.Editor
             Dependencies.CacheAs<IAdjustableClock>(clock);
             Dependencies.CacheAs<IFrameBasedClock>(clock);
             Dependencies.CacheAs(editorBeatmap);
+            Dependencies.CacheAs<IBeatSnapProvider>(editorBeatmap);
 
             Child = new OsuHitObjectComposer(new OsuRuleset());
         }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 5eba31d149..50042d1e3b 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Edit
         private IAdjustableClock adjustableClock { get; set; }
 
         [Resolved]
-        private BindableBeatDivisor beatDivisor { get; set; }
+        private IBeatSnapProvider beatSnapProvider { get; set; }
 
         private IBeatmapProcessor beatmapProcessor;
 
@@ -259,40 +259,26 @@ namespace osu.Game.Rulesets.Edit
         public override float GetBeatSnapDistanceAt(double referenceTime)
         {
             DifficultyControlPoint difficultyPoint = EditorBeatmap.ControlPointInfo.DifficultyPointAt(referenceTime);
-            return (float)(100 * EditorBeatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier / beatDivisor.Value);
+            return (float)(100 * EditorBeatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier / beatSnapProvider.BeatDivisor);
         }
 
         public override float DurationToDistance(double referenceTime, double duration)
         {
-            double beatLength = EditorBeatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceTime, beatSnapProvider.BeatDivisor);
             return (float)(duration / beatLength * GetBeatSnapDistanceAt(referenceTime));
         }
 
         public override double DistanceToDuration(double referenceTime, float distance)
         {
-            double beatLength = EditorBeatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceTime, beatSnapProvider.BeatDivisor);
             return distance / GetBeatSnapDistanceAt(referenceTime) * beatLength;
         }
 
         public override double GetSnappedDurationFromDistance(double referenceTime, float distance)
-            => beatSnap(referenceTime, DistanceToDuration(referenceTime, distance));
+            => beatSnapProvider.SnapTime(referenceTime, DistanceToDuration(referenceTime, distance), beatSnapProvider.BeatDivisor);
 
         public override float GetSnappedDistanceFromDistance(double referenceTime, float distance)
-            => DurationToDistance(referenceTime, beatSnap(referenceTime, DistanceToDuration(referenceTime, distance)));
-
-        /// <summary>
-        /// Snaps a duration to the closest beat of a timing point applicable at the reference time.
-        /// </summary>
-        /// <param name="referenceTime">The time of the timing point which <paramref name="duration"/> resides in.</param>
-        /// <param name="duration">The duration to snap.</param>
-        /// <returns>A value that represents <paramref name="duration"/> snapped to the closest beat of the timing point.</returns>
-        private double beatSnap(double referenceTime, double duration)
-        {
-            double beatLength = EditorBeatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
-
-            // A 1ms offset prevents rounding errors due to minute variations in duration
-            return (int)((duration + 1) / beatLength) * beatLength;
-        }
+            => DurationToDistance(referenceTime, beatSnapProvider.SnapTime(referenceTime, DistanceToDuration(referenceTime, distance), beatSnapProvider.BeatDivisor));
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs b/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs
new file mode 100644
index 0000000000..ed6e08d054
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/IBeatSnapProvider.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.
+
+namespace osu.Game.Rulesets.Edit
+{
+    public interface IBeatSnapProvider
+    {
+        /// <summary>
+        /// Snaps a duration to the closest beat of a timing point applicable at the reference time.
+        /// </summary>
+        /// <param name="referenceTime">The time of the timing point which <paramref name="duration"/> resides in.</param>
+        /// <param name="duration">The duration to snap.</param>
+        /// <param name="beatDivisor">The divisor to use for snapping purposes.</param>
+        /// <returns>A value that represents <paramref name="duration"/> snapped to the closest beat of the timing point.</returns>
+        double SnapTime(double referenceTime, double duration, int beatDivisor);
+
+        /// <summary>
+        /// Get the most appropriate beat length at a given time.
+        /// </summary>
+        /// <param name="referenceTime">A reference time used for lookup.</param>
+        /// <param name="beatDivisor">The divisor to use for snapping purposes.</param>
+        /// <returns>The most appropriate beat length.</returns>
+        double GetBeatLengthAtTime(double referenceTime, int beatDivisor);
+
+        /// <summary>
+        /// Returns the current beat divisor.
+        /// </summary>
+        int BeatDivisor { get; }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 804c2f1e65..ec6f0bb923 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
@@ -10,7 +11,6 @@ using osu.Framework.Graphics.Audio;
 using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osuTK;
@@ -169,53 +169,25 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         }
 
         [Resolved]
-        private BindableBeatDivisor beatDivisor { get; set; }
+        private EditorBeatmap beatmap { get; set; }
 
         [Resolved]
-        private EditorBeatmap beatmap { get; set; }
+        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, beatSnap(targetTime, targetTime));
+            return (position, beatSnapProvider.SnapTime(targetTime, targetTime, beatSnapProvider.BeatDivisor));
         }
 
-        public float GetBeatSnapDistanceAt(double referenceTime)
-        {
-            DifficultyControlPoint difficultyPoint = beatmap.ControlPointInfo.DifficultyPointAt(referenceTime);
-            return (float)(100 * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier / beatDivisor.Value);
-        }
+        public float GetBeatSnapDistanceAt(double referenceTime) => throw new NotImplementedException();
 
-        public float DurationToDistance(double referenceTime, double duration)
-        {
-            double beatLength = beatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
-            return (float)(duration / beatLength * GetBeatSnapDistanceAt(referenceTime));
-        }
+        public float DurationToDistance(double referenceTime, double duration) => throw new NotImplementedException();
 
-        public double DistanceToDuration(double referenceTime, float distance)
-        {
-            double beatLength = beatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
-            return distance / GetBeatSnapDistanceAt(referenceTime) * beatLength;
-        }
+        public double DistanceToDuration(double referenceTime, float distance) => throw new NotImplementedException();
 
-        public double GetSnappedDurationFromDistance(double referenceTime, float distance)
-            => beatSnap(referenceTime, DistanceToDuration(referenceTime, distance));
+        public double GetSnappedDurationFromDistance(double referenceTime, float distance) => throw new NotImplementedException();
 
-        public float GetSnappedDistanceFromDistance(double referenceTime, float distance)
-            => DurationToDistance(referenceTime, beatSnap(referenceTime, DistanceToDuration(referenceTime, distance)));
-
-        /// <summary>
-        /// Snaps a duration to the closest beat of a timing point applicable at the reference time.
-        /// </summary>
-        /// <param name="referenceTime">The time of the timing point which <paramref name="duration"/> resides in.</param>
-        /// <param name="duration">The duration to snap.</param>
-        /// <returns>A value that represents <paramref name="duration"/> snapped to the closest beat of the timing point.</returns>
-        private double beatSnap(double referenceTime, double duration)
-        {
-            double beatLength = beatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
-
-            // A 1ms offset prevents rounding errors due to minute variations in duration
-            return (int)((duration + 1) / beatLength) * beatLength;
-        }
+        public float GetSnappedDistanceFromDistance(double referenceTime, float distance) => throw new NotImplementedException();
     }
 }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index e212b429b9..26660c427c 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -26,6 +26,7 @@ using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Edit.Timing;
@@ -34,7 +35,8 @@ using osu.Game.Users;
 
 namespace osu.Game.Screens.Edit
 {
-    public class Editor : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>
+    [Cached(typeof(IBeatSnapProvider))]
+    public class Editor : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>, IBeatSnapProvider
     {
         public override float BackgroundParallaxAmount => 0.1f;
 
@@ -77,11 +79,14 @@ namespace osu.Game.Screens.Edit
             clock.ChangeSource(sourceClock);
 
             playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
-            editorBeatmap = new EditorBeatmap(playableBeatmap);
+            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);
+
             dependencies.CacheAs(editorBeatmap);
 
             EditorMenuBar menuBar;
@@ -345,5 +350,11 @@ namespace osu.Game.Screens.Edit
             saveBeatmap();
             beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
         }
+
+        public double SnapTime(double referenceTime, double duration, int beatDivisor) => editorBeatmap.SnapTime(referenceTime, duration, beatDivisor);
+
+        public double GetBeatLengthAtTime(double referenceTime, int beatDivisor) => editorBeatmap.GetBeatLengthAtTime(referenceTime, beatDivisor);
+
+        public int BeatDivisor => beatDivisor.Value;
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 2ff7563a88..b7dd94b6c5 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -8,11 +8,12 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Screens.Edit
 {
-    public class EditorBeatmap : IBeatmap
+    public class EditorBeatmap : IBeatmap, IBeatSnapProvider
     {
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> is added to this <see cref="EditorBeatmap"/>.
@@ -33,11 +34,14 @@ namespace osu.Game.Screens.Edit
 
         public readonly IBeatmap PlayableBeatmap;
 
+        private readonly BindableBeatDivisor beatDivisor;
+
         private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();
 
-        public EditorBeatmap(IBeatmap playableBeatmap)
+        public EditorBeatmap(IBeatmap playableBeatmap, BindableBeatDivisor beatDivisor = null)
         {
             PlayableBeatmap = playableBeatmap;
+            this.beatDivisor = beatDivisor;
 
             foreach (var obj in HitObjects)
                 trackStartTime(obj);
@@ -123,5 +127,17 @@ namespace osu.Game.Screens.Edit
 
             return list.Count - 1;
         }
+
+        public double SnapTime(double referenceTime, double duration, int beatDivisor)
+        {
+            double beatLength = GetBeatLengthAtTime(referenceTime, beatDivisor);
+
+            // A 1ms offset prevents rounding errors due to minute variations in duration
+            return (int)((duration + 1) / beatLength) * beatLength;
+        }
+
+        public double GetBeatLengthAtTime(double referenceTime, int beatDivisor) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
+
+        public int BeatDivisor => beatDivisor?.Value ?? 1;
     }
 }

From 098d643955fc7fd05a35f1106451b1fb12290ea4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jan 2020 14:39:56 +0900
Subject: [PATCH 00240/10326] Move beat snapping to its own interface

---
 ...tSceneHitObjectComposerDistanceSnapping.cs |  9 +++++-
 .../Visual/Editor/TestSceneComposeScreen.cs   |  2 ++
 .../Editor/TestSceneHitObjectComposer.cs      |  1 +
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 26 ++++------------
 osu.Game/Rulesets/Edit/IBeatSnapProvider.cs   | 30 +++++++++++++++++++
 osu.Game/Screens/Edit/Editor.cs               | 15 ++++++++--
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 20 +++++++++++--
 7 files changed, 78 insertions(+), 25 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/IBeatSnapProvider.cs

diff --git a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
index 2d336bd19c..e825df5a3f 100644
--- a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Edit;
@@ -19,7 +20,13 @@ namespace osu.Game.Tests.Editor
         private TestHitObjectComposer composer;
 
         [Cached(typeof(EditorBeatmap))]
-        private readonly EditorBeatmap editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+        [Cached(typeof(IBeatSnapProvider))]
+        private readonly EditorBeatmap editorBeatmap;
+
+        public TestSceneHitObjectComposerDistanceSnapping()
+        {
+            editorBeatmap = new EditorBeatmap(new OsuBeatmap(), BeatDivisor);
+        }
 
         [SetUp]
         public void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs b/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
index 3562689482..a8830824c0 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
@@ -14,6 +15,7 @@ namespace osu.Game.Tests.Visual.Editor
     public class TestSceneComposeScreen : EditorClockTestScene
     {
         [Cached(typeof(EditorBeatmap))]
+        [Cached(typeof(IBeatSnapProvider))]
         private readonly EditorBeatmap editorBeatmap =
             new EditorBeatmap(new OsuBeatmap
             {
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
index c001c83877..e41c2427fb 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
@@ -66,6 +66,7 @@ namespace osu.Game.Tests.Visual.Editor
             Dependencies.CacheAs<IAdjustableClock>(clock);
             Dependencies.CacheAs<IFrameBasedClock>(clock);
             Dependencies.CacheAs(editorBeatmap);
+            Dependencies.CacheAs<IBeatSnapProvider>(editorBeatmap);
 
             Child = new OsuHitObjectComposer(new OsuRuleset());
         }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index bfaa7e8872..e1ce294581 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Edit
         private IAdjustableClock adjustableClock { get; set; }
 
         [Resolved]
-        private BindableBeatDivisor beatDivisor { get; set; }
+        private IBeatSnapProvider beatSnapProvider { get; set; }
 
         private IBeatmapProcessor beatmapProcessor;
 
@@ -257,40 +257,26 @@ namespace osu.Game.Rulesets.Edit
         public override float GetBeatSnapDistanceAt(double referenceTime)
         {
             DifficultyControlPoint difficultyPoint = EditorBeatmap.ControlPointInfo.DifficultyPointAt(referenceTime);
-            return (float)(100 * EditorBeatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier / beatDivisor.Value);
+            return (float)(100 * EditorBeatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier / beatSnapProvider.BeatDivisor);
         }
 
         public override float DurationToDistance(double referenceTime, double duration)
         {
-            double beatLength = EditorBeatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceTime, beatSnapProvider.BeatDivisor);
             return (float)(duration / beatLength * GetBeatSnapDistanceAt(referenceTime));
         }
 
         public override double DistanceToDuration(double referenceTime, float distance)
         {
-            double beatLength = EditorBeatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceTime, beatSnapProvider.BeatDivisor);
             return distance / GetBeatSnapDistanceAt(referenceTime) * beatLength;
         }
 
         public override double GetSnappedDurationFromDistance(double referenceTime, float distance)
-            => beatSnap(referenceTime, DistanceToDuration(referenceTime, distance));
+            => beatSnapProvider.SnapTime(referenceTime, DistanceToDuration(referenceTime, distance), beatSnapProvider.BeatDivisor);
 
         public override float GetSnappedDistanceFromDistance(double referenceTime, float distance)
-            => DurationToDistance(referenceTime, beatSnap(referenceTime, DistanceToDuration(referenceTime, distance)));
-
-        /// <summary>
-        /// Snaps a duration to the closest beat of a timing point applicable at the reference time.
-        /// </summary>
-        /// <param name="referenceTime">The time of the timing point which <paramref name="duration"/> resides in.</param>
-        /// <param name="duration">The duration to snap.</param>
-        /// <returns>A value that represents <paramref name="duration"/> snapped to the closest beat of the timing point.</returns>
-        private double beatSnap(double referenceTime, double duration)
-        {
-            double beatLength = EditorBeatmap.ControlPointInfo.TimingPointAt(referenceTime).BeatLength / beatDivisor.Value;
-
-            // A 1ms offset prevents rounding errors due to minute variations in duration
-            return (int)((duration + 1) / beatLength) * beatLength;
-        }
+            => DurationToDistance(referenceTime, beatSnapProvider.SnapTime(referenceTime, DistanceToDuration(referenceTime, distance), beatSnapProvider.BeatDivisor));
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs b/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs
new file mode 100644
index 0000000000..ed6e08d054
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/IBeatSnapProvider.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.
+
+namespace osu.Game.Rulesets.Edit
+{
+    public interface IBeatSnapProvider
+    {
+        /// <summary>
+        /// Snaps a duration to the closest beat of a timing point applicable at the reference time.
+        /// </summary>
+        /// <param name="referenceTime">The time of the timing point which <paramref name="duration"/> resides in.</param>
+        /// <param name="duration">The duration to snap.</param>
+        /// <param name="beatDivisor">The divisor to use for snapping purposes.</param>
+        /// <returns>A value that represents <paramref name="duration"/> snapped to the closest beat of the timing point.</returns>
+        double SnapTime(double referenceTime, double duration, int beatDivisor);
+
+        /// <summary>
+        /// Get the most appropriate beat length at a given time.
+        /// </summary>
+        /// <param name="referenceTime">A reference time used for lookup.</param>
+        /// <param name="beatDivisor">The divisor to use for snapping purposes.</param>
+        /// <returns>The most appropriate beat length.</returns>
+        double GetBeatLengthAtTime(double referenceTime, int beatDivisor);
+
+        /// <summary>
+        /// Returns the current beat divisor.
+        /// </summary>
+        int BeatDivisor { get; }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index e5cb319fb9..820915e8e3 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -26,6 +26,7 @@ using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Edit.Timing;
@@ -34,7 +35,8 @@ using osu.Game.Users;
 
 namespace osu.Game.Screens.Edit
 {
-    public class Editor : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>
+    [Cached(typeof(IBeatSnapProvider))]
+    public class Editor : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>, IBeatSnapProvider
     {
         public override float BackgroundParallaxAmount => 0.1f;
 
@@ -77,11 +79,14 @@ namespace osu.Game.Screens.Edit
             clock.ChangeSource(sourceClock);
 
             playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
-            editorBeatmap = new EditorBeatmap(playableBeatmap);
+            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);
+
             dependencies.CacheAs(editorBeatmap);
 
             EditorMenuBar menuBar;
@@ -347,5 +352,11 @@ namespace osu.Game.Screens.Edit
             saveBeatmap();
             beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
         }
+
+        public double SnapTime(double referenceTime, double duration, int beatDivisor) => editorBeatmap.SnapTime(referenceTime, duration, beatDivisor);
+
+        public double GetBeatLengthAtTime(double referenceTime, int beatDivisor) => editorBeatmap.GetBeatLengthAtTime(referenceTime, beatDivisor);
+
+        public int BeatDivisor => beatDivisor.Value;
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 6ed74dfdb0..7c037c435f 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -8,11 +8,12 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Screens.Edit
 {
-    public class EditorBeatmap : IBeatmap
+    public class EditorBeatmap : IBeatmap, IBeatSnapProvider
     {
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> is added to this <see cref="EditorBeatmap"/>.
@@ -31,11 +32,14 @@ namespace osu.Game.Screens.Edit
 
         public readonly IBeatmap PlayableBeatmap;
 
+        private readonly BindableBeatDivisor beatDivisor;
+
         private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();
 
-        public EditorBeatmap(IBeatmap playableBeatmap)
+        public EditorBeatmap(IBeatmap playableBeatmap, BindableBeatDivisor beatDivisor = null)
         {
             PlayableBeatmap = playableBeatmap;
+            this.beatDivisor = beatDivisor;
 
             foreach (var obj in HitObjects)
                 trackStartTime(obj);
@@ -121,5 +125,17 @@ namespace osu.Game.Screens.Edit
 
             return list.Count - 1;
         }
+
+        public double SnapTime(double referenceTime, double duration, int beatDivisor)
+        {
+            double beatLength = GetBeatLengthAtTime(referenceTime, beatDivisor);
+
+            // A 1ms offset prevents rounding errors due to minute variations in duration
+            return (int)((duration + 1) / beatLength) * beatLength;
+        }
+
+        public double GetBeatLengthAtTime(double referenceTime, int beatDivisor) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
+
+        public int BeatDivisor => beatDivisor?.Value ?? 1;
     }
 }

From ccf911884be0e8a822b4ed4215413cd103752758 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jan 2020 15:31:56 +0900
Subject: [PATCH 00241/10326] Remove passed in BaetDivisor

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 8 ++++----
 osu.Game/Rulesets/Edit/IBeatSnapProvider.cs | 6 ++----
 osu.Game/Screens/Edit/Editor.cs             | 4 ++--
 osu.Game/Screens/Edit/EditorBeatmap.cs      | 6 +++---
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index e1ce294581..dbd29a167c 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -262,21 +262,21 @@ namespace osu.Game.Rulesets.Edit
 
         public override float DurationToDistance(double referenceTime, double duration)
         {
-            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceTime, beatSnapProvider.BeatDivisor);
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceTime);
             return (float)(duration / beatLength * GetBeatSnapDistanceAt(referenceTime));
         }
 
         public override double DistanceToDuration(double referenceTime, float distance)
         {
-            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceTime, beatSnapProvider.BeatDivisor);
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceTime);
             return distance / GetBeatSnapDistanceAt(referenceTime) * beatLength;
         }
 
         public override double GetSnappedDurationFromDistance(double referenceTime, float distance)
-            => beatSnapProvider.SnapTime(referenceTime, DistanceToDuration(referenceTime, distance), beatSnapProvider.BeatDivisor);
+            => beatSnapProvider.SnapTime(referenceTime, DistanceToDuration(referenceTime, distance));
 
         public override float GetSnappedDistanceFromDistance(double referenceTime, float distance)
-            => DurationToDistance(referenceTime, beatSnapProvider.SnapTime(referenceTime, DistanceToDuration(referenceTime, distance), beatSnapProvider.BeatDivisor));
+            => DurationToDistance(referenceTime, beatSnapProvider.SnapTime(referenceTime, DistanceToDuration(referenceTime, distance)));
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs b/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs
index ed6e08d054..e1daafaebe 100644
--- a/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs
@@ -10,17 +10,15 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         /// <param name="referenceTime">The time of the timing point which <paramref name="duration"/> resides in.</param>
         /// <param name="duration">The duration to snap.</param>
-        /// <param name="beatDivisor">The divisor to use for snapping purposes.</param>
         /// <returns>A value that represents <paramref name="duration"/> snapped to the closest beat of the timing point.</returns>
-        double SnapTime(double referenceTime, double duration, int beatDivisor);
+        double SnapTime(double referenceTime, double duration);
 
         /// <summary>
         /// Get the most appropriate beat length at a given time.
         /// </summary>
         /// <param name="referenceTime">A reference time used for lookup.</param>
-        /// <param name="beatDivisor">The divisor to use for snapping purposes.</param>
         /// <returns>The most appropriate beat length.</returns>
-        double GetBeatLengthAtTime(double referenceTime, int beatDivisor);
+        double GetBeatLengthAtTime(double referenceTime);
 
         /// <summary>
         /// Returns the current beat divisor.
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 820915e8e3..8d66cef16e 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -353,9 +353,9 @@ namespace osu.Game.Screens.Edit
             beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
         }
 
-        public double SnapTime(double referenceTime, double duration, int beatDivisor) => editorBeatmap.SnapTime(referenceTime, duration, beatDivisor);
+        public double SnapTime(double referenceTime, double duration) => editorBeatmap.SnapTime(referenceTime, duration);
 
-        public double GetBeatLengthAtTime(double referenceTime, int beatDivisor) => editorBeatmap.GetBeatLengthAtTime(referenceTime, beatDivisor);
+        public double GetBeatLengthAtTime(double referenceTime) => editorBeatmap.GetBeatLengthAtTime(referenceTime);
 
         public int BeatDivisor => beatDivisor.Value;
     }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 7c037c435f..a67a0ff0f1 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -126,15 +126,15 @@ namespace osu.Game.Screens.Edit
             return list.Count - 1;
         }
 
-        public double SnapTime(double referenceTime, double duration, int beatDivisor)
+        public double SnapTime(double referenceTime, double duration)
         {
-            double beatLength = GetBeatLengthAtTime(referenceTime, beatDivisor);
+            double beatLength = GetBeatLengthAtTime(referenceTime);
 
             // A 1ms offset prevents rounding errors due to minute variations in duration
             return (int)((duration + 1) / beatLength) * beatLength;
         }
 
-        public double GetBeatLengthAtTime(double referenceTime, int beatDivisor) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
+        public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
 
         public int BeatDivisor => beatDivisor?.Value ?? 1;
     }

From d3262a5667757ef047722c69634d3250d614f6a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jan 2020 17:35:36 +0900
Subject: [PATCH 00242/10326] Cache EditorBeatmap in test

---
 osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
index 29575cb42e..e9372bd134 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Tests.Visual.Editor
 
             var editorBeatmap = new EditorBeatmap((Beatmap<HitObject>)Beatmap.Value.Beatmap);
 
+            Dependencies.Cache(editorBeatmap);
+
             Children = new Drawable[]
             {
                 new FillFlowContainer

From 9d90799447027b3d74a92363514aed5a6b1911f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jan 2020 16:20:42 +0900
Subject: [PATCH 00243/10326] Remove useless container

---
 .../Edit/Compose/Components/BlueprintContainer.cs      | 10 +++-------
 .../Components/Timeline/TimelineBlueprintContainer.cs  |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 4ef8877795..23f62e4eaf 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 SelectionBlueprintContainer selectionBlueprints;
+        private Container<SelectionBlueprint> selectionBlueprints;
 
         private SelectionHandler selectionHandler;
 
@@ -83,7 +83,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
         }
 
-        protected virtual SelectionBlueprintContainer CreateSelectionBlueprintContainer() => new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
+        protected virtual Container<SelectionBlueprint> CreateSelectionBlueprintContainer() =>
+            new Container<SelectionBlueprint> { RelativeSizeAxes = Axes.Both };
 
         protected override void LoadComplete()
         {
@@ -430,10 +431,5 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 beatmap.HitObjectRemoved -= removeBlueprintFor;
             }
         }
-
-        protected class SelectionBlueprintContainer : Container<SelectionBlueprint>
-        {
-            //todo: remove
-        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index b0d3e2dcde..9fef2998bd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             });
         }
 
-        protected override SelectionBlueprintContainer CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
+        protected override Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
 
         protected override void LoadComplete()
         {
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        protected class TimelineSelectionBlueprintContainer : SelectionBlueprintContainer
+        protected class TimelineSelectionBlueprintContainer : Container<SelectionBlueprint>
         {
             protected override Container<SelectionBlueprint> Content { get; }
 

From 5cadbb1ffb057f71f086b6a6053a65e15807001a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jan 2020 16:22:43 +0900
Subject: [PATCH 00244/10326] Move timeline blueprint to own class

---
 .../Timeline/TimelineBlueprintContainer.cs    | 102 ---------------
 .../Timeline/TimelineHitObjectBlueprint.cs    | 116 ++++++++++++++++++
 2 files changed, 116 insertions(+), 102 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 9fef2998bd..c1458480a6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -2,9 +2,7 @@
 // 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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -12,7 +10,6 @@ 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;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 using osuTK;
 using osuTK.Graphics;
@@ -139,104 +136,5 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 AddInternal(new TimelinePart<SelectionBlueprint>(Content = new Container<SelectionBlueprint> { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
             }
         }
-
-        private class TimelineHitObjectBlueprint : SelectionBlueprint
-        {
-            private readonly Circle circle;
-
-            private readonly Container extensionBar;
-
-            [UsedImplicitly]
-            private readonly Bindable<double> startTime;
-
-            public const float THICKNESS = 3;
-
-            private const float circle_size = 16;
-
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) || circle.ReceivePositionalInputAt(screenSpacePos);
-
-            public TimelineHitObjectBlueprint(HitObject hitObject)
-                : base(hitObject)
-            {
-                Anchor = Anchor.CentreLeft;
-                Origin = Anchor.CentreLeft;
-
-                startTime = hitObject.StartTimeBindable.GetBoundCopy();
-                startTime.BindValueChanged(time => X = (float)time.NewValue, true);
-
-                RelativePositionAxes = Axes.X;
-
-                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),
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.Centre,
-                    RelativePositionAxes = Axes.X,
-                    AlwaysPresent = true,
-                    Colour = Color4.White,
-                    BorderColour = Color4.Black,
-                    BorderThickness = THICKNESS,
-                });
-            }
-
-            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.Colour = Color4.Orange;
-            }
-
-            protected override void OnDeselected()
-            {
-                circle.BorderColour = Color4.Black;
-                if (extensionBar != null)
-                    extensionBar.Colour = 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;
-        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
new file mode 100644
index 0000000000..2ed5471444
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -0,0 +1,116 @@
+// Copyright (c) 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
+{
+    public class TimelineHitObjectBlueprint : SelectionBlueprint
+    {
+        private readonly Circle circle;
+
+        private readonly Container extensionBar;
+
+        [UsedImplicitly]
+        private readonly Bindable<double> startTime;
+
+        public const float THICKNESS = 3;
+
+        private const float circle_size = 16;
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) || circle.ReceivePositionalInputAt(screenSpacePos);
+
+        public TimelineHitObjectBlueprint(HitObject hitObject)
+            : base(hitObject)
+        {
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+
+            startTime = hitObject.StartTimeBindable.GetBoundCopy();
+            startTime.BindValueChanged(time => X = (float)time.NewValue, true);
+
+            RelativePositionAxes = Axes.X;
+
+            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),
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.Centre,
+                RelativePositionAxes = Axes.X,
+                AlwaysPresent = true,
+                Colour = Color4.White,
+                BorderColour = Color4.Black,
+                BorderThickness = THICKNESS,
+            });
+        }
+
+        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.Colour = Color4.Orange;
+        }
+
+        protected override void OnDeselected()
+        {
+            circle.BorderColour = Color4.Black;
+            if (extensionBar != null)
+                extensionBar.Colour = 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 5646f7777e77bd6c7a5414debef4bfd9c7c769cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jan 2020 16:23:42 +0900
Subject: [PATCH 00245/10326] Add comment about custom SelectionHandler

---
 .../Components/Timeline/TimelineBlueprintContainer.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index c1458480a6..6bfd323c13 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -82,15 +82,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override SelectionHandler CreateSelectionHandler() => new TimelineSelectionHandler();
 
-        internal class TimelineSelectionHandler : SelectionHandler
-        {
-            public override bool HandleMovement(MoveSelectionEvent moveEvent) => true;
-        }
-
         protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => new TimelineHitObjectBlueprint(hitObject);
 
         protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect);
 
+        internal class TimelineSelectionHandler : SelectionHandler
+        {
+            // for now we always allow movement. snapping is provided by the Timeline's "distance" snap implementation
+            public override bool HandleMovement(MoveSelectionEvent moveEvent) => true;
+        }
+
         private class TimelineDragBox : DragBox
         {
             private Vector2 lastMouseDown;

From 32fb87acecdad9722ab9c7acf1d235df2f342fad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jan 2020 16:45:30 +0900
Subject: [PATCH 00246/10326] Update country names

---
 osu.Game.Tournament/Resources/countries.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Resources/countries.json b/osu.Game.Tournament/Resources/countries.json
index ec2ca2bf37..7306a8bec5 100644
--- a/osu.Game.Tournament/Resources/countries.json
+++ b/osu.Game.Tournament/Resources/countries.json
@@ -541,7 +541,7 @@
     },
     {
         "FlagName": "MK",
-        "FullName": "Macedonia",
+        "FullName": "North Macedonia",
         "Acronym": "MKD"
     },
     {
@@ -811,7 +811,7 @@
     },
     {
         "FlagName": "CV",
-        "FullName": "Cape Verde",
+        "FullName": "Cabo Verde",
         "Acronym": "CPV"
     },
     {
@@ -821,7 +821,7 @@
     },
     {
         "FlagName": "SZ",
-        "FullName": "Swaziland",
+        "FullName": "Eswatini",
         "Acronym": "SWZ"
     },
     {

From 667fdb907cb56e6ad5fb5d4f616e1c8a23d85710 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 23 Jan 2020 12:21:16 +0300
Subject: [PATCH 00247/10326] Call the method directly rather that trigger a
 bindable

---
 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 99f79cd940..1193de52d7 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Overlays.Comments
         {
             this.type = type;
             this.id = id;
-            Sort.TriggerChange();
+            refetchComments();
         }
 
         private void refetchComments()

From 0c3120d965914062e5dd14619bee56abb031ccb0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 23 Jan 2020 12:59:53 +0300
Subject: [PATCH 00248/10326] Fix possible crash due to not loaded api

---
 osu.Game/Overlays/Comments/CommentsContainer.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 1193de52d7..9f1d9d9488 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Overlays.Comments
 
         protected override void LoadComplete()
         {
-            Sort.BindValueChanged(_ => refetchComments());
+            Sort.BindValueChanged(_ => refetchComments(), true);
             base.LoadComplete();
         }
 
@@ -129,6 +129,10 @@ namespace osu.Game.Overlays.Comments
         {
             this.type = type;
             this.id = id;
+
+            if (!IsLoaded)
+                return;
+
             refetchComments();
         }
 

From f8cb8985161d313490b33fe420cc0b3f931d33bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jan 2020 20:03:52 +0900
Subject: [PATCH 00249/10326] Improve song select display on ultrawide displays
 (or when UI scale is set low)

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs |   2 +-
 osu.Game/Screens/Select/SongSelect.cs       | 117 ++++++++++++++------
 2 files changed, 82 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index b0d5be8140..cf49cf0228 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Select
     {
         private const float shear_width = 36.75f;
 
-        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGED_CONTAINER_SIZE.Y, 0);
+        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGE_HEIGHT, 0);
 
         private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index bf57def700..bcb828a666 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Select
 {
     public abstract class SongSelect : OsuScreen, IKeyBindingHandler<GlobalAction>
     {
-        public static readonly Vector2 WEDGED_CONTAINER_SIZE = new Vector2(0.5f, 245);
+        public static readonly float WEDGE_HEIGHT = 245;
 
         protected const float BACKGROUND_BLUR = 20;
         private const float left_area_padding = 20;
@@ -88,13 +88,15 @@ namespace osu.Game.Screens.Select
         [Resolved(canBeNull: true)]
         private MusicController music { get; set; }
 
+        private const float panel_overflow = 1.2f;
+
         [BackgroundDependencyLoader(true)]
         private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores)
         {
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
 
-            AddRangeInternal(new Drawable[]
+            AddRangeInternal(new[]
             {
                 new ParallaxContainer
                 {
@@ -107,27 +109,61 @@ namespace osu.Game.Screens.Select
                         {
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Right = -150 },
-                            Size = new Vector2(WEDGED_CONTAINER_SIZE.X, 1),
+                            Size = new Vector2(0.5f, 1),
                         }
                     }
                 },
-                new Container
+                new GridContainer // used for max width implementation
                 {
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(WEDGED_CONTAINER_SIZE.X, 1),
-                    Padding = new MarginPadding
+                    ColumnDimensions = new[]
                     {
-                        Bottom = Footer.HEIGHT,
-                        Top = WEDGED_CONTAINER_SIZE.Y + left_area_padding,
-                        Left = left_area_padding,
-                        Right = left_area_padding * 2,
+                        new Dimension(GridSizeMode.Relative, 0.5f, maxSize: 650),
                     },
-                    Child = BeatmapDetails = new BeatmapDetailArea
+                    Content = new[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Top = 10, Right = 5 },
+                        new Drawable[]
+                        {
+                            new Container
+                            {
+                                Origin = Anchor.BottomLeft,
+                                Anchor = Anchor.BottomLeft,
+                                RelativeSizeAxes = Axes.Both,
+
+                                Children = new Drawable[]
+                                {
+                                    beatmapInfoWedge = new BeatmapInfoWedge
+                                    {
+                                        Height = WEDGE_HEIGHT,
+                                        RelativeSizeAxes = Axes.X,
+                                        Margin = new MarginPadding
+                                        {
+                                            Top = left_area_padding,
+                                            Right = left_area_padding,
+                                        },
+                                    },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Padding = new MarginPadding
+                                        {
+                                            Bottom = Footer.HEIGHT,
+                                            Top = WEDGE_HEIGHT + left_area_padding,
+                                            Left = left_area_padding,
+                                            Right = left_area_padding * 2,
+                                        },
+                                        Children = new Drawable[]
+                                        {
+                                            BeatmapDetails = new BeatmapDetailArea
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Padding = new MarginPadding { Top = 10, Right = 5 },
+                                            },
+                                        }
+                                    },
+                                }
+                            },
+                        },
                     }
                 },
                 new Container
@@ -136,13 +172,13 @@ namespace osu.Game.Screens.Select
                     Masking = true,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Width = 2, //avoid horizontal masking so the panels don't clip when screen stack is pushed.
+                    Width = panel_overflow, //avoid horizontal masking so the panels don't clip when screen stack is pushed.
                     Child = new Container
                     {
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Width = 0.5f,
+                        Width = 1 / panel_overflow,
                         Children = new Drawable[]
                         {
                             new Container
@@ -153,15 +189,33 @@ namespace osu.Game.Screens.Select
                                     Top = FilterControl.HEIGHT,
                                     Bottom = Footer.HEIGHT
                                 },
-                                Child = Carousel = new BeatmapCarousel
+                                Children = new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Size = new Vector2(1 - WEDGED_CONTAINER_SIZE.X, 1),
-                                    Anchor = Anchor.CentreRight,
-                                    Origin = Anchor.CentreRight,
-                                    SelectionChanged = updateSelectedBeatmap,
-                                    BeatmapSetsChanged = carouselBeatmapsLoaded,
-                                },
+                                    new GridContainer // used for max width implementation
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        ColumnDimensions = new[]
+                                        {
+                                            new Dimension(),
+                                            new Dimension(GridSizeMode.Relative, 0.5f, maxSize: 850),
+                                        },
+                                        Content = new[]
+                                        {
+                                            new Drawable[]
+                                            {
+                                                null,
+                                                Carousel = new BeatmapCarousel
+                                                {
+                                                    Anchor = Anchor.CentreRight,
+                                                    Origin = Anchor.CentreRight,
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    SelectionChanged = updateSelectedBeatmap,
+                                                    BeatmapSetsChanged = carouselBeatmapsLoaded,
+                                                },
+                                            }
+                                        }
+                                    },
+                                }
                             },
                             FilterControl = new FilterControl
                             {
@@ -173,21 +227,12 @@ namespace osu.Game.Screens.Select
                         }
                     },
                 },
-                beatmapInfoWedge = new BeatmapInfoWedge
-                {
-                    Size = WEDGED_CONTAINER_SIZE,
-                    RelativeSizeAxes = Axes.X,
-                    Margin = new MarginPadding
-                    {
-                        Top = left_area_padding,
-                        Right = left_area_padding,
-                    },
-                },
                 new ResetScrollContainer(() => Carousel.ScrollToSelected())
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = 250,
-                }
+                },
+                beatmapInfoWedge.CreateProxy()
             });
 
             if (ShowFooter)

From 6493f24547bd1eae1ecbfce3edb13f4ac0612d80 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 23 Jan 2020 15:56:01 +0300
Subject: [PATCH 00250/10326] Add TotalCommentsCounter to CommentsContainer

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

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 9f1d9d9488..433af5fb4e 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Overlays.Comments
         private readonly FillFlowContainer content;
         private readonly DeletedChildrenPlaceholder deletedChildrenPlaceholder;
         private readonly CommentsShowMoreButton moreButton;
+        private readonly TotalCommentsCounter commentCounter;
 
         public CommentsContainer()
         {
@@ -56,6 +57,7 @@ namespace osu.Game.Overlays.Comments
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
+                        commentCounter = new TotalCommentsCounter(),
                         new CommentsHeader
                         {
                             Sort = { BindTarget = Sort },
@@ -133,6 +135,7 @@ namespace osu.Game.Overlays.Comments
             if (!IsLoaded)
                 return;
 
+            commentCounter.Current.Value = 0;
             refetchComments();
         }
 
@@ -199,6 +202,8 @@ namespace osu.Game.Overlays.Comments
                     moreButton.IsLoading = false;
                 }
 
+                commentCounter.Current.Value = response.Total;
+
                 moreButton.FadeTo(response.HasMore ? 1 : 0);
             }, loadCancellation.Token);
         }

From 316a764f6f85a91f42b1d11b6bb8b03b47392e73 Mon Sep 17 00:00:00 2001
From: Berkan Diler <b.diler@gmx.de>
Date: Thu, 23 Jan 2020 16:23:53 +0100
Subject: [PATCH 00251/10326] Minor cleanups for Legacy Storyboard/Beatmap
 decoder

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs  | 12 ++++++------
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs         |  5 ++++-
 .../Beatmaps/Formats/LegacyStoryboardDecoder.cs    | 14 +++++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 447d52d980..a8ec351817 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -239,11 +239,11 @@ namespace osu.Game.Beatmaps.Formats
                     break;
 
                 case @"Source":
-                    beatmap.BeatmapInfo.Metadata.Source = pair.Value;
+                    metadata.Source = pair.Value;
                     break;
 
                 case @"Tags":
-                    beatmap.BeatmapInfo.Metadata.Tags = pair.Value;
+                    metadata.Tags = pair.Value;
                     break;
 
                 case @"BeatmapID":
@@ -300,13 +300,13 @@ namespace osu.Game.Beatmaps.Formats
             switch (type)
             {
                 case LegacyEventType.Background:
-                    string bgFilename = split[2].Trim('"');
-                    beatmap.BeatmapInfo.Metadata.BackgroundFile = bgFilename.ToStandardisedPath();
+                    string bgFilename = split[2];
+                    beatmap.BeatmapInfo.Metadata.BackgroundFile = CleanFilename(bgFilename); ;
                     break;
 
                 case LegacyEventType.Video:
-                    string videoFilename = split[2].Trim('"');
-                    beatmap.BeatmapInfo.Metadata.VideoFile = videoFilename.ToStandardisedPath();
+                    string videoFilename = split[2];
+                    beatmap.BeatmapInfo.Metadata.VideoFile = CleanFilename(videoFilename);
                     break;
 
                 case LegacyEventType.Break:
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index f55e24245b..0ec80eee41 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Extensions;
 using osu.Framework.Logging;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
@@ -115,7 +116,7 @@ namespace osu.Game.Beatmaps.Formats
 
         protected KeyValuePair<string, string> SplitKeyVal(string line, char separator = ':')
         {
-            var split = line.Trim().Split(new[] { separator }, 2);
+            var split = line.Split(separator, 2);
 
             return new KeyValuePair<string, string>
             (
@@ -124,6 +125,8 @@ namespace osu.Game.Beatmaps.Formats
             );
         }
 
+        protected string CleanFilename(string path) => path.Trim('"').ToStandardisedPath();
+
         protected enum Section
         {
             None,
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index c46634e72f..cbf0f8dfbd 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -7,7 +7,6 @@ using System.Globalization;
 using System.IO;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Game.IO;
 using osu.Game.Storyboards;
@@ -65,12 +64,14 @@ namespace osu.Game.Beatmaps.Formats
         private void handleEvents(string line)
         {
             var depth = 0;
+            var lineSpan = line.AsSpan();
 
-            while (line.StartsWith(" ", StringComparison.Ordinal) || line.StartsWith("_", StringComparison.Ordinal))
+            while (lineSpan.StartsWith(" ", StringComparison.Ordinal) || lineSpan.StartsWith("_", StringComparison.Ordinal))
             {
+                lineSpan = lineSpan.Slice(1);
                 ++depth;
-                line = line.Substring(1);
             }
+            line = line.Substring(depth);
 
             decodeVariables(ref line);
 
@@ -89,7 +90,7 @@ namespace osu.Game.Beatmaps.Formats
                     {
                         var layer = parseLayer(split[1]);
                         var origin = parseOrigin(split[2]);
-                        var path = cleanFilename(split[3]);
+                        var path = CleanFilename(split[3]);
                         var x = float.Parse(split[4], NumberFormatInfo.InvariantInfo);
                         var y = float.Parse(split[5], NumberFormatInfo.InvariantInfo);
                         storyboardSprite = new StoryboardSprite(path, origin, new Vector2(x, y));
@@ -101,7 +102,7 @@ namespace osu.Game.Beatmaps.Formats
                     {
                         var layer = parseLayer(split[1]);
                         var origin = parseOrigin(split[2]);
-                        var path = cleanFilename(split[3]);
+                        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]);
@@ -116,7 +117,7 @@ namespace osu.Game.Beatmaps.Formats
                     {
                         var time = double.Parse(split[1], CultureInfo.InvariantCulture);
                         var layer = parseLayer(split[2]);
-                        var path = cleanFilename(split[3]);
+                        var path = CleanFilename(split[3]);
                         var volume = split.Length > 4 ? float.Parse(split[4], CultureInfo.InvariantCulture) : 100;
                         storyboard.GetLayer(layer).Add(new StoryboardSampleInfo(path, time, (int)volume));
                         break;
@@ -332,6 +333,5 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
-        private string cleanFilename(string path) => path.Trim('"').ToStandardisedPath();
     }
 }

From 6658bdb223c15661bf7836d66165dacef2d07eec Mon Sep 17 00:00:00 2001
From: Berkan Diler <b.diler@gmx.de>
Date: Thu, 23 Jan 2020 16:34:43 +0100
Subject: [PATCH 00252/10326] Fix CodeFactor issues

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs    | 2 +-
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index a8ec351817..965fcc03a3 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -301,7 +301,7 @@ namespace osu.Game.Beatmaps.Formats
             {
                 case LegacyEventType.Background:
                     string bgFilename = split[2];
-                    beatmap.BeatmapInfo.Metadata.BackgroundFile = CleanFilename(bgFilename); ;
+                    beatmap.BeatmapInfo.Metadata.BackgroundFile = CleanFilename(bgFilename);
                     break;
 
                 case LegacyEventType.Video:
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index cbf0f8dfbd..a7d0360f0d 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -332,6 +332,5 @@ namespace osu.Game.Beatmaps.Formats
                     break;
             }
         }
-
     }
 }

From 5863576ce49721bb0cad638dfdeedb997c95fa48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 11:42:33 +0900
Subject: [PATCH 00253/10326] Add comment as to why counter is zeroes only in
 Show method

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

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 433af5fb4e..d252083411 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -135,7 +135,9 @@ namespace osu.Game.Overlays.Comments
             if (!IsLoaded)
                 return;
 
+            // only reset when changing ID/type. other refetch ops are generally just changing sort order.
             commentCounter.Current.Value = 0;
+
             refetchComments();
         }
 

From 851b89128559aee63f81b6dbccfa0f50e0f5dc66 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 11:52:32 +0900
Subject: [PATCH 00254/10326] Fix incorrect insert logic

---
 .../Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index d18f6f3743..f06f6938a2 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.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 System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -33,7 +34,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             private const int drawable_judgement_size = 8;
             private const int spacing = 2;
 
-            private int runningDepth;
+            public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
 
             public JudgementFlow()
             {
@@ -47,7 +48,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
             public void Push(Color4 colour)
             {
-                Insert(runningDepth--, new DrawableResult(colour, drawable_judgement_size));
+                Add(new DrawableResult(colour, drawable_judgement_size));
 
                 if (Children.Count > max_available_judgements)
                     Children.FirstOrDefault(c => !c.IsRemoved)?.Remove();

From eb5abcab8c129a47f11a56f178e32f50d4a6c8aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 11:54:48 +0900
Subject: [PATCH 00255/10326] Rename and simplify circle logic

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index f06f6938a2..657235bfd4 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         public override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
 
-        private class JudgementFlow : FillFlowContainer<DrawableResult>
+        private class JudgementFlow : FillFlowContainer<HitErrorCircle>
         {
             private const int max_available_judgements = 20;
             private const int drawable_judgement_size = 8;
@@ -48,46 +48,43 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
             public void Push(Color4 colour)
             {
-                Add(new DrawableResult(colour, drawable_judgement_size));
+                Add(new HitErrorCircle(colour, drawable_judgement_size));
 
                 if (Children.Count > max_available_judgements)
                     Children.FirstOrDefault(c => !c.IsRemoved)?.Remove();
             }
         }
 
-        private class DrawableResult : Container
+        private class HitErrorCircle : Container
         {
             public bool IsRemoved { get; private set; }
 
-            private readonly CircularContainer content;
+            private readonly Circle circle;
 
-            public DrawableResult(Color4 colour, int size)
+            public HitErrorCircle(Color4 colour, int size)
             {
                 Size = new Vector2(size);
-                Child = content = new CircularContainer
+                Child = circle = new Circle
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Masking = true,
                     Alpha = 0,
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colour
-                    },
+                    Colour = colour
                 };
             }
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                content.FadeInFromZero(animation_duration, Easing.OutQuint);
-                content.MoveToY(-DrawSize.Y);
-                content.MoveToY(0, animation_duration, Easing.OutQuint);
+
+                circle.FadeInFromZero(animation_duration, Easing.OutQuint);
+                circle.MoveToY(-DrawSize.Y);
+                circle.MoveToY(0, animation_duration, Easing.OutQuint);
             }
 
             public void Remove()
             {
                 IsRemoved = true;
+
                 this.FadeOut(animation_duration, Easing.OutQuint).Expire();
             }
         }

From e4702ffe9ef809a966fdc519c4039ce9ee076f06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 13:10:02 +0900
Subject: [PATCH 00256/10326] Fix editor rate adjustment polluting global
 beatmap rate

---
 .../Screens/Edit/Components/PlaybackControl.cs  | 17 +++++++++++++----
 osu.Game/Screens/Edit/Editor.cs                 |  9 ++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 62d6c4648b..66df68418a 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -5,6 +5,8 @@ using System.Linq;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -25,13 +27,13 @@ namespace osu.Game.Screens.Edit.Components
 
         private IAdjustableClock adjustableClock;
 
+        private readonly BindableNumber<double> tempo = new BindableDouble(1);
+
         [BackgroundDependencyLoader]
         private void load(IAdjustableClock adjustableClock)
         {
             this.adjustableClock = adjustableClock;
 
-            PlaybackTabControl tabs;
-
             Children = new Drawable[]
             {
                 playButton = new IconButton
@@ -58,11 +60,18 @@ namespace osu.Game.Screens.Edit.Components
                     RelativeSizeAxes = Axes.Both,
                     Height = 0.5f,
                     Padding = new MarginPadding { Left = 45 },
-                    Child = tabs = new PlaybackTabControl(),
+                    Child = new PlaybackTabControl { Current = tempo },
                 }
             };
 
-            tabs.Current.ValueChanged += tempo => Beatmap.Value.Track.Tempo.Value = tempo.NewValue;
+            Track?.AddAdjustment(AdjustableProperty.Tempo, tempo);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            Track?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
+
+            base.Dispose(isDisposing);
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 8d66cef16e..eae94a3c8e 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -46,6 +46,8 @@ namespace osu.Game.Screens.Edit
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        public override bool AllowRateAdjustments => false;
+
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -262,12 +264,6 @@ namespace osu.Game.Screens.Edit
         {
         }
 
-        public override void OnResuming(IScreen last)
-        {
-            base.OnResuming(last);
-            Beatmap.Value.Track?.Stop();
-        }
-
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
@@ -291,7 +287,6 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            Beatmap.Value.Track?.ResetSpeedAdjustments();
             Beatmap.Value.Track?.Stop();
 
             if (seekToStart)

From 0e9ab8c76b843fcb35bd06d7ffd1c423549ba5f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 13:39:47 +0900
Subject: [PATCH 00257/10326] Rename test scene to match

---
 ...mposeTimeline.cs => TestSceneTimelineBlueprintContainer.cs} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Editor/{TestSceneEditorComposeTimeline.cs => TestSceneTimelineBlueprintContainer.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
similarity index 97%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
rename to osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
index 5b0408268f..34bf671eba 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
@@ -23,12 +23,11 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestSceneEditorComposeTimeline : EditorClockTestScene
+    public class TestSceneTimelineBlueprintContainer : EditorClockTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(TimelineArea),
-            typeof(TimelineBlueprintContainer),
             typeof(Timeline),
             typeof(TimelineButton),
             typeof(CentreMarker)

From 997b49f6dc872f0104a9680665b5dbb92c67c91f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 14:21:22 +0900
Subject: [PATCH 00258/10326] Change display to always show progress bar, only
 hiding seeking handle instead

---
 .../Visual/Gameplay/TestSceneSongProgress.cs  |  3 +++
 osu.Game/Screens/Play/HUDOverlay.cs           |  1 -
 osu.Game/Screens/Play/SongProgress.cs         |  8 +++----
 osu.Game/Screens/Play/SongProgressBar.cs      | 23 ++++++++++++++++++-
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index 0996b5b0c7..ff14846b68 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -6,6 +6,9 @@ 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.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Graphics;
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 236bdc8442..a5f8051557 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -131,7 +131,6 @@ namespace osu.Game.Screens.Play
                 BindDrawableRuleset(drawableRuleset);
 
                 Progress.Objects = drawableRuleset.Objects;
-                Progress.AllowSeeking = drawableRuleset.HasReplayLoaded.Value;
                 Progress.RequestSeek = time => RequestSeek(time);
                 Progress.ReferenceClock = drawableRuleset.FrameStableClock;
             }
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 1368158938..aa745f5ba2 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -46,7 +46,6 @@ namespace osu.Game.Screens.Play
         public override bool HandlePositionalInput => AllowSeeking.Value;
 
         private double firstHitTime => objects.First().StartTime;
-        private double lastHitTime => ((objects.Last() as IHasEndTime)?.EndTime ?? objects.Last().StartTime) + 1;
 
         private IEnumerable<HitObject> objects;
 
@@ -92,7 +91,6 @@ namespace osu.Game.Screens.Play
                 },
                 bar = new SongProgressBar(bottom_bar_height, graph_height, handle_size)
                 {
-                    Alpha = 0,
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     OnSeek = time => RequestSeek?.Invoke(time),
@@ -105,6 +103,9 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
+            if (clock != null)
+                gameplayClock = clock;
+
             config.BindWith(OsuSetting.ShowProgressGraph, ShowGraph);
 
             graph.FillColour = bar.FillColour = colours.BlueLighter;
@@ -151,8 +152,7 @@ namespace osu.Game.Screens.Play
 
         private void updateBarVisibility()
         {
-            bar.FadeTo(AllowSeeking.Value ? 1 : 0, transition_duration, Easing.In);
-            this.MoveTo(new Vector2(0, AllowSeeking.Value ? 0 : bottom_bar_height), transition_duration, Easing.In);
+            bar.ShowHandle = AllowSeeking.Value;
 
             updateInfoMargin();
         }
diff --git a/osu.Game/Screens/Play/SongProgressBar.cs b/osu.Game/Screens/Play/SongProgressBar.cs
index 817b703fca..5052b32335 100644
--- a/osu.Game/Screens/Play/SongProgressBar.cs
+++ b/osu.Game/Screens/Play/SongProgressBar.cs
@@ -21,6 +21,22 @@ namespace osu.Game.Screens.Play
         private readonly Container handleBase;
         private readonly Container handleContainer;
 
+        private bool showHandle;
+
+        public bool ShowHandle
+        {
+            get => showHandle;
+            set
+            {
+                if (value == showHandle)
+                    return;
+
+                showHandle = value;
+
+                handleBase.FadeTo(showHandle ? 1 : 0, 200);
+            }
+        }
+
         public Color4 FillColour
         {
             set => fill.Colour = value;
@@ -75,6 +91,7 @@ namespace osu.Game.Screens.Play
                     Origin = Anchor.BottomLeft,
                     Anchor = Anchor.BottomLeft,
                     Width = 2,
+                    Alpha = 0,
                     Colour = Color4.White,
                     Position = new Vector2(2, 0),
                     Children = new Drawable[]
@@ -128,7 +145,11 @@ namespace osu.Game.Screens.Play
         protected override void OnUserChange(double value)
         {
             scheduledSeek?.Cancel();
-            scheduledSeek = Schedule(() => OnSeek?.Invoke(value));
+            scheduledSeek = Schedule(() =>
+            {
+                if (showHandle)
+                    OnSeek?.Invoke(value);
+            });
         }
     }
 }

From 2187dbd0c28b43684842593aa6f4f3b9427294d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 14:37:37 +0900
Subject: [PATCH 00259/10326] Rename steps in test for clarity

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index ff14846b68..b9b13d7bd8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -111,10 +111,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("display max values", displayMaxValues);
             AddUntilStep("wait for graph", () => graph.CreationCount == 1);
             AddStep("start", clock.Start);
-            AddStep("show bar", () => progress.AllowSeeking.Value = true);
+            AddStep("allow seeking", () => progress.AllowSeeking.Value = true);
             AddStep("hide graph", () => progress.ShowGraph.Value = false);
-            AddStep("hide Bar", () => progress.AllowSeeking.Value = false);
-            AddStep("show bar", () => progress.AllowSeeking.Value = true);
+            AddStep("disallow seeking", () => progress.AllowSeeking.Value = false);
+            AddStep("allow seeking", () => progress.AllowSeeking.Value = true);
             AddStep("show graph", () => progress.ShowGraph.Value = true);
             AddStep("stop", clock.Stop);
         }

From c0a233e8bb7d8a8ce8c2a6b67b6be72c09a8d57b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 15:00:10 +0900
Subject: [PATCH 00260/10326] Align background wedge with carousel

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index bcb828a666..30cb66b301 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -105,11 +105,26 @@ namespace osu.Game.Screens.Select
                     RelativeSizeAxes = Axes.Both,
                     Children = new[]
                     {
-                        new WedgeBackground
+                        new GridContainer // used for max width implementation
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Right = -150 },
-                            Size = new Vector2(0.5f, 1),
+                            ColumnDimensions = new[]
+                            {
+                                new Dimension(),
+                                new Dimension(GridSizeMode.Relative, 0.5f, maxSize: 850),
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    new WedgeBackground
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Padding = new MarginPadding { Right = -150 },
+                                    },
+                                    null
+                                }
+                            }
                         }
                     }
                 },

From fdde4a6858301129ac787b4fc4990a421e09cf28 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 15:34:15 +0900
Subject: [PATCH 00261/10326] Tidy up song select hierarchy to be more readable

---
 osu.Game/Screens/Select/SongSelect.cs | 219 ++++++++++++--------------
 1 file changed, 100 insertions(+), 119 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 30cb66b301..1a29f336ea 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -88,22 +88,22 @@ namespace osu.Game.Screens.Select
         [Resolved(canBeNull: true)]
         private MusicController music { get; set; }
 
-        private const float panel_overflow = 1.2f;
-
         [BackgroundDependencyLoader(true)]
         private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores)
         {
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
 
-            AddRangeInternal(new[]
+            AddRangeInternal(new Drawable[]
             {
-                new ParallaxContainer
+                new ResetScrollContainer(() => Carousel.ScrollToSelected())
                 {
-                    Masking = true,
-                    ParallaxAmount = 0.005f,
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new[]
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 250,
+                },
+                new VerticalMaskingContainer
+                {
+                    Children = new Drawable[]
                     {
                         new GridContainer // used for max width implementation
                         {
@@ -117,44 +117,14 @@ namespace osu.Game.Screens.Select
                             {
                                 new Drawable[]
                                 {
-                                    new WedgeBackground
+                                    new ParallaxContainer
                                     {
+                                        ParallaxAmount = 0.005f,
                                         RelativeSizeAxes = Axes.Both,
-                                        Padding = new MarginPadding { Right = -150 },
-                                    },
-                                    null
-                                }
-                            }
-                        }
-                    }
-                },
-                new GridContainer // used for max width implementation
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ColumnDimensions = new[]
-                    {
-                        new Dimension(GridSizeMode.Relative, 0.5f, maxSize: 650),
-                    },
-                    Content = new[]
-                    {
-                        new Drawable[]
-                        {
-                            new Container
-                            {
-                                Origin = Anchor.BottomLeft,
-                                Anchor = Anchor.BottomLeft,
-                                RelativeSizeAxes = Axes.Both,
-
-                                Children = new Drawable[]
-                                {
-                                    beatmapInfoWedge = new BeatmapInfoWedge
-                                    {
-                                        Height = WEDGE_HEIGHT,
-                                        RelativeSizeAxes = Axes.X,
-                                        Margin = new MarginPadding
+                                        Child = new WedgeBackground
                                         {
-                                            Top = left_area_padding,
-                                            Right = left_area_padding,
+                                            RelativeSizeAxes = Axes.Both,
+                                            Padding = new MarginPadding { Right = -150 },
                                         },
                                     },
                                     new Container
@@ -162,92 +132,80 @@ namespace osu.Game.Screens.Select
                                         RelativeSizeAxes = Axes.Both,
                                         Padding = new MarginPadding
                                         {
-                                            Bottom = Footer.HEIGHT,
-                                            Top = WEDGE_HEIGHT + left_area_padding,
-                                            Left = left_area_padding,
-                                            Right = left_area_padding * 2,
+                                            Top = FilterControl.HEIGHT,
+                                            Bottom = Footer.HEIGHT
                                         },
+                                        Child = Carousel = new BeatmapCarousel
+                                        {
+                                            Anchor = Anchor.CentreRight,
+                                            Origin = Anchor.CentreRight,
+                                            RelativeSizeAxes = Axes.Both,
+                                            SelectionChanged = updateSelectedBeatmap,
+                                            BeatmapSetsChanged = carouselBeatmapsLoaded,
+                                        },
+                                    }
+                                },
+                            }
+                        },
+                        FilterControl = new FilterControl
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = FilterControl.HEIGHT,
+                            FilterChanged = ApplyFilterToCarousel,
+                            Background = { Width = 2 },
+                        },
+                        new GridContainer // used for max width implementation
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            ColumnDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.Relative, 0.5f, maxSize: 650),
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    new Container
+                                    {
+                                        Origin = Anchor.BottomLeft,
+                                        Anchor = Anchor.BottomLeft,
+                                        RelativeSizeAxes = Axes.Both,
+
                                         Children = new Drawable[]
                                         {
-                                            BeatmapDetails = new BeatmapDetailArea
+                                            beatmapInfoWedge = new BeatmapInfoWedge
+                                            {
+                                                Height = WEDGE_HEIGHT,
+                                                RelativeSizeAxes = Axes.X,
+                                                Margin = new MarginPadding
+                                                {
+                                                    Top = left_area_padding,
+                                                    Right = left_area_padding,
+                                                },
+                                            },
+                                            new Container
                                             {
                                                 RelativeSizeAxes = Axes.Both,
-                                                Padding = new MarginPadding { Top = 10, Right = 5 },
+                                                Padding = new MarginPadding
+                                                {
+                                                    Bottom = Footer.HEIGHT,
+                                                    Top = WEDGE_HEIGHT + left_area_padding,
+                                                    Left = left_area_padding,
+                                                    Right = left_area_padding * 2,
+                                                },
+                                                Child = BeatmapDetails = new BeatmapDetailArea
+                                                {
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Padding = new MarginPadding { Top = 10, Right = 5 },
+                                                },
                                             },
                                         }
                                     },
-                                }
-                            },
-                        },
+                                },
+                            }
+                        }
                     }
                 },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Width = panel_overflow, //avoid horizontal masking so the panels don't clip when screen stack is pushed.
-                    Child = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Width = 1 / panel_overflow,
-                        Children = new Drawable[]
-                        {
-                            new Container
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding
-                                {
-                                    Top = FilterControl.HEIGHT,
-                                    Bottom = Footer.HEIGHT
-                                },
-                                Children = new Drawable[]
-                                {
-                                    new GridContainer // used for max width implementation
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        ColumnDimensions = new[]
-                                        {
-                                            new Dimension(),
-                                            new Dimension(GridSizeMode.Relative, 0.5f, maxSize: 850),
-                                        },
-                                        Content = new[]
-                                        {
-                                            new Drawable[]
-                                            {
-                                                null,
-                                                Carousel = new BeatmapCarousel
-                                                {
-                                                    Anchor = Anchor.CentreRight,
-                                                    Origin = Anchor.CentreRight,
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    SelectionChanged = updateSelectedBeatmap,
-                                                    BeatmapSetsChanged = carouselBeatmapsLoaded,
-                                                },
-                                            }
-                                        }
-                                    },
-                                }
-                            },
-                            FilterControl = new FilterControl
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                Height = FilterControl.HEIGHT,
-                                FilterChanged = ApplyFilterToCarousel,
-                                Background = { Width = 2 },
-                            },
-                        }
-                    },
-                },
-                new ResetScrollContainer(() => Carousel.ScrollToSelected())
-                {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 250,
-                },
-                beatmapInfoWedge.CreateProxy()
             });
 
             if (ShowFooter)
@@ -765,6 +723,29 @@ namespace osu.Game.Screens.Select
             return base.OnKeyDown(e);
         }
 
+        private class VerticalMaskingContainer : Container
+        {
+            private const float panel_overflow = 1.2f;
+
+            protected override Container<Drawable> Content { get; }
+
+            public VerticalMaskingContainer()
+            {
+                RelativeSizeAxes = Axes.Both;
+                Masking = true;
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                Width = panel_overflow; //avoid horizontal masking so the panels don't clip when screen stack is pushed.
+                InternalChild = Content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 1 / panel_overflow,
+                };
+            }
+        }
+
         private class ResetScrollContainer : Container
         {
             private readonly Action onHoverAction;

From 34ffbcf2ae66065e3ceeef69597e81ce6593934d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 24 Jan 2020 10:24:44 +0300
Subject: [PATCH 00262/10326] Adjust xmldoc

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

diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index 0837bf0db4..d5017fb4d7 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -14,9 +14,9 @@ using osuTK;
 namespace osu.Game.Overlays
 {
     /// <summary>
-    /// <see cref="OverlayHeader"/> which contains <see cref="OsuTabControl{T}"/>.
+    /// An overlay header which contains a <see cref="OsuTabControl{T}"/>.
     /// </summary>
-    /// <typeparam name="T">The type of item to be represented by tabs in <see cref="OsuTabControl{T}"/>.</typeparam>
+    /// <typeparam name="T">The type of item to be represented by tabs.</typeparam>
     public abstract class TabControlOverlayHeader<T> : OverlayHeader
     {
         protected OsuTabControl<T> TabControl;

From f9a54dfb1dc59a9e85cec3ccb1c63e46361ea911 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 16:23:41 +0900
Subject: [PATCH 00263/10326] Tidy up implementation and show on returning with
 new song

---
 osu.Game/Screens/Menu/MainMenu.cs   | 50 +++++++++++++----------------
 osu.Game/Screens/Menu/SongTicker.cs |  7 ++--
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 2de31cf399..27b87e4fa5 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -78,27 +78,6 @@ namespace osu.Game.Screens.Menu
             holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
 
-            AddInternal(songTicker = new SongTicker
-            {
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                Margin = new MarginPadding { Right = 15, Top = 5 }
-            });
-
-            if (host.CanExit)
-            {
-                AddInternal(exitConfirmOverlay = new ExitConfirmOverlay
-                {
-                    Action = () =>
-                    {
-                        if (holdDelay.Value > 0)
-                            confirmAndExit();
-                        else
-                            this.Exit();
-                    }
-                });
-            }
-
             AddRangeInternal(new Drawable[]
             {
                 buttonsContainer = new ParallaxContainer
@@ -117,8 +96,28 @@ namespace osu.Game.Screens.Menu
                     }
                 },
                 sideFlashes = new MenuSideFlashes(),
+                songTicker = new SongTicker
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Margin = new MarginPadding { Right = 15, Top = 5 }
+                }
             });
 
+            if (host.CanExit)
+            {
+                AddInternal(exitConfirmOverlay = new ExitConfirmOverlay
+                {
+                    Action = () =>
+                    {
+                        if (holdDelay.Value > 0)
+                            confirmAndExit();
+                        else
+                            this.Exit();
+                    }
+                });
+            }
+
             buttons.StateChanged += state =>
             {
                 switch (state)
@@ -236,9 +235,6 @@ namespace osu.Game.Screens.Menu
 
             buttons.State = ButtonSystemState.EnteringMode;
 
-            songTicker.FadeOut(100, Easing.OutQuint);
-            songTicker.AllowUpdates = false;
-
             this.FadeOut(FADE_OUT_DURATION, Easing.InSine);
             buttonsContainer.MoveTo(new Vector2(-800, 0), FADE_OUT_DURATION, Easing.InSine);
 
@@ -249,8 +245,6 @@ namespace osu.Game.Screens.Menu
         {
             base.OnResuming(last);
 
-            songTicker.AllowUpdates = true;
-
             (Background as BackgroundScreenDefault)?.Next();
 
             //we may have consumed our preloaded instance, so let's make another.
@@ -277,8 +271,10 @@ namespace osu.Game.Screens.Menu
             }
 
             buttons.State = ButtonSystemState.Exit;
-            this.FadeOut(3000);
+
             songTicker.Hide();
+
+            this.FadeOut(3000);
             return base.OnExiting(next);
         }
 
diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index f858d162d2..c3569b7ccb 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.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;
@@ -17,8 +17,6 @@ namespace osu.Game.Screens.Menu
     {
         private const int fade_duration = 800;
 
-        public bool AllowUpdates { get; set; } = true;
-
         [Resolved]
         private Bindable<WorkingBeatmap> beatmap { get; set; }
 
@@ -58,8 +56,7 @@ namespace osu.Game.Screens.Menu
 
         private void onBeatmapChanged(ValueChangedEvent<WorkingBeatmap> working)
         {
-            if (!AllowUpdates)
-                return;
+            var metadata = beatmap.Value.Metadata;
 
             var metadata = working.NewValue.Metadata;
 

From 6f44f8a1ad0a64a142043ea97eb806836519df76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 16:27:49 +0900
Subject: [PATCH 00264/10326] Ensure only run once when not current screen

---
 osu.Game/Screens/Menu/SongTicker.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index c3569b7ccb..4323d639c4 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.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;
@@ -22,6 +22,8 @@ namespace osu.Game.Screens.Menu
 
         private readonly OsuSpriteText title, artist;
 
+        public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
+
         public SongTicker()
         {
             AutoSizeAxes = Axes.Both;
@@ -51,19 +53,20 @@ namespace osu.Game.Screens.Menu
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            beatmap.BindValueChanged(onBeatmapChanged);
+
+            beatmap.BindValueChanged(_ => Scheduler.AddOnce(show), true);
         }
 
-        private void onBeatmapChanged(ValueChangedEvent<WorkingBeatmap> working)
+        private void show()
         {
             var metadata = beatmap.Value.Metadata;
 
-            var metadata = working.NewValue.Metadata;
-
             title.Text = new LocalisedString((metadata.TitleUnicode, metadata.Title));
             artist.Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist));
 
-            this.FadeIn(fade_duration, Easing.OutQuint).Delay(4000).Then().FadeOut(fade_duration, Easing.OutQuint);
+            this.FadeInFromZero(fade_duration)
+                .Delay(4000)
+                .Then().FadeOut(fade_duration);
         }
     }
 }

From 738980e3f76f8e2ddfbeab90fb40d1109e49c689 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 24 Jan 2020 10:31:47 +0300
Subject: [PATCH 00265/10326] Refactor OsuTabControl.AccentColour

---
 .../Graphics/UserInterface/OsuTabControl.cs   | 30 ++++++++-----------
 osu.Game/Overlays/OverlayTabControl.cs        |  6 ++--
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index c0129c921e..deffa863dd 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -22,12 +22,20 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
-        private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
+        protected readonly Bindable<Color4> AccentColourBindable = new Bindable<Color4>();
 
         public Color4 AccentColour
         {
-            get => accentColour.Value;
-            set => accentColour.Value = value;
+            get => AccentColourBindable.Value;
+            set
+            {
+                AccentColourBindable.Value = value;
+
+                if (Dropdown is IHasAccentColour dropdown)
+                    dropdown.AccentColour = value;
+                foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
+                    i.AccentColour = value;
+            }
         }
 
         private readonly Box strip;
@@ -67,24 +75,10 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            if (accentColour.Value == default)
+            if (AccentColour == default)
                 AccentColour = colours.Blue;
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            accentColour.BindValueChanged(OnAccentColourChanged, true);
-        }
-
-        protected virtual void OnAccentColourChanged(ValueChangedEvent<Color4> colour)
-        {
-            if (Dropdown is IHasAccentColour dropdown)
-                dropdown.AccentColour = colour.NewValue;
-            foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
-                i.AccentColour = colour.NewValue;
-        }
-
         public Color4 StripColour
         {
             get => strip.Colour;
diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index 72977d6bff..e8ef05f473 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.cs
@@ -37,10 +37,10 @@ namespace osu.Game.Overlays
             });
         }
 
-        protected override void OnAccentColourChanged(ValueChangedEvent<Color4> colour)
+        protected override void LoadComplete()
         {
-            base.OnAccentColourChanged(colour);
-            bar.Colour = colour.NewValue;
+            base.LoadComplete();
+            AccentColourBindable.BindValueChanged(colour => bar.Colour = colour.NewValue, true);
         }
 
         protected override Dropdown<T> CreateDropdown() => null;

From 7495cfa0a95dc4e8e54af3b11c9d299422114d7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 16:32:31 +0900
Subject: [PATCH 00266/10326] Add a test scene

You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene
---
 .../Visual/Menus/TestSceneSongTicker.cs       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Menus/TestSceneSongTicker.cs

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneSongTicker.cs b/osu.Game.Tests/Visual/Menus/TestSceneSongTicker.cs
new file mode 100644
index 0000000000..d7f23f5cc0
--- /dev/null
+++ b/osu.Game.Tests/Visual/Menus/TestSceneSongTicker.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.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays;
+using osu.Game.Screens.Menu;
+
+namespace osu.Game.Tests.Visual.Menus
+{
+    public class TestSceneSongTicker : OsuTestScene
+    {
+        [Cached]
+        private MusicController musicController = new MusicController();
+
+        public TestSceneSongTicker()
+        {
+            AddRange(new Drawable[]
+            {
+                musicController,
+                new SongTicker
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                new NowPlayingOverlay
+                {
+                    Origin = Anchor.TopRight,
+                    Anchor = Anchor.TopRight,
+                    State = { Value = Visibility.Visible }
+                }
+            });
+        }
+    }
+}

From 827f48c29bc8a512a1807b9e010899a0f7172c8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 16:32:39 +0900
Subject: [PATCH 00267/10326] Adjust fade

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

diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index 4323d639c4..c4943e77d5 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Menu
             title.Text = new LocalisedString((metadata.TitleUnicode, metadata.Title));
             artist.Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist));
 
-            this.FadeInFromZero(fade_duration)
+            this.FadeInFromZero(fade_duration / 2f)
                 .Delay(4000)
                 .Then().FadeOut(fade_duration);
         }

From 1d549a0c8aaa817bd3347bdc9160e941f021ac03 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 24 Jan 2020 10:46:27 +0300
Subject: [PATCH 00268/10326] Remove unused using

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

diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index e8ef05f473..619729acae 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.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.Shapes;
 using osu.Framework.Graphics.UserInterface;

From f9e93e2a6ae041f0a956f82aaa0768e9cb601a12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jan 2020 16:34:13 +0900
Subject: [PATCH 00269/10326] Fix regressed input handling order

---
 osu.Game/Screens/Menu/MainMenu.cs | 33 ++++++++++++++++---------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 27b87e4fa5..b03febce31 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -78,7 +78,21 @@ namespace osu.Game.Screens.Menu
             holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
 
-            AddRangeInternal(new Drawable[]
+            if (host.CanExit)
+            {
+                AddInternal(exitConfirmOverlay = new ExitConfirmOverlay
+                {
+                    Action = () =>
+                    {
+                        if (holdDelay.Value > 0)
+                            confirmAndExit();
+                        else
+                            this.Exit();
+                    }
+                });
+            }
+
+            AddRangeInternal(new[]
             {
                 buttonsContainer = new ParallaxContainer
                 {
@@ -101,23 +115,10 @@ namespace osu.Game.Screens.Menu
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     Margin = new MarginPadding { Right = 15, Top = 5 }
-                }
+                },
+                exitConfirmOverlay.CreateProxy()
             });
 
-            if (host.CanExit)
-            {
-                AddInternal(exitConfirmOverlay = new ExitConfirmOverlay
-                {
-                    Action = () =>
-                    {
-                        if (holdDelay.Value > 0)
-                            confirmAndExit();
-                        else
-                            this.Exit();
-                    }
-                });
-            }
-
             buttons.StateChanged += state =>
             {
                 switch (state)

From 28727bbafd1c7e5e3fb3bd2aabf73d47e900f24e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 17:30:37 +0900
Subject: [PATCH 00270/10326] Fix crash when deselecting via ctrl+click

---
 .../Edit/Compose/Components/BlueprintContainer.cs     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 23f62e4eaf..165fc93b9e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -110,7 +110,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override bool OnMouseDown(MouseDownEvent e)
         {
             beginClickSelection(e);
-
             prepareSelectionMovement();
 
             return e.Button == MouseButton.Left;
@@ -356,21 +355,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Attempts to begin the movement of any selected blueprints.
         /// </summary>
-        /// <returns>Whether movement began.</returns>
-        private bool prepareSelectionMovement()
+        private void prepareSelectionMovement()
         {
-            Debug.Assert(movementBlueprint == null);
+            if (!selectionHandler.SelectedBlueprints.Any())
+                return;
 
             // Any selected blueprint that is hovered can begin the movement of the group, however only the earliest hitobject is used for movement
             // A special case is added for when a click selection occurred before the drag
             if (!clickSelectionBegan && !selectionHandler.SelectedBlueprints.Any(b => b.IsHovered))
-                return false;
+                return;
 
             // Movement is tracked from the blueprint of the earliest hitobject, since it only makes sense to distance snap from that hitobject
             movementBlueprint = selectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime).First();
             movementBlueprintOriginalPosition = movementBlueprint.SelectionPoint; // todo: unsure if correct
-
-            return true;
         }
 
         /// <summary>

From 6fc6a376ee285700940fcfbebac3da349e312d99 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 17:50:09 +0900
Subject: [PATCH 00271/10326] Fix incorrect slider selection point

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 4fdead512a..c18b3b0ff3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -170,7 +170,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 SelectionPoint => HeadBlueprint.SelectionPoint;
+        public override Vector2 SelectionPoint => ((DrawableSlider)DrawableObject).HeadCircle.ScreenSpaceDrawQuad.Centre;
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => BodyPiece.ReceivePositionalInputAt(screenSpacePos);
 

From 811ddb02a4bca157bcb17b5fee4adbeb11415fd0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 17:50:36 +0900
Subject: [PATCH 00272/10326] General refactoring

---
 .../Blueprints/Sliders/SliderCircleSelectionBlueprint.cs    | 1 +
 .../Visual/Editor/TestSceneTimelineBlueprintContainer.cs    | 2 +-
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs   | 6 +++---
 .../Components/Timeline/TimelineBlueprintContainer.cs       | 6 +++---
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs              | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
index f09279ed73..a0392fe536 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             : base(slider)
         {
             this.position = position;
+
             InternalChild = CirclePiece = new HitCirclePiece();
 
             Select();
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
index 34bf671eba..e7b2508ac7 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.Editor
                 },
                 new TimelineArea
                 {
-                    Child = new TimelineBlueprintContainer(editorBeatmap),
+                    Child = new TimelineBlueprintContainer(),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 165fc93b9e..6b21f56567 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -83,9 +83,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
         }
 
-        protected virtual Container<SelectionBlueprint> CreateSelectionBlueprintContainer() =>
-            new Container<SelectionBlueprint> { RelativeSizeAxes = Axes.Both };
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -94,6 +91,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             beatmap.HitObjectRemoved += removeBlueprintFor;
         }
 
+        protected virtual Container<SelectionBlueprint> CreateSelectionBlueprintContainer() =>
+            new Container<SelectionBlueprint> { RelativeSizeAxes = Axes.Both };
+
         /// <summary>
         /// Creates a <see cref="SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 6bfd323c13..3b9cb1df24 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private DragEvent lastDragEvent;
 
-        public TimelineBlueprintContainer(EditorBeatmap beatmap)
+        public TimelineBlueprintContainer()
         {
             RelativeSizeAxes = Axes.Both;
             Anchor = Anchor.Centre;
@@ -39,14 +39,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             });
         }
 
-        protected override Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
             DragBox.Alpha = 0;
         }
 
+        protected override Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
+
         protected override void OnDrag(DragEvent e)
         {
             if (timeline != null)
diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 20e1ef95d3..cdea200e10 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -32,6 +32,6 @@ namespace osu.Game.Screens.Edit.Compose
             return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(composer));
         }
 
-        protected override Drawable CreateTimelineContent() => composer == null ? base.CreateTimelineContent() : new TimelineBlueprintContainer(EditorBeatmap);
+        protected override Drawable CreateTimelineContent() => composer == null ? base.CreateTimelineContent() : new TimelineBlueprintContainer();
     }
 }

From 027778acc1dff50fcfd04ff116f0b94daf732a25 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 17:51:24 +0900
Subject: [PATCH 00273/10326] Fix slider circles not being selected by default

---
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs | 39 ++++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 9998254f76..a972d28480 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -41,14 +41,15 @@ namespace osu.Game.Rulesets.Edit
         protected SelectionBlueprint(HitObject hitObject)
         {
             HitObject = hitObject;
+
             RelativeSizeAxes = Axes.Both;
+            AlwaysPresent = true;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void LoadComplete()
         {
-            OnDeselected();
-            AlwaysPresent = true;
+            base.LoadComplete();
+            updateState();
         }
 
         private SelectionState state;
@@ -65,23 +66,29 @@ namespace osu.Game.Rulesets.Edit
 
                 state = value;
 
-                switch (state)
-                {
-                    case SelectionState.Selected:
-                        OnSelected();
-                        Selected?.Invoke(this);
-                        break;
-
-                    case SelectionState.NotSelected:
-                        OnDeselected();
-                        Deselected?.Invoke(this);
-                        break;
-                }
+                if (IsLoaded)
+                    updateState();
 
                 StateChanged?.Invoke(state);
             }
         }
 
+        private void updateState()
+        {
+            switch (state)
+            {
+                case SelectionState.Selected:
+                    OnSelected();
+                    Selected?.Invoke(this);
+                    break;
+
+                case SelectionState.NotSelected:
+                    OnDeselected();
+                    Deselected?.Invoke(this);
+                    break;
+            }
+        }
+
         protected virtual void OnDeselected() => Hide();
 
         protected virtual void OnSelected() => Show();

From db4cd51d020cc768d5131d5e1f47456d47cead94 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 24 Jan 2020 12:24:35 +0300
Subject: [PATCH 00274/10326] Implement OverlayColourProvider

---
 osu.Game/Graphics/OsuColour.cs                | 51 -----------
 osu.Game/Overlays/BeatmapSetOverlay.cs        |  1 +
 osu.Game/Overlays/ChangelogOverlay.cs         |  5 ++
 osu.Game/Overlays/DirectOverlay.cs            |  1 +
 osu.Game/Overlays/FullscreenOverlay.cs        | 17 +++-
 osu.Game/Overlays/NewsOverlay.cs              |  5 ++
 osu.Game/Overlays/OverlayColourProvider.cs    | 90 +++++++++++++++++++
 osu.Game/Overlays/RankingsOverlay.cs          |  1 +
 .../SearchableList/SearchableListOverlay.cs   |  8 +-
 osu.Game/Overlays/SocialOverlay.cs            |  1 +
 osu.Game/Overlays/UserProfileOverlay.cs       |  5 ++
 11 files changed, 132 insertions(+), 53 deletions(-)
 create mode 100644 osu.Game/Overlays/OverlayColourProvider.cs

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 53a40f5613..c8298543a1 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Game.Beatmaps;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Graphics
@@ -78,46 +77,6 @@ namespace osu.Game.Graphics
             }
         }
 
-        public Color4 ForOverlayElement(OverlayColourScheme colourScheme, float saturation, float lightness, float opacity = 1) => Color4.FromHsl(new Vector4(getBaseHue(colourScheme), saturation, lightness, opacity));
-
-        // See https://github.com/ppy/osu-web/blob/4218c288292d7c810b619075471eaea8bbb8f9d8/app/helpers.php#L1463
-        private static float getBaseHue(OverlayColourScheme colourScheme)
-        {
-            float hue;
-
-            switch (colourScheme)
-            {
-                default:
-                    throw new ArgumentException($@"{colourScheme} colour scheme does not provide a hue value in {nameof(getBaseHue)}.");
-
-                case OverlayColourScheme.Red:
-                    hue = 0;
-                    break;
-
-                case OverlayColourScheme.Pink:
-                    hue = 333;
-                    break;
-
-                case OverlayColourScheme.Orange:
-                    hue = 46;
-                    break;
-
-                case OverlayColourScheme.Green:
-                    hue = 115;
-                    break;
-
-                case OverlayColourScheme.Purple:
-                    hue = 255;
-                    break;
-
-                case OverlayColourScheme.Blue:
-                    hue = 200;
-                    break;
-            }
-
-            return hue / 360f;
-        }
-
         // 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");
@@ -220,14 +179,4 @@ namespace osu.Game.Graphics
 
         public readonly Color4 ContextMenuGray = FromHex(@"223034");
     }
-
-    public enum OverlayColourScheme
-    {
-        Red,
-        Pink,
-        Orange,
-        Green,
-        Purple,
-        Blue
-    }
 }
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 50fb2782d4..e4e928df18 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Overlays
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         public BeatmapSetOverlay()
+            : base(OverlayColourScheme.Blue)
         {
             OsuScrollContainer scroll;
             Info info;
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 15b0079277..e2186df64c 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -36,6 +36,11 @@ namespace osu.Game.Overlays
 
         private List<APIUpdateStream> streams;
 
+        public ChangelogOverlay()
+            : base(OverlayColourScheme.Purple)
+        {
+        }
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, OsuColour colour)
         {
diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index 9daf55c796..c718ca7a1e 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -84,6 +84,7 @@ namespace osu.Game.Overlays
         }
 
         public DirectOverlay()
+            : base(OverlayColourScheme.Blue)
         {
             // osu!direct colours are not part of the standard palette
 
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 0911ee84de..662188cbfd 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -18,8 +18,12 @@ namespace osu.Game.Overlays
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        protected FullscreenOverlay()
+        private readonly OverlayColourScheme colourScheme;
+
+        protected FullscreenOverlay(OverlayColourScheme colourScheme)
         {
+            this.colourScheme = colourScheme;
+
             Waves.FirstWaveColour = OsuColour.Gray(0.4f);
             Waves.SecondWaveColour = OsuColour.Gray(0.3f);
             Waves.ThirdWaveColour = OsuColour.Gray(0.2f);
@@ -41,6 +45,17 @@ namespace osu.Game.Overlays
             };
         }
 
+        private DependencyContainer dependencies;
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
+            dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            dependencies.Cache(new OverlayColourProvider(colourScheme));
+        }
+
         public override void Show()
         {
             if (State.Value == Visibility.Visible)
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index e7471cb21d..6dde300556 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -21,6 +21,11 @@ namespace osu.Game.Overlays
 
         public readonly Bindable<string> Current = new Bindable<string>(null);
 
+        public NewsOverlay()
+            : base(OverlayColourScheme.Purple)
+        {
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
new file mode 100644
index 0000000000..1223b8d064
--- /dev/null
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -0,0 +1,90 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays
+{
+    public class OverlayColourProvider
+    {
+        private readonly OverlayColourScheme colourScheme;
+
+        public OverlayColourProvider(OverlayColourScheme colourScheme)
+        {
+            this.colourScheme = colourScheme;
+        }
+
+        private Color4 convert(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)
+        {
+            float hue;
+
+            switch (colourScheme)
+            {
+                default:
+                    throw new ArgumentException($@"{colourScheme} colour scheme does not provide a hue value in {nameof(getBaseHue)}.");
+
+                case OverlayColourScheme.Red:
+                    hue = 0;
+                    break;
+
+                case OverlayColourScheme.Pink:
+                    hue = 333;
+                    break;
+
+                case OverlayColourScheme.Orange:
+                    hue = 46;
+                    break;
+
+                case OverlayColourScheme.Green:
+                    hue = 115;
+                    break;
+
+                case OverlayColourScheme.Purple:
+                    hue = 255;
+                    break;
+
+                case OverlayColourScheme.Blue:
+                    hue = 200;
+                    break;
+            }
+
+            return hue / 360f;
+        }
+
+        public Color4 Highlight1 => convert(1, 0.7f);
+        public Color4 Content1 => convert(0.4f, 1);
+        public Color4 Content2 => convert(0.4f, 0.9f);
+        public Color4 Link1 => convert(0.4f, 0.8f);
+        public Color4 Link2 => convert(0.4f, 0.75f);
+        public Color4 Link3 => convert(0.4f, 0.7f);
+        public Color4 Link4 => convert(0.4f, 0.5f);
+        public Color4 Dark1 => convert(0.2f, 0.35f);
+        public Color4 Dark2 => convert(0.2f, 0.3f);
+        public Color4 Dark3 => convert(0.2f, 0.25f);
+        public Color4 Dark4 => convert(0.2f, 0.20f);
+        public Color4 Dark5 => convert(0.2f, 0.15f);
+        public Color4 Dark6 => convert(0.2f, 0.1f);
+        public Color4 Foreground1 => convert(0.1f, 0.6f);
+        public Color4 Background1 => convert(0.1f, 0.4f);
+        public Color4 Background2 => convert(0.1f, 0.3f);
+        public Color4 Background3 => convert(0.1f, 0.25f);
+        public Color4 Background4 => convert(0.1f, 0.2f);
+        public Color4 Background5 => convert(0.1f, 0.15f);
+        public Color4 Background6 => convert(0.1f, 0.1f);
+    }
+
+    public enum OverlayColourScheme
+    {
+        Red,
+        Pink,
+        Orange,
+        Green,
+        Purple,
+        Blue
+    }
+}
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index c8874ef891..2297925e5c 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -36,6 +36,7 @@ namespace osu.Game.Overlays
         private IAPIProvider api { get; set; }
 
         public RankingsOverlay()
+            : base(OverlayColourScheme.Green)
         {
             Children = new Drawable[]
             {
diff --git a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
index 5975e94ffc..0783c64c20 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
@@ -16,6 +16,11 @@ namespace osu.Game.Overlays.SearchableList
     public abstract class SearchableListOverlay : FullscreenOverlay
     {
         public const float WIDTH_PADDING = 80;
+
+        protected SearchableListOverlay(OverlayColourScheme colourScheme)
+            : base(colourScheme)
+        {
+        }
     }
 
     public abstract class SearchableListOverlay<THeader, TTab, TCategory> : SearchableListOverlay
@@ -35,7 +40,8 @@ namespace osu.Game.Overlays.SearchableList
         protected abstract SearchableListHeader<THeader> CreateHeader();
         protected abstract SearchableListFilterControl<TTab, TCategory> CreateFilterControl();
 
-        protected SearchableListOverlay()
+        protected SearchableListOverlay(OverlayColourScheme colourScheme)
+            : base(colourScheme)
         {
             Children = new Drawable[]
             {
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index 0c99962def..27bef7145b 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Overlays
         }
 
         public SocialOverlay()
+            : base(OverlayColourScheme.Pink)
         {
             Waves.FirstWaveColour = OsuColour.FromHex(@"cb5fa0");
             Waves.SecondWaveColour = OsuColour.FromHex(@"b04384");
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index a34fc619a8..07c0dbed43 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -29,6 +29,11 @@ namespace osu.Game.Overlays
 
         public const float CONTENT_X_MARGIN = 70;
 
+        public UserProfileOverlay()
+            : base(OverlayColourScheme.Green)
+        {
+        }
+
         public void ShowUser(long userId) => ShowUser(new User { Id = userId });
 
         public void ShowUser(User user, bool fetchOnline = true)

From e03a085d7071228941d0f1f20fd90d57806fc32c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 24 Jan 2020 12:33:34 +0300
Subject: [PATCH 00275/10326] Make overlay elements use OverlayColourProvider

---
 .../Overlays/BreadcrumbControlOverlayHeader.cs     | 10 ++--------
 osu.Game/Overlays/Changelog/ChangelogHeader.cs     |  2 --
 osu.Game/Overlays/News/NewsHeader.cs               |  1 -
 osu.Game/Overlays/OverlayColourProvider.cs         |  2 +-
 osu.Game/Overlays/OverlayHeader.cs                 | 14 +++++---------
 osu.Game/Overlays/Profile/ProfileHeader.cs         |  1 -
 osu.Game/Overlays/TabControlOverlayHeader.cs       |  9 ++-------
 7 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
index 2e50c19729..c3f35b4313 100644
--- a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
+++ b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays
@@ -15,15 +14,10 @@ namespace osu.Game.Overlays
 
         protected override TabControl<string> CreateTabControl() => BreadcrumbControl = new OverlayHeaderBreadcrumbControl();
 
-        protected BreadcrumbControlOverlayHeader(OverlayColourScheme colourScheme)
-            : base(colourScheme)
-        {
-        }
-
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            BreadcrumbControl.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.75f);
+            BreadcrumbControl.AccentColour = colourProvider.Highlight1;
         }
 
         public class OverlayHeaderBreadcrumbControl : BreadcrumbControl<string>
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index d5e0890b4d..70a45f2667 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
 
@@ -26,7 +25,6 @@ namespace osu.Game.Overlays.Changelog
         private const string listing_string = "listing";
 
         public ChangelogHeader()
-            : base(OverlayColourScheme.Purple)
         {
             BreadcrumbControl.AddItem(listing_string);
             BreadcrumbControl.Current.ValueChanged += e =>
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index 03dc64b3bd..457c5a19ba 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Overlays.News
         public Action ShowFrontPage;
 
         public NewsHeader()
-            : base(OverlayColourScheme.Purple)
         {
             BreadcrumbControl.AddItem(front_page_string);
 
diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index 1223b8d064..e92a231bc1 100644
--- a/osu.Game/Overlays/OverlayColourProvider.cs
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Overlays
         public Color4 Dark1 => convert(0.2f, 0.35f);
         public Color4 Dark2 => convert(0.2f, 0.3f);
         public Color4 Dark3 => convert(0.2f, 0.25f);
-        public Color4 Dark4 => convert(0.2f, 0.20f);
+        public Color4 Dark4 => convert(0.2f, 0.2f);
         public Color4 Dark5 => convert(0.2f, 0.15f);
         public Color4 Dark6 => convert(0.2f, 0.1f);
         public Color4 Foreground1 => convert(0.1f, 0.6f);
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index c9547bb5b8..2578f6a3bd 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -25,12 +25,8 @@ namespace osu.Game.Overlays
             set => background.Height = value;
         }
 
-        protected OverlayColourScheme ColourScheme { get; }
-
-        protected OverlayHeader(OverlayColourScheme colourScheme)
+        protected OverlayHeader()
         {
-            ColourScheme = colourScheme;
-
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
@@ -89,11 +85,11 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            titleBackground.Colour = colours.ForOverlayElement(ColourScheme, 0.2f, 0.15f);
-            title.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.7f);
-            controlBackground.Colour = colours.ForOverlayElement(ColourScheme, 0.2f, 0.2f);
+            titleBackground.Colour = colourProvider.Dark5;
+            title.AccentColour = colourProvider.Highlight1;
+            controlBackground.Colour = colourProvider.Dark4;
         }
 
         protected abstract Drawable CreateBackground();
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index b550d7d823..f8eb03770a 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -24,7 +24,6 @@ namespace osu.Game.Overlays.Profile
         private DetailHeaderContainer detailHeaderContainer;
 
         public ProfileHeader()
-            : base(OverlayColourScheme.Green)
         {
             BackgroundHeight = 150;
 
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index 8f3aa896ee..0c55b8383b 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -16,15 +16,10 @@ namespace osu.Game.Overlays
 
         protected override TabControl<string> CreateTabControl() => TabControl = new OverlayHeaderTabControl();
 
-        protected TabControlOverlayHeader(OverlayColourScheme colourScheme)
-            : base(colourScheme)
-        {
-        }
-
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            TabControl.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.75f);
+            TabControl.AccentColour = colourProvider.Highlight1;
         }
 
         public class OverlayHeaderTabControl : OverlayTabControl<string>

From 59ff3aa800648663d6c30a7db6632380866d9290 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 24 Jan 2020 12:42:48 +0300
Subject: [PATCH 00276/10326] Fix tests

---
 osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs | 1 +
 osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
index fe8437be17..e60adcee34 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Tests.Visual.Online
         private class TestFullscreenOverlay : FullscreenOverlay
         {
             public TestFullscreenOverlay()
+                : base(OverlayColourScheme.Pink)
             {
                 Children = new Drawable[]
                 {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
index 63b46c991f..f825e4f1e9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
@@ -31,6 +31,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(ProfileHeaderButton)
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
         [Resolved]
         private IAPIProvider api { get; set; }
 

From d9af43da4c231e21f03ddadd2a541aa3d1a55132 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 24 Jan 2020 12:55:51 +0300
Subject: [PATCH 00277/10326] Remove unused usings

---
 osu.Game/Overlays/News/NewsHeader.cs | 1 -
 osu.Game/Overlays/OverlayHeader.cs   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index 457c5a19ba..1152d9044b 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using System;
 
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index 2578f6a3bd..bc58a17401 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -7,7 +7,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.UserInterface;
 using osuTK.Graphics;
 

From 9e0e7be8d09b2c8d449a7ebb138e8c4e90a8c6bb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 18:57:17 +0900
Subject: [PATCH 00278/10326] Modernise filter implementation

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs |  2 +-
 osu.Game/Screens/Select/FilterControl.cs            | 10 +++++++---
 osu.Game/Screens/Select/FilterCriteria.cs           |  3 +--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index d50154485a..2ffb73f226 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Select.Carousel
             match &= !criteria.Artist.HasFilter || criteria.Artist.Matches(Beatmap.Metadata.Artist) ||
                      criteria.Artist.Matches(Beatmap.Metadata.ArtistUnicode);
 
-            match &= Beatmap.StarDifficulty >= criteria.DisplayStarsMinimum && Beatmap.StarDifficulty <= criteria.DisplayStarsMaximum;
+            match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(Beatmap.StarDifficulty);
 
             if (match)
             {
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 88a48a54fc..c851b201d7 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -42,11 +42,15 @@ namespace osu.Game.Screens.Select
                 Group = groupMode.Value,
                 Sort = sortMode.Value,
                 AllowConvertedBeatmaps = showConverted.Value,
-                Ruleset = ruleset.Value
-                DisplayStarsMinimum = minimumStars,
-                DisplayStarsMaximum = maximumStars,
+                Ruleset = ruleset.Value,
             };
 
+            if (!minimumStars.IsDefault)
+                criteria.UserStarDifficulty.Min = minimumStars.Value;
+
+            if (!maximumStars.IsDefault)
+                criteria.UserStarDifficulty.Max = maximumStars.Value;
+
             FilterQueryParser.ApplyQueries(criteria, query);
             return criteria;
         }
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index fb41c1d09a..27d9adc386 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -25,13 +25,12 @@ namespace osu.Game.Screens.Select
         public OptionalRange<BeatmapSetOnlineStatus> OnlineStatus;
         public OptionalTextFilter Creator;
         public OptionalTextFilter Artist;
+        public OptionalRange<double> UserStarDifficulty;
 
         public string[] SearchTerms = Array.Empty<string>();
 
         public RulesetInfo Ruleset;
         public bool AllowConvertedBeatmaps;
-        public double DisplayStarsMinimum;
-        public double DisplayStarsMaximum;
 
         private string searchText;
 

From 62fa619ad43fc9161f9a733ff2a9d6d057817b75 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 19:08:14 +0900
Subject: [PATCH 00279/10326] Display "no limit" for maximum stars

---
 .../Settings/Sections/Gameplay/SongSelectSettings.cs       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
index a5f56ae76e..78f12c0695 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     KeyboardStep = 0.1f,
                     Keywords = new[] { "star", "difficulty" }
                 },
-                new SettingsSlider<double, StarSlider>
+                new SettingsSlider<double, MaximumStarsSlider>
                 {
                     LabelText = "up to",
                     Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum),
@@ -49,6 +49,11 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
             };
         }
 
+        private class MaximumStarsSlider : StarSlider
+        {
+            public override string TooltipText => Current.IsDefault ? "no limit" : base.TooltipText;
+        }
+
         private class StarSlider : OsuSliderBar<double>
         {
             public override string TooltipText => Current.Value.ToString(@"0.## stars");

From 2643b6fca3b1d3695bcb53731c81b9cc4dfb2e73 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 19:12:48 +0900
Subject: [PATCH 00280/10326] Add additional keywods

---
 .../Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
index 78f12c0695..b01aa1e297 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
@@ -32,14 +32,14 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Display beatmaps from",
                     Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum),
                     KeyboardStep = 0.1f,
-                    Keywords = new[] { "star", "difficulty" }
+                    Keywords = new[] { "minimum", "star", "difficulty" }
                 },
                 new SettingsSlider<double, MaximumStarsSlider>
                 {
                     LabelText = "up to",
                     Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum),
                     KeyboardStep = 0.1f,
-                    Keywords = new[] { "star", "difficulty" }
+                    Keywords = new[] { "maximum", "star", "difficulty" }
                 },
                 new SettingsEnumDropdown<RandomSelectAlgorithm>
                 {

From ed66ee3ba6904beb011a885e3266dd47f6d81aae Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 19:12:56 +0900
Subject: [PATCH 00281/10326] Allow 10.0 stars to be selectable

---
 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 7e4ab58e36..4155381790 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.ShowConvertedBeatmaps, true);
             Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);
-            Set(OsuSetting.DisplayStarsMaximum, 10.0, 0, 10, 0.1);
+            Set(OsuSetting.DisplayStarsMaximum, 10.1, 0, 10.1, 0.1);
 
             Set(OsuSetting.SongSelectGroupingMode, GroupMode.All);
             Set(OsuSetting.SongSelectSortingMode, SortMode.Title);

From 45a25214ab401b73c5f55e8aa6aefa614fe8c8db Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 19:39:21 +0900
Subject: [PATCH 00282/10326] Make upper and lower bounds inclusive

---
 osu.Game/Screens/Select/FilterCriteria.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 27d9adc386..9fa57af01d 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -25,7 +25,12 @@ namespace osu.Game.Screens.Select
         public OptionalRange<BeatmapSetOnlineStatus> OnlineStatus;
         public OptionalTextFilter Creator;
         public OptionalTextFilter Artist;
-        public OptionalRange<double> UserStarDifficulty;
+
+        public OptionalRange<double> UserStarDifficulty = new OptionalRange<double>
+        {
+            IsLowerInclusive = true,
+            IsUpperInclusive = true
+        };
 
         public string[] SearchTerms = Array.Empty<string>();
 

From bb390b4470df1e5c6536da9740edc6698bfd2354 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 19:40:20 +0900
Subject: [PATCH 00283/10326] Add test

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 132b104afb..71ae47dc66 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -437,6 +437,53 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selection was random", () => eagerSelectedIDs.Count > 1);
         }
 
+        [Test]
+        public void TestFilteringByUserStarDifficulty()
+        {
+            BeatmapSetInfo set = null;
+
+            loadBeatmaps(new List<BeatmapSetInfo>());
+
+            AddStep("add mixed difficulty set", () =>
+            {
+                set = createTestBeatmapSet(1);
+                set.Beatmaps.Clear();
+
+                for (int i = 1; i <= 15; i++)
+                {
+                    set.Beatmaps.Add(new BeatmapInfo
+                    {
+                        Version = $"Stars: {i}",
+                        StarDifficulty = i,
+                    });
+                }
+
+                carousel.UpdateBeatmapSet(set);
+            });
+
+            AddStep("select added set", () => carousel.SelectBeatmap(set.Beatmaps[0], false));
+
+            AddStep("filter [5..]", () => carousel.Filter(new FilterCriteria { UserStarDifficulty = { Min = 5 } }));
+            AddUntilStep("Wait for debounce", () => !carousel.PendingFilterTask);
+            checkVisibleItemCount(true, 11);
+
+            AddStep("filter to [0..7]", () => carousel.Filter(new FilterCriteria { UserStarDifficulty = { Max = 7 } }));
+            AddUntilStep("Wait for debounce", () => !carousel.PendingFilterTask);
+            checkVisibleItemCount(true, 7);
+
+            AddStep("filter to [5..7]", () => carousel.Filter(new FilterCriteria { UserStarDifficulty = { Min = 5, Max = 7 } }));
+            AddUntilStep("Wait for debounce", () => !carousel.PendingFilterTask);
+            checkVisibleItemCount(true, 3);
+
+            AddStep("filter [2..2]", () => carousel.Filter(new FilterCriteria { UserStarDifficulty = { Min = 2, Max = 2 } }));
+            AddUntilStep("Wait for debounce", () => !carousel.PendingFilterTask);
+            checkVisibleItemCount(true, 1);
+
+            AddStep("filter to [0..]", () => carousel.Filter(new FilterCriteria { UserStarDifficulty = { Min = 0 } }));
+            AddUntilStep("Wait for debounce", () => !carousel.PendingFilterTask);
+            checkVisibleItemCount(true, 15);
+        }
+
         private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null)
         {
             createCarousel();

From 75d0fd0bab1ca0a00308bca0f459cb242024ed37 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 19:43:23 +0900
Subject: [PATCH 00284/10326] Rename class

---
 .../Settings/Sections/Gameplay/SongSelectSettings.cs        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
index b01aa1e297..de67d55184 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Show converted beatmaps",
                     Bindable = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
                 },
-                new SettingsSlider<double, StarSlider>
+                new SettingsSlider<double, StarsSlider>
                 {
                     LabelText = "Display beatmaps from",
                     Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum),
@@ -49,12 +49,12 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
             };
         }
 
-        private class MaximumStarsSlider : StarSlider
+        private class MaximumStarsSlider : StarsSlider
         {
             public override string TooltipText => Current.IsDefault ? "no limit" : base.TooltipText;
         }
 
-        private class StarSlider : OsuSliderBar<double>
+        private class StarsSlider : OsuSliderBar<double>
         {
             public override string TooltipText => Current.Value.ToString(@"0.## stars");
         }

From d1684a3c92513e7e0af59d3452a98afffaff79aa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jan 2020 19:50:16 +0900
Subject: [PATCH 00285/10326] Duplicate keywords for better UX

---
 .../Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
index de67d55184..e03c247b6c 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
@@ -32,14 +32,14 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Display beatmaps from",
                     Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum),
                     KeyboardStep = 0.1f,
-                    Keywords = new[] { "minimum", "star", "difficulty" }
+                    Keywords = new[] { "minimum", "maximum", "star", "difficulty" }
                 },
                 new SettingsSlider<double, MaximumStarsSlider>
                 {
                     LabelText = "up to",
                     Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum),
                     KeyboardStep = 0.1f,
-                    Keywords = new[] { "maximum", "star", "difficulty" }
+                    Keywords = new[] { "minimum", "maximum", "star", "difficulty" }
                 },
                 new SettingsEnumDropdown<RandomSelectAlgorithm>
                 {

From bc75290655b222d073fc58ea99cd2525dfb72656 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 25 Jan 2020 00:11:20 +0900
Subject: [PATCH 00286/10326] Ensure min and max stars are correctly ordered

---
 .../Settings/Sections/Gameplay/SongSelectSettings.cs  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
index e03c247b6c..0c42247993 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
@@ -10,11 +12,20 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
 {
     public class SongSelectSettings : SettingsSubsection
     {
+        private Bindable<double> minStars;
+        private Bindable<double> maxStars;
+
         protected override string Header => "Song Select";
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
+            minStars = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum);
+            maxStars = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum);
+
+            minStars.ValueChanged += min => maxStars.Value = Math.Max(min.NewValue, maxStars.Value);
+            maxStars.ValueChanged += max => minStars.Value = Math.Min(max.NewValue, minStars.Value);
+
             Children = new Drawable[]
             {
                 new SettingsCheckbox

From 219e14baa2e0f7a9a63be5a78f418c5e826d6c71 Mon Sep 17 00:00:00 2001
From: Berkan Diler <b.diler@gmx.de>
Date: Fri, 24 Jan 2020 17:05:27 +0100
Subject: [PATCH 00287/10326] Address review and fix InspectCode

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs    | 6 ++----
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 965fcc03a3..009da0656b 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -300,13 +300,11 @@ namespace osu.Game.Beatmaps.Formats
             switch (type)
             {
                 case LegacyEventType.Background:
-                    string bgFilename = split[2];
-                    beatmap.BeatmapInfo.Metadata.BackgroundFile = CleanFilename(bgFilename);
+                    beatmap.BeatmapInfo.Metadata.BackgroundFile = CleanFilename(split[2]);
                     break;
 
                 case LegacyEventType.Video:
-                    string videoFilename = split[2];
-                    beatmap.BeatmapInfo.Metadata.VideoFile = CleanFilename(videoFilename);
+                    beatmap.BeatmapInfo.Metadata.VideoFile = CleanFilename(split[2]);
                     break;
 
                 case LegacyEventType.Break:
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index a7d0360f0d..9ba4d7b05e 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -71,6 +71,7 @@ namespace osu.Game.Beatmaps.Formats
                 lineSpan = lineSpan.Slice(1);
                 ++depth;
             }
+
             line = line.Substring(depth);
 
             decodeVariables(ref line);

From fa595e07a65907e66cb2e37b31c7e76ab5cb62f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 25 Jan 2020 12:44:48 +0900
Subject: [PATCH 00288/10326] 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 2ccba60424..5497a82a7a 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.122.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.125.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9b431e6425..0ea558bbc7 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.122.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.125.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 4dc7403553..a215bc65e8 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.122.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.125.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.122.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.125.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 73e822e08db765e1a3fbc1f1fdea8bab88d029df Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 25 Jan 2020 06:46:54 +0300
Subject: [PATCH 00289/10326] Make waves colour dependent on overlay colour
 scheme

---
 osu.Game/Overlays/ChangelogOverlay.cs  |  5 -----
 osu.Game/Overlays/DirectOverlay.cs     |  7 -------
 osu.Game/Overlays/FullscreenOverlay.cs | 14 +++++++-------
 osu.Game/Overlays/RankingsOverlay.cs   | 15 ++-------------
 osu.Game/Overlays/SocialOverlay.cs     |  5 -----
 5 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index e2186df64c..412e29735a 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -44,11 +44,6 @@ namespace osu.Game.Overlays
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, OsuColour colour)
         {
-            Waves.FirstWaveColour = colour.GreyVioletLight;
-            Waves.SecondWaveColour = colour.GreyViolet;
-            Waves.ThirdWaveColour = colour.GreyVioletDark;
-            Waves.FourthWaveColour = colour.GreyVioletDarker;
-
             Children = new Drawable[]
             {
                 new Box
diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index c718ca7a1e..e4cef319fe 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -86,13 +86,6 @@ namespace osu.Game.Overlays
         public DirectOverlay()
             : base(OverlayColourScheme.Blue)
         {
-            // osu!direct colours are not part of the standard palette
-
-            Waves.FirstWaveColour = OsuColour.FromHex(@"19b0e2");
-            Waves.SecondWaveColour = OsuColour.FromHex(@"2280a2");
-            Waves.ThirdWaveColour = OsuColour.FromHex(@"005774");
-            Waves.FourthWaveColour = OsuColour.FromHex(@"003a4e");
-
             ScrollFlow.Children = new Drawable[]
             {
                 resultCountsContainer = new FillFlowContainer
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 662188cbfd..c391947ccb 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -6,7 +6,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
 using osuTK.Graphics;
@@ -24,11 +23,6 @@ namespace osu.Game.Overlays
         {
             this.colourScheme = colourScheme;
 
-            Waves.FirstWaveColour = OsuColour.Gray(0.4f);
-            Waves.SecondWaveColour = OsuColour.Gray(0.3f);
-            Waves.ThirdWaveColour = OsuColour.Gray(0.2f);
-            Waves.FourthWaveColour = OsuColour.Gray(0.1f);
-
             RelativeSizeAxes = Axes.Both;
             RelativePositionAxes = Axes.Both;
             Width = 0.85f;
@@ -53,7 +47,13 @@ namespace osu.Game.Overlays
         [BackgroundDependencyLoader]
         private void load()
         {
-            dependencies.Cache(new OverlayColourProvider(colourScheme));
+            OverlayColourProvider colourProvider;
+            dependencies.Cache(colourProvider = new OverlayColourProvider(colourScheme));
+
+            Waves.FirstWaveColour = colourProvider.Highlight1;
+            Waves.SecondWaveColour = colourProvider.Link4;
+            Waves.ThirdWaveColour = colourProvider.Dark3;
+            Waves.FourthWaveColour = colourProvider.Dark1;
         }
 
         public override void Show()
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 2297925e5c..1ab18b8c15 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -25,7 +25,6 @@ namespace osu.Game.Overlays
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
         private readonly BasicScrollContainer scrollFlow;
-        private readonly Box background;
         private readonly Container tableContainer;
         private readonly DimmedLoadingLayer loading;
 
@@ -40,9 +39,10 @@ namespace osu.Game.Overlays
         {
             Children = new Drawable[]
             {
-                background = new Box
+                new Box
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Colour = OsuColour.Gray(0.1f),
                 },
                 scrollFlow = new BasicScrollContainer
                 {
@@ -86,17 +86,6 @@ namespace osu.Game.Overlays
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colour)
-        {
-            Waves.FirstWaveColour = colour.Green;
-            Waves.SecondWaveColour = colour.GreenLight;
-            Waves.ThirdWaveColour = colour.GreenDark;
-            Waves.FourthWaveColour = colour.GreenDarker;
-
-            background.Colour = OsuColour.Gray(0.1f);
-        }
-
         protected override void LoadComplete()
         {
             Country.BindValueChanged(_ =>
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index 27bef7145b..9a523bc1bc 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -54,11 +54,6 @@ namespace osu.Game.Overlays
         public SocialOverlay()
             : base(OverlayColourScheme.Pink)
         {
-            Waves.FirstWaveColour = OsuColour.FromHex(@"cb5fa0");
-            Waves.SecondWaveColour = OsuColour.FromHex(@"b04384");
-            Waves.ThirdWaveColour = OsuColour.FromHex(@"9b2b6e");
-            Waves.FourthWaveColour = OsuColour.FromHex(@"6d214d");
-
             Add(loading = new LoadingAnimation());
 
             Filter.Search.Current.ValueChanged += text =>

From 9a960a60e37fe69cb6140ca9fdb78f949b077b8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 25 Jan 2020 17:08:24 +0900
Subject: [PATCH 00290/10326] Remove build target from Fastfile

---
 fastlane/Fastfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 28a83fbbae..510b53054b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -111,7 +111,6 @@ platform :ios do
 
     souyuz(
       platform: "ios",
-      build_target: "osu_iOS",
       plist_path: "../osu.iOS/Info.plist"
     )
   end

From 8aec9e450089d874caf812153c7dd7025621018a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 25 Jan 2020 11:41:26 +0300
Subject: [PATCH 00291/10326] Fix NullReferenceException on main menu for
 mobile game hsots

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

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index b03febce31..cb5ceefb0f 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Screens.Menu
                     Origin = Anchor.TopRight,
                     Margin = new MarginPadding { Right = 15, Top = 5 }
                 },
-                exitConfirmOverlay.CreateProxy()
+                exitConfirmOverlay?.CreateProxy() ?? Drawable.Empty()
             });
 
             buttons.StateChanged += state =>

From d2a032ca8d84453fc35cf54123dfda7dd8070c39 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sat, 25 Jan 2020 22:16:21 +0100
Subject: [PATCH 00292/10326] Move reverse-order comparer to ChannelTabControl

---
 osu.Game/Graphics/UserInterface/OsuTabControl.cs | 14 --------------
 osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 6a7998d5fb..1bfbee4a60 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -10,7 +10,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 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.Framework.Graphics.UserInterface;
@@ -84,14 +83,6 @@ namespace osu.Game.Graphics.UserInterface
             set => strip.Colour = value;
         }
 
-        protected override TabFillFlowContainer CreateTabFlow() => new OsuTabFillFlowContainer
-        {
-            Direction = FillDirection.Full,
-            RelativeSizeAxes = Axes.Both,
-            Depth = -1,
-            Masking = true
-        };
-
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
@@ -283,10 +274,5 @@ namespace osu.Game.Graphics.UserInterface
                 }
             }
         }
-
-        private class OsuTabFillFlowContainer : TabFillFlowContainer
-        {
-            protected override int Compare(Drawable x, Drawable y) => CompareReverseChildID(x, y);
-        }
     }
 }
diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
index 2e4d8ce729..104495ae01 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
@@ -9,6 +9,7 @@ using osuTK;
 using System;
 using System.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Overlays.Chat.Tabs
 {
@@ -113,5 +114,18 @@ namespace osu.Game.Overlays.Chat.Tabs
 
             OnRequestLeave?.Invoke(tab.Value);
         }
+
+        protected override TabFillFlowContainer CreateTabFlow() => new ChannelTabFillFlowContainer
+        {
+            Direction = FillDirection.Full,
+            RelativeSizeAxes = Axes.Both,
+            Depth = -1,
+            Masking = true
+        };
+
+        private class ChannelTabFillFlowContainer : TabFillFlowContainer
+        {
+            protected override int Compare(Drawable x, Drawable y) => CompareReverseChildID(x, y);
+        }
     }
 }

From eabb5a870175e6f59fb86b9039c7a77d6cd832ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 26 Jan 2020 17:40:38 +0900
Subject: [PATCH 00293/10326] Use ToString instead of Substring

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

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 9ba4d7b05e..35576e0f33 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Beatmaps.Formats
                 ++depth;
             }
 
-            line = line.Substring(depth);
+            line = lineSpan.ToString();
 
             decodeVariables(ref line);
 

From bd7c137394e5f2f7c4377d575b83b6df8f09f43e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 26 Jan 2020 18:31:01 +0900
Subject: [PATCH 00294/10326] Remap osu!mania dual stage key bindings to be
 more ergonomic

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 02c2158383..b7b523a94d 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -237,19 +237,19 @@ namespace osu.Game.Rulesets.Mania
                     {
                         LeftKeys = new[]
                         {
-                            InputKey.Number1,
-                            InputKey.Number2,
-                            InputKey.Number3,
-                            InputKey.Number4,
+                            InputKey.Q,
+                            InputKey.W,
+                            InputKey.E,
+                            InputKey.R,
                         },
                         RightKeys = new[]
                         {
-                            InputKey.Z,
                             InputKey.X,
                             InputKey.C,
-                            InputKey.V
+                            InputKey.V,
+                            InputKey.B
                         },
-                        SpecialKey = InputKey.Tilde,
+                        SpecialKey = InputKey.S,
                         SpecialAction = ManiaAction.Special1,
                         NormalActionStart = ManiaAction.Key1
                     }.GenerateKeyBindingsFor(keys, out var nextNormal);
@@ -265,12 +265,12 @@ namespace osu.Game.Rulesets.Mania
                         },
                         RightKeys = new[]
                         {
-                            InputKey.O,
-                            InputKey.P,
-                            InputKey.BracketLeft,
-                            InputKey.BracketRight
+                            InputKey.K,
+                            InputKey.L,
+                            InputKey.Semicolon,
+                            InputKey.Quote
                         },
-                        SpecialKey = InputKey.BackSlash,
+                        SpecialKey = InputKey.I,
                         SpecialAction = ManiaAction.Special2,
                         NormalActionStart = nextNormal
                     }.GenerateKeyBindingsFor(keys, out _);

From 406bc23fdeea4955de909fb4d1cd30371e032ba7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 12:38:20 +0300
Subject: [PATCH 00295/10326] Rename incorrect colours

---
 osu.Game/Overlays/FullscreenOverlay.cs     | 2 +-
 osu.Game/Overlays/OverlayColourProvider.cs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index c391947ccb..8a8a53e042 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Overlays
             dependencies.Cache(colourProvider = new OverlayColourProvider(colourScheme));
 
             Waves.FirstWaveColour = colourProvider.Highlight1;
-            Waves.SecondWaveColour = colourProvider.Link4;
+            Waves.SecondWaveColour = colourProvider.Light4;
             Waves.ThirdWaveColour = colourProvider.Dark3;
             Waves.FourthWaveColour = colourProvider.Dark1;
         }
diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index e92a231bc1..dd756d4b3f 100644
--- a/osu.Game/Overlays/OverlayColourProvider.cs
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -59,10 +59,10 @@ namespace osu.Game.Overlays
         public Color4 Highlight1 => convert(1, 0.7f);
         public Color4 Content1 => convert(0.4f, 1);
         public Color4 Content2 => convert(0.4f, 0.9f);
-        public Color4 Link1 => convert(0.4f, 0.8f);
-        public Color4 Link2 => convert(0.4f, 0.75f);
-        public Color4 Link3 => convert(0.4f, 0.7f);
-        public Color4 Link4 => convert(0.4f, 0.5f);
+        public Color4 Light1 => convert(0.4f, 0.8f);
+        public Color4 Light2 => convert(0.4f, 0.75f);
+        public Color4 Light3 => convert(0.4f, 0.7f);
+        public Color4 Light4 => convert(0.4f, 0.5f);
         public Color4 Dark1 => convert(0.2f, 0.35f);
         public Color4 Dark2 => convert(0.2f, 0.3f);
         public Color4 Dark3 => convert(0.2f, 0.25f);

From 6dee287a82c28a5bdfcc097c9d74f98370b9c691 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 12:39:15 +0300
Subject: [PATCH 00296/10326] Move private methods below public

---
 osu.Game/Overlays/OverlayColourProvider.cs | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index dd756d4b3f..b548522538 100644
--- a/osu.Game/Overlays/OverlayColourProvider.cs
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -16,6 +16,27 @@ namespace osu.Game.Overlays
             this.colourScheme = colourScheme;
         }
 
+        public Color4 Highlight1 => convert(1, 0.7f);
+        public Color4 Content1 => convert(0.4f, 1);
+        public Color4 Content2 => convert(0.4f, 0.9f);
+        public Color4 Light1 => convert(0.4f, 0.8f);
+        public Color4 Light2 => convert(0.4f, 0.75f);
+        public Color4 Light3 => convert(0.4f, 0.7f);
+        public Color4 Light4 => convert(0.4f, 0.5f);
+        public Color4 Dark1 => convert(0.2f, 0.35f);
+        public Color4 Dark2 => convert(0.2f, 0.3f);
+        public Color4 Dark3 => convert(0.2f, 0.25f);
+        public Color4 Dark4 => convert(0.2f, 0.2f);
+        public Color4 Dark5 => convert(0.2f, 0.15f);
+        public Color4 Dark6 => convert(0.2f, 0.1f);
+        public Color4 Foreground1 => convert(0.1f, 0.6f);
+        public Color4 Background1 => convert(0.1f, 0.4f);
+        public Color4 Background2 => convert(0.1f, 0.3f);
+        public Color4 Background3 => convert(0.1f, 0.25f);
+        public Color4 Background4 => convert(0.1f, 0.2f);
+        public Color4 Background5 => convert(0.1f, 0.15f);
+        public Color4 Background6 => convert(0.1f, 0.1f);
+
         private Color4 convert(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
@@ -55,27 +76,6 @@ namespace osu.Game.Overlays
 
             return hue / 360f;
         }
-
-        public Color4 Highlight1 => convert(1, 0.7f);
-        public Color4 Content1 => convert(0.4f, 1);
-        public Color4 Content2 => convert(0.4f, 0.9f);
-        public Color4 Light1 => convert(0.4f, 0.8f);
-        public Color4 Light2 => convert(0.4f, 0.75f);
-        public Color4 Light3 => convert(0.4f, 0.7f);
-        public Color4 Light4 => convert(0.4f, 0.5f);
-        public Color4 Dark1 => convert(0.2f, 0.35f);
-        public Color4 Dark2 => convert(0.2f, 0.3f);
-        public Color4 Dark3 => convert(0.2f, 0.25f);
-        public Color4 Dark4 => convert(0.2f, 0.2f);
-        public Color4 Dark5 => convert(0.2f, 0.15f);
-        public Color4 Dark6 => convert(0.2f, 0.1f);
-        public Color4 Foreground1 => convert(0.1f, 0.6f);
-        public Color4 Background1 => convert(0.1f, 0.4f);
-        public Color4 Background2 => convert(0.1f, 0.3f);
-        public Color4 Background3 => convert(0.1f, 0.25f);
-        public Color4 Background4 => convert(0.1f, 0.2f);
-        public Color4 Background5 => convert(0.1f, 0.15f);
-        public Color4 Background6 => convert(0.1f, 0.1f);
     }
 
     public enum OverlayColourScheme

From 750a4476d8cb91e5984552a53d3f7cccba7de1d1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 12:41:21 +0300
Subject: [PATCH 00297/10326] Simplify getBaseHue function

---
 osu.Game/Overlays/OverlayColourProvider.cs | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index b548522538..1221de480e 100644
--- a/osu.Game/Overlays/OverlayColourProvider.cs
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -42,39 +42,29 @@ namespace osu.Game.Overlays
         // See https://github.com/ppy/osu-web/blob/4218c288292d7c810b619075471eaea8bbb8f9d8/app/helpers.php#L1463
         private static float getBaseHue(OverlayColourScheme colourScheme)
         {
-            float hue;
-
             switch (colourScheme)
             {
                 default:
                     throw new ArgumentException($@"{colourScheme} colour scheme does not provide a hue value in {nameof(getBaseHue)}.");
 
                 case OverlayColourScheme.Red:
-                    hue = 0;
-                    break;
+                    return 0;
 
                 case OverlayColourScheme.Pink:
-                    hue = 333;
-                    break;
+                    return 333 / 360f;
 
                 case OverlayColourScheme.Orange:
-                    hue = 46;
-                    break;
+                    return 46 / 360f;
 
                 case OverlayColourScheme.Green:
-                    hue = 115;
-                    break;
+                    return 115 / 360f;
 
                 case OverlayColourScheme.Purple:
-                    hue = 255;
-                    break;
+                    return 255 / 360f;
 
                 case OverlayColourScheme.Blue:
-                    hue = 200;
-                    break;
+                    return 200 / 360f;
             }
-
-            return hue / 360f;
         }
     }
 

From 8e470678c7d124fab495d4c15be304f598be87aa Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 12:42:23 +0300
Subject: [PATCH 00298/10326] Rename convert() to getColour()

---
 osu.Game/Overlays/OverlayColourProvider.cs | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index 1221de480e..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 => convert(1, 0.7f);
-        public Color4 Content1 => convert(0.4f, 1);
-        public Color4 Content2 => convert(0.4f, 0.9f);
-        public Color4 Light1 => convert(0.4f, 0.8f);
-        public Color4 Light2 => convert(0.4f, 0.75f);
-        public Color4 Light3 => convert(0.4f, 0.7f);
-        public Color4 Light4 => convert(0.4f, 0.5f);
-        public Color4 Dark1 => convert(0.2f, 0.35f);
-        public Color4 Dark2 => convert(0.2f, 0.3f);
-        public Color4 Dark3 => convert(0.2f, 0.25f);
-        public Color4 Dark4 => convert(0.2f, 0.2f);
-        public Color4 Dark5 => convert(0.2f, 0.15f);
-        public Color4 Dark6 => convert(0.2f, 0.1f);
-        public Color4 Foreground1 => convert(0.1f, 0.6f);
-        public Color4 Background1 => convert(0.1f, 0.4f);
-        public Color4 Background2 => convert(0.1f, 0.3f);
-        public Color4 Background3 => convert(0.1f, 0.25f);
-        public Color4 Background4 => convert(0.1f, 0.2f);
-        public Color4 Background5 => convert(0.1f, 0.15f);
-        public Color4 Background6 => convert(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 convert(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 e442e8535bc46fbf5b3d2a51079148d97ec0f7f4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 12:57:19 +0300
Subject: [PATCH 00299/10326] Remake OsuTabControl.AccentColour

---
 .../Graphics/UserInterface/OsuTabControl.cs   | 19 ++++++++++++-------
 osu.Game/Overlays/OverlayTabControl.cs        |  6 +++---
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 9bdd227957..ca623b7775 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -21,19 +21,16 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
-        protected readonly Bindable<Color4> AccentColourBindable = new Bindable<Color4>();
+        private Color4 accentColour;
 
         public Color4 AccentColour
         {
-            get => AccentColourBindable.Value;
+            get => accentColour;
             set
             {
-                AccentColourBindable.Value = value;
+                accentColour = value;
 
-                if (Dropdown is IHasAccentColour dropdown)
-                    dropdown.AccentColour = value;
-                foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
-                    i.AccentColour = value;
+                OnAccentColourChanged(value);
             }
         }
 
@@ -93,6 +90,14 @@ namespace osu.Game.Graphics.UserInterface
                 strip.Width = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 1000), strip.Width, StripWidth, 0, 500, Easing.OutQuint);
         }
 
+        protected virtual void OnAccentColourChanged(Color4 colour)
+        {
+            if (Dropdown is IHasAccentColour dropdown)
+                dropdown.AccentColour = colour;
+            foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
+                i.AccentColour = colour;
+        }
+
         public class OsuTabItem : TabItem<T>, IHasAccentColour
         {
             protected readonly SpriteText Text;
diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index 619729acae..aa79dde13c 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.cs
@@ -36,10 +36,10 @@ namespace osu.Game.Overlays
             });
         }
 
-        protected override void LoadComplete()
+        protected override void OnAccentColourChanged(Color4 colour)
         {
-            base.LoadComplete();
-            AccentColourBindable.BindValueChanged(colour => bar.Colour = colour.NewValue, true);
+            base.OnAccentColourChanged(colour);
+            bar.Colour = colour;
         }
 
         protected override Dropdown<T> CreateDropdown() => null;

From 2d74609f5030b07844fab427bb4f11e7915ebdbd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 26 Jan 2020 19:06:50 +0900
Subject: [PATCH 00300/10326] Fix crash due to misordered selection events

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 4433543ca1..420aa14a99 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -559,6 +559,14 @@ namespace osu.Game.Screens.Select
                 {
                     if (state.NewValue == CarouselItemState.Selected)
                     {
+                        if (!AllowSelection)
+                        {
+                            // CarouselBeatmap may trigger a state change from OnClick, unaware that it is not allowed to.
+                            // we revert this change here to ensure sanity.
+                            c.State.Value = state.OldValue;
+                            return;
+                        }
+
                         selectedBeatmapSet = set;
                         SelectionChanged?.Invoke(c.Beatmap);
 

From 852e622f02056bf296f0b3ae5721c659df0b1d7c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 13:12:35 +0300
Subject: [PATCH 00301/10326] Fix broken BreadcrumbControl

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

diff --git a/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs b/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
index e2438cc4cd..4dfb2769dc 100644
--- a/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
+++ b/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Graphics.UserInterface
                     var tIndex = TabContainer.IndexOf(t);
                     var tabIndex = TabContainer.IndexOf(TabMap[index.NewValue]);
 
-                    t.State = tIndex < tabIndex ? Visibility.Hidden : Visibility.Visible;
-                    t.Chevron.FadeTo(tIndex <= tabIndex ? 0f : 1f, 500, Easing.OutQuint);
+                    t.State = tIndex > tabIndex ? Visibility.Hidden : Visibility.Visible;
+                    t.Chevron.FadeTo(tIndex >= tabIndex ? 0f : 1f, 500, Easing.OutQuint);
                 }
             };
         }

From 1305634c5263a9e628d4cbd0879d246181225aee Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 14:02:05 +0300
Subject: [PATCH 00302/10326] Simplify colour provider caching

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

diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 8a8a53e042..b7e6eb2ff7 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -17,11 +17,12 @@ namespace osu.Game.Overlays
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        private readonly OverlayColourScheme colourScheme;
+        [Cached]
+        private OverlayColourProvider colourProvider;
 
         protected FullscreenOverlay(OverlayColourScheme colourScheme)
         {
-            this.colourScheme = colourScheme;
+            colourProvider = new OverlayColourProvider(colourScheme);
 
             RelativeSizeAxes = Axes.Both;
             RelativePositionAxes = Axes.Both;
@@ -39,17 +40,9 @@ namespace osu.Game.Overlays
             };
         }
 
-        private DependencyContainer dependencies;
-
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
-            dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            OverlayColourProvider colourProvider;
-            dependencies.Cache(colourProvider = new OverlayColourProvider(colourScheme));
-
             Waves.FirstWaveColour = colourProvider.Highlight1;
             Waves.SecondWaveColour = colourProvider.Light4;
             Waves.ThirdWaveColour = colourProvider.Dark3;

From 49c5d5b23d27d188183930920bc3628cdcf43e65 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 14:06:05 +0300
Subject: [PATCH 00303/10326] Make colour provider readonly

---
 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 b7e6eb2ff7..e02f03301b 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 OverlayColourProvider colourProvider;
+        private readonly OverlayColourProvider colourProvider;
 
         protected FullscreenOverlay(OverlayColourScheme colourScheme)
         {

From 97c80529d5ac0abeb848c56af603cc5033d72d45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 26 Jan 2020 21:47:40 +0900
Subject: [PATCH 00304/10326] Adjust wave colours slightly

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

diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index e02f03301b..959f6749d2 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -43,10 +43,10 @@ namespace osu.Game.Overlays
         [BackgroundDependencyLoader]
         private void load()
         {
-            Waves.FirstWaveColour = colourProvider.Highlight1;
-            Waves.SecondWaveColour = colourProvider.Light4;
-            Waves.ThirdWaveColour = colourProvider.Dark3;
-            Waves.FourthWaveColour = colourProvider.Dark1;
+            Waves.FirstWaveColour = colourProvider.Light4;
+            Waves.SecondWaveColour = colourProvider.Light3;
+            Waves.ThirdWaveColour = colourProvider.Dark4;
+            Waves.FourthWaveColour = colourProvider.Dark3;
         }
 
         public override void Show()

From 891f9a9b18c1ff7ff59a6180017fbc46eebe6bf0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 16:49:39 +0300
Subject: [PATCH 00305/10326] Remove unused using

---
 osu.Game/Graphics/UserInterface/OsuTabControl.cs | 2 +-
 osu.Game/Overlays/OverlayHeader.cs               | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index ca623b7775..922535b39e 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            if (AccentColour == default)
+            if (accentColour == default)
                 AccentColour = colours.Blue;
         }
 
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index 509aa175ed..0575f6f296 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -6,7 +6,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.Graphics;
 

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 00306/10326] 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 e54ea92c60c7465f536b7a682eca1b2d1b809a21 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 17:21:22 +0300
Subject: [PATCH 00307/10326] Use virtual property for
 OsuTabControl.AccentColour

---
 osu.Game/Graphics/UserInterface/OsuTabControl.cs | 15 +++++----------
 osu.Game/Overlays/OverlayTabControl.cs           | 12 ++++++------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 922535b39e..9fa6085035 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -23,14 +23,17 @@ namespace osu.Game.Graphics.UserInterface
     {
         private Color4 accentColour;
 
-        public Color4 AccentColour
+        public virtual Color4 AccentColour
         {
             get => accentColour;
             set
             {
                 accentColour = value;
 
-                OnAccentColourChanged(value);
+                if (Dropdown is IHasAccentColour dropdown)
+                    dropdown.AccentColour = value;
+                foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
+                    i.AccentColour = value;
             }
         }
 
@@ -90,14 +93,6 @@ namespace osu.Game.Graphics.UserInterface
                 strip.Width = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 1000), strip.Width, StripWidth, 0, 500, Easing.OutQuint);
         }
 
-        protected virtual void OnAccentColourChanged(Color4 colour)
-        {
-            if (Dropdown is IHasAccentColour dropdown)
-                dropdown.AccentColour = colour;
-            foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
-                i.AccentColour = colour;
-        }
-
         public class OsuTabItem : TabItem<T>, IHasAccentColour
         {
             protected readonly SpriteText Text;
diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index aa79dde13c..30ae6a9e52 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.cs
@@ -22,6 +22,12 @@ namespace osu.Game.Overlays
             set => bar.Height = value;
         }
 
+        public override Color4 AccentColour
+        {
+            get => base.AccentColour;
+            set => base.AccentColour = bar.Colour = value;
+        }
+
         protected OverlayTabControl()
         {
             TabContainer.Masking = false;
@@ -36,12 +42,6 @@ namespace osu.Game.Overlays
             });
         }
 
-        protected override void OnAccentColourChanged(Color4 colour)
-        {
-            base.OnAccentColourChanged(colour);
-            bar.Colour = colour;
-        }
-
         protected override Dropdown<T> CreateDropdown() => null;
 
         protected override TabItem<T> CreateTabItem(T value) => new OverlayTabItem(value);

From 6463a32f58f1a05e31e2610fa014428b2cfa2a66 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 17:42:07 +0300
Subject: [PATCH 00308/10326] Split AccentColour setter in two lines

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

diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index 30ae6a9e52..aa96f0e19b 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.cs
@@ -25,7 +25,11 @@ namespace osu.Game.Overlays
         public override Color4 AccentColour
         {
             get => base.AccentColour;
-            set => base.AccentColour = bar.Colour = value;
+            set
+            {
+                base.AccentColour = value;
+                bar.Colour = value;
+            }
         }
 
         protected OverlayTabControl()

From 7f538cfa747f069fada8354d4999dfc67f51a45a Mon Sep 17 00:00:00 2001
From: unknown <n20gaming2000@gmail.com>
Date: Mon, 27 Jan 2020 07:56:18 +0800
Subject: [PATCH 00309/10326] allow setting initial rate instead of reversing

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 14 ++++++--------
 osu.Game/Rulesets/Mods/ModWindDown.cs | 10 ++++++++++
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 10 ++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index d21990ae91..a9330f9287 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -20,12 +20,12 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         private const double final_rate_progress = 0.75f;
 
+        [SettingSource("Initial rate", "The starting speed of the track")]
+        public abstract BindableNumber<double> InitialRate { get; }
+
         [SettingSource("Final rate", "The final speed to ramp to")]
         public abstract BindableNumber<double> FinalRate { get; }
 
-        [SettingSource("Start wounded", "Start at 100% of the final rate")]
-        public BindableBool Reverse { get; } = new BindableBool();
-
         private double finalRateTime;
         private double beginRampTime;
 
@@ -64,10 +64,7 @@ namespace osu.Game.Rulesets.Mods
 
         public virtual void Update(Playfield playfield)
         {
-            if (!Reverse.Value)
-                applyAdjustment((track.CurrentTime - beginRampTime) / finalRateTime);
-            else
-                applyAdjustment(1 - ((track.CurrentTime - beginRampTime) / finalRateTime));
+            applyAdjustment((track.CurrentTime - beginRampTime) / finalRateTime);
         }
 
         /// <summary>
@@ -75,6 +72,7 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         /// <param name="amount">The amount of adjustment to apply (from 0..1).</param>
         private void applyAdjustment(double amount) =>
-            SpeedChange.Value = 1 + (FinalRate.Value - 1) * Math.Clamp(amount, 0, 1);
+            //  SpeedChange.Value = 1 + (FinalRate.Value - 1) * Math.Clamp(amount, 0, 1);
+            SpeedChange.Value = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index da3bd75b44..939766fee5 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -17,6 +17,16 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleDown;
         public override double ScoreMultiplier => 1.0;
 
+        [SettingSource("Initial rate", "The starting speed of the track")]
+        public override BindableNumber<double> InitialRate { get; } = new BindableDouble
+        {
+            MinValue = 1,
+            MaxValue = 1.5,
+            Default = 1,
+            Value = 1,
+            Precision = 0.01,
+        };
+
         [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 3f456a42a5..74c6fc22d3 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -17,6 +17,16 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleUp;
         public override double ScoreMultiplier => 1.0;
 
+        [SettingSource("Initial rate", "The starting speed of the track")]
+        public override BindableNumber<double> InitialRate { get; } = new BindableDouble
+        {
+            MinValue = 0.5,
+            MaxValue = 1,
+            Default = 1,
+            Value = 1,
+            Precision = 0.01,
+        };
+
         [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {

From a6124ae499eddbe22c799fc8b1de46f74c560f79 Mon Sep 17 00:00:00 2001
From: unknown <n20gaming2000@gmail.com>
Date: Mon, 27 Jan 2020 08:24:15 +0800
Subject: [PATCH 00310/10326] fix typo on ScoreProcessor xmldoc

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

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 8ccc2af93b..8eafaa88ec 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Scoring
         public readonly Bindable<ScoreRank> Rank = new Bindable<ScoreRank>(ScoreRank.X);
 
         /// <summary>
-        /// THe highest combo achieved by this score.
+        /// The highest combo achieved by this score.
         /// </summary>
         public readonly BindableInt HighestCombo = new BindableInt();
 

From 15fd8596c238348c45b5ff367b8d6b5fcfc97f21 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 27 Jan 2020 12:16:00 +0900
Subject: [PATCH 00311/10326] Fix cursor not hiding for screenshots

---
 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 7f20c30048..3ad36577b5 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Graphics
                 {
                     ScheduledDelegate waitDelegate = host.DrawThread.Scheduler.AddDelayed(() =>
                     {
-                        if (framesWaited++ < frames_to_wait)
+                        if (framesWaited++ >= frames_to_wait)
                             // ReSharper disable once AccessToDisposedClosure
                             framesWaitedEvent.Set();
                     }, 10, true);

From 1f0aaabf7b72966c0eb741cd11822bce123a96fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 12:21:17 +0900
Subject: [PATCH 00312/10326] Add tests

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 111 ++++++++++++++++++
 .../Visual/ManualInputManagerTestScene.cs     |   7 +-
 2 files changed, 117 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index eb812f5d5a..81a44f9f8a 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -14,6 +14,7 @@ using osu.Framework.Extensions;
 using osu.Framework.Utils;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Overlays;
@@ -25,6 +26,7 @@ using osu.Game.Rulesets.Taiko;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Carousel;
 using osu.Game.Screens.Select.Filter;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.SongSelect
 {
@@ -95,6 +97,115 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("filter count is 1", () => songSelect.FilterCount == 1);
         }
 
+        [Test]
+        public void TestChangeBeatmapBeforeEnter()
+        {
+            addRulesetImportStep(0);
+
+            createSongSelect();
+
+            WorkingBeatmap selected = null;
+
+            AddStep("store selected beatmap", () => selected = Beatmap.Value);
+
+            AddStep("select next and enter", () =>
+            {
+                InputManager.PressKey(Key.Down);
+                InputManager.ReleaseKey(Key.Down);
+                InputManager.PressKey(Key.Enter);
+                InputManager.ReleaseKey(Key.Enter);
+            });
+
+            AddAssert("ensure selection changed", () => selected != Beatmap.Value);
+
+            AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
+            AddUntilStep("bindable lease returned", () => !Beatmap.Disabled);
+        }
+
+        [Test]
+        public void TestChangeBeatmapAfterEnter()
+        {
+            addRulesetImportStep(0);
+
+            createSongSelect();
+
+            WorkingBeatmap selected = null;
+
+            AddStep("store selected beatmap", () => selected = Beatmap.Value);
+
+            AddStep("select next and enter", () =>
+            {
+                InputManager.PressKey(Key.Enter);
+                InputManager.ReleaseKey(Key.Enter);
+                InputManager.PressKey(Key.Down);
+                InputManager.ReleaseKey(Key.Down);
+            });
+
+            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]
+        public void TestChangeBeatmapViaMouseBeforeEnter()
+        {
+            addRulesetImportStep(0);
+
+            createSongSelect();
+
+            WorkingBeatmap selected = null;
+
+            AddStep("store selected beatmap", () => selected = Beatmap.Value);
+
+            AddStep("select next and enter", () =>
+            {
+                InputManager.MoveMouseTo(songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>()
+                                                   .First(b => ((CarouselBeatmap)b.Item).Beatmap != songSelect.Carousel.SelectedBeatmap));
+
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.ReleaseButton(MouseButton.Left);
+
+                InputManager.PressKey(Key.Enter);
+                InputManager.ReleaseKey(Key.Enter);
+            });
+
+            AddAssert("ensure selection changed", () => selected != Beatmap.Value);
+
+            AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
+            AddUntilStep("bindable lease returned", () => !Beatmap.Disabled);
+        }
+
+        [Test]
+        public void TestChangeBeatmapViaMouseAfterEnter()
+        {
+            addRulesetImportStep(0);
+
+            createSongSelect();
+
+            WorkingBeatmap selected = null;
+
+            AddStep("store selected beatmap", () => selected = Beatmap.Value);
+
+            AddStep("select next and enter", () =>
+            {
+                InputManager.MoveMouseTo(songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>()
+                                                   .First(b => ((CarouselBeatmap)b.Item).Beatmap != songSelect.Carousel.SelectedBeatmap));
+
+                InputManager.PressButton(MouseButton.Left);
+
+                InputManager.PressKey(Key.Enter);
+                InputManager.ReleaseKey(Key.Enter);
+
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            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]
         public void TestNoFilterOnSimpleResume()
         {
diff --git a/osu.Game/Tests/Visual/ManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/ManualInputManagerTestScene.cs
index 86191609a4..a0af07013c 100644
--- a/osu.Game/Tests/Visual/ManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/ManualInputManagerTestScene.cs
@@ -8,6 +8,7 @@ using osu.Framework.Testing.Input;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
 using osuTK;
 using osuTK.Graphics;
 
@@ -30,7 +31,11 @@ namespace osu.Game.Tests.Visual
                 InputManager = new ManualInputManager
                 {
                     UseParentInput = true,
-                    Child = content = new MenuCursorContainer { RelativeSizeAxes = Axes.Both },
+                    Child = new GlobalActionContainer(null)
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Child = content = new MenuCursorContainer { RelativeSizeAxes = Axes.Both }
+                    },
                 },
                 new Container
                 {

From 431b1489b9e859fcb79ea6dfd0709c33fb3d7478 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 27 Jan 2020 13:16:36 +0900
Subject: [PATCH 00313/10326] Add test

---
 .../TestSceneBreadcrumbControl.cs             | 27 +++++++++++++++++--
 .../UserInterface/BreadcrumbControl.cs        |  2 +-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControl.cs
index 19eebc89b6..3967b62c95 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControl.cs
@@ -1,9 +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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
@@ -12,11 +14,11 @@ namespace osu.Game.Tests.Visual.UserInterface
     [TestFixture]
     public class TestSceneBreadcrumbControl : OsuTestScene
     {
-        private readonly BreadcrumbControl<BreadcrumbTab> breadcrumbs;
+        private readonly TestBreadcrumbControl breadcrumbs;
 
         public TestSceneBreadcrumbControl()
         {
-            Add(breadcrumbs = new BreadcrumbControl<BreadcrumbTab>
+            Add(breadcrumbs = new TestBreadcrumbControl
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -25,8 +27,13 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             AddStep(@"first", () => breadcrumbs.Current.Value = BreadcrumbTab.Click);
+            assertVisible(1);
+
             AddStep(@"second", () => breadcrumbs.Current.Value = BreadcrumbTab.The);
+            assertVisible(2);
+
             AddStep(@"third", () => breadcrumbs.Current.Value = BreadcrumbTab.Circles);
+            assertVisible(3);
         }
 
         [BackgroundDependencyLoader]
@@ -35,11 +42,27 @@ namespace osu.Game.Tests.Visual.UserInterface
             breadcrumbs.StripColour = colours.Blue;
         }
 
+        private void assertVisible(int count) => AddAssert($"first {count} item(s) visible", () =>
+        {
+            for (int i = 0; i < count; i++)
+            {
+                if (breadcrumbs.GetDrawable((BreadcrumbTab)i).State != Visibility.Visible)
+                    return false;
+            }
+
+            return true;
+        });
+
         private enum BreadcrumbTab
         {
             Click,
             The,
             Circles,
         }
+
+        private class TestBreadcrumbControl : BreadcrumbControl<BreadcrumbTab>
+        {
+            public BreadcrumbTabItem GetDrawable(BreadcrumbTab tab) => (BreadcrumbTabItem)TabContainer.First(t => t.Value == tab);
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs b/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
index 4dfb2769dc..84429bf5bd 100644
--- a/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
+++ b/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.UserInterface
             };
         }
 
-        protected class BreadcrumbTabItem : OsuTabItem, IStateful<Visibility>
+        public class BreadcrumbTabItem : OsuTabItem, IStateful<Visibility>
         {
             protected virtual float ChevronSize => 10;
 

From 834e82d543074cdfb45480c31d1c83a4d62f727c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 14:50:24 +0900
Subject: [PATCH 00314/10326] Add comprehensive tests for changelog overlay

Includes failing case
---
 .../Online/TestSceneChangelogOverlay.cs       | 57 +++++++++++++------
 osu.Game/Overlays/ChangelogOverlay.cs         | 16 +++---
 osu.sln.DotSettings                           |  1 +
 3 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 658f678b10..7a8570c09b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneChangelogOverlay : OsuTestScene
     {
-        private ChangelogOverlay changelog;
+        private TestChangelogOverlay changelog;
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -29,23 +29,40 @@ namespace osu.Game.Tests.Visual.Online
 
         protected override bool UseOnlineAPI => true;
 
-        protected override void LoadComplete()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
-            base.LoadComplete();
+            Child = changelog = new TestChangelogOverlay();
+        });
 
-            Add(changelog = new ChangelogOverlay());
-            AddStep(@"Show", changelog.Show);
-            AddStep(@"Hide", changelog.Hide);
+        [Test]
+        public void ShowWithNoFetch()
+        {
+            AddStep(@"Show", () => changelog.Show());
+            AddUntilStep(@"wait for streams", () => changelog.Streams?.Count > 0);
+            AddAssert(@"listing displayed", () => changelog.Current.Value == null);
+            AddAssert(@"no stream selected", () => changelog.Header.Streams.Current.Value == null);
+        }
 
-            AddWaitStep("wait for hide", 3);
+        [Test]
+        public void ShowWithListing()
+        {
+            AddStep(@"Show with listing", () => changelog.ShowListing());
+            AddUntilStep(@"wait for streams", () => changelog.Streams?.Count > 0);
+            AddAssert(@"listing displayed", () => changelog.Current.Value == null);
+            AddAssert(@"no stream selected", () => changelog.Header.Streams.Current.Value == null);
+        }
 
+        [Test]
+        public void ShowWithBuild()
+        {
             AddStep(@"Show with Lazer 2018.712.0", () =>
             {
                 changelog.ShowBuild(new APIChangelogBuild
                 {
                     Version = "2018.712.0",
                     DisplayVersion = "2018.712.0",
-                    UpdateStream = new APIUpdateStream { Name = OsuGameBase.CLIENT_STREAM_NAME },
+                    UpdateStream = new APIUpdateStream { Id = 7, Name = OsuGameBase.CLIENT_STREAM_NAME },
                     ChangelogEntries = new List<APIChangelogEntry>
                     {
                         new APIChangelogEntry
@@ -56,19 +73,16 @@ namespace osu.Game.Tests.Visual.Online
                         }
                     }
                 });
-                changelog.Show();
             });
 
-            AddWaitStep("wait for show", 3);
-            AddStep(@"Hide", changelog.Hide);
-            AddWaitStep("wait for hide", 3);
-
-            AddStep(@"Show with listing", () =>
-            {
-                changelog.ShowListing();
-                changelog.Show();
-            });
+            AddUntilStep(@"wait for streams", () => changelog.Streams?.Count > 0);
+            AddAssert(@"correct build displayed", () => changelog.Current.Value.Version == "2018.712.0");
+            AddAssert(@"correct stream selected", () => changelog.Header.Streams.Current.Value.Id == 7);
+        }
 
+        [Test]
+        public void TestHTMLUnescaping()
+        {
             AddStep(@"Ensure HTML string unescaping", () =>
             {
                 changelog.ShowBuild(new APIChangelogBuild
@@ -97,5 +111,12 @@ namespace osu.Game.Tests.Visual.Online
                 });
             });
         }
+
+        private class TestChangelogOverlay : ChangelogOverlay
+        {
+            public new List<APIUpdateStream> Streams => base.Streams;
+
+            public new ChangelogHeader Header => base.Header;
+        }
     }
 }
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 412e29735a..2ce26276d5 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.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;
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays
     {
         public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
 
-        private ChangelogHeader header;
+        protected ChangelogHeader Header;
 
         private Container<ChangelogContent> content;
 
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays
 
         private List<APIChangelogBuild> builds;
 
-        private List<APIUpdateStream> streams;
+        protected List<APIUpdateStream> Streams;
 
         public ChangelogOverlay()
             : base(OverlayColourScheme.Purple)
@@ -62,7 +62,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            header = new ChangelogHeader
+                            Header = new ChangelogHeader
                             {
                                 ListingSelected = ShowListing,
                             },
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays
 
             sampleBack = audio.Samples.Get(@"UI/generic-select-soft");
 
-            header.Current.BindTo(Current);
+            Header.Current.BindTo(Current);
 
             Current.BindValueChanged(e =>
             {
@@ -117,7 +117,7 @@ namespace osu.Game.Overlays
             performAfterFetch(() =>
             {
                 var build = builds.Find(b => b.Version == version && b.UpdateStream.Name == updateStream)
-                            ?? streams.Find(s => s.Name == updateStream)?.LatestBuild;
+                            ?? Streams.Find(s => s.Name == updateStream)?.LatestBuild;
 
                 if (build != null)
                     ShowBuild(build);
@@ -179,9 +179,9 @@ namespace osu.Game.Overlays
                     res.Streams.ForEach(s => s.LatestBuild.UpdateStream = res.Streams.Find(s2 => s2.Id == s.LatestBuild.UpdateStream.Id));
 
                     builds = res.Builds;
-                    streams = res.Streams;
+                    Streams = res.Streams;
 
-                    header.Streams.Populate(res.Streams);
+                    Header.Streams.Populate(res.Streams);
 
                     tcs.SetResult(true);
                 });
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 15ea20084d..6d131bf423 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -298,6 +298,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTML/@EntryIndexedValue">HTML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>

From 292a82ac273f2f2df092aa7b4368e5e7ff9ef5c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 14:52:21 +0900
Subject: [PATCH 00315/10326] Fix incorrect propagation of stream/build on
 initial display with build

---
 .../Overlays/Changelog/ChangelogHeader.cs     | 19 +++++++++++++++++--
 .../Changelog/UpdateStreamBadgeArea.cs        |  2 --
 osu.Game/Overlays/ChangelogOverlay.cs         |  4 ++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 70a45f2667..7755c0f64b 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -37,7 +38,7 @@ namespace osu.Game.Overlays.Changelog
 
             Streams.Current.ValueChanged += e =>
             {
-                if (e.NewValue?.LatestBuild != null && e.NewValue != Current.Value?.UpdateStream)
+                if (e.NewValue?.LatestBuild != null && !e.NewValue.Equals(Current.Value?.UpdateStream))
                     Current.Value = e.NewValue.LatestBuild;
             };
         }
@@ -54,7 +55,7 @@ namespace osu.Game.Overlays.Changelog
                 BreadcrumbControl.AddItem(e.NewValue.ToString());
                 BreadcrumbControl.Current.Value = e.NewValue.ToString();
 
-                Streams.Current.Value = Streams.Items.FirstOrDefault(s => s.Name == e.NewValue.UpdateStream.Name);
+                updateCurrentStream();
 
                 title.Version = e.NewValue.UpdateStream.DisplayName;
             }
@@ -80,6 +81,20 @@ namespace osu.Game.Overlays.Changelog
 
         protected override ScreenTitle CreateTitle() => title = new ChangelogHeaderTitle();
 
+        public void Populate(List<APIUpdateStream> streams)
+        {
+            Streams.Populate(streams);
+            updateCurrentStream();
+        }
+
+        private void updateCurrentStream()
+        {
+            if (Current.Value == null)
+                return;
+
+            Streams.Current.Value = Streams.Items.FirstOrDefault(s => s.Name == Current.Value.UpdateStream.Name);
+        }
+
         public class HeaderBackground : Sprite
         {
             public HeaderBackground()
diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
index 2b48811bd6..ca57ba24e2 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
@@ -29,8 +29,6 @@ namespace osu.Game.Overlays.Changelog
 
         public void Populate(List<APIUpdateStream> streams)
         {
-            Current.Value = null;
-
             foreach (APIUpdateStream updateStream in streams)
                 AddItem(updateStream);
         }
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 2ce26276d5..90ba206077 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.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;
@@ -181,7 +181,7 @@ namespace osu.Game.Overlays
                     builds = res.Builds;
                     Streams = res.Streams;
 
-                    Header.Streams.Populate(res.Streams);
+                    Header.Populate(res.Streams);
 
                     tcs.SetResult(true);
                 });

From 1c64b70b0674f270cef8aa25d3a28615f8373518 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 26 Jan 2020 19:06:50 +0900
Subject: [PATCH 00316/10326] Revert "Fix crash due to misordered selection
 events"

This reverts commit 2d74609f5030b07844fab427bb4f11e7915ebdbd.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 420aa14a99..4433543ca1 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -559,14 +559,6 @@ namespace osu.Game.Screens.Select
                 {
                     if (state.NewValue == CarouselItemState.Selected)
                     {
-                        if (!AllowSelection)
-                        {
-                            // CarouselBeatmap may trigger a state change from OnClick, unaware that it is not allowed to.
-                            // we revert this change here to ensure sanity.
-                            c.State.Value = state.OldValue;
-                            return;
-                        }
-
                         selectedBeatmapSet = set;
                         SelectionChanged?.Invoke(c.Beatmap);
 

From 7aa5e8c23eec292b2f3b7d669203ca639d2478e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 14:55:47 +0900
Subject: [PATCH 00317/10326] Limit input propagation correctly

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 4433543ca1..2bb5ba612e 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -56,6 +56,9 @@ namespace osu.Game.Screens.Select
         public override bool HandleNonPositionalInput => AllowSelection;
         public override bool HandlePositionalInput => AllowSelection;
 
+        public override bool PropagatePositionalInputSubTree => AllowSelection;
+        public override bool PropagateNonPositionalInputSubTree => AllowSelection;
+
         /// <summary>
         /// Whether carousel items have completed asynchronously loaded.
         /// </summary>
@@ -449,8 +452,6 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
-        protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => ReceivePositionalInputAt(screenSpacePos);
-
         protected override void Update()
         {
             base.Update();

From 5609c92aafa89a99ff79943c4dd2481c421897f0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2020 07:50:21 +0000
Subject: [PATCH 00318/10326] Bump DiscordRichPresence from 1.0.121 to 1.0.147

Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.121 to 1.0.147.
- [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 da47ad8223..b9294088f4 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.121" />
+    <PackageReference Include="DiscordRichPresence" Version="1.0.147" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />

From 508b92e611c3c20ffa4a7bbdecd64b2f3db42586 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 15:57:55 +0900
Subject: [PATCH 00319/10326] Update beat divisor colours to be more
 distinguishable

Close to osu-stable
---
 osu.Game/Screens/Edit/BindableBeatDivisor.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/BindableBeatDivisor.cs b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
index ce95d81f54..e8f7c75cc1 100644
--- a/osu.Game/Screens/Edit/BindableBeatDivisor.cs
+++ b/osu.Game/Screens/Edit/BindableBeatDivisor.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;
@@ -52,29 +52,32 @@ namespace osu.Game.Screens.Edit
         {
             switch (beatDivisor)
             {
+                case 1:
+                    return Color4.White;
+
                 case 2:
-                    return colours.BlueLight;
+                    return colours.Red;
 
                 case 4:
                     return colours.Blue;
 
                 case 8:
-                    return colours.BlueDarker;
+                    return colours.Yellow;
 
                 case 16:
                     return colours.PurpleDark;
 
                 case 3:
-                    return colours.YellowLight;
+                    return colours.Purple;
 
                 case 6:
-                    return colours.Yellow;
+                    return colours.YellowDark;
 
                 case 12:
                     return colours.YellowDarker;
 
                 default:
-                    return Color4.White;
+                    return Color4.Red;
             }
         }
     }

From df665c3a3cd98744c5381282c124148b60d83cdc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 16:00:51 +0900
Subject: [PATCH 00320/10326] Move beat index colour retrieval to static
 function

---
 osu.Game/Screens/Edit/BindableBeatDivisor.cs  | 23 ++++++++++++++++++-
 .../Compose/Components/DistanceSnapGrid.cs    | 14 +----------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Edit/BindableBeatDivisor.cs b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
index e8f7c75cc1..be1e121a99 100644
--- a/osu.Game/Screens/Edit/BindableBeatDivisor.cs
+++ b/osu.Game/Screens/Edit/BindableBeatDivisor.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;
@@ -80,5 +80,26 @@ namespace osu.Game.Screens.Edit
                     return Color4.Red;
             }
         }
+
+        /// <summary>
+        /// Retrieves the applicable divisor for a specific beat index.
+        /// </summary>
+        /// <param name="index">The 0-based beat index.</param>
+        /// <param name="beatDivisor">The beat divisor.</param>
+        /// <returns>The applicable divisor.</returns>
+        public static int GetDivisorForBeatIndex(int index, int beatDivisor)
+        {
+            int beat = index % beatDivisor;
+
+            for (int i = 0; i < BindableBeatDivisor.VALID_DIVISORS.Length; i++)
+            {
+                int divisor = BindableBeatDivisor.VALID_DIVISORS[i];
+
+                if ((beat * divisor) % beatDivisor == 0)
+                    return divisor;
+            }
+
+            return 0;
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
index 53c5cf97fa..3bbccd612b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
@@ -130,19 +130,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>The applicable colour.</returns>
         protected ColourInfo GetColourForBeatIndex(int index)
         {
-            int beat = (index + 1) % beatDivisor.Value;
-            ColourInfo colour = Colours.Gray5;
-
-            for (int i = 0; i < BindableBeatDivisor.VALID_DIVISORS.Length; i++)
-            {
-                int divisor = BindableBeatDivisor.VALID_DIVISORS[i];
-
-                if ((beat * divisor) % beatDivisor.Value == 0)
-                {
-                    colour = BindableBeatDivisor.GetColourFor(divisor, Colours);
-                    break;
-                }
-            }
+            var colour = BindableBeatDivisor.GetColourFor(BindableBeatDivisor.GetDivisorForBeatIndex(index + 1, beatDivisor.Value), Colours);
 
             int repeatIndex = index / beatDivisor.Value;
             return colour.MultiplyAlpha(0.5f / (repeatIndex + 1));

From 03b7c6cfa7ed291dc9b9c2913d12c7b4378c65b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 16:54:36 +0900
Subject: [PATCH 00321/10326] Add base test scene for timeline

---
 .../TestSceneTimelineBlueprintContainer.cs    | 135 +---------------
 .../Visual/Editor/TimelineTestScene.cs        | 148 ++++++++++++++++++
 2 files changed, 150 insertions(+), 133 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Editor/TimelineTestScene.cs

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
index e7b2508ac7..3c75fd5310 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
@@ -1,146 +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;
-using System.Collections.Generic;
 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.Graphics.Shapes;
-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;
-using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestSceneTimelineBlueprintContainer : EditorClockTestScene
+    public class TestSceneTimelineBlueprintContainer : TimelineTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(TimelineArea),
-            typeof(Timeline),
-            typeof(TimelineButton),
-            typeof(CentreMarker)
-        };
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            Beatmap.Value = new WaveformTestBeatmap(audio);
-
-            var editorBeatmap = new EditorBeatmap((Beatmap<HitObject>)Beatmap.Value.Beatmap, BeatDivisor);
-
-            Dependencies.Cache(editorBeatmap);
-            Dependencies.CacheAs<IBeatSnapProvider>(editorBeatmap);
-
-            Children = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(0, 5),
-                    Children = new Drawable[]
-                    {
-                        new StartStopButton(),
-                        new AudioVisualiser(),
-                    }
-                },
-                new TimelineArea
-                {
-                    Child = new TimelineBlueprintContainer(),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.X,
-                    Size = new Vector2(0.8f, 100)
-                }
-            };
-        }
-
-        private class AudioVisualiser : CompositeDrawable
-        {
-            private readonly Drawable marker;
-
-            [Resolved]
-            private IBindable<WorkingBeatmap> beatmap { get; set; }
-
-            [Resolved]
-            private IAdjustableClock adjustableClock { get; set; }
-
-            public AudioVisualiser()
-            {
-                Size = new Vector2(250, 25);
-
-                InternalChildren = new[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0.25f,
-                    },
-                    marker = new Box
-                    {
-                        RelativePositionAxes = Axes.X,
-                        RelativeSizeAxes = Axes.Y,
-                        Width = 2,
-                    }
-                };
-            }
-
-            protected override void Update()
-            {
-                base.Update();
-
-                if (beatmap.Value.Track.IsLoaded)
-                    marker.X = (float)(adjustableClock.CurrentTime / beatmap.Value.Track.Length);
-            }
-        }
-
-        private class StartStopButton : OsuButton
-        {
-            private IAdjustableClock adjustableClock;
-            private bool started;
-
-            public StartStopButton()
-            {
-                BackgroundColour = Color4.SlateGray;
-                Size = new Vector2(100, 50);
-                Text = "Start";
-
-                Action = onClick;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(IAdjustableClock adjustableClock)
-            {
-                this.adjustableClock = adjustableClock;
-            }
-
-            private void onClick()
-            {
-                if (started)
-                {
-                    adjustableClock.Stop();
-                    Text = "Start";
-                }
-                else
-                {
-                    adjustableClock.Start();
-                    Text = "Stop";
-                }
-
-                started = !started;
-            }
-        }
+        public override Drawable CreateTestComponent() => new TimelineBlueprintContainer();
     }
 }
diff --git a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
new file mode 100644
index 0000000000..b5e526d3c2
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
@@ -0,0 +1,148 @@
+// Copyright (c) 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.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+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;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Editor
+{
+    public abstract class TimelineTestScene : EditorClockTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(TimelineArea),
+            typeof(Timeline),
+            typeof(TimelineButton),
+            typeof(CentreMarker)
+        };
+
+        protected TimelineArea TimelineArea { get; private set; }
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            Beatmap.Value = new WaveformTestBeatmap(audio);
+
+            var editorBeatmap = new EditorBeatmap((Beatmap<HitObject>)Beatmap.Value.Beatmap, BeatDivisor);
+
+            Dependencies.Cache(editorBeatmap);
+            Dependencies.CacheAs<IBeatSnapProvider>(editorBeatmap);
+
+            AddRange(new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0, 5),
+                    Children = new Drawable[]
+                    {
+                        new StartStopButton(),
+                        new AudioVisualiser(),
+                    }
+                },
+                TimelineArea = new TimelineArea
+                {
+                    Child = CreateTestComponent(),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.X,
+                    Size = new Vector2(0.8f, 100),
+                }
+            });
+        }
+
+        public abstract Drawable CreateTestComponent();
+
+        private class AudioVisualiser : CompositeDrawable
+        {
+            private readonly Drawable marker;
+
+            [Resolved]
+            private IBindable<WorkingBeatmap> beatmap { get; set; }
+
+            [Resolved]
+            private IAdjustableClock adjustableClock { get; set; }
+
+            public AudioVisualiser()
+            {
+                Size = new Vector2(250, 25);
+
+                InternalChildren = new[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0.25f,
+                    },
+                    marker = new Box
+                    {
+                        RelativePositionAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 2,
+                    }
+                };
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                if (beatmap.Value.Track.IsLoaded)
+                    marker.X = (float)(adjustableClock.CurrentTime / beatmap.Value.Track.Length);
+            }
+        }
+
+        private class StartStopButton : OsuButton
+        {
+            private IAdjustableClock adjustableClock;
+            private bool started;
+
+            public StartStopButton()
+            {
+                BackgroundColour = Color4.SlateGray;
+                Size = new Vector2(100, 50);
+                Text = "Start";
+
+                Action = onClick;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(IAdjustableClock adjustableClock)
+            {
+                this.adjustableClock = adjustableClock;
+            }
+
+            private void onClick()
+            {
+                if (started)
+                {
+                    adjustableClock.Stop();
+                    Text = "Start";
+                }
+                else
+                {
+                    adjustableClock.Start();
+                    Text = "Stop";
+                }
+
+                started = !started;
+            }
+        }
+    }
+}

From e24c4ab90101ed2c53035db225a5c85339dc6183 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 16:54:57 +0900
Subject: [PATCH 00322/10326] Adjust zoom defaults for timeline to be more
 useful

---
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 96395696c3..5b2dd343e6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -30,7 +30,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             ZoomDuration = 200;
             ZoomEasing = Easing.OutQuint;
-            Zoom = 10;
+
+            Zoom = 60;
+            MaxZoom = 240;
+
             ScrollbarVisible = false;
         }
 

From 084fa2f04a8fa8b1d6a3c34b7744c590c0256f75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 17:34:25 +0900
Subject: [PATCH 00323/10326] Add timeline beat display

---
 .../TestSceneTimelineBeatLineDisplay.cs       | 32 +++++++
 .../Visualisations/PointVisualisation.cs      |  2 +-
 .../Timeline/TimelineBeatLineDisplay.cs       | 90 +++++++++++++++++++
 .../Screens/Edit/EditorScreenWithTimeline.cs  |  6 +-
 4 files changed, 128 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Editor/TestSceneTimelineBeatLineDisplay.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBeatLineDisplay.cs

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBeatLineDisplay.cs b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBeatLineDisplay.cs
new file mode 100644
index 0000000000..50a33852be
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBeatLineDisplay.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Editor
+{
+    [TestFixture]
+    public class TestSceneTimelineBeatLineDisplay : TimelineTestScene
+    {
+        public override Drawable CreateTestComponent() => new TimelineBeatLineDisplay();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            BeatDivisor.Value = 4;
+
+            Add(new BeatDivisorControl(BeatDivisor)
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                Margin = new MarginPadding(30),
+                Size = new Vector2(90)
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
index 9c00cce57a..1ac960039e 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     /// </summary>
     public class PointVisualisation : Box
     {
-        protected PointVisualisation(double startTime)
+        public PointVisualisation(double startTime)
         {
             Origin = Anchor.TopCentre;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBeatLineDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBeatLineDisplay.cs
new file mode 100644
index 0000000000..0a6fa2be66
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBeatLineDisplay.cs
@@ -0,0 +1,90 @@
+// Copyright (c) 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.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
+
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
+{
+    public class TimelineBeatLineDisplay : TimelinePart
+    {
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; }
+
+        [Resolved]
+        private Bindable<WorkingBeatmap> working { get; set; }
+
+        [Resolved]
+        private BindableBeatDivisor beatDivisor { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public TimelineBeatLineDisplay()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            beatDivisor.BindValueChanged(_ => createLines(), true);
+        }
+
+        private void createLines()
+        {
+            Clear();
+
+            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;
+
+                int beat = 0;
+
+                for (double t = point.Time; t < until; t += point.BeatLength / beatDivisor.Value)
+                {
+                    var indexInBeat = beat % beatDivisor.Value;
+
+                    if (indexInBeat == 0)
+                    {
+                        Add(new PointVisualisation(t)
+                        {
+                            Colour = BindableBeatDivisor.GetColourFor(1, colours),
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                        });
+                    }
+                    else
+                    {
+                        var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
+                        var colour = BindableBeatDivisor.GetColourFor(divisor, colours);
+                        var height = 0.1f - (float)divisor / BindableBeatDivisor.VALID_DIVISORS.Last() * 0.08f;
+
+                        Add(new PointVisualisation(t)
+                        {
+                            Colour = colour,
+                            Height = height,
+                        });
+
+                        Add(new PointVisualisation(t)
+                        {
+                            Colour = colour,
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Height = height,
+                        });
+                    }
+
+                    beat++;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 8967f24185..0f81194894 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -102,7 +102,11 @@ namespace osu.Game.Screens.Edit
                 LoadComponentAsync(new TimelineArea
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = CreateTimelineContent()
+                    Children = new[]
+                    {
+                        new TimelineBeatLineDisplay(),
+                        CreateTimelineContent(),
+                    }
                 }, timelineContainer.Add);
             });
         }

From 493390b75088993c67d6c6c8d662b366483cb622 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 18:07:46 +0900
Subject: [PATCH 00324/10326] Rename class to TimelineTickDisplay

---
 .../Visual/Editor/TestSceneTimelineBeatLineDisplay.cs         | 2 +-
 .../{TimelineBeatLineDisplay.cs => TimelineTickDisplay.cs}    | 4 ++--
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Screens/Edit/Compose/Components/Timeline/{TimelineBeatLineDisplay.cs => TimelineTickDisplay.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBeatLineDisplay.cs b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBeatLineDisplay.cs
index 50a33852be..3b04496792 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBeatLineDisplay.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBeatLineDisplay.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Tests.Visual.Editor
     [TestFixture]
     public class TestSceneTimelineBeatLineDisplay : TimelineTestScene
     {
-        public override Drawable CreateTestComponent() => new TimelineBeatLineDisplay();
+        public override Drawable CreateTestComponent() => new TimelineTickDisplay();
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBeatLineDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
similarity index 96%
rename from osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBeatLineDisplay.cs
rename to osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 0a6fa2be66..03fb1fdba1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBeatLineDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -12,7 +12,7 @@ using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    public class TimelineBeatLineDisplay : TimelinePart
+    public class TimelineTickDisplay : TimelinePart
     {
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private OsuColour colours { get; set; }
 
-        public TimelineBeatLineDisplay()
+        public TimelineTickDisplay()
         {
             RelativeSizeAxes = Axes.Both;
         }
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 0f81194894..7ee1005add 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Edit
                     RelativeSizeAxes = Axes.Both,
                     Children = new[]
                     {
-                        new TimelineBeatLineDisplay(),
+                        new TimelineTickDisplay(),
                         CreateTimelineContent(),
                     }
                 }, timelineContainer.Add);

From d5fda053f4333bd6c68715c3cc077412d5607b57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 18:08:30 +0900
Subject: [PATCH 00325/10326] Use centre origin/anchors

---
 .../Edit/Compose/Components/Timeline/TimelineTickDisplay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 03fb1fdba1..f9b92c0504 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -57,8 +57,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         Add(new PointVisualisation(t)
                         {
                             Colour = BindableBeatDivisor.GetColourFor(1, colours),
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
+                            Origin = Anchor.TopCentre,
                         });
                     }
                     else
@@ -71,13 +70,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         {
                             Colour = colour,
                             Height = height,
+                            Origin = Anchor.TopCentre,
                         });
 
                         Add(new PointVisualisation(t)
                         {
                             Colour = colour,
                             Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
+                            Origin = Anchor.BottomCentre,
                             Height = height,
                         });
                     }

From 9a2867d3d97e8becceffa5d7b6866ae336758cdb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 18:10:42 +0900
Subject: [PATCH 00326/10326] Rename test class

---
 ...melineBeatLineDisplay.cs => TestSceneTimelineTickDisplay.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Editor/{TestSceneTimelineBeatLineDisplay.cs => TestSceneTimelineTickDisplay.cs} (92%)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBeatLineDisplay.cs b/osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs
similarity index 92%
rename from osu.Game.Tests/Visual/Editor/TestSceneTimelineBeatLineDisplay.cs
rename to osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs
index 3b04496792..43a3cd6122 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBeatLineDisplay.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs
@@ -11,7 +11,7 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestSceneTimelineBeatLineDisplay : TimelineTestScene
+    public class TestSceneTimelineTickDisplay : TimelineTestScene
     {
         public override Drawable CreateTestComponent() => new TimelineTickDisplay();
 

From fd7f07433da4b6f95d75bbce6c328c29e5d72ca4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jan 2020 18:26:44 +0900
Subject: [PATCH 00327/10326] Ensure selection has occurred before storing
 value

---
 .../Visual/SongSelect/TestScenePlaySongSelect.cs          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 81a44f9f8a..98b8e3c5d6 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -104,6 +104,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
+            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+
             WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
@@ -129,6 +131,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
+            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+
             WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
@@ -154,6 +158,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
+            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+
             WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
@@ -183,6 +189,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
+            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+
             WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);

From 79cdfc6dc211ec3086843d8bfddb998df80db4ed Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 27 Jan 2020 12:55:19 +0300
Subject: [PATCH 00328/10326] Use OverlayColourProvider

---
 .../Online/TestSceneUserProfileScores.cs      | 23 ++++++++++++++++---
 .../Visual/Online/TestSceneUserRanks.cs       |  5 ++++
 .../Profile/Sections/ProfileItemContainer.cs  |  7 +++---
 .../Sections/Ranks/DrawableProfileScore.cs    | 11 +++++----
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
index a303d88037..19b72e7071 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
@@ -12,6 +12,8 @@ using osuTK;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -74,11 +76,26 @@ namespace osu.Game.Tests.Visual.Online
                 Spacing = new Vector2(0, 10),
                 Children = new[]
                 {
-                    new DrawableProfileScore(score),
-                    new DrawableProfileScore(noPPScore),
-                    new DrawableProfileWeightedScore(score, 0.85),
+                    new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(score)),
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(noPPScore)),
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(score, 0.85))
                 }
             });
         }
+
+        private class ColourProvidedContainer : Container
+        {
+            [Cached]
+            private readonly OverlayColourProvider colourProvider;
+
+            public ColourProvidedContainer(OverlayColourScheme colourScheme, DrawableProfileScore score)
+            {
+                colourProvider = new OverlayColourProvider(colourScheme);
+
+                AutoSizeAxes = Axes.Y;
+                RelativeSizeAxes = Axes.X;
+                Add(score);
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs b/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
index 5cbdfb561e..c8e94b2915 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserRanks.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.Containers;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Profile.Sections;
 using osu.Game.Overlays.Profile.Sections.Ranks;
 using osu.Game.Users;
@@ -27,6 +29,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(RanksSection)
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
         public TestSceneUserRanks()
         {
             RanksSection ranks;
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
index 99cad26a64..717ec4fb1a 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.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.Profile.Sections
@@ -43,10 +42,10 @@ namespace osu.Game.Overlays.Profile.Sections
         }
 
         [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)
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 722b4d2dae..9145ce6894 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -30,6 +30,9 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         [Resolved]
         private OsuColour colours { get; set; }
 
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
         public DrawableProfileScore(ScoreInfo score)
         {
             Score = score;
@@ -91,7 +94,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                                     },
                                                     new DrawableDate(Score.Date, 12)
                                                     {
-                                                        Colour = colours.GreySeafoamLighter
+                                                        Colour = colourProvider.Foreground1
                                                     }
                                                 }
                                             }
@@ -192,7 +195,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                             Origin = Anchor.BottomLeft,
                             Font = OsuFont.GetFont(weight: FontWeight.Bold),
                             Text = $"{Score.PP:0}",
-                            Colour = colours.GreenLight
+                            Colour = colourProvider.Highlight1
                         },
                         new OsuSpriteText
                         {
@@ -200,7 +203,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                             Origin = Anchor.BottomLeft,
                             Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
                             Text = "pp",
-                            Colour = colours.Green
+                            Colour = colourProvider.Light3
                         }
                     }
                 };
@@ -210,7 +213,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             {
                 Font = OsuFont.GetFont(weight: FontWeight.Bold),
                 Text = "-",
-                Colour = colours.GreenLight
+                Colour = colourProvider.Highlight1
             };
         }
 

From ed2737e0276efa75859ff1f205c9e58e3ef26d72 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 27 Jan 2020 14:47:47 +0300
Subject: [PATCH 00329/10326] Recolour TotalCommentCounter

---
 .../Online/TestSceneTotalCommentsCounter.cs      |  5 +++++
 .../Overlays/Comments/TotalCommentsCounter.cs    | 16 +++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs b/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs
index f14c75084f..8ecbf0891b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs
@@ -7,6 +7,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Overlays.Comments;
 using osu.Framework.Utils;
+using osu.Framework.Allocation;
+using osu.Game.Overlays;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -17,6 +19,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(TotalCommentsCounter),
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         public TestSceneTotalCommentsCounter()
         {
             var count = new BindableInt();
diff --git a/osu.Game/Overlays/Comments/TotalCommentsCounter.cs b/osu.Game/Overlays/Comments/TotalCommentsCounter.cs
index 376853c1de..57f4986bce 100644
--- a/osu.Game/Overlays/Comments/TotalCommentsCounter.cs
+++ b/osu.Game/Overlays/Comments/TotalCommentsCounter.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -17,7 +16,9 @@ namespace osu.Game.Overlays.Comments
     {
         public readonly BindableInt Current = new BindableInt();
 
-        private readonly SpriteText counter;
+        private readonly OsuSpriteText counter;
+        private readonly OsuSpriteText text;
+        private readonly Box pillBackground;
 
         public TotalCommentsCounter()
         {
@@ -33,7 +34,7 @@ namespace osu.Game.Overlays.Comments
                 Spacing = new Vector2(5, 0),
                 Children = new Drawable[]
                 {
-                    new OsuSpriteText
+                    text = new OsuSpriteText
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
@@ -48,10 +49,9 @@ namespace osu.Game.Overlays.Comments
                         Masking = true,
                         Children = new Drawable[]
                         {
-                            new Box
+                            pillBackground = new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = OsuColour.Gray(0.05f)
                             },
                             counter = new OsuSpriteText
                             {
@@ -67,9 +67,11 @@ namespace osu.Game.Overlays.Comments
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            counter.Colour = colours.BlueLighter;
+            text.Colour = colourProvider.Light1;
+            pillBackground.Colour = colourProvider.Background6;
+            counter.Colour = colourProvider.Foreground1;
         }
 
         protected override void LoadComplete()

From 12ca28ea6d3f4a21f10ea44794acbd9899adc612 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 27 Jan 2020 14:58:27 +0300
Subject: [PATCH 00330/10326] Recolour CommentsHeader

---
 osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs | 5 +++++
 osu.Game/Overlays/Comments/CommentsHeader.cs            | 4 ++--
 osu.Game/Overlays/Comments/HeaderButton.cs              | 5 ++---
 osu.Game/Overlays/Comments/SortTabControl.cs            | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
index bc3e0eff1a..a60f220e4b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
@@ -4,7 +4,9 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Comments;
 
 namespace osu.Game.Tests.Visual.Online
@@ -19,6 +21,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(SortTabControl),
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         private readonly Bindable<CommentsSortCriteria> sort = new Bindable<CommentsSortCriteria>();
         private readonly BindableBool showDeleted = new BindableBool();
 
diff --git a/osu.Game/Overlays/Comments/CommentsHeader.cs b/osu.Game/Overlays/Comments/CommentsHeader.cs
index 6a7a678cc7..ad80e67330 100644
--- a/osu.Game/Overlays/Comments/CommentsHeader.cs
+++ b/osu.Game/Overlays/Comments/CommentsHeader.cs
@@ -76,9 +76,9 @@ namespace osu.Game.Overlays.Comments
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = colours.Gray3;
+            background.Colour = colourProvider.Background4;
         }
 
         private class ShowDeletedButton : HeaderButton
diff --git a/osu.Game/Overlays/Comments/HeaderButton.cs b/osu.Game/Overlays/Comments/HeaderButton.cs
index 8789cf5830..fdc8db35ab 100644
--- a/osu.Game/Overlays/Comments/HeaderButton.cs
+++ b/osu.Game/Overlays/Comments/HeaderButton.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 
@@ -45,9 +44,9 @@ namespace osu.Game.Overlays.Comments
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = colours.Gray4;
+            background.Colour = colourProvider.Background3;
         }
 
         protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Overlays/Comments/SortTabControl.cs b/osu.Game/Overlays/Comments/SortTabControl.cs
index a114197b8d..700d63351f 100644
--- a/osu.Game/Overlays/Comments/SortTabControl.cs
+++ b/osu.Game/Overlays/Comments/SortTabControl.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Comments
                 public readonly BindableBool Active = new BindableBool();
 
                 [Resolved]
-                private OsuColour colours { get; set; }
+                private OverlayColourProvider colourProvider { get; set; }
 
                 private readonly SpriteText text;
 
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Comments
                         updateBackgroundState();
 
                         text.Font = text.Font.With(weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium);
-                        text.Colour = active.NewValue ? colours.BlueLighter : Color4.White;
+                        text.Colour = active.NewValue ? colourProvider.Light1 : Color4.White;
                     }, true);
                 }
 

From 68503bf7711a8f5163cf36b084e4a876454f1d0f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 27 Jan 2020 15:00:56 +0300
Subject: [PATCH 00331/10326] Recolour CommentsShowMoreButton

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

diff --git a/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs b/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
index b0174e7b1a..ab65c9c63a 100644
--- a/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
+++ b/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
@@ -1,8 +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.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Comments
@@ -11,11 +11,12 @@ namespace osu.Game.Overlays.Comments
     {
         public readonly BindableInt Current = new BindableInt();
 
-        public CommentsShowMoreButton()
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
         {
-            IdleColour = OsuColour.Gray(0.3f);
-            HoverColour = OsuColour.Gray(0.4f);
-            ChevronIconColour = OsuColour.Gray(0.5f);
+            IdleColour = colourProvider.Background2;
+            HoverColour = colourProvider.Background1;
+            ChevronIconColour = colourProvider.Foreground1;
         }
 
         protected override void LoadComplete()

From 100532845b2d5ba27828ffc9b4f5c6a2836584f8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 27 Jan 2020 15:07:24 +0300
Subject: [PATCH 00332/10326] Recolour CommentsContainer

---
 .../Visual/Online/TestSceneCommentsContainer.cs     |  5 +++++
 osu.Game/Overlays/Comments/CommentsContainer.cs     | 13 +++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 8134c10750..3d63e2b07e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -8,6 +8,8 @@ using osu.Game.Online.API.Requests;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Comments;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -28,6 +30,9 @@ namespace osu.Game.Tests.Visual.Online
 
         protected override bool UseOnlineAPI => true;
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
         public TestSceneCommentsContainer()
         {
             BasicScrollContainer scroll;
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index d252083411..36b165c97d 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -8,7 +8,6 @@ using osu.Game.Online.API.Requests;
 using osu.Framework.Graphics;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 using osu.Game.Online.API.Requests.Responses;
 using System.Threading;
 using System.Linq;
@@ -27,14 +26,12 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         private GetCommentsRequest request;
         private CancellationTokenSource loadCancellation;
         private int currentPage;
 
         private readonly Box background;
+        private readonly Box footerBackground;
         private readonly FillFlowContainer content;
         private readonly DeletedChildrenPlaceholder deletedChildrenPlaceholder;
         private readonly CommentsShowMoreButton moreButton;
@@ -75,10 +72,9 @@ namespace osu.Game.Overlays.Comments
                             AutoSizeAxes = Axes.Y,
                             Children = new Drawable[]
                             {
-                                new Box
+                                footerBackground = new Box
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Colour = OsuColour.Gray(0.2f)
                                 },
                                 new FillFlowContainer
                                 {
@@ -114,9 +110,10 @@ namespace osu.Game.Overlays.Comments
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = colours.Gray2;
+            background.Colour = colourProvider.Background5;
+            footerBackground.Colour = colourProvider.Background4;
         }
 
         protected override void LoadComplete()

From e6fa793d5624deeea15720631e2c9677027a5259 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 27 Jan 2020 15:36:19 +0300
Subject: [PATCH 00333/10326] Refactor background creation in OverlayHeader

---
 .../UserInterface/TestSceneOverlayHeader.cs   | 32 +++++---------
 .../Overlays/Changelog/ChangelogHeader.cs     | 20 +--------
 osu.Game/Overlays/News/NewsHeader.cs          | 20 +--------
 osu.Game/Overlays/OverlayHeader.cs            | 19 ++------
 osu.Game/Overlays/OverlayHeaderBackground.cs  | 43 +++++++++++++++++++
 osu.Game/Overlays/Profile/ProfileHeader.cs    |  6 +--
 6 files changed, 63 insertions(+), 77 deletions(-)
 create mode 100644 osu.Game/Overlays/OverlayHeaderBackground.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index be0933e9d4..7e6fda14c1 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -7,9 +7,7 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Shapes;
 using osuTK.Graphics;
@@ -27,6 +25,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             typeof(TestStringTabControlHeader),
             typeof(TestEnumTabControlHeader),
             typeof(TestBreadcrumbControlHeader),
+            typeof(OverlayHeaderBackground)
         };
 
         private readonly FillFlowContainer flow;
@@ -52,6 +51,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("Pink TabControlOverlayHeader (enum)", new TestEnumTabControlHeader(), OverlayColourScheme.Pink);
@@ -98,16 +98,21 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
         }
 
+        private class TestNoBackgroundHeader : OverlayHeader
+        {
+            protected override ScreenTitle CreateTitle() => new TestTitle();
+        }
+
         private class TestNoControlHeader : OverlayHeader
         {
-            protected override Drawable CreateBackground() => new TestBackground();
+            protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/changelog");
 
             protected override ScreenTitle CreateTitle() => new TestTitle();
         }
 
         private class TestStringTabControlHeader : TabControlOverlayHeader<string>
         {
-            protected override Drawable CreateBackground() => new TestBackground();
+            protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/news");
 
             protected override ScreenTitle CreateTitle() => new TestTitle();
 
@@ -120,7 +125,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestEnumTabControlHeader : TabControlOverlayHeader<TestEnum>
         {
-            protected override Drawable CreateBackground() => new TestBackground();
+            protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/rankings");
 
             protected override ScreenTitle CreateTitle() => new TestTitle();
         }
@@ -134,7 +139,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestBreadcrumbControlHeader : BreadcrumbControlOverlayHeader
         {
-            protected override Drawable CreateBackground() => new TestBackground();
+            protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/search");
 
             protected override ScreenTitle CreateTitle() => new TestTitle();
 
@@ -146,21 +151,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
         }
 
-        private class TestBackground : Sprite
-        {
-            public TestBackground()
-            {
-                RelativeSizeAxes = Axes.Both;
-                FillMode = FillMode.Fill;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
-            {
-                Texture = textures.Get(@"Headers/changelog");
-            }
-        }
-
         private class TestTitle : ScreenTitle
         {
             public TestTitle()
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 2fbfdec3d1..4165a180da 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -4,12 +4,9 @@
 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.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
 
@@ -67,7 +64,7 @@ namespace osu.Game.Overlays.Changelog
             }
         }
 
-        protected override Drawable CreateBackground() => new HeaderBackground();
+        protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/changelog");
 
         protected override Drawable CreateContent() => new Container
         {
@@ -95,21 +92,6 @@ namespace osu.Game.Overlays.Changelog
             Streams.Current.Value = Streams.Items.FirstOrDefault(s => s.Name == Current.Value.UpdateStream.Name);
         }
 
-        public class HeaderBackground : Sprite
-        {
-            public HeaderBackground()
-            {
-                RelativeSizeAxes = Axes.Both;
-                FillMode = FillMode.Fill;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
-            {
-                Texture = textures.Get(@"Headers/changelog");
-            }
-        }
-
         private class ChangelogHeaderTitle : ScreenTitle
         {
             public string Version
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index 2f9cde1687..b525ba7a82 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -1,11 +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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics.UserInterface;
 using System;
 
@@ -53,25 +50,10 @@ namespace osu.Game.Overlays.News
             }
         }
 
-        protected override Drawable CreateBackground() => new NewsHeaderBackground();
+        protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/news");
 
         protected override ScreenTitle CreateTitle() => title = new NewsHeaderTitle();
 
-        private class NewsHeaderBackground : Sprite
-        {
-            public NewsHeaderBackground()
-            {
-                RelativeSizeAxes = Axes.Both;
-                FillMode = FillMode.Fill;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
-            {
-                Texture = textures.Get(@"Headers/news");
-            }
-        }
-
         private class NewsHeaderTitle : ScreenTitle
         {
             private const string post_string = "post";
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index 0575f6f296..aca931d9c3 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -14,16 +14,10 @@ namespace osu.Game.Overlays
     public abstract class OverlayHeader : Container
     {
         private readonly Box titleBackground;
-        private readonly Container background;
         private readonly ScreenTitle title;
 
         protected readonly FillFlowContainer HeaderInfo;
 
-        protected float BackgroundHeight
-        {
-            set => background.Height = value;
-        }
-
         protected OverlayHeader()
         {
             RelativeSizeAxes = Axes.X;
@@ -44,13 +38,7 @@ namespace osu.Game.Overlays
                         Depth = -float.MaxValue,
                         Children = new Drawable[]
                         {
-                            background = new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                Height = 80,
-                                Masking = true,
-                                Child = CreateBackground()
-                            },
+                            CreateBackground(),
                             new Container
                             {
                                 RelativeSizeAxes = Axes.X,
@@ -86,11 +74,12 @@ namespace osu.Game.Overlays
             title.AccentColour = colourProvider.Highlight1;
         }
 
-        protected abstract Drawable CreateBackground();
-
         [NotNull]
         protected virtual Drawable CreateContent() => new Container();
 
+        [NotNull]
+        protected virtual Drawable CreateBackground() => new Container();
+
         protected abstract ScreenTitle CreateTitle();
     }
 }
diff --git a/osu.Game/Overlays/OverlayHeaderBackground.cs b/osu.Game/Overlays/OverlayHeaderBackground.cs
new file mode 100644
index 0000000000..2fef593285
--- /dev/null
+++ b/osu.Game/Overlays/OverlayHeaderBackground.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Overlays
+{
+    public class OverlayHeaderBackground : CompositeDrawable
+    {
+        public OverlayHeaderBackground(string textureName)
+        {
+            Height = 80;
+            RelativeSizeAxes = Axes.X;
+            Masking = true;
+            InternalChild = new Background(textureName);
+        }
+
+        private class Background : Sprite
+        {
+            private readonly string textureName;
+
+            public Background(string textureName)
+            {
+                this.textureName = textureName;
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                RelativeSizeAxes = Axes.Both;
+                FillMode = FillMode.Fill;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                Texture = textures.Get(textureName);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 203df2ec12..3e78423a5a 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -25,8 +25,6 @@ namespace osu.Game.Overlays.Profile
 
         public ProfileHeader()
         {
-            BackgroundHeight = 150;
-
             User.ValueChanged += e => updateDisplay(e.NewValue);
 
             TabControl.AddItem("info");
@@ -38,7 +36,9 @@ namespace osu.Game.Overlays.Profile
         protected override Drawable CreateBackground() =>
             new Container
             {
-                RelativeSizeAxes = Axes.Both,
+                RelativeSizeAxes = Axes.X,
+                Height = 150,
+                Masking = true,
                 Children = new Drawable[]
                 {
                     coverContainer = new UserCoverBackground

From 97fb7a5593470829dfaaec08408608cbd54c9921 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 27 Jan 2020 15:42:46 +0300
Subject: [PATCH 00334/10326] Add test scene

---
 .../UserInterface/TestSceneOverlayHeader.cs   |  4 +-
 .../TestSceneOverlayHeaderBackground.cs       | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index 7e6fda14c1..c899ccb9eb 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             addHeader("Blue OverlayHeader", new TestNoControlHeader(), OverlayColourScheme.Blue);
             addHeader("Green TabControlOverlayHeader (string)", new TestStringTabControlHeader(), OverlayColourScheme.Green);
             addHeader("Pink TabControlOverlayHeader (enum)", new TestEnumTabControlHeader(), OverlayColourScheme.Pink);
-            addHeader("Red BreadcrumbControlOverlayHeader", new TestBreadcrumbControlHeader(), OverlayColourScheme.Red);
+            addHeader("Red BreadcrumbControlOverlayHeader (no background)", new TestBreadcrumbControlHeader(), OverlayColourScheme.Red);
         }
 
         private void addHeader(string name, OverlayHeader header, OverlayColourScheme colourScheme)
@@ -139,8 +139,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestBreadcrumbControlHeader : BreadcrumbControlOverlayHeader
         {
-            protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/search");
-
             protected override ScreenTitle CreateTitle() => new TestTitle();
 
             public TestBreadcrumbControlHeader()
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.cs
new file mode 100644
index 0000000000..5a0b28e24a
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.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 osu.Framework.Graphics.Containers;
+using osu.Game.Overlays;
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneOverlayHeaderBackground : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OverlayHeaderBackground)
+        };
+
+        public TestSceneOverlayHeaderBackground()
+        {
+            Add(new BasicScrollContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0, 20),
+                    Children = new[]
+                    {
+                        new OverlayHeaderBackground(@"Headers/changelog"),
+                        new OverlayHeaderBackground(@"Headers/news"),
+                        new OverlayHeaderBackground(@"Headers/rankings"),
+                        new OverlayHeaderBackground(@"Headers/search"),
+                    }
+                }
+            });
+        }
+    }
+}

From 55d78dbc577c9b273fc23265b161f04ec4176425 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 27 Jan 2020 16:45:10 +0300
Subject: [PATCH 00335/10326] CI fix

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

diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index aca931d9c3..b165882864 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays
                         AutoSizeAxes = Axes.Y,
                         Direction = FillDirection.Vertical,
                         Depth = -float.MaxValue,
-                        Children = new Drawable[]
+                        Children = new[]
                         {
                             CreateBackground(),
                             new Container

From b14c7bd171905e44f8cdd831ed06d1bfc063c573 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Mon, 27 Jan 2020 21:28:28 +0800
Subject: [PATCH 00336/10326] Use type switch in SearializationWriter.

---
 osu.Game/IO/Legacy/SerializationWriter.cs | 70 +++++++++++------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/osu.Game/IO/Legacy/SerializationWriter.cs b/osu.Game/IO/Legacy/SerializationWriter.cs
index c75de93bc8..bb8014fe54 100644
--- a/osu.Game/IO/Legacy/SerializationWriter.cs
+++ b/osu.Game/IO/Legacy/SerializationWriter.cs
@@ -130,91 +130,91 @@ namespace osu.Game.IO.Legacy
             }
             else
             {
-                switch (obj.GetType().Name)
+                switch (obj)
                 {
-                    case "Boolean":
+                    case bool boolObj:
                         Write((byte)ObjType.boolType);
-                        Write((bool)obj);
+                        Write(boolObj);
                         break;
 
-                    case "Byte":
+                    case byte byteObj:
                         Write((byte)ObjType.byteType);
-                        Write((byte)obj);
+                        Write(byteObj);
                         break;
 
-                    case "UInt16":
+                    case ushort ushortObj:
                         Write((byte)ObjType.uint16Type);
-                        Write((ushort)obj);
+                        Write(ushortObj);
                         break;
 
-                    case "UInt32":
+                    case uint uintObj:
                         Write((byte)ObjType.uint32Type);
-                        Write((uint)obj);
+                        Write(uintObj);
                         break;
 
-                    case "UInt64":
+                    case ulong ulongObj:
                         Write((byte)ObjType.uint64Type);
-                        Write((ulong)obj);
+                        Write(ulongObj);
                         break;
 
-                    case "SByte":
+                    case sbyte sbyteObj:
                         Write((byte)ObjType.sbyteType);
-                        Write((sbyte)obj);
+                        Write(sbyteObj);
                         break;
 
-                    case "Int16":
+                    case short shortObj:
                         Write((byte)ObjType.int16Type);
-                        Write((short)obj);
+                        Write(shortObj);
                         break;
 
-                    case "Int32":
+                    case int intObj:
                         Write((byte)ObjType.int32Type);
-                        Write((int)obj);
+                        Write(intObj);
                         break;
 
-                    case "Int64":
+                    case long longObj:
                         Write((byte)ObjType.int64Type);
-                        Write((long)obj);
+                        Write(longObj);
                         break;
 
-                    case "Char":
+                    case char charObj:
                         Write((byte)ObjType.charType);
-                        base.Write((char)obj);
+                        base.Write(charObj);
                         break;
 
-                    case "String":
+                    case string stringObj:
                         Write((byte)ObjType.stringType);
-                        base.Write((string)obj);
+                        base.Write(stringObj);
                         break;
 
-                    case "Single":
+                    case float floatObj:
                         Write((byte)ObjType.singleType);
-                        Write((float)obj);
+                        Write(floatObj);
                         break;
 
-                    case "Double":
+                    case double doubleObj:
                         Write((byte)ObjType.doubleType);
-                        Write((double)obj);
+                        Write(doubleObj);
                         break;
 
-                    case "Decimal":
+                    case decimal decimalObj:
                         Write((byte)ObjType.decimalType);
-                        Write((decimal)obj);
+                        Write(decimalObj);
                         break;
 
-                    case "DateTime":
+                    case DateTime dateTimeObj:
                         Write((byte)ObjType.dateTimeType);
-                        Write((DateTime)obj);
+                        Write(dateTimeObj);
                         break;
 
-                    case "Byte[]":
+                    case byte[] byteArray:
                         Write((byte)ObjType.byteArrayType);
-                        base.Write((byte[])obj);
+                        base.Write(byteArray);
                         break;
 
-                    case "Char[]":
+                    case char[] charArray:
                         Write((byte)ObjType.charArrayType);
-                        base.Write((char[])obj);
+                        base.Write(charArray);
                         break;
 
                     default:

From d9e21a572fba46f991a7ca94a218e8655bca9d47 Mon Sep 17 00:00:00 2001
From: unknown <n20gaming2000@gmail.com>
Date: Tue, 28 Jan 2020 07:13:28 +0800
Subject: [PATCH 00337/10326] remove unecessary comment

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index a9330f9287..9e63142b42 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -72,7 +72,6 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         /// <param name="amount">The amount of adjustment to apply (from 0..1).</param>
         private void applyAdjustment(double amount) =>
-            //  SpeedChange.Value = 1 + (FinalRate.Value - 1) * Math.Clamp(amount, 0, 1);
             SpeedChange.Value = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
     }
 }

From ce95b4a10623ad8533df7de211369fd4a9ef1a6c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 28 Jan 2020 05:57:45 +0300
Subject: [PATCH 00338/10326] TotalCommentsCounter improvements

---
 .../Overlays/Comments/TotalCommentsCounter.cs | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Comments/TotalCommentsCounter.cs b/osu.Game/Overlays/Comments/TotalCommentsCounter.cs
index 57f4986bce..1bb9b52689 100644
--- a/osu.Game/Overlays/Comments/TotalCommentsCounter.cs
+++ b/osu.Game/Overlays/Comments/TotalCommentsCounter.cs
@@ -16,11 +16,10 @@ namespace osu.Game.Overlays.Comments
     {
         public readonly BindableInt Current = new BindableInt();
 
-        private readonly OsuSpriteText counter;
-        private readonly OsuSpriteText text;
-        private readonly Box pillBackground;
+        private OsuSpriteText counter;
 
-        public TotalCommentsCounter()
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
         {
             RelativeSizeAxes = Axes.X;
             Height = 50;
@@ -34,11 +33,12 @@ namespace osu.Game.Overlays.Comments
                 Spacing = new Vector2(5, 0),
                 Children = new Drawable[]
                 {
-                    text = new OsuSpriteText
+                    new OsuSpriteText
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                         Font = OsuFont.GetFont(size: 20, italics: true),
+                        Colour = colourProvider.Light1,
                         Text = @"Comments"
                     },
                     new CircularContainer
@@ -49,16 +49,18 @@ namespace osu.Game.Overlays.Comments
                         Masking = true,
                         Children = new Drawable[]
                         {
-                            pillBackground = new Box
+                            new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
+                                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(size: 14, weight: FontWeight.Bold),
+                                Colour = colourProvider.Foreground1
                             }
                         },
                     }
@@ -66,14 +68,6 @@ namespace osu.Game.Overlays.Comments
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            text.Colour = colourProvider.Light1;
-            pillBackground.Colour = colourProvider.Background6;
-            counter.Colour = colourProvider.Foreground1;
-        }
-
         protected override void LoadComplete()
         {
             Current.BindValueChanged(value => counter.Text = value.NewValue.ToString("N0"), true);

From 29daabb40a42856de7fd6a709ee938b17bedf152 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 11:59:21 +0900
Subject: [PATCH 00339/10326] Fix distance snap grid showing incorrect
 colouring

Now matches timeline colours (based on timing point).
---
 .../Editor/TestSceneDistanceSnapGrid.cs       | 36 +++++++++----------
 .../Components/CircularDistanceSnapGrid.cs    | 14 ++++----
 .../Compose/Components/DistanceSnapGrid.cs    | 15 ++++----
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs
index 847d168e51..f49256a633 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs
@@ -85,64 +85,64 @@ namespace osu.Game.Tests.Visual.Editor
             {
             }
 
-            protected override void CreateContent(Vector2 startPosition)
+            protected override void CreateContent()
             {
                 AddInternal(new Circle
                 {
                     Origin = Anchor.Centre,
                     Size = new Vector2(5),
-                    Position = startPosition
+                    Position = StartPosition
                 });
 
-                int beatIndex = 0;
+                int indexFromPlacement = 0;
 
-                for (float s = startPosition.X + DistanceSpacing; s <= DrawWidth && beatIndex < MaxIntervals; s += DistanceSpacing, beatIndex++)
+                for (float s = StartPosition.X + DistanceSpacing; s <= DrawWidth && indexFromPlacement < MaxIntervals; s += DistanceSpacing, indexFromPlacement++)
                 {
                     AddInternal(new Circle
                     {
                         Origin = Anchor.Centre,
                         Size = new Vector2(5, 10),
-                        Position = new Vector2(s, startPosition.Y),
-                        Colour = GetColourForBeatIndex(beatIndex)
+                        Position = new Vector2(s, StartPosition.Y),
+                        Colour = GetColourForIndexFromPlacement(indexFromPlacement)
                     });
                 }
 
-                beatIndex = 0;
+                indexFromPlacement = 0;
 
-                for (float s = startPosition.X - DistanceSpacing; s >= 0 && beatIndex < MaxIntervals; s -= DistanceSpacing, beatIndex++)
+                for (float s = StartPosition.X - DistanceSpacing; s >= 0 && indexFromPlacement < MaxIntervals; s -= DistanceSpacing, indexFromPlacement++)
                 {
                     AddInternal(new Circle
                     {
                         Origin = Anchor.Centre,
                         Size = new Vector2(5, 10),
-                        Position = new Vector2(s, startPosition.Y),
-                        Colour = GetColourForBeatIndex(beatIndex)
+                        Position = new Vector2(s, StartPosition.Y),
+                        Colour = GetColourForIndexFromPlacement(indexFromPlacement)
                     });
                 }
 
-                beatIndex = 0;
+                indexFromPlacement = 0;
 
-                for (float s = startPosition.Y + DistanceSpacing; s <= DrawHeight && beatIndex < MaxIntervals; s += DistanceSpacing, beatIndex++)
+                for (float s = StartPosition.Y + DistanceSpacing; s <= DrawHeight && indexFromPlacement < MaxIntervals; s += DistanceSpacing, indexFromPlacement++)
                 {
                     AddInternal(new Circle
                     {
                         Origin = Anchor.Centre,
                         Size = new Vector2(10, 5),
-                        Position = new Vector2(startPosition.X, s),
-                        Colour = GetColourForBeatIndex(beatIndex)
+                        Position = new Vector2(StartPosition.X, s),
+                        Colour = GetColourForIndexFromPlacement(indexFromPlacement)
                     });
                 }
 
-                beatIndex = 0;
+                indexFromPlacement = 0;
 
-                for (float s = startPosition.Y - DistanceSpacing; s >= 0 && beatIndex < MaxIntervals; s -= DistanceSpacing, beatIndex++)
+                for (float s = StartPosition.Y - DistanceSpacing; s >= 0 && indexFromPlacement < MaxIntervals; s -= DistanceSpacing, indexFromPlacement++)
                 {
                     AddInternal(new Circle
                     {
                         Origin = Anchor.Centre,
                         Size = new Vector2(10, 5),
-                        Position = new Vector2(startPosition.X, s),
-                        Colour = GetColourForBeatIndex(beatIndex)
+                        Position = new Vector2(StartPosition.X, s),
+                        Colour = GetColourForIndexFromPlacement(indexFromPlacement)
                     });
                 }
             }
diff --git a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
index 23ed10b92d..730f482f83 100644
--- a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
         }
 
-        protected override void CreateContent(Vector2 startPosition)
+        protected override void CreateContent()
         {
             const float crosshair_thickness = 1;
             const float crosshair_max_size = 10;
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 new Box
                 {
                     Origin = Anchor.Centre,
-                    Position = startPosition,
+                    Position = StartPosition,
                     Width = crosshair_thickness,
                     EdgeSmoothness = new Vector2(1),
                     Height = Math.Min(crosshair_max_size, DistanceSpacing * 2),
@@ -34,15 +34,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 new Box
                 {
                     Origin = Anchor.Centre,
-                    Position = startPosition,
+                    Position = StartPosition,
                     EdgeSmoothness = new Vector2(1),
                     Width = Math.Min(crosshair_max_size, DistanceSpacing * 2),
                     Height = crosshair_thickness,
                 }
             });
 
-            float dx = Math.Max(startPosition.X, DrawWidth - startPosition.X);
-            float dy = Math.Max(startPosition.Y, DrawHeight - startPosition.Y);
+            float dx = Math.Max(StartPosition.X, DrawWidth - StartPosition.X);
+            float dy = Math.Max(StartPosition.Y, DrawHeight - StartPosition.Y);
             float maxDistance = new Vector2(dx, dy).Length;
             int requiredCircles = Math.Min(MaxIntervals, (int)(maxDistance / DistanceSpacing));
 
@@ -53,11 +53,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 AddInternal(new CircularProgress
                 {
                     Origin = Anchor.Centre,
-                    Position = startPosition,
+                    Position = StartPosition,
                     Current = { Value = 1 },
                     Size = new Vector2(radius),
                     InnerRadius = 4 * 1f / radius,
-                    Colour = GetColourForBeatIndex(i)
+                    Colour = GetColourForIndexFromPlacement(i)
                 });
             }
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
index 3bbccd612b..bce8878766 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
@@ -106,7 +107,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (!gridCache.IsValid)
             {
                 ClearInternal();
-                CreateContent(StartPosition);
+                CreateContent();
                 gridCache.Validate();
             }
         }
@@ -114,7 +115,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Creates the content which visualises the grid ticks.
         /// </summary>
-        protected abstract void CreateContent(Vector2 startPosition);
+        protected abstract void CreateContent();
 
         /// <summary>
         /// Snaps a position to this grid.
@@ -126,13 +127,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Retrieves the applicable colour for a beat index.
         /// </summary>
-        /// <param name="index">The 0-based beat index.</param>
+        /// <param name="placementIndex">The 0-based beat index from the point of placement.</param>
         /// <returns>The applicable colour.</returns>
-        protected ColourInfo GetColourForBeatIndex(int index)
+        protected ColourInfo GetColourForIndexFromPlacement(int placementIndex)
         {
-            var colour = BindableBeatDivisor.GetColourFor(BindableBeatDivisor.GetDivisorForBeatIndex(index + 1, beatDivisor.Value), Colours);
+            var timingPoint = beatmap.ControlPointInfo.TimingPointAt(StartTime);
+            var beatIndex = (int)Math.Round((StartTime - timingPoint.Time) / timingPoint.BeatLength * beatDivisor.Value);
+            var colour = BindableBeatDivisor.GetColourFor(BindableBeatDivisor.GetDivisorForBeatIndex(beatIndex + placementIndex + 1, beatDivisor.Value), Colours);
 
-            int repeatIndex = index / beatDivisor.Value;
+            int repeatIndex = placementIndex / beatDivisor.Value;
             return colour.MultiplyAlpha(0.5f / (repeatIndex + 1));
         }
     }

From 58654f28b67e4ce29d50125237e075007f0ec7ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 12:48:24 +0900
Subject: [PATCH 00340/10326] Fix beat snap implementation being incorrect

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs               | 4 ++--
 osu.Game/Rulesets/Edit/IBeatSnapProvider.cs               | 8 ++++----
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs  | 2 +-
 osu.Game/Screens/Edit/Editor.cs                           | 2 +-
 osu.Game/Screens/Edit/EditorBeatmap.cs                    | 8 +++++---
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 9ee3bacf9b..252b418523 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -275,10 +275,10 @@ namespace osu.Game.Rulesets.Edit
         }
 
         public override double GetSnappedDurationFromDistance(double referenceTime, float distance)
-            => beatSnapProvider.SnapTime(referenceTime, DistanceToDuration(referenceTime, distance));
+            => beatSnapProvider.SnapTime(referenceTime + DistanceToDuration(referenceTime, distance), referenceTime) - referenceTime;
 
         public override float GetSnappedDistanceFromDistance(double referenceTime, float distance)
-            => DurationToDistance(referenceTime, beatSnapProvider.SnapTime(referenceTime, DistanceToDuration(referenceTime, distance)));
+            => DurationToDistance(referenceTime, beatSnapProvider.SnapTime(DistanceToDuration(referenceTime, distance), referenceTime));
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs b/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs
index e1daafaebe..616f854cd7 100644
--- a/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IBeatSnapProvider.cs
@@ -8,10 +8,10 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Snaps a duration to the closest beat of a timing point applicable at the reference time.
         /// </summary>
-        /// <param name="referenceTime">The time of the timing point which <paramref name="duration"/> resides in.</param>
-        /// <param name="duration">The duration to snap.</param>
-        /// <returns>A value that represents <paramref name="duration"/> snapped to the closest beat of the timing point.</returns>
-        double SnapTime(double referenceTime, double duration);
+        /// <param name="time">The time to snap.</param>
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        /// <returns>A value that represents <paramref name="time"/> snapped to the closest beat of the timing point.</returns>
+        double SnapTime(double time, double? referenceTime = null);
 
         /// <summary>
         /// Get the most appropriate beat length at a given time.
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 96395696c3..2dd7ad79ba 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         public (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time)
         {
             var targetTime = (position.X / Content.DrawWidth) * track.Length;
-            return (position, beatSnapProvider.SnapTime(targetTime, targetTime));
+            return (position, beatSnapProvider.SnapTime(targetTime));
         }
 
         public float GetBeatSnapDistanceAt(double referenceTime) => throw new NotImplementedException();
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index eae94a3c8e..8c7270d3a2 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -348,7 +348,7 @@ namespace osu.Game.Screens.Edit
             beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
         }
 
-        public double SnapTime(double referenceTime, double duration) => editorBeatmap.SnapTime(referenceTime, duration);
+        public double SnapTime(double time, double? referenceTime) => editorBeatmap.SnapTime(time, referenceTime);
 
         public double GetBeatLengthAtTime(double referenceTime) => editorBeatmap.GetBeatLengthAtTime(referenceTime);
 
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 9c75d40bec..2d3ecf583e 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -128,12 +128,14 @@ namespace osu.Game.Screens.Edit
             return list.Count - 1;
         }
 
-        public double SnapTime(double referenceTime, double duration)
+        public double SnapTime(double time, double? referenceTime)
         {
-            double beatLength = GetBeatLengthAtTime(referenceTime);
+            var timingPoint = ControlPointInfo.TimingPointAt(referenceTime ?? time);
+
+            var beatLength = timingPoint.BeatLength / BeatDivisor;
 
             // A 1ms offset prevents rounding errors due to minute variations in duration
-            return (int)((duration + 1) / beatLength) * beatLength;
+            return timingPoint.Time + (int)Math.Round(((time - timingPoint.Time) + 1) / beatLength) * beatLength;
         }
 
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;

From 4bb33046ca3b4237c3227c3bbba4c60c6084971a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 13:02:29 +0900
Subject: [PATCH 00341/10326] Standardise editor timeline zoom across maps of
 all lengths

---
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs  | 7 ++++++-
 .../Components/Timeline/ZoomableScrollContainer.cs        | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 96395696c3..b4baa64086 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -30,7 +30,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             ZoomDuration = 200;
             ZoomEasing = Easing.OutQuint;
-            Zoom = 10;
             ScrollbarVisible = false;
         }
 
@@ -61,9 +60,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 waveform.Waveform = b.NewValue.Waveform;
                 track = b.NewValue.Track;
+
+                MinZoom = getZoomLevelForVisibleMilliseconds(10000);
+                MaxZoom = getZoomLevelForVisibleMilliseconds(500);
+                Zoom = getZoomLevelForVisibleMilliseconds(2000);
             }, true);
         }
 
+        private float getZoomLevelForVisibleMilliseconds(double milliseconds) => (float)(track.Length / milliseconds);
+
         /// <summary>
         /// The timeline's scroll position in the last frame.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 9aa527667b..7ce8a751e0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -36,12 +36,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             base.Content.Add(zoomedContent = new Container { RelativeSizeAxes = Axes.Y });
         }
 
-        private int minZoom = 1;
+        private float minZoom = 1;
 
         /// <summary>
         /// The minimum zoom level allowed.
         /// </summary>
-        public int MinZoom
+        public float MinZoom
         {
             get => minZoom;
             set
@@ -56,12 +56,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        private int maxZoom = 60;
+        private float maxZoom = 60;
 
         /// <summary>
         /// The maximum zoom level allowed.
         /// </summary>
-        public int MaxZoom
+        public float MaxZoom
         {
             get => maxZoom;
             set

From aa264cd2a8c89f77c966471661e6b76d781e27bf Mon Sep 17 00:00:00 2001
From: unknown <n20gaming2000@gmail.com>
Date: Tue, 28 Jan 2020 12:32:30 +0800
Subject: [PATCH 00342/10326] allow tooltip to show as percentage as needed

---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs      |  8 ++++++--
 .../Settings/Sections/Audio/VolumeSettings.cs        |  8 ++++----
 .../Settings/Sections/Gameplay/GeneralSettings.cs    |  6 ++++--
 .../Settings/Sections/Graphics/LayoutSettings.cs     | 12 ++++++++----
 osu.Game/Overlays/Settings/SettingsSlider.cs         |  6 ++++++
 .../Screens/Play/PlayerSettings/VisualSettings.cs    | 10 ++++++++--
 6 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 2112aac6a3..1058595232 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Graphics.UserInterface
         private readonly Container nubContainer;
 
         public virtual string TooltipText { get; private set; }
+        public bool DisplayAsPercentage { get; set; }
 
         private Color4 accentColour;
 
@@ -172,8 +173,11 @@ namespace osu.Game.Graphics.UserInterface
                 double floatMinValue = CurrentNumber.MinValue.ToDouble(NumberFormatInfo.InvariantInfo);
                 double floatMaxValue = CurrentNumber.MaxValue.ToDouble(NumberFormatInfo.InvariantInfo);
 
-                if (floatMaxValue == 1 && floatMinValue >= -1)
-                    TooltipText = floatValue.ToString("P0");
+                if (DisplayAsPercentage)
+                {
+                    double percentage = floatValue / floatMaxValue;
+                    TooltipText = percentage.ToString("P0");
+                }
                 else
                 {
                     var decimalPrecision = normalise(CurrentNumber.Precision.ToDecimal(NumberFormatInfo.InvariantInfo), max_decimal_digits);
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
index 0124f7090e..fe7f4c4908 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
@@ -17,10 +17,10 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
         {
             Children = new Drawable[]
             {
-                new SettingsSlider<double> { LabelText = "Master", Bindable = audio.Volume, KeyboardStep = 0.01f },
-                new SettingsSlider<double> { LabelText = "Master (window inactive)", Bindable = config.GetBindable<double>(OsuSetting.VolumeInactive), KeyboardStep = 0.01f },
-                new SettingsSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample, KeyboardStep = 0.01f },
-                new SettingsSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack, KeyboardStep = 0.01f },
+                new SettingsSlider<double> { LabelText = "Master", Bindable = audio.Volume, KeyboardStep = 0.01f, DisplayAsPercentage = true },
+                new SettingsSlider<double> { LabelText = "Master (window inactive)", Bindable = config.GetBindable<double>(OsuSetting.VolumeInactive), KeyboardStep = 0.01f, DisplayAsPercentage = true },
+                new SettingsSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample, KeyboardStep = 0.01f, DisplayAsPercentage = true },
+                new SettingsSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack, KeyboardStep = 0.01f, DisplayAsPercentage = true },
             };
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 08bc67e43e..2d2cd42213 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -21,13 +21,15 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Background dim",
                     Bindable = config.GetBindable<double>(OsuSetting.DimLevel),
-                    KeyboardStep = 0.01f
+                    KeyboardStep = 0.01f,
+                    DisplayAsPercentage = true
                 },
                 new SettingsSlider<double>
                 {
                     LabelText = "Background blur",
                     Bindable = config.GetBindable<double>(OsuSetting.BlurLevel),
-                    KeyboardStep = 0.01f
+                    KeyboardStep = 0.01f,
+                    DisplayAsPercentage = true
                 },
                 new SettingsCheckbox
                 {
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 02b9edd975..efbb08b7df 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -98,25 +98,29 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                         {
                             LabelText = "Horizontal position",
                             Bindable = scalingPositionX,
-                            KeyboardStep = 0.01f
+                            KeyboardStep = 0.01f,
+                            DisplayAsPercentage = true
                         },
                         new SettingsSlider<float>
                         {
                             LabelText = "Vertical position",
                             Bindable = scalingPositionY,
-                            KeyboardStep = 0.01f
+                            KeyboardStep = 0.01f,
+                            DisplayAsPercentage = true
                         },
                         new SettingsSlider<float>
                         {
                             LabelText = "Horizontal scale",
                             Bindable = scalingSizeX,
-                            KeyboardStep = 0.01f
+                            KeyboardStep = 0.01f,
+                            DisplayAsPercentage = true
                         },
                         new SettingsSlider<float>
                         {
                             LabelText = "Vertical scale",
                             Bindable = scalingSizeY,
-                            KeyboardStep = 0.01f
+                            KeyboardStep = 0.01f,
+                            DisplayAsPercentage = true
                         },
                     }
                 },
diff --git a/osu.Game/Overlays/Settings/SettingsSlider.cs b/osu.Game/Overlays/Settings/SettingsSlider.cs
index 96c0279a7b..a7485f77cd 100644
--- a/osu.Game/Overlays/Settings/SettingsSlider.cs
+++ b/osu.Game/Overlays/Settings/SettingsSlider.cs
@@ -33,5 +33,11 @@ namespace osu.Game.Overlays.Settings
             get => ((TSlider)Control).KeyboardStep;
             set => ((TSlider)Control).KeyboardStep = value;
         }
+
+        public bool DisplayAsPercentage
+        {
+            get => ((TSlider)Control).DisplayAsPercentage;
+            set => ((TSlider)Control).DisplayAsPercentage = value;
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
index ff64f35a18..9db3a587fa 100644
--- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
@@ -27,12 +27,18 @@ namespace osu.Game.Screens.Play.PlayerSettings
                 {
                     Text = "Background dim:"
                 },
-                dimSliderBar = new PlayerSliderBar<double>(),
+                dimSliderBar = new PlayerSliderBar<double>
+                {
+                    DisplayAsPercentage = true
+                },
                 new OsuSpriteText
                 {
                     Text = "Background blur:"
                 },
-                blurSliderBar = new PlayerSliderBar<double>(),
+                blurSliderBar = new PlayerSliderBar<double>
+                {
+                    DisplayAsPercentage = true
+                },
                 new OsuSpriteText
                 {
                     Text = "Toggles:"

From a3cfeb08d41d3b4b8235b6422fc35c8d5cf16b0d Mon Sep 17 00:00:00 2001
From: unknown <n20gaming2000@gmail.com>
Date: Tue, 28 Jan 2020 12:34:17 +0800
Subject: [PATCH 00343/10326] remove unused assignment

---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 1058595232..d908f046bd 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -170,7 +170,6 @@ namespace osu.Game.Graphics.UserInterface
             else
             {
                 double floatValue = value.ToDouble(NumberFormatInfo.InvariantInfo);
-                double floatMinValue = CurrentNumber.MinValue.ToDouble(NumberFormatInfo.InvariantInfo);
                 double floatMaxValue = CurrentNumber.MaxValue.ToDouble(NumberFormatInfo.InvariantInfo);
 
                 if (DisplayAsPercentage)

From 596a01661cfed0e2dc275c105754fb6c4304adb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 13:42:22 +0900
Subject: [PATCH 00344/10326] Remove 1ms offset and update tests

---
 ...tSceneHitObjectComposerDistanceSnapping.cs | 30 ++++++++++---------
 osu.Game/Screens/Edit/EditorBeatmap.cs        |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
index e825df5a3f..5a4e76d586 100644
--- a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -118,17 +118,19 @@ namespace osu.Game.Tests.Editor
         [Test]
         public void TestGetSnappedDurationFromDistance()
         {
-            assertSnappedDuration(50, 0);
+            assertSnappedDuration(0, 0);
+            assertSnappedDuration(50, 1000);
             assertSnappedDuration(100, 1000);
-            assertSnappedDuration(150, 1000);
+            assertSnappedDuration(150, 2000);
             assertSnappedDuration(200, 2000);
-            assertSnappedDuration(250, 2000);
+            assertSnappedDuration(250, 3000);
 
             AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier = 2);
 
+            assertSnappedDuration(0, 0);
             assertSnappedDuration(50, 0);
-            assertSnappedDuration(100, 0);
-            assertSnappedDuration(150, 0);
+            assertSnappedDuration(100, 1000);
+            assertSnappedDuration(150, 1000);
             assertSnappedDuration(200, 1000);
             assertSnappedDuration(250, 1000);
 
@@ -139,8 +141,8 @@ namespace osu.Game.Tests.Editor
             });
 
             assertSnappedDuration(50, 0);
-            assertSnappedDuration(100, 0);
-            assertSnappedDuration(150, 0);
+            assertSnappedDuration(100, 500);
+            assertSnappedDuration(150, 500);
             assertSnappedDuration(200, 500);
             assertSnappedDuration(250, 500);
             assertSnappedDuration(400, 1000);
@@ -149,17 +151,17 @@ namespace osu.Game.Tests.Editor
         [Test]
         public void GetSnappedDistanceFromDistance()
         {
-            assertSnappedDistance(50, 0);
+            assertSnappedDistance(50, 100);
             assertSnappedDistance(100, 100);
-            assertSnappedDistance(150, 100);
+            assertSnappedDistance(150, 200);
             assertSnappedDistance(200, 200);
-            assertSnappedDistance(250, 200);
+            assertSnappedDistance(250, 300);
 
             AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier = 2);
 
             assertSnappedDistance(50, 0);
-            assertSnappedDistance(100, 0);
-            assertSnappedDistance(150, 0);
+            assertSnappedDistance(100, 200);
+            assertSnappedDistance(150, 200);
             assertSnappedDistance(200, 200);
             assertSnappedDistance(250, 200);
 
@@ -170,8 +172,8 @@ namespace osu.Game.Tests.Editor
             });
 
             assertSnappedDistance(50, 0);
-            assertSnappedDistance(100, 0);
-            assertSnappedDistance(150, 0);
+            assertSnappedDistance(100, 200);
+            assertSnappedDistance(150, 200);
             assertSnappedDistance(200, 200);
             assertSnappedDistance(250, 200);
             assertSnappedDistance(400, 400);
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 2d3ecf583e..385afc2392 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Edit
             var beatLength = timingPoint.BeatLength / BeatDivisor;
 
             // A 1ms offset prevents rounding errors due to minute variations in duration
-            return timingPoint.Time + (int)Math.Round(((time - timingPoint.Time) + 1) / beatLength) * beatLength;
+            return timingPoint.Time + (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero) * beatLength;
         }
 
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;

From e81d3c51edb0f4ca502409593d03d34c0b523a1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 15:00:45 +0900
Subject: [PATCH 00345/10326] Move select tool to an actual tool implementation

Also tidies up radio button action firing so calling Select actually fires the associated action in all cases.
---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 14 ++++----
 .../Edit/Tools/HitObjectCompositionTool.cs    |  2 ++
 osu.Game/Rulesets/Edit/Tools/SelectTool.cs    | 15 +++++++++
 .../RadioButtons/DrawableRadioButton.cs       | 18 ++---------
 .../Components/RadioButtons/RadioButton.cs    | 32 +++++++++++--------
 5 files changed, 44 insertions(+), 37 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/Tools/SelectTool.cs

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 9ee3bacf9b..c413d25f09 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -137,12 +137,12 @@ namespace osu.Game.Rulesets.Edit
                 }
             };
 
-            toolboxCollection.Items =
-                CompositionTools.Select(t => new RadioButton(t.Name, () => selectTool(t)))
-                                .Prepend(new RadioButton("Select", () => selectTool(null)))
-                                .ToList();
+            toolboxCollection.Items = CompositionTools
+                                      .Prepend(new SelectTool())
+                                      .Select(t => new RadioButton(t.Name, () => toolSelected(t)))
+                                      .ToList();
 
-            toolboxCollection.Items[0].Select();
+            toolboxCollection.Items.First().Select();
 
             blueprintContainer.SelectionChanged += selectionChanged;
         }
@@ -187,11 +187,11 @@ namespace osu.Game.Rulesets.Edit
                 showGridFor(hitObjects);
         }
 
-        private void selectTool(HitObjectCompositionTool tool)
+        private void toolSelected(HitObjectCompositionTool tool)
         {
             blueprintContainer.CurrentTool = tool;
 
-            if (tool == null)
+            if (tool is SelectTool)
                 distanceSnapGridContainer.Hide();
             else
                 showGridFor(Enumerable.Empty<HitObject>());
diff --git a/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs b/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
index 825c63e6ee..0631031302 100644
--- a/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
+++ b/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
@@ -13,5 +13,7 @@ namespace osu.Game.Rulesets.Edit.Tools
         }
 
         public abstract PlacementBlueprint CreatePlacementBlueprint();
+
+        public override string ToString() => Name;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Tools/SelectTool.cs b/osu.Game/Rulesets/Edit/Tools/SelectTool.cs
new file mode 100644
index 0000000000..b96eeb0790
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Tools/SelectTool.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.
+
+namespace osu.Game.Rulesets.Edit.Tools
+{
+    public class SelectTool : HitObjectCompositionTool
+    {
+        public SelectTool()
+            : base("Select")
+        {
+        }
+
+        public override PlacementBlueprint CreatePlacementBlueprint() => null;
+    }
+}
diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
index 5854d66aa8..7be91f4e8e 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 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.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -37,8 +36,8 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
         {
             this.button = button;
 
-            Text = button.Text;
-            Action = button.Action;
+            Text = button.Item.ToString();
+            Action = button.Select;
 
             RelativeSizeAxes = Axes.X;
 
@@ -100,19 +99,6 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
             bubble.Colour = button.Selected.Value ? selectedBubbleColour : defaultBubbleColour;
         }
 
-        protected override bool OnClick(ClickEvent e)
-        {
-            if (button.Selected.Value)
-                return true;
-
-            if (!Enabled.Value)
-                return true;
-
-            button.Selected.Value = true;
-
-            return base.OnClick(e);
-        }
-
         protected override SpriteText CreateText() => new OsuSpriteText
         {
             Depth = -1,
diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
index 3692c0437b..b515d7c8bd 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
@@ -15,33 +15,37 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
         public readonly BindableBool Selected;
 
         /// <summary>
-        /// The text that should be displayed in this button.
+        /// The item related to this button.
         /// </summary>
-        public string Text;
+        public object Item;
 
-        /// <summary>
-        /// The <see cref="Action"/> that should be invoked when this button is selected.
-        /// </summary>
-        public Action Action;
+        private readonly Action action;
 
-        public RadioButton(string text, Action action)
+        public RadioButton(object item, Action action)
         {
-            Text = text;
-            Action = action;
+            Item = item;
+            this.action = action;
             Selected = new BindableBool();
         }
 
-        public RadioButton(string text)
-            : this(text, null)
+        public RadioButton(string item)
+            : this(item, null)
         {
-            Text = text;
-            Action = null;
+            Item = item;
+            action = null;
         }
 
         /// <summary>
         /// Selects this <see cref="RadioButton"/>.
         /// </summary>
-        public void Select() => Selected.Value = true;
+        public void Select()
+        {
+            if (!Selected.Value)
+            {
+                Selected.Value = true;
+                action?.Invoke();
+            }
+        }
 
         /// <summary>
         /// Deselects this <see cref="RadioButton"/>.

From 7e0c45de6dfb736d749f3606b8c33eded764c432 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 15:08:02 +0900
Subject: [PATCH 00346/10326] Allow selecting composition tools using 1-4 keys

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index c413d25f09..82e0905bd8 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 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;
@@ -25,6 +26,7 @@ using osu.Game.Screens.Edit.Components.RadioButtons;
 using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
+using Key = osuTK.Input.Key;
 
 namespace osu.Game.Rulesets.Edit
 {
@@ -58,6 +60,8 @@ namespace osu.Game.Rulesets.Edit
 
         private InputManager inputManager;
 
+        private RadioButtonCollection toolboxCollection;
+
         protected HitObjectComposer(Ruleset ruleset)
         {
             Ruleset = ruleset;
@@ -100,7 +104,6 @@ namespace osu.Game.Rulesets.Edit
             layerContainers.Add(layerBelowRuleset);
             layerContainers.Add(layerAboveRuleset);
 
-            RadioButtonCollection toolboxCollection;
             InternalChild = new GridContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -147,6 +150,22 @@ namespace osu.Game.Rulesets.Edit
             blueprintContainer.SelectionChanged += selectionChanged;
         }
 
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (e.Key >= Key.Number1 && e.Key <= Key.Number9)
+            {
+                var item = toolboxCollection.Items.Skip(e.Key - Key.Number1).FirstOrDefault();
+
+                if (item != null)
+                {
+                    item.Select();
+                    return true;
+                }
+            }
+
+            return base.OnKeyDown(e);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 8e2159e4eba213a624dbb759bd5ff130207590b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 15:07:37 +0900
Subject: [PATCH 00347/10326] Ensure selection tool correctly matches selection
 state

- When a selection is made (via the timeline) the selection tool should become the select tool.
- When the selection tool is changed to anything *but* the select tool, the selection should be cleared.
---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 21 ++++++++++++++-----
 .../Compose/Components/BlueprintContainer.cs  |  8 +++----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index c413d25f09..1d97567b39 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -58,6 +58,8 @@ namespace osu.Game.Rulesets.Edit
 
         private InputManager inputManager;
 
+        private RadioButtonCollection toolboxCollection;
+
         protected HitObjectComposer(Ruleset ruleset)
         {
             Ruleset = ruleset;
@@ -100,7 +102,6 @@ namespace osu.Game.Rulesets.Edit
             layerContainers.Add(layerBelowRuleset);
             layerContainers.Add(layerAboveRuleset);
 
-            RadioButtonCollection toolboxCollection;
             InternalChild = new GridContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -142,7 +143,7 @@ namespace osu.Game.Rulesets.Edit
                                       .Select(t => new RadioButton(t.Name, () => toolSelected(t)))
                                       .ToList();
 
-            toolboxCollection.Items.First().Select();
+            setSelectTool();
 
             blueprintContainer.SelectionChanged += selectionChanged;
         }
@@ -181,12 +182,19 @@ namespace osu.Game.Rulesets.Edit
         {
             var hitObjects = selectedHitObjects.ToArray();
 
-            if (!hitObjects.Any())
-                distanceSnapGridContainer.Hide();
-            else
+            if (hitObjects.Any())
+            {
+                // ensure in selection mode if a selection is made.
+                setSelectTool();
+
                 showGridFor(hitObjects);
+            }
+            else
+                distanceSnapGridContainer.Hide();
         }
 
+        private void setSelectTool() => toolboxCollection.Items.First().Select();
+
         private void toolSelected(HitObjectCompositionTool tool)
         {
             blueprintContainer.CurrentTool = tool;
@@ -194,7 +202,10 @@ namespace osu.Game.Rulesets.Edit
             if (tool is SelectTool)
                 distanceSnapGridContainer.Hide();
             else
+            {
+                EditorBeatmap.SelectedHitObjects.Clear();
                 showGridFor(Enumerable.Empty<HitObject>());
+            }
         }
 
         private void showGridFor(IEnumerable<HitObject> selectedHitObjects)
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 6b21f56567..675b2b648d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -74,12 +74,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 foreach (var o in objects)
                     selectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
+
+                SelectionChanged?.Invoke(selectedHitObjects);
             };
 
             selectedHitObjects.ItemsRemoved += objects =>
             {
                 foreach (var o in objects)
                     selectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
+
+                SelectionChanged?.Invoke(selectedHitObjects);
             };
         }
 
@@ -332,8 +336,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectionHandler.HandleSelected(blueprint);
             selectionBlueprints.ChangeChildDepth(blueprint, 1);
             beatmap.SelectedHitObjects.Add(blueprint.HitObject);
-
-            SelectionChanged?.Invoke(selectionHandler.SelectedHitObjects);
         }
 
         private void onBlueprintDeselected(SelectionBlueprint blueprint)
@@ -341,8 +343,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectionHandler.HandleDeselected(blueprint);
             selectionBlueprints.ChangeChildDepth(blueprint, 0);
             beatmap.SelectedHitObjects.Remove(blueprint.HitObject);
-
-            SelectionChanged?.Invoke(selectionHandler.SelectedHitObjects);
         }
 
         #endregion

From a6cac072ee7f4376238094fcee94ef926162dab6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 15:17:50 +0900
Subject: [PATCH 00348/10326] Change default method style for better IDE
 autocompletion

---
 .editorconfig       | 2 +-
 osu.sln.DotSettings | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 8cdb92d11c..67f98f94eb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -135,7 +135,7 @@ csharp_preferred_modifier_order = public,private,protected,internal,new,abstract
 csharp_style_expression_bodied_accessors = true:warning
 csharp_style_expression_bodied_constructors = false:none
 csharp_style_expression_bodied_indexers = true:warning
-csharp_style_expression_bodied_methods = true:silent
+csharp_style_expression_bodied_methods = false:silent
 csharp_style_expression_bodied_operators = true:warning
 csharp_style_expression_bodied_properties = true:warning
 csharp_style_expression_bodied_local_functions = true:silent
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 6d131bf423..e3b64c03b9 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -1,4 +1,4 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
@@ -245,7 +245,7 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">RequiredForMultiline</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">BlockBody</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>

From f48c7db8276a38727914e8643cb20b9016eebe44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 15:41:09 +0900
Subject: [PATCH 00349/10326] Use Drawable.Empty instead of container

---
 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 b165882864..5596f71dd0 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -75,10 +75,10 @@ namespace osu.Game.Overlays
         }
 
         [NotNull]
-        protected virtual Drawable CreateContent() => new Container();
+        protected virtual Drawable CreateContent() => Drawable.Empty();
 
         [NotNull]
-        protected virtual Drawable CreateBackground() => new Container();
+        protected virtual Drawable CreateBackground() => Drawable.Empty();
 
         protected abstract ScreenTitle CreateTitle();
     }

From 40379a5e225eb8b2b8f13a1214858e5dedf059e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 16:04:13 +0900
Subject: [PATCH 00350/10326] Use foreach

---
 osu.Game/Screens/Edit/BindableBeatDivisor.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/BindableBeatDivisor.cs b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
index be1e121a99..d9477dd4bc 100644
--- a/osu.Game/Screens/Edit/BindableBeatDivisor.cs
+++ b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
@@ -91,10 +91,8 @@ namespace osu.Game.Screens.Edit
         {
             int beat = index % beatDivisor;
 
-            for (int i = 0; i < BindableBeatDivisor.VALID_DIVISORS.Length; i++)
+            foreach (var divisor in BindableBeatDivisor.VALID_DIVISORS)
             {
-                int divisor = BindableBeatDivisor.VALID_DIVISORS[i];
-
                 if ((beat * divisor) % beatDivisor == 0)
                     return divisor;
             }

From 5a2fd18bdd46ea994d7605cf757daa4434b36fb1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 28 Jan 2020 10:21:27 +0300
Subject: [PATCH 00351/10326] Allow better async support for CommentsContainer

---
 .../Overlays/Comments/CommentsContainer.cs    | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 36b165c97d..78df73eb0d 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -30,22 +30,22 @@ namespace osu.Game.Overlays.Comments
         private CancellationTokenSource loadCancellation;
         private int currentPage;
 
-        private readonly Box background;
-        private readonly Box footerBackground;
-        private readonly FillFlowContainer content;
-        private readonly DeletedChildrenPlaceholder deletedChildrenPlaceholder;
-        private readonly CommentsShowMoreButton moreButton;
-        private readonly TotalCommentsCounter commentCounter;
+        private FillFlowContainer content;
+        private DeletedChildrenPlaceholder deletedChildrenPlaceholder;
+        private CommentsShowMoreButton moreButton;
+        private TotalCommentsCounter commentCounter;
 
-        public CommentsContainer()
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             AddRangeInternal(new Drawable[]
             {
-                background = new Box
+                new Box
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background5
                 },
                 new FillFlowContainer
                 {
@@ -72,9 +72,10 @@ namespace osu.Game.Overlays.Comments
                             AutoSizeAxes = Axes.Y,
                             Children = new Drawable[]
                             {
-                                footerBackground = new Box
+                                new Box
                                 {
                                     RelativeSizeAxes = Axes.Both,
+                                    Colour = colourProvider.Background4
                                 },
                                 new FillFlowContainer
                                 {
@@ -109,13 +110,6 @@ namespace osu.Game.Overlays.Comments
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            background.Colour = colourProvider.Background5;
-            footerBackground.Colour = colourProvider.Background4;
-        }
-
         protected override void LoadComplete()
         {
             Sort.BindValueChanged(_ => refetchComments(), true);

From 12ff51f686cfd884200dabed1f2ef87dc7f08d91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 17:21:24 +0900
Subject: [PATCH 00352/10326] Fix key count being incorrectly adjusted by
 hard/easy mods

---
 .../Screens/Select/Details/AdvancedStats.cs     | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index b7f60a8370..56c400e869 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -117,9 +117,20 @@ namespace osu.Game.Screens.Select.Details
                     mod.ApplyToDifficulty(adjustedDifficulty);
             }
 
-            // Account for mania differences
-            firstValue.Title = (Beatmap?.Ruleset?.ID ?? 0) == 3 ? "Key Amount" : "Circle Size";
-            firstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize);
+            switch (Beatmap?.Ruleset?.ID ?? 0)
+            {
+                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);
+                    break;
+
+                default:
+                    firstValue.Title = "Circle Size";
+                    firstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize);
+                    break;
+            }
 
             starDifficulty.Value = ((float)(Beatmap?.StarDifficulty ?? 0), null);
 

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 00353/10326] 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 894642d5883d75dcd9c1b294c6edde806994a06c Mon Sep 17 00:00:00 2001
From: unknown <n20gaming2000@gmail.com>
Date: Tue, 28 Jan 2020 18:04:00 +0800
Subject: [PATCH 00354/10326] add xmldoc and formatting

---
 .../Graphics/UserInterface/OsuSliderBar.cs    |  4 +++
 .../Settings/Sections/Audio/VolumeSettings.cs | 32 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index d908f046bd..2db1c881c0 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -35,6 +35,10 @@ namespace osu.Game.Graphics.UserInterface
         private readonly Container nubContainer;
 
         public virtual string TooltipText { get; private set; }
+
+        /// <summary>
+        /// Whether to format the tooltip as a percentage or the actual value.
+        /// </summary>
         public bool DisplayAsPercentage { get; set; }
 
         private Color4 accentColour;
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
index fe7f4c4908..bda677ecd6 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
@@ -17,10 +17,34 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
         {
             Children = new Drawable[]
             {
-                new SettingsSlider<double> { LabelText = "Master", Bindable = audio.Volume, KeyboardStep = 0.01f, DisplayAsPercentage = true },
-                new SettingsSlider<double> { LabelText = "Master (window inactive)", Bindable = config.GetBindable<double>(OsuSetting.VolumeInactive), KeyboardStep = 0.01f, DisplayAsPercentage = true },
-                new SettingsSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample, KeyboardStep = 0.01f, DisplayAsPercentage = true },
-                new SettingsSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack, KeyboardStep = 0.01f, DisplayAsPercentage = true },
+                new SettingsSlider<double>
+                {
+                    LabelText = "Master",
+                    Bindable = audio.Volume,
+                    KeyboardStep = 0.01f,
+                    DisplayAsPercentage = true
+                },
+                new SettingsSlider<double>
+                {
+                    LabelText = "Master (window inactive)",
+                    Bindable = config.GetBindable<double>(OsuSetting.VolumeInactive),
+                    KeyboardStep = 0.01f,
+                    DisplayAsPercentage = true
+                },
+                new SettingsSlider<double>
+                {
+                    LabelText = "Effect",
+                    Bindable = audio.VolumeSample,
+                    KeyboardStep = 0.01f,
+                    DisplayAsPercentage = true
+                },
+                new SettingsSlider<double>
+                {
+                    LabelText = "Music",
+                    Bindable = audio.VolumeTrack,
+                    KeyboardStep = 0.01f,
+                    DisplayAsPercentage = true
+                },
             };
         }
     }

From 0e0c730095e11e4320c50d4934d0ad60df6f5af8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 19:44:32 +0900
Subject: [PATCH 00355/10326] Add a method to recycle test storage between runs

---
 .../Visual/Menus/TestSceneScreenNavigation.cs |  2 ++
 osu.Game/Tests/Visual/OsuTestScene.cs         | 33 +++++++++++--------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
index 471f67b7b6..f3c5d2a7ef 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
@@ -65,6 +65,8 @@ namespace osu.Game.Tests.Visual.Menus
                     game.Dispose();
                 }
 
+                RecycleLocalStorage();
+
                 game = new TestOsuGame(LocalStorage, API);
                 game.SetHost(host);
 
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 8926c76018..41ab7fce99 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Tests.Visual
 
         protected new OsuScreenDependencies Dependencies { get; private set; }
 
-        private readonly Lazy<Storage> localStorage;
+        private Lazy<Storage> localStorage;
         protected Storage LocalStorage => localStorage.Value;
 
         private readonly Lazy<DatabaseContextFactory> contextFactory;
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Visual
 
         protected OsuTestScene()
         {
-            localStorage = new Lazy<Storage>(() => new NativeStorage($"{GetType().Name}-{Guid.NewGuid()}"));
+            RecycleLocalStorage();
             contextFactory = new Lazy<DatabaseContextFactory>(() =>
             {
                 var factory = new DatabaseContextFactory(LocalStorage);
@@ -104,6 +104,23 @@ namespace osu.Game.Tests.Visual
             base.Content.Add(content = new DrawSizePreservingFillContainer());
         }
 
+        public void RecycleLocalStorage()
+        {
+            if (localStorage?.IsValueCreated == true)
+            {
+                try
+                {
+                    localStorage.Value.DeleteDirectory(".");
+                }
+                catch
+                {
+                    // we don't really care if this fails; it will just leave folders lying around from test runs.
+                }
+            }
+
+            localStorage = new Lazy<Storage>(() => new NativeStorage($"{GetType().Name}-{Guid.NewGuid()}"));
+        }
+
         [Resolved]
         protected AudioManager Audio { get; private set; }
 
@@ -131,17 +148,7 @@ namespace osu.Game.Tests.Visual
             if (contextFactory.IsValueCreated)
                 contextFactory.Value.ResetDatabase();
 
-            if (localStorage.IsValueCreated)
-            {
-                try
-                {
-                    localStorage.Value.DeleteDirectory(".");
-                }
-                catch
-                {
-                    // we don't really care if this fails; it will just leave folders lying around from test runs.
-                }
-            }
+            RecycleLocalStorage();
         }
 
         protected override ITestSceneTestRunner CreateRunner() => new OsuTestSceneTestRunner();

From 2498709d0626c388c0a1d4801db7c743585a6618 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 19:46:57 +0900
Subject: [PATCH 00356/10326] Fix navigation test crashing when raw input is
 disabled

---
 osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
index 471f67b7b6..0908e527a6 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -65,10 +66,14 @@ namespace osu.Game.Tests.Visual.Menus
                     game.Dispose();
                 }
 
+                // see MouseSettings
+                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 trakcs without a device present
+                // 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);
 

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 00357/10326] 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 00358/10326] 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 00359/10326] 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 00360/10326] 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 00361/10326] 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 cfc4eaff59c72c41e41f2b16485429b581dfa134 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jan 2020 12:50:21 +0900
Subject: [PATCH 00362/10326] Fix display being incorrect when MaxValue is not
 1

---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 2db1c881c0..5c6c7aeafd 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -174,12 +174,10 @@ namespace osu.Game.Graphics.UserInterface
             else
             {
                 double floatValue = value.ToDouble(NumberFormatInfo.InvariantInfo);
-                double floatMaxValue = CurrentNumber.MaxValue.ToDouble(NumberFormatInfo.InvariantInfo);
 
                 if (DisplayAsPercentage)
                 {
-                    double percentage = floatValue / floatMaxValue;
-                    TooltipText = percentage.ToString("P0");
+                    TooltipText = floatValue.ToString("P0");
                 }
                 else
                 {

From aa597c193468b5b2f4c798412b41f003ad5e1e2d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jan 2020 12:55:07 +0900
Subject: [PATCH 00363/10326] Copy documentation across to SettingsSlider

---
 osu.Game/Overlays/Settings/SettingsSlider.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Overlays/Settings/SettingsSlider.cs b/osu.Game/Overlays/Settings/SettingsSlider.cs
index a7485f77cd..9fc3379b94 100644
--- a/osu.Game/Overlays/Settings/SettingsSlider.cs
+++ b/osu.Game/Overlays/Settings/SettingsSlider.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings
@@ -22,18 +23,28 @@ namespace osu.Game.Overlays.Settings
             RelativeSizeAxes = Axes.X
         };
 
+        /// <summary>
+        /// When set, value changes based on user input are only transferred to any bound control's Current on commit.
+        /// This is useful if the UI interaction could be adversely affected by the value changing, such as the position of the <see cref="SliderBar{T}"/> on the screen.
+        /// </summary>
         public bool TransferValueOnCommit
         {
             get => ((TSlider)Control).TransferValueOnCommit;
             set => ((TSlider)Control).TransferValueOnCommit = value;
         }
 
+        /// <summary>
+        /// A custom step value for each key press which actuates a change on this control.
+        /// </summary>
         public float KeyboardStep
         {
             get => ((TSlider)Control).KeyboardStep;
             set => ((TSlider)Control).KeyboardStep = value;
         }
 
+        /// <summary>
+        /// Whether to format the tooltip as a percentage or the actual value.
+        /// </summary>
         public bool DisplayAsPercentage
         {
             get => ((TSlider)Control).DisplayAsPercentage;

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 00364/10326] 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 f457ecaf83968ce794e42bb6f8198c842b738aac Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jan 2020 13:54:12 +0900
Subject: [PATCH 00365/10326] Fix random test failures

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 98b8e3c5d6..fc06780431 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -118,6 +118,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.ReleaseKey(Key.Enter);
             });
 
+            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
             AddAssert("ensure selection changed", () => selected != Beatmap.Value);
 
             AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
@@ -145,6 +146,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.ReleaseKey(Key.Down);
             });
 
+            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());
@@ -176,6 +178,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.ReleaseKey(Key.Enter);
             });
 
+            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
             AddAssert("ensure selection changed", () => selected != Beatmap.Value);
 
             AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
@@ -208,6 +211,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 
+            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());

From 9a47428bfd9fa68fd1ba9924d579f28260bec861 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jan 2020 14:40:42 +0900
Subject: [PATCH 00366/10326] Remove out of date comment

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

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 385afc2392..6edd62fa67 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -131,10 +131,8 @@ namespace osu.Game.Screens.Edit
         public double SnapTime(double time, double? referenceTime)
         {
             var timingPoint = ControlPointInfo.TimingPointAt(referenceTime ?? time);
-
             var beatLength = timingPoint.BeatLength / BeatDivisor;
 
-            // A 1ms offset prevents rounding errors due to minute variations in duration
             return timingPoint.Time + (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero) * beatLength;
         }
 

From 391681b7afaf17d14178d975c4292689fa37d4f9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jan 2020 15:16:48 +0900
Subject: [PATCH 00367/10326] Separate calculation to follow other examples

---
 osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
index bce8878766..479de64eab 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
@@ -132,7 +132,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected ColourInfo GetColourForIndexFromPlacement(int placementIndex)
         {
             var timingPoint = beatmap.ControlPointInfo.TimingPointAt(StartTime);
-            var beatIndex = (int)Math.Round((StartTime - timingPoint.Time) / timingPoint.BeatLength * beatDivisor.Value);
+            var beatLength = timingPoint.BeatLength / beatDivisor.Value;
+            var beatIndex = (int)Math.Round((StartTime - timingPoint.Time) / beatLength);
+
             var colour = BindableBeatDivisor.GetColourFor(BindableBeatDivisor.GetDivisorForBeatIndex(beatIndex + placementIndex + 1, beatDivisor.Value), Colours);
 
             int repeatIndex = placementIndex / beatDivisor.Value;

From 17294b1b09719724a8694b38aa374b15ebbc6501 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jan 2020 15:34:36 +0900
Subject: [PATCH 00368/10326] Make wind down max value 200%

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

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index 939766fee5..5e634ac434 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
             MinValue = 1,
-            MaxValue = 1.5,
+            MaxValue = 2,
             Default = 1,
             Value = 1,
             Precision = 0.01,

From 6e8bd35373701f7758e302010b5d994655e1afdd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jan 2020 14:23:23 +0900
Subject: [PATCH 00369/10326] Move navigation / game test scenes to new
 namespace

---
 .../Visual/Navigation/OsuGameTestScene.cs     | 122 ++++++++++++++++
 .../TestSceneScreenNavigation.cs              | 132 +++---------------
 2 files changed, 139 insertions(+), 115 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
 rename osu.Game.Tests/Visual/{Menus => Navigation}/TestSceneScreenNavigation.cs (54%)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
new file mode 100644
index 0000000000..662d9977ba
--- /dev/null
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Platform;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Overlays;
+using osu.Game.Rulesets;
+using osu.Game.Screens;
+using osu.Game.Screens.Menu;
+using osuTK.Graphics;
+using IntroSequence = osu.Game.Configuration.IntroSequence;
+
+namespace osu.Game.Tests.Visual.Navigation
+{
+    /// <summary>
+    /// A scene which tests full game flow.
+    /// </summary>
+    public abstract class OsuGameTestScene : ManualInputManagerTestScene
+    {
+        private GameHost host;
+
+        protected TestOsuGame Game;
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
+        {
+            this.host = host;
+
+            Child = new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = Color4.Black,
+            };
+        }
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("Create new game instance", () =>
+            {
+                if (Game != null)
+                {
+                    Remove(Game);
+                    Game.Dispose();
+                }
+
+                RecycleLocalStorage();
+
+                // see MouseSettings
+                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);
+            });
+
+            AddUntilStep("Wait for load", () => Game.IsLoaded);
+            AddUntilStep("Wait for intro", () => Game.ScreenStack.CurrentScreen is IntroScreen);
+
+            ConfirmAtMainMenu();
+        }
+
+        protected void ConfirmAtMainMenu() => AddUntilStep("Wait for main menu", () => Game.ScreenStack.CurrentScreen is MainMenu menu && menu.IsLoaded);
+
+        public class TestOsuGame : OsuGame
+        {
+            public new ScreenStack ScreenStack => base.ScreenStack;
+
+            public new BackButton BackButton => base.BackButton;
+
+            public new BeatmapManager BeatmapManager => base.BeatmapManager;
+
+            public new SettingsPanel Settings => base.Settings;
+
+            public new OsuConfigManager LocalConfig => base.LocalConfig;
+
+            public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap;
+
+            public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
+
+            protected override Loader CreateLoader() => new TestLoader();
+
+            public TestOsuGame(Storage storage, IAPIProvider api)
+            {
+                Storage = storage;
+                API = api;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                API.Login("Rhythm Champion", "osu!");
+            }
+        }
+
+        public class TestLoader : Loader
+        {
+            protected override ShaderPrecompiler CreateShaderPrecompiler() => new TestShaderPrecompiler();
+
+            private class TestShaderPrecompiler : ShaderPrecompiler
+            {
+                protected override bool AllLoaded => true;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
similarity index 54%
rename from osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
rename to osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index c4307a3ad3..d706d47384 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -6,85 +6,26 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
-using osu.Framework.Bindables;
-using osu.Framework.Configuration;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Platform;
 using osu.Framework.Screens;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
-using osu.Game.Screens;
-using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Tests.Beatmaps.IO;
 using osuTK;
-using osuTK.Graphics;
 using osuTK.Input;
-using IntroSequence = osu.Game.Configuration.IntroSequence;
 
-namespace osu.Game.Tests.Visual.Menus
+namespace osu.Game.Tests.Visual.Navigation
 {
-    public class TestSceneScreenNavigation : ManualInputManagerTestScene
+    public class TestSceneScreenNavigation : OsuGameTestScene
     {
         private const float click_padding = 25;
 
-        private GameHost host;
-        private TestOsuGame game;
+        private Vector2 backButtonPosition => Game.ToScreenSpace(new Vector2(click_padding, Game.LayoutRectangle.Bottom - click_padding));
 
-        private Vector2 backButtonPosition => game.ToScreenSpace(new Vector2(click_padding, game.LayoutRectangle.Bottom - click_padding));
-
-        private Vector2 optionsButtonPosition => game.ToScreenSpace(new Vector2(click_padding, click_padding));
-
-        [BackgroundDependencyLoader]
-        private void load(GameHost host)
-        {
-            this.host = host;
-
-            Child = new Box
-            {
-                RelativeSizeAxes = Axes.Both,
-                Colour = Color4.Black,
-            };
-        }
-
-        [SetUpSteps]
-        public void SetUpSteps()
-        {
-            AddStep("Create new game instance", () =>
-            {
-                if (game != null)
-                {
-                    Remove(game);
-                    game.Dispose();
-                }
-
-                RecycleLocalStorage();
-
-                // see MouseSettings
-                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);
-            });
-            AddUntilStep("Wait for load", () => game.IsLoaded);
-            AddUntilStep("Wait for intro", () => game.ScreenStack.CurrentScreen is IntroScreen);
-            confirmAtMainMenu();
-        }
+        private Vector2 optionsButtonPosition => Game.ToScreenSpace(new Vector2(click_padding, click_padding));
 
         [Test]
         public void TestExitSongSelectWithEscape()
@@ -105,21 +46,21 @@ namespace osu.Game.Tests.Visual.Menus
         {
             Player player = null;
 
-            WorkingBeatmap beatmap() => game.Beatmap.Value;
+            WorkingBeatmap beatmap() => Game.Beatmap.Value;
             Track track() => beatmap().Track;
 
             pushAndConfirm(() => new TestSongSelect());
 
-            AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).Wait());
+            AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(Game, virtualTrack: true).Wait());
 
-            AddUntilStep("wait for selected", () => !game.Beatmap.IsDefault);
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
 
             if (withUserPause)
-                AddStep("pause", () => game.Dependencies.Get<MusicController>().Stop());
+                AddStep("pause", () => Game.Dependencies.Get<MusicController>().Stop());
 
             AddStep("press enter", () => pressAndRelease(Key.Enter));
 
-            AddUntilStep("wait for player", () => (player = game.ScreenStack.CurrentScreen as Player) != null);
+            AddUntilStep("wait for player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
             AddUntilStep("wait for fail", () => player.HasFailed);
 
             AddUntilStep("wait for track stop", () => !track().IsRunning);
@@ -142,7 +83,7 @@ namespace osu.Game.Tests.Visual.Menus
             AddStep("Move mouse to backButton", () => InputManager.MoveMouseTo(backButtonPosition));
 
             // BackButton handles hover using its child button, so this checks whether or not any of BackButton's children are hovered.
-            AddUntilStep("Back button is hovered", () => InputManager.HoveredDrawables.Any(d => d.Parent == game.BackButton));
+            AddUntilStep("Back button is hovered", () => InputManager.HoveredDrawables.Any(d => d.Parent == Game.BackButton));
 
             AddStep("Click back button", () => InputManager.Click(MouseButton.Left));
             AddUntilStep("Overlay was hidden", () => songSelect.ModSelectOverlay.State.Value == Visibility.Hidden);
@@ -166,20 +107,20 @@ namespace osu.Game.Tests.Visual.Menus
         [Test]
         public void TestOpenOptionsAndExitWithEscape()
         {
-            AddUntilStep("Wait for options to load", () => game.Settings.IsLoaded);
+            AddUntilStep("Wait for options to load", () => Game.Settings.IsLoaded);
             AddStep("Enter menu", () => pressAndRelease(Key.Enter));
             AddStep("Move mouse to options overlay", () => InputManager.MoveMouseTo(optionsButtonPosition));
             AddStep("Click options overlay", () => InputManager.Click(MouseButton.Left));
-            AddAssert("Options overlay was opened", () => game.Settings.State.Value == Visibility.Visible);
+            AddAssert("Options overlay was opened", () => Game.Settings.State.Value == Visibility.Visible);
             AddStep("Hide options overlay using escape", () => pressAndRelease(Key.Escape));
-            AddAssert("Options overlay was closed", () => game.Settings.State.Value == Visibility.Hidden);
+            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);
+            AddStep("Push new screen", () => Game.ScreenStack.Push(screen = newScreen()));
+            AddUntilStep("Wait for new screen", () => Game.ScreenStack.CurrentScreen == screen && screen.IsLoaded);
         }
 
         private void pushEscape() =>
@@ -188,64 +129,25 @@ namespace osu.Game.Tests.Visual.Menus
         private void exitViaEscapeAndConfirm()
         {
             pushEscape();
-            confirmAtMainMenu();
+            ConfirmAtMainMenu();
         }
 
         private void exitViaBackButtonAndConfirm()
         {
             AddStep("Move mouse to backButton", () => InputManager.MoveMouseTo(backButtonPosition));
             AddStep("Click back button", () => InputManager.Click(MouseButton.Left));
-            confirmAtMainMenu();
+            ConfirmAtMainMenu();
         }
 
-        private void confirmAtMainMenu() => AddUntilStep("Wait for main menu", () => game.ScreenStack.CurrentScreen is MainMenu menu && menu.IsLoaded);
-
         private void pressAndRelease(Key key)
         {
             InputManager.PressKey(key);
             InputManager.ReleaseKey(key);
         }
 
-        private class TestOsuGame : OsuGame
-        {
-            public new ScreenStack ScreenStack => base.ScreenStack;
-
-            public new BackButton BackButton => base.BackButton;
-
-            public new SettingsPanel Settings => base.Settings;
-
-            public new OsuConfigManager LocalConfig => base.LocalConfig;
-
-            public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap;
-
-            protected override Loader CreateLoader() => new TestLoader();
-
-            public TestOsuGame(Storage storage, IAPIProvider api)
-            {
-                Storage = storage;
-                API = api;
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                API.Login("Rhythm Champion", "osu!");
-            }
-        }
-
         private class TestSongSelect : PlaySongSelect
         {
             public ModSelectOverlay ModSelectOverlay => ModSelect;
         }
-
-        private class TestLoader : Loader
-        {
-            protected override ShaderPrecompiler CreateShaderPrecompiler() => new TestShaderPrecompiler();
-
-            private class TestShaderPrecompiler : ShaderPrecompiler
-            {
-                protected override bool AllLoaded => true;
-            }
-        }
     }
 }

From 1db353558bf0b4f09a58e0079be1e0ee5a6839f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jan 2020 14:23:31 +0900
Subject: [PATCH 00370/10326] Add present beatmap tests

---
 .../Navigation/TestScenePresentBeatmap.cs     | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
new file mode 100644
index 0000000000..909409835c
--- /dev/null
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
@@ -0,0 +1,110 @@
+// Copyright (c) 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.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Menu;
+
+namespace osu.Game.Tests.Visual.Navigation
+{
+    public class TestScenePresentBeatmap : OsuGameTestScene
+    {
+        [Test]
+        public void TestFromMainMenu()
+        {
+            var firstImport = importBeatmap(1);
+            presentAndConfirm(firstImport);
+
+            AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
+            AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
+
+            var secondimport = importBeatmap(2);
+            presentAndConfirm(secondimport);
+        }
+
+        [Test]
+        public void TestFromMainMenuDifferentRuleset()
+        {
+            var firstImport = importBeatmap(1);
+            presentAndConfirm(firstImport);
+
+            AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
+            AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
+
+            var secondimport = importBeatmap(2, new ManiaRuleset().RulesetInfo);
+            presentAndConfirm(secondimport);
+        }
+
+        [Test]
+        public void TestFromSongSelect()
+        {
+            var firstImport = importBeatmap(1);
+            presentAndConfirm(firstImport);
+
+            var secondimport = importBeatmap(2);
+            presentAndConfirm(secondimport);
+        }
+
+        [Test]
+        public void TestFromSongSelectDifferentRuleset()
+        {
+            var firstImport = importBeatmap(1);
+            presentAndConfirm(firstImport);
+
+            var secondimport = importBeatmap(2, new ManiaRuleset().RulesetInfo);
+            presentAndConfirm(secondimport);
+        }
+
+        private Func<BeatmapSetInfo> importBeatmap(int i, RulesetInfo ruleset = null)
+        {
+            BeatmapSetInfo imported = null;
+            AddStep($"import beatmap {i}", () =>
+            {
+                var difficulty = new BeatmapDifficulty();
+                var metadata = new BeatmapMetadata
+                {
+                    Artist = "SomeArtist",
+                    AuthorString = "SomeAuthor",
+                    Title = $"import {i}"
+                };
+
+                imported = Game.BeatmapManager.Import(new BeatmapSetInfo
+                {
+                    Hash = Guid.NewGuid().ToString(),
+                    OnlineBeatmapSetID = i,
+                    Metadata = metadata,
+                    Beatmaps = new List<BeatmapInfo>
+                    {
+                        new BeatmapInfo
+                        {
+                            OnlineBeatmapID = i * 1024,
+                            Metadata = metadata,
+                            BaseDifficulty = difficulty,
+                            Ruleset = ruleset ?? new OsuRuleset().RulesetInfo
+                        },
+                    }
+                }).Result;
+            });
+
+            AddAssert($"import {i} succeeded", () => imported != null);
+
+            return () => imported;
+        }
+
+        private void presentAndConfirm(Func<BeatmapSetInfo> getImport)
+        {
+            AddStep("present beatmap", () => Game.PresentBeatmap(getImport()));
+
+            AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is Screens.Select.SongSelect);
+            AddUntilStep("correct beatmap displayed", () => Game.Beatmap.Value.BeatmapSetInfo.ID == getImport().ID);
+            AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Beatmaps.First().Ruleset.ID);
+        }
+    }
+}

From 77c06b1c6eb7f20d0e6f9ae3fc248ed2680cf3fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jan 2020 16:51:14 +0900
Subject: [PATCH 00371/10326] Fix beatmap carousel potentially missing beatmap
 imports

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 27 +++++++++++++++++++++-
 osu.Game/Screens/Select/SongSelect.cs      | 27 ++++------------------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 2bb5ba612e..592e26adc2 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -68,6 +68,7 @@ namespace osu.Game.Screens.Select
 
         private IEnumerable<CarouselBeatmapSet> beatmapSets => root.Children.OfType<CarouselBeatmapSet>();
 
+        // todo: only used for testing, maybe remove.
         public IEnumerable<BeatmapSetInfo> BeatmapSets
         {
             get => beatmapSets.Select(g => g.BeatmapSet);
@@ -133,8 +134,11 @@ namespace osu.Game.Screens.Select
             };
         }
 
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuConfigManager config, BeatmapManager beatmaps)
+        private void load(OsuConfigManager config)
         {
             config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
             config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
@@ -142,6 +146,11 @@ namespace osu.Game.Screens.Select
             RightClickScrollingEnabled.ValueChanged += enabled => scroll.RightMouseScrollbar = enabled.NewValue;
             RightClickScrollingEnabled.TriggerChange();
 
+            beatmaps.ItemAdded += beatmapAdded;
+            beatmaps.ItemRemoved += beatmapRemoved;
+            beatmaps.BeatmapHidden += beatmapHidden;
+            beatmaps.BeatmapRestored += beatmapRestored;
+
             loadBeatmapSets(beatmaps.GetAllUsableBeatmapSetsEnumerable());
         }
 
@@ -535,11 +544,27 @@ namespace osu.Game.Screens.Select
         {
             base.Dispose(isDisposing);
 
+            if (beatmaps != null)
+            {
+                beatmaps.ItemAdded -= beatmapAdded;
+                beatmaps.ItemRemoved -= beatmapRemoved;
+                beatmaps.BeatmapHidden -= beatmapHidden;
+                beatmaps.BeatmapRestored -= beatmapRestored;
+            }
+
             // aggressively dispose "off-screen" items to reduce GC pressure.
             foreach (var i in Items)
                 i.Dispose();
         }
 
+        private void beatmapRemoved(BeatmapSetInfo item) => RemoveBeatmapSet(item);
+
+        private void beatmapAdded(BeatmapSetInfo item) => UpdateBeatmapSet(item);
+
+        private void beatmapRestored(BeatmapInfo b) => UpdateBeatmapSet(beatmaps.QueryBeatmapSet(s => s.ID == b.BeatmapSetInfoID));
+
+        private void beatmapHidden(BeatmapInfo b) => UpdateBeatmapSet(beatmaps.QueryBeatmapSet(s => s.ID == b.BeatmapSetInfoID));
+
         private CarouselBeatmapSet createCarouselSet(BeatmapSetInfo beatmapSet)
         {
             if (beatmapSet.Beatmaps.All(b => b.Hidden))
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 1a29f336ea..a5352c4eeb 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -72,7 +72,9 @@ namespace osu.Game.Screens.Select
 
         private BeatmapInfoWedge beatmapInfoWedge;
         private DialogOverlay dialogOverlay;
-        private BeatmapManager beatmaps;
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
 
         protected ModSelectOverlay ModSelect { get; private set; }
 
@@ -89,7 +91,7 @@ namespace osu.Game.Screens.Select
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader(true)]
-        private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores)
+        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores)
         {
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
@@ -247,14 +249,6 @@ namespace osu.Game.Screens.Select
                 BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo), Key.Number3);
             }
 
-            if (this.beatmaps == null)
-                this.beatmaps = beatmaps;
-
-            this.beatmaps.ItemAdded += onBeatmapSetAdded;
-            this.beatmaps.ItemRemoved += onBeatmapSetRemoved;
-            this.beatmaps.BeatmapHidden += onBeatmapHidden;
-            this.beatmaps.BeatmapRestored += onBeatmapRestored;
-
             dialogOverlay = dialog;
 
             sampleChangeDifficulty = audio.Samples.Get(@"SongSelect/select-difficulty");
@@ -563,14 +557,6 @@ namespace osu.Game.Screens.Select
             base.Dispose(isDisposing);
 
             decoupledRuleset.UnbindAll();
-
-            if (beatmaps != null)
-            {
-                beatmaps.ItemAdded -= onBeatmapSetAdded;
-                beatmaps.ItemRemoved -= onBeatmapSetRemoved;
-                beatmaps.BeatmapHidden -= onBeatmapHidden;
-                beatmaps.BeatmapRestored -= onBeatmapRestored;
-            }
         }
 
         /// <summary>
@@ -617,11 +603,6 @@ namespace osu.Game.Screens.Select
             lastTrack.SetTarget(track);
         }
 
-        private void onBeatmapSetAdded(BeatmapSetInfo s) => Carousel.UpdateBeatmapSet(s);
-        private void onBeatmapSetRemoved(BeatmapSetInfo s) => Carousel.RemoveBeatmapSet(s);
-        private void onBeatmapRestored(BeatmapInfo b) => Carousel.UpdateBeatmapSet(beatmaps.QueryBeatmapSet(s => s.ID == b.BeatmapSetInfoID));
-        private void onBeatmapHidden(BeatmapInfo b) => Carousel.UpdateBeatmapSet(beatmaps.QueryBeatmapSet(s => s.ID == b.BeatmapSetInfoID));
-
         private void carouselBeatmapsLoaded()
         {
             bindBindables();

From c003ae63d5afa9fd9d32eacbc884b0692e241151 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jan 2020 17:17:10 +0900
Subject: [PATCH 00372/10326] Ignore failing test for now

---
 osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
index 909409835c..de330004c2 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Tests.Visual.Navigation
         }
 
         [Test]
+        [Ignore("will be fixed soon")]
         public void TestFromMainMenuDifferentRuleset()
         {
             var firstImport = importBeatmap(1);

From d908bc269345c13a7a1f282418faa29fb79204d6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jan 2020 18:44:30 +0900
Subject: [PATCH 00373/10326] Remove unnecessary extra spritetext

---
 .../Ranks/DrawableProfileWeightedScore.cs     | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
index bacfc0fd83..1b77e8e4fb 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
@@ -40,28 +40,13 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                             Width = 60,
                             Child = CreateDrawableAccuracy()
                         },
-                        new FillFlowContainer
+                        new OsuSpriteText
                         {
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            Children = new[]
-                            {
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true),
-                                    Text = $"{Score.PP * weight:0}",
-                                },
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
-                                    Text = "pp",
-                                }
-                            }
-                        }
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true),
+                            Text = $"{Score.PP * weight:0}pp",
+                        },
                     }
                 },
                 new OsuSpriteText

From 7f946047f9ab1b064a27901eea7a171a864c06ee Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jan 2020 18:51:20 +0900
Subject: [PATCH 00374/10326] Adjust styling to closer match osu-web

---
 .../Profile/Sections/Ranks/DrawableProfileScore.cs    |  8 ++++----
 .../Sections/Ranks/DrawableProfileWeightedScore.cs    | 11 +++--------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 9145ce6894..5196bef48d 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -174,8 +174,8 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
 
         protected OsuSpriteText CreateDrawableAccuracy() => new OsuSpriteText
         {
-            Text = $"{Score.Accuracy:P2}",
-            Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true),
+            Text = $"{Score.Accuracy:0.00%}",
+            Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
             Colour = colours.Yellow,
         };
 
@@ -233,14 +233,14 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                     Text = new LocalisedString((
                         $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} ",
                         $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} ")),
-                    Font = OsuFont.GetFont(weight: FontWeight.SemiBold, italics: true)
+                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold, italics: true)
                 },
                 new OsuSpriteText
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     Text = "by " + new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
-                    Font = OsuFont.GetFont(size: 14, italics: true)
+                    Font = OsuFont.GetFont(size: 12, italics: true)
                 },
             };
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
index 1b77e8e4fb..e741c88aeb 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
@@ -6,7 +6,6 @@ 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
 {
@@ -24,14 +23,12 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         {
             AutoSizeAxes = Axes.Both,
             Direction = FillDirection.Vertical,
-            Spacing = new Vector2(0, 2),
             Children = new Drawable[]
             {
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(15, 0),
                     Children = new Drawable[]
                     {
                         new Container
@@ -42,17 +39,15 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                         },
                         new OsuSpriteText
                         {
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true),
+                            Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
                             Text = $"{Score.PP * weight:0}pp",
                         },
                     }
                 },
                 new OsuSpriteText
                 {
-                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
-                    Text = $@"weighted {weight:P0}"
+                    Font = OsuFont.GetFont(size: 12),
+                    Text = $@"weighted {weight:0%}"
                 }
             }
         };

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 00375/10326] 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 76af8bea5dd13d940d021ed6328f7d77c99bcf20 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jan 2020 19:51:24 +0900
Subject: [PATCH 00376/10326] Fix percentage-formatted displays containing a
 space

---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs                 | 2 +-
 osu.Game/Online/Leaderboards/LeaderboardScore.cs                | 2 +-
 osu.Game/Overlays/BeatmapSet/SuccessRate.cs                     | 2 +-
 .../Screens/Multi/Match/Components/MatchLeaderboardScore.cs     | 2 +-
 osu.Game/Screens/Select/LocalScoreDeleteDialog.cs               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 5c6c7aeafd..d0356e77c7 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Graphics.UserInterface
 
                 if (DisplayAsPercentage)
                 {
-                    TooltipText = floatValue.ToString("P0");
+                    TooltipText = floatValue.ToString("0%");
                 }
                 else
                 {
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 9c7324d913..c8b2f2327b 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:P0}" : @"{0:P2}", model.Accuracy))
+            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:0%}" : @"{0:0.00%}", model.Accuracy))
         };
 
         protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Overlays/BeatmapSet/SuccessRate.cs b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
index 0258a0301a..cd81013c30 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("P0");
+            successPercent.Text = rate.ToString("0%");
             successRate.Length = rate;
             percentContainer.ResizeWidthTo(successRate.Length, 250, Easing.InOutCubic);
 
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
index aa92451c77..bab9672d65 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:P0}" : @"{0:P2}", model.Accuracy)),
+            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:0%}" : @"{0:0.00%}", model.Accuracy)),
             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/Select/LocalScoreDeleteDialog.cs b/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
index 97df40fa6d..99e76124e8 100644
--- a/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
+++ b/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
@@ -32,7 +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:P0}" : "{0:P2}", score.Accuracy);
+            string accuracy = string.Format(score.Accuracy == 1 ? "{0:0%}" : "{0:0.00%}", score.Accuracy);
             BodyText = $"{score.User} ({accuracy}, {score.Rank})";
 
             Icon = FontAwesome.Regular.TrashAlt;

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 00377/10326] 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 00378/10326] 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 00379/10326] 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 c9dda78ded008337b45b1b4190dce7ea70751613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 29 Jan 2020 18:59:51 +0100
Subject: [PATCH 00380/10326] Refactor drawable hierarchy to center properly

* Use FillFlowContainer.Spacing instead of manually applying margins.
* Use Update() for calculating button padding to preserve it after
  mod button expansion and adjust FooterButtonRandom to use this method
  while avoiding flickering.
* Expose mod display margin to clear it in the footer button.
---
 osu.Game/Screens/Play/HUD/ModDisplay.cs       | 16 +++++++-------
 osu.Game/Screens/Select/FooterButton.cs       | 21 ++++++++++++++++---
 osu.Game/Screens/Select/FooterButtonMods.cs   |  2 +-
 osu.Game/Screens/Select/FooterButtonRandom.cs |  5 ++++-
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 0f3c92a962..00edd4db99 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private readonly FillFlowContainer<ModIcon> iconsContainer;
+        protected readonly FillFlowContainer<ModIcon> IconsContainer;
         private readonly OsuSpriteText unrankedText;
 
         public ModDisplay()
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play.HUD
 
             Children = new Drawable[]
             {
-                iconsContainer = new ReverseChildIDFillFlowContainer<ModIcon>
+                IconsContainer = new ReverseChildIDFillFlowContainer<ModIcon>
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
@@ -69,11 +69,11 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.ValueChanged += mods =>
             {
-                iconsContainer.Clear();
+                IconsContainer.Clear();
 
                 foreach (Mod mod in mods.NewValue)
                 {
-                    iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
+                    IconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
                 }
 
                 if (IsLoaded)
@@ -92,7 +92,7 @@ namespace osu.Game.Screens.Play.HUD
             base.LoadComplete();
 
             appearTransform();
-            iconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint);
+            IconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint);
         }
 
         private void appearTransform()
@@ -104,17 +104,17 @@ namespace osu.Game.Screens.Play.HUD
 
             expand();
 
-            using (iconsContainer.BeginDelayedSequence(1200))
+            using (IconsContainer.BeginDelayedSequence(1200))
                 contract();
         }
 
         private void expand()
         {
             if (AllowExpand)
-                iconsContainer.TransformSpacingTo(new Vector2(5, 0), 500, Easing.OutQuint);
+                IconsContainer.TransformSpacingTo(new Vector2(5, 0), 500, Easing.OutQuint);
         }
 
-        private void contract() => iconsContainer.TransformSpacingTo(new Vector2(-25, 0), 500, Easing.OutQuint);
+        private void contract() => IconsContainer.TransformSpacingTo(new Vector2(-25, 0), 500, Easing.OutQuint);
 
         protected override bool OnHover(HoverEvent e)
         {
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 869e9e8aa4..cebc73d70d 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -92,15 +92,17 @@ namespace osu.Game.Screens.Select
                             Origin = Anchor.CentreLeft,
                             Direction = FillDirection.Horizontal,
                             Shear = -SHEAR,
-                            AutoSizeAxes = Axes.Both,
-                            Margin = new MarginPadding { Horizontal = SHEAR_WIDTH / 4 },
+                            AutoSizeAxes = Axes.X,
+                            Height = 50,
+                            Margin = new MarginPadding { Right = -SHEAR_WIDTH / 2 },
+                            Spacing = new Vector2(15, 0),
                             Children = new Drawable[]
                             {
                                 TextContainer = new Container
                                 {
                                     Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
-                                    Size = new Vector2(100 - SHEAR_WIDTH, 50),
+                                    AutoSizeAxes = Axes.Both,
                                     Child = SpriteText = new OsuSpriteText
                                     {
                                         Anchor = Anchor.Centre,
@@ -118,6 +120,19 @@ namespace osu.Game.Screens.Select
         public Action HoverLost;
         public Key? Hotkey;
 
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            float horizontalMargin = (100 - TextContainer.Width) / 2;
+            ButtonContentContainer.Padding = new MarginPadding
+            {
+                Left = horizontalMargin,
+                // right side margin offset to compensate for shear
+                Right = horizontalMargin - SHEAR_WIDTH / 2
+            };
+        }
+
         protected override bool OnHover(HoverEvent e)
         {
             Hovered?.Invoke();
diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index 67b491cf9e..a98f3d6c5e 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -46,7 +46,6 @@ namespace osu.Game.Screens.Select
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                Margin = new MarginPadding { Right = 10 }
             });
         }
 
@@ -94,6 +93,7 @@ namespace osu.Game.Screens.Select
             public FooterModDisplay()
             {
                 AllowExpand = false;
+                IconsContainer.Margin = new MarginPadding();
             }
         }
     }
diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 14c9eb2035..990b9a52fb 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -24,8 +24,11 @@ namespace osu.Game.Screens.Select
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Text = @"rewind",
-                Alpha = 0
+                Alpha = 0,
             });
+
+            // force both text sprites to always be present to avoid width flickering while they're being swapped out
+            SpriteText.AlwaysPresent = secondaryText.AlwaysPresent = true;
         }
 
         [BackgroundDependencyLoader]

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 00381/10326] 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 f130e48c9e05ba37d348feac2a541edfff533f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 29 Jan 2020 19:17:07 +0100
Subject: [PATCH 00382/10326] Remove leftover negative margin

---
 osu.Game/Screens/Select/FooterButton.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index cebc73d70d..3517ab4c3c 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -94,7 +94,6 @@ namespace osu.Game.Screens.Select
                             Shear = -SHEAR,
                             AutoSizeAxes = Axes.X,
                             Height = 50,
-                            Margin = new MarginPadding { Right = -SHEAR_WIDTH / 2 },
                             Spacing = new Vector2(15, 0),
                             Children = new Drawable[]
                             {

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 00383/10326] 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 00384/10326] 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 00385/10326] 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 00386/10326] 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 00387/10326] 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 00388/10326] 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 00389/10326] 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 00390/10326] 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 00391/10326] 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 00392/10326] 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 00393/10326] 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 00394/10326] 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 00395/10326] 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 00396/10326] 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 00397/10326] 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 37ecf8a060fc37743dfc72b7bf4d7e1ad2a363b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 10:50:48 +0900
Subject: [PATCH 00398/10326] Remove commented line

---
 osu.Game/Screens/Select/FooterButtonMods.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index a98f3d6c5e..965be10219 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-// using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Rulesets.Mods;
 using System.Collections.Generic;

From f72de235cc9ad05ab9f76cc874fc118aabc5f358 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 11:00:14 +0900
Subject: [PATCH 00399/10326] Remove unnecessary length specifications

---
 osu.Game/Screens/Select/FooterButtonMods.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index 965be10219..4f2369847f 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -80,9 +80,9 @@ namespace osu.Game.Screens.Select
                 MultiplierText.FadeColour(Color4.White, 200);
 
             if (Current.Value?.Count > 0)
-                modDisplay.FadeIn(0);
+                modDisplay.FadeIn();
             else
-                modDisplay.FadeOut(0);
+                modDisplay.FadeOut();
         }
 
         private class FooterModDisplay : ModDisplay

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 00400/10326] 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 00401/10326] 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 00402/10326] 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 00403/10326] 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 00404/10326] 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 00405/10326] 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 00406/10326] 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 00407/10326] 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 00408/10326] 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 00409/10326] 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 00410/10326] 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 00411/10326] 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 00412/10326] 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 00413/10326] 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 00414/10326] 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 00415/10326] 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 00416/10326] 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 00417/10326] 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 00418/10326] 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 00419/10326] 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 00420/10326] 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 00421/10326] 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 00422/10326] 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 00423/10326] 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 00424/10326] 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 00425/10326] 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 00426/10326] 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 00427/10326] 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 00428/10326] 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 00429/10326] 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 00430/10326] 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 00431/10326] 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 00432/10326] 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 00433/10326] 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 00434/10326] 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 00435/10326] 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 00436/10326] 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 00437/10326] 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 00438/10326] 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 00439/10326] 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 00440/10326] 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 00441/10326] 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 00442/10326] 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 00443/10326] 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 00444/10326] 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 00445/10326] 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 00446/10326] 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 00447/10326] 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 00448/10326] 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 00449/10326] 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 00450/10326] 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 00451/10326] 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 00452/10326] 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 00453/10326] 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 00454/10326] 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 00455/10326] 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 00456/10326] 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 00457/10326] 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 00458/10326] 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 00459/10326] 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 00460/10326] 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 00461/10326] 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 00462/10326] 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 00463/10326] 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 00464/10326] 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 00465/10326] 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 00466/10326] 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 00467/10326] 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 00468/10326] 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 00469/10326] 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 00470/10326] 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 00471/10326] 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 00472/10326] 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 00473/10326] 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 00474/10326] 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 00475/10326] 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 00476/10326] 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 00477/10326] 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 00478/10326] 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 00479/10326] 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 00480/10326] 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 00481/10326] 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 00482/10326] 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 00483/10326] 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 00484/10326] 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 00485/10326] 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 00486/10326] 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 00487/10326] 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 00488/10326] 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 00489/10326] 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 00490/10326] 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 00491/10326] 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 00492/10326] 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 00493/10326] 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 00494/10326] 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 00495/10326] 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 00496/10326] 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 00497/10326] 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 00498/10326] 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 00499/10326] 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 00500/10326] 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 00501/10326] 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 00502/10326] 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 00503/10326] 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 00504/10326] 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 00505/10326] 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 00506/10326] 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 00507/10326] 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 00508/10326] 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 00509/10326] 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 00510/10326] 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 00511/10326] 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 00512/10326] 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 00513/10326] 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 00514/10326] 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 00515/10326] 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 00516/10326] 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 00517/10326] 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 00518/10326] 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 00519/10326] 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 00520/10326] 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 00521/10326] 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 00522/10326] 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 00523/10326] 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 00524/10326] 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 00525/10326] 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 00526/10326] 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 00527/10326] 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 00528/10326] 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 00529/10326] 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 00530/10326] 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 00531/10326] 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 00532/10326] 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 00533/10326] 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 00534/10326] 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 00535/10326] 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 00536/10326] 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 00537/10326] 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 00538/10326] 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 00539/10326] 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 00540/10326] 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 00541/10326] 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 00542/10326] 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 00543/10326] 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 00544/10326] 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 00545/10326] 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 00546/10326] 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 00547/10326] 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 00548/10326] 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 00549/10326] 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 00550/10326] 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 00551/10326] 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 00552/10326] 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 00553/10326] 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 00554/10326] 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 00555/10326] 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 00556/10326] 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 00557/10326] 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 00558/10326] 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 00559/10326] 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 00560/10326] 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 00561/10326] 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 00562/10326] 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 00563/10326] 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 00564/10326] 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 00565/10326] 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 00566/10326] 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 00567/10326] 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 00568/10326] 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 00569/10326] 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 00570/10326] 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 00571/10326] 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 00572/10326] 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 00573/10326] 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 00574/10326] 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 00575/10326] 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 00576/10326] 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 00577/10326] 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 00578/10326] 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 00579/10326] 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 00580/10326] 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 00581/10326] 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 00582/10326] 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 00583/10326] 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 00584/10326] 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 00585/10326] 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 00586/10326] 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 00587/10326] 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 00588/10326] 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 00589/10326] 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 00590/10326] 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 00591/10326] 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 00592/10326] 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 00593/10326] 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 00594/10326] 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 00595/10326] 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 00596/10326] 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 d773eb2c22c804e97977298fb57bc3cd265a7530 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 5 Feb 2020 14:05:12 +0800
Subject: [PATCH 00597/10326] refactor rotation logic to use explicit delta
 value

---
 .../Objects/Drawables/Pieces/SpinnerDisc.cs      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index e3dd2b1b4f..91e49e0264 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -98,6 +98,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             bool validAndTracking = tracking && spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
 
+            var delta = thisAngle - lastAngle;
+
             if (validAndTracking)
             {
                 if (!rotationTransferred)
@@ -106,13 +108,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     rotationTransferred = true;
                 }
 
-                if (thisAngle - lastAngle > 180)
+                if (delta > 180)
+                {
                     lastAngle += 360;
-                else if (lastAngle - thisAngle > 180)
+                    delta -= 360;
+                }
+                else if (-delta > 180)
+                {
                     lastAngle -= 360;
+                    delta += 360;
+                }
 
-                currentRotation += thisAngle - lastAngle;
-                RotationAbsolute += Math.Abs(thisAngle - lastAngle) * Math.Sign(Clock.ElapsedFrameTime);
+                currentRotation += delta;
+                RotationAbsolute += Math.Abs(delta) * Math.Sign(Clock.ElapsedFrameTime);
             }
 
             lastAngle = thisAngle;

From 9f79713fb3a7b14e4f502d96b9b5bf9e417342cc Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 5 Feb 2020 14:23:59 +0800
Subject: [PATCH 00598/10326] move rotation logic to its own method

---
 .../Objects/Drawables/Pieces/SpinnerDisc.cs   | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 91e49e0264..58132635ca 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -96,32 +96,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             var thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
 
-            bool validAndTracking = tracking && spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
-
             var delta = thisAngle - lastAngle;
 
+            bool validAndTracking = tracking && spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
+
             if (validAndTracking)
-            {
-                if (!rotationTransferred)
-                {
-                    currentRotation = Rotation * 2;
-                    rotationTransferred = true;
-                }
-
-                if (delta > 180)
-                {
-                    lastAngle += 360;
-                    delta -= 360;
-                }
-                else if (-delta > 180)
-                {
-                    lastAngle -= 360;
-                    delta += 360;
-                }
-
-                currentRotation += delta;
-                RotationAbsolute += Math.Abs(delta) * Math.Sign(Clock.ElapsedFrameTime);
-            }
+                Rotate(delta);
 
             lastAngle = thisAngle;
 
@@ -136,5 +116,28 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             this.RotateTo(currentRotation / 2, validAndTracking ? 500 : 1500, Easing.OutExpo);
         }
+
+        public void Rotate(float angle)
+        {
+            if (!rotationTransferred)
+            {
+                currentRotation = Rotation * 2;
+                rotationTransferred = true;
+            }
+
+            if (angle > 180)
+            {
+                lastAngle += 360;
+                angle -= 360;
+            }
+            else if (-angle > 180)
+            {
+                lastAngle -= 360;
+                angle += 360;
+            }
+
+            currentRotation += angle;
+            RotationAbsolute += Math.Abs(angle) * Math.Sign(Clock.ElapsedFrameTime);
+        }
     }
 }

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 00599/10326] 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 00600/10326] 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 00601/10326] 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 00602/10326] 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 00603/10326] 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 00604/10326] 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 00605/10326] 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 00606/10326] 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 00607/10326] 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 00608/10326] 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 00609/10326] 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 00610/10326] 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 00611/10326] 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 00612/10326] 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 00613/10326] 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 00614/10326] 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 00615/10326] 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 00616/10326] 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 00617/10326] 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 00618/10326] 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 00619/10326] 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 00620/10326] 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 00621/10326] 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 00622/10326] 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 00623/10326] 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 00624/10326] 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 00625/10326] 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 00626/10326] 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 00627/10326] 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 00628/10326] 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 00629/10326] 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 00630/10326] 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 00631/10326] 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 00632/10326] 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 00633/10326] 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 00634/10326] 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 00635/10326] 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 00636/10326] 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 00637/10326] 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 00638/10326] 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 00639/10326] 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 00640/10326] 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 00641/10326] 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 00642/10326] 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 00643/10326] 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 00644/10326] 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 00645/10326] 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 00646/10326] 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 00647/10326] 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 00648/10326] 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 00649/10326] 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 00650/10326] 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 00651/10326] 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 00652/10326] 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 00653/10326] 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 00654/10326] 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 00655/10326] 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 00656/10326] 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 00657/10326] 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 00658/10326] 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 00659/10326] 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 00660/10326] 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 00661/10326] 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 00662/10326] 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 00663/10326] 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 00664/10326] 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 00665/10326] 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 00666/10326] 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 00667/10326] 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 00668/10326] 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 00669/10326] 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 00670/10326] 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 00671/10326] 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 00672/10326] 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 00673/10326] 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 00674/10326] 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 00675/10326] 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 00676/10326] 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 00677/10326] 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 00678/10326] 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 fa53bd96a0b308a52ce5aa43f8a58bfab894786b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 7 Feb 2020 23:14:46 +0300
Subject: [PATCH 00679/10326] Merge dependency

---
 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 84b7dfb3d6d0031873ba4b964ca5bdf4a4aa9294 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 7 Feb 2020 23:26:35 +0300
Subject: [PATCH 00680/10326] Implement UserGraph component

An abstraction for RankGraph
---
 .../Profile/Header/Components/RankGraph.cs    | 281 +++---------------
 osu.Game/Overlays/Profile/UserGraph.cs        | 234 +++++++++++++++
 2 files changed, 270 insertions(+), 245 deletions(-)
 create mode 100644 osu.Game/Overlays/Profile/UserGraph.cs

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index ffc060b3f1..917b086f04 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -4,307 +4,98 @@
 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.Cursor;
-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.Users;
-using osuTK;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public class RankGraph : Container, IHasCustomTooltip
+    public class RankGraph : UserGraph<int, int>
     {
-        private const float secondary_textsize = 13;
-        private const float padding = 10;
-        private const float fade_duration = 150;
         private const int ranked_days = 88;
 
-        private readonly RankChartLineGraph graph;
-        private readonly OsuSpriteText placeholder;
-
-        private KeyValuePair<int, int>[] ranks;
-        private int dayIndex;
         public readonly Bindable<UserStatistics> Statistics = new Bindable<UserStatistics>();
 
+        private readonly OsuSpriteText placeholder;
+
         public RankGraph()
         {
-            Padding = new MarginPadding { Vertical = padding };
-            Children = new Drawable[]
+            Add(placeholder = new OsuSpriteText
             {
-                placeholder = new OsuSpriteText
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Text = "No recent plays",
-                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular)
-                },
-                graph = new RankChartLineGraph
-                {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    RelativeSizeAxes = Axes.Both,
-                    Y = -secondary_textsize,
-                    Alpha = 0,
-                }
-            };
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Text = "No recent plays",
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular)
+            });
 
-            graph.OnBallMove += i => dayIndex = i;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            graph.LineColour = colours.Yellow;
+            Graph.Alpha = 0;
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-
             Statistics.BindValueChanged(statistics => updateStatistics(statistics.NewValue), true);
         }
 
         private void updateStatistics(UserStatistics statistics)
         {
-            placeholder.FadeIn(fade_duration, Easing.Out);
+            placeholder.FadeIn(FADE_DURATION, Easing.Out);
 
             if (statistics?.Ranks.Global == null)
             {
-                graph.FadeOut(fade_duration, Easing.Out);
-                ranks = null;
+                Graph.FadeOut(FADE_DURATION, Easing.Out);
+                Data = null;
                 return;
             }
 
             int[] userRanks = statistics.RankHistory?.Data ?? new[] { statistics.Ranks.Global.Value };
-            ranks = userRanks.Select((x, index) => new KeyValuePair<int, int>(index, x)).Where(x => x.Value != 0).ToArray();
+            Data = userRanks.Select((x, index) => new KeyValuePair<int, int>(index, x)).Where(x => x.Value != 0).ToArray();
 
-            if (ranks.Length > 1)
+            if (Data.Length > 1)
             {
-                placeholder.FadeOut(fade_duration, Easing.Out);
+                placeholder.FadeOut(FADE_DURATION, Easing.Out);
 
-                graph.DefaultValueCount = ranks.Length;
-                graph.Values = ranks.Select(x => -MathF.Log(x.Value));
+                Graph.DefaultValueCount = Data.Length;
+                Graph.Values = Data.Select(x => -MathF.Log(x.Value));
             }
 
-            graph.FadeTo(ranks.Length > 1 ? 1 : 0, fade_duration, Easing.Out);
+            Graph.FadeTo(Data.Length > 1 ? 1 : 0, FADE_DURATION, Easing.Out);
         }
 
-        protected override bool OnHover(HoverEvent e)
+        protected override object GetTooltipContent()
         {
-            if (ranks?.Length > 1)
-            {
-                graph.UpdateBallPosition(e.MousePosition.X);
-                graph.ShowBar();
-            }
+            if (Statistics.Value?.Ranks.Global == null)
+                return null;
 
-            return base.OnHover(e);
+            var days = ranked_days - Data[DataIndex].Key + 1;
+
+            return new TooltipDisplayContent
+            {
+                Rank = $"#{Data[DataIndex].Value:#,##0}",
+                Time = days == 0 ? "now" : $"{days} days ago"
+            };
         }
 
-        protected override bool OnMouseMove(MouseMoveEvent e)
+        protected override UserGraphTooltip GetTooltip() => new RankGraphTooltip();
+
+        private class RankGraphTooltip : UserGraphTooltip
         {
-            if (ranks?.Length > 1)
-                graph.UpdateBallPosition(e.MousePosition.X);
-
-            return base.OnMouseMove(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            if (ranks?.Length > 1)
-            {
-                graph.HideBar();
-            }
-
-            base.OnHoverLost(e);
-        }
-
-        private class RankChartLineGraph : LineGraph
-        {
-            private readonly CircularContainer movingBall;
-            private readonly Container bar;
-            private readonly Box ballBg;
-            private readonly Box line;
-
-            public Action<int> OnBallMove;
-
-            public RankChartLineGraph()
-            {
-                Add(bar = new Container
-                {
-                    Origin = Anchor.TopCentre,
-                    RelativeSizeAxes = Axes.Y,
-                    AutoSizeAxes = Axes.X,
-                    Alpha = 0,
-                    RelativePositionAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        line = new Box
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            RelativeSizeAxes = Axes.Y,
-                            Width = 1.5f,
-                        },
-                        movingBall = new CircularContainer
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(18),
-                            Masking = true,
-                            BorderThickness = 4,
-                            RelativePositionAxes = Axes.Y,
-                            Child = ballBg = new Box { RelativeSizeAxes = Axes.Both }
-                        }
-                    }
-                });
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider, OsuColour colours)
-            {
-                ballBg.Colour = colourProvider.Background5;
-                movingBall.BorderColour = line.Colour = colours.Yellow;
-            }
-
-            public void UpdateBallPosition(float mouseXPosition)
-            {
-                const int duration = 200;
-                int index = calculateIndex(mouseXPosition);
-                Vector2 position = calculateBallPosition(index);
-                movingBall.MoveToY(position.Y, duration, Easing.OutQuint);
-                bar.MoveToX(position.X, duration, Easing.OutQuint);
-                OnBallMove.Invoke(index);
-            }
-
-            public void ShowBar() => bar.FadeIn(fade_duration);
-
-            public void HideBar() => bar.FadeOut(fade_duration);
-
-            private int calculateIndex(float mouseXPosition) => (int)MathF.Round(mouseXPosition / DrawWidth * (DefaultValueCount - 1));
-
-            private Vector2 calculateBallPosition(int index)
-            {
-                float y = GetYPosition(Values.ElementAt(index));
-                return new Vector2(index / (float)(DefaultValueCount - 1), y);
-            }
-        }
-
-        public object TooltipContent
-        {
-            get
-            {
-                if (Statistics.Value?.Ranks.Global == null)
-                    return null;
-
-                var days = ranked_days - ranks[dayIndex].Key + 1;
-
-                return new TooltipDisplayContent
-                {
-                    Rank = $"#{ranks[dayIndex].Value:#,##0}",
-                    Time = days == 0 ? "now" : $"{days} days ago"
-                };
-            }
-        }
-
-        public ITooltip GetCustomTooltip() => new RankGraphTooltip();
-
-        private class RankGraphTooltip : VisibilityContainer, ITooltip
-        {
-            private readonly OsuSpriteText globalRankingText, timeText;
-            private readonly Box background;
-
             public RankGraphTooltip()
+                : base(@"Global Ranking")
             {
-                AutoSizeAxes = Axes.Both;
-                Masking = true;
-                CornerRadius = 10;
-
-                Children = new Drawable[]
-                {
-                    background = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding(10),
-                        Children = new Drawable[]
-                        {
-                            new FillFlowContainer
-                            {
-                                AutoSizeAxes = Axes.Both,
-                                Direction = FillDirection.Horizontal,
-                                Children = new Drawable[]
-                                {
-                                    new OsuSpriteText
-                                    {
-                                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
-                                        Text = "Global Ranking "
-                                    },
-                                    globalRankingText = new OsuSpriteText
-                                    {
-                                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
-                                        Anchor = Anchor.BottomLeft,
-                                        Origin = Anchor.BottomLeft,
-                                    }
-                                }
-                            },
-                            timeText = new OsuSpriteText
-                            {
-                                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
-                            }
-                        }
-                    }
-                };
             }
 
-            [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;
-            }
-
-            public bool SetContent(object content)
+            public override bool SetContent(object content)
             {
                 if (!(content is TooltipDisplayContent info))
                     return false;
 
-                globalRankingText.Text = info.Rank;
-                timeText.Text = info.Time;
+                Counter.Text = info.Rank;
+                BottomText.Text = info.Time;
                 return true;
             }
-
-            private bool instantMove = true;
-
-            public void Move(Vector2 pos)
-            {
-                if (instantMove)
-                {
-                    Position = pos;
-                    instantMove = false;
-                }
-                else
-                    this.MoveTo(pos, 200, Easing.OutQuint);
-            }
-
-            protected override void PopIn()
-            {
-                instantMove |= !IsPresent;
-                this.FadeIn(200, Easing.OutQuint);
-            }
-
-            protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
         }
 
         private class TooltipDisplayContent
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
new file mode 100644
index 0000000000..d0816fd4c6
--- /dev/null
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -0,0 +1,234 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+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 osuTK;
+
+namespace osu.Game.Overlays.Profile
+{
+    public abstract class UserGraph<TKey, TValue> : Container, IHasCustomTooltip
+    {
+        protected const float FADE_DURATION = 150;
+
+        protected readonly RankChartLineGraph Graph;
+        protected KeyValuePair<TKey, TValue>[] Data;
+        protected int DataIndex;
+
+        protected UserGraph()
+        {
+            Add(Graph = new RankChartLineGraph
+            {
+                RelativeSizeAxes = Axes.Both,
+            });
+
+            Graph.OnBallMove += i => DataIndex = i;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Graph.LineColour = colours.Yellow;
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            if (Data?.Length > 1)
+            {
+                Graph.UpdateBallPosition(e.MousePosition.X);
+                Graph.ShowBar();
+            }
+
+            return base.OnHover(e);
+        }
+
+        protected override bool OnMouseMove(MouseMoveEvent e)
+        {
+            if (Data?.Length > 1)
+                Graph.UpdateBallPosition(e.MousePosition.X);
+
+            return base.OnMouseMove(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            if (Data?.Length > 1)
+                Graph.HideBar();
+
+            base.OnHoverLost(e);
+        }
+
+        public ITooltip GetCustomTooltip() => GetTooltip();
+
+        public object TooltipContent => GetTooltipContent();
+
+        protected abstract UserGraphTooltip GetTooltip();
+
+        protected abstract object GetTooltipContent();
+
+        protected class RankChartLineGraph : LineGraph
+        {
+            private readonly CircularContainer movingBall;
+            private readonly Container bar;
+            private readonly Box ballBg;
+            private readonly Box line;
+
+            public Action<int> OnBallMove;
+
+            public RankChartLineGraph()
+            {
+                Add(bar = new Container
+                {
+                    Origin = Anchor.TopCentre,
+                    RelativeSizeAxes = Axes.Y,
+                    AutoSizeAxes = Axes.X,
+                    Alpha = 0,
+                    RelativePositionAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        line = new Box
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Y,
+                            Width = 1.5f,
+                        },
+                        movingBall = new CircularContainer
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(18),
+                            Masking = true,
+                            BorderThickness = 4,
+                            RelativePositionAxes = Axes.Y,
+                            Child = ballBg = new Box { RelativeSizeAxes = Axes.Both }
+                        }
+                    }
+                });
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider, OsuColour colours)
+            {
+                ballBg.Colour = colourProvider.Background5;
+                movingBall.BorderColour = line.Colour = colours.Yellow;
+            }
+
+            public void UpdateBallPosition(float mouseXPosition)
+            {
+                const int duration = 200;
+                int index = calculateIndex(mouseXPosition);
+                Vector2 position = calculateBallPosition(index);
+                movingBall.MoveToY(position.Y, duration, Easing.OutQuint);
+                bar.MoveToX(position.X, duration, Easing.OutQuint);
+                OnBallMove.Invoke(index);
+            }
+
+            public void ShowBar() => bar.FadeIn(FADE_DURATION);
+
+            public void HideBar() => bar.FadeOut(FADE_DURATION);
+
+            private int calculateIndex(float mouseXPosition) => (int)MathF.Round(mouseXPosition / DrawWidth * (DefaultValueCount - 1));
+
+            private Vector2 calculateBallPosition(int index)
+            {
+                float y = GetYPosition(Values.ElementAt(index));
+                return new Vector2(index / (float)(DefaultValueCount - 1), y);
+            }
+        }
+
+        protected abstract class UserGraphTooltip : VisibilityContainer, ITooltip
+        {
+            protected readonly OsuSpriteText Counter, BottomText;
+            private readonly Box background;
+
+            protected UserGraphTooltip(string topText)
+            {
+                AutoSizeAxes = Axes.Both;
+                Masking = true;
+                CornerRadius = 10;
+
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding(10),
+                        Children = new Drawable[]
+                        {
+                            new FillFlowContainer
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
+                                Children = new Drawable[]
+                                {
+                                    new OsuSpriteText
+                                    {
+                                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                                        Text = $"{topText} "
+                                    },
+                                    Counter = new OsuSpriteText
+                                    {
+                                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
+                                        Anchor = Anchor.BottomLeft,
+                                        Origin = Anchor.BottomLeft,
+                                    }
+                                }
+                            },
+                            BottomText = new OsuSpriteText
+                            {
+                                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
+                            }
+                        }
+                    }
+                };
+            }
+
+            [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;
+            }
+
+            public abstract bool SetContent(object content);
+
+            private bool instantMove = true;
+
+            public void Move(Vector2 pos)
+            {
+                if (instantMove)
+                {
+                    Position = pos;
+                    instantMove = false;
+                }
+                else
+                    this.MoveTo(pos, 200, Easing.OutQuint);
+            }
+
+            protected override void PopIn()
+            {
+                instantMove |= !IsPresent;
+                this.FadeIn(200, Easing.OutQuint);
+            }
+
+            protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
+        }
+    }
+}

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 00681/10326] 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 00682/10326] 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 b325725c4533c93e4fb7ebac7b864df82cf49db5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 8 Feb 2020 00:10:17 +0300
Subject: [PATCH 00683/10326] Implement UserHistoryGraph component

---
 .../Online/TestSceneUserHistoryGraph.cs       | 112 ++++++++++++++++++
 .../Profile/Header/Components/RankGraph.cs    |   2 -
 .../Sections/Historical/UserHistoryGraph.cs   |  90 ++++++++++++++
 osu.Game/Overlays/Profile/UserGraph.cs        |   1 +
 4 files changed, 203 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
 create mode 100644 osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
new file mode 100644
index 0000000000..88bb002fc2
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
@@ -0,0 +1,112 @@
+// Copyright (c) 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.Profile.Sections.Historical;
+using osu.Game.Overlays.Profile;
+using osu.Framework.Graphics;
+using static osu.Game.Users.User;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneUserHistoryGraph : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(UserHistoryGraph),
+            typeof(UserGraph<,>),
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
+
+        public TestSceneUserHistoryGraph()
+        {
+            UserHistoryGraph graph;
+
+            Add(graph = new UserHistoryGraph("Counter Name")
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = 200,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            var values = new[]
+            {
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2000, 1, 1),
+                    Count = 10,
+                },
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2000, 2, 1),
+                    Count = 20,
+                },
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2000, 3, 1),
+                    Count = 100,
+                },
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2000, 4, 1),
+                    Count = 15,
+                },
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2000, 5, 1),
+                    Count = 30,
+                }
+            };
+
+            var moreValues = new[]
+            {
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2010, 5, 1),
+                    Count = 1000,
+                },
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2010, 6, 1),
+                    Count = 20,
+                },
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2010, 7, 1),
+                    Count = 20000,
+                },
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2010, 8, 1),
+                    Count = 30,
+                },
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2010, 9, 1),
+                    Count = 50,
+                },
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2010, 10, 1),
+                    Count = 2000,
+                },
+                new UserHistoryCount
+                {
+                    Date = new DateTime(2010, 11, 1),
+                    Count = 2100,
+                }
+            };
+
+            AddStep("Set fake values", () => graph.Values = values);
+            AddStep("Set more values", () => graph.Values = moreValues);
+            AddStep("Set null values", () => graph.Values = null);
+            AddStep("Set empty values", () => graph.Values = Array.Empty<UserHistoryCount>());
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index 917b086f04..2a571e46d1 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -29,8 +29,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 Text = "No recent plays",
                 Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular)
             });
-
-            Graph.Alpha = 0;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
new file mode 100644
index 0000000000..5129ce872f
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -0,0 +1,90 @@
+// Copyright (c) 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.Graphics;
+using static osu.Game.Users.User;
+
+namespace osu.Game.Overlays.Profile.Sections.Historical
+{
+    public class UserHistoryGraph : UserGraph<DateTime, long>
+    {
+        private UserHistoryCount[] values;
+
+        public UserHistoryCount[] Values
+        {
+            get => values;
+            set
+            {
+                values = value;
+                updateValues(value);
+            }
+        }
+
+        private readonly string tooltipCounterName;
+
+        public UserHistoryGraph(string tooltipCounterName)
+        {
+            this.tooltipCounterName = tooltipCounterName;
+        }
+
+        private void updateValues(UserHistoryCount[] values)
+        {
+            if (values == null || !values.Any())
+            {
+                Graph.FadeOut(FADE_DURATION, Easing.Out);
+                Data = null;
+                return;
+            }
+
+            Data = values.Select(v => new KeyValuePair<DateTime, long>(v.Date, v.Count)).ToArray();
+
+            if (values.Length > 1)
+            {
+                Graph.DefaultValueCount = Data.Length;
+                Graph.Values = Data.Select(x => (float)x.Value);
+                Graph.FadeIn(FADE_DURATION, Easing.Out);
+            }
+        }
+
+        protected override object GetTooltipContent()
+        {
+            if (!Data?.Any() ?? true)
+                return null;
+
+            return new TooltipDisplayContent
+            {
+                Count = Data[DataIndex].Value.ToString("N0"),
+                Date = Data[DataIndex].Key.ToString("MMMM yyyy")
+            };
+        }
+
+        protected override UserGraphTooltip GetTooltip() => new HistoryGraphTooltip(tooltipCounterName);
+
+        private class HistoryGraphTooltip : UserGraphTooltip
+        {
+            public HistoryGraphTooltip(string topText)
+                : base(topText)
+            {
+            }
+
+            public override bool SetContent(object content)
+            {
+                if (!(content is TooltipDisplayContent info))
+                    return false;
+
+                Counter.Text = info.Count;
+                BottomText.Text = info.Date;
+                return true;
+            }
+        }
+
+        private class TooltipDisplayContent
+        {
+            public string Count;
+            public string Date;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index d0816fd4c6..13ea347032 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Overlays.Profile
             Add(Graph = new RankChartLineGraph
             {
                 RelativeSizeAxes = Axes.Both,
+                Alpha = 0
             });
 
             Graph.OnBallMove += i => DataIndex = i;

From 5a6a77b609dcf4e9b10fd9c6975b5a8ac964d1f0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 8 Feb 2020 00:13:26 +0300
Subject: [PATCH 00684/10326] Fix usings order

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
index 88bb002fc2..bf77e5d60a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
@@ -6,9 +6,9 @@ using System.Collections.Generic;
 using osu.Game.Overlays.Profile.Sections.Historical;
 using osu.Game.Overlays.Profile;
 using osu.Framework.Graphics;
-using static osu.Game.Users.User;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
+using static osu.Game.Users.User;
 
 namespace osu.Game.Tests.Visual.Online
 {

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 00685/10326] 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 00686/10326] 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 25a930c43877007279a2503e34b4fa7702860f21 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 8 Feb 2020 08:59:35 +0800
Subject: [PATCH 00687/10326] Implement OsuModSpunOut

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs   | 17 ++++++++++++++-
 .../Objects/Drawables/DrawableSpinner.cs      |  2 +-
 .../Objects/Drawables/Pieces/SpinnerDisc.cs   | 21 ++++++++++++-------
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 1cdcddbd33..1ef53542a8 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -2,13 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModSpunOut : Mod
+    public class OsuModSpunOut : Mod, IApplicableToDrawableHitObjects
     {
         public override string Name => "Spun Out";
         public override string Acronym => "SO";
@@ -18,5 +22,16 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override double ScoreMultiplier => 0.9;
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(OsuModAutopilot) };
+
+        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        {
+            foreach (var hitObject in drawables)
+            {
+                if (hitObject is DrawableSpinner spinner)
+                {
+                    spinner.Disc.AutoSpin = true;
+                }
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index de11ab6419..b5265babd9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void Update()
         {
             Disc.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
-            if (!SpmCounter.IsPresent && Disc.Tracking)
+            if (!SpmCounter.IsPresent && (Disc.Tracking || Disc.AutoSpin))
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
             base.Update();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 58132635ca..e042a3791d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -73,6 +73,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
         }
 
+        public bool AutoSpin { get; set; } = false;
+
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
             mousePosition = Parent.ToLocalSpace(e.ScreenSpaceMousePosition);
@@ -94,16 +96,21 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             base.Update();
 
-            var thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
+            bool valid = spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
 
-            var delta = thisAngle - lastAngle;
+            if (valid && AutoSpin)
+                Rotate(6f);
+            else
+            {
+                var thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
 
-            bool validAndTracking = tracking && spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
+                var delta = thisAngle - lastAngle;
 
-            if (validAndTracking)
-                Rotate(delta);
+                if (valid && tracking)
+                    Rotate(delta);
 
-            lastAngle = thisAngle;
+                lastAngle = thisAngle;
+            }
 
             if (Complete && updateCompleteTick())
             {
@@ -114,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     .FadeTo(tracking_alpha, 250, Easing.OutQuint);
             }
 
-            this.RotateTo(currentRotation / 2, validAndTracking ? 500 : 1500, Easing.OutExpo);
+            this.RotateTo(currentRotation / 2, 500, Easing.OutExpo);
         }
 
         public void Rotate(float angle)

From 0dee6ceab74a3826c2705d55e50921f58d38dc52 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 8 Feb 2020 09:06:29 +0800
Subject: [PATCH 00688/10326] Remove unnecessary using

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 1ef53542a8..f1a1e47118 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 

From 4d9232a895ad4dd12e43cc0c9fc0b519a62091a2 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 8 Feb 2020 09:51:32 +0800
Subject: [PATCH 00689/10326] Move autospin logic to mods

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs   | 24 +++++++++++++++++--
 .../Objects/Drawables/DrawableSpinner.cs      |  2 +-
 .../Objects/Drawables/Pieces/SpinnerDisc.cs   | 21 ++++++----------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index f1a1e47118..07c10966d3 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -3,15 +3,18 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModSpunOut : Mod, IApplicableToDrawableHitObjects
+    public class OsuModSpunOut : Mod, IApplicableToDrawableHitObjects, IUpdatableByPlayfield
     {
         public override string Name => "Spun Out";
         public override string Acronym => "SO";
@@ -22,15 +25,32 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(OsuModAutopilot) };
 
+        private double lastFrameTime;
+        private double frameDelay;
+
         public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
             foreach (var hitObject in drawables)
             {
                 if (hitObject is DrawableSpinner spinner)
                 {
-                    spinner.Disc.AutoSpin = true;
+                    spinner.Disc.Trackable = false;
+                    spinner.Disc.OnUpdate += d =>
+                    {
+                        if (d is SpinnerDisc s)
+                        {
+                            if (s.Valid)
+                            s.Rotate((float)frameDelay);
+                        }
+                    };
                 }
             }
         }
+
+        public void Update(Playfield playfield)
+        {
+            frameDelay = playfield.Time.Current - lastFrameTime;
+            lastFrameTime = playfield.Time.Current;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index b5265babd9..2930134d4f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void Update()
         {
             Disc.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
-            if (!SpmCounter.IsPresent && (Disc.Tracking || Disc.AutoSpin))
+            if (!SpmCounter.IsPresent && (Disc.Tracking || !Disc.Trackable))
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
             base.Update();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index e042a3791d..9a9d915cfe 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -73,7 +73,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
         }
 
-        public bool AutoSpin { get; set; } = false;
+        public bool Valid => spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
+        public bool Trackable { get; set; }
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
@@ -95,22 +96,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         protected override void Update()
         {
             base.Update();
+            var thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
 
-            bool valid = spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
+            var delta = thisAngle - lastAngle;
 
-            if (valid && AutoSpin)
-                Rotate(6f);
-            else
-            {
-                var thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
+            if (Valid && tracking && Trackable)
+                Rotate(delta);
 
-                var delta = thisAngle - lastAngle;
-
-                if (valid && tracking)
-                    Rotate(delta);
-
-                lastAngle = thisAngle;
-            }
+            lastAngle = thisAngle;
 
             if (Complete && updateCompleteTick())
             {

From ca09ae6849b94cdc2ef15c4b770212d1f8a92138 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 8 Feb 2020 09:53:20 +0800
Subject: [PATCH 00690/10326] fix formatting

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 07c10966d3..c74e4e3e70 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                         if (d is SpinnerDisc s)
                         {
                             if (s.Valid)
-                            s.Rotate((float)frameDelay);
+                                s.Rotate((float)frameDelay);
                         }
                     };
                 }

From 204c2f0bde7cbd36563842d0f4831a65d2308fcc Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 8 Feb 2020 10:16:04 +0800
Subject: [PATCH 00691/10326] add tests

---
 osu.Game.Rulesets.Osu.Tests/Class1.cs       | 23 +++++++++++++++++++++
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs |  1 -
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Class1.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Class1.cs b/osu.Game.Rulesets.Osu.Tests/Class1.cs
new file mode 100644
index 0000000000..402c14fa64
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Class1.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Osu.Mods;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [TestFixture]
+    public class TestSceneSpinnerSpunOut : TestSceneSpinner
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModSpunOut) }).ToList();
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            SelectedMods.Value = new[] { new OsuModHidden() };
+        });
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index c74e4e3e70..eb49742db6 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;

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 00692/10326] 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 715608c7985c2366905751be856b3984b6cf94cd Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 8 Feb 2020 10:49:49 +0800
Subject: [PATCH 00693/10326] Fix test applying incorrect mod

---
 .../{Class1.cs => TestSceneSpinnerSpunOut.cs}                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Rulesets.Osu.Tests/{Class1.cs => TestSceneSpinnerSpunOut.cs} (90%)

diff --git a/osu.Game.Rulesets.Osu.Tests/Class1.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs
similarity index 90%
rename from osu.Game.Rulesets.Osu.Tests/Class1.cs
rename to osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs
index 402c14fa64..a6c09691c7 100644
--- a/osu.Game.Rulesets.Osu.Tests/Class1.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            SelectedMods.Value = new[] { new OsuModHidden() };
+            SelectedMods.Value = new[] { new OsuModSpunOut() };
         });
     }
 }

From efa95ecebb66fe587c6c2e9862c384586b29dbf9 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 8 Feb 2020 10:52:59 +0800
Subject: [PATCH 00694/10326] fix spinner unspinnable

---
 osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 9a9d915cfe..4e2758b3d5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         }
 
         public bool Valid => spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
-        public bool Trackable { get; set; }
+        public bool Trackable { get; set; } = true;
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {

From fbdf07dc201c87140c00be1121d227d003c3dd1e Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 8 Feb 2020 11:06:37 +0800
Subject: [PATCH 00695/10326] Correct speed of spun out

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index eb49742db6..16fc7646c2 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                         if (d is SpinnerDisc s)
                         {
                             if (s.Valid)
-                                s.Rotate((float)frameDelay);
+                                s.Rotate(180 / MathF.PI * ((float)frameDelay) / 40);
                         }
                     };
                 }

From d821b6a15aee2f2d0d7559828a6a04752546ddba Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 8 Feb 2020 11:16:48 +0800
Subject: [PATCH 00696/10326] make frameDelay a float

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 16fc7646c2..1832910e71 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(OsuModAutopilot) };
 
         private double lastFrameTime;
-        private double frameDelay;
+        private float frameDelay;
 
         public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                         if (d is SpinnerDisc s)
                         {
                             if (s.Valid)
-                                s.Rotate(180 / MathF.PI * ((float)frameDelay) / 40);
+                                s.Rotate(180 / MathF.PI * frameDelay / 40);
                         }
                     };
                 }
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void Update(Playfield playfield)
         {
-            frameDelay = playfield.Time.Current - lastFrameTime;
+            frameDelay = (float)(playfield.Time.Current - lastFrameTime);
             lastFrameTime = playfield.Time.Current;
         }
     }

From 2d672159317783629f3e5334621fc7341942531e Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 8 Feb 2020 12:07:21 +0800
Subject: [PATCH 00697/10326] make target practice subject of unimplemented mod
 test

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs         | 4 ++--
 1 file 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..1e18e18631 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             var doubleTimeMod = harderMods.OfType<MultiMod>().FirstOrDefault(m => m.Mods.Any(a => a is OsuModDoubleTime));
 
-            var spunOutMod = easierMods.FirstOrDefault(m => m is OsuModSpunOut);
+            var targetMod = easierMods.FirstOrDefault(m => m is OsuModTarget);
 
             var easy = easierMods.FirstOrDefault(m => m is OsuModEasy);
             var hardRock = harderMods.FirstOrDefault(m => m is OsuModHardRock);
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             testMultiplierTextColour(noFailMod, () => modSelect.LowMultiplierColour);
             testMultiplierTextColour(hiddenMod, () => modSelect.HighMultiplierColour);
 
-            testUnimplementedMod(spunOutMod);
+            testUnimplementedMod(targetMod);
         }
 
         [Test]

From a4637a24a6c6d57a23f18db87ac954577ff9e1c3 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 8 Feb 2020 12:08:44 +0800
Subject: [PATCH 00698/10326] fix test scene crash

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 1e18e18631..034324aadd 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -91,13 +91,14 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             var easierMods = osu.GetModsFor(ModType.DifficultyReduction);
             var harderMods = osu.GetModsFor(ModType.DifficultyIncrease);
+            var conversionMods = osu.GetModsFor(ModType.Conversion);
 
             var noFailMod = osu.GetModsFor(ModType.DifficultyReduction).FirstOrDefault(m => m is OsuModNoFail);
             var hiddenMod = harderMods.FirstOrDefault(m => m is OsuModHidden);
 
             var doubleTimeMod = harderMods.OfType<MultiMod>().FirstOrDefault(m => m.Mods.Any(a => a is OsuModDoubleTime));
 
-            var targetMod = easierMods.FirstOrDefault(m => m is OsuModTarget);
+            var targetMod = conversionMods.FirstOrDefault(m => m is OsuModTarget);
 
             var easy = easierMods.FirstOrDefault(m => m is OsuModEasy);
             var hardRock = harderMods.FirstOrDefault(m => m is OsuModHardRock);

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 00699/10326] 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 00700/10326] 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 00701/10326] 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 00702/10326] 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 00703/10326] 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 00704/10326] 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 00705/10326] 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 9e5da60614f150af5077da96db092134fa7c136a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 Feb 2020 00:28:38 +0300
Subject: [PATCH 00706/10326] Rename RankChartLineGraph to UserLineGraph

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

diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index 13ea347032..f3d4f824f7 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -21,13 +21,13 @@ namespace osu.Game.Overlays.Profile
     {
         protected const float FADE_DURATION = 150;
 
-        protected readonly RankChartLineGraph Graph;
+        protected readonly UserLineGraph Graph;
         protected KeyValuePair<TKey, TValue>[] Data;
         protected int DataIndex;
 
         protected UserGraph()
         {
-            Add(Graph = new RankChartLineGraph
+            Add(Graph = new UserLineGraph
             {
                 RelativeSizeAxes = Axes.Both,
                 Alpha = 0
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Profile
 
         protected abstract object GetTooltipContent();
 
-        protected class RankChartLineGraph : LineGraph
+        protected class UserLineGraph : LineGraph
         {
             private readonly CircularContainer movingBall;
             private readonly Container bar;
@@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Profile
 
             public Action<int> OnBallMove;
 
-            public RankChartLineGraph()
+            public UserLineGraph()
             {
                 Add(bar = new Container
                 {

From e2ecef732cfafa97619e2918572c06b6f5a536ed Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 Feb 2020 00:36:41 +0300
Subject: [PATCH 00707/10326] Make TooltipCounterName an abstract property

---
 .../Visual/Online/TestSceneUserHistoryGraph.cs | 14 ++++++++++++--
 .../Profile/Header/Components/RankGraph.cs     |  5 +----
 .../Sections/Historical/UserHistoryGraph.cs    | 18 ++----------------
 osu.Game/Overlays/Profile/UserGraph.cs         |  6 ++++--
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
index bf77e5d60a..164d719a00 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
@@ -25,9 +25,9 @@ namespace osu.Game.Tests.Visual.Online
 
         public TestSceneUserHistoryGraph()
         {
-            UserHistoryGraph graph;
+            TestGraph graph;
 
-            Add(graph = new UserHistoryGraph("Counter Name")
+            Add(graph = new TestGraph
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 200,
@@ -108,5 +108,15 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Set null values", () => graph.Values = null);
             AddStep("Set empty values", () => graph.Values = Array.Empty<UserHistoryCount>());
         }
+
+        private class TestGraph : UserHistoryGraph
+        {
+            protected override UserGraphTooltip GetTooltip() => new TestTooltip();
+
+            private class TestTooltip : HistoryGraphTooltip
+            {
+                protected override string TooltipCounterName => "Test Counter";
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index 2a571e46d1..b62864364b 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -80,10 +80,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         private class RankGraphTooltip : UserGraphTooltip
         {
-            public RankGraphTooltip()
-                : base(@"Global Ranking")
-            {
-            }
+            protected override string TooltipCounterName => @"Global Ranking";
 
             public override bool SetContent(object content)
             {
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index 5129ce872f..2e389d3ac6 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -9,7 +9,7 @@ using static osu.Game.Users.User;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
-    public class UserHistoryGraph : UserGraph<DateTime, long>
+    public abstract class UserHistoryGraph : UserGraph<DateTime, long>
     {
         private UserHistoryCount[] values;
 
@@ -23,13 +23,6 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             }
         }
 
-        private readonly string tooltipCounterName;
-
-        public UserHistoryGraph(string tooltipCounterName)
-        {
-            this.tooltipCounterName = tooltipCounterName;
-        }
-
         private void updateValues(UserHistoryCount[] values)
         {
             if (values == null || !values.Any())
@@ -61,15 +54,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             };
         }
 
-        protected override UserGraphTooltip GetTooltip() => new HistoryGraphTooltip(tooltipCounterName);
-
-        private class HistoryGraphTooltip : UserGraphTooltip
+        protected abstract class HistoryGraphTooltip : UserGraphTooltip
         {
-            public HistoryGraphTooltip(string topText)
-                : base(topText)
-            {
-            }
-
             public override bool SetContent(object content)
             {
                 if (!(content is TooltipDisplayContent info))
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index f3d4f824f7..122a6ded36 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -153,7 +153,9 @@ namespace osu.Game.Overlays.Profile
             protected readonly OsuSpriteText Counter, BottomText;
             private readonly Box background;
 
-            protected UserGraphTooltip(string topText)
+            protected abstract string TooltipCounterName { get; }
+
+            protected UserGraphTooltip()
             {
                 AutoSizeAxes = Axes.Both;
                 Masking = true;
@@ -181,7 +183,7 @@ namespace osu.Game.Overlays.Profile
                                     new OsuSpriteText
                                     {
                                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
-                                        Text = $"{topText} "
+                                        Text = $"{TooltipCounterName} "
                                     },
                                     Counter = new OsuSpriteText
                                     {

From 8e20e641f440d4a2dff2c49b60816b0021a1cd55 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sun, 9 Feb 2020 13:33:43 +0800
Subject: [PATCH 00708/10326] move spun out to automation

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index b794f5e22e..c4890afe36 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Name => "Spun Out";
         public override string Acronym => "SO";
         public override IconUsage? Icon => OsuIcon.ModSpunout;
-        public override ModType Type => ModType.DifficultyReduction;
+        public override ModType Type => ModType.Automation;
         public override string Description => @"Spinners will be automatically completed.";
         public override double ScoreMultiplier => 0.9;
         public override bool Ranked => true;

From 83c67dc155518d1a9b2432432e0a4f250c370544 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sun, 9 Feb 2020 13:34:35 +0800
Subject: [PATCH 00709/10326] move spun out to automation

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

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 148869f5e8..ed73a54815 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -113,7 +113,6 @@ namespace osu.Game.Rulesets.Osu
                         new OsuModEasy(),
                         new OsuModNoFail(),
                         new MultiMod(new OsuModHalfTime(), new OsuModDaycore()),
-                        new OsuModSpunOut(),
                     };
 
                 case ModType.DifficultyIncrease:
@@ -139,6 +138,7 @@ namespace osu.Game.Rulesets.Osu
                         new MultiMod(new OsuModAutoplay(), new OsuModCinema()),
                         new OsuModRelax(),
                         new OsuModAutopilot(),
+                        new OsuModSpunOut(),
                     };
 
                 case ModType.Fun:

From c9520b299a40cd23d228dd62b38c87a1ee3b9632 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sun, 9 Feb 2020 13:35:36 +0800
Subject: [PATCH 00710/10326] replace if check with variable decl

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index c4890afe36..6a2610ae05 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -36,11 +36,10 @@ namespace osu.Game.Rulesets.Osu.Mods
                     spinner.Disc.Trackable = false;
                     spinner.Disc.OnUpdate += d =>
                     {
-                        if (d is SpinnerDisc s)
-                        {
-                            if (s.Valid)
-                                s.Rotate(180 / MathF.PI * frameDelay / 40);
-                        }
+                        var s = d as SpinnerDisc;
+
+                        if (s.Valid)
+                            s.Rotate(180 / MathF.PI * frameDelay / 40);
                     };
                 }
             }

From d314b38699d1211d034cc896a478b809d8aa15e5 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sun, 9 Feb 2020 13:46:06 +0800
Subject: [PATCH 00711/10326] rename trackable to enabled and cleanup code

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs              | 2 +-
 .../Objects/Drawables/DrawableSpinner.cs                 | 2 +-
 .../Objects/Drawables/Pieces/SpinnerDisc.cs              | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 6a2610ae05..e02ded979f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 if (hitObject is DrawableSpinner spinner)
                 {
-                    spinner.Disc.Trackable = false;
+                    spinner.Disc.Enabled = false;
                     spinner.Disc.OnUpdate += d =>
                     {
                         var s = d as SpinnerDisc;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 2930134d4f..de11ab6419 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void Update()
         {
             Disc.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
-            if (!SpmCounter.IsPresent && (Disc.Tracking || !Disc.Trackable))
+            if (!SpmCounter.IsPresent && Disc.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
             base.Update();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 4e2758b3d5..b062fc5afa 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -50,9 +50,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             get => tracking;
             set
             {
-                if (value == tracking) return;
+                if ((Enabled && value) == tracking) return;
 
-                tracking = value;
+                tracking = Enabled && value;
 
                 background.FadeTo(tracking ? tracking_alpha : idle_alpha, 100);
             }
@@ -74,7 +74,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         }
 
         public bool Valid => spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
-        public bool Trackable { get; set; } = true;
+
+        public bool Enabled { get; set; } = true;
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
@@ -100,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             var delta = thisAngle - lastAngle;
 
-            if (Valid && tracking && Trackable)
+            if (Valid && tracking)
                 Rotate(delta);
 
             lastAngle = thisAngle;

From 68873830aadfde6495812766820c3b9b78dc94d3 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sun, 9 Feb 2020 13:49:08 +0800
Subject: [PATCH 00712/10326] make spm counter show up automatically with spun
 out

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index de11ab6419..752bd7be85 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void Update()
         {
             Disc.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
-            if (!SpmCounter.IsPresent && Disc.Tracking)
+            if (!SpmCounter.IsPresent && (Disc.Tracking || !Disc.Enabled))
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
             base.Update();

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 00713/10326] 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 596f4f7d2e6c62c7a4c3fa43ce161c5b71c388d8 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sun, 9 Feb 2020 14:54:46 +0800
Subject: [PATCH 00714/10326] use spinner's clock to drive spinner

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index e02ded979f..084be40672 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModSpunOut : Mod, IApplicableToDrawableHitObjects, IUpdatableByPlayfield
+    public class OsuModSpunOut : Mod, IApplicableToDrawableHitObjects
     {
         public override string Name => "Spun Out";
         public override string Acronym => "SO";
@@ -24,9 +24,6 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(OsuModAutopilot) };
 
-        private double lastFrameTime;
-        private float frameDelay;
-
         public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
             foreach (var hitObject in drawables)
@@ -39,16 +36,10 @@ namespace osu.Game.Rulesets.Osu.Mods
                         var s = d as SpinnerDisc;
 
                         if (s.Valid)
-                            s.Rotate(180 / MathF.PI * frameDelay / 40);
+                            s.Rotate(180 / MathF.PI * (float)s.Clock.ElapsedFrameTime / 40);
                     };
                 }
             }
         }
-
-        public void Update(Playfield playfield)
-        {
-            frameDelay = (float)(playfield.Time.Current - lastFrameTime);
-            lastFrameTime = playfield.Time.Current;
-        }
     }
 }

From e78d94d4692d02ed5843e5f23882c660e23099d1 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sun, 9 Feb 2020 14:56:47 +0800
Subject: [PATCH 00715/10326] return to use if for casting

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 084be40672..2c1d1362a6 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -33,9 +33,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     spinner.Disc.Enabled = false;
                     spinner.Disc.OnUpdate += d =>
                     {
-                        var s = d as SpinnerDisc;
-
-                        if (s.Valid)
+                        if (d is SpinnerDisc s && s.Valid)
                             s.Rotate(180 / MathF.PI * (float)s.Clock.ElapsedFrameTime / 40);
                     };
                 }

From 10a1948720b15e8de61149ff7abfcad89d5eca8d Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sun, 9 Feb 2020 16:19:21 +0800
Subject: [PATCH 00716/10326] remove using directive

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 2c1d1362a6..d56e39b588 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -9,7 +9,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
-using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {

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 00717/10326] 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 00718/10326] 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 00719/10326] 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 00720/10326] 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 00721/10326] 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 00722/10326] 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 00723/10326] 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 00724/10326] 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 00725/10326] 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 00726/10326] 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 00727/10326] 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 00728/10326] 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 00729/10326] 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 00730/10326] 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 9aa5db88d4baed09dcda72005845cf2dad27e9f0 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Mon, 10 Feb 2020 14:14:04 +0800
Subject: [PATCH 00731/10326] move auto fade in to mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs         | 13 +++++++++----
 .../Objects/Drawables/DrawableSpinner.cs            |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index d56e39b588..670f4a2cd8 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -3,12 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -30,10 +30,15 @@ namespace osu.Game.Rulesets.Osu.Mods
                 if (hitObject is DrawableSpinner spinner)
                 {
                     spinner.Disc.Enabled = false;
-                    spinner.Disc.OnUpdate += d =>
+                    spinner.OnUpdate += d =>
                     {
-                        if (d is SpinnerDisc s && s.Valid)
-                            s.Rotate(180 / MathF.PI * (float)s.Clock.ElapsedFrameTime / 40);
+                        if (d is DrawableSpinner s)
+                        {
+                            if (s.Disc.Valid)
+                                s.Disc.Rotate(180 / MathF.PI * (float)s.Clock.ElapsedFrameTime / 40);
+                            if (!s.SpmCounter.IsPresent)
+                                s.SpmCounter.FadeIn(s.HitObject.TimeFadeIn);
+                        }
                     };
                 }
             }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 752bd7be85..de11ab6419 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void Update()
         {
             Disc.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
-            if (!SpmCounter.IsPresent && (Disc.Tracking || !Disc.Enabled))
+            if (!SpmCounter.IsPresent && Disc.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
             base.Update();

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 00732/10326] 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 00733/10326] 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 00734/10326] 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 00735/10326] 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 00736/10326] 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 00737/10326] 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 00738/10326] 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 00739/10326] 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 00740/10326] 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 00741/10326] 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 00742/10326] 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 00743/10326] 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 00744/10326] 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 00745/10326] 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 00746/10326] 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 00747/10326] 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 00748/10326] 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 00749/10326] 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 403c03841d1d3497dfda7ffc3af8f2fb72d2daba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 10 Feb 2020 21:39:45 +0100
Subject: [PATCH 00750/10326] Decouple test scene & add assertions

---
 .../TestSceneSpinnerSpunOut.cs                | 51 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs
index a6c09691c7..e406f9ddff 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs
@@ -5,19 +5,66 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestSceneSpinnerSpunOut : TestSceneSpinner
+    public class TestSceneSpinnerSpunOut : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModSpunOut) }).ToList();
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(SpinnerDisc),
+            typeof(DrawableSpinner),
+            typeof(DrawableOsuHitObject),
+            typeof(OsuModSpunOut)
+        };
 
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
             SelectedMods.Value = new[] { new OsuModSpunOut() };
         });
+
+        [Test]
+        public void TestSpunOut()
+        {
+            DrawableSpinner spinner = null;
+
+            AddStep("create spinner", () => spinner = createSpinner());
+
+            AddUntilStep("wait for end", () => Time.Current > spinner.LifetimeEnd);
+
+            AddAssert("spinner is completed", () => spinner.Progress >= 1);
+        }
+
+        private DrawableSpinner createSpinner()
+        {
+            var spinner = new Spinner
+            {
+                StartTime = Time.Current + 500,
+                EndTime = Time.Current + 2500
+            };
+            spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            var drawableSpinner = new DrawableSpinner(spinner)
+            {
+                Anchor = Anchor.Centre
+            };
+
+            foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObjects>())
+                mod.ApplyToDrawableHitObjects(new[] { drawableSpinner });
+
+            Add(drawableSpinner);
+            return drawableSpinner;
+        }
     }
 }

From 686040d8ad7926ad515fcb1bfcf586ca8b1d5d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 10 Feb 2020 21:42:34 +0100
Subject: [PATCH 00751/10326] Extract auto-spin logic to method

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 22 +++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 670f4a2cd8..37ef001223 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -30,18 +30,20 @@ namespace osu.Game.Rulesets.Osu.Mods
                 if (hitObject is DrawableSpinner spinner)
                 {
                     spinner.Disc.Enabled = false;
-                    spinner.OnUpdate += d =>
-                    {
-                        if (d is DrawableSpinner s)
-                        {
-                            if (s.Disc.Valid)
-                                s.Disc.Rotate(180 / MathF.PI * (float)s.Clock.ElapsedFrameTime / 40);
-                            if (!s.SpmCounter.IsPresent)
-                                s.SpmCounter.FadeIn(s.HitObject.TimeFadeIn);
-                        }
-                    };
+                    spinner.OnUpdate += autoSpin;
                 }
             }
         }
+
+        private void autoSpin(Drawable drawable)
+        {
+            if (drawable is DrawableSpinner spinner)
+            {
+                if (spinner.Disc.Valid)
+                    spinner.Disc.Rotate(180 / MathF.PI * (float)spinner.Clock.ElapsedFrameTime / 40);
+                if (!spinner.SpmCounter.IsPresent)
+                    spinner.SpmCounter.FadeIn(spinner.HitObject.TimeFadeIn);
+            }
+        }
     }
 }

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 00752/10326] 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 00753/10326] 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 00754/10326] 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 00755/10326] 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 00756/10326] 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 00757/10326] 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 00758/10326] 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 00759/10326] 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 00760/10326] 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 00761/10326] 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 00762/10326] 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 00763/10326] 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 00764/10326] 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 00765/10326] 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 00766/10326] 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 00767/10326] 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 00768/10326] 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 00769/10326] 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 00770/10326] 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 00771/10326] 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 00772/10326] 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 00773/10326] 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 00774/10326] 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 00775/10326] 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 00776/10326] 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 00777/10326] 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 2b0bdd1db5deee1efcae3d7388aae3c4a03e2d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 Feb 2020 19:15:37 +0100
Subject: [PATCH 00778/10326] Refactor tooltip construction

---
 .../Profile/Header/Components/RankGraph.cs    |  9 +++------
 .../Sections/Historical/UserHistoryGraph.cs   |  9 +++------
 osu.Game/Overlays/Profile/UserGraph.cs        | 20 ++++++++++++++-----
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index b62864364b..097b68f3aa 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -62,16 +62,13 @@ namespace osu.Game.Overlays.Profile.Header.Components
             Graph.FadeTo(Data.Length > 1 ? 1 : 0, FADE_DURATION, Easing.Out);
         }
 
-        protected override object GetTooltipContent()
+        protected override object GetTooltipContent(int index, int rank)
         {
-            if (Statistics.Value?.Ranks.Global == null)
-                return null;
-
-            var days = ranked_days - Data[DataIndex].Key + 1;
+            var days = ranked_days - index + 1;
 
             return new TooltipDisplayContent
             {
-                Rank = $"#{Data[DataIndex].Value:#,##0}",
+                Rank = $"#{rank:#,##0}",
                 Time = days == 0 ? "now" : $"{days} days ago"
             };
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index 2e389d3ac6..d37454d607 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -42,15 +42,12 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             }
         }
 
-        protected override object GetTooltipContent()
+        protected override object GetTooltipContent(DateTime date, long playCount)
         {
-            if (!Data?.Any() ?? true)
-                return null;
-
             return new TooltipDisplayContent
             {
-                Count = Data[DataIndex].Value.ToString("N0"),
-                Date = Data[DataIndex].Key.ToString("MMMM yyyy")
+                Count = playCount.ToString("N0"),
+                Date = date.ToString("MMMM yyyy")
             };
         }
 
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index 122a6ded36..f1f5b50cd3 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Profile
 
         protected readonly UserLineGraph Graph;
         protected KeyValuePair<TKey, TValue>[] Data;
-        protected int DataIndex;
+        private int dataIndex;
 
         protected UserGraph()
         {
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Profile
                 Alpha = 0
             });
 
-            Graph.OnBallMove += i => DataIndex = i;
+            Graph.OnBallMove += i => dataIndex = i;
         }
 
         [BackgroundDependencyLoader]
@@ -71,11 +71,21 @@ namespace osu.Game.Overlays.Profile
 
         public ITooltip GetCustomTooltip() => GetTooltip();
 
-        public object TooltipContent => GetTooltipContent();
-
         protected abstract UserGraphTooltip GetTooltip();
 
-        protected abstract object GetTooltipContent();
+        public object TooltipContent
+        {
+            get
+            {
+                if (Data == null || Data.Length == 0)
+                    return null;
+
+                var (key, value) = Data[dataIndex];
+                return GetTooltipContent(key, value);
+            }
+        }
+
+        protected abstract object GetTooltipContent(TKey key, TValue value);
 
         protected class UserLineGraph : LineGraph
         {

From 9edddbaf4691ee04f2b8af0a9263dc673c1072ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 Feb 2020 20:19:20 +0100
Subject: [PATCH 00779/10326] Encapsulate base graph further

---
 .../Profile/Header/Components/RankGraph.cs    | 24 ++++----
 .../Sections/Historical/UserHistoryGraph.cs   | 32 +++-------
 osu.Game/Overlays/Profile/UserGraph.cs        | 61 ++++++++++++++-----
 3 files changed, 66 insertions(+), 51 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index 097b68f3aa..77edfe2746 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -39,27 +39,29 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         private void updateStatistics(UserStatistics statistics)
         {
-            placeholder.FadeIn(FADE_DURATION, Easing.Out);
+            int[] userRanks = statistics?.RankHistory?.Data;
 
-            if (statistics?.Ranks.Global == null)
+            if (userRanks == null)
             {
-                Graph.FadeOut(FADE_DURATION, Easing.Out);
                 Data = null;
                 return;
             }
 
-            int[] userRanks = statistics.RankHistory?.Data ?? new[] { statistics.Ranks.Global.Value };
             Data = userRanks.Select((x, index) => new KeyValuePair<int, int>(index, x)).Where(x => x.Value != 0).ToArray();
+        }
 
-            if (Data.Length > 1)
-            {
-                placeholder.FadeOut(FADE_DURATION, Easing.Out);
+        protected override float GetDataPointHeight(int rank) => -MathF.Log(rank);
 
-                Graph.DefaultValueCount = Data.Length;
-                Graph.Values = Data.Select(x => -MathF.Log(x.Value));
-            }
+        protected override void ShowGraph()
+        {
+            base.ShowGraph();
+            placeholder.FadeOut(FADE_DURATION, Easing.Out);
+        }
 
-            Graph.FadeTo(Data.Length > 1 ? 1 : 0, FADE_DURATION, Easing.Out);
+        protected override void HideGraph()
+        {
+            base.HideGraph();
+            placeholder.FadeIn(FADE_DURATION, Easing.Out);
         }
 
         protected override object GetTooltipContent(int index, int rank)
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index d37454d607..ccc286d423 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -4,43 +4,27 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics;
 using static osu.Game.Users.User;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
     public abstract class UserHistoryGraph : UserGraph<DateTime, long>
     {
-        private UserHistoryCount[] values;
-
         public UserHistoryCount[] Values
         {
-            get => values;
             set
             {
-                values = value;
-                updateValues(value);
+                if (value == null)
+                {
+                    Data = null;
+                    return;
+                }
+
+                Data = value.Select(v => new KeyValuePair<DateTime, long>(v.Date, v.Count)).ToArray();
             }
         }
 
-        private void updateValues(UserHistoryCount[] values)
-        {
-            if (values == null || !values.Any())
-            {
-                Graph.FadeOut(FADE_DURATION, Easing.Out);
-                Data = null;
-                return;
-            }
-
-            Data = values.Select(v => new KeyValuePair<DateTime, long>(v.Date, v.Count)).ToArray();
-
-            if (values.Length > 1)
-            {
-                Graph.DefaultValueCount = Data.Length;
-                Graph.Values = Data.Select(x => (float)x.Value);
-                Graph.FadeIn(FADE_DURATION, Easing.Out);
-            }
-        }
+        protected override float GetDataPointHeight(long playCount) => playCount;
 
         protected override object GetTooltipContent(DateTime date, long playCount)
         {
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index f1f5b50cd3..86e405c8f0 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -21,54 +21,83 @@ namespace osu.Game.Overlays.Profile
     {
         protected const float FADE_DURATION = 150;
 
-        protected readonly UserLineGraph Graph;
-        protected KeyValuePair<TKey, TValue>[] Data;
+        private readonly UserLineGraph graph;
+        private KeyValuePair<TKey, TValue>[] data;
         private int dataIndex;
 
         protected UserGraph()
         {
-            Add(Graph = new UserLineGraph
+            data = Array.Empty<KeyValuePair<TKey, TValue>>();
+
+            Add(graph = new UserLineGraph
             {
                 RelativeSizeAxes = Axes.Both,
                 Alpha = 0
             });
 
-            Graph.OnBallMove += i => dataIndex = i;
+            graph.OnBallMove += i => dataIndex = i;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Graph.LineColour = colours.Yellow;
+            graph.LineColour = colours.Yellow;
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            if (Data?.Length > 1)
-            {
-                Graph.UpdateBallPosition(e.MousePosition.X);
-                Graph.ShowBar();
-            }
+            if (data.Length <= 1)
+                return base.OnHover(e);
+
+            graph.UpdateBallPosition(e.MousePosition.X);
+            graph.ShowBar();
 
             return base.OnHover(e);
         }
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
-            if (Data?.Length > 1)
-                Graph.UpdateBallPosition(e.MousePosition.X);
+            if (data.Length > 1)
+                graph.UpdateBallPosition(e.MousePosition.X);
 
             return base.OnMouseMove(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            if (Data?.Length > 1)
-                Graph.HideBar();
+            if (data.Length > 1)
+                graph.HideBar();
 
             base.OnHoverLost(e);
         }
 
+        protected KeyValuePair<TKey, TValue>[] Data
+        {
+            set
+            {
+                value ??= Array.Empty<KeyValuePair<TKey, TValue>>();
+                data = value;
+                redrawGraph();
+            }
+        }
+
+        private void redrawGraph()
+        {
+            if (data.Length == 0)
+            {
+                HideGraph();
+                return;
+            }
+
+            graph.DefaultValueCount = data.Length;
+            graph.Values = data.Select(pair => GetDataPointHeight(pair.Value)).ToArray();
+            ShowGraph();
+        }
+
+        protected abstract float GetDataPointHeight(TValue value);
+        protected virtual void ShowGraph() => graph.FadeIn(FADE_DURATION, Easing.Out);
+        protected virtual void HideGraph() => graph.FadeOut(FADE_DURATION, Easing.Out);
+
         public ITooltip GetCustomTooltip() => GetTooltip();
 
         protected abstract UserGraphTooltip GetTooltip();
@@ -77,10 +106,10 @@ namespace osu.Game.Overlays.Profile
         {
             get
             {
-                if (Data == null || Data.Length == 0)
+                if (data.Length == 0)
                     return null;
 
-                var (key, value) = Data[dataIndex];
+                var (key, value) = data[dataIndex];
                 return GetTooltipContent(key, value);
             }
         }

From 60a1dad67d8f51ce21e5bd40cc64792043e6a18e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 Feb 2020 20:35:31 +0100
Subject: [PATCH 00780/10326] Explicitly handle hover event

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

diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index 86e405c8f0..de3d91f088 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Overlays.Profile
             graph.UpdateBallPosition(e.MousePosition.X);
             graph.ShowBar();
 
-            return base.OnHover(e);
+            return true;
         }
 
         protected override bool OnMouseMove(MouseMoveEvent e)

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 00781/10326] 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 00782/10326] 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 00783/10326] 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 00784/10326] 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 00785/10326] 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 00786/10326] 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 00787/10326] 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 00788/10326] 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 00789/10326] 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 00790/10326] 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 00791/10326] 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 00792/10326] 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 00793/10326] 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 00794/10326] 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 00795/10326] 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 00796/10326] 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 00797/10326] 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 00798/10326] 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 00799/10326] 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 00800/10326] 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 00801/10326] 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 00802/10326] 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 00803/10326] 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 00804/10326] 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 00805/10326] 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 00806/10326] 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 00807/10326] 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 00808/10326] 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 00809/10326] 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 00810/10326] 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 00811/10326] 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 00812/10326] 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 00813/10326] 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 00814/10326] 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 00815/10326] 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 00816/10326] 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 00817/10326] 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 00818/10326] 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 00819/10326] 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 00820/10326] 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 00821/10326] 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 00822/10326] 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 00823/10326] 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 00824/10326] 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 00825/10326] 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 00826/10326] 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 00827/10326] 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 00828/10326] 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 00829/10326] 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 00830/10326] 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 00831/10326] 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 00832/10326] 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 00833/10326] 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 00834/10326] 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 00835/10326] 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 00836/10326] 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 00837/10326] 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 00838/10326] 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 00839/10326] 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 00840/10326] 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 00841/10326] 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 00842/10326] 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 00843/10326] 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 00844/10326] 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 00845/10326] 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 00846/10326] 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 00847/10326] 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 00848/10326] 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 00849/10326] 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 00850/10326] 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 00851/10326] 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 00852/10326] 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 00853/10326] 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 00854/10326] 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 00855/10326] 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 00856/10326] 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 00857/10326] 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 00858/10326] 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 00859/10326] 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 00860/10326] 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 00861/10326] 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 00862/10326] 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 00863/10326] 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 00864/10326] 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 00865/10326] 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 00866/10326] 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 00867/10326] 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 00868/10326] 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 00869/10326] 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 00870/10326] 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 00871/10326] 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 00872/10326] 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 00873/10326] 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 00874/10326] 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 00875/10326] 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 00876/10326] 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 00877/10326] 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 00878/10326] 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 00879/10326] 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 00880/10326] 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 00881/10326] 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 00882/10326] 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 00883/10326] 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 00884/10326] 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 00885/10326] 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 00886/10326] 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 00887/10326] 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 00888/10326] 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 00889/10326] 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 00890/10326] 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 00891/10326] 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 00892/10326] 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 00893/10326] 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 00894/10326] 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 00895/10326] 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 00896/10326] 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 00897/10326] 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 00898/10326] 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 00899/10326] 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 00900/10326] 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 00901/10326] 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 00902/10326] 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 00903/10326] 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 00904/10326] 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 00905/10326] 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 00906/10326] 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 00907/10326] 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 00908/10326] 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 b6378c7ae22ef88365a604a34289f574d6decae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9CNate?= <nathandu@outlook.com>
Date: Sun, 16 Feb 2020 17:50:52 +0800
Subject: [PATCH 00909/10326] fix speed

* Original /40 is due to documentation error.

Co-Authored-By: clayton <me@clayton.cc>
---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 37ef001223..30b9c84538 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             if (drawable is DrawableSpinner spinner)
             {
                 if (spinner.Disc.Valid)
-                    spinner.Disc.Rotate(180 / MathF.PI * (float)spinner.Clock.ElapsedFrameTime / 40);
+                    spinner.Disc.Rotate(180 / MathF.PI * (float)spinner.Clock.ElapsedFrameTime * 0.03f);
                 if (!spinner.SpmCounter.IsPresent)
                     spinner.SpmCounter.FadeIn(spinner.HitObject.TimeFadeIn);
             }

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 00910/10326] 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 00911/10326] 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 00912/10326] 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 00913/10326] 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 00914/10326] 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 00915/10326] 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 00916/10326] 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 00917/10326] 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 00918/10326] 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 00919/10326] 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 00920/10326] 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 00921/10326] 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 00922/10326] 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 00923/10326] 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 00924/10326] 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 00925/10326] 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 00926/10326] 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 00927/10326] 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 00928/10326] 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 00929/10326] 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 00930/10326] 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 00931/10326] 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 00932/10326] 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 00933/10326] 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 00934/10326] 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 00935/10326] 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 00936/10326] 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 00937/10326] 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 00938/10326] 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 00939/10326] 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 00940/10326] 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
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

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
zcmZvZWmwY>poM=M+Zg32K_o`2C?QD4KmkEoL{dUx2+|<Ph!GOf-65c$NGM21Y;=bp
zCCCUR1l;H$vHQQD?>*0R-uF45PpqN-eFoaAv;Y7wXltoI{Lk3`EgbeAyHxCk{u2bP
zrl$q~HT|;C*PH)s4qpv3Ut<p^Uw=DqM?lTN<EbOBwwoQ=@u8!g!%MFLM<oDYQPx&h
zdlUfL&ecd0luwINmXL~Tq5JxW(`n7o$w@(c(k~Q0>@l~+bu5E1cUnBZlG_}YN+r0n
zdeWRQFcHPkIa27Qec7CYg?KZIb!tL`{fY0l{|`NA<<z8I%xNuXetO#ZO_XMxk%s-H
zR^Qz)4KbvFgD0Cc7QLi$-44c*-6=OX*nOpghQ5lRnk=Sb0@GRsLU=CB9!uWpNT%!G
z9B@EBnw96u16AjdWS9Aa=tk$s@1Ja;c%{mc^KQ_&y52D~e?cU+C{R7``1v{0{#97N
zg1nx3_`pU`7!&QYuCMjh3A<&FetC7Z`u`(Q=q@-esM}##%a?Qs_9j|(JtC80&%1;_
z-W`iXMbddP=o4CK6sVjJY;|B9NzIINZ!F71sLDRa6lVZj^^duoF0s_-aG8n^h*q34
zRG%r54alh`uks`!<s<!hAG${c!L7sBmu}3~?W*YNkx|jONRIEs5l8`udB}%GMD8co
zHywfUBDE5AW`!!q9Vbx}po=Rx=}&O8G=+gf8rOZ9^7IT5G?n?9rDCxY-aPUT?WX;&
zpeiHChtB>;!eO-S89mzl{KvE4(G!x1)DJ%vLTD~Sa&SBWg9^&}_zNK}g1^cd8(Rc6
z*B0<?<vsrP9C{$d`Ac*!FvV-6?NJO-Bk@|5?=?e?oxB*FTi!PU78UH=NC@?86t|fb
zam*tmaX7RUX-9FmvO7G)6dV%nPz@922g;;WFCBNrJ#<PM&<wNUC`};^tz7f6X?Kg_
z;Z6Mb0p!i=akudK(Dz_=&Dq;2nwgw%ofQ-UmmxerM1@Fb{hj|ibm=tpi)7YaVh63k
zRA7#@+RcvY*qZoZEB!@3U)XG&-;um|Bgd06nMr{T7LCk#TenKui6JsKHsCXDaCY<Q
z+uh^Yf5EhM{g6r$<V*y2lvFfplY$vNaB#(vo{5M>zS@}lF;w9#nd@q)w`4q)w9V?x
z(pvypoIkGaXq$*4W`SNKyq{3AdSo3^XtpddbF3~=l3n!U(Ww^;1!;o>wD1*k_Yo`#
z5_&|k#`zOo7|7hVD-^1UL%naMU$4s7p91uUaKoJ9VPiku?Su2%PmS-Rv8=RmbjJcq
z7oEVlGfhkn`_Ob_gLGyB@bBcQ9ZV{W&<jUsWE3|DZJ^BvxZ^hkVcUkUUMpQrB7YeT
zVxd5G4bb|D<yG-F*Nsj%`S;jKD9;|<sn*kARWy*m{G#kgT+Hd?Lsgd_F4on66O8|=
zjZ91qufYi1uthI3vd@<zhMuJ3?{?Vki5K>+%F;25L9$7mANcKB%IC^e!5f<|2;1qq
z8ghteBaKaZk~@ED05^{ln}<&5ZP!&=TP?x%-`9KWKhZo#*$HEXKMvFfFF0+hoOS=S
zbZj14`xI?{73mN~R#-Jq?Lldt^`2A;pW%KCQ#21?pZ{cHk4>S0wW41_9|t;Nm8AKy
zpw@{2!`(@B>YTj`&Rwr{*@x5y0x3&BpP!A^9$kCCv0c8cSa34@&m+!8F|;R=Vn7yg
zrd*;YtPd4egVkT^g)2Q+v>2Z5RA&jeS4HSJZL>wvhSk@9%0CTz<X&o1*7h?YwJxOh
zcdR>!jkCQ=n~H9?W^-#z>#WifUM>-)kbC~$-;R*vh=_<gWBcvLAyayJ=%&){Me1yt
zO#WNzaP5!Wyo1)U@vOEBM-O|aF*(njp|+kA5P2?HZ_LD>hn@~A6pY}7s9f0X;WyBk
zbI~Q`?jdnpzS0GGwFgHz#hv~ya7PIqL8}CP0|R0eVhfo$oC$!$VIP_|q`h3aIeP+_
zb3xslpgV)~Q~Nyxo)4~4gFynT9C`Q<VH5lHkm=BsAyO#GugN0w_fE-m{l})J<^F_V
z|MNH;Iqq+UsrAVLMOq?~<YiKrk(QPg<mRULqk(%fLM8O#jDY0kcAJTwntYt6tF9mt
zqNbRn$H-~>tcDSs?Pbw5XZB1yUWQgazajnf@fgJg+cQ_xl<{s8Dl+*}9jAPSUSCF5
zwp>wBQEcdQI!4R}vm;HJ2|b?)D|$6Y-^bX}(y}~dYIAr+z+Cb^x%(>b@^Wx`*z$u3
z5eKEE?UegG1NlCph@(r0)3`_BQjH#j#pi#&ADd~fyIf4_RDmH<*pysyuE6=pLMn){
z0W{JPf2Y5UXY+PVN`_>{;LDsweMX8p8iONv^b38Q@e?(zvEK0+ORV6$J8w046sT-)
z=xthUWpvz~(c$fDTC}bVtRS?u46mn8<)>OO=1#@isT4Kx)_waWW}{e*5Pm00EmG*j
z&R-I8v)Jvj5_YZPiDk>H2dD14@-mSVsfXnCd)_g89-VL{CODt>2a^(s!Vfom^FIg$
z5+k>Fc7za0B&-!K<jEp$>eyS5?wRxi?3dvcp}P0B!WqLQLBYYw0^cE*90C<C!fUL?
zx=ofv`%3a=-6UF{^52J55U|ab$*HfEmhIJgeZ;L(?f-6m$PA6FimaT1hZ#y?ojr+a
zQa!we(qKNTa<@0Hp)5*4iv}Q(c3PZ>aNu)*#}_0I8-G}d2~XeV45zjl>6=V=VOEus
zyc>AQsO3;NKz*mf8#-OiP@(cF2Xij;bTwR;^OwOS=fZ@eH1P6uv5$1v9|OXqf41tk
z2LDJ#7iM~a!MZUOPBE({MwR0}RhCfh2c<Fdv<P=2sF?vBeex$R_)vs>P%oAB*^S16
z>9!Y-YMcjT!t@TV&v*@lrg5O8-sM`J=bu}q@n*a@zx%7EtFbA1>lagaqQr($q@fo|
z^xOg!e(}}c>*mdyg`O7BrqQk5WJ<IURnWx|AaWtH8BbGikK<cJr}sd_uv(?+yPc}4
zDhGS}Qb+S_lBx;Tn1|GD>b96aDiLmgk2LktvmJ_YJ=Y>>yTWRBg#+5R1oi6P{H0`n
zHU2l#6irb(^Vltz>F>MZ(>;49Qli|(9;>O&Cb8&U;5tA3?P#Hfvcitr&^<Fa)8;*4
z>=D;GO}<~J5}{J2iI6PCrc>wWmrtINNVQE~tG%@JV%DuqFE%IM)^V};&&Cpee)V%L
zN|@;gP*P!^5X_KNV7L`s0Aafm$Ms!ncw3<RaU#?;yW;W*JVjjKUt{*1f74&qu<~CI
zG#Z@E-&mA%<R`kamjj8fFFL4^2L{TA>9L~LD$8%yrx2?`2KowUaF$LTsxDtMxK`zj
zu<8PMZ*_H*S?XZ!(V>`4du!m%k1r;Bm+n`)#n<*lpoaX=jE;7^@mcD^^tp^v^WKu0
z{e1Zqq+j>sR@RNBp;=?~Bf8V(q0zsc)p^p^9i(I8<_Lu2`T6<31J{b^aVL4W&DEKC
z;<n>qA95i2fZv&Yy2P&?@zNo(@Jm{S0z`|?_``?6Y)6jrFkd+?w$g9cjiqcO&(=or
zs6;xh3eOg|#nMc_zbZ7tenm~Shh4G#y_sm|C?f`ZZJ5NecU#I5eZjbPMRkZ`RWr$f
zSoK*S)g!hL+fOD9P)|^lv;C3tV}gewrZ(mW-`y_pB=bapAU1|t8uS}0VM$fCFLdMm
zZVUGk19G@)4q6K;_#{+ia&&!PUgtw|^b;4FCk2irwBPAa7ir_|!^fGw8r2<I^q5c$
z+s4zpD>jD~ZNidrY@{Z)q|l@FX9*=vQHrAnVcT;_f}fUjN-&;Aio#}zHAw<Nne-Ca
zwzuYl$%fz0pP>x9>v+1oODbskLATk1rNR8y9zl($DmI2M;)Qtm%3D(}hpbHj&ctCr
zBn0YHupDFcslioy#;WdFrFoz0V5|Fv(u`d9Q9LxBu^$}!6Ky7ml~SrV!Ufw41T`=u
z<HK@_+3mu0C<*ko&SjZt{q#4$Ke7X~{G2L574SG+4MS#9{Co22*Vc+)HCM&zmrj_t
zeuic>GTYT|H~G&~!jUuf`Ln^})A?dq=K<6AJ7sm;C@{@&QjrPO$4>V<t3%iGnBtuU
zuB6;!<}(s93#nX-QLTUU3QM}%!iUM*wGM>|r&chrZQPpiCp*E)Z^g3I?1LsM3e-DK
zwS3<;w8!=4FK3K-L$5FKG6w>|uE+6Y23wwt3p29sd%bK4;k)WqE?*X0QSY8uN1Ft=
z_1PQE_jGdZMG@#yW)CTK{=yGZOI7KG+-4TnDWNW5bC~<PC6{wC@7!W|<3F_=CqKN-
zS9uk(@d#U!10XATmi*28a7@_4$uE#Lhw1^V)xeu;hM*h4M7cy95!(M`5gFqU?ltlL
zUiFRDd?ZBS<0*u4$gDaYB<<6pbsl!A7kEP=a4g?KOJX;Es2BD*Uw7(P@PiOKUVlxT
z7}Z{(^|gP$MZ!Ze;Gys(LA6aYxba=MCQb&L!E|R11a#P<b9;rtFX8BD3SEG=tNu2%
zg1Y&^+P*hAzH3a9cJ_j(YB_}_`WxG_?(C=|Aq9K-E6%>0rN<5j(Ql#0HCX^^>v6Re
z(p%YK-Gh3`5j(Sncgv0dsVC|`lW{VHPv}(}Xn5+|^gZ97x{1YFfd6*HtOq7+ELvw*
z+GfMes2Cw_icjI=5K6k(*zz{0HGT*PzJVYq^9M%P5xz`T#I_V!osRJQyCbQ8^3DMv
z?IP?#Er{H2%6eI<+r>m?hK#2v24K0DCZ~)qqFeoGX}r;bK2_1?5&XV#nDE8;97Xvk
zH3sicCNP`~c|<d=1q>>_ooET9+bjE+x64bj-4f%;_;dop=pf}U1je5Wtn9WFY?dPX
z-*cCyAE*0KS~>5@YTsgJ{E1C^p$6va|K0o!<@tFg`O;r`myLIG&-&r@*C2#-VwxAY
z{Ye-wf4Y6zHHD1#ZeDNIJaW1~KWJ1h_AOu3`vB9HW#*Ad9{=-)mW18+_}WY*E|EgJ
z@~0GO3LbS0)MqE$juyh}gi2ui{GhXBDc@5wwij4yd0gM+pV@Nvz(CCRQBb@WEaQQf
z9e6waB{UO)w^DPu-H=F7^i$FC5sXOsGg$1MsNT#EGOX`75a0f7uu5$KP#hM=z9(UQ
zp0mCJPP_P-SMKfvAUnrNDZF;)sNZOqUS_xxerNf^&!VYS7kZ?Y%Y17zcxjs_c%4Jp
zbtzylN*?Pdpb}AJjMpToF(SSe6=gjJG}|N>Sv{L#L>8hGc<9`--0`y4umGnJnpg_<
zqXx6qOvoC4?)j59f<-{#md$oN-Jtii3xJi)m%P#oHd<TN!ezKGTze2pv<mf~KrVin
z?<M;?NgKLMYFzBF0;ZaWc*Sc8sa_l6zsN7D?Um|wOW9*j0fzlX6YPotP3d~W16d<L
z^AdxtWT-(Y>}OfDpqgYLR~A+14S*ks-ay2X?T*gV&RD(|;v0n-MV44Q$YJok0yzGY
zA~JMBTonY5BJ}f-R0v~vs0-ehQ`Yw*c`W#>r#jvK%C{t)T)kaoe_dR=3?}A&uJWag
z5u#y6beU}tVYys9TQ6fouvAFk88I6%iYi=3RPQg8!{<i$fobjOmEF)K{mJfh`r>w1
z#0?}X-b1tJjt3L4$FO8h(uP(vol-+RVFpE<{N49>vMA*ixE5wS_giL2ZkwbzzE-e*
z{_BlBv>ENJ=(mKc3+aGD6d%j#O#GSbb}L7gesULAJQAPy)_Uy$SRBFlXJ597lKBE)
z%IQjWxjMdlpqGdsE$>ZE)xQPY&lk(I4zy2X(SS7wu2N{HQijnbww`fDG{Kj!EOm`K
z-~aNeemFs^Tbd&9laD<Ty;CQvPvQV{%)&Yj=h1G+P|ty|n@|JjmTnVoVzy;GRH*uw
zYHr!ybC3zyf_<&&5Ma^*Mt#mgkSpY5fyLh-RtV544+dCW7iukKpP#U4Ip9&Kf;mf`
zVn~H%GN?VvDV0~FnTQtI1k3+yrtkxK>Z>p?Yfz_?3g;4@mjhO+ocz`<zYM4HaRI}$
zRE&^##q)a$vV-1((JW*Amr6^6$B+K<10~+&TQWkc&ibIw^~Nh+9($Mtdzt{#)kgSI
zCHh1oq20Sb!Z%8{BYxy-(Rn;|2ot_ROvpxmjqcc)&t}ZBQ7YXtn0C_!f<;^>V<mfQ
zhCw>u&p9XC+fw65Z+smbU<9?R%l_q-WBV?l{{ajZ8=#DP&{2Ewm~ELKJ%M14Tfu@<
zt>U*&yXRZt0Dx>Ma2hanHrA)CDvJ-qq9}b$kM)*f#Y0rPqbFrqKB+-1F6Im#4}XGV
zWv(o%G_EPbSNC7aAdc2O;(*UPc|uuOrtS1{G~Sh)9Q02-#+K8`K;<9+IFJd&5R;B}
z0I8BIw8a}2vgeb~NNYq%&FEX-E4<gFQYdTPa*aFy`KiTqHWhY%@BS8}VJh3j^Mh(?
zZDNG2ZMN0U9}a9&K^%@45-Q*f52WR7uMEXJq4U2*z6y95%TmlAi*AQ4Nn@+m_pkPF
zj0*qZ#=4*F^7QO1A{nqg6cph%-3t{U%=X7c7Z0!x9lE)~02+tyZ7x!1v9mpNFPg)W
q8E60yF95*;i~v{_fCHfaJH`=gCXk#*`vnQWf6>;^SFgTn8~#5O#*hjC

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
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
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
zcmV-nE}qeeP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBVK^GQTORCodG
z&jAqt00;vi?O%F5{-6QZ0ssI200000z{f6Q-z%IX*OBy{lI(I}S65HZJZ4^IX5I~0
z4u-|x9|RoJKXS}W0msaIx6C*_*!`xlsw^pWUs~yS-Z@(C*Bj@EZ&H>mSGm70Q>j#q
z1xjrPAS%9tkN*{bQPQWt7BJJk$ARm>fr=n?1JVaRK!vqb7~@(H85sjh`G!=eO#l}$
zGHitP1+!dC-!TG6?|tvt{qjHdV@`>`6?hPMF7OaA2L1&2W8hQ3A&}Dh-%o{e7UY*8
zz69YGwt!_=A+-a6Xc8f)HL!&U0SIWX0sc-9gDYY@d&K|bPZ}lpf)f8i;B_K^+EE!n
ziI3?4oG%q${J<lRtc$7=kFNj&5k%k!*Sz$>4glLlMf61w?}2qobc`aHTJDuL;Bl8+
zi)a^TRS0KJ0Q56ILogHI9wq)Qz#A81SKU6Zin_GL;VKlL-(5Yt^66bfWH+no@AkdF
z@>f@{9zU|Zy<XJyKFD;yCI}r1vGTV73?Lq#U|GmTI|$Lh39t_Y6<>vG7FgpM{;Z0?
z{>amwc6P}B*`Fnt3b+G!Iq-j{wSDPB7l!uUt-9ErR>inRR43t(L<kTGZB@pkVO3rE
z@ZR3Fr<^~3eA{ex9^QW|h~EM>HE)<;kPtfr@guZ54AGY@(HORryh4Rh0S;{fqD&L8
zX9})hK5Gfz1b6^=(|BMX1^LA-v$7af7W}|feSV+PQY(goWqjUI2<h*xT=}E_|LkW^
z9^BkKCwYUAtl_-#dQzLZL{OtZDHi87+F1-lLyX-+-##GElBq$)H+Y^1;jBc1vm*fd
z#a|@N_Rj;)0A799qAD(c{27QQLxm5iXkuzbunt@_ILDyfn9^^*?DpG7ufF^4+pICp
z$5@rHMF=LxL7O4u>q0=2zAOw_6^D_#VM`T;U>9R1z(7gYgz~K90LGjp?;ivA0xz7@
zcCs}V&o|<HZJri@lZK0<bu9LmQG_6K_wPNpv9bHo+it7Q4~MfD0;nXD-`=I7EJ+9h
zI<HTiQ-F9822|A)5DTH-0uuI(t_&<J>2h-lNP@}e_h_GqDB#Y7_y7FQcSW8p;8EZu
zw{BF$6rNv#{3Ki@g#XAQ0L=Zd1rhz__Hg*2SKV>P<IlZtp_rGYE14s_Ux*h0v;+ep
ziUjoM$0x{>dx>(N_tZrJVA4wz4}hse0udDY!&wl4J4-7T;2iLvv$QoIx?-r_FH{AV
z&@bK}io-R_{Z}l}ho8DwTnFO$sxmcn;$(n$z7h{)?-z98Uj-oN0*wlCKehKY4QcY1
zG;wTz6I^R>-vDDA?&Y&kg_JM)tyrpA&5%pL{3o7}dgrX|py2-^{8zvncz80f#jrGm
zGnp_34-xz<;r+)T|70Dd@56Ubr<b3;Se)Ee*Suj24^v{w30=}TzR)Q!Y4|6Q*Z-bb
zBtpJ(olTeyBofGVqf^32zuQ%<ES5?>cLI9y3c$H<jO?HI34(Eo8rT4~6tiA!KB?sn
z+UJ3_uCaHugnOv{d{dpj0wf0aoU_mfP_zO#0V1b^+S*S)G@b4}FdnaOt*WqzTSNdd
zp9`r%Bp`$HxiNxHn51pF-v6L{9p@^b{Jo5+(I+Ahtbif<Mt}$)>U#v4DxPfBLs9G3
zPWq4kI4K!JV5;h0Xi4@i;C|o{ZFe5vfR&Dmz_E@$P_i!q{|bB(_zZ9vxS?Z6!N5rq
zL2_bsS`8mD6|0aFKpY=ESJxLGnayt8I~+E*7~>Zy#mf66L^sPN#j>R693=_sx(Xm;
zU@RM=Hsm;164GPL<ZE>3tn_PcU}1+CEYra?x!zSA0jm*VP>2ATb16AS?gVuvmVsJ+
zErE%8`FY?LEy_HkYx8?s@<$G9Gl#oPrp*v2PO$pA4d-^iNdy>JM(KYWdOr^QIq)Ii
z)4-Qi2&wZVS?V<*hkaS^3kT9(qi^N8utcA~qpq(%G#;<Et@Ti*mnEME*{k&$ADc{w
zkr<>WV>%Hq;jn0{5E2ByqFMu<49IpW0_t)E6@U`$a9%6n1S_Hnuxk~J1BMt^X<6CB
zo_Z-+zVug9dhO=lJJh=$R1bd|a9?3*T8u32r~qhWjCZYpZuVy-x{n~1#bz`tBA{Xw
zA1#i;qZlKke;D`+6~$$ZHY@qcvd;H-?m!}RFACr|8d|$|=V)}aU6yf56iW~gn4y6{
z9=H3ZF<yxm))V*w^QKVZr3;o@3egrJSZ0O*jLjQDg^_!3KWTK(e9B4^2<uuWF=n9C
zfCrXZI11`S6>#dMWXWW|nl0n0F27z1yrU%^f900+S%p^x=@VD9=QSXnZ*)l&g&8Hf
zvz{{o?jZ(JZ>Fa_eii2s#Y=JDOANAkknj;){eovMIi-kX&x*H8GDtcRaDJB+zS??G
zmVV(}oPf}fQhST{o}?X_DTrf(z$mK%pdE>Og?%HWLl8LFN)$ks%`Tj*_sM1NClh0m
z5yCd*Xkc3rq~tUom}z3kunp`S_7HX#AVBg2i3$eobti%+%@m;PZ=)~r81UU7c~UF}
z+0!S$*y2_3z5^kio*<qz#3w}r`s6o#tKx_$Lk@YC)N6zR&rfS2KMG2|;EdS`%tt8k
zZXBG%qJ{t}m#eul9pI=5-i2W_G{%<@gLp8AFH#7ZXl4Sr6k-$-oJ>dz@-%~&HbrBS
zLEBhMl`+wXa6}`ph$Mvr`RK!=IEjEd5$H}M<ATvpFHT09Bn}0=Qu2Y;5(cMLO8#nc
z01K4B7%**k--OpMfML($os!>u_1Gs}iC+UvgauX%#3%ZK-rtF*JCa&ME;8STOXtDQ
z$=-3;nAE<gAe1r07lnt`sb~VS7gtuR!IF6?NoHxxN|G-j#;`OBazFq{5v0cgd=d>}
zjCEoba;hZ#I+w4B41@;-;Xqdc`4AIB1e|o&kc?p`Vi3eA<GPiCsMBh)Z8Yi*{@YSA
zQF^kh0!R^n6W}UHy5}pdCV`OGZ!0<v7p#=@CG2s)(*Wsfvgd=kNO?6Nmb<E)rj9nH
zWY8v{M!S@p@6wHC09P;Oqr9vaHl#8L;?IA1wQ~P-aIilp%bk}l7B?UQD}Q)UXBl1{
z5;z2DL8ycbMGR<9fjKj81dsx<YX<p*1Lv_2@`Y9r0EkYoCTIK!<8%JNOj<(j$QKmq
z;YOW~Br5!8rDT8s-;V;P9RUbf0ax10{LtUi5;#`RCmFBaPe4E13%P4S%!D6Bz$^JI
zY_37f?r2c%*47?X60VK$R{q{11R`c3ika3ij*psVYZ>D<&Zkm}U3&IA`@WP_fiu*u
z07NoA#`(t%4vv22i(fo=)17w?in_k5&AyqP<oJNB%UG9U(F>RxJa@T@@gmyS(B6)i
z=<pUIgn?!&2`~xw3(@+%i3LO)VI>Nn&-BPAT_*NpnvAQuQZnGR_Av#zND#WciPKC1
zlOh1ufKMTu9~FmT(oO}=Xwd2epm+DZf2rgj0EfQye&S*c!Y|J2dS_!W*qc?={<x}6
zki3Z?B>N6l=3o^74v_2J<4rT(T`o7SEthv3HqAXCY4czipu}Wk{+A+<k7<Q*7ay3-
z><1ry_|C1#WL=b{Ye|qO&{aNT?0)o-${1tmy-&>R5~O>4(<a6*H_ZDG!v#i~3)B*c
z<ogiF6vDfj0HMny99lS156{r)pts8?eWtgcAXDoceM__(6@UX6h^M|6&=bH7;0x{2
z?7+XUo&O!_60c3x`t!ereGT{fK9dhIlw>Y1M#E2IlV<0_c)W`px_t=YWLnqD+PNqR
zo6$cmti*N!VstS3>-FH`(b446@$vObCnq~sPEH<JhHyI)!gI2ANca>8=x^?uPXGCZ
z+uOzc8ymCITJOc<%QER6Kv(+hfC#mg{sDPk4<X$uFJgxVRY^<q*_hI85W*s%53u6!
z$_%UK87QKN$y&Kown-q7DXOa5ZcZvZK?3@v<Z*$i2kon{4tS!Jtg<@IWnfeR9H;>P
z6(Rkp#a=ThtXwT~B4}@l0BzU@g!}_v&?<&eS$^umX!Pkjr_-IgX0vOzj>iYvlgY^p
z)w<DO;OnxC@(5>46w+BT?-&Kea<#JSrZKk+hldv-n#IAvjfrzNc8-sCZZyr^Ajk}?
z{rDZ@@u!}*y?ymr=gx)mbzOmwT)Kt0ioqb0q5H?`t<uLWDXUdkSRD8)2%$0{vPtRj
zCdMz3F}NcwLe4>iO~!eSQu@}`n4ne731GV^w7;nYn<0^bne@H^Fvj^vqrgyw5CJ|l
z0i<`lBhjz^D(g#~06W0H0e53Ae{}(U7a`>uK-I1Nb=|)L4u$*%<g=et)xX_2nS27j
z$hmm$Y<3+2INYAimW$D-*%*&~Js2<ujBO&Np)}=;x;O?QF$97&j~^a7tnXKw&YjGw
z>Tod_Tt!s)<X+QAxV~~91oia!+&?&-`WZ+s#ryGWkWZKj1WC!rBFF-u!uz~lUoH*q
ztq8p}?y(@7vggXX6EF`TOxp}3lOsVUpQr&!Eesiedix9_xK0G}%>HIqt<%9Z*nx86
z^)m=ar#S_9O$2v=PXHSL$b|?zXAulFDNMTTJBe8UD^A0*{Lo#K$%h`>+WO+7^ZE6A
zHaCxN-Pl;3n@-pB$s|mM!%!kTJD@Zs|8cU1=Hd<DA%Nx45rKS%BF|bxa1MFH?RC9(
zc{D1nu2u*Cw72)=jjBqw)b(VuEUSsE;hoDKFP>kP8A^uM_`6ari|zj4THPCzA&5X?
z5`tsgg|!Z&VoIef4N1r+iWbC6`AU{^-H%NB+sx`{4BHWzZW4e42HK8#Zg9VzpVAbN
z-v0JPzxHdad)|k=D3BAGWqeVQFdZ~f4APgC2ymP;eGvND+eV|0Ji1tX{uztK)dw~=
z5ARqkmKWypM#vx4HOu@AFHL=wYk1Ct#h5&5_zj4hIu{@S+JXpR-K~RxIhsy+ziEyi
zoJ^L#yR&oo{rBE`VavJsh-jE{u}9|kYz18&U`!{1?lbe!&AD92@m>fl9rM@``DDzc
zh{RCdyR9J0RU#&J5VVhB7y1LzQkQxKY=$f&frx&}{YjUBgt4}_qZ&yC0MKbi06Ds8
zV5!@+U+ncaNcLWVx0)2SB!fWUZkcyuvmX2lGV;$obw0oPD0b)Wn$MT;em@zHJMtwt
zd*TIqb%}moDbayBRTwj3E~Y63gdx9;u}B2jr_^BcCtj$k2sgSu!@G&UW1Llw&g83C
z-t<RJx-Bfo+r-)Pg+NR49AicxZVn;HYN%o%5hUZ9c)vu)CHgQrjWDJLtjMD!-I#WM
zkP*yG-GV`<ghJogSYxaf!vi3q(4FtoT?O161&#sJBPasv!t+Z({Q1I}Zu2J$ocq^1
zMx)O?y0LKu-g$7>bh^9)VSiTFu_aW0jU&WpDE><Fb0sdX1hh}aKr}^(?7E7PAp-VN
zlb3p8UDLBC6L+m?u9qoIOR4I`I08ffebSSL<xXH-;pPc}<heV4FZE0iEs@{|!%i@!
zq8tjmR3<4W$=mJPKE_He#TZQtAs3y5d}EB{H4<5D2<;R=DRpx|;w%Po#&k={Rs`u=
zDS)JnuVFbzz|qYD0QM*qPcK4xP}bZy|I+!v;6o42W)~mX*tl`;XmorF6256!`j&kC
z;{v4NF?(tMz<Iw<g_4DU+hxh+jgkAfz13P%K^^#97LP<<q;9-~dJV_j(Gyq~qKm#b
zq#q!;(j{sH5tPPU2So#r&p4O8h69i`16ec4hFB_<xZj76mjxg@8bho<I3?yp=raJu
zM~xy3D}OlhxNgwye(z?8PX9N7j3{7!?boE~fh4$D0HrZsuB^Rn8Dohh+U5JF(<|`)
zy}O6Q6NKjV6ogeoTxN0wT~=%o4xO8G(w(mf2;ju5V$rQV(tm}(7?W@*K|G}7C?``5
zF?&2XU+?DQ4l+(de_wEYtGk2p@r8zF2eNC4Rj_L!3LxqP<d+uYQ?3(~fRHHO!fUa3
z4ufb`K^yPe?_|&xqUB9=N@=5ymD}|F7?Ah=mI;8<S04ky+uoMkum5`6ys1vmIHJSN
zs=7WxlKzF`<750Bt9<t6CO<ZvhFhI$WJxwMCW8Eg`Bl7CvU~aCniQiv#3Z6V85x;C
z3y5X=geNDUTgvIWF4LxSX#|*Yzv(#5pnmeD?G*dh<RH~rj=&VN2pr`EZ~)SmGT9j-
z5ylMnO?3S(0x&YxdvBsK9Aaz<?$&cL1c?Ijpp<f-&@Up*)15KxeF674W1d{U3KkK-
zh!8>-0R+yN^*!UUlz6Xw?&#?7MO#~oXV2%udxk^1T~%>L)FyGEX($qjhnNTvFkVp3
zld2sy^#qV(uddfAMgsvPST67!%jgs@0=kGUCNUdl3@7~`ywQ6}<4A<3KLw|RgEQgX
z^pK&mPA8I-BTz?_z~b4~%DgX`KG76}4K$%^bjq=;zmrTc=1r_DfGk$k80YYwtZp(%
z+vw-(3w85sI`tgj=EJ}3ZCw8Pugh=&53Tjj+1w;f>F6K#_KwhY_YH^XHs{<_ZV17w
zyq8H+GD+hz@qq5X=LgAn(_aB-n9M)PLSG0$Jf+=_k4@9gr8cGZ5d>>=CozIFYcLwN
zH<ct7vO}OGpDzSt;wXwZV$6{FIY!cuo!L_|tb}OYA%u`BAZcQ}k~v$VRSD7~kxj;+
z8A}YWAoxlu5i#dSEa02#0)R{vF(-ey(5g}3$r1r>7D0jtggbuC`SbkR?d@vGOn<w(
zd-BxDWOdhYSPj}5ixFo{Z9zwhJF;wR86%S<M5_09Nmy@P-c5c?81Fd8dWZ25L|Isp
z=_DtI$>}=VbzUP#IAr?3y|CiZ1&}nPr=Sr4;FN7UCZKJYxtmI?B$S${!KRk@vOI=e
z%8H;X+^B%K_C7dfNf2oj;{>AF;FM%3Sp!u!B^0`5LZ3u{sAV*hddt*PSOt9bN2621
zukY-{m!CT))iCqPgM-z>*oA9fOgs>1lOp*+CP;`f{~IG-BAzG?mT_~ooB2;-DHCQ)
z76C;MDS`a1#@3B2Ngkycm5>)>&`lQ+0tG~k_Q}Sy^M1-x3%A5+awd@eh<<~9`3we3
zUiKwjHcG)r!v7fUTB~?gmyirZ2sHrf%9v%td>LXhO^jQznJz*I%&v<DvYdo%6r+Ar
zI1~Rf=-s#9o>a~B1CKnCU;{{x4C<QvV+)S5EQ%5YZ5x7N#o44yg%HsdXgUwhq-XMp
z62l6K(%E`GtW(jL90l4)A<r>|9+_YvU*?Y_1c{A$xs{7NU#`isyL)xVPS@ti>8e4X
zB-fJo!EOR0w5x94KM$hV!kFM<Tmu`C`Opzv^~^(HZZVE!jF#IC(OUBib0+_5nC_5u
z%b*6N2Urd{;c7{3lcKx<lZ<#Cktm+Uw}q_OUy(5zt%nmJUQ9+V!OAUB^A87T5|}jf
z$8I;Sw^AqsLaJO866Icqvb(29-phR?c?GEm`u`u`CT|q7hrme7w+?O7{il=mokGaF
zj7?L+4sDF1Q3xY%jO;L8S~G7kRt_-}zQRi#St8kEFlh7Hi2&-cEIjAsizGgcptrG+
z)RTh#5F={hv=$NQIRmNZoQ6eE`FWK<qCD$$AjuJP1})uD;guB9&$6sjfaVKDAcE=D
zB0#!|pcM(@JZbp1N<_-G`<xPRO1y0RI1o>0Gum0aI0yN;qPbpMy}v4BEOE!4K{UXp
zY$o&v<`u|~xV4rDAZ=K-#^~SVZ2afYj>HN$BBGgWX^Ky1p(YSuiI%X(5W_y~p|0Bp
zlr3ra=SU>MW9@UHXpD!?VoD><iIljR?Rkn=d46L6-Ap0M5u=;i+t4rPns4N?e7-K^
zi{~fy{@>ZV66Q8~9XTL5QsQLq`~LrbZ12tW5+{*JV5f!dGFK&ke*0CPUuM^=Vo{!q
z6>9*3K%)UUekNw`k;50FcHsGw;oCS1Q_Tq>t8|QD(kA@82EIW$yH>}juMHnC-r-1S
zwcb;ygoe33+wU|NU_V{~hNZwujrfWhIesYYB%o(s)>1woyG8)z?{S{8n8G;I^!AQJ
z7|CWFCts28ha<JEf3mG_N5oO@4G(&IaYkYW@p&y}HJzpIdF~T#?##~zIS1QR_y^(R
zUc83zXTpb<1i(&9DVQt0|GKo6%%4m>=foiEhgnD``=|+Mf|uFcu^~RfAq^GNQt(=L
z;{%l3Z{131p}N0qHF~**pG*0&%|Bmi{lklLw1)gS9%2=|%UpR}oT>BK4Z*bgx0R06
z$?QMR5ueZQe*}xLFb8QV{Lds;w&24YaO{{=@@x=+C#!@@p7m4`OvC-T14lqh(ln0>
z!J7g0K9I(pW<P0PC_9&f7&EL)G}Gu07~*2k!nYN4@RN;kkNhKXkY(~?0&^Efz{oh<
zDyw1XB>6Uf!*d?OM*-zOZR;OgoF}C9YK8DcoVbR7VOE{x*he{1uY12+LDe$*SJ1RT
z6<6VC#k=5V?k0qx5H`Zbo(ZD>`WUqD!UYzd`D0tB&<t~2)=fYSY2R8A`~NXRwH3R6
zt~Q47Wp!|k3V_!LGx2!>tRq^6B!!mpCtzJe@dOXMI+bDU<_ItghCXNZ)O&Ryk!11Z
zUo2*SzQ8ZQ^>wY<J><>j)PNvTFoi8#;7F-@=g`Jjo7uY_@t@uO5Ba1%sU#gScJPb`
zyaQa_@j9abC3zH?EJ3b6MHf_Lfj_-w^5-k!f3}u;4YmP31C)S&zpK>@$tJn#*|Y{l
z*1tguMF6>jBET9Tm!PorIXaBAADU{cRn@XV@@3)mzoG)bG^g<4FdYs-)2WA)Q#;08
z_`Pq!#~tAAtyl%SwlQFJ{)@=kI@}MD=HEsHgdRQT7%UBgC78TBBYq*H;AWOo|570Q
zfy$z7-Y>O&+9s43yY`4<i#>+aY9^x&9yfC>fDq2Pw49@WK}0^_J(<QzL1Wl%qJY5p
z3G!vFl?s3z^JkZSe5JtQJCZ7G3n*aNJ*v+))5DPh*hJ7UW_p5nz}(zw7#u10k6`ga
z>AHIj3Ljw9z)k5q=HWUeV|*5nNS+ac!tX8f{a<S-AD3GHfXCPCrM0$w4w&)$`^ihd
zIwiB_egZSht<rKSK$|+14myJ-e&D`(1l8Kui}#Fmn|}(#Od$?TKIqvr|B0#3g%enn
z?!8V6!)mzaS<0G4Hf2Cd*L#aN6^5Glw~_vR0Ro_kL+*Hs$+_aH=_M<IVfF#z-f!~*
zl^RM6Q+<ce31yS;1sG}PhqQCzF)00PQ;|q9gCaIs<D<@f3g32R0qpM1DE#H(ESdd{
z%AM4YXy)CiJ)10mhLk`K)s-WK)Gop)?GU{8ogAq$#y5n3?vAu=CVvPj)dwqL&h+t&
zxY;(D<L?b--|Xu)Kh#o;?~l)NN6<%{zuftWT_ov~khO1<T|pA+&JwazhzaUuma%$7
zrSh6MfjjFG#$Bm?x)MGJ9T<w0&0^Z|B3)c7f!5oOlpZ9obU9M)Z?>!VEG&<j=kbBW
z&f;cPm|zS!h-%Y9l+qGQIIU*)uWJ2xto1d`ehMG|7Xd4xh_X-^%L!;B2LElqi5(-A
zfN5sj>sM)Jcb5kgl{pb-T6h-<fU}<nAl5HS1lq@dl$rJMwa%PA3idW3RQC{4z3oVm
zT*3R(k%H2heQDeOUu!*$h;w&8wpv#rhpm(27x_Ng{hgGAGtc}lz%7oozO`)PAmJZX
z(ZjT{xP#H@TPV_qInB&<PBRnw#<g6@2Q(fdusVB71{vS4W5@A<K_SW<6HCyK6GCtJ
z0k<5fh~Pa!+Zvrr{0)_V%!iiBfvTHhBn7Ur%pAjWCc;;e_Kvf^u!+MFD?y(XmP~&u
zwk)Y_(V1Yv8c+nRx6{nH9v#<{%p|I^RWl%!Gat|d3}O5PoWLh-e^%g*0i-XxUf}X9
zEDWu};7g)1Qxsr9!D^1_wSE`Y9PsbNtFKZ5IBc*!Jfqcy?mZxunmPED@6(x$#5nLM
z!B7pvD=8R+ugoOEQlzp$HG|N6T_N;LF!6H%K%Uaf%Ob4dK@nutA~;(zf@VJ8J}f{*
zEF4kEw(Tg4m>DuNI!6ATiF+r781#5`&2e3(HeX*91wwQl8<i#41v@B{EESVw;MspC
zvvVg3`V65@C0YlziI?vpg~fee7x(v<BMkKgB({X%DDO#XNd{7)M^hL(C~&2skzrJt
zS-ga+D8xlyU#Ud&4S2)P%LwA&Ijp7&W^$5(HGYPj00%H=_65o~YxCq7hIYNXm587d
z6<2({%RNqxeIo(Hv|Cdc86uWa7;36=cW_E66-_|+h04|eJL4Ma0o5J6N1)SqjauzY
zdnAP&wLS=p*N9|F36N(H=YURV-fi@0lAIhSD?mQr4txMTc&?nGFHsPgBiswlNym<W
zGL#~Ph=G+_PwNo00`Zt5Wf7x5N7SQd+Ay>R2jUWV9d!CM;|6e}UF@veH~KX1w~I#*
zJD~)AI$58yG-@ULKU2(enmLn9y*re^ah+<y-9K=g0pS2(Wo9#kXg|LNpefe#m`R;_
zK&bOao*m^;VHQJS6wcFZx02j@j=<|*aHPc73-RhFWxT4mg&@-+0aDI>0fTgK=dl#i
z-yZbLE3H@G=D+la4<2#cCa8W#5L%%!hTDNl2({F>N;Bga@MIo`r^37LtY#PMWM-!j
zA8=QUAeu5-0jy4jkW8I{dL_q+4+_@-mLxy06v}dP5FZ?=<(4DmFp;TDVeWD1>z7$X
znEixUF>6iC{%}Z~UKYwdC;A6tMW+yV0XN2P2|@RcKN;@-F*f0JHk#T5O7e>M>t*(J
zZl;-G2_X2$G=wwRG!U*9WE!QoS7SE{pnVVM)yW7BU5CIRz*_MjaK-SmkU%nqVuDX+
zN6PU#xA=OUA3_D!b^fvk<`D=x8<c<v8#$y>h*<Ji!ZqVuSdj#Q-+A&IK7*MQu$%}h
zPp3+LV@|W#k|@m#YZWm4v<V($P8rsS-ctCV<%nMI{=IMlT}6>FXFZubBO;R2Ms8ft
z>rwVlg&T|l^og$>spS@54|i4e>nTVT$nO|qWhOF<Kg|R=&neqn@!sP3>->+%d_yW?
zh43Nx?*7g<bQAsn*}PEZ620eV5x7OgSDk^Alfa#i&EW;YPZra6QsnUZRWmcAZ?GFi
zkO-lkyBA9E9f`O>p2(8cpyHtt{R5sa1Q3Lu8R)Uc94YbjqIYF=AbhNYH3*KTQ0%u;
zryc2noJq}6iMZBfO5-N2o8}wl9^3+S3F9C54WErY0+d<I<4Le?hO6cjU|@3hFBHB}
z_-HDz&5zqWB%j8XGAY2GEWqH|5BBb75IAWC8Z&S>Ya{RhMGsfI7WL|#T}O;3_<EL{
zJ-zM~%p-92<oM0C|AKv!+!+!JCY3Cw!cj;l!g_{mE!fOSs3AV*h>&oNsYX5vE&4EI
zqCXH!1|a7O$T@{yn%QAR303kD0!mQ#0tC5EdG~>bh0_;J7h~IrJ*nKTaK=ujtp8hA
zhlwn$l`!*J32r!2AxDbBcQKIly5tv0d?!)!Kvd8qYzdm(yLt4a*i?!hoWdAF{DD;9
zChlPvD%=7Eu|Vt+mZTDJ1gDriUMN^7>RJkR{{43CBXSPtK2jgr&I~GZ?5!>UqtlT=
zo&2W}@ix*_3LEeRuTLik-warQJA`jC)7nSG%CX9kT7tsYT+vQ0chkj-u4aIt{}_}r
zelfJ^y&2L)ch7KhiZG}Q^Z#k?9!6JPfR81})N90r8jkCh1tu0e4yL~6Zv54X9i9CT
z&!DWMvKY*0SdumS5Zm-SSLS~QoIrZ-Hlb{lg8b}RDO6!fb)5*Cx@+Shh6FX?0D*Pp
z>xrICp<{K+OdeXy-diSd?!-JI^*RJSqm|46lpCRIvMP&8!U$FSY+-^KJEC%zf)_9n
zdSbQ>;7yoWlga0xxxbK0sH7*bi%<`-txb(AX1|2sP&``{P=8Rqxj&qBXOT46UG#uT
zA#(KQI2Z76VV^w<dFoWAAcRcMc^1A?_-d_!^zD61*72XRP*V=z5b>gCQAj9ZGm=@9
zKoCKu$>)%x8EgZigjX1Q0x^4Z@o~sLnt6Om??O4jDLk>G$UT@+<QE+1d?M#?Pq^7k
z#}&tJSiyEx93m8sUBxOt(*;SRFe~p9_+!_(|Cn}Eq`=cRV+t3=lpt$v^P?qE^9?h4
zE7P{>IPRBhoy;^J@{MdAW~g<X`~!eZH4(ezSZg(qH#2r;RWLK51cppLidkn72}<Cc
z393J2AHf5ohm~J9cf$KIsRs0MU&Wz#NI>*F%eT*LAB{RUc)IUBcL;X!QT=w6^R|fr
z8&_0lGI!H6HXBBdzm=k$|Dh!@^DV!r>%b6DRY7XeBBwvFPDP>d7|0~p!XAXbSgpq;
zr?E)nJ!AiM+EAHz!u8}6K<EeZ3n2Ja*;5{e*^IjsSb+w`nfnCqiWF*$b3w0)q-fto
z)(QTnMGR8Kpae~{r)&5#A|~I06ACkN^ectG!iO;XBak)mz9ge$2C-I15Duil<PVZ9
zx{$`FL8f3xw$#E#CSU`v>mO1HI)!!SlnK*kS|L<MC0H8;Z>kaGy?2=E6O8+4L7o8!
z`hlFY)hzI!*{-G23Sd{f#cqv=f3IeLJivjM>C~4&+-ATAr<++9U#~HQLhM|S&zJD$
zoPH8B{k#dbmx38xd;^GoDi@E$7u>cvgG^A9!eggF__dx{$B2@)x9TNGCFnDSTPbEt
z3f{<$nv-VEzxj?G!?RCtf@f#`yFEj*=pQ!#Uf|)<3Y_8rNO@DT^5uQx8G7lGA)!$j
zCTlRo_-36RH0Eb2!5frP7qdG)G<_Akk+@;-`XTgQYsU2$v@lm7lQUa4gG^q`rmABW
zh1LpFj+q6mW>rX{K&DB+Ha%Yxswt$A`HseUq;(jSOW9#v0Ih&Rpmd;M)`I5nl}A*I
zz}fj<-`yJo=vfZ6dW2BJg}WZYKVw!XO?Dkw?rJ@tH=kuw#$!#sUj80g6<(|N-k}6|
z9ix==1AZY}2jSD-5Mg9gC|`zZ0-4Ym1XF-hVNqzp%$Nk2=FVeWV_|xmtMQ(8nGyT0
z3($B~YkVC8(3VgCNzh4J%?!8znns=-SV206R?XJn?QFo@YocS;%<5Xop|WVhXktB~
z=7Jp)%p~HG_S31r>_@FQ|Fb2WO2VH4nIZ%-K^YQa7RUsrPEH(zuhMWcVHt8hojY9U
zrFaLKXnLTHDbT4*Faaf8Bz)WJw}-!eL<vTI(M;LKN|x@CIr2fk<)qM%&6pdIvXWgh
z@O}fJ4;~|a=Pba8zuei=Z@{cW_{qP^ETDQ3l9BTS$TSegZ}VHr_&q@;edAYa27xmg
zaMm}Pz$cb~i|i_D9OlBZ_q0^%j7rC_rjn{K#P-7pe8dubdr$&j&495&L={#bn5to`
z^mQgmPGuqLnFocykx~dX|Au*nBY~#q0a1qN)CD^mBP0Y^nkPV}N}Pea|9ep*Xw)|f
zV<3*eMo>-xYrpDe9Rrvy^B<YM4p76Lm<dB-H|8kVELwencW41_D*-;~XsO}e^Qf+t
zT3&<+%$Snpj7s4(%K;$}eEifS)@>G62U|~bU;F_`vZ?32U4u+&#=yi4R#yvnfK06v
zAdDA`0m??x4^SteVx_EWmB5vFQi*$D^b9WpO1aIvI00S8N~dNfO1Ko+c2O7bOXE;V
zVEvvO!QISPOVTfJbSgm6vw)y*VFF^HK!KkXUq{629`S`-y$j3?(k6TY8hsDF=WUQF
zJaQ0ZatR-Gfp9tnGEE5Mft|}B-28?SHmeS^7y`T4l~nXKbs>$Mj$_GbA!hKS(Sfe4
zFGNJOQy<{=I5Nfg-Q6I3Hw+sTeiB0?2;t>}kP=7{f_eUtUBj>|KgSkPuo4)Yy;t$z
zP&vV-r$DA)11Na>-?s^PSs+tZ1Sd?}qyRe01DT=T4FVlB*ATjJ1}D%Y1puQsNDPe`
z=fFDE1;pO!0)B->z=#u-VX@qTkDYmi&mv7bljnIJzty*z@*B?IfUigEMv&>c*}~%>
z6VCi3Y1{yr5@j^j_B%U*gU%an#<ng~t-v-5Rwx0H#(>UXof3yn)CKGW3jP7g@YKEE
z$FP!-#E?LVG`^`xseT{XxcM!j3kVTKq57ORK&IUF5IjMqLn+ADBiwvDflMnalZ@s+
zx*6Kt2SBEt5{$v!JM$TP0!^ZZC*UNEU+LzZ)&)GjveX&?f+{@eYzlp%F<yB_SLjJI
zyMRoQ^?`@q24n)%dtmp_wUndfd#3QSF3>0tAElt%c`&<(9UBuF<WZzC9_j*oL`aDp
zc@yvqW4Cny&p6gnu9W~II`i_yteyoj!5Ww$Tr5{0lM*=Il8@KcQr4Qz>51vw+9N;#
z!!$-20kiC84v2Y_0*^i=mC7^I*<k9`qY%@t>H<P_0o@(6u&?{A3;0QtV6Zo!U4cy1
zOd!))gp&zm%Ibl{7=obFJ-!aJ%T?C_or`yLC&AgC4X*_>Dddb9X><rb>jL6NU4WN}
zZpkh9vah;;pFjx^FN+%fB*=8dv9k$eVwkDU;|Islg6iO;f**)3YWHIMmcX@AY;JGo
z(iL}`kw!q#3Ok*`SDpbBdiEt4<WHD<gLsy@fE|xUC8&7@2Y$wQ6l9u)<y5*iAbdJs
zRb5WeT?C1$fv}RS-%g_tEPbEb+xY{Z(XWw4zLr2oNvkAkxT1~<MKmFiFBag*@en3G
z4KfJ{B+ih6=kE6jWNPFwc8~bbQ}}2xCpwz|CJE;XX`E^Tl<HyB;_2;YNf`SkTM8dE
zvxAxaZ~FwlD1gRFkm>w5$W%y5eGFv6FbWOpD}4FAC(>9*4bH+)3YNnEC8Tl5T|Wsm
z|E6yxn^}EiX7g^FRh&mQr4CFUAHTEF;MM+L8il1^m5HATWEy2c*X%aPWV%Gs<^^dS
z5&wzbXJP0uBC0HlN7$2eHkPkhGKaD#Bw^+=um)IwI`>)Te2D^nkTQ^>{q)FV0=pD+
ztYX=`@h#HN;r{QjEPrAV;5gnw8fWvbb?!pe%LA7YJ0DgH!f!RHb8dvASx-Qy_}QS~
zmtn~Jq^Wl>nUtde(ukiU;@y(%==EI%2k{yoqqDKh3)lkC#?Pd+t*w*;gkLfwRg;Kb
zs5JKcbpbEK*rn?lX<UdjuBB9qK#S6M5IX5>7bSQMX{6x4LbwOB%kQkEU@Z`SCDWPt
zh;e)OKdS|JQGz9f@BI-vo4LbL6VmvJNMj=;Ejk-!GzdD6k~a+sltM4$ISeC(o&~PH
zOu~OrfZyN9a$rEdkI>o3Mf6`l8V^RMvjnd!4@<zE!XKocDHM$tDEKEBF)6{gL1%;c
z_FHr|4x31w5WA_uD21$@?-YK_!hcbKpGygTHJ$CM3wdbQSFB_pQTV!dc~O9$PzeYe
z{VJqUPN8<c1kaFRq6PkbM*FS*^OvD!55E=CD5YUUAWT5{hnqWo2NvLEXuHy++cnY{
zw@c<97y63=>|Yru;GLqS|F6f(`0sY<Kn4H+0AP^6^*z2~NB{v4009sH0T2KI5C8!X
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
zcmV<b4FK|qP)<h;3K|Lk000e1NJLTq008Cy001%w1^@s6NX4gu00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU<kx4{BRCodG
z$uSK800;xH&A(|hz(>-)4FCWD00000000000002MH(gwF1q{1p!6Z43eDRkuH1{ya
zGBYzXGw%lfztsN&95XXB^9?gIcXfd+U0QzO&^kPxt%19RR`-icr6n)^=A~5S+UE5U
zw*V=8KBk(YQk9v5^aGE%F$ben^;IXRSygsAK;ss-G^!ERV$~I@t5hph<9yccq;q3#
z%sHb~byT}m>r@+5`&E{5!?vqN6{)6Gm(N?a>eGYSlNU}eSQ3et;um5JL>NuPjXIBv
zuN6aAf&;qAi-T+0hnP<e^CAZS%i)~;<d9?C2Uugne>YwgZO&C|Twe0!{5&sf&Xv(>
zbk-d|av)E}Cbu8kx9dFs8&$_uxysgIZf|8N&htTc_WRbl|66*+b@3%P-GhazF2=~j
zB+`*_B%@<U$Hozljv`J*ki;?KID!#_I1(76@{ktNjJZHnkKhmnCd1$<LoEJqVm~+B
zFl*iL?{&<=;N{*Q$*)GMqRnZN<<8f#EXN?rkPUjsx?S{VJ5W~8?{(0dIf=u&wqncQ
ze=A3S_fuOiL>TLg4d2R==#!mehkvZGxBBPbeRJ=+f3CdgnKyCK4R>I2Y97)gMj8nc
zSfr98F$PH#DU?8DM59qfC74DCA>q`C31F%lq_o@mS-~eE!RG;Dk&ih%?!3Xq_q(%)
zwsBso2LL+4=QObaq}G=6EYDRIxp5kSfwdS&jy^O-0#O#kCg_~#VdvVv;qTx50uJxp
zxjP&5zX0G@s*_}jYz=qwYE&_m^3rFC>Jrs;s=LIP$F8{TzVy0BU&e|nufxRDG)B@9
zbx?K8Btfc5k`z%KDWrxDDhjGbLl{+20IF!Bk-2J!|Iy_vV3Ci2yNbv;g2{d8UC=ev
z-0*wb-w`?^<y=+EZJE;{b)LgIS2|<?W)TN{^aleBRQ+BLy?zffCyry!`hVl!KlvIq
z{Q1{?XKi6<zgPWRwMBJ+7eIYgM%ngOwt0vu=gYRMda7g2+C3Zp^4kZt{_~Gl-1x++
zxcrWXu=v8uFg8ApRDn!VRZ=MSilW#98X1*FV^oj|OjCnVm=M_0yWjBeeJGqxKCEu|
zVRGIfpmnF;M*zdUfinhRTBxi-n5#5;AoEN?q!i3SU*Xg^+v(uo_D$IM$DiXLKl}=^
zLAF5|`6YmVsy3<ik)gc(KYKfvE}+;_nX0QgqS{>KHqVaq^X%HceEaivZv5R(7v1>e
zE4bjg+p%Ez1sE9_MKY3lNMjFY;sK4L0@6sMffzw-Gy*;s&^_y5o&|6%`-X6&^XIT4
zAKf<9otN{X8{R#K1lUoipDBwUI%UR-o6N(QBddTM6wrAX2faRey)KUI-GLqd{uBQ3
zgRkQFq5X%f&Hn&kH7|K~lbLSdjv-ra7%)RPb5%wSR9%w4kI!eU%?}+txcBN`e)j*b
zUw+Azqt`zCB34~}BPJIvW@}483pnG%x3^J5nL?=GG@6+3!pAU&oDw9a!?wPs2WaT`
z%?)=BoY9>{Ysz{H=$sQkpMvK})^b}YS0E{W!BYS^D1lTJt?S9d2eE7IKd|~|-@x82
z>$}dmf5Ex6G_GAi+u9{N8I`v}$swnxMHJ7O7*&m_##NI%cTTJ3@%*`pXVA;Vn5(Y1
z{Q<c^FNYRia2ckTEXU~h6p}PSoGPHPs(><%6-rSV51LU46}l(<yd1_bsntbV;B9fq
zvms0V%T6dC!uHg;bNtt9g^HsEy3iF7Jhv8MJ#<Npr7UA^tx98-m6ttPA6Z|4><`fG
zoWSt|dvS2bChYj<AF<(2zjV&pb#%uq0g%U3#|h?1RYx^TNc#bx`LMULmQnbUK69_y
zx;${w!_L}$`Zs*l`ak?)>55CQG?(4^2$o-dEv6SOM>;Wq$e%q6K;zOqC8AqO5eX)$
zXevvT0L;KK2{NjE?S5!Xt=8bU2GUC1Q0_TI%PeyCz`An`SRI0)U9x4b4R*VFQbFZf
z|EkWp3OIsRTSqV*^9sx$S_jLRyV51ItUO2Ns{YK3wyArucjIbo`omALXY+b1M)niR
zZK|EB{i>q`@+5hfX#vs>?U;;)ic|?TLiZe}CTb44K($P@!b{`=0WMs5+11hI_dJ1R
zmt2Xl=>-a8;hrNfk%v=b3W-eRnud^pc?BTl2cus}V8drp2P}L~SPr47uVuX%8ewdE
zSIdwOVH?~6NE@)O{Y_k31Bu19cR9y;-2qX-SncHl@JaZLs=y?~nul(gTiCo`K&df9
z*6(RP!0hoO*tcapHvaa9*u80O?ttxZZU=xp)IQab&>;zAhw7?&ssTkPD=^*Af520O
zvjQ|FpkveoHAzjY=Cj3Js=7c#E>#FuU3t%=SaF%U=aQ8eDcmzoVHDEH6mUlT77-;-
z`C18RRDDI4&&AJ;nD>KZ0&qh(Lm*iT-BUu)8{rH_;~BU9uHkQ@<UF*rZiqF*-nh6B
zEI8Jh_ccQq?sE+;=}>oGTL;g+|DD#^BB2x7>OD5soHgfi70R5ld0u`jqA=!JAHBjQ
z5A4RCO{=l~w?8Rh-Q}Fy3}6S{@j&R1)C@IC_2`s?np3)=&X_IFLqOxuJ)0bqajF88
zXHXGySvoqp;DYOJ)sI&$$GEy@JUWIX89_2Su8_ts9#TV)2&Jj!6_CYmRMf*ZwtyR)
zt17s{9E_0xQy7VY=jGsEyP-8E{1U8d02(2rs+Q4usnxRhEc(;7OOp0Y;o4@vEbAVc
z#?})muB$<nquQI>@V(qq%T@j-&jSZ7&xtJ1ElVh^uLtwOB|VH82Hg$@{u?~A=%`B`
z+`dt7TmOQ7w|hj_Z>pUkj|Q!3gF^-`*?i&S&h_oTq2drwst%~Ca?piz&lTQ5jk!eQ
zqVdTo85x`OU+GIHrZ74+4{<t*I7uOK>@SL<BtaCZ66Ok@(Ry6uaZ;^=fB-`WA!Z)7
z#AT7d3AnD-#&R#$)uAQW5o=ABN7!51<kJBrr>vW^{|;;$jLqQH_YfkE5OPiwmY`M#
z+mRt#e?OrC*QshPDEF!?pM$``U(`5-Eaxq%)w#b}9Sl@OUc^DQF4J1p@1lF+82U3O
z{8#FFvnSCxdBOoW<gDF7hulM#JRCUWOjFAm0!h`{*7NjDGpY&DlyJ5Ix<Iv<F1m>I
zF>t?#j6-C!$l;2bi=0Cw0#OK+!9;;nrKxI6fgV%Goj^K1fhZmEpOcEJaNelMje&_`
z73Yyrn9I4C$b)VCnn<H6F6&i$%n`QHVZF+XX$F)Ng4W*Rwz((doH(YdIoA*^s~2ad
z2GUyQP48qoS!+8T9m^ImS6S=9a(-SwmcjAEeM>pZxqqgBsq%gg{mzU!-i!h^tH2df
z@H~iv;+_5<Lj*Y>ImE-Ggu1Ri=mah2EWtZOcRZ*%(gq~eKLwDEI`6mebwKMMt<(V>
zBY@*ncorSwy0iv(Lb1m8hYD&^!mN@6qBW-~pau+_lVT`*VhCd#6W%1PKEg4Hf;}?o
z=LENmA|<fZ*|r2(pK~rAY7}+OVVJ8*ZX?!9fOUV+<{A~s_ko;qE#a)WdN>-|WV%W-
zT$XtWk=00$JP1rG2o)3p=W8Aw9Ucs;Vx5j<{d1n}2v#w-<s2wMa;}7n;CXm@UD!dd
z`e;Jk&9BYqeuUN)10qfUOSm#P6<h&C0a!NxBWDbi2k;E23Ml4X!buQSgpm1c9Y`u`
zJ4c>pFx$_c^&4Djtghf$QUk9JV7+dFITg5e^Pc)zLor7b#Dbti{JW%lpJ>g&R1wZN
zK$w#+DZmmVrsPbb3e57E@h!LqR!T@KxFZj%kH*9R*K@C54^y?@Y@s<=3x}(L={y{)
zS*O1tJUnYz?@Bzcg;162;T=ln1d(8BUeo|OpCizYcK}w(+!ncJc@<H@<O(31t6hvR
z(shD750o`T!qvFeHtwNn^#RqRW*gM|4?Aa|(m)IZ(MG`k|6cJfA}|6E9z&?XYi(iK
z*-3H)>tmZ@<TtJT9Jv|Ha{e6r2KPI11`Uw$10~`ufoBf!vgQXwf`?qS?1y^DUa1Fk
z4vE78<9^x3-@i#s55C2Xe?kU*Qo}n^Qwxk;16)9rdM0x}veyHVPWllDbB2r$Ag7!o
z{|?LoXgXQqJsDk*Kn`T_4TO@R<#_~hbuawF>{g&O@Vu@sKqxhQgEKjL3Y^S|N!Vm<
z;-v1m@1^($x@iDRPJ9+1F9D_lnvk=hbVvb40IL9E4g%27Q=M3<9X$H1eXK*tTE`l=
z&@1&R8t}n0P&=?TZgUuiomDYUfV?J{-a-ANV+Y3}a>yhwM|D|`ddYJr*I*nC$PQwM
zQ()^JY8gALW^|Zkyn|mpLUUgaeI;->SOjPt2*PXYHq`Jda6|IlU2;SB1f()wpp-c~
zYVXWz>l9LX?$h1X9nh=4*kjd0?rZnM=j-;rPqU9x?}wK2cC5W)kJSJ4620%q0qC$h
zH21*f{{C***UbH0wS&A4abK6($2wf}uM5HJKg)NRsD1u^0Q+k{uwK(&h1~1?aJ|5M
z(w|YAKOXF^^!(-L&ad|1KmY&$fML-6sSmPhWdHyG0C4-z5OSU|0K5PI002ovPDHLk
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
zcmV-L61we)P)<h;3K|Lk000e1NJLTq004jh004jp1ONa4X*a1r000V2X+uL$P-t&-
zZ*ypGa3D!TLm+T+Z)Rz1WdHzp+MQE(Sd;e_KHv9c4^~3h@UfR{fdC>StO&>uS)ve<
z0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Zr?q{0@9pjT*ZaKZ
zoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!FmX9dLo0Pq8Ocz$%S
zKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n$QS^yQ?q0W0F(d#
zY<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKSfl@32z`_8atUw|z
z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNTpfJ+E;Hh75g}6uo
z0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH15C~g000{K(ZT*W
zKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm#{sZ)ziX*m0NPdn
zXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|;cwuJe)jx89{$^U
z@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP6^ij#iMUWAO~-k;
zQjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E506>28EsPoqkpK{9
zG%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5!4#~(4xGUqyucR%
zVFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9;1XPc>u?taU>Kgl
z7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZqynizYLQ(?Bl0bB
z6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>XmZEFX8nhlgfVQHi
z(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvGb`=}Io?-6@Bm#?o
z6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1#CT#lv5;6stS0Uu
z9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z>yT~9-sA|ffUF>w
zk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>Lsh-pbs)#zDT1jo7
zc2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8eYv>2*=jns=cMJ`N
z4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^d=-((5|uiYR+WC0
z=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6cT$f~&rx5azF+-<
z`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;xb_M$zb}xHOQ$usA
zW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!dfL9)V(oJ67VYcW
z?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|NA+#=qxBc+@7C|p
zA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~?uTdNHFy_3W~^@<
zVyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIyjyctwYo1}g*}U8Q
zjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7S8PxlSDOr*I-AS3
zsI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{%p4LO);n}Nd~$Sk
z%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;pL)xc<r?m~(zVm|
zqno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_kmoO6c3xRt`@J4d
zvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~e%5}Oeh2)X`#bu}
z{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg6+#RN4Ot&@lW)Km
z@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnWh~P(Th`1kV8JQRP
zeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmhY-8-3xPZ8-xPf?w
z_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C%bs^USv6UZd^m-e
z5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3hINdvaL;7fjPeygd
zGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eTPi8AClMUo~=55Lw
zlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^{_6Q73xXDWy^yd_
zxUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uopRq|?i-13f6gVLp?
zLo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<xaQ(lPG8l0^?7aD
z+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`^^VQ7&C1OKHDNXF
zTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09GkwJUg6YrRE%^={Jc
zg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk9!NTH<(q(S+MDf~
zceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrFqivu)p}p_ujH8_$
zUL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8zO#GQ^T~S@VXG71P
zKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S_si{9Jg#)~P3t?+
z@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZWdXIRo{Jz@#>IeD{
z>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl9~%uCz4Bzvli{bb
zrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&AH2?aJ@Kaet<Kwh
z@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z6w!GXMYp32;bRa{vGf6951U
z69E94oEQKA03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>R<o>I+y?e7jKeZ#YO-C
z2XaY7K~#7F<-uD_ly@G-;qRahf|3Z<YGUNH(wo*Ru*ss;1k)8I#nwVEZRB#@8xL8x
zEqEB$xK&#BZZ%Q2ZP02PtxI}~b^|KgXi=<(TP<Q~mSHT4O9J!RkmlF_3<U(_F!R38
zqp3qK>-ZzJoZ%v^JRr=^4EUKa4`}5gr`gXYUS*!VgGIc>VH$}r79D)UVcueqk`=Qk
z;UKL%uT~CH!Ym~ZW>Cr}gqcWTKB1HuN_6B9qK(PYMu;3GDvCKvKO<?Uf#cLr#RgVV
z$V=pt&r1}tk_}W*!*LpTz)1QzOR*9SYq`X5I{BLSSi=h%C0<|+@9{OA4CfMSl_*$6
zBSVSOObyFP(KwO9a%yNM%1|0vrRhdK=NQU$c95e9LJm8)&QQ+rJ53jY?4gIj9&?l;
zO#+HI%3}uWVGlt~J&O6B!G7d@vNVa9$4-7^uv-*sDiP#w^b_wVwvnbOKpNZliFo~d
zNUEj=1zaUw4<Y7i3Ne=uJ;b|8fhHes&_%p6WNR9b%^Bi#@rEW70YXHHb)Pa#Bg*)J
zSW!X*G&xA+bK;#KL(_~5P7v=jvo-O^q>)%*DwH6opo>_IWNKpZBG-x4LcS6R`Lq!0
zIxlMCu$Vi<sv}(qhICF6>kf-GF<8JIVuc7O0TCcXtUD~w^J5-2aQdiH0;7sPoEv27
z`4HsaIK8~11jjq{;xrP}_z|EEr<Zai0m|vcsUx8AVlPe~l}Zv+(uWh$`0xf%oXtui
zyh{`lrCejjQX)79lw>%76Je>wh9K8)P7zR&A;2k|YXmhGe2CLRx{?s-wBQ`n=uu1`
zCQQDP6#0ZPeH3eSNaYqzg_0PRIJZdEXs{dSgpwTp#M!N9Baf$;`(!A|k->e;Q}XmI
zoW&`V2T+D{RwH8-&gb$7PT{Q5NNB=zvsfNMHcv238XjwLcF9B7jZ>=Oa2eCV9C-+H
z=)hdo(D*&hHhBzNaaL$3oX512CXXSFcFcMG7CH1|s^vjcWBSR}V1zK;%$Em|MK>m-
zc+BJn%u#t1M=)*7R4iV{DUwG~gj1?m9K*E8!)U>LDu-EgVs^;G*pBHUC_@P*N{&2?
zY@(PoGSp)JBafpQQ!B$wOpQE_8qD|l1q*SC<Z&#=S)>7M#B`D(k0XUn%-b5kN0@r~
z0QH!UHGoFUPWb?T!8B?B5lo4EfD%lEfXKy}FCSn&PM%nYX_HUThA9(UFb(nv8ZcYL
zA<QxP1jjIk#21)q`2-(ez7!WQRq_d{Fc(BC=1utoZ(>@-L(B^K1S>G@B7#{apI{j#
zBDygz%O`jR(=D8A`2^YgN;ui_39|W>=*GM(pWqctw}@bt$tPHbiHL`oV)+CsFzw<d
zW`lf!4Vata0;WnnK^5kL_ySWcpWp+`m*NoSn0$g`m_uR<ra?YI17?d@hiQ{f(1s}!
zxj0$!0p{c6Ng{$Nkq=OUc|<@GjhLPC0d`^<HGq#W_3{DgF&}FH8!`VSMIJ{AotU>Z
zfQ2}P@;Hic7U>t<!qmv)sKMNl;qRDcc^u7{S{eR;iIOc3Bbz8@jSNA;nC<c~wqv>o
z%HbHMMIOd?m`@dp*KvyEQ54~nDi$+o!yJ)E@efQJGZl{zrkgBz5Sesi_GvJ3>Bm&d
zgQ&*zldIq2Jf@vAc?@Z^W6o<RtiahSk6|m$N)3(6m=5O1LzqJc=8A?xDb6l=2)l6B
zX?QeYx>+obU<pq!moySq<D8O5a0+L&M#edu_3{AL<9wxOA&;k+dt@ldk->e;Q}Xm|
z?7=y%B*zJykVb=4ZsAlYiBW-bn^cVs#q?o1$ybshpD?D66&gJb;IxpgBt$wbI0rNq
z1o;-{BmpHE0-VJ8mY~Llr9^P{E6MOzoCpOPJIaY-qP(jl!X~1aDCHU-LO6X?DoIdD
zA5KW)MSwb-UdojOD5n>vj)2CGAeV4@sZ@fal3tuE1oeE#q!p)+DkU&B(}&Yark)=Q
zxQi2IF99VW0_-J<bC(607%b*4vFb=uf+3wcV%=r2CJqa^POKL4lt9R%g;+OOsEI`u
zO~eXQp#(t%VPZ9rrHRLEP807q8JcEfaDsSen61e{fPF-Xb&oPlBg(i(tSI{kXfjbw
zgm|aP)-)iS)5Lp3xh5Y4TqRx)yO^sf#9VgKL%gdLXlgKv1N0NGgRP`#3XsNDI*8ZL
z0cL3`QOs=yd&v7_X%aDyKl6~mZd0tON02@IkHH>ughEXM3OPbIgY~k9pr#8;Imb}G
zV>?SUL0H0et}&EzEY);lHBAg9$`xu@PKw5f6qZxN6`~BKiPcIJl+w&_I;m$TCCt|-
zF`p84QcowtX{J<(hS&HP{fwlI298rr6&qMdAqC`<PXUFjWCNS2<~R+sF_M11;x#2I
zatYDKWO+b{TqQbYP|9a?F_F6Xj8bMOc@U(8TJG???odk!K_x2|v5~_x@`$nM;2RFJ
zkwx+j@>tKGsO1b7xk)==o-p7EVcNOLMNYGyO}xrHO_~1#Zj~Jav*Fl400000NkvXX
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
zcmV+!66WoRP)<h;3K|Lk000e1NJLTq004jh004jp1ONa4X*a1r00009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde2XaY7K~#7F<-uD_ly@G-;qRahf|3Z<YGUNH(wo*Ru*ss;1k)8I#nwVE
zZRB#@8xL8xEqEB$xK&#BZZ%Q2ZP02PtxI}~b^|KgXi=<(TP<Q~mSHT4O9J!RkmlF_
z3<U(_F!R38qp3qK>-ZzJoZ%v^JRr=^4EUKa4`}5gr`gXYUS*!VgGIc>VH$}r79D)U
zVcueqk`=Qk;UKL%uT~CH!Ym~ZW>Cr}gqcWTKB1HuN_6B9qK(PYMu;3GDvCKvKO<?U
zf#cLr#RgVV$V=pt&r1}tk_}W*!*LpTz)1QzOR*9SYq`X5I{BLSSi=h%C0<|+@9{OA
z4CfMSl_*$6BSVSOObyFP(KwO9a%yNM%1|0vrRhdK=NQU$c95e9LJm8)&QQ+rJ53jY
z?4gIj9&?l;O#+HI%3}uWVGlt~J&O6B!G7d@vNVa9$4-7^uv-*sDiP#w^b_wVwvnbO
zKpNZliFo~dNUEj=1zaUw4<Y7i3Ne=uJ;b|8fhHes&_%p6WNR9b%^Bi#@rEW70YXHH
zb)Pa#Bg*)JSW!X*G&xA+bK;#KL(_~5P7v=jvo-O^q>)%*DwH6opo>_IWNKpZBG-x4
zLcS6R`Lq!0IxlMCu$Vi<sv}(qhICF6>kf-GF<8JIVuc7O0TCcXtUD~w^J5-2aQdiH
z0;7sPoEv27`4HsaIK8~11jjq{;xrP}_z|EEr<Zai0m|vcsUx8AVlPe~l}Zv+(uWh$
z`0xf%oXtuiyh{`lrCejjQX)79lw>%76Je>wh9K8)P7zR&A;2k|YXmhGe2CLRx{?s-
zwBQ`n=uu1`CQQDP6#0ZPeH3eSNaYqzg_0PRIJZdEXs{dSgpwTp#M!N9Baf$;`(!A|
zk->e;Q}XmIoW&`V2T+D{RwH8-&gb$7PT{Q5NNB=zvsfNMHcv238XjwLcF9B7jZ>=O
za2eCV9C-+H=)hdo(D*&hHhBzNaaL$3oX512CXXSFcFcMG7CH1|s^vjcWBSR}V1zK;
z%$Em|MK>m-c+BJn%u#t1M=)*7R4iV{DUwG~gj1?m9K*E8!)U>LDu-EgVs^;G*pBHU
zC_@P*N{&2?Y@(PoGSp)JBafpQQ!B$wOpQE_8qD|l1q*SC<Z&#=S)>7M#B`D(k0XUn
z%-b5kN0@r~0QH!UHGoFUPWb?T!8B?B5lo4EfD%lEfXKy}FCSn&PM%nYX_HUThA9(U
zFb(nv8ZcYLA<QxP1jjIk#21)q`2-(ez7!WQRq_d{Fc(BC=1utoZ(>@-L(B^K1S>G@
zB7#{apI{j#BDygz%O`jR(=D8A`2^YgN;ui_39|W>=*GM(pWqctw}@bt$tPHbiHL`o
zV)+CsFzw<dW`lf!4Vata0;WnnK^5kL_ySWcpWp+`m*NoSn0$g`m_uR<ra?YI17?d@
zhiQ{f(1s}!xj0$!0p{c6Ng{$Nkq=OUc|<@GjhLPC0d`^<HGq#W_3{DgF&}FH8!`VS
zMIJ{AotU>ZfQ2}P@;Hic7U>t<!qmv)sKMNl;qRDcc^u7{S{eR;iIOc3Bbz8@jSNA;
znC<c~wqv>o%HbHMMIOd?m`@dp*KvyEQ54~nDi$+o!yJ)E@efQJGZl{zrkgBz5Sesi
z_GvJ3>Bm&dgQ&*zldIq2Jf@vAc?@Z^W6o<RtiahSk6|m$N)3(6m=5O1LzqJc=8A?x
zDb6l=2)l6BX?QeYx>+obU<pq!moySq<D8O5a0+L&M#edu_3{AL<9wxOA&;k+dt@ld
zk->e;Q}Xm|?7=y%B*zJykVb=4ZsAlYiBW-bn^cVs#q?o1$ybshpD?D66&gJb;Ixpg
zBt$wbI0rNq1o;-{BmpHE0-VJ8mY~Llr9^P{E6MOzoCpOPJIaY-qP(jl!X~1aDCHU-
zLO6X?DoIdDA5KW)MSwb-UdojOD5n>vj)2CGAeV4@sZ@fal3tuE1oeE#q!p)+DkU&B
z(}&Yark)=QxQi2IF99VW0_-J<bC(607%b*4vFb=uf+3wcV%=r2CJqa^POKL4lt9R%
zg;+OOsEI`uO~eXQp#(t%VPZ9rrHRLEP807q8JcEfaDsSen61e{fPF-Xb&oPlBg(i(
ztSI{kXfjbwgm|aP)-)iS)5Lp3xh5Y4TqRx)yO^sf#9VgKL%gdLXlgKv1N0NGgRP`#
z3XsNDI*8ZL0cL3`QOs=yd&v7_X%aDyKl6~mZd0tON02@IkHH>ughEXM3OPbIgY~k9
zpr#8;Imb}GV>?SUL0H0et}&EzEY);lHBAg9$`xu@PKw5f6qZxN6`~BKiPcIJl+w&_
zI;m$TCCt|-F`p84QcowtX{J<(hS&HP{fwlI298rr6&qMdAqC`<PXUFjWCNS2<~R+s
zF_M11;x#2IatYDKWO+b{TqQbYP|9a?F_F6Xj8bMOc@U(8TJG???odk!K_x2|v5~_x
z@`$nM;2RFJkwx+j@>tKGsO1b7xk)==o-p7EVcNOLMNYGyO}xrHO_~1#Zj~Jav*Fl4
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
zcmV+!66WoRP)<h;3K|Lk000e1NJLTq004jh004jp1ONa4X*a1r00009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde2XaY7K~#7F<-uD_ly@G-;qRahf|3Z<YGUNH(wo*Ru*ss;1k)8I#nwVE
zZRB#@8xL8xEqEB$xK&#BZZ%Q2ZP02PtxI}~b^|KgXi=<(TP<Q~mSHT4O9J!RkmlF_
z3<U(_F!R38qp3qK>-ZzJoZ%v^JRr=^4EUKa4`}5gr`gXYUS*!VgGIc>VH$}r79D)U
zVcueqk`=Qk;UKL%uT~CH!Ym~ZW>Cr}gqcWTKB1HuN_6B9qK(PYMu;3GDvCKvKO<?U
zf#cLr#RgVV$V=pt&r1}tk_}W*!*LpTz)1QzOR*9SYq`X5I{BLSSi=h%C0<|+@9{OA
z4CfMSl_*$6BSVSOObyFP(KwO9a%yNM%1|0vrRhdK=NQU$c95e9LJm8)&QQ+rJ53jY
z?4gIj9&?l;O#+HI%3}uWVGlt~J&O6B!G7d@vNVa9$4-7^uv-*sDiP#w^b_wVwvnbO
zKpNZliFo~dNUEj=1zaUw4<Y7i3Ne=uJ;b|8fhHes&_%p6WNR9b%^Bi#@rEW70YXHH
zb)Pa#Bg*)JSW!X*G&xA+bK;#KL(_~5P7v=jvo-O^q>)%*DwH6opo>_IWNKpZBG-x4
zLcS6R`Lq!0IxlMCu$Vi<sv}(qhICF6>kf-GF<8JIVuc7O0TCcXtUD~w^J5-2aQdiH
z0;7sPoEv27`4HsaIK8~11jjq{;xrP}_z|EEr<Zai0m|vcsUx8AVlPe~l}Zv+(uWh$
z`0xf%oXtuiyh{`lrCejjQX)79lw>%76Je>wh9K8)P7zR&A;2k|YXmhGe2CLRx{?s-
zwBQ`n=uu1`CQQDP6#0ZPeH3eSNaYqzg_0PRIJZdEXs{dSgpwTp#M!N9Baf$;`(!A|
zk->e;Q}XmIoW&`V2T+D{RwH8-&gb$7PT{Q5NNB=zvsfNMHcv238XjwLcF9B7jZ>=O
za2eCV9C-+H=)hdo(D*&hHhBzNaaL$3oX512CXXSFcFcMG7CH1|s^vjcWBSR}V1zK;
z%$Em|MK>m-c+BJn%u#t1M=)*7R4iV{DUwG~gj1?m9K*E8!)U>LDu-EgVs^;G*pBHU
zC_@P*N{&2?Y@(PoGSp)JBafpQQ!B$wOpQE_8qD|l1q*SC<Z&#=S)>7M#B`D(k0XUn
z%-b5kN0@r~0QH!UHGoFUPWb?T!8B?B5lo4EfD%lEfXKy}FCSn&PM%nYX_HUThA9(U
zFb(nv8ZcYLA<QxP1jjIk#21)q`2-(ez7!WQRq_d{Fc(BC=1utoZ(>@-L(B^K1S>G@
zB7#{apI{j#BDygz%O`jR(=D8A`2^YgN;ui_39|W>=*GM(pWqctw}@bt$tPHbiHL`o
zV)+CsFzw<dW`lf!4Vata0;WnnK^5kL_ySWcpWp+`m*NoSn0$g`m_uR<ra?YI17?d@
zhiQ{f(1s}!xj0$!0p{c6Ng{$Nkq=OUc|<@GjhLPC0d`^<HGq#W_3{DgF&}FH8!`VS
zMIJ{AotU>ZfQ2}P@;Hic7U>t<!qmv)sKMNl;qRDcc^u7{S{eR;iIOc3Bbz8@jSNA;
znC<c~wqv>o%HbHMMIOd?m`@dp*KvyEQ54~nDi$+o!yJ)E@efQJGZl{zrkgBz5Sesi
z_GvJ3>Bm&dgQ&*zldIq2Jf@vAc?@Z^W6o<RtiahSk6|m$N)3(6m=5O1LzqJc=8A?x
zDb6l=2)l6BX?QeYx>+obU<pq!moySq<D8O5a0+L&M#edu_3{AL<9wxOA&;k+dt@ld
zk->e;Q}Xm|?7=y%B*zJykVb=4ZsAlYiBW-bn^cVs#q?o1$ybshpD?D66&gJb;Ixpg
zBt$wbI0rNq1o;-{BmpHE0-VJ8mY~Llr9^P{E6MOzoCpOPJIaY-qP(jl!X~1aDCHU-
zLO6X?DoIdDA5KW)MSwb-UdojOD5n>vj)2CGAeV4@sZ@fal3tuE1oeE#q!p)+DkU&B
z(}&Yark)=QxQi2IF99VW0_-J<bC(607%b*4vFb=uf+3wcV%=r2CJqa^POKL4lt9R%
zg;+OOsEI`uO~eXQp#(t%VPZ9rrHRLEP807q8JcEfaDsSen61e{fPF-Xb&oPlBg(i(
ztSI{kXfjbwgm|aP)-)iS)5Lp3xh5Y4TqRx)yO^sf#9VgKL%gdLXlgKv1N0NGgRP`#
z3XsNDI*8ZL0cL3`QOs=yd&v7_X%aDyKl6~mZd0tON02@IkHH>ughEXM3OPbIgY~k9
zpr#8;Imb}GV>?SUL0H0et}&EzEY);lHBAg9$`xu@PKw5f6qZxN6`~BKiPcIJl+w&_
zI;m$TCCt|-F`p84QcowtX{J<(hS&HP{fwlI298rr6&qMdAqC`<PXUFjWCNS2<~R+s
zF_M11;x#2IatYDKWO+b{TqQbYP|9a?F_F6Xj8bMOc@U(8TJG???odk!K_x2|v5~_x
z@`$nM;2RFJkwx+j@>tKGsO1b7xk)==o-p7EVcNOLMNYGyO}xrHO_~1#Zj~Jav*Fl4
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 00941/10326] 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 00942/10326] 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 00943/10326] 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 00944/10326] 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 00945/10326] 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 00946/10326] 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 00947/10326] 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 00948/10326] 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 00949/10326] 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 00950/10326] 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 00951/10326] 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 00952/10326] 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 00953/10326] 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 00954/10326] 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 00955/10326] 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 00956/10326] 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 00957/10326] 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 00958/10326] 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 00959/10326] 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 00960/10326] 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 00961/10326] 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 00962/10326] 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 00963/10326] 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 00964/10326] 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 00965/10326] 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 00966/10326] 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 00967/10326] 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 00968/10326] 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 00969/10326] 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 00970/10326] 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 00971/10326] 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 00972/10326] 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 00973/10326] 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 00974/10326] 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 00975/10326] 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 00976/10326] 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 00977/10326] 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 00978/10326] 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 00979/10326] 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 00980/10326] 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 00981/10326] 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 00982/10326] 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 00983/10326] 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 00984/10326] 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 00985/10326] 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 00986/10326] 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 00987/10326] 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 00988/10326] 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 00989/10326] 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 00990/10326] 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 00991/10326] 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 00992/10326] 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 00993/10326] 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 00994/10326] 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 00995/10326] 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 00996/10326] 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 00997/10326] 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 00998/10326] 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 00999/10326] 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 01000/10326] 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 01001/10326] 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 01002/10326] 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 01003/10326] 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 01004/10326] 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 01005/10326] 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 01006/10326] 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 01007/10326] 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 01008/10326] 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 01009/10326] 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 01010/10326] 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 01011/10326] 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 01012/10326] 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 01013/10326] 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 01014/10326] 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 01015/10326] 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 01016/10326] 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 01017/10326] 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 01018/10326] 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 01019/10326] 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 01020/10326] 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 01021/10326] 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 01022/10326] 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 01023/10326] 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 01024/10326] 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 01025/10326] 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 01026/10326] 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 01027/10326] 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
zcmY*eWmMD;u>I}A(y>T)3JX$73oJ{ADBX>ONQX4+f*?vr3j)%JbV<q54I;`P>0Cji
zVF6*6dcF_u!}~CE=hK`ybLO0T?%X%}Pc$jXSjYeXpw!k<GyI3B{|yqNf4Lv-F#Zpi
z1Jum}jJ#a}f*kyu0c9s|M`tc=PX||LLuUu45Z_T}1pwf<udSwR9K5h+<CbD$=6i7Y
zciy%1ho}X)`MbnkE~{f64?ZDjjW-QR80fD7?zMr^HEJdd*qXj$jQ$STsYXZ3hfB~}
z8>W&PW2}rqz4;|OH1e+3{9W^0qqMu^<zJVTj`QE2S7(<ZT@NBoT2fuw%PZYoO5X>q
z%3r@YpN+uh{krJVJ2wBqOQWYufeIb~UTgk;P{7b62M_RaJhJD@8YAA{-L>)`7isla
zs(0v*fBW|BfthVcS+lutV9xE1bf4W~Vri1Bh63-SVvPe~dZ5~}xzh7&=jY+Wz`eOe
zEH2!;NZ%)Xby9g-_th|yfW{MMIY+1OBPppgy!|N#yn{>txqrat*49-SIQ)jj)bZg5
zc#am|llEG9m!35+3B_yEV8WXPuuq=2-`vPk4Lm3#D=AOv0X>1eLt<j8qQ<t}{@&hF
zx64G%R$|__O+VW7^mL=)WKK?bzl{+(x>YJ@0Q0s~<Io5LuT_#R3$r*@owwknnRz{L
z^K1J2Xjy%sdk-9hZ&B-@xWN5|7nlY2I(ExeujPz&Fs*=I{$9uVN*FaY6_rabF(FWu
z=pl{4NIgtslf=H@{V%~Gje-2Vv%}^YB4j+t+M(2b<Hg%w=%41d0q*X*+X-S_!5)+O
zii1^kT@O9cD0f6}w?Fp!5P7SOiUo<k?e+u-dO)&orbn`p*lhkBAnyZQv2zoqq3ptc
zO?erksv9t`3@fHnd@q%xX5fuahu^+g?g(OR@mgN+YK$s1fTwrU5^=>9I+23%*sEjC
zx<L+W1R6K2+&xypUVhwNTcR-6^wbX?>l!Ow8z#KvN#O;VPMFJjhugu&xzch&JLy^0
ze%doIct^;|@9B8@dmkm<Q{3JdY2b+07u1jM6&@udp$A8PYD7A1AQSTvno#5tjjwy_
z;xZ3kO?^Y9b|)TAvXmvWI?E3&7-_86u*!IO*mVSY#vOzA`3WyXL_}!$+0gb=y@xf{
z?TsXZL4bMn)tUZHZj!av288#V1vl^Lb4gAKFvD(=G$L8a<l;Uj{t_SFZ(3enCdjgj
z4C#f+FSPr+4w;AK8r1#>an15Q`JnMYV;gSRc0IIHU=V)@c-!C9Ke2!#uS-*JA#Dtq
zSVl1L&>{A`hmunUTb;^?3;Q)hT-%0;uc)g1GA0xAZNAa@(Tq7VVf1`4eblLZZ0kMO
z?<91e*AlGTPOy_40o`4tsP~k>8t^8wyf^<^F%`~AI^bYBAlkO_RO2Sork*=M%qC<r
zvqWaer~mZDtW6gBbn4N6Ha0eLB_|B^LEL_F!PM0BijhgfiP#93mD*TO+DV-s+YUAY
zPbQ4~A%uj3xyXr-64lAemoiCL1F)O=(d9Vr&NI{5QXfIuS$WC?*GF0LHdM%hp)IVz
z=XIasVuLHAi_UM*&F**jyLU9sHZ~L|pGM<kGsk-92-dC=y~Od!0O76kh8ypso&SUs
zLF;m$)iL{Fux1XucXek!tZTV3KoEZc`<}?fd-2}j#<wlRW}S9svT($ysls1_NK*rA
zMc;7h2z<SMMzFi`bi+s^Uji%j_H1{yPRVzeJxG^z)0HCk@V;6dZ9}JxpzR5h=@k<;
zz;q4Nc15Lr@$k5ra!fBUsFlO6yDRJhw>9aZiXSHQ&wkg__8qWyM$^Y1qB>m7BEG{S
zE)F^lpD=5zHh9c8a+F+nsqdU#{_XuXTqN1D!mDvC07_#>*bjnDrtWOJDPnu6ZIM^*
zc8jaqU-E-rZ9(DxW^5SWvcA##^!W;3ke7dUdWt?hPDU;*w|d(xetEGQy0EbD?pM$v
z&8l;o{omq?NS{~z8aPri)02e^%!@fK)~wa@AIU2|0bAdaV)c-CEB1?PI)yik1oj6+
zTZ=NxxWrU}l;`Yo4Nr%+<2XWLPp7_kJw5BR-?Y(BOytSN!7x`)ze@?N!zr$pjh`1k
z_He1Cst*78yYEi5g1lY1a)qCGQUj?zjVyKP$)N97UkI#D<dd$rU$0P`<HF7l_GQMr
z7rP=Z<E=$o)1ot5GYqd}>BJ~mUZ%iHt^{Es1fwe3mVA%0ZCk4M+sg~O3P8V>f>vj3
z6vksu%~$w|5b4-3Q{gOMC6|p3{Tqp(m5{BTm(=h%Po^88^n>HRZ+>m=Zj(8Mg%Yk>
zAk?krci5_GgXTMwM17zLGb|H%h(O+MB@;kBHpept8R=VJgTAYcyC!t~Hxg%$L))Kx
zwFz35auV)#?SDmC)!UQR?@T+g49lps`aHx{Vvo~?0Q;cEcZ*xMGWU`H(NxgOep7^_
z)2IvSk91{-5GO=db7IW6`qV=ZK<w3h9T<4ose!A$X!hw8$-W{jyHIvMrnUc*t{<ra
z;;P9gXvz@VTvOG9<KFP(r<WHBo(lJv0p>>cfgB0hmad5rf-x-hQt+>&h=S`q*DwcM
z@m2NMW?avnI_{~yLRhTeu<t+<A6Lueq~*Iqo=(=D?uN54uJ;z`8%adN3{U=jV25pQ
ztnNNGM5w0B|0}Yks%m$-pIT|DBl0@b_j0-3))z;hgX85wrq_Q1XXxqR{<Sh6(<_Gi
zOrLjig*&jkTP5{5C2w;CBwddPZMDl7D$9$m3VdpB259vHlyOysS9JW5vMM+u{Vwv>
zLm17jo>hZV2_PQ5W2-#Z*>K}l8dmfAR^3E@r>qd-VUXTCzy?kjuSCXRzPiUujvQZK
zo^Q2yF1C=R*JVzUDaDyDB}2u@vJ^Z8S6gnJw8&t-N>PnRZZL~JWmdj~+w{IEk{cI#
zk*FjIe-K~_t*h#$*13p+-KJ`C_=<JxHD>DIm|<o@AzN#pSJ3o9tRl=#>7`1wQpuE}
zHje-3OTO=|;ML>&=w_7UiYmxK;{odNqap@zM!?>%nK2Vyd$b=1p*mP>t&{oiq|P{|
z4oKLIqkw%>f+RF&){Pdl+<XSBSXvw!06Nmh?AZ<h(5CAV2ez^g7SrS^=mef10`%~A
zH4fr1NZqoBNTi+JD%L~#o_anT-Gh&gky2wpDu8_$>N8JdI$+mp-W|SDJa$K|*YPY}
z=+yeHqcH`Fg~;l>j`t(BlB3n~T<P!J(<k2Ehh$YF5>ahRsJfDO*lXyxK*E)}MfU(M
zJy?XXd$(tKi%!$$=#m2vCqZ;UoW8#S=`U;bKVNa)(B4?0h-t9t2oxzVY!SO3EUSjA
z&g01n<jvrGhcBZ849D<s19*BMybbvn>P*?&f4&!s2hv0?mYDz(sM5C&$ng=q)C1p|
zh-W@N^^nqfa$1|1KH|&{k)|uM$?rw{Zh}glgEyekfLh<%VvpHMN<P8>x_~>BQIgp6
ztU=(Dmrpf1RcHA#+qqo~>qJmc(0FJhIppl`I?1M4W4Pz_7i?Ceuw6EivwFd#5N3$W
zSMEC;QK0L2#7DV|o+DS8002GF^B>1#t03OVgx&Lq0;3vdKue{4&cS43)U4<VhRq^t
zxFO6?N}Se%3v?hs2$jy?8F<^*+g!F!<r_f)M2OQh!<`!a-%VN_ME4uUq306WOTIAM
zdv<0QF60spdv^DfND~gy@liaXU1i~#sVc`p`IW3kE%#UWur5v%_W>TFprbBE-&-jE
z+ZrWRW$FR~M4~}`UT!iBJMDPwz->>5AqXHH|0$rNkd3ZALPZAOry}sS`nqjj0z3nq
zxW;m*El5RcXRynprD?NfRqtqrwC1eH3lv{G-MYTx!k>A`xO*;aRtrk24+g^OC4k;s
z8X`v^=1L^Jl)4{l7rmP|;1tA_IW?o?lHSGAm?%E$ZPiUY7-D+hP0(XD|LQ8t@EFC7
zrsAaRAFP@cn`!jn1=dJA7zPXa>lyfM)qmZTojt4}6MkyCbY7WwnYq+Wq@v<WG3j?3
zsTI0?FIJ#NpPN`?R1U$0G5wE6!J;{pny=iKEw1cT^~XP!8vBiyr=_djp2grxM(l<R
zyI}R4V-j3f(Ip}rHFgg6DV|ObB}V#leYJim#&%Q$0P3Pdh>-bno9se~*N2cn$|*XJ
zg>2M@yU+EL*fBeyQtTEcLf6daw(AacS_8nZU>_4L;%IIB1ym|c1n@`PTf&f<kE>Pe
z{4Te@F3v#LTnSktnMnFfZwz&Q{NnPq#{I|OX@$O-Z;e;U;d|0kk{2y7_r@=f0uaB-
zg`Q7x{oT4>B&VJo?{k^{0;<G*dDfTQ5{k1l-q2$V8<^?`%A*SVDJsOp6F>i@_sQ8$
zsNvTa1A-;C<Y{j0VmmTILrvQa-5Tk3gWT&QYqFhUuk0L^y0hHOkq`Rt{qSz@RF%fD
zzAYdia;PJfUiJ|)K!riF9QXnUhCqs`i4+KB>r*j!wyW}3h>(yJwnK;3HQ$>h6c<9r
zgxu|X7)-_STPLRTE+tAB>u4dxI;e(==NuVZlvHnhVX}L}{^(fyE)^h~xV1f1CzC)7
zJxq(gVAuO8R%#=n-kbI}4T2CbEQX`(tu0#XbSlB9?T3y?<1@X4t4l6)V!5Hx#A%7`
zYy*OUh@rxs>emU@HKN}U13Cjx;~nmT&(`nEKH?|%e$Wb#=hXJ&-553nOx9f~CeLg7
z^s+B!<Fg7*=*iSYA^STKN8nkbil$MEN??s*jmP=gXl&}U6g?<9wA${Tunum@LXyL9
z=gcMKBaw0unC4U%5NBReF6)Z>Y6w9U+Of!zKgR~hnE-1usrc<vF&YrSIaWY5x?jbO
z>=I&*OVu+}3#6O>Hh!_xO`>Y<2WS;BJ*cf-%}4lt7$mAzq9Am5P(-(B_8vb^t{kcL
zjEj7P&E=b+507ALr+2aXcWK*uz}&v)ORNALu=lW|9Hg&#RZa##)!QFNz65TpM`>p2
zR!cb3JYzyY>mULc347mUw@TS7Mpr=)V(Pxl!Wr*U<zgYR)>m*e8pFw9Vv8$*qMom$
z6=La?8{x?wmYbmj=knP3-a};@u8s_#hcl2J^5{#T@30X7GyIh$W`YIO#|h+U)I@cQ
zSW2ZEbk&>)etjZFtCgviyr*4CN`y5S11YL^b<^edbvmI%L<$HVwfic-NqldZ6c`cq
zsdN)`hXyHdFD8%l$V=b=g_+=$`2qG~t`Z>Jm?nJpSbFBdMrt(jL-TEYxJ~(c4#;p@
zsKlz~;6<Gx%2g2Vb_`l1-w-qpN?~X_7j+WT-_3n@;=d=m8xs>XKNsAL(24<gs9kK0
z34K~9dd%XdxiVk8Qj5XvPb$4lTw_A?jBO45Xek2#i@+qIO4%90+3}luAq1nhFRptl
zqJagz?<PgO&Z$oXFy420nFzTR62Gqfj?H11Aw!v#MtQ~b5%PJ_Dk8G81gE|lp({h)
zarPQK;9mKdMx%=&<bZH5MKAP3FRB?*lUmbYx!Dsw$c){5Afcuul8q~V)Nb6H)?BU=
z>%@|IBc1#O@Q*6s5!pzzKUd+6Y5pP{h-?(j`S|C9wAafSJ4zo<`->(zl*e0)g`g7?
z$(2Q0k06<74#s3^HO@6So?%3twmB5Ar3=X)(_4oTpqSMwYj7nCP=x8%^Jv!<qunNj
zadK#8og7~!3GW`niTvT=n{c+16KLkaJr66A^+HoXeCPZn`G}kKXo_K_4YvYkiRHO>
zR^?{r4*M`TMn^Ri@-3PIi#}TJTcWuJGT#on+jsz4s6Qjyix`MUf~ON{8_VIE1)1M-
z!gzO3Ptp6_$7v?$S~mL$uYy^UNJ8jQ^n8TzPTmtSet=I<*4yr_onEZ*-Ud3Nt2jaw
zjS%9ynFRx#)`~TNGeMyxbj0sC;q`6!{4|jedv=2#JTBT2)RTTDDU0fA8T<{J=A*W+
zdmx==`N|gnA)@*wSw96v#?xiIq3)v<hhBs`!DUO_yP~;Fh=C0uhW6LoH6$7CvHz|j
zpm}W8PH}T+H)0tE@YPTVSg0CQ0e4`Ve(i-jPq`A3F;%T8ihzMn&r6S6FVaUvDU=tK
zmT>i8luL>(CD8dnw?Hnha-G?)rANH-r8Vc;NovT}G$+%1oKK4N2nWKjx1Y}XzgoS;
z>9eqI(r46*Gj~~^e0ZpBPe%>YuP^%Pr5fZOY$JGw-H0ukRa=P^PymZrntuYAAYZ(R
zNES-^P{&}jnYcmuRLOvm&g^!%-LO9&D-`%svbpacR|$#oh&wF7o)P4?o-@xs+nB5{
z*2pg<4`+Iz2xP~&|5{Ws)%O9<#rT!{W38X{l;}GodpkBN7G|AX^_?imwhh=HTBw+Q
z;lkMB6oRKttSXE56LmEKNq&sx8N(eQ{!?U9U)dQ7`WA-CD#ZV4vQsC5&hQ+};Dq-f
z@ic-CQDa%{?q`I4&}KIKUSjv~ZzBZ;+qDC5vIC)<bH0?LSGd2)&46-TB^ke)%cUvr
zc8*Awjw12~{cx-o&%8k1Rw-UO$@yfaSEkfSxW*~`Ii9*AKocW)6deX-Xk_FusSdi%
zS)RW&*bZ(pIRe-5Q1I1=ug#>8?aX-9fvJ7gDo-fEHFubG5yx^u-oAC4Cv$?u9$BoK
zIwMZUR6-w`Pg{*GjhN&M(1o_tTo7*2@M`7lrsc}QySo$+OPp<ttYlN_N%NNZ{(5r^
z2!vYM=8LnLW7MC{4b*WxJ`pcG)Zd23%5d`?3G$8qQE18fdC8S8X-j@frjzf-;4`CB
z5RmSy82^Un<=>$ngi;*OPi=?X&hU7uK3#$W%{W3^!>u7hTLhj%1+0|oZH_Y$l3K~n
zIw;oQ=;Pc_hao9b7R%#>0^PICN_J0qG2Ia+c|!2zU$fgF1$9CJ6A-Knjau3LV|0B^
zHU@tgd8W{Qn?1VTIdbQQ)F~`nv?)fzAQ0@k$Kw<AAKmG$8!%mRrQ=q}iE+-^gz!=P
zamh*?V>orKEWasis-W2n+2DGdKWUX{O-Vg2Q=R|5O1Q`X@KLyQrIQr}bG_n413wXk
z#Tj*-+G&-CziXt=GA8%~pK3iEAb&mkY{TXLwxI0e-X!NGpD{(EC1Wg*8ORwy!~HZm
zC%nY11YlC-7{A<*Ho&<R4MN3IKJ~F)(5s+`qCBtP5M{1UVjzZVAc&B6_zTwX+C9WO
zd9n?)JEDvy_nX6+h`kXwc_9(lhf;gJf3Kh@`~;^e*-2<HsDgY07Vf!Rk*0=g3I=Nq
z?l`@CkD>(2Ek4tsk0L25jCHY<Q+=F042Fofgda)EybB*6>E@LT2Xi>cNF6_4bU}|0
z8mjO|S)smz$h`2=zVaScfz7OP5%<(}4MVn`@Tz@}^fHJ-_$TRV!F+PpAgBHi3cnz%
zMa+UsFR#zpQI$qlRQtOU+%-7_h-O?XY4;w^efX$%oyLnWeKw4&3KYePwIr=XH#Ggw
z7gygTS9wELRA`}Vqwu|+=hdA%vIE#{zOehVX)5rt2jaIX0LtJZ+1T<=8`Ep{;<YO-
zB^8`41bV@ZbR`fJCX{^)j;flHWbZ4LTymu8v;50%{0RC_u#K!UGqEzJiGmC^PFOgJ
znU!KznX9DTwWN+Gx+p}ChUwTi<!kvzOgSdN(e?3#l;Fk(QG8N|U3TnbA3vdGxXLb2
zPbh7kA4K$bVT=ExTY5I+9|0Z6rSxJIdLv-`;<(K@rl{oovS8yuXM&Evo1I+cr4;l$
z^*SgpJ#GTq|BXDa#V_Ezm$+MwF_yODD1&O$^wjnF@9&$>Ei~;XkAw_I(l6eR%6J<`
zP(!RP@H9GC?L+{`GZDR7SZEa(JvRGa2}6(vG-erEJIj1(8Npqu|KDEGYFw>a+Mv;I
zGC~IgQ_))Sc+(M;!q&1Dr=4aQ{Rpjr|C9$nXTtqV43Y#*r|UGcm)3&@8fJT~1&Bzm
zBzC^ZoN}@8|2{t8z&Gm#^>K)^d}RWE;gSIXq<M9(Sw~7_ve*#G+|v!Sz3h}$f<<Og
z*M=jvyAjua*Qq!r6duC0e{9`KJH8l9`K-^Mm(h3ToZ&FgYC5<`#5I|vE;OIp2KMjb
zXl9DE)6;kB9QxpX=h?lqCX|>#1v55@0VswCC`TNs8x!vLvs;rXseKVAcG4Z|N|!t_
zPGu149)o+A_0&37oWX3w9=GzWG+}T{8n$s3l$%YPb?T;n<&Fq%!@&qREQks@HquX*
z$8_*2{F(eg2X}rCe7cu%l+YvE+{2IQsHPdbAKg@mpZ^Gm(;E=K0i$XzK3B?bWMIPd
zgVQtTqyPjpM$wGo_GRTCc>cJQD?f7SbVTvETT?=h{=fT%1>X$xxjt<`_O7q-EV%6y
zSE(jMseEdhet<y!A*@)sOzSx}m?TqlAWbB=_(D`mOc>cLM2;lJQdCFgRhrA@?0$U7
zogos^2iKMen&(p;Nh(>YaUax|0RyF&;>U!ZdQ;Wl)LM$M1vN3cj1nxzOND>SHOuPX
zukvXe+gao;zH$a~+0>3bd2dz9Ot1Z$O$oMG0FISu8Pr;`K5qRhY0mu0-S$qPKj{d_
z!MSFf&5K|{r&uu%^bqQ|kwG<ol%V+r5hR*0Gl(TN1gvQhZc3lcH`59`oQjt`ywtz=
z<#VEXmJu~c45-l%91$uAc9&S&J>Y45@@e#*Il5<Mp@vm$?{AF(8C8a;^bVy{5h+*7
zT#o6_7COwar0|QRLG8XL`akp4bS6l{iR5B8hCf}7Q`Wc&wtXrox<Q@1sLV``|EUDb
z2U%<{TIf!-4ThK3JTIW_BZwDb*X@-WlR8t?Qq?r!$4HYAq7dGAreTTFtBLy;<T}S5
zgYwh(Ucb`kcvGp!!@9L=4kPvaXgu3lUKiZ`TL@eeTtQ|hGd__V-p5cE!CAJ36_kq$
zjvvdFlp--S&D$%q@4%bVmv6EJw=X*-j&)@2SPrCax&%j4<aaZWOUgIE{xUr%qz!(z
zmwQBSK3YlNX597YP0om&=qKWOcS59gnMoD3gQHVb`_i0ZEvDG^wcw{Vw>WV7q^n#8
z_iWdPDCZB#qsHjo0Fu<|=f!vFdT6yQTBsRBg|A(%u4e21_~yj@QepEjk1+`+eRpdH
zAOzGHq&FVsWI%{~Uy@eoY=P87$#_LBTHz^8Sw~CoV4{d*-zb;b-Aj{bR5xS&heE8#
z@37<d!Lg?#6Y1=|j4Z%EF-wZ>+>0=NXtAqf+_C|8Y)>&fU}MlL6f4Xig8Jg}D<}Q$
zdQfNLw?$RnpTcad4nS-zsKPgvKLz;|dif?i?AK>EOufCf@Tw^LP&jB!h0|0V;;axq
zdh6V#zZ|P-n#85O9z?2zpC)&1Dnl|K6tD`2mf6dPb?7vlIzUHLERj5=&v6Uq)bNYP
zp=(jOc9$#R5hBhJr$1EF&h-p^3NR+YH{3CWm~c=}xLhlL)ZB!kcaS~hy1MySQYX@v
zLXo>ujdfG}E;HesyJGrof~N$pyLX}KNJgYTm|M9m3VkE~8k2#Q47Dp{G|VHj+8gaV
zlUQFS0?_o^M|S#dVb@#}FMm1y9{0VQ*3u9b$&xNctiK^%^w;FrKqj8#-YQuAmXLYK
z-*~~P7kNUYC6>=E5D|z<{`|>N*EEE*(@K^d>p$jrKJ}OnwfSv32s|S2jDrn&zwTRA
z(HaNvgc?bL4eaz=6d|K<8+YFQ5=uoDAz$en0hn{n2y{_XH<9aD#Pv=1h12T?82K=y
z#ZW}3*?y~>ZT)on$Ov~gM+JDFycCnu%Z=hCLTys=r;1{!7F?A}TPk#wr!?dmB-J-_
zrPD7y)Lfjq0>FIUsOT+Z`iC8A>M!8q_q$gp+=f)|M^(>{62z2qMCM&f%8yjd*-dN?
zmGn!lT)%-#O)As={Iyx=;^o@Rq%skmCalL%EGpLDGvE7qg%jgdcDg_yR!?a$Y6`fc
zqDyRE8M}q3w7<B-=hd_7H3jSKLPKR0jz1<}uDwAs0ZrYL4CZ(B*1QcXwjSfx@xoBq
zdZ#BMVnobWq4az5#E(`96P8Jid>$hqkSuMzdk-ovX_{SsqPYkX81;OiZtFpUZBciL
z5ShFs83A(DXVNf)*PX1vY)}2~9la1V%huiU=d|v}XQ9D-)bG$5&U`8)WwBw#o7dKB
z7+N)I)LuR~8%^$MLH<I^Jy3p0VGA$AGh|Da+`F>wop`0Fq9H-%>KXsK1%o3Ermz^w
zH#B(!8s>v|VpqcbY7!hq-YfelxKjh-I=y68zHbY>?JP|Wak0m*HUH0g{lD_-&kH1o
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 01028/10326] 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 01029/10326] 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 01030/10326] 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 01031/10326] 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 01032/10326] 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 01033/10326] 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 01034/10326] 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 01035/10326] 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 01036/10326] 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 01037/10326] 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 01038/10326] 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 01039/10326] 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 01040/10326] 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 01041/10326] 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 01042/10326] 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 01043/10326] 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 01044/10326] 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 01045/10326] 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 01046/10326] 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 01047/10326] 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 01048/10326] 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 01049/10326] 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 5a0b93bdb2f2000cc7360319982cf652d0bdbbe1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 20 Feb 2020 17:02:22 +0300
Subject: [PATCH 01050/10326] Add ShowTag method

---
 .../Online/TestSceneBeatmapListingOverlay.cs  |  6 ++++++
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 20 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 7c05d99c59..4aea29faa0 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -24,6 +24,12 @@ namespace osu.Game.Tests.Visual.Online
             Add(overlay = new BeatmapListingOverlay());
         }
 
+        [Test]
+        public void TestShowTag()
+        {
+            AddStep("Show Rem tag", () => overlay.ShowTag("Rem"));
+        }
+
         [Test]
         public void TestShow()
         {
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 213e9a4244..e212d05442 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -158,6 +158,26 @@ namespace osu.Game.Overlays
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
         }
 
+        public void ShowTag(string tag)
+        {
+            var currentQuery = searchSection.Query.Value;
+
+            if (currentQuery != tag)
+            {
+                setDefaultSearchValues();
+                searchSection.Query.Value = tag;
+            }
+
+            Show();
+        }
+
+        private void setDefaultSearchValues()
+        {
+            searchSection.Query.Value = string.Empty;
+            searchSection.Ruleset.Value = new RulesetInfo { Name = @"Any" };
+            searchSection.Category.Value = BeatmapSearchCategory.Leaderboard;
+        }
+
         private ScheduledDelegate queryChangedDebounce;
 
         private void queueUpdateSearch(bool queryTextChanged = false)

From 6b2ae67eafda3bef8a2d720865f1ec2851e4fa86 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 20 Feb 2020 17:40:45 +0300
Subject: [PATCH 01051/10326] Implement Genre filter

---
 .../Online/TestSceneBeatmapListingOverlay.cs  |  7 +++++
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 26 ++++++++++++++++++-
 .../BeatmapListingSearchSection.cs            |  4 +++
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 18 ++++++++++++-
 4 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 4aea29faa0..9dec965818 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using osu.Game.Overlays;
 using NUnit.Framework;
+using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -30,6 +31,12 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Show Rem tag", () => overlay.ShowTag("Rem"));
         }
 
+        [Test]
+        public void TestShowGenre()
+        {
+            AddStep("Show Anime genre", () => overlay.ShowGenre(BeatmapSearchGenre.Anime));
+        }
+
         [Test]
         public void TestShow()
         {
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 930ca8fdf1..797a0a1015 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -16,15 +16,17 @@ namespace osu.Game.Online.API.Requests
         private readonly BeatmapSearchCategory searchCategory;
         private readonly DirectSortCriteria sortCriteria;
         private readonly SortDirection direction;
+        private readonly BeatmapSearchGenre genre;
         private string directionString => direction == SortDirection.Descending ? @"desc" : @"asc";
 
-        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, BeatmapSearchCategory searchCategory = BeatmapSearchCategory.Any, DirectSortCriteria sortCriteria = DirectSortCriteria.Ranked, SortDirection direction = SortDirection.Descending)
+        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, BeatmapSearchCategory searchCategory = BeatmapSearchCategory.Any, DirectSortCriteria sortCriteria = DirectSortCriteria.Ranked, SortDirection direction = SortDirection.Descending, BeatmapSearchGenre genre = BeatmapSearchGenre.Any)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
             this.searchCategory = searchCategory;
             this.sortCriteria = sortCriteria;
             this.direction = direction;
+            this.genre = genre;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -36,6 +38,10 @@ namespace osu.Game.Online.API.Requests
                 req.AddParameter("m", ruleset.ID.Value.ToString());
 
             req.AddParameter("s", searchCategory.ToString().ToLowerInvariant());
+
+            if (genre != BeatmapSearchGenre.Any)
+                req.AddParameter("g", ((int)genre).ToString());
+
             req.AddParameter("sort", $"{sortCriteria.ToString().ToLowerInvariant()}_{directionString}");
 
             return req;
@@ -62,4 +68,22 @@ namespace osu.Game.Online.API.Requests
         [Description("My Maps")]
         Mine,
     }
+
+    public enum BeatmapSearchGenre
+    {
+        Any,
+        Unspecified,
+
+        [Description("Video Game")]
+        Game,
+        Anime,
+        Rock,
+        Pop,
+        Other,
+        Novelty,
+
+        [Description("Hip Hop")]
+        Hiphop = 9,
+        Electronic
+    }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
index f9799d8a6b..1e97720705 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<BeatmapSearchCategory> Category => categoryFilter.Current;
 
+        public Bindable<BeatmapSearchGenre> Genre => genreFilter.Current;
+
         public BeatmapSetInfo BeatmapSet
         {
             set
@@ -43,6 +45,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchTextBox textBox;
         private readonly BeatmapSearchRulesetFilterRow modeFilter;
         private readonly BeatmapSearchFilterRow<BeatmapSearchCategory> categoryFilter;
+        private readonly BeatmapSearchSmallFilterRow<BeatmapSearchGenre> genreFilter;
 
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
@@ -98,6 +101,7 @@ namespace osu.Game.Overlays.BeatmapListing
                                 {
                                     modeFilter = new BeatmapSearchRulesetFilterRow(),
                                     categoryFilter = new BeatmapSearchFilterRow<BeatmapSearchCategory>(@"Categories"),
+                                    genreFilter = new BeatmapSearchSmallFilterRow<BeatmapSearchGenre>(@"Genre"),
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index e212d05442..604af971f3 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -154,6 +154,7 @@ namespace osu.Game.Overlays
 
             searchSection.Ruleset.BindValueChanged(_ => queueUpdateSearch());
             searchSection.Category.BindValueChanged(_ => queueUpdateSearch());
+            searchSection.Genre.BindValueChanged(_ => queueUpdateSearch());
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
         }
@@ -171,11 +172,25 @@ namespace osu.Game.Overlays
             Show();
         }
 
+        public void ShowGenre(BeatmapSearchGenre genre)
+        {
+            var currentGenre = searchSection.Genre.Value;
+
+            if (currentGenre != genre)
+            {
+                setDefaultSearchValues();
+                searchSection.Genre.Value = genre;
+            }
+
+            Show();
+        }
+
         private void setDefaultSearchValues()
         {
             searchSection.Query.Value = string.Empty;
             searchSection.Ruleset.Value = new RulesetInfo { Name = @"Any" };
             searchSection.Category.Value = BeatmapSearchCategory.Leaderboard;
+            searchSection.Genre.Value = BeatmapSearchGenre.Any;
         }
 
         private ScheduledDelegate queryChangedDebounce;
@@ -208,7 +223,8 @@ namespace osu.Game.Overlays
                 searchSection.Ruleset.Value,
                 searchSection.Category.Value,
                 sortControl.Current.Value,
-                sortControl.SortDirection.Value);
+                sortControl.SortDirection.Value,
+                searchSection.Genre.Value);
 
             getSetsRequest.Success += response => Schedule(() => recreatePanels(response));
 

From 063a53017e82a4b883dd088bfb4ca36d72a9a6f5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 20 Feb 2020 17:56:49 +0300
Subject: [PATCH 01052/10326] Implement Language filter

---
 .../Online/TestSceneBeatmapListingOverlay.cs  |  6 +++++
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 23 ++++++++++++++++++-
 .../BeatmapListingSearchSection.cs            |  4 ++++
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 18 ++++++++++++++-
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 9dec965818..4dceb57129 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -37,6 +37,12 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Show Anime genre", () => overlay.ShowGenre(BeatmapSearchGenre.Anime));
         }
 
+        [Test]
+        public void TestShowLanguage()
+        {
+            AddStep("Show Japanese language", () => overlay.ShowLanguage(BeatmapSearchLanguage.Japanese));
+        }
+
         [Test]
         public void TestShow()
         {
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 797a0a1015..c2679fcd5f 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -17,9 +17,10 @@ namespace osu.Game.Online.API.Requests
         private readonly DirectSortCriteria sortCriteria;
         private readonly SortDirection direction;
         private readonly BeatmapSearchGenre genre;
+        private readonly BeatmapSearchLanguage language;
         private string directionString => direction == SortDirection.Descending ? @"desc" : @"asc";
 
-        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, BeatmapSearchCategory searchCategory = BeatmapSearchCategory.Any, DirectSortCriteria sortCriteria = DirectSortCriteria.Ranked, SortDirection direction = SortDirection.Descending, BeatmapSearchGenre genre = BeatmapSearchGenre.Any)
+        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, BeatmapSearchCategory searchCategory = BeatmapSearchCategory.Any, DirectSortCriteria sortCriteria = DirectSortCriteria.Ranked, SortDirection direction = SortDirection.Descending, BeatmapSearchGenre genre = BeatmapSearchGenre.Any, BeatmapSearchLanguage language = BeatmapSearchLanguage.Any)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
@@ -27,6 +28,7 @@ namespace osu.Game.Online.API.Requests
             this.sortCriteria = sortCriteria;
             this.direction = direction;
             this.genre = genre;
+            this.language = language;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -42,6 +44,9 @@ namespace osu.Game.Online.API.Requests
             if (genre != BeatmapSearchGenre.Any)
                 req.AddParameter("g", ((int)genre).ToString());
 
+            if (language != BeatmapSearchLanguage.Any)
+                req.AddParameter("l", ((int)language).ToString());
+
             req.AddParameter("sort", $"{sortCriteria.ToString().ToLowerInvariant()}_{directionString}");
 
             return req;
@@ -86,4 +91,20 @@ namespace osu.Game.Online.API.Requests
         Hiphop = 9,
         Electronic
     }
+
+    public enum BeatmapSearchLanguage
+    {
+        Any,
+        English = 2,
+        Chilnese = 4,
+        French = 7,
+        German,
+        Italian = 11,
+        Japanese = 3,
+        Korean = 6,
+        Spanish = 10,
+        Swedish = 9,
+        Instrumantal = 5,
+        Other = 1
+    }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
index 1e97720705..28619ea6fe 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<BeatmapSearchGenre> Genre => genreFilter.Current;
 
+        public Bindable<BeatmapSearchLanguage> Language => languageFilter.Current;
+
         public BeatmapSetInfo BeatmapSet
         {
             set
@@ -46,6 +48,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchRulesetFilterRow modeFilter;
         private readonly BeatmapSearchFilterRow<BeatmapSearchCategory> categoryFilter;
         private readonly BeatmapSearchSmallFilterRow<BeatmapSearchGenre> genreFilter;
+        private readonly BeatmapSearchSmallFilterRow<BeatmapSearchLanguage> languageFilter;
 
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
@@ -102,6 +105,7 @@ namespace osu.Game.Overlays.BeatmapListing
                                     modeFilter = new BeatmapSearchRulesetFilterRow(),
                                     categoryFilter = new BeatmapSearchFilterRow<BeatmapSearchCategory>(@"Categories"),
                                     genreFilter = new BeatmapSearchSmallFilterRow<BeatmapSearchGenre>(@"Genre"),
+                                    languageFilter = new BeatmapSearchSmallFilterRow<BeatmapSearchLanguage>(@"Language"),
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 604af971f3..414dabd7c1 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -155,6 +155,7 @@ namespace osu.Game.Overlays
             searchSection.Ruleset.BindValueChanged(_ => queueUpdateSearch());
             searchSection.Category.BindValueChanged(_ => queueUpdateSearch());
             searchSection.Genre.BindValueChanged(_ => queueUpdateSearch());
+            searchSection.Language.BindValueChanged(_ => queueUpdateSearch());
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
         }
@@ -185,12 +186,26 @@ namespace osu.Game.Overlays
             Show();
         }
 
+        public void ShowLanguage(BeatmapSearchLanguage language)
+        {
+            var currentLanguage = searchSection.Language.Value;
+
+            if (currentLanguage != language)
+            {
+                setDefaultSearchValues();
+                searchSection.Language.Value = language;
+            }
+
+            Show();
+        }
+
         private void setDefaultSearchValues()
         {
             searchSection.Query.Value = string.Empty;
             searchSection.Ruleset.Value = new RulesetInfo { Name = @"Any" };
             searchSection.Category.Value = BeatmapSearchCategory.Leaderboard;
             searchSection.Genre.Value = BeatmapSearchGenre.Any;
+            searchSection.Language.Value = BeatmapSearchLanguage.Any;
         }
 
         private ScheduledDelegate queryChangedDebounce;
@@ -224,7 +239,8 @@ namespace osu.Game.Overlays
                 searchSection.Category.Value,
                 sortControl.Current.Value,
                 sortControl.SortDirection.Value,
-                searchSection.Genre.Value);
+                searchSection.Genre.Value,
+                searchSection.Language.Value);
 
             getSetsRequest.Success += response => Schedule(() => recreatePanels(response));
 

From eeae0a57746a4ed70199439499561b55f8311f2e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 00:56:33 +0300
Subject: [PATCH 01053/10326] Fix typos

---
 osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index c2679fcd5f..1c1da33d8a 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Online.API.Requests
         Unspecified,
 
         [Description("Video Game")]
-        Game,
+        VideoGame,
         Anime,
         Rock,
         Pop,
@@ -88,7 +88,7 @@ namespace osu.Game.Online.API.Requests
         Novelty,
 
         [Description("Hip Hop")]
-        Hiphop = 9,
+        HipHop = 9,
         Electronic
     }
 
@@ -96,7 +96,7 @@ namespace osu.Game.Online.API.Requests
     {
         Any,
         English = 2,
-        Chilnese = 4,
+        Chinese = 4,
         French = 7,
         German,
         Italian = 11,
@@ -104,7 +104,7 @@ namespace osu.Game.Online.API.Requests
         Korean = 6,
         Spanish = 10,
         Swedish = 9,
-        Instrumantal = 5,
+        Instrumental = 5,
         Other = 1
     }
 }

From d50cca626405266f86e7eae733b2af247cb2243d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 01:05:20 +0300
Subject: [PATCH 01054/10326] Minor enum adjustments for consistency

---
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 1c1da33d8a..e329015f67 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -76,35 +76,35 @@ namespace osu.Game.Online.API.Requests
 
     public enum BeatmapSearchGenre
     {
-        Any,
-        Unspecified,
+        Any = 0,
+        Unspecified = 1,
 
         [Description("Video Game")]
-        VideoGame,
-        Anime,
-        Rock,
-        Pop,
-        Other,
-        Novelty,
+        VideoGame = 2,
+        Anime = 3,
+        Rock = 4,
+        Pop = 5,
+        Other = 6,
+        Novelty = 7,
 
         [Description("Hip Hop")]
         HipHop = 9,
-        Electronic
+        Electronic = 10
     }
 
     public enum BeatmapSearchLanguage
     {
         Any,
-        English = 2,
-        Chinese = 4,
-        French = 7,
+        Other,
+        English,
+        Japanese,
+        Chinese,
+        Instrumental,
+        Korean,
+        French,
         German,
-        Italian = 11,
-        Japanese = 3,
-        Korean = 6,
-        Spanish = 10,
-        Swedish = 9,
-        Instrumental = 5,
-        Other = 1
+        Swedish,
+        Spanish,
+        Italian
     }
 }

From 58903759f13f307df17fd781780952a5d92f102e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 01:37:36 +0300
Subject: [PATCH 01055/10326] Implement enum attributes to set display order

---
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 41 +++++++++++++++++++
 .../BeatmapListing/BeatmapSearchFilterRow.cs  | 27 +++++++++++-
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index e329015f67..58a41b6e08 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.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.ComponentModel;
 using osu.Framework.IO.Network;
 using osu.Game.Overlays;
@@ -92,19 +93,59 @@ namespace osu.Game.Online.API.Requests
         Electronic = 10
     }
 
+    [HasOrderedElements]
     public enum BeatmapSearchLanguage
     {
+        [Order(0)]
         Any,
+
+        [Order(11)]
         Other,
+
+        [Order(1)]
         English,
+
+        [Order(6)]
         Japanese,
+
+        [Order(2)]
         Chinese,
+
+        [Order(10)]
         Instrumental,
+
+        [Order(7)]
         Korean,
+
+        [Order(3)]
         French,
+
+        [Order(4)]
         German,
+
+        [Order(9)]
         Swedish,
+
+        [Order(8)]
         Spanish,
+
+        [Order(5)]
         Italian
     }
+
+    [AttributeUsage(AttributeTargets.Field)]
+    public class OrderAttribute : Attribute
+    {
+        public readonly int Order;
+
+        public OrderAttribute(int order)
+        {
+            Order = order;
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Enum)]
+    public class HasOrderedElementsAttribute : Attribute
+    {
+    }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index 2c046a2bbf..467399dd20 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -2,6 +2,7 @@
 // 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.Bindables;
@@ -13,6 +14,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API.Requests;
 using osuTK;
 using osuTK.Graphics;
 
@@ -79,9 +81,30 @@ namespace osu.Game.Overlays.BeatmapListing
 
                 TabContainer.Spacing = new Vector2(10, 0);
 
-                if (typeof(T).IsEnum)
+                var type = typeof(T);
+
+                if (type.IsEnum)
                 {
-                    foreach (var val in (T[])Enum.GetValues(typeof(T)))
+                    if (Attribute.GetCustomAttribute(type, typeof(HasOrderedElementsAttribute)) != null)
+                    {
+                        var enumValues = Enum.GetValues(type).Cast<T>().ToArray();
+                        var enumNames = Enum.GetNames(type);
+
+                        int[] enumPositions = Array.ConvertAll(enumNames, n =>
+                        {
+                            var orderAttr = (OrderAttribute)type.GetField(n).GetCustomAttributes(typeof(OrderAttribute), false)[0];
+                            return orderAttr.Order;
+                        });
+
+                        Array.Sort(enumPositions, enumValues);
+
+                        foreach (var val in enumValues)
+                            AddItem(val);
+
+                        return;
+                    }
+
+                    foreach (var val in (T[])Enum.GetValues(type))
                         AddItem(val);
                 }
             }

From 20b49bea4b516180bfcddfd40cbc57635c38c84a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 01:49:03 +0300
Subject: [PATCH 01056/10326] Refactor SearchBeatmapSetsRequest

---
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 43 +++++++++++--------
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 16 +++----
 osu.Game/Overlays/DirectOverlay.cs            | 10 ++---
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 58a41b6e08..aef0788b49 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -12,24 +12,31 @@ namespace osu.Game.Online.API.Requests
 {
     public class SearchBeatmapSetsRequest : APIRequest<SearchBeatmapSetsResponse>
     {
+        public BeatmapSearchCategory SearchCategory { get; set; }
+
+        public DirectSortCriteria SortCriteria { get; set; }
+
+        public SortDirection SortDirection { get; set; }
+
+        public BeatmapSearchGenre Genre { get; set; }
+
+        public BeatmapSearchLanguage Language { get; set; }
+
         private readonly string query;
         private readonly RulesetInfo ruleset;
-        private readonly BeatmapSearchCategory searchCategory;
-        private readonly DirectSortCriteria sortCriteria;
-        private readonly SortDirection direction;
-        private readonly BeatmapSearchGenre genre;
-        private readonly BeatmapSearchLanguage language;
-        private string directionString => direction == SortDirection.Descending ? @"desc" : @"asc";
 
-        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, BeatmapSearchCategory searchCategory = BeatmapSearchCategory.Any, DirectSortCriteria sortCriteria = DirectSortCriteria.Ranked, SortDirection direction = SortDirection.Descending, BeatmapSearchGenre genre = BeatmapSearchGenre.Any, BeatmapSearchLanguage language = BeatmapSearchLanguage.Any)
+        private string directionString => SortDirection == SortDirection.Descending ? @"desc" : @"asc";
+
+        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
-            this.searchCategory = searchCategory;
-            this.sortCriteria = sortCriteria;
-            this.direction = direction;
-            this.genre = genre;
-            this.language = language;
+
+            SearchCategory = BeatmapSearchCategory.Any;
+            SortCriteria = DirectSortCriteria.Ranked;
+            SortDirection = SortDirection.Descending;
+            Genre = BeatmapSearchGenre.Any;
+            Language = BeatmapSearchLanguage.Any;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -40,15 +47,15 @@ namespace osu.Game.Online.API.Requests
             if (ruleset.ID.HasValue)
                 req.AddParameter("m", ruleset.ID.Value.ToString());
 
-            req.AddParameter("s", searchCategory.ToString().ToLowerInvariant());
+            req.AddParameter("s", SearchCategory.ToString().ToLowerInvariant());
 
-            if (genre != BeatmapSearchGenre.Any)
-                req.AddParameter("g", ((int)genre).ToString());
+            if (Genre != BeatmapSearchGenre.Any)
+                req.AddParameter("g", ((int)Genre).ToString());
 
-            if (language != BeatmapSearchLanguage.Any)
-                req.AddParameter("l", ((int)language).ToString());
+            if (Language != BeatmapSearchLanguage.Any)
+                req.AddParameter("l", ((int)Language).ToString());
 
-            req.AddParameter("sort", $"{sortCriteria.ToString().ToLowerInvariant()}_{directionString}");
+            req.AddParameter("sort", $"{SortCriteria.ToString().ToLowerInvariant()}_{directionString}");
 
             return req;
         }
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 414dabd7c1..5b7466df0d 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -233,14 +233,14 @@ namespace osu.Game.Overlays
 
             currentContent?.FadeColour(Color4.DimGray, 400, Easing.OutQuint);
 
-            getSetsRequest = new SearchBeatmapSetsRequest(
-                searchSection.Query.Value,
-                searchSection.Ruleset.Value,
-                searchSection.Category.Value,
-                sortControl.Current.Value,
-                sortControl.SortDirection.Value,
-                searchSection.Genre.Value,
-                searchSection.Language.Value);
+            getSetsRequest = new SearchBeatmapSetsRequest(searchSection.Query.Value, searchSection.Ruleset.Value)
+            {
+                SearchCategory = searchSection.Category.Value,
+                SortCriteria = sortControl.Current.Value,
+                SortDirection = sortControl.SortDirection.Value,
+                Genre = searchSection.Genre.Value,
+                Language = searchSection.Language.Value,
+            };
 
             getSetsRequest.Success += response => Schedule(() => recreatePanels(response));
 
diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index a6f8b65a0d..0620e687e5 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -254,11 +254,11 @@ namespace osu.Game.Overlays
 
             previewTrackManager.StopAnyPlaying(this);
 
-            getSetsRequest = new SearchBeatmapSetsRequest(
-                currentQuery.Value,
-                ((FilterControl)Filter).Ruleset.Value,
-                Filter.DisplayStyleControl.Dropdown.Current.Value,
-                Filter.Tabs.Current.Value); //todo: sort direction (?)
+            getSetsRequest = new SearchBeatmapSetsRequest(currentQuery.Value, ((FilterControl)Filter).Ruleset.Value)
+            {
+                SearchCategory = Filter.DisplayStyleControl.Dropdown.Current.Value,
+                SortCriteria = Filter.Tabs.Current.Value
+            };
 
             getSetsRequest.Success += response =>
             {

From 3c56118f45f184f8a0a274db99e346530f0893ad Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 02:28:33 +0300
Subject: [PATCH 01057/10326] Implement BeatmapSearchParameters and refactor
 all the components

---
 .../TestSceneBeatmapListingSearchSection.cs   | 27 +++++++-
 .../BeatmapListingSearchSection.cs            | 35 +++++++----
 .../BeatmapListing/BeatmapSearchParameters.cs | 30 +++++++++
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 63 ++++++-------------
 4 files changed, 96 insertions(+), 59 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchParameters.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
index 1d8db71527..f809c780f1 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
@@ -11,6 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
+using osu.Game.Online.API.Requests;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
@@ -32,6 +33,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuSpriteText query;
             OsuSpriteText ruleset;
             OsuSpriteText category;
+            OsuSpriteText genre;
+            OsuSpriteText language;
 
             Add(section = new BeatmapListingSearchSection
             {
@@ -49,12 +52,19 @@ namespace osu.Game.Tests.Visual.UserInterface
                     query = new OsuSpriteText(),
                     ruleset = new OsuSpriteText(),
                     category = new OsuSpriteText(),
+                    genre = new OsuSpriteText(),
+                    language = new OsuSpriteText(),
                 }
             });
 
-            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);
+            section.SearchParameters.BindValueChanged(parameters =>
+            {
+                query.Text = $"Query: {parameters.NewValue.Query}";
+                ruleset.Text = $"Ruleset: {parameters.NewValue.Ruleset}";
+                category.Text = $"Category: {parameters.NewValue.Category}";
+                genre.Text = $"Genre: {parameters.NewValue.Genre}";
+                language.Text = $"Language: {parameters.NewValue.Language}";
+            }, true);
         }
 
         [Test]
@@ -65,6 +75,17 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Set null beatmap", () => section.BeatmapSet = null);
         }
 
+        [Test]
+        public void TestParametersSet()
+        {
+            AddStep("Set big black tag", () => section.SetTag("big black"));
+            AddAssert("Check query is big black", () => section.SearchParameters.Value.Query == "big black");
+            AddStep("Set anime genre", () => section.SetGenre(BeatmapSearchGenre.Anime));
+            AddAssert("Check genre is anime", () => section.SearchParameters.Value.Genre == BeatmapSearchGenre.Anime);
+            AddStep("Set japanese language", () => section.SetLanguage(BeatmapSearchLanguage.Japanese));
+            AddAssert("Check language is japanese", () => section.SearchParameters.Value.Language == BeatmapSearchLanguage.Japanese);
+        }
+
         private static readonly BeatmapSetInfo beatmap_set = new BeatmapSetInfo
         {
             OnlineInfo = new BeatmapSetOnlineInfo
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
index 28619ea6fe..121b101861 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
@@ -6,7 +6,6 @@ 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;
@@ -19,15 +18,7 @@ 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 Bindable<BeatmapSearchGenre> Genre => genreFilter.Current;
-
-        public Bindable<BeatmapSearchLanguage> Language => languageFilter.Current;
+        public Bindable<BeatmapSearchParameters> SearchParameters = new Bindable<BeatmapSearchParameters>();
 
         public BeatmapSetInfo BeatmapSet
         {
@@ -113,7 +104,13 @@ namespace osu.Game.Overlays.BeatmapListing
                 }
             });
 
-            Category.Value = BeatmapSearchCategory.Leaderboard;
+            categoryFilter.Current.Value = BeatmapSearchCategory.Leaderboard;
+
+            textBox.Current.BindValueChanged(_ => changeSearchParameters());
+            modeFilter.Current.BindValueChanged(_ => changeSearchParameters());
+            categoryFilter.Current.BindValueChanged(_ => changeSearchParameters());
+            genreFilter.Current.BindValueChanged(_ => changeSearchParameters());
+            languageFilter.Current.BindValueChanged(_ => changeSearchParameters(), true);
         }
 
         [BackgroundDependencyLoader]
@@ -122,6 +119,22 @@ namespace osu.Game.Overlays.BeatmapListing
             background.Colour = colourProvider.Dark6;
         }
 
+        public void SetTag(string tag) => textBox.Current.Value = tag;
+
+        public void SetGenre(BeatmapSearchGenre genre) => genreFilter.Current.Value = genre;
+
+        public void SetLanguage(BeatmapSearchLanguage language) => languageFilter.Current.Value = language;
+
+        private void changeSearchParameters()
+        {
+            SearchParameters.Value = new BeatmapSearchParameters(
+                textBox.Current.Value,
+                modeFilter.Current.Value,
+                categoryFilter.Current.Value,
+                genreFilter.Current.Value,
+                languageFilter.Current.Value);
+        }
+
         private class BeatmapSearchTextBox : SearchTextBox
         {
             protected override Color4 SelectionColour => Color4.Gray;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchParameters.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchParameters.cs
new file mode 100644
index 0000000000..6a681503f5
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchParameters.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.Game.Online.API.Requests;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapSearchParameters
+    {
+        public readonly string Query;
+
+        public readonly RulesetInfo Ruleset;
+
+        public readonly BeatmapSearchCategory Category;
+
+        public readonly BeatmapSearchGenre Genre;
+
+        public readonly BeatmapSearchLanguage Language;
+
+        public BeatmapSearchParameters(string query, RulesetInfo ruleset, BeatmapSearchCategory category, BeatmapSearchGenre genre, BeatmapSearchLanguage language)
+        {
+            Query = query;
+            Ruleset = ruleset;
+            Category = category;
+            Genre = genre;
+            Language = language;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 5b7466df0d..2449f561c1 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -144,70 +144,43 @@ namespace osu.Game.Overlays
             var sortCriteria = sortControl.Current;
             var sortDirection = sortControl.SortDirection;
 
-            searchSection.Query.BindValueChanged(query =>
+            searchSection.SearchParameters.BindValueChanged(parameters =>
             {
-                sortCriteria.Value = string.IsNullOrEmpty(query.NewValue) ? DirectSortCriteria.Ranked : DirectSortCriteria.Relevance;
-                sortDirection.Value = SortDirection.Descending;
+                if (parameters.OldValue.Query != parameters.NewValue.Query)
+                {
+                    sortCriteria.Value = string.IsNullOrEmpty(parameters.NewValue.Query) ? DirectSortCriteria.Ranked : DirectSortCriteria.Relevance;
+                    sortDirection.Value = SortDirection.Descending;
 
-                queueUpdateSearch(true);
+                    queueUpdateSearch(true);
+                }
+                else
+                {
+                    queueUpdateSearch();
+                }
             });
 
-            searchSection.Ruleset.BindValueChanged(_ => queueUpdateSearch());
-            searchSection.Category.BindValueChanged(_ => queueUpdateSearch());
-            searchSection.Genre.BindValueChanged(_ => queueUpdateSearch());
-            searchSection.Language.BindValueChanged(_ => queueUpdateSearch());
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
         }
 
         public void ShowTag(string tag)
         {
-            var currentQuery = searchSection.Query.Value;
-
-            if (currentQuery != tag)
-            {
-                setDefaultSearchValues();
-                searchSection.Query.Value = tag;
-            }
-
+            searchSection.SetTag(tag);
             Show();
         }
 
         public void ShowGenre(BeatmapSearchGenre genre)
         {
-            var currentGenre = searchSection.Genre.Value;
-
-            if (currentGenre != genre)
-            {
-                setDefaultSearchValues();
-                searchSection.Genre.Value = genre;
-            }
-
+            searchSection.SetGenre(genre);
             Show();
         }
 
         public void ShowLanguage(BeatmapSearchLanguage language)
         {
-            var currentLanguage = searchSection.Language.Value;
-
-            if (currentLanguage != language)
-            {
-                setDefaultSearchValues();
-                searchSection.Language.Value = language;
-            }
-
+            searchSection.SetLanguage(language);
             Show();
         }
 
-        private void setDefaultSearchValues()
-        {
-            searchSection.Query.Value = string.Empty;
-            searchSection.Ruleset.Value = new RulesetInfo { Name = @"Any" };
-            searchSection.Category.Value = BeatmapSearchCategory.Leaderboard;
-            searchSection.Genre.Value = BeatmapSearchGenre.Any;
-            searchSection.Language.Value = BeatmapSearchLanguage.Any;
-        }
-
         private ScheduledDelegate queryChangedDebounce;
 
         private void queueUpdateSearch(bool queryTextChanged = false)
@@ -233,13 +206,13 @@ namespace osu.Game.Overlays
 
             currentContent?.FadeColour(Color4.DimGray, 400, Easing.OutQuint);
 
-            getSetsRequest = new SearchBeatmapSetsRequest(searchSection.Query.Value, searchSection.Ruleset.Value)
+            getSetsRequest = new SearchBeatmapSetsRequest(searchSection.SearchParameters.Value.Query, searchSection.SearchParameters.Value.Ruleset)
             {
-                SearchCategory = searchSection.Category.Value,
+                SearchCategory = searchSection.SearchParameters.Value.Category,
                 SortCriteria = sortControl.Current.Value,
                 SortDirection = sortControl.SortDirection.Value,
-                Genre = searchSection.Genre.Value,
-                Language = searchSection.Language.Value,
+                Genre = searchSection.SearchParameters.Value.Genre,
+                Language = searchSection.SearchParameters.Value.Language
             };
 
             getSetsRequest.Success += response => Schedule(() => recreatePanels(response));

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 01058/10326] 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 01059/10326] 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 01060/10326] 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 01061/10326] 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 01062/10326] 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 01063/10326] 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 01064/10326] 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 01065/10326] 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 01066/10326] 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 01067/10326] 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 01068/10326] 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 01069/10326] 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 01070/10326] 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 01071/10326] 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 01072/10326] 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 01073/10326] 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 01074/10326] 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 01075/10326] 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 01076/10326] 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 01077/10326] 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 01078/10326] 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 01079/10326] 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 01080/10326] 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 01081/10326] 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 01082/10326] 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 01083/10326] 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 01084/10326] 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 01085/10326] 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 01086/10326] 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 01087/10326] 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 01088/10326] 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 01089/10326] 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 01090/10326] 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 01091/10326] 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 01092/10326] 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 01093/10326] 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 01094/10326] 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 01095/10326] 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 01096/10326] 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 01097/10326] 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 01098/10326] 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 01099/10326] 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 01100/10326] 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 01101/10326] 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 01102/10326] 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 01103/10326] 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 01104/10326] 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 01105/10326] 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 01106/10326] 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 01107/10326] 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 01108/10326] 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 01109/10326] 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 01110/10326] 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 01111/10326] 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 01112/10326] 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 01113/10326] 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 01114/10326] 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 01115/10326] 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 01116/10326] 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 01117/10326] 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 01118/10326] 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 01119/10326] 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 01120/10326] 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 01121/10326] 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 01122/10326] 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 01123/10326] 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 01124/10326] 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 01125/10326] 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 01126/10326] 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 01127/10326] 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 01128/10326] 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 01129/10326] 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 01130/10326] 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 01131/10326] 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 01132/10326] 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 01133/10326] 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 01134/10326] 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 01135/10326] 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 01136/10326] 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 01137/10326] 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 01138/10326] 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 01139/10326] 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 01140/10326] 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 01141/10326] 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 01142/10326] 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 01143/10326] 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 01144/10326] 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 01145/10326] 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 01146/10326] 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 01147/10326] 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 01148/10326] 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 01149/10326] 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 01150/10326] 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 01151/10326] 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 01152/10326] 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 01153/10326] 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 01154/10326] 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 01155/10326] 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 01156/10326] 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 01157/10326] 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 01158/10326] 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 01159/10326] 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 01160/10326] 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 01161/10326] 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 01162/10326] 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 01163/10326] 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 01164/10326] 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 01165/10326] 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 01166/10326] 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 01167/10326] 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 01168/10326] 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 01169/10326] 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 01170/10326] 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 01171/10326] 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 01172/10326] 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 01173/10326] 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 01174/10326] 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 01175/10326] 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 01176/10326] 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 01177/10326] 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 01178/10326] 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 01179/10326] 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 01180/10326] 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 01181/10326] 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 01182/10326] 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 01183/10326] 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 01184/10326] 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 01185/10326] 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 01186/10326] 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 01187/10326] 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 01188/10326] 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 01189/10326] 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 01190/10326] 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 01191/10326] 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 01192/10326] 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 01193/10326] 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 01194/10326] 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 01195/10326] 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 01196/10326] 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 01197/10326] 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 01198/10326] 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 01199/10326] 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 01200/10326] 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 01201/10326] 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 01202/10326] 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 01203/10326] 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 01204/10326] 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 01205/10326] 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 01206/10326] 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 01207/10326] 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 01208/10326] 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 01209/10326] 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 01210/10326] 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 01211/10326] 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 01212/10326] 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 01213/10326] 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 01214/10326] 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 01215/10326] 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 01216/10326] 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 01217/10326] 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 01218/10326] 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 01219/10326] 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
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

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
zcmXtfWmr^g*Y;2X(jncAfCxjkNT-U@rN96J4k=xVG?D^CONw+i3`jFWNOwxZ&<rpP
z-`vl8e82YovyXkPbzZB_74=F_o#ZjYV*mg^qN$<s1^~dtyy5}~9$_BA%mQBl05*W8
z%8R!?S%=x)?aZn-535nG9?2m}1V1%MbT#;}-pXKM?L~T)YW;Zn4!0EhuZl{vSPdJW
zYIG!<5R{gB?<Xf$s1kuHIl*4b7$Sa5zRUd6=Nut>?=k7?<GafY+O1J(U>(r^vwhCO
z0L+1+5y$Y+E%u{!;-#5!if$D27V2uPx+Vbq2vxHFWc^IcG6Vt@vwnQ?>^Tb^N&90t
zd^v+{D5H|N(M0)U=a@=XPq5;YiJy!WRyg1&!0q126EG<|BDJ<Dia(1hh)2ASdN6?s
zI6TWpd@^CY7}7U^=%}b04H<%(L3eh&?`2N9&LSX@1)(oPyR#p19xV}>D~<VG)#Dss
zm*I>6MsP;3&av)gw2g|f3_|tCZ#$xc()6((ihU7qxnJ8)rSC%;LMfoHtnol&?_}$8
ziNuSsfFY8h-s1uC_;Pr1R-*|AA2dBH1aO@4<#ic7I>(9&cGgCAP0)f1vln81x3^@<
z{<G7e-zMtv8YA|GJuirTo*dcaDjmo-)F&3(Kd&bB%dHBjth(zkUrg)3N8$UBAbC%M
zN;xZX?Z(APakf<t=5pr`q=+h}1$L#;l&v$8+N_RpUqdP;5EcDgYtf?*YJW>qaRK%K
zUUk&HjCEDgz?qk|q_vIplQnJWhC2#ZNmoTm=YSN0wz$F!f!y~FFXvW{5X?}T-SG(n
zI?`BN2|(&D>bjl36TAyWVlS}C5yvWL?&tL1LgPa!kQ*`H*wrL)ieZ(}L6eO6X&@Jz
zlyFk6ao@)s#_H@pjS9YDA7I4;0y*|&#?QB<taTt?hZF5W<wJBs!OwR<astT{JSPfk
zk1{-xQ&K-xCe?}g&4QzGx$iwbUQ?~<t>uh9NW_r)NL33^u2gAVoO2L@al8S+ILE{G
z4kYg#{jP3><3|}5^DakQ)3P7QJz64IiYA?i1BtJ-K~o*{7c5+Vgppq8wc|9?%dci6
zR)l0vSbFXeuSyms1cddkCTsun=oxjeV!jOWBR+EEaKyucet;V13s>SeX08bN5EEhH
z<J_I85^BHJ!TW@TCO~zBq0b64%C?yBvuJ<a$ye(~+3<g<80T@Mx{!r4z8nj08&|un
z!M^27o(>_J2>6C%TnI~nr#c8VVbKWwiic<jd<LG#T7P(P@56+J65R$Ggw%zePlQ*_
z@5PhW;sdNW@7{Cs*Ns2gGhNfKPi<_&{OjW7SXjqIxQsAXaO4m)H*^*7VB~7W-l#ej
zsXO@j)fpX*Ik9=1U{OZ)N;P`*k)G0Ud3!D%a3b`^UW4MTge=y;8(4!pj=745+~gzd
z2!J|A*`yrg@e;22x13GYIu4l=M2O(4B)P9MY<XfIF)H95WCBL-4VM4nOV0Q)9#_YD
zqbW9dCRiKN-0<R_w<x3RB8wpF$*(q?xz662t-e>DtcPl7vPCIN>`MGfTm`-sgdbfb
zX)^xv68iVvmUx|}$jIIgyG1RswF`X7kinjv$HVvXRbiH?%et)vK95{N9t?IPYk>sv
z@$ssa5^>gYl<t;aae3id;zmRCxB;wEkL5WTx^1BPiQLxo<=;ug7=Mh<;;#7=PC2Og
z{kg4*$L)5ao(eJ|Hc4gHmQJ-}WLJGjKYPVNnYU!3Z1tLn6cy&4v!{<`pVZ}ad%Fwm
zlCRa$9`VCXv4KAWoYX($!O<*u7qVooPm?Y{B6pclI&J8$mRlY_N&Y<@9N>xBLgKAG
z&lr<z&nP>*;KG7F_mpoV4~`Vd7)vBylVd1Q)%)WIWlc~tWn$K7c31t$`PY=?YfgnP
zM1J;<wgd1=c6g$>3eP-T4C<!yh_tXp;=sj0#~#aS^yJ==&+-o=Y-XjN9XQ85_*p+z
zopFf~7|^8gyG2V+u`pIT?&8>tl`V8Wc>J#OO7=J&<(j63K6hNeYZ+qxM#`W%{$1iy
zkt;iVG2!NRhp&Hv?Qa*YI=cY0=}k}-A4WM%obOTWwvyk*KGKWgwV>~xZeDNFg^;50
z6M|xy2TdK1V*^)1NH-tg$oqQ1nDXBegC`aR3Newv1?K})^j)i@&fl*d%&=o-L}(n|
zV?k9laGvz(Y{i_rj|LuxevubS+K?6gNf<;8Icr}FXjD97H6w#0x_l7}(cD#1jxPuy
zGl;F?``z+8K8FoJhmFE^RG!QL1ciUuh*f_Ptnfl%E$}sY%S}RxAKzbC@g*=f+OoLh
z=U3A@H)2=PQ^uDsKarLs-xno?eVcg1K4OX{^I>v1>Cf9a+kvf!34SA0amv4B%J~`J
zgs~WX{;sqi72~(%l;_efL0P;{6!Lv$)UQ$d{GC7+A95eSvXyXOK#-IuV}*S3r1Ps|
z6~qN7^5-k~J9mi}+k1Z~gV4Z2!ZudIjR9`dO7&=GqiV)57j_E$?zOkX&0~TzRps=;
zjK7khi;0;t+PisX1&Rw*pQ2&IvuyM1hk<MUVhRdMVB?3r3BRi3lk<m{HIXbYB08h^
zG|U-Wy=h+Jk5?5q(I-?d%Z|%R>5pvNO$4@l=o!;jnRybQ*D=qy>qo1EKr~FW1rQ}E
zPOcoHPy$iv*>PT>U3vF9Om*YFTUc9$qAVsR&qBhQ1q!ZvH9VI!@o<=-Ee`RyVR#ck
zHUgdqUilp^c0K?UmeC;i0c0QuWA!)&S3{N$FJ`lwV28v&vzpPMMYyv)ux$Va;yLvH
z0&z(>zcliA=e!379i-29gRX3VveU3*kN*2$(3LpQERV3C<!MC5JnyKur+qPG84Mc8
zn9tz9+qX9zn1mk^0uMAM5N4o8i*Ap^E7M9XsjJtZMz!uuM_?T%{BSbNMiiL&9`vw_
zTKPzS%VY~$%$!#RU44!Yf?u@J=bSV7czD!9boHKBGRi2f{<_<@oowY=HvqORocT(8
zvIBJi9|D(ukm)$B{__33{nU5Q9z>fyUyf^&ZRaP6aP~8rUA(rQJpb1h=5d(<sYsag
z0y~2cyzSevFz54>BQo*282I5iZXiqy{;~nBa9RE!3X*vCf|VI`WxOMPr9FYhF24V}
z8#XIC40{A>Pd&D?0A{9Fud3^g{SrF@+kqraYUOY2=@;}38tZMxX0CPoPl^oc<)>gl
zwxBT{hpzr6s`|FTopxKhted-Jua|+e4FtX^F<C?zj-Ws8hfX*^|AD<Kfw7GFXNE8}
zun4fN7go$oH$XfIH@<3p>+z#q&;`VsF`o>QkYCU8D)|Fbkf@V|A4&nuy0B&^Is_d-
zWJS&46U8@HTmvG4_Mn|~(re9@3D`EjwZh+&(BiKiObEz)4tK1*V{$b=e}Qght=udn
z@U9qQ;WR|1W&l4-z}_kHH<?K4K!O|2z5%o|=D$XPbg?IF1iRpNv!cDQ(K_2q2q{pu
zE2FG9r_4?_;<r?B=KLk7Q7hDDej<rEXGOA3_2AHnQJd%Fu4!60i}?d+)&zys_6Iil
zyRPcveZfdl>fwpvLSahjwdv<tTV({kV0HrgZ)fMB9FgnHtE<b4h78DZYF?FQ_U7;%
ziwS3UgPtUR;(lOp71(cf;Qmu`mTc0Jzs273<rw?)`B~Y;lTlkCUV!l+3jZWd`l_LX
zd(l(xd0mHAE4ojIvVqHVbk*3G@hc{4_yHHp{-JETB3kF68?h$3-Rv~~H%UAB!DWam
z?=mF_^f?65k?5)ePM_cBh8ett%)(gop7;C1oYyJ)>pC?5q=yBYNoNeI>M)dO5)OF9
zI9iSvcYU5zll*?5%|OP}twPB@w*&f|G(=gtD?%dS2upS#0oMi8f15V{XEsw~J9ZPC
zK0nMIR|<!b)*<a@g1jzHg<@!D^hF#!&f6PF1m`<^)kg0zIsn%pz0W+8`(AZKoL1Vg
zXoK*O=Q6j(-5Wa}Ga$@4n_llh{>JU%>-O7BI=~ce_~CN8!fGw5f?quySNye3jcxQk
z7j^~&bkz*Wwx)!6feX|L0i!XH$ab!{5>r&STPnl?6gR>2$pr-Nj~&zDaZm*l|89vE
z{;G?gB(}YG`FzrI&bT!1AgUEVi9ozRqn^)h6$jt6R(FIt*-i^$<J5$VQ;UFPTm1DI
zt+l=0Gj@WRl1kJG2+iM1^bbD?&rY;H9u<1ev|4Wq8g4R`F&Jncz6D+ReK}pW?{k<h
zYZ*3dZ19=9xGqQ8J5&fdz8CoISN>An7zGN5eZs56;tcX0xLAGfH}>v;Rd?Z1k$YRF
z#JC30MFpcpdl^g27WfKU@{7(ydk8aq1XcB4JQV-)Hl%wpIqNVPXfP%73G5!z*-?jD
zfz4<mm#GB(6h+{kxd`wnO`5zKpgQ4ZA=k`(e}`9(RlGk_f;28G-WPsYiEGob7(MyP
z$m5BX#D3OSwdc#8eEe?+JU@ML(*Z(^e*Bas`q9lZ<d>!9lFCo>lHTScu&%2=*1mN}
ztU9&^^%Nus60K3}V`xiFpEpf~5nozNKI$xYV+Nlphujk#2HV6m^=Ev%aq|9~8Vb7F
zNq5WGv(79DugEBKwquN$4N-LH`&68q`c-ykqkHs>40xy4-x!`QNGs1GS=UF@Su6o;
zlLIkLR?t!HuQZ}#AP?qz!*4tM=i#XP;ay@E%cFYx;*Nb$JgeCa8id4k3Da$qY;J7b
zMsU+*su%n)0`&Q<{rvLZzK4AgYycupWaMmqi`nrsvnfI+B1&ycy&@~s8fNrl94u~h
zYG<TfT$<&W^p?emk`C2#bGTS+?d|vhA2k{6J8qGYhiKA?Xi%#PtZ;T25)0Z%d7hfv
z7yCZ?2UTHpZXXc`tWcWo{5iAHf{x*PH|6Xx!NBL0e#7xL{lNKJJdId^KY}a0XUqZ$
zKDHU|`F)DX=cI>b@OQ0ADzDCBc+zt@hVMmY?|=Q+`51QNj{_tW2;W+=2b(>_WFH(>
zZ!FWcrPgKFr1S4uXLw!Yup&%?x<xmKtz*1hO6?JK(Kr5EV_NMqYN;&j06JUr$n6Z%
z?cCoDGN)Nn-_FmD!=Z%zL8jmD-(hf0(twqu&wrD!cg>*6Ml7w|K=5=<sgJc><v~fG
zxB2Jq?Y<~He1dZWe*Y*EG6`wpxPRIt@vtVdZ0l~)AHa2L1rAq=`dJ&-N93hY=T7E9
z+Z(&12$EnMK&LkP=>B8mp@OMZ8C}=L_bL84Bla|ezdNh_a?@2on#}51uu~N2UaJVd
z3Lg?}ICNWP09M|49F{dzJOIu&W0zl@`7FQ=eeLD+iyRI#OS0)xm&D|&YQu+mp7sL0
z>g9(WXUnschT*UL!T@W6I~+3QK^0SfdG^u<igcfoS<d&N;<|N!jF6X#)8>6?(?SZy
z^L#|$=g9<s*3|braQ&tJlXoKn`WF}JK`>jrm0hnZtv3GSuj&zwf3m$-iOf*NA6JvM
z+4Tx+i#0amEUTJp^ZVKsbn4xU(AOzqRrfj>8u3OIEpTS<dZfKO3#e(@oLd+NCOLid
zyro^tPa&G`51e)_*m~kc(=gu=O)%LG1zDbC<-_;U%hBg8_$l(m2q~NW=XL+6>TBXA
z!%d`X9P@|WL^g*%xYVfYWJ-$fnlipNwFHot+;`QDUM&iu-<yV+SWx_%OFy6kUpm^B
zVf@uS?64)hQCLE8M#&UQsiNHR6wC7akgKl62o?=E+%)_qfTak&u}oK-DQJ0ic%7QA
zAk4RSyJ^|UT>NV%&a$M?jy{I$x!BBbofiFv&T7x_JxMdLqUA?(pvi;SSMVouX_;*q
z9^-q4Sxo#$bNX;A)j_!Z^A~0GnoIG{MkNW$>Z|kXK7`5rSj$Q?ItSARVU((j&vN4)
zl3OoY&$RBtCnx!V-p1eSl(h4ADGteESExo=*k-iYQUWfDeCNp0C12S?_q-Z|iK{CO
z9>`BRWbXK4h(fHSFJo}hrYC|hrpQEGzCUF}#Dt|YHvXAOA8QqW-U|T5$t+lrAi2i}
zZeU{}RQtOHI>k5<*lAL^5Jsd>wXI&@F>$~^X)v9XNJ*#M49;lu4NRXhpcq0&6hK9{
z831xzyDo}-w4#2UhPS_iUHPjnUU&SQs~6uvZ{>Ggu4r?0U6^so?TQr!ReRdCJH7iS
z&{D7ZRoEec^Wl^g4yvWFCX5aT1ubP&4m_ANn|&zLTVB;-?8}l{o2p<rU&afq$iCGM
z9W#jMV=V^kNL?~we|=NmL{=SZ5G?8^Y~&*rx`mzmc6c&xs_fos1+~V5NS~*~++0U3
z#bks|Wcl7pOl>ohvtxGK%snESFpZsONF(Z4n_tQ61jxh!U3~#QtJ{{mBl{r{Ge&u;
zM0($=*`_F7SESXv!iD9-U`Ls*ZZfkG*ghg=5jS#>HO*SHjG}g{D;FtcIN*2Vxn%}5
zYKj|u8=Y1<Uv@-0!s%Cet2R1zcrxa{=sxc^Z5g9K5E}v2u4K-xwjIlzPnHO+<eYp@
zM;vbjc(;mMa(3qJS(4NkMK{V3&CxOhWXJIdxnQ{xB-w@|?Xr&^7#zr^ya20s{j>Ax
z^Ex=6Rg)U{ZUJ3`<DW2)I>(3!zlPzG=F`E0y%hiw$}=L8o~Z&d1Kwu+62jQw(wD*N
zG#nL!o`sO$g&SBuH2&al$00!b3o90QW?r2#h(vIG>Y>F$uws}|W0T_60tZEHQlHXI
zcG@s(k999vf5&NUQi2Xx8znxHNOFX(go(ci42cPCOgS?2_>l!nz%!@L#qtLj7&Oj5
zJ&b+Gk$r*$Yuae`kcHBRwo25RBwub{vhGg#B9ik@Z@>F{J8w<Nt8I#JJm9HGU#@D+
zjm|({m2_G<om##G5&&)sNIW73Li`ULf`PV_bQ_X`g&j|PNu>HpS+Ncw`5hSBIdv&H
z9)s3t;{U(_W0$aZ!@LunlntpGtJsaQ$Tt(&iip?MUI%=ye4lg<Nlqm6rJ?DeWkV4)
z%h@bC&OL@Shx;%GSD1aX4=KpHmGG2$`gJTcIqR1D6z)=BOdvH{8q9o;HcON|fyYE(
z-4#1jVfrD0kC?Wnaw8ERCii{tw`&H!RY82Pnnz0&0aj5n*(;ss9R7fZziJ}9?Ee@w
z$aibL7+hP2*HCva>n*1eF3zo%`qMY_-?;io!r1^)1jfCkiWQ?*9f&UN1EfeqGp^Nv
zr*m|pp2z<0mJB#Z&!Qmk(ZRZV&sZ2e^jHHpzTf^mN0$AzV2;8>Dx>=IPn_V%AGG(U
zo6I_@4Ap8kINR_i$gVb$&<-tz5icYSk7Le29!`a~;*q|S)84agMF%EGeg#Hx9vtsu
zLU~VfSt~|mkmxDJ0_kr{JDfy+_!cyH%@5%RWGB%EM*65iKl=5lKF5;|H^todf~qI6
z29lA;7Astn=J00G%Sb<wI2ynO{&(;F2i3rZ2a=Po^V#Yi5MR6ZPdjHE#jVeAk1z#>
zb0rPn5&k|1>)Mvi2<S>)U2G6cbK;<B!~gXlG&B1av4$TR{ekWABiaofYG{qa_dc?O
zbE@c?Hzwr9jF9gv(PHQ7?B~-siBYRh@h*sDmO2ima<zRkvVqyHKcS?Ai}bNeo61Yd
z2d1{u>EXi0mh_70pg4?>W78aA6~V;8EdJOz&t0)k+G-yqC8eEO++FF->4B|+LyWRp
z3o~{(j4_}*+iuIbgoY7g8fwkJUP+t%Cj3t7UzyQhZi9)q7KWt<bXZ{N3v}k?nx@KX
z5qb~??}^(Dp*fRPphK$bFix9CHMf|iRIeQxWEgmmt23he&xE)D!<j!dWZST#hZl2&
zM~{fDMU!R}V@St*Z%0`}b^hV2OkKWENMbB>00;L#bY%E=|Du&pbR@z_RiEu$tR*it
zEFrea|1<|_Pi98X+(<Xm!%$r>6CY?*LA7?xI7`tI2LgEeWQQmnCV%o7hp~M0wN0I?
ztY3dv&JaFUaFk;~hCrfiB`H^caWjz*$Ktr@7YWa*u;%aEK@nC&ht$8!2u&n?=0o$m
ztAgVO2#F3PRh5&X{*mCH*l52%v8=>kQSK<bqH)_a<}F6I=`CA@kWG@5cu#5&g#;nd
ze)@S4uMHpNQ}ePv`&rYiaAqqLl-FC4uq~q^Zd4bQS=N%>YS@r4_hfbF-u2Av;akF^
zTfD7VKcO?oD%KpfiS^X*%;4L5+rn-}926t-QU{xYrZ273VyP9Gv4E<74tT+ee}EW4
zZr!Pr{j+7n23XB(8WYShxw+02oD0Ko{`%KB4nIgw=3$yVSZVLcOD64GB}bFfH+3%I
zh%3WCRKqJ;=jmQEBc7<Y-kEtj;p*Z>97E<u2UEVKt$x^y04vfddN^1)fHsJHn`_}9
zFuOIU6D@wsg<^4j+4E2<4KMY_TK$L>(EToTtxk3AD7V`i%a~wQOWJAez*3tN4{*1x
z{;TpDznN+xLq36Z8ock^HIHOo$5&FUUnhMHpLX8Z9!`E9ZjO_|JVvrZxb~gtmM#*t
zzpAnzC5-J6*~#~6T{!VMln9-gLKJ$9?G>nzLt!oNNkIBqZLRAwO4=8oIOa;3s`lww
zQ$fS8v{1fJJuw=<cfyKp`>9GZkL_IL-v^%y|CH-zDZ?p~xtz77e@k_)-ZQq<a-zFf
z){>#SWFE(L$Z{ci5<DL<P3eQU+DUxXI)7RoA@|_$Yo@DzVAq@agJNL<UkvLyYmj`X
zJBe`T(1*Qn13LC~vpDVqf%nvm6pg02q)TaDuR4CH5dv=4Gno{%?@RsKm0Yf0clzp2
z^cKyXp!CXGZaG%WJ6;+yDzMHM3`j;NBJpQ)|BVlXYxo5c-`u<>dl7N%XF#dfEg7|%
zW4o|mk=^Q+LdD228g_z`S+rtxL?!o9YmQiNfjpmd3fnNnuVq40|E=Cq)S433c)_ka
zUM~5d9EK|fBan<z2x|lQH0_X#(MssAlIl`}w1~VmV)Xu0MKl=e@8WEifFf^}X^rq3
z>I(B7sm4C<*9_{S+*z~%jlbq(9i!@g9TExB{yJY0VdZ2s>akQUzy<hkIz5~ZZtiL#
zKEZz8gSPbbveP*0Gs=WF;7<lGq@xvj@kJaZ+Cwyi6JbX4n{4$a_gXz;j4~-^J!9Y>
zcCVJ3V_j8HTnnZr-_*KvW%FVW52oZb1C=8?CS-Uh!eg<5uuuROsrbD^*{FkVbarkW
z(B|sogHQm8qJBV*Pv_jhnpFX9NNtHia>ts}3a|z9>m<9%*c?_Rr=T7;>AcR6NxL(G
z_uML0)M?x*V9ST&_Api|5W!=n3<)|{hR-j)d>9i$yC!wWT6ye8w}*@Q@SwzN2>>iZ
z&r>b+IdK6lNKnJrn=avjr(tl7*zKVxh~zbef)okIZNxkHbXM5*?{Isy4*PA2ANsOq
zHDnZzf2F2)gji7_uEnt&*CkbX)^S3<O{||@^O0Le(jG8zYM31qB`(Tu-yHyAWG{27
z`Gp^CIyEJwlZVf-II_tpD!=T>pPs<FbEv;+;?Ry08b|CuM>*WH#UyqmEK{z5!zKf-
zirP~`ys1{2;i||y3B{AR^w0hr1+S`MeB11%{%`+xtdE2}l}0v$lF*Mp(J!vJr}SZX
zckq5Ol(Q(ikQ3PIflse{ED}i9XEC_wUe3%fQ#G*4YN74!<RCmU)Vf7wU&3;`*|s(n
zxuD&!X(qx2KM`eW@ivd6CZP(^9|!+-f`kb^&QaT$m`p6Hr)4ew=MV<4W<^oIvwT%q
z=+h}?lc1@qZz~s+vv$dW#?)D2uRY%VnJoOIq0l*DS1rE&>$2__V(k`ZYj*ooL5o6?
zTC)XV-w4{o@$^~3Z+Vx6AFB$XQNTmvFDbdR-b<k|S?r_o-6?-VR+~t&m1O)yN>W$J
zABW1*RUDJ!<NfrWaR+RnacRFDL|yr-<=oXz%H?JdC}%^t(C@T(a{4@*cT=C}kaq+<
znLT?VE{&oH&I<ELK9X0Mk)#TI`q7}4Q1t6d(qDKdS2DuucdsNFa{z3f*&TuR1?jOL
ztbHBN7AD#psQtXBM{Wl>5Y(vaeZ@qm96wopy2Wc)9BW}S@#mL4LsI!mbP*I+4+y1a
z0QPWB?p|Z+oz0J2xO44wRl)@w2D75%glXz*c!T_WM1NH3A6C=O{ywHv!(1~(&wWdk
zmf8b5ypqxL<UK;4;^(i6tESCWHz9<Iq_Lz^mw3<e+Z{G9*C5~IwLZr|K}ZOV64}HL
zSw&j=l`AYt9%5BDn(dcKa|lX_W&II8)b4Q3SYul2HW;Fo%mNmwD_&rX6#He_|Lrbu
z=HZn3DCj%3{&8%s#l~IXBEah(Ll1Vi-KoX+S?`Dzxu~N#{AM({e&z+YkmciAzVoAx
zmHAN_Wkp$I*Kc2F8nqu>hw;NBC0EA1Fzqq2(?^sW5nr%o=Lq0;LYNuG)x@L2$Z~a7
z4h4cUf$Tt^nfT=!VRX>u^RuCxly5<NnFf^kOT-<<#G6qo>dui@ykkGt2DNz)R|`l8
zNh?){Cp;4DY_#7r0<7&(-(Y{PSy7Qt`TJLQ(FU}a<E7hAGn(-)AbQKKP|dvv1DTwv
z-6Q%%b8^Q?`MO4;*9<Kn?aW=gP=>v!Z(=QLtbp@gvyt-7hmuV&1431VPGMvYEu_)P
z^0*iGu`-0~SjpRxTM)Yc^>5LS(54y|wfa2QU+38gPA~Pl>r$gyX)$#z&&SFcPlX5f
zY#T>Bxu0mFqBsuL_S5jnx~8hG0fE8&^UL(H>00Ndxa~uRHGh@1*zZaa$BJx6=WvZz
ztlr0d<VczMl`<n)uNV&9&zw@Yt7mNjujz;6Mq-XX<&EUuAMjn|2=8af;_??;z9>yF
z`(BF&D3S598C1U`Ll;jIrA$!y43x%*R$ydj5YCX<wG8YpRV365$o#>M>}h^YzbKD)
zgNQ(q%q)a2{eLdN<HtMy%3Y`nvRV^EyQ-Au%Hbiw(;_*A#CWNm{RvZwl>#yBO|j(Q
zyt}p)uXfspf6`<@9~I+Y>n#t)x)lF&?CD(apb~Pp*ogOeMk9}fc*R(BRE5#~ua?Jn
zAH>%bFUd;wPB-d(_5w2#<Fi_^RGhf|?`{W9AIa1|gxkJ|?20a*3i`SYrm6juxpecO
zkJF{>_A{w)J@b40mRW+uuOQw||G^35afNF2(;(}WW0gLJGirB>+^-QF2TMl;ZEc<<
zIQKbdGRRGrn#@Sew}ffLA0+l(ae)pN)cb_?G>hr(j1(*{RAk}ZF4y?_O+Ds{YHl1f
z2(ROerzOPSKI0#FOLIVuz7N)tIEe2H`I>#JK7rF};+uZ*-o-LMP@rQDz={o?mHmYq
z>$<<fWyTc0N!V5cQ=Tz5k>p=)VNzV|MI)7q$P2P$z@ukd!N}BSua%{Qk?-~Oy|!*P
z)Cd<aEn3XgP*(2YN8%6Xd}*3>6emFngsr|KcM+dnoK+-DP6$R`Aw}}@cVohY?=^!P
zZ)KyIy?8E(rsFvUq3J|;bC>49=eG1*DH@x?tWRj!smmT;FdfEYKebe@$9v(uvWGfs
znppYpVk_xdsJ`SN{)#}IttrlgaA7HA<1ZJjG6Wki_Fy9zWSUv;BN?*eu|RdgW%OFH
z=RaMXK^fv$CqI0m)<EnaDW(`PsnQAdZy%<pU<bLB?W>_c)`x1Qe@2VMB4Tpyf7lmM
z=CeMYqv9C7<tE~#BDJQL%pte*wAXh{mRt!WFZyw@L3QEzvz(TUYk&UD{~Y?0+P5Fo
zoXR;)R=PDMkZ`qKU&4vm1&rJz!K$hDzI}9ObaCYzFWrj%p0U+x5s2X4^z(`jjSVXg
zzT<Fd&;I36y7LIhPnp+i=Y-utbO=9$PBu|BqJ3#hTmz_%YMybUn?!L5<=X4Vbzhob
zhky%|UbByKu0|wW=OOkYOu+`^|I#clCvhu1_-Ot;VBzJ(3y_ii>zsKv%66OtTE^~8
zOzs_5AFf&Hee{}v8qs2yYB)p`whh4vH_ol@Uk;fRt*2Kv2h3%Q*58P(>$=O{;Noe0
zvB$zln>BV5pg)VLxU+uQyZ<jpywi}%<QX>>*gWz|+A;x4w2P>l^j}<E>JNAG&8=Rh
zP>F%xc_JS;Zy*T|<f~uayK&+24O4znP5CGrQ}p7k4%=AZjtYuSgH0eb`?Xq#VgkBd
znx@ag_^~4N`R@Fkz2~vZ$6-o<PbhDHL1eV=21L!*OFs0~?^yC_^XV}WjS++hF@*9y
z?t;QL2AVwlePn!v0ZFzeXAuzH8{<#mHTO_^?mMO;sZZm+U)#*)LywnJ)Lb8Kx!(y+
zP&gX(L>*io&&r+RzOW=tjgFRcRGBFO^_&xa>g)LKO%T;OgQ>vX1ml+g!n_L$!rzAm
zqfdehoA@9^{I7D<K|7bCgmaXNjeVkgYKgQ5yhQjMWs<_sX7#DSBf<|GD?hK<xQF2M
z1Cu|Z2D#lNQ7zewEdc*eNk%<-vapJiBAuOtu8V2^bly`kN4xfe7}2guj4P=x-XFl`
zT~ilBd<`P=<|I5f<i8tCZs+9ir<|+VvR^S2vwRB0<3MjiCOXV^jFUD@JbG2dzkd)a
zdFJ#vl56RuahbH_yactSYgz3QK#s(03b;$Pb1szW&c~jkADkkNDP1t({oQW%jPtRh
z>bm2-sT=8EQ!xx`*HV-weBp2EKJOS5!ldz3Gpxv&-_WYvg|)m2Sws9BM2#iu42l7Y
z)Pm@O<5R<CUlIS-9JOBviAfZP-g;d%(F_-Q;-Ob=Jy5aQzAYA0<xiT}9@ugvIf}y4
zq8pf-NtPLPHR-WKCbL>k2eUZ9a+A#otZ((Z{nORu2{3-6-`^oziuQ(xn~<fB@}IiR
zQFKWQTI{8NnUq&BeB83&WJZ3t{Bz{_joT#&w@401E{1UoQ*{S}9EAA|PM1|`9WZLV
zCVl0*K}c0lo*-BDO^~0$j1U1~@(L;YKQB#~KYYt9#-J~in<j1zQNhzLqwuQuFQcIg
z5gdEQvC`vAGi+LiQ`@?TvBI;Kcy~!ZEToVtfYMSpVktYB?~#O3O}d2kiAg;EYZcVB
zjY1RQ3Blv3EJKk?p{;8)*m^O2Oix)k>bUf-mGV-Dtfk5)OEakSUjg0MFN*^$rsn2r
zbo==ZSWrX0TDwRh{{HKaSq3}IZ~d?>i@))mZ@Z1|l(lG$ab_RoXa!;+)YvA=x#kIK
z6PgqY)3$k1;ydV1-6PanbbZFgYhhX)4KQ~yKgxrA&N6@WnF-gP<2}X>h-RL6J@`1$
z*nRt(e8SP7PU!J}K6!-*!)kaQeE-MMPj3BFsvu{a?Tdh)swp%LO;y3(kFdQda!X5b
z98c5KDOSLoX0X~CJ}^oYYT4ViL-Hcy%uh&_6?cXka<I}mSi5eqm2n?v+i%&Xc<YV6
z^Vjgblc;rA&Op}tgY(bVERc5#eDA;Uw#RI61k9ed`!LQ?uP%FdZ`e?ah2`S`c%{7%
z90rLTbURbu+<#tCx3>?z-cH)g8Z+|v5mySO-^CCr=F16Fm6HC<CUD&lQ$x9g+yCgN
zzAW%2U{3qlp|%dmRmEdE->xZV%gFIulEpNOt8!LVDdi551&e<>a@tAa<Sd5Mp49NJ
zxeyoB^1t<XqB~_CM-tE|jBcwgS;O;jDMc+Kx7R15^xT&IEAw1-*;u`w`?KJI6+%u>
zMRp9X%(eAxOp2CDvaUo!7F5dZp&McrnxcKZ9DMLgacHu}b48LPyId8MN1gg-z@FTM
zwY)3F3qjt3D}dvNr*gPVKQ_)UMQI2VmHp!s#2kssIq(3P?2d0D&-p%mJ;bvZW=PL}
zcLMXyjYpdOpGlhX<Ol3)|AexWCF%;u5f^DPlE{7kn{F!-wI5BZ#7AVAGehQnT&5w%
z|9QnDl{UvyZUngERJHqS(DKeC|6PfAvdg1<352+EOS}JLOY?BPgRK9hr~-)W?G7UU
z$2qL73vcb>`WeB4(Z4a68;vSuERu(t%XEd8%fzgCtdUcD&Q7v5aps=;<=Q8Qeobfz
zUZCy^oX7zl1#PHq(NxP?wF`IDslMILFLc8y#<}B0Ip@ele~=6_&b<95)nZTxSQ9Hb
z4&;h@`dIkHU{XkVG+?<jCL;}VjMHsyAy#(HeT_m#q(TxPLg!5R;)M;G`ELNT^5+*J
z_6*tF$jyhWRyiTs=zbvM_f|FiKjx`crS{*`CEOLnB%Vdi1}&@-A!n@&_k|JH)ZAew
z68laQb%CGd)4KWId;L#^KX?UC7xwvmf(9zKk9XrFse79+a>kK_Y-Zh>4EEmR4*ROh
zVV8eJd~PLheW!OXA69=V%lYjMMRc5fXkfy0clPrBqs<a<oICxcIZm59Jvz{m%YIX!
zt<z{mDd|lLz&bGC=mC#9)8CVNJ<~79uhMbNH9&FRo&zlrjS(_3qfE|+>c;R$HL&|d
zD&U#wJgyoD+37tv!tqwaNoKX&r!x<sf`U^4RPaayzqI2l`!0m$OGabx`=IFqLc{m-
zPv5Q~8XEWGW|qo{dlcv7SWcV%2V&WShk{~l<wX6XoCX_%l7na{2FB^1|B0tfkQ+$s
zm=J8V;tDW1?8Qr1VZzHEiOEa^`Qg?M>SdI&MUxh$+~UdH#Q}o!>)k(y_oSxgl6Q=q
z)dHu}zg2w`&WJxjWM=<bb(b`XrUYcIO?AW<im8gy1lP?CUO1_W{w?*-ba27UB0MNF
z%0wY5wMxK|eClUuiO1DDH>UQ41Y7XgLE<Cv$HKD8Q+_@SUutU|wvHC}@rV`_Uixd!
zr&kLM5!Vv_YhOz-!3iwxBbuSHdv~UoPv$D#_zNthI}#pdA;I&LZ*sYG`=g$+$K|7S
zwvs=uZO?OJdFQgyW@@pG|I77%hJU<&VG15Yp>|S&kyWP>kBfKs)yMeqR(D>x_Pk5P
zw)MAVcYE?!*+=pu{@K6d(Jrg$n+|Y+_tF`3qSyZMnPALI1oD?4(Xwwy|3GHzmuh7%
zOD<POhG=p?0LjC+58=%}-;3te(wLar`QJX79$<yv|23lmQu=WCpu_r+@idFH$QL`_
zH2QO$ypC73oM8kmGD_GXhEanZDF(DZItOG`Xnu76l(n=)3wBmu>I|<_9OTp=QoZG_
z!QvXL?oxqGd0e#o<(oAGnat{5>6op4+a>w?PzP}%tKQ7A*P&h4eGm7Sxc%#yl<|W0
zbY68&J1_Hjcj=xW{lUh;AynC|v#-mG)XubEbm8pmFJ1>kl3vpS@bd%DQu(H>DxBwU
zu5l9oL63S%=ntcL0X|YE-oo;(aUc!JdzsFn3CUpw4N8o(S;}+mn?Tz}^GA|WUS;d}
z<BqB{FBs~{m+xI$-(dP-r`x}E6mUnCP0<}E22-K+*ktRhQXhRpNNXM9SUH@d7vn#O
z5BP2{FBFI!t*o~R&f<grNOHXN_okXrhJ7nU`_>Ue$5Cvo5W9S5b9OfZnh1U^%5ELQ
z4!+KLp*?;swuo~=*3cyDHEkY90j@lD-6w@fWTkGf>MegRipy7MH$OmZm~CPvJXRE|
zMVCJN+RItAX&agCO|`G;SUYJ@KcTA~fE;laZN)6*$lA`|iK;DzbiPCYwKb=QU{z6r
z?{dw#4px*2AsZ)2{jX_OIh`qy^k|;ajI#M&_&d(@(ZhO?lJ(4NGQ8vN_+hdjtxQ3(
z()f_OtlLS)xDazou`RwyA7MYRiHTS{yhn?EA(MD%Yl=1cjrsP_UKkLd!)pfM5=L&x
zB0~kvd)rFX@X_dI1N^usPjfC=3d;vas8tri&_g`4xurGvB(Up|yyE$oyx#Jo`tYI*
zUY+YoGQaCvgtD>p4UMZ)l+9`SBh*4E_=%ks^(qGwwYSXr%K-D4FDA$r3L{*$)A*gT
z)_Yq*0I5Dl56ZJD{$xdIuRHb%1N}T!Q7key=F=qj$4Zr?mXFj1<1ZYk^5GLs<&oGV
zeqkJVUtuY=xB{n^rrOvMb`EtqsZjj}sv?mqSVxlahpkX=B)yu%>L?K*KJI?RaaB9^
zg7ddvjW(>JDV-6GlH(!bBfIz9C>`7!qNr=el~CuNY|uZSl4EeMdT8agRxf;7Z0%Ob
zf)$0-l@Dzr*r7(KcfOd3ww6W#Lfk;(9lrM+<@!0}<rJv-(o8awZ;c#omD)c$t{qVI
z9g|szRNcYfWPYyXPzof^+cblmtFHcUVeq8IP#bL~?Zm?f#DTxX7m433l$zVWC*;Cm
z_wqnAb0|XQQlCO$jfBnYDq``JtiT>8)6StuP=ceJ9mzUT{38c!YO;{BL*V3fn}47+
z;y}$U)vGp`UuJ2j)H9HvIx4n?B0g$lx9TI$S@p^B$sCO*G_wrNQT-`}XQh1l!Vg<^
z&5YS1IS(`S!RWL#+BNTY_MS;k(s6*&+!$TJKP8~+^UkEBV_cVunagWj-uP6BXxsKs
z@Xypf-MWe1mM<&2Q@VeQ8hz%|hk2ZMzWp6C0G!yAbc_u(MwO)zA~WYW9V(dqy(U)i
zVBHW&y6MM^wE`+LLM11#28cS{pRJ2IJoGhT5Bj}Qj6T`^@M$ex46GBCsJHwJx@yH4
z(1DX+Vn-kAzTf_}dLR)KT=21J6D@vs@VG0UExjA%%5+=}3WFcTo-GBmhp1bcJ{w=M
zTAxB_9TW*4=qaw1=-oRMHpCTRrjH(%<>xIed^~@Bfa}Y=POk!fPnHv_)PyLbLT&dN
z{10yZ>4TCAAp(qJDeX`20Bz)>&&6Yq-nFz2tq`$;oHD1u+h6Qk+yG;|)%s0QE?*a1
zMNYXrj{*{B0T0rkEpPCj@$8S4rZJKsfds5dwD_OBJ6Rt$V{08HeZvna%f9^<!pkR-
z<U+G>vY8ep){j^#$>A3uyWuPO#M|?QEk0@&Lr_0Z#}4N0h#6nm1svY9D6(g+`LLrj
zhV|D5po7VYdf6pW<!%b^C;NrhSwW_ue@?^~?28=AFv4Z&Av<a~-GK+COM1p_3;0r{
zy)}jF02Hxcu*QTT*!-a-OJ=OS{k4w?IAaf*nesBbH6qIU+#gzcfKRL^pZ~#lu5=`6
z=-2ZzOhD9`3-fsT?+)#4Cl+Km2Ii>yZD^~Ds!`MvO|E8`Hg90@=Ik0HkC5`R9Pexx
zd}gPBZPg|%ybzX6Myxfr-NW~7SFGMm#P*{X>nRplay5Nt|6HaGf-S8Nr9jj~L9-G_
zKgVO!=1qa1Z6%D3ca>OQvlW+6!9Q80V5N3f`0G?~%lV)wJf~;!rSr*2ptw4>gAGS3
z;$?YM*z=0PSDxgAr`WAk$(Rm=dkz~DMJJgn_qw%3#pqj9UjE|WfEf;)QyWFO7Xj$Y
z<6MNx0fM<R<J7dnM@2J#Lz0T~WO=<E`C1(PVy?ZDY<|fw2HK`KrrPLvMh++stGe&P
z_7RQ<+Fu_)hSCRp&lPT^r;n6qWiQ><35YU_#NZomkliXy=wyQ6$?C5p3nIpfFWrTl
zG@e6*e>PLvBmzWIg1~s5V;$dTewA&tkx^>-GHw<g?oY`_l?y5Rq+&c?=9Rn<c;imw
z*i3y<QT>>UJ&pqQx$1_TP`fk2GOP?MGrzs(;e|(oVRUD_daA4@-Isi8e|`nlV!88&
z?CjPkE;1D#1~hmtz`7&MMV!b*!-k%cj$Wob;%q)b>c8QwyV&~6iCSc;dBx~Wn2p+n
zsz_Nzl)>q@j1r7b#ITv9N-F1<6c$b=2fho~)3vM@MdU{2w$}IGA&*1g<j^|ihkME&
zTCMN5*a1kw&MU>e?Fx;R0Wxec0A60?q@_63?1ocXW$!hF@HPD1!Ks**4V9`@4<#m4
zaAJSeA+5{E2n?xTb)y^;<`hCW?XCw={pEVVqWj8{u8wmq<ub+S68s+Z$8<?;7aZ1r
zz?r~mCYGZbulS{}9E9zT9~o1>xH3NrPIw2egLXhg_`Z121cl+^m*MZ<v1_O8oCY5A
zvUjVP_}pY9BR|d}nc!BDEw78i1m{^8`b?m$diO#|o?LbeS7ns$qMW2gR$fvPg+C}R
z-aG5S;xw=hCCk3$)wq@`omiZCpfC9p^H(h~7Cuq;G@29@;saMR4?(VOmNXtm+ZVOT
z#(BrhWw_4dl5R|TrfPLyhx|B^lr~Bh3N)ZFj|HE#Gic%c-DTt>v|nR2?k~{wF#O%}
zQU2I#zx`JyCe_f!ZnI+~%_He=MQ)#4n9$#pJ<!cj{mUTJjB|o1V`uqEg;z`8dTtot
zcEsnF%+x&_Og1}hFulBOL}L*G`={phsNE7hBvm|6<fc`ZnC%<wM2W380S|NZyE#uk
z9KH^~Q6y4f@Nh{OpVlU6!2O$F|Hb;V73$@!%Dy(eDaJlV2gm~a34@$d47Zt3_j@;D
z3d^RlGHkvP-312@U6K`DX*YH@83O8Uw1=m7C}J#lzbX=ILs(;Crb2HS8~G(%RBEZz
zpFz>Vdv8hrAeCBea_LF^wh}T&waWb7BV+8MOjdovX}5$^bFNV4u5|l%!--CT92`-A
zEFR2ReNU;Nj^0sUYfH6V=jLjuQvWSOU^VFh96}w*v3HN|{(CF-(05(57<zlZ#iANI
z_??q=w$jAmSdFc_K%JF~pc&wUTNET4h6IEG6Ucd@Anz>?H>Y&j7UkPmI|YVib{RH5
z2#6)QBtV~W%^fJsnjkvf!QY7%|NNu2OD`!|JAAhE(ey|BxQAe`oJPXia3Z5f;6$BB
zZ$qy=)#<M8K``%oqQ(|S7S-|JyB5qnvbd6r{y)7xN7iF)JZR1>Ji)ApT>CF$D{dPk
zN#Pg0i3eDVcxn*4Jz3ZlqeA?QgV3Iy-)RUe#4a3tO;oHbc_N=0;GSXVF>UIT36;`K
zqm}ogs}8<hhjmvaNc;;}o0M7fBh)liUo-p7wLTE`mEd#2(ziX+o{6)?#Ku<QXKd|5
zkQn64&y>ZVuj+{ZzFN_jdDtW^>_g&3pH_3aKar+vVJN(`yYj)u;}`Uptbg8F*3CNf
zIWCuz2$JvvpO2^CVvC9n2>z@T5tSf8brCT5VRQ)-l9GUr<Tqb_(!qHJZ7wf;p9wiQ
zS!H+n+Z=bdf?T+d!Z6HqmBA(t@uxy8WJT@u9V}fOhlcW0im$wZHC#b7xnwr`FHt?E
zX5sz4=lk(9LcI~tTrCD|cbK44OK%VCd0pSWL)&g`8pKO#Q}Vy<gl)$!H8aD~BAeoq
z8E-wNn_INZ^gR2${f8SRTo+n-yRUP-J0B_`B*Ukzn1u#j;9UhIPP`7Hw+aINZ!Mv1
z5GDb0WBMbzNa|)beD%p=fx!vnBK>_?fL40*`6O5dp@8|$1t{AK(-W<$gCE|Gx~uN2
zet%wvVXP&jHyTRT$qJ!cHbvlKWM7GzXPVtBft3)DME&ShljuXIIM9Cvmg)>`h!`dl
zM0*Fl#Jb0Du-cjECwHhP5ls{4lMR9&K?9JLA`G{`2GpoCERibKu_+g1c;@Bef)13O
zgf+ri#xOfue_#(T9iKqw5+{D6p8X(07@{-sF9<}|Z$9#qe(@L#qRRSQk~x3NZH0Iu
zGVABuec!ct(eY{5-$d37R^R>jbl{7yM7;ZNAex~nbN(X<%Z@d$O}yI}+_XVTH*NmJ
z;EWpJyk75R^aTOl3BXYOYO!~IF2fAP>%i$Oh7GmF5Fsn;u50O8%#mg^=2vD!Jeoa1
zXa6=3OVnLwyS3ZHz19eSG{6oSfOlLVODC9U-K@@7S$#xE`*06PVu*fISNgK9u8);+
zwE;y&=r{tHWaxLx-IIRRONa5FmZRVI{8KfdE5wMgWue=qs~m_>Qf-Bh5Sm50sqkQ7
z)N}4isw}V5|Ie)zi$`1m%-I^J(!Oc*hUBzG{J0~v(VQGOpg%j0?iM-fve+=segaGt
z;rXeWXv6mou;!Q!N}t!lvvRil$4gUXm*JcgE3pwO`4`qdfFZy$tmI4JVpL#+Q2`U8
z{xUPn1@*_#CRH<YW><QojOp0C48qlFvJg1xc<v>DXmWc6yOe*sVSL6{2AS^!U2$es
z97)%luVU6;wrA*Eg0J0w0C$){5*!1aSB*YLS2~m3MY|*#Z%zILjN~(1o18KpV=N^t
z7qi~+$FPfAdq#8|7UY5s+Nvf#@<VJg7@5`FMFa|=74Drv@2|rza|d86(Jh_o<xAH?
z6EwmhGPS*@QwDm`E#HTDzUg<|qvVTo-9U}z-Ltow=_0V&fC|HxMPgV`j%{sTvln-(
z4NSJDigLg@d)T29cbp>y@Gkl0FO*@{xFsTbMZxHZhw2|iwq2;q!mt5gjd>+rYp#EI
z+w4lGerB9$;KwxF`L{<l!t5&T;hA0=XkMb&WTfjuzx(GXn>`Xcl4O9K%EGEA2CF_N
zBKX#qT3yZa=YzH)DO(n9Wj}ZmDlpqPn(l0n51<m`7VP8-A@qsFh^>5T(fzs2f&|ci
z7?ujZX-zT>mUI5Mgd-n#KPw(gW(~S3egb|X)>|JOw>d_?@JW)eTtUKQBJi)T?m)Up
z*O$s2u^1z2mh{b~zLsO1=XG(9n@6#DxL+?dq&5sZ)x{wGV4pGnl-t5J$4)zW{uNW5
zPEe;R^Cwyf4C#UDZ>5cNT}IiPoqbt~d)>yv%)WM9Kumg-xW;CNTlD02h}Z!9!;8cs
znA6{0|3fQ#)`IND)uyvBzLAXil2KzB%npcJm8L%5J*)|x{{Bo+C?DY^1i4Ix%oi9g
z6@N|`dLuY=_w$b}kLi`nJB+y>T7xiPuNoU1#^;khNx!1F=A|3))P8nC`b4<%UEG*X
z#Fkv8uK>`W^F?mFNeg-pqXzG4A9nQ!$g*>^c*3<fvvX&eW!&px9Q%c<c((;6o10dy
zXAaT&<O6-uS5bSuEZ*^>Vl5S0Ucr?hkT6&COump;Yw8<Z01*WBN_ok618>J7Rjls8
zqq0JPxtR4|r(y1+W<!bRH{5-iTuwUG{kH;FGcA6=@d10#)im+ZKW+drZgP~7e_#qE
zv*o{(xNe&Hvp!RdkHr^ve*S53d~k{nye&hxDCg6ew9Capy`MB3VgszRqFH*t_!U_Y
zv4!tn7-@9?%)IOU8)BcH;>rMP&?2oID`p+WAQfnG!M)B5l%0pAj+P=M465hUg-n#j
zPgAW<s<=QW7!e@z3aLk~HKBV631On<ihi57h>xewXhCmK<{vKGTuH?0?sY=dlTY&O
ztgg9Et1ZO{!L?TtRp)mrSoQrC^mma0jG5GKZtZrp3WFc<+M^wVcTH}l`4*>}sj;BG
zdb}0C?-8a8I&YS_Bn{$*ivKK7fEty1f*xfS#?zW0U(s(ECbJc1l=+<Hl*MOv@)+Od
zx%m<RJ_8^ArT2lI9b?jTXan>3H-b7iw=?>UgXRV0(ujfgkA_>Xn)B2R$|<p@3^uSM
z<C@ND3z<MeWN9Gxo0i23K`Z(9tmm2KInSzXGZHG7oZ`-zF{3FnM@h%=B&HPDg_+Md
zwY{CsaOZ7ij_PdsygK3C!SlKU!Qk8@R%6jL3LqYH+xP}q-b-CK?HsMSO33_=8RN1x
z3?(kpR8%{QK_601Jfk&-CQrWHwM&KN=l6>nuC^kw^Q$yLSF)3q{%BkmVQ?#NlBvP6
z<xWHI54g|`L#Lhlr6y%W-g5otCR0&KAz+JV%Dq3F3$SYg(gZ$wh8xSBWq>kVll3j+
zamG%?d&X<FGRY4W;A`4<f)<W;k>Szc_q<i5`2So0LzNqmyJBZ=VprUgCSseXNh@MT
zB{(Hgm&u_v8aa|km9=uEWoGD=$m%M~KN=UZsV=;LCvXqbMzt<SVY17AP_iLOus=mT
zj%0z;<5THs_7hLNz-M3Gm&pjG^zk}L<#G*zSzMql(9}_T5CDH%Mmjw6n_WmSHWB_l
z$sCj7tj~&ItUEVC>(+k9cI}-t(+N|n@GbV&&?g~3#_N15Q;zhM#`-}c-^?*-Yd8)q
z)~e1;M^mW%#QBNtnw^+YV2J8C%LhDbA#1w5?E~&L*R{|T8?E8}-Q^nRXoL=S&Wr0_
z6>AnTZ!7h?T?N9$8zw38W(Cz%)&ED+J2+I@eec63+qUcEsmZoIO_OcgcAadyshRAP
zHDR)AvTeJ!=l%XZ`!BfHUb@zGueJ6}@?rq}rrd3%Qa|?QhGo?Tgb>toA*TU~CYEN_
zu8oof(U5ywnZA;U&%*oXyeXC^M%6#Yo}ojn2OL9`O(IK!yp;Un6Z$N(X$QAE><uq6
zPhwBx@t1&Uek1x#o5MWhvzqp=P~&&J^v{!^mOvUvx0Aw?>||_A*hy;Zv^}CVu-1q<
z?M<;1d+(UP<@kli8qxmm@ua6hL8HIdd*)35OKvMS!SN5Kij6y?jSQhN)4rv#hy4!R
zi<vL|*yKzXT|4Y3G0oS$d~g|*L_V&XCfm`C)|rbb?o&J0uyGEdf0<c-?H9q*W?Z{+
z_xXOdzZs9<{(LaRY&b3QoZU@Rl>+QS(BkEnEC9SN@od&p90a}I9%^^B&pI;A*x4re
z*L&D=&(hv(eHKUL{d5`M6uRe278ty)I%rzp>5D?QS;xN6?W@lW!eu%z{77+-Zb%td
z_=l48oO>V|@i+fB27T1;R>bt6pBb>So@=J&ZR!P8jgWz&w6hI$2+u;raW<#g{#gYz
zLzTP=-`oEid)ds-tk=Qj4CgV}d8u03l+_#Uz|AKp;QC4NIf?guR0M=qE?_-QL9Fw4
zR}2S_jaNDED?*R<+1n?!zpnpD|E`cE(&05_^sIPh8Y^q0%`fAX>3qD0V3X_GF6j35
zlC4WO+m>T)_LF|fP#bTi(F`Y9M|9ffhW@98CDrV8wJGKy?O#+4G%N)+bi!OUFW#>{
zr7KIcZgI?yoh2*)3ksJ#87fFqhAZ`?aP6Gl9{b^WBSBMb9qJ3n7bp*$Rb`CZ-BxQj
zf2h;E%bRe8&W~t+y3ZE0CTbQyf1=fM+vh$CI?(_;zz_|w4(0@eKlV)~+Vty2o=Nwe
z;}`a`yRjC&z~rC?B;p~%T@7^hNyyBD3pw6uY^Z5Ju+!K9Eu=IgH?C08f{FensUgY1
zSF9<A`*Ag?lo&2UB*XNH50(s*6_UeDceG0%L)SPv?%@9rK41x931cbL^rE~3pS`Rb
zrB&jUZm7AT9_T#1gwyIdH)^_T@4<U%iF%f*sI2$FWyomAx+}EAdT{?ayb_oPVd7%H
zV)A9V{X9(Jx%+de#04Ng;-xx@w@Hh&KY?hxt0&#XdN#r54{MMxmB&OHbrir5qVcm4
zQssl&Fk1j_p7K_@OT`AN0>D_T=${lJ0e6icw~fbvM1rY2&NcS4plo8^ez@DJ4tXOt
z#<xlgt(5+7S)7f#C<B!kMK{Yx!08p52P%LBxw9l7(zk-J*SW{+&rnGQ#HlPV+^Smw
znkSGHU>VZDzt^F#Jk2*SkO2VWRUOEO#g)5h;yxnP{=UhS{d8Glda99$-!kZph}TED
zSc37}zK&%S-RnP8PSb`0Bdk^(x;}?0<tDsk9-CmjC()!M`oJNB>V^WBe0;ZpLHiY%
z2i7FmI%doz@Hz>PopOu#5D$<a1z~6y7`K1!YR-(Li!6G$r!ItlIeZ}Bz62n6LW8sS
z(ao7-pmT`GC1+<Io$}k*Q3hPVWCMnl=8|T@hTmMPPKtfl6)U6S6CKYXN_Gj89{@z6
zm=HZqJzhb4;=-YH*Tm|eufj=)Xr>cz>rAe-J}7UO?xIP*Qn4C+D3bUdsJ;7i@8J9c
zId;Y6j=x5i1zvos<gy~e&Y+#h+WEFgy~%K!1PloRPL0J!;W7Ea`r?5b4n^IJ_+1@u
zxkS+@6h|UTV`OlFWmq4SIjFi3O!E3H-YSY?EeXwoFS*K+!Knc$>_x_h5y9jrhWD@@
zu->HI)8(R^^#4s7`QNf!Fu>=oYh`VHNr4MdF>HtMy%N+~ne+{X7VAvRYkt2eCa;Bx
z^p7BHYmQHxx2UK^Y-<i0BRF+nSA+jZU(i5oECl?!DK^}(^Syd_=3S0Z6cPL7F+yrc
z@CN|^ODQXD+3$kqZ+aGOdK!gVg*4!MZV{@-=8ZJY_X8^N*K}SF{EVbuRYY0he7}L*
zvBUU8SCT{!30e-Cu41zSv@CvTs9*%-4b9{0tW3sS<oJ{QA^8~s#31>%5es>O#FBUJ
zgt2HdT=wssY5QsS2a5cd!DP{7^!}K&P<v9ZHRb<zWF&I{J+tp2YUZoiCz0N)@|0&Y
zQWF-)Bww;=m=%gG?^_9@QGJNWkuqVNZQG%&j4q_!H70kL+|^*I<O4}QHxLM#I{QP(
zwI;z4QIR$0%I>=?1r7RQ$8xqPP(o*f&pha=k3=@+9RN0{ycil0hW)l3hB;V3ffl^G
zLd^sQ3TrnGrm8pE;aoT7{JXO}9Q!U8#T(+TZMo6^?-*N3YqWt}pH?JNmU*2gPd+=!
zshIy21w9WX)F?}K=|-Z`Q_xbN+??zom;JIzZPg}x>SvDk&ygqps53(#V-k`O3jQ{2
zbRs+)e{0YKH-O5`)?S1UZy<Y>i<cOFE4qvH;?#G6A__T_nEP=TeC&4MRnqB4J>U^-
zN{9VQ$I^ZJtw%Hk&(O_p6Emfo2W2+V@PIxA>kWqb_E)B8O`yVAnn=WZQzA`NOSp+l
zx(~lYvxF1tg5u@BABi-&X4iVE|97|oD75K47!e1B;PL>Q5i&OzMKkYsLu85Z&XI7c
zjq}k9c@@-JfUMl0;rLgTZM4R<%&=8xeW{4@sIj=vjkwp7G>N`s7}@IF>MI09T~CBP
zi6!O!wjO3*Rc)dHrdz`gdQ4MnMWT8&o=;-Oj#^%&tNZkNSlcW%G`|~WfHqToE|B5>
z9mrehx~d{3c?(SVQ+!OoAFGd#ScPoH=t7jICI8u{F;ewvz|^wKJQg&76IYZ)94?W?
zMHE9pVu2#P(2!+(BxyKbC@RnzH`>O@xsd9alD~-ajqoUp_3j$6R_(7}FywM|>ZVI_
z!rk=z0BYHfOFL|{Zd`6N!e_mX^t#TlsRkEDQ>S|P2B;81Z`zK)%0&B8FQyO?4OX2m
z{N(d+mNBvZapUo!#x`vHkk7g@h8j98S3sVnmEqt6+07525c(-9&{0dv$)lc~u*wYE
zhbqV;_5*TJMfWtv`&TRP0xE9!_DKqXCO7j6#gB$%KX#Z>7gU(Fs)Z8InQB=oO<Z~j
z>yfNXnL1C|ekl$*#!a}a7+<b%Xg~x+w=>~N);bRKZw#j3u`coVag(SA`7`FmW8FJy
z2$9$@6|P{xsh^chd{bLza@aNnS_U(!ukbvvo=DNCDKN#Sk$vKcspIy!Z+NZK@5pN}
zWm6gI{NFAY3!%UWB<~x{W)gzgA%O;;%Z==Iqpww?n>C~+XYFLtw~t7ubr~uBtO=VX
zojBVz0&1WP=vv#=^&5)=e+i4geQ>yFn;>G=zGfQdjSfK_?5~<9z6SDMJQ$FJR?ayp
z?za16GNuK2z=a+k4x^+hkf?AhagQ(fDVWtSep*$sS0#GMQnl#IKUi>7Js9f0*uk<R
z0E!y<-loJk|6r*{e6VLka`jTAi9$><d~&(8LLx-<-&J433<~hRNkjOJOF$ediKF#2
zCEkJw^ogx_@G@66Fm77AWNtLLOai}7%X<OYy*`-hF|$=IR>+_Nq*+jjiUUJ^X21gN
z0cfvlDyW-@GU#d~?>9y(JsWs*tw?gh*p-h2riuyo1<yDo<6eY<;)K03GVS;@zS^i-
zFe#G!-uZFj5G4z=D_dlyifz1Y&D<)wv7(<%*B@AI0a>ZQ!uPJAN&A@XdJZBu^jv~U
zwCRX_b8^?81kv~OYyY?}pR5(Hsm`)Ef{UYsUPA`+4;m_6i%5@Ow%{zDtwc?JWhBcd
z-r9Q>yz`XA{x0ADP2iRG@8}d)Op9niGU6_E%7u1@n?BeI$ndI3t>Q_Xnf}f?bj6j#
zX6XVZz_gTr$@f9k^PwUbIt>wx-8$@PrsRtmSG;XEgT-7{5YZk-=+PNK;l%PO7MJ_c
z@W*5NW-m$#<u}~U+j}xN7a7`q$OA%t1Ri_Q60a|~fYMT2%dTUtIa!`?H2ko(OBce9
zHTph20!o^^BG8*a+J$sjOu~%o3DBx3aiw>gXG81majfw<btKhY)>cpBEgbgf@Mq&U
zCw&@|jT%>oifsitlq%wJ@(6*_yQ>F;r8rST0$@`sOPYOF=aF>ATFU6~%lskmVO*?Y
z{JXL%gv{u6kFU(hT#e4!+{86or}9o4%kt6!>P&uNV7iq;5hFuZu1`WZPjq6B_=LxS
zDBL}@_KUKr%2W+Ht7b-cD8LDq*UO0k^Eu3uG;<S=WcXHLbBG$N!<D>n&*ku`<BNA%
zO?3WtBVzz0s>Eb-<=l38rTmkVT-!{9r_p`D6i@pLcfP_>$|Dv>i{y~1%*b+&u!)ch
z1s^^qQn%#MbP>Ly>q54*V)R~1i9vGx6T%hZ#bm;rM)8ALD;RJZQu8J(xL3e%d@vbG
zrSKryI>q=oQdTvz0>oeZ25hoiyym#X?7X-{YkR*5Y~UZQv3!;PSyc2n&iUB?5dxf=
z6FaO03tT@utcE^AEUGH4X2f1X`6!8AsYeUF8iaCaty6g8VuDXY$70hjUO%9wh--pS
zrT8gq+B4bw&ch*LSg>w*<69E$qyrl5V}Un?Db1u8fDKAM@ISXuz1@9rHs&lC<yl>m
zmOkmk9Ed}IWGC^>i}@^U=><;u<e*_S`Z%v3aYRyiBUitr7K$T>$mt%t&)7*B{1<59
z8OcD@Z>w!rZO-d<_pI?lU0wZF9aTd68GSY|M75{7oBahK2&<)E1^GJq^xko(H?!~i
zQy;cCB)p7GIC^_FKp%#f;3jh=v0`!`cxN^&@z9-n*G^tFS91vi!AMS_I6T>m118;o
z*@H6tw%dg}p!uqRJzfO1?Ee^_*F-kkw1jo1&Plbz-P-j0-zSGe#{EJc*y0en`A*x0
z2)OS}|C6V6smajynsq7P7_+)rCBZm8ZxUKM_Pt>Izf{gk5Lsy=rU26grMu<3kKziv
z;b=K2%8-$~;`bF^%D$|jKtqMT_c#_7S?+fzp3AYq2l>897d@fYVLNiqY_|~N6>@}9
z{49C`Ww&qeyXkBXMF2s}8M%neapu!JK5%z%s(>T(&(9MVv{8e73o`lU>krRt4Ku|F
z+k+HZeBLF)1J;)0Jq>wP#XW!ZfV<9L4H-Oux98Hfs&*GuowRws_&RMqEZ?uCI-PwO
zQN&KSc9`;4!Zjg#`7p?JXJweIegB0U<w>r4u@*xznFhAU=@BxpUnXzHfns;4%d)_q
z>GJzEcW=CW(<|<0?%W|G8;S<Hh#hVULcq}Y(MNQ_0$MQjZ30IxL+m+;EH>L6#zcNj
z$QsKs1@7~w1mD6FcGH3LO!xQ67gNJ5PyKB$3<b83aea1lVl-@$gzu_l2|{PEygQJX
z<agLr%%UMwumGnq*OTE(VGP0El9G~7jT8{Fi%Zn`6yur=2rk=8B!cBOzHz8#W)dAF
z(6)i~td%j1<xT0AV-svK(s2JQ_~gGzY{S3^zuFhWZ8<W|@Ngr+u~}3*sdU87TUKjg
zYC!`o$dea<q~v~5fqIuzGZ#_ky&ak)tz@of-r6Rxa@_Zpaeh))4x2VXZD@gaDw}N`
zmeSSGg?HzNmF>bqLZEH(O=n0VoBBP2hddYMLXm`6V{|^`i1UBI`#sP<<B@&o9^Rm~
z$;5pwmUgKo+NY$UENoff+p!zttuP)$EojbQ1<1f<*h}>TkjXF94;&nv*e$gpMfDbG
zh(_%&swn?YeR5$)N@A}gWR}^<Tpz9$j6d?Yf;*EAZ@-&uWiD|+ji-SGIPwM(Q}Yj2
zmQO2{A1~3i#!H7{Ws-^NomYcjp#e}+{v#`m`BGOAA64*V@BC9+oRj^+GGMTvvma=L
zb{@~{N-JnTs+M#B^{^A0?=@uMvW0%-4Qs1^pAdLxyl#_}LL%ca1#RU*<h69Gu<k(d
zPqaZh+4rxBV)X9IW5mZphMm@G?oOidZ&eMzuOko#9>r{c%AeK$+(HW7+sHO@rlt|m
z2ku>n7>0T@+fHS9Av=MKZG4OD)*e4v4X!hI2APv`!#yBtgZnW=3ax-hpRZo(r`%|W
zVs0CrYRWT{?$MlGX5BcD1vbs)m`p@VIC}rHL(_V5BKSEsIyA2k>OBdY$fHo7OWb^M
z{pOakkA7F+oZ|Fj6;4<~d^&X9fRtz&yct)qU6%Cnt<U{8=im5_g%aR$f{#`tT|yxF
zpCTZR*XR^prfDd?yh*9#ry@FuSP>r}Kijzc1wQTssAADXSZBJE3|Q8LfNRU*Kx?ne
z-uPo#3=LQ;Rr022=S%k1ITOBjk1~5vUm968_aWicE@|Fs79#Y8cjbW=`0<c~poW}h
zGVIj=jc|wnic>69?|ahJy0@dpYGAv$ZHs<dFW!52FiQYJ>m)~TCxVV;N63fIh1{pr
zBraxQ57_^K>+42BfE3FS@vevoXT$5dKN5(Z6xNy6)R0hn*y<4&uCX-g%2+VwyO#IG
zdW!D~c~#6Svsfb=7r;wp^_3(Zh2*9p+o3!JL0Z{I29F8qsR-*`&7Am(m{ej~kM+gd
z>n92uI2|85*?E#Yl6?s%5W0ORVFHm&cbmH#NF_+I>JQ+gV1>P?HENNft8x>Y8G2TR
zI#HWxnd-5}-(<f0GJx`g+DeI$F9hQkAD>b&`(QQ`XTh&ZKdQ76b=8&uJ3_p)6<t0B
zN;t^E?!8i4YZyb__kvZcm8gTpyw*?K0VA5QP`gEWQ*;D#?coT5I1`n327CA<x&xEh
zp)&P^BB@Q{r&has)~rff%YC;P1=7T_(OIkTW%@mk5C`vgqPe=LuPt<;o^S@ue6=98
zpll<~A1JRH?My6fZG)q)uU@}yR5hGkg`z#nC#|t|qm*K2FFuWhrKCU4gS1o^2JfhL
zF9I|R{N=Nx0ku4QDq-xBfx0ElW$(7+@x?K^g%+3VDFI8jMPnP0p%aDu`;MkfH=gSu
z&P$jdf`_FKpd#($=f6IR*XDG-j5Yc0Paph=BIG5Oytu8ZoSn{%thH3^qlfw$MawY{
z*c#9ilG-P9iS(n~zb<-^t~vEcGCS6gI^ykLQBG`IWVGE_7z`ex(Qhb^8Xtmlqe5jy
z3u1c}4=<Gu0vw=}L~UxhmPM9w#$N;WMb%yk?~nx`)`Mz>v8`~%qaJdqxgV48MvZ#;
zmfz@SEF(M-A7x3-%8X!2#^a2c_7LaZx99BCmVv(el902dxsx41s2^Th+j<vsXQ8av
z<JoRgTI7H3Wd5-&JSog@xOr_^W#vOjSy+Dh{WH*5@p_lK>|Ao+S0ne_*Pozd%Gz67
zkX$8fvL#_*+st&m-n944k07&KAQW}69edS)P}}eSWZ^CZ@KdZyYj^j{n6JO^$f2~e
z$&uh0!?VXTCG{%ljY_Ok4WlR@?zDoadwu9SlIzBq6QzKEsHs<(<^OFDT*xHV2r0jZ
zF&z|X7LNr%TS~iJyL~cgD#v{SP(kmwt$31bto0oXNUXF2ps@u?pVk$R(hiRofGas#
z;+@}}&ZpzcsoEsrt?aZbN|D?<^y6v2f~zr7C1?PLnYNM6uj{cKX!>o0@mbwIxC;`!
z-=vBocVmmPK+$<)?=oPVZ9CVEjoiYs2$i1NA32l0xyDo!K7<>xF!wssIWZo`$4ydK
z3LOoP185M{y&D!Jq1$LF1IZExpuEt0ghKeA<g>@X<*TL~$=Ps)U($T}PsnC4_{lCC
z7ey8h@T{0#d5sjJj*-=HEgM+P_&U%ZB&l@#n7Ggr)IKUV){6Dt=CXFf%HGI8t2D(t
zvrp^nk0*23>X3nX1AW7<2cmtd{>7d|d%Qxhg4p4OA<n|LJzAKVBxez0k<!HllCqjG
zFk|3c=h=957uD(6qlmG4aRsplN5P=uLAT~DD{#G3r&2JUD)%w@x9Nr}CN-&r>2tzR
z?q5<|5It^>VqrE{iXf07AtpR2BJrA5oXEw`bU9L_NAnQ_7CUU0YnN9|gm0>+l|}nw
z{MdfUjx5&#|7MOXaF^-kJ)wm8+R{G+mG7O8NlUr_>GN5p#lxJx(yJ~f;e@G9M+30x
z!SJfCT&ZoD6%!Y%aFr3S91&1AY-K7&xYx1XM6zx9VnSr&rd|KAs!cqwdl!*7=2Gzz
z&@L4Jyu8I;Fnx#x`G}wuo+aEnFmH#+u23XzcP2h5B>pEU(Gtpr^gHzRzk;r?u?%sd
zg4F4ouQmxB@i;kc3{r|0I}m*u>e&<&c4?dP>qZVt@1mU1WNvYEe@=R~=vT%-@s@eO
z`46Y#k=u&%k$<5fSi$$f?S(yol1^V8d8ctzTp(VGG^HfBpX`K#L;LkwvufM_cqCM8
z58a_L4pTnXQ3)hJQmfk}<rOWK=nI^Ecy5Pa<;5|D72${LlG#susa6}N1S~;zGIgUc
zrPXa50sBrmhfQhDMmf>EN8FGBEQ6D*x+b)31e2nDAa74J@b3m>@vKn6tGDQVN$tci
zdRjL<PCT4W1lFmshG8)pR{wZ^MvB<|eQYYgWvFK|(qT<e>lLb=f#}7}R5+6a|3`f1
zO<a00!^a0dgfkYTe<G$gLZ^7J>XD?1cQS2J0g&WK1{BT!gr^L4MT#azl)*Y8FSxC~
z#niTBpg8+^`ng7W%^)qCcXI4BkDlLUy=Jj1C8zVN#mGcXnICECcDu|<zBlt6!^i-3
z3MpaU%N{}j2QPHHe+vY0AV2dG9@g~pADXOoqJM<hH^wcX7-v`mq}QCo%Bo(!mG;J)
zU%daY?pouGAu(M}Lmd@olJ7W=LdR<dw3O+Dh8+d#U&8qZ<IDb_2A0qOLZ*<e32xa1
z0`EWNz2_3^1R980k*CRovi^1^R!kE?jpPaOfc-6MKq5KB&*}McW4l4DA(80HNaGLu
z2aJet!6?VNDJX9T-LNl}-BFIpHQGe7-5W{0Ag834IW5LQ#q@Sr6!8G~zYE9mtgGw>
z*5-6eQ^4toC=ubw%AfewVadI<@PxfKVpgsn+882ryN{rPM{8&?&HzsU@ZY7MqmK7s
zrM3Ym{=|b@StV5QHZv>{geDHjV{9{^5oq1YsGONn>L@5ftd#S2`BR~&+%Y36^M!Aw
zG{EnvJC^m7(cmhKn@$UrwkLZT2w{1BN#Vy>Ckye_2wW#2gab+yZjBy0Qw6H*8O#a+
z^DyLlICs22?wC3ex2HO`W=u!-XuGN?wJtpY<X7f_dzN1J<Mm)lX9%MvmT`8@R$(1-
zLD(OSm??UeR@IODxT|Y)unARH=5{ZHtBZqjNBU?UC5_)ShV(!5_N;`rvZ(25Y-Ui4
zrySM?lx6gdA8pK;J1uEyaBF_m5d%V|LC0L`c=@69<y_B$U6W8HC-WWba>f4e0T`vf
ziKQ7U01w990u}&^qO4n=uNff&ork();c`@2`D{HJc@H=fk_B;<<}rRUT+>b!`rH*7
zDH@?)ECF-L6}6*h_XA434)p@jaav-@8r=u)r%}w6ceMYcSKCk)U2OT>e?}-Td=eWj
z_#3ULsc^foI8GCCf9!bJk@YmgSD1SONKByWV7B;rpY=LrpV>)4j*3Z%2b{8_S783&
zSaCvQ*&|6*C_EdAy55<s89)Y6C;p;xZEQes`9syP4k=Af1GV)~GlE=12Az3!u?p+x
zw?vOF5>>MD38%(-WM^~DH{T7ouCUzaWKOIg7xr~&9=xD7<EEj86f6E-XZ&_=YLDpo
z6~X_c(WeHx!JTuCS*qi@Q_F>%O)duJ8+G$nQ$P8bc-fA}9?9U*TC=#Bxvj>%RDQk9
zVnSO*9y9YjP&!rLXL>@J!H#Cvz?D>0*a)8^1?S&6n0(OwB&T_XBH7uX&U9g6PTM-;
zpCPW6WxwvAwZac#e)h&aYLaD<EE;7|-Df-G{l-vaU*4Liietg?f%WUEI&`M!e8_II
zD{e-mD@>ijLrm2T^iP#2OsB56o#oSus+a<C1vNUii4HSB9G*AiIUteTy5(yvtDD?Q
zNfV|D{rxmdFeA=a6~A+uuJM_?a-_k`!*xAaUQ|+%qxH0_5BAHoP#1z2+{UzqW7AWi
zZMQ$aV>_86-dKZ1_`?Y{yx`r=GIRQUi#!o^%7CEAhP~6;q7B7rj={9vg=(t^W=D%?
z&d49m%JN{^t6e|E8AoD!ixHp3MG7-SOcYl(#HMeboFCnm^(NBbMhDz!oPPNkzQ(tN
z>z%e?9+3Rsb@+KX)?{bl@4RueAya5;$7COna#+8;15O=TAl)n~+02_@PoWvVU)CYt
zx8R@S-Emx3VW6hO&qm_4>jHQnJ<)l8vA`|FJ!RJc&A$GU`^c1$?-}S^`n)Go_}YB7
zJhw($d+e0D1@sz7gVINP6pfFk+}eiTnR+h7@TRZnv=3BpSx6iIu+w_qpxKxFu&SdJ
zF&3#2Dk#__@zST>FW#ItNlXNk-x4Hl4RlH3mUmjgXr*>q>m?koBunUC%T<vJYJM;J
zY+LRXpW2A&JuiFWtEF!?Qo$KSpQxePNBLhbfMmfs*!o$dRCb}SndE*57ipv@&q2tf
zvOH3^K$kd%7y?Ck#RsBul(~0QqghH1TDK#f9m6-}<9n3D*2KC`tZkEbctJsY6RHnf
z6N1mzelO}hx!ubcW2IO3yyZ1~pXlB2Y_k-95*-gJ6c<W5MgE(^&-lEG?WUOI$YftQ
zdG*HwqAnwpS*0D-`)5kH23(KWk{h{4VPl*V!PpMw=FO5{37(Xdk^F#d1;fzvNO;fm
z;Ab^!GT*z2azKfmAd)tU@Fmc+jZRhzp}qU6!gL2vTLjEEt?d@^a2BW~$#o0Mh+A&2
z3Ss`TG=f=vKTAV9FXGlx<MyS7fgQQscc;ws;0r-0JNHgre1JHK?}F4~tIS}bvou~;
zD2-17#o_h?eX|?PIal0`A!BXXRs~qz;b$U~U>8Xrr_;AN&L|TaLkp8v$jxHZ2PX=5
z+(5JTU8M>rLymJ07w%G+?YBaGaaFyOaD8NE4rb-=-{Xp9(J=9xy{djvIkc5d>EZOX
z!b6)ox3JxtDZf}Q{GG7#Jy2JEIgW3dTx4IiDBy2}kaP_Ql&DK$C*j@gj%<S~Im)|Y
zJbk`GO00F<oXr8fbacY$rfqd8Q)L!5&>ipI0!DzZ_<|0TVp?S4>{<CpCposERbeS9
z%#I!|nM!TLXBEJ&3t_B#pT%oeh%Ka_VjpMJ&tV&5r!V%?O9<sD72jx$S_<DVXP|&E
zif}z0GQ>jz@4LnNE1(X&G~?%J@BsFIE>0Y!z1GT;XuM*zEBhI_dKBKRW6omoB64ey
zy^VCXOFasJmbjWUaAX#ZlOhl72vKJ!($gy@ssX1uiC7g+tr!G_8?b3o6ZO(+=O>R{
zeqc|`CVv#)EWtp%*sEz%q5@fl)1~}Y)%&fj;eWSeDYBQ}UrUvAUST{KkN+j~7ky)b
zx@6g0OIc}%nXNj~t#qe2-7rjxqlRCkjxMT+0!apT#$JJHM_Xncg`7>L*aAJTmRBwL
z0PcTs?Y+34D$2QiezrT7c4_SKWPOG!HWt!;rSU4vEnR5H{QXJrH#4|m+YEOtxKws#
z8{Y%H({$@H&8k*0q@F;K{%w~q32z^l^u+zX1<~B>oAWXwktUiC1~-NoA#856asx~B
z?{+X0^Ph&2S?mp3LCa1rlo1{Q<nBI)x6IWRRy>U?Pt1L&X7<4qRl9E72M0s+Pwb9)
z|0fsa8NqqZR2EFzpmxjY<b=%E1*A1uJTIeR$u^Xqi>`IdLIp6=j2zo#(`-mJQC5i&
zeVdMQL-?cqDFty{dyWxbE!rIh9^$8OJaSwVTmA$UTd^W-YGUhYPCZW00iW-@iB^=O
z=OL$Xybz%4P3_g!xg)M}`(;=tHSyA<29r*>-w?bbEXIXO7%^n~wq;s2H-@j0angEQ
z7~B^tc-(t(|9*im<1g709+o}Z=C`wLz>#l#k1x5{TSwi>^37t`O@3zz&3$sgIQmMz
z4aR;TGy~8a!B4pYY<KbV5m)mj)y<9A+cNh>=xhPko5W_X<5F<}7tK2W=2bL~K~^}@
zJGNey|1t)7R{oZT2wAvVQF1-g@ppehdk0?2x-RD5@#B~kUC*U44<zssP6Y1R;}w5}
zqSx$@;m#$Hu7HH)_K&H=`_4qi%3Z{@VjE>}ytEpUMFIRp`df>4<MdV$Q3F90Dm`={
z+raiZlIq+>=LX~w8%yDx5lmmAuv{baI=<R)Hh;<N6~)oDP@9<&ro|Fr=^b~0`y|Ev
zOX;4;*ekm_ouU1{Q<*m>(xJ!VKV`qt!#>eUa?K8I?{TSw8#OQbgd{oocxSmqGvjwh
zVQhNv?9w253gv^}_KDVpDE*ul&nhn4;Lpa_kKXd`ixC-5E3K5yFOga#1m6<Bxl=~Z
z2+d!22L%qiFP(Mj)2$?B*qic<(AF;}<prxH-%yVPJy!0t_p4eIo~im6F}^^RIMqTr
zQ&XP-6H_W28KW*{xYM|>oUJxp20iJ1pS2VnTBqDt0De0;SiG4djK>c6Z#>cJVyXVL
znK6Yp9V?Q*%*UA9Wug|qH)}_hP#R?V8g5Jwxjc>H8iQB5u!JhF8oOh8ZD+zXn%x`|
z>Vg3eexhIqi83a??r6u|d;v@rr!?~HeCT6Sj54kae!qsYZt*6#<dAFff&W$i0Z(A0
zL*>*G`|QUhjvAwvxVc1@Xt?r`ATooxR0<d5UC-wpfB0*d7k&BLgsIhb?8gmImanq6
z0$5=pPaWyaV4qk+YeN|_gsEZ|A@68G&7{C?boA~E^|0*4)VyR%+&L`Le7}a;PGI8I
zl8Lk^k#dy9!Hd~Wv*kr_{zA2xKKK|1bX3KMs{5AOCTsbNVF<$8OY?{VZ=W*}^FKuy
z-T>uRJnFv4S=jku*rN%A_zP>ueH{k#lKwKZ(7M?m8>OhD!sOM(@vzC~@P(E9@*YDx
zDBQ;)3O^S?F&t&y<WHpdtOVJw5?Y>VEd*iK%pr`WIygQK)NWK5Im7!a*W<S|__25R
z*dFx|h&9y&2DI$pV5hW^cB2m9C2rOsRrCiVjczs|50q$%E%gVXsM$LpsSjdELJ{nG
zVOGmNRU?$UdIp%hT5lQ<Om5ME+q1^P7ruwFq3fjd9{1~VeTHMhiU=Xm&YAE1pXp?q
z7e%sPuQIBwz!pv*PR+h5ElZJ9QgDVDPF#cOM~{%`M4*XE)+NP~H+;~s3zvJzKG)2A
z;zR_cxQQx%-`P}=kCJ&>6|xv=MA+2!v%324Ym3wS3^PNM6lT-ZOWnYc<hE4hKqwWi
z#CaiGYE1assQHnz3h>LIbRCQRP!enZS^n_9(>^(p_`YZkVI?-moUJS{{qbjfTDi|w
z60*s9P}LE^GmxB^5yOY?fE{y;sma(-=iBG}?L-VPU?22PUtt;%{mdyM0?De+ZKdYz
z6wzF?82L{C$pfJXlC@z>vbdGMhnnlKLW6H{j%OdlbNv1YXf6n@WbKBF30)xX6*@DA
zO<qHT8U8fbqK(G}AXPz(Z7e%(rT?}C)lMs-o{zog<o623zg^{SC9Ktd>_4)8re@Qq
zJ@7D~-2|mVc76TZK)o*^m5elsKAH3%UU5<kHwFRU30n3e947kKyq(-rRMp|3RCOXh
zcm~r4m9`kLKEdLXYG)zn<T^_R0sb=p%S?;{IlGcI_&b5dO_cu@hG-~alkPco%O7DJ
zfwc(i%Ms)h1(HD@Q2Sy^vEoyZK-rpmlpr|zsc&S!(9)?ljvh84sH53G^C8?%6pn1U
z>1oKK1Q6+})u$<XQ+>;3JRE^os;1R)uSg^>>O+qro38OMF92RGUFz8Ndq6wUju1)<
zqhq?fFD!3dQZ1IdqK9hJ{#KU6Cv5pg_Tb_U>+Qckz;mj$rw0U9RM4|K#k1*`%Nfc2
zb|gM2UQPh6m*}6>{D)6wuE^a-GC@b>-A{5o7(Ed}bn~<t*33ORhng+oQt#S5qUD_1
zdcc7;;bax9{#M`&JK3e+c9=1q=tX)e)`Z~H8nT#RSC!1Y77#Kg^lKm+I2S?jXVHT;
z=FnV=WeuJuE-|R6fF<np2zV?^TZ6DSW-$GAV1Ta&KK`Xa`*&4*&JQQsAb!rZmaTif
z^E+PZi#((G!3`y63tik$8+JxX-DHX-rNM6UtqlQQ5`Lu3NaBO*4=X-^JxAB9EZJzs
zuRf<r!x+Jg|Jju@m$dbxl|Jp)1pEm?83(F({Z-k25n2sxLZWy5MC4&-P}4}AYg{#0
zs@>~miHYV>-pqm8z%b{)V;5rW#&*xZ-Cx=50O^5GT#(W_bE+y#R!euKbY4Z@MZ76p
zp0`k{Erf$ms1?2ReN!4N4*^?nas(oB625^=Qur(A(0|4~xRgG1GjB{$!n(CxKlk<e
zvrcJH`@{JU4uMR18lW`c#G<$k!@@b(4XVmaLKug;cLS$hOB*isq((6iN9@t~3$$pZ
zgnSkwL7p0tpm?1?Rr-&6?M9x-3Q`sn?qZlhMCN=L73wRY$(LtngbzEA-ef!eNDA=V
zv0D!-krC0u&a{}IEXqq#dCFk)t3jB5zp#n<!l*<ej{yq3Z2NLdP|@)TZ3f5zw$Oxs
z@Noiq&Z&ec6H)7$!W!?8(n`(^^Jl?90tg(q=-Z<)2sW#19OVR$&hC@@Pxx$2z>}b@
zPOUd~U{wDtqu<WDHG~tf|H-3RJnPu~6}FJ+x9+EE-b4Ica$`RHe`=|O?bK>Jcm7W~
zf!V#5S0BLpzTWMM@`={UTS}O%eL7idSGv_04#@Q{T@5VF(^!Z4`_jKUswJ6$2?-qE
z_TiRP8*dVVn=5wB*&R9BHguH&c@t{&^N^(m`-28O*5SHh^oaC0?b!#@XuI~T2`e@1
z86j+lcKA2#8~8~1vzzs33w#D8b;Co=V)VuDFT$xm?JAkF`tLe8z(f%R(|{?u`k-t0
z$dP!)s}-6zI4gfPLEOvZwAyS#6e51r@+{w%5VJ7~(*-}=zU!{8n98hRCB7e%u@SfQ
zJN5sMW%g8#{V^p!2!N1B(PE^5MF8pNOzp)R$XWtN;d8>voy0=TpGi?72d}su!Zs>_
z6jmhXeM=;e=c2h>NtY&bgkz}#Jcw%zEi|k8bjXs4f{b?$%qe20@^u|LU@|iY34{z(
z5t}TaU6T7FzxO-S8U6-|$FGvogm>xsudDBY{NsMmwF1-3I~qf{q0MUlZm4yWGe0Y1
zSfg}pL3n}H{boEkp?KRN)kE-swTli5ES2;{VP4BgNt5}B-l=vy=hP@oHEoGy+Z#`1
z_HRTxmzn=E=NHD6BFqe)od8${5MdOFD707Y<Sl!<@>gU8Lr&pVZ!rHRObPWVpG8Q5
zDsDL{92E%)9xG+<aLFfBRX1fnvgt$X=ORUuY3+2^L<U2xJO&^zr<|C7{!XNEAl$L>
zT+cT%^~*hsyq*D${>rs;9~m#FvB8FNM4Hs<PF)OY=g&xX=;Nf{&-$cx8hL2<KG{6G
zKm*Ys7nEbtM%4G%589W6V!LI7#y#B<^W$x#9<1^Kwalaaomy*oy=U09zLE0pTE%-`
zNj)OM|8pi~7kulcJ?r+_U8lJ&d$<zM7n9ABjBZ}aUXPhtL2sw^jcWpV(dZUCN0i@_
z?sZVVr%_#nZHlyg@RC&>PB|_}Ml&4|p6yDED4S=kTvqA-2;s-!-Wh!9x>4RG_T=pM
zN+B7Q{rcyot6C&(9Vi4+-+Q@1Sq+Y@F=Fh0=@}_-DowdCe~rD1VF`9rjBcgX*nOo)
zGLyCotnUz#$PGmmo$LgkGk4*Obr{-WU+i=p=zfrT^`C{3ZnNNuTBj@mDyVbyAY4zJ
zz@(7hHwDZUW3!OJIfv`L|5Y_#c?los-TkhqZ)XUjW-xRJ#5*9*EnnyUjz>V(J#UOQ
zK$UF<P~_l5>~KB9Qbs5gv=c<D*)s1u!Ot|sX%n}b?M{BPtw@!3DuYCWU9fR!cdCpG
z<xXeoa>0{(X`$S7>v6_>!bS5V@ce@xFL&0QvVZeswNn2c^wq}DUVatv2xV7+5o;@J
zH$c&S(0^UqChKWB>&R-?@`>w9P4}<TeZY(b#4B7&^6=+RO7>dX0`2;D(2xc!`Bgbx
z;06WEO8s=zkkR~;YrD~*+Fd>t^Ot9=Pa7n67wt4<&XbtttsuKYi&WMli_JmFbwoT*
zUpjS-huS1L9T-yzjRUMrw3efkfNX+pzS+A7uA-jSNi5FM8e!gN?cdnhFB+3<>f73d
z5+$mBp$K{NAX;d!vxa?XU&3EO<Tc5z1g%6Rr*GY3H-D|_whza#@{e&w6pOG)V%1no
zla9irB#DD`GEw~<p#9>&=S-+O-}3P`?Gk{qtFDRpNU2RlJl|47SEqv#LOgQ@joU0K
zns=gNvwQOV?xV9v2G&>ENxUNV*cqQtFzb&1uDi_S+Y6wM`sA2-8<1*Zyp>~Te_AI5
zFUUXE&tNqa_gI;3Y5gInA?6BV_@AT948pw$N{QvkHs5A3SBoC>!KPAiHc`8QZ^7zm
z-1-B{;EevuCQK|FBVR^ndu&}P->Q2+Go}95BS>r+`Vd4P0?j`B(QRTqkoJ`1G}P(R
z^+uZY3zbYa1sYS+Yi=fe5f5Eki*AbKYt1L0yE}BhWE@&{`*M-0((?c_H$ZLm#R=Bg
zJ}2~a<mu(Uoyd{lQeJ)kk(hzP6Uwac1L25~Bt~vL9AbsM>^CSx#v#N%n4QEO(0uZ;
zf%Wn(h&c+M8KX|`F~E#IZ3<A6>cEb=Tnjs9W2*7icU}3MTa01O`M<Oc0pjD43ol@&
zIiYc*IcCfKDfA?B%CQSEENkfXtoNFt?2%zr`fs5!+Y_hVFMhV4^f0ng=bi;h*D^*~
zJh29Cd8wHObN&}%$9(T_+3^0va6*(?qr<gHN<E>3*8utH%Y7^I{S(DZnA5cD;5|78
zAD+hCGIzIBcMWjg_-9Zn*7=JAL-VvY^?#ReHMsN*xCw}UGzbf(Zr{-_Ze)idIF2Yt
zT5D3N=w1o>Xy)CBR~eiWT?z^tYf4I*(=><;jZ>o1I_cm|@ZSD6+<(oaEn`2ofc!Si
zJY*Dgz?6U0H7dn}2f=7O!)&!{I62QZSnSk-4H=btK0gtfP}G{bEI@?GAxEXq%GeA(
z=5;L-Swb0Hl4~6=^49dmbrMU@oeIGXNh|cnbWa)VW6xS~0yY{8vih10k_6*kyYLJW
zm8&1V<lX<kSs3s;BQnJsZ#w=X9Fe1^1GwSong!(udQBtOwmwRAf5dL1Qu}LY^l|>p
zW3Fqb%L&fAvVi;$vmrRioi!z{e@l}#9yv(TZ{&<CQ~liqx=1+V|57)+EImA0k8NF-
z-uQ3@pdNGNX{!^0^beacsKhhXaP4;zFo~JBD<qhZ+%z$<)wFLoBt8*6mz&l`Z@O@~
z;`1(a!}Q}vUoqKmg*;6#)Df?}gIPCTaP6?)Vl$~kUS?a1reS!vKz{IHkKPA^BRqQ*
zkWN~g)ZtcO9%I<{6&@6Ne+{c1XakkS&9Edt((sCWnWb8|2K9%!F{XEMO?xES&<X6)
zw%oCD`G3wBr|#Rw%#>ESC#OH>#(DfF>Ga@IL(fMc;2eY6B~Iw`C64(EvN&jxhF$7a
zEkOS;xXDI4^)5b;tT6pPeC#waBW1EkKQ`caWq~ZHrX(i>ZN!&2ErJIrD4+c^EcLKM
zRt|e+YGSsith%lS8%As^y*U&}dM4Ta<heIC&(g(qDX^5%{rxh%bXT)c<|En1WOnlu
zQx}*`v2-+(hOvgAV_5d1D*`tt*YJ&npV^?{&m*5+Z5}9?iY4m|Jz##zpU>=vxgFax
z>{%+)ld=9bN?YZjq*gV{y_h#Di~orm*IzJ1OTV@It&%fu;b1YxF*{bZY_n~+#Jw(4
ztQ;^&z#(5`vg!M@m&XzJ<G#}_(AkNaz#PJL#{5jbL>-K*#!MCq&A5$?ntfZKozz_<
zQ$xd$NMpv2D!=7n*7nK4(QoNe7mqYuk`bEpyJSmRXsRlmJl=B*zC*75TX!`t#A7Zm
zPI1oW$OY)|4Mv!hK?#S3dbHt;;-lyRmQB8`x@B})s_thS^_YPdg-{F~OcmUN_rR+O
z6KZ!=nAtqJRCpn(ZCAa69zvqqYH1B$SXoRLHr9w`0+}i_BAtjsnA09#VjdjKoSCCu
z@?Kc)8-y8Y3pX=CG_iFRN2t@E56#q5RlfpdqYg)b?M~1$+6=*1(>`?3Ml$^@SiW~!
z0i>lNv0|MR-Ld+#vXZ|vMCm@JyX>$f3F3BWRw+fH=xI%gfPJkQvU)aKRdXktd^z&^
zF&u-sLoKAu2hU^oWmvMT&ie1;j}wL|ca2(qmbAb%XUOW-Q{$R$A=TJj_Quf8q1?hN
z$(<%9bS9@{1ZOvhr|MTXS6BmWWFFX7O1rO?5t6m?N|l8Ac;eG+4i3H+#I+FjHx$ac
zam7E2*&Plp+ho2C3<w9pvFG&*t01~)`%C*{Oujb~?Xghu{l~YN_5*FDEs1xgF5Jwb
zJuHP{-d2UOViq2|hyhg{aJq5FI|q`Ss(1-Z-`%J$$*o1dyQ-HC?|@hE8?ePIhSvr)
zb0;J}#UtbH`ru7!aimXji)Bk^a7{^E+x>oen&F-qL+Ptw-fLK5zp4!fW^9(~Np)R+
zuC%OdJCSW2rzAoZS31dW_N}H_fm!QY+D>XQubsRw`KZnlp-&geh_SmQS=o1w@9nhr
zL2B2L#J(x!3NT>rx`AbXud;Aj*ENk{4n8NVApT1?T3}Jcn8gp(UfD-?2CT*VRT6-A
z)NcH_f}O7|%u(_6Yt}uxK^X<z#Yj1lnpRtSj(rTXLOoMp?{J+j(7TLm`C(&%(-{{v
zP~&GoTNzZsqM!0MUT{Mp-W_u}ju^r43r{uoAXh1|F}D}SL|C~E^Q#GX)CrdAs;u6G
zxmr)E4}QmiN%C1KGsgO@D*Z{f9NLJQoqU3=>jmLG<~L>Cc|*rDhsA)A1nW<Ci2G5?
ze2X3Z3<YtkXCW;lojC_cXVWJIqb4=0#a=z79b>Q4FvDf+g)QJWBfA}bR`Q*V(r;?m
zLlDY@JEMiy6F6V<h7ME``kebd^6uHcE^m2Ivl_sZifrUh>n0^FEHxb;kIH~){Ruvw
z>Dk<7D<N<spRs4eYAGzJ15wqD4yH+DLbnupoG8D%KQwm*#51i8FGEa?NT}y?B1(d`
zk6*Y%lUYGn1+t_=PE?n|Lrb<}rxe<7eXZzjRbe0KFWhMoxm_~NeQzuIas2&eW+vHM
zb5bqr5aTN&>={T$dAhM@q5QZln9kfr^EexyYz!Zroa^MBFU%vs5z0Kzz4%}=NO<QV
zFB6Gir#j8OK(f$*>VbWg^9d@!_<kFqg%iKDxjl!rbBToKxj}$Ep~}4tjU0-baqn3v
zBStQ*^2Jm(<zG@N)`{V5Ok*gM!I<NRYKK(YfhvL85$k{+)LK4lvzi})SFEF=uQTM4
z?IJzU#oF#x0LZBEBXuB=D;6~Cm>yoW%q@iE#Rt%CMfGyJA5!}D0U6Da$~n$mv6B(Z
zjPLS=;30wuV@o%(ZJ{qjFS#9SARS3d^Y>i*mb<T}v6`2}4lQ~AMgE`%ZjU{JE30GP
zq%6)KmCeyXuv=Vo&kSRvw?>|kZvgs8-*sxAFZR74TiE^Vj-GDt8TA{~rOo6EGzqA5
zz7E}yzquCoFl#MT+p!fKybBp<gXI8T4?6cE)03*-Hrp+4)FzvVlH(@p6AG|ef=t!U
z0g<Ho5DALkocku->gS2_#*E|DZhTY;gy%4<Nqy>F6D5_NcF$>!?G$+=`TSzr9J|WH
z3HiLqURO$D*HaZWkhWU_wlQ_22_yGzXFP-{Zin*pJt31`JT1YI<yZ#^O?$PiV;ac_
z^aJNF<&xXP0%*N0&ucy>UYc_jt?8;I`7b!aF77nCXjoN2TuL{ymffyME~>gmX)A~1
zF1#D7J$&65V~+29XbCksS!OYbJMO~Rf~Z5RS<AG$X8}@^wDiS(2cK-7+a5u`Q?`TB
zJ()Q%A%D-X1J#PuO?-61T>HX@ZG$LmgzH1hXS?^NkSVcjO3be*<Dxq%r&uxtPEWbs
z<Il#`i_S^t2KB2xZd{uH{Nf+9A(L+5tTB;^#U|MrkQ#Lvp$TZ`9Qke|<4h_J?+gI&
za#|dUD<YPvTZ2g2eBsIKv4?Ud{@q;#wWT}Pf=k*MSuapb*T|ha_9SE<|2Zol(3W8x
zqxEa7iy&UjZq}THSjy*k$gCKS|Je^~kHHB)nB<>ZRMfd-NA2$5u;(jWE$da{3F+MR
zIXktkRZ|mm?&z@k0GAf2PJR&{?_oWMtB<OKCu33<kX_+IbRsgbobFDsoMmq0G7I$-
z!Z*Q?#Xxefb2JkMb8tE6+_G+ASL^m2#2A}}!mIrreLmDM&2N<#d4VeW@S<9-aPmnV
zVOl(ftec&v<=FQH$ozy$oa-44VXWKmLjRax`nr|nIw41G)9@}dg2@xT%}3ujdbc!L
zXA-6VZP038A`Z=xBPq?xbi()$<`9#^C*k~yvoGloa973gm!3ZIX|lEZz_swI^)gjm
z@#>Z?Ft{#l$6=!Xd`p)@XG>`>AC)Px%B7adTJ&Js$MQ-WS3`Pn)U47VZaJpSlgNXp
z2SwG}FOMmlvS*a$@%;NzDcaf}j3ukp6^flICfg7nq0S}xQSp~|E-Rl>ST&G8rrD)$
zOg&7RG~#J~{67Q6hXRXGWs_GnTek6w<ZAmaEH3e7*tDzMv|l~kvdw@GQq1uBB8vcV
z!C#|&$fgo>IH!cc{uM8YEMQI&H$G2-Dpn0?jE_c$`oF;WM~-M^?&kFt@_tK<5t?xK
zuM9PgPDt-}GS{Ch#snDoQDe-5RC;1Iy&+%8{4|uAyd4fR&DIPZF_fgQ>?}GyF>aDx
zLLhl$_tS)QFM8~DtE8`vGh{Elhyw<hUAah@7p}QrmrJqW0HH2yu#bg14(pN_twngG
zEdC%;T~&dYm@u9^2o0wgzu=;;HKlo4Tmqr|D;9iNC*3jK-B2wQ8YvAX-(3ybyd6Vu
z&x&RAg_rWj6U(~)A^|bAp{Wu*XLI7NEE2>g?y`x3<hrvuqH)!=-lYO!WBP#Sk`q)Q
zQQ%H5j@585W8&8_i@7Jz((jR$A|GaDsREdrVA5tzf>bVQCn1tB<XQJ+bDZ&);U1Y;
zsoR^wr;Od)?GS?U(0!g;B32{^iV*hbjc;9CBTnIyN=u@F_T;+B_jL<n1sj|Ct^qpw
zwTo@t18;H4k_2*}VH4@a{G{QxE!qEi0dNOA@`s#wjs?&MY=^Pb?`|Jx-GuSnD#IKG
z_Fe&!3)MY#m3x2VYvuj?!|Yx|a1mLyW57%qL{?6kgTjZo&QND=KOZ636SQBZHzL&>
z)2&T>a%-XGhFsQ^Q8vj}2Vae3oWOUQ)igRmWnpyz7A>?(QmoD#apWuR$puX5ok43?
z`OfDvF%X_`rF#eCJBJ<m;?7}bz;jX5xROjdx~bejVVMf@D&VfTjHj1P$)wR5Qtl<f
zj3+*V@8{my55pE`#`?()5K)j*T%FU>^o>2mr}$p|R~INLZVim{U*3E5PrOeczjMI>
zfO@@>gm*(lS8l{LMlBJV$OK(x8e$IvHghk!b9J~~sltU!=y)eZ18#|n0c5tK)lM?w
zoN@fIb&7vmZU$z`g;tO8)<-CZ5waE#92<8wxS{i;U_D5gLMFPu%Lkya|IsCuYMgFD
z`qu=*Pt@YM%dvd|t>cBdgqvES7g*Jpm$s;CHE>OTkP;pdIYCSij~jhq(YV30E=vD9
zyTFIZD&P`!<o7=UvsBIC{<kOP=!>*O_lwSKm7@W|9_89F^W<yc#=%Eg=Qc8lHk(8`
zI?4m9iUun_XOZ;jjJy~L{uiR0o#*$?mE+c8_{9=GRFj3C;USs$&$|2|5iS5ys@OSU
zy=!u)TyO`b%U!J*Gmy4s3m0D-bU!P9v(NeZ|Izf-VNtzLyi0c@-5@M2-6bqtOE*ZP
zbV{exl1hklhqRP5lF}X0pmcZdJ>TEGmw$Mk^PD|r-Z@k6%xC7M8l>A0v_RSxlTs+}
zu_>7$1flO1I5(a>8={xD8nMj_<wJtj*ybM@2XkLf-%?-UCtA5#gMTvkC=^1R<{hJ{
z_^|*#!_6SOI~K7X9Ddiimsoh2rF+<M4Q0#sYUeIgtbToT!++A*-cgqFn@~_~Bxn&U
z{CnNp**00+_}EU_;SfbP{PkTMs!@x0<nY>ya;HszxkZU~5rTN4Sb;8bZxY)x=Frsq
z!D41aJyVX1ylmUS#xlJd4|`x!rTC{H_Rf^4bjU;lcR}M4#oo)_=FG$&r9DYs3<-}M
zX<TGl^$2M?d~jC1C~%JXa>yg9^7Sz)U_A-J4`QQt;|?hc0GO5+-Grc`2=~9Gt2drO
z15k=tj3aNf6?p^`1yv>Xnmb)aZ>L2|ocmVSuZcX(3jeg;TcB4^N+yl-_M1s(kSpm7
zH$x)dXStdn74PQCUD(M}$xfZ0L~*9vAPh%Dx7FNqtKa5EPCo^dt<ioORyVoKL9C2}
z-)QARa5KU0+8n@sR}6DXBiP7@q0)JTDRs!8276ZmQhGKb$;53OCf9e3|AcXc+5dT8
zS_l&g{P4>hY@~E3KKZ}ou3%D8TxQQfiErfUB}k3)%QUmjgT-8}hn;ex+w?wirR>+r
z4LdQv<NRwOM)pX3jw|ZS4)O8*JM>koCkP&PlHNkmjG%bB1-&x<lW;R4>8B}r>M^wR
zjvT%X#SA7aoqjcxv1#c&dwHv#QnG>z%UhpJtlJGFT)Iko!E<krz(4mbbKxL^hXRa7
zPl*FKog+BVTHd*Q>$Va`@?G!Gz$VznN0D-QB1}M2;_PC;$4mx#%s+c?GFwiv)_*^g
z*Yw^Vjq%;j-DJryylbaP-&F$gT%j%J`=!5v*0m+N!NFv0T&@n*j`!~qTj^Z6v^0Ed
zzViEG6i1jxXpL|ZG;`<8o-(zfXcS(p@boQ^;!3|pU7#=B;7&Tz*D*hRsf;m->_|wt
z+@@l6Dco*h?`g_B`qV(gAt-;m@DiHETK&0>Spxj&o|j3q$!_%4<(Ed946qd7W5jCC
z6NUhFQm$Cqf@pc6q&YV#m8XIerG_`bonwJ_7Csx6N9ae(_5@FFGat(if0n6m22hD5
zo7}mv#rCa-VQaC=mP%bR^nM`H`O<3ttE-JzION8-i!+2_Rc~O@lh{cz=O(2rUFO-U
zOO2QDSubU4?c03UYj;({3{D6C4sKZe$0oJAXJ+kWqGOb+WjL}(TNM57uU(~u#Ah?>
z(Pj_lsDe>ceU-r%{*XHRwTb+P`=#U=R}B8!7Qz^2hY25G8GUseM$62BxTzWC_SwY6
z$8X3|BO05&1kiYS)?Jwo|5^c~H@zL{l0bg?Y#;U9s<>`L=Z7cpiBsN$S?_Iz=a_1X
z{-h}P`&9w57$4`bY?1U=+DQqMBjCjgdjt>A@F7T;%ID$cUAKtHcrj7Ec!E_jLuYC~
z4*}%e#G!@M@f%uYm1h#~$9#1lN$({=>Q(+J(Td3xgV0u`HyGM?&uRTeT^=iJDM|Jn
zf%V6#khmItZrC|kcC#SGBi0g`P#rd6oe|0~zCgb{K}c>&-2v(v7)=kN(w+ongKt`k
z&A!aG(z>8E(VH$ek7>$>)Tl-k1;i!Xrc*oH;j<};rajfWSIgm2uOD9{3WiVq=+u?F
zaANwk;Ka5wlJ_}%M`Br;{LSqv!NQxbcs9cgY4jaoU1?cfJkc`WB;ZBjhN+TYqp5nI
z`MhgDoiyjqXj4X2qg}f+SH|%NE0<_jYcBtU8zN7-<RvJVcx-Hau8dE*B7frCx%b_2
zzoo_={sm7enVOUHss8<+Vg!8>YjndR?l?pZf;0`*Q5qQ-U^ypg&UY?y{tc)@(_%@~
z#tBB^JQ5Rl$(+45p$gH;<z!}L=_B8>Nk=ixzdCR6yjy<kTy~aQ>8C4-g9lDSd;<B9
z$Ty-2uiVWm;~9>yO7Akwh}D8#ncgl<T7DFmZYF5QO7-d!`Rom<{`ErrlC$?omnyR$
zdbEjW`835WMc17p=+(A9s=5MhQsqa=M!eyQ4l}KT_vmdT>A`Q8lvjU+f&VOZ&GdR+
zRV!;_YBOQcg*#<L*8%)5COWXj5BGEkN;>s)f5-o$>1$5(V{1-y*0hZcwsTdP!|21y
z6L7}JjUC%R?zT?SR7Uwa<{wS_PhYLS$wAJjFq2Fp;Q|+x{1ox8DdPwF<K?&K(<WHs
z<qJ!v>@_Ft92vju$IDxN-F5+R4-Qhsz<q8B&sXcaIKb8CxCE~#`NDJ0Fkj&Mz$$Pl
z6njT=!NX0iaO!KCg}D{*NDSbrjK-iy*_8d!qCNkK;>XJ15BwCe635He8O{0YfuA3{
zS+s#0=YSipad&8L4eO`uS8`^~`F%_BA4SH*eH<2Vx3A<2dCZ5Mnu18)^HU58P{c<)
zH2s4u0KfZ>zGU2;w7);R3#Wv;rtITxg>M%CdN$*ag3XnrNJVyh)i8F_c79kCP618I
zZmPiRDHQ_X!3o<rQ}+Dx;GT1)=d2Uq1bNworoH>u_t?(-6u0DqJmbBR>ikXXV_B2Y
zl54%NES*TI`LEXov^<^b%l7>8@=t2yl8lc#yIcRFyD}^Ty7snX9@}k31G7^GjYw#K
zx8#1X4md#tcoR(LR`{|a{qRSH)-n7&bKyr!jB*GR0FXz$*2Ek|#pr^gD`&j$oduyi
znqt}rAF0(>qw<AdLGNYtpn0u1u!@CWr8eMNKIO3|%q2N{Te|*-4^SO3tm12MlLF=i
zyIo779kii!HSK%b^|O=C63~$|ySr^>K((4kiTM2{@Uv}5oWixwErV$|n)oOSPB`?h
zrH4*r9qJExlS2DE@PJhr|KFNGxH0pKg6H}@Dx1STZ7M5!={5;p2boQO!v*gNN7*H`
zG^Tzgygt%oN#1TUBjkgbNn*#%<5%l0A*}DCKQcwAii2<Mz^;717xY)VKY+g!1`B24
zXqLdfi=VI-;c1q{mC)$ycD0^on`)Muv1_~5P*+XQ@t%>eEyP)x+6LAb4?bWRE!^9B
zH=wF{aFsHemh$m_#mgfE9a?9>`tmRO4k&3-OJ<4yY${i{=5jTWQqG##D^99Yd4XPy
zyjFWs7(-qB7*zD+J<}=EIR$URCH|{&z$5r^2DD+ztA|YFlWte+3EOJa#iR1Re~Hnu
z%6%(f>+&(%K~zxAYt5K(P_^_4Pb4`giq`5Q>4v)`XMhOM<;Hzh8%PQ((2B|*eNea0
zdwi_w)L6RXaDOi+!c&s}vrF-Q`EYIyUy|mwEfBG_34YGocC<+DgEd0FCy^9YqRNtm
zK}B#$O^X{MO5Rt+0r4FExU`7d=5!%f#JTOR_yRO<o1|0`TVUUun|;c<e8#{9@ernB
z*!8pz{qCZ1S508b7;`1}GxuA#B%ieBe~Da;x<j1x5KA1&)}2^^ksMcl8wC(?r5tfo
zG-97S$F{Mpk;P#otT@(3W8rZn-ezfEG}T68to4IW3KDh;4jRuo$>K<OWFI7d@EyXO
zDf|po<t0v~M%{uO43RkBrlX}HMHY&#(b#s}mKOG}s&uz03ZI#!;B065KI}~Y<=p7N
zz99mWdI>~C(XZkxAYNKrkQS(oAj!d^LU{)(z4XWzX+<)&&Ne~z^~Be2qT6ErX-1}h
zUuz3(u&?HC;$gvz#rBEQfcRmgZ8)37$z@D(1!nmqTkVEN*KL6C4Mjl@KQR6Dj%C|R
zrmn%4Gweu!GF#ds*k9AWu%F=+xKNophKZMRy`J;XY;Ay5P(^Xe=dJB7Lsh@SeuMj;
zJ+C%cKa1wTe3Q?gO&h>tFbDAK7h>Yqc*uy?h2xQDy5Psxv3AKwKPxLE<D?b}g3(s0
z;zzm#_nyD}l{lS2n8djQi2js6lw>@9H?9#gK^S@hMzI&V?ox6EMT=8|)bt>s!|_&~
zJ|x2>*8|cUYO`!TvBQoD>cf$eK5H(I3)_O<)=|_GmgIF4dPx%tZ(JAwX>G@zuuBTJ
za!YZ8Hk{*Ki<8pQmkv%V#y^VIt5D{Iif<G`bsR~<&S}wSGj3~f`kw)4Q)Xo(gFjd0
zIQ#q}n_P1V8`k5N*;!)o$^cx^x}9Y6FSnR16vm_S{Nz~i?kT)A-e3T3S~j9Wc+&5T
z(&iWIWYb><py6~|;^ESD;^BycQZnkoq)~;qMr-y?NWi>-_r{2}e3S8>!a;EvG_%1M
zA6M{>_sh(-b|RK5hu!XM@r^z@;yFfO%hKj_?1L>``3O@-j1|9AANX-q7-7+(BM%Rv
zDr)ri>uc_tk&ECptM?dOtu%ZjybXJz&@s~#j4ZfL`tHerb<ALntw15^@TX{=6=_4G
zjCi`=6daP8uIQ3Rg_UI+mk1dz;Lqr`;X>JC0@yqR!iQLc8h9y$f0G4ci8Qq%Um8(^
z@~-Yb#E=qX#>sVz%P@!>*HSAxL?2B28NP+$UGf8<+<I$_BIyp~)_qdQZWU|R+`$kq
z6;e%3emxVMdhUC*JzQVJfOinURiOuvp7LpP&!*F0q$^%Fu)!Q`Er0w2nfJwr`fxiL
zea&NF{XdPy_lfD%@su1%qF#s<*sW}YiN15*c$X5G7TGEcs(%wbGMrZSn8uDTL{9$c
znC!rY17(l@|4K;#HOL}8DRdssjQ97W7)TnmM?~=}-N`Qvv=iBVK_5cyn?@$l+Ky<K
zcXQILqx0b-1#E)^=*X?<*O~*6dG4v-V7~3DPB@(RpTXqZ61sO|Ngxr1Q~b3=5B5)_
zV%8fLE($Y!S>f@RH>fc^X)&d4heRegN8h$hK2L|&A8#Gl6_$k~(W!*DIC3C~qjOjU
z>}Hm!dA6lgv3HaG(SAPF03?}L7!=7Mv-662`;?xtVY?diU$S#KFH=HE!y_sG5%VHU
zBFqRjCXKh4I?3?y_2=?B02?3nlH|Hh0>JO2=_XC7!l{BG9nyn^4gJ9kXuBPMPl?NZ
z5Qt-l6cm00-4T*E-26sAG|-d1H6->Dj0nc1`b*}Im70_K`k$ZdEaC!1mr!nb(H3u!
z+qNY`uCweP<vD7QFIk_>J1`r9Vej4eL=uTM%P7VZR`U$sgjPt)EWCN@Uh!fa4;KVQ
zMFTBT+e`QCn)|d8jUa$pmlPNo1s$ZW)qmEx1lRbk*y<)Q;-h=w(L$@|HD{ouDeH7R
zHHq$vcG>Y3AMz30v4h8Y+b{CIK(tM9HiaS2HHg9L;y)aJQuv4rXfH<ULbKxP*-ceJ
zxCmTsar#RLN$D~sBrhSyU)#|3CGS6uJBE2C#&V!Us{pme^~+pBXKrDToFUL>6%xEX
zpVjip!P`^LgxH^<f|eq|=<9Ry3^j!~f@3_xO^xrG_y42KSA_BlFD0)97i21QB#F&8
z&EWK_R|s(4QkO=hRm|ZwWxw;^OfDm0(oH=fGvW^Jkua4zyoOp0B9veX$eu|{7K85(
zI`71N7+@<fJ45BtO;sUXHEcyq&Ar8d;!AW-iHyDekT4+lvi^3UmYZceyCqvWNkczG
zcn;34<otv-tiXLRylKf;v@}QHMh<%3mx(-XmQb@mjFo#P@#Vh&#1g8ICWH6%34l*f
z5Zbc(YwUX)5*0sUA3mO9fW!QAcb~E4_d_UoXSN@)V+mF5Ju<y&f)in&^w9miB>_|)
z3Lh3G5j5WgwI-E6Lo%POazhz<Y@BOQvlY~6K=a;ls}N5I$QnoVu!zZcR(P%P6Xad7
z`?xgh&Q9BTMo6mLH1Zt7Z=vZCcPNaz5L;zrzlqkBo-oW?1fk*^f-ApkB+m<pDEH|u
zU$*KJRSSX-OCjst(pDSejAqfJmK>|}=UMoi63aXlFYs}ALDCs++?3mtR(9X}KhGmf
zD&xg&RN}-Tra=g9dgQPYRAq#AF3Xx;a?4E3r}lFJF&C``X+4_qS{_9$9`m&(>rP6{
zOC5h?t7Q%Pz#EKpL~srat~Ogg(1g>#3(k8i8tx1U_p^W#6O{CsGt`y7lq>RI%RO=3
z96BPic!AX9#_Q`j#0&O3r*!mXThP47+#5^9NQ=u!`{^2nOh$QLJU0CA)mYMAK@Wb+
zO}wy-#yKyHA!w$^m>~Bi5A=i$_}sj1!%kyRMhGZ<5ds1QC^H&pi2m45kQOCt>Gyz`
z8^~aE;TD0@d2Q5^MMN`oy9`t6ZKMq`QIe2gV(U(O?RzS2IVdhIwmd8!oal~Jyx;l7
zJv0BMV=?{Usmy8WrVQ>e?H*A#MDTayr;Z(?uo|l35`;j^lz(msUy`~JAz{nPQ=Pf#
z=dt<{LNl%m5;=vTHELt;R$28bq2~$rv;hm6^c1RF4z|o~*xbRR<tz$^3Rm2c!soPn
z2eR<02e|*np_8K!pejpLApMQboUUIa(($j=BEUGb1tc2WldJL`K;sVPD9kihgjkrN
z^ylCHZv$T^t~zvGOTVa<N?3`^c9D*t*}sFU=}2A(6lo9+ZYdrId3tNZtkq|$*&LeF
zD(c7x>)m6py~VVXF30-KTIT)$4Mi&h!Qta^B_2~A{IL@tfA893^}4n4TTPnnVDN#B
zvjpvndfjflVq{)fjm?v}sz6+@CQhf#)4GOa2745e3)yyI-G}R$T2a?5o)^J?!}A!P
z>N@_L%v^SUmi6u+WW-Jpkk~Qatk=6Ws-4fIX`v4;iH~lL?T8qLw&k|Q$Pz;y4@|B&
zH|P4HF+(j>p$~7Rs4kzEpdw>ce-DSsTM4KXnqwGBimM~fmcg9Mka?&w=}3X77OBHE
zZoMVGpSnULk<$h5ux;4~R$D{tEpcJ|#Z|K4W*6~9|96N+Dgd$@?``rQ^~MkYjDqr>
zV(+1({1GpOmYt777=+kp0p>l~{z@r=S<!8=g2-p#k2+J|&XWc)JyF!i_0s(ID3oOP
z^u9sUrz7r>kFr7{82gUr--yvrn6akmmZW{Y^|?)v%T{cht;}5fhH%9Sc^(i+^$#q5
zD|>qFg8QojHGtCQZ%Qa%ov~RwQs-Nd2y<ATDyrMOV@Oqk<f}y#F}BmpmTC~=Ui<d1
zsYTqJya#i&O4apyvDFq8FcUtQ=#f_&MJgeD3adc1qW`!SbBZA)FFi}6cSRZMKfN9F
z?XJ4+V4Z;8>G_dLQPW1~X}&8x0~Y$>@nzvX!VSbTXo01Rw`?_O=-_MCjXv^>8@yAY
z&^^8$#?Tb*)g^$l*|jS~O-CzxXIm7yad6m<cTaPhwRm0FHDJEnpe~HCd@n^VvCY|d
z#HKADF3g?=?9@+QT){75Os_Xx{}#EUILR084rx0%`g<LHZclnJH?3TE8gv3>a(BE6
zIW0(^lw4e!2htt2oP3F1E*2u&kDDvRBlsIb#Ot*30`;J+>5D+F@k*`mQi&55?$)Z8
z4zQ%O!w<BAPX(}IO=f8m40R)u{f)d279z~8)ahWVy^bfbqiBuhX?|dSQ#MLcDgBd&
zl_TkAv7dpplx%I$mJ~N8mzD~SEE}H0OVwcofnq63bT?xbIy6m5=h-76mzNpi9M-y+
z__sdv*Ij=M5aX!3(oqX$KL^vhC1E{EHs>{2=oX^gQMyX-C0-MHK0#q)uFfmF%-o%_
z4@T*|XB*V)U)!fIwv}<ru3Bms_R=118ANCoQ5!`)>JZQLpI)jD-XkMreaaRzvVr!s
zQvB-b&yHLTN5t`c2bqJveW>Q{G{k#;F*W4POORgJ;me+edWSCxNhwsdnm!>J4>ID_
zgHh1S;nxGomx=6~aX`*1THcrZhHjlyizX{9r5ljLDd_h9Xu|W;eD7^UB5#AV8kd?z
zYu8uO!zQrzI+HM@0PO$lpS%(~9`9u~-%}$4*etRXzaRizulqluX!B6oVC@P1rboDZ
z5cYm<SRBP+r&JWKzlD#;ss;X|r4%u`I}fhN1po-$_`xo%_>9Nl5a(6t%Zo2I?1k&i
zRG+y>_$+KHR}B5+!B|QBgX3QCW-B<0$D4mO8^xmdU)P44lwNu0#B)jvEOaiqrp|f3
zYoQ<GjN3xnqWwI(<NQO}>>N6(*TN!(*z3;Nf@mNT;^gUm4aG2<H`u)u`HRgF3t;(N
zY(iJ!vL$r9T7T1>q+EyOl5cB6%hwO@Raw$(S*3e<avF%~ieAt_db|Sz-mT{?Tp*7E
zib7}e0M6*?`~YtW^j&6S)OQMST6tVVQY@<l@3f4ThNoSLlM#1I-8lqM|3X)KsvY!q
z;@rczT{kZPP19#=`HeP&@Il11Vv#%#ush*phtaUg!X~V|$KU;*$WPZT-ze{!|G66v
zFH<eTM*IYfbwqVz;YgTYOsfl^Vl(9=@+lB#gfSI^=&z+f-iI^lMl*=N<2nUGbG=&&
z!|o+`Jp+lx)x3`)jd{p*>RtJ~MW1-U#SP1~(-);1`d=rM75w|QgNBu%*QYi+>PK;T
z^xfPNCpFdbu3v%~^M^%a80G=5GeP!9*o3gcy594wo`r6byxF;ZhvY5RCzN!)eoP(o
zr`Q;0%X?3T0v`r6m&abDg;K??3JkLSCtC<fj4Q*F#~%Z8_z&7>jhK8G2N5%^Tb^B=
z>w7MeBzs2ZRawZ_jj4(`01#^8n%x!ckrvYWBO5zpwktjRGW2`=xmswA|B5+v{Dz)$
zK@jlu1R~&|rwJZG$|X^$N-nG}RLNl=AeKUC;v0~XZsqW8WZ<M+b;d9KM>Xp=-%kW^
z7IKMkoQfDR3zz;P;kLX7msP(?P&@#UflOkv(@f;&QPf92(r&KY*|9kGUj0pj2QzxZ
zni-YW{fg}`lt(6h%;p^tL*ZuLxP9|WcLYIvjtBP0&00eL6YnpzDn>VSnbW_VG?lc8
zabk(!%d~BCF5K?8^ZS9bxz0k-GiPeV1|H{<MvUsCcA`!mV*4rxZx4b&MN)RpsLtK8
z<g-Vtooyhk)78<z1P=@627^)AZmulKE-IHe37B7dvpd6yw{&kZ%UFd7C#9azOCimz
zRVsz*fJ<ACbDkkQh|jtA#tsa5`Pa^@OGisbov<!EkV!5mX{?rwQW<Uhx55FrCLE0*
zi_jgvmTHRH(4qvqmA)60TvI|HP-Yc?cg1xUm}T=OA~=-67b^4hU3c{m!6wm&@BN!5
zMhW&NgmHlZ%00;ziQN5^&lO~SN(NYMPqv~)6J8^ax0)O5EuSJ33U8ORQ-rSJEr>T6
zkw0T|q*0&H+n#@>`{+=hfx1z_Z#~>sNL9Lv7deRoh{oe-n|k$Z6NZgi5;E{6!3o75
z(Ykq=7L01CKtC9_2hlRgtxlO2Cv=JwCXXW(*~cDk&4CqNpU(gMPS^#hnwA$CNR)wo
z$W53KCGUB5h-HwBFb4Kyv3HH_%&GK%fSA9X_@+j^jkbN;62+K}L#ihtuNNmrp!R{<
zkN0daphR1_!WQ3{BLq=I?`8y}EZe1dk^|+Aa*DG*lNC;>wKfaa#san}OSoc>$I#jA
z3akH8h^$2_$vKfEX15PtrR9%Q{E{o$LgOEwjfH_Kjje=`;W@su)wV7%bsVpt_dvDb
z+NUiNLMa8Qy)shi=1WmO-)nv9rXaCZSDNa#w{b8DO_F#>b8a}Zalusp=`xS@mqMxI
zobda)c#9+=It|7}(X{05ZPrd&pJ#o!K^L!F;pC?Xf*Bfr3g=!YbScb$>Tsu9JK-~i
zlhINahEjc+qwdNj$EwOtoGD);b2rp~1e4mx8DvWZ@KLqU0)`YLJKZF{I}le2^`)lw
z*zPyt-b=G`Py&kjgq>&xFS^6IqjkV;;^OIFUJr~Wnz=9C6a#ms=ih(M<Tf;^H`j8V
zNp}U0T$s+Yn#;VVsV2GNOXA$=A8;(aUOuwl6zfXFu<pj}UP3t*%gP*IBy2v%Q---g
zDB#iA^)J2NEOYeih0(S`<N*!_gu+F8O4ibA|5+T{qv<alyo+{w*qXFZx$hCyoDJa1
zegq&};!~GB)cF&mE$$zk#v?g)KrdNWSU^1dC(tRy`{Kg#sE%)Ai{DDhxeZU$>Agb}
z{;!+j+lkX5_PHqn$F@}2%R+b{RPe{h9a;-05n;#Mzl&S`oOKS0ErZw3u<Z58W9HR9
z;?@7h0!Zo|!wps%htxQry}Fw3oz_xx?Rr>ruc(9$*G)Y?M8$a5)kikHonl*`{f(Yb
z!1X^X<X;D&_371k^Nw`opWV#)_e}x?JfpwW_5r)BSD7cM62+Betuiaa3w7b>+t4Oe
zq2}PYL(C0^vKRf_V(9(|cio8j$pDFpnpzf8_l1Fz#=Urh9nyF5?dO>kF?vA#9V1OW
zf<(_@KMtW8Ay^|lNv|{th!-k&35@rfGVeJnFudKc=RAYt&h1vNZ^AVXj7Vnt(Y>Kj
z;~+2oh)k2{2Au-3Fy(mBe)qhU=;!gPvHQiUsCDF~;<oq>_406;6>Bx(Hy$>M>I%Ds
zm=tJkrU(V#@B=vJYq-I2=Ex|8V&buR9~#d~d=AV^AaRQy<Sj2$`5o5{^9&LTO+239
zDr26#rt?K>%=|gd6C||H4>|~P4)7pyPA+IpPUlea+-Y0H%n;j<9Iqrpc9f~_oPXR%
zNLUGzvI|RXl|q>#8Q{TaWb_@Wi`Rsk#d}Qt6<z6Q4TgBi4KIkakonkwk~WjP>_Wr^
zKt}sA*L7S_In8XVw1Q~E1vRed>TGtagEzC7RYV+t8HcP~U;ZYx{FpJ5L99RKMNB<y
zIcct{%XN_yA&+VKd53(5c$PI7=$(n${cW%LXm~a&Vg8NKU%|qoue2YLjgua%H_!k#
zPrCCKHTOHaG`kC<%$|4we6?NA7t5fJM^6wZBz}_Oz47NIB)Xois@f6yWrk|3?vWw7
zpVK^R;bvwZG##-%7bksl%_5z$^D`F~dLjFSZA~ggfBzH||0j*(ADL9>6E&#AJ~SgD
zJid-n6DJApKkP8%XCuQ!ks-V@%_@L<1vjL^jno+}<kj4z44@Im<Dl(HzG)kDT2(vT
z5Q0U^Fi6^QcGP1_y1e>O=JHBYvD78oJvn^6d%Qa{R#fti|D`Sde(Fyj+l+Ypdop<V
z<ew!#SMrSpr22eN><P8tZHbW3drdtvykYgPcpW}zr;kOy$+AO-5fkKk1W%c!K!8{G
zTdQ9TH2GnRUxCxCg*+h#(_fG9*pAwElfoW+*W9zO!R=1g0(bywtz>M}v^N8RtZ&0<
z<hg(dHJ43O?%ALG=M0%~mSew0rhIK`^$LI3cSUMBf+{^vHQ5%^VM}xcH@verp0#Si
zm-a>6{B|RFAbD|X>v%AdX|8uRm2RFh>iO>$vEYzD*52Q@f~lH`;5lrv2f=jYhXp=E
znPq=(Wl{tJ>D?EP(JPfjx8dYhE8<CUalwjQh#%3LptVB%5E^yld7*(*mgOj0VWDgu
z#Ki$JDcF@%h)SJy=wQ)`nOS9+alRkwS^HpMm2=#^C%+ER{<l6dFw-*83nI>+_$*4+
zL!wIxscfZpd?)g=xhH$;{W;Fc)ZgEIu!9E+$OeTY&kC(o`te*SP)-oDz&Z*FqdLs}
z%a{FDn9nv~-NcsQtmjh;U&71<*>HprPD}5MU^bH%NL5bYRPX)2Po8?;=W!|DNhwOo
z2L}Go`GT`s!k5q+NZYC4|4UW7c6mFlAWMF^Vqo#HJ6Pi6!z-&JbDCRi6v?*&i(H*4
z3v$ZcUGY5n84;(?`b+2ug$D)Ex&jf~cht_%<|X?YoUb-=CNWg+4eN!Ky}b9CLhHea
zzdzF0l&Yhi$10jEq~h=*J)4;iIm!21badrWEVObNEH$|CCwZJwU5%T;sEnsd9FXpq
zTqAfSh5V9tien|D{2W>tN^q_a171h{jPRJD`JSJi3sbQ--@kEZa^5T08;t^2qQ%Tb
zNpQLqqjLMM=<C)FTh~_ya}()dzKDyA<sZnqQt6&xYeHm&G2k)}0$ew8Ud2jFR0hAv
znonqHv0ry4K1=A7rkb|R{-(>J^vbS%$jX&@p->BzW+{5L6GXIMA4qAV#uX*!>_Hl*
zu?+%2tl*AuHAq?0FP>WG#z*$u{X=b8q?;>6y9O)jvFG;r%UoYH-{-@;G!J`t-xdFp
z`uE=^p~rf|F!8Yh69VjAG1z%|^qqf{H4$V*geM{VD`1VazkbEVsLK~I<4SNMxrs&p
zZ?EXcDo$dca(GdaJOVkX3$X34Q>LH-J>&edV|1MqVnjE3DFhVgo<xs``kT(Xe{xZv
zhrdQxTRLov&_H_@RSyS@wXaqK&m^uaea^96?FT%f8L~3}Rz@hZn3#lU)rf7rJ>m!{
z6kF+ZscZ<yy@mrDnba*)yI6pESo2sT!)(99DkyrC%Id+Ey4afy;xVEUEw%O7#)f3Z
z`Ya#D!ujeJL{19?VsD%DOy#q&w`OV=ifb%t(2zpwFPNukjHob@1|=4Dq`%Py7jASz
z#c)ILG?!Z(1_Zg0A{)iZ$>c2*yjc+Zlk(jQWQ2u&i;($H4rBDeikRLJdW*GjZ=PUf
z3%NPmrwQvBy+sST0k^(%V7KHrSv1!Shp|xtgjM{HFz>rhJU6~a9Cgg=z0c0iv`e<|
z?2y%AZ$hnpF8&K$M4(3Q5@lL1kR11rg@!1?i;MCqs_@%OOI*m<q`&i0-0r_3Y9LSy
z>{c4Mds~(^AtVcZpOK3A5!pzZ7$Pim&Joti*wTU?vv$7`z{E_}56sWcxtU=Ff?>}m
zQPBS=lYRD|YQe?=kMA2n7=>ANUqOz%0h3cLPjCT7#jn9#3-1dwHIeu3nxO{Jcr#NS
z4;J!|rz8Mn+=<FsrcLrlcewPIZ#1bT<piD?LlrDL#i+cjj9CtqAXC*ypp;)0#pcej
z!CninTJ4gT2(3XFa~5T$l`9s5`oOrQqKb)NPg;sB$Efm1Fj80J=X@k-|CHjF4n@5;
z0|9B}Mfnx-u38n~*u}9(R~A)->Nf*j7y<KS>m<!D6WES}$}E-PoZ{HLH$mZ9+`fS)
z0y}*AVO?;12QkjHBmO=umhg{YKS4uNx^cO;S)tN%A5jfRg=xenEy&nzmxL3Q8mD8B
zKv%r(5Pg~Cvk9-3L}vg0dg85E^-o7#oeK=n+j1`<Eu=xm?ySx(51`>Gf^OxJTh?Jx
zQBZ?M#=$!5m%As^tDfIsY!p2XW#7P-%@n^Rg=w4lK5*&S?){p+{TY6wb;`|R_QA?~
zgHI&5a(Av9IarGOK*#fam<PVXD)yF?MXAtwjIumpXaz92EwE|eM39fvPbzWLN=r@D
z3)CK}_0u#=!UME0>Feoec(iw|V+{&k+zbjJ99QF4*fs+L@Gs-_0OY3?fGY-k;m;-S
z1gu8w{F5dT@&bo-fO#8f1rNqRAI7%|@*anBfJPyJ#*eSaW4TPmpXNdu<GV(t_n}^B
zWr^7T6?z953kUltyQ}TTNYQn&yATfFr6-Sn%6a_hfarMu0yXl8tdp4&LM)bx(Tb6b
zA}?aP*TohU^ddYi9Z0(MY&wxYiWLUteiFm7pzHsBY~*k+=?|)LjC+;(Yn3wvNFSl6
z@ec$X=rpLz#clBGs1esu;=D6Aag3|NbR;`JecU=>ks@gUI`YX^k~W)0x~ZvO0s#f(
zoNArvXDSM}fXE?*R-B91O5XSd(d*z^*kJhf8cmjLD(W0=#1@={(d3af)*Wlt%?O_U
z((uy*=;Hgr=yuzlE#FizN{i5ioZudJ8cmX*VJD16DzQjFoD22+KASfRt>e`kc(@fe
z#Ixao@MODNC-TQ{L?v~r6RR=aeehLdQ}|X8jkjqgcNBTDz#}qNPQ*2^dQ;<oe(Q5b
z?128bCI1)Xw%YqlZ7Lfo5r1sD=U~QlBYpVQ>%6)8sz<y97~I3)#01lr^gWSl`3ZOx
z-tHPVJ95Fv(-}KGE4oR}_D`*et4JKjcjMEFldA`WTPWsu2fv5>@5!8zP8~O#ry+dJ
zZ{Npqts&hg*L5(U@5+y29l6ArtKA@aN+ICVJ&2A*wgW@-#iPJ_J<rBjvF5$QS`!J{
z993dARlyT5wYWOFGj^RN3|+pknQ3B3JI(Fe0Dhwg^Yn$HKSj&f?{ZDz4ipL(aSiYr
za}YZYO(#mtj^Yq$uL?Yjn=Zu=n~^Mdo4h~c0h*5o35(Hlxy+>}=#$Q?ZjXuBIQ^9k
zy?-^EKk8299hV3IMY%y}6x$vQjNA?f{|FV!7X${$yPKg0!0UHWaR)odaufXXx4+!h
zsql8jnr>&k(tCg(f-Cm1zAsBt7c6FL?f{=+ah9x&v)Pb|(G#^S0bF3yE{L<q><_J^
zKl%c5lX~3Un0bw#HgxK>7}gi+Se7XhK<*u~NpobUMW;z>1|fKf8Sqh;HcZdhoIwCx
zcp7zhEl5wDFqtI$VQdjbYm=;XoV{Pc?$>*P^W7KY0TQbvBGw;$_ID0}u6lL@0ysPd
zo0{N>&&8U4HLy&NZweF@*2vAWx^e`E@6m%pI&2rw8fRAVjpgPEyK$@)03o%~6!{Jl
z3e7H$9FU>g2oGj#8+uJFC3X<8Jxp~<wvG$Z#GBENI}e-+@7@wV@|+ojwt6>17d(DQ
zIY;$lU(B(RMP-+?V4Zl*RMwJUX!xxp>b`&T$?^)X^^<cMK#9v%ka;`KO76DFwB{?u
z7Sjs4SOYuR#bE;j;#5Q$pjOH{%!p{h@}Jkh&2o&>kjc>duf8Om_u)>$wVJ1s$<<F!
zY~mNf8w80v6TBt_#ZNx0gLi(5UKwM@>BVdOI9}pHvYHQFu&#}TA+=xoi-sVDzrv)o
zGZ%pr|Mbdb6yeSLKsJ?QPi9<&w5xChYl)4l=U6Kh*g6SBoDNpwNzt^$6*~&td*!L4
zx@m8BPZK@ToY_mxU?8_96ixxjxuEVL4)3f_fX%g{b&BH-p`i$Wcz#?NVg$}83soOb
zp&qL?IPiA9K_Kyt6R0&$F+At;e(XO*g#G1D7oWMP(h9F%6|yPJJXjCBq+TJoAWvBz
zDvKpp;ZlRj=~L<?fw#Vz*v`-ZsmiL+PmN!_swS<)jZ}~?3IT<~FVb^PEi_Z~r>;f}
zZJoqAiZ`yY_fF~G^BZqg)58UY&=v+oatVSGj&EJk-<4Xv(9Fqsig}3$Ni0rXWkP)-
z7=&?rX5I0B<iIO|M4<n9CN%-z1_re}&7a%2clx+kAFx)ZB<nHdU0HNwi0gpFByC9I
z@?D#Ger30`<bRP5v9Z*@({6g8wu!%IOM}4mW<ViN6`{s@9|XEXJxkz`q#$q06Ftw4
zJM9cB_^q3dyKC#Rq7Fk1GB)ABtc>?0PLMXjkdn*!vECe@F8emP&8l=Y0L@@%`^m(>
z;ojlTTV{GskbR<aRq$;O`69Wv?}3k}@~gNF^*!(ZW!;FBa<h5E56Hf)z6HdUaq7ox
zzgYLe`Em~!zl?VfWEFo-3o?FO$xki$8-6<_yCGQc2$V}msQl^cm`OW^KqoutAA>7`
zoKX=J$hYwj@tS`g_lHg(9U>KKS}z|=t>K1G;ayA$!aLCnl0UL6lg8EEp0|-TE92}a
z*4FGVs()ddKE6K9euF7OYr3L(Ym)%jSU&1)HO7w;Ol3v_<8LQkFG#EsLrl>8d9;w#
zWQF4ibYIEdS#DT-MsqqTe#llDmIDaKsa+PlW#FvfZOq3-9v(+-SZhVt@42?ao#hHz
z=sfjQod>>V+oa{lD_;ZbyAPu#2_@fPb!@qr5^gZ^w+}kY@tW4o%bmya&(Z-u@M2v{
zUL7t`*ieqHZoUXHcM)Q!*tDg(DR$g-V()4(w|2aAnC_rfGyD<3c$4}xY#lH&CSQw(
zi<l-`aS!E(5Om4i_i+LyK?)YZA*6oye94=ovM~ch<Yt5&q#T?Ty?g3CW72u{&TkDz
zs+;y@Lp~&H`(sl#HIDTnfRs%Q@O-GN1QNRtr7k54FEr;otRUmG3>mI}P=}IhCEnB|
zDivF!4_hi4`+IO@Q^IX*WEvI?yY^!KO6wl1FK@m-^8PAS(6%h^{exhIRSnt~<!ZiN
z0xozp#}Ot<`D-`%sAc_^b_5t-1z=pyUWR?Dd?(6ixbmB}P}c5iWP-oazIQaWyv~`f
zf+?(LrYR5!nvc{~y4oo0m+qje0?|K%p%X=SZOzcCfYkD>pG)Mc-CUJ_;P=pq6`$G<
z^Oswo4VI$EcVp>OCc|&ds0m|Bl&?=6?pWX3{M&lXd!&|0wCafbm<MDT@ty7dIV)0H
ztEzh_D+AC4$|)XBipvgIxwD~G#((CU;;jE`mwC#GKX*=C!guF?@uBX#<co+XO2ELq
zrQ{RCFRy_f>LsWdE+|QJwG%8Ls`PN<X@S?ESuUz8Cd5K!l}K3iO_D0+_E^pTxuq0o
z;yN$~Rr2U@9iG>4oj>%|xYEU3r2u?W(K3^@|Jc^6c#EiET>8gJC%;56fo;BvWmCtq
ztL<wv_O23;*3fQULcfvGCO-FDndqKcJid(uN)4{uq9r^7J|)n^T@P}AW=DrjPd-^q
z2ZtP7kV>>*5^nBp{id67_8S@-+85MCp3U{jbZ-`*|4@2uI$o*708XUCXii$;?%Xu!
zEaaoy1vkSG!S<$KeHKRIRCSTN-b)0*1v=sM6+Mr3UBS7ekcR|I+l5arR1pmnlFGu(
zvY}|28Wtn@mnc_TF<UmX4^yOr^mg*Zq)0Wd7YDGfK3BRgi<NmlxAl`R{^P>A3b<JM
zR&U=rhkgUmg3663eG>vqBlp`=m4&tozoV14URLs%R!YD^o@nMcom9VH&a!eNof2kC
zX!V`mdg%}@<oaCZC{l{QZBU=#-x!My_MtwMYoGyR5rxzg#O-Y-S6QDs{-OR0^xcsw
z99oq6tVbEO%*C^1QGU05VBKi#giBEs69lLJg^iGxrJZQl=U@6|dN}@L{44j7n)9Nt
zuXsm(31hzQdiMZ%U4*<DX@k}AT|WPnMY`!z)=Bm5joRGd`Xe8iP1O;}Wd~mpkAXnz
z6#9)4A+)a^sxNy-T_mv;i>a%d(qQ@$U*G_ZJd~w&ZUd4bL1o3ZCOc|EJUFQs&#fVW
z!K5O*#@V1#O;wfCjw!L~xuh2t84snAy6*Sg^_*})1Qfo42%*A+Yb#HQ;j-Jyw$2GX
zaDOmUE#g4~DyE`D9AauY81S4J#WhmV;_=V-pt(MMRxfVW)gb34WJ$ZY+^|2_@iIam
zG=3c?$o?bfq7$2HES>r_JcsloHbi&3<UBQ;a+YD%iFvaAKwM!n>a9$Dux@OKYa`az
z7$Tnj-d2KtU!HN1#jPOP=0C6>6x`<MWo!FYO*UbLX{*)C67zkg7n`VEUdpC_Xs_6c
z_bT?*G8Dt68&7C!o@_Ytv36N5J!3Z}VXtj(-m0VgbUU7b3Y14Yy*epto0AqyixmK~
z-XGE}&YT#tw>mQ1fQOJOzD)X)K&We&b6<Y4<VOeSkaWMX#YBAgHGK84XFEubXW#|c
z|F5cNAFRtzpxF_+th|K1|6s(wF9;B-Bu6kJ52&$zhyW}{j?_(MeNd=}4i_2GR0RrX
z=<Ul7u#**?k%_|GhuLIjaiPq2SX&(N)7hWTka-8H_dT^(eW^H!o804QF|rbKIYMY0
zx&OjwZl<j7vu<X_X3Jj!iO*D0lx?S^ZP;wML@tzsD0(E77-9{W!|190Yp{@}l!J&~
z?z|>G=4cBwMqc%F?xf|T(Vd>mO%J8k6m?%42>wFk#vY0*>-ARhzslX#!eoOo4$Wmt
zuCw(U*Vj$wcyndJv?wN6PvIZ8gBjR_Dq!d9MGnY`+<puwQ^XK#wz>cHrRbzE@PQEL
z-VxU-p#@9fLY}ybJ_d$IL8DL>&Z**emK-QrQqxXlS887Y8;SAPAg{9ETs)Dv&IGOH
zFAd~@h;w5P9J2e&pMfxz7x=uuGm}t8v~ybTiufl*hYy%)xuyr%WG4k!wL`lKq^*f{
z#Y$)_G+GZ|GNbE7mN5;G(WJZ43YBaPu1c3G9Qc15AN}juZ=nWZ6>@}lh^<7WrscL~
zN6DC!_gvE4&Z+4%z67G5`C2f}&bv$4R`d@{VLg$FY!8=3X0mt*g>B0bAkA64PFd1J
zp3(GQt2A=ay<e=b2h%3-r?vjhbG(o|Sf+Vh7C=SV?Q9os!r#$N(w+VM(h)o8DdPU*
zLz!9V&n?h{fWMbQ(DGr2lSWoxE)kfHLFz1<O$NZCXk+R@q6Ewh0BoQHZd{D|1+2e5
zBMw%1esrU0;=wln86eL&CW3ZKJ5XkEx_P=iXm)g89XKN|7!ng)8H-}<FYuGLx)gqL
z(Ob2jzVIS${8o6{Ra&6ew##z2T+gw^Qcx}A^CER~B7QROZuWFn>ToJQo<F`{WXSTF
z!5W+;48gF8vt~<qYyCb+j_5Nz&H%20C{v1DxE3*mt|(zDYU-~<?_THT+n}J}fLt#>
zznj(?fz=tKh23XAi5i33=SnZrL*E;}lSBXDnp4s{+F=Z3jf)j#ulxYewg^jfS8v-)
z$E)Q>`<Gi+1CMBtF*6R0tt_+YZiC^ofGyGB4az7~5Pt<8&tlXKQeVNr41exPt~+`^
zr_eluU(Ah1vMy6<nt6)5K-{cecoqpflZf;a#FWOiHSx~sB_4Co!~WC6YE8e~)W`(y
zlJ1N`@+E`tZ9()p-2>Oe4XvDJo<r2ML{baR)I#gR?gE<qAmk}lu4&pMhNMTIpr_e|
zCm<>C^R8ey*1yybG%8Cp93KOUjTE4r&X?c%L{{ZR`I@VCkbJN&<F_B^3%nPR7vF_k
z*3eCVky39Xg@f$yuR*a#D)92TAJ@tw+#Xoc2S`=M#6h3MzqR=L)10weDEI~MJb!EX
zV)k#V%fSc9oW7pUEDi=w8E3c~pzmzn<2rZh#Vhshh-DbJYq_<hB1Q?EXQb|~>P;^C
z5#4mWE%LxRx*VYvBRI6cYvN6>dh;J^#mAlL5%<6B;Qn#@QJ@O(`15Hmwh=fL9Ls-n
z_oHRoRQD)o5{#SI#b5{vEsS;yg--7rdV`bIm&T0b4s5!raO{+e|8W<sfTZ7l?{QHM
z$QHC;e!0zzZX0wu)8A0tXp^&5G4+3{VY%5F7fgU{6x@7-z&1>yrKhdz#J$;T6_$`H
z7aO}rVkAEEJ?6l(zmBYDlIh@R_5AurI9LH7CQkFl`7vZVyh3L}zk~{Dt3R$b8KnQt
zHXg3U`o}p!qZmU%D5M?9ioLqy%gHSHi1r*nyC7ovR*Vm%&g}fw(}UY}u~x$oB;ET5
z{Ud~ScNOJG`KgXlsFctr0_LZ7svviXHfF0>{BK?Lr_5)da{3)ugUsK0_%o**tVcjO
zXpJE|`rNe7Z04|}YrOQQg~m8+V<ePCN2<XnOBPvTE=#1_t#5rM#VV#trLgRP;U&4R
zvG+?1-LYt3z{K}xtV?QesceGBhXF9wKbSI&im~ceJF}a*+EQH03D})~|Aa^hklM=I
znaA5*%q=_<V@zh8ZA}Kmg)zUrC)8uS+*sbUpXkSpb9v>0E>4Q9->u+}DBV_UekX35
z3<eadRF>;^2@>OvRR26V%P$yS6!>0lXF?Z<e0sDWV{`c>N_Kf4t|L6Y@Z;i^+?C9W
z7m)2uRwCrRyKa4iJ26m5jKhLMPLtGspXxDHq^l7Q4!5(zkz>R8Z{Pg%_t9Q~b2(&j
z;AP35_QR9o^hdO!odiyqw6?mCIh3>7PzfT8s~+B^T7KSTE;q^~S}21^4n!Z%;DGE6
zgh<6DAxBC}F`HT)f53B?CkwLT=4^AP>A=6_W$;>#t6NOXj2iiVoXtJ^nVKc-To+;a
zy-kx*N)cP7oMZ0cEBhC+<W!;Rm$wZlYdN0Ehplnuq4P>PnMLmdBDd6;oB51LdAmU&
zk+(D(8b4^-GVRaZrJsAtXIZ;L<r=DfOtgBi+_%u@oPLqheaN6ePN2UjO#e3_CsyQd
zD-nd$0aJ`W;G8wyb3(wg5qSEl_$d%A*{P0giu;lHfIWystyMP$mPAX0!VDY^&Ll2)
zttQ}4?MgC*@wa^+-eFhBc(AT4*E0@R&EkX1>fF0>GFGf*bpHT%_JGb1Eo%HCwJZLk
z^}-R$F<JNpLm5ofIt%<E5$g{JVb&%3YdIpA7`Pslc3;{`?D!J}4Szn3FS_8+K<3EN
z2+kH5z5&&l?)q(zcH0QF@07?5Mve#6uyB1|USzdqFKAiN>MJ;8+gOq8bosn{XVto%
z(Me#?b<~5isTqrv(3!L5W1RW)*o9dqu}>c3K|+vAK8SZuQGWkw)wg0KvhRAR0%h=&
z3G?Jtakpsm`F8ujAk%oc8W(dD$kPMsoSgS!i~|Nz*1D8LYj50_89l=*z#3?dX-l&4
zzrXUB!1c~jX;}F%gLv=JXSTK^saj-4nsFuaqR_K_NU*B#&5_TK>1?g<+{wYE_4=FK
zANUu-U2*hwgu7fLd7ZAq==H%bm<ez!f~PxsCq}jjrU|uad+)rD=XkEduWjmEQKUbA
zyZu&z_GW}J24!Ghj$l**oN$L{72IkkDxP~)(CX}x_xOu!8cX%-lSoN5Z5m~eFr(PF
zHL1)d61WNF9YzN!T#V-@44wc-7+0iP&vuvka=`x^(1CWHjZ=BcLpN4zkfPS*j-W(H
z1Pgv6R}hAHRnhK~!q%d{!(dt=PIN03#CBo+D`%8Q({HM+tup<<FIJ&7x>8x8RSFHb
zYK<}3c<tDCW}J-g%_?k;DEe~l-30!7ev3ZAGAb<K>(;L|q{BuOi;7CpZ_=GY#~1In
zEWNd!LKSIGc0{_h9h__Cp8F*Gmt)*Y*eDY%eYeIhXY9mp#5TYMXz!P+5RZ_=od>K)
ziTu6Mlr~$@3{19KMAK08^5E-*W6^Zo2;H9^mOlP}EWn^bz;PmeU`^XIj?p*8i6BC#
zOdEzrOq(Y=%eY9(phrN&?_4Y6QG`y&sh)3cVRqGpAk)cHO@{C;O~IGn8I5se)Labj
zIUV&}1H>3q9H`VTR+w;XarX}^)-^Ah8f{{{P2p?*76ZE*f#wIS6-<tzN0g;wQ<}>T
zjMcSFL6L6<-~R}0ig09nd!+x9Dk%<mI(hoGXBEKquMzab3+?xBA|>?ESZ;{&Yx*g!
zbM0HQK=`S{Osv~OBK-g}K_b>5LXz?$D|Ce;mAnbt6}ir03ATA#@Qf`SVZh|`1NF?y
zvL=8?QW<$EHcR#DM*a7@1gBc@vp~P*VX@ENO~cF4cSk0SZsX#XE_=SfVocRbKPI<3
zWh0e$1A?UmUz4*AeI-(RL~25@7+=OFJhR%JnbDqRC`5F8XnRwd%itI0<L?pZ61$!$
z=qo#eR5o<jCf=k0%!x3@G{E|Zab{RBe1EIN&GB%35jL2Ma-{$3Qr|%;&E(0ay?#9O
z>P*NIdd^dDHd-R5d>1a!>7p;c9v&cEr^r=LJ=W0YN3$>Sw;AMedim4+tJN1h1`=oo
z37obt8wQULy;S0UIc1PkaW{FAZI^<~qtKYn2v@uTL}@nnXWv){Lps62T(Qyn_rt2*
z@g0<k3gZL1&E7`kH|$RJWWvb?a@fl?S6Z=17<h;i$Xv7+KfhlQGw61f;s3$mSYq#R
z;#A00EK<4sQ~JWX5y;p+{vdZV#D+4sOGHkjAAd#>Zjg%ZN5VNoLI8Q<BHIvQ@k&sG
zk5|iimVpoCK?Hr0A?SVB6$kecc*5~lByr2px&5c|0aeZe#i<LJauV?c6EmDKo(~yW
z%Xe;O+g60Tvqc@D6HEy%8m;zwnjDB_O0}fN>m_f>mK}D+Eez9`dC97+?>0syiBAK~
zafL%~UQJ}G#Ift51g?J@07hfrV<l>QuJ)<NJ0El~5W;^|1LM#*@;81Lu|U?BuCyL6
zk<vo~Pa32;Y{IOwlWe>*M?U)P3WHa4B(1^VnbCAIuV8RDcd7l`yk)^LH=h64xE$M!
zMl{G>5Y{hs#f1ot52qy{ZAdKkU#^0hs<|~>x}hW{S`s8HOO*k^#1Qrf!DIgdq8`f)
zr)1_83P<0>-`zgR8<|~C1n3)=iLmWV!txth@-yG>4Yd1g)$0s5dWkSR{KrI?(F_Ml
zKxm6*N7qJ{nK~jc;Kjr>fM{bzPG*Sh7;^N3%bk9Ic$HOTw2tcop#!|b=wC<Zf5J<1
zhf8qB>W)+^kc`57$CsQsJ9glOTZH&UTu8~m9|5lC>KKdJ+y>ahgDSOsbtj4u6Tp-R
z`H}LrVJ?RCG$U0iuEcW<GuY4Qg_xE9pZ31<tEui=Hz5=SqzWj#7il6bG(inrK$`R-
zh$vO0_aHA45&;1L>4*qOM|w?Eih_dl4l$@mPoyMLlC$x5&KdU)xF7Bv<K@Fn*=z5$
zGS{5XeAb+EZ788E4BdX#%Xy~d+dmv&<;lVV_nL6erCHG;jjdflH(7P*t16M*Qg~@3
zmj{uBVVFlREZH#6ogLli4e`wI%Onccv%hK`ta6Ky7a_~OzVc5kgq$H+YyVp1M0V{5
z9Sl^H=U1dP?0XEYBPb*VdcA*zc>KGHgO?)IS9DHf<1Wa@a4*z3x9v<jJ+!rwOLkTd
zqoNtKN~Fc5JT$L^&G$`~*M<am^+PbB<>(Nhxm}LvXTC<I8C;8B<R1x`^X+SP_}i`f
z(1fXf38DEVu}^VQn*Qx;)yby)VStM_mX5H?*8*Md?k(98?m#CRvuZ7=O3-IzJ)jY$
z(GJ!>*m~MRO4R&m`+6TS5*N(2`dI?$L$1$aJ$Fw6i#CkaJ4Uu)d8S8_Dod#bR(djn
zPkGBsq*Tv6=bO|Z=|-7)?a|8n2f~E$raBzSM}s}~mS?O%;kmBjp+7AsZ_~^z+(ef@
z2rW2vf*RutmEio8%}82UspoJVv!Hl(W|Q2l&ifp5xy9`^vpTO>U<I-Dz25mc3w*NU
z=CFHuX&I7r6hEfG>i1823n|L%s|z<|$RpJru=sFx^GKm)-7Qa;-ei|Lt<pWD*SnjK
zPx-_4Z4o4eLoE}j=#VXb2^!jYLz9W&ht@BCp~WZLM-X4G>HJIceQ)?`CG3eDi!{!;
z-x#pnMSC$bCrM2U;+h_Z`>2I?VNrz#k1nkhz4JB>Oa2g7B%Y#O^oZEo{URu?hbOKz
zlN13M)ld^_z^ZmLsYu_a=>7_h0>Rh-=rkf?f4zgWBWJxCe8=}yMgJ+Jh90raQ+3+G
z79=Ys#*)CLV-s_3A<{KD9bY!;tk0F+iQV{ZJ37)Vn<a!acVdhxI7qcQ`9rf7BChew
z^qcJ1EdAG(T2Myeq4qeHuwwPc+s`dOk&{bX8Tf9h#eHZ_dVW+QYr)L+ZZgs+tY#Jf
z&5J7H5wFWTI2UL%QMRzwFYhp{rLErzbSG|IY;p2pvY4jRo!1)ZJEalnw<Wsy4(^ta
z!d^d`ce&fyb|Cf2DSz&VBvSglJj6%i`))`J)%i6anu_t#a`H&loP$>OFHh~tyric|
zCG^chtPZSt=eP@XN*B1)UQ{4m5_o??D_2={l~D%<R111Oah+v=HvN3)Hh<HLK#3L(
zyfZU*vE3jzs;#EQ+{zu$rw4`tC2jm8*O8ranU`8s;4LVIj43(Otw&s=F&kfK23jTT
z2hOdWz>Ie1Xa<N9hu+hp9K|;46yKYA>y(?SEX|t8v4$c&_3mz$W$}Y|T(8UOn4?(3
z7N3ov<<q=ezEf5DCuV=(P29g;V(q-X({BQ+DcbP5IO>`rO0W4kU&qINPtJeNs}#WY
zWvQyKe}ytdx0DMd(_mYJ8AV$`I{NGkpH-Yn9j$gZ_UGmN&XtrLUj{T=PP-fmde-5-
zG!#8P5~*@(fSHHdecwyTBOzD&P-Dr)Q3XVn&^SsrmNX30d#_3twN##-Qcp=R7_Ga(
z6v#Vq(2LWaY{1gGdXFhf<vwEU?kwOniMm?Rx+OV$yTB}{hTG;8*NhJ@^r<3OEgc2h
zg4%t-w-nX4a4iyJCzg>e8e2G}B{>sb2h`{RvdGwKLe65~FR)2~%dIq@lpXuyX3&`=
zbt0>;gJoR)N)jRheOq|DtDH)82SkQq0#k$&)tGP|7@~nZxeh{(KaeG_f+WTw2^1;E
zV`iLnlKbkk3exK)z;Uz|#9^(a!Y;-AzS^`Pt5$y&n!Ig;{6>vY28Wf6OGqwd;|w|M
zY-+Rt(WvgNw2t;0N=8&%tP9RI2Mj{AynHjvTE(IZLkX`p@|i>^oLH9tffzttwL^sa
zGcQ&Ak#=L4uK@^2>=3*Aa{EAdB1=K`M3ISs=ed-?=*&~&7UP2v4t68ogd028I)Ems
zO*`8H*J8@c$K|#;f|-n7cjn=!oV&fQ?>&<L;zRRGbwAcZBSl9&-gA=Pc}KA~;kOE)
zPt;7sq4W9E7G1J5SY{=zHh>>V`3t{|uxJjC(Yu@0Tw}fT8;1JKB|4lVOi#scF@z8w
z@RaN^50)qNq*fUgI?Prs469Z|CS4!!ICfYn`Daz~LpMxl`^rsR{$TyZv~Rb+@0Qlp
z7<qzpOxBuE(jB{#54b`teMKy0$*=%W@l)aaf*O#n?u3dMk~S-Rv><RjR{zp&$x{{h
z;^y_cnaAGm2oQJ?OTt!%T~W}tPc*%JzpO%TOahWp6(|m^>e_{8f9;vOEDhEcT!)^w
zgPo^7_K_9I<vn^P=k|xDzqQ}UIxue{;SqY)EcnHZ&6TS~XN*!xO!#bv1*xiE0kM_L
zZ?DeN9sdLuRRqYuPvuxS2O#3@>Tk*szBJHhqe!OVCaLgpa%d^1m$kJLIzv*}enQ3n
zqFbbSE8{<Em}!L7p)j3=*(%~WVD9tp_MDH4bnogn`4X5}H#eF|%QRe+_=t;Z47l*8
z{x!vyR#nP%T_`tYo);;8cbxMZo4buZ6LxPrUeeCt=N{u&9O4EXJ*kvMaR(%}4oGY)
z>tn%_#@jesJBGgD+weYsfPpA|zd~8mM>75j>x;Jayt|b)b&4^s3rg~Z>U<1LdQ5or
ztIl4x4pZPJG~WPaCQC*$cRjC2Sy0Ji-J-V~7MV-0jNK7CK$pMmJt&zQ$*lx*8hLZ>
z`bFH_{(uSdb@vrXBxU#{=NGS~Mk}b|fps&=vXPt|q#l;T1?_I3^3f~3n3|3x#jUMM
zr2_?v1L{fc*5%)OvfExY8NMUf0IIF=20tRU9mTb_5bU49`!h^bVdObGT&qH^>aJBQ
zo4YX$SF3o(y-lMi(>F8h2&$|%6JZG9EQ-^~LnB~0WGv<VGRorYh<TPa%k1q?6|HCK
z1(4&nYuBDvp9`GJ3Uc~K<i2F*7Z5ym%B-`k#Fxse&WbBB93v}+Ub@;#w*}xMv*>p3
zxpA9t%Q1#(M+=IEiV?5$(W?4<6gC*9Oez75oA(w>quHc(bwlUN5D5WZ42JCD(J2F8
zJFS;Sn<&c@PQ88ei3XmQwKvX7pIjlRP4?F?nncjEx<=D<*BOq`E;;`}3|bOTBVh|w
zo&9Zd-D}{RM_NC&7K?h-l5ww++*{LY=PjimATRrJr-cQ%0RXFFEH@BVPps$?FC7RG
z*Xh3+ev1{4Uo_urP7o}gprm+;rc4t2_q|HmR#q8O>I|Chb{6ibJeLQRXKOT#-Nf;(
zvV`tOI(?2s5*}oRvY1ojZO5*SyiQ_#T@$DJHHBeZTq|j&s8cp=D}9c3i~zwZH>rx0
zzWUT|vVJ|>BD!G>Y~{+fs#MKqNO6MZ)A~Q;2HoPZnw2x%cgVTFYx{i@>D-E}0hN)p
z7t}HA>;sk;wLH|H+|Oyf@s1#27R%9|+r~40FGFeIM^db`#sPGPWo%Z(H%MyKZ*L2x
zhY?|0tu?#r#|v{jHhJ6LOWuhUe_Js{r6Mke5KzSI%7`Oz9KnoU?@yV4nnftZU$oYS
z2T*n2Tfv>s$&HNjbbg%dp>kCgKW~F9DcO5^$ngTowI*WqkOP8YTbcH_=MQG%Vrq?U
z#${jxg+JvDfC$QYYMDk4&&3o-kH*Qe6?*jt`~zYeT=(kd(g;U54Pn<In-nf@tfpJ$
zFL<RBY40+1=ajl}*Oj!TFk@aS<$t-$1!}&=w}rDxT?P4@@M<T{@YrSo##VCM>m-Ec
z@_wwLG^_3`@)#aLDLzTK-*9^ZT=MZKPI^edRIEQbMVhtyg(Zrji;29j(-%8Xl(bpy
z^sBpmnYN8F%xf~fa)uTbGEfFP_`s`&Zs|&@ctWAhbrJ-k)1ubyOn5>s!5dyTp_Fx<
z7BoQ{+=Q~+R}mlkhI*^Q2|1d+oD!JiHK?oZ0JgY!;xhIP7Mdt*vU#GBI-|H$Ct%rC
z*HhCUo>I;d+JTZ0<{T=j@q{+3rF~q0)(wPvvlcwGxHjJ6kc~U2h;Pfj&(QT@FOc7O
zg3fEK<K{Nd{mPfpd6$@q+PG2~Wo6}kP+w^Kp_KDjskV7Oce~g_^JMopl8*mS<ZM|(
z=`l~5k<(q@$~u`P<GiIIm1K{yX^@MsQ{%U=^(t)F6}*G%m&Yp%2!=gB2e1l_+)Gk)
zkMCjrl^t?<OsyHXR+7;Cqydt)<al1GhcV1P`a}4O_TH&@D-10*q(o;LTISdqkkTFF
z`7-p~NFZXl=4g=HDrxXgwO#w+<?dF;DW~K5YP47tTWAy61HNO&c$`dHXrqP}o%!dp
z09MW7f0vO~S?w^o$0a;@+2iTe^4<V=1-GIs+f_v5{9MLXx?C*%uf2^#NN(B%QR1y8
zI4~0wvF>MWuk4ygE;k$de)5BsuI&u2(<v6BVlRxSEg2op8~L`*a+6$KZG;0o+4%Hi
zKxmrkLg-F6W+l#Md>C$!h6as@$7oL%5J=s<J2;oPgx(#zKsmbhWfx6Arg*qt`XDi6
z%<fB#)FW>I)vG$4^7Rz6C4Js1H%#w8*h?Wf>r<aumoo@qYT$5feY~>RLG|L0@~{(9
zB!qO~P)qqqe0#8~zh8ivexQG+>(0}8-W}meTr6TQ<U=rGSkOhB%8+<lyJ^lzr)fkp
z&Gr`OY+;yuix?Gl1xLgznJ||KpAx4Zc1e2&V=gSp0ru|z*qpHHY|HQd$F{3ZZ*y`-
zW>cNwlw$j}&hWgaV~Xvbyvf2RhbQmU6&($HnA?IU;+WSKd-*m?YCwveRJQvRp$&Ga
zPu+7ZC(nOIwxHu}FYmuqVEsJPJ@?JZ&2cr1#hmxI?bxidG5eNAEA5ib&dtPtAVqW1
z&IRF>mmfJXedDVt`|VPO+@A~2PaEb6llfbofI-S{K7|CR&C!r{xLtPqO1Q%_xEfCU
zXh_UAPZDRe$#S^R*EZ$<c*kXr`E+b#z(wewlp5H*kDn$P%h^`04j9Lkv%g8xXPKNp
zRhyk3)<8(At3CM1e$h~sHBe^oX_#i3GQJ3gzHev|sf7#*Kr7y#H8JS~RY;k%qJ~CI
zmC;Kg2#s)0kXh}YW=~)lDf#vyUh%id$ud1j>7kZ+)g7A%d2+0t%zExkOJ^{NHtpqD
z-D`wKy|>MklHVp{yr~cs>YnM9t{;f#T~F2=ql{m#VD~2ClLDtiu682dW{Vnb;jbd&
z=TUK~6ROY27eKez=f>pZRMGxe<!q`JkxC%}*iM3n^^%D?`!~ZR_m%uZ$^|#?4~j`L
ziLKxxRtmXR9BEUa-=)1lBt)T-g0{KFj`@F>LCkn@N4Ft8w}0DKUU?9Btk|&S%@x5V
zz3`->bP0+4!~xBjam%O-ufK|CXQVQ)aH!Ec<R&Nyv)5WLP!)IV1B4OPn@}_ud;w35
zZI`(iwN@G+k9$ewM#SGj^(XY=nB7L9x}}=FRGM#7r=7D9@T(|W(1g>Ej_KQQ;g#G&
zv{=Au*dklet}3h;D<O7uwcc5mS`q1JR%+_+^e{?V_+yxD`-e-Dq9X)Y$rbWh%r4t%
zjdJu-Cj!lr@sqJcZs@^zipj#W873l?c%x2<XmaBTf(pJUQ{oXx(a6fp&E;N=Nr|PJ
zl7zPW2b4ng`+df3UF$;v9KHf2Abh?N^7BerDalFQmHvW<?nLeZv!rUc_(4i+4z3oo
z7{wmur0bsZrn+#24=ofU=h4PXg5tN*3;nIU*+=(E_V6^Y;<ej=&qZ_Q69pScKJM?@
z175h>p&O6bV|gMLpOMb*bLPt&E#Dp7HJ}57VqkX}WdPTMP$A1op#pidhrOc!#`~mM
zofRR!{(R4OeK}^H3m{IHfCOK_5gSLc{3{|3{U#)U`-?JW6;VV~gu5I-W2JG!F6;o$
zeDNUPlA_A{EwUVO$WtUl6>9cc3l)o)IG9+%Lz0U73Sjk~0q??xSalUFQMF~?FAt=A
zK!9+3TEmg@57kEt?vCZ_-_?8lxMZF+4r*wj5rx3@QLfv!5z((~db_uPB7-P%#qCGl
zT;-1(uP@|8378W)e}!U|G0aIy`|A6h9IlR*6pdk8XC=&^R;qHgxDE!y-fxw;qBDXV
zYCNRgrxePK64HV*&1#)~X%@QW>AOtPM77}%Fsr5}Ygh=bYb)uGzwxfJ<Y0(OK>05X
zAgASbAb#bBX|?yQ^wL@tVW-c>X!!D!;`4X=b5xgy7pN{D+veWqYL&&KxLpESGJXfv
z0Curs5v6eCiEU77tlO6^jSQI1JX|&hHXrB0Hrlc+kI5r@g628L&%iF_rVebOMwVzZ
zvt07d%^`L>sW;bC>&nTlR;nvX1D7nmXG^GGC?)$|Zz^7R;sxms_5;6oz${#B`8`JX
zW5f?couX;1G3}3q{?uJ=fedK*o%}OE$ZZo`g4pn-8Q@vv1O;b!cS18ag2r?|lR0J@
z%NjmURn;ACH$N>=Z)LON^adA|5*NpQz*AXsSgUSpG`+08NiBxr>_;V8k!Bg(5l!nh
z8B6v-y!G!SAu`th9`12fVIW>|X$pi76ZUrPR;RUYT#0+dHee$dV}=|v6*HWi`)AL7
zEzG`)L<a$_%dLh4T$+w$eN&^mWH%1I=P<EC(gJ#qh^4)%BlG;~jgB2?uhS&z!SZzi
zs+22ofb|Vtw-$0>$m^0b6T19;)fDJ+T0aSNdz~1ph2<4*)Ln|{T|oL=Kd<{-baF@J
zynjG97qqMACF1}H-l4__&1lPOa-Eu99Cx9lBK#Kh9K*;#ha0>&Ih-Aa88O(eO-CMG
z^$wluE9k$=896u_(_47xHznM?Z1;mCjpr8*Znx2%+ebXjm#yTtDhd(mjy*9ttYV7Q
zd}xFtarVA%JgfFO;Fbit^^T>(KT{HO7N+(ruHZEL+>ZDrI(&Y_6A{DQmWzbeHy;~<
zMkc&7os~iSHmj~r9$p=N{F28T)Z{6{w=yB;SEkaP4MZ{pYpGRap$7`s56UStB}U{O
zwt@M*K-ow%f!9sp59`=IcpL0&v}x!+NZY%BqVHKU^Wo{J9a(kAtSCg^en-%Sal#4$
z`KQ&U_BH0sP+cfE*DXJ-v@$Qy=RHSZjJZ|)A1~KHx9WKAX|x!yfqP{jJUP`ce_YU1
zf_^MSk=d4u<ly`2qD7q?=*0P<l326;t*yXw%*{{dqYlv{H}laPqjI%hCaWfk#wD3R
zn%%>32pU+HS$S^QXdxvtsc1fyg<-Jci;%^XB?CJ8!sgC|3&Jf-`(@<e(v@EFx`bJg
zL-T3;XcwVlb?Hn!4YLQMOvMAo;5PV7hvoB=hO_vXIj1hmbn(7GgHYQ;QTKWh9RN6L
z1t9@D65Rqv%CLy){`ux4_q<6J`Y%D8qmQ=wd)1`bkB0Lq&f?9-=2=XIESBhkuRgqw
zBe^45!h=8FN%4TD{<@zwNITC&3e)=VW-`%`!lU&JhpiNSqp5!@|Hng#HLBVgH-N-w
zq_=rzTsjC6t+&wnV6JP?eM`W4UQ%g(2Z0D#XWCtdnLM-hx@bOw+$$tHBx!y9p#Hof
z@YY@Z%AH#c92wdJR|-t5oJ>z@X7VEDL#MvQU}euwo995Hm~CrXSPd;=oMGy&vCuC~
z&HP4n+#uiOA%cW!@?-ZY(ESnHLxQ;QBKjj8Vj@?(X{{UZ1hfj-ZO>%6S8{vNs~z7R
zA;o#hNuB*0Knja}rUe(E<6}rt4#@7v(}l^V?dnGr?3cTgOV$TyH|VZavbvP#8NP70
zL^npV@UbEn%<g78so^%1PW&IW_&;Ovb7btIZ)+b}<@s+tkWj9Jtn+?k;Rl)0kZ(Qo
z8H;fS5G2NtUb7iH;|nXhTgl;Hbpa%4^Oq#QcJXBGd(+WQW82x^@Oh$)_}0YzqE+4F
zSHV-f3ZVMZeT3Bp5NnR2hPL4XqEdqr7J+KW>qB^ZY+lle4P>PFSbH5<>xjpCYU_6V
z_%;diO*5ze*z#@p`^_qrU89quF31c}?GnL7%e#se>;A6ZYUm`H8eihNE=ra&#pOrL
zf=Mwrk~3_d(r^b<?D!u~8Kae1aqgB<&njyHczx<WgPORGJSwXN{QPtuNGCLvPVQA3
z&FXdB^0yJ`h!d?iceVj}>O!;jgry$(F13JT=%7hv(Q`GGKN=c|6($YAxP12{)LY=G
z#mnC}r?rZLMh)O-_E=*s*6C|ScR#s)gi>VJ#HQPm<L__|uHbaCWIn1Tp;3V3oO?{q
zPjCIya}{~A(LZ(pAnYb`BHItohsQWU%-4QebdeGxxG0xGWbwC=L>_tLQehkO40raD
zCH=H;7{ln>sxCBpn@~U$Gqz8x`!*0D|3KyHDZKUeBR?z}W%x)9Z&ae|IjGG#8#K>0
zD{AezWpH92_iJ5Y-Xxg0lqxhhy!yU#sFm6?qzNFcwS&ejXug8OaXc8*Jn|sPy#>YN
z!XuHA{H5^C&8Up~qjq=sO4$5zvLx);YM((pL&s1vz>~_ma&fpv#$cB_d$I;Vmc}%c
zb)JWllh-BpW77+VcivnyAJ-p>o9q0}0{5&waN?IfB+t|F-C_Wer9kYUizoiXwDr?<
zH;3uz4&DuwIyA(;D&iIg5S-e7M4c9=+2}nhjC=AC8a(j_h&4{Aw4m~C<^gd6yJIt;
zpmFW}!$_93j~;5sy`7I|F@|D2OFr4GTT{qmhBe{WCxBH4cY;VaaU^kA)$E<~vQ66}
zC!v*0*<dqJN*UTG&Ci#5`CU2#Za(KJiey+gUn=)JR*zaRoBKoE4@p1EIbUZA<8ko_
zu{s&3Jn3H0^@(-NO8nU+(>G6LKf(?A;Wd7`JY>X4_4b*lG9)q2bu|CSCIg`6`IUK!
z@GWm%23tt6fEgslkT8`jjp)vQRaS+5@$pzHVg#UT`O~A$t3G2#gG7m#Y&zwnK%b$V
zO?r$nP^jp~3CdFpE014gxya-FC2Z5r4fVN|E~@rYjj2!KOku?<Ma2(yuM#3#xfDVS
z(?5f5Z8+YDpahuD%QQQ9#l;5rzWORCC${M4t0-*gdfuD;&8jZL3SH8~en-T{Htj+V
zH0E-jFB}Q*De*<-t^^#KClJw@Qgx2hwYdFAD?LP(EOfBQuiKP-Ea5hEV|62~m+ul6
zCB5`CI_J9!>N~P}nTvC;oZ>9CEYjZ!u3g_WR$tuv@btFkwlr)#eEkpV%Hzt1iVZq)
z_BZA9Wk7U)cn9yKm}q1NRejix8^2h`O_wfe{T>9LleCs4_sr?NeA}fQuo;s3V5@?>
zz|d8&gzC#?BrF`Io9b#O{zjcUSP8<CdI|e+@&|t$0Zo%#GVRcr8;^4V`<Ldvho_4s
z(*V&Xp7}nLEQ;t{F2@50^_r}`8`z<w6=@c!se$yKajkL7q=UP<+oIbRsvZLB%V%=`
zrxpM^*h?rVM_T~F)x6Il^Z~E!zt=DwbET=oa^giwLW#evnN8D6TP}l&TN<1ezT2{s
z)ccAQ8Q^9Us=UcqCrm=p$`DJaD+PAmMJuB%e!+Kn-w1{+uP9zU-*CAneCA!2>(z!(
z_5GYc&4BW*Jl>x(dfAXVQ9f$;j5PXOy)0{~8UTWZ=@Z=lt>uh7tPK4na(pZ_KmDpa
zq1>ZUt{TD#>K=AjI}8J&Mqv5Zqv3J``Aex1787|P%BNK$)`*jnMPNRkm&l3)L)mAL
z@9bY|)#Sc3NT0ZRde>Al-p<+<^ZT~apdDH{A*Y8M;#j!7o)S6N@#Yt$)R{5DB4DGl
zPW;BcXWMfPO#D$Rh^=$FEy9NlBUvAKQ3vzObdDOh7ka@L6@I>2t26nLJjtY=UV8A~
zQVE-5BZ=Z8vE!xEh!K%(@#)C}AKs>L1?BN>j5OQ{zI+fsR(9g=e1%;&ikoJgrS<)-
zg7i++1Rb{ztpEf`HLGhVMiqZ=P5~W>sFB`av13}Lq6kt^71VVm$z-a~+!ZyfoOo-(
ztdsjLB;eI->=eZX=|xV~ell~TQ?s5kZF||@daDy&@XMd@B4ZKGo<wY1@e@w&Ifr^P
zYno4<;|~+UpT`EkMuHKy3$sBxzkYZ7Lwfo@v?d;N%w)D{EUCl_0ofDUYW?HR$F{CL
z2^Wrh)IJkDpXxhwYrtQXp+yY`mn<wTEt&COb?4azHh4d?kYNP=71<;=tKk2D!QKWn
z)`VujPolf1%Lwo|mhKNaT_APhZ>e)zgz%lcgcdSSny6v=lb@WR=7cSr_;djbxuy7E
z04LyTJ`Q;XoLavJSlHKtkO1AIM*q6t^LHGP)+Vg7?FT}YFJp5*I^RcaNG+8w_KsMm
z0|Loc22C_2!v)5-LjwH4rnqnJT?I3%^AomH)oc6wqD~1htPS;OX3{zH`fd9Xj_Grm
zseVfSG(FVSS63R!Vrs|Q>@zBy%qLrN`e1Y~(7|ddbYUWRUh&<CpAo`GHOavuqK58+
z{|k0Oja2m-56`S2394Wo_r9<ncWz*pbNOM+mc5Uw9ccS5!Bi2kt1q7xqS-0K@;vxp
zAPbx!sdBcSg>)6aOtU&7HirmtCfb**#|+M4UU@!M%)GPfg>BH>`xCC%0L@#xxBUrY
zgBYn9ZU>4#=!Uly3Y}X-k<qo#l?I-;?xbz*SN4Tr%S8rHqmgGefoDngNrnpjv=4Sl
z??h~~Yv=8gvJu6<L^}m$&Xa(mlr&KjTFCzZ_2(wBdJ(*RNp94jCibGOf^+yxqOE4?
zhpFmFL?wZ1IO5o$_j-8CpI)l%r&o(89^)g;j@j;!;DO<Y&DSuS$C*H>kszTkre`P+
zDD9)~a-CYq28~GkR2}z3=pOh;fHg)UHn~gaPJCK_<K>v+BRC&2F}oax9#hRc8Kru?
z0V-!lQD$QxT`$C1Z!DgzR(bEugww~M?rEu{CQ?32Odi3_l(o(nj@`Wsx>XBs{WlG~
zmp3S_?M@5f98ZnCUZJT{y&_m3B)Nu)qBS|!$;Z2^5Dk#$e%R6kPQY#GYY0%zm$WUr
z#>vJofgXuC{(`Y#D5RWV(i-`X=<o=+)vF)ViyC*O$oV`6I~dwtCsM3QexOQ&K~X{4
z*E)8)D=!qrRpWpP%1wFA=hw`e{j`Z22%ii?qB`y*TlB%*j5bfxZoauaP{e)9PUsss
zhCF@@yd#<D*a0NDsHx0^wx_sg4kBd9FC%lw>rVXfB%W6Ohkexpmh&<lzJ~TaL+)RJ
z2N2OkPK$C9-}Gt2Xfa#}Z2#pJ0URkYZUj8U_$T+Iqv&Hw&X#QN`!*Yu*|vyhGxu;f
zmvpP#0A|q4p!eH_v%J?ziCNYPG1|DtZGq;o%xO=K1CUi1?;r<|+3L&a-f6Z_{QB=J
zZX>~-aV;0x&O;H~kvUcM4Cbr2B$z$LO*r$A0i)WHPw~T2AC9Cy7~>0K7VU|jfuQfa
zBi1nH>k$QYv{4inFddW97@>vj;gx#7qE&PfiT4D{Qnw$9P18yl36W`#y%RXr?5L-}
zOp;pc40P0qrZE>Y%sn&2_9kP|;#dEjfFP+wqLrNJfx}eIuWp}8r-c>nu*GX8tf8wt
z;Hb1msFQ9^X!Xzv4^<=!LxaeL)aCsEf-qL3_pxh>8GGd0surPuX`c{yV`J-)yYka-
zzP&rsJ|l%>`!rH?(VA$<N4rdp$)WleXMP1auq@FWOW@gQ8L0L;Ny|?jAs3V5)nKC^
zJef$*0w6LYuQHYx%>iv2Ao$hhkpbLrceQg>b=z6~oUpfiG4;0X5jc<KNJL{>Ob+hn
z=c?I)lAeNfww+@e$dW)tY^B7(uWaf}Wc_Nv@5}@q<~wK3>hDt_8}nK!NX;5cvjc=#
zAhnC}V1GAsWpU8;8a(!WU##i?#DV!wcab2~SUDqJOP__}ckuJuKGQbsRgGvzz+bm}
zBx#r~A|;aJmq%-<bhy42b|bVsn~>ufSlrcN1(wUXd`V4*62yRQx3Oy_Z%aATgRN&=
zLVH(Mwr`ghW5Qv<fBbIK#^@}pnVx(emO##bsr{_|iAkb6n*uIzqihO4<r`v&I|<*D
z>zHYP&x}*PT^#{Jk?!|-=S&PgsAp7oMH>sOhERc3*<{g3BvNYAz-N)fe<DlfqS|@g
zb3!!PnB47|CKx^x!E0vu@Tra)0Vz&@GiMY<3m(lrz{P6)&BgF;I7f~#P{8B3^i|Yw
ztW6PAY#7RxCia%=0}YkM<om$AOIWW%7m~a%@`V-+wDx^K^Or=#mfYfkepBwyHHkBq
zKW9}B<ItZw1btgY@PGJMqn;&N94*6qnkC;}NdwoDKZ<0C8nOd{>qmHyc}>I%9gIK{
z!*AtuPqQ8y)@Gg_VEe?5htOz;7ki29!sO(+n#>qeY6B)A`t|~qljR#_0_f8Amy_Fi
zZWOXFBx=O2m-8`D#Xlke<Q=mj^r?z+2^21tebtyWQlT=!r@~sFuUOQOJGS7u9nWvP
zMgj41p;TqYmDE+L5!_3Lcb##R66m>*ue)>&!T|)bkDCJVZi&vsCTb!97SOtZFv8lf
z?40OgT#PU158Tu2(wWr6{=SNCWj{lrH$Q#^JX+oG#SQ9nOY~7mzb;+=c>P}f7jTI1
zHuNA*uj|<vHeRaZmXd&E)N+Q+P{;EP#7#KEuf-9vqnml&PzWm`MV4}dnjaOFv7IAA
zWZRjRm+BcugCAZp7gQ`SMv5Bddf4F}<IZG#rX{hhjGiraxA@thk#<R|^W4l5Cd2kh
zP1x7nBZb6@;clLQ(IqpN-)gXWtlc<;@_L*S{Y+Bnk8FwLWIb0=s<_3cqUj$qG`%r1
zorh6!5b%RQxGI~I%GAbgBqvJ^Z)$G>x+9YQWHBK|)BJ@>_S7Sw5DZc!HvH#oy*G~J
z)Qckn_L12F>bXJ9z{z;^reV6$*(`Cn-<`fRVGL^w=`A_W!@J_PwJ@rJa>e>u+8$yh
z`iIHAZjla$4#(v(`lT%~arcR#k{@1|@LwaIVrB2;qajbfb72|^JI?BHaGsp58gL*2
zG|&t~b;NK|7~t+@Ba7#_DC^tGFt}vq(ozHMs8(@B0#?*6;nzRU=yk|Q+a~R=EA6!s
zk3nxf*ZF>`;!Hdh*#o!H=`R)&(>Hn;fq4#QALww>WR8eYEzsTC0k-T}%X(30W(3;U
zX8bTa(RQgT^UTU6c+hCz5dqd>;1>sP#}xLC#J)(NXuMePIg{-7tS?qy?iyU4Do;Fx
zlJ?PWT{Uo>8~dZQ)ojy<`cTx+;t5dVcn-m^HKJ(ScNC6Ez@#FmtafQhOUelTsUiu^
zG2aHb!On;n%jLjtv5aZRg`p^HU>n{h_KDqbXwYNOiQkQj`Wm7sCpi`9M;q{waFu$7
z(YRM1CBc?}nEM$)-?w}*bxGYXyJdvu9(CtQ(vr@UT*jix&=l6*gu^_9(Ny=gt*nVm
zK3X^S8r%x)jkvVok+Y|Rq1Sv)2w?2q5YUl1);2zVO6*TSM{IZ!V&xu2;z*@*U}VeZ
z1!I{p%H{9Ce>K|7fEF4@(*S*<!0@PO<V?0pQ*g;j?OLEJb&D`(99jxWOvOyY3zBNi
z(ouyTgpv8;%=Q$PP7s%-7V`~d?hmOvh=X$=K*RgJGqg@5G*8>Bx1$fz_Zmr*s|_6Y
zdB$ior(gaN#7uxzIbSbp&-`d`Lad*Jj*vQD%v5Q6(dCV>Hk;Ju5Ef#=JxozSy{lQL
zWDTTKm?9J%dd7_qdA<R_e{+mKORSLnJKyV$zsfgF_HxYH6VGr~LwwX$y!mi$f8-%4
z{wyo}XI`}9DM}~4`)yn#QPz(E-|DWNI+G+)Yw$U9Y~XW2%rXPN3-tmJDF50WXk`Ai
zaXzr<*2C@44$T9HlE6U`&nPVjDcmh89?Bnvd%EhJ{0ncchq494^8}cZRadv=(7{a1
zIGjio%R|`T7NsZgO|5i|jB4<JvG=eg7hP0Sl{(%%br5tFE7AISnSrto2Wmv0y^iTl
z2kKY(;;F&>i$7*M?cN%Z-Ee{B^PV$jdkYR`$vQ-u<6(>%42$){3c!ZCv$>vnNR(jL
zz~e4;5-s|M>7vSBZ-75K$))&{^H?PJfFjZ`XP`*ZS=3K=^Mk;T<8aJi(lq4?UJgs1
z5KP>gU0ap=4R#}_$^B#r9Y1(Q+52wF^6hfvygr(Z^?SI$X!uJ3BFh%Axi5lMg=y)=
z-MXMaPW*fBf%H7|*XX#VQD1`gcz>_3_GHJtj&SGw7Ud*g*@BjeR@V7+<Y%Gn6nX6v
ziU4(ONoc2*VR~tU2dz$w#hc?I!MPjO4WvX{tV<EJCseo2A+yDUS`*o}5(^<TZh8{5
zQ_tvC-#Cuyk0#XJt9b#P@+L5!cu-Z_<4H9z{dCiiuLA5N@AjZ_MFC{7HWJ|L*oQ$n
zF$Z@)X^aqA83vedAI~wfgnFVhp8(kFm&-)0Ne_K)i)ZY>yJQ=f^9NTYQsWgmxISy7
z0foUSrYu+irxaPimJ0^yq7Tjtsc3;Fx33F3MK4}VJxL?WeICL?a7_D$Krt2VaK!@|
zj}73_%z6|D2!KwlS4dNEeb!*^rL)yztHcGh6LtM>B`!ZS^4rGIV$3uzDB15&b50N+
z>aMIri#-8B^_cS<-vLKw!AuMK-2}gPq*G)RAdVT|;5E=4JVPDzO!DLO7cW?UKR;s&
zUYiZ7Lg+HFOZ#O+up0bibctRLteJxgNsm7iF?S@SifJup#MM!mVP8gX`Zm3&kbTRr
z*y(?qg(Dxtw-w;*nE(dF{a6<?U%oC3_r*tHC1?hIf>VJysNf4_w%7zrW2a^hB#o-z
z(s!t39v7K!xh$0DV@t=yFy6lIWx9ZK4I}}s0k&(>fNmw91>$yRV~uzn5`H;o8{V5b
z1BL%GSsKcM(eL@_k1yjWA-LMZLzoApMUH$&bK`1IwTV@_{0DV0Ei<PnzX;IjSe^nY
z;BTR@p&H?nB{2bsD%P5z1BpeE?iK!y@+?YVQC%n)?>^U!-)U=K13z^Iv-(JVAR0v!
zc0{4qz^Aiwc?xvPa+@wo8miJd9B1Vd?CRp?A6uzAce51&Z2#k18AvkP=-#C6dTdaq
z{m-L=yEYzNZVn&ZjU#$qOObsX7-eMEg2~tJ+Ld0hr)}WDTViuCMq*l?9NV-p2Iu#l
z1Jve%0!YyMRU>}6AhGfV@sY-8{|-Zt%kd4FpMaII`7Esb$)X9NbvEgQfU_;Pmx#n$
zj+)!N*aWej+c}&dmz-1DnQjCmn3TnWv(Zl<dzsk9&y>fC)T;uF%OAX?y8xyz_5pgA
zfrwtM6Q>{8A3IC!sJrLBbK5}&xOVIxfLn?C+zbG@Dr|KbFAi~IR+9jy^DFinnhU=J
z`&vBxKDH%8fkhCQl{aQU$m5@KiIheAdC9?stIV>;#F93SA2$`b$OCM$GWvG}Pw#2*
zx7ilkfLxvL`B$?DTTMy|nTxDS<quIQ&QGBD&{6?|7Uj4CD(>*5?ve>O-s_;fQab#e
za><RbU?%hhct^lwBi#J0xm8#mDx1qZ%vgUSemVfD)7nUgq_dK?PNW0M_qt3<T^S{T
zqKx5r<Nr;2zBmr<0k;9$xc(hSE)-~8PK4AM^J<@M19EPARgHM`V_RPN@d2Xa4VjLj
zGf@SHT;#?tjMT?vsk`T>pSycwt*~7efrOy89MIq7FbKZ>mhNE~jueG`rJVd)AP-!A
z`S?BM`}z}=ri`S%;~}^UF`y?7{%wmopQh{lj934(ak;?qo0mY`NmR-m7(nxnq&?z_
zfqaSf_03HGxqBEQ+&C_KeEB_Py0@gGhJiBMWA=GmM<@7zF6$DsWn%C2$~U)xD>DHO
zfC<JpMC2cdU{^9zC4B?k?nFt|i=3Ry|B^XY%_A=bxC<7mr}7cn0D)SmLqM121K}f7
zs-OXo_db*oh2^kjzH}$BWEWEh=liv@+$;8!2u!Cr1e|wUwW%R^7BL_OVCC4p<tN8=
z+YH;U^13oqHZ)UtF~@JlU8K+9qn4>dL=Gs^TeFxR3`){;vT%#dt?K<nj^sBFmW#-9
ztk5%Ik5YFv;@~!*a#m&D+KNYT_wOLLItsm0%A)q^io~!o6Aaqlh{p&$-_;0Yt{1@n
zVJq~$HP3<~$<mSv4P8hhD)$9l*VY1Eka6&oB8VB)lFq~vTW;H%L3c>%_@kevQ(x+M
z5p+wNob-s3!px@odx>u0YA<mFymY2oVWmL>UN@?Nas|keZm-(`u(`-H{lb|GUv}ak
zdHnwXl9{*z(mAos8;!B?6Xqlr(faXx3r~3&dF>q+8^=-SY>F*OI~qRSe*Z9Xm>(M{
zZYRM~4@v9j2|rZ{00#_Z@3QLbyFb%9w8ShUg8o3_WaEP4h>CMK0jx4jD!LR)IDrd{
zE#qS8p>$zjg?n5SWA)51`BsS*-Mv$DGn$C})gs`0Y8oa$P+6NivqHMo`xsw`*&nCW
zyw86;fQm^az77Srjj(ON<r7&ij-Ba?FmPY$R~J2ucajdqJTpZ`^98h}?a4IYfYR+h
zF@pBp!S#{>$Mcv}IPmNYg7#BNHdICTE}bSMOhJyE7(g5ELA_TgbStY7o<K7oSNVYP
zwEqpDOayHaYCWGj*UiP+_2Pj-Ls4{~BPsj!vJNJ6{UXyexQ;eP&qt&ETpJsS8viM`
z|J3rEQ-D&|IvUJxnt`mUKtTvesGhU_-O~ZT9J0k9bq7cb#QAKs`Uy!Gd%i@_)u~7I
z1kfwd2f3#+e-+D0Gcb1?8ML~Wy}tWuO&&O7D2w9+PHp!#wA=%oia5Otm|wJo>@h!(
z_5(hO8s1O<6~}y$D^nf!YEHg>+C=F*kjS>V1o}E9cZ%=nr4Il&s<Q$Wf6)b<c4r9u
zHVVH1Z=S>dc?+jJs7hUn`QJ{S0I9|kb^f-7p%pGFmp9=ue{TbB4|O={U=O3JKU=@B
z=T3y!D5(ga-p^v05p<trH_n(l>ZFe*)ofCo{`70^8-C!g(Dn)}p~{Od;dHRcLW&?I
z(-0aa8h*u<hIv5mE~fnbo*4q-mQV$EDghCw(<}A;z^BnjQ7H&5==9Za5Do^NzNTMs
z1)XANdMV=t&{x5wvySIJ)A7F`ABy0mT>E}L`TP6U`{Y3D(}{8MfFot9XRhbR|F+lv
zdz<yVi@=#4trRrlOj}Ca-ycg0#E(wGc<ZkVtZH?v|L40W<K7IITFh23W2qSm?gHXs
zBt-+uld@x`Hl8pTE?)}!^E7dOI#jDV5Jto6VxManycObd0k8`Xev?BMe0wjUj*SNV
zcR;dAfL>%#InVA18r@P#)rDLgDPCpXxbNzT^~5YEJ%xA14aJ?nwY<53HPI>EF@~rr
zYaxUdCVw;lWHEte)f5~n_wCp`pIVcP<cUoicQK<$0dYP*w*M;&HraEVv<qW<I)_R$
zj%Rsie$149Ub!(oP<BsKCH8Q^+ZgI{+V1(w*JWj85k-H;l-@rFodW%pvLWOO=u~?R
zEogx~mVaA<A%9gz)C1V8`&V)oFaO&Fkl?>^In|SYmEm6_`4<`fMa+NU@c)KywEaAG
z2m;X;8p5tw{eR?b$0+^-Ow=IYkNS@T^P@Y|mjzEhxayo9G4RtP91K2vfl!?uY5%rm
zJahW~0?X;~-wWWUV)$1||Ek8n_Hb$m|DwjfQ2DQaIJJa-z39Kx;r}VV1bz^n`pfK(
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
zcmZ9OOKeqD6o%Kit%`~{S|k_|M0qG6rId;Sf>54Sd8&YDROBUyAdjLlFp-f%;s9}=
zaUuzcP8m6IVB)}mF>0KsL~({OUL<LIQ@8)O|KsKMmfZ5)|Ln8ZTK`)6oc3>6+fhu4
zh&}PGKAocI?2MI12X~z~u=_~V%6#ovsnJ>Fi=7>l_5c4X=55`(fAG+*W8JSDIQ&vi
z_Zx@zN9Uy*Bc^H1m0}<Y{fpQg_eGTY#Gf5MMj8Fl5ffsfwELyqUYlOr6_cVSZHlz%
z((dj!6U(Y~tEA14_KiM0u|@aZ7K^0K)c0Fz12GV*@_rko&64(LY>UOQT3S~;F6{wn
zOBLf*#USn-(jJudwNjfFPi0Mem9wR7&Dw^hHb>fD#q?rIOqMn=ly5m#+VNs$(Hrxn
zO^rvSJtXa+W{mYY#yn|X*6u0pjhnTuH&jE}E$xW3QZ;nM`s~4cY5erY4r#aK{d)BM
zy^e^-VvV#eIT7UoX+Ox9$(1kiv+R|&JU)(v*@G_C9_2!5zsE<hpz;N;`lM}_S4%5x
zg|vsI-Bo-zW}Vi?*NWR$#a*m*s!uuf77MDl?58*}D4+W(pO;9}TK&8*=3eP>p_rk1
zyH&@`T<=n8|HK?=i>1xV+GEm|6|*W&XJ!wUN&7<g&R3UMry9!T(rzl|XkCxA8F`(0
z921HyF}KP^K9wt^om4M3=KglYGtyQ{J5`*M1O0i{)=QJGQIE^=%`>T(rRFWxw|T!>
z+S%F}dF^#tQ?8MAQS-d8((r1nw83USCggssllE0DG>h(~?kg2LcGi9z6L&z`_c6B^
zU+veWbx%n9wqqb>D{Ib&=BIp8+SJ<5WA1%Q+9$fVr@B|YEjLKpq@1ajx!3-s&Pd#;
z{aWW>le8=HYMt_{Y1Xt?xmnsfs;#fOm;P>%#(b=ct=g|Ew12r(-=Eh^F0R(8KjqWX
zF2%Dt9X^BfP5#HJ_@kLK>-1F7&!@4ZWhS>t`JrV_)w6QDw0`yX<!aqtX*;BSC;t{z
zaWzxrbJ7kLzmAEqQ`)(<{9csygwE=Hnml~b^Pzl6+G(B3r8=vsNarrfU7|0G53+xF
z&%C@M?R@b|GY0drTiUp`dD$cFr?z=f-ume+TIXe-l+W7cWxur3ZS(S~w2LkN5%++!
z%Wd;=P}&B~c<a2pCat@;G$!Xm(hez?)_Hkd+PIqQ{eNB#OFP@rj}?l0MA{?DuXSGD
zkhZpMUXDt8SD)5-Ii~NLwlVW^T*~KqmbA{x32DC-*Jqr08I<<EX18@-PD*>aWuBRr
zH>I5~HjkN?x1^0%ey#KJwzRV?XOI}Dq%CX9?}9X5V;eQ`%)REjykYfty#%HA>yr}1
zBf_KuUJ;K2YaDo!j$uU{WNRE>69?495j1hgOpKq20W&dHCWgtxxR@9c6Juba`6k+H
zqJbt_WLhO^<l1<InRr;3cpR8G047G)#E_U60}~H{t9d`#YvRDyvqmdT9C#D0G;z4E
zr9S=c)h8u>^KCS-W|uzoOmxEJxLkEEkn@9_Gu>n7M!we-an)5qt{k!(Wa(&-qd|@a
zIU3VIy^RD>uW4J8SZi&2lZa!@S#d8hM)EGiHSt>bH)|aDe-jf&exsSl*+d;CYBN!}
z2{%mSY@&|Q#N4`G$R0rU1+rHV`!(_%>}RqET(vI{bqwWo)G?IU6)j~#ONnzp+~G{D
zFcH^8ToZ9k#5EDuL|hYH_&e`M7fhZeI^dik*8#aU$n`?x(nt{bH4=N_eLWNXs3%qv
zt&xcprfp5)erxVIcev+}dk*2tNZtisOzt^X-E*D~tQ$%Y>xObJ(A7*_HQ5a^I-<{T
zzG~Od>?CA&A>s@tzCWW+BNMvG6>-%SL9PgLMUX3k$Ymt&LVhM!#8p?sbI$HUb{ry?
zMuJ#ta<|ajL5SLX^=OlvJy)GQL{`IzKU27xGI7;JrlVOS)6v8lvKr1rRwg^dRkE^X
zC(-OKL{`2^RwiOx&HE9<gd6p&;YK~-vE6{|24puNy8+n^$ZkM(1F{<salJEf>xrH@
z2ILr!V?d4pIR@kykYhlO0XYWb7`W{ikYhlO0XYWb7?5K?jsZCaM2u?*BF44EZ@-Bl
zo|-9ZeiNhd1hVEgF`D1Rkl)0R-^7sL#E{>_5Yyvb{3b@*)71PXM%&la{3b^8n;7z&
z81kDK@|zg)n;1H#kE7W?H2VkHKgj+;_7Aduko|+~AH-Z<%?_Pt67x~d+Q}x-MQd+1
z3D>XXCkVOtSweopi9h7neKga`CJ`fLjkqaM7rP8+;%Xz|Ct4$GtTQ=h?r<HDYlB=b
zWDg+w0@*A2<NY8<gQ&NWAnG+yuZen1&Wd$ZG?MS2N|T>qT=g@I8NiLv1d)M>tW0ET
zB6|}RnW)l4<)ev7V!uWvSA^y&Ay*FB4T$}G2m6`W&qN(Vc|YnHN~}gpnb1;VGKo8!
ziMS@>nuu#6u8EyY#5EDuL>K<f`_ToHr-^R4N><xR$nHX9HIg7QHMuir?iS<@65TzA
v+;hl1hum}M`W@Z{%{xPm1~~)BSwYT}6U(}x1hH-?XX+Sa<+zY@ft=rex5o-x

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 01220/10326] 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 01221/10326] 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 01222/10326] 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 01223/10326] 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 01224/10326] 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 01225/10326] 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 01226/10326] 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 01227/10326] 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 01228/10326] 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 01229/10326] 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 01230/10326] 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 01231/10326] 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 01232/10326] 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 01233/10326] 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 01234/10326] 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 01235/10326] 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 01236/10326] 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 01237/10326] 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 01238/10326] 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 01239/10326] 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 01240/10326] 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 01241/10326] 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 01242/10326] 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 01243/10326] 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 01244/10326] 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 01245/10326] 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 01246/10326] 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 01247/10326] 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 01248/10326] 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 01249/10326] 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 01250/10326] 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 01251/10326] 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 01252/10326] 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 e2ea92e21f7d3a6fad4459a8cfdaadbbcfead410 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 4 Mar 2020 13:51:12 +0800
Subject: [PATCH 01253/10326] Use framework method to convert rad to deg

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 30b9c84538..49c4e7fa45 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -40,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             if (drawable is DrawableSpinner spinner)
             {
                 if (spinner.Disc.Valid)
-                    spinner.Disc.Rotate(180 / MathF.PI * (float)spinner.Clock.ElapsedFrameTime * 0.03f);
+                    spinner.Disc.Rotate(MathUtils.RadiansToDegrees((float)spinner.Clock.ElapsedFrameTime * 0.03f));
                 if (!spinner.SpmCounter.IsPresent)
                     spinner.SpmCounter.FadeIn(spinner.HitObject.TimeFadeIn);
             }

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 01254/10326] 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 01255/10326] 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 01256/10326] 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 01257/10326] 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 01258/10326] 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 01259/10326] 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 01260/10326] 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 01261/10326] 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 01262/10326] 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 01263/10326] 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 01264/10326] 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 01265/10326] 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 01266/10326] 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 01267/10326] 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 01268/10326] 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 01269/10326] 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 01270/10326] 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 01271/10326] 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 01272/10326] 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 01273/10326]  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 01274/10326] 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 01275/10326] 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 01276/10326] 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 01277/10326] 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 01278/10326] 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 01279/10326] 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 01280/10326] 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 01281/10326] 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 01282/10326] 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 01283/10326] 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 01284/10326] 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 01285/10326] 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 01286/10326] 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 01287/10326] 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 01288/10326] 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 01289/10326] 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 01290/10326] 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 01291/10326] 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 01292/10326] 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 01293/10326] 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 01294/10326] 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 01295/10326] 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 01296/10326] 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 01297/10326] 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 01298/10326] 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 01299/10326] 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 01300/10326] 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 01301/10326] 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 01302/10326] 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 01303/10326] 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 01304/10326] 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 01305/10326] 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 01306/10326] 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 01307/10326] 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 01308/10326] 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 01309/10326] 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 01310/10326] 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 01311/10326] 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 01312/10326] 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 01313/10326] 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 01314/10326] 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 01315/10326] 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 01316/10326] 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 01317/10326] 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 01318/10326] 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 d3937acfe9f8ed0d7ca91fbbeae293761ccddcfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 5 Mar 2020 20:11:14 +0100
Subject: [PATCH 01319/10326] Fix rank graph tooltip display

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

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index 77edfe2746..39fa0ca251 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Humanizer;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
@@ -70,8 +71,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
             return new TooltipDisplayContent
             {
-                Rank = $"#{rank:#,##0}",
-                Time = days == 0 ? "now" : $"{days} days ago"
+                Rank = $"#{rank:N0}",
+                Time = days == 0 ? "now" : $"{"day".ToQuantity(days)} ago"
             };
         }
 

From b1de47a6afb6089c31f047b95414b7b11c3a1537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 5 Mar 2020 20:34:33 +0100
Subject: [PATCH 01320/10326] Adjust graph sizings to match web

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

diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index de3d91f088..48671b8a70 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -141,13 +141,13 @@ namespace osu.Game.Overlays.Profile
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             RelativeSizeAxes = Axes.Y,
-                            Width = 1.5f,
+                            Width = 2,
                         },
                         movingBall = new CircularContainer
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.Centre,
-                            Size = new Vector2(18),
+                            Size = new Vector2(20),
                             Masking = true,
                             BorderThickness = 4,
                             RelativePositionAxes = Axes.Y,

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 01321/10326] 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 01322/10326] 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 1318f242c1cdd710b52ace6de9ce881ec24cb1fb Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 6 Mar 2020 02:12:30 +0300
Subject: [PATCH 01323/10326] Revert changes to basic implementation and remove
 redundant stuff

---
 .../Online/TestSceneBeatmapListingOverlay.cs  | 19 --------
 .../TestSceneBeatmapListingSearchSection.cs   | 25 ++--------
 .../BeatmapListingSearchSection.cs            | 33 ++++---------
 .../BeatmapListing/BeatmapSearchParameters.cs | 30 ------------
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 47 +++++--------------
 5 files changed, 28 insertions(+), 126 deletions(-)
 delete mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchParameters.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 4dceb57129..7c05d99c59 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using osu.Game.Overlays;
 using NUnit.Framework;
-using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -25,24 +24,6 @@ namespace osu.Game.Tests.Visual.Online
             Add(overlay = new BeatmapListingOverlay());
         }
 
-        [Test]
-        public void TestShowTag()
-        {
-            AddStep("Show Rem tag", () => overlay.ShowTag("Rem"));
-        }
-
-        [Test]
-        public void TestShowGenre()
-        {
-            AddStep("Show Anime genre", () => overlay.ShowGenre(BeatmapSearchGenre.Anime));
-        }
-
-        [Test]
-        public void TestShowLanguage()
-        {
-            AddStep("Show Japanese language", () => overlay.ShowLanguage(BeatmapSearchLanguage.Japanese));
-        }
-
         [Test]
         public void TestShow()
         {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
index f809c780f1..69e3fbd75f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
@@ -11,7 +11,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
-using osu.Game.Online.API.Requests;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
@@ -57,14 +56,11 @@ namespace osu.Game.Tests.Visual.UserInterface
                 }
             });
 
-            section.SearchParameters.BindValueChanged(parameters =>
-            {
-                query.Text = $"Query: {parameters.NewValue.Query}";
-                ruleset.Text = $"Ruleset: {parameters.NewValue.Ruleset}";
-                category.Text = $"Category: {parameters.NewValue.Category}";
-                genre.Text = $"Genre: {parameters.NewValue.Genre}";
-                language.Text = $"Language: {parameters.NewValue.Language}";
-            }, true);
+            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);
+            section.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);
+            section.Language.BindValueChanged(l => language.Text = $"Language: {l.NewValue}", true);
         }
 
         [Test]
@@ -75,17 +71,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Set null beatmap", () => section.BeatmapSet = null);
         }
 
-        [Test]
-        public void TestParametersSet()
-        {
-            AddStep("Set big black tag", () => section.SetTag("big black"));
-            AddAssert("Check query is big black", () => section.SearchParameters.Value.Query == "big black");
-            AddStep("Set anime genre", () => section.SetGenre(BeatmapSearchGenre.Anime));
-            AddAssert("Check genre is anime", () => section.SearchParameters.Value.Genre == BeatmapSearchGenre.Anime);
-            AddStep("Set japanese language", () => section.SetLanguage(BeatmapSearchLanguage.Japanese));
-            AddAssert("Check language is japanese", () => section.SearchParameters.Value.Language == BeatmapSearchLanguage.Japanese);
-        }
-
         private static readonly BeatmapSetInfo beatmap_set = new BeatmapSetInfo
         {
             OnlineInfo = new BeatmapSetOnlineInfo
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
index 121b101861..501abbf2c8 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
@@ -13,12 +13,21 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osuTK.Graphics;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
     public class BeatmapListingSearchSection : CompositeDrawable
     {
-        public Bindable<BeatmapSearchParameters> SearchParameters = new Bindable<BeatmapSearchParameters>();
+        public Bindable<string> Query => textBox.Current;
+
+        public Bindable<RulesetInfo> Ruleset => modeFilter.Current;
+
+        public Bindable<BeatmapSearchCategory> Category => categoryFilter.Current;
+
+        public Bindable<BeatmapSearchGenre> Genre => genreFilter.Current;
+
+        public Bindable<BeatmapSearchLanguage> Language => languageFilter.Current;
 
         public BeatmapSetInfo BeatmapSet
         {
@@ -105,12 +114,6 @@ namespace osu.Game.Overlays.BeatmapListing
             });
 
             categoryFilter.Current.Value = BeatmapSearchCategory.Leaderboard;
-
-            textBox.Current.BindValueChanged(_ => changeSearchParameters());
-            modeFilter.Current.BindValueChanged(_ => changeSearchParameters());
-            categoryFilter.Current.BindValueChanged(_ => changeSearchParameters());
-            genreFilter.Current.BindValueChanged(_ => changeSearchParameters());
-            languageFilter.Current.BindValueChanged(_ => changeSearchParameters(), true);
         }
 
         [BackgroundDependencyLoader]
@@ -119,22 +122,6 @@ namespace osu.Game.Overlays.BeatmapListing
             background.Colour = colourProvider.Dark6;
         }
 
-        public void SetTag(string tag) => textBox.Current.Value = tag;
-
-        public void SetGenre(BeatmapSearchGenre genre) => genreFilter.Current.Value = genre;
-
-        public void SetLanguage(BeatmapSearchLanguage language) => languageFilter.Current.Value = language;
-
-        private void changeSearchParameters()
-        {
-            SearchParameters.Value = new BeatmapSearchParameters(
-                textBox.Current.Value,
-                modeFilter.Current.Value,
-                categoryFilter.Current.Value,
-                genreFilter.Current.Value,
-                languageFilter.Current.Value);
-        }
-
         private class BeatmapSearchTextBox : SearchTextBox
         {
             protected override Color4 SelectionColour => Color4.Gray;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchParameters.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchParameters.cs
deleted file mode 100644
index 6a681503f5..0000000000
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchParameters.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.Game.Online.API.Requests;
-using osu.Game.Rulesets;
-
-namespace osu.Game.Overlays.BeatmapListing
-{
-    public class BeatmapSearchParameters
-    {
-        public readonly string Query;
-
-        public readonly RulesetInfo Ruleset;
-
-        public readonly BeatmapSearchCategory Category;
-
-        public readonly BeatmapSearchGenre Genre;
-
-        public readonly BeatmapSearchLanguage Language;
-
-        public BeatmapSearchParameters(string query, RulesetInfo ruleset, BeatmapSearchCategory category, BeatmapSearchGenre genre, BeatmapSearchLanguage language)
-        {
-            Query = query;
-            Ruleset = ruleset;
-            Category = category;
-            Genre = genre;
-            Language = language;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index ebe4b7fe61..1a5257457f 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -153,43 +153,22 @@ namespace osu.Game.Overlays
             var sortCriteria = sortControl.Current;
             var sortDirection = sortControl.SortDirection;
 
-            searchSection.SearchParameters.BindValueChanged(parameters =>
+            searchSection.Query.BindValueChanged(query =>
             {
-                if (parameters.OldValue.Query != parameters.NewValue.Query)
-                {
-                    sortCriteria.Value = string.IsNullOrEmpty(parameters.NewValue.Query) ? DirectSortCriteria.Ranked : DirectSortCriteria.Relevance;
-                    sortDirection.Value = SortDirection.Descending;
-
-                    queueUpdateSearch(true);
-                }
-                else
-                {
-                    queueUpdateSearch();
-                }
+                sortCriteria.Value = string.IsNullOrEmpty(query.NewValue) ? DirectSortCriteria.Ranked : DirectSortCriteria.Relevance;
+                sortDirection.Value = SortDirection.Descending;
+                queueUpdateSearch(true);
             });
 
+            searchSection.Ruleset.BindValueChanged(_ => queueUpdateSearch());
+            searchSection.Category.BindValueChanged(_ => queueUpdateSearch());
+            searchSection.Genre.BindValueChanged(_ => queueUpdateSearch());
+            searchSection.Language.BindValueChanged(_ => queueUpdateSearch());
+
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
         }
 
-        public void ShowTag(string tag)
-        {
-            searchSection.SetTag(tag);
-            Show();
-        }
-
-        public void ShowGenre(BeatmapSearchGenre genre)
-        {
-            searchSection.SetGenre(genre);
-            Show();
-        }
-
-        public void ShowLanguage(BeatmapSearchLanguage language)
-        {
-            searchSection.SetLanguage(language);
-            Show();
-        }
-
         private ScheduledDelegate queryChangedDebounce;
 
         private LoadingLayer loadingLayer;
@@ -218,13 +197,13 @@ namespace osu.Game.Overlays
 
             loadingLayer.Show();
 
-            getSetsRequest = new SearchBeatmapSetsRequest(searchSection.SearchParameters.Value.Query, searchSection.SearchParameters.Value.Ruleset)
+            getSetsRequest = new SearchBeatmapSetsRequest(searchSection.Query.Value, searchSection.Ruleset.Value)
             {
-                SearchCategory = searchSection.SearchParameters.Value.Category,
+                SearchCategory = searchSection.Category.Value,
                 SortCriteria = sortControl.Current.Value,
                 SortDirection = sortControl.SortDirection.Value,
-                Genre = searchSection.SearchParameters.Value.Genre,
-                Language = searchSection.SearchParameters.Value.Language
+                Genre = searchSection.Genre.Value,
+                Language = searchSection.Language.Value
             };
 
             getSetsRequest.Success += response => Schedule(() => recreatePanels(response));

From c7384b9717a7cf9d063a502a8b219c04f98cc991 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 6 Mar 2020 03:09:43 +0300
Subject: [PATCH 01324/10326] Implement BeatmapListingSearchHandler component

---
 .../Online/TestSceneBeatmapListingOverlay.cs  |   2 +
 .../BeatmapListingSearchHandler.cs            | 163 +++++++++++++++++
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 172 +++---------------
 3 files changed, 191 insertions(+), 146 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapListingSearchHandler.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 7c05d99c59..f80687e142 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using osu.Game.Overlays;
 using NUnit.Framework;
+using osu.Game.Overlays.BeatmapListing;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -13,6 +14,7 @@ namespace osu.Game.Tests.Visual.Online
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(BeatmapListingOverlay),
+            typeof(BeatmapListingSearchHandler)
         };
 
         protected override bool UseOnlineAPI => true;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchHandler.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchHandler.cs
new file mode 100644
index 0000000000..ce3d37fb98
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchHandler.cs
@@ -0,0 +1,163 @@
+// Copyright (c) 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.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.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.Direct;
+using osu.Game.Rulesets;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapListingSearchHandler : CompositeDrawable
+    {
+        public Action<List<BeatmapSetInfo>> SearchFinished;
+        public Action SearchStarted;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        private readonly BeatmapListingSearchSection searchSection;
+        private readonly BeatmapListingSortTabControl sortControl;
+        private readonly Box sortControlBackground;
+
+        private SearchBeatmapSetsRequest getSetsRequest;
+
+        public BeatmapListingSearchHandler()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        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),
+                        },
+                        Child = searchSection = new BeatmapListingSearchSection(),
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 40,
+                        Children = new Drawable[]
+                        {
+                            sortControlBackground = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both
+                            },
+                            sortControl = new BeatmapListingSortTabControl
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                Margin = new MarginPadding { Left = 20 }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            sortControlBackground.Colour = colourProvider.Background5;
+        }
+
+        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;
+                queueUpdateSearch(true);
+            });
+
+            searchSection.Ruleset.BindValueChanged(_ => queueUpdateSearch());
+            searchSection.Category.BindValueChanged(_ => queueUpdateSearch());
+            searchSection.Genre.BindValueChanged(_ => queueUpdateSearch());
+            searchSection.Language.BindValueChanged(_ => queueUpdateSearch());
+
+            sortCriteria.BindValueChanged(_ => queueUpdateSearch());
+            sortDirection.BindValueChanged(_ => queueUpdateSearch());
+        }
+
+        private ScheduledDelegate queryChangedDebounce;
+
+        private void queueUpdateSearch(bool queryTextChanged = false)
+        {
+            SearchStarted?.Invoke();
+
+            getSetsRequest?.Cancel();
+
+            queryChangedDebounce?.Cancel();
+            queryChangedDebounce = Scheduler.AddDelayed(updateSearch, queryTextChanged ? 500 : 100);
+        }
+
+        private void updateSearch()
+        {
+            getSetsRequest = new SearchBeatmapSetsRequest(searchSection.Query.Value, searchSection.Ruleset.Value)
+            {
+                SearchCategory = searchSection.Category.Value,
+                SortCriteria = sortControl.Current.Value,
+                SortDirection = sortControl.SortDirection.Value,
+                Genre = searchSection.Genre.Value,
+                Language = searchSection.Language.Value
+            };
+
+            getSetsRequest.Success += response => Schedule(() => onSearchFinished(response));
+
+            api.Queue(getSetsRequest);
+        }
+
+        private void onSearchFinished(SearchBeatmapSetsResponse response)
+        {
+            var beatmaps = response.BeatmapSets.Select(r => r.ToBeatmapSet(rulesets)).ToList();
+
+            searchSection.BeatmapSet = response.Total == 0 ? null : beatmaps.First();
+
+            SearchFinished?.Invoke(beatmaps);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            getSetsRequest?.Cancel();
+            queryChangedDebounce?.Cancel();
+
+            base.Dispose(isDisposing);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 1a5257457f..dd8dc4a79d 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -1,27 +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.Collections.Generic;
 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;
 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;
-using osu.Game.Rulesets;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
@@ -30,14 +26,9 @@ namespace osu.Game.Overlays
         [Resolved]
         private PreviewTrackManager previewTrackManager { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
-        private SearchBeatmapSetsRequest getSetsRequest;
-
         private Drawable currentContent;
-        private BeatmapListingSearchSection searchSection;
-        private BeatmapListingSortTabControl sortControl;
+        private LoadingLayer loadingLayer;
+        private Container panelTarget;
 
         public BeatmapListingOverlay()
             : base(OverlayColourScheme.Blue)
@@ -63,27 +54,13 @@ namespace osu.Game.Overlays
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
                         Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 10),
                         Children = new Drawable[]
                         {
-                            new FillFlowContainer
+                            new BeatmapListingHeader(),
+                            new BeatmapListingSearchHandler
                             {
-                                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(),
-                                }
+                                SearchStarted = onSearchStarted,
+                                SearchFinished = onSearchFinished,
                             },
                             new Container
                             {
@@ -96,132 +73,41 @@ namespace osu.Game.Overlays
                                         RelativeSizeAxes = Axes.Both,
                                         Colour = ColourProvider.Background4,
                                     },
-                                    new FillFlowContainer
+                                    panelTarget = new Container
                                     {
-                                        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 }
-                                                    }
-                                                }
-                                            },
-                                            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),
-                                                }
-                                            },
-                                        }
-                                    }
+                                        RelativeSizeAxes = Axes.X,
+                                        Padding = new MarginPadding { Horizontal = 20 }
+                                    },
+                                    loadingLayer = new LoadingLayer(panelTarget)
                                 }
-                            }
+                            },
                         }
                     }
                 }
             };
         }
 
-        protected override void LoadComplete()
+        private CancellationTokenSource cancellationToken;
+
+        private void onSearchStarted()
         {
-            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;
-                queueUpdateSearch(true);
-            });
-
-            searchSection.Ruleset.BindValueChanged(_ => queueUpdateSearch());
-            searchSection.Category.BindValueChanged(_ => queueUpdateSearch());
-            searchSection.Genre.BindValueChanged(_ => queueUpdateSearch());
-            searchSection.Language.BindValueChanged(_ => queueUpdateSearch());
-
-            sortCriteria.BindValueChanged(_ => queueUpdateSearch());
-            sortDirection.BindValueChanged(_ => queueUpdateSearch());
-        }
-
-        private ScheduledDelegate queryChangedDebounce;
-
-        private LoadingLayer loadingLayer;
-        private Container panelTarget;
-
-        private void queueUpdateSearch(bool queryTextChanged = false)
-        {
-            getSetsRequest?.Cancel();
-
-            queryChangedDebounce?.Cancel();
-            queryChangedDebounce = Scheduler.AddDelayed(updateSearch, queryTextChanged ? 500 : 100);
-        }
-
-        private void updateSearch()
-        {
-            if (!IsLoaded)
-                return;
-
-            if (State.Value == Visibility.Hidden)
-                return;
-
-            if (API == null)
-                return;
+            cancellationToken?.Cancel();
 
             previewTrackManager.StopAnyPlaying(this);
 
-            loadingLayer.Show();
-
-            getSetsRequest = new SearchBeatmapSetsRequest(searchSection.Query.Value, searchSection.Ruleset.Value)
-            {
-                SearchCategory = searchSection.Category.Value,
-                SortCriteria = sortControl.Current.Value,
-                SortDirection = sortControl.SortDirection.Value,
-                Genre = searchSection.Genre.Value,
-                Language = searchSection.Language.Value
-            };
-
-            getSetsRequest.Success += response => Schedule(() => recreatePanels(response));
-
-            API.Queue(getSetsRequest);
+            if (panelTarget.Any())
+                loadingLayer.Show();
         }
 
-        private void recreatePanels(SearchBeatmapSetsResponse response)
+        private void onSearchFinished(List<BeatmapSetInfo> beatmaps)
         {
-            if (response.Total == 0)
+            if (!beatmaps.Any())
             {
-                searchSection.BeatmapSet = null;
-                LoadComponentAsync(new NotFoundDrawable(), addContentToPlaceholder);
+                LoadComponentAsync(new NotFoundDrawable(), addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
                 return;
             }
 
-            var beatmaps = response.BeatmapSets.Select(r => r.ToBeatmapSet(rulesets)).ToList();
-
             var newPanels = new FillFlowContainer<DirectPanel>
             {
                 RelativeSizeAxes = Axes.X,
@@ -236,18 +122,14 @@ namespace osu.Game.Overlays
                 })
             };
 
-            LoadComponentAsync(newPanels, loaded =>
-            {
-                addContentToPlaceholder(loaded);
-                searchSection.BeatmapSet = beatmaps.First();
-            });
+            LoadComponentAsync(newPanels, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
         private void addContentToPlaceholder(Drawable content)
         {
             loadingLayer.Hide();
 
-            Drawable lastContent = currentContent;
+            var lastContent = currentContent;
 
             if (lastContent != null)
             {
@@ -266,9 +148,7 @@ namespace osu.Game.Overlays
 
         protected override void Dispose(bool isDisposing)
         {
-            getSetsRequest?.Cancel();
-            queryChangedDebounce?.Cancel();
-
+            cancellationToken?.Cancel();
             base.Dispose(isDisposing);
         }
 

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 01325/10326] 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 01326/10326] 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 01327/10326] 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 01328/10326] 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 01329/10326] 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 01330/10326] 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 01331/10326] 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 01332/10326] 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 01333/10326] 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 01334/10326] 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 01335/10326] 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 01336/10326] 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 01337/10326] 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 01338/10326] 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 01339/10326] 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 d68d7edea332e37df2610fa91316ceb7692dabd4 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Sat, 7 Mar 2020 14:08:13 -0800
Subject: [PATCH 01340/10326] Start background video playback based on provided
 offset

---
 osu.Game/Beatmaps/BeatmapMetadata.cs          |   2 +
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  |   7 +-
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  |   2 +-
 .../20200307015200_AddVideoOffset.Designer.cs | 508 ++++++++++++++++++
 .../20200307015200_AddVideoOffset.cs          |  23 +
 .../Migrations/OsuDbContextModelSnapshot.cs   |   2 +
 osu.Game/Screens/Play/DimmableVideo.cs        |  42 +-
 .../Screens/Play/GameplayClockContainer.cs    |   4 +
 osu.Game/Screens/Play/Player.cs               |   2 +-
 9 files changed, 581 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game/Migrations/20200307015200_AddVideoOffset.Designer.cs
 create mode 100644 osu.Game/Migrations/20200307015200_AddVideoOffset.cs

diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 9267527d79..a353b1a0b6 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Beatmaps
         public int PreviewTime { get; set; }
         public string AudioFile { get; set; }
         public string BackgroundFile { get; set; }
+        public int VideoOffset { get; set; }
         public string VideoFile { get; set; }
 
         public override string ToString() => $"{Artist} - {Title} ({Author})";
@@ -83,6 +84,7 @@ namespace osu.Game.Beatmaps
                    && PreviewTime == other.PreviewTime
                    && AudioFile == other.AudioFile
                    && BackgroundFile == other.BackgroundFile
+                   && VideoOffset == other.VideoOffset
                    && VideoFile == other.VideoFile;
         }
     }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 4b01b2490e..8fe08a61b7 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -6,11 +6,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using osu.Framework.Extensions;
-using osu.Game.Beatmaps.Timing;
-using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.IO;
 using osu.Game.Beatmaps.Legacy;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.IO;
+using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Beatmaps.Formats
 {
@@ -304,6 +304,7 @@ namespace osu.Game.Beatmaps.Formats
                     break;
 
                 case LegacyEventType.Video:
+                    beatmap.BeatmapInfo.Metadata.VideoOffset = Parsing.ParseInt(split[1]);
                     beatmap.BeatmapInfo.Metadata.VideoFile = CleanFilename(split[2]);
                     break;
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 09f40ce7b6..7e3e3aacd8 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Beatmaps.Formats
                 writer.WriteLine(FormattableString.Invariant($"{(int)LegacyEventType.Background},0,\"{beatmap.BeatmapInfo.Metadata.BackgroundFile}\",0,0"));
 
             if (!string.IsNullOrEmpty(beatmap.BeatmapInfo.Metadata.VideoFile))
-                writer.WriteLine(FormattableString.Invariant($"{(int)LegacyEventType.Video},0,\"{beatmap.BeatmapInfo.Metadata.VideoFile}\",0,0"));
+                writer.WriteLine(FormattableString.Invariant($"{(int)LegacyEventType.Video},{beatmap.BeatmapInfo.Metadata.VideoOffset},\"{beatmap.BeatmapInfo.Metadata.VideoFile}\",0,0"));
 
             foreach (var b in beatmap.Breaks)
                 writer.WriteLine(FormattableString.Invariant($"{(int)LegacyEventType.Break},{b.StartTime},{b.EndTime}"));
diff --git a/osu.Game/Migrations/20200307015200_AddVideoOffset.Designer.cs b/osu.Game/Migrations/20200307015200_AddVideoOffset.Designer.cs
new file mode 100644
index 0000000000..10fea5a8bc
--- /dev/null
+++ b/osu.Game/Migrations/20200307015200_AddVideoOffset.Designer.cs
@@ -0,0 +1,508 @@
+// <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("20200307015200_AddVideoOffset")]
+    partial class AddVideoOffset
+    {
+        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.Property<int>("VideoOffset");
+
+                    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/20200307015200_AddVideoOffset.cs b/osu.Game/Migrations/20200307015200_AddVideoOffset.cs
new file mode 100644
index 0000000000..06c456c551
--- /dev/null
+++ b/osu.Game/Migrations/20200307015200_AddVideoOffset.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace osu.Game.Migrations
+{
+    public partial class AddVideoOffset : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "VideoOffset",
+                table: "BeatmapMetadata",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "VideoOffset",
+                table: "BeatmapMetadata");
+        }
+    }
+}
diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
index bc4fc3342d..6f91688ddb 100644
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
@@ -141,6 +141,8 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("VideoFile");
 
+                    b.Property<int>("VideoOffset");
+
                     b.HasKey("ID");
 
                     b.ToTable("BeatmapMetadata");
diff --git a/osu.Game/Screens/Play/DimmableVideo.cs b/osu.Game/Screens/Play/DimmableVideo.cs
index 1a01cace17..2e080d9c2b 100644
--- a/osu.Game/Screens/Play/DimmableVideo.cs
+++ b/osu.Game/Screens/Play/DimmableVideo.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Video;
+using osu.Framework.Timing;
 using osu.Game.Graphics.Containers;
 using osuTK.Graphics;
 
@@ -14,11 +15,13 @@ namespace osu.Game.Screens.Play
     public class DimmableVideo : UserDimContainer
     {
         private readonly VideoSprite video;
+        private readonly int offset;
         private DrawableVideo drawableVideo;
 
-        public DimmableVideo(VideoSprite video)
+        public DimmableVideo(VideoSprite video, int offset)
         {
             this.video = video;
+            this.offset = offset;
         }
 
         [BackgroundDependencyLoader]
@@ -46,7 +49,7 @@ namespace osu.Game.Screens.Play
             if (!ShowVideo.Value && !IgnoreUserSettings.Value)
                 return;
 
-            drawableVideo = new DrawableVideo(video);
+            drawableVideo = new DrawableVideo(video, offset);
 
             if (async)
                 LoadComponentAsync(drawableVideo, Add);
@@ -56,8 +59,15 @@ namespace osu.Game.Screens.Play
 
         private class DrawableVideo : Container
         {
-            public DrawableVideo(VideoSprite video)
+            private readonly Drawable cover;
+            private readonly int offset;
+            private readonly ManualClock videoClock;
+            private bool videoStarted;
+
+            public DrawableVideo(VideoSprite video, int offset)
             {
+                this.offset = offset;
+
                 RelativeSizeAxes = Axes.Both;
                 Masking = true;
 
@@ -66,14 +76,17 @@ namespace osu.Game.Screens.Play
                 video.Anchor = Anchor.Centre;
                 video.Origin = Anchor.Centre;
 
-                AddRangeInternal(new Drawable[]
+                videoClock = new ManualClock();
+                video.Clock = new FramedClock(videoClock);
+
+                AddRangeInternal(new[]
                 {
-                    new Box
+                    video,
+                    cover = new Box
                     {
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4.Black,
                     },
-                    video,
                 });
             }
 
@@ -83,6 +96,23 @@ namespace osu.Game.Screens.Play
                 if (clock != null)
                     Clock = clock;
             }
+
+            protected override void Update()
+            {
+                if (videoClock != null && Clock.CurrentTime > offset)
+                {
+                    if (!videoStarted)
+                    {
+                        cover.FadeOut(500);
+                        videoStarted = true;
+                    }
+
+                    // handle seeking before the video starts (break skipping, replay seek)
+                    videoClock.CurrentTime = Clock.CurrentTime - offset;
+                }
+
+                base.Update();
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 591e969ad8..da4829d484 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -116,6 +116,10 @@ namespace osu.Game.Screens.Play
             if (beatmap.BeatmapInfo.AudioLeadIn > 0)
                 startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
 
+            // some beatmaps have no AudioLeadIn but the video starts before the first object
+            if (beatmap.Video != null && beatmap.Metadata.VideoOffset != 0)
+                startTime = Math.Min(startTime, beatmap.Metadata.VideoOffset);
+
             Seek(startTime);
 
             adjustableClock.ProcessFrame();
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index bcadba14af..22d90d4ac1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Screens.Play
 
         private void addUnderlayComponents(Container target)
         {
-            target.Add(DimmableVideo = new DimmableVideo(Beatmap.Value.Video) { RelativeSizeAxes = Axes.Both });
+            target.Add(DimmableVideo = new DimmableVideo(Beatmap.Value.Video, Beatmap.Value.Metadata.VideoOffset) { RelativeSizeAxes = Axes.Both });
             target.Add(DimmableStoryboard = new DimmableStoryboard(Beatmap.Value.Storyboard) { RelativeSizeAxes = Axes.Both });
         }
 

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 01341/10326] 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 76c832518fcf15f53581c5972efbfd7451584884 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Sat, 7 Mar 2020 21:32:03 -0800
Subject: [PATCH 01342/10326] Render video as a part of the storyboard

---
 osu.Game.Tests/WaveformTestBeatmap.cs         |   3 -
 osu.Game/Beatmaps/BeatmapManager.cs           |   2 -
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs |  19 -
 osu.Game/Beatmaps/BeatmapMetadata.cs          |   2 -
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs      |   3 -
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  |   5 -
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  |   3 -
 .../Formats/LegacyStoryboardDecoder.cs        |  17 +-
 osu.Game/Beatmaps/IWorkingBeatmap.cs          |   6 -
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  15 +-
 .../20200307015200_AddVideoOffset.Designer.cs | 508 ------------------
 .../20200307015200_AddVideoOffset.cs          |  23 -
 osu.Game/Rulesets/Mods/ModCinema.cs           |   1 -
 osu.Game/Screens/Play/DimmableVideo.cs        | 118 ----
 .../Screens/Play/GameplayClockContainer.cs    |  11 +-
 osu.Game/Screens/Play/Player.cs               |   3 -
 .../Drawables/DrawableStoryboardVideo.cs      |  82 +++
 osu.Game/Storyboards/Storyboard.cs            |   3 +-
 osu.Game/Storyboards/StoryboardVideo.cs       |  25 +
 .../Tests/Beatmaps/BeatmapConversionTest.cs   |   3 -
 osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs |   3 -
 21 files changed, 136 insertions(+), 719 deletions(-)
 delete mode 100644 osu.Game/Migrations/20200307015200_AddVideoOffset.Designer.cs
 delete mode 100644 osu.Game/Migrations/20200307015200_AddVideoOffset.cs
 delete mode 100644 osu.Game/Screens/Play/DimmableVideo.cs
 create mode 100644 osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
 create mode 100644 osu.Game/Storyboards/StoryboardVideo.cs

diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index 53ce5def32..90c91eb007 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Video;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
@@ -51,8 +50,6 @@ namespace osu.Game.Tests
 
         protected override Texture GetBackground() => null;
 
-        protected override VideoSprite GetVideo() => null;
-
         protected override Waveform GetWaveform() => new Waveform(trackStore.GetStream(firstAudioFile));
 
         protected override Track GetTrack() => trackStore.Get(firstAudioFile);
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 31869f9310..abb3f8ac42 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -14,7 +14,6 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Video;
 using osu.Framework.Lists;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -403,7 +402,6 @@ namespace osu.Game.Beatmaps
 
             protected override IBeatmap GetBeatmap() => beatmap;
             protected override Texture GetBackground() => null;
-            protected override VideoSprite GetVideo() => null;
             protected override Track GetTrack() => null;
         }
 
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 1991770518..e62a9bb39d 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Video;
 using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps.Formats;
@@ -67,24 +66,6 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            protected override VideoSprite GetVideo()
-            {
-                if (Metadata?.VideoFile == null)
-                    return null;
-
-                try
-                {
-                    var stream = textureStore.GetStream(getPathForFile(Metadata.VideoFile));
-
-                    return stream == null ? null : new VideoSprite(stream);
-                }
-                catch (Exception e)
-                {
-                    Logger.Error(e, "Video failed to load");
-                    return null;
-                }
-            }
-
             protected override Track GetTrack()
             {
                 try
diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index a353b1a0b6..9267527d79 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -52,7 +52,6 @@ namespace osu.Game.Beatmaps
         public int PreviewTime { get; set; }
         public string AudioFile { get; set; }
         public string BackgroundFile { get; set; }
-        public int VideoOffset { get; set; }
         public string VideoFile { get; set; }
 
         public override string ToString() => $"{Artist} - {Title} ({Author})";
@@ -84,7 +83,6 @@ namespace osu.Game.Beatmaps
                    && PreviewTime == other.PreviewTime
                    && AudioFile == other.AudioFile
                    && BackgroundFile == other.BackgroundFile
-                   && VideoOffset == other.VideoOffset
                    && VideoFile == other.VideoFile;
         }
     }
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index bfcc38e4a9..8080e94075 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -7,7 +7,6 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Video;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
@@ -45,8 +44,6 @@ namespace osu.Game.Beatmaps
 
         protected override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4");
 
-        protected override VideoSprite GetVideo() => null;
-
         protected override Track GetTrack() => GetVirtualTrack();
 
         private class DummyRulesetInfo : RulesetInfo
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 8fe08a61b7..f5b27eddd2 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -303,11 +303,6 @@ namespace osu.Game.Beatmaps.Formats
                     beatmap.BeatmapInfo.Metadata.BackgroundFile = CleanFilename(split[2]);
                     break;
 
-                case LegacyEventType.Video:
-                    beatmap.BeatmapInfo.Metadata.VideoOffset = Parsing.ParseInt(split[1]);
-                    beatmap.BeatmapInfo.Metadata.VideoFile = CleanFilename(split[2]);
-                    break;
-
                 case LegacyEventType.Break:
                     double start = getOffsetTime(Parsing.ParseDouble(split[1]));
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 7e3e3aacd8..ec2ca30535 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -133,9 +133,6 @@ namespace osu.Game.Beatmaps.Formats
             if (!string.IsNullOrEmpty(beatmap.BeatmapInfo.Metadata.BackgroundFile))
                 writer.WriteLine(FormattableString.Invariant($"{(int)LegacyEventType.Background},0,\"{beatmap.BeatmapInfo.Metadata.BackgroundFile}\",0,0"));
 
-            if (!string.IsNullOrEmpty(beatmap.BeatmapInfo.Metadata.VideoFile))
-                writer.WriteLine(FormattableString.Invariant($"{(int)LegacyEventType.Video},{beatmap.BeatmapInfo.Metadata.VideoOffset},\"{beatmap.BeatmapInfo.Metadata.VideoFile}\",0,0"));
-
             foreach (var b in beatmap.Breaks)
                 writer.WriteLine(FormattableString.Invariant($"{(int)LegacyEventType.Break},{b.StartTime},{b.EndTime}"));
         }
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 6569f76b2d..b44d4947d4 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -5,13 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using osuTK;
-using osuTK.Graphics;
 using osu.Framework.Graphics;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps.Legacy;
 using osu.Game.IO;
 using osu.Game.Storyboards;
-using osu.Game.Beatmaps.Legacy;
-using osu.Framework.Utils;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.Formats
 {
@@ -88,6 +88,15 @@ namespace osu.Game.Beatmaps.Formats
 
                 switch (type)
                 {
+                    case LegacyEventType.Video:
+                    {
+                        var offset = Parsing.ParseInt(split[1]);
+                        var filename = CleanFilename(split[2]);
+
+                        storyboard.GetLayer("Video").Add(new StoryboardVideo(filename, offset));
+                        break;
+                    }
+
                     case LegacyEventType.Sprite:
                     {
                         var layer = parseLayer(split[1]);
diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 5f1f0d1e40..155e603d30 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Video;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -26,11 +25,6 @@ namespace osu.Game.Beatmaps
         /// </summary>
         Texture Background { get; }
 
-        /// <summary>
-        /// Retrieves the video background file for this <see cref="WorkingBeatmap"/>.
-        /// </summary>
-        VideoSprite Video { get; }
-
         /// <summary>
         /// Retrieves the audio track for this <see cref="WorkingBeatmap"/>.
         /// </summary>
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 1e1ffad81e..ad94ae8050 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -1,23 +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.Audio.Track;
-using osu.Framework.Graphics.Textures;
-using osu.Game.Rulesets.Mods;
 using System;
 using System.Collections.Generic;
-using osu.Game.Storyboards;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Audio;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Logging;
 using osu.Framework.Statistics;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
-using osu.Framework.Graphics.Video;
-using osu.Framework.Logging;
+using osu.Game.Storyboards;
 
 namespace osu.Game.Beatmaps
 {
@@ -208,10 +207,6 @@ namespace osu.Game.Beatmaps
         protected abstract Texture GetBackground();
         private readonly RecyclableLazy<Texture> background;
 
-        public VideoSprite Video => GetVideo();
-
-        protected abstract VideoSprite GetVideo();
-
         public bool TrackLoaded => track.IsResultAvailable;
         public Track Track => track.Value;
         protected abstract Track GetTrack();
diff --git a/osu.Game/Migrations/20200307015200_AddVideoOffset.Designer.cs b/osu.Game/Migrations/20200307015200_AddVideoOffset.Designer.cs
deleted file mode 100644
index 10fea5a8bc..0000000000
--- a/osu.Game/Migrations/20200307015200_AddVideoOffset.Designer.cs
+++ /dev/null
@@ -1,508 +0,0 @@
-// <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("20200307015200_AddVideoOffset")]
-    partial class AddVideoOffset
-    {
-        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.Property<int>("VideoOffset");
-
-                    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/20200307015200_AddVideoOffset.cs b/osu.Game/Migrations/20200307015200_AddVideoOffset.cs
deleted file mode 100644
index 06c456c551..0000000000
--- a/osu.Game/Migrations/20200307015200_AddVideoOffset.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddVideoOffset : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "VideoOffset",
-                table: "BeatmapMetadata",
-                nullable: false,
-                defaultValue: 0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "VideoOffset",
-                table: "BeatmapMetadata");
-        }
-    }
-}
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index cd08aee453..cf8128301c 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -39,7 +39,6 @@ namespace osu.Game.Rulesets.Mods
         {
             player.Background.EnableUserDim.Value = false;
 
-            player.DimmableVideo.IgnoreUserSettings.Value = true;
             player.DimmableStoryboard.IgnoreUserSettings.Value = true;
 
             player.BreakOverlay.Hide();
diff --git a/osu.Game/Screens/Play/DimmableVideo.cs b/osu.Game/Screens/Play/DimmableVideo.cs
deleted file mode 100644
index 2e080d9c2b..0000000000
--- a/osu.Game/Screens/Play/DimmableVideo.cs
+++ /dev/null
@@ -1,118 +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.Video;
-using osu.Framework.Timing;
-using osu.Game.Graphics.Containers;
-using osuTK.Graphics;
-
-namespace osu.Game.Screens.Play
-{
-    public class DimmableVideo : UserDimContainer
-    {
-        private readonly VideoSprite video;
-        private readonly int offset;
-        private DrawableVideo drawableVideo;
-
-        public DimmableVideo(VideoSprite video, int offset)
-        {
-            this.video = video;
-            this.offset = offset;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            initializeVideo(false);
-        }
-
-        protected override void LoadComplete()
-        {
-            ShowVideo.BindValueChanged(_ => initializeVideo(true), true);
-            base.LoadComplete();
-        }
-
-        protected override bool ShowDimContent => IgnoreUserSettings.Value || (ShowVideo.Value && DimLevel < 1);
-
-        private void initializeVideo(bool async)
-        {
-            if (video == null)
-                return;
-
-            if (drawableVideo != null)
-                return;
-
-            if (!ShowVideo.Value && !IgnoreUserSettings.Value)
-                return;
-
-            drawableVideo = new DrawableVideo(video, offset);
-
-            if (async)
-                LoadComponentAsync(drawableVideo, Add);
-            else
-                Add(drawableVideo);
-        }
-
-        private class DrawableVideo : Container
-        {
-            private readonly Drawable cover;
-            private readonly int offset;
-            private readonly ManualClock videoClock;
-            private bool videoStarted;
-
-            public DrawableVideo(VideoSprite video, int offset)
-            {
-                this.offset = offset;
-
-                RelativeSizeAxes = Axes.Both;
-                Masking = true;
-
-                video.RelativeSizeAxes = Axes.Both;
-                video.FillMode = FillMode.Fit;
-                video.Anchor = Anchor.Centre;
-                video.Origin = Anchor.Centre;
-
-                videoClock = new ManualClock();
-                video.Clock = new FramedClock(videoClock);
-
-                AddRangeInternal(new[]
-                {
-                    video,
-                    cover = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
-                    },
-                });
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(GameplayClock clock)
-            {
-                if (clock != null)
-                    Clock = clock;
-            }
-
-            protected override void Update()
-            {
-                if (videoClock != null && Clock.CurrentTime > offset)
-                {
-                    if (!videoStarted)
-                    {
-                        cover.FadeOut(500);
-                        videoStarted = true;
-                    }
-
-                    // handle seeking before the video starts (break skipping, replay seek)
-                    videoClock.CurrentTime = Clock.CurrentTime - offset;
-                }
-
-                base.Update();
-            }
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index da4829d484..ac0a4bcadc 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -117,8 +117,15 @@ namespace osu.Game.Screens.Play
                 startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
 
             // some beatmaps have no AudioLeadIn but the video starts before the first object
-            if (beatmap.Video != null && beatmap.Metadata.VideoOffset != 0)
-                startTime = Math.Min(startTime, beatmap.Metadata.VideoOffset);
+            var videoLayer = beatmap.Storyboard.GetLayer("Video");
+
+            if (videoLayer.Elements.Any())
+            {
+                var videoOffset = videoLayer.Elements.First().StartTime;
+
+                if (videoOffset != 0)
+                    startTime = Math.Min(startTime, videoOffset);
+            }
 
             Seek(startTime);
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 22d90d4ac1..b90d9d982a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -85,7 +85,6 @@ namespace osu.Game.Screens.Play
         protected GameplayClockContainer GameplayClockContainer { get; private set; }
 
         public DimmableStoryboard DimmableStoryboard { get; private set; }
-        public DimmableVideo DimmableVideo { get; private set; }
 
         [Cached]
         [Cached(Type = typeof(IBindable<IReadOnlyList<Mod>>))]
@@ -189,7 +188,6 @@ namespace osu.Game.Screens.Play
 
         private void addUnderlayComponents(Container target)
         {
-            target.Add(DimmableVideo = new DimmableVideo(Beatmap.Value.Video, Beatmap.Value.Metadata.VideoOffset) { RelativeSizeAxes = Axes.Both });
             target.Add(DimmableStoryboard = new DimmableStoryboard(Beatmap.Value.Storyboard) { RelativeSizeAxes = Axes.Both });
         }
 
@@ -549,7 +547,6 @@ namespace osu.Game.Screens.Play
             // bind component bindables.
             Background.IsBreakTime.BindTo(BreakOverlay.IsBreakTime);
             DimmableStoryboard.IsBreakTime.BindTo(BreakOverlay.IsBreakTime);
-            DimmableVideo.IsBreakTime.BindTo(BreakOverlay.IsBreakTime);
 
             Background.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
             DimmableStoryboard.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
new file mode 100644
index 0000000000..2c887a1553
--- /dev/null
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.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 System;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Graphics.Video;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Storyboards.Drawables
+{
+    public class DrawableStoryboardVideo : Container
+    {
+        public readonly StoryboardVideo Video;
+        private VideoSprite videoSprite;
+        private ManualClock videoClock;
+        private GameplayClock clock;
+
+        private bool videoStarted;
+
+        public override bool RemoveWhenNotAlive => false;
+
+        public DrawableStoryboardVideo(StoryboardVideo video)
+        {
+            Video = video;
+
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(GameplayClock clock, IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
+        {
+            if (clock != null)
+                this.clock = clock;
+
+            var path = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Video.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+
+            if (path == null)
+                return;
+
+            var stream = textureStore.GetStream(path);
+
+            if (stream == null)
+                return;
+
+            AddInternal(videoSprite = new VideoSprite(stream)
+            {
+                RelativeSizeAxes = Axes.Both,
+                FillMode = FillMode.Fill,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AlwaysPresent = true,
+                Alpha = 0
+            });
+
+            videoClock = new ManualClock();
+            videoSprite.Clock = new FramedClock(videoClock);
+        }
+
+        protected override void Update()
+        {
+            if (clock.CurrentTime > Video.StartTime)
+            {
+                if (!videoStarted)
+                {
+                    videoSprite.FadeIn(500);
+                    videoStarted = true;
+                }
+
+                // handle seeking before the video starts (break skipping, replay seek)
+                videoClock.CurrentTime = clock.CurrentTime - Video.StartTime;
+            }
+
+            base.Update();
+        }
+    }
+}
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 35bfe8c229..e58c422c6d 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Storyboards
 
         public Storyboard()
         {
+            layers.Add("Video", new StoryboardLayer("Video", 4));
             layers.Add("Background", new StoryboardLayer("Background", 3));
             layers.Add("Fail", new StoryboardLayer("Fail", 2) { EnabledWhenPassing = false, });
             layers.Add("Pass", new StoryboardLayer("Pass", 1) { EnabledWhenFailing = false, });
@@ -53,7 +54,7 @@ namespace osu.Game.Storyboards
         public DrawableStoryboard CreateDrawable(WorkingBeatmap working = null)
         {
             var drawable = new DrawableStoryboard(this);
-            drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard ? 16 / 9f : 4 / 3f);
+            drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard || GetLayer("Video").Elements.Any() ? 16 / 9f : 4 / 3f);
             return drawable;
         }
     }
diff --git a/osu.Game/Storyboards/StoryboardVideo.cs b/osu.Game/Storyboards/StoryboardVideo.cs
new file mode 100644
index 0000000000..4652e45852
--- /dev/null
+++ b/osu.Game/Storyboards/StoryboardVideo.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.Graphics;
+using osu.Game.Storyboards.Drawables;
+
+namespace osu.Game.Storyboards
+{
+    public class StoryboardVideo : IStoryboardElement
+    {
+        public string Path { get; }
+
+        public bool IsDrawable => true;
+
+        public double StartTime { get; }
+
+        public StoryboardVideo(string path, int offset)
+        {
+            Path = path;
+            StartTime = offset;
+        }
+
+        public Drawable CreateDrawable() => new DrawableStoryboardVideo(this);
+    }
+}
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index ef86186e41..b60add6e3b 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -10,7 +10,6 @@ using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Video;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
@@ -207,8 +206,6 @@ namespace osu.Game.Tests.Beatmaps
 
             protected override Texture GetBackground() => throw new NotImplementedException();
 
-            protected override VideoSprite GetVideo() => throw new NotImplementedException();
-
             protected override Track GetTrack() => throw new NotImplementedException();
 
             protected override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
diff --git a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
index 871d8ee3f1..6db34af20c 100644
--- a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Video;
 using osu.Game.Beatmaps;
 using osu.Game.Storyboards;
 
@@ -32,8 +31,6 @@ namespace osu.Game.Tests.Beatmaps
 
         protected override Texture GetBackground() => null;
 
-        protected override VideoSprite GetVideo() => null;
-
         protected override Track GetTrack() => null;
     }
 }

From 48282dea8bd4fbd172efa6848aa88c87b4a103e9 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Sat, 7 Mar 2020 22:08:38 -0800
Subject: [PATCH 01343/10326] Remove individual setting to disable videos, fix
 tests

---
 .../Beatmaps/Formats/LegacyStoryboardDecoderTest.cs    |  2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs  |  5 +++++
 osu.Game/Configuration/OsuConfigManager.cs             |  2 --
 osu.Game/Graphics/Containers/UserDimContainer.cs       |  4 ----
 .../Settings/Sections/Graphics/DetailSettings.cs       |  5 -----
 .../Screens/Backgrounds/BackgroundScreenBeatmap.cs     |  2 +-
 osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs |  3 ---
 .../Storyboards/Drawables/DrawableStoryboardVideo.cs   | 10 ++++++----
 8 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 96ff6b81e3..edb0d9f04b 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var storyboard = decoder.Decode(stream);
 
                 Assert.IsTrue(storyboard.HasDrawable);
-                Assert.AreEqual(4, storyboard.Layers.Count());
+                Assert.AreEqual(5, storyboard.Layers.Count());
 
                 StoryboardLayer background = storyboard.Layers.FirstOrDefault(l => l.Depth == 3);
                 Assert.IsNotNull(background);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index ff8437311e..16a985c796 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
+using osu.Game.Screens.Play;
 using osu.Game.Storyboards.Drawables;
 using osuTK.Graphics;
 
@@ -24,9 +25,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private MusicController musicController = new MusicController();
 
+        [Cached]
+        private GameplayClock gameplayClock;
+
         public TestSceneStoryboard()
         {
             Clock = new FramedClock();
+            gameplayClock = new GameplayClock(Clock);
 
             AddRange(new Drawable[]
             {
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 21de654670..41f6747b74 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -70,7 +70,6 @@ namespace osu.Game.Configuration
             Set(OsuSetting.ShowFpsDisplay, false);
 
             Set(OsuSetting.ShowStoryboard, true);
-            Set(OsuSetting.ShowVideoBackground, true);
             Set(OsuSetting.BeatmapSkins, true);
             Set(OsuSetting.BeatmapHitsounds, true);
 
@@ -176,7 +175,6 @@ namespace osu.Game.Configuration
         BlurLevel,
         LightenDuringBreaks,
         ShowStoryboard,
-        ShowVideoBackground,
         KeyOverlay,
         ScoreMeter,
         FloatingComments,
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 65c104b92f..4485ce3447 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -55,8 +55,6 @@ namespace osu.Game.Graphics.Containers
 
         protected Bindable<bool> ShowStoryboard { get; private set; }
 
-        protected Bindable<bool> ShowVideo { get; private set; }
-
         private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
 
         protected float DimLevel => Math.Max(EnableUserDim.Value && !IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
@@ -79,14 +77,12 @@ namespace osu.Game.Graphics.Containers
             UserDimLevel = config.GetBindable<double>(OsuSetting.DimLevel);
             LightenDuringBreaks = config.GetBindable<bool>(OsuSetting.LightenDuringBreaks);
             ShowStoryboard = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
-            ShowVideo = config.GetBindable<bool>(OsuSetting.ShowVideoBackground);
 
             EnableUserDim.ValueChanged += _ => UpdateVisuals();
             UserDimLevel.ValueChanged += _ => UpdateVisuals();
             LightenDuringBreaks.ValueChanged += _ => UpdateVisuals();
             IsBreakTime.ValueChanged += _ => UpdateVisuals();
             ShowStoryboard.ValueChanged += _ => UpdateVisuals();
-            ShowVideo.ValueChanged += _ => UpdateVisuals();
             StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
             IgnoreUserSettings.ValueChanged += _ => UpdateVisuals();
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
index ea2811e5cd..acf33f00b3 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
@@ -22,11 +22,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     Bindable = config.GetBindable<bool>(OsuSetting.ShowStoryboard)
                 },
                 new SettingsCheckbox
-                {
-                    LabelText = "Video",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowVideoBackground)
-                },
-                new SettingsCheckbox
                 {
                     LabelText = "Hit Lighting",
                     Bindable = config.GetBindable<bool>(OsuSetting.HitLighting)
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 50fd127093..b08455be95 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -166,7 +166,7 @@ namespace osu.Game.Screens.Backgrounds
                 BlurAmount.ValueChanged += _ => UpdateVisuals();
             }
 
-            protected override bool ShowDimContent => !ShowStoryboard.Value || !StoryboardReplacesBackground.Value || !ShowVideo.Value; // The background needs to be hidden in the case of it being replaced by the storyboard
+            protected override bool ShowDimContent => !ShowStoryboard.Value || !StoryboardReplacesBackground.Value; // The background needs to be hidden in the case of it being replaced by the storyboard
 
             protected override void UpdateVisuals()
             {
diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
index 9db3a587fa..bfb77e823f 100644
--- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
@@ -15,7 +15,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
         private readonly PlayerSliderBar<double> dimSliderBar;
         private readonly PlayerSliderBar<double> blurSliderBar;
         private readonly PlayerCheckbox showStoryboardToggle;
-        private readonly PlayerCheckbox showVideoToggle;
         private readonly PlayerCheckbox beatmapSkinsToggle;
         private readonly PlayerCheckbox beatmapHitsoundsToggle;
 
@@ -44,7 +43,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
                     Text = "Toggles:"
                 },
                 showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboards" },
-                showVideoToggle = new PlayerCheckbox { LabelText = "Video" },
                 beatmapSkinsToggle = new PlayerCheckbox { LabelText = "Beatmap skins" },
                 beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hitsounds" }
             };
@@ -56,7 +54,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
             dimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.DimLevel);
             blurSliderBar.Bindable = config.GetBindable<double>(OsuSetting.BlurLevel);
             showStoryboardToggle.Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
-            showVideoToggle.Current = config.GetBindable<bool>(OsuSetting.ShowVideoBackground);
             beatmapSkinsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
             beatmapHitsoundsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
         }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index 2c887a1553..ef14ccd4d7 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -32,11 +32,13 @@ namespace osu.Game.Storyboards.Drawables
             RelativeSizeAxes = Axes.Both;
         }
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(GameplayClock clock, IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
         {
-            if (clock != null)
-                this.clock = clock;
+            if (clock == null)
+                return;
+
+            this.clock = clock;
 
             var path = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Video.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
 
@@ -64,7 +66,7 @@ namespace osu.Game.Storyboards.Drawables
 
         protected override void Update()
         {
-            if (clock.CurrentTime > Video.StartTime)
+            if (clock != null && clock.CurrentTime > Video.StartTime)
             {
                 if (!videoStarted)
                 {

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 01344/10326] 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 01345/10326] 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 01346/10326] 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 01347/10326] 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 01348/10326] 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 01349/10326] 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 01350/10326] 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 77c94afcf182ff33a893ed3d3930f9cb04e3b344 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 14:28:10 +0900
Subject: [PATCH 01351/10326] Add better flow logic to map pool layout when few
 beatmaps are present

---
 .../Screens/MapPool/MapPoolScreen.cs          | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index c42d0a6da3..d7aeac02cb 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -47,9 +47,10 @@ namespace osu.Game.Tournament.Screens.MapPool
                 {
                     Y = 100,
                     Spacing = new Vector2(10, 10),
-                    Padding = new MarginPadding(25),
+                    Padding = new MarginPadding(5) { Horizontal = 100 },
                     Direction = FillDirection.Vertical,
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
                 },
                 new ControlPanel
                 {
@@ -90,6 +91,7 @@ namespace osu.Game.Tournament.Screens.MapPool
                             Text = "Reset",
                             Action = reset
                         },
+                        new ControlPanel.Spacer(),
                     }
                 }
             };
@@ -206,11 +208,15 @@ namespace osu.Game.Tournament.Screens.MapPool
         {
             mapFlows.Clear();
 
+            int totalRows = 0;
+
             if (match.NewValue.Round.Value != null)
             {
                 FillFlowContainer<TournamentBeatmapPanel> currentFlow = null;
                 string currentMod = null;
 
+                int flowCount = 0;
+
                 foreach (var b in match.NewValue.Round.Value.Beatmaps)
                 {
                     if (currentFlow == null || currentMod != b.Mods)
@@ -224,6 +230,15 @@ namespace osu.Game.Tournament.Screens.MapPool
                         });
 
                         currentMod = b.Mods;
+
+                        totalRows++;
+                        flowCount = 0;
+                    }
+
+                    if (++flowCount > 2)
+                    {
+                        totalRows++;
+                        flowCount = 0;
                     }
 
                     currentFlow.Add(new TournamentBeatmapPanel(b.BeatmapInfo, b.Mods)
@@ -233,6 +248,10 @@ namespace osu.Game.Tournament.Screens.MapPool
                     });
                 }
             }
+
+            if (totalRows > 8)
+                // remove horizontal padding to increase flow width to 3 panels
+                mapFlows.Padding = new MarginPadding(5);
         }
     }
 }

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 01352/10326] 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 01353/10326] 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 01354/10326] 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 01355/10326] 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 01356/10326] 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 01357/10326] 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 01358/10326] 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 01359/10326] 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 01360/10326] 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 01361/10326] 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 01362/10326] 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 01363/10326] 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 01364/10326] 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 01365/10326] 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 01366/10326] 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 01367/10326] 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 01368/10326] 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 01369/10326] 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 01370/10326] 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 01371/10326] 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 01372/10326] 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 01373/10326] 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 01374/10326] 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 01375/10326] 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 01376/10326] 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 01377/10326] 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 01378/10326] 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 01379/10326] 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 01380/10326] 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 22dd93a4f6a0ef4367e0ee0591b672659d35ad13 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Sun, 8 Mar 2020 14:02:39 -0700
Subject: [PATCH 01381/10326] Code quality, read position offsets

---
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs |  4 +++-
 osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs         |  5 +++--
 osu.Game/Migrations/OsuDbContextModelSnapshot.cs     |  2 --
 osu.Game/Screens/Play/GameplayClockContainer.cs      | 12 +++++-------
 .../Storyboards/Drawables/DrawableStoryboardVideo.cs |  4 +++-
 osu.Game/Storyboards/Storyboard.cs                   |  7 +++++--
 osu.Game/Storyboards/StoryboardVideo.cs              |  8 +++++++-
 7 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index b44d4947d4..0358ec2e42 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -92,8 +92,10 @@ namespace osu.Game.Beatmaps.Formats
                     {
                         var offset = Parsing.ParseInt(split[1]);
                         var filename = CleanFilename(split[2]);
+                        var xOffset = split.Length > 3 ? Parsing.ParseInt(split[3]) : 0;
+                        var yOffset = split.Length > 4 ? Parsing.ParseInt(split[4]) : 0;
 
-                        storyboard.GetLayer("Video").Add(new StoryboardVideo(filename, offset));
+                        storyboard.GetLayer(LegacyStoryLayer.Video).Add(new StoryboardVideo(filename, offset, xOffset, yOffset));
                         break;
                     }
 
diff --git a/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs b/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
index 5237445640..c1329921ec 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
@@ -3,11 +3,12 @@
 
 namespace osu.Game.Beatmaps.Legacy
 {
-    internal enum LegacyStoryLayer
+    public enum LegacyStoryLayer
     {
         Background = 0,
         Fail = 1,
         Pass = 2,
-        Foreground = 3
+        Foreground = 3,
+        Video = 4
     }
 }
diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
index 6f91688ddb..bc4fc3342d 100644
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
@@ -141,8 +141,6 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("VideoFile");
 
-                    b.Property<int>("VideoOffset");
-
                     b.HasKey("ID");
 
                     b.ToTable("BeatmapMetadata");
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ac0a4bcadc..87b0c196d3 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Legacy;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 
@@ -117,15 +118,12 @@ namespace osu.Game.Screens.Play
                 startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
 
             // some beatmaps have no AudioLeadIn but the video starts before the first object
-            var videoLayer = beatmap.Storyboard.GetLayer("Video");
+            var videoLayer = beatmap.Storyboard.GetLayer(LegacyStoryLayer.Video);
 
-            if (videoLayer.Elements.Any())
-            {
-                var videoOffset = videoLayer.Elements.First().StartTime;
+            var videoOffset = videoLayer.Elements.SingleOrDefault()?.StartTime;
 
-                if (videoOffset != 0)
-                    startTime = Math.Min(startTime, videoOffset);
-            }
+            if (videoOffset != null)
+                startTime = Math.Min(startTime, videoOffset.GetValueOrDefault());
 
             Seek(startTime);
 
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index ef14ccd4d7..b46150785b 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Video;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Play;
+using osuTK;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -57,7 +58,8 @@ namespace osu.Game.Storyboards.Drawables
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 AlwaysPresent = true,
-                Alpha = 0
+                Alpha = 0,
+                Position = new Vector2(Video.XOffset, Video.YOffset)
             });
 
             videoClock = new ManualClock();
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index e58c422c6d..fac489838e 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Legacy;
 using osu.Game.Storyboards.Drawables;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,6 +29,8 @@ namespace osu.Game.Storyboards
             layers.Add("Foreground", new StoryboardLayer("Foreground", 0));
         }
 
+        public StoryboardLayer GetLayer(LegacyStoryLayer layer) => GetLayer(layer.ToString());
+
         public StoryboardLayer GetLayer(string name)
         {
             if (!layers.TryGetValue(name, out var layer))
@@ -47,14 +50,14 @@ namespace osu.Game.Storyboards
                 if (backgroundPath == null)
                     return false;
 
-                return GetLayer("Background").Elements.Any(e => e.Path.ToLowerInvariant() == backgroundPath);
+                return GetLayer(LegacyStoryLayer.Background).Elements.Any(e => e.Path.ToLowerInvariant() == backgroundPath);
             }
         }
 
         public DrawableStoryboard CreateDrawable(WorkingBeatmap working = null)
         {
             var drawable = new DrawableStoryboard(this);
-            drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard || GetLayer("Video").Elements.Any() ? 16 / 9f : 4 / 3f);
+            drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard || GetLayer(LegacyStoryLayer.Video).Elements.Any() ? 16 / 9f : 4 / 3f);
             return drawable;
         }
     }
diff --git a/osu.Game/Storyboards/StoryboardVideo.cs b/osu.Game/Storyboards/StoryboardVideo.cs
index 4652e45852..7d22b8f7c9 100644
--- a/osu.Game/Storyboards/StoryboardVideo.cs
+++ b/osu.Game/Storyboards/StoryboardVideo.cs
@@ -14,10 +14,16 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
-        public StoryboardVideo(string path, int offset)
+        public int XOffset { get; }
+
+        public int YOffset { get; }
+
+        public StoryboardVideo(string path, int offset, int xOffset, int yOffset)
         {
             Path = path;
             StartTime = offset;
+            XOffset = xOffset;
+            YOffset = yOffset;
         }
 
         public Drawable CreateDrawable() => new DrawableStoryboardVideo(this);

From 4624582703724ef12fabd3410d5fcaf6abcd63bb Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Sun, 8 Mar 2020 14:40:36 -0700
Subject: [PATCH 01382/10326] Revert position offset change for separate pull

---
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs      | 4 +---
 osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs | 4 +---
 osu.Game/Storyboards/StoryboardVideo.cs                   | 8 +-------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 0358ec2e42..be82721a76 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -92,10 +92,8 @@ namespace osu.Game.Beatmaps.Formats
                     {
                         var offset = Parsing.ParseInt(split[1]);
                         var filename = CleanFilename(split[2]);
-                        var xOffset = split.Length > 3 ? Parsing.ParseInt(split[3]) : 0;
-                        var yOffset = split.Length > 4 ? Parsing.ParseInt(split[4]) : 0;
 
-                        storyboard.GetLayer(LegacyStoryLayer.Video).Add(new StoryboardVideo(filename, offset, xOffset, yOffset));
+                        storyboard.GetLayer(LegacyStoryLayer.Video).Add(new StoryboardVideo(filename, offset));
                         break;
                     }
 
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index b46150785b..ef14ccd4d7 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Video;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Play;
-using osuTK;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -58,8 +57,7 @@ namespace osu.Game.Storyboards.Drawables
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 AlwaysPresent = true,
-                Alpha = 0,
-                Position = new Vector2(Video.XOffset, Video.YOffset)
+                Alpha = 0
             });
 
             videoClock = new ManualClock();
diff --git a/osu.Game/Storyboards/StoryboardVideo.cs b/osu.Game/Storyboards/StoryboardVideo.cs
index 7d22b8f7c9..4652e45852 100644
--- a/osu.Game/Storyboards/StoryboardVideo.cs
+++ b/osu.Game/Storyboards/StoryboardVideo.cs
@@ -14,16 +14,10 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
-        public int XOffset { get; }
-
-        public int YOffset { get; }
-
-        public StoryboardVideo(string path, int offset, int xOffset, int yOffset)
+        public StoryboardVideo(string path, int offset)
         {
             Path = path;
             StartTime = offset;
-            XOffset = xOffset;
-            YOffset = yOffset;
         }
 
         public Drawable CreateDrawable() => new DrawableStoryboardVideo(this);

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 01383/10326] 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 01384/10326] 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 01385/10326] 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 01386/10326] 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 01387/10326] 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 01388/10326] 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 b77bd08925461bcbd8b24129570c8cdae17c6fc0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 9 Mar 2020 19:20:06 +0300
Subject: [PATCH 01389/10326] Simplify null values handling

---
 .../Profile/Sections/Historical/UserHistoryGraph.cs   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index ccc286d423..6de1b8e0f0 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -12,16 +12,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     {
         public UserHistoryCount[] Values
         {
-            set
-            {
-                if (value == null)
-                {
-                    Data = null;
-                    return;
-                }
-
-                Data = value.Select(v => new KeyValuePair<DateTime, long>(v.Date, v.Count)).ToArray();
-            }
+            set => Data = value?.Select(v => new KeyValuePair<DateTime, long>(v.Date, v.Count)).ToArray();
         }
 
         protected override float GetDataPointHeight(long playCount) => playCount;

From bea2b7094879d36165f179ae130c482b64bf3b02 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 9 Mar 2020 19:22:03 +0300
Subject: [PATCH 01390/10326] Adjust OnHover syntax

---
 osu.Game/Overlays/Profile/UserGraph.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index 48671b8a70..e2db79024c 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -46,13 +46,15 @@ namespace osu.Game.Overlays.Profile
 
         protected override bool OnHover(HoverEvent e)
         {
-            if (data.Length <= 1)
-                return base.OnHover(e);
+            if (data.Length > 1)
+            {
+                graph.UpdateBallPosition(e.MousePosition.X);
+                graph.ShowBar();
 
-            graph.UpdateBallPosition(e.MousePosition.X);
-            graph.ShowBar();
+                return true;
+            }
 
-            return true;
+            return base.OnHover(e);
         }
 
         protected override bool OnMouseMove(MouseMoveEvent e)

From 432c52bf276747248acc91e8e155a36294ed6a10 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 9 Mar 2020 19:26:15 +0300
Subject: [PATCH 01391/10326] Simplify test scene

---
 .../Online/TestSceneUserHistoryGraph.cs       | 72 ++++---------------
 1 file changed, 12 insertions(+), 60 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
index 164d719a00..26f6ac199b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
@@ -37,70 +37,22 @@ namespace osu.Game.Tests.Visual.Online
 
             var values = new[]
             {
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2000, 1, 1),
-                    Count = 10,
-                },
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2000, 2, 1),
-                    Count = 20,
-                },
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2000, 3, 1),
-                    Count = 100,
-                },
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2000, 4, 1),
-                    Count = 15,
-                },
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2000, 5, 1),
-                    Count = 30,
-                }
+                new UserHistoryCount { Date = new DateTime(2000, 1, 1), Count = 10 },
+                new UserHistoryCount { Date = new DateTime(2000, 2, 1), Count = 20 },
+                new UserHistoryCount { Date = new DateTime(2000, 3, 1), Count = 100 },
+                new UserHistoryCount { Date = new DateTime(2000, 4, 1), Count = 15 },
+                new UserHistoryCount { Date = new DateTime(2000, 5, 1), Count = 30 }
             };
 
             var moreValues = new[]
             {
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2010, 5, 1),
-                    Count = 1000,
-                },
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2010, 6, 1),
-                    Count = 20,
-                },
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2010, 7, 1),
-                    Count = 20000,
-                },
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2010, 8, 1),
-                    Count = 30,
-                },
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2010, 9, 1),
-                    Count = 50,
-                },
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2010, 10, 1),
-                    Count = 2000,
-                },
-                new UserHistoryCount
-                {
-                    Date = new DateTime(2010, 11, 1),
-                    Count = 2100,
-                }
+                new UserHistoryCount { Date = new DateTime(2010, 5, 1), Count = 1000 },
+                new UserHistoryCount { Date = new DateTime(2010, 6, 1), Count = 20 },
+                new UserHistoryCount { Date = new DateTime(2010, 7, 1), Count = 20000 },
+                new UserHistoryCount { Date = new DateTime(2010, 8, 1), Count = 30 },
+                new UserHistoryCount { Date = new DateTime(2010, 9, 1), Count = 50 },
+                new UserHistoryCount { Date = new DateTime(2010, 10, 1), Count = 2000 },
+                new UserHistoryCount { Date = new DateTime(2010, 11, 1), Count = 2100 }
             };
 
             AddStep("Set fake values", () => graph.Values = values);

From 06855c09c741bba8dd1bc0696c5bfccd08273621 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 9 Mar 2020 19:42:35 +0300
Subject: [PATCH 01392/10326] Make data nullable

---
 .../Overlays/Profile/Header/Components/RankGraph.cs  |  8 +-------
 osu.Game/Overlays/Profile/UserGraph.cs               | 12 +++++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index 39fa0ca251..13fbaa7f85 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -42,13 +42,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         {
             int[] userRanks = statistics?.RankHistory?.Data;
 
-            if (userRanks == null)
-            {
-                Data = null;
-                return;
-            }
-
-            Data = userRanks.Select((x, index) => new KeyValuePair<int, int>(index, x)).Where(x => x.Value != 0).ToArray();
+            Data = userRanks?.Select((x, index) => new KeyValuePair<int, int>(index, x)).Where(x => x.Value != 0).ToArray();
         }
 
         protected override float GetDataPointHeight(int rank) => -MathF.Log(rank);
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index e2db79024c..64f988b0c1 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -27,8 +27,6 @@ namespace osu.Game.Overlays.Profile
 
         protected UserGraph()
         {
-            data = Array.Empty<KeyValuePair<TKey, TValue>>();
-
             Add(graph = new UserLineGraph
             {
                 RelativeSizeAxes = Axes.Both,
@@ -46,7 +44,7 @@ namespace osu.Game.Overlays.Profile
 
         protected override bool OnHover(HoverEvent e)
         {
-            if (data.Length > 1)
+            if (data?.Length > 1)
             {
                 graph.UpdateBallPosition(e.MousePosition.X);
                 graph.ShowBar();
@@ -59,7 +57,7 @@ namespace osu.Game.Overlays.Profile
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
-            if (data.Length > 1)
+            if (data?.Length > 1)
                 graph.UpdateBallPosition(e.MousePosition.X);
 
             return base.OnMouseMove(e);
@@ -67,7 +65,7 @@ namespace osu.Game.Overlays.Profile
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            if (data.Length > 1)
+            if (data?.Length > 1)
                 graph.HideBar();
 
             base.OnHoverLost(e);
@@ -85,7 +83,7 @@ namespace osu.Game.Overlays.Profile
 
         private void redrawGraph()
         {
-            if (data.Length == 0)
+            if (!data?.Any() ?? true)
             {
                 HideGraph();
                 return;
@@ -108,7 +106,7 @@ namespace osu.Game.Overlays.Profile
         {
             get
             {
-                if (data.Length == 0)
+                if (!data?.Any() ?? true)
                     return null;
 
                 var (key, value) = data[dataIndex];

From d6adc06f6e0f4334d571e4f3e806bbabf19f8157 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 9 Mar 2020 20:13:59 +0300
Subject: [PATCH 01393/10326] Add xmldoc

---
 osu.Game/Overlays/Profile/UserGraph.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index 64f988b0c1..07346a3e45 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -17,6 +17,11 @@ using osuTK;
 
 namespace osu.Game.Overlays.Profile
 {
+    /// <summary>
+    /// Graph which is used in <see cref="UserProfileOverlay"/> to present changes in user statistics over time.
+    /// </summary>
+    /// <typeparam name="TKey">Type of data to be used for X-axis of the graph.</typeparam>
+    /// <typeparam name="TValue">Type of data to be used for Y-axis of the graph.</typeparam>
     public abstract class UserGraph<TKey, TValue> : Container, IHasCustomTooltip
     {
         protected const float FADE_DURATION = 150;
@@ -192,6 +197,9 @@ namespace osu.Game.Overlays.Profile
             protected readonly OsuSpriteText Counter, BottomText;
             private readonly Box background;
 
+            /// <summary>
+            /// Text which will be shown near the <see cref="Counter"/>.
+            /// </summary>
             protected abstract string TooltipCounterName { get; }
 
             protected UserGraphTooltip()

From f6461dc5f8381d3f62523e155f6f5e7646abb788 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 10 Mar 2020 00:19:28 +0300
Subject: [PATCH 01394/10326] Add more consistency to data null checks

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

diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index 07346a3e45..cea4600523 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Overlays.Profile
 
         private void redrawGraph()
         {
-            if (!data?.Any() ?? true)
+            if (!(data?.Length > 1))
             {
                 HideGraph();
                 return;
@@ -111,7 +111,7 @@ namespace osu.Game.Overlays.Profile
         {
             get
             {
-                if (!data?.Any() ?? true)
+                if (!(data?.Length > 1))
                     return null;
 
                 var (key, value) = data[dataIndex];

From 2f441baeacc8e9421d4914a7d5a69eba9f87793d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 10 Mar 2020 00:50:12 +0300
Subject: [PATCH 01395/10326] Make UserHistoryGraph non-abstract

---
 .../Visual/Online/TestSceneUserHistoryGraph.cs   | 15 +++------------
 .../Profile/Header/Components/RankGraph.cs       |  5 ++++-
 .../Sections/Historical/UserHistoryGraph.cs      | 16 ++++++++++++++--
 osu.Game/Overlays/Profile/UserGraph.cs           | 10 +++-------
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
index 26f6ac199b..83607bea6a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
@@ -25,14 +25,15 @@ namespace osu.Game.Tests.Visual.Online
 
         public TestSceneUserHistoryGraph()
         {
-            TestGraph graph;
+            UserHistoryGraph graph;
 
-            Add(graph = new TestGraph
+            Add(graph = new UserHistoryGraph
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 200,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
+                TooltipCounterName = "Test"
             });
 
             var values = new[]
@@ -60,15 +61,5 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Set null values", () => graph.Values = null);
             AddStep("Set empty values", () => graph.Values = Array.Empty<UserHistoryCount>());
         }
-
-        private class TestGraph : UserHistoryGraph
-        {
-            protected override UserGraphTooltip GetTooltip() => new TestTooltip();
-
-            private class TestTooltip : HistoryGraphTooltip
-            {
-                protected override string TooltipCounterName => "Test Counter";
-            }
-        }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index 13fbaa7f85..73ae91e345 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -74,7 +74,10 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         private class RankGraphTooltip : UserGraphTooltip
         {
-            protected override string TooltipCounterName => @"Global Ranking";
+            public RankGraphTooltip()
+                : base(@"Global Ranking")
+            {
+            }
 
             public override bool SetContent(object content)
             {
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index 6de1b8e0f0..5f6f6cc3e4 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -8,15 +8,22 @@ using static osu.Game.Users.User;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
-    public abstract class UserHistoryGraph : UserGraph<DateTime, long>
+    public class UserHistoryGraph : UserGraph<DateTime, long>
     {
         public UserHistoryCount[] Values
         {
             set => Data = value?.Select(v => new KeyValuePair<DateTime, long>(v.Date, v.Count)).ToArray();
         }
 
+        /// <summary>
+        /// Text describing the value being plotted on the graph, which will be displayed as a prefix to the value in the <see cref="HistoryGraphTooltip"/>
+        /// </summary>
+        public string TooltipCounterName { get; set; } = @"Plays";
+
         protected override float GetDataPointHeight(long playCount) => playCount;
 
+        protected override UserGraphTooltip GetTooltip() => new HistoryGraphTooltip(TooltipCounterName);
+
         protected override object GetTooltipContent(DateTime date, long playCount)
         {
             return new TooltipDisplayContent
@@ -26,8 +33,13 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             };
         }
 
-        protected abstract class HistoryGraphTooltip : UserGraphTooltip
+        protected class HistoryGraphTooltip : UserGraphTooltip
         {
+            public HistoryGraphTooltip(string tooltipCounterName)
+                : base(tooltipCounterName)
+            {
+            }
+
             public override bool SetContent(object content)
             {
                 if (!(content is TooltipDisplayContent info))
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index cea4600523..c19844960b 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -197,12 +197,7 @@ namespace osu.Game.Overlays.Profile
             protected readonly OsuSpriteText Counter, BottomText;
             private readonly Box background;
 
-            /// <summary>
-            /// Text which will be shown near the <see cref="Counter"/>.
-            /// </summary>
-            protected abstract string TooltipCounterName { get; }
-
-            protected UserGraphTooltip()
+            protected UserGraphTooltip(string tooltipCounterName)
             {
                 AutoSizeAxes = Axes.Both;
                 Masking = true;
@@ -225,12 +220,13 @@ namespace osu.Game.Overlays.Profile
                             {
                                 AutoSizeAxes = Axes.Both,
                                 Direction = FillDirection.Horizontal,
+                                Spacing = new Vector2(3, 0),
                                 Children = new Drawable[]
                                 {
                                     new OsuSpriteText
                                     {
                                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
-                                        Text = $"{TooltipCounterName} "
+                                        Text = tooltipCounterName
                                     },
                                     Counter = new OsuSpriteText
                                     {

From d2b4856d134d5e6792b40aca2dd1e49b51d2d97f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 10 Mar 2020 01:02:09 +0300
Subject: [PATCH 01396/10326] Add more xmldoc

---
 osu.Game/Overlays/Profile/UserGraph.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index c19844960b..aee464dbf9 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -76,6 +76,9 @@ namespace osu.Game.Overlays.Profile
             base.OnHoverLost(e);
         }
 
+        /// <summary>
+        /// Set of values which will be used to create a graph.
+        /// </summary>
         protected KeyValuePair<TKey, TValue>[] Data
         {
             set
@@ -99,7 +102,13 @@ namespace osu.Game.Overlays.Profile
             ShowGraph();
         }
 
+        /// <summary>
+        /// Function used to convert <see cref="Data"/> point to it's Y-axis position on the graph.
+        /// </summary>
+        /// <param name="value">Value to convert.</param>
+        /// <returns></returns>
         protected abstract float GetDataPointHeight(TValue value);
+
         protected virtual void ShowGraph() => graph.FadeIn(FADE_DURATION, Easing.Out);
         protected virtual void HideGraph() => graph.FadeOut(FADE_DURATION, Easing.Out);
 

From 5aa99d8b34aff0c44911f852e2a673135a0fd416 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Mon, 9 Mar 2020 16:04:23 -0700
Subject: [PATCH 01397/10326] Hide background image when video is present

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

diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index fac489838e..64ad0208c9 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -50,6 +50,9 @@ namespace osu.Game.Storyboards
                 if (backgroundPath == null)
                     return false;
 
+                if (GetLayer(LegacyStoryLayer.Video).Elements.Any())
+                    return true;
+
                 return GetLayer(LegacyStoryLayer.Background).Elements.Any(e => e.Path.ToLowerInvariant() == backgroundPath);
             }
         }

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 01398/10326] 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 01399/10326] 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 01400/10326] 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 01401/10326] 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 01402/10326] 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 01403/10326] 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 01404/10326] 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 01405/10326] 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 742698acab9ba2034ebae716bcd8cc1634d5a13e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Mar 2020 15:30:24 +0900
Subject: [PATCH 01406/10326] Add notelock implementation

---
 .../Objects/Drawables/DrawableHitCircle.cs    |  2 +-
 .../Objects/Drawables/DrawableOsuHitObject.cs |  7 +++++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      | 28 +++++++++++++++++--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index da1e666aba..3ca2714511 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             var result = HitObject.HitWindows.ResultFor(timeOffset);
 
-            if (result == HitResult.None)
+            if (result == HitResult.None || CheckHittable?.Invoke(this) == false)
             {
                 Shake(Math.Abs(timeOffset) - HitObject.HitWindows.WindowFor(HitResult.Miss));
                 return;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index a677cb6a72..82a81040e4 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;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
@@ -16,6 +17,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         // Must be set to update IsHovered as it's used in relax mdo to detect osu hit objects.
         public override bool HandlePositionalInput => true;
 
+        /// <summary>
+        /// Whether this <see cref="DrawableOsuHitObject"/> can be hit.
+        /// If not-null, this <see cref="DrawableOsuHitObject"/> will not receive a judgement until this function returns <c>true</c>.
+        /// </summary>
+        public Func<DrawableOsuHitObject, bool> CheckHittable;
+
         protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
         {
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 6d1ea4bbfc..9eb2786951 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.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.Extensions.IEnumerableExtensions;
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -64,7 +65,10 @@ namespace osu.Game.Rulesets.Osu.UI
 
             base.Add(h);
 
-            followPoints.AddFollowPoints((DrawableOsuHitObject)h);
+            DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)h;
+            osuHitObject.CheckHittable = checkHittable;
+
+            followPoints.AddFollowPoints(osuHitObject);
         }
 
         public override bool Remove(DrawableHitObject h)
@@ -72,11 +76,31 @@ namespace osu.Game.Rulesets.Osu.UI
             bool result = base.Remove(h);
 
             if (result)
-                followPoints.RemoveFollowPoints((DrawableOsuHitObject)h);
+            {
+                DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)h;
+                osuHitObject.CheckHittable = null;
+
+                followPoints.RemoveFollowPoints(osuHitObject);
+            }
 
             return result;
         }
 
+        private bool checkHittable(DrawableOsuHitObject osuHitObject)
+        {
+            var lastObject = HitObjectContainer.AliveObjects.GetPrevious(osuHitObject);
+
+            // Ensure the last object is not alive anymore, in which case always allow the hit.
+            if (lastObject == null)
+                return true;
+
+            // Ensure that either the last object has received a judgement or the hit time occurs after the last object's start time.
+            if (lastObject.Judged || Time.Current > lastObject.HitObject.StartTime)
+                return true;
+
+            return false;
+        }
+
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)

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 01407/10326] 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 01408/10326] 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 01409/10326] 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 01410/10326] 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 01411/10326] 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 01412/10326] 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 01413/10326] 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 01414/10326] 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 01415/10326] 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 01416/10326] 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 01417/10326] 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 01418/10326] 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 01419/10326] 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 01420/10326] 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 01421/10326] 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 01422/10326] 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 01423/10326] 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 01424/10326] 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 01425/10326] 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 01426/10326] 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 01427/10326] 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 01428/10326] 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 01429/10326] 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 6de244389bdff557869a0491ceeb0193458e2cdb Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Tue, 10 Mar 2020 22:50:20 -0700
Subject: [PATCH 01430/10326] Use OffsetClock instead of ManualClock

---
 .../Visual/Gameplay/TestSceneStoryboard.cs    |  5 ---
 .../Screens/Play/GameplayClockContainer.cs    |  9 ------
 .../Drawables/DrawableStoryboardVideo.cs      | 32 +++++--------------
 3 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index 16a985c796..ff8437311e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
-using osu.Game.Screens.Play;
 using osu.Game.Storyboards.Drawables;
 using osuTK.Graphics;
 
@@ -25,13 +24,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private MusicController musicController = new MusicController();
 
-        [Cached]
-        private GameplayClock gameplayClock;
-
         public TestSceneStoryboard()
         {
             Clock = new FramedClock();
-            gameplayClock = new GameplayClock(Clock);
 
             AddRange(new Drawable[]
             {
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 87b0c196d3..591e969ad8 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Legacy;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 
@@ -117,14 +116,6 @@ namespace osu.Game.Screens.Play
             if (beatmap.BeatmapInfo.AudioLeadIn > 0)
                 startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
 
-            // some beatmaps have no AudioLeadIn but the video starts before the first object
-            var videoLayer = beatmap.Storyboard.GetLayer(LegacyStoryLayer.Video);
-
-            var videoOffset = videoLayer.Elements.SingleOrDefault()?.StartTime;
-
-            if (videoOffset != null)
-                startTime = Math.Min(startTime, videoOffset.GetValueOrDefault());
-
             Seek(startTime);
 
             adjustableClock.ProcessFrame();
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index ef14ccd4d7..d3f77e03ae 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Video;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -18,10 +17,6 @@ namespace osu.Game.Storyboards.Drawables
     {
         public readonly StoryboardVideo Video;
         private VideoSprite videoSprite;
-        private ManualClock videoClock;
-        private GameplayClock clock;
-
-        private bool videoStarted;
 
         public override bool RemoveWhenNotAlive => false;
 
@@ -33,13 +28,8 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(GameplayClock clock, IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
+        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
         {
-            if (clock == null)
-                return;
-
-            this.clock = clock;
-
             var path = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Video.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
 
             if (path == null)
@@ -56,29 +46,23 @@ namespace osu.Game.Storyboards.Drawables
                 FillMode = FillMode.Fill,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                AlwaysPresent = true,
                 Alpha = 0
             });
-
-            videoClock = new ManualClock();
-            videoSprite.Clock = new FramedClock(videoClock);
         }
 
-        protected override void Update()
+        protected override void LoadComplete()
         {
-            if (clock != null && clock.CurrentTime > Video.StartTime)
+            using (videoSprite.BeginAbsoluteSequence(Video.StartTime))
             {
-                if (!videoStarted)
+                videoSprite.Clock = new FramedOffsetClock(Clock)
                 {
-                    videoSprite.FadeIn(500);
-                    videoStarted = true;
-                }
+                    Offset = -Video.StartTime
+                };
 
-                // handle seeking before the video starts (break skipping, replay seek)
-                videoClock.CurrentTime = clock.CurrentTime - Video.StartTime;
+                videoSprite.FadeIn(500);
             }
 
-            base.Update();
+            base.LoadComplete();
         }
     }
 }

From ae7245a51bea2b812a8ce814db2afa325a27a163 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Mar 2020 15:11:54 +0900
Subject: [PATCH 01431/10326] Refactor + fix fade in too late

---
 .../Drawables/DrawableStoryboardVideo.cs         | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index d3f77e03ae..75135495cc 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -46,23 +46,17 @@ namespace osu.Game.Storyboards.Drawables
                 FillMode = FillMode.Fill,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Alpha = 0
+                Alpha = 0,
+                Clock = new FramedOffsetClock(Clock) { Offset = -Video.StartTime }
             });
         }
 
         protected override void LoadComplete()
         {
-            using (videoSprite.BeginAbsoluteSequence(Video.StartTime))
-            {
-                videoSprite.Clock = new FramedOffsetClock(Clock)
-                {
-                    Offset = -Video.StartTime
-                };
-
-                videoSprite.FadeIn(500);
-            }
-
             base.LoadComplete();
+
+            using (videoSprite.BeginAbsoluteSequence(0))
+                videoSprite.FadeIn(500);
         }
     }
 }

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 01432/10326] 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 01433/10326] 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 01434/10326] 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 424f9afbf42203d0f32c97209c72531e4a8b16ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Mar 2020 17:55:20 +0900
Subject: [PATCH 01435/10326] Fix incorrect offset with custom clock

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index 75135495cc..00df388d09 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -13,7 +13,7 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    public class DrawableStoryboardVideo : Container
+    public class DrawableStoryboardVideo : CompositeDrawable
     {
         public readonly StoryboardVideo Video;
         private VideoSprite videoSprite;
@@ -40,7 +40,7 @@ namespace osu.Game.Storyboards.Drawables
             if (stream == null)
                 return;
 
-            AddInternal(videoSprite = new VideoSprite(stream)
+            InternalChild = videoSprite = new VideoSprite(stream, false)
             {
                 RelativeSizeAxes = Axes.Both,
                 FillMode = FillMode.Fill,
@@ -48,7 +48,7 @@ namespace osu.Game.Storyboards.Drawables
                 Origin = Anchor.Centre,
                 Alpha = 0,
                 Clock = new FramedOffsetClock(Clock) { Offset = -Video.StartTime }
-            });
+            };
         }
 
         protected override void LoadComplete()

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 01436/10326] 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 01437/10326] 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 01438/10326] 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 01439/10326] 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 01440/10326] 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 01441/10326] 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 01442/10326] 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 01443/10326] 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 01444/10326] 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 01445/10326] 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 01446/10326] 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 01447/10326] 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 01448/10326] 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 01449/10326] 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 01450/10326] 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 01451/10326] 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 01452/10326] 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 01453/10326] 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 1d314a1f4b86ce5fd6ea95804acb8d411d95413c Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Wed, 11 Mar 2020 22:40:08 -0700
Subject: [PATCH 01454/10326] Prevent playback from going beyond song end

---
 .../Edit/Components/PlaybackControl.cs        |  3 +++
 osu.Game/Screens/Edit/EditorClock.cs          | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 897c6ec531..ff650a7ad7 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -87,6 +87,9 @@ namespace osu.Game.Screens.Edit.Components
 
         private void togglePause()
         {
+            if ((adjustableClock as EditorClock)?.PlaybackFinished == true)
+                adjustableClock.Seek(0);
+
             if (adjustableClock.IsRunning)
                 adjustableClock.Stop();
             else
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index e5e47507f3..0e5b42fe69 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Screens.Edit
 
         private readonly BindableBeatDivisor beatDivisor;
 
+        public bool PlaybackFinished { get; private set; }
+
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
         {
             this.beatDivisor = beatDivisor;
@@ -37,6 +39,23 @@ namespace osu.Game.Screens.Edit
             TrackLength = trackLength;
         }
 
+        public override void ProcessFrame()
+        {
+            base.ProcessFrame();
+
+            if (CurrentTime >= TrackLength)
+            {
+                if (!PlaybackFinished)
+                {
+                    PlaybackFinished = true;
+                    Stop();
+                    Seek(TrackLength);
+                }
+            }
+            else
+                PlaybackFinished = false;
+        }
+
         /// <summary>
         /// Seek to the closest snappable beat from a time.
         /// </summary>

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 01455/10326] 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 01456/10326] 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 01457/10326] 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 01458/10326] 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 01459/10326] 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 01460/10326] 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 01461/10326] 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 01462/10326] 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 01463/10326] 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 01464/10326] 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 01465/10326] 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 01466/10326] 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 01467/10326] 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 01468/10326] 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 01469/10326] 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 01470/10326] 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 01471/10326] 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 01472/10326] 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 01473/10326] 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 01474/10326] 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 01475/10326] 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 01476/10326] 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 01477/10326] 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 01478/10326] 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 01479/10326] 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 01480/10326] 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 01481/10326] 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 01482/10326] 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 01483/10326] 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 01484/10326] 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 ef0acde458c7b9bea5fa42fc60e951fa6e3581fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 14:12:56 +0900
Subject: [PATCH 01485/10326] Adjust to allow for extra row

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 1ef2916ca1..fad9f00dc8 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -254,7 +254,7 @@ namespace osu.Game.Tournament.Screens.MapPool
                 }
             }
 
-            if (totalRows > 8)
+            if (totalRows > 9)
                 // remove horizontal padding to increase flow width to 3 panels
                 mapFlows.Padding = new MarginPadding(5);
         }

From fbb7e9f12a3971a6f3afb46138ba2f67b499d54b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 15:34:52 +0900
Subject: [PATCH 01486/10326] Add tests (wip)

---
 osu.Game.Tournament.Tests/LadderTestScene.cs  | 122 ++++++++++++++++++
 .../Screens/TestSceneMapPoolScreen.cs         |  83 +++++++++++-
 .../Screens/TestSceneSeedingEditorScreen.cs   |   2 +-
 .../Screens/TestSceneSeedingScreen.cs         | 101 ---------------
 .../Screens/MapPool/MapPoolScreen.cs          |   4 +-
 5 files changed, 201 insertions(+), 111 deletions(-)

diff --git a/osu.Game.Tournament.Tests/LadderTestScene.cs b/osu.Game.Tournament.Tests/LadderTestScene.cs
index dae0721023..4477ca8338 100644
--- a/osu.Game.Tournament.Tests/LadderTestScene.cs
+++ b/osu.Game.Tournament.Tests/LadderTestScene.cs
@@ -3,7 +3,10 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
 using osu.Game.Tournament.Models;
+using osu.Game.Users;
 
 namespace osu.Game.Tournament.Tests
 {
@@ -12,5 +15,124 @@ namespace osu.Game.Tournament.Tests
     {
         [Resolved]
         protected LadderInfo Ladder { get; private set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            TournamentMatch match = CreateSampleMatch();
+
+            Ladder.Rounds.Clear();
+            Ladder.Rounds.Add(match.Round.Value);
+
+            Ladder.Matches.Clear();
+            Ladder.Matches.Add(match);
+
+            Ladder.Teams.Clear();
+            Ladder.Teams.Add(match.Team1.Value);
+            Ladder.Teams.Add(match.Team2.Value);
+
+            Ladder.CurrentMatch.Value = match;
+        }
+
+        public static TournamentMatch CreateSampleMatch() => 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 = CreateSampleBeatmapInfo(),
+                                    Score = 12345672,
+                                    Seed = { Value = 24 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = CreateSampleBeatmapInfo(),
+                                    Score = 1234567,
+                                    Seed = { Value = 12 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = CreateSampleBeatmapInfo(),
+                                    Score = 1234567,
+                                    Seed = { Value = 16 },
+                                }
+                            }
+                        },
+                        new SeedingResult
+                        {
+                            Mod = { Value = "DT" },
+                            Seed = { Value = 5 },
+                            Beatmaps =
+                            {
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = CreateSampleBeatmapInfo(),
+                                    Score = 234567,
+                                    Seed = { Value = 3 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = CreateSampleBeatmapInfo(),
+                                    Score = 234567,
+                                    Seed = { Value = 6 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = CreateSampleBeatmapInfo(),
+                                    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" } }
+            }
+        };
+
+        public static BeatmapInfo CreateSampleBeatmapInfo() =>
+            new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist", ID = RNG.Next(0, 1000000) } };
     }
 }
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index a7011c6d3c..a73e4e53ba 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -1,24 +1,93 @@
 // Copyright (c) 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;
+using osu.Framework.Testing;
+using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.MapPool;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
     public class TestSceneMapPoolScreen : LadderTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(MapPoolScreen)
-        };
+        private MapPoolScreen screen;
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Add(new MapPoolScreen { Width = 0.7f });
+            Add(screen = new MapPoolScreen { Width = 0.7f });
+        }
+
+        [Test]
+        public void TestFewMaps()
+        {
+            AddStep("load few maps", () =>
+            {
+                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+
+                for (int i = 0; i < 8; i++)
+                    addBeatmap();
+            });
+
+            AddStep("reset match", () =>
+            {
+                Ladder.CurrentMatch.Value = new TournamentMatch();
+                Ladder.CurrentMatch.Value = Ladder.Matches.First();
+            });
+
+            AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y > 0);
+        }
+
+        [Test]
+        public void TestManyMaps()
+        {
+            AddStep("load many maps", () =>
+            {
+                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+
+                for (int i = 0; i < 17; i++)
+                    addBeatmap();
+            });
+
+            AddStep("reset match", () =>
+            {
+                Ladder.CurrentMatch.Value = new TournamentMatch();
+                Ladder.CurrentMatch.Value = Ladder.Matches.First();
+            });
+
+            AddAssert("ensure layout width is 3", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y == 0);
+        }
+
+        [Test]
+        public void TestManyMods()
+        {
+            AddStep("load many maps", () =>
+            {
+                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+
+                for (int i = 0; i < 13; i++)
+                    addBeatmap(i < 4 ? $"M{i}" : "NM");
+            });
+
+            AddStep("reset match", () =>
+            {
+                Ladder.CurrentMatch.Value = new TournamentMatch();
+                Ladder.CurrentMatch.Value = Ladder.Matches.First();
+            });
+
+            AddAssert("ensure layout width is 3", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y == 0);
+        }
+
+        private void addBeatmap(string mods = "nm")
+        {
+            Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Add(new RoundBeatmap
+            {
+                BeatmapInfo = CreateSampleBeatmapInfo(),
+                Mods = mods
+            });
         }
     }
 }
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
index 014cd4663b..17cccd34b6 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tournament.Tests.Screens
 
         public TestSceneSeedingEditorScreen()
         {
-            var match = TestSceneSeedingScreen.CreateSampleSeededMatch();
+            var match = CreateSampleMatch();
 
             Add(new SeedingEditorScreen(match.Team1.Value)
             {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
index 335a6c80a1..4269f8f56a 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
@@ -3,10 +3,8 @@
 
 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
 {
@@ -18,110 +16,11 @@ namespace osu.Game.Tournament.Tests.Screens
         [BackgroundDependencyLoader]
         private void load()
         {
-            ladder.CurrentMatch.Value = CreateSampleSeededMatch();
-
             Add(new SeedingScreen
             {
                 FillMode = FillMode.Fit,
                 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" } }
-            }
-        };
     }
 }
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index fad9f00dc8..a9e1d1f226 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -52,7 +52,6 @@ namespace osu.Game.Tournament.Screens.MapPool
                 {
                     Y = 100,
                     Spacing = new Vector2(10, 10),
-                    Padding = new MarginPadding(5) { Horizontal = 100 },
                     Direction = FillDirection.Vertical,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
@@ -212,6 +211,7 @@ namespace osu.Game.Tournament.Screens.MapPool
         private void matchChanged(ValueChangedEvent<TournamentMatch> match)
         {
             mapFlows.Clear();
+            mapFlows.Padding = new MarginPadding(5) { Horizontal = 100 };
 
             int totalRows = 0;
 
@@ -243,7 +243,7 @@ namespace osu.Game.Tournament.Screens.MapPool
                     if (++flowCount > 2)
                     {
                         totalRows++;
-                        flowCount = 0;
+                        flowCount = 1;
                     }
 
                     currentFlow.Add(new TournamentBeatmapPanel(b.BeatmapInfo, b.Mods)

From 00d7dc19cc4932ac1af3ca1c6da315dbcd8b5ee1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 14:25:25 +0900
Subject: [PATCH 01487/10326] Update tests and logic

---
 .../Screens/TestSceneMapPoolScreen.cs         | 46 +++++++++++++++++--
 .../Screens/MapPool/MapPoolScreen.cs          |  7 +--
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index a73e4e53ba..cc5f66761e 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -41,6 +41,26 @@ namespace osu.Game.Tournament.Tests.Screens
             AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y > 0);
         }
 
+        [Test]
+        public void TestJustEnoughMaps()
+        {
+            AddStep("load just enough maps", () =>
+            {
+                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+
+                for (int i = 0; i < 18; i++)
+                    addBeatmap();
+            });
+
+            AddStep("reset match", () =>
+            {
+                Ladder.CurrentMatch.Value = new TournamentMatch();
+                Ladder.CurrentMatch.Value = Ladder.Matches.First();
+            });
+
+            AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y > 0);
+        }
+
         [Test]
         public void TestManyMaps()
         {
@@ -48,7 +68,7 @@ namespace osu.Game.Tournament.Tests.Screens
             {
                 Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
 
-                for (int i = 0; i < 17; i++)
+                for (int i = 0; i < 19; i++)
                     addBeatmap();
             });
 
@@ -61,6 +81,26 @@ namespace osu.Game.Tournament.Tests.Screens
             AddAssert("ensure layout width is 3", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y == 0);
         }
 
+        [Test]
+        public void TestJustEnoughMods()
+        {
+            AddStep("load many maps", () =>
+            {
+                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+
+                for (int i = 0; i < 11; i++)
+                    addBeatmap(i > 4 ? $"M{i}" : "NM");
+            });
+
+            AddStep("reset match", () =>
+            {
+                Ladder.CurrentMatch.Value = new TournamentMatch();
+                Ladder.CurrentMatch.Value = Ladder.Matches.First();
+            });
+
+            AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y > 0);
+        }
+
         [Test]
         public void TestManyMods()
         {
@@ -68,8 +108,8 @@ namespace osu.Game.Tournament.Tests.Screens
             {
                 Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
 
-                for (int i = 0; i < 13; i++)
-                    addBeatmap(i < 4 ? $"M{i}" : "NM");
+                for (int i = 0; i < 12; i++)
+                    addBeatmap(i > 4 ? $"M{i}" : "NM");
             });
 
             AddStep("reset match", () =>
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index a9e1d1f226..da7e226103 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -211,7 +211,6 @@ namespace osu.Game.Tournament.Screens.MapPool
         private void matchChanged(ValueChangedEvent<TournamentMatch> match)
         {
             mapFlows.Clear();
-            mapFlows.Padding = new MarginPadding(5) { Horizontal = 100 };
 
             int totalRows = 0;
 
@@ -254,9 +253,11 @@ namespace osu.Game.Tournament.Screens.MapPool
                 }
             }
 
-            if (totalRows > 9)
+            mapFlows.Padding = new MarginPadding(5)
+            {
                 // remove horizontal padding to increase flow width to 3 panels
-                mapFlows.Padding = new MarginPadding(5);
+                Horizontal = totalRows > 9 ? 0 : 100
+            };
         }
     }
 }

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 01488/10326] 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 30ad580993b60944d395a3650214f53a8e6b75fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 14:09:09 +0900
Subject: [PATCH 01489/10326] Fix map pool screen vertical layout

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index da7e226103..7217629860 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 = 160,
                     Spacing = new Vector2(10, 10),
                     Direction = FillDirection.Vertical,
                     RelativeSizeAxes = Axes.X,

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 01490/10326] 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 c27751050be0ac704c76ceb11cfc2b25f0213c7e Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Thu, 12 Mar 2020 23:29:11 -0700
Subject: [PATCH 01491/10326] Switch back to strings and update setting labels

---
 .../Beatmaps/Formats/LegacyStoryboardDecoder.cs     |  2 +-
 osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs        |  2 +-
 .../Settings/Sections/Graphics/DetailSettings.cs    |  2 +-
 .../Screens/Play/PlayerSettings/VisualSettings.cs   |  2 +-
 osu.Game/Storyboards/Storyboard.cs                  | 13 +++++--------
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 8cb717076a..ba4eb7209b 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Beatmaps.Formats
                         var offset = Parsing.ParseInt(split[1]);
                         var filename = CleanFilename(split[2]);
 
-                        storyboard.GetLayer(LegacyStoryLayer.Video).Add(new StoryboardVideo(filename, offset));
+                        storyboard.GetLayer("Video").Add(new StoryboardVideo(filename, offset));
                         break;
                     }
 
diff --git a/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs b/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
index c1329921ec..48e8bdbb76 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Beatmaps.Legacy
 {
-    public enum LegacyStoryLayer
+    internal enum LegacyStoryLayer
     {
         Background = 0,
         Fail = 1,
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
index acf33f00b3..3089040f96 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             {
                 new SettingsCheckbox
                 {
-                    LabelText = "Storyboards",
+                    LabelText = "Storyboard / Video",
                     Bindable = config.GetBindable<bool>(OsuSetting.ShowStoryboard)
                 },
                 new SettingsCheckbox
diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
index bfb77e823f..d6c66d0751 100644
--- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
                 {
                     Text = "Toggles:"
                 },
-                showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboards" },
+                showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboard / Video" },
                 beatmapSkinsToggle = new PlayerCheckbox { LabelText = "Beatmap skins" },
                 beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hitsounds" }
             };
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 64ad0208c9..7cfb104576 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -1,11 +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.Game.Beatmaps;
-using osu.Game.Beatmaps.Legacy;
-using osu.Game.Storyboards.Drawables;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Storyboards.Drawables;
 
 namespace osu.Game.Storyboards
 {
@@ -29,8 +28,6 @@ namespace osu.Game.Storyboards
             layers.Add("Foreground", new StoryboardLayer("Foreground", 0));
         }
 
-        public StoryboardLayer GetLayer(LegacyStoryLayer layer) => GetLayer(layer.ToString());
-
         public StoryboardLayer GetLayer(string name)
         {
             if (!layers.TryGetValue(name, out var layer))
@@ -50,17 +47,17 @@ namespace osu.Game.Storyboards
                 if (backgroundPath == null)
                     return false;
 
-                if (GetLayer(LegacyStoryLayer.Video).Elements.Any())
+                if (GetLayer("Video").Elements.Any())
                     return true;
 
-                return GetLayer(LegacyStoryLayer.Background).Elements.Any(e => e.Path.ToLowerInvariant() == backgroundPath);
+                return GetLayer("Background").Elements.Any(e => e.Path.ToLowerInvariant() == backgroundPath);
             }
         }
 
         public DrawableStoryboard CreateDrawable(WorkingBeatmap working = null)
         {
             var drawable = new DrawableStoryboard(this);
-            drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard || GetLayer(LegacyStoryLayer.Video).Elements.Any() ? 16 / 9f : 4 / 3f);
+            drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard || GetLayer("Video").Elements.Any() ? 16 / 9f : 4 / 3f);
             return drawable;
         }
     }

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 01492/10326] 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 01493/10326] 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 01494/10326] 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 01495/10326] 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 01496/10326] 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 01497/10326] 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 01498/10326] 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 01499/10326] 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 01500/10326] 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 7e4f58c2d3adc15ccb14a69d99094de5efcd7c13 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Fri, 13 Mar 2020 16:42:05 -0700
Subject: [PATCH 01501/10326] Internalize both looping and stopping

---
 .../Screens/Edit/Components/PlaybackControl.cs     |  3 ---
 osu.Game/Screens/Edit/EditorClock.cs               | 14 ++++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index ff650a7ad7..897c6ec531 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -87,9 +87,6 @@ namespace osu.Game.Screens.Edit.Components
 
         private void togglePause()
         {
-            if ((adjustableClock as EditorClock)?.PlaybackFinished == true)
-                adjustableClock.Seek(0);
-
             if (adjustableClock.IsRunning)
                 adjustableClock.Stop();
             else
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 0e5b42fe69..aef304bd6e 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit
 
         private readonly BindableBeatDivisor beatDivisor;
 
-        public bool PlaybackFinished { get; private set; }
+        private bool playbackFinished;
 
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
         {
@@ -43,17 +43,19 @@ namespace osu.Game.Screens.Edit
         {
             base.ProcessFrame();
 
-            if (CurrentTime >= TrackLength)
+            var playbackAlreadyStopped = playbackFinished;
+            playbackFinished = CurrentTime >= TrackLength;
+
+            if (playbackFinished && IsRunning)
             {
-                if (!PlaybackFinished)
+                if (!playbackAlreadyStopped)
                 {
-                    PlaybackFinished = true;
                     Stop();
                     Seek(TrackLength);
                 }
+                else
+                    Seek(0);
             }
-            else
-                PlaybackFinished = false;
         }
 
         /// <summary>

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 01502/10326] 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 01503/10326] 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 01504/10326] 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 01505/10326] 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 01506/10326] 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 01507/10326] 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 01508/10326] 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 01509/10326] 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 01510/10326] 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 01511/10326] 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 01512/10326] 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 01513/10326] 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 01514/10326] 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 01515/10326] 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 01516/10326] 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 01517/10326] 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 01518/10326] 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 01519/10326] 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 544dfe7dd39266a4e0c4906413fa3b26db161d10 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 16 Mar 2020 09:42:21 +0300
Subject: [PATCH 01520/10326] Implement FriendsLayout component

---
 .../Visual/Online/TestSceneFriendsLayout.cs   |  80 ++++++
 .../TestSceneFriendsOnlineStatusControl.cs    |  12 +-
 .../UserInterface/TestSceneUserListToolbar.cs |   2 +-
 .../Online/API/Requests/GetFriendsRequest.cs  |   4 +-
 .../API/Requests/Responses/APIFriend.cs       |  14 +
 .../Friends/FriendsBundle.cs                  |  13 +-
 .../Dashboard/Friends/FriendsLayout.cs        | 256 ++++++++++++++++++
 .../Friends/FriendsOnlineStatusControl.cs     |  15 +-
 .../Friends/FriendsOnlineStatusItem.cs        |   2 +-
 .../Friends/UserListToolbar.cs                |   2 +-
 .../Friends/UserSortTabControl.cs             |   2 +-
 osu.Game/Overlays/SocialOverlay.cs            |   2 +-
 12 files changed, 379 insertions(+), 25 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
 create mode 100644 osu.Game/Online/API/Requests/Responses/APIFriend.cs
 rename osu.Game/Overlays/{Home => Dashboard}/Friends/FriendsBundle.cs (55%)
 create mode 100644 osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
 rename osu.Game/Overlays/{Home => Dashboard}/Friends/FriendsOnlineStatusControl.cs (70%)
 rename osu.Game/Overlays/{Home => Dashboard}/Friends/FriendsOnlineStatusItem.cs (96%)
 rename osu.Game/Overlays/{Home => Dashboard}/Friends/UserListToolbar.cs (96%)
 rename osu.Game/Overlays/{Home => Dashboard}/Friends/UserSortTabControl.cs (90%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
new file mode 100644
index 0000000000..0e9fafb1b6
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.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.Graphics.Containers;
+using osu.Game.Overlays.Dashboard.Friends;
+using osu.Framework.Graphics;
+using osu.Game.Users;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
+using NUnit.Framework;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneFriendsLayout : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(FriendsLayout),
+            typeof(FriendsOnlineStatusControl),
+            typeof(UserListToolbar)
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private FriendsLayout layout;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Child = new BasicScrollContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = layout = new FriendsLayout()
+            };
+        });
+
+        [Test]
+        public void TestPopulate()
+        {
+            AddStep("Populate", () => layout.Users = getUsers());
+        }
+
+        private List<APIFriend> getUsers() => new List<APIFriend>
+        {
+            new APIFriend
+            {
+                Username = @"flyte",
+                Id = 3103765,
+                IsOnline = true,
+                CurrentModeRank = 1111,
+                Country = new Country { FlagName = @"JP" },
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
+            },
+            new APIFriend
+            {
+                Username = @"peppy",
+                Id = 2,
+                IsOnline = false,
+                CurrentModeRank = 2222,
+                Country = new Country { FlagName = @"AU" },
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                IsSupporter = true,
+                SupportLevel = 3,
+            },
+            new APIFriend
+            {
+                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/TestSceneFriendsOnlineStatusControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
index 0d841dfef1..8bdf3c5dc1 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
@@ -7,9 +7,9 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Home.Friends;
-using osu.Game.Users;
+using osu.Game.Overlays.Dashboard.Friends;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -39,17 +39,17 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void Populate()
         {
-            AddStep("Populate", () => control.Populate(new List<User>
+            AddStep("Populate", () => control.Populate(new List<APIFriend>
             {
-                new User
+                new APIFriend
                 {
                     IsOnline = true
                 },
-                new User
+                new APIFriend
                 {
                     IsOnline = false
                 },
-                new User
+                new APIFriend
                 {
                     IsOnline = false
                 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs
index 02b8839922..1546972580 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs
@@ -8,7 +8,7 @@ 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 osu.Game.Overlays.Dashboard.Friends;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
diff --git a/osu.Game/Online/API/Requests/GetFriendsRequest.cs b/osu.Game/Online/API/Requests/GetFriendsRequest.cs
index 46890aa889..321f675aae 100644
--- a/osu.Game/Online/API/Requests/GetFriendsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetFriendsRequest.cs
@@ -2,11 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Users;
+using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetFriendsRequest : APIRequest<List<User>>
+    public class GetFriendsRequest : APIRequest<List<APIFriend>>
     {
         protected override string Target => @"friends";
     }
diff --git a/osu.Game/Online/API/Requests/Responses/APIFriend.cs b/osu.Game/Online/API/Requests/Responses/APIFriend.cs
new file mode 100644
index 0000000000..91fed28d44
--- /dev/null
+++ b/osu.Game/Online/API/Requests/Responses/APIFriend.cs
@@ -0,0 +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 Newtonsoft.Json;
+using osu.Game.Users;
+
+namespace osu.Game.Online.API.Requests.Responses
+{
+    public class APIFriend : User
+    {
+        [JsonProperty(@"current_mode_rank")]
+        public int? CurrentModeRank;
+    }
+}
diff --git a/osu.Game/Overlays/Home/Friends/FriendsBundle.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
similarity index 55%
rename from osu.Game/Overlays/Home/Friends/FriendsBundle.cs
rename to osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
index 75d00dfef8..0062c49c91 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsBundle.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
@@ -1,18 +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.
 
-namespace osu.Game.Overlays.Home.Friends
+using System.Collections.Generic;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Overlays.Dashboard.Friends
 {
     public class FriendsBundle
     {
         public FriendsOnlineStatus Status { get; }
 
-        public int Count { get; }
+        public int Count => Users.Count;
 
-        public FriendsBundle(FriendsOnlineStatus status, int count)
+        public List<APIFriend> Users { get; }
+
+        public FriendsBundle(FriendsOnlineStatus status, List<APIFriend> users)
         {
             Status = status;
-            Count = count;
+            Users = users;
         }
     }
 
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
new file mode 100644
index 0000000000..55f394cb78
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
@@ -0,0 +1,256 @@
+// Copyright (c) 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 System.Threading;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+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.Users;
+using osuTK;
+
+namespace osu.Game.Overlays.Dashboard.Friends
+{
+    public class FriendsLayout : CompositeDrawable
+    {
+        private List<APIFriend> users = new List<APIFriend>();
+
+        public List<APIFriend> Users
+        {
+            get => users;
+            set
+            {
+                users = value;
+
+                usersLoaded = true;
+
+                onlineStatusControl.Populate(value);
+            }
+        }
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private GetFriendsRequest request;
+        private CancellationTokenSource cancellationToken;
+
+        private Drawable currentContent;
+
+        private readonly Box background;
+        private readonly Box controlBackground;
+        private readonly FriendsOnlineStatusControl onlineStatusControl;
+        private readonly UserListToolbar userListToolbar;
+        private readonly Container itemsPlaceholder;
+        private readonly LoadingLayer loading;
+
+        public FriendsLayout()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Children = new Drawable[]
+                        {
+                            controlBackground = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both
+                            },
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Padding = new MarginPadding
+                                {
+                                    Top = 20,
+                                    Horizontal = 45
+                                },
+                                Child = onlineStatusControl = new FriendsOnlineStatusControl(),
+                            }
+                        }
+                    },
+                    new Container
+                    {
+                        Name = "User List",
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Children = new Drawable[]
+                        {
+                            background = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both
+                            },
+                            new FillFlowContainer
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Direction = FillDirection.Vertical,
+                                Margin = new MarginPadding { Bottom = 20 },
+                                Children = new Drawable[]
+                                {
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Padding = new MarginPadding
+                                        {
+                                            Horizontal = 40,
+                                            Vertical = 20
+                                        },
+                                        Child = userListToolbar = new UserListToolbar
+                                        {
+                                            Anchor = Anchor.CentreRight,
+                                            Origin = Anchor.CentreRight,
+                                        }
+                                    },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Children = new Drawable[]
+                                        {
+                                            itemsPlaceholder = new Container
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                AutoSizeAxes = Axes.Y,
+                                                Padding = new MarginPadding { Horizontal = 50 }
+                                            },
+                                            loading = new LoadingLayer(itemsPlaceholder)
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            background.Colour = colourProvider.Background4;
+            controlBackground.Colour = colourProvider.Background5;
+        }
+
+        private bool usersLoaded;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            onlineStatusControl.Current.BindValueChanged(_ => recreatePanels());
+            userListToolbar.DisplayStyle.BindValueChanged(_ => recreatePanels());
+            userListToolbar.SortCriteria.BindValueChanged(_ => recreatePanels());
+
+            if (!api.IsLoggedIn)
+                return;
+
+            request = new GetFriendsRequest();
+            request.Success += response => Schedule(() => Users = response);
+            api.Queue(request);
+        }
+
+        private void recreatePanels()
+        {
+            // Don't allow any changes until we have users loaded
+            if (!usersLoaded)
+                return;
+
+            cancellationToken?.Cancel();
+
+            if (itemsPlaceholder.Any())
+                loading.Show();
+
+            var groupedUsers = onlineStatusControl.Current.Value?.Users ?? new List<APIFriend>();
+
+            var sortedUsers = sortUsers(groupedUsers);
+
+            LoadComponentAsync(createTable(sortedUsers), addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        private void addContentToPlaceholder(Drawable content)
+        {
+            loading.Hide();
+
+            var lastContent = currentContent;
+
+            if (lastContent != null)
+            {
+                lastContent.FadeOut(100, Easing.OutQuint).Expire();
+                lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y);
+            }
+
+            itemsPlaceholder.Add(currentContent = content);
+            currentContent.FadeIn(200, Easing.OutQuint);
+        }
+
+        private FillFlowContainer createTable(List<APIFriend> users)
+        {
+            var style = userListToolbar.DisplayStyle.Value;
+
+            return new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(style == OverlayPanelDisplayStyle.Card ? 10 : 2),
+                Children = users.Select(u => createUserPanel(u, style)).ToList()
+            };
+        }
+
+        private UserPanel createUserPanel(User user, OverlayPanelDisplayStyle style)
+        {
+            switch (style)
+            {
+                default:
+                case OverlayPanelDisplayStyle.Card:
+                    return new UserGridPanel(user).With(panel =>
+                    {
+                        panel.Anchor = Anchor.TopCentre;
+                        panel.Origin = Anchor.TopCentre;
+                        panel.Width = 290;
+                    });
+
+                case OverlayPanelDisplayStyle.List:
+                    return new UserListPanel(user);
+            }
+        }
+
+        private List<APIFriend> sortUsers(List<APIFriend> unsorted)
+        {
+            switch (userListToolbar.SortCriteria.Value)
+            {
+                default:
+                case UserSortCriteria.LastVisit:
+                    return unsorted.OrderBy(u => u.LastVisit).Reverse().ToList();
+
+                case UserSortCriteria.Rank:
+                    return unsorted.Where(u => u.CurrentModeRank.HasValue).OrderBy(u => u.CurrentModeRank).Concat(unsorted.Where(u => u.CurrentModeRank == null)).ToList();
+
+                case UserSortCriteria.Username:
+                    return unsorted.OrderBy(u => u.Username).ToList();
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            request?.Cancel();
+            cancellationToken?.Cancel();
+
+            base.Dispose(isDisposing);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
similarity index 70%
rename from osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
rename to osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
index 196f01ab4a..2b716f228d 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
@@ -3,22 +3,21 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Users;
+using osu.Game.Online.API.Requests.Responses;
 
-namespace osu.Game.Overlays.Home.Friends
+namespace osu.Game.Overlays.Dashboard.Friends
 {
     public class FriendsOnlineStatusControl : OverlayStreamControl<FriendsBundle>
     {
         protected override OverlayStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
 
-        public void Populate(List<User> users)
+        public void Populate(List<APIFriend> users)
         {
-            var userCount = users.Count;
-            var onlineUsersCount = users.Count(user => user.IsOnline);
+            Clear();
 
-            AddItem(new FriendsBundle(FriendsOnlineStatus.All, userCount));
-            AddItem(new FriendsBundle(FriendsOnlineStatus.Online, onlineUsersCount));
-            AddItem(new FriendsBundle(FriendsOnlineStatus.Offline, userCount - onlineUsersCount));
+            AddItem(new FriendsBundle(FriendsOnlineStatus.All, users));
+            AddItem(new FriendsBundle(FriendsOnlineStatus.Online, users.Where(u => u.IsOnline).ToList()));
+            AddItem(new FriendsBundle(FriendsOnlineStatus.Offline, users.Where(u => !u.IsOnline).ToList()));
 
             Current.Value = Items.FirstOrDefault();
         }
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusItem.cs
similarity index 96%
rename from osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
rename to osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusItem.cs
index d9b780ce46..eada9420ea 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusItem.cs
@@ -5,7 +5,7 @@ using System;
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
-namespace osu.Game.Overlays.Home.Friends
+namespace osu.Game.Overlays.Dashboard.Friends
 {
     public class FriendsOnlineStatusItem : OverlayStreamItem<FriendsBundle>
     {
diff --git a/osu.Game/Overlays/Home/Friends/UserListToolbar.cs b/osu.Game/Overlays/Dashboard/Friends/UserListToolbar.cs
similarity index 96%
rename from osu.Game/Overlays/Home/Friends/UserListToolbar.cs
rename to osu.Game/Overlays/Dashboard/Friends/UserListToolbar.cs
index f7c5e9f4fd..fb4b938183 100644
--- a/osu.Game/Overlays/Home/Friends/UserListToolbar.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/UserListToolbar.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
 using osuTK;
 using osu.Framework.Bindables;
 
-namespace osu.Game.Overlays.Home.Friends
+namespace osu.Game.Overlays.Dashboard.Friends
 {
     public class UserListToolbar : CompositeDrawable
     {
diff --git a/osu.Game/Overlays/Home/Friends/UserSortTabControl.cs b/osu.Game/Overlays/Dashboard/Friends/UserSortTabControl.cs
similarity index 90%
rename from osu.Game/Overlays/Home/Friends/UserSortTabControl.cs
rename to osu.Game/Overlays/Dashboard/Friends/UserSortTabControl.cs
index 2479fa4638..3a5f65212d 100644
--- a/osu.Game/Overlays/Home/Friends/UserSortTabControl.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/UserSortTabControl.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 
-namespace osu.Game.Overlays.Home.Friends
+namespace osu.Game.Overlays.Dashboard.Friends
 {
     public class UserSortTabControl : OverlaySortTabControl<UserSortCriteria>
     {
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index 02f7c9b0d3..ba572b0e78 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Overlays
             {
                 case SocialTab.Friends:
                     var friendRequest = new GetFriendsRequest(); // TODO filter arguments?
-                    friendRequest.Success += users => Users = users.ToArray();
+                    friendRequest.Success += users => Users = users.Select(u => (User)u).ToArray();
                     API.Queue(getUsersRequest = friendRequest);
                     break;
 

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 01521/10326] 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 01522/10326] 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 01523/10326] 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 1aacd1aaa2568eecb1f00ecc1b77cb0ae406082f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 16 Mar 2020 20:43:02 +0100
Subject: [PATCH 01524/10326] Initial implementation of LowHealthLayer

---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 +
 .../Sections/Gameplay/GeneralSettings.cs      |  6 +++
 osu.Game/Screens/Play/HUD/LowHealthLayer.cs   | 47 +++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 osu.Game/Screens/Play/HUD/LowHealthLayer.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 21de654670..895bacafc4 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -88,6 +88,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.ShowInterface, true);
             Set(OsuSetting.ShowProgressGraph, true);
             Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
+            Set(OsuSetting.FadePlayfieldWhenLowHealth, true);
             Set(OsuSetting.KeyOverlay, false);
             Set(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
@@ -183,6 +184,7 @@ namespace osu.Game.Configuration
         ShowInterface,
         ShowProgressGraph,
         ShowHealthDisplayWhenCantFail,
+        FadePlayfieldWhenLowHealth,
         MouseDisableButtons,
         MouseDisableWheel,
         AudioOffset,
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 2d2cd42213..6b6b3e8fa4 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -53,6 +53,12 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     Keywords = new[] { "hp", "bar" }
                 },
                 new SettingsCheckbox
+                {
+                    LabelText = "Fade playfield to red when health is low",
+                    Bindable = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenLowHealth),
+                    Keywords = new[] { "hp", "playfield", "health" }
+                },
+                new SettingsCheckbox
                 {
                     LabelText = "Always show key overlay",
                     Bindable = config.GetBindable<bool>(OsuSetting.KeyOverlay)
diff --git a/osu.Game/Screens/Play/HUD/LowHealthLayer.cs b/osu.Game/Screens/Play/HUD/LowHealthLayer.cs
new file mode 100644
index 0000000000..8f03a95877
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/LowHealthLayer.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Configuration;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class LowHealthLayer : HealthDisplay
+    {
+        private const float max_alpha = 0.4f;
+
+        private const double fade_time = 300;
+
+        private readonly Box box;
+
+        private Bindable<bool> configFadeRedWhenLowHealth;
+
+        public LowHealthLayer()
+        {
+            Child = box = new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Alpha = 0
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config, OsuColour color)
+        {
+            configFadeRedWhenLowHealth = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenLowHealth);
+            box.Colour = color.Red;
+
+            configFadeRedWhenLowHealth.BindValueChanged(value =>
+            {
+                if (value.NewValue)
+                    this.FadeIn(fade_time, Easing.OutQuint);
+                else
+                    this.FadeOut(fade_time, Easing.OutQuint);
+            }, true);
+        }
+    }
+}

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 01525/10326] 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 cc5833db80568e8e300dd434f4ad636c9582f573 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 17 Mar 2020 01:36:48 +0300
Subject: [PATCH 01526/10326] Remove string prefixes in the test scene

---
 .../Visual/Online/TestSceneFriendsLayout.cs    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
index 0e9fafb1b6..46f22073f2 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
@@ -48,30 +48,30 @@ namespace osu.Game.Tests.Visual.Online
         {
             new APIFriend
             {
-                Username = @"flyte",
+                Username = "flyte",
                 Id = 3103765,
                 IsOnline = true,
                 CurrentModeRank = 1111,
-                Country = new Country { FlagName = @"JP" },
-                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
+                Country = new Country { FlagName = "JP" },
+                CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
             },
             new APIFriend
             {
-                Username = @"peppy",
+                Username = "peppy",
                 Id = 2,
                 IsOnline = false,
                 CurrentModeRank = 2222,
-                Country = new Country { FlagName = @"AU" },
-                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                Country = new Country { FlagName = "AU" },
+                CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 IsSupporter = true,
                 SupportLevel = 3,
             },
             new APIFriend
             {
-                Username = @"Evast",
+                Username = "Evast",
                 Id = 8195163,
-                Country = new Country { FlagName = @"BY" },
-                CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
+                Country = new Country { FlagName = "BY" },
+                CoverUrl = "https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
                 IsOnline = false,
                 LastVisit = DateTimeOffset.Now
             }

From 6ec01a67af0d3d3a7af3db542e00dd69e725b008 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 17 Mar 2020 01:38:45 +0300
Subject: [PATCH 01527/10326] Use cast in SocialOverlay

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

diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index ba572b0e78..ff6f7de436 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Overlays
             {
                 case SocialTab.Friends:
                     var friendRequest = new GetFriendsRequest(); // TODO filter arguments?
-                    friendRequest.Success += users => Users = users.Select(u => (User)u).ToArray();
+                    friendRequest.Success += users => Users = users.Cast<User>().ToArray();
                     API.Queue(getUsersRequest = friendRequest);
                     break;
 

From 6a151b8e75a4bcc3ed48d2dfd6c8f2f2ddd393b1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 17 Mar 2020 01:50:19 +0300
Subject: [PATCH 01528/10326] Add online test

---
 .../Visual/Online/TestSceneFriendsLayout.cs    | 18 ++++++++++++++++--
 .../Dashboard/Friends/FriendsLayout.cs         | 12 +++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
index 46f22073f2..90474e5178 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
@@ -11,6 +11,7 @@ using osu.Game.Overlays;
 using osu.Framework.Allocation;
 using NUnit.Framework;
 using osu.Game.Online.API.Requests.Responses;
+using System.Linq;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -23,10 +24,12 @@ namespace osu.Game.Tests.Visual.Online
             typeof(UserListToolbar)
         };
 
+        protected override bool UseOnlineAPI => true;
+
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private FriendsLayout layout;
+        private TestFriendsLayout layout;
 
         [SetUp]
         public void Setup() => Schedule(() =>
@@ -34,10 +37,16 @@ namespace osu.Game.Tests.Visual.Online
             Child = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = layout = new FriendsLayout()
+                Child = layout = new TestFriendsLayout()
             };
         });
 
+        [Test]
+        public void TestOnline()
+        {
+            AddUntilStep("Users loaded", () => layout?.StatusControl.Items.Any() ?? false);
+        }
+
         [Test]
         public void TestPopulate()
         {
@@ -76,5 +85,10 @@ namespace osu.Game.Tests.Visual.Online
                 LastVisit = DateTimeOffset.Now
             }
         };
+
+        private class TestFriendsLayout : FriendsLayout
+        {
+            public FriendsOnlineStatusControl StatusControl => OnlineStatusControl;
+        }
     }
 }
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
index 55f394cb78..cd358bcf84 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
@@ -26,11 +26,13 @@ namespace osu.Game.Overlays.Dashboard.Friends
             get => users;
             set
             {
+                request?.Cancel();
+
                 users = value;
 
                 usersLoaded = true;
 
-                onlineStatusControl.Populate(value);
+                OnlineStatusControl.Populate(value);
             }
         }
 
@@ -42,9 +44,9 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
         private Drawable currentContent;
 
+        protected readonly FriendsOnlineStatusControl OnlineStatusControl;
         private readonly Box background;
         private readonly Box controlBackground;
-        private readonly FriendsOnlineStatusControl onlineStatusControl;
         private readonly UserListToolbar userListToolbar;
         private readonly Container itemsPlaceholder;
         private readonly LoadingLayer loading;
@@ -78,7 +80,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
                                     Top = 20,
                                     Horizontal = 45
                                 },
-                                Child = onlineStatusControl = new FriendsOnlineStatusControl(),
+                                Child = OnlineStatusControl = new FriendsOnlineStatusControl(),
                             }
                         }
                     },
@@ -152,7 +154,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
         {
             base.LoadComplete();
 
-            onlineStatusControl.Current.BindValueChanged(_ => recreatePanels());
+            OnlineStatusControl.Current.BindValueChanged(_ => recreatePanels());
             userListToolbar.DisplayStyle.BindValueChanged(_ => recreatePanels());
             userListToolbar.SortCriteria.BindValueChanged(_ => recreatePanels());
 
@@ -175,7 +177,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
             if (itemsPlaceholder.Any())
                 loading.Show();
 
-            var groupedUsers = onlineStatusControl.Current.Value?.Users ?? new List<APIFriend>();
+            var groupedUsers = OnlineStatusControl.Current.Value?.Users ?? new List<APIFriend>();
 
             var sortedUsers = sortUsers(groupedUsers);
 

From da97a02e6660ef516762d9f0c742df3eb39f7247 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 17 Mar 2020 01:53:53 +0300
Subject: [PATCH 01529/10326] Remove pointless flag

---
 osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
index cd358bcf84..1098fdee8f 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
@@ -30,8 +30,6 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
                 users = value;
 
-                usersLoaded = true;
-
                 OnlineStatusControl.Populate(value);
             }
         }
@@ -148,8 +146,6 @@ namespace osu.Game.Overlays.Dashboard.Friends
             controlBackground.Colour = colourProvider.Background5;
         }
 
-        private bool usersLoaded;
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -168,8 +164,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
         private void recreatePanels()
         {
-            // Don't allow any changes until we have users loaded
-            if (!usersLoaded)
+            if (!users.Any())
                 return;
 
             cancellationToken?.Cancel();

From bd84980aa61af03d6c398db2942d8d5998d049ab Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 17 Mar 2020 01:56:10 +0300
Subject: [PATCH 01530/10326] Simplify order by last visit

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

diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
index 1098fdee8f..1c56227521 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
@@ -232,7 +232,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
             {
                 default:
                 case UserSortCriteria.LastVisit:
-                    return unsorted.OrderBy(u => u.LastVisit).Reverse().ToList();
+                    return unsorted.OrderByDescending(u => u.LastVisit).ToList();
 
                 case UserSortCriteria.Rank:
                     return unsorted.Where(u => u.CurrentModeRank.HasValue).OrderBy(u => u.CurrentModeRank).Concat(unsorted.Where(u => u.CurrentModeRank == null)).ToList();

From f816479ff8972c4e2fb139b55746b36432a05f34 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 17 Mar 2020 02:03:57 +0300
Subject: [PATCH 01531/10326] Simplify order by rank

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

diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
index 1c56227521..f069d3f384 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
@@ -235,7 +235,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
                     return unsorted.OrderByDescending(u => u.LastVisit).ToList();
 
                 case UserSortCriteria.Rank:
-                    return unsorted.Where(u => u.CurrentModeRank.HasValue).OrderBy(u => u.CurrentModeRank).Concat(unsorted.Where(u => u.CurrentModeRank == null)).ToList();
+                    return unsorted.OrderByDescending(u => u.CurrentModeRank.HasValue).ThenBy(u => u.CurrentModeRank ?? 0).ToList();
 
                 case UserSortCriteria.Username:
                     return unsorted.OrderBy(u => u.Username).ToList();

From d9d812a8fe09d7006c0e64bd20a79dd9f049efec Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 17 Mar 2020 02:10:20 +0300
Subject: [PATCH 01532/10326] Fix status icon flash on first status change

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

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 289244cdc3..d5e6d5f13e 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -99,6 +99,9 @@ namespace osu.Game.Users
         {
             base.LoadComplete();
             Status.TriggerChange();
+
+            // Colour should be applied immediately on first load.
+            statusIcon.FinishTransforms();
         }
 
         protected override bool OnHover(HoverEvent e)

From bf9c6f8a3b0f36f1fb984ddc7894cb00d2ec0a8d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 17 Mar 2020 02:19:03 +0300
Subject: [PATCH 01533/10326] Skip online test if user is not logged-in

---
 osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
index 90474e5178..788cbd82c9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
@@ -12,6 +12,7 @@ using osu.Framework.Allocation;
 using NUnit.Framework;
 using osu.Game.Online.API.Requests.Responses;
 using System.Linq;
+using osu.Game.Online.API;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -29,6 +30,9 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         private TestFriendsLayout layout;
 
         [SetUp]
@@ -44,7 +48,8 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestOnline()
         {
-            AddUntilStep("Users loaded", () => layout?.StatusControl.Items.Any() ?? false);
+            // Skip online test if user is not logged-in
+            AddUntilStep("Users loaded", () => !api.IsLoggedIn || (layout?.StatusControl.Items.Any() ?? false));
         }
 
         [Test]

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 01534/10326] 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 01535/10326] 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 01536/10326] 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 4ac740b12baceb300e3c582e37804587568acb8c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 17 Mar 2020 08:51:54 +0300
Subject: [PATCH 01537/10326] Remove APIFriend

---
 .../Visual/Online/TestSceneFriendsLayout.cs        |  9 ++++-----
 .../TestSceneFriendsOnlineStatusControl.cs         | 10 +++++-----
 osu.Game/Online/API/Requests/GetFriendsRequest.cs  |  4 ++--
 .../Online/API/Requests/Responses/APIFriend.cs     | 14 --------------
 .../Overlays/Dashboard/Friends/FriendsBundle.cs    |  6 +++---
 .../Overlays/Dashboard/Friends/FriendsLayout.cs    | 11 +++++------
 .../Friends/FriendsOnlineStatusControl.cs          |  4 ++--
 osu.Game/Overlays/SocialOverlay.cs                 |  2 +-
 osu.Game/Users/User.cs                             |  3 +++
 9 files changed, 25 insertions(+), 38 deletions(-)
 delete mode 100644 osu.Game/Online/API/Requests/Responses/APIFriend.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
index 788cbd82c9..c6971a971d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
@@ -10,7 +10,6 @@ using osu.Game.Users;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
 using NUnit.Framework;
-using osu.Game.Online.API.Requests.Responses;
 using System.Linq;
 using osu.Game.Online.API;
 
@@ -58,9 +57,9 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Populate", () => layout.Users = getUsers());
         }
 
-        private List<APIFriend> getUsers() => new List<APIFriend>
+        private List<User> getUsers() => new List<User>
         {
-            new APIFriend
+            new User
             {
                 Username = "flyte",
                 Id = 3103765,
@@ -69,7 +68,7 @@ namespace osu.Game.Tests.Visual.Online
                 Country = new Country { FlagName = "JP" },
                 CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
             },
-            new APIFriend
+            new User
             {
                 Username = "peppy",
                 Id = 2,
@@ -80,7 +79,7 @@ namespace osu.Game.Tests.Visual.Online
                 IsSupporter = true,
                 SupportLevel = 3,
             },
-            new APIFriend
+            new User
             {
                 Username = "Evast",
                 Id = 8195163,
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
index 8bdf3c5dc1..d72818ed89 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
@@ -7,9 +7,9 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dashboard.Friends;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -39,17 +39,17 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void Populate()
         {
-            AddStep("Populate", () => control.Populate(new List<APIFriend>
+            AddStep("Populate", () => control.Populate(new List<User>
             {
-                new APIFriend
+                new User
                 {
                     IsOnline = true
                 },
-                new APIFriend
+                new User
                 {
                     IsOnline = false
                 },
-                new APIFriend
+                new User
                 {
                     IsOnline = false
                 }
diff --git a/osu.Game/Online/API/Requests/GetFriendsRequest.cs b/osu.Game/Online/API/Requests/GetFriendsRequest.cs
index 321f675aae..46890aa889 100644
--- a/osu.Game/Online/API/Requests/GetFriendsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetFriendsRequest.cs
@@ -2,11 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetFriendsRequest : APIRequest<List<APIFriend>>
+    public class GetFriendsRequest : APIRequest<List<User>>
     {
         protected override string Target => @"friends";
     }
diff --git a/osu.Game/Online/API/Requests/Responses/APIFriend.cs b/osu.Game/Online/API/Requests/Responses/APIFriend.cs
deleted file mode 100644
index 91fed28d44..0000000000
--- a/osu.Game/Online/API/Requests/Responses/APIFriend.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 Newtonsoft.Json;
-using osu.Game.Users;
-
-namespace osu.Game.Online.API.Requests.Responses
-{
-    public class APIFriend : User
-    {
-        [JsonProperty(@"current_mode_rank")]
-        public int? CurrentModeRank;
-    }
-}
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
index 0062c49c91..772d9c67a0 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users;
 
 namespace osu.Game.Overlays.Dashboard.Friends
 {
@@ -12,9 +12,9 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
         public int Count => Users.Count;
 
-        public List<APIFriend> Users { get; }
+        public List<User> Users { get; }
 
-        public FriendsBundle(FriendsOnlineStatus status, List<APIFriend> users)
+        public FriendsBundle(FriendsOnlineStatus status, List<User> users)
         {
             Status = status;
             Users = users;
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
index f069d3f384..c02f07fe4a 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Shapes;
 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.Users;
 using osuTK;
 
@@ -19,9 +18,9 @@ namespace osu.Game.Overlays.Dashboard.Friends
 {
     public class FriendsLayout : CompositeDrawable
     {
-        private List<APIFriend> users = new List<APIFriend>();
+        private List<User> users = new List<User>();
 
-        public List<APIFriend> Users
+        public List<User> Users
         {
             get => users;
             set
@@ -172,7 +171,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
             if (itemsPlaceholder.Any())
                 loading.Show();
 
-            var groupedUsers = OnlineStatusControl.Current.Value?.Users ?? new List<APIFriend>();
+            var groupedUsers = OnlineStatusControl.Current.Value?.Users ?? new List<User>();
 
             var sortedUsers = sortUsers(groupedUsers);
 
@@ -195,7 +194,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
             currentContent.FadeIn(200, Easing.OutQuint);
         }
 
-        private FillFlowContainer createTable(List<APIFriend> users)
+        private FillFlowContainer createTable(List<User> users)
         {
             var style = userListToolbar.DisplayStyle.Value;
 
@@ -226,7 +225,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
             }
         }
 
-        private List<APIFriend> sortUsers(List<APIFriend> unsorted)
+        private List<User> sortUsers(List<User> unsorted)
         {
             switch (userListToolbar.SortCriteria.Value)
             {
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
index 2b716f228d..88035e0a34 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users;
 
 namespace osu.Game.Overlays.Dashboard.Friends
 {
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
     {
         protected override OverlayStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
 
-        public void Populate(List<APIFriend> users)
+        public void Populate(List<User> users)
         {
             Clear();
 
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index ff6f7de436..02f7c9b0d3 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Overlays
             {
                 case SocialTab.Friends:
                     var friendRequest = new GetFriendsRequest(); // TODO filter arguments?
-                    friendRequest.Success += users => Users = users.Cast<User>().ToArray();
+                    friendRequest.Success += users => Users = users.ToArray();
                     API.Queue(getUsersRequest = friendRequest);
                     break;
 
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index d25c552160..2a6f7844a2 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -69,6 +69,9 @@ namespace osu.Game.Users
         [JsonProperty(@"support_level")]
         public int SupportLevel;
 
+        [JsonProperty(@"current_mode_rank")]
+        public int? CurrentModeRank;
+
         [JsonProperty(@"is_gmt")]
         public bool IsGMT;
 

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 01538/10326] 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 01539/10326] 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 01540/10326] 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 01541/10326] 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 01542/10326] 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 01543/10326] 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 01544/10326] 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 01545/10326] 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 01546/10326] 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 01547/10326] 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 01548/10326] 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 01549/10326] 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 01550/10326] 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 01551/10326] 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 01552/10326] 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 01553/10326] 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 01554/10326] 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 01555/10326] 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 01556/10326] 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 01557/10326] 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 01558/10326] 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 01559/10326] 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 01560/10326] 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 01561/10326] 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 01562/10326] 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 01563/10326] 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 100c9d422fbd043943e9743f57a3aeb00f2b23bd Mon Sep 17 00:00:00 2001
From: Tina <me@tina.moe>
Date: Tue, 17 Mar 2020 18:55:30 +0100
Subject: [PATCH 01564/10326] Re-use colors defined for each rank in result
 screen accuracy circle

---
 .../Ranking/Expanded/Accuracy/AccuracyCircle.cs      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 4b6f777283..2d76a7c3b0 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -119,42 +119,42 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                         new SmoothCircularProgress
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = Color4Extensions.FromHex("#BE0089"),
+                            Colour = OsuColour.ForRank(ScoreRank.X),
                             InnerRadius = RANK_CIRCLE_RADIUS,
                             Current = { Value = 1 }
                         },
                         new SmoothCircularProgress
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = Color4Extensions.FromHex("#0096A2"),
+                            Colour = OsuColour.ForRank(ScoreRank.S),
                             InnerRadius = RANK_CIRCLE_RADIUS,
                             Current = { Value = 1 - virtual_ss_percentage }
                         },
                         new SmoothCircularProgress
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = Color4Extensions.FromHex("#72C904"),
+                            Colour = OsuColour.ForRank(ScoreRank.A),
                             InnerRadius = RANK_CIRCLE_RADIUS,
                             Current = { Value = 0.95f }
                         },
                         new SmoothCircularProgress
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = Color4Extensions.FromHex("#D99D03"),
+                            Colour = OsuColour.ForRank(ScoreRank.B),
                             InnerRadius = RANK_CIRCLE_RADIUS,
                             Current = { Value = 0.9f }
                         },
                         new SmoothCircularProgress
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = Color4Extensions.FromHex("#EA7948"),
+                            Colour = OsuColour.ForRank(ScoreRank.C),
                             InnerRadius = RANK_CIRCLE_RADIUS,
                             Current = { Value = 0.8f }
                         },
                         new SmoothCircularProgress
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = Color4Extensions.FromHex("#FF5858"),
+                            Colour = OsuColour.ForRank(ScoreRank.D),
                             InnerRadius = RANK_CIRCLE_RADIUS,
                             Current = { Value = 0.7f }
                         },

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 01565/10326] 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 01566/10326] 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 01567/10326] 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 e951979a12ec05aadce4e4c0b68435d2a24f9f75 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 17 Mar 2020 22:34:46 +0300
Subject: [PATCH 01568/10326] Remove assert from online test

---
 .../Visual/Online/TestSceneFriendsLayout.cs    | 18 +++++-------------
 .../Dashboard/Friends/FriendsLayout.cs         | 10 +++++-----
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
index c6971a971d..e6b2a41c1c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
@@ -10,7 +10,6 @@ using osu.Game.Users;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
 using NUnit.Framework;
-using System.Linq;
 using osu.Game.Online.API;
 
 namespace osu.Game.Tests.Visual.Online
@@ -32,7 +31,7 @@ namespace osu.Game.Tests.Visual.Online
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private TestFriendsLayout layout;
+        private FriendsLayout layout;
 
         [SetUp]
         public void Setup() => Schedule(() =>
@@ -40,21 +39,19 @@ namespace osu.Game.Tests.Visual.Online
             Child = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = layout = new TestFriendsLayout()
+                Child = layout = new FriendsLayout()
             };
         });
 
         [Test]
-        public void TestOnline()
+        public void TestOffline()
         {
-            // Skip online test if user is not logged-in
-            AddUntilStep("Users loaded", () => !api.IsLoggedIn || (layout?.StatusControl.Items.Any() ?? false));
+            AddStep("Populate", () => layout.Users = getUsers());
         }
 
         [Test]
-        public void TestPopulate()
+        public void TestOnline()
         {
-            AddStep("Populate", () => layout.Users = getUsers());
         }
 
         private List<User> getUsers() => new List<User>
@@ -89,10 +86,5 @@ namespace osu.Game.Tests.Visual.Online
                 LastVisit = DateTimeOffset.Now
             }
         };
-
-        private class TestFriendsLayout : FriendsLayout
-        {
-            public FriendsOnlineStatusControl StatusControl => OnlineStatusControl;
-        }
     }
 }
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
index c02f07fe4a..55a5081435 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
                 users = value;
 
-                OnlineStatusControl.Populate(value);
+                onlineStatusControl.Populate(value);
             }
         }
 
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
         private Drawable currentContent;
 
-        protected readonly FriendsOnlineStatusControl OnlineStatusControl;
+        private readonly FriendsOnlineStatusControl onlineStatusControl;
         private readonly Box background;
         private readonly Box controlBackground;
         private readonly UserListToolbar userListToolbar;
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
                                     Top = 20,
                                     Horizontal = 45
                                 },
-                                Child = OnlineStatusControl = new FriendsOnlineStatusControl(),
+                                Child = onlineStatusControl = new FriendsOnlineStatusControl(),
                             }
                         }
                     },
@@ -149,7 +149,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
         {
             base.LoadComplete();
 
-            OnlineStatusControl.Current.BindValueChanged(_ => recreatePanels());
+            onlineStatusControl.Current.BindValueChanged(_ => recreatePanels());
             userListToolbar.DisplayStyle.BindValueChanged(_ => recreatePanels());
             userListToolbar.SortCriteria.BindValueChanged(_ => recreatePanels());
 
@@ -171,7 +171,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
             if (itemsPlaceholder.Any())
                 loading.Show();
 
-            var groupedUsers = OnlineStatusControl.Current.Value?.Users ?? new List<User>();
+            var groupedUsers = onlineStatusControl.Current.Value?.Users ?? new List<User>();
 
             var sortedUsers = sortUsers(groupedUsers);
 

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 01569/10326] 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 bee8e22d185e39abca1e54886fc3bb3998f3b8a4 Mon Sep 17 00:00:00 2001
From: Fuewburvpoa <Fuewburvpoa@yandex.ru>
Date: Tue, 17 Mar 2020 22:27:11 +0200
Subject: [PATCH 01570/10326] Fix BeatDivisorControl allow to select value
 outside of VALID_DIVISORS

---
 .../Screens/Edit/Compose/Components/BeatDivisorControl.cs     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 8201ec2710..626a12edcf 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -279,6 +279,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 handleMouseInput(e.ScreenSpaceMousePosition);
             }
 
+            protected override void OnDragEnd(DragEndEvent e)
+            {
+            }
+
             private void handleMouseInput(Vector2 screenSpaceMousePosition)
             {
                 // copied from SliderBar so we can do custom spacing logic.

From 8c611a981f0fc35ab89fb8012157dc7c62cecb00 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 16 Mar 2020 21:48:28 +0100
Subject: [PATCH 01571/10326] Update visual tests

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index fc03dc6ed3..579f6ff9b6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -103,6 +103,38 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("return value", () => config.Set<bool>(OsuSetting.KeyOverlay, keyCounterVisibleValue));
         }
 
+        [Test]
+        public void TestChangeHealthValue()
+        {
+            void applyToHealthDisplays(double value)
+            {
+                if (hudOverlay == null) return;
+
+                hudOverlay.LowHealthDisplay.Current.Value = value;
+                hudOverlay.HealthDisplay.Current.Value = value;
+            }
+
+            createNew();
+            AddSliderStep("health value", 0, 1, 0.5, applyToHealthDisplays);
+
+            AddStep("enable low health display", () =>
+            {
+                config.Set(OsuSetting.FadePlayfieldWhenLowHealth, true);
+                hudOverlay.LowHealthDisplay.FinishTransforms(true);
+            });
+            AddAssert("low health display is visible", () => hudOverlay.LowHealthDisplay.IsPresent);
+            AddStep("set health to 30%", () => applyToHealthDisplays(0.3));
+            AddAssert("hud is not faded to red", () => !hudOverlay.LowHealthDisplay.Child.IsPresent);
+            AddStep("set health to < 10%", () => applyToHealthDisplays(0.1f));
+            AddAssert("hud is faded to red", () => hudOverlay.LowHealthDisplay.Child.IsPresent);
+            AddStep("disable low health display", () =>
+            {
+                config.Set(OsuSetting.FadePlayfieldWhenLowHealth, false);
+                hudOverlay.LowHealthDisplay.FinishTransforms(true);
+            });
+            AddAssert("low health display is not visible", () => !hudOverlay.LowHealthDisplay.IsPresent);
+        }
+
         private void createNew(Action<HUDOverlay> action = null)
         {
             AddStep("create overlay", () =>

From 6b0c5bc65d1f6aa80fd98abd2261613ca971fbbc Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 17 Mar 2020 22:32:07 +0100
Subject: [PATCH 01572/10326] Rename to LowHealthLayer to FaillingLayer.

---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    | 32 -------------
 osu.Game/Screens/Play/HUD/FaillingLayer.cs    | 47 +++++++++++++++++++
 osu.Game/Screens/Play/HUD/LowHealthLayer.cs   | 47 -------------------
 3 files changed, 47 insertions(+), 79 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/FaillingLayer.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/LowHealthLayer.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 579f6ff9b6..fc03dc6ed3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -103,38 +103,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("return value", () => config.Set<bool>(OsuSetting.KeyOverlay, keyCounterVisibleValue));
         }
 
-        [Test]
-        public void TestChangeHealthValue()
-        {
-            void applyToHealthDisplays(double value)
-            {
-                if (hudOverlay == null) return;
-
-                hudOverlay.LowHealthDisplay.Current.Value = value;
-                hudOverlay.HealthDisplay.Current.Value = value;
-            }
-
-            createNew();
-            AddSliderStep("health value", 0, 1, 0.5, applyToHealthDisplays);
-
-            AddStep("enable low health display", () =>
-            {
-                config.Set(OsuSetting.FadePlayfieldWhenLowHealth, true);
-                hudOverlay.LowHealthDisplay.FinishTransforms(true);
-            });
-            AddAssert("low health display is visible", () => hudOverlay.LowHealthDisplay.IsPresent);
-            AddStep("set health to 30%", () => applyToHealthDisplays(0.3));
-            AddAssert("hud is not faded to red", () => !hudOverlay.LowHealthDisplay.Child.IsPresent);
-            AddStep("set health to < 10%", () => applyToHealthDisplays(0.1f));
-            AddAssert("hud is faded to red", () => hudOverlay.LowHealthDisplay.Child.IsPresent);
-            AddStep("disable low health display", () =>
-            {
-                config.Set(OsuSetting.FadePlayfieldWhenLowHealth, false);
-                hudOverlay.LowHealthDisplay.FinishTransforms(true);
-            });
-            AddAssert("low health display is not visible", () => !hudOverlay.LowHealthDisplay.IsPresent);
-        }
-
         private void createNew(Action<HUDOverlay> action = null)
         {
             AddStep("create overlay", () =>
diff --git a/osu.Game/Screens/Play/HUD/FaillingLayer.cs b/osu.Game/Screens/Play/HUD/FaillingLayer.cs
new file mode 100644
index 0000000000..3dc18cefec
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/FaillingLayer.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 System;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// An overlay layer on top of the player HUD which fades to red when the current player health falls a certain threshold defined by <see cref="LowHealthThreshold"/>.
+    /// </summary>
+    public class FaillingLayer : HealthDisplay
+    {
+        private const float max_alpha = 0.4f;
+
+        private readonly Box box;
+
+        /// <summary>
+        /// The threshold under which the current player life should be considered low and the layer should start fading in.
+        /// </summary>
+        protected virtual double LowHealthThreshold => 0.20f;
+
+        public FaillingLayer()
+        {
+            Child = box = new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Alpha = 0
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour color)
+        {
+            box.Colour = color.Red;
+        }
+
+        protected override void Update()
+        {
+            box.Alpha = (float)Math.Clamp(max_alpha * (1 - Current.Value / LowHealthThreshold), 0, max_alpha);
+            base.Update();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/LowHealthLayer.cs b/osu.Game/Screens/Play/HUD/LowHealthLayer.cs
deleted file mode 100644
index 8f03a95877..0000000000
--- a/osu.Game/Screens/Play/HUD/LowHealthLayer.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.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Configuration;
-using osu.Game.Graphics;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public class LowHealthLayer : HealthDisplay
-    {
-        private const float max_alpha = 0.4f;
-
-        private const double fade_time = 300;
-
-        private readonly Box box;
-
-        private Bindable<bool> configFadeRedWhenLowHealth;
-
-        public LowHealthLayer()
-        {
-            Child = box = new Box
-            {
-                RelativeSizeAxes = Axes.Both,
-                Alpha = 0
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, OsuColour color)
-        {
-            configFadeRedWhenLowHealth = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenLowHealth);
-            box.Colour = color.Red;
-
-            configFadeRedWhenLowHealth.BindValueChanged(value =>
-            {
-                if (value.NewValue)
-                    this.FadeIn(fade_time, Easing.OutQuint);
-                else
-                    this.FadeOut(fade_time, Easing.OutQuint);
-            }, true);
-        }
-    }
-}

From ed4f9f8ba9959c142dc1282ef37e735a4a162b7e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 17 Mar 2020 22:57:47 +0100
Subject: [PATCH 01573/10326] Bind every HealthDisplay on Player load

---
 osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs | 8 ++++++++
 osu.Game/Screens/Play/HUD/FaillingLayer.cs     | 1 +
 osu.Game/Screens/Play/HUD/HealthDisplay.cs     | 6 ++++++
 osu.Game/Screens/Play/Player.cs                | 4 ++++
 4 files changed, 19 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index a37ef8d9a0..50bff4fe3a 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Input.Handlers;
@@ -16,6 +17,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -29,6 +31,12 @@ namespace osu.Game.Rulesets.Osu.UI
         {
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Overlays.Add(new FaillingLayer());
+        }
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true; // always show the gameplay cursor
 
         protected override Playfield CreatePlayfield() => new OsuPlayfield();
diff --git a/osu.Game/Screens/Play/HUD/FaillingLayer.cs b/osu.Game/Screens/Play/HUD/FaillingLayer.cs
index 3dc18cefec..6651ad6c88 100644
--- a/osu.Game/Screens/Play/HUD/FaillingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FaillingLayer.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Screens.Play.HUD
 
         public FaillingLayer()
         {
+            RelativeSizeAxes = Axes.Both;
             Child = box = new Box
             {
                 RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 37038ad58c..6a5b77a64b 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -13,5 +14,10 @@ namespace osu.Game.Screens.Play.HUD
             MinValue = 0,
             MaxValue = 1
         };
+        
+        public virtual void BindHealthProcessor(HealthProcessor processor)
+        {
+            Current.BindTo(processor.Health);
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index bcadba14af..0df4aacb7a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -24,6 +24,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 using osu.Game.Users;
@@ -184,6 +185,9 @@ namespace osu.Game.Screens.Play
             foreach (var mod in Mods.Value.OfType<IApplicableToHealthProcessor>())
                 mod.ApplyToHealthProcessor(HealthProcessor);
 
+            foreach (var overlay in DrawableRuleset.Overlays.OfType<HealthDisplay>())
+                overlay.BindHealthProcessor(HealthProcessor);
+
             BreakOverlay.IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
         }
 

From 44c13b081c4167685ace193a5a6fadae95072fcf Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 17 Mar 2020 22:58:20 +0100
Subject: [PATCH 01574/10326] Remove old configuration variants.

---
 osu.Game/Configuration/OsuConfigManager.cs                  | 2 --
 .../Overlays/Settings/Sections/Gameplay/GeneralSettings.cs  | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 895bacafc4..21de654670 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -88,7 +88,6 @@ namespace osu.Game.Configuration
             Set(OsuSetting.ShowInterface, true);
             Set(OsuSetting.ShowProgressGraph, true);
             Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
-            Set(OsuSetting.FadePlayfieldWhenLowHealth, true);
             Set(OsuSetting.KeyOverlay, false);
             Set(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
@@ -184,7 +183,6 @@ namespace osu.Game.Configuration
         ShowInterface,
         ShowProgressGraph,
         ShowHealthDisplayWhenCantFail,
-        FadePlayfieldWhenLowHealth,
         MouseDisableButtons,
         MouseDisableWheel,
         AudioOffset,
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 6b6b3e8fa4..2d2cd42213 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -53,12 +53,6 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     Keywords = new[] { "hp", "bar" }
                 },
                 new SettingsCheckbox
-                {
-                    LabelText = "Fade playfield to red when health is low",
-                    Bindable = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenLowHealth),
-                    Keywords = new[] { "hp", "playfield", "health" }
-                },
-                new SettingsCheckbox
                 {
                     LabelText = "Always show key overlay",
                     Bindable = config.GetBindable<bool>(OsuSetting.KeyOverlay)

From 6c825eb74499799fe5dd7c07f56fbd0359862c9f Mon Sep 17 00:00:00 2001
From: Fuewburvpoa <44163588+Fuewburvpoa@users.noreply.github.com>
Date: Wed, 18 Mar 2020 00:04:03 +0200
Subject: [PATCH 01575/10326] Update
 osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
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/Edit/Compose/Components/BeatDivisorControl.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 626a12edcf..2dec3fd22e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -281,6 +281,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             protected override void OnDragEnd(DragEndEvent e)
             {
+                handleMouseInput(e.ScreenSpaceMousePosition);
             }
 
             private void handleMouseInput(Vector2 screenSpaceMousePosition)

From 17bae532bd91e782ac9be727843b4e8f57456df9 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 17 Mar 2020 23:09:50 +0100
Subject: [PATCH 01576/10326] Add failling layer to others rulesets.

---
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs | 8 ++++++++
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index fd8a1d175d..705c2d756c 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.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.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -14,6 +15,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -30,6 +32,12 @@ namespace osu.Game.Rulesets.Catch.UI
             TimeRange.Value = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450);
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Overlays.Add(new FaillingLayer());
+        }
+
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);
 
         protected override Playfield CreatePlayfield() => new CatchPlayfield(Beatmap.BeatmapInfo.BaseDifficulty, CreateDrawableRepresentation);
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 2c497541a8..b8b6ff3c3c 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -19,6 +19,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
@@ -52,6 +53,8 @@ namespace osu.Game.Rulesets.Mania.UI
             configDirection.BindValueChanged(direction => Direction.Value = (ScrollingDirection)direction.NewValue, true);
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, TimeRange);
+
+            Overlays.Add(new FaillingLayer());
         }
 
         /// <summary>

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 01577/10326] 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 01578/10326] 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 01579/10326] 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 01580/10326] 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>

From 44cfed8af1cb7a577f67c5c25c895eb2fb6c2a51 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Mar 2020 15:03:01 +0900
Subject: [PATCH 01581/10326] Fix perfect display showing when misses are
 present

---
 .../Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 7a50a96fe7..cd2534bd31 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -14,6 +14,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking.Expanded.Accuracy;
@@ -56,7 +57,7 @@ namespace osu.Game.Screens.Ranking.Expanded
             var topStatistics = new List<StatisticDisplay>
             {
                 new AccuracyStatistic(score.Accuracy),
-                new ComboStatistic(score.MaxCombo, true),
+                new ComboStatistic(score.MaxCombo, score.Statistics[HitResult.Miss] == 0),
                 new CounterStatistic("pp", (int)(score.PP ?? 0)),
             };
 

From 336d92715755320e33ab6c2f17095935a42b99c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Mar 2020 15:38:19 +0900
Subject: [PATCH 01582/10326] Update tests to not use positional data (nunit
 runs at an incompatible window size)

---
 .../Screens/TestSceneMapPoolScreen.cs           | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index cc5f66761e..a4538be384 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
@@ -38,7 +39,7 @@ namespace osu.Game.Tournament.Tests.Screens
                 Ladder.CurrentMatch.Value = Ladder.Matches.First();
             });
 
-            AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y > 0);
+            assertTwoWide();
         }
 
         [Test]
@@ -58,7 +59,7 @@ namespace osu.Game.Tournament.Tests.Screens
                 Ladder.CurrentMatch.Value = Ladder.Matches.First();
             });
 
-            AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y > 0);
+            assertTwoWide();
         }
 
         [Test]
@@ -78,7 +79,7 @@ namespace osu.Game.Tournament.Tests.Screens
                 Ladder.CurrentMatch.Value = Ladder.Matches.First();
             });
 
-            AddAssert("ensure layout width is 3", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y == 0);
+            assertThreeWide();
         }
 
         [Test]
@@ -98,9 +99,15 @@ namespace osu.Game.Tournament.Tests.Screens
                 Ladder.CurrentMatch.Value = Ladder.Matches.First();
             });
 
-            AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y > 0);
+            assertTwoWide();
         }
 
+        private void assertTwoWide() =>
+            AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>>().First().Padding.Left > 0);
+
+        private void assertThreeWide() =>
+            AddAssert("ensure layout width is 3", () => screen.ChildrenOfType<FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>>().First().Padding.Left == 0);
+
         [Test]
         public void TestManyMods()
         {
@@ -118,7 +125,7 @@ namespace osu.Game.Tournament.Tests.Screens
                 Ladder.CurrentMatch.Value = Ladder.Matches.First();
             });
 
-            AddAssert("ensure layout width is 3", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y == 0);
+            assertThreeWide();
         }
 
         private void addBeatmap(string mods = "nm")

From fdcb60706b286ea8c4c8479206642d4fe8ad9a7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Mar 2020 15:49:24 +0900
Subject: [PATCH 01583/10326] Use TryGetValue to make tests happy

---
 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 cd2534bd31..4ae9bb05cc 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Ranking.Expanded
             var topStatistics = new List<StatisticDisplay>
             {
                 new AccuracyStatistic(score.Accuracy),
-                new ComboStatistic(score.MaxCombo, score.Statistics[HitResult.Miss] == 0),
+                new ComboStatistic(score.MaxCombo, !score.Statistics.TryGetValue(HitResult.Miss, out var missCount) || missCount == 0),
                 new CounterStatistic("pp", (int)(score.PP ?? 0)),
             };
 

From a1274a9eb0ca927c4d07cb94aaba0fa101745a4a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 18 Mar 2020 08:17:41 +0100
Subject: [PATCH 01584/10326] Fix and add missing XMLDoc

---
 osu.Game/Screens/Play/HUD/FaillingLayer.cs |  2 +-
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/FaillingLayer.cs b/osu.Game/Screens/Play/HUD/FaillingLayer.cs
index 6651ad6c88..55cc4476b0 100644
--- a/osu.Game/Screens/Play/HUD/FaillingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FaillingLayer.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics;
 namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
-    /// An overlay layer on top of the player HUD which fades to red when the current player health falls a certain threshold defined by <see cref="LowHealthThreshold"/>.
+    /// An overlay layer on top of the playfield which fades to red when the current player health falls a certain threshold defined by <see cref="LowHealthThreshold"/>.
     /// </summary>
     public class FaillingLayer : HealthDisplay
     {
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 6a5b77a64b..4094b3de69 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -4,9 +4,14 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD
 {
+    /// <summary>
+    /// A container for components displaying the current player health.
+    /// Gets bound automatically to the <see cref="HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy.
+    /// </summary>
     public abstract class HealthDisplay : Container
     {
         public readonly BindableDouble Current = new BindableDouble
@@ -14,7 +19,11 @@ namespace osu.Game.Screens.Play.HUD
             MinValue = 0,
             MaxValue = 1
         };
-        
+
+        /// <summary>
+        /// Bind the tracked fields of <see cref="HealthProcessor"/> to this health display.
+        /// </summary>
+        /// <param name="processor"></param>
         public virtual void BindHealthProcessor(HealthProcessor processor)
         {
             Current.BindTo(processor.Health);

From 80a86102b65b5a2421ef75e1899ff609ae463cb8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 18 Mar 2020 17:00:48 +0900
Subject: [PATCH 01585/10326] Add test

---
 .../TestSceneNoteLock.cs                      | 180 ++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
new file mode 100644
index 0000000000..a7416671f6
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneNoteLock : RateAdjustedBeatmapTestScene
+    {
+        private const double time_first_circle = 1500;
+        private const double time_second_circle = 1600;
+
+        private static readonly Vector2 position_first_circle = Vector2.Zero;
+        private static readonly Vector2 position_second_circle = new Vector2(80);
+
+        /// <summary>
+        /// Tests clicking the second circle before the first hitobject's start time, while the first hitobject HAS NOT been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleBeforeFirstCircleTime()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle - 100, Position = position_second_circle, Actions = { OsuAction.LeftButton } }
+            });
+
+            addJudgementAssert(HitResult.Miss, HitResult.Miss);
+        }
+
+        /// <summary>
+        /// Tests clicking the second circle at the first hitobject's start time, while the first hitobject HAS NOT been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleAtFirstCircleTime()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle, Position = position_second_circle, Actions = { OsuAction.LeftButton } }
+            });
+
+            addJudgementAssert(HitResult.Miss, HitResult.Miss);
+        }
+
+        /// <summary>
+        /// Tests clicking the second circle after the first hitobject's start time, while the first hitobject HAS NOT been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleAfterFirstCircleTime()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle + 100, Position = position_second_circle, Actions = { OsuAction.LeftButton } }
+            });
+
+            addJudgementAssert(HitResult.Miss, HitResult.Great);
+        }
+
+        /// <summary>
+        /// Tests clicking the second circle before the first hitobject's start time, while the first hitobject HAS been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleBeforeFirstCircleTimeWithFirstCircleJudged()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle - 200, Position = position_first_circle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle - 100, Position = position_second_circle, Actions = { OsuAction.RightButton } }
+            });
+
+            addJudgementAssert(HitResult.Great, HitResult.Great);
+        }
+
+        private void addJudgementAssert(HitResult firstCircle, HitResult secondCircle)
+        {
+            AddAssert($"first circle judgement is {firstCircle}", () => judgementResults.Single(r => r.HitObject.StartTime == time_first_circle).Type == firstCircle);
+            AddAssert($"second circle judgement is {secondCircle}", () => judgementResults.Single(r => r.HitObject.StartTime == time_second_circle).Type == secondCircle);
+        }
+
+        private ScoreAccessibleReplayPlayer currentPlayer;
+        private List<JudgementResult> judgementResults;
+        private bool allJudgedFired;
+
+        private void performTest(List<ReplayFrame> frames)
+        {
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
+                {
+                    HitObjects =
+                    {
+                        new TestHitCircle
+                        {
+                            StartTime = time_first_circle,
+                            Position = position_first_circle
+                        },
+                        new TestHitCircle
+                        {
+                            StartTime = time_second_circle,
+                            Position = position_second_circle
+                        }
+                    },
+                    BeatmapInfo =
+                    {
+                        BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 3 },
+                        Ruleset = new OsuRuleset().RulesetInfo
+                    },
+                });
+
+                Beatmap.Value.Beatmap.ControlPointInfo.Add(0, new DifficultyControlPoint { SpeedMultiplier = 0.1f });
+
+                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
+
+                p.OnLoadComplete += _ =>
+                {
+                    p.ScoreProcessor.NewJudgement += result =>
+                    {
+                        if (currentPlayer == p) judgementResults.Add(result);
+                    };
+                    p.ScoreProcessor.AllJudged += () =>
+                    {
+                        if (currentPlayer == p) allJudgedFired = true;
+                    };
+                };
+
+                LoadScreen(currentPlayer = p);
+                allJudgedFired = false;
+                judgementResults = new List<JudgementResult>();
+            });
+
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+            AddUntilStep("Wait for all judged", () => allJudgedFired);
+        }
+
+        private class TestHitCircle : HitCircle
+        {
+            protected override HitWindows CreateHitWindows() => new TestHitWindows();
+        }
+
+        private class TestHitWindows : HitWindows
+        {
+            private static readonly DifficultyRange[] ranges =
+            {
+                new DifficultyRange(HitResult.Great, 500, 500, 500),
+                new DifficultyRange(HitResult.Miss, 1000, 1000, 1000),
+            };
+
+            public override bool IsHitResultAllowed(HitResult result) => result == HitResult.Great || result == HitResult.Miss;
+
+            protected override DifficultyRange[] GetRanges() => ranges;
+        }
+
+        private class ScoreAccessibleReplayPlayer : ReplayPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            protected override bool PauseOnFocusLost => false;
+
+            public ScoreAccessibleReplayPlayer(Score score)
+                : base(score, false, false)
+            {
+            }
+        }
+    }
+}

From 5f09c70f756f6548577a8a28d21335a7ce4df43f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 18 Mar 2020 17:21:36 +0900
Subject: [PATCH 01586/10326] Move judgement colours to OsuColour

---
 osu.Game/Graphics/OsuColour.cs                | 27 +++++++++++++++++++
 .../Rulesets/Judgements/DrawableJudgement.cs  | 26 +-----------------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index f7ed55410c..caf09a7df6 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.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osuTK.Graphics;
 
@@ -67,6 +68,32 @@ namespace osu.Game.Graphics
             }
         }
 
+        /// <summary>
+        /// Retrieves the colour for a <see cref="HitResult"/>.
+        /// </summary>
+        public Color4 ForHitResult(HitResult judgement)
+        {
+            switch (judgement)
+            {
+                case HitResult.Perfect:
+                case HitResult.Great:
+                    return Blue;
+
+                case HitResult.Ok:
+                case HitResult.Good:
+                    return Green;
+
+                case HitResult.Meh:
+                    return Yellow;
+
+                case HitResult.Miss:
+                    return Red;
+
+                default:
+                    return Color4.White;
+            }
+        }
+
         // 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/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 960585b968..7113acbbfb 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -12,7 +12,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Judgements
 {
@@ -68,7 +67,7 @@ namespace osu.Game.Rulesets.Judgements
                 {
                     Text = Result.Type.GetDescription().ToUpperInvariant(),
                     Font = OsuFont.Numeric.With(size: 20),
-                    Colour = judgementColour(Result.Type),
+                    Colour = colours.ForHitResult(Result.Type),
                     Scale = new Vector2(0.85f, 1),
                 }, confineMode: ConfineMode.NoScaling)
             };
@@ -110,28 +109,5 @@ namespace osu.Game.Rulesets.Judgements
 
             Expire(true);
         }
-
-        private Color4 judgementColour(HitResult judgement)
-        {
-            switch (judgement)
-            {
-                case HitResult.Perfect:
-                case HitResult.Great:
-                    return colours.Blue;
-
-                case HitResult.Ok:
-                case HitResult.Good:
-                    return colours.Green;
-
-                case HitResult.Meh:
-                    return colours.Yellow;
-
-                case HitResult.Miss:
-                    return colours.Red;
-
-                default:
-                    return Color4.White;
-            }
-        }
     }
 }

From 66558ca8c527e44a5739389cf7dd0a716fe65b1b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 18 Mar 2020 17:21:57 +0900
Subject: [PATCH 01587/10326] Colourise hit result statistics

---
 .../Expanded/ExpandedPanelMiddleContent.cs    |  3 +--
 .../Expanded/Statistics/HitResultStatistic.cs | 27 +++++++++++++++++++
 .../Expanded/Statistics/StatisticDisplay.cs   |  6 +++--
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 7a50a96fe7..1de071a228 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -5,7 +5,6 @@ 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;
 using osu.Framework.Localisation;
@@ -62,7 +61,7 @@ namespace osu.Game.Screens.Ranking.Expanded
 
             var bottomStatistics = new List<StatisticDisplay>();
             foreach (var stat in score.SortedStatistics)
-                bottomStatistics.Add(new CounterStatistic(stat.Key.GetDescription(), stat.Value));
+                bottomStatistics.Add(new HitResultStatistic(stat.Key, stat.Value));
 
             statisticDisplays.AddRange(topStatistics);
             statisticDisplays.AddRange(bottomStatistics);
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
new file mode 100644
index 0000000000..faa4a6a96c
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Ranking.Expanded.Statistics
+{
+    public class HitResultStatistic : CounterStatistic
+    {
+        private readonly HitResult result;
+
+        public HitResultStatistic(HitResult result, int count)
+            : base(result.GetDescription(), count)
+        {
+            this.result = result;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            HeaderText.Colour = colours.ForHitResult(result);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
index a653cc82d4..9206c58bc9 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.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.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
@@ -16,8 +17,9 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
     /// </summary>
     public abstract class StatisticDisplay : CompositeDrawable
     {
-        private readonly string header;
+        protected SpriteText HeaderText { get; private set; }
 
+        private readonly string header;
         private Drawable content;
 
         /// <summary>
@@ -53,7 +55,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
                                 RelativeSizeAxes = Axes.Both,
                                 Colour = Color4Extensions.FromHex("#222")
                             },
-                            new OsuSpriteText
+                            HeaderText = new OsuSpriteText
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,

From b91dc15dbf2b39fb4f8c5c51bafaaec4d8bc8cb0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 18 Mar 2020 17:37:03 +0900
Subject: [PATCH 01588/10326] Update rank badge colours

---
 osu.Game/Graphics/OsuColour.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index f7ed55410c..aa5c424599 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -47,23 +47,23 @@ namespace osu.Game.Graphics
             {
                 case ScoreRank.XH:
                 case ScoreRank.X:
-                    return Color4Extensions.FromHex(@"ce1c9d");
+                    return Color4Extensions.FromHex(@"de31ae");
 
                 case ScoreRank.SH:
                 case ScoreRank.S:
-                    return Color4Extensions.FromHex(@"00a8b5");
+                    return Color4Extensions.FromHex(@"02b5c3");
 
                 case ScoreRank.A:
-                    return Color4Extensions.FromHex(@"7cce14");
+                    return Color4Extensions.FromHex(@"88da20");
 
                 case ScoreRank.B:
                     return Color4Extensions.FromHex(@"e3b130");
 
                 case ScoreRank.C:
-                    return Color4Extensions.FromHex(@"f18252");
+                    return Color4Extensions.FromHex(@"ff8e5d");
 
                 default:
-                    return Color4Extensions.FromHex(@"e95353");
+                    return Color4Extensions.FromHex(@"ff5a5a");
             }
         }
 

From 63531a8564c9bd03cacb53c9038c791fc18caa11 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 18 Mar 2020 17:59:44 +0900
Subject: [PATCH 01589/10326] Add date played to score panel

---
 .../Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 7a50a96fe7..dcd988a247 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -204,6 +204,13 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 }
                             }
                         }
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
+                        Text = $"Played on {score.Date.ToLocalTime():g}"
                     }
                 }
             };

From 1d211cb56354056b4068d82ce252b8b0d74525bc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 18 Mar 2020 18:28:42 +0900
Subject: [PATCH 01590/10326] Make score panel scroll if off-screen

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 0952ba1f70..803b33a998 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -135,7 +136,7 @@ namespace osu.Game.Screens.Ranking
             protected override void Update()
             {
                 base.Update();
-                content.Height = DrawHeight;
+                content.Height = Math.Max(768, DrawHeight);
             }
         }
     }

From 1d680b7a0073b783cee638e64c31d90c966f9deb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 18 Mar 2020 19:13:25 +0900
Subject: [PATCH 01591/10326] Better english

Co-Authored-By: Dean Herbert <pe@ppy.sh>
---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs | 2 +-
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 82a81040e4..3e66549ca0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         /// <summary>
         /// Whether this <see cref="DrawableOsuHitObject"/> can be hit.
-        /// If not-null, this <see cref="DrawableOsuHitObject"/> will not receive a judgement until this function returns <c>true</c>.
+        /// If non-null, judgements will be ignored (resulting in a shake) whilst the function returns false.
         /// </summary>
         public Func<DrawableOsuHitObject, bool> CheckHittable;
 
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 9eb2786951..643253b1af 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             var lastObject = HitObjectContainer.AliveObjects.GetPrevious(osuHitObject);
 
-            // Ensure the last object is not alive anymore, in which case always allow the hit.
+            // If there is no previous object alive, allow the hit.
             if (lastObject == null)
                 return true;
 

From b342e25c9d3fd36fa5c6cc0e9db7b1e28c82eade Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 00:26:49 +0900
Subject: [PATCH 01592/10326] Add testflight distribution step automation

---
 fastlane/Fastfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 510b53054b..f895c465d2 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -99,6 +99,8 @@ platform :ios do
     pilot(
       wait_processing_interval: 1800,
       changelog: changelog,
+      groups: ['osu! supporters', 'public'],
+      distribute_external: true,
       ipa: './osu.iOS/bin/iPhone/Release/osu.iOS.ipa'
     )
   end

From 1c0c26985280e634d5dab81bf8b0cc5361d8d0c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 00:34:24 +0900
Subject: [PATCH 01593/10326] Reduce allocations of followpoints by reusing
 existing

---
 .../Connections/FollowPointConnection.cs      | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 3e9c0f341b..d0935e46f7 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -88,8 +88,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
         private void refresh()
         {
-            ClearInternal();
-
             OsuHitObject osuStart = Start.HitObject;
             double startTime = osuStart.GetEndTime();
 
@@ -116,6 +114,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             double? firstTransformStartTime = null;
             double finalTransformEndTime = startTime;
 
+            int point = 0;
+
             for (int d = (int)(spacing * 1.5); d < distance - spacing; d += spacing)
             {
                 float fraction = (float)d / distance;
@@ -126,13 +126,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
                 FollowPoint fp;
 
-                AddInternal(fp = new FollowPoint
+                if (InternalChildren.Count > point)
                 {
-                    Position = pointStartPosition,
-                    Rotation = rotation,
-                    Alpha = 0,
-                    Scale = new Vector2(1.5f * osuEnd.Scale),
-                });
+                    fp = (FollowPoint)InternalChildren[point];
+                    fp.ClearTransforms();
+                }
+                else
+                    AddInternal(fp = new FollowPoint());
+
+                fp.Position = pointStartPosition;
+                fp.Rotation = rotation;
+                fp.Alpha = 0;
+                fp.Scale = new Vector2(1.5f * osuEnd.Scale);
 
                 if (firstTransformStartTime == null)
                     firstTransformStartTime = fadeInTime;
@@ -146,8 +151,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
                     finalTransformEndTime = fadeOutTime + osuEnd.TimeFadeIn;
                 }
+
+                point++;
             }
 
+            int excessPoints = InternalChildren.Count - point;
+            for (int i = 0; i < excessPoints; i++)
+                RemoveInternal(InternalChildren[^1]);
+
             // 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 463dde1fc40206a8e7ee3d59ebecdb6186a2f1e4 Mon Sep 17 00:00:00 2001
From: Fuewburvpoa <Fuewburvpoa@yandex.ru>
Date: Wed, 18 Mar 2020 21:04:38 +0200
Subject: [PATCH 01594/10326] Tests for BeatDivisorControl

---
 .../Editor/TestSceneBeatDivisorControl.cs     | 52 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
index 7531a7be2c..2ee5e649a8 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit;
@@ -11,19 +12,66 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Editor
 {
-    public class TestSceneBeatDivisorControl : OsuTestScene
+    public class TestSceneBeatDivisorControl : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(BindableBeatDivisor) };
+        private BeatDivisorControl beatDivisorControl;
+        private BindableBeatDivisor bindableBeatDivisor;
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new BeatDivisorControl(new BindableBeatDivisor())
+            Child = beatDivisorControl = new BeatDivisorControl(bindableBeatDivisor = new BindableBeatDivisor())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(90, 90)
             };
         }
+
+        [Test]
+        public void TestBindableBeatDivisor()
+        {
+            AddStep("Reset", () => reset());
+            AddRepeatStep("Move previous", () => bindableBeatDivisor.Previous(), 4);
+            AddAssert("Position at 4", () => bindableBeatDivisor.Value == 4);
+            AddRepeatStep("Move next", () => bindableBeatDivisor.Next(), 3);
+            AddAssert("Position at 12", () => bindableBeatDivisor.Value == 12);
+        }
+
+        [Test]
+        public void TestMouseInput()
+        {
+            AddStep("Reset", () => reset());
+            AddStep("Move to marker", () =>
+            {
+                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(38, -18));
+                InputManager.PressButton(osuTK.Input.MouseButton.Left);
+            });
+            AddStep("Mote to divisor 8", () =>
+            {
+                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(0, -18));
+                InputManager.ReleaseButton(osuTK.Input.MouseButton.Left);
+            });
+            AddAssert("Position at 8", () => bindableBeatDivisor.Value == 8);
+            AddStep("Prepare to move marker", () => { InputManager.PressButton(osuTK.Input.MouseButton.Left); });
+            AddStep("Trigger marker jump", () =>
+            {
+                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(30, -18));
+            });
+            AddStep("Move to divisor ~10", () =>
+            {
+                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(10, -18));
+                InputManager.ReleaseButton(osuTK.Input.MouseButton.Left);
+            });
+            AddAssert("Position clamped to 8", () => bindableBeatDivisor.Value == 8);
+
+        }
+
+        private void reset()
+        {
+            bindableBeatDivisor.Value = 16;
+            InputManager.MoveMouseTo(beatDivisorControl, new Vector2(beatDivisorControl.Width, beatDivisorControl.Height));
+        }
     }
 }

From d5541dfc651635eecd650b4619000760f8f2fa97 Mon Sep 17 00:00:00 2001
From: Fuewburvpoa <Fuewburvpoa@yandex.ru>
Date: Wed, 18 Mar 2020 21:06:14 +0200
Subject: [PATCH 01595/10326] Codefactor fix

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

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
index 2ee5e649a8..b8cefdb841 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
@@ -65,7 +65,6 @@ namespace osu.Game.Tests.Visual.Editor
                 InputManager.ReleaseButton(osuTK.Input.MouseButton.Left);
             });
             AddAssert("Position clamped to 8", () => bindableBeatDivisor.Value == 8);
-
         }
 
         private void reset()

From e9f224b5e8c3ae93098848ee3ee2146d47e7146e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 18 Mar 2020 21:16:54 +0100
Subject: [PATCH 01596/10326] Apply review suggestions

---
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs        | 2 +-
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs        | 2 +-
 osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs            | 2 +-
 .../Play/HUD/{FaillingLayer.cs => FailingLayer.cs}        | 8 ++++----
 osu.Game/Screens/Play/HUD/HealthDisplay.cs                | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game/Screens/Play/HUD/{FaillingLayer.cs => FailingLayer.cs} (82%)

diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index 705c2d756c..50c4154c61 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Catch.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Overlays.Add(new FaillingLayer());
+            Overlays.Add(new FailingLayer());
         }
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index b8b6ff3c3c..8e56144752 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, TimeRange);
 
-            Overlays.Add(new FaillingLayer());
+            Overlays.Add(new FailingLayer());
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index 50bff4fe3a..ed75d47bbe 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Overlays.Add(new FaillingLayer());
+            Overlays.Add(new FailingLayer());
         }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true; // always show the gameplay cursor
diff --git a/osu.Game/Screens/Play/HUD/FaillingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
similarity index 82%
rename from osu.Game/Screens/Play/HUD/FaillingLayer.cs
rename to osu.Game/Screens/Play/HUD/FailingLayer.cs
index 55cc4476b0..5f7dc77928 100644
--- a/osu.Game/Screens/Play/HUD/FaillingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -10,9 +10,9 @@ using osu.Game.Graphics;
 namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
-    /// An overlay layer on top of the playfield which fades to red when the current player health falls a certain threshold defined by <see cref="LowHealthThreshold"/>.
+    /// An overlay layer on top of the playfield which fades to red when the current player health falls below a certain threshold defined by <see cref="LowHealthThreshold"/>.
     /// </summary>
-    public class FaillingLayer : HealthDisplay
+    public class FailingLayer : HealthDisplay
     {
         private const float max_alpha = 0.4f;
 
@@ -21,9 +21,9 @@ namespace osu.Game.Screens.Play.HUD
         /// <summary>
         /// The threshold under which the current player life should be considered low and the layer should start fading in.
         /// </summary>
-        protected virtual double LowHealthThreshold => 0.20f;
+        protected double LowHealthThreshold { get; set; } = 0.20f;
 
-        public FaillingLayer()
+        public FailingLayer()
         {
             RelativeSizeAxes = Axes.Both;
             Child = box = new Box
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 4094b3de69..4ea08626ad 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Play.HUD
         /// Bind the tracked fields of <see cref="HealthProcessor"/> to this health display.
         /// </summary>
         /// <param name="processor"></param>
-        public virtual void BindHealthProcessor(HealthProcessor processor)
+        public void BindHealthProcessor(HealthProcessor processor)
         {
             Current.BindTo(processor.Health);
         }

From a4171253a38f2d09eedea9f38eb7d3eca0afebff Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 18 Mar 2020 21:41:43 +0100
Subject: [PATCH 01597/10326] Make LowHealthThreshold a field.

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 5f7dc77928..5f4037c14d 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Play.HUD
         /// <summary>
         /// The threshold under which the current player life should be considered low and the layer should start fading in.
         /// </summary>
-        protected double LowHealthThreshold { get; set; } = 0.20f;
+        public double LowHealthThreshold = 0.20f;
 
         public FailingLayer()
         {

From 4bda520695e37a5753a667289e6ac7f2c31147d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 18 Mar 2020 21:54:17 +0100
Subject: [PATCH 01598/10326] Use [SetUp] instead of reset method

---
 .../Editor/TestSceneBeatDivisorControl.cs       | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
index b8cefdb841..dc41f7d92b 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -18,21 +17,20 @@ namespace osu.Game.Tests.Visual.Editor
         private BeatDivisorControl beatDivisorControl;
         private BindableBeatDivisor bindableBeatDivisor;
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
-            Child = beatDivisorControl = new BeatDivisorControl(bindableBeatDivisor = new BindableBeatDivisor())
+            Child = beatDivisorControl = new BeatDivisorControl(bindableBeatDivisor = new BindableBeatDivisor(16))
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(90, 90)
             };
-        }
+        });
 
         [Test]
         public void TestBindableBeatDivisor()
         {
-            AddStep("Reset", () => reset());
             AddRepeatStep("Move previous", () => bindableBeatDivisor.Previous(), 4);
             AddAssert("Position at 4", () => bindableBeatDivisor.Value == 4);
             AddRepeatStep("Move next", () => bindableBeatDivisor.Next(), 3);
@@ -42,7 +40,6 @@ namespace osu.Game.Tests.Visual.Editor
         [Test]
         public void TestMouseInput()
         {
-            AddStep("Reset", () => reset());
             AddStep("Move to marker", () =>
             {
                 InputManager.MoveMouseTo(beatDivisorControl, new Vector2(38, -18));
@@ -66,11 +63,5 @@ namespace osu.Game.Tests.Visual.Editor
             });
             AddAssert("Position clamped to 8", () => bindableBeatDivisor.Value == 8);
         }
-
-        private void reset()
-        {
-            bindableBeatDivisor.Value = 16;
-            InputManager.MoveMouseTo(beatDivisorControl, new Vector2(beatDivisorControl.Width, beatDivisorControl.Height));
-        }
     }
 }

From 1d3cac4cdc5e61e9148c69f5c567ad135c04d6ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 18 Mar 2020 21:55:35 +0100
Subject: [PATCH 01599/10326] Eliminate osuTK.Input namespace qualifications

---
 .../Visual/Editor/TestSceneBeatDivisorControl.cs         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
index dc41f7d92b..5a441f568a 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editor
 {
@@ -43,15 +44,15 @@ namespace osu.Game.Tests.Visual.Editor
             AddStep("Move to marker", () =>
             {
                 InputManager.MoveMouseTo(beatDivisorControl, new Vector2(38, -18));
-                InputManager.PressButton(osuTK.Input.MouseButton.Left);
+                InputManager.PressButton(MouseButton.Left);
             });
             AddStep("Mote to divisor 8", () =>
             {
                 InputManager.MoveMouseTo(beatDivisorControl, new Vector2(0, -18));
-                InputManager.ReleaseButton(osuTK.Input.MouseButton.Left);
+                InputManager.ReleaseButton(MouseButton.Left);
             });
             AddAssert("Position at 8", () => bindableBeatDivisor.Value == 8);
-            AddStep("Prepare to move marker", () => { InputManager.PressButton(osuTK.Input.MouseButton.Left); });
+            AddStep("Prepare to move marker", () => { InputManager.PressButton(MouseButton.Left); });
             AddStep("Trigger marker jump", () =>
             {
                 InputManager.MoveMouseTo(beatDivisorControl, new Vector2(30, -18));
@@ -59,7 +60,7 @@ namespace osu.Game.Tests.Visual.Editor
             AddStep("Move to divisor ~10", () =>
             {
                 InputManager.MoveMouseTo(beatDivisorControl, new Vector2(10, -18));
-                InputManager.ReleaseButton(osuTK.Input.MouseButton.Left);
+                InputManager.ReleaseButton(MouseButton.Left);
             });
             AddAssert("Position clamped to 8", () => bindableBeatDivisor.Value == 8);
         }

From 78bdf5cf9150c851c74433113ca433fa069830b2 Mon Sep 17 00:00:00 2001
From: Fuewburvpoa <Fuewburvpoa@yandex.ru>
Date: Wed, 18 Mar 2020 23:03:58 +0200
Subject: [PATCH 01600/10326] InspectCode fixes

---
 osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
index b8cefdb841..38b33acc32 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Editor
         [Test]
         public void TestBindableBeatDivisor()
         {
-            AddStep("Reset", () => reset());
+            AddStep("Reset", reset);
             AddRepeatStep("Move previous", () => bindableBeatDivisor.Previous(), 4);
             AddAssert("Position at 4", () => bindableBeatDivisor.Value == 4);
             AddRepeatStep("Move next", () => bindableBeatDivisor.Next(), 3);
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Editor
         [Test]
         public void TestMouseInput()
         {
-            AddStep("Reset", () => reset());
+            AddStep("Reset", reset);
             AddStep("Move to marker", () =>
             {
                 InputManager.MoveMouseTo(beatDivisorControl, new Vector2(38, -18));
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Visual.Editor
                 InputManager.ReleaseButton(osuTK.Input.MouseButton.Left);
             });
             AddAssert("Position at 8", () => bindableBeatDivisor.Value == 8);
-            AddStep("Prepare to move marker", () => { InputManager.PressButton(osuTK.Input.MouseButton.Left); });
+            AddStep("Prepare to move marker", () => InputManager.PressButton(osuTK.Input.MouseButton.Left));
             AddStep("Trigger marker jump", () =>
             {
                 InputManager.MoveMouseTo(beatDivisorControl, new Vector2(30, -18));

From 23338a6c82ed4f14b5e8e4cab0dafd96fb371deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 18 Mar 2020 22:23:06 +0100
Subject: [PATCH 01601/10326] Adjust test implementation

* Use slider bar and slider marker coordinates in manual tests instead
  of hard-coded offsets.
* Reword test steps slightly for greater clarity.
---
 .../Editor/TestSceneBeatDivisorControl.cs     | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
index 5a441f568a..746b2c99aa 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
@@ -3,8 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
@@ -18,6 +22,9 @@ namespace osu.Game.Tests.Visual.Editor
         private BeatDivisorControl beatDivisorControl;
         private BindableBeatDivisor bindableBeatDivisor;
 
+        private SliderBar<int> tickSliderBar;
+        private EquilateralTriangle tickMarkerHead;
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -27,42 +34,52 @@ namespace osu.Game.Tests.Visual.Editor
                 Origin = Anchor.Centre,
                 Size = new Vector2(90, 90)
             };
+
+            tickSliderBar = beatDivisorControl.ChildrenOfType<SliderBar<int>>().Single();
+            tickMarkerHead = tickSliderBar.ChildrenOfType<EquilateralTriangle>().Single();
         });
 
         [Test]
         public void TestBindableBeatDivisor()
         {
-            AddRepeatStep("Move previous", () => bindableBeatDivisor.Previous(), 4);
-            AddAssert("Position at 4", () => bindableBeatDivisor.Value == 4);
-            AddRepeatStep("Move next", () => bindableBeatDivisor.Next(), 3);
-            AddAssert("Position at 12", () => bindableBeatDivisor.Value == 12);
+            AddRepeatStep("move previous", () => bindableBeatDivisor.Previous(), 4);
+            AddAssert("divisor is 4", () => bindableBeatDivisor.Value == 4);
+            AddRepeatStep("move next", () => bindableBeatDivisor.Next(), 3);
+            AddAssert("divisor is 12", () => bindableBeatDivisor.Value == 12);
         }
 
         [Test]
         public void TestMouseInput()
         {
-            AddStep("Move to marker", () =>
+            AddStep("hold marker", () =>
             {
-                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(38, -18));
+                InputManager.MoveMouseTo(tickMarkerHead.ScreenSpaceDrawQuad.Centre);
                 InputManager.PressButton(MouseButton.Left);
             });
-            AddStep("Mote to divisor 8", () =>
+            AddStep("move to 8 and release", () =>
             {
-                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(0, -18));
+                InputManager.MoveMouseTo(tickSliderBar.ScreenSpaceDrawQuad.Centre);
                 InputManager.ReleaseButton(MouseButton.Left);
             });
-            AddAssert("Position at 8", () => bindableBeatDivisor.Value == 8);
-            AddStep("Prepare to move marker", () => { InputManager.PressButton(MouseButton.Left); });
-            AddStep("Trigger marker jump", () =>
+            AddAssert("divisor is 8", () => bindableBeatDivisor.Value == 8);
+            AddStep("hold marker", () => InputManager.PressButton(MouseButton.Left));
+            AddStep("move to 16", () => InputManager.MoveMouseTo(getPositionForDivisor(16)));
+            AddStep("move to ~10 and release", () =>
             {
-                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(30, -18));
-            });
-            AddStep("Move to divisor ~10", () =>
-            {
-                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(10, -18));
+                InputManager.MoveMouseTo(getPositionForDivisor(10));
                 InputManager.ReleaseButton(MouseButton.Left);
             });
-            AddAssert("Position clamped to 8", () => bindableBeatDivisor.Value == 8);
+            AddAssert("divisor clamped to 8", () => bindableBeatDivisor.Value == 8);
+        }
+
+        private Vector2 getPositionForDivisor(int divisor)
+        {
+            var relativePosition = (float)Math.Clamp(divisor, 0, 16) / 16;
+            var sliderDrawQuad = tickSliderBar.ScreenSpaceDrawQuad;
+            return new Vector2(
+                sliderDrawQuad.TopLeft.X + sliderDrawQuad.Width * relativePosition,
+                sliderDrawQuad.Centre.Y
+            );
         }
     }
 }

From c50784da934163e38991d837a7d0c670274c6b7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 11:58:52 +0900
Subject: [PATCH 01602/10326] Show 'D' rank badge on accuracy circle

---
 .../Visual/Ranking/TestSceneAccuracyCircle.cs          | 10 ++++++++++
 .../Ranking/Expanded/Accuracy/AccuracyCircle.cs        |  1 +
 2 files changed, 11 insertions(+)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index d0b9d43f51..0781cba924 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -32,6 +32,16 @@ namespace osu.Game.Tests.Visual.Ranking
             typeof(SmoothCircularProgress)
         };
 
+        [Test]
+        public void TestLowDRank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.2;
+            score.Rank = ScoreRank.D;
+
+            addCircleStep(score);
+        }
+
         [Test]
         public void TestDRank()
         {
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 2d76a7c3b0..ee53ee9879 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -196,6 +196,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                         new RankBadge(0.9f, ScoreRank.A),
                         new RankBadge(0.8f, ScoreRank.B),
                         new RankBadge(0.7f, ScoreRank.C),
+                        new RankBadge(0.35f, ScoreRank.D),
                     }
                 },
                 rankText = new RankText(score.Rank)

From e59d7fee26728e6c281d03bf67ee004c127973de Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 18 Mar 2020 23:42:14 -0400
Subject: [PATCH 01603/10326] fix comment grammar

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

diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 2083671072..c3d1e4c857 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.Mods
 
         /// <summary>
         /// Transfer a setting from <see cref="BeatmapDifficulty"/> to a configuration bindable.
-        /// Only performs the transfer if the user it not currently overriding..
+        /// Only performs the transfer if the user is not currently overriding.
         /// </summary>
         protected void TransferSetting<T>(BindableNumber<T> bindable, T beatmapDefault)
             where T : struct, IComparable<T>, IConvertible, IEquatable<T>

From 18bf7c913b1b73f444f09ca16d2f43334d696404 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 18 Mar 2020 23:43:26 -0400
Subject: [PATCH 01604/10326] show mod settings in ModIcon tooltip

---
 .../Mods/CatchModDifficultyAdjust.cs                  |  5 +++++
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs  |  5 +++++
 osu.Game/Rulesets/Mods/Mod.cs                         | 11 +++++++++++
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs         |  3 +++
 osu.Game/Rulesets/Mods/ModDoubleTime.cs               |  2 ++
 osu.Game/Rulesets/Mods/ModEasy.cs                     |  2 ++
 osu.Game/Rulesets/Mods/ModHalfTime.cs                 |  2 ++
 osu.Game/Rulesets/Mods/ModTimeRamp.cs                 |  2 ++
 osu.Game/Rulesets/UI/ModIcon.cs                       |  2 +-
 9 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index e2465d727e..8ea39c8676 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -30,6 +30,11 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = 5,
         };
 
+        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value.ToString()}, ")}" +
+                                              $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}, ")}" +
+                                              $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value.ToString()}, ")}" +
+                                              $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value.ToString()}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
+
         protected override void TransferSettings(BeatmapDifficulty difficulty)
         {
             base.TransferSettings(difficulty);
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 75de6896a3..c3e1321dac 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -30,6 +30,11 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = 5,
         };
 
+        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value.ToString()}, ")}" +
+                                              $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}, ")}" +
+                                              $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value.ToString()}, ")}" +
+                                              $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value.ToString()}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
+
         protected override void TransferSettings(BeatmapDifficulty difficulty)
         {
             base.TransferSettings(difficulty);
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 46c0c1da07..b70ddc6d46 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -5,6 +5,7 @@ using System;
 using Newtonsoft.Json;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.IO.Serialization;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -42,6 +43,16 @@ namespace osu.Game.Rulesets.Mods
         [JsonIgnore]
         public virtual string Description => string.Empty;
 
+        /// <summary>
+        /// The tooltip to display for this mod when used in a <see cref="ModIcon"/>.
+        /// </summary>
+        /// <remarks>
+        /// Differs from <see cref="Name"/>, as the value of attributes (AR, CS, etc) changeable via the mod
+        /// are displayed in the tooltip.
+        /// </remarks>
+        [JsonIgnore]
+        public virtual string IconTooltip => Name;
+
         /// <summary>
         /// The score multiplier of this mod.
         /// </summary>
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index c3d1e4c857..4072e6a6af 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -52,6 +52,9 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
+        public override string IconTooltip => $"{Name} ({(DrainRate.IsDefault ? $"HP {DrainRate.Value.ToString()}, " : "")}" +
+                                              $"{(OverallDifficulty.IsDefault ? $"OD {OverallDifficulty.Value.ToString()}, " : "")})";
+
         private BeatmapDifficulty difficulty;
 
         public void ReadFromDifficulty(BeatmapDifficulty difficulty)
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 152657da33..4f7d82418d 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -30,5 +30,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 1.5,
             Precision = 0.01,
         };
+
+        public override string IconTooltip => $"{Name}{(SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)")}";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index b56be95dfe..2ec4e9610b 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Rulesets.Mods
             MaxValue = 10
         };
 
+        public override string IconTooltip => $"{Name}{(Retries.IsDefault ? "" : $" ({Retries.Value} lives)")}";
+
         private int retries;
 
         private BindableNumber<double> health;
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 203b88951c..14133bddcd 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -30,5 +30,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 0.75,
             Precision = 0.01,
         };
+
+        public override string IconTooltip => $"{Name}{(SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)")}";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 9e63142b42..9cb97dfc35 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The final speed to ramp to")]
         public abstract BindableNumber<double> FinalRate { get; }
 
+        public override string IconTooltip => $"{Name} ({InitialRate.Value}x to {FinalRate.Value}x)";
+
         private double finalRateTime;
         private double beginRampTime;
 
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 3edab0745d..3cd1b0820d 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.UI
 
             type = mod.Type;
 
-            TooltipText = mod.Name;
+            TooltipText = mod.IconTooltip;
 
             Size = new Vector2(size);
 

From 7a0a633ef9320fbd2c519f7630999306fcce6ce5 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Thu, 19 Mar 2020 00:06:55 -0400
Subject: [PATCH 01605/10326] don't use ToString, proper indent level

---
 osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs | 8 ++++----
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index 8ea39c8676..661c59332f 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -30,10 +30,10 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = 5,
         };
 
-        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value.ToString()}, ")}" +
-                                              $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}, ")}" +
-                                              $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value.ToString()}, ")}" +
-                                              $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value.ToString()}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
+        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}, ")}" +
+                                       $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}, ")}" +
+                                       $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}, ")}" +
+                                       $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
 
         protected override void TransferSettings(BeatmapDifficulty difficulty)
         {
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index c3e1321dac..477028dbbe 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -30,10 +30,10 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = 5,
         };
 
-        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value.ToString()}, ")}" +
-                                              $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}, ")}" +
-                                              $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value.ToString()}, ")}" +
-                                              $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value.ToString()}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
+        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}, ")}" +
+                                       $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}, ")}" +
+                                       $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}, ")}" +
+                                       $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
 
         protected override void TransferSettings(BeatmapDifficulty difficulty)
         {

From 17c3455b36b9ee38a2116556d62de503cf2232fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 14:10:54 +0900
Subject: [PATCH 01606/10326] Fix potentially invalid push in player while
 already exiting

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 32261efd4e..efce2e05ce 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -387,6 +387,10 @@ namespace osu.Game.Screens.Play
 
         private void onCompletion()
         {
+            // screen may be in the exiting transition phase.
+            if (!this.IsCurrentScreen())
+                return;
+
             // Only show the completion screen if the player hasn't failed
             if (HealthProcessor.HasFailed || completionProgressDelegate != null)
                 return;
@@ -581,7 +585,7 @@ namespace osu.Game.Screens.Play
             if (completionProgressDelegate != null && !completionProgressDelegate.Cancelled && !completionProgressDelegate.Completed)
             {
                 // proceed to result screen if beatmap already finished playing
-                scheduleGotoRanking();
+                completionProgressDelegate.RunTask();
                 return true;
             }
 
@@ -623,7 +627,12 @@ namespace osu.Game.Screens.Play
             {
                 var score = CreateScore();
                 if (DrawableRuleset.ReplayScore == null)
-                    scoreManager.Import(score).ContinueWith(_ => Schedule(() => this.Push(CreateResults(score))));
+                    scoreManager.Import(score).ContinueWith(_ => Schedule(() =>
+                    {
+                        // screen may be in the exiting transition phase.
+                        if (this.IsCurrentScreen())
+                            this.Push(CreateResults(score));
+                    }));
                 else
                     this.Push(CreateResults(score));
             });

From 94c3ffb6e508226da53b1f6cc786b7dcbea928fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 14:26:24 +0900
Subject: [PATCH 01607/10326] Fix slider ticks contributing to accuracy

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs   |  6 +++---
 .../TestSceneSliderInput.cs                      |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs     |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs    |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs       |  2 +-
 .../Objects/Drawables/DrawableSlider.cs          | 10 +++++-----
 ...bleRepeatPoint.cs => DrawableSliderRepeat.cs} | 16 ++++++++--------
 osu.Game.Rulesets.Osu/Objects/Slider.cs          |  4 ++--
 .../{RepeatPoint.cs => SliderRepeatPoint.cs}     | 13 ++++++++++---
 osu.Game.Rulesets.Osu/Objects/SliderTick.cs      | 11 +++++++++--
 10 files changed, 41 insertions(+), 27 deletions(-)
 rename osu.Game.Rulesets.Osu/Objects/Drawables/{DrawableRepeatPoint.cs => DrawableSliderRepeat.cs} (88%)
 rename osu.Game.Rulesets.Osu/Objects/{RepeatPoint.cs => SliderRepeatPoint.cs} (76%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index defd3a6f22..1c0dd27e69 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             typeof(DrawableSliderTick),
             typeof(DrawableSliderTail),
             typeof(DrawableSliderHead),
-            typeof(DrawableRepeatPoint),
+            typeof(DrawableSliderRepeat),
             typeof(DrawableOsuHitObject)
         };
 
@@ -146,7 +146,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddAssert("head samples updated", () => assertSamples(((Slider)slider.HitObject).HeadCircle));
             AddAssert("tick samples not updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderTick>().All(assertTickSamples));
-            AddAssert("repeat samples updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<RepeatPoint>().All(assertSamples));
+            AddAssert("repeat samples updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderRepeatPoint>().All(assertSamples));
             AddAssert("tail has no samples", () => ((Slider)slider.HitObject).TailCircle.Samples.Count == 0);
 
             static bool assertTickSamples(SliderTick tick) => tick.Samples.Single().Name == "slidertick";
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddAssert("head samples not updated", () => assertSamples(((Slider)slider.HitObject).HeadCircle));
             AddAssert("tick samples not updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderTick>().All(assertTickSamples));
-            AddAssert("repeat samples not updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<RepeatPoint>().All(assertSamples));
+            AddAssert("repeat samples not updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderRepeatPoint>().All(assertSamples));
             AddAssert("tail has no samples", () => ((Slider)slider.HitObject).TailCircle.Samples.Count == 0);
 
             static bool assertTickSamples(SliderTick tick) => tick.Samples.Single().Name == "slidertick";
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 94df239267..21244f0e9c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             typeof(SliderBall),
             typeof(DrawableSlider),
             typeof(DrawableSliderTick),
-            typeof(DrawableRepeatPoint),
+            typeof(DrawableSliderRepeat),
             typeof(DrawableOsuHitObject),
             typeof(DrawableSliderHead),
             typeof(DrawableSliderTail),
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
index bc5f79331f..c1fc589798 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 return;
 
             slider.NestedHitObjects.OfType<SliderTick>().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
-            slider.NestedHitObjects.OfType<RepeatPoint>().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
+            slider.NestedHitObjects.OfType<SliderRepeatPoint>().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
 
             foreach (var point in slider.Path.ControlPoints)
                 point.Position.Value = new Vector2(point.Position.Value.X, -point.Position.Value.Y);
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
index 41daef1f38..44dba7715a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 case DrawableSliderHead _:
                 case DrawableSliderTail _:
                 case DrawableSliderTick _:
-                case DrawableRepeatPoint _:
+                case DrawableSliderRepeat _:
                     return;
 
                 default:
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
index cc2f4c3f70..fe7c70c52c 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             // Wiggle the repeat points with the slider instead of independently.
             // Also fixes an issue with repeat points being positioned incorrectly.
-            if (osuObject is RepeatPoint)
+            if (osuObject is SliderRepeatPoint)
                 return;
 
             Random objRand = new Random((int)osuObject.StartTime);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 7403649184..cb7005cb17 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private readonly Container<DrawableSliderHead> headContainer;
         private readonly Container<DrawableSliderTail> tailContainer;
         private readonly Container<DrawableSliderTick> tickContainer;
-        private readonly Container<DrawableRepeatPoint> repeatContainer;
+        private readonly Container<DrawableSliderRepeat> repeatContainer;
 
         private readonly Slider slider;
 
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 Body = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderBody), _ => new DefaultSliderBody(), confineMode: ConfineMode.NoScaling),
                 tickContainer = new Container<DrawableSliderTick> { RelativeSizeAxes = Axes.Both },
-                repeatContainer = new Container<DrawableRepeatPoint> { RelativeSizeAxes = Axes.Both },
+                repeatContainer = new Container<DrawableSliderRepeat> { RelativeSizeAxes = Axes.Both },
                 Ball = new SliderBall(s, this)
                 {
                     GetInitialHitAction = () => HeadCircle.HitAction,
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     tickContainer.Add(tick);
                     break;
 
-                case DrawableRepeatPoint repeat:
+                case DrawableSliderRepeat repeat:
                     repeatContainer.Add(repeat);
                     break;
             }
@@ -129,8 +129,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 case SliderTick tick:
                     return new DrawableSliderTick(tick) { Position = tick.Position - slider.Position };
 
-                case RepeatPoint repeat:
-                    return new DrawableRepeatPoint(repeat, this) { Position = repeat.Position - slider.Position };
+                case SliderRepeatPoint repeat:
+                    return new DrawableSliderRepeat(repeat, this) { Position = repeat.Position - slider.Position };
             }
 
             return base.CreateNestedHitObject(hitObject);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
similarity index 88%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs
rename to osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 8fdcd060e7..3336188068 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -14,19 +14,19 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableRepeatPoint : DrawableOsuHitObject, ITrackSnaking
+    public class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking
     {
-        private readonly RepeatPoint repeatPoint;
+        private readonly SliderRepeatPoint sliderRepeatPoint;
         private readonly DrawableSlider drawableSlider;
 
         private double animDuration;
 
         private readonly Drawable scaleContainer;
 
-        public DrawableRepeatPoint(RepeatPoint repeatPoint, DrawableSlider drawableSlider)
-            : base(repeatPoint)
+        public DrawableSliderRepeat(SliderRepeatPoint sliderRepeatPoint, DrawableSlider drawableSlider)
+            : base(sliderRepeatPoint)
         {
-            this.repeatPoint = repeatPoint;
+            this.sliderRepeatPoint = sliderRepeatPoint;
             this.drawableSlider = drawableSlider;
 
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
@@ -48,13 +48,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (repeatPoint.StartTime <= Time.Current)
+            if (sliderRepeatPoint.StartTime <= Time.Current)
                 ApplyResult(r => r.Type = drawableSlider.Tracking.Value ? HitResult.Great : HitResult.Miss);
         }
 
         protected override void UpdateInitialTransforms()
         {
-            animDuration = Math.Min(300, repeatPoint.SpanDuration);
+            animDuration = Math.Min(300, sliderRepeatPoint.SpanDuration);
 
             this.Animate(
                 d => d.FadeIn(animDuration),
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public void UpdateSnakingPosition(Vector2 start, Vector2 end)
         {
-            bool isRepeatAtEnd = repeatPoint.RepeatIndex % 2 == 0;
+            bool isRepeatAtEnd = sliderRepeatPoint.RepeatIndex % 2 == 0;
             List<Vector2> curve = ((PlaySliderBody)drawableSlider.Body.Drawable).CurrentCurve;
 
             Position = isRepeatAtEnd ? end : start;
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 77f8ec6cc8..04546b2216 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                         break;
 
                     case SliderEventType.Repeat:
-                        AddNested(new RepeatPoint
+                        AddNested(new SliderRepeatPoint
                         {
                             RepeatIndex = e.SpanIndex,
                             SpanDuration = SpanDuration,
@@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             foreach (var tick in NestedHitObjects.OfType<SliderTick>())
                 tick.Samples = sampleList;
 
-            foreach (var repeat in NestedHitObjects.OfType<RepeatPoint>())
+            foreach (var repeat in NestedHitObjects.OfType<SliderRepeatPoint>())
                 repeat.Samples = getNodeSamples(repeat.RepeatIndex + 1);
 
             if (HeadCircle != null)
diff --git a/osu.Game.Rulesets.Osu/Objects/RepeatPoint.cs b/osu.Game.Rulesets.Osu/Objects/SliderRepeatPoint.cs
similarity index 76%
rename from osu.Game.Rulesets.Osu/Objects/RepeatPoint.cs
rename to osu.Game.Rulesets.Osu/Objects/SliderRepeatPoint.cs
index a277517f9f..797383910f 100644
--- a/osu.Game.Rulesets.Osu/Objects/RepeatPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderRepeatPoint.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    public class RepeatPoint : OsuHitObject
+    public class SliderRepeatPoint : OsuHitObject
     {
         public int RepeatIndex { get; set; }
         public double SpanDuration { get; set; }
@@ -28,8 +28,15 @@ namespace osu.Game.Rulesets.Osu.Objects
                 TimePreempt = Math.Min(SpanDuration * 2, TimePreempt);
         }
 
-        public override Judgement CreateJudgement() => new OsuJudgement();
-
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        public override Judgement CreateJudgement() => new SliderRepeatPointJudgement();
+
+        public class SliderRepeatPointJudgement : OsuJudgement
+        {
+            public override bool IsBonus => true;
+
+            protected override int NumericResultFor(HitResult result) => result == MaxResult ? 30 : 0;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
index a49f4cef8b..212a84c04a 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
@@ -30,8 +30,15 @@ namespace osu.Game.Rulesets.Osu.Objects
             TimePreempt = (StartTime - SpanStartTime) / 2 + offset;
         }
 
-        public override Judgement CreateJudgement() => new OsuJudgement();
-
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        public override Judgement CreateJudgement() => new SliderTickJudgement();
+
+        public class SliderTickJudgement : OsuJudgement
+        {
+            public override bool IsBonus => true;
+
+            protected override int NumericResultFor(HitResult result) => result == MaxResult ? 10 : 0;
+        }
     }
 }

From 855f0a42530635fad333ed4962aed98079c07850 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 14:38:49 +0900
Subject: [PATCH 01608/10326] Fix bracket style

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index efce2e05ce..a120963abd 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -626,13 +626,16 @@ namespace osu.Game.Screens.Play
             completionProgressDelegate = Schedule(delegate
             {
                 var score = CreateScore();
+
                 if (DrawableRuleset.ReplayScore == null)
+                {
                     scoreManager.Import(score).ContinueWith(_ => Schedule(() =>
                     {
                         // screen may be in the exiting transition phase.
                         if (this.IsCurrentScreen())
                             this.Push(CreateResults(score));
                     }));
+                }
                 else
                     this.Push(CreateResults(score));
             });

From 08b5ab8ec43c01eace7d1639fbb92dd2332bea2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 14:42:02 +0900
Subject: [PATCH 01609/10326] SliderRepeatPoint -> SliderRepeat

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs     |  4 ++--
 osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs       |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs         |  2 +-
 .../Objects/Drawables/DrawableSlider.cs            |  2 +-
 .../Objects/Drawables/DrawableSliderRepeat.cs      | 14 +++++++-------
 osu.Game.Rulesets.Osu/Objects/Slider.cs            |  4 ++--
 .../{SliderRepeatPoint.cs => SliderRepeat.cs}      |  6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)
 rename osu.Game.Rulesets.Osu/Objects/{SliderRepeatPoint.cs => SliderRepeat.cs} (91%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index 1c0dd27e69..a201364de4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -146,7 +146,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddAssert("head samples updated", () => assertSamples(((Slider)slider.HitObject).HeadCircle));
             AddAssert("tick samples not updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderTick>().All(assertTickSamples));
-            AddAssert("repeat samples updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderRepeatPoint>().All(assertSamples));
+            AddAssert("repeat samples updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderRepeat>().All(assertSamples));
             AddAssert("tail has no samples", () => ((Slider)slider.HitObject).TailCircle.Samples.Count == 0);
 
             static bool assertTickSamples(SliderTick tick) => tick.Samples.Single().Name == "slidertick";
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddAssert("head samples not updated", () => assertSamples(((Slider)slider.HitObject).HeadCircle));
             AddAssert("tick samples not updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderTick>().All(assertTickSamples));
-            AddAssert("repeat samples not updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderRepeatPoint>().All(assertSamples));
+            AddAssert("repeat samples not updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderRepeat>().All(assertSamples));
             AddAssert("tail has no samples", () => ((Slider)slider.HitObject).TailCircle.Samples.Count == 0);
 
             static bool assertTickSamples(SliderTick tick) => tick.Samples.Single().Name == "slidertick";
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
index c1fc589798..cf6677a55d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 return;
 
             slider.NestedHitObjects.OfType<SliderTick>().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
-            slider.NestedHitObjects.OfType<SliderRepeatPoint>().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
+            slider.NestedHitObjects.OfType<SliderRepeat>().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
 
             foreach (var point in slider.Path.ControlPoints)
                 point.Position.Value = new Vector2(point.Position.Value.X, -point.Position.Value.Y);
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
index fe7c70c52c..297a0fea79 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             // Wiggle the repeat points with the slider instead of independently.
             // Also fixes an issue with repeat points being positioned incorrectly.
-            if (osuObject is SliderRepeatPoint)
+            if (osuObject is SliderRepeat)
                 return;
 
             Random objRand = new Random((int)osuObject.StartTime);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index cb7005cb17..8b8a0ff22a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 case SliderTick tick:
                     return new DrawableSliderTick(tick) { Position = tick.Position - slider.Position };
 
-                case SliderRepeatPoint repeat:
+                case SliderRepeat repeat:
                     return new DrawableSliderRepeat(repeat, this) { Position = repeat.Position - slider.Position };
             }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 3336188068..b9cee71ca1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -16,17 +16,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking
     {
-        private readonly SliderRepeatPoint sliderRepeatPoint;
+        private readonly SliderRepeat sliderRepeat;
         private readonly DrawableSlider drawableSlider;
 
         private double animDuration;
 
         private readonly Drawable scaleContainer;
 
-        public DrawableSliderRepeat(SliderRepeatPoint sliderRepeatPoint, DrawableSlider drawableSlider)
-            : base(sliderRepeatPoint)
+        public DrawableSliderRepeat(SliderRepeat sliderRepeat, DrawableSlider drawableSlider)
+            : base(sliderRepeat)
         {
-            this.sliderRepeatPoint = sliderRepeatPoint;
+            this.sliderRepeat = sliderRepeat;
             this.drawableSlider = drawableSlider;
 
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
@@ -48,13 +48,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (sliderRepeatPoint.StartTime <= Time.Current)
+            if (sliderRepeat.StartTime <= Time.Current)
                 ApplyResult(r => r.Type = drawableSlider.Tracking.Value ? HitResult.Great : HitResult.Miss);
         }
 
         protected override void UpdateInitialTransforms()
         {
-            animDuration = Math.Min(300, sliderRepeatPoint.SpanDuration);
+            animDuration = Math.Min(300, sliderRepeat.SpanDuration);
 
             this.Animate(
                 d => d.FadeIn(animDuration),
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public void UpdateSnakingPosition(Vector2 start, Vector2 end)
         {
-            bool isRepeatAtEnd = sliderRepeatPoint.RepeatIndex % 2 == 0;
+            bool isRepeatAtEnd = sliderRepeat.RepeatIndex % 2 == 0;
             List<Vector2> curve = ((PlaySliderBody)drawableSlider.Body.Drawable).CurrentCurve;
 
             Position = isRepeatAtEnd ? end : start;
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 04546b2216..28706b07f3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                         break;
 
                     case SliderEventType.Repeat:
-                        AddNested(new SliderRepeatPoint
+                        AddNested(new SliderRepeat
                         {
                             RepeatIndex = e.SpanIndex,
                             SpanDuration = SpanDuration,
@@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             foreach (var tick in NestedHitObjects.OfType<SliderTick>())
                 tick.Samples = sampleList;
 
-            foreach (var repeat in NestedHitObjects.OfType<SliderRepeatPoint>())
+            foreach (var repeat in NestedHitObjects.OfType<SliderRepeat>())
                 repeat.Samples = getNodeSamples(repeat.RepeatIndex + 1);
 
             if (HeadCircle != null)
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderRepeatPoint.cs b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
similarity index 91%
rename from osu.Game.Rulesets.Osu/Objects/SliderRepeatPoint.cs
rename to osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
index 797383910f..a8fd3764c5 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderRepeatPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    public class SliderRepeatPoint : OsuHitObject
+    public class SliderRepeat : OsuHitObject
     {
         public int RepeatIndex { get; set; }
         public double SpanDuration { get; set; }
@@ -30,9 +30,9 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
-        public override Judgement CreateJudgement() => new SliderRepeatPointJudgement();
+        public override Judgement CreateJudgement() => new SliderRepeatJudgement();
 
-        public class SliderRepeatPointJudgement : OsuJudgement
+        public class SliderRepeatJudgement : OsuJudgement
         {
             public override bool IsBonus => true;
 

From 114b46c4f02a9a8d92c9e614722a70a9877971d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 14:44:48 +0900
Subject: [PATCH 01610/10326] Change slider tail to give repeat judgement;
 slider itself to give none (managed by head already)

---
 .../Objects/Drawables/DrawableSlider.cs       | 21 +++----------------
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  3 +--
 .../Objects/SliderTailCircle.cs               |  4 ++--
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 8b8a0ff22a..2d5b9d874c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -6,13 +6,11 @@ using osuTK;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Skinning;
-using osu.Game.Rulesets.Scoring;
 using osuTK.Graphics;
 using osu.Game.Skinning;
 
@@ -26,6 +24,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public readonly SliderBall Ball;
         public readonly SkinnableDrawable Body;
 
+        public override bool DisplayResult => false;
+
         private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody;
 
         private readonly Container<DrawableSliderHead> headContainer;
@@ -193,22 +193,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || Time.Current < slider.EndTime)
                 return;
 
-            ApplyResult(r =>
-            {
-                var judgementsCount = NestedHitObjects.Count;
-                var judgementsHit = NestedHitObjects.Count(h => h.IsHit);
-
-                var hitFraction = (double)judgementsHit / judgementsCount;
-
-                if (hitFraction == 1 && HeadCircle.Result.Type == HitResult.Great)
-                    r.Type = HitResult.Great;
-                else if (hitFraction >= 0.5 && HeadCircle.Result.Type >= HitResult.Good)
-                    r.Type = HitResult.Good;
-                else if (hitFraction > 0)
-                    r.Type = HitResult.Meh;
-                else
-                    r.Type = HitResult.Miss;
-            });
+            ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
 
         protected override void UpdateStateTransforms(ArmedState state)
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 28706b07f3..3812a62a25 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -11,7 +11,6 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
@@ -233,7 +232,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         private IList<HitSampleInfo> getNodeSamples(int nodeIndex) =>
             nodeIndex < NodeSamples.Count ? NodeSamples[nodeIndex] : Samples;
 
-        public override Judgement CreateJudgement() => new OsuJudgement();
+        public override Judgement CreateJudgement() => new IgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index 127c36fcc0..c11e20c9e7 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Rulesets.Osu.Objects
             pathVersion.BindValueChanged(_ => Position = slider.EndPosition);
         }
 
-        public override Judgement CreateJudgement() => new IgnoreJudgement();
-
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        public override Judgement CreateJudgement() => new SliderRepeat.SliderRepeatJudgement();
     }
 }

From 3489514b65f6462d27f80dcf9db6b5039d8d527e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 17:15:53 +0900
Subject: [PATCH 01611/10326] Fix tests asserting incorrectly

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 21244f0e9c..67e1b77770 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -327,7 +327,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Tracking dropped", assertMidSliderJudgementFail);
         }
 
-        private bool assertGreatJudge() => judgementResults.Last().Type == HitResult.Great;
+        private bool assertGreatJudge() => judgementResults.Any() && judgementResults.All(t => t.Type == HitResult.Great);
 
         private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.Great && judgementResults.First().Type == HitResult.Miss;
 

From f285b43a74afd66c6c2ec1dcbe63e4f66f007314 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Mar 2020 17:44:32 +0900
Subject: [PATCH 01612/10326] Allow simultaneous hitobjects

---
 osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs | 2 +-
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs         | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
index a7416671f6..59d8727ae1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Time = time_first_circle, Position = position_second_circle, Actions = { OsuAction.LeftButton } }
             });
 
-            addJudgementAssert(HitResult.Miss, HitResult.Miss);
+            addJudgementAssert(HitResult.Miss, HitResult.Great);
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 643253b1af..bf91504b00 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -94,8 +94,9 @@ namespace osu.Game.Rulesets.Osu.UI
             if (lastObject == null)
                 return true;
 
-            // Ensure that either the last object has received a judgement or the hit time occurs after the last object's start time.
-            if (lastObject.Judged || Time.Current > lastObject.HitObject.StartTime)
+            // Ensure that either the last object has received a judgement or the hit time occurs at or after the last object's start time.
+            // Simultaneous hitobjects are allowed to be hit at the same time value to account for edge-cases such as Centipede.
+            if (lastObject.Judged || Time.Current >= lastObject.HitObject.StartTime)
                 return true;
 
             return false;

From 8f9e97b4ccbec6e9de72dba2fca7bfe29e1b7b88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 18:07:39 +0900
Subject: [PATCH 01613/10326] Fix carousel not remembering last selection
 correctly

---
 osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
index 045c682dc3..6ce12f7b89 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
@@ -104,7 +104,8 @@ namespace osu.Game.Screens.Select.Carousel
 
         private void updateSelected(CarouselItem newSelection)
         {
-            LastSelected = newSelection;
+            if (newSelection != null)
+                LastSelected = newSelection;
             updateSelectedIndex();
         }
 

From 0c1f385d5aae66ed9f4735fd154487481efc397f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 18:19:10 +0900
Subject: [PATCH 01614/10326] Add OsuIgnoreJudgement to get correct result type

---
 .../Judgements/OsuIgnoreJudgement.cs             | 16 ++++++++++++++++
 .../Objects/Drawables/DrawableSliderTail.cs      |  2 +-
 .../Objects/Drawables/DrawableSliderTick.cs      |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs          |  3 ++-
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs
new file mode 100644
index 0000000000..e528f65dca
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.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.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Judgements
+{
+    public class OsuIgnoreJudgement : OsuJudgement
+    {
+        public override bool AffectsCombo => false;
+
+        protected override int NumericResultFor(HitResult result) => 0;
+
+        protected override double HealthIncreaseFor(HitResult result) => 0;
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 21a3a0d236..29a4929c1b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (!userTriggered && timeOffset >= 0)
-                ApplyResult(r => r.Type = Tracking ? HitResult.Great : HitResult.Miss);
+                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : HitResult.Miss);
         }
 
         private void updatePosition() => Position = HitObject.Position - slider.Position;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 60b5c335d6..66eb60aa28 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (timeOffset >= 0)
-                ApplyResult(r => r.Type = Tracking ? HitResult.Great : HitResult.Miss);
+                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : HitResult.Miss);
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 3812a62a25..db1f46d8e2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -11,6 +11,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
@@ -232,7 +233,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         private IList<HitSampleInfo> getNodeSamples(int nodeIndex) =>
             nodeIndex < NodeSamples.Count ? NodeSamples[nodeIndex] : Samples;
 
-        public override Judgement CreateJudgement() => new IgnoreJudgement();
+        public override Judgement CreateJudgement() => new OsuIgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }

From 3a50c4bb51bf0377ad51e830656ef2a24c32417f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 18:58:22 +0900
Subject: [PATCH 01615/10326] Update tests

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 86 +++++++++++++++----
 1 file changed, 69 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 8df75c78f5..c2534e2cc7 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -419,7 +419,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
-        public void TestCarouselRootIsRandom()
+        public void TestCarouselRemembersSelection()
         {
             List<BeatmapSetInfo> manySets = new List<BeatmapSetInfo>();
 
@@ -429,12 +429,74 @@ namespace osu.Game.Tests.Visual.SongSelect
             loadBeatmaps(manySets);
 
             advanceSelection(direction: 1, diff: false);
-            checkNonmatchingFilter();
-            checkNonmatchingFilter();
-            checkNonmatchingFilter();
-            checkNonmatchingFilter();
-            checkNonmatchingFilter();
-            AddAssert("Selection was random", () => eagerSelectedIDs.Count > 1);
+
+            for (int i = 0; i < 5; i++)
+            {
+                AddStep("Toggle non-matching filter", () =>
+                {
+                    carousel.Filter(new FilterCriteria { SearchText = Guid.NewGuid().ToString() }, false);
+                });
+
+                AddStep("Restore no filter", () =>
+                {
+                    carousel.Filter(new FilterCriteria(), false);
+                    eagerSelectedIDs.Add(carousel.SelectedBeatmapSet.ID);
+                });
+            }
+
+            // always returns to same selection as long as it's available.
+            AddAssert("Selection was remembered", () => eagerSelectedIDs.Count == 1);
+        }
+
+        [Test]
+        public void TestRandomFallbackOnNonMatchingPrevious()
+        {
+            List<BeatmapSetInfo> manySets = new List<BeatmapSetInfo>();
+
+            AddStep("populate maps", () =>
+            {
+                for (int i = 0; i < 10; i++)
+                {
+                    var set = createTestBeatmapSet(i);
+
+                    foreach (var b in set.Beatmaps)
+                    {
+                        // all taiko except for first
+                        int ruleset = i > 0 ? 1 : 0;
+
+                        b.Ruleset = rulesets.GetRuleset(ruleset);
+                        b.RulesetID = ruleset;
+                    }
+
+                    manySets.Add(set);
+                }
+            });
+
+            loadBeatmaps(manySets);
+
+            for (int i = 0; i < 10; i++)
+            {
+                AddStep("Reset filter", () => carousel.Filter(new FilterCriteria(), false));
+
+                AddStep("select first beatmap", () => carousel.SelectBeatmap(manySets.First().Beatmaps.First()));
+
+                AddStep("Toggle non-matching filter", () =>
+                {
+                    carousel.Filter(new FilterCriteria { SearchText = Guid.NewGuid().ToString() }, false);
+                });
+
+                AddAssert("selection lost", () => carousel.SelectedBeatmap == null);
+
+                AddStep("Restore different ruleset filter", () =>
+                {
+                    carousel.Filter(new FilterCriteria { Ruleset = rulesets.GetRuleset(1) }, false);
+                    eagerSelectedIDs.Add(carousel.SelectedBeatmapSet.ID);
+                });
+
+                AddAssert("selection changed", () => carousel.SelectedBeatmap != manySets.First().Beatmaps.First());
+            }
+
+            AddAssert("Selection was random", () => eagerSelectedIDs.Count > 2);
         }
 
         [Test]
@@ -593,16 +655,6 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selection is visible", selectedBeatmapVisible);
         }
 
-        private void checkNonmatchingFilter()
-        {
-            AddStep("Toggle non-matching filter", () =>
-            {
-                carousel.Filter(new FilterCriteria { SearchText = "Dingo" }, false);
-                carousel.Filter(new FilterCriteria(), false);
-                eagerSelectedIDs.Add(carousel.SelectedBeatmapSet.ID);
-            });
-        }
-
         private BeatmapSetInfo createTestBeatmapSet(int id)
         {
             return new BeatmapSetInfo

From 12a48d2774dd0e4aa19cdd989b34c7022343ff1e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Mar 2020 19:16:24 +0900
Subject: [PATCH 01616/10326] Cause all earlier hitobjects to get missed

---
 .../TestSceneNoteLock.cs                      | 13 ++++-
 .../Objects/Drawables/DrawableOsuHitObject.cs |  6 +++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      | 52 +++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
index 59d8727ae1..e2b8364f3e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Screens;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
@@ -24,6 +25,8 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         private const double time_first_circle = 1500;
         private const double time_second_circle = 1600;
+        private const double early_miss_window = 1000; // time after -1000 to -500 is considered a miss
+        private const double late_miss_window = 500; // time after +500 is considered a miss
 
         private static readonly Vector2 position_first_circle = Vector2.Zero;
         private static readonly Vector2 position_second_circle = new Vector2(80);
@@ -40,6 +43,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             addJudgementAssert(HitResult.Miss, HitResult.Miss);
+            addJudgementOffsetAssert(late_miss_window);
         }
 
         /// <summary>
@@ -54,6 +58,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             addJudgementAssert(HitResult.Miss, HitResult.Great);
+            addJudgementOffsetAssert(0);
         }
 
         /// <summary>
@@ -68,6 +73,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             addJudgementAssert(HitResult.Miss, HitResult.Great);
+            addJudgementOffsetAssert(100);
         }
 
         /// <summary>
@@ -91,6 +97,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert($"second circle judgement is {secondCircle}", () => judgementResults.Single(r => r.HitObject.StartTime == time_second_circle).Type == secondCircle);
         }
 
+        private void addJudgementOffsetAssert(double offset)
+        {
+            AddAssert($"first circle judged at {offset}", () => Precision.AlmostEquals(judgementResults.Single(r => r.HitObject.StartTime == time_first_circle).TimeOffset, offset, 100));
+        }
+
         private ScoreAccessibleReplayPlayer currentPlayer;
         private List<JudgementResult> judgementResults;
         private bool allJudgedFired;
@@ -157,7 +168,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             private static readonly DifficultyRange[] ranges =
             {
                 new DifficultyRange(HitResult.Great, 500, 500, 500),
-                new DifficultyRange(HitResult.Miss, 1000, 1000, 1000),
+                new DifficultyRange(HitResult.Miss, early_miss_window, early_miss_window, early_miss_window),
             };
 
             public override bool IsHitResultAllowed(HitResult result) => result == HitResult.Great || result == HitResult.Miss;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 3e66549ca0..13829dc2f7 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Graphics.Containers;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -61,6 +62,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        /// <summary>
+        /// Causes this <see cref="DrawableOsuHitObject"/> to get missed, disregarding all conditions in implementations of <see cref="DrawableHitObject.CheckForResult"/>.
+        /// </summary>
+        public void MissForcefully() => ApplyResult(r => r.Type = HitResult.Miss);
+
         protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(HitObject, judgement);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index bf91504b00..e36d32d01a 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.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.IEnumerableExtensions;
 using osuTK;
 using osu.Framework.Graphics;
@@ -104,6 +105,8 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
+            missAllEarlier(result);
+
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
@@ -117,6 +120,55 @@ namespace osu.Game.Rulesets.Osu.UI
             judgementLayer.Add(explosion);
         }
 
+        /// <summary>
+        /// Misses all <see cref="OsuHitObject"/>s occurring earlier than the start time of a judged <see cref="OsuHitObject"/>.
+        /// </summary>
+        /// <param name="result">The <see cref="JudgementResult"/> of the judged <see cref="OsuHitObject"/>.</param>
+        private void missAllEarlier(JudgementResult result)
+        {
+            // Hitobjects that count as bonus should not cause other hitobjects to get missed.
+            // E.g. For the sequence slider-head -> circle -> slider-tick, hitting the tick before the circle should not cause the circle to be missed.
+            // E.g. For the sequence spinner -> circle -> spinner-bonus, hitting the bonus before the circle should not cause the circle to be missed.
+            if (result.Judgement.IsBonus)
+                return;
+
+            // The minimum start time required for hitobjects so that they aren't missed.
+            double minimumTime = result.HitObject.StartTime;
+
+            foreach (var obj in HitObjectContainer.AliveObjects)
+            {
+                if (obj.HitObject.StartTime >= minimumTime)
+                    break;
+
+                attemptMiss(obj);
+
+                foreach (var n in obj.NestedHitObjects)
+                {
+                    if (n.HitObject.StartTime >= minimumTime)
+                        break;
+
+                    attemptMiss(n);
+                }
+            }
+
+            static void attemptMiss(DrawableHitObject obj)
+            {
+                if (!(obj is DrawableOsuHitObject osuObject))
+                    throw new InvalidOperationException($"{obj.GetType()} is not a {nameof(DrawableOsuHitObject)}.");
+
+                // Hitobjects that have already been judged cannot be missed.
+                if (osuObject.Judged)
+                    return;
+
+                // Hitobjects that count as bonus should not be missed.
+                // For the sequence slider-head -> slider-tick -> circle, hitting the circle before the tick should not cause the tick to be missed.
+                if (osuObject.Result.Judgement.IsBonus)
+                    return;
+
+                osuObject.MissForcefully();
+            }
+        }
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => HitObjectContainer.ReceivePositionalInputAt(screenSpacePos);
 
         private class ApproachCircleProxyContainer : LifetimeManagementContainer

From 43c1f27f2490ee304e2347473f6cbc2bd3b5de36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Mar 2020 20:19:50 +0900
Subject: [PATCH 01617/10326] 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 942970c890..7e17f9da16 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.317.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.319.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 54f1ad2845..46d17bcf05 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.317.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.319.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 816a430b52..9cc9792ecf 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.317.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.319.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.317.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.319.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 549cec80d6d62ecd55d7a8dbfc55363c6ea7f273 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Mar 2020 02:47:45 +0900
Subject: [PATCH 01618/10326] Reduce app store processing wait interval in line
 with faster processing time

---
 fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f895c465d2..4fd0e5e8c7 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -97,7 +97,7 @@ platform :ios do
     changelog.gsub!('$BUILD_ID', options[:build])
 
     pilot(
-      wait_processing_interval: 1800,
+      wait_processing_interval: 900,
       changelog: changelog,
       groups: ['osu! supporters', 'public'],
       distribute_external: true,

From be4a97c2894282c794c763f269dcdb991aacf512 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Mar 2020 13:01:24 +0900
Subject: [PATCH 01619/10326] Correctly bypass last selected when it is
 filtered

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 9f8b201eff..389ae918b9 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -333,8 +333,7 @@ namespace osu.Game.Screens.Select
             else
                 set = visibleSets.ElementAt(RNG.Next(visibleSets.Count));
 
-            var visibleBeatmaps = set.Beatmaps.Where(s => !s.Filtered.Value).ToList();
-            select(visibleBeatmaps[RNG.Next(visibleBeatmaps.Count)]);
+            select(set);
             return true;
         }
 
@@ -756,7 +755,7 @@ namespace osu.Game.Screens.Select
 
             protected override void PerformSelection()
             {
-                if (LastSelected == null)
+                if (LastSelected == null || LastSelected.Filtered.Value)
                     carousel.SelectNextRandom();
                 else
                     base.PerformSelection();

From 9b60b535e596c051c353400f5feeb68e4562fa5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Mar 2020 15:01:26 +0900
Subject: [PATCH 01620/10326] Fix selection not occurring when switching from
 empty ruleset on first load

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 32 +++++++++++++++++--
 osu.Game/Screens/Select/BeatmapCarousel.cs    |  6 +++-
 osu.Game/Screens/Select/SongSelect.cs         |  3 ++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 8df75c78f5..bd26120da9 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -227,6 +227,32 @@ namespace osu.Game.Tests.Visual.SongSelect
             waitForSelection(set_count);
         }
 
+        [Test]
+        public void TestSelectionEnteringFromEmptyRuleset()
+        {
+            var sets = new List<BeatmapSetInfo>();
+
+            AddStep("Create beatmaps for taiko only", () =>
+            {
+                var rulesetBeatmapSet = createTestBeatmapSet(1);
+                var taikoRuleset = rulesets.AvailableRulesets.ElementAt(1);
+                rulesetBeatmapSet.Beatmaps.ForEach(b =>
+                {
+                    b.Ruleset = taikoRuleset;
+                    b.RulesetID = 1;
+                });
+
+                sets.Add(rulesetBeatmapSet);
+            });
+
+            loadBeatmaps(sets, () => new FilterCriteria { Ruleset = rulesets.AvailableRulesets.ElementAt(0) });
+
+            AddStep("Set non-empty mode filter", () =>
+                carousel.Filter(new FilterCriteria { Ruleset = rulesets.AvailableRulesets.ElementAt(1) }, false));
+
+            AddAssert("Something is selected", () => carousel.SelectedBeatmap != null);
+        }
+
         /// <summary>
         /// Test sorting
         /// </summary>
@@ -399,7 +425,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 not selected", () => carousel.SelectedBeatmap == null);
+            AddAssert("unfiltered beatmap not selected", () => carousel.SelectedBeatmap.RulesetID == 0);
 
             AddStep("remove mixed set", () =>
             {
@@ -484,7 +510,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             checkVisibleItemCount(true, 15);
         }
 
-        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null)
+        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null)
         {
             createCarousel();
 
@@ -499,7 +525,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             bool changed = false;
             AddStep($"Load {(beatmapSets.Count > 0 ? beatmapSets.Count.ToString() : "some")} beatmaps", () =>
             {
-                carousel.Filter(new FilterCriteria());
+                carousel.Filter(initialCriteria?.Invoke() ?? new FilterCriteria());
                 carousel.BeatmapSetsChanged = () => changed = true;
                 carousel.BeatmapSets = beatmapSets;
             });
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 9f8b201eff..6c6f9a0e79 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -751,13 +751,17 @@ namespace osu.Game.Screens.Select
 
             public CarouselRoot(BeatmapCarousel carousel)
             {
+                // root should always remaing selected. if not, PerformSelection will not be called.
+                State.Value = CarouselItemState.Selected;
+                State.ValueChanged += state => State.Value = CarouselItemState.Selected;
+
                 this.carousel = carousel;
             }
 
             protected override void PerformSelection()
             {
                 if (LastSelected == null)
-                    carousel.SelectNextRandom();
+                    carousel?.SelectNextRandom();
                 else
                     base.PerformSelection();
             }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 11c680bdb0..b6ec40ab88 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -150,6 +150,7 @@ namespace osu.Game.Screens.Select
                                         },
                                         Child = Carousel = new BeatmapCarousel
                                         {
+                                            AllowSelection = false, // delay any selection until our bindables are ready to make a good choice.
                                             Anchor = Anchor.CentreRight,
                                             Origin = Anchor.CentreRight,
                                             RelativeSizeAxes = Axes.Both,
@@ -655,6 +656,8 @@ namespace osu.Game.Screens.Select
         {
             bindBindables();
 
+            Carousel.AllowSelection = true;
+
             // If a selection was already obtained, do not attempt to update the selected beatmap.
             if (Carousel.SelectedBeatmapSet != null)
                 return;

From 8136ea561e689786be2b5938fec47bdffc495d8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Mar 2020 15:02:13 +0900
Subject: [PATCH 01621/10326] Fix a couple of broken tests

---
 .../Background/TestSceneUserDimBackgrounds.cs     |  1 +
 .../Visual/SongSelect/TestSceneBeatmapCarousel.cs | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index b51555db3e..1ddc1326d5 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -278,6 +278,7 @@ namespace osu.Game.Tests.Visual.Background
 
         private void setupUserSettings()
         {
+            AddUntilStep("Song select is current", () => songSelect.IsCurrentScreen());
             AddUntilStep("Song select has selection", () => songSelect.Carousel?.SelectedBeatmap != null);
             AddStep("Set default user settings", () =>
             {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index bd26120da9..5b4c57e28f 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -432,13 +432,18 @@ namespace osu.Game.Tests.Visual.SongSelect
                 carousel.RemoveBeatmapSet(testMixed);
                 testMixed = null;
             });
-            var testSingle = createTestBeatmapSet(set_count + 2);
-            testSingle.Beatmaps.ForEach(b =>
+            BeatmapSetInfo testSingle = null;
+            AddStep("add single ruleset beatmapset", () =>
             {
-                b.Ruleset = rulesets.AvailableRulesets.ElementAt(1);
-                b.RulesetID = b.Ruleset.ID ?? 1;
+                testSingle = createTestBeatmapSet(set_count + 2);
+                testSingle.Beatmaps.ForEach(b =>
+                {
+                    b.Ruleset = rulesets.AvailableRulesets.ElementAt(1);
+                    b.RulesetID = b.Ruleset.ID ?? 1;
+                });
+
+                carousel.UpdateBeatmapSet(testSingle);
             });
-            AddStep("add single ruleset beatmapset", () => carousel.UpdateBeatmapSet(testSingle));
             AddStep("select filtered map skipping filtered", () => carousel.SelectBeatmap(testSingle.Beatmaps[0], false));
             checkNoSelection();
             AddStep("remove single ruleset set", () => carousel.RemoveBeatmapSet(testSingle));

From b813c0aff1bff795bb5247caf7dfeac26a1d19a4 Mon Sep 17 00:00:00 2001
From: OctopuSSX <vladik0701@gmail.com>
Date: Fri, 20 Mar 2020 14:26:26 +0300
Subject: [PATCH 01622/10326] Don't open profile if it's Autoplay

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

diff --git a/osu.Game/Users/Drawables/DrawableAvatar.cs b/osu.Game/Users/Drawables/DrawableAvatar.cs
index 93136e88a0..fe44c56ae0 100644
--- a/osu.Game/Users/Drawables/DrawableAvatar.cs
+++ b/osu.Game/Users/Drawables/DrawableAvatar.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Users.Drawables
             if (!OpenOnClick.Value)
                 return;
 
-            if (user != null)
+            if (user != null && user.Id != 1)
                 game?.ShowUser(user.Id);
         }
 

From 157f05c3e508a228a9f13e7e454a937faab0b7c9 Mon Sep 17 00:00:00 2001
From: OctopuSSX <vladik0701@gmail.com>
Date: Fri, 20 Mar 2020 14:35:27 +0300
Subject: [PATCH 01623/10326] Update osu.Game/Users/Drawables/DrawableAvatar.cs

Co-Authored-By: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Users/Drawables/DrawableAvatar.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Users/Drawables/DrawableAvatar.cs b/osu.Game/Users/Drawables/DrawableAvatar.cs
index fe44c56ae0..09750c5bfe 100644
--- a/osu.Game/Users/Drawables/DrawableAvatar.cs
+++ b/osu.Game/Users/Drawables/DrawableAvatar.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Users.Drawables
             if (!OpenOnClick.Value)
                 return;
 
-            if (user != null && user.Id != 1)
+            if (user?.Id > 1)
                 game?.ShowUser(user.Id);
         }
 

From 5a6d8f1932715d9fc7479d8cb5614e0b2efe4025 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 12:47:17 -0400
Subject: [PATCH 01624/10326] use SettingSource to define IconTooltip format

---
 .../Mods/CatchModDifficultyAdjust.cs          |  9 ++---
 .../Mods/OsuModDifficultyAdjust.cs            |  9 ++---
 .../Configuration/SettingSourceAttribute.cs   | 11 +++++-
 osu.Game/Rulesets/Mods/Mod.cs                 | 34 ++++++++++++++++++-
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs |  7 ++--
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       |  4 +--
 osu.Game/Rulesets/Mods/ModEasy.cs             |  4 +--
 osu.Game/Rulesets/Mods/ModHalfTime.cs         |  4 +--
 8 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index 661c59332f..e4298dc008 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.", FIRST_SETTING_ORDER - 1)]
+        [SettingSource("Circle Size", "Override a beatmap's set CS.", "CS {0}", 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.", LAST_SETTING_ORDER + 1)]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", "AR {0}", LAST_SETTING_ORDER + 1)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -30,11 +30,6 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = 5,
         };
 
-        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}, ")}" +
-                                       $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}, ")}" +
-                                       $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}, ")}" +
-                                       $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
-
         protected override void TransferSettings(BeatmapDifficulty difficulty)
         {
             base.TransferSettings(difficulty);
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 477028dbbe..91707ea328 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.", FIRST_SETTING_ORDER - 1)]
+        [SettingSource("Circle Size", "Override a beatmap's set CS.", "CS {0}", 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.", LAST_SETTING_ORDER + 1)]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", "AR {0}", LAST_SETTING_ORDER + 1)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -30,11 +30,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = 5,
         };
 
-        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}, ")}" +
-                                       $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}, ")}" +
-                                       $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}, ")}" +
-                                       $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
-
         protected override void TransferSettings(BeatmapDifficulty difficulty)
         {
             base.TransferSettings(difficulty);
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index fe487cb1d0..1a79dc7335 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -30,17 +30,26 @@ namespace osu.Game.Configuration
 
         public int? OrderPosition { get; }
 
+        public string TooltipText { get; }
+
         public SettingSourceAttribute(string label, string description = null)
         {
             Label = label ?? string.Empty;
             Description = description ?? string.Empty;
         }
 
-        public SettingSourceAttribute(string label, string description, int orderPosition)
+        public SettingSourceAttribute(string label, string description, string tooltipText, int orderPosition)
             : this(label, description)
         {
             OrderPosition = orderPosition;
+            TooltipText = tooltipText;
         }
+
+        public SettingSourceAttribute(string label, string description, string tooltipText) : this(label, description)
+        {
+            TooltipText = tooltipText;
+        }
+
     }
 
     public static class SettingSourceExtensions
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b70ddc6d46..860e768350 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -2,8 +2,12 @@
 // 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.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 using osu.Game.IO.Serialization;
 using osu.Game.Rulesets.UI;
 
@@ -51,7 +55,35 @@ namespace osu.Game.Rulesets.Mods
         /// are displayed in the tooltip.
         /// </remarks>
         [JsonIgnore]
-        public virtual string IconTooltip => Name;
+        public virtual string IconTooltip
+        {
+            get
+            {
+                List<string> attributes = new List<string>();
+                foreach ((SettingSourceAttribute attr, System.Reflection.PropertyInfo property) in this.GetOrderedSettingsSourceProperties())
+                {
+                    // use TooltipText from SettingSource if available, but fall back to Label, which has to be provided
+                    string tooltipText = attr.TooltipText ?? attr.Label + " {0}";
+                    object bindableObj = property.GetValue(this);
+                    if (bindableObj is BindableInt bindableInt && !bindableInt.IsDefault)
+                    {
+                        attributes.Add(string.Format(tooltipText, bindableInt.Value));
+                        continue;
+                    }
+                    if (bindableObj is BindableFloat bindableFloat && !bindableFloat.IsDefault)
+                    {
+                        attributes.Add(string.Format(tooltipText, bindableFloat.Value));
+                        continue;
+                    }
+                    if (bindableObj is BindableDouble bindableDouble && !bindableDouble.IsDefault)
+                    {
+                        attributes.Add(string.Format(tooltipText, bindableDouble.Value));
+                        continue;
+                    }
+                }
+                return $"{Name}{(attributes.Any() ? $" ({string.Join(", ", attributes)})" : "")}";
+            }
+        }
 
         /// <summary>
         /// The score multiplier of this mod.
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 4072e6a6af..8188e36b64 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Mods
 
         protected const int LAST_SETTING_ORDER = 2;
 
-        [SettingSource("HP Drain", "Override a beatmap's set HP.", FIRST_SETTING_ORDER)]
+        [SettingSource("HP Drain", "Override a beatmap's set HP.", "HP {0}", FIRST_SETTING_ORDER)]
         public BindableNumber<float> DrainRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
-        [SettingSource("Accuracy", "Override a beatmap's set OD.", LAST_SETTING_ORDER)]
+        [SettingSource("Accuracy", "Override a beatmap's set OD.", "OD {0}", LAST_SETTING_ORDER)]
         public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -52,9 +52,6 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
-        public override string IconTooltip => $"{Name} ({(DrainRate.IsDefault ? $"HP {DrainRate.Value.ToString()}, " : "")}" +
-                                              $"{(OverallDifficulty.IsDefault ? $"OD {OverallDifficulty.Value.ToString()}, " : "")})";
-
         private BeatmapDifficulty difficulty;
 
         public void ReadFromDifficulty(BeatmapDifficulty difficulty)
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 4f7d82418d..fe027b9da0 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModHalfTime)).ToArray();
 
-        [SettingSource("Speed increase", "The actual increase to apply")]
+        [SettingSource("Speed increase", "The actual increase to apply", "{0}x")]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble
         {
             MinValue = 1.01,
@@ -30,7 +30,5 @@ namespace osu.Game.Rulesets.Mods
             Value = 1.5,
             Precision = 0.01,
         };
-
-        public override string IconTooltip => $"{Name}{(SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)")}";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index 2ec4e9610b..c92c7297c3 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -21,15 +21,13 @@ namespace osu.Game.Rulesets.Mods
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModHardRock), typeof(ModDifficultyAdjust) };
 
-        [SettingSource("Extra Lives", "Number of extra lives")]
+        [SettingSource("Extra Lives", "Number of extra lives", "{0} lives")]
         public Bindable<int> Retries { get; } = new BindableInt(2)
         {
             MinValue = 0,
             MaxValue = 10
         };
 
-        public override string IconTooltip => $"{Name}{(Retries.IsDefault ? "" : $" ({Retries.Value} lives)")}";
-
         private int retries;
 
         private BindableNumber<double> health;
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 14133bddcd..7c1f4b8e12 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModDoubleTime)).ToArray();
 
-        [SettingSource("Speed decrease", "The actual decrease to apply")]
+        [SettingSource("Speed decrease", "The actual decrease to apply", "{0}x")]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble
         {
             MinValue = 0.5,
@@ -30,7 +30,5 @@ namespace osu.Game.Rulesets.Mods
             Value = 0.75,
             Precision = 0.01,
         };
-
-        public override string IconTooltip => $"{Name}{(SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)")}";
     }
 }

From 9dc814681195f864192436ba0a9f8197a726108b Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 13:21:44 -0400
Subject: [PATCH 01625/10326] fix style issues

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 4 ++--
 osu.Game/Rulesets/Mods/Mod.cs                    | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 1a79dc7335..fb0daf9217 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -45,11 +45,11 @@ namespace osu.Game.Configuration
             TooltipText = tooltipText;
         }
 
-        public SettingSourceAttribute(string label, string description, string tooltipText) : this(label, description)
+        public SettingSourceAttribute(string label, string description, string tooltipText)
+            : this(label, description)
         {
             TooltipText = tooltipText;
         }
-
     }
 
     public static class SettingSourceExtensions
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 860e768350..69fd45767b 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -60,25 +60,28 @@ namespace osu.Game.Rulesets.Mods
             get
             {
                 List<string> attributes = new List<string>();
+
                 foreach ((SettingSourceAttribute attr, System.Reflection.PropertyInfo property) in this.GetOrderedSettingsSourceProperties())
                 {
                     // use TooltipText from SettingSource if available, but fall back to Label, which has to be provided
                     string tooltipText = attr.TooltipText ?? attr.Label + " {0}";
                     object bindableObj = property.GetValue(this);
+
                     if (bindableObj is BindableInt bindableInt && !bindableInt.IsDefault)
                     {
                         attributes.Add(string.Format(tooltipText, bindableInt.Value));
                         continue;
                     }
+
                     if (bindableObj is BindableFloat bindableFloat && !bindableFloat.IsDefault)
                     {
                         attributes.Add(string.Format(tooltipText, bindableFloat.Value));
                         continue;
                     }
+
                     if (bindableObj is BindableDouble bindableDouble && !bindableDouble.IsDefault)
                     {
                         attributes.Add(string.Format(tooltipText, bindableDouble.Value));
-                        continue;
                     }
                 }
                 return $"{Name}{(attributes.Any() ? $" ({string.Join(", ", attributes)})" : "")}";

From 9e3bff3b97503c6e4f2a89fa5ea1c8a01f3767bf Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 13:36:16 -0400
Subject: [PATCH 01626/10326] oops, missed a newline

---
 osu.Game/Rulesets/Mods/Mod.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 69fd45767b..f3b7fed96a 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -84,6 +84,7 @@ namespace osu.Game.Rulesets.Mods
                         attributes.Add(string.Format(tooltipText, bindableDouble.Value));
                     }
                 }
+
                 return $"{Name}{(attributes.Any() ? $" ({string.Join(", ", attributes)})" : "")}";
             }
         }

From 3d955921302cbe8e449640bdb0488b528654fd7c Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 14:37:31 -0400
Subject: [PATCH 01627/10326] use var for list declaration
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/Rulesets/Mods/Mod.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index f3b7fed96a..b4faf55734 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Mods
         {
             get
             {
-                List<string> attributes = new List<string>();
+                var attributes = new List<string>();
 
                 foreach ((SettingSourceAttribute attr, System.Reflection.PropertyInfo property) in this.GetOrderedSettingsSourceProperties())
                 {

From 7bdbdd25f8b3955b9c0a8f2dcb897a722073f958 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 16:05:12 -0400
Subject: [PATCH 01628/10326] Revert "use SettingSource to define IconTooltip
 format"

This reverts commit 5a6d8f1932715d9fc7479d8cb5614e0b2efe4025.
---
 .../Mods/CatchModDifficultyAdjust.cs          |  9 ++++-
 .../Mods/OsuModDifficultyAdjust.cs            |  9 ++++-
 .../Configuration/SettingSourceAttribute.cs   | 11 +-----
 osu.Game/Rulesets/Mods/Mod.cs                 | 38 +------------------
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs |  7 +++-
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       |  4 +-
 osu.Game/Rulesets/Mods/ModEasy.cs             |  4 +-
 osu.Game/Rulesets/Mods/ModHalfTime.cs         |  4 +-
 8 files changed, 30 insertions(+), 56 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index e4298dc008..661c59332f 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.", "CS {0}", FIRST_SETTING_ORDER - 1)]
+        [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.", "AR {0}", LAST_SETTING_ORDER + 1)]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -30,6 +30,11 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = 5,
         };
 
+        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}, ")}" +
+                                       $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}, ")}" +
+                                       $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}, ")}" +
+                                       $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
+
         protected override void TransferSettings(BeatmapDifficulty difficulty)
         {
             base.TransferSettings(difficulty);
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 91707ea328..477028dbbe 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.", "CS {0}", FIRST_SETTING_ORDER - 1)]
+        [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.", "AR {0}", LAST_SETTING_ORDER + 1)]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -30,6 +30,11 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = 5,
         };
 
+        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}, ")}" +
+                                       $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}, ")}" +
+                                       $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}, ")}" +
+                                       $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
+
         protected override void TransferSettings(BeatmapDifficulty difficulty)
         {
             base.TransferSettings(difficulty);
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index fb0daf9217..fe487cb1d0 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -30,25 +30,16 @@ namespace osu.Game.Configuration
 
         public int? OrderPosition { get; }
 
-        public string TooltipText { get; }
-
         public SettingSourceAttribute(string label, string description = null)
         {
             Label = label ?? string.Empty;
             Description = description ?? string.Empty;
         }
 
-        public SettingSourceAttribute(string label, string description, string tooltipText, int orderPosition)
+        public SettingSourceAttribute(string label, string description, int orderPosition)
             : this(label, description)
         {
             OrderPosition = orderPosition;
-            TooltipText = tooltipText;
-        }
-
-        public SettingSourceAttribute(string label, string description, string tooltipText)
-            : this(label, description)
-        {
-            TooltipText = tooltipText;
         }
     }
 
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b4faf55734..b70ddc6d46 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -2,12 +2,8 @@
 // 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.Bindables;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Configuration;
 using osu.Game.IO.Serialization;
 using osu.Game.Rulesets.UI;
 
@@ -55,39 +51,7 @@ namespace osu.Game.Rulesets.Mods
         /// are displayed in the tooltip.
         /// </remarks>
         [JsonIgnore]
-        public virtual string IconTooltip
-        {
-            get
-            {
-                var attributes = new List<string>();
-
-                foreach ((SettingSourceAttribute attr, System.Reflection.PropertyInfo property) in this.GetOrderedSettingsSourceProperties())
-                {
-                    // use TooltipText from SettingSource if available, but fall back to Label, which has to be provided
-                    string tooltipText = attr.TooltipText ?? attr.Label + " {0}";
-                    object bindableObj = property.GetValue(this);
-
-                    if (bindableObj is BindableInt bindableInt && !bindableInt.IsDefault)
-                    {
-                        attributes.Add(string.Format(tooltipText, bindableInt.Value));
-                        continue;
-                    }
-
-                    if (bindableObj is BindableFloat bindableFloat && !bindableFloat.IsDefault)
-                    {
-                        attributes.Add(string.Format(tooltipText, bindableFloat.Value));
-                        continue;
-                    }
-
-                    if (bindableObj is BindableDouble bindableDouble && !bindableDouble.IsDefault)
-                    {
-                        attributes.Add(string.Format(tooltipText, bindableDouble.Value));
-                    }
-                }
-
-                return $"{Name}{(attributes.Any() ? $" ({string.Join(", ", attributes)})" : "")}";
-            }
-        }
+        public virtual string IconTooltip => Name;
 
         /// <summary>
         /// The score multiplier of this mod.
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 8188e36b64..4072e6a6af 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Mods
 
         protected const int LAST_SETTING_ORDER = 2;
 
-        [SettingSource("HP Drain", "Override a beatmap's set HP.", "HP {0}", FIRST_SETTING_ORDER)]
+        [SettingSource("HP Drain", "Override a beatmap's set HP.", FIRST_SETTING_ORDER)]
         public BindableNumber<float> DrainRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
-        [SettingSource("Accuracy", "Override a beatmap's set OD.", "OD {0}", LAST_SETTING_ORDER)]
+        [SettingSource("Accuracy", "Override a beatmap's set OD.", LAST_SETTING_ORDER)]
         public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -52,6 +52,9 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
+        public override string IconTooltip => $"{Name} ({(DrainRate.IsDefault ? $"HP {DrainRate.Value.ToString()}, " : "")}" +
+                                              $"{(OverallDifficulty.IsDefault ? $"OD {OverallDifficulty.Value.ToString()}, " : "")})";
+
         private BeatmapDifficulty difficulty;
 
         public void ReadFromDifficulty(BeatmapDifficulty difficulty)
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index fe027b9da0..4f7d82418d 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModHalfTime)).ToArray();
 
-        [SettingSource("Speed increase", "The actual increase to apply", "{0}x")]
+        [SettingSource("Speed increase", "The actual increase to apply")]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble
         {
             MinValue = 1.01,
@@ -30,5 +30,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 1.5,
             Precision = 0.01,
         };
+
+        public override string IconTooltip => $"{Name}{(SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)")}";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index c92c7297c3..2ec4e9610b 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -21,13 +21,15 @@ namespace osu.Game.Rulesets.Mods
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModHardRock), typeof(ModDifficultyAdjust) };
 
-        [SettingSource("Extra Lives", "Number of extra lives", "{0} lives")]
+        [SettingSource("Extra Lives", "Number of extra lives")]
         public Bindable<int> Retries { get; } = new BindableInt(2)
         {
             MinValue = 0,
             MaxValue = 10
         };
 
+        public override string IconTooltip => $"{Name}{(Retries.IsDefault ? "" : $" ({Retries.Value} lives)")}";
+
         private int retries;
 
         private BindableNumber<double> health;
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 7c1f4b8e12..14133bddcd 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModDoubleTime)).ToArray();
 
-        [SettingSource("Speed decrease", "The actual decrease to apply", "{0}x")]
+        [SettingSource("Speed decrease", "The actual decrease to apply")]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble
         {
             MinValue = 0.5,
@@ -30,5 +30,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 0.75,
             Precision = 0.01,
         };
+
+        public override string IconTooltip => $"{Name}{(SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)")}";
     }
 }

From cda1efef0bde4d9ee692cb8d7747aea63b502e58 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 16:34:36 -0400
Subject: [PATCH 01629/10326] move overridability to SettingDescription method

---
 .../Mods/CatchModDifficultyAdjust.cs          | 20 +++++++++++++++----
 .../Mods/OsuModDifficultyAdjust.cs            | 20 +++++++++++++++----
 osu.Game/Rulesets/Mods/Mod.cs                 | 18 ++++++++++++++++-
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs | 16 +++++++++++++--
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       |  2 +-
 osu.Game/Rulesets/Mods/ModEasy.cs             |  2 +-
 osu.Game/Rulesets/Mods/ModHalfTime.cs         |  2 +-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  2 +-
 8 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index 661c59332f..ee05dd1560 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.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.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -30,10 +31,21 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = 5,
         };
 
-        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}, ")}" +
-                                       $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}, ")}" +
-                                       $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}, ")}" +
-                                       $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
+        public override string SettingDescription
+        {
+            get
+            {
+                string circleSize = CircleSize.IsDefault ? "" : $"CS {CircleSize.Value.ToString()}";
+                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}";
+                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value.ToString()}";
+                string approachRate = ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value.ToString()}";
+
+                string[] settings = new string[] { circleSize, drainRate, overallDifficulty, approachRate };
+                // filter out empty strings so we don't have orphaned commas
+                settings = Array.FindAll(settings, s => !string.IsNullOrEmpty(s));
+                return string.Join(", ", settings);
+            }
+        }
 
         protected override void TransferSettings(BeatmapDifficulty difficulty)
         {
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 477028dbbe..520e5a6726 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.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.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -30,10 +31,21 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = 5,
         };
 
-        public override string IconTooltip => ($"{Name} ({(CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}, ")}" +
-                                       $"{(DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}, ")}" +
-                                       $"{(OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}, ")}" +
-                                       $"{(ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}")}").TrimEnd(new char[] { ',', ' ' }) + ")";
+        public override string SettingDescription
+        {
+            get
+            {
+                string circleSize = CircleSize.IsDefault ? "" : $"CS {CircleSize.Value.ToString()}";
+                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}";
+                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value.ToString()}";
+                string approachRate = ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value.ToString()}";
+
+                string[] settings = new string[] { circleSize, drainRate, overallDifficulty, approachRate };
+                // filter out empty strings so we don't have orphaned commas
+                settings = Array.FindAll(settings, s => !string.IsNullOrEmpty(s));
+                return string.Join(", ", settings);
+            }
+        }
 
         protected override void TransferSettings(BeatmapDifficulty difficulty)
         {
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b70ddc6d46..231b95f974 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -51,7 +51,23 @@ namespace osu.Game.Rulesets.Mods
         /// are displayed in the tooltip.
         /// </remarks>
         [JsonIgnore]
-        public virtual string IconTooltip => Name;
+        public string IconTooltip
+        {
+            get
+            {
+                string settingDescription = string.IsNullOrEmpty(SettingDescription) ? "" : $" ({SettingDescription})";
+                return $"{Name}{settingDescription}";
+            }
+        }
+
+        /// <summary>
+        /// The description of editable settings of a mod to use in the <see cref="IconTooltip"/>.
+        /// </summary>
+        /// <remarks>
+        /// Parentheses are added to the tooltip, surrounding the value of this property. If this property is <c>string.Empty</c>,
+        /// the tooltip will not have parentheses.
+        /// </remarks>
+        public virtual string SettingDescription => string.Empty;
 
         /// <summary>
         /// The score multiplier of this mod.
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 4072e6a6af..a5024d6988 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 System.Linq;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -52,8 +53,19 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
-        public override string IconTooltip => $"{Name} ({(DrainRate.IsDefault ? $"HP {DrainRate.Value.ToString()}, " : "")}" +
-                                              $"{(OverallDifficulty.IsDefault ? $"OD {OverallDifficulty.Value.ToString()}, " : "")})";
+        public override string SettingDescription
+        {
+            get
+            {
+                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}";
+                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value.ToString()}";
+
+                string[] settings = new string[] { drainRate, overallDifficulty };
+                // filter out empty strings so we don't have orphaned commas
+                settings = Array.FindAll(settings, s => !string.IsNullOrEmpty(s));
+                return string.Join(", ", settings);
+            }
+        }
 
         private BeatmapDifficulty difficulty;
 
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 4f7d82418d..1730c98c7f 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override string IconTooltip => $"{Name}{(SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)")}";
+        public override string SettingDescription => SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index 2ec4e9610b..4433a28a95 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mods
             MaxValue = 10
         };
 
-        public override string IconTooltip => $"{Name}{(Retries.IsDefault ? "" : $" ({Retries.Value} lives)")}";
+        public override string SettingDescription => Retries.IsDefault ? "" : $" ({Retries.Value} lives)";
 
         private int retries;
 
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 14133bddcd..5f99748a87 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override string IconTooltip => $"{Name}{(SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)")}";
+        public override string SettingDescription => SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 9cb97dfc35..7b4c1370ac 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The final speed to ramp to")]
         public abstract BindableNumber<double> FinalRate { get; }
 
-        public override string IconTooltip => $"{Name} ({InitialRate.Value}x to {FinalRate.Value}x)";
+        public override string SettingDescription => $"{InitialRate.Value} to {FinalRate.Value}";
 
         private double finalRateTime;
         private double beginRampTime;

From 6a63ba1bb826235cdca903ccdc855188d4e3d584 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 16:42:35 -0400
Subject: [PATCH 01630/10326] use humanizer for ModEasy lives setting

---
 osu.Game/Rulesets/Mods/ModEasy.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index 4433a28a95..a1dd6c088d 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Humanizer;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
@@ -28,7 +29,7 @@ namespace osu.Game.Rulesets.Mods
             MaxValue = 10
         };
 
-        public override string SettingDescription => Retries.IsDefault ? "" : $" ({Retries.Value} lives)";
+        public override string SettingDescription => Retries.IsDefault ? "" : $"{"lives".ToQuantity(Retries.Value)}";
 
         private int retries;
 

From 55568ee6a5cae8ce8494eae518f8fc14562f64bf Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 16:44:38 -0400
Subject: [PATCH 01631/10326] remove extra parentheses

---
 osu.Game/Rulesets/Mods/ModDoubleTime.cs | 2 +-
 osu.Game/Rulesets/Mods/ModHalfTime.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 1730c98c7f..05a8dbfa56 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override string SettingDescription => SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)";
+        public override string SettingDescription => SpeedChange.IsDefault ? "" : $"{SpeedChange.Value}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 5f99748a87..5252ce8d89 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override string SettingDescription => SpeedChange.IsDefault ? "" : $" ({SpeedChange.Value}x)";
+        public override string SettingDescription => SpeedChange.IsDefault ? "" : $"{SpeedChange.Value}x";
     }
 }

From e84b40f8ed86507a16a162d5b1ce6ee1e66821ff Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 16:53:40 -0400
Subject: [PATCH 01632/10326] remove unnecessary ToString calls

---
 osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs | 8 ++++----
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index ee05dd1560..3ebe8c6f6f 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -35,10 +35,10 @@ namespace osu.Game.Rulesets.Catch.Mods
         {
             get
             {
-                string circleSize = CircleSize.IsDefault ? "" : $"CS {CircleSize.Value.ToString()}";
-                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}";
-                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value.ToString()}";
-                string approachRate = ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value.ToString()}";
+                string circleSize = CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}";
+                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}";
+                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}";
+                string approachRate = ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}";
 
                 string[] settings = new string[] { circleSize, drainRate, overallDifficulty, approachRate };
                 // filter out empty strings so we don't have orphaned commas
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 520e5a6726..d63239755b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -35,10 +35,10 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             get
             {
-                string circleSize = CircleSize.IsDefault ? "" : $"CS {CircleSize.Value.ToString()}";
-                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}";
-                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value.ToString()}";
-                string approachRate = ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value.ToString()}";
+                string circleSize = CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}";
+                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}";
+                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}";
+                string approachRate = ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}";
 
                 string[] settings = new string[] { circleSize, drainRate, overallDifficulty, approachRate };
                 // filter out empty strings so we don't have orphaned commas

From ac202ba7ea963d43b2e5a7054dbfd285edf2a48b Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 16:57:37 -0400
Subject: [PATCH 01633/10326] remove unused using directive

---
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index a5024d6988..f50c2cf001 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 System.Linq;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -60,7 +59,7 @@ namespace osu.Game.Rulesets.Mods
                 string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}";
                 string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value.ToString()}";
 
-                string[] settings = new string[] { drainRate, overallDifficulty };
+                string[] settings = { drainRate, overallDifficulty };
                 // filter out empty strings so we don't have orphaned commas
                 settings = Array.FindAll(settings, s => !string.IsNullOrEmpty(s));
                 return string.Join(", ", settings);

From a440d156205ea6503cfed552bb782dad9e6cba41 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 16:58:02 -0400
Subject: [PATCH 01634/10326] simplify array initializationstatement

---
 osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index 3ebe8c6f6f..6d0025b236 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Catch.Mods
                 string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}";
                 string approachRate = ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}";
 
-                string[] settings = new string[] { circleSize, drainRate, overallDifficulty, approachRate };
+                string[] settings = { circleSize, drainRate, overallDifficulty, approachRate };
                 // filter out empty strings so we don't have orphaned commas
                 settings = Array.FindAll(settings, s => !string.IsNullOrEmpty(s));
                 return string.Join(", ", settings);
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index d63239755b..307fe3da4a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}";
                 string approachRate = ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}";
 
-                string[] settings = new string[] { circleSize, drainRate, overallDifficulty, approachRate };
+                string[] settings = { circleSize, drainRate, overallDifficulty, approachRate };
                 // filter out empty strings so we don't have orphaned commas
                 settings = Array.FindAll(settings, s => !string.IsNullOrEmpty(s));
                 return string.Join(", ", settings);

From eab705a9b690e9bdac340edae616895aef3465f1 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 17:00:36 -0400
Subject: [PATCH 01635/10326] remove another ToString statement

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

diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index f50c2cf001..4a8313b1f1 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Mods
             get
             {
                 string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}";
-                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value.ToString()}";
+                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}";
 
                 string[] settings = { drainRate, overallDifficulty };
                 // filter out empty strings so we don't have orphaned commas

From 4907fb8fd1e966c1940936b74712c9bf672b3184 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Fri, 20 Mar 2020 17:04:22 -0400
Subject: [PATCH 01636/10326] remove another ToString statement

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

diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 4a8313b1f1..f8341e6cdb 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mods
         {
             get
             {
-                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value.ToString()}";
+                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}";
                 string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}";
 
                 string[] settings = { drainRate, overallDifficulty };

From 299ea236121d0fd47fc56aa2508dcac3290bc843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 21 Mar 2020 14:26:49 +0100
Subject: [PATCH 01637/10326] Clean up xmldocs

---
 .../Overlays/Profile/Sections/Historical/UserHistoryGraph.cs    | 2 +-
 osu.Game/Overlays/Profile/UserGraph.cs                          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index 5f6f6cc3e4..5009c13512 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         }
 
         /// <summary>
-        /// Text describing the value being plotted on the graph, which will be displayed as a prefix to the value in the <see cref="HistoryGraphTooltip"/>
+        /// Text describing the value being plotted on the graph, which will be displayed as a prefix to the value in the <see cref="HistoryGraphTooltip"/>.
         /// </summary>
         public string TooltipCounterName { get; set; } = @"Plays";
 
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index aee464dbf9..651e9ba8b3 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -106,7 +106,6 @@ namespace osu.Game.Overlays.Profile
         /// Function used to convert <see cref="Data"/> point to it's Y-axis position on the graph.
         /// </summary>
         /// <param name="value">Value to convert.</param>
-        /// <returns></returns>
         protected abstract float GetDataPointHeight(TValue value);
 
         protected virtual void ShowGraph() => graph.FadeIn(FADE_DURATION, Easing.Out);

From ce4761747639e4830bdc415af6513a91bd1f839d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 21 Mar 2020 14:28:23 +0100
Subject: [PATCH 01638/10326] Trim unnecessary raw string prefixes

---
 osu.Game/Overlays/Profile/Header/Components/RankGraph.cs        | 2 +-
 .../Overlays/Profile/Sections/Historical/UserHistoryGraph.cs    | 2 +-
 2 files 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 73ae91e345..7d094b3be1 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         private class RankGraphTooltip : UserGraphTooltip
         {
             public RankGraphTooltip()
-                : base(@"Global Ranking")
+                : base("Global Ranking")
             {
             }
 
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index 5009c13512..b690c2051c 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         /// <summary>
         /// Text describing the value being plotted on the graph, which will be displayed as a prefix to the value in the <see cref="HistoryGraphTooltip"/>.
         /// </summary>
-        public string TooltipCounterName { get; set; } = @"Plays";
+        public string TooltipCounterName { get; set; } = "Plays";
 
         protected override float GetDataPointHeight(long playCount) => playCount;
 

From d167e0c8b9ca107eef6e1bdffd20ece0562932ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 21 Mar 2020 14:35:04 +0100
Subject: [PATCH 01639/10326] Mark properties as [CanBeNull]

---
 .../Overlays/Profile/Sections/Historical/UserHistoryGraph.cs   | 2 ++
 osu.Game/Overlays/Profile/UserGraph.cs                         | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index b690c2051c..b1e8c8f0ca 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -4,12 +4,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using static osu.Game.Users.User;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
     public class UserHistoryGraph : UserGraph<DateTime, long>
     {
+        [CanBeNull]
         public UserHistoryCount[] Values
         {
             set => Data = value?.Select(v => new KeyValuePair<DateTime, long>(v.Date, v.Count)).ToArray();
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index 651e9ba8b3..5ef42bc3fa 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -79,11 +80,11 @@ namespace osu.Game.Overlays.Profile
         /// <summary>
         /// Set of values which will be used to create a graph.
         /// </summary>
+        [CanBeNull]
         protected KeyValuePair<TKey, TValue>[] Data
         {
             set
             {
-                value ??= Array.Empty<KeyValuePair<TKey, TValue>>();
                 data = value;
                 redrawGraph();
             }

From af7d6d0a4e4f6b62d042c2a4a301dbf1011db3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 21 Mar 2020 14:45:32 +0100
Subject: [PATCH 01640/10326] Invert data length checks for consistency

---
 osu.Game/Overlays/Profile/UserGraph.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index 5ef42bc3fa..95f8e0c923 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -92,15 +92,15 @@ namespace osu.Game.Overlays.Profile
 
         private void redrawGraph()
         {
-            if (!(data?.Length > 1))
+            if (data?.Length > 1)
             {
-                HideGraph();
+                graph.DefaultValueCount = data.Length;
+                graph.Values = data.Select(pair => GetDataPointHeight(pair.Value)).ToArray();
+                ShowGraph();
                 return;
             }
 
-            graph.DefaultValueCount = data.Length;
-            graph.Values = data.Select(pair => GetDataPointHeight(pair.Value)).ToArray();
-            ShowGraph();
+            HideGraph();
         }
 
         /// <summary>
@@ -120,11 +120,13 @@ namespace osu.Game.Overlays.Profile
         {
             get
             {
-                if (!(data?.Length > 1))
-                    return null;
+                if (data?.Length > 1)
+                {
+                    var (key, value) = data[dataIndex];
+                    return GetTooltipContent(key, value);
+                }
 
-                var (key, value) = data[dataIndex];
-                return GetTooltipContent(key, value);
+                return null;
             }
         }
 

From 29009c85c01ad1729d54f25137e8ae6eb18b6d5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 22 Mar 2020 00:32:53 +0900
Subject: [PATCH 01641/10326] 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/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 6c6f9a0e79..739f99d72d 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -751,7 +751,7 @@ namespace osu.Game.Screens.Select
 
             public CarouselRoot(BeatmapCarousel carousel)
             {
-                // root should always remaing selected. if not, PerformSelection will not be called.
+                // root should always remain selected. if not, PerformSelection will not be called.
                 State.Value = CarouselItemState.Selected;
                 State.ValueChanged += state => State.Value = CarouselItemState.Selected;
 

From d8041a0dcbfc5929c3244b686c959fa78a25857a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 22 Mar 2020 02:16:28 +0900
Subject: [PATCH 01642/10326] Increase sample concurrency to better match
 stable

---
 osu.Game/OsuGameBase.cs                 | 4 ++++
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 1 +
 osu.Game/Skinning/LegacySkin.cs         | 6 +++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 3c7ab27651..5487bd9320 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -47,6 +47,8 @@ namespace osu.Game
     {
         public const string CLIENT_STREAM_NAME = "lazer";
 
+        public const int SAMPLE_CONCURRENCY = 6;
+
         protected OsuConfigManager LocalConfig;
 
         protected BeatmapManager BeatmapManager;
@@ -153,6 +155,8 @@ namespace osu.Game
             AddFont(Resources, @"Fonts/Venera-Bold");
             AddFont(Resources, @"Fonts/Venera-Black");
 
+            Audio.Samples.PlaybackConcurrency = SAMPLE_CONCURRENCY;
+
             runMigrations();
 
             dependencies.Cache(SkinManager = new SkinManager(Storage, contextFactory, Host, Audio, new NamespacedResourceStore<byte[]>(Resources, "Skins/Legacy")));
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index e624fb80fa..d0a2722f58 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -158,6 +158,7 @@ namespace osu.Game.Rulesets.UI
                 dependencies.Cache(textureStore);
 
                 localSampleStore = dependencies.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, "Samples"));
+                localSampleStore.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
                 dependencies.CacheAs<ISampleStore>(new FallbackSampleStore(localSampleStore, dependencies.Get<ISampleStore>()));
             }
 
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 29bcd2e210..c71a321e74 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -52,7 +52,11 @@ namespace osu.Game.Skinning
 
             if (storage != null)
             {
-                Samples = audioManager?.GetSampleStore(storage);
+                var samples = audioManager?.GetSampleStore(storage);
+                if (samples != null)
+                    samples.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
+
+                Samples = samples;
                 Textures = new TextureStore(new TextureLoaderStore(storage));
 
                 (storage as ResourceStore<byte[]>)?.AddExtension("ogg");

From d241f7c55fece40263c582e0dd6f89ceb3a60d2e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Mar 2020 20:32:55 +0300
Subject: [PATCH 01643/10326] Better variable naming

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

diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
index 55a5081435..c2f0917e29 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
@@ -171,9 +171,9 @@ namespace osu.Game.Overlays.Dashboard.Friends
             if (itemsPlaceholder.Any())
                 loading.Show();
 
-            var groupedUsers = onlineStatusControl.Current.Value?.Users ?? new List<User>();
+            var usersInCurrentGroup = onlineStatusControl.Current.Value?.Users ?? new List<User>();
 
-            var sortedUsers = sortUsers(groupedUsers);
+            var sortedUsers = sortUsers(usersInCurrentGroup);
 
             LoadComponentAsync(createTable(sortedUsers), addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
         }

From 2b0c267cb902a8c9667a7e6afba57fb351fb1deb Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Mar 2020 20:37:21 +0300
Subject: [PATCH 01644/10326] Expose Fetch method

---
 osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs | 5 +----
 osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs   | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
index e6b2a41c1c..1d8238dd40 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
@@ -10,7 +10,6 @@ using osu.Game.Users;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
 using NUnit.Framework;
-using osu.Game.Online.API;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -28,9 +27,6 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
         private FriendsLayout layout;
 
         [SetUp]
@@ -52,6 +48,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestOnline()
         {
+            AddStep("Fetch online", () => layout?.Fetch());
         }
 
         private List<User> getUsers() => new List<User>
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
index c2f0917e29..94c8230d8e 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
@@ -25,8 +25,6 @@ namespace osu.Game.Overlays.Dashboard.Friends
             get => users;
             set
             {
-                request?.Cancel();
-
                 users = value;
 
                 onlineStatusControl.Populate(value);
@@ -152,7 +150,10 @@ namespace osu.Game.Overlays.Dashboard.Friends
             onlineStatusControl.Current.BindValueChanged(_ => recreatePanels());
             userListToolbar.DisplayStyle.BindValueChanged(_ => recreatePanels());
             userListToolbar.SortCriteria.BindValueChanged(_ => recreatePanels());
+        }
 
+        public void Fetch()
+        {
             if (!api.IsLoggedIn)
                 return;
 

From a38c912c6d4060a85f5172adf1bcc89e0ed9dc0e Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Sat, 21 Mar 2020 12:15:20 -0700
Subject: [PATCH 01645/10326] Test stopping behavior

---
 .../Visual/Editor/TestSceneEditorClock.cs     | 51 +++++++++++++++++++
 .../Visual/Editor/TimelineTestScene.cs        | 16 +++---
 2 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs
new file mode 100644
index 0000000000..0b128a974c
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs
@@ -0,0 +1,51 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Screens.Edit.Components;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Editor
+{
+    [TestFixture]
+    public class TestSceneEditorClock : EditorClockTestScene
+    {
+        public TestSceneEditorClock()
+        {
+            Add(new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new TimeInfoContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(200, 100)
+                    },
+                    new PlaybackControl
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(200, 100)
+                    }
+                }
+            });
+        }
+
+        [Test]
+        public void TestStopAtTrackEnd()
+        {
+            AddStep("Reset clock", () => Clock.Seek(0));
+            AddStep("Start clock", Clock.Start);
+            AddAssert("Clock running", () => Clock.IsRunning);
+            AddStep("Seek near end", () => Clock.Seek(Clock.TrackLength - 250));
+            AddUntilStep("Clock stops", () => !Clock.IsRunning);
+            AddAssert("Clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
+            AddStep("Start clock again", Clock.Start);
+            AddAssert("Clock looped", () => Clock.IsRunning && Clock.CurrentTime < Clock.TrackLength);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
index 7081eb3af5..83a0455b46 100644
--- a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
@@ -113,7 +113,6 @@ namespace osu.Game.Tests.Visual.Editor
         private class StartStopButton : OsuButton
         {
             private IAdjustableClock adjustableClock;
-            private bool started;
 
             public StartStopButton()
             {
@@ -132,18 +131,17 @@ namespace osu.Game.Tests.Visual.Editor
 
             private void onClick()
             {
-                if (started)
-                {
+                if (adjustableClock.IsRunning)
                     adjustableClock.Stop();
-                    Text = "Start";
-                }
                 else
-                {
                     adjustableClock.Start();
-                    Text = "Stop";
-                }
+            }
 
-                started = !started;
+            protected override void Update()
+            {
+                base.Update();
+
+                Text = adjustableClock.IsRunning ? "Stop" : "Start";
             }
         }
     }

From 19b6e496efbc0dddc8abb4af66a002e98a130512 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 22 Mar 2020 04:17:04 +0900
Subject: [PATCH 01646/10326] Fix (very) long spinners degrading in performance
 due to high transform count

---
 osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index e3dd2b1b4f..3de30d51d9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     .FadeTo(tracking_alpha, 250, Easing.OutQuint);
             }
 
-            this.RotateTo(currentRotation / 2, validAndTracking ? 500 : 1500, Easing.OutExpo);
+            Rotation = (float)Interpolation.Lerp(Rotation, currentRotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
         }
     }
 }

From 9482fc5b9990af7a53611539332e81cc1d5d79d5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Mar 2020 20:13:54 +0300
Subject: [PATCH 01647/10326] Refactor grouping logic

---
 .../Dashboard/Friends/FriendsBundle.cs        | 11 +++-------
 .../Dashboard/Friends/FriendsLayout.cs        | 20 ++++++++++++++++---
 .../Friends/FriendsOnlineStatusControl.cs     |  9 ++++++---
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
index 772d9c67a0..d5fad1ffd3 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
@@ -1,23 +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.Collections.Generic;
-using osu.Game.Users;
-
 namespace osu.Game.Overlays.Dashboard.Friends
 {
     public class FriendsBundle
     {
         public FriendsOnlineStatus Status { get; }
 
-        public int Count => Users.Count;
+        public int Count { get; }
 
-        public List<User> Users { get; }
-
-        public FriendsBundle(FriendsOnlineStatus status, List<User> users)
+        public FriendsBundle(FriendsOnlineStatus status, int count)
         {
             Status = status;
-            Users = users;
+            Count = count;
         }
     }
 
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
index 94c8230d8e..3514bf7ff7 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
@@ -172,13 +172,27 @@ namespace osu.Game.Overlays.Dashboard.Friends
             if (itemsPlaceholder.Any())
                 loading.Show();
 
-            var usersInCurrentGroup = onlineStatusControl.Current.Value?.Users ?? new List<User>();
-
-            var sortedUsers = sortUsers(usersInCurrentGroup);
+            var sortedUsers = sortUsers(getUsersInCurrentGroup());
 
             LoadComponentAsync(createTable(sortedUsers), addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
+        private List<User> getUsersInCurrentGroup()
+        {
+            switch (onlineStatusControl.Current.Value?.Status)
+            {
+                default:
+                case FriendsOnlineStatus.All:
+                    return users;
+
+                case FriendsOnlineStatus.Offline:
+                    return users.Where(u => !u.IsOnline).ToList();
+
+                case FriendsOnlineStatus.Online:
+                    return users.Where(u => u.IsOnline).ToList();
+            }
+        }
+
         private void addContentToPlaceholder(Drawable content)
         {
             loading.Hide();
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
index 88035e0a34..c54e9e2a06 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
@@ -15,9 +15,12 @@ namespace osu.Game.Overlays.Dashboard.Friends
         {
             Clear();
 
-            AddItem(new FriendsBundle(FriendsOnlineStatus.All, users));
-            AddItem(new FriendsBundle(FriendsOnlineStatus.Online, users.Where(u => u.IsOnline).ToList()));
-            AddItem(new FriendsBundle(FriendsOnlineStatus.Offline, users.Where(u => !u.IsOnline).ToList()));
+            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();
         }

From 97076325c46f8f734da5fa50cceaab7ea3747cf0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 23 Mar 2020 01:45:13 +0300
Subject: [PATCH 01648/10326] Fix test scenes using framework-testing-specifc
 test scene

---
 .../TestSceneHitCircleArea.cs                 | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
index 67b6dac787..394d959d0a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
@@ -4,13 +4,13 @@
 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 osu.Game.Tests.Visual;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -22,30 +22,25 @@ namespace osu.Game.Rulesets.Osu.Tests
         private DrawableHitCircle.HitReceptor hitAreaReceptor => drawableHitCircle.HitArea;
 
         [SetUp]
-        public new void SetUp()
+        public void SetUp() => Schedule(() =>
         {
-            base.SetUp();
-
-            Schedule(() =>
+            hitCircle = new HitCircle
             {
-                hitCircle = new HitCircle
-                {
-                    Position = new Vector2(100, 100),
-                    StartTime = Time.Current + 500
-                };
+                Position = new Vector2(100, 100),
+                StartTime = Time.Current + 500
+            };
 
-                hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-                Child = new SkinProvidingContainer(new DefaultSkin())
+            Child = new SkinProvidingContainer(new DefaultSkin())
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = drawableHitCircle = new DrawableHitCircle(hitCircle)
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = drawableHitCircle = new DrawableHitCircle(hitCircle)
-                    {
-                        Size = new Vector2(100)
-                    }
-                };
-            });
-        }
+                    Size = new Vector2(100)
+                }
+            };
+        });
 
         [Test]
         public void TestCircleHitCentre()

From 63e9b2a299cf6496ec535315a4787ad9327cb044 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Sun, 22 Mar 2020 18:49:45 -0400
Subject: [PATCH 01649/10326] use string.Empty, use base SettingDescription for
 [Osu/Catch]ModDifficultyAdjust

---
 .../Mods/CatchModDifficultyAdjust.cs          | 17 ++++++------
 .../Mods/OsuModDifficultyAdjust.cs            | 17 ++++++------
 osu.Game/Rulesets/Mods/Mod.cs                 | 26 ++++++++++++++++++-
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs | 14 +++++-----
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       |  2 +-
 osu.Game/Rulesets/Mods/ModEasy.cs             |  2 +-
 osu.Game/Rulesets/Mods/ModHalfTime.cs         |  2 +-
 7 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index 6d0025b236..a60b35739e 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.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.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -35,15 +36,15 @@ namespace osu.Game.Rulesets.Catch.Mods
         {
             get
             {
-                string circleSize = CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}";
-                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}";
-                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}";
-                string approachRate = ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}";
+                string circleSize = CircleSize.IsDefault ? string.Empty : $"CS {CircleSize.Value}";
+                string approachRate = ApproachRate.IsDefault ? string.Empty : $"AR {ApproachRate.Value}";
 
-                string[] settings = { circleSize, drainRate, overallDifficulty, approachRate };
-                // filter out empty strings so we don't have orphaned commas
-                settings = Array.FindAll(settings, s => !string.IsNullOrEmpty(s));
-                return string.Join(", ", settings);
+                return string.Join(", ", new[]
+                {
+                    circleSize,
+                    base.SettingDescription,
+                    approachRate
+                }.Where(s => !string.IsNullOrEmpty(s)));
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 307fe3da4a..18492828f0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.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.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -35,15 +36,15 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             get
             {
-                string circleSize = CircleSize.IsDefault ? "" : $"CS {CircleSize.Value}";
-                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}";
-                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}";
-                string approachRate = ApproachRate.IsDefault ? "" : $"AR {ApproachRate.Value}";
+                string circleSize = CircleSize.IsDefault ? string.Empty : $"CS {CircleSize.Value}";
+                string approachRate = ApproachRate.IsDefault ? string.Empty : $"AR {ApproachRate.Value}";
 
-                string[] settings = { circleSize, drainRate, overallDifficulty, approachRate };
-                // filter out empty strings so we don't have orphaned commas
-                settings = Array.FindAll(settings, s => !string.IsNullOrEmpty(s));
-                return string.Join(", ", settings);
+                return string.Join(", ", new[]
+                {
+                    circleSize,
+                    base.SettingDescription,
+                    approachRate
+                }.Where(s => !string.IsNullOrEmpty(s)));
             }
         }
 
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 231b95f974..95e8ff86eb 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -2,8 +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.Reflection;
 using Newtonsoft.Json;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 using osu.Game.IO.Serialization;
 using osu.Game.Rulesets.UI;
 
@@ -67,7 +72,26 @@ namespace osu.Game.Rulesets.Mods
         /// Parentheses are added to the tooltip, surrounding the value of this property. If this property is <c>string.Empty</c>,
         /// the tooltip will not have parentheses.
         /// </remarks>
-        public virtual string SettingDescription => string.Empty;
+        public virtual string SettingDescription
+        {
+            get
+            {
+                var tooltipTexts = new List<string>();
+
+                foreach ((SettingSourceAttribute attr, PropertyInfo property) in this.GetOrderedSettingsSourceProperties())
+                {
+                    object bindableObj = property.GetValue(this);
+                    bool? settingIsDefault = (bindableObj as IHasDefaultValue)?.IsDefault;
+                    string tooltipText = settingIsDefault == true ? string.Empty : attr.Label + " " + bindableObj.ToString();
+                    tooltipTexts.Add(tooltipText);
+                }
+
+                // filter out empty strings so we don't have orphaned commas
+                //tooltipTexts = tooltipTexts.Where(s => !string.IsNullOrEmpty(s)).ToList();
+                string joinedTooltipText = string.Join(", ", tooltipTexts);
+                return $"{Name}{joinedTooltipText}";
+            }
+        }
 
         /// <summary>
         /// The score multiplier of this mod.
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index f8341e6cdb..1baf9f7057 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 System.Linq;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -56,13 +57,14 @@ namespace osu.Game.Rulesets.Mods
         {
             get
             {
-                string drainRate = DrainRate.IsDefault ? "" : $"HP {DrainRate.Value}";
-                string overallDifficulty = OverallDifficulty.IsDefault ? "" : $"OD {OverallDifficulty.Value}";
+                string drainRate = DrainRate.IsDefault ? string.Empty : $"HP {DrainRate.Value}";
+                string overallDifficulty = OverallDifficulty.IsDefault ? string.Empty : $"OD {OverallDifficulty.Value}";
 
-                string[] settings = { drainRate, overallDifficulty };
-                // filter out empty strings so we don't have orphaned commas
-                settings = Array.FindAll(settings, s => !string.IsNullOrEmpty(s));
-                return string.Join(", ", settings);
+                return string.Join(", ", new[]
+                {
+                    drainRate,
+                    overallDifficulty
+                }.Where(s => !string.IsNullOrEmpty(s)));
             }
         }
 
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 05a8dbfa56..7d86190134 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override string SettingDescription => SpeedChange.IsDefault ? "" : $"{SpeedChange.Value}x";
+        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index a1dd6c088d..c1c4124b98 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mods
             MaxValue = 10
         };
 
-        public override string SettingDescription => Retries.IsDefault ? "" : $"{"lives".ToQuantity(Retries.Value)}";
+        public override string SettingDescription => Retries.IsDefault ? string.Empty : $"{"lives".ToQuantity(Retries.Value)}";
 
         private int retries;
 
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 5252ce8d89..ec215369a3 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override string SettingDescription => SpeedChange.IsDefault ? "" : $"{SpeedChange.Value}x";
+        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value}x";
     }
 }

From 0b728f483fb1d2934a629387fe936ff9fba84d8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 10:01:33 +0900
Subject: [PATCH 01650/10326] Rename base test class to help avoid incorrect
 reference

---
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs         | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs   | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs         | 2 +-
 .../Visual/Background/TestSceneUserDimBackgrounds.cs          | 2 +-
 osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs      | 2 +-
 osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs   | 2 +-
 .../Visual/Editor/TestSceneZoomableScrollContainer.cs         | 2 +-
 .../Visual/Gameplay/TestSceneGameplayMenuOverlay.cs           | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs         | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneHoldForMenuButton.cs  | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs         | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs       | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs        | 2 +-
 .../Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs       | 2 +-
 osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs          | 2 +-
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs          | 2 +-
 osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs | 2 +-
 osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs       | 2 +-
 .../Visual/UserInterface/TestSceneDeleteLocalScore.cs         | 2 +-
 .../Visual/UserInterface/TestSceneOsuHoverContainer.cs        | 2 +-
 .../Visual/UserInterface/TestSceneStatefulMenuItem.cs         | 2 +-
 osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs  | 2 +-
 ...tManagerTestScene.cs => OsuManualInputManagerTestScene.cs} | 4 ++--
 osu.Game/Tests/Visual/ScreenTestScene.cs                      | 2 +-
 osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs          | 2 +-
 25 files changed, 26 insertions(+), 26 deletions(-)
 rename osu.Game/Tests/Visual/{ManualInputManagerTestScene.cs => OsuManualInputManagerTestScene.cs} (97%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
index 394d959d0a..0649989dc0 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestSceneHitCircleArea : ManualInputManagerTestScene
+    public class TestSceneHitCircleArea : OsuManualInputManagerTestScene
     {
         private HitCircle hitCircle;
         private DrawableHitCircle drawableHitCircle;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
index 4af4d5f966..0ae49790cd 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
@@ -23,7 +23,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestSceneOsuDistanceSnapGrid : ManualInputManagerTestScene
+    public class TestSceneOsuDistanceSnapGrid : OsuManualInputManagerTestScene
     {
         private const double beat_length = 100;
         private static readonly Vector2 grid_position = new Vector2(512, 384);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
index 8e73d6152f..f4809b0c9b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
@@ -12,7 +12,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestSceneResumeOverlay : ManualInputManagerTestScene
+    public class TestSceneResumeOverlay : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index b51555db3e..c906f21e22 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -37,7 +37,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Background
 {
     [TestFixture]
-    public class TestSceneUserDimBackgrounds : ManualInputManagerTestScene
+    public class TestSceneUserDimBackgrounds : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index 55aaeed8bf..4d64c7d35d 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -12,7 +12,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Components
 {
     [TestFixture]
-    public class TestSceneIdleTracker : ManualInputManagerTestScene
+    public class TestSceneIdleTracker : OsuManualInputManagerTestScene
     {
         private IdleTrackingBox box1;
         private IdleTrackingBox box2;
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
index 746b2c99aa..fd7a5980f3 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
@@ -16,7 +16,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editor
 {
-    public class TestSceneBeatDivisorControl : ManualInputManagerTestScene
+    public class TestSceneBeatDivisorControl : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(BindableBeatDivisor) };
         private BeatDivisorControl beatDivisorControl;
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs b/osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs
index fd248abbc9..19d19c2759 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Editor
 {
-    public class TestSceneZoomableScrollContainer : ManualInputManagerTestScene
+    public class TestSceneZoomableScrollContainer : OsuManualInputManagerTestScene
     {
         private ZoomableScrollContainer scrollContainer;
         private Drawable innerBox;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
index c1635ffc83..ea3e0c2293 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
@@ -18,7 +18,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("player pause/fail screens")]
-    public class TestSceneGameplayMenuOverlay : ManualInputManagerTestScene
+    public class TestSceneGameplayMenuOverlay : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(FailOverlay), typeof(PauseOverlay) };
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index fc03dc6ed3..c192a7b0e0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -15,7 +15,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneHUDOverlay : ManualInputManagerTestScene
+    public class TestSceneHUDOverlay : OsuManualInputManagerTestScene
     {
         private HUDOverlay hudOverlay;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHoldForMenuButton.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHoldForMenuButton.cs
index 0c5ead10cf..235842acc9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHoldForMenuButton.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHoldForMenuButton.cs
@@ -13,7 +13,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("'Hold to Quit' UI element")]
-    public class TestSceneHoldForMenuButton : ManualInputManagerTestScene
+    public class TestSceneHoldForMenuButton : OsuManualInputManagerTestScene
     {
         private bool exitAction;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 227ada70fe..593dcd245c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -13,7 +13,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestSceneKeyCounter : ManualInputManagerTestScene
+    public class TestSceneKeyCounter : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 175f909a5a..4c73065087 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -29,7 +29,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestScenePlayerLoader : ManualInputManagerTestScene
+    public class TestScenePlayerLoader : OsuManualInputManagerTestScene
     {
         private TestPlayerLoader loader;
         private TestPlayerLoaderContainer container;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index 4c5c18f38a..6a0f86fe53 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -14,7 +14,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestSceneSkipOverlay : ManualInputManagerTestScene
+    public class TestSceneSkipOverlay : OsuManualInputManagerTestScene
     {
         private SkipOverlay skip;
         private int requestCount;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 9fbe8f7ffe..713ba13439 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -20,7 +20,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneDrawableRoomPlaylist : ManualInputManagerTestScene
+    public class TestSceneDrawableRoomPlaylist : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 0d64eb651f..31afce86ae 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Navigation
     /// <summary>
     /// A scene which tests full game flow.
     /// </summary>
-    public abstract class OsuGameTestScene : ManualInputManagerTestScene
+    public abstract class OsuGameTestScene : OsuManualInputManagerTestScene
     {
         private GameHost host;
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 6665452d94..14924dda21 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -22,7 +22,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneChatOverlay : ManualInputManagerTestScene
+    public class TestSceneChatOverlay : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index 7b0b644dab..cef04a4c18 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -15,7 +15,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneCommentEditor : ManualInputManagerTestScene
+    public class TestSceneCommentEditor : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs
index d1dde4664a..5b74852259 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestSceneCursors : ManualInputManagerTestScene
+    public class TestSceneCursors : OsuManualInputManagerTestScene
     {
         private readonly MenuCursorContainer menuCursorContainer;
         private readonly CustomCursorBox[] cursorBoxes = new CustomCursorBox[6];
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index 1e5e26e4c5..a812b4dc79 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -27,7 +27,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneDeleteLocalScore : ManualInputManagerTestScene
+    public class TestSceneDeleteLocalScore : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuHoverContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuHoverContainer.cs
index dbef7d1686..396bec51b6 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuHoverContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuHoverContainer.cs
@@ -12,7 +12,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestSceneOsuHoverContainer : ManualInputManagerTestScene
+    public class TestSceneOsuHoverContainer : OsuManualInputManagerTestScene
     {
         private OsuHoverTestContainer hoverContainer;
         private Box colourContainer;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
index 2ada5b927b..85fea73bf5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
@@ -12,7 +12,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneStatefulMenuItem : ManualInputManagerTestScene
+    public class TestSceneStatefulMenuItem : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
index 4a104b4a41..37fab75aee 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
@@ -9,7 +9,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneSwitchButton : ManualInputManagerTestScene
+    public class TestSceneSwitchButton : OsuManualInputManagerTestScene
     {
         private SwitchButton switchButton;
 
diff --git a/osu.Game/Tests/Visual/ManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
similarity index 97%
rename from osu.Game/Tests/Visual/ManualInputManagerTestScene.cs
rename to osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index a0af07013c..0da3ae7f87 100644
--- a/osu.Game/Tests/Visual/ManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -14,7 +14,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class ManualInputManagerTestScene : OsuTestScene
+    public abstract class OsuManualInputManagerTestScene : OsuTestScene
     {
         protected override Container<Drawable> Content => content;
         private readonly Container content;
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual
         private readonly TriangleButton buttonTest;
         private readonly TriangleButton buttonLocal;
 
-        protected ManualInputManagerTestScene()
+        protected OsuManualInputManagerTestScene()
         {
             base.Content.AddRange(new Drawable[]
             {
diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index d26aacf2bc..33cc00e748 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Tests.Visual
     /// <summary>
     /// A test case which can be used to test a screen (that relies on OnEntering being called to execute startup instructions).
     /// </summary>
-    public abstract class ScreenTestScene : ManualInputManagerTestScene
+    public abstract class ScreenTestScene : OsuManualInputManagerTestScene
     {
         protected readonly OsuScreenStack Stack;
 
diff --git a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
index 6565f98666..1176361679 100644
--- a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Edit;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class SelectionBlueprintTestScene : ManualInputManagerTestScene
+    public abstract class SelectionBlueprintTestScene : OsuManualInputManagerTestScene
     {
         protected override Container<Drawable> Content => content ?? base.Content;
         private readonly Container content;

From 67667b3d22c0f0e389cd0717c1ed717704dfb11c Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Sun, 22 Mar 2020 21:22:46 -0400
Subject: [PATCH 01651/10326] enforce precision for ModDifficultyAdjust and
 derived classes

---
 osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs | 4 ++--
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs     | 4 ++--
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index a60b35739e..6288d498bd 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -36,8 +36,8 @@ namespace osu.Game.Rulesets.Catch.Mods
         {
             get
             {
-                string circleSize = CircleSize.IsDefault ? string.Empty : $"CS {CircleSize.Value}";
-                string approachRate = ApproachRate.IsDefault ? string.Empty : $"AR {ApproachRate.Value}";
+                string circleSize = CircleSize.IsDefault ? string.Empty : $"CS {CircleSize.Value:0.#}";
+                string approachRate = ApproachRate.IsDefault ? string.Empty : $"AR {ApproachRate.Value:0.#}";
 
                 return string.Join(", ", new[]
                 {
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 18492828f0..4830b29c4e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -36,8 +36,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             get
             {
-                string circleSize = CircleSize.IsDefault ? string.Empty : $"CS {CircleSize.Value}";
-                string approachRate = ApproachRate.IsDefault ? string.Empty : $"AR {ApproachRate.Value}";
+                string circleSize = CircleSize.IsDefault ? string.Empty : $"CS {CircleSize.Value:0.#}";
+                string approachRate = ApproachRate.IsDefault ? string.Empty : $"AR {ApproachRate.Value:0.#}";
 
                 return string.Join(", ", new[]
                 {
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 1baf9f7057..06616c7b24 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -57,8 +57,8 @@ namespace osu.Game.Rulesets.Mods
         {
             get
             {
-                string drainRate = DrainRate.IsDefault ? string.Empty : $"HP {DrainRate.Value}";
-                string overallDifficulty = OverallDifficulty.IsDefault ? string.Empty : $"OD {OverallDifficulty.Value}";
+                string drainRate = DrainRate.IsDefault ? string.Empty : $"HP {DrainRate.Value:0.#}";
+                string overallDifficulty = OverallDifficulty.IsDefault ? string.Empty : $"OD {OverallDifficulty.Value:0.#}";
 
                 return string.Join(", ", new[]
                 {

From 754d0ca14d43037c745c9a74a5ce8321bb0f195a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 23 Mar 2020 10:28:17 +0900
Subject: [PATCH 01652/10326] Fix crashes due to ladder re-use

---
 osu.Game.Tournament.Tests/LadderTestScene.cs | 21 ++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament.Tests/LadderTestScene.cs b/osu.Game.Tournament.Tests/LadderTestScene.cs
index 4477ca8338..b962d035ab 100644
--- a/osu.Game.Tournament.Tests/LadderTestScene.cs
+++ b/osu.Game.Tournament.Tests/LadderTestScene.cs
@@ -1,10 +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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 using osu.Game.Tournament.Models;
 using osu.Game.Users;
 
@@ -13,8 +15,20 @@ namespace osu.Game.Tournament.Tests
     [TestFixture]
     public abstract class LadderTestScene : TournamentTestScene
     {
+        [Cached]
+        protected LadderInfo Ladder { get; private set; } = new LadderInfo();
+
         [Resolved]
-        protected LadderInfo Ladder { get; private set; }
+        private RulesetStore rulesetStore { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (Ladder.Ruleset.Value == null)
+                Ladder.Ruleset.Value = rulesetStore.AvailableRulesets.First();
+
+            Ruleset.BindTo(Ladder.Ruleset);
+        }
 
         protected override void LoadComplete()
         {
@@ -22,13 +36,8 @@ namespace osu.Game.Tournament.Tests
 
             TournamentMatch match = CreateSampleMatch();
 
-            Ladder.Rounds.Clear();
             Ladder.Rounds.Add(match.Round.Value);
-
-            Ladder.Matches.Clear();
             Ladder.Matches.Add(match);
-
-            Ladder.Teams.Clear();
             Ladder.Teams.Add(match.Team1.Value);
             Ladder.Teams.Add(match.Team2.Value);
 

From bfd643dd1659179186a5d26982b58bcbfcd3d5e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 10:47:27 +0900
Subject: [PATCH 01653/10326] Rename classes

---
 .../Visual/Online/TestSceneFriendsLayout.cs   | 12 +++++------
 .../TestSceneFriendsOnlineStatusControl.cs    | 14 ++++++-------
 .../{FriendsLayout.cs => FriendDisplay.cs}    | 20 +++++++++----------
 ...ontrol.cs => FriendOnlineStreamControl.cs} | 10 +++++-----
 .../{FriendsBundle.cs => FriendStream.cs}     | 13 +++---------
 .../Friends/FriendsOnlineStatusItem.cs        | 10 +++++-----
 .../Dashboard/Friends/OnlineStatus.cs         | 12 +++++++++++
 7 files changed, 48 insertions(+), 43 deletions(-)
 rename osu.Game/Overlays/Dashboard/Friends/{FriendsLayout.cs => FriendDisplay.cs} (94%)
 rename osu.Game/Overlays/Dashboard/Friends/{FriendsOnlineStatusControl.cs => FriendOnlineStreamControl.cs} (53%)
 rename osu.Game/Overlays/Dashboard/Friends/{FriendsBundle.cs => FriendStream.cs} (57%)
 create mode 100644 osu.Game/Overlays/Dashboard/Friends/OnlineStatus.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
index 1d8238dd40..c0a617fe57 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Tests.Visual.Online
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(FriendsLayout),
-            typeof(FriendsOnlineStatusControl),
+            typeof(FriendDisplay),
+            typeof(FriendOnlineStreamControl),
             typeof(UserListToolbar)
         };
 
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private FriendsLayout layout;
+        private FriendDisplay display;
 
         [SetUp]
         public void Setup() => Schedule(() =>
@@ -35,20 +35,20 @@ namespace osu.Game.Tests.Visual.Online
             Child = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = layout = new FriendsLayout()
+                Child = display = new FriendDisplay()
             };
         });
 
         [Test]
         public void TestOffline()
         {
-            AddStep("Populate", () => layout.Users = getUsers());
+            AddStep("Populate", () => display.Users = getUsers());
         }
 
         [Test]
         public void TestOnline()
         {
-            AddStep("Fetch online", () => layout?.Fetch());
+            AddStep("Fetch online", () => display?.Fetch());
         }
 
         private List<User> getUsers() => new List<User>
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
index d72818ed89..f6dcf78d55 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
@@ -17,20 +17,20 @@ namespace osu.Game.Tests.Visual.UserInterface
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(FriendsOnlineStatusControl),
+            typeof(FriendOnlineStreamControl),
             typeof(FriendsOnlineStatusItem),
             typeof(OverlayStreamControl<>),
             typeof(OverlayStreamItem<>),
-            typeof(FriendsBundle)
+            typeof(FriendStream)
         };
 
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private FriendsOnlineStatusControl control;
+        private FriendOnlineStreamControl control;
 
         [SetUp]
-        public void SetUp() => Schedule(() => Child = control = new FriendsOnlineStatusControl
+        public void SetUp() => Schedule(() => Child = control = new FriendOnlineStreamControl
         {
             Anchor = Anchor.Centre,
             Origin = Anchor.Centre,
@@ -55,9 +55,9 @@ namespace osu.Game.Tests.Visual.UserInterface
                 }
             }));
 
-            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);
+            AddAssert("3 users", () => control.Items.FirstOrDefault(item => item.Status == OnlineStatus.All)?.Count == 3);
+            AddAssert("1 online user", () => control.Items.FirstOrDefault(item => item.Status == OnlineStatus.Online)?.Count == 1);
+            AddAssert("2 offline users", () => control.Items.FirstOrDefault(item => item.Status == OnlineStatus.Offline)?.Count == 2);
         }
     }
 }
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
similarity index 94%
rename from osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
rename to osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index 3514bf7ff7..3c9b31daae 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -16,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Dashboard.Friends
 {
-    public class FriendsLayout : CompositeDrawable
+    public class FriendDisplay : CompositeDrawable
     {
         private List<User> users = new List<User>();
 
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
             {
                 users = value;
 
-                onlineStatusControl.Populate(value);
+                onlineStreamControl.Populate(value);
             }
         }
 
@@ -39,14 +39,14 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
         private Drawable currentContent;
 
-        private readonly FriendsOnlineStatusControl onlineStatusControl;
+        private readonly FriendOnlineStreamControl onlineStreamControl;
         private readonly Box background;
         private readonly Box controlBackground;
         private readonly UserListToolbar userListToolbar;
         private readonly Container itemsPlaceholder;
         private readonly LoadingLayer loading;
 
-        public FriendsLayout()
+        public FriendDisplay()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
                                     Top = 20,
                                     Horizontal = 45
                                 },
-                                Child = onlineStatusControl = new FriendsOnlineStatusControl(),
+                                Child = onlineStreamControl = new FriendOnlineStreamControl(),
                             }
                         }
                     },
@@ -147,7 +147,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
         {
             base.LoadComplete();
 
-            onlineStatusControl.Current.BindValueChanged(_ => recreatePanels());
+            onlineStreamControl.Current.BindValueChanged(_ => recreatePanels());
             userListToolbar.DisplayStyle.BindValueChanged(_ => recreatePanels());
             userListToolbar.SortCriteria.BindValueChanged(_ => recreatePanels());
         }
@@ -179,16 +179,16 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
         private List<User> getUsersInCurrentGroup()
         {
-            switch (onlineStatusControl.Current.Value?.Status)
+            switch (onlineStreamControl.Current.Value?.Status)
             {
                 default:
-                case FriendsOnlineStatus.All:
+                case OnlineStatus.All:
                     return users;
 
-                case FriendsOnlineStatus.Offline:
+                case OnlineStatus.Offline:
                     return users.Where(u => !u.IsOnline).ToList();
 
-                case FriendsOnlineStatus.Online:
+                case OnlineStatus.Online:
                     return users.Where(u => u.IsOnline).ToList();
             }
         }
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs b/osu.Game/Overlays/Dashboard/Friends/FriendOnlineStreamControl.cs
similarity index 53%
rename from osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
rename to osu.Game/Overlays/Dashboard/Friends/FriendOnlineStreamControl.cs
index c54e9e2a06..28546ceab8 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendOnlineStreamControl.cs
@@ -7,9 +7,9 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.Dashboard.Friends
 {
-    public class FriendsOnlineStatusControl : OverlayStreamControl<FriendsBundle>
+    public class FriendOnlineStreamControl : OverlayStreamControl<FriendStream>
     {
-        protected override OverlayStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
+        protected override OverlayStreamItem<FriendStream> CreateStreamItem(FriendStream value) => new FriendsOnlineStatusItem(value);
 
         public void Populate(List<User> users)
         {
@@ -18,9 +18,9 @@ namespace osu.Game.Overlays.Dashboard.Friends
             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));
+            AddItem(new FriendStream(OnlineStatus.All, userCount));
+            AddItem(new FriendStream(OnlineStatus.Online, onlineUsersCount));
+            AddItem(new FriendStream(OnlineStatus.Offline, userCount - onlineUsersCount));
 
             Current.Value = Items.FirstOrDefault();
         }
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs b/osu.Game/Overlays/Dashboard/Friends/FriendStream.cs
similarity index 57%
rename from osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
rename to osu.Game/Overlays/Dashboard/Friends/FriendStream.cs
index d5fad1ffd3..4abece9a8d 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendStream.cs
@@ -3,23 +3,16 @@
 
 namespace osu.Game.Overlays.Dashboard.Friends
 {
-    public class FriendsBundle
+    public class FriendStream
     {
-        public FriendsOnlineStatus Status { get; }
+        public OnlineStatus Status { get; }
 
         public int Count { get; }
 
-        public FriendsBundle(FriendsOnlineStatus status, int count)
+        public FriendStream(OnlineStatus status, int count)
         {
             Status = status;
             Count = count;
         }
     }
-
-    public enum FriendsOnlineStatus
-    {
-        All,
-        Online,
-        Offline
-    }
 }
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusItem.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusItem.cs
index eada9420ea..7e902203f8 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusItem.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusItem.cs
@@ -7,9 +7,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Dashboard.Friends
 {
-    public class FriendsOnlineStatusItem : OverlayStreamItem<FriendsBundle>
+    public class FriendsOnlineStatusItem : OverlayStreamItem<FriendStream>
     {
-        public FriendsOnlineStatusItem(FriendsBundle value)
+        public FriendsOnlineStatusItem(FriendStream value)
             : base(value)
         {
         }
@@ -22,13 +22,13 @@ namespace osu.Game.Overlays.Dashboard.Friends
         {
             switch (Value.Status)
             {
-                case FriendsOnlineStatus.All:
+                case OnlineStatus.All:
                     return Color4.White;
 
-                case FriendsOnlineStatus.Online:
+                case OnlineStatus.Online:
                     return colours.GreenLight;
 
-                case FriendsOnlineStatus.Offline:
+                case OnlineStatus.Offline:
                     return Color4.Black;
 
                 default:
diff --git a/osu.Game/Overlays/Dashboard/Friends/OnlineStatus.cs b/osu.Game/Overlays/Dashboard/Friends/OnlineStatus.cs
new file mode 100644
index 0000000000..6f2f55a6ed
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Friends/OnlineStatus.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.Overlays.Dashboard.Friends
+{
+    public enum OnlineStatus
+    {
+        All,
+        Online,
+        Offline
+    }
+}

From cb6e6025567179280b52d2e58aa099af6b2ef5d9 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Sun, 22 Mar 2020 22:06:35 -0400
Subject: [PATCH 01654/10326] enforce single signficiant digit precision for
 other mods

---
 osu.Game/Rulesets/Mods/ModDoubleTime.cs | 2 +-
 osu.Game/Rulesets/Mods/ModHalfTime.cs   | 2 +-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 7d86190134..105c19dec7 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value}x";
+        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:0.#}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index ec215369a3..32e16e0914 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value}x";
+        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:0.#}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 7b4c1370ac..01b49faa75 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The final speed to ramp to")]
         public abstract BindableNumber<double> FinalRate { get; }
 
-        public override string SettingDescription => $"{InitialRate.Value} to {FinalRate.Value}";
+        public override string SettingDescription => $"{InitialRate.Value:0.#} to {FinalRate.Value:0.#}";
 
         private double finalRateTime;
         private double beginRampTime;

From ea87afd5775c8f4220d642d093f0fe664b1a0d3e Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Sun, 22 Mar 2020 22:06:54 -0400
Subject: [PATCH 01655/10326] use string.Empty in IconTooltip

---
 osu.Game/Rulesets/Mods/Mod.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 95e8ff86eb..23ad48ac5a 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.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;
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Mods
         {
             get
             {
-                string settingDescription = string.IsNullOrEmpty(SettingDescription) ? "" : $" ({SettingDescription})";
+                string settingDescription = string.IsNullOrEmpty(SettingDescription) ? string.Empty : $" ({SettingDescription})";
                 return $"{Name}{settingDescription}";
             }
         }

From 98b8f828103c037ae54ecbeb07c9a398289ae335 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Sun, 22 Mar 2020 22:07:09 -0400
Subject: [PATCH 01656/10326] simplify SettingDescription default definition

---
 osu.Game/Rulesets/Mods/Mod.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 23ad48ac5a..5944717c13 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.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;
@@ -86,10 +86,8 @@ namespace osu.Game.Rulesets.Mods
                     tooltipTexts.Add(tooltipText);
                 }
 
-                // filter out empty strings so we don't have orphaned commas
-                //tooltipTexts = tooltipTexts.Where(s => !string.IsNullOrEmpty(s)).ToList();
-                string joinedTooltipText = string.Join(", ", tooltipTexts);
-                return $"{Name}{joinedTooltipText}";
+                string joinedTooltipText = string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));
+                return $"{joinedTooltipText}";
             }
         }
 

From bf70276496b072dad7009cb4b1c27848b7710edd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 23 Mar 2020 11:12:36 +0900
Subject: [PATCH 01657/10326] Fix test re-using the same beatmap sets

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 5b4c57e28f..6b4090ea58 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -234,6 +234,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Create beatmaps for taiko only", () =>
             {
+                sets.Clear();
+
                 var rulesetBeatmapSet = createTestBeatmapSet(1);
                 var taikoRuleset = rulesets.AvailableRulesets.ElementAt(1);
                 rulesetBeatmapSet.Beatmaps.ForEach(b =>

From 27ae2d29aac6d10f13a696713d5a9de78b0056ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 11:47:24 +0900
Subject: [PATCH 01658/10326] Add ability to adjust (and save) chroma-key area
 width

---
 osu.Game.Tournament/Models/LadderInfo.cs           |  8 +++++++-
 .../Screens/Gameplay/GameplayScreen.cs             | 14 ++++++++++++--
 osu.Game.Tournament/Screens/SetupScreen.cs         |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index 5db0b01547..c2e6da9ca5 100644
--- a/osu.Game.Tournament/Models/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.cs
@@ -24,7 +24,13 @@ namespace osu.Game.Tournament.Models
         // only used for serialisation
         public List<TournamentProgression> Progressions = new List<TournamentProgression>();
 
-        [JsonIgnore]
+        [JsonIgnore] // updated manually in TournamentGameBase
         public Bindable<TournamentMatch> CurrentMatch = new Bindable<TournamentMatch>();
+
+        public Bindable<int> ChromaKeyWidth = new BindableInt(1024)
+        {
+            MinValue = 640,
+            MaxValue = 1366,
+        };
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 8920990d1b..64a5cd6dec 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
@@ -35,6 +36,8 @@ namespace osu.Game.Tournament.Screens.Gameplay
         [Resolved]
         private TournamentMatchChatDisplay chat { get; set; }
 
+        private Box chroma;
+
         [BackgroundDependencyLoader]
         private void load(LadderInfo ladder, MatchIPCInfo ipc, Storage storage)
         {
@@ -60,11 +63,10 @@ namespace osu.Game.Tournament.Screens.Gameplay
                     Origin = Anchor.TopCentre,
                     Children = new Drawable[]
                     {
-                        new Box
+                        chroma = new Box
                         {
                             // chroma key area for stable gameplay
                             Name = "chroma",
-                            RelativeSizeAxes = Axes.X,
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Height = 512,
@@ -93,6 +95,12 @@ namespace osu.Game.Tournament.Screens.Gameplay
                             RelativeSizeAxes = Axes.X,
                             Text = "Toggle chat",
                             Action = () => { State.Value = State.Value == TourneyState.Idle ? TourneyState.Playing : TourneyState.Idle; }
+                        },
+                        new SettingsSlider<int>
+                        {
+                            LabelText = "Chroma Width",
+                            Bindable = LadderInfo.ChromaKeyWidth,
+                            KeyboardStep = 1,
                         }
                     }
                 }
@@ -101,6 +109,8 @@ namespace osu.Game.Tournament.Screens.Gameplay
             State.BindTo(ipc.State);
             State.BindValueChanged(stateChanged, true);
 
+            ladder.ChromaKeyWidth.BindValueChanged(width => chroma.Width = width.NewValue, true);
+
             currentMatch.BindValueChanged(m =>
             {
                 warmup.Value = m.NewValue.Team1Score.Value + m.NewValue.Team2Score.Value == 0;
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index b7f8b2bfd6..c91379b2d6 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Tournament.Screens
                     {
                         windowSize.Value = new Size((int)(1920 / TournamentSceneManager.STREAM_AREA_WIDTH * TournamentSceneManager.REQUIRED_WIDTH), 1080);
                     }
-                }
+                },
             };
         }
 

From afe7397d891237271902caa4b3f31f8b189b770b Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Sun, 22 Mar 2020 22:50:52 -0400
Subject: [PATCH 01659/10326] remove unnecessary using statements

---
 osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs | 1 -
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index 6288d498bd..c465048da3 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.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 osu.Framework.Bindables;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 4830b29c4e..fab4638fb7 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.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 osu.Framework.Bindables;
 using osu.Game.Beatmaps;

From 889608a408e854e30ffd2177aa9d3f079cc71717 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Sun, 22 Mar 2020 22:51:29 -0400
Subject: [PATCH 01660/10326] remove redundant ToString call

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 5944717c13..f712fdc3be 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Mods
                 {
                     object bindableObj = property.GetValue(this);
                     bool? settingIsDefault = (bindableObj as IHasDefaultValue)?.IsDefault;
-                    string tooltipText = settingIsDefault == true ? string.Empty : attr.Label + " " + bindableObj.ToString();
+                    string tooltipText = settingIsDefault == true ? string.Empty : attr.Label + " " + bindableObj;
                     tooltipTexts.Add(tooltipText);
                 }
 

From 1da590c63f6b77b68471e564e1210b2109f304aa Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Sun, 22 Mar 2020 22:54:21 -0400
Subject: [PATCH 01661/10326] use N1 format instead of 0.#

---
 osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs | 4 ++--
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs     | 4 ++--
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs            | 4 ++--
 osu.Game/Rulesets/Mods/ModDoubleTime.cs                  | 2 +-
 osu.Game/Rulesets/Mods/ModHalfTime.cs                    | 2 +-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs                    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index c465048da3..acdd0a420c 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -35,8 +35,8 @@ namespace osu.Game.Rulesets.Catch.Mods
         {
             get
             {
-                string circleSize = CircleSize.IsDefault ? string.Empty : $"CS {CircleSize.Value:0.#}";
-                string approachRate = ApproachRate.IsDefault ? string.Empty : $"AR {ApproachRate.Value:0.#}";
+                string circleSize = CircleSize.IsDefault ? string.Empty : $"CS {CircleSize.Value:N1}";
+                string approachRate = ApproachRate.IsDefault ? string.Empty : $"AR {ApproachRate.Value:N1}";
 
                 return string.Join(", ", new[]
                 {
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index fab4638fb7..8228161008 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -35,8 +35,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             get
             {
-                string circleSize = CircleSize.IsDefault ? string.Empty : $"CS {CircleSize.Value:0.#}";
-                string approachRate = ApproachRate.IsDefault ? string.Empty : $"AR {ApproachRate.Value:0.#}";
+                string circleSize = CircleSize.IsDefault ? string.Empty : $"CS {CircleSize.Value:N1}";
+                string approachRate = ApproachRate.IsDefault ? string.Empty : $"AR {ApproachRate.Value:N1}";
 
                 return string.Join(", ", new[]
                 {
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 06616c7b24..c3a8efdd66 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -57,8 +57,8 @@ namespace osu.Game.Rulesets.Mods
         {
             get
             {
-                string drainRate = DrainRate.IsDefault ? string.Empty : $"HP {DrainRate.Value:0.#}";
-                string overallDifficulty = OverallDifficulty.IsDefault ? string.Empty : $"OD {OverallDifficulty.Value:0.#}";
+                string drainRate = DrainRate.IsDefault ? string.Empty : $"HP {DrainRate.Value:N1}";
+                string overallDifficulty = OverallDifficulty.IsDefault ? string.Empty : $"OD {OverallDifficulty.Value:N1}";
 
                 return string.Join(", ", new[]
                 {
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 105c19dec7..3f01bfb11e 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:0.#}x";
+        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N1}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 32e16e0914..c555692ed9 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:0.#}x";
+        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N1}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 01b49faa75..f21ba684b4 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The final speed to ramp to")]
         public abstract BindableNumber<double> FinalRate { get; }
 
-        public override string SettingDescription => $"{InitialRate.Value:0.#} to {FinalRate.Value:0.#}";
+        public override string SettingDescription => $"{InitialRate.Value:0.#} to {FinalRate.Value:N1}";
 
         private double finalRateTime;
         private double beginRampTime;

From 5cc626d37b746c69d5979e9c465933c8fe6c1b8a Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Sun, 22 Mar 2020 22:57:46 -0400
Subject: [PATCH 01662/10326] move SettingDescription override to ModRateAdjust

---
 osu.Game/Rulesets/Mods/ModDoubleTime.cs | 2 --
 osu.Game/Rulesets/Mods/ModHalfTime.cs   | 2 --
 osu.Game/Rulesets/Mods/ModRateAdjust.cs | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 3f01bfb11e..152657da33 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -30,7 +30,5 @@ namespace osu.Game.Rulesets.Mods
             Value = 1.5,
             Precision = 0.01,
         };
-
-        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N1}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index c555692ed9..203b88951c 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -30,7 +30,5 @@ namespace osu.Game.Rulesets.Mods
             Value = 0.75,
             Precision = 0.01,
         };
-
-        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N1}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index 1739524bcd..9059d54035 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -15,5 +15,7 @@ namespace osu.Game.Rulesets.Mods
         {
             track.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
         }
+
+        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N1}x";
     }
 }

From 1b6342438f8cc54ff14dad811d54512c7e8af29b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 12:03:33 +0900
Subject: [PATCH 01663/10326] Hide scrollbars in tournament chat display

---
 .../Components/TournamentMatchChatDisplay.cs    | 11 +++++++++++
 osu.Game/Online/Chat/StandAloneChatDisplay.cs   | 17 ++++++++++-------
 osu.Game/Overlays/Chat/DrawableChannel.cs       | 15 +++++++++++++++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index 2a183d0d45..fe22d1e76d 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -70,6 +70,17 @@ namespace osu.Game.Tournament.Components
 
         protected override ChatLine CreateMessage(Message message) => new MatchMessage(message);
 
+        protected override StandAloneDrawableChannel CreateDrawableChannel(Channel channel) => new MatchChannel(channel);
+
+        public class MatchChannel : StandAloneDrawableChannel
+        {
+            public MatchChannel(Channel channel)
+                : base(channel)
+            {
+                ScrollbarVisible = false;
+            }
+        }
+
         protected class MatchMessage : StandAloneMessage
         {
             public MatchMessage(Message message)
diff --git a/osu.Game/Online/Chat/StandAloneChatDisplay.cs b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
index 0914f688e9..4fbeac1db9 100644
--- a/osu.Game/Online/Chat/StandAloneChatDisplay.cs
+++ b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Online.Chat
 
         protected ChannelManager ChannelManager;
 
-        private DrawableChannel drawableChannel;
+        private StandAloneDrawableChannel drawableChannel;
 
         private readonly bool postingTextbox;
 
@@ -77,6 +77,9 @@ namespace osu.Game.Online.Chat
                 ChannelManager = manager;
         }
 
+        protected virtual StandAloneDrawableChannel CreateDrawableChannel(Channel channel) =>
+            new StandAloneDrawableChannel(channel);
+
         private void postMessage(TextBox sender, bool newtext)
         {
             var text = textbox.Text.Trim();
@@ -100,14 +103,14 @@ namespace osu.Game.Online.Chat
 
             if (e.NewValue == null) return;
 
-            AddInternal(drawableChannel = new StandAloneDrawableChannel(e.NewValue)
-            {
-                CreateChatLineAction = CreateMessage,
-                Padding = new MarginPadding { Bottom = postingTextbox ? textbox_height : 0 }
-            });
+            drawableChannel = CreateDrawableChannel(e.NewValue);
+            drawableChannel.CreateChatLineAction = CreateMessage;
+            drawableChannel.Padding = new MarginPadding { Bottom = postingTextbox ? textbox_height : 0 };
+
+            AddInternal(drawableChannel);
         }
 
-        protected class StandAloneDrawableChannel : DrawableChannel
+        public class StandAloneDrawableChannel : DrawableChannel
         {
             public Func<Message, ChatLine> CreateChatLineAction;
 
diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 443f2b7bf7..6019657cf0 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -26,6 +26,20 @@ namespace osu.Game.Overlays.Chat
         protected FillFlowContainer ChatLineFlow;
         private OsuScrollContainer scroll;
 
+        private bool scrollbarVisible = true;
+
+        public bool ScrollbarVisible
+        {
+            set
+            {
+                if (scrollbarVisible == value) return;
+
+                scrollbarVisible = value;
+                if (scroll != null)
+                    scroll.ScrollbarVisible = value;
+            }
+        }
+
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -44,6 +58,7 @@ namespace osu.Game.Overlays.Chat
                 Masking = true,
                 Child = scroll = new OsuScrollContainer
                 {
+                    ScrollbarVisible = scrollbarVisible,
                     RelativeSizeAxes = Axes.Both,
                     // Some chat lines have effects that slightly protrude to the bottom,
                     // which we do not want to mask away, hence the padding.

From 64fc116d673500e6b4e55639e7e7daf7d7fad640 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Sun, 22 Mar 2020 23:08:00 -0400
Subject: [PATCH 01664/10326] use two decimal points for ModRateAdjust format

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

diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index 9059d54035..cb2ff149f1 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Mods
             track.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
         }
 
-        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N1}x";
+        public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N2}x";
     }
 }

From 5106d275ca1cf58f26897f1f962762fa8d6119c5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 23 Mar 2020 12:08:15 +0900
Subject: [PATCH 01665/10326] Remove CentreHit/RimHit hitobject abstraction

---
 .../Mods/TestSceneTaikoModPerfect.cs          |  2 +-
 .../TaikoBeatmapConversionTest.cs             |  4 +-
 .../TestSceneTaikoPlayfield.cs                |  2 +-
 .../Beatmaps/TaikoBeatmapConverter.cs         | 46 +++++--------------
 .../Preprocessing/TaikoDifficultyHitObject.cs |  2 +-
 osu.Game.Rulesets.Taiko/Objects/CentreHit.cs  |  9 ----
 osu.Game.Rulesets.Taiko/Objects/Hit.cs        |  4 ++
 osu.Game.Rulesets.Taiko/Objects/HitType.cs    | 21 +++++++++
 osu.Game.Rulesets.Taiko/Objects/RimHit.cs     |  9 ----
 .../Replays/TaikoAutoGenerator.cs             |  2 +-
 .../UI/DrawableTaikoRuleset.cs                | 10 ++--
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |  4 +-
 12 files changed, 50 insertions(+), 65 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Taiko/Objects/CentreHit.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Objects/HitType.cs
 delete mode 100644 osu.Game.Rulesets.Taiko/Objects/RimHit.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
index d3be2cdf0d..26c90ad295 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestHit(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new CentreHit { StartTime = 1000 }), shouldMiss);
+        public void TestHit(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Hit { StartTime = 1000, Type = HitType.Centre }), shouldMiss);
 
         [TestCase(false)]
         [TestCase(true)]
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index f23fd6d3f9..8c26ca70ac 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -27,8 +27,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
             {
                 StartTime = hitObject.StartTime,
                 EndTime = hitObject.GetEndTime(),
-                IsRim = hitObject is RimHit,
-                IsCentre = hitObject is CentreHit,
+                IsRim = (hitObject as Hit)?.Type == HitType.Rim,
+                IsCentre = (hitObject as Hit)?.Type == HitType.Centre,
                 IsDrumRoll = hitObject is DrumRoll,
                 IsSwell = hitObject is Swell,
                 IsStrong = ((TaikoHitObject)hitObject).IsStrong
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
index c01eef5252..0d9e813c60 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             WorkingBeatmap beatmap = CreateWorkingBeatmap(new Beatmap
             {
-                HitObjects = new List<HitObject> { new CentreHit() },
+                HitObjects = new List<HitObject> { new Hit { Type = HitType.Centre } },
                 BeatmapInfo = new BeatmapInfo
                 {
                     BaseDifficulty = new BeatmapDifficulty(),
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index cc9d6e4470..695ada3a00 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -124,24 +124,13 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                             bool isRim = currentSamples.Any(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE);
                             strong = currentSamples.Any(s => s.Name == HitSampleInfo.HIT_FINISH);
 
-                            if (isRim)
+                            yield return new Hit
                             {
-                                yield return new RimHit
-                                {
-                                    StartTime = j,
-                                    Samples = currentSamples,
-                                    IsStrong = strong
-                                };
-                            }
-                            else
-                            {
-                                yield return new CentreHit
-                                {
-                                    StartTime = j,
-                                    Samples = currentSamples,
-                                    IsStrong = strong
-                                };
-                            }
+                                StartTime = j,
+                                Type = isRim ? HitType.Rim : HitType.Centre,
+                                Samples = currentSamples,
+                                IsStrong = strong
+                            };
 
                             i = (i + 1) % allSamples.Count;
                         }
@@ -180,24 +169,13 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 {
                     bool isRim = samples.Any(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE);
 
-                    if (isRim)
+                    yield return new Hit
                     {
-                        yield return new RimHit
-                        {
-                            StartTime = obj.StartTime,
-                            Samples = obj.Samples,
-                            IsStrong = strong
-                        };
-                    }
-                    else
-                    {
-                        yield return new CentreHit
-                        {
-                            StartTime = obj.StartTime,
-                            Samples = obj.Samples,
-                            IsStrong = strong
-                        };
-                    }
+                        StartTime = obj.StartTime,
+                        Type = isRim ? HitType.Rim : HitType.Centre,
+                        Samples = obj.Samples,
+                        IsStrong = strong
+                    };
 
                     break;
                 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
index 24345275c1..6807142327 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
         public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, double clockRate)
             : base(hitObject, lastObject, clockRate)
         {
-            HasTypeChange = lastObject is RimHit != hitObject is RimHit;
+            HasTypeChange = (lastObject as Hit)?.Type != (hitObject as Hit)?.Type;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/CentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/CentreHit.cs
deleted file mode 100644
index a6354b16ed..0000000000
--- a/osu.Game.Rulesets.Taiko/Objects/CentreHit.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.Rulesets.Taiko.Objects
-{
-    public class CentreHit : Hit
-    {
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 6cc9357580..2aca701515 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -5,5 +5,9 @@ namespace osu.Game.Rulesets.Taiko.Objects
 {
     public class Hit : TaikoHitObject
     {
+        /// <summary>
+        /// The <see cref="HitType"/> that actuates this <see cref="Hit"/>.
+        /// </summary>
+        public HitType Type { get; set; }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/HitType.cs b/osu.Game.Rulesets.Taiko/Objects/HitType.cs
new file mode 100644
index 0000000000..17b3fdbd04
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Objects/HitType.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.
+
+namespace osu.Game.Rulesets.Taiko.Objects
+{
+    /// <summary>
+    /// The type of a <see cref="Hit"/>.
+    /// </summary>
+    public enum HitType
+    {
+        /// <summary>
+        /// A <see cref="Hit"/> that can be hit by the centre portion of the drum.
+        /// </summary>
+        Centre,
+
+        /// <summary>
+        /// A <see cref="Hit"/> that can be hit by the rim portion of the drum.
+        /// </summary>
+        Rim
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/RimHit.cs b/osu.Game.Rulesets.Taiko/Objects/RimHit.cs
deleted file mode 100644
index 6f6b089e03..0000000000
--- a/osu.Game.Rulesets.Taiko/Objects/RimHit.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.Rulesets.Taiko.Objects
-{
-    public class RimHit : Hit
-    {
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 48eb33976e..273f4e4105 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
                     {
                         TaikoAction[] actions;
 
-                        if (hit is CentreHit)
+                        if (hit.Type == HitType.Centre)
                         {
                             actions = h.IsStrong
                                 ? new[] { TaikoAction.LeftCentre, TaikoAction.RightCentre }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 0c7495aa52..9196bbf13e 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -48,11 +48,11 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             switch (h)
             {
-                case CentreHit centreHit:
-                    return new DrawableCentreHit(centreHit);
-
-                case RimHit rimHit:
-                    return new DrawableRimHit(rimHit);
+                case Hit hit:
+                    if (hit.Type == HitType.Centre)
+                        return new DrawableCentreHit(hit);
+                    else
+                        return new DrawableRimHit(hit);
 
                 case DrumRoll drumRoll:
                     return new DrawableDrumRoll(drumRoll);
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index a10f70a344..bde9085c23 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -14,9 +14,9 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Judgements;
+using osu.Game.Rulesets.Taiko.Objects;
 using osuTK;
 using osuTK.Graphics;
 
@@ -245,7 +245,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     if (!result.IsHit)
                         break;
 
-                    bool isRim = judgedObject.HitObject is RimHit;
+                    bool isRim = (judgedObject.HitObject as Hit)?.Type == HitType.Rim;
 
                     hitExplosionContainer.Add(new HitExplosion(judgedObject, isRim));
 

From e3a5be71cce01b6e42311a89772cc6fedbbb9c8f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 23 Mar 2020 12:09:30 +0900
Subject: [PATCH 01666/10326] Implement random mod for taiko

---
 .../Mods/ManiaModRandom.cs                    |  9 +------
 .../Mods/TaikoModRandom.cs                    | 27 +++++++++++++++++++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  1 +
 osu.Game/Rulesets/Mods/ModRandom.cs           | 17 ++++++++++++
 4 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
 create mode 100644 osu.Game/Rulesets/Mods/ModRandom.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs
index 14b36fb765..699c58c373 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs
@@ -3,24 +3,17 @@
 
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModRandom : Mod, IApplicableToBeatmap
+    public class ManiaModRandom : ModRandom, IApplicableToBeatmap
     {
-        public override string Name => "Random";
-        public override string Acronym => "RD";
-        public override ModType Type => ModType.Conversion;
-        public override IconUsage? Icon => OsuIcon.Dice;
         public override string Description => @"Shuffle around the keys!";
-        public override double ScoreMultiplier => 1;
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
new file mode 100644
index 0000000000..1cf19ac18e
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Taiko.Beatmaps;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModRandom : ModRandom, IApplicableToBeatmap
+    {
+        public override string Description => @"Shuffle around the colours!";
+
+        public void ApplyToBeatmap(IBeatmap beatmap)
+        {
+            var taikoBeatmap = (TaikoBeatmap)beatmap;
+
+            foreach (var obj in taikoBeatmap.HitObjects)
+            {
+                if (obj is Hit hit)
+                    hit.Type = RNG.Next(2) == 0 ? HitType.Centre : HitType.Rim;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index fc79e59864..4a841bf8c3 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -114,6 +114,7 @@ namespace osu.Game.Rulesets.Taiko
                 case ModType.Conversion:
                     return new Mod[]
                     {
+                        new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                     };
 
diff --git a/osu.Game/Rulesets/Mods/ModRandom.cs b/osu.Game/Rulesets/Mods/ModRandom.cs
new file mode 100644
index 0000000000..da55ab3fbf
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModRandom.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModRandom : Mod
+    {
+        public override string Name => "Random";
+        public override string Acronym => "RD";
+        public override ModType Type => ModType.Conversion;
+        public override IconUsage? Icon => OsuIcon.Dice;
+        public override double ScoreMultiplier => 1;
+    }
+}

From 997ce397efa6c64e6218fdd342cc0ea738a47b40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 12:48:05 +0900
Subject: [PATCH 01667/10326] Disable raw input toggle on all but windows

---
 .../Settings/Sections/Input/MouseSettings.cs  | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 59d39a1c3c..e7f2f21465 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.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;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
@@ -56,24 +57,32 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 },
             };
 
-            rawInputToggle.ValueChanged += enabled =>
+            if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
             {
-                // this is temporary until we support per-handler settings.
-                const string raw_mouse_handler = @"OsuTKRawMouseHandler";
-                const string standard_mouse_handler = @"OsuTKMouseHandler";
-
-                ignoredInputHandler.Value = enabled.NewValue ? standard_mouse_handler : raw_mouse_handler;
-            };
-
-            ignoredInputHandler = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
-            ignoredInputHandler.ValueChanged += handler =>
+                rawInputToggle.Disabled = true;
+                sensitivity.Bindable.Disabled = true;
+            }
+            else
             {
-                bool raw = !handler.NewValue.Contains("Raw");
-                rawInputToggle.Value = raw;
-                sensitivity.Bindable.Disabled = !raw;
-            };
+                rawInputToggle.ValueChanged += enabled =>
+                {
+                    // this is temporary until we support per-handler settings.
+                    const string raw_mouse_handler = @"OsuTKRawMouseHandler";
+                    const string standard_mouse_handler = @"OsuTKMouseHandler";
 
-            ignoredInputHandler.TriggerChange();
+                    ignoredInputHandler.Value = enabled.NewValue ? standard_mouse_handler : raw_mouse_handler;
+                };
+
+                ignoredInputHandler = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
+                ignoredInputHandler.ValueChanged += handler =>
+                {
+                    bool raw = !handler.NewValue.Contains("Raw");
+                    rawInputToggle.Value = raw;
+                    sensitivity.Bindable.Disabled = !raw;
+                };
+
+                ignoredInputHandler.TriggerChange();
+            }
         }
 
         private class SensitivitySetting : SettingsSlider<double, SensitivitySlider>

From 3a3df06e0b2e0a38ab2c1591d012a78859b164cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 13:11:40 +0900
Subject: [PATCH 01668/10326] Fix some pieces of SettingsItem getting dimmed
 twice when disabled

---
 .../Overlays/Settings/SettingsCheckbox.cs     |  6 ++----
 osu.Game/Overlays/Settings/SettingsItem.cs    | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsCheckbox.cs b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
index a554159fd7..437b2e45b3 100644
--- a/osu.Game/Overlays/Settings/SettingsCheckbox.cs
+++ b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
@@ -8,16 +8,14 @@ namespace osu.Game.Overlays.Settings
 {
     public class SettingsCheckbox : SettingsItem<bool>
     {
-        private OsuCheckbox checkbox;
-
         private string labelText;
 
-        protected override Drawable CreateControl() => checkbox = new OsuCheckbox();
+        protected override Drawable CreateControl() => new OsuCheckbox();
 
         public override string LabelText
         {
             get => labelText;
-            set => checkbox.LabelText = labelText = value;
+            set => ((OsuCheckbox)Control).LabelText = labelText = value;
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index e89f2adf0b..c2dd40d2a6 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -33,22 +33,24 @@ namespace osu.Game.Overlays.Settings
 
         protected readonly FillFlowContainer FlowContent;
 
-        private SpriteText text;
+        private SpriteText labelText;
 
         public bool ShowsDefaultIndicator = true;
 
         public virtual string LabelText
         {
-            get => text?.Text ?? string.Empty;
+            get => labelText?.Text ?? string.Empty;
             set
             {
-                if (text == null)
+                if (labelText == null)
                 {
                     // construct lazily for cases where the label is not needed (may be provided by the Control).
-                    FlowContent.Insert(-1, text = new OsuSpriteText());
+                    FlowContent.Insert(-1, labelText = new OsuSpriteText());
+
+                    updateDisabled();
                 }
 
-                text.Text = value;
+                labelText.Text = value;
             }
         }
 
@@ -96,13 +98,19 @@ namespace osu.Game.Overlays.Settings
             if (controlWithCurrent != null)
             {
                 controlWithCurrent.Current.ValueChanged += _ => SettingChanged?.Invoke();
-                controlWithCurrent.Current.DisabledChanged += disabled => { Colour = disabled ? Color4.Gray : Color4.White; };
+                controlWithCurrent.Current.DisabledChanged += _ => updateDisabled();
 
                 if (ShowsDefaultIndicator)
                     restoreDefaultButton.Bindable = controlWithCurrent.Current;
             }
         }
 
+        private void updateDisabled()
+        {
+            if (labelText != null)
+                labelText.Alpha = controlWithCurrent.Current.Disabled ? 0.3f : 1;
+        }
+
         private class RestoreDefaultValueButton : Container, IHasTooltip
         {
             private Bindable<T> bindable;

From a6b153673e2fa61dc5c7c674a5fb6b964008063d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 14:58:02 +0900
Subject: [PATCH 01669/10326] Fix icons not updating tooltip text correctly

---
 osu.Game/Rulesets/UI/ModIcon.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 3cd1b0820d..8ea6c74349 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.UI
 
         private readonly ModType type;
 
-        public virtual string TooltipText { get; }
+        public virtual string TooltipText => mod.IconTooltip;
 
         private Mod mod;
 
@@ -48,8 +48,6 @@ namespace osu.Game.Rulesets.UI
 
             type = mod.Type;
 
-            TooltipText = mod.IconTooltip;
-
             Size = new Vector2(size);
 
             Children = new Drawable[]

From 205f4dcb54f854fc36fcf8e322e20329e4e3144f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 15:20:56 +0900
Subject: [PATCH 01670/10326] Simplify string construction logic

---
 osu.Game/Rulesets/Mods/Mod.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index f712fdc3be..0e5fe3fc9c 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -60,8 +60,9 @@ namespace osu.Game.Rulesets.Mods
         {
             get
             {
-                string settingDescription = string.IsNullOrEmpty(SettingDescription) ? string.Empty : $" ({SettingDescription})";
-                return $"{Name}{settingDescription}";
+                string description = SettingDescription;
+
+                return string.IsNullOrEmpty(description) ? Name : $"{Name} ({description})";
             }
         }
 
@@ -81,13 +82,14 @@ namespace osu.Game.Rulesets.Mods
                 foreach ((SettingSourceAttribute attr, PropertyInfo property) in this.GetOrderedSettingsSourceProperties())
                 {
                     object bindableObj = property.GetValue(this);
-                    bool? settingIsDefault = (bindableObj as IHasDefaultValue)?.IsDefault;
-                    string tooltipText = settingIsDefault == true ? string.Empty : attr.Label + " " + bindableObj;
-                    tooltipTexts.Add(tooltipText);
+
+                    if ((bindableObj as IHasDefaultValue)?.IsDefault == true)
+                        continue;
+
+                    tooltipTexts.Add($"{attr.Label} {bindableObj}");
                 }
 
-                string joinedTooltipText = string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));
-                return $"{joinedTooltipText}";
+                return string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));
             }
         }
 

From 98e6896e934d5aa0f88a3977c7edc0a6e8005d92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 15:37:34 +0900
Subject: [PATCH 01671/10326] Rename test class

---
 .../{TestSceneFriendsLayout.cs => TestSceneFriendDisplay.cs}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Online/{TestSceneFriendsLayout.cs => TestSceneFriendDisplay.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
similarity index 97%
rename from osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
rename to osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
index c0a617fe57..cf365a7614 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
@@ -13,7 +13,7 @@ using NUnit.Framework;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneFriendsLayout : OsuTestScene
+    public class TestSceneFriendDisplay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

From 47c7673c9e7a855e02dd7d090830a7677657f64b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 17:04:54 +0900
Subject: [PATCH 01672/10326] Fix crash when holding a key down while entering
 player

---
 osu.Game/Screens/Select/FilterControl.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 6a03cfb68e..cad7672c71 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -136,6 +136,8 @@ namespace osu.Game.Screens.Select
 
         public void Deactivate()
         {
+            searchTextBox.ReadOnly = true;
+
             searchTextBox.HoldFocus = false;
             if (searchTextBox.HasFocus)
                 GetContainingInputManager().ChangeFocus(searchTextBox);
@@ -143,6 +145,7 @@ namespace osu.Game.Screens.Select
 
         public void Activate()
         {
+            searchTextBox.ReadOnly = false;
             searchTextBox.HoldFocus = true;
         }
 

From 232c2559867ceebfb8b61e0a979096c07c67c406 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 17:33:02 +0900
Subject: [PATCH 01673/10326] Basic test scene setup

---
 .../ManiaInputTestScene.cs                    |   2 +-
 osu.Game.Rulesets.Osu/OsuInputManager.cs      |   2 +-
 .../Gameplay/TestSceneReplayRecording.cs      | 105 ++++++++++++++++++
 osu.Game/Rulesets/UI/RulesetInputManager.cs   |   2 +-
 4 files changed, 108 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index 909d0d45c6..9049bb3a82 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
             }
 
-            protected override RulesetKeyBindingContainer CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+            protected override KeyBindingContainer<ManiaAction> CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
                 => new LocalKeyBindingContainer(ruleset, variant, unique);
 
             private class LocalKeyBindingContainer : RulesetKeyBindingContainer
diff --git a/osu.Game.Rulesets.Osu/OsuInputManager.cs b/osu.Game.Rulesets.Osu/OsuInputManager.cs
index cdea7276f3..c8fe4f41ca 100644
--- a/osu.Game.Rulesets.Osu/OsuInputManager.cs
+++ b/osu.Game.Rulesets.Osu/OsuInputManager.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu
         /// </summary>
         public bool AllowUserCursorMovement { get; set; } = true;
 
-        protected override RulesetKeyBindingContainer CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+        protected override KeyBindingContainer<OsuAction> CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
             => new OsuKeyBindingContainer(ruleset, variant, unique);
 
         public OsuInputManager(RulesetInfo ruleset)
diff --git a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
new file mode 100644
index 0000000000..0dc19cc3f2
--- /dev/null
+++ b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
@@ -0,0 +1,105 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.UI;
+using osu.Game.Tests.Visual;
+using osu.Game.Tests.Visual.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Gameplay
+{
+    public class TestSceneReplayRecording : OsuTestScene
+    {
+        public TestSceneReplayRecording()
+        {
+            Add(new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
+            {
+                Child = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.Brown,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new TestConsumer()
+                    }
+                },
+            });
+        }
+
+        public class TestConsumer : CompositeDrawable, IKeyBindingHandler<TestAction>
+        {
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
+            private readonly Box box;
+
+            public TestConsumer()
+            {
+                Size = new Vector2(30);
+
+                Origin = Anchor.Centre;
+
+                InternalChildren = new Drawable[]
+                {
+                    box = new Box
+                    {
+                        Colour = Color4.Black,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                };
+            }
+
+            protected override bool OnMouseMove(MouseMoveEvent e)
+            {
+                this.Position = e.MousePosition;
+                return base.OnMouseMove(e);
+            }
+
+            public bool OnPressed(TestAction action)
+            {
+                box.Colour = Color4.White;
+                return true;
+            }
+
+            public void OnReleased(TestAction action)
+            {
+                box.Colour = Color4.Black;
+            }
+        }
+
+        private class TestRulesetInputManager : RulesetInputManager<TestAction>
+        {
+            public TestRulesetInputManager(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+                : base(ruleset, variant, unique)
+            {
+            }
+
+            protected override KeyBindingContainer<TestAction> CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+                => new TestKeyBindingContainer();
+
+            internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
+            {
+                public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+                {
+                    new KeyBinding(InputKey.MouseLeft, TestAction.Down),
+                };
+            }
+        }
+
+        public enum TestAction
+        {
+            Down,
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 41b2739fc5..7f85c10b56 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
-        protected virtual RulesetKeyBindingContainer CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+        protected virtual KeyBindingContainer<T> CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
             => new RulesetKeyBindingContainer(ruleset, variant, unique);
 
         public class RulesetKeyBindingContainer : DatabasedKeyBindingContainer<T>

From 66f2a52dd286693aa0aecd6b3e0f343acef23f12 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2020 08:59:47 +0000
Subject: [PATCH 01674/10326] Bump Sentry from 2.1.0 to 2.1.1

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.0...2.1.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 46d17bcf05..3894c06994 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.315.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.319.0" />
-    <PackageReference Include="Sentry" Version="2.1.0" />
+    <PackageReference Include="Sentry" Version="2.1.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 467066112f3845393623fa9dc0b2d470a7260935 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 18:50:16 +0900
Subject: [PATCH 01675/10326] Initial record/playback implementation

---
 .../Gameplay/TestSceneReplayRecording.cs      | 317 ++++++++++++++----
 1 file changed, 247 insertions(+), 70 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
index 0dc19cc3f2..3ff11bbd4e 100644
--- a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
@@ -1,13 +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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Input.StateChanges;
+using osu.Framework.Input.States;
+using osu.Framework.Logging;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Replays;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
 using osu.Game.Tests.Visual;
 using osu.Game.Tests.Visual.UserInterface;
@@ -18,88 +25,258 @@ namespace osu.Game.Tests.Gameplay
 {
     public class TestSceneReplayRecording : OsuTestScene
     {
+        private readonly TestRulesetInputManager playbackManager;
+
         public TestSceneReplayRecording()
         {
-            Add(new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
+            Replay replay = new Replay();
+
+            Add(new GridContainer
             {
-                Child = new Container
+                RelativeSizeAxes = Axes.Both,
+                Content = new[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    new Drawable[]
                     {
-                        new Box
+                        new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
-                            Colour = Color4.Brown,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new TestConsumer()
+                            RecordTarget = replay,
+                            Child = new Container
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        Colour = Color4.Brown,
+                                        RelativeSizeAxes = Axes.Both,
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Text = "Recording",
+                                        Scale = new Vector2(3),
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                    },
+                                    new TestConsumer()
+                                }
+                            },
+                        }
+                    },
+                    new Drawable[]
+                    {
+                        playbackManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
+                        {
+                            ReplayInputHandler = new TestFramedReplayInputHandler(replay)
+                            {
+                                GamefieldToScreenSpace = pos => playbackManager.ToScreenSpace(pos),
+                            },
+                            Child = new Container
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        Colour = Color4.DarkBlue,
+                                        RelativeSizeAxes = Axes.Both,
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Text = "Playback",
+                                        Scale = new Vector2(3),
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                    },
+                                    new TestConsumer()
+                                }
+                            },
+                        }
                     }
-                },
+                }
             });
         }
 
-        public class TestConsumer : CompositeDrawable, IKeyBindingHandler<TestAction>
+        protected override void Update()
         {
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+            base.Update();
 
-            private readonly Box box;
-
-            public TestConsumer()
-            {
-                Size = new Vector2(30);
-
-                Origin = Anchor.Centre;
-
-                InternalChildren = new Drawable[]
-                {
-                    box = new Box
-                    {
-                        Colour = Color4.Black,
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                };
-            }
-
-            protected override bool OnMouseMove(MouseMoveEvent e)
-            {
-                this.Position = e.MousePosition;
-                return base.OnMouseMove(e);
-            }
-
-            public bool OnPressed(TestAction action)
-            {
-                box.Colour = Color4.White;
-                return true;
-            }
-
-            public void OnReleased(TestAction action)
-            {
-                box.Colour = Color4.Black;
-            }
-        }
-
-        private class TestRulesetInputManager : RulesetInputManager<TestAction>
-        {
-            public TestRulesetInputManager(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
-                : base(ruleset, variant, unique)
-            {
-            }
-
-            protected override KeyBindingContainer<TestAction> CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
-                => new TestKeyBindingContainer();
-
-            internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
-            {
-                public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
-                {
-                    new KeyBinding(InputKey.MouseLeft, TestAction.Down),
-                };
-            }
-        }
-
-        public enum TestAction
-        {
-            Down,
+            playbackManager.ReplayInputHandler.SetFrameFromTime(Time.Current - 500);
         }
     }
+
+    public class TestFramedReplayInputHandler : FramedReplayInputHandler<TestReplayFrame>
+    {
+        public TestFramedReplayInputHandler(Replay replay)
+            : base(replay)
+        {
+        }
+
+        public override List<IInput> GetPendingInputs()
+        {
+            return new List<IInput>
+            {
+                new MousePositionAbsoluteInput
+                {
+                    Position = GamefieldToScreenSpace(CurrentFrame?.Position ?? Vector2.Zero)
+                },
+                new ReplayState<TestAction>
+                {
+                    PressedActions = CurrentFrame?.Actions ?? new List<TestAction>()
+                }
+            };
+        }
+    }
+
+    public class TestConsumer : CompositeDrawable, IKeyBindingHandler<TestAction>
+    {
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent.ReceivePositionalInputAt(screenSpacePos);
+
+        private readonly Box box;
+
+        public TestConsumer()
+        {
+            Size = new Vector2(30);
+
+            Origin = Anchor.Centre;
+
+            InternalChildren = new Drawable[]
+            {
+                box = new Box
+                {
+                    Colour = Color4.Black,
+                    RelativeSizeAxes = Axes.Both,
+                },
+            };
+        }
+
+        protected override bool OnMouseMove(MouseMoveEvent e)
+        {
+            Position = e.MousePosition;
+            return base.OnMouseMove(e);
+        }
+
+        public bool OnPressed(TestAction action)
+        {
+            box.Colour = Color4.White;
+            return true;
+        }
+
+        public void OnReleased(TestAction action)
+        {
+            box.Colour = Color4.Black;
+        }
+    }
+
+    public class TestRulesetInputManager : RulesetInputManager<TestAction>
+    {
+        private ReplayRecorder<TestAction> recorder;
+
+        public Replay RecordTarget
+        {
+            set
+            {
+                if (recorder != null)
+                    throw new InvalidOperationException("Cannot attach more than one recorder");
+
+                KeyBindingContainer.Add(recorder = new TestReplayRecorder(value));
+            }
+        }
+
+        public TestRulesetInputManager(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+            : base(ruleset, variant, unique)
+        {
+        }
+
+        protected override KeyBindingContainer<TestAction> CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+            => new TestKeyBindingContainer();
+
+        internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
+        {
+            public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+            {
+                new KeyBinding(InputKey.MouseLeft, TestAction.Down),
+            };
+        }
+    }
+
+    public class TestReplayFrame : ReplayFrame
+    {
+        public Vector2 Position;
+
+        public List<TestAction> Actions = new List<TestAction>();
+
+        public TestReplayFrame()
+        {
+        }
+
+        public TestReplayFrame(double time, Vector2 position, params TestAction[] actions)
+            : base(time)
+        {
+            Position = position;
+            Actions.AddRange(actions);
+        }
+    }
+
+    public enum TestAction
+    {
+        Down,
+    }
+
+    internal class TestReplayRecorder : ReplayRecorder<TestAction>
+    {
+        public TestReplayRecorder(Replay target)
+            : base(target)
+        {
+        }
+
+        protected override ReplayFrame HandleFrame(InputState state, List<TestAction> pressedActions) =>
+            new TestReplayFrame(Time.Current, ToLocalSpace(state.Mouse.Position), pressedActions.ToArray());
+    }
+
+    internal abstract class ReplayRecorder<T> : Component, IKeyBindingHandler<T>
+        where T : struct
+    {
+        private readonly Replay target;
+
+        private readonly List<T> pressedActions = new List<T>();
+
+        protected ReplayRecorder(Replay target)
+        {
+            this.target = target;
+
+            RelativeSizeAxes = Axes.Both;
+
+            Depth = float.MinValue;
+        }
+
+        protected override bool OnMouseMove(MouseMoveEvent e)
+        {
+            recordFrame();
+            return base.OnMouseMove(e);
+        }
+
+        public bool OnPressed(T action)
+        {
+            pressedActions.Add(action);
+            recordFrame();
+            return false;
+        }
+
+        public void OnReleased(T action)
+        {
+            pressedActions.Remove(action);
+            recordFrame();
+        }
+
+        private void recordFrame()
+        {
+            var frame = HandleFrame(GetContainingInputManager().CurrentState, pressedActions);
+
+            if (frame != null)
+                target.Frames.Add(frame);
+        }
+
+        protected abstract ReplayFrame HandleFrame(InputState state, List<T> pressedActions);
+    }
 }

From d5bc4915e6fd3961ae4a4c6b62059cddc5740817 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 19:02:45 +0900
Subject: [PATCH 01676/10326] Add "important" frames and record rate options

---
 .../Gameplay/TestSceneReplayRecording.cs      | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
index 3ff11bbd4e..c2b2ebdb98 100644
--- a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
@@ -3,14 +3,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Input.States;
-using osu.Framework.Logging;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
@@ -206,10 +207,6 @@ namespace osu.Game.Tests.Gameplay
 
         public List<TestAction> Actions = new List<TestAction>();
 
-        public TestReplayFrame()
-        {
-        }
-
         public TestReplayFrame(double time, Vector2 position, params TestAction[] actions)
             : base(time)
         {
@@ -230,7 +227,7 @@ namespace osu.Game.Tests.Gameplay
         {
         }
 
-        protected override ReplayFrame HandleFrame(InputState state, List<TestAction> pressedActions) =>
+        protected override ReplayFrame HandleFrame(InputState state, List<TestAction> pressedActions, ReplayFrame previousFrame) =>
             new TestReplayFrame(Time.Current, ToLocalSpace(state.Mouse.Position), pressedActions.ToArray());
     }
 
@@ -241,6 +238,10 @@ namespace osu.Game.Tests.Gameplay
 
         private readonly List<T> pressedActions = new List<T>();
 
+        private InputManager inputManager;
+
+        public int RecordFrameRate = 60;
+
         protected ReplayRecorder(Replay target)
         {
             this.target = target;
@@ -250,33 +251,45 @@ namespace osu.Game.Tests.Gameplay
             Depth = float.MinValue;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            inputManager = GetContainingInputManager();
+        }
+
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
-            recordFrame();
+            recordFrame(false);
             return base.OnMouseMove(e);
         }
 
         public bool OnPressed(T action)
         {
             pressedActions.Add(action);
-            recordFrame();
+            recordFrame(true);
             return false;
         }
 
         public void OnReleased(T action)
         {
             pressedActions.Remove(action);
-            recordFrame();
+            recordFrame(true);
         }
 
-        private void recordFrame()
+        private void recordFrame(bool important)
         {
-            var frame = HandleFrame(GetContainingInputManager().CurrentState, pressedActions);
+            var last = target.Frames.LastOrDefault();
+
+            if (!important && last != null && Time.Current - last.Time < (1000d / RecordFrameRate))
+                return;
+
+            var frame = HandleFrame(inputManager.CurrentState, pressedActions, last);
 
             if (frame != null)
                 target.Frames.Add(frame);
         }
 
-        protected abstract ReplayFrame HandleFrame(InputState state, List<T> pressedActions);
+        protected abstract ReplayFrame HandleFrame(InputState state, List<T> testActions, ReplayFrame previousFrame);
     }
 }

From 6d480680612b2bf0f875e36fa7d86ddc16464013 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 19:03:42 +0900
Subject: [PATCH 01677/10326] Move replay recorder to final location

---
 osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs | 23 ++++++
 .../Gameplay/TestSceneReplayRecording.cs      | 80 +-----------------
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  2 +
 osu.Game/Rulesets/UI/ReplayRecorder.cs        | 81 +++++++++++++++++++
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 16 ++++
 5 files changed, 123 insertions(+), 79 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
 create mode 100644 osu.Game/Rulesets/UI/ReplayRecorder.cs

diff --git a/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs b/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
new file mode 100644
index 0000000000..898212ee6b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.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 System.Collections.Generic;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    public class OsuReplayRecorder : ReplayRecorder<OsuAction>
+    {
+        public OsuReplayRecorder(Replay replay)
+            : base(replay)
+        {
+        }
+
+        protected override ReplayFrame HandleFrame(Vector2 position, List<OsuAction> actions, ReplayFrame previousFrame)
+            => new OsuReplayFrame(Time.Current, position, actions.ToArray());
+    }
+}
diff --git a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
index c2b2ebdb98..ab1998a650 100644
--- a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
@@ -1,13 +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 System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges;
@@ -41,7 +38,7 @@ namespace osu.Game.Tests.Gameplay
                     {
                         new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
-                            RecordTarget = replay,
+                            Recorder = new TestReplayRecorder(replay),
                             Child = new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
@@ -171,19 +168,6 @@ namespace osu.Game.Tests.Gameplay
 
     public class TestRulesetInputManager : RulesetInputManager<TestAction>
     {
-        private ReplayRecorder<TestAction> recorder;
-
-        public Replay RecordTarget
-        {
-            set
-            {
-                if (recorder != null)
-                    throw new InvalidOperationException("Cannot attach more than one recorder");
-
-                KeyBindingContainer.Add(recorder = new TestReplayRecorder(value));
-            }
-        }
-
         public TestRulesetInputManager(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
             : base(ruleset, variant, unique)
         {
@@ -230,66 +214,4 @@ namespace osu.Game.Tests.Gameplay
         protected override ReplayFrame HandleFrame(InputState state, List<TestAction> pressedActions, ReplayFrame previousFrame) =>
             new TestReplayFrame(Time.Current, ToLocalSpace(state.Mouse.Position), pressedActions.ToArray());
     }
-
-    internal abstract class ReplayRecorder<T> : Component, IKeyBindingHandler<T>
-        where T : struct
-    {
-        private readonly Replay target;
-
-        private readonly List<T> pressedActions = new List<T>();
-
-        private InputManager inputManager;
-
-        public int RecordFrameRate = 60;
-
-        protected ReplayRecorder(Replay target)
-        {
-            this.target = target;
-
-            RelativeSizeAxes = Axes.Both;
-
-            Depth = float.MinValue;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            inputManager = GetContainingInputManager();
-        }
-
-        protected override bool OnMouseMove(MouseMoveEvent e)
-        {
-            recordFrame(false);
-            return base.OnMouseMove(e);
-        }
-
-        public bool OnPressed(T action)
-        {
-            pressedActions.Add(action);
-            recordFrame(true);
-            return false;
-        }
-
-        public void OnReleased(T action)
-        {
-            pressedActions.Remove(action);
-            recordFrame(true);
-        }
-
-        private void recordFrame(bool important)
-        {
-            var last = target.Frames.LastOrDefault();
-
-            if (!important && last != null && Time.Current - last.Time < (1000d / RecordFrameRate))
-                return;
-
-            var frame = HandleFrame(inputManager.CurrentState, pressedActions, last);
-
-            if (frame != null)
-                target.Frames.Add(frame);
-        }
-
-        protected abstract ReplayFrame HandleFrame(InputState state, List<T> testActions, ReplayFrame previousFrame);
-    }
 }
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index d0a2722f58..c8af3be980 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -302,6 +302,8 @@ namespace osu.Game.Rulesets.UI
 
         protected virtual ReplayInputHandler CreateReplayInputHandler(Replay replay) => null;
 
+        protected virtual ReplayRecorder CreateReplayRecorder(Replay replay) => null;
+
         /// <summary>
         /// Creates a Playfield.
         /// </summary>
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
new file mode 100644
index 0000000000..9e2f898206
--- /dev/null
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.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.Collections.Generic;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Framework.Input.States;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.UI
+{
+    public abstract class ReplayRecorder<T> : ReplayRecorder, IKeyBindingHandler<T>
+        where T : struct
+    {
+        private readonly Replay target;
+
+        private readonly List<T> pressedActions = new List<T>();
+
+        private InputManager inputManager;
+
+        public int RecordFrameRate = 60;
+
+        protected ReplayRecorder(Replay target)
+        {
+            this.target = target;
+
+            RelativeSizeAxes = Axes.Both;
+
+            Depth = float.MinValue;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            inputManager = GetContainingInputManager();
+        }
+
+        protected override bool OnMouseMove(MouseMoveEvent e)
+        {
+            recordFrame(false);
+            return base.OnMouseMove(e);
+        }
+
+        public bool OnPressed(T action)
+        {
+            pressedActions.Add(action);
+            recordFrame(true);
+            return false;
+        }
+
+        public void OnReleased(T action)
+        {
+            pressedActions.Remove(action);
+            recordFrame(true);
+        }
+
+        private void recordFrame(bool important)
+        {
+            var last = target.Frames.LastOrDefault();
+
+            if (!important && last != null && Time.Current - last.Time < (1000d / RecordFrameRate))
+                return;
+
+            var frame = HandleFrame(inputManager.CurrentState, pressedActions, last);
+
+            if (frame != null)
+                target.Frames.Add(frame);
+        }
+
+        protected abstract ReplayFrame HandleFrame(InputState state, List<T> testActions, ReplayFrame previousFrame);
+    }
+
+    public abstract class ReplayRecorder : Component
+    {
+    }
+}
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 7f85c10b56..043e0f56cc 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.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.Bindables;
@@ -26,6 +27,21 @@ namespace osu.Game.Rulesets.UI
     public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachKeyCounter, IHasReplayHandler
         where T : struct
     {
+        private ReplayRecorder recorder;
+
+        public ReplayRecorder Recorder
+        {
+            set
+            {
+                if (recorder != null)
+                    throw new InvalidOperationException("Cannot attach more than one recorder");
+
+                recorder = value;
+
+                KeyBindingContainer.Add(recorder);
+            }
+        }
+
         protected override InputState CreateInitialState()
         {
             var state = base.CreateInitialState();

From 14a85a84bf6001336b82702b7a9e5ba815bab0a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 19:18:56 +0900
Subject: [PATCH 01678/10326] Add proper screen space - gamefield mapping

---
 osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs     |  2 ++
 .../Gameplay/TestSceneReplayRecording.cs           | 14 +++++++++-----
 osu.Game/Rulesets/UI/Playfield.cs                  |  5 +++++
 osu.Game/Rulesets/UI/ReplayRecorder.cs             | 10 +++++++---
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index a37ef8d9a0..b4d51d11c9 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -58,6 +58,8 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new OsuFramedReplayInputHandler(replay);
 
+        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new OsuReplayRecorder(replay);
+
         public override double GameplayStartTime
         {
             get
diff --git a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
index ab1998a650..fe87ca675b 100644
--- a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges;
-using osu.Framework.Input.States;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
@@ -25,6 +24,8 @@ namespace osu.Game.Tests.Gameplay
     {
         private readonly TestRulesetInputManager playbackManager;
 
+        private readonly TestRulesetInputManager recordingManager;
+
         public TestSceneReplayRecording()
         {
             Replay replay = new Replay();
@@ -36,9 +37,12 @@ namespace osu.Game.Tests.Gameplay
                 {
                     new Drawable[]
                     {
-                        new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
+                        recordingManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
-                            Recorder = new TestReplayRecorder(replay),
+                            Recorder = new TestReplayRecorder(replay)
+                            {
+                                ScreenSpaceToGamefield = pos => recordingManager.ToLocalSpace(pos)
+                            },
                             Child = new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
@@ -211,7 +215,7 @@ namespace osu.Game.Tests.Gameplay
         {
         }
 
-        protected override ReplayFrame HandleFrame(InputState state, List<TestAction> pressedActions, ReplayFrame previousFrame) =>
-            new TestReplayFrame(Time.Current, ToLocalSpace(state.Mouse.Position), pressedActions.ToArray());
+        protected override ReplayFrame HandleFrame(Vector2 position, List<TestAction> actions, ReplayFrame previousFrame) =>
+            new TestReplayFrame(Time.Current, position, actions.ToArray());
     }
 }
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 047047ccfd..8141108aef 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -30,6 +30,11 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public Func<Vector2, Vector2> GamefieldToScreenSpace => HitObjectContainer.ToScreenSpace;
 
+        /// <summary>
+        /// A function that converts screen space coordinates to gamefield.
+        /// </summary>
+        public Func<Vector2, Vector2> ScreenSpaceToGamefield => HitObjectContainer.ToLocalSpace;
+
         /// <summary>
         /// All the <see cref="DrawableHitObject"/>s contained in this <see cref="Playfield"/> and all <see cref="NestedPlayfields"/>.
         /// </summary>
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index 9e2f898206..74e8109d52 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -1,15 +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;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Input.States;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
+using osuTK;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -66,16 +67,19 @@ namespace osu.Game.Rulesets.UI
             if (!important && last != null && Time.Current - last.Time < (1000d / RecordFrameRate))
                 return;
 
-            var frame = HandleFrame(inputManager.CurrentState, pressedActions, last);
+            var position = ScreenSpaceToGamefield?.Invoke(inputManager.CurrentState.Mouse.Position) ?? inputManager.CurrentState.Mouse.Position;
+
+            var frame = HandleFrame(position, pressedActions, last);
 
             if (frame != null)
                 target.Frames.Add(frame);
         }
 
-        protected abstract ReplayFrame HandleFrame(InputState state, List<T> testActions, ReplayFrame previousFrame);
+        protected abstract ReplayFrame HandleFrame(Vector2 position, List<T> actions, ReplayFrame previousFrame);
     }
 
     public abstract class ReplayRecorder : Component
     {
+        public Func<Vector2, Vector2> ScreenSpaceToGamefield;
     }
 }

From 617149fb2702a4686ee9ce69200ea7c84f250d35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 19:31:43 +0900
Subject: [PATCH 01679/10326] Implement in player

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs     | 17 +++++++++++++++++
 osu.Game/Rulesets/UI/RulesetInputManager.cs |  7 ++++++-
 osu.Game/Screens/Play/Player.cs             | 18 ++++++++++++++++++
 osu.Game/Screens/Play/ReplayPlayer.cs       |  3 +--
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index c8af3be980..5c57a92cd1 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -262,6 +262,17 @@ namespace osu.Game.Rulesets.UI
             Playfield.Add(drawableObject);
         }
 
+        public override void SetRecordTarget(Replay recordingReplay)
+        {
+            if (!(KeyBindingInputManager is IHasRecordingHandler recordingInputHandler))
+                throw new InvalidOperationException($"A {nameof(KeyBindingInputManager)} which supports recording is not available");
+
+            var recorder = CreateReplayRecorder(recordingReplay);
+            recorder.ScreenSpaceToGamefield = Playfield.ScreenSpaceToGamefield;
+
+            recordingInputHandler.Recorder = recorder;
+        }
+
         public override void SetReplayScore(Score replayScore)
         {
             if (!(KeyBindingInputManager is IHasReplayHandler replayInputManager))
@@ -472,6 +483,12 @@ namespace osu.Game.Rulesets.UI
         /// <param name="replayScore">The replay, null for local input.</param>
         public abstract void SetReplayScore(Score replayScore);
 
+        /// <summary>
+        /// Sets a replay to be used to record gameplay.
+        /// </summary>
+        /// <param name="recordingReplay">The target to be recorded to.</param>
+        public abstract void SetRecordTarget(Replay recordingReplay);
+
         /// <summary>
         /// Invoked when the interactive user requests resuming from a paused state.
         /// Allows potentially delaying the resume process until an interaction is performed.
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 043e0f56cc..ba30fe28d5 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -24,7 +24,7 @@ using MouseState = osu.Framework.Input.States.MouseState;
 
 namespace osu.Game.Rulesets.UI
 {
-    public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachKeyCounter, IHasReplayHandler
+    public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachKeyCounter, IHasReplayHandler, IHasRecordingHandler
         where T : struct
     {
         private ReplayRecorder recorder;
@@ -184,6 +184,11 @@ namespace osu.Game.Rulesets.UI
         ReplayInputHandler ReplayInputHandler { get; set; }
     }
 
+    public interface IHasRecordingHandler
+    {
+        public ReplayRecorder Recorder { set; }
+    }
+
     /// <summary>
     /// Supports attaching a <see cref="KeyCounterDisplay"/>.
     /// Keys will be populated automatically and a receptor will be injected inside.
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a120963abd..8fee516f2b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -19,6 +19,7 @@ using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
+using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -118,6 +119,23 @@ namespace osu.Game.Screens.Play
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            PrepareReplay();
+        }
+
+        private Replay recordingReplay;
+
+        /// <summary>
+        /// Run any recording / playback setup for replays.
+        /// </summary>
+        protected virtual void PrepareReplay()
+        {
+            DrawableRuleset.SetRecordTarget(recordingReplay = new Replay());
+        }
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, OsuConfigManager config)
         {
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index b040549efc..8708b5f634 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -18,9 +18,8 @@ namespace osu.Game.Screens.Play
             this.score = score;
         }
 
-        protected override void LoadComplete()
+        protected override void PrepareReplay()
         {
-            base.LoadComplete();
             DrawableRuleset?.SetReplayScore(score);
         }
 

From 2fa42ed644d4dede960ec3e1bb4c424551b22ec6 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Mon, 23 Mar 2020 12:54:08 -0400
Subject: [PATCH 01680/10326] use N2 for ModTimeRamp, add x text

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

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index f21ba684b4..c1f3e357a1 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The final speed to ramp to")]
         public abstract BindableNumber<double> FinalRate { get; }
 
-        public override string SettingDescription => $"{InitialRate.Value:0.#} to {FinalRate.Value:N1}";
+        public override string SettingDescription => $"{InitialRate.Value:N2}x to {FinalRate.Value:N2}x";
 
         private double finalRateTime;
         private double beginRampTime;

From 96848405fd8df958850d4421c5eb31625416586f Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 23 Mar 2020 10:54:45 -0700
Subject: [PATCH 01681/10326] Fix song select filter not absorbing input from
 carousel

---
 osu.Game/Screens/Select/FilterControl.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 6a03cfb68e..c831e1dcc4 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -16,6 +16,7 @@ using Container = osu.Framework.Graphics.Containers.Container;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
+using osu.Framework.Input.Events;
 
 namespace osu.Game.Screens.Select
 {
@@ -184,5 +185,7 @@ namespace osu.Game.Screens.Select
         }
 
         private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());
+
+        protected override bool OnClick(ClickEvent e) => true;
     }
 }

From 96d962ab307dfd6c6f7e5213ae5bead1ef241403 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 23 Mar 2020 11:25:40 -0700
Subject: [PATCH 01682/10326] Fix autoplay keyboard shortcut not working with
 keypad enter key

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

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 9e2f5761dd..8b0547376d 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Screens.Select
             switch (e.Key)
             {
                 case Key.Enter:
+                case Key.KeypadEnter:
                     // 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();

From 5bc51193891766d39cd564a06d52383bacad3f7a Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 23 Mar 2020 16:03:33 -0700
Subject: [PATCH 01683/10326] Handle OnHover on song select filter and footer

---
 osu.Game/Screens/Select/FilterControl.cs | 2 ++
 osu.Game/Screens/Select/Footer.cs        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index c831e1dcc4..a4a7ac5c9d 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -187,5 +187,7 @@ namespace osu.Game.Screens.Select
         private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());
 
         protected override bool OnClick(ClickEvent e) => true;
+
+        protected override bool OnHover(HoverEvent e) => true;
     }
 }
diff --git a/osu.Game/Screens/Select/Footer.cs b/osu.Game/Screens/Select/Footer.cs
index 1dc7081c1c..689a11166a 100644
--- a/osu.Game/Screens/Select/Footer.cs
+++ b/osu.Game/Screens/Select/Footer.cs
@@ -107,5 +107,7 @@ namespace osu.Game.Screens.Select
         protected override bool OnMouseDown(MouseDownEvent e) => true;
 
         protected override bool OnClick(ClickEvent e) => true;
+
+        protected override bool OnHover(HoverEvent e) => true;
     }
 }

From e5f4d8686e04b610ac560b3e62cd60c3f7425445 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 10:38:24 +0900
Subject: [PATCH 01684/10326] Rename decoder

---
 ...dLegacyScoreParser.cs => DatabasedLegacyScoreDecoder.cs} | 6 +++---
 .../Legacy/{LegacyScoreParser.cs => LegacyScoreDecoder.cs}  | 2 +-
 osu.Game/Scoring/LegacyDatabasedScore.cs                    | 2 +-
 osu.Game/Scoring/ScoreManager.cs                            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game/Scoring/Legacy/{DatabasedLegacyScoreParser.cs => DatabasedLegacyScoreDecoder.cs} (74%)
 rename osu.Game/Scoring/Legacy/{LegacyScoreParser.cs => LegacyScoreDecoder.cs} (99%)

diff --git a/osu.Game/Scoring/Legacy/DatabasedLegacyScoreParser.cs b/osu.Game/Scoring/Legacy/DatabasedLegacyScoreDecoder.cs
similarity index 74%
rename from osu.Game/Scoring/Legacy/DatabasedLegacyScoreParser.cs
rename to osu.Game/Scoring/Legacy/DatabasedLegacyScoreDecoder.cs
index 2115d784a0..9b590f56dd 100644
--- a/osu.Game/Scoring/Legacy/DatabasedLegacyScoreParser.cs
+++ b/osu.Game/Scoring/Legacy/DatabasedLegacyScoreDecoder.cs
@@ -7,15 +7,15 @@ using osu.Game.Rulesets;
 namespace osu.Game.Scoring.Legacy
 {
     /// <summary>
-    /// A <see cref="LegacyScoreParser"/> which retrieves the applicable <see cref="Beatmap"/> and <see cref="Ruleset"/>
+    /// A <see cref="LegacyScoreDecoder"/> which retrieves the applicable <see cref="Beatmap"/> and <see cref="Ruleset"/>
     /// for the score from the database.
     /// </summary>
-    public class DatabasedLegacyScoreParser : LegacyScoreParser
+    public class DatabasedLegacyScoreDecoder : LegacyScoreDecoder
     {
         private readonly RulesetStore rulesets;
         private readonly BeatmapManager beatmaps;
 
-        public DatabasedLegacyScoreParser(RulesetStore rulesets, BeatmapManager beatmaps)
+        public DatabasedLegacyScoreDecoder(RulesetStore rulesets, BeatmapManager beatmaps)
         {
             this.rulesets = rulesets;
             this.beatmaps = beatmaps;
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
similarity index 99%
rename from osu.Game/Scoring/Legacy/LegacyScoreParser.cs
rename to osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 19d8410cc2..f29e98b0b4 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -19,7 +19,7 @@ using SharpCompress.Compressors.LZMA;
 
 namespace osu.Game.Scoring.Legacy
 {
-    public abstract class LegacyScoreParser
+    public abstract class LegacyScoreDecoder
     {
         private IBeatmap currentBeatmap;
         private Ruleset currentRuleset;
diff --git a/osu.Game/Scoring/LegacyDatabasedScore.cs b/osu.Game/Scoring/LegacyDatabasedScore.cs
index 172e08e2d0..bd673eaa29 100644
--- a/osu.Game/Scoring/LegacyDatabasedScore.cs
+++ b/osu.Game/Scoring/LegacyDatabasedScore.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Scoring
             var replayFilename = score.Files.First(f => f.Filename.EndsWith(".osr", StringComparison.InvariantCultureIgnoreCase)).FileInfo.StoragePath;
 
             using (var stream = store.GetStream(replayFilename))
-                Replay = new DatabasedLegacyScoreParser(rulesets, beatmaps).Parse(stream).Replay;
+                Replay = new DatabasedLegacyScoreDecoder(rulesets, beatmaps).Parse(stream).Replay;
         }
     }
 }
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 249f0a932b..d5bd486e43 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -46,9 +46,9 @@ namespace osu.Game.Scoring
             {
                 try
                 {
-                    return new DatabasedLegacyScoreParser(rulesets, beatmaps()).Parse(stream).ScoreInfo;
+                    return new DatabasedLegacyScoreDecoder(rulesets, beatmaps()).Parse(stream).ScoreInfo;
                 }
-                catch (LegacyScoreParser.BeatmapNotFoundException e)
+                catch (LegacyScoreDecoder.BeatmapNotFoundException e)
                 {
                     Logger.Log(e.Message, LoggingTarget.Information, LogLevel.Error);
                     return null;

From 546772192ce30e0afd20e9830864de65ac11680d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 12:06:24 +0900
Subject: [PATCH 01685/10326] Add helper method to convert to legacy mods enums

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |  2 +-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 55 ++++++++++++++++-
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  2 +-
 osu.Game/Rulesets/Ruleset.cs                  | 60 ++++++++++++++++++-
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs |  2 +-
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 35 +++++++++++
 .../Tests/Beatmaps/LegacyModConversionTest.cs |  2 +-
 8 files changed, 151 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index b9d791fdb1..212365caad 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Catch
             new KeyBinding(InputKey.Shift, CatchAction.Dash),
         };
 
-        public override IEnumerable<Mod> ConvertLegacyMods(LegacyMods mods)
+        public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
             if (mods.HasFlag(LegacyMods.Nightcore))
                 yield return new CatchModNightcore();
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index b7b523a94d..9d06bd7c25 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mania
 
         public override ISkin CreateLegacySkinProvider(ISkinSource source) => new ManiaLegacySkinTransformer(source);
 
-        public override IEnumerable<Mod> ConvertLegacyMods(LegacyMods mods)
+        public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
             if (mods.HasFlag(LegacyMods.Nightcore))
                 yield return new ManiaModNightcore();
@@ -118,6 +118,59 @@ namespace osu.Game.Rulesets.Mania
                 yield return new ManiaModRandom();
         }
 
+        public override LegacyMods ConvertToLegacyMods(Mod[] mods)
+        {
+            var value = base.ConvertToLegacyMods(mods);
+
+            foreach (var mod in mods)
+            {
+                switch (mod)
+                {
+                    case ManiaModKey1 _:
+                        value |= LegacyMods.Key1;
+                        break;
+
+                    case ManiaModKey2 _:
+                        value |= LegacyMods.Key2;
+                        break;
+
+                    case ManiaModKey3 _:
+                        value |= LegacyMods.Key3;
+                        break;
+
+                    case ManiaModKey4 _:
+                        value |= LegacyMods.Key4;
+                        break;
+
+                    case ManiaModKey5 _:
+                        value |= LegacyMods.Key5;
+                        break;
+
+                    case ManiaModKey6 _:
+                        value |= LegacyMods.Key6;
+                        break;
+
+                    case ManiaModKey7 _:
+                        value |= LegacyMods.Key7;
+                        break;
+
+                    case ManiaModKey8 _:
+                        value |= LegacyMods.Key8;
+                        break;
+
+                    case ManiaModKey9 _:
+                        value |= LegacyMods.Key9;
+                        break;
+
+                    case ManiaModFadeIn _:
+                        value |= LegacyMods.FadeIn;
+                        break;
+                }
+            }
+
+            return value;
+        }
+
         public override IEnumerable<Mod> GetModsFor(ModType type)
         {
             switch (type)
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 148869f5e8..a2c0e051d0 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu
             new KeyBinding(InputKey.MouseRight, OsuAction.RightButton),
         };
 
-        public override IEnumerable<Mod> ConvertLegacyMods(LegacyMods mods)
+        public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
             if (mods.HasFlag(LegacyMods.Nightcore))
                 yield return new OsuModNightcore();
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index fc79e59864..dfcc886940 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Taiko
             new KeyBinding(InputKey.K, TaikoAction.RightRim),
         };
 
-        public override IEnumerable<Mod> ConvertLegacyMods(LegacyMods mods)
+        public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
             if (mods.HasFlag(LegacyMods.Nightcore))
                 yield return new TaikoModNightcore();
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index c38a5c6af7..58f598a203 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -42,9 +42,63 @@ namespace osu.Game.Rulesets
         /// <summary>
         /// Converts mods from legacy enum values. Do not override if you're not a legacy ruleset.
         /// </summary>
-        /// <param name="mods">The legacy enum which will be converted</param>
-        /// <returns>An enumerable of constructed <see cref="Mod"/>s</returns>
-        public virtual IEnumerable<Mod> ConvertLegacyMods(LegacyMods mods) => Array.Empty<Mod>();
+        /// <param name="mods">The legacy enum which will be converted.</param>
+        /// <returns>An enumerable of constructed <see cref="Mod"/>s.</returns>
+        public virtual IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods) => Array.Empty<Mod>();
+
+        /// <summary>
+        /// Converts mods to legacy enum values. Do not override if you're not a legacy ruleset.
+        /// </summary>
+        /// <param name="mods">The mods which will be converted.</param>
+        /// <returns>A single bitwise enumerable value representing (to the best of our ability) the mods.</returns>
+        public virtual LegacyMods ConvertToLegacyMods(Mod[] mods)
+        {
+            var value = LegacyMods.None;
+
+            foreach (var mod in mods)
+            {
+                switch (mod)
+                {
+                    case ModNoFail _:
+                        value |= LegacyMods.NoFail;
+                        break;
+
+                    case ModEasy _:
+                        value |= LegacyMods.Easy;
+                        break;
+
+                    case ModHidden _:
+                        value |= LegacyMods.Hidden;
+                        break;
+
+                    case ModHardRock _:
+                        value |= LegacyMods.HardRock;
+                        break;
+
+                    case ModSuddenDeath _:
+                        value |= LegacyMods.SuddenDeath;
+                        break;
+
+                    case ModDoubleTime _:
+                        value |= LegacyMods.DoubleTime;
+                        break;
+
+                    case ModRelax _:
+                        value |= LegacyMods.Relax;
+                        break;
+
+                    case ModHalfTime _:
+                        value |= LegacyMods.HalfTime;
+                        break;
+
+                    case ModFlashlight _:
+                        value |= LegacyMods.Flashlight;
+                        break;
+                }
+            }
+
+            return value;
+        }
 
         public ModAutoplay GetAutoplayMod() => GetAllMods().OfType<ModAutoplay>().First();
 
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index f29e98b0b4..495d8c8cc0 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Scoring.Legacy
                 /* score.Perfect = */
                 sr.ReadBoolean();
 
-                scoreInfo.Mods = currentRuleset.ConvertLegacyMods((LegacyMods)sr.ReadInt32()).ToArray();
+                scoreInfo.Mods = currentRuleset.ConvertFromLegacyMods((LegacyMods)sr.ReadInt32()).ToArray();
 
                 /* score.HpGraphString = */
                 sr.ReadString();
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
new file mode 100644
index 0000000000..927ab3fe07
--- /dev/null
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.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.IO;
+
+namespace osu.Game.Scoring.Legacy
+{
+    public class LegacyScoreEncoder
+    {
+        public const int LATEST_VERSION = 128;
+
+        private readonly Score score;
+
+        public LegacyScoreEncoder(Score score)
+        {
+            this.score = score;
+
+            if (score.ScoreInfo.Beatmap.RulesetID < 0 || score.ScoreInfo.Beatmap.RulesetID > 3)
+                throw new ArgumentException("Only scores in the osu, taiko, catch, or mania rulesets can be encoded to the legacy score format.", nameof(score));
+        }
+
+        public void Encode(TextWriter writer)
+        {
+            writer.WriteLine($"osu file format v{LATEST_VERSION}");
+
+            writer.WriteLine();
+            handleGeneral(writer);
+        }
+
+        private void handleGeneral(TextWriter writer)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
index e9251f8011..e93bf916c7 100644
--- a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Beatmaps
         protected void Test(LegacyMods legacyMods, Type[] expectedMods)
         {
             var ruleset = CreateRuleset();
-            var mods = ruleset.ConvertLegacyMods(legacyMods).ToList();
+            var mods = ruleset.ConvertFromLegacyMods(legacyMods).ToList();
             Assert.AreEqual(expectedMods.Length, mods.Count);
 
             foreach (var modType in expectedMods)

From 68ebe98fdee98368a276e07275c0d27fd10bc51c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 14:08:25 +0900
Subject: [PATCH 01686/10326] Remove unused GetUnderlyingStream method

---
 osu.Game.Tests/Scores/IO/ImportScoreTest.cs          | 2 --
 osu.Game/IO/Archives/ArchiveReader.cs                | 2 --
 osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs | 2 --
 osu.Game/IO/Archives/LegacyFileArchiveReader.cs      | 2 --
 osu.Game/IO/Archives/ZipArchiveReader.cs             | 2 --
 5 files changed, 10 deletions(-)

diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index a139c3a8c2..90bf419644 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -236,8 +236,6 @@ namespace osu.Game.Tests.Scores.IO
             }
 
             public override IEnumerable<string> Filenames => new[] { "test_file.osr" };
-
-            public override Stream GetUnderlyingStream() => new MemoryStream();
         }
     }
 }
diff --git a/osu.Game/IO/Archives/ArchiveReader.cs b/osu.Game/IO/Archives/ArchiveReader.cs
index 4ee7a19ebc..a30f961daf 100644
--- a/osu.Game/IO/Archives/ArchiveReader.cs
+++ b/osu.Game/IO/Archives/ArchiveReader.cs
@@ -45,7 +45,5 @@ namespace osu.Game.IO.Archives
                 return buffer;
             }
         }
-
-        public abstract Stream GetUnderlyingStream();
     }
 }
diff --git a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
index eff02ae7a5..dfae58aed7 100644
--- a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
+++ b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
@@ -28,7 +28,5 @@ namespace osu.Game.IO.Archives
         }
 
         public override IEnumerable<string> Filenames => Directory.GetFiles(path, "*", SearchOption.AllDirectories).Select(f => f.Replace(path, string.Empty).Trim(Path.DirectorySeparatorChar)).ToArray();
-
-        public override Stream GetUnderlyingStream() => null;
     }
 }
diff --git a/osu.Game/IO/Archives/LegacyFileArchiveReader.cs b/osu.Game/IO/Archives/LegacyFileArchiveReader.cs
index bd5f9cbd07..72e5a21079 100644
--- a/osu.Game/IO/Archives/LegacyFileArchiveReader.cs
+++ b/osu.Game/IO/Archives/LegacyFileArchiveReader.cs
@@ -28,7 +28,5 @@ namespace osu.Game.IO.Archives
         }
 
         public override IEnumerable<string> Filenames => new[] { Name };
-
-        public override Stream GetUnderlyingStream() => null;
     }
 }
diff --git a/osu.Game/IO/Archives/ZipArchiveReader.cs b/osu.Game/IO/Archives/ZipArchiveReader.cs
index 35f38ea7e8..80dfa104f3 100644
--- a/osu.Game/IO/Archives/ZipArchiveReader.cs
+++ b/osu.Game/IO/Archives/ZipArchiveReader.cs
@@ -45,7 +45,5 @@ namespace osu.Game.IO.Archives
         }
 
         public override IEnumerable<string> Filenames => archive.Entries.Select(e => e.Key).ExcludeSystemFileNames();
-
-        public override Stream GetUnderlyingStream() => archiveStream;
     }
 }

From b41f3f1cad7312708d864269cfb1c587ed2353ca Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Mon, 23 Mar 2020 22:37:53 -0700
Subject: [PATCH 01687/10326] Fix seeking back to beginning too early

---
 .../Compose/Components/Timeline/Timeline.cs   |  4 +++-
 osu.Game/Screens/Edit/EditorClock.cs          | 21 +++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index ddca5e42c2..590abf20b4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -130,7 +130,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (!track.IsLoaded)
                 return;
 
-            adjustableClock.Seek(Current / Content.DrawWidth * track.Length);
+            double target = Current / Content.DrawWidth * track.Length;
+
+            adjustableClock.Seek(Math.Min(track.Length, target));
         }
 
         private void scrollToTrackTime()
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index aef304bd6e..b4ab867774 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -43,18 +43,21 @@ namespace osu.Game.Screens.Edit
         {
             base.ProcessFrame();
 
-            var playbackAlreadyStopped = playbackFinished;
-            playbackFinished = CurrentTime >= TrackLength;
-
-            if (playbackFinished && IsRunning)
+            if (IsRunning)
             {
-                if (!playbackAlreadyStopped)
+                var playbackAlreadyStopped = playbackFinished;
+                playbackFinished = CurrentTime >= TrackLength;
+
+                if (playbackFinished)
                 {
-                    Stop();
-                    Seek(TrackLength);
+                    if (!playbackAlreadyStopped)
+                    {
+                        Stop();
+                        Seek(TrackLength);
+                    }
+                    else
+                        Seek(0);
                 }
-                else
-                    Seek(0);
             }
         }
 

From 4bb15a8b93e1290c6a1052005bf3c2bd47623f6c Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Mon, 23 Mar 2020 22:51:37 -0700
Subject: [PATCH 01688/10326] Allow individual storyboard layers to disable
 masking

---
 osu.Game/Screens/Play/DimmableStoryboard.cs               | 1 -
 osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs | 1 +
 osu.Game/Storyboards/StoryboardLayer.cs                   | 4 +++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index 0fe315fbab..eabdee95fb 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Screens.Play
                 return;
 
             drawableStoryboard = storyboard.CreateDrawable();
-            drawableStoryboard.Masking = true;
 
             if (async)
                 LoadComponentAsync(drawableStoryboard, Add);
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
index 39f5418902..69219fb038 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Storyboards.Drawables
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
             Enabled = layer.EnabledWhenPassing;
+            Masking = layer.Masking;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Storyboards/StoryboardLayer.cs b/osu.Game/Storyboards/StoryboardLayer.cs
index d15f771534..e3b74ca609 100644
--- a/osu.Game/Storyboards/StoryboardLayer.cs
+++ b/osu.Game/Storyboards/StoryboardLayer.cs
@@ -10,15 +10,17 @@ namespace osu.Game.Storyboards
     {
         public string Name;
         public int Depth;
+        public bool Masking;
         public bool EnabledWhenPassing = true;
         public bool EnabledWhenFailing = true;
 
         public List<IStoryboardElement> Elements = new List<IStoryboardElement>();
 
-        public StoryboardLayer(string name, int depth)
+        public StoryboardLayer(string name, int depth, bool masking = true)
         {
             Name = name;
             Depth = depth;
+            Masking = masking;
         }
 
         public void Add(IStoryboardElement element)

From 022465f546ba5cfb93f21f9792365cf6010d3a2f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 14:13:46 +0900
Subject: [PATCH 01689/10326] Add encoding and import support

---
 .../Replays/CatchReplayFrame.cs               |  9 ++
 .../Replays/ManiaReplayFrame.cs               | 37 ++++++++
 .../Replays/OsuReplayFrame.cs                 | 12 +++
 .../Replays/TaikoReplayFrame.cs               | 12 +++
 osu.Game/IO/Archives/LegacyByteArrayReader.cs | 30 ++++++
 .../Replays/Types/IConvertibleReplayFrame.cs  |  6 ++
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  4 +
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 91 +++++++++++++++++--
 osu.Game/Screens/Play/Player.cs               | 37 +++++---
 9 files changed, 220 insertions(+), 18 deletions(-)
 create mode 100644 osu.Game/IO/Archives/LegacyByteArrayReader.cs

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs b/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
index b41a5e0612..bc60f16ae8 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
@@ -56,5 +56,14 @@ namespace osu.Game.Rulesets.Catch.Replays
                     Actions.Add(CatchAction.MoveLeft);
             }
         }
+
+        public LegacyReplayFrame ConvertTo(IBeatmap beatmap)
+        {
+            ReplayButtonState state = ReplayButtonState.None;
+
+            if (Actions.Contains(CatchAction.Dash)) state |= ReplayButtonState.Left1;
+
+            return new LegacyReplayFrame(Time, Position * CatchPlayfield.BASE_WIDTH, null, state);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
index 877a9ee410..4987aa8e4c 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
@@ -56,5 +56,42 @@ namespace osu.Game.Rulesets.Mania.Replays
                 activeColumns >>= 1;
             }
         }
+
+        public LegacyReplayFrame ConvertTo(IBeatmap beatmap)
+        {
+            int keys = 0;
+
+            var converter = new ManiaBeatmapConverter(beatmap, new ManiaRuleset());
+
+            var stage = new StageDefinition { Columns = converter.TargetColumns };
+
+            var specialColumns = new List<int>();
+
+            for (int i = 0; i < converter.TargetColumns; i++)
+            {
+                if (stage.IsSpecialColumn(i))
+                    specialColumns.Add(i);
+            }
+
+            foreach (var action in Actions)
+            {
+                switch (action)
+                {
+                    case ManiaAction.Special1:
+                        keys |= 1 << specialColumns[0];
+                        break;
+
+                    case ManiaAction.Special2:
+                        keys |= 1 << specialColumns[1];
+                        break;
+
+                    default:
+                        keys |= 1 << (action - ManiaAction.Key1);
+                        break;
+                }
+            }
+
+            return new LegacyReplayFrame(Time, keys, null, ReplayButtonState.None);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs b/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs
index e6c6db5e61..93cf4db5b1 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs
@@ -32,5 +32,17 @@ namespace osu.Game.Rulesets.Osu.Replays
             if (currentFrame.MouseLeft) Actions.Add(OsuAction.LeftButton);
             if (currentFrame.MouseRight) Actions.Add(OsuAction.RightButton);
         }
+
+        public LegacyReplayFrame ConvertTo(IBeatmap beatmap)
+        {
+            ReplayButtonState state = ReplayButtonState.None;
+
+            if (Actions.Contains(OsuAction.LeftButton))
+                state |= ReplayButtonState.Left1;
+            if (Actions.Contains(OsuAction.RightButton))
+                state |= ReplayButtonState.Right1;
+
+            return new LegacyReplayFrame(Time, Position.X, Position.Y, state);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoReplayFrame.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoReplayFrame.cs
index c5ebefc397..cb4ca35c2b 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoReplayFrame.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoReplayFrame.cs
@@ -30,5 +30,17 @@ namespace osu.Game.Rulesets.Taiko.Replays
             if (currentFrame.MouseLeft1) Actions.Add(TaikoAction.LeftCentre);
             if (currentFrame.MouseLeft2) Actions.Add(TaikoAction.RightCentre);
         }
+
+        public LegacyReplayFrame ConvertTo(IBeatmap beatmap)
+        {
+            ReplayButtonState state = ReplayButtonState.None;
+
+            if (Actions.Contains(TaikoAction.LeftRim)) state |= ReplayButtonState.Right1;
+            if (Actions.Contains(TaikoAction.RightRim)) state |= ReplayButtonState.Right2;
+            if (Actions.Contains(TaikoAction.LeftCentre)) state |= ReplayButtonState.Left1;
+            if (Actions.Contains(TaikoAction.RightCentre)) state |= ReplayButtonState.Left2;
+
+            return new LegacyReplayFrame(Time, null, null, state);
+        }
     }
 }
diff --git a/osu.Game/IO/Archives/LegacyByteArrayReader.cs b/osu.Game/IO/Archives/LegacyByteArrayReader.cs
new file mode 100644
index 0000000000..0c3620403f
--- /dev/null
+++ b/osu.Game/IO/Archives/LegacyByteArrayReader.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace osu.Game.IO.Archives
+{
+    /// <summary>
+    /// Allows reading a single file from the provided stream.
+    /// </summary>
+    public class LegacyByteArrayReader : ArchiveReader
+    {
+        private readonly byte[] content;
+
+        public LegacyByteArrayReader(byte[] content, string filename)
+            : base(filename)
+        {
+            this.content = content;
+        }
+
+        public override Stream GetStream(string name) => new MemoryStream(content);
+
+        public override void Dispose()
+        {
+        }
+
+        public override IEnumerable<string> Filenames => new[] { Name };
+    }
+}
diff --git a/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs b/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs
index c2947c0aca..a240e7aa0e 100644
--- a/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs
+++ b/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs
@@ -18,5 +18,11 @@ namespace osu.Game.Rulesets.Replays.Types
         /// <param name="beatmap">The beatmap.</param>
         /// <param name="lastFrame">The last post-conversion <see cref="ReplayFrame"/>, used to fill in missing delta information. May be null.</param>
         void ConvertFrom(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null);
+
+        /// <summary>
+        /// Populates this <see cref="ReplayFrame"/> using values from a <see cref="LegacyReplayFrame"/>.
+        /// </summary>
+        /// <param name="beatmap">The beatmap.</param>
+        LegacyReplayFrame ConvertTo(IBeatmap beatmap);
     }
 }
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 5c57a92cd1..e4e2f5d569 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -268,6 +268,10 @@ namespace osu.Game.Rulesets.UI
                 throw new InvalidOperationException($"A {nameof(KeyBindingInputManager)} which supports recording is not available");
 
             var recorder = CreateReplayRecorder(recordingReplay);
+
+            if (recorder == null)
+                return;
+
             recorder.ScreenSpaceToGamefield = Playfield.ScreenSpaceToGamefield;
 
             recordingInputHandler.Recorder = recorder;
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 927ab3fe07..3e3120d99f 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -3,6 +3,14 @@
 
 using System;
 using System.IO;
+using System.Linq;
+using System.Text;
+using osu.Framework.Extensions;
+using osu.Game.Beatmaps;
+using osu.Game.IO.Legacy;
+using osu.Game.Replays.Legacy;
+using osu.Game.Rulesets.Replays.Types;
+using SharpCompress.Compressors.LZMA;
 
 namespace osu.Game.Scoring.Legacy
 {
@@ -11,25 +19,96 @@ namespace osu.Game.Scoring.Legacy
         public const int LATEST_VERSION = 128;
 
         private readonly Score score;
+        private readonly IBeatmap beatmap;
 
-        public LegacyScoreEncoder(Score score)
+        public LegacyScoreEncoder(Score score, IBeatmap beatmap)
         {
             this.score = score;
+            this.beatmap = beatmap;
 
             if (score.ScoreInfo.Beatmap.RulesetID < 0 || score.ScoreInfo.Beatmap.RulesetID > 3)
                 throw new ArgumentException("Only scores in the osu, taiko, catch, or mania rulesets can be encoded to the legacy score format.", nameof(score));
         }
 
-        public void Encode(TextWriter writer)
+        public void Encode(Stream stream)
         {
-            writer.WriteLine($"osu file format v{LATEST_VERSION}");
+            using (SerializationWriter sw = new SerializationWriter(stream))
+            {
+                sw.Write((byte)score.ScoreInfo.RulesetID);
+                sw.Write(LATEST_VERSION);
+                sw.Write(score.ScoreInfo.Beatmap.MD5Hash);
+                sw.Write(score.ScoreInfo.UserString);
+                sw.Write($"lazer-{score.ScoreInfo.UserString}-{score.ScoreInfo.Date}".ComputeMD5Hash());
+                sw.Write((ushort)(score.ScoreInfo.GetCount300() ?? 0));
+                sw.Write((ushort)(score.ScoreInfo.GetCount100() ?? 0));
+                sw.Write((ushort)(score.ScoreInfo.GetCount50() ?? 0));
+                sw.Write((ushort)(score.ScoreInfo.GetCountGeki() ?? 0));
+                sw.Write((ushort)(score.ScoreInfo.GetCountKatu() ?? 0));
+                sw.Write((ushort)(score.ScoreInfo.GetCountMiss() ?? 0));
+                sw.Write((int)(score.ScoreInfo.TotalScore));
+                sw.Write((ushort)score.ScoreInfo.MaxCombo);
+                sw.Write(score.ScoreInfo.Combo == score.ScoreInfo.MaxCombo);
+                sw.Write((int)score.ScoreInfo.Ruleset.CreateInstance().ConvertToLegacyMods(score.ScoreInfo.Mods));
 
-            writer.WriteLine();
-            handleGeneral(writer);
+                sw.Write(getHpGraphFormatted());
+                sw.Write(score.ScoreInfo.Date.DateTime);
+                sw.WriteByteArray(createReplayData());
+                sw.Write((long)0);
+                writeModSpecificData(score.ScoreInfo, sw);
+            }
         }
 
-        private void handleGeneral(TextWriter writer)
+        private void writeModSpecificData(ScoreInfo score, SerializationWriter sw)
         {
         }
+
+        private byte[] createReplayData()
+        {
+            var content = new ASCIIEncoding().GetBytes(replayStringContent);
+
+            using (var outStream = new MemoryStream())
+            {
+                using (var lzma = new LzmaStream(new LzmaEncoderProperties(false, 1 << 21, 255), false, outStream))
+                {
+                    outStream.Write(lzma.Properties);
+
+                    long fileSize = content.Length;
+                    for (int i = 0; i < 8; i++)
+                        outStream.WriteByte((byte)(fileSize >> (8 * i)));
+
+                    lzma.Write(content);
+                }
+
+                return outStream.ToArray();
+            }
+        }
+
+        private string replayStringContent
+        {
+            get
+            {
+                StringBuilder replayData = new StringBuilder();
+
+                if (score.Replay != null)
+                {
+                    LegacyReplayFrame lastF = new LegacyReplayFrame(0, 0, 0, ReplayButtonState.None);
+
+                    foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ConvertTo(beatmap)))
+                    {
+                        replayData.Append(FormattableString.Invariant($"{f.Time - lastF.Time}|{f.MouseX}|{f.MouseY}|{(int)f.ButtonState},"));
+                        lastF = f;
+                    }
+                }
+
+                replayData.AppendFormat(@"{0}|{1}|{2}|{3},", -12345, 0, 0, 0);
+                return replayData.ToString();
+            }
+        }
+
+        private string getHpGraphFormatted()
+        {
+            // todo: implement, maybe?
+            return string.Empty;
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8fee516f2b..f0f36db490 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -17,6 +18,7 @@ using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
+using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Replays;
@@ -25,6 +27,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 using osu.Game.Users;
@@ -643,19 +646,29 @@ namespace osu.Game.Screens.Play
             completionProgressDelegate?.Cancel();
             completionProgressDelegate = Schedule(delegate
             {
-                var score = CreateScore();
-
-                if (DrawableRuleset.ReplayScore == null)
-                {
-                    scoreManager.Import(score).ContinueWith(_ => Schedule(() =>
-                    {
-                        // screen may be in the exiting transition phase.
-                        if (this.IsCurrentScreen())
-                            this.Push(CreateResults(score));
-                    }));
-                }
+                if (DrawableRuleset.ReplayScore != null)
+                    this.Push(CreateResults(DrawableRuleset.ReplayScore.ScoreInfo));
                 else
-                    this.Push(CreateResults(score));
+                {
+                    var score = new Score
+                    {
+                        ScoreInfo = CreateScore(),
+                        Replay = recordingReplay
+                    };
+
+                    using (var stream = new MemoryStream())
+                    {
+                        new LegacyScoreEncoder(score, gameplayBeatmap).Encode(stream);
+
+                        scoreManager.Import(score.ScoreInfo, new LegacyByteArrayReader(stream.ToArray(), "replay.osr"))
+                                    .ContinueWith(imported => Schedule(() =>
+                                    {
+                                        // screen may be in the exiting transition phase.
+                                        if (this.IsCurrentScreen())
+                                            this.Push(CreateResults(imported.Result));
+                                    }));
+                    }
+                }
             });
         }
 

From 96a849f897375c906d3ab8b672e8522aa93d3da4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 14:55:49 +0900
Subject: [PATCH 01690/10326] Add remaining replay recorders

---
 .../UI/CatchReplayRecorder.cs                 | 23 +++++++++++++++++++
 .../UI/DrawableCatchRuleset.cs                |  2 ++
 .../UI/DrawableManiaRuleset.cs                |  2 ++
 .../UI/ManiaReplayRecorder.cs                 | 23 +++++++++++++++++++
 .../UI/DrawableTaikoRuleset.cs                |  2 ++
 .../UI/TaikoReplayRecorder.cs                 | 23 +++++++++++++++++++
 6 files changed, 75 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs
 create mode 100644 osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
 create mode 100644 osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs

diff --git a/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs b/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs
new file mode 100644
index 0000000000..8bede32c59
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.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 System.Collections.Generic;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Catch.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.UI
+{
+    public class CatchReplayRecorder : ReplayRecorder<CatchAction>
+    {
+        public CatchReplayRecorder(Replay target)
+            : base(target)
+        {
+        }
+
+        protected override ReplayFrame HandleFrame(Vector2 position, List<CatchAction> actions, ReplayFrame previousFrame)
+            => new CatchReplayFrame(Time.Current, position.X, actions.Contains(CatchAction.Dash), previousFrame as CatchReplayFrame);
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index fd8a1d175d..594c7a57c7 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);
 
+        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new CatchReplayRecorder(replay);
+
         protected override Playfield CreatePlayfield() => new CatchPlayfield(Beatmap.BeatmapInfo.BaseDifficulty, CreateDrawableRepresentation);
 
         public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new CatchPlayfieldAdjustmentContainer();
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 2c497541a8..e5ec054fa7 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -85,5 +85,7 @@ namespace osu.Game.Rulesets.Mania.UI
         }
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new ManiaFramedReplayInputHandler(replay);
+
+        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new ManiaReplayRecorder(replay);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs b/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
new file mode 100644
index 0000000000..57cbc1ff17
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.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 System.Collections.Generic;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public class ManiaReplayRecorder : ReplayRecorder<ManiaAction>
+    {
+        public ManiaReplayRecorder(Replay replay)
+            : base(replay)
+        {
+        }
+
+        protected override ReplayFrame HandleFrame(Vector2 position, List<ManiaAction> actions, ReplayFrame previousFrame)
+            => new ManiaReplayFrame(Time.Current, actions.ToArray());
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 9196bbf13e..e4a4b555a7 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -65,5 +65,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         }
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new TaikoFramedReplayInputHandler(replay);
+
+        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new TaikoReplayRecorder(replay);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs b/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs
new file mode 100644
index 0000000000..4330ae6464
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.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 System.Collections.Generic;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Taiko.Replays;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public class TaikoReplayRecorder : ReplayRecorder<TaikoAction>
+    {
+        public TaikoReplayRecorder(Replay replay)
+            : base(replay)
+        {
+        }
+
+        protected override ReplayFrame HandleFrame(Vector2 position, List<TaikoAction> actions, ReplayFrame previousFrame) =>
+            new TaikoReplayFrame(Time.Current, actions.ToArray());
+    }
+}

From 388cf5c83a40ed2650cb947cda677c681f51a481 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 15:38:54 +0900
Subject: [PATCH 01691/10326] Fix catch positional data being incorrectly
 recorded

---
 osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs   | 9 ++++++---
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs  | 2 +-
 osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs   | 2 +-
 osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs       | 4 ++--
 osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs   | 2 +-
 osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs | 4 ++--
 osu.Game/Rulesets/UI/ReplayRecorder.cs              | 2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs b/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs
index 8bede32c59..9a4d1f9585 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs
@@ -12,12 +12,15 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public class CatchReplayRecorder : ReplayRecorder<CatchAction>
     {
-        public CatchReplayRecorder(Replay target)
+        private readonly CatchPlayfield playfield;
+
+        public CatchReplayRecorder(Replay target, CatchPlayfield playfield)
             : base(target)
         {
+            this.playfield = playfield;
         }
 
-        protected override ReplayFrame HandleFrame(Vector2 position, List<CatchAction> actions, ReplayFrame previousFrame)
-            => new CatchReplayFrame(Time.Current, position.X, actions.Contains(CatchAction.Dash), previousFrame as CatchReplayFrame);
+        protected override ReplayFrame HandleFrame(Vector2 mousePosition, List<CatchAction> actions, ReplayFrame previousFrame)
+            => new CatchReplayFrame(Time.Current, playfield.CatcherArea.MovableCatcher.X, actions.Contains(CatchAction.Dash), previousFrame as CatchReplayFrame);
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index 594c7a57c7..ebe45aa3ab 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);
 
-        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new CatchReplayRecorder(replay);
+        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new CatchReplayRecorder(replay, (CatchPlayfield)Playfield);
 
         protected override Playfield CreatePlayfield() => new CatchPlayfield(Beatmap.BeatmapInfo.BaseDifficulty, CreateDrawableRepresentation);
 
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs b/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
index 57cbc1ff17..18275000a2 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Mania.UI
         {
         }
 
-        protected override ReplayFrame HandleFrame(Vector2 position, List<ManiaAction> actions, ReplayFrame previousFrame)
+        protected override ReplayFrame HandleFrame(Vector2 mousePosition, List<ManiaAction> actions, ReplayFrame previousFrame)
             => new ManiaReplayFrame(Time.Current, actions.ToArray());
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs b/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
index 898212ee6b..b68ea136d5 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.UI
         {
         }
 
-        protected override ReplayFrame HandleFrame(Vector2 position, List<OsuAction> actions, ReplayFrame previousFrame)
-            => new OsuReplayFrame(Time.Current, position, actions.ToArray());
+        protected override ReplayFrame HandleFrame(Vector2 mousePosition, List<OsuAction> actions, ReplayFrame previousFrame)
+            => new OsuReplayFrame(Time.Current, mousePosition, actions.ToArray());
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs b/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs
index 4330ae6464..1859dabf03 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
         }
 
-        protected override ReplayFrame HandleFrame(Vector2 position, List<TaikoAction> actions, ReplayFrame previousFrame) =>
+        protected override ReplayFrame HandleFrame(Vector2 mousePosition, List<TaikoAction> actions, ReplayFrame previousFrame) =>
             new TaikoReplayFrame(Time.Current, actions.ToArray());
     }
 }
diff --git a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
index fe87ca675b..057d026132 100644
--- a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Gameplay
         {
         }
 
-        protected override ReplayFrame HandleFrame(Vector2 position, List<TestAction> actions, ReplayFrame previousFrame) =>
-            new TestReplayFrame(Time.Current, position, actions.ToArray());
+        protected override ReplayFrame HandleFrame(Vector2 mousePosition, List<TestAction> actions, ReplayFrame previousFrame) =>
+            new TestReplayFrame(Time.Current, mousePosition, actions.ToArray());
     }
 }
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index 74e8109d52..c977639584 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.UI
                 target.Frames.Add(frame);
         }
 
-        protected abstract ReplayFrame HandleFrame(Vector2 position, List<T> actions, ReplayFrame previousFrame);
+        protected abstract ReplayFrame HandleFrame(Vector2 mousePosition, List<T> actions, ReplayFrame previousFrame);
     }
 
     public abstract class ReplayRecorder : Component

From 448961b330f3ad087b558ff87cded8ddb7e57540 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 15:39:01 +0900
Subject: [PATCH 01692/10326] Rename incorrect variable

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index e4e2f5d569..27993ff173 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -264,7 +264,7 @@ namespace osu.Game.Rulesets.UI
 
         public override void SetRecordTarget(Replay recordingReplay)
         {
-            if (!(KeyBindingInputManager is IHasRecordingHandler recordingInputHandler))
+            if (!(KeyBindingInputManager is IHasRecordingHandler recordingInputManager))
                 throw new InvalidOperationException($"A {nameof(KeyBindingInputManager)} which supports recording is not available");
 
             var recorder = CreateReplayRecorder(recordingReplay);
@@ -274,7 +274,7 @@ namespace osu.Game.Rulesets.UI
 
             recorder.ScreenSpaceToGamefield = Playfield.ScreenSpaceToGamefield;
 
-            recordingInputHandler.Recorder = recorder;
+            recordingInputManager.Recorder = recorder;
         }
 
         public override void SetReplayScore(Score replayScore)

From 02a3c7c025866795894a7eae5757ee41f6034d15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 15:43:22 +0900
Subject: [PATCH 01693/10326] Fix incorrect ruleset being recorded to file

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

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 3e3120d99f..0ba595b1c5 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Scoring.Legacy
         {
             using (SerializationWriter sw = new SerializationWriter(stream))
             {
-                sw.Write((byte)score.ScoreInfo.RulesetID);
+                sw.Write((byte)(score.ScoreInfo.Ruleset.ID ?? 0));
                 sw.Write(LATEST_VERSION);
                 sw.Write(score.ScoreInfo.Beatmap.MD5Hash);
                 sw.Write(score.ScoreInfo.UserString);

From 2feb66d4233b58772b219e9ee29ad96775af1742 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 15:43:34 +0900
Subject: [PATCH 01694/10326] Correctly handle missing positional data

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

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 0ba595b1c5..515cdc8864 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Scoring.Legacy
 
                     foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ConvertTo(beatmap)))
                     {
-                        replayData.Append(FormattableString.Invariant($"{f.Time - lastF.Time}|{f.MouseX}|{f.MouseY}|{(int)f.ButtonState},"));
+                        replayData.Append(FormattableString.Invariant($"{f.Time - lastF.Time}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
                         lastF = f;
                     }
                 }

From a7bfaad60fdb18115549b2c031c01b0a538f355b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 15:44:39 +0900
Subject: [PATCH 01695/10326] More correctly handle rulesets which don't
 support replay recording

---
 osu.Game/Screens/Play/Player.cs | 34 ++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index f0f36db490..7723a84637 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -650,24 +650,28 @@ namespace osu.Game.Screens.Play
                     this.Push(CreateResults(DrawableRuleset.ReplayScore.ScoreInfo));
                 else
                 {
-                    var score = new Score
-                    {
-                        ScoreInfo = CreateScore(),
-                        Replay = recordingReplay
-                    };
+                    var score = new Score { ScoreInfo = CreateScore() };
 
-                    using (var stream = new MemoryStream())
-                    {
-                        new LegacyScoreEncoder(score, gameplayBeatmap).Encode(stream);
+                    LegacyByteArrayReader replayReader = null;
 
-                        scoreManager.Import(score.ScoreInfo, new LegacyByteArrayReader(stream.ToArray(), "replay.osr"))
-                                    .ContinueWith(imported => Schedule(() =>
-                                    {
-                                        // screen may be in the exiting transition phase.
-                                        if (this.IsCurrentScreen())
-                                            this.Push(CreateResults(imported.Result));
-                                    }));
+                    if (recordingReplay?.Frames.Count > 0)
+                    {
+                        score.Replay = recordingReplay;
+
+                        using (var stream = new MemoryStream())
+                        {
+                            new LegacyScoreEncoder(score, gameplayBeatmap).Encode(stream);
+                            replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
+                        }
                     }
+
+                    scoreManager.Import(score.ScoreInfo, replayReader)
+                                .ContinueWith(imported => Schedule(() =>
+                                {
+                                    // screen may be in the exiting transition phase.
+                                    if (this.IsCurrentScreen())
+                                        this.Push(CreateResults(imported.Result));
+                                }));
                 }
             });
         }

From 2735a2250c1236e92cdc9be5a323e570a717d57b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 19:03:42 +0900
Subject: [PATCH 01696/10326] Move replay recorder to final location

---
 .../Gameplay/TestSceneReplayRecording.cs      | 80 +-----------------
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  2 +
 osu.Game/Rulesets/UI/ReplayRecorder.cs        | 81 +++++++++++++++++++
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 16 ++++
 4 files changed, 100 insertions(+), 79 deletions(-)
 create mode 100644 osu.Game/Rulesets/UI/ReplayRecorder.cs

diff --git a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
index c2b2ebdb98..ab1998a650 100644
--- a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
@@ -1,13 +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 System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges;
@@ -41,7 +38,7 @@ namespace osu.Game.Tests.Gameplay
                     {
                         new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
-                            RecordTarget = replay,
+                            Recorder = new TestReplayRecorder(replay),
                             Child = new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
@@ -171,19 +168,6 @@ namespace osu.Game.Tests.Gameplay
 
     public class TestRulesetInputManager : RulesetInputManager<TestAction>
     {
-        private ReplayRecorder<TestAction> recorder;
-
-        public Replay RecordTarget
-        {
-            set
-            {
-                if (recorder != null)
-                    throw new InvalidOperationException("Cannot attach more than one recorder");
-
-                KeyBindingContainer.Add(recorder = new TestReplayRecorder(value));
-            }
-        }
-
         public TestRulesetInputManager(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
             : base(ruleset, variant, unique)
         {
@@ -230,66 +214,4 @@ namespace osu.Game.Tests.Gameplay
         protected override ReplayFrame HandleFrame(InputState state, List<TestAction> pressedActions, ReplayFrame previousFrame) =>
             new TestReplayFrame(Time.Current, ToLocalSpace(state.Mouse.Position), pressedActions.ToArray());
     }
-
-    internal abstract class ReplayRecorder<T> : Component, IKeyBindingHandler<T>
-        where T : struct
-    {
-        private readonly Replay target;
-
-        private readonly List<T> pressedActions = new List<T>();
-
-        private InputManager inputManager;
-
-        public int RecordFrameRate = 60;
-
-        protected ReplayRecorder(Replay target)
-        {
-            this.target = target;
-
-            RelativeSizeAxes = Axes.Both;
-
-            Depth = float.MinValue;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            inputManager = GetContainingInputManager();
-        }
-
-        protected override bool OnMouseMove(MouseMoveEvent e)
-        {
-            recordFrame(false);
-            return base.OnMouseMove(e);
-        }
-
-        public bool OnPressed(T action)
-        {
-            pressedActions.Add(action);
-            recordFrame(true);
-            return false;
-        }
-
-        public void OnReleased(T action)
-        {
-            pressedActions.Remove(action);
-            recordFrame(true);
-        }
-
-        private void recordFrame(bool important)
-        {
-            var last = target.Frames.LastOrDefault();
-
-            if (!important && last != null && Time.Current - last.Time < (1000d / RecordFrameRate))
-                return;
-
-            var frame = HandleFrame(inputManager.CurrentState, pressedActions, last);
-
-            if (frame != null)
-                target.Frames.Add(frame);
-        }
-
-        protected abstract ReplayFrame HandleFrame(InputState state, List<T> testActions, ReplayFrame previousFrame);
-    }
 }
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index d0a2722f58..c8af3be980 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -302,6 +302,8 @@ namespace osu.Game.Rulesets.UI
 
         protected virtual ReplayInputHandler CreateReplayInputHandler(Replay replay) => null;
 
+        protected virtual ReplayRecorder CreateReplayRecorder(Replay replay) => null;
+
         /// <summary>
         /// Creates a Playfield.
         /// </summary>
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
new file mode 100644
index 0000000000..9e2f898206
--- /dev/null
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.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.Collections.Generic;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Framework.Input.States;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.UI
+{
+    public abstract class ReplayRecorder<T> : ReplayRecorder, IKeyBindingHandler<T>
+        where T : struct
+    {
+        private readonly Replay target;
+
+        private readonly List<T> pressedActions = new List<T>();
+
+        private InputManager inputManager;
+
+        public int RecordFrameRate = 60;
+
+        protected ReplayRecorder(Replay target)
+        {
+            this.target = target;
+
+            RelativeSizeAxes = Axes.Both;
+
+            Depth = float.MinValue;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            inputManager = GetContainingInputManager();
+        }
+
+        protected override bool OnMouseMove(MouseMoveEvent e)
+        {
+            recordFrame(false);
+            return base.OnMouseMove(e);
+        }
+
+        public bool OnPressed(T action)
+        {
+            pressedActions.Add(action);
+            recordFrame(true);
+            return false;
+        }
+
+        public void OnReleased(T action)
+        {
+            pressedActions.Remove(action);
+            recordFrame(true);
+        }
+
+        private void recordFrame(bool important)
+        {
+            var last = target.Frames.LastOrDefault();
+
+            if (!important && last != null && Time.Current - last.Time < (1000d / RecordFrameRate))
+                return;
+
+            var frame = HandleFrame(inputManager.CurrentState, pressedActions, last);
+
+            if (frame != null)
+                target.Frames.Add(frame);
+        }
+
+        protected abstract ReplayFrame HandleFrame(InputState state, List<T> testActions, ReplayFrame previousFrame);
+    }
+
+    public abstract class ReplayRecorder : Component
+    {
+    }
+}
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 7f85c10b56..043e0f56cc 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.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.Bindables;
@@ -26,6 +27,21 @@ namespace osu.Game.Rulesets.UI
     public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachKeyCounter, IHasReplayHandler
         where T : struct
     {
+        private ReplayRecorder recorder;
+
+        public ReplayRecorder Recorder
+        {
+            set
+            {
+                if (recorder != null)
+                    throw new InvalidOperationException("Cannot attach more than one recorder");
+
+                recorder = value;
+
+                KeyBindingContainer.Add(recorder);
+            }
+        }
+
         protected override InputState CreateInitialState()
         {
             var state = base.CreateInitialState();

From 8484d201d16488e83462bfb5ed722c307d616d0b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 15:54:04 +0900
Subject: [PATCH 01697/10326] Nest and rename test classes

---
 .../Gameplay/TestSceneReplayRecording.cs      | 188 +++++++++---------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
index ab1998a650..cd9486a70a 100644
--- a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Gameplay
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
                                     },
-                                    new TestConsumer()
+                                    new TestInputConsumer()
                                 }
                             },
                         }
@@ -86,7 +86,7 @@ namespace osu.Game.Tests.Gameplay
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
                                     },
-                                    new TestConsumer()
+                                    new TestInputConsumer()
                                 }
                             },
                         }
@@ -101,117 +101,117 @@ namespace osu.Game.Tests.Gameplay
 
             playbackManager.ReplayInputHandler.SetFrameFromTime(Time.Current - 500);
         }
-    }
 
-    public class TestFramedReplayInputHandler : FramedReplayInputHandler<TestReplayFrame>
-    {
-        public TestFramedReplayInputHandler(Replay replay)
-            : base(replay)
+        public class TestFramedReplayInputHandler : FramedReplayInputHandler<TestReplayFrame>
         {
-        }
-
-        public override List<IInput> GetPendingInputs()
-        {
-            return new List<IInput>
+            public TestFramedReplayInputHandler(Replay replay)
+                : base(replay)
             {
-                new MousePositionAbsoluteInput
-                {
-                    Position = GamefieldToScreenSpace(CurrentFrame?.Position ?? Vector2.Zero)
-                },
-                new ReplayState<TestAction>
-                {
-                    PressedActions = CurrentFrame?.Actions ?? new List<TestAction>()
-                }
-            };
-        }
-    }
+            }
 
-    public class TestConsumer : CompositeDrawable, IKeyBindingHandler<TestAction>
-    {
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent.ReceivePositionalInputAt(screenSpacePos);
-
-        private readonly Box box;
-
-        public TestConsumer()
-        {
-            Size = new Vector2(30);
-
-            Origin = Anchor.Centre;
-
-            InternalChildren = new Drawable[]
+            public override List<IInput> GetPendingInputs()
             {
-                box = new Box
+                return new List<IInput>
                 {
-                    Colour = Color4.Black,
-                    RelativeSizeAxes = Axes.Both,
-                },
-            };
+                    new MousePositionAbsoluteInput
+                    {
+                        Position = GamefieldToScreenSpace(CurrentFrame?.Position ?? Vector2.Zero)
+                    },
+                    new ReplayState<TestAction>
+                    {
+                        PressedActions = CurrentFrame?.Actions ?? new List<TestAction>()
+                    }
+                };
+            }
         }
 
-        protected override bool OnMouseMove(MouseMoveEvent e)
+        public class TestInputConsumer : CompositeDrawable, IKeyBindingHandler<TestAction>
         {
-            Position = e.MousePosition;
-            return base.OnMouseMove(e);
-        }
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent.ReceivePositionalInputAt(screenSpacePos);
 
-        public bool OnPressed(TestAction action)
-        {
-            box.Colour = Color4.White;
-            return true;
-        }
+            private readonly Box box;
 
-        public void OnReleased(TestAction action)
-        {
-            box.Colour = Color4.Black;
-        }
-    }
-
-    public class TestRulesetInputManager : RulesetInputManager<TestAction>
-    {
-        public TestRulesetInputManager(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
-            : base(ruleset, variant, unique)
-        {
-        }
-
-        protected override KeyBindingContainer<TestAction> CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
-            => new TestKeyBindingContainer();
-
-        internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
-        {
-            public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+            public TestInputConsumer()
             {
-                new KeyBinding(InputKey.MouseLeft, TestAction.Down),
-            };
+                Size = new Vector2(30);
+
+                Origin = Anchor.Centre;
+
+                InternalChildren = new Drawable[]
+                {
+                    box = new Box
+                    {
+                        Colour = Color4.Black,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                };
+            }
+
+            protected override bool OnMouseMove(MouseMoveEvent e)
+            {
+                Position = e.MousePosition;
+                return base.OnMouseMove(e);
+            }
+
+            public bool OnPressed(TestAction action)
+            {
+                box.Colour = Color4.White;
+                return true;
+            }
+
+            public void OnReleased(TestAction action)
+            {
+                box.Colour = Color4.Black;
+            }
         }
-    }
 
-    public class TestReplayFrame : ReplayFrame
-    {
-        public Vector2 Position;
-
-        public List<TestAction> Actions = new List<TestAction>();
-
-        public TestReplayFrame(double time, Vector2 position, params TestAction[] actions)
-            : base(time)
+        public class TestRulesetInputManager : RulesetInputManager<TestAction>
         {
-            Position = position;
-            Actions.AddRange(actions);
+            public TestRulesetInputManager(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+                : base(ruleset, variant, unique)
+            {
+            }
+
+            protected override KeyBindingContainer<TestAction> CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+                => new TestKeyBindingContainer();
+
+            internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
+            {
+                public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+                {
+                    new KeyBinding(InputKey.MouseLeft, TestAction.Down),
+                };
+            }
         }
-    }
 
-    public enum TestAction
-    {
-        Down,
-    }
-
-    internal class TestReplayRecorder : ReplayRecorder<TestAction>
-    {
-        public TestReplayRecorder(Replay target)
-            : base(target)
+        public class TestReplayFrame : ReplayFrame
         {
+            public Vector2 Position;
+
+            public List<TestAction> Actions = new List<TestAction>();
+
+            public TestReplayFrame(double time, Vector2 position, params TestAction[] actions)
+                : base(time)
+            {
+                Position = position;
+                Actions.AddRange(actions);
+            }
         }
 
-        protected override ReplayFrame HandleFrame(InputState state, List<TestAction> pressedActions, ReplayFrame previousFrame) =>
-            new TestReplayFrame(Time.Current, ToLocalSpace(state.Mouse.Position), pressedActions.ToArray());
+        public enum TestAction
+        {
+            Down,
+        }
+
+        internal class TestReplayRecorder : ReplayRecorder<TestAction>
+        {
+            public TestReplayRecorder(Replay target)
+                : base(target)
+            {
+            }
+
+            protected override ReplayFrame HandleFrame(InputState state, List<TestAction> pressedActions, ReplayFrame previousFrame) =>
+                new TestReplayFrame(Time.Current, ToLocalSpace(state.Mouse.Position), pressedActions.ToArray());
+        }
     }
 }

From 417ff837ac95434809dcf5333ec7246b6dd925fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Mar 2020 16:22:54 +0900
Subject: [PATCH 01698/10326] Add basic tests

---
 ...ecording.cs => TestSceneReplayRecorder.cs} | 79 +++++++++++++++++--
 1 file changed, 71 insertions(+), 8 deletions(-)
 rename osu.Game.Tests/Gameplay/{TestSceneReplayRecording.cs => TestSceneReplayRecorder.cs} (68%)

diff --git a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Gameplay/TestSceneReplayRecorder.cs
similarity index 68%
rename from osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
rename to osu.Game.Tests/Gameplay/TestSceneReplayRecorder.cs
index cd9486a70a..e99c399b89 100644
--- a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneReplayRecorder.cs
@@ -2,6 +2,8 @@
 // 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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -9,6 +11,8 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Input.States;
+using osu.Framework.Testing;
+using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
@@ -18,16 +22,23 @@ using osu.Game.Tests.Visual;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Gameplay
 {
-    public class TestSceneReplayRecording : OsuTestScene
+    public class TestSceneReplayRecorder : OsuManualInputManagerTestScene
     {
-        private readonly TestRulesetInputManager playbackManager;
+        private TestRulesetInputManager playbackManager;
+        private TestRulesetInputManager recordingManager;
 
-        public TestSceneReplayRecording()
+        private Replay replay;
+
+        private TestReplayRecorder recorder;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
-            Replay replay = new Replay();
+            replay = new Replay();
 
             Add(new GridContainer
             {
@@ -36,9 +47,9 @@ namespace osu.Game.Tests.Gameplay
                 {
                     new Drawable[]
                     {
-                        new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
+                        recordingManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
-                            Recorder = new TestReplayRecorder(replay),
+                            Recorder = recorder = new TestReplayRecorder(replay),
                             Child = new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
@@ -93,13 +104,65 @@ namespace osu.Game.Tests.Gameplay
                     }
                 }
             });
+        });
+
+        [Test]
+        public void TestBasic()
+        {
+            AddStep("move to center", () => InputManager.MoveMouseTo(recordingManager.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("one frame recorded", () => replay.Frames.Count == 1);
+            AddAssert("position matches", () => playbackManager.ChildrenOfType<Box>().First().Position == recordingManager.ChildrenOfType<Box>().First().Position);
+        }
+
+        [Test]
+        public void TestHighFrameRate()
+        {
+            ScheduledDelegate moveFunction = null;
+
+            AddStep("move to center", () => InputManager.MoveMouseTo(recordingManager.ScreenSpaceDrawQuad.Centre));
+            AddStep("much move", () => moveFunction = Scheduler.AddDelayed(() =>
+                InputManager.MoveMouseTo(InputManager.CurrentState.Mouse.Position + new Vector2(-1, 0)), 10, true));
+            AddWaitStep("move", 10);
+            AddStep("stop move", () => moveFunction.Cancel());
+            AddAssert("at least 60 frames recorded", () => replay.Frames.Count > 60);
+        }
+
+        [Test]
+        public void TestLimitedFrameRate()
+        {
+            ScheduledDelegate moveFunction = null;
+
+            AddStep("lower rate", () => recorder.RecordFrameRate = 2);
+            AddStep("move to center", () => InputManager.MoveMouseTo(recordingManager.ScreenSpaceDrawQuad.Centre));
+            AddStep("much move", () => moveFunction = Scheduler.AddDelayed(() =>
+                InputManager.MoveMouseTo(InputManager.CurrentState.Mouse.Position + new Vector2(-1, 0)), 10, true));
+            AddWaitStep("move", 10);
+            AddStep("stop move", () => moveFunction.Cancel());
+            AddAssert("less than 10 frames recorded", () => replay.Frames.Count < 10);
+        }
+
+        [Test]
+        public void TestLimitedFrameRateWithImportantFrames()
+        {
+            ScheduledDelegate moveFunction = null;
+
+            AddStep("lower rate", () => recorder.RecordFrameRate = 2);
+            AddStep("move to center", () => InputManager.MoveMouseTo(recordingManager.ScreenSpaceDrawQuad.Centre));
+            AddStep("much move with press", () => moveFunction = Scheduler.AddDelayed(() =>
+            {
+                InputManager.MoveMouseTo(InputManager.CurrentState.Mouse.Position + new Vector2(-1, 0));
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.ReleaseButton(MouseButton.Left);
+            }, 10, true));
+            AddWaitStep("move", 10);
+            AddStep("stop move", () => moveFunction.Cancel());
+            AddAssert("at least 60 frames recorded", () => replay.Frames.Count > 60);
         }
 
         protected override void Update()
         {
             base.Update();
-
-            playbackManager.ReplayInputHandler.SetFrameFromTime(Time.Current - 500);
+            playbackManager?.ReplayInputHandler.SetFrameFromTime(Time.Current - 100);
         }
 
         public class TestFramedReplayInputHandler : FramedReplayInputHandler<TestReplayFrame>

From e85f45f91125ed1e428772df542294992586601e Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 24 Mar 2020 22:03:16 +0100
Subject: [PATCH 01699/10326] Move old ScreenTitle to MultiHeaderTitle

---
 .../Graphics/UserInterface/ScreenTitle.cs     | 102 ------------------
 .../UserInterface/ScreenTitleTextureIcon.cs   |  40 -------
 osu.Game/Screens/Multi/Header.cs              |  77 ++++++++++++-
 3 files changed, 73 insertions(+), 146 deletions(-)
 delete mode 100644 osu.Game/Graphics/UserInterface/ScreenTitle.cs
 delete mode 100644 osu.Game/Graphics/UserInterface/ScreenTitleTextureIcon.cs

diff --git a/osu.Game/Graphics/UserInterface/ScreenTitle.cs b/osu.Game/Graphics/UserInterface/ScreenTitle.cs
deleted file mode 100644
index ecd0508258..0000000000
--- a/osu.Game/Graphics/UserInterface/ScreenTitle.cs
+++ /dev/null
@@ -1,102 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Sprites;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public abstract class ScreenTitle : CompositeDrawable, IHasAccentColour
-    {
-        public const float ICON_WIDTH = ICON_SIZE + spacing;
-
-        public const float ICON_SIZE = 25;
-        private const float spacing = 6;
-        private const int text_offset = 2;
-
-        private SpriteIcon iconSprite;
-        private readonly OsuSpriteText titleText, pageText;
-
-        protected IconUsage Icon
-        {
-            set
-            {
-                if (iconSprite == null)
-                    throw new InvalidOperationException($"Cannot use {nameof(Icon)} with a custom {nameof(CreateIcon)} function.");
-
-                iconSprite.Icon = value;
-            }
-        }
-
-        protected string Title
-        {
-            set => titleText.Text = value;
-        }
-
-        protected string Section
-        {
-            set => pageText.Text = value;
-        }
-
-        public Color4 AccentColour
-        {
-            get => pageText.Colour;
-            set => pageText.Colour = value;
-        }
-
-        protected virtual Drawable CreateIcon() => iconSprite = new SpriteIcon
-        {
-            Size = new Vector2(ICON_SIZE),
-        };
-
-        protected ScreenTitle()
-        {
-            AutoSizeAxes = Axes.Both;
-
-            InternalChildren = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Spacing = new Vector2(spacing, 0),
-                    Direction = FillDirection.Horizontal,
-                    Children = new[]
-                    {
-                        CreateIcon().With(t =>
-                        {
-                            t.Anchor = Anchor.Centre;
-                            t.Origin = Anchor.Centre;
-                        }),
-                        titleText = new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold),
-                            Margin = new MarginPadding { Bottom = text_offset }
-                        },
-                        new Circle
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(4),
-                            Colour = Color4.Gray,
-                        },
-                        pageText = new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Font = OsuFont.GetFont(size: 20),
-                            Margin = new MarginPadding { Bottom = text_offset }
-                        }
-                    }
-                },
-            };
-        }
-    }
-}
diff --git a/osu.Game/Graphics/UserInterface/ScreenTitleTextureIcon.cs b/osu.Game/Graphics/UserInterface/ScreenTitleTextureIcon.cs
deleted file mode 100644
index c2a13970de..0000000000
--- a/osu.Game/Graphics/UserInterface/ScreenTitleTextureIcon.cs
+++ /dev/null
@@ -1,40 +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.Sprites;
-using osu.Framework.Graphics.Textures;
-using osuTK;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    /// <summary>
-    /// A custom icon class for use with <see cref="ScreenTitle.CreateIcon()"/> based off a texture resource.
-    /// </summary>
-    public class ScreenTitleTextureIcon : CompositeDrawable
-    {
-        private readonly string textureName;
-
-        public ScreenTitleTextureIcon(string textureName)
-        {
-            this.textureName = textureName;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            Size = new Vector2(ScreenTitle.ICON_SIZE);
-
-            InternalChild = new Sprite
-            {
-                RelativeSizeAxes = Axes.Both,
-                Texture = textures.Get(textureName),
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                FillMode = FillMode.Fit
-            };
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index 0a05472ba3..6f790d703e 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -6,10 +6,13 @@ 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.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.SearchableList;
+using osu.Game.Graphics.Sprites;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi
@@ -43,7 +46,7 @@ namespace osu.Game.Screens.Multi
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.BottomLeft,
-                            X = -ScreenTitle.ICON_WIDTH,
+                            X = -MultiHeaderTitle.ICON_WIDTH,
                         },
                         breadcrumbs = new HeaderBreadcrumbControl(stack)
                         {
@@ -70,18 +73,84 @@ namespace osu.Game.Screens.Multi
             breadcrumbs.StripColour = colours.Green;
         }
 
-        private class MultiHeaderTitle : ScreenTitle
+        private class MultiHeaderTitle : CompositeDrawable, IHasAccentColour
         {
+            public const float ICON_WIDTH = ICON_SIZE + spacing;
+
+            public const float ICON_SIZE = 25;
+            private const float spacing = 6;
+            private const int text_offset = 2;
+
+            private SpriteIcon iconSprite;
+            private readonly OsuSpriteText titleText, pageText;
+
             public IMultiplayerSubScreen Screen
             {
-                set => Section = value.ShortTitle.ToLowerInvariant();
+                set => pageText.Text = value.ShortTitle.ToLowerInvariant();
+            }
+
+            protected string Title
+            {
+                set => titleText.Text = value;
+            }
+
+            public Color4 AccentColour
+            {
+                get => pageText.Colour;
+                set => pageText.Colour = value;
+            }
+
+            public MultiHeaderTitle()
+                : base()
+            {
+                AutoSizeAxes = Axes.Both;
+
+                InternalChildren = new Drawable[]
+                {
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(spacing, 0),
+                        Direction = FillDirection.Horizontal,
+                        Children = new Drawable[]
+                        {
+                            iconSprite = new SpriteIcon
+                            {
+                                Size = new Vector2(ICON_SIZE),
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre
+                            },
+                            titleText = new OsuSpriteText
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold),
+                                Margin = new MarginPadding { Bottom = text_offset }
+                            },
+                            new Circle
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Size = new Vector2(4),
+                                Colour = Color4.Gray,
+                            },
+                            pageText = new OsuSpriteText
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Font = OsuFont.GetFont(size: 20),
+                                Margin = new MarginPadding { Bottom = text_offset }
+                            }
+                        }
+                    },
+                };
             }
 
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
                 Title = "multi";
-                Icon = OsuIcon.Multi;
+                iconSprite.Icon = OsuIcon.Multi;
                 AccentColour = colours.Yellow;
             }
         }

From 127c16fccdfc0b836b4221e1692a83e232965257 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 24 Mar 2020 22:03:38 +0100
Subject: [PATCH 01700/10326] Implement OverlayTitle component

---
 osu.Game/Overlays/OverlayTitle.cs | 80 +++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 osu.Game/Overlays/OverlayTitle.cs

diff --git a/osu.Game/Overlays/OverlayTitle.cs b/osu.Game/Overlays/OverlayTitle.cs
new file mode 100644
index 0000000000..9fafee41b6
--- /dev/null
+++ b/osu.Game/Overlays/OverlayTitle.cs
@@ -0,0 +1,80 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Overlays
+{
+    public abstract class OverlayTitle : CompositeDrawable
+    {
+        private readonly OsuSpriteText title;
+        private readonly Container icon;
+
+        protected string Title
+        {
+            set => title.Text = value;
+        }
+
+        protected string IconTexture
+        {
+            set => icon.Child = new OverlayTitleIcon(value);
+        }
+
+        protected OverlayTitle()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Spacing = new Vector2(10, 0),
+                Direction = FillDirection.Horizontal,
+                Children = new Drawable[]
+                {
+                    icon = new Container
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Margin = new MarginPadding { Horizontal = 5 }, // compensates for osu-web sprites having around 5px of whitespace on each side
+                        Size = new Vector2(30)
+                    },
+                    title = new OsuSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Font = OsuFont.GetFont(size: 20, weight: FontWeight.Regular),
+                        Margin = new MarginPadding { Vertical = 17.5f } // 15px padding + 2.5px line-height difference compensation
+                    }
+                }
+            };
+        }
+
+        private class OverlayTitleIcon : Sprite
+        {
+            private readonly string textureName;
+
+            public OverlayTitleIcon(string textureName)
+            {
+                this.textureName = textureName;
+                
+                RelativeSizeAxes = Axes.Both;
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                FillMode = FillMode.Fit;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                Texture = textures.Get(textureName);
+            }
+        }
+    }
+}
\ No newline at end of file

From a5781d7fc595f6c017da739567233aa1dca63adc Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 24 Mar 2020 22:08:20 +0100
Subject: [PATCH 01701/10326] Replace ScreenTitle with OverlayTitle and update
 titles to match new design

---
 .../UserInterface/TestSceneOverlayHeader.cs   | 16 +++++++-------
 .../BeatmapListing/BeatmapListingHeader.cs    | 13 ++++--------
 .../Overlays/BeatmapSet/BeatmapSetHeader.cs   | 11 ++++------
 .../Overlays/Changelog/ChangelogHeader.cs     | 19 +++--------------
 osu.Game/Overlays/News/NewsHeader.cs          | 21 +++----------------
 osu.Game/Overlays/OverlayHeader.cs            |  8 +++----
 osu.Game/Overlays/OverlayTitle.cs             |  4 ++--
 osu.Game/Overlays/Profile/ProfileHeader.cs    | 11 ++++------
 .../Rankings/RankingsOverlayHeader.cs         | 21 ++++---------------
 9 files changed, 34 insertions(+), 90 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index 1cd68d1fdd..9dc71c7e74 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -100,21 +100,21 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestNoBackgroundHeader : OverlayHeader
         {
-            protected override ScreenTitle CreateTitle() => new TestTitle();
+            protected override OverlayTitle CreateTitle() => new TestTitle();
         }
 
         private class TestNoControlHeader : OverlayHeader
         {
             protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/changelog");
 
-            protected override ScreenTitle CreateTitle() => new TestTitle();
+            protected override OverlayTitle CreateTitle() => new TestTitle();
         }
 
         private class TestStringTabControlHeader : TabControlOverlayHeader<string>
         {
             protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/news");
 
-            protected override ScreenTitle CreateTitle() => new TestTitle();
+            protected override OverlayTitle CreateTitle() => new TestTitle();
 
             protected override Drawable CreateTitleContent() => new OverlayRulesetSelector();
 
@@ -129,7 +129,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/rankings");
 
-            protected override ScreenTitle CreateTitle() => new TestTitle();
+            protected override OverlayTitle CreateTitle() => new TestTitle();
         }
 
         private enum TestEnum
@@ -141,7 +141,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestBreadcrumbControlHeader : BreadcrumbControlOverlayHeader
         {
-            protected override ScreenTitle CreateTitle() => new TestTitle();
+            protected override OverlayTitle CreateTitle() => new TestTitle();
 
             public TestBreadcrumbControlHeader()
             {
@@ -151,15 +151,13 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
         }
 
-        private class TestTitle : ScreenTitle
+        private class TestTitle : OverlayTitle
         {
             public TestTitle()
             {
                 Title = "title";
-                Section = "section";
+                IconTexture = "Icons/changelog";
             }
-
-            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/changelog");
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
index 5af92914de..1bab200fec 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
@@ -1,24 +1,19 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
-
 namespace osu.Game.Overlays.BeatmapListing
 {
     public class BeatmapListingHeader : OverlayHeader
     {
-        protected override ScreenTitle CreateTitle() => new BeatmapListingTitle();
+        protected override OverlayTitle CreateTitle() => new BeatmapListingTitle();
 
-        private class BeatmapListingTitle : ScreenTitle
+        private class BeatmapListingTitle : OverlayTitle
         {
             public BeatmapListingTitle()
             {
-                Title = @"beatmap";
-                Section = @"listing";
+                Title = "beatmap listing";
+                IconTexture = "Icons/changelog";
             }
-
-            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/changelog");
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
index e5e3e276d5..4626589d81 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.BeatmapSet
@@ -14,22 +13,20 @@ namespace osu.Game.Overlays.BeatmapSet
 
         public BeatmapRulesetSelector RulesetSelector { get; private set; }
 
-        protected override ScreenTitle CreateTitle() => new BeatmapHeaderTitle();
+        protected override OverlayTitle CreateTitle() => new BeatmapHeaderTitle();
 
         protected override Drawable CreateTitleContent() => RulesetSelector = new BeatmapRulesetSelector
         {
             Current = Ruleset
         };
 
-        private class BeatmapHeaderTitle : ScreenTitle
+        private class BeatmapHeaderTitle : OverlayTitle
         {
             public BeatmapHeaderTitle()
             {
-                Title = @"beatmap";
-                Section = @"info";
+                Title = "beatmap info";
+                IconTexture = "Icons/changelog";
             }
-
-            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/changelog");
         }
     }
 }
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 532efeb4bd..050bdea03a 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -9,7 +9,6 @@ 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;
 
 namespace osu.Game.Overlays.Changelog
@@ -50,8 +49,6 @@ namespace osu.Game.Overlays.Changelog
             streamsBackground.Colour = colourProvider.Background5;
         }
 
-        private ChangelogHeaderTitle title;
-
         private void showBuild(ValueChangedEvent<APIChangelogBuild> e)
         {
             if (e.OldValue != null)
@@ -63,14 +60,11 @@ namespace osu.Game.Overlays.Changelog
                 Current.Value = e.NewValue.ToString();
 
                 updateCurrentStream();
-
-                title.Version = e.NewValue.UpdateStream.DisplayName;
             }
             else
             {
                 Current.Value = listing_string;
                 Streams.Current.Value = null;
-                title.Version = null;
             }
         }
 
@@ -100,7 +94,7 @@ namespace osu.Game.Overlays.Changelog
             }
         };
 
-        protected override ScreenTitle CreateTitle() => title = new ChangelogHeaderTitle();
+        protected override OverlayTitle CreateTitle() => new ChangelogHeaderTitle();
 
         public void Populate(List<APIUpdateStream> streams)
         {
@@ -116,20 +110,13 @@ namespace osu.Game.Overlays.Changelog
             Streams.Current.Value = Streams.Items.FirstOrDefault(s => s.Name == Build.Value.UpdateStream.Name);
         }
 
-        private class ChangelogHeaderTitle : ScreenTitle
+        private class ChangelogHeaderTitle : OverlayTitle
         {
-            public string Version
-            {
-                set => Section = value ?? listing_string;
-            }
-
             public ChangelogHeaderTitle()
             {
                 Title = "changelog";
-                Version = null;
+                IconTexture = "Icons/changelog";
             }
-
-            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/changelog");
         }
     }
 }
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index b55e3ffba0..8214c71b3a 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
 using System;
 
 namespace osu.Game.Overlays.News
@@ -12,8 +11,6 @@ namespace osu.Game.Overlays.News
     {
         private const string front_page_string = "frontpage";
 
-        private NewsHeaderTitle title;
-
         public readonly Bindable<string> Post = new Bindable<string>(null);
 
         public Action ShowFrontPage;
@@ -40,36 +37,24 @@ namespace osu.Game.Overlays.News
             {
                 TabControl.AddItem(e.NewValue);
                 Current.Value = e.NewValue;
-
-                title.IsReadingPost = true;
             }
             else
             {
                 Current.Value = front_page_string;
-                title.IsReadingPost = false;
             }
         }
 
         protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/news");
 
-        protected override ScreenTitle CreateTitle() => title = new NewsHeaderTitle();
+        protected override OverlayTitle CreateTitle() => new NewsHeaderTitle();
 
-        private class NewsHeaderTitle : ScreenTitle
+        private class NewsHeaderTitle : OverlayTitle
         {
-            private const string post_string = "post";
-
-            public bool IsReadingPost
-            {
-                set => Section = value ? post_string : front_page_string;
-            }
-
             public NewsHeaderTitle()
             {
                 Title = "news";
-                IsReadingPost = false;
+                IconTexture = "Icons/news";
             }
-
-            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/news");
         }
     }
 }
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index bedf8e5435..f017d66485 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays
     public abstract class OverlayHeader : Container
     {
         private readonly Box titleBackground;
-        private readonly ScreenTitle title;
+        private readonly OverlayTitle title;
 
         protected readonly FillFlowContainer HeaderInfo;
 
@@ -57,7 +57,6 @@ namespace osu.Game.Overlays
                                         Padding = new MarginPadding
                                         {
                                             Horizontal = UserProfileOverlay.CONTENT_X_MARGIN,
-                                            Vertical = 10,
                                         },
                                         Children = new[]
                                         {
@@ -86,7 +85,6 @@ namespace osu.Game.Overlays
         private void load(OverlayColourProvider colourProvider)
         {
             titleBackground.Colour = colourProvider.Dark5;
-            title.AccentColour = colourProvider.Highlight1;
         }
 
         [NotNull]
@@ -96,11 +94,11 @@ namespace osu.Game.Overlays
         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"/>.
+        /// Creates a <see cref="Drawable"/> on the opposite side of the <see cref="OverlayTitle"/>. Used mostly to create <see cref="OverlayRulesetSelector"/>.
         /// </summary>
         [NotNull]
         protected virtual Drawable CreateTitleContent() => Empty();
 
-        protected abstract ScreenTitle CreateTitle();
+        protected abstract OverlayTitle CreateTitle();
     }
 }
diff --git a/osu.Game/Overlays/OverlayTitle.cs b/osu.Game/Overlays/OverlayTitle.cs
index 9fafee41b6..1c9567428c 100644
--- a/osu.Game/Overlays/OverlayTitle.cs
+++ b/osu.Game/Overlays/OverlayTitle.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Overlays
             public OverlayTitleIcon(string textureName)
             {
                 this.textureName = textureName;
-                
+
                 RelativeSizeAxes = Axes.Both;
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
@@ -77,4 +77,4 @@ namespace osu.Game.Overlays
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index f7c09e33c1..0161d91daa 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.UserInterface;
 using osu.Game.Overlays.Profile.Header;
 using osu.Game.Users;
 
@@ -87,19 +86,17 @@ namespace osu.Game.Overlays.Profile
             }
         };
 
-        protected override ScreenTitle CreateTitle() => new ProfileHeaderTitle();
+        protected override OverlayTitle CreateTitle() => new ProfileHeaderTitle();
 
         private void updateDisplay(User user) => coverContainer.User = user;
 
-        private class ProfileHeaderTitle : ScreenTitle
+        private class ProfileHeaderTitle : OverlayTitle
         {
             public ProfileHeaderTitle()
             {
-                Title = "player";
-                Section = "info";
+                Title = "player info";
+                IconTexture = "Icons/profile";
             }
-
-            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/profile");
         }
     }
 }
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 99325aa1da..e30c6f07a8 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Bindables;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Users;
 
@@ -18,33 +17,21 @@ namespace osu.Game.Overlays.Rankings
         private OverlayRulesetSelector rulesetSelector;
         private CountryFilter countryFilter;
 
-        protected override ScreenTitle CreateTitle() => new RankingsTitle
-        {
-            Scope = { BindTarget = Current }
-        };
+        protected override OverlayTitle CreateTitle() => new RankingsTitle();
 
         protected override Drawable CreateTitleContent() => rulesetSelector = new OverlayRulesetSelector();
 
         protected override Drawable CreateContent() => countryFilter = new CountryFilter();
 
-        protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/rankings");
+        protected override Drawable CreateBackground() => new OverlayHeaderBackground("Headers/rankings");
 
-        private class RankingsTitle : ScreenTitle
+        private class RankingsTitle : OverlayTitle
         {
-            public readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
-
             public RankingsTitle()
             {
                 Title = "ranking";
+                IconTexture = "Icons/rankings";
             }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                Scope.BindValueChanged(scope => Section = scope.NewValue.ToString().ToLowerInvariant(), true);
-            }
-
-            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/rankings");
         }
     }
 

From 05de65937b950e7e35b3b55dbc6cf58528a54d8b Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 24 Mar 2020 22:14:15 +0100
Subject: [PATCH 01702/10326] Update ruleset selector design

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

diff --git a/osu.Game/Overlays/OverlayRulesetSelector.cs b/osu.Game/Overlays/OverlayRulesetSelector.cs
index b73d38eeb3..8c44157f78 100644
--- a/osu.Game/Overlays/OverlayRulesetSelector.cs
+++ b/osu.Game/Overlays/OverlayRulesetSelector.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays
         {
             AutoSizeAxes = Axes.Both,
             Direction = FillDirection.Horizontal,
-            Spacing = new Vector2(25, 0),
+            Spacing = new Vector2(20, 0),
         };
     }
 }
diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index 9b4dd5ba1e..9d4afc94d1 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets;
 using osuTK.Graphics;
 using osuTK;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Overlays
 {
@@ -53,6 +54,8 @@ namespace osu.Game.Overlays
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
                         Text = value.Name,
+                        Font = OsuFont.GetFont(size: 14),
+                        ShadowColour = Color4.Black.Opacity(0.75f)
                     }
                 },
                 new HoverClickSounds()

From 368bf585217409695bb4b336b97907b23834c560 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Mar 2020 11:08:08 +0900
Subject: [PATCH 01703/10326] Rename and make fields readonly

---
 .../Formats/LegacyStoryboardDecoderTest.cs       | 16 ++++++++--------
 .../Storyboards/Drawables/DrawableStoryboard.cs  |  2 +-
 .../Drawables/DrawableStoryboardLayer.cs         |  2 +-
 osu.Game/Storyboards/Storyboard.cs               |  4 ++--
 osu.Game/Storyboards/StoryboardLayer.cs          | 14 +++++++++-----
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 76b76aa357..a6945dca90 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -31,29 +31,29 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 StoryboardLayer background = storyboard.Layers.FirstOrDefault(l => l.Depth == 3);
                 Assert.IsNotNull(background);
                 Assert.AreEqual(16, background.Elements.Count);
-                Assert.IsTrue(background.EnabledWhenFailing);
-                Assert.IsTrue(background.EnabledWhenPassing);
+                Assert.IsTrue(background.VisibleWhenFailing);
+                Assert.IsTrue(background.VisibleWhenPassing);
                 Assert.AreEqual("Background", background.Name);
 
                 StoryboardLayer fail = storyboard.Layers.FirstOrDefault(l => l.Depth == 2);
                 Assert.IsNotNull(fail);
                 Assert.AreEqual(0, fail.Elements.Count);
-                Assert.IsTrue(fail.EnabledWhenFailing);
-                Assert.IsFalse(fail.EnabledWhenPassing);
+                Assert.IsTrue(fail.VisibleWhenFailing);
+                Assert.IsFalse(fail.VisibleWhenPassing);
                 Assert.AreEqual("Fail", fail.Name);
 
                 StoryboardLayer pass = storyboard.Layers.FirstOrDefault(l => l.Depth == 1);
                 Assert.IsNotNull(pass);
                 Assert.AreEqual(0, pass.Elements.Count);
-                Assert.IsFalse(pass.EnabledWhenFailing);
-                Assert.IsTrue(pass.EnabledWhenPassing);
+                Assert.IsFalse(pass.VisibleWhenFailing);
+                Assert.IsTrue(pass.VisibleWhenPassing);
                 Assert.AreEqual("Pass", pass.Name);
 
                 StoryboardLayer foreground = storyboard.Layers.FirstOrDefault(l => l.Depth == 0);
                 Assert.IsNotNull(foreground);
                 Assert.AreEqual(151, foreground.Elements.Count);
-                Assert.IsTrue(foreground.EnabledWhenFailing);
-                Assert.IsTrue(foreground.EnabledWhenPassing);
+                Assert.IsTrue(foreground.VisibleWhenFailing);
+                Assert.IsTrue(foreground.VisibleWhenPassing);
                 Assert.AreEqual("Foreground", foreground.Name);
 
                 int spriteCount = background.Elements.Count(x => x.GetType() == typeof(StoryboardSprite));
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 94d7395ecf..bc6e01a729 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Storyboards.Drawables
         private void updateLayerVisibility()
         {
             foreach (var layer in Children)
-                layer.Enabled = passing ? layer.Layer.EnabledWhenPassing : layer.Layer.EnabledWhenFailing;
+                layer.Enabled = passing ? layer.Layer.VisibleWhenPassing : layer.Layer.VisibleWhenFailing;
         }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
index 69219fb038..def4eed2ca 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Storyboards.Drawables
             RelativeSizeAxes = Axes.Both;
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
-            Enabled = layer.EnabledWhenPassing;
+            Enabled = layer.VisibleWhenPassing;
             Masking = layer.Masking;
         }
 
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 35bfe8c229..2ba8563ba8 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Storyboards
         public Storyboard()
         {
             layers.Add("Background", new StoryboardLayer("Background", 3));
-            layers.Add("Fail", new StoryboardLayer("Fail", 2) { EnabledWhenPassing = false, });
-            layers.Add("Pass", new StoryboardLayer("Pass", 1) { EnabledWhenFailing = false, });
+            layers.Add("Fail", new StoryboardLayer("Fail", 2) { VisibleWhenPassing = false, });
+            layers.Add("Pass", new StoryboardLayer("Pass", 1) { VisibleWhenFailing = false, });
             layers.Add("Foreground", new StoryboardLayer("Foreground", 0));
         }
 
diff --git a/osu.Game/Storyboards/StoryboardLayer.cs b/osu.Game/Storyboards/StoryboardLayer.cs
index e3b74ca609..142bc60deb 100644
--- a/osu.Game/Storyboards/StoryboardLayer.cs
+++ b/osu.Game/Storyboards/StoryboardLayer.cs
@@ -8,11 +8,15 @@ namespace osu.Game.Storyboards
 {
     public class StoryboardLayer
     {
-        public string Name;
-        public int Depth;
-        public bool Masking;
-        public bool EnabledWhenPassing = true;
-        public bool EnabledWhenFailing = true;
+        public readonly string Name;
+
+        public readonly int Depth;
+
+        public readonly bool Masking;
+
+        public bool VisibleWhenPassing = true;
+
+        public bool VisibleWhenFailing = true;
 
         public List<IStoryboardElement> Elements = new List<IStoryboardElement>();
 

From f2e0fba1648ee4668b63e3b30d7cb92ad137fe48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Mar 2020 11:59:59 +0900
Subject: [PATCH 01704/10326] Remove VideoFile from BeatmapMetadata

Leaving in database because it's a pain to drop columns.
---
 osu.Game/Beatmaps/BeatmapMetadata.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 9267527d79..001f319307 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -52,7 +52,6 @@ namespace osu.Game.Beatmaps
         public int PreviewTime { get; set; }
         public string AudioFile { get; set; }
         public string BackgroundFile { get; set; }
-        public string VideoFile { get; set; }
 
         public override string ToString() => $"{Artist} - {Title} ({Author})";
 
@@ -82,8 +81,7 @@ namespace osu.Game.Beatmaps
                    && Tags == other.Tags
                    && PreviewTime == other.PreviewTime
                    && AudioFile == other.AudioFile
-                   && BackgroundFile == other.BackgroundFile
-                   && VideoFile == other.VideoFile;
+                   && BackgroundFile == other.BackgroundFile;
         }
     }
 }

From b8f20831a18e8cb6bf1dddc7d08ee3b75d325e35 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Tue, 24 Mar 2020 20:04:09 -0700
Subject: [PATCH 01705/10326] Video no longer modifies storyboard resolution

---
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs | 4 ++--
 osu.Game/Storyboards/Storyboard.cs                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index ba4eb7209b..269449ef80 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -90,9 +90,9 @@ namespace osu.Game.Beatmaps.Formats
                     case LegacyEventType.Video:
                     {
                         var offset = Parsing.ParseInt(split[1]);
-                        var filename = CleanFilename(split[2]);
+                        var path = CleanFilename(split[2]);
 
-                        storyboard.GetLayer("Video").Add(new StoryboardVideo(filename, offset));
+                        storyboard.GetLayer("Video").Add(new StoryboardVideo(path, offset));
                         break;
                     }
 
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index dba8b4e176..a1ddafbacf 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Storyboards
 
         public Storyboard()
         {
-            layers.Add("Video", new StoryboardLayer("Video", 4));
+            layers.Add("Video", new StoryboardLayer("Video", 4, false));
             layers.Add("Background", new StoryboardLayer("Background", 3));
             layers.Add("Fail", new StoryboardLayer("Fail", 2) { VisibleWhenPassing = false, });
             layers.Add("Pass", new StoryboardLayer("Pass", 1) { VisibleWhenFailing = false, });
@@ -57,7 +57,7 @@ namespace osu.Game.Storyboards
         public DrawableStoryboard CreateDrawable(WorkingBeatmap working = null)
         {
             var drawable = new DrawableStoryboard(this);
-            drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard || GetLayer("Video").Elements.Any() ? 16 / 9f : 4 / 3f);
+            drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard ? 16 / 9f : 4 / 3f);
             return drawable;
         }
     }

From 87db1ba48703d07371f12f822d4d2eb765c1adfb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Mar 2020 14:58:49 +0900
Subject: [PATCH 01706/10326] Remove unused text transform helpers

---
 osu.Game/Graphics/Sprites/OsuSpriteText.cs | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/osu.Game/Graphics/Sprites/OsuSpriteText.cs b/osu.Game/Graphics/Sprites/OsuSpriteText.cs
index cd988c347b..76e46513ba 100644
--- a/osu.Game/Graphics/Sprites/OsuSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/OsuSpriteText.cs
@@ -1,9 +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.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 
 namespace osu.Game.Graphics.Sprites
 {
@@ -15,23 +13,4 @@ namespace osu.Game.Graphics.Sprites
             Font = OsuFont.Default;
         }
     }
-
-    public static class OsuSpriteTextTransformExtensions
-    {
-        /// <summary>
-        /// Sets <see cref="SpriteText.Text">Text</see> to a new value after a duration.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public static TransformSequence<T> TransformTextTo<T>(this T spriteText, string newText, double duration = 0, Easing easing = Easing.None)
-            where T : OsuSpriteText
-            => spriteText.TransformTo(nameof(OsuSpriteText.Text), newText, duration, easing);
-
-        /// <summary>
-        /// Sets <see cref="SpriteText.Text">Text</see> to a new value after a duration.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public static TransformSequence<T> TransformTextTo<T>(this TransformSequence<T> t, string newText, double duration = 0, Easing easing = Easing.None)
-            where T : OsuSpriteText
-            => t.Append(o => o.TransformTextTo(newText, duration, easing));
-    }
 }

From 880d138a47276f82323d3187e54375abfc85d252 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Mar 2020 15:12:19 +0900
Subject: [PATCH 01707/10326] Fix intro tests not asserting pass or working at
 all

---
 osu.Game.Tests/Visual/Menus/IntroTestScene.cs | 2 ++
 osu.Game/Screens/Menu/MainMenu.cs             | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/IntroTestScene.cs b/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
index 5870ef9813..1ad4d9dca9 100644
--- a/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
+++ b/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
@@ -64,6 +64,8 @@ namespace osu.Game.Tests.Visual.Menus
 
                 introStack.Push(CreateScreen());
             });
+
+            AddUntilStep("wait for menu", () => introStack.CurrentScreen is MainMenu);
         }
 
         protected abstract IScreen CreateScreen();
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 127270f521..dcee5e83b7 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Screens.Menu
             preloadSongSelect();
         }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
 
         private void confirmAndExit()
@@ -148,7 +148,7 @@ namespace osu.Game.Screens.Menu
             if (exitConfirmed) return;
 
             exitConfirmed = true;
-            game.PerformFromScreen(menu => menu.Exit());
+            game?.PerformFromScreen(menu => menu.Exit());
         }
 
         private void preloadSongSelect()

From b1d4261402088dd44aee59130863d15be2f90add Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Mar 2020 15:45:33 +0900
Subject: [PATCH 01708/10326] Fix track looping state not being reset when
 entering editor from song select

Closes #8432.
---
 osu.Game/Screens/Select/PlaySongSelect.cs | 2 --
 osu.Game/Screens/Select/SongSelect.cs     | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 8b0547376d..179aab54a3 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -85,8 +85,6 @@ namespace osu.Game.Screens.Select
                 }
             }
 
-            Beatmap.Value.Track.Looping = false;
-
             SampleConfirm?.Play();
 
             this.Push(player = new PlayerLoader(() => new Player()));
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index b6ec40ab88..895a8ad0c9 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -572,6 +572,9 @@ namespace osu.Game.Screens.Select
 
             BeatmapOptions.Hide();
 
+            if (Beatmap.Value.Track != null)
+                Beatmap.Value.Track.Looping = false;
+
             this.ScaleTo(1.1f, 250, Easing.InSine);
 
             this.FadeOut(250);

From d42c872f8f19923dd56388cd1ba632cc7298292a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Mar 2020 16:02:20 +0900
Subject: [PATCH 01709/10326] Better ensure track restarted

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

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs
index 0b128a974c..a824696022 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Editor
             AddUntilStep("Clock stops", () => !Clock.IsRunning);
             AddAssert("Clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
             AddStep("Start clock again", Clock.Start);
-            AddAssert("Clock looped", () => Clock.IsRunning && Clock.CurrentTime < Clock.TrackLength);
+            AddAssert("Clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
         }
     }
 }

From 8a2aac5f8377a27ceb33e22eeb5fa8dbb4432c9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Mar 2020 20:21:34 +0900
Subject: [PATCH 01710/10326] Rename conversion methods for clarity

---
 osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs        | 4 ++--
 osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs        | 4 ++--
 osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs            | 4 ++--
 osu.Game.Rulesets.Taiko/Replays/TaikoReplayFrame.cs        | 4 ++--
 osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs | 4 ++--
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs              | 2 +-
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs              | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs b/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
index bc60f16ae8..9dab3ed630 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Catch.Replays
             }
         }
 
-        public void ConvertFrom(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null)
+        public void FromLegacy(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null)
         {
             Position = currentFrame.Position.X / CatchPlayfield.BASE_WIDTH;
             Dashing = currentFrame.ButtonState == ReplayButtonState.Left1;
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Catch.Replays
             }
         }
 
-        public LegacyReplayFrame ConvertTo(IBeatmap beatmap)
+        public LegacyReplayFrame ToLegacy(IBeatmap beatmap)
         {
             ReplayButtonState state = ReplayButtonState.None;
 
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
index 4987aa8e4c..b93e372027 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.Replays
             Actions.AddRange(actions);
         }
 
-        public void ConvertFrom(LegacyReplayFrame legacyFrame, IBeatmap beatmap, ReplayFrame lastFrame = null)
+        public void FromLegacy(LegacyReplayFrame legacyFrame, IBeatmap beatmap, ReplayFrame lastFrame = null)
         {
             // We don't need to fully convert, just create the converter
             var converter = new ManiaBeatmapConverter(beatmap, new ManiaRuleset());
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Mania.Replays
             }
         }
 
-        public LegacyReplayFrame ConvertTo(IBeatmap beatmap)
+        public LegacyReplayFrame ToLegacy(IBeatmap beatmap)
         {
             int keys = 0;
 
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs b/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs
index 93cf4db5b1..3db81d70da 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs
@@ -26,14 +26,14 @@ namespace osu.Game.Rulesets.Osu.Replays
             Actions.AddRange(actions);
         }
 
-        public void ConvertFrom(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null)
+        public void FromLegacy(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null)
         {
             Position = currentFrame.Position;
             if (currentFrame.MouseLeft) Actions.Add(OsuAction.LeftButton);
             if (currentFrame.MouseRight) Actions.Add(OsuAction.RightButton);
         }
 
-        public LegacyReplayFrame ConvertTo(IBeatmap beatmap)
+        public LegacyReplayFrame ToLegacy(IBeatmap beatmap)
         {
             ReplayButtonState state = ReplayButtonState.None;
 
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoReplayFrame.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoReplayFrame.cs
index cb4ca35c2b..d2a7329a28 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoReplayFrame.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoReplayFrame.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
             Actions.AddRange(actions);
         }
 
-        public void ConvertFrom(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null)
+        public void FromLegacy(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null)
         {
             if (currentFrame.MouseRight1) Actions.Add(TaikoAction.LeftRim);
             if (currentFrame.MouseRight2) Actions.Add(TaikoAction.RightRim);
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
             if (currentFrame.MouseLeft2) Actions.Add(TaikoAction.RightCentre);
         }
 
-        public LegacyReplayFrame ConvertTo(IBeatmap beatmap)
+        public LegacyReplayFrame ToLegacy(IBeatmap beatmap)
         {
             ReplayButtonState state = ReplayButtonState.None;
 
diff --git a/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs b/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs
index a240e7aa0e..d9aa615c6e 100644
--- a/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs
+++ b/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs
@@ -17,12 +17,12 @@ namespace osu.Game.Rulesets.Replays.Types
         /// <param name="currentFrame">The <see cref="LegacyReplayFrame"/> to extract values from.</param>
         /// <param name="beatmap">The beatmap.</param>
         /// <param name="lastFrame">The last post-conversion <see cref="ReplayFrame"/>, used to fill in missing delta information. May be null.</param>
-        void ConvertFrom(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null);
+        void FromLegacy(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null);
 
         /// <summary>
         /// Populates this <see cref="ReplayFrame"/> using values from a <see cref="LegacyReplayFrame"/>.
         /// </summary>
         /// <param name="beatmap">The beatmap.</param>
-        LegacyReplayFrame ConvertTo(IBeatmap beatmap);
+        LegacyReplayFrame ToLegacy(IBeatmap beatmap);
     }
 }
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 495d8c8cc0..58b64e1b8f 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -264,7 +264,7 @@ namespace osu.Game.Scoring.Legacy
             if (convertible == null)
                 throw new InvalidOperationException($"Legacy replay cannot be converted for the ruleset: {currentRuleset.Description}");
 
-            convertible.ConvertFrom(currentFrame, currentBeatmap, lastFrame);
+            convertible.FromLegacy(currentFrame, currentBeatmap, lastFrame);
 
             var frame = (ReplayFrame)convertible;
             frame.Time = currentFrame.Time;
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 515cdc8864..db7e51e833 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Scoring.Legacy
                 {
                     LegacyReplayFrame lastF = new LegacyReplayFrame(0, 0, 0, ReplayButtonState.None);
 
-                    foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ConvertTo(beatmap)))
+                    foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ToLegacy(beatmap)))
                     {
                         replayData.Append(FormattableString.Invariant($"{f.Time - lastF.Time}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
                         lastF = f;

From 1e025b7c3187a6dc31d363aeb89ead355f85135d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 25 Mar 2020 20:58:51 +0300
Subject: [PATCH 01711/10326] Add tests to cover the issue

---
 .../Visual/Online/TestSceneUserPanel.cs       | 32 +++++++++++++++++--
 osu.Game/Users/UserPanel.cs                   |  7 ++--
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index ccae778745..a38f045e7f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual.Online
         private readonly Bindable<UserStatus> status = new Bindable<UserStatus>();
 
         private UserGridPanel peppy;
-        private UserListPanel evast;
+        private TestUserListPanel evast;
 
         [Resolved]
         private RulesetStore rulesetStore { get; set; }
@@ -38,6 +38,9 @@ namespace osu.Game.Tests.Visual.Online
         {
             UserGridPanel flyte;
 
+            activity.Value = null;
+            status.Value = null;
+
             Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
@@ -63,7 +66,7 @@ namespace osu.Game.Tests.Visual.Online
                         IsSupporter = true,
                         SupportLevel = 3,
                     }) { Width = 300 },
-                    evast = new UserListPanel(new User
+                    evast = new TestUserListPanel(new User
                     {
                         Username = @"Evast",
                         Id = 8195163,
@@ -96,7 +99,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestUserActivity()
         {
-            AddStep("set online status", () => peppy.Status.Value = evast.Status.Value = new UserStatusOnline());
+            AddStep("set online status", () => status.Value = new UserStatusOnline());
 
             AddStep("idle", () => activity.Value = null);
             AddStep("spectating", () => activity.Value = new UserActivity.Spectating());
@@ -109,6 +112,29 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("modding", () => activity.Value = new UserActivity.Modding());
         }
 
+        [Test]
+        public void TestUserActivityChange()
+        {
+            AddAssert("visit message is visible", () => evast.LastVisitMessage.IsPresent);
+            AddStep("set online status", () => status.Value = new UserStatusOnline());
+            AddAssert("visit message is not visible", () => !evast.LastVisitMessage.IsPresent);
+            AddStep("set choosing activity", () => activity.Value = new UserActivity.ChoosingBeatmap());
+            AddStep("set offline status", () => status.Value = new UserStatusOffline());
+            AddAssert("visit message is visible", () => evast.LastVisitMessage.IsPresent);
+            AddStep("set online status", () => status.Value = new UserStatusOnline());
+            AddAssert("visit message is not visible", () => !evast.LastVisitMessage.IsPresent);
+        }
+
         private UserActivity soloGameStatusForRuleset(int rulesetId) => new UserActivity.SoloGame(null, rulesetStore.GetRuleset(rulesetId));
+
+        private class TestUserListPanel : UserListPanel
+        {
+            public TestUserListPanel(User user)
+                : base(user)
+            {
+            }
+
+            public new TextFlowContainer LastVisitMessage => base.LastVisitMessage;
+        }
     }
 }
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index d5e6d5f13e..2f3986b4c0 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -36,9 +36,10 @@ namespace osu.Game.Users
 
         protected DelayedLoadUnloadWrapper Background { get; private set; }
 
+        protected TextFlowContainer LastVisitMessage { get; private set; }
+
         private SpriteIcon statusIcon;
         private OsuSpriteText statusMessage;
-        private TextFlowContainer lastVisitMessage;
 
         protected UserPanel(User user)
         {
@@ -153,7 +154,7 @@ namespace osu.Game.Users
 
             var alignment = rightAlignedChildren ? Anchor.CentreRight : Anchor.CentreLeft;
 
-            statusContainer.Add(lastVisitMessage = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 12, 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;
@@ -193,7 +194,7 @@ namespace osu.Game.Users
                 }
 
                 // Otherwise use only status
-                lastVisitMessage.FadeTo(status is UserStatusOffline && User.LastVisit.HasValue ? 1 : 0);
+                LastVisitMessage.FadeTo(status is UserStatusOffline && User.LastVisit.HasValue ? 1 : 0);
                 statusMessage.Text = status.Message;
                 statusIcon.FadeColour(status.GetAppropriateColour(colours), 500, Easing.OutQuint);
 

From 454e402e882b23f3188543f3d7b1de1ce1bdfb65 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 25 Mar 2020 21:02:45 +0300
Subject: [PATCH 01712/10326] Fix last seen message has been visible when it
 shouldn't

---
 osu.Game/Users/UserPanel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 2f3986b4c0..6f59f9e443 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -185,6 +185,8 @@ namespace osu.Game.Users
         {
             if (status != null)
             {
+                LastVisitMessage.FadeTo(status is UserStatusOffline && User.LastVisit.HasValue ? 1 : 0);
+
                 // Set status message based on activity (if we have one) and status is not offline
                 if (activity != null && !(status is UserStatusOffline))
                 {
@@ -194,7 +196,6 @@ namespace osu.Game.Users
                 }
 
                 // 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);
 

From 2f5dc93d6119428654b0fa40e4e5e9439a074d64 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Thu, 26 Mar 2020 00:19:54 +0200
Subject: [PATCH 01713/10326] Select recommended difficulty

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 10 +++++--
 .../Select/Carousel/CarouselBeatmapSet.cs     | 28 ++++++++++++++++++-
 .../Carousel/CarouselGroupEagerSelect.cs      | 10 +++++--
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index fa8974f55a..2c45b3642d 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -23,6 +23,8 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
 using osu.Game.Screens.Select.Carousel;
+using osu.Game.Online.API;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Select
 {
@@ -31,6 +33,8 @@ namespace osu.Game.Screens.Select
         private const float bleed_top = FilterControl.HEIGHT;
         private const float bleed_bottom = Footer.HEIGHT;
 
+        private readonly Bindable<User> localUser = new Bindable<User>();
+
         /// <summary>
         /// Triggered when the <see cref="BeatmapSets"/> loaded change and are completely loaded.
         /// </summary>
@@ -140,7 +144,7 @@ namespace osu.Game.Screens.Select
         private BeatmapManager beatmaps { get; set; }
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, IAPIProvider api)
         {
             config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
             config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
@@ -154,6 +158,8 @@ namespace osu.Game.Screens.Select
             beatmaps.BeatmapRestored += beatmapRestored;
 
             loadBeatmapSets(GetLoadableBeatmaps());
+
+            localUser.BindTo(api.LocalUser);
         }
 
         protected virtual IEnumerable<BeatmapSetInfo> GetLoadableBeatmaps() => beatmaps.GetAllUsableBeatmapSetsEnumerable();
@@ -588,7 +594,7 @@ namespace osu.Game.Screens.Select
                     b.Metadata = beatmapSet.Metadata;
             }
 
-            var set = new CarouselBeatmapSet(beatmapSet);
+            var set = new CarouselBeatmapSet(beatmapSet, localUser);
 
             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 8e323c66e2..9f1c39c578 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -4,19 +4,23 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Select.Filter;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselBeatmapSet : CarouselGroupEagerSelect
     {
+        private readonly Bindable<User> localUser;
+
         public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>();
 
         public BeatmapSetInfo BeatmapSet;
 
-        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet)
+        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet, Bindable<User> localUser)
         {
             BeatmapSet = beatmapSet ?? throw new ArgumentNullException(nameof(beatmapSet));
 
@@ -24,10 +28,32 @@ namespace osu.Game.Screens.Select.Carousel
                       .Where(b => !b.Hidden)
                       .Select(b => new CarouselBeatmap(b))
                       .ForEach(AddChild);
+
+            this.localUser = localUser;
         }
 
         protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this);
 
+        protected override CarouselItem GetNextToSelect()
+        {
+            if (LastSelected == null)
+            {
+                decimal? pp = localUser.Value?.Statistics?.PP ?? 60; // TODO: This needs to get ruleset specific statistics
+
+                var recommendedDifficulty = Math.Pow((double)pp, 0.4) * 0.195;
+                return Children.OfType<CarouselBeatmap>()
+                               .Where(b => !b.Filtered.Value)
+                               .OrderBy(b =>
+                               {
+                                   var difference = b.Beatmap.StarDifficulty - recommendedDifficulty;
+                                   return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
+                               })
+                               .FirstOrDefault();
+            }
+
+            return base.GetNextToSelect();
+        }
+
         public override int CompareTo(FilterCriteria criteria, CarouselItem other)
         {
             if (!(other is CarouselBeatmapSet otherSet))
diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
index 6ce12f7b89..262bea9c71 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
@@ -90,11 +90,15 @@ namespace osu.Game.Screens.Select.Carousel
             PerformSelection();
         }
 
+        protected virtual CarouselItem GetNextToSelect()
+        {
+            return Children.Skip(lastSelectedIndex).FirstOrDefault(i => !i.Filtered.Value) ??
+                   Children.Reverse().Skip(InternalChildren.Count - lastSelectedIndex).FirstOrDefault(i => !i.Filtered.Value);
+        }
+
         protected virtual void PerformSelection()
         {
-            CarouselItem nextToSelect =
-                Children.Skip(lastSelectedIndex).FirstOrDefault(i => !i.Filtered.Value) ??
-                Children.Reverse().Skip(InternalChildren.Count - lastSelectedIndex).FirstOrDefault(i => !i.Filtered.Value);
+            CarouselItem nextToSelect = GetNextToSelect();
 
             if (nextToSelect != null)
                 nextToSelect.State.Value = CarouselItemState.Selected;

From e6b2e3b0ed1f4059a9fef74053b7ed5d6ec39d9d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 26 Mar 2020 05:18:12 +0300
Subject: [PATCH 01714/10326] Add osu!catch skin configurations

---
 .../Skinning/CatchSkinConfiguration.cs        | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch/Skinning/CatchSkinConfiguration.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchSkinConfiguration.cs b/osu.Game.Rulesets.Catch/Skinning/CatchSkinConfiguration.cs
new file mode 100644
index 0000000000..aea5beaa6b
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchSkinConfiguration.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.
+
+namespace osu.Game.Rulesets.Catch.Skinning
+{
+    public enum CatchSkinConfiguration
+    {
+        /// <summary>
+        /// The colour to be used for the catcher while on hyper-dashing state.
+        /// </summary>
+        HyperDash,
+
+        /// <summary>
+        /// The colour to be used for hyper-dash fruits.
+        /// </summary>
+        HyperDashFruit,
+
+        /// <summary>
+        /// The colour to be used for the "exploding" catcher sprite on beginning of hyper-dashing.
+        /// </summary>
+        HyperDashAfterImage,
+    }
+}

From aa162b1033caff83366debb191f58366561b6555 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 26 Mar 2020 05:30:59 +0300
Subject: [PATCH 01715/10326] Setup hyper-dash colouring test scene

---
 .../TestSceneHyperDashColouring.cs            | 112 ++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
new file mode 100644
index 0000000000..2041e365ea
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -0,0 +1,112 @@
+// Copyright (c) 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.Audio.Sample;
+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.Testing;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Catch.Skinning;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Skinning;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public class TestSceneHyperDashColouring : OsuTestScene
+    {
+        private Drawable setupSkinHierarchy(Func<Drawable> getChild, bool customHyperDashCatcherColour = false, bool customHyperDashFruitColour = false, bool customHyperDashAfterColour = false)
+        {
+            var testSkinProvider = new SkinProvidingContainer(new TestLegacySkin(customHyperDashCatcherColour, customHyperDashFruitColour, customHyperDashAfterColour));
+
+            var legacySkinTransformer = new SkinProvidingContainer(new CatchLegacySkinTransformer(testSkinProvider));
+
+            return testSkinProvider
+                .WithChild(legacySkinTransformer
+                    .WithChild(getChild.Invoke()));
+        }
+
+        private bool checkFruitHyperDashColour(DrawableFruit fruit, Color4 expectedColour, bool isLegacyFruit) =>
+            isLegacyFruit
+                ? fruit.ChildrenOfType<SkinnableDrawable>().First().Drawable.ChildrenOfType<Sprite>().Any(c => c.Colour == expectedColour)
+                : fruit.ChildrenOfType<SkinnableDrawable>().First().Drawable.ChildrenOfType<Circle>().Single(c => c.BorderColour == expectedColour).Any(d => d.Colour == expectedColour);
+
+        private class TestLegacySkin : ISkin
+        {
+            public static Color4 CustomHyperDashColour { get; } = Color4.Goldenrod;
+            public static Color4 CustomHyperDashFruitColour { get; } = Color4.Cyan;
+            public static Color4 CustomHyperDashAfterColour { get; } = Color4.Lime;
+
+            private readonly bool customHyperDashCatcherColour;
+            private readonly bool customHyperDashFruitColour;
+            private readonly bool customHyperDashAfterColour;
+
+            public TestLegacySkin(bool customHyperDashCatcherColour = false, bool customHyperDashFruitColour = false, bool customHyperDashAfterColour = false)
+            {
+                this.customHyperDashCatcherColour = customHyperDashCatcherColour;
+                this.customHyperDashFruitColour = customHyperDashFruitColour;
+                this.customHyperDashAfterColour = customHyperDashAfterColour;
+            }
+
+            public Drawable GetDrawableComponent(ISkinComponent component) => null;
+
+            public Texture GetTexture(string componentName)
+            {
+                if (componentName == "fruit-pear")
+                {
+                    // convince CatchLegacySkinTransformer to use the LegacyFruitPiece for pear fruit.
+                    var texture = new Texture(Texture.WhitePixel.TextureGL)
+                    {
+                        Width = 1,
+                        Height = 1,
+                        ScaleAdjust = 1 / 96f
+                    };
+                    return texture;
+                }
+
+                return null;
+            }
+
+            public SampleChannel GetSample(ISampleInfo sampleInfo) => null;
+
+            public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
+            {
+                switch (lookup)
+                {
+                    case CatchSkinConfiguration config when config == CatchSkinConfiguration.HyperDash:
+                        if (customHyperDashCatcherColour)
+                            return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashColour));
+
+                        return null;
+
+                    case CatchSkinConfiguration config when config == CatchSkinConfiguration.HyperDashFruit:
+                        if (customHyperDashFruitColour)
+                            return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashFruitColour));
+
+                        return null;
+
+                    case CatchSkinConfiguration config when config == CatchSkinConfiguration.HyperDashAfterImage:
+                        if (customHyperDashAfterColour)
+                            return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashAfterColour));
+
+                        return null;
+                }
+
+                return null;
+            }
+        }
+    }
+}

From 0a368f13d99421d17c34fa48a75db4001115c95a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 26 Mar 2020 05:37:26 +0300
Subject: [PATCH 01716/10326] Add default hyper-dash colour constant on Catcher

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index e361b29a9d..f53e14a8c7 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public class Catcher : Container, IKeyBindingHandler<CatchAction>
     {
+        public static Color4 DefaultHyperDashColour { get; } = Color4.Red;
+
         /// <summary>
         /// Whether we are hyper-dashing or not.
         /// </summary>

From 6f2cc5471adabc4392fcf1f63a5de32266016c10 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 26 Mar 2020 05:38:41 +0300
Subject: [PATCH 01717/10326] Add support for custom hyper-dash fruit colouring

---
 .../Objects/Drawables/FruitPiece.cs                | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
index 5797588ded..c8f7c4912e 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
@@ -7,7 +7,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Catch.Skinning;
+using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
@@ -31,7 +34,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableObject)
+        private void load(DrawableHitObject drawableObject, ISkinSource skin)
         {
             DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
             hitObject = drawableCatchObject.HitObject;
@@ -60,6 +63,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 },
             });
 
+            var hyperDashColour =
+                skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDashFruit)?.Value ??
+                skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDash)?.Value ??
+                Catcher.DefaultHyperDashColour;
+
             if (hitObject.HyperDash)
             {
                 AddInternal(new Circle
@@ -67,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    BorderColour = Color4.Red,
+                    BorderColour = hyperDashColour,
                     BorderThickness = 12f * RADIUS_ADJUST,
                     Children = new Drawable[]
                     {
@@ -77,7 +85,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                             Alpha = 0.3f,
                             Blending = BlendingParameters.Additive,
                             RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.Red,
+                            Colour = hyperDashColour,
                         }
                     }
                 });

From d995f3e1cc7eff1604d4fa06ed4f85de7152f020 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 26 Mar 2020 05:39:32 +0300
Subject: [PATCH 01718/10326] Add support for custom hyper-dash legacy fruit
 colouring

---
 osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 25ee0811d0..99ecf12fd3 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
@@ -53,10 +54,15 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
             if (drawableCatchObject.HitObject.HyperDash)
             {
+                var hyperDashColour =
+                    skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDashFruit)?.Value ??
+                    skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDash)?.Value ??
+                    Catcher.DefaultHyperDashColour;
+
                 var hyperDash = new Sprite
                 {
                     Texture = skin.GetTexture(lookupName),
-                    Colour = Color4.Red,
+                    Colour = hyperDashColour,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Blending = BlendingParameters.Additive,

From 29274b004cfa1141d3a4c85ec97e8960ccdeca48 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 26 Mar 2020 05:40:38 +0300
Subject: [PATCH 01719/10326] Add hyper-dash fruit colouring test cases

---
 .../TestSceneHyperDashColouring.cs            | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 2041e365ea..7fab961aa7 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -28,6 +28,77 @@ namespace osu.Game.Rulesets.Catch.Tests
 {
     public class TestSceneHyperDashColouring : OsuTestScene
     {
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestHyperDashFruitColour(bool legacyFruit)
+        {
+            DrawableFruit drawableFruit = null;
+
+            AddStep("setup fruit", () =>
+            {
+                var fruit = new Fruit { IndexInBeatmap = legacyFruit ? 0 : 1, HyperDashTarget = new Banana() };
+                fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                Child = setupSkinHierarchy(() =>
+                    drawableFruit = new DrawableFruit(fruit)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(4f),
+                    }, false, false);
+            });
+
+            AddAssert("fruit colour default-hyperdash", () => checkFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour, legacyFruit));
+        }
+
+        [TestCase(false, true)]
+        [TestCase(false, false)]
+        [TestCase(true, true)]
+        [TestCase(true, false)]
+        public void TestCustomHyperDashFruitColour(bool legacyFruit, bool customCatcherHyperDashColour)
+        {
+            DrawableFruit drawableFruit = null;
+
+            AddStep("setup fruit", () =>
+            {
+                var fruit = new Fruit { IndexInBeatmap = legacyFruit ? 0 : 1, HyperDashTarget = new Banana() };
+                fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                Child = setupSkinHierarchy(() =>
+                    drawableFruit = new DrawableFruit(fruit)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(4f),
+                    }, customCatcherHyperDashColour, true);
+            });
+
+            AddAssert("fruit colour custom-hyperdash", () => checkFruitHyperDashColour(drawableFruit, TestLegacySkin.CustomHyperDashFruitColour, legacyFruit));
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestCustomHyperDashFruitColourFallback(bool legacyFruit)
+        {
+            DrawableFruit drawableFruit = null;
+
+            AddStep("setup fruit", () =>
+            {
+                var fruit = new Fruit { IndexInBeatmap = legacyFruit ? 0 : 1, HyperDashTarget = new Banana() };
+                fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                Child = setupSkinHierarchy(() =>
+                    drawableFruit = new DrawableFruit(fruit)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(4f),
+                    }, true, false);
+            });
+
+            AddAssert("fruit colour catcher-custom-hyperdash", () => checkFruitHyperDashColour(drawableFruit, TestLegacySkin.CustomHyperDashColour, legacyFruit));
+        }
+
         private Drawable setupSkinHierarchy(Func<Drawable> getChild, bool customHyperDashCatcherColour = false, bool customHyperDashFruitColour = false, bool customHyperDashAfterColour = false)
         {
             var testSkinProvider = new SkinProvidingContainer(new TestLegacySkin(customHyperDashCatcherColour, customHyperDashFruitColour, customHyperDashAfterColour));

From 2b1245f63a279e2eee4521f689ed692ed839d376 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Mar 2020 12:50:00 +0900
Subject: [PATCH 01720/10326] Improve xmldoc in a couple of places

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs         | 2 +-
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 27993ff173..ff6ed5bf17 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -406,7 +406,7 @@ namespace osu.Game.Rulesets.UI
         public abstract Playfield Playfield { get; }
 
         /// <summary>
-        /// Place to put drawables above hit objects but below UI.
+        /// Content to be placed above hitobjects. Will be affected by frame stability.
         /// </summary>
         public abstract Container Overlays { get; }
 
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index e569bb8459..3ba28aad45 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.UI
 {
     /// <summary>
     /// A container which consumes a parent gameplay clock and standardises frame counts for children.
-    /// Will ensure a minimum of 40 frames per clock second is maintained, regardless of any system lag or seeks.
+    /// Will ensure a minimum of 50 frames per clock second is maintained, regardless of any system lag or seeks.
     /// </summary>
     public class FrameStabilityContainer : Container, IHasReplayHandler
     {

From d372ddaadd65696972f778ddfd2cb3c3df750ac4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Mar 2020 12:50:18 +0900
Subject: [PATCH 01721/10326] Move break overlay to a location it is not
 affected by gameplay scale

---
 osu.Game/Screens/Play/Player.cs | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dc5bac9fd1..3ff47b868c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -293,19 +293,26 @@ namespace osu.Game.Screens.Play
                         performImmediateExit();
                     },
                 },
-                failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, }
+                failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
+                new Container
+                {
+                    Name = "Frame-stable elements",
+                    Clock = DrawableRuleset.FrameStableClock,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        ScoreProcessor,
+                        HealthProcessor,
+                        BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, DrawableRuleset.GameplayStartTime, ScoreProcessor)
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Breaks = working.Beatmap.Breaks
+                        },
+                    }
+                },
             });
 
-            DrawableRuleset.Overlays.Add(BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, DrawableRuleset.GameplayStartTime, ScoreProcessor)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Breaks = working.Beatmap.Breaks
-            });
-
-            DrawableRuleset.Overlays.Add(ScoreProcessor);
-            DrawableRuleset.Overlays.Add(HealthProcessor);
-
             HealthProcessor.IsBreakTime.BindTo(BreakOverlay.IsBreakTime);
         }
 

From e3a7c8a124b46fc6979c2cbc96565560a91228cb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 26 Mar 2020 09:11:31 +0300
Subject: [PATCH 01722/10326] Make catcher trails colouring per container

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 73 +++++++++++++++++++++------
 1 file changed, 57 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index f53e14a8c7..68280ab111 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -35,7 +35,30 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public Container ExplodingFruitTarget;
 
-        public Container AdditiveTarget;
+        private Container additiveTarget;
+        private Container<CatcherTrailSprite> dashTrails;
+        private Container<CatcherTrailSprite> hyperDashTrails;
+        private Container<CatcherTrailSprite> endGlowSprites;
+
+        public Container AdditiveTarget
+        {
+            get => additiveTarget;
+            set
+            {
+                if (additiveTarget == value)
+                    return;
+
+                additiveTarget?.RemoveRange(new[] { dashTrails, hyperDashTrails, endGlowSprites });
+
+                additiveTarget = value;
+                additiveTarget?.AddRange(new[]
+                {
+                    dashTrails ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = Color4.White },
+                    hyperDashTrails ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashColour },
+                    endGlowSprites ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashEndGlowColour },
+                });
+            }
+        }
 
         public CatcherAnimationState CurrentState { get; private set; }
 
@@ -65,7 +88,7 @@ namespace osu.Game.Rulesets.Catch.UI
             get => trail;
             set
             {
-                if (value == trail || AdditiveTarget == null) return;
+                if (value == trail || additiveTarget == null) return;
 
                 trail = value;
 
@@ -82,6 +105,9 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private CatcherSprite currentCatcher;
 
+        private Color4 hyperDashColour = DefaultHyperDashColour;
+        private Color4 hyperDashEndGlowColour = DefaultHyperDashColour;
+
         private int currentDirection;
 
         private bool dashing;
@@ -213,8 +239,6 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <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)
@@ -223,11 +247,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 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
             {
@@ -237,18 +257,37 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 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();
-
+                    var hyperDashEndGlow = createAdditiveSprite(endGlowSprites);
                     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);
                 }
             }
+
+            updateCatcherColour();
+        }
+
+        private void updateCatcherColour()
+        {
+            const float hyper_dash_transition_length = 180;
+
+            if (HyperDashing)
+            {
+                this.FadeColour(hyperDashColour == DefaultHyperDashColour ? Color4.OrangeRed : hyperDashColour, hyper_dash_transition_length, Easing.OutQuint);
+                this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint);
+            }
+            else
+            {
+                this.FadeColour(Color4.White, hyper_dash_transition_length, Easing.OutQuint);
+                this.FadeTo(1f, hyper_dash_transition_length, Easing.OutQuint);
+            }
+
+            // update hyper-dash colour of the hyper-dashing catcher sprites containers.
+            hyperDashTrails?.FadeColour(hyperDashColour, hyper_dash_transition_length, Easing.OutQuint);
+            endGlowSprites?.FadeColour(hyperDashEndGlowColour, hyper_dash_transition_length, Easing.OutQuint);
         }
 
         public bool OnPressed(CatchAction action)
@@ -392,7 +431,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 return;
             }
 
-            var additive = createAdditiveSprite();
+            var additive = createAdditiveSprite(HyperDashing ? hyperDashTrails : dashTrails);
 
             additive.FadeTo(0.4f).FadeOut(800, Easing.OutQuint);
             additive.Expire(true);
@@ -409,21 +448,23 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
-        private CatcherTrailSprite createAdditiveSprite()
+        private CatcherTrailSprite createAdditiveSprite(Container<CatcherTrailSprite> target)
         {
+            if (target == null)
+                return null;
+
             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);
+            target.Add(sprite);
 
             return sprite;
         }

From 302fdd834a305697536ac4093b00f88d72751d80 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 26 Mar 2020 09:11:59 +0300
Subject: [PATCH 01723/10326] Add support for custom hyper-dash catcher
 colouring

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 68280ab111..b3742aa1ad 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -13,13 +13,15 @@ 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.Catch.Skinning;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
-    public class Catcher : Container, IKeyBindingHandler<CatchAction>
+    public class Catcher : SkinReloadableDrawable, IKeyBindingHandler<CatchAction>
     {
         public static Color4 DefaultHyperDashColour { get; } = Color4.Red;
 
@@ -133,7 +135,7 @@ namespace osu.Game.Rulesets.Catch.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 caughtFruit = new Container<DrawableHitObject>
                 {
@@ -184,7 +186,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             caughtFruit.Add(fruit);
 
-            Add(new HitExplosion(fruit)
+            AddInternal(new HitExplosion(fruit)
             {
                 X = fruit.X,
                 Scale = new Vector2(fruit.HitObject.Scale)
@@ -378,6 +380,15 @@ namespace osu.Game.Rulesets.Catch.UI
             });
         }
 
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+
+            hyperDashColour = skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDash)?.Value ?? DefaultHyperDashColour;
+            hyperDashEndGlowColour = skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDashAfterImage)?.Value ?? hyperDashColour;
+            updateCatcherColour();
+        }
+
         protected override void Update()
         {
             base.Update();

From fecafc2e48b9e45fa5a70c630832b55e7db6f396 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 26 Mar 2020 09:14:44 +0300
Subject: [PATCH 01724/10326] Fix additive target accidentally clears all of
 the added containers

It sets the AdditiveTarget on the object initializer but then the catcher is set to Child which wipes up all of the existing children (containers added by Catcher through AdditiveTarget setter)
---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index e0d9ff759d..37501736ff 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -33,10 +33,10 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             RelativeSizeAxes = Axes.X;
             Height = CATCHER_SIZE;
-            Child = MovableCatcher = new Catcher(difficulty)
-            {
-                AdditiveTarget = this,
-            };
+            Child = MovableCatcher = new Catcher(difficulty);
+
+            // this property adds containers to 'this' so it must not be set in the object initializer.
+            MovableCatcher.AdditiveTarget = this;
         }
 
         public static float GetCatcherSize(BeatmapDifficulty difficulty)

From 77b3011394ffdc1afb2517943a025bce713177c2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 26 Mar 2020 09:19:00 +0300
Subject: [PATCH 01725/10326] Add hyper-dash catcher & trails colouring test
 cases

---
 .../TestSceneHyperDashColouring.cs            | 134 ++++++++++++++++++
 1 file changed, 134 insertions(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 7fab961aa7..6bad45f7ba 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -28,6 +28,140 @@ namespace osu.Game.Rulesets.Catch.Tests
 {
     public class TestSceneHyperDashColouring : OsuTestScene
     {
+        [Test]
+        public void TestHyperDashCatcherColour()
+        {
+            CatcherArea catcherArea = null;
+
+            AddStep("setup catcher", () =>
+            {
+                Child = setupSkinHierarchy(() =>
+                    catcherArea = new CatcherArea
+                    {
+                        RelativePositionAxes = Axes.None,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(4f),
+                    }, false);
+            });
+
+            AddStep("set hyper-dash", () =>
+            {
+                catcherArea.MovableCatcher.SetHyperDashState(2);
+                catcherArea.MovableCatcher.FinishTransforms();
+            });
+
+            AddAssert("catcher colour default-hyperdash", () => catcherArea.MovableCatcher.Colour == Color4.OrangeRed);
+            AddAssert("catcher trails colour default-hyperdash", () => catcherArea.OfType<Container<CatcherTrailSprite>>().Any(c => c.Colour == Catcher.DefaultHyperDashColour));
+
+            AddStep("clear hyper-dash", () =>
+            {
+                catcherArea.MovableCatcher.SetHyperDashState(1);
+                catcherArea.MovableCatcher.FinishTransforms();
+            });
+
+            AddAssert("catcher colour white", () => catcherArea.MovableCatcher.Colour == Color4.White);
+        }
+
+        [Test]
+        public void TestCustomHyperDashCatcherColour()
+        {
+            CatcherArea catcherArea = null;
+
+            AddStep("setup catcher", () =>
+            {
+                Child = setupSkinHierarchy(() =>
+                    catcherArea = new CatcherArea
+                    {
+                        RelativePositionAxes = Axes.None,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(4f),
+                    }, true);
+            });
+
+            AddStep("set hyper-dash", () =>
+            {
+                catcherArea.MovableCatcher.SetHyperDashState(2);
+                catcherArea.MovableCatcher.FinishTransforms();
+            });
+
+            AddAssert("catcher colour custom-hyperdash", () => catcherArea.MovableCatcher.Colour == TestLegacySkin.CustomHyperDashColour);
+            AddAssert("catcher trails colour custom-hyperdash", () => catcherArea.OfType<Container<CatcherTrailSprite>>().Any(c => c.Colour == TestLegacySkin.CustomHyperDashColour));
+
+            AddStep("clear hyper-dash", () =>
+            {
+                catcherArea.MovableCatcher.SetHyperDashState(1);
+                catcherArea.MovableCatcher.FinishTransforms();
+            });
+
+            AddAssert("catcher colour white", () => catcherArea.MovableCatcher.Colour == Color4.White);
+        }
+
+        [Test]
+        public void TestHyperDashCatcherEndGlowColour()
+        {
+            CatcherArea catcherArea = null;
+
+            AddStep("setup catcher", () =>
+            {
+                Child = setupSkinHierarchy(() =>
+                    catcherArea = new CatcherArea
+                    {
+                        RelativePositionAxes = Axes.None,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(4f),
+                    }, false, false, false);
+            });
+
+            AddStep("set hyper-dash", () => catcherArea.MovableCatcher.SetHyperDashState(2));
+            AddAssert("end-glow sprite colour default-hyperdash", () => catcherArea.OfType<Container<CatcherTrailSprite>>().Any(c => c.Colour == Catcher.DefaultHyperDashColour));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestCustomHyperDashCatcherEndGlowColour(bool customHyperDashCatcherColour)
+        {
+            CatcherArea catcherArea = null;
+
+            AddStep("setup catcher", () =>
+            {
+                Child = setupSkinHierarchy(() =>
+                    catcherArea = new CatcherArea
+                    {
+                        RelativePositionAxes = Axes.None,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(4f),
+                    }, customHyperDashCatcherColour, false, true);
+            });
+
+            AddStep("set hyper-dash", () => catcherArea.MovableCatcher.SetHyperDashState(2));
+            AddAssert("end-glow sprite colour custom-hyperdash", () => catcherArea.OfType<Container<CatcherTrailSprite>>().Any(c => c.Colour == TestLegacySkin.CustomHyperDashAfterColour));
+        }
+
+        [Test]
+        public void TestCustomHyperDashCatcherEndGlowColourFallback()
+        {
+            CatcherArea catcherArea = null;
+
+            AddStep("setup catcher", () =>
+            {
+                Child = setupSkinHierarchy(() =>
+                    catcherArea = new CatcherArea
+                    {
+                        RelativePositionAxes = Axes.None,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(4f),
+                    }, true, false, false);
+            });
+
+            AddStep("set hyper-dash", () => catcherArea.MovableCatcher.SetHyperDashState(2));
+            AddAssert("end-glow sprite colour catcher-custom-hyperdash", () => catcherArea.OfType<Container<CatcherTrailSprite>>().Any(c => c.Colour == TestLegacySkin.CustomHyperDashColour));
+        }
+
         [TestCase(false)]
         [TestCase(true)]
         public void TestHyperDashFruitColour(bool legacyFruit)

From 07462120e47d46e0a8639f2868538eb822800d86 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Mar 2020 15:28:56 +0900
Subject: [PATCH 01726/10326] Split break tracking into its own component

---
 .../Visual/Gameplay/TestSceneAutoplay.cs      |  3 +-
 ...eakOverlay.cs => TestSceneBreakTracker.cs} | 53 ++++++++----
 .../Graphics/Containers/UserDimContainer.cs   |  2 +-
 osu.Game/Rulesets/UI/DrawableRuleset.cs       | 12 ++-
 osu.Game/Screens/Play/BreakOverlay.cs         | 80 ++----------------
 osu.Game/Screens/Play/BreakTracker.cs         | 82 +++++++++++++++++++
 osu.Game/Screens/Play/Player.cs               | 43 +++++-----
 7 files changed, 160 insertions(+), 115 deletions(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestSceneBreakOverlay.cs => TestSceneBreakTracker.cs} (80%)
 create mode 100644 osu.Game/Screens/Play/BreakTracker.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index afeda5fb7c..8108ce0864 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -3,6 +3,7 @@
 
 using System.ComponentModel;
 using System.Linq;
+using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
 
@@ -23,7 +24,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddUntilStep("score above zero", () => Player.ScoreProcessor.TotalScore.Value > 0);
             AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 2));
-            AddStep("seek to break time", () => Player.GameplayClockContainer.Seek(Player.BreakOverlay.Breaks.First().StartTime));
+            AddStep("seek to break time", () => Player.GameplayClockContainer.Seek(Player.ChildrenOfType<BreakTracker>().First().Breaks.First().StartTime));
             AddUntilStep("wait for seek to complete", () =>
                 Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= Player.BreakOverlay.Breaks.First().StartTime);
             AddAssert("test keys not counting", () => !Player.HUDOverlay.KeyCounter.IsCounting);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBreakOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
similarity index 80%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneBreakOverlay.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
index 19dce303ea..d46b4ea289 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBreakOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Screens.Play;
@@ -12,14 +13,16 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestSceneBreakOverlay : OsuTestScene
+    public class TestSceneBreakTracker : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(BreakOverlay),
         };
 
-        private readonly TestBreakOverlay breakOverlay;
+        private readonly BreakOverlay breakOverlay;
+
+        private readonly TestBreakTracker breakTracker;
 
         private readonly IReadOnlyList<BreakPeriod> testBreaks = new List<BreakPeriod>
         {
@@ -35,9 +38,23 @@ namespace osu.Game.Tests.Visual.Gameplay
             },
         };
 
-        public TestSceneBreakOverlay()
+        public TestSceneBreakTracker()
         {
-            Add(breakOverlay = new TestBreakOverlay(true));
+            AddRange(new Drawable[]
+            {
+                breakTracker = new TestBreakTracker(),
+                breakOverlay = new BreakOverlay(true)
+                {
+                    ProcessCustomClock = false,
+                }
+            });
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            breakOverlay.Clock = breakTracker.Clock;
         }
 
         [Test]
@@ -88,7 +105,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             loadBreaksStep("multiple breaks", testBreaks);
 
             seekAndAssertBreak("seek to break start", testBreaks[1].StartTime, true);
-            AddAssert("is skipped to break #2", () => breakOverlay.CurrentBreakIndex == 1);
+            AddAssert("is skipped to break #2", () => breakTracker.CurrentBreakIndex == 1);
 
             seekAndAssertBreak("seek to break middle", testBreaks[1].StartTime + testBreaks[1].Duration / 2, true);
             seekAndAssertBreak("seek to break end", testBreaks[1].EndTime, false);
@@ -110,7 +127,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void addShowBreakStep(double seconds)
         {
-            AddStep($"show '{seconds}s' break", () => breakOverlay.Breaks = new List<BreakPeriod>
+            AddStep($"show '{seconds}s' break", () => breakOverlay.Breaks = breakTracker.Breaks = new List<BreakPeriod>
             {
                 new BreakPeriod
                 {
@@ -122,12 +139,12 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void setClock(bool useManual)
         {
-            AddStep($"set {(useManual ? "manual" : "realtime")} clock", () => breakOverlay.SwitchClock(useManual));
+            AddStep($"set {(useManual ? "manual" : "realtime")} clock", () => breakTracker.SwitchClock(useManual));
         }
 
         private void loadBreaksStep(string breakDescription, IReadOnlyList<BreakPeriod> breaks)
         {
-            AddStep($"load {breakDescription}", () => breakOverlay.Breaks = breaks);
+            AddStep($"load {breakDescription}", () => breakOverlay.Breaks = breakTracker.Breaks = breaks);
             seekAndAssertBreak("seek back to 0", 0, false);
         }
 
@@ -151,17 +168,18 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void seekAndAssertBreak(string seekStepDescription, double time, bool shouldBeBreak)
         {
-            AddStep(seekStepDescription, () => breakOverlay.ManualClockTime = time);
+            AddStep(seekStepDescription, () => breakTracker.ManualClockTime = time);
             AddAssert($"is{(!shouldBeBreak ? " not" : string.Empty)} break time", () =>
             {
-                breakOverlay.ProgressTime();
-                return breakOverlay.IsBreakTime.Value == shouldBeBreak;
+                breakTracker.ProgressTime();
+                return breakTracker.IsBreakTime.Value == shouldBeBreak;
             });
         }
 
-        private class TestBreakOverlay : BreakOverlay
+        private class TestBreakTracker : BreakTracker
         {
-            private readonly FramedClock framedManualClock;
+            public readonly FramedClock FramedManualClock;
+
             private readonly ManualClock manualClock;
             private IFrameBasedClock originalClock;
 
@@ -173,20 +191,19 @@ namespace osu.Game.Tests.Visual.Gameplay
                 set => manualClock.CurrentTime = value;
             }
 
-            public TestBreakOverlay(bool letterboxing)
-                : base(letterboxing)
+            public TestBreakTracker()
             {
-                framedManualClock = new FramedClock(manualClock = new ManualClock());
+                FramedManualClock = new FramedClock(manualClock = new ManualClock());
                 ProcessCustomClock = false;
             }
 
             public void ProgressTime()
             {
-                framedManualClock.ProcessFrame();
+                FramedManualClock.ProcessFrame();
                 Update();
             }
 
-            public void SwitchClock(bool setManual) => Clock = setManual ? framedManualClock : originalClock;
+            public void SwitchClock(bool setManual) => Clock = setManual ? FramedManualClock : originalClock;
 
             protected override void LoadComplete()
             {
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 4485ce3447..39c1fdad52 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.Containers
 
         /// <summary>
         /// Whether player is in break time.
-        /// Must be bound to <see cref="BreakOverlay.IsBreakTime"/> to allow for dim adjustments in gameplay.
+        /// Must be bound to <see cref="BreakTracker.IsBreakTime"/> to allow for dim adjustments in gameplay.
         /// </summary>
         public readonly IBindable<bool> IsBreakTime = new Bindable<bool>();
 
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index ff6ed5bf17..5062c92afe 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -72,9 +72,9 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public override Playfield Playfield => playfield.Value;
 
-        private Container overlays;
+        public override Container Overlays { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
-        public override Container Overlays => overlays;
+        public override Container FrameStableComponents { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
         public override GameplayClock FrameStableClock => frameStabilityContainer.GameplayClock;
 
@@ -187,11 +187,12 @@ namespace osu.Game.Rulesets.UI
                     FrameStablePlayback = FrameStablePlayback,
                     Children = new Drawable[]
                     {
+                        FrameStableComponents,
                         KeyBindingInputManager
                             .WithChild(CreatePlayfieldAdjustmentContainer()
                                 .WithChild(Playfield)
                             ),
-                        overlays = new Container { RelativeSizeAxes = Axes.Both }
+                        Overlays,
                     }
                 },
             };
@@ -410,6 +411,11 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public abstract Container Overlays { get; }
 
+        /// <summary>
+        /// Components to be run potentially multiple times in line with frame-stable gameplay.
+        /// </summary>
+        public abstract Container FrameStableComponents { get; }
+
         /// <summary>
         /// The frame-stable clock which is being used for playfield display.
         /// </summary>
diff --git a/osu.Game/Screens/Play/BreakOverlay.cs b/osu.Game/Screens/Play/BreakOverlay.cs
index ee8be87352..89f51315f2 100644
--- a/osu.Game/Screens/Play/BreakOverlay.cs
+++ b/osu.Game/Screens/Play/BreakOverlay.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -16,8 +14,6 @@ namespace osu.Game.Screens.Play
 {
     public class BreakOverlay : Container
     {
-        private readonly ScoreProcessor scoreProcessor;
-
         /// <summary>
         /// The duration of the break overlay fading.
         /// </summary>
@@ -37,10 +33,6 @@ namespace osu.Game.Screens.Play
             {
                 breaks = value;
 
-                // reset index in case the new breaks list is smaller than last one
-                isBreakTime.Value = false;
-                CurrentBreakIndex = 0;
-
                 if (IsLoaded)
                     initializeBreaks();
             }
@@ -48,27 +40,17 @@ namespace osu.Game.Screens.Play
 
         public override bool RemoveCompletedTransforms => false;
 
-        /// <summary>
-        /// Whether the gameplay is currently in a break.
-        /// </summary>
-        public IBindable<bool> IsBreakTime => isBreakTime;
-
-        protected int CurrentBreakIndex;
-
-        private readonly BindableBool isBreakTime = new BindableBool();
-
         private readonly Container remainingTimeAdjustmentBox;
         private readonly Container remainingTimeBox;
         private readonly RemainingTimeCounter remainingTimeCounter;
-        private readonly BreakInfo info;
         private readonly BreakArrows breakArrows;
-        private readonly double gameplayStartTime;
 
-        public BreakOverlay(bool letterboxing, double gameplayStartTime = 0, ScoreProcessor scoreProcessor = null)
+        public BreakOverlay(bool letterboxing, ScoreProcessor scoreProcessor = null)
         {
-            this.gameplayStartTime = gameplayStartTime;
-            this.scoreProcessor = scoreProcessor;
             RelativeSizeAxes = Axes.Both;
+
+            BreakInfo info;
+
             Child = fadeContainer = new Container
             {
                 Alpha = 0,
@@ -119,13 +101,11 @@ namespace osu.Game.Screens.Play
                 }
             };
 
-            if (scoreProcessor != null) bindProcessor(scoreProcessor);
-        }
-
-        [BackgroundDependencyLoader(true)]
-        private void load(GameplayClock clock)
-        {
-            if (clock != null) Clock = clock;
+            if (scoreProcessor != null)
+            {
+                info.AccuracyDisplay.Current.BindTo(scoreProcessor.Accuracy);
+                info.GradeDisplay.Current.BindTo(scoreProcessor.Rank);
+            }
         }
 
         protected override void LoadComplete()
@@ -134,42 +114,6 @@ namespace osu.Game.Screens.Play
             initializeBreaks();
         }
 
-        protected override void Update()
-        {
-            base.Update();
-            updateBreakTimeBindable();
-        }
-
-        private void updateBreakTimeBindable() =>
-            isBreakTime.Value = getCurrentBreak()?.HasEffect == true
-                                || Clock.CurrentTime < gameplayStartTime
-                                || scoreProcessor?.HasCompleted == true;
-
-        private BreakPeriod getCurrentBreak()
-        {
-            if (breaks?.Count > 0)
-            {
-                var time = Clock.CurrentTime;
-
-                if (time > breaks[CurrentBreakIndex].EndTime)
-                {
-                    while (time > breaks[CurrentBreakIndex].EndTime && CurrentBreakIndex < breaks.Count - 1)
-                        CurrentBreakIndex++;
-                }
-                else
-                {
-                    while (time < breaks[CurrentBreakIndex].StartTime && CurrentBreakIndex > 0)
-                        CurrentBreakIndex--;
-                }
-
-                var closest = breaks[CurrentBreakIndex];
-
-                return closest.Contains(time) ? closest : null;
-            }
-
-            return null;
-        }
-
         private void initializeBreaks()
         {
             FinishTransforms(true);
@@ -207,11 +151,5 @@ namespace osu.Game.Screens.Play
                 }
             }
         }
-
-        private void bindProcessor(ScoreProcessor processor)
-        {
-            info.AccuracyDisplay.Current.BindTo(processor.Accuracy);
-            info.GradeDisplay.Current.BindTo(processor.Rank);
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/BreakTracker.cs b/osu.Game/Screens/Play/BreakTracker.cs
new file mode 100644
index 0000000000..64262d52b5
--- /dev/null
+++ b/osu.Game/Screens/Play/BreakTracker.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 System.Collections.Generic;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Play
+{
+    public class BreakTracker : Component
+    {
+        private readonly ScoreProcessor scoreProcessor;
+
+        private readonly double gameplayStartTime;
+
+        /// <summary>
+        /// Whether the gameplay is currently in a break.
+        /// </summary>
+        public IBindable<bool> IsBreakTime => isBreakTime;
+
+        protected int CurrentBreakIndex;
+
+        private readonly BindableBool isBreakTime = new BindableBool();
+
+        private IReadOnlyList<BreakPeriod> breaks;
+
+        public IReadOnlyList<BreakPeriod> Breaks
+        {
+            get => breaks;
+            set
+            {
+                breaks = value;
+
+                // reset index in case the new breaks list is smaller than last one
+                isBreakTime.Value = false;
+                CurrentBreakIndex = 0;
+            }
+        }
+
+        public BreakTracker(double gameplayStartTime = 0, ScoreProcessor scoreProcessor = null)
+        {
+            this.gameplayStartTime = gameplayStartTime;
+            this.scoreProcessor = scoreProcessor;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            isBreakTime.Value = getCurrentBreak()?.HasEffect == true
+                                || Clock.CurrentTime < gameplayStartTime
+                                || scoreProcessor?.HasCompleted == true;
+        }
+
+        private BreakPeriod getCurrentBreak()
+        {
+            if (breaks?.Count > 0)
+            {
+                var time = Clock.CurrentTime;
+
+                if (time > breaks[CurrentBreakIndex].EndTime)
+                {
+                    while (time > breaks[CurrentBreakIndex].EndTime && CurrentBreakIndex < breaks.Count - 1)
+                        CurrentBreakIndex++;
+                }
+                else
+                {
+                    while (time < breaks[CurrentBreakIndex].StartTime && CurrentBreakIndex > 0)
+                        CurrentBreakIndex--;
+                }
+
+                var closest = breaks[CurrentBreakIndex];
+
+                return closest.Contains(time) ? closest : null;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 3ff47b868c..9ad500039e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -76,6 +76,8 @@ namespace osu.Game.Screens.Play
 
         public BreakOverlay BreakOverlay;
 
+        private BreakTracker breakTracker;
+
         protected ScoreProcessor ScoreProcessor { get; private set; }
 
         protected HealthProcessor HealthProcessor { get; private set; }
@@ -204,7 +206,7 @@ namespace osu.Game.Screens.Play
             foreach (var mod in Mods.Value.OfType<IApplicableToHealthProcessor>())
                 mod.ApplyToHealthProcessor(HealthProcessor);
 
-            BreakOverlay.IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
+            breakTracker.IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
         }
 
         private void addUnderlayComponents(Container target)
@@ -231,6 +233,18 @@ namespace osu.Game.Screens.Play
                 DrawableRuleset,
                 new ComboEffects(ScoreProcessor)
             });
+
+            DrawableRuleset.FrameStableComponents.AddRange(new Drawable[]
+            {
+                ScoreProcessor,
+                HealthProcessor,
+                breakTracker = new BreakTracker(DrawableRuleset.GameplayStartTime, ScoreProcessor)
+                {
+                    Breaks = working.Beatmap.Breaks
+                }
+            });
+
+            HealthProcessor.IsBreakTime.BindTo(breakTracker.IsBreakTime);
         }
 
         private void addOverlayComponents(Container target, WorkingBeatmap working)
@@ -294,26 +308,13 @@ namespace osu.Game.Screens.Play
                     },
                 },
                 failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
-                new Container
+                BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks)
                 {
-                    Name = "Frame-stable elements",
                     Clock = DrawableRuleset.FrameStableClock,
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        ScoreProcessor,
-                        HealthProcessor,
-                        BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, DrawableRuleset.GameplayStartTime, ScoreProcessor)
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Breaks = working.Beatmap.Breaks
-                        },
-                    }
+                    ProcessCustomClock = false,
+                    Breaks = working.Beatmap.Breaks
                 },
             });
-
-            HealthProcessor.IsBreakTime.BindTo(BreakOverlay.IsBreakTime);
         }
 
         private void onBreakTimeChanged(ValueChangedEvent<bool> isBreakTime)
@@ -325,7 +326,7 @@ namespace osu.Game.Screens.Play
         private void updatePauseOnFocusLostState() =>
             HUDOverlay.HoldToQuit.PauseOnFocusLost = PauseOnFocusLost
                                                      && !DrawableRuleset.HasReplayLoaded.Value
-                                                     && !BreakOverlay.IsBreakTime.Value;
+                                                     && !breakTracker.IsBreakTime.Value;
 
         private IBeatmap loadPlayableBeatmap()
         {
@@ -547,7 +548,7 @@ namespace osu.Game.Screens.Play
             PauseOverlay.Hide();
 
             // breaks and time-based conditions may allow instant resume.
-            if (BreakOverlay.IsBreakTime.Value)
+            if (breakTracker.IsBreakTime.Value)
                 completeResume();
             else
                 DrawableRuleset.RequestResume(completeResume);
@@ -581,8 +582,8 @@ namespace osu.Game.Screens.Play
             Background.BlurAmount.Value = 0;
 
             // bind component bindables.
-            Background.IsBreakTime.BindTo(BreakOverlay.IsBreakTime);
-            DimmableStoryboard.IsBreakTime.BindTo(BreakOverlay.IsBreakTime);
+            Background.IsBreakTime.BindTo(breakTracker.IsBreakTime);
+            DimmableStoryboard.IsBreakTime.BindTo(breakTracker.IsBreakTime);
 
             Background.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
             DimmableStoryboard.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);

From 2949e8dc27d66ec99df393b12543fecd8241b471 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Mar 2020 16:58:23 +0900
Subject: [PATCH 01727/10326] Reduce spread of stacked fruit

---
 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 e361b29a9d..8fa9c61b6f 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -141,14 +141,14 @@ namespace osu.Game.Rulesets.Catch.UI
             var ourRadius = fruit.DisplayRadius;
             float theirRadius = 0;
 
-            const float allowance = 6;
+            const float allowance = 10;
 
             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.X += (RNG.NextSingle() - 0.5f) * diff * 2;
                 fruit.Y -= RNG.NextSingle() * diff;
             }
 

From 8e4896fbbecce162e327d1c4af60dce652985c6b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Mar 2020 17:13:53 +0900
Subject: [PATCH 01728/10326] Make slider judgements count towards base score /
 accuracy

---
 osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs | 2 --
 osu.Game.Rulesets.Osu/Objects/SliderTick.cs   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
index a8fd3764c5..ac6c6905e4 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public class SliderRepeatJudgement : OsuJudgement
         {
-            public override bool IsBonus => true;
-
             protected override int NumericResultFor(HitResult result) => result == MaxResult ? 30 : 0;
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
index 212a84c04a..22f3f559db 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
@@ -36,8 +36,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public class SliderTickJudgement : OsuJudgement
         {
-            public override bool IsBonus => true;
-
             protected override int NumericResultFor(HitResult result) => result == MaxResult ? 10 : 0;
         }
     }

From 6555ab6ede959af102069e1c29ae4d29924d8242 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Mar 2020 17:18:27 +0900
Subject: [PATCH 01729/10326] Only play slider end sounds if tracking

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 2d5b9d874c..35d58b7111 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Skinning;
+using osu.Game.Rulesets.Scoring;
 using osuTK.Graphics;
 using osu.Game.Skinning;
 
@@ -193,7 +194,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || Time.Current < slider.EndTime)
                 return;
 
-            ApplyResult(r => r.Type = r.Judgement.MaxResult);
+            ApplyResult(r => r.Type = Ball.Tracking ? r.Judgement.MaxResult : HitResult.Miss);
         }
 
         protected override void UpdateStateTransforms(ArmedState state)

From f80efd10c22aefe8678374ce3b14075d619462b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Mar 2020 19:51:02 +0900
Subject: [PATCH 01730/10326] Avoid using a miss judgement

---
 .../Objects/Drawables/DrawableSlider.cs                | 10 +++++++++-
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs    |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 35d58b7111..5c7f4a42b3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -194,7 +194,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || Time.Current < slider.EndTime)
                 return;
 
-            ApplyResult(r => r.Type = Ball.Tracking ? r.Judgement.MaxResult : HitResult.Miss);
+            ApplyResult(r => r.Type = r.Judgement.MaxResult);
+        }
+
+        public override void PlaySamples()
+        {
+            // rather than doing it this way, we should probably attach the sample to the tail circle.
+            // this can only be done after we stop using LegacyLastTick.
+            if (TailCircle.Result.Type != HitResult.Miss)
+                base.PlaySamples();
         }
 
         protected override void UpdateStateTransforms(ArmedState state)
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index aa29e42fac..5b5802fa9d 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -344,7 +344,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Plays all the hit sounds for this <see cref="DrawableHitObject"/>.
         /// This is invoked automatically when this <see cref="DrawableHitObject"/> is hit.
         /// </summary>
-        public void PlaySamples() => Samples?.Play();
+        public virtual void PlaySamples() => Samples?.Play();
 
         protected override void Update()
         {

From c1ac57e70fc05e11e6d085f2829eef31d524328e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 26 Mar 2020 12:14:44 +0100
Subject: [PATCH 01731/10326] Add back visual tests and add easing to alpha
 fade.

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs  | 31 +++++++++++++++++++
 osu.Game/Screens/Play/HUD/FailingLayer.cs     |  7 ++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
new file mode 100644
index 0000000000..3016890ade
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.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 NUnit.Framework;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneFailingLayer : OsuTestScene
+    {
+        private readonly FailingLayer layer;
+
+        public TestSceneFailingLayer()
+        {
+            Child = layer = new FailingLayer();
+        }
+
+        [Test]
+        public void TestLayerFading()
+        {
+            AddSliderStep("current health", 0.0, 1.0, 1.0, val =>
+            {
+                layer.Current.Value = val;
+            });
+
+            AddStep("set health to 0.10", () => layer.Current.Value = 0.10);
+            AddWaitStep("wait for fade to finish", 5);
+            AddStep("set health to 1", () => layer.Current.Value = 1f);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 5f4037c14d..97d2458674 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
@@ -16,6 +17,8 @@ namespace osu.Game.Screens.Play.HUD
     {
         private const float max_alpha = 0.4f;
 
+        private const int fade_time = 400;
+
         private readonly Box box;
 
         /// <summary>
@@ -41,7 +44,9 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override void Update()
         {
-            box.Alpha = (float)Math.Clamp(max_alpha * (1 - Current.Value / LowHealthThreshold), 0, max_alpha);
+            box.Alpha = (float)Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, fade_time), box.Alpha,
+                Math.Clamp(max_alpha * (1 - Current.Value / LowHealthThreshold), 0, max_alpha), 0, fade_time, Easing.Out);
+
             base.Update();
         }
     }

From e33055e2c455eae6c030d9740c08560149e9cbd1 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 26 Mar 2020 14:19:36 +0100
Subject: [PATCH 01732/10326] Simplify active tab font changes and expose
 necessary fields in OsuTabItem

---
 .../Graphics/UserInterface/OsuTabControl.cs   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index ca9f1330f9..c2feca171b 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -113,13 +113,13 @@ namespace osu.Game.Graphics.UserInterface
 
             private const float transition_length = 500;
 
-            private void fadeActive()
+            protected void FadeHovered()
             {
                 Bar.FadeIn(transition_length, Easing.OutQuint);
                 Text.FadeColour(Color4.White, transition_length, Easing.OutQuint);
             }
 
-            private void fadeInactive()
+            protected void FadeUnhovered()
             {
                 Bar.FadeOut(transition_length, Easing.OutQuint);
                 Text.FadeColour(AccentColour, transition_length, Easing.OutQuint);
@@ -128,14 +128,14 @@ namespace osu.Game.Graphics.UserInterface
             protected override bool OnHover(HoverEvent e)
             {
                 if (!Active.Value)
-                    fadeActive();
+                    FadeHovered();
                 return true;
             }
 
             protected override void OnHoverLost(HoverLostEvent e)
             {
                 if (!Active.Value)
-                    fadeInactive();
+                    FadeUnhovered();
             }
 
             [BackgroundDependencyLoader]
@@ -172,13 +172,19 @@ namespace osu.Game.Graphics.UserInterface
                     },
                     new HoverClickSounds()
                 };
-
-                Active.BindValueChanged(active => Text.Font = Text.Font.With(Typeface.Torus, weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium), true);
             }
 
-            protected override void OnActivated() => fadeActive();
+            protected override void OnActivated()
+            {
+                Text.Font = Text.Font.With(weight: FontWeight.Bold);
+                FadeHovered();
+            }
 
-            protected override void OnDeactivated() => fadeInactive();
+            protected override void OnDeactivated()
+            {
+                Text.Font = Text.Font.With(weight: FontWeight.Medium);
+                FadeUnhovered();
+            }
         }
     }
 }

From 816418742ea4641b1a6c18b3ec35a33aae73d6b7 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 26 Mar 2020 15:43:48 +0100
Subject: [PATCH 01733/10326] Update header tab control

---
 osu.Game/Overlays/OverlayTabControl.cs       | 21 +++++++++++---------
 osu.Game/Overlays/TabControlOverlayHeader.cs | 14 ++++++-------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index aa96f0e19b..a1cbf2c1e7 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.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.Shapes;
 using osu.Framework.Graphics.UserInterface;
@@ -35,17 +36,22 @@ namespace osu.Game.Overlays
         protected OverlayTabControl()
         {
             TabContainer.Masking = false;
-            TabContainer.Spacing = new Vector2(15, 0);
+            TabContainer.Spacing = new Vector2(20, 0);
 
             AddInternal(bar = new Box
             {
                 RelativeSizeAxes = Axes.X,
-                Height = 2,
                 Anchor = Anchor.BottomLeft,
-                Origin = Anchor.CentreLeft
+                Origin = Anchor.BottomLeft
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            AccentColour = colourProvider.Highlight1;
+        }
+
         protected override Dropdown<T> CreateDropdown() => null;
 
         protected override TabItem<T> CreateTabItem(T value) => new OverlayTabItem(value);
@@ -90,7 +96,7 @@ namespace osu.Game.Overlays
                     Bar = new ExpandingBar
                     {
                         Anchor = Anchor.BottomCentre,
-                        ExpandedSize = 7.5f,
+                        ExpandedSize = 5f,
                         CollapsedSize = 0
                     },
                     new HoverClickSounds()
@@ -119,6 +125,7 @@ namespace osu.Game.Overlays
             {
                 HoverAction();
                 Text.Font = Text.Font.With(weight: FontWeight.Bold);
+                Text.FadeColour(Color4.White, 120, Easing.InQuad);
             }
 
             protected override void OnDeactivated()
@@ -135,11 +142,7 @@ namespace osu.Game.Overlays
                     OnDeactivated();
             }
 
-            protected virtual void HoverAction()
-            {
-                Bar.Expand();
-                Text.FadeColour(Color4.White, 120, Easing.InQuad);
-            }
+            protected virtual void HoverAction() => Bar.Expand();
 
             protected virtual void UnhoverAction()
             {
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index b199a2a0cf..d6d53eec58 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Overlays
     {
         protected OsuTabControl<T> TabControl;
 
+        private readonly Box controlBackground;
         private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();
 
         public Bindable<T> Current
@@ -30,8 +31,6 @@ namespace osu.Game.Overlays
             set => current.Current = value;
         }
 
-        private readonly Box controlBackground;
-
         protected TabControlOverlayHeader()
         {
             HeaderInfo.Add(new Container
@@ -56,7 +55,6 @@ namespace osu.Game.Overlays
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            TabControl.AccentColour = colourProvider.Highlight1;
             controlBackground.Colour = colourProvider.Dark4;
         }
 
@@ -65,14 +63,16 @@ namespace osu.Game.Overlays
 
         public class OverlayHeaderTabControl : OverlayTabControl<T>
         {
+            private const float bar_height = 1;
+
             public OverlayHeaderTabControl()
             {
-                BarHeight = 1;
                 RelativeSizeAxes = Axes.None;
                 AutoSizeAxes = Axes.X;
                 Anchor = Anchor.BottomLeft;
                 Origin = Anchor.BottomLeft;
-                Height = 35;
+                Height = 47;
+                BarHeight = bar_height;
             }
 
             protected override TabItem<T> CreateTabItem(T value) => new OverlayHeaderTabItem(value);
@@ -82,7 +82,6 @@ namespace osu.Game.Overlays
                 RelativeSizeAxes = Axes.Y,
                 AutoSizeAxes = Axes.X,
                 Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(5, 0),
             };
 
             private class OverlayHeaderTabItem : OverlayTabItem
@@ -92,7 +91,8 @@ namespace osu.Game.Overlays
                 {
                     Text.Text = value.ToString().ToLower();
                     Text.Font = OsuFont.GetFont(size: 14);
-                    Bar.ExpandedSize = 5;
+                    Text.Margin = new MarginPadding { Vertical = 16.5f }; // 15px padding + 1.5px line-height difference compensation
+                    Bar.Margin = new MarginPadding { Bottom = bar_height };
                 }
             }
         }

From 46ebf6ef7827f633485ac4c8b5cbee2ed66b191b Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 26 Mar 2020 15:44:22 +0100
Subject: [PATCH 01734/10326] Update user profile section tabs and rename
 classes for better readibility

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

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 045a52a0c7..44f3acb564 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays
         private GetUserRequest userReq;
         protected ProfileHeader Header;
         private ProfileSectionsContainer sectionsContainer;
-        private ProfileTabControl tabs;
+        private ProfileSectionTabControl tabs;
 
         public const float CONTENT_X_MARGIN = 70;
 
@@ -62,7 +62,7 @@ namespace osu.Game.Overlays
                 }
                 : Array.Empty<ProfileSection>();
 
-            tabs = new ProfileTabControl
+            tabs = new ProfileSectionTabControl
             {
                 RelativeSizeAxes = Axes.X,
                 Anchor = Anchor.TopCentre,
@@ -149,19 +149,23 @@ namespace osu.Game.Overlays
             }
         }
 
-        private class ProfileTabControl : OverlayTabControl<ProfileSection>
+        private class ProfileSectionTabControl : OverlayTabControl<ProfileSection>
         {
-            public ProfileTabControl()
+            private const float bar_height = 2;
+
+            public ProfileSectionTabControl()
             {
                 TabContainer.RelativeSizeAxes &= ~Axes.X;
                 TabContainer.AutoSizeAxes |= Axes.X;
                 TabContainer.Anchor |= Anchor.x1;
                 TabContainer.Origin |= Anchor.x1;
+
+                BarHeight = bar_height;
             }
 
-            protected override TabItem<ProfileSection> CreateTabItem(ProfileSection value) => new ProfileTabItem(value)
+            protected override TabItem<ProfileSection> CreateTabItem(ProfileSection value) => new ProfileSectionTabItem(value)
             {
-                AccentColour = AccentColour
+                AccentColour = AccentColour,
             };
 
             [BackgroundDependencyLoader]
@@ -170,12 +174,14 @@ namespace osu.Game.Overlays
                 AccentColour = colourProvider.Highlight1;
             }
 
-            private class ProfileTabItem : OverlayTabItem
+            private class ProfileSectionTabItem : OverlayTabItem
             {
-                public ProfileTabItem(ProfileSection value)
+                public ProfileSectionTabItem(ProfileSection value)
                     : base(value)
                 {
                     Text.Text = value.Title;
+                    Bar.ExpandedSize = 10;
+                    Bar.Margin = new MarginPadding { Bottom = bar_height };
                 }
             }
         }

From da996ffe748d2d30821284f1ccf48ad0fa0d193d Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 26 Mar 2020 15:44:53 +0100
Subject: [PATCH 01735/10326] Update header breadcrumb tab control

---
 .../Overlays/BreadcrumbControlOverlayHeader.cs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
index 1d8411dfcc..81315f9638 100644
--- a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
+++ b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.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.UserInterface;
 using osu.Game.Graphics.UserInterface;
@@ -16,6 +17,13 @@ namespace osu.Game.Overlays
             public OverlayHeaderBreadcrumbControl()
             {
                 RelativeSizeAxes = Axes.X;
+                Height = 47;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                AccentColour = colourProvider.Light2;
             }
 
             protected override TabItem<string> CreateTabItem(string value) => new ControlTabItem(value);
@@ -27,10 +35,18 @@ namespace osu.Game.Overlays
                 public ControlTabItem(string value)
                     : base(value)
                 {
+                    RelativeSizeAxes = Axes.Y;
                     Text.Font = Text.Font.With(size: 14);
-                    Chevron.Y = 3;
+                    Text.Anchor = Anchor.CentreLeft;
+                    Text.Origin = Anchor.CentreLeft;
+                    Chevron.Y = 1;
                     Bar.Height = 0;
                 }
+
+                // base OsuTabItem makes font bold on activation, we don't want that here
+                protected override void OnActivated() => FadeHovered();
+
+                protected override void OnDeactivated() => FadeUnhovered();
             }
         }
     }

From 9a30ff5a00c91b3e0b5b606b11efeb0402c58f8a Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 26 Mar 2020 16:11:58 +0100
Subject: [PATCH 01736/10326] Fix code quality issues

---
 osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs | 1 -
 osu.Game/Overlays/OverlayHeader.cs                            | 4 +---
 osu.Game/Overlays/TabControlOverlayHeader.cs                  | 1 -
 osu.Game/Screens/Multi/Header.cs                              | 3 +--
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index 9dc71c7e74..c81ec9f663 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -8,7 +8,6 @@ using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Allocation;
-using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Shapes;
 using osuTK.Graphics;
 
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index f017d66485..4ac0f697c3 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -6,7 +6,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.Graphics;
 
 namespace osu.Game.Overlays
@@ -14,7 +13,6 @@ namespace osu.Game.Overlays
     public abstract class OverlayHeader : Container
     {
         private readonly Box titleBackground;
-        private readonly OverlayTitle title;
 
         protected readonly FillFlowContainer HeaderInfo;
 
@@ -60,7 +58,7 @@ namespace osu.Game.Overlays
                                         },
                                         Children = new[]
                                         {
-                                            title = CreateTitle().With(title =>
+                                            CreateTitle().With(title =>
                                             {
                                                 title.Anchor = Anchor.CentreLeft;
                                                 title.Origin = Anchor.CentreLeft;
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index d6d53eec58..ab1a6aff78 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
-using osuTK;
 
 namespace osu.Game.Overlays
 {
diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index 6f790d703e..7a2d3a6239 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Multi
             private const float spacing = 6;
             private const int text_offset = 2;
 
-            private SpriteIcon iconSprite;
+            private readonly SpriteIcon iconSprite;
             private readonly OsuSpriteText titleText, pageText;
 
             public IMultiplayerSubScreen Screen
@@ -101,7 +101,6 @@ namespace osu.Game.Screens.Multi
             }
 
             public MultiHeaderTitle()
-                : base()
             {
                 AutoSizeAxes = Axes.Both;
 

From 543f584595be39f4b429a45d5f0131bd452a5d0c Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 26 Mar 2020 16:44:46 +0100
Subject: [PATCH 01737/10326] Adjust user profile tabs

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

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 44f3acb564..6ec30f7707 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -67,7 +67,6 @@ namespace osu.Game.Overlays
                 RelativeSizeAxes = Axes.X,
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
-                Height = 34
             };
 
             Add(new Box
@@ -160,6 +159,7 @@ namespace osu.Game.Overlays
                 TabContainer.Anchor |= Anchor.x1;
                 TabContainer.Origin |= Anchor.x1;
 
+                Height = 36 + bar_height;
                 BarHeight = bar_height;
             }
 
@@ -180,6 +180,8 @@ namespace osu.Game.Overlays
                     : base(value)
                 {
                     Text.Text = value.Title;
+                    Text.Font = Text.Font.With(size: 16);
+                    Text.Margin = new MarginPadding { Bottom = 10 + bar_height };
                     Bar.ExpandedSize = 10;
                     Bar.Margin = new MarginPadding { Bottom = bar_height };
                 }

From 01c9112f82136510ae96dbd918e698ee9623ae81 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 26 Mar 2020 17:09:22 +0100
Subject: [PATCH 01738/10326] Add a null check to prevent NRE when playing the
 "no video" version of a beatmap.

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index 00df388d09..d4dbdf1ea8 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -55,6 +55,8 @@ namespace osu.Game.Storyboards.Drawables
         {
             base.LoadComplete();
 
+            if (videoSprite == null) return;
+
             using (videoSprite.BeginAbsoluteSequence(0))
                 videoSprite.FadeIn(500);
         }

From 83410315c64a5362325ee9fe02293af2fd5247b8 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 26 Mar 2020 17:18:01 +0100
Subject: [PATCH 01739/10326] Make fields private

---
 osu.Game/Screens/Multi/Header.cs | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index 7a2d3a6239..5b8e8a7fd9 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -75,25 +75,20 @@ namespace osu.Game.Screens.Multi
 
         private class MultiHeaderTitle : CompositeDrawable, IHasAccentColour
         {
-            public const float ICON_WIDTH = ICON_SIZE + spacing;
+            public const float ICON_WIDTH = icon_size + spacing;
 
-            public const float ICON_SIZE = 25;
+            private const float icon_size = 25;
             private const float spacing = 6;
             private const int text_offset = 2;
 
             private readonly SpriteIcon iconSprite;
-            private readonly OsuSpriteText titleText, pageText;
+            private readonly OsuSpriteText title, pageText;
 
             public IMultiplayerSubScreen Screen
             {
                 set => pageText.Text = value.ShortTitle.ToLowerInvariant();
             }
 
-            protected string Title
-            {
-                set => titleText.Text = value;
-            }
-
             public Color4 AccentColour
             {
                 get => pageText.Colour;
@@ -115,11 +110,11 @@ namespace osu.Game.Screens.Multi
                         {
                             iconSprite = new SpriteIcon
                             {
-                                Size = new Vector2(ICON_SIZE),
+                                Size = new Vector2(icon_size),
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre
                             },
-                            titleText = new OsuSpriteText
+                            title = new OsuSpriteText
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
@@ -148,7 +143,7 @@ namespace osu.Game.Screens.Multi
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
-                Title = "multi";
+                title.Text = "multi";
                 iconSprite.Icon = OsuIcon.Multi;
                 AccentColour = colours.Yellow;
             }

From ee112c6f507e295a414721e4049f679583b9ab24 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Thu, 26 Mar 2020 18:42:08 +0200
Subject: [PATCH 01740/10326] Move and change logic

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 33 ++++++++++++++++---
 .../Select/Carousel/CarouselBeatmapSet.cs     | 12 +++----
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 2c45b3642d..65472f8a0e 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -24,7 +24,8 @@ using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
 using osu.Game.Screens.Select.Carousel;
 using osu.Game.Online.API;
-using osu.Game.Users;
+using osu.Game.Rulesets;
+using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Screens.Select
 {
@@ -33,7 +34,7 @@ namespace osu.Game.Screens.Select
         private const float bleed_top = FilterControl.HEIGHT;
         private const float bleed_bottom = Footer.HEIGHT;
 
-        private readonly Bindable<User> localUser = new Bindable<User>();
+        private readonly Bindable<double> recommendedStarDifficulty = new Bindable<double>();
 
         /// <summary>
         /// Triggered when the <see cref="BeatmapSets"/> loaded change and are completely loaded.
@@ -143,8 +144,11 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuConfigManager config, IAPIProvider api)
+        private void load(OsuConfigManager config, Bindable<RulesetInfo> decoupledRuleset)
         {
             config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
             config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
@@ -159,7 +163,26 @@ namespace osu.Game.Screens.Select
 
             loadBeatmapSets(GetLoadableBeatmaps());
 
-            localUser.BindTo(api.LocalUser);
+            decoupledRuleset.BindValueChanged(UpdateRecommendedStarDifficulty, true);
+        }
+
+        protected void UpdateRecommendedStarDifficulty(ValueChangedEvent<RulesetInfo> ruleset)
+        {
+            if (api.LocalUser.Value is GuestUser)
+            {
+                recommendedStarDifficulty.Value = 0;
+                return;
+            }
+
+            var req = new GetUserRequest(api.LocalUser.Value.Id, ruleset.NewValue);
+
+            req.Success += result =>
+            {
+                // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
+                recommendedStarDifficulty.Value = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
+            };
+
+            api.PerformAsync(req);
         }
 
         protected virtual IEnumerable<BeatmapSetInfo> GetLoadableBeatmaps() => beatmaps.GetAllUsableBeatmapSetsEnumerable();
@@ -594,7 +617,7 @@ namespace osu.Game.Screens.Select
                     b.Metadata = beatmapSet.Metadata;
             }
 
-            var set = new CarouselBeatmapSet(beatmapSet, localUser);
+            var set = new CarouselBeatmapSet(beatmapSet, recommendedStarDifficulty);
 
             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 9f1c39c578..064840d99a 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -8,19 +8,18 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Users;
 
 namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselBeatmapSet : CarouselGroupEagerSelect
     {
-        private readonly Bindable<User> localUser;
+        private readonly Bindable<double> recommendedStarDifficulty = new Bindable<double>();
 
         public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>();
 
         public BeatmapSetInfo BeatmapSet;
 
-        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet, Bindable<User> localUser)
+        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet, Bindable<double> recommendedStarDifficulty)
         {
             BeatmapSet = beatmapSet ?? throw new ArgumentNullException(nameof(beatmapSet));
 
@@ -29,7 +28,7 @@ namespace osu.Game.Screens.Select.Carousel
                       .Select(b => new CarouselBeatmap(b))
                       .ForEach(AddChild);
 
-            this.localUser = localUser;
+            this.recommendedStarDifficulty.BindTo(recommendedStarDifficulty);
         }
 
         protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this);
@@ -38,14 +37,11 @@ namespace osu.Game.Screens.Select.Carousel
         {
             if (LastSelected == null)
             {
-                decimal? pp = localUser.Value?.Statistics?.PP ?? 60; // TODO: This needs to get ruleset specific statistics
-
-                var recommendedDifficulty = Math.Pow((double)pp, 0.4) * 0.195;
                 return Children.OfType<CarouselBeatmap>()
                                .Where(b => !b.Filtered.Value)
                                .OrderBy(b =>
                                {
-                                   var difference = b.Beatmap.StarDifficulty - recommendedDifficulty;
+                                   var difference = b.Beatmap.StarDifficulty - recommendedStarDifficulty.Value;
                                    return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
                                })
                                .FirstOrDefault();

From bbbaaae3ee8bbf6d48498deef378ca1974b2ff17 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Thu, 26 Mar 2020 19:18:16 +0200
Subject: [PATCH 01741/10326] Write tests

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 31 +++++++++++++++++++
 osu.Game/Screens/Select/BeatmapCarousel.cs    |  8 ++---
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 0cc37bbd57..b9b52a28cb 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -579,6 +580,34 @@ namespace osu.Game.Tests.Visual.SongSelect
             checkVisibleItemCount(true, 15);
         }
 
+        [Test]
+        public void TestSelectRecommendedDifficulty()
+        {
+            void setRecommendedAndExpect(double recommended, int expectedSet, int expectedDiff)
+            {
+                AddStep($"Recommend SR {recommended}", () => carousel.RecommendedStarDifficulty.Value = recommended);
+                advanceSelection(direction: 1, diff: false);
+                waitForSelection(expectedSet, expectedDiff);
+            }
+
+            createCarousel();
+            AddStep("Add beatmaps", () =>
+            {
+                for (int i = 1; i <= 7; i++)
+                {
+                    var set = createTestBeatmapSet(i);
+                    carousel.UpdateBeatmapSet(set);
+                }
+            });
+            waitForSelection(1, 1);
+            setRecommendedAndExpect(1, 2, 1);
+            setRecommendedAndExpect(3.9, 3, 1);
+            setRecommendedAndExpect(4.1, 4, 2);
+            setRecommendedAndExpect(5.6, 5, 2);
+            setRecommendedAndExpect(5.7, 6, 3);
+            setRecommendedAndExpect(10, 7, 3);
+        }
+
         private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null)
         {
             createCarousel();
@@ -781,6 +810,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             public new List<DrawableCarouselItem> Items => base.Items;
 
+            public new Bindable<double> RecommendedStarDifficulty => base.RecommendedStarDifficulty;
+
             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 65472f8a0e..9aa4938886 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Select
         private const float bleed_top = FilterControl.HEIGHT;
         private const float bleed_bottom = Footer.HEIGHT;
 
-        private readonly Bindable<double> recommendedStarDifficulty = new Bindable<double>();
+        protected readonly Bindable<double> RecommendedStarDifficulty = new Bindable<double>();
 
         /// <summary>
         /// Triggered when the <see cref="BeatmapSets"/> loaded change and are completely loaded.
@@ -170,7 +170,7 @@ namespace osu.Game.Screens.Select
         {
             if (api.LocalUser.Value is GuestUser)
             {
-                recommendedStarDifficulty.Value = 0;
+                RecommendedStarDifficulty.Value = 0;
                 return;
             }
 
@@ -179,7 +179,7 @@ namespace osu.Game.Screens.Select
             req.Success += result =>
             {
                 // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
-                recommendedStarDifficulty.Value = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
+                RecommendedStarDifficulty.Value = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
             };
 
             api.PerformAsync(req);
@@ -617,7 +617,7 @@ namespace osu.Game.Screens.Select
                     b.Metadata = beatmapSet.Metadata;
             }
 
-            var set = new CarouselBeatmapSet(beatmapSet, recommendedStarDifficulty);
+            var set = new CarouselBeatmapSet(beatmapSet, RecommendedStarDifficulty);
 
             foreach (var c in set.Beatmaps)
             {

From 902734b75e8a0b0ceb65e2c5c46f3f2d7bbd2972 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Thu, 26 Mar 2020 20:32:43 +0200
Subject: [PATCH 01742/10326] Add failing test

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 0cc37bbd57..efe79d88ab 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -83,6 +83,38 @@ namespace osu.Game.Tests.Visual.SongSelect
             waitForSelection(set_count, 3);
         }
 
+        [Test]
+        public void TestTraversalHold()
+        {
+            var sets = new List<BeatmapSetInfo>();
+
+            for (int i = 0; i < 20; i++)
+            {
+                var set = createTestBeatmapSet(i);
+                sets.Add(set);
+            }
+
+            loadBeatmaps(sets);
+
+            void selectNextAndAssert(int amount)
+            {
+                setSelected(1, 1);
+                AddStep($"Next beatmap {amount} times", () =>
+                {
+                    for (int i = 0; i < amount; i++)
+                    {
+                        carousel.SelectNext();
+                    }
+                });
+                waitForSelection(amount + 1);
+            }
+
+            for (int i = 1; i < 15; i += i)
+            {
+                selectNextAndAssert(i);
+            }
+        }
+
         /// <summary>
         /// Test filtering
         /// </summary>

From e707adb7738fcf6a72ea4bdb8c4c5a9ecfd361cb Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Thu, 26 Mar 2020 21:16:10 +0200
Subject: [PATCH 01743/10326] Increase amount of test sets

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index efe79d88ab..31114dfd25 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -87,8 +87,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         public void TestTraversalHold()
         {
             var sets = new List<BeatmapSetInfo>();
+            const int create_this_many_sets = 200;
 
-            for (int i = 0; i < 20; i++)
+            for (int i = 0; i < create_this_many_sets; i++)
             {
                 var set = createTestBeatmapSet(i);
                 sets.Add(set);
@@ -109,7 +110,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 waitForSelection(amount + 1);
             }
 
-            for (int i = 1; i < 15; i += i)
+            for (int i = 1; i < create_this_many_sets; i += i)
             {
                 selectNextAndAssert(i);
             }

From f75c0826018a72977b3edca3ae469e93f6a28dee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Mar 2020 15:50:11 +0900
Subject: [PATCH 01744/10326] Fix osu!mania replays recording incorrectly when
 key mod applied

---
 .../Replays/ManiaReplayFrame.cs               | 21 +++++++------------
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs |  6 +++---
 osu.Game/Screens/Play/Player.cs               |  2 +-
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
index b93e372027..8c73c36e99 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -26,13 +27,7 @@ namespace osu.Game.Rulesets.Mania.Replays
 
         public void FromLegacy(LegacyReplayFrame legacyFrame, IBeatmap beatmap, ReplayFrame lastFrame = null)
         {
-            // We don't need to fully convert, just create the converter
-            var converter = new ManiaBeatmapConverter(beatmap, new ManiaRuleset());
-
-            // NB: Via co-op mod, osu-stable can have two stages with floor(col/2) and ceil(col/2) columns. This will need special handling
-            // elsewhere in the game if we do choose to support the old co-op mod anyway. For now, assume that there is only one stage.
-
-            var stage = new StageDefinition { Columns = converter.TargetColumns };
+            var maniaBeatmap = (ManiaBeatmap)beatmap;
 
             var normalAction = ManiaAction.Key1;
             var specialAction = ManiaAction.Special1;
@@ -42,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Replays
 
             while (activeColumns > 0)
             {
-                var isSpecial = stage.IsSpecialColumn(counter);
+                var isSpecial = maniaBeatmap.Stages.First().IsSpecialColumn(counter);
 
                 if ((activeColumns & 1) > 0)
                     Actions.Add(isSpecial ? specialAction : normalAction);
@@ -59,17 +54,15 @@ namespace osu.Game.Rulesets.Mania.Replays
 
         public LegacyReplayFrame ToLegacy(IBeatmap beatmap)
         {
+            var maniaBeatmap = (ManiaBeatmap)beatmap;
+
             int keys = 0;
 
-            var converter = new ManiaBeatmapConverter(beatmap, new ManiaRuleset());
-
-            var stage = new StageDefinition { Columns = converter.TargetColumns };
-
             var specialColumns = new List<int>();
 
-            for (int i = 0; i < converter.TargetColumns; i++)
+            for (int i = 0; i < maniaBeatmap.TotalColumns; i++)
             {
-                if (stage.IsSpecialColumn(i))
+                if (maniaBeatmap.Stages.First().IsSpecialColumn(i))
                     specialColumns.Add(i);
             }
 
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 58b64e1b8f..c356dd246d 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -45,9 +45,6 @@ namespace osu.Game.Scoring.Legacy
                 if (workingBeatmap is DummyWorkingBeatmap)
                     throw new BeatmapNotFoundException();
 
-                currentBeatmap = workingBeatmap.Beatmap;
-                scoreInfo.Beatmap = currentBeatmap.BeatmapInfo;
-
                 scoreInfo.User = new User { Username = sr.ReadString() };
 
                 // MD5Hash
@@ -68,6 +65,9 @@ namespace osu.Game.Scoring.Legacy
 
                 scoreInfo.Mods = currentRuleset.ConvertFromLegacyMods((LegacyMods)sr.ReadInt32()).ToArray();
 
+                currentBeatmap = workingBeatmap.GetPlayableBeatmap(currentRuleset.RulesetInfo, scoreInfo.Mods);
+                scoreInfo.Beatmap = currentBeatmap.BeatmapInfo;
+
                 /* score.HpGraphString = */
                 sr.ReadString();
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dc5bac9fd1..c570f4bf4f 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -657,7 +657,7 @@ namespace osu.Game.Screens.Play
 
                         using (var stream = new MemoryStream())
                         {
-                            new LegacyScoreEncoder(score, gameplayBeatmap).Encode(stream);
+                            new LegacyScoreEncoder(score, gameplayBeatmap.PlayableBeatmap).Encode(stream);
                             replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
                         }
                     }

From d36f5fb96f34cf22d84902d425a8d17583472ce1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Mar 2020 18:03:02 +0900
Subject: [PATCH 01745/10326] Fix animated follow points not (re)animating
 after rewind

---
 .../Drawables/Connections/FollowPoint.cs      |  4 ++-
 .../Connections/FollowPointConnection.cs      | 12 ++++-----
 osu.Game/Skinning/IAnimationTimeReference.cs  | 25 +++++++++++++++++++
 osu.Game/Skinning/LegacySkinExtensions.cs     | 23 ++++++++++++++++-
 4 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game/Skinning/IAnimationTimeReference.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
index 7e530ca047..8bb324d02e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
     /// <summary>
     /// A single follow point positioned between two adjacent <see cref="DrawableOsuHitObject"/>s.
     /// </summary>
-    public class FollowPoint : Container
+    public class FollowPoint : Container, IAnimationTimeReference
     {
         private const float width = 8;
 
@@ -45,5 +45,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 }
             }, confineMode: ConfineMode.NoScaling);
         }
+
+        public double AnimationStartTime { get; set; }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index d0935e46f7..6f09bbcd57 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -116,6 +116,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
             int point = 0;
 
+            ClearInternal();
+
             for (int d = (int)(spacing * 1.5); d < distance - spacing; d += spacing)
             {
                 float fraction = (float)d / distance;
@@ -126,13 +128,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
                 FollowPoint fp;
 
-                if (InternalChildren.Count > point)
-                {
-                    fp = (FollowPoint)InternalChildren[point];
-                    fp.ClearTransforms();
-                }
-                else
-                    AddInternal(fp = new FollowPoint());
+                AddInternal(fp = new FollowPoint());
 
                 fp.Position = pointStartPosition;
                 fp.Rotation = rotation;
@@ -142,6 +138,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 if (firstTransformStartTime == null)
                     firstTransformStartTime = fadeInTime;
 
+                fp.AnimationStartTime = fadeInTime;
+
                 using (fp.BeginAbsoluteSequence(fadeInTime))
                 {
                     fp.FadeIn(osuEnd.TimeFadeIn);
diff --git a/osu.Game/Skinning/IAnimationTimeReference.cs b/osu.Game/Skinning/IAnimationTimeReference.cs
new file mode 100644
index 0000000000..bcff10a24b
--- /dev/null
+++ b/osu.Game/Skinning/IAnimationTimeReference.cs
@@ -0,0 +1,25 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Timing;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// Denotes an object which provides a reference time to start animations from.
+    /// </summary>
+    [Cached]
+    public interface IAnimationTimeReference
+    {
+        /// <summary>
+        /// The reference clock.
+        /// </summary>
+        IFrameBasedClock Clock { get; }
+
+        /// <summary>
+        /// The time which animations should be started from, relative to <see cref="Clock"/>.
+        /// </summary>
+        double AnimationStartTime { get; }
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 52328d43b2..8765b161d4 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -3,10 +3,12 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Timing;
 
 namespace osu.Game.Skinning
 {
@@ -22,7 +24,7 @@ namespace osu.Game.Skinning
 
                 if (textures.Length > 0)
                 {
-                    var animation = new TextureAnimation
+                    var animation = new SkinnableTextureAnimation
                     {
                         DefaultFrameLength = getFrameLength(source, applyConfigFrameRate, textures),
                         Repeat = looping,
@@ -53,6 +55,25 @@ namespace osu.Game.Skinning
             }
         }
 
+        public class SkinnableTextureAnimation : TextureAnimation
+        {
+            [Resolved(canBeNull: true)]
+            private IAnimationTimeReference timeReference { get; set; }
+
+            public SkinnableTextureAnimation()
+                : base(false)
+            {
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                if (timeReference != null)
+                    Clock = new FramedOffsetClock(timeReference.Clock) { Offset = -timeReference.AnimationStartTime };
+            }
+        }
+
         private const double default_frame_time = 1000 / 60d;
 
         private static double getFrameLength(ISkin source, bool applyConfigFrameRate, Texture[] textures)

From 6788b7f9cd9222c4dffa9fe46792b4a179e053c4 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 27 Mar 2020 09:43:51 +0100
Subject: [PATCH 01746/10326] Add test for loading storyboards with missing
 video file.

---
 .../Resources/storyboard_no_video.osu         | 31 ++++++++++++++++
 .../Visual/Gameplay/TestSceneStoryboard.cs    | 37 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/storyboard_no_video.osu

diff --git a/osu.Game.Tests/Resources/storyboard_no_video.osu b/osu.Game.Tests/Resources/storyboard_no_video.osu
new file mode 100644
index 0000000000..25f1ff6361
--- /dev/null
+++ b/osu.Game.Tests/Resources/storyboard_no_video.osu
@@ -0,0 +1,31 @@
+osu file format v14
+
+[Events]
+//Background and Video events
+0,0,"BG.jpg",0,0
+Video,0,"video.avi"
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+1674,333.333333333333,4,2,1,70,1,0
+1674,-100,4,2,1,70,0,0
+3340,-100,4,2,1,70,0,0
+3507,-100,4,2,1,70,0,0
+3673,-100,4,2,1,70,0,0
+
+[Colours]
+Combo1 : 240,80,80
+Combo2 : 171,252,203
+Combo3 : 128,128,255
+Combo4 : 249,254,186
+
+[HitObjects]
+148,303,1674,5,6,3:2:0:0:
+378,252,1840,1,0,0:0:0:0:
+389,270,2340,5,2,0:1:0:0:
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index ff8437311e..9f1492a25f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -9,8 +9,12 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
 using osu.Game.Overlays;
+using osu.Game.Storyboards;
 using osu.Game.Storyboards.Drawables;
+using osu.Game.Tests.Resources;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -54,7 +58,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                     State = { Value = Visibility.Visible },
                 }
             });
+        }
 
+        [Test]
+        public void TestStoryboard()
+        {
             AddStep("Restart", restart);
             AddToggleStep("Passing", passing =>
             {
@@ -62,6 +70,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
         }
 
+        [Test]
+        public void TestStoryboardMissingVideo()
+        {
+            AddStep("Load storyboard with missing video", loadStoryboardNoVideo);
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -94,5 +108,28 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboardContainer.Add(storyboard);
             decoupledClock.ChangeSource(working.Track);
         }
+
+        private void loadStoryboardNoVideo()
+        {
+            if (storyboard != null)
+                storyboardContainer.Remove(storyboard);
+
+            var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
+            storyboardContainer.Clock = decoupledClock;
+
+            Storyboard sb;
+
+            using (var str = TestResources.OpenResource("storyboard_no_video.osu"))
+            using (var bfr = new LineBufferedReader(str))
+            {
+                var decoder = new LegacyStoryboardDecoder();
+                sb = decoder.Decode(bfr);
+            }
+
+            storyboard = sb.CreateDrawable(Beatmap.Value);
+
+            storyboardContainer.Add(storyboard);
+            decoupledClock.ChangeSource(Beatmap.Value.Track);
+        }
     }
 }

From 4106700771f8581ca07846d291aa343c121f0884 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Mar 2020 20:51:44 +0900
Subject: [PATCH 01747/10326] 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 7e17f9da16..b147fdd05b 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.319.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.327.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3894c06994..781c566b5f 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.319.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.327.0" />
     <PackageReference Include="Sentry" Version="2.1.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 9cc9792ecf..a2c6106931 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.319.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.327.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.319.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.327.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 7b24cc325f0ed61490766307ac0a681d5a9bb766 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 27 Mar 2020 20:57:57 +0300
Subject: [PATCH 01748/10326] Implement OverlayScrollContainer component

---
 .../TestSceneOverlayScrollContainer.cs        |  90 ++++++++++
 osu.Game/Overlays/OverlayScrollContainer.cs   | 169 ++++++++++++++++++
 2 files changed, 259 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
 create mode 100644 osu.Game/Overlays/OverlayScrollContainer.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
new file mode 100644
index 0000000000..1fc85c3c04
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
@@ -0,0 +1,90 @@
+// Copyright (c) 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.Overlays;
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Shapes;
+using osuTK.Graphics;
+using NUnit.Framework;
+using osu.Framework.Utils;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneOverlayScrollContainer : OsuManualInputManagerTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OverlayScrollContainer)
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+        private OverlayScrollContainer scroll;
+
+        private int invocationCount;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Add(scroll = new OverlayScrollContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new Container
+                {
+                    Height = 3000,
+                    RelativeSizeAxes = Axes.X,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Gray
+                    }
+                }
+            });
+
+            invocationCount = 0;
+
+            scroll.Button.Action += () => invocationCount++;
+        });
+
+        [Test]
+        public void TestButtonVisibility()
+        {
+            AddAssert("button is hidden", () => scroll.Button.State.Value == Visibility.Hidden);
+
+            AddStep("scroll to end", () => scroll.ScrollToEnd(false));
+            AddAssert("button is visible", () => scroll.Button.State.Value == Visibility.Visible);
+
+            AddStep("scroll to start", () => scroll.ScrollToStart(false));
+            AddAssert("button is hidden", () => scroll.Button.State.Value == Visibility.Hidden);
+        }
+
+        [Test]
+        public void TestButtonAction()
+        {
+            AddStep("scroll to end", () => scroll.ScrollToEnd(false));
+
+            AddStep("invoke action", () => scroll.Button.Action.Invoke());
+
+            AddUntilStep("scrolled back to start", () => Precision.AlmostEquals(scroll.Current, 0, 0.1f));
+        }
+
+        [Test]
+        public void TestMultipleClicks()
+        {
+            AddStep("scroll to end", () => scroll.ScrollToEnd(false));
+
+            AddAssert("invocation count is 0", () => invocationCount == 0);
+
+            AddStep("hover button", () => InputManager.MoveMouseTo(scroll.Button));
+            AddRepeatStep("click button", () => InputManager.Click(MouseButton.Left), 3);
+
+            AddAssert("invocation count is 1", () => invocationCount == 1);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
new file mode 100644
index 0000000000..1a875ded95
--- /dev/null
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -0,0 +1,169 @@
+// Copyright (c) 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.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.Input.Events;
+using osu.Game.Graphics.Containers;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays
+{
+    /// <summary>
+    /// <see cref="OsuScrollContainer"/> which provides <see cref="ScrollToTopButton"/>. Mostly used in <see cref="FullscreenOverlay"/>.
+    /// </summary>
+    public class OverlayScrollContainer : OsuScrollContainer
+    {
+        /// <summary>
+        /// Scroll position at which the <see cref="ScrollToTopButton"/> will be shown.
+        /// </summary>
+        private const int button_scroll_position = 200;
+
+        public ScrollToTopButton Button { get; }
+
+        private float currentTarget;
+
+        public OverlayScrollContainer()
+        {
+            AddInternal(Button = new ScrollToTopButton
+            {
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.BottomRight,
+                Margin = new MarginPadding(20),
+                Action = () =>
+                {
+                    ScrollToStart();
+                    currentTarget = Target;
+                    Button.State.Value = Visibility.Hidden;
+                }
+            });
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            if (ScrollContent.DrawHeight + button_scroll_position < DrawHeight)
+            {
+                Button.State.Value = Visibility.Hidden;
+                return;
+            }
+
+            if (Target == currentTarget)
+                return;
+
+            currentTarget = Target;
+            Button.State.Value = Current > button_scroll_position ? Visibility.Visible : Visibility.Hidden;
+        }
+
+        public class ScrollToTopButton : VisibilityContainer
+        {
+            private const int fade_duration = 500;
+
+            public Action Action
+            {
+                get => button.Action;
+                set => button.Action = value;
+            }
+
+            public override bool PropagatePositionalInputSubTree => true;
+
+            protected override bool StartHidden => true;
+
+            private readonly Button button;
+
+            public ScrollToTopButton()
+            {
+                Size = new Vector2(50);
+                Child = button = new Button();
+            }
+
+            protected override bool OnMouseDown(MouseDownEvent e) => true;
+
+            protected override void PopIn() => button.FadeIn(fade_duration, Easing.OutQuint);
+
+            protected override void PopOut() => button.FadeOut(fade_duration, Easing.OutQuint);
+
+            private class Button : OsuHoverContainer
+            {
+                public override bool PropagatePositionalInputSubTree => Alpha == 1;
+
+                protected override IEnumerable<Drawable> EffectTargets => new[] { background };
+
+                private Color4 flashColour;
+
+                private readonly Container content;
+                private readonly Box background;
+
+                public Button()
+                {
+                    RelativeSizeAxes = Axes.Both;
+                    Add(content = new CircularContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Masking = true,
+                        EdgeEffect = new EdgeEffectParameters
+                        {
+                            Type = EdgeEffectType.Shadow,
+                            Offset = new Vector2(0f, 1f),
+                            Radius = 3f,
+                            Colour = Color4.Black.Opacity(0.25f),
+                        },
+                        Children = new Drawable[]
+                        {
+                            background = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both
+                            },
+                            new SpriteIcon
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Size = new Vector2(15),
+                                Icon = FontAwesome.Solid.ChevronUp
+                            }
+                        }
+                    });
+
+                    TooltipText = "Scroll to top";
+                }
+
+                [BackgroundDependencyLoader]
+                private void load(OverlayColourProvider colourProvider)
+                {
+                    IdleColour = colourProvider.Background6;
+                    HoverColour = colourProvider.Background5;
+                    flashColour = colourProvider.Light1;
+                }
+
+                protected override bool OnClick(ClickEvent e)
+                {
+                    background.FlashColour(flashColour, 800, Easing.OutQuint);
+                    return base.OnClick(e);
+                }
+
+                protected override bool OnMouseDown(MouseDownEvent e)
+                {
+                    content.ScaleTo(0.75f, 2000, Easing.OutQuint);
+                    return true;
+                }
+
+                protected override void OnMouseUp(MouseUpEvent e)
+                {
+                    content.ScaleTo(1, 1000, Easing.OutElastic);
+                    base.OnMouseUp(e);
+                }
+            }
+        }
+    }
+}

From 46af4bce32eb176c459514b04aac08a95cf44e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Mar 2020 19:42:45 +0100
Subject: [PATCH 01749/10326] Cover regression in autoplay test

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 8108ce0864..5ee17aeea2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.Break;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -27,7 +28,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("seek to break time", () => Player.GameplayClockContainer.Seek(Player.ChildrenOfType<BreakTracker>().First().Breaks.First().StartTime));
             AddUntilStep("wait for seek to complete", () =>
                 Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= Player.BreakOverlay.Breaks.First().StartTime);
-            AddAssert("test keys not counting", () => !Player.HUDOverlay.KeyCounter.IsCounting);
+            AddAssert("keys not counting", () => !Player.HUDOverlay.KeyCounter.IsCounting);
+            AddAssert("overlay displays 100% accuracy", () => Player.BreakOverlay.ChildrenOfType<BreakInfo>().Single().AccuracyDisplay.Current.Value == 1);
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-80000));
             AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
         }

From adc759771ff73e3b3b023b624348cf9655c9f017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Mar 2020 19:47:42 +0100
Subject: [PATCH 01750/10326] Hook up score processor in player

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 118cea324c..8693035103 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -308,7 +308,7 @@ namespace osu.Game.Screens.Play
                     },
                 },
                 failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
-                BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks)
+                BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)
                 {
                     Clock = DrawableRuleset.FrameStableClock,
                     ProcessCustomClock = false,

From 3a3bfe9a5ea14477da9fdc67d42b9f6fe16598e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Mar 2020 21:19:49 +0100
Subject: [PATCH 01751/10326] Reorder children to fix pause overlay z-order

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8693035103..63ec3b0d2d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -251,6 +251,12 @@ namespace osu.Game.Screens.Play
         {
             target.AddRange(new[]
             {
+                BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)
+                {
+                    Clock = DrawableRuleset.FrameStableClock,
+                    ProcessCustomClock = false,
+                    Breaks = working.Beatmap.Breaks
+                },
                 // display the cursor above some HUD elements.
                 DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
                 DrawableRuleset.ResumeOverlay?.CreateProxy() ?? new Container(),
@@ -308,12 +314,6 @@ namespace osu.Game.Screens.Play
                     },
                 },
                 failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
-                BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)
-                {
-                    Clock = DrawableRuleset.FrameStableClock,
-                    ProcessCustomClock = false,
-                    Breaks = working.Beatmap.Breaks
-                },
             });
         }
 

From 15fb1a099e4d96e725a6c46072fdf6b782bfd529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 28 Mar 2020 00:42:51 +0100
Subject: [PATCH 01752/10326] Modify assert to avoid false failures

In headless tests it was possible for TestInstantLoad() to erroneously
fail. There were two scenarios in which LoadingSpinner could be null:

1. If the test runner was quick enough, the assert could end up running
   even before Loader.OnEntering() had even had a chance to, meaning
   that the spinner was never even actually assigned to or instantiated
   at that point in time.

2. Even if Loader.OnEntering() had managed to run, there was also
   a possibility that the spinner itself wasn't loaded at the point
   of checking the assertion. As the spinner is accessed through
   ChildrenOfType(), which only checks InternalChildren and ignores
   all currently-loading drawables, it would therefore return null.

As null != 0, both of these cases would actually fail the test (this is
best seen running headless, preferably with a [Repeat] attribute
attached).

To resolve, allow the spinner to be null at the point of asserting and
duplicate the assertion step at the end. This weakens the test, as case
(1) should probably be waited for and case (2) could be solved with
exposition as protected in the base, but when attempting to wait for
the loader itself to be loaded there were also cases where the
appropriate until step would take so much time that the spinner would
actually become visible in line with the delayed display logic, so this
is a best-effort attempt to address both points without radical
changes.
---
 osu.Game.Tests/Visual/Menus/TestSceneLoader.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
index b3064ba9be..c44363d9ea 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
@@ -36,8 +36,6 @@ namespace osu.Game.Tests.Visual.Menus
         [Test]
         public void TestInstantLoad()
         {
-            // visual only, very impossible to test this using asserts.
-
             AddStep("load immediately", () =>
             {
                 loader = new TestLoader();
@@ -46,12 +44,17 @@ namespace osu.Game.Tests.Visual.Menus
                 LoadScreen(loader);
             });
 
-            AddAssert("spinner did not display", () => loader.LoadingSpinner?.Alpha == 0);
+            spinnerNotPresentOrHidden();
 
             AddUntilStep("loaded", () => loader.ScreenLoaded);
             AddUntilStep("not current", () => !loader.IsCurrentScreen());
+
+            spinnerNotPresentOrHidden();
         }
 
+        private void spinnerNotPresentOrHidden() =>
+            AddAssert("spinner did not display", () => loader.LoadingSpinner == null || loader.LoadingSpinner.Alpha == 0);
+
         [Test]
         public void TestDelayedLoad()
         {

From a317ef65b8b5d301689e526bec8efd6b453743bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 28 Mar 2020 12:18:28 +0900
Subject: [PATCH 01753/10326] Remove default for argument

---
 osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs | 2 +-
 osu.Game/Screens/Play/BreakOverlay.cs                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
index d46b4ea289..ff25e609c1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddRange(new Drawable[]
             {
                 breakTracker = new TestBreakTracker(),
-                breakOverlay = new BreakOverlay(true)
+                breakOverlay = new BreakOverlay(true, null)
                 {
                     ProcessCustomClock = false,
                 }
diff --git a/osu.Game/Screens/Play/BreakOverlay.cs b/osu.Game/Screens/Play/BreakOverlay.cs
index 89f51315f2..c978f4e96d 100644
--- a/osu.Game/Screens/Play/BreakOverlay.cs
+++ b/osu.Game/Screens/Play/BreakOverlay.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Play
         private readonly RemainingTimeCounter remainingTimeCounter;
         private readonly BreakArrows breakArrows;
 
-        public BreakOverlay(bool letterboxing, ScoreProcessor scoreProcessor = null)
+        public BreakOverlay(bool letterboxing, ScoreProcessor scoreProcessor)
         {
             RelativeSizeAxes = Axes.Both;
 

From 45eb03bfe2adc868729915defc057b09e5fb7f90 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 28 Mar 2020 07:43:47 +0300
Subject: [PATCH 01754/10326] Apply review suggestions

---
 .../TestSceneHyperDashColouring.cs            | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 7fab961aa7..9ab8cf9113 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     }, false, false);
             });
 
-            AddAssert("fruit colour default-hyperdash", () => checkFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour, legacyFruit));
+            AddAssert("default colour", () => checkFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour, legacyFruit));
         }
 
         [TestCase(false, true)]
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     }, customCatcherHyperDashColour, true);
             });
 
-            AddAssert("fruit colour custom-hyperdash", () => checkFruitHyperDashColour(drawableFruit, TestLegacySkin.CustomHyperDashFruitColour, legacyFruit));
+            AddAssert("custom colour", () => checkFruitHyperDashColour(drawableFruit, TestLegacySkin.CustomHyperDashFruitColour, legacyFruit));
         }
 
         [TestCase(false)]
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     }, true, false);
             });
 
-            AddAssert("fruit colour catcher-custom-hyperdash", () => checkFruitHyperDashColour(drawableFruit, TestLegacySkin.CustomHyperDashColour, legacyFruit));
+            AddAssert("catcher custom colour", () => checkFruitHyperDashColour(drawableFruit, TestLegacySkin.CustomHyperDashColour, legacyFruit));
         }
 
         private Drawable setupSkinHierarchy(Func<Drawable> getChild, bool customHyperDashCatcherColour = false, bool customHyperDashFruitColour = false, bool customHyperDashAfterColour = false)
@@ -139,13 +139,12 @@ namespace osu.Game.Rulesets.Catch.Tests
                 if (componentName == "fruit-pear")
                 {
                     // convince CatchLegacySkinTransformer to use the LegacyFruitPiece for pear fruit.
-                    var texture = new Texture(Texture.WhitePixel.TextureGL)
+                    return new Texture(Texture.WhitePixel.TextureGL)
                     {
                         Width = 1,
                         Height = 1,
                         ScaleAdjust = 1 / 96f
                     };
-                    return texture;
                 }
 
                 return null;
@@ -155,25 +154,16 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
             {
-                switch (lookup)
+                if (lookup is CatchSkinConfiguration config)
                 {
-                    case CatchSkinConfiguration config when config == CatchSkinConfiguration.HyperDash:
-                        if (customHyperDashCatcherColour)
-                            return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashColour));
+                    if (config == CatchSkinConfiguration.HyperDash && customHyperDashCatcherColour)
+                        return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashColour));
 
-                        return null;
+                    if (config == CatchSkinConfiguration.HyperDashFruit && customHyperDashFruitColour)
+                        return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashFruitColour));
 
-                    case CatchSkinConfiguration config when config == CatchSkinConfiguration.HyperDashFruit:
-                        if (customHyperDashFruitColour)
-                            return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashFruitColour));
-
-                        return null;
-
-                    case CatchSkinConfiguration config when config == CatchSkinConfiguration.HyperDashAfterImage:
-                        if (customHyperDashAfterColour)
-                            return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashAfterColour));
-
-                        return null;
+                    if (config == CatchSkinConfiguration.HyperDashAfterImage && customHyperDashAfterColour)
+                        return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashAfterColour));
                 }
 
                 return null;

From fb4b334ce2f9a5e44bf82cd846a7af98f7487388 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 28 Mar 2020 13:39:08 +0900
Subject: [PATCH 01755/10326] Add support for legacy skin sliderstartcircle /
 sliderstartcircleoverlay

---
 .../metrics-skin/sliderstartcircle@2x.png     | Bin 0 -> 17245 bytes
 .../sliderstartcircleoverlay@2x.png           | Bin 0 -> 50009 bytes
 .../Objects/Drawables/DrawableHitCircle.cs    |   4 +++-
 .../Objects/Drawables/DrawableSliderHead.cs   |   2 ++
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs    |   1 +
 .../Skinning/LegacyMainCirclePiece.cs         |  21 +++++++++++++++---
 .../Skinning/OsuLegacySkinTransformer.cs      |   6 +++++
 7 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderstartcircle@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderstartcircleoverlay@2x.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderstartcircle@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderstartcircle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d630443cd7e2222d3a676e8d77219873660ebe0
GIT binary patch
literal 17245
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
QfB^_RUHx3vIVCg!0GzvG!~g&Q

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderstartcircleoverlay@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderstartcircleoverlay@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a824784942a70e4717218688bc32318d012a4d40
GIT binary patch
literal 50009
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%0A6c)ubJ
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index da1e666aba..5202327245 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public readonly SkinnableDrawable CirclePiece;
         private readonly Container scaleContainer;
 
+        protected virtual OsuSkinComponents CirclePieceComponent => OsuSkinComponents.HitCircle;
+
         public DrawableHitCircle(HitCircle h)
             : base(h)
         {
@@ -57,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                                 return true;
                             },
                         },
-                        CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.HitCircle), _ => new MainCirclePiece()),
+                        CirclePiece = new SkinnableDrawable(new OsuSkinComponent(CirclePieceComponent), _ => new MainCirclePiece()),
                         ApproachCircle = new ApproachCircle
                         {
                             Alpha = 0,
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index c5609b01e0..a360071f26 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
+        protected override OsuSkinComponents CirclePieceComponent => OsuSkinComponents.SliderHeadHitCircle;
+
         private readonly Slider slider;
 
         public DrawableSliderHead(Slider slider, HitCircle h)
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index 4ea4220faf..b2cdc8ccbf 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -13,6 +13,7 @@ namespace osu.Game.Rulesets.Osu
         ApproachCircle,
         ReverseArrow,
         HitCircleText,
+        SliderHeadHitCircle,
         SliderFollowCircle,
         SliderBall,
         SliderBody,
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 93ae0371df..38ba4c5974 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -18,8 +19,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
 {
     public class LegacyMainCirclePiece : CompositeDrawable
     {
-        public LegacyMainCirclePiece()
+        private readonly string priorityLookup;
+
+        public LegacyMainCirclePiece(string priorityLookup = null)
         {
+            this.priorityLookup = priorityLookup;
+
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
         }
 
@@ -39,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             {
                 hitCircleSprite = new Sprite
                 {
-                    Texture = skin.GetTexture("hitcircle"),
+                    Texture = getTextureWithFallback(string.Empty),
                     Colour = drawableObject.AccentColour.Value,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -51,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 }, confineMode: ConfineMode.NoScaling),
                 new Sprite
                 {
-                    Texture = skin.GetTexture("hitcircleoverlay"),
+                    Texture = getTextureWithFallback("overlay"),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                 }
@@ -65,6 +70,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             indexInCurrentCombo.BindTo(osuObject.IndexInCurrentComboBindable);
             indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
+
+            Texture getTextureWithFallback(string name)
+            {
+                Texture tex = null;
+
+                if (!string.IsNullOrEmpty(priorityLookup))
+                    tex = skin.GetTexture($"{priorityLookup}{name}");
+
+                return tex ?? skin.GetTexture($"hitcircle{name}");
+            }
         }
 
         private void updateState(ValueChangedEvent<ArmedState> state)
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index d6c3f443eb..075c536b4c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -82,6 +82,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                     return null;
 
+                case OsuSkinComponents.SliderHeadHitCircle:
+                    if (hasHitCircle.Value)
+                        return new LegacyMainCirclePiece("sliderstartcircle");
+
+                    return null;
+
                 case OsuSkinComponents.HitCircle:
                     if (hasHitCircle.Value)
                         return new LegacyMainCirclePiece();

From fc3f9ff6faf06324e32c7964d5af915a0b16ffcb Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 28 Mar 2020 12:54:48 +0200
Subject: [PATCH 01756/10326] Don't use drawables for select next

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 57 +++++++++-------------
 1 file changed, 23 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index fa8974f55a..df2c1236f4 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -253,46 +253,35 @@ namespace osu.Game.Screens.Select
         /// <param name="skipDifficulties">Whether to skip individual difficulties and only increment over full groups.</param>
         public void SelectNext(int direction = 1, bool skipDifficulties = true)
         {
-            var visibleItems = Items.Where(s => !s.Item.Filtered.Value).ToList();
-
-            if (!visibleItems.Any())
+            if (!root.Children.Where(s => !s.Filtered.Value).ToList().Any())
                 return;
 
-            DrawableCarouselItem drawable = null;
+            if (skipDifficulties)
+                selectNextSet(direction, true);
+            else
+                selectNextDifficulty(direction);
+        }
 
-            if (selectedBeatmap != null && (drawable = selectedBeatmap.Drawables.FirstOrDefault()) == null)
-                // if the selected beatmap isn't present yet, we can't correctly change selection.
-                // we can fix this by changing this method to not reference drawables / Items in the first place.
-                return;
+        private void selectNextSet(int direction, bool skipDifficulties)
+        {
+            var visibleSets = root.Children.OfType<CarouselBeatmapSet>().Where(s => !s.Filtered.Value).ToList();
 
-            int originalIndex = visibleItems.IndexOf(drawable);
-            int currentIndex = originalIndex;
+            var item = visibleSets[(visibleSets.IndexOf(selectedBeatmapSet) + direction + visibleSets.Count) % visibleSets.Count];
 
-            // local function to increment the index in the required direction, wrapping over extremities.
-            int incrementIndex() => currentIndex = (currentIndex + direction + visibleItems.Count) % visibleItems.Count;
+            if (skipDifficulties)
+                select(item);
+            else
+                select(direction > 0 ? item.Beatmaps.First(b => !b.Filtered.Value) : item.Beatmaps.Last(b => !b.Filtered.Value));
+        }
 
-            while (incrementIndex() != originalIndex)
-            {
-                var item = visibleItems[currentIndex].Item;
-
-                if (item.Filtered.Value || item.State.Value == CarouselItemState.Selected) continue;
-
-                switch (item)
-                {
-                    case CarouselBeatmap beatmap:
-                        if (skipDifficulties) continue;
-
-                        select(beatmap);
-                        return;
-
-                    case CarouselBeatmapSet set:
-                        if (skipDifficulties)
-                            select(set);
-                        else
-                            select(direction > 0 ? set.Beatmaps.First(b => !b.Filtered.Value) : set.Beatmaps.Last(b => !b.Filtered.Value));
-                        return;
-                }
-            }
+        private void selectNextDifficulty(int direction)
+        {
+            var difficulties = selectedBeatmapSet.Children.Where(s => !s.Filtered.Value).ToList();
+            int index = difficulties.IndexOf(selectedBeatmap);
+            if (index + direction < 0 || index + direction >= difficulties.Count)
+                selectNextSet(direction, false);
+            else
+                select(difficulties[index + direction]);
         }
 
         /// <summary>

From 6a0c5c87aa52c908af5f632b58b7849e45988c6e Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 28 Mar 2020 13:06:03 +0200
Subject: [PATCH 01757/10326] Use already existing variable

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index df2c1236f4..a6cbf58023 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -253,7 +253,7 @@ namespace osu.Game.Screens.Select
         /// <param name="skipDifficulties">Whether to skip individual difficulties and only increment over full groups.</param>
         public void SelectNext(int direction = 1, bool skipDifficulties = true)
         {
-            if (!root.Children.Where(s => !s.Filtered.Value).ToList().Any())
+            if (!beatmapSets.Where(s => !s.Filtered.Value).ToList().Any())
                 return;
 
             if (skipDifficulties)
@@ -264,7 +264,7 @@ namespace osu.Game.Screens.Select
 
         private void selectNextSet(int direction, bool skipDifficulties)
         {
-            var visibleSets = root.Children.OfType<CarouselBeatmapSet>().Where(s => !s.Filtered.Value).ToList();
+            var visibleSets = beatmapSets.Where(s => !s.Filtered.Value).ToList();
 
             var item = visibleSets[(visibleSets.IndexOf(selectedBeatmapSet) + direction + visibleSets.Count) % visibleSets.Count];
 

From 659865b45762ee153f02888e8bbfdc92513b83b3 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 28 Mar 2020 13:08:06 +0200
Subject: [PATCH 01758/10326] Use understandable set id

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 31114dfd25..a811e58694 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             for (int i = 0; i < create_this_many_sets; i++)
             {
-                var set = createTestBeatmapSet(i);
+                var set = createTestBeatmapSet(i + 1);
                 sets.Add(set);
             }
 

From 63f6269eb0ae7e88a8b810c6c7ba5690a9cea1dd Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 28 Mar 2020 13:10:20 +0200
Subject: [PATCH 01759/10326] Test both ways

---
 .../Visual/SongSelect/TestSceneBeatmapCarousel.cs  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index a811e58694..b316fcc60b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -83,8 +83,9 @@ namespace osu.Game.Tests.Visual.SongSelect
             waitForSelection(set_count, 3);
         }
 
-        [Test]
-        public void TestTraversalHold()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestTraversalHold(bool forwards)
         {
             var sets = new List<BeatmapSetInfo>();
             const int create_this_many_sets = 200;
@@ -99,15 +100,16 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             void selectNextAndAssert(int amount)
             {
-                setSelected(1, 1);
-                AddStep($"Next beatmap {amount} times", () =>
+                setSelected(forwards ? 1 : create_this_many_sets, 1);
+                string text = forwards ? "Next" : "Previous";
+                AddStep($"{text} beatmap {amount} times", () =>
                 {
                     for (int i = 0; i < amount; i++)
                     {
-                        carousel.SelectNext();
+                        carousel.SelectNext(forwards ? 1 : -1);
                     }
                 });
-                waitForSelection(amount + 1);
+                waitForSelection(forwards ? amount + 1 : create_this_many_sets - amount);
             }
 
             for (int i = 1; i < create_this_many_sets; i += i)

From 87854fc4fabea688d60922552f487037e4873d44 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 28 Mar 2020 13:23:31 +0200
Subject: [PATCH 01760/10326] Rename variable

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

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index a6cbf58023..91a9b19115 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -266,12 +266,12 @@ namespace osu.Game.Screens.Select
         {
             var visibleSets = beatmapSets.Where(s => !s.Filtered.Value).ToList();
 
-            var item = visibleSets[(visibleSets.IndexOf(selectedBeatmapSet) + direction + visibleSets.Count) % visibleSets.Count];
+            var nextSet = visibleSets[(visibleSets.IndexOf(selectedBeatmapSet) + direction + visibleSets.Count) % visibleSets.Count];
 
             if (skipDifficulties)
-                select(item);
+                select(nextSet);
             else
-                select(direction > 0 ? item.Beatmaps.First(b => !b.Filtered.Value) : item.Beatmaps.Last(b => !b.Filtered.Value));
+                select(direction > 0 ? nextSet.Beatmaps.First(b => !b.Filtered.Value) : nextSet.Beatmaps.Last(b => !b.Filtered.Value));
         }
 
         private void selectNextDifficulty(int direction)

From 1c711147f37c289f1519088563fab122c05785cc Mon Sep 17 00:00:00 2001
From: Santeri Nogelainen <santeri.nogelainen@gmail.com>
Date: Sat, 28 Mar 2020 17:22:01 +0200
Subject: [PATCH 01761/10326] Move all carousel rank logic into separate
 classes (TopLocalRank and CarouselBeatmapRank)

---
 osu.Game/Online/Leaderboards/TopLocalRank.cs  | 78 +++++++++++++++++++
 .../Online/Leaderboards/UpdateableRank.cs     | 22 ++++--
 .../Select/Carousel/CarouselBeatmapRank.cs    | 67 ++++++++++++++++
 .../Carousel/DrawableCarouselBeatmap.cs       | 20 ++++-
 4 files changed, 177 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game/Online/Leaderboards/TopLocalRank.cs
 create mode 100644 osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs

diff --git a/osu.Game/Online/Leaderboards/TopLocalRank.cs b/osu.Game/Online/Leaderboards/TopLocalRank.cs
new file mode 100644
index 0000000000..40855e6cf8
--- /dev/null
+++ b/osu.Game/Online/Leaderboards/TopLocalRank.cs
@@ -0,0 +1,78 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Rulesets;
+using osu.Game.Scoring;
+
+namespace osu.Game.Online.Leaderboards
+{
+    public class TopLocalRank : Container
+    {
+        private readonly BeatmapInfo beatmap;
+
+        private ScoreManager scores;
+        private IBindable<RulesetInfo> ruleset;
+        private IAPIProvider api;
+        private UpdateableRank rank;
+
+        /// <summary>
+        /// Raised when the top score is loaded
+        /// </summary>
+        public Action<ScoreInfo> ScoreLoaded;
+
+        public TopLocalRank(BeatmapInfo beatmap)
+        {
+            this.beatmap = beatmap;
+
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChild = rank = new UpdateableRank(null)
+            {
+                RelativeSizeAxes = Axes.Both
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ScoreManager scores, IBindable<RulesetInfo> ruleset, IAPIProvider api)
+        {
+            this.scores = scores;
+            this.ruleset = ruleset;
+            this.api = api;
+
+            FetchAndLoadTopScore();
+        }
+
+        public void FetchAndLoadTopScore()
+        {
+            var score = fetchTopScore();
+
+            loadTopScore(score);
+        }
+
+        private void loadTopScore(ScoreInfo score)
+        {
+            Schedule(() => rank.Rank = score?.Rank);
+
+            ScoreLoaded?.Invoke(score);
+        }
+
+        private ScoreInfo fetchTopScore()
+        {
+            if (scores == null || beatmap == null || ruleset?.Value == null || api?.LocalUser.Value == null)
+                return null;
+
+            return scores.GetAllUsableScores()
+                         .Where(s => s.UserID == api.LocalUser.Value.Id && s.BeatmapInfoID == beatmap.ID && s.RulesetID == ruleset.Value.ID)
+                         .OrderByDescending(s => s.TotalScore)
+                         .FirstOrDefault();
+        }
+    }
+}
diff --git a/osu.Game/Online/Leaderboards/UpdateableRank.cs b/osu.Game/Online/Leaderboards/UpdateableRank.cs
index d9e8957281..8f74fd84fe 100644
--- a/osu.Game/Online/Leaderboards/UpdateableRank.cs
+++ b/osu.Game/Online/Leaderboards/UpdateableRank.cs
@@ -7,23 +7,31 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Online.Leaderboards
 {
-    public class UpdateableRank : ModelBackedDrawable<ScoreRank>
+    public class UpdateableRank : ModelBackedDrawable<ScoreRank?>
     {
-        public ScoreRank Rank
+        public ScoreRank? Rank
         {
             get => Model;
             set => Model = value;
         }
 
-        public UpdateableRank(ScoreRank rank)
+        public UpdateableRank(ScoreRank? rank)
         {
             Rank = rank;
         }
 
-        protected override Drawable CreateDrawable(ScoreRank rank) => new DrawableRank(rank)
+        protected override Drawable CreateDrawable(ScoreRank? rank)
         {
-            Anchor = Anchor.Centre,
-            Origin = Anchor.Centre,
-        };
+            if (rank.HasValue)
+            {
+                return new DrawableRank(rank.Value)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                };
+            }
+
+            return null;
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs
new file mode 100644
index 0000000000..9ad0dc946e
--- /dev/null
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Scoring;
+
+namespace osu.Game.Online.Leaderboards
+{
+    public class CarouselBeatmapRank : Container
+    {
+        private const int rank_size = 20;
+        private readonly BeatmapInfo beatmap;
+
+        private TopLocalRank rank;
+
+        public CarouselBeatmapRank(BeatmapInfo beatmap)
+        {
+            this.beatmap = beatmap;
+
+            Height = rank_size;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ScoreManager scores, IBindable<RulesetInfo> ruleset)
+        {
+            scores.ItemAdded += scoreChanged;
+            scores.ItemRemoved += scoreChanged;
+            ruleset.ValueChanged += _ => rulesetChanged();
+
+            rank = new TopLocalRank(beatmap)
+            {
+                ScoreLoaded = scaleDisplay
+            };
+
+            InternalChild = new DelayedLoadWrapper(rank)
+            {
+                RelativeSizeAxes = Axes.Both
+            };
+        }
+
+        private void rulesetChanged()
+        {
+            rank.FetchAndLoadTopScore();
+        }
+
+        private void scoreChanged(ScoreInfo score)
+        {
+            if (score.BeatmapInfoID == beatmap.ID)
+            {
+                rank.FetchAndLoadTopScore();
+            }
+        }
+
+        private void scaleDisplay(ScoreInfo score)
+        {
+            if (score != null)
+                Width = rank_size * 2;
+            else
+                Width = 0;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 841bbf415c..a58d706003 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
@@ -122,10 +123,23 @@ namespace osu.Game.Screens.Select.Carousel
                                         },
                                     }
                                 },
-                                starCounter = new StarCounter
+                                new FillFlowContainer
                                 {
-                                    Current = (float)beatmap.StarDifficulty,
-                                    Scale = new Vector2(0.8f),
+                                    Direction = FillDirection.Horizontal,
+                                    Spacing = new Vector2(4, 0),
+                                    AutoSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
+                                        new CarouselBeatmapRank(beatmap)
+                                        {
+                                            Scale = new Vector2(0.8f)
+                                        },
+                                        starCounter = new StarCounter
+                                        {
+                                            Current = (float)beatmap.StarDifficulty,
+                                            Scale = new Vector2(0.8f),
+                                        }
+                                    }
                                 }
                             }
                         }

From faa2b49be41032f14dacc829ce90de8ae38b6783 Mon Sep 17 00:00:00 2001
From: Santeri Nogelainen <santeri.nogelainen@gmail.com>
Date: Sat, 28 Mar 2020 18:13:39 +0200
Subject: [PATCH 01762/10326] Fix namespace for CarouselBeatmapRank, make
 UpdateableRank in TopLocalRank readonly

---
 osu.Game/Online/Leaderboards/TopLocalRank.cs                | 2 +-
 osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs     | 3 ++-
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/TopLocalRank.cs b/osu.Game/Online/Leaderboards/TopLocalRank.cs
index 40855e6cf8..83d92f8ffa 100644
--- a/osu.Game/Online/Leaderboards/TopLocalRank.cs
+++ b/osu.Game/Online/Leaderboards/TopLocalRank.cs
@@ -17,11 +17,11 @@ namespace osu.Game.Online.Leaderboards
     public class TopLocalRank : Container
     {
         private readonly BeatmapInfo beatmap;
+        private readonly UpdateableRank rank;
 
         private ScoreManager scores;
         private IBindable<RulesetInfo> ruleset;
         private IAPIProvider api;
-        private UpdateableRank rank;
 
         /// <summary>
         /// Raised when the top score is loaded
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs
index 9ad0dc946e..fbd4292138 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs
@@ -6,10 +6,11 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
+using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
 
-namespace osu.Game.Online.Leaderboards
+namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselBeatmapRank : Container
     {
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index a58d706003..4b42d818f5 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -19,7 +19,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;

From 2c27894527f91317e16e660f61a613c700110282 Mon Sep 17 00:00:00 2001
From: Endrik <enduslittlecomputer@gmail.com>
Date: Sat, 28 Mar 2020 19:58:33 +0200
Subject: [PATCH 01763/10326] Use All instead of ToList Any
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/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 91a9b19115..cd2deb8abe 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -253,7 +253,7 @@ namespace osu.Game.Screens.Select
         /// <param name="skipDifficulties">Whether to skip individual difficulties and only increment over full groups.</param>
         public void SelectNext(int direction = 1, bool skipDifficulties = true)
         {
-            if (!beatmapSets.Where(s => !s.Filtered.Value).ToList().Any())
+            if (beatmapSets.All(s => !s.Filtered.Value))
                 return;
 
             if (skipDifficulties)

From b4f05007063dcb46cb6736a817ccb5e18222a511 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 28 Mar 2020 20:21:21 +0200
Subject: [PATCH 01764/10326] Invert logic

---
 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 cd2deb8abe..a2c2cde7c7 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -253,7 +253,7 @@ namespace osu.Game.Screens.Select
         /// <param name="skipDifficulties">Whether to skip individual difficulties and only increment over full groups.</param>
         public void SelectNext(int direction = 1, bool skipDifficulties = true)
         {
-            if (beatmapSets.All(s => !s.Filtered.Value))
+            if (beatmapSets.All(s => s.Filtered.Value))
                 return;
 
             if (skipDifficulties)

From 8cab303611786eeba91aa2a67bb25633f23e10c6 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 28 Mar 2020 21:02:55 +0200
Subject: [PATCH 01765/10326] Cover skipDifficulties = false in tests

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index b316fcc60b..7c3498e034 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -118,6 +118,50 @@ namespace osu.Game.Tests.Visual.SongSelect
             }
         }
 
+        [Test]
+        public void TestTraversalHoldDifficulties()
+        {
+            var sets = new List<BeatmapSetInfo>();
+
+            for (int i = 0; i < 20; i++)
+            {
+                var set = createTestBeatmapSet(i + 1);
+                sets.Add(set);
+            }
+
+            loadBeatmaps(sets);
+
+            void selectNextAndAssert(int amount, bool forwards, int expectedSet, int expectedDiff)
+            {
+                // Select very first or very last difficulty
+                setSelected(forwards ? 1 : 20, forwards ? 1 : 3);
+                string text = forwards ? "Next" : "Previous";
+                AddStep($"{text} difficulty {amount} times", () =>
+                {
+                    for (int i = 0; i < amount; i++)
+                    {
+                        carousel.SelectNext(forwards ? 1 : -1, false);
+                    }
+                });
+                waitForSelection(expectedSet, expectedDiff);
+            }
+
+            // Selects next set once, difficulty index doesn't change
+            selectNextAndAssert(3, true, 2, 1);
+            // Selects next set 16 times (50 // 3 == 16), difficulty index changes twice (50 % 3 == 2)
+            selectNextAndAssert(50, true, 17, 3);
+            // Travels around the carousel thrice (200/60 == 3)
+            // continues to select 20 times (200 % 60 == 20)
+            // selects next set 6 times (20 // 3 == 6)
+            // difficulty index changes twice (20 % 3 == 2)
+            selectNextAndAssert(200, true, 7, 3);
+
+            // All same but in reverse
+            selectNextAndAssert(3, false, 19, 3);
+            selectNextAndAssert(50, false, 4, 1);
+            selectNextAndAssert(200, false, 14, 1);
+        }
+
         /// <summary>
         /// Test filtering
         /// </summary>

From d3114ca858718aa1f69fcd46c1c8faabdc3228f0 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 28 Mar 2020 23:12:13 +0200
Subject: [PATCH 01766/10326] Don't snake when hit

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index b9cee71ca1..30abce7696 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -87,6 +87,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public void UpdateSnakingPosition(Vector2 start, Vector2 end)
         {
+            if (IsHit) return;
+
             bool isRepeatAtEnd = sliderRepeat.RepeatIndex % 2 == 0;
             List<Vector2> curve = ((PlaySliderBody)drawableSlider.Body.Drawable).CurrentCurve;
 

From a2b3fe180e096a6f85ab034370821b917ce79345 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 29 Mar 2020 14:30:45 +0900
Subject: [PATCH 01767/10326] Add the ability to disable user input on specific
 DrawableHitObjects

---
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 5b5802fa9d..9aad125ed1 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -38,6 +38,19 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private readonly Lazy<List<DrawableHitObject>> nestedHitObjects = new Lazy<List<DrawableHitObject>>();
         public IReadOnlyList<DrawableHitObject> NestedHitObjects => nestedHitObjects.IsValueCreated ? nestedHitObjects.Value : (IReadOnlyList<DrawableHitObject>)Array.Empty<DrawableHitObject>();
 
+        /// <summary>
+        /// Whether this object should handle any user input events.
+        /// </summary>
+        public bool HandleUserInput { get; set; } = true;
+
+        public override bool HandlePositionalInput => HandleUserInput;
+
+        public override bool HandleNonPositionalInput => HandleUserInput;
+
+        public override bool PropagatePositionalInputSubTree => HandleUserInput;
+
+        public override bool PropagateNonPositionalInputSubTree => HandleUserInput;
+
         /// <summary>
         /// Invoked when a <see cref="JudgementResult"/> has been applied by this <see cref="DrawableHitObject"/> or a nested <see cref="DrawableHitObject"/>.
         /// </summary>

From d1b01095ee292b02ad1af51ff6a74b49df8c8929 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 29 Mar 2020 14:31:03 +0900
Subject: [PATCH 01768/10326] Rewrite to reduce code changes and complexities
 in hit object implementation

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs   | 17 ++++++--------
 .../Objects/Drawables/DrawableSpinner.cs      |  9 ++++----
 .../Objects/Drawables/Pieces/SpinnerDisc.cs   | 23 ++++++++++++++-----
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 49c4e7fa45..7b54baa99b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -30,21 +30,18 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 if (hitObject is DrawableSpinner spinner)
                 {
-                    spinner.Disc.Enabled = false;
-                    spinner.OnUpdate += autoSpin;
+                    spinner.HandleUserInput = false;
+                    spinner.OnUpdate += onSpinnerUpdate;
                 }
             }
         }
 
-        private void autoSpin(Drawable drawable)
+        private void onSpinnerUpdate(Drawable drawable)
         {
-            if (drawable is DrawableSpinner spinner)
-            {
-                if (spinner.Disc.Valid)
-                    spinner.Disc.Rotate(MathUtils.RadiansToDegrees((float)spinner.Clock.ElapsedFrameTime * 0.03f));
-                if (!spinner.SpmCounter.IsPresent)
-                    spinner.SpmCounter.FadeIn(spinner.HitObject.TimeFadeIn);
-            }
+            var spinner = (DrawableSpinner)drawable;
+
+            spinner.Disc.Tracking = true;
+            spinner.Disc.Rotate(MathUtils.RadiansToDegrees((float)spinner.Clock.ElapsedFrameTime * 0.03f));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 0ec7f2ebfe..3c8ab0f5ab 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -176,17 +176,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void Update()
         {
-            Disc.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
-            if (!SpmCounter.IsPresent && Disc.Tracking)
-                SpmCounter.FadeIn(HitObject.TimeFadeIn);
-
             base.Update();
+            if (HandleUserInput)
+                Disc.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
         }
 
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
 
+            if (!SpmCounter.IsPresent && Disc.Tracking)
+                SpmCounter.FadeIn(HitObject.TimeFadeIn);
+
             circle.Rotation = Disc.Rotation;
             Ticks.Rotation = Disc.Rotation;
             SpmCounter.SetRotation(Disc.RotationAbsolute);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 0c089c1fed..d4ef039b79 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -50,9 +50,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             get => tracking;
             set
             {
-                if ((Enabled && value) == tracking) return;
+                if (value == tracking) return;
 
-                tracking = Enabled && value;
+                tracking = value;
 
                 background.FadeTo(tracking ? tracking_alpha : idle_alpha, 100);
             }
@@ -73,9 +73,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
         }
 
-        public bool Valid => spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
-
-        public bool Enabled { get; set; } = true;
+        /// <summary>
+        /// Whether currently in the correct time range to allow spinning.
+        /// </summary>
+        private bool isSpinnableTime => spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
@@ -101,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             var delta = thisAngle - lastAngle;
 
-            if (Valid && tracking)
+            if (tracking)
                 Rotate(delta);
 
             lastAngle = thisAngle;
@@ -118,8 +119,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             Rotation = (float)Interpolation.Lerp(Rotation, currentRotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
         }
 
+        /// <summary>
+        /// Rotate the disc by the provided angle (in addition to any existing rotation).
+        /// </summary>
+        /// <remarks>
+        /// Will be a no-op if not a valid time to spin.
+        /// </remarks>
+        /// <param name="angle">The delta angle.</param>
         public void Rotate(float angle)
         {
+            if (!isSpinnableTime)
+                return;
+
             if (!rotationTransferred)
             {
                 currentRotation = Rotation * 2;

From 2ab8267f84090b9fcab62bbd143ec163e1f0c0f3 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 29 Mar 2020 10:50:43 +0300
Subject: [PATCH 01769/10326] Add a comment

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 30abce7696..2704680d54 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -87,6 +87,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public void UpdateSnakingPosition(Vector2 start, Vector2 end)
         {
+            // When the repeat is hit, the arrow should fade out on spot,
+            // it should no longer follow snaking
             if (IsHit) return;
 
             bool isRepeatAtEnd = sliderRepeat.RepeatIndex % 2 == 0;

From 4f5557096c238ac602b59d3dab39605b93cb2ca2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 29 Mar 2020 22:51:28 +0900
Subject: [PATCH 01770/10326] Fix auto mod results not displaying correctly

---
 osu.Game/Screens/Play/Player.cs       | 64 ++++++++++++++-------------
 osu.Game/Screens/Play/ReplayPlayer.cs |  6 +++
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 63ec3b0d2d..5da53ad2c9 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -637,6 +637,39 @@ namespace osu.Game.Screens.Play
             return base.OnExiting(next);
         }
 
+        protected virtual void GotoRanking()
+        {
+            if (DrawableRuleset.ReplayScore != null)
+            {
+                // if a replay is present, we likely don't want to import into the local database.
+                this.Push(CreateResults(CreateScore()));
+                return;
+            }
+
+            LegacyByteArrayReader replayReader = null;
+
+            var score = new Score { ScoreInfo = CreateScore() };
+
+            if (recordingReplay?.Frames.Count > 0)
+            {
+                score.Replay = recordingReplay;
+
+                using (var stream = new MemoryStream())
+                {
+                    new LegacyScoreEncoder(score, gameplayBeatmap.PlayableBeatmap).Encode(stream);
+                    replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
+                }
+            }
+
+            scoreManager.Import(score.ScoreInfo, replayReader)
+                        .ContinueWith(imported => Schedule(() =>
+                        {
+                            // screen may be in the exiting transition phase.
+                            if (this.IsCurrentScreen())
+                                this.Push(CreateResults(imported.Result));
+                        }));
+        }
+
         private void fadeOut(bool instant = false)
         {
             float fadeOutDuration = instant ? 0 : 250;
@@ -649,36 +682,7 @@ namespace osu.Game.Screens.Play
         private void scheduleGotoRanking()
         {
             completionProgressDelegate?.Cancel();
-            completionProgressDelegate = Schedule(delegate
-            {
-                if (DrawableRuleset.ReplayScore != null)
-                    this.Push(CreateResults(DrawableRuleset.ReplayScore.ScoreInfo));
-                else
-                {
-                    var score = new Score { ScoreInfo = CreateScore() };
-
-                    LegacyByteArrayReader replayReader = null;
-
-                    if (recordingReplay?.Frames.Count > 0)
-                    {
-                        score.Replay = recordingReplay;
-
-                        using (var stream = new MemoryStream())
-                        {
-                            new LegacyScoreEncoder(score, gameplayBeatmap.PlayableBeatmap).Encode(stream);
-                            replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
-                        }
-                    }
-
-                    scoreManager.Import(score.ScoreInfo, replayReader)
-                                .ContinueWith(imported => Schedule(() =>
-                                {
-                                    // screen may be in the exiting transition phase.
-                                    if (this.IsCurrentScreen())
-                                        this.Push(CreateResults(imported.Result));
-                                }));
-                }
-            });
+            completionProgressDelegate = Schedule(GotoRanking);
         }
 
         #endregion
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 8708b5f634..74c853340d 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.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.Screens;
 using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Play
@@ -23,6 +24,11 @@ namespace osu.Game.Screens.Play
             DrawableRuleset?.SetReplayScore(score);
         }
 
+        protected override void GotoRanking()
+        {
+            this.Push(CreateResults(DrawableRuleset.ReplayScore.ScoreInfo));
+        }
+
         protected override ScoreInfo CreateScore() => score.ScoreInfo;
     }
 }

From 11826800fb834ccd9b04b98db23c713fdfc6b4e9 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 29 Mar 2020 17:00:26 +0300
Subject: [PATCH 01771/10326] Test slider snaking

---
 .../TestSceneSliderSnaking.cs                 | 294 ++++++++++++++++++
 1 file changed, 294 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
new file mode 100644
index 0000000000..3e40713f52
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -0,0 +1,294 @@
+// Copyright (c) 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.Framework.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Configuration;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Storyboards;
+using osuTK;
+using static osu.Game.Tests.Visual.OsuTestScene.ClockBackedTestWorkingBeatmap;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [TestFixture]
+    public class TestSceneSliderSnaking : TestSceneOsuPlayer
+    {
+        [Resolved]
+        private AudioManager audioManager { get; set; }
+
+        private TrackVirtualManual track;
+
+        protected override bool Autoplay => true;
+
+        private readonly Bindable<bool> snakingIn = new Bindable<bool>();
+        private readonly Bindable<bool> snakingOut = new Bindable<bool>();
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+        {
+            var working = new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
+            track = (TrackVirtualManual)working.Track;
+            return working;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (OsuRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(OsuRulesetSetting.SnakingInSliders, snakingIn);
+            config.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
+        }
+
+        private DrawableSlider slider;
+        private DrawableSliderRepeat repeat;
+        private Vector2 vector;
+
+        [SetUpSteps]
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddUntilStep("wait for track to start running", () => track.IsRunning);
+        }
+
+        [Test]
+        public void TestSnaking()
+        {
+            AddStep("retrieve 1st slider", () => slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.First());
+            testLinear(true);
+            testLinear(false);
+            AddStep("retrieve 2nd slider", () => slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.Skip(1).First());
+            testRepeating(true);
+            testRepeating(false);
+            AddStep("retrieve 3rd slider", () => slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.Skip(2).First());
+            testDoubleRepeating(true);
+            testDoubleRepeating(false);
+
+            // Test arrow stays in place
+            setSnaking(true);
+            addSeekStep(13500);
+            AddStep("retrieve 2nd slider repeat", () =>
+            {
+                var drawable = Player.DrawableRuleset.Playfield.AllHitObjects.Skip(1).First();
+                repeat = drawable.ChildrenOfType<Container<DrawableSliderRepeat>>().First().Children.First();
+            });
+            AddStep("Save repeat vector", () => vector = repeat.Position);
+            addSeekStep(13700);
+            AddAssert("Repeat vector is same", () => Precision.AlmostEquals(vector.X, repeat.Position.X, 1) && Precision.AlmostEquals(vector.Y, repeat.Position.Y, 1));
+        }
+
+        private void testLinear(bool snaking)
+        {
+            var increased = snaking ? "increased" : "is same";
+
+            setSnaking(snaking);
+            addSeekStep(1800);
+            AddStep("Save end vector", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                vector = body.CurrentCurve.Last();
+            });
+            addSeekStep(1900);
+            AddAssert($"End vector {increased}", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                var last = body.CurrentCurve.Last();
+                return snaking ? last.X > vector.X && last.Y > vector.Y : last == vector;
+            });
+            addSeekStep(3100);
+            AddStep("Save start vector", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                vector = body.CurrentCurve.First();
+            });
+            addSeekStep(3200);
+            AddAssert($"Start vector {increased}", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                var first = body.CurrentCurve.First();
+                return snaking ? first.X > vector.X && first.Y > vector.Y : first == vector;
+            });
+        }
+
+        private void testRepeating(bool snaking)
+        {
+            var increased = snaking ? "increased" : "is same";
+            var decreased = snaking ? "decreased" : "is same";
+
+            setSnaking(snaking);
+            addSeekStep(8800);
+            AddStep("Save end vector", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                vector = body.CurrentCurve.Last();
+            });
+            addSeekStep(8900);
+            AddAssert($"End vector {increased}", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                var last = body.CurrentCurve.Last();
+                return snaking ? last.X > vector.X && last.Y > vector.Y : last == vector;
+            });
+            addSeekStep(10100);
+            AddStep("Save start vector", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                vector = body.CurrentCurve.First();
+            });
+            addSeekStep(10200);
+            AddAssert("Start vector is same", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                var first = body.CurrentCurve.First();
+                return first == vector;
+            });
+            addSeekStep(13700);
+            AddStep("Save end vector", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                vector = body.CurrentCurve.Last();
+            });
+            addSeekStep(13800);
+            AddAssert($"End vector {decreased}", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                var last = body.CurrentCurve.Last();
+                return snaking ? last.X < vector.X && last.Y < vector.Y : last == vector;
+            });
+        }
+
+        private void testDoubleRepeating(bool snaking)
+        {
+            var increased = snaking ? "increased" : "is same";
+
+            setSnaking(snaking);
+            addSeekStep(18800);
+            AddStep("Save end vector", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                vector = body.CurrentCurve.Last();
+            });
+            addSeekStep(18900);
+            AddAssert($"End vector {increased}", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                var last = body.CurrentCurve.Last();
+                return snaking ? last.X > vector.X && last.Y > vector.Y : last == vector;
+            });
+            addSeekStep(20100);
+            AddStep("Save start vector", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                vector = body.CurrentCurve.First();
+            });
+            addSeekStep(20200);
+            AddAssert("Start vector is same", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                var first = body.CurrentCurve.First();
+                return first == vector;
+            });
+            addSeekStep(23700);
+            AddStep("Save end vector", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                vector = body.CurrentCurve.Last();
+            });
+            addSeekStep(23800);
+            AddAssert("End vector is same", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                var last = body.CurrentCurve.Last();
+                return last == vector;
+            });
+            addSeekStep(27300);
+            AddStep("Save start vector", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                vector = body.CurrentCurve.First();
+            });
+            addSeekStep(27400);
+            AddAssert($"Start vector {increased}", () =>
+            {
+                var body = (PlaySliderBody)slider.Body.Drawable;
+                var first = body.CurrentCurve.First();
+                return snaking ? first.X > vector.X && first.Y > vector.Y : first == vector;
+            });
+        }
+
+        private void setSnaking(bool value)
+        {
+            var text = value ? "Enable" : "Disable";
+            AddStep($"{text} snaking", () =>
+            {
+                snakingIn.Value = value;
+                snakingOut.Value = value;
+            });
+        }
+
+        private void addSeekStep(double time)
+        {
+            AddStep($"seek to {time}", () => track.Seek(time));
+
+            AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time, Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
+        }
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new Beatmap
+        {
+            HitObjects = new List<HitObject>
+            {
+                new Slider
+                {
+                    StartTime = 3000,
+                    Position = new Vector2(100, 100),
+                    Path = new SliderPath(PathType.PerfectCurve, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(300, 200)
+                    }),
+                },
+                new Slider
+                {
+                    StartTime = 10000,
+                    Position = new Vector2(100, 100),
+                    Path = new SliderPath(PathType.PerfectCurve, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(300, 200)
+                    }),
+                    RepeatCount = 1,
+                },
+
+                new Slider
+                {
+                    StartTime = 20000,
+                    Position = new Vector2(100, 100),
+                    Path = new SliderPath(PathType.PerfectCurve, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(300, 200)
+                    }),
+                    RepeatCount = 2,
+                },
+
+                new HitCircle
+                {
+                    StartTime = 99999,
+                }
+            }
+        };
+    }
+}

From 653480b2f855d103405f7e4bdd6c041fd5967eed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 29 Mar 2020 23:29:46 +0900
Subject: [PATCH 01772/10326] Add regression test

---
 .../Visual/Gameplay/TestSceneAllRulesetPlayers.cs |  4 ----
 .../Visual/Gameplay/TestSceneAutoplay.cs          | 15 +++++++++++++--
 osu.Game/Screens/Ranking/ResultsScreen.cs         |  8 ++++----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
index 83a7b896d2..b7dcad3825 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
@@ -4,7 +4,6 @@
 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;
@@ -74,9 +73,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             Beatmap.Value = working;
             SelectedMods.Value = new[] { ruleset.GetAllMods().First(m => m is ModNoFail) };
 
-            Player?.Exit();
-            Player = null;
-
             Player = CreatePlayer(ruleset);
 
             LoadScreen(Player);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 5ee17aeea2..43fb848ab8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -5,8 +5,11 @@ using System.ComponentModel;
 using System.Linq;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.Break;
+using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -17,8 +20,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Player CreatePlayer(Ruleset ruleset)
         {
-            SelectedMods.Value = SelectedMods.Value.Concat(new[] { ruleset.GetAutoplayMod() }).ToArray();
-            return new TestPlayer(false, false);
+            SelectedMods.Value = new[] { ruleset.GetAutoplayMod() };
+            return new TestPlayer(false);
         }
 
         protected override void AddCheckSteps()
@@ -32,6 +35,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("overlay displays 100% accuracy", () => Player.BreakOverlay.ChildrenOfType<BreakInfo>().Single().AccuracyDisplay.Current.Value == 1);
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-80000));
             AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
+
+            AddStep("complete", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.Objects.Last().GetEndTime()));
+            AddUntilStep("results displayed", () => getResultsScreen() != null);
+
+            AddAssert("score has combo", () => getResultsScreen().Score.Combo > 100);
+            AddAssert("score has no misses", () => getResultsScreen().Score.Statistics[HitResult.Miss] == 0);
+
+            ResultsScreen getResultsScreen() => Stack.CurrentScreen as ResultsScreen;
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 803b33a998..5e0c30c4c0 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -31,13 +31,13 @@ namespace osu.Game.Screens.Ranking
         [Resolved(CanBeNull = true)]
         private Player player { get; set; }
 
-        private readonly ScoreInfo score;
+        public readonly ScoreInfo Score;
 
         private Drawable bottomPanel;
 
         public ResultsScreen(ScoreInfo score)
         {
-            this.score = score;
+            this.Score = score;
         }
 
         [BackgroundDependencyLoader]
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Ranking
             {
                 new ResultsScrollContainer
                 {
-                    Child = new ScorePanel(score)
+                    Child = new ScorePanel(Score)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Ranking
                             Direction = FillDirection.Horizontal,
                             Children = new Drawable[]
                             {
-                                new ReplayDownloadButton(score) { Width = 300 },
+                                new ReplayDownloadButton(Score) { Width = 300 },
                                 new RetryButton { Width = 300 },
                             }
                         }

From ce2fa23baf1c55e83ba051033975a606d1b100ba Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 29 Mar 2020 17:43:18 +0300
Subject: [PATCH 01773/10326] Include a test for miss

---
 .../TestSceneSliderSnaking.cs                 | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 3e40713f52..a53e06dc0f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -32,7 +32,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private TrackVirtualManual track;
 
-        protected override bool Autoplay => true;
+        protected override bool Autoplay => autoplay;
+        private bool autoplay;
 
         private readonly Bindable<bool> snakingIn = new Bindable<bool>();
         private readonly Bindable<bool> snakingOut = new Bindable<bool>();
@@ -57,16 +58,15 @@ namespace osu.Game.Rulesets.Osu.Tests
         private Vector2 vector;
 
         [SetUpSteps]
-        public override void SetUpSteps()
-        {
-            base.SetUpSteps();
-
-            AddUntilStep("wait for track to start running", () => track.IsRunning);
-        }
+        public override void SetUpSteps() { }
 
         [Test]
         public void TestSnaking()
         {
+            AddStep("have autoplay", () => autoplay = true);
+            base.SetUpSteps();
+            AddUntilStep("wait for track to start running", () => track.IsRunning);
+
             AddStep("retrieve 1st slider", () => slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.First());
             testLinear(true);
             testLinear(false);
@@ -76,9 +76,19 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("retrieve 3rd slider", () => slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.Skip(2).First());
             testDoubleRepeating(true);
             testDoubleRepeating(false);
+        }
 
-            // Test arrow stays in place
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestArrowStays(bool isHit)
+        {
+            var isSame = isHit ? "is same" : "decreased";
+            var enable = isHit ? "enable" : "disable";
+
+            AddStep($"{enable} autoplay", () => autoplay = isHit);
             setSnaking(true);
+            base.SetUpSteps();
+
             addSeekStep(13500);
             AddStep("retrieve 2nd slider repeat", () =>
             {
@@ -87,7 +97,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
             AddStep("Save repeat vector", () => vector = repeat.Position);
             addSeekStep(13700);
-            AddAssert("Repeat vector is same", () => Precision.AlmostEquals(vector.X, repeat.Position.X, 1) && Precision.AlmostEquals(vector.Y, repeat.Position.Y, 1));
+            AddAssert($"Repeat vector {isSame}", () => isHit ? Precision.AlmostEquals(vector.X, repeat.X, 1) && Precision.AlmostEquals(vector.Y, repeat.Y, 1) : repeat.X < vector.X && repeat.Y < vector.Y);
         }
 
         private void testLinear(bool snaking)

From 07c7233b3d4f68acc11090ab78801bb6d6dbd97b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 29 Mar 2020 23:46:28 +0900
Subject: [PATCH 01774/10326] Change int div comments

---
 .../Visual/SongSelect/TestSceneBeatmapCarousel.cs      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 7c3498e034..c76ce628ba 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -148,11 +148,13 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             // Selects next set once, difficulty index doesn't change
             selectNextAndAssert(3, true, 2, 1);
-            // Selects next set 16 times (50 // 3 == 16), difficulty index changes twice (50 % 3 == 2)
+
+            // Selects next set 16 times (50 \ 3 == 16), difficulty index changes twice (50 % 3 == 2)
             selectNextAndAssert(50, true, 17, 3);
-            // Travels around the carousel thrice (200/60 == 3)
-            // continues to select 20 times (200 % 60 == 20)
-            // selects next set 6 times (20 // 3 == 6)
+
+            // Travels around the carousel thrice (200 \ 60 == 3)
+            // continues to select 20 times (200 \ 60 == 20)
+            // selects next set 6 times (20 \ 3 == 6)
             // difficulty index changes twice (20 % 3 == 2)
             selectNextAndAssert(200, true, 7, 3);
 

From 66a990cd5e20ebf0022626900bb95ba972e466ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 29 Mar 2020 23:50:16 +0900
Subject: [PATCH 01775/10326] Remove redundant this

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

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 5e0c30c4c0..d063d8749f 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Ranking
 
         public ResultsScreen(ScoreInfo score)
         {
-            this.Score = score;
+            Score = score;
         }
 
         [BackgroundDependencyLoader]

From 6e68b968f8afba0ebd5824fda4a94b9495fbb055 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 29 Mar 2020 23:52:50 +0900
Subject: [PATCH 01776/10326] Hide "retry" button on results screen after
 watching a replay

---
 osu.Game/Screens/Play/ReplayPlayer.cs     |  3 +++
 osu.Game/Screens/Ranking/ResultsScreen.cs | 29 +++++++++++++++--------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 74c853340d..0d2ddb7b01 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Screens;
 using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Play
 {
@@ -29,6 +30,8 @@ namespace osu.Game.Screens.Play
             this.Push(CreateResults(DrawableRuleset.ReplayScore.ScoreInfo));
         }
 
+        protected override ResultsScreen CreateResults(ScoreInfo score) => new ResultsScreen(score, false);
+
         protected override ScoreInfo CreateScore() => score.ScoreInfo;
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index d063d8749f..1c08b763fe 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -33,16 +33,21 @@ namespace osu.Game.Screens.Ranking
 
         public readonly ScoreInfo Score;
 
+        private readonly bool allowRetry;
+
         private Drawable bottomPanel;
 
-        public ResultsScreen(ScoreInfo score)
+        public ResultsScreen(ScoreInfo score, bool allowRetry = true)
         {
             Score = score;
+            this.allowRetry = allowRetry;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
+            FillFlowContainer buttons;
+
             InternalChildren = new[]
             {
                 new ResultsScrollContainer
@@ -68,7 +73,7 @@ namespace osu.Game.Screens.Ranking
                             RelativeSizeAxes = Axes.Both,
                             Colour = Color4Extensions.FromHex("#333")
                         },
-                        new FillFlowContainer
+                        buttons = new FillFlowContainer
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
@@ -78,7 +83,6 @@ namespace osu.Game.Screens.Ranking
                             Children = new Drawable[]
                             {
                                 new ReplayDownloadButton(Score) { Width = 300 },
-                                new RetryButton { Width = 300 },
                             }
                         }
                     }
@@ -87,15 +91,20 @@ namespace osu.Game.Screens.Ranking
 
             if (player != null)
             {
-                AddInternal(new HotkeyRetryOverlay
+                if (allowRetry)
                 {
-                    Action = () =>
-                    {
-                        if (!this.IsCurrentScreen()) return;
+                    buttons.Add(new RetryButton { Width = 300 });
 
-                        player?.Restart();
-                    },
-                });
+                    AddInternal(new HotkeyRetryOverlay
+                    {
+                        Action = () =>
+                        {
+                            if (!this.IsCurrentScreen()) return;
+
+                            player?.Restart();
+                        },
+                    });
+                }
             }
         }
 

From a72f0f57f6662bec55cdce569e6d071328f7fdcc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 00:05:07 +0900
Subject: [PATCH 01777/10326] Refactor tests for readability

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 67 +++++++++----------
 1 file changed, 31 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index c76ce628ba..f29d532857 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -85,67 +85,48 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         [TestCase(true)]
         [TestCase(false)]
-        public void TestTraversalHold(bool forwards)
+        public void TestTraversalBeyondVisible(bool forwards)
         {
             var sets = new List<BeatmapSetInfo>();
-            const int create_this_many_sets = 200;
 
-            for (int i = 0; i < create_this_many_sets; i++)
-            {
-                var set = createTestBeatmapSet(i + 1);
-                sets.Add(set);
-            }
+            const int total_set_count = 200;
+
+            for (int i = 0; i < total_set_count; i++)
+                sets.Add(createTestBeatmapSet(i + 1));
 
             loadBeatmaps(sets);
 
+            for (int i = 1; i < total_set_count; i += i)
+                selectNextAndAssert(i);
+
             void selectNextAndAssert(int amount)
             {
-                setSelected(forwards ? 1 : create_this_many_sets, 1);
-                string text = forwards ? "Next" : "Previous";
-                AddStep($"{text} beatmap {amount} times", () =>
+                setSelected(forwards ? 1 : total_set_count, 1);
+
+                AddStep($"{(forwards ? "Next" : "Previous")} beatmap {amount} times", () =>
                 {
                     for (int i = 0; i < amount; i++)
                     {
                         carousel.SelectNext(forwards ? 1 : -1);
                     }
                 });
-                waitForSelection(forwards ? amount + 1 : create_this_many_sets - amount);
-            }
 
-            for (int i = 1; i < create_this_many_sets; i += i)
-            {
-                selectNextAndAssert(i);
+                waitForSelection(forwards ? amount + 1 : total_set_count - amount);
             }
         }
 
         [Test]
-        public void TestTraversalHoldDifficulties()
+        public void TestTraversalBeyondVisibleDifficulties()
         {
             var sets = new List<BeatmapSetInfo>();
 
-            for (int i = 0; i < 20; i++)
-            {
-                var set = createTestBeatmapSet(i + 1);
-                sets.Add(set);
-            }
+            const int total_set_count = 200;
+
+            for (int i = 0; i < total_set_count; i++)
+                sets.Add(createTestBeatmapSet(i + 1));
 
             loadBeatmaps(sets);
 
-            void selectNextAndAssert(int amount, bool forwards, int expectedSet, int expectedDiff)
-            {
-                // Select very first or very last difficulty
-                setSelected(forwards ? 1 : 20, forwards ? 1 : 3);
-                string text = forwards ? "Next" : "Previous";
-                AddStep($"{text} difficulty {amount} times", () =>
-                {
-                    for (int i = 0; i < amount; i++)
-                    {
-                        carousel.SelectNext(forwards ? 1 : -1, false);
-                    }
-                });
-                waitForSelection(expectedSet, expectedDiff);
-            }
-
             // Selects next set once, difficulty index doesn't change
             selectNextAndAssert(3, true, 2, 1);
 
@@ -162,6 +143,20 @@ namespace osu.Game.Tests.Visual.SongSelect
             selectNextAndAssert(3, false, 19, 3);
             selectNextAndAssert(50, false, 4, 1);
             selectNextAndAssert(200, false, 14, 1);
+
+            void selectNextAndAssert(int amount, bool forwards, int expectedSet, int expectedDiff)
+            {
+                // Select very first or very last difficulty
+                setSelected(forwards ? 1 : 20, forwards ? 1 : 3);
+
+                AddStep($"{(forwards ? "Next" : "Previous")} difficulty {amount} times", () =>
+                {
+                    for (int i = 0; i < amount; i++)
+                        carousel.SelectNext(forwards ? 1 : -1, false);
+                });
+
+                waitForSelection(expectedSet, expectedDiff);
+            }
         }
 
         /// <summary>

From b47a532df353f45ec95ef51e9e6d0f383f832502 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 00:07:48 +0900
Subject: [PATCH 01778/10326] Adjust code formatting slightly

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index a2c2cde7c7..59dddc2baa 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -264,9 +264,9 @@ namespace osu.Game.Screens.Select
 
         private void selectNextSet(int direction, bool skipDifficulties)
         {
-            var visibleSets = beatmapSets.Where(s => !s.Filtered.Value).ToList();
+            var unfilteredSets = beatmapSets.Where(s => !s.Filtered.Value).ToList();
 
-            var nextSet = visibleSets[(visibleSets.IndexOf(selectedBeatmapSet) + direction + visibleSets.Count) % visibleSets.Count];
+            var nextSet = unfilteredSets[(unfilteredSets.IndexOf(selectedBeatmapSet) + direction + unfilteredSets.Count) % unfilteredSets.Count];
 
             if (skipDifficulties)
                 select(nextSet);
@@ -276,12 +276,14 @@ namespace osu.Game.Screens.Select
 
         private void selectNextDifficulty(int direction)
         {
-            var difficulties = selectedBeatmapSet.Children.Where(s => !s.Filtered.Value).ToList();
-            int index = difficulties.IndexOf(selectedBeatmap);
-            if (index + direction < 0 || index + direction >= difficulties.Count)
+            var unfilteredDifficulties = selectedBeatmapSet.Children.Where(s => !s.Filtered.Value).ToList();
+
+            int index = unfilteredDifficulties.IndexOf(selectedBeatmap);
+
+            if (index + direction < 0 || index + direction >= unfilteredDifficulties.Count)
                 selectNextSet(direction, false);
             else
-                select(difficulties[index + direction]);
+                select(unfilteredDifficulties[index + direction]);
         }
 
         /// <summary>

From f4c8b6d219001b82ee8494ed00ee1a14d27f4a3a Mon Sep 17 00:00:00 2001
From: Endrik <enduslittlecomputer@gmail.com>
Date: Sun, 29 Mar 2020 18:55:47 +0300
Subject: [PATCH 01779/10326] Fix copy paste oversight

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index f29d532857..76a8ee9914 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             var sets = new List<BeatmapSetInfo>();
 
-            const int total_set_count = 200;
+            const int total_set_count = 20;
 
             for (int i = 0; i < total_set_count; i++)
                 sets.Add(createTestBeatmapSet(i + 1));

From 98a700ef3a70244f4c8bd9e44631593debf1e269 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 00:58:06 +0900
Subject: [PATCH 01780/10326] Attempt to fix tests by skipping one break at a
 time

---
 .../Visual/Gameplay/TestSceneAutoplay.cs       | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 43fb848ab8..4b1c2ec256 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.Linq;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -28,15 +29,16 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddUntilStep("score above zero", () => Player.ScoreProcessor.TotalScore.Value > 0);
             AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 2));
-            AddStep("seek to break time", () => Player.GameplayClockContainer.Seek(Player.ChildrenOfType<BreakTracker>().First().Breaks.First().StartTime));
-            AddUntilStep("wait for seek to complete", () =>
-                Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= Player.BreakOverlay.Breaks.First().StartTime);
+            seekToBreak(0);
             AddAssert("keys not counting", () => !Player.HUDOverlay.KeyCounter.IsCounting);
             AddAssert("overlay displays 100% accuracy", () => Player.BreakOverlay.ChildrenOfType<BreakInfo>().Single().AccuracyDisplay.Current.Value == 1);
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-80000));
             AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
 
-            AddStep("complete", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.Objects.Last().GetEndTime()));
+            seekToBreak(0);
+            seekToBreak(1);
+
+            AddStep("seek to completion", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.Objects.Last().GetEndTime()));
             AddUntilStep("results displayed", () => getResultsScreen() != null);
 
             AddAssert("score has combo", () => getResultsScreen().Score.Combo > 100);
@@ -44,5 +46,13 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             ResultsScreen getResultsScreen() => Stack.CurrentScreen as ResultsScreen;
         }
+
+        private void seekToBreak(int breakIndex)
+        {
+            AddStep($"seek to break {breakIndex}", () => Player.GameplayClockContainer.Seek(destBreak().StartTime));
+            AddUntilStep("wait for seek to complete", () => Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= destBreak().StartTime);
+
+            BreakPeriod destBreak() => Player.ChildrenOfType<BreakTracker>().First().Breaks.ElementAt(breakIndex);
+        }
     }
 }

From d99b445720b0b6a6d994ee148192d2903626a116 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 09:59:52 +0900
Subject: [PATCH 01781/10326] Move non-headless tests to correct namespace

---
 .../{ => Visual}/Gameplay/TestSceneReplayRecorder.cs           | 3 +--
 .../{ => Visual}/Gameplay/TestSceneReplayRecording.cs          | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename osu.Game.Tests/{ => Visual}/Gameplay/TestSceneReplayRecorder.cs (99%)
 rename osu.Game.Tests/{ => Visual}/Gameplay/TestSceneReplayRecording.cs (99%)

diff --git a/osu.Game.Tests/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
similarity index 99%
rename from osu.Game.Tests/Gameplay/TestSceneReplayRecorder.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index 734991b868..c7455583e4 100644
--- a/osu.Game.Tests/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -17,13 +17,12 @@ using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
-using osu.Game.Tests.Visual;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Gameplay
+namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneReplayRecorder : OsuManualInputManagerTestScene
     {
diff --git a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
similarity index 99%
rename from osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
index 057d026132..7822f07957 100644
--- a/osu.Game.Tests/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
@@ -13,12 +13,11 @@ using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
-using osu.Game.Tests.Visual;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Gameplay
+namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneReplayRecording : OsuTestScene
     {

From 09d860d5f5701edaaa292f0797774d6758123952 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 11:52:11 +0900
Subject: [PATCH 01782/10326] Fix imports with no matching beatmap IDs still
 retaining a potentially invalid set ID

---
 osu.Game/Beatmaps/BeatmapManager.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index abb3f8ac42..40ffb40f52 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Beatmaps
 
         protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path)?.ToLowerInvariant() == ".osz";
 
-        protected override Task Populate(BeatmapSetInfo beatmapSet, ArchiveReader archive, CancellationToken cancellationToken = default)
+        protected override async Task Populate(BeatmapSetInfo beatmapSet, ArchiveReader archive, CancellationToken cancellationToken = default)
         {
             if (archive != null)
                 beatmapSet.Beatmaps = createBeatmapDifficulties(beatmapSet.Files);
@@ -103,7 +103,11 @@ namespace osu.Game.Beatmaps
 
             validateOnlineIds(beatmapSet);
 
-            return updateQueue.UpdateAsync(beatmapSet, cancellationToken);
+            await updateQueue.UpdateAsync(beatmapSet, cancellationToken);
+
+            // ensure at least one beatmap was able to retrieve an online ID, else drop the set ID.
+            if (!beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0))
+                beatmapSet.OnlineBeatmapSetID = null;
         }
 
         protected override void PreImport(BeatmapSetInfo beatmapSet)

From 7db9bd798c4b0d9dedc9097c416d61ce62197fa2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 11:59:51 +0900
Subject: [PATCH 01783/10326] Remove handle overrides

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 9aad125ed1..0011faefbb 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -43,10 +43,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public bool HandleUserInput { get; set; } = true;
 
-        public override bool HandlePositionalInput => HandleUserInput;
-
-        public override bool HandleNonPositionalInput => HandleUserInput;
-
         public override bool PropagatePositionalInputSubTree => HandleUserInput;
 
         public override bool PropagateNonPositionalInputSubTree => HandleUserInput;

From 7ecce713bb736069be7f1037df45770482d6f349 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 15:05:40 +0900
Subject: [PATCH 01784/10326] Keep provided IDs where possible if not online

---
 osu.Game/Beatmaps/BeatmapManager.cs                 | 13 ++++++++-----
 osu.Game/Online/API/APIRequest.cs                   |  4 ++--
 osu.Game/Online/API/Requests/GetRankingsRequest.cs  |  3 ++-
 osu.Game/Online/API/Requests/PaginatedAPIRequest.cs |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 40ffb40f52..797a5160c9 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -451,12 +451,15 @@ namespace osu.Game.Beatmaps
 
                     var res = req.Result;
 
-                    beatmap.Status = res.Status;
-                    beatmap.BeatmapSet.Status = res.BeatmapSet.Status;
-                    beatmap.BeatmapSet.OnlineBeatmapSetID = res.OnlineBeatmapSetID;
-                    beatmap.OnlineBeatmapID = res.OnlineBeatmapID;
+                    if (res != null)
+                    {
+                        beatmap.Status = res.Status;
+                        beatmap.BeatmapSet.Status = res.BeatmapSet.Status;
+                        beatmap.BeatmapSet.OnlineBeatmapSetID = res.OnlineBeatmapSetID;
+                        beatmap.OnlineBeatmapID = res.OnlineBeatmapID;
 
-                    LogForModel(set, $"Online retrieval mapped {beatmap} to {res.OnlineBeatmapSetID} / {res.OnlineBeatmapID}.");
+                        LogForModel(set, $"Online retrieval mapped {beatmap} to {res.OnlineBeatmapSetID} / {res.OnlineBeatmapID}.");
+                    }
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 30c1018c1e..6a6c7b72a8 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -12,11 +12,11 @@ namespace osu.Game.Online.API
     /// An API request with a well-defined response type.
     /// </summary>
     /// <typeparam name="T">Type of the response (used for deserialisation).</typeparam>
-    public abstract class APIRequest<T> : APIRequest
+    public abstract class APIRequest<T> : APIRequest where T : class
     {
         protected override WebRequest CreateWebRequest() => new OsuJsonWebRequest<T>(Uri);
 
-        public T Result => ((OsuJsonWebRequest<T>)WebRequest).ResponseObject;
+        public T Result => ((OsuJsonWebRequest<T>)WebRequest)?.ResponseObject;
 
         protected APIRequest()
         {
diff --git a/osu.Game/Online/API/Requests/GetRankingsRequest.cs b/osu.Game/Online/API/Requests/GetRankingsRequest.cs
index 941691c4c1..1bbaa73bbb 100644
--- a/osu.Game/Online/API/Requests/GetRankingsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetRankingsRequest.cs
@@ -6,7 +6,8 @@ using osu.Game.Rulesets;
 
 namespace osu.Game.Online.API.Requests
 {
-    public abstract class GetRankingsRequest<TModel> : APIRequest<TModel>
+    public abstract class GetRankingsRequest<TModel> : APIRequest<TModel> where TModel : class
+
     {
         private readonly RulesetInfo ruleset;
         private readonly int page;
diff --git a/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs b/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
index 52e12f04ee..bddc34a0dc 100644
--- a/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
+++ b/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
@@ -6,7 +6,7 @@ using osu.Framework.IO.Network;
 
 namespace osu.Game.Online.API.Requests
 {
-    public abstract class PaginatedAPIRequest<T> : APIRequest<T>
+    public abstract class PaginatedAPIRequest<T> : APIRequest<T> where T : class
     {
         private readonly int page;
         private readonly int itemsPerPage;

From f71c8cb30ff8c11084cc48bbe40fbfe437dbd089 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 15:07:56 +0900
Subject: [PATCH 01785/10326] Only drop online set ID if beatmap IDs were
 stripped in online retrieval

---
 osu.Game/Beatmaps/BeatmapManager.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 797a5160c9..6542866936 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -103,11 +103,19 @@ namespace osu.Game.Beatmaps
 
             validateOnlineIds(beatmapSet);
 
+            bool hadOnlineBeatmapIDs = beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0);
+
             await updateQueue.UpdateAsync(beatmapSet, cancellationToken);
 
-            // ensure at least one beatmap was able to retrieve an online ID, else drop the set ID.
-            if (!beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0))
-                beatmapSet.OnlineBeatmapSetID = null;
+            // ensure at least one beatmap was able to retrieve or keep an online ID, else drop the set ID.
+            if (hadOnlineBeatmapIDs && !beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0))
+            {
+                if (beatmapSet.OnlineBeatmapSetID != null)
+                {
+                    beatmapSet.OnlineBeatmapSetID = null;
+                    LogForModel(beatmapSet, "Disassociating beatmap set ID due to loss of all beatmap IDs");
+                }
+            }
         }
 
         protected override void PreImport(BeatmapSetInfo beatmapSet)

From b9277165f788361acb43b3c57da49ce605d44155 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 15:11:15 +0900
Subject: [PATCH 01786/10326] Refactor test to support custom hitobjects

---
 .../TestSceneNoteLock.cs                      | 126 +++++++++++++-----
 1 file changed, 94 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
index e2b8364f3e..af82a05c4f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Screens;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -23,8 +24,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneNoteLock : RateAdjustedBeatmapTestScene
     {
-        private const double time_first_circle = 1500;
-        private const double time_second_circle = 1600;
         private const double early_miss_window = 1000; // time after -1000 to -500 is considered a miss
         private const double late_miss_window = 500; // time after +500 is considered a miss
 
@@ -37,13 +36,31 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestClickSecondCircleBeforeFirstCircleTime()
         {
-            performTest(new List<ReplayFrame>
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = position_first_circle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = position_second_circle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
             {
                 new OsuReplayFrame { Time = time_first_circle - 100, Position = position_second_circle, Actions = { OsuAction.LeftButton } }
             });
 
-            addJudgementAssert(HitResult.Miss, HitResult.Miss);
-            addJudgementOffsetAssert(late_miss_window);
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[1], HitResult.Miss);
+            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
         }
 
         /// <summary>
@@ -52,13 +69,31 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestClickSecondCircleAtFirstCircleTime()
         {
-            performTest(new List<ReplayFrame>
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = position_first_circle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = position_second_circle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
             {
                 new OsuReplayFrame { Time = time_first_circle, Position = position_second_circle, Actions = { OsuAction.LeftButton } }
             });
 
-            addJudgementAssert(HitResult.Miss, HitResult.Great);
-            addJudgementOffsetAssert(0);
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[0], 0);
         }
 
         /// <summary>
@@ -67,13 +102,31 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestClickSecondCircleAfterFirstCircleTime()
         {
-            performTest(new List<ReplayFrame>
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = position_first_circle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = position_second_circle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
             {
                 new OsuReplayFrame { Time = time_first_circle + 100, Position = position_second_circle, Actions = { OsuAction.LeftButton } }
             });
 
-            addJudgementAssert(HitResult.Miss, HitResult.Great);
-            addJudgementOffsetAssert(100);
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[0], 100);
         }
 
         /// <summary>
@@ -82,49 +135,58 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestClickSecondCircleBeforeFirstCircleTimeWithFirstCircleJudged()
         {
-            performTest(new List<ReplayFrame>
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = position_first_circle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = position_second_circle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
             {
                 new OsuReplayFrame { Time = time_first_circle - 200, Position = position_first_circle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_first_circle - 100, Position = position_second_circle, Actions = { OsuAction.RightButton } }
             });
 
-            addJudgementAssert(HitResult.Great, HitResult.Great);
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
+            addJudgementOffsetAssert(hitObjects[0], -200); // time_second_circle - first_circle_time - 100
         }
 
-        private void addJudgementAssert(HitResult firstCircle, HitResult secondCircle)
+        private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
-            AddAssert($"first circle judgement is {firstCircle}", () => judgementResults.Single(r => r.HitObject.StartTime == time_first_circle).Type == firstCircle);
-            AddAssert($"second circle judgement is {secondCircle}", () => judgementResults.Single(r => r.HitObject.StartTime == time_second_circle).Type == secondCircle);
+            AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
+                () => judgementResults.Single(r => r.HitObject == hitObject).Type == result);
         }
 
-        private void addJudgementOffsetAssert(double offset)
+        private void addJudgementOffsetAssert(OsuHitObject hitObject, double offset)
         {
-            AddAssert($"first circle judged at {offset}", () => Precision.AlmostEquals(judgementResults.Single(r => r.HitObject.StartTime == time_first_circle).TimeOffset, offset, 100));
+            AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judged at {offset}",
+                () => Precision.AlmostEquals(judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, offset, 100));
         }
 
         private ScoreAccessibleReplayPlayer currentPlayer;
         private List<JudgementResult> judgementResults;
         private bool allJudgedFired;
 
-        private void performTest(List<ReplayFrame> frames)
+        private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames)
         {
             AddStep("load player", () =>
             {
                 Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
                 {
-                    HitObjects =
-                    {
-                        new TestHitCircle
-                        {
-                            StartTime = time_first_circle,
-                            Position = position_first_circle
-                        },
-                        new TestHitCircle
-                        {
-                            StartTime = time_second_circle,
-                            Position = position_second_circle
-                        }
-                    },
+                    HitObjects = hitObjects,
                     BeatmapInfo =
                     {
                         BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 3 },

From e51097da9e7ee6f6128fd5e9b19e23117a85904b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 30 Mar 2020 09:29:00 +0300
Subject: [PATCH 01787/10326] Add a legacy skin provider above the test skin

---
 .../TestSceneHyperDashColouring.cs            | 122 +++++++++---------
 1 file changed, 63 insertions(+), 59 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 9ab8cf9113..fea2939eae 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -1,9 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -28,6 +28,9 @@ namespace osu.Game.Rulesets.Catch.Tests
 {
     public class TestSceneHyperDashColouring : OsuTestScene
     {
+        [Resolved]
+        private SkinManager skins { get; set; }
+
         [TestCase(false)]
         [TestCase(true)]
         public void TestHyperDashFruitColour(bool legacyFruit)
@@ -36,19 +39,21 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             AddStep("setup fruit", () =>
             {
-                var fruit = new Fruit { IndexInBeatmap = legacyFruit ? 0 : 1, HyperDashTarget = new Banana() };
+                var fruit = new Fruit { HyperDashTarget = new Banana() };
                 fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-                Child = setupSkinHierarchy(() =>
-                    drawableFruit = new DrawableFruit(fruit)
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Scale = new Vector2(4f),
-                    }, false, false);
+                Child = setupSkinHierarchy(drawableFruit = new DrawableFruit(fruit)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(4f),
+                }, false, false, false, legacyFruit);
             });
 
-            AddAssert("default colour", () => checkFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour, legacyFruit));
+            AddAssert("default colour", () =>
+                legacyFruit
+                    ? checkLegacyFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour)
+                    : checkFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour));
         }
 
         [TestCase(false, true)]
@@ -61,19 +66,21 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             AddStep("setup fruit", () =>
             {
-                var fruit = new Fruit { IndexInBeatmap = legacyFruit ? 0 : 1, HyperDashTarget = new Banana() };
+                var fruit = new Fruit { HyperDashTarget = new Banana() };
                 fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-                Child = setupSkinHierarchy(() =>
-                    drawableFruit = new DrawableFruit(fruit)
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Scale = new Vector2(4f),
-                    }, customCatcherHyperDashColour, true);
+                Child = setupSkinHierarchy(drawableFruit = new DrawableFruit(fruit)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(4f),
+                }, customCatcherHyperDashColour, false, true, legacyFruit);
             });
 
-            AddAssert("custom colour", () => checkFruitHyperDashColour(drawableFruit, TestLegacySkin.CustomHyperDashFruitColour, legacyFruit));
+            AddAssert("custom colour", () =>
+                legacyFruit
+                    ? checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashFruitColour)
+                    : checkFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashFruitColour));
         }
 
         [TestCase(false)]
@@ -84,71 +91,68 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             AddStep("setup fruit", () =>
             {
-                var fruit = new Fruit { IndexInBeatmap = legacyFruit ? 0 : 1, HyperDashTarget = new Banana() };
+                var fruit = new Fruit { HyperDashTarget = new Banana() };
                 fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-                Child = setupSkinHierarchy(() =>
+                Child = setupSkinHierarchy(
                     drawableFruit = new DrawableFruit(fruit)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Scale = new Vector2(4f),
-                    }, true, false);
+                    }, true, false, false, legacyFruit);
             });
 
-            AddAssert("catcher custom colour", () => checkFruitHyperDashColour(drawableFruit, TestLegacySkin.CustomHyperDashColour, legacyFruit));
+            AddAssert("catcher custom colour", () =>
+                legacyFruit
+                    ? checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashColour)
+                    : checkFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashColour));
         }
 
-        private Drawable setupSkinHierarchy(Func<Drawable> getChild, bool customHyperDashCatcherColour = false, bool customHyperDashFruitColour = false, bool customHyperDashAfterColour = false)
+        private Drawable setupSkinHierarchy(Drawable child, bool customCatcherColour = false, bool customAfterColour = false, bool customFruitColour = false, bool legacySkin = true)
         {
-            var testSkinProvider = new SkinProvidingContainer(new TestLegacySkin(customHyperDashCatcherColour, customHyperDashFruitColour, customHyperDashAfterColour));
+            var testSkinProvider = new SkinProvidingContainer(new TestSkin(customCatcherColour, customAfterColour, customFruitColour));
 
-            var legacySkinTransformer = new SkinProvidingContainer(new CatchLegacySkinTransformer(testSkinProvider));
+            if (legacySkin)
+            {
+                var legacySkinProvider = new SkinProvidingContainer(skins.GetSkin(DefaultLegacySkin.Info));
+                var legacySkinTransformer = new SkinProvidingContainer(new CatchLegacySkinTransformer(testSkinProvider));
 
-            return testSkinProvider
-                .WithChild(legacySkinTransformer
-                    .WithChild(getChild.Invoke()));
+                return legacySkinProvider
+                    .WithChild(testSkinProvider
+                        .WithChild(legacySkinTransformer
+                            .WithChild(child)));
+            }
+
+            return testSkinProvider.WithChild(child);
         }
 
-        private bool checkFruitHyperDashColour(DrawableFruit fruit, Color4 expectedColour, bool isLegacyFruit) =>
-            isLegacyFruit
-                ? fruit.ChildrenOfType<SkinnableDrawable>().First().Drawable.ChildrenOfType<Sprite>().Any(c => c.Colour == expectedColour)
-                : fruit.ChildrenOfType<SkinnableDrawable>().First().Drawable.ChildrenOfType<Circle>().Single(c => c.BorderColour == expectedColour).Any(d => d.Colour == expectedColour);
+        private bool checkFruitHyperDashColour(DrawableFruit fruit, Color4 expectedColour) =>
+            fruit.ChildrenOfType<SkinnableDrawable>().First().Drawable.ChildrenOfType<Circle>().Single(c => c.BorderColour == expectedColour).Any(d => d.Colour == expectedColour);
 
-        private class TestLegacySkin : ISkin
+        private bool checkLegacyFruitHyperDashColour(DrawableFruit fruit, Color4 expectedColour) =>
+            fruit.ChildrenOfType<SkinnableDrawable>().First().Drawable.ChildrenOfType<Sprite>().Any(c => c.Colour == expectedColour);
+
+        private class TestSkin : ISkin
         {
             public static Color4 CustomHyperDashColour { get; } = Color4.Goldenrod;
             public static Color4 CustomHyperDashFruitColour { get; } = Color4.Cyan;
             public static Color4 CustomHyperDashAfterColour { get; } = Color4.Lime;
 
-            private readonly bool customHyperDashCatcherColour;
-            private readonly bool customHyperDashFruitColour;
-            private readonly bool customHyperDashAfterColour;
+            private readonly bool customCatcherColour;
+            private readonly bool customAfterColour;
+            private readonly bool customFruitColour;
 
-            public TestLegacySkin(bool customHyperDashCatcherColour = false, bool customHyperDashFruitColour = false, bool customHyperDashAfterColour = false)
+            public TestSkin(bool customCatcherColour = false, bool customAfterColour = false, bool customFruitColour = false)
             {
-                this.customHyperDashCatcherColour = customHyperDashCatcherColour;
-                this.customHyperDashFruitColour = customHyperDashFruitColour;
-                this.customHyperDashAfterColour = customHyperDashAfterColour;
+                this.customCatcherColour = customCatcherColour;
+                this.customAfterColour = customAfterColour;
+                this.customFruitColour = customFruitColour;
             }
 
             public Drawable GetDrawableComponent(ISkinComponent component) => null;
 
-            public Texture GetTexture(string componentName)
-            {
-                if (componentName == "fruit-pear")
-                {
-                    // convince CatchLegacySkinTransformer to use the LegacyFruitPiece for pear fruit.
-                    return new Texture(Texture.WhitePixel.TextureGL)
-                    {
-                        Width = 1,
-                        Height = 1,
-                        ScaleAdjust = 1 / 96f
-                    };
-                }
-
-                return null;
-            }
+            public Texture GetTexture(string componentName) => null;
 
             public SampleChannel GetSample(ISampleInfo sampleInfo) => null;
 
@@ -156,13 +160,13 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 if (lookup is CatchSkinConfiguration config)
                 {
-                    if (config == CatchSkinConfiguration.HyperDash && customHyperDashCatcherColour)
+                    if (config == CatchSkinConfiguration.HyperDash && customCatcherColour)
                         return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashColour));
 
-                    if (config == CatchSkinConfiguration.HyperDashFruit && customHyperDashFruitColour)
+                    if (config == CatchSkinConfiguration.HyperDashFruit && customFruitColour)
                         return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashFruitColour));
 
-                    if (config == CatchSkinConfiguration.HyperDashAfterImage && customHyperDashAfterColour)
+                    if (config == CatchSkinConfiguration.HyperDashAfterImage && customAfterColour)
                         return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashAfterColour));
                 }
 

From 16a4525a9cdbe35aecc28579937a0606e919f5de Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 30 Mar 2020 09:33:47 +0300
Subject: [PATCH 01788/10326] CatchSkinConfiguration -> CatchSkinColour

---
 .../TestSceneHyperDashColouring.cs                        | 8 ++++----
 osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs   | 4 ++--
 .../{CatchSkinConfiguration.cs => CatchSkinColour.cs}     | 2 +-
 osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs      | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename osu.Game.Rulesets.Catch/Skinning/{CatchSkinConfiguration.cs => CatchSkinColour.cs} (94%)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index fea2939eae..ebc3d3bff1 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -158,15 +158,15 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
             {
-                if (lookup is CatchSkinConfiguration config)
+                if (lookup is CatchSkinColour config)
                 {
-                    if (config == CatchSkinConfiguration.HyperDash && customCatcherColour)
+                    if (config == CatchSkinColour.HyperDash && customCatcherColour)
                         return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashColour));
 
-                    if (config == CatchSkinConfiguration.HyperDashFruit && customFruitColour)
+                    if (config == CatchSkinColour.HyperDashFruit && customFruitColour)
                         return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashFruitColour));
 
-                    if (config == CatchSkinConfiguration.HyperDashAfterImage && customAfterColour)
+                    if (config == CatchSkinColour.HyperDashAfterImage && customAfterColour)
                         return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashAfterColour));
                 }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
index c8f7c4912e..16818746b5 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
@@ -64,8 +64,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             });
 
             var hyperDashColour =
-                skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDashFruit)?.Value ??
-                skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDash)?.Value ??
+                skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??
+                skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
                 Catcher.DefaultHyperDashColour;
 
             if (hitObject.HyperDash)
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchSkinConfiguration.cs b/osu.Game.Rulesets.Catch/Skinning/CatchSkinColour.cs
similarity index 94%
rename from osu.Game.Rulesets.Catch/Skinning/CatchSkinConfiguration.cs
rename to osu.Game.Rulesets.Catch/Skinning/CatchSkinColour.cs
index aea5beaa6b..2ad8f89739 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchSkinColour.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
-    public enum CatchSkinConfiguration
+    public enum CatchSkinColour
     {
         /// <summary>
         /// The colour to be used for the catcher while on hyper-dashing state.
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 99ecf12fd3..5235058c52 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -55,8 +55,8 @@ namespace osu.Game.Rulesets.Catch.Skinning
             if (drawableCatchObject.HitObject.HyperDash)
             {
                 var hyperDashColour =
-                    skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDashFruit)?.Value ??
-                    skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDash)?.Value ??
+                    skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??
+                    skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
                     Catcher.DefaultHyperDashColour;
 
                 var hyperDash = new Sprite

From 0d202929921e26afb043ea637bb7c9a722b0f7d6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 16:14:56 +0900
Subject: [PATCH 01789/10326] Fix ticks/spinners contributing to notelock

---
 .../Objects/Drawables/DrawableSlider.cs       |  2 +-
 .../Objects/Drawables/DrawableSliderHead.cs   |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  2 +-
 .../Objects/SliderHeadCircle.cs               |  9 ++++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      | 53 +++++++++++--------
 5 files changed, 42 insertions(+), 26 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 5c7f4a42b3..b017eacf70 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 case SliderTailCircle tail:
                     return new DrawableSliderTail(slider, tail);
 
-                case HitCircle head:
+                case SliderHeadCircle head:
                     return new DrawableSliderHead(slider, head) { OnShake = Shake };
 
                 case SliderTick tick:
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index c5609b01e0..563282e18f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private readonly Slider slider;
 
-        public DrawableSliderHead(Slider slider, HitCircle h)
+        public DrawableSliderHead(Slider slider, SliderHeadCircle h)
             : base(h)
         {
             this.slider = slider;
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index db1f46d8e2..e5d6c20738 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -155,7 +155,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                         break;
 
                     case SliderEventType.Head:
-                        AddNested(HeadCircle = new SliderCircle
+                        AddNested(HeadCircle = new SliderHeadCircle
                         {
                             StartTime = e.Time,
                             Position = Position,
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
new file mode 100644
index 0000000000..f6d46aeef5
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -0,0 +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.
+
+namespace osu.Game.Rulesets.Osu.Objects
+{
+    public class SliderHeadCircle : HitCircle
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index e36d32d01a..97e002edd0 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Skinning;
 
@@ -126,10 +127,7 @@ namespace osu.Game.Rulesets.Osu.UI
         /// <param name="result">The <see cref="JudgementResult"/> of the judged <see cref="OsuHitObject"/>.</param>
         private void missAllEarlier(JudgementResult result)
         {
-            // Hitobjects that count as bonus should not cause other hitobjects to get missed.
-            // E.g. For the sequence slider-head -> circle -> slider-tick, hitting the tick before the circle should not cause the circle to be missed.
-            // E.g. For the sequence spinner -> circle -> spinner-bonus, hitting the bonus before the circle should not cause the circle to be missed.
-            if (result.Judgement.IsBonus)
+            if (!contributesToNoteLock(result.HitObject))
                 return;
 
             // The minimum start time required for hitobjects so that they aren't missed.
@@ -140,35 +138,44 @@ namespace osu.Game.Rulesets.Osu.UI
                 if (obj.HitObject.StartTime >= minimumTime)
                     break;
 
-                attemptMiss(obj);
+                performMiss(obj);
 
                 foreach (var n in obj.NestedHitObjects)
                 {
                     if (n.HitObject.StartTime >= minimumTime)
                         break;
 
-                    attemptMiss(n);
+                    performMiss(n);
                 }
             }
-
-            static void attemptMiss(DrawableHitObject obj)
-            {
-                if (!(obj is DrawableOsuHitObject osuObject))
-                    throw new InvalidOperationException($"{obj.GetType()} is not a {nameof(DrawableOsuHitObject)}.");
-
-                // Hitobjects that have already been judged cannot be missed.
-                if (osuObject.Judged)
-                    return;
-
-                // Hitobjects that count as bonus should not be missed.
-                // For the sequence slider-head -> slider-tick -> circle, hitting the circle before the tick should not cause the tick to be missed.
-                if (osuObject.Result.Judgement.IsBonus)
-                    return;
-
-                osuObject.MissForcefully();
-            }
         }
 
+        private void performMiss(DrawableHitObject obj)
+        {
+            if (!(obj is DrawableOsuHitObject osuObject))
+                throw new InvalidOperationException($"{obj.GetType()} is not a {nameof(DrawableOsuHitObject)}.");
+
+            // Hitobjects that have already been judged cannot be missed.
+            if (osuObject.Judged)
+                return;
+
+            // Hitobjects that count as bonus should not be missed.
+            // For the sequence slider-head -> slider-tick -> circle, hitting the circle before the tick should not cause the tick to be missed.
+            if (!contributesToNoteLock(obj.HitObject))
+                return;
+
+            osuObject.MissForcefully();
+        }
+
+        /// <summary>
+        /// Whether a hitobject contributes to notelock.
+        /// Only hit circles and slider start circles contribute to notelock.
+        /// </summary>
+        /// <param name="hitObject">The hitobject to test.</param>
+        /// <returns>Whether <paramref name="hitObject"/> contributes to notelock.</returns>
+        private bool contributesToNoteLock(HitObject hitObject)
+            => hitObject is HitCircle && !(hitObject is SliderTailCircle);
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => HitObjectContainer.ReceivePositionalInputAt(screenSpacePos);
 
         private class ApproachCircleProxyContainer : LifetimeManagementContainer

From e074c3e5e99f69349471cf21e8a72323f390417b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 16:15:07 +0900
Subject: [PATCH 01790/10326] Add additional tests

---
 .../TestSceneNoteLock.cs                      | 182 ++++++++++++++++--
 1 file changed, 166 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
index af82a05c4f..a33fb54ff6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -11,6 +12,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.Replays;
@@ -27,9 +30,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         private const double early_miss_window = 1000; // time after -1000 to -500 is considered a miss
         private const double late_miss_window = 500; // time after +500 is considered a miss
 
-        private static readonly Vector2 position_first_circle = Vector2.Zero;
-        private static readonly Vector2 position_second_circle = new Vector2(80);
-
         /// <summary>
         /// Tests clicking the second circle before the first hitobject's start time, while the first hitobject HAS NOT been judged.
         /// </summary>
@@ -38,24 +38,26 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             const double time_first_circle = 1500;
             const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
 
             var hitObjects = new List<OsuHitObject>
             {
                 new TestHitCircle
                 {
                     StartTime = time_first_circle,
-                    Position = position_first_circle
+                    Position = positionFirstCircle
                 },
                 new TestHitCircle
                 {
                     StartTime = time_second_circle,
-                    Position = position_second_circle
+                    Position = positionSecondCircle
                 }
             };
 
             performTest(hitObjects, new List<ReplayFrame>
             {
-                new OsuReplayFrame { Time = time_first_circle - 100, Position = position_second_circle, Actions = { OsuAction.LeftButton } }
+                new OsuReplayFrame { Time = time_first_circle - 100, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } }
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Miss);
@@ -71,24 +73,26 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             const double time_first_circle = 1500;
             const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
 
             var hitObjects = new List<OsuHitObject>
             {
                 new TestHitCircle
                 {
                     StartTime = time_first_circle,
-                    Position = position_first_circle
+                    Position = positionFirstCircle
                 },
                 new TestHitCircle
                 {
                     StartTime = time_second_circle,
-                    Position = position_second_circle
+                    Position = positionSecondCircle
                 }
             };
 
             performTest(hitObjects, new List<ReplayFrame>
             {
-                new OsuReplayFrame { Time = time_first_circle, Position = position_second_circle, Actions = { OsuAction.LeftButton } }
+                new OsuReplayFrame { Time = time_first_circle, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } }
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Miss);
@@ -104,24 +108,26 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             const double time_first_circle = 1500;
             const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
 
             var hitObjects = new List<OsuHitObject>
             {
                 new TestHitCircle
                 {
                     StartTime = time_first_circle,
-                    Position = position_first_circle
+                    Position = positionFirstCircle
                 },
                 new TestHitCircle
                 {
                     StartTime = time_second_circle,
-                    Position = position_second_circle
+                    Position = positionSecondCircle
                 }
             };
 
             performTest(hitObjects, new List<ReplayFrame>
             {
-                new OsuReplayFrame { Time = time_first_circle + 100, Position = position_second_circle, Actions = { OsuAction.LeftButton } }
+                new OsuReplayFrame { Time = time_first_circle + 100, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } }
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Miss);
@@ -137,25 +143,27 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             const double time_first_circle = 1500;
             const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
 
             var hitObjects = new List<OsuHitObject>
             {
                 new TestHitCircle
                 {
                     StartTime = time_first_circle,
-                    Position = position_first_circle
+                    Position = positionFirstCircle
                 },
                 new TestHitCircle
                 {
                     StartTime = time_second_circle,
-                    Position = position_second_circle
+                    Position = positionSecondCircle
                 }
             };
 
             performTest(hitObjects, new List<ReplayFrame>
             {
-                new OsuReplayFrame { Time = time_first_circle - 200, Position = position_first_circle, Actions = { OsuAction.LeftButton } },
-                new OsuReplayFrame { Time = time_first_circle - 100, Position = position_second_circle, Actions = { OsuAction.RightButton } }
+                new OsuReplayFrame { Time = time_first_circle - 200, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle - 100, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
@@ -164,12 +172,133 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementOffsetAssert(hitObjects[0], -200); // time_second_circle - first_circle_time - 100
         }
 
+        [Test]
+        public void TestMissSliderHeadAndHitAllSliderTicks()
+        {
+            const double time_slider = 1500;
+            const double time_circle = 1510;
+            Vector2 positionCircle = Vector2.Zero;
+            Vector2 positionSlider = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+                new TestSlider
+                {
+                    StartTime = time_slider,
+                    Position = positionSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_slider, Position = positionCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_slider + 10, Position = positionSlider, Actions = { OsuAction.RightButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.Miss);
+            addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.Great);
+        }
+
+        [Test]
+        public void TestHitSliderTicksBeforeCircle()
+        {
+            const double time_slider = 1500;
+            const double time_circle = 1510;
+            Vector2 positionCircle = Vector2.Zero;
+            Vector2 positionSlider = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+                new TestSlider
+                {
+                    StartTime = time_slider,
+                    Position = positionSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_slider, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_circle + late_miss_window - 100, Position = positionCircle, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_circle + late_miss_window - 90, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.Great);
+            addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.Great);
+        }
+
+        [Test]
+        public void TestHitCircleBeforeSpinner()
+        {
+            const double time_spinner = 1500;
+            const double time_circle = 1510;
+            Vector2 positionCircle = Vector2.Zero;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestSpinner
+                {
+                    StartTime = time_spinner,
+                    Position = new Vector2(256, 192),
+                    EndTime = time_spinner + 1000,
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_spinner, Position = positionCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_spinner + 10, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_spinner + 20, Position = new Vector2(256, 172), Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_spinner + 30, Position = new Vector2(276, 192), Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_spinner + 40, Position = new Vector2(256, 212), Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_spinner + 50, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
                 () => judgementResults.Single(r => r.HitObject == hitObject).Type == result);
         }
 
+        private void addJudgementAssert(string name, Func<OsuHitObject> hitObject, HitResult result)
+        {
+            AddAssert($"{name} judgement is {result}",
+                () => judgementResults.Single(r => r.HitObject == hitObject()).Type == result);
+        }
+
         private void addJudgementOffsetAssert(OsuHitObject hitObject, double offset)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judged at {offset}",
@@ -225,6 +354,27 @@ namespace osu.Game.Rulesets.Osu.Tests
             protected override HitWindows CreateHitWindows() => new TestHitWindows();
         }
 
+        private class TestSlider : Slider
+        {
+            public TestSlider()
+            {
+                DefaultsApplied += () =>
+                {
+                    HeadCircle.HitWindows = new TestHitWindows();
+                    TailCircle.HitWindows = new TestHitWindows();
+                };
+            }
+        }
+
+        private class TestSpinner : Spinner
+        {
+            protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
+            {
+                base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
+                SpinsRequired = 1;
+            }
+        }
+
         private class TestHitWindows : HitWindows
         {
             private static readonly DifficultyRange[] ranges =

From 812583a4cd6e714626f0132a0351b62c1eea99db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 16:17:42 +0900
Subject: [PATCH 01791/10326] Remove stray newline

---
 osu.Game/Online/API/Requests/GetRankingsRequest.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/GetRankingsRequest.cs b/osu.Game/Online/API/Requests/GetRankingsRequest.cs
index 1bbaa73bbb..ddc3298ca7 100644
--- a/osu.Game/Online/API/Requests/GetRankingsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetRankingsRequest.cs
@@ -7,7 +7,6 @@ using osu.Game.Rulesets;
 namespace osu.Game.Online.API.Requests
 {
     public abstract class GetRankingsRequest<TModel> : APIRequest<TModel> where TModel : class
-
     {
         private readonly RulesetInfo ruleset;
         private readonly int page;

From 744f6c3ca7be99511c5732c0fa4c8688a3acbd5e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 16:33:46 +0900
Subject: [PATCH 01792/10326] Rename method + adjust comments

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 97e002edd0..994b3d9718 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Rulesets.Osu.UI
         /// <param name="result">The <see cref="JudgementResult"/> of the judged <see cref="OsuHitObject"/>.</param>
         private void missAllEarlier(JudgementResult result)
         {
-            if (!contributesToNoteLock(result.HitObject))
+            if (!causesNoteLockMisses(result.HitObject))
                 return;
 
             // The minimum start time required for hitobjects so that they aren't missed.
@@ -159,21 +159,18 @@ namespace osu.Game.Rulesets.Osu.UI
             if (osuObject.Judged)
                 return;
 
-            // Hitobjects that count as bonus should not be missed.
-            // For the sequence slider-head -> slider-tick -> circle, hitting the circle before the tick should not cause the tick to be missed.
-            if (!contributesToNoteLock(obj.HitObject))
+            if (!causesNoteLockMisses(obj.HitObject))
                 return;
 
             osuObject.MissForcefully();
         }
 
         /// <summary>
-        /// Whether a hitobject contributes to notelock.
-        /// Only hit circles and slider start circles contribute to notelock.
+        /// Whether a <see cref="HitObject"/> can be missed and causes other hitobjects to be missed during notelock.
         /// </summary>
-        /// <param name="hitObject">The hitobject to test.</param>
-        /// <returns>Whether <paramref name="hitObject"/> contributes to notelock.</returns>
-        private bool contributesToNoteLock(HitObject hitObject)
+        /// <param name="hitObject">The <see cref="HitObject"/> to test.</param>
+        /// <returns>Whether <paramref name="hitObject"/> contributes to notelock misses.</returns>
+        private bool causesNoteLockMisses(HitObject hitObject)
             => hitObject is HitCircle && !(hitObject is SliderTailCircle);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => HitObjectContainer.ReceivePositionalInputAt(screenSpacePos);

From 0044d00d07111399bbd12f0f4350bcb13a288f9b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 16:53:23 +0900
Subject: [PATCH 01793/10326] 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 7e17f9da16..fd2532257b 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.319.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.330.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3894c06994..fdf9703d79 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.319.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.330.0" />
     <PackageReference Include="Sentry" Version="2.1.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 9cc9792ecf..a286d1d460 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.319.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.330.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.319.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.330.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 796976db3c046f967e0403c9d15e4d305cbe3435 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 17:00:53 +0900
Subject: [PATCH 01794/10326] Completely ignore spinners from note lock

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 994b3d9718..db8a47e4a2 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -90,7 +90,14 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private bool checkHittable(DrawableOsuHitObject osuHitObject)
         {
-            var lastObject = HitObjectContainer.AliveObjects.GetPrevious(osuHitObject);
+            DrawableHitObject lastObject = osuHitObject;
+
+            // Get the last hitobject that contributes to note lock
+            while ((lastObject = HitObjectContainer.AliveObjects.GetPrevious(lastObject)) != null)
+            {
+                if (contributesToNoteLock(lastObject.HitObject))
+                    break;
+            }
 
             // If there is no previous object alive, allow the hit.
             if (lastObject == null)
@@ -166,10 +173,19 @@ namespace osu.Game.Rulesets.Osu.UI
         }
 
         /// <summary>
-        /// Whether a <see cref="HitObject"/> can be missed and causes other hitobjects to be missed during notelock.
+        /// Whether a <see cref="HitObject"/> is contributes to note lock.
+        /// Future contributing <see cref="HitObject"/>s will not be hittable until the start time of the last contributing <see cref="HitObject"/> is reached.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to test.</param>
-        /// <returns>Whether <paramref name="hitObject"/> contributes to notelock misses.</returns>
+        /// <returns>Whether <paramref name="hitObject"/> causes note lock.</returns>
+        private bool contributesToNoteLock(HitObject hitObject)
+            => hitObject is HitCircle || hitObject is Slider;
+
+        /// <summary>
+        /// Whether a <see cref="HitObject"/> can be missed and causes other <see cref="HitObject"/>s to be missed when hit out-of-order during note lock.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to test.</param>
+        /// <returns>Whether <paramref name="hitObject"/> contributes to note lock misses.</returns>
         private bool causesNoteLockMisses(HitObject hitObject)
             => hitObject is HitCircle && !(hitObject is SliderTailCircle);
 

From 1ff60b73d70deb25d9133f42b17b813711759bbc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 17:01:29 +0900
Subject: [PATCH 01795/10326] Refactor tests a bit

---
 .../TestSceneNoteLock.cs                      | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
index a33fb54ff6..2c69540951 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private const double late_miss_window = 500; // time after +500 is considered a miss
 
         /// <summary>
-        /// Tests clicking the second circle before the first hitobject's start time, while the first hitobject HAS NOT been judged.
+        /// Tests clicking a future circle before the first circle's start time, while the first circle HAS NOT been judged.
         /// </summary>
         [Test]
         public void TestClickSecondCircleBeforeFirstCircleTime()
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         /// <summary>
-        /// Tests clicking the second circle at the first hitobject's start time, while the first hitobject HAS NOT been judged.
+        /// Tests clicking a future circle at the first circle's start time, while the first circle HAS NOT been judged.
         /// </summary>
         [Test]
         public void TestClickSecondCircleAtFirstCircleTime()
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         /// <summary>
-        /// Tests clicking the second circle after the first hitobject's start time, while the first hitobject HAS NOT been judged.
+        /// Tests clicking a future circle after the first circle's start time, while the first circle HAS NOT been judged.
         /// </summary>
         [Test]
         public void TestClickSecondCircleAfterFirstCircleTime()
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         /// <summary>
-        /// Tests clicking the second circle before the first hitobject's start time, while the first hitobject HAS been judged.
+        /// Tests clicking a future circle before the first circle's start time, while the first circle HAS been judged.
         /// </summary>
         [Test]
         public void TestClickSecondCircleBeforeFirstCircleTimeWithFirstCircleJudged()
@@ -172,6 +172,9 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementOffsetAssert(hitObjects[0], -200); // time_second_circle - first_circle_time - 100
         }
 
+        /// <summary>
+        /// Tests clicking a future circle after a slider's start time, but hitting all slider ticks.
+        /// </summary>
         [Test]
         public void TestMissSliderHeadAndHitAllSliderTicks()
         {
@@ -211,6 +214,9 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.Great);
         }
 
+        /// <summary>
+        /// Tests clicking hitting future slider ticks before a circle.
+        /// </summary>
         [Test]
         public void TestHitSliderTicksBeforeCircle()
         {
@@ -251,11 +257,14 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.Great);
         }
 
+        /// <summary>
+        /// Tests clicking a future circle before a spinner.
+        /// </summary>
         [Test]
         public void TestHitCircleBeforeSpinner()
         {
             const double time_spinner = 1500;
-            const double time_circle = 1510;
+            const double time_circle = 1800;
             Vector2 positionCircle = Vector2.Zero;
 
             var hitObjects = new List<OsuHitObject>
@@ -275,7 +284,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             performTest(hitObjects, new List<ReplayFrame>
             {
-                new OsuReplayFrame { Time = time_spinner, Position = positionCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_spinner - 100, Position = positionCircle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_spinner + 10, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
                 new OsuReplayFrame { Time = time_spinner + 20, Position = new Vector2(256, 172), Actions = { OsuAction.RightButton } },
                 new OsuReplayFrame { Time = time_spinner + 30, Position = new Vector2(276, 192), Actions = { OsuAction.RightButton } },

From 4719aac235727c684a2f3d20e80eceff02c4f801 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 17:18:09 +0900
Subject: [PATCH 01796/10326] Add basic mania skin parsing

---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    |  12 +-
 .../Skinning/LegacyManiaSkinConfiguration.cs  |  30 +++++
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs   | 106 ++++++++++++++++++
 3 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
 create mode 100644 osu.Game/Skinning/LegacyManiaSkinDecoder.cs

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index e28e235788..bbc0aad467 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Beatmaps.Formats
                         section = Section.None;
                     }
 
+                    OnBeginNewSection(section);
                     continue;
                 }
 
@@ -57,6 +58,14 @@ namespace osu.Game.Beatmaps.Formats
 
         protected virtual bool ShouldSkipLine(string line) => string.IsNullOrWhiteSpace(line) || line.AsSpan().TrimStart().StartsWith("//".AsSpan(), StringComparison.Ordinal);
 
+        /// <summary>
+        /// Invoked when a new <see cref="Section"/> has been entered.
+        /// </summary>
+        /// <param name="section">The entered <see cref="Section"/>.</param>
+        protected virtual void OnBeginNewSection(Section section)
+        {
+        }
+
         protected virtual void ParseLine(T output, Section section, string line)
         {
             line = StripComments(line);
@@ -139,7 +148,8 @@ namespace osu.Game.Beatmaps.Formats
             Colours,
             HitObjects,
             Variables,
-            Fonts
+            Fonts,
+            Mania
         }
 
         internal class LegacyDifficultyControlPoint : DifficultyControlPoint
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
new file mode 100644
index 0000000000..5dd185879b
--- /dev/null
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+
+namespace osu.Game.Skinning
+{
+    public class LegacyManiaSkinConfiguration
+    {
+        public readonly int Keys;
+
+        public readonly float[] ColumnLineWidth;
+        public readonly float[] ColumnSpacing;
+        public readonly float[] ColumnWidth;
+
+        public float HitPosition = 124.8f; // (480 - 402) * 1.6f
+
+        public LegacyManiaSkinConfiguration(int keys)
+        {
+            Keys = keys;
+
+            ColumnLineWidth = new float[keys + 1];
+            ColumnSpacing = new float[keys - 1];
+            ColumnWidth = new float[keys];
+
+            ColumnLineWidth.AsSpan().Fill(2);
+            ColumnWidth.AsSpan().Fill(48);
+        }
+    }
+}
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
new file mode 100644
index 0000000000..153a2c9626
--- /dev/null
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -0,0 +1,106 @@
+// Copyright (c) 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.Diagnostics;
+using System.Globalization;
+using osu.Game.Beatmaps.Formats;
+
+namespace osu.Game.Skinning
+{
+    public class LegacyManiaSkinDecoder : LegacyDecoder<List<LegacyManiaSkinConfiguration>>
+    {
+        private const float size_scale_factor = 1.6f;
+
+        public LegacyManiaSkinDecoder()
+            : base(1)
+        {
+        }
+
+        private readonly List<string> pendingLines = new List<string>();
+        private LegacyManiaSkinConfiguration currentConfig;
+
+        protected override void OnBeginNewSection(Section section)
+        {
+            base.OnBeginNewSection(section);
+
+            // If a new section is reached with pending lines remaining, they can all be discarded as there isn't a valid configuration to parse them into.
+            pendingLines.Clear();
+            currentConfig = null;
+        }
+
+        protected override void ParseLine(List<LegacyManiaSkinConfiguration> output, Section section, string line)
+        {
+            line = StripComments(line);
+
+            switch (section)
+            {
+                case Section.Mania:
+                    var pair = SplitKeyVal(line);
+
+                    switch (pair.Key)
+                    {
+                        case "Keys":
+                            currentConfig = new LegacyManiaSkinConfiguration(int.Parse(pair.Value, CultureInfo.InvariantCulture));
+                            output.Add(currentConfig);
+
+                            // All existing lines can be flushed now that we have a valid configuration.
+                            flushPendingLines();
+                            break;
+
+                        default:
+                            pendingLines.Add(line);
+
+                            // Hold all lines until a "Keys" item is found.
+                            if (currentConfig != null)
+                                flushPendingLines();
+                            break;
+                    }
+
+                    break;
+            }
+        }
+
+        private void flushPendingLines()
+        {
+            Debug.Assert(currentConfig != null);
+
+            foreach (var line in pendingLines)
+            {
+                var pair = SplitKeyVal(line);
+
+                switch (pair.Key)
+                {
+                    case "ColumnLineWidth":
+                        parseArrayValue(pair.Value, currentConfig.ColumnLineWidth);
+                        break;
+
+                    case "ColumnSpacing":
+                        parseArrayValue(pair.Value, currentConfig.ColumnSpacing);
+                        break;
+
+                    case "ColumnWidth":
+                        parseArrayValue(pair.Value, currentConfig.ColumnWidth);
+                        break;
+
+                    case "HitPosition":
+                        currentConfig.HitPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * size_scale_factor;
+                        break;
+                }
+            }
+        }
+
+        private void parseArrayValue(string value, float[] output)
+        {
+            string[] values = value.Split(',');
+
+            for (int i = 0; i < values.Length; i++)
+            {
+                if (i >= output.Length)
+                    break;
+
+                output[i] = float.Parse(values[i], CultureInfo.InvariantCulture) * size_scale_factor;
+            }
+        }
+    }
+}

From 4406f441654726dd21c810349b0eeb6935ba7d65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 17:26:35 +0900
Subject: [PATCH 01797/10326] Remove osu!catch GotoFrame usage

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs     | 5 ++++-
 osu.Game/Skinning/LegacySkinExtensions.cs | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index e361b29a9d..bc0311bd2d 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Timing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
@@ -379,7 +380,9 @@ namespace osu.Game.Rulesets.Catch.UI
             }
 
             currentCatcher.Show();
-            (currentCatcher.Drawable as IAnimation)?.GotoFrame(0);
+
+            if (currentCatcher.Drawable.Clock is FramedOffsetClock offsetClock)
+                offsetClock.Offset = -Time.Current;
         }
 
         private void beginTrail()
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 8765b161d4..de0add6ba3 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -71,6 +71,8 @@ namespace osu.Game.Skinning
 
                 if (timeReference != null)
                     Clock = new FramedOffsetClock(timeReference.Clock) { Offset = -timeReference.AnimationStartTime };
+                else
+                    Clock = new FramedOffsetClock(Clock);
             }
         }
 

From 881ec146afca5c8560c811ea3e1370b227aa6a3a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 17:36:57 +0900
Subject: [PATCH 01798/10326] Ignore duplicate configs

---
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 153a2c9626..ae6c8eeb15 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
+using System.Linq;
 using osu.Game.Beatmaps.Formats;
 
 namespace osu.Game.Skinning
@@ -42,7 +43,10 @@ namespace osu.Game.Skinning
                     {
                         case "Keys":
                             currentConfig = new LegacyManiaSkinConfiguration(int.Parse(pair.Value, CultureInfo.InvariantCulture));
-                            output.Add(currentConfig);
+
+                            // Silently ignore duplicate configurations.
+                            if (output.All(c => c.Keys != currentConfig.Keys))
+                                output.Add(currentConfig);
 
                             // All existing lines can be flushed now that we have a valid configuration.
                             flushPendingLines();

From 1ce4f7c8545893786590da52a52184da8008af1b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 17:37:08 +0900
Subject: [PATCH 01799/10326] Add tests

---
 .../Resources/mania-skin-duplicate.ini        |  9 ++
 .../Resources/mania-skin-extra-data.ini       |  4 +
 .../Resources/mania-skin-multiple.ini         |  9 ++
 .../Resources/mania-skin-single.ini           |  4 +
 .../Skins/LegacyManiaSkinDecoderTest.cs       | 87 +++++++++++++++++++
 5 files changed, 113 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/mania-skin-duplicate.ini
 create mode 100644 osu.Game.Tests/Resources/mania-skin-extra-data.ini
 create mode 100644 osu.Game.Tests/Resources/mania-skin-multiple.ini
 create mode 100644 osu.Game.Tests/Resources/mania-skin-single.ini
 create mode 100644 osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs

diff --git a/osu.Game.Tests/Resources/mania-skin-duplicate.ini b/osu.Game.Tests/Resources/mania-skin-duplicate.ini
new file mode 100644
index 0000000000..2f4fa92c52
--- /dev/null
+++ b/osu.Game.Tests/Resources/mania-skin-duplicate.ini
@@ -0,0 +1,9 @@
+[Mania]
+Keys: 4
+ColumnWidth: 10,10,10,10
+HitPosition: 470
+
+[Mania]
+Keys: 4
+ColumnWidth: 20,20,20,20
+HitPosition: 460
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/mania-skin-extra-data.ini b/osu.Game.Tests/Resources/mania-skin-extra-data.ini
new file mode 100644
index 0000000000..e538b5335a
--- /dev/null
+++ b/osu.Game.Tests/Resources/mania-skin-extra-data.ini
@@ -0,0 +1,4 @@
+[Mania]
+Keys: 4
+ColumnWidth: 10,10,10,10,10,10,10
+HitPosition: 470
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/mania-skin-multiple.ini b/osu.Game.Tests/Resources/mania-skin-multiple.ini
new file mode 100644
index 0000000000..247c7738a0
--- /dev/null
+++ b/osu.Game.Tests/Resources/mania-skin-multiple.ini
@@ -0,0 +1,9 @@
+[Mania]
+Keys: 4
+ColumnWidth: 10,10,10,10
+HitPosition: 470
+
+[Mania]
+Keys: 2
+ColumnWidth: 20,20
+HitPosition: 460
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/mania-skin-single.ini b/osu.Game.Tests/Resources/mania-skin-single.ini
new file mode 100644
index 0000000000..3ae38fd75e
--- /dev/null
+++ b/osu.Game.Tests/Resources/mania-skin-single.ini
@@ -0,0 +1,4 @@
+[Mania]
+Keys: 4
+ColumnWidth: 10,10,10,10
+HitPosition: 470
\ No newline at end of file
diff --git a/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
new file mode 100644
index 0000000000..736f97f39f
--- /dev/null
+++ b/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.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 NUnit.Framework;
+using osu.Game.IO;
+using osu.Game.Skinning;
+using osu.Game.Tests.Resources;
+
+namespace osu.Game.Tests.Skins
+{
+    [TestFixture]
+    public class LegacyManiaSkinDecoderTest
+    {
+        [Test]
+        public void TestParseSingleConfig()
+        {
+            var decoder = new LegacyManiaSkinDecoder();
+
+            using (var resStream = TestResources.OpenResource("mania-skin-single.ini"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var configs = decoder.Decode(stream);
+
+                Assert.That(configs.Count, Is.EqualTo(1));
+                Assert.That(configs[0].Keys, Is.EqualTo(4));
+                Assert.That(configs[0].ColumnWidth, Is.EquivalentTo(new float[] { 16, 16, 16, 16 }));
+                Assert.That(configs[0].HitPosition, Is.EqualTo(16));
+            }
+        }
+
+        [Test]
+        public void TestParseMultipleConfig()
+        {
+            var decoder = new LegacyManiaSkinDecoder();
+
+            using (var resStream = TestResources.OpenResource("mania-skin-multiple.ini"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var configs = decoder.Decode(stream);
+
+                Assert.That(configs.Count, Is.EqualTo(2));
+
+                Assert.That(configs[0].Keys, Is.EqualTo(4));
+                Assert.That(configs[0].ColumnWidth, Is.EquivalentTo(new float[] { 16, 16, 16, 16 }));
+                Assert.That(configs[0].HitPosition, Is.EqualTo(16));
+
+                Assert.That(configs[1].Keys, Is.EqualTo(2));
+                Assert.That(configs[1].ColumnWidth, Is.EquivalentTo(new float[] { 32, 32 }));
+                Assert.That(configs[1].HitPosition, Is.EqualTo(32));
+            }
+        }
+
+        [Test]
+        public void TestParseDuplicateConfig()
+        {
+            var decoder = new LegacyManiaSkinDecoder();
+
+            using (var resStream = TestResources.OpenResource("mania-skin-single.ini"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var configs = decoder.Decode(stream);
+
+                Assert.That(configs.Count, Is.EqualTo(1));
+                Assert.That(configs[0].Keys, Is.EqualTo(4));
+                Assert.That(configs[0].ColumnWidth, Is.EquivalentTo(new float[] { 16, 16, 16, 16 }));
+                Assert.That(configs[0].HitPosition, Is.EqualTo(16));
+            }
+        }
+
+        [Test]
+        public void TestParseWithUnnecessaryExtraData()
+        {
+            var decoder = new LegacyManiaSkinDecoder();
+
+            using (var resStream = TestResources.OpenResource("mania-skin-extra-data.ini"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var configs = decoder.Decode(stream);
+
+                Assert.That(configs.Count, Is.EqualTo(1));
+                Assert.That(configs[0].Keys, Is.EqualTo(4));
+                Assert.That(configs[0].ColumnWidth, Is.EquivalentTo(new float[] { 16, 16, 16, 16 }));
+                Assert.That(configs[0].HitPosition, Is.EqualTo(16));
+            }
+        }
+    }
+}

From 43367dbe35c313f70156d5ad31d9fe508c69ef01 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 08:49:50 +0000
Subject: [PATCH 01800/10326] Bump Microsoft.Build.Traversal from 2.0.24 to
 2.0.32

Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.24 to 2.0.32.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.0.24...Microsoft.Build.Traversal.2.0.32)

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

diff --git a/global.json b/global.json
index 6858d4044d..0223dc7330 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,6 @@
     "version": "3.1.100"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "2.0.24"
+    "Microsoft.Build.Traversal": "2.0.32"
   }
 }
\ No newline at end of file

From c4df49954f39d7c5d07352987c281ed1b5296e3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 18:35:01 +0900
Subject: [PATCH 01801/10326] Reword comment

---
 .../Objects/Drawables/DrawableSliderRepeat.cs                  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 2704680d54..b04d484195 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -87,8 +87,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public void UpdateSnakingPosition(Vector2 start, Vector2 end)
         {
-            // When the repeat is hit, the arrow should fade out on spot,
-            // it should no longer follow snaking
+            // When the repeat is hit, the arrow should fade out on spot rather than following the slider
             if (IsHit) return;
 
             bool isRepeatAtEnd = sliderRepeat.RepeatIndex % 2 == 0;

From 113660b6219b7729f28d35d0136a9d0634a59f61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 18:56:35 +0900
Subject: [PATCH 01802/10326] Merge if statements

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 1c08b763fe..cfba1e6e3e 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -89,22 +89,19 @@ namespace osu.Game.Screens.Ranking
                 }
             };
 
-            if (player != null)
+            if (player != null && allowRetry)
             {
-                if (allowRetry)
+                buttons.Add(new RetryButton { Width = 300 });
+
+                AddInternal(new HotkeyRetryOverlay
                 {
-                    buttons.Add(new RetryButton { Width = 300 });
-
-                    AddInternal(new HotkeyRetryOverlay
+                    Action = () =>
                     {
-                        Action = () =>
-                        {
-                            if (!this.IsCurrentScreen()) return;
+                        if (!this.IsCurrentScreen()) return;
 
-                            player?.Restart();
-                        },
-                    });
-                }
+                        player?.Restart();
+                    },
+                });
             }
         }
 

From 35647d59a6f46e9f9284995edcd43af377954158 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 19:09:05 +0900
Subject: [PATCH 01803/10326] Add failing test

---
 .../TestSceneOverlayScrollContainer.cs             | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
index 1fc85c3c04..684436459f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
@@ -74,6 +74,20 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("scrolled back to start", () => Precision.AlmostEquals(scroll.Current, 0, 0.1f));
         }
 
+        [Test]
+        public void TestClick()
+        {
+            AddStep("scroll to end", () => scroll.ScrollToEnd(false));
+
+            AddStep("click button", () =>
+            {
+                InputManager.MoveMouseTo(scroll.Button);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("scrolled back to start", () => Precision.AlmostEquals(scroll.Current, 0, 0.1f));
+        }
+
         [Test]
         public void TestMultipleClicks()
         {

From 0d4830550e4f3cbf6c51599c6b90b6f36816b7ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 19:15:44 +0900
Subject: [PATCH 01804/10326] Fix tooltips not showing inside
 ManualInputManagerTestScenes

---
 osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index 0da3ae7f87..64f4d7b95b 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -26,16 +26,16 @@ namespace osu.Game.Tests.Visual
 
         protected OsuManualInputManagerTestScene()
         {
+            MenuCursorContainer cursorContainer;
+
             base.Content.AddRange(new Drawable[]
             {
                 InputManager = new ManualInputManager
                 {
                     UseParentInput = true,
                     Child = new GlobalActionContainer(null)
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Child = content = new MenuCursorContainer { RelativeSizeAxes = Axes.Both }
-                    },
+                        .WithChild((cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both })
+                            .WithChild(content = new OsuTooltipContainer(cursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }))
                 },
                 new Container
                 {

From f96229c572e812cf2f7fc99b9dee05f62faf9a36 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 30 Mar 2020 13:21:22 +0300
Subject: [PATCH 01805/10326] Add support for HitCircleOverlayAboveNumber
 legacy skin property

---
 osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs | 5 +++++
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 38ba4c5974..0480449d05 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -80,6 +80,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                 return tex ?? skin.GetTexture($"hitcircle{name}");
             }
+
+            bool overlayAboveNumber = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value ?? true;
+
+            if (!overlayAboveNumber)
+                ChangeInternalChildDepth(hitCircleText, -float.MaxValue);
         }
 
         private void updateState(ValueChangedEvent<ArmedState> state)
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index 5d99960f10..c6920bd03e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -11,6 +11,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         SliderPathRadius,
         AllowSliderBallTint,
         CursorExpand,
-        CursorRotate
+        CursorRotate,
+        HitCircleOverlayAboveNumber
     }
 }

From 179bd1ce7ebe2384fc819bdac20865f5176fd7d7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 30 Mar 2020 13:38:04 +0300
Subject: [PATCH 01806/10326] Fix failing test

---
 osu.Game/Overlays/OverlayScrollContainer.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index 1a875ded95..a9524b9d32 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -83,7 +84,10 @@ namespace osu.Game.Overlays
             public ScrollToTopButton()
             {
                 Size = new Vector2(50);
-                Child = button = new Button();
+                Child = button = new Button
+                {
+                    AreaState = { BindTarget = State }
+                };
             }
 
             protected override bool OnMouseDown(MouseDownEvent e) => true;
@@ -94,7 +98,9 @@ namespace osu.Game.Overlays
 
             private class Button : OsuHoverContainer
             {
-                public override bool PropagatePositionalInputSubTree => Alpha == 1;
+                public readonly Bindable<Visibility> AreaState = new Bindable<Visibility>();
+
+                public override bool HandlePositionalInput => AreaState.Value == Visibility.Visible;
 
                 protected override IEnumerable<Drawable> EffectTargets => new[] { background };
 

From 9890544b3692df822dcc97b25fdfad7cd800b0e5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 30 Mar 2020 13:42:18 +0300
Subject: [PATCH 01807/10326] Move implementation to better place

---
 .../Skinning/LegacyMainCirclePiece.cs                  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 0480449d05..e7486ef9b0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -62,6 +62,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 }
             };
 
+            bool overlayAboveNumber = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value ?? true;
+
+            if (!overlayAboveNumber)
+                ChangeInternalChildDepth(hitCircleText, -float.MaxValue);
+
             state.BindTo(drawableObject.State);
             state.BindValueChanged(updateState, true);
 
@@ -80,11 +85,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                 return tex ?? skin.GetTexture($"hitcircle{name}");
             }
-
-            bool overlayAboveNumber = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value ?? true;
-
-            if (!overlayAboveNumber)
-                ChangeInternalChildDepth(hitCircleText, -float.MaxValue);
         }
 
         private void updateState(ValueChangedEvent<ArmedState> state)

From 3cae0cedeea80e1dc6206f26e5526a5b7e22662a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 30 Mar 2020 12:59:39 +0200
Subject: [PATCH 01808/10326] Add a game setting to disable the layer

---
 osu.Game/Configuration/OsuConfigManager.cs                | 2 ++
 .../Settings/Sections/Gameplay/GeneralSettings.cs         | 6 ++++++
 osu.Game/Screens/Play/HUD/FailingLayer.cs                 | 8 +++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 41f6747b74..6fed5ea5a2 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -87,6 +87,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.ShowInterface, true);
             Set(OsuSetting.ShowProgressGraph, true);
             Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
+            Set(OsuSetting.FadePlayfieldWhenHealthLow, true);
             Set(OsuSetting.KeyOverlay, false);
             Set(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
@@ -181,6 +182,7 @@ namespace osu.Game.Configuration
         ShowInterface,
         ShowProgressGraph,
         ShowHealthDisplayWhenCantFail,
+        FadePlayfieldWhenHealthLow,
         MouseDisableButtons,
         MouseDisableWheel,
         AudioOffset,
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 2d2cd42213..4b75910454 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -53,6 +53,12 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     Keywords = new[] { "hp", "bar" }
                 },
                 new SettingsCheckbox
+                {
+                    LabelText = "Fade playfield to red when health is low",
+                    Bindable = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow),
+                    Keywords = new[] { "hp", "low", "playfield", "red" }
+                },
+                new SettingsCheckbox
                 {
                     LabelText = "Always show key overlay",
                     Bindable = config.GetBindable<bool>(OsuSetting.KeyOverlay)
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 97d2458674..761178b93d 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -3,9 +3,11 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
@@ -21,6 +23,8 @@ namespace osu.Game.Screens.Play.HUD
 
         private readonly Box box;
 
+        private Bindable<bool> enabled;
+
         /// <summary>
         /// The threshold under which the current player life should be considered low and the layer should start fading in.
         /// </summary>
@@ -37,9 +41,11 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour color)
+        private void load(OsuColour color, OsuConfigManager config)
         {
             box.Colour = color.Red;
+            enabled = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
+            enabled.BindValueChanged(e => this.FadeTo(e.NewValue ? 1 : 0, fade_time, Easing.OutQuint), true);
         }
 
         protected override void Update()

From 655fab6a976007486b2de2d037a55f2fcb7c1d06 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 23:02:07 +0900
Subject: [PATCH 01809/10326] Add mania skinnable test helpers

---
 .../Skinning/ColumnTestContainer.cs           | 38 +++++++++++
 .../Skinning/ManiaHitObjectTestScene.cs       | 67 +++++++++++++++++++
 .../Skinning/ManiaSkinnableTestScene.cs       | 58 ++++++++++++++++
 3 files changed, 163 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
new file mode 100644
index 0000000000..c807e98871
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.UI;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    /// <summary>
+    /// A container to be used in a <see cref="ManiaSkinnableTestScene"/> to provide a resolvable <see cref="Column"/> dependency.
+    /// </summary>
+    public class ColumnTestContainer : Container
+    {
+        protected override Container<Drawable> Content => content;
+
+        private readonly Container content;
+
+        [Cached]
+        private readonly Column column;
+
+        public ColumnTestContainer(int column, ManiaAction action)
+        {
+            this.column = new Column(column)
+            {
+                Action = { Value = action },
+                AccentColour = Color4.Orange
+            };
+
+            InternalChild = content = new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)
+            {
+                RelativeSizeAxes = Axes.Both
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
new file mode 100644
index 0000000000..e65982b240
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.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.Timing;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    /// <summary>
+    /// A test scene for a mania hitobject.
+    /// </summary>
+    public abstract class ManiaHitObjectTestScene : ManiaSkinnableTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            SetContents(() => new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Height = 0.7f,
+                Direction = FillDirection.Horizontal,
+                Children = new Drawable[]
+                {
+                    new ColumnTestContainer(0, ManiaAction.Key1)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 80,
+                        Child = new ScrollingHitObjectContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Clock = new FramedClock(new StopwatchClock()),
+                        }.With(c =>
+                        {
+                            c.Add(CreateHitObject().With(h => h.AccentColour.Value = Color4.Orange));
+                        })
+                    },
+                    new ColumnTestContainer(1, ManiaAction.Key2)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 80,
+                        Child = new ScrollingHitObjectContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Clock = new FramedClock(new StopwatchClock()),
+                        }.With(c =>
+                        {
+                            c.Add(CreateHitObject().With(h => h.AccentColour.Value = Color4.Orange));
+                        })
+                    },
+                }
+            });
+        }
+
+        protected abstract DrawableManiaHitObject CreateHitObject();
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
new file mode 100644
index 0000000000..41fb7c727e
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -0,0 +1,58 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Rulesets.UI.Scrolling.Algorithms;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    /// <summary>
+    /// A test scene for skinnable mania components.
+    /// </summary>
+    public abstract class ManiaSkinnableTestScene : SkinnableTestScene
+    {
+        [Cached(Type = typeof(IScrollingInfo))]
+        private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
+
+        protected ManiaSkinnableTestScene()
+        {
+            scrollingInfo.Direction.Value = ScrollingDirection.Down;
+
+            Add(new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = Color4.SlateGray.Opacity(0.2f),
+                Depth = 1
+            });
+        }
+
+        [Test]
+        public void TestScrollingDown()
+        {
+            AddStep("change direction to down", () => scrollingInfo.Direction.Value = ScrollingDirection.Down);
+        }
+
+        [Test]
+        public void TestScrollingUp()
+        {
+            AddStep("change direction to up", () => scrollingInfo.Direction.Value = ScrollingDirection.Up);
+        }
+
+        private class TestScrollingInfo : IScrollingInfo
+        {
+            public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
+
+            IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
+            IBindable<double> IScrollingInfo.TimeRange { get; } = new Bindable<double>(1000);
+            IScrollAlgorithm IScrollingInfo.Algorithm { get; } = new ConstantScrollAlgorithm();
+        }
+    }
+}

From bd87a4cde8212d97173be42b0bd0caa697f7a84d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 23:03:36 +0900
Subject: [PATCH 01810/10326] Re-namespace testscene

---
 .../{ => Skinning}/TestSceneDrawableJudgement.cs            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename osu.Game.Rulesets.Mania.Tests/{ => Skinning}/TestSceneDrawableJudgement.cs (96%)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
similarity index 96%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs
rename to osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
index 692d079c16..a6bc64550f 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
@@ -6,13 +6,13 @@ 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.Mania.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
     public class TestSceneDrawableJudgement : SkinnableTestScene
     {

From 6ff2273b64bcb9600a71888673e78332050aa292 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 23:07:32 +0900
Subject: [PATCH 01811/10326] Make column + stage cached

---
 osu.Game.Rulesets.Mania/UI/Column.cs     | 1 +
 osu.Game.Rulesets.Mania/UI/ManiaStage.cs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 63c573d344..0eccd27944 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -19,6 +19,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
+    [Cached]
     public class Column : ScrollingPlayfield, IKeyBindingHandler<ManiaAction>, IHasAccentColour
     {
         public const float COLUMN_WIDTH = 80;
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
index bfe9f1085b..bd21663c4e 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Mania.UI
     /// <summary>
     /// A collection of <see cref="Column"/>s.
     /// </summary>
+    [Cached]
     public class ManiaStage : ScrollingPlayfield
     {
         public const float COLUMN_SPACING = 1;

From c1789140d5aa964c5ee9525aef2f76ae8816ae9d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 23:17:32 +0900
Subject: [PATCH 01812/10326] Prepare skin transformer for mania components

---
 .../Skinning/ManiaLegacySkinTransformer.cs    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index f3739ce7c2..444f153c66 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Audio.Sample;
@@ -15,9 +16,19 @@ namespace osu.Game.Rulesets.Mania.Skinning
     {
         private readonly ISkin source;
 
-        public ManiaLegacySkinTransformer(ISkin source)
+        private Lazy<bool> isLegacySkin;
+
+        public ManiaLegacySkinTransformer(ISkinSource source)
         {
             this.source = source;
+
+            source.SourceChanged += sourceChanged;
+            sourceChanged();
+        }
+
+        private void sourceChanged()
+        {
+            isLegacySkin = new Lazy<bool>(() => source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
         }
 
         public Drawable GetDrawableComponent(ISkinComponent component)
@@ -26,6 +37,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
             {
                 case GameplaySkinComponent<HitResult> resultComponent:
                     return getResult(resultComponent);
+
+                case ManiaSkinComponent maniaComponent:
+                    if (!isLegacySkin.Value)
+                        return null;
+
+                    break;
             }
 
             return null;

From c3cde7a16383909f3e1e42abc61fcc935568e1ce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 23:18:38 +0900
Subject: [PATCH 01813/10326] Combine files

---
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs  | 4 ++++
 osu.Game.Rulesets.Mania/ManiaSkinComponents.cs | 9 ---------
 2 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/ManiaSkinComponents.cs

diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 69bd4b0ecf..5340ebc01f 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -16,4 +16,8 @@ namespace osu.Game.Rulesets.Mania
 
         protected override string ComponentName => Component.ToString().ToLower();
     }
+
+    public enum ManiaSkinComponents
+    {
+    }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponents.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponents.cs
deleted file mode 100644
index 6d85816e5a..0000000000
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponents.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.Rulesets.Mania
-{
-    public enum ManiaSkinComponents
-    {
-    }
-}

From a8f7d7ea422ba684ed3d88e53c0907f9c188c69c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 23:21:10 +0900
Subject: [PATCH 01814/10326] Add structure for mania configuration lookups

---
 .../Skinning/ManiaLegacySkinTransformer.cs    |  2 +-
 .../LegacyManiaSkinConfigurationLookup.cs     | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 444f153c66..ffc69fae49 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 case GameplaySkinComponent<HitResult> resultComponent:
                     return getResult(resultComponent);
 
-                case ManiaSkinComponent maniaComponent:
+                case ManiaSkinComponent _:
                     if (!isLegacySkin.Value)
                         return null;
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
new file mode 100644
index 0000000000..bbdd445f66
--- /dev/null
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.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.
+
+namespace osu.Game.Skinning
+{
+    public class LegacyManiaSkinConfigurationLookup
+    {
+        public readonly int Keys;
+        public readonly LegacyManiaSkinConfigurationLookups Lookup;
+        public readonly int? TargetColumn;
+
+        public LegacyManiaSkinConfigurationLookup(int keys, LegacyManiaSkinConfigurationLookups lookup, int? targetColumn = null)
+        {
+            Keys = keys;
+            Lookup = lookup;
+            TargetColumn = targetColumn;
+        }
+    }
+
+    public enum LegacyManiaSkinConfigurationLookups
+    {
+    }
+}

From 522bbc1e9c4a84209531fb5538b5d9a2ad799445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Mar 2020 21:37:20 +0200
Subject: [PATCH 01815/10326] Support widescreen per-layer storyboard masking

---
 .../Drawables/DrawableStoryboard.cs           |  2 +-
 .../Drawables/DrawableStoryboardLayer.cs      | 33 ++++++++++++++-----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index bc6e01a729..c4d796e30b 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Storyboards.Drawables
 
             AddInternal(Content = new Container<DrawableStoryboardLayer>
             {
-                Size = new Vector2(640, 480),
+                RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             });
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
index def4eed2ca..2ada83c3b4 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    public class DrawableStoryboardLayer : LifetimeManagementContainer
+    public class DrawableStoryboardLayer : CompositeDrawable
     {
         public StoryboardLayer Layer { get; }
         public bool Enabled;
@@ -23,17 +23,34 @@ namespace osu.Game.Storyboards.Drawables
             Origin = Anchor.Centre;
             Enabled = layer.VisibleWhenPassing;
             Masking = layer.Masking;
+
+            InternalChild = new LayerElementContainer(layer);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(CancellationToken? cancellationToken)
+        private class LayerElementContainer : LifetimeManagementContainer
         {
-            foreach (var element in Layer.Elements)
-            {
-                cancellationToken?.ThrowIfCancellationRequested();
+            private readonly StoryboardLayer storyboardLayer;
 
-                if (element.IsDrawable)
-                    AddInternal(element.CreateDrawable());
+            public LayerElementContainer(StoryboardLayer layer)
+            {
+                storyboardLayer = layer;
+
+                Width = 640;
+                Height = 480;
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(CancellationToken? cancellationToken)
+            {
+                foreach (var element in storyboardLayer.Elements)
+                {
+                    cancellationToken?.ThrowIfCancellationRequested();
+
+                    if (element.IsDrawable)
+                        AddInternal(element.CreateDrawable());
+                }
             }
         }
     }

From f6f5de7ad16fd416bdbb7ad11fa205be085f66c6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 10:13:50 +0900
Subject: [PATCH 01816/10326] Allow LineBufferedReader to keep underlying
 stream open

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

diff --git a/osu.Game/IO/LineBufferedReader.cs b/osu.Game/IO/LineBufferedReader.cs
index aab761afd8..018321dc9a 100644
--- a/osu.Game/IO/LineBufferedReader.cs
+++ b/osu.Game/IO/LineBufferedReader.cs
@@ -17,9 +17,9 @@ namespace osu.Game.IO
         private readonly StreamReader streamReader;
         private readonly Queue<string> lineBuffer;
 
-        public LineBufferedReader(Stream stream)
+        public LineBufferedReader(Stream stream, bool leaveOpen = false)
         {
-            streamReader = new StreamReader(stream);
+            streamReader = new StreamReader(stream, Encoding.UTF8, true, 1024, leaveOpen);
             lineBuffer = new Queue<string>();
         }
 

From 2b5e9885f6df85c45c0062fe24956af5e92b85c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 10:14:36 +0900
Subject: [PATCH 01817/10326] Implement mania skin reading functionality

---
 osu.Game/Skinning/LegacyBeatmapSkin.cs |  2 ++
 osu.Game/Skinning/LegacySkin.cs        | 38 +++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index fa7e895a28..1c39fc41bb 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Skinning
 {
     public class LegacyBeatmapSkin : LegacySkin
     {
+        protected override bool AllowManiaSkin => false;
+
         public LegacyBeatmapSkin(BeatmapInfo beatmap, IResourceStore<byte[]> storage, AudioManager audioManager)
             : base(createSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), audioManager, beatmap.Path)
         {
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index c71a321e74..fe190740b3 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -26,12 +26,16 @@ namespace osu.Game.Skinning
         [CanBeNull]
         protected IResourceStore<SampleChannel> Samples;
 
+        protected virtual bool AllowManiaSkin => true;
+
         public new LegacySkinConfiguration Configuration
         {
             get => base.Configuration as LegacySkinConfiguration;
             set => base.Configuration = value;
         }
 
+        private readonly Dictionary<int, LegacyManiaSkinConfiguration> maniaConfigurations = new Dictionary<int, LegacyManiaSkinConfiguration>();
+
         public LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager)
             : this(skin, new LegacySkinResourceStore<SkinFileInfo>(skin, storage), audioManager, "skin.ini")
         {
@@ -40,15 +44,26 @@ namespace osu.Game.Skinning
         protected LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, string filename)
             : base(skin)
         {
-            Stream stream = storage?.GetStream(filename);
-
-            if (stream != null)
+            using (var stream = storage?.GetStream(filename))
             {
-                using (LineBufferedReader reader = new LineBufferedReader(stream))
-                    Configuration = new LegacySkinDecoder().Decode(reader);
+                if (stream != null)
+                {
+                    using (LineBufferedReader reader = new LineBufferedReader(stream, true))
+                        Configuration = new LegacySkinDecoder().Decode(reader);
+
+                    stream.Seek(0, SeekOrigin.Begin);
+
+                    using (LineBufferedReader reader = new LineBufferedReader(stream))
+                    {
+                        var maniaList = new LegacyManiaSkinDecoder().Decode(reader);
+
+                        foreach (var config in maniaList)
+                            maniaConfigurations[config.Keys] = config;
+                    }
+                }
+                else
+                    Configuration = new LegacySkinConfiguration { LegacyVersion = LegacySkinConfiguration.LATEST_VERSION };
             }
-            else
-                Configuration = new LegacySkinConfiguration { LegacyVersion = LegacySkinConfiguration.LATEST_VERSION };
 
             if (storage != null)
             {
@@ -105,6 +120,15 @@ namespace osu.Game.Skinning
                 case SkinCustomColourLookup customColour:
                     return SkinUtils.As<TValue>(getCustomColour(customColour.Lookup.ToString()));
 
+                case LegacyManiaSkinConfigurationLookup legacy:
+                    if (!AllowManiaSkin)
+                        return null;
+
+                    if (!maniaConfigurations.TryGetValue(legacy.Keys, out _))
+                        maniaConfigurations[legacy.Keys] = new LegacyManiaSkinConfiguration(legacy.Keys);
+
+                    break;
+
                 default:
                     // handles lookups like GlobalSkinConfiguration
 

From 44727eb2b831c51cb339ed1ca1c2dfd96387fbb4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Mar 2020 23:14:30 +0900
Subject: [PATCH 01818/10326] Implement column background skinning

---
 .../Skinning/TestSceneColumnBackground.cs     |  49 +++++++
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |   1 +
 .../Skinning/LegacyColumnBackground.cs        | 133 ++++++++++++++++++
 .../Skinning/ManiaLegacySkinTransformer.cs    |   8 +-
 osu.Game.Rulesets.Mania/UI/Column.cs          |   8 +-
 .../UI/Components/DefaultColumnBackground.cs  |  90 ++++++++++++
 .../LegacyManiaSkinConfigurationLookup.cs     |   3 +
 7 files changed, 288 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
 create mode 100644 osu.Game.Rulesets.Mania/UI/Components/DefaultColumnBackground.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
new file mode 100644
index 0000000000..ca323b5911
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.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.Game.Rulesets.Mania.UI.Components;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    public class TestSceneColumnBackground : ManiaSkinnableTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            SetContents(() => new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Size = new Vector2(0.8f),
+                Direction = FillDirection.Horizontal,
+                Children = new Drawable[]
+                {
+                    new ColumnTestContainer(0, ManiaAction.Key1)
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Width = 0.5f,
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    },
+                    new ColumnTestContainer(1, ManiaAction.Key2)
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Width = 0.5f,
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 5340ebc01f..ca932c5319 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -19,5 +19,6 @@ namespace osu.Game.Rulesets.Mania
 
     public enum ManiaSkinComponents
     {
+        ColumnBackground
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
new file mode 100644
index 0000000000..96b28964d3
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -0,0 +1,133 @@
+// Copyright (c) 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.Input.Bindings;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class LegacyColumnBackground : CompositeDrawable, IKeyBindingHandler<ManiaAction>
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Container lightContainer;
+        private Sprite light;
+
+        [Resolved]
+        private Column column { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private ManiaStage stage { get; set; }
+
+        public LegacyColumnBackground()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        {
+            string lightImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
+                                    new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LightImage, 0))?.Value
+                                ?? "mania-stage-light";
+
+            float leftLineWidth = skin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
+                                          new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LeftLineWidth, column.Index))
+                                      ?.Value ?? 1;
+            float rightLineWidth = skin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
+                                           new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.RightLineWidth, column.Index))
+                                       ?.Value ?? 1;
+
+            bool hasLeftLine = leftLineWidth > 0;
+            bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
+                                || stage == null || column.Index == stage.Columns.Count - 1;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black
+                },
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = leftLineWidth,
+                    Alpha = hasLeftLine ? 1 : 0
+                },
+                new Box
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    RelativeSizeAxes = Axes.Y,
+                    Width = rightLineWidth,
+                    Alpha = hasRightLine ? 1 : 0
+                },
+                lightContainer = new Container
+                {
+                    Origin = Anchor.BottomCentre,
+                    RelativeSizeAxes = Axes.Both,
+                    Child = light = new Sprite
+                    {
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        Texture = skin.GetTexture(lightImage),
+                        RelativeSizeAxes = Axes.X,
+                        Width = 1,
+                        Alpha = 0
+                    }
+                }
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (direction.NewValue == ScrollingDirection.Up)
+            {
+                lightContainer.Anchor = Anchor.TopCentre;
+                lightContainer.Scale = new Vector2(1, -1);
+            }
+            else
+            {
+                lightContainer.Anchor = Anchor.BottomCentre;
+                lightContainer.Scale = Vector2.One;
+            }
+        }
+
+        public bool OnPressed(ManiaAction action)
+        {
+            if (action == column.Action.Value)
+            {
+                light.FadeIn();
+                light.ScaleTo(Vector2.One);
+            }
+
+            return false;
+        }
+
+        public void OnReleased(ManiaAction action)
+        {
+            // Todo: Should be 400 * 100 / CurrentBPM
+            const double animation_length = 250;
+
+            if (action == column.Action.Value)
+            {
+                light.FadeTo(0, animation_length);
+                light.ScaleTo(new Vector2(1, 0), animation_length);
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index ffc69fae49..12145975f1 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -38,10 +38,16 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 case GameplaySkinComponent<HitResult> resultComponent:
                     return getResult(resultComponent);
 
-                case ManiaSkinComponent _:
+                case ManiaSkinComponent maniaComponent:
                     if (!isLegacySkin.Value)
                         return null;
 
+                    switch (maniaComponent.Component)
+                    {
+                        case ManiaSkinComponents.ColumnBackground:
+                            return new LegacyColumnBackground();
+                    }
+
                     break;
             }
 
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 0eccd27944..70e2782a7b 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
@@ -32,7 +33,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public readonly Bindable<ManiaAction> Action = new Bindable<ManiaAction>();
 
-        private readonly ColumnBackground background;
         private readonly ColumnKeyArea keyArea;
         private readonly ColumnHitObjectArea hitObjectArea;
 
@@ -46,7 +46,10 @@ namespace osu.Game.Rulesets.Mania.UI
             RelativeSizeAxes = Axes.Y;
             Width = COLUMN_WIDTH;
 
-            background = new ColumnBackground { RelativeSizeAxes = Axes.Both };
+            Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
+            {
+                RelativeSizeAxes = Axes.Both
+            };
 
             Container hitTargetContainer;
 
@@ -130,7 +133,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
                 accentColour = value;
 
-                background.AccentColour = value;
                 keyArea.AccentColour = value;
                 hitObjectArea.AccentColour = value;
             }
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultColumnBackground.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultColumnBackground.cs
new file mode 100644
index 0000000000..4b4bc157d5
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultColumnBackground.cs
@@ -0,0 +1,90 @@
+// Copyright (c) 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.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.UI.Components
+{
+    public class DefaultColumnBackground : CompositeDrawable, IKeyBindingHandler<ManiaAction>
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Color4 brightColour;
+        private Color4 dimColour;
+
+        private Box background;
+        private Box backgroundOverlay;
+
+        [Resolved]
+        private Column column { get; set; }
+
+        public DefaultColumnBackground()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            InternalChildren = new[]
+            {
+                background = new Box
+                {
+                    Name = "Background",
+                    RelativeSizeAxes = Axes.Both,
+                },
+                backgroundOverlay = new Box
+                {
+                    Name = "Background Gradient Overlay",
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.5f,
+                    Blending = BlendingParameters.Additive,
+                    Alpha = 0
+                }
+            };
+
+            background.Colour = column.AccentColour.Darken(5);
+            brightColour = column.AccentColour.Opacity(0.6f);
+            dimColour = column.AccentColour.Opacity(0);
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (direction.NewValue == ScrollingDirection.Up)
+            {
+                backgroundOverlay.Anchor = backgroundOverlay.Origin = Anchor.TopLeft;
+                backgroundOverlay.Colour = ColourInfo.GradientVertical(brightColour, dimColour);
+            }
+            else
+            {
+                backgroundOverlay.Anchor = backgroundOverlay.Origin = Anchor.BottomLeft;
+                backgroundOverlay.Colour = ColourInfo.GradientVertical(dimColour, brightColour);
+            }
+        }
+
+        public bool OnPressed(ManiaAction action)
+        {
+            if (action == column.Action.Value)
+                backgroundOverlay.FadeTo(1, 50, Easing.OutQuint).Then().FadeTo(0.5f, 250, Easing.OutQuint);
+            return false;
+        }
+
+        public void OnReleased(ManiaAction action)
+        {
+            if (action == column.Action.Value)
+                backgroundOverlay.FadeTo(0, 250, Easing.OutQuint);
+        }
+    }
+}
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index bbdd445f66..9e83217afc 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -19,5 +19,8 @@ namespace osu.Game.Skinning
 
     public enum LegacyManiaSkinConfigurationLookups
     {
+        LightImage,
+        LeftLineWidth,
+        RightLineWidth
     }
 }

From cb1513b37466189fad1044a429a80516200a12a1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 11:23:33 +0900
Subject: [PATCH 01819/10326] Add mania key area skinning

---
 .../Skinning/TestSceneKeyArea.cs              |  58 ++++++++
 .../TestSceneColumn.cs                        |   1 -
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |   1 +
 .../Skinning/LegacyKeyArea.cs                 | 113 ++++++++++++++++
 .../Skinning/ManiaLegacySkinTransformer.cs    |   8 +-
 osu.Game.Rulesets.Mania/UI/Column.cs          |  10 +-
 .../UI/Components/ColumnKeyArea.cs            | 124 ------------------
 .../UI/Components/DefaultKeyArea.cs           | 114 ++++++++++++++++
 .../LegacyManiaSkinConfigurationLookup.cs     |   2 +
 9 files changed, 298 insertions(+), 133 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
 delete mode 100644 osu.Game.Rulesets.Mania/UI/Components/ColumnKeyArea.cs
 create mode 100644 osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
new file mode 100644
index 0000000000..1e6f00205a
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
@@ -0,0 +1,58 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.Skinning;
+using osu.Game.Rulesets.Mania.UI.Components;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    public class TestSceneKeyArea : ManiaSkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DefaultKeyArea),
+            typeof(LegacyKeyArea)
+        };
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            SetContents(() => new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Size = new Vector2(0.8f),
+                Direction = FillDirection.Horizontal,
+                Children = new Drawable[]
+                {
+                    new ColumnTestContainer(0, ManiaAction.Key1)
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Width = 0.5f,
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        },
+                    },
+                    new ColumnTestContainer(1, ManiaAction.Key2)
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Width = 0.5f,
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        },
+                    },
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index d94a986dae..9aad08c433 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             typeof(Column),
             typeof(ColumnBackground),
-            typeof(ColumnKeyArea),
             typeof(ColumnHitObjectArea)
         };
 
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 5340ebc01f..da5993ef26 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -19,5 +19,6 @@ namespace osu.Game.Rulesets.Mania
 
     public enum ManiaSkinComponents
     {
+        KeyArea
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
new file mode 100644
index 0000000000..8a57953d60
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
@@ -0,0 +1,113 @@
+// Copyright (c) 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.Bindings;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class LegacyKeyArea : CompositeDrawable, IKeyBindingHandler<ManiaAction>
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Container directionContainer;
+        private Sprite upSprite;
+        private Sprite downSprite;
+
+        [Resolved(CanBeNull = true)]
+        private ManiaStage stage { get; set; }
+
+        [Resolved]
+        private Column column { get; set; }
+
+        public LegacyKeyArea()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        {
+            int fallbackColumn = column.Index % 2 + 1;
+
+            string upImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
+                                 new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.KeyImage, column.Index))?.Value
+                             ?? $"mania-key{fallbackColumn}";
+
+            string downImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
+                                   new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.KeyImageDown, column.Index))?.Value
+                               ?? $"mania-key{fallbackColumn}D";
+
+            InternalChild = directionContainer = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Children = new Drawable[]
+                {
+                    upSprite = new Sprite
+                    {
+                        Origin = Anchor.BottomCentre,
+                        Texture = skin.GetTexture(upImage),
+                        RelativeSizeAxes = Axes.X,
+                        Width = 1
+                    },
+                    downSprite = new Sprite
+                    {
+                        Origin = Anchor.BottomCentre,
+                        Texture = skin.GetTexture(downImage),
+                        RelativeSizeAxes = Axes.X,
+                        Width = 1,
+                        Alpha = 0
+                    }
+                }
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (direction.NewValue == ScrollingDirection.Up)
+            {
+                directionContainer.Anchor = directionContainer.Origin = Anchor.TopCentre;
+                upSprite.Anchor = downSprite.Anchor = Anchor.TopCentre;
+                upSprite.Scale = downSprite.Scale = new Vector2(1, -1);
+            }
+            else
+            {
+                directionContainer.Anchor = directionContainer.Origin = Anchor.BottomCentre;
+                upSprite.Anchor = downSprite.Anchor = Anchor.BottomCentre;
+                upSprite.Scale = downSprite.Scale = Vector2.One;
+            }
+        }
+
+        public bool OnPressed(ManiaAction action)
+        {
+            if (action == column.Action.Value)
+            {
+                upSprite.FadeTo(0);
+                downSprite.FadeTo(1);
+            }
+
+            return false;
+        }
+
+        public void OnReleased(ManiaAction action)
+        {
+            if (action == column.Action.Value)
+            {
+                upSprite.FadeTo(1);
+                downSprite.FadeTo(0);
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index ffc69fae49..b71e7b9f14 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -38,10 +38,16 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 case GameplaySkinComponent<HitResult> resultComponent:
                     return getResult(resultComponent);
 
-                case ManiaSkinComponent _:
+                case ManiaSkinComponent maniaComponent:
                     if (!isLegacySkin.Value)
                         return null;
 
+                    switch (maniaComponent.Component)
+                    {
+                        case ManiaSkinComponents.KeyArea:
+                            return new LegacyKeyArea();
+                    }
+
                     break;
             }
 
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 0eccd27944..62c1afde7d 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
@@ -33,7 +34,6 @@ namespace osu.Game.Rulesets.Mania.UI
         public readonly Bindable<ManiaAction> Action = new Bindable<ManiaAction>();
 
         private readonly ColumnBackground background;
-        private readonly ColumnKeyArea keyArea;
         private readonly ColumnHitObjectArea hitObjectArea;
 
         internal readonly Container TopLevelContainer;
@@ -71,10 +71,9 @@ namespace osu.Game.Rulesets.Mania.UI
                         }
                     }
                 },
-                keyArea = new ColumnKeyArea
+                new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
                 {
-                    RelativeSizeAxes = Axes.X,
-                    Height = ManiaStage.HIT_TARGET_POSITION,
+                    RelativeSizeAxes = Axes.Both
                 },
                 background,
                 TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
@@ -95,8 +94,6 @@ namespace osu.Game.Rulesets.Mania.UI
                     Top = dir.NewValue == ScrollingDirection.Up ? NotePiece.NOTE_HEIGHT / 2 : 0,
                     Bottom = dir.NewValue == ScrollingDirection.Down ? NotePiece.NOTE_HEIGHT / 2 : 0
                 };
-
-                keyArea.Anchor = keyArea.Origin = dir.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
             }, true);
         }
 
@@ -131,7 +128,6 @@ namespace osu.Game.Rulesets.Mania.UI
                 accentColour = value;
 
                 background.AccentColour = value;
-                keyArea.AccentColour = value;
                 hitObjectArea.AccentColour = value;
             }
         }
diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnKeyArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnKeyArea.cs
deleted file mode 100644
index 60fc2713b3..0000000000
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnKeyArea.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.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Bindings;
-using osu.Game.Graphics;
-using osu.Game.Rulesets.UI.Scrolling;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Rulesets.Mania.UI.Components
-{
-    public class ColumnKeyArea : CompositeDrawable, IKeyBindingHandler<ManiaAction>, IHasAccentColour
-    {
-        private const float key_icon_size = 10;
-        private const float key_icon_corner_radius = 3;
-
-        private readonly IBindable<ManiaAction> action = new Bindable<ManiaAction>();
-        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-
-        private Container keyIcon;
-
-        [BackgroundDependencyLoader]
-        private void load(IBindable<ManiaAction> action, IScrollingInfo scrollingInfo)
-        {
-            this.action.BindTo(action);
-
-            Drawable gradient;
-
-            InternalChildren = new[]
-            {
-                gradient = new Box
-                {
-                    Name = "Key gradient",
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0.5f
-                },
-                keyIcon = new Container
-                {
-                    Name = "Key icon",
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(key_icon_size),
-                    Masking = true,
-                    CornerRadius = key_icon_corner_radius,
-                    BorderThickness = 2,
-                    BorderColour = Color4.White, // Not true
-                    Children = new[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            AlwaysPresent = true
-                        }
-                    }
-                }
-            };
-
-            direction.BindTo(scrollingInfo.Direction);
-            direction.BindValueChanged(dir =>
-            {
-                gradient.Colour = ColourInfo.GradientVertical(
-                    dir.NewValue == ScrollingDirection.Up ? Color4.Black : Color4.Black.Opacity(0),
-                    dir.NewValue == ScrollingDirection.Up ? Color4.Black.Opacity(0) : Color4.Black);
-            }, true);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateColours();
-        }
-
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => accentColour;
-            set
-            {
-                if (accentColour == value)
-                    return;
-
-                accentColour = value;
-
-                updateColours();
-            }
-        }
-
-        private void updateColours()
-        {
-            if (!IsLoaded)
-                return;
-
-            keyIcon.EdgeEffect = new EdgeEffectParameters
-            {
-                Type = EdgeEffectType.Glow,
-                Radius = 5,
-                Colour = accentColour.Opacity(0.5f),
-            };
-        }
-
-        public bool OnPressed(ManiaAction action)
-        {
-            if (action == this.action.Value)
-                keyIcon.ScaleTo(1.4f, 50, Easing.OutQuint).Then().ScaleTo(1.3f, 250, Easing.OutQuint);
-            return false;
-        }
-
-        public void OnReleased(ManiaAction action)
-        {
-            if (action == this.action.Value)
-                keyIcon.ScaleTo(1f, 125, Easing.OutQuint);
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
new file mode 100644
index 0000000000..982a18cb60
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.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.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.UI.Components
+{
+    public class DefaultKeyArea : CompositeDrawable, IKeyBindingHandler<ManiaAction>
+    {
+        private const float key_icon_size = 10;
+        private const float key_icon_corner_radius = 3;
+
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Container directionContainer;
+        private Container keyIcon;
+        private Drawable gradient;
+
+        [Resolved]
+        private Column column { get; set; }
+
+        public DefaultKeyArea()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            InternalChild = directionContainer = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = ManiaStage.HIT_TARGET_POSITION,
+                Children = new[]
+                {
+                    gradient = new Box
+                    {
+                        Name = "Key gradient",
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0.5f
+                    },
+                    keyIcon = new Container
+                    {
+                        Name = "Key icon",
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(key_icon_size),
+                        Masking = true,
+                        CornerRadius = key_icon_corner_radius,
+                        BorderThickness = 2,
+                        BorderColour = Color4.White, // Not true
+                        Children = new[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                                AlwaysPresent = true
+                            }
+                        }
+                    }
+                }
+            };
+
+            keyIcon.EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Radius = 5,
+                Colour = column.AccentColour.Opacity(0.5f),
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (direction.NewValue == ScrollingDirection.Up)
+            {
+                directionContainer.Anchor = directionContainer.Origin = Anchor.TopLeft;
+                gradient.Colour = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0));
+            }
+            else
+            {
+                directionContainer.Anchor = directionContainer.Origin = Anchor.BottomLeft;
+                gradient.Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0), Color4.Black);
+            }
+        }
+
+        public bool OnPressed(ManiaAction action)
+        {
+            if (action == column.Action.Value)
+                keyIcon.ScaleTo(1.4f, 50, Easing.OutQuint).Then().ScaleTo(1.3f, 250, Easing.OutQuint);
+            return false;
+        }
+
+        public void OnReleased(ManiaAction action)
+        {
+            if (action == column.Action.Value)
+                keyIcon.ScaleTo(1f, 125, Easing.OutQuint);
+        }
+    }
+}
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index bbdd445f66..bdb016d3b1 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -19,5 +19,7 @@ namespace osu.Game.Skinning
 
     public enum LegacyManiaSkinConfigurationLookups
     {
+        KeyImage,
+        KeyImageDown
     }
 }

From 6d4f9247ea5e36d163c05b5fecc4b84f6a0447fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 11:49:18 +0900
Subject: [PATCH 01820/10326] Revert "Remove osu!catch GotoFrame usage"

This reverts commit 4406f441654726dd21c810349b0eeb6935ba7d65.
---
 osu.Game.Rulesets.Catch/UI/Catcher.cs     | 5 +----
 osu.Game/Skinning/LegacySkinExtensions.cs | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index bc0311bd2d..e361b29a9d 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
-using osu.Framework.Timing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
@@ -380,9 +379,7 @@ namespace osu.Game.Rulesets.Catch.UI
             }
 
             currentCatcher.Show();
-
-            if (currentCatcher.Drawable.Clock is FramedOffsetClock offsetClock)
-                offsetClock.Offset = -Time.Current;
+            (currentCatcher.Drawable as IAnimation)?.GotoFrame(0);
         }
 
         private void beginTrail()
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index de0add6ba3..8765b161d4 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -71,8 +71,6 @@ namespace osu.Game.Skinning
 
                 if (timeReference != null)
                     Clock = new FramedOffsetClock(timeReference.Clock) { Offset = -timeReference.AnimationStartTime };
-                else
-                    Clock = new FramedOffsetClock(Clock);
             }
         }
 

From 02237133cb2bc7421363c4f839bebfc784fbd54c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 12:17:44 +0900
Subject: [PATCH 01821/10326] Implement mania hit target skinning

---
 .../Skinning/TestSceneColumnHitObjectArea.cs  |  49 +++++++
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |   1 +
 .../Skinning/LegacyHitTarget.cs               |  69 ++++++++++
 .../Skinning/ManiaLegacySkinTransformer.cs    |   8 +-
 osu.Game.Rulesets.Mania/UI/Column.cs          |  41 +-----
 .../UI/Components/ColumnHitObjectArea.cs      | 129 +++++-------------
 .../UI/Components/DefaultHitTarget.cs         |  80 +++++++++++
 osu.Game.Rulesets.Mania/UI/HitExplosion.cs    |   2 +-
 .../LegacyManiaSkinConfigurationLookup.cs     |   2 +
 osu.Game/Skinning/LegacySkin.cs               |  10 +-
 10 files changed, 252 insertions(+), 139 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
 create mode 100644 osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs
new file mode 100644
index 0000000000..5d05bca03e
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.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.Game.Rulesets.Mania.UI.Components;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    public class TestSceneColumnHitObjectArea : ManiaSkinnableTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            SetContents(() => new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Size = new Vector2(0.8f),
+                Direction = FillDirection.Horizontal,
+                Children = new Drawable[]
+                {
+                    new ColumnTestContainer(0, ManiaAction.Key1)
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Width = 0.5f,
+                        Child = new ColumnHitObjectArea(new HitObjectContainer())
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    },
+                    new ColumnTestContainer(1, ManiaAction.Key2)
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Width = 0.5f,
+                        Child = new ColumnHitObjectArea(new HitObjectContainer())
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 5340ebc01f..efea386801 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -19,5 +19,6 @@ namespace osu.Game.Rulesets.Mania
 
     public enum ManiaSkinComponents
     {
+        HitTarget
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
new file mode 100644
index 0000000000..667245ce2e
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -0,0 +1,69 @@
+// Copyright (c) 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.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class LegacyHitTarget : CompositeDrawable
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        [Resolved(CanBeNull = true)]
+        private ManiaStage stage { get; set; }
+
+        private Container directionContainer;
+
+        public LegacyHitTarget()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        {
+            string targetImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
+                                     new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.HitTargetImage))?.Value
+                                 ?? "mania-stage-hint";
+
+            InternalChild = directionContainer = new Container
+            {
+                Origin = Anchor.CentreLeft,
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Child = new Sprite
+                {
+                    Texture = skin.GetTexture(targetImage),
+                    Scale = new Vector2(1, 0.9f * 1.6025f),
+                    RelativeSizeAxes = Axes.X,
+                    Width = 1
+                }
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (direction.NewValue == ScrollingDirection.Up)
+            {
+                directionContainer.Anchor = Anchor.TopLeft;
+                directionContainer.Scale = new Vector2(1, -1);
+            }
+            else
+            {
+                directionContainer.Anchor = Anchor.BottomLeft;
+                directionContainer.Scale = Vector2.One;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index ffc69fae49..b7b515241e 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -38,10 +38,16 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 case GameplaySkinComponent<HitResult> resultComponent:
                     return getResult(resultComponent);
 
-                case ManiaSkinComponent _:
+                case ManiaSkinComponent maniaComponent:
                     if (!isLegacySkin.Value)
                         return null;
 
+                    switch (maniaComponent.Component)
+                    {
+                        case ManiaSkinComponents.HitTarget:
+                            return new LegacyHitTarget();
+                    }
+
                     break;
             }
 
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 0eccd27944..7d064657f4 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -12,7 +12,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
@@ -32,12 +31,11 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public readonly Bindable<ManiaAction> Action = new Bindable<ManiaAction>();
 
+        private readonly ColumnHitObjectArea hitObjectArea;
         private readonly ColumnBackground background;
         private readonly ColumnKeyArea keyArea;
-        private readonly ColumnHitObjectArea hitObjectArea;
 
         internal readonly Container TopLevelContainer;
-        private readonly Container explosionContainer;
 
         public Column(int index)
         {
@@ -48,29 +46,11 @@ namespace osu.Game.Rulesets.Mania.UI
 
             background = new ColumnBackground { RelativeSizeAxes = Axes.Both };
 
-            Container hitTargetContainer;
-
             InternalChildren = new[]
             {
                 // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
                 background.CreateProxy(),
-                hitTargetContainer = new Container
-                {
-                    Name = "Hit target + hit objects",
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        hitObjectArea = new ColumnHitObjectArea(HitObjectContainer)
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        explosionContainer = new Container
-                        {
-                            Name = "Hit explosions",
-                            RelativeSizeAxes = Axes.Both,
-                        }
-                    }
-                },
+                hitObjectArea = new ColumnHitObjectArea(HitObjectContainer) { RelativeSizeAxes = Axes.Both },
                 keyArea = new ColumnKeyArea
                 {
                     RelativeSizeAxes = Axes.X,
@@ -80,22 +60,10 @@ namespace osu.Game.Rulesets.Mania.UI
                 TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
             };
 
-            TopLevelContainer.Add(explosionContainer.CreateProxy());
+            TopLevelContainer.Add(hitObjectArea.Explosions.CreateProxy());
 
             Direction.BindValueChanged(dir =>
             {
-                hitTargetContainer.Padding = new MarginPadding
-                {
-                    Top = dir.NewValue == ScrollingDirection.Up ? ManiaStage.HIT_TARGET_POSITION : 0,
-                    Bottom = dir.NewValue == ScrollingDirection.Down ? ManiaStage.HIT_TARGET_POSITION : 0,
-                };
-
-                explosionContainer.Padding = new MarginPadding
-                {
-                    Top = dir.NewValue == ScrollingDirection.Up ? NotePiece.NOTE_HEIGHT / 2 : 0,
-                    Bottom = dir.NewValue == ScrollingDirection.Down ? NotePiece.NOTE_HEIGHT / 2 : 0
-                };
-
                 keyArea.Anchor = keyArea.Origin = dir.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
             }, true);
         }
@@ -132,7 +100,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
                 background.AccentColour = value;
                 keyArea.AccentColour = value;
-                hitObjectArea.AccentColour = value;
             }
         }
 
@@ -169,7 +136,7 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!result.IsHit || !judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            explosionContainer.Add(new HitExplosion(judgedObject.AccentColour.Value, judgedObject is DrawableHoldNoteTick)
+            hitObjectArea.Explosions.Add(new HitExplosion(judgedObject.AccentColour.Value, judgedObject is DrawableHoldNoteTick)
             {
                 Anchor = Direction.Value == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre,
                 Origin = Anchor.Centre
diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
index 90e78c3899..51928f8b66 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
@@ -3,34 +3,35 @@
 
 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.Graphics;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osuTK.Graphics;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.UI.Components
 {
-    public class ColumnHitObjectArea : CompositeDrawable, IHasAccentColour
+    public class ColumnHitObjectArea : SkinReloadableDrawable
     {
-        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+        public readonly Container<HitExplosion> Explosions;
 
+        [Resolved(CanBeNull = true)]
+        private ManiaStage stage { get; set; }
+
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
         private readonly Drawable hitTarget;
 
         public ColumnHitObjectArea(HitObjectContainer hitObjectContainer)
         {
             InternalChildren = new[]
             {
-                hitTarget = new DefaultHitTarget
+                hitTarget = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitTarget), _ => new DefaultHitTarget())
                 {
                     RelativeSizeAxes = Axes.X,
                 },
-                hitObjectContainer
+                hitObjectContainer,
+                Explosions = new Container<HitExplosion> { RelativeSizeAxes = Axes.Both }
             };
         }
 
@@ -38,107 +39,39 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         private void load(IScrollingInfo scrollingInfo)
         {
             direction.BindTo(scrollingInfo.Direction);
-            direction.BindValueChanged(dir =>
-            {
-                Anchor anchor = dir.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
-
-                hitTarget.Anchor = hitTarget.Origin = anchor;
-            }, true);
+            direction.BindValueChanged(onDirectionChanged, true);
         }
 
-        private Color4 accentColour;
-
-        public Color4 AccentColour
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
-            get => accentColour;
-            set
-            {
-                if (accentColour == value)
-                    return;
-
-                accentColour = value;
-
-                if (hitTarget is IHasAccentColour colouredHitTarget)
-                    colouredHitTarget.AccentColour = accentColour;
-            }
+            base.SkinChanged(skin, allowFallback);
+            updateHitPosition();
         }
 
-        private class DefaultHitTarget : CompositeDrawable, IHasAccentColour
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
         {
-            private const float hit_target_bar_height = 2;
+            updateHitPosition();
+        }
 
-            private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+        private void updateHitPosition()
+        {
+            float hitPosition = CurrentSkin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
+                                    new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.HitPosition))?.Value
+                                ?? ManiaStage.HIT_TARGET_POSITION;
 
-            private readonly Container hitTargetLine;
-            private readonly Drawable hitTargetBar;
-
-            public DefaultHitTarget()
+            if (direction.Value == ScrollingDirection.Up)
             {
-                InternalChildren = new[]
-                {
-                    hitTargetBar = new Box
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Height = NotePiece.NOTE_HEIGHT,
-                        Alpha = 0.6f,
-                        Colour = Color4.Black
-                    },
-                    hitTargetLine = new Container
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Height = hit_target_bar_height,
-                        Masking = true,
-                        Child = new Box { RelativeSizeAxes = Axes.Both }
-                    },
-                };
+                hitTarget.Anchor = hitTarget.Origin = Anchor.TopLeft;
+
+                Padding = new MarginPadding { Top = hitPosition };
+                Explosions.Padding = new MarginPadding { Top = NotePiece.NOTE_HEIGHT };
             }
-
-            [BackgroundDependencyLoader]
-            private void load(IScrollingInfo scrollingInfo)
+            else
             {
-                direction.BindTo(scrollingInfo.Direction);
-                direction.BindValueChanged(dir =>
-                {
-                    Anchor anchor = dir.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+                hitTarget.Anchor = hitTarget.Origin = Anchor.BottomLeft;
 
-                    hitTargetBar.Anchor = hitTargetBar.Origin = anchor;
-                    hitTargetLine.Anchor = hitTargetLine.Origin = anchor;
-                }, true);
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                updateColours();
-            }
-
-            private Color4 accentColour;
-
-            public Color4 AccentColour
-            {
-                get => accentColour;
-                set
-                {
-                    if (accentColour == value)
-                        return;
-
-                    accentColour = value;
-
-                    updateColours();
-                }
-            }
-
-            private void updateColours()
-            {
-                if (!IsLoaded)
-                    return;
-
-                hitTargetLine.EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Glow,
-                    Radius = 5,
-                    Colour = accentColour.Opacity(0.5f),
-                };
+                Padding = new MarginPadding { Bottom = hitPosition };
+                Explosions.Padding = new MarginPadding { Bottom = NotePiece.NOTE_HEIGHT };
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs
new file mode 100644
index 0000000000..d96b4d864b
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs
@@ -0,0 +1,80 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.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.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.UI.Components
+{
+    public class DefaultHitTarget : CompositeDrawable
+    {
+        private const float hit_target_bar_height = 2;
+
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Container hitTargetLine;
+        private Drawable hitTargetBar;
+
+        [Resolved]
+        private Column column { get; set; }
+
+        public DefaultHitTarget()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            InternalChildren = new[]
+            {
+                hitTargetBar = new Box
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = NotePiece.NOTE_HEIGHT,
+                    Alpha = 0.6f,
+                    Colour = Color4.Black
+                },
+                hitTargetLine = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = hit_target_bar_height,
+                    Masking = true,
+                    Child = new Box { RelativeSizeAxes = Axes.Both }
+                },
+            };
+
+            hitTargetLine.EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Radius = 5,
+                Colour = column.AccentColour.Opacity(0.5f),
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (direction.NewValue == ScrollingDirection.Up)
+            {
+                hitTargetBar.Anchor = hitTargetBar.Origin = Anchor.TopLeft;
+                hitTargetLine.Anchor = hitTargetLine.Origin = Anchor.TopLeft;
+            }
+            else
+            {
+                hitTargetBar.Anchor = hitTargetBar.Origin = Anchor.BottomLeft;
+                hitTargetLine.Anchor = hitTargetLine.Origin = Anchor.BottomLeft;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/HitExplosion.cs b/osu.Game.Rulesets.Mania/UI/HitExplosion.cs
index 35de47e208..c26697fa79 100644
--- a/osu.Game.Rulesets.Mania/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/HitExplosion.cs
@@ -12,7 +12,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
-    internal class HitExplosion : CompositeDrawable
+    public class HitExplosion : CompositeDrawable
     {
         public override bool RemoveWhenNotAlive => true;
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index bbdd445f66..72cbdb7a18 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -19,5 +19,7 @@ namespace osu.Game.Skinning
 
     public enum LegacyManiaSkinConfigurationLookups
     {
+        HitPosition,
+        HitTargetImage
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index fe190740b3..75ce983b65 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -124,8 +124,14 @@ namespace osu.Game.Skinning
                     if (!AllowManiaSkin)
                         return null;
 
-                    if (!maniaConfigurations.TryGetValue(legacy.Keys, out _))
-                        maniaConfigurations[legacy.Keys] = new LegacyManiaSkinConfiguration(legacy.Keys);
+                    if (!maniaConfigurations.TryGetValue(legacy.Keys, out var existing))
+                        maniaConfigurations[legacy.Keys] = existing = new LegacyManiaSkinConfiguration(legacy.Keys);
+
+                    switch (legacy.Lookup)
+                    {
+                        case LegacyManiaSkinConfigurationLookups.HitPosition:
+                            return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));
+                    }
 
                     break;
 

From 71387016b2f35b878a3812d8afcc7c60db815dd1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 12:26:31 +0900
Subject: [PATCH 01822/10326] Add missing judgement line

---
 .../Skinning/LegacyHitTarget.cs               | 25 +++++++++++++++----
 .../Skinning/LegacyManiaSkinConfiguration.cs  |  1 +
 .../LegacyManiaSkinConfigurationLookup.cs     |  3 ++-
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs   |  4 +++
 osu.Game/Skinning/LegacySkin.cs               |  3 +++
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index 667245ce2e..3e550808f3 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -5,6 +5,7 @@ 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.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -34,17 +35,31 @@ namespace osu.Game.Rulesets.Mania.Skinning
                                      new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.HitTargetImage))?.Value
                                  ?? "mania-stage-hint";
 
+            bool showJudgementLine = skin.GetConfig<LegacyManiaSkinConfigurationLookup, bool>(
+                                         new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.ShowJudgementLine))?.Value
+                                     ?? true;
+
             InternalChild = directionContainer = new Container
             {
                 Origin = Anchor.CentreLeft,
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
-                Child = new Sprite
+                Children = new Drawable[]
                 {
-                    Texture = skin.GetTexture(targetImage),
-                    Scale = new Vector2(1, 0.9f * 1.6025f),
-                    RelativeSizeAxes = Axes.X,
-                    Width = 1
+                    new Sprite
+                    {
+                        Texture = skin.GetTexture(targetImage),
+                        Scale = new Vector2(1, 0.9f * 1.6025f),
+                        RelativeSizeAxes = Axes.X,
+                        Width = 1
+                    },
+                    new Box
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        RelativeSizeAxes = Axes.X,
+                        Height = 1,
+                        Alpha = showJudgementLine ? 0.9f : 0
+                    }
                 }
             };
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 5dd185879b..56d2652e76 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Skinning
         public readonly float[] ColumnWidth;
 
         public float HitPosition = 124.8f; // (480 - 402) * 1.6f
+        public bool ShowJudgementLine = true;
 
         public LegacyManiaSkinConfiguration(int keys)
         {
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 72cbdb7a18..33c88f3920 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Skinning
     public enum LegacyManiaSkinConfigurationLookups
     {
         HitPosition,
-        HitTargetImage
+        HitTargetImage,
+        ShowJudgementLine
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index ae6c8eeb15..2c6b76847d 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -90,6 +90,10 @@ namespace osu.Game.Skinning
                     case "HitPosition":
                         currentConfig.HitPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * size_scale_factor;
                         break;
+
+                    case "JudgementLine":
+                        currentConfig.ShowJudgementLine = pair.Value == "1";
+                        break;
                 }
             }
         }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 75ce983b65..94caa78e6d 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -131,6 +131,9 @@ namespace osu.Game.Skinning
                     {
                         case LegacyManiaSkinConfigurationLookups.HitPosition:
                             return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));
+
+                        case LegacyManiaSkinConfigurationLookups.ShowJudgementLine:
+                            return SkinUtils.As<TValue>(new Bindable<bool>(existing.ShowJudgementLine));
                     }
 
                     break;

From 323146e4a69489524a2e6f08da79b5607e377a30 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 11:53:17 +0800
Subject: [PATCH 01823/10326] simplify column type check logic

---
 .../Beatmaps/ColumnType.cs                    | 12 +++++
 .../Beatmaps/StageDefinition.cs               | 15 ++++++
 osu.Game.Rulesets.Mania/UI/Column.cs          | 15 +++---
 osu.Game.Rulesets.Mania/UI/ManiaStage.cs      | 47 ++++---------------
 4 files changed, 46 insertions(+), 43 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs b/osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs
new file mode 100644
index 0000000000..8f904530bc
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ColumnType.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.Mania.Beatmaps
+{
+    public enum ColumnType
+    {
+        Even,
+        Odd,
+        Special
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
index dff7cb72ce..fae422e6ea 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.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.Game.Rulesets.Mania.UI;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps
@@ -21,5 +22,19 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
         /// <param name="column">The 0-based column index.</param>
         /// <returns>Whether the column is a special column.</returns>
         public bool IsSpecialColumn(int column) => Columns % 2 == 1 && column == Columns / 2;
+
+        /// <summary>
+        /// Get the type of column given a column index.
+        /// </summary>
+        /// <param name="column">The 0-based column index.</param>
+        /// <returns>The type of the column.</returns>
+        public ColumnType GetTypeOfColumn(int column)
+        {
+            if (IsSpecialColumn(column))
+                return ColumnType.Special;
+
+            int distanceToEdge = Math.Min(column, (Columns - 1) - column);
+            return distanceToEdge % 2 == 1 ? ColumnType.Odd : ColumnType.Even;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 63c573d344..f9d3ddf9ee 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
+using osu.Game.Rulesets.Mania.Beatmaps;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -101,22 +102,24 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public override Axes RelativeSizeAxes => Axes.Y;
 
-        private bool isSpecial;
+        private ColumnType columnType;
 
-        public bool IsSpecial
+        public ColumnType ColumnType
         {
-            get => isSpecial;
+            get => columnType;
             set
             {
-                if (isSpecial == value)
+                if (columnType == value)
                     return;
 
-                isSpecial = value;
+                columnType = value;
 
-                Width = isSpecial ? special_column_width : COLUMN_WIDTH;
+                Width = IsSpecial ? special_column_width : COLUMN_WIDTH;
             }
         }
 
+        public bool IsSpecial => columnType == ColumnType.Special;
+
         private Color4 accentColour;
 
         public Color4 AccentColour
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
index bfe9f1085b..1a94462e2a 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
@@ -39,8 +39,12 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly Container topLevelContainer;
 
-        private List<Color4> normalColumnColours = new List<Color4>();
-        private Color4 specialColumnColour;
+        private readonly Dictionary<ColumnType, Color4> columnColours = new Dictionary<ColumnType, Color4>
+        {
+            { ColumnType.Even, new Color4(94, 0, 57, 255) },
+            { ColumnType.Odd, new Color4(6, 84, 0, 255) },
+            { ColumnType.Special, new Color4(0, 48, 63, 255) }
+        };
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Columns.Any(c => c.ReceivePositionalInputAt(screenSpacePos));
 
@@ -125,11 +129,12 @@ namespace osu.Game.Rulesets.Mania.UI
 
             for (int i = 0; i < definition.Columns; i++)
             {
-                var isSpecial = definition.IsSpecialColumn(i);
+                var columnType = definition.GetTypeOfColumn(i);
                 var column = new Column(firstColumnIndex + i)
                 {
-                    IsSpecial = isSpecial,
-                    Action = { Value = isSpecial ? specialColumnStartAction++ : normalColumnStartAction++ }
+                    ColumnType = columnType,
+                    AccentColour = columnColours[columnType],
+                    Action = { Value = columnType == ColumnType.Special ? specialColumnStartAction++ : normalColumnStartAction++ }
                 };
 
                 AddColumn(column);
@@ -195,38 +200,6 @@ namespace osu.Game.Rulesets.Mania.UI
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            normalColumnColours = new List<Color4>
-            {
-                new Color4(94, 0, 57, 255),
-                new Color4(6, 84, 0, 255)
-            };
-
-            specialColumnColour = new Color4(0, 48, 63, 255);
-
-            // Set the special column + colour + key
-            foreach (var column in Columns)
-            {
-                if (!column.IsSpecial)
-                    continue;
-
-                column.AccentColour = specialColumnColour;
-            }
-
-            var nonSpecialColumns = Columns.Where(c => !c.IsSpecial).ToList();
-
-            // We'll set the colours of the non-special columns in a separate loop, because the non-special
-            // column colours are mirrored across their centre and special styles mess with this
-            for (int i = 0; i < Math.Ceiling(nonSpecialColumns.Count / 2f); i++)
-            {
-                Color4 colour = normalColumnColours[i % normalColumnColours.Count];
-                nonSpecialColumns[i].AccentColour = colour;
-                nonSpecialColumns[nonSpecialColumns.Count - 1 - i].AccentColour = colour;
-            }
-        }
-
         protected override void Update()
         {
             // Due to masking differences, it is not possible to get the width of the columns container automatically

From 3fb044c3b659d4040454c9a345b18f1a9c0d9ee9 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 12:09:04 +0800
Subject: [PATCH 01824/10326] rm unnecessary usings

---
 osu.Game.Rulesets.Mania/UI/ManiaStage.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
index 1a94462e2a..63fc80cdc8 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
@@ -1,10 +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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;

From 89d8bf9780cc18aa039e7ec21e54b4d650b36601 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 13:46:20 +0900
Subject: [PATCH 01825/10326] Fix catcher test resources being at wrong dpi
 definition

---
 ...t-catcher-fail.png => fruit-catcher-fail@2x.png} | Bin
 ...t-catcher-kiai.png => fruit-catcher-kiai@2x.png} | Bin
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-fail.png => fruit-catcher-fail@2x.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-kiai.png => fruit-catcher-kiai@2x.png} (100%)

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@2x.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail@2x.png
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@2x.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai@2x.png

From 1fce7cce01639860fc028394c62b42a9ec508934 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 13:45:55 +0900
Subject: [PATCH 01826/10326] Remove ScaleDownToFit as it was not implemented
 without enough safety

---
 osu.Game.Rulesets.Catch/UI/CatcherSprite.cs    |  2 +-
 .../Gameplay/TestSceneSkinnableDrawable.cs     |  2 +-
 osu.Game/Skinning/SkinnableDrawable.cs         | 18 +++++-------------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs b/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
index 52eb8d597e..ef69e3d2d1 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatcherSprite(CatcherAnimationState state)
             : base(new CatchSkinComponent(componentFromState(state)), _ =>
-                new DefaultCatcherSprite(state), confineMode: ConfineMode.ScaleDownToFit)
+                new DefaultCatcherSprite(state), confineMode: ConfineMode.ScaleToFit)
         {
             RelativeSizeAxes = Axes.None;
             Size = new Vector2(CatcherArea.CATCHER_SIZE);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index ec94053679..d8222f2ad1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             public new Drawable Drawable => base.Drawable;
 
             public ExposedSkinnableDrawable(string name, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null,
-                                            ConfineMode confineMode = ConfineMode.ScaleDownToFit)
+                                            ConfineMode confineMode = ConfineMode.ScaleToFit)
                 : base(new TestSkinComponent(name), defaultImplementation, allowFallback, confineMode)
             {
             }
diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index fda031e6cb..68a7a8c159 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -92,20 +92,13 @@ namespace osu.Game.Skinning
 
                     switch (confineMode)
                     {
-                        case ConfineMode.NoScaling:
-                            return;
-
-                        case ConfineMode.ScaleDownToFit:
-                            if (Drawable.DrawSize.X <= DrawSize.X && Drawable.DrawSize.Y <= DrawSize.Y)
-                                return;
-
+                        case ConfineMode.ScaleToFit:
+                            Drawable.RelativeSizeAxes = Axes.Both;
+                            Drawable.Size = Vector2.One;
+                            Drawable.Scale = Vector2.One;
+                            Drawable.FillMode = FillMode.Fit;
                             break;
                     }
-
-                    Drawable.RelativeSizeAxes = Axes.Both;
-                    Drawable.Size = Vector2.One;
-                    Drawable.Scale = Vector2.One;
-                    Drawable.FillMode = FillMode.Fit;
                 }
                 finally
                 {
@@ -121,7 +114,6 @@ namespace osu.Game.Skinning
         /// Don't apply any scaling. This allows the user element to be of any size, exceeding specified bounds.
         /// </summary>
         NoScaling,
-        ScaleDownToFit,
         ScaleToFit,
     }
 }

From db59d0530ee3f4114f7e24561aa7164cdb88f767 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 14:15:25 +0900
Subject: [PATCH 01827/10326] Remove test coverage of scale down

---
 .../Visual/Gameplay/TestSceneSkinnableDrawable.cs      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index d8222f2ad1..3b91243fee 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -43,16 +43,15 @@ namespace osu.Game.Tests.Visual.Gameplay
                         {
                             new ExposedSkinnableDrawable("default", _ => new DefaultBox(), _ => true),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true),
-                            new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.ScaleToFit),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.NoScaling)
                         }
                     },
                 };
             });
 
-            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 30, 50 }));
+            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 50 }));
             AddStep("adjust scale", () => fill.Scale = new Vector2(2));
-            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 30, 50 }));
+            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 50 }));
         }
 
         [Test]
@@ -74,7 +73,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                         Children = new[]
                         {
                             new ExposedSkinnableDrawable("default", _ => new DefaultBox(), _ => true),
-                            new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.ScaleToFit),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.NoScaling)
                         }
@@ -82,9 +80,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                 };
             });
 
-            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 30, 50, 30 }));
+            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 50, 30 }));
             AddStep("adjust scale", () => fill.Scale = new Vector2(2));
-            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 30, 50, 30 }));
+            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 50, 30 }));
         }
 
         [Test]

From 275f96791dd48611599df45864993d2afa749b5c Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 13:57:37 +0800
Subject: [PATCH 01828/10326] add regression tests

---
 .../ManiaColumnTypeTest.cs                    | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/ManiaColumnTypeTest.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaColumnTypeTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaColumnTypeTest.cs
new file mode 100644
index 0000000000..40a6e1fdae
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaColumnTypeTest.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 System.Collections.Generic;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using NUnit.Framework;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class ManiaColumnTypeTest
+    {
+        [TestCase(new[]
+        {
+            ColumnType.Special
+        }, 1)]
+        [TestCase(new[]
+        {
+            ColumnType.Odd,
+            ColumnType.Even,
+            ColumnType.Even,
+            ColumnType.Odd
+        }, 4)]
+        [TestCase(new[]
+        {
+            ColumnType.Odd,
+            ColumnType.Even,
+            ColumnType.Odd,
+            ColumnType.Special,
+            ColumnType.Odd,
+            ColumnType.Even,
+            ColumnType.Odd
+        }, 7)]
+        public void Test(IEnumerable<ColumnType> expected, int columns)
+        {
+            var definition = new StageDefinition
+            {
+                Columns = columns
+            };
+            var results = getResults(definition);
+            Assert.AreEqual(expected, results);
+        }
+
+        private IEnumerable<ColumnType> getResults(StageDefinition definition)
+        {
+            for (var i = 0; i < definition.Columns; i++)
+                yield return definition.GetTypeOfColumn(i);
+        }
+    }
+}

From 2008a7bbecac158efc7c521b44d14ace6d80e28d Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 14:03:11 +0800
Subject: [PATCH 01829/10326] fix naming

---
 osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs | 2 +-
 osu.Game.Rulesets.Mania/UI/ManiaStage.cs            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
index fae422e6ea..2557f2acdf 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 return ColumnType.Special;
 
             int distanceToEdge = Math.Min(column, (Columns - 1) - column);
-            return distanceToEdge % 2 == 1 ? ColumnType.Odd : ColumnType.Even;
+            return distanceToEdge % 2 == 0 ? ColumnType.Odd : ColumnType.Even;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
index 63fc80cdc8..b27b23359e 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
@@ -39,8 +39,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly Dictionary<ColumnType, Color4> columnColours = new Dictionary<ColumnType, Color4>
         {
-            { ColumnType.Even, new Color4(94, 0, 57, 255) },
-            { ColumnType.Odd, new Color4(6, 84, 0, 255) },
+            { ColumnType.Even, new Color4(6, 84, 0, 255) },
+            { ColumnType.Odd, new Color4(94, 0, 57, 255) },
             { ColumnType.Special, new Color4(0, 48, 63, 255) }
         };
 

From 75e43acb1abfc893394c929b708cb0fbbab1add9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 15:10:15 +0900
Subject: [PATCH 01830/10326] Add a legacy element to help with texture
 fallbacks

---
 .../Skinning/LegacyManiaColumnElement.cs      | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
new file mode 100644
index 0000000000..231a55a7e2
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.UI;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    /// <summary>
+    /// A <see cref="CompositeDrawable"/> which is placed somewhere within a <see cref="Column"/>.
+    /// </summary>
+    public class LegacyManiaColumnElement : CompositeDrawable
+    {
+        [Resolved(CanBeNull = true)]
+        [CanBeNull]
+        protected ManiaStage Stage { get; private set; }
+
+        [Resolved]
+        protected Column Column { get; private set; }
+
+        /// <summary>
+        /// The column index to use for texture lookups, in the case of no user-provided configuration.
+        /// </summary>
+        protected int FallbackColumnIndex { get; private set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (Stage == null)
+                FallbackColumnIndex = Column.Index % 2 + 1;
+            else
+            {
+                int dist = Math.Min(Column.Index, Stage.Columns.Count - Column.Index - 1);
+                FallbackColumnIndex = dist % 2 + 1;
+            }
+        }
+    }
+}

From 16439f7d8eff72f8352805680735d8cc8409a90e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 15:15:49 +0900
Subject: [PATCH 01831/10326] Fix incorrect fallback index being used

---
 osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
index 8a57953d60..6afc86c4fa 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyKeyArea : CompositeDrawable, IKeyBindingHandler<ManiaAction>
+    public class LegacyKeyArea : LegacyManiaColumnElement, IKeyBindingHandler<ManiaAction>
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
@@ -36,15 +36,13 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            int fallbackColumn = column.Index % 2 + 1;
-
             string upImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
                                  new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.KeyImage, column.Index))?.Value
-                             ?? $"mania-key{fallbackColumn}";
+                             ?? $"mania-key{FallbackColumnIndex}";
 
             string downImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
                                    new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.KeyImageDown, column.Index))?.Value
-                               ?? $"mania-key{fallbackColumn}D";
+                               ?? $"mania-key{FallbackColumnIndex}D";
 
             InternalChild = directionContainer = new Container
             {

From 8a998d600d13ae64d1e838deae92b7f432d30e56 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 15:17:27 +0900
Subject: [PATCH 01832/10326] Fix relax mod pressing too many keys

---
 osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 6286c80d7c..9b0759d9d2 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             void handleHitCircle(DrawableHitCircle circle)
             {
-                if (!circle.IsHovered)
+                if (!circle.HitArea.IsHovered)
                     return;
 
                 Debug.Assert(circle.HitObject.HitWindows != null);

From bf1fc9f7a035acf9003acb3ac6b2e36a10873002 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 15:18:50 +0900
Subject: [PATCH 01833/10326] 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 fd2532257b..6db4220fad 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.330.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.331.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fdf9703d79..4163044273 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.330.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.331.0" />
     <PackageReference Include="Sentry" Version="2.1.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 a286d1d460..17430e4b25 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.330.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.331.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.330.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.331.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From ae668e3e87ad3d9d84185d74d0318b68381dcad9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 15:24:13 +0900
Subject: [PATCH 01834/10326] Fix post-merge errors

---
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs                 | 4 ++--
 .../Skinning/ManiaLegacySkinTransformer.cs                    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 55009d0f5c..72aa0dbd4c 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Rulesets.Mania
 
     public enum ManiaSkinComponents
     {
-        ColumnBackground
-        HitTarget
+        ColumnBackground,
+        HitTarget,
         KeyArea
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index a929f51966..efc95f3c24 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -46,8 +46,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     {
                         case ManiaSkinComponents.ColumnBackground:
                             return new LegacyColumnBackground();
+
                         case ManiaSkinComponents.HitTarget:
                             return new LegacyHitTarget();
+
                         case ManiaSkinComponents.KeyArea:
                             return new LegacyKeyArea();
                     }

From b926d570ee1bdacb1e7a39e758da09b11a5b4fef Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 15:28:50 +0900
Subject: [PATCH 01835/10326] Allow skinnabledrawable to be auto-sized

---
 osu.Game/Skinning/SkinnableDrawable.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index fda031e6cb..f6ac6494b4 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -18,6 +18,12 @@ namespace osu.Game.Skinning
         /// </summary>
         public Drawable Drawable { get; private set; }
 
+        public new Axes AutoSizeAxes
+        {
+            get => base.AutoSizeAxes;
+            set => base.AutoSizeAxes = value;
+        }
+
         private readonly ISkinComponent component;
 
         private readonly ConfineMode confineMode;

From c4f76ffdaf12dac914c5b94dd3547d37129b326b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 15:29:25 +0900
Subject: [PATCH 01836/10326] Implement mania note skinning

---
 .../Skinning/TestSceneHoldNote.cs             | 24 +++++
 .../Skinning/TestSceneNote.cs                 | 21 +++++
 .../TestSceneHitExplosion.cs                  |  2 +-
 .../Blueprints/Components/EditNotePiece.cs    |  4 +-
 .../Blueprints/ManiaPlacementBlueprint.cs     |  8 +-
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |  5 +-
 .../Objects/Drawables/DrawableNote.cs         | 26 ++----
 .../{NotePiece.cs => DefaultNotePiece.cs}     | 50 +++++-----
 .../Skinning/LegacyHoldNoteHeadPiece.cs       | 17 ++++
 .../Skinning/LegacyHoldNoteTailPiece.cs       | 27 ++++++
 .../Skinning/LegacyNotePiece.cs               | 93 +++++++++++++++++++
 .../Skinning/ManiaLegacySkinTransformer.cs    |  9 ++
 .../UI/Components/ColumnHitObjectArea.cs      |  4 +-
 .../UI/Components/DefaultHitTarget.cs         |  2 +-
 osu.Game.Rulesets.Mania/UI/HitExplosion.cs    |  2 +-
 .../LegacyManiaSkinConfigurationLookup.cs     |  5 +-
 16 files changed, 247 insertions(+), 52 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
 rename osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/{NotePiece.cs => DefaultNotePiece.cs} (52%)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
new file mode 100644
index 0000000000..19623a5705
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.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.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    public class TestSceneHoldNote : ManiaHitObjectTestScene
+    {
+        protected override DrawableManiaHitObject CreateHitObject()
+        {
+            var note = new HoldNote { Duration = 1000 };
+            note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            return new DrawableHoldNote(note)
+            {
+                Height = 200,
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
new file mode 100644
index 0000000000..bc3bdf0bcb
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    public class TestSceneNote : ManiaHitObjectTestScene
+    {
+        protected override DrawableManiaHitObject CreateHitObject()
+        {
+            var note = new Note();
+            note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            return new DrawableNote(note);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHitExplosion.cs
index 26a1b1b1ec..9a50bc3926 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHitExplosion.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 Origin = Anchor.Centre,
                 RelativePositionAxes = Axes.Y,
                 Y = -0.25f,
-                Size = new Vector2(Column.COLUMN_WIDTH, NotePiece.NOTE_HEIGHT),
+                Size = new Vector2(Column.COLUMN_WIDTH, DefaultNotePiece.NOTE_HEIGHT),
             };
 
             int runcount = 0;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs
index 6f85fd9167..8773a39939 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs
@@ -12,12 +12,12 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints.Components
     {
         public EditNotePiece()
         {
-            Height = NotePiece.NOTE_HEIGHT;
+            Height = DefaultNotePiece.NOTE_HEIGHT;
 
             CornerRadius = 5;
             Masking = true;
 
-            InternalChild = new NotePiece();
+            InternalChild = new DefaultNotePiece();
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index a3657d3bb9..6ddf212266 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -122,11 +122,11 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             switch (scrollingInfo.Direction.Value)
             {
                 case ScrollingDirection.Up:
-                    mousePosition.Y -= NotePiece.NOTE_HEIGHT / 2;
+                    mousePosition.Y -= DefaultNotePiece.NOTE_HEIGHT / 2;
                     break;
 
                 case ScrollingDirection.Down:
-                    mousePosition.Y += NotePiece.NOTE_HEIGHT / 2;
+                    mousePosition.Y += DefaultNotePiece.NOTE_HEIGHT / 2;
                     break;
             }
 
@@ -143,11 +143,11 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             switch (scrollingInfo.Direction.Value)
             {
                 case ScrollingDirection.Up:
-                    hitObjectPosition.Y += NotePiece.NOTE_HEIGHT / 2;
+                    hitObjectPosition.Y += DefaultNotePiece.NOTE_HEIGHT / 2;
                     break;
 
                 case ScrollingDirection.Down:
-                    hitObjectPosition.Y -= NotePiece.NOTE_HEIGHT / 2;
+                    hitObjectPosition.Y -= DefaultNotePiece.NOTE_HEIGHT / 2;
                     break;
             }
 
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 72aa0dbd4c..9df15f424d 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -21,6 +21,9 @@ namespace osu.Game.Rulesets.Mania
     {
         ColumnBackground,
         HitTarget,
-        KeyArea
+        KeyArea,
+        Note,
+        HoldNoteHead,
+        HoldNoteTail,
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 85613d3afb..fdc50048fe 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -3,13 +3,12 @@
 
 using System.Diagnostics;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -18,7 +17,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     /// </summary>
     public class DrawableNote : DrawableManiaHitObject<Note>, IKeyBindingHandler<ManiaAction>
     {
-        private readonly NotePiece headPiece;
+        protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
+
+        private readonly Drawable headPiece;
 
         public DrawableNote(Note hitObject)
             : base(hitObject)
@@ -26,22 +27,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            CornerRadius = 5;
-            Masking = true;
-
-            AddInternal(headPiece = new NotePiece());
-
-            AccentColour.BindValueChanged(colour =>
+            AddInternal(headPiece = new SkinnableDrawable(new ManiaSkinComponent(Component), _ => new DefaultNotePiece())
             {
-                headPiece.AccentColour = colour.NewValue;
-
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Glow,
-                    Colour = colour.NewValue.Lighten(1f).Opacity(0.2f),
-                    Radius = 10,
-                };
-            }, true);
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y
+            });
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/NotePiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultNotePiece.cs
similarity index 52%
rename from osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/NotePiece.cs
rename to osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultNotePiece.cs
index 4521af7dfb..3888612e45 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/NotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultNotePiece.cs
@@ -7,8 +7,9 @@ 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.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
@@ -16,20 +17,24 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
     /// <summary>
     /// Represents the static hit markers of notes.
     /// </summary>
-    internal class NotePiece : Container, IHasAccentColour
+    internal class DefaultNotePiece : CompositeDrawable
     {
         public const float NOTE_HEIGHT = 12;
 
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
 
         private readonly Box colouredBox;
 
-        public NotePiece()
+        public DefaultNotePiece()
         {
             RelativeSizeAxes = Axes.X;
             Height = NOTE_HEIGHT;
 
-            Children = new[]
+            CornerRadius = 5;
+            Masking = true;
+
+            InternalChildren = new Drawable[]
             {
                 new Box
                 {
@@ -45,29 +50,32 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
         }
 
         [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
+        private void load(IScrollingInfo scrollingInfo, DrawableHitObject drawableObject)
         {
             direction.BindTo(scrollingInfo.Direction);
-            direction.BindValueChanged(dir =>
-            {
-                colouredBox.Anchor = colouredBox.Origin = dir.NewValue == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
-            }, true);
+            direction.BindValueChanged(onDirectionChanged, true);
+
+            accentColour.BindTo(drawableObject.AccentColour);
+            accentColour.BindValueChanged(onAccentChanged, true);
         }
 
-        private Color4 accentColour;
-
-        public Color4 AccentColour
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
         {
-            get => accentColour;
-            set
+            colouredBox.Anchor = colouredBox.Origin = direction.NewValue == ScrollingDirection.Up
+                ? Anchor.TopCentre
+                : Anchor.BottomCentre;
+        }
+
+        private void onAccentChanged(ValueChangedEvent<Color4> accent)
+        {
+            colouredBox.Colour = accent.NewValue.Lighten(0.9f);
+
+            EdgeEffect = new EdgeEffectParameters
             {
-                if (accentColour == value)
-                    return;
-
-                accentColour = value;
-
-                colouredBox.Colour = AccentColour.Lighten(0.9f);
-            }
+                Type = EdgeEffectType.Glow,
+                Colour = accent.NewValue.Lighten(1f).Opacity(0.2f),
+                Radius = 10,
+            };
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs
new file mode 100644
index 0000000000..ebe7ff09b2
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class LegacyHoldNoteHeadPiece : LegacyNotePiece
+    {
+        protected override Texture GetTexture(ISkinSource skin)
+        {
+            return GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage)
+                   ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.NoteImage);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs
new file mode 100644
index 0000000000..085d2bf004
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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.Textures;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class LegacyHoldNoteTailPiece : LegacyNotePiece
+    {
+        protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            // Invert the direction
+            base.OnDirectionChanged(direction.NewValue == ScrollingDirection.Up
+                ? new ValueChangedEvent<ScrollingDirection>(ScrollingDirection.Down, ScrollingDirection.Down)
+                : new ValueChangedEvent<ScrollingDirection>(ScrollingDirection.Up, ScrollingDirection.Up));
+        }
+
+        protected override Texture GetTexture(ISkinSource skin)
+        {
+            return GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteTailImage)
+                   ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
new file mode 100644
index 0000000000..7936965ff8
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
@@ -0,0 +1,93 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class LegacyNotePiece : LegacyManiaColumnElement
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Container directionContainer;
+        private Sprite noteSprite;
+
+        public LegacyNotePiece()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        {
+            InternalChild = directionContainer = new Container
+            {
+                Anchor = Anchor.TopCentre,
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Child = noteSprite = new Sprite { Texture = GetTexture(skin) }
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(OnDirectionChanged, true);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (noteSprite.Texture != null)
+            {
+                var scale = DrawWidth / noteSprite.Texture.DisplayWidth;
+                noteSprite.Scale = new Vector2(scale);
+            }
+        }
+
+        protected virtual void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (direction.NewValue == ScrollingDirection.Up)
+            {
+                directionContainer.Origin = Anchor.BottomCentre;
+                directionContainer.Scale = new Vector2(1, -1);
+            }
+            else
+            {
+                directionContainer.Origin = Anchor.TopCentre;
+                directionContainer.Scale = Vector2.One;
+            }
+        }
+
+        protected virtual Texture GetTexture(ISkinSource skin) => GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.NoteImage);
+
+        protected Texture GetTextureFromLookup(ISkin skin, LegacyManiaSkinConfigurationLookups lookup)
+        {
+            string suffix = string.Empty;
+
+            switch (lookup)
+            {
+                case LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage:
+                    suffix = "H";
+                    break;
+
+                case LegacyManiaSkinConfigurationLookups.HoldNoteTailImage:
+                    suffix = "T";
+                    break;
+            }
+
+            string noteImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
+                                   new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, lookup, Column.Index))?.Value
+                               ?? $"mania-note{FallbackColumnIndex}{suffix}";
+
+            return skin.GetTexture(noteImage);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index efc95f3c24..b8caeaca30 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -52,6 +52,15 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
                         case ManiaSkinComponents.KeyArea:
                             return new LegacyKeyArea();
+
+                        case ManiaSkinComponents.Note:
+                            return new LegacyNotePiece();
+
+                        case ManiaSkinComponents.HoldNoteHead:
+                            return new LegacyHoldNoteHeadPiece();
+
+                        case ManiaSkinComponents.HoldNoteTail:
+                            return new LegacyHoldNoteTailPiece();
                     }
 
                     break;
diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
index 51928f8b66..fb6e8a87e5 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
@@ -64,14 +64,14 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                 hitTarget.Anchor = hitTarget.Origin = Anchor.TopLeft;
 
                 Padding = new MarginPadding { Top = hitPosition };
-                Explosions.Padding = new MarginPadding { Top = NotePiece.NOTE_HEIGHT };
+                Explosions.Padding = new MarginPadding { Top = DefaultNotePiece.NOTE_HEIGHT };
             }
             else
             {
                 hitTarget.Anchor = hitTarget.Origin = Anchor.BottomLeft;
 
                 Padding = new MarginPadding { Bottom = hitPosition };
-                Explosions.Padding = new MarginPadding { Bottom = NotePiece.NOTE_HEIGHT };
+                Explosions.Padding = new MarginPadding { Bottom = DefaultNotePiece.NOTE_HEIGHT };
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs
index d96b4d864b..e0b099ab9b 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                 hitTargetBar = new Box
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = NotePiece.NOTE_HEIGHT,
+                    Height = DefaultNotePiece.NOTE_HEIGHT,
                     Alpha = 0.6f,
                     Colour = Color4.Black
                 },
diff --git a/osu.Game.Rulesets.Mania/UI/HitExplosion.cs b/osu.Game.Rulesets.Mania/UI/HitExplosion.cs
index c26697fa79..824b087cb9 100644
--- a/osu.Game.Rulesets.Mania/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/HitExplosion.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public HitExplosion(Color4 objectColour, bool isSmall = false)
         {
             RelativeSizeAxes = Axes.X;
-            Height = NotePiece.NOTE_HEIGHT;
+            Height = DefaultNotePiece.NOTE_HEIGHT;
 
             // scale roughly in-line with visual appearance of notes
             Scale = new Vector2(1f, 0.6f);
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 1eae6b41b3..ca4811b3d5 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Skinning
         HitTargetImage,
         ShowJudgementLine,
         KeyImage,
-        KeyImageDown
+        KeyImageDown,
+        NoteImage,
+        HoldNoteHeadImage,
+        HoldNoteTailImage
     }
 }

From 9a37a328b619c282b26f423c92deed683a140e0c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 15:39:00 +0900
Subject: [PATCH 01837/10326] Add component overrides for hold note head/tail

---
 .../Objects/Drawables/DrawableHoldNoteHead.cs                   | 2 ++
 .../Objects/Drawables/DrawableHoldNoteTail.cs                   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
index 390c64c5e2..a73fe259e4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
@@ -8,6 +8,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     /// </summary>
     public class DrawableHoldNoteHead : DrawableNote
     {
+        protected override ManiaSkinComponents Component => ManiaSkinComponents.HoldNoteHead;
+
         public DrawableHoldNoteHead(DrawableHoldNote holdNote)
             : base(holdNote.HitObject.Head)
         {
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index 568b07c958..31e43d3ee2 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// </summary>
         private const double release_window_lenience = 1.5;
 
+        protected override ManiaSkinComponents Component => ManiaSkinComponents.HoldNoteTail;
+
         private readonly DrawableHoldNote holdNote;
 
         public DrawableHoldNoteTail(DrawableHoldNote holdNote)

From b805ed6bf1faf63c7534e45129bd3808635f6a8e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 15:59:52 +0900
Subject: [PATCH 01838/10326] Flip anchors and origins

---
 osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
index 7936965ff8..e74509febd 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         {
             InternalChild = directionContainer = new Container
             {
-                Anchor = Anchor.TopCentre,
+                Origin = Anchor.BottomCentre,
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Child = noteSprite = new Sprite { Texture = GetTexture(skin) }
@@ -56,12 +56,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
         {
             if (direction.NewValue == ScrollingDirection.Up)
             {
-                directionContainer.Origin = Anchor.BottomCentre;
+                directionContainer.Anchor = Anchor.TopCentre;
                 directionContainer.Scale = new Vector2(1, -1);
             }
             else
             {
-                directionContainer.Origin = Anchor.TopCentre;
+                directionContainer.Anchor = Anchor.BottomCentre;
                 directionContainer.Scale = Vector2.One;
             }
         }

From 11430d616eb7b47754b84bdb9b6d81334069884a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 16:00:08 +0900
Subject: [PATCH 01839/10326] Allow null hitobject

---
 .../Objects/Drawables/Pieces/DefaultNotePiece.cs     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultNotePiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultNotePiece.cs
index 3888612e45..29f5217fd8 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultNotePiece.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osuTK.Graphics;
@@ -49,14 +50,17 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo, DrawableHitObject drawableObject)
+        [BackgroundDependencyLoader(true)]
+        private void load([NotNull] IScrollingInfo scrollingInfo, [CanBeNull] DrawableHitObject drawableObject)
         {
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
 
-            accentColour.BindTo(drawableObject.AccentColour);
-            accentColour.BindValueChanged(onAccentChanged, true);
+            if (drawableObject != null)
+            {
+                accentColour.BindTo(drawableObject.AccentColour);
+                accentColour.BindValueChanged(onAccentChanged, true);
+            }
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)

From 1952fcc0ce0b424607ad8846c4f727548b160ef0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 16:42:35 +0900
Subject: [PATCH 01840/10326] Implement mania hold note skinning

---
 .../Blueprints/Components/EditBodyPiece.cs    |   4 +-
 .../Blueprints/HoldNoteSelectionBlueprint.cs  |  19 ++-
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |   1 +
 .../Objects/Drawables/DrawableHoldNote.cs     |  23 ++--
 .../{BodyPiece.cs => DefaultBodyPiece.cs}     | 110 ++++++++----------
 .../Skinning/LegacyBodyPiece.cs               |  93 +++++++++++++++
 .../Skinning/ManiaLegacySkinTransformer.cs    |   3 +
 .../LegacyManiaSkinConfigurationLookup.cs     |   3 +-
 8 files changed, 174 insertions(+), 82 deletions(-)
 rename osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/{BodyPiece.cs => DefaultBodyPiece.cs} (70%)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
index b99a1157f3..efcfe11dad 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
@@ -7,12 +7,12 @@ using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints.Components
 {
-    public class EditBodyPiece : BodyPiece
+    public class EditBodyPiece : DefaultBodyPiece
     {
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            AccentColour = colours.Yellow;
+            AccentColour.Value = colours.Yellow;
 
             Background.Alpha = 0.5f;
             Foreground.Alpha = 0;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
index 56c0b671a0..f1750f4a01 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
@@ -4,13 +4,13 @@
 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.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
@@ -42,11 +42,18 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             {
                 new HoldNoteNoteSelectionBlueprint(DrawableObject, HoldNotePosition.Start),
                 new HoldNoteNoteSelectionBlueprint(DrawableObject, HoldNotePosition.End),
-                new BodyPiece
+                new Container
                 {
-                    AccentColour = Color4.Transparent,
-                    BorderColour = colours.Yellow
-                },
+                    RelativeSizeAxes = Axes.Both,
+                    BorderThickness = 1,
+                    BorderColour = colours.Yellow,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        AlwaysPresent = true,
+                    }
+                }
             };
         }
 
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 9df15f424d..dd1052ad0e 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -25,5 +25,6 @@ namespace osu.Game.Rulesets.Mania
         Note,
         HoldNoteHead,
         HoldNoteTail,
+        HoldNoteBody,
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 14a7c5fda3..7cacaf35a6 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -20,6 +21,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     {
         public override bool DisplayResult => false;
 
+        public IBindable<bool> IsHitting => isHitting;
+
+        private readonly Bindable<bool> isHitting = new Bindable<bool>();
+
         public DrawableHoldNoteHead Head => headContainer.Child;
         public DrawableHoldNoteTail Tail => tailContainer.Child;
 
@@ -27,7 +32,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private readonly Container<DrawableHoldNoteTail> tailContainer;
         private readonly Container<DrawableHoldNoteTick> tickContainer;
 
-        private readonly BodyPiece bodyPiece;
+        private readonly Drawable bodyPiece;
 
         /// <summary>
         /// Time at which the user started holding this hold note. Null if the user is not holding this hold note.
@@ -44,18 +49,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             RelativeSizeAxes = Axes.X;
 
-            AddRangeInternal(new Drawable[]
+            AddRangeInternal(new[]
             {
-                bodyPiece = new BodyPiece { RelativeSizeAxes = Axes.X },
+                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody), _ => new DefaultBodyPiece())
+                {
+                    RelativeSizeAxes = Axes.X
+                },
                 tickContainer = new Container<DrawableHoldNoteTick> { RelativeSizeAxes = Axes.Both },
                 headContainer = new Container<DrawableHoldNoteHead> { RelativeSizeAxes = Axes.Both },
                 tailContainer = new Container<DrawableHoldNoteTail> { RelativeSizeAxes = Axes.Both },
             });
-
-            AccentColour.BindValueChanged(colour =>
-            {
-                bodyPiece.AccentColour = colour.NewValue;
-            }, true);
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
@@ -168,7 +171,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 return;
 
             HoldStartTime = Time.Current;
-            bodyPiece.Hitting = true;
+            isHitting.Value = true;
         }
 
         public void OnReleased(ManiaAction action)
@@ -194,7 +197,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private void endHold()
         {
             HoldStartTime = null;
-            bodyPiece.Hitting = false;
+            isHitting.Value = false;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
similarity index 70%
rename from osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs
rename to osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
index 43f9ae2783..d1e6264c61 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
@@ -2,6 +2,9 @@
 // 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 osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -9,26 +12,38 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Layout;
-using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
 {
     /// <summary>
     /// Represents length-wise portion of a hold note.
     /// </summary>
-    public class BodyPiece : Container, IHasAccentColour
+    public class DefaultBodyPiece : CompositeDrawable
     {
-        private readonly Container subtractionLayer;
+        protected readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
 
-        protected readonly Drawable Background;
-        protected readonly BufferedContainer Foreground;
-        private readonly BufferedContainer subtractionContainer;
+        private readonly LayoutValue subtractionCache = new LayoutValue(Invalidation.DrawSize);
+        private readonly IBindable<bool> isHitting = new Bindable<bool>();
 
-        public BodyPiece()
+        protected Drawable Background { get; private set; }
+        protected BufferedContainer Foreground { get; private set; }
+
+        private BufferedContainer subtractionContainer;
+        private Container subtractionLayer;
+
+        public DefaultBodyPiece()
         {
+            RelativeSizeAxes = Axes.Both;
             Blending = BlendingParameters.Additive;
 
-            Children = new[]
+            AddLayout(subtractionCache);
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load([CanBeNull] DrawableHitObject drawableObject)
+        {
+            InternalChildren = new[]
             {
                 Background = new Box { RelativeSizeAxes = Axes.Both },
                 Foreground = new BufferedContainer
@@ -66,43 +81,37 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
                 }
             };
 
-            AddLayout(subtractionCache);
-        }
+            var holdNote = (DrawableHoldNote)drawableObject;
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            updateAccentColour();
-        }
-
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => accentColour;
-            set
+            if (drawableObject != null)
             {
-                if (accentColour == value)
-                    return;
-
-                accentColour = value;
-
-                updateAccentColour();
+                AccentColour.BindTo(drawableObject.AccentColour);
+                AccentColour.BindValueChanged(onAccentChanged, true);
             }
+
+            isHitting.BindTo(holdNote.IsHitting);
+            isHitting.BindValueChanged(_ => onAccentChanged(new ValueChangedEvent<Color4>(AccentColour.Value, AccentColour.Value)), true);
         }
 
-        public bool Hitting
+        private void onAccentChanged(ValueChangedEvent<Color4> accent)
         {
-            get => hitting;
-            set
-            {
-                hitting = value;
-                updateAccentColour();
-            }
-        }
+            Foreground.Colour = accent.NewValue.Opacity(0.5f);
+            Background.Colour = accent.NewValue.Opacity(0.7f);
 
-        private readonly LayoutValue subtractionCache = new LayoutValue(Invalidation.DrawSize);
+            const float animation_length = 50;
+
+            Foreground.ClearTransforms(false, nameof(Foreground.Colour));
+
+            if (isHitting.Value)
+            {
+                // wait for the next sync point
+                double synchronisedOffset = animation_length * 2 - Time.Current % (animation_length * 2);
+                using (Foreground.BeginDelayedSequence(synchronisedOffset))
+                    Foreground.FadeColour(accent.NewValue.Lighten(0.2f), animation_length).Then().FadeColour(Foreground.Colour, animation_length).Loop();
+            }
+
+            subtractionCache.Invalidate();
+        }
 
         protected override void Update()
         {
@@ -125,30 +134,5 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
                 subtractionCache.Validate();
             }
         }
-
-        private bool hitting;
-
-        private void updateAccentColour()
-        {
-            if (!IsLoaded)
-                return;
-
-            Foreground.Colour = AccentColour.Opacity(0.5f);
-            Background.Colour = AccentColour.Opacity(0.7f);
-
-            const float animation_length = 50;
-
-            Foreground.ClearTransforms(false, nameof(Foreground.Colour));
-
-            if (hitting)
-            {
-                // wait for the next sync point
-                double synchronisedOffset = animation_length * 2 - Time.Current % (animation_length * 2);
-                using (Foreground.BeginDelayedSequence(synchronisedOffset))
-                    Foreground.FadeColour(AccentColour.Lighten(0.2f), animation_length).Then().FadeColour(Foreground.Colour, animation_length).Loop();
-            }
-
-            subtractionCache.Invalidate();
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
new file mode 100644
index 0000000000..e7fb331079
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -0,0 +1,93 @@
+// Copyright (c) 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.Animations;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class LegacyBodyPiece : LegacyManiaColumnElement
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+        private readonly IBindable<bool> isHitting = new Bindable<bool>();
+
+        private Drawable sprite;
+
+        [Resolved(CanBeNull = true)]
+        private ManiaStage stage { get; set; }
+
+        [Resolved]
+        private Column column { get; set; }
+
+        public LegacyBodyPiece()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo, DrawableHitObject drawableObject)
+        {
+            string imageName = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
+                                   new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage, column.Index))?.Value
+                               ?? $"mania-note{FallbackColumnIndex}L";
+
+            sprite = skin.GetAnimation(imageName, true, true).With(d =>
+            {
+                if (d == null)
+                    return;
+
+                if (d is TextureAnimation animation)
+                    animation.IsPlaying = false;
+
+                d.Anchor = Anchor.TopCentre;
+                d.RelativeSizeAxes = Axes.Both;
+                d.Size = Vector2.One;
+                d.FillMode = FillMode.Stretch;
+                // Todo: Wrap
+            });
+
+            if (sprite != null)
+                InternalChild = sprite;
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+
+            var holdNote = (DrawableHoldNote)drawableObject;
+            isHitting.BindTo(holdNote.IsHitting);
+            isHitting.BindValueChanged(onIsHittingChanged, true);
+        }
+
+        private void onIsHittingChanged(ValueChangedEvent<bool> isHitting)
+        {
+            if (!(sprite is TextureAnimation animation))
+                return;
+
+            animation.IsPlaying = isHitting.NewValue;
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (sprite == null)
+                return;
+
+            if (direction.NewValue == ScrollingDirection.Up)
+            {
+                sprite.Origin = Anchor.BottomCentre;
+                sprite.Scale = new Vector2(1, -1);
+            }
+            else
+            {
+                sprite.Origin = Anchor.TopCentre;
+                sprite.Scale = Vector2.One;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index b8caeaca30..69e6a0d238 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -61,6 +61,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
                         case ManiaSkinComponents.HoldNoteTail:
                             return new LegacyHoldNoteTailPiece();
+
+                        case ManiaSkinComponents.HoldNoteBody:
+                            return new LegacyBodyPiece();
                     }
 
                     break;
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index ca4811b3d5..72556a79b4 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -29,6 +29,7 @@ namespace osu.Game.Skinning
         KeyImageDown,
         NoteImage,
         HoldNoteHeadImage,
-        HoldNoteTailImage
+        HoldNoteTailImage,
+        HoldNoteBodyImage,
     }
 }

From 3cd353d3872ef728ccba8ec45a4d525c23edb380 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 31 Mar 2020 16:57:58 +0900
Subject: [PATCH 01841/10326] Fix possible nullrefs

---
 .../Objects/Drawables/Pieces/DefaultBodyPiece.cs          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
index d1e6264c61..0ee0a14df3 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
@@ -81,15 +81,15 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
                 }
             };
 
-            var holdNote = (DrawableHoldNote)drawableObject;
-
             if (drawableObject != null)
             {
+                var holdNote = (DrawableHoldNote)drawableObject;
+
                 AccentColour.BindTo(drawableObject.AccentColour);
-                AccentColour.BindValueChanged(onAccentChanged, true);
+                isHitting.BindTo(holdNote.IsHitting);
             }
 
-            isHitting.BindTo(holdNote.IsHitting);
+            AccentColour.BindValueChanged(onAccentChanged, true);
             isHitting.BindValueChanged(_ => onAccentChanged(new ValueChangedEvent<Color4>(AccentColour.Value, AccentColour.Value)), true);
         }
 

From 9602ab17b0c32fd6f4c30ba0e72f373f8c88bb92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 17:13:42 +0900
Subject: [PATCH 01842/10326] Fix replay imports failing for certain mod
 combinations

---
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index c356dd246d..a4a560c8e4 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -28,10 +28,11 @@ namespace osu.Game.Scoring.Legacy
         {
             var score = new Score
             {
-                ScoreInfo = new ScoreInfo(),
                 Replay = new Replay()
             };
 
+            WorkingBeatmap workingBeatmap;
+
             using (SerializationReader sr = new SerializationReader(stream))
             {
                 currentRuleset = GetRuleset(sr.ReadByte());
@@ -41,7 +42,7 @@ namespace osu.Game.Scoring.Legacy
 
                 var version = sr.ReadInt32();
 
-                var workingBeatmap = GetBeatmap(sr.ReadString());
+                workingBeatmap = GetBeatmap(sr.ReadString());
                 if (workingBeatmap is DummyWorkingBeatmap)
                     throw new BeatmapNotFoundException();
 
@@ -113,6 +114,10 @@ namespace osu.Game.Scoring.Legacy
 
             CalculateAccuracy(score.ScoreInfo);
 
+            // before returning for database import, we must restore the database-sourced BeatmapInfo.
+            // if not, the clone operation in GetPlayableBeatmap will cause a dereference and subsequent database exception.
+            score.ScoreInfo.Beatmap = workingBeatmap.BeatmapInfo;
+
             return score;
         }
 

From 5179635b2dc855a1873e94da8512476c3bebf255 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 17:08:05 +0800
Subject: [PATCH 01843/10326] add shorthand method for config retrieval

---
 .../Skinning/LegacyManiaColumnElement.cs                    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
index 231a55a7e2..694c167f7f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
@@ -4,8 +4,10 @@
 using System;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
@@ -37,5 +39,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 FallbackColumnIndex = dist % 2 + 1;
             }
         }
+
+        protected IBindable<T> GetManiaSkinConfig<T>(ISkinSource skin, LegacyManiaSkinConfigurationLookups lookup)
+            => skin.GetConfig<LegacyManiaSkinConfigurationLookup, T>(
+                new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, lookup, Column.Index));
     }
 }

From ec3d21e2b7e30aafcabc7bcde879f5ab34c0af57 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 17:18:53 +0800
Subject: [PATCH 01844/10326] convert older elements to
 LegacyManiaColumnElement

Also added xmldoc for new shorthand method.
---
 .../Skinning/LegacyColumnBackground.cs        | 20 +++++++------------
 .../Skinning/LegacyHitTarget.cs               |  9 +++------
 .../Skinning/LegacyManiaColumnElement.cs      |  7 ++++++-
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 96b28964d3..44354ed057 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -16,19 +16,13 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyColumnBackground : CompositeDrawable, IKeyBindingHandler<ManiaAction>
+    public class LegacyColumnBackground : LegacyManiaColumnElement, IKeyBindingHandler<ManiaAction>
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private Container lightContainer;
         private Sprite light;
 
-        [Resolved]
-        private Column column { get; set; }
-
-        [Resolved(CanBeNull = true)]
-        private ManiaStage stage { get; set; }
-
         public LegacyColumnBackground()
         {
             RelativeSizeAxes = Axes.Both;
@@ -38,19 +32,19 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
             string lightImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
-                                    new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LightImage, 0))?.Value
+                                    new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LightImage, 0))?.Value
                                 ?? "mania-stage-light";
 
             float leftLineWidth = skin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
-                                          new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LeftLineWidth, column.Index))
+                                          new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LeftLineWidth, Column.Index))
                                       ?.Value ?? 1;
             float rightLineWidth = skin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
-                                           new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.RightLineWidth, column.Index))
+                                           new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.RightLineWidth, Column.Index))
                                        ?.Value ?? 1;
 
             bool hasLeftLine = leftLineWidth > 0;
             bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
-                                || stage == null || column.Index == stage.Columns.Count - 1;
+                                || Stage == null || Column.Index == Stage.Columns.Count - 1;
 
             InternalChildren = new Drawable[]
             {
@@ -109,7 +103,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         public bool OnPressed(ManiaAction action)
         {
-            if (action == column.Action.Value)
+            if (action == Column.Action.Value)
             {
                 light.FadeIn();
                 light.ScaleTo(Vector2.One);
@@ -123,7 +117,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             // Todo: Should be 400 * 100 / CurrentBPM
             const double animation_length = 250;
 
-            if (action == column.Action.Value)
+            if (action == Column.Action.Value)
             {
                 light.FadeTo(0, animation_length);
                 light.ScaleTo(new Vector2(1, 0), animation_length);
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index 3e550808f3..dd909a39ca 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -14,13 +14,10 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyHitTarget : CompositeDrawable
+    public class LegacyHitTarget : LegacyManiaColumnElement
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-        [Resolved(CanBeNull = true)]
-        private ManiaStage stage { get; set; }
-
         private Container directionContainer;
 
         public LegacyHitTarget()
@@ -32,11 +29,11 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
             string targetImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
-                                     new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.HitTargetImage))?.Value
+                                     new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.HitTargetImage))?.Value
                                  ?? "mania-stage-hint";
 
             bool showJudgementLine = skin.GetConfig<LegacyManiaSkinConfigurationLookup, bool>(
-                                         new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.ShowJudgementLine))?.Value
+                                         new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.ShowJudgementLine))?.Value
                                      ?? true;
 
             InternalChild = directionContainer = new Container
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
index 694c167f7f..4a51080594 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
@@ -40,7 +40,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
             }
         }
 
-        protected IBindable<T> GetManiaSkinConfig<T>(ISkinSource skin, LegacyManiaSkinConfigurationLookups lookup)
+        /// <summary>
+        /// Retrieve a per-column skin configuration.
+        /// </summary>
+        /// <param name="skin">The skin from which configuration is retrieved.</param>
+        /// <param name="lookup">The value to retrieve.</param>
+        protected IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup)
             => skin.GetConfig<LegacyManiaSkinConfigurationLookup, T>(
                 new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, lookup, Column.Index));
     }

From c0f8c1dc2836f811786fe11d6051c2646ccb04d3 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 17:22:46 +0800
Subject: [PATCH 01845/10326] rename variable used for mania lookup key storage

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

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 94caa78e6d..bcab84ddd9 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -120,14 +120,14 @@ namespace osu.Game.Skinning
                 case SkinCustomColourLookup customColour:
                     return SkinUtils.As<TValue>(getCustomColour(customColour.Lookup.ToString()));
 
-                case LegacyManiaSkinConfigurationLookup legacy:
+                case LegacyManiaSkinConfigurationLookup maniaLookup:
                     if (!AllowManiaSkin)
                         return null;
 
-                    if (!maniaConfigurations.TryGetValue(legacy.Keys, out var existing))
-                        maniaConfigurations[legacy.Keys] = existing = new LegacyManiaSkinConfiguration(legacy.Keys);
+                    if (!maniaConfigurations.TryGetValue(maniaLookup.Keys, out var existing))
+                        maniaConfigurations[maniaLookup.Keys] = existing = new LegacyManiaSkinConfiguration(maniaLookup.Keys);
 
-                    switch (legacy.Lookup)
+                    switch (maniaLookup.Lookup)
                     {
                         case LegacyManiaSkinConfigurationLookups.HitPosition:
                             return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));

From 71fc240aeea75d0544a8da624c36d0b9c78ee56f Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 17:32:05 +0800
Subject: [PATCH 01846/10326] make mania skin elements use new method

---
 osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs      | 3 +--
 .../Skinning/LegacyColumnBackground.cs                   | 9 +++------
 osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs      | 6 ++----
 osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs        | 6 ++----
 .../Skinning/LegacyManiaColumnElement.cs                 | 5 +++--
 osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs      | 3 +--
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index e7fb331079..643d92ff41 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -35,8 +35,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo, DrawableHitObject drawableObject)
         {
-            string imageName = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
-                                   new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage, column.Index))?.Value
+            string imageName = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage)?.Value
                                ?? $"mania-note{FallbackColumnIndex}L";
 
             sprite = skin.GetAnimation(imageName, true, true).With(d =>
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 44354ed057..b94996c81d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -31,15 +31,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string lightImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
-                                    new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LightImage, 0))?.Value
+            string lightImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.LightImage, 0)?.Value
                                 ?? "mania-stage-light";
 
-            float leftLineWidth = skin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
-                                          new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LeftLineWidth, Column.Index))
+            float leftLineWidth = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LeftLineWidth)
                                       ?.Value ?? 1;
-            float rightLineWidth = skin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
-                                           new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.RightLineWidth, Column.Index))
+            float rightLineWidth = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.RightLineWidth)
                                        ?.Value ?? 1;
 
             bool hasLeftLine = leftLineWidth > 0;
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index dd909a39ca..c0093f5ca1 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -28,12 +28,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string targetImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
-                                     new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.HitTargetImage))?.Value
+            string targetImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HitTargetImage)?.Value
                                  ?? "mania-stage-hint";
 
-            bool showJudgementLine = skin.GetConfig<LegacyManiaSkinConfigurationLookup, bool>(
-                                         new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.ShowJudgementLine))?.Value
+            bool showJudgementLine = GetManiaSkinConfig<bool>(skin, LegacyManiaSkinConfigurationLookups.ShowJudgementLine)?.Value
                                      ?? true;
 
             InternalChild = directionContainer = new Container
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
index 6afc86c4fa..d2541772cc 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
@@ -36,12 +36,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string upImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
-                                 new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.KeyImage, column.Index))?.Value
+            string upImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.KeyImage)?.Value
                              ?? $"mania-key{FallbackColumnIndex}";
 
-            string downImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
-                                   new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.KeyImageDown, column.Index))?.Value
+            string downImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.KeyImageDown)?.Value
                                ?? $"mania-key{FallbackColumnIndex}D";
 
             InternalChild = directionContainer = new Container
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
index 4a51080594..bf7405bb44 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
@@ -45,8 +45,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// </summary>
         /// <param name="skin">The skin from which configuration is retrieved.</param>
         /// <param name="lookup">The value to retrieve.</param>
-        protected IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup)
+        /// <param name="index">The index of the column to which the entry applies.</param>
+        protected IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
             => skin.GetConfig<LegacyManiaSkinConfigurationLookup, T>(
-                new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, lookup, Column.Index));
+                new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, lookup, index ?? Column.Index));
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
index e74509febd..d2ceb06d0b 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
@@ -83,8 +83,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     break;
             }
 
-            string noteImage = skin.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
-                                   new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, lookup, Column.Index))?.Value
+            string noteImage = GetManiaSkinConfig<string>(skin, lookup)?.Value
                                ?? $"mania-note{FallbackColumnIndex}{suffix}";
 
             return skin.GetTexture(noteImage);

From b7d73f96eaf24ab49f4d67f0903fd768f1dcf577 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 18:33:00 +0900
Subject: [PATCH 01847/10326] Fix osu!catch catcher hit area being too large

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 8fa9c61b6f..13935e036b 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -37,10 +37,15 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatcherAnimationState CurrentState { get; private set; }
 
+        /// <summary>
+        /// The width of the catcher which can receive fruit. Equivalent to "catchMargin" in osu-stable.
+        /// </summary>
+        private const float allowed_catch_range = 0.8f;
+
         /// <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);
+        internal float CatchWidth => CatcherArea.CATCHER_SIZE * Math.Abs(Scale.X) * allowed_catch_range;
 
         protected bool Dashing
         {

From 977e1a3bfec706663347ecb167219971ee738e9f Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 17:48:37 +0800
Subject: [PATCH 01848/10326] split shortcut into two methods

---
 .../Skinning/LegacyManiaColumnElement.cs        | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
index bf7405bb44..5386d05504 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
@@ -40,14 +40,23 @@ namespace osu.Game.Rulesets.Mania.Skinning
             }
         }
 
+        /// <summary>
+        /// Retrieve a per-column-count skin configuration.
+        /// </summary>
+        /// <param name="skin">The skin from which configuration is retrieved.</param>
+        /// <param name="lookup">The value to retrieve.</param>
+        /// <param name="index">If not null, denotes the index of the column to which the entry applies.</param>
+        protected IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
+            => skin.GetConfig<LegacyManiaSkinConfigurationLookup, T>(
+                new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, lookup, index));
+
         /// <summary>
         /// Retrieve a per-column skin configuration.
         /// </summary>
         /// <param name="skin">The skin from which configuration is retrieved.</param>
         /// <param name="lookup">The value to retrieve.</param>
-        /// <param name="index">The index of the column to which the entry applies.</param>
-        protected IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
-            => skin.GetConfig<LegacyManiaSkinConfigurationLookup, T>(
-                new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, lookup, index ?? Column.Index));
+        /// <param name="index">The index of the column to which the entry applies. Defaults to the column index.</param>
+        protected IBindable<T> GetPerColumnSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
+            => GetManiaSkinConfig<T>(skin, lookup, index ?? Column.Index);
     }
 }

From ecc305bb6384ce948391c7f27a15c56e92bc650f Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 17:54:51 +0800
Subject: [PATCH 01849/10326] extract superclass for all mania skinning
 elements

---
 .../Skinning/LegacyManiaColumnElement.cs      | 16 +---------
 .../Skinning/LegacyManiaElement.cs            | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
index 5386d05504..7eaf3b5b5e 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
@@ -14,12 +14,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
     /// <summary>
     /// A <see cref="CompositeDrawable"/> which is placed somewhere within a <see cref="Column"/>.
     /// </summary>
-    public class LegacyManiaColumnElement : CompositeDrawable
+    public class LegacyManiaColumnElement : LegacyManiaElement
     {
-        [Resolved(CanBeNull = true)]
-        [CanBeNull]
-        protected ManiaStage Stage { get; private set; }
-
         [Resolved]
         protected Column Column { get; private set; }
 
@@ -40,16 +36,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
             }
         }
 
-        /// <summary>
-        /// Retrieve a per-column-count skin configuration.
-        /// </summary>
-        /// <param name="skin">The skin from which configuration is retrieved.</param>
-        /// <param name="lookup">The value to retrieve.</param>
-        /// <param name="index">If not null, denotes the index of the column to which the entry applies.</param>
-        protected IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
-            => skin.GetConfig<LegacyManiaSkinConfigurationLookup, T>(
-                new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, lookup, index));
-
         /// <summary>
         /// Retrieve a per-column skin configuration.
         /// </summary>
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.cs
new file mode 100644
index 0000000000..2fb229862f
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.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.Containers;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    /// <summary>
+    /// A mania legacy skin element.
+    /// </summary>
+    public class LegacyManiaElement : CompositeDrawable
+    {
+        [Resolved(CanBeNull = true)]
+        [CanBeNull]
+        protected ManiaStage Stage { get; private set; }
+
+        /// <summary>
+        /// Retrieve a per-column-count skin configuration.
+        /// </summary>
+        /// <param name="skin">The skin from which configuration is retrieved.</param>
+        /// <param name="lookup">The value to retrieve.</param>
+        /// <param name="index">If not null, denotes the index of the column to which the entry applies.</param>
+        protected virtual IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
+            => skin.GetConfig<LegacyManiaSkinConfigurationLookup, T>(
+                new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, lookup, index));
+    }
+}

From d41ff8c4b45edbb1fe075d048fd4c34c0f8dc3fd Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 17:58:29 +0800
Subject: [PATCH 01850/10326] remove Column field from LegacyHitTarget

---
 osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs   |  3 +--
 .../Skinning/LegacyManiaColumnElement.cs              | 11 ++---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index c0093f5ca1..53e4f3cd14 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -7,14 +7,13 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyHitTarget : LegacyManiaColumnElement
+    public class LegacyHitTarget : LegacyManiaElement
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
index 7eaf3b5b5e..79e5673ff2 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
@@ -2,7 +2,6 @@
 // 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.Graphics.Containers;
@@ -36,13 +35,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             }
         }
 
-        /// <summary>
-        /// Retrieve a per-column skin configuration.
-        /// </summary>
-        /// <param name="skin">The skin from which configuration is retrieved.</param>
-        /// <param name="lookup">The value to retrieve.</param>
-        /// <param name="index">The index of the column to which the entry applies. Defaults to the column index.</param>
-        protected IBindable<T> GetPerColumnSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
-            => GetManiaSkinConfig<T>(skin, lookup, index ?? Column.Index);
+        protected override IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
+            => base.GetManiaSkinConfig<T>(skin, lookup, index ?? Column.Index);
     }
 }

From 3e0991d350667ab96aefa315b701895f283aecc5 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 18:00:56 +0800
Subject: [PATCH 01851/10326] fix indent

---
 osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index b94996c81d..22478670dc 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -35,9 +35,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
                                 ?? "mania-stage-light";
 
             float leftLineWidth = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LeftLineWidth)
-                                      ?.Value ?? 1;
+                                  ?.Value ?? 1;
             float rightLineWidth = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.RightLineWidth)
-                                       ?.Value ?? 1;
+                                   ?.Value ?? 1;
 
             bool hasLeftLine = leftLineWidth > 0;
             bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m

From 03b90fe2dbed5a7851e4a689e42edcc86968970c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 19:01:49 +0900
Subject: [PATCH 01852/10326] Remove local application of same margin in
 CatchDifficultyCalculator

---
 .../Difficulty/CatchDifficultyCalculator.cs                    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 5880a227c2..4d9dbbbc5f 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -72,10 +72,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         protected override Skill[] CreateSkills(IBeatmap beatmap)
         {
             using (var catcher = new 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[]
             {

From df2379fb0e85415407c84ae993a054305d556c90 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 18:10:43 +0800
Subject: [PATCH 01853/10326] remove unnecessary using

---
 osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 22478670dc..b03b2fce45 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;

From e26fbd5ed87681d8577fc5d9dced39cfd199b9cf Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 31 Mar 2020 13:45:59 +0300
Subject: [PATCH 01854/10326] Remove overcomplicated stuff

---
 .../TestSceneOverlayScrollContainer.cs        |   6 +-
 osu.Game/Overlays/OverlayScrollContainer.cs   | 159 ++++++++----------
 2 files changed, 75 insertions(+), 90 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
index 684436459f..0eccc907a1 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
@@ -55,13 +55,13 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestButtonVisibility()
         {
-            AddAssert("button is hidden", () => scroll.Button.State.Value == Visibility.Hidden);
+            AddAssert("button is hidden", () => scroll.Button.Current.Value == Visibility.Hidden);
 
             AddStep("scroll to end", () => scroll.ScrollToEnd(false));
-            AddAssert("button is visible", () => scroll.Button.State.Value == Visibility.Visible);
+            AddAssert("button is visible", () => scroll.Button.Current.Value == Visibility.Visible);
 
             AddStep("scroll to start", () => scroll.ScrollToStart(false));
-            AddAssert("button is hidden", () => scroll.Button.State.Value == Visibility.Hidden);
+            AddAssert("button is hidden", () => scroll.Button.Current.Value == Visibility.Hidden);
         }
 
         [Test]
diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index a9524b9d32..f96d9e3a31 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -43,7 +43,7 @@ namespace osu.Game.Overlays
                 {
                     ScrollToStart();
                     currentTarget = Target;
-                    Button.State.Value = Visibility.Hidden;
+                    Button.Current.Value = Visibility.Hidden;
                 }
             });
         }
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays
 
             if (ScrollContent.DrawHeight + button_scroll_position < DrawHeight)
             {
-                Button.State.Value = Visibility.Hidden;
+                Button.Current.Value = Visibility.Hidden;
                 return;
             }
 
@@ -62,113 +62,98 @@ namespace osu.Game.Overlays
                 return;
 
             currentTarget = Target;
-            Button.State.Value = Current > button_scroll_position ? Visibility.Visible : Visibility.Hidden;
+            Button.Current.Value = Current > button_scroll_position ? Visibility.Visible : Visibility.Hidden;
         }
 
-        public class ScrollToTopButton : VisibilityContainer
+        public class ScrollToTopButton : OsuHoverContainer, IHasCurrentValue<Visibility>
         {
             private const int fade_duration = 500;
 
-            public Action Action
+            private readonly BindableWithCurrent<Visibility> current = new BindableWithCurrent<Visibility>();
+
+            public Bindable<Visibility> Current
             {
-                get => button.Action;
-                set => button.Action = value;
+                get => current.Current;
+                set => current.Current = value;
             }
 
-            public override bool PropagatePositionalInputSubTree => true;
+            protected override IEnumerable<Drawable> EffectTargets => new[] { background };
 
-            protected override bool StartHidden => true;
+            private Color4 flashColour;
 
-            private readonly Button button;
+            private readonly Container content;
+            private readonly Box background;
 
             public ScrollToTopButton()
             {
                 Size = new Vector2(50);
-                Child = button = new Button
+                Alpha = 0;
+                Add(content = new CircularContainer
                 {
-                    AreaState = { BindTarget = State }
-                };
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Shadow,
+                        Offset = new Vector2(0f, 1f),
+                        Radius = 3f,
+                        Colour = Color4.Black.Opacity(0.25f),
+                    },
+                    Children = new Drawable[]
+                    {
+                        background = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        },
+                        new SpriteIcon
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(15),
+                            Icon = FontAwesome.Solid.ChevronUp
+                        }
+                    }
+                });
+
+                TooltipText = "Scroll to top";
             }
 
-            protected override bool OnMouseDown(MouseDownEvent e) => true;
-
-            protected override void PopIn() => button.FadeIn(fade_duration, Easing.OutQuint);
-
-            protected override void PopOut() => button.FadeOut(fade_duration, Easing.OutQuint);
-
-            private class Button : OsuHoverContainer
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
             {
-                public readonly Bindable<Visibility> AreaState = new Bindable<Visibility>();
+                IdleColour = colourProvider.Background6;
+                HoverColour = colourProvider.Background5;
+                flashColour = colourProvider.Light1;
+            }
 
-                public override bool HandlePositionalInput => AreaState.Value == Visibility.Visible;
-
-                protected override IEnumerable<Drawable> EffectTargets => new[] { background };
-
-                private Color4 flashColour;
-
-                private readonly Container content;
-                private readonly Box background;
-
-                public Button()
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                Current.BindValueChanged(visibility =>
                 {
-                    RelativeSizeAxes = Axes.Both;
-                    Add(content = new CircularContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Masking = true,
-                        EdgeEffect = new EdgeEffectParameters
-                        {
-                            Type = EdgeEffectType.Shadow,
-                            Offset = new Vector2(0f, 1f),
-                            Radius = 3f,
-                            Colour = Color4.Black.Opacity(0.25f),
-                        },
-                        Children = new Drawable[]
-                        {
-                            background = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both
-                            },
-                            new SpriteIcon
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Size = new Vector2(15),
-                                Icon = FontAwesome.Solid.ChevronUp
-                            }
-                        }
-                    });
+                    Enabled.Value = visibility.NewValue == Visibility.Visible;
+                    this.FadeTo(visibility.NewValue == Visibility.Visible ? 1 : 0, fade_duration, Easing.OutQuint);
+                }, true);
+            }
 
-                    TooltipText = "Scroll to top";
-                }
+            protected override bool OnClick(ClickEvent e)
+            {
+                background.FlashColour(flashColour, 800, Easing.OutQuint);
+                return base.OnClick(e);
+            }
 
-                [BackgroundDependencyLoader]
-                private void load(OverlayColourProvider colourProvider)
-                {
-                    IdleColour = colourProvider.Background6;
-                    HoverColour = colourProvider.Background5;
-                    flashColour = colourProvider.Light1;
-                }
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                content.ScaleTo(0.75f, 2000, Easing.OutQuint);
+                return true;
+            }
 
-                protected override bool OnClick(ClickEvent e)
-                {
-                    background.FlashColour(flashColour, 800, Easing.OutQuint);
-                    return base.OnClick(e);
-                }
-
-                protected override bool OnMouseDown(MouseDownEvent e)
-                {
-                    content.ScaleTo(0.75f, 2000, Easing.OutQuint);
-                    return true;
-                }
-
-                protected override void OnMouseUp(MouseUpEvent e)
-                {
-                    content.ScaleTo(1, 1000, Easing.OutElastic);
-                    base.OnMouseUp(e);
-                }
+            protected override void OnMouseUp(MouseUpEvent e)
+            {
+                content.ScaleTo(1, 1000, Easing.OutElastic);
+                base.OnMouseUp(e);
             }
         }
     }

From ff499b7d6b205f234b3f05416ac62ef9729aec45 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 19:12:02 +0800
Subject: [PATCH 01855/10326] fix indent

---
 osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index b03b2fce45..b4bf6b1652 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -34,9 +34,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
                                 ?? "mania-stage-light";
 
             float leftLineWidth = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LeftLineWidth)
-                                  ?.Value ?? 1;
+                ?.Value ?? 1;
             float rightLineWidth = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.RightLineWidth)
-                                   ?.Value ?? 1;
+                ?.Value ?? 1;
 
             bool hasLeftLine = leftLineWidth > 0;
             bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m

From 03689adda8abadaddac9a823b9990fa2719d3000 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 21:33:59 +0900
Subject: [PATCH 01856/10326] 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 6db4220fad..9e729d8705 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.315.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.331.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4163044273..30c11a1cdb 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.315.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.331.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 17430e4b25..d035f5c4d8 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.315.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.331.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From a7eda32a6eea5822049b13373ef14fba213c9bf0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 22:34:41 +0900
Subject: [PATCH 01857/10326] Fix missing comma

---
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs           | 2 +-
 osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index abb919a8af..5969a90e2c 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania
 
     public enum ManiaSkinComponents
     {
-        KeyArea
+        KeyArea,
         ColumnBackground
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index a134f5b135..79c7922ba9 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Skinning
     public enum LegacyManiaSkinConfigurationLookups
     {
         KeyImage,
-        KeyImageDown
+        KeyImageDown,
         LightImage,
         LeftLineWidth,
         RightLineWidth

From a894b42a32e6eeffc22cc2298f2f78067e5faa5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 22:41:16 +0900
Subject: [PATCH 01858/10326] Fix merge conflict mess

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 70a18764f8..0ace5160fa 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -33,13 +33,10 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public readonly Bindable<ManiaAction> Action = new Bindable<ManiaAction>();
 
-        private readonly ColumnBackground background;
-
-        private readonly ColumnKeyArea keyArea;
-
         private readonly ColumnHitObjectArea hitObjectArea;
 
         internal readonly Container TopLevelContainer;
+
         private readonly Container explosionContainer;
 
         public Column(int index)
@@ -133,8 +130,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
                 accentColour = value;
 
-                background.AccentColour = value;
-                keyArea.AccentColour = value;
                 hitObjectArea.AccentColour = value;
             }
         }

From 1e88d3c17a557640fa81675e97f6f389436ef34d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Mar 2020 23:35:23 +0900
Subject: [PATCH 01859/10326] Merge conflict "resolution"

---
 osu.Android.props                             |   4 +--
 ...her-fail.png => fruit-catcher-fail@2x.png} | Bin
 ...her-kiai.png => fruit-catcher-kiai@2x.png} | Bin
 .../Difficulty/CatchDifficultyCalculator.cs   |   3 --
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |   7 +++-
 osu.Game.Rulesets.Catch/UI/CatcherSprite.cs   |   2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs     |   2 +-
 .../Drawables/Connections/FollowPoint.cs      |   4 ++-
 .../Connections/FollowPointConnection.cs      |  12 +++----
 .../Skinning/LegacyMainCirclePiece.cs         |   5 +++
 .../Skinning/OsuSkinConfiguration.cs          |   3 +-
 .../Gameplay/TestSceneSkinnableDrawable.cs    |  12 +++----
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs |   9 +++--
 osu.Game/Skinning/IAnimationTimeReference.cs  |  25 +++++++++++++
 osu.Game/Skinning/LegacySkinExtensions.cs     |  23 +++++++++++-
 osu.Game/Skinning/SkinnableDrawable.cs        |  18 +++-------
 .../Drawables/DrawableStoryboard.cs           |   2 +-
 .../Drawables/DrawableStoryboardLayer.cs      |  33 +++++++++++++-----
 osu.Game/osu.Game.csproj                      |   4 +--
 osu.iOS.props                                 |   6 ++--
 20 files changed, 120 insertions(+), 54 deletions(-)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-fail.png => fruit-catcher-fail@2x.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-kiai.png => fruit-catcher-kiai@2x.png} (100%)
 create mode 100644 osu.Game/Skinning/IAnimationTimeReference.cs

diff --git a/osu.Android.props b/osu.Android.props
index b147fdd05b..9e729d8705 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.315.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.327.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.331.0" />
   </ItemGroup>
 </Project>
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@2x.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail@2x.png
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@2x.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai@2x.png
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 5880a227c2..4d9dbbbc5f 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -72,10 +72,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         protected override Skill[] CreateSkills(IBeatmap beatmap)
         {
             using (var catcher = new 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[]
             {
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 8fa9c61b6f..13935e036b 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -37,10 +37,15 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatcherAnimationState CurrentState { get; private set; }
 
+        /// <summary>
+        /// The width of the catcher which can receive fruit. Equivalent to "catchMargin" in osu-stable.
+        /// </summary>
+        private const float allowed_catch_range = 0.8f;
+
         /// <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);
+        internal float CatchWidth => CatcherArea.CATCHER_SIZE * Math.Abs(Scale.X) * allowed_catch_range;
 
         protected bool Dashing
         {
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs b/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
index 52eb8d597e..ef69e3d2d1 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatcherSprite(CatcherAnimationState state)
             : base(new CatchSkinComponent(componentFromState(state)), _ =>
-                new DefaultCatcherSprite(state), confineMode: ConfineMode.ScaleDownToFit)
+                new DefaultCatcherSprite(state), confineMode: ConfineMode.ScaleToFit)
         {
             RelativeSizeAxes = Axes.None;
             Size = new Vector2(CatcherArea.CATCHER_SIZE);
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 6286c80d7c..9b0759d9d2 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             void handleHitCircle(DrawableHitCircle circle)
             {
-                if (!circle.IsHovered)
+                if (!circle.HitArea.IsHovered)
                     return;
 
                 Debug.Assert(circle.HitObject.HitWindows != null);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
index 7e530ca047..8bb324d02e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
     /// <summary>
     /// A single follow point positioned between two adjacent <see cref="DrawableOsuHitObject"/>s.
     /// </summary>
-    public class FollowPoint : Container
+    public class FollowPoint : Container, IAnimationTimeReference
     {
         private const float width = 8;
 
@@ -45,5 +45,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 }
             }, confineMode: ConfineMode.NoScaling);
         }
+
+        public double AnimationStartTime { get; set; }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index d0935e46f7..6f09bbcd57 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -116,6 +116,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
             int point = 0;
 
+            ClearInternal();
+
             for (int d = (int)(spacing * 1.5); d < distance - spacing; d += spacing)
             {
                 float fraction = (float)d / distance;
@@ -126,13 +128,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
                 FollowPoint fp;
 
-                if (InternalChildren.Count > point)
-                {
-                    fp = (FollowPoint)InternalChildren[point];
-                    fp.ClearTransforms();
-                }
-                else
-                    AddInternal(fp = new FollowPoint());
+                AddInternal(fp = new FollowPoint());
 
                 fp.Position = pointStartPosition;
                 fp.Rotation = rotation;
@@ -142,6 +138,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 if (firstTransformStartTime == null)
                     firstTransformStartTime = fadeInTime;
 
+                fp.AnimationStartTime = fadeInTime;
+
                 using (fp.BeginAbsoluteSequence(fadeInTime))
                 {
                     fp.FadeIn(osuEnd.TimeFadeIn);
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 38ba4c5974..e7486ef9b0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -62,6 +62,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 }
             };
 
+            bool overlayAboveNumber = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value ?? true;
+
+            if (!overlayAboveNumber)
+                ChangeInternalChildDepth(hitCircleText, -float.MaxValue);
+
             state.BindTo(drawableObject.State);
             state.BindValueChanged(updateState, true);
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index 5d99960f10..c6920bd03e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -11,6 +11,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         SliderPathRadius,
         AllowSliderBallTint,
         CursorExpand,
-        CursorRotate
+        CursorRotate,
+        HitCircleOverlayAboveNumber
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index ec94053679..3b91243fee 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -43,16 +43,15 @@ namespace osu.Game.Tests.Visual.Gameplay
                         {
                             new ExposedSkinnableDrawable("default", _ => new DefaultBox(), _ => true),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true),
-                            new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.ScaleToFit),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.NoScaling)
                         }
                     },
                 };
             });
 
-            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 30, 50 }));
+            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 50 }));
             AddStep("adjust scale", () => fill.Scale = new Vector2(2));
-            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 30, 50 }));
+            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 50 }));
         }
 
         [Test]
@@ -74,7 +73,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                         Children = new[]
                         {
                             new ExposedSkinnableDrawable("default", _ => new DefaultBox(), _ => true),
-                            new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.ScaleToFit),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.NoScaling)
                         }
@@ -82,9 +80,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                 };
             });
 
-            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 30, 50, 30 }));
+            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 50, 30 }));
             AddStep("adjust scale", () => fill.Scale = new Vector2(2));
-            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 30, 50, 30 }));
+            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 50, 30 }));
         }
 
         [Test]
@@ -182,7 +180,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             public new Drawable Drawable => base.Drawable;
 
             public ExposedSkinnableDrawable(string name, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null,
-                                            ConfineMode confineMode = ConfineMode.ScaleDownToFit)
+                                            ConfineMode confineMode = ConfineMode.ScaleToFit)
                 : base(new TestSkinComponent(name), defaultImplementation, allowFallback, confineMode)
             {
             }
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index c356dd246d..a4a560c8e4 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -28,10 +28,11 @@ namespace osu.Game.Scoring.Legacy
         {
             var score = new Score
             {
-                ScoreInfo = new ScoreInfo(),
                 Replay = new Replay()
             };
 
+            WorkingBeatmap workingBeatmap;
+
             using (SerializationReader sr = new SerializationReader(stream))
             {
                 currentRuleset = GetRuleset(sr.ReadByte());
@@ -41,7 +42,7 @@ namespace osu.Game.Scoring.Legacy
 
                 var version = sr.ReadInt32();
 
-                var workingBeatmap = GetBeatmap(sr.ReadString());
+                workingBeatmap = GetBeatmap(sr.ReadString());
                 if (workingBeatmap is DummyWorkingBeatmap)
                     throw new BeatmapNotFoundException();
 
@@ -113,6 +114,10 @@ namespace osu.Game.Scoring.Legacy
 
             CalculateAccuracy(score.ScoreInfo);
 
+            // before returning for database import, we must restore the database-sourced BeatmapInfo.
+            // if not, the clone operation in GetPlayableBeatmap will cause a dereference and subsequent database exception.
+            score.ScoreInfo.Beatmap = workingBeatmap.BeatmapInfo;
+
             return score;
         }
 
diff --git a/osu.Game/Skinning/IAnimationTimeReference.cs b/osu.Game/Skinning/IAnimationTimeReference.cs
new file mode 100644
index 0000000000..bcff10a24b
--- /dev/null
+++ b/osu.Game/Skinning/IAnimationTimeReference.cs
@@ -0,0 +1,25 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Timing;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// Denotes an object which provides a reference time to start animations from.
+    /// </summary>
+    [Cached]
+    public interface IAnimationTimeReference
+    {
+        /// <summary>
+        /// The reference clock.
+        /// </summary>
+        IFrameBasedClock Clock { get; }
+
+        /// <summary>
+        /// The time which animations should be started from, relative to <see cref="Clock"/>.
+        /// </summary>
+        double AnimationStartTime { get; }
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 52328d43b2..8765b161d4 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -3,10 +3,12 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Timing;
 
 namespace osu.Game.Skinning
 {
@@ -22,7 +24,7 @@ namespace osu.Game.Skinning
 
                 if (textures.Length > 0)
                 {
-                    var animation = new TextureAnimation
+                    var animation = new SkinnableTextureAnimation
                     {
                         DefaultFrameLength = getFrameLength(source, applyConfigFrameRate, textures),
                         Repeat = looping,
@@ -53,6 +55,25 @@ namespace osu.Game.Skinning
             }
         }
 
+        public class SkinnableTextureAnimation : TextureAnimation
+        {
+            [Resolved(canBeNull: true)]
+            private IAnimationTimeReference timeReference { get; set; }
+
+            public SkinnableTextureAnimation()
+                : base(false)
+            {
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                if (timeReference != null)
+                    Clock = new FramedOffsetClock(timeReference.Clock) { Offset = -timeReference.AnimationStartTime };
+            }
+        }
+
         private const double default_frame_time = 1000 / 60d;
 
         private static double getFrameLength(ISkin source, bool applyConfigFrameRate, Texture[] textures)
diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index f6ac6494b4..0f0d3da5aa 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -98,20 +98,13 @@ namespace osu.Game.Skinning
 
                     switch (confineMode)
                     {
-                        case ConfineMode.NoScaling:
-                            return;
-
-                        case ConfineMode.ScaleDownToFit:
-                            if (Drawable.DrawSize.X <= DrawSize.X && Drawable.DrawSize.Y <= DrawSize.Y)
-                                return;
-
+                        case ConfineMode.ScaleToFit:
+                            Drawable.RelativeSizeAxes = Axes.Both;
+                            Drawable.Size = Vector2.One;
+                            Drawable.Scale = Vector2.One;
+                            Drawable.FillMode = FillMode.Fit;
                             break;
                     }
-
-                    Drawable.RelativeSizeAxes = Axes.Both;
-                    Drawable.Size = Vector2.One;
-                    Drawable.Scale = Vector2.One;
-                    Drawable.FillMode = FillMode.Fit;
                 }
                 finally
                 {
@@ -127,7 +120,6 @@ namespace osu.Game.Skinning
         /// Don't apply any scaling. This allows the user element to be of any size, exceeding specified bounds.
         /// </summary>
         NoScaling,
-        ScaleDownToFit,
         ScaleToFit,
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index bc6e01a729..c4d796e30b 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Storyboards.Drawables
 
             AddInternal(Content = new Container<DrawableStoryboardLayer>
             {
-                Size = new Vector2(640, 480),
+                RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             });
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
index def4eed2ca..2ada83c3b4 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    public class DrawableStoryboardLayer : LifetimeManagementContainer
+    public class DrawableStoryboardLayer : CompositeDrawable
     {
         public StoryboardLayer Layer { get; }
         public bool Enabled;
@@ -23,17 +23,34 @@ namespace osu.Game.Storyboards.Drawables
             Origin = Anchor.Centre;
             Enabled = layer.VisibleWhenPassing;
             Masking = layer.Masking;
+
+            InternalChild = new LayerElementContainer(layer);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(CancellationToken? cancellationToken)
+        private class LayerElementContainer : LifetimeManagementContainer
         {
-            foreach (var element in Layer.Elements)
-            {
-                cancellationToken?.ThrowIfCancellationRequested();
+            private readonly StoryboardLayer storyboardLayer;
 
-                if (element.IsDrawable)
-                    AddInternal(element.CreateDrawable());
+            public LayerElementContainer(StoryboardLayer layer)
+            {
+                storyboardLayer = layer;
+
+                Width = 640;
+                Height = 480;
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(CancellationToken? cancellationToken)
+            {
+                foreach (var element in storyboardLayer.Elements)
+                {
+                    cancellationToken?.ThrowIfCancellationRequested();
+
+                    if (element.IsDrawable)
+                        AddInternal(element.CreateDrawable());
+                }
             }
         }
     }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 781c566b5f..30c11a1cdb 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,8 +22,8 @@
     <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.315.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.327.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.331.0" />
     <PackageReference Include="Sentry" Version="2.1.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 a2c6106931..d035f5c4d8 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,8 +70,8 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.327.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.331.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.327.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.331.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 44fcd2613f99a9844c6a87205225710a29c9292a Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Tue, 31 Mar 2020 22:58:04 +0800
Subject: [PATCH 01860/10326] Add support for special column

---
 .../Skinning/LegacyManiaColumnElement.cs      | 25 +++++++++++++------
 osu.Game.Rulesets.Mania/UI/ManiaStage.cs      |  1 +
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
index 79e5673ff2..d479d07ad1 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
 
@@ -19,20 +20,30 @@ namespace osu.Game.Rulesets.Mania.Skinning
         protected Column Column { get; private set; }
 
         /// <summary>
-        /// The column index to use for texture lookups, in the case of no user-provided configuration.
+        /// The column type identifier to use for texture lookups, in the case of no user-provided configuration.
         /// </summary>
-        protected int FallbackColumnIndex { get; private set; }
+        protected string FallbackColumnIndex { get; private set; }
 
         [BackgroundDependencyLoader]
         private void load()
         {
             if (Stage == null)
-                FallbackColumnIndex = Column.Index % 2 + 1;
+                FallbackColumnIndex = (Column.Index % 2 + 1).ToString();
             else
-            {
-                int dist = Math.Min(Column.Index, Stage.Columns.Count - Column.Index - 1);
-                FallbackColumnIndex = dist % 2 + 1;
-            }
+                switch (Column.ColumnType)
+                {
+                    case ColumnType.Special:
+                        FallbackColumnIndex = "S";
+                        break;
+
+                    case ColumnType.Odd:
+                        FallbackColumnIndex = "1";
+                        break;
+
+                    case ColumnType.Even:
+                        FallbackColumnIndex = "2";
+                        break;
+                }
         }
 
         protected override IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
index 9edb384753..047284086e 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
@@ -3,6 +3,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.Shapes;

From bb5fa472dcc43d1ff37575fe5ec0332bbc73090d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 11:59:34 +0900
Subject: [PATCH 01861/10326] Remove null-stage fallback

---
 .../Skinning/LegacyManiaColumnElement.cs      | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
index d479d07ad1..05b731ec5d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.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.Containers;
@@ -27,23 +26,20 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (Stage == null)
-                FallbackColumnIndex = (Column.Index % 2 + 1).ToString();
-            else
-                switch (Column.ColumnType)
-                {
-                    case ColumnType.Special:
-                        FallbackColumnIndex = "S";
-                        break;
+            switch (Column.ColumnType)
+            {
+                case ColumnType.Special:
+                    FallbackColumnIndex = "S";
+                    break;
 
-                    case ColumnType.Odd:
-                        FallbackColumnIndex = "1";
-                        break;
+                case ColumnType.Odd:
+                    FallbackColumnIndex = "1";
+                    break;
 
-                    case ColumnType.Even:
-                        FallbackColumnIndex = "2";
-                        break;
-                }
+                case ColumnType.Even:
+                    FallbackColumnIndex = "2";
+                    break;
+            }
         }
 
         protected override IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)

From 716c7fa07a6c6607b85ae6730fbf192160ec73a1 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 1 Apr 2020 11:04:29 +0800
Subject: [PATCH 01862/10326] Add check to detect whether mania is skinned

---
 .../Skinning/ManiaLegacySkinTransformer.cs           | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 69e6a0d238..88eb6e0d2f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -18,6 +18,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         private Lazy<bool> isLegacySkin;
 
+        /// <summary>
+        /// Whether texture for the keys exists.
+        /// Used to determine if the mania ruleset is skinned.
+        /// </summary>
+        private Lazy<bool> hasKeyTexture;
+
         public ManiaLegacySkinTransformer(ISkinSource source)
         {
             this.source = source;
@@ -29,6 +35,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private void sourceChanged()
         {
             isLegacySkin = new Lazy<bool>(() => source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
+            hasKeyTexture = new Lazy<bool>(() => source.GetTexture(
+                source.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
+                    new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value
+                    ?? $"mania-key1") != null);
         }
 
         public Drawable GetDrawableComponent(ISkinComponent component)
@@ -39,7 +49,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     return getResult(resultComponent);
 
                 case ManiaSkinComponent maniaComponent:
-                    if (!isLegacySkin.Value)
+                    if (!isLegacySkin.Value || !hasKeyTexture.Value)
                         return null;
 
                     switch (maniaComponent.Component)

From c10a91a33ed488bdc57d219224fb86355b9c6266 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 12:04:33 +0900
Subject: [PATCH 01863/10326] Add odd/even type to test scenes

---
 osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
index c807e98871..ff4865c71d 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osuTK.Graphics;
 
@@ -26,7 +27,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             this.column = new Column(column)
             {
                 Action = { Value = action },
-                AccentColour = Color4.Orange
+                AccentColour = Color4.Orange,
+                ColumnType = column % 2 == 0 ? ColumnType.Even : ColumnType.Odd
             };
 
             InternalChild = content = new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)

From 66486b094c162625fff9bdeafe8cf1a440905913 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 13:31:17 +0900
Subject: [PATCH 01864/10326] Remove unnecessary dependency, allow null mods

---
 osu.Game/Rulesets/UI/Playfield.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 8141108aef..c52183f3f2 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -10,7 +10,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osuTK;
 
@@ -62,10 +61,7 @@ namespace osu.Game.Rulesets.UI
             hitObjectContainerLazy = new Lazy<HitObjectContainer>(CreateHitObjectContainer);
         }
 
-        [Resolved]
-        private IBindable<WorkingBeatmap> beatmap { get; set; }
-
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private IReadOnlyList<Mod> mods { get; set; }
 
         [BackgroundDependencyLoader]
@@ -137,7 +133,7 @@ namespace osu.Game.Rulesets.UI
         {
             base.Update();
 
-            if (beatmap != null)
+            if (mods != null)
             {
                 foreach (var mod in mods)
                 {

From aac77096400c4fa48e1410e27b264409a91e71f4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 13:31:25 +0900
Subject: [PATCH 01865/10326] Add stage test scene

---
 .../Skinning/TestSceneStage.cs                | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs
new file mode 100644
index 0000000000..0d5ebd33e9
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.UI;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    public class TestSceneStage : ManiaSkinnableTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            SetContents(() =>
+            {
+                ManiaAction normalAction = ManiaAction.Key1;
+                ManiaAction specialAction = ManiaAction.Special1;
+
+                return new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)
+                {
+                    Child = new ManiaStage(0, new StageDefinition { Columns = 4 }, ref normalAction, ref specialAction)
+                };
+            });
+        }
+    }
+}

From 2d6d1a8cc6102c03ea56703c0dc1f5189bc38f69 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 13:38:03 +0900
Subject: [PATCH 01866/10326] Implement column width and column spacing

---
 osu.Game.Rulesets.Mania/UI/Column.cs          | 21 ++---------
 osu.Game.Rulesets.Mania/UI/ManiaStage.cs      | 37 ++++++++++++++++++-
 .../LegacyManiaSkinConfigurationLookup.cs     |  2 +
 osu.Game/Skinning/LegacySkin.cs               |  9 +++++
 4 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 141718ef5e..153345dde7 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.UI
     public class Column : ScrollingPlayfield, IKeyBindingHandler<ManiaAction>, IHasAccentColour
     {
         public const float COLUMN_WIDTH = 80;
-        private const float special_column_width = 70;
+        public const float SPECIAL_COLUMN_WIDTH = 70;
 
         /// <summary>
         /// The index of this column as part of the whole playfield.
@@ -42,7 +42,6 @@ namespace osu.Game.Rulesets.Mania.UI
             Index = index;
 
             RelativeSizeAxes = Axes.Y;
-            Width = COLUMN_WIDTH;
 
             Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
             {
@@ -67,23 +66,9 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public override Axes RelativeSizeAxes => Axes.Y;
 
-        private ColumnType columnType;
+        public ColumnType ColumnType { get; set; }
 
-        public ColumnType ColumnType
-        {
-            get => columnType;
-            set
-            {
-                if (columnType == value)
-                    return;
-
-                columnType = value;
-
-                Width = IsSpecial ? special_column_width : COLUMN_WIDTH;
-            }
-        }
-
-        public bool IsSpecial => columnType == ColumnType.Special;
+        public bool IsSpecial => ColumnType == ColumnType.Special;
 
         public Color4 AccentColour { get; set; }
 
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
index 047284086e..0e3fd52a13 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
@@ -93,7 +94,6 @@ namespace osu.Game.Rulesets.Mania.UI
                                     AutoSizeAxes = Axes.X,
                                     Direction = FillDirection.Horizontal,
                                     Padding = new MarginPadding { Left = COLUMN_SPACING, Right = COLUMN_SPACING },
-                                    Spacing = new Vector2(COLUMN_SPACING, 0)
                                 },
                             }
                         },
@@ -150,6 +150,41 @@ namespace osu.Game.Rulesets.Mania.UI
             }, true);
         }
 
+        private ISkin currentSkin;
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            currentSkin = skin;
+            skin.SourceChanged += onSkinChanged;
+
+            onSkinChanged();
+        }
+
+        private void onSkinChanged()
+        {
+            foreach (var col in columnFlow)
+            {
+                if (col.Index > 0)
+                {
+                    float spacing = currentSkin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
+                                                   new LegacyManiaSkinConfigurationLookup(Columns.Count, LegacyManiaSkinConfigurationLookups.ColumnSpacing, col.Index - 1))
+                                               ?.Value ?? COLUMN_SPACING;
+
+                    col.Margin = new MarginPadding { Left = spacing };
+                }
+
+                float? width = currentSkin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
+                                              new LegacyManiaSkinConfigurationLookup(Columns.Count, LegacyManiaSkinConfigurationLookups.ColumnWidth, col.Index))
+                                          ?.Value;
+
+                if (width == null)
+                    col.Width = col.IsSpecial ? Column.SPECIAL_COLUMN_WIDTH : Column.COLUMN_WIDTH;
+                else
+                    col.Width = width.Value;
+            }
+        }
+
         public void AddColumn(Column c)
         {
             topLevelContainer.Add(c.TopLevelContainer.CreateProxy());
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 72556a79b4..67895a69e4 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Skinning
 
     public enum LegacyManiaSkinConfigurationLookups
     {
+        ColumnWidth,
+        ColumnSpacing,
         LightImage,
         LeftLineWidth,
         RightLineWidth,
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index bcab84ddd9..7d0fa2489e 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using JetBrains.Annotations;
@@ -129,6 +130,14 @@ namespace osu.Game.Skinning
 
                     switch (maniaLookup.Lookup)
                     {
+                        case LegacyManiaSkinConfigurationLookups.ColumnWidth:
+                            Debug.Assert(maniaLookup.TargetColumn != null);
+                            return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.TargetColumn.Value]));
+
+                        case LegacyManiaSkinConfigurationLookups.ColumnSpacing:
+                            Debug.Assert(maniaLookup.TargetColumn != null);
+                            return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnSpacing[maniaLookup.TargetColumn.Value]));
+
                         case LegacyManiaSkinConfigurationLookups.HitPosition:
                             return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));
 

From 87e5e98caedb8e0f5d97a91deb72d7a8b4b9d30d Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 1 Apr 2020 14:17:23 +0800
Subject: [PATCH 01867/10326] use GetAnimation for checking

---
 .../Skinning/ManiaLegacySkinTransformer.cs                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 88eb6e0d2f..9b077fc398 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -35,10 +35,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private void sourceChanged()
         {
             isLegacySkin = new Lazy<bool>(() => source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
-            hasKeyTexture = new Lazy<bool>(() => source.GetTexture(
+            hasKeyTexture = new Lazy<bool>(() => source.GetAnimation(
                 source.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
                     new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value
-                    ?? $"mania-key1") != null);
+                    ?? $"mania-key1", true, true) != null);
         }
 
         public Drawable GetDrawableComponent(ISkinComponent component)

From 9de348235e7df98b1d6fe17082b73b976aafe9d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 1 Apr 2020 15:30:51 +0900
Subject: [PATCH 01868/10326] Add comment about legacy fallback widths

---
 osu.Game.Rulesets.Mania/UI/ManiaStage.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
index 0e3fd52a13..b5f2c126ae 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
@@ -179,6 +179,7 @@ namespace osu.Game.Rulesets.Mania.UI
                                           ?.Value;
 
                 if (width == null)
+                    // only used by default skin (legacy skins get defaults set in LegacyManiaSkinConfiguration)
                     col.Width = col.IsSpecial ? Column.SPECIAL_COLUMN_WIDTH : Column.COLUMN_WIDTH;
                 else
                     col.Width = width.Value;

From ff2c5b446e9787494d1ad9690036904a3bf43ddf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 16:05:52 +0900
Subject: [PATCH 01869/10326] Fix column lights positioned incorrectly

---
 osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs | 5 +++++
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs          | 1 +
 osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs    | 1 +
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs                | 4 ++++
 osu.Game/Skinning/LegacySkin.cs                            | 3 +++
 5 files changed, 14 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index b4bf6b1652..7e8f720e99 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -42,6 +42,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
             bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
                                 || Stage == null || Column.Index == Stage.Columns.Count - 1;
 
+            float lightPosition = skin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
+                                      new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LightPosition))?.Value
+                                  ?? 0;
+
             InternalChildren = new Drawable[]
             {
                 new Box
@@ -67,6 +71,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 {
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Bottom = lightPosition },
                     Child = light = new Sprite
                     {
                         Anchor = Anchor.BottomCentre,
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 56d2652e76..0d0c4943ef 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Skinning
         public readonly float[] ColumnWidth;
 
         public float HitPosition = 124.8f; // (480 - 402) * 1.6f
+        public float LightPosition = 107.2f; // (480 - 413) * 1.6f
         public bool ShowJudgementLine = true;
 
         public LegacyManiaSkinConfiguration(int keys)
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 67895a69e4..49e4faa269 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Skinning
         LeftLineWidth,
         RightLineWidth,
         HitPosition,
+        LightPosition,
         HitTargetImage,
         ShowJudgementLine,
         KeyImage,
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 2c6b76847d..dabdd0a980 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -91,6 +91,10 @@ namespace osu.Game.Skinning
                         currentConfig.HitPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * size_scale_factor;
                         break;
 
+                    case "LightPosition":
+                        currentConfig.LightPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * size_scale_factor;
+                        break;
+
                     case "JudgementLine":
                         currentConfig.ShowJudgementLine = pair.Value == "1";
                         break;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 7d0fa2489e..eafbdd4ee5 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -141,6 +141,9 @@ namespace osu.Game.Skinning
                         case LegacyManiaSkinConfigurationLookups.HitPosition:
                             return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));
 
+                        case LegacyManiaSkinConfigurationLookups.LightPosition:
+                            return SkinUtils.As<TValue>(new Bindable<float>(existing.LightPosition));
+
                         case LegacyManiaSkinConfigurationLookups.ShowJudgementLine:
                             return SkinUtils.As<TValue>(new Bindable<bool>(existing.ShowJudgementLine));
                     }

From 59eac34d82ba057f273b44f43ceee9faabae9565 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 18:00:17 +0900
Subject: [PATCH 01870/10326] Fix barlines scrolling at different speeds in
 legacy skins

---
 .../UI/Components/ColumnHitObjectArea.cs      | 52 +++++------------
 .../UI/Components/HitObjectArea.cs            | 57 +++++++++++++++++++
 osu.Game.Rulesets.Mania/UI/ManiaStage.cs      | 16 +-----
 3 files changed, 73 insertions(+), 52 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs

diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
index fb6e8a87e5..6cf08a708d 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.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.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
@@ -12,65 +10,41 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.UI.Components
 {
-    public class ColumnHitObjectArea : SkinReloadableDrawable
+    public class ColumnHitObjectArea : HitObjectArea
     {
         public readonly Container<HitExplosion> Explosions;
-
-        [Resolved(CanBeNull = true)]
-        private ManiaStage stage { get; set; }
-
-        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
         private readonly Drawable hitTarget;
 
         public ColumnHitObjectArea(HitObjectContainer hitObjectContainer)
+            : base(hitObjectContainer)
         {
-            InternalChildren = new[]
+            AddRangeInternal(new[]
             {
                 hitTarget = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitTarget), _ => new DefaultHitTarget())
                 {
                     RelativeSizeAxes = Axes.X,
+                    Depth = 1
                 },
-                hitObjectContainer,
-                Explosions = new Container<HitExplosion> { RelativeSizeAxes = Axes.Both }
-            };
+                Explosions = new Container<HitExplosion>
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = -1,
+                }
+            });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
+        protected override void UpdateHitPosition()
         {
-            direction.BindTo(scrollingInfo.Direction);
-            direction.BindValueChanged(onDirectionChanged, true);
-        }
+            base.UpdateHitPosition();
 
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-            updateHitPosition();
-        }
-
-        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
-        {
-            updateHitPosition();
-        }
-
-        private void updateHitPosition()
-        {
-            float hitPosition = CurrentSkin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
-                                    new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.HitPosition))?.Value
-                                ?? ManiaStage.HIT_TARGET_POSITION;
-
-            if (direction.Value == ScrollingDirection.Up)
+            if (Direction.Value == ScrollingDirection.Up)
             {
                 hitTarget.Anchor = hitTarget.Origin = Anchor.TopLeft;
-
-                Padding = new MarginPadding { Top = hitPosition };
                 Explosions.Padding = new MarginPadding { Top = DefaultNotePiece.NOTE_HEIGHT };
             }
             else
             {
                 hitTarget.Anchor = hitTarget.Origin = Anchor.BottomLeft;
-
-                Padding = new MarginPadding { Bottom = hitPosition };
                 Explosions.Padding = new MarginPadding { Bottom = DefaultNotePiece.NOTE_HEIGHT };
             }
         }
diff --git a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
new file mode 100644
index 0000000000..9e62445c81
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.UI.Components
+{
+    public class HitObjectArea : SkinReloadableDrawable
+    {
+        protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
+
+        [Resolved(CanBeNull = true)]
+        private ManiaStage stage { get; set; }
+
+        public HitObjectArea(HitObjectContainer hitObjectContainer)
+        {
+            InternalChildren = new[]
+            {
+                hitObjectContainer,
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            Direction.BindTo(scrollingInfo.Direction);
+            Direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+            UpdateHitPosition();
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            UpdateHitPosition();
+        }
+
+        protected virtual void UpdateHitPosition()
+        {
+            float hitPosition = CurrentSkin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
+                                    new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.HitPosition))?.Value
+                                ?? ManiaStage.HIT_TARGET_POSITION;
+
+            Padding = Direction.Value == ScrollingDirection.Up
+                ? new MarginPadding { Top = hitPosition }
+                : new MarginPadding { Bottom = hitPosition };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
index b5f2c126ae..c6102675a1 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -33,11 +34,10 @@ namespace osu.Game.Rulesets.Mania.UI
         public IReadOnlyList<Column> Columns => columnFlow.Children;
         private readonly FillFlowContainer<Column> columnFlow;
 
-        private readonly Container barLineContainer;
-
         public Container<DrawableManiaJudgement> Judgements => judgements;
         private readonly JudgementContainer<DrawableManiaJudgement> judgements;
 
+        private readonly Drawable barLineContainer;
         private readonly Container topLevelContainer;
 
         private readonly Dictionary<ColumnType, Color4> columnColours = new Dictionary<ColumnType, Color4>
@@ -106,13 +106,12 @@ namespace osu.Game.Rulesets.Mania.UI
                             Width = 1366, // Bar lines should only be masked on the vertical axis
                             BypassAutoSizeAxes = Axes.Both,
                             Masking = true,
-                            Child = barLineContainer = new Container
+                            Child = barLineContainer = new HitObjectArea(HitObjectContainer)
                             {
                                 Name = "Bar lines",
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 RelativeSizeAxes = Axes.Y,
-                                Child = HitObjectContainer
                             }
                         },
                         judgements = new JudgementContainer<DrawableManiaJudgement>
@@ -139,15 +138,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
                 AddColumn(column);
             }
-
-            Direction.BindValueChanged(dir =>
-            {
-                barLineContainer.Padding = new MarginPadding
-                {
-                    Top = dir.NewValue == ScrollingDirection.Up ? HIT_TARGET_POSITION : 0,
-                    Bottom = dir.NewValue == ScrollingDirection.Down ? HIT_TARGET_POSITION : 0,
-                };
-            }, true);
         }
 
         private ISkin currentSkin;

From 558feade87b1180842b9bd22a469a0f889c07dbd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 18:19:11 +0900
Subject: [PATCH 01871/10326] Fix ci warnings

---
 osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 9b077fc398..3e423c6b0f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             hasKeyTexture = new Lazy<bool>(() => source.GetAnimation(
                 source.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
                     new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value
-                    ?? $"mania-key1", true, true) != null);
+                ?? "mania-key1", true, true) != null);
         }
 
         public Drawable GetDrawableComponent(ISkinComponent component)

From f4d8defa48b81cd79caefd57b14d5a777c3fbd20 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 20:01:35 +0900
Subject: [PATCH 01872/10326] Fix incorrect explosion position on default skin

---
 osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
index fb6e8a87e5..1b744df331 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
@@ -64,14 +64,14 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                 hitTarget.Anchor = hitTarget.Origin = Anchor.TopLeft;
 
                 Padding = new MarginPadding { Top = hitPosition };
-                Explosions.Padding = new MarginPadding { Top = DefaultNotePiece.NOTE_HEIGHT };
+                Explosions.Padding = new MarginPadding { Top = DefaultNotePiece.NOTE_HEIGHT / 2 };
             }
             else
             {
                 hitTarget.Anchor = hitTarget.Origin = Anchor.BottomLeft;
 
                 Padding = new MarginPadding { Bottom = hitPosition };
-                Explosions.Padding = new MarginPadding { Bottom = DefaultNotePiece.NOTE_HEIGHT };
+                Explosions.Padding = new MarginPadding { Bottom = DefaultNotePiece.NOTE_HEIGHT / 2 };
             }
         }
     }

From 4d8b6c47cc189a2bb4d4af49ddd8e3edaf6dc307 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 1 Apr 2020 21:23:43 +0900
Subject: [PATCH 01873/10326] 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 9e729d8705..cb848c0433 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.331.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.401.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 30c11a1cdb..4a9d2e0830 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.331.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.331.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.401.0" />
     <PackageReference Include="Sentry" Version="2.1.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 d035f5c4d8..a528bd5658 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.331.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.331.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.401.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.331.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.401.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1562612f41681da4ead59c0d220068f933ef5faf Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 1 Apr 2020 15:12:31 +0200
Subject: [PATCH 01874/10326] Update visual tests and remove unessecary XMLDoc
 tag

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs  | 30 ++++++++++++++++---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs    |  1 -
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 3016890ade..97fe0ac769 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -1,7 +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.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Testing;
+using osu.Game.Configuration;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -10,22 +15,39 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private readonly FailingLayer layer;
 
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
         public TestSceneFailingLayer()
         {
             Child = layer = new FailingLayer();
         }
 
+        [Test]
+        public void TestLayerConfig()
+        {
+            AddStep("enable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddWaitStep("wait for transition to finish", 5);
+            AddAssert("layer is enabled", () => layer.IsPresent);
+
+            AddStep("disable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddWaitStep("wait for transition to finish", 5);
+            AddAssert("layer is disabled", () => !layer.IsPresent);
+            AddStep("restore layer enabling", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+        }
+
         [Test]
         public void TestLayerFading()
         {
-            AddSliderStep("current health", 0.0, 1.0, 1.0, val =>
-            {
-                layer.Current.Value = val;
-            });
+            AddSliderStep("current health", 0.0, 1.0, 1.0, val => layer.Current.Value = val);
+            var box = layer.ChildrenOfType<Box>().First();
 
             AddStep("set health to 0.10", () => layer.Current.Value = 0.10);
             AddWaitStep("wait for fade to finish", 5);
+            AddAssert("layer fade is visible", () => box.IsPresent);
             AddStep("set health to 1", () => layer.Current.Value = 1f);
+            AddWaitStep("wait for fade to finish", 10);
+            AddAssert("layer fade is invisible", () => !box.IsPresent);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 4ea08626ad..01cb64a88c 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Screens.Play.HUD
         /// <summary>
         /// Bind the tracked fields of <see cref="HealthProcessor"/> to this health display.
         /// </summary>
-        /// <param name="processor"></param>
         public void BindHealthProcessor(HealthProcessor processor)
         {
             Current.BindTo(processor.Health);

From c2c7ff7334ad02bd00c0d51967113a9fb7b6f8ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 1 Apr 2020 23:32:33 +0900
Subject: [PATCH 01875/10326] Add temporary logic to LegacySkin

---
 osu.Game/Skinning/LegacySkin.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index eafbdd4ee5..d915a03fd0 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.Diagnostics;
 using System.IO;
@@ -27,7 +28,13 @@ namespace osu.Game.Skinning
         [CanBeNull]
         protected IResourceStore<SampleChannel> Samples;
 
-        protected virtual bool AllowManiaSkin => true;
+        /// <summary>
+        /// Whether texture for the keys exists.
+        /// Used to determine if the mania ruleset is skinned.
+        /// </summary>
+        private readonly Lazy<bool> hasKeyTexture;
+
+        protected virtual bool AllowManiaSkin => hasKeyTexture.Value;
 
         public new LegacySkinConfiguration Configuration
         {
@@ -77,6 +84,12 @@ namespace osu.Game.Skinning
 
                 (storage as ResourceStore<byte[]>)?.AddExtension("ogg");
             }
+
+            // todo: this shouldn't really be duplicated here (from ManiaLegacySkinTransformer). we need to come up with a better solution.
+            hasKeyTexture = new Lazy<bool>(() => this.GetAnimation(
+                GetConfig<LegacyManiaSkinConfigurationLookup, string>(
+                    new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value
+                ?? "mania-key1", true, true) != null);
         }
 
         protected override void Dispose(bool isDisposing)

From a76428f965220c9f89dcbd349dc240b82678cedc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 1 Apr 2020 23:46:50 +0900
Subject: [PATCH 01876/10326] Move lookup to own function

---
 osu.Game/Skinning/LegacySkin.cs | 57 ++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index d915a03fd0..52655fd01a 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -87,9 +87,7 @@ namespace osu.Game.Skinning
 
             // todo: this shouldn't really be duplicated here (from ManiaLegacySkinTransformer). we need to come up with a better solution.
             hasKeyTexture = new Lazy<bool>(() => this.GetAnimation(
-                GetConfig<LegacyManiaSkinConfigurationLookup, string>(
-                    new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value
-                ?? "mania-key1", true, true) != null);
+                lookupForMania<string>(new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value ?? "mania-key1", true, true) != null);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -138,28 +136,9 @@ namespace osu.Game.Skinning
                     if (!AllowManiaSkin)
                         return null;
 
-                    if (!maniaConfigurations.TryGetValue(maniaLookup.Keys, out var existing))
-                        maniaConfigurations[maniaLookup.Keys] = existing = new LegacyManiaSkinConfiguration(maniaLookup.Keys);
-
-                    switch (maniaLookup.Lookup)
-                    {
-                        case LegacyManiaSkinConfigurationLookups.ColumnWidth:
-                            Debug.Assert(maniaLookup.TargetColumn != null);
-                            return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.TargetColumn.Value]));
-
-                        case LegacyManiaSkinConfigurationLookups.ColumnSpacing:
-                            Debug.Assert(maniaLookup.TargetColumn != null);
-                            return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnSpacing[maniaLookup.TargetColumn.Value]));
-
-                        case LegacyManiaSkinConfigurationLookups.HitPosition:
-                            return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));
-
-                        case LegacyManiaSkinConfigurationLookups.LightPosition:
-                            return SkinUtils.As<TValue>(new Bindable<float>(existing.LightPosition));
-
-                        case LegacyManiaSkinConfigurationLookups.ShowJudgementLine:
-                            return SkinUtils.As<TValue>(new Bindable<bool>(existing.ShowJudgementLine));
-                    }
+                    var result = lookupForMania<TValue>(maniaLookup);
+                    if (result != null)
+                        return result;
 
                     break;
 
@@ -190,6 +169,34 @@ namespace osu.Game.Skinning
             return null;
         }
 
+        private IBindable<TValue> lookupForMania<TValue>(LegacyManiaSkinConfigurationLookup maniaLookup)
+        {
+            if (!maniaConfigurations.TryGetValue(maniaLookup.Keys, out var existing))
+                maniaConfigurations[maniaLookup.Keys] = existing = new LegacyManiaSkinConfiguration(maniaLookup.Keys);
+
+            switch (maniaLookup.Lookup)
+            {
+                case LegacyManiaSkinConfigurationLookups.ColumnWidth:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.TargetColumn.Value]));
+
+                case LegacyManiaSkinConfigurationLookups.ColumnSpacing:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnSpacing[maniaLookup.TargetColumn.Value]));
+
+                case LegacyManiaSkinConfigurationLookups.HitPosition:
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));
+
+                case LegacyManiaSkinConfigurationLookups.LightPosition:
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.LightPosition));
+
+                case LegacyManiaSkinConfigurationLookups.ShowJudgementLine:
+                    return SkinUtils.As<TValue>(new Bindable<bool>(existing.ShowJudgementLine));
+            }
+
+            return null;
+        }
+
         private IBindable<Color4> getCustomColour(string lookup) => Configuration.CustomColours.TryGetValue(lookup, out var col) ? new Bindable<Color4>(col) : null;
 
         public override Drawable GetDrawableComponent(ISkinComponent component)

From beb1f037e97a8f0ebb5c7b698f1af538e46ff167 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 14:30:22 +0900
Subject: [PATCH 01877/10326] Add startAtCurrentTime parameter to
 GetAnimation()

---
 osu.Game/Skinning/IAnimationTimeReference.cs | 4 ++++
 osu.Game/Skinning/LegacySkinExtensions.cs    | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/IAnimationTimeReference.cs b/osu.Game/Skinning/IAnimationTimeReference.cs
index bcff10a24b..4ed5ef64c3 100644
--- a/osu.Game/Skinning/IAnimationTimeReference.cs
+++ b/osu.Game/Skinning/IAnimationTimeReference.cs
@@ -9,6 +9,10 @@ namespace osu.Game.Skinning
     /// <summary>
     /// Denotes an object which provides a reference time to start animations from.
     /// </summary>
+    /// <remarks>
+    /// This should not be used to start an animation immediately at the current time.
+    /// To do so, use <see cref="LegacySkinExtensions.GetAnimation"/> with <code>startAtCurrentTime = true</code> instead.
+    /// </remarks>
     [Cached]
     public interface IAnimationTimeReference
     {
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 8765b161d4..a736174f13 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -14,7 +14,8 @@ namespace osu.Game.Skinning
 {
     public static class LegacySkinExtensions
     {
-        public static Drawable GetAnimation(this ISkin source, string componentName, bool animatable, bool looping, bool applyConfigFrameRate = false, string animationSeparator = "-")
+        public static Drawable GetAnimation(this ISkin source, string componentName, bool animatable, bool looping, bool applyConfigFrameRate = false, string animationSeparator = "-",
+                                            bool startAtCurrentTime = false)
         {
             Texture texture;
 
@@ -24,7 +25,7 @@ namespace osu.Game.Skinning
 
                 if (textures.Length > 0)
                 {
-                    var animation = new SkinnableTextureAnimation
+                    var animation = new SkinnableTextureAnimation(startAtCurrentTime)
                     {
                         DefaultFrameLength = getFrameLength(source, applyConfigFrameRate, textures),
                         Repeat = looping,
@@ -60,8 +61,8 @@ namespace osu.Game.Skinning
             [Resolved(canBeNull: true)]
             private IAnimationTimeReference timeReference { get; set; }
 
-            public SkinnableTextureAnimation()
-                : base(false)
+            public SkinnableTextureAnimation(bool startAtCurrentTime = true)
+                : base(startAtCurrentTime)
             {
             }
 

From 94031b57eaceb94f9b0a575dd1ea3b319d522d52 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 19:19:32 +0900
Subject: [PATCH 01878/10326] Split hit explosion positioning from column

---
 .../{ => Skinning}/TestSceneHitExplosion.cs   | 52 ++++++++++---------
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |  1 +
 osu.Game.Rulesets.Mania/UI/Column.cs          |  6 +--
 .../UI/Components/ColumnHitObjectArea.cs      | 11 +---
 ...HitExplosion.cs => DefaultHitExplosion.cs} | 32 +++++++++++-
 5 files changed, 64 insertions(+), 38 deletions(-)
 rename osu.Game.Rulesets.Mania.Tests/{ => Skinning}/TestSceneHitExplosion.cs (54%)
 rename osu.Game.Rulesets.Mania/UI/{HitExplosion.cs => DefaultHitExplosion.cs} (81%)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
similarity index 54%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneHitExplosion.cs
rename to osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
index 9a50bc3926..a8362d6048 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
@@ -3,42 +3,32 @@
 
 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.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Tests.Visual;
+using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
     [TestFixture]
-    public class TestSceneHitExplosion : OsuTestScene
+    public class TestSceneHitExplosion : ManiaSkinnableTestScene
     {
-        private ScrollingTestContainer scrolling;
-
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(DrawableNote),
             typeof(DrawableManiaHitObject),
         };
 
-        protected override void LoadComplete()
+        public TestSceneHitExplosion()
         {
-            base.LoadComplete();
-
-            Child = scrolling = new ScrollingTestContainer(ScrollingDirection.Down)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativePositionAxes = Axes.Y,
-                Y = -0.25f,
-                Size = new Vector2(Column.COLUMN_WIDTH, DefaultNotePiece.NOTE_HEIGHT),
-            };
-
             int runcount = 0;
 
             AddRepeatStep("explode", () =>
@@ -48,15 +38,29 @@ namespace osu.Game.Rulesets.Mania.Tests
                 if (runcount % 15 > 12)
                     return;
 
-                scrolling.AddRange(new Drawable[]
+                CreatedDrawables.OfType<Container>().ForEach(c =>
                 {
-                    new HitExplosion((runcount / 15) % 2 == 0 ? new Color4(94, 0, 57, 255) : new Color4(6, 84, 0, 255), runcount % 6 != 0)
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    }
+                    c.Add(new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion),
+                        _ => new DefaultHitExplosion((runcount / 15) % 2 == 0 ? new Color4(94, 0, 57, 255) : new Color4(6, 84, 0, 255), runcount % 6 != 0)
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        }));
                 });
             }, 100);
         }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            SetContents(() => new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativePositionAxes = Axes.Y,
+                Y = -0.25f,
+                Size = new Vector2(Column.COLUMN_WIDTH, DefaultNotePiece.NOTE_HEIGHT),
+            });
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index dd1052ad0e..7d1c4ff8b3 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -26,5 +26,6 @@ namespace osu.Game.Rulesets.Mania
         HoldNoteHead,
         HoldNoteTail,
         HoldNoteBody,
+        HitExplosion
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 153345dde7..60cf019939 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -105,10 +105,10 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!result.IsHit || !judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            hitObjectArea.Explosions.Add(new HitExplosion(judgedObject.AccentColour.Value, judgedObject is DrawableHoldNoteTick)
+            hitObjectArea.Explosions.Add(new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion), _ =>
+                new DefaultHitExplosion(judgedObject.AccentColour.Value, judgedObject is DrawableHoldNoteTick))
             {
-                Anchor = Direction.Value == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre,
-                Origin = Anchor.Centre
+                RelativeSizeAxes = Axes.Both
             });
         }
 
diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
index c3c69b0ff3..aa02f67c8e 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
@@ -12,7 +11,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 {
     public class ColumnHitObjectArea : HitObjectArea
     {
-        public readonly Container<HitExplosion> Explosions;
+        public readonly Container<Drawable> Explosions;
         private readonly Drawable hitTarget;
 
         public ColumnHitObjectArea(HitObjectContainer hitObjectContainer)
@@ -25,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                     RelativeSizeAxes = Axes.X,
                     Depth = 1
                 },
-                Explosions = new Container<HitExplosion>
+                Explosions = new Container<Drawable>
                 {
                     RelativeSizeAxes = Axes.Both,
                     Depth = -1,
@@ -38,15 +37,9 @@ namespace osu.Game.Rulesets.Mania.UI.Components
             base.UpdateHitPosition();
 
             if (Direction.Value == ScrollingDirection.Up)
-            {
                 hitTarget.Anchor = hitTarget.Origin = Anchor.TopLeft;
-                Explosions.Padding = new MarginPadding { Top = DefaultNotePiece.NOTE_HEIGHT / 2 };
-            }
             else
-            {
                 hitTarget.Anchor = hitTarget.Origin = Anchor.BottomLeft;
-                Explosions.Padding = new MarginPadding { Bottom = DefaultNotePiece.NOTE_HEIGHT / 2 };
-            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/HitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
similarity index 81%
rename from osu.Game.Rulesets.Mania/UI/HitExplosion.cs
rename to osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index 824b087cb9..a4398f6ed7 100644
--- a/osu.Game.Rulesets.Mania/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -1,26 +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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
-    public class HitExplosion : CompositeDrawable
+    public class DefaultHitExplosion : CompositeDrawable
     {
         public override bool RemoveWhenNotAlive => true;
 
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
         private readonly CircularContainer largeFaint;
         private readonly CircularContainer mainGlow1;
 
-        public HitExplosion(Color4 objectColour, bool isSmall = false)
+        public DefaultHitExplosion(Color4 objectColour, bool isSmall = false)
         {
+            Origin = Anchor.Centre;
+
             RelativeSizeAxes = Axes.X;
             Height = DefaultNotePiece.NOTE_HEIGHT;
 
@@ -109,6 +116,13 @@ namespace osu.Game.Rulesets.Mania.UI
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
         protected override void LoadComplete()
         {
             const double duration = 200;
@@ -124,5 +138,19 @@ namespace osu.Game.Rulesets.Mania.UI
             this.FadeOut(duration, Easing.Out);
             Expire(true);
         }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (direction.NewValue == ScrollingDirection.Up)
+            {
+                Anchor = Anchor.TopCentre;
+                Y = DefaultNotePiece.NOTE_HEIGHT / 2;
+            }
+            else
+            {
+                Anchor = Anchor.BottomCentre;
+                Y = -DefaultNotePiece.NOTE_HEIGHT / 2;
+            }
+        }
     }
 }

From c8eee8d204c075174d99af7d629a042cb4ce7ee5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 20:00:52 +0900
Subject: [PATCH 01879/10326] Add structure for legacy hit explosions

---
 .../Skinning/LegacyHitExplosion.cs            | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
new file mode 100644
index 0000000000..404d464018
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class LegacyHitExplosion : LegacyManiaColumnElement
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Drawable explosion;
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            InternalChild = explosion = new Sprite
+            {
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+
+            // Todo: LightingN
+            // Todo: LightingL
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> obj)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            lighting.FadeInFromZero(80)
+                    .Then().FadeOut(120);
+        }
+    }
+}

From 09eb9facdd6eb72543cd6c0e3ce6f7b3817966e1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 12:01:07 +0900
Subject: [PATCH 01880/10326] Add column to test scene

---
 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
index a8362d6048..718dbbea93 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new Container
+            SetContents(() => new ColumnTestContainer(0, ManiaAction.Key1)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

From b375a02cff1ea6813423a85d214677cef131599e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 14:24:09 +0900
Subject: [PATCH 01881/10326] Cleanup positioning factor definition

---
 .../Skinning/LegacyHitExplosion.cs            | 45 +++++++++++++------
 .../Skinning/LegacyManiaSkinConfiguration.cs  | 16 +++++--
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs   |  8 ++--
 3 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index 404d464018..688ee7e340 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -1,45 +1,64 @@
 // Copyright (c) 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.Sprites;
+using osu.Framework.Graphics.Animations;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyHitExplosion : LegacyManiaColumnElement
+    public class LegacyHitExplosion : LegacyManiaElement
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private Drawable explosion;
 
-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
+        public LegacyHitExplosion()
         {
-            InternalChild = explosion = new Sprite
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        {
+            string imageName = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.ExplosionImage)?.Value
+                               ?? "lightingN";
+
+            InternalChild = explosion = skin.GetAnimation(imageName, true, false, startAtCurrentTime: true).With(d =>
             {
-            };
+                if (d == null)
+                    return;
+
+                d.Origin = Anchor.Centre;
+                d.Blending = BlendingParameters.Additive;
+
+                if (!(d is TextureAnimation texAnimation))
+                    return;
+
+                if (texAnimation.FrameCount > 0)
+                    texAnimation.DefaultFrameLength = Math.Max(texAnimation.DefaultFrameLength, 170.0 / texAnimation.FrameCount);
+            });
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
-
-            // Todo: LightingN
-            // Todo: LightingL
         }
 
-        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> obj)
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
         {
-            throw new System.NotImplementedException();
+            if (explosion != null)
+                explosion.Anchor = direction.NewValue == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            lighting.FadeInFromZero(80)
-                    .Then().FadeOut(120);
+            explosion?.FadeInFromZero(80)
+                     .Then().FadeOut(120);
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 0d0c4943ef..ba29870ffa 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -7,14 +7,24 @@ namespace osu.Game.Skinning
 {
     public class LegacyManiaSkinConfiguration
     {
+        /// <summary>
+        /// Conversion factor from converting legacy positioning values (based in x480 dimensions) to x768.
+        /// </summary>
+        public const float POSITION_SCALE_FACTOR = 1.6f;
+
+        /// <summary>
+        /// Size of a legacy column in the default skin, used for determining relative scale factors.
+        /// </summary>
+        public const float DEFAULT_COLUMN_SIZE = 30 * POSITION_SCALE_FACTOR;
+
         public readonly int Keys;
 
         public readonly float[] ColumnLineWidth;
         public readonly float[] ColumnSpacing;
         public readonly float[] ColumnWidth;
 
-        public float HitPosition = 124.8f; // (480 - 402) * 1.6f
-        public float LightPosition = 107.2f; // (480 - 413) * 1.6f
+        public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
+        public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;
 
         public LegacyManiaSkinConfiguration(int keys)
@@ -26,7 +36,7 @@ namespace osu.Game.Skinning
             ColumnWidth = new float[keys];
 
             ColumnLineWidth.AsSpan().Fill(2);
-            ColumnWidth.AsSpan().Fill(48);
+            ColumnWidth.AsSpan().Fill(DEFAULT_COLUMN_SIZE);
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index dabdd0a980..0c9157e59b 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -11,8 +11,6 @@ namespace osu.Game.Skinning
 {
     public class LegacyManiaSkinDecoder : LegacyDecoder<List<LegacyManiaSkinConfiguration>>
     {
-        private const float size_scale_factor = 1.6f;
-
         public LegacyManiaSkinDecoder()
             : base(1)
         {
@@ -88,11 +86,11 @@ namespace osu.Game.Skinning
                         break;
 
                     case "HitPosition":
-                        currentConfig.HitPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * size_scale_factor;
+                        currentConfig.HitPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         break;
 
                     case "LightPosition":
-                        currentConfig.LightPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * size_scale_factor;
+                        currentConfig.LightPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         break;
 
                     case "JudgementLine":
@@ -111,7 +109,7 @@ namespace osu.Game.Skinning
                 if (i >= output.Length)
                     break;
 
-                output[i] = float.Parse(values[i], CultureInfo.InvariantCulture) * size_scale_factor;
+                output[i] = float.Parse(values[i], CultureInfo.InvariantCulture) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
             }
         }
     }

From fa3a449c3b11b0edfc459606e431fedcfb92a5da Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 14:29:16 +0900
Subject: [PATCH 01882/10326] Implement legacy normal hit explosions

---
 .../Skinning/LegacyHitExplosion.cs                    |  7 ++++++-
 .../Skinning/ManiaLegacySkinTransformer.cs            |  3 +++
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs     |  2 ++
 .../Skinning/LegacyManiaSkinConfigurationLookup.cs    |  2 ++
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs           |  4 ++++
 osu.Game/Skinning/LegacySkin.cs                       | 11 +++++++++++
 6 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index 688ee7e340..ca2a54aa62 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -8,10 +8,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyHitExplosion : LegacyManiaElement
+    public class LegacyHitExplosion : LegacyManiaColumnElement
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
@@ -28,6 +29,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
             string imageName = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.ExplosionImage)?.Value
                                ?? "lightingN";
 
+            float explosionScale = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.ExplosionScale)?.Value
+                                   ?? 1;
+
             InternalChild = explosion = skin.GetAnimation(imageName, true, false, startAtCurrentTime: true).With(d =>
             {
                 if (d == null)
@@ -35,6 +39,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
                 d.Origin = Anchor.Centre;
                 d.Blending = BlendingParameters.Additive;
+                d.Scale = new Vector2(explosionScale);
 
                 if (!(d is TextureAnimation texAnimation))
                     return;
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 3e423c6b0f..02fd6c0572 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -74,6 +74,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
                         case ManiaSkinComponents.HoldNoteBody:
                             return new LegacyBodyPiece();
+
+                        case ManiaSkinComponents.HitExplosion:
+                            return new LegacyHitExplosion();
                     }
 
                     break;
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index ba29870ffa..b5d5531e0a 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Skinning
         public readonly float[] ColumnLineWidth;
         public readonly float[] ColumnSpacing;
         public readonly float[] ColumnWidth;
+        public readonly float[] ExplosionWidth;
 
         public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
         public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
@@ -34,6 +35,7 @@ namespace osu.Game.Skinning
             ColumnLineWidth = new float[keys + 1];
             ColumnSpacing = new float[keys - 1];
             ColumnWidth = new float[keys];
+            ExplosionWidth = new float[keys];
 
             ColumnLineWidth.AsSpan().Fill(2);
             ColumnWidth.AsSpan().Fill(DEFAULT_COLUMN_SIZE);
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 49e4faa269..68f402d435 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -34,5 +34,7 @@ namespace osu.Game.Skinning
         HoldNoteHeadImage,
         HoldNoteTailImage,
         HoldNoteBodyImage,
+        ExplosionImage,
+        ExplosionScale
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 0c9157e59b..e7b25ab267 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -96,6 +96,10 @@ namespace osu.Game.Skinning
                     case "JudgementLine":
                         currentConfig.ShowJudgementLine = pair.Value == "1";
                         break;
+
+                    case "LightingNWidth":
+                        parseArrayValue(pair.Value, currentConfig.ExplosionWidth);
+                        break;
                 }
             }
         }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 52655fd01a..5af42df1de 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -192,6 +192,17 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.ShowJudgementLine:
                     return SkinUtils.As<TValue>(new Bindable<bool>(existing.ShowJudgementLine));
+
+                case LegacyManiaSkinConfigurationLookups.ExplosionScale:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+
+                    if (GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value < 2.5m)
+                        return SkinUtils.As<TValue>(new Bindable<float>(1));
+
+                    if (existing.ExplosionWidth[maniaLookup.TargetColumn.Value] != 0)
+                        return SkinUtils.As<TValue>(new Bindable<float>(existing.ExplosionWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
             }
 
             return null;

From de7ee571006646402a0937ef5a0c8c6f19f1aeca Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 15:27:31 +0900
Subject: [PATCH 01883/10326] Fix adding null hit explosions

---
 osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index ca2a54aa62..5cfbc1d847 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             float explosionScale = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.ExplosionScale)?.Value
                                    ?? 1;
 
-            InternalChild = explosion = skin.GetAnimation(imageName, true, false, startAtCurrentTime: true).With(d =>
+            explosion = skin.GetAnimation(imageName, true, false, startAtCurrentTime: true).With(d =>
             {
                 if (d == null)
                     return;
@@ -48,6 +48,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     texAnimation.DefaultFrameLength = Math.Max(texAnimation.DefaultFrameLength, 170.0 / texAnimation.FrameCount);
             });
 
+            if (explosion != null)
+                InternalChild = explosion;
+
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
         }

From f3b96f8f50c9dde37741578f1e13fce19d9d0ef9 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Thu, 2 Apr 2020 14:29:30 +0800
Subject: [PATCH 01884/10326] add fallback to normal note image

---
 osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs
index 085d2bf004..cef976c7c8 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs
@@ -21,7 +21,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
         protected override Texture GetTexture(ISkinSource skin)
         {
             return GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteTailImage)
-                   ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage);
+                   ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage)
+                   ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.NoteImage);
         }
     }
 }

From c8d161e03aa17a542dea93e6c554ffd09cda0079 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 15:57:02 +0900
Subject: [PATCH 01885/10326] Fix explosion expiry

---
 osu.Game.Rulesets.Mania/UI/Column.cs              | 8 ++++++--
 osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 60cf019939..5a6cd7e229 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -105,11 +105,15 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!result.IsHit || !judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            hitObjectArea.Explosions.Add(new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion), _ =>
+            var explosion = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion), _ =>
                 new DefaultHitExplosion(judgedObject.AccentColour.Value, judgedObject is DrawableHoldNoteTick))
             {
                 RelativeSizeAxes = Axes.Both
-            });
+            };
+
+            hitObjectArea.Explosions.Add(explosion);
+
+            explosion.Delay(200).Expire(true);
         }
 
         public bool OnPressed(ManiaAction action)
diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index a4398f6ed7..7a047ed121 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -136,7 +136,6 @@ namespace osu.Game.Rulesets.Mania.UI
             mainGlow1.ScaleTo(1.4f, duration, Easing.OutQuint);
 
             this.FadeOut(duration, Easing.Out);
-            Expire(true);
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)

From 62f6683a20db2774d91226395dfe99c0864319a3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 15:57:50 +0900
Subject: [PATCH 01886/10326] Remove unnecessary generic

---
 osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
index aa02f67c8e..7d280f0bea 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 {
     public class ColumnHitObjectArea : HitObjectArea
     {
-        public readonly Container<Drawable> Explosions;
+        public readonly Container Explosions;
         private readonly Drawable hitTarget;
 
         public ColumnHitObjectArea(HitObjectContainer hitObjectContainer)
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                     RelativeSizeAxes = Axes.X,
                     Depth = 1
                 },
-                Explosions = new Container<Drawable>
+                Explosions = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Depth = -1,

From dae738d6a42bc56730d78b65d9c9e60582150bac Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Thu, 2 Apr 2020 14:58:31 +0800
Subject: [PATCH 01887/10326] add todo entries

---
 osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs | 1 +
 osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs
index ebe7ff09b2..c5aa062d0f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs
@@ -10,6 +10,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
     {
         protected override Texture GetTexture(ISkinSource skin)
         {
+            // TODO: Should fallback to the head from default legacy skin instead of note.
             return GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage)
                    ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.NoteImage);
         }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs
index cef976c7c8..2e8259f10a 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         protected override Texture GetTexture(ISkinSource skin)
         {
+            // TODO: Should fallback to the head from default legacy skin instead of note.
             return GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteTailImage)
                    ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage)
                    ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.NoteImage);

From 7ba533b7a4a47cf7b2d61b4453b1cd329e7fef51 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 16:04:09 +0900
Subject: [PATCH 01888/10326] Expand mania to fit vertical screen bounds

---
 .../UI/ManiaPlayfieldAdjustmentContainer.cs                    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfieldAdjustmentContainer.cs
index d893a3fdde..30e0aafb7d 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfieldAdjustmentContainer.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.UI;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -13,8 +12,6 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
-
-            Size = new Vector2(1, 0.8f);
         }
     }
 }

From 5aa4c4f3cbb651ed5ca44d2806b876bcf910c06e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 16:10:09 +0900
Subject: [PATCH 01889/10326] Remove corner radius

---
 osu.Game.Rulesets.Mania/UI/ManiaStage.cs | 31 ++++++++----------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
index c6102675a1..1e190f4857 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
@@ -72,30 +72,19 @@ namespace osu.Game.Rulesets.Mania.UI
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        new Container
+                        new Box
                         {
-                            Name = "Columns mask",
+                            Name = "Background",
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.Black
+                        },
+                        columnFlow = new FillFlowContainer<Column>
+                        {
+                            Name = "Columns",
                             RelativeSizeAxes = Axes.Y,
                             AutoSizeAxes = Axes.X,
-                            Masking = true,
-                            CornerRadius = 5,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    Name = "Background",
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Color4.Black
-                                },
-                                columnFlow = new FillFlowContainer<Column>
-                                {
-                                    Name = "Columns",
-                                    RelativeSizeAxes = Axes.Y,
-                                    AutoSizeAxes = Axes.X,
-                                    Direction = FillDirection.Horizontal,
-                                    Padding = new MarginPadding { Left = COLUMN_SPACING, Right = COLUMN_SPACING },
-                                },
-                            }
+                            Direction = FillDirection.Horizontal,
+                            Padding = new MarginPadding { Left = COLUMN_SPACING, Right = COLUMN_SPACING },
                         },
                         new Container
                         {

From 63708532a17dbcf186c505025ad5805bfeb7d76d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 16:36:57 +0900
Subject: [PATCH 01890/10326] Remove frozen clock from test scenes

---
 .../Skinning/ManiaHitObjectTestScene.cs       | 15 ++++++++----
 .../Skinning/ManiaSkinnableTestScene.cs       | 23 ++++++++++++++++++-
 .../Skinning/TestSceneHoldNote.cs             |  5 +---
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
index e65982b240..18eebada00 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Timing;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK.Graphics;
@@ -37,10 +36,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                         Child = new ScrollingHitObjectContainer
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Clock = new FramedClock(new StopwatchClock()),
                         }.With(c =>
                         {
-                            c.Add(CreateHitObject().With(h => h.AccentColour.Value = Color4.Orange));
+                            c.Add(CreateHitObject().With(h =>
+                            {
+                                h.HitObject.StartTime = START_TIME;
+                                h.AccentColour.Value = Color4.Orange;
+                            }));
                         })
                     },
                     new ColumnTestContainer(1, ManiaAction.Key2)
@@ -52,10 +54,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                         Child = new ScrollingHitObjectContainer
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Clock = new FramedClock(new StopwatchClock()),
                         }.With(c =>
                         {
-                            c.Add(CreateHitObject().With(h => h.AccentColour.Value = Color4.Orange));
+                            c.Add(CreateHitObject().With(h =>
+                            {
+                                h.HitObject.StartTime = START_TIME;
+                                h.AccentColour.Value = Color4.Orange;
+                            }));
                         })
                     },
                 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 41fb7c727e..eaa2a56e36 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
     /// </summary>
     public abstract class ManiaSkinnableTestScene : SkinnableTestScene
     {
+        protected const double START_TIME = 1000000000;
+
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
@@ -52,7 +54,26 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 
             IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
             IBindable<double> IScrollingInfo.TimeRange { get; } = new Bindable<double>(1000);
-            IScrollAlgorithm IScrollingInfo.Algorithm { get; } = new ConstantScrollAlgorithm();
+            IScrollAlgorithm IScrollingInfo.Algorithm { get; } = new ZeroScrollAlgorithm();
+        }
+
+        private class ZeroScrollAlgorithm : IScrollAlgorithm
+        {
+            public double GetDisplayStartTime(double originTime, float offset, double timeRange, float scrollLength)
+                => double.MinValue;
+
+            public float GetLength(double startTime, double endTime, double timeRange, float scrollLength)
+                => scrollLength;
+
+            public float PositionAt(double time, double currentTime, double timeRange, float scrollLength)
+                => (float)((time - START_TIME) / timeRange) * scrollLength;
+
+            public double TimeAt(float position, double currentTime, double timeRange, float scrollLength)
+                => 0;
+
+            public void Reset()
+            {
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
index 19623a5705..91a0a06552 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
@@ -15,10 +15,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             var note = new HoldNote { Duration = 1000 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            return new DrawableHoldNote(note)
-            {
-                Height = 200,
-            };
+            return new DrawableHoldNote(note);
         }
     }
 }

From 95523197324a259c637c4b1e908fb86562b4ddb1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 17:09:08 +0900
Subject: [PATCH 01891/10326] Fix hold note animation not being reset

---
 .../Skinning/TestSceneHoldNote.cs                  | 14 ++++++++++++++
 .../Skinning/LegacyBodyPiece.cs                    |  1 +
 2 files changed, 15 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
index 91a0a06552..95e86de884 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
@@ -1,6 +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.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Objects;
@@ -10,6 +13,17 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
     public class TestSceneHoldNote : ManiaHitObjectTestScene
     {
+        public TestSceneHoldNote()
+        {
+            AddToggleStep("toggle hitting", v =>
+            {
+                foreach (var holdNote in CreatedDrawables.SelectMany(d => d.ChildrenOfType<DrawableHoldNote>()))
+                {
+                    ((Bindable<bool>)holdNote.IsHitting).Value = v;
+                }
+            });
+        }
+
         protected override DrawableManiaHitObject CreateHitObject()
         {
             var note = new HoldNote { Duration = 1000 };
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index 643d92ff41..1ffee98a6c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -69,6 +69,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             if (!(sprite is TextureAnimation animation))
                 return;
 
+            animation.GotoFrame(0);
             animation.IsPlaying = isHitting.NewValue;
         }
 

From a77933f5e007904b7d423c62dc7747b308a03a24 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 17:56:12 +0900
Subject: [PATCH 01892/10326] Add support for parsing mania skin colours

---
 osu.Game.Tests/Resources/mania-skin-colours.ini  |  3 +++
 .../Skins/LegacyManiaSkinDecoderTest.cs          | 16 ++++++++++++++++
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs       |  4 ++--
 .../Skinning/LegacyManiaSkinConfiguration.cs     |  7 ++++++-
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs      |  6 ++++++
 osu.Game/Skinning/LegacySkin.cs                  |  8 +++++---
 6 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/mania-skin-colours.ini

diff --git a/osu.Game.Tests/Resources/mania-skin-colours.ini b/osu.Game.Tests/Resources/mania-skin-colours.ini
new file mode 100644
index 0000000000..91d9696e0c
--- /dev/null
+++ b/osu.Game.Tests/Resources/mania-skin-colours.ini
@@ -0,0 +1,3 @@
+[Mania]
+Keys: 4
+ColourBarline: 50,50,50,50
\ No newline at end of file
diff --git a/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
index 736f97f39f..83fd4878aa 100644
--- a/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Game.IO;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
+using osuTK.Graphics;
 
 namespace osu.Game.Tests.Skins
 {
@@ -83,5 +84,20 @@ namespace osu.Game.Tests.Skins
                 Assert.That(configs[0].HitPosition, Is.EqualTo(16));
             }
         }
+
+        [Test]
+        public void TestParseColours()
+        {
+            var decoder = new LegacyManiaSkinDecoder();
+
+            using (var resStream = TestResources.OpenResource("mania-skin-colours.ini"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var configs = decoder.Decode(stream);
+
+                Assert.That(configs.Count, Is.EqualTo(1));
+                Assert.That(configs[0].CustomColours, Contains.Key("ColourBarline").And.ContainValue(new Color4(50, 50, 50, 50)));
+            }
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index bbc0aad467..561707f9ef 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Beatmaps.Formats
             switch (section)
             {
                 case Section.Colours:
-                    handleColours(output, line);
+                    HandleColours(output, line);
                     return;
             }
         }
@@ -87,7 +87,7 @@ namespace osu.Game.Beatmaps.Formats
             return line;
         }
 
-        private void handleColours(T output, string line)
+        protected void HandleColours<TModel>(TModel output, string line)
         {
             var pair = SplitKeyVal(line);
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 0d0c4943ef..95886fa97f 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -2,13 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using osu.Game.Beatmaps.Formats;
+using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyManiaSkinConfiguration
+    public class LegacyManiaSkinConfiguration : IHasCustomColours
     {
         public readonly int Keys;
 
+        public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
+
         public readonly float[] ColumnLineWidth;
         public readonly float[] ColumnSpacing;
         public readonly float[] ColumnWidth;
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index dabdd0a980..f290e705fa 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -73,6 +73,12 @@ namespace osu.Game.Skinning
             {
                 var pair = SplitKeyVal(line);
 
+                if (pair.Key.StartsWith("Colour"))
+                {
+                    HandleColours(currentConfig, line);
+                    continue;
+                }
+
                 switch (pair.Key)
                 {
                     case "ColumnLineWidth":
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 52655fd01a..9585768bab 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Audio;
+using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
 using osuTK.Graphics;
@@ -112,7 +113,7 @@ namespace osu.Game.Skinning
                             break;
 
                         default:
-                            return SkinUtils.As<TValue>(getCustomColour(colour.ToString()));
+                            return SkinUtils.As<TValue>(getCustomColour(Configuration, colour.ToString()));
                     }
 
                     break;
@@ -130,7 +131,7 @@ namespace osu.Game.Skinning
                     break;
 
                 case SkinCustomColourLookup customColour:
-                    return SkinUtils.As<TValue>(getCustomColour(customColour.Lookup.ToString()));
+                    return SkinUtils.As<TValue>(getCustomColour(Configuration, customColour.Lookup.ToString()));
 
                 case LegacyManiaSkinConfigurationLookup maniaLookup:
                     if (!AllowManiaSkin)
@@ -197,7 +198,8 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        private IBindable<Color4> getCustomColour(string lookup) => Configuration.CustomColours.TryGetValue(lookup, out var col) ? new Bindable<Color4>(col) : null;
+        private IBindable<Color4> getCustomColour(IHasCustomColours source, string lookup)
+            => source.CustomColours.TryGetValue(lookup, out var col) ? new Bindable<Color4>(col) : null;
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {

From 62f1bc276d14c3b706835807f706bc40573da892 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 18:10:17 +0900
Subject: [PATCH 01893/10326] Add skinning support for column line colour

---
 osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs | 5 +++++
 osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs    | 1 +
 osu.Game/Skinning/LegacySkin.cs                            | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 7e8f720e99..27845fca4a 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -46,6 +46,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
                                       new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LightPosition))?.Value
                                   ?? 0;
 
+            Color4 lineColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLineColour)?.Value
+                                ?? Color4.White;
+
             InternalChildren = new Drawable[]
             {
                 new Box
@@ -57,6 +60,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = leftLineWidth,
+                    Colour = lineColour,
                     Alpha = hasLeftLine ? 1 : 0
                 },
                 new Box
@@ -65,6 +69,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Y,
                     Width = rightLineWidth,
+                    Colour = lineColour,
                     Alpha = hasRightLine ? 1 : 0
                 },
                 lightContainer = new Container
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 49e4faa269..3cccb71745 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -34,5 +34,6 @@ namespace osu.Game.Skinning
         HoldNoteHeadImage,
         HoldNoteTailImage,
         HoldNoteBodyImage,
+        ColumnLineColour
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 9585768bab..a51556fa77 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -193,6 +193,9 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.ShowJudgementLine:
                     return SkinUtils.As<TValue>(new Bindable<bool>(existing.ShowJudgementLine));
+
+                case LegacyManiaSkinConfigurationLookups.ColumnLineColour:
+                    return SkinUtils.As<TValue>(getCustomColour(existing, "ColourColumnLine"));
             }
 
             return null;

From c18248c82736794faf87e70bb842a43c6337cac8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Apr 2020 18:46:09 +0900
Subject: [PATCH 01894/10326] Fix crash caused by user json order changing

---
 osu.Game/Users/User.cs | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 2a6f7844a2..f8bb8f4c6a 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -173,8 +173,27 @@ namespace osu.Game.Users
             public int Available;
         }
 
+        private UserStatistics statistics;
+
         [JsonProperty(@"statistics")]
-        public UserStatistics Statistics;
+        public UserStatistics Statistics
+        {
+            get => statistics ??= new UserStatistics();
+            set
+            {
+                if (statistics != null)
+                    // we may already have rank history populated
+                    value.RankHistory = statistics.RankHistory;
+
+                statistics = value;
+            }
+        }
+
+        [JsonProperty(@"rankHistory")]
+        private RankHistoryData rankHistory
+        {
+            set => statistics.RankHistory = value;
+        }
 
         public class RankHistoryData
         {
@@ -185,12 +204,6 @@ namespace osu.Game.Users
             public int[] Data;
         }
 
-        [JsonProperty(@"rankHistory")]
-        private RankHistoryData rankHistory
-        {
-            set => Statistics.RankHistory = value;
-        }
-
         [JsonProperty("badges")]
         public Badge[] Badges;
 

From a3d4212462794230d3d2f9ce7128ae0399616ef1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Apr 2020 19:30:58 +0900
Subject: [PATCH 01895/10326] Fix weird slider ball sizing

---
 .../Resources/special-skin/sliderb0.png         | Bin 0 -> 10899 bytes
 .../Resources/special-skin/sliderb0@2x.png      | Bin 0 -> 23267 bytes
 .../Skinning/LegacySliderBall.cs                |   2 ++
 .../Skinning/OsuLegacySkinTransformer.cs        |  12 +-----------
 4 files changed, 3 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/sliderb0.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/sliderb0@2x.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/sliderb0.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/sliderb0.png
new file mode 100644
index 0000000000000000000000000000000000000000..316d52c685d1169bf9bb991d6b2d8bd4b3797c61
GIT binary patch
literal 10899
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
Ml9pnX{L}FN0ew%+2><{9

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/sliderb0@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/sliderb0@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6f6b3c23942e012da9dcb30317ffd0590d88d20
GIT binary patch
literal 23267
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
O%h(WaP;|^G;=ch*f89R-

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
index 81c02199d0..b4ed75d97c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
         public LegacySliderBall(Drawable animationContent)
         {
             this.animationContent = animationContent;
+
+            AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 075c536b4c..0d67846b8e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -62,17 +62,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
 
                     if (sliderBallContent != null)
-                    {
-                        var size = sliderBallContent.Size;
-
-                        sliderBallContent.RelativeSizeAxes = Axes.Both;
-                        sliderBallContent.Size = Vector2.One;
-
-                        return new LegacySliderBall(sliderBallContent)
-                        {
-                            Size = size
-                        };
-                    }
+                        return new LegacySliderBall(sliderBallContent);
 
                     return null;
 

From a6d6bab0ccb5e5af9d600546089a240915f1dc7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Apr 2020 21:21:29 +0900
Subject: [PATCH 01896/10326] 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 cb848c0433..067431596c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.401.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.402.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4a9d2e0830..4597d212f3 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.331.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.401.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.402.0" />
     <PackageReference Include="Sentry" Version="2.1.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 a528bd5658..27e485709b 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.331.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.401.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.402.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.401.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.402.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 23b53bee563d30bae925a9b0ce86f3688932f4e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Apr 2020 22:05:32 +0900
Subject: [PATCH 01897/10326] 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 067431596c..3e10e6cc4d 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.331.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.402.1" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.402.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4597d212f3..073799f08f 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.331.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.402.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.402.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 27e485709b..6578aec69f 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.331.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.402.1" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.402.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From 2a6c0de225b7fa64bfad2d02e747ea3d3806c31d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 22:55:42 +0900
Subject: [PATCH 01898/10326] Add frameLength parameter to GetAnimation

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

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index a736174f13..ea3d180ef8 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Skinning
     public static class LegacySkinExtensions
     {
         public static Drawable GetAnimation(this ISkin source, string componentName, bool animatable, bool looping, bool applyConfigFrameRate = false, string animationSeparator = "-",
-                                            bool startAtCurrentTime = false)
+                                            bool startAtCurrentTime = false, double? frameLength = null)
         {
             Texture texture;
 
@@ -27,7 +27,7 @@ namespace osu.Game.Skinning
                 {
                     var animation = new SkinnableTextureAnimation(startAtCurrentTime)
                     {
-                        DefaultFrameLength = getFrameLength(source, applyConfigFrameRate, textures),
+                        DefaultFrameLength = frameLength ?? getFrameLength(source, applyConfigFrameRate, textures),
                         Repeat = looping,
                     };
 

From 47e2ff5ce61a9b96d72f51c79620c892bc91d5f6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 22:55:54 +0900
Subject: [PATCH 01899/10326] Fix incorrect frame length for hit explosions

---
 .../Skinning/LegacyHitExplosion.cs                | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index 5cfbc1d847..4868dd87ef 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -32,7 +32,14 @@ namespace osu.Game.Rulesets.Mania.Skinning
             float explosionScale = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.ExplosionScale)?.Value
                                    ?? 1;
 
-            explosion = skin.GetAnimation(imageName, true, false, startAtCurrentTime: true).With(d =>
+            // Create a temporary animation to retrieve the number of frames, in an effort to calculate the intended frame length.
+            // This animation is discarded and re-queried with the appropriate frame length afterwards.
+            var tmp = skin.GetAnimation(imageName, true, false);
+            double frameLength = 0;
+            if (tmp is IAnimation tmpAnimation && tmpAnimation.FrameCount > 0)
+                frameLength = Math.Max(1000 / 60.0, 170.0 / tmpAnimation.FrameCount);
+
+            explosion = skin.GetAnimation(imageName, true, false, startAtCurrentTime: true, frameLength: frameLength).With(d =>
             {
                 if (d == null)
                     return;
@@ -40,12 +47,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 d.Origin = Anchor.Centre;
                 d.Blending = BlendingParameters.Additive;
                 d.Scale = new Vector2(explosionScale);
-
-                if (!(d is TextureAnimation texAnimation))
-                    return;
-
-                if (texAnimation.FrameCount > 0)
-                    texAnimation.DefaultFrameLength = Math.Max(texAnimation.DefaultFrameLength, 170.0 / texAnimation.FrameCount);
             });
 
             if (explosion != null)

From 24a7b5f0d69438034f406e0ff27bf5d7578d3ad0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 23:59:53 +0900
Subject: [PATCH 01900/10326] Fix missing comma

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

diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 6239b69b4d..853d07c060 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Skinning
         HoldNoteTailImage,
         HoldNoteBodyImage,
         ExplosionImage,
-        ExplosionScale
+        ExplosionScale,
         ColumnLineColour
     }
 }

From c042e709a59f874918b4aa6dcc771421d19085cc Mon Sep 17 00:00:00 2001
From: Will Kennedy <willmlb@sbcglobal.net>
Date: Thu, 2 Apr 2020 20:43:54 -0400
Subject: [PATCH 01901/10326] Fix GetDecoder getting fallback decoder too often

---
 .../Beatmaps/Formats/OsuJsonDecoderTest.cs    | 25 +++++++++++++++++++
 osu.Game/Beatmaps/Formats/Decoder.cs          |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
index 63346b8c9d..c3771302ca 100644
--- a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
@@ -127,6 +127,31 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 .Assert();
         }
 
+        [Test]
+        public void TestGetJsonDecoder()
+        {
+            Decoder<Beatmap> decoder;
+
+            using (var stream = TestResources.OpenResource(normal))
+            using (var sr = new LineBufferedReader(stream))
+            {
+                var legacyDecoded = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(sr);
+
+                using (var ms = new MemoryStream())
+                using (var sw = new StreamWriter(ms))
+                using (var sr2 = new LineBufferedReader(ms))
+                {
+                    sw.Write(legacyDecoded.Serialize());
+                    sw.Flush();
+
+                    ms.Position = 0;
+                    decoder = Decoder.GetDecoder<Beatmap>(sr2);
+                }
+            }
+
+            Assert.IsInstanceOf(typeof(JsonBeatmapDecoder), decoder);
+        }
+
         /// <summary>
         /// Reads a .osu file first with a <see cref="LegacyBeatmapDecoder"/>, serializes the resulting <see cref="Beatmap"/> to JSON
         /// and then deserializes the result back into a <see cref="Beatmap"/> through an <see cref="JsonBeatmapDecoder"/>.
diff --git a/osu.Game/Beatmaps/Formats/Decoder.cs b/osu.Game/Beatmaps/Formats/Decoder.cs
index 45122f6312..46a1ed1967 100644
--- a/osu.Game/Beatmaps/Formats/Decoder.cs
+++ b/osu.Game/Beatmaps/Formats/Decoder.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Beatmaps.Formats
             if (line == null)
                 throw new IOException("Unknown file format (null)");
 
-            var decoder = typedDecoders.Select(d => line.StartsWith(d.Key, StringComparison.InvariantCulture) ? d.Value : null).FirstOrDefault();
+            var decoder = typedDecoders.Where(d => line.StartsWith(d.Key, StringComparison.InvariantCulture)).FirstOrDefault().Value;
 
             // it's important the magic does NOT get consumed here, since sometimes it's part of the structure
             // (see JsonBeatmapDecoder - the magic string is the opening brace)

From 57944bd335a8f94469ec8383dcd980f01f7cd083 Mon Sep 17 00:00:00 2001
From: Will Kennedy <willmlb@sbcglobal.net>
Date: Thu, 2 Apr 2020 21:36:31 -0400
Subject: [PATCH 01902/10326] fix(?) InspectCode warnings

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

diff --git a/osu.Game/Beatmaps/Formats/Decoder.cs b/osu.Game/Beatmaps/Formats/Decoder.cs
index 46a1ed1967..845ac20db0 100644
--- a/osu.Game/Beatmaps/Formats/Decoder.cs
+++ b/osu.Game/Beatmaps/Formats/Decoder.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Beatmaps.Formats
             if (line == null)
                 throw new IOException("Unknown file format (null)");
 
-            var decoder = typedDecoders.Where(d => line.StartsWith(d.Key, StringComparison.InvariantCulture)).FirstOrDefault().Value;
+            var decoder = typedDecoders.Where(d => line.StartsWith(d.Key, StringComparison.InvariantCulture)).Select(d => d.Value).FirstOrDefault();
 
             // it's important the magic does NOT get consumed here, since sometimes it's part of the structure
             // (see JsonBeatmapDecoder - the magic string is the opening brace)

From 877bd7837a7c3aae64164d6bfed4cfca9524e06a Mon Sep 17 00:00:00 2001
From: Will Kennedy <willmlb@sbcglobal.net>
Date: Thu, 2 Apr 2020 22:02:57 -0400
Subject: [PATCH 01903/10326] Changed variable names

---
 .../Beatmaps/Formats/OsuJsonDecoderTest.cs         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
index c3771302ca..b034e66616 100644
--- a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
@@ -137,15 +137,15 @@ namespace osu.Game.Tests.Beatmaps.Formats
             {
                 var legacyDecoded = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(sr);
 
-                using (var ms = new MemoryStream())
-                using (var sw = new StreamWriter(ms))
-                using (var sr2 = new LineBufferedReader(ms))
+                using (var memStream = new MemoryStream())
+                using (var memWriter = new StreamWriter(memStream))
+                using (var memReader = new LineBufferedReader(memStream))
                 {
-                    sw.Write(legacyDecoded.Serialize());
-                    sw.Flush();
+                    memWriter.Write(legacyDecoded.Serialize());
+                    memWriter.Flush();
 
-                    ms.Position = 0;
-                    decoder = Decoder.GetDecoder<Beatmap>(sr2);
+                    memStream.Position = 0;
+                    decoder = Decoder.GetDecoder<Beatmap>(memReader);
                 }
             }
 

From 1f797207f7c0502a5e1f6a0f324d74e4b5bc130a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 18:39:49 +0900
Subject: [PATCH 01904/10326] Rework lookups to not require total playfield
 columns

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |  2 +-
 .../Skinning/TestSceneColumnBackground.cs     |  4 +-
 .../Skinning/TestSceneColumnHitObjectArea.cs  |  4 +-
 .../Skinning/TestSceneHitExplosion.cs         |  2 +-
 .../Skinning/TestSceneKeyArea.cs              |  4 +-
 .../Skinning/TestScenePlayfield.cs            | 52 +++++++++++++++++++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  2 +-
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |  5 +-
 .../Objects/Drawables/DrawableHoldNote.cs     |  2 +-
 .../Objects/Drawables/DrawableNote.cs         |  2 +-
 .../Skinning/LegacyBodyPiece.cs               |  7 ---
 .../Skinning/LegacyColumnBackground.cs        |  9 ++--
 .../Skinning/LegacyKeyArea.cs                 |  3 --
 .../Skinning/LegacyManiaElement.cs            | 11 +---
 .../Skinning/ManiaLegacySkinTransformer.cs    | 21 +++++---
 .../Skinning/ManiaSkinConfigurationLookup.cs  | 19 +++++++
 osu.Game.Rulesets.Mania/UI/Column.cs          |  8 +--
 .../UI/Components/ColumnHitObjectArea.cs      |  4 +-
 .../UI/Components/HitObjectArea.cs            |  8 ++-
 osu.Game.Rulesets.Mania/UI/ManiaStage.cs      | 10 ++--
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  2 +-
 osu.Game/Rulesets/Ruleset.cs                  |  2 +-
 .../Screens/Edit/Compose/ComposeScreen.cs     |  2 +-
 osu.Game/Screens/Play/Player.cs               |  6 +--
 osu.Game/Tests/Visual/SkinnableTestScene.cs   | 19 ++++---
 26 files changed, 141 insertions(+), 71 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 212365caad..ca75a816f1 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -143,7 +143,7 @@ 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 ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => new CatchLegacySkinTransformer(source);
 
         public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new CatchPerformanceCalculator(this, beatmap, score);
 
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
index ca323b5911..d6bacbe59e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, 0), _ => new DefaultColumnBackground())
                         {
                             RelativeSizeAxes = Axes.Both
                         }
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, 0), _ => new DefaultColumnBackground())
                         {
                             RelativeSizeAxes = Axes.Both
                         }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs
index 5d05bca03e..4392666cb7 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new ColumnHitObjectArea(new HitObjectContainer())
+                        Child = new ColumnHitObjectArea(0, new HitObjectContainer())
                         {
                             RelativeSizeAxes = Axes.Both
                         }
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new ColumnHitObjectArea(new HitObjectContainer())
+                        Child = new ColumnHitObjectArea(1, new HitObjectContainer())
                         {
                             RelativeSizeAxes = Axes.Both
                         }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
index 718dbbea93..5f046574ba 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 
                 CreatedDrawables.OfType<Container>().ForEach(c =>
                 {
-                    c.Add(new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion),
+                    c.Add(new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion, 0),
                         _ => new DefaultHitExplosion((runcount / 15) % 2 == 0 ? new Color4(94, 0, 57, 255) : new Color4(6, 84, 0, 255), runcount % 6 != 0)
                         {
                             Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
index 1e6f00205a..c8f901285a 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea, 0), _ => new DefaultKeyArea())
                         {
                             RelativeSizeAxes = Axes.Both
                         },
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea, 1), _ => new DefaultKeyArea())
                         {
                             RelativeSizeAxes = Axes.Both
                         },
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
new file mode 100644
index 0000000000..161eda650e
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.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.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.UI;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    public class TestScenePlayfield : ManiaSkinnableTestScene
+    {
+        private List<StageDefinition> stageDefinitions = new List<StageDefinition>();
+
+        [Test]
+        public void TestSingleStage()
+        {
+            AddStep("create stage", () =>
+            {
+                stageDefinitions = new List<StageDefinition>
+                {
+                    new StageDefinition { Columns = 2 }
+                };
+
+                SetContents(() => new ManiaPlayfield(stageDefinitions));
+            });
+        }
+
+        [Test]
+        public void TestDualStages()
+        {
+            AddStep("create stage", () =>
+            {
+                stageDefinitions = new List<StageDefinition>
+                {
+                    new StageDefinition { Columns = 2 },
+                    new StageDefinition { Columns = 2 }
+                };
+
+                SetContents(() => new ManiaPlayfield(stageDefinitions));
+            });
+        }
+
+        protected override IBeatmap CreateBeatmapForSkinProvider()
+        {
+            var maniaBeatmap = (ManiaBeatmap)base.CreateBeatmapForSkinProvider();
+            maniaBeatmap.Stages = stageDefinitions;
+            return maniaBeatmap;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 9d06bd7c25..2bd88fee90 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania
 
         public override HitObjectComposer CreateHitObjectComposer() => new ManiaHitObjectComposer(this);
 
-        public override ISkin CreateLegacySkinProvider(ISkinSource source) => new ManiaLegacySkinTransformer(source);
+        public override ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => new ManiaLegacySkinTransformer(source, beatmap);
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 7d1c4ff8b3..89eb203309 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -7,9 +7,12 @@ namespace osu.Game.Rulesets.Mania
 {
     public class ManiaSkinComponent : GameplaySkinComponent<ManiaSkinComponents>
     {
-        public ManiaSkinComponent(ManiaSkinComponents component)
+        public readonly int TargetColumn;
+
+        public ManiaSkinComponent(ManiaSkinComponents component, int targetColumn)
             : base(component)
         {
+            TargetColumn = targetColumn;
         }
 
         protected override string RulesetPrefix => ManiaRuleset.SHORT_NAME;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 7cacaf35a6..a9ef661aaa 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             AddRangeInternal(new[]
             {
-                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody), _ => new DefaultBodyPiece())
+                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece())
                 {
                     RelativeSizeAxes = Axes.X
                 },
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index fdc50048fe..9451bc4430 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            AddInternal(headPiece = new SkinnableDrawable(new ManiaSkinComponent(Component), _ => new DefaultNotePiece())
+            AddInternal(headPiece = new SkinnableDrawable(new ManiaSkinComponent(Component, hitObject.Column), _ => new DefaultNotePiece())
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index 1ffee98a6c..0c9bc97ba9 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
@@ -21,12 +20,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         private Drawable sprite;
 
-        [Resolved(CanBeNull = true)]
-        private ManiaStage stage { get; set; }
-
-        [Resolved]
-        private Column column { get; set; }
-
         public LegacyBodyPiece()
         {
             RelativeSizeAxes = Axes.Both;
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 27845fca4a..8cd0272b52 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -18,12 +18,14 @@ namespace osu.Game.Rulesets.Mania.Skinning
     public class LegacyColumnBackground : LegacyManiaColumnElement, IKeyBindingHandler<ManiaAction>
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+        private readonly bool isLastColumn;
 
         private Container lightContainer;
         private Sprite light;
 
-        public LegacyColumnBackground()
+        public LegacyColumnBackground(bool isLastColumn)
         {
+            this.isLastColumn = isLastColumn;
             RelativeSizeAxes = Axes.Both;
         }
 
@@ -40,10 +42,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             bool hasLeftLine = leftLineWidth > 0;
             bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
-                                || Stage == null || Column.Index == Stage.Columns.Count - 1;
+                                || isLastColumn;
 
-            float lightPosition = skin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
-                                      new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LightPosition))?.Value
+            float lightPosition = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LightPosition)?.Value
                                   ?? 0;
 
             Color4 lineColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLineColour)?.Value
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
index d2541772cc..7c8d1cd303 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
@@ -22,9 +22,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private Sprite upSprite;
         private Sprite downSprite;
 
-        [Resolved(CanBeNull = true)]
-        private ManiaStage stage { get; set; }
-
         [Resolved]
         private Column column { get; set; }
 
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.cs
index 2fb229862f..11fdd663a1 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.cs
@@ -1,11 +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 JetBrains.Annotations;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Skinning
@@ -15,10 +12,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
     /// </summary>
     public class LegacyManiaElement : CompositeDrawable
     {
-        [Resolved(CanBeNull = true)]
-        [CanBeNull]
-        protected ManiaStage Stage { get; private set; }
-
         /// <summary>
         /// Retrieve a per-column-count skin configuration.
         /// </summary>
@@ -26,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// <param name="lookup">The value to retrieve.</param>
         /// <param name="index">If not null, denotes the index of the column to which the entry applies.</param>
         protected virtual IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
-            => skin.GetConfig<LegacyManiaSkinConfigurationLookup, T>(
-                new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, lookup, index));
+            => skin.GetConfig<ManiaSkinConfigurationLookup, T>(
+                new ManiaSkinConfigurationLookup(lookup, index));
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 02fd6c0572..cbe2036343 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -8,6 +8,8 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Skinning
@@ -15,6 +17,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
     public class ManiaLegacySkinTransformer : ISkin
     {
         private readonly ISkin source;
+        private readonly ManiaBeatmap beatmap;
 
         private Lazy<bool> isLegacySkin;
 
@@ -24,9 +27,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// </summary>
         private Lazy<bool> hasKeyTexture;
 
-        public ManiaLegacySkinTransformer(ISkinSource source)
+        public ManiaLegacySkinTransformer(ISkinSource source, IBeatmap beatmap)
         {
             this.source = source;
+            this.beatmap = (ManiaBeatmap)beatmap;
 
             source.SourceChanged += sourceChanged;
             sourceChanged();
@@ -36,8 +40,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
         {
             isLegacySkin = new Lazy<bool>(() => source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
             hasKeyTexture = new Lazy<bool>(() => source.GetAnimation(
-                source.GetConfig<LegacyManiaSkinConfigurationLookup, string>(
-                    new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value
+                source.GetConfig<ManiaSkinConfigurationLookup, string>(
+                    new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value
                 ?? "mania-key1", true, true) != null);
         }
 
@@ -55,7 +59,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     switch (maniaComponent.Component)
                     {
                         case ManiaSkinComponents.ColumnBackground:
-                            return new LegacyColumnBackground();
+                            return new LegacyColumnBackground(maniaComponent.TargetColumn == beatmap.TotalColumns - 1);
 
                         case ManiaSkinComponents.HitTarget:
                             return new LegacyHitTarget();
@@ -115,7 +119,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         public SampleChannel GetSample(ISampleInfo sample) => source.GetSample(sample);
 
-        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) =>
-            source.GetConfig<TLookup, TValue>(lookup);
+        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
+        {
+            if (lookup is ManiaSkinConfigurationLookup maniaLookup)
+                return source.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.TargetColumn));
+
+            return source.GetConfig<TLookup, TValue>(lookup);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
new file mode 100644
index 0000000000..7e5a2aa7ed
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.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.Skinning;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class ManiaSkinConfigurationLookup
+    {
+        public readonly LegacyManiaSkinConfigurationLookups Lookup;
+        public readonly int? TargetColumn;
+
+        public ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups lookup, int? targetColumn = null)
+        {
+            Lookup = lookup;
+            TargetColumn = targetColumn;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 5a6cd7e229..d2f58d7255 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             RelativeSizeAxes = Axes.Y;
 
-            Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
+            Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, Index), _ => new DefaultColumnBackground())
             {
                 RelativeSizeAxes = Axes.Both
             };
@@ -52,8 +52,8 @@ namespace osu.Game.Rulesets.Mania.UI
             {
                 // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
                 background.CreateProxy(),
-                hitObjectArea = new ColumnHitObjectArea(HitObjectContainer) { RelativeSizeAxes = Axes.Both },
-                new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
+                hitObjectArea = new ColumnHitObjectArea(Index, HitObjectContainer) { RelativeSizeAxes = Axes.Both },
+                new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea, Index), _ => new DefaultKeyArea())
                 {
                     RelativeSizeAxes = Axes.Both
                 },
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!result.IsHit || !judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            var explosion = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion), _ =>
+            var explosion = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion, Index), _ =>
                 new DefaultHitExplosion(judgedObject.AccentColour.Value, judgedObject is DrawableHoldNoteTick))
             {
                 RelativeSizeAxes = Axes.Both
diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
index 7d280f0bea..cb79bf7f43 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
@@ -14,12 +14,12 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         public readonly Container Explosions;
         private readonly Drawable hitTarget;
 
-        public ColumnHitObjectArea(HitObjectContainer hitObjectContainer)
+        public ColumnHitObjectArea(int columnIndex, HitObjectContainer hitObjectContainer)
             : base(hitObjectContainer)
         {
             AddRangeInternal(new[]
             {
-                hitTarget = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitTarget), _ => new DefaultHitTarget())
+                hitTarget = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitTarget, columnIndex), _ => new DefaultHitTarget())
                 {
                     RelativeSizeAxes = Axes.X,
                     Depth = 1
diff --git a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
index 9e62445c81..bca7c3ff08 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
@@ -14,9 +15,6 @@ namespace osu.Game.Rulesets.Mania.UI.Components
     {
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
 
-        [Resolved(CanBeNull = true)]
-        private ManiaStage stage { get; set; }
-
         public HitObjectArea(HitObjectContainer hitObjectContainer)
         {
             InternalChildren = new[]
@@ -45,8 +43,8 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 
         protected virtual void UpdateHitPosition()
         {
-            float hitPosition = CurrentSkin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
-                                    new LegacyManiaSkinConfigurationLookup(stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.HitPosition))?.Value
+            float hitPosition = CurrentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                    new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.HitPosition))?.Value
                                 ?? ManiaStage.HIT_TARGET_POSITION;
 
             Padding = Direction.Value == ScrollingDirection.Up
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
index 1e190f4857..adab08eb06 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -24,7 +25,6 @@ namespace osu.Game.Rulesets.Mania.UI
     /// <summary>
     /// A collection of <see cref="Column"/>s.
     /// </summary>
-    [Cached]
     public class ManiaStage : ScrollingPlayfield
     {
         public const float COLUMN_SPACING = 1;
@@ -146,15 +146,15 @@ namespace osu.Game.Rulesets.Mania.UI
             {
                 if (col.Index > 0)
                 {
-                    float spacing = currentSkin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
-                                                   new LegacyManiaSkinConfigurationLookup(Columns.Count, LegacyManiaSkinConfigurationLookups.ColumnSpacing, col.Index - 1))
+                    float spacing = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnSpacing, col.Index - 1))
                                                ?.Value ?? COLUMN_SPACING;
 
                     col.Margin = new MarginPadding { Left = spacing };
                 }
 
-                float? width = currentSkin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
-                                              new LegacyManiaSkinConfigurationLookup(Columns.Count, LegacyManiaSkinConfigurationLookups.ColumnWidth, col.Index))
+                float? width = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                              new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, col.Index))
                                           ?.Value;
 
                 if (width == null)
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index a0f5b8fe01..689a7b35ea 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -179,7 +179,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override RulesetSettingsSubsection CreateSettings() => new OsuSettingsSubsection(this);
 
-        public override ISkin CreateLegacySkinProvider(ISkinSource source) => new OsuLegacySkinTransformer(source);
+        public override ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => new OsuLegacySkinTransformer(source);
 
         public int LegacyID => 0;
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index a6c9a33569..74d9e68ad3 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new TaikoBeatmapConverter(beatmap, this);
 
-        public override ISkin CreateLegacySkinProvider(ISkinSource source) => new TaikoLegacySkinTransformer(source);
+        public override ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => new TaikoLegacySkinTransformer(source);
 
         public const string SHORT_NAME = "taiko";
 
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 58f598a203..bee11accca 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets
 
         public ModAutoplay GetAutoplayMod() => GetAllMods().OfType<ModAutoplay>().First();
 
-        public virtual ISkin CreateLegacySkinProvider(ISkinSource source) => null;
+        public virtual ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => null;
 
         protected Ruleset()
         {
diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index cdea200e10..04983ca597 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Edit.Compose
 
             // the beatmapSkinProvider is used as the fallback source here to allow the ruleset-specific skin implementation
             // full access to all skin sources.
-            var rulesetSkinProvider = new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(beatmapSkinProvider));
+            var rulesetSkinProvider = new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(beatmapSkinProvider, EditorBeatmap.PlayableBeatmap));
 
             // load the skinning hierarchy first.
             // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 5da53ad2c9..4597ae760c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Screens.Play
             dependencies.CacheAs(gameplayBeatmap);
 
             addUnderlayComponents(GameplayClockContainer);
-            addGameplayComponents(GameplayClockContainer, Beatmap.Value);
+            addGameplayComponents(GameplayClockContainer, Beatmap.Value, playableBeatmap);
             addOverlayComponents(GameplayClockContainer, Beatmap.Value);
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
@@ -214,13 +214,13 @@ namespace osu.Game.Screens.Play
             target.Add(DimmableStoryboard = new DimmableStoryboard(Beatmap.Value.Storyboard) { RelativeSizeAxes = Axes.Both });
         }
 
-        private void addGameplayComponents(Container target, WorkingBeatmap working)
+        private void addGameplayComponents(Container target, WorkingBeatmap working, IBeatmap playableBeatmap)
         {
             var beatmapSkinProvider = new BeatmapSkinProvidingContainer(working.Skin);
 
             // the beatmapSkinProvider is used as the fallback source here to allow the ruleset-specific skin implementation
             // full access to all skin sources.
-            var rulesetSkinProvider = new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(beatmapSkinProvider));
+            var rulesetSkinProvider = new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(beatmapSkinProvider, playableBeatmap));
 
             // load the skinning hierarchy first.
             // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 7a5328d30c..d0113b3096 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Skinning;
 using osuTK;
@@ -47,16 +48,18 @@ namespace osu.Game.Tests.Visual
         {
             createdDrawables.Clear();
 
-            Cell(0).Child = createProvider(null, creationFunction);
-            Cell(1).Child = createProvider(metricsSkin, creationFunction);
-            Cell(2).Child = createProvider(defaultSkin, creationFunction);
-            Cell(3).Child = createProvider(specialSkin, creationFunction);
-            Cell(4).Child = createProvider(oldSkin, creationFunction);
+            var beatmap = CreateBeatmapForSkinProvider();
+
+            Cell(0).Child = createProvider(null, creationFunction, beatmap);
+            Cell(1).Child = createProvider(metricsSkin, creationFunction, beatmap);
+            Cell(2).Child = createProvider(defaultSkin, creationFunction, beatmap);
+            Cell(3).Child = createProvider(specialSkin, creationFunction, beatmap);
+            Cell(4).Child = createProvider(oldSkin, creationFunction, beatmap);
         }
 
         protected IEnumerable<Drawable> CreatedDrawables => createdDrawables;
 
-        private Drawable createProvider(Skin skin, Func<Drawable> creationFunction)
+        private Drawable createProvider(Skin skin, Func<Drawable> creationFunction, IBeatmap beatmap)
         {
             var created = creationFunction();
             createdDrawables.Add(created);
@@ -100,7 +103,7 @@ namespace osu.Game.Tests.Visual
                         {
                             new OutlineBox { Alpha = autoSize ? 1 : 0 },
                             mainProvider.WithChild(
-                                new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider))
+                                new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider, beatmap))
                                 {
                                     Child = created,
                                     RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,
@@ -113,6 +116,8 @@ namespace osu.Game.Tests.Visual
             };
         }
 
+        protected virtual IBeatmap CreateBeatmapForSkinProvider() => CreateWorkingBeatmap(Ruleset.Value).GetPlayableBeatmap(Ruleset.Value);
+
         private class OutlineBox : CompositeDrawable
         {
             public OutlineBox()

From 571748d10528e5cabad54a4c4dccd3b439235c48 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Apr 2020 11:55:52 +0900
Subject: [PATCH 01905/10326] Add some xmldocs + nullable parameter

---
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs      | 14 ++++++++++++--
 .../Skinning/ManiaSkinConfigurationLookup.cs       | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 89eb203309..2371d74a2b 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -1,15 +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.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania
 {
     public class ManiaSkinComponent : GameplaySkinComponent<ManiaSkinComponents>
     {
-        public readonly int TargetColumn;
+        /// <summary>
+        /// The intended <see cref="Column"/> index for this component.
+        /// May be null if the component does not exist in a <see cref="Column"/>.
+        /// </summary>
+        public readonly int? TargetColumn;
 
-        public ManiaSkinComponent(ManiaSkinComponents component, int targetColumn)
+        /// <summary>
+        /// Creates a new <see cref="ManiaSkinComponent"/>.
+        /// </summary>
+        /// <param name="component">The component.</param>
+        /// <param name="targetColumn">The intended <see cref="Column"/> index for this component. May be null if the component does not exist in a <see cref="Column"/>.</param>
+        public ManiaSkinComponent(ManiaSkinComponents component, int? targetColumn = null)
             : base(component)
         {
             TargetColumn = targetColumn;
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
index 7e5a2aa7ed..f07a5518b7 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
@@ -1,15 +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.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
     public class ManiaSkinConfigurationLookup
     {
+        /// <summary>
+        /// The configuration lookup value.
+        /// </summary>
         public readonly LegacyManiaSkinConfigurationLookups Lookup;
+
+        /// <summary>
+        /// The intended <see cref="Column"/> index for the configuration.
+        /// May be null if the configuration does not apply to a <see cref="Column"/>.
+        /// </summary>
         public readonly int? TargetColumn;
 
+        /// <summary>
+        /// Creates a new <see cref="ManiaSkinConfigurationLookup"/>.
+        /// </summary>
+        /// <param name="lookup">The lookup value.</param>
+        /// <param name="targetColumn">The intended <see cref="Column"/> index for the configuration. May be null if the configuration does not apply to a <see cref="Column"/>.</param>
         public ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups lookup, int? targetColumn = null)
         {
             Lookup = lookup;

From b42d1104b7270a5946090dc563ad439dd32478ef Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Apr 2020 13:16:01 +0900
Subject: [PATCH 01906/10326] Fix mania converts scrolling at incorrect speeds

---
 .../UI/DrawableManiaRuleset.cs                | 13 ++++++++
 .../UI/Scrolling/DrawableScrollingRuleset.cs  | 32 +++++++++----------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index e5ec054fa7..796d083c32 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -46,6 +47,18 @@ namespace osu.Game.Rulesets.Mania.UI
         [BackgroundDependencyLoader]
         private void load()
         {
+            bool isForCurrentRuleset = Beatmap.BeatmapInfo.Ruleset.Equals(Ruleset.RulesetInfo);
+
+            foreach (var p in ControlPoints)
+            {
+                // Mania doesn't care about global velocity
+                p.Velocity = 1;
+
+                // For non-mania beatmap, speed changes should only happen through timing points
+                if (!isForCurrentRuleset)
+                    p.DifficultyPoint = new DifficultyControlPoint();
+            }
+
             BarLines.ForEach(Playfield.Add);
 
             Config.BindWith(ManiaRulesetSetting.ScrollDirection, configDirection);
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index 8bcdfff2fd..f3d2c5bdcb 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -74,11 +74,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
         protected virtual bool RelativeScaleBeatLengths => false;
 
         /// <summary>
-        /// Provides the default <see cref="MultiplierControlPoint"/>s that adjust the scrolling rate of <see cref="HitObject"/>s
-        /// inside this <see cref="DrawableRuleset{TObject}"/>.
+        /// The <see cref="MultiplierControlPoint"/>s that adjust the scrolling rate of <see cref="HitObject"/>s inside this <see cref="DrawableRuleset{TObject}"/>.
         /// </summary>
-        /// <returns></returns>
-        private readonly SortedList<MultiplierControlPoint> controlPoints = new SortedList<MultiplierControlPoint>(Comparer<MultiplierControlPoint>.Default);
+        protected readonly SortedList<MultiplierControlPoint> ControlPoints = new SortedList<MultiplierControlPoint>(Comparer<MultiplierControlPoint>.Default);
 
         protected IScrollingInfo ScrollingInfo => scrollingInfo;
 
@@ -95,11 +93,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
             switch (VisualisationMethod)
             {
                 case ScrollVisualisationMethod.Sequential:
-                    scrollingInfo.Algorithm = new SequentialScrollAlgorithm(controlPoints);
+                    scrollingInfo.Algorithm = new SequentialScrollAlgorithm(ControlPoints);
                     break;
 
                 case ScrollVisualisationMethod.Overlapping:
-                    scrollingInfo.Algorithm = new OverlappingScrollAlgorithm(controlPoints);
+                    scrollingInfo.Algorithm = new OverlappingScrollAlgorithm(ControlPoints);
                     break;
 
                 case ScrollVisualisationMethod.Constant:
@@ -168,10 +166,18 @@ namespace osu.Game.Rulesets.UI.Scrolling
                             // Collapse sections with the same start time
                             .GroupBy(s => s.StartTime).Select(g => g.Last()).OrderBy(s => s.StartTime);
 
-            controlPoints.AddRange(timingChanges);
+            ControlPoints.AddRange(timingChanges);
 
-            if (controlPoints.Count == 0)
-                controlPoints.Add(new MultiplierControlPoint { Velocity = Beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier });
+            if (ControlPoints.Count == 0)
+                ControlPoints.Add(new MultiplierControlPoint { Velocity = Beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (!(Playfield is ScrollingPlayfield))
+                throw new ArgumentException($"{nameof(Playfield)} must be a {nameof(ScrollingPlayfield)} when using {nameof(DrawableScrollingRuleset<TObject>)}.");
         }
 
         public bool OnPressed(GlobalAction action)
@@ -193,14 +199,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
             return false;
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            if (!(Playfield is ScrollingPlayfield))
-                throw new ArgumentException($"{nameof(Playfield)} must be a {nameof(ScrollingPlayfield)} when using {nameof(DrawableScrollingRuleset<TObject>)}.");
-        }
-
         public void OnReleased(GlobalAction action)
         {
         }

From 8cb0eb9b1251169e4433fe42948239cda76da607 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 3 Apr 2020 15:08:06 +0900
Subject: [PATCH 01907/10326] Fix dynamic recompilation in intro test scenes

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

diff --git a/osu.Game.Tests/Visual/Menus/IntroTestScene.cs b/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
index 1ad4d9dca9..33811f9529 100644
--- a/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
+++ b/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Tests.Visual.Menus
         {
             typeof(StartupScreen),
             typeof(IntroScreen),
-            typeof(OsuScreen),
             typeof(IntroTestScene),
         };
 

From 51db361c32c2c1a3a97599ff5ea47490d1e8369c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 3 Apr 2020 15:59:56 +0900
Subject: [PATCH 01908/10326] Update usages of Animation and Video in line with
 framework changes

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs               |  2 +-
 .../Skinning/LegacyHitExplosion.cs                  |  2 +-
 osu.Game.Tournament/Components/TourneyVideo.cs      |  4 ++--
 osu.Game/Screens/Menu/IntroTriangles.cs             |  3 +--
 osu.Game/Skinning/LegacySkinExtensions.cs           |  8 +++++---
 .../Drawables/DrawableStoryboardAnimation.cs        |  2 +-
 .../Drawables/DrawableStoryboardVideo.cs            | 13 ++++++-------
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 13935e036b..7c815370c8 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -384,7 +384,7 @@ namespace osu.Game.Rulesets.Catch.UI
             }
 
             currentCatcher.Show();
-            (currentCatcher.Drawable as IAnimation)?.GotoFrame(0);
+            (currentCatcher.Drawable as IFramedAnimation)?.GotoFrame(0);
         }
 
         private void beginTrail()
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index 4868dd87ef..c87a1d438b 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             // This animation is discarded and re-queried with the appropriate frame length afterwards.
             var tmp = skin.GetAnimation(imageName, true, false);
             double frameLength = 0;
-            if (tmp is IAnimation tmpAnimation && tmpAnimation.FrameCount > 0)
+            if (tmp is IFramedAnimation tmpAnimation && tmpAnimation.FrameCount > 0)
                 frameLength = Math.Max(1000 / 60.0, 170.0 / tmpAnimation.FrameCount);
 
             explosion = skin.GetAnimation(imageName, true, false, startAtCurrentTime: true, frameLength: frameLength).With(d =>
diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index bc66fad8c1..317c5f6a56 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tournament.Components
     {
         private readonly string filename;
         private readonly bool drawFallbackGradient;
-        private VideoSprite video;
+        private Video video;
 
         private ManualClock manualClock;
 
@@ -33,7 +33,7 @@ namespace osu.Game.Tournament.Components
 
             if (stream != null)
             {
-                InternalChild = video = new VideoSprite(stream, false)
+                InternalChild = video = new Video(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 be5762e68d..b44b6ea993 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -270,10 +270,9 @@ namespace osu.Game.Screens.Menu
                 [BackgroundDependencyLoader]
                 private void load()
                 {
-                    InternalChild = new VideoSprite(videoStream, false)
+                    InternalChild = new Video(videoStream, false)
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Clock = new FramedOffsetClock(Clock) { Offset = -logo_1 }
                     };
                 }
             }
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index ea3d180ef8..9bfde4fdcb 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Timing;
 
 namespace osu.Game.Skinning
 {
@@ -28,7 +27,7 @@ namespace osu.Game.Skinning
                     var animation = new SkinnableTextureAnimation(startAtCurrentTime)
                     {
                         DefaultFrameLength = frameLength ?? getFrameLength(source, applyConfigFrameRate, textures),
-                        Repeat = looping,
+                        Loop = looping,
                     };
 
                     foreach (var t in textures)
@@ -71,7 +70,10 @@ namespace osu.Game.Skinning
                 base.LoadComplete();
 
                 if (timeReference != null)
-                    Clock = new FramedOffsetClock(timeReference.Clock) { Offset = -timeReference.AnimationStartTime };
+                {
+                    Clock = timeReference.Clock;
+                    PlaybackPosition = timeReference.AnimationStartTime - timeReference.Clock.CurrentTime;
+                }
             }
         }
 
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index eabb78bac5..72e52f6106 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Storyboards.Drawables
             Animation = animation;
             Origin = animation.Origin;
             Position = animation.InitialPosition;
-            Repeat = animation.LoopType == AnimationLoopType.LoopForever;
+            Loop = animation.LoopType == AnimationLoopType.LoopForever;
 
             LifetimeStart = animation.StartTime;
             LifetimeEnd = animation.EndTime;
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index d4dbdf1ea8..2e7b66ea4f 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Video;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Storyboards.Drawables
@@ -16,7 +15,7 @@ namespace osu.Game.Storyboards.Drawables
     public class DrawableStoryboardVideo : CompositeDrawable
     {
         public readonly StoryboardVideo Video;
-        private VideoSprite videoSprite;
+        private Video video;
 
         public override bool RemoveWhenNotAlive => false;
 
@@ -40,14 +39,14 @@ namespace osu.Game.Storyboards.Drawables
             if (stream == null)
                 return;
 
-            InternalChild = videoSprite = new VideoSprite(stream, false)
+            InternalChild = video = new Video(stream, false)
             {
                 RelativeSizeAxes = Axes.Both,
                 FillMode = FillMode.Fill,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Alpha = 0,
-                Clock = new FramedOffsetClock(Clock) { Offset = -Video.StartTime }
+                PlaybackPosition = Video.StartTime
             };
         }
 
@@ -55,10 +54,10 @@ namespace osu.Game.Storyboards.Drawables
         {
             base.LoadComplete();
 
-            if (videoSprite == null) return;
+            if (video == null) return;
 
-            using (videoSprite.BeginAbsoluteSequence(0))
-                videoSprite.FadeIn(500);
+            using (video.BeginAbsoluteSequence(0))
+                video.FadeIn(500);
         }
     }
 }

From b1268a73f1c0a0de1260e57a34aa20ec2a3bc64b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Apr 2020 18:15:24 +0900
Subject: [PATCH 01909/10326] Add keybinding repeat extension method

---
 osu.Game/Extensions/DrawableExtensions.cs | 32 +++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 osu.Game/Extensions/DrawableExtensions.cs

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
new file mode 100644
index 0000000000..1790eb608e
--- /dev/null
+++ b/osu.Game/Extensions/DrawableExtensions.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 System;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Threading;
+
+namespace osu.Game.Extensions
+{
+    public static class DrawableExtensions
+    {
+        /// <summary>
+        /// Helper method that is used while <see cref="IKeyBindingHandler"/> doesn't support repetitions of <see cref="IKeyBindingHandler{T}.OnPressed"/>.
+        /// Simulates repetitions by continually invoking a delegate according to the default key repeat rate.
+        /// </summary>
+        /// <remarks>
+        /// The returned delegate can be cancelled to stop repeat events from firing (usually in <see cref="IKeyBindingHandler{T}.OnReleased"/>).
+        /// </remarks>
+        /// <param name="handler">The <see cref="IKeyBindingHandler{T}"/> which is handling the repeat.</param>
+        /// <param name="scheduler">The <see cref="Scheduler"/> to schedule repetitions on.</param>
+        /// <param name="action">The <see cref="Action"/> to be invoked once immediately and with every repetition.</param>
+        /// <returns>A <see cref="ScheduledDelegate"/> which can be cancelled to stop the repeat events from firing.</returns>
+        public static ScheduledDelegate BeginKeyRepeat(this IKeyBindingHandler handler, Scheduler scheduler, Action action)
+        {
+            action();
+
+            ScheduledDelegate repeatDelegate = new ScheduledDelegate(action, handler.Time.Current + 250, 70);
+            scheduler.Add(repeatDelegate);
+            return repeatDelegate;
+        }
+    }
+}

From 0a7d9b930c76ca3c224abe79d0d395334e777d9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 3 Apr 2020 18:23:03 +0900
Subject: [PATCH 01910/10326] Add osu!taiko legacy drum skinning support

---
 .../metrics-skin/taiko-bar-left@2x.png        | Bin 0 -> 78533 bytes
 .../metrics-skin/taiko-drum-inner@2x.png      | Bin 0 -> 4829 bytes
 .../metrics-skin/taiko-drum-outer@2x.png      | Bin 0 -> 7818 bytes
 .../TestSceneInputDrum.cs                     |  13 +-
 .../Skinning/LegacyTaikoDrum.cs               | 144 ++++++++++++++++++
 .../Skinning/TaikoLegacySkinTransformer.cs    |  17 ++-
 .../TaikoSkinComponents.cs                    |   1 +
 osu.Game.Rulesets.Taiko/UI/InputDrum.cs       |  65 ++++----
 8 files changed, 200 insertions(+), 40 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-bar-left@2x.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-drum-inner@2x.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-drum-outer@2x.png
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoDrum.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-bar-left@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-bar-left@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc3d7f4c702b7e94d1c53e3434b61d028bd803e3
GIT binary patch
literal 78533
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-drum-inner@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-drum-inner@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..15a89ade1bb6e63efb49b48fee95d7c664ed5ff0
GIT binary patch
literal 4829
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
Xp_`m9X#X7j11iuj*tcfQ&g}mI9g`V^

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-drum-outer@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-drum-outer@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a01583c6fb1aefbf69878e0650e586b7e91922f9
GIT binary patch
literal 7818
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs
index 8c1b0c4c62..c79088056f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs
@@ -4,31 +4,28 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Taiko.Audio;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
-    public class TestSceneInputDrum : OsuTestScene
+    public class TestSceneInputDrum : SkinnableTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(InputDrum),
-            typeof(DrumSampleMapping),
-            typeof(HitSampleInfo),
-            typeof(SampleControlPoint)
         };
 
-        public TestSceneInputDrum()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            Add(new TaikoInputManager(new RulesetInfo { ID = 1 })
+            SetContents(() => new TaikoInputManager(new RulesetInfo { ID = 1 })
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = new Container
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoDrum.cs
new file mode 100644
index 0000000000..8fe7c5e566
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoDrum.cs
@@ -0,0 +1,144 @@
+// Copyright (c) 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.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.Taiko.Audio;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.Skinning
+{
+    /// <summary>
+    /// A component of the playfield that captures input and displays input as a drum.
+    /// </summary>
+    internal class LegacyInputDrum : Container
+    {
+        public LegacyInputDrum()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            Children = new Drawable[]
+            {
+                new Sprite
+                {
+                    Texture = skin.GetTexture("taiko-bar-left")
+                },
+                new LegacyHalfDrum(false)
+                {
+                    Name = "Left Half",
+                    RelativeSizeAxes = Axes.Both,
+                    Width = 0.5f,
+                    RimAction = TaikoAction.LeftRim,
+                    CentreAction = TaikoAction.LeftCentre
+                },
+                new LegacyHalfDrum(true)
+                {
+                    Name = "Right Half",
+                    Anchor = Anchor.TopRight,
+                    RelativeSizeAxes = Axes.Both,
+                    Width = 0.5f,
+                    Scale = new Vector2(-1, 1),
+                    RimAction = TaikoAction.RightRim,
+                    CentreAction = TaikoAction.RightCentre
+                }
+            };
+        }
+
+        /// <summary>
+        /// A half-drum. Contains one centre and one rim hit.
+        /// </summary>
+        private class LegacyHalfDrum : Container, IKeyBindingHandler<TaikoAction>
+        {
+            /// <summary>
+            /// The key to be used for the rim of the half-drum.
+            /// </summary>
+            public TaikoAction RimAction;
+
+            /// <summary>
+            /// The key to be used for the centre of the half-drum.
+            /// </summary>
+            public TaikoAction CentreAction;
+
+            private readonly Sprite rimHit;
+            private readonly Sprite centreHit;
+
+            [Resolved]
+            private DrumSampleMapping sampleMappings { get; set; }
+
+            public LegacyHalfDrum(bool flipped)
+            {
+                Masking = true;
+
+                Children = new Drawable[]
+                {
+                    rimHit = new Sprite
+                    {
+                        Anchor = flipped ? Anchor.CentreRight : Anchor.CentreLeft,
+                        Origin = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
+                        Scale = new Vector2(-1, 1),
+                        Alpha = 0,
+                    },
+                    centreHit = new Sprite
+                    {
+                        Anchor = flipped ? Anchor.CentreRight : Anchor.CentreLeft,
+                        Origin = flipped ? Anchor.CentreRight : Anchor.CentreLeft,
+                        Alpha = 0,
+                    }
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(ISkinSource skin)
+            {
+                rimHit.Texture = skin.GetTexture(@"taiko-drum-outer");
+                centreHit.Texture = skin.GetTexture(@"taiko-drum-inner");
+            }
+
+            public bool OnPressed(TaikoAction action)
+            {
+                Drawable target = null;
+                var drumSample = sampleMappings.SampleAt(Time.Current);
+
+                if (action == CentreAction)
+                {
+                    target = centreHit;
+                    drumSample.Centre?.Play();
+                }
+                else if (action == RimAction)
+                {
+                    target = rimHit;
+                    drumSample.Rim?.Play();
+                }
+
+                if (target != null)
+                {
+                    const float alpha_amount = 1;
+
+                    const float down_time = 80;
+                    const float up_time = 50;
+
+                    target.Animate(
+                        t => t.FadeTo(Math.Min(target.Alpha + alpha_amount, 1), down_time)
+                    ).Then(
+                        t => t.FadeOut(up_time)
+                    );
+                }
+
+                return false;
+            }
+
+            public void OnReleased(TaikoAction action)
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 381cd14cd4..78eec94590 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -20,7 +20,22 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             this.source = source;
         }
 
-        public Drawable GetDrawableComponent(ISkinComponent component) => source.GetDrawableComponent(component);
+        public Drawable GetDrawableComponent(ISkinComponent component)
+        {
+            if (!(component is TaikoSkinComponent taikoComponent))
+                return null;
+
+            switch (taikoComponent.Component)
+            {
+                case TaikoSkinComponents.InputDrum:
+                    if (GetTexture("taiko-bar-left") != null)
+                        return new LegacyInputDrum();
+
+                    return null;
+            }
+
+            return source.GetDrawableComponent(component);
+        }
 
         public Texture GetTexture(string componentName) => source.GetTexture(componentName);
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index 04aca534c6..6d4581db80 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -5,5 +5,6 @@ namespace osu.Game.Rulesets.Taiko
 {
     public enum TaikoSkinComponents
     {
+        InputDrum,
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
index d26ccfe867..422ea2f929 100644
--- a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
@@ -12,6 +12,7 @@ using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Taiko.Audio;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -22,11 +23,12 @@ namespace osu.Game.Rulesets.Taiko.UI
     {
         private const float middle_split = 0.025f;
 
-        private readonly ControlPointInfo controlPoints;
+        [Cached]
+        private DrumSampleMapping sampleMapping;
 
         public InputDrum(ControlPointInfo controlPoints)
         {
-            this.controlPoints = controlPoints;
+            sampleMapping = new DrumSampleMapping(controlPoints);
 
             RelativeSizeAxes = Axes.Both;
             FillMode = FillMode.Fit;
@@ -35,35 +37,37 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            var sampleMappings = new DrumSampleMapping(controlPoints);
-
-            Children = new Drawable[]
+            Child = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.InputDrum), _ => new Container
             {
-                new TaikoHalfDrum(false, sampleMappings)
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    Name = "Left Half",
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.CentreRight,
-                    RelativeSizeAxes = Axes.Both,
-                    RelativePositionAxes = Axes.X,
-                    X = -middle_split / 2,
-                    RimAction = TaikoAction.LeftRim,
-                    CentreAction = TaikoAction.LeftCentre
-                },
-                new TaikoHalfDrum(true, sampleMappings)
-                {
-                    Name = "Right Half",
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.CentreLeft,
-                    RelativeSizeAxes = Axes.Both,
-                    RelativePositionAxes = Axes.X,
-                    X = middle_split / 2,
-                    RimAction = TaikoAction.RightRim,
-                    CentreAction = TaikoAction.RightCentre
+                    new TaikoHalfDrum(false)
+                    {
+                        Name = "Left Half",
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.CentreRight,
+                        RelativeSizeAxes = Axes.Both,
+                        RelativePositionAxes = Axes.X,
+                        X = -middle_split / 2,
+                        RimAction = TaikoAction.LeftRim,
+                        CentreAction = TaikoAction.LeftCentre
+                    },
+                    new TaikoHalfDrum(true)
+                    {
+                        Name = "Right Half",
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.CentreLeft,
+                        RelativeSizeAxes = Axes.Both,
+                        RelativePositionAxes = Axes.X,
+                        X = middle_split / 2,
+                        RimAction = TaikoAction.RightRim,
+                        CentreAction = TaikoAction.RightCentre
+                    }
                 }
-            };
+            });
 
-            AddRangeInternal(sampleMappings.Sounds);
+            AddRangeInternal(sampleMapping.Sounds);
         }
 
         /// <summary>
@@ -86,12 +90,11 @@ namespace osu.Game.Rulesets.Taiko.UI
             private readonly Sprite centre;
             private readonly Sprite centreHit;
 
-            private readonly DrumSampleMapping sampleMappings;
+            [Resolved]
+            private DrumSampleMapping sampleMappings { get; set; }
 
-            public TaikoHalfDrum(bool flipped, DrumSampleMapping sampleMappings)
+            public TaikoHalfDrum(bool flipped)
             {
-                this.sampleMappings = sampleMappings;
-
                 Masking = true;
 
                 Children = new Drawable[]

From 1ff2cc31d113ea02c02802c1d720411ceb9f6bbb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Apr 2020 18:25:01 +0900
Subject: [PATCH 01911/10326] Implement more familiar scroll speed options in
 mania

---
 .../ManiaRulesetConfigManager.cs              |  5 +-
 .../UI/DrawableManiaRuleset.cs                | 22 ++++++++
 .../UI/Scrolling/DrawableScrollingRuleset.cs  | 56 ++++++++++++-------
 3 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index f5412dcfc5..4926f448ee 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.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.Configuration.Tracking;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Configuration;
@@ -19,13 +20,13 @@ namespace osu.Game.Rulesets.Mania.Configuration
         {
             base.InitialiseDefaults();
 
-            Set(ManiaRulesetSetting.ScrollTime, 1500.0, 50.0, 5000.0, 50.0);
+            Set(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 1);
             Set(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
         {
-            new TrackedSetting<double>(ManiaRulesetSetting.ScrollTime, v => new SettingDescription(v, "Scroll Time", $"{v}ms"))
+            new TrackedSetting<double>(ManiaRulesetSetting.ScrollTime, v => new SettingDescription(v, "Scroll Speed", $"{(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / v)}"))
         };
     }
 
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index e5ec054fa7..f4e67b0793 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Input.Handlers;
@@ -25,6 +26,16 @@ namespace osu.Game.Rulesets.Mania.UI
 {
     public class DrawableManiaRuleset : DrawableScrollingRuleset<ManiaHitObject>
     {
+        /// <summary>
+        /// The minimum time range. This occurs at a <see cref="relativeTimeRange"/> of 40.
+        /// </summary>
+        public const double MIN_TIME_RANGE = 150;
+
+        /// <summary>
+        /// The maximum time range. This occurs at a <see cref="relativeTimeRange"/> of 1.
+        /// </summary>
+        public const double MAX_TIME_RANGE = 6000;
+
         protected new ManiaPlayfield Playfield => (ManiaPlayfield)base.Playfield;
 
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
@@ -54,6 +65,17 @@ namespace osu.Game.Rulesets.Mania.UI
             Config.BindWith(ManiaRulesetSetting.ScrollTime, TimeRange);
         }
 
+        protected override void AdjustScrollSpeed(int amount)
+        {
+            this.TransformTo(nameof(relativeTimeRange), relativeTimeRange + amount, 200, Easing.OutQuint);
+        }
+
+        private double relativeTimeRange
+        {
+            get => MAX_TIME_RANGE / TimeRange.Value;
+            set => TimeRange.Value = MAX_TIME_RANGE / value;
+        }
+
         /// <summary>
         /// Retrieves the column that intersects a screen-space position.
         /// </summary>
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index 8bcdfff2fd..e9fe52cd3b 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -9,9 +9,11 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Lists;
+using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
+using osu.Game.Extensions;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -174,25 +176,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 controlPoints.Add(new MultiplierControlPoint { Velocity = Beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier });
         }
 
-        public bool OnPressed(GlobalAction action)
-        {
-            if (!UserScrollSpeedAdjustment)
-                return false;
-
-            switch (action)
-            {
-                case GlobalAction.IncreaseScrollSpeed:
-                    this.TransformBindableTo(TimeRange, TimeRange.Value - time_span_step, 200, Easing.OutQuint);
-                    return true;
-
-                case GlobalAction.DecreaseScrollSpeed:
-                    this.TransformBindableTo(TimeRange, TimeRange.Value + time_span_step, 200, Easing.OutQuint);
-                    return true;
-            }
-
-            return false;
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -201,8 +184,43 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 throw new ArgumentException($"{nameof(Playfield)} must be a {nameof(ScrollingPlayfield)} when using {nameof(DrawableScrollingRuleset<TObject>)}.");
         }
 
+        /// <summary>
+        /// Adjusts the scroll speed of the <see cref="HitObject"/>.
+        /// </summary>
+        /// <param name="amount">The amount to adjust by. Greater than 0 if the scroll speed should be increased, less than 0 if it should be decreased.</param>
+        protected virtual void AdjustScrollSpeed(int amount) => this.TransformBindableTo(TimeRange, TimeRange.Value - amount * time_span_step, 200, Easing.OutQuint);
+
+        public bool OnPressed(GlobalAction action)
+        {
+            if (!UserScrollSpeedAdjustment)
+                return false;
+
+            switch (action)
+            {
+                case GlobalAction.IncreaseScrollSpeed:
+                    scheduleScrollSpeedAdjustment(1);
+                    return true;
+
+                case GlobalAction.DecreaseScrollSpeed:
+                    scheduleScrollSpeedAdjustment(-1);
+                    return true;
+            }
+
+            return false;
+        }
+
+        private ScheduledDelegate scheduledScrollSpeedAdjustment;
+
         public void OnReleased(GlobalAction action)
         {
+            scheduledScrollSpeedAdjustment?.Cancel();
+            scheduledScrollSpeedAdjustment = null;
+        }
+
+        private void scheduleScrollSpeedAdjustment(int amount)
+        {
+            scheduledScrollSpeedAdjustment?.Cancel();
+            scheduledScrollSpeedAdjustment = this.BeginKeyRepeat(Scheduler, () => AdjustScrollSpeed(amount));
         }
 
         private class LocalScrollingInfo : IScrollingInfo

From fd9d4a8d322cc0576537ef0a4e6aa1e86cc4ae7b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 3 Apr 2020 18:29:32 +0900
Subject: [PATCH 01912/10326] 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 3e10e6cc4d..68528d5688 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.402.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.402.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 073799f08f..ad9a835cdb 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.402.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.402.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 6578aec69f..6a32359ebe 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.402.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.402.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From d90db5649dc049d9bb1b00bf1a79266562fd4782 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Apr 2020 18:32:07 +0900
Subject: [PATCH 01913/10326] Improve comment slightly

---
 osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index e9fe52cd3b..a7eb78e3ae 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         }
 
         /// <summary>
-        /// Adjusts the scroll speed of the <see cref="HitObject"/>.
+        /// Adjusts the scroll speed of <see cref="HitObject"/>s.
         /// </summary>
         /// <param name="amount">The amount to adjust by. Greater than 0 if the scroll speed should be increased, less than 0 if it should be decreased.</param>
         protected virtual void AdjustScrollSpeed(int amount) => this.TransformBindableTo(TimeRange, TimeRange.Value - amount * time_span_step, 200, Easing.OutQuint);

From 23b7cde941495bdc43944cdc66b634600370060a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Apr 2020 18:38:04 +0900
Subject: [PATCH 01914/10326] Add milliseconds value alongside

---
 .../Configuration/ManiaRulesetConfigManager.cs                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 4926f448ee..7e84f17809 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -26,7 +26,8 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
         {
-            new TrackedSetting<double>(ManiaRulesetSetting.ScrollTime, v => new SettingDescription(v, "Scroll Speed", $"{(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / v)}"))
+            new TrackedSetting<double>(ManiaRulesetSetting.ScrollTime,
+                v => new SettingDescription(v, "Scroll Speed", $"{(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / v)} ({v}ms)"))
         };
     }
 

From d896d5a231bd22a6964a57997e2eae836c62daaa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 3 Apr 2020 18:51:34 +0900
Subject: [PATCH 01915/10326] Rename filename to match class

---
 .../Skinning/{LegacyTaikoDrum.cs => LegacyInputDrum.cs}           | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Taiko/Skinning/{LegacyTaikoDrum.cs => LegacyInputDrum.cs} (100%)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoDrum.cs
rename to osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs

From f59479fa0719b1e4408d013c0da8ee1f64292ed1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 3 Apr 2020 21:09:33 +0900
Subject: [PATCH 01916/10326] Update framework

---
 .idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml | 2 +-
 osu.Android.props                                        | 2 +-
 osu.Game/osu.Game.csproj                                 | 2 +-
 osu.iOS.props                                            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
index 7515e76054..4bb9f4d2a0 100644
--- a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
+++ b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="1" />
+    <option name="vcsConfiguration" value="2" />
   </component>
 </project>
\ No newline at end of file
diff --git a/osu.Android.props b/osu.Android.props
index 3e10e6cc4d..db68a3052a 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.402.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.402.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.403.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 073799f08f..edccb56cd1 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.402.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.402.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.403.0" />
     <PackageReference Include="Sentry" Version="2.1.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 6578aec69f..f8449be037 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.402.1" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.402.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.403.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.402.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.403.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 7b2144a1a71c748ea7e42434265ad6890e35604c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 3 Apr 2020 23:31:46 +0900
Subject: [PATCH 01917/10326] Fix merge mishap

---
 .../Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index 36fb64bfef..0955f32790 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -182,14 +182,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 throw new ArgumentException($"{nameof(Playfield)} must be a {nameof(ScrollingPlayfield)} when using {nameof(DrawableScrollingRuleset<TObject>)}.");
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            if (!(Playfield is ScrollingPlayfield))
-                throw new ArgumentException($"{nameof(Playfield)} must be a {nameof(ScrollingPlayfield)} when using {nameof(DrawableScrollingRuleset<TObject>)}.");
-        }
-
         /// <summary>
         /// Adjusts the scroll speed of <see cref="HitObject"/>s.
         /// </summary>

From 7e82f5740b0668e1f21321cd257be9928026ad54 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 3 Apr 2020 19:35:50 +0300
Subject: [PATCH 01918/10326] Add a skin extension for simplifying falling back
 on hyper-dash colours

---
 .../Objects/Drawables/FruitPiece.cs              |  3 +--
 .../Skinning/CatchSkinExtensions.cs              | 16 ++++++++++++++++
 .../Skinning/LegacyFruitPiece.cs                 |  7 +------
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
index 16818746b5..2437958916 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
@@ -64,8 +64,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             });
 
             var hyperDashColour =
-                skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??
-                skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
+                skin.GetHyperDashFruitColour()?.Value ??
                 Catcher.DefaultHyperDashColour;
 
             if (hitObject.HyperDash)
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
new file mode 100644
index 0000000000..8fc0831918
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.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.Framework.Bindables;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Skinning
+{
+    internal static class CatchSkinExtensions
+    {
+        public static IBindable<Color4> GetHyperDashFruitColour(this ISkin skin)
+            => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit) ??
+               skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash);
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 5235058c52..d8489399d2 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -54,15 +54,10 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
             if (drawableCatchObject.HitObject.HyperDash)
             {
-                var hyperDashColour =
-                    skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??
-                    skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
-                    Catcher.DefaultHyperDashColour;
-
                 var hyperDash = new Sprite
                 {
                     Texture = skin.GetTexture(lookupName),
-                    Colour = hyperDashColour,
+                    Colour = skin.GetHyperDashFruitColour()?.Value ?? Catcher.DefaultHyperDashColour,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Blending = BlendingParameters.Additive,

From 0340b6db51f88120511ac243cc0872bc8527eb32 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 3 Apr 2020 19:50:32 +0300
Subject: [PATCH 01919/10326] Describe step names more

---
 .../TestSceneHyperDashColouring.cs                   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index ebc3d3bff1..066b399f13 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             DrawableFruit drawableFruit = null;
 
-            AddStep("setup fruit", () =>
+            AddStep("setup hyper-dash fruit", () =>
             {
                 var fruit = new Fruit { HyperDashTarget = new Banana() };
                 fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 }, false, false, false, legacyFruit);
             });
 
-            AddAssert("default colour", () =>
+            AddAssert("hyper-dash fruit has default colour", () =>
                 legacyFruit
                     ? checkLegacyFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour)
                     : checkFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour));
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             DrawableFruit drawableFruit = null;
 
-            AddStep("setup fruit", () =>
+            AddStep("setup hyper-dash fruit", () =>
             {
                 var fruit = new Fruit { HyperDashTarget = new Banana() };
                 fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 }, customCatcherHyperDashColour, false, true, legacyFruit);
             });
 
-            AddAssert("custom colour", () =>
+            AddAssert("hyper-dash fruit use fruit colour from skin", () =>
                 legacyFruit
                     ? checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashFruitColour)
                     : checkFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashFruitColour));
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             DrawableFruit drawableFruit = null;
 
-            AddStep("setup fruit", () =>
+            AddStep("setup hyper-dash fruit", () =>
             {
                 var fruit = new Fruit { HyperDashTarget = new Banana() };
                 fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     }, true, false, false, legacyFruit);
             });
 
-            AddAssert("catcher custom colour", () =>
+            AddAssert("hyper-dash fruit colour falls back to catcher colour from skin", () =>
                 legacyFruit
                     ? checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashColour)
                     : checkFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashColour));

From dd684b68d9cef47cc6e5a61a730343536428dc3b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 3 Apr 2020 19:53:38 +0300
Subject: [PATCH 01920/10326] Make parameters required

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

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 066b399f13..2009099a61 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     : checkFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashColour));
         }
 
-        private Drawable setupSkinHierarchy(Drawable child, bool customCatcherColour = false, bool customAfterColour = false, bool customFruitColour = false, bool legacySkin = true)
+        private Drawable setupSkinHierarchy(Drawable child, bool customCatcherColour, bool customAfterColour, bool customFruitColour, bool legacySkin = true)
         {
             var testSkinProvider = new SkinProvidingContainer(new TestSkin(customCatcherColour, customAfterColour, customFruitColour));
 
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             private readonly bool customAfterColour;
             private readonly bool customFruitColour;
 
-            public TestSkin(bool customCatcherColour = false, bool customAfterColour = false, bool customFruitColour = false)
+            public TestSkin(bool customCatcherColour, bool customAfterColour, bool customFruitColour)
             {
                 this.customCatcherColour = customCatcherColour;
                 this.customAfterColour = customAfterColour;

From d73c791a108fe0bc349535242ecd60250073679c Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 3 Apr 2020 20:56:52 +0300
Subject: [PATCH 01921/10326] Support this typo for old skins

---
 osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs | 4 +++-
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index e7486ef9b0..8a9ce79dd4 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -62,7 +62,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 }
             };
 
-            bool overlayAboveNumber = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value ?? true;
+            bool? numberSetting = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value;
+            bool? numerSetting = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumer)?.Value;
+            bool overlayAboveNumber = numberSetting ?? numerSetting ?? true;
 
             if (!overlayAboveNumber)
                 ChangeInternalChildDepth(hitCircleText, -float.MaxValue);
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index c6920bd03e..154160fdb5 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -12,6 +12,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         AllowSliderBallTint,
         CursorExpand,
         CursorRotate,
-        HitCircleOverlayAboveNumber
+        HitCircleOverlayAboveNumber,
+        HitCircleOverlayAboveNumer // Some old skins will have this typo
     }
 }

From 493b6540116687b1d031963d30a30c5b7b90f06a Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 3 Apr 2020 11:30:02 -0700
Subject: [PATCH 01922/10326] Remove horizontal margin from mod display

Can skew center alignment on fill flow containers.

Fixes affected areas. Vector2(5, 0) is similar to MarginPadding { Left = 10 }.
---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs           | 2 +-
 osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs              | 2 +-
 osu.Game/Screens/Play/HUD/ModDisplay.cs                         | 1 -
 osu.Game/Screens/Play/HUDOverlay.cs                             | 2 +-
 osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs | 1 +
 osu.Game/Screens/Select/FooterButtonMods.cs                     | 1 -
 6 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 03a19b6690..2294cd6966 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     AutoSizeAxes = Axes.Both,
-                    Position = new Vector2(0, 25),
+                    Position = new Vector2(-5, 25),
                     Current = { BindTarget = modSelect.SelectedMods }
                 }
             };
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index 6cd1aa912f..ed3f9af8e2 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -161,7 +161,7 @@ namespace osu.Game.Screens.Multi
                                 {
                                     AutoSizeAxes = Axes.Both,
                                     Direction = FillDirection.Horizontal,
-                                    Spacing = new Vector2(10, 0),
+                                    Spacing = new Vector2(15, 0),
                                     Children = new Drawable[]
                                     {
                                         authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 336b03544f..cd15886c0b 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -56,7 +56,6 @@ namespace osu.Game.Screens.Play.HUD
                     Origin = Anchor.TopCentre,
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
-                    Margin = new MarginPadding { Left = 10, Right = 10 },
                 },
                 unrankedText = new OsuSpriteText
                 {
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index a5f8051557..e06f6d19c2 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -285,7 +285,7 @@ namespace osu.Game.Screens.Play
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
             AutoSizeAxes = Axes.Both,
-            Margin = new MarginPadding { Top = 20, Right = 10 },
+            Margin = new MarginPadding { Top = 20, Right = 20 },
         };
 
         protected virtual HitErrorDisplay CreateHitErrorDisplayOverlay() => new HitErrorDisplay(scoreProcessor, drawableRuleset?.FirstAvailableHitWindows);
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index df7eed9a02..8ef0920d19 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -124,6 +124,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 AutoSizeAxes = Axes.Both,
+                                Spacing = new Vector2(5, 0),
                                 Children = new Drawable[]
                                 {
                                     new StarRatingDisplay(beatmap)
diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index 2411cf26f9..b18301c082 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -92,7 +92,6 @@ namespace osu.Game.Screens.Select
             public FooterModDisplay()
             {
                 ExpansionMode = ExpansionMode.AlwaysContracted;
-                IconsContainer.Margin = new MarginPadding();
             }
         }
     }

From 88cc552534043ec8c715a45635fe7bf581a9ba11 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 3 Apr 2020 11:30:22 -0700
Subject: [PATCH 01923/10326] Fix results star rating display not being
 centered when no mods are present

Needed or the spacing will apply to the fill flow container, causing alignment issues.
---
 .../Expanded/ExpandedPanelMiddleContent.cs    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 8ef0920d19..b058cc142b 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -30,6 +30,9 @@ namespace osu.Game.Screens.Ranking.Expanded
         private readonly ScoreInfo score;
 
         private readonly List<StatisticDisplay> statisticDisplays = new List<StatisticDisplay>();
+
+        private FillFlowContainer starAndModDisplay;
+
         private RollingCounter<long> scoreCounter;
 
         /// <summary>
@@ -119,7 +122,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 Alpha = 0,
                                 AlwaysPresent = true
                             },
-                            new FillFlowContainer
+                            starAndModDisplay = new FillFlowContainer
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
@@ -132,15 +135,6 @@ namespace osu.Game.Screens.Ranking.Expanded
                                         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
@@ -215,6 +209,19 @@ namespace osu.Game.Screens.Ranking.Expanded
                     }
                 }
             };
+
+            if (score.Mods.Any())
+            {
+                starAndModDisplay.Add(new ModDisplay
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    DisplayUnrankedText = false,
+                    ExpansionMode = ExpansionMode.AlwaysExpanded,
+                    Scale = new Vector2(0.5f),
+                    Current = { Value = score.Mods }
+                });
+            }
         }
 
         protected override void LoadComplete()

From 8cdae790c3b0fc90996ae473ffe998206f9af51a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 3 Apr 2020 17:32:37 +0200
Subject: [PATCH 01924/10326] Load user rulesets from the game data directory

---
 osu.Game/OsuGameBase.cs           |  2 +-
 osu.Game/Rulesets/RulesetStore.cs | 40 +++++++++++++++++++++++++++----
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 5487bd9320..609b6ce98e 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -168,7 +168,7 @@ namespace osu.Game
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
-            dependencies.Cache(RulesetStore = new RulesetStore(contextFactory));
+            dependencies.Cache(RulesetStore = new RulesetStore(contextFactory, Storage));
             dependencies.Cache(FileStore = new FileStore(contextFactory, Storage));
 
             // ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup()
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index a389d4ff75..c3c7b653da 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using osu.Framework.Logging;
+using osu.Framework.Platform;
 using osu.Game.Database;
 
 namespace osu.Game.Rulesets
@@ -17,16 +18,20 @@ namespace osu.Game.Rulesets
 
         private readonly Dictionary<Assembly, Type> loadedAssemblies = new Dictionary<Assembly, Type>();
 
-        public RulesetStore(IDatabaseContextFactory factory)
+        private readonly Storage rulesetStorage;
+
+        public RulesetStore(IDatabaseContextFactory factory, Storage storage = null)
             : base(factory)
         {
+            rulesetStorage = storage?.GetStorageForDirectory("rulesets");
+            AppDomain.CurrentDomain.AssemblyResolve += resolveRulesetDependencyAssembly;
+
             // On android in release configuration assemblies are loaded from the apk directly into memory.
             // We cannot read assemblies from cwd, so should check loaded assemblies instead.
             loadFromAppDomain();
             loadFromDisk();
+            loadUserRulesets();
             addMissingRulesets();
-
-            AppDomain.CurrentDomain.AssemblyResolve += resolveRulesetAssembly;
         }
 
         /// <summary>
@@ -48,7 +53,17 @@ namespace osu.Game.Rulesets
         /// </summary>
         public IEnumerable<RulesetInfo> AvailableRulesets { get; private set; }
 
-        private Assembly resolveRulesetAssembly(object sender, ResolveEventArgs args) => loadedAssemblies.Keys.FirstOrDefault(a => a.FullName == args.Name);
+        private Assembly resolveRulesetDependencyAssembly(object sender, ResolveEventArgs args)
+        {
+            var asm = new AssemblyName(args.Name);
+
+            // this assumes the only explicit dependency of the ruleset is the game core assembly.
+            // the ruleset dependency on the game core assembly requires manual resolving, transient dependencies should be resolved automatically
+            if (asm.Name.Equals(typeof(OsuGame).Assembly.GetName().Name, StringComparison.Ordinal))
+                return Assembly.GetExecutingAssembly();
+
+            return null;
+        }
 
         private void addMissingRulesets()
         {
@@ -120,6 +135,21 @@ namespace osu.Game.Rulesets
             }
         }
 
+        private void loadUserRulesets()
+        {
+            try
+            {
+                var rulesets = rulesetStorage?.GetFiles(".", $"{ruleset_library_prefix}.*.dll");
+
+                foreach (var ruleset in rulesets.Where(f => !f.Contains("Tests")))
+                    loadRulesetFromFile(rulesetStorage?.GetFullPath(ruleset));
+            }
+            catch (Exception e)
+            {
+                Logger.Error(e, "Couldn't load user rulesets");
+            }
+        }
+
         private void loadFromDisk()
         {
             try
@@ -175,7 +205,7 @@ namespace osu.Game.Rulesets
 
         protected virtual void Dispose(bool disposing)
         {
-            AppDomain.CurrentDomain.AssemblyResolve -= resolveRulesetAssembly;
+            AppDomain.CurrentDomain.AssemblyResolve -= resolveRulesetDependencyAssembly;
         }
     }
 }

From e1a67bdb96d7af8fe76fd7f483061d74deba1652 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 4 Apr 2020 11:13:25 +0300
Subject: [PATCH 01925/10326] Move implementation to transformer

---
 osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs    | 4 +---
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 8a9ce79dd4..e7486ef9b0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -62,9 +62,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 }
             };
 
-            bool? numberSetting = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value;
-            bool? numerSetting = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumer)?.Value;
-            bool overlayAboveNumber = numberSetting ?? numerSetting ?? true;
+            bool overlayAboveNumber = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value ?? true;
 
             if (!overlayAboveNumber)
                 ChangeInternalChildDepth(hitCircleText, -float.MaxValue);
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 0d67846b8e..d4bc651414 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -132,6 +132,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
                                 return SkinUtils.As<TValue>(new BindableFloat(LEGACY_CIRCLE_RADIUS));
 
                             break;
+
+                        case OsuSkinConfiguration.HitCircleOverlayAboveNumber:
+                            // Quote from https://osu.ppy.sh/help/wiki/Skinning/skin.ini#%5Bgeneral%5D
+                            // Old command: HitCircleOverlayAboveNumer (with typo) still works for legacy support
+                            var rv = source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber);
+                            return rv ?? source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
                     }
 
                     break;

From 6700ef910f3a7d218a0e1b91f1692e4089d518ac Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 4 Apr 2020 11:35:15 +0300
Subject: [PATCH 01926/10326] use startAtCurrentTime

---
 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 9bfde4fdcb..476e53bdaa 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Skinning
     public static class LegacySkinExtensions
     {
         public static Drawable GetAnimation(this ISkin source, string componentName, bool animatable, bool looping, bool applyConfigFrameRate = false, string animationSeparator = "-",
-                                            bool startAtCurrentTime = false, double? frameLength = null)
+                                            bool startAtCurrentTime = true, double? frameLength = null)
         {
             Texture texture;
 

From c3f0ef1bd4a13888c51e48ff4f409e7c05aafbe0 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 4 Apr 2020 15:10:54 +0300
Subject: [PATCH 01927/10326] Major DRYing of code

---
 .../TestSceneSliderSnaking.cs                 | 201 +++++-------------
 1 file changed, 56 insertions(+), 145 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index a53e06dc0f..04f00122dc 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.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 System.Linq;
+using Humanizer;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -38,6 +40,9 @@ namespace osu.Game.Rulesets.Osu.Tests
         private readonly Bindable<bool> snakingIn = new Bindable<bool>();
         private readonly Bindable<bool> snakingOut = new Bindable<bool>();
 
+        private const double duration_of_span = 3605;
+        private const double fade_in_modifier = -1200;
+
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
         {
             var working = new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
@@ -55,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private DrawableSlider slider;
         private DrawableSliderRepeat repeat;
-        private Vector2 vector;
+        private Vector2 savedVector;
 
         [SetUpSteps]
         public override void SetUpSteps() { }
@@ -67,25 +72,18 @@ namespace osu.Game.Rulesets.Osu.Tests
             base.SetUpSteps();
             AddUntilStep("wait for track to start running", () => track.IsRunning);
 
-            AddStep("retrieve 1st slider", () => slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.First());
-            testLinear(true);
-            testLinear(false);
-            AddStep("retrieve 2nd slider", () => slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.Skip(1).First());
-            testRepeating(true);
-            testRepeating(false);
-            AddStep("retrieve 3rd slider", () => slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.Skip(2).First());
-            testDoubleRepeating(true);
-            testDoubleRepeating(false);
+            for (int i = 0; i < 3; i++)
+            {
+                testSlider(i, true);
+                testSlider(i, false);
+            }
         }
 
         [TestCase(true)]
         [TestCase(false)]
         public void TestArrowStays(bool isHit)
         {
-            var isSame = isHit ? "is same" : "decreased";
-            var enable = isHit ? "enable" : "disable";
-
-            AddStep($"{enable} autoplay", () => autoplay = isHit);
+            AddStep($"{(isHit ? "enable" : "disable")} autoplay", () => autoplay = isHit);
             setSnaking(true);
             base.SetUpSteps();
 
@@ -95,154 +93,67 @@ namespace osu.Game.Rulesets.Osu.Tests
                 var drawable = Player.DrawableRuleset.Playfield.AllHitObjects.Skip(1).First();
                 repeat = drawable.ChildrenOfType<Container<DrawableSliderRepeat>>().First().Children.First();
             });
-            AddStep("Save repeat vector", () => vector = repeat.Position);
+            AddStep("Save repeat vector", () => savedVector = repeat.Position);
             addSeekStep(13700);
-            AddAssert($"Repeat vector {isSame}", () => isHit ? Precision.AlmostEquals(vector.X, repeat.X, 1) && Precision.AlmostEquals(vector.Y, repeat.Y, 1) : repeat.X < vector.X && repeat.Y < vector.Y);
+            // Precision.AlmostEquals is used because repeat might have a chance to update its position depending on where in the frame its hit
+            AddAssert($"Repeat vector {(isHit ? "is same" : "decreased")}", () => isHit ? Precision.AlmostEquals(savedVector.X, repeat.X, 1) && Precision.AlmostEquals(savedVector.Y, repeat.Y, 1) : repeat.X < savedVector.X && repeat.Y < savedVector.Y);
         }
 
-        private void testLinear(bool snaking)
+        private void testSlider(int index, bool snaking)
         {
-            var increased = snaking ? "increased" : "is same";
-
+            double startTime = index * 10000 + 3000;
+            int repeats = index;
+            AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
+            {
+                slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.Skip(index).First();
+            });
             setSnaking(snaking);
-            addSeekStep(1800);
-            AddStep("Save end vector", () =>
+            testSnakingIn(startTime + fade_in_modifier, snaking);
+            for (int i = 0; i < repeats + 1; i++)
             {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                vector = body.CurrentCurve.Last();
-            });
-            addSeekStep(1900);
-            AddAssert($"End vector {increased}", () =>
+                testSnakingOut(startTime + 100 + duration_of_span * i, snaking && i == repeats, i%2 == 1);
+            }
+        }
+
+        private void testSnakingIn(double startTime, bool isSnakingExpected)
+        {
+            addSeekStep(startTime);
+            AddStep("Save end vector", () => savedVector = getCurrentSliderVector(true));
+            addSeekStep(startTime + 100);
+            AddAssert($"End vector increased", () =>
             {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                var last = body.CurrentCurve.Last();
-                return snaking ? last.X > vector.X && last.Y > vector.Y : last == vector;
-            });
-            addSeekStep(3100);
-            AddStep("Save start vector", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                vector = body.CurrentCurve.First();
-            });
-            addSeekStep(3200);
-            AddAssert($"Start vector {increased}", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                var first = body.CurrentCurve.First();
-                return snaking ? first.X > vector.X && first.Y > vector.Y : first == vector;
+                var currentVector = getCurrentSliderVector(true);
+                return isSnakingExpected ? currentVector.X > savedVector.X && currentVector.Y > savedVector.Y : currentVector == savedVector;
             });
         }
 
-        private void testRepeating(bool snaking)
+        private void testSnakingOut(double startTime, bool isSnakingExpected, bool testSliderEnd)
         {
-            var increased = snaking ? "increased" : "is same";
-            var decreased = snaking ? "decreased" : "is same";
-
-            setSnaking(snaking);
-            addSeekStep(8800);
-            AddStep("Save end vector", () =>
+            addSeekStep(startTime);
+            AddStep($"Save {(testSliderEnd ? "end" : "start")} vector", () => savedVector = getCurrentSliderVector(testSliderEnd));
+            addSeekStep(startTime + 100);
+            AddAssert($"{(testSliderEnd ? "End" : "Start")} vector {(isSnakingExpected ? (testSliderEnd ? "decreased" : "increased") : "is same")}", () =>
             {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                vector = body.CurrentCurve.Last();
-            });
-            addSeekStep(8900);
-            AddAssert($"End vector {increased}", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                var last = body.CurrentCurve.Last();
-                return snaking ? last.X > vector.X && last.Y > vector.Y : last == vector;
-            });
-            addSeekStep(10100);
-            AddStep("Save start vector", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                vector = body.CurrentCurve.First();
-            });
-            addSeekStep(10200);
-            AddAssert("Start vector is same", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                var first = body.CurrentCurve.First();
-                return first == vector;
-            });
-            addSeekStep(13700);
-            AddStep("Save end vector", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                vector = body.CurrentCurve.Last();
-            });
-            addSeekStep(13800);
-            AddAssert($"End vector {decreased}", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                var last = body.CurrentCurve.Last();
-                return snaking ? last.X < vector.X && last.Y < vector.Y : last == vector;
+                var currentVector = getCurrentSliderVector(testSliderEnd);
+                bool check(Vector2 a, Vector2 b)
+                {
+                    if (testSliderEnd)
+                        return a.X < b.X && a.Y < b.Y;
+                    return a.X > b.X && a.Y > b.Y;
+                }
+                return isSnakingExpected ? check(currentVector, savedVector) : currentVector == savedVector;
             });
         }
 
-        private void testDoubleRepeating(bool snaking)
+        private Vector2 getCurrentSliderVector(bool getEndOne)
         {
-            var increased = snaking ? "increased" : "is same";
-
-            setSnaking(snaking);
-            addSeekStep(18800);
-            AddStep("Save end vector", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                vector = body.CurrentCurve.Last();
-            });
-            addSeekStep(18900);
-            AddAssert($"End vector {increased}", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                var last = body.CurrentCurve.Last();
-                return snaking ? last.X > vector.X && last.Y > vector.Y : last == vector;
-            });
-            addSeekStep(20100);
-            AddStep("Save start vector", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                vector = body.CurrentCurve.First();
-            });
-            addSeekStep(20200);
-            AddAssert("Start vector is same", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                var first = body.CurrentCurve.First();
-                return first == vector;
-            });
-            addSeekStep(23700);
-            AddStep("Save end vector", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                vector = body.CurrentCurve.Last();
-            });
-            addSeekStep(23800);
-            AddAssert("End vector is same", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                var last = body.CurrentCurve.Last();
-                return last == vector;
-            });
-            addSeekStep(27300);
-            AddStep("Save start vector", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                vector = body.CurrentCurve.First();
-            });
-            addSeekStep(27400);
-            AddAssert($"Start vector {increased}", () =>
-            {
-                var body = (PlaySliderBody)slider.Body.Drawable;
-                var first = body.CurrentCurve.First();
-                return snaking ? first.X > vector.X && first.Y > vector.Y : first == vector;
-            });
+            var body = (PlaySliderBody)slider.Body.Drawable;
+            return getEndOne ? body.CurrentCurve.Last() : body.CurrentCurve.First();
         }
 
         private void setSnaking(bool value)
         {
-            var text = value ? "Enable" : "Disable";
-            AddStep($"{text} snaking", () =>
+            AddStep($"{(value ? "Enable" : "Disable")} snaking", () =>
             {
                 snakingIn.Value = value;
                 snakingOut.Value = value;
@@ -272,7 +183,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 },
                 new Slider
                 {
-                    StartTime = 10000,
+                    StartTime = 13000,
                     Position = new Vector2(100, 100),
                     Path = new SliderPath(PathType.PerfectCurve, new[]
                     {
@@ -284,7 +195,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 new Slider
                 {
-                    StartTime = 20000,
+                    StartTime = 23000,
                     Position = new Vector2(100, 100),
                     Path = new SliderPath(PathType.PerfectCurve, new[]
                     {
@@ -296,7 +207,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 new HitCircle
                 {
-                    StartTime = 99999,
+                    StartTime = 199999,
                 }
             }
         };

From a8a52e506dfd9aaba5b19f9c9294718ff12ee39e Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 4 Apr 2020 15:35:35 +0300
Subject: [PATCH 01928/10326] Review and style changes

---
 .../TestSceneSliderSnaking.cs                 | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 04f00122dc..99b2f7d46e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.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.Linq;
 using Humanizer;
@@ -37,8 +36,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         protected override bool Autoplay => autoplay;
         private bool autoplay;
 
-        private readonly Bindable<bool> snakingIn = new Bindable<bool>();
-        private readonly Bindable<bool> snakingOut = new Bindable<bool>();
+        private readonly BindableBool snakingIn = new BindableBool();
+        private readonly BindableBool snakingOut = new BindableBool();
 
         private const double duration_of_span = 3605;
         private const double fade_in_modifier = -1200;
@@ -95,8 +94,15 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
             AddStep("Save repeat vector", () => savedVector = repeat.Position);
             addSeekStep(13700);
-            // Precision.AlmostEquals is used because repeat might have a chance to update its position depending on where in the frame its hit
-            AddAssert($"Repeat vector {(isHit ? "is same" : "decreased")}", () => isHit ? Precision.AlmostEquals(savedVector.X, repeat.X, 1) && Precision.AlmostEquals(savedVector.Y, repeat.Y, 1) : repeat.X < savedVector.X && repeat.Y < savedVector.Y);
+
+            AddAssert($"Repeat vector {(isHit ? "is same" : "decreased")}", () =>
+            {
+                if (isHit)
+                    // Precision.AlmostEquals is used because repeat might have a chance to update its position depending on where in the frame its hit
+                    return Precision.AlmostEquals(savedVector, repeat.Position, 1);
+
+                return repeat.X < savedVector.X && repeat.Y < savedVector.Y;
+            });
         }
 
         private void testSlider(int index, bool snaking)
@@ -109,9 +115,10 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
             setSnaking(snaking);
             testSnakingIn(startTime + fade_in_modifier, snaking);
+
             for (int i = 0; i < repeats + 1; i++)
             {
-                testSnakingOut(startTime + 100 + duration_of_span * i, snaking && i == repeats, i%2 == 1);
+                testSnakingOut(startTime + 100 + duration_of_span * i, snaking && i == repeats, i % 2 == 1);
             }
         }
 
@@ -120,7 +127,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addSeekStep(startTime);
             AddStep("Save end vector", () => savedVector = getCurrentSliderVector(true));
             addSeekStep(startTime + 100);
-            AddAssert($"End vector increased", () =>
+            AddAssert($"End vector {(isSnakingExpected ? "increased" : "is same")}", () =>
             {
                 var currentVector = getCurrentSliderVector(true);
                 return isSnakingExpected ? currentVector.X > savedVector.X && currentVector.Y > savedVector.Y : currentVector == savedVector;
@@ -135,12 +142,15 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert($"{(testSliderEnd ? "End" : "Start")} vector {(isSnakingExpected ? (testSliderEnd ? "decreased" : "increased") : "is same")}", () =>
             {
                 var currentVector = getCurrentSliderVector(testSliderEnd);
+
                 bool check(Vector2 a, Vector2 b)
                 {
                     if (testSliderEnd)
                         return a.X < b.X && a.Y < b.Y;
+
                     return a.X > b.X && a.Y > b.Y;
                 }
+
                 return isSnakingExpected ? check(currentVector, savedVector) : currentVector == savedVector;
             });
         }

From 0ebb5a81f937601a9008a4f9cb94779f6d9b4861 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 4 Apr 2020 15:59:39 +0300
Subject: [PATCH 01929/10326] Fix oversight in testing

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 99b2f7d46e..51d4d1c008 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -86,14 +86,14 @@ namespace osu.Game.Rulesets.Osu.Tests
             setSnaking(true);
             base.SetUpSteps();
 
-            addSeekStep(13500);
+            addSeekStep(16500);
             AddStep("retrieve 2nd slider repeat", () =>
             {
                 var drawable = Player.DrawableRuleset.Playfield.AllHitObjects.Skip(1).First();
                 repeat = drawable.ChildrenOfType<Container<DrawableSliderRepeat>>().First().Children.First();
             });
             AddStep("Save repeat vector", () => savedVector = repeat.Position);
-            addSeekStep(13700);
+            addSeekStep(16700);
 
             AddAssert($"Repeat vector {(isHit ? "is same" : "decreased")}", () =>
             {

From f3bcb0628c828b12484c4b6f46be8b44c3599ccd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 4 Apr 2020 19:09:52 +0300
Subject: [PATCH 01930/10326] Add helper methods for retrieving other skin
 hyper-dash colours

---
 osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs | 7 +++++++
 osu.Game.Rulesets.Catch/UI/Catcher.cs                   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
index 8fc0831918..48e11121ea 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
@@ -9,6 +9,13 @@ namespace osu.Game.Rulesets.Catch.Skinning
 {
     internal static class CatchSkinExtensions
     {
+        public static IBindable<Color4> GetHyperDashCatcherColour(this ISkin skin)
+            => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash);
+
+        public static IBindable<Color4> GetHyperDashEndGlowColour(this ISkin skin)
+            => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage) ??
+               skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash);
+
         public static IBindable<Color4> GetHyperDashFruitColour(this ISkin skin)
             => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit) ??
                skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash);
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 98cc10aa31..49c9a77277 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -389,9 +389,9 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             base.SkinChanged(skin, allowFallback);
 
-            hyperDashColour = skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ?? DefaultHyperDashColour;
-            hyperDashEndGlowColour = skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage)?.Value ?? hyperDashColour;
             updateCatcherColour();
+            hyperDashColour = skin.GetHyperDashCatcherColour()?.Value ?? DefaultHyperDashColour;
+            hyperDashEndGlowColour = skin.GetHyperDashEndGlowColour()?.Value ?? DefaultHyperDashColour;
         }
 
         protected override void Update()

From 50604dc7b22624632f015fcb55c0cb44bd3f4080 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 4 Apr 2020 19:29:06 +0300
Subject: [PATCH 01931/10326] Update catcher hyper-dashing colours on changing
 hyper-dash state only

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 49c9a77277..0b73c510d9 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -254,7 +254,10 @@ namespace osu.Game.Rulesets.Catch.UI
                 hyperDashDirection = 0;
 
                 if (wasHyperDashing)
+                {
+                    updateCatcherColour(false);
                     Trail &= Dashing;
+                }
             }
             else
             {
@@ -264,6 +267,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 if (!wasHyperDashing)
                 {
+                    updateCatcherColour(true);
                     Trail = true;
 
                     var hyperDashEndGlow = createAdditiveSprite(endGlowSprites);
@@ -273,15 +277,13 @@ namespace osu.Game.Rulesets.Catch.UI
                     hyperDashEndGlow.Expire(true);
                 }
             }
-
-            updateCatcherColour();
         }
 
-        private void updateCatcherColour()
+        private void updateCatcherColour(bool hyperDashing)
         {
             const float hyper_dash_transition_length = 180;
 
-            if (HyperDashing)
+            if (hyperDashing)
             {
                 this.FadeColour(hyperDashColour == DefaultHyperDashColour ? Color4.OrangeRed : hyperDashColour, hyper_dash_transition_length, Easing.OutQuint);
                 this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint);
@@ -389,9 +391,9 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             base.SkinChanged(skin, allowFallback);
 
-            updateCatcherColour();
             hyperDashColour = skin.GetHyperDashCatcherColour()?.Value ?? DefaultHyperDashColour;
             hyperDashEndGlowColour = skin.GetHyperDashEndGlowColour()?.Value ?? DefaultHyperDashColour;
+            updateCatcherColour(HyperDashing);
         }
 
         protected override void Update()

From fbe95a52e3b068d37c49dafa6057a744d0d0df9c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 4 Apr 2020 19:29:41 +0300
Subject: [PATCH 01932/10326] Remove unnecessary restating comment

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 0b73c510d9..1cb6987397 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -294,7 +294,6 @@ namespace osu.Game.Rulesets.Catch.UI
                 this.FadeTo(1f, hyper_dash_transition_length, Easing.OutQuint);
             }
 
-            // update hyper-dash colour of the hyper-dashing catcher sprites containers.
             hyperDashTrails?.FadeColour(hyperDashColour, hyper_dash_transition_length, Easing.OutQuint);
             endGlowSprites?.FadeColour(hyperDashEndGlowColour, hyper_dash_transition_length, Easing.OutQuint);
         }

From 19f39fe6327ffd3b3bdf27cde0da4d5b1a2801a7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 4 Apr 2020 19:33:52 +0300
Subject: [PATCH 01933/10326] Change AdditiveTarget into a set method

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs     | 39 ++++++++++++-----------
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs |  5 ++-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 1cb6987397..0e42c19455 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -42,25 +42,6 @@ namespace osu.Game.Rulesets.Catch.UI
         private Container<CatcherTrailSprite> hyperDashTrails;
         private Container<CatcherTrailSprite> endGlowSprites;
 
-        public Container AdditiveTarget
-        {
-            get => additiveTarget;
-            set
-            {
-                if (additiveTarget == value)
-                    return;
-
-                additiveTarget?.RemoveRange(new[] { dashTrails, hyperDashTrails, endGlowSprites });
-
-                additiveTarget = value;
-                additiveTarget?.AddRange(new[]
-                {
-                    dashTrails ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = Color4.White },
-                    hyperDashTrails ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashColour },
-                    endGlowSprites ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashEndGlowColour },
-                });
-            }
-        }
 
         public CatcherAnimationState CurrentState { get; private set; }
 
@@ -167,6 +148,26 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
+        /// <summary>
+        /// Sets container target to provide catcher additive trails content in.
+        /// </summary>
+        /// <param name="target">The container to add catcher trails in.</param>
+        public void SetAdditiveTarget(Container target)
+        {
+            if (additiveTarget == target)
+                return;
+
+            additiveTarget?.RemoveRange(new[] { dashTrails, hyperDashTrails, endGlowSprites });
+
+            additiveTarget = target;
+            additiveTarget?.AddRange(new[]
+            {
+                dashTrails ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = Color4.White },
+                hyperDashTrails ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashColour },
+                endGlowSprites ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashEndGlowColour },
+            });
+        }
+
         /// <summary>
         /// Add a caught fruit to the catcher's stack.
         /// </summary>
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 37501736ff..641b81599e 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -33,10 +33,9 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             RelativeSizeAxes = Axes.X;
             Height = CATCHER_SIZE;
-            Child = MovableCatcher = new Catcher(difficulty);
 
-            // this property adds containers to 'this' so it must not be set in the object initializer.
-            MovableCatcher.AdditiveTarget = this;
+            Child = MovableCatcher = new Catcher(difficulty);
+            MovableCatcher.SetAdditiveTarget(this);
         }
 
         public static float GetCatcherSize(BeatmapDifficulty difficulty)

From 0e45a4d54e1dd372f120dbfb926234065f4158af Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 4 Apr 2020 20:13:46 +0200
Subject: [PATCH 01934/10326] Add back cached ruleset assembly lookup

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

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index c3c7b653da..7b4c0302aa 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets
             if (asm.Name.Equals(typeof(OsuGame).Assembly.GetName().Name, StringComparison.Ordinal))
                 return Assembly.GetExecutingAssembly();
 
-            return null;
+            return loadedAssemblies.Keys.FirstOrDefault(a => a.FullName == asm.FullName);
         }
 
         private void addMissingRulesets()

From e340d2628b36a9ce935e8d75931f414416d683e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 5 Apr 2020 03:17:11 +0900
Subject: [PATCH 01935/10326] Fix sliderball accent colour not being set
 correctly

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 5c7f4a42b3..9b6f39d91d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -186,7 +186,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)

From 1e8badb14a9ebdb4733af916d847fc10e0505f7c Mon Sep 17 00:00:00 2001
From: Santeri Nogelainen <santeri.nogelainen@gmail.com>
Date: Sat, 4 Apr 2020 22:28:36 +0300
Subject: [PATCH 01936/10326] Move all logic to TopLocalRank and remove
 CarouselBeatmapRank

---
 osu.Game/Online/Leaderboards/TopLocalRank.cs  | 52 +++++++-------
 .../Select/Carousel/CarouselBeatmapRank.cs    | 68 -------------------
 .../Carousel/DrawableCarouselBeatmap.cs       |  6 +-
 3 files changed, 32 insertions(+), 94 deletions(-)
 delete mode 100644 osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs

diff --git a/osu.Game/Online/Leaderboards/TopLocalRank.cs b/osu.Game/Online/Leaderboards/TopLocalRank.cs
index 83d92f8ffa..51c171a176 100644
--- a/osu.Game/Online/Leaderboards/TopLocalRank.cs
+++ b/osu.Game/Online/Leaderboards/TopLocalRank.cs
@@ -1,12 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Rulesets;
@@ -14,43 +11,44 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Online.Leaderboards
 {
-    public class TopLocalRank : Container
+    public class TopLocalRank : UpdateableRank
     {
         private readonly BeatmapInfo beatmap;
-        private readonly UpdateableRank rank;
 
         private ScoreManager scores;
         private IBindable<RulesetInfo> ruleset;
         private IAPIProvider api;
 
-        /// <summary>
-        /// Raised when the top score is loaded
-        /// </summary>
-        public Action<ScoreInfo> ScoreLoaded;
+        protected override double LoadDelay => 250;
 
-        public TopLocalRank(BeatmapInfo beatmap)
+        public TopLocalRank(BeatmapInfo beatmap) : base(null)
         {
             this.beatmap = beatmap;
-
-            RelativeSizeAxes = Axes.Both;
-
-            InternalChild = rank = new UpdateableRank(null)
-            {
-                RelativeSizeAxes = Axes.Both
-            };
         }
 
         [BackgroundDependencyLoader]
         private void load(ScoreManager scores, IBindable<RulesetInfo> ruleset, IAPIProvider api)
         {
+            scores.ItemAdded += scoreChanged;
+            scores.ItemRemoved += scoreChanged;
+            ruleset.ValueChanged += _ => fetchAndLoadTopScore();
+
+            this.ruleset = ruleset.GetBoundCopy();
             this.scores = scores;
-            this.ruleset = ruleset;
             this.api = api;
 
-            FetchAndLoadTopScore();
+            fetchAndLoadTopScore();
         }
 
-        public void FetchAndLoadTopScore()
+        private void scoreChanged(ScoreInfo score)
+        {
+            if (score.BeatmapInfoID == beatmap.ID)
+            {
+                fetchAndLoadTopScore();
+            }
+        }
+
+        private void fetchAndLoadTopScore()
         {
             var score = fetchTopScore();
 
@@ -59,9 +57,16 @@ namespace osu.Game.Online.Leaderboards
 
         private void loadTopScore(ScoreInfo score)
         {
-            Schedule(() => rank.Rank = score?.Rank);
+            var rank = score?.Rank;
 
-            ScoreLoaded?.Invoke(score);
+            // toggle the display of this drawable
+            // we do not want empty space if there is no rank to be displayed
+            if (rank.HasValue)
+                Show();
+            else
+                Hide();
+
+            Schedule(() => Rank = rank);
         }
 
         private ScoreInfo fetchTopScore()
@@ -69,8 +74,7 @@ namespace osu.Game.Online.Leaderboards
             if (scores == null || beatmap == null || ruleset?.Value == null || api?.LocalUser.Value == null)
                 return null;
 
-            return scores.GetAllUsableScores()
-                         .Where(s => s.UserID == api.LocalUser.Value.Id && s.BeatmapInfoID == beatmap.ID && s.RulesetID == ruleset.Value.ID)
+            return scores.QueryScores(s => s.UserID == api.LocalUser.Value.Id && s.BeatmapInfoID == beatmap.ID && s.RulesetID == ruleset.Value.ID && !s.DeletePending)
                          .OrderByDescending(s => s.TotalScore)
                          .FirstOrDefault();
         }
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs
deleted file mode 100644
index fbd4292138..0000000000
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
-using osu.Game.Online.Leaderboards;
-using osu.Game.Rulesets;
-using osu.Game.Scoring;
-
-namespace osu.Game.Screens.Select.Carousel
-{
-    public class CarouselBeatmapRank : Container
-    {
-        private const int rank_size = 20;
-        private readonly BeatmapInfo beatmap;
-
-        private TopLocalRank rank;
-
-        public CarouselBeatmapRank(BeatmapInfo beatmap)
-        {
-            this.beatmap = beatmap;
-
-            Height = rank_size;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(ScoreManager scores, IBindable<RulesetInfo> ruleset)
-        {
-            scores.ItemAdded += scoreChanged;
-            scores.ItemRemoved += scoreChanged;
-            ruleset.ValueChanged += _ => rulesetChanged();
-
-            rank = new TopLocalRank(beatmap)
-            {
-                ScoreLoaded = scaleDisplay
-            };
-
-            InternalChild = new DelayedLoadWrapper(rank)
-            {
-                RelativeSizeAxes = Axes.Both
-            };
-        }
-
-        private void rulesetChanged()
-        {
-            rank.FetchAndLoadTopScore();
-        }
-
-        private void scoreChanged(ScoreInfo score)
-        {
-            if (score.BeatmapInfoID == beatmap.ID)
-            {
-                rank.FetchAndLoadTopScore();
-            }
-        }
-
-        private void scaleDisplay(ScoreInfo score)
-        {
-            if (score != null)
-                Width = rank_size * 2;
-            else
-                Width = 0;
-        }
-    }
-}
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 4b42d818f5..5357f9a652 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
@@ -129,9 +130,10 @@ namespace osu.Game.Screens.Select.Carousel
                                     AutoSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        new CarouselBeatmapRank(beatmap)
+                                        new TopLocalRank(beatmap)
                                         {
-                                            Scale = new Vector2(0.8f)
+                                            Scale = new Vector2(0.8f),
+                                            Size = new Vector2(40, 20)
                                         },
                                         starCounter = new StarCounter
                                         {

From da59baa7798fc9f9851e0bd716a97ae1179a812e Mon Sep 17 00:00:00 2001
From: Santeri Nogelainen <santeri.nogelainen@gmail.com>
Date: Sat, 4 Apr 2020 22:42:13 +0300
Subject: [PATCH 01937/10326] Add line break

---
 osu.Game/Online/Leaderboards/TopLocalRank.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Leaderboards/TopLocalRank.cs b/osu.Game/Online/Leaderboards/TopLocalRank.cs
index 51c171a176..be014dafc3 100644
--- a/osu.Game/Online/Leaderboards/TopLocalRank.cs
+++ b/osu.Game/Online/Leaderboards/TopLocalRank.cs
@@ -21,7 +21,8 @@ namespace osu.Game.Online.Leaderboards
 
         protected override double LoadDelay => 250;
 
-        public TopLocalRank(BeatmapInfo beatmap) : base(null)
+        public TopLocalRank(BeatmapInfo beatmap)
+            : base(null)
         {
             this.beatmap = beatmap;
         }

From 634a8f9ff49bbf0bf85e4834df444e70463cec76 Mon Sep 17 00:00:00 2001
From: Endrik <enduslittlecomputer@gmail.com>
Date: Sat, 4 Apr 2020 23:05:10 +0300
Subject: [PATCH 01938/10326] Return inline

---
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index d4bc651414..30ed37a966 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -136,8 +136,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         case OsuSkinConfiguration.HitCircleOverlayAboveNumber:
                             // Quote from https://osu.ppy.sh/help/wiki/Skinning/skin.ini#%5Bgeneral%5D
                             // Old command: HitCircleOverlayAboveNumer (with typo) still works for legacy support
-                            var rv = source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber);
-                            return rv ?? source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
+                            return source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber) ?? source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);                       
                     }
 
                     break;

From 0014a8404e17d196d3aebf386346efd20790d023 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 4 Apr 2020 23:12:42 +0300
Subject: [PATCH 01939/10326] GetHyperDashEndGlowColour() ->
 GetHyperDashCatcherAfterImageColour()

---
 osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs | 2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
index 48e11121ea..06d21f8c5e 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
         public static IBindable<Color4> GetHyperDashCatcherColour(this ISkin skin)
             => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash);
 
-        public static IBindable<Color4> GetHyperDashEndGlowColour(this ISkin skin)
+        public static IBindable<Color4> GetHyperDashCatcherAfterImageColour(this ISkin skin)
             => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage) ??
                skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash);
 
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 0e42c19455..0d5b454a9d 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -392,7 +392,7 @@ namespace osu.Game.Rulesets.Catch.UI
             base.SkinChanged(skin, allowFallback);
 
             hyperDashColour = skin.GetHyperDashCatcherColour()?.Value ?? DefaultHyperDashColour;
-            hyperDashEndGlowColour = skin.GetHyperDashEndGlowColour()?.Value ?? DefaultHyperDashColour;
+            hyperDashEndGlowColour = skin.GetHyperDashCatcherAfterImageColour()?.Value ?? DefaultHyperDashColour;
             updateCatcherColour(HyperDashing);
         }
 

From 36ad1cbd79854ffc4b8193e776ae8b6f253e9f39 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 4 Apr 2020 23:17:55 +0300
Subject: [PATCH 01940/10326] Format the code

---
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 30ed37a966..0a697d1fde 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         case OsuSkinConfiguration.HitCircleOverlayAboveNumber:
                             // Quote from https://osu.ppy.sh/help/wiki/Skinning/skin.ini#%5Bgeneral%5D
                             // Old command: HitCircleOverlayAboveNumer (with typo) still works for legacy support
-                            return source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber) ?? source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);                       
+                            return source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber) ?? source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
                     }
 
                     break;

From c4f7b4576848da614959c8a427f7886e7a2f66f3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 00:02:33 +0300
Subject: [PATCH 01941/10326] Revert "Add support for custom hyper-dash fruit
 colouring"

This reverts commit 6f2cc5471adabc4392fcf1f63a5de32266016c10 and also its testing cases.

This became dead code after actual correct osu!catch skin colouring, we don't support modern skinning (non-legacy skinning) at the moment, so for what it's worth this can be reverted to default red-coloured
---
 .../TestSceneHyperDashColouring.cs            | 67 ++++++-------------
 .../Objects/Drawables/FruitPiece.cs           | 12 +---
 2 files changed, 23 insertions(+), 56 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 2009099a61..10739a3131 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -4,15 +4,10 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Sample;
-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.Testing;
-using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.Objects;
@@ -31,9 +26,8 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Resolved]
         private SkinManager skins { get; set; }
 
-        [TestCase(false)]
-        [TestCase(true)]
-        public void TestHyperDashFruitColour(bool legacyFruit)
+        [Test]
+        public void TestHyperDashFruitColour()
         {
             DrawableFruit drawableFruit = null;
 
@@ -47,20 +41,15 @@ namespace osu.Game.Rulesets.Catch.Tests
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Scale = new Vector2(4f),
-                }, false, false, false, legacyFruit);
+                }, false, false, false);
             });
 
-            AddAssert("hyper-dash fruit has default colour", () =>
-                legacyFruit
-                    ? checkLegacyFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour)
-                    : checkFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour));
+            AddAssert("hyper-dash fruit has default colour", () => checkLegacyFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour));
         }
 
-        [TestCase(false, true)]
-        [TestCase(false, false)]
-        [TestCase(true, true)]
-        [TestCase(true, false)]
-        public void TestCustomHyperDashFruitColour(bool legacyFruit, bool customCatcherHyperDashColour)
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestCustomHyperDashFruitColour(bool customCatcherHyperDashColour)
         {
             DrawableFruit drawableFruit = null;
 
@@ -74,18 +63,14 @@ namespace osu.Game.Rulesets.Catch.Tests
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Scale = new Vector2(4f),
-                }, customCatcherHyperDashColour, false, true, legacyFruit);
+                }, customCatcherHyperDashColour, false, true);
             });
 
-            AddAssert("hyper-dash fruit use fruit colour from skin", () =>
-                legacyFruit
-                    ? checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashFruitColour)
-                    : checkFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashFruitColour));
+            AddAssert("hyper-dash fruit use fruit colour from skin", () => checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashFruitColour));
         }
 
-        [TestCase(false)]
-        [TestCase(true)]
-        public void TestCustomHyperDashFruitColourFallback(bool legacyFruit)
+        [Test]
+        public void TestCustomHyperDashFruitColourFallback()
         {
             DrawableFruit drawableFruit = null;
 
@@ -100,36 +85,24 @@ namespace osu.Game.Rulesets.Catch.Tests
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Scale = new Vector2(4f),
-                    }, true, false, false, legacyFruit);
+                    }, true, false, false);
             });
 
-            AddAssert("hyper-dash fruit colour falls back to catcher colour from skin", () =>
-                legacyFruit
-                    ? checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashColour)
-                    : checkFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashColour));
+            AddAssert("hyper-dash fruit colour falls back to catcher colour from skin", () => checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashColour));
         }
 
-        private Drawable setupSkinHierarchy(Drawable child, bool customCatcherColour, bool customAfterColour, bool customFruitColour, bool legacySkin = true)
+        private Drawable setupSkinHierarchy(Drawable child, bool customCatcherColour, bool customAfterColour, bool customFruitColour)
         {
+            var legacySkinProvider = new SkinProvidingContainer(skins.GetSkin(DefaultLegacySkin.Info));
             var testSkinProvider = new SkinProvidingContainer(new TestSkin(customCatcherColour, customAfterColour, customFruitColour));
+            var legacySkinTransformer = new SkinProvidingContainer(new CatchLegacySkinTransformer(testSkinProvider));
 
-            if (legacySkin)
-            {
-                var legacySkinProvider = new SkinProvidingContainer(skins.GetSkin(DefaultLegacySkin.Info));
-                var legacySkinTransformer = new SkinProvidingContainer(new CatchLegacySkinTransformer(testSkinProvider));
-
-                return legacySkinProvider
-                    .WithChild(testSkinProvider
-                        .WithChild(legacySkinTransformer
-                            .WithChild(child)));
-            }
-
-            return testSkinProvider.WithChild(child);
+            return legacySkinProvider
+                .WithChild(testSkinProvider
+                    .WithChild(legacySkinTransformer
+                        .WithChild(child)));
         }
 
-        private bool checkFruitHyperDashColour(DrawableFruit fruit, Color4 expectedColour) =>
-            fruit.ChildrenOfType<SkinnableDrawable>().First().Drawable.ChildrenOfType<Circle>().Single(c => c.BorderColour == expectedColour).Any(d => d.Colour == expectedColour);
-
         private bool checkLegacyFruitHyperDashColour(DrawableFruit fruit, Color4 expectedColour) =>
             fruit.ChildrenOfType<SkinnableDrawable>().First().Drawable.ChildrenOfType<Sprite>().Any(c => c.Colour == expectedColour);
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
index 2437958916..359329885c 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
@@ -7,10 +7,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Catch.Skinning;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
@@ -34,7 +32,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableObject, ISkinSource skin)
+        private void load(DrawableHitObject drawableObject)
         {
             DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
             hitObject = drawableCatchObject.HitObject;
@@ -63,10 +61,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 },
             });
 
-            var hyperDashColour =
-                skin.GetHyperDashFruitColour()?.Value ??
-                Catcher.DefaultHyperDashColour;
-
             if (hitObject.HyperDash)
             {
                 AddInternal(new Circle
@@ -74,7 +68,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    BorderColour = hyperDashColour,
+                    BorderColour = Catcher.DefaultHyperDashColour,
                     BorderThickness = 12f * RADIUS_ADJUST,
                     Children = new Drawable[]
                     {
@@ -84,7 +78,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                             Alpha = 0.3f,
                             Blending = BlendingParameters.Additive,
                             RelativeSizeAxes = Axes.Both,
-                            Colour = hyperDashColour,
+                            Colour = Catcher.DefaultHyperDashColour,
                         }
                     }
                 });

From 10e65c4f53929cf477042c58aa302fd0f6e3b076 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 00:10:12 +0300
Subject: [PATCH 01942/10326] Add handling for legacy CatchTheBeat section in
 LegacyDecoder

---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 561707f9ef..743a470e6e 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -73,6 +73,9 @@ namespace osu.Game.Beatmaps.Formats
             switch (section)
             {
                 case Section.Colours:
+                // osu!catch section only has colour settings
+                // so no harm in handling the entire section
+                case Section.CatchTheBeat:
                     HandleColours(output, line);
                     return;
             }
@@ -149,7 +152,8 @@ namespace osu.Game.Beatmaps.Formats
             HitObjects,
             Variables,
             Fonts,
-            Mania
+            CatchTheBeat,
+            Mania,
         }
 
         internal class LegacyDifficultyControlPoint : DifficultyControlPoint

From 55d076d6f359ed50edd3cf371195b656effd9929 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 00:10:25 +0300
Subject: [PATCH 01943/10326] Transform CatchSkinColour lookup to skin
 configuration custom colours lookup

---
 .../Skinning/CatchLegacySkinTransformer.cs            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 65e6e6f209..4a87eb95e7 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -65,6 +65,15 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
         public SampleChannel GetSample(ISampleInfo sample) => source.GetSample(sample);
 
-        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => source.GetConfig<TLookup, TValue>(lookup);
+        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
+        {
+            switch (lookup)
+            {
+                case CatchSkinColour colour:
+                    return source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+            }
+
+            return source.GetConfig<TLookup, TValue>(lookup);
+        }
     }
 }

From b100230538707ffcbed2a70fc17b0981b618b3eb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 00:13:23 +0300
Subject: [PATCH 01944/10326] Test CatchSkinColour transformation on colour
 retrieval implicitly

---
 .../TestSceneHyperDashColouring.cs            | 37 ++++---------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 10739a3131..c8d28dbaeb 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -106,44 +106,23 @@ namespace osu.Game.Rulesets.Catch.Tests
         private bool checkLegacyFruitHyperDashColour(DrawableFruit fruit, Color4 expectedColour) =>
             fruit.ChildrenOfType<SkinnableDrawable>().First().Drawable.ChildrenOfType<Sprite>().Any(c => c.Colour == expectedColour);
 
-        private class TestSkin : ISkin
+        private class TestSkin : LegacySkin
         {
             public static Color4 CustomHyperDashColour { get; } = Color4.Goldenrod;
             public static Color4 CustomHyperDashFruitColour { get; } = Color4.Cyan;
             public static Color4 CustomHyperDashAfterColour { get; } = Color4.Lime;
 
-            private readonly bool customCatcherColour;
-            private readonly bool customAfterColour;
-            private readonly bool customFruitColour;
-
             public TestSkin(bool customCatcherColour, bool customAfterColour, bool customFruitColour)
+                : base(new SkinInfo(), null, null, string.Empty)
             {
-                this.customCatcherColour = customCatcherColour;
-                this.customAfterColour = customAfterColour;
-                this.customFruitColour = customFruitColour;
-            }
+                if (customCatcherColour)
+                    Configuration.CustomColours[CatchSkinColour.HyperDash.ToString()] = CustomHyperDashColour;
 
-            public Drawable GetDrawableComponent(ISkinComponent component) => null;
+                if (customAfterColour)
+                    Configuration.CustomColours[CatchSkinColour.HyperDashAfterImage.ToString()] = CustomHyperDashAfterColour;
 
-            public Texture GetTexture(string componentName) => null;
-
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => null;
-
-            public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
-            {
-                if (lookup is CatchSkinColour config)
-                {
-                    if (config == CatchSkinColour.HyperDash && customCatcherColour)
-                        return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashColour));
-
-                    if (config == CatchSkinColour.HyperDashFruit && customFruitColour)
-                        return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashFruitColour));
-
-                    if (config == CatchSkinColour.HyperDashAfterImage && customAfterColour)
-                        return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashAfterColour));
-                }
-
-                return null;
+                if (customFruitColour)
+                    Configuration.CustomColours[CatchSkinColour.HyperDashFruit.ToString()] = CustomHyperDashFruitColour;
             }
         }
     }

From dfd86e643bd415e5653a942e2432d56d224c6a1b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 00:14:07 +0300
Subject: [PATCH 01945/10326] Add custom-coloured osu!catch skin configuration
 to 'Resources/special-skin'

---
 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini
new file mode 100644
index 0000000000..36515f33c5
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini
@@ -0,0 +1,4 @@
+[CatchTheBeat]
+HyperDash: 232,185,35
+HyperDashFruit: 0,255,255
+HyperDashAfterImage: 232,74,35
\ No newline at end of file

From 42ccee5e6c8a2eedc459a369e129cccab853133d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 00:15:42 +0300
Subject: [PATCH 01946/10326] Fix CI issue

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 0d5b454a9d..7971a17e68 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -42,7 +42,6 @@ namespace osu.Game.Rulesets.Catch.UI
         private Container<CatcherTrailSprite> hyperDashTrails;
         private Container<CatcherTrailSprite> endGlowSprites;
 
-
         public CatcherAnimationState CurrentState { get; private set; }
 
         /// <summary>

From f6bbec72bfd664f1a29f27de192496bba08df6ca Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 00:20:21 +0300
Subject: [PATCH 01947/10326] Revert "Add custom-coloured osu!catch skin
 configuration to 'Resources/special-skin'"

This reverts commit dfd86e643bd415e5653a942e2432d56d224c6a1b.
---
 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini
deleted file mode 100644
index 36515f33c5..0000000000
--- a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CatchTheBeat]
-HyperDash: 232,185,35
-HyperDashFruit: 0,255,255
-HyperDashAfterImage: 232,74,35
\ No newline at end of file

From b8327ed877b61ac867210f7b611240c28063fdc7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 00:30:10 +0300
Subject: [PATCH 01948/10326] Add test for osu!catch skin colour decoding

Tests the skin configuration CatchTheBeat section's colours decoding part
---
 .../CatchSkinColourDecodingTest.cs            | 36 +++++++++++++++++++
 .../Resources/special-skin/skin.ini           |  4 +++
 .../Skinning/CatchLegacySkinTransformer.cs    |  2 +-
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
new file mode 100644
index 0000000000..57228210d6
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.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 NUnit.Framework;
+using osu.Framework.IO.Stores;
+using osu.Game.Rulesets.Catch.Skinning;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class CatchSkinColourDecodingTest
+    {
+        [Test]
+        public void TestCatchSkinColourDecoding()
+        {
+            var store = new NamespacedResourceStore<byte[]>(new DllResourceStore(GetType().Assembly), "Resources/special-skin");
+            var rawSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, store);
+            var skin = new CatchLegacySkinTransformer(rawSkin);
+
+            Assert.AreEqual(new Color4(232, 185, 35, 255), skin.GetHyperDashCatcherColour()?.Value);
+            Assert.AreEqual(new Color4(232, 74, 35, 255), skin.GetHyperDashCatcherAfterImageColour()?.Value);
+            Assert.AreEqual(new Color4(0, 255, 255, 255), skin.GetHyperDashFruitColour()?.Value);
+        }
+
+        private class TestLegacySkin : LegacySkin
+        {
+            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage)
+                // Bypass LegacySkinResourceStore to avoid returning null for retrieving files due to bad skin info (SkinInfo.Files = null).
+                : base(skin, storage, null, "skin.ini")
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini
new file mode 100644
index 0000000000..96d50f1451
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/skin.ini
@@ -0,0 +1,4 @@
+[CatchTheBeat]
+HyperDash: 232,185,35
+HyperDashFruit: 0,255,255
+HyperDashAfterImage: 232,74,35
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 65e6e6f209..ba939157ea 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
     {
         private readonly ISkin source;
 
-        public CatchLegacySkinTransformer(ISkinSource source)
+        public CatchLegacySkinTransformer(ISkin source)
         {
             this.source = source;
         }

From 42ac0c72eac12ea39415f9bc9926adcc5a1a6ff6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 00:46:52 +0300
Subject: [PATCH 01949/10326] Fix grammer issue and more rewording
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.Rulesets.Catch/Skinning/CatchSkinColour.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchSkinColour.cs b/osu.Game.Rulesets.Catch/Skinning/CatchSkinColour.cs
index 2ad8f89739..4506111498 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchSkinColour.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchSkinColour.cs
@@ -6,12 +6,12 @@ namespace osu.Game.Rulesets.Catch.Skinning
     public enum CatchSkinColour
     {
         /// <summary>
-        /// The colour to be used for the catcher while on hyper-dashing state.
+        /// The colour to be used for the catcher while in hyper-dashing state.
         /// </summary>
         HyperDash,
 
         /// <summary>
-        /// The colour to be used for hyper-dash fruits.
+        /// The colour to be used for fruits that grant the catcher the ability to hyper-dash.
         /// </summary>
         HyperDashFruit,
 

From 2fec8b7b8555101200250846e9ea0958f77b6b1c Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Sun, 5 Apr 2020 13:01:10 +0930
Subject: [PATCH 01950/10326] Use DisplayModes rather than AvailableResolutions

---
 .../Settings/Sections/Graphics/LayoutSettings.cs  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index b73c8f7622..00b7643332 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -209,15 +209,16 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
         private IReadOnlyList<Size> getResolutions()
         {
             var resolutions = new List<Size> { new Size(9999, 9999) };
+            var currentDisplay = game.Window?.CurrentDisplay.Value;
 
-            if (game.Window != null)
+            if (currentDisplay != null)
             {
-                resolutions.AddRange(game.Window.AvailableResolutions
-                                         .Where(r => r.Width >= 800 && r.Height >= 600)
-                                         .OrderByDescending(r => r.Width)
-                                         .ThenByDescending(r => r.Height)
-                                         .Select(res => new Size(res.Width, res.Height))
-                                         .Distinct());
+                resolutions.AddRange(currentDisplay.DisplayModes
+                                                   .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
+                                                   .OrderByDescending(m => m.Size.Width)
+                                                   .ThenByDescending(m => m.Size.Height)
+                                                   .Select(m => m.Size)
+                                                   .Distinct());
             }
 
             return resolutions;

From bc6c6228ace9161032f22cc004478c3f59179604 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 5 Apr 2020 14:13:06 +0900
Subject: [PATCH 01951/10326] Tidy up a touch

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

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 0a697d1fde..487401c939 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -134,9 +134,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
                             break;
 
                         case OsuSkinConfiguration.HitCircleOverlayAboveNumber:
-                            // Quote from https://osu.ppy.sh/help/wiki/Skinning/skin.ini#%5Bgeneral%5D
-                            // Old command: HitCircleOverlayAboveNumer (with typo) still works for legacy support
-                            return source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber) ?? source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
+                            // See https://osu.ppy.sh/help/wiki/Skinning/skin.ini#%5Bgeneral%5D
+                            // HitCircleOverlayAboveNumer (with typo) should still be supported for now.
+                            return source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber) ??
+                                   source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
                     }
 
                     break;

From 8d3e228f78b5b16f31e9fd250ca82d4ad0c5a770 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 5 Apr 2020 11:22:52 +0300
Subject: [PATCH 01952/10326] Split and rename tests

---
 .../TestSceneSliderSnaking.cs                 | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 51d4d1c008..c282314be7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -64,23 +64,33 @@ namespace osu.Game.Rulesets.Osu.Tests
         [SetUpSteps]
         public override void SetUpSteps() { }
 
-        [Test]
-        public void TestSnaking()
+        [TestCase(0)]
+        [TestCase(1)]
+        [TestCase(2)]
+        public void TestSnakingEnabled(int repeatAmount)
         {
             AddStep("have autoplay", () => autoplay = true);
             base.SetUpSteps();
             AddUntilStep("wait for track to start running", () => track.IsRunning);
 
-            for (int i = 0; i < 3; i++)
-            {
-                testSlider(i, true);
-                testSlider(i, false);
-            }
+            testSlider(repeatAmount, true);
+        }
+
+        [TestCase(0)]
+        [TestCase(1)]
+        [TestCase(2)]
+        public void TestSnakingDisabled(int repeatAmount)
+        {
+            AddStep("have autoplay", () => autoplay = true);
+            base.SetUpSteps();
+            AddUntilStep("wait for track to start running", () => track.IsRunning);
+
+            testSlider(repeatAmount, false);
         }
 
         [TestCase(true)]
         [TestCase(false)]
-        public void TestArrowStays(bool isHit)
+        public void TestArrowMovement(bool isHit)
         {
             AddStep($"{(isHit ? "enable" : "disable")} autoplay", () => autoplay = isHit);
             setSnaking(true);

From 1f6a4fa4b812752767b3aa7b36ef3d1e90ee052e Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 5 Apr 2020 12:45:10 +0300
Subject: [PATCH 01953/10326] Remove transformations

---
 .../Objects/Drawables/DrawableSliderRepeat.cs            | 5 ++++-
 .../Objects/Drawables/Pieces/ReverseArrowPiece.cs        | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index b04d484195..6c818f4a3e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -21,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private double animDuration;
 
-        private readonly Drawable scaleContainer;
+        private readonly ReverseArrowPiece scaleContainer;
 
         public DrawableSliderRepeat(SliderRepeat sliderRepeat, DrawableSlider drawableSlider)
             : base(sliderRepeat)
@@ -79,6 +80,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 case ArmedState.Hit:
                     this.FadeOut(animDuration, Easing.Out)
                         .ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
+                    scaleContainer.ShouldFollowBeats = false;
+                    scaleContainer.Transforms.ForEach(t => scaleContainer.RemoveTransform(t));
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
index 35a27bb0a6..73f02aa59c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     public class ReverseArrowPiece : BeatSyncedContainer
     {
+        public bool ShouldFollowBeats = true;
+
         public ReverseArrowPiece()
         {
             Divisor = 2;
@@ -37,7 +39,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             };
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes) =>
-            Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        {
+            if (ShouldFollowBeats)
+                Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+        }
     }
 }

From a3626333bebb580005c353466f6e130ef9c1f798 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 5 Apr 2020 13:36:52 +0300
Subject: [PATCH 01954/10326] Use DI instead

---
 .../Objects/Drawables/DrawableSliderRepeat.cs              | 3 +--
 .../Objects/Drawables/Pieces/ReverseArrowPiece.cs          | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 6c818f4a3e..517af630fc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private double animDuration;
 
-        private readonly ReverseArrowPiece scaleContainer;
+        private readonly Drawable scaleContainer;
 
         public DrawableSliderRepeat(SliderRepeat sliderRepeat, DrawableSlider drawableSlider)
             : base(sliderRepeat)
@@ -80,7 +80,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 case ArmedState.Hit:
                     this.FadeOut(animDuration, Easing.Out)
                         .ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
-                    scaleContainer.ShouldFollowBeats = false;
                     scaleContainer.Transforms.ForEach(t => scaleContainer.RemoveTransform(t));
                     break;
             }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
index 73f02aa59c..d792665d9d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
@@ -8,12 +8,15 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
 using osu.Game.Skinning;
+using osu.Framework.Allocation;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     public class ReverseArrowPiece : BeatSyncedContainer
     {
-        public bool ShouldFollowBeats = true;
+        [Resolved]
+        private DrawableHitObject drawableSlider { get; set; }
 
         public ReverseArrowPiece()
         {
@@ -41,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
         {
-            if (ShouldFollowBeats)
+            if (!drawableSlider.IsHit)
                 Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
         }
     }

From 23c3be0969b3c240d53844221f71928fdaa20520 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 5 Apr 2020 13:39:31 +0300
Subject: [PATCH 01955/10326] Rename variable

---
 .../Objects/Drawables/Pieces/ReverseArrowPiece.cs             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
index d792665d9d..6f3b2b6890 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
     public class ReverseArrowPiece : BeatSyncedContainer
     {
         [Resolved]
-        private DrawableHitObject drawableSlider { get; set; }
+        private DrawableHitObject drawableRepeat { get; set; }
 
         public ReverseArrowPiece()
         {
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
         {
-            if (!drawableSlider.IsHit)
+            if (!drawableRepeat.IsHit)
                 Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
         }
     }

From d68c45e22b38173d4c30b21d9eef8c0f48b71a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 5 Apr 2020 13:47:30 +0200
Subject: [PATCH 01956/10326] Use ElementAt() where applicable

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index c282314be7..98b039c9b4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addSeekStep(16500);
             AddStep("retrieve 2nd slider repeat", () =>
             {
-                var drawable = Player.DrawableRuleset.Playfield.AllHitObjects.Skip(1).First();
+                var drawable = Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(1);
                 repeat = drawable.ChildrenOfType<Container<DrawableSliderRepeat>>().First().Children.First();
             });
             AddStep("Save repeat vector", () => savedVector = repeat.Position);
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             int repeats = index;
             AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
             {
-                slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.Skip(index).First();
+                slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(index);
             });
             setSnaking(snaking);
             testSnakingIn(startTime + fade_in_modifier, snaking);

From 4170c210b29872b1edcb0072cd42b037245f34bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 5 Apr 2020 13:50:27 +0200
Subject: [PATCH 01957/10326] Centralise hitobject start time calculation

---
 .../TestSceneSliderSnaking.cs                 | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 98b039c9b4..287da2d25c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private void testSlider(int index, bool snaking)
         {
-            double startTime = index * 10000 + 3000;
+            double startTime = hitObjects[index].StartTime;
             int repeats = index;
             AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
             {
@@ -189,46 +189,48 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new Beatmap
         {
-            HitObjects = new List<HitObject>
+            HitObjects = hitObjects
+        };
+
+        private readonly List<HitObject> hitObjects = new List<HitObject>
+        {
+            new Slider
             {
-                new Slider
+                StartTime = 3000,
+                Position = new Vector2(100, 100),
+                Path = new SliderPath(PathType.PerfectCurve, new[]
                 {
-                    StartTime = 3000,
-                    Position = new Vector2(100, 100),
-                    Path = new SliderPath(PathType.PerfectCurve, new[]
-                    {
-                        Vector2.Zero,
-                        new Vector2(300, 200)
-                    }),
-                },
-                new Slider
+                    Vector2.Zero,
+                    new Vector2(300, 200)
+                }),
+            },
+            new Slider
+            {
+                StartTime = 13000,
+                Position = new Vector2(100, 100),
+                Path = new SliderPath(PathType.PerfectCurve, new[]
                 {
-                    StartTime = 13000,
-                    Position = new Vector2(100, 100),
-                    Path = new SliderPath(PathType.PerfectCurve, new[]
-                    {
-                        Vector2.Zero,
-                        new Vector2(300, 200)
-                    }),
-                    RepeatCount = 1,
-                },
+                    Vector2.Zero,
+                    new Vector2(300, 200)
+                }),
+                RepeatCount = 1,
+            },
 
-                new Slider
+            new Slider
+            {
+                StartTime = 23000,
+                Position = new Vector2(100, 100),
+                Path = new SliderPath(PathType.PerfectCurve, new[]
                 {
-                    StartTime = 23000,
-                    Position = new Vector2(100, 100),
-                    Path = new SliderPath(PathType.PerfectCurve, new[]
-                    {
-                        Vector2.Zero,
-                        new Vector2(300, 200)
-                    }),
-                    RepeatCount = 2,
-                },
+                    Vector2.Zero,
+                    new Vector2(300, 200)
+                }),
+                RepeatCount = 2,
+            },
 
-                new HitCircle
-                {
-                    StartTime = 199999,
-                }
+            new HitCircle
+            {
+                StartTime = 199999,
             }
         };
     }

From cbc546905ff103ace3583a9446b1764849228392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 5 Apr 2020 15:26:32 +0200
Subject: [PATCH 01958/10326] Rewrite snaking tests

---
 .../TestSceneSliderSnaking.cs                 | 117 ++++++++++--------
 1 file changed, 67 insertions(+), 50 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 287da2d25c..19b05f6b51 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Humanizer;
@@ -67,25 +68,48 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(0)]
         [TestCase(1)]
         [TestCase(2)]
-        public void TestSnakingEnabled(int repeatAmount)
+        public void TestSnakingEnabled(int sliderIndex)
         {
-            AddStep("have autoplay", () => autoplay = true);
+            AddStep("enable autoplay", () => autoplay = true);
             base.SetUpSteps();
             AddUntilStep("wait for track to start running", () => track.IsRunning);
 
-            testSlider(repeatAmount, true);
+            double startTime = hitObjects[sliderIndex].StartTime;
+            retrieveSlider(sliderIndex);
+            setSnaking(true);
+
+            ensureSnakingIn(startTime + fade_in_modifier);
+
+            for (int i = 0; i < sliderIndex; i++)
+            {
+                // non-final repeats should not snake out
+                ensureNoSnakingOut(startTime, i);
+            }
+
+            // final repeat should snake out
+            ensureSnakingOut(startTime, sliderIndex);
         }
 
         [TestCase(0)]
         [TestCase(1)]
         [TestCase(2)]
-        public void TestSnakingDisabled(int repeatAmount)
+        public void TestSnakingDisabled(int sliderIndex)
         {
             AddStep("have autoplay", () => autoplay = true);
             base.SetUpSteps();
             AddUntilStep("wait for track to start running", () => track.IsRunning);
 
-            testSlider(repeatAmount, false);
+            double startTime = hitObjects[sliderIndex].StartTime;
+            retrieveSlider(sliderIndex);
+            setSnaking(false);
+
+            ensureNoSnakingIn(startTime + fade_in_modifier);
+
+            for (int i = 0; i <= sliderIndex; i++)
+            {
+                // no snaking out ever, including final repeat
+                ensureNoSnakingOut(startTime, i);
+            }
         }
 
         [TestCase(true)]
@@ -115,62 +139,55 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
         }
 
-        private void testSlider(int index, bool snaking)
+        private void retrieveSlider(int index) => AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
         {
-            double startTime = hitObjects[index].StartTime;
-            int repeats = index;
-            AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
-            {
-                slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(index);
-            });
-            setSnaking(snaking);
-            testSnakingIn(startTime + fade_in_modifier, snaking);
+            slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(index);
+        });
 
-            for (int i = 0; i < repeats + 1; i++)
-            {
-                testSnakingOut(startTime + 100 + duration_of_span * i, snaking && i == repeats, i % 2 == 1);
-            }
+        private void ensureSnakingIn(double startTime) => checkPositionChange(startTime, sliderEnd, positionIncreased);
+        private void ensureNoSnakingIn(double startTime) => checkPositionChange(startTime, sliderEnd, positionRemainsSame);
+
+        private void ensureSnakingOut(double startTime, int repeatIndex)
+        {
+            var repeatTime = timeAtRepeat(startTime, repeatIndex);
+
+            if (repeatIndex % 2 == 0)
+                checkPositionChange(repeatTime, sliderStart, positionIncreased);
+            else
+                checkPositionChange(repeatTime, sliderEnd, positionDecreased);
         }
 
-        private void testSnakingIn(double startTime, bool isSnakingExpected)
+        private void ensureNoSnakingOut(double startTime, int repeatIndex) =>
+            checkPositionChange(timeAtRepeat(startTime, repeatIndex), positionAtRepeat(repeatIndex), positionRemainsSame);
+
+        private double timeAtRepeat(double startTime, int repeatIndex) => startTime + 100 + duration_of_span * repeatIndex;
+        private Func<Vector2> positionAtRepeat(int repeatIndex) => repeatIndex % 2 == 0 ? (Func<Vector2>)sliderStart : sliderEnd;
+
+        private List<Vector2> sliderCurve => ((PlaySliderBody)slider.Body.Drawable).CurrentCurve;
+        private Vector2 sliderStart() => sliderCurve.First();
+        private Vector2 sliderEnd() => sliderCurve.Last();
+
+        private bool positionRemainsSame(Vector2 previous, Vector2 current) => previous == current;
+        private bool positionIncreased(Vector2 previous, Vector2 current) => current.X > previous.X && current.Y > previous.Y;
+        private bool positionDecreased(Vector2 previous, Vector2 current) => current.X < previous.X && current.Y < previous.Y;
+
+        private void checkPositionChange(double startTime, Func<Vector2> positionToCheck, Func<Vector2, Vector2, bool> positionAssertion)
         {
+            Vector2 previousPosition = Vector2.Zero;
+
+            string positionDescription = positionToCheck.Method.Name.Humanize(LetterCasing.LowerCase);
+            string assertionDescription = positionAssertion.Method.Name.Humanize(LetterCasing.LowerCase);
+
             addSeekStep(startTime);
-            AddStep("Save end vector", () => savedVector = getCurrentSliderVector(true));
+            AddStep($"save {positionDescription} position", () => previousPosition = positionToCheck.Invoke());
             addSeekStep(startTime + 100);
-            AddAssert($"End vector {(isSnakingExpected ? "increased" : "is same")}", () =>
+            AddAssert($"{positionDescription} {assertionDescription}", () =>
             {
-                var currentVector = getCurrentSliderVector(true);
-                return isSnakingExpected ? currentVector.X > savedVector.X && currentVector.Y > savedVector.Y : currentVector == savedVector;
+                var currentPosition = positionToCheck.Invoke();
+                return positionAssertion.Invoke(previousPosition, currentPosition);
             });
         }
 
-        private void testSnakingOut(double startTime, bool isSnakingExpected, bool testSliderEnd)
-        {
-            addSeekStep(startTime);
-            AddStep($"Save {(testSliderEnd ? "end" : "start")} vector", () => savedVector = getCurrentSliderVector(testSliderEnd));
-            addSeekStep(startTime + 100);
-            AddAssert($"{(testSliderEnd ? "End" : "Start")} vector {(isSnakingExpected ? (testSliderEnd ? "decreased" : "increased") : "is same")}", () =>
-            {
-                var currentVector = getCurrentSliderVector(testSliderEnd);
-
-                bool check(Vector2 a, Vector2 b)
-                {
-                    if (testSliderEnd)
-                        return a.X < b.X && a.Y < b.Y;
-
-                    return a.X > b.X && a.Y > b.Y;
-                }
-
-                return isSnakingExpected ? check(currentVector, savedVector) : currentVector == savedVector;
-            });
-        }
-
-        private Vector2 getCurrentSliderVector(bool getEndOne)
-        {
-            var body = (PlaySliderBody)slider.Body.Drawable;
-            return getEndOne ? body.CurrentCurve.Last() : body.CurrentCurve.First();
-        }
-
         private void setSnaking(bool value)
         {
             AddStep($"{(value ? "Enable" : "Disable")} snaking", () =>

From c817cc726afdddd759dd4ee4379b2bf8b5548bb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 5 Apr 2020 15:37:31 +0200
Subject: [PATCH 01959/10326] Rewrite repeat arrow test

---
 .../TestSceneSliderSnaking.cs                 | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 19b05f6b51..e26a91eb0e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -59,8 +59,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         private DrawableSlider slider;
-        private DrawableSliderRepeat repeat;
-        private Vector2 savedVector;
 
         [SetUpSteps]
         public override void SetUpSteps() { }
@@ -112,31 +110,24 @@ namespace osu.Game.Rulesets.Osu.Tests
             }
         }
 
-        [TestCase(true)]
-        [TestCase(false)]
-        public void TestArrowMovement(bool isHit)
+        [Test]
+        public void TestRepeatArrowDoesNotMoveWhenHit()
         {
-            AddStep($"{(isHit ? "enable" : "disable")} autoplay", () => autoplay = isHit);
+            AddStep("enable autoplay", () => autoplay = true);
             setSnaking(true);
             base.SetUpSteps();
 
-            addSeekStep(16500);
-            AddStep("retrieve 2nd slider repeat", () =>
-            {
-                var drawable = Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(1);
-                repeat = drawable.ChildrenOfType<Container<DrawableSliderRepeat>>().First().Children.First();
-            });
-            AddStep("Save repeat vector", () => savedVector = repeat.Position);
-            addSeekStep(16700);
+            checkPositionChange(16600, sliderRepeat, positionAlmostSame);
+        }
 
-            AddAssert($"Repeat vector {(isHit ? "is same" : "decreased")}", () =>
-            {
-                if (isHit)
-                    // Precision.AlmostEquals is used because repeat might have a chance to update its position depending on where in the frame its hit
-                    return Precision.AlmostEquals(savedVector, repeat.Position, 1);
+        [Test]
+        public void TestRepeatArrowMovesWhenNotHit()
+        {
+            AddStep("disable autoplay", () => autoplay = false);
+            setSnaking(true);
+            base.SetUpSteps();
 
-                return repeat.X < savedVector.X && repeat.Y < savedVector.Y;
-            });
+            checkPositionChange(16600, sliderRepeat, positionDecreased);
         }
 
         private void retrieveSlider(int index) => AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
@@ -166,10 +157,17 @@ namespace osu.Game.Rulesets.Osu.Tests
         private List<Vector2> sliderCurve => ((PlaySliderBody)slider.Body.Drawable).CurrentCurve;
         private Vector2 sliderStart() => sliderCurve.First();
         private Vector2 sliderEnd() => sliderCurve.Last();
+        private Vector2 sliderRepeat()
+        {
+            var drawable = Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(1);
+            var repeat = drawable.ChildrenOfType<Container<DrawableSliderRepeat>>().First().Children.First();
+            return repeat.Position;
+        }
 
         private bool positionRemainsSame(Vector2 previous, Vector2 current) => previous == current;
         private bool positionIncreased(Vector2 previous, Vector2 current) => current.X > previous.X && current.Y > previous.Y;
         private bool positionDecreased(Vector2 previous, Vector2 current) => current.X < previous.X && current.Y < previous.Y;
+        private bool positionAlmostSame(Vector2 previous, Vector2 current) => Precision.AlmostEquals(previous, current, 1);
 
         private void checkPositionChange(double startTime, Func<Vector2> positionToCheck, Func<Vector2, Vector2, bool> positionAssertion)
         {

From 7135c997466f0ed207390a8f96604b28fcf0d464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 5 Apr 2020 15:39:32 +0200
Subject: [PATCH 01960/10326] Final cleanups

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index e26a91eb0e..2eee5c4825 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -157,6 +157,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private List<Vector2> sliderCurve => ((PlaySliderBody)slider.Body.Drawable).CurrentCurve;
         private Vector2 sliderStart() => sliderCurve.First();
         private Vector2 sliderEnd() => sliderCurve.Last();
+
         private Vector2 sliderRepeat()
         {
             var drawable = Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(1);
@@ -188,7 +189,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private void setSnaking(bool value)
         {
-            AddStep($"{(value ? "Enable" : "Disable")} snaking", () =>
+            AddStep($"{(value ? "enable" : "disable")} snaking", () =>
             {
                 snakingIn.Value = value;
                 snakingOut.Value = value;

From f9e44ae53ee8b7116a87fc4fa43b18ccaf5f2a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 5 Apr 2020 15:53:56 +0200
Subject: [PATCH 01961/10326] Bring back comment about AlmostEquals

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 2eee5c4825..75adbd0987 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.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;
@@ -117,6 +117,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             setSnaking(true);
             base.SetUpSteps();
 
+            // repeat might have a chance to update its position depending on where in the frame its hit,
+            // so some leniency is allowed here instead of checking strict equality
             checkPositionChange(16600, sliderRepeat, positionAlmostSame);
         }
 

From 25c96744870547b4e0297c4b41495d73cd891e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 5 Apr 2020 15:54:15 +0200
Subject: [PATCH 01962/10326] Rename method to justify its existence better

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 75adbd0987..e320cfff45 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.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;
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("wait for track to start running", () => track.IsRunning);
 
             double startTime = hitObjects[sliderIndex].StartTime;
-            retrieveSlider(sliderIndex);
+            retrieveDrawableSlider(sliderIndex);
             setSnaking(true);
 
             ensureSnakingIn(startTime + fade_in_modifier);
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("wait for track to start running", () => track.IsRunning);
 
             double startTime = hitObjects[sliderIndex].StartTime;
-            retrieveSlider(sliderIndex);
+            retrieveDrawableSlider(sliderIndex);
             setSnaking(false);
 
             ensureNoSnakingIn(startTime + fade_in_modifier);
@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             checkPositionChange(16600, sliderRepeat, positionDecreased);
         }
 
-        private void retrieveSlider(int index) => AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
+        private void retrieveDrawableSlider(int index) => AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
         {
             slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(index);
         });

From 3ff27816be8ac5d98bbbd4ee6aa90469271bc130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 5 Apr 2020 15:54:50 +0200
Subject: [PATCH 01963/10326] Trim excess newlines

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index e320cfff45..f5b20fd1c5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -233,7 +233,6 @@ namespace osu.Game.Rulesets.Osu.Tests
                 }),
                 RepeatCount = 1,
             },
-
             new Slider
             {
                 StartTime = 23000,
@@ -245,7 +244,6 @@ namespace osu.Game.Rulesets.Osu.Tests
                 }),
                 RepeatCount = 2,
             },
-
             new HitCircle
             {
                 StartTime = 199999,

From 0eaea8ef9da45538ba1439de7c54157bba942673 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 21:29:03 +0300
Subject: [PATCH 01964/10326] Create a constructor for break period

For simple construction of break periods (e.g. filling a method with an array of break periods inside a test case)
---
 .../Visual/Gameplay/TestSceneBreakTracker.cs  | 23 ++++++-------------
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  |  7 ++----
 osu.Game/Beatmaps/Timing/BreakPeriod.cs       | 11 +++++++++
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
index ff25e609c1..91d6f2f143 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
@@ -26,16 +26,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private readonly IReadOnlyList<BreakPeriod> testBreaks = new List<BreakPeriod>
         {
-            new BreakPeriod
-            {
-                StartTime = 1000,
-                EndTime = 5000,
-            },
-            new BreakPeriod
-            {
-                StartTime = 6000,
-                EndTime = 13500,
-            },
+            new BreakPeriod(1000, 5000),
+            new BreakPeriod(6000, 13500),
         };
 
         public TestSceneBreakTracker()
@@ -70,7 +62,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestNoEffectsBreak()
         {
-            var shortBreak = new BreakPeriod { EndTime = 500 };
+            var shortBreak = new BreakPeriod(0, 500);
 
             setClock(true);
             loadBreaksStep("short break", new[] { shortBreak });
@@ -127,13 +119,12 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void addShowBreakStep(double seconds)
         {
-            AddStep($"show '{seconds}s' break", () => breakOverlay.Breaks = breakTracker.Breaks = new List<BreakPeriod>
+            AddStep($"show '{seconds}s' break", () =>
             {
-                new BreakPeriod
+                breakOverlay.Breaks = breakTracker.Breaks = new List<BreakPeriod>
                 {
-                    StartTime = Clock.CurrentTime,
-                    EndTime = Clock.CurrentTime + seconds * 1000,
-                }
+                    new BreakPeriod(Clock.CurrentTime, Clock.CurrentTime + seconds * 1000)
+                };
             });
         }
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index f5b27eddd2..33bb9774df 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -305,12 +305,9 @@ namespace osu.Game.Beatmaps.Formats
 
                 case LegacyEventType.Break:
                     double start = getOffsetTime(Parsing.ParseDouble(split[1]));
+                    double end = Math.Max(start, getOffsetTime(Parsing.ParseDouble(split[2])));
 
-                    var breakEvent = new BreakPeriod
-                    {
-                        StartTime = start,
-                        EndTime = Math.Max(start, getOffsetTime(Parsing.ParseDouble(split[2])))
-                    };
+                    var breakEvent = new BreakPeriod(start, end);
 
                     if (!breakEvent.HasEffect)
                         return;
diff --git a/osu.Game/Beatmaps/Timing/BreakPeriod.cs b/osu.Game/Beatmaps/Timing/BreakPeriod.cs
index 5d79c7a86b..bb8ae4a66a 100644
--- a/osu.Game/Beatmaps/Timing/BreakPeriod.cs
+++ b/osu.Game/Beatmaps/Timing/BreakPeriod.cs
@@ -32,6 +32,17 @@ namespace osu.Game.Beatmaps.Timing
         /// </summary>
         public bool HasEffect => Duration >= MIN_BREAK_DURATION;
 
+        /// <summary>
+        /// Constructs a new break period.
+        /// </summary>
+        /// <param name="startTime">The start time of the break period.</param>
+        /// <param name="endTime">The end time of the break period.</param>
+        public BreakPeriod(double startTime, double endTime)
+        {
+            StartTime = startTime;
+            EndTime = endTime;
+        }
+
         /// <summary>
         /// Whether this break contains a specified time.
         /// </summary>

From e71a9668a537b2616b71b8f192c37671e2447553 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 21:32:55 +0300
Subject: [PATCH 01965/10326] Disallow draining in non-draining sections

---
 .../Scoring/DrainingHealthProcessor.cs        | 57 ++++++++++++++++---
 1 file changed, 50 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index fffcbb3c9f..b36e42326c 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 
@@ -47,6 +49,34 @@ namespace osu.Game.Rulesets.Scoring
         private double targetMinimumHealth;
         private double drainRate = 1;
 
+        private readonly List<(double startTime, double endTime)> nonDrainSections = new List<(double, double)>();
+        private int currentNonDrainSection;
+
+        private bool isInNonDrainSection
+        {
+            get
+            {
+                if (nonDrainSections.Count == 0)
+                    return false;
+
+                var time = Time.Current;
+
+                if (time > nonDrainSections[currentNonDrainSection].endTime)
+                {
+                    while (time > nonDrainSections[currentNonDrainSection].endTime && currentNonDrainSection < nonDrainSections.Count - 1)
+                        currentNonDrainSection++;
+                }
+                else
+                {
+                    while (time < nonDrainSections[currentNonDrainSection].startTime && currentNonDrainSection > 0)
+                        currentNonDrainSection--;
+                }
+
+                var closestSection = nonDrainSections[currentNonDrainSection];
+                return time >= closestSection.startTime && time <= closestSection.endTime;
+            }
+        }
+
         /// <summary>
         /// Creates a new <see cref="DrainingHealthProcessor"/>.
         /// </summary>
@@ -60,23 +90,36 @@ namespace osu.Game.Rulesets.Scoring
         {
             base.Update();
 
-            if (!IsBreakTime.Value)
-            {
-                // When jumping in and out of gameplay time within a single frame, health should only be drained for the period within the gameplay time
-                double lastGameplayTime = Math.Clamp(Time.Current - Time.Elapsed, drainStartTime, gameplayEndTime);
-                double currentGameplayTime = Math.Clamp(Time.Current, drainStartTime, gameplayEndTime);
+            if (isInNonDrainSection)
+                return;
 
-                Health.Value -= drainRate * (currentGameplayTime - lastGameplayTime);
-            }
+            // When jumping in and out of gameplay time within a single frame, health should only be drained for the period within the gameplay time
+            double lastGameplayTime = Math.Clamp(Time.Current - Time.Elapsed, drainStartTime, gameplayEndTime);
+            double currentGameplayTime = Math.Clamp(Time.Current, drainStartTime, gameplayEndTime);
+
+            Health.Value -= drainRate * (currentGameplayTime - lastGameplayTime);
         }
 
         public override void ApplyBeatmap(IBeatmap beatmap)
         {
+            nonDrainSections.Clear();
+
             this.beatmap = beatmap;
 
             if (beatmap.HitObjects.Count > 0)
                 gameplayEndTime = beatmap.HitObjects[^1].GetEndTime();
 
+            // Ranges between the end of last hit object before a break
+            // and the start of first hit object after a break should
+            // not allow HP draining. (with break periods in)
+            foreach (BreakPeriod b in beatmap.Breaks)
+            {
+                var startTime = beatmap.HitObjects.LastOrDefault(h => h.GetEndTime() < b.StartTime)?.GetEndTime() ?? double.MinValue;
+                var endTime = beatmap.HitObjects.FirstOrDefault(h => h.StartTime > b.EndTime)?.StartTime ?? double.MaxValue;
+
+                nonDrainSections.Add((startTime, endTime));
+            }
+
             targetMinimumHealth = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, min_health_target, mid_health_target, max_health_target);
 
             base.ApplyBeatmap(beatmap);

From 7fab07670ed8ff6725bc4b8c1c543e0101af9664 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 21:35:09 +0300
Subject: [PATCH 01966/10326] Remove no longer necessary usage of IsBreakTime

---
 osu.Game/Rulesets/Scoring/HealthProcessor.cs | 5 -----
 osu.Game/Screens/Play/Player.cs              | 2 --
 2 files changed, 7 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HealthProcessor.cs b/osu.Game/Rulesets/Scoring/HealthProcessor.cs
index 45edc0f4a3..1535fe4d00 100644
--- a/osu.Game/Rulesets/Scoring/HealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/HealthProcessor.cs
@@ -26,11 +26,6 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public readonly BindableDouble Health = new BindableDouble(1) { MinValue = 0, MaxValue = 1 };
 
-        /// <summary>
-        /// Whether gameplay is currently in a break.
-        /// </summary>
-        public readonly IBindable<bool> IsBreakTime = new Bindable<bool>();
-
         /// <summary>
         /// Whether this ScoreProcessor has already triggered the failed state.
         /// </summary>
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4597ae760c..f2051790db 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -243,8 +243,6 @@ namespace osu.Game.Screens.Play
                     Breaks = working.Beatmap.Breaks
                 }
             });
-
-            HealthProcessor.IsBreakTime.BindTo(breakTracker.IsBreakTime);
         }
 
         private void addOverlayComponents(Container target, WorkingBeatmap working)

From c902ba40860b2757ea960925322bf9731b4eeefc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 21:46:07 +0300
Subject: [PATCH 01967/10326] Add test cases for HP draining not applied before
 a break and after it

---
 .../TestSceneDrainingHealthProcessor.cs       | 87 ++++++++++++++-----
 1 file changed, 66 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
index 885abb61b5..2f83ea4832 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
@@ -1,13 +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.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -18,7 +20,6 @@ namespace osu.Game.Tests.Gameplay
     [HeadlessTest]
     public class TestSceneDrainingHealthProcessor : OsuTestScene
     {
-        private Bindable<bool> breakTime;
         private HealthProcessor processor;
         private ManualClock clock;
 
@@ -41,6 +42,55 @@ namespace osu.Game.Tests.Gameplay
             assertHealthEqualTo(1);
         }
 
+        [Test]
+        public void TestHealthNotDrainedBeforeBreak()
+        {
+            createProcessor(createBeatmap(0, 2000,
+                new BreakPeriod(400, 600), new BreakPeriod(1200, 1400)));
+
+            setTime(300);
+            setHealth(1);
+
+            setTime(400);
+            assertHealthEqualTo(1);
+
+            setTime(1100);
+            setHealth(1);
+
+            setTime(1200);
+            assertHealthEqualTo(1);
+        }
+
+        [Test]
+        public void TestHealthNotDrainedDuringBreak()
+        {
+            createProcessor(createBeatmap(0, 2000, new BreakPeriod(0, 1200)));
+
+            setTime(700);
+            assertHealthEqualTo(1);
+            setTime(900);
+            assertHealthEqualTo(1);
+        }
+
+        [Test]
+        public void TestHealthNotDrainedAfterBreak()
+        {
+            createProcessor(createBeatmap(0, 2000,
+                new BreakPeriod(400, 600), new BreakPeriod(1200, 1400)));
+
+            setTime(600);
+            setHealth(1);
+
+            setTime(700);
+            assertHealthEqualTo(1);
+
+            setTime(1400);
+            setHealth(1);
+
+            setTime(1500);
+            assertHealthEqualTo(1);
+        }
+
         [Test]
         public void TestHealthNotDrainedAfterGameplayEnd()
         {
@@ -54,18 +104,6 @@ namespace osu.Game.Tests.Gameplay
             assertHealthEqualTo(1);
         }
 
-        [Test]
-        public void TestHealthNotDrainedDuringBreak()
-        {
-            createProcessor(createBeatmap(0, 2000));
-            setBreak(true);
-
-            setTime(700);
-            assertHealthEqualTo(1);
-            setTime(900);
-            assertHealthEqualTo(1);
-        }
-
         [Test]
         public void TestHealthDrainedDuringGameplay()
         {
@@ -112,30 +150,39 @@ namespace osu.Game.Tests.Gameplay
             assertHealthNotEqualTo(1);
         }
 
-        private Beatmap createBeatmap(double startTime, double endTime)
+        private Beatmap createBeatmap(double startTime, double endTime, params BreakPeriod[] breaks)
         {
             var beatmap = new Beatmap
             {
                 BeatmapInfo = { BaseDifficulty = { DrainRate = 5 } },
             };
 
-            for (double time = startTime; time <= endTime; time += 100)
+            double time = startTime;
+
+            while (time <= endTime)
+            {
                 beatmap.HitObjects.Add(new JudgeableHitObject { StartTime = time });
 
+                // leave a 100ms gap between the start and end of a break period.
+                time += (getCurrentBreak(breaks, time)?.Duration ?? 0) + 100;
+            }
+
+            beatmap.Breaks.AddRange(breaks);
+
+            static BreakPeriod getCurrentBreak(IEnumerable<BreakPeriod> breaks, double time) =>
+                breaks?.FirstOrDefault(b => time >= b.StartTime && time <= b.EndTime);
+
             return beatmap;
         }
 
         private void createProcessor(Beatmap beatmap) => AddStep("create processor", () =>
         {
-            breakTime = new Bindable<bool>();
-
             Child = processor = new DrainingHealthProcessor(beatmap.HitObjects[0].StartTime).With(d =>
             {
                 d.RelativeSizeAxes = Axes.Both;
                 d.Clock = new FramedClock(clock = new ManualClock());
             });
 
-            processor.IsBreakTime.BindTo(breakTime);
             processor.ApplyBeatmap(beatmap);
         });
 
@@ -143,8 +190,6 @@ namespace osu.Game.Tests.Gameplay
 
         private void setHealth(double health) => AddStep($"set health = {health}", () => processor.Health.Value = health);
 
-        private void setBreak(bool enabled) => AddStep($"{(enabled ? "enable" : "disable")} break", () => breakTime.Value = enabled);
-
         private void assertHealthEqualTo(double value)
             => AddAssert($"health = {value}", () => Precision.AlmostEquals(value, processor.Health.Value, 0.0001f));
 

From 1b76a53d329acbe4c3dc73800e867b69277e5a0a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 22:10:35 +0300
Subject: [PATCH 01968/10326] Move CatchTheBeat section handling to
 LegacySkinDecoder

Best place to reside at
---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs | 3 ---
 osu.Game/Skinning/LegacySkinDecoder.cs     | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 743a470e6e..113526f9dd 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -73,9 +73,6 @@ namespace osu.Game.Beatmaps.Formats
             switch (section)
             {
                 case Section.Colours:
-                // osu!catch section only has colour settings
-                // so no harm in handling the entire section
-                case Section.CatchTheBeat:
                     HandleColours(output, line);
                     return;
             }
diff --git a/osu.Game/Skinning/LegacySkinDecoder.cs b/osu.Game/Skinning/LegacySkinDecoder.cs
index 88ba7b23b7..b5734edacf 100644
--- a/osu.Game/Skinning/LegacySkinDecoder.cs
+++ b/osu.Game/Skinning/LegacySkinDecoder.cs
@@ -44,6 +44,12 @@ namespace osu.Game.Skinning
                         }
 
                         break;
+
+                    // osu!catch section only has colour settings
+                    // so no harm in handling the entire section
+                    case Section.CatchTheBeat:
+                        HandleColours(skin, line);
+                        return;
                 }
 
                 if (!string.IsNullOrEmpty(pair.Key))

From 7f3ad6d5be7b79358f6c1d9ed2c44c3e60a30dda Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 5 Apr 2020 22:15:11 +0300
Subject: [PATCH 01969/10326] Move default colour fallback to the extension
 methods itself

---
 osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs | 6 +++++-
 osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs    | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
index 8fc0831918..623f87bf11 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using JetBrains.Annotations;
 using osu.Framework.Bindables;
+using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
@@ -9,8 +11,10 @@ namespace osu.Game.Rulesets.Catch.Skinning
 {
     internal static class CatchSkinExtensions
     {
+        [NotNull]
         public static IBindable<Color4> GetHyperDashFruitColour(this ISkin skin)
             => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit) ??
-               skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash);
+               skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash) ??
+               new Bindable<Color4>(Catcher.DefaultHyperDashColour);
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index d8489399d2..470c12559e 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
-using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
@@ -57,7 +56,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 var hyperDash = new Sprite
                 {
                     Texture = skin.GetTexture(lookupName),
-                    Colour = skin.GetHyperDashFruitColour()?.Value ?? Catcher.DefaultHyperDashColour,
+                    Colour = skin.GetHyperDashFruitColour().Value,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Blending = BlendingParameters.Additive,

From 0f11ecce018984ccac589d126052e35b7a500b3b Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 5 Apr 2020 14:53:49 -0700
Subject: [PATCH 01970/10326] Make icons container private

---
 osu.Game/Screens/Play/HUD/ModDisplay.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index cd15886c0b..99c31241f1 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        protected readonly FillFlowContainer<ModIcon> IconsContainer;
+        private readonly FillFlowContainer<ModIcon> iconsContainer;
         private readonly OsuSpriteText unrankedText;
 
         public ModDisplay()
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play.HUD
 
             Children = new Drawable[]
             {
-                IconsContainer = new ReverseChildIDFillFlowContainer<ModIcon>
+                iconsContainer = new ReverseChildIDFillFlowContainer<ModIcon>
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
@@ -68,11 +68,11 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.ValueChanged += mods =>
             {
-                IconsContainer.Clear();
+                iconsContainer.Clear();
 
                 foreach (Mod mod in mods.NewValue)
                 {
-                    IconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
+                    iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
                 }
 
                 if (IsLoaded)
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Play.HUD
             base.LoadComplete();
 
             appearTransform();
-            IconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint);
+            iconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint);
         }
 
         private void appearTransform()
@@ -103,20 +103,20 @@ namespace osu.Game.Screens.Play.HUD
 
             expand();
 
-            using (IconsContainer.BeginDelayedSequence(1200))
+            using (iconsContainer.BeginDelayedSequence(1200))
                 contract();
         }
 
         private void expand()
         {
             if (ExpansionMode != ExpansionMode.AlwaysContracted)
-                IconsContainer.TransformSpacingTo(new Vector2(5, 0), 500, Easing.OutQuint);
+                iconsContainer.TransformSpacingTo(new Vector2(5, 0), 500, Easing.OutQuint);
         }
 
         private void contract()
         {
             if (ExpansionMode != ExpansionMode.AlwaysExpanded)
-                IconsContainer.TransformSpacingTo(new Vector2(-25, 0), 500, Easing.OutQuint);
+                iconsContainer.TransformSpacingTo(new Vector2(-25, 0), 500, Easing.OutQuint);
         }
 
         protected override bool OnHover(HoverEvent e)

From 57b6a91449bd557530baee213fe82c2ecc5f9692 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 5 Apr 2020 14:57:44 -0700
Subject: [PATCH 01971/10326] Remove unnecessary input override on footer
 button mods

Was used when it expanded on hover, but doesn't anymore.
---
 osu.Game/Screens/Select/FooterButtonMods.cs | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index b18301c082..02333da0dc 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -27,18 +27,19 @@ namespace osu.Game.Screens.Select
         }
 
         protected readonly OsuSpriteText MultiplierText;
-        private readonly FooterModDisplay modDisplay;
+        private readonly ModDisplay modDisplay;
         private Color4 lowMultiplierColour;
         private Color4 highMultiplierColour;
 
         public FooterButtonMods()
         {
-            ButtonContentContainer.Add(modDisplay = new FooterModDisplay
+            ButtonContentContainer.Add(modDisplay = new ModDisplay
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 DisplayUnrankedText = false,
-                Scale = new Vector2(0.8f)
+                Scale = new Vector2(0.8f),
+                ExpansionMode = ExpansionMode.AlwaysContracted,
             });
             ButtonContentContainer.Add(MultiplierText = new OsuSpriteText
             {
@@ -84,15 +85,5 @@ namespace osu.Game.Screens.Select
             else
                 modDisplay.FadeOut();
         }
-
-        private class FooterModDisplay : ModDisplay
-        {
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent?.Parent?.ReceivePositionalInputAt(screenSpacePos) ?? false;
-
-            public FooterModDisplay()
-            {
-                ExpansionMode = ExpansionMode.AlwaysContracted;
-            }
-        }
     }
 }

From cfa2404626674b5ba37673bb8fe8007f1c016ad9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Apr 2020 12:39:49 +0900
Subject: [PATCH 01972/10326] Remove explicit specification of new default

---
 osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index c87a1d438b..ce0b9fe4b6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             if (tmp is IFramedAnimation tmpAnimation && tmpAnimation.FrameCount > 0)
                 frameLength = Math.Max(1000 / 60.0, 170.0 / tmpAnimation.FrameCount);
 
-            explosion = skin.GetAnimation(imageName, true, false, startAtCurrentTime: true, frameLength: frameLength).With(d =>
+            explosion = skin.GetAnimation(imageName, true, false, frameLength: frameLength).With(d =>
             {
                 if (d == null)
                     return;

From 66b8a8ad2eadf04b6dcd88b9ba9740044f4cf92e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Apr 2020 12:45:58 +0900
Subject: [PATCH 01973/10326] Remove stray default value specification

---
 .../Objects/Drawables/Connections/FollowPoint.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
index 8bb324d02e..a981648444 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                     Anchor = Anchor.Centre,
                     Alpha = 0.5f,
                 }
-            }, confineMode: ConfineMode.NoScaling);
+            });
         }
 
         public double AnimationStartTime { get; set; }

From 33c64428a891bb01b85a2e88fb2111edd454acea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Apr 2020 13:04:32 +0900
Subject: [PATCH 01974/10326] Fix playback position being set incorrectly for
 IAnimationTimeReference

---
 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 476e53bdaa..549571dec4 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Skinning
                 if (timeReference != null)
                 {
                     Clock = timeReference.Clock;
-                    PlaybackPosition = timeReference.AnimationStartTime - timeReference.Clock.CurrentTime;
+                    PlaybackPosition = timeReference.Clock.CurrentTime - timeReference.AnimationStartTime;
                 }
             }
         }

From a4b4b7df211d2f2ddb80241c45dca36059513f11 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Apr 2020 13:04:46 +0900
Subject: [PATCH 01975/10326] Fix follow points not starting at correct time

---
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 487401c939..ba0003b5cd 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             switch (osuComponent.Component)
             {
                 case OsuSkinComponents.FollowPoint:
-                    return this.GetAnimation(component.LookupName, true, false, true);
+                    return this.GetAnimation(component.LookupName, true, false, true, startAtCurrentTime: false);
 
                 case OsuSkinComponents.SliderFollowCircle:
                     var followCircle = this.GetAnimation("sliderfollowcircle", true, true, true);

From 018244826221080e9c0bba050787001c3aa0f107 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Apr 2020 18:35:39 +0900
Subject: [PATCH 01976/10326] Fix performance when parsing mania skins

---
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 3393fe09b3..eb90225d1c 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -108,6 +108,8 @@ namespace osu.Game.Skinning
                         break;
                 }
             }
+
+            pendingLines.Clear();
         }
 
         private void parseArrayValue(string value, float[] output)

From eff17c2da57f26fdafff02fc979e949abf7611c6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Apr 2020 19:02:50 +0900
Subject: [PATCH 01977/10326] Allow legacy skin textures from subpaths

---
 osu.Game/Skinning/LegacySkin.cs              | 35 ++++++++++++--------
 osu.Game/Skinning/LegacySkinResourceStore.cs |  3 +-
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 3d3eac97f6..5e2d0fb25f 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -243,21 +243,24 @@ namespace osu.Game.Skinning
 
         public override Texture GetTexture(string componentName)
         {
-            componentName = getFallbackName(componentName);
-
-            float ratio = 2;
-            var texture = Textures?.Get($"{componentName}@2x");
-
-            if (texture == null)
+            foreach (var name in getFallbackNames(componentName))
             {
-                ratio = 1;
-                texture = Textures?.Get(componentName);
+                float ratio = 2;
+                var texture = Textures?.Get($"{name}@2x");
+
+                if (texture == null)
+                {
+                    ratio = 1;
+                    texture = Textures?.Get(name);
+                }
+
+                if (texture != null)
+                    texture.ScaleAdjust = ratio;
+
+                return texture;
             }
 
-            if (texture != null)
-                texture.ScaleAdjust = ratio;
-
-            return texture;
+            return null;
         }
 
         public override SampleChannel GetSample(ISampleInfo sampleInfo)
@@ -277,10 +280,14 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        private string getFallbackName(string componentName)
+        private IEnumerable<string> getFallbackNames(string componentName)
         {
+            // May be something like "Gameplay/osu/approachcircle" from lazer, or "Arrows/note1" from a user skin.
+            yield return componentName;
+
+            // Fall back to using the last piece for components coming from lazer (e.g. "Gameplay/osu/approachcircle" -> "approachcircle").
             string lastPiece = componentName.Split('/').Last();
-            return componentName.StartsWith("Gameplay/taiko/") ? "taiko-" + lastPiece : lastPiece;
+            yield return componentName.StartsWith("Gameplay/taiko/") ? "taiko-" + lastPiece : lastPiece;
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkinResourceStore.cs b/osu.Game/Skinning/LegacySkinResourceStore.cs
index 249d48b34b..05d0dee05f 100644
--- a/osu.Game/Skinning/LegacySkinResourceStore.cs
+++ b/osu.Game/Skinning/LegacySkinResourceStore.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions;
 using osu.Framework.IO.Stores;
 using osu.Game.Database;
 
@@ -27,7 +28,7 @@ namespace osu.Game.Skinning
 
             foreach (var filename in base.GetFilenames(name))
             {
-                var path = getPathForFile(filename);
+                var path = getPathForFile(filename.ToStandardisedPath());
                 if (path != null)
                     yield return path;
             }

From 707a6269b3f4f153a1baf3b5272770b97475205e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Apr 2020 19:03:37 +0900
Subject: [PATCH 01978/10326] Fix incorrect key texture lookup

---
 osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index cbe2036343..78ea4b68ae 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         {
             isLegacySkin = new Lazy<bool>(() => source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
             hasKeyTexture = new Lazy<bool>(() => source.GetAnimation(
-                source.GetConfig<ManiaSkinConfigurationLookup, string>(
+                GetConfig<ManiaSkinConfigurationLookup, string>(
                     new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value
                 ?? "mania-key1", true, true) != null);
         }

From db6db861c069256915643494766c172dc3925cc9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Apr 2020 19:04:02 +0900
Subject: [PATCH 01979/10326] Implement mania note + key image configs

---
 .../Skinning/LegacyManiaSkinConfiguration.cs  |  2 ++
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs   | 18 ++++++++-----
 osu.Game/Skinning/LegacySkin.cs               | 27 +++++++++++++++++++
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index ac257b8c80..603487a603 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Skinning
 
         public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
 
+        public Dictionary<string, string> ImageLookups = new Dictionary<string, string>();
+
         public readonly float[] ColumnLineWidth;
         public readonly float[] ColumnSpacing;
         public readonly float[] ColumnWidth;
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 3393fe09b3..b23b115c14 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -71,12 +71,6 @@ namespace osu.Game.Skinning
             {
                 var pair = SplitKeyVal(line);
 
-                if (pair.Key.StartsWith("Colour"))
-                {
-                    HandleColours(currentConfig, line);
-                    continue;
-                }
-
                 switch (pair.Key)
                 {
                     case "ColumnLineWidth":
@@ -106,6 +100,18 @@ namespace osu.Game.Skinning
                     case "LightingNWidth":
                         parseArrayValue(pair.Value, currentConfig.ExplosionWidth);
                         break;
+
+                    case string _ when pair.Key.StartsWith("Colour"):
+                        HandleColours(currentConfig, line);
+                        break;
+
+                    case string _ when pair.Key.StartsWith("NoteImage"):
+                        currentConfig.ImageLookups[pair.Key] = pair.Value;
+                        break;
+
+                    case string _ when pair.Key.StartsWith("KeyImage"):
+                        currentConfig.ImageLookups[pair.Key] = pair.Value;
+                        break;
                 }
             }
         }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 5e2d0fb25f..ff050d90e2 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -207,6 +207,30 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.ColumnLineColour:
                     return SkinUtils.As<TValue>(getCustomColour(existing, "ColourColumnLine"));
+
+                case LegacyManiaSkinConfigurationLookups.NoteImage:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}"));
+
+                case LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}H"));
+
+                case LegacyManiaSkinConfigurationLookups.HoldNoteTailImage:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}T"));
+
+                case LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}L"));
+
+                case LegacyManiaSkinConfigurationLookups.KeyImage:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"KeyImage{maniaLookup.TargetColumn}"));
+
+                case LegacyManiaSkinConfigurationLookups.KeyImageDown:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"KeyImage{maniaLookup.TargetColumn}D"));
             }
 
             return null;
@@ -215,6 +239,9 @@ namespace osu.Game.Skinning
         private IBindable<Color4> getCustomColour(IHasCustomColours source, string lookup)
             => source.CustomColours.TryGetValue(lookup, out var col) ? new Bindable<Color4>(col) : null;
 
+        private IBindable<string> getManiaImage(LegacyManiaSkinConfiguration source, string lookup)
+            => source.ImageLookups.TryGetValue(lookup, out var image) ? new Bindable<string>(image) : null;
+
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             switch (component)

From 8438ee7e0787fe472199571566482b3a21265b99 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Apr 2020 19:35:27 +0900
Subject: [PATCH 01980/10326] Improve testing

---
 .../Skins/TestSceneSkinConfigurationLookup.cs | 77 ++++++++++++++-----
 1 file changed, 57 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index 35313ee858..9c1a6a1346 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -12,7 +13,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
 using osu.Game.Audio;
+using osu.Game.IO;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning;
+using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
 
@@ -22,15 +26,15 @@ namespace osu.Game.Tests.Skins
     [HeadlessTest]
     public class TestSceneSkinConfigurationLookup : OsuTestScene
     {
-        private SkinSource source1;
-        private SkinSource source2;
+        private UserSkinSource userSource;
+        private BeatmapSkinSource beatmapSource;
         private SkinRequester requester;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            Add(new SkinProvidingContainer(source1 = new SkinSource())
-                .WithChild(new SkinProvidingContainer(source2 = new SkinSource())
+            Add(new SkinProvidingContainer(userSource = new UserSkinSource())
+                .WithChild(new SkinProvidingContainer(beatmapSource = new BeatmapSkinSource())
                     .WithChild(requester = new SkinRequester())));
         });
 
@@ -39,8 +43,8 @@ namespace osu.Game.Tests.Skins
         {
             AddStep("Add config values", () =>
             {
-                source1.Configuration.ConfigDictionary["Lookup"] = "source1";
-                source2.Configuration.ConfigDictionary["Lookup"] = "source2";
+                userSource.Configuration.ConfigDictionary["Lookup"] = "source1";
+                beatmapSource.Configuration.ConfigDictionary["Lookup"] = "source2";
             });
 
             AddAssert("Check lookup finds source2", () => requester.GetConfig<string, string>("Lookup")?.Value == "source2");
@@ -49,21 +53,21 @@ namespace osu.Game.Tests.Skins
         [Test]
         public void TestFloatLookup()
         {
-            AddStep("Add config values", () => source1.Configuration.ConfigDictionary["FloatTest"] = "1.1");
+            AddStep("Add config values", () => userSource.Configuration.ConfigDictionary["FloatTest"] = "1.1");
             AddAssert("Check float parse lookup", () => requester.GetConfig<string, float>("FloatTest")?.Value == 1.1f);
         }
 
         [Test]
         public void TestBoolLookup()
         {
-            AddStep("Add config values", () => source1.Configuration.ConfigDictionary["BoolTest"] = "1");
+            AddStep("Add config values", () => userSource.Configuration.ConfigDictionary["BoolTest"] = "1");
             AddAssert("Check bool parse lookup", () => requester.GetConfig<string, bool>("BoolTest")?.Value == true);
         }
 
         [Test]
         public void TestEnumLookup()
         {
-            AddStep("Add config values", () => source1.Configuration.ConfigDictionary["Test"] = "Test2");
+            AddStep("Add config values", () => userSource.Configuration.ConfigDictionary["Test"] = "Test2");
             AddAssert("Check enum parse lookup", () => requester.GetConfig<LookupType, ValueType>(LookupType.Test)?.Value == ValueType.Test2);
         }
 
@@ -76,7 +80,7 @@ namespace osu.Game.Tests.Skins
         [Test]
         public void TestLookupNull()
         {
-            AddStep("Add config values", () => source1.Configuration.ConfigDictionary["Lookup"] = null);
+            AddStep("Add config values", () => userSource.Configuration.ConfigDictionary["Lookup"] = null);
 
             AddAssert("Check lookup null", () =>
             {
@@ -88,7 +92,7 @@ namespace osu.Game.Tests.Skins
         [Test]
         public void TestColourLookup()
         {
-            AddStep("Add config colour", () => source1.Configuration.CustomColours["Lookup"] = Color4.Red);
+            AddStep("Add config colour", () => userSource.Configuration.CustomColours["Lookup"] = Color4.Red);
             AddAssert("Check colour lookup", () => requester.GetConfig<SkinCustomColourLookup, Color4>(new SkinCustomColourLookup("Lookup"))?.Value == Color4.Red);
         }
 
@@ -101,7 +105,7 @@ namespace osu.Game.Tests.Skins
         [Test]
         public void TestWrongColourType()
         {
-            AddStep("Add config colour", () => source1.Configuration.CustomColours["Lookup"] = Color4.Red);
+            AddStep("Add config colour", () => userSource.Configuration.CustomColours["Lookup"] = Color4.Red);
 
             AddAssert("perform incorrect lookup", () =>
             {
@@ -127,26 +131,51 @@ namespace osu.Game.Tests.Skins
         [Test]
         public void TestEmptyComboColoursNoFallback()
         {
-            AddStep("Add custom combo colours to source1", () => source1.Configuration.AddComboColours(
+            AddStep("Add custom combo colours to source1", () => userSource.Configuration.AddComboColours(
                 new Color4(100, 150, 200, 255),
                 new Color4(55, 110, 166, 255),
                 new Color4(75, 125, 175, 255)
             ));
 
-            AddStep("Disallow default colours fallback in source2", () => source2.Configuration.AllowDefaultComboColoursFallback = false);
+            AddStep("Disallow default colours fallback in source2", () => beatmapSource.Configuration.AllowDefaultComboColoursFallback = false);
 
             AddAssert("Check retrieved combo colours from source1", () =>
-                requester.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value?.SequenceEqual(source1.Configuration.ComboColours) ?? false);
+                requester.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value?.SequenceEqual(userSource.Configuration.ComboColours) ?? false);
         }
 
         [Test]
-        public void TestLegacyVersionLookup()
+        public void TestNullBeatmapVersionFallsBackToUserSkin()
         {
-            AddStep("Set source1 version 2.3", () => source1.Configuration.LegacyVersion = 2.3m);
-            AddStep("Set source2 version null", () => source2.Configuration.LegacyVersion = null);
+            AddStep("Set source1 version 2.3", () => userSource.Configuration.LegacyVersion = 2.3m);
+            AddStep("Set source2 version null", () => beatmapSource.Configuration.LegacyVersion = null);
             AddAssert("Check legacy version lookup", () => requester.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value == 2.3m);
         }
 
+        [Test]
+        public void TestSetBeatmapVersionNoFallback()
+        {
+            AddStep("Set source1 version 2.3", () => userSource.Configuration.LegacyVersion = 2.3m);
+            AddStep("Set source2 version null", () => beatmapSource.Configuration.LegacyVersion = 1.7m);
+            AddAssert("Check legacy version lookup", () => requester.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value == 1.7m);
+        }
+
+        [Test]
+        public void TestNullBeatmapAndUserVersionFallsBackToLatest()
+        {
+            AddStep("Set source1 version 2.3", () => userSource.Configuration.LegacyVersion = null);
+            AddStep("Set source2 version null", () => beatmapSource.Configuration.LegacyVersion = null);
+            AddAssert("Check legacy version lookup",
+                () => requester.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value == LegacySkinConfiguration.LATEST_VERSION);
+        }
+
+        [Test]
+        public void TestIniWithNoVersionFallsBackTo1()
+        {
+            AddStep("Parse skin with no version", () => userSource.Configuration = new LegacySkinDecoder().Decode(new LineBufferedReader(new MemoryStream())));
+            AddStep("Set source2 version null", () => beatmapSource.Configuration.LegacyVersion = null);
+            AddAssert("Check legacy version lookup", () => requester.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value == 1.0m);
+        }
+
         public enum LookupType
         {
             Test
@@ -159,14 +188,22 @@ namespace osu.Game.Tests.Skins
             Test3
         }
 
-        public class SkinSource : LegacySkin
+        public class UserSkinSource : LegacySkin
         {
-            public SkinSource()
+            public UserSkinSource()
                 : base(new SkinInfo(), null, null, string.Empty)
             {
             }
         }
 
+        public class BeatmapSkinSource : LegacyBeatmapSkin
+        {
+            public BeatmapSkinSource()
+                : base(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo, null, null)
+            {
+            }
+        }
+
         public class SkinRequester : Drawable, ISkin
         {
             private ISkinSource skin;

From a4208f35c49c55ea1bbe4907d374e17a497cde30 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Apr 2020 19:36:04 +0900
Subject: [PATCH 01981/10326] Make versionless skins fallback to version 1.0

---
 osu.Game.Tests/Skins/LegacySkinDecoderTest.cs |  2 +-
 osu.Game/Skinning/LegacyBeatmapSkin.cs        | 15 +++++++++++++++
 osu.Game/Skinning/LegacySkin.cs               |  7 ++-----
 osu.Game/Skinning/LegacySkinDecoder.cs        |  7 +++++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
index cef38bbbb8..aedf26ee75 100644
--- a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Tests.Skins
             var decoder = new LegacySkinDecoder();
             using (var resStream = TestResources.OpenResource("skin-empty.ini"))
             using (var stream = new LineBufferedReader(resStream))
-                Assert.IsNull(decoder.Decode(stream).LegacyVersion);
+                Assert.That(decoder.Decode(stream).LegacyVersion, Is.EqualTo(1.0m));
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 1c39fc41bb..1190a330fe 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.IO.Stores;
 using osu.Game.Beatmaps;
 
@@ -18,6 +19,20 @@ namespace osu.Game.Skinning
             Configuration.AllowDefaultComboColoursFallback = false;
         }
 
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
+        {
+            switch (lookup)
+            {
+                case LegacySkinConfiguration.LegacySetting s when s == LegacySkinConfiguration.LegacySetting.Version:
+                    if (Configuration.LegacyVersion is decimal version)
+                        return SkinUtils.As<TValue>(new Bindable<decimal>(version));
+
+                    return null;
+            }
+
+            return base.GetConfig<TLookup, TValue>(lookup);
+        }
+
         private static SkinInfo createSkinInfo(BeatmapInfo beatmap) =>
             new SkinInfo { Name = beatmap.ToString(), Creator = beatmap.Metadata.Author.ToString() };
     }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 3d3eac97f6..a68ae11288 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Skinning
                     }
                 }
                 else
-                    Configuration = new LegacySkinConfiguration { LegacyVersion = LegacySkinConfiguration.LATEST_VERSION };
+                    Configuration = new LegacySkinConfiguration();
             }
 
             if (storage != null)
@@ -122,10 +122,7 @@ namespace osu.Game.Skinning
                     switch (legacy)
                     {
                         case LegacySkinConfiguration.LegacySetting.Version:
-                            if (Configuration.LegacyVersion is decimal version)
-                                return SkinUtils.As<TValue>(new Bindable<decimal>(version));
-
-                            break;
+                            return SkinUtils.As<TValue>(new Bindable<decimal>(Configuration.LegacyVersion ?? LegacySkinConfiguration.LATEST_VERSION));
                     }
 
                     break;
diff --git a/osu.Game/Skinning/LegacySkinDecoder.cs b/osu.Game/Skinning/LegacySkinDecoder.cs
index 88ba7b23b7..5d4b8de7ac 100644
--- a/osu.Game/Skinning/LegacySkinDecoder.cs
+++ b/osu.Game/Skinning/LegacySkinDecoder.cs
@@ -52,5 +52,12 @@ namespace osu.Game.Skinning
 
             base.ParseLine(skin, section, line);
         }
+
+        protected override LegacySkinConfiguration CreateTemplateObject()
+        {
+            var config = base.CreateTemplateObject();
+            config.LegacyVersion = 1.0m;
+            return config;
+        }
     }
 }

From 00f390c850e31f86c3fbe5df759524bfb9e4bb5e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Apr 2020 20:13:53 +0900
Subject: [PATCH 01982/10326] 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 77365b51a9..161a15fa4e 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.403.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.406.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8d31fbf280..84c3c0ec8d 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.Framework" Version="2020.403.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.406.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index e2b98720be..7a894facce 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.Framework.iOS" Version="2020.403.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.406.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -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.403.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.406.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 9ed0560da30f8af0f729b48395316899fe3e413b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:37:56 +0000
Subject: [PATCH 01983/10326] Bump SharpCompress from 0.24.0 to 0.25.0

Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.24.0 to 0.25.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.24...0.25)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 84c3c0ec8d..c62aec7250 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="ppy.osu.Framework" Version="2020.406.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
-    <PackageReference Include="SharpCompress" Version="0.24.0" />
+    <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index 7a894facce..834c0ee956 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -80,7 +80,7 @@
     <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.406.0" />
-    <PackageReference Include="SharpCompress" Version="0.24.0" />
+    <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From 678ac0f9e1f7e3a5378aa65386ee7cc428d11825 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 12:08:26 +0000
Subject: [PATCH 01984/10326] Bump Microsoft.Build.Traversal from 2.0.32 to
 2.0.34

Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.32 to 2.0.34.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.0.32...Microsoft.Build.Traversal.2.0.34)

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

diff --git a/global.json b/global.json
index 0223dc7330..6c793a3f1d 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,6 @@
     "version": "3.1.100"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "2.0.32"
+    "Microsoft.Build.Traversal": "2.0.34"
   }
 }
\ No newline at end of file

From b7308f5ed479623e67150e9886450436617410d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Apr 2020 00:26:38 +0900
Subject: [PATCH 01985/10326] Fix storyboard videos being offset incorrectly

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index 2e7b66ea4f..a85936edf7 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -46,7 +46,6 @@ namespace osu.Game.Storyboards.Drawables
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Alpha = 0,
-                PlaybackPosition = Video.StartTime
             };
         }
 
@@ -56,6 +55,8 @@ namespace osu.Game.Storyboards.Drawables
 
             if (video == null) return;
 
+            video.PlaybackPosition = Clock.CurrentTime - Video.StartTime;
+
             using (video.BeginAbsoluteSequence(0))
                 video.FadeIn(500);
         }

From 5dfa2a2bad5121104a5ada46c148c6bb139ebd6c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 11:50:40 +0900
Subject: [PATCH 01986/10326] Fix step namings

---
 .../Skins/TestSceneSkinConfigurationLookup.cs | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index 9c1a6a1346..685decf097 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -43,11 +43,11 @@ namespace osu.Game.Tests.Skins
         {
             AddStep("Add config values", () =>
             {
-                userSource.Configuration.ConfigDictionary["Lookup"] = "source1";
-                beatmapSource.Configuration.ConfigDictionary["Lookup"] = "source2";
+                userSource.Configuration.ConfigDictionary["Lookup"] = "user skin";
+                beatmapSource.Configuration.ConfigDictionary["Lookup"] = "beatmap skin";
             });
 
-            AddAssert("Check lookup finds source2", () => requester.GetConfig<string, string>("Lookup")?.Value == "source2");
+            AddAssert("Check lookup finds beatmap skin", () => requester.GetConfig<string, string>("Lookup")?.Value == "beatmap skin");
         }
 
         [Test]
@@ -131,39 +131,39 @@ namespace osu.Game.Tests.Skins
         [Test]
         public void TestEmptyComboColoursNoFallback()
         {
-            AddStep("Add custom combo colours to source1", () => userSource.Configuration.AddComboColours(
+            AddStep("Add custom combo colours to user skin", () => userSource.Configuration.AddComboColours(
                 new Color4(100, 150, 200, 255),
                 new Color4(55, 110, 166, 255),
                 new Color4(75, 125, 175, 255)
             ));
 
-            AddStep("Disallow default colours fallback in source2", () => beatmapSource.Configuration.AllowDefaultComboColoursFallback = false);
+            AddStep("Disallow default colours fallback in beatmap skin", () => beatmapSource.Configuration.AllowDefaultComboColoursFallback = false);
 
-            AddAssert("Check retrieved combo colours from source1", () =>
+            AddAssert("Check retrieved combo colours from user skin", () =>
                 requester.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value?.SequenceEqual(userSource.Configuration.ComboColours) ?? false);
         }
 
         [Test]
         public void TestNullBeatmapVersionFallsBackToUserSkin()
         {
-            AddStep("Set source1 version 2.3", () => userSource.Configuration.LegacyVersion = 2.3m);
-            AddStep("Set source2 version null", () => beatmapSource.Configuration.LegacyVersion = null);
+            AddStep("Set user skin version 2.3", () => userSource.Configuration.LegacyVersion = 2.3m);
+            AddStep("Set beatmap skin version null", () => beatmapSource.Configuration.LegacyVersion = null);
             AddAssert("Check legacy version lookup", () => requester.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value == 2.3m);
         }
 
         [Test]
         public void TestSetBeatmapVersionNoFallback()
         {
-            AddStep("Set source1 version 2.3", () => userSource.Configuration.LegacyVersion = 2.3m);
-            AddStep("Set source2 version null", () => beatmapSource.Configuration.LegacyVersion = 1.7m);
+            AddStep("Set user skin version 2.3", () => userSource.Configuration.LegacyVersion = 2.3m);
+            AddStep("Set beatmap skin version null", () => beatmapSource.Configuration.LegacyVersion = 1.7m);
             AddAssert("Check legacy version lookup", () => requester.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value == 1.7m);
         }
 
         [Test]
         public void TestNullBeatmapAndUserVersionFallsBackToLatest()
         {
-            AddStep("Set source1 version 2.3", () => userSource.Configuration.LegacyVersion = null);
-            AddStep("Set source2 version null", () => beatmapSource.Configuration.LegacyVersion = null);
+            AddStep("Set user skin version 2.3", () => userSource.Configuration.LegacyVersion = null);
+            AddStep("Set beatmap skin version null", () => beatmapSource.Configuration.LegacyVersion = null);
             AddAssert("Check legacy version lookup",
                 () => requester.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value == LegacySkinConfiguration.LATEST_VERSION);
         }
@@ -172,7 +172,7 @@ namespace osu.Game.Tests.Skins
         public void TestIniWithNoVersionFallsBackTo1()
         {
             AddStep("Parse skin with no version", () => userSource.Configuration = new LegacySkinDecoder().Decode(new LineBufferedReader(new MemoryStream())));
-            AddStep("Set source2 version null", () => beatmapSource.Configuration.LegacyVersion = null);
+            AddStep("Set beatmap skin version null", () => beatmapSource.Configuration.LegacyVersion = null);
             AddAssert("Check legacy version lookup", () => requester.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value == 1.0m);
         }
 

From 8506029237cc57cb8f5b9f457daf5185eb271325 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Apr 2020 13:46:37 +0900
Subject: [PATCH 01987/10326] Fix SkinnableTestScene losing test resources on
 dynamic recompilation

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index d0113b3096..71d3266d18 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Tests.Visual
         private Skin specialSkin;
         private Skin oldSkin;
 
+        // Keep a static reference to ensure we don't use a dynamically recompiled DLL as a source (resources will be missing).
+        private static DllResourceStore dllStore;
+
         protected SkinnableTestScene()
             : base(2, 3)
         {
@@ -34,7 +37,7 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SkinManager skinManager)
         {
-            var dllStore = new DllResourceStore(GetType().Assembly);
+            dllStore ??= new DllResourceStore(GetType().Assembly);
 
             metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
             defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);

From c46ea7bdef8a42c0f06a8920e60df8a6a4d8dea5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 14:49:24 +0900
Subject: [PATCH 01988/10326] Add disposal, prevent memory leaks

---
 osu.Game/Online/Leaderboards/TopLocalRank.cs | 30 +++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/TopLocalRank.cs b/osu.Game/Online/Leaderboards/TopLocalRank.cs
index be014dafc3..f355a907af 100644
--- a/osu.Game/Online/Leaderboards/TopLocalRank.cs
+++ b/osu.Game/Online/Leaderboards/TopLocalRank.cs
@@ -15,9 +15,14 @@ namespace osu.Game.Online.Leaderboards
     {
         private readonly BeatmapInfo beatmap;
 
-        private ScoreManager scores;
-        private IBindable<RulesetInfo> ruleset;
-        private IAPIProvider api;
+        [Resolved]
+        private ScoreManager scores { get; set; }
+
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
 
         protected override double LoadDelay => 250;
 
@@ -28,25 +33,19 @@ namespace osu.Game.Online.Leaderboards
         }
 
         [BackgroundDependencyLoader]
-        private void load(ScoreManager scores, IBindable<RulesetInfo> ruleset, IAPIProvider api)
+        private void load()
         {
             scores.ItemAdded += scoreChanged;
             scores.ItemRemoved += scoreChanged;
             ruleset.ValueChanged += _ => fetchAndLoadTopScore();
 
-            this.ruleset = ruleset.GetBoundCopy();
-            this.scores = scores;
-            this.api = api;
-
             fetchAndLoadTopScore();
         }
 
         private void scoreChanged(ScoreInfo score)
         {
             if (score.BeatmapInfoID == beatmap.ID)
-            {
                 fetchAndLoadTopScore();
-            }
         }
 
         private void fetchAndLoadTopScore()
@@ -79,5 +78,16 @@ namespace osu.Game.Online.Leaderboards
                          .OrderByDescending(s => s.TotalScore)
                          .FirstOrDefault();
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (scores != null)
+            {
+                scores.ItemAdded -= scoreChanged;
+                scores.ItemRemoved -= scoreChanged;
+            }
+        }
     }
 }

From 933314d724169677f5ec39a071dc009134d8b355 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 14:50:11 +0900
Subject: [PATCH 01989/10326] Remove unnecessary method

---
 osu.Game/Online/Leaderboards/TopLocalRank.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/TopLocalRank.cs b/osu.Game/Online/Leaderboards/TopLocalRank.cs
index f355a907af..3e77549851 100644
--- a/osu.Game/Online/Leaderboards/TopLocalRank.cs
+++ b/osu.Game/Online/Leaderboards/TopLocalRank.cs
@@ -50,14 +50,7 @@ namespace osu.Game.Online.Leaderboards
 
         private void fetchAndLoadTopScore()
         {
-            var score = fetchTopScore();
-
-            loadTopScore(score);
-        }
-
-        private void loadTopScore(ScoreInfo score)
-        {
-            var rank = score?.Rank;
+            var rank = fetchTopScore()?.Rank;
 
             // toggle the display of this drawable
             // we do not want empty space if there is no rank to be displayed

From ed17a1c99016cfd1668d2e8be9158a95ea3bcf7e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 15:30:06 +0900
Subject: [PATCH 01990/10326] Improve visual display

---
 osu.Game/Online/Leaderboards/TopLocalRank.cs | 23 +++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/TopLocalRank.cs b/osu.Game/Online/Leaderboards/TopLocalRank.cs
index 3e77549851..345e8cb221 100644
--- a/osu.Game/Online/Leaderboards/TopLocalRank.cs
+++ b/osu.Game/Online/Leaderboards/TopLocalRank.cs
@@ -4,6 +4,8 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Rulesets;
@@ -24,8 +26,6 @@ namespace osu.Game.Online.Leaderboards
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        protected override double LoadDelay => 250;
-
         public TopLocalRank(BeatmapInfo beatmap)
             : base(null)
         {
@@ -48,20 +48,23 @@ namespace osu.Game.Online.Leaderboards
                 fetchAndLoadTopScore();
         }
 
+        private ScheduledDelegate scheduledRankUpdate;
+
         private void fetchAndLoadTopScore()
         {
             var rank = fetchTopScore()?.Rank;
+            scheduledRankUpdate = Schedule(() =>
+            {
+                Rank = rank;
 
-            // toggle the display of this drawable
-            // we do not want empty space if there is no rank to be displayed
-            if (rank.HasValue)
-                Show();
-            else
-                Hide();
-
-            Schedule(() => Rank = rank);
+                // Required since presence is changed via IsPresent override
+                Invalidate(Invalidation.Presence);
+            });
         }
 
+        // We're present if a rank is set, or if there is a pending rank update (IsPresent = true is required for the scheduler to run).
+        public override bool IsPresent => base.IsPresent && (Rank != null || scheduledRankUpdate?.Completed == false);
+
         private ScoreInfo fetchTopScore()
         {
             if (scores == null || beatmap == null || ruleset?.Value == null || api?.LocalUser.Value == null)

From ed3e0a01e162720cf3c40482085f11cd1263179f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 15:31:22 +0900
Subject: [PATCH 01991/10326] Re-namespace into song select

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs    | 1 -
 .../Leaderboards => Screens/Select/Carousel}/TopLocalRank.cs   | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game/{Online/Leaderboards => Screens/Select/Carousel}/TopLocalRank.cs (97%)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 5357f9a652..2520c70989 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -19,7 +19,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game/Online/Leaderboards/TopLocalRank.cs b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
similarity index 97%
rename from osu.Game/Online/Leaderboards/TopLocalRank.cs
rename to osu.Game/Screens/Select/Carousel/TopLocalRank.cs
index 345e8cb221..e981550c84 100644
--- a/osu.Game/Online/Leaderboards/TopLocalRank.cs
+++ b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
@@ -8,10 +8,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
+using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
 
-namespace osu.Game.Online.Leaderboards
+namespace osu.Game.Screens.Select.Carousel
 {
     public class TopLocalRank : UpdateableRank
     {

From 3ecb99462fce3ac20e5e3aefd5bc909de6c99a81 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 16:07:18 +0900
Subject: [PATCH 01992/10326] Make note height scale by minimum column width

---
 osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs    | 10 ++++++++--
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs      |  9 +++++++++
 .../Skinning/LegacyManiaSkinConfigurationLookup.cs     |  3 ++-
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs            |  4 ++++
 osu.Game/Skinning/LegacySkin.cs                        |  3 +++
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
index d2ceb06d0b..85523ae3c0 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private Container directionContainer;
         private Sprite noteSprite;
 
+        private float? minimumColumnWidth;
+
         public LegacyNotePiece()
         {
             RelativeSizeAxes = Axes.X;
@@ -29,6 +31,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
+            minimumColumnWidth = skin.GetConfig<ManiaSkinConfigurationLookup, float>(new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.MinimumColumnWidth))?.Value;
+
             InternalChild = directionContainer = new Container
             {
                 Origin = Anchor.BottomCentre,
@@ -47,8 +51,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             if (noteSprite.Texture != null)
             {
-                var scale = DrawWidth / noteSprite.Texture.DisplayWidth;
-                noteSprite.Scale = new Vector2(scale);
+                // The height is scaled to the minimum column width, if provided.
+                float minimumWidth = minimumColumnWidth ?? DrawWidth;
+
+                noteSprite.Scale = Vector2.Divide(new Vector2(DrawWidth, minimumWidth), noteSprite.Texture.DisplayWidth);
             }
         }
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index ac257b8c80..08b3b8ff5a 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Beatmaps.Formats;
 using osuTK.Graphics;
 
@@ -45,5 +46,13 @@ namespace osu.Game.Skinning
             ColumnLineWidth.AsSpan().Fill(2);
             ColumnWidth.AsSpan().Fill(DEFAULT_COLUMN_SIZE);
         }
+
+        private float? minimumColumnWidth;
+
+        public float MinimumColumnWidth
+        {
+            get => minimumColumnWidth ?? ColumnWidth.Min();
+            set => minimumColumnWidth = value;
+        }
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 853d07c060..588e9e3ee2 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -36,6 +36,7 @@ namespace osu.Game.Skinning
         HoldNoteBodyImage,
         ExplosionImage,
         ExplosionScale,
-        ColumnLineColour
+        ColumnLineColour,
+        MinimumColumnWidth
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index eb90225d1c..4fe36c2239 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -106,6 +106,10 @@ namespace osu.Game.Skinning
                     case "LightingNWidth":
                         parseArrayValue(pair.Value, currentConfig.ExplosionWidth);
                         break;
+
+                    case "WidthForNoteHeightScale":
+                        currentConfig.MinimumColumnWidth = float.Parse(pair.Value, CultureInfo.InvariantCulture) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
+                        break;
                 }
             }
 
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 3d3eac97f6..d5ef5220cf 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -207,6 +207,9 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.ColumnLineColour:
                     return SkinUtils.As<TValue>(getCustomColour(existing, "ColourColumnLine"));
+
+                case LegacyManiaSkinConfigurationLookups.MinimumColumnWidth:
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.MinimumColumnWidth));
             }
 
             return null;

From 2c840c52a3dfe841e4e77dcf6b4579e9165c65a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Apr 2020 15:38:29 +0900
Subject: [PATCH 01993/10326] Add skinnable test scene per ruleset to better
 allow dynamic compilation

---
 .../CatchSkinnableTestScene.cs                | 19 +++++++++++++++++
 .../TestSceneCatcher.cs                       |  8 +++----
 .../TestSceneCatcherArea.cs                   |  3 +--
 .../TestSceneFruitObjects.cs                  |  8 +++----
 .../Skinning/ManiaSkinnableTestScene.cs       |  9 ++++++++
 .../OsuSkinnableTestScene.cs                  | 19 +++++++++++++++++
 .../TestSceneDrawableJudgement.cs             |  7 +++----
 .../TestSceneGameplayCursor.cs                | 14 +++++++++----
 .../TestSceneHitCircle.cs                     |  3 +--
 .../TestSceneSlider.cs                        |  3 +--
 .../TaikoSkinnableTestScene.cs                | 21 +++++++++++++++++++
 .../TestSceneInputDrum.cs                     | 10 +++++----
 12 files changed, 98 insertions(+), 26 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
 create mode 100644 osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
new file mode 100644
index 0000000000..f7f1a8d58f
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.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;
+using System.Collections.Generic;
+using osu.Game.Rulesets.Catch.Skinning;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public abstract class CatchSkinnableTestScene : SkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(CatchRuleset),
+            typeof(CatchLegacySkinTransformer),
+        };
+    }
+}
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index fe0d512166..acc5f4e428 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -4,21 +4,21 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Tests.Visual;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatcher : SkinnableTestScene
+    public class TestSceneCatcher : CatchSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
         {
             typeof(CatcherArea),
             typeof(CatcherSprite)
-        };
+        }).ToList();
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index cf68c5424d..2b30edb70b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -17,12 +17,11 @@ 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
 {
     [TestFixture]
-    public class TestSceneCatcherArea : SkinnableTestScene
+    public class TestSceneCatcherArea : CatchSkinnableTestScene
     {
         private RulesetInfo catchRuleset;
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 82d5aa936f..cd674bb754 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -3,20 +3,20 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
-using osu.Game.Tests.Visual;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneFruitObjects : SkinnableTestScene
+    public class TestSceneFruitObjects : CatchSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
         {
             typeof(CatchHitObject),
             typeof(Fruit),
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(DrawableBanana),
             typeof(DrawableBananaShower),
             typeof(Pulp),
-        };
+        }).ToList();
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index eaa2a56e36..009e609c56 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.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;
+using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osu.Game.Tests.Visual;
@@ -24,6 +27,12 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ManiaRuleset),
+            typeof(ManiaLegacySkinTransformer),
+        };
+
         protected ManiaSkinnableTestScene()
         {
             scrollingInfo.Direction.Value = ScrollingDirection.Down;
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
new file mode 100644
index 0000000000..929ce5dcc0
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.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;
+using System.Collections.Generic;
+using osu.Game.Rulesets.Osu.Skinning;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public abstract class OsuSkinnableTestScene : SkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OsuRuleset),
+            typeof(OsuLegacySkinTransformer),
+        };
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index 02d4406809..f867630df6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -10,17 +10,16 @@ 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
 {
-    public class TestSceneDrawableJudgement : SkinnableTestScene
+    public class TestSceneDrawableJudgement : OsuSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
         {
             typeof(DrawableJudgement),
             typeof(DrawableOsuJudgement)
-        };
+        }).ToList();
 
         public TestSceneDrawableJudgement()
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index 7b96e2ec6a..22dacc6f5e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -3,26 +3,32 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 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.Skinning;
 using osu.Game.Rulesets.Osu.UI.Cursor;
+using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
-using osu.Game.Tests.Visual;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestSceneGameplayCursor : SkinnableTestScene
+    public class TestSceneGameplayCursor : OsuSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
         {
+            typeof(GameplayCursorContainer),
             typeof(OsuCursorContainer),
+            typeof(OsuCursor),
+            typeof(LegacyCursor),
+            typeof(LegacyCursorTrail),
             typeof(CursorTrail)
-        };
+        }).ToList();
 
         [Cached]
         private GameplayBeatmap gameplayBeatmap;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index ae5a28217c..e117729f01 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -14,12 +14,11 @@ 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
 {
     [TestFixture]
-    public class TestSceneHitCircle : SkinnableTestScene
+    public class TestSceneHitCircle : OsuSkinnableTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index a201364de4..eb6130c8a6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -22,12 +22,11 @@ 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
 {
     [TestFixture]
-    public class TestSceneSlider : SkinnableTestScene
+    public class TestSceneSlider : OsuSkinnableTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs
new file mode 100644
index 0000000000..6db2a6907f
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.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;
+using System.Collections.Generic;
+using osu.Game.Rulesets.Taiko.Skinning;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public abstract class TaikoSkinnableTestScene : SkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(TaikoRuleset),
+            typeof(TaikoLegacySkinTransformer),
+        };
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new TaikoRuleset();
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs
index c79088056f..1928e9f66f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs
@@ -3,24 +3,26 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.Taiko.UI;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
-    public class TestSceneInputDrum : SkinnableTestScene
+    public class TestSceneInputDrum : TaikoSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
         {
             typeof(InputDrum),
-        };
+            typeof(LegacyInputDrum),
+        }).ToList();
 
         [BackgroundDependencyLoader]
         private void load()

From 0a340bac5a48abce060e0ee88b9ed86a3bd9c5c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Apr 2020 16:18:24 +0900
Subject: [PATCH 01994/10326] Ensure the correct (up-to-date) ruleset is
 retrieved

---
 osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs    | 2 ++
 .../Skinning/ManiaSkinnableTestScene.cs                     | 2 ++
 osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs        | 2 ++
 osu.Game/Tests/Visual/SkinnableTestScene.cs                 | 6 +++++-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
index f7f1a8d58f..0c46b078b5 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
@@ -15,5 +15,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(CatchRuleset),
             typeof(CatchLegacySkinTransformer),
         };
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new CatchRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 009e609c56..7f0503913f 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             typeof(ManiaLegacySkinTransformer),
         };
 
+        protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
+
         protected ManiaSkinnableTestScene()
         {
             scrollingInfo.Direction.Value = ScrollingDirection.Down;
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
index 929ce5dcc0..90ebbd9f04 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
@@ -15,5 +15,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             typeof(OsuRuleset),
             typeof(OsuLegacySkinTransformer),
         };
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
     }
 }
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 71d3266d18..50cc5b6c5c 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -34,6 +35,9 @@ namespace osu.Game.Tests.Visual
         {
         }
 
+        // Required to be part of the per-ruleset implementation to construct the newer version of the Ruleset.
+        protected abstract Ruleset CreateRulesetForSkinProvider();
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SkinManager skinManager)
         {
@@ -106,7 +110,7 @@ namespace osu.Game.Tests.Visual
                         {
                             new OutlineBox { Alpha = autoSize ? 1 : 0 },
                             mainProvider.WithChild(
-                                new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider, beatmap))
+                                new SkinProvidingContainer(CreateRulesetForSkinProvider().CreateLegacySkinProvider(mainProvider, beatmap))
                                 {
                                     Child = created,
                                     RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,

From 9071bf5cbb72bdc02bffd822620ddfa19efc75c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Apr 2020 16:18:34 +0900
Subject: [PATCH 01995/10326] Fix mania test scene not using mania skinnable
 test scene

---
 .../Skinning/TestSceneDrawableJudgement.cs                     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
index a6bc64550f..6ab8a68176 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
@@ -10,11 +10,10 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
-    public class TestSceneDrawableJudgement : SkinnableTestScene
+    public class TestSceneDrawableJudgement : ManiaSkinnableTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

From 9cfeb60afc96f1dbdb9abc6a026cad59436aebd9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 16:30:58 +0900
Subject: [PATCH 01996/10326] Fix missed speed removal in mania

---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index c8c537964f..14cad39b04 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -64,6 +64,7 @@ namespace osu.Game.Rulesets.Mania.UI
             {
                 // Mania doesn't care about global velocity
                 p.Velocity = 1;
+                p.BaseBeatLength *= Beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier;
 
                 // For non-mania beatmap, speed changes should only happen through timing points
                 if (!isForCurrentRuleset)

From 9fd73492ca7c354668699620744d22bfdc0f36e4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 16:50:08 +0900
Subject: [PATCH 01997/10326] Implement judgement line colour

---
 osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs     | 5 +++++
 osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs | 3 ++-
 osu.Game/Skinning/LegacySkin.cs                         | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index 53e4f3cd14..40752d3f4b 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
@@ -33,6 +34,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
             bool showJudgementLine = GetManiaSkinConfig<bool>(skin, LegacyManiaSkinConfigurationLookups.ShowJudgementLine)?.Value
                                      ?? true;
 
+            Color4 lineColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.JudgementLineColour)?.Value
+                                ?? Color4.White;
+
             InternalChild = directionContainer = new Container
             {
                 Origin = Anchor.CentreLeft,
@@ -52,6 +56,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                         Anchor = Anchor.CentreLeft,
                         RelativeSizeAxes = Axes.X,
                         Height = 1,
+                        Colour = lineColour,
                         Alpha = showJudgementLine ? 0.9f : 0
                     }
                 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 853d07c060..ee5db2a77f 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -36,6 +36,7 @@ namespace osu.Game.Skinning
         HoldNoteBodyImage,
         ExplosionImage,
         ExplosionScale,
-        ColumnLineColour
+        ColumnLineColour,
+        JudgementLineColour,
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 3d3eac97f6..f206bc792d 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -207,6 +207,9 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.ColumnLineColour:
                     return SkinUtils.As<TValue>(getCustomColour(existing, "ColourColumnLine"));
+
+                case LegacyManiaSkinConfigurationLookups.JudgementLineColour:
+                    return SkinUtils.As<TValue>(getCustomColour(existing, "ColourJudgementLine"));
             }
 
             return null;

From 11d58fb7f61ccfd17bd96d080886cd2853feeb53 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 16:53:29 +0900
Subject: [PATCH 01998/10326] Implement column background and light colours

---
 .../Skinning/LegacyColumnBackground.cs                |  9 ++++++++-
 .../Skinning/LegacyManiaSkinConfigurationLookup.cs    |  2 ++
 osu.Game/Skinning/LegacySkin.cs                       | 11 ++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 8cd0272b52..6504321bb2 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -50,12 +50,18 @@ namespace osu.Game.Rulesets.Mania.Skinning
             Color4 lineColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLineColour)?.Value
                                 ?? Color4.White;
 
+            Color4 backgroundColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour)?.Value
+                                      ?? Color4.Black;
+
+            Color4 lightColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
+                                 ?? Color4.White;
+
             InternalChildren = new Drawable[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black
+                    Colour = backgroundColour
                 },
                 new Box
                 {
@@ -82,6 +88,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     {
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
+                        Colour = lightColour,
                         Texture = skin.GetTexture(lightImage),
                         RelativeSizeAxes = Axes.X,
                         Width = 1,
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index ee5db2a77f..7d3614bf83 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -38,5 +38,7 @@ namespace osu.Game.Skinning
         ExplosionScale,
         ColumnLineColour,
         JudgementLineColour,
+        ColumnBackgroundColour,
+        ColumnLightColour
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index f206bc792d..f1a911e652 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -88,7 +88,8 @@ namespace osu.Game.Skinning
 
             // todo: this shouldn't really be duplicated here (from ManiaLegacySkinTransformer). we need to come up with a better solution.
             hasKeyTexture = new Lazy<bool>(() => this.GetAnimation(
-                lookupForMania<string>(new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value ?? "mania-key1", true, true) != null);
+                lookupForMania<string>(new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value ?? "mania-key1", true,
+                true) != null);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -210,6 +211,14 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.JudgementLineColour:
                     return SkinUtils.As<TValue>(getCustomColour(existing, "ColourJudgementLine"));
+
+                case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(getCustomColour(existing, $"Colour{maniaLookup.TargetColumn}"));
+
+                case LegacyManiaSkinConfigurationLookups.ColumnLightColour:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(getCustomColour(existing, $"ColourLight{maniaLookup.TargetColumn}"));
             }
 
             return null;

From 2568f3f5886fd537c52ca0877d7edd51dd1d08b1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 17:11:32 +0900
Subject: [PATCH 01999/10326] Fix off-by-one indexing

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

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index f1a911e652..9e0f4007a1 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -214,11 +214,11 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
                     Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(getCustomColour(existing, $"Colour{maniaLookup.TargetColumn}"));
+                    return SkinUtils.As<TValue>(getCustomColour(existing, $"Colour{maniaLookup.TargetColumn + 1}"));
 
                 case LegacyManiaSkinConfigurationLookups.ColumnLightColour:
                     Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(getCustomColour(existing, $"ColourLight{maniaLookup.TargetColumn}"));
+                    return SkinUtils.As<TValue>(getCustomColour(existing, $"ColourLight{maniaLookup.TargetColumn + 1}"));
             }
 
             return null;

From ccc764eace14444e4421d83eb4ee1c842f46f2f1 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:39:41 +0800
Subject: [PATCH 02000/10326] =?UTF-8?q?Added=20=E2=80=9Cinstant=20fly?=
 =?UTF-8?q?=E2=80=9D=20variant=20of=20hit=20notes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Objects/Drawables/DrawableCentreHit.cs      | 17 +++++++++++++++++
 .../Objects/Drawables/DrawableRimHit.cs         | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 4979135f50..08df05e719 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -2,7 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -23,4 +26,18 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             MainPiece.AccentColour = colours.PinkDarker;
         }
     }
+
+    public class DrawableFlyingCentreHit : DrawableCentreHit
+    {
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            ApplyResult(r => r.Type = HitResult.Good);
+        }
+
+        public DrawableFlyingCentreHit(double time)
+            : base(new Hit { StartTime = time })
+        {
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+        }
+    }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index 5a12d71cea..0c2c9fbdef 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -2,7 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -23,4 +26,18 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             MainPiece.AccentColour = colours.BlueDarker;
         }
     }
+
+    public class DrawableFlyingRimHit : DrawableRimHit
+    {
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            ApplyResult(r => r.Type = HitResult.Good);
+        }
+
+        public DrawableFlyingRimHit(double time)
+            : base(new Hit { StartTime = time })
+        {
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+        }
+    }
 }

From 2705de70a206ad71d8db84d70c4af6cbd259b4ca Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:40:01 +0800
Subject: [PATCH 02001/10326] Added arbitrary hit handler to drum roll object

---
 .../Objects/Drawables/DrawableDrumRoll.cs     | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 5806c90115..3e7b6dfd31 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -34,6 +34,14 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private Color4 colourIdle;
         private Color4 colourEngaged;
 
+        private bool judgingStarted;
+
+        /// <summary>
+        /// A handler action for when the drumroll has been hit,
+        /// regardless of any judgement.
+        /// </summary>
+        public Action<TaikoAction> OnHit;
+
         public DrawableDrumRoll(DrumRoll drumRoll)
             : base(drumRoll)
         {
@@ -86,15 +94,27 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece();
 
-        public override bool OnPressed(TaikoAction action) => false;
+        public override bool OnPressed(TaikoAction action)
+        {
+            if (judgingStarted)
+                OnHit.Invoke(action);
+
+            return false;
+        }
 
         private void onNewResult(DrawableHitObject obj, JudgementResult result)
         {
             if (!(obj is DrawableDrumRollTick))
                 return;
 
+            DrawableDrumRollTick drumRollTick = (DrawableDrumRollTick)obj;
+
             if (result.Type > HitResult.Miss)
+            {
+                OnHit.Invoke(drumRollTick.JudgedAction);
+                judgingStarted = true;
                 rollingHits++;
+            }
             else
                 rollingHits--;
 
@@ -113,8 +133,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 return;
 
             int countHit = NestedHitObjects.Count(o => o.IsHit);
+
             if (countHit >= HitObject.RequiredGoodHits)
+            {
                 ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Good);
+            }
             else
                 ApplyResult(r => r.Type = HitResult.Miss);
         }

From 7c3c198212d70205ee4897eafc7cff815e55c929 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:40:18 +0800
Subject: [PATCH 02002/10326] Added judgement forwarder to drumroll tick object

---
 .../Objects/Drawables/DrawableDrumRollTick.cs        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index 25b6141a0e..9961cb6ea2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -11,6 +11,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     public class DrawableDrumRollTick : DrawableTaikoHitObject<DrumRollTick>
     {
+        /// <summary>
+        /// The action type that the user took which caused this tick to
+        /// have been judged as "hit"
+        /// </summary>
+        public TaikoAction JudgedAction;
+
         public DrawableDrumRollTick(DrumRollTick tick)
             : base(tick)
         {
@@ -49,7 +55,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        public override bool OnPressed(TaikoAction action) => UpdateResult(true);
+        public override bool OnPressed(TaikoAction action)
+        {
+            JudgedAction = action;
+            return UpdateResult(true);
+        }
 
         protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
 

From 3fec213c928db64bb7dcb07bf6b468fb9d9e39c8 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:40:32 +0800
Subject: [PATCH 02003/10326] Added separate scrolling track to display drum
 roll notes

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index bde9085c23..b32e7b53da 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private readonly Container<HitExplosion> hitExplosionContainer;
         private readonly Container<KiaiHitExplosion> kiaiExplosionContainer;
         private readonly JudgementContainer<DrawableTaikoJudgement> judgementContainer;
+        private readonly ScrollingHitObjectContainer drumRollHitContainer;
         internal readonly HitTarget HitTarget;
 
         private readonly ProxyContainer topLevelHitContainer;
@@ -135,6 +136,14 @@ namespace osu.Game.Rulesets.Taiko.UI
                             Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
                             Blending = BlendingParameters.Additive
                         },
+                        drumRollHitContainer = new ScrollingHitObjectContainer
+                        {
+                            Name = "Drumroll hit",
+                            RelativeSizeAxes = Axes.Both,
+                            FillMode = FillMode.Stretch,
+                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                            Width = 1.0f
+                        }
                     }
                 },
                 overlayBackgroundContainer = new Container
@@ -212,12 +221,28 @@ namespace osu.Game.Rulesets.Taiko.UI
                     barlineContainer.Add(barline.CreateProxy());
                     break;
 
+                case DrawableDrumRoll drumRoll:
+                    drumRoll.OnHit += onDrumrollArbitraryHit;
+                    break;
+
                 case DrawableTaikoHitObject taikoObject:
                     topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
                     break;
             }
         }
 
+        private void onDrumrollArbitraryHit(TaikoAction action)
+        {
+            DrawableHit drawableHit;
+
+            if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
+                drawableHit = new DrawableFlyingRimHit(Time.Current);
+            else
+                drawableHit = new DrawableFlyingCentreHit(Time.Current);
+
+            drumRollHitContainer.Add(drawableHit);
+        }
+
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             if (!DisplayJudgements.Value)

From a1e215888eda520a432e63465e5a6c4c33bc111c Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 17:25:47 +0800
Subject: [PATCH 02004/10326] Added logic to allow strong notes

---
 .../Objects/Drawables/DrawableCentreHit.cs                  | 4 ++--
 .../Objects/Drawables/DrawableDrumRoll.cs                   | 6 +++---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs | 4 ++--
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs                | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 08df05e719..86e885239f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ApplyResult(r => r.Type = HitResult.Good);
         }
 
-        public DrawableFlyingCentreHit(double time)
-            : base(new Hit { StartTime = time })
+        public DrawableFlyingCentreHit(double time, bool isStrong = false)
+            : base(new Hit { StartTime = time, IsStrong = isStrong })
         {
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 3e7b6dfd31..64be870262 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// A handler action for when the drumroll has been hit,
         /// regardless of any judgement.
         /// </summary>
-        public Action<TaikoAction> OnHit;
+        public Action<TaikoAction, bool> OnHit;
 
         public DrawableDrumRoll(DrumRoll drumRoll)
             : base(drumRoll)
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         public override bool OnPressed(TaikoAction action)
         {
             if (judgingStarted)
-                OnHit.Invoke(action);
+                OnHit.Invoke(action, HitObject.IsStrong);
 
             return false;
         }
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             if (result.Type > HitResult.Miss)
             {
-                OnHit.Invoke(drumRollTick.JudgedAction);
+                OnHit.Invoke(drumRollTick.JudgedAction, HitObject.IsStrong);
                 judgingStarted = true;
                 rollingHits++;
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index 0c2c9fbdef..ad9872b21f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ApplyResult(r => r.Type = HitResult.Good);
         }
 
-        public DrawableFlyingRimHit(double time)
-            : base(new Hit { StartTime = time })
+        public DrawableFlyingRimHit(double time, bool isStrong = false)
+            : base(new Hit { StartTime = time, IsStrong = isStrong })
         {
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index b32e7b53da..59cf9193b5 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -231,14 +231,14 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
-        private void onDrumrollArbitraryHit(TaikoAction action)
+        private void onDrumrollArbitraryHit(TaikoAction action, bool isStrong)
         {
             DrawableHit drawableHit;
 
             if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
-                drawableHit = new DrawableFlyingRimHit(Time.Current);
+                drawableHit = new DrawableFlyingRimHit(Time.Current, isStrong);
             else
-                drawableHit = new DrawableFlyingCentreHit(Time.Current);
+                drawableHit = new DrawableFlyingCentreHit(Time.Current, isStrong);
 
             drumRollHitContainer.Add(drawableHit);
         }

From c9872f1d93369601dd5787994772673790a904e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Apr 2020 18:55:03 +0900
Subject: [PATCH 02005/10326] Retrieve dll resources using a more reliable
 method

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 71d3266d18..69e17af01b 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -26,9 +26,6 @@ namespace osu.Game.Tests.Visual
         private Skin specialSkin;
         private Skin oldSkin;
 
-        // Keep a static reference to ensure we don't use a dynamically recompiled DLL as a source (resources will be missing).
-        private static DllResourceStore dllStore;
-
         protected SkinnableTestScene()
             : base(2, 3)
         {
@@ -37,7 +34,7 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SkinManager skinManager)
         {
-            dllStore ??= new DllResourceStore(GetType().Assembly);
+            var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly);
 
             metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
             defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);

From 08308e07e7a1ea594214594400f3cb784936a9a9 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 7 Apr 2020 12:20:54 +0200
Subject: [PATCH 02006/10326] Apply review suggestions

---
 osu.Game/Rulesets/RulesetStore.cs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 7b4c0302aa..ef72f187c3 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -24,12 +24,12 @@ namespace osu.Game.Rulesets
             : base(factory)
         {
             rulesetStorage = storage?.GetStorageForDirectory("rulesets");
-            AppDomain.CurrentDomain.AssemblyResolve += resolveRulesetDependencyAssembly;
 
             // On android in release configuration assemblies are loaded from the apk directly into memory.
             // We cannot read assemblies from cwd, so should check loaded assemblies instead.
             loadFromAppDomain();
             loadFromDisk();
+            AppDomain.CurrentDomain.AssemblyResolve += resolveRulesetDependencyAssembly;
             loadUserRulesets();
             addMissingRulesets();
         }
@@ -57,6 +57,7 @@ namespace osu.Game.Rulesets
         {
             var asm = new AssemblyName(args.Name);
 
+            // the requesting assembly may be located out of the executable's base directory, thus requiring manual resolving of its dependencies.
             // this assumes the only explicit dependency of the ruleset is the game core assembly.
             // the ruleset dependency on the game core assembly requires manual resolving, transient dependencies should be resolved automatically
             if (asm.Name.Equals(typeof(OsuGame).Assembly.GetName().Name, StringComparison.Ordinal))
@@ -137,17 +138,10 @@ namespace osu.Game.Rulesets
 
         private void loadUserRulesets()
         {
-            try
-            {
-                var rulesets = rulesetStorage?.GetFiles(".", $"{ruleset_library_prefix}.*.dll");
+            var rulesets = rulesetStorage?.GetFiles(".", $"{ruleset_library_prefix}.*.dll");
 
-                foreach (var ruleset in rulesets.Where(f => !f.Contains("Tests")))
-                    loadRulesetFromFile(rulesetStorage?.GetFullPath(ruleset));
-            }
-            catch (Exception e)
-            {
-                Logger.Error(e, "Couldn't load user rulesets");
-            }
+            foreach (var ruleset in rulesets.Where(f => !f.Contains("Tests")))
+                loadRulesetFromFile(rulesetStorage?.GetFullPath(ruleset));
         }
 
         private void loadFromDisk()

From e597ee9ffd47628c6a18e238f3cbad1e93e5af1b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Apr 2020 21:52:15 +0900
Subject: [PATCH 02007/10326] 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 161a15fa4e..aaac6ec427 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.406.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.407.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c62aec7250..3e2c2b1599 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.Framework" Version="2020.406.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.407.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 834c0ee956..7903d964ce 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.Framework.iOS" Version="2020.406.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.407.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -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.406.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.407.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 2087d8d09e92c4662a9cc228e25476801624539a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 7 Apr 2020 16:01:47 +0200
Subject: [PATCH 02008/10326] Don't search for user rulesets if rulesetsStorage
 isn't set (Testing environnment)

---
 osu.Game/Rulesets/RulesetStore.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index ef72f187c3..34da2dc2db 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -138,10 +138,12 @@ namespace osu.Game.Rulesets
 
         private void loadUserRulesets()
         {
-            var rulesets = rulesetStorage?.GetFiles(".", $"{ruleset_library_prefix}.*.dll");
+            if (rulesetStorage == null) return;
+
+            var rulesets = rulesetStorage.GetFiles(".", $"{ruleset_library_prefix}.*.dll");
 
             foreach (var ruleset in rulesets.Where(f => !f.Contains("Tests")))
-                loadRulesetFromFile(rulesetStorage?.GetFullPath(ruleset));
+                loadRulesetFromFile(rulesetStorage.GetFullPath(ruleset));
         }
 
         private void loadFromDisk()

From 16d906d769b576e1678c983f37e2ff0ac114e6b9 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 7 Apr 2020 17:16:06 +0300
Subject: [PATCH 02009/10326] Get rid of unnecessary removal

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 517af630fc..b04d484195 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -80,7 +79,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 case ArmedState.Hit:
                     this.FadeOut(animDuration, Easing.Out)
                         .ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
-                    scaleContainer.Transforms.ForEach(t => scaleContainer.RemoveTransform(t));
                     break;
             }
         }

From 35d66c3c1df447370eca1baaf5f1281b60c015df Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 23:37:30 +0900
Subject: [PATCH 02010/10326] Fix missing comma

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

diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index f8089a9590..9a2f9f2fe5 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
         ColumnLineColour,
         JudgementLineColour,
         ColumnBackgroundColour,
-        ColumnLightColour
+        ColumnLightColour,
         MinimumColumnWidth
     }
 }

From 65db64e13e615de506c07d9c71816c294e414361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 7 Apr 2020 22:41:20 +0200
Subject: [PATCH 02011/10326] Add failing test cases

---
 .../Skinning/LegacySkinTextureFallbackTest.cs | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/Skinning/LegacySkinTextureFallbackTest.cs

diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinTextureFallbackTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinTextureFallbackTest.cs
new file mode 100644
index 0000000000..867af9c1b8
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinTextureFallbackTest.cs
@@ -0,0 +1,109 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
+
+namespace osu.Game.Tests.NonVisual.Skinning
+{
+    [TestFixture]
+    public sealed class LegacySkinTextureFallbackTest
+    {
+        private static object[][] fallbackTestCases =
+        {
+            new object[]
+            {
+                // textures in store
+                new[] { "Gameplay/osu/followpoint@2x", "Gameplay/osu/followpoint" },
+                // requested component
+                "Gameplay/osu/followpoint",
+                // returned texture name & scale
+                "Gameplay/osu/followpoint@2x", 2
+            },
+            new object[]
+            {
+                new[] { "Gameplay/osu/followpoint@2x" },
+                "Gameplay/osu/followpoint",
+                "Gameplay/osu/followpoint@2x", 2
+            },
+            new object[]
+            {
+                new[] { "Gameplay/osu/followpoint" },
+                "Gameplay/osu/followpoint",
+                "Gameplay/osu/followpoint", 1
+            },
+            new object[]
+            {
+                new[] { "Gameplay/osu/followpoint", "followpoint@2x" },
+                "Gameplay/osu/followpoint",
+                "Gameplay/osu/followpoint", 1
+            },
+            new object[]
+            {
+                new[] { "followpoint@2x", "followpoint" },
+                "Gameplay/osu/followpoint",
+                "followpoint@2x", 2
+            },
+            new object[]
+            {
+                new[] { "followpoint@2x" },
+                "Gameplay/osu/followpoint",
+                "followpoint@2x", 2
+            },
+            new object[]
+            {
+                new[] { "followpoint" },
+                "Gameplay/osu/followpoint",
+                "followpoint", 1
+            },
+        };
+
+        [TestCaseSource(nameof(fallbackTestCases))]
+        public void TestFallbackOrder(string[] filesInStore, string requestedComponent, string expectedTexture, float expectedScale)
+        {
+            var textureStore = new TestTextureStore(filesInStore);
+            var legacySkin = new TestLegacySkin(textureStore);
+
+            var texture = legacySkin.GetTexture(requestedComponent);
+
+            Assert.IsNotNull(texture);
+            Assert.AreEqual(textureStore.Textures[expectedTexture], texture);
+            Assert.AreEqual(expectedScale, texture.ScaleAdjust);
+        }
+
+        [Test]
+        public void TestReturnNullOnFallbackFailure()
+        {
+            var textureStore = new TestTextureStore("sliderb", "hit100");
+            var legacySkin = new TestLegacySkin(textureStore);
+
+            var texture = legacySkin.GetTexture("Gameplay/osu/followpoint");
+
+            Assert.IsNull(texture);
+        }
+
+        private class TestLegacySkin : LegacySkin
+        {
+            public TestLegacySkin(TextureStore textureStore)
+                : base(new SkinInfo(), null, null, string.Empty)
+            {
+                Textures = textureStore;
+            }
+        }
+
+        private class TestTextureStore : TextureStore
+        {
+            public readonly Dictionary<string, Texture> Textures;
+
+            public TestTextureStore(params string[] fileNames)
+            {
+                Textures = fileNames.ToDictionary(fileName => fileName, fileName => new Texture(1, 1));
+            }
+
+            public override Texture Get(string name) => Textures.GetValueOrDefault(name);
+        }
+    }
+}

From f5f0b94944af1f1455859420aba1ed4f2fed083c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 7 Apr 2020 22:50:25 +0200
Subject: [PATCH 02012/10326] Fix incorrect fallback logic

The recently-modified skin texture fallback logic was very subtly
incorrect. If at the end of the first loop no texture was found, it
would be checked for null to avoid setting scale adjust on a null
texture, but then returned anyway, bypassing the fallback logic for
subsequent possible paths entirely.

Invert the check and explicitly continue to the next fallback path
if neither a 2x, nor 1x texture with the given name is found in the
store.
---
 osu.Game/Skinning/LegacySkin.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 60eb3d8e51..ea1cc203d7 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -293,9 +293,10 @@ namespace osu.Game.Skinning
                     texture = Textures?.Get(name);
                 }
 
-                if (texture != null)
-                    texture.ScaleAdjust = ratio;
+                if (texture == null)
+                    continue;
 
+                texture.ScaleAdjust = ratio;
                 return texture;
             }
 

From 737a3b608a925aff03cbe91214a2f8f3ecc2df7d Mon Sep 17 00:00:00 2001
From: Alchyr <isithalchyr@gmail.com>
Date: Tue, 7 Apr 2020 17:34:18 -0700
Subject: [PATCH 02013/10326] Correct spelling

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

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index dcee5e83b7..174eadfe26 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -294,7 +294,7 @@ namespace osu.Game.Screens.Menu
                 {
                     new PopupDialogOkButton
                     {
-                        Text = @"Good bye",
+                        Text = @"Goodbye",
                         Action = confirm
                     },
                     new PopupDialogCancelButton

From 66a474619ce2f56d127d92c2c0ca2429f845ab10 Mon Sep 17 00:00:00 2001
From: Alchyr <isithalchyr@gmail.com>
Date: Tue, 7 Apr 2020 18:13:26 -0700
Subject: [PATCH 02014/10326] Adjust TimingControlPoint equivalency

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

diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 51b3377394..158788964b 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -50,6 +50,6 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public override bool EquivalentTo(ControlPoint other) =>
             other is TimingControlPoint otherTyped
-            && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
+            && Time == otherTyped.Time && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
     }
 }

From c5aae9b757ef7c726b513a7b0dfd2e1b55d2cda2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 8 Apr 2020 12:19:09 +0900
Subject: [PATCH 02015/10326] Fix post-merge errors

---
 .../Difficulty/CatchDifficultyCalculator.cs        | 14 +++++---------
 .../Preprocessing/CatchDifficultyHitObject.cs      |  1 +
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 7d763f1792..ee3b410780 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -50,15 +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;
-                // We're only using 80% of the catcher's width to simulate imperfect gameplay, reduced further at circle sizes above 5.5
-                halfCatchWidth *= Math.Min(1.075f - (0.05f * beatmap.BeatmapInfo.BaseDifficulty.CircleSize), 0.8f);
-            }
-
             CatchHitObject lastObject = null;
 
             // In 2B beatmaps, it is possible that a normal Fruit is placed in the middle of a JuiceStream.
@@ -81,8 +72,13 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         protected override Skill[] CreateSkills(IBeatmap beatmap)
         {
             using (var catcher = new Catcher(beatmap.BeatmapInfo.BaseDifficulty))
+            {
                 halfCatcherWidth = catcher.CatchWidth * 0.5f;
 
+                // For circle sizes above 5.5, reduce the catcher width further to simulate imperfect gameplay.
+                halfCatcherWidth *= 1 - (Math.Max(0, beatmap.BeatmapInfo.BaseDifficulty.CircleSize - 5.5f) * 0.0625f);
+            }
+
             return new Skill[]
             {
                 new Movement(halfCatcherWidth),
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
index b2b4129c8a..360af1a8c9 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
         /// Milliseconds elapsed since the start time of the previous <see cref="CatchDifficultyHitObject"/>, with a minimum of 40ms.
         /// </summary>
         public readonly double StrainTime;
+
         public readonly double ClockRate;
 
         public CatchDifficultyHitObject(HitObject hitObject, HitObject lastObject, double clockRate, float halfCatcherWidth)

From fd51bbb9ecd1e7e381c481d50c85ba392a63bc75 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 8 Apr 2020 12:20:46 +0900
Subject: [PATCH 02016/10326] Apply latest changes

---
 .../Difficulty/Skills/Movement.cs             | 25 ++++---------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 3ab4ae63a1..5cd2f1f581 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -46,29 +46,29 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 
             float distanceMoved = playerPosition - lastPlayerPosition.Value;
 
-            double weightedStrainTime = catchCurrent.StrainTime + 10 + (8 / catchCurrent.ClockRate);
+            double weightedStrainTime = catchCurrent.StrainTime + 13 + (3 / catchCurrent.ClockRate);
 
             double distanceAddition = (Math.Pow(Math.Abs(distanceMoved), 1.3) / 510);
             double sqrtStrain = Math.Sqrt(weightedStrainTime);
 
             double edgeDashBonus = 0;
 
-            // Direction changes give an extra point!
+            // Direction change bonus.
             if (Math.Abs(distanceMoved) > 0.1)
             {
                 if (Math.Abs(lastDistanceMoved) > 0.1 && Math.Sign(distanceMoved) != Math.Sign(lastDistanceMoved))
                 {
                     double bonusFactor = Math.Min(50, Math.Abs(distanceMoved)) / 50;
-                    double antiflowFactor = Math.Max(Math.Min(70, Math.Abs(lastDistanceMoved)) / 70, 0.3);
+                    double antiflowFactor = Math.Max(Math.Min(70, Math.Abs(lastDistanceMoved)) / 70, 0.38);
 
-                    distanceAddition += direction_change_bonus / Math.Sqrt(lastStrainTime + 18) * bonusFactor * antiflowFactor * Math.Max(1 - Math.Pow(weightedStrainTime / 1000, 3), 0);
+                    distanceAddition += direction_change_bonus / Math.Sqrt(lastStrainTime + 16) * bonusFactor * antiflowFactor * Math.Max(1 - Math.Pow(weightedStrainTime / 1000, 3), 0);
                 }
 
                 // Base bonus for every movement, giving some weight to streams.
                 distanceAddition += 12.5 * Math.Min(Math.Abs(distanceMoved), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtStrain;
             }
 
-            // Bonus for "almost" hyperdashes at corner points
+            // Bonus for edge dashes.
             if (catchCurrent.LastObject.DistanceToHyperDash <= 20.0f / CatchPlayfield.BASE_WIDTH)
             {
                 if (!catchCurrent.LastObject.HyperDash)
@@ -82,21 +82,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
                 distanceAddition *= 1.0 + edgeDashBonus * ((20 - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 20) * Math.Pow((Math.Min(catchCurrent.StrainTime * catchCurrent.ClockRate, 265) / 265), 1.5); // Edge Dashes are easier at lower ms values
             }
 
-            // Prevent wide dense stacks of notes which fit on the catcher from greatly increasing SR
-            if (Math.Abs(distanceMoved) > 0.1)
-            {
-                if (Math.Abs(lastDistanceMoved) > 0.1 && Math.Sign(distanceMoved) != Math.Sign(lastDistanceMoved))
-                {
-                    if (Math.Abs(distanceMoved) <= (CatcherArea.CATCHER_SIZE) && Math.Abs(lastDistanceMoved) == Math.Abs(distanceMoved))
-                    {
-                        if (catchCurrent.StrainTime <= 80 && lastStrainTime == catchCurrent.StrainTime)
-                        {
-                            distanceAddition *= Math.Max(((catchCurrent.StrainTime / 80) - 0.75) * 4, 0);
-                        }
-                    }
-                }
-            }
-
             lastPlayerPosition = playerPosition;
             lastDistanceMoved = distanceMoved;
             lastStrainTime = catchCurrent.StrainTime;

From a7d1eed3f5d938608eb9581ccde72072efd014b9 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Wed, 8 Apr 2020 12:12:59 +0800
Subject: [PATCH 02017/10326] Added content proxying to drull roll elements

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 59cf9193b5..e947795fe5 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -241,6 +241,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                 drawableHit = new DrawableFlyingCentreHit(Time.Current, isStrong);
 
             drumRollHitContainer.Add(drawableHit);
+            topLevelHitContainer.Add(drawableHit.CreateProxiedContent());
         }
 
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)

From f4dc604dbf5928e8142573562d18274030bbdd0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Apr 2020 13:32:37 +0900
Subject: [PATCH 02018/10326] Fix dragging tournament ladder too far causing it
 to disappear

---
 osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs b/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
index bdaa1ae7fd..fa03518c47 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Tournament.Screens.Ladder
 
         protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
 
+        public override bool UpdateSubTreeMasking(Drawable source, RectangleF maskingBounds) => false;
+
         protected override void OnDrag(DragEvent e)
         {
             this.MoveTo(target += e.Delta, 1000, Easing.OutQuint);

From 6e12f1b69b95e0d9b0fbe84b4666b6a87f8b5caa Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:39:41 +0800
Subject: [PATCH 02019/10326] =?UTF-8?q?Added=20=E2=80=9Cinstant=20fly?=
 =?UTF-8?q?=E2=80=9D=20variant=20of=20hit=20notes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Objects/Drawables/DrawableCentreHit.cs      | 17 +++++++++++++++++
 .../Objects/Drawables/DrawableRimHit.cs         | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 4979135f50..08df05e719 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -2,7 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -23,4 +26,18 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             MainPiece.AccentColour = colours.PinkDarker;
         }
     }
+
+    public class DrawableFlyingCentreHit : DrawableCentreHit
+    {
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            ApplyResult(r => r.Type = HitResult.Good);
+        }
+
+        public DrawableFlyingCentreHit(double time)
+            : base(new Hit { StartTime = time })
+        {
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+        }
+    }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index 5a12d71cea..0c2c9fbdef 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -2,7 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -23,4 +26,18 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             MainPiece.AccentColour = colours.BlueDarker;
         }
     }
+
+    public class DrawableFlyingRimHit : DrawableRimHit
+    {
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            ApplyResult(r => r.Type = HitResult.Good);
+        }
+
+        public DrawableFlyingRimHit(double time)
+            : base(new Hit { StartTime = time })
+        {
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+        }
+    }
 }

From 1057981c793dfabd262123cacfb47f36df57a844 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:40:01 +0800
Subject: [PATCH 02020/10326] Added arbitrary hit handler to drum roll object

---
 .../Objects/Drawables/DrawableDrumRoll.cs     | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 5806c90115..3e7b6dfd31 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -34,6 +34,14 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private Color4 colourIdle;
         private Color4 colourEngaged;
 
+        private bool judgingStarted;
+
+        /// <summary>
+        /// A handler action for when the drumroll has been hit,
+        /// regardless of any judgement.
+        /// </summary>
+        public Action<TaikoAction> OnHit;
+
         public DrawableDrumRoll(DrumRoll drumRoll)
             : base(drumRoll)
         {
@@ -86,15 +94,27 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece();
 
-        public override bool OnPressed(TaikoAction action) => false;
+        public override bool OnPressed(TaikoAction action)
+        {
+            if (judgingStarted)
+                OnHit.Invoke(action);
+
+            return false;
+        }
 
         private void onNewResult(DrawableHitObject obj, JudgementResult result)
         {
             if (!(obj is DrawableDrumRollTick))
                 return;
 
+            DrawableDrumRollTick drumRollTick = (DrawableDrumRollTick)obj;
+
             if (result.Type > HitResult.Miss)
+            {
+                OnHit.Invoke(drumRollTick.JudgedAction);
+                judgingStarted = true;
                 rollingHits++;
+            }
             else
                 rollingHits--;
 
@@ -113,8 +133,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 return;
 
             int countHit = NestedHitObjects.Count(o => o.IsHit);
+
             if (countHit >= HitObject.RequiredGoodHits)
+            {
                 ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Good);
+            }
             else
                 ApplyResult(r => r.Type = HitResult.Miss);
         }

From 9d5a9775017f7ffa67207419b28b5cf3e6fdca61 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:40:18 +0800
Subject: [PATCH 02021/10326] Added judgement forwarder to drumroll tick object

---
 .../Objects/Drawables/DrawableDrumRollTick.cs        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index 25b6141a0e..9961cb6ea2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -11,6 +11,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     public class DrawableDrumRollTick : DrawableTaikoHitObject<DrumRollTick>
     {
+        /// <summary>
+        /// The action type that the user took which caused this tick to
+        /// have been judged as "hit"
+        /// </summary>
+        public TaikoAction JudgedAction;
+
         public DrawableDrumRollTick(DrumRollTick tick)
             : base(tick)
         {
@@ -49,7 +55,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        public override bool OnPressed(TaikoAction action) => UpdateResult(true);
+        public override bool OnPressed(TaikoAction action)
+        {
+            JudgedAction = action;
+            return UpdateResult(true);
+        }
 
         protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
 

From 7751c5e3aa30fc530b4d9c8973c307765b5f7b16 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:40:32 +0800
Subject: [PATCH 02022/10326] Added separate scrolling track to display drum
 roll notes

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index bde9085c23..b32e7b53da 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private readonly Container<HitExplosion> hitExplosionContainer;
         private readonly Container<KiaiHitExplosion> kiaiExplosionContainer;
         private readonly JudgementContainer<DrawableTaikoJudgement> judgementContainer;
+        private readonly ScrollingHitObjectContainer drumRollHitContainer;
         internal readonly HitTarget HitTarget;
 
         private readonly ProxyContainer topLevelHitContainer;
@@ -135,6 +136,14 @@ namespace osu.Game.Rulesets.Taiko.UI
                             Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
                             Blending = BlendingParameters.Additive
                         },
+                        drumRollHitContainer = new ScrollingHitObjectContainer
+                        {
+                            Name = "Drumroll hit",
+                            RelativeSizeAxes = Axes.Both,
+                            FillMode = FillMode.Stretch,
+                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                            Width = 1.0f
+                        }
                     }
                 },
                 overlayBackgroundContainer = new Container
@@ -212,12 +221,28 @@ namespace osu.Game.Rulesets.Taiko.UI
                     barlineContainer.Add(barline.CreateProxy());
                     break;
 
+                case DrawableDrumRoll drumRoll:
+                    drumRoll.OnHit += onDrumrollArbitraryHit;
+                    break;
+
                 case DrawableTaikoHitObject taikoObject:
                     topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
                     break;
             }
         }
 
+        private void onDrumrollArbitraryHit(TaikoAction action)
+        {
+            DrawableHit drawableHit;
+
+            if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
+                drawableHit = new DrawableFlyingRimHit(Time.Current);
+            else
+                drawableHit = new DrawableFlyingCentreHit(Time.Current);
+
+            drumRollHitContainer.Add(drawableHit);
+        }
+
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             if (!DisplayJudgements.Value)

From b883586addd31c3933c8549af61a071ad65a143d Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 17:25:47 +0800
Subject: [PATCH 02023/10326] Added logic to allow strong notes

---
 .../Objects/Drawables/DrawableCentreHit.cs                  | 4 ++--
 .../Objects/Drawables/DrawableDrumRoll.cs                   | 6 +++---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs | 4 ++--
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs                | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 08df05e719..86e885239f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ApplyResult(r => r.Type = HitResult.Good);
         }
 
-        public DrawableFlyingCentreHit(double time)
-            : base(new Hit { StartTime = time })
+        public DrawableFlyingCentreHit(double time, bool isStrong = false)
+            : base(new Hit { StartTime = time, IsStrong = isStrong })
         {
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 3e7b6dfd31..64be870262 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// A handler action for when the drumroll has been hit,
         /// regardless of any judgement.
         /// </summary>
-        public Action<TaikoAction> OnHit;
+        public Action<TaikoAction, bool> OnHit;
 
         public DrawableDrumRoll(DrumRoll drumRoll)
             : base(drumRoll)
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         public override bool OnPressed(TaikoAction action)
         {
             if (judgingStarted)
-                OnHit.Invoke(action);
+                OnHit.Invoke(action, HitObject.IsStrong);
 
             return false;
         }
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             if (result.Type > HitResult.Miss)
             {
-                OnHit.Invoke(drumRollTick.JudgedAction);
+                OnHit.Invoke(drumRollTick.JudgedAction, HitObject.IsStrong);
                 judgingStarted = true;
                 rollingHits++;
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index 0c2c9fbdef..ad9872b21f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ApplyResult(r => r.Type = HitResult.Good);
         }
 
-        public DrawableFlyingRimHit(double time)
-            : base(new Hit { StartTime = time })
+        public DrawableFlyingRimHit(double time, bool isStrong = false)
+            : base(new Hit { StartTime = time, IsStrong = isStrong })
         {
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index b32e7b53da..59cf9193b5 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -231,14 +231,14 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
-        private void onDrumrollArbitraryHit(TaikoAction action)
+        private void onDrumrollArbitraryHit(TaikoAction action, bool isStrong)
         {
             DrawableHit drawableHit;
 
             if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
-                drawableHit = new DrawableFlyingRimHit(Time.Current);
+                drawableHit = new DrawableFlyingRimHit(Time.Current, isStrong);
             else
-                drawableHit = new DrawableFlyingCentreHit(Time.Current);
+                drawableHit = new DrawableFlyingCentreHit(Time.Current, isStrong);
 
             drumRollHitContainer.Add(drawableHit);
         }

From c30ea2ec2916d2f5852a63b0e21f599bb34b6ef0 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Wed, 8 Apr 2020 12:12:59 +0800
Subject: [PATCH 02024/10326] Added content proxying to drull roll elements

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 59cf9193b5..e947795fe5 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -241,6 +241,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                 drawableHit = new DrawableFlyingCentreHit(Time.Current, isStrong);
 
             drumRollHitContainer.Add(drawableHit);
+            topLevelHitContainer.Add(drawableHit.CreateProxiedContent());
         }
 
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)

From 3794b55eef5eed19a8acd0656f3af1ccd3f01380 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Apr 2020 14:08:34 +0900
Subject: [PATCH 02025/10326] Rename ManiaStage to Stage

---
 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs | 2 +-
 osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs          | 8 ++++----
 osu.Game.Rulesets.Mania/UI/Column.cs                     | 2 +-
 osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs  | 2 +-
 osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs   | 2 +-
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs             | 6 +++---
 osu.Game.Rulesets.Mania/UI/{ManiaStage.cs => Stage.cs}   | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename osu.Game.Rulesets.Mania/UI/{ManiaStage.cs => Stage.cs} (97%)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs
index 0d5ebd33e9..37b97a444a 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 
                 return new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)
                 {
-                    Child = new ManiaStage(0, new StageDefinition { Columns = 4 }, ref normalAction, ref specialAction)
+                    Child = new Stage(0, new StageDefinition { Columns = 4 }, ref normalAction, ref specialAction)
                 };
             });
         }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
index d5fd2808b8..7376a90f17 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         [Cached(typeof(IReadOnlyList<Mod>))]
         private IReadOnlyList<Mod> mods { get; set; } = Array.Empty<Mod>();
 
-        private readonly List<ManiaStage> stages = new List<ManiaStage>();
+        private readonly List<Stage> stages = new List<Stage>();
 
         private FillFlowContainer<ScrollingTestContainer> fill;
 
@@ -81,9 +81,9 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("check bar anchors", () => barsInStageAreAnchored(stages[1], Anchor.TopCentre));
         }
 
-        private bool notesInStageAreAnchored(ManiaStage stage, Anchor anchor) => stage.Columns.SelectMany(c => c.AllHitObjects).All(o => o.Anchor == anchor);
+        private bool notesInStageAreAnchored(Stage stage, Anchor anchor) => stage.Columns.SelectMany(c => c.AllHitObjects).All(o => o.Anchor == anchor);
 
-        private bool barsInStageAreAnchored(ManiaStage stage, Anchor anchor) => stage.AllHitObjects.Where(obj => obj is DrawableBarLine).All(o => o.Anchor == anchor);
+        private bool barsInStageAreAnchored(Stage stage, Anchor anchor) => stage.AllHitObjects.Where(obj => obj is DrawableBarLine).All(o => o.Anchor == anchor);
 
         private void createNote()
         {
@@ -133,7 +133,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var specialAction = ManiaAction.Special1;
 
-            var stage = new ManiaStage(0, new StageDefinition { Columns = 2 }, ref action, ref specialAction);
+            var stage = new Stage(0, new StageDefinition { Columns = 2 }, ref action, ref specialAction);
             stages.Add(stage);
 
             return new ScrollingTestContainer(direction)
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index d2f58d7255..d1da102be5 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -138,6 +138,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
             // This probably shouldn't exist as is, but the columns in the stage are separated by a 1px border
-            => DrawRectangle.Inflate(new Vector2(ManiaStage.COLUMN_SPACING / 2, 0)).Contains(ToLocalSpace(screenSpacePos));
+            => DrawRectangle.Inflate(new Vector2(Stage.COLUMN_SPACING / 2, 0)).Contains(ToLocalSpace(screenSpacePos));
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
index 982a18cb60..a5de09ca75 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
             InternalChild = directionContainer = new Container
             {
                 RelativeSizeAxes = Axes.X,
-                Height = ManiaStage.HIT_TARGET_POSITION,
+                Height = Stage.HIT_TARGET_POSITION,
                 Children = new[]
                 {
                     gradient = new Box
diff --git a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
index bca7c3ff08..ba5281a1a2 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         {
             float hitPosition = CurrentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
                                     new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.HitPosition))?.Value
-                                ?? ManiaStage.HIT_TARGET_POSITION;
+                                ?? Stage.HIT_TARGET_POSITION;
 
             Padding = Direction.Value == ScrollingDirection.Up
                 ? new MarginPadding { Top = hitPosition }
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index 08f6049782..c2eb48b774 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Mania.UI
 {
     public class ManiaPlayfield : ScrollingPlayfield
     {
-        private readonly List<ManiaStage> stages = new List<ManiaStage>();
+        private readonly List<Stage> stages = new List<Stage>();
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => stages.Any(s => s.ReceivePositionalInputAt(screenSpacePos));
 
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             for (int i = 0; i < stageDefinitions.Count; i++)
             {
-                var newStage = new ManiaStage(firstColumnIndex, stageDefinitions[i], ref normalColumnAction, ref specialColumnAction);
+                var newStage = new Stage(firstColumnIndex, stageDefinitions[i], ref normalColumnAction, ref specialColumnAction);
 
                 playfieldGrid.Content[0][i] = newStage;
 
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Mania.UI
         /// </summary>
         public int TotalColumns => stages.Sum(s => s.Columns.Count);
 
-        private ManiaStage getStageByColumn(int column)
+        private Stage getStageByColumn(int column)
         {
             int sum = 0;
 
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
similarity index 97%
rename from osu.Game.Rulesets.Mania/UI/ManiaStage.cs
rename to osu.Game.Rulesets.Mania/UI/Stage.cs
index adab08eb06..1d64672035 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.UI
     /// <summary>
     /// A collection of <see cref="Column"/>s.
     /// </summary>
-    public class ManiaStage : ScrollingPlayfield
+    public class Stage : ScrollingPlayfield
     {
         public const float COLUMN_SPACING = 1;
 
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly int firstColumnIndex;
 
-        public ManiaStage(int firstColumnIndex, StageDefinition definition, ref ManiaAction normalColumnStartAction, ref ManiaAction specialColumnStartAction)
+        public Stage(int firstColumnIndex, StageDefinition definition, ref ManiaAction normalColumnStartAction, ref ManiaAction specialColumnStartAction)
         {
             this.firstColumnIndex = firstColumnIndex;
 

From 9db996a91f171c4618477eadea2db9dcb6b7e3a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Apr 2020 14:08:58 +0900
Subject: [PATCH 02026/10326] Increase size of default osu!mania skin's keys to
 allow clearance with HUD

---
 osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs | 7 +++++--
 osu.Game.Rulesets.Mania/UI/Stage.cs                     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
index a5de09ca75..47cb9bd45a 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
@@ -53,9 +53,8 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                     keyIcon = new Container
                     {
                         Name = "Key icon",
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
                         Size = new Vector2(key_icon_size),
+                        Origin = Anchor.Centre,
                         Masking = true,
                         CornerRadius = key_icon_corner_radius,
                         BorderThickness = 2,
@@ -88,11 +87,15 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         {
             if (direction.NewValue == ScrollingDirection.Up)
             {
+                keyIcon.Anchor = Anchor.BottomCentre;
+                keyIcon.Y = -20;
                 directionContainer.Anchor = directionContainer.Origin = Anchor.TopLeft;
                 gradient.Colour = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0));
             }
             else
             {
+                keyIcon.Anchor = Anchor.TopCentre;
+                keyIcon.Y = 20;
                 directionContainer.Anchor = directionContainer.Origin = Anchor.BottomLeft;
                 gradient.Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0), Color4.Black);
             }
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 1d64672035..58e7fba4df 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.UI
     {
         public const float COLUMN_SPACING = 1;
 
-        public const float HIT_TARGET_POSITION = 50;
+        public const float HIT_TARGET_POSITION = 110;
 
         public IReadOnlyList<Column> Columns => columnFlow.Children;
         private readonly FillFlowContainer<Column> columnFlow;

From e429c274a99ac0b0d6428468d0b680a55e7efbb9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 8 Apr 2020 15:08:13 +0900
Subject: [PATCH 02027/10326] Initial structure

---
 .../Skinning/ManiaSkinnableTestScene.cs       |  1 +
 .../Skinning/TestSceneStageBackground.cs      | 35 +++++++++++++++++++
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |  3 +-
 .../Skinning/LegacyStageBackground.cs         | 11 ++++++
 .../Skinning/ManiaLegacySkinTransformer.cs    |  3 ++
 .../UI/Components/DefaultStageBackground.cs   | 11 ++++++
 6 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
 create mode 100644 osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 7f0503913f..a3c1d518c5 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         {
             typeof(ManiaRuleset),
             typeof(ManiaLegacySkinTransformer),
+            typeof(ManiaSettingsSubsection)
         };
 
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
new file mode 100644
index 0000000000..a8fc68188a
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.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 System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.Skinning;
+using osu.Game.Rulesets.Mania.UI.Components;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    public class TestSceneStageBackground : ManiaSkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
+        {
+            typeof(DefaultStageBackground),
+            typeof(LegacyStageBackground),
+        }).ToList();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            SetContents(() => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground), _ => new DefaultStageBackground())
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Width = 0.5f,
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 2371d74a2b..a7252a348a 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Rulesets.Mania
         HoldNoteHead,
         HoldNoteTail,
         HoldNoteBody,
-        HitExplosion
+        HitExplosion,
+        StageBackground
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
new file mode 100644
index 0000000000..d2ea47cfeb
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.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.
+
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class LegacyStageBackground : CompositeDrawable
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 78ea4b68ae..27df534ddd 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -81,6 +81,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
                         case ManiaSkinComponents.HitExplosion:
                             return new LegacyHitExplosion();
+
+                        case ManiaSkinComponents.StageBackground:
+                            return new LegacyStageBackground();
                     }
 
                     break;
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.cs
new file mode 100644
index 0000000000..1e10cd8d59
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.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.
+
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Rulesets.Mania.UI.Components
+{
+    public class DefaultStageBackground : CompositeDrawable
+    {
+    }
+}

From cd15b672eba7c97ed90b58d61f936d058d20df14 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 8 Apr 2020 15:36:07 +0900
Subject: [PATCH 02028/10326] Implement left and right stage images

---
 .../Skinning/LegacyStageBackground.cs         | 54 ++++++++++++++++++-
 .../UI/Components/DefaultStageBackground.cs   | 19 +++++++
 osu.Game.Rulesets.Mania/UI/Stage.cs           |  7 +--
 .../LegacyManiaSkinConfigurationLookup.cs     |  4 +-
 osu.Game/Skinning/LegacySkin.cs               |  6 +++
 5 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
index d2ea47cfeb..7680526ac4 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
@@ -1,11 +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 osu.Framework.Graphics.Containers;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyStageBackground : CompositeDrawable
+    public class LegacyStageBackground : LegacyManiaElement
     {
+        private Drawable leftSprite;
+        private Drawable rightSprite;
+
+        public LegacyStageBackground()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            string leftImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.LeftStageImage)?.Value
+                               ?? "mania-stage-left";
+
+            string rightImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.RightStageImage)?.Value
+                                ?? "mania-stage-right";
+
+            InternalChildren = new[]
+            {
+                leftSprite = new Sprite
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopRight,
+                    X = 0.05f,
+                    Texture = skin.GetTexture(leftImage),
+                },
+                rightSprite = new Sprite
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopLeft,
+                    X = -0.05f,
+                    Texture = skin.GetTexture(rightImage)
+                }
+            };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (leftSprite?.Height > 0)
+                leftSprite.Scale = new Vector2(DrawHeight / leftSprite.Height);
+
+            if (rightSprite?.Height > 0)
+                rightSprite.Scale = new Vector2(DrawHeight / rightSprite.Height);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.cs
index 1e10cd8d59..f5b542d085 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.cs
@@ -1,11 +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.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.UI.Components
 {
     public class DefaultStageBackground : CompositeDrawable
     {
+        public DefaultStageBackground()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new Box
+            {
+                Name = "Background",
+                RelativeSizeAxes = Axes.Both,
+                Colour = Color4.Black
+            };
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 58e7fba4df..91839bd043 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
@@ -72,11 +71,9 @@ namespace osu.Game.Rulesets.Mania.UI
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        new Box
+                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground), _ => new DefaultStageBackground())
                         {
-                            Name = "Background",
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.Black
+                            RelativeSizeAxes = Axes.Both
                         },
                         columnFlow = new FillFlowContainer<Column>
                         {
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 9a2f9f2fe5..59847017ec 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Skinning
         JudgementLineColour,
         ColumnBackgroundColour,
         ColumnLightColour,
-        MinimumColumnWidth
+        MinimumColumnWidth,
+        LeftStageImage,
+        RightStageImage,
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index ea1cc203d7..91f970d19f 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -243,6 +243,12 @@ namespace osu.Game.Skinning
                 case LegacyManiaSkinConfigurationLookups.KeyImageDown:
                     Debug.Assert(maniaLookup.TargetColumn != null);
                     return SkinUtils.As<TValue>(getManiaImage(existing, $"KeyImage{maniaLookup.TargetColumn}D"));
+
+                case LegacyManiaSkinConfigurationLookups.LeftStageImage:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "StageLeft"));
+
+                case LegacyManiaSkinConfigurationLookups.RightStageImage:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "StageRight"));
             }
 
             return null;

From 83db6cebb655d9ea25c5c6d1dfde8f3057d57630 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 8 Apr 2020 16:20:26 +0900
Subject: [PATCH 02029/10326] Implement bottom stage image

---
 .../Resources/metrics-skin/mania-key1@2x.png  | Bin 0 -> 12914 bytes
 .../metrics-skin/mania-stage-bottom@2x.png    | Bin 0 -> 1965 bytes
 .../Skinning/TestSceneStageForeground.cs      |  33 +++++++++++
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |   3 +-
 .../Skinning/LegacyStageForeground.cs         |  56 ++++++++++++++++++
 .../Skinning/ManiaLegacySkinTransformer.cs    |   3 +
 osu.Game.Rulesets.Mania/UI/Stage.cs           |   4 ++
 .../LegacyManiaSkinConfigurationLookup.cs     |   1 +
 8 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/metrics-skin/mania-key1@2x.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/metrics-skin/mania-stage-bottom@2x.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/metrics-skin/mania-key1@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/metrics-skin/mania-key1@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa681f6f223ea44319b3a383935237d1a2e4b345
GIT binary patch
literal 12914
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/metrics-skin/mania-stage-bottom@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/metrics-skin/mania-stage-bottom@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca590eaf08e65dc1ae40bce9f9f74e69c3a0f8a4
GIT binary patch
literal 1965
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
new file mode 100644
index 0000000000..d436445b59
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.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 System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.Skinning;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+    public class TestSceneStageForeground : ManiaSkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
+        {
+            typeof(LegacyStageForeground),
+        }).ToList();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            SetContents(() => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground), _ => null)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Width = 0.5f,
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index a7252a348a..c0c8505f44 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Rulesets.Mania
         HoldNoteTail,
         HoldNoteBody,
         HitExplosion,
-        StageBackground
+        StageBackground,
+        StageForeground,
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs
new file mode 100644
index 0000000000..9719005d54
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.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.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class LegacyStageForeground : LegacyManiaElement
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Drawable sprite;
+
+        public LegacyStageForeground()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        {
+            string bottomImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.BottomStageImage)?.Value
+                                 ?? "mania-stage-bottom";
+
+            sprite = skin.GetAnimation(bottomImage, true, true)?.With(d =>
+            {
+                if (d == null)
+                    return;
+
+                d.Scale = new Vector2(1.6f);
+            });
+
+            if (sprite != null)
+                InternalChild = sprite;
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (sprite == null)
+                return;
+
+            if (direction.NewValue == ScrollingDirection.Up)
+                sprite.Anchor = sprite.Origin = Anchor.TopCentre;
+            else
+                sprite.Anchor = sprite.Origin = Anchor.BottomCentre;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 27df534ddd..e64178083a 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -84,6 +84,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
                         case ManiaSkinComponents.StageBackground:
                             return new LegacyStageBackground();
+
+                        case ManiaSkinComponents.StageForeground:
+                            return new LegacyStageForeground();
                     }
 
                     break;
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 91839bd043..faa04dea97 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -100,6 +100,10 @@ namespace osu.Game.Rulesets.Mania.UI
                                 RelativeSizeAxes = Axes.Y,
                             }
                         },
+                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground), _ => null)
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        },
                         judgements = new JudgementContainer<DrawableManiaJudgement>
                         {
                             Anchor = Anchor.TopCentre,
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 59847017ec..c76d5c8784 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -43,5 +43,6 @@ namespace osu.Game.Skinning
         MinimumColumnWidth,
         LeftStageImage,
         RightStageImage,
+        BottomStageImage
     }
 }

From 2ddea018cfe443bd82a2f72cd0320dd1bef001af Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 8 Apr 2020 17:15:59 +0900
Subject: [PATCH 02030/10326] Fix hidden notes due to 0 minimum width

---
 .../Resources/mania-skin-zero-minwidth.ini        |  4 ++++
 .../Skins/LegacyManiaSkinDecoderTest.cs           | 15 +++++++++++++++
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Resources/mania-skin-zero-minwidth.ini

diff --git a/osu.Game.Tests/Resources/mania-skin-zero-minwidth.ini b/osu.Game.Tests/Resources/mania-skin-zero-minwidth.ini
new file mode 100644
index 0000000000..fd22e2e299
--- /dev/null
+++ b/osu.Game.Tests/Resources/mania-skin-zero-minwidth.ini
@@ -0,0 +1,4 @@
+[Mania]
+Keys: 4
+ColumnWidth: 10,10,10,10
+WidthForNoteHeightScale: 0
\ No newline at end of file
diff --git a/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
index 83fd4878aa..e811979aed 100644
--- a/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
@@ -99,5 +99,20 @@ namespace osu.Game.Tests.Skins
                 Assert.That(configs[0].CustomColours, Contains.Key("ColourBarline").And.ContainValue(new Color4(50, 50, 50, 50)));
             }
         }
+
+        [Test]
+        public void TestMinimumColumnWidthFallsBackWhenZeroIsProvided()
+        {
+            var decoder = new LegacyManiaSkinDecoder();
+
+            using (var resStream = TestResources.OpenResource("mania-skin-zero-minwidth.ini"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var configs = decoder.Decode(stream);
+
+                Assert.That(configs.Count, Is.EqualTo(1));
+                Assert.That(configs[0].MinimumColumnWidth, Is.EqualTo(16));
+            }
+        }
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index af7d6007f3..fb591969fb 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Skinning
         public float MinimumColumnWidth
         {
             get => minimumColumnWidth ?? ColumnWidth.Min();
-            set => minimumColumnWidth = value;
+            set => minimumColumnWidth = value > 0 ? (float?)value : null;
         }
     }
 }

From 65823fb2e1101f4b73bc7446063520ca95bbf846 Mon Sep 17 00:00:00 2001
From: Alchyr <isithalchyr@gmail.com>
Date: Wed, 8 Apr 2020 01:42:35 -0700
Subject: [PATCH 02031/10326] Use redundancy test

---
 .../NonVisual/ControlPointInfoTest.cs         | 23 ++++++++++++-------
 .../Beatmaps/ControlPoints/ControlPoint.cs    |  8 +++++++
 .../ControlPoints/ControlPointInfo.cs         |  2 +-
 .../ControlPoints/DifficultyControlPoint.cs   |  1 +
 .../ControlPoints/EffectControlPoint.cs       |  1 +
 .../ControlPoints/SampleControlPoint.cs       |  1 +
 .../ControlPoints/TimingControlPoint.cs       |  6 ++++-
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
index 2782e902fe..158954106d 100644
--- a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
+++ b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
@@ -29,11 +29,17 @@ namespace osu.Game.Tests.NonVisual
             var cpi = new ControlPointInfo();
 
             cpi.Add(0, new TimingControlPoint()); // is *not* redundant, special exception for first timing point.
-            cpi.Add(1000, new TimingControlPoint()); // is redundant
+            cpi.Add(1000, new TimingControlPoint()); // is also not redundant, due to change of offset
 
-            Assert.That(cpi.Groups.Count, Is.EqualTo(1));
-            Assert.That(cpi.TimingPoints.Count, Is.EqualTo(1));
-            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(1));
+            Assert.That(cpi.Groups.Count, Is.EqualTo(2));
+            Assert.That(cpi.TimingPoints.Count, Is.EqualTo(2));
+            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(2));
+
+            cpi.Add(1000, new TimingControlPoint()); //is redundant
+
+            Assert.That(cpi.Groups.Count, Is.EqualTo(2));
+            Assert.That(cpi.TimingPoints.Count, Is.EqualTo(2));
+            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(2));
         }
 
         [Test]
@@ -86,11 +92,12 @@ namespace osu.Game.Tests.NonVisual
             Assert.That(cpi.EffectPoints.Count, Is.EqualTo(0));
             Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(0));
 
-            cpi.Add(1000, new EffectControlPoint { KiaiMode = true }); // is not redundant
+            cpi.Add(1000, new EffectControlPoint { KiaiMode = true, OmitFirstBarLine = true }); // is not redundant
+            cpi.Add(1400, new EffectControlPoint { KiaiMode = true, OmitFirstBarLine = true }); // same settings, but is not redundant
 
-            Assert.That(cpi.Groups.Count, Is.EqualTo(1));
-            Assert.That(cpi.EffectPoints.Count, Is.EqualTo(1));
-            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(1));
+            Assert.That(cpi.Groups.Count, Is.EqualTo(2));
+            Assert.That(cpi.EffectPoints.Count, Is.EqualTo(2));
+            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(2));
         }
 
         [Test]
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index 39a0e6f6d4..411a4441de 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -25,6 +25,14 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <returns>Whether equivalent.</returns>
         public abstract bool EquivalentTo(ControlPoint other);
 
+        /// <summary>
+        /// Whether this control point results in a meaningful change when placed after another.
+        /// </summary>
+        /// <param name="other">Another control point to compare with.</param>
+        /// <param name="time">The time this timing point will be placed at.</param>
+        /// <returns>Whether redundant.</returns>
+        public abstract bool IsRedundant(ControlPoint other, double time);
+
         public bool Equals(ControlPoint other) => Time == other?.Time && EquivalentTo(other);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index df68d8acd2..37a3dbf592 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Beatmaps.ControlPoints
                     break;
             }
 
-            return existing?.EquivalentTo(newPoint) == true;
+            return newPoint.IsRedundant(existing, time);
         }
 
         private void groupItemAdded(ControlPoint controlPoint)
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 8b21098a51..44522dc927 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -29,5 +29,6 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public override bool EquivalentTo(ControlPoint other) =>
             other is DifficultyControlPoint otherTyped && otherTyped.SpeedMultiplier.Equals(SpeedMultiplier);
+        public override bool IsRedundant(ControlPoint other, double time) => EquivalentTo(other);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index 369b93ff3d..8066c6b577 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -38,5 +38,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool EquivalentTo(ControlPoint other) =>
             other is EffectControlPoint otherTyped &&
             KiaiMode == otherTyped.KiaiMode && OmitFirstBarLine == otherTyped.OmitFirstBarLine;
+        public override bool IsRedundant(ControlPoint other, double time) => !OmitFirstBarLine && EquivalentTo(other);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index 393bcfdb3c..cf7c842b24 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -71,5 +71,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool EquivalentTo(ControlPoint other) =>
             other is SampleControlPoint otherTyped &&
             SampleBank == otherTyped.SampleBank && SampleVolume == otherTyped.SampleVolume;
+        public override bool IsRedundant(ControlPoint other, double time) => EquivalentTo(other);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 158788964b..d14ac1221b 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -50,6 +50,10 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public override bool EquivalentTo(ControlPoint other) =>
             other is TimingControlPoint otherTyped
-            && Time == otherTyped.Time && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
+            && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
+
+        public override bool IsRedundant(ControlPoint other, double time) =>
+            EquivalentTo(other)
+            && other.Time == time;
     }
 }

From e6b87656ba1164e4e8e81ac532be9916a6ae0426 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Apr 2020 18:04:53 +0900
Subject: [PATCH 02032/10326] Fix TestSceneColumn columns not getting a width

---
 osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index 9aad08c433..8b35a57380 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -28,7 +28,9 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             typeof(Column),
             typeof(ColumnBackground),
-            typeof(ColumnHitObjectArea)
+            typeof(ColumnHitObjectArea),
+            typeof(DefaultKeyArea),
+            typeof(DefaultHitTarget)
         };
 
         [Cached(typeof(IReadOnlyList<Mod>))]
@@ -94,6 +96,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
+                Width = 50,
                 Height = 0.85f,
                 AccentColour = Color4.OrangeRed,
                 Action = { Value = action },

From 7d787dde8926331a03a96140ed0ff1827520ee95 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 8 Apr 2020 18:17:45 +0900
Subject: [PATCH 02033/10326] Move comparison to decoder

---
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs | 2 +-
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index fb591969fb..af7d6007f3 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Skinning
         public float MinimumColumnWidth
         {
             get => minimumColumnWidth ?? ColumnWidth.Min();
-            set => minimumColumnWidth = value > 0 ? (float?)value : null;
+            set => minimumColumnWidth = value;
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 8b76749e3e..2db902c182 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -102,7 +102,9 @@ namespace osu.Game.Skinning
                         break;
 
                     case "WidthForNoteHeightScale":
-                        currentConfig.MinimumColumnWidth = float.Parse(pair.Value, CultureInfo.InvariantCulture) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
+                        float minWidth = float.Parse(pair.Value, CultureInfo.InvariantCulture) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
+                        if (minWidth > 0)
+                            currentConfig.MinimumColumnWidth = minWidth;
                         break;
 
                     case string _ when pair.Key.StartsWith("Colour"):

From d13231eff744ae95590ef7a06987a4529593c77a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 8 Apr 2020 18:23:24 +0900
Subject: [PATCH 02034/10326] Use ctor for default width

---
 osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs | 1 -
 osu.Game.Rulesets.Mania/UI/Column.cs             | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index 8b35a57380..5e06002f41 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -96,7 +96,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Width = 50,
                 Height = 0.85f,
                 AccentColour = Color4.OrangeRed,
                 Action = { Value = action },
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index d1da102be5..506a07f26b 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Mania.UI
             Index = index;
 
             RelativeSizeAxes = Axes.Y;
+            Width = COLUMN_WIDTH;
 
             Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, Index), _ => new DefaultColumnBackground())
             {

From f3e909539df1566e43b86ff0af2520369e04f995 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Apr 2020 18:39:18 +0900
Subject: [PATCH 02035/10326] Fix slider ball and follow circle blending for
 legacy skins

---
 osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs | 2 +-
 1 file changed, 1 insertion(+), 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 5a6dd49c44..395c76a233 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             this.drawableSlider = drawableSlider;
             this.slider = slider;
 
-            Blending = BlendingParameters.Additive;
             Origin = Anchor.Centre;
 
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
@@ -241,6 +240,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     Scale = new Vector2(radius / OsuHitObject.OBJECT_RADIUS),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    Blending = BlendingParameters.Additive,
                     BorderThickness = 10,
                     BorderColour = Color4.White,
                     Alpha = 1,

From 067ec2785919118b183bbda158aa40ce1dff83b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Apr 2020 18:58:09 +0900
Subject: [PATCH 02036/10326] Also fix slider repeat circles

---
 .../Objects/Drawables/DrawableSliderRepeat.cs                  | 1 -
 .../Objects/Drawables/Pieces/ReverseArrowPiece.cs              | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index b04d484195..720ffcd51c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -31,7 +31,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 
-            Blending = BlendingParameters.Additive;
             Origin = Anchor.Centre;
 
             InternalChild = scaleContainer = new ReverseArrowPiece();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
index 35a27bb0a6..c0ee874545 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
@@ -21,13 +21,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            Blending = BlendingParameters.Additive;
-
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 
             Child = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.ReverseArrow), _ => new SpriteIcon
             {
                 RelativeSizeAxes = Axes.Both,
+                Blending = BlendingParameters.Additive,
                 Icon = FontAwesome.Solid.ChevronRight,
                 Size = new Vector2(0.35f)
             })

From 40267cb1fe9e1bbc4878fceef1d24c57adc02fc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Apr 2020 20:13:25 +0900
Subject: [PATCH 02037/10326] Add test sprites and make alignment initially
 better

---
 .../Resources/old-skin/skin.ini                 |   5 +++++
 .../Resources/old-skin/taiko-bar-left.png       | Bin 0 -> 17758 bytes
 .../Resources/old-skin/taiko-drum-inner.png     | Bin 0 -> 4661 bytes
 .../Resources/old-skin/taiko-drum-outer.png     | Bin 0 -> 5585 bytes
 .../Skinning/LegacyInputDrum.cs                 |   8 ++++----
 5 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/skin.ini
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-bar-left.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-drum-inner.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-drum-outer.png

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/skin.ini b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/skin.ini
new file mode 100644
index 0000000000..462c2c278e
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/skin.ini
@@ -0,0 +1,5 @@
+[General]
+Name: an old skin
+Author: an old guy
+
+// no version specified means v1
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-bar-left.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-bar-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad55fd5a96f702c4a6cda17692d78723b2e8c487
GIT binary patch
literal 17758
zcmbTd1z23&(k_S-v`KIa?!lpPx8NEG?(XjHZo!?PA-KD{L*pLY-EBJGIsdu;ow@g!
zncMwz_m<jaYt_5=s;UlGkdr_`#6yIDfIyM_Dyjtjtp|S=KEQ#$wQSKIz&{9fU)3EU
zAdt}iejp*zGjSjwU@^>9zB_%FmEktDwPw&avNbSfaI>}pQ$s-T3b@(n8(JDW5gQnr
zn%nS^p0{?A5}O<Gk*cxFGRfMB7@L`Y^>8p&_K;IC^sqGKG9ne=C+2nI1~afWcG4$y
zv$nEv<aXmD{f93%c>C{RMpEK`NSrMBNQM3iB>pa|KrCYGU`));0Hil$X5%F0;9_6~
zvN5p&zYw!9F>^68aWXQq(lar0GXc5TIf(!LA_YrxFf!p*5*7cqEbty5shN|L9XBJR
ztE(%6D=UMogDE337Z;cZ3nL2)J(z;t(cQ*L-;LhJk?g-Xh#ET@I+)uzncLbB|K+G}
zVC(F}M+(;TUnW@F{fDiM<G<Ymb{M0Zz8xbo1JhrV{vk9n{12U-vxC(?!i@|WjjfEW
zjcuG9!L-c(p|vx!b+UCdv;E(&{?F<ENdVZjva<h?@xRo?+WJ2t9G%2mz-Ij0A^%Hi
zM-_KFV@4%oM_XqHLt`-)u$p9lt+C@4aWK|*vUO0gwYB=Mfl~M{m5EuvRufap>KmHd
z{568+zg=Q1s_$gXM+zP{HhLx&dL~vCCN^$1W;!M=ZYHLG(aG8xnVY!(7aa=|JrkG|
zsKU&}&Bnyd%KAT%f@h48zLWm{E3uIww~4KTwLaKhb8CH5V@5k0Q&Qspc#&Jg*2>la
zEEudB>wiBkDI%iaU~6J-1wP@ZBq2;JDJBAB<^lrgSs0lAQCC)$ThhkSN#DlMSW=Xa
z6zm%Yb8{nZAR8NyiN(N>o|%c$fF8VKK+nZ#!bERkWWowGHUS!Qvj69LQCmajzcb*!
zt~dJsdA+=YIXD9Kt^SYs{Ef@MQ-}Mjxg&T`-Txgq%EtEp-m)?${%5vu>l^-!0zOj1
zzr$~AMEdW;=KseY_!nDOGh;B*|J|hc7mcH>iIc0ogRzh)*j4`@<{TqfcgDZr`Y$sW
z|L+$5bMC)|_J5Is@#631e}D?S^B<@)wgKat0~pAPC~$TmAOtQXMTJz{mQS<bQwjQ$
z24jg4Acb?+(zMaw!lRhPjgSc_hmBC95THaqQECWBin5qib;GTg2B33hqNnQB3=hLV
zvq%yL1O+Kz2`?{YE#)S;P&Bo?si}Pfzn#_Y$E@-nJMPVwvJNXQju$F*+C9z%K9Ib}
zOH#f{)(8!e2XZIMu#~V47qsTxy^*CE%}kQx2mN#8Kd1g{<8U&e)c~b>WVbBMNwGAm
zW+V|+iN_tbw7D)C#8&5_L|UJiE;&vCt4j$?(70punJg6l8Xx}FYO>3{cMgo44Bzm)
z2UMt$*PCIZ*Ri`U(JtF`0?MGnj~eZfRU?@%DwjU4!oN#dU#wtk__TLkeP0}qez&2=
zciiP}64-;YzTS(NNW%%N*fG@G>^3FALE?r(p&#)odA;8YX&6n>0E!3TbGy>3i0VGR
z*IJ@x?A%)}7GTLoxRhM$7>?JZOP$roQ66+j*~Tp|i8joH%+2^)gZhY0mL+8q*zo(_
zGjJf@+NWGIkT+&Y;`u{em^U3TPLh7VX65Vpi{9%J!uujSAe*iJOy&b!z4o3W-m8br
zn7*|?Fe`Uj;`nmI5uCUfBZKU}Ckl=k#$Q*+pD!pNFPmAZ88U4U*tkcTWoRyLME-g2
zhZgLd72XOF6>R6`onBA;keAh|1?K@vNZfg8_TWIvb;tPXt|XK|`7_nu`qM_K^OH{P
z4cBe<&Akr(p`M{I>>{1Huh$`B-;A&B1I}-Z#IKbI`rCSzfv9=q@-NRt=ZhW18?$WK
zH_v8dgrS&FR-FP_cW*1Ac<2?I2RO<X5gM9vz}<p|M{jFXfe#ov`2rO$rY@&i&<i&m
zdolB%r=1W#ol@TT=Hcu+OEXox^bC+08t#cOj*C`cB#Y#pB&%;_ZhfBQQ<MO4-MF&q
zhpKXg44?VD0d_ljE%b$=K>Ef`MGN`vsX^gB5#6a}qI<r#TK$vV=5BT-(~wXen1-2i
zhG(4W%c1M))K&5BWJr~#+?$`wsf_&cXzuICJtX^kVLYI0kajnfLlUDCi~F|b>u>>z
z=3XR}{ZHT`?9ZL{fqkwY>-$#;L6r+7UW`;7mQOl%)=z2D(momOLdEEtlG$=48yq)t
z=eBOhFB@fsoAL(u_@N0NjMBOwAU5)=Mbv4eHNp7y8csIRlU-v3yw+#vv3hf4nf$0o
z7Ro53s79DNvrh7>?}v_3yEFNU7*%P92EpkZpcFaUx>*(OKG8kq@TMj<cdjyw-*)>H
z^cgAe8;NbVEiSpTfLLBZjE-UY4jJ?7XHjE{(w};+EQ*7<F|wHtyd9$ziH3&yp$w>2
z^}c^<m%rOt6Lo}|N8v{=U~WrnQHR54#zGQ?PT?$y?)93I2^6joVRKVbNP8lEw8JLV
z2L_%Zvs+g2rsYqUuSaM6@So&?B%GIVM=`5SMuoP9COuluE6xdM7lzf8DWRpEqFe04
zG}NC+nvQLQbJM|RZDgL$O~!=VLvsx0O6mskuVR%%dsS7Nn<*t_-^3lgB1nGAo3CT@
zhMN9f?tdnTKlZ`9DtcjREM}??Gn1q^ahNShpp<SkuSl>lg5w*LeFfnA&&xbu20*_&
zi$kYu6WQg%7jCRVjOCVDRA)1*9zf~gcsibig<2zdaEr*I)J+J&ShQEr>yRwGw#Z;Q
zp?Iz}y47@?cnJ?1x@dM2DiUaX{&|teD1~30SP!wUsQg;>n*5KfAa-m+C{JDyR*^(J
z2;m`JB)?K%WCm24SA;&C!=F)()sDmVwr=Din$8wH)zkB~$)<5?JqKfc%^oGD37<Is
zd2z-|kKU#B5oOwniR;9AenY1P_Ye0#O9S#+WM?zepk$uvK(VaHrZiMr=5SlsCyCr|
z*JLyx8J=mXN)nsgd_IDwu49EzYX%9PC83qzdgoH)66rk8mNsLpQ`_VGB?#vm=k0w&
zM~%Tell8bhh1qKTV|v=v=a0LGG(QRpN9#(RWeIOJ==#Fkuf~>##wl=G{{Z-ixk0B0
zxi+yu+#b^>Goiv}_QpgRH`_K^h6U50Rkp;e4+#jQo(;6t@@i;DC2HO;T_G<G>33lc
z<6`c}R(LZ<=a_pEmWU;qn3EE9zI?yD?K}1lE{A!dQV6XAB}zUiNCUjJ1K1^$thI4V
zjL}8St-9Tr#uKMfhX`?wSE3;`re~byCSU5T;xU>Pc5*Uiu)K6VyRMn7!*yP`TXyTJ
zM|sly#N!?U7%qjUYr=qnSsK4k*%wr1NCkD<TjZp4u6=gUt(N;9i?5l{3Gck>q!lWo
z{5%R_oLl>$mF&zUG9?C4j@s@tTyJMXUvFQwY#JYqM+2AZzSg<-v;Ztt_9BrR??lBJ
zW$+Bub{=ug{Ur^#%uUrrLjB}6i-FOB`aM@4O+ryi#tTMy+|%*M23L_I^a(y$cQ_4L
zb^O3^)p;>d&*RCBS@es?f?3?2)NBkl)N-hfq^$*xQhA}!3C^a%qa0AvThGnEaqc`=
zY(TkWE+x5MsA=+%RcFY-{xm6a6mNV$5mYnEX!~Y=*iYB;;ko5XVURDr{K%zx_ZvZo
zyL-^eM2Fju*cq=l?_<xZS-hVr73-&i5@s~LmCt8ptdi^T^_@jXAI~~=<9U(?z9S+{
zIZv!?W1)*S@oI`(5}mc?!cyV4%9Q-<ns-?s#fq1T8tj|&Vs2W__iM2Ey4YcxIn+?4
z%MDXk_@2jX2B^S(_QU?oOnAlF<VW8zIKWI)y@_neV~$<_CAakp(qTiKCgXDTCh$Ga
z{^PVS{~}H9Sp@1C!qO6j$cvSsOjM}1e`;(LewFBXI3#_k4Ue}pFP0hW;s9(yhaa*v
zf1hpOetG1MnJi;Rv8{x(<EQzFB4<%G4&k-$aG;JMi9RJkYbZ@$O!!u7E{3t9i1oLI
z_Vfg3`W|Vquu@|oGd2zaD(0i{LTkYt0|U|3t_FCqV6yWE|F8sZ)R$AE`kX|l(>+LL
z&oF~AWeLY15p8sUGfOlk>af+f98lPBlw)6O^D%M-_pxY8IzGZCFxtN(%f|k-pRdGT
z^Jp5-c%xt`q?v>Z4G##jM=wG%)NQq%fEnCL*S4})5vJKHkW!#p(g4sSXKiyv%!rQM
zIeNlUDLY<=cUY3Ti$5TsZ9~o2>BwWHi2bx5<-vf8gE^Sk`SYQkPp(+c$#KBk#%DE}
zsHdK2e}=MTHD*rip-Ow(|EJDm%Q-uh9xxRj6ExL*S<JM^wY2M6x^o9=he*Kw>c)Z$
zpS+!?nk1AJ#xJwA#XM$t)oiQ0u3}O$$C1zyUtl|i`Q!Wpx-`KZgJ=d(H~L!MqK=$j
zsDY(spq%=e_s4Et1b-m?2Rf8mMa>M+%w4PN-5IQE-0u3Q97?@rMZ@dag*`%v)|HA0
zmxpdhxou4<;S*cS*?jelFy<Veh>(_C`Y_`ve6oZk85>qB87I*%4BXq;aabui$H(kM
zxCgq(8Tj#uX&5^U#piI33fxJ7BV30;^-L0}JhVd#)mpMdxjA1rGPhV;Po+@zQ4RNG
zn8{EK6kPJoLvxc|u_NKi%OFSP*CS;q53Pzgt7i!a+KjoxP86h(%F#As(!savy(qOt
zi%8~<CE*%a{iV+_X5lipxfCx5GmO6xXFi6BG71?aYtVCu$L!L4e3T+z&|A0j2x>iZ
z@M@e={21(~;v%(Da4Q+<wjH!}#>9(un&8REd(QO=IhQ*jZKGH1I70N{<@M8E#y*10
z_fG_^k0j^IRrI@={hetatcF8rVkYs~nymfN_&=`W%};!TSk7e0k6bT)8^e}-4Zlxl
z`ROBc1usL{D;`UMZ{<ym%j@OJ(qsaI%jTraVs~I-v?+dTv>C^Jz9HMbVJ+_4xn4y-
zygBYdCekR72|983G<?bt4~lNi1`)o}DY;$+7To=TwF<Oo{&6mRB_z!-OS~(Tp$G}a
zCU^VMeXVPIcwbicB<?Stb5)I}siCrv%^9?ECx$az6`-uPDID@}bi}Z~O$Kb|ilJm4
z-O+KMiXRDaa+x~*to5=!(e^B_pC^TeLnaS|uauwH^@UETETi)D_V#t?8QvZWMrR}w
zXuDK(SRpzmab15Wci%}{7?QU25!Lbag-p8N#~S+GUw)(e#`8j$)4PAk=S8%@wY4*Q
z=xp!33V+}0ZU4U7SNP}K*!9TV6$~F~XsF3&94qgiJ<L|gFf&H06~OdgB<378L!e7&
zDw4zkVo0s284(QV#ibaw`qJ$f$27HhS^bUTvhgD1g0oSZXrM$vZ$^!)2y9Ec)$>w8
z^s&5e#P9aIWurA`__$@QYy!I}90&W}q#f+e)<oXhnU$TarJQ)cK8Nymfk!I}b%pP;
z$v-}*&s!vOm}36+?Y+P7)`DN?{g1l7b<n3mtw-|i-@8stBMfkht(cCl^;l3~yJV}2
z!*<XgNAP=~T;w)774{l1x@d*Ut(IwUGat^~x!E_=tT_aJBh^yUH}U7S4z);5SF~qG
z=ua&LV&F#oP!I_{{qwD0-Sc$+jyD5&sVU^dy(`{m<lg7&nfngc)qGU{PN2K2(Zo#5
zSG%9&h)2}juXehtM5ltDQx$vw&IshCf|#8<?od#UlK|}Kx*9Y{N{Q54pqpM*dxFrQ
zzS($o7VU%_>*?f$u0pNYPe(z1YSf;HR6sXVn$ae)H(jS|yx1Bjxr{9DKrpr!Dk)Eb
z)i_i}bWbpR?)ecneI@gRXHV2&w(?z6$IBbe{X9|p7uT%ccgYgj0GB*(Gpgm*$-E6p
zk!wwl*QV4viSsfV_S9^3+B5Qw%MaPvJfe5e_}w-f8DykRjgtNv^P4Y_3E2HY1~bAp
z!qYzj$!3y@o`Vv_Thg!+DA7e&*%KhjJ!x_kfqX|;HHza!*#kTQFFVN_3BGc#e#>o<
z=>nBFUULB&SasN^;?L878~9h@_mVxMa00GHL=eiQ<~;*xp!I#66Atf}av@Hp+4+`c
z+%ASJ57P-KU)inVIC0%fc4zWMxM%LCIU;>ao=5R*s|T~x<B9h;koPuA!iI&b!|)E>
zFtmJ|jP*jWtmQ8#EmuK$q$mHkT-^hrCw13N%!0Fkw6Xq!RxHSXb4J@3nd`X50{+@J
z9r%@&_~NJ9;7_xp1jZ?(9P&ZtJ-K(v@Qq56RSHp~c0WWlUHiX~t0fE(%6`7WH552z
zTF7~a942z3SaR489C8+Tgmu45I^6jwM*l7JcWYiU?5l{t);HYC`asDu{Lib{K0ATq
zHFe8!g*#+&<@?+GWNoC$?I@Z?WTszJ$!lWUzVY4AKkghtk6c+72eqKJXQWW`FMKl9
zLoXJj8y`!pN(B)*Vd6HA3hfLEyrVe(9Jf6=Qf=};v|zYSc1=jxNEdq+xUz)zu>CbE
zd6wS{SAv8(cy!Wj?2kM11uKRGfSV&x_DC~mI2t+WB4Sp1H1V4lq;%oFlh3TJB~~X&
z52Y6WMD`Ynym2WoTrbd()}uwQ+1w~Xzq0O!zs>A5_$v9DdR$t`q4h}2wOEvRR&?qi
z#&xJSYA2DFKNd+!HL;KRaU^sZ;|v!+XkFa}LNQbA=i86ap{ZyN5_C%6Sl-7!nxOZU
zM5bG;l4d<#CI*}w{a#n%TdLJV)#xr}p;!n_Q5o?IG)oVc)OP9<50)wFd?Q`zfjy(z
zLIN|%s;u>I9~J*FP<|l|ge#Yb;k|>oTIdvz<A1AbR}%!S<n9Grc5|LOUm!TGI$%#A
zSP$-#Il6pLFt`#Ula4cF5&3Z&-!@4cj_c&?NaNR%sQRJS@+b^-N&X>OlvjMh!Hc$i
z{>))!LU+jkMjNC3vb#qIR^B!^9cch5(lknUE&Lv~nq0#?Qp-p^k_p6>{FxIQvSFOv
za%P9*K%EAlQ$~qrv9Nsvtdg};Q?R6KsC7L>0WQW7IKD{kbPVboBu(A8fbD)^icztY
z*RqgrCs1n?<Dy&o4couet2X<)6r;Fnw`_YHV5z5=-)2eyUp1SCe{0$)#evJv`ow*;
z7aHlo&g2bgu`F&&z?_Y5%Mt~O_EzEcH&oXRW`V<~6Xnszwp$E6MXdLSExjX)Na7C8
zPKStXtVRClQ?yKra3yn~xe}(cVsVqV!}0Fv8XH*E^x$iBb~R^oS4=k?C3d>=`dGfR
z)=a@-EywEqylrwde*y)I2mYo!ca^=dJ@--~pKYJqx_<cF5qrGp!M8>gbv*IY^_~n`
zEX=Yt@5itM`>&YLkfTE79V5O0?ZF*eJN6hptfK@x2~Tq;O1H*-qv?w$`{N*;M%zFX
zAn`MS1MlNtt#Ye(O-chA;`&%W-H_+C28JFTO%p>!?DM8ildbDL=C<d<^x$ljn&Pim
zBGNqyC5Q$q5l5cYgxF;cX+)Q*S?ZR)^kut-FZ{D|LG!>QcgNK~1Ew6Sb|1K&+s<8%
z4eWgMQGzX7;L{Mg%pD_CRwlGog-jT=#rW0d554ytYf2uGYKCT8BBhT+{5R-t-WqZb
z9iO<oK5z8i+Y@R{I^`T9JJc2PV8@$gdw#61rD>X}X8U#VK!bs_*bpG&E@>Hx6&Isd
z9Ks!LNwptmG=Q;W3ax2gckg7|G(E60Vri4hWAyEQ*P{!PCH3PkIO}{or({#wF-xtV
z5SogK1Fe5eeXtFpEF?6;UJi9}8I0K}7_H2s)IIz2_{XVD2`$O|gn-Auc-e<z(1>I3
zp{A^)H1UBh%i{NU9)s^_I&6_vnHvdO*FQ6Uowwey?Rln)hwKH7^Hf%wa@gDX)`=|a
zm@zJEpFY3eI}4CyAeWIeUz<t|4w6?<(W{{jr;ivM7@r3TXf7<GE^}`QSBw7Xl2hsI
z|5Yx_6+Z_@)?&5&R6Y!_X{&GP7Lew~xQ0S%!;NgY2S09;3qMcEE%6Eo{BqyGw`qw6
zf%d+>1*G{8?77Q!!Ah&9EyS3Kh5p7G(>zKFZBfxLvBs?KQGgemB+jsE@c!nXy(<L4
z2m=o-F!}hqRsze!9J|7-ay`_d2c^pX_ZQ!FcoJpu%#@#8PqGY!JRj0Xgf#~RPj`xA
znEAA7?YaB)r70$iN{-u#T@z&+^LT>hQgQr<ElpmK@f#TZtT^Q7gPwwXRJV0F*1dRe
zRh6Y3u)ROcFFJH9(%VP3FPe96K53^7Rm6mH$3IVGPjArd6Q08a;!UfGSRM`Em+6UY
z*VC_zO<6dmxZawlIt%$4jYq$!_D1#Knf8+4$FBy-L#Ggl%Gr_>bB9Ha1KmXO<rNE8
z6`g{)D;Jo<S%ie`7wKNe#H|E!Jh^E35QrG860P<quP#lqUJ>`E@)wSYo`#>J-qfBx
zr)b@IZ>&)@^sf9+-Wq6gZ-9p5^c}K34pJB#@DYVxGqbAF@@MB>@zqnKlfTE%Rqh3N
zj~tq+IjN!8RBqO<e%03Z?l-9j0_&H*u}WTAfRA?VbcDPAWKQnZ#a~-Kr_y%`k8DO^
zY~0<%LP=MKSg(9gY8lQ%v7!D2q?8+(c{>=`@>ZgGkT;!%B#nvh<o3Zx89IYd7cRBe
zWMMx-GQhqRRL`snAIp^hBD6<`tx3-E23_y;ixBc}d^gqla-`roAabfyttz=_8ldrO
z|I?9QCNNT{{cso%SLt;t$m0CehM10jIzsNFUg!8@KAGqWfK{h@vYgtesJj-t)9D@S
zYf>ewkbxbE>AxI@qdDoD{OL%eLF047BelbV$fSzZRn^*<A$5zPVZQv*^19naDrS^&
z;pe+nBA?`)E9bY>+O8tbk~xAo+4RRPC}&gmbZ*-r74^>`AG<L)k&uM4iuP(28mRP6
zG%yGT9Ut4YShTz|@q3LDZmWhL`<%lIkQ|qDa2C9*=Gw^VEAt4Sdi)U^#vWr)Xc0Nh
zsSxDtUWfmz9PfrIGsctigO*?M^_vl_pM6=MoBn42&k?79(YIk0jW8PfPlDw;;!YaW
zE=Bh~-?8KHK!4udcao_gtF<iJiVHhi!*&|i6M5g4pE03Ys9$PyU7oqZO9x)>a5|;@
zq8|x59<j&;-o}Zsc#57XzXHuyy-FcKa)r+I+dTe{(`No2%^FADo*o>lX6WgWq|hzz
z{?YD*ir$Io!U}^Xpy)NlI>LRa5A~?E`GvbtKZ-0GJnTOM4xYB(W$qT=t7^tkgUm(*
z)#xzlI*|rs;XEZvy;xyv_<bA(bfU}9_(cuESAQSG7(Cb&?qJ5}*YxEp))rf0=Du1I
z2VHIz>(YC&JQR)GARk2d(Z`xLFNg@ckFjQXLJQ=rGJAOJErOga^ps&6hS_UHYAbie
z1R?6*X?ren&$U1bce(bB+J!o4X%9R>FXN$?^!FaArem(_E{mc;GUNi(Xx!vzu+Cba
z@ax%xgq%-@O(YI5mGdQh8x|eN=>dx2(U>q}_f8i+?~eE7Snwa2CU&)uuA?3&@_eF`
zMaZY7tmgzCKebY0h#BF{X^TDH!{u&W3SJ<^Y^Jm_?cmeZ)<!4&vYq<zjMe8AnM>sZ
zk{(7$JQH=V+15&Si)}M-VEd&X9I>RRkeGFGdV!FWVBN6dZ_>qR8rNi7uSK5_zOsV0
ztv%t)w2^xM(trI*Xw?2g+_m5<Q@|H@wi{M6mMI5Wfo#oKHP8N8jkAd@c%<b%K~tpO
zBSwN|sP3i|NBS|I@fXp+1y!?eecVdMr&2|w+EP@Ocp9msAsX~I;h9ybR?G%;EY|Zg
zEK1WpBnEl$NMz8JJg5Y}v6z=4N0>wu)*!Cs<+Exn;5=#uL6~zhg4Q>h(m<!U^E@$H
zm{P1?eTWbFl4?KdnR{MK=03PglE2yYdm1-AGM%UT9wAJRY!;4}rB1zsO-TG^#F}#q
zrC$zDMn&Xss3qBQeO!+*Nk^s(EXPl*_uL*2%o$N1d^tW{`T>ncMW56|$D?RQD{DOx
zS!A?CLtD?)6tX8#S5+2t^UYkoc9Uj5+$e690=oPec6$Q-sK9&0;H?|dZF8>Y#`^ro
z+=5WAB8i=d&95Ty+U>wSOx<Ry``A|Stm!<wrk)K5ThkPi9SPXVVA(aZw1fC8I`3B_
zRY1N(=~~iPAV~jBUI`%kREpX_(CmEl`>iH9JInm=bJ9{mgWRz@6g*kOatJ-noJE`c
zT!Kg;TLQUutQ=91<zfC%LjmWEdJ8nc5bu4DWT`Bm<LhvplkM!hb*U_xRaPL9qx&H>
zLJH~5t<E3Ij;5WnIIF{41HWH|)8E@H6iR9c=*Q*#O!aQth>vLn(y~>Dc^`H<sj+zj
z1&uzE=?H=px}_^8c9HALS=6#JlNS=u0TSyHR`u3LPwQ^Knsr+m_v)UnvZQp$Ugpg=
zIvi8V^R<Zcj7oGozApFPP815~*Z=k*4dwBdo>V|nK@~*^Mt*9T;XeK?Eyr`*2D(Lh
zJlpcT)@04~h;JLrC!0NE34phQ<o8OkZCx~1$+HHGaNv({kCslnuuNFfAmY*#GAxhP
zYZZ(YE@HjD5(0`mWJ$henG$8qPO{S6vZsl#3OxE8vxOpbK{w^D>@ktlX?a08WLti0
zo1SHcEhMIA+?L6+p^i@v!3uS=XeW;U+HDEdBBBxhqyShlqjrD(DL)#~7dY!HiM2gl
z26NrbVK^gx(a!3LyW3m2K1XRWLha18tF?D?gAARq3qL%nAa8Ni#V}yZmo)pB+_Su-
zf-XOzq2YT4ZFF<yS<GM2?>&2NS|m}4;Uh>^K8dI02LM?I$!d*WYtq5SMkvvU2plJ7
zn?U2Gk5Iq@PWC>O?3UZa+ce5DPeqG;rYO;8%yR6eFw$4Pf?fZUu#++Ir_i%_GJQa^
z_+C8_=>k&D%d_blO<Vy1+eiCF4Jg+;Pct(??d@<v3)Lwt*yc4276!&Q6qZ&10cY5%
z*E3<M>QE$0r9{qEKtXsvB=#nBCd7nB%c3QMT(;%qBNyLf6viw71?8Fy7DV^u7SIb%
zd_34G1P9Q`;l2D*rxMvGmcW+<3GxhHnKKtw>V|!Qpn9x*r%#Gv2>Ek!i{n%HP~z9Z
zg?fZJu!gUQz5I!GDDQLC;pc)P;Q5mFp@SW92uE%4bBuNtWy9K}>!L6ht^$X~IFL9E
zFYm%6`&5$FUSd4<d&#Zvfq3ev!ZvB^Ndw2DnSG1Q&#(`@diwXYfyIsI3|LBHasfye
z%pS3o$~p>2+VU<xW&w`U{qcQ!xpW|B`)&$U1tRB{?|2Z2a2DA%z){uZXTW~ZxHAev
z7d+>d0-Z}8HOnsw;-vZ}7-!ipplY;?6LSHjUuSKHH>BH)9Z?l=vx4LDO*f4iUtZ5k
z)YOj9nK3M40d~T9;@091=~Q0|KS5}zXn9ABmkSXd&N$A^@SeyAy}PG-bX|BKh*i8@
zG7b;sI2Q(_O9VJeurJ7r(DC$;QO^pZ@V`BW=ql=Tp*SDgSLIdj{y@~g<%vJ_Yq^nP
zP>{&tJixGNgE;smtb850db8p=WK}tB?v=XR6v1-1Zm6?*n{L7g<+b|K>IusV(p~G)
z_83Je^+U?9YeHrRnv^`oqgo)C(R|GadDHLgAZa={Klh0Ma*t!VHs?jBIq7<_GuFqO
zlo5LQp-&*s&7h3c@4x<DF!<q$3%j^0R1PWI3#<O6?4Hp%)6?Z+=a6=+EJbayOW{m|
zIXrFRSxTKFEJN4eTI@TI-&25kdS%NrTA+$bmuemZrGGjkJ*?w?0r9CuQK6%0J0-(a
zY>G)-EdQwt=0$?g+It=x_U86<3ba@%{yT8(EZKWbQQ=vy*4hEDP|YEj8@Z0txl8!%
z01;#<^LAs}FZS8poHDH$M!__lJ8&81_Fa*`3&E7qcjDNmj<9B13a_<C;h0h)^uwQ`
z%Zd|B|0IjkK4WrMVZ9rHw`HoGKry=Emm(QuQw4kj30|<$=*s(W=}$if`^2Sg!L>Oj
z9R^pw)mh{t{m>0shO3=pq#;iv?xD6G>~L(aCE;pcMvO~7Fc5)dnhcR}Ae2}p3Zt}g
zAI16MT9~*HBPX3+Jq&}8ve}fD9`F}n_69roDQEW@;^mVoB~Ru@wLD%|3gJI@{f&>z
zwA)S}V}PKnJTb;AY0MY$snF$0jH)*q?1;$K>#^sZajtTZbt1-u)pen-ZHM1q{QE2R
zqGCTXj0d}<Is8*9kz`)T(w2~{d_2d+b)+mLDEqN`y+pZB?99yzFO9pbUvtZaLg$Og
z%Fe521_7@h(uMs#`uPWwu2@v(%w&eyqIvduKs}(LvJ~FhGpcE*^8AU)-B?`l3s&Od
zAg{kH))a^XDm{U`0TSLT{sX^F>ppDvSgv(!67i`^N#HMS&@0RE!aTGD0V#t+uQebJ
zd;MBR_Ii1Ebzl-*C@VPoZevOrd`|=0`*3M{hCSw&a~7%r6l#j+r-AU?RJ%jRZa$*&
zC7+bh6kmTTps&`>BK&mF84A<H_pgW?LtgaiL<1@6se$7aN@}E4fzF>#ueQBUjG^g7
z{HhOMdI%IN70#g#evo;+=fvJ{`Ukr{l<@h03t-!O()goMy`SRTuyq=JIPBxmCmtBw
zck0D<b^+<Boy%)5!>H?blYxyLzE6%L&`l6Tn?bD5J}r<(2i6YpC4g$8&x^-<os<j?
zT^zAgfHvM(-up9$tA_huk8VpA`(f>0#Dw2v;{6`s;Wr_{2yRE3d-o78R89)gmWtWz
z!q8Xr;FToGojCo%P}4i%8Rw~+Dw6GS%=+|8@@RQ9Vd<vR2-uUfe+lsyeLn8Nqi)VD
z#+nqyl~fDcJSyOKi3d|;6XEFTE=$3E-5Z>ewHV5hpCpcLe=9W#XllKysWW_~J56n4
zNB!4?5?0=K`2>y~O(}uVYLJp}28M#GxkR(7dD^NPEmFUK;5?bY`}OQjd}-ui8D%Lp
zxis2R=O@t-9l*su8f=aIt{n!FN=>31nXsQrG!Hg|3|ROVp@AC$Zb#sJI(p|jlEeGx
z^>Css14ZS;mjv8MwRl(rph1mF$17P9;~xHX%ztym=Y}j8=R~Kj1~dd9e9OS;rZvVQ
zB&cpZgbG^1M_J40w0?mS3~bpiuZ8YA)4q%!@tGx|GHVKs+h>oNt>u^%XPiHG^>Ju{
z@7Umh5vA@)C;YxBR;6hzLsR|(*K|*+P4+Z-TO`z@{WLJi>a@ae*oEg*{LIG(=zcIK
zwsY8+67MTrP0X;YK_44`%5ayhEqXtt=M}<;rkk@S%mo41Gyvu8C!P+j$pUdY%HW)T
z0_rjmyAxQmdga-jF+d)`S?Vruks9utg`cy(YGKLf6@`Pe)Axb?s*4WkuxFFP*8k${
z1=A@5^i9(=ILbrq#c4)Z9Q;_%vG+>RAP584Bo#PPs9D3kM<^+M6xt3mD#1_s6v{=B
zWUCm#M++`x74drLcd^T!zVev;$gzfxUfsIk8KTrYm!Q;r*L2tzMLL)bx1Q$Uw=p)w
zUaPDBQ#&Cwar@hrTYtD&P}+6Ieegx#W!d1LnTrTo7iJy|*gjFft|K63S&aU;%S>rG
zJa_vEM+$|9$l@hR+`eRbkwo)E@=oAT%HcfHvAx(aerkRe-SYT1r`h?;%xQQX+aA76
z+u+7`slV=l@)}a8JT|vTKNktmkmV{Wx*EUc_4p#-%mz|24?x?L!bN5mndQchRmlyp
zs^8$eYBV*Ce}1oz<1cj6(AT7xo>#}+&rT^Y&NQZve%#Z*BLHJqH|{jMv)nAmVOb};
zoW>VnvRMuJ7lLRy(NzTs9W^>gN-Gc3WTzijZH7uV)MK#$K91<^ivMXOzMdT*shyyp
z*?X8nczyI{sOeSP|4o{a29~7ApT0fJ!EUXRC|4^eZ(T!B8y~Vh^G`|$Uu|^CP_RK&
zj}>A{+Ru93o?zU|S{olh;If1KRkU))e!Iiobny>QVYeHdPo3-n9}^pvEhrCz80WR+
zo9sH-Vh6TA1I7e6!M^AzDz$_KX)svu9hZI`TF3Csq%-}pvWlT1_lNz2b5TY{!4Z8Y
zrr4Cpx;^eC@UeUYt2Js^SZS+KF7bdT(Fx%~j4gXRnRA0L6S#0MZP>vKUX<7oXMDC-
z*hfi%{;@ju=enbkyWx*D`C?dc(VVz9<R-A>@>lbbsc&9Z%eyYpkVv-m?T%(nyqan9
z&@+<SjGgF$7}<ugm#Ynp^Yp#U>Q4&h2}u{gCE*y=9_DqVyHD8i4AQ|%AoS7=QyNi3
zQL?o0*XG-u&gSMDg5!i)5h%8zmS`xOK#$&WSF%<jM+EQN2R+6D&-clWTHfkNKo2~(
zb#tvuLb)N+dWA{oNl)*KK{oS7s_Q=v0hTmd%1zFY|8ihwstj}ZT1eBeL(r)Ir)zKc
z@g+f@eju1M<*D+soXzVBQk`QQyzVV_G-Jm(Bi={T$c1F2Mcx3$Yi-w9`DKbvfa{RQ
zUS0!!=E_vvG1eSMF#oBgxN$&-G<A=BGnE_$96ih+La>rG=8{qtdp*iY<_;CiDrL&&
zlsvLK68J0^l*ec3>)?igKU*{wAsA`6S7HVm^|rdEr5LnXPkt-Yl3p{Z0vjjPGw!>Q
zB7cK(bGAdCD=a{xbf!NdAfhGv3!g+5HO`TU?6@AdQLbB<*-F>Z)U6!k=iI&!iefPo
z<}F9k>3JY~xnpoioIxVlPO{oDP$anQ(32Ll5#W_bVUF>6Paeqg@CWTGRH7(8{yE!Z
zM|j<9OCyDDBy*9`{2QwGX#KD`EL2N_W<1tWz^~Fmzq8wh_hdgje_D_2YI=`F^@Z@5
z5t9$MA#P>6>e7iz3#;QC-a66^E8qRKdk?L66PwPNbW<A}(;7uMc!)!DyxSMCVnLw9
z*XzpFf<jY$s?l5CmDG6#SW}}zS6YbrDG;w%!2R{6_QXf*rAv?i9#7Rcq-o;&>mb{-
z`tJy$n`|?yyenDUjSk8Q9yP7nwiJJDtSK#_rVz3R7q*WsY<uV794Rx8J0|cj*U|1A
zmuSnB*z0T?vcH2YK3pO#gxpCnXnun%>7T|IDDj+fdB;p8+CF1;fsj8=W%VuL?f>Pi
zoiE{2g`Z@!mFlm}m7DklnOQ!SaV*0|!m-<HrLIm=S-AwagmgFS>vVNbOPMwg1(XH*
z2Og;cWyEY`0xrs#qGapim9varPMIqU;3ot**Sxr7L?pn1wG+{a5}b>=U`pl!rSxJC
z+I7%lPurmj8w@xj67xsMKiypCqcZt^<}|5zl4H#mB~V4F;Y3JjF>1PKE|BG<NiZ6d
zsX=OY;uuMSfV%54ha8`kWpQ>txu*YTubX|2@2A{HIHW!JYa<OD2QIslIq}#~ObbXS
zH9ORK6>lylaUiP2C=K-WBNM{W_?=4tUd`b`47otdDaknUC3eiBYX8<47_;-}jtcay
z!-df%+6GQ=QYD!fc)uR5H4ppW@e$HHWi#mllxjs_@xY-PV<>c~99bfN?Qi><8v*Fl
zHRp1DJaW74H3~>Y<#VW7DBoDawK$<Yb-59BShyy_?;b#W%9+I<&Tw2lfS8bnXwV&N
zPqLmeT2hu>l454yt&Auu4Y|yj^c!f?^Jyv;fq$ylH<^8$a|LMU7F|AmE`VIzW344H
z(VdUWq>{@krtBJ5z!nXm#4d4{8JgZ`X1*Ee5#APZff<8uWv?E%dtEHg_kspv(bB2a
zP0oV%{p-|O@r^M`^dp*}Wi~3qV799v^#B=`g_{6_a-J%C1Ed9{%NGzuzSOjtVQ8)i
zZn{?9UgUu0ncF(#2@n#9MN{E7k{Fi6$2OjFi@|x1b{V>QEA%}dVhsz4ZI9K)-puKc
z<n;S(ZUd%4R7kq1nG_T|z-49}4Slg{tBN!2cqy>rj9+KK-<I})YL=&iO#}Z`)b|m=
zE-KJ+DZb0PF(ig(KmgTj>?e)cFsw!TZ5_Ca=_)9Q%^4~~gIT0uNuX}F#Bbcn>Wh>e
z+Xox+2Z`z?N#(pQT~VxIs?jIcu@6s!j!p%`53!g1oQ7@8XE^U&Av$K6j3)#w>4YRD
zq35&h>B}eciP|2YK^dosh!#U8tpu`imQDRoE}NMC&j<BsVn-Je#M}*LiHl2aD4kSw
z4V_mx3r#IK?m$%}0NVWul_XryWnYtl7xM&;ZB*;{X!mZ^aAU&O&sa&`dngNXZF$7{
z=YPr(sL!QH`MlzIC8Y#zsE@bpm7)RT9A-Lc(=v@FiW_+Bq6v#jyqM*@mu~d;&i6!m
z*%f?Ml1e0w&$!#+_WchAnU4cf7*nYnW4h_?`wC>eDQB-GOdtx5l0xo?zy_|CFD0(r
zyBtOfKPeMBc`rLKtvZAP>DBx2h_^OFK@)GQTsoqYoaBtT7p$L%?=Um)Pena%`N_x4
z`nNgt1PpnZD{yq9SU0{`Lq>zcQ2%Yj9}l;~NT8k-B<FL4GaJ}?=amXwvaoWf0(l#=
z{g(VIkTb6Nypa*R*hnS-Qaq}A+ty1e`yPv->b{990Bxwha0gtrDG-@<7&<}#2-%Kr
zg@ViVywB9WD_(U*#s;a(Iyf9QHhTXOTx(t&hqQ-qO+i#3OS%be`rVcsK_z*MmQzhP
zy6!g+3FR;}k_D$s3EA&l4`tA>Zk&diEX$#3JjI)`qPv_3ZbT=5W*G&MU)>Fb8=4>U
z9R~96J~y`8g9}GGFZLN+<8aDVI9eiuDBJhHtOPW932F$q&(eqV3OOOE^8cJ3I35DI
zpb|Mj{EJ!h<b|a!7^fN@%~K$D^pt7nM0WUBK`o<V+jm}P36h~&mp-nALBG@ePu<5K
z;d$+YJ_sFYS@r^D{yfdD`Pl^zyKo2y!-d7I!UEmuQQv3AQO}>60B3`-s>63I%PB>)
zOs;d|DRry^U|kBBI8N?ZvBv<Dp((0e;eH<H!*C^PTteg6so{C3EDFGo+#(0iDI{pn
zr}Ov3)kB=&L@Tp{p0Oj$8KoI6MwaLk?1O5&Fc#e-1&z$7$8P|9=a!;wW7(Kf6Ty&R
z+!;i@M0ky<8wLB43s*1HoWXlLfR@BUUyZx}WC45lgD~2*zkT<EUM3TGETVKXo4aAJ
z|9o2bh*UrLcVX<$F(vr!R&u)tATleSQm!4|%2C6Re2EjEgT^z?w3PP(d*xY#k)gF0
zG{^CT)3S@lF|?Y4LLVsTZ1stl{1ctq2Kl2_)BA`z%*>zU&q0cDYEqniO}fq2dp6ur
z&;!uhf2-a4ZBXapyi=*M<4R3uGEj1&Py4oOiBJ|cft9pGM+&&6sl<jkXxK|0owIZ^
z=4ZXY{;<VO@oWV0J8_d-><z}Li?0O<{nOs4_X#Xp^JLJa4Yx9|i)~X4OaL_4(BMoP
z?#=g0&wsZ8rQ$Wo6$+aekDv6eN)AH)+x*WS*45}^Xk*ZOKb0Jj<TzQK4T-M1P86^r
z^h<6((L;jbsdTLr_C+MC*h?m#6|{`5wPQ=a558g`g-);0a#Vdwgc(NI$_`jN=v@=j
z?L;EaXzjGhxbFC;VIv$|&N>hnfZQg@z_V|tZPN^MFWG4eK#!k&sWUApQbmu|$W8uJ
z8t4^Mwz^%~t5BA<$_1+5&<3wI57h<>T#m)WZV5dG0A}BRmdy_Yz%K!foAOF8o`MBj
zCTix`zQZru+n2W3iAbxVn{4zw1l;}YNSTtqQ47J{-eQDV1J5-4?QEy#mHsSvIT+A>
z$99gi3`Bi;0UHH~^s-(n+fN8(MFZr8%aj_$y=96?2y=G!JegQY+PLv<Ta3Wm{d%*~
zQ4F)v`JI|X4OVA-%A#X1NCoynN@QF}+;bnPd{y!}&?nFLfa)m&&g8=Y?zVQ!%EZyc
zH8?raQv@fC2rA1Q0~E7HTrM}~{&*Rw7WIbUZJN?BdS*ta<41ep#3AkW@p|r^NJQ^C
z&7ipGHE2Z6K>q%^J@+!vhRNmzui1xj5n$`9HX=%cZLw4**gC~uhkh#7I_+}<{VLQs
zC2+&a#EM0U#~8&pz;(u{dL))V2wsRQkokuCc_gudO0gmwRI+t?<w9Cixo2RP94gVv
zSa5iaoI?XA$x^hgM@7*K7gw|QJdBP$wK#@6!0r6*Dm5drv+ZuI3bf#VaHtl7v>qba
zPv=EAsZbbQxMgP!Y#QF67V`9pUKLsizsp}U6Zoe+2hiTY89)97X#jIOgFJ|>)DO_i
z;Er>25S)MX`gL<=R9%!qfD=@|Kdy3eWP$R*duDJ=44Z*7Ag7Ojxfv>Nd=tUX6RCj;
z!hfJQnfVWK)l>kmFW>Uc6#N*_XKvxwAlM}bbHRPnh8OV0^QP_v*cf!S<I}=k81%Li
zSjE1V;F<bdhje-^q$9raN<BMLQNfkb?0+db!4qZ6zAs;0+%9Giv-=#Ehf1`2RQFVB
zh`J6;Kb{ZvV}L1wAN}}cWez`fwfH1UOpV8L^4)@XVIACu6TY*o2}j_gX~x^sjwXS;
zf`QiE7`ZL8s3cC0zF4`~2jRp74MB`$?)TA#O?O@a67*vF#_<o<{4YD$yrSE_Lvlr{
zf*V~{j+>;*3<NS<K6S&J1`q7fDGZ)crbn8KErS{y!+({<QuLbKvGFnGVkD|ZTDe|4
zej_4oIpEv{dITK|Iof{M#gHuPt}f}Jd(q#!hZC(*u6~Bg!1QZ>(P#C(mCu?J9*2N<
zNT&K;BAc-yJ`Vi>q7a{Uz4OKOfrmeI65Nl$UlDk`)zZX&7Wll?(Il|!f5-d7VA>Qt
z3L6Z~q4p;+k5JgZ_|}T{o}1bdMX^gyk;RTFB3|Rz>uSPwC=lI*aQD_VQwWcLg>)`|
zvm|TgsMJy5--O%&)C5zqkwXNkL00+*!k;22L!b#~ICNJK@|hkAjr%6Q$NV?x9aDXk
zUog;8enuPr3y9b9vaH_@Av4Zs*qk`yN~IJsT(R-R4jBuxv*6v|K*a%6b}O&##qW1E
zgjIy?&)t-~4>y)W^6wX%&HKUfv{3%IP8&w<arC@I279BuGQH4J41OAKzHhj1gkJAL
zE_`R@B^X^b|FkX<Ma{;n@d|*GUSU~%_LK1H$v@&|4;=pFZEGni3>M=nmyy|*98!)2
z6{=t?=mh@}`~+C9UYL0z4Wn$`o$wVOFmnxsILdAlc#5^>ba;t9XwviYFwl8%i|x9(
z;E+pz%zB8*Z*St7oq#$JA1+@Y_k&w?E4)CmseZQSV{wBzBV(jmA!5rWxXr>pEND6V
zdWT&yt$Tz2I>@QV>*2uP70AQ~T+xI;siub;6>zg;VRs`&=itJ~Me4Zkh1LLd@f@?;
zck64OOS^Di?tLcwI)oZ3OS<B-P0&L9lq0|=_Vxq{eZ{l50lWs8h<8rEXJ<o$)0jbr
z_IE0h(t|`>w9?9<f_uyAw54U>3_yAYX08y>EqfKN2E4|)eegpZ_wF;Qd9)dvb|9qI
zia3Ist7`RxviL95L4Q4^Hw2*eg&-v?bP*1cBTNmmI~$Fs2rm|LOf!~BA9q%roW;E~
zVFyq-fJiU_cC?z71g?bIx3T;VP+YbnC_6=+ydrN82d&?r+cXq@wtuzqxz^3OezGS!
z1v~}6-4<OAfEWJVeYlJ_1fVUW;{+aC(#nr(V<UWx;rT2Vd=Zfq^}waAjFg*SLRcol
z=DxSf!1yz{Gv`$dhwfd0Lcf=-_(pTW)AbMR%fWYfS=c(4tjjiaM3GE4#T+r$F`@EB
z1TaW_6ClB2CV`VAn5&R}(z)f|aG?P9vN`6$z~6NJ0mvJ>LpofGPm~jPp;})j*H0b#
zU>v~7@tt(dv!a#3sXwl~e2IT^e`|>BXQ9t;ht-F5gl2$$<eAwvTBrXY>6IWNO#S?w
zI61FybOGdLUm}?edAd+%sh_U#YssH5|I#)B2|!rQf$MxT*Y0y+jKXge$#-z+OQ73h
z`PwwgK#pF~5&Yz?-}-iVd4CXaGGWS3>iX^|M}DEG@c#^B7UDcUGd0_}A#vsN)Uv}D
zq}lD?Y9mnG%|-K&dm3r<7}p8b<Ce?2G*jhYsEva^wb8fUw|ItD&&2zG=oPKvg^8@n
z8qgBFBXT6*ayfb2`HiqJbI?%c^JMDq3QkS+GugJDv;Wf0GlpbeXn5dzi}@eDWZ-_U
z$@Ac6RaS!v9#^z@$LWef9`vsX7zoM1`R3hU^Rmb4o#<fG7q<P#2)FzmS#?$G*t3^A
zxVcDhT>-exSCvC0+ZFfi$nf5wR_z<+Mx%W4#2IH^INCUKr*2H8OC|y}mqV4azL)R+
zL#}+~w)UjzhhK~liqg6!Qs2=bnHa<K=Dh3~Vn1r1sxHikb=r|tI#Ss*NZJ3ojw(^n
zjOA~67tE4uOHQ^nkA?Qp(2BXvwL6{)DIik;edQm)B$Pi@=t*0dsZ-d-D0L&VF>wnp
zvgX^NYfV&?(2kdVND*Y3Otn>)o^5P&X`%R}Gm)g~B3JqI09-^~w$}b|klT<&1W%VG
zrFU6TLsftW@5tI*x$s!H8wio=>vKbk?2MzKyNqjkdUU?{zEC68NN@(jz(-T0@eAb?
znh?YCH@eW8!}r{R@=1@R->gnSO^UAl8m2QM!iGh!%>!)<(Y_+7h!G}O->lS9{gcyr
z-&rp$QyRmbc1AkF9EZ7l>?1=|^H6h0ehNtIm$Fg9MCK#=`B0^*aka7eF3%=NSW&PN
z;<Q15RQJRz(PQA>UDr48(s^lM>}I{=l^~o&!omO2<m^+Xqw$vRao&fkL#*$#ySZi?
zVg~12FUyewe5g~^^j&sb42WHs)VErFN}0^m`ER(hxKMd~_Vl)OA%TH-iuox0O)nsa
zKetNXc?O}%vp*!~%y8RIH{In%i!vOqW7s818bb}ZO_-0>a>8`wVF`}nrI{N}u9l;3
z!r3Xi<(WNB04uq6%*|-O((sjXL0OzS=UVK$P~}3Gct3}`hT+|D#=6Y(M&Qn@6&tdY
zews4$Ee=Ya_qhJTixClG^D}>OSOuTMQm1hf4N-oO<ZS{_JOxb)tMs>WjA)kuSA$$j
zHnnOx&MoR+WQzML0((3kbHomhz)~8rR9$OgQ^(>+QZlVxY-#vH7tC6wS9_p9UzDR3
zCJkAi;ew?g%`Y)c!-f;BM}z55%qu>R$HrEIp6D*})Ycf7L72M0JBC^@#(;8Sa;x$!
z(W$8wCyb!Dvi~B|jU4u9kF!J#$JO>h)%a8HHSz(kFO*o1i@^JO)%M%GDReeV{8-G-
zxpF%Tmy1o{uPGxGZH&tY7v(_z@=y-xuIr7<Mqf5i0zlF41j4auoaPjUSyQr4Pu>C}
zI2Hn!uz?(>M61A|%R$~XTu>8kZp4EJY2|e)x*%Vb!<h6sLSb(qg<z~2g8&Dt`%qxm
znR04lT9O43Gd<A}V)Koy4#C1ABJ+vO`S}74bj}uX;&w#Ds`u1Wk;ehfc|C@y`n+iR
zi}-nRHtDJZnPHmtM5x^1eD!QFR2C^pEDiEv5bh&6ILOsdpt9@eUG;s!T9~8j5WBfW
z8dY8vR$^Oupo_7Q_9S$0DrzskCJ1bcb@m1CY;BInHWYuuZ&5eXWmgtbG}{x5ga-tm
zIu}S!s`JqKQ`1iM@cnEyyW$o31;?J0NQC)jIi&iWo!mVe347hUZ$WRn?oiB+34^PC
zYDOO_W9E+o<e*+mFj1`ut`=FZRv49-lO-K=9@5(n8dj_$fKMEqqfd#5WJv>w0=eFF
zrsGgTVkuW%_S0|$+ZC7?Q;GQ1*s1u0kLxemKj2y*7D73%LREv4sdNB;mHq%B?F>W<
zMQD%uo97AQL>^saCXQ$nv*xN2Y6dCqD1YQdD@F>LdX7T1p+0#>;?P7?oQ_!d8!1F~
z_+<c-1%j2izC1_S9<(e2o}V^dmklB#9(!VNz!(dTLWYMD2-u8VB`K^>d4+BgIbcWg
zUH`7O09gHv4mzFv_Z|-s_3#R7^qMC-TaTpWq)!$|M&~e4_Vf_bzX8jyk@k@F<<wfB
zl-k#G)|ZMsvJ*i()%9oc`DX|HobtRq31-wIc5)3>>0*tSrWlRSDx{HC8eb{lLe)9P
z)dNE=eHqOud*!_4xagsaeJDm3jT0((2{yDo3g$f0mZr@d4%5P(q)V@qJlOCN9pRzo
zlGpH!EtPEPDFdNC+JBz8e{c>_^pX0QSA1erp~#>M{x@DIt~>=E{Sy1C>493Wb%DU>
zC${;}MOzHZ)Z*&@Ywf-|6B31|O-@XnA9#r=*}?ryZPGK*myG)C$70!})ZEWXuAh`B
zlEL<MO6Vb;hYrdzTih-#`*g>9R#?;Q|FH*7?_X^%@~B)_&U#<O!oDBQ>jmai-Y$Ie
z-uS_;!~Ac1H`g57!0-J&U&Sw_{%gzpln0@K2KywQ*D;jbZ@9Hy^K+@us}4=chS1K=
zc}~Z-&u6$>zTjDz+1H*gi)|$L9zMJ=yPj!RzN7B*m#3K)p5pg8Wbw^;!Ed!IHYHn^
zdli1E<Zn06D|(T^R;q98z9DM8TkMy*OzY~$EgxSkzhx=lWOQ;#y{8$+%#?uiNuF$_
sYN!myxt?m0S7xS6LS~?-3i19YpZ@EynEY>L5zq-Jp00i_>zopr04_8W>i_@%

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-drum-inner.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-drum-inner.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5c02509fb63c4f5d68a81f626b9ae07fd22e800
GIT binary patch
literal 4661
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-drum-outer.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-drum-outer.png
new file mode 100644
index 0000000000000000000000000000000000000000..53905792cb2e40cc5e799a146c1ccfbcffcfa369
GIT binary patch
literal 5585
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
index 8fe7c5e566..de01999e7f 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
@@ -82,15 +82,15 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 {
                     rimHit = new Sprite
                     {
-                        Anchor = flipped ? Anchor.CentreRight : Anchor.CentreLeft,
-                        Origin = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreLeft, // opposite due to scale inversion.
                         Scale = new Vector2(-1, 1),
                         Alpha = 0,
                     },
                     centreHit = new Sprite
                     {
-                        Anchor = flipped ? Anchor.CentreRight : Anchor.CentreLeft,
-                        Origin = flipped ? Anchor.CentreRight : Anchor.CentreLeft,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
                         Alpha = 0,
                     }
                 };

From 4b16b2e720eced66af563293aeded37b1a6b59d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Apr 2020 19:19:14 +0900
Subject: [PATCH 02038/10326] Bump legacy skin version

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

diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 1929a7e5d2..78d3a37f7c 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Skinning
                 new Color4(242, 24, 57, 255)
             );
 
-            Configuration.LegacyVersion = 2.0m;
+            Configuration.LegacyVersion = 2.7m;
         }
 
         public static SkinInfo Info { get; } = new SkinInfo

From d786a2c5b33a0ab6be7ff0924094124f3ee82f30 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Apr 2020 19:14:31 +0900
Subject: [PATCH 02039/10326] Add alignment support for skin versions older
 than 2.1

---
 .../Skinning/LegacyInputDrum.cs               | 59 +++++++++++++------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
index de01999e7f..c61e35692b 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
@@ -18,9 +18,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning
     /// </summary>
     internal class LegacyInputDrum : Container
     {
+        private LegacyHalfDrum left;
+        private LegacyHalfDrum right;
+
         public LegacyInputDrum()
         {
-            AutoSizeAxes = Axes.Both;
+            Size = new Vector2(180, 200);
         }
 
         [BackgroundDependencyLoader]
@@ -32,25 +35,47 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 {
                     Texture = skin.GetTexture("taiko-bar-left")
                 },
-                new LegacyHalfDrum(false)
+                left = new LegacyHalfDrum(false)
                 {
                     Name = "Left Half",
                     RelativeSizeAxes = Axes.Both,
-                    Width = 0.5f,
                     RimAction = TaikoAction.LeftRim,
                     CentreAction = TaikoAction.LeftCentre
                 },
-                new LegacyHalfDrum(true)
+                right = new LegacyHalfDrum(true)
                 {
                     Name = "Right Half",
-                    Anchor = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Both,
-                    Width = 0.5f,
+                    Origin = Anchor.TopRight,
                     Scale = new Vector2(-1, 1),
                     RimAction = TaikoAction.RightRim,
                     CentreAction = TaikoAction.RightCentre
                 }
             };
+
+            // this will be used in the future for stable skin alignment. keeping here for reference.
+            const float taiko_bar_y = 0;
+
+            // stable things
+            const float ratio = 1.6f;
+
+            // because the right half is flipped, we need to position using width - position to get the true "topleft" origin position
+            float negativeScaleAdjust = Width / ratio;
+
+            if (skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.1m)
+            {
+                left.Centre.Position = new Vector2(0, taiko_bar_y) * ratio;
+                right.Centre.Position = new Vector2(negativeScaleAdjust - 56, taiko_bar_y) * ratio;
+                left.Rim.Position = new Vector2(0, taiko_bar_y) * ratio;
+                right.Rim.Position = new Vector2(negativeScaleAdjust - 56, taiko_bar_y) * ratio;
+            }
+            else
+            {
+                left.Centre.Position = new Vector2(18, taiko_bar_y + 31) * ratio;
+                right.Centre.Position = new Vector2(negativeScaleAdjust - 54, taiko_bar_y + 31) * ratio;
+                left.Rim.Position = new Vector2(8, taiko_bar_y + 23) * ratio;
+                right.Rim.Position = new Vector2(negativeScaleAdjust - 53, taiko_bar_y + 23) * ratio;
+            }
         }
 
         /// <summary>
@@ -68,8 +93,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             /// </summary>
             public TaikoAction CentreAction;
 
-            private readonly Sprite rimHit;
-            private readonly Sprite centreHit;
+            public readonly Sprite Rim;
+            public readonly Sprite Centre;
 
             [Resolved]
             private DrumSampleMapping sampleMappings { get; set; }
@@ -80,18 +105,16 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                 Children = new Drawable[]
                 {
-                    rimHit = new Sprite
+                    Rim = new Sprite
                     {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreLeft, // opposite due to scale inversion.
                         Scale = new Vector2(-1, 1),
+                        Origin = flipped ? Anchor.TopLeft : Anchor.TopRight,
                         Alpha = 0,
                     },
-                    centreHit = new Sprite
+                    Centre = new Sprite
                     {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
                         Alpha = 0,
+                        Origin = flipped ? Anchor.TopRight : Anchor.TopLeft,
                     }
                 };
             }
@@ -99,8 +122,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             [BackgroundDependencyLoader]
             private void load(ISkinSource skin)
             {
-                rimHit.Texture = skin.GetTexture(@"taiko-drum-outer");
-                centreHit.Texture = skin.GetTexture(@"taiko-drum-inner");
+                Rim.Texture = skin.GetTexture(@"taiko-drum-outer");
+                Centre.Texture = skin.GetTexture(@"taiko-drum-inner");
             }
 
             public bool OnPressed(TaikoAction action)
@@ -110,12 +133,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                 if (action == CentreAction)
                 {
-                    target = centreHit;
+                    target = Centre;
                     drumSample.Centre?.Play();
                 }
                 else if (action == RimAction)
                 {
-                    target = rimHit;
+                    target = Rim;
                     drumSample.Rim?.Play();
                 }
 

From 61d8cfd2241453074c3d5067b18b7bda13afccbd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Apr 2020 19:51:55 +0900
Subject: [PATCH 02040/10326] Fix triangle intro video being out of time

---
 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 b44b6ea993..188a49c147 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -270,7 +270,7 @@ namespace osu.Game.Screens.Menu
                 [BackgroundDependencyLoader]
                 private void load()
                 {
-                    InternalChild = new Video(videoStream, false)
+                    InternalChild = new Video(videoStream)
                     {
                         RelativeSizeAxes = Axes.Both,
                     };

From d27d8671ab08e6a334f9859e46a295c68b3d5f01 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 8 Apr 2020 14:23:29 +0300
Subject: [PATCH 02041/10326] Convert all static getter-only properties to
 static readonly fields

---
 .../TestSceneHyperDashColouring.cs             | 18 +++++++++---------
 .../Objects/Drawables/FruitPiece.cs            |  4 ++--
 .../Skinning/CatchSkinExtensions.cs            |  2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs          |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index c8d28dbaeb..846b17f324 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 }, false, false, false);
             });
 
-            AddAssert("hyper-dash fruit has default colour", () => checkLegacyFruitHyperDashColour(drawableFruit, Catcher.DefaultHyperDashColour));
+            AddAssert("hyper-dash fruit has default colour", () => checkLegacyFruitHyperDashColour(drawableFruit, Catcher.DEFAULT_HYPER_DASH_COLOUR));
         }
 
         [TestCase(true)]
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 }, customCatcherHyperDashColour, false, true);
             });
 
-            AddAssert("hyper-dash fruit use fruit colour from skin", () => checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashFruitColour));
+            AddAssert("hyper-dash fruit use fruit colour from skin", () => checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CUSTOM_HYPER_DASH_FRUIT_COLOUR));
         }
 
         [Test]
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     }, true, false, false);
             });
 
-            AddAssert("hyper-dash fruit colour falls back to catcher colour from skin", () => checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CustomHyperDashColour));
+            AddAssert("hyper-dash fruit colour falls back to catcher colour from skin", () => checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CUSTOM_HYPER_DASH_COLOUR));
         }
 
         private Drawable setupSkinHierarchy(Drawable child, bool customCatcherColour, bool customAfterColour, bool customFruitColour)
@@ -108,21 +108,21 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private class TestSkin : LegacySkin
         {
-            public static Color4 CustomHyperDashColour { get; } = Color4.Goldenrod;
-            public static Color4 CustomHyperDashFruitColour { get; } = Color4.Cyan;
-            public static Color4 CustomHyperDashAfterColour { get; } = Color4.Lime;
+            public static readonly Color4 CUSTOM_HYPER_DASH_COLOUR = Color4.Goldenrod;
+            public static readonly Color4 CUSTOM_HYPER_DASH_AFTER_COLOUR = Color4.Lime;
+            public static readonly Color4 CUSTOM_HYPER_DASH_FRUIT_COLOUR = Color4.Cyan;
 
             public TestSkin(bool customCatcherColour, bool customAfterColour, bool customFruitColour)
                 : base(new SkinInfo(), null, null, string.Empty)
             {
                 if (customCatcherColour)
-                    Configuration.CustomColours[CatchSkinColour.HyperDash.ToString()] = CustomHyperDashColour;
+                    Configuration.CustomColours[CatchSkinColour.HyperDash.ToString()] = CUSTOM_HYPER_DASH_COLOUR;
 
                 if (customAfterColour)
-                    Configuration.CustomColours[CatchSkinColour.HyperDashAfterImage.ToString()] = CustomHyperDashAfterColour;
+                    Configuration.CustomColours[CatchSkinColour.HyperDashAfterImage.ToString()] = CUSTOM_HYPER_DASH_AFTER_COLOUR;
 
                 if (customFruitColour)
-                    Configuration.CustomColours[CatchSkinColour.HyperDashFruit.ToString()] = CustomHyperDashFruitColour;
+                    Configuration.CustomColours[CatchSkinColour.HyperDashFruit.ToString()] = CUSTOM_HYPER_DASH_FRUIT_COLOUR;
             }
         }
     }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
index 359329885c..7ac9f11ad6 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    BorderColour = Catcher.DefaultHyperDashColour,
+                    BorderColour = Catcher.DEFAULT_HYPER_DASH_COLOUR,
                     BorderThickness = 12f * RADIUS_ADJUST,
                     Children = new Drawable[]
                     {
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                             Alpha = 0.3f,
                             Blending = BlendingParameters.Additive,
                             RelativeSizeAxes = Axes.Both,
-                            Colour = Catcher.DefaultHyperDashColour,
+                            Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR,
                         }
                     }
                 });
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
index 623f87bf11..718b22a0fb 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
@@ -15,6 +15,6 @@ namespace osu.Game.Rulesets.Catch.Skinning
         public static IBindable<Color4> GetHyperDashFruitColour(this ISkin skin)
             => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit) ??
                skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash) ??
-               new Bindable<Color4>(Catcher.DefaultHyperDashColour);
+               new Bindable<Color4>(Catcher.DEFAULT_HYPER_DASH_COLOUR);
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 9bfff209d5..920d804e72 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public class Catcher : Container, IKeyBindingHandler<CatchAction>
     {
-        public static Color4 DefaultHyperDashColour { get; } = Color4.Red;
+        public static readonly Color4 DEFAULT_HYPER_DASH_COLOUR = Color4.Red;
 
         /// <summary>
         /// Whether we are hyper-dashing or not.

From 4976f80b7107ae0e7554b02423ef0515c1b023f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Apr 2020 14:31:25 +0900
Subject: [PATCH 02042/10326] Move implementation to HUD

---
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs |  8 --------
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs |  3 ---
 osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs     |  8 --------
 osu.Game/Screens/Play/HUD/FailingLayer.cs          | 12 ++++++++++++
 osu.Game/Screens/Play/HUD/HealthDisplay.cs         |  2 +-
 osu.Game/Screens/Play/HUDOverlay.cs                |  7 ++++++-
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index 4df2bc0f52..ebe45aa3ab 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Framework.Allocation;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -15,7 +14,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -32,12 +30,6 @@ namespace osu.Game.Rulesets.Catch.UI
             TimeRange.Value = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450);
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Overlays.Add(new FailingLayer());
-        }
-
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);
 
         protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new CatchReplayRecorder(replay, (CatchPlayfield)Playfield);
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 18bdfa5b5d..14cad39b04 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -21,7 +21,6 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
@@ -78,8 +77,6 @@ namespace osu.Game.Rulesets.Mania.UI
             configDirection.BindValueChanged(direction => Direction.Value = (ScrollingDirection)direction.NewValue, true);
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, TimeRange);
-
-            Overlays.Add(new FailingLayer());
         }
 
         protected override void AdjustScrollSpeed(int amount)
diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index b04e3cef3b..b4d51d11c9 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Input.Handlers;
@@ -17,7 +16,6 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -31,12 +29,6 @@ namespace osu.Game.Rulesets.Osu.UI
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Overlays.Add(new FailingLayer());
-        }
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true; // always show the gameplay cursor
 
         protected override Playfield CreatePlayfield() => new OsuPlayfield();
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 761178b93d..f026d09c39 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -48,6 +49,17 @@ namespace osu.Game.Screens.Play.HUD
             enabled.BindValueChanged(e => this.FadeTo(e.NewValue ? 1 : 0, fade_time, Easing.OutQuint), true);
         }
 
+        public override void BindHealthProcessor(HealthProcessor processor)
+        {
+            base.BindHealthProcessor(processor);
+
+            if (!(processor is DrainingHealthProcessor))
+            {
+                enabled.UnbindBindings();
+                enabled.Value = false;
+            }
+        }
+
         protected override void Update()
         {
             box.Alpha = (float)Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, fade_time), box.Alpha,
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 01cb64a88c..08cb07d7ee 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Play.HUD
         /// <summary>
         /// Bind the tracked fields of <see cref="HealthProcessor"/> to this health display.
         /// </summary>
-        public void BindHealthProcessor(HealthProcessor processor)
+        public virtual void BindHealthProcessor(HealthProcessor processor)
         {
             Current.BindTo(processor.Health);
         }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index e06f6d19c2..5114efd9a9 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -37,6 +37,7 @@ namespace osu.Game.Screens.Play
         public readonly HitErrorDisplay HitErrorDisplay;
         public readonly HoldForMenuButton HoldToQuit;
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
+        public readonly FailingLayer FailingLayer;
 
         public Bindable<bool> ShowHealthbar = new Bindable<bool>(true);
 
@@ -75,6 +76,7 @@ namespace osu.Game.Screens.Play
 
             Children = new Drawable[]
             {
+                FailingLayer = CreateFailingLayer(),
                 visibilityContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -260,6 +262,8 @@ namespace osu.Game.Screens.Play
             Margin = new MarginPadding { Top = 20 }
         };
 
+        protected virtual FailingLayer CreateFailingLayer() => new FailingLayer();
+
         protected virtual KeyCounterDisplay CreateKeyCounter() => new KeyCounterDisplay
         {
             Anchor = Anchor.BottomRight,
@@ -304,7 +308,8 @@ namespace osu.Game.Screens.Play
 
         protected virtual void BindHealthProcessor(HealthProcessor processor)
         {
-            HealthDisplay?.Current.BindTo(processor.Health);
+            HealthDisplay?.BindHealthProcessor(processor);
+            FailingLayer?.BindHealthProcessor(processor);
         }
     }
 }

From 947745d87eff2d73b2f6f3c7da091897245217e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Apr 2020 14:33:11 +0900
Subject: [PATCH 02043/10326] Change fail effect to be less distracting

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs  |  5 +--
 osu.Game/Screens/Play/HUD/FailingLayer.cs     | 40 +++++++++++++++----
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 97fe0ac769..42a211cb3d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -1,11 +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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Screens.Play.HUD;
 
@@ -40,7 +37,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestLayerFading()
         {
             AddSliderStep("current health", 0.0, 1.0, 1.0, val => layer.Current.Value = val);
-            var box = layer.ChildrenOfType<Box>().First();
+            var box = layer.Child;
 
             AddStep("set health to 0.10", () => layer.Current.Value = 0.10);
             AddWaitStep("wait for fade to finish", 5);
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index f026d09c39..79f6855804 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -4,12 +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.Utils;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Scoring;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -22,8 +26,6 @@ namespace osu.Game.Screens.Play.HUD
 
         private const int fade_time = 400;
 
-        private readonly Box box;
-
         private Bindable<bool> enabled;
 
         /// <summary>
@@ -31,20 +33,43 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         public double LowHealthThreshold = 0.20f;
 
+        private readonly Container boxes;
+
         public FailingLayer()
         {
             RelativeSizeAxes = Axes.Both;
-            Child = box = new Box
+            Children = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Alpha = 0
+                boxes = new Container
+                {
+                    Blending = BlendingParameters.Additive,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0)),
+                            Height = 0.2f,
+                        },
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Height = 0.2f,
+                            Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0), Color4.White),
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                        },
+                    }
+                },
             };
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour color, OsuConfigManager config)
         {
-            box.Colour = color.Red;
+            boxes.Colour = color.Red;
+
             enabled = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
             enabled.BindValueChanged(e => this.FadeTo(e.NewValue ? 1 : 0, fade_time, Easing.OutQuint), true);
         }
@@ -53,6 +78,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.BindHealthProcessor(processor);
 
+            // don't display ever if the ruleset is not using a draining health display.
             if (!(processor is DrainingHealthProcessor))
             {
                 enabled.UnbindBindings();
@@ -62,7 +88,7 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override void Update()
         {
-            box.Alpha = (float)Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, fade_time), box.Alpha,
+            boxes.Alpha = (float)Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, fade_time), boxes.Alpha,
                 Math.Clamp(max_alpha * (1 - Current.Value / LowHealthThreshold), 0, max_alpha), 0, fade_time, Easing.Out);
 
             base.Update();

From 52c976265146e754738a5c8f94222687537cd769 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Apr 2020 14:36:04 +0900
Subject: [PATCH 02044/10326] Remove pointless keywords

---
 osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 4b75910454..0e854e8e9f 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -56,7 +56,6 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Fade playfield to red when health is low",
                     Bindable = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow),
-                    Keywords = new[] { "hp", "low", "playfield", "red" }
                 },
                 new SettingsCheckbox
                 {

From 6db22366e2bcd50bb60aaa5b327d42e6fa639ad0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Apr 2020 14:47:48 +0900
Subject: [PATCH 02045/10326] Add new tests and tidy up existing tests

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs  | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 42a211cb3d..0b5f023007 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -3,48 +3,63 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Testing;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneFailingLayer : OsuTestScene
     {
-        private readonly FailingLayer layer;
+        private FailingLayer layer;
 
         [Resolved]
         private OsuConfigManager config { get; set; }
 
-        public TestSceneFailingLayer()
+        [SetUpSteps]
+        public void SetUpSteps()
         {
-            Child = layer = new FailingLayer();
+            AddStep("create layer", () => Child = layer = new FailingLayer());
+            AddStep("enable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddUntilStep("layer is visible", () => layer.IsPresent);
         }
 
         [Test]
-        public void TestLayerConfig()
+        public void TestLayerDisabledViaConfig()
         {
-            AddStep("enable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
-            AddWaitStep("wait for transition to finish", 5);
-            AddAssert("layer is enabled", () => layer.IsPresent);
-
             AddStep("disable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
-            AddWaitStep("wait for transition to finish", 5);
-            AddAssert("layer is disabled", () => !layer.IsPresent);
-            AddStep("restore layer enabling", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddUntilStep("layer is not visible", () => !layer.IsPresent);
+        }
+
+        [Test]
+        public void TestLayerVisibilityWithAccumulatingProcessor()
+        {
+            AddStep("bind accumulating processor", () => layer.BindHealthProcessor(new AccumulatingHealthProcessor(1)));
+            AddUntilStep("layer is not visible", () => !layer.IsPresent);
+        }
+
+        [Test]
+        public void TestLayerVisibilityWithDrainingProcessor()
+        {
+            AddStep("bind accumulating processor", () => layer.BindHealthProcessor(new DrainingHealthProcessor(1)));
+            AddWaitStep("wait for potential fade", 10);
+            AddAssert("layer is still visible", () => layer.IsPresent);
         }
 
         [Test]
         public void TestLayerFading()
         {
-            AddSliderStep("current health", 0.0, 1.0, 1.0, val => layer.Current.Value = val);
-            var box = layer.Child;
+            AddSliderStep("current health", 0.0, 1.0, 1.0, val =>
+            {
+                if (layer != null)
+                    layer.Current.Value = val;
+            });
 
-            AddStep("set health to 0.10", () => layer.Current.Value = 0.10);
-            AddWaitStep("wait for fade to finish", 5);
-            AddAssert("layer fade is visible", () => box.IsPresent);
+            AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
+            AddUntilStep("layer fade is visible", () => layer.Child.Alpha > 0.1f);
             AddStep("set health to 1", () => layer.Current.Value = 1f);
-            AddWaitStep("wait for fade to finish", 10);
-            AddAssert("layer fade is invisible", () => !box.IsPresent);
+            AddUntilStep("layer fade is invisible", () => !layer.Child.IsPresent);
         }
     }
 }

From c44957db3f8261da13f277c1b225e0bedbdebf3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Apr 2020 14:49:09 +0900
Subject: [PATCH 02046/10326] Change initial health to 1 to avoid false fail
 display

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs  | 1 +
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 79f6855804..335516a767 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 boxes = new Container
                 {
+                    Alpha = 0,
                     Blending = BlendingParameters.Additive,
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 08cb07d7ee..edc9dedf24 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.HUD
     /// </summary>
     public abstract class HealthDisplay : Container
     {
-        public readonly BindableDouble Current = new BindableDouble
+        public readonly BindableDouble Current = new BindableDouble(1)
         {
             MinValue = 0,
             MaxValue = 1

From 5a78e74470740ab31141c71b623d3d0c4bfa2987 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Apr 2020 14:51:50 +0900
Subject: [PATCH 02047/10326] Use Lerp instead of ValueAt

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 335516a767..2a98e277b3 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -89,8 +89,9 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override void Update()
         {
-            boxes.Alpha = (float)Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, fade_time), boxes.Alpha,
-                Math.Clamp(max_alpha * (1 - Current.Value / LowHealthThreshold), 0, max_alpha), 0, fade_time, Easing.Out);
+            double target = Math.Clamp(max_alpha * (1 - Current.Value / LowHealthThreshold), 0, max_alpha);
+
+            boxes.Alpha = (float)Interpolation.Lerp(boxes.Alpha, target, Clock.ElapsedFrameTime * 0.01f);
 
             base.Update();
         }

From 1c72afe8c49bfbe8df6f7670bb21c8f45cbcd271 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Apr 2020 14:52:40 +0900
Subject: [PATCH 02048/10326] Move fading test to top for convenience

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 0b5f023007..d831ea1835 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -25,6 +25,21 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("layer is visible", () => layer.IsPresent);
         }
 
+        [Test]
+        public void TestLayerFading()
+        {
+            AddSliderStep("current health", 0.0, 1.0, 1.0, val =>
+            {
+                if (layer != null)
+                    layer.Current.Value = val;
+            });
+
+            AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
+            AddUntilStep("layer fade is visible", () => layer.Child.Alpha > 0.1f);
+            AddStep("set health to 1", () => layer.Current.Value = 1f);
+            AddUntilStep("layer fade is invisible", () => !layer.Child.IsPresent);
+        }
+
         [Test]
         public void TestLayerDisabledViaConfig()
         {
@@ -46,20 +61,5 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddWaitStep("wait for potential fade", 10);
             AddAssert("layer is still visible", () => layer.IsPresent);
         }
-
-        [Test]
-        public void TestLayerFading()
-        {
-            AddSliderStep("current health", 0.0, 1.0, 1.0, val =>
-            {
-                if (layer != null)
-                    layer.Current.Value = val;
-            });
-
-            AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
-            AddUntilStep("layer fade is visible", () => layer.Child.Alpha > 0.1f);
-            AddStep("set health to 1", () => layer.Current.Value = 1f);
-            AddUntilStep("layer fade is invisible", () => !layer.Child.IsPresent);
-        }
     }
 }

From c5005eb378c657fff32971aebcb336ea4ff20ad1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Apr 2020 14:55:02 +0900
Subject: [PATCH 02049/10326] Adjust gradient size slightly and make const

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 2a98e277b3..a1188343ac 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         public double LowHealthThreshold = 0.20f;
 
+        private const float gradient_size = 0.3f;
+
         private readonly Container boxes;
 
         public FailingLayer()
@@ -51,12 +53,12 @@ namespace osu.Game.Screens.Play.HUD
                         {
                             RelativeSizeAxes = Axes.Both,
                             Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0)),
-                            Height = 0.2f,
+                            Height = gradient_size,
                         },
                         new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Height = 0.2f,
+                            Height = gradient_size,
                             Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0), Color4.White),
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft,

From 134feefa141b27b81ca9674a8332257216ee4755 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 9 Apr 2020 13:10:09 +0300
Subject: [PATCH 02050/10326] Remove bindable

---
 .../TestSceneOverlayScrollContainer.cs        |  6 ++--
 osu.Game/Overlays/OverlayScrollContainer.cs   | 36 +++++++++----------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
index 0eccc907a1..4205d65100 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
@@ -55,13 +55,13 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestButtonVisibility()
         {
-            AddAssert("button is hidden", () => scroll.Button.Current.Value == Visibility.Hidden);
+            AddAssert("button is hidden", () => scroll.Button.State == Visibility.Hidden);
 
             AddStep("scroll to end", () => scroll.ScrollToEnd(false));
-            AddAssert("button is visible", () => scroll.Button.Current.Value == Visibility.Visible);
+            AddAssert("button is visible", () => scroll.Button.State == Visibility.Visible);
 
             AddStep("scroll to start", () => scroll.ScrollToStart(false));
-            AddAssert("button is hidden", () => scroll.Button.Current.Value == Visibility.Hidden);
+            AddAssert("button is hidden", () => scroll.Button.State == Visibility.Hidden);
         }
 
         [Test]
diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index f96d9e3a31..a6c687f28f 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -3,14 +3,12 @@
 
 using System.Collections.Generic;
 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.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -43,7 +41,7 @@ namespace osu.Game.Overlays
                 {
                     ScrollToStart();
                     currentTarget = Target;
-                    Button.Current.Value = Visibility.Hidden;
+                    Button.State = Visibility.Hidden;
                 }
             });
         }
@@ -54,7 +52,7 @@ namespace osu.Game.Overlays
 
             if (ScrollContent.DrawHeight + button_scroll_position < DrawHeight)
             {
-                Button.Current.Value = Visibility.Hidden;
+                Button.State = Visibility.Hidden;
                 return;
             }
 
@@ -62,19 +60,27 @@ namespace osu.Game.Overlays
                 return;
 
             currentTarget = Target;
-            Button.Current.Value = Current > button_scroll_position ? Visibility.Visible : Visibility.Hidden;
+            Button.State = Current > button_scroll_position ? Visibility.Visible : Visibility.Hidden;
         }
 
-        public class ScrollToTopButton : OsuHoverContainer, IHasCurrentValue<Visibility>
+        public class ScrollToTopButton : OsuHoverContainer
         {
             private const int fade_duration = 500;
 
-            private readonly BindableWithCurrent<Visibility> current = new BindableWithCurrent<Visibility>();
+            private Visibility state;
 
-            public Bindable<Visibility> Current
+            public Visibility State
             {
-                get => current.Current;
-                set => current.Current = value;
+                get => state;
+                set
+                {
+                    if (value == state)
+                        return;
+
+                    state = value;
+                    Enabled.Value = state == Visibility.Visible;
+                    this.FadeTo(state == Visibility.Visible ? 1 : 0, fade_duration, Easing.OutQuint);
+                }
             }
 
             protected override IEnumerable<Drawable> EffectTargets => new[] { background };
@@ -128,16 +134,6 @@ namespace osu.Game.Overlays
                 flashColour = colourProvider.Light1;
             }
 
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                Current.BindValueChanged(visibility =>
-                {
-                    Enabled.Value = visibility.NewValue == Visibility.Visible;
-                    this.FadeTo(visibility.NewValue == Visibility.Visible ? 1 : 0, fade_duration, Easing.OutQuint);
-                }, true);
-            }
-
             protected override bool OnClick(ClickEvent e)
             {
                 background.FlashColour(flashColour, 800, Easing.OutQuint);

From ee6ea08cf85a5c4cdb6de99ed8a445c84248d9ea Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Apr 2020 19:54:58 +0900
Subject: [PATCH 02051/10326] Cleanup handling of hitobject updates

---
 .../Sliders/SliderSelectionBlueprint.cs       |  6 ++++-
 osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs  |  6 ++---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 27 -------------------
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs  |  5 ----
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 18 ++++++++++---
 5 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index c18b3b0ff3..001100d3ce 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
 using osuTK.Input;
@@ -34,6 +35,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [Resolved(CanBeNull = true)]
         private IPlacementHandler placementHandler { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private EditorBeatmap editorBeatmap { get; set; }
+
         public SliderSelectionBlueprint(DrawableSlider slider)
             : base(slider)
         {
@@ -162,7 +166,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void updatePath()
         {
             HitObject.Path.ExpectedDistance.Value = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
-            UpdateHitObject();
+            editorBeatmap?.UpdateHitObject(HitObject);
         }
 
         public override MenuItem[] ContextMenuItems => new MenuItem[]
diff --git a/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs b/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs
index 12d729d09f..f2b13e3a85 100644
--- a/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Beatmaps
             var editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
 
             HitObject changedObject = null;
-            editorBeatmap.StartTimeChanged += h => changedObject = h;
+            editorBeatmap.HitObjectUpdated += h => changedObject = h;
 
             hitCircle.StartTime = 1000;
             Assert.That(changedObject, Is.EqualTo(hitCircle));
@@ -74,7 +74,7 @@ namespace osu.Game.Tests.Beatmaps
             var editorBeatmap = new EditorBeatmap(new OsuBeatmap());
 
             HitObject changedObject = null;
-            editorBeatmap.StartTimeChanged += h => changedObject = h;
+            editorBeatmap.HitObjectUpdated += h => changedObject = h;
 
             var hitCircle = new HitCircle();
 
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Beatmaps
             var editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
 
             HitObject changedObject = null;
-            editorBeatmap.StartTimeChanged += h => changedObject = h;
+            editorBeatmap.HitObjectUpdated += h => changedObject = h;
 
             editorBeatmap.Remove(hitCircle);
             Assert.That(changedObject, Is.Null);
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index fb4e945701..883288d6d7 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -69,10 +69,6 @@ namespace osu.Game.Rulesets.Edit
         [BackgroundDependencyLoader]
         private void load(IFrameBasedClock framedClock)
         {
-            EditorBeatmap.HitObjectAdded += addHitObject;
-            EditorBeatmap.HitObjectRemoved += removeHitObject;
-            EditorBeatmap.StartTimeChanged += UpdateHitObject;
-
             Config = Dependencies.Get<RulesetConfigCache>().GetConfigFor(Ruleset);
 
             try
@@ -236,10 +232,6 @@ namespace osu.Game.Rulesets.Edit
             lastGridUpdateTime = EditorClock.CurrentTime;
         }
 
-        private void addHitObject(HitObject hitObject) => UpdateHitObject(hitObject);
-
-        private void removeHitObject(HitObject hitObject) => UpdateHitObject(null);
-
         public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
         public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(inputManager.CurrentState.Mouse.Position);
 
@@ -302,19 +294,6 @@ namespace osu.Game.Rulesets.Edit
 
             return DurationToDistance(referenceTime, snappedEndTime - referenceTime);
         }
-
-        public override void UpdateHitObject(HitObject hitObject) => EditorBeatmap.UpdateHitObject(hitObject);
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (EditorBeatmap != null)
-            {
-                EditorBeatmap.HitObjectAdded -= addHitObject;
-                EditorBeatmap.HitObjectRemoved -= removeHitObject;
-            }
-        }
     }
 
     [Cached(typeof(HitObjectComposer))]
@@ -344,12 +323,6 @@ namespace osu.Game.Rulesets.Edit
         [CanBeNull]
         protected virtual DistanceSnapGrid CreateDistanceSnapGrid([NotNull] IEnumerable<HitObject> selectedHitObjects) => null;
 
-        /// <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 abstract void UpdateHitObject([CanBeNull] HitObject hitObject);
-
         public abstract (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time);
 
         public abstract float GetBeatSnapDistanceAt(double referenceTime);
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index a972d28480..e6a63eae4f 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -108,11 +108,6 @@ namespace osu.Game.Rulesets.Edit
 
         public bool IsSelected => State == SelectionState.Selected;
 
-        /// <summary>
-        /// Updates the <see cref="Objects.HitObject"/>, invoking <see cref="Objects.HitObject.ApplyDefaults"/> and re-processing the beatmap.
-        /// </summary>
-        protected void UpdateHitObject() => composer?.UpdateHitObject(HitObject);
-
         /// <summary>
         /// The <see cref="MenuItem"/>s to be displayed in the context menu for this <see cref="OverlaySelectionBlueprint"/>.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 5216e85903..7f04a7a58d 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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -29,9 +30,9 @@ namespace osu.Game.Screens.Edit
         public event Action<HitObject> HitObjectRemoved;
 
         /// <summary>
-        /// Invoked when the start time of a <see cref="HitObject"/> in this <see cref="EditorBeatmap"/> was changed.
+        /// Invoked when a <see cref="HitObject"/> is updated.
         /// </summary>
-        public event Action<HitObject> StartTimeChanged;
+        public event Action<HitObject> HitObjectUpdated;
 
         /// <summary>
         /// All currently selected <see cref="HitObject"/>s.
@@ -68,7 +69,9 @@ namespace osu.Game.Screens.Edit
         /// 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)
+        public void UpdateHitObject([NotNull] HitObject hitObject) => updateHitObject(hitObject, false);
+
+        private void updateHitObject([CanBeNull] HitObject hitObject, bool silent)
         {
             scheduledUpdate?.Cancel();
             scheduledUpdate = Scheduler.AddDelayed(() =>
@@ -76,6 +79,9 @@ namespace osu.Game.Screens.Edit
                 beatmapProcessor?.PreProcess();
                 hitObject?.ApplyDefaults(ControlPointInfo, BeatmapInfo.BaseDifficulty);
                 beatmapProcessor?.PostProcess();
+
+                if (!silent)
+                    HitObjectUpdated?.Invoke(hitObject);
             }, 0);
         }
 
@@ -114,6 +120,8 @@ namespace osu.Game.Screens.Edit
             mutableHitObjects.Insert(insertionIndex + 1, hitObject);
 
             HitObjectAdded?.Invoke(hitObject);
+
+            updateHitObject(hitObject, true);
         }
 
         /// <summary>
@@ -132,6 +140,8 @@ namespace osu.Game.Screens.Edit
 
             startTimeBindables.Remove(hitObject);
             HitObjectRemoved?.Invoke(hitObject);
+
+            updateHitObject(null, true);
         }
 
         private void trackStartTime(HitObject hitObject)
@@ -145,7 +155,7 @@ namespace osu.Game.Screens.Edit
                 var insertionIndex = findInsertionIndex(PlayableBeatmap.HitObjects, hitObject.StartTime);
                 mutableHitObjects.Insert(insertionIndex + 1, hitObject);
 
-                StartTimeChanged?.Invoke(hitObject);
+                UpdateHitObject(hitObject);
             };
         }
 

From b900f229e778c4c9ca5b65daccfea8837e6cc6eb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Apr 2020 20:21:42 +0900
Subject: [PATCH 02052/10326] Fix possible legacy beatmap encoder nullref

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

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index ec2ca30535..12f2c58e35 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine(FormattableString.Invariant($"Source: {beatmap.Metadata.Source}"));
             writer.WriteLine(FormattableString.Invariant($"Tags: {beatmap.Metadata.Tags}"));
             writer.WriteLine(FormattableString.Invariant($"BeatmapID: {beatmap.BeatmapInfo.OnlineBeatmapID ?? 0}"));
-            writer.WriteLine(FormattableString.Invariant($"BeatmapSetID: {beatmap.BeatmapInfo.BeatmapSet.OnlineBeatmapSetID ?? -1}"));
+            writer.WriteLine(FormattableString.Invariant($"BeatmapSetID: {beatmap.BeatmapInfo.BeatmapSet?.OnlineBeatmapSetID ?? -1}"));
         }
 
         private void handleDifficulty(TextWriter writer)

From 683302a77d63a223ca902ac8f19b558908b941c7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Apr 2020 20:25:26 +0900
Subject: [PATCH 02053/10326] Fix crash when trying to edit long beatmaps

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index ddca5e42c2..1cb4f737c1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -60,8 +60,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 waveform.Waveform = b.NewValue.Waveform;
                 track = b.NewValue.Track;
 
-                MinZoom = getZoomLevelForVisibleMilliseconds(10000);
                 MaxZoom = getZoomLevelForVisibleMilliseconds(500);
+                MinZoom = getZoomLevelForVisibleMilliseconds(10000);
                 Zoom = getZoomLevelForVisibleMilliseconds(2000);
             }, true);
         }

From e58bf8a0d08154d87043f1a90170e8f46f6eea8c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Apr 2020 20:38:38 +0900
Subject: [PATCH 02054/10326] Add DiffPlex package

---
 osu.Game/osu.Game.csproj | 1 +
 osu.iOS.props            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3e2c2b1599..3dd84caea9 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,6 +18,7 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
+    <PackageReference Include="DiffPlex" Version="1.6.1" />
     <PackageReference Include="Humanizer" Version="2.7.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 7903d964ce..7e6f6b5246 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -75,6 +75,7 @@
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
+    <PackageReference Include="DiffPlex" Version="1.6.1" />
     <PackageReference Include="Humanizer" Version="2.7.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />

From 86243d463f423367c2f140be93d00986c044894b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Apr 2020 20:48:59 +0900
Subject: [PATCH 02055/10326] Add legacy beatmap diffing

---
 .../Editor/LegacyEditorBeatmapDifferTest.cs   | 342 ++++++++++++++++++
 osu.Game/Screens/Edit/EditorBeatmap.cs        |  40 +-
 .../Screens/Edit/LegacyEditorBeatmapDiffer.cs | 110 ++++++
 3 files changed, 488 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Tests/Editor/LegacyEditorBeatmapDifferTest.cs
 create mode 100644 osu.Game/Screens/Edit/LegacyEditorBeatmapDiffer.cs

diff --git a/osu.Game.Tests/Editor/LegacyEditorBeatmapDifferTest.cs b/osu.Game.Tests/Editor/LegacyEditorBeatmapDifferTest.cs
new file mode 100644
index 0000000000..d70a112b7f
--- /dev/null
+++ b/osu.Game.Tests/Editor/LegacyEditorBeatmapDifferTest.cs
@@ -0,0 +1,342 @@
+// Copyright (c) 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 System.Text;
+using NUnit.Framework;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit;
+using osuTK;
+using Decoder = osu.Game.Beatmaps.Formats.Decoder;
+
+namespace osu.Game.Tests.Editor
+{
+    [TestFixture]
+    public class LegacyEditorBeatmapDifferTest
+    {
+        private LegacyEditorBeatmapDiffer differ;
+        private EditorBeatmap current;
+
+        [SetUp]
+        public void Setup()
+        {
+            differ = new LegacyEditorBeatmapDiffer(current = new EditorBeatmap(new OsuBeatmap
+            {
+                BeatmapInfo =
+                {
+                    Ruleset = new OsuRuleset().RulesetInfo
+                }
+            }));
+        }
+
+        [Test]
+        public void TestAddHitObject()
+        {
+            var patch = new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 1000 }
+                }
+            };
+
+            runTest(patch);
+        }
+
+        [Test]
+        public void TestInsertHitObject()
+        {
+            current.AddRange(new[]
+            {
+                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 3000 },
+            });
+
+            var patch = new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    (OsuHitObject)current.HitObjects[0],
+                    new HitCircle { StartTime = 2000 },
+                    (OsuHitObject)current.HitObjects[1],
+                }
+            };
+
+            runTest(patch);
+        }
+
+        [Test]
+        public void TestDeleteHitObject()
+        {
+            current.AddRange(new[]
+            {
+                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 2000 },
+                new HitCircle { StartTime = 3000 },
+            });
+
+            var patch = new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    (OsuHitObject)current.HitObjects[0],
+                    (OsuHitObject)current.HitObjects[2],
+                }
+            };
+
+            runTest(patch);
+        }
+
+        [Test]
+        public void TestChangeStartTime()
+        {
+            current.AddRange(new[]
+            {
+                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 2000 },
+                new HitCircle { StartTime = 3000 },
+            });
+
+            var patch = new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 500 },
+                    (OsuHitObject)current.HitObjects[1],
+                    (OsuHitObject)current.HitObjects[2],
+                }
+            };
+
+            runTest(patch);
+        }
+
+        [Test]
+        public void TestChangeSample()
+        {
+            current.AddRange(new[]
+            {
+                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 2000 },
+                new HitCircle { StartTime = 3000 },
+            });
+
+            var patch = new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    (OsuHitObject)current.HitObjects[0],
+                    new HitCircle { StartTime = 2000, Samples = { new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH } } },
+                    (OsuHitObject)current.HitObjects[2],
+                }
+            };
+
+            runTest(patch);
+        }
+
+        [Test]
+        public void TestChangeSliderPath()
+        {
+            current.AddRange(new OsuHitObject[]
+            {
+                new HitCircle { StartTime = 1000 },
+                new Slider
+                {
+                    StartTime = 2000,
+                    Path = new SliderPath(new[]
+                    {
+                        new PathControlPoint(Vector2.Zero),
+                        new PathControlPoint(Vector2.One),
+                        new PathControlPoint(new Vector2(2), PathType.Bezier),
+                        new PathControlPoint(new Vector2(3)),
+                    }, 50)
+                },
+                new HitCircle { StartTime = 3000 },
+            });
+
+            var patch = new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    (OsuHitObject)current.HitObjects[0],
+                    new Slider
+                    {
+                        StartTime = 2000,
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(Vector2.Zero, PathType.Bezier),
+                            new PathControlPoint(new Vector2(4)),
+                            new PathControlPoint(new Vector2(5)),
+                        }, 100)
+                    },
+                    (OsuHitObject)current.HitObjects[2],
+                }
+            };
+
+            runTest(patch);
+        }
+
+        [Test]
+        public void TestAddMultipleHitObjects()
+        {
+            current.AddRange(new[]
+            {
+                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 2000 },
+                new HitCircle { StartTime = 3000 },
+            });
+
+            var patch = new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 500 },
+                    (OsuHitObject)current.HitObjects[0],
+                    new HitCircle { StartTime = 1500 },
+                    (OsuHitObject)current.HitObjects[1],
+                    new HitCircle { StartTime = 2250 },
+                    new HitCircle { StartTime = 2500 },
+                    (OsuHitObject)current.HitObjects[2],
+                    new HitCircle { StartTime = 3500 },
+                }
+            };
+
+            runTest(patch);
+        }
+
+        [Test]
+        public void TestDeleteMultipleHitObjects()
+        {
+            current.AddRange(new[]
+            {
+                new HitCircle { StartTime = 500 },
+                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 1500 },
+                new HitCircle { StartTime = 2000 },
+                new HitCircle { StartTime = 2250 },
+                new HitCircle { StartTime = 2500 },
+                new HitCircle { StartTime = 3000 },
+                new HitCircle { StartTime = 3500 },
+            });
+
+            var patch = new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    (OsuHitObject)current.HitObjects[1],
+                    (OsuHitObject)current.HitObjects[3],
+                    (OsuHitObject)current.HitObjects[6],
+                }
+            };
+
+            runTest(patch);
+        }
+
+        [Test]
+        public void TestChangeSamplesOfMultipleHitObjects()
+        {
+            current.AddRange(new[]
+            {
+                new HitCircle { StartTime = 500 },
+                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 1500 },
+                new HitCircle { StartTime = 2000 },
+                new HitCircle { StartTime = 2250 },
+                new HitCircle { StartTime = 2500 },
+                new HitCircle { StartTime = 3000 },
+                new HitCircle { StartTime = 3500 },
+            });
+
+            var patch = new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    (OsuHitObject)current.HitObjects[0],
+                    new HitCircle { StartTime = 1000, Samples = { new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH } } },
+                    (OsuHitObject)current.HitObjects[2],
+                    (OsuHitObject)current.HitObjects[3],
+                    new HitCircle { StartTime = 2250, Samples = { new HitSampleInfo { Name = HitSampleInfo.HIT_WHISTLE } } },
+                    (OsuHitObject)current.HitObjects[5],
+                    new HitCircle { StartTime = 3000, Samples = { new HitSampleInfo { Name = HitSampleInfo.HIT_CLAP } } },
+                    (OsuHitObject)current.HitObjects[7],
+                }
+            };
+
+            runTest(patch);
+        }
+
+        [Test]
+        public void TestAddAndDeleteHitObjects()
+        {
+            current.AddRange(new[]
+            {
+                new HitCircle { StartTime = 500 },
+                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 1500 },
+                new HitCircle { StartTime = 2000 },
+                new HitCircle { StartTime = 2250 },
+                new HitCircle { StartTime = 2500 },
+                new HitCircle { StartTime = 3000 },
+                new HitCircle { StartTime = 3500 },
+            });
+
+            var patch = new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 750 },
+                    (OsuHitObject)current.HitObjects[1],
+                    (OsuHitObject)current.HitObjects[4],
+                    (OsuHitObject)current.HitObjects[5],
+                    new HitCircle { StartTime = 2650 },
+                    new HitCircle { StartTime = 2750 },
+                    new HitCircle { StartTime = 4000 },
+                }
+            };
+
+            runTest(patch);
+        }
+
+        private void runTest(IBeatmap patch)
+        {
+            // Due to the method of testing, "patch" comes in without having been decoded via a beatmap decoder.
+            // This causes issues because the decoder adds various default properties (e.g. new combo on first object, default samples).
+            // To resolve "patch" into a sane state it is encoded and then re-decoded.
+            patch = decode(encode(patch));
+
+            // Apply the patch.
+            differ.Patch(encode(current), encode(patch));
+
+            // Convert beatmaps to strings for assertion purposes.
+            string currentStr = Encoding.ASCII.GetString(encode(current).ToArray());
+            string patchStr = Encoding.ASCII.GetString(encode(patch).ToArray());
+
+            Assert.That(currentStr, Is.EqualTo(patchStr));
+        }
+
+        private MemoryStream encode(IBeatmap beatmap)
+        {
+            var encoded = new MemoryStream();
+
+            using (var sw = new StreamWriter(encoded, leaveOpen: true))
+                new LegacyBeatmapEncoder(beatmap).Encode(sw);
+
+            return encoded;
+        }
+
+        private IBeatmap decode(Stream stream)
+        {
+            stream.Seek(0, SeekOrigin.Begin);
+
+            using (var reader = new LineBufferedReader(stream, true))
+                return Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 7f04a7a58d..22e0061b61 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -107,6 +107,16 @@ namespace osu.Game.Screens.Edit
 
         private IList mutableHitObjects => (IList)PlayableBeatmap.HitObjects;
 
+        /// <summary>
+        /// Adds a collection of <see cref="HitObject"/>s to this <see cref="EditorBeatmap"/>.
+        /// </summary>
+        /// <param name="hitObjects">The <see cref="HitObject"/>s to add.</param>
+        public void AddRange(IEnumerable<HitObject> hitObjects)
+        {
+            foreach (var h in hitObjects)
+                Add(h);
+        }
+
         /// <summary>
         /// Adds a <see cref="HitObject"/> to this <see cref="EditorBeatmap"/>.
         /// </summary>
@@ -128,12 +138,34 @@ namespace osu.Game.Screens.Edit
         /// Removes a <see cref="HitObject"/> from this <see cref="EditorBeatmap"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to add.</param>
-        public void Remove(HitObject hitObject)
+        /// <returns>True if the <see cref="HitObject"/> has been removed, false otherwise.</returns>
+        public bool Remove(HitObject hitObject)
         {
-            if (!mutableHitObjects.Contains(hitObject))
-                return;
+            int index = FindIndex(hitObject);
 
-            mutableHitObjects.Remove(hitObject);
+            if (index == -1)
+                return false;
+
+            RemoveAt(index);
+            return true;
+        }
+
+        /// <summary>
+        /// Finds the index of a <see cref="HitObject"/> in this <see cref="EditorBeatmap"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to search for.</param>
+        /// <returns>The index of <paramref name="hitObject"/>.</returns>
+        public int FindIndex(HitObject hitObject) => mutableHitObjects.IndexOf(hitObject);
+
+        /// <summary>
+        /// Removes a <see cref="HitObject"/> at an index in this <see cref="EditorBeatmap"/>.
+        /// </summary>
+        /// <param name="index">The index of the <see cref="HitObject"/> to remove.</param>
+        public void RemoveAt(int index)
+        {
+            var hitObject = (HitObject)mutableHitObjects[index];
+
+            mutableHitObjects.RemoveAt(index);
 
             var bindable = startTimeBindables[hitObject];
             bindable.UnbindAll();
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapDiffer.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapDiffer.cs
new file mode 100644
index 0000000000..8d2f577a1d
--- /dev/null
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapDiffer.cs
@@ -0,0 +1,110 @@
+// Copyright (c) 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 DiffPlex;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
+
+namespace osu.Game.Screens.Edit
+{
+    public class LegacyEditorBeatmapDiffer
+    {
+        private readonly EditorBeatmap editorBeatmap;
+
+        public LegacyEditorBeatmapDiffer(EditorBeatmap editorBeatmap)
+        {
+            this.editorBeatmap = editorBeatmap;
+        }
+
+        public void Patch(Stream currentState, Stream newState)
+        {
+            // Diff the beatmaps
+            var result = new Differ().CreateLineDiffs(readString(currentState), readString(newState), true, false);
+
+            // Find the index of [HitObject] sections. Lines changed prior to this index are ignored.
+            int oldHitObjectsIndex = Array.IndexOf(result.PiecesOld, "[HitObjects]");
+            int newHitObjectsIndex = Array.IndexOf(result.PiecesNew, "[HitObjects]");
+
+            var toRemove = new List<int>();
+            var toAdd = new List<int>();
+
+            foreach (var block in result.DiffBlocks)
+            {
+                // Removed hitobject
+                for (int i = 0; i < block.DeleteCountA; i++)
+                {
+                    int hoIndex = block.DeleteStartA + i - oldHitObjectsIndex - 1;
+
+                    if (hoIndex < 0)
+                        continue;
+
+                    toRemove.Add(hoIndex);
+                }
+
+                // Added hitobject
+                for (int i = 0; i < block.InsertCountB; i++)
+                {
+                    int hoIndex = block.InsertStartB + i - newHitObjectsIndex - 1;
+
+                    if (hoIndex < 0)
+                        continue;
+
+                    toAdd.Add(hoIndex);
+                }
+            }
+
+            // Make the removal indices are sorted so that iteration order doesn't get messed up post-removal.
+            toRemove.Sort();
+
+            // Apply the changes.
+            for (int i = toRemove.Count - 1; i >= 0; i--)
+                editorBeatmap.RemoveAt(toRemove[i]);
+
+            if (toAdd.Count > 0)
+            {
+                IBeatmap newBeatmap = readBeatmap(newState);
+                foreach (var i in toAdd)
+                    editorBeatmap.Add(newBeatmap.HitObjects[i]);
+            }
+        }
+
+        private string readString(Stream stream)
+        {
+            stream.Seek(0, SeekOrigin.Begin);
+
+            using (var sr = new StreamReader(stream, System.Text.Encoding.UTF8, true, 1024, true))
+                return sr.ReadToEnd();
+        }
+
+        private IBeatmap readBeatmap(Stream stream)
+        {
+            stream.Seek(0, SeekOrigin.Begin);
+
+            using (var reader = new LineBufferedReader(stream, true))
+                return new PassThroughWorkingBeatmap(Decoder.GetDecoder<Beatmap>(reader).Decode(reader)).GetPlayableBeatmap(editorBeatmap.BeatmapInfo.Ruleset);
+        }
+
+        private class PassThroughWorkingBeatmap : WorkingBeatmap
+        {
+            private readonly IBeatmap beatmap;
+
+            public PassThroughWorkingBeatmap(IBeatmap beatmap)
+                : base(beatmap.BeatmapInfo, null)
+            {
+                this.beatmap = beatmap;
+            }
+
+            protected override IBeatmap GetBeatmap() => beatmap;
+
+            protected override Texture GetBackground() => throw new NotImplementedException();
+
+            protected override Track GetTrack() => throw new NotImplementedException();
+        }
+    }
+}

From ecd7ce4b98648f786d9861f1e4c4bf5bd8f5f358 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Apr 2020 21:00:23 +0900
Subject: [PATCH 02056/10326] Fix test scene

---
 ...atmapTest.cs => TestSceneEditorBeatmap.cs} | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)
 rename osu.Game.Tests/Beatmaps/{EditorBeatmapTest.cs => TestSceneEditorBeatmap.cs} (80%)

diff --git a/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs b/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
similarity index 80%
rename from osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs
rename to osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
index f2b13e3a85..d367d9f88b 100644
--- a/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
@@ -4,15 +4,17 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore.Internal;
 using NUnit.Framework;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
+using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.Beatmaps
 {
-    [TestFixture]
-    public class EditorBeatmapTest
+    [HeadlessTest]
+    public class TestSceneEditorBeatmap : EditorClockTestScene
     {
         /// <summary>
         /// Tests that the addition event is correctly invoked after a hitobject is added.
@@ -55,13 +57,19 @@ namespace osu.Game.Tests.Beatmaps
         public void TestInitialHitObjectStartTimeChangeEvent()
         {
             var hitCircle = new HitCircle();
-            var editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
 
             HitObject changedObject = null;
-            editorBeatmap.HitObjectUpdated += h => changedObject = h;
 
-            hitCircle.StartTime = 1000;
-            Assert.That(changedObject, Is.EqualTo(hitCircle));
+            AddStep("add beatmap", () =>
+            {
+                EditorBeatmap editorBeatmap;
+
+                Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
+                editorBeatmap.HitObjectUpdated += h => changedObject = h;
+            });
+
+            AddStep("change start time", () => hitCircle.StartTime = 1000);
+            AddAssert("received change event", () => changedObject == hitCircle);
         }
 
         /// <summary>
@@ -71,18 +79,22 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestAddedHitObjectStartTimeChangeEvent()
         {
-            var editorBeatmap = new EditorBeatmap(new OsuBeatmap());
-
+            EditorBeatmap editorBeatmap = null;
             HitObject changedObject = null;
-            editorBeatmap.HitObjectUpdated += h => changedObject = h;
+
+            AddStep("add beatmap", () =>
+            {
+                Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+                editorBeatmap.HitObjectUpdated += h => changedObject = h;
+            });
 
             var hitCircle = new HitCircle();
 
-            editorBeatmap.Add(hitCircle);
-            Assert.That(changedObject, Is.Null);
+            AddStep("add object", () => editorBeatmap.Add(hitCircle));
+            AddAssert("event not received", () => changedObject == null);
 
-            hitCircle.StartTime = 1000;
-            Assert.That(changedObject, Is.EqualTo(hitCircle));
+            AddStep("change start time", () => hitCircle.StartTime = 1000);
+            AddAssert("event received", () => changedObject == hitCircle);
         }
 
         /// <summary>

From 14eca3655b752222b609b19f5fe268d1f467e6e1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Apr 2020 21:22:07 +0900
Subject: [PATCH 02057/10326] Add change state handling to the editor

---
 osu.Game/Screens/Edit/Editor.cs               |  30 ++++-
 osu.Game/Screens/Edit/EditorChangeHandler.cs  | 108 ++++++++++++++++++
 osu.Game/Screens/Edit/IEditorChangeHandler.cs |  33 ++++++
 3 files changed, 170 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Edit/EditorChangeHandler.cs
 create mode 100644 osu.Game/Screens/Edit/IEditorChangeHandler.cs

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index f1cbed57f1..14a227eb07 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -62,6 +62,7 @@ namespace osu.Game.Screens.Edit
 
         private IBeatmap playableBeatmap;
         private EditorBeatmap editorBeatmap;
+        private EditorChangeHandler changeHandler;
 
         private DependencyContainer dependencies;
 
@@ -100,9 +101,11 @@ namespace osu.Game.Screens.Edit
             }
 
             AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap));
-
             dependencies.CacheAs(editorBeatmap);
 
+            changeHandler = new EditorChangeHandler(editorBeatmap);
+            dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
+
             EditorMenuBar menuBar;
 
             var fileMenuItems = new List<MenuItem>
@@ -147,6 +150,14 @@ namespace osu.Game.Screens.Edit
                                 new MenuItem("File")
                                 {
                                     Items = fileMenuItems
+                                },
+                                new MenuItem("Edit")
+                                {
+                                    Items = new[]
+                                    {
+                                        new EditorMenuItem("Undo", MenuItemType.Standard, undo),
+                                        new EditorMenuItem("Redo", MenuItemType.Standard, redo)
+                                    }
                                 }
                             }
                         }
@@ -233,6 +244,19 @@ namespace osu.Game.Screens.Edit
                         return true;
                     }
 
+                    break;
+
+                case Key.Z:
+                    if (e.ControlPressed)
+                    {
+                        if (e.ShiftPressed)
+                            redo();
+                        else
+                            undo();
+
+                        return true;
+                    }
+
                     break;
             }
 
@@ -297,6 +321,10 @@ namespace osu.Game.Screens.Edit
             return base.OnExiting(next);
         }
 
+        private void undo() => changeHandler.RestoreState(-1);
+
+        private void redo() => changeHandler.RestoreState(1);
+
         private void resetTrack(bool seekToStart = false)
         {
             Beatmap.Value.Track?.Stop();
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
new file mode 100644
index 0000000000..7e372926ba
--- /dev/null
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.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.IO;
+using System.Text;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Screens.Edit
+{
+    /// <summary>
+    /// Tracks changes to the <see cref="Editor"/>.
+    /// </summary>
+    public class EditorChangeHandler : IEditorChangeHandler
+    {
+        private readonly LegacyEditorBeatmapDiffer differ;
+        private readonly List<Stream> savedStates = new List<Stream>();
+        private int currentState = -1;
+
+        private readonly EditorBeatmap editorBeatmap;
+        private int bulkChangesStarted;
+        private bool isRestoring;
+
+        /// <summary>
+        /// Creates a new <see cref="EditorChangeHandler"/>.
+        /// </summary>
+        /// <param name="editorBeatmap">The <see cref="EditorBeatmap"/> to track the <see cref="HitObject"/>s of.</param>
+        public EditorChangeHandler(EditorBeatmap editorBeatmap)
+        {
+            this.editorBeatmap = editorBeatmap;
+
+            editorBeatmap.HitObjectAdded += hitObjectAdded;
+            editorBeatmap.HitObjectRemoved += hitObjectRemoved;
+            editorBeatmap.HitObjectUpdated += hitObjectUpdated;
+
+            differ = new LegacyEditorBeatmapDiffer(editorBeatmap);
+
+            // Initial state.
+            SaveState();
+        }
+
+        private void hitObjectAdded(HitObject obj) => SaveState();
+
+        private void hitObjectRemoved(HitObject obj) => SaveState();
+
+        private void hitObjectUpdated(HitObject obj) => SaveState();
+
+        public void BeginChange() => bulkChangesStarted++;
+
+        public void EndChange()
+        {
+            if (bulkChangesStarted == 0)
+                throw new InvalidOperationException($"Cannot call {nameof(EndChange)} without a previous call to {nameof(BeginChange)}.");
+
+            if (--bulkChangesStarted == 0)
+                SaveState();
+        }
+
+        /// <summary>
+        /// Saves the current <see cref="Editor"/> state.
+        /// </summary>
+        public void SaveState()
+        {
+            if (bulkChangesStarted > 0)
+                return;
+
+            if (isRestoring)
+                return;
+
+            var stream = new MemoryStream();
+
+            using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+                new LegacyBeatmapEncoder(editorBeatmap).Encode(sw);
+
+            if (currentState < savedStates.Count - 1)
+                savedStates.RemoveRange(currentState + 1, savedStates.Count - currentState - 1);
+
+            savedStates.Add(stream);
+            currentState = savedStates.Count - 1;
+        }
+
+        /// <summary>
+        /// Restores an older or newer state.
+        /// </summary>
+        /// <param name="direction">The direction to restore in. If less than 0, an older state will be used. If greater than 0, a newer state will be used.</param>
+        public void RestoreState(int direction)
+        {
+            if (bulkChangesStarted > 0)
+                return;
+
+            if (savedStates.Count == 0)
+                return;
+
+            int newState = Math.Clamp(currentState + direction, 0, savedStates.Count - 1);
+            if (currentState == newState)
+                return;
+
+            isRestoring = true;
+
+            differ.Patch(savedStates[currentState], savedStates[newState]);
+            currentState = newState;
+
+            isRestoring = false;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/IEditorChangeHandler.cs b/osu.Game/Screens/Edit/IEditorChangeHandler.cs
new file mode 100644
index 0000000000..c1328252d4
--- /dev/null
+++ b/osu.Game/Screens/Edit/IEditorChangeHandler.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.Game.Rulesets.Objects;
+
+namespace osu.Game.Screens.Edit
+{
+    /// <summary>
+    /// Interface for a component that manages changes in the <see cref="Editor"/>.
+    /// </summary>
+    public interface IEditorChangeHandler
+    {
+        /// <summary>
+        /// Begins a bulk state change event. <see cref="EndChange"/> should be invoked soon after.
+        /// </summary>
+        /// <remarks>
+        /// This should be invoked when multiple changes to the <see cref="Editor"/> should be bundled together into one state change event.
+        /// When nested invocations are involved, a state change will not occur until an equal number of invocations of <see cref="EndChange"/> are received.
+        /// </remarks>
+        /// <example>
+        /// When a group of <see cref="HitObject"/>s are deleted, a single undo and redo state change should update the state of all <see cref="HitObject"/>.
+        /// </example>
+        void BeginChange();
+
+        /// <summary>
+        /// Ends a bulk state change event.
+        /// </summary>
+        /// <remarks>
+        /// This should be invoked as soon as possible after <see cref="BeginChange"/> to cause a state change.
+        /// </remarks>
+        void EndChange();
+    }
+}

From ed4ce54ac3e7149b3a6f3d4cc9406ef74d2f6e38 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Apr 2020 21:56:36 +0900
Subject: [PATCH 02058/10326] Add tests

---
 .../Editor/TestSceneEditorChangeStates.cs     | 193 ++++++++++++++++++
 1 file changed, 193 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
new file mode 100644
index 0000000000..abaa373cac
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
@@ -0,0 +1,193 @@
+// Copyright (c) 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.Testing;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Editor
+{
+    public class TestSceneEditorChangeStates : ScreenTestScene
+    {
+        private EditorBeatmap editorBeatmap;
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            Screens.Edit.Editor editor = null;
+
+            AddStep("load editor", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+                LoadScreen(editor = new Screens.Edit.Editor());
+            });
+
+            AddUntilStep("wait for editor to load", () => editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true);
+            AddStep("get beatmap", () => editorBeatmap = editor.ChildrenOfType<EditorBeatmap>().Single());
+        }
+
+        [Test]
+        public void TestUndoFromInitialState()
+        {
+            int hitObjectCount = 0;
+
+            AddStep("get initial state", () => hitObjectCount = editorBeatmap.HitObjects.Count);
+
+            addUndoSteps();
+
+            AddAssert("no change occurred", () => hitObjectCount == editorBeatmap.HitObjects.Count);
+        }
+
+        [Test]
+        public void TestRedoFromInitialState()
+        {
+            int hitObjectCount = 0;
+
+            AddStep("get initial state", () => hitObjectCount = editorBeatmap.HitObjects.Count);
+
+            addRedoSteps();
+
+            AddAssert("no change occurred", () => hitObjectCount == editorBeatmap.HitObjects.Count);
+        }
+
+        [Test]
+        public void TestAddObjectAndUndo()
+        {
+            HitObject addedObject = null;
+            HitObject removedObject = null;
+            HitObject expectedObject = null;
+
+            AddStep("bind removal", () =>
+            {
+                editorBeatmap.HitObjectAdded += h => addedObject = h;
+                editorBeatmap.HitObjectRemoved += h => removedObject = h;
+            });
+
+            AddStep("add hitobject", () => editorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
+            AddAssert("hitobject added", () => addedObject == expectedObject);
+
+            addUndoSteps();
+            AddAssert("hitobject removed", () => removedObject == expectedObject);
+        }
+
+        [Test]
+        public void TestAddObjectThenUndoThenRedo()
+        {
+            HitObject addedObject = null;
+            HitObject removedObject = null;
+            HitObject expectedObject = null;
+
+            AddStep("bind removal", () =>
+            {
+                editorBeatmap.HitObjectAdded += h => addedObject = h;
+                editorBeatmap.HitObjectRemoved += h => removedObject = h;
+            });
+
+            AddStep("add hitobject", () => editorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
+            addUndoSteps();
+
+            AddStep("reset variables", () =>
+            {
+                addedObject = null;
+                removedObject = null;
+            });
+
+            addRedoSteps();
+            AddAssert("hitobject added", () => addedObject.StartTime == expectedObject.StartTime); // Can't compare via equality (new hitobject instance)
+            AddAssert("no hitobject removed", () => removedObject == null);
+        }
+
+        [Test]
+        public void TestRemoveObjectThenUndo()
+        {
+            HitObject addedObject = null;
+            HitObject removedObject = null;
+            HitObject expectedObject = null;
+
+            AddStep("bind removal", () =>
+            {
+                editorBeatmap.HitObjectAdded += h => addedObject = h;
+                editorBeatmap.HitObjectRemoved += h => removedObject = h;
+            });
+
+            AddStep("add hitobject", () => editorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
+            AddStep("remove object", () => editorBeatmap.Remove(expectedObject));
+            AddStep("reset variables", () =>
+            {
+                addedObject = null;
+                removedObject = null;
+            });
+
+            addUndoSteps();
+            AddAssert("hitobject added", () => addedObject.StartTime == expectedObject.StartTime); // Can't compare via equality (new hitobject instance)
+            AddAssert("no hitobject removed", () => removedObject == null);
+        }
+
+        [Test]
+        public void TestRemoveObjectThenUndoThenRedo()
+        {
+            HitObject addedObject = null;
+            HitObject removedObject = null;
+            HitObject expectedObject = null;
+
+            AddStep("bind removal", () =>
+            {
+                editorBeatmap.HitObjectAdded += h => addedObject = h;
+                editorBeatmap.HitObjectRemoved += h => removedObject = h;
+            });
+
+            AddStep("add hitobject", () => editorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
+            AddStep("remove object", () => editorBeatmap.Remove(expectedObject));
+            addUndoSteps();
+
+            AddStep("reset variables", () =>
+            {
+                addedObject = null;
+                removedObject = null;
+            });
+
+            addRedoSteps();
+            AddAssert("hitobject removed", () => removedObject.StartTime == expectedObject.StartTime); // Can't compare via equality (new hitobject instance after undo)
+            AddAssert("no hitobject added", () => addedObject == null);
+        }
+
+        private void addUndoSteps()
+        {
+            AddStep("press undo", () =>
+            {
+                InputManager.PressKey(Key.LControl);
+                InputManager.PressKey(Key.Z);
+            });
+
+            AddStep("release keys", () =>
+            {
+                InputManager.ReleaseKey(Key.LControl);
+                InputManager.ReleaseKey(Key.Z);
+            });
+        }
+
+        private void addRedoSteps()
+        {
+            AddStep("press redo", () =>
+            {
+                InputManager.PressKey(Key.LControl);
+                InputManager.PressKey(Key.LShift);
+                InputManager.PressKey(Key.Z);
+            });
+
+            AddStep("release keys", () =>
+            {
+                InputManager.ReleaseKey(Key.LControl);
+                InputManager.ReleaseKey(Key.LShift);
+                InputManager.ReleaseKey(Key.Z);
+            });
+        }
+    }
+}

From 575b061dd76a59fd39079904f53193bb524ea261 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Apr 2020 22:00:56 +0900
Subject: [PATCH 02059/10326] Add change state support to more editor
 components

---
 .../Components/PathControlPointPiece.cs       | 17 +++++++++++++++-
 .../Sliders/SliderSelectionBlueprint.cs       | 20 +++++++++++++++++--
 .../Compose/Components/BlueprintContainer.cs  | 14 +++++++++++++
 .../Compose/Components/SelectionHandler.cs    |  9 ++++++++-
 .../Timeline/TimelineHitObjectBlueprint.cs    | 12 +++++++++--
 5 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index af4da5e853..092a13cca5 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -33,6 +34,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         private readonly Container marker;
         private readonly Drawable markerRing;
 
+        [Resolved(CanBeNull = true)]
+        private IEditorChangeHandler changeHandler { get; set; }
+
         [Resolved(CanBeNull = true)]
         private IDistanceSnapProvider snapProvider { get; set; }
 
@@ -137,7 +141,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override bool OnClick(ClickEvent e) => RequestSelection != null;
 
-        protected override bool OnDragStart(DragStartEvent e) => e.Button == MouseButton.Left;
+        protected override bool OnDragStart(DragStartEvent e)
+        {
+            if (e.Button == MouseButton.Left)
+            {
+                changeHandler?.BeginChange();
+                return true;
+            }
+
+            return false;
+        }
 
         protected override void OnDrag(DragEvent e)
         {
@@ -158,6 +171,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 ControlPoint.Position.Value += e.Delta;
         }
 
+        protected override void OnDragEnd(DragEndEvent e) => changeHandler?.EndChange();
+
         /// <summary>
         /// Updates the state of the circular control point marker.
         /// </summary>
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 001100d3ce..b7074b7ee5 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -38,6 +38,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [Resolved(CanBeNull = true)]
         private EditorBeatmap editorBeatmap { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private IEditorChangeHandler changeHandler { get; set; }
+
         public SliderSelectionBlueprint(DrawableSlider slider)
             : base(slider)
         {
@@ -92,7 +95,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private int? placementControlPointIndex;
 
-        protected override bool OnDragStart(DragStartEvent e) => placementControlPointIndex != null;
+        protected override bool OnDragStart(DragStartEvent e)
+        {
+            if (placementControlPointIndex != null)
+            {
+                changeHandler?.BeginChange();
+                return true;
+            }
+
+            return false;
+        }
 
         protected override void OnDrag(DragEvent e)
         {
@@ -103,7 +115,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         protected override void OnDragEnd(DragEndEvent e)
         {
-            placementControlPointIndex = null;
+            if (placementControlPointIndex != null)
+            {
+                placementControlPointIndex = null;
+                changeHandler?.EndChange();
+            }
         }
 
         private BindableList<PathControlPoint> controlPoints => HitObject.Path.ControlPoints;
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index c81c6059cc..ad16e22e5e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -37,6 +37,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private SelectionHandler selectionHandler;
 
+        [Resolved(CanBeNull = true)]
+        private IEditorChangeHandler changeHandler { get; set; }
+
         [Resolved]
         private IAdjustableClock adjustableClock { get; set; }
 
@@ -164,7 +167,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
 
             if (movementBlueprint != null)
+            {
+                isDraggingBlueprint = true;
+                changeHandler?.BeginChange();
                 return true;
+            }
 
             if (DragBox.HandleDrag(e))
             {
@@ -191,6 +198,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (e.Button == MouseButton.Right)
                 return;
 
+            if (isDraggingBlueprint)
+            {
+                changeHandler?.EndChange();
+                isDraggingBlueprint = false;
+            }
+
             if (DragBox.State == Visibility.Visible)
             {
                 DragBox.Hide();
@@ -354,6 +367,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private Vector2? movementBlueprintOriginalPosition;
         private SelectionBlueprint movementBlueprint;
+        private bool isDraggingBlueprint;
 
         /// <summary>
         /// Attempts to begin the movement of any selected blueprints.
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index fc46bf3fed..e212979433 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -40,6 +40,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved(CanBeNull = true)]
         private EditorBeatmap editorBeatmap { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private IEditorChangeHandler changeHandler { get; set; }
+
         public SelectionHandler()
         {
             selectedBlueprints = new List<SelectionBlueprint>();
@@ -152,8 +155,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void deleteSelected()
         {
+            changeHandler?.BeginChange();
+
             foreach (var h in selectedBlueprints.ToList())
-                editorBeatmap.Remove(h.HitObject);
+                editorBeatmap?.Remove(h.HitObject);
+
+            changeHandler?.EndChange();
         }
 
         #endregion
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 8f12c2f0ed..16ba3ba89a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -254,14 +254,21 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 Colour = IsHovered || hasMouseDown ? Color4.OrangeRed : Color4.White;
             }
 
-            protected override bool OnDragStart(DragStartEvent e) => true;
-
             [Resolved]
             private EditorBeatmap beatmap { get; set; }
 
             [Resolved]
             private IBeatSnapProvider beatSnapProvider { get; set; }
 
+            [Resolved(CanBeNull = true)]
+            private IEditorChangeHandler changeHandler { get; set; }
+
+            protected override bool OnDragStart(DragStartEvent e)
+            {
+                changeHandler?.BeginChange();
+                return true;
+            }
+
             protected override void OnDrag(DragEvent e)
             {
                 base.OnDrag(e);
@@ -301,6 +308,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 base.OnDragEnd(e);
 
                 OnDragHandled?.Invoke(null);
+                changeHandler?.EndChange();
             }
         }
     }

From e208251fc6f1729eac62cfa2e7e756b651eedbc4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Apr 2020 23:18:43 +0900
Subject: [PATCH 02060/10326] Wait for timeline to also load

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

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
index abaa373cac..dd1b6cf6aa 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editor
@@ -29,7 +30,8 @@ namespace osu.Game.Tests.Visual.Editor
                 LoadScreen(editor = new Screens.Edit.Editor());
             });
 
-            AddUntilStep("wait for editor to load", () => editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true);
+            AddUntilStep("wait for editor to load", () => editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
+                                                          && editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true);
             AddStep("get beatmap", () => editorBeatmap = editor.ChildrenOfType<EditorBeatmap>().Single());
         }
 

From f40bdcd34e835731855d48b1ddf9af4574331320 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Thu, 9 Apr 2020 18:47:28 +0300
Subject: [PATCH 02061/10326] Initial rewrite, moving API logic to SongSelect

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 35 +++-------
 .../Select/Carousel/CarouselBeatmapSet.cs     | 16 ++---
 osu.Game/Screens/Select/SongSelect.cs         | 65 +++++++++++++++++++
 3 files changed, 79 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index c7221699de..5a62184ad8 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Screens.Select
         private const float bleed_top = FilterControl.HEIGHT;
         private const float bleed_bottom = Footer.HEIGHT;
 
-        protected readonly Bindable<double> RecommendedStarDifficulty = new Bindable<double>();
-
         /// <summary>
         /// Triggered when the <see cref="BeatmapSets"/> loaded change and are completely loaded.
         /// </summary>
@@ -122,6 +120,7 @@ namespace osu.Game.Screens.Select
 
         protected List<DrawableCarouselItem> Items = new List<DrawableCarouselItem>();
         private CarouselRoot root;
+        public SongSelect.DifficultyRecommender DifficultyRecommender;
 
         public BeatmapCarousel()
         {
@@ -145,10 +144,10 @@ namespace osu.Game.Screens.Select
         private BeatmapManager beatmaps { get; set; }
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private Bindable<RulesetInfo> decoupledRuleset { get; set; }
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuConfigManager config, Bindable<RulesetInfo> decoupledRuleset)
+        private void load(OsuConfigManager config)
         {
             config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
             config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
@@ -162,27 +161,6 @@ namespace osu.Game.Screens.Select
             beatmaps.BeatmapRestored += beatmapRestored;
 
             loadBeatmapSets(GetLoadableBeatmaps());
-
-            decoupledRuleset.BindValueChanged(UpdateRecommendedStarDifficulty, true);
-        }
-
-        protected void UpdateRecommendedStarDifficulty(ValueChangedEvent<RulesetInfo> ruleset)
-        {
-            if (api.LocalUser.Value is GuestUser)
-            {
-                RecommendedStarDifficulty.Value = 0;
-                return;
-            }
-
-            var req = new GetUserRequest(api.LocalUser.Value.Id, ruleset.NewValue);
-
-            req.Success += result =>
-            {
-                // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
-                RecommendedStarDifficulty.Value = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
-            };
-
-            api.PerformAsync(req);
         }
 
         protected virtual IEnumerable<BeatmapSetInfo> GetLoadableBeatmaps() => beatmaps.GetAllUsableBeatmapSetsEnumerable();
@@ -608,7 +586,12 @@ namespace osu.Game.Screens.Select
                     b.Metadata = beatmapSet.Metadata;
             }
 
-            var set = new CarouselBeatmapSet(beatmapSet, RecommendedStarDifficulty);
+            BeatmapInfo recommender(IEnumerable<BeatmapInfo> beatmaps)
+            {
+                return DifficultyRecommender?.GetRecommendedBeatmap(beatmaps, decoupledRuleset.Value);
+            }
+
+            var set = new CarouselBeatmapSet(beatmapSet, recommender);
 
             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 064840d99a..1b715cad02 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -13,13 +13,13 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselBeatmapSet : CarouselGroupEagerSelect
     {
-        private readonly Bindable<double> recommendedStarDifficulty = new Bindable<double>();
+        private Func<IEnumerable<BeatmapInfo>, BeatmapInfo> getRecommendedBeatmap;
 
         public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>();
 
         public BeatmapSetInfo BeatmapSet;
 
-        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet, Bindable<double> recommendedStarDifficulty)
+        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet, Func<IEnumerable<BeatmapInfo>, BeatmapInfo> getRecommendedBeatmap)
         {
             BeatmapSet = beatmapSet ?? throw new ArgumentNullException(nameof(beatmapSet));
 
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Select.Carousel
                       .Select(b => new CarouselBeatmap(b))
                       .ForEach(AddChild);
 
-            this.recommendedStarDifficulty.BindTo(recommendedStarDifficulty);
+            this.getRecommendedBeatmap = getRecommendedBeatmap;
         }
 
         protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this);
@@ -37,14 +37,8 @@ namespace osu.Game.Screens.Select.Carousel
         {
             if (LastSelected == null)
             {
-                return Children.OfType<CarouselBeatmap>()
-                               .Where(b => !b.Filtered.Value)
-                               .OrderBy(b =>
-                               {
-                                   var difference = b.Beatmap.StarDifficulty - recommendedStarDifficulty.Value;
-                                   return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
-                               })
-                               .FirstOrDefault();
+                var recommendedBeatmapInfo = getRecommendedBeatmap(Children.OfType<CarouselBeatmap>().Where(b => !b.Filtered.Value).Select(b => b.Beatmap));
+                return Children.OfType<CarouselBeatmap>().Where(b => b.Beatmap == recommendedBeatmapInfo).First();
             }
 
             return base.GetNextToSelect();
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 895a8ad0c9..fda5872f3b 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -36,6 +36,9 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
+using osu.Game.Online.API;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Screens.Select
 {
@@ -80,6 +83,7 @@ namespace osu.Game.Screens.Select
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
         protected BeatmapCarousel Carousel { get; private set; }
+        private DifficultyRecommender difficultyRecommender;
 
         private BeatmapInfoWedge beatmapInfoWedge;
         private DialogOverlay dialogOverlay;
@@ -107,6 +111,8 @@ namespace osu.Game.Screens.Select
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
 
+            AddInternal(difficultyRecommender = new DifficultyRecommender());
+
             AddRangeInternal(new Drawable[]
             {
                 new ResetScrollContainer(() => Carousel.ScrollToSelected())
@@ -156,6 +162,7 @@ namespace osu.Game.Screens.Select
                                             RelativeSizeAxes = Axes.Both,
                                             SelectionChanged = updateSelectedBeatmap,
                                             BeatmapSetsChanged = carouselBeatmapsLoaded,
+                                            DifficultyRecommender = difficultyRecommender,
                                         },
                                     }
                                 },
@@ -780,6 +787,64 @@ namespace osu.Game.Screens.Select
             return base.OnKeyDown(e);
         }
 
+        public class DifficultyRecommender : Component
+        {
+            [Resolved]
+            private IAPIProvider api { get; set; }
+
+            [Resolved]
+            private RulesetStore rulesets { get; set; }
+
+            private Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
+
+            private int pendingAPIRequests = 0;
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                updateRecommended();
+            }
+
+            private void updateRecommended()
+            {
+                if (pendingAPIRequests > 0)
+                    return;
+                if (api.LocalUser.Value is GuestUser)
+                    return;
+                rulesets.AvailableRulesets.ForEach(rulesetInfo =>
+                {
+                    var req = new GetUserRequest(api.LocalUser.Value.Id, rulesetInfo);
+
+                    req.Success += result =>
+                    {
+                        // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
+                        recommendedStarDifficulty[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
+                        pendingAPIRequests--;
+                    };
+
+                    req.Failure += _ => pendingAPIRequests--;
+
+                    pendingAPIRequests++;
+                    api.Queue(req);
+                });
+            }
+
+            public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps, RulesetInfo currentRuleset)
+            {
+                if (!recommendedStarDifficulty.ContainsKey(currentRuleset))
+                {
+                    updateRecommended();
+                    return null;
+                }
+
+                return beatmaps.OrderBy(b =>
+                {
+                    var difference = b.StarDifficulty - recommendedStarDifficulty[currentRuleset];
+                    return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
+                }).FirstOrDefault();
+            }
+        }
+
         private class VerticalMaskingContainer : Container
         {
             private const float panel_overflow = 1.2f;

From caa404f8fa6024b1fadff3d61ad46339bc50c34f Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Thu, 9 Apr 2020 18:48:13 +0300
Subject: [PATCH 02062/10326] Remove test for now

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 5a199885c0..8d207be216 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -656,34 +656,6 @@ namespace osu.Game.Tests.Visual.SongSelect
             checkVisibleItemCount(true, 15);
         }
 
-        [Test]
-        public void TestSelectRecommendedDifficulty()
-        {
-            void setRecommendedAndExpect(double recommended, int expectedSet, int expectedDiff)
-            {
-                AddStep($"Recommend SR {recommended}", () => carousel.RecommendedStarDifficulty.Value = recommended);
-                advanceSelection(direction: 1, diff: false);
-                waitForSelection(expectedSet, expectedDiff);
-            }
-
-            createCarousel();
-            AddStep("Add beatmaps", () =>
-            {
-                for (int i = 1; i <= 7; i++)
-                {
-                    var set = createTestBeatmapSet(i);
-                    carousel.UpdateBeatmapSet(set);
-                }
-            });
-            waitForSelection(1, 1);
-            setRecommendedAndExpect(1, 2, 1);
-            setRecommendedAndExpect(3.9, 3, 1);
-            setRecommendedAndExpect(4.1, 4, 2);
-            setRecommendedAndExpect(5.6, 5, 2);
-            setRecommendedAndExpect(5.7, 6, 3);
-            setRecommendedAndExpect(10, 7, 3);
-        }
-
         private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null)
         {
             createCarousel();
@@ -886,8 +858,6 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             public new List<DrawableCarouselItem> Items => base.Items;
 
-            public new Bindable<double> RecommendedStarDifficulty => base.RecommendedStarDifficulty;
-
             public bool PendingFilterTask => PendingFilter != null;
 
             protected override IEnumerable<BeatmapSetInfo> GetLoadableBeatmaps() => Enumerable.Empty<BeatmapSetInfo>();

From 35f97dfc7521a7952dad16896babc6cc649353c0 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Thu, 9 Apr 2020 18:59:18 +0300
Subject: [PATCH 02063/10326] Style changes

---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs | 1 -
 osu.Game/Screens/Select/BeatmapCarousel.cs                   | 2 --
 osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs       | 5 ++---
 osu.Game/Screens/Select/SongSelect.cs                        | 5 +++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 8d207be216..76a8ee9914 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -8,7 +8,6 @@ using System.Linq;
 using System.Text;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 5a62184ad8..3e619a1f80 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -23,9 +23,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
 using osu.Game.Screens.Select.Carousel;
-using osu.Game.Online.API;
 using osu.Game.Rulesets;
-using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Screens.Select
 {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 1b715cad02..e7a18e15c7 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Select.Filter;
@@ -13,7 +12,7 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselBeatmapSet : CarouselGroupEagerSelect
     {
-        private Func<IEnumerable<BeatmapInfo>, BeatmapInfo> getRecommendedBeatmap;
+        private readonly Func<IEnumerable<BeatmapInfo>, BeatmapInfo> getRecommendedBeatmap;
 
         public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>();
 
@@ -38,7 +37,7 @@ namespace osu.Game.Screens.Select.Carousel
             if (LastSelected == null)
             {
                 var recommendedBeatmapInfo = getRecommendedBeatmap(Children.OfType<CarouselBeatmap>().Where(b => !b.Filtered.Value).Select(b => b.Beatmap));
-                return Children.OfType<CarouselBeatmap>().Where(b => b.Beatmap == recommendedBeatmapInfo).First();
+                return Children.OfType<CarouselBeatmap>().First(b => b.Beatmap == recommendedBeatmapInfo);
             }
 
             return base.GetNextToSelect();
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index fda5872f3b..d6bc20df39 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -795,9 +795,9 @@ namespace osu.Game.Screens.Select
             [Resolved]
             private RulesetStore rulesets { get; set; }
 
-            private Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
+            private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
 
-            private int pendingAPIRequests = 0;
+            private int pendingAPIRequests;
 
             [BackgroundDependencyLoader]
             private void load()
@@ -811,6 +811,7 @@ namespace osu.Game.Screens.Select
                     return;
                 if (api.LocalUser.Value is GuestUser)
                     return;
+
                 rulesets.AvailableRulesets.ForEach(rulesetInfo =>
                 {
                     var req = new GetUserRequest(api.LocalUser.Value.Id, rulesetInfo);

From 2201e9b4ae00154d14a4b0ccb45b881550c7bdfb Mon Sep 17 00:00:00 2001
From: Fire937 <atoli.huppe@gmail.com>
Date: Thu, 9 Apr 2020 18:12:15 +0200
Subject: [PATCH 02064/10326] Add stereo shifted hitsound playback support

There is now a setting in the general settings called "Positional
hitsounds". If the setting is enabled, the hitsounds playback will be
shifted according to their position on the beatmap.
---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 ++
 .../Sections/Gameplay/GeneralSettings.cs      |  5 ++++
 .../Objects/Drawables/DrawableHitObject.cs    | 26 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 41f6747b74..ab5a652a94 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -88,6 +88,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.ShowProgressGraph, true);
             Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
             Set(OsuSetting.KeyOverlay, false);
+            Set(OsuSetting.PositionalHitSounds, true);
             Set(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
             Set(OsuSetting.FloatingComments, false);
@@ -176,6 +177,7 @@ namespace osu.Game.Configuration
         LightenDuringBreaks,
         ShowStoryboard,
         KeyOverlay,
+        PositionalHitSounds,
         ScoreMeter,
         FloatingComments,
         ShowInterface,
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 2d2cd42213..ef03c0622a 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -57,6 +57,11 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Always show key overlay",
                     Bindable = config.GetBindable<bool>(OsuSetting.KeyOverlay)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Positional hitsounds",
+                    Bindable = config.GetBindable<bool>(OsuSetting.PositionalHitSounds)
+                },
                 new SettingsEnumDropdown<ScoreMeterType>
                 {
                     LabelText = "Score meter type",
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 0011faefbb..ed9efba89f 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -12,11 +12,13 @@ using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Threading;
+using osu.Framework.Audio;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
+using osu.Game.Configuration;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Drawables
@@ -31,6 +33,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public readonly Bindable<Color4> AccentColour = new Bindable<Color4>(Color4.Gray);
 
+        /// <summary>
+        /// The stereo balance of the samples if the <i>Positional hitsounds</i> setting is set.
+        /// </summary>
+        private readonly BindableDouble positionalSoundAdjustment = new BindableDouble();
+
         protected SkinnableSound Samples { get; private set; }
 
         protected virtual IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples;
@@ -84,8 +91,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public JudgementResult Result { get; private set; }
 
+        /// <summary>
+        /// The stereo balance of the samples played if <i>Positional hitsounds</i> is set.
+        /// </summary>
+        protected virtual float PositionalSound => (HitObject is IHasXPosition position) ? (position.X / 512f - 0.5f) * 0.8f : 0;
+
         private BindableList<HitSampleInfo> samplesBindable;
         private Bindable<double> startTimeBindable;
+        private Bindable<bool> userPositionalHitSounds;
         private Bindable<int> comboIndexBindable;
 
         public override bool RemoveWhenNotAlive => false;
@@ -101,10 +114,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
         protected DrawableHitObject([NotNull] HitObject hitObject)
         {
             HitObject = hitObject ?? throw new ArgumentNullException(nameof(hitObject));
+            positionalSoundAdjustment.Value = PositionalSound;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuConfigManager config)
         {
             var judgement = HitObject.CreateJudgement();
 
@@ -113,6 +127,16 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
             loadSamples();
+
+            userPositionalHitSounds = config.GetBindable<bool>(OsuSetting.PositionalHitSounds);
+            userPositionalHitSounds.BindValueChanged(positional =>
+            {
+                if (positional.NewValue)
+                    Samples?.AddAdjustment(AdjustableProperty.Balance, positionalSoundAdjustment);
+                else
+                    Samples?.RemoveAdjustment(AdjustableProperty.Balance, positionalSoundAdjustment);
+            });
+            userPositionalHitSounds.TriggerChange();
         }
 
         protected override void LoadComplete()

From 116b952dfe973218621de51532c8620c0f65e015 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Apr 2020 01:20:43 +0900
Subject: [PATCH 02065/10326] Change param to hitobject rather than result

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index db8a47e4a2..9c066c367b 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
-            missAllEarlier(result);
+            missAllEarlier(result.HitObject);
 
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
@@ -131,14 +131,14 @@ namespace osu.Game.Rulesets.Osu.UI
         /// <summary>
         /// Misses all <see cref="OsuHitObject"/>s occurring earlier than the start time of a judged <see cref="OsuHitObject"/>.
         /// </summary>
-        /// <param name="result">The <see cref="JudgementResult"/> of the judged <see cref="OsuHitObject"/>.</param>
-        private void missAllEarlier(JudgementResult result)
+        /// <param name="hitObject">The marker <see cref="HitObject"/>, which all <see cref="HitObject"/>s earlier than will get missed.</param>
+        private void missAllEarlier(HitObject hitObject)
         {
-            if (!causesNoteLockMisses(result.HitObject))
+            if (!causesNoteLockMisses(hitObject))
                 return;
 
             // The minimum start time required for hitobjects so that they aren't missed.
-            double minimumTime = result.HitObject.StartTime;
+            double minimumTime = hitObject.StartTime;
 
             foreach (var obj in HitObjectContainer.AliveObjects)
             {

From b8d7b78b55a3022e8556110a44bc4d40c977c86e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Apr 2020 01:21:37 +0900
Subject: [PATCH 02066/10326] Remove unnecessary null set

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 9c066c367b..9011f21fd5 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -78,12 +78,7 @@ namespace osu.Game.Rulesets.Osu.UI
             bool result = base.Remove(h);
 
             if (result)
-            {
-                DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)h;
-                osuHitObject.CheckHittable = null;
-
-                followPoints.RemoveFollowPoints(osuHitObject);
-            }
+                followPoints.RemoveFollowPoints((DrawableOsuHitObject)h);
 
             return result;
         }

From deaf24f1419f25f26297271e819caf73445bac4b Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Thu, 9 Apr 2020 19:30:40 +0300
Subject: [PATCH 02067/10326] Fix oversight on null

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index e7a18e15c7..99ded4c58e 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -37,7 +37,8 @@ namespace osu.Game.Screens.Select.Carousel
             if (LastSelected == null)
             {
                 var recommendedBeatmapInfo = getRecommendedBeatmap(Children.OfType<CarouselBeatmap>().Where(b => !b.Filtered.Value).Select(b => b.Beatmap));
-                return Children.OfType<CarouselBeatmap>().First(b => b.Beatmap == recommendedBeatmapInfo);
+                if (recommendedBeatmapInfo != null)
+                    return Children.OfType<CarouselBeatmap>().First(b => b.Beatmap == recommendedBeatmapInfo);
             }
 
             return base.GetNextToSelect();

From f115fecb23c13b7a2fbfc99e38b1eef458866199 Mon Sep 17 00:00:00 2001
From: Alchyr <isithalchyr@gmail.com>
Date: Thu, 9 Apr 2020 09:34:40 -0700
Subject: [PATCH 02068/10326] Fix formatting

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs           | 6 +++---
 osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs | 3 ++-
 osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs     | 3 ++-
 osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs     | 3 ++-
 osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs     | 6 +++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index 411a4441de..9599ad184b 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -28,10 +28,10 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <summary>
         /// Whether this control point results in a meaningful change when placed after another.
         /// </summary>
-        /// <param name="other">Another control point to compare with.</param>
-        /// <param name="time">The time this timing point will be placed at.</param>
+        /// <param name="existing">An existing control point to compare with.</param>
+        /// <param name="time">The time this control point will be placed at if it is added.</param>
         /// <returns>Whether redundant.</returns>
-        public abstract bool IsRedundant(ControlPoint other, double time);
+        public abstract bool IsRedundant(ControlPoint existing, double time);
 
         public bool Equals(ControlPoint other) => Time == other?.Time && EquivalentTo(other);
     }
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 44522dc927..dc856b0a0a 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -29,6 +29,7 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public override bool EquivalentTo(ControlPoint other) =>
             other is DifficultyControlPoint otherTyped && otherTyped.SpeedMultiplier.Equals(SpeedMultiplier);
-        public override bool IsRedundant(ControlPoint other, double time) => EquivalentTo(other);
+
+        public override bool IsRedundant(ControlPoint existing, double time) => EquivalentTo(existing);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index 8066c6b577..d050f44ba4 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool EquivalentTo(ControlPoint other) =>
             other is EffectControlPoint otherTyped &&
             KiaiMode == otherTyped.KiaiMode && OmitFirstBarLine == otherTyped.OmitFirstBarLine;
-        public override bool IsRedundant(ControlPoint other, double time) => !OmitFirstBarLine && EquivalentTo(other);
+
+        public override bool IsRedundant(ControlPoint existing, double time) => !OmitFirstBarLine && EquivalentTo(existing);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index cf7c842b24..38edbe70da 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -71,6 +71,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool EquivalentTo(ControlPoint other) =>
             other is SampleControlPoint otherTyped &&
             SampleBank == otherTyped.SampleBank && SampleVolume == otherTyped.SampleVolume;
-        public override bool IsRedundant(ControlPoint other, double time) => EquivalentTo(other);
+
+        public override bool IsRedundant(ControlPoint existing, double time) => EquivalentTo(existing);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index d14ac1221b..316c603ece 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -52,8 +52,8 @@ namespace osu.Game.Beatmaps.ControlPoints
             other is TimingControlPoint otherTyped
             && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
 
-        public override bool IsRedundant(ControlPoint other, double time) =>
-            EquivalentTo(other)
-            && other.Time == time;
+        public override bool IsRedundant(ControlPoint existing, double time) =>
+            EquivalentTo(existing)
+            && existing.Time == time;
     }
 }

From ea1bec85ae7ef875f133add73c5051a6fa9b5a4c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Apr 2020 01:40:20 +0900
Subject: [PATCH 02069/10326] Simplify code/language

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 65 +++++++++---------------
 1 file changed, 24 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 9011f21fd5..f4009a281c 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.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.Extensions.IEnumerableExtensions;
 using osuTK;
 using osu.Framework.Graphics;
@@ -87,10 +86,10 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             DrawableHitObject lastObject = osuHitObject;
 
-            // Get the last hitobject that contributes to note lock
+            // Get the last hitobject that can block future hits
             while ((lastObject = HitObjectContainer.AliveObjects.GetPrevious(lastObject)) != null)
             {
-                if (contributesToNoteLock(lastObject.HitObject))
+                if (canBlockFutureHits(lastObject.HitObject))
                     break;
             }
 
@@ -108,7 +107,9 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
-            missAllEarlier(result.HitObject);
+            // Hitobjects that block future hits should miss previous hitobjects if they're hit out-of-order.
+            if (canBlockFutureHits(result.HitObject))
+                missAllEarlierObjects(result.HitObject);
 
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
@@ -127,12 +128,8 @@ namespace osu.Game.Rulesets.Osu.UI
         /// Misses all <see cref="OsuHitObject"/>s occurring earlier than the start time of a judged <see cref="OsuHitObject"/>.
         /// </summary>
         /// <param name="hitObject">The marker <see cref="HitObject"/>, which all <see cref="HitObject"/>s earlier than will get missed.</param>
-        private void missAllEarlier(HitObject hitObject)
+        private void missAllEarlierObjects(HitObject hitObject)
         {
-            if (!causesNoteLockMisses(hitObject))
-                return;
-
-            // The minimum start time required for hitobjects so that they aren't missed.
             double minimumTime = hitObject.StartTime;
 
             foreach (var obj in HitObjectContainer.AliveObjects)
@@ -140,50 +137,36 @@ namespace osu.Game.Rulesets.Osu.UI
                 if (obj.HitObject.StartTime >= minimumTime)
                     break;
 
-                performMiss(obj);
-
-                foreach (var n in obj.NestedHitObjects)
+                switch (obj)
                 {
-                    if (n.HitObject.StartTime >= minimumTime)
+                    case DrawableHitCircle circle:
+                        miss(circle);
                         break;
 
-                    performMiss(n);
+                    case DrawableSlider slider:
+                        miss(slider.HeadCircle);
+                        break;
                 }
             }
+
+            static void miss(DrawableOsuHitObject obj)
+            {
+                // Hitobjects that have already been judged cannot be missed.
+                if (obj.Judged)
+                    return;
+
+                obj.MissForcefully();
+            }
         }
 
-        private void performMiss(DrawableHitObject obj)
-        {
-            if (!(obj is DrawableOsuHitObject osuObject))
-                throw new InvalidOperationException($"{obj.GetType()} is not a {nameof(DrawableOsuHitObject)}.");
-
-            // Hitobjects that have already been judged cannot be missed.
-            if (osuObject.Judged)
-                return;
-
-            if (!causesNoteLockMisses(obj.HitObject))
-                return;
-
-            osuObject.MissForcefully();
-        }
-
         /// <summary>
-        /// Whether a <see cref="HitObject"/> is contributes to note lock.
-        /// Future contributing <see cref="HitObject"/>s will not be hittable until the start time of the last contributing <see cref="HitObject"/> is reached.
+        /// Whether a <see cref="HitObject"/> can block hits on future <see cref="HitObject"/>s until its start time is reached.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to test.</param>
-        /// <returns>Whether <paramref name="hitObject"/> causes note lock.</returns>
-        private bool contributesToNoteLock(HitObject hitObject)
+        /// <returns>Whether <paramref name="hitObject"/> can block hits on future <see cref="HitObject"/>s.</returns>
+        private bool canBlockFutureHits(HitObject hitObject)
             => hitObject is HitCircle || hitObject is Slider;
 
-        /// <summary>
-        /// Whether a <see cref="HitObject"/> can be missed and causes other <see cref="HitObject"/>s to be missed when hit out-of-order during note lock.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to test.</param>
-        /// <returns>Whether <paramref name="hitObject"/> contributes to note lock misses.</returns>
-        private bool causesNoteLockMisses(HitObject hitObject)
-            => hitObject is HitCircle && !(hitObject is SliderTailCircle);
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => HitObjectContainer.ReceivePositionalInputAt(screenSpacePos);
 
         private class ApproachCircleProxyContainer : LifetimeManagementContainer

From 518acf03e9b8319a0e533652f7cacadc7a2afa96 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 9 Apr 2020 19:41:35 +0300
Subject: [PATCH 02070/10326] Remove BeatmapSearchSmallFilterRow component

---
 .../TestSceneBeatmapSearchFilter.cs           |  5 ++-
 .../BeatmapListingSearchSection.cs            |  8 ++---
 .../BeatmapListing/BeatmapSearchFilterRow.cs  |  5 +--
 .../BeatmapSearchSmallFilterRow.cs            | 32 -------------------
 4 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchSmallFilterRow.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
index 7b4424e568..fac58a6754 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
@@ -20,8 +20,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(BeatmapSearchFilterRow<>),
-            typeof(BeatmapSearchRulesetFilterRow),
-            typeof(BeatmapSearchSmallFilterRow<>),
+            typeof(BeatmapSearchRulesetFilterRow)
         };
 
         [Cached]
@@ -43,7 +42,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 {
                     new BeatmapSearchRulesetFilterRow(),
                     new BeatmapSearchFilterRow<BeatmapSearchCategory>("Categories"),
-                    new BeatmapSearchSmallFilterRow<BeatmapSearchCategory>("Header Name")
+                    new BeatmapSearchFilterRow<BeatmapSearchCategory>("Header Name")
                 }
             });
         }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
index 501abbf2c8..3f9cc211df 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
@@ -47,8 +47,8 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchTextBox textBox;
         private readonly BeatmapSearchRulesetFilterRow modeFilter;
         private readonly BeatmapSearchFilterRow<BeatmapSearchCategory> categoryFilter;
-        private readonly BeatmapSearchSmallFilterRow<BeatmapSearchGenre> genreFilter;
-        private readonly BeatmapSearchSmallFilterRow<BeatmapSearchLanguage> languageFilter;
+        private readonly BeatmapSearchFilterRow<BeatmapSearchGenre> genreFilter;
+        private readonly BeatmapSearchFilterRow<BeatmapSearchLanguage> languageFilter;
 
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
@@ -104,8 +104,8 @@ namespace osu.Game.Overlays.BeatmapListing
                                 {
                                     modeFilter = new BeatmapSearchRulesetFilterRow(),
                                     categoryFilter = new BeatmapSearchFilterRow<BeatmapSearchCategory>(@"Categories"),
-                                    genreFilter = new BeatmapSearchSmallFilterRow<BeatmapSearchGenre>(@"Genre"),
-                                    languageFilter = new BeatmapSearchSmallFilterRow<BeatmapSearchLanguage>(@"Language"),
+                                    genreFilter = new BeatmapSearchFilterRow<BeatmapSearchGenre>(@"Genre"),
+                                    languageFilter = new BeatmapSearchFilterRow<BeatmapSearchLanguage>(@"Language"),
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index 467399dd20..bc0a011e31 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -17,6 +17,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests;
 using osuTK;
 using osuTK.Graphics;
+using Humanizer;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -55,8 +56,8 @@ namespace osu.Game.Overlays.BeatmapListing
                         {
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft,
-                            Font = OsuFont.GetFont(size: 10),
-                            Text = headerName.ToUpper()
+                            Font = OsuFont.GetFont(size: 13),
+                            Text = headerName.Titleize()
                         },
                         CreateFilter().With(f =>
                         {
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchSmallFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchSmallFilterRow.cs
deleted file mode 100644
index 6daa7cb0e0..0000000000
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchSmallFilterRow.cs
+++ /dev/null
@@ -1,32 +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 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;
-            }
-        }
-    }
-}

From 10e849d19616d3fa1314e8fa81ea10e12111e1da Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Apr 2020 02:02:09 +0900
Subject: [PATCH 02071/10326] Separate into separate class

---
 .../Objects/Drawables/DrawableHitCircle.cs    |   2 +-
 .../Objects/Drawables/DrawableOsuHitObject.cs |   2 +-
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs  | 104 ++++++++++++++++++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  76 +------------
 4 files changed, 111 insertions(+), 73 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 5776c64c86..d73ad888f4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             var result = HitObject.HitWindows.ResultFor(timeOffset);
 
-            if (result == HitResult.None || CheckHittable?.Invoke(this) == false)
+            if (result == HitResult.None || CheckHittable?.Invoke(this, Time.Current) == false)
             {
                 Shake(Math.Abs(timeOffset) - HitObject.HitWindows.WindowFor(HitResult.Miss));
                 return;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 13829dc2f7..fe23e3729d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// Whether this <see cref="DrawableOsuHitObject"/> can be hit.
         /// If non-null, judgements will be ignored (resulting in a shake) whilst the function returns false.
         /// </summary>
-        public Func<DrawableOsuHitObject, bool> CheckHittable;
+        public Func<DrawableHitObject, double, bool> CheckHittable;
 
         protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
new file mode 100644
index 0000000000..ddaf714e5b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.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 osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    /// <summary>
+    /// Ensures that <see cref="HitObject"/>s are hit in-order.
+    /// If a <see cref="HitObject"/> is hit out of order:
+    /// <list type="number">
+    /// <item><description>The hit is blocked if it occurred earlier than the previous <see cref="HitObject"/>'s start time.</description></item>
+    /// <item><description>The hit causes all previous <see cref="HitObject"/>s to missed otherwise.</description></item>
+    /// </list>
+    /// </summary>
+    public class OrderedHitPolicy
+    {
+        private readonly HitObjectContainer hitObjectContainer;
+
+        public OrderedHitPolicy(HitObjectContainer hitObjectContainer)
+        {
+            this.hitObjectContainer = hitObjectContainer;
+        }
+
+        /// <summary>
+        /// Determines whether a <see cref="DrawableHitObject"/> can be hit at a point in time.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to check.</param>
+        /// <param name="time">The time to check.</param>
+        /// <returns>Whether <paramref name="hitObject"/> can be hit at the given <paramref name="time"/>.</returns>
+        public bool IsHittable(DrawableHitObject hitObject, double time)
+        {
+            DrawableHitObject lastObject = hitObject;
+
+            // Get the last hitobject that can block future hits
+            while ((lastObject = hitObjectContainer.AliveObjects.GetPrevious(lastObject)) != null)
+            {
+                if (canBlockFutureHits(lastObject.HitObject))
+                    break;
+            }
+
+            // If there is no previous object alive, allow the hit.
+            if (lastObject == null)
+                return true;
+
+            // Ensure that either the last object has received a judgement or the hit time occurs at or after the last object's start time.
+            // Simultaneous hitobjects are allowed to be hit at the same time value to account for edge-cases such as Centipede.
+            if (lastObject.Judged || time >= lastObject.HitObject.StartTime)
+                return true;
+
+            return false;
+        }
+
+        /// <summary>
+        /// Handles a <see cref="HitObject"/> being hit to potentially miss all earlier <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
+        public void HandleHit(HitObject hitObject)
+        {
+            if (!canBlockFutureHits(hitObject))
+                return;
+
+            double minimumTime = hitObject.StartTime;
+
+            foreach (var obj in hitObjectContainer.AliveObjects)
+            {
+                if (obj.HitObject.StartTime >= minimumTime)
+                    break;
+
+                switch (obj)
+                {
+                    case DrawableHitCircle circle:
+                        miss(circle);
+                        break;
+
+                    case DrawableSlider slider:
+                        miss(slider.HeadCircle);
+                        break;
+                }
+            }
+
+            static void miss(DrawableOsuHitObject obj)
+            {
+                // Hitobjects that have already been judged cannot be missed.
+                if (obj.Judged)
+                    return;
+
+                obj.MissForcefully();
+            }
+        }
+
+        /// <summary>
+        /// Whether a <see cref="HitObject"/> blocks hits on future <see cref="HitObject"/>s until its start time is reached.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to test.</param>
+        private bool canBlockFutureHits(HitObject hitObject)
+            => hitObject is HitCircle || hitObject is Slider;
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index f4009a281c..2f222f59b4 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.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.Extensions.IEnumerableExtensions;
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -11,7 +10,6 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Skinning;
 
@@ -22,6 +20,7 @@ namespace osu.Game.Rulesets.Osu.UI
         private readonly ApproachCircleProxyContainer approachCircles;
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
         private readonly FollowPointRenderer followPoints;
+        private readonly OrderedHitPolicy hitPolicy;
 
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
 
@@ -53,6 +52,8 @@ namespace osu.Game.Rulesets.Osu.UI
                     Depth = -1,
                 },
             };
+
+            hitPolicy = new OrderedHitPolicy(HitObjectContainer);
         }
 
         public override void Add(DrawableHitObject h)
@@ -67,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.UI
             base.Add(h);
 
             DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)h;
-            osuHitObject.CheckHittable = checkHittable;
+            osuHitObject.CheckHittable = hitPolicy.IsHittable;
 
             followPoints.AddFollowPoints(osuHitObject);
         }
@@ -82,34 +83,10 @@ namespace osu.Game.Rulesets.Osu.UI
             return result;
         }
 
-        private bool checkHittable(DrawableOsuHitObject osuHitObject)
-        {
-            DrawableHitObject lastObject = osuHitObject;
-
-            // Get the last hitobject that can block future hits
-            while ((lastObject = HitObjectContainer.AliveObjects.GetPrevious(lastObject)) != null)
-            {
-                if (canBlockFutureHits(lastObject.HitObject))
-                    break;
-            }
-
-            // If there is no previous object alive, allow the hit.
-            if (lastObject == null)
-                return true;
-
-            // Ensure that either the last object has received a judgement or the hit time occurs at or after the last object's start time.
-            // Simultaneous hitobjects are allowed to be hit at the same time value to account for edge-cases such as Centipede.
-            if (lastObject.Judged || Time.Current >= lastObject.HitObject.StartTime)
-                return true;
-
-            return false;
-        }
-
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             // Hitobjects that block future hits should miss previous hitobjects if they're hit out-of-order.
-            if (canBlockFutureHits(result.HitObject))
-                missAllEarlierObjects(result.HitObject);
+            hitPolicy.HandleHit(result.HitObject);
 
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
@@ -124,49 +101,6 @@ namespace osu.Game.Rulesets.Osu.UI
             judgementLayer.Add(explosion);
         }
 
-        /// <summary>
-        /// Misses all <see cref="OsuHitObject"/>s occurring earlier than the start time of a judged <see cref="OsuHitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The marker <see cref="HitObject"/>, which all <see cref="HitObject"/>s earlier than will get missed.</param>
-        private void missAllEarlierObjects(HitObject hitObject)
-        {
-            double minimumTime = hitObject.StartTime;
-
-            foreach (var obj in HitObjectContainer.AliveObjects)
-            {
-                if (obj.HitObject.StartTime >= minimumTime)
-                    break;
-
-                switch (obj)
-                {
-                    case DrawableHitCircle circle:
-                        miss(circle);
-                        break;
-
-                    case DrawableSlider slider:
-                        miss(slider.HeadCircle);
-                        break;
-                }
-            }
-
-            static void miss(DrawableOsuHitObject obj)
-            {
-                // Hitobjects that have already been judged cannot be missed.
-                if (obj.Judged)
-                    return;
-
-                obj.MissForcefully();
-            }
-        }
-
-        /// <summary>
-        /// Whether a <see cref="HitObject"/> can block hits on future <see cref="HitObject"/>s until its start time is reached.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to test.</param>
-        /// <returns>Whether <paramref name="hitObject"/> can block hits on future <see cref="HitObject"/>s.</returns>
-        private bool canBlockFutureHits(HitObject hitObject)
-            => hitObject is HitCircle || hitObject is Slider;
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => HitObjectContainer.ReceivePositionalInputAt(screenSpacePos);
 
         private class ApproachCircleProxyContainer : LifetimeManagementContainer

From b54bbc5f6a217352a03ed77eb05eb20e50a948fa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Apr 2020 02:41:37 +0900
Subject: [PATCH 02072/10326] Improve commenting + refactor

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 79 +++++++++++++-------
 1 file changed, 54 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index ddaf714e5b..0a09b5be7c 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.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.Extensions.IEnumerableExtensions;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
@@ -35,22 +34,27 @@ namespace osu.Game.Rulesets.Osu.UI
         /// <returns>Whether <paramref name="hitObject"/> can be hit at the given <paramref name="time"/>.</returns>
         public bool IsHittable(DrawableHitObject hitObject, double time)
         {
-            DrawableHitObject lastObject = hitObject;
+            DrawableHitObject blockingObject = null;
 
-            // Get the last hitobject that can block future hits
-            while ((lastObject = hitObjectContainer.AliveObjects.GetPrevious(lastObject)) != null)
+            // Find the last hitobject which blocks future hits.
+            foreach (var obj in hitObjectContainer.AliveObjects)
             {
-                if (canBlockFutureHits(lastObject.HitObject))
+                if (obj == hitObject)
                     break;
+
+                if (canBlockFutureHits(obj))
+                    blockingObject = obj;
             }
 
-            // If there is no previous object alive, allow the hit.
-            if (lastObject == null)
+            // If there is no previous hitobject, allow the hit.
+            if (blockingObject == null)
                 return true;
 
-            // Ensure that either the last object has received a judgement or the hit time occurs at or after the last object's start time.
-            // Simultaneous hitobjects are allowed to be hit at the same time value to account for edge-cases such as Centipede.
-            if (lastObject.Judged || time >= lastObject.HitObject.StartTime)
+            // A hit is allowed if:
+            // 1. The last blocking hitobject has been judged.
+            // 2. The current time is after the last hitobject's start time.
+            // Hits at exactly the same time as the blocking hitobject are allowed for maps that contain simultaneous hitobjects (e.g. /b/372245).
+            if (blockingObject.Judged || time >= blockingObject.HitObject.StartTime)
                 return true;
 
             return false;
@@ -62,6 +66,7 @@ namespace osu.Game.Rulesets.Osu.UI
         /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
         public void HandleHit(HitObject hitObject)
         {
+            // Hitobjects which themselves don't block future hitobjects don't cause misses (e.g. slider ticks)
             if (!canBlockFutureHits(hitObject))
                 return;
 
@@ -72,33 +77,57 @@ namespace osu.Game.Rulesets.Osu.UI
                 if (obj.HitObject.StartTime >= minimumTime)
                     break;
 
-                switch (obj)
+                // If the parent hitobject cannot cause a miss, neither can any nested hitobject.
+                if (!canBlockFutureHits(obj))
+                    continue;
+
+                applyMiss(obj);
+
+                foreach (var nested in obj.NestedHitObjects)
                 {
-                    case DrawableHitCircle circle:
-                        miss(circle);
+                    if (nested.HitObject.StartTime >= minimumTime)
                         break;
 
-                    case DrawableSlider slider:
-                        miss(slider.HeadCircle);
-                        break;
+                    if (canBlockFutureHits(nested))
+                        applyMiss(nested);
                 }
             }
 
-            static void miss(DrawableOsuHitObject obj)
-            {
-                // Hitobjects that have already been judged cannot be missed.
-                if (obj.Judged)
-                    return;
+            static void applyMiss(DrawableHitObject obj) => ((DrawableOsuHitObject)obj).MissForcefully();
+        }
 
-                obj.MissForcefully();
-            }
+        /// <summary>
+        /// Whether a <see cref="DrawableHitObject"/> blocks hits on future <see cref="DrawableHitObject"/>s until its start time is reached.
+        /// </summary>
+        /// <remarks>
+        /// Must only be used when iterating through top-most drawable hitobjects.
+        /// </remarks>
+        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to test.</param>
+        private static bool canBlockFutureHits(DrawableHitObject hitObject)
+        {
+            // Judged hitobjects can never block hits.
+            if (hitObject.Judged)
+                return false;
+
+            // Special considerations for slider tails aren't required since only top-most drawable hitobjects are being iterated over.
+            return hitObject is DrawableHitCircle || hitObject is DrawableSlider;
         }
 
         /// <summary>
         /// Whether a <see cref="HitObject"/> blocks hits on future <see cref="HitObject"/>s until its start time is reached.
         /// </summary>
+        /// <remarks>
+        /// Must only be used when iterating through nested hitobjects.
+        /// </remarks>
         /// <param name="hitObject">The <see cref="HitObject"/> to test.</param>
-        private bool canBlockFutureHits(HitObject hitObject)
-            => hitObject is HitCircle || hitObject is Slider;
+        private static bool canBlockFutureHits(HitObject hitObject)
+        {
+            // Unlike the above we will receive slider tails, but they do not block future hits.
+            if (hitObject is SliderTailCircle)
+                return false;
+
+            // All other hitcircles continue to block future hits.
+            return hitObject is HitCircle;
+        }
     }
 }

From 42b3ff805b60c740fbd85948a8db366f8e91952b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Apr 2020 02:57:31 +0900
Subject: [PATCH 02073/10326] Rename methods + fix incorrect method usage

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 33 ++++++++------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index 0a09b5be7c..cfb850b785 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 if (obj == hitObject)
                     break;
 
-                if (canBlockFutureHits(obj))
+                if (drawableCanBlockFutureHits(obj))
                     blockingObject = obj;
             }
 
@@ -66,29 +66,26 @@ namespace osu.Game.Rulesets.Osu.UI
         /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
         public void HandleHit(HitObject hitObject)
         {
-            // Hitobjects which themselves don't block future hitobjects don't cause misses (e.g. slider ticks)
-            if (!canBlockFutureHits(hitObject))
+            // Hitobjects which themselves don't block future hitobjects don't cause misses (e.g. slider ticks, spinners)
+            if (!hitObjectCanBlockFutureHits(hitObject))
                 return;
 
             double minimumTime = hitObject.StartTime;
 
             foreach (var obj in hitObjectContainer.AliveObjects)
             {
-                if (obj.HitObject.StartTime >= minimumTime)
-                    break;
-
-                // If the parent hitobject cannot cause a miss, neither can any nested hitobject.
-                if (!canBlockFutureHits(obj))
+                if (obj.Judged || obj.HitObject.StartTime >= minimumTime)
                     continue;
 
-                applyMiss(obj);
+                if (hitObjectCanBlockFutureHits(obj.HitObject))
+                    applyMiss(obj);
 
                 foreach (var nested in obj.NestedHitObjects)
                 {
-                    if (nested.HitObject.StartTime >= minimumTime)
-                        break;
+                    if (nested.Judged || nested.HitObject.StartTime >= minimumTime)
+                        continue;
 
-                    if (canBlockFutureHits(nested))
+                    if (hitObjectCanBlockFutureHits(nested.HitObject))
                         applyMiss(nested);
                 }
             }
@@ -100,15 +97,11 @@ namespace osu.Game.Rulesets.Osu.UI
         /// Whether a <see cref="DrawableHitObject"/> blocks hits on future <see cref="DrawableHitObject"/>s until its start time is reached.
         /// </summary>
         /// <remarks>
-        /// Must only be used when iterating through top-most drawable hitobjects.
+        /// This will ONLY match on top-most <see cref="DrawableHitObject"/>s.
         /// </remarks>
         /// <param name="hitObject">The <see cref="DrawableHitObject"/> to test.</param>
-        private static bool canBlockFutureHits(DrawableHitObject hitObject)
+        private static bool drawableCanBlockFutureHits(DrawableHitObject hitObject)
         {
-            // Judged hitobjects can never block hits.
-            if (hitObject.Judged)
-                return false;
-
             // Special considerations for slider tails aren't required since only top-most drawable hitobjects are being iterated over.
             return hitObject is DrawableHitCircle || hitObject is DrawableSlider;
         }
@@ -117,10 +110,10 @@ namespace osu.Game.Rulesets.Osu.UI
         /// Whether a <see cref="HitObject"/> blocks hits on future <see cref="HitObject"/>s until its start time is reached.
         /// </summary>
         /// <remarks>
-        /// Must only be used when iterating through nested hitobjects.
+        /// This is more rigorous and may not match on top-most <see cref="HitObject"/>s as <see cref="drawableCanBlockFutureHits"/> does.
         /// </remarks>
         /// <param name="hitObject">The <see cref="HitObject"/> to test.</param>
-        private static bool canBlockFutureHits(HitObject hitObject)
+        private static bool hitObjectCanBlockFutureHits(HitObject hitObject)
         {
             // Unlike the above we will receive slider tails, but they do not block future hits.
             if (hitObject is SliderTailCircle)

From 15a92d1451c9fe0fb916f4c4e392c4da2411dcf3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Apr 2020 02:57:35 +0900
Subject: [PATCH 02074/10326] Rename test scene

---
 .../{TestSceneNoteLock.cs => TestSceneOutOfOrderHits.cs}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Rulesets.Osu.Tests/{TestSceneNoteLock.cs => TestSceneOutOfOrderHits.cs} (99%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
similarity index 99%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
rename to osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index 2c69540951..d6858f831e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -25,7 +25,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestSceneNoteLock : RateAdjustedBeatmapTestScene
+    public class TestSceneOutOfOrderHits : RateAdjustedBeatmapTestScene
     {
         private const double early_miss_window = 1000; // time after -1000 to -500 is considered a miss
         private const double late_miss_window = 500; // time after +500 is considered a miss

From 6988df30bd9cdfe7be77a21f6de63b11ca462a45 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Apr 2020 03:12:13 +0900
Subject: [PATCH 02075/10326] Rename variable, add comment

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index cfb850b785..dfca2aff7b 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
@@ -66,15 +66,16 @@ namespace osu.Game.Rulesets.Osu.UI
         /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
         public void HandleHit(HitObject hitObject)
         {
-            // Hitobjects which themselves don't block future hitobjects don't cause misses (e.g. slider ticks, spinners)
+            // Hitobjects which themselves don't block future hitobjects don't cause misses (e.g. slider ticks, spinners).
             if (!hitObjectCanBlockFutureHits(hitObject))
                 return;
 
-            double minimumTime = hitObject.StartTime;
+            double maximumTime = hitObject.StartTime;
 
+            // Iterate through and apply miss results to all top-level and nested hitobjects which block future hits.
             foreach (var obj in hitObjectContainer.AliveObjects)
             {
-                if (obj.Judged || obj.HitObject.StartTime >= minimumTime)
+                if (obj.Judged || obj.HitObject.StartTime >= maximumTime)
                     continue;
 
                 if (hitObjectCanBlockFutureHits(obj.HitObject))
@@ -82,7 +83,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
                 foreach (var nested in obj.NestedHitObjects)
                 {
-                    if (nested.Judged || nested.HitObject.StartTime >= minimumTime)
+                    if (nested.Judged || nested.HitObject.StartTime >= maximumTime)
                         continue;
 
                     if (hitObjectCanBlockFutureHits(nested.HitObject))

From 91b3aa2914427cfa0af3cd1dbc58ea4b25ad9919 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 9 Apr 2020 22:56:10 +0300
Subject: [PATCH 02076/10326] Implement interval list

---
 osu.Game/Lists/IntervalList.cs | 128 +++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 osu.Game/Lists/IntervalList.cs

diff --git a/osu.Game/Lists/IntervalList.cs b/osu.Game/Lists/IntervalList.cs
new file mode 100644
index 0000000000..493b6b6e72
--- /dev/null
+++ b/osu.Game/Lists/IntervalList.cs
@@ -0,0 +1,128 @@
+// Copyright (c) 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;
+using System.Collections.Generic;
+using osu.Framework.Lists;
+
+namespace osu.Game.Lists
+{
+    /// <summary>
+    /// Represents a list of intervals that can be used for whether a specific value falls into one of them.
+    /// </summary>
+    /// <typeparam name="T">The type of interval values.</typeparam>
+    public class IntervalList<T> : ICollection<Interval<T>>, IReadOnlyList<Interval<T>>
+    {
+        private static readonly IComparer<T> type_comparer = Comparer<T>.Default;
+
+        private readonly SortedList<Interval<T>> intervals = new SortedList<Interval<T>>((x, y) => type_comparer.Compare(x.Start, y.Start));
+
+        /// <summary>
+        /// The index of the nearest interval from last <see cref="IsInAnyInterval"/> call.
+        /// </summary>
+        protected int NearestIntervalIndex;
+
+        /// <summary>
+        /// Whether the provided value is in any interval added to this list.
+        /// </summary>
+        /// <param name="value">The value to check for.</param>
+        public bool IsInAnyInterval(T value)
+        {
+            if (intervals.Count == 0)
+                return false;
+
+            // Clamp the nearest index in case there were intervals
+            // removed from the list causing the index to go out of range.
+            NearestIntervalIndex = Math.Clamp(NearestIntervalIndex, 0, Count - 1);
+
+            if (type_comparer.Compare(value, this[NearestIntervalIndex].End) > 0)
+            {
+                while (type_comparer.Compare(value, this[NearestIntervalIndex].End) > 0 && NearestIntervalIndex < Count - 1)
+                    NearestIntervalIndex++;
+            }
+            else
+            {
+                while (type_comparer.Compare(value, this[NearestIntervalIndex].Start) < 0 && NearestIntervalIndex > 0)
+                    NearestIntervalIndex--;
+            }
+
+            var nearestInterval = this[NearestIntervalIndex];
+
+            return type_comparer.Compare(value, nearestInterval.Start) >= 0 &&
+                   type_comparer.Compare(value, nearestInterval.End) <= 0;
+        }
+
+        /// <summary>
+        /// Adds a new interval to the list.
+        /// </summary>
+        /// <param name="start">The start value of the interval.</param>
+        /// <param name="end">The end value of the interval.</param>
+        public void Add(T start, T end) => Add(new Interval<T>(start, end));
+
+        #region ICollection<Interval<T>>
+
+        public int Count => intervals.Count;
+
+        bool ICollection<Interval<T>>.IsReadOnly => false;
+
+        /// <summary>
+        /// Adds a new interval to the list
+        /// </summary>
+        /// <param name="interval">The interval to add.</param>
+        public void Add(Interval<T> interval) => intervals.Add(interval);
+
+        /// <summary>
+        /// Removes an existing interval from the list.
+        /// </summary>
+        /// <param name="interval">The interval to remove.</param>
+        /// <returns>Whether the provided interval exists in the list and has been removed.</returns>
+        public bool Remove(Interval<T> interval) => intervals.Remove(interval);
+
+        /// <summary>
+        /// Removes all intervals from the list.
+        /// </summary>
+        public void Clear() => intervals.Clear();
+
+        public void CopyTo(Interval<T>[] array, int arrayIndex) => intervals.CopyTo(array, arrayIndex);
+
+        public bool Contains(Interval<T> item) => intervals.Contains(item);
+
+        public IEnumerator<Interval<T>> GetEnumerator() => intervals.GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        #endregion
+
+        #region IReadOnlyList<Interval<T>>
+
+        public Interval<T> this[int index]
+        {
+            get => intervals[index];
+            set => intervals[index] = value;
+        }
+
+        #endregion
+    }
+
+    public readonly struct Interval<T>
+    {
+        /// <summary>
+        /// The start value of this interval.
+        /// </summary>
+        public readonly T Start;
+
+        /// <summary>
+        /// The end value of this interval.
+        /// </summary>
+        public readonly T End;
+
+        public Interval(T start, T end)
+        {
+            bool startLessThanEnd = Comparer<T>.Default.Compare(start, end) < 0;
+
+            Start = startLessThanEnd ? start : end;
+            End = startLessThanEnd ? end : start;
+        }
+    }
+}

From 38ee5f310302e3d05b240c4d55e1bb4e1bd5f8e7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 9 Apr 2020 22:57:54 +0300
Subject: [PATCH 02077/10326] Add tests covering most cases of interval list
 checking

---
 osu.Game.Tests/Lists/IntervalListTest.cs | 141 +++++++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 osu.Game.Tests/Lists/IntervalListTest.cs

diff --git a/osu.Game.Tests/Lists/IntervalListTest.cs b/osu.Game.Tests/Lists/IntervalListTest.cs
new file mode 100644
index 0000000000..1bc1483e15
--- /dev/null
+++ b/osu.Game.Tests/Lists/IntervalListTest.cs
@@ -0,0 +1,141 @@
+// Copyright (c) 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.Lists;
+
+namespace osu.Game.Tests.Lists
+{
+    [TestFixture]
+    public class IntervalListTest
+    {
+        // this is intended to be unordered to test adding intervals in unordered way.
+        private static readonly (double, double)[] test_intervals =
+        {
+            (-9.1d, -8.3d),
+            (-3.4d, 2.1d),
+            (50.0d, 9.0d), // intentionally reversing interval.
+            (5.25d, 10.50d),
+        };
+
+        [Test]
+        public void TestCheckValueInsideSingleInterval()
+        {
+            var list = new IntervalList<double> { { 1.0d, 2.0d } };
+
+            Assert.IsTrue(list.IsInAnyInterval(1.0d));
+            Assert.IsTrue(list.IsInAnyInterval(1.5d));
+            Assert.IsTrue(list.IsInAnyInterval(2.0d));
+        }
+
+        [Test]
+        public void TestCheckValuesInsideIntervals()
+        {
+            var list = new IntervalList<double>();
+
+            foreach (var (start, end) in test_intervals)
+                list.Add(start, end);
+
+            Assert.IsTrue(list.IsInAnyInterval(-8.75d));
+            Assert.IsTrue(list.IsInAnyInterval(1.0d));
+            Assert.IsTrue(list.IsInAnyInterval(7.89d));
+            Assert.IsTrue(list.IsInAnyInterval(9.8d));
+            Assert.IsTrue(list.IsInAnyInterval(15.83d));
+        }
+
+        [Test]
+        public void TestCheckValuesInRandomOrder()
+        {
+            var list = new IntervalList<double>();
+
+            foreach (var (start, end) in test_intervals)
+                list.Add(start, end);
+
+            Assert.IsTrue(list.IsInAnyInterval(9.8d));
+            Assert.IsTrue(list.IsInAnyInterval(7.89d));
+            Assert.IsTrue(list.IsInAnyInterval(1.0d));
+            Assert.IsTrue(list.IsInAnyInterval(15.83d));
+            Assert.IsTrue(list.IsInAnyInterval(-8.75d));
+        }
+
+        [Test]
+        public void TestCheckValuesOutOfIntervals()
+        {
+            var list = new IntervalList<double>();
+
+            foreach (var (start, end) in test_intervals)
+                list.Add(start, end);
+
+            Assert.IsFalse(list.IsInAnyInterval(-9.2d));
+            Assert.IsFalse(list.IsInAnyInterval(2.2d));
+            Assert.IsFalse(list.IsInAnyInterval(5.15d));
+            Assert.IsFalse(list.IsInAnyInterval(51.2d));
+        }
+
+        [Test]
+        public void TestCheckValueAfterRemovedInterval()
+        {
+            var list = new IntervalList<int> { { 50, 100 }, { 150, 200 }, { 250, 300 } };
+
+            Assert.IsTrue(list.IsInAnyInterval(75));
+            Assert.IsTrue(list.IsInAnyInterval(175));
+            Assert.IsTrue(list.IsInAnyInterval(275));
+
+            list.Remove(list[1]);
+
+            Assert.IsFalse(list.IsInAnyInterval(175));
+            Assert.IsTrue(list.IsInAnyInterval(75));
+            Assert.IsTrue(list.IsInAnyInterval(275));
+        }
+
+        [Test]
+        public void TestCheckValueAfterAddedInterval()
+        {
+            var list = new IntervalList<int> { { 50, 100 }, { 250, 300 } };
+
+            Assert.IsFalse(list.IsInAnyInterval(175));
+            Assert.IsTrue(list.IsInAnyInterval(75));
+            Assert.IsTrue(list.IsInAnyInterval(275));
+
+            list.Add(150, 200);
+
+            Assert.IsTrue(list.IsInAnyInterval(175));
+        }
+
+        [Test]
+        public void TestCheckIntervalIndexOnChecks()
+        {
+            var list = new TestIntervalList { { 1.0d, 2.0d }, { 3.0d, 4.0d }, { 5.0d, 6.0d }, { 7.0d, 8.0d } };
+
+            Assert.IsTrue(list.IsInAnyInterval(1.5d));
+            Assert.IsTrue(list.NearestIntervalIndex == 0);
+
+            Assert.IsTrue(list.IsInAnyInterval(5.5d));
+            Assert.IsTrue(list.NearestIntervalIndex == 2);
+
+            Assert.IsTrue(list.IsInAnyInterval(7.5d));
+            Assert.IsTrue(list.NearestIntervalIndex == 3);
+        }
+
+        [Test]
+        public void TestCheckIntervalIndexOnOutOfIntervalsChecks()
+        {
+            var list = new TestIntervalList { { 1.0d, 2.0d }, { 3.0d, 4.0d }, { 5.0d, 6.0d }, { 7.0d, 8.0d } };
+
+            Assert.IsFalse(list.IsInAnyInterval(4.5d));
+            Assert.IsTrue(list.NearestIntervalIndex == 1 ||
+                          list.NearestIntervalIndex == 2); // 4.5 in between 3.0-4.0 and 5.0-6.0
+
+            Assert.IsFalse(list.IsInAnyInterval(9.0d));
+            Assert.IsTrue(list.NearestIntervalIndex == 3); // 9.0 goes above 7.0-8.0
+
+            Assert.IsFalse(list.IsInAnyInterval(0.0d));
+            Assert.IsTrue(list.NearestIntervalIndex == 0); // 0.0 goes below 1.0-2.0
+        }
+
+        private class TestIntervalList : IntervalList<double>
+        {
+            public new int NearestIntervalIndex => base.NearestIntervalIndex;
+        }
+    }
+}

From 9a29797a5bee661a767d43584af541d6619d5ea5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 9 Apr 2020 23:00:16 +0300
Subject: [PATCH 02078/10326] Use IntervalList<double> for tracking break
 periods

---
 .../Visual/Gameplay/TestSceneAutoplay.cs      |  2 +-
 .../Visual/Gameplay/TestSceneBreakTracker.cs  |  4 --
 osu.Game/Screens/Play/BreakTracker.cs         | 50 ++++++-------------
 3 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 4b1c2ec256..0be949650e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep($"seek to break {breakIndex}", () => Player.GameplayClockContainer.Seek(destBreak().StartTime));
             AddUntilStep("wait for seek to complete", () => Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= destBreak().StartTime);
 
-            BreakPeriod destBreak() => Player.ChildrenOfType<BreakTracker>().First().Breaks.ElementAt(breakIndex);
+            BreakPeriod destBreak() => Beatmap.Value.Beatmap.Breaks.ElementAt(breakIndex);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
index 91d6f2f143..a6f996c30d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
@@ -97,8 +97,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             loadBreaksStep("multiple breaks", testBreaks);
 
             seekAndAssertBreak("seek to break start", testBreaks[1].StartTime, true);
-            AddAssert("is skipped to break #2", () => breakTracker.CurrentBreakIndex == 1);
-
             seekAndAssertBreak("seek to break middle", testBreaks[1].StartTime + testBreaks[1].Duration / 2, true);
             seekAndAssertBreak("seek to break end", testBreaks[1].EndTime, false);
             seekAndAssertBreak("seek to break after end", testBreaks[1].EndTime + 500, false);
@@ -174,8 +172,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             private readonly ManualClock manualClock;
             private IFrameBasedClock originalClock;
 
-            public new int CurrentBreakIndex => base.CurrentBreakIndex;
-
             public double ManualClockTime
             {
                 get => manualClock.CurrentTime;
diff --git a/osu.Game/Screens/Play/BreakTracker.cs b/osu.Game/Screens/Play/BreakTracker.cs
index 64262d52b5..c2eb069ee6 100644
--- a/osu.Game/Screens/Play/BreakTracker.cs
+++ b/osu.Game/Screens/Play/BreakTracker.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Lists;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play
@@ -20,22 +21,24 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public IBindable<bool> IsBreakTime => isBreakTime;
 
-        protected int CurrentBreakIndex;
-
         private readonly BindableBool isBreakTime = new BindableBool();
 
-        private IReadOnlyList<BreakPeriod> breaks;
+        private readonly IntervalList<double> breakIntervals = new IntervalList<double>();
 
         public IReadOnlyList<BreakPeriod> Breaks
         {
-            get => breaks;
             set
             {
-                breaks = value;
-
-                // reset index in case the new breaks list is smaller than last one
                 isBreakTime.Value = false;
-                CurrentBreakIndex = 0;
+                breakIntervals.Clear();
+
+                foreach (var b in value)
+                {
+                    if (!b.HasEffect)
+                        continue;
+
+                    breakIntervals.Add(b.StartTime, b.EndTime - BreakOverlay.BREAK_FADE_DURATION);
+                }
             }
         }
 
@@ -49,34 +52,11 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            isBreakTime.Value = getCurrentBreak()?.HasEffect == true
-                                || Clock.CurrentTime < gameplayStartTime
+            var time = Clock.CurrentTime;
+
+            isBreakTime.Value = breakIntervals.IsInAnyInterval(time)
+                                || time < gameplayStartTime
                                 || scoreProcessor?.HasCompleted == true;
         }
-
-        private BreakPeriod getCurrentBreak()
-        {
-            if (breaks?.Count > 0)
-            {
-                var time = Clock.CurrentTime;
-
-                if (time > breaks[CurrentBreakIndex].EndTime)
-                {
-                    while (time > breaks[CurrentBreakIndex].EndTime && CurrentBreakIndex < breaks.Count - 1)
-                        CurrentBreakIndex++;
-                }
-                else
-                {
-                    while (time < breaks[CurrentBreakIndex].StartTime && CurrentBreakIndex > 0)
-                        CurrentBreakIndex--;
-                }
-
-                var closest = breaks[CurrentBreakIndex];
-
-                return closest.Contains(time) ? closest : null;
-            }
-
-            return null;
-        }
     }
 }

From c17e47026623afde64aaf11b8334b5ebcd221696 Mon Sep 17 00:00:00 2001
From: Fire937 <atoli.huppe@gmail.com>
Date: Fri, 10 Apr 2020 00:01:35 +0200
Subject: [PATCH 02079/10326] Fix PositionalSound calculation implementation

The position used to calculate the stereo balance is now the position of
the drawable (as opposed to the position specified in the beatmap file
previously).
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ed9efba89f..30a9106ddc 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The stereo balance of the samples played if <i>Positional hitsounds</i> is set.
         /// </summary>
-        protected virtual float PositionalSound => (HitObject is IHasXPosition position) ? (position.X / 512f - 0.5f) * 0.8f : 0;
+        protected virtual float PositionalSound => (Position.X / 512f - 0.5f) * 0.8f;
 
         private BindableList<HitSampleInfo> samplesBindable;
         private Bindable<double> startTimeBindable;
@@ -114,7 +114,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         protected DrawableHitObject([NotNull] HitObject hitObject)
         {
             HitObject = hitObject ?? throw new ArgumentNullException(nameof(hitObject));
-            positionalSoundAdjustment.Value = PositionalSound;
         }
 
         [BackgroundDependencyLoader]
@@ -377,7 +376,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Plays all the hit sounds for this <see cref="DrawableHitObject"/>.
         /// This is invoked automatically when this <see cref="DrawableHitObject"/> is hit.
         /// </summary>
-        public virtual void PlaySamples() => Samples?.Play();
+        public virtual void PlaySamples()
+        {
+            positionalSoundAdjustment.Value = PositionalSound;
+            Samples?.Play();
+        }
 
         protected override void Update()
         {

From ee7e2b0854a8096dd55c1e3472b8964311df2897 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Apr 2020 13:29:46 +0900
Subject: [PATCH 02080/10326] Fix editor beatmap potentially not updating
 hitobjects

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 7f04a7a58d..efffde54b3 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -63,6 +63,7 @@ namespace osu.Game.Screens.Edit
                 trackStartTime(obj);
         }
 
+        private readonly HashSet<HitObject> pendingUpdates = new HashSet<HitObject>();
         private ScheduledDelegate scheduledUpdate;
 
         /// <summary>
@@ -74,15 +75,27 @@ namespace osu.Game.Screens.Edit
         private void updateHitObject([CanBeNull] HitObject hitObject, bool silent)
         {
             scheduledUpdate?.Cancel();
-            scheduledUpdate = Scheduler.AddDelayed(() =>
+
+            if (hitObject != null)
+                pendingUpdates.Add(hitObject);
+
+            scheduledUpdate = Schedule(() =>
             {
                 beatmapProcessor?.PreProcess();
-                hitObject?.ApplyDefaults(ControlPointInfo, BeatmapInfo.BaseDifficulty);
+
+                foreach (var obj in pendingUpdates)
+                    obj.ApplyDefaults(ControlPointInfo, BeatmapInfo.BaseDifficulty);
+
                 beatmapProcessor?.PostProcess();
 
                 if (!silent)
-                    HitObjectUpdated?.Invoke(hitObject);
-            }, 0);
+                {
+                    foreach (var obj in pendingUpdates)
+                        HitObjectUpdated?.Invoke(obj);
+                }
+
+                pendingUpdates.Clear();
+            });
         }
 
         public BeatmapInfo BeatmapInfo

From 41caa378565d807853dd53ec6b0727d60139bd33 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Apr 2020 13:29:49 +0900
Subject: [PATCH 02081/10326] Add tests

---
 .../Beatmaps/TestSceneEditorBeatmap.cs        | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs b/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
index d367d9f88b..2d4587341d 100644
--- a/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
+++ b/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.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 System.Linq;
 using Microsoft.EntityFrameworkCore.Internal;
 using NUnit.Framework;
@@ -162,5 +163,69 @@ namespace osu.Game.Tests.Beatmaps
             Assert.That(editorBeatmap.HitObjects.Count(h => h == hitCircle), Is.EqualTo(1));
             Assert.That(editorBeatmap.HitObjects.IndexOf(hitCircle), Is.EqualTo(1));
         }
+
+        /// <summary>
+        /// Tests that multiple hitobjects are updated simultaneously.
+        /// </summary>
+        [Test]
+        public void TestMultipleHitObjectUpdate()
+        {
+            var updatedObjects = new List<HitObject>();
+            var allHitObjects = new List<HitObject>();
+            EditorBeatmap editorBeatmap = null;
+
+            AddStep("add beatmap", () =>
+            {
+                updatedObjects.Clear();
+
+                Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+
+                for (int i = 0; i < 10; i++)
+                {
+                    var h = new HitCircle();
+                    editorBeatmap.Add(h);
+                    allHitObjects.Add(h);
+                }
+            });
+
+            AddStep("change all start times", () =>
+            {
+                editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h);
+
+                for (int i = 0; i < 10; i++)
+                    allHitObjects[i].StartTime += 10;
+            });
+
+            // Distinct ensures that all hitobjects have been updated once, debounce is tested below.
+            AddAssert("all hitobjects updated", () => updatedObjects.Distinct().Count() == 10);
+        }
+
+        /// <summary>
+        /// Tests that hitobject updates are debounced when they happen too soon.
+        /// </summary>
+        [Test]
+        public void TestDebouncedUpdate()
+        {
+            var updatedObjects = new List<HitObject>();
+            EditorBeatmap editorBeatmap = null;
+
+            AddStep("add beatmap", () =>
+            {
+                updatedObjects.Clear();
+
+                Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+                editorBeatmap.Add(new HitCircle());
+            });
+
+            AddStep("change start time twice", () =>
+            {
+                editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h);
+
+                editorBeatmap.HitObjects[0].StartTime = 10;
+                editorBeatmap.HitObjects[0].StartTime = 20;
+            });
+
+            AddAssert("only updated once", () => updatedObjects.Count == 1);
+        }
     }
 }

From 4a87ac784061318026fe650a48e42ca455e7e7f9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Apr 2020 13:53:09 +0900
Subject: [PATCH 02082/10326] Add support for sample changes

---
 .../Screens/Edit/Compose/Components/SelectionHandler.cs   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index e212979433..764eae1056 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -212,6 +212,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void AddHitSample(string sampleName)
         {
+            changeHandler?.BeginChange();
+
             foreach (var h in SelectedHitObjects)
             {
                 // Make sure there isn't already an existing sample
@@ -220,6 +222,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                 h.Samples.Add(new HitSampleInfo { Name = sampleName });
             }
+
+            changeHandler?.EndChange();
         }
 
         /// <summary>
@@ -228,8 +232,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void RemoveHitSample(string sampleName)
         {
+            changeHandler?.BeginChange();
+
             foreach (var h in SelectedHitObjects)
                 h.SamplesBindable.RemoveAll(s => s.Name == sampleName);
+
+            changeHandler?.EndChange();
         }
 
         #endregion

From 1001fcfb94d28787d62fa9e185499188620b4522 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 10 Apr 2020 15:48:00 +0300
Subject: [PATCH 02083/10326] Revert nearest index accessibility back to
 private

Implementation details should not be tested.
---
 osu.Game/Lists/IntervalList.cs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Lists/IntervalList.cs b/osu.Game/Lists/IntervalList.cs
index 493b6b6e72..6a71d94ea8 100644
--- a/osu.Game/Lists/IntervalList.cs
+++ b/osu.Game/Lists/IntervalList.cs
@@ -17,11 +17,8 @@ namespace osu.Game.Lists
         private static readonly IComparer<T> type_comparer = Comparer<T>.Default;
 
         private readonly SortedList<Interval<T>> intervals = new SortedList<Interval<T>>((x, y) => type_comparer.Compare(x.Start, y.Start));
+        private int nearestIndex;
 
-        /// <summary>
-        /// The index of the nearest interval from last <see cref="IsInAnyInterval"/> call.
-        /// </summary>
-        protected int NearestIntervalIndex;
 
         /// <summary>
         /// Whether the provided value is in any interval added to this list.
@@ -34,20 +31,20 @@ namespace osu.Game.Lists
 
             // Clamp the nearest index in case there were intervals
             // removed from the list causing the index to go out of range.
-            NearestIntervalIndex = Math.Clamp(NearestIntervalIndex, 0, Count - 1);
+            nearestIndex = Math.Clamp(nearestIndex, 0, intervals.Count - 1);
 
-            if (type_comparer.Compare(value, this[NearestIntervalIndex].End) > 0)
+            if (type_comparer.Compare(value, this[nearestIndex].End) > 0)
             {
-                while (type_comparer.Compare(value, this[NearestIntervalIndex].End) > 0 && NearestIntervalIndex < Count - 1)
-                    NearestIntervalIndex++;
+                while (type_comparer.Compare(value, this[nearestIndex].End) > 0 && nearestIndex < intervals.Count - 1)
+                    nearestIndex++;
             }
             else
             {
-                while (type_comparer.Compare(value, this[NearestIntervalIndex].Start) < 0 && NearestIntervalIndex > 0)
-                    NearestIntervalIndex--;
+                while (type_comparer.Compare(value, this[nearestIndex].Start) < 0 && nearestIndex > 0)
+                    nearestIndex--;
             }
 
-            var nearestInterval = this[NearestIntervalIndex];
+            var nearestInterval = this[nearestIndex];
 
             return type_comparer.Compare(value, nearestInterval.Start) >= 0 &&
                    type_comparer.Compare(value, nearestInterval.End) <= 0;

From b7ed17dfbd16a78561da25516757bc19170e9af2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 10 Apr 2020 15:49:06 +0300
Subject: [PATCH 02084/10326] Throw if interval with reversed values added

May reduce in subtle bugs.
---
 osu.Game.Tests/Lists/IntervalListTest.cs | 38 ++++--------------------
 osu.Game/Lists/IntervalList.cs           |  7 +++--
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Tests/Lists/IntervalListTest.cs b/osu.Game.Tests/Lists/IntervalListTest.cs
index 1bc1483e15..0958f0fa7c 100644
--- a/osu.Game.Tests/Lists/IntervalListTest.cs
+++ b/osu.Game.Tests/Lists/IntervalListTest.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 NUnit.Framework;
 using osu.Game.Lists;
 
@@ -14,7 +15,7 @@ namespace osu.Game.Tests.Lists
         {
             (-9.1d, -8.3d),
             (-3.4d, 2.1d),
-            (50.0d, 9.0d), // intentionally reversing interval.
+            (9.0d, 50.0d),
             (5.25d, 10.50d),
         };
 
@@ -103,39 +104,12 @@ namespace osu.Game.Tests.Lists
         }
 
         [Test]
-        public void TestCheckIntervalIndexOnChecks()
+        public void TestReversedIntervalThrows()
         {
-            var list = new TestIntervalList { { 1.0d, 2.0d }, { 3.0d, 4.0d }, { 5.0d, 6.0d }, { 7.0d, 8.0d } };
+            var list = new IntervalList<int>();
 
-            Assert.IsTrue(list.IsInAnyInterval(1.5d));
-            Assert.IsTrue(list.NearestIntervalIndex == 0);
-
-            Assert.IsTrue(list.IsInAnyInterval(5.5d));
-            Assert.IsTrue(list.NearestIntervalIndex == 2);
-
-            Assert.IsTrue(list.IsInAnyInterval(7.5d));
-            Assert.IsTrue(list.NearestIntervalIndex == 3);
-        }
-
-        [Test]
-        public void TestCheckIntervalIndexOnOutOfIntervalsChecks()
-        {
-            var list = new TestIntervalList { { 1.0d, 2.0d }, { 3.0d, 4.0d }, { 5.0d, 6.0d }, { 7.0d, 8.0d } };
-
-            Assert.IsFalse(list.IsInAnyInterval(4.5d));
-            Assert.IsTrue(list.NearestIntervalIndex == 1 ||
-                          list.NearestIntervalIndex == 2); // 4.5 in between 3.0-4.0 and 5.0-6.0
-
-            Assert.IsFalse(list.IsInAnyInterval(9.0d));
-            Assert.IsTrue(list.NearestIntervalIndex == 3); // 9.0 goes above 7.0-8.0
-
-            Assert.IsFalse(list.IsInAnyInterval(0.0d));
-            Assert.IsTrue(list.NearestIntervalIndex == 0); // 0.0 goes below 1.0-2.0
-        }
-
-        private class TestIntervalList : IntervalList<double>
-        {
-            public new int NearestIntervalIndex => base.NearestIntervalIndex;
+            Assert.Throws<ArgumentException>(() => list.Add(50, 25));
+            Assert.Throws<ArgumentException>(() => list.Add(new Interval<int>(50, 25)));
         }
     }
 }
diff --git a/osu.Game/Lists/IntervalList.cs b/osu.Game/Lists/IntervalList.cs
index 6a71d94ea8..15d9a349dc 100644
--- a/osu.Game/Lists/IntervalList.cs
+++ b/osu.Game/Lists/IntervalList.cs
@@ -116,10 +116,11 @@ namespace osu.Game.Lists
 
         public Interval(T start, T end)
         {
-            bool startLessThanEnd = Comparer<T>.Default.Compare(start, end) < 0;
+            if (Comparer<T>.Default.Compare(start, end) >= 0)
+                throw new ArgumentException($"Invalid interval, {nameof(start)} must be less than {nameof(end)}", nameof(start));
 
-            Start = startLessThanEnd ? start : end;
-            End = startLessThanEnd ? end : start;
+            Start = start;
+            End = end;
         }
     }
 }

From 5966c9af9ccdd05d84a92921eae77b3cff787712 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 10 Apr 2020 15:50:07 +0300
Subject: [PATCH 02085/10326] Limit generic type to IConvertible structures
 (common number types)

---
 osu.Game/Lists/IntervalList.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Lists/IntervalList.cs b/osu.Game/Lists/IntervalList.cs
index 15d9a349dc..5a5866ca91 100644
--- a/osu.Game/Lists/IntervalList.cs
+++ b/osu.Game/Lists/IntervalList.cs
@@ -13,6 +13,7 @@ namespace osu.Game.Lists
     /// </summary>
     /// <typeparam name="T">The type of interval values.</typeparam>
     public class IntervalList<T> : ICollection<Interval<T>>, IReadOnlyList<Interval<T>>
+        where T : struct, IConvertible
     {
         private static readonly IComparer<T> type_comparer = Comparer<T>.Default;
 
@@ -103,6 +104,7 @@ namespace osu.Game.Lists
     }
 
     public readonly struct Interval<T>
+        where T : struct, IConvertible
     {
         /// <summary>
         /// The start value of this interval.

From bf124a5cc6d9d99566f099e405f2c03bcdc6ac3f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 10 Apr 2020 15:50:40 +0300
Subject: [PATCH 02086/10326] Simplify IntervalList implementation enough to
 work for its usages

---
 osu.Game/Lists/IntervalList.cs | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Lists/IntervalList.cs b/osu.Game/Lists/IntervalList.cs
index 5a5866ca91..580015bb96 100644
--- a/osu.Game/Lists/IntervalList.cs
+++ b/osu.Game/Lists/IntervalList.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Lists
     /// Represents a list of intervals that can be used for whether a specific value falls into one of them.
     /// </summary>
     /// <typeparam name="T">The type of interval values.</typeparam>
-    public class IntervalList<T> : ICollection<Interval<T>>, IReadOnlyList<Interval<T>>
+    public class IntervalList<T> : IEnumerable<Interval<T>>
         where T : struct, IConvertible
     {
         private static readonly IComparer<T> type_comparer = Comparer<T>.Default;
@@ -20,6 +20,11 @@ namespace osu.Game.Lists
         private readonly SortedList<Interval<T>> intervals = new SortedList<Interval<T>>((x, y) => type_comparer.Compare(x.Start, y.Start));
         private int nearestIndex;
 
+        public Interval<T> this[int i]
+        {
+            get => intervals[i];
+            set => intervals[i] = value;
+        }
 
         /// <summary>
         /// Whether the provided value is in any interval added to this list.
@@ -58,12 +63,6 @@ namespace osu.Game.Lists
         /// <param name="end">The end value of the interval.</param>
         public void Add(T start, T end) => Add(new Interval<T>(start, end));
 
-        #region ICollection<Interval<T>>
-
-        public int Count => intervals.Count;
-
-        bool ICollection<Interval<T>>.IsReadOnly => false;
-
         /// <summary>
         /// Adds a new interval to the list
         /// </summary>
@@ -82,25 +81,9 @@ namespace osu.Game.Lists
         /// </summary>
         public void Clear() => intervals.Clear();
 
-        public void CopyTo(Interval<T>[] array, int arrayIndex) => intervals.CopyTo(array, arrayIndex);
-
-        public bool Contains(Interval<T> item) => intervals.Contains(item);
-
         public IEnumerator<Interval<T>> GetEnumerator() => intervals.GetEnumerator();
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
-        #endregion
-
-        #region IReadOnlyList<Interval<T>>
-
-        public Interval<T> this[int index]
-        {
-            get => intervals[index];
-            set => intervals[index] = value;
-        }
-
-        #endregion
     }
 
     public readonly struct Interval<T>

From 235d3046c65d3e65fe924067ad57096537c86a92 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 11 Apr 2020 04:22:23 +0300
Subject: [PATCH 02087/10326] Move ruleset dependencies caching to its own
 container

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  93 ++---------
 .../UI/DrawableRulesetDependencies.cs         | 148 ++++++++++++++++++
 2 files changed, 157 insertions(+), 84 deletions(-)
 create mode 100644 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 5062c92afe..0a46f5207e 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -11,20 +11,15 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
-using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Handlers;
@@ -113,6 +108,8 @@ namespace osu.Game.Rulesets.UI
 
         private OnScreenDisplay onScreenDisplay;
 
+        private DrawableRulesetDependencies dependencies;
+
         /// <summary>
         /// Creates a ruleset visualisation for the provided ruleset and beatmap.
         /// </summary>
@@ -147,30 +144,15 @@ namespace osu.Game.Rulesets.UI
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies = new DrawableRulesetDependencies(Ruleset, base.CreateChildDependencies(parent));
 
-            var resources = Ruleset.CreateResourceStore();
-
-            if (resources != null)
-            {
-                textureStore = new TextureStore(new TextureLoaderStore(new NamespacedResourceStore<byte[]>(resources, "Textures")));
-                textureStore.AddStore(dependencies.Get<TextureStore>());
-                dependencies.Cache(textureStore);
-
-                localSampleStore = dependencies.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, "Samples"));
-                localSampleStore.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
-                dependencies.CacheAs<ISampleStore>(new FallbackSampleStore(localSampleStore, dependencies.Get<ISampleStore>()));
-            }
+            textureStore = dependencies.TextureStore;
+            localSampleStore = dependencies.SampleStore;
+            Config = dependencies.RulesetConfigManager;
 
             onScreenDisplay = dependencies.Get<OnScreenDisplay>();
-
-            Config = dependencies.Get<RulesetConfigCache>().GetConfigFor(Ruleset);
-
             if (Config != null)
-            {
-                dependencies.Cache(Config);
                 onScreenDisplay?.BeginTracking(this, Config);
-            }
 
             return dependencies;
         }
@@ -362,13 +344,14 @@ namespace osu.Game.Rulesets.UI
         {
             base.Dispose(isDisposing);
 
-            localSampleStore?.Dispose();
-
             if (Config != null)
             {
                 onScreenDisplay?.StopTracking(this, Config);
                 Config = null;
             }
+
+            // Dispose the components created by this dependency container.
+            dependencies.Dispose();
         }
     }
 
@@ -519,62 +502,4 @@ namespace osu.Game.Rulesets.UI
         {
         }
     }
-
-    /// <summary>
-    /// A sample store which adds a fallback source.
-    /// </summary>
-    /// <remarks>
-    /// This is a temporary implementation to workaround ISampleStore limitations.
-    /// </remarks>
-    public class FallbackSampleStore : ISampleStore
-    {
-        private readonly ISampleStore primary;
-        private readonly ISampleStore secondary;
-
-        public FallbackSampleStore(ISampleStore primary, ISampleStore secondary)
-        {
-            this.primary = primary;
-            this.secondary = secondary;
-        }
-
-        public SampleChannel Get(string name) => primary.Get(name) ?? secondary.Get(name);
-
-        public Task<SampleChannel> GetAsync(string name) => primary.GetAsync(name) ?? secondary.GetAsync(name);
-
-        public Stream GetStream(string name) => primary.GetStream(name) ?? secondary.GetStream(name);
-
-        public IEnumerable<string> GetAvailableResources() => throw new NotSupportedException();
-
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
-
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
-
-        public BindableNumber<double> Volume => throw new NotSupportedException();
-
-        public BindableNumber<double> Balance => throw new NotSupportedException();
-
-        public BindableNumber<double> Frequency => throw new NotSupportedException();
-
-        public BindableNumber<double> Tempo => throw new NotSupportedException();
-
-        public IBindable<double> GetAggregate(AdjustableProperty type) => throw new NotSupportedException();
-
-        public IBindable<double> AggregateVolume => throw new NotSupportedException();
-
-        public IBindable<double> AggregateBalance => throw new NotSupportedException();
-
-        public IBindable<double> AggregateFrequency => throw new NotSupportedException();
-
-        public IBindable<double> AggregateTempo => throw new NotSupportedException();
-
-        public int PlaybackConcurrency
-        {
-            get => throw new NotSupportedException();
-            set => throw new NotSupportedException();
-        }
-
-        public void Dispose()
-        {
-        }
-    }
 }
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
new file mode 100644
index 0000000000..33b340a974
--- /dev/null
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -0,0 +1,148 @@
+// Copyright (c) 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.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+using osu.Game.Rulesets.Configuration;
+
+namespace osu.Game.Rulesets.UI
+{
+    public class DrawableRulesetDependencies : DependencyContainer, IDisposable
+    {
+        /// <summary>
+        /// The texture store to be used for the ruleset.
+        /// </summary>
+        public TextureStore TextureStore { get; private set; }
+
+        /// <summary>
+        /// The sample store to be used for the ruleset.
+        /// </summary>
+        /// <remarks>
+        /// This is the local sample store pointing to the ruleset sample resources,
+        /// the cached sample store (<see cref="FallbackSampleStore"/>) retrieves from
+        /// this store and falls back to the parent store if this store doesn't have the requested sample.
+        /// </remarks>
+        public ISampleStore SampleStore { get; private set; }
+
+        /// <summary>
+        /// The ruleset config manager.
+        /// </summary>
+        public IRulesetConfigManager RulesetConfigManager { get; private set; }
+
+        public DrawableRulesetDependencies(Ruleset ruleset, IReadOnlyDependencyContainer parent)
+            : base(parent)
+        {
+            var resources = ruleset.CreateResourceStore();
+
+            if (resources != null)
+            {
+                TextureStore = new TextureStore(new TextureLoaderStore(new NamespacedResourceStore<byte[]>(resources, @"Textures")));
+                TextureStore.AddStore(parent.Get<TextureStore>());
+                Cache(TextureStore);
+
+                SampleStore = parent.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, @"Samples"));
+                SampleStore.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
+                CacheAs<ISampleStore>(new FallbackSampleStore(SampleStore, parent.Get<ISampleStore>()));
+            }
+
+            RulesetConfigManager = parent.Get<RulesetConfigCache>().GetConfigFor(ruleset);
+            if (RulesetConfigManager != null)
+                Cache(RulesetConfigManager);
+        }
+
+        #region Disposal
+
+        ~DrawableRulesetDependencies()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private bool isDisposed;
+
+        protected void Dispose(bool disposing)
+        {
+            if (isDisposed)
+                return;
+
+            isDisposed = true;
+
+            SampleStore?.Dispose();
+            RulesetConfigManager = null;
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// A sample store which adds a fallback source.
+    /// </summary>
+    /// <remarks>
+    /// This is a temporary implementation to workaround ISampleStore limitations.
+    /// </remarks>
+    public class FallbackSampleStore : ISampleStore
+    {
+        private readonly ISampleStore primary;
+        private readonly ISampleStore secondary;
+
+        public FallbackSampleStore(ISampleStore primary, ISampleStore secondary)
+        {
+            this.primary = primary;
+            this.secondary = secondary;
+        }
+
+        public SampleChannel Get(string name) => primary.Get(name) ?? secondary.Get(name);
+
+        public Task<SampleChannel> GetAsync(string name) => primary.GetAsync(name) ?? secondary.GetAsync(name);
+
+        public Stream GetStream(string name) => primary.GetStream(name) ?? secondary.GetStream(name);
+
+        public IEnumerable<string> GetAvailableResources() => throw new NotSupportedException();
+
+        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
+
+        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
+
+        public BindableNumber<double> Volume => throw new NotSupportedException();
+
+        public BindableNumber<double> Balance => throw new NotSupportedException();
+
+        public BindableNumber<double> Frequency => throw new NotSupportedException();
+
+        public BindableNumber<double> Tempo => throw new NotSupportedException();
+
+        public IBindable<double> GetAggregate(AdjustableProperty type) => throw new NotSupportedException();
+
+        public IBindable<double> AggregateVolume => throw new NotSupportedException();
+
+        public IBindable<double> AggregateBalance => throw new NotSupportedException();
+
+        public IBindable<double> AggregateFrequency => throw new NotSupportedException();
+
+        public IBindable<double> AggregateTempo => throw new NotSupportedException();
+
+        public int PlaybackConcurrency
+        {
+            get => throw new NotSupportedException();
+            set => throw new NotSupportedException();
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}

From 2b4208bebfa4e81894d7a9a107701f474478325b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 11 Apr 2020 04:23:31 +0300
Subject: [PATCH 02088/10326] Cache ruleset dependencies if the scene tests
 ruleset-specific components

---
 .../Rulesets/Testing/IRulesetTestScene.cs     | 20 +++++++++++++++++++
 osu.Game/Tests/Visual/OsuTestScene.cs         | 13 +++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Rulesets/Testing/IRulesetTestScene.cs

diff --git a/osu.Game/Rulesets/Testing/IRulesetTestScene.cs b/osu.Game/Rulesets/Testing/IRulesetTestScene.cs
new file mode 100644
index 0000000000..e8b8a79eb5
--- /dev/null
+++ b/osu.Game/Rulesets/Testing/IRulesetTestScene.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.
+
+namespace osu.Game.Rulesets.Testing
+{
+    /// <summary>
+    /// An interface that can be assigned to test scenes to indicate
+    /// that the test scene is testing ruleset-specific components.
+    /// This is to cache required ruleset dependencies for the components.
+    /// </summary>
+    public interface IRulesetTestScene
+    {
+        /// <summary>
+        /// Retrieves the ruleset that is going
+        /// to be tested by this test scene.
+        /// </summary>
+        /// <returns>The <see cref="Ruleset"/>.</returns>
+        Ruleset CreateRuleset();
+    }
+}
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index d1d8059cb1..eb1905cbe1 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -20,6 +20,8 @@ using osu.Game.Database;
 using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Testing;
+using osu.Game.Rulesets.UI;
 using osu.Game.Screens;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Beatmaps;
@@ -36,6 +38,8 @@ namespace osu.Game.Tests.Visual
 
         protected new OsuScreenDependencies Dependencies { get; private set; }
 
+        private DrawableRulesetDependencies rulesetDependencies;
+
         private Lazy<Storage> localStorage;
         protected Storage LocalStorage => localStorage.Value;
 
@@ -64,7 +68,12 @@ namespace osu.Game.Tests.Visual
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
-            Dependencies = new OsuScreenDependencies(false, base.CreateChildDependencies(parent));
+            var baseDependencies = base.CreateChildDependencies(parent);
+
+            if (this is IRulesetTestScene rts)
+                baseDependencies = rulesetDependencies = new DrawableRulesetDependencies(rts.CreateRuleset(), baseDependencies);
+
+            Dependencies = new OsuScreenDependencies(false, baseDependencies);
 
             Beatmap = Dependencies.Beatmap;
             Beatmap.SetDefault();
@@ -142,6 +151,8 @@ namespace osu.Game.Tests.Visual
         {
             base.Dispose(isDisposing);
 
+            rulesetDependencies?.Dispose();
+
             if (Beatmap?.Value.TrackLoaded == true)
                 Beatmap.Value.Track.Stop();
 

From e10c973aa69b8b59df985c35debac260647b3845 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 11 Apr 2020 04:24:34 +0300
Subject: [PATCH 02089/10326] Add test cases for behaviour of ruleset
 dependencies caching on tests

---
 .../Gameplay/TestSceneStoryboardSamples.cs    |   6 +-
 .../Resources/{ => Samples}/test-sample.mp3   | Bin
 .../Resources/Textures/test-image.png         | Bin 0 -> 4852 bytes
 .../Testing/TestSceneRulesetTestScene.cs      |  80 ++++++++++++++++++
 4 files changed, 83 insertions(+), 3 deletions(-)
 rename osu.Game.Tests/Resources/{ => Samples}/test-sample.mp3 (100%)
 create mode 100644 osu.Game.Tests/Resources/Textures/test-image.png
 create mode 100644 osu.Game.Tests/Testing/TestSceneRulesetTestScene.cs

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 84506739ab..8adf6064f5 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -60,11 +60,11 @@ namespace osu.Game.Tests.Gameplay
                 this.resourceName = resourceName;
             }
 
-            public byte[] Get(string name) => name == resourceName ? TestResources.GetStore().Get("Resources/test-sample.mp3") : null;
+            public byte[] Get(string name) => name == resourceName ? TestResources.GetStore().Get("Resources/Samples/test-sample.mp3") : null;
 
-            public Task<byte[]> GetAsync(string name) => name == resourceName ? TestResources.GetStore().GetAsync("Resources/test-sample.mp3") : null;
+            public Task<byte[]> GetAsync(string name) => name == resourceName ? TestResources.GetStore().GetAsync("Resources/Samples/test-sample.mp3") : null;
 
-            public Stream GetStream(string name) => name == resourceName ? TestResources.GetStore().GetStream("Resources/test-sample.mp3") : null;
+            public Stream GetStream(string name) => name == resourceName ? TestResources.GetStore().GetStream("Resources/Samples/test-sample.mp3") : null;
 
             public IEnumerable<string> GetAvailableResources() => new[] { resourceName };
 
diff --git a/osu.Game.Tests/Resources/test-sample.mp3 b/osu.Game.Tests/Resources/Samples/test-sample.mp3
similarity index 100%
rename from osu.Game.Tests/Resources/test-sample.mp3
rename to osu.Game.Tests/Resources/Samples/test-sample.mp3
diff --git a/osu.Game.Tests/Resources/Textures/test-image.png b/osu.Game.Tests/Resources/Textures/test-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d0092edc89e6cb91a46c1dacba724642e3d880d
GIT binary patch
literal 4852
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Testing/TestSceneRulesetTestScene.cs b/osu.Game.Tests/Testing/TestSceneRulesetTestScene.cs
new file mode 100644
index 0000000000..6d8502e651
--- /dev/null
+++ b/osu.Game.Tests/Testing/TestSceneRulesetTestScene.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Configuration.Tracking;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Configuration;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Testing;
+using osu.Game.Rulesets.UI;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Testing
+{
+    public class TestSceneRulesetTestScene : OsuTestScene, IRulesetTestScene
+    {
+        [Test]
+        public void TestRetrieveTexture()
+        {
+            AddAssert("ruleset texture retrieved", () =>
+                Dependencies.Get<TextureStore>().Get(@"test-image") != null);
+        }
+
+        [Test]
+        public void TestRetrieveSample()
+        {
+            AddAssert("ruleset sample retrieved", () =>
+                Dependencies.Get<ISampleStore>().Get(@"test-sample") != null);
+        }
+
+        [Test]
+        public void TestResolveConfigManager()
+        {
+            AddAssert("ruleset config resolved", () =>
+                Dependencies.Get<TestRulesetConfigManager>() != null);
+        }
+
+        public Ruleset CreateRuleset() => new TestRuleset();
+
+        private class TestRuleset : Ruleset
+        {
+            public override string Description => string.Empty;
+            public override string ShortName => string.Empty;
+
+            public TestRuleset()
+            {
+                // temporary ID to let RulesetConfigCache pass our
+                // config manager to the ruleset dependencies.
+                RulesetInfo.ID = -1;
+            }
+
+            public override IResourceStore<byte[]> CreateResourceStore() => new NamespacedResourceStore<byte[]>(TestResources.GetStore(), @"Resources");
+            public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new TestRulesetConfigManager();
+
+            public override IEnumerable<Mod> GetModsFor(ModType type) => throw new NotImplementedException();
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new NotImplementedException();
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => throw new NotImplementedException();
+            public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => throw new NotImplementedException();
+        }
+
+        private class TestRulesetConfigManager : IRulesetConfigManager
+        {
+            public void Load() => throw new NotImplementedException();
+            public bool Save() => throw new NotImplementedException();
+            public TrackedSettings CreateTrackedSettings() => throw new NotImplementedException();
+            public void LoadInto(TrackedSettings settings) => throw new NotImplementedException();
+            public void Dispose() => throw new NotImplementedException();
+        }
+    }
+}

From a314a6119a9461155fdb083976f45121c704d796 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 11 Apr 2020 05:13:04 +0300
Subject: [PATCH 02090/10326] Fix CI issues

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs             | 8 --------
 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 0a46f5207e..265c6a7319 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -14,10 +14,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using JetBrains.Annotations;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
@@ -58,10 +56,6 @@ namespace osu.Game.Rulesets.UI
 
         private readonly Lazy<Playfield> playfield;
 
-        private TextureStore textureStore;
-
-        private ISampleStore localSampleStore;
-
         /// <summary>
         /// The playfield.
         /// </summary>
@@ -146,8 +140,6 @@ namespace osu.Game.Rulesets.UI
         {
             dependencies = new DrawableRulesetDependencies(Ruleset, base.CreateChildDependencies(parent));
 
-            textureStore = dependencies.TextureStore;
-            localSampleStore = dependencies.SampleStore;
             Config = dependencies.RulesetConfigManager;
 
             onScreenDisplay = dependencies.Get<OnScreenDisplay>();
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index 33b340a974..168e937256 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// The texture store to be used for the ruleset.
         /// </summary>
-        public TextureStore TextureStore { get; private set; }
+        public TextureStore TextureStore { get; }
 
         /// <summary>
         /// The sample store to be used for the ruleset.
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.UI
         /// the cached sample store (<see cref="FallbackSampleStore"/>) retrieves from
         /// this store and falls back to the parent store if this store doesn't have the requested sample.
         /// </remarks>
-        public ISampleStore SampleStore { get; private set; }
+        public ISampleStore SampleStore { get; }
 
         /// <summary>
         /// The ruleset config manager.

From 7fba29113466d5fe6aa43eef0cd284323f1c969a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 13:14:34 +0900
Subject: [PATCH 02091/10326] Change inheritance of taiko hit pieces to better
 allow for skinning

---
 .../TestSceneDrawableHit.cs                   | 54 ++++++++++++++++++
 .../Objects/Drawables/DrawableCentreHit.cs    | 10 +---
 .../Objects/Drawables/DrawableDrumRoll.cs     | 10 ++--
 .../Objects/Drawables/DrawableDrumRollTick.cs |  3 +-
 .../Objects/Drawables/DrawableRimHit.cs       | 10 +---
 .../Objects/Drawables/DrawableSwell.cs        | 16 +++---
 .../Objects/Drawables/DrawableSwellTick.cs    |  4 ++
 .../Drawables/DrawableTaikoHitObject.cs       | 14 ++---
 .../Drawables/Pieces/CentreHitSymbolPiece.cs  | 50 +++++++++++------
 .../Drawables/Pieces/RimHitCirclePiece.cs     | 55 +++++++++++++++++++
 .../Drawables/Pieces/RimHitSymbolPiece.cs     | 39 -------------
 .../Drawables/Pieces/SwellSymbolPiece.cs      | 50 +++++++++++------
 .../Objects/Drawables/Pieces/TickPiece.cs     |  6 +-
 13 files changed, 209 insertions(+), 112 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/RimHitCirclePiece.cs
 delete mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/RimHitSymbolPiece.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
new file mode 100644
index 0000000000..b927f0294b
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    [TestFixture]
+    public class TestSceneDrawableHit : TaikoSkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
+        {
+            typeof(DrawableHit),
+            typeof(DrawableCentreHit),
+            typeof(DrawableRimHit),
+        }).ToList();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddStep("Centre hit", () => SetContents(() => new DrawableCentreHit(createHitAtCurrentTime())
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            }));
+            AddStep("Rim hit", () => SetContents(() => new DrawableRimHit(createHitAtCurrentTime())
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            }));
+        }
+
+        private Hit createHitAtCurrentTime()
+        {
+            var hit = new Hit
+            {
+                StartTime = Time.Current + 3000,
+            };
+
+            hit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            return hit;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 4979135f50..22d62442cf 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.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 osu.Framework.Allocation;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -14,13 +13,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         public DrawableCentreHit(Hit hit)
             : base(hit)
         {
-            MainPiece.Add(new CentreHitSymbolPiece());
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            MainPiece.AccentColour = colours.PinkDarker;
-        }
+        protected override CompositeDrawable CreateMainPiece() => new CentreHitCirclePiece();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 5806c90115..0627eb95fd 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -34,17 +34,19 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private Color4 colourIdle;
         private Color4 colourEngaged;
 
+        private ElongatedCirclePiece elongatedPiece;
+
         public DrawableDrumRoll(DrumRoll drumRoll)
             : base(drumRoll)
         {
             RelativeSizeAxes = Axes.Y;
-            MainPiece.Add(tickContainer = new Container<DrawableDrumRollTick> { RelativeSizeAxes = Axes.Both });
+            elongatedPiece.Add(tickContainer = new Container<DrawableDrumRollTick> { RelativeSizeAxes = Axes.Both });
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            MainPiece.AccentColour = colourIdle = colours.YellowDark;
+            elongatedPiece.AccentColour = colourIdle = colours.YellowDark;
             colourEngaged = colours.YellowDarker;
         }
 
@@ -84,7 +86,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return base.CreateNestedHitObject(hitObject);
         }
 
-        protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece();
+        protected override CompositeDrawable CreateMainPiece() => elongatedPiece = new ElongatedCirclePiece();
 
         public override bool OnPressed(TaikoAction action) => false;
 
@@ -101,7 +103,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             rollingHits = Math.Clamp(rollingHits, 0, rolling_hits_for_engaged_colour);
 
             Color4 newColour = Interpolation.ValueAt((float)rollingHits / rolling_hits_for_engaged_colour, colourIdle, colourEngaged, 0, 1);
-            MainPiece.FadeAccent(newColour, 100);
+            (MainPiece as IHasAccentColour)?.FadeAccent(newColour, 100);
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index 25b6141a0e..fea3eea6a9 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
@@ -19,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         public override bool DisplayResult => false;
 
-        protected override TaikoPiece CreateMainPiece() => new TickPiece
+        protected override CompositeDrawable CreateMainPiece() => new TickPiece
         {
             Filled = HitObject.FirstTick
         };
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index 5a12d71cea..6dad7af907 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.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 osu.Framework.Allocation;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -14,13 +13,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         public DrawableRimHit(Hit hit)
             : base(hit)
         {
-            MainPiece.Add(new RimHitSymbolPiece());
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            MainPiece.AccentColour = colours.BlueDarker;
-        }
+        protected override CompositeDrawable CreateMainPiece() => new RimHitCirclePiece();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index fa39819199..3a2e44038f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -9,11 +9,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -34,8 +34,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private readonly CircularContainer targetRing;
         private readonly CircularContainer expandingRing;
 
-        private readonly SwellSymbolPiece symbol;
-
         public DrawableSwell(Swell swell)
             : base(swell)
         {
@@ -107,18 +105,22 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             });
 
             AddInternal(ticks = new Container<DrawableSwellTick> { RelativeSizeAxes = Axes.Both });
-
-            MainPiece.Add(symbol = new SwellSymbolPiece());
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            MainPiece.AccentColour = colours.YellowDark;
             expandingRing.Colour = colours.YellowLight;
             targetRing.BorderColour = colours.YellowDark.Opacity(0.25f);
         }
 
+        protected override CompositeDrawable CreateMainPiece() => new SwellCirclePiece
+        {
+            // to allow for rotation transform
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre,
+        };
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -182,7 +184,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     .Then()
                     .FadeTo(completion / 8, 2000, Easing.OutQuint);
 
-                symbol.RotateTo((float)(completion * HitObject.Duration / 8), 4000, Easing.OutQuint);
+                MainPiece.RotateTo((float)(completion * HitObject.Duration / 8), 4000, Easing.OutQuint);
 
                 expandingRing.ScaleTo(1f + Math.Min(target_ring_scale - 1f, (target_ring_scale - 1f) * completion * 1.3f), 260, Easing.OutQuint);
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
index ce875ebba8..5a954addfb 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
@@ -2,7 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -28,5 +30,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         }
 
         public override bool OnPressed(TaikoAction action) => false;
+
+        protected override CompositeDrawable CreateMainPiece() => new TickPiece();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 5f892dd2fa..397888bb11 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 using osuTK;
 using System.Linq;
 using osu.Game.Audio;
@@ -108,19 +107,19 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         }
     }
 
-    public abstract class DrawableTaikoHitObject<TTaikoHit> : DrawableTaikoHitObject
-        where TTaikoHit : TaikoHitObject
+    public abstract class DrawableTaikoHitObject<TObject> : DrawableTaikoHitObject
+        where TObject : TaikoHitObject
     {
         public override Vector2 OriginPosition => new Vector2(DrawHeight / 2);
 
-        public new TTaikoHit HitObject;
+        public new TObject HitObject;
 
         protected readonly Vector2 BaseSize;
-        protected readonly TaikoPiece MainPiece;
+        protected readonly CompositeDrawable MainPiece;
 
         private readonly Container<DrawableStrongNestedHit> strongHitContainer;
 
-        protected DrawableTaikoHitObject(TTaikoHit hitObject)
+        protected DrawableTaikoHitObject(TObject hitObject)
             : base(hitObject)
         {
             HitObject = hitObject;
@@ -132,7 +131,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Size = BaseSize = new Vector2(HitObject.IsStrong ? TaikoHitObject.DEFAULT_STRONG_SIZE : TaikoHitObject.DEFAULT_SIZE);
 
             Content.Add(MainPiece = CreateMainPiece());
-            MainPiece.KiaiMode = HitObject.Kiai;
 
             AddInternal(strongHitContainer = new Container<DrawableStrongNestedHit>());
         }
@@ -169,7 +167,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         // Normal and clap samples are handled by the drum
         protected override IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples.Where(s => s.Name != HitSampleInfo.HIT_NORMAL && s.Name != HitSampleInfo.HIT_CLAP);
 
-        protected virtual TaikoPiece CreateMainPiece() => new CirclePiece();
+        protected abstract CompositeDrawable CreateMainPiece();
 
         /// <summary>
         /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongHitObject"/>.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CentreHitSymbolPiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CentreHitSymbolPiece.cs
index 7ed61ede96..0509841ba8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CentreHitSymbolPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CentreHitSymbolPiece.cs
@@ -1,36 +1,52 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osuTK;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
 {
-    /// <summary>
-    /// The symbol used for centre hit pieces.
-    /// </summary>
-    public class CentreHitSymbolPiece : Container
+    public class CentreHitCirclePiece : CirclePiece
     {
-        public CentreHitSymbolPiece()
+        public CentreHitCirclePiece()
         {
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
+            Add(new CentreHitSymbolPiece());
+        }
 
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(CirclePiece.SYMBOL_SIZE);
-            Padding = new MarginPadding(CirclePiece.SYMBOL_BORDER);
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AccentColour = colours.PinkDarker;
+        }
 
-            Children = new[]
+        /// <summary>
+        /// The symbol used for centre hit pieces.
+        /// </summary>
+        public class CentreHitSymbolPiece : Container
+        {
+            public CentreHitSymbolPiece()
             {
-                new CircularContainer
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                RelativeSizeAxes = Axes.Both;
+                Size = new Vector2(SYMBOL_SIZE);
+                Padding = new MarginPadding(SYMBOL_BORDER);
+
+                Children = new[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Children = new[] { new Box { RelativeSizeAxes = Axes.Both } }
-                }
-            };
+                    new CircularContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        Children = new[] { new Box { RelativeSizeAxes = Axes.Both } }
+                    }
+                };
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/RimHitCirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/RimHitCirclePiece.cs
new file mode 100644
index 0000000000..3273ab7fa7
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/RimHitCirclePiece.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
+{
+    public class RimHitCirclePiece : CirclePiece
+    {
+        public RimHitCirclePiece()
+        {
+            Add(new RimHitSymbolPiece());
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AccentColour = colours.BlueDarker;
+        }
+
+        /// <summary>
+        /// The symbol used for rim hit pieces.
+        /// </summary>
+        public class RimHitSymbolPiece : CircularContainer
+        {
+            public RimHitSymbolPiece()
+            {
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                RelativeSizeAxes = Axes.Both;
+                Size = new Vector2(SYMBOL_SIZE);
+
+                BorderThickness = SYMBOL_BORDER;
+                BorderColour = Color4.White;
+                Masking = true;
+                Children = new[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        AlwaysPresent = true
+                    }
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/RimHitSymbolPiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/RimHitSymbolPiece.cs
deleted file mode 100644
index e4c964a884..0000000000
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/RimHitSymbolPiece.cs
+++ /dev/null
@@ -1,39 +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.Containers;
-using osuTK;
-using osuTK.Graphics;
-using osu.Framework.Graphics.Shapes;
-
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
-{
-    /// <summary>
-    /// The symbol used for rim hit pieces.
-    /// </summary>
-    public class RimHitSymbolPiece : CircularContainer
-    {
-        public RimHitSymbolPiece()
-        {
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
-
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(CirclePiece.SYMBOL_SIZE);
-
-            BorderThickness = CirclePiece.SYMBOL_BORDER;
-            BorderColour = Color4.White;
-            Masking = true;
-            Children = new[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0,
-                    AlwaysPresent = true
-                }
-            };
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs
index 0ed9923924..a8f9f0b94d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs
@@ -1,36 +1,52 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
 {
-    /// <summary>
-    /// The symbol used for swell pieces.
-    /// </summary>
-    public class SwellSymbolPiece : Container
+    public class SwellCirclePiece : CirclePiece
     {
-        public SwellSymbolPiece()
+        public SwellCirclePiece()
         {
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
+            Add(new SwellSymbolPiece());
+        }
 
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(CirclePiece.SYMBOL_SIZE);
-            Padding = new MarginPadding(CirclePiece.SYMBOL_BORDER);
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AccentColour = colours.YellowDark;
+        }
 
-            Children = new[]
+        /// <summary>
+        /// The symbol used for swell pieces.
+        /// </summary>
+        public class SwellSymbolPiece : Container
+        {
+            public SwellSymbolPiece()
             {
-                new SpriteIcon
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                RelativeSizeAxes = Axes.Both;
+                Size = new Vector2(SYMBOL_SIZE);
+                Padding = new MarginPadding(SYMBOL_BORDER);
+
+                Children = new[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Icon = FontAwesome.Solid.Asterisk,
-                    Shadow = false
-                }
-            };
+                    new SpriteIcon
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Icon = FontAwesome.Solid.Asterisk,
+                        Shadow = false
+                    }
+                };
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TickPiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TickPiece.cs
index 83cf7a64ec..0648bcebcd 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TickPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TickPiece.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
 {
-    public class TickPiece : TaikoPiece
+    public class TickPiece : CompositeDrawable
     {
         /// <summary>
         /// Any tick that is not the first for a drumroll is not filled, but is instead displayed
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
             FillMode = FillMode.Fit;
             Size = new Vector2(tick_size);
 
-            Add(new CircularContainer
+            InternalChild = new CircularContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
                         AlwaysPresent = true
                     }
                 }
-            });
+            };
         }
     }
 }

From ca2df77c7684899cc107d72f646e90461244a8e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 13:14:41 +0900
Subject: [PATCH 02092/10326] Add default skin test resources

---
 .../metrics-skin/taikohitcircle@2x.png          | Bin 0 -> 13140 bytes
 .../metrics-skin/taikohitcircleoverlay@2x.png   | Bin 0 -> 38217 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taikohitcircle@2x.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taikohitcircleoverlay@2x.png

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taikohitcircle@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taikohitcircle@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.Taiko.Tests/Resources/metrics-skin/taikohitcircleoverlay@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taikohitcircleoverlay@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4233d9bb6e6aa88c7da5c1998439789cc5f9c7b2
GIT binary patch
literal 38217
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

literal 0
HcmV?d00001


From 78db83fd0e88ad1217f96ff83cb077c800ad9494 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 13:33:19 +0900
Subject: [PATCH 02093/10326] Remove TaikoPiece class and localise kiai for now

---
 ...SymbolPiece.cs => CentreHitCirclePiece.cs} |  0
 .../Objects/Drawables/Pieces/CirclePiece.cs   | 19 ++++++++-----
 .../Objects/Drawables/Pieces/TaikoPiece.cs    | 28 -------------------
 3 files changed, 12 insertions(+), 35 deletions(-)
 rename osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/{CentreHitSymbolPiece.cs => CentreHitCirclePiece.cs} (100%)
 delete mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CentreHitSymbolPiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CentreHitCirclePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CentreHitSymbolPiece.cs
rename to osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CentreHitCirclePiece.cs
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
index d9c0664ecd..ce2882656a 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
@@ -10,6 +10,7 @@ using osuTK.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Effects;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
 {
@@ -20,21 +21,23 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
     /// for a usage example.
     /// </para>
     /// </summary>
-    public class CirclePiece : TaikoPiece
+    public class CirclePiece : BeatSyncedContainer
     {
         public const float SYMBOL_SIZE = 0.45f;
         public const float SYMBOL_BORDER = 8;
         private const double pre_beat_transition_time = 80;
 
+        private Color4 accentColour;
+
         /// <summary>
         /// The colour of the inner circle and outer glows.
         /// </summary>
-        public override Color4 AccentColour
+        public Color4 AccentColour
         {
-            get => base.AccentColour;
+            get => accentColour;
             set
             {
-                base.AccentColour = value;
+                accentColour = value;
 
                 background.Colour = AccentColour;
 
@@ -42,15 +45,17 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
             }
         }
 
+        private bool kiaiMode;
+
         /// <summary>
         /// Whether Kiai mode effects are enabled for this circle piece.
         /// </summary>
-        public override bool KiaiMode
+        public bool KiaiMode
         {
-            get => base.KiaiMode;
+            get => kiaiMode;
             set
             {
-                base.KiaiMode = value;
+                kiaiMode = value;
 
                 resetEdgeEffects();
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs
deleted file mode 100644
index 8067054f8f..0000000000
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.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.Game.Graphics;
-using osuTK.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Framework.Graphics;
-
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
-{
-    public class TaikoPiece : BeatSyncedContainer, IHasAccentColour
-    {
-        /// <summary>
-        /// The colour of the inner circle and outer glows.
-        /// </summary>
-        public virtual Color4 AccentColour { get; set; }
-
-        /// <summary>
-        /// Whether Kiai mode effects are enabled for this circle piece.
-        /// </summary>
-        public virtual bool KiaiMode { get; set; }
-
-        public TaikoPiece()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-    }
-}

From 009b1383648dd267e76ee13f72daac2ee1bb1458 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 13:41:14 +0900
Subject: [PATCH 02094/10326] Prepare for skinnable versions

---
 .../Objects/Drawables/DrawableCentreHit.cs                    | 4 +++-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs   | 4 +++-
 .../Objects/Drawables/Pieces/CirclePiece.cs                   | 2 ++
 osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs                | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 22d62442cf..f3f4c59a62 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -15,6 +16,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
         }
 
-        protected override CompositeDrawable CreateMainPiece() => new CentreHitCirclePiece();
+        protected override CompositeDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.CentreHit),
+            _ => new CentreHitCirclePiece(), confineMode: ConfineMode.ScaleToFit);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index 6dad7af907..463a8b746c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -15,6 +16,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
         }
 
-        protected override CompositeDrawable CreateMainPiece() => new RimHitCirclePiece();
+        protected override CompositeDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.RimHit),
+            _ => new RimHitCirclePiece(), confineMode: ConfineMode.ScaleToFit);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
index ce2882656a..70fe4b7bb2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
@@ -71,6 +71,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
 
         public CirclePiece()
         {
+            RelativeSizeAxes = Axes.Both;
+
             EarlyActivationMilliseconds = pre_beat_transition_time;
 
             AddRangeInternal(new Drawable[]
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index 6d4581db80..babf21b6a9 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -6,5 +6,7 @@ namespace osu.Game.Rulesets.Taiko
     public enum TaikoSkinComponents
     {
         InputDrum,
+        CentreHit,
+        RimHit
     }
 }

From dc56be0a1d946d08acede69fc6619dcc47298e3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 14:20:09 +0900
Subject: [PATCH 02095/10326] Add support for skinned hits

---
 .../TestSceneDrawableHit.cs                   |  2 +
 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs | 62 +++++++++++++++++++
 .../Skinning/TaikoLegacySkinTransformer.cs    |  8 +++
 3 files changed, 72 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
index b927f0294b..f2198031db 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
@@ -11,6 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
@@ -22,6 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             typeof(DrawableHit),
             typeof(DrawableCentreHit),
             typeof(DrawableRimHit),
+            typeof(LegacyHit),
         }).ToList();
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
new file mode 100644
index 0000000000..bb76eac865
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
@@ -0,0 +1,62 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Taiko.Skinning
+{
+    public class LegacyHit : CompositeDrawable, IHasAccentColour
+    {
+        private readonly TaikoSkinComponents component;
+
+        private Drawable backgroundLayer;
+
+        public LegacyHit(TaikoSkinComponents component)
+        {
+            this.component = component;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            InternalChildren = new Drawable[]
+            {
+                backgroundLayer = skin.GetAnimation("taikohitcircle", true, false),
+                skin.GetAnimation("taikohitcircleoverlay", true, false),
+            };
+
+            // animations in taiko skins are used in a custom way (>150 combo and animating in time with beat).
+            // for now just stop at first frame for sanity.
+            foreach (var c in InternalChildren)
+            {
+                (c as IFramedAnimation)?.Stop();
+                c.Anchor = Anchor.Centre;
+                c.Origin = Anchor.Centre;
+            }
+
+            AccentColour = component == TaikoSkinComponents.CentreHit
+                ? new Color4(235, 69, 44, 255)
+                : new Color4(67, 142, 172, 255);
+        }
+
+        private Color4 accentColour;
+
+        public Color4 AccentColour
+        {
+            get => accentColour;
+            set
+            {
+                if (value == accentColour)
+                    return;
+
+                backgroundLayer.Colour = accentColour = value;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 78eec94590..9cd625c35f 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -32,6 +32,14 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                         return new LegacyInputDrum();
 
                     return null;
+
+                case TaikoSkinComponents.CentreHit:
+                case TaikoSkinComponents.RimHit:
+
+                    if (GetTexture("taikohitcircle") != null)
+                        return new LegacyHit(taikoComponent.Component);
+
+                    return null;
             }
 
             return source.GetDrawableComponent(component);

From 96bf86099c89444e5328adaa3c169a60d47854c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 14:43:57 +0900
Subject: [PATCH 02096/10326] Fix scaling of strong hits

---
 .../TestSceneDrawableHit.cs                      | 16 +++++++++++++++-
 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs    | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
index f2198031db..301295253d 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
@@ -34,17 +34,31 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             }));
+
+            AddStep("Centre hit (strong)", () => SetContents(() => new DrawableCentreHit(createHitAtCurrentTime(true))
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            }));
+
             AddStep("Rim hit", () => SetContents(() => new DrawableRimHit(createHitAtCurrentTime())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             }));
+
+            AddStep("Rim hit (strong)", () => SetContents(() => new DrawableRimHit(createHitAtCurrentTime(true))
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            }));
         }
 
-        private Hit createHitAtCurrentTime()
+        private Hit createHitAtCurrentTime(bool strong = false)
         {
             var hit = new Hit
             {
+                IsStrong = strong,
                 StartTime = Time.Current + 3000,
             };
 
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
index bb76eac865..af10944ee9 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
@@ -20,12 +21,14 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         public LegacyHit(TaikoSkinComponents component)
         {
             this.component = component;
+
+            RelativeSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 backgroundLayer = skin.GetAnimation("taikohitcircle", true, false),
                 skin.GetAnimation("taikohitcircleoverlay", true, false),
@@ -36,6 +39,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             foreach (var c in InternalChildren)
             {
                 (c as IFramedAnimation)?.Stop();
+
                 c.Anchor = Anchor.Centre;
                 c.Origin = Anchor.Centre;
             }
@@ -45,6 +49,16 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 : new Color4(67, 142, 172, 255);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            // not all skins (including the default osu-stable) have similar sizes for hitcircle and hitcircleoverlay.
+            // this ensures they are scaled relative to each other but also match the expected DrawableHit size.
+            foreach (var c in InternalChildren)
+                c.Scale = new Vector2(DrawWidth / 128);
+        }
+
         private Color4 accentColour;
 
         public Color4 AccentColour

From bf938a37e3d374075e0b9f8e2231e41dc2297949 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 14:51:27 +0900
Subject: [PATCH 02097/10326] Add old skin test resources (with "animation")

---
 .../Resources/old-skin/taikobigcircle.png       | Bin 0 -> 3079 bytes
 .../old-skin/taikobigcircleoverlay-0.png        | Bin 0 -> 17018 bytes
 .../old-skin/taikobigcircleoverlay-1.png        | Bin 0 -> 18837 bytes
 .../Resources/old-skin/taikohitcircle.png       | Bin 0 -> 6028 bytes
 .../old-skin/taikohitcircleoverlay-0.png        | Bin 0 -> 20284 bytes
 .../old-skin/taikohitcircleoverlay-1.png        | Bin 0 -> 20333 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikobigcircle.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikobigcircleoverlay-0.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikobigcircleoverlay-1.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikohitcircle.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikohitcircleoverlay-0.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikohitcircleoverlay-1.png

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikobigcircle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikobigcircle.png
new file mode 100644
index 0000000000000000000000000000000000000000..63504dd52db36e9da6b3b40a08a9d3ec6e1e34f9
GIT binary patch
literal 3079
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
Pp&j68ch<J<B%bs?0(rBb

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikobigcircleoverlay-0.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikobigcircleoverlay-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..490c196fbaaabfcbfaeaf6f39c099e07b99ab8e1
GIT binary patch
literal 17018
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikobigcircleoverlay-1.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikobigcircleoverlay-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..99cd589a10d1b1bfc138a5261cfdc8cc97474bf9
GIT binary patch
literal 18837
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikohitcircle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikohitcircle.png
new file mode 100644
index 0000000000000000000000000000000000000000..26eec54d07fd645ca7d5a1c86932fb4f1b680dad
GIT binary patch
literal 6028
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
JRBqrF^Iu$8TZ{kz

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikohitcircleoverlay-0.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikohitcircleoverlay-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..272c6bcaf75c18a985b971284b11162a13a2cca0
GIT binary patch
literal 20284
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
Tt$RSL00000NkvXXu0mjfXcM#R

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikohitcircleoverlay-1.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taikohitcircleoverlay-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e49e82a71f0e2b2cbf8a7720a727287fc243b1a4
GIT binary patch
literal 20333
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

literal 0
HcmV?d00001


From 63ebb7f80c15a87d5cc3d1275c4c4dc22d3c3dfd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 15:01:09 +0900
Subject: [PATCH 02098/10326] Add support for taikobigcircle and fix exception
 on missing layers

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
index af10944ee9..43d45ea1c9 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
@@ -6,6 +6,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -26,13 +28,24 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        private void load(ISkinSource skin, DrawableHitObject drawableHitObject)
         {
-            InternalChildren = new[]
+            Drawable getDrawableFor(string lookup)
             {
-                backgroundLayer = skin.GetAnimation("taikohitcircle", true, false),
-                skin.GetAnimation("taikohitcircleoverlay", true, false),
-            };
+                const string normal_hit = "taikohit";
+                const string big_hit = "taikobig";
+
+                string prefix = ((drawableHitObject as DrawableTaikoHitObject)?.HitObject.IsStrong ?? false) ? big_hit : normal_hit;
+
+                return skin.GetAnimation($"{prefix}{lookup}", true, false) ?? skin.GetAnimation($"{normal_hit}{lookup}", true, false);
+            }
+
+            // backgroundLayer is guaranteed to exist due to the pre-check in TaikoLegacySkinTransformer
+            AddInternal(backgroundLayer = getDrawableFor("circle"));
+
+            var foregroundLayer = getDrawableFor("circleoverlay");
+            if (foregroundLayer != null)
+                AddInternal(foregroundLayer);
 
             // animations in taiko skins are used in a custom way (>150 combo and animating in time with beat).
             // for now just stop at first frame for sanity.

From 3d5a622db7b0dbf8e4984c1ea57dba56c1d7393f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 15:04:58 +0900
Subject: [PATCH 02099/10326] Tidy up comments

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
index 43d45ea1c9..80bf97936d 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
@@ -37,18 +37,20 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                 string prefix = ((drawableHitObject as DrawableTaikoHitObject)?.HitObject.IsStrong ?? false) ? big_hit : normal_hit;
 
-                return skin.GetAnimation($"{prefix}{lookup}", true, false) ?? skin.GetAnimation($"{normal_hit}{lookup}", true, false);
+                return skin.GetAnimation($"{prefix}{lookup}", true, false) ??
+                       // fallback to regular size if "big" version doesn't exist.
+                       skin.GetAnimation($"{normal_hit}{lookup}", true, false);
             }
 
-            // backgroundLayer is guaranteed to exist due to the pre-check in TaikoLegacySkinTransformer
+            // backgroundLayer is guaranteed to exist due to the pre-check in TaikoLegacySkinTransformer.
             AddInternal(backgroundLayer = getDrawableFor("circle"));
 
             var foregroundLayer = getDrawableFor("circleoverlay");
             if (foregroundLayer != null)
                 AddInternal(foregroundLayer);
 
-            // animations in taiko skins are used in a custom way (>150 combo and animating in time with beat).
-            // for now just stop at first frame for sanity.
+            // Animations in taiko skins are used in a custom way (>150 combo and animating in time with beat).
+            // For now just stop at first frame for sanity.
             foreach (var c in InternalChildren)
             {
                 (c as IFramedAnimation)?.Stop();
@@ -66,8 +68,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         {
             base.Update();
 
-            // not all skins (including the default osu-stable) have similar sizes for hitcircle and hitcircleoverlay.
-            // this ensures they are scaled relative to each other but also match the expected DrawableHit size.
+            // Not all skins (including the default osu-stable) have similar sizes for "hitcircle" and "hitcircleoverlay".
+            // This ensures they are scaled relative to each other but also match the expected DrawableHit size.
             foreach (var c in InternalChildren)
                 c.Scale = new Vector2(DrawWidth / 128);
         }

From e206df479b1636496a95f96711b6ccfa6a52696f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 15:13:20 +0900
Subject: [PATCH 02100/10326] 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 aaac6ec427..5b200ee104 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.407.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.411.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3e2c2b1599..7cf1272611 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.Framework" Version="2020.407.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.411.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 7903d964ce..c58a431e80 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.Framework.iOS" Version="2020.407.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.411.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -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.407.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.411.0" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 12c21cba7e0150d0d14c3a5d5906b5e21409b132 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 15:20:27 +0900
Subject: [PATCH 02101/10326] Add missing masking specification

---
 .../Edit/Blueprints/HoldNoteSelectionBlueprint.cs                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
index f1750f4a01..d569d68b59 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Masking = true,
                     BorderThickness = 1,
                     BorderColour = colours.Yellow,
                     Child = new Box

From eb1fbdacde77c9f7f29634d9f8953d7eb0e55dd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 15:29:52 +0900
Subject: [PATCH 02102/10326] Remove unintentional edge effect

---
 osu.Game/Overlays/Music/CollectionsDropdown.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Music/CollectionsDropdown.cs b/osu.Game/Overlays/Music/CollectionsDropdown.cs
index 4f59b053b6..5bd321f31e 100644
--- a/osu.Game/Overlays/Music/CollectionsDropdown.cs
+++ b/osu.Game/Overlays/Music/CollectionsDropdown.cs
@@ -29,14 +29,8 @@ namespace osu.Game.Overlays.Music
         {
             public CollectionsMenu()
             {
+                Masking = true;
                 CornerRadius = 5;
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Shadow,
-                    Colour = Color4.Black.Opacity(0.3f),
-                    Radius = 3,
-                    Offset = new Vector2(0f, 1f),
-                };
             }
 
             [BackgroundDependencyLoader]

From a843793957583694bd12bcb765068da79c9388eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 16:41:11 +0900
Subject: [PATCH 02103/10326] Un-nest class

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    |  4 +-
 .../Screens/Select/DifficultyRecommender.cs   | 75 +++++++++++++++++++
 osu.Game/Screens/Select/SongSelect.cs         | 62 ---------------
 3 files changed, 78 insertions(+), 63 deletions(-)
 create mode 100644 osu.Game/Screens/Select/DifficultyRecommender.cs

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 3e619a1f80..555c74fb44 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -117,8 +117,10 @@ namespace osu.Game.Screens.Select
         private readonly Stack<CarouselBeatmap> randomSelectedBeatmaps = new Stack<CarouselBeatmap>();
 
         protected List<DrawableCarouselItem> Items = new List<DrawableCarouselItem>();
+
         private CarouselRoot root;
-        public SongSelect.DifficultyRecommender DifficultyRecommender;
+
+        public DifficultyRecommender DifficultyRecommender;
 
         public BeatmapCarousel()
         {
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
new file mode 100644
index 0000000000..d89d505f61
--- /dev/null
+++ b/osu.Game/Screens/Select/DifficultyRecommender.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;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Screens.Select
+{
+    public class DifficultyRecommender : Component
+    {
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
+
+        private int pendingAPIRequests;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            updateRecommended();
+        }
+
+        private void updateRecommended()
+        {
+            if (pendingAPIRequests > 0)
+                return;
+            if (api.LocalUser.Value is GuestUser)
+                return;
+
+            rulesets.AvailableRulesets.ForEach(rulesetInfo =>
+            {
+                var req = new GetUserRequest(api.LocalUser.Value.Id, rulesetInfo);
+
+                req.Success += result =>
+                {
+                    // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
+                    recommendedStarDifficulty[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
+                    pendingAPIRequests--;
+                };
+
+                req.Failure += _ => pendingAPIRequests--;
+
+                pendingAPIRequests++;
+                api.Queue(req);
+            });
+        }
+
+        public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps, RulesetInfo currentRuleset)
+        {
+            if (!recommendedStarDifficulty.ContainsKey(currentRuleset))
+            {
+                updateRecommended();
+                return null;
+            }
+
+            return beatmaps.OrderBy(b =>
+            {
+                var difference = b.StarDifficulty - recommendedStarDifficulty[currentRuleset];
+                return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
+            }).FirstOrDefault();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d6bc20df39..9897515615 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -36,9 +36,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
-using osu.Game.Online.API;
-using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Screens.Select
 {
@@ -787,65 +784,6 @@ namespace osu.Game.Screens.Select
             return base.OnKeyDown(e);
         }
 
-        public class DifficultyRecommender : Component
-        {
-            [Resolved]
-            private IAPIProvider api { get; set; }
-
-            [Resolved]
-            private RulesetStore rulesets { get; set; }
-
-            private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
-
-            private int pendingAPIRequests;
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                updateRecommended();
-            }
-
-            private void updateRecommended()
-            {
-                if (pendingAPIRequests > 0)
-                    return;
-                if (api.LocalUser.Value is GuestUser)
-                    return;
-
-                rulesets.AvailableRulesets.ForEach(rulesetInfo =>
-                {
-                    var req = new GetUserRequest(api.LocalUser.Value.Id, rulesetInfo);
-
-                    req.Success += result =>
-                    {
-                        // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
-                        recommendedStarDifficulty[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
-                        pendingAPIRequests--;
-                    };
-
-                    req.Failure += _ => pendingAPIRequests--;
-
-                    pendingAPIRequests++;
-                    api.Queue(req);
-                });
-            }
-
-            public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps, RulesetInfo currentRuleset)
-            {
-                if (!recommendedStarDifficulty.ContainsKey(currentRuleset))
-                {
-                    updateRecommended();
-                    return null;
-                }
-
-                return beatmaps.OrderBy(b =>
-                {
-                    var difference = b.StarDifficulty - recommendedStarDifficulty[currentRuleset];
-                    return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
-                }).FirstOrDefault();
-            }
-        }
-
         private class VerticalMaskingContainer : Container
         {
             private const float panel_overflow = 1.2f;

From 7f753f6b4d79a2bbee5c169cdd10e39f4dd158e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 16:43:09 +0900
Subject: [PATCH 02104/10326] Remove current ruleset from function call

---
 osu.Game/Screens/Select/BeatmapCarousel.cs       |  2 +-
 osu.Game/Screens/Select/DifficultyRecommender.cs | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 555c74fb44..7139b804b0 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -588,7 +588,7 @@ namespace osu.Game.Screens.Select
 
             BeatmapInfo recommender(IEnumerable<BeatmapInfo> beatmaps)
             {
-                return DifficultyRecommender?.GetRecommendedBeatmap(beatmaps, decoupledRuleset.Value);
+                return DifficultyRecommender?.GetRecommendedBeatmap(beatmaps);
             }
 
             var set = new CarouselBeatmapSet(beatmapSet, recommender);
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index d89d505f61..fb67d63818 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -5,6 +5,7 @@ using System;
 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.Game.Beatmaps;
@@ -22,6 +23,9 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        [Resolved]
+        private Bindable<RulesetInfo> ruleset { get; set; }
+
         private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
 
         private int pendingAPIRequests;
@@ -57,9 +61,9 @@ namespace osu.Game.Screens.Select
             });
         }
 
-        public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps, RulesetInfo currentRuleset)
+        public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps)
         {
-            if (!recommendedStarDifficulty.ContainsKey(currentRuleset))
+            if (!recommendedStarDifficulty.ContainsKey(ruleset.Value))
             {
                 updateRecommended();
                 return null;
@@ -67,7 +71,7 @@ namespace osu.Game.Screens.Select
 
             return beatmaps.OrderBy(b =>
             {
-                var difference = b.StarDifficulty - recommendedStarDifficulty[currentRuleset];
+                var difference = b.StarDifficulty - recommendedStarDifficulty[ruleset.Value];
                 return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
             }).FirstOrDefault();
         }

From a84fe2525ba17ac331c198e5c1ec80c061f1066f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 11 Apr 2020 16:53:45 +0900
Subject: [PATCH 02105/10326] Fix nested hitobjects potentially indirectly
 masked away

---
 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 0011faefbb..8fa0c041d4 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -375,7 +375,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
         }
 
-        protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => AllJudged && base.ComputeIsMaskedAway(maskingBounds);
+        public override bool UpdateSubTreeMasking(Drawable source, RectangleF maskingBounds) => AllJudged && base.UpdateSubTreeMasking(source, maskingBounds);
 
         protected override void UpdateAfterChildren()
         {

From abea7b5299a5fc38c12742aad9d741dec3be7f3a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 16:58:13 +0900
Subject: [PATCH 02106/10326] Tidy up function passing, naming, ordering etc.

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 15 +++----
 .../Select/Carousel/CarouselBeatmapSet.cs     | 13 +++---
 .../Screens/Select/DifficultyRecommender.cs   | 42 +++++++++++--------
 osu.Game/Screens/Select/SongSelect.cs         |  8 ++--
 4 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 7139b804b0..3e3bb4dbc5 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -49,6 +49,11 @@ namespace osu.Game.Screens.Select
         /// </summary>
         public BeatmapSetInfo SelectedBeatmapSet => selectedBeatmapSet?.BeatmapSet;
 
+        /// <summary>
+        /// A function to optionally decide on a recommended difficulty from a beatmap set.
+        /// </summary>
+        public Func<IEnumerable<BeatmapInfo>, BeatmapInfo> GetRecommendedBeatmap;
+
         private CarouselBeatmapSet selectedBeatmapSet;
 
         /// <summary>
@@ -120,8 +125,6 @@ namespace osu.Game.Screens.Select
 
         private CarouselRoot root;
 
-        public DifficultyRecommender DifficultyRecommender;
-
         public BeatmapCarousel()
         {
             root = new CarouselRoot(this);
@@ -586,12 +589,10 @@ namespace osu.Game.Screens.Select
                     b.Metadata = beatmapSet.Metadata;
             }
 
-            BeatmapInfo recommender(IEnumerable<BeatmapInfo> beatmaps)
+            var set = new CarouselBeatmapSet(beatmapSet)
             {
-                return DifficultyRecommender?.GetRecommendedBeatmap(beatmaps);
-            }
-
-            var set = new CarouselBeatmapSet(beatmapSet, recommender);
+                GetRecommendedBeatmap = beatmaps => GetRecommendedBeatmap?.Invoke(beatmaps)
+            };
 
             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 99ded4c58e..92ccfde14b 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -12,13 +12,13 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselBeatmapSet : CarouselGroupEagerSelect
     {
-        private readonly Func<IEnumerable<BeatmapInfo>, BeatmapInfo> getRecommendedBeatmap;
-
         public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>();
 
         public BeatmapSetInfo BeatmapSet;
 
-        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet, Func<IEnumerable<BeatmapInfo>, BeatmapInfo> getRecommendedBeatmap)
+        public Func<IEnumerable<BeatmapInfo>, BeatmapInfo> GetRecommendedBeatmap;
+
+        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet)
         {
             BeatmapSet = beatmapSet ?? throw new ArgumentNullException(nameof(beatmapSet));
 
@@ -26,8 +26,6 @@ namespace osu.Game.Screens.Select.Carousel
                       .Where(b => !b.Hidden)
                       .Select(b => new CarouselBeatmap(b))
                       .ForEach(AddChild);
-
-            this.getRecommendedBeatmap = getRecommendedBeatmap;
         }
 
         protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this);
@@ -36,9 +34,8 @@ namespace osu.Game.Screens.Select.Carousel
         {
             if (LastSelected == null)
             {
-                var recommendedBeatmapInfo = getRecommendedBeatmap(Children.OfType<CarouselBeatmap>().Where(b => !b.Filtered.Value).Select(b => b.Beatmap));
-                if (recommendedBeatmapInfo != null)
-                    return Children.OfType<CarouselBeatmap>().First(b => b.Beatmap == recommendedBeatmapInfo);
+                if (GetRecommendedBeatmap?.Invoke(Children.OfType<CarouselBeatmap>().Where(b => !b.Filtered.Value).Select(b => b.Beatmap)) is BeatmapInfo recommended)
+                    return Children.OfType<CarouselBeatmap>().First(b => b.Beatmap == recommended);
             }
 
             return base.GetNextToSelect();
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index fb67d63818..47838ebd6d 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -33,10 +33,33 @@ namespace osu.Game.Screens.Select
         [BackgroundDependencyLoader]
         private void load()
         {
-            updateRecommended();
+            calculateRecommendedDifficulties();
         }
 
-        private void updateRecommended()
+        /// <summary>
+        /// Find the recommended difficulty from a selection of available difficulties for the current local user.
+        /// </summary>
+        /// <remarks>
+        /// This requires the user to be online for now.
+        /// </remarks>
+        /// <param name="beatmaps">A collection of beatmaps to select a difficulty from.</param>
+        /// <returns>The recommended difficulty, or null if a recommendation could not be provided.</returns>
+        public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps)
+        {
+            if (!recommendedStarDifficulty.ContainsKey(ruleset.Value))
+            {
+                calculateRecommendedDifficulties();
+                return null;
+            }
+
+            return beatmaps.OrderBy(b =>
+            {
+                var difference = b.StarDifficulty - recommendedStarDifficulty[ruleset.Value];
+                return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
+            }).FirstOrDefault();
+        }
+
+        private void calculateRecommendedDifficulties()
         {
             if (pendingAPIRequests > 0)
                 return;
@@ -60,20 +83,5 @@ namespace osu.Game.Screens.Select
                 api.Queue(req);
             });
         }
-
-        public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps)
-        {
-            if (!recommendedStarDifficulty.ContainsKey(ruleset.Value))
-            {
-                updateRecommended();
-                return null;
-            }
-
-            return beatmaps.OrderBy(b =>
-            {
-                var difference = b.StarDifficulty - recommendedStarDifficulty[ruleset.Value];
-                return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
-            }).FirstOrDefault();
-        }
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 9897515615..f164056ede 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -80,7 +80,8 @@ namespace osu.Game.Screens.Select
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
         protected BeatmapCarousel Carousel { get; private set; }
-        private DifficultyRecommender difficultyRecommender;
+
+        private DifficultyRecommender recommender;
 
         private BeatmapInfoWedge beatmapInfoWedge;
         private DialogOverlay dialogOverlay;
@@ -108,10 +109,9 @@ namespace osu.Game.Screens.Select
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
 
-            AddInternal(difficultyRecommender = new DifficultyRecommender());
-
             AddRangeInternal(new Drawable[]
             {
+                recommender = new DifficultyRecommender(),
                 new ResetScrollContainer(() => Carousel.ScrollToSelected())
                 {
                     RelativeSizeAxes = Axes.Y,
@@ -159,7 +159,7 @@ namespace osu.Game.Screens.Select
                                             RelativeSizeAxes = Axes.Both,
                                             SelectionChanged = updateSelectedBeatmap,
                                             BeatmapSetsChanged = carouselBeatmapsLoaded,
-                                            DifficultyRecommender = difficultyRecommender,
+                                            GetRecommendedBeatmap = recommender.GetRecommendedBeatmap,
                                         },
                                     }
                                 },

From 310cf830d47a4618f33b2bc1fe646aa516823ea8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 17:07:08 +0900
Subject: [PATCH 02107/10326] Simplify api request logic

---
 .../Screens/Select/DifficultyRecommender.cs   | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 47838ebd6d..595bfd6122 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -15,7 +15,7 @@ using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.Select
 {
-    public class DifficultyRecommender : Component
+    public class DifficultyRecommender : Component, IOnlineComponent
     {
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -28,12 +28,10 @@ namespace osu.Game.Screens.Select
 
         private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
 
-        private int pendingAPIRequests;
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            calculateRecommendedDifficulties();
+            api.Register(this);
         }
 
         /// <summary>
@@ -48,7 +46,6 @@ namespace osu.Game.Screens.Select
         {
             if (!recommendedStarDifficulty.ContainsKey(ruleset.Value))
             {
-                calculateRecommendedDifficulties();
                 return null;
             }
 
@@ -61,11 +58,6 @@ namespace osu.Game.Screens.Select
 
         private void calculateRecommendedDifficulties()
         {
-            if (pendingAPIRequests > 0)
-                return;
-            if (api.LocalUser.Value is GuestUser)
-                return;
-
             rulesets.AvailableRulesets.ForEach(rulesetInfo =>
             {
                 var req = new GetUserRequest(api.LocalUser.Value.Id, rulesetInfo);
@@ -74,14 +66,27 @@ namespace osu.Game.Screens.Select
                 {
                     // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
                     recommendedStarDifficulty[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
-                    pendingAPIRequests--;
                 };
 
-                req.Failure += _ => pendingAPIRequests--;
-
-                pendingAPIRequests++;
                 api.Queue(req);
             });
         }
+
+        public void APIStateChanged(IAPIProvider api, APIState state)
+        {
+            switch (state)
+            {
+                case APIState.Online:
+                    calculateRecommendedDifficulties();
+                    break;
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            api.Unregister(this);
+        }
     }
 }

From 7aac0e59a8c02ab765b53b196177a79f43bb294e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 17:08:07 +0900
Subject: [PATCH 02108/10326] Reduce dictionary lookups

---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 595bfd6122..20cdca858a 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -44,16 +44,16 @@ namespace osu.Game.Screens.Select
         /// <returns>The recommended difficulty, or null if a recommendation could not be provided.</returns>
         public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps)
         {
-            if (!recommendedStarDifficulty.ContainsKey(ruleset.Value))
+            if (recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars))
             {
-                return null;
+                return beatmaps.OrderBy(b =>
+                {
+                    var difference = b.StarDifficulty - stars;
+                    return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
+                }).FirstOrDefault();
             }
 
-            return beatmaps.OrderBy(b =>
-            {
-                var difference = b.StarDifficulty - recommendedStarDifficulty[ruleset.Value];
-                return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
-            }).FirstOrDefault();
+            return null;
         }
 
         private void calculateRecommendedDifficulties()

From c0c1f2c0235c9e49c8c44541ad1d266a182bb017 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 17:17:18 +0900
Subject: [PATCH 02109/10326] Add test coverage

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 76a8ee9914..f68ed4154b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -54,6 +54,35 @@ namespace osu.Game.Tests.Visual.SongSelect
             this.rulesets = rulesets;
         }
 
+        [Test]
+        public void TestRecommendedSelection()
+        {
+            loadBeatmaps();
+
+            AddStep("set recommendation function", () => carousel.GetRecommendedBeatmap = beatmaps => beatmaps.LastOrDefault());
+
+            // check recommended was selected
+            advanceSelection(direction: 1, diff: false);
+            waitForSelection(1, 3);
+
+            // change away from recommended
+            advanceSelection(direction: -1, diff: true);
+            waitForSelection(1, 2);
+
+            // next set, check recommended
+            advanceSelection(direction: 1, diff: false);
+            waitForSelection(2, 3);
+
+            // next set, check recommended
+            advanceSelection(direction: 1, diff: false);
+            waitForSelection(3, 3);
+
+            // go back to first set and ensure user selection was retained
+            advanceSelection(direction: -1, diff: false);
+            advanceSelection(direction: -1, diff: false);
+            waitForSelection(1, 2);
+        }
+
         /// <summary>
         /// Test keyboard traversal
         /// </summary>

From 73a3f1fe65d6eb17ca9eef1a5b3cd8a843f0e3eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 17:30:34 +0900
Subject: [PATCH 02110/10326] Remove unnecessary DI

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 3e3bb4dbc5..a8225ba1ec 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -23,7 +23,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
 using osu.Game.Screens.Select.Carousel;
-using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.Select
 {
@@ -146,9 +145,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        [Resolved]
-        private Bindable<RulesetInfo> decoupledRuleset { get; set; }
-
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(OsuConfigManager config)
         {

From 832822858ca2c17eac82ab669f4c10634978c58c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 17:47:51 +0900
Subject: [PATCH 02111/10326] Add basic request / response support

---
 .../Online/TestDummyAPIRequestHandling.cs     | 39 +++++++++++++++++++
 osu.Game/Online/API/APIRequest.cs             |  2 +
 osu.Game/Online/API/DummyAPIAccess.cs         |  7 ++++
 3 files changed, 48 insertions(+)
 create mode 100644 osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs

diff --git a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
new file mode 100644
index 0000000000..bf3e1204d7
--- /dev/null
+++ b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.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.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Online
+{
+    public class TestDummyAPIRequestHandling : OsuTestScene
+    {
+        public TestDummyAPIRequestHandling()
+        {
+            AddStep("register request handling", () => ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case CommentVoteRequest cRequest:
+                        cRequest.TriggerSuccess(new CommentBundle());
+                        break;
+                }
+            });
+
+            CommentVoteRequest request = null;
+            CommentBundle response = null;
+
+            AddStep("fire request", () =>
+            {
+                response = null;
+                request = new CommentVoteRequest(1, CommentVoteAction.Vote);
+                request.Success += res => response = res;
+                API.Queue(request);
+            });
+
+            AddAssert("got response", () => response != null);
+        }
+    }
+}
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 6a6c7b72a8..1f0eae4965 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Online.API
         /// This will be scheduled to the API's internal scheduler (run on update thread automatically).
         /// </summary>
         public new event APISuccessHandler<T> Success;
+
+        internal void TriggerSuccess(T result) => Success?.Invoke(result);
     }
 
     /// <summary>
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index a1c3475fd9..fa5ad115d2 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.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.Threading;
 using System.Threading.Tasks;
@@ -30,6 +31,11 @@ namespace osu.Game.Online.API
 
         private readonly List<IOnlineComponent> components = new List<IOnlineComponent>();
 
+        /// <summary>
+        /// Provide handling logic for an arbitrary API request.
+        /// </summary>
+        public Action<APIRequest> HandleRequest;
+
         public APIState State
         {
             get => state;
@@ -55,6 +61,7 @@ namespace osu.Game.Online.API
 
         public virtual void Queue(APIRequest request)
         {
+            HandleRequest?.Invoke(request);
         }
 
         public void Perform(APIRequest request) { }

From 415adecdf68c07d8882ca7ecdb2c099d6749243a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 18:02:43 +0900
Subject: [PATCH 02112/10326] Add support for Result fetching

---
 osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs | 8 ++++++--
 osu.Game/Online/API/APIRequest.cs                    | 8 +++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
index bf3e1204d7..5b169cccdf 100644
--- a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
+++ b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
@@ -10,7 +10,8 @@ namespace osu.Game.Tests.Online
 {
     public class TestDummyAPIRequestHandling : OsuTestScene
     {
-        public TestDummyAPIRequestHandling()
+        [Test]
+        public void TestGenericRequestHandling()
         {
             AddStep("register request handling", () => ((DummyAPIAccess)API).HandleRequest = req =>
             {
@@ -33,7 +34,10 @@ namespace osu.Game.Tests.Online
                 API.Queue(request);
             });
 
-            AddAssert("got response", () => response != null);
+            AddAssert("response event fired", () => response != null);
+
+            AddAssert("request has response", () => request.Result == response);
+        }
         }
     }
 }
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 1f0eae4965..34b69b3c09 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using osu.Framework.Logging;
@@ -98,10 +99,15 @@ namespace osu.Game.Online.API
             {
                 if (cancelled) return;
 
-                Success?.Invoke();
+                TriggerSuccess();
             });
         }
 
+        internal void TriggerSuccess()
+        {
+            Success?.Invoke();
+        }
+
         public void Cancel() => Fail(new OperationCanceledException(@"Request cancelled"));
 
         public void Fail(Exception e)

From c96df9758674b58df599ca8f9153f9f5c1d3e206 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 18:02:49 +0900
Subject: [PATCH 02113/10326] Add support for non-generic requests

---
 .../Online/TestDummyAPIRequestHandling.cs     | 29 +++++++++++++++++++
 osu.Game/Online/API/APIRequest.cs             | 15 ++++++----
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
index 5b169cccdf..b00b63f6d5 100644
--- a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
+++ b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
@@ -1,10 +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 NUnit.Framework;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Chat;
 using osu.Game.Tests.Visual;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Online
 {
@@ -38,6 +41,32 @@ namespace osu.Game.Tests.Online
 
             AddAssert("request has response", () => request.Result == response);
         }
+
+        [Test]
+        public void TestRequestHandling()
+        {
+            AddStep("register request handling", () => ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case LeaveChannelRequest cRequest:
+                        cRequest.TriggerSuccess();
+                        break;
+                }
+            });
+
+            LeaveChannelRequest request;
+            bool gotResponse = false;
+
+            AddStep("fire request", () =>
+            {
+                gotResponse = false;
+                request = new LeaveChannelRequest(new Channel(), new User());
+                request.Success += () => gotResponse = true;
+                API.Queue(request);
+            });
+
+            AddAssert("response event fired", () => gotResponse);
         }
     }
 }
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 34b69b3c09..6abb388c01 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -17,22 +17,27 @@ namespace osu.Game.Online.API
     {
         protected override WebRequest CreateWebRequest() => new OsuJsonWebRequest<T>(Uri);
 
-        public T Result => ((OsuJsonWebRequest<T>)WebRequest)?.ResponseObject;
+        public T Result { get; private set; }
 
         protected APIRequest()
         {
-            base.Success += onSuccess;
+            base.Success += () => TriggerSuccess(((OsuJsonWebRequest<T>)WebRequest)?.ResponseObject);
         }
 
-        private void onSuccess() => Success?.Invoke(Result);
-
         /// <summary>
         /// Invoked on successful completion of an API request.
         /// This will be scheduled to the API's internal scheduler (run on update thread automatically).
         /// </summary>
         public new event APISuccessHandler<T> Success;
 
-        internal void TriggerSuccess(T result) => Success?.Invoke(result);
+        internal void TriggerSuccess(T result)
+        {
+            // disallow calling twice
+            Debug.Assert(Result == null);
+
+            Result = result;
+            Success?.Invoke(result);
+        }
     }
 
     /// <summary>

From 1c0ad13d82bec928abb9f0cdb9e826f0cf23c7f8 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Sat, 11 Apr 2020 17:20:37 +0800
Subject: [PATCH 02114/10326] Added ignore hit object

---
 osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs

diff --git a/osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs b/osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs
new file mode 100644
index 0000000000..302f940ef4
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Objects/IgnoreHit.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.Rulesets.Judgements;
+
+namespace osu.Game.Rulesets.Taiko.Objects
+{
+    public class IgnoreHit : Hit
+    {
+        public override Judgement CreateJudgement() => new IgnoreJudgement();
+    }
+}

From 3ad36c7b84e920a13e48b160888cab9874bac20d Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Sat, 11 Apr 2020 17:20:52 +0800
Subject: [PATCH 02115/10326] Moved flying objects to use ignore hit judgements

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs | 3 ++-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 86e885239f..4468c1e3fb 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
@@ -35,7 +36,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         }
 
         public DrawableFlyingCentreHit(double time, bool isStrong = false)
-            : base(new Hit { StartTime = time, IsStrong = isStrong })
+            : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
         {
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index ad9872b21f..e5cfc0562b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         }
 
         public DrawableFlyingRimHit(double time, bool isStrong = false)
-            : base(new Hit { StartTime = time, IsStrong = isStrong })
+            : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
         {
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }

From df76636ffc5be7d5d817a7a943ec56a505339855 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 11 Apr 2020 14:08:16 +0300
Subject: [PATCH 02116/10326] Implement "prefer no video" option

---
 osu.Game/Configuration/OsuConfigManager.cs             |  2 ++
 osu.Game/Overlays/Direct/PanelDownloadButton.cs        | 10 ++++++----
 .../Overlays/Settings/Sections/Online/WebSettings.cs   |  5 +++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 41f6747b74..89eb084262 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -49,6 +49,7 @@ namespace osu.Game.Configuration
             };
 
             Set(OsuSetting.ExternalLinkWarning, true);
+            Set(OsuSetting.PreferNoVideo, false);
 
             // Audio
             Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
@@ -212,6 +213,7 @@ namespace osu.Game.Configuration
         IncreaseFirstObjectVisibility,
         ScoreDisplayMode,
         ExternalLinkWarning,
+        PreferNoVideo,
         Scaling,
         ScalingPositionX,
         ScalingPositionY,
diff --git a/osu.Game/Overlays/Direct/PanelDownloadButton.cs b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
index 1b3657f010..f09586c571 100644
--- a/osu.Game/Overlays/Direct/PanelDownloadButton.cs
+++ b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
@@ -14,12 +15,12 @@ namespace osu.Game.Overlays.Direct
     {
         protected bool DownloadEnabled => button.Enabled.Value;
 
-        private readonly bool noVideo;
+        private readonly bool? noVideo;
 
         private readonly ShakeContainer shakeContainer;
         private readonly DownloadButton button;
 
-        public PanelDownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
+        public PanelDownloadButton(BeatmapSetInfo beatmapSet, bool? noVideo = null)
             : base(beatmapSet)
         {
             this.noVideo = noVideo;
@@ -43,7 +44,7 @@ namespace osu.Game.Overlays.Direct
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuGame game, BeatmapManager beatmaps)
+        private void load(OsuGame game, BeatmapManager beatmaps, OsuConfigManager osuConfig)
         {
             if (BeatmapSet.Value?.OnlineInfo?.Availability?.DownloadDisabled ?? false)
             {
@@ -66,7 +67,8 @@ namespace osu.Game.Overlays.Direct
                         break;
 
                     default:
-                        beatmaps.Download(BeatmapSet.Value, noVideo);
+                        var minimiseDownloadSize = noVideo ?? osuConfig.GetBindable<bool>(OsuSetting.PreferNoVideo).Value;
+                        beatmaps.Download(BeatmapSet.Value, minimiseDownloadSize);
                         break;
                 }
             };
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index a8b3e45a83..da3176aca8 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -21,6 +21,11 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                     LabelText = "Warn about opening external links",
                     Bindable = config.GetBindable<bool>(OsuSetting.ExternalLinkWarning)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Prefer no-video downloads",
+                    Bindable = config.GetBindable<bool>(OsuSetting.PreferNoVideo)
+                },
             };
         }
     }

From fc1d497a864c48adf3d702beb1c0b7c93d23ddcd Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 11 Apr 2020 14:21:28 +0300
Subject: [PATCH 02117/10326] Change PlaylistDownloadButton default

---
 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 ed3f9af8e2..d58218b6b5 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -212,7 +212,7 @@ namespace osu.Game.Screens.Multi
 
         private class PlaylistDownloadButton : PanelDownloadButton
         {
-            public PlaylistDownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
+            public PlaylistDownloadButton(BeatmapSetInfo beatmapSet, bool? noVideo = null)
                 : base(beatmapSet, noVideo)
             {
                 Alpha = 0;

From 97340da2f296eb1d88ac70c7addfb5cf2dd76a23 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 12 Apr 2020 02:24:36 +0300
Subject: [PATCH 02118/10326] Add null-conditional to acesses in dispose
 methods

Such a terrible mistake, the finalizer may be called while the dependencies have an instance but the local itself doesn't have a value yet.
---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 265c6a7319..06f8715929 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -343,7 +343,7 @@ namespace osu.Game.Rulesets.UI
             }
 
             // Dispose the components created by this dependency container.
-            dependencies.Dispose();
+            dependencies?.Dispose();
         }
     }
 

From f274ec297ce23e79eff1d2a64f745e1396b0c280 Mon Sep 17 00:00:00 2001
From: Fire937 <atoli.huppe@gmail.com>
Date: Sun, 12 Apr 2020 01:33:25 +0200
Subject: [PATCH 02119/10326] Add positional sound support for all rulesets

The SamplePlaybackBalance is calculated in a way that the balance
remains between -0.4 and 0.4.
Positional sound is not supported in osu!taiko.
---
 .../Drawables/DrawableCatchHitObject.cs       |  2 ++
 .../Drawables/DrawableManiaHitObject.cs       | 16 ++++++++++++
 .../Objects/Drawables/DrawableOsuHitObject.cs |  2 ++
 .../Objects/Drawables/DrawableHitObject.cs    | 26 ++++++-------------
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 6844be5941..e726d6eff5 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -70,6 +70,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         public float DisplayRadius => DrawSize.X / 2 * Scale.X * HitObject.Scale;
 
+        protected override float SamplePlaybackBalance => 0.8f * HitObject.X - 0.4f;
+
         protected DrawableCatchHitObject(CatchHitObject hitObject)
             : base(hitObject)
         {
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 5bfa07bd14..76e9695855 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -5,8 +5,10 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Rulesets.Mania.UI;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -24,6 +26,20 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
 
+        protected override float SamplePlaybackBalance
+        {
+            get
+            {
+                CompositeDrawable stage = this;
+                while (!(stage is Stage))
+                    stage = stage.Parent;
+
+                var columnCount = ((Stage)stage).Columns.Count;
+                var columnIndex = HitObject.Column;
+                return 0.8f * columnIndex / (columnCount - 1) - 0.4f;
+            }
+        }
+
         protected DrawableManiaHitObject(ManiaHitObject hitObject)
             : base(hitObject)
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index a677cb6a72..c5a4491b2d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         // Must be set to update IsHovered as it's used in relax mdo to detect osu hit objects.
         public override bool HandlePositionalInput => true;
 
+        protected override float SamplePlaybackBalance => (HitObject.X / 512f - 0.5f) * 0.8f;
+
         protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
         {
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 30a9106ddc..ef32dc1560 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -33,11 +33,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public readonly Bindable<Color4> AccentColour = new Bindable<Color4>(Color4.Gray);
 
-        /// <summary>
-        /// The stereo balance of the samples if the <i>Positional hitsounds</i> setting is set.
-        /// </summary>
-        private readonly BindableDouble positionalSoundAdjustment = new BindableDouble();
-
         protected SkinnableSound Samples { get; private set; }
 
         protected virtual IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples;
@@ -94,7 +89,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The stereo balance of the samples played if <i>Positional hitsounds</i> is set.
         /// </summary>
-        protected virtual float PositionalSound => (Position.X / 512f - 0.5f) * 0.8f;
+        protected virtual float SamplePlaybackBalance => 0;
+
+        private readonly BindableDouble samplePlaybackBalanceAdjustment = new BindableDouble();
 
         private BindableList<HitSampleInfo> samplesBindable;
         private Bindable<double> startTimeBindable;
@@ -119,6 +116,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
+            userPositionalHitSounds = config.GetBindable<bool>(OsuSetting.PositionalHitSounds);
             var judgement = HitObject.CreateJudgement();
 
             Result = CreateResult(judgement);
@@ -126,16 +124,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
             loadSamples();
-
-            userPositionalHitSounds = config.GetBindable<bool>(OsuSetting.PositionalHitSounds);
-            userPositionalHitSounds.BindValueChanged(positional =>
-            {
-                if (positional.NewValue)
-                    Samples?.AddAdjustment(AdjustableProperty.Balance, positionalSoundAdjustment);
-                else
-                    Samples?.RemoveAdjustment(AdjustableProperty.Balance, positionalSoundAdjustment);
-            });
-            userPositionalHitSounds.TriggerChange();
         }
 
         protected override void LoadComplete()
@@ -179,7 +167,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
                                                     + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
             }
 
-            AddInternal(Samples = new SkinnableSound(samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s))));
+            Samples = new SkinnableSound(samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)));
+            Samples.AddAdjustment(AdjustableProperty.Balance, samplePlaybackBalanceAdjustment);
+            AddInternal(Samples);
         }
 
         private void onDefaultsApplied() => apply(HitObject);
@@ -378,7 +368,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public virtual void PlaySamples()
         {
-            positionalSoundAdjustment.Value = PositionalSound;
+            samplePlaybackBalanceAdjustment.Value = userPositionalHitSounds.Value ? SamplePlaybackBalance : 0;
             Samples?.Play();
         }
 

From 162a85042a6e15be69f57388e50669e174f81792 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Sun, 12 Apr 2020 10:38:22 +0800
Subject: [PATCH 02120/10326] Removed un-needed using

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 4468c1e3fb..b6f6f04821 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 

From 7a9ee907bf4d862c1e49188a8c835a2412977fb9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 12 Apr 2020 07:34:58 +0300
Subject: [PATCH 02121/10326] Fix incorrect button state in some cases

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

diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index a6c687f28f..a8f2a0ce6c 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays
                 return;
 
             currentTarget = Target;
-            Button.State = Current > button_scroll_position ? Visibility.Visible : Visibility.Hidden;
+            Button.State = Target > button_scroll_position ? Visibility.Visible : Visibility.Hidden;
         }
 
         public class ScrollToTopButton : OsuHoverContainer

From f8b728f9e86e7bb0c8e2a6686859201dc7b26f49 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:39:41 +0800
Subject: [PATCH 02122/10326] =?UTF-8?q?Added=20=E2=80=9Cinstant=20fly?=
 =?UTF-8?q?=E2=80=9D=20variant=20of=20hit=20notes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Objects/Drawables/DrawableCentreHit.cs      | 17 +++++++++++++++++
 .../Objects/Drawables/DrawableRimHit.cs         | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 4979135f50..08df05e719 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -2,7 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -23,4 +26,18 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             MainPiece.AccentColour = colours.PinkDarker;
         }
     }
+
+    public class DrawableFlyingCentreHit : DrawableCentreHit
+    {
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            ApplyResult(r => r.Type = HitResult.Good);
+        }
+
+        public DrawableFlyingCentreHit(double time)
+            : base(new Hit { StartTime = time })
+        {
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+        }
+    }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index 5a12d71cea..0c2c9fbdef 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -2,7 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -23,4 +26,18 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             MainPiece.AccentColour = colours.BlueDarker;
         }
     }
+
+    public class DrawableFlyingRimHit : DrawableRimHit
+    {
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            ApplyResult(r => r.Type = HitResult.Good);
+        }
+
+        public DrawableFlyingRimHit(double time)
+            : base(new Hit { StartTime = time })
+        {
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+        }
+    }
 }

From a52130857bdefc35656ff4357ff8ee3ee1783174 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:40:01 +0800
Subject: [PATCH 02123/10326] Added arbitrary hit handler to drum roll object

---
 .../Objects/Drawables/DrawableDrumRoll.cs     | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 5806c90115..3e7b6dfd31 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -34,6 +34,14 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private Color4 colourIdle;
         private Color4 colourEngaged;
 
+        private bool judgingStarted;
+
+        /// <summary>
+        /// A handler action for when the drumroll has been hit,
+        /// regardless of any judgement.
+        /// </summary>
+        public Action<TaikoAction> OnHit;
+
         public DrawableDrumRoll(DrumRoll drumRoll)
             : base(drumRoll)
         {
@@ -86,15 +94,27 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece();
 
-        public override bool OnPressed(TaikoAction action) => false;
+        public override bool OnPressed(TaikoAction action)
+        {
+            if (judgingStarted)
+                OnHit.Invoke(action);
+
+            return false;
+        }
 
         private void onNewResult(DrawableHitObject obj, JudgementResult result)
         {
             if (!(obj is DrawableDrumRollTick))
                 return;
 
+            DrawableDrumRollTick drumRollTick = (DrawableDrumRollTick)obj;
+
             if (result.Type > HitResult.Miss)
+            {
+                OnHit.Invoke(drumRollTick.JudgedAction);
+                judgingStarted = true;
                 rollingHits++;
+            }
             else
                 rollingHits--;
 
@@ -113,8 +133,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 return;
 
             int countHit = NestedHitObjects.Count(o => o.IsHit);
+
             if (countHit >= HitObject.RequiredGoodHits)
+            {
                 ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Good);
+            }
             else
                 ApplyResult(r => r.Type = HitResult.Miss);
         }

From 81a514ee6a38b37cb1b9a64e947f2087eba287cd Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:40:18 +0800
Subject: [PATCH 02124/10326] Added judgement forwarder to drumroll tick object

---
 .../Objects/Drawables/DrawableDrumRollTick.cs        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index 25b6141a0e..9961cb6ea2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -11,6 +11,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     public class DrawableDrumRollTick : DrawableTaikoHitObject<DrumRollTick>
     {
+        /// <summary>
+        /// The action type that the user took which caused this tick to
+        /// have been judged as "hit"
+        /// </summary>
+        public TaikoAction JudgedAction;
+
         public DrawableDrumRollTick(DrumRollTick tick)
             : base(tick)
         {
@@ -49,7 +55,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        public override bool OnPressed(TaikoAction action) => UpdateResult(true);
+        public override bool OnPressed(TaikoAction action)
+        {
+            JudgedAction = action;
+            return UpdateResult(true);
+        }
 
         protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
 

From fbcfc7d278a7ed779839c7ade8a395db9b4bc53a Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:40:32 +0800
Subject: [PATCH 02125/10326] Added separate scrolling track to display drum
 roll notes

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index bde9085c23..b32e7b53da 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private readonly Container<HitExplosion> hitExplosionContainer;
         private readonly Container<KiaiHitExplosion> kiaiExplosionContainer;
         private readonly JudgementContainer<DrawableTaikoJudgement> judgementContainer;
+        private readonly ScrollingHitObjectContainer drumRollHitContainer;
         internal readonly HitTarget HitTarget;
 
         private readonly ProxyContainer topLevelHitContainer;
@@ -135,6 +136,14 @@ namespace osu.Game.Rulesets.Taiko.UI
                             Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
                             Blending = BlendingParameters.Additive
                         },
+                        drumRollHitContainer = new ScrollingHitObjectContainer
+                        {
+                            Name = "Drumroll hit",
+                            RelativeSizeAxes = Axes.Both,
+                            FillMode = FillMode.Stretch,
+                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                            Width = 1.0f
+                        }
                     }
                 },
                 overlayBackgroundContainer = new Container
@@ -212,12 +221,28 @@ namespace osu.Game.Rulesets.Taiko.UI
                     barlineContainer.Add(barline.CreateProxy());
                     break;
 
+                case DrawableDrumRoll drumRoll:
+                    drumRoll.OnHit += onDrumrollArbitraryHit;
+                    break;
+
                 case DrawableTaikoHitObject taikoObject:
                     topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
                     break;
             }
         }
 
+        private void onDrumrollArbitraryHit(TaikoAction action)
+        {
+            DrawableHit drawableHit;
+
+            if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
+                drawableHit = new DrawableFlyingRimHit(Time.Current);
+            else
+                drawableHit = new DrawableFlyingCentreHit(Time.Current);
+
+            drumRollHitContainer.Add(drawableHit);
+        }
+
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             if (!DisplayJudgements.Value)

From c6d996030a83763d4b03ff1e5a819e6958d9f973 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 17:25:47 +0800
Subject: [PATCH 02126/10326] Added logic to allow strong notes

---
 .../Objects/Drawables/DrawableCentreHit.cs                  | 4 ++--
 .../Objects/Drawables/DrawableDrumRoll.cs                   | 6 +++---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs | 4 ++--
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs                | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 08df05e719..86e885239f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ApplyResult(r => r.Type = HitResult.Good);
         }
 
-        public DrawableFlyingCentreHit(double time)
-            : base(new Hit { StartTime = time })
+        public DrawableFlyingCentreHit(double time, bool isStrong = false)
+            : base(new Hit { StartTime = time, IsStrong = isStrong })
         {
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 3e7b6dfd31..64be870262 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// A handler action for when the drumroll has been hit,
         /// regardless of any judgement.
         /// </summary>
-        public Action<TaikoAction> OnHit;
+        public Action<TaikoAction, bool> OnHit;
 
         public DrawableDrumRoll(DrumRoll drumRoll)
             : base(drumRoll)
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         public override bool OnPressed(TaikoAction action)
         {
             if (judgingStarted)
-                OnHit.Invoke(action);
+                OnHit.Invoke(action, HitObject.IsStrong);
 
             return false;
         }
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             if (result.Type > HitResult.Miss)
             {
-                OnHit.Invoke(drumRollTick.JudgedAction);
+                OnHit.Invoke(drumRollTick.JudgedAction, HitObject.IsStrong);
                 judgingStarted = true;
                 rollingHits++;
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index 0c2c9fbdef..ad9872b21f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ApplyResult(r => r.Type = HitResult.Good);
         }
 
-        public DrawableFlyingRimHit(double time)
-            : base(new Hit { StartTime = time })
+        public DrawableFlyingRimHit(double time, bool isStrong = false)
+            : base(new Hit { StartTime = time, IsStrong = isStrong })
         {
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index b32e7b53da..59cf9193b5 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -231,14 +231,14 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
-        private void onDrumrollArbitraryHit(TaikoAction action)
+        private void onDrumrollArbitraryHit(TaikoAction action, bool isStrong)
         {
             DrawableHit drawableHit;
 
             if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
-                drawableHit = new DrawableFlyingRimHit(Time.Current);
+                drawableHit = new DrawableFlyingRimHit(Time.Current, isStrong);
             else
-                drawableHit = new DrawableFlyingCentreHit(Time.Current);
+                drawableHit = new DrawableFlyingCentreHit(Time.Current, isStrong);
 
             drumRollHitContainer.Add(drawableHit);
         }

From 9d0d2ef68aaff860b62c2c3de247f2a34ecb2961 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Wed, 8 Apr 2020 12:12:59 +0800
Subject: [PATCH 02127/10326] Added content proxying to drull roll elements

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 59cf9193b5..e947795fe5 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -241,6 +241,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                 drawableHit = new DrawableFlyingCentreHit(Time.Current, isStrong);
 
             drumRollHitContainer.Add(drawableHit);
+            topLevelHitContainer.Add(drawableHit.CreateProxiedContent());
         }
 
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)

From 78492dbba8a23fba4e07606afce6b3f1ae336227 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Sat, 11 Apr 2020 17:20:37 +0800
Subject: [PATCH 02128/10326] Added ignore hit object

---
 osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs

diff --git a/osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs b/osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs
new file mode 100644
index 0000000000..302f940ef4
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Objects/IgnoreHit.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.Rulesets.Judgements;
+
+namespace osu.Game.Rulesets.Taiko.Objects
+{
+    public class IgnoreHit : Hit
+    {
+        public override Judgement CreateJudgement() => new IgnoreJudgement();
+    }
+}

From 940d85cfa6f22df86ce1a55a752959579998028b Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Sat, 11 Apr 2020 17:20:52 +0800
Subject: [PATCH 02129/10326] Moved flying objects to use ignore hit judgements

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs | 3 ++-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 86e885239f..4468c1e3fb 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
@@ -35,7 +36,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         }
 
         public DrawableFlyingCentreHit(double time, bool isStrong = false)
-            : base(new Hit { StartTime = time, IsStrong = isStrong })
+            : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
         {
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index ad9872b21f..e5cfc0562b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         }
 
         public DrawableFlyingRimHit(double time, bool isStrong = false)
-            : base(new Hit { StartTime = time, IsStrong = isStrong })
+            : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
         {
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }

From 442992dc5bd9bb1e4fcdbeee0ab39a170af263f5 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Sun, 12 Apr 2020 10:38:22 +0800
Subject: [PATCH 02130/10326] Removed un-needed using

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 4468c1e3fb..b6f6f04821 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 

From c3f0475748f910172c5161db4dbd62afc3eb0c28 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Apr 2020 17:40:22 +0900
Subject: [PATCH 02131/10326] Make CirclePiece abstract

---
 .../Objects/Drawables/Pieces/CirclePiece.cs                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
index 70fe4b7bb2..6ca77e666d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
     /// for a usage example.
     /// </para>
     /// </summary>
-    public class CirclePiece : BeatSyncedContainer
+    public abstract class CirclePiece : BeatSyncedContainer
     {
         public const float SYMBOL_SIZE = 0.45f;
         public const float SYMBOL_BORDER = 8;
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
 
         public Box FlashBox;
 
-        public CirclePiece()
+        protected CirclePiece()
         {
             RelativeSizeAxes = Axes.Both;
 

From c5d6c7728a512ab6a85857e391f7841afedb255f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Apr 2020 18:29:25 +0900
Subject: [PATCH 02132/10326] 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 5b200ee104..723844155f 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.403.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.412.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.411.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 7cf1272611..0732e6090d 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.Framework" Version="2020.411.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.412.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index c58a431e80..d7006761be 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.411.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.403.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.412.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 63a1686dfbe8e984cc8e3e5ad32ce1bfa8931e41 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 12 Apr 2020 12:42:52 +0300
Subject: [PATCH 02133/10326] Scroll to screen middle

---
 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 59dddc2baa..a5379e9649 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -632,7 +632,7 @@ namespace osu.Game.Screens.Select
                         case DrawableCarouselBeatmap beatmap:
                         {
                             if (beatmap.Item.State.Value == CarouselItemState.Selected)
-                                scrollTarget = currentY + beatmap.DrawHeight / 2 - DrawHeight / 2;
+                                scrollTarget = currentY + beatmap.DrawHeight / 2 - (Parent.DrawHeight / 2 - Parent.Padding.Top);
 
                             void performMove(float y, float? startY = null)
                             {

From 07dc2773218e4e65e6c388e7210a49a8a6a8f8ac Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 12 Apr 2020 14:55:42 +0200
Subject: [PATCH 02134/10326] Remove unused changelog comments class

---
 .../Online/TestSceneChangelogOverlay.cs       |  1 -
 osu.Game/Overlays/Changelog/Comments.cs       | 79 -------------------
 2 files changed, 80 deletions(-)
 delete mode 100644 osu.Game/Overlays/Changelog/Comments.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 864fd31a0f..22d20f7098 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -24,7 +24,6 @@ namespace osu.Game.Tests.Visual.Online
             typeof(ChangelogListing),
             typeof(ChangelogSingleBuild),
             typeof(ChangelogBuild),
-            typeof(Comments),
         };
 
         protected override bool UseOnlineAPI => true;
diff --git a/osu.Game/Overlays/Changelog/Comments.cs b/osu.Game/Overlays/Changelog/Comments.cs
deleted file mode 100644
index 4cf39e7b44..0000000000
--- a/osu.Game/Overlays/Changelog/Comments.cs
+++ /dev/null
@@ -1,79 +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.Containers;
-using osu.Game.Online.API.Requests.Responses;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.Changelog
-{
-    public class Comments : CompositeDrawable
-    {
-        private readonly APIChangelogBuild build;
-
-        public Comments(APIChangelogBuild build)
-        {
-            this.build = build;
-
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            Padding = new MarginPadding
-            {
-                Horizontal = 50,
-                Vertical = 20,
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            LinkFlowContainer text;
-
-            InternalChildren = new Drawable[]
-            {
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    CornerRadius = 10,
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colours.GreyVioletDarker
-                    },
-                },
-                text = new LinkFlowContainer(t =>
-                {
-                    t.Colour = colours.PinkLighter;
-                    t.Font = OsuFont.Default.With(size: 14);
-                })
-                {
-                    Padding = new MarginPadding(20),
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                }
-            };
-
-            text.AddParagraph("Got feedback?", t =>
-            {
-                t.Colour = Color4.White;
-                t.Font = OsuFont.Default.With(italics: true, size: 20);
-                t.Padding = new MarginPadding { Bottom = 20 };
-            });
-
-            text.AddParagraph("We would love to hear what you think of this update! ");
-            text.AddIcon(FontAwesome.Regular.GrinHearts);
-
-            text.AddParagraph("Please visit the ");
-            text.AddLink("web version", $"{build.Url}#comments");
-            text.AddText(" of this changelog to leave any comments.");
-        }
-    }
-}

From ecd25e567d8803c548e273b11aac15f333e55da6 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 12 Apr 2020 16:00:05 +0300
Subject: [PATCH 02135/10326] Present selected difficulty

---
 osu.Game/OsuGame.cs                             | 12 ++++++++----
 osu.Game/Overlays/BeatmapSet/Header.cs          |  3 ++-
 osu.Game/Overlays/Direct/PanelDownloadButton.cs | 10 +++++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1b2fd658f4..113e9bbe24 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -315,8 +315,12 @@ namespace osu.Game
         /// The user should have already requested this interactively.
         /// </summary>
         /// <param name="beatmap">The beatmap to select.</param>
-        public void PresentBeatmap(BeatmapSetInfo beatmap)
+        /// <param name="findPredicate">Predicate used to find a difficulty to select</param>
+        public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> findPredicate = null)
         {
+            // Use this predicate if non was provided. This will try to find some difficulty from current ruleset so we wouldn't have to change rulesets
+            findPredicate ??= b => b.Ruleset.Equals(Ruleset.Value);
+
             var databasedSet = beatmap.OnlineBeatmapSetID != null
                 ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID)
                 : BeatmapManager.QueryBeatmapSet(s => s.Hash == beatmap.Hash);
@@ -334,13 +338,13 @@ namespace osu.Game
                     menuScreen.LoadToSolo();
 
                 // we might even already be at the song
-                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash)
+                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && findPredicate(Beatmap.Value.BeatmapInfo))
                 {
                     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();
+                // Find first beatmap that matches our predicate.
+                var first = databasedSet.Beatmaps.Find(findPredicate) ?? databasedSet.Beatmaps.First();
 
                 Ruleset.Value = first.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(first);
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 29c259b7f8..a60b9e04b1 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -277,7 +277,8 @@ namespace osu.Game.Overlays.BeatmapSet
                     downloadButtonsContainer.Child = new PanelDownloadButton(BeatmapSet.Value)
                     {
                         Width = 50,
-                        RelativeSizeAxes = Axes.Y
+                        RelativeSizeAxes = Axes.Y,
+                        CurrentBeatmap = Picker.Beatmap.GetBoundCopy()
                     };
                     break;
 
diff --git a/osu.Game/Overlays/Direct/PanelDownloadButton.cs b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
index 1b3657f010..eae2f3353c 100644
--- a/osu.Game/Overlays/Direct/PanelDownloadButton.cs
+++ b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
@@ -16,6 +18,8 @@ namespace osu.Game.Overlays.Direct
 
         private readonly bool noVideo;
 
+        public Bindable<BeatmapInfo> CurrentBeatmap = new Bindable<BeatmapInfo>();
+
         private readonly ShakeContainer shakeContainer;
         private readonly DownloadButton button;
 
@@ -62,7 +66,11 @@ namespace osu.Game.Overlays.Direct
                         break;
 
                     case DownloadState.LocallyAvailable:
-                        game?.PresentBeatmap(BeatmapSet.Value);
+                        Predicate<BeatmapInfo> findPredicate = null;
+                        if (CurrentBeatmap.Value != null)
+                            findPredicate = b => b.OnlineBeatmapID == CurrentBeatmap.Value.OnlineBeatmapID;
+
+                        game?.PresentBeatmap(BeatmapSet.Value, findPredicate);
                         break;
 
                     default:

From ed28e8c8f5f6d92f7f06034800fd9df82f688ef7 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 12 Apr 2020 19:38:09 +0300
Subject: [PATCH 02136/10326] Rename param

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 113e9bbe24..5e93d760e3 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -315,11 +315,14 @@ namespace osu.Game
         /// The user should have already requested this interactively.
         /// </summary>
         /// <param name="beatmap">The beatmap to select.</param>
-        /// <param name="findPredicate">Predicate used to find a difficulty to select</param>
-        public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> findPredicate = null)
+        /// <param name="difficultyCriteria">
+        /// Optional predicate used to try and find a difficulty to select.
+        /// If omitted, this will try to present the first beatmap from the current ruleset.
+        /// In case of failure the first difficulty of the set will be presented, ignoring the predicate.
+        /// </param>
+        public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> difficultyCriteria = null)
         {
-            // Use this predicate if non was provided. This will try to find some difficulty from current ruleset so we wouldn't have to change rulesets
-            findPredicate ??= b => b.Ruleset.Equals(Ruleset.Value);
+            difficultyCriteria ??= b => b.Ruleset.Equals(Ruleset.Value);
 
             var databasedSet = beatmap.OnlineBeatmapSetID != null
                 ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID)
@@ -338,13 +341,13 @@ namespace osu.Game
                     menuScreen.LoadToSolo();
 
                 // we might even already be at the song
-                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && findPredicate(Beatmap.Value.BeatmapInfo))
+                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && difficultyCriteria(Beatmap.Value.BeatmapInfo))
                 {
                     return;
                 }
 
                 // Find first beatmap that matches our predicate.
-                var first = databasedSet.Beatmaps.Find(findPredicate) ?? databasedSet.Beatmaps.First();
+                var first = databasedSet.Beatmaps.Find(difficultyCriteria) ?? databasedSet.Beatmaps.First();
 
                 Ruleset.Value = first.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(first);

From 3b9e0fa67def20a8e9177088147cbfff4536cc07 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 12 Apr 2020 19:42:28 +0300
Subject: [PATCH 02137/10326] Use readonly IBindable

---
 osu.Game/Overlays/BeatmapSet/Header.cs          | 7 ++++---
 osu.Game/Overlays/Direct/PanelDownloadButton.cs | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index a60b9e04b1..4e57bfa688 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -274,12 +274,13 @@ namespace osu.Game.Overlays.BeatmapSet
             {
                 case DownloadState.LocallyAvailable:
                     // temporary for UX until new design is implemented.
-                    downloadButtonsContainer.Child = new PanelDownloadButton(BeatmapSet.Value)
+                    PanelDownloadButton panelButton;
+                    downloadButtonsContainer.Child = panelButton = new PanelDownloadButton(BeatmapSet.Value)
                     {
                         Width = 50,
-                        RelativeSizeAxes = Axes.Y,
-                        CurrentBeatmap = Picker.Beatmap.GetBoundCopy()
+                        RelativeSizeAxes = Axes.Y
                     };
+                    panelButton.CurrentBeatmap.BindTo(Picker.Beatmap);
                     break;
 
                 case DownloadState.Downloading:
diff --git a/osu.Game/Overlays/Direct/PanelDownloadButton.cs b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
index eae2f3353c..6fe174438b 100644
--- a/osu.Game/Overlays/Direct/PanelDownloadButton.cs
+++ b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Direct
 
         private readonly bool noVideo;
 
-        public Bindable<BeatmapInfo> CurrentBeatmap = new Bindable<BeatmapInfo>();
+        public readonly IBindable<BeatmapInfo> CurrentBeatmap = new Bindable<BeatmapInfo>();
 
         private readonly ShakeContainer shakeContainer;
         private readonly DownloadButton button;

From 1cf240b5fff1c269f9e668970a4046d963521b41 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 12 Apr 2020 20:04:25 +0300
Subject: [PATCH 02138/10326] Test new predicate behaviour

---
 .../Navigation/TestScenePresentBeatmap.cs     | 57 +++++++++++++++----
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
index 909409835c..27f5b29738 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
@@ -20,26 +20,30 @@ namespace osu.Game.Tests.Visual.Navigation
         public void TestFromMainMenu()
         {
             var firstImport = importBeatmap(1);
+            var secondimport = importBeatmap(3);
+
             presentAndConfirm(firstImport);
-
-            AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
-            AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
-
-            var secondimport = importBeatmap(2);
+            returnToMenu();
             presentAndConfirm(secondimport);
+            returnToMenu();
+            presentSecondDifficultyAndConfirm(firstImport, 1);
+            returnToMenu();
+            presentSecondDifficultyAndConfirm(secondimport, 3);
         }
 
         [Test]
         public void TestFromMainMenuDifferentRuleset()
         {
             var firstImport = importBeatmap(1);
+            var secondimport = importBeatmap(3, new ManiaRuleset().RulesetInfo);
+
             presentAndConfirm(firstImport);
-
-            AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
-            AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
-
-            var secondimport = importBeatmap(2, new ManiaRuleset().RulesetInfo);
+            returnToMenu();
             presentAndConfirm(secondimport);
+            returnToMenu();
+            presentSecondDifficultyAndConfirm(firstImport, 1);
+            returnToMenu();
+            presentSecondDifficultyAndConfirm(secondimport, 3);
         }
 
         [Test]
@@ -48,8 +52,11 @@ namespace osu.Game.Tests.Visual.Navigation
             var firstImport = importBeatmap(1);
             presentAndConfirm(firstImport);
 
-            var secondimport = importBeatmap(2);
+            var secondimport = importBeatmap(3);
             presentAndConfirm(secondimport);
+
+            presentSecondDifficultyAndConfirm(firstImport, 1);
+            presentSecondDifficultyAndConfirm(secondimport, 3);
         }
 
         [Test]
@@ -58,8 +65,17 @@ namespace osu.Game.Tests.Visual.Navigation
             var firstImport = importBeatmap(1);
             presentAndConfirm(firstImport);
 
-            var secondimport = importBeatmap(2, new ManiaRuleset().RulesetInfo);
+            var secondimport = importBeatmap(3, new ManiaRuleset().RulesetInfo);
             presentAndConfirm(secondimport);
+
+            presentSecondDifficultyAndConfirm(firstImport, 1);
+            presentSecondDifficultyAndConfirm(secondimport, 3);
+        }
+
+        private void returnToMenu()
+        {
+            AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
+            AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
         }
 
         private Func<BeatmapSetInfo> importBeatmap(int i, RulesetInfo ruleset = null)
@@ -89,6 +105,13 @@ namespace osu.Game.Tests.Visual.Navigation
                             BaseDifficulty = difficulty,
                             Ruleset = ruleset ?? new OsuRuleset().RulesetInfo
                         },
+                        new BeatmapInfo
+                        {
+                            OnlineBeatmapID = i * 2048,
+                            Metadata = metadata,
+                            BaseDifficulty = difficulty,
+                            Ruleset = ruleset ?? new OsuRuleset().RulesetInfo
+                        },
                     }
                 }).Result;
             });
@@ -106,5 +129,15 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("correct beatmap displayed", () => Game.Beatmap.Value.BeatmapSetInfo.ID == getImport().ID);
             AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Beatmaps.First().Ruleset.ID);
         }
+
+        private void presentSecondDifficultyAndConfirm(Func<BeatmapSetInfo> getImport, int importedID)
+        {
+            Predicate<BeatmapInfo> pred = b => b.OnlineBeatmapID == importedID * 2048;
+            AddStep("present difficulty", () => Game.PresentBeatmap(getImport(), pred));
+
+            AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is Screens.Select.SongSelect);
+            AddUntilStep("correct beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID * 2048);
+            AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Beatmaps.First().Ruleset.ID);
+        }
     }
 }

From b475316a4e0a34161450ab8eed126d4087866cab Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 12 Apr 2020 20:40:08 +0300
Subject: [PATCH 02139/10326] Simplify and comment

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index a5379e9649..e13511a02c 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -632,7 +632,11 @@ namespace osu.Game.Screens.Select
                         case DrawableCarouselBeatmap beatmap:
                         {
                             if (beatmap.Item.State.Value == CarouselItemState.Selected)
-                                scrollTarget = currentY + beatmap.DrawHeight / 2 - (Parent.DrawHeight / 2 - Parent.Padding.Top);
+                                // scroll position at currentY makes the set panel appear at the very top of the carousel in screen space
+                                // move down by half of parent height (which is the height of the carousel's visible extent, including semi-transparent areas)
+                                // then reapply parent's padding from the top by adding it
+                                // and finally add half of the panel's own height to achieve vertical centering of the panel itself
+                                scrollTarget = currentY - Parent.DrawHeight / 2 + Parent.Padding.Top + beatmap.DrawHeight / 2;
 
                             void performMove(float y, float? startY = null)
                             {

From 3efb4aba25803c36a2f50401808a389f3b082f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 12 Apr 2020 19:48:15 +0200
Subject: [PATCH 02140/10326] Use BindTarget

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

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 4e57bfa688..a03613f955 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -274,13 +274,12 @@ namespace osu.Game.Overlays.BeatmapSet
             {
                 case DownloadState.LocallyAvailable:
                     // temporary for UX until new design is implemented.
-                    PanelDownloadButton panelButton;
-                    downloadButtonsContainer.Child = panelButton = new PanelDownloadButton(BeatmapSet.Value)
+                    downloadButtonsContainer.Child = new PanelDownloadButton(BeatmapSet.Value)
                     {
                         Width = 50,
-                        RelativeSizeAxes = Axes.Y
+                        RelativeSizeAxes = Axes.Y,
+                        CurrentBeatmap = { BindTarget = Picker.Beatmap }
                     };
-                    panelButton.CurrentBeatmap.BindTo(Picker.Beatmap);
                     break;
 
                 case DownloadState.Downloading:

From 633b969017515da564a14036e7ad3eb0cbb5a141 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 12 Apr 2020 21:57:35 +0300
Subject: [PATCH 02141/10326] Apply review suggestions

---
 .../Visual/Online/TestSceneDirectDownloadButton.cs  |  4 ++--
 osu.Game/Overlays/Direct/PanelDownloadButton.cs     | 13 ++++++-------
 .../Settings/Sections/Online/WebSettings.cs         |  3 ++-
 osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs  |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
index 5b0c2d3c67..f612992bf6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
@@ -149,8 +149,8 @@ namespace osu.Game.Tests.Visual.Online
 
             public DownloadState DownloadState => State.Value;
 
-            public TestDownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
-                : base(beatmapSet, noVideo)
+            public TestDownloadButton(BeatmapSetInfo beatmapSet)
+                : base(beatmapSet)
             {
             }
         }
diff --git a/osu.Game/Overlays/Direct/PanelDownloadButton.cs b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
index f09586c571..51f5b2ae4f 100644
--- a/osu.Game/Overlays/Direct/PanelDownloadButton.cs
+++ b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
@@ -2,6 +2,7 @@
 // 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.Beatmaps;
 using osu.Game.Configuration;
@@ -15,16 +16,13 @@ namespace osu.Game.Overlays.Direct
     {
         protected bool DownloadEnabled => button.Enabled.Value;
 
-        private readonly bool? noVideo;
-
         private readonly ShakeContainer shakeContainer;
         private readonly DownloadButton button;
+        private readonly BindableBool noVideoSetting = new BindableBool();
 
-        public PanelDownloadButton(BeatmapSetInfo beatmapSet, bool? noVideo = null)
+        public PanelDownloadButton(BeatmapSetInfo beatmapSet)
             : base(beatmapSet)
         {
-            this.noVideo = noVideo;
-
             InternalChild = shakeContainer = new ShakeContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -53,6 +51,8 @@ namespace osu.Game.Overlays.Direct
                 return;
             }
 
+            noVideoSetting.BindTo(osuConfig.GetBindable<bool>(OsuSetting.PreferNoVideo));
+
             button.Action = () =>
             {
                 switch (State.Value)
@@ -67,8 +67,7 @@ namespace osu.Game.Overlays.Direct
                         break;
 
                     default:
-                        var minimiseDownloadSize = noVideo ?? osuConfig.GetBindable<bool>(OsuSetting.PreferNoVideo).Value;
-                        beatmaps.Download(BeatmapSet.Value, minimiseDownloadSize);
+                        beatmaps.Download(BeatmapSet.Value, noVideoSetting.Value);
                         break;
                 }
             };
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index da3176aca8..23513eade8 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -23,7 +23,8 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = "Prefer no-video downloads",
+                    LabelText = "Prefer downloads without video",
+                    Keywords = new[] { "no-video" },
                     Bindable = config.GetBindable<bool>(OsuSetting.PreferNoVideo)
                 },
             };
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index d58218b6b5..d7dcca9809 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -212,8 +212,8 @@ namespace osu.Game.Screens.Multi
 
         private class PlaylistDownloadButton : PanelDownloadButton
         {
-            public PlaylistDownloadButton(BeatmapSetInfo beatmapSet, bool? noVideo = null)
-                : base(beatmapSet, noVideo)
+            public PlaylistDownloadButton(BeatmapSetInfo beatmapSet)
+                : base(beatmapSet)
             {
                 Alpha = 0;
             }

From 65b96079a05f46de50dd1f0f191bed8389cdf62f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 13:00:03 +0900
Subject: [PATCH 02142/10326] Move dampening to base implementation and change
 range to 0..1

---
 .../Objects/Drawables/DrawableCatchHitObject.cs  |  2 +-
 .../Objects/Drawables/DrawableManiaHitObject.cs  |  2 +-
 .../Objects/Drawables/DrawableOsuHitObject.cs    |  3 ++-
 .../Objects/Drawables/DrawableHitObject.cs       | 16 +++++++++++-----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index e726d6eff5..b12cdd4ccb 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         public float DisplayRadius => DrawSize.X / 2 * Scale.X * HitObject.Scale;
 
-        protected override float SamplePlaybackBalance => 0.8f * HitObject.X - 0.4f;
+        protected override float SamplePlaybackPosition => HitObject.X;
 
         protected DrawableCatchHitObject(CatchHitObject hitObject)
             : base(hitObject)
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 76e9695855..ce56fd222c 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
 
-        protected override float SamplePlaybackBalance
+        protected override float SamplePlaybackPosition
         {
             get
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 068d666c8e..8308c0c576 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Graphics.Containers;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
@@ -18,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         // Must be set to update IsHovered as it's used in relax mdo to detect osu hit objects.
         public override bool HandlePositionalInput => true;
 
-        protected override float SamplePlaybackBalance => (HitObject.X / 512f - 0.5f) * 0.8f;
+        protected override float SamplePlaybackPosition => HitObject.X / OsuPlayfield.BASE_SIZE.X;
 
         /// <summary>
         /// Whether this <see cref="DrawableOsuHitObject"/> can be hit.
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index d6e231424b..b14927bcd5 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -87,11 +87,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
         public JudgementResult Result { get; private set; }
 
         /// <summary>
-        /// The stereo balance of the samples played if <i>Positional hitsounds</i> is set.
+        /// The relative X position of this hit object for sample playback balance adjustment.
         /// </summary>
-        protected virtual float SamplePlaybackBalance => 0;
+        /// <remarks>
+        /// This is a range of 0..1 (0 for far-left, 0.5 for centre, 1 for far-right).
+        /// Dampening is post-applied to ensure the effect is not too intense.
+        /// </remarks>
+        protected virtual float SamplePlaybackPosition => 0.5f;
 
-        private readonly BindableDouble samplePlaybackBalanceAdjustment = new BindableDouble();
+        private readonly BindableDouble balanceAdjust = new BindableDouble();
 
         private BindableList<HitSampleInfo> samplesBindable;
         private Bindable<double> startTimeBindable;
@@ -168,7 +172,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             Samples = new SkinnableSound(samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)));
-            Samples.AddAdjustment(AdjustableProperty.Balance, samplePlaybackBalanceAdjustment);
+            Samples.AddAdjustment(AdjustableProperty.Balance, balanceAdjust);
             AddInternal(Samples);
         }
 
@@ -368,7 +372,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public virtual void PlaySamples()
         {
-            samplePlaybackBalanceAdjustment.Value = userPositionalHitSounds.Value ? SamplePlaybackBalance : 0;
+            const float balance_adjust_amount = 0.4f;
+
+            balanceAdjust.Value = balance_adjust_amount * (userPositionalHitSounds.Value ? SamplePlaybackPosition - 0.5f : 0);
             Samples?.Play();
         }
 

From cdff6060d3eccdf3ed36df6ce0d3aa26dc411a17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 13:01:27 +0900
Subject: [PATCH 02143/10326] Remove recursive hierarchy traversal for mania
 sample balance

---
 .../Objects/Drawables/DrawableManiaHitObject.cs  | 16 +++++++++-------
 osu.Game/Rulesets/UI/Playfield.cs                |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index ce56fd222c..a708adb493 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -5,10 +5,10 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -26,17 +26,19 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
 
+        [Resolved(canBeNull: true)]
+        private Playfield playfield { get; set; }
+
         protected override float SamplePlaybackPosition
         {
             get
             {
-                CompositeDrawable stage = this;
-                while (!(stage is Stage))
-                    stage = stage.Parent;
+                var columns = (playfield as ManiaPlayfield)?.TotalColumns;
 
-                var columnCount = ((Stage)stage).Columns.Count;
-                var columnIndex = HitObject.Column;
-                return 0.8f * columnIndex / (columnCount - 1) - 0.4f;
+                if (columns == null)
+                    return base.SamplePlaybackPosition;
+
+                return (float)HitObject.Column / columns.Value;
             }
         }
 
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index c52183f3f2..fc6906560b 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -15,6 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.UI
 {
+    [Cached]
     public abstract class Playfield : CompositeDrawable
     {
         /// <summary>

From c51bad0e35e4a08d3e0e159e103884bbf709e85d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 13:42:21 +0900
Subject: [PATCH 02144/10326] Cache ManiaPlayfield instead

---
 .../Objects/Drawables/DrawableManiaHitObject.cs          | 9 +++------
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs             | 2 ++
 osu.Game/Rulesets/UI/Playfield.cs                        | 1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index a708adb493..88888001b4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -27,18 +26,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
 
         [Resolved(canBeNull: true)]
-        private Playfield playfield { get; set; }
+        private ManiaPlayfield playfield { get; set; }
 
         protected override float SamplePlaybackPosition
         {
             get
             {
-                var columns = (playfield as ManiaPlayfield)?.TotalColumns;
-
-                if (columns == null)
+                if (playfield == null)
                     return base.SamplePlaybackPosition;
 
-                return (float)HitObject.Column / columns.Value;
+                return (float)HitObject.Column / playfield.TotalColumns;
             }
         }
 
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index c2eb48b774..2dec468654 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics.Containers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -14,6 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
+    [Cached]
     public class ManiaPlayfield : ScrollingPlayfield
     {
         private readonly List<Stage> stages = new List<Stage>();
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index fc6906560b..c52183f3f2 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -15,7 +15,6 @@ using osuTK;
 
 namespace osu.Game.Rulesets.UI
 {
-    [Cached]
     public abstract class Playfield : CompositeDrawable
     {
         /// <summary>

From f38b64d20177c2010b415f8a3bae39fbf29e0303 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Apr 2020 13:57:15 +0900
Subject: [PATCH 02145/10326] Fix placement blueprints handling double clicks

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index ea77a6091a..fb1eb7adbf 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -106,6 +106,9 @@ namespace osu.Game.Rulesets.Edit
                 case ScrollEvent _:
                     return false;
 
+                case DoubleClickEvent _:
+                    return false;
+
                 case MouseButtonEvent _:
                     return true;
 

From e17d5bdbaf3a6ad45b4a60af9ab9a168cf0d0406 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Apr 2020 13:57:40 +0900
Subject: [PATCH 02146/10326] Improve red slider control point placement logic

---
 .../Sliders/SliderPlacementBlueprint.cs       | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index a780653796..be43515269 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -1,10 +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.Diagnostics;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
+using osu.Framework.Logging;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -23,6 +26,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private SliderBodyPiece bodyPiece;
         private HitCirclePiece headCirclePiece;
         private HitCirclePiece tailCirclePiece;
+        private PathControlPointVisualiser controlPointVisualiser;
 
         private InputManager inputManager;
 
@@ -51,7 +55,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 bodyPiece = new SliderBodyPiece(),
                 headCirclePiece = new HitCirclePiece(),
                 tailCirclePiece = new HitCirclePiece(),
-                new PathControlPointVisualiser(HitObject, false)
+                controlPointVisualiser = new PathControlPointVisualiser(HitObject, false)
             };
 
             setState(PlacementState.Initial);
@@ -91,17 +95,29 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     break;
 
                 case PlacementState.Body:
-                    switch (e.Button)
-                    {
-                        case MouseButton.Left:
-                            ensureCursor();
+                    if (e.Button != MouseButton.Left)
+                        break;
 
-                            // Detatch the cursor
-                            cursor = null;
-                            break;
+                    // Find the last non-cursor control point and the respective drawable piece
+                    var lastPoint = HitObject.Path.ControlPoints.LastOrDefault(p => p != cursor);
+                    var lastPiece = controlPointVisualiser.Pieces.Single(p => p.ControlPoint == lastPoint);
+
+                    if (lastPiece?.IsHovered == true)
+                    {
+                        Debug.Assert(lastPoint != null);
+
+                        segmentStart = lastPoint;
+                        segmentStart.Type.Value = PathType.Linear;
+
+                        currentSegmentLength = 1;
+                    }
+                    else
+                    {
+                        ensureCursor();
+                        cursor = null; // Detatch the cursor
                     }
 
-                    break;
+                    return true;
             }
 
             return true;
@@ -114,16 +130,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             base.OnMouseUp(e);
         }
 
-        protected override bool OnDoubleClick(DoubleClickEvent e)
-        {
-            // Todo: This should all not occur on double click, but rather if the previous control point is hovered.
-            segmentStart = HitObject.Path.ControlPoints[^1];
-            segmentStart.Type.Value = PathType.Linear;
-
-            currentSegmentLength = 1;
-            return true;
-        }
-
         private void beginCurve()
         {
             BeginPlacement(commitStart: true);
@@ -169,6 +175,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 currentSegmentLength++;
 
                 updatePathType();
+
+                Logger.Log("Set cursor");
             }
         }
 

From 99fa1458470fe7fc031e3ae4e422cf2f1ad0d73b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 13 Apr 2020 08:38:34 +0300
Subject: [PATCH 02147/10326] Add test for potential failing case

---
 .../UserInterface/TestSceneOverlayScrollContainer.cs      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
index 4205d65100..fd3b6ed3ab 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            Add(scroll = new OverlayScrollContainer
+            Child = scroll = new OverlayScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = new Container
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                         Colour = Color4.Gray
                     }
                 }
-            });
+            };
 
             invocationCount = 0;
 
@@ -62,6 +62,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("scroll to start", () => scroll.ScrollToStart(false));
             AddAssert("button is hidden", () => scroll.Button.State == Visibility.Hidden);
+
+            AddStep("scroll to 250", () => scroll.ScrollTo(500));
+            AddUntilStep("scrolled back to start", () => Precision.AlmostEquals(scroll.Current, 500, 0.1f));
+            AddAssert("button is visible", () => scroll.Button.State == Visibility.Visible);
         }
 
         [Test]

From 142cddfb10d46a1392dda590ac5fb1864c82bf7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 15:13:35 +0900
Subject: [PATCH 02148/10326] Rename CurrentBeatmap to SelectedBeatmap

---
 osu.Game/Overlays/BeatmapSet/Header.cs          | 2 +-
 osu.Game/Overlays/Direct/PanelDownloadButton.cs | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index a03613f955..11dc424183 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -278,7 +278,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     {
                         Width = 50,
                         RelativeSizeAxes = Axes.Y,
-                        CurrentBeatmap = { BindTarget = Picker.Beatmap }
+                        SelectedBeatmap = { BindTarget = Picker.Beatmap }
                     };
                     break;
 
diff --git a/osu.Game/Overlays/Direct/PanelDownloadButton.cs b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
index 6fe174438b..08e3ed9b38 100644
--- a/osu.Game/Overlays/Direct/PanelDownloadButton.cs
+++ b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
@@ -18,7 +18,10 @@ namespace osu.Game.Overlays.Direct
 
         private readonly bool noVideo;
 
-        public readonly IBindable<BeatmapInfo> CurrentBeatmap = new Bindable<BeatmapInfo>();
+        /// <summary>
+        /// Currently selected beatmap. Used to present the correct difficulty after completing a download.
+        /// </summary>
+        public readonly IBindable<BeatmapInfo> SelectedBeatmap = new Bindable<BeatmapInfo>();
 
         private readonly ShakeContainer shakeContainer;
         private readonly DownloadButton button;
@@ -67,8 +70,8 @@ namespace osu.Game.Overlays.Direct
 
                     case DownloadState.LocallyAvailable:
                         Predicate<BeatmapInfo> findPredicate = null;
-                        if (CurrentBeatmap.Value != null)
-                            findPredicate = b => b.OnlineBeatmapID == CurrentBeatmap.Value.OnlineBeatmapID;
+                        if (SelectedBeatmap.Value != null)
+                            findPredicate = b => b.OnlineBeatmapID == SelectedBeatmap.Value.OnlineBeatmapID;
 
                         game?.PresentBeatmap(BeatmapSet.Value, findPredicate);
                         break;

From 2c20328a70cfd3f5f2722b226346feeabad633ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Apr 2020 15:31:46 +0900
Subject: [PATCH 02149/10326] Rework control point placement for better
 progression

---
 .../Sliders/SliderPlacementBlueprint.cs       | 69 +++++++++++++------
 1 file changed, 47 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index be43515269..9af972dbce 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -3,11 +3,11 @@
 
 using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
-using osu.Framework.Logging;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -77,11 +77,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     break;
 
                 case PlacementState.Body:
-                    ensureCursor();
-
-                    // The given screen-space position may have been externally snapped, but the unsnapped position from the input manager
-                    // is used instead since snapping control points doesn't make much sense
-                    cursor.Position.Value = ToLocalSpace(inputManager.CurrentState.Mouse.Position) - HitObject.Position;
+                    updateCursor();
                     break;
             }
         }
@@ -98,12 +94,15 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     if (e.Button != MouseButton.Left)
                         break;
 
-                    // Find the last non-cursor control point and the respective drawable piece
-                    var lastPoint = HitObject.Path.ControlPoints.LastOrDefault(p => p != cursor);
-                    var lastPiece = controlPointVisualiser.Pieces.Single(p => p.ControlPoint == lastPoint);
-
-                    if (lastPiece?.IsHovered == true)
+                    if (canPlaceNewControlPoint(out var lastPoint))
                     {
+                        // Place a new point by detatching the current cursor.
+                        updateCursor();
+                        cursor = null;
+                    }
+                    else
+                    {
+                        // Transform the last point into a new segment.
                         Debug.Assert(lastPoint != null);
 
                         segmentStart = lastPoint;
@@ -111,11 +110,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
                         currentSegmentLength = 1;
                     }
-                    else
-                    {
-                        ensureCursor();
-                        cursor = null; // Detatch the cursor
-                    }
 
                     return true;
             }
@@ -167,17 +161,48 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             }
         }
 
-        private void ensureCursor()
+        private void updateCursor()
         {
-            if (cursor == null)
+            if (canPlaceNewControlPoint(out _))
             {
-                HitObject.Path.ControlPoints.Add(cursor = new PathControlPoint { Position = { Value = Vector2.Zero } });
-                currentSegmentLength++;
+                // The cursor does not overlap a previous control point, so it can be added if not already existing.
+                if (cursor == null)
+                {
+                    HitObject.Path.ControlPoints.Add(cursor = new PathControlPoint { Position = { Value = Vector2.Zero } });
 
-                updatePathType();
+                    // The path type should be adjusted in the progression of updatePathType() (Linear -> PC -> Bezier).
+                    currentSegmentLength++;
+                    updatePathType();
+                }
 
-                Logger.Log("Set cursor");
+                // Update the cursor position.
+                cursor.Position.Value = ToLocalSpace(inputManager.CurrentState.Mouse.Position) - HitObject.Position;
             }
+            else if (cursor != null)
+            {
+                // The cursor overlaps a previous control point, so it's removed.
+                HitObject.Path.ControlPoints.Remove(cursor);
+                cursor = null;
+
+                // The path type should be adjusted in the reverse progression of updatePathType() (Bezier -> PC -> Linear).
+                currentSegmentLength--;
+                updatePathType();
+            }
+        }
+
+        /// <summary>
+        /// Whether a new control point can be placed at the current mouse position.
+        /// </summary>
+        /// <param name="lastPoint">The last-placed control point. May be null, but is not null if <c>false</c> is returned.</param>
+        /// <returns>Whether a new control point can be placed at the current position.</returns>
+        private bool canPlaceNewControlPoint([CanBeNull] out PathControlPoint lastPoint)
+        {
+            // We cannot rely on the ordering of drawable pieces, so find the respective drawable piece by searching for the last non-cursor control point.
+            var last = HitObject.Path.ControlPoints.LastOrDefault(p => p != cursor);
+            var lastPiece = controlPointVisualiser.Pieces.Single(p => p.ControlPoint == last);
+
+            lastPoint = last;
+            return lastPiece?.IsHovered != true;
         }
 
         private void updateSlider()

From bde0b259c1c03d2022124c6125dd2cc45a292807 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Apr 2020 15:31:54 +0900
Subject: [PATCH 02150/10326] Improve slider placement test scene

---
 .../TestSceneSliderPlacementBlueprint.cs      | 267 ++++++++++++++++++
 .../Visual/PlacementBlueprintTestScene.cs     |  28 +-
 2 files changed, 282 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs
index 0522260150..9fc479953e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs
@@ -1,18 +1,285 @@
 // Copyright (c) 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.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneSliderPlacementBlueprint : PlacementBlueprintTestScene
     {
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            HitObjectContainer.Clear();
+            ResetPlacement();
+        });
+
+        [Test]
+        public void TestBeginPlacementWithoutFinishing()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            assertPlaced(false);
+        }
+
+        [Test]
+        public void TestPlaceWithoutMovingMouse()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertLength(0);
+            assertControlPointType(0, PathType.Linear);
+        }
+
+        [Test]
+        public void TestPlaceWithMouseMovement()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400, 200));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertLength(200);
+            assertControlPointCount(2);
+            assertControlPointType(0, PathType.Linear);
+        }
+
+        [Test]
+        public void TestPlaceNormalControlPoint()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointPosition(1, new Vector2(100, 0));
+            assertControlPointType(0, PathType.PerfectCurve);
+        }
+
+        [Test]
+        public void TestPlaceTwoNormalControlPoints()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400, 300));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(4);
+            assertControlPointPosition(1, new Vector2(100, 0));
+            assertControlPointPosition(2, new Vector2(100, 100));
+            assertControlPointType(0, PathType.Bezier);
+        }
+
+        [Test]
+        public void TestPlaceSegmentControlPoint()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 200));
+            addClickStep(MouseButton.Left);
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointPosition(1, new Vector2(100, 0));
+            assertControlPointType(0, PathType.Linear);
+            assertControlPointType(1, PathType.Linear);
+        }
+
+        [Test]
+        public void TestMoveToPerfectCurveThenPlaceLinear()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300));
+            addMovementStep(new Vector2(300, 200));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(2);
+            assertControlPointType(0, PathType.Linear);
+            assertLength(100);
+        }
+
+        [Test]
+        public void TestMoveToBezierThenPlacePerfectCurve()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400, 300));
+            addMovementStep(new Vector2(300));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointType(0, PathType.PerfectCurve);
+        }
+
+        [Test]
+        public void TestMoveToFourthOrderBezierThenPlaceThirdOrderBezier()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400, 300));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400));
+            addMovementStep(new Vector2(400, 300));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(4);
+            assertControlPointType(0, PathType.Bezier);
+        }
+
+        [Test]
+        public void TestPlaceLinearSegmentThenPlaceLinearSegment()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 200));
+            addClickStep(MouseButton.Left);
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 300));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointPosition(1, new Vector2(100, 0));
+            assertControlPointPosition(2, new Vector2(100));
+            assertControlPointType(0, PathType.Linear);
+            assertControlPointType(1, PathType.Linear);
+        }
+
+        [Test]
+        public void TestPlaceLinearSegmentThenPlacePerfectCurveSegment()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 200));
+            addClickStep(MouseButton.Left);
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 300));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400, 300));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(4);
+            assertControlPointPosition(1, new Vector2(100, 0));
+            assertControlPointPosition(2, new Vector2(100));
+            assertControlPointType(0, PathType.Linear);
+            assertControlPointType(1, PathType.PerfectCurve);
+        }
+
+        [Test]
+        public void TestPlacePerfectCurveSegmentThenPlacePerfectCurveSegment()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(300, 300));
+            addClickStep(MouseButton.Left);
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400, 300));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(5);
+            assertControlPointPosition(1, new Vector2(100, 0));
+            assertControlPointPosition(2, new Vector2(100));
+            assertControlPointPosition(3, new Vector2(200, 100));
+            assertControlPointPosition(4, new Vector2(200));
+            assertControlPointType(0, PathType.PerfectCurve);
+            assertControlPointType(2, PathType.PerfectCurve);
+        }
+
+        private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
+
+        private void addClickStep(MouseButton button)
+        {
+            AddStep($"press {button}", () => InputManager.PressButton(button));
+            AddStep($"release {button}", () => InputManager.ReleaseButton(button));
+        }
+
+        private void assertPlaced(bool expected) => AddAssert($"slider {(expected ? "placed" : "not placed")}", () => (getSlider() != null) == expected);
+
+        private void assertLength(double expected) => AddAssert($"slider length is {expected}", () => Precision.AlmostEquals(expected, getSlider().Distance, 1));
+
+        private void assertControlPointCount(int expected) => AddAssert($"has {expected} control points", () => getSlider().Path.ControlPoints.Count == expected);
+
+        private void assertControlPointType(int index, PathType type) => AddAssert($"control point {index} is {type}", () => getSlider().Path.ControlPoints[index].Type.Value == type);
+
+        private void assertControlPointPosition(int index, Vector2 position) =>
+            AddAssert($"control point {index} at {position}", () => Precision.AlmostEquals(position, getSlider().Path.ControlPoints[index].Position.Value, 1));
+
+        private Slider getSlider() => HitObjectContainer.Count > 0 ? (Slider)((DrawableSlider)HitObjectContainer[0]).HitObject : null;
+
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableSlider((Slider)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new SliderPlacementBlueprint();
     }
diff --git a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
index ce95dfa62f..dc67d28f63 100644
--- a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
@@ -4,8 +4,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.Framework.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -15,13 +13,11 @@ using osu.Game.Screens.Edit.Compose;
 namespace osu.Game.Tests.Visual
 {
     [Cached(Type = typeof(IPlacementHandler))]
-    public abstract class PlacementBlueprintTestScene : OsuTestScene, IPlacementHandler
+    public abstract class PlacementBlueprintTestScene : OsuManualInputManagerTestScene, IPlacementHandler
     {
-        protected Container HitObjectContainer;
+        protected readonly Container HitObjectContainer;
         private PlacementBlueprint currentBlueprint;
 
-        private InputManager inputManager;
-
         protected PlacementBlueprintTestScene()
         {
             Add(HitObjectContainer = CreateHitObjectContainer().With(c => c.Clock = new FramedClock(new StopwatchClock())));
@@ -45,8 +41,7 @@ namespace osu.Game.Tests.Visual
         {
             base.LoadComplete();
 
-            inputManager = GetContainingInputManager();
-            Add(currentBlueprint = CreateBlueprint());
+            ResetPlacement();
         }
 
         public void BeginPlacement(HitObject hitObject)
@@ -58,7 +53,13 @@ namespace osu.Game.Tests.Visual
             if (commit)
                 AddHitObject(CreateHitObject(hitObject));
 
-            Remove(currentBlueprint);
+            ResetPlacement();
+        }
+
+        protected void ResetPlacement()
+        {
+            if (currentBlueprint != null)
+                Remove(currentBlueprint);
             Add(currentBlueprint = CreateBlueprint());
         }
 
@@ -66,10 +67,11 @@ namespace osu.Game.Tests.Visual
         {
         }
 
-        protected override bool OnMouseMove(MouseMoveEvent e)
+        protected override void Update()
         {
-            currentBlueprint.UpdatePosition(e.ScreenSpaceMousePosition);
-            return true;
+            base.Update();
+
+            currentBlueprint.UpdatePosition(InputManager.CurrentState.Mouse.Position);
         }
 
         public override void Add(Drawable drawable)
@@ -79,7 +81,7 @@ namespace osu.Game.Tests.Visual
             if (drawable is PlacementBlueprint blueprint)
             {
                 blueprint.Show();
-                blueprint.UpdatePosition(inputManager.CurrentState.Mouse.Position);
+                blueprint.UpdatePosition(InputManager.CurrentState.Mouse.Position);
             }
         }
 

From 0eaff00787293a93f945bdf0f5866b5285e2626f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 13 Apr 2020 09:45:49 +0300
Subject: [PATCH 02151/10326] Fix typo in test

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
index fd3b6ed3ab..3ef0adcd9d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("scroll to start", () => scroll.ScrollToStart(false));
             AddAssert("button is hidden", () => scroll.Button.State == Visibility.Hidden);
 
-            AddStep("scroll to 250", () => scroll.ScrollTo(500));
+            AddStep("scroll to 500", () => scroll.ScrollTo(500));
             AddUntilStep("scrolled back to start", () => Precision.AlmostEquals(scroll.Current, 500, 0.1f));
             AddAssert("button is visible", () => scroll.Button.State == Visibility.Visible);
         }

From bdce79ed5b85b01de2f49e24e22aa8156a518f3c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 13 Apr 2020 09:57:05 +0300
Subject: [PATCH 02152/10326] Fix incorrect test step name

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
index 3ef0adcd9d..6a09fecc0a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("button is hidden", () => scroll.Button.State == Visibility.Hidden);
 
             AddStep("scroll to 500", () => scroll.ScrollTo(500));
-            AddUntilStep("scrolled back to start", () => Precision.AlmostEquals(scroll.Current, 500, 0.1f));
+            AddUntilStep("scrolled to 500", () => Precision.AlmostEquals(scroll.Current, 500, 0.1f));
             AddAssert("button is visible", () => scroll.Button.State == Visibility.Visible);
         }
 

From 9a65aa18d78407bbba9658e0fc98810fc2940c69 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Apr 2020 16:13:14 +0900
Subject: [PATCH 02153/10326] Fix connections hidden due to overlapping
 controlpoints

---
 .../TestScenePathControlPointVisualiser.cs    | 64 +++++++++++++++++++
 .../PathControlPointConnectionPiece.cs        | 16 +++--
 .../Components/PathControlPointVisualiser.cs  | 57 +++++++++--------
 3 files changed, 103 insertions(+), 34 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestScenePathControlPointVisualiser.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/TestScenePathControlPointVisualiser.cs
new file mode 100644
index 0000000000..cbe14ff4d2
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestScenePathControlPointVisualiser.cs
@@ -0,0 +1,64 @@
+// Copyright (c) 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 Humanizer;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestScenePathControlPointVisualiser : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(StringHumanizeExtensions),
+            typeof(PathControlPointPiece),
+            typeof(PathControlPointConnectionPiece)
+        };
+
+        private Slider slider;
+        private PathControlPointVisualiser visualiser;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            slider = new Slider();
+            slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+        });
+
+        [Test]
+        public void TestAddOverlappingControlPoints()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200));
+            addControlPointStep(new Vector2(300));
+            addControlPointStep(new Vector2(300));
+            addControlPointStep(new Vector2(500, 300));
+
+            AddAssert("last connection displayed", () =>
+            {
+                var lastConnection = visualiser.Connections.Last(c => c.ControlPoint.Position.Value == new Vector2(300));
+                return lastConnection.DrawWidth > 50;
+            });
+        }
+
+        private void createVisualiser(bool allowSelection) => AddStep("create visualiser", () => Child = visualiser = new PathControlPointVisualiser(slider, allowSelection)
+        {
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre
+        });
+
+        private void addControlPointStep(Vector2 position) => AddStep($"add control point {position}", () => slider.Path.ControlPoints.Add(new PathControlPoint(position)));
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
index 0fc441fec6..9c620ecb2f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
@@ -16,22 +16,25 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
     /// </summary>
     public class PathControlPointConnectionPiece : CompositeDrawable
     {
-        public PathControlPoint ControlPoint;
+        public readonly PathControlPoint ControlPoint;
 
         private readonly Path path;
         private readonly Slider slider;
+        private readonly int controlPointIndex;
 
         private IBindable<Vector2> sliderPosition;
         private IBindable<int> pathVersion;
 
-        public PathControlPointConnectionPiece(Slider slider, PathControlPoint controlPoint)
+        public PathControlPointConnectionPiece(Slider slider, int controlPointIndex)
         {
             this.slider = slider;
-            ControlPoint = controlPoint;
+            this.controlPointIndex = controlPointIndex;
 
             Origin = Anchor.Centre;
             AutoSizeAxes = Axes.Both;
 
+            ControlPoint = slider.Path.ControlPoints[controlPointIndex];
+
             InternalChild = path = new SmoothPath
             {
                 Anchor = Anchor.Centre,
@@ -61,13 +64,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             path.ClearVertices();
 
-            int index = slider.Path.ControlPoints.IndexOf(ControlPoint) + 1;
-
-            if (index == 0 || index == slider.Path.ControlPoints.Count)
+            int nextIndex = controlPointIndex + 1;
+            if (nextIndex == 0 || nextIndex == slider.Path.ControlPoints.Count)
                 return;
 
             path.AddVertex(Vector2.Zero);
-            path.AddVertex(slider.Path.ControlPoints[index].Position.Value - ControlPoint.Position.Value);
+            path.AddVertex(slider.Path.ControlPoints[nextIndex].Position.Value - ControlPoint.Position.Value);
 
             path.OriginPosition = path.PositionInBoundingBox(Vector2.Zero);
         }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index e293eba9d7..f6354bc612 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using Humanizer;
 using osu.Framework.Bindables;
@@ -24,17 +25,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
     public class PathControlPointVisualiser : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
     {
         internal readonly Container<PathControlPointPiece> Pieces;
+        internal readonly Container<PathControlPointConnectionPiece> Connections;
 
-        private readonly Container<PathControlPointConnectionPiece> connections;
-
+        private readonly IBindableList<PathControlPoint> controlPoints = new BindableList<PathControlPoint>();
         private readonly Slider slider;
-
         private readonly bool allowSelection;
 
         private InputManager inputManager;
 
-        private IBindableList<PathControlPoint> controlPoints;
-
         public Action<List<PathControlPoint>> RemoveControlPointsRequested;
 
         public PathControlPointVisualiser(Slider slider, bool allowSelection)
@@ -46,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             InternalChildren = new Drawable[]
             {
-                connections = new Container<PathControlPointConnectionPiece> { RelativeSizeAxes = Axes.Both },
+                Connections = new Container<PathControlPointConnectionPiece> { RelativeSizeAxes = Axes.Both },
                 Pieces = new Container<PathControlPointPiece> { RelativeSizeAxes = Axes.Both }
             };
         }
@@ -57,33 +55,38 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             inputManager = GetContainingInputManager();
 
-            controlPoints = slider.Path.ControlPoints.GetBoundCopy();
-            controlPoints.ItemsAdded += addControlPoints;
-            controlPoints.ItemsRemoved += removeControlPoints;
-
-            addControlPoints(controlPoints);
+            controlPoints.CollectionChanged += onControlPointsChanged;
+            controlPoints.BindTo(slider.Path.ControlPoints);
         }
 
-        private void addControlPoints(IEnumerable<PathControlPoint> controlPoints)
+        private void onControlPointsChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            foreach (var point in controlPoints)
+            switch (e.Action)
             {
-                Pieces.Add(new PathControlPointPiece(slider, point).With(d =>
-                {
-                    if (allowSelection)
-                        d.RequestSelection = selectPiece;
-                }));
+                case NotifyCollectionChangedAction.Add:
+                    for (int i = 0; i < e.NewItems.Count; i++)
+                    {
+                        var point = (PathControlPoint)e.NewItems[i];
 
-                connections.Add(new PathControlPointConnectionPiece(slider, point));
-            }
-        }
+                        Pieces.Add(new PathControlPointPiece(slider, point).With(d =>
+                        {
+                            if (allowSelection)
+                                d.RequestSelection = selectPiece;
+                        }));
 
-        private void removeControlPoints(IEnumerable<PathControlPoint> controlPoints)
-        {
-            foreach (var point in controlPoints)
-            {
-                Pieces.RemoveAll(p => p.ControlPoint == point);
-                connections.RemoveAll(c => c.ControlPoint == point);
+                        Connections.Add(new PathControlPointConnectionPiece(slider, e.NewStartingIndex + i));
+                    }
+
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (var point in e.OldItems.Cast<PathControlPoint>())
+                    {
+                        Pieces.RemoveAll(p => p.ControlPoint == point);
+                        Connections.RemoveAll(c => c.ControlPoint == point);
+                    }
+
+                    break;
             }
         }
 

From 29dd2252054ed45fbac8be5f43318bdae45552f5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 13 Apr 2020 10:45:15 +0300
Subject: [PATCH 02154/10326] Make button protected

---
 .../UserInterface/TestSceneOverlayScrollContainer.cs     | 9 +++++++--
 osu.Game/Overlays/OverlayScrollContainer.cs              | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
index 6a09fecc0a..e9e63613c0 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
@@ -25,14 +25,14 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private OverlayScrollContainer scroll;
+        private TestScrollContainer scroll;
 
         private int invocationCount;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            Child = scroll = new OverlayScrollContainer
+            Child = scroll = new TestScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = new Container
@@ -104,5 +104,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddAssert("invocation count is 1", () => invocationCount == 1);
         }
+
+        private class TestScrollContainer : OverlayScrollContainer
+        {
+            public new ScrollToTopButton Button => base.Button;
+        }
     }
 }
diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index a8f2a0ce6c..9af09f0f6a 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays
         /// </summary>
         private const int button_scroll_position = 200;
 
-        public ScrollToTopButton Button { get; }
+        protected readonly ScrollToTopButton Button;
 
         private float currentTarget;
 

From b8ecc41667301cccff0d3e81bccdc95f6946a69f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 13 Apr 2020 10:52:34 +0300
Subject: [PATCH 02155/10326] Add comment

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

diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index 9af09f0f6a..e95a6379f1 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Overlays
                 return;
             }
 
+            // Clicking on button should immediately cause it's disappearance, so we don't want to override it's state until we have a new target.
             if (Target == currentTarget)
                 return;
 

From 1e3251e3e936f0ce0eca7a77dd7ae5dbffab27eb Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 13 Apr 2020 10:59:53 +0300
Subject: [PATCH 02156/10326] Remove excessive logic

---
 osu.Game/Overlays/OverlayScrollContainer.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index e95a6379f1..e7415e6f74 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -28,8 +28,6 @@ namespace osu.Game.Overlays
 
         protected readonly ScrollToTopButton Button;
 
-        private float currentTarget;
-
         public OverlayScrollContainer()
         {
             AddInternal(Button = new ScrollToTopButton
@@ -40,7 +38,6 @@ namespace osu.Game.Overlays
                 Action = () =>
                 {
                     ScrollToStart();
-                    currentTarget = Target;
                     Button.State = Visibility.Hidden;
                 }
             });
@@ -56,11 +53,6 @@ namespace osu.Game.Overlays
                 return;
             }
 
-            // Clicking on button should immediately cause it's disappearance, so we don't want to override it's state until we have a new target.
-            if (Target == currentTarget)
-                return;
-
-            currentTarget = Target;
             Button.State = Target > button_scroll_position ? Visibility.Visible : Visibility.Hidden;
         }
 

From bb53f96c717e9034c5a2e1b2411c3474d076fc9a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 17:18:50 +0900
Subject: [PATCH 02157/10326] Store states as byte[] instead of Streams

---
 .../Editor/LegacyEditorBeatmapDifferTest.cs   | 19 +++++++--------
 osu.Game/Screens/Edit/EditorChangeHandler.cs  | 18 ++++++++------
 .../Screens/Edit/LegacyEditorBeatmapDiffer.cs | 24 +++++++------------
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Editor/LegacyEditorBeatmapDifferTest.cs b/osu.Game.Tests/Editor/LegacyEditorBeatmapDifferTest.cs
index d70a112b7f..ecd3799cb1 100644
--- a/osu.Game.Tests/Editor/LegacyEditorBeatmapDifferTest.cs
+++ b/osu.Game.Tests/Editor/LegacyEditorBeatmapDifferTest.cs
@@ -315,26 +315,25 @@ namespace osu.Game.Tests.Editor
             differ.Patch(encode(current), encode(patch));
 
             // Convert beatmaps to strings for assertion purposes.
-            string currentStr = Encoding.ASCII.GetString(encode(current).ToArray());
-            string patchStr = Encoding.ASCII.GetString(encode(patch).ToArray());
+            string currentStr = Encoding.ASCII.GetString(encode(current));
+            string patchStr = Encoding.ASCII.GetString(encode(patch));
 
             Assert.That(currentStr, Is.EqualTo(patchStr));
         }
 
-        private MemoryStream encode(IBeatmap beatmap)
+        private byte[] encode(IBeatmap beatmap)
         {
-            var encoded = new MemoryStream();
-
+            using (var encoded = new MemoryStream())
             using (var sw = new StreamWriter(encoded, leaveOpen: true))
+            {
                 new LegacyBeatmapEncoder(beatmap).Encode(sw);
-
-            return encoded;
+                return encoded.ToArray();
+            }
         }
 
-        private IBeatmap decode(Stream stream)
+        private IBeatmap decode(byte[] state)
         {
-            stream.Seek(0, SeekOrigin.Begin);
-
+            using (var stream = new MemoryStream(state))
             using (var reader = new LineBufferedReader(stream, true))
                 return Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
         }
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 7e372926ba..22f076d939 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -16,7 +16,9 @@ namespace osu.Game.Screens.Edit
     public class EditorChangeHandler : IEditorChangeHandler
     {
         private readonly LegacyEditorBeatmapDiffer differ;
-        private readonly List<Stream> savedStates = new List<Stream>();
+
+        private readonly List<byte[]> savedStates = new List<byte[]>();
+
         private int currentState = -1;
 
         private readonly EditorBeatmap editorBeatmap;
@@ -69,15 +71,17 @@ namespace osu.Game.Screens.Edit
             if (isRestoring)
                 return;
 
-            var stream = new MemoryStream();
-
-            using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                new LegacyBeatmapEncoder(editorBeatmap).Encode(sw);
-
             if (currentState < savedStates.Count - 1)
                 savedStates.RemoveRange(currentState + 1, savedStates.Count - currentState - 1);
 
-            savedStates.Add(stream);
+            using (var stream = new MemoryStream())
+            {
+                using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+                    new LegacyBeatmapEncoder(editorBeatmap).Encode(sw);
+
+                savedStates.Add(stream.ToArray());
+            }
+
             currentState = savedStates.Count - 1;
         }
 
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapDiffer.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapDiffer.cs
index 8d2f577a1d..c62f21bb39 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapDiffer.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapDiffer.cs
@@ -4,12 +4,13 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using DiffPlex;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
+using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
 namespace osu.Game.Screens.Edit
 {
@@ -22,7 +23,7 @@ namespace osu.Game.Screens.Edit
             this.editorBeatmap = editorBeatmap;
         }
 
-        public void Patch(Stream currentState, Stream newState)
+        public void Patch(byte[] currentState, byte[] newState)
         {
             // Diff the beatmaps
             var result = new Differ().CreateLineDiffs(readString(currentState), readString(newState), true, false);
@@ -36,7 +37,7 @@ namespace osu.Game.Screens.Edit
 
             foreach (var block in result.DiffBlocks)
             {
-                // Removed hitobject
+                // Removed hitobjects
                 for (int i = 0; i < block.DeleteCountA; i++)
                 {
                     int hoIndex = block.DeleteStartA + i - oldHitObjectsIndex - 1;
@@ -47,7 +48,7 @@ namespace osu.Game.Screens.Edit
                     toRemove.Add(hoIndex);
                 }
 
-                // Added hitobject
+                // Added hitobjects
                 for (int i = 0; i < block.InsertCountB; i++)
                 {
                     int hoIndex = block.InsertStartB + i - newHitObjectsIndex - 1;
@@ -74,18 +75,11 @@ namespace osu.Game.Screens.Edit
             }
         }
 
-        private string readString(Stream stream)
+        private string readString(byte[] state) => Encoding.UTF8.GetString(state);
+
+        private IBeatmap readBeatmap(byte[] state)
         {
-            stream.Seek(0, SeekOrigin.Begin);
-
-            using (var sr = new StreamReader(stream, System.Text.Encoding.UTF8, true, 1024, true))
-                return sr.ReadToEnd();
-        }
-
-        private IBeatmap readBeatmap(Stream stream)
-        {
-            stream.Seek(0, SeekOrigin.Begin);
-
+            using (var stream = new MemoryStream(state))
             using (var reader = new LineBufferedReader(stream, true))
                 return new PassThroughWorkingBeatmap(Decoder.GetDecoder<Beatmap>(reader).Decode(reader)).GetPlayableBeatmap(editorBeatmap.BeatmapInfo.Ruleset);
         }

From 6aab19413c793bce5650fa1aa6a95a82a3048e4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 17:20:01 +0900
Subject: [PATCH 02158/10326] Rename differ to patcher, add xmldoc

---
 ...mapDifferTest.cs => LegacyEditorBeatmapPatcherTest.cs} | 8 ++++----
 osu.Game/Screens/Edit/EditorChangeHandler.cs              | 6 +++---
 ...itorBeatmapDiffer.cs => LegacyEditorBeatmapPatcher.cs} | 7 +++++--
 3 files changed, 12 insertions(+), 9 deletions(-)
 rename osu.Game.Tests/Editor/{LegacyEditorBeatmapDifferTest.cs => LegacyEditorBeatmapPatcherTest.cs} (97%)
 rename osu.Game/Screens/Edit/{LegacyEditorBeatmapDiffer.cs => LegacyEditorBeatmapPatcher.cs} (93%)

diff --git a/osu.Game.Tests/Editor/LegacyEditorBeatmapDifferTest.cs b/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
similarity index 97%
rename from osu.Game.Tests/Editor/LegacyEditorBeatmapDifferTest.cs
rename to osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
index ecd3799cb1..11c6399d19 100644
--- a/osu.Game.Tests/Editor/LegacyEditorBeatmapDifferTest.cs
+++ b/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
@@ -20,15 +20,15 @@ using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 namespace osu.Game.Tests.Editor
 {
     [TestFixture]
-    public class LegacyEditorBeatmapDifferTest
+    public class LegacyEditorBeatmapPatcherTest
     {
-        private LegacyEditorBeatmapDiffer differ;
+        private LegacyEditorBeatmapPatcher patcher;
         private EditorBeatmap current;
 
         [SetUp]
         public void Setup()
         {
-            differ = new LegacyEditorBeatmapDiffer(current = new EditorBeatmap(new OsuBeatmap
+            patcher = new LegacyEditorBeatmapPatcher(current = new EditorBeatmap(new OsuBeatmap
             {
                 BeatmapInfo =
                 {
@@ -312,7 +312,7 @@ namespace osu.Game.Tests.Editor
             patch = decode(encode(patch));
 
             // Apply the patch.
-            differ.Patch(encode(current), encode(patch));
+            patcher.Patch(encode(current), encode(patch));
 
             // Convert beatmaps to strings for assertion purposes.
             string currentStr = Encoding.ASCII.GetString(encode(current));
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 22f076d939..00a27801f4 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Edit
     /// </summary>
     public class EditorChangeHandler : IEditorChangeHandler
     {
-        private readonly LegacyEditorBeatmapDiffer differ;
+        private readonly LegacyEditorBeatmapPatcher patcher;
 
         private readonly List<byte[]> savedStates = new List<byte[]>();
 
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Edit
             editorBeatmap.HitObjectRemoved += hitObjectRemoved;
             editorBeatmap.HitObjectUpdated += hitObjectUpdated;
 
-            differ = new LegacyEditorBeatmapDiffer(editorBeatmap);
+            patcher = new LegacyEditorBeatmapPatcher(editorBeatmap);
 
             // Initial state.
             SaveState();
@@ -103,7 +103,7 @@ namespace osu.Game.Screens.Edit
 
             isRestoring = true;
 
-            differ.Patch(savedStates[currentState], savedStates[newState]);
+            patcher.Patch(savedStates[currentState], savedStates[newState]);
             currentState = newState;
 
             isRestoring = false;
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapDiffer.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
similarity index 93%
rename from osu.Game/Screens/Edit/LegacyEditorBeatmapDiffer.cs
rename to osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index c62f21bb39..17eba87076 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapDiffer.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -14,11 +14,14 @@ using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
 namespace osu.Game.Screens.Edit
 {
-    public class LegacyEditorBeatmapDiffer
+    /// <summary>
+    /// Patches an <see cref="EditorBeatmap"/> based on the difference between two legacy (.osu) states.
+    /// </summary>
+    public class LegacyEditorBeatmapPatcher
     {
         private readonly EditorBeatmap editorBeatmap;
 
-        public LegacyEditorBeatmapDiffer(EditorBeatmap editorBeatmap)
+        public LegacyEditorBeatmapPatcher(EditorBeatmap editorBeatmap)
         {
             this.editorBeatmap = editorBeatmap;
         }

From dd949a3fe09ebaa45143be64075efe89aafc08f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 17:52:04 +0900
Subject: [PATCH 02159/10326] Fix test writer flush happening too late

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

diff --git a/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs b/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
index 11c6399d19..c24418d688 100644
--- a/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
+++ b/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
@@ -324,9 +324,10 @@ namespace osu.Game.Tests.Editor
         private byte[] encode(IBeatmap beatmap)
         {
             using (var encoded = new MemoryStream())
-            using (var sw = new StreamWriter(encoded, leaveOpen: true))
             {
-                new LegacyBeatmapEncoder(beatmap).Encode(sw);
+                using (var sw = new StreamWriter(encoded))
+                    new LegacyBeatmapEncoder(beatmap).Encode(sw);
+
                 return encoded.ToArray();
             }
         }
@@ -334,7 +335,7 @@ namespace osu.Game.Tests.Editor
         private IBeatmap decode(byte[] state)
         {
             using (var stream = new MemoryStream(state))
-            using (var reader = new LineBufferedReader(stream, true))
+            using (var reader = new LineBufferedReader(stream))
                 return Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
         }
     }

From 409cda3cc0d5a8edeb8470a88648499bab9d511d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 08:53:21 +0000
Subject: [PATCH 02160/10326] Bump BenchmarkDotNet from 0.12.0 to 0.12.1

Bumps [BenchmarkDotNet](https://github.com/dotnet/BenchmarkDotNet) from 0.12.0 to 0.12.1.
- [Release notes](https://github.com/dotnet/BenchmarkDotNet/releases)
- [Commits](https://github.com/dotnet/BenchmarkDotNet/compare/v0.12.0...v0.12.1)

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

diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index f2e1c0ec3b..88fe8f1150 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
   </ItemGroup>

From b741e359cd5abf64d3428c3ff0da0e2ae1f1e436 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 13 Apr 2020 12:23:28 +0300
Subject: [PATCH 02161/10326] Use OverlayScrollContainer for overlays

---
 .../Graphics/Containers/SectionsContainer.cs  | 27 ++++++++++++-------
 osu.Game/Overlays/BeatmapListingOverlay.cs    |  2 +-
 osu.Game/Overlays/BeatmapSetOverlay.cs        |  4 +--
 osu.Game/Overlays/ChangelogOverlay.cs         |  2 +-
 osu.Game/Overlays/NewsOverlay.cs              |  2 +-
 osu.Game/Overlays/RankingsOverlay.cs          |  4 +--
 .../SearchableList/SearchableListOverlay.cs   |  2 +-
 osu.Game/Overlays/UserProfileOverlay.cs       |  2 ++
 8 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 07a50c39e1..24c61ad11c 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -19,7 +20,7 @@ namespace osu.Game.Graphics.Containers
         private Drawable expandableHeader, fixedHeader, footer, headerBackground;
         private readonly OsuScrollContainer scrollContainer;
         private readonly Container headerBackgroundContainer;
-        private readonly FlowContainer<T> scrollContentContainer;
+        private FlowContainer<T> scrollContentContainer;
 
         protected override Container<T> Content => scrollContentContainer;
 
@@ -125,20 +126,26 @@ namespace osu.Game.Graphics.Containers
 
         public SectionsContainer()
         {
-            AddInternal(scrollContainer = new OsuScrollContainer
+            AddRangeInternal(new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Masking = true,
-                ScrollbarVisible = false,
-                Children = new Drawable[] { scrollContentContainer = CreateScrollContentContainer() }
-            });
-            AddInternal(headerBackgroundContainer = new Container
-            {
-                RelativeSizeAxes = Axes.X
+                scrollContainer = CreateScrollContainer().With(s =>
+                {
+                    s.RelativeSizeAxes = Axes.Both;
+                    s.Masking = true;
+                    s.ScrollbarVisible = false;
+                    s.Children = new Drawable[] { scrollContentContainer = CreateScrollContentContainer() };
+                }),
+                headerBackgroundContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.X
+                }
             });
             originalSectionsMargin = scrollContentContainer.Margin;
         }
 
+        [NotNull]
+        protected virtual OsuScrollContainer CreateScrollContainer() => new OsuScrollContainer();
+
         public void ScrollTo(Drawable section) => scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - (FixedHeader?.BoundingBox.Height ?? 0));
 
         public void ScrollToTop() => scrollContainer.ScrollTo(0);
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 5bac5a5402..b450f33ee1 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays
                     RelativeSizeAxes = Axes.Both,
                     Colour = ColourProvider.Background6
                 },
-                new BasicScrollContainer
+                new OverlayScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarVisible = false,
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 0d16c4842d..3e23442023 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays
         public BeatmapSetOverlay()
             : base(OverlayColourScheme.Blue)
         {
-            OsuScrollContainer scroll;
+            OverlayScrollContainer scroll;
             Info info;
             CommentsSection comments;
 
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays
                 {
                     RelativeSizeAxes = Axes.Both
                 },
-                scroll = new OsuScrollContainer
+                scroll = new OverlayScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarVisible = false,
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index d13ac5c2de..726be9e194 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays
                     RelativeSizeAxes = Axes.Both,
                     Colour = ColourProvider.Background4,
                 },
-                new OsuScrollContainer
+                new OverlayScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarVisible = false,
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 71c205ff63..6c9477cbc4 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays
                     RelativeSizeAxes = Axes.Both,
                     Colour = colours.PurpleDarkAlternative
                 },
-                new OsuScrollContainer
+                new OverlayScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Child = new FillFlowContainer
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index afb23883ac..7b200d4226 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays
 
         protected Bindable<RankingsScope> Scope => header.Current;
 
-        private readonly BasicScrollContainer scrollFlow;
+        private readonly OverlayScrollContainer scrollFlow;
         private readonly Container contentContainer;
         private readonly LoadingLayer loading;
         private readonly Box background;
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays
                 {
                     RelativeSizeAxes = Axes.Both
                 },
-                scrollFlow = new BasicScrollContainer
+                scrollFlow = new OverlayScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarVisible = false,
diff --git a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
index d6174e0733..ebd12913f5 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Overlays.SearchableList
                     {
                         RelativeSizeAxes = Axes.Both,
                         Masking = true,
-                        Child = new OsuScrollContainer
+                        Child = new OverlayScrollContainer
                         {
                             RelativeSizeAxes = Axes.Both,
                             ScrollbarVisible = false,
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 6ec30f7707..b4c8a2d3ca 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -195,6 +195,8 @@ namespace osu.Game.Overlays
                 RelativeSizeAxes = Axes.Both;
             }
 
+            protected override OsuScrollContainer CreateScrollContainer() => new OverlayScrollContainer();
+
             protected override FlowContainer<ProfileSection> CreateScrollContentContainer() => new FillFlowContainer<ProfileSection>
             {
                 Direction = FillDirection.Vertical,

From 4c5d01a611ddc88cd847a2d91db27ff57bc3e037 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 13 Apr 2020 12:34:51 +0300
Subject: [PATCH 02162/10326] Remove unused usings

---
 osu.Game/Overlays/NewsOverlay.cs                          | 1 -
 osu.Game/Overlays/SearchableList/SearchableListOverlay.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 6c9477cbc4..46d692d44d 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.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.Containers;
 using osu.Game.Overlays.News;
 
 namespace osu.Game.Overlays
diff --git a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
index ebd12913f5..4ab2de06b6 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Backgrounds;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 
 namespace osu.Game.Overlays.SearchableList

From cee4b005e6a5ceb3e4af6380f73321205b9d9403 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Apr 2020 20:00:06 +0900
Subject: [PATCH 02163/10326] Fix custom sample set 0 not falling back to
 default samples

---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs          |  2 +-
 .../Objects/Legacy/ConvertHitObjectParser.cs        |  2 +-
 osu.Game/Skinning/LegacyBeatmapSkin.cs              | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 561707f9ef..90a5d0dcba 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Beatmaps.Formats
             {
                 var baseInfo = base.ApplyTo(hitSampleInfo);
 
-                if (string.IsNullOrEmpty(baseInfo.Suffix) && CustomSampleBank > 1)
+                if (string.IsNullOrEmpty(baseInfo.Suffix) && CustomSampleBank > 0)
                     baseInfo.Suffix = CustomSampleBank.ToString();
 
                 return baseInfo;
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 8d3ad5984f..8580cdede3 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -415,7 +415,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             {
                 set
                 {
-                    if (value > 1)
+                    if (value > 0)
                         Suffix = value.ToString();
                 }
             }
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 1190a330fe..c4636f46f5 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -2,8 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.IO.Stores;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Skinning
@@ -33,6 +35,17 @@ namespace osu.Game.Skinning
             return base.GetConfig<TLookup, TValue>(lookup);
         }
 
+        public override SampleChannel GetSample(ISampleInfo sampleInfo)
+        {
+            if (sampleInfo is HitSampleInfo hsi && string.IsNullOrEmpty(hsi.Suffix))
+            {
+                // When no custom sample set is provided, always fall-back to the default samples.
+                return null;
+            }
+
+            return base.GetSample(sampleInfo);
+        }
+
         private static SkinInfo createSkinInfo(BeatmapInfo beatmap) =>
             new SkinInfo { Name = beatmap.ToString(), Creator = beatmap.Metadata.Author.ToString() };
     }

From 58a7313091812597a622ff0f616fcd23a271febd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Apr 2020 20:09:17 +0900
Subject: [PATCH 02164/10326] Fix fallback for file hit samples

---
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 8580cdede3..1dca4a5c02 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -425,6 +425,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
         {
             public string Filename;
 
+            public FileHitSampleInfo()
+            {
+                // Has no effect since LookupNames is overridden, however prompts LegacyBeatmapSkin to not fallback.
+                Suffix = "0";
+            }
+
             public override IEnumerable<string> LookupNames => new[]
             {
                 Filename,

From 0be2dc9b2dee3eecb9fdac94a9f8e64745230d72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 20:12:51 +0900
Subject: [PATCH 02165/10326] Tidy up SectionsContainer class layout/ordering

---
 .../Graphics/Containers/SectionsContainer.cs  | 82 ++++++++++---------
 1 file changed, 43 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 24c61ad11c..a3125614aa 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -17,12 +17,7 @@ namespace osu.Game.Graphics.Containers
     public class SectionsContainer<T> : Container<T>
         where T : Drawable
     {
-        private Drawable expandableHeader, fixedHeader, footer, headerBackground;
-        private readonly OsuScrollContainer scrollContainer;
-        private readonly Container headerBackgroundContainer;
-        private FlowContainer<T> scrollContentContainer;
-
-        protected override Container<T> Content => scrollContentContainer;
+        public Bindable<T> SelectedSection { get; } = new Bindable<T>();
 
         public Drawable ExpandableHeader
         {
@@ -84,6 +79,7 @@ namespace osu.Game.Graphics.Containers
 
                 headerBackgroundContainer.Clear();
                 headerBackground = value;
+
                 if (value == null) return;
 
                 headerBackgroundContainer.Add(headerBackground);
@@ -92,37 +88,17 @@ namespace osu.Game.Graphics.Containers
             }
         }
 
-        public Bindable<T> SelectedSection { get; } = new Bindable<T>();
+        protected override Container<T> Content => scrollContentContainer;
 
-        protected virtual FlowContainer<T> CreateScrollContentContainer()
-            => new FillFlowContainer<T>
-            {
-                Direction = FillDirection.Vertical,
-                AutoSizeAxes = Axes.Y,
-                RelativeSizeAxes = Axes.X,
-            };
-
-        public override void Add(T drawable)
-        {
-            base.Add(drawable);
-            lastKnownScroll = float.NaN;
-            headerHeight = float.NaN;
-            footerHeight = float.NaN;
-        }
+        private readonly OsuScrollContainer scrollContainer;
+        private readonly Container headerBackgroundContainer;
+        private readonly MarginPadding originalSectionsMargin;
+        private Drawable expandableHeader, fixedHeader, footer, headerBackground;
+        private FlowContainer<T> scrollContentContainer;
 
         private float headerHeight, footerHeight;
-        private readonly MarginPadding originalSectionsMargin;
 
-        private void updateSectionsMargin()
-        {
-            if (!Children.Any()) return;
-
-            var newMargin = originalSectionsMargin;
-            newMargin.Top += headerHeight;
-            newMargin.Bottom += footerHeight;
-
-            scrollContentContainer.Margin = newMargin;
-        }
+        private float lastKnownScroll;
 
         public SectionsContainer()
         {
@@ -133,22 +109,41 @@ namespace osu.Game.Graphics.Containers
                     s.RelativeSizeAxes = Axes.Both;
                     s.Masking = true;
                     s.ScrollbarVisible = false;
-                    s.Children = new Drawable[] { scrollContentContainer = CreateScrollContentContainer() };
+                    s.Child = scrollContentContainer = CreateScrollContentContainer();
                 }),
                 headerBackgroundContainer = new Container
                 {
                     RelativeSizeAxes = Axes.X
                 }
             });
+
             originalSectionsMargin = scrollContentContainer.Margin;
         }
 
+        public override void Add(T drawable)
+        {
+            base.Add(drawable);
+            lastKnownScroll = float.NaN;
+            headerHeight = float.NaN;
+            footerHeight = float.NaN;
+        }
+
+        public void ScrollTo(Drawable section) =>
+            scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - (FixedHeader?.BoundingBox.Height ?? 0));
+
+        public void ScrollToTop() => scrollContainer.ScrollTo(0);
+
         [NotNull]
         protected virtual OsuScrollContainer CreateScrollContainer() => new OsuScrollContainer();
 
-        public void ScrollTo(Drawable section) => scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - (FixedHeader?.BoundingBox.Height ?? 0));
-
-        public void ScrollToTop() => scrollContainer.ScrollTo(0);
+        [NotNull]
+        protected virtual FlowContainer<T> CreateScrollContentContainer() =>
+            new FillFlowContainer<T>
+            {
+                Direction = FillDirection.Vertical,
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+            };
 
         protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
         {
@@ -163,8 +158,6 @@ namespace osu.Game.Graphics.Containers
             return result;
         }
 
-        private float lastKnownScroll;
-
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
@@ -215,5 +208,16 @@ namespace osu.Game.Graphics.Containers
                     SelectedSection.Value = bestMatch;
             }
         }
+
+        private void updateSectionsMargin()
+        {
+            if (!Children.Any()) return;
+
+            var newMargin = originalSectionsMargin;
+            newMargin.Top += headerHeight;
+            newMargin.Bottom += footerHeight;
+
+            scrollContentContainer.Margin = newMargin;
+        }
     }
 }

From 2388799acfb8a781894d2c41de06c7f25b92bccb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 20:34:18 +0900
Subject: [PATCH 02166/10326] Limit upper number of editor beatmap states saved
 to 50

---
 .../Editor/EditorChangeHandlerTest.cs         | 71 +++++++++++++++++++
 osu.Game/Screens/Edit/EditorChangeHandler.cs  |  7 ++
 2 files changed, 78 insertions(+)
 create mode 100644 osu.Game.Tests/Editor/EditorChangeHandlerTest.cs

diff --git a/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs
new file mode 100644
index 0000000000..ef16976130
--- /dev/null
+++ b/osu.Game.Tests/Editor/EditorChangeHandlerTest.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 NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Edit;
+
+namespace osu.Game.Tests.Editor
+{
+    [TestFixture]
+    public class EditorChangeHandlerTest
+    {
+        [Test]
+        public void TestSaveRestoreState()
+        {
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
+
+            Assert.That(handler.HasUndoState, Is.False);
+
+            handler.SaveState();
+
+            Assert.That(handler.HasUndoState, Is.True);
+
+            handler.RestoreState(-1);
+
+            Assert.That(handler.HasUndoState, Is.False);
+        }
+
+        [Test]
+        public void TestMaxStatesSaved()
+        {
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
+
+            Assert.That(handler.HasUndoState, Is.False);
+
+            for (int i = 0; i < EditorChangeHandler.MAX_SAVED_STATES; i++)
+                handler.SaveState();
+
+            Assert.That(handler.HasUndoState, Is.True);
+
+            for (int i = 0; i < EditorChangeHandler.MAX_SAVED_STATES; i++)
+            {
+                Assert.That(handler.HasUndoState, Is.True);
+                handler.RestoreState(-1);
+            }
+
+            Assert.That(handler.HasUndoState, Is.False);
+        }
+
+        [Test]
+        public void TestMaxStatesExceeded()
+        {
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
+
+            Assert.That(handler.HasUndoState, Is.False);
+
+            for (int i = 0; i < EditorChangeHandler.MAX_SAVED_STATES * 2; i++)
+                handler.SaveState();
+
+            Assert.That(handler.HasUndoState, Is.True);
+
+            for (int i = 0; i < EditorChangeHandler.MAX_SAVED_STATES; i++)
+            {
+                Assert.That(handler.HasUndoState, Is.True);
+                handler.RestoreState(-1);
+            }
+
+            Assert.That(handler.HasUndoState, Is.False);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 00a27801f4..a8204715cd 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Screens.Edit
         private int bulkChangesStarted;
         private bool isRestoring;
 
+        public const int MAX_SAVED_STATES = 50;
+
         /// <summary>
         /// Creates a new <see cref="EditorChangeHandler"/>.
         /// </summary>
@@ -43,6 +45,8 @@ namespace osu.Game.Screens.Edit
             SaveState();
         }
 
+        public bool HasUndoState => currentState > 0;
+
         private void hitObjectAdded(HitObject obj) => SaveState();
 
         private void hitObjectRemoved(HitObject obj) => SaveState();
@@ -74,6 +78,9 @@ namespace osu.Game.Screens.Edit
             if (currentState < savedStates.Count - 1)
                 savedStates.RemoveRange(currentState + 1, savedStates.Count - currentState - 1);
 
+            if (savedStates.Count > MAX_SAVED_STATES)
+                savedStates.RemoveAt(0);
+
             using (var stream = new MemoryStream())
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))

From 1c8a71b2842dd90ff1cdfc1c4d4cd3595a618925 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 21:24:47 +0900
Subject: [PATCH 02167/10326] Exception instead of assert

---
 osu.Game/Online/API/APIRequest.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 6abb388c01..47600e4f68 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using osu.Framework.Logging;
@@ -32,8 +31,8 @@ namespace osu.Game.Online.API
 
         internal void TriggerSuccess(T result)
         {
-            // disallow calling twice
-            Debug.Assert(Result == null);
+            if (Result != null)
+                throw new InvalidOperationException("Attempted to trigger success more than once");
 
             Result = result;
             Success?.Invoke(result);

From 89d806358809b62ca0c8b81ec77abbc412ae8cbe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 21:35:35 +0900
Subject: [PATCH 02168/10326] Add support for Perform/PerformAsync

---
 .../Online/TestDummyAPIRequestHandling.cs     | 63 ++++++++++++++++---
 osu.Game/Online/API/DummyAPIAccess.cs         |  8 ++-
 2 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
index b00b63f6d5..5ef01d5702 100644
--- a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
+++ b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
@@ -43,17 +43,9 @@ namespace osu.Game.Tests.Online
         }
 
         [Test]
-        public void TestRequestHandling()
+        public void TestQueueRequestHandling()
         {
-            AddStep("register request handling", () => ((DummyAPIAccess)API).HandleRequest = req =>
-            {
-                switch (req)
-                {
-                    case LeaveChannelRequest cRequest:
-                        cRequest.TriggerSuccess();
-                        break;
-                }
-            });
+            registerHandler();
 
             LeaveChannelRequest request;
             bool gotResponse = false;
@@ -68,5 +60,56 @@ namespace osu.Game.Tests.Online
 
             AddAssert("response event fired", () => gotResponse);
         }
+
+        [Test]
+        public void TestPerformRequestHandling()
+        {
+            registerHandler();
+
+            LeaveChannelRequest request;
+            bool gotResponse = false;
+
+            AddStep("fire request", () =>
+            {
+                gotResponse = false;
+                request = new LeaveChannelRequest(new Channel(), new User());
+                request.Success += () => gotResponse = true;
+                API.Perform(request);
+            });
+
+            AddAssert("response event fired", () => gotResponse);
+        }
+
+        [Test]
+        public void TestPerformAsyncRequestHandling()
+        {
+            registerHandler();
+
+            LeaveChannelRequest request;
+            bool gotResponse = false;
+
+            AddStep("fire request", () =>
+            {
+                gotResponse = false;
+                request = new LeaveChannelRequest(new Channel(), new User());
+                request.Success += () => gotResponse = true;
+                API.PerformAsync(request);
+            });
+
+            AddAssert("response event fired", () => gotResponse);
+        }
+
+        private void registerHandler()
+        {
+            AddStep("register request handling", () => ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case LeaveChannelRequest cRequest:
+                        cRequest.TriggerSuccess();
+                        break;
+                }
+            });
+        }
     }
 }
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index fa5ad115d2..7800241904 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -64,9 +64,13 @@ namespace osu.Game.Online.API
             HandleRequest?.Invoke(request);
         }
 
-        public void Perform(APIRequest request) { }
+        public void Perform(APIRequest request) => HandleRequest?.Invoke(request);
 
-        public Task PerformAsync(APIRequest request) => Task.CompletedTask;
+        public Task PerformAsync(APIRequest request)
+        {
+            HandleRequest?.Invoke(request);
+            return Task.CompletedTask;
+        }
 
         public void Register(IOnlineComponent component)
         {

From 4cfc6866835d4d92f2c6f03cd4bfeaa47c845c76 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Apr 2020 21:41:18 +0900
Subject: [PATCH 02169/10326] Fix excption with 0 control points

---
 .../Sliders/Components/PathControlPointConnectionPiece.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
index 9c620ecb2f..ba1d35c35c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             path.ClearVertices();
 
             int nextIndex = controlPointIndex + 1;
-            if (nextIndex == 0 || nextIndex == slider.Path.ControlPoints.Count)
+            if (nextIndex == 0 || nextIndex >= slider.Path.ControlPoints.Count)
                 return;
 
             path.AddVertex(Vector2.Zero);

From 2b2ab2bf1929d3b6d730d579b73b1bc39e2220e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 21:59:23 +0900
Subject: [PATCH 02170/10326] Show new segments as red points even when hovered

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 092a13cca5..fed149b5c5 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.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;
@@ -51,6 +52,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             this.slider = slider;
             ControlPoint = controlPoint;
 
+            controlPoint.Type.BindValueChanged(_ => updateMarkerDisplay());
+
             Origin = Anchor.Centre;
             AutoSizeAxes = Axes.Both;
 
@@ -183,8 +186,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             markerRing.Alpha = IsSelected.Value ? 1 : 0;
 
             Color4 colour = ControlPoint.Type.Value != null ? colours.Red : colours.Yellow;
+
             if (IsHovered || IsSelected.Value)
-                colour = Color4.White;
+                colour = colour.Lighten(1);
+
             marker.Colour = colour;
         }
     }

From 13812fef4c1af988e1d292e43d96e20dc17b0784 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Mon, 13 Apr 2020 17:28:02 +0300
Subject: [PATCH 02171/10326] Replace BindTo with setting the bindable

---
 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 51f5b2ae4f..dfcaf5ded6 100644
--- a/osu.Game/Overlays/Direct/PanelDownloadButton.cs
+++ b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Direct
 
         private readonly ShakeContainer shakeContainer;
         private readonly DownloadButton button;
-        private readonly BindableBool noVideoSetting = new BindableBool();
+        private Bindable<bool> noVideoSetting;
 
         public PanelDownloadButton(BeatmapSetInfo beatmapSet)
             : base(beatmapSet)
@@ -51,7 +51,7 @@ namespace osu.Game.Overlays.Direct
                 return;
             }
 
-            noVideoSetting.BindTo(osuConfig.GetBindable<bool>(OsuSetting.PreferNoVideo));
+            noVideoSetting = osuConfig.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
             button.Action = () =>
             {

From 3e48c26bc24eedfdc2fe0a8a6ac01f5377648ca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 14 Apr 2020 00:54:02 +0200
Subject: [PATCH 02172/10326] Add failing tests

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
new file mode 100644
index 0000000000..64d1024efb
--- /dev/null
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Beatmaps;
+
+namespace osu.Game.Tests.Rulesets.Scoring
+{
+    public class ScoreProcessorTest
+    {
+        private ScoreProcessor scoreProcessor;
+        private IBeatmap beatmap;
+
+        [SetUp]
+        public void SetUp()
+        {
+            scoreProcessor = new ScoreProcessor();
+            beatmap = new TestBeatmap(new RulesetInfo())
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle()
+                }
+            };
+        }
+
+        [TestCase(ScoringMode.Standardised, HitResult.Meh, 750_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.Good, 800_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.Great, 1_000_000)]
+        [TestCase(ScoringMode.Classic, HitResult.Meh, 50)]
+        [TestCase(ScoringMode.Classic, HitResult.Good, 100)]
+        [TestCase(ScoringMode.Classic, HitResult.Great, 300)]
+        public void TestSingleOsuHit(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
+        {
+            scoreProcessor.Mode.Value = scoringMode;
+            scoreProcessor.ApplyBeatmap(beatmap);
+
+            var judgementResult = new JudgementResult(beatmap.HitObjects.Single(), new OsuJudgement())
+            {
+                Type = hitResult
+            };
+            scoreProcessor.ApplyResult(judgementResult);
+
+            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
+        }
+    }
+}

From 13c81db0cf90fcb1db1909a20aa753c23884faea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 14 Apr 2020 00:56:37 +0200
Subject: [PATCH 02173/10326] Fix incorrect classic score formula

Upon closer inspection the classic score formula was subtly wrong. The
version given in the wiki is:

	Score = Hit Value + (Hit Value * ((Combo multiplier * Difficulty
	multiplier * Mod multiplier) / 25))

The code previously used:

	bonusScore + baseScore * ((1 + Math.Max(0, HighestCombo.Value - 1)
	* scoreMultiplier) / 25);

which is not equivalent to the version on the wiki. The error is in the 1
factor, as in the above version it is being divided by 25, while it should
be outside the division to keep parity with the previous formula.

The tests attached in the previous commit demonstrate that this change
causes a single hit without combo to increase total score by its exact
numeric value.
---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 8eafaa88ec..1f40f44dce 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Rulesets.Scoring
 
                 case ScoringMode.Classic:
                     // should emulate osu-stable's scoring as closely as we can (https://osu.ppy.sh/help/wiki/Score/ScoreV1)
-                    return bonusScore + baseScore * ((1 + Math.Max(0, HighestCombo.Value - 1) * scoreMultiplier) / 25);
+                    return bonusScore + baseScore * (1 + Math.Max(0, HighestCombo.Value - 1) * scoreMultiplier / 25);
             }
         }
 

From 5f13dc81bed4d90e9fd43c5a3e96573de00951dd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Tue, 14 Apr 2020 04:38:18 +0300
Subject: [PATCH 02174/10326] Remove no longer necessary extensions

---
 .../Skinning/CatchSkinExtensions.cs           | 20 -------------------
 .../Skinning/LegacyFruitPiece.cs              |  9 ++++++---
 2 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
deleted file mode 100644
index 718b22a0fb..0000000000
--- a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
+++ /dev/null
@@ -1,20 +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 JetBrains.Annotations;
-using osu.Framework.Bindables;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Skinning;
-using osuTK.Graphics;
-
-namespace osu.Game.Rulesets.Catch.Skinning
-{
-    internal static class CatchSkinExtensions
-    {
-        [NotNull]
-        public static IBindable<Color4> GetHyperDashFruitColour(this ISkin skin)
-            => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit) ??
-               skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash) ??
-               new Bindable<Color4>(Catcher.DEFAULT_HYPER_DASH_COLOUR);
-    }
-}
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 470c12559e..5be54d3882 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
@@ -55,14 +56,16 @@ namespace osu.Game.Rulesets.Catch.Skinning
             {
                 var hyperDash = new Sprite
                 {
-                    Texture = skin.GetTexture(lookupName),
-                    Colour = skin.GetHyperDashFruitColour().Value,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Blending = BlendingParameters.Additive,
                     Depth = 1,
                     Alpha = 0.7f,
-                    Scale = new Vector2(1.2f)
+                    Scale = new Vector2(1.2f),
+                    Texture = skin.GetTexture(lookupName),
+                    Colour = skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??
+                             skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
+                             Catcher.DEFAULT_HYPER_DASH_COLOUR,
                 };
 
                 AddInternal(hyperDash);

From c5f8bbb25fe55fd89af091ce27b8f5ba27aaa9f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Apr 2020 11:56:37 +0900
Subject: [PATCH 02175/10326] Fix beatmap background not displaying when video
 is present

---
 osu.Game/Storyboards/Storyboard.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index a1ddafbacf..d13c874ee2 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -47,9 +47,6 @@ namespace osu.Game.Storyboards
                 if (backgroundPath == null)
                     return false;
 
-                if (GetLayer("Video").Elements.Any())
-                    return true;
-
                 return GetLayer("Background").Elements.Any(e => e.Path.ToLowerInvariant() == backgroundPath);
             }
         }

From 3c5fb7982351a86964b3fa65c515c61f36b4d9e8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 14:51:09 +0900
Subject: [PATCH 02176/10326] Mark dummy api test scene as headless

---
 osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
index 5ef01d5702..1e77d50115 100644
--- a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
+++ b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Testing;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -11,6 +12,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Online
 {
+    [HeadlessTest]
     public class TestDummyAPIRequestHandling : OsuTestScene
     {
         [Test]

From 9619fb9f6a5fa140b3bbf0226cf12c879619c66e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 15:00:36 +0900
Subject: [PATCH 02177/10326] Remove bind in Player

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index f1df69c5db..4597ae760c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -27,7 +27,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Scoring.Legacy;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
@@ -207,9 +206,6 @@ namespace osu.Game.Screens.Play
             foreach (var mod in Mods.Value.OfType<IApplicableToHealthProcessor>())
                 mod.ApplyToHealthProcessor(HealthProcessor);
 
-            foreach (var overlay in DrawableRuleset.Overlays.OfType<HealthDisplay>())
-                overlay.BindHealthProcessor(HealthProcessor);
-
             breakTracker.IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
         }
 

From 7d2d0785fd0cda708e8cfe0ecf867c7eb6214bb6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 15:07:32 +0900
Subject: [PATCH 02178/10326] Fix potential unsafe ordering of binds

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index a1188343ac..aa15c1fd45 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -26,7 +26,8 @@ namespace osu.Game.Screens.Play.HUD
 
         private const int fade_time = 400;
 
-        private Bindable<bool> enabled;
+        private readonly Bindable<bool> enabled = new Bindable<bool>();
+        private Bindable<bool> configEnabled;
 
         /// <summary>
         /// The threshold under which the current player life should be considered low and the layer should start fading in.
@@ -36,6 +37,7 @@ namespace osu.Game.Screens.Play.HUD
         private const float gradient_size = 0.3f;
 
         private readonly Container boxes;
+        private HealthProcessor healthProcessor;
 
         public FailingLayer()
         {
@@ -73,16 +75,29 @@ namespace osu.Game.Screens.Play.HUD
         {
             boxes.Colour = color.Red;
 
-            enabled = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
+            configEnabled = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
             enabled.BindValueChanged(e => this.FadeTo(e.NewValue ? 1 : 0, fade_time, Easing.OutQuint), true);
+
+            updateBindings();
         }
 
         public override void BindHealthProcessor(HealthProcessor processor)
         {
             base.BindHealthProcessor(processor);
 
-            // don't display ever if the ruleset is not using a draining health display.
-            if (!(processor is DrainingHealthProcessor))
+            healthProcessor = processor;
+            updateBindings();
+        }
+
+        private void updateBindings()
+        {
+            if (configEnabled == null || healthProcessor == null)
+                return;
+
+            // Don't display ever if the ruleset is not using a draining health display.
+            if (healthProcessor is DrainingHealthProcessor)
+                enabled.BindTo(configEnabled);
+            else
             {
                 enabled.UnbindBindings();
                 enabled.Value = false;

From 3183827329e477c8edb138f0f3930fcc450bf8a8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 15:09:31 +0900
Subject: [PATCH 02179/10326] Reorder fields

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index aa15c1fd45..cea85af112 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -23,20 +23,18 @@ namespace osu.Game.Screens.Play.HUD
     public class FailingLayer : HealthDisplay
     {
         private const float max_alpha = 0.4f;
-
         private const int fade_time = 400;
-
-        private readonly Bindable<bool> enabled = new Bindable<bool>();
-        private Bindable<bool> configEnabled;
+        private const float gradient_size = 0.3f;
 
         /// <summary>
         /// The threshold under which the current player life should be considered low and the layer should start fading in.
         /// </summary>
         public double LowHealthThreshold = 0.20f;
 
-        private const float gradient_size = 0.3f;
-
+        private readonly Bindable<bool> enabled = new Bindable<bool>();
         private readonly Container boxes;
+
+        private Bindable<bool> configEnabled;
         private HealthProcessor healthProcessor;
 
         public FailingLayer()

From b8b334ca27d853b81bf86eeb93d29a91d3ca4f34 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 15:21:56 +0900
Subject: [PATCH 02180/10326] Always unbind bindings

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index cea85af112..cb8b5c1a9d 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -92,14 +92,13 @@ namespace osu.Game.Screens.Play.HUD
             if (configEnabled == null || healthProcessor == null)
                 return;
 
+            enabled.UnbindBindings();
+
             // Don't display ever if the ruleset is not using a draining health display.
             if (healthProcessor is DrainingHealthProcessor)
                 enabled.BindTo(configEnabled);
             else
-            {
-                enabled.UnbindBindings();
                 enabled.Value = false;
-            }
         }
 
         protected override void Update()

From 59728ffebddcdb47c121d7eaf3b1f80687f0e63a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 15:24:34 +0900
Subject: [PATCH 02181/10326] Fix up/improve test scene

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs           | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index d831ea1835..a95e806862 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -20,7 +20,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("create layer", () => Child = layer = new FailingLayer());
+            AddStep("create layer", () =>
+            {
+                Child = layer = new FailingLayer();
+                layer.BindHealthProcessor(new DrainingHealthProcessor(1));
+            });
+
             AddStep("enable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer is visible", () => layer.IsPresent);
         }
@@ -44,6 +49,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestLayerDisabledViaConfig()
         {
             AddStep("disable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddUntilStep("layer is not visible", () => !layer.IsPresent);
         }
 
@@ -51,6 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestLayerVisibilityWithAccumulatingProcessor()
         {
             AddStep("bind accumulating processor", () => layer.BindHealthProcessor(new AccumulatingHealthProcessor(1)));
+            AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddUntilStep("layer is not visible", () => !layer.IsPresent);
         }
 
@@ -58,6 +65,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestLayerVisibilityWithDrainingProcessor()
         {
             AddStep("bind accumulating processor", () => layer.BindHealthProcessor(new DrainingHealthProcessor(1)));
+            AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddWaitStep("wait for potential fade", 10);
             AddAssert("layer is still visible", () => layer.IsPresent);
         }

From f3dbddd75ca735dfb75fb34efb15a2f14370a440 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 15:52:38 +0900
Subject: [PATCH 02182/10326] Update bindings in LoadComplete()

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index cb8b5c1a9d..a49aa89a7c 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -75,7 +75,11 @@ namespace osu.Game.Screens.Play.HUD
 
             configEnabled = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
             enabled.BindValueChanged(e => this.FadeTo(e.NewValue ? 1 : 0, fade_time, Easing.OutQuint), true);
+        }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
             updateBindings();
         }
 
@@ -89,7 +93,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updateBindings()
         {
-            if (configEnabled == null || healthProcessor == null)
+            if (LoadState < LoadState.Ready)
                 return;
 
             enabled.UnbindBindings();

From 7f95418262d84096ea2afb38896d674170f9942e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Apr 2020 16:52:17 +0900
Subject: [PATCH 02183/10326] Fix osu!mania replays actuating incorrect keys
 when multiple stages are involved

---
 .../ManiaLegacyReplayTest.cs                  | 51 ++++++++++++
 .../Replays/ManiaReplayFrame.cs               | 83 ++++++++++++++++---
 2 files changed, 121 insertions(+), 13 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs
new file mode 100644
index 0000000000..40bb83aece
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs
@@ -0,0 +1,51 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Replays;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class ManiaLegacyReplayTest
+    {
+        [TestCase(ManiaAction.Key1)]
+        [TestCase(ManiaAction.Key1, ManiaAction.Key2)]
+        [TestCase(ManiaAction.Special1)]
+        [TestCase(ManiaAction.Key8)]
+        public void TestEncodeDecodeSingleStage(params ManiaAction[] actions)
+        {
+            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 9 });
+
+            var frame = new ManiaReplayFrame(0, actions);
+            var legacyFrame = frame.ToLegacy(beatmap);
+
+            var decodedFrame = new ManiaReplayFrame();
+            decodedFrame.FromLegacy(legacyFrame, beatmap);
+
+            Assert.That(decodedFrame.Actions, Is.EquivalentTo(frame.Actions));
+        }
+
+        [TestCase(ManiaAction.Key1)]
+        [TestCase(ManiaAction.Key1, ManiaAction.Key2)]
+        [TestCase(ManiaAction.Special1)]
+        [TestCase(ManiaAction.Special2)]
+        [TestCase(ManiaAction.Special1, ManiaAction.Special2)]
+        [TestCase(ManiaAction.Special1, ManiaAction.Key5)]
+        [TestCase(ManiaAction.Key8)]
+        public void TestEncodeDecodeDualStage(params ManiaAction[] actions)
+        {
+            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 5 });
+            beatmap.Stages.Add(new StageDefinition { Columns = 5 });
+
+            var frame = new ManiaReplayFrame(0, actions);
+            var legacyFrame = frame.ToLegacy(beatmap);
+
+            var decodedFrame = new ManiaReplayFrame();
+            decodedFrame.FromLegacy(legacyFrame, beatmap);
+
+            Assert.That(decodedFrame.Actions, Is.EquivalentTo(frame.Actions));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
index 8c73c36e99..0059a78a44 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
@@ -1,8 +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 osu.Game.Beatmaps;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Replays
 
             while (activeColumns > 0)
             {
-                var isSpecial = maniaBeatmap.Stages.First().IsSpecialColumn(counter);
+                bool isSpecial = isColumnAtIndexSpecial(maniaBeatmap, counter);
 
                 if ((activeColumns & 1) > 0)
                     Actions.Add(isSpecial ? specialAction : normalAction);
@@ -58,33 +58,90 @@ namespace osu.Game.Rulesets.Mania.Replays
 
             int keys = 0;
 
-            var specialColumns = new List<int>();
-
-            for (int i = 0; i < maniaBeatmap.TotalColumns; i++)
-            {
-                if (maniaBeatmap.Stages.First().IsSpecialColumn(i))
-                    specialColumns.Add(i);
-            }
-
             foreach (var action in Actions)
             {
                 switch (action)
                 {
                     case ManiaAction.Special1:
-                        keys |= 1 << specialColumns[0];
+                        keys |= 1 << getSpecialColumnIndex(maniaBeatmap, 0);
                         break;
 
                     case ManiaAction.Special2:
-                        keys |= 1 << specialColumns[1];
+                        keys |= 1 << getSpecialColumnIndex(maniaBeatmap, 1);
                         break;
 
                     default:
-                        keys |= 1 << (action - ManiaAction.Key1);
+                        // the index in lazer, which doesn't include special keys.
+                        int nonSpecialKeyIndex = action - ManiaAction.Key1;
+
+                        int overallIndex = 0;
+
+                        // iterate to find the index including special keys.
+                        while (true)
+                        {
+                            if (!isColumnAtIndexSpecial(maniaBeatmap, overallIndex))
+                            {
+                                // found a non-special column we could use.
+                                if (nonSpecialKeyIndex == 0)
+                                    break;
+
+                                // found a non-special column but not ours.
+                                nonSpecialKeyIndex--;
+                            }
+
+                            overallIndex++;
+                        }
+
+                        keys |= 1 << overallIndex;
                         break;
                 }
             }
 
             return new LegacyReplayFrame(Time, keys, null, ReplayButtonState.None);
         }
+
+        /// <summary>
+        /// Find the overall index (across all stages) for a specified special key.
+        /// </summary>
+        /// <param name="maniaBeatmap">The beatmap.</param>
+        /// <param name="specialOffset">The special key offset (0 is S1).</param>
+        /// <returns>The overall index for the special column.</returns>
+        private int getSpecialColumnIndex(ManiaBeatmap maniaBeatmap, int specialOffset)
+        {
+            for (int i = 0; i < maniaBeatmap.TotalColumns; i++)
+            {
+                if (isColumnAtIndexSpecial(maniaBeatmap, i))
+                {
+                    if (specialOffset == 0)
+                        return i;
+
+                    specialOffset--;
+                }
+            }
+
+            throw new InvalidOperationException("Special key index too high");
+        }
+
+        /// <summary>
+        /// Check whether the column at an overall index (across all stages) is a special column.
+        /// </summary>
+        /// <param name="beatmap">The beatmap.</param>
+        /// <param name="index">The overall index to check.</param>
+        /// <returns></returns>
+        private bool isColumnAtIndexSpecial(ManiaBeatmap beatmap, int index)
+        {
+            foreach (var stage in beatmap.Stages)
+            {
+                for (int stageIndex = 0; stageIndex < stage.Columns; stageIndex++)
+                {
+                    if (index == 0)
+                        return stage.IsSpecialColumn(stageIndex);
+
+                    index--;
+                }
+            }
+
+            return false;
+        }
     }
 }

From 69352214637b9b5ef6f7e9d56da30da98455584a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 21:05:07 +0900
Subject: [PATCH 02184/10326] Improve logic for CSB transfer

---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    |  8 ++++--
 .../Objects/Legacy/ConvertHitObjectParser.cs  | 28 ++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 90a5d0dcba..5b2b213322 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -8,6 +8,7 @@ using osu.Framework.Logging;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.IO;
+using osu.Game.Rulesets.Objects.Legacy;
 using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.Formats
@@ -168,8 +169,11 @@ namespace osu.Game.Beatmaps.Formats
             {
                 var baseInfo = base.ApplyTo(hitSampleInfo);
 
-                if (string.IsNullOrEmpty(baseInfo.Suffix) && CustomSampleBank > 0)
-                    baseInfo.Suffix = CustomSampleBank.ToString();
+                if (baseInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy
+                    && legacy.CustomSampleBank == 0)
+                {
+                    legacy.CustomSampleBank = CustomSampleBank;
+                }
 
                 return baseInfo;
             }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 1dca4a5c02..95cbf3ab40 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -409,26 +409,46 @@ namespace osu.Game.Rulesets.Objects.Legacy
             public SampleBankInfo Clone() => (SampleBankInfo)MemberwiseClone();
         }
 
-        private class LegacyHitSampleInfo : HitSampleInfo
+        internal class LegacyHitSampleInfo : HitSampleInfo
         {
+            private int customSampleBank;
+
             public int CustomSampleBank
             {
+                get => customSampleBank;
                 set
                 {
+                    customSampleBank = value;
+
+                    // A 0 custom sample bank should cause LegacyBeatmapSkin to always fall back to the user skin. This is done by giving a null suffix.
                     if (value > 0)
                         Suffix = value.ToString();
                 }
             }
+
+            public override IEnumerable<string> LookupNames
+            {
+                get
+                {
+                    // The lookup should only contain the suffix for custom sample bank 2 and beyond.
+                    // For custom sample bank 1 and 0, the lookup should not contain the suffix as only the lookup source (beatmap or user skin) is changed.
+                    if (CustomSampleBank >= 2)
+                        yield return $"{Bank}-{Name}{Suffix}";
+
+                    yield return $"{Bank}-{Name}";
+                }
+            }
         }
 
-        private class FileHitSampleInfo : HitSampleInfo
+        private class FileHitSampleInfo : LegacyHitSampleInfo
         {
             public string Filename;
 
             public FileHitSampleInfo()
             {
-                // Has no effect since LookupNames is overridden, however prompts LegacyBeatmapSkin to not fallback.
-                Suffix = "0";
+                // Make sure that the LegacyBeatmapSkin does not fall back to the user skin.
+                // Note that this does not change the lookup names, as they are overridden locally.
+                CustomSampleBank = 1;
             }
 
             public override IEnumerable<string> LookupNames => new[]

From b29957798f38c28f3940649ecc13be0ca1ee5b8e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 21:05:42 +0900
Subject: [PATCH 02185/10326] Fix no audiomanager in test scene working beatmap

---
 osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs | 6 ++++--
 osu.Game/Tests/Visual/OsuTestScene.cs         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
index 6db34af20c..8f8afb87d4 100644
--- a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.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.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
@@ -18,8 +19,9 @@ namespace osu.Game.Tests.Beatmaps
         /// </summary>
         /// <param name="beatmap">The beatmap.</param>
         /// <param name="storyboard">An optional storyboard.</param>
-        public TestWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-            : base(beatmap.BeatmapInfo, null)
+        /// <param name="audioManager">The <see cref="AudioManager"/>.</param>
+        public TestWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null, AudioManager audioManager = null)
+            : base(beatmap.BeatmapInfo, audioManager)
         {
             this.beatmap = beatmap;
             this.storyboard = storyboard;
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index d1d8059cb1..5dc8714c07 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -179,7 +179,7 @@ namespace osu.Game.Tests.Visual
             /// <param name="audio">Audio manager. Required if a reference clock isn't provided.</param>
             /// <param name="length">The length of the returned virtual track.</param>
             public ClockBackedTestWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio, double length = 60000)
-                : base(beatmap, storyboard)
+                : base(beatmap, storyboard, audio)
             {
                 if (referenceClock != null)
                 {

From 00d564d29cafc4b4319e7165de2d5a5210c9d083 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 21:05:54 +0900
Subject: [PATCH 02186/10326] Add tests

---
 .../Gameplay/TestSceneHitObjectSamples.cs     | 344 ++++++++++++++++++
 .../controlpoint-beatmap-custom-sample.osu    |   7 +
 .../controlpoint-beatmap-sample.osu           |   7 +
 .../controlpoint-skin-sample.osu              |   7 +
 .../SampleLookups/file-beatmap-sample.osu     |   4 +
 ...tobject-beatmap-custom-sample-override.osu |   7 +
 .../hitobject-beatmap-custom-sample.osu       |   4 +
 .../hitobject-beatmap-sample.osu              |   4 +
 .../SampleLookups/hitobject-skin-sample.osu   |   4 +
 9 files changed, 388 insertions(+)
 create mode 100644 osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
 create mode 100644 osu.Game.Tests/Resources/SampleLookups/controlpoint-beatmap-custom-sample.osu
 create mode 100644 osu.Game.Tests/Resources/SampleLookups/controlpoint-beatmap-sample.osu
 create mode 100644 osu.Game.Tests/Resources/SampleLookups/controlpoint-skin-sample.osu
 create mode 100644 osu.Game.Tests/Resources/SampleLookups/file-beatmap-sample.osu
 create mode 100644 osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample-override.osu
 create mode 100644 osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample.osu
 create mode 100644 osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-sample.osu
 create mode 100644 osu.Game.Tests/Resources/SampleLookups/hitobject-skin-sample.osu

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
new file mode 100644
index 0000000000..f80ea3ae88
--- /dev/null
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -0,0 +1,344 @@
+// Copyright (c) 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;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.IO.Stores;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Skinning;
+using osu.Game.Storyboards;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Gameplay
+{
+    public class TestSceneHitObjectSamples : PlayerTestScene
+    {
+        private readonly SkinInfo userSkinInfo = new SkinInfo();
+
+        private readonly BeatmapInfo beatmapInfo = new BeatmapInfo
+        {
+            BeatmapSet = new BeatmapSetInfo(),
+            Metadata = new BeatmapMetadata
+            {
+                Author = User.SYSTEM_USER
+            }
+        };
+
+        private readonly TestResourceStore userSkinResourceStore = new TestResourceStore();
+        private readonly TestResourceStore beatmapSkinResourceStore = new TestResourceStore();
+
+        protected override bool HasCustomSteps => true;
+
+        public TestSceneHitObjectSamples()
+            : base(new OsuRuleset())
+        {
+        }
+
+        private SkinSourceDependencyContainer dependencies;
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            => new DependencyContainer(dependencies = new SkinSourceDependencyContainer(base.CreateChildDependencies(parent)));
+
+        /// <summary>
+        /// Tests that a hitobject which provides no custom sample set retrieves samples from the user skin.
+        /// </summary>
+        [Test]
+        public void TestDefaultSampleFromUserSkin()
+        {
+            const string expected_sample = "normal-hitnormal";
+
+            setupSkins(expected_sample, expected_sample);
+
+            createTestWithBeatmap("hitobject-skin-sample.osu");
+
+            assertUserLookup(expected_sample);
+        }
+
+        /// <summary>
+        /// Tests that a hitobject which provides a sample set of 1 retrieves samples from the beatmap skin.
+        /// </summary>
+        [Test]
+        public void TestDefaultSampleFromBeatmap()
+        {
+            const string expected_sample = "normal-hitnormal";
+
+            setupSkins(expected_sample, expected_sample);
+
+            createTestWithBeatmap("hitobject-beatmap-sample.osu");
+
+            assertBeatmapLookup(expected_sample);
+        }
+
+        /// <summary>
+        /// Tests that a hitobject which provides a sample set of 1 retrieves samples from the user skin when the beatmap does not contain the sample.
+        /// </summary>
+        [Test]
+        public void TestDefaultSampleFromUserSkinFallback()
+        {
+            const string expected_sample = "normal-hitnormal";
+
+            setupSkins(null, expected_sample);
+
+            createTestWithBeatmap("hitobject-beatmap-sample.osu");
+
+            assertUserLookup(expected_sample);
+        }
+
+        /// <summary>
+        /// Tests that a hitobject which provides a custom sample set of 2 retrieves the following samples from the beatmap skin:
+        /// normal-hitnormal2
+        /// normal-hitnormal
+        /// </summary>
+        [TestCase("normal-hitnormal2")]
+        [TestCase("normal-hitnormal")]
+        public void TestDefaultCustomSampleFromBeatmap(string expectedSample)
+        {
+            setupSkins(expectedSample, expectedSample);
+
+            createTestWithBeatmap("hitobject-beatmap-custom-sample.osu");
+
+            assertBeatmapLookup(expectedSample);
+        }
+
+        /// <summary>
+        /// Tests that a hitobject which provides a custom sample set of 2 retrieves the following samples from the user skin when the beatmap does not contain the sample:
+        /// normal-hitnormal2
+        /// normal-hitnormal
+        /// </summary>
+        [TestCase("normal-hitnormal2")]
+        [TestCase("normal-hitnormal")]
+        public void TestDefaultCustomSampleFromUserSkinFallback(string expectedSample)
+        {
+            setupSkins(string.Empty, expectedSample);
+
+            createTestWithBeatmap("hitobject-beatmap-custom-sample.osu");
+
+            assertUserLookup(expectedSample);
+        }
+
+        /// <summary>
+        /// Tests that a hitobject which provides a sample file retrieves the sample file from the beatmap skin.
+        /// </summary>
+        [Test]
+        public void TestFileSampleFromBeatmap()
+        {
+            const string expected_sample = "hit_1.wav";
+
+            setupSkins(expected_sample, expected_sample);
+
+            createTestWithBeatmap("file-beatmap-sample.osu");
+
+            assertBeatmapLookup(expected_sample);
+        }
+
+        /// <summary>
+        /// Tests that a default hitobject and control point causes <see cref="TestDefaultSampleFromUserSkin"/>.
+        /// </summary>
+        [Test]
+        public void TestControlPointSampleFromSkin()
+        {
+            const string expected_sample = "normal-hitnormal";
+
+            setupSkins(expected_sample, expected_sample);
+
+            createTestWithBeatmap("controlpoint-skin-sample.osu");
+
+            assertUserLookup(expected_sample);
+        }
+
+        /// <summary>
+        /// Tests that a control point that provides a custom sample set of 1 causes <see cref="TestDefaultSampleFromBeatmap"/>.
+        /// </summary>
+        [Test]
+        public void TestControlPointSampleFromBeatmap()
+        {
+            const string expected_sample = "normal-hitnormal";
+
+            setupSkins(expected_sample, expected_sample);
+
+            createTestWithBeatmap("controlpoint-beatmap-sample.osu");
+
+            assertBeatmapLookup(expected_sample);
+        }
+
+        /// <summary>
+        /// Tests that a control point that provides a custom sample of 2 causes <see cref="TestDefaultCustomSampleFromBeatmap"/>.
+        /// </summary>
+        [TestCase("normal-hitnormal2")]
+        [TestCase("normal-hitnormal")]
+        public void TestControlPointCustomSampleFromBeatmap(string sampleName)
+        {
+            setupSkins(sampleName, sampleName);
+
+            createTestWithBeatmap("controlpoint-beatmap-custom-sample.osu");
+
+            assertBeatmapLookup(sampleName);
+        }
+
+        /// <summary>
+        /// Tests that a hitobject's custom sample overrides the control point's.
+        /// </summary>
+        [Test]
+        public void TestHitObjectCustomSampleOverride()
+        {
+            const string expected_sample = "normal-hitnormal3";
+
+            setupSkins(expected_sample, expected_sample);
+
+            createTestWithBeatmap("hitobject-beatmap-custom-sample-override.osu");
+
+            assertBeatmapLookup(expected_sample);
+        }
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestBeatmap;
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+            => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, Audio);
+
+        private IBeatmap currentTestBeatmap;
+
+        private void createTestWithBeatmap(string filename)
+        {
+            CreateTest(() =>
+            {
+                AddStep("clear performed lookups", () =>
+                {
+                    userSkinResourceStore.PerformedLookups.Clear();
+                    beatmapSkinResourceStore.PerformedLookups.Clear();
+                });
+
+                AddStep($"load {filename}", () =>
+                {
+                    using (var reader = new LineBufferedReader(TestResources.OpenResource($"SampleLookups/{filename}")))
+                        currentTestBeatmap = Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
+                });
+            });
+        }
+
+        private void setupSkins(string beatmapFile, string userFile)
+        {
+            AddStep("setup skins", () =>
+            {
+                userSkinInfo.Files = new List<SkinFileInfo>
+                {
+                    new SkinFileInfo
+                    {
+                        Filename = userFile,
+                        FileInfo = new IO.FileInfo { Hash = userFile }
+                    }
+                };
+
+                beatmapInfo.BeatmapSet.Files = new List<BeatmapSetFileInfo>
+                {
+                    new BeatmapSetFileInfo
+                    {
+                        Filename = beatmapFile,
+                        FileInfo = new IO.FileInfo { Hash = beatmapFile }
+                    }
+                };
+
+                // Need to refresh the cached skin source to refresh the skin resource store.
+                dependencies.SkinSource = new SkinProvidingContainer(new LegacySkin(userSkinInfo, userSkinResourceStore, dependencies.Get<AudioManager>()));
+            });
+        }
+
+        private void assertBeatmapLookup(string name) => AddAssert($"\"{name}\" looked up from beatmap skin",
+            () => !userSkinResourceStore.PerformedLookups.Contains(name) && beatmapSkinResourceStore.PerformedLookups.Contains(name));
+
+        private void assertUserLookup(string name) => AddAssert($"\"{name}\" looked up from user skin",
+            () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && userSkinResourceStore.PerformedLookups.Contains(name));
+
+        private class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
+        {
+            public ISkinSource SkinSource;
+
+            private readonly IReadOnlyDependencyContainer fallback;
+
+            public SkinSourceDependencyContainer(IReadOnlyDependencyContainer fallback)
+            {
+                this.fallback = fallback;
+            }
+
+            public object Get(Type type)
+            {
+                if (type == typeof(ISkinSource))
+                    return SkinSource;
+
+                return fallback.Get(type);
+            }
+
+            public object Get(Type type, CacheInfo info)
+            {
+                if (type == typeof(ISkinSource))
+                    return SkinSource;
+
+                return fallback.Get(type);
+            }
+
+            public void Inject<T>(T instance) where T : class
+            {
+                // Never used directly
+            }
+        }
+
+        private class TestResourceStore : IResourceStore<byte[]>
+        {
+            public readonly List<string> PerformedLookups = new List<string>();
+
+            public byte[] Get(string name)
+            {
+                markLookup(name);
+                return Array.Empty<byte>();
+            }
+
+            public Task<byte[]> GetAsync(string name)
+            {
+                markLookup(name);
+                return Task.FromResult(Array.Empty<byte>());
+            }
+
+            public Stream GetStream(string name)
+            {
+                markLookup(name);
+                return new MemoryStream();
+            }
+
+            private void markLookup(string name) => PerformedLookups.Add(name.Substring(name.LastIndexOf('/') + 1));
+
+            public IEnumerable<string> GetAvailableResources() => Enumerable.Empty<string>();
+
+            public void Dispose()
+            {
+            }
+        }
+
+        private class TestWorkingBeatmap : ClockBackedTestWorkingBeatmap
+        {
+            private readonly BeatmapInfo skinBeatmapInfo;
+            private readonly IResourceStore<byte[]> resourceStore;
+
+            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio,
+                                      double length = 60000)
+                : base(beatmap, storyboard, referenceClock, audio, length)
+            {
+                this.skinBeatmapInfo = skinBeatmapInfo;
+                this.resourceStore = resourceStore;
+            }
+
+            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, AudioManager);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Resources/SampleLookups/controlpoint-beatmap-custom-sample.osu b/osu.Game.Tests/Resources/SampleLookups/controlpoint-beatmap-custom-sample.osu
new file mode 100644
index 0000000000..91dbc6a60e
--- /dev/null
+++ b/osu.Game.Tests/Resources/SampleLookups/controlpoint-beatmap-custom-sample.osu
@@ -0,0 +1,7 @@
+osu file format v14
+
+[TimingPoints]
+0,300,4,0,2,100,1,0
+
+[HitObjects]
+444,320,1000,5,0,0:0:0:0:
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/SampleLookups/controlpoint-beatmap-sample.osu b/osu.Game.Tests/Resources/SampleLookups/controlpoint-beatmap-sample.osu
new file mode 100644
index 0000000000..3274820100
--- /dev/null
+++ b/osu.Game.Tests/Resources/SampleLookups/controlpoint-beatmap-sample.osu
@@ -0,0 +1,7 @@
+osu file format v14
+
+[TimingPoints]
+0,300,4,0,1,100,1,0
+
+[HitObjects]
+444,320,1000,5,0,0:0:0:0:
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/SampleLookups/controlpoint-skin-sample.osu b/osu.Game.Tests/Resources/SampleLookups/controlpoint-skin-sample.osu
new file mode 100644
index 0000000000..c53ec465fb
--- /dev/null
+++ b/osu.Game.Tests/Resources/SampleLookups/controlpoint-skin-sample.osu
@@ -0,0 +1,7 @@
+osu file format v14
+
+[TimingPoints]
+0,300,4,0,0,100,1,0
+
+[HitObjects]
+444,320,1000,5,0,0:0:0:0:
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/SampleLookups/file-beatmap-sample.osu b/osu.Game.Tests/Resources/SampleLookups/file-beatmap-sample.osu
new file mode 100644
index 0000000000..65b5ea8707
--- /dev/null
+++ b/osu.Game.Tests/Resources/SampleLookups/file-beatmap-sample.osu
@@ -0,0 +1,4 @@
+osu file format v14
+
+[HitObjects]
+255,193,2170,1,0,0:0:0:0:hit_1.wav
diff --git a/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample-override.osu b/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample-override.osu
new file mode 100644
index 0000000000..13dc2faab1
--- /dev/null
+++ b/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample-override.osu
@@ -0,0 +1,7 @@
+osu file format v14
+
+[TimingPoints]
+0,300,4,0,2,100,1,0
+
+[HitObjects]
+444,320,1000,5,0,0:0:3:0:
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample.osu b/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample.osu
new file mode 100644
index 0000000000..4ab672dbb0
--- /dev/null
+++ b/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample.osu
@@ -0,0 +1,4 @@
+osu file format v14
+
+[HitObjects]
+444,320,1000,5,0,0:0:2:0:
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-sample.osu b/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-sample.osu
new file mode 100644
index 0000000000..33bc34949a
--- /dev/null
+++ b/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-sample.osu
@@ -0,0 +1,4 @@
+osu file format v14
+
+[HitObjects]
+444,320,1000,5,0,0:0:1:0:
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/SampleLookups/hitobject-skin-sample.osu b/osu.Game.Tests/Resources/SampleLookups/hitobject-skin-sample.osu
new file mode 100644
index 0000000000..47f5b44c90
--- /dev/null
+++ b/osu.Game.Tests/Resources/SampleLookups/hitobject-skin-sample.osu
@@ -0,0 +1,4 @@
+osu file format v14
+
+[HitObjects]
+444,320,1000,5,0,0:0:0:0:
\ No newline at end of file

From 44981431c5470c457d1708ad9227e4ec1dd60566 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 21:33:32 +0900
Subject: [PATCH 02187/10326] Remove suffix hackery

---
 .../Objects/Legacy/ConvertHitObjectParser.cs     | 16 +---------------
 osu.Game/Skinning/LegacyBeatmapSkin.cs           |  5 +++--
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 95cbf3ab40..9a60a0a75c 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -420,24 +420,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 {
                     customSampleBank = value;
 
-                    // A 0 custom sample bank should cause LegacyBeatmapSkin to always fall back to the user skin. This is done by giving a null suffix.
-                    if (value > 0)
+                    if (value >= 2)
                         Suffix = value.ToString();
                 }
             }
-
-            public override IEnumerable<string> LookupNames
-            {
-                get
-                {
-                    // The lookup should only contain the suffix for custom sample bank 2 and beyond.
-                    // For custom sample bank 1 and 0, the lookup should not contain the suffix as only the lookup source (beatmap or user skin) is changed.
-                    if (CustomSampleBank >= 2)
-                        yield return $"{Bank}-{Name}{Suffix}";
-
-                    yield return $"{Bank}-{Name}";
-                }
-            }
         }
 
         private class FileHitSampleInfo : LegacyHitSampleInfo
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index c4636f46f5..21533e58cd 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.IO.Stores;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Skinning
 {
@@ -37,9 +38,9 @@ namespace osu.Game.Skinning
 
         public override SampleChannel GetSample(ISampleInfo sampleInfo)
         {
-            if (sampleInfo is HitSampleInfo hsi && string.IsNullOrEmpty(hsi.Suffix))
+            if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy && legacy.CustomSampleBank == 0)
             {
-                // When no custom sample set is provided, always fall-back to the default samples.
+                // When no custom sample bank is provided, always fall-back to the default samples.
                 return null;
             }
 

From 64d44dedcd643cef2e971a968154e0fd17e2a6b2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 22:39:51 +0900
Subject: [PATCH 02188/10326] Make testscene headless

---
 osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index f80ea3ae88..a8bd902117 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -10,6 +10,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
@@ -24,6 +25,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Gameplay
 {
+    [HeadlessTest]
     public class TestSceneHitObjectSamples : PlayerTestScene
     {
         private readonly SkinInfo userSkinInfo = new SkinInfo();

From 10486a0ad2b2aa1809d1d4f18d532cf545ebcb38 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Apr 2020 23:10:14 +0900
Subject: [PATCH 02189/10326] Fix potential dependency-related issues

---
 osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index a8bd902117..366437a771 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -253,7 +253,7 @@ namespace osu.Game.Tests.Gameplay
                 };
 
                 // Need to refresh the cached skin source to refresh the skin resource store.
-                dependencies.SkinSource = new SkinProvidingContainer(new LegacySkin(userSkinInfo, userSkinResourceStore, dependencies.Get<AudioManager>()));
+                dependencies.SkinSource = new SkinProvidingContainer(new LegacySkin(userSkinInfo, userSkinResourceStore, Audio));
             });
         }
 
@@ -287,7 +287,7 @@ namespace osu.Game.Tests.Gameplay
                 if (type == typeof(ISkinSource))
                     return SkinSource;
 
-                return fallback.Get(type);
+                return fallback.Get(type, info);
             }
 
             public void Inject<T>(T instance) where T : class

From dd6c9173da8b4d44f001cb057efa67c71e2d14a6 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 18:42:00 +0300
Subject: [PATCH 02190/10326] Move DifficultyRecommender to OsuGameBase

---
 osu.Game/OsuGameBase.cs               | 5 +++++
 osu.Game/Screens/Select/SongSelect.cs | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 5487bd9320..4b79e9f24c 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -33,6 +33,7 @@ using osu.Game.Resources;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
+using osu.Game.Screens.Select;
 using osu.Game.Skinning;
 using osuTK.Input;
 
@@ -240,6 +241,10 @@ namespace osu.Game
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());
             Add(previewTrackManager);
 
+            DifficultyRecommender difficultyRecommender;
+            dependencies.Cache(difficultyRecommender = new DifficultyRecommender());
+            Add(difficultyRecommender);
+
             Ruleset.BindValueChanged(onRulesetChanged);
         }
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index f164056ede..7f35011379 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -81,8 +81,6 @@ namespace osu.Game.Screens.Select
 
         protected BeatmapCarousel Carousel { get; private set; }
 
-        private DifficultyRecommender recommender;
-
         private BeatmapInfoWedge beatmapInfoWedge;
         private DialogOverlay dialogOverlay;
 
@@ -104,14 +102,13 @@ namespace osu.Game.Screens.Select
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores)
+        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores, DifficultyRecommender recommender)
         {
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
 
             AddRangeInternal(new Drawable[]
             {
-                recommender = new DifficultyRecommender(),
                 new ResetScrollContainer(() => Carousel.ScrollToSelected())
                 {
                     RelativeSizeAxes = Axes.Y,

From 00d1cf1ce2b693348633919d649a15388f955072 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 18:42:18 +0300
Subject: [PATCH 02191/10326] Recommend from all rulesets

---
 .../Screens/Select/DifficultyRecommender.cs   | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 20cdca858a..76b1188298 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -44,16 +44,27 @@ namespace osu.Game.Screens.Select
         /// <returns>The recommended difficulty, or null if a recommendation could not be provided.</returns>
         public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps)
         {
-            if (recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars))
+            if (!recommendedStarDifficulty.Any())
+                return null;
+
+            BeatmapInfo beatmap = null;
+
+            foreach (var r in getBestRulesetOrder())
             {
-                return beatmaps.OrderBy(b =>
+                if (!recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars))
+                    break;
+
+                beatmap = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
                 {
                     var difference = b.StarDifficulty - stars;
                     return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
                 }).FirstOrDefault();
+
+                if (beatmap != null)
+                    break;
             }
 
-            return null;
+            return beatmap;
         }
 
         private void calculateRecommendedDifficulties()
@@ -72,6 +83,26 @@ namespace osu.Game.Screens.Select
             });
         }
 
+        private IEnumerable<RulesetInfo> bestRulesetOrder;
+
+        private IEnumerable<RulesetInfo> getBestRulesetOrder()
+        {
+            if (bestRulesetOrder != null)
+                return bestRulesetOrder;
+
+            var otherRulesets = recommendedStarDifficulty.ToList()
+                                                         .Where(pair => !pair.Key.Equals(ruleset.Value))
+                                                         .OrderBy(pair => pair.Value)
+                                                         .Select(pair => pair.Key)
+                                                         .Reverse();
+
+            var rulesetList = new List<RulesetInfo>(new[] { ruleset.Value });
+            rulesetList.AddRange(otherRulesets);
+
+            bestRulesetOrder = rulesetList;
+            return rulesetList;
+        }
+
         public void APIStateChanged(IAPIProvider api, APIState state)
         {
             switch (state)

From bbef94b4df15fd3e1b2f0f51f5c16e2243920a45 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 18:56:20 +0300
Subject: [PATCH 02192/10326] Reset best order on ruleset change

---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 76b1188298..bdc81ad066 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Screens.Select
         private void load()
         {
             api.Register(this);
+
+            ruleset.ValueChanged += _ => bestRulesetOrder = null;
         }
 
         /// <summary>

From 872551733f3b4c9e8fe4c7f21a4d0b8edf4ae3bb Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 19:39:14 +0300
Subject: [PATCH 02193/10326] Present recommended beatmaps

---
 osu.Game/OsuGame.cs     | 14 +++++++++-----
 osu.Game/OsuGameBase.cs |  7 ++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5e93d760e3..64fe0f6733 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -322,7 +322,7 @@ namespace osu.Game
         /// </param>
         public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> difficultyCriteria = null)
         {
-            difficultyCriteria ??= b => b.Ruleset.Equals(Ruleset.Value);
+            difficultyCriteria ??= _ => true;
 
             var databasedSet = beatmap.OnlineBeatmapSetID != null
                 ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID)
@@ -346,11 +346,15 @@ namespace osu.Game
                     return;
                 }
 
-                // Find first beatmap that matches our predicate.
-                var first = databasedSet.Beatmaps.Find(difficultyCriteria) ?? databasedSet.Beatmaps.First();
+                // Find beatmaps that match our predicate.
+                var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria(b));
+                if (!beatmaps.Any())
+                    beatmaps = databasedSet.Beatmaps;
 
-                Ruleset.Value = first.Ruleset;
-                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(first);
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
+
+                Ruleset.Value = selection.Ruleset;
+                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
             }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 4b79e9f24c..0c86017974 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -100,6 +100,9 @@ namespace osu.Game
 
         public bool IsDeployedBuild => AssemblyVersion.Major > 0;
 
+        [Cached]
+        protected readonly DifficultyRecommender DifficultyRecommender = new DifficultyRecommender();
+
         public virtual string Version
         {
             get
@@ -241,9 +244,7 @@ namespace osu.Game
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());
             Add(previewTrackManager);
 
-            DifficultyRecommender difficultyRecommender;
-            dependencies.Cache(difficultyRecommender = new DifficultyRecommender());
-            Add(difficultyRecommender);
+            Add(DifficultyRecommender);
 
             Ruleset.BindValueChanged(onRulesetChanged);
         }

From 80949e89b934f0eaee7705da8e8f62f0dc47b6b3 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 19:49:42 +0300
Subject: [PATCH 02194/10326] Offline fallback and commenting

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 64fe0f6733..e64ca3ad87 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -316,8 +316,8 @@ namespace osu.Game
         /// </summary>
         /// <param name="beatmap">The beatmap to select.</param>
         /// <param name="difficultyCriteria">
-        /// Optional predicate used to try and find a difficulty to select.
-        /// If omitted, this will try to present the first beatmap from the current ruleset.
+        /// Optional predicate used to filter which difficulties to select.
+        /// If omitted, this will try to present a recommended beatmap from the current ruleset.
         /// In case of failure the first difficulty of the set will be presented, ignoring the predicate.
         /// </param>
         public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> difficultyCriteria = null)
@@ -351,7 +351,10 @@ namespace osu.Game
                 if (!beatmaps.Any())
                     beatmaps = databasedSet.Beatmaps;
 
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps) ?? (
+                    // fallback if a difficulty can't be recommended, maybe we are offline
+                    databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First()
+                );
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);

From 58e122a7cb1c0b47365e1fe28c16f24d85ce0681 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 19:56:41 +0300
Subject: [PATCH 02195/10326] Better fallback logic

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e64ca3ad87..fea89155f5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -322,8 +322,6 @@ namespace osu.Game
         /// </param>
         public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> difficultyCriteria = null)
         {
-            difficultyCriteria ??= _ => true;
-
             var databasedSet = beatmap.OnlineBeatmapSetID != null
                 ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID)
                 : BeatmapManager.QueryBeatmapSet(s => s.Hash == beatmap.Hash);
@@ -347,14 +345,20 @@ namespace osu.Game
                 }
 
                 // Find beatmaps that match our predicate.
-                var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria(b));
+                var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria?.Invoke(b) ?? true);
                 if (!beatmaps.Any())
                     beatmaps = databasedSet.Beatmaps;
 
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps) ?? (
-                    // fallback if a difficulty can't be recommended, maybe we are offline
-                    databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First()
-                );
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
+
+                // fallback if a difficulty can't be recommended, maybe we are offline
+                if (selection == null)
+                {
+                    if (difficultyCriteria != null)
+                        selection = beatmaps.First();
+                    else
+                        selection = databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First();
+                }
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);

From d47e414fb142e7aa504814494d496a3d08528a46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Apr 2020 12:35:43 +0900
Subject: [PATCH 02196/10326] Apply review feedback (unroll inner loop / xml
 fixes)

---
 .../Replays/ManiaReplayFrame.cs               | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
index 0059a78a44..da4b0c943c 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
@@ -74,22 +74,20 @@ namespace osu.Game.Rulesets.Mania.Replays
                         // the index in lazer, which doesn't include special keys.
                         int nonSpecialKeyIndex = action - ManiaAction.Key1;
 
+                        // the index inclusive of special keys.
                         int overallIndex = 0;
 
                         // iterate to find the index including special keys.
-                        while (true)
+                        for (; overallIndex < maniaBeatmap.TotalColumns; overallIndex++)
                         {
-                            if (!isColumnAtIndexSpecial(maniaBeatmap, overallIndex))
-                            {
-                                // found a non-special column we could use.
-                                if (nonSpecialKeyIndex == 0)
-                                    break;
-
-                                // found a non-special column but not ours.
-                                nonSpecialKeyIndex--;
-                            }
-
-                            overallIndex++;
+                            // skip over special columns.
+                            if (isColumnAtIndexSpecial(maniaBeatmap, overallIndex))
+                                continue;
+                            // found a non-special column to use.
+                            if (nonSpecialKeyIndex == 0)
+                                break;
+                            // found a non-special column but not ours.
+                            nonSpecialKeyIndex--;
                         }
 
                         keys |= 1 << overallIndex;
@@ -127,21 +125,20 @@ namespace osu.Game.Rulesets.Mania.Replays
         /// </summary>
         /// <param name="beatmap">The beatmap.</param>
         /// <param name="index">The overall index to check.</param>
-        /// <returns></returns>
         private bool isColumnAtIndexSpecial(ManiaBeatmap beatmap, int index)
         {
             foreach (var stage in beatmap.Stages)
             {
-                for (int stageIndex = 0; stageIndex < stage.Columns; stageIndex++)
+                if (index >= stage.Columns)
                 {
-                    if (index == 0)
-                        return stage.IsSpecialColumn(stageIndex);
-
-                    index--;
+                    index -= stage.Columns;
+                    continue;
                 }
+
+                return stage.IsSpecialColumn(index);
             }
 
-            return false;
+            throw new ArgumentException("Column index is too high.", nameof(index));
         }
     }
 }

From f4b5a17b650264a9b0fda00c1a59c94cfde58fec Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 15 Apr 2020 07:00:38 +0300
Subject: [PATCH 02197/10326] Fix typo in DrawableTaikoHitObject

---
 .../Objects/Drawables/DrawableTaikoHitObject.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 397888bb11..2f90f3b96c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         /// <summary>
         /// Moves <see cref="Content"/> to a layer proxied above the playfield.
-        /// Does nothing is content is already proxied.
+        /// Does nothing if content is already proxied.
         /// </summary>
         protected void ProxyContent()
         {

From e534d59c807ecd1350e2ced30c4595e49fc6af4a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Apr 2020 13:08:15 +0900
Subject: [PATCH 02198/10326] Use another argument exception

---
 osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
index da4b0c943c..dbab54d1d0 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Mania.Replays
                 }
             }
 
-            throw new InvalidOperationException("Special key index too high");
+            throw new ArgumentException("Special key index is too high.", nameof(specialOffset));
         }
 
         /// <summary>

From 72707a9973f41f1961bd030c66d84a7627e4be81 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Apr 2020 13:54:23 +0900
Subject: [PATCH 02199/10326] Fix OS-dependent substring

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

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index 366437a771..f611f2717e 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -318,7 +318,7 @@ namespace osu.Game.Tests.Gameplay
                 return new MemoryStream();
             }
 
-            private void markLookup(string name) => PerformedLookups.Add(name.Substring(name.LastIndexOf('/') + 1));
+            private void markLookup(string name) => PerformedLookups.Add(name.Substring(name.LastIndexOf(Path.DirectorySeparatorChar) + 1));
 
             public IEnumerable<string> GetAvailableResources() => Enumerable.Empty<string>();
 

From 019e777d7da8022678efa7e4a60026d6d6440be7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Apr 2020 16:01:49 +0900
Subject: [PATCH 02200/10326] Move taiko skinning tests to own namespace

---
 .../{ => Skinning}/TaikoSkinnableTestScene.cs                 | 2 +-
 .../{ => Skinning}/TestSceneDrawableHit.cs                    | 2 +-
 .../{ => Skinning}/TestSceneInputDrum.cs                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game.Rulesets.Taiko.Tests/{ => Skinning}/TaikoSkinnableTestScene.cs (92%)
 rename osu.Game.Rulesets.Taiko.Tests/{ => Skinning}/TestSceneDrawableHit.cs (97%)
 rename osu.Game.Rulesets.Taiko.Tests/{ => Skinning}/TestSceneInputDrum.cs (96%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TaikoSkinnableTestScene.cs
similarity index 92%
rename from osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs
rename to osu.Game.Rulesets.Taiko.Tests/Skinning/TaikoSkinnableTestScene.cs
index 6db2a6907f..161154b1a7 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TaikoSkinnableTestScene.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Taiko.Tests
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 {
     public abstract class TaikoSkinnableTestScene : SkinnableTestScene
     {
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
similarity index 97%
rename from osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
rename to osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
index 301295253d..a3832b010c 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Skinning;
 
-namespace osu.Game.Rulesets.Taiko.Tests
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 {
     [TestFixture]
     public class TestSceneDrawableHit : TaikoSkinnableTestScene
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
similarity index 96%
rename from osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs
rename to osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
index 1928e9f66f..412027ca61 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
@@ -6,14 +6,14 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.Taiko.UI;
+using osuTK;
 
-namespace osu.Game.Rulesets.Taiko.Tests
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 {
     [TestFixture]
     public class TestSceneInputDrum : TaikoSkinnableTestScene

From 102c1d9095d4189731f6d7ac547abd0c0e5b7527 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Apr 2020 15:50:19 +0900
Subject: [PATCH 02201/10326] Add disabled state to menu items

---
 .../Visual/UserInterface/TestSceneOsuMenu.cs  | 91 +++++++++++++++++++
 .../UserInterface/DrawableOsuMenuItem.cs      | 26 +++++-
 .../Graphics/UserInterface/OsuMenuItem.cs     |  6 ++
 3 files changed, 118 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
new file mode 100644
index 0000000000..cdda1969ca
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
@@ -0,0 +1,91 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneOsuMenu : OsuManualInputManagerTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OsuMenu),
+            typeof(DrawableOsuMenuItem)
+        };
+
+        private OsuMenu menu;
+        private bool actionPeformed;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            actionPeformed = false;
+
+            Child = menu = new OsuMenu(Direction.Vertical, true)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Items = new[]
+                {
+                    new OsuMenuItem("standard", MenuItemType.Standard, performAction),
+                    new OsuMenuItem("highlighted", MenuItemType.Highlighted, performAction),
+                    new OsuMenuItem("destructive", MenuItemType.Destructive, performAction),
+                }
+            };
+        });
+
+        [Test]
+        public void TestClickEnabledMenuItem()
+        {
+            AddStep("move to first menu item", () => InputManager.MoveMouseTo(menu.ChildrenOfType<DrawableOsuMenuItem>().First()));
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("action performed", () => actionPeformed);
+        }
+
+        [Test]
+        public void TestDisableMenuItemsAndClick()
+        {
+            AddStep("disable menu items", () =>
+            {
+                foreach (var item in menu.Items)
+                    ((OsuMenuItem)item).Enabled.Value = false;
+            });
+
+            AddStep("move to first menu item", () => InputManager.MoveMouseTo(menu.ChildrenOfType<DrawableOsuMenuItem>().First()));
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("action not performed", () => !actionPeformed);
+        }
+
+        [Test]
+        public void TestEnableMenuItemsAndClick()
+        {
+            AddStep("disable menu items", () =>
+            {
+                foreach (var item in menu.Items)
+                    ((OsuMenuItem)item).Enabled.Value = false;
+            });
+
+            AddStep("enable menu items", () =>
+            {
+                foreach (var item in menu.Items)
+                    ((OsuMenuItem)item).Enabled.Value = true;
+            });
+
+            AddStep("move to first menu item", () => InputManager.MoveMouseTo(menu.ChildrenOfType<DrawableOsuMenuItem>().First()));
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("action performed", () => actionPeformed);
+        }
+
+        private void performAction() => actionPeformed = true;
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index a3ca851341..abaae7b43c 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Graphics.UserInterface
             BackgroundColourHover = Color4Extensions.FromHex(@"172023");
 
             updateTextColour();
+
+            Item.Action.BindDisabledChanged(_ => updateState(), true);
         }
 
         private void updateTextColour()
@@ -65,19 +67,33 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override bool OnHover(HoverEvent e)
         {
-            sampleHover.Play();
-            text.BoldText.FadeIn(transition_length, Easing.OutQuint);
-            text.NormalText.FadeOut(transition_length, Easing.OutQuint);
+            updateState();
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            text.BoldText.FadeOut(transition_length, Easing.OutQuint);
-            text.NormalText.FadeIn(transition_length, Easing.OutQuint);
+            updateState();
             base.OnHoverLost(e);
         }
 
+        private void updateState()
+        {
+            Alpha = Item.Action.Disabled ? 0.2f : 1;
+
+            if (IsHovered && !Item.Action.Disabled)
+            {
+                sampleHover.Play();
+                text.BoldText.FadeIn(transition_length, Easing.OutQuint);
+                text.NormalText.FadeOut(transition_length, Easing.OutQuint);
+            }
+            else
+            {
+                text.BoldText.FadeOut(transition_length, Easing.OutQuint);
+                text.NormalText.FadeIn(transition_length, Easing.OutQuint);
+            }
+        }
+
         protected override bool OnClick(ClickEvent e)
         {
             sampleClick.Play();
diff --git a/osu.Game/Graphics/UserInterface/OsuMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuMenuItem.cs
index 0fe41937ce..36122ca0b2 100644
--- a/osu.Game/Graphics/UserInterface/OsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/OsuMenuItem.cs
@@ -2,12 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterface
 {
     public class OsuMenuItem : MenuItem
     {
+        public readonly Bindable<bool> Enabled = new Bindable<bool>(true);
+
         public readonly MenuItemType Type;
 
         public OsuMenuItem(string text, MenuItemType type = MenuItemType.Standard)
@@ -19,6 +22,9 @@ namespace osu.Game.Graphics.UserInterface
             : base(text, action)
         {
             Type = type;
+
+            Enabled.BindValueChanged(enabled => Action.Disabled = !enabled.NewValue);
+            Action.BindDisabledChanged(disabled => Enabled.Value = !disabled);
         }
     }
 }

From e8c955ed9b0a253ba2bfa6bd1e1af737a4e34440 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Apr 2020 15:50:43 +0900
Subject: [PATCH 02202/10326] Add CanUndo/CanRedo bindables

---
 .../Editor/EditorChangeHandlerTest.cs         | 25 +++++++++++--------
 osu.Game/Screens/Edit/EditorChangeHandler.cs  | 17 ++++++++++---
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs
index ef16976130..9613f250c4 100644
--- a/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs
+++ b/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs
@@ -15,15 +15,18 @@ namespace osu.Game.Tests.Editor
         {
             var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
 
-            Assert.That(handler.HasUndoState, Is.False);
+            Assert.That(handler.CanUndo.Value, Is.False);
+            Assert.That(handler.CanRedo.Value, Is.False);
 
             handler.SaveState();
 
-            Assert.That(handler.HasUndoState, Is.True);
+            Assert.That(handler.CanUndo.Value, Is.True);
+            Assert.That(handler.CanRedo.Value, Is.False);
 
             handler.RestoreState(-1);
 
-            Assert.That(handler.HasUndoState, Is.False);
+            Assert.That(handler.CanUndo.Value, Is.False);
+            Assert.That(handler.CanRedo.Value, Is.True);
         }
 
         [Test]
@@ -31,20 +34,20 @@ namespace osu.Game.Tests.Editor
         {
             var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
 
-            Assert.That(handler.HasUndoState, Is.False);
+            Assert.That(handler.CanUndo.Value, Is.False);
 
             for (int i = 0; i < EditorChangeHandler.MAX_SAVED_STATES; i++)
                 handler.SaveState();
 
-            Assert.That(handler.HasUndoState, Is.True);
+            Assert.That(handler.CanUndo.Value, Is.True);
 
             for (int i = 0; i < EditorChangeHandler.MAX_SAVED_STATES; i++)
             {
-                Assert.That(handler.HasUndoState, Is.True);
+                Assert.That(handler.CanUndo.Value, Is.True);
                 handler.RestoreState(-1);
             }
 
-            Assert.That(handler.HasUndoState, Is.False);
+            Assert.That(handler.CanUndo.Value, Is.False);
         }
 
         [Test]
@@ -52,20 +55,20 @@ namespace osu.Game.Tests.Editor
         {
             var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
 
-            Assert.That(handler.HasUndoState, Is.False);
+            Assert.That(handler.CanUndo.Value, Is.False);
 
             for (int i = 0; i < EditorChangeHandler.MAX_SAVED_STATES * 2; i++)
                 handler.SaveState();
 
-            Assert.That(handler.HasUndoState, Is.True);
+            Assert.That(handler.CanUndo.Value, Is.True);
 
             for (int i = 0; i < EditorChangeHandler.MAX_SAVED_STATES; i++)
             {
-                Assert.That(handler.HasUndoState, Is.True);
+                Assert.That(handler.CanUndo.Value, Is.True);
                 handler.RestoreState(-1);
             }
 
-            Assert.That(handler.HasUndoState, Is.False);
+            Assert.That(handler.CanUndo.Value, Is.False);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index a8204715cd..1553c2d2ef 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Objects;
 
@@ -15,8 +16,10 @@ namespace osu.Game.Screens.Edit
     /// </summary>
     public class EditorChangeHandler : IEditorChangeHandler
     {
-        private readonly LegacyEditorBeatmapPatcher patcher;
+        public readonly Bindable<bool> CanUndo = new Bindable<bool>();
+        public readonly Bindable<bool> CanRedo = new Bindable<bool>();
 
+        private readonly LegacyEditorBeatmapPatcher patcher;
         private readonly List<byte[]> savedStates = new List<byte[]>();
 
         private int currentState = -1;
@@ -45,8 +48,6 @@ namespace osu.Game.Screens.Edit
             SaveState();
         }
 
-        public bool HasUndoState => currentState > 0;
-
         private void hitObjectAdded(HitObject obj) => SaveState();
 
         private void hitObjectRemoved(HitObject obj) => SaveState();
@@ -90,6 +91,8 @@ namespace osu.Game.Screens.Edit
             }
 
             currentState = savedStates.Count - 1;
+
+            updateBindables();
         }
 
         /// <summary>
@@ -114,6 +117,14 @@ namespace osu.Game.Screens.Edit
             currentState = newState;
 
             isRestoring = false;
+
+            updateBindables();
+        }
+
+        private void updateBindables()
+        {
+            CanUndo.Value = savedStates.Count > 0 && currentState > 0;
+            CanRedo.Value = currentState < savedStates.Count - 1;
         }
     }
 }

From ce21cfbb035b16bb42b473614edbe372b5ace04b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Apr 2020 16:17:34 +0900
Subject: [PATCH 02203/10326] Use bindables in menu items

---
 osu.Game/Screens/Edit/Editor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 14a227eb07..ad17498d93 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -155,8 +155,8 @@ namespace osu.Game.Screens.Edit
                                 {
                                     Items = new[]
                                     {
-                                        new EditorMenuItem("Undo", MenuItemType.Standard, undo),
-                                        new EditorMenuItem("Redo", MenuItemType.Standard, redo)
+                                        new EditorMenuItem("Undo", MenuItemType.Standard, undo) { Enabled = { BindTarget = changeHandler.CanUndo } },
+                                        new EditorMenuItem("Redo", MenuItemType.Standard, redo) { Enabled = { BindTarget = changeHandler.CanRedo } }
                                     }
                                 }
                             }

From 18c28390ef6f441acd11acd318cffa057331fa4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Apr 2020 16:29:39 +0900
Subject: [PATCH 02204/10326] Setup drumroll testing

---
 .../Skinning/TestSceneDrawableDrumRoll.cs     | 84 +++++++++++++++++++
 .../Tests/Visual/ScrollingTestContainer.cs    |  4 +-
 2 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs
new file mode 100644
index 0000000000..388be5bbc4
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs
@@ -0,0 +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 System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
+{
+    [TestFixture]
+    public class TestSceneDrawableDrumRoll : TaikoSkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
+        {
+            typeof(DrawableDrumRoll),
+            typeof(DrawableDrumRollTick),
+        }).ToList();
+
+        [Cached(typeof(IScrollingInfo))]
+        private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
+        {
+            Direction = { Value = ScrollingDirection.Left },
+            TimeRange = { Value = 5000 },
+        };
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddStep("Drum roll", () => SetContents(() =>
+            {
+                var hoc = new ScrollingHitObjectContainer();
+
+                hoc.Add(new DrawableDrumRoll(createDrumRollAtCurrentTime())
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 500,
+                });
+
+                return hoc;
+            }));
+
+            AddStep("Drum roll (strong)", () => SetContents(() =>
+            {
+                var hoc = new ScrollingHitObjectContainer();
+
+                hoc.Add(new DrawableDrumRoll(createDrumRollAtCurrentTime(true))
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 500,
+                });
+
+                return hoc;
+            }));
+        }
+
+        private DrumRoll createDrumRollAtCurrentTime(bool strong = false)
+        {
+            var drumroll = new DrumRoll
+            {
+                IsStrong = strong,
+                StartTime = Time.Current + 1000,
+                Duration = 4000,
+            };
+
+            var cpi = new ControlPointInfo();
+            cpi.Add(0, new TimingControlPoint { BeatLength = 500 });
+
+            drumroll.ApplyDefaults(cpi, new BeatmapDifficulty());
+
+            return drumroll;
+        }
+    }
+}
diff --git a/osu.Game/Tests/Visual/ScrollingTestContainer.cs b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
index 18326a78ad..3b741fcf1d 100644
--- a/osu.Game/Tests/Visual/ScrollingTestContainer.cs
+++ b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual
 
         public void Flip() => scrollingInfo.Direction.Value = scrollingInfo.Direction.Value == ScrollingDirection.Up ? ScrollingDirection.Down : ScrollingDirection.Up;
 
-        private class TestScrollingInfo : IScrollingInfo
+        public class TestScrollingInfo : IScrollingInfo
         {
             public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
             IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Visual
             IScrollAlgorithm IScrollingInfo.Algorithm => Algorithm;
         }
 
-        private class TestScrollAlgorithm : IScrollAlgorithm
+        public class TestScrollAlgorithm : IScrollAlgorithm
         {
             public readonly SortedList<MultiplierControlPoint> ControlPoints = new SortedList<MultiplierControlPoint>();
 

From eb165840cb4e202846dfbc11b2da997af6a814fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Apr 2020 16:54:50 +0900
Subject: [PATCH 02205/10326] Add remaining taiko hitobject skinnables and
 expose as SkinnableDrawable for safety

---
 .../Objects/Drawables/DrawableCentreHit.cs    |  3 +--
 .../Objects/Drawables/DrawableDrumRoll.cs     | 27 +++++++++++++------
 .../Objects/Drawables/DrawableDrumRollTick.cs |  8 +++---
 .../Objects/Drawables/DrawableHit.cs          |  2 +-
 .../Objects/Drawables/DrawableRimHit.cs       |  3 +--
 .../Objects/Drawables/DrawableSwell.cs        | 16 ++++++-----
 .../Objects/Drawables/DrawableSwellTick.cs    |  5 ++--
 .../Drawables/DrawableTaikoHitObject.cs       |  5 ++--
 .../Objects/Drawables/Pieces/CirclePiece.cs   |  3 ++-
 .../TaikoSkinComponents.cs                    |  5 +++-
 10 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index f3f4c59a62..a87da44415 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.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.Graphics.Containers;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 
@@ -16,7 +15,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
         }
 
-        protected override CompositeDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.CentreHit),
+        protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.CentreHit),
             _ => new CentreHitCirclePiece(), confineMode: ConfineMode.ScaleToFit);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 0627eb95fd..5c3433cbf4 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -29,25 +30,29 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         private int rollingHits;
 
-        private readonly Container<DrawableDrumRollTick> tickContainer;
+        private Container<DrawableDrumRollTick> tickContainer;
 
         private Color4 colourIdle;
         private Color4 colourEngaged;
 
-        private ElongatedCirclePiece elongatedPiece;
-
         public DrawableDrumRoll(DrumRoll drumRoll)
             : base(drumRoll)
         {
             RelativeSizeAxes = Axes.Y;
-            elongatedPiece.Add(tickContainer = new Container<DrawableDrumRollTick> { RelativeSizeAxes = Axes.Both });
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            elongatedPiece.AccentColour = colourIdle = colours.YellowDark;
+            colourIdle = colours.YellowDark;
             colourEngaged = colours.YellowDarker;
+
+            updateColour();
+
+            ((Container)MainPiece.Drawable).Add(tickContainer = new Container<DrawableDrumRollTick> { RelativeSizeAxes = Axes.Both });
+
+            if (MainPiece.Drawable is IHasAccentColour accentMain)
+                accentMain.AccentColour = colourIdle;
         }
 
         protected override void LoadComplete()
@@ -86,7 +91,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return base.CreateNestedHitObject(hitObject);
         }
 
-        protected override CompositeDrawable CreateMainPiece() => elongatedPiece = new ElongatedCirclePiece();
+        protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.DrumRollBody),
+            _ => new ElongatedCirclePiece());
 
         public override bool OnPressed(TaikoAction action) => false;
 
@@ -102,8 +108,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             rollingHits = Math.Clamp(rollingHits, 0, rolling_hits_for_engaged_colour);
 
-            Color4 newColour = Interpolation.ValueAt((float)rollingHits / rolling_hits_for_engaged_colour, colourIdle, colourEngaged, 0, 1);
-            (MainPiece as IHasAccentColour)?.FadeAccent(newColour, 100);
+            updateColour();
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
@@ -151,5 +156,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             public override bool OnPressed(TaikoAction action) => false;
         }
+
+        private void updateColour()
+        {
+            Color4 newColour = Interpolation.ValueAt((float)rollingHits / rolling_hits_for_engaged_colour, colourIdle, colourEngaged, 0, 1);
+            (MainPiece.Drawable as IHasAccentColour)?.FadeAccent(newColour, 100);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index fea3eea6a9..e11e019826 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -3,10 +3,10 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -20,10 +20,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         public override bool DisplayResult => false;
 
-        protected override CompositeDrawable CreateMainPiece() => new TickPiece
-        {
-            Filled = HitObject.FirstTick
-        };
+        protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.DrumRollTick),
+            _ => new TickPiece());
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 85dfc8d5e0..9333e5f144 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     // If we're far enough away from the left stage, we should bring outselves in front of it
                     ProxyContent();
 
-                    var flash = (MainPiece as CirclePiece)?.FlashBox;
+                    var flash = (MainPiece.Drawable as CirclePiece)?.FlashBox;
                     flash?.FadeTo(0.9f).FadeOut(300);
 
                     const float gravity_time = 300;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index 463a8b746c..f767403c65 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.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.Graphics.Containers;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 
@@ -16,7 +15,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
         }
 
-        protected override CompositeDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.RimHit),
+        protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.RimHit),
             _ => new RimHitCirclePiece(), confineMode: ConfineMode.ScaleToFit);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 3a2e44038f..32f7acadc8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -114,12 +115,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             targetRing.BorderColour = colours.YellowDark.Opacity(0.25f);
         }
 
-        protected override CompositeDrawable CreateMainPiece() => new SwellCirclePiece
-        {
-            // to allow for rotation transform
-            Anchor = Anchor.Centre,
-            Origin = Anchor.Centre,
-        };
+        protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Swell),
+            _ => new SwellCirclePiece
+            {
+                // to allow for rotation transform
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
 
         protected override void LoadComplete()
         {
@@ -184,7 +186,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     .Then()
                     .FadeTo(completion / 8, 2000, Easing.OutQuint);
 
-                MainPiece.RotateTo((float)(completion * HitObject.Duration / 8), 4000, Easing.OutQuint);
+                MainPiece.Drawable.RotateTo((float)(completion * HitObject.Duration / 8), 4000, Easing.OutQuint);
 
                 expandingRing.ScaleTo(1f + Math.Min(target_ring_scale - 1f, (target_ring_scale - 1f) * completion * 1.3f), 260, Easing.OutQuint);
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
index 5a954addfb..1685576f0d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -31,6 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         public override bool OnPressed(TaikoAction action) => false;
 
-        protected override CompositeDrawable CreateMainPiece() => new TickPiece();
+        protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.DrumRollTick),
+            _ => new TickPiece());
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 2f90f3b96c..1be04f1760 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -11,6 +11,7 @@ using System.Collections.Generic;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -115,7 +116,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         public new TObject HitObject;
 
         protected readonly Vector2 BaseSize;
-        protected readonly CompositeDrawable MainPiece;
+        protected readonly SkinnableDrawable MainPiece;
 
         private readonly Container<DrawableStrongNestedHit> strongHitContainer;
 
@@ -167,7 +168,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         // Normal and clap samples are handled by the drum
         protected override IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples.Where(s => s.Name != HitSampleInfo.HIT_NORMAL && s.Name != HitSampleInfo.HIT_CLAP);
 
-        protected abstract CompositeDrawable CreateMainPiece();
+        protected abstract SkinnableDrawable CreateMainPiece();
 
         /// <summary>
         /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongHitObject"/>.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
index 6ca77e666d..b5471e6976 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
@@ -10,6 +10,7 @@ using osuTK.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Effects;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
@@ -21,7 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
     /// for a usage example.
     /// </para>
     /// </summary>
-    public abstract class CirclePiece : BeatSyncedContainer
+    public abstract class CirclePiece : BeatSyncedContainer, IHasAccentColour
     {
         public const float SYMBOL_SIZE = 0.45f;
         public const float SYMBOL_BORDER = 8;
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index babf21b6a9..156ea71c16 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -7,6 +7,9 @@ namespace osu.Game.Rulesets.Taiko
     {
         InputDrum,
         CentreHit,
-        RimHit
+        RimHit,
+        DrumRollBody,
+        DrumRollTick,
+        Swell
     }
 }

From 45d88b70f8de3cf146a1e28e99d07dabf6d511ce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Apr 2020 17:50:37 +0900
Subject: [PATCH 02206/10326] Split out base logic from LegacyHit into
 LegacyCirclePiece

---
 .../Skinning/TestSceneDrawableHit.cs          |  1 +
 .../Skinning/LegacyCirclePiece.cs             | 96 +++++++++++++++++++
 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs | 69 +------------
 3 files changed, 99 insertions(+), 67 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
index a3832b010c..6d6da1fb5b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             typeof(DrawableCentreHit),
             typeof(DrawableRimHit),
             typeof(LegacyHit),
+            typeof(LegacyCirclePiece),
         }).ToList();
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
new file mode 100644
index 0000000000..bfcf268c3d
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
@@ -0,0 +1,96 @@
+// Copyright (c) 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.Animations;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Taiko.Skinning
+{
+    public class LegacyCirclePiece : CompositeDrawable, IHasAccentColour
+    {
+        private Drawable backgroundLayer;
+
+        public LegacyCirclePiece()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin, DrawableHitObject drawableHitObject)
+        {
+            Drawable getDrawableFor(string lookup)
+            {
+                const string normal_hit = "taikohit";
+                const string big_hit = "taikobig";
+
+                string prefix = ((drawableHitObject as DrawableTaikoHitObject)?.HitObject.IsStrong ?? false) ? big_hit : normal_hit;
+
+                return skin.GetAnimation($"{prefix}{lookup}", true, false) ??
+                       // fallback to regular size if "big" version doesn't exist.
+                       skin.GetAnimation($"{normal_hit}{lookup}", true, false);
+            }
+
+            // backgroundLayer is guaranteed to exist due to the pre-check in TaikoLegacySkinTransformer.
+            AddInternal(backgroundLayer = getDrawableFor("circle"));
+
+            var foregroundLayer = getDrawableFor("circleoverlay");
+            if (foregroundLayer != null)
+                AddInternal(foregroundLayer);
+
+            // Animations in taiko skins are used in a custom way (>150 combo and animating in time with beat).
+            // For now just stop at first frame for sanity.
+            foreach (var c in InternalChildren)
+            {
+                (c as IFramedAnimation)?.Stop();
+
+                c.Anchor = Anchor.Centre;
+                c.Origin = Anchor.Centre;
+            }
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateAccentColour();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // Not all skins (including the default osu-stable) have similar sizes for "hitcircle" and "hitcircleoverlay".
+            // This ensures they are scaled relative to each other but also match the expected DrawableHit size.
+            foreach (var c in InternalChildren)
+                c.Scale = new Vector2(DrawHeight / 128);
+        }
+
+        private Color4 accentColour;
+
+        public Color4 AccentColour
+        {
+            get => accentColour;
+            set
+            {
+                if (value == accentColour)
+                    return;
+
+                accentColour = value;
+                if (IsLoaded)
+                    updateAccentColour();
+            }
+        }
+
+        private void updateAccentColour()
+        {
+            backgroundLayer.Colour = accentColour;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
index 80bf97936d..656728f6e4 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
@@ -2,90 +2,25 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Animations;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Objects.Drawables;
-using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
 {
-    public class LegacyHit : CompositeDrawable, IHasAccentColour
+    public class LegacyHit : LegacyCirclePiece
     {
         private readonly TaikoSkinComponents component;
 
-        private Drawable backgroundLayer;
-
         public LegacyHit(TaikoSkinComponents component)
         {
             this.component = component;
-
-            RelativeSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, DrawableHitObject drawableHitObject)
+        private void load()
         {
-            Drawable getDrawableFor(string lookup)
-            {
-                const string normal_hit = "taikohit";
-                const string big_hit = "taikobig";
-
-                string prefix = ((drawableHitObject as DrawableTaikoHitObject)?.HitObject.IsStrong ?? false) ? big_hit : normal_hit;
-
-                return skin.GetAnimation($"{prefix}{lookup}", true, false) ??
-                       // fallback to regular size if "big" version doesn't exist.
-                       skin.GetAnimation($"{normal_hit}{lookup}", true, false);
-            }
-
-            // backgroundLayer is guaranteed to exist due to the pre-check in TaikoLegacySkinTransformer.
-            AddInternal(backgroundLayer = getDrawableFor("circle"));
-
-            var foregroundLayer = getDrawableFor("circleoverlay");
-            if (foregroundLayer != null)
-                AddInternal(foregroundLayer);
-
-            // Animations in taiko skins are used in a custom way (>150 combo and animating in time with beat).
-            // For now just stop at first frame for sanity.
-            foreach (var c in InternalChildren)
-            {
-                (c as IFramedAnimation)?.Stop();
-
-                c.Anchor = Anchor.Centre;
-                c.Origin = Anchor.Centre;
-            }
-
             AccentColour = component == TaikoSkinComponents.CentreHit
                 ? new Color4(235, 69, 44, 255)
                 : new Color4(67, 142, 172, 255);
         }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            // Not all skins (including the default osu-stable) have similar sizes for "hitcircle" and "hitcircleoverlay".
-            // This ensures they are scaled relative to each other but also match the expected DrawableHit size.
-            foreach (var c in InternalChildren)
-                c.Scale = new Vector2(DrawWidth / 128);
-        }
-
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => accentColour;
-            set
-            {
-                if (value == accentColour)
-                    return;
-
-                backgroundLayer.Colour = accentColour = value;
-            }
-        }
     }
 }

From 313741799468b34fb5abb903b9513b9bbafbe4a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Apr 2020 17:50:57 +0900
Subject: [PATCH 02207/10326] Add drumroll skinning

---
 .../Skinning/TestSceneDrawableDrumRoll.cs     |   2 +
 .../Skinning/LegacyDrumRoll.cs                | 110 ++++++++++++++++++
 .../Skinning/TaikoLegacySkinTransformer.cs    |   6 +
 3 files changed, 118 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs
index 388be5bbc4..554894bf68 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs
@@ -11,6 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
 
@@ -23,6 +24,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         {
             typeof(DrawableDrumRoll),
             typeof(DrawableDrumRollTick),
+            typeof(LegacyDrumRoll),
         }).ToList();
 
         [Cached(typeof(IScrollingInfo))]
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
new file mode 100644
index 0000000000..d3579fbbbd
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
@@ -0,0 +1,110 @@
+// Copyright (c) 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.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Taiko.Skinning
+{
+    public class LegacyDrumRoll : Container, IHasAccentColour
+    {
+        protected override Container<Drawable> Content => content;
+
+        private Container content;
+
+        private LegacyCirclePiece headCircle;
+
+        private Sprite body;
+
+        private Sprite end;
+
+        public LegacyDrumRoll()
+        {
+            RelativeSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            InternalChildren = new Drawable[]
+            {
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        headCircle = new LegacyCirclePiece
+                        {
+                            Depth = float.MinValue,
+                            RelativeSizeAxes = Axes.Y,
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                        },
+                        body = new Sprite
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Texture = skin.GetTexture("taiko-roll-middle"),
+                        },
+                        end = new Sprite
+                        {
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreLeft,
+                            RelativeSizeAxes = Axes.Both,
+                            Texture = skin.GetTexture("taiko-roll-end"),
+                            FillMode = FillMode.Fit,
+                        },
+                    },
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateAccentColour();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            var padding = Content.DrawHeight * Content.Width / 2;
+
+            Content.Padding = new MarginPadding
+            {
+                Left = padding,
+                Right = padding,
+            };
+
+            Width = Parent.DrawSize.X + DrawHeight;
+        }
+
+        private Color4 accentColour;
+
+        public Color4 AccentColour
+        {
+            get => accentColour;
+            set
+            {
+                if (value == accentColour)
+                    return;
+
+                accentColour = value;
+                if (IsLoaded)
+                    updateAccentColour();
+            }
+        }
+
+        private void updateAccentColour()
+        {
+            headCircle.AccentColour = accentColour;
+            body.Colour = accentColour;
+            end.Colour = accentColour;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 9cd625c35f..86e3945021 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -27,6 +27,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
             switch (taikoComponent.Component)
             {
+                case TaikoSkinComponents.DrumRollBody:
+                    if (GetTexture("taiko-roll-middle") != null)
+                        return new LegacyDrumRoll();
+
+                    return null;
+
                 case TaikoSkinComponents.InputDrum:
                     if (GetTexture("taiko-bar-left") != null)
                         return new LegacyInputDrum();

From 07632cd1e53a9e297861b5f152f5e74e7d2552bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Apr 2020 18:44:12 +0900
Subject: [PATCH 02208/10326] Remove unnecessary container logic

---
 .../Objects/Drawables/DrawableDrumRoll.cs     | 16 ++---
 .../Drawables/Pieces/ElongatedCirclePiece.cs  | 17 +++--
 .../Skinning/LegacyDrumRoll.cs                | 65 ++++++-------------
 3 files changed, 35 insertions(+), 63 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 5c3433cbf4..0a6f462607 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         private int rollingHits;
 
-        private Container<DrawableDrumRollTick> tickContainer;
+        private Container tickContainer;
 
         private Color4 colourIdle;
         private Color4 colourEngaged;
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             updateColour();
 
-            ((Container)MainPiece.Drawable).Add(tickContainer = new Container<DrawableDrumRollTick> { RelativeSizeAxes = Axes.Both });
+            Content.Add(tickContainer = new Container { RelativeSizeAxes = Axes.Both });
 
             if (MainPiece.Drawable is IHasAccentColour accentMain)
                 accentMain.AccentColour = colourIdle;
@@ -139,6 +139,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
+        private void updateColour()
+        {
+            Color4 newColour = Interpolation.ValueAt((float)rollingHits / rolling_hits_for_engaged_colour, colourIdle, colourEngaged, 0, 1);
+            (MainPiece.Drawable as IHasAccentColour)?.FadeAccent(newColour, 100);
+        }
+
         private class StrongNestedHit : DrawableStrongNestedHit
         {
             public StrongNestedHit(StrongHitObject strong, DrawableDrumRoll drumRoll)
@@ -156,11 +162,5 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             public override bool OnPressed(TaikoAction action) => false;
         }
-
-        private void updateColour()
-        {
-            Color4 newColour = Interpolation.ValueAt((float)rollingHits / rolling_hits_for_engaged_colour, colourIdle, colourEngaged, 0, 1);
-            (MainPiece.Drawable as IHasAccentColour)?.FadeAccent(newColour, 100);
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs
index 7e3272e42b..034ab6dd21 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
 {
@@ -12,18 +14,15 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
             RelativeSizeAxes = Axes.Y;
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AccentColour = colours.YellowDark;
+        }
+
         protected override void Update()
         {
             base.Update();
-
-            var padding = Content.DrawHeight * Content.Width / 2;
-
-            Content.Padding = new MarginPadding
-            {
-                Left = padding,
-                Right = padding,
-            };
-
             Width = Parent.DrawSize.X + DrawHeight;
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
index d3579fbbbd..8531f3cefd 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
@@ -11,12 +11,8 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
 {
-    public class LegacyDrumRoll : Container, IHasAccentColour
+    public class LegacyDrumRoll : CompositeDrawable, IHasAccentColour
     {
-        protected override Container<Drawable> Content => content;
-
-        private Container content;
-
         private LegacyCirclePiece headCircle;
 
         private Sprite body;
@@ -25,42 +21,34 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         public LegacyDrumRoll()
         {
-            RelativeSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        private void load(ISkinSource skin, OsuColour colours)
         {
             InternalChildren = new Drawable[]
             {
-                content = new Container
+                end = new Sprite
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreLeft,
+                    RelativeSizeAxes = Axes.Both,
+                    Texture = skin.GetTexture("taiko-roll-end"),
+                    FillMode = FillMode.Fit,
+                },
+                body = new Sprite
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        headCircle = new LegacyCirclePiece
-                        {
-                            Depth = float.MinValue,
-                            RelativeSizeAxes = Axes.Y,
-                            Anchor = Anchor.TopLeft,
-                            Origin = Anchor.TopLeft,
-                        },
-                        body = new Sprite
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Texture = skin.GetTexture("taiko-roll-middle"),
-                        },
-                        end = new Sprite
-                        {
-                            Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreLeft,
-                            RelativeSizeAxes = Axes.Both,
-                            Texture = skin.GetTexture("taiko-roll-end"),
-                            FillMode = FillMode.Fit,
-                        },
-                    },
+                    Texture = skin.GetTexture("taiko-roll-middle"),
+                },
+                headCircle = new LegacyCirclePiece
+                {
+                    RelativeSizeAxes = Axes.Y,
                 },
             };
+
+            AccentColour = colours.YellowDark;
         }
 
         protected override void LoadComplete()
@@ -69,21 +57,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             updateAccentColour();
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            var padding = Content.DrawHeight * Content.Width / 2;
-
-            Content.Padding = new MarginPadding
-            {
-                Left = padding,
-                Right = padding,
-            };
-
-            Width = Parent.DrawSize.X + DrawHeight;
-        }
-
         private Color4 accentColour;
 
         public Color4 AccentColour

From bfc0d41c0ca81f5a0cc4c3fb00e7d320fac55330 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Apr 2020 19:24:50 +0900
Subject: [PATCH 02209/10326] Add tick skinning support

---
 osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 86e3945021..3af7df07c4 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -46,6 +46,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                         return new LegacyHit(taikoComponent.Component);
 
                     return null;
+
+                case TaikoSkinComponents.DrumRollTick:
+                    return this.GetAnimation("sliderscorepoint", false, false);
             }
 
             return source.GetDrawableComponent(component);

From 47187ec14cbbcfe9ebb8157150cae30e1346c2aa Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Wed, 15 Apr 2020 18:04:23 +0300
Subject: [PATCH 02210/10326] Simplify recommended beatmap presenting

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index fea89155f5..68bf9c822f 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -346,19 +346,18 @@ namespace osu.Game
 
                 // Find beatmaps that match our predicate.
                 var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria?.Invoke(b) ?? true);
+
+                // Use all beatmaps if predicate matched nothing
                 if (!beatmaps.Any())
                     beatmaps = databasedSet.Beatmaps;
 
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
-
-                // fallback if a difficulty can't be recommended, maybe we are offline
-                if (selection == null)
-                {
-                    if (difficultyCriteria != null)
-                        selection = beatmaps.First();
-                    else
-                        selection = databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First();
-                }
+                // Try to select recommended beatmap
+                // This should give us a beatmap from current ruleset if there are any in our matched beatmaps
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps) ?? (
+                    // Fallback if a difficulty can't be recommended, maybe we are offline
+                    // First try to find a beatmap in current ruleset, otherwise use first beatmap
+                    beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value)) ?? beatmaps.First()
+                );
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);

From b5c1752f0a40a731bdefc4c328c2b9cb05a953bf Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Wed, 15 Apr 2020 18:14:51 +0300
Subject: [PATCH 02211/10326] Calculate best ruleset order only once

---
 .../Screens/Select/DifficultyRecommender.cs   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index bdc81ad066..e7536db356 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -32,8 +32,6 @@ namespace osu.Game.Screens.Select
         private void load()
         {
             api.Register(this);
-
-            ruleset.ValueChanged += _ => bestRulesetOrder = null;
         }
 
         /// <summary>
@@ -90,19 +88,22 @@ namespace osu.Game.Screens.Select
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
             if (bestRulesetOrder != null)
-                return bestRulesetOrder;
+                return moveCurrentRulesetToFirst();
 
-            var otherRulesets = recommendedStarDifficulty.ToList()
-                                                         .Where(pair => !pair.Key.Equals(ruleset.Value))
-                                                         .OrderBy(pair => pair.Value)
-                                                         .Select(pair => pair.Key)
-                                                         .Reverse();
+            bestRulesetOrder = recommendedStarDifficulty.ToList()
+                                                        .OrderBy(pair => pair.Value)
+                                                        .Select(pair => pair.Key)
+                                                        .Reverse();
 
-            var rulesetList = new List<RulesetInfo>(new[] { ruleset.Value });
-            rulesetList.AddRange(otherRulesets);
+            return moveCurrentRulesetToFirst();
+        }
 
-            bestRulesetOrder = rulesetList;
-            return rulesetList;
+        private IEnumerable<RulesetInfo> moveCurrentRulesetToFirst()
+        {
+            var orderedRulesets = bestRulesetOrder.ToList();
+            orderedRulesets.Remove(ruleset.Value);
+            orderedRulesets.Insert(0, ruleset.Value);
+            return orderedRulesets;
         }
 
         public void APIStateChanged(IAPIProvider api, APIState state)

From da9bd74e2eef2f08b85e6e8e15501f70299c4218 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Wed, 15 Apr 2020 20:19:17 +0300
Subject: [PATCH 02212/10326] Very basic testing

---
 .../TestSceneBeatmapRecommendations.cs        | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
new file mode 100644
index 0000000000..80a00ac9a1
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -0,0 +1,130 @@
+// Copyright (c) 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;
+using osu.Framework.Logging;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Select;
+using osu.Game.Tests.Visual.Navigation;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    public class TestSceneBeatmapRecommendations : OsuGameTestScene
+    {
+        [Resolved]
+        private DifficultyRecommender recommender { get; set; }
+
+        [SetUpSteps]
+        public new void SetUpSteps()
+        {
+            AddStep("register request handling", () =>
+            {
+                Logger.Log($"Registering request handling for {(DummyAPIAccess)API}");
+                ((DummyAPIAccess)API).HandleRequest = req =>
+                {
+                    Logger.Log($"New request {req}");
+
+                    switch (req)
+                    {
+                        case GetUserRequest userRequest:
+                            userRequest.TriggerSuccess(new User
+                            {
+                                Username = @"Dummy",
+                                Id = 1001,
+                                Statistics = new UserStatistics
+                                {
+                                    PP = 928 // Expected recommended star difficulty is 2.999
+                                }
+                            });
+                            break;
+                    }
+                };
+                // Force recommender to calculate its star ratings again
+                recommender.APIStateChanged(API, APIState.Online);
+            });
+        }
+
+        [Test]
+        public void TestPresentedBeatmapIsRecommended()
+        {
+            var importFunctions = importBeatmaps(5);
+
+            for (int i = 0; i < 5; i++)
+            {
+                presentAndConfirm(importFunctions[i], i);
+            }
+        }
+
+        private List<Func<BeatmapSetInfo>> importBeatmaps(int amount, RulesetInfo ruleset = null)
+        {
+            var importFunctions = new List<Func<BeatmapSetInfo>>();
+
+            for (int i = 0; i < amount; i++)
+            {
+                importFunctions.Add(importBeatmap(i, ruleset));
+            }
+
+            return importFunctions;
+        }
+
+        private Func<BeatmapSetInfo> importBeatmap(int i, RulesetInfo ruleset = null)
+        {
+            BeatmapSetInfo imported = null;
+            AddStep($"import beatmap {i * 1000}", () =>
+            {
+                var difficulty = new BeatmapDifficulty();
+                var metadata = new BeatmapMetadata
+                {
+                    Artist = "SomeArtist",
+                    AuthorString = "SomeAuthor",
+                    Title = $"import {i * 1000}"
+                };
+
+                var beatmaps = new List<BeatmapInfo>();
+
+                for (int j = 1; j <= 5; j++)
+                {
+                    beatmaps.Add(new BeatmapInfo
+                    {
+                        OnlineBeatmapID = j * 1024 + i * 5,
+                        Metadata = metadata,
+                        BaseDifficulty = difficulty,
+                        Ruleset = ruleset ?? new OsuRuleset().RulesetInfo,
+                        StarDifficulty = j,
+                    });
+                }
+
+                imported = Game.BeatmapManager.Import(new BeatmapSetInfo
+                {
+                    Hash = Guid.NewGuid().ToString(),
+                    OnlineBeatmapSetID = i,
+                    Metadata = metadata,
+                    Beatmaps = beatmaps,
+                }).Result;
+            });
+
+            AddAssert($"import {i * 1000} succeeded", () => imported != null);
+
+            return () => imported;
+        }
+
+        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID)
+        {
+            AddStep("present beatmap", () => Game.PresentBeatmap(getImport()));
+
+            AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is Screens.Select.SongSelect);
+            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID * 5 + 1024 * 3);
+            AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Beatmaps.First().Ruleset.ID);
+        }
+    }
+}

From f36477e39dd1bbd055d345997f91c99701ffa208 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Apr 2020 10:04:09 +0900
Subject: [PATCH 02213/10326] Add back "filled" property setting

---
 .../Objects/Drawables/DrawableDrumRollTick.cs                | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index e11e019826..689a7bfa64 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -21,7 +21,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         public override bool DisplayResult => false;
 
         protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.DrumRollTick),
-            _ => new TickPiece());
+            _ => new TickPiece
+            {
+                Filled = HitObject.FirstTick
+            });
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {

From e2b28bfe88cc94c685a8ddbe3f496190c39103c1 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 15 Apr 2020 18:17:12 -0700
Subject: [PATCH 02214/10326] Hide edit context menu item in multiplayer song
 select

---
 .../Select/Carousel/DrawableCarouselBeatmap.cs       | 12 +++++++++---
 osu.Game/Screens/Select/SongSelect.cs                | 10 ----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 2520c70989..a371c56101 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -41,6 +41,9 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved(CanBeNull = true)]
         private BeatmapSetOverlay beatmapOverlay { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private SongSelect songSelect { get; set; }
+
         public DrawableCarouselBeatmap(CarouselBeatmap panel)
             : base(panel)
         {
@@ -49,7 +52,7 @@ namespace osu.Game.Screens.Select.Carousel
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(SongSelect songSelect, BeatmapManager manager)
+        private void load(BeatmapManager manager)
         {
             if (songSelect != null)
             {
@@ -190,10 +193,13 @@ namespace osu.Game.Screens.Select.Carousel
                 List<MenuItem> items = new List<MenuItem>
                 {
                     new OsuMenuItem("Play", MenuItemType.Highlighted, () => startRequested?.Invoke(beatmap)),
-                    new OsuMenuItem("Edit", MenuItemType.Standard, () => editRequested?.Invoke(beatmap)),
-                    new OsuMenuItem("Hide", MenuItemType.Destructive, () => hideRequested?.Invoke(beatmap)),
                 };
 
+                if (songSelect.AllowEditing)
+                    items.Add(new OsuMenuItem("Edit", MenuItemType.Standard, () => editRequested?.Invoke(beatmap)));
+
+                items.Add(new OsuMenuItem("Hide", MenuItemType.Destructive, () => hideRequested?.Invoke(beatmap)));
+
                 if (beatmap.OnlineBeatmapID.HasValue)
                     items.Add(new OsuMenuItem("Details", MenuItemType.Standard, () => beatmapOverlay?.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index f164056ede..8967628954 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -34,7 +34,6 @@ 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
@@ -71,9 +70,6 @@ namespace osu.Game.Screens.Select
         /// </summary>
         public virtual bool AllowEditing => true;
 
-        [Resolved(canBeNull: true)]
-        private NotificationOverlay notificationOverlay { get; set; }
-
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; }
 
@@ -328,12 +324,6 @@ 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 06e25091f666c8b8f2ac4e4e42f1d24d83026c37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Apr 2020 10:44:08 +0900
Subject: [PATCH 02215/10326] Fix typo

---
 .../Visual/UserInterface/TestSceneOsuMenu.cs         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
index cdda1969ca..c171e567ad 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
@@ -21,12 +21,12 @@ namespace osu.Game.Tests.Visual.UserInterface
         };
 
         private OsuMenu menu;
-        private bool actionPeformed;
+        private bool actionPerformed;
 
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            actionPeformed = false;
+            actionPerformed = false;
 
             Child = menu = new OsuMenu(Direction.Vertical, true)
             {
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("move to first menu item", () => InputManager.MoveMouseTo(menu.ChildrenOfType<DrawableOsuMenuItem>().First()));
             AddStep("click", () => InputManager.Click(MouseButton.Left));
 
-            AddAssert("action performed", () => actionPeformed);
+            AddAssert("action performed", () => actionPerformed);
         }
 
         [Test]
@@ -62,7 +62,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("move to first menu item", () => InputManager.MoveMouseTo(menu.ChildrenOfType<DrawableOsuMenuItem>().First()));
             AddStep("click", () => InputManager.Click(MouseButton.Left));
 
-            AddAssert("action not performed", () => !actionPeformed);
+            AddAssert("action not performed", () => !actionPerformed);
         }
 
         [Test]
@@ -83,9 +83,9 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("move to first menu item", () => InputManager.MoveMouseTo(menu.ChildrenOfType<DrawableOsuMenuItem>().First()));
             AddStep("click", () => InputManager.Click(MouseButton.Left));
 
-            AddAssert("action performed", () => actionPeformed);
+            AddAssert("action performed", () => actionPerformed);
         }
 
-        private void performAction() => actionPeformed = true;
+        private void performAction() => actionPerformed = true;
     }
 }

From c4caf38febbe7862589c2f33d761c005a7e6f0fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Apr 2020 12:10:20 +0900
Subject: [PATCH 02216/10326] Simplify menu item checks (and add for other
 items)

---
 .../Carousel/DrawableCarouselBeatmap.cs       | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index a371c56101..3e4798a812 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -41,9 +41,6 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved(CanBeNull = true)]
         private BeatmapSetOverlay beatmapOverlay { get; set; }
 
-        [Resolved(CanBeNull = true)]
-        private SongSelect songSelect { get; set; }
-
         public DrawableCarouselBeatmap(CarouselBeatmap panel)
             : base(panel)
         {
@@ -52,12 +49,13 @@ namespace osu.Game.Screens.Select.Carousel
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(BeatmapManager manager)
+        private void load(BeatmapManager manager, SongSelect songSelect)
         {
             if (songSelect != null)
             {
                 startRequested = b => songSelect.FinaliseSelection(b);
-                editRequested = songSelect.Edit;
+                if (songSelect.AllowEditing)
+                    editRequested = songSelect.Edit;
             }
 
             if (manager != null)
@@ -190,18 +188,19 @@ namespace osu.Game.Screens.Select.Carousel
         {
             get
             {
-                List<MenuItem> items = new List<MenuItem>
-                {
-                    new OsuMenuItem("Play", MenuItemType.Highlighted, () => startRequested?.Invoke(beatmap)),
-                };
+                List<MenuItem> items = new List<MenuItem>();
 
-                if (songSelect.AllowEditing)
-                    items.Add(new OsuMenuItem("Edit", MenuItemType.Standard, () => editRequested?.Invoke(beatmap)));
+                if (startRequested != null)
+                    items.Add(new OsuMenuItem("Play", MenuItemType.Highlighted, () => startRequested(beatmap)));
 
-                items.Add(new OsuMenuItem("Hide", MenuItemType.Destructive, () => hideRequested?.Invoke(beatmap)));
+                if (editRequested != null)
+                    items.Add(new OsuMenuItem("Edit", MenuItemType.Standard, () => editRequested(beatmap)));
 
-                if (beatmap.OnlineBeatmapID.HasValue)
-                    items.Add(new OsuMenuItem("Details", MenuItemType.Standard, () => beatmapOverlay?.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
+                if (hideRequested != null)
+                    items.Add(new OsuMenuItem("Hide", MenuItemType.Destructive, () => hideRequested(beatmap)));
+
+                if (beatmap.OnlineBeatmapID.HasValue && beatmapOverlay != null)
+                    items.Add(new OsuMenuItem("Details", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
 
                 return items.ToArray();
             }

From 91b13f91eaaaad87dd221bdb8daf3ed34d7166b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Apr 2020 12:11:12 +0900
Subject: [PATCH 02217/10326] Add exception disallowing potential edit when
 disabled at a property level

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 8967628954..5bc2e1aa56 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -324,6 +324,9 @@ namespace osu.Game.Screens.Select
 
         public void Edit(BeatmapInfo beatmap = null)
         {
+            if (!AllowEditing)
+                throw new InvalidOperationException($"Attempted to edit when {nameof(AllowEditing)} is disabled");
+
             Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap ?? beatmapNoDebounce);
             this.Push(new Editor());
         }

From 03a74a4320db317e063130161933694d4563ca85 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Apr 2020 12:13:26 +0900
Subject: [PATCH 02218/10326] Apply same conditional check changes to
 DrawableCarouselBeatmapSet

---
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index a53b74c1b8..5acb6d1946 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Screens.Select.Carousel
         private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay)
         {
             restoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore);
+
             if (beatmapOverlay != null)
                 viewDetails = beatmapOverlay.FetchAndShowBeatmapSet;
 
@@ -131,13 +132,14 @@ namespace osu.Game.Screens.Select.Carousel
                 if (Item.State.Value == CarouselItemState.NotSelected)
                     items.Add(new OsuMenuItem("Expand", MenuItemType.Highlighted, () => Item.State.Value = CarouselItemState.Selected));
 
-                if (beatmapSet.OnlineBeatmapSetID != null)
-                    items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => viewDetails?.Invoke(beatmapSet.OnlineBeatmapSetID.Value)));
+                if (beatmapSet.OnlineBeatmapSetID != null && viewDetails != null)
+                    items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => viewDetails(beatmapSet.OnlineBeatmapSetID.Value)));
 
                 if (beatmapSet.Beatmaps.Any(b => b.Hidden))
-                    items.Add(new OsuMenuItem("Restore all hidden", MenuItemType.Standard, () => restoreHiddenRequested?.Invoke(beatmapSet)));
+                    items.Add(new OsuMenuItem("Restore all hidden", MenuItemType.Standard, () => restoreHiddenRequested(beatmapSet)));
 
-                items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay?.Push(new BeatmapDeleteDialog(beatmapSet))));
+                if (dialogOverlay != null)
+                    items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay.Push(new BeatmapDeleteDialog(beatmapSet))));
 
                 return items.ToArray();
             }

From 9e2be6f2f438dcc288bbe711c486a8cc112e310d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Apr 2020 13:25:08 +0900
Subject: [PATCH 02219/10326] Remove bindable to promote one-way access

---
 osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs | 6 +++---
 osu.Game/Graphics/UserInterface/OsuMenuItem.cs          | 6 ------
 osu.Game/Screens/Edit/Editor.cs                         | 9 +++++++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
index c171e567ad..9ea76c2c7b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("disable menu items", () =>
             {
                 foreach (var item in menu.Items)
-                    ((OsuMenuItem)item).Enabled.Value = false;
+                    ((OsuMenuItem)item).Action.Disabled = true;
             });
 
             AddStep("move to first menu item", () => InputManager.MoveMouseTo(menu.ChildrenOfType<DrawableOsuMenuItem>().First()));
@@ -71,13 +71,13 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("disable menu items", () =>
             {
                 foreach (var item in menu.Items)
-                    ((OsuMenuItem)item).Enabled.Value = false;
+                    ((OsuMenuItem)item).Action.Disabled = true;
             });
 
             AddStep("enable menu items", () =>
             {
                 foreach (var item in menu.Items)
-                    ((OsuMenuItem)item).Enabled.Value = true;
+                    ((OsuMenuItem)item).Action.Disabled = false;
             });
 
             AddStep("move to first menu item", () => InputManager.MoveMouseTo(menu.ChildrenOfType<DrawableOsuMenuItem>().First()));
diff --git a/osu.Game/Graphics/UserInterface/OsuMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuMenuItem.cs
index 36122ca0b2..0fe41937ce 100644
--- a/osu.Game/Graphics/UserInterface/OsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/OsuMenuItem.cs
@@ -2,15 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterface
 {
     public class OsuMenuItem : MenuItem
     {
-        public readonly Bindable<bool> Enabled = new Bindable<bool>(true);
-
         public readonly MenuItemType Type;
 
         public OsuMenuItem(string text, MenuItemType type = MenuItemType.Standard)
@@ -22,9 +19,6 @@ namespace osu.Game.Graphics.UserInterface
             : base(text, action)
         {
             Type = type;
-
-            Enabled.BindValueChanged(enabled => Action.Disabled = !enabled.NewValue);
-            Action.BindDisabledChanged(disabled => Enabled.Value = !disabled);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index ad17498d93..9a1f450dc6 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -107,6 +107,8 @@ namespace osu.Game.Screens.Edit
             dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
 
             EditorMenuBar menuBar;
+            OsuMenuItem undoMenuItem;
+            OsuMenuItem redoMenuItem;
 
             var fileMenuItems = new List<MenuItem>
             {
@@ -155,8 +157,8 @@ namespace osu.Game.Screens.Edit
                                 {
                                     Items = new[]
                                     {
-                                        new EditorMenuItem("Undo", MenuItemType.Standard, undo) { Enabled = { BindTarget = changeHandler.CanUndo } },
-                                        new EditorMenuItem("Redo", MenuItemType.Standard, redo) { Enabled = { BindTarget = changeHandler.CanRedo } }
+                                        undoMenuItem = new EditorMenuItem("Undo", MenuItemType.Standard, undo),
+                                        redoMenuItem = new EditorMenuItem("Redo", MenuItemType.Standard, redo)
                                     }
                                 }
                             }
@@ -214,6 +216,9 @@ namespace osu.Game.Screens.Edit
                 }
             });
 
+            changeHandler.CanUndo.BindValueChanged(v => undoMenuItem.Action.Disabled = !v.NewValue, true);
+            changeHandler.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
+
             menuBar.Mode.ValueChanged += onModeChanged;
 
             bottomBackground.Colour = colours.Gray2;

From 9dda7da489918120d251c6c266272f41a2fa8671 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Apr 2020 14:11:38 +0900
Subject: [PATCH 02220/10326] Fix spinners being considered the "first object"
 for increased visibility in hidden

---
 .../Mods/TestSceneOsuModHidden.cs             | 106 ++++++++++++++++++
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs    |   2 +
 osu.Game/Rulesets/Mods/ModHidden.cs           |  14 ++-
 3 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
new file mode 100644
index 0000000000..8bd3d3c7cc
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
@@ -0,0 +1,106 @@
+// Copyright (c) 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.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.Mods
+{
+    public class TestSceneOsuModHidden : ModTestScene
+    {
+        public TestSceneOsuModHidden()
+            : base(new OsuRuleset())
+        {
+        }
+
+        [Test]
+        public void TestDefaultBeatmapTest() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModHidden(),
+            Autoplay = true,
+            PassCondition = checkSomeHit
+        });
+
+        [Test]
+        public void FirstCircleAfterTwoSpinners() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModHidden(),
+            Autoplay = true,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Spinner
+                    {
+                        Position = new Vector2(256, 192),
+                        EndTime = 1000,
+                    },
+                    new Spinner
+                    {
+                        Position = new Vector2(256, 192),
+                        StartTime = 1200,
+                        EndTime = 2200,
+                    },
+                    new HitCircle
+                    {
+                        Position = new Vector2(300, 192),
+                        StartTime = 3200,
+                    },
+                    new HitCircle
+                    {
+                        Position = new Vector2(384, 192),
+                        StartTime = 4200,
+                    }
+                }
+            },
+            PassCondition = checkSomeHit
+        });
+
+        [Test]
+        public void FirstSliderAfterTwoSpinners() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModHidden(),
+            Autoplay = true,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Spinner
+                    {
+                        Position = new Vector2(256, 192),
+                        EndTime = 1000,
+                    },
+                    new Spinner
+                    {
+                        Position = new Vector2(256, 192),
+                        StartTime = 1200,
+                        EndTime = 2200,
+                    },
+                    new Slider
+                    {
+                        StartTime = 3200,
+                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+                    },
+                    new Slider
+                    {
+                        StartTime = 5200,
+                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+                    }
+                }
+            },
+            PassCondition = checkSomeHit
+        });
+
+        private bool checkSomeHit()
+        {
+            return Player.ScoreProcessor.JudgedHits >= 4;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 91a4e049e3..fdba03f260 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         private const double fade_in_duration_multiplier = 0.4;
         private const double fade_out_duration_multiplier = 0.3;
 
+        protected override bool IsFirstHideableObject(DrawableHitObject hitObject) => !(hitObject is DrawableSpinner);
+
         public override void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
             static void adjustFadeIn(OsuHitObject h) => h.TimeFadeIn = h.TimePreempt * fade_in_duration_multiplier;
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 4e4a75db82..a1915b974c 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -23,6 +23,13 @@ namespace osu.Game.Rulesets.Mods
 
         protected Bindable<bool> IncreaseFirstObjectVisibility = new Bindable<bool>();
 
+        /// <summary>
+        /// Check whether the provided hitobject should be considered the "first" hideable object.
+        /// Can be used to skip spinners, for instance.
+        /// </summary>
+        /// <param name="hitObject">The hitobject to check.</param>
+        protected virtual bool IsFirstHideableObject(DrawableHitObject hitObject) => true;
+
         public void ReadFromConfig(OsuConfigManager config)
         {
             IncreaseFirstObjectVisibility = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility);
@@ -30,8 +37,11 @@ namespace osu.Game.Rulesets.Mods
 
         public virtual void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
-            foreach (var d in drawables.Skip(IncreaseFirstObjectVisibility.Value ? 1 : 0))
-                d.ApplyCustomUpdateState += ApplyHiddenState;
+            if (IncreaseFirstObjectVisibility.Value)
+                drawables = drawables.SkipWhile(h => !IsFirstHideableObject(h)).Skip(1);
+
+            foreach (var dho in drawables)
+                dho.ApplyCustomUpdateState += ApplyHiddenState;
         }
 
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)

From ef0da9e3e831096674d37ba799246de1d569a786 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 16 Apr 2020 11:01:36 +0300
Subject: [PATCH 02221/10326] Basic overlay layout implementation

---
 .../Online/TestSceneDashboardOverlay.cs       | 43 +++++++++++++
 .../Dashboard/DashboardOverlayHeader.cs       | 24 +++++++
 osu.Game/Overlays/DashboardOverlay.cs         | 62 +++++++++++++++++++
 3 files changed, 129 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.cs
 create mode 100644 osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
 create mode 100644 osu.Game/Overlays/DashboardOverlay.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.cs
new file mode 100644
index 0000000000..df95f24686
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.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 NUnit.Framework;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dashboard;
+using osu.Game.Overlays.Dashboard.Friends;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneDashboardOverlay : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DashboardOverlay),
+            typeof(DashboardOverlayHeader),
+            typeof(FriendDisplay)
+        };
+
+        protected override bool UseOnlineAPI => true;
+
+        private readonly DashboardOverlay overlay;
+
+        public TestSceneDashboardOverlay()
+        {
+            Add(overlay = new DashboardOverlay());
+        }
+
+        [Test]
+        public void TestShow()
+        {
+            AddStep("Show", overlay.Show);
+        }
+
+        [Test]
+        public void TestHide()
+        {
+            AddStep("Hide", overlay.Hide);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
new file mode 100644
index 0000000000..1c52b033a5
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.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.Dashboard
+{
+    public class DashboardOverlayHeader : TabControlOverlayHeader<HomeOverlayTabs>
+    {
+        protected override OverlayTitle CreateTitle() => new DashboardTitle();
+
+        private class DashboardTitle : OverlayTitle
+        {
+            public DashboardTitle()
+            {
+                Title = "dashboard";
+                IconTexture = "Icons/changelog";
+            }
+        }
+    }
+
+    public enum HomeOverlayTabs
+    {
+        Friends
+    }
+}
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
new file mode 100644
index 0000000000..a1a7c9889a
--- /dev/null
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -0,0 +1,62 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Dashboard;
+
+namespace osu.Game.Overlays
+{
+    public class DashboardOverlay : FullscreenOverlay
+    {
+        private readonly Box background;
+        private readonly Container content;
+
+        public DashboardOverlay()
+            : base(OverlayColourScheme.Purple)
+        {
+            Children = new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                new OverlayScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    ScrollbarVisible = false,
+                    Child = new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Direction = FillDirection.Vertical,
+                        Children = new Drawable[]
+                        {
+                            new DashboardOverlayHeader
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Depth = -float.MaxValue
+                            },
+                            content = new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y
+                            }
+                        }
+                    }
+                },
+                new LoadingLayer(content),
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            background.Colour = ColourProvider.Background5;
+        }
+    }
+}

From 2ab4a7293ec507b691fbf5fcd1208634fbe74aa2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Apr 2020 17:26:09 +0900
Subject: [PATCH 02222/10326] Clean up enum sorting attribute code

---
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 18 +------
 .../BeatmapListing/BeatmapSearchFilterRow.cs  | 28 ++--------
 osu.Game/Utils/OrderAttribute.cs              | 52 +++++++++++++++++++
 3 files changed, 56 insertions(+), 42 deletions(-)
 create mode 100644 osu.Game/Utils/OrderAttribute.cs

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index aef0788b49..1206563b18 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.ComponentModel;
 using osu.Framework.IO.Network;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Direct;
 using osu.Game.Rulesets;
+using osu.Game.Utils;
 
 namespace osu.Game.Online.API.Requests
 {
@@ -139,20 +139,4 @@ namespace osu.Game.Online.API.Requests
         [Order(5)]
         Italian
     }
-
-    [AttributeUsage(AttributeTargets.Field)]
-    public class OrderAttribute : Attribute
-    {
-        public readonly int Order;
-
-        public OrderAttribute(int order)
-        {
-            Order = order;
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Enum)]
-    public class HasOrderedElementsAttribute : Attribute
-    {
-    }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index bc0a011e31..64b3afcae1 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -2,7 +2,6 @@
 // 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.Bindables;
@@ -14,10 +13,10 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API.Requests;
 using osuTK;
 using osuTK.Graphics;
 using Humanizer;
+using osu.Game.Utils;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -82,30 +81,9 @@ namespace osu.Game.Overlays.BeatmapListing
 
                 TabContainer.Spacing = new Vector2(10, 0);
 
-                var type = typeof(T);
-
-                if (type.IsEnum)
+                if (typeof(T).IsEnum)
                 {
-                    if (Attribute.GetCustomAttribute(type, typeof(HasOrderedElementsAttribute)) != null)
-                    {
-                        var enumValues = Enum.GetValues(type).Cast<T>().ToArray();
-                        var enumNames = Enum.GetNames(type);
-
-                        int[] enumPositions = Array.ConvertAll(enumNames, n =>
-                        {
-                            var orderAttr = (OrderAttribute)type.GetField(n).GetCustomAttributes(typeof(OrderAttribute), false)[0];
-                            return orderAttr.Order;
-                        });
-
-                        Array.Sort(enumPositions, enumValues);
-
-                        foreach (var val in enumValues)
-                            AddItem(val);
-
-                        return;
-                    }
-
-                    foreach (var val in (T[])Enum.GetValues(type))
+                    foreach (var val in OrderAttributeUtils.GetValuesInOrder<T>())
                         AddItem(val);
                 }
             }
diff --git a/osu.Game/Utils/OrderAttribute.cs b/osu.Game/Utils/OrderAttribute.cs
new file mode 100644
index 0000000000..4959caa726
--- /dev/null
+++ b/osu.Game/Utils/OrderAttribute.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 System.Linq;
+
+namespace osu.Game.Utils
+{
+    public static class OrderAttributeUtils
+    {
+        /// <summary>
+        /// Get values of an enum in order. Supports custom ordering via <see cref="OrderAttribute"/>.
+        /// </summary>
+        public static IEnumerable<T> GetValuesInOrder<T>()
+        {
+            var type = typeof(T);
+
+            if (!type.IsEnum)
+                throw new InvalidOperationException("T must be an enum");
+
+            IEnumerable<T> items = (T[])Enum.GetValues(type);
+
+            if (Attribute.GetCustomAttribute(type, typeof(HasOrderedElementsAttribute)) == null)
+                return items;
+
+            return items.OrderBy(i =>
+            {
+                if (type.GetField(i.ToString()).GetCustomAttributes(typeof(OrderAttribute), false).FirstOrDefault() is OrderAttribute attr)
+                    return attr.Order;
+
+                return 0;
+            });
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Field)]
+    public class OrderAttribute : Attribute
+    {
+        public readonly int Order;
+
+        public OrderAttribute(int order)
+        {
+            Order = order;
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Enum)]
+    public class HasOrderedElementsAttribute : Attribute
+    {
+    }
+}

From c6aa6acc1b2f46c6c39a0d241325b1d2d8f154a5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Apr 2020 17:28:06 +0900
Subject: [PATCH 02223/10326] Apply performance calculator changes

---
 .../Difficulty/CatchPerformanceCalculator.cs                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
index 21d4642c22..bc52f0b812 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             if (approachRate > 9.0f)
                 approachRateFactor += 0.1f * (approachRate - 9.0f); // 10% for each AR above 9
             if (approachRate > 10.0f)
-                approachRateFactor += 0.2f * (float)Math.Pow(approachRate - 10.0f, 1.5f); // Additional 20% at AR 11, 40% total
+                approachRateFactor += 0.1f * (approachRate - 10.0f); // Additional 10% at AR 11, 30% total
             else if (approachRate < 8.0f)
                 approachRateFactor += 0.025f * (8.0f - approachRate); // 2.5% for each AR below 8
 

From 29bea4e11c03292545a9937a149f28c3686c14c4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 16 Apr 2020 11:42:21 +0300
Subject: [PATCH 02224/10326] Implement OverlayView component

---
 .../Visual/Online/TestSceneFriendDisplay.cs   |  17 ++-
 .../Dashboard/Friends/FriendDisplay.cs        | 143 ++++++++----------
 osu.Game/Overlays/OverlayView.cs              |  71 +++++++++
 3 files changed, 149 insertions(+), 82 deletions(-)
 create mode 100644 osu.Game/Overlays/OverlayView.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
index cf365a7614..0b5ff1c960 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
@@ -10,6 +10,7 @@ using osu.Game.Users;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
 using NUnit.Framework;
+using osu.Game.Online.API;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -27,7 +28,7 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private FriendDisplay display;
+        private TestFriendDisplay display;
 
         [SetUp]
         public void Setup() => Schedule(() =>
@@ -35,7 +36,7 @@ namespace osu.Game.Tests.Visual.Online
             Child = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = display = new FriendDisplay()
+                Child = display = new TestFriendDisplay()
             };
         });
 
@@ -83,5 +84,17 @@ namespace osu.Game.Tests.Visual.Online
                 LastVisit = DateTimeOffset.Now
             }
         };
+
+        private class TestFriendDisplay : FriendDisplay
+        {
+            public void Fetch()
+            {
+                base.APIStateChanged(API, APIState.Online);
+            }
+
+            public override void APIStateChanged(IAPIProvider api, APIState state)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index 3c9b31daae..9764f82199 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -16,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Dashboard.Friends
 {
-    public class FriendDisplay : CompositeDrawable
+    public class FriendDisplay : OverlayView<List<User>>
     {
         private List<User> users = new List<User>();
 
@@ -26,15 +26,10 @@ namespace osu.Game.Overlays.Dashboard.Friends
             set
             {
                 users = value;
-
                 onlineStreamControl.Populate(value);
             }
         }
 
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        private GetFriendsRequest request;
         private CancellationTokenSource cancellationToken;
 
         private Drawable currentContent;
@@ -48,92 +43,85 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
         public FriendDisplay()
         {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            InternalChild = new FillFlowContainer
+            AddRange(new Drawable[]
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Children = new Drawable[]
+                new Container
                 {
-                    new Container
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Children = new Drawable[]
+                        controlBackground = new Box
                         {
-                            controlBackground = new Box
+                            RelativeSizeAxes = Axes.Both
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Padding = new MarginPadding
                             {
-                                RelativeSizeAxes = Axes.Both
+                                Top = 20,
+                                Horizontal = 45
                             },
-                            new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Padding = new MarginPadding
-                                {
-                                    Top = 20,
-                                    Horizontal = 45
-                                },
-                                Child = onlineStreamControl = new FriendOnlineStreamControl(),
-                            }
+                            Child = onlineStreamControl = new FriendOnlineStreamControl(),
                         }
-                    },
-                    new Container
+                    }
+                },
+                new Container
+                {
+                    Name = "User List",
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Children = new Drawable[]
                     {
-                        Name = "User List",
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Children = new Drawable[]
+                        background = new Box
                         {
-                            background = new Box
+                            RelativeSizeAxes = Axes.Both
+                        },
+                        new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Vertical,
+                            Margin = new MarginPadding { Bottom = 20 },
+                            Children = new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both
-                            },
-                            new FillFlowContainer
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Direction = FillDirection.Vertical,
-                                Margin = new MarginPadding { Bottom = 20 },
-                                Children = new Drawable[]
+                                new Container
                                 {
-                                    new Container
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Padding = new MarginPadding
                                     {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Padding = new MarginPadding
-                                        {
-                                            Horizontal = 40,
-                                            Vertical = 20
-                                        },
-                                        Child = userListToolbar = new UserListToolbar
-                                        {
-                                            Anchor = Anchor.CentreRight,
-                                            Origin = Anchor.CentreRight,
-                                        }
+                                        Horizontal = 40,
+                                        Vertical = 20
                                     },
-                                    new Container
+                                    Child = userListToolbar = new UserListToolbar
                                     {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Children = new Drawable[]
+                                        Anchor = Anchor.CentreRight,
+                                        Origin = Anchor.CentreRight,
+                                    }
+                                },
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Children = new Drawable[]
+                                    {
+                                        itemsPlaceholder = new Container
                                         {
-                                            itemsPlaceholder = new Container
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                AutoSizeAxes = Axes.Y,
-                                                Padding = new MarginPadding { Horizontal = 50 }
-                                            },
-                                            loading = new LoadingLayer(itemsPlaceholder)
-                                        }
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Padding = new MarginPadding { Horizontal = 50 }
+                                        },
+                                        loading = new LoadingLayer(itemsPlaceholder)
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -152,14 +140,11 @@ namespace osu.Game.Overlays.Dashboard.Friends
             userListToolbar.SortCriteria.BindValueChanged(_ => recreatePanels());
         }
 
-        public void Fetch()
-        {
-            if (!api.IsLoggedIn)
-                return;
+        protected override APIRequest<List<User>> CreateRequest() => new GetFriendsRequest();
 
-            request = new GetFriendsRequest();
-            request.Success += response => Schedule(() => Users = response);
-            api.Queue(request);
+        protected override void OnSuccess(List<User> response)
+        {
+            Users = response;
         }
 
         private void recreatePanels()
@@ -258,9 +243,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
         protected override void Dispose(bool isDisposing)
         {
-            request?.Cancel();
             cancellationToken?.Cancel();
-
             base.Dispose(isDisposing);
         }
     }
diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
new file mode 100644
index 0000000000..f39c6bd1b9
--- /dev/null
+++ b/osu.Game/Overlays/OverlayView.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.API;
+
+namespace osu.Game.Overlays
+{
+    /// <summary>
+    /// Drawable which used to represent online content in <see cref="FullscreenOverlay"/>.
+    /// </summary>
+    /// <typeparam name="T">Response type</typeparam>
+    public abstract class OverlayView<T> : Container, IOnlineComponent
+        where T : class
+    {
+        [Resolved]
+        protected IAPIProvider API { get; private set; }
+
+        protected override Container<Drawable> Content => content;
+
+        private readonly FillFlowContainer content;
+
+        protected OverlayView()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            AddInternal(content = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            API.Register(this);
+        }
+
+        private APIRequest<T> request;
+
+        protected abstract APIRequest<T> CreateRequest();
+
+        protected abstract void OnSuccess(T response);
+
+        public virtual void APIStateChanged(IAPIProvider api, APIState state)
+        {
+            switch (state)
+            {
+                case APIState.Online:
+                    request = CreateRequest();
+                    request.Success += response => Schedule(() => OnSuccess(response));
+                    api.Queue(request);
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            request?.Cancel();
+            API?.Unregister(this);
+            base.Dispose(isDisposing);
+        }
+    }
+}

From 894598eb220e7cc05f3fab5df81a786973f804d5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 16 Apr 2020 12:05:51 +0300
Subject: [PATCH 02225/10326] Replace SocialOverlay with DashboardOverlay

---
 osu.Game.Tests/Visual/TestSceneOsuGame.cs     |  2 +-
 osu.Game/OsuGame.cs                           |  8 +-
 .../Dashboard/DashboardOverlayHeader.cs       |  4 +-
 osu.Game/Overlays/DashboardOverlay.cs         | 94 ++++++++++++++++++-
 .../Overlays/Toolbar/ToolbarSocialButton.cs   |  4 +-
 5 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestSceneOsuGame.cs b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
index 492494ada3..8793d880e3 100644
--- a/osu.Game.Tests/Visual/TestSceneOsuGame.cs
+++ b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual
             typeof(OnScreenDisplay),
             typeof(NotificationOverlay),
             typeof(DirectOverlay),
-            typeof(SocialOverlay),
+            typeof(DashboardOverlay),
             typeof(ChannelManager),
             typeof(ChatOverlay),
             typeof(SettingsOverlay),
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5e93d760e3..c861b84835 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -67,7 +67,7 @@ namespace osu.Game
 
         private DirectOverlay direct;
 
-        private SocialOverlay social;
+        private DashboardOverlay dashboard;
 
         private UserProfileOverlay userProfile;
 
@@ -611,7 +611,7 @@ namespace osu.Game
 
             //overlay elements
             loadComponentSingleFile(direct = new DirectOverlay(), overlayContent.Add, true);
-            loadComponentSingleFile(social = new SocialOverlay(), overlayContent.Add, true);
+            loadComponentSingleFile(dashboard = new DashboardOverlay(), overlayContent.Add, true);
             var rankingsOverlay = loadComponentSingleFile(new RankingsOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(channelManager = new ChannelManager(), AddInternal, true);
             loadComponentSingleFile(chatOverlay = new ChatOverlay(), overlayContent.Add, true);
@@ -670,7 +670,7 @@ namespace osu.Game
             }
 
             // ensure only one of these overlays are open at once.
-            var singleDisplayOverlays = new OverlayContainer[] { chatOverlay, social, direct, changelogOverlay, rankingsOverlay };
+            var singleDisplayOverlays = new OverlayContainer[] { chatOverlay, dashboard, direct, changelogOverlay, rankingsOverlay };
 
             foreach (var overlay in singleDisplayOverlays)
             {
@@ -842,7 +842,7 @@ namespace osu.Game
                     return true;
 
                 case GlobalAction.ToggleSocial:
-                    social.ToggleVisibility();
+                    dashboard.ToggleVisibility();
                     return true;
 
                 case GlobalAction.ResetInputSettings:
diff --git a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
index 1c52b033a5..9ee679a866 100644
--- a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
+++ b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Overlays.Dashboard
 {
-    public class DashboardOverlayHeader : TabControlOverlayHeader<HomeOverlayTabs>
+    public class DashboardOverlayHeader : TabControlOverlayHeader<DashboardOverlayTabs>
     {
         protected override OverlayTitle CreateTitle() => new DashboardTitle();
 
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Dashboard
         }
     }
 
-    public enum HomeOverlayTabs
+    public enum DashboardOverlayTabs
     {
         Friends
     }
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index a1a7c9889a..1e0fbc90b4 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -1,19 +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 System;
+using System.Threading;
 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;
 using osu.Game.Overlays.Dashboard;
+using osu.Game.Overlays.Dashboard.Friends;
 
 namespace osu.Game.Overlays
 {
     public class DashboardOverlay : FullscreenOverlay
     {
+        private CancellationTokenSource cancellationToken;
+
         private readonly Box background;
         private readonly Container content;
+        private readonly DashboardOverlayHeader header;
+        private readonly LoadingLayer loading;
+        private readonly OverlayScrollContainer scrollFlow;
 
         public DashboardOverlay()
             : base(OverlayColourScheme.Purple)
@@ -24,7 +34,7 @@ namespace osu.Game.Overlays
                 {
                     RelativeSizeAxes = Axes.Both
                 },
-                new OverlayScrollContainer
+                scrollFlow = new OverlayScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarVisible = false,
@@ -35,7 +45,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            new DashboardOverlayHeader
+                            header = new DashboardOverlayHeader
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
@@ -49,7 +59,7 @@ namespace osu.Game.Overlays
                         }
                     }
                 },
-                new LoadingLayer(content),
+                loading = new LoadingLayer(content),
             };
         }
 
@@ -58,5 +68,83 @@ namespace osu.Game.Overlays
         {
             background.Colour = ColourProvider.Background5;
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            header.Current.BindValueChanged(onTabChanged);
+        }
+
+        private bool displayUpdateRequired = true;
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+
+            // We don't want to create new display on every call, only when exiting from fully closed state.
+            if (displayUpdateRequired)
+            {
+                header.Current.TriggerChange();
+                displayUpdateRequired = false;
+            }
+        }
+
+        protected override void PopOutComplete()
+        {
+            base.PopOutComplete();
+            loadDisplay(Empty());
+            displayUpdateRequired = true;
+        }
+
+        private void loadDisplay(Drawable display)
+        {
+            scrollFlow.ScrollToStart();
+
+            LoadComponentAsync(display, loaded =>
+            {
+                loading.Hide();
+                content.Child = loaded;
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        private void onTabChanged(ValueChangedEvent<DashboardOverlayTabs> tab)
+        {
+            cancellationToken?.Cancel();
+
+            loading.Show();
+
+            switch (tab.NewValue)
+            {
+                case DashboardOverlayTabs.Friends:
+                    loadDisplay(new FriendDisplay());
+                    break;
+
+                default:
+                    throw new NotImplementedException($"Display for {tab.NewValue} tab is not implemented");
+            }
+        }
+
+        public override void APIStateChanged(IAPIProvider api, APIState state)
+        {
+            switch (state)
+            {
+                case APIState.Online:
+                    // Will force to create a display based on visibility state
+                    displayUpdateRequired = true;
+                    State.TriggerChange();
+                    return;
+
+                default:
+                    content.Clear();
+                    loading.Show();
+                    return;
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            cancellationToken?.Cancel();
+            base.Dispose(isDisposing);
+        }
     }
 }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
index 5e353d3319..f6646eb81d 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
@@ -14,9 +14,9 @@ namespace osu.Game.Overlays.Toolbar
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(SocialOverlay chat)
+        private void load(DashboardOverlay dashboard)
         {
-            StateContainer = chat;
+            StateContainer = dashboard;
         }
     }
 }

From eb86be0a6da6d76dfef8526eff26ddb584d8bd7b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 16 Apr 2020 12:07:38 +0300
Subject: [PATCH 02226/10326] Adjust header content margin

---
 osu.Game/Overlays/OverlayHeader.cs           | 4 +++-
 osu.Game/Overlays/TabControlOverlayHeader.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index 4ac0f697c3..dbc934bde9 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Overlays
 {
     public abstract class OverlayHeader : Container
     {
+        public const int CONTENT_X_MARGIN = 50;
+
         private readonly Box titleBackground;
 
         protected readonly FillFlowContainer HeaderInfo;
@@ -54,7 +56,7 @@ namespace osu.Game.Overlays
                                         AutoSizeAxes = Axes.Y,
                                         Padding = new MarginPadding
                                         {
-                                            Horizontal = UserProfileOverlay.CONTENT_X_MARGIN,
+                                            Horizontal = CONTENT_X_MARGIN,
                                         },
                                         Children = new[]
                                         {
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index ab1a6aff78..e8e000f441 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays
                     },
                     TabControl = CreateTabControl().With(control =>
                     {
-                        control.Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN };
+                        control.Margin = new MarginPadding { Left = CONTENT_X_MARGIN };
                         control.Current = Current;
                     })
                 }

From 87f52b82331dc1f6ba4b198d96cb8b768a152c19 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 16 Apr 2020 12:09:44 +0300
Subject: [PATCH 02227/10326] Remove redundant switch section

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

diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
index f39c6bd1b9..e3a07fc2de 100644
--- a/osu.Game/Overlays/OverlayView.cs
+++ b/osu.Game/Overlays/OverlayView.cs
@@ -55,9 +55,6 @@ namespace osu.Game.Overlays
                     request.Success += response => Schedule(() => OnSuccess(response));
                     api.Queue(request);
                     break;
-
-                default:
-                    break;
             }
         }
 

From d62094cd4ba1e9d20d60edc8e326198c615f8732 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Apr 2020 18:10:35 +0900
Subject: [PATCH 02228/10326] Fix carousel not correctly updating when
 selection changes to a new beatmap from a child screen

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index a8225ba1ec..d8178bbbbb 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -217,6 +217,9 @@ namespace osu.Game.Screens.Select
         /// <returns>True if a selection was made, False if it wasn't.</returns>
         public bool SelectBeatmap(BeatmapInfo beatmap, bool bypassFilters = true)
         {
+            // ensure that any pending events from BeatmapManager have been run before attempting a selection.
+            Scheduler.Update();
+
             if (beatmap?.Hidden != false)
                 return false;
 

From d7ea5432a8b1eda9d85e29de2261b0d4cfa3ccbc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Apr 2020 18:15:52 +0900
Subject: [PATCH 02229/10326] Fix incorrect combo calculation

---
 .../Difficulty/CatchPerformanceCalculator.cs                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
index bc52f0b812..e7ce680365 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)
-                value *= Math.Min(Math.Pow(Attributes.MaxCombo, 0.8) / Math.Pow(Attributes.MaxCombo, 0.8), 1.0);
+                value *= Math.Min(Math.Pow(Score.MaxCombo, 0.8) / Math.Pow(Attributes.MaxCombo, 0.8), 1.0);
 
             float approachRate = (float)Attributes.ApproachRate;
             float approachRateFactor = 1.0f;

From ae210d567d794f5b16587b8684bb9bdb9edfeeb2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Apr 2020 18:16:08 +0900
Subject: [PATCH 02230/10326] Add temporary solution for tick hit/miss count

---
 osu.Game/Rulesets/Scoring/HitResult.cs        |  5 +++++
 .../Scoring/Legacy/ScoreInfoExtensions.cs     | 21 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 7ba88d3df8..0c895bd086 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -43,5 +43,10 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         [Description(@"Perfect")]
         Perfect,
+
+        SmallTickHit,
+        SmallTickMiss,
+        LargeTickHit,
+        LargeTickMiss,
     }
 }
diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index 66b1acf591..9745d1abef 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -66,6 +66,9 @@ namespace osu.Game.Scoring.Legacy
             {
                 case 3:
                     return scoreInfo.Statistics[HitResult.Good];
+
+                case 2:
+                    return scoreInfo.Statistics[HitResult.SmallTickMiss];
             }
 
             return null;
@@ -78,6 +81,10 @@ namespace osu.Game.Scoring.Legacy
                 case 3:
                     scoreInfo.Statistics[HitResult.Good] = value;
                     break;
+
+                case 2:
+                    scoreInfo.Statistics[HitResult.SmallTickMiss] = value;
+                    break;
             }
         }
 
@@ -91,6 +98,9 @@ namespace osu.Game.Scoring.Legacy
 
                 case 3:
                     return scoreInfo.Statistics[HitResult.Ok];
+
+                case 2:
+                    return scoreInfo.Statistics[HitResult.LargeTickHit];
             }
 
             return null;
@@ -108,6 +118,10 @@ namespace osu.Game.Scoring.Legacy
                 case 3:
                     scoreInfo.Statistics[HitResult.Ok] = value;
                     break;
+
+                case 2:
+                    scoreInfo.Statistics[HitResult.LargeTickHit] = value;
+                    break;
             }
         }
 
@@ -118,6 +132,9 @@ namespace osu.Game.Scoring.Legacy
                 case 0:
                 case 3:
                     return scoreInfo.Statistics[HitResult.Meh];
+
+                case 2:
+                    return scoreInfo.Statistics[HitResult.SmallTickHit];
             }
 
             return null;
@@ -131,6 +148,10 @@ namespace osu.Game.Scoring.Legacy
                 case 3:
                     scoreInfo.Statistics[HitResult.Meh] = value;
                     break;
+
+                case 2:
+                    scoreInfo.Statistics[HitResult.SmallTickHit] = value;
+                    break;
             }
         }
 

From c5a343d3a07daf31ad95a036850a05e7007f2a41 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 16 Apr 2020 14:10:39 +0300
Subject: [PATCH 02231/10326] Fix overlay accepting state changes while hidden

---
 osu.Game/Overlays/DashboardOverlay.cs | 28 +++++++++++++--------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 1e0fbc90b4..86c0f3bd83 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Overlays
         {
             base.PopIn();
 
-            // We don't want to create new display on every call, only when exiting from fully closed state.
+            // We don't want to create a new display on every call, only when exiting from fully closed state.
             if (displayUpdateRequired)
             {
                 header.Current.TriggerChange();
@@ -102,7 +102,9 @@ namespace osu.Game.Overlays
 
             LoadComponentAsync(display, loaded =>
             {
-                loading.Hide();
+                if (API.IsLoggedIn)
+                    loading.Hide();
+
                 content.Child = loaded;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
@@ -110,9 +112,14 @@ namespace osu.Game.Overlays
         private void onTabChanged(ValueChangedEvent<DashboardOverlayTabs> tab)
         {
             cancellationToken?.Cancel();
-
             loading.Show();
 
+            if (!API.IsLoggedIn)
+            {
+                loadDisplay(Empty());
+                return;
+            }
+
             switch (tab.NewValue)
             {
                 case DashboardOverlayTabs.Friends:
@@ -126,19 +133,10 @@ namespace osu.Game.Overlays
 
         public override void APIStateChanged(IAPIProvider api, APIState state)
         {
-            switch (state)
-            {
-                case APIState.Online:
-                    // Will force to create a display based on visibility state
-                    displayUpdateRequired = true;
-                    State.TriggerChange();
-                    return;
+            if (State.Value == Visibility.Hidden)
+                return;
 
-                default:
-                    content.Clear();
-                    loading.Show();
-                    return;
-            }
+            header.Current.TriggerChange();
         }
 
         protected override void Dispose(bool isDisposing)

From 3daacbc2d202b3d42ac84e7242e571a045d8fa09 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 13:34:20 +0900
Subject: [PATCH 02232/10326] Initial inefficient refactor of hitobject
 enumeration

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 76 ++++++++------------
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs     |  2 +-
 2 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index dfca2aff7b..171ce6fe61 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.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 osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 
@@ -37,12 +37,9 @@ namespace osu.Game.Rulesets.Osu.UI
             DrawableHitObject blockingObject = null;
 
             // Find the last hitobject which blocks future hits.
-            foreach (var obj in hitObjectContainer.AliveObjects)
+            foreach (var obj in enumerateHitObjectsUpTo(hitObject))
             {
-                if (obj == hitObject)
-                    break;
-
-                if (drawableCanBlockFutureHits(obj))
+                if (hitObjectCanBlockFutureHits(obj))
                     blockingObject = obj;
             }
 
@@ -64,64 +61,47 @@ namespace osu.Game.Rulesets.Osu.UI
         /// Handles a <see cref="HitObject"/> being hit to potentially miss all earlier <see cref="HitObject"/>s.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
-        public void HandleHit(HitObject hitObject)
+        public void HandleHit(DrawableHitObject hitObject)
         {
             // Hitobjects which themselves don't block future hitobjects don't cause misses (e.g. slider ticks, spinners).
             if (!hitObjectCanBlockFutureHits(hitObject))
                 return;
 
-            double maximumTime = hitObject.StartTime;
-
-            // Iterate through and apply miss results to all top-level and nested hitobjects which block future hits.
-            foreach (var obj in hitObjectContainer.AliveObjects)
+            foreach (var obj in enumerateHitObjectsUpTo(hitObject))
             {
-                if (obj.Judged || obj.HitObject.StartTime >= maximumTime)
+                if (obj.Judged)
                     continue;
 
-                if (hitObjectCanBlockFutureHits(obj.HitObject))
-                    applyMiss(obj);
-
-                foreach (var nested in obj.NestedHitObjects)
-                {
-                    if (nested.Judged || nested.HitObject.StartTime >= maximumTime)
-                        continue;
-
-                    if (hitObjectCanBlockFutureHits(nested.HitObject))
-                        applyMiss(nested);
-                }
+                if (hitObjectCanBlockFutureHits(obj))
+                    ((DrawableOsuHitObject)obj).MissForcefully();
             }
-
-            static void applyMiss(DrawableHitObject obj) => ((DrawableOsuHitObject)obj).MissForcefully();
-        }
-
-        /// <summary>
-        /// Whether a <see cref="DrawableHitObject"/> blocks hits on future <see cref="DrawableHitObject"/>s until its start time is reached.
-        /// </summary>
-        /// <remarks>
-        /// This will ONLY match on top-most <see cref="DrawableHitObject"/>s.
-        /// </remarks>
-        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to test.</param>
-        private static bool drawableCanBlockFutureHits(DrawableHitObject hitObject)
-        {
-            // Special considerations for slider tails aren't required since only top-most drawable hitobjects are being iterated over.
-            return hitObject is DrawableHitCircle || hitObject is DrawableSlider;
         }
 
         /// <summary>
         /// Whether a <see cref="HitObject"/> blocks hits on future <see cref="HitObject"/>s until its start time is reached.
         /// </summary>
-        /// <remarks>
-        /// This is more rigorous and may not match on top-most <see cref="HitObject"/>s as <see cref="drawableCanBlockFutureHits"/> does.
-        /// </remarks>
         /// <param name="hitObject">The <see cref="HitObject"/> to test.</param>
-        private static bool hitObjectCanBlockFutureHits(HitObject hitObject)
-        {
-            // Unlike the above we will receive slider tails, but they do not block future hits.
-            if (hitObject is SliderTailCircle)
-                return false;
+        private static bool hitObjectCanBlockFutureHits(DrawableHitObject hitObject)
+            => hitObject is DrawableHitCircle;
 
-            // All other hitcircles continue to block future hits.
-            return hitObject is HitCircle;
+        // Todo: Inefficient
+        private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(DrawableHitObject hitObject)
+        {
+            return enumerate(hitObjectContainer.AliveObjects);
+
+            IEnumerable<DrawableHitObject> enumerate(IEnumerable<DrawableHitObject> list)
+            {
+                foreach (var obj in list)
+                {
+                    if (obj.HitObject.StartTime >= hitObject.HitObject.StartTime)
+                        yield break;
+
+                    yield return obj;
+
+                    foreach (var nested in enumerate(obj.NestedHitObjects))
+                        yield return nested;
+                }
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 2f222f59b4..4b1a2ce43c 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Osu.UI
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             // Hitobjects that block future hits should miss previous hitobjects if they're hit out-of-order.
-            hitPolicy.HandleHit(result.HitObject);
+            hitPolicy.HandleHit(judgedObject);
 
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;

From 62f77a05befb156ac6cda6411f2dda85ffcc8b44 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 14:00:00 +0900
Subject: [PATCH 02233/10326] Optimise by removing state machine

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 115 +++++++++++++++----
 1 file changed, 95 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index 171ce6fe61..b55e04ec4c 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -36,11 +38,14 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             DrawableHitObject blockingObject = null;
 
-            // Find the last hitobject which blocks future hits.
-            foreach (var obj in enumerateHitObjectsUpTo(hitObject))
+            var enumerator = new HitObjectEnumerator(hitObjectContainer, hitObject.HitObject.StartTime);
+
+            while (enumerator.MoveNext())
             {
-                if (hitObjectCanBlockFutureHits(obj))
-                    blockingObject = obj;
+                Debug.Assert(enumerator.Current != null);
+
+                if (hitObjectCanBlockFutureHits(enumerator.Current))
+                    blockingObject = enumerator.Current;
             }
 
             // If there is no previous hitobject, allow the hit.
@@ -67,13 +72,17 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!hitObjectCanBlockFutureHits(hitObject))
                 return;
 
-            foreach (var obj in enumerateHitObjectsUpTo(hitObject))
+            var enumerator = new HitObjectEnumerator(hitObjectContainer, hitObject.HitObject.StartTime);
+
+            while (enumerator.MoveNext())
             {
-                if (obj.Judged)
+                Debug.Assert(enumerator.Current != null);
+
+                if (enumerator.Current.Judged)
                     continue;
 
-                if (hitObjectCanBlockFutureHits(obj))
-                    ((DrawableOsuHitObject)obj).MissForcefully();
+                if (hitObjectCanBlockFutureHits(enumerator.Current))
+                    ((DrawableOsuHitObject)enumerator.Current).MissForcefully();
             }
         }
 
@@ -84,23 +93,89 @@ namespace osu.Game.Rulesets.Osu.UI
         private static bool hitObjectCanBlockFutureHits(DrawableHitObject hitObject)
             => hitObject is DrawableHitCircle;
 
-        // Todo: Inefficient
-        private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(DrawableHitObject hitObject)
+        private struct HitObjectEnumerator : IEnumerator<DrawableHitObject>
         {
-            return enumerate(hitObjectContainer.AliveObjects);
+            private readonly IEnumerator<DrawableHitObject> hitObjectEnumerator;
+            private readonly double targetTime;
 
-            IEnumerable<DrawableHitObject> enumerate(IEnumerable<DrawableHitObject> list)
+            private DrawableHitObject currentTopLevel;
+            private int currentNestedIndex;
+
+            public HitObjectEnumerator(HitObjectContainer hitObjectContainer, double targetTime)
             {
-                foreach (var obj in list)
-                {
-                    if (obj.HitObject.StartTime >= hitObject.HitObject.StartTime)
-                        yield break;
+                hitObjectEnumerator = hitObjectContainer.AliveObjects.GetEnumerator();
+                this.targetTime = targetTime;
 
-                    yield return obj;
+                currentTopLevel = null;
+                currentNestedIndex = -1;
+                Current = null;
+            }
 
-                    foreach (var nested in enumerate(obj.NestedHitObjects))
-                        yield return nested;
-                }
+            /// <summary>
+            /// Attempts to move to the next top-level or nested hitobject.
+            /// Stops when no such hitobject is found or until the hitobject start time reaches <see cref="targetTime"/>.
+            /// </summary>
+            /// <returns>Whether a new hitobject was moved to.</returns>
+            public bool MoveNext()
+            {
+                // If we don't already have a top-level hitobject, try to get one.
+                if (currentTopLevel == null)
+                    return moveNextTopLevel();
+
+                // If we have a top-level hitobject, try to move to the next nested hitobject or otherwise move to the next top-level hitobject.
+                if (!moveNextNested())
+                    return moveNextTopLevel();
+
+                // Guaranteed by moveNextNested() to have a hitobject.
+                return true;
+            }
+
+            /// <summary>
+            /// Attempts to move to the next top-level hitobject.
+            /// </summary>
+            /// <returns>Whether a new top-level hitobject was found.</returns>
+            private bool moveNextTopLevel()
+            {
+                currentNestedIndex = -1;
+
+                hitObjectEnumerator.MoveNext();
+                currentTopLevel = hitObjectEnumerator.Current;
+
+                Current = currentTopLevel;
+
+                return Current?.HitObject.StartTime < targetTime;
+            }
+
+            /// <summary>
+            /// Attempts to move to the next nested hitobject in the current top-level hitobject.
+            /// </summary>
+            /// <returns>Whether a new nested hitobject was moved to.</returns>
+            private bool moveNextNested()
+            {
+                currentNestedIndex++;
+                if (currentNestedIndex >= currentTopLevel.NestedHitObjects.Count)
+                    return false;
+
+                Current = currentTopLevel.NestedHitObjects[currentNestedIndex];
+                Debug.Assert(Current != null);
+
+                return Current?.HitObject.StartTime < targetTime;
+            }
+
+            public void Reset()
+            {
+                hitObjectEnumerator.Reset();
+                currentTopLevel = null;
+                currentNestedIndex = -1;
+                Current = null;
+            }
+
+            public DrawableHitObject Current { get; set; }
+
+            object IEnumerator.Current => Current;
+
+            public void Dispose()
+            {
             }
         }
     }

From ee5301b887a78a3bd0cabab17c306857133da794 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 14:12:38 +0900
Subject: [PATCH 02234/10326] Fix head/tail circles not getting correct hit
 windows

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index d6858f831e..3df51be600 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -371,6 +371,9 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     HeadCircle.HitWindows = new TestHitWindows();
                     TailCircle.HitWindows = new TestHitWindows();
+
+                    HeadCircle.HitWindows.SetDifficulty(0);
+                    TailCircle.HitWindows.SetDifficulty(0);
                 };
             }
         }

From 08df9d49e52a968691b77a76fe360c3111eb3436 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 14:12:43 +0900
Subject: [PATCH 02235/10326] Add failing test

---
 .../TestSceneOutOfOrderHits.cs                | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index 3df51be600..40ee53e8f2 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -296,6 +296,44 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Great);
         }
 
+        [Test]
+        public void TestHitSliderHeadBeforeHitCircle()
+        {
+            const double time_circle = 1000;
+            const double time_slider = 1200;
+            Vector2 positionCircle = Vector2.Zero;
+            Vector2 positionSlider = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+                new TestSlider
+                {
+                    StartTime = time_slider,
+                    Position = positionSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_circle - 100, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_circle, Position = positionCircle, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_slider, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",

From a4a782381797f927bc80f108cbbf94f410faef99 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 14:22:03 +0900
Subject: [PATCH 02236/10326] Add fail-safe to ensure hittability after a hit

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index b55e04ec4c..31edefea83 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.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;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -72,6 +73,9 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!hitObjectCanBlockFutureHits(hitObject))
                 return;
 
+            if (!IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
+                throw new InvalidOperationException($"A {hitObject} was hit before it become hittable!");
+
             var enumerator = new HitObjectEnumerator(hitObjectContainer, hitObject.HitObject.StartTime);
 
             while (enumerator.MoveNext())

From 4e4fe5cc904107ac647ffaa57d5ac17361ee073e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 14:33:29 +0900
Subject: [PATCH 02237/10326] Fix slider heads not being blocked when hit out
 of order

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 522217a916..72502c02cd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -125,7 +125,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     return new DrawableSliderTail(slider, tail);
 
                 case SliderHeadCircle head:
-                    return new DrawableSliderHead(slider, head) { OnShake = Shake };
+                    return new DrawableSliderHead(slider, head)
+                    {
+                        OnShake = Shake,
+                        CheckHittable = (d, t) => CheckHittable?.Invoke(d, t) ?? true
+                    };
 
                 case SliderTick tick:
                     return new DrawableSliderTick(tick) { Position = tick.Position - slider.Position };

From 2dee5e03e30f158880a09aaa04ded47879d6f74d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 14:40:29 +0900
Subject: [PATCH 02238/10326] Dispose enumerators for safety

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 31 +++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index 31edefea83..4bc7da4794 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
@@ -39,14 +39,15 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             DrawableHitObject blockingObject = null;
 
-            var enumerator = new HitObjectEnumerator(hitObjectContainer, hitObject.HitObject.StartTime);
-
-            while (enumerator.MoveNext())
+            using (var enumerator = new HitObjectEnumerator(hitObjectContainer, hitObject.HitObject.StartTime))
             {
-                Debug.Assert(enumerator.Current != null);
+                while (enumerator.MoveNext())
+                {
+                    Debug.Assert(enumerator.Current != null);
 
-                if (hitObjectCanBlockFutureHits(enumerator.Current))
-                    blockingObject = enumerator.Current;
+                    if (hitObjectCanBlockFutureHits(enumerator.Current))
+                        blockingObject = enumerator.Current;
+                }
             }
 
             // If there is no previous hitobject, allow the hit.
@@ -76,17 +77,18 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
                 throw new InvalidOperationException($"A {hitObject} was hit before it become hittable!");
 
-            var enumerator = new HitObjectEnumerator(hitObjectContainer, hitObject.HitObject.StartTime);
-
-            while (enumerator.MoveNext())
+            using (var enumerator = new HitObjectEnumerator(hitObjectContainer, hitObject.HitObject.StartTime))
             {
-                Debug.Assert(enumerator.Current != null);
+                while (enumerator.MoveNext())
+                {
+                    Debug.Assert(enumerator.Current != null);
 
-                if (enumerator.Current.Judged)
-                    continue;
+                    if (enumerator.Current.Judged)
+                        continue;
 
-                if (hitObjectCanBlockFutureHits(enumerator.Current))
-                    ((DrawableOsuHitObject)enumerator.Current).MissForcefully();
+                    if (hitObjectCanBlockFutureHits(enumerator.Current))
+                        ((DrawableOsuHitObject)enumerator.Current).MissForcefully();
+                }
             }
         }
 
@@ -180,6 +182,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
             public void Dispose()
             {
+                hitObjectEnumerator?.Dispose();
             }
         }
     }

From bbcbd7e3fbc790e91415bc96ffcfb93c63bcffc6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 14:48:12 +0900
Subject: [PATCH 02239/10326] Simplify by removing custom enumerator

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 118 +++----------------
 1 file changed, 19 insertions(+), 99 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index 4bc7da4794..cd9838e7bf 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
@@ -2,9 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -39,15 +37,10 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             DrawableHitObject blockingObject = null;
 
-            using (var enumerator = new HitObjectEnumerator(hitObjectContainer, hitObject.HitObject.StartTime))
+            foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))
             {
-                while (enumerator.MoveNext())
-                {
-                    Debug.Assert(enumerator.Current != null);
-
-                    if (hitObjectCanBlockFutureHits(enumerator.Current))
-                        blockingObject = enumerator.Current;
-                }
+                if (hitObjectCanBlockFutureHits(obj))
+                    blockingObject = obj;
             }
 
             // If there is no previous hitobject, allow the hit.
@@ -77,18 +70,13 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
                 throw new InvalidOperationException($"A {hitObject} was hit before it become hittable!");
 
-            using (var enumerator = new HitObjectEnumerator(hitObjectContainer, hitObject.HitObject.StartTime))
+            foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))
             {
-                while (enumerator.MoveNext())
-                {
-                    Debug.Assert(enumerator.Current != null);
+                if (obj.Judged)
+                    continue;
 
-                    if (enumerator.Current.Judged)
-                        continue;
-
-                    if (hitObjectCanBlockFutureHits(enumerator.Current))
-                        ((DrawableOsuHitObject)enumerator.Current).MissForcefully();
-                }
+                if (hitObjectCanBlockFutureHits(obj))
+                    ((DrawableOsuHitObject)obj).MissForcefully();
             }
         }
 
@@ -99,90 +87,22 @@ namespace osu.Game.Rulesets.Osu.UI
         private static bool hitObjectCanBlockFutureHits(DrawableHitObject hitObject)
             => hitObject is DrawableHitCircle;
 
-        private struct HitObjectEnumerator : IEnumerator<DrawableHitObject>
+        private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(double targetTime)
         {
-            private readonly IEnumerator<DrawableHitObject> hitObjectEnumerator;
-            private readonly double targetTime;
-
-            private DrawableHitObject currentTopLevel;
-            private int currentNestedIndex;
-
-            public HitObjectEnumerator(HitObjectContainer hitObjectContainer, double targetTime)
+            foreach (var obj in hitObjectContainer.AliveObjects)
             {
-                hitObjectEnumerator = hitObjectContainer.AliveObjects.GetEnumerator();
-                this.targetTime = targetTime;
+                if (obj.HitObject.StartTime >= targetTime)
+                    yield break;
 
-                currentTopLevel = null;
-                currentNestedIndex = -1;
-                Current = null;
-            }
+                yield return obj;
 
-            /// <summary>
-            /// Attempts to move to the next top-level or nested hitobject.
-            /// Stops when no such hitobject is found or until the hitobject start time reaches <see cref="targetTime"/>.
-            /// </summary>
-            /// <returns>Whether a new hitobject was moved to.</returns>
-            public bool MoveNext()
-            {
-                // If we don't already have a top-level hitobject, try to get one.
-                if (currentTopLevel == null)
-                    return moveNextTopLevel();
+                for (int i = 0; i < obj.NestedHitObjects.Count; i++)
+                {
+                    if (obj.NestedHitObjects[i].HitObject.StartTime >= targetTime)
+                        break;
 
-                // If we have a top-level hitobject, try to move to the next nested hitobject or otherwise move to the next top-level hitobject.
-                if (!moveNextNested())
-                    return moveNextTopLevel();
-
-                // Guaranteed by moveNextNested() to have a hitobject.
-                return true;
-            }
-
-            /// <summary>
-            /// Attempts to move to the next top-level hitobject.
-            /// </summary>
-            /// <returns>Whether a new top-level hitobject was found.</returns>
-            private bool moveNextTopLevel()
-            {
-                currentNestedIndex = -1;
-
-                hitObjectEnumerator.MoveNext();
-                currentTopLevel = hitObjectEnumerator.Current;
-
-                Current = currentTopLevel;
-
-                return Current?.HitObject.StartTime < targetTime;
-            }
-
-            /// <summary>
-            /// Attempts to move to the next nested hitobject in the current top-level hitobject.
-            /// </summary>
-            /// <returns>Whether a new nested hitobject was moved to.</returns>
-            private bool moveNextNested()
-            {
-                currentNestedIndex++;
-                if (currentNestedIndex >= currentTopLevel.NestedHitObjects.Count)
-                    return false;
-
-                Current = currentTopLevel.NestedHitObjects[currentNestedIndex];
-                Debug.Assert(Current != null);
-
-                return Current?.HitObject.StartTime < targetTime;
-            }
-
-            public void Reset()
-            {
-                hitObjectEnumerator.Reset();
-                currentTopLevel = null;
-                currentNestedIndex = -1;
-                Current = null;
-            }
-
-            public DrawableHitObject Current { get; set; }
-
-            object IEnumerator.Current => Current;
-
-            public void Dispose()
-            {
-                hitObjectEnumerator?.Dispose();
+                    yield return obj.NestedHitObjects[i];
+                }
             }
         }
     }

From 69fb984e71fae2c371b19de763cbf8a80ff861d2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 17:04:09 +0900
Subject: [PATCH 02240/10326] Remove EquivalentTo() and Equals()

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs       | 11 +----------
 .../Beatmaps/ControlPoints/DifficultyControlPoint.cs  |  7 +++----
 osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs | 10 +++++-----
 osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs |  9 ++++-----
 osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs |  9 ++-------
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs            |  7 ++++---
 osu.Game/Graphics/Containers/BeatSyncedContainer.cs   |  2 +-
 7 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index 9599ad184b..f9bb3877d3 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -5,7 +5,7 @@ using System;
 
 namespace osu.Game.Beatmaps.ControlPoints
 {
-    public abstract class ControlPoint : IComparable<ControlPoint>, IEquatable<ControlPoint>
+    public abstract class ControlPoint : IComparable<ControlPoint>
     {
         /// <summary>
         /// The time at which the control point takes effect.
@@ -18,13 +18,6 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public int CompareTo(ControlPoint other) => Time.CompareTo(other.Time);
 
-        /// <summary>
-        /// Whether this control point is equivalent to another, ignoring time.
-        /// </summary>
-        /// <param name="other">Another control point to compare with.</param>
-        /// <returns>Whether equivalent.</returns>
-        public abstract bool EquivalentTo(ControlPoint other);
-
         /// <summary>
         /// Whether this control point results in a meaningful change when placed after another.
         /// </summary>
@@ -32,7 +25,5 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="time">The time this control point will be placed at if it is added.</param>
         /// <returns>Whether redundant.</returns>
         public abstract bool IsRedundant(ControlPoint existing, double time);
-
-        public bool Equals(ControlPoint other) => Time == other?.Time && EquivalentTo(other);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index dc856b0a0a..42140462cb 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -27,9 +27,8 @@ namespace osu.Game.Beatmaps.ControlPoints
             set => SpeedMultiplierBindable.Value = value;
         }
 
-        public override bool EquivalentTo(ControlPoint other) =>
-            other is DifficultyControlPoint otherTyped && otherTyped.SpeedMultiplier.Equals(SpeedMultiplier);
-
-        public override bool IsRedundant(ControlPoint existing, double time) => EquivalentTo(existing);
+        public override bool IsRedundant(ControlPoint existing, double time)
+            => existing is DifficultyControlPoint existingDifficulty
+               && SpeedMultiplier == existingDifficulty.SpeedMultiplier;
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index d050f44ba4..f7a232c394 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -35,10 +35,10 @@ namespace osu.Game.Beatmaps.ControlPoints
             set => KiaiModeBindable.Value = value;
         }
 
-        public override bool EquivalentTo(ControlPoint other) =>
-            other is EffectControlPoint otherTyped &&
-            KiaiMode == otherTyped.KiaiMode && OmitFirstBarLine == otherTyped.OmitFirstBarLine;
-
-        public override bool IsRedundant(ControlPoint existing, double time) => !OmitFirstBarLine && EquivalentTo(existing);
+        public override bool IsRedundant(ControlPoint existing, double time)
+            => !OmitFirstBarLine
+               && existing is EffectControlPoint existingEffect
+               && KiaiMode == existingEffect.KiaiMode
+               && OmitFirstBarLine == existingEffect.OmitFirstBarLine;
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index 38edbe70da..0fced16b4d 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -68,10 +68,9 @@ namespace osu.Game.Beatmaps.ControlPoints
             return newSampleInfo;
         }
 
-        public override bool EquivalentTo(ControlPoint other) =>
-            other is SampleControlPoint otherTyped &&
-            SampleBank == otherTyped.SampleBank && SampleVolume == otherTyped.SampleVolume;
-
-        public override bool IsRedundant(ControlPoint existing, double time) => EquivalentTo(existing);
+        public override bool IsRedundant(ControlPoint existing, double time)
+            => existing is SampleControlPoint existingSample
+               && SampleBank == existingSample.SampleBank
+               && SampleVolume == existingSample.SampleVolume;
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 316c603ece..27f4662d49 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -48,12 +48,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         public double BPM => 60000 / BeatLength;
 
-        public override bool EquivalentTo(ControlPoint other) =>
-            other is TimingControlPoint otherTyped
-            && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
-
-        public override bool IsRedundant(ControlPoint existing, double time) =>
-            EquivalentTo(existing)
-            && existing.Time == time;
+        // Timing points are never redundant as they can change the time signature.
+        public override bool IsRedundant(ControlPoint existing, double time) => false;
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 561707f9ef..5fa1da111d 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -174,9 +174,10 @@ namespace osu.Game.Beatmaps.Formats
                 return baseInfo;
             }
 
-            public override bool EquivalentTo(ControlPoint other) =>
-                base.EquivalentTo(other) && other is LegacySampleControlPoint otherTyped &&
-                CustomSampleBank == otherTyped.CustomSampleBank;
+            public override bool IsRedundant(ControlPoint existing, double time)
+                => base.IsRedundant(existing, time)
+                   && existing is LegacySampleControlPoint existingSample
+                   && CustomSampleBank == existingSample.CustomSampleBank;
         }
     }
 }
diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index f36079682e..5a613d1a54 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Graphics.Containers
 
             TimeSinceLastBeat = beatLength - TimeUntilNextBeat;
 
-            if (timingPoint.Equals(lastTimingPoint) && beatIndex == lastBeat)
+            if (timingPoint == lastTimingPoint && beatIndex == lastBeat)
                 return;
 
             using (BeginDelayedSequence(-TimeSinceLastBeat, true))

From 9aac98664ce9379938cea94e62dc3bb31df13a26 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 17:06:12 +0900
Subject: [PATCH 02241/10326] Remove unnecessary time property

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs           | 7 +++----
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs       | 2 +-
 osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs | 2 +-
 osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs     | 2 +-
 osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs     | 2 +-
 osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs     | 2 +-
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs                | 4 ++--
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index f9bb3877d3..a1822a1163 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -19,11 +19,10 @@ namespace osu.Game.Beatmaps.ControlPoints
         public int CompareTo(ControlPoint other) => Time.CompareTo(other.Time);
 
         /// <summary>
-        /// Whether this control point results in a meaningful change when placed after another.
+        /// Determines whether this <see cref="ControlPoint"/> results in a meaningful change when placed alongside another.
         /// </summary>
         /// <param name="existing">An existing control point to compare with.</param>
-        /// <param name="time">The time this control point will be placed at if it is added.</param>
-        /// <returns>Whether redundant.</returns>
-        public abstract bool IsRedundant(ControlPoint existing, double time);
+        /// <returns>Whether this <see cref="ControlPoint"/> is redundant when placed alongside <paramref name="existing"/>.</returns>
+        public abstract bool IsRedundant(ControlPoint existing);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 37a3dbf592..8e4079f776 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Beatmaps.ControlPoints
                     break;
             }
 
-            return newPoint.IsRedundant(existing, time);
+            return newPoint.IsRedundant(existing);
         }
 
         private void groupItemAdded(ControlPoint controlPoint)
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 42140462cb..2448b2b25c 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             set => SpeedMultiplierBindable.Value = value;
         }
 
-        public override bool IsRedundant(ControlPoint existing, double time)
+        public override bool IsRedundant(ControlPoint existing)
             => existing is DifficultyControlPoint existingDifficulty
                && SpeedMultiplier == existingDifficulty.SpeedMultiplier;
     }
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index f7a232c394..9b69147468 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             set => KiaiModeBindable.Value = value;
         }
 
-        public override bool IsRedundant(ControlPoint existing, double time)
+        public override bool IsRedundant(ControlPoint existing)
             => !OmitFirstBarLine
                && existing is EffectControlPoint existingEffect
                && KiaiMode == existingEffect.KiaiMode
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index 0fced16b4d..61851a00d7 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             return newSampleInfo;
         }
 
-        public override bool IsRedundant(ControlPoint existing, double time)
+        public override bool IsRedundant(ControlPoint existing)
             => existing is SampleControlPoint existingSample
                && SampleBank == existingSample.SampleBank
                && SampleVolume == existingSample.SampleVolume;
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 27f4662d49..1927dd6575 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -49,6 +49,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         public double BPM => 60000 / BeatLength;
 
         // Timing points are never redundant as they can change the time signature.
-        public override bool IsRedundant(ControlPoint existing, double time) => false;
+        public override bool IsRedundant(ControlPoint existing) => false;
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 5fa1da111d..556527bfd5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -174,8 +174,8 @@ namespace osu.Game.Beatmaps.Formats
                 return baseInfo;
             }
 
-            public override bool IsRedundant(ControlPoint existing, double time)
-                => base.IsRedundant(existing, time)
+            public override bool IsRedundant(ControlPoint existing)
+                => base.IsRedundant(existing)
                    && existing is LegacySampleControlPoint existingSample
                    && CustomSampleBank == existingSample.CustomSampleBank;
         }

From 0fba93bf658d917286defb5b029fcf5bc0f1b566 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 17:10:13 +0900
Subject: [PATCH 02242/10326] Add back null check

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

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 8e4079f776..d33a922a32 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Beatmaps.ControlPoints
                     break;
             }
 
-            return newPoint.IsRedundant(existing);
+            return newPoint?.IsRedundant(existing) == true;
         }
 
         private void groupItemAdded(ControlPoint controlPoint)

From 67bd7bfa3905aa96f21f2225a517e2e369e80540 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 17 Apr 2020 06:17:15 +0300
Subject: [PATCH 02243/10326] Add `CreateRuleset` in OsuTestScene for scenes
 that depend on it

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 5dc8714c07..8058a074ef 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -70,7 +70,18 @@ namespace osu.Game.Tests.Visual
             Beatmap.SetDefault();
 
             Ruleset = Dependencies.Ruleset;
-            Ruleset.SetDefault();
+
+            var definedRuleset = CreateRuleset()?.RulesetInfo;
+
+            if (definedRuleset != null)
+            {
+                // Set global ruleset bindable to the ruleset defined
+                // for this test scene and disallow changing it.
+                Ruleset.Value = definedRuleset;
+                Ruleset.Disabled = true;
+            }
+            else
+                Ruleset.SetDefault();
 
             SelectedMods = Dependencies.Mods;
             SelectedMods.SetDefault();
@@ -124,6 +135,14 @@ namespace osu.Game.Tests.Visual
         [Resolved]
         protected AudioManager Audio { get; private set; }
 
+        /// <summary>
+        /// Creates the ruleset to be used for this test scene.
+        /// </summary>
+        /// <remarks>
+        /// When testing against ruleset-specific components, this method must be overriden to their ruleset.
+        /// </remarks>
+        protected virtual Ruleset CreateRuleset() => null;
+
         protected virtual IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset);
 
         protected WorkingBeatmap CreateWorkingBeatmap(RulesetInfo ruleset) =>
@@ -135,7 +154,8 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
         {
-            Ruleset.Value = rulesets.AvailableRulesets.First();
+            if (!Ruleset.Disabled)
+                Ruleset.Value = rulesets.AvailableRulesets.First();
         }
 
         protected override void Dispose(bool isDisposing)

From 5fa6bcb5a3f73b080873f48ee34a7dcec0a9da58 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 17 Apr 2020 11:17:14 +0300
Subject: [PATCH 02244/10326] Move `SkinnableTestScene` into using the global
 `CreateRuleset` method

---
 .../CatchSkinnableTestScene.cs                      |  2 +-
 .../Skinning/ManiaSkinnableTestScene.cs             |  4 ++--
 .../OsuSkinnableTestScene.cs                        |  2 +-
 .../TaikoSkinnableTestScene.cs                      |  2 +-
 osu.Game/Tests/Visual/SkinnableTestScene.cs         | 13 ++++++++-----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
index 0c46b078b5..c0060af74a 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(CatchLegacySkinTransformer),
         };
 
-        protected override Ruleset CreateRulesetForSkinProvider() => new CatchRuleset();
+        protected override Ruleset CreateRuleset() => new CatchRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index a3c1d518c5..f41ba4db42 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             typeof(ManiaSettingsSubsection)
         };
 
-        protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
-
         protected ManiaSkinnableTestScene()
         {
             scrollingInfo.Direction.Value = ScrollingDirection.Down;
@@ -60,6 +58,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             AddStep("change direction to up", () => scrollingInfo.Direction.Value = ScrollingDirection.Up);
         }
 
+        protected override Ruleset CreateRuleset() => new ManiaRuleset();
+
         private class TestScrollingInfo : IScrollingInfo
         {
             public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
index 90ebbd9f04..1458270193 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             typeof(OsuLegacySkinTransformer),
         };
 
-        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+        protected override Ruleset CreateRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs
index 6db2a6907f..98e6c2ec52 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
             typeof(TaikoLegacySkinTransformer),
         };
 
-        protected override Ruleset CreateRulesetForSkinProvider() => new TaikoRuleset();
+        protected override Ruleset CreateRuleset() => new TaikoRuleset();
     }
 }
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index ace24c0d7e..d648afd504 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -30,11 +29,15 @@ namespace osu.Game.Tests.Visual
         protected SkinnableTestScene()
             : base(2, 3)
         {
+            // avoid running silently incorrectly.
+            if (CreateRuleset() == null)
+            {
+                throw new InvalidOperationException(
+                    $"No ruleset provided, override {nameof(CreateRuleset)} to the ruleset belonging to the skinnable content."
+                    + "This is required to add the legacy skin transformer for the content to behave as expected.");
+            }
         }
 
-        // Required to be part of the per-ruleset implementation to construct the newer version of the Ruleset.
-        protected abstract Ruleset CreateRulesetForSkinProvider();
-
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SkinManager skinManager)
         {
@@ -107,7 +110,7 @@ namespace osu.Game.Tests.Visual
                         {
                             new OutlineBox { Alpha = autoSize ? 1 : 0 },
                             mainProvider.WithChild(
-                                new SkinProvidingContainer(CreateRulesetForSkinProvider().CreateLegacySkinProvider(mainProvider, beatmap))
+                                new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider, beatmap))
                                 {
                                     Child = created,
                                     RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,

From 92df4e3a9eb8ad56c6da99b088d0159a419c8110 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 17 Apr 2020 10:32:12 +0300
Subject: [PATCH 02245/10326] Remove `PlayerTestScene` constructor and use
 `CreateRuleset` method instead

---
 .../TestSceneAutoJuiceStream.cs               |  7 +------
 .../TestSceneBananaShower.cs                  |  8 +------
 .../TestSceneCatchPlayer.cs                   | 10 ++++++---
 .../TestSceneCatchStacker.cs                  |  8 +------
 .../TestSceneHyperDash.cs                     |  8 +------
 .../TestSceneJuiceStream.cs                   |  8 +------
 .../TestSceneManiaPlayer.cs                   | 19 +++++++++++++++++
 .../TestScenePlayer.cs                        | 15 -------------
 .../TestSceneHitCircleLongCombo.cs            |  8 +------
 .../TestSceneOsuPlayer.cs                     | 10 ++++++---
 .../TestSceneSkinFallbacks.cs                 |  3 +--
 .../TestSceneSwellJudgements.cs               |  8 +------
 .../TestSceneTaikoPlayer.cs                   | 19 +++++++++++++++++
 .../TestSceneTaikoSuddenDeath.cs              |  7 +------
 .../Gameplay/TestSceneHitObjectSamples.cs     | 10 ++-------
 .../Visual/Gameplay/TestPlayerTestScene.cs    | 16 ++++++++++++++
 .../Gameplay/TestSceneGameplayRewinding.cs    |  8 +------
 .../Visual/Gameplay/TestScenePause.cs         |  4 +---
 .../Gameplay/TestScenePauseWhenInactive.cs    |  8 +------
 osu.Game/Tests/Visual/PlayerTestScene.cs      | 21 +++++++------------
 20 files changed, 89 insertions(+), 116 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs
 delete mode 100644 osu.Game.Rulesets.Mania.Tests/TestScenePlayer.cs
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestPlayerTestScene.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index ed7bfb9a44..7c2304694f 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -12,13 +12,8 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneAutoJuiceStream : PlayerTestScene
+    public class TestSceneAutoJuiceStream : TestSceneCatchPlayer
     {
-        public TestSceneAutoJuiceStream()
-            : base(new CatchRuleset())
-        {
-        }
-
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
index 024c4cefb0..56f94e609f 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
@@ -8,12 +8,11 @@ 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;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneBananaShower : PlayerTestScene
+    public class TestSceneBananaShower : TestSceneCatchPlayer
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -26,11 +25,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(DrawableCatchRuleset),
         };
 
-        public TestSceneBananaShower()
-            : base(new CatchRuleset())
-        {
-        }
-
         [Test]
         public void TestBananaShower()
         {
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs
index 9836a7811a..722f3b5a3b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.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.Game.Tests.Visual;
 
@@ -9,9 +11,11 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class TestSceneCatchPlayer : PlayerTestScene
     {
-        public TestSceneCatchPlayer()
-            : base(new CatchRuleset())
+        public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-        }
+            typeof(CatchRuleset),
+        };
+
+        protected override Ruleset CreateRuleset() => new CatchRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
index 9ce46ad6ba..44672b6526 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
@@ -4,18 +4,12 @@
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatchStacker : PlayerTestScene
+    public class TestSceneCatchStacker : TestSceneCatchPlayer
     {
-        public TestSceneCatchStacker()
-            : base(new CatchRuleset())
-        {
-        }
-
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 49ff9df4d7..75b8b68c14 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -10,24 +10,18 @@ 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
 {
     [TestFixture]
-    public class TestSceneHyperDash : PlayerTestScene
+    public class TestSceneHyperDash : TestSceneCatchPlayer
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(CatcherArea),
         };
 
-        public TestSceneHyperDash()
-            : base(new CatchRuleset())
-        {
-        }
-
         protected override bool Autoplay => true;
 
         [Test]
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
index cbc87459e1..ffcf61a4bf 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
@@ -7,18 +7,12 @@ 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 class TestSceneJuiceStream : TestSceneCatchPlayer
     {
-        public TestSceneJuiceStream()
-            : base(new CatchRuleset())
-        {
-        }
-
         [Test]
         public void TestJuiceStreamEndingCombo()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs
new file mode 100644
index 0000000000..11663605e2
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.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;
+using System.Collections.Generic;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public class TestSceneManiaPlayer : PlayerTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ManiaRuleset),
+        };
+
+        protected override Ruleset CreateRuleset() => new ManiaRuleset();
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests/TestScenePlayer.cs b/osu.Game.Rulesets.Mania.Tests/TestScenePlayer.cs
deleted file mode 100644
index cd25d162d0..0000000000
--- a/osu.Game.Rulesets.Mania.Tests/TestScenePlayer.cs
+++ /dev/null
@@ -1,15 +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.Tests.Visual;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    public class TestScenePlayer : PlayerTestScene
-    {
-        public TestScenePlayer()
-            : base(new ManiaRuleset())
-        {
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLongCombo.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLongCombo.cs
index b99cd523ff..8cf29ddfbf 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLongCombo.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLongCombo.cs
@@ -4,19 +4,13 @@
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Tests.Visual;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestSceneHitCircleLongCombo : PlayerTestScene
+    public class TestSceneHitCircleLongCombo : TestSceneOsuPlayer
     {
-        public TestSceneHitCircleLongCombo()
-            : base(new OsuRuleset())
-        {
-        }
-
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs
index 0a33b09ba8..102f8bf841 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.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.Game.Tests.Visual;
 
@@ -9,9 +11,11 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneOsuPlayer : PlayerTestScene
     {
-        public TestSceneOsuPlayer()
-            : base(new OsuRuleset())
+        public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-        }
+            typeof(OsuRuleset),
+        };
+
+        protected override Ruleset CreateRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index d39e24fc1f..b357e20ee8 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -25,13 +25,12 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestSceneSkinFallbacks : PlayerTestScene
+    public class TestSceneSkinFallbacks : TestSceneOsuPlayer
     {
         private readonly TestSource testUserSkin;
         private readonly TestSource testBeatmapSkin;
 
         public TestSceneSkinFallbacks()
-            : base(new OsuRuleset())
         {
             testUserSkin = new TestSource("user");
             testBeatmapSkin = new TestSource("beatmap");
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
index 303f0163b1..965cde0f3f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
@@ -5,17 +5,11 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
-    public class TestSceneSwellJudgements : PlayerTestScene
+    public class TestSceneSwellJudgements : TestSceneTaikoPlayer
     {
-        public TestSceneSwellJudgements()
-            : base(new TaikoRuleset())
-        {
-        }
-
         [Test]
         public void TestZeroTickTimeOffsets()
         {
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs
new file mode 100644
index 0000000000..4c5ab7eabf
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.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;
+using System.Collections.Generic;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneTaikoPlayer : PlayerTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(TaikoRuleset)
+        };
+
+        protected override Ruleset CreateRuleset() => new TaikoRuleset();
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
index 2ab041e191..aaa634648a 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
@@ -11,13 +11,8 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
-    public class TestSceneTaikoSuddenDeath : PlayerTestScene
+    public class TestSceneTaikoSuddenDeath : TestSceneTaikoPlayer
     {
-        public TestSceneTaikoSuddenDeath()
-            : base(new TaikoRuleset())
-        {
-        }
-
         protected override bool AllowFail => true;
 
         protected override TestPlayer CreatePlayer(Ruleset ruleset)
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index f611f2717e..7d3d8b7f16 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -16,17 +16,16 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Resources;
-using osu.Game.Tests.Visual;
+using osu.Game.Tests.Visual.Gameplay;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Gameplay
 {
     [HeadlessTest]
-    public class TestSceneHitObjectSamples : PlayerTestScene
+    public class TestSceneHitObjectSamples : TestPlayerTestScene
     {
         private readonly SkinInfo userSkinInfo = new SkinInfo();
 
@@ -44,11 +43,6 @@ namespace osu.Game.Tests.Gameplay
 
         protected override bool HasCustomSteps => true;
 
-        public TestSceneHitObjectSamples()
-            : base(new OsuRuleset())
-        {
-        }
-
         private SkinSourceDependencyContainer dependencies;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
diff --git a/osu.Game.Tests/Visual/Gameplay/TestPlayerTestScene.cs b/osu.Game.Tests/Visual/Gameplay/TestPlayerTestScene.cs
new file mode 100644
index 0000000000..2130171449
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestPlayerTestScene.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.Rulesets;
+using osu.Game.Rulesets.Osu;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    /// <summary>
+    /// A <see cref="PlayerTestScene"/> with an arbitrary ruleset value to test with.
+    /// </summary>
+    public abstract class TestPlayerTestScene : PlayerTestScene
+    {
+        protected override Ruleset CreateRuleset() => new OsuRuleset();
+    }
+}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
index 310746d179..744eeed022 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
@@ -10,23 +10,17 @@ using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Storyboards;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneGameplayRewinding : PlayerTestScene
+    public class TestSceneGameplayRewinding : TestPlayerTestScene
     {
         [Resolved]
         private AudioManager audioManager { get; set; }
 
-        public TestSceneGameplayRewinding()
-            : base(new OsuRuleset())
-        {
-        }
-
         private Track track;
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 944e6ca6be..411265d600 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -10,14 +10,13 @@ using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
 using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestScenePause : PlayerTestScene
+    public class TestScenePause : TestPlayerTestScene
     {
         protected new PausePlayer Player => (PausePlayer)base.Player;
 
@@ -26,7 +25,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected override Container<Drawable> Content => content;
 
         public TestScenePause()
-            : base(new OsuRuleset())
         {
             base.Content.Add(content = new MenuCursorContainer { RelativeSizeAxes = Axes.Both });
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
index a83320048b..20911bfa4d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
@@ -8,12 +8,11 @@ using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [HeadlessTest] // we alter unsafe properties on the game host to test inactive window state.
-    public class TestScenePauseWhenInactive : PlayerTestScene
+    public class TestScenePauseWhenInactive : TestPlayerTestScene
     {
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
@@ -27,11 +26,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private GameHost host { get; set; }
 
-        public TestScenePauseWhenInactive()
-            : base(new OsuRuleset())
-        {
-        }
-
         [Test]
         public void TestDoesntPauseDuringIntro()
         {
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 9e852719e0..f5e78fbbd1 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -19,15 +19,8 @@ namespace osu.Game.Tests.Visual
         /// </summary>
         protected virtual bool HasCustomSteps { get; } = false;
 
-        private readonly Ruleset ruleset;
-
         protected TestPlayer Player;
 
-        protected PlayerTestScene(Ruleset ruleset)
-        {
-            this.ruleset = ruleset;
-        }
-
         protected OsuConfigManager LocalConfig;
 
         [BackgroundDependencyLoader]
@@ -53,7 +46,7 @@ namespace osu.Game.Tests.Visual
 
             action?.Invoke();
 
-            AddStep(ruleset.RulesetInfo.Name, LoadPlayer);
+            AddStep(CreateRuleset().RulesetInfo.Name, LoadPlayer);
             AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
         }
 
@@ -63,28 +56,28 @@ namespace osu.Game.Tests.Visual
 
         protected void LoadPlayer()
         {
-            var beatmap = CreateBeatmap(ruleset.RulesetInfo);
+            var beatmap = CreateBeatmap(Ruleset.Value);
 
             Beatmap.Value = CreateWorkingBeatmap(beatmap);
-            Ruleset.Value = ruleset.RulesetInfo;
-
             SelectedMods.Value = Array.Empty<Mod>();
 
+            var rulesetInstance = Ruleset.Value.CreateInstance();
+
             if (!AllowFail)
             {
-                var noFailMod = ruleset.GetAllMods().FirstOrDefault(m => m is ModNoFail);
+                var noFailMod = rulesetInstance.GetAllMods().FirstOrDefault(m => m is ModNoFail);
                 if (noFailMod != null)
                     SelectedMods.Value = new[] { noFailMod };
             }
 
             if (Autoplay)
             {
-                var mod = ruleset.GetAutoplayMod();
+                var mod = rulesetInstance.GetAutoplayMod();
                 if (mod != null)
                     SelectedMods.Value = SelectedMods.Value.Concat(mod.Yield()).ToArray();
             }
 
-            Player = CreatePlayer(ruleset);
+            Player = CreatePlayer(rulesetInstance);
             LoadScreen(Player);
         }
 

From 155bc8b49a08842297cf1a4eb1b4d9e36d799b55 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 17 Apr 2020 10:56:01 +0300
Subject: [PATCH 02246/10326] Remove `ModTestScene` ruleset parameter on
 constructor and use `CreateRuleset` instead

---
 .../Mods/TestSceneCatchModPerfect.cs                       | 4 +++-
 .../Mods/TestSceneManiaModPerfect.cs                       | 4 +++-
 .../Mods/TestSceneOsuModDifficultyAdjust.cs                | 7 ++-----
 .../Mods/TestSceneOsuModDoubleTime.cs                      | 7 ++-----
 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs | 4 +++-
 .../TestSceneMissHitWindowJudgements.cs                    | 7 ++-----
 .../Mods/TestSceneTaikoModPerfect.cs                       | 4 +++-
 osu.Game/Tests/Visual/ModPerfectTestScene.cs               | 7 ++-----
 osu.Game/Tests/Visual/ModTestScene.cs                      | 5 -----
 9 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
index 47e91e50d4..1e69a3f1b6 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
     public class TestSceneCatchModPerfect : ModPerfectTestScene
     {
         public TestSceneCatchModPerfect()
-            : base(new CatchRuleset(), new CatchModPerfect())
+            : base(new CatchModPerfect())
         {
         }
 
@@ -50,5 +50,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
         // We only care about testing misses, hits are tested via JuiceStream
         [TestCase(true)]
         public void TestTinyDroplet(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new TinyDroplet { StartTime = 1000 }), shouldMiss);
+
+        protected override Ruleset CreateRuleset() => new CatchRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index 607d42a1bb..72ef58ec73 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
     public class TestSceneManiaModPerfect : ModPerfectTestScene
     {
         public TestSceneManiaModPerfect()
-            : base(new ManiaRuleset(), new ManiaModPerfect())
+            : base(new ManiaModPerfect())
         {
         }
 
@@ -22,5 +22,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         [TestCase(false)]
         [TestCase(true)]
         public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HoldNote { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+
+        protected override Ruleset CreateRuleset() => new ManiaRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 69415b70e3..6c5949ca85 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -15,11 +15,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public class TestSceneOsuModDifficultyAdjust : ModTestScene
     {
-        public TestSceneOsuModDifficultyAdjust()
-            : base(new OsuRuleset())
-        {
-        }
-
         [Test]
         public void TestNoAdjustment() => CreateModTest(new ModTestData
         {
@@ -82,5 +77,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             return Player.ScoreProcessor.JudgedHits >= 2;
         }
+
+        protected override Ruleset CreateRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
index dcf19ad993..c61ef2724b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
@@ -10,11 +10,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public class TestSceneOsuModDoubleTime : ModTestScene
     {
-        public TestSceneOsuModDoubleTime()
-            : base(new OsuRuleset())
-        {
-        }
-
         [TestCase(0.5)]
         [TestCase(1.01)]
         [TestCase(1.5)]
@@ -31,5 +26,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                                       Precision.AlmostEquals(Player.GameplayClockContainer.GameplayClock.Rate, mod.SpeedChange.Value)
             });
         }
+
+        protected override Ruleset CreateRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
index b03a894085..ddbbf9554c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
     public class TestSceneOsuModPerfect : ModPerfectTestScene
     {
         public TestSceneOsuModPerfect()
-            : base(new OsuRuleset(), new OsuModPerfect())
+            : base(new OsuModPerfect())
         {
         }
 
@@ -48,5 +48,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 
             CreateHitObjectTest(new HitObjectTestData(spinner), shouldMiss);
         }
+
+        protected override Ruleset CreateRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
index 5f3596976d..13457ccaf9 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
@@ -19,11 +19,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneMissHitWindowJudgements : ModTestScene
     {
-        public TestSceneMissHitWindowJudgements()
-            : base(new OsuRuleset())
-        {
-        }
-
         [Test]
         public void TestMissViaEarlyHit()
         {
@@ -66,6 +61,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
         }
 
+        protected override Ruleset CreateRuleset() => new OsuRuleset();
+
         private class TestAutoMod : OsuModAutoplay
         {
             public override Score CreateReplayScore(IBeatmap beatmap) => new Score
diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
index 26c90ad295..a9c962bfa0 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
     public class TestSceneTaikoModPerfect : ModPerfectTestScene
     {
         public TestSceneTaikoModPerfect()
-            : base(new TestTaikoRuleset(), new TaikoModPerfect())
+            : base(new TaikoModPerfect())
         {
         }
 
@@ -29,6 +29,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         [TestCase(true)]
         public void TestSwell(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Swell { StartTime = 1000, EndTime = 3000 }), shouldMiss);
 
+        protected override Ruleset CreateRuleset() => new TestTaikoRuleset();
+
         private class TestTaikoRuleset : TaikoRuleset
         {
             public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new TestTaikoHealthProcessor();
diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
index 798947eb40..3565fe751b 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -10,13 +10,10 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class ModPerfectTestScene : ModTestScene
     {
-        private readonly Ruleset ruleset;
         private readonly ModPerfect mod;
 
-        protected ModPerfectTestScene(Ruleset ruleset, ModPerfect mod)
-            : base(ruleset)
+        protected ModPerfectTestScene(ModPerfect mod)
         {
-            this.ruleset = ruleset;
             this.mod = mod;
         }
 
@@ -25,7 +22,7 @@ namespace osu.Game.Tests.Visual
             Mod = mod,
             Beatmap = new Beatmap
             {
-                BeatmapInfo = { Ruleset = ruleset.RulesetInfo },
+                BeatmapInfo = { Ruleset = Ruleset.Value },
                 HitObjects = { testData.HitObject }
             },
             Autoplay = !shouldMiss,
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 8b41fb5075..c198d6b52c 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -19,11 +19,6 @@ namespace osu.Game.Tests.Visual
             typeof(ModTestScene)
         };
 
-        protected ModTestScene(Ruleset ruleset)
-            : base(ruleset)
-        {
-        }
-
         private ModTestData currentTestData;
 
         protected void CreateModTest(ModTestData testData) => CreateTest(() =>

From 7f791dcdf04d3434ea7275de20fd8d369060b062 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 17 Apr 2020 10:57:58 +0300
Subject: [PATCH 02247/10326] Re-enable ruleset bindable before setting defined
 ruleset in case it's disabled

Happens on cases like restarting the test scene by clicking directly on it on the browser (*where it for some reason reloads the entire test scene*)
---
 osu.Game/Tests/Visual/OsuTestScene.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 8058a074ef..25ac768272 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -75,6 +75,10 @@ namespace osu.Game.Tests.Visual
 
             if (definedRuleset != null)
             {
+                // re-enable the bindable in case it was disabled.
+                // happens when restarting current test scene.
+                Ruleset.Disabled = false;
+
                 // Set global ruleset bindable to the ruleset defined
                 // for this test scene and disallow changing it.
                 Ruleset.Value = definedRuleset;

From 5833a7ac913af77a8c8d801ffd5d117b9861930c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Apr 2020 18:50:58 +0900
Subject: [PATCH 02248/10326] Fix presenting new ruleset and beatmap at once
 causing wedge display desync

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 62 +++++++++++++++++++
 osu.Game/Screens/Select/SongSelect.cs         |  6 +-
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 4405c75744..39e04ed39a 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -359,6 +359,68 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddUntilStep("no selection", () => songSelect.Carousel.SelectedBeatmap == null);
         }
 
+        [Test]
+        public void TestPresentNewRulesetNewBeatmap()
+        {
+            createSongSelect();
+            changeRuleset(2);
+
+            addRulesetImportStep(2);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap.RulesetID == 2);
+
+            addRulesetImportStep(0);
+            addRulesetImportStep(0);
+            addRulesetImportStep(0);
+
+            BeatmapInfo target = null;
+
+            AddStep("select beatmap/ruleset externally", () =>
+            {
+                target = manager.GetAllUsableBeatmapSets()
+                                .Last(b => b.Beatmaps.Any(bi => bi.RulesetID == 0)).Beatmaps.Last();
+
+                Ruleset.Value = rulesets.AvailableRulesets.First(r => r.ID == 0);
+                Beatmap.Value = manager.GetWorkingBeatmap(target);
+            });
+
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap.Equals(target));
+
+            // this is an important check, to make sure updateComponentFromBeatmap() was actually run
+            AddUntilStep("selection shown on wedge", () => songSelect.CurrentBeatmapDetailsBeatmap.BeatmapInfo == target);
+        }
+
+        [Test]
+        public void TestPresentNewBeatmapNewRuleset()
+        {
+            createSongSelect();
+            changeRuleset(2);
+
+            addRulesetImportStep(2);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap.RulesetID == 2);
+
+            addRulesetImportStep(0);
+            addRulesetImportStep(0);
+            addRulesetImportStep(0);
+
+            BeatmapInfo target = null;
+
+            AddStep("select beatmap/ruleset externally", () =>
+            {
+                target = manager.GetAllUsableBeatmapSets()
+                                .Last(b => b.Beatmaps.Any(bi => bi.RulesetID == 0)).Beatmaps.Last();
+
+                Beatmap.Value = manager.GetWorkingBeatmap(target);
+                Ruleset.Value = rulesets.AvailableRulesets.First(r => r.ID == 0);
+            });
+
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap.Equals(target));
+
+            AddUntilStep("has correct ruleset", () => Ruleset.Value.ID == 0);
+
+            // this is an important check, to make sure updateComponentFromBeatmap() was actually run
+            AddUntilStep("selection shown on wedge", () => songSelect.CurrentBeatmapDetailsBeatmap.BeatmapInfo == target);
+        }
+
         [Test]
         public void TestRulesetChangeResetsMods()
         {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 5bc2e1aa56..9d3dc58a26 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -448,8 +448,10 @@ namespace osu.Game.Screens.Select
                 {
                     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.
+                    // the ruleset transfer may cause a deselection of the current beatmap (due to incompatibility).
+                    // this can happen via Carousel.FlushPendingFilterOperations().
+                    // to ensure a good state, re-transfer no-debounce values.
+                    performUpdateSelected();
                     return;
                 }
 

From 58a1c6e17186084345feedbd1c5b0d44c2ce8695 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Apr 2020 19:52:58 +0900
Subject: [PATCH 02249/10326] Reapply taiko visibility hack at a higher level

---
 .../Objects/Drawables/DrawableDrumRoll.cs                | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 0a6f462607..99f48afff0 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -137,6 +138,14 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            OriginPosition = new Vector2(DrawHeight);
+            Content.X = DrawHeight / 2;
+        }
+
         protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private void updateColour()

From 5f3ed3e93aab472b9d748d857e4394ec13843742 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Apr 2020 22:25:24 +0900
Subject: [PATCH 02250/10326] 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 723844155f..d2bdbc8b61 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.411.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.417.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 76f7a030f9..5facb04117 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,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.411.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.417.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.412.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 7a487a6430..dda1ee5c42 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.Framework.iOS" Version="2020.411.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.417.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.412.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.411.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.417.0" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1ac9ee599088d893211bd6dbcdba16662275e745 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 17 Apr 2020 18:15:11 +0300
Subject: [PATCH 02251/10326] Optimize recommender (for custom rulesets)

---
 .../Screens/Select/DifficultyRecommender.cs   | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index e7536db356..07dfc3a85e 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -51,8 +51,7 @@ namespace osu.Game.Screens.Select
 
             foreach (var r in getBestRulesetOrder())
             {
-                if (!recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars))
-                    break;
+                recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars);
 
                 beatmap = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
                 {
@@ -75,6 +74,7 @@ namespace osu.Game.Screens.Select
 
                 req.Success += result =>
                 {
+                    bestRulesetOrder = null;
                     // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
                     recommendedStarDifficulty[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
                 };
@@ -87,22 +87,30 @@ namespace osu.Game.Screens.Select
 
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
-            if (bestRulesetOrder != null)
-                return moveCurrentRulesetToFirst();
-
-            bestRulesetOrder = recommendedStarDifficulty.ToList()
-                                                        .OrderBy(pair => pair.Value)
-                                                        .Select(pair => pair.Key)
-                                                        .Reverse();
+            bestRulesetOrder ??= recommendedStarDifficulty.ToList()
+                                                          .OrderBy(pair => pair.Value)
+                                                          .Select(pair => pair.Key)
+                                                          .Reverse();
 
             return moveCurrentRulesetToFirst();
         }
 
         private IEnumerable<RulesetInfo> moveCurrentRulesetToFirst()
         {
-            var orderedRulesets = bestRulesetOrder.ToList();
-            orderedRulesets.Remove(ruleset.Value);
-            orderedRulesets.Insert(0, ruleset.Value);
+            List<RulesetInfo> orderedRulesets = null;
+
+            if (bestRulesetOrder.Contains(ruleset.Value))
+            {
+                orderedRulesets = bestRulesetOrder.ToList();
+                orderedRulesets.Remove(ruleset.Value);
+                orderedRulesets.Insert(0, ruleset.Value);
+            }
+            else
+            {
+                orderedRulesets = new List<RulesetInfo> { ruleset.Value };
+                orderedRulesets.AddRange(bestRulesetOrder);
+            }
+
             return orderedRulesets;
         }
 

From 90fa58b3b65c7221990bfbc12237577a489c4741 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 17 Apr 2020 19:55:51 +0300
Subject: [PATCH 02252/10326] More testing

---
 .../TestSceneBeatmapRecommendations.cs        | 96 +++++++++++++------
 .../Online/API/Requests/GetUserRequest.cs     |  6 +-
 2 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 80a00ac9a1..ec5fe65fdd 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -6,44 +6,53 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Logging;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Select;
 using osu.Game.Tests.Visual.Navigation;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.SongSelect
 {
+    [HeadlessTest]
     public class TestSceneBeatmapRecommendations : OsuGameTestScene
     {
         [Resolved]
         private DifficultyRecommender recommender { get; set; }
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
         [SetUpSteps]
         public new void SetUpSteps()
         {
             AddStep("register request handling", () =>
             {
-                Logger.Log($"Registering request handling for {(DummyAPIAccess)API}");
                 ((DummyAPIAccess)API).HandleRequest = req =>
                 {
-                    Logger.Log($"New request {req}");
-
                     switch (req)
                     {
                         case GetUserRequest userRequest:
+
+                            decimal pp = userRequest.Ruleset.ID switch
+                            {
+                                0 => 336, // Expected recommended star difficulty 2*
+                                1 => 928, // Expected recommended star difficulty 3*
+                                2 => 1905, // Expected recommended star difficulty 4*
+                                3 => 3329, // Expected recommended star difficulty 5*
+                                _ => 0
+                            };
+
                             userRequest.TriggerSuccess(new User
                             {
                                 Username = @"Dummy",
                                 Id = 1001,
                                 Statistics = new UserStatistics
                                 {
-                                    PP = 928 // Expected recommended star difficulty is 2.999
+                                    PP = pp
                                 }
                             });
                             break;
@@ -57,74 +66,103 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestPresentedBeatmapIsRecommended()
         {
-            var importFunctions = importBeatmaps(5);
+            var importFunctions = new List<Func<BeatmapSetInfo>>();
 
             for (int i = 0; i < 5; i++)
             {
-                presentAndConfirm(importFunctions[i], i);
+                importFunctions.Add(importBeatmap(i, new List<RulesetInfo> { null, null, null, null, null }));
             }
-        }
 
-        private List<Func<BeatmapSetInfo>> importBeatmaps(int amount, RulesetInfo ruleset = null)
-        {
-            var importFunctions = new List<Func<BeatmapSetInfo>>();
-
-            for (int i = 0; i < amount; i++)
+            for (int i = 0; i < 5; i++)
             {
-                importFunctions.Add(importBeatmap(i, ruleset));
+                presentAndConfirm(importFunctions[i], i, 2);
             }
-
-            return importFunctions;
         }
 
-        private Func<BeatmapSetInfo> importBeatmap(int i, RulesetInfo ruleset = null)
+        [Test]
+        public void TestBestRulesetIsRecommended()
+        {
+            var osuRuleset = rulesets.AvailableRulesets.First(r => r.ID == 0);
+            var taikoRuleset = rulesets.AvailableRulesets.First(r => r.ID == 1);
+            var catchRuleset = rulesets.AvailableRulesets.First(r => r.ID == 2);
+            var maniaRuleset = rulesets.AvailableRulesets.First(r => r.ID == 3);
+
+            var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
+            var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, maniaRuleset });
+
+            // Make sure we are on standard ruleset
+            presentAndConfirm(osuImport, 0, 1);
+
+            // Present mixed difficulty set, expect ruleset with highest star difficulty
+            presentAndConfirm(mixedImport, 1, 3);
+        }
+
+        [Test]
+        public void TestSecondBestRulesetIsRecommended()
+        {
+            var osuRuleset = rulesets.AvailableRulesets.First(r => r.ID == 0);
+            var taikoRuleset = rulesets.AvailableRulesets.First(r => r.ID == 1);
+            var catchRuleset = rulesets.AvailableRulesets.First(r => r.ID == 2);
+
+            var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
+            var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, taikoRuleset });
+
+            // Make sure we are on standard ruleset
+            presentAndConfirm(osuImport, 0, 1);
+
+            // Present mixed difficulty set, expect ruleset with highest star difficulty
+            presentAndConfirm(mixedImport, 1, 2);
+        }
+
+        private Func<BeatmapSetInfo> importBeatmap(int importID, List<RulesetInfo> rulesets)
         {
             BeatmapSetInfo imported = null;
-            AddStep($"import beatmap {i * 1000}", () =>
+            AddStep($"import beatmap {importID}", () =>
             {
                 var difficulty = new BeatmapDifficulty();
                 var metadata = new BeatmapMetadata
                 {
                     Artist = "SomeArtist",
                     AuthorString = "SomeAuthor",
-                    Title = $"import {i * 1000}"
+                    Title = $"import {importID}"
                 };
 
                 var beatmaps = new List<BeatmapInfo>();
+                int difficultyID = 1;
 
-                for (int j = 1; j <= 5; j++)
+                foreach (RulesetInfo r in rulesets)
                 {
                     beatmaps.Add(new BeatmapInfo
                     {
-                        OnlineBeatmapID = j * 1024 + i * 5,
+                        OnlineBeatmapID = importID + 1024 * difficultyID,
                         Metadata = metadata,
                         BaseDifficulty = difficulty,
-                        Ruleset = ruleset ?? new OsuRuleset().RulesetInfo,
-                        StarDifficulty = j,
+                        Ruleset = r ?? rulesets.First(),
+                        StarDifficulty = difficultyID,
                     });
+                    difficultyID++;
                 }
 
                 imported = Game.BeatmapManager.Import(new BeatmapSetInfo
                 {
                     Hash = Guid.NewGuid().ToString(),
-                    OnlineBeatmapSetID = i,
+                    OnlineBeatmapSetID = importID,
                     Metadata = metadata,
                     Beatmaps = beatmaps,
                 }).Result;
             });
 
-            AddAssert($"import {i * 1000} succeeded", () => imported != null);
+            AddAssert($"import {importID} succeeded", () => imported != null);
 
             return () => imported;
         }
 
-        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID)
+        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID, int expextedDiff)
         {
             AddStep("present beatmap", () => Game.PresentBeatmap(getImport()));
 
             AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is Screens.Select.SongSelect);
-            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID * 5 + 1024 * 3);
-            AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Beatmaps.First().Ruleset.ID);
+            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID + 1024 * expextedDiff);
         }
     }
 }
diff --git a/osu.Game/Online/API/Requests/GetUserRequest.cs b/osu.Game/Online/API/Requests/GetUserRequest.cs
index 31b7e95b39..42aad6f9eb 100644
--- a/osu.Game/Online/API/Requests/GetUserRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRequest.cs
@@ -9,14 +9,14 @@ namespace osu.Game.Online.API.Requests
     public class GetUserRequest : APIRequest<User>
     {
         private readonly long? userId;
-        private readonly RulesetInfo ruleset;
+        public readonly RulesetInfo Ruleset;
 
         public GetUserRequest(long? userId = null, RulesetInfo ruleset = null)
         {
             this.userId = userId;
-            this.ruleset = ruleset;
+            Ruleset = ruleset;
         }
 
-        protected override string Target => userId.HasValue ? $@"users/{userId}/{ruleset?.ShortName}" : $@"me/{ruleset?.ShortName}";
+        protected override string Target => userId.HasValue ? $@"users/{userId}/{Ruleset?.ShortName}" : $@"me/{Ruleset?.ShortName}";
     }
 }

From 4aaa00e3219611c387dcdf20dc4f04103bb7af07 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 17 Apr 2020 20:33:12 +0300
Subject: [PATCH 02253/10326] Fix CI complaints

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

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 07dfc3a85e..4d48cc3fe7 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Select
 
         private IEnumerable<RulesetInfo> moveCurrentRulesetToFirst()
         {
-            List<RulesetInfo> orderedRulesets = null;
+            List<RulesetInfo> orderedRulesets;
 
             if (bestRulesetOrder.Contains(ruleset.Value))
             {

From 61e3491e603daf0a497ec988318043001a4e068a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Apr 2020 12:57:09 +0900
Subject: [PATCH 02254/10326] Fix hard crash in editor on legacy modes without
 encoder implementation

---
 osu.Game/Screens/Edit/EditorChangeHandler.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 1553c2d2ef..ac889500b4 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -82,12 +82,19 @@ namespace osu.Game.Screens.Edit
             if (savedStates.Count > MAX_SAVED_STATES)
                 savedStates.RemoveAt(0);
 
-            using (var stream = new MemoryStream())
+            try
             {
-                using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                    new LegacyBeatmapEncoder(editorBeatmap).Encode(sw);
+                using (var stream = new MemoryStream())
+                {
+                    using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+                        new LegacyBeatmapEncoder(editorBeatmap).Encode(sw);
 
-                savedStates.Add(stream.ToArray());
+                    savedStates.Add(stream.ToArray());
+                }
+            }
+            catch (NotImplementedException)
+            {
+                // some rulesets don't have encoder implementations yet.
             }
 
             currentState = savedStates.Count - 1;

From c00a386ff681a3ba4a037de6654bd1fd199d6770 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Apr 2020 21:46:04 +0900
Subject: [PATCH 02255/10326] Remove exceptions instead

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 21 +------------------
 osu.Game/Screens/Edit/EditorChangeHandler.cs  | 15 ++++---------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 12f2c58e35..8d9dfc318a 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -194,20 +194,7 @@ namespace osu.Game.Beatmaps.Formats
                         handleOsuHitObject(writer, h);
                     break;
 
-                case 1:
-                    foreach (var h in beatmap.HitObjects)
-                        handleTaikoHitObject(writer, h);
-                    break;
-
-                case 2:
-                    foreach (var h in beatmap.HitObjects)
-                        handleCatchHitObject(writer, h);
-                    break;
-
-                case 3:
-                    foreach (var h in beatmap.HitObjects)
-                        handleManiaHitObject(writer, h);
-                    break;
+                // TODO: implement other legacy rulesets
             }
         }
 
@@ -328,12 +315,6 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
-        private void handleTaikoHitObject(TextWriter writer, HitObject hitObject) => throw new NotImplementedException();
-
-        private void handleCatchHitObject(TextWriter writer, HitObject hitObject) => throw new NotImplementedException();
-
-        private void handleManiaHitObject(TextWriter writer, HitObject hitObject) => throw new NotImplementedException();
-
         private string getSampleBank(IList<HitSampleInfo> samples, bool banksOnly = false, bool zeroBanks = false)
         {
             LegacySampleBank normalBank = toLegacySampleBank(samples.SingleOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)?.Bank);
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index ac889500b4..1553c2d2ef 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -82,19 +82,12 @@ namespace osu.Game.Screens.Edit
             if (savedStates.Count > MAX_SAVED_STATES)
                 savedStates.RemoveAt(0);
 
-            try
+            using (var stream = new MemoryStream())
             {
-                using (var stream = new MemoryStream())
-                {
-                    using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                        new LegacyBeatmapEncoder(editorBeatmap).Encode(sw);
+                using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+                    new LegacyBeatmapEncoder(editorBeatmap).Encode(sw);
 
-                    savedStates.Add(stream.ToArray());
-                }
-            }
-            catch (NotImplementedException)
-            {
-                // some rulesets don't have encoder implementations yet.
+                savedStates.Add(stream.ToArray());
             }
 
             currentState = savedStates.Count - 1;

From 6b16908c05bafd95e069b986d5efd6d73631875f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Apr 2020 21:51:37 +0900
Subject: [PATCH 02256/10326] Move todo to appease dotnet-format

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 8d9dfc318a..fe63eec3f9 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -187,14 +187,13 @@ namespace osu.Game.Beatmaps.Formats
 
             writer.WriteLine("[HitObjects]");
 
+            // TODO: implement other legacy rulesets
             switch (beatmap.BeatmapInfo.RulesetID)
             {
                 case 0:
                     foreach (var h in beatmap.HitObjects)
                         handleOsuHitObject(writer, h);
                     break;
-
-                // TODO: implement other legacy rulesets
             }
         }
 

From fc6c245de5dc362489706fbae2b1c299260f9fb8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 19 Apr 2020 05:36:04 +0300
Subject: [PATCH 02257/10326] Replace all judged event logic with HasCompleted
 bindable

---
 .../TestSceneHoldNoteInput.cs                   |  8 +-------
 .../TestSceneOutOfOrderHits.cs                  |  8 +-------
 .../TestSceneSliderInput.cs                     |  8 +-------
 .../TestSceneSwellJudgements.cs                 |  2 +-
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs | 17 +++++++++--------
 osu.Game/Screens/Play/BreakTracker.cs           |  2 +-
 osu.Game/Tests/Visual/ModPerfectTestScene.cs    |  2 +-
 7 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 7b0cf40d45..0d13b85901 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -27,7 +27,6 @@ namespace osu.Game.Rulesets.Mania.Tests
         private const double time_after_tail = 5250;
 
         private List<JudgementResult> judgementResults;
-        private bool allJudgedFired;
 
         /// <summary>
         ///     -----[           ]-----
@@ -283,20 +282,15 @@ namespace osu.Game.Rulesets.Mania.Tests
                     {
                         if (currentPlayer == p) judgementResults.Add(result);
                     };
-                    p.ScoreProcessor.AllJudged += () =>
-                    {
-                        if (currentPlayer == p) allJudgedFired = true;
-                    };
                 };
 
                 LoadScreen(currentPlayer = p);
-                allJudgedFired = false;
                 judgementResults = new List<JudgementResult>();
             });
 
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
-            AddUntilStep("Wait for all judged", () => allJudgedFired);
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
         private class ScoreAccessibleReplayPlayer : ReplayPlayer
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index d6858f831e..91d5e04f6f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -316,7 +316,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private ScoreAccessibleReplayPlayer currentPlayer;
         private List<JudgementResult> judgementResults;
-        private bool allJudgedFired;
 
         private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames)
         {
@@ -342,20 +341,15 @@ namespace osu.Game.Rulesets.Osu.Tests
                     {
                         if (currentPlayer == p) judgementResults.Add(result);
                     };
-                    p.ScoreProcessor.AllJudged += () =>
-                    {
-                        if (currentPlayer == p) allJudgedFired = true;
-                    };
                 };
 
                 LoadScreen(currentPlayer = p);
-                allJudgedFired = false;
                 judgementResults = new List<JudgementResult>();
             });
 
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
-            AddUntilStep("Wait for all judged", () => allJudgedFired);
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
         private class TestHitCircle : HitCircle
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 67e1b77770..b0c2e56c3e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -47,7 +47,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         private const double time_slider_end = 4000;
 
         private List<JudgementResult> judgementResults;
-        private bool allJudgedFired;
 
         /// <summary>
         /// Scenario:
@@ -375,20 +374,15 @@ namespace osu.Game.Rulesets.Osu.Tests
                     {
                         if (currentPlayer == p) judgementResults.Add(result);
                     };
-                    p.ScoreProcessor.AllJudged += () =>
-                    {
-                        if (currentPlayer == p) allJudgedFired = true;
-                    };
                 };
 
                 LoadScreen(currentPlayer = p);
-                allJudgedFired = false;
                 judgementResults = new List<JudgementResult>();
             });
 
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
-            AddUntilStep("Wait for all judged", () => allJudgedFired);
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
         private class ScoreAccessibleReplayPlayer : ReplayPlayer
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
index 303f0163b1..923e28a45e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [Test]
         public void TestZeroTickTimeOffsets()
         {
-            AddUntilStep("gameplay finished", () => Player.ScoreProcessor.HasCompleted);
+            AddUntilStep("gameplay finished", () => Player.ScoreProcessor.HasCompleted.Value);
             AddAssert("all tick offsets are 0", () => Player.Results.Where(r => r.HitObject is SwellTick).All(r => r.TimeOffset == 0));
         }
 
diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index 334b95f808..d878ef0a5c 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
@@ -12,11 +13,6 @@ namespace osu.Game.Rulesets.Scoring
 {
     public abstract class JudgementProcessor : Component
     {
-        /// <summary>
-        /// Invoked when all <see cref="HitObject"/>s have been judged by this <see cref="JudgementProcessor"/>.
-        /// </summary>
-        public event Action AllJudged;
-
         /// <summary>
         /// Invoked when a new judgement has occurred. This occurs after the judgement has been processed by this <see cref="JudgementProcessor"/>.
         /// </summary>
@@ -32,10 +28,12 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public int JudgedHits { get; private set; }
 
+        private readonly BindableBool hasCompleted = new BindableBool();
+
         /// <summary>
         /// Whether all <see cref="Judgement"/>s have been processed.
         /// </summary>
-        public bool HasCompleted => JudgedHits == MaxHits;
+        public IBindable<bool> HasCompleted => hasCompleted;
 
         /// <summary>
         /// Applies a <see cref="IBeatmap"/> to this <see cref="ScoreProcessor"/>.
@@ -60,8 +58,8 @@ namespace osu.Game.Rulesets.Scoring
 
             NewJudgement?.Invoke(result);
 
-            if (HasCompleted)
-                AllJudged?.Invoke();
+            if (JudgedHits == MaxHits)
+                hasCompleted.Value = true;
         }
 
         /// <summary>
@@ -72,6 +70,9 @@ namespace osu.Game.Rulesets.Scoring
         {
             JudgedHits--;
 
+            if (JudgedHits < MaxHits)
+                hasCompleted.Value = false;
+
             RevertResultInternal(result);
         }
 
diff --git a/osu.Game/Screens/Play/BreakTracker.cs b/osu.Game/Screens/Play/BreakTracker.cs
index 64262d52b5..fcd7ed6b73 100644
--- a/osu.Game/Screens/Play/BreakTracker.cs
+++ b/osu.Game/Screens/Play/BreakTracker.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Play
 
             isBreakTime.Value = getCurrentBreak()?.HasEffect == true
                                 || Clock.CurrentTime < gameplayStartTime
-                                || scoreProcessor?.HasCompleted == true;
+                                || scoreProcessor?.HasCompleted.Value == true;
         }
 
         private BreakPeriod getCurrentBreak()
diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
index 798947eb40..5948283428 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual
             public bool CheckFailed(bool failed)
             {
                 if (!failed)
-                    return ScoreProcessor.HasCompleted && !HealthProcessor.HasFailed;
+                    return ScoreProcessor.HasCompleted.Value && !HealthProcessor.HasFailed;
 
                 return HealthProcessor.HasFailed;
             }

From 7e64bec94f286b4d1bbc550d4e95f9ca601ca997 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 19 Apr 2020 05:58:22 +0300
Subject: [PATCH 02258/10326] Use HasCompleted in Player

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4597ae760c..542e226809 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Screens.Play
             };
 
             // Bind the judgement processors to ourselves
-            ScoreProcessor.AllJudged += onCompletion;
+            ScoreProcessor.HasCompleted.ValueChanged += updateCompletionState;
             HealthProcessor.Failed += onFail;
 
             foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
@@ -412,7 +412,7 @@ namespace osu.Game.Screens.Play
 
         private ScheduledDelegate completionProgressDelegate;
 
-        private void onCompletion()
+        private void updateCompletionState(ValueChangedEvent<bool> completionState)
         {
             // screen may be in the exiting transition phase.
             if (!this.IsCurrentScreen())

From 6d276890a7dca11c37855655f8f760c4b3176314 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 19 Apr 2020 05:59:56 +0300
Subject: [PATCH 02259/10326] Fix results screen pushed after rewinding
 in-between push delay

---
 osu.Game/Screens/Play/Player.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 542e226809..c6c83e5379 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -418,6 +418,16 @@ namespace osu.Game.Screens.Play
             if (!this.IsCurrentScreen())
                 return;
 
+            // cancel push delegate in case judges reverted
+            // after delegate may have already been scheduled.
+            if (!completionState.NewValue)
+            {
+                completionProgressDelegate?.Cancel();
+                completionProgressDelegate = null;
+                ValidForResume = true;
+                return;
+            }
+
             // Only show the completion screen if the player hasn't failed
             if (HealthProcessor.HasFailed || completionProgressDelegate != null)
                 return;

From 65a8860a65812dc4de6aae708d5352508898cdb7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 19 Apr 2020 06:01:09 +0300
Subject: [PATCH 02260/10326] Add test cases to ensure no regression in
 "cancelling completion"

---
 .../TestSceneCompletionCancellation.cs        | 129 ++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
new file mode 100644
index 0000000000..54e1ff5345
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
@@ -0,0 +1,129 @@
+// Copyright (c) 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;
+using osu.Framework.Audio.Track;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Storyboards;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneCompletionCancellation : PlayerTestScene
+    {
+        private Track track;
+
+        [Resolved]
+        private AudioManager audio { get; set; }
+
+        protected override bool AllowFail => false;
+
+        public TestSceneCompletionCancellation()
+            : base(new OsuRuleset())
+        {
+        }
+
+        [SetUpSteps]
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            // Ensure track has actually running before attempting to seek
+            AddUntilStep("wait for track to start running", () => track.IsRunning);
+        }
+
+        [Test]
+        public void TestCancelCompletionOnRewind()
+        {
+            cancelCompletionSteps();
+
+            AddAssert("no attempt to push ranking", () => !((FakeRankingPushPlayer)Player).GotoRankingInvoked);
+        }
+
+        [Test]
+        public void TestReCompleteAfterCancellation()
+        {
+            cancelCompletionSteps();
+
+            // Attempt completing again.
+            AddStep("seek to completion again", () => track.Seek(5000));
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+
+            AddWaitStep("wait", 5);
+
+            AddAssert("attempted to push ranking", () => ((FakeRankingPushPlayer)Player).GotoRankingInvoked);
+        }
+
+        /// <summary>
+        /// Tests whether can still pause after cancelling completion
+        /// by reverting <see cref="IScreen.ValidForResume"/> back to true.
+        /// </summary>
+        [Test]
+        public void TestCanPauseAfterCancellation()
+        {
+            cancelCompletionSteps();
+
+            AddStep("pause", () => Player.Pause());
+            AddAssert("paused successfully", () => Player.GameplayClockContainer.IsPaused.Value);
+        }
+
+        private void cancelCompletionSteps()
+        {
+            AddStep("seek to completion", () => track.Seek(5000));
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+
+            AddStep("rewind to cancel", () => track.Seek(4000));
+            AddUntilStep("completion cleared by processor", () => !Player.ScoreProcessor.HasCompleted.Value);
+
+            AddWaitStep("wait", 5);
+        }
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+        {
+            var working = new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audio);
+            track = working.Track;
+            return working;
+        }
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            var beatmap = new Beatmap();
+
+            for (int i = 1; i <= 19; i++)
+            {
+                beatmap.HitObjects.Add(new HitCircle
+                {
+                    Position = new Vector2(256, 192),
+                    StartTime = i * 250,
+                });
+            }
+
+            return beatmap;
+        }
+
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new FakeRankingPushPlayer();
+
+        public class FakeRankingPushPlayer : TestPlayer
+        {
+            public bool GotoRankingInvoked;
+
+            public FakeRankingPushPlayer()
+                : base(true, true)
+            {
+            }
+
+            protected override void GotoRanking()
+            {
+                GotoRankingInvoked = true;
+            }
+        }
+    }
+}

From 1dd471dfcc1ae9465d17c3d21ea2577d7a2b46c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Apr 2020 15:12:36 +0900
Subject: [PATCH 02261/10326] Add /np (now playing) command support in chat

---
 .../Visual/Online/TestNowPlayingCommand.cs    | 85 +++++++++++++++++++
 osu.Game/Online/Chat/ChannelManager.cs        |  6 +-
 osu.Game/Online/Chat/IChannelPostTarget.cs    | 19 +++++
 osu.Game/Online/Chat/NowPlayingCommand.cs     | 55 ++++++++++++
 osu.Game/Online/PollingComponent.cs           |  4 +-
 5 files changed, 166 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestNowPlayingCommand.cs
 create mode 100644 osu.Game/Online/Chat/IChannelPostTarget.cs
 create mode 100644 osu.Game/Online/Chat/NowPlayingCommand.cs

diff --git a/osu.Game.Tests/Visual/Online/TestNowPlayingCommand.cs b/osu.Game.Tests/Visual/Online/TestNowPlayingCommand.cs
new file mode 100644
index 0000000000..60032ab118
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestNowPlayingCommand.cs
@@ -0,0 +1,85 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Chat;
+using osu.Game.Rulesets;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    [HeadlessTest]
+    public class TestNowPlayingCommand : OsuTestScene
+    {
+        [Cached(typeof(IChannelPostTarget))]
+        private PostTarget postTarget { get; set; }
+
+        public TestNowPlayingCommand()
+        {
+            Add(postTarget = new PostTarget());
+        }
+
+        [Test]
+        public void TestGenericActivity()
+        {
+            AddStep("Set activity", () => API.Activity.Value = new UserActivity.InLobby());
+
+            AddStep("Run command", () => Add(new NowPlayingCommand()));
+
+            AddAssert("Check correct response", () => postTarget.LastMessage.Contains("is listening"));
+        }
+
+        [Test]
+        public void TestEditActivity()
+        {
+            AddStep("Set activity", () => API.Activity.Value = new UserActivity.Editing(new BeatmapInfo()));
+
+            AddStep("Run command", () => Add(new NowPlayingCommand()));
+
+            AddAssert("Check correct response", () => postTarget.LastMessage.Contains("is editing"));
+        }
+
+        [Test]
+        public void TestPlayActivity()
+        {
+            AddStep("Set activity", () => API.Activity.Value = new UserActivity.SoloGame(new BeatmapInfo(), new RulesetInfo()));
+
+            AddStep("Run command", () => Add(new NowPlayingCommand()));
+
+            AddAssert("Check correct response", () => postTarget.LastMessage.Contains("is playing"));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestLinkPresence(bool hasOnlineId)
+        {
+            AddStep("Set activity", () => API.Activity.Value = new UserActivity.InLobby());
+
+            AddStep("Set beatmap", () => Beatmap.Value = new DummyWorkingBeatmap(null, null)
+            {
+                BeatmapInfo = { OnlineBeatmapID = hasOnlineId ? 1234 : (int?)null }
+            });
+
+            AddStep("Run command", () => Add(new NowPlayingCommand()));
+
+            if (hasOnlineId)
+                AddAssert("Check link presence", () => postTarget.LastMessage.Contains("https://osu.ppy.sh/b/1234"));
+            else
+                AddAssert("Check link not present", () => !postTarget.LastMessage.Contains("https://"));
+        }
+
+        public class PostTarget : Component, IChannelPostTarget
+        {
+            public void PostMessage(string text, bool isAction = false, Channel target = null)
+            {
+                LastMessage = text;
+            }
+
+            public string LastMessage { get; private set; }
+        }
+    }
+}
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 2c37216fd6..f53beefeb5 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Online.Chat
     /// <summary>
     /// Manages everything channel related
     /// </summary>
-    public class ChannelManager : PollingComponent
+    public class ChannelManager : PollingComponent, IChannelPostTarget
     {
         /// <summary>
         /// The channels the player joins on startup
@@ -204,6 +204,10 @@ namespace osu.Game.Online.Chat
 
             switch (command)
             {
+                case "np":
+                    AddInternal(new NowPlayingCommand());
+                    break;
+
                 case "me":
                     if (string.IsNullOrWhiteSpace(content))
                     {
diff --git a/osu.Game/Online/Chat/IChannelPostTarget.cs b/osu.Game/Online/Chat/IChannelPostTarget.cs
new file mode 100644
index 0000000000..5697e918f0
--- /dev/null
+++ b/osu.Game/Online/Chat/IChannelPostTarget.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.Allocation;
+
+namespace osu.Game.Online.Chat
+{
+    [Cached(typeof(IChannelPostTarget))]
+    public interface IChannelPostTarget
+    {
+        /// <summary>
+        /// Posts a message to the currently opened channel.
+        /// </summary>
+        /// <param name="text">The message text that is going to be posted</param>
+        /// <param name="isAction">Is true if the message is an action, e.g.: user is currently eating </param>
+        /// <param name="target">An optional target channel. If null, <see cref="ChannelManager.CurrentChannel"/> will be used.</param>
+        void PostMessage(string text, bool isAction = false, Channel target = null);
+    }
+}
diff --git a/osu.Game/Online/Chat/NowPlayingCommand.cs b/osu.Game/Online/Chat/NowPlayingCommand.cs
new file mode 100644
index 0000000000..c0b54812b6
--- /dev/null
+++ b/osu.Game/Online/Chat/NowPlayingCommand.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Users;
+
+namespace osu.Game.Online.Chat
+{
+    public class NowPlayingCommand : Component
+    {
+        [Resolved]
+        private IChannelPostTarget channelManager { get; set; }
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private Bindable<WorkingBeatmap> currentBeatmap { get; set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            string verb;
+            BeatmapInfo beatmap;
+
+            switch (api.Activity.Value)
+            {
+                case UserActivity.SoloGame solo:
+                    verb = "playing";
+                    beatmap = solo.Beatmap;
+                    break;
+
+                case UserActivity.Editing edit:
+                    verb = "editing";
+                    beatmap = edit.Beatmap;
+                    break;
+
+                default:
+                    verb = "listening to";
+                    beatmap = currentBeatmap.Value.BeatmapInfo;
+                    break;
+            }
+
+            var beatmapString = beatmap.OnlineBeatmapID.HasValue ? $"[https://osu.ppy.sh/b/{beatmap.OnlineBeatmapID} {beatmap}]" : beatmap.ToString();
+
+            channelManager.PostMessage($"is {verb} {beatmapString}", true);
+            Expire();
+        }
+    }
+}
diff --git a/osu.Game/Online/PollingComponent.cs b/osu.Game/Online/PollingComponent.cs
index acbb2c39f4..228f147835 100644
--- a/osu.Game/Online/PollingComponent.cs
+++ b/osu.Game/Online/PollingComponent.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
-using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
 
 namespace osu.Game.Online
@@ -11,7 +11,7 @@ namespace osu.Game.Online
     /// <summary>
     /// A component which requires a constant polling process.
     /// </summary>
-    public abstract class PollingComponent : Component
+    public abstract class PollingComponent : CompositeDrawable // switch away from Component because InternalChildren are used in usages.
     {
         private double? lastTimePolled;
 

From e4d4040afb90a990eb369ced822d65f07acd1e25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Apr 2020 16:57:47 +0900
Subject: [PATCH 02262/10326] Rename test to match other classes

---
 ...TestNowPlayingCommand.cs => TestSceneNowPlayingCommand.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Online/{TestNowPlayingCommand.cs => TestSceneNowPlayingCommand.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Online/TestNowPlayingCommand.cs b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Online/TestNowPlayingCommand.cs
rename to osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
index 60032ab118..103308d34d 100644
--- a/osu.Game.Tests/Visual/Online/TestNowPlayingCommand.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
@@ -13,12 +13,12 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Visual.Online
 {
     [HeadlessTest]
-    public class TestNowPlayingCommand : OsuTestScene
+    public class TestSceneNowPlayingCommand : OsuTestScene
     {
         [Cached(typeof(IChannelPostTarget))]
         private PostTarget postTarget { get; set; }
 
-        public TestNowPlayingCommand()
+        public TestSceneNowPlayingCommand()
         {
             Add(postTarget = new PostTarget());
         }

From f893d523f52554b57b390b3f4ee25d302bef9831 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 19 Apr 2020 12:23:41 +0300
Subject: [PATCH 02263/10326] User setting for always playing first combo break

---
 osu.Game/Configuration/OsuConfigManager.cs         |  2 ++
 .../Settings/Sections/Gameplay/GeneralSettings.cs  |  6 ++++++
 osu.Game/Screens/Play/ComboEffects.cs              | 14 +++++++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 9d31bc9bba..10d11f967e 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -91,6 +91,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.FadePlayfieldWhenHealthLow, true);
             Set(OsuSetting.KeyOverlay, false);
             Set(OsuSetting.PositionalHitSounds, true);
+            Set(OsuSetting.AlwaysPlayComboBreak, false);
             Set(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
             Set(OsuSetting.FloatingComments, false);
@@ -180,6 +181,7 @@ namespace osu.Game.Configuration
         ShowStoryboard,
         KeyOverlay,
         PositionalHitSounds,
+        AlwaysPlayComboBreak,
         ScoreMeter,
         FloatingComments,
         ShowInterface,
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 93a02ea0e4..f3534e4625 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -67,6 +67,12 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Positional hitsounds",
                     Bindable = config.GetBindable<bool>(OsuSetting.PositionalHitSounds)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Always play first combo break sound",
+                    Keywords = new[] { "regardless", "combobreak.wav" },
+                    Bindable = config.GetBindable<bool>(OsuSetting.AlwaysPlayComboBreak)
+                },
                 new SettingsEnumDropdown<ScoreMeterType>
                 {
                     LabelText = "Score meter type",
diff --git a/osu.Game/Screens/Play/ComboEffects.cs b/osu.Game/Screens/Play/ComboEffects.cs
index 1c4ac921f0..c56ee35cec 100644
--- a/osu.Game/Screens/Play/ComboEffects.cs
+++ b/osu.Game/Screens/Play/ComboEffects.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
@@ -16,27 +17,34 @@ namespace osu.Game.Screens.Play
 
         private SkinnableSound comboBreakSample;
 
+        private Bindable<bool> alwaysPlay;
+        private bool firstTime = true;
+
         public ComboEffects(ScoreProcessor processor)
         {
             this.processor = processor;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuConfigManager config)
         {
             InternalChild = comboBreakSample = new SkinnableSound(new SampleInfo("combobreak"));
+            alwaysPlay = config.GetBindable<bool>(OsuSetting.AlwaysPlayComboBreak);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            processor.Combo.BindValueChanged(onComboChange, true);
+            processor.Combo.BindValueChanged(onComboChange);
         }
 
         private void onComboChange(ValueChangedEvent<int> combo)
         {
-            if (combo.NewValue == 0 && combo.OldValue > 20)
+            if (combo.NewValue == 0 && (combo.OldValue > 20 || alwaysPlay.Value && firstTime))
+            {
                 comboBreakSample?.Play();
+                firstTime = false;
+            }
         }
     }
 }

From e3e0cd149f94d033a36d7622c0a8bf91e029fde0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 19 Apr 2020 12:41:00 +0200
Subject: [PATCH 02264/10326] Refactor test code to eliminate boolean flags

---
 .../TestSceneHyperDashColouring.cs            | 127 +++++++++---------
 1 file changed, 65 insertions(+), 62 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 846b17f324..a48ecb9b79 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -27,74 +27,71 @@ namespace osu.Game.Rulesets.Catch.Tests
         private SkinManager skins { get; set; }
 
         [Test]
-        public void TestHyperDashFruitColour()
+        public void TestDefaultFruitColour()
         {
-            DrawableFruit drawableFruit = null;
+            var skin = new TestSkin();
 
-            AddStep("setup hyper-dash fruit", () =>
-            {
-                var fruit = new Fruit { HyperDashTarget = new Banana() };
-                fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-                Child = setupSkinHierarchy(drawableFruit = new DrawableFruit(fruit)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(4f),
-                }, false, false, false);
-            });
-
-            AddAssert("hyper-dash fruit has default colour", () => checkLegacyFruitHyperDashColour(drawableFruit, Catcher.DEFAULT_HYPER_DASH_COLOUR));
-        }
-
-        [TestCase(true)]
-        [TestCase(false)]
-        public void TestCustomHyperDashFruitColour(bool customCatcherHyperDashColour)
-        {
-            DrawableFruit drawableFruit = null;
-
-            AddStep("setup hyper-dash fruit", () =>
-            {
-                var fruit = new Fruit { HyperDashTarget = new Banana() };
-                fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-                Child = setupSkinHierarchy(drawableFruit = new DrawableFruit(fruit)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(4f),
-                }, customCatcherHyperDashColour, false, true);
-            });
-
-            AddAssert("hyper-dash fruit use fruit colour from skin", () => checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CUSTOM_HYPER_DASH_FRUIT_COLOUR));
+            checkHyperDashFruitColour(skin, Catcher.DEFAULT_HYPER_DASH_COLOUR);
         }
 
         [Test]
-        public void TestCustomHyperDashFruitColourFallback()
+        public void TestCustomFruitColour()
+        {
+            var skin = new TestSkin
+            {
+                HyperDashFruitColour = Color4.Cyan
+            };
+
+            checkHyperDashFruitColour(skin, skin.HyperDashFruitColour);
+        }
+
+        [Test]
+        public void TestCustomFruitColourPriority()
+        {
+            var skin = new TestSkin
+            {
+                HyperDashColour = Color4.Goldenrod,
+                HyperDashFruitColour = Color4.Cyan
+            };
+
+            checkHyperDashFruitColour(skin, skin.HyperDashFruitColour);
+        }
+
+        [Test]
+        public void TestFruitColourFallback()
+        {
+            var skin = new TestSkin
+            {
+                HyperDashColour = Color4.Goldenrod
+            };
+
+            checkHyperDashFruitColour(skin, skin.HyperDashColour);
+        }
+
+        private void checkHyperDashFruitColour(ISkin skin, Color4 expectedColour)
         {
             DrawableFruit drawableFruit = null;
 
-            AddStep("setup hyper-dash fruit", () =>
+            AddStep("create hyper-dash fruit", () =>
             {
                 var fruit = new Fruit { HyperDashTarget = new Banana() };
                 fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-                Child = setupSkinHierarchy(
-                    drawableFruit = new DrawableFruit(fruit)
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Scale = new Vector2(4f),
-                    }, true, false, false);
+                Child = setupSkinHierarchy(drawableFruit = new DrawableFruit(fruit)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(4f),
+                }, skin);
             });
 
-            AddAssert("hyper-dash fruit colour falls back to catcher colour from skin", () => checkLegacyFruitHyperDashColour(drawableFruit, TestSkin.CUSTOM_HYPER_DASH_COLOUR));
+            AddAssert("hyper-dash colour is correct", () => checkLegacyFruitHyperDashColour(drawableFruit, expectedColour));
         }
 
-        private Drawable setupSkinHierarchy(Drawable child, bool customCatcherColour, bool customAfterColour, bool customFruitColour)
+        private Drawable setupSkinHierarchy(Drawable child, ISkin skin)
         {
             var legacySkinProvider = new SkinProvidingContainer(skins.GetSkin(DefaultLegacySkin.Info));
-            var testSkinProvider = new SkinProvidingContainer(new TestSkin(customCatcherColour, customAfterColour, customFruitColour));
+            var testSkinProvider = new SkinProvidingContainer(skin);
             var legacySkinTransformer = new SkinProvidingContainer(new CatchLegacySkinTransformer(testSkinProvider));
 
             return legacySkinProvider
@@ -108,21 +105,27 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private class TestSkin : LegacySkin
         {
-            public static readonly Color4 CUSTOM_HYPER_DASH_COLOUR = Color4.Goldenrod;
-            public static readonly Color4 CUSTOM_HYPER_DASH_AFTER_COLOUR = Color4.Lime;
-            public static readonly Color4 CUSTOM_HYPER_DASH_FRUIT_COLOUR = Color4.Cyan;
+            public Color4 HyperDashColour
+            {
+                get => Configuration.CustomColours[CatchSkinColour.HyperDash.ToString()];
+                set => Configuration.CustomColours[CatchSkinColour.HyperDash.ToString()] = value;
+            }
 
-            public TestSkin(bool customCatcherColour, bool customAfterColour, bool customFruitColour)
+            public Color4 HyperDashAfterImageColour
+            {
+                get => Configuration.CustomColours[CatchSkinColour.HyperDashAfterImage.ToString()];
+                set => Configuration.CustomColours[CatchSkinColour.HyperDashAfterImage.ToString()] = value;
+            }
+
+            public Color4 HyperDashFruitColour
+            {
+                get => Configuration.CustomColours[CatchSkinColour.HyperDashFruit.ToString()];
+                set => Configuration.CustomColours[CatchSkinColour.HyperDashFruit.ToString()] = value;
+            }
+
+            public TestSkin()
                 : base(new SkinInfo(), null, null, string.Empty)
             {
-                if (customCatcherColour)
-                    Configuration.CustomColours[CatchSkinColour.HyperDash.ToString()] = CUSTOM_HYPER_DASH_COLOUR;
-
-                if (customAfterColour)
-                    Configuration.CustomColours[CatchSkinColour.HyperDashAfterImage.ToString()] = CUSTOM_HYPER_DASH_AFTER_COLOUR;
-
-                if (customFruitColour)
-                    Configuration.CustomColours[CatchSkinColour.HyperDashFruit.ToString()] = CUSTOM_HYPER_DASH_FRUIT_COLOUR;
             }
         }
     }

From a7179d1c8751b179ae8d676ee76cd73b8930336f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 19 Apr 2020 15:15:04 +0200
Subject: [PATCH 02265/10326] Fix comment wording
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/Rulesets/RulesetStore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 34da2dc2db..d4b41dcb38 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets
 
             // the requesting assembly may be located out of the executable's base directory, thus requiring manual resolving of its dependencies.
             // this assumes the only explicit dependency of the ruleset is the game core assembly.
-            // the ruleset dependency on the game core assembly requires manual resolving, transient dependencies should be resolved automatically
+            // the ruleset dependency on the game core assembly requires manual resolving, transitive dependencies should be resolved automatically
             if (asm.Name.Equals(typeof(OsuGame).Assembly.GetName().Name, StringComparison.Ordinal))
                 return Assembly.GetExecutingAssembly();
 

From 07b8ef83c95c209a9953013b3cadc01bc529b7aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Apr 2020 22:15:07 +0900
Subject: [PATCH 02266/10326] Add /np to help line

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

diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index f53beefeb5..822f628dd2 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -238,7 +238,7 @@ namespace osu.Game.Online.Chat
                     break;
 
                 case "help":
-                    target.AddNewMessages(new InfoMessage("Supported commands: /help, /me [action], /join [channel]"));
+                    target.AddNewMessages(new InfoMessage("Supported commands: /help, /me [action], /join [channel], /np"));
                     break;
 
                 default:

From ba1c465edf296fe55bf4d623e5543918ab85f7af Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 19 Apr 2020 15:25:21 +0200
Subject: [PATCH 02267/10326] Add comment in regards to the attaching of event
 handler  to the assembly lookup event before call to loadUserRulesets().

---
 osu.Game/Rulesets/RulesetStore.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index d4b41dcb38..ab169c741d 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -29,6 +29,10 @@ namespace osu.Game.Rulesets
             // We cannot read assemblies from cwd, so should check loaded assemblies instead.
             loadFromAppDomain();
             loadFromDisk();
+   
+            // the event handler contains code for resolving dependency on the game assembly for rulesets located outside the base game directory.
+            // It needs to be attached to the assembly lookup event before the actual call to loadUserRulesets() else rulesets located out of the base game directory will fail
+            // to load as unable to locate the game core assembly.
             AppDomain.CurrentDomain.AssemblyResolve += resolveRulesetDependencyAssembly;
             loadUserRulesets();
             addMissingRulesets();

From 1dcb0f53a233452392efadd949c12342842eb7c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 19 Apr 2020 16:29:32 +0200
Subject: [PATCH 02268/10326] Fix whitespace formatting

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

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index ab169c741d..7e165311a3 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets
             // We cannot read assemblies from cwd, so should check loaded assemblies instead.
             loadFromAppDomain();
             loadFromDisk();
-   
+
             // the event handler contains code for resolving dependency on the game assembly for rulesets located outside the base game directory.
             // It needs to be attached to the assembly lookup event before the actual call to loadUserRulesets() else rulesets located out of the base game directory will fail
             // to load as unable to locate the game core assembly.

From b57d709d151d4296e35a03fb79130cf55e4a34d3 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 19 Apr 2020 18:29:06 +0300
Subject: [PATCH 02269/10326] Don't use Parent

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 18 +++++++++---------
 osu.Game/Screens/Select/SongSelect.cs      |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index b5dfcadeaa..cf3a5a7199 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -28,8 +28,8 @@ namespace osu.Game.Screens.Select
 {
     public class BeatmapCarousel : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
-        private const float bleed_top = FilterControl.HEIGHT;
-        private const float bleed_bottom = Footer.HEIGHT;
+        public float BleedTop;
+        public float BleedBottom;
 
         /// <summary>
         /// Triggered when the <see cref="BeatmapSets"/> loaded change and are completely loaded.
@@ -373,17 +373,17 @@ namespace osu.Game.Screens.Select
         /// the beatmap carousel bleeds into the <see cref="FilterControl"/> and the <see cref="Footer"/>
         /// </remarks>
         /// </summary>
-        private float visibleHalfHeight => (DrawHeight + bleed_bottom + bleed_top) / 2;
+        private float visibleHalfHeight => (DrawHeight + BleedBottom + BleedTop) / 2;
 
         /// <summary>
         /// The position of the lower visible bound with respect to the current scroll position.
         /// </summary>
-        private float visibleBottomBound => scroll.Current + DrawHeight + bleed_bottom;
+        private float visibleBottomBound => scroll.Current + DrawHeight + BleedBottom;
 
         /// <summary>
         /// The position of the upper visible bound with respect to the current scroll position.
         /// </summary>
-        private float visibleUpperBound => scroll.Current - bleed_top;
+        private float visibleUpperBound => scroll.Current - BleedTop;
 
         public void FlushPendingFilterOperations()
         {
@@ -641,11 +641,11 @@ namespace osu.Game.Screens.Select
                         case DrawableCarouselBeatmap beatmap:
                         {
                             if (beatmap.Item.State.Value == CarouselItemState.Selected)
-                                // scroll position at currentY makes the set panel appear at the very top of the carousel in screen space
-                                // move down by half of parent height (which is the height of the carousel's visible extent, including semi-transparent areas)
-                                // then reapply parent's padding from the top by adding it
+                                // scroll position at currentY makes the set panel appear at the very top of the carousel's screen space
+                                // move down by half of visible height (height of the carousel's visible extent, including semi-transparent areas)
+                                // then reapply the top semi-transparent area (because carousel's screen space starts below it)
                                 // and finally add half of the panel's own height to achieve vertical centering of the panel itself
-                                scrollTarget = currentY - Parent.DrawHeight / 2 + Parent.Padding.Top + beatmap.DrawHeight / 2;
+                                scrollTarget = currentY - visibleHalfHeight + BleedTop + beatmap.DrawHeight / 2;
 
                             void performMove(float y, float? startY = null)
                             {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 5bc2e1aa56..bd6204d8cd 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -153,6 +153,8 @@ namespace osu.Game.Screens.Select
                                             Anchor = Anchor.CentreRight,
                                             Origin = Anchor.CentreRight,
                                             RelativeSizeAxes = Axes.Both,
+                                            BleedTop = FilterControl.HEIGHT,
+                                            BleedBottom = Footer.HEIGHT,
                                             SelectionChanged = updateSelectedBeatmap,
                                             BeatmapSetsChanged = carouselBeatmapsLoaded,
                                             GetRecommendedBeatmap = recommender.GetRecommendedBeatmap,

From f3fee734417154e36ef9594a67e3060983455d91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 09:35:00 +0900
Subject: [PATCH 02270/10326] Fix DatabasedKeyBindingContainer not using
 defaults for non-databased ruleset

---
 .../Visual/Gameplay/TestSceneKeyBindings.cs   | 99 +++++++++++++++++++
 .../Bindings/DatabasedKeyBindingContainer.cs  | 10 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.cs
new file mode 100644
index 0000000000..45d9819c0e
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.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.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Bindings;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    [HeadlessTest]
+    public class TestSceneKeyBindings : OsuManualInputManagerTestScene
+    {
+        private readonly ActionReceiver receiver;
+
+        public TestSceneKeyBindings()
+        {
+            Add(new TestKeyBindingContainer
+            {
+                Child = receiver = new ActionReceiver()
+            });
+        }
+
+        [Test]
+        public void TestDefaultsWhenNotDatabased()
+        {
+            AddStep("fire key", () =>
+            {
+                InputManager.PressKey(Key.A);
+                InputManager.ReleaseKey(Key.A);
+            });
+
+            AddAssert("received key", () => receiver.ReceivedAction);
+        }
+
+        private class TestRuleset : Ruleset
+        {
+            public override IEnumerable<Mod> GetModsFor(ModType type) =>
+                throw new System.NotImplementedException();
+
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) =>
+                throw new System.NotImplementedException();
+
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) =>
+                throw new System.NotImplementedException();
+
+            public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) =>
+                throw new System.NotImplementedException();
+
+            public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0)
+            {
+                return new[]
+                {
+                    new KeyBinding(InputKey.A, TestAction.Down),
+                };
+            }
+
+            public override string Description => "test";
+            public override string ShortName => "test";
+        }
+
+        private enum TestAction
+        {
+            Down,
+        }
+
+        private class TestKeyBindingContainer : DatabasedKeyBindingContainer<TestAction>
+        {
+            public TestKeyBindingContainer()
+                : base(new TestRuleset().RulesetInfo, 0)
+            {
+            }
+        }
+
+        private class ActionReceiver : CompositeDrawable, IKeyBindingHandler<TestAction>
+        {
+            public bool ReceivedAction;
+
+            public bool OnPressed(TestAction action)
+            {
+                ReceivedAction = action == TestAction.Down;
+                return true;
+            }
+
+            public void OnReleased(TestAction action)
+            {
+                throw new System.NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index e83d899469..94edc33099 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -62,6 +62,14 @@ namespace osu.Game.Input.Bindings
                 store.KeyBindingChanged -= ReloadMappings;
         }
 
-        protected override void ReloadMappings() => KeyBindings = store.Query(ruleset?.ID, variant).ToList();
+        protected override void ReloadMappings()
+        {
+            if (ruleset != null && !ruleset.ID.HasValue)
+                // if the provided ruleset is not stored to the database, we have no way to retrieve custom bindings.
+                // fallback to defaults instead.
+                KeyBindings = DefaultKeyBindings;
+            else
+                KeyBindings = store.Query(ruleset?.ID, variant).ToList();
+        }
     }
 }

From 2444dd42d0a931a9b6288813956f435b1bc5d4f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 09:57:46 +0900
Subject: [PATCH 02271/10326] Remove not-implemented-exception

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.cs
index 45d9819c0e..db65e91d17 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.cs
@@ -92,7 +92,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public void OnReleased(TestAction action)
             {
-                throw new System.NotImplementedException();
             }
         }
     }

From 28318a0140a4e3854d81896e7a762a451f8d7637 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 10:59:08 +0900
Subject: [PATCH 02272/10326] Add mention of notelock in xmldoc (potentially
 easier to find class)

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index cd9838e7bf..176402c831 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.Osu.UI
 {
     /// <summary>
-    /// Ensures that <see cref="HitObject"/>s are hit in-order.
+    /// Ensures that <see cref="HitObject"/>s are hit in-order. Affectionately known as "note lock".
     /// If a <see cref="HitObject"/> is hit out of order:
     /// <list type="number">
     /// <item><description>The hit is blocked if it occurred earlier than the previous <see cref="HitObject"/>'s start time.</description></item>

From e1acfd26a6849be6cee96edc66ae58c17e9a1fac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 10:59:44 +0900
Subject: [PATCH 02273/10326] Simplify return logic

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index 176402c831..1f027e9726 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
@@ -51,10 +51,7 @@ namespace osu.Game.Rulesets.Osu.UI
             // 1. The last blocking hitobject has been judged.
             // 2. The current time is after the last hitobject's start time.
             // Hits at exactly the same time as the blocking hitobject are allowed for maps that contain simultaneous hitobjects (e.g. /b/372245).
-            if (blockingObject.Judged || time >= blockingObject.HitObject.StartTime)
-                return true;
-
-            return false;
+            return blockingObject.Judged || time >= blockingObject.HitObject.StartTime;
         }
 
         /// <summary>

From 8c85602ad013001281d4148b6109d606d6885c8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 11:00:42 +0900
Subject: [PATCH 02274/10326] Use foreach for conformity

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index 1f027e9726..53dd1127d6 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
@@ -93,12 +93,12 @@ namespace osu.Game.Rulesets.Osu.UI
 
                 yield return obj;
 
-                for (int i = 0; i < obj.NestedHitObjects.Count; i++)
+                foreach (var nestedObj in obj.NestedHitObjects)
                 {
-                    if (obj.NestedHitObjects[i].HitObject.StartTime >= targetTime)
+                    if (nestedObj.HitObject.StartTime >= targetTime)
                         break;
 
-                    yield return obj.NestedHitObjects[i];
+                    yield return nestedObj;
                 }
             }
         }

From 6f233917b18dc05bb5f7d620cfc8fc512a6df9f7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 20 Apr 2020 06:40:51 +0300
Subject: [PATCH 02275/10326] Centralize updating HasCompleted bindable logic

---
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index d878ef0a5c..8aef615b5f 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -58,8 +58,7 @@ namespace osu.Game.Rulesets.Scoring
 
             NewJudgement?.Invoke(result);
 
-            if (JudgedHits == MaxHits)
-                hasCompleted.Value = true;
+            updateHasCompleted();
         }
 
         /// <summary>
@@ -70,8 +69,7 @@ namespace osu.Game.Rulesets.Scoring
         {
             JudgedHits--;
 
-            if (JudgedHits < MaxHits)
-                hasCompleted.Value = false;
+            updateHasCompleted();
 
             RevertResultInternal(result);
         }
@@ -135,5 +133,7 @@ namespace osu.Game.Rulesets.Scoring
                 ApplyResult(result);
             }
         }
+
+        private void updateHasCompleted() => hasCompleted.Value = JudgedHits == MaxHits;
     }
 }

From e12e3391fb803f9bdf75ebb51abaf275427c1d07 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 20 Apr 2020 06:42:33 +0300
Subject: [PATCH 02276/10326] Base wait steps duration on the delay used for
 results display

With `* 2` for safety of not potentially going to the next step and the delegate not executed yet.
---
 .../Visual/Gameplay/TestSceneCompletionCancellation.cs     | 6 +++++-
 osu.Game/Screens/Play/Player.cs                            | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
index 54e1ff5345..aef173c36a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private AudioManager audio { get; set; }
 
+        private int resultsDisplayWaitCount =>
+            (int)((Screens.Play.Player.RESULTS_DISPLAY_DELAY / TimePerAction) * 2);
+
         protected override bool AllowFail => false;
 
         public TestSceneCompletionCancellation()
@@ -83,7 +86,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("rewind to cancel", () => track.Seek(4000));
             AddUntilStep("completion cleared by processor", () => !Player.ScoreProcessor.HasCompleted.Value);
 
-            AddWaitStep("wait", 5);
+            // wait to ensure there was no attempt of pushing the results screen.
+            AddWaitStep("wait", resultsDisplayWaitCount);
         }
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c6c83e5379..2f3807753a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -37,6 +37,11 @@ namespace osu.Game.Screens.Play
     [Cached]
     public class Player : ScreenWithBeatmapBackground
     {
+        /// <summary>
+        /// The delay upon completion of the beatmap before displaying the results screen.
+        /// </summary>
+        public const double RESULTS_DISPLAY_DELAY = 1000.0;
+
         public override bool AllowBackButton => false; // handled by HoldForMenuButton
 
         protected override UserActivity InitialActivity => new UserActivity.SoloGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
@@ -436,7 +441,7 @@ namespace osu.Game.Screens.Play
 
             if (!showResults) return;
 
-            using (BeginDelayedSequence(1000))
+            using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
                 scheduleGotoRanking();
         }
 

From 2c012b9af1106bbc154b25453a8cd71c3eb5001b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 20 Apr 2020 06:43:18 +0300
Subject: [PATCH 02277/10326] Use AddUntilStep whenever possible

Avoid redundant usage
---
 .../Visual/Gameplay/TestSceneCompletionCancellation.cs        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
index aef173c36a..a3fb17942f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
@@ -60,9 +60,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("seek to completion again", () => track.Seek(5000));
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
 
-            AddWaitStep("wait", 5);
-
-            AddAssert("attempted to push ranking", () => ((FakeRankingPushPlayer)Player).GotoRankingInvoked);
+            AddUntilStep("attempted to push ranking", () => ((FakeRankingPushPlayer)Player).GotoRankingInvoked);
         }
 
         /// <summary>

From 355e682e24557b3b87d791943c0e2523e3331de6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 20 Apr 2020 13:23:27 +0900
Subject: [PATCH 02278/10326] Fix typo in exception

---
 osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
index 53dd1127d6..8e4f81347d 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 return;
 
             if (!IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
-                throw new InvalidOperationException($"A {hitObject} was hit before it become hittable!");
+                throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
 
             foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))
             {

From ee1ccb8bcb14c637e6912c9f278b10b7573348af Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 14:03:55 +0900
Subject: [PATCH 02279/10326] Fix in a slightly different and hopefully more
 understandable way

---
 osu.Game/Screens/Select/SongSelect.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 9d3dc58a26..478c46fb36 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -426,7 +426,7 @@ namespace osu.Game.Screens.Select
         }
 
         /// <summary>
-        /// selection has been changed as the result of a user interaction.
+        /// Selection has been changed as the result of a user interaction.
         /// </summary>
         private void performUpdateSelected()
         {
@@ -435,7 +435,7 @@ namespace osu.Game.Screens.Select
 
             selectionChangedDebounce?.Cancel();
 
-            if (beatmap == null)
+            if (beatmapNoDebounce == null)
                 run();
             else
                 selectionChangedDebounce = Scheduler.AddDelayed(run, 200);
@@ -448,11 +448,11 @@ namespace osu.Game.Screens.Select
                 {
                     Mods.Value = Array.Empty<Mod>();
 
-                    // the ruleset transfer may cause a deselection of the current beatmap (due to incompatibility).
-                    // this can happen via Carousel.FlushPendingFilterOperations().
-                    // to ensure a good state, re-transfer no-debounce values.
-                    performUpdateSelected();
-                    return;
+                    // transferRulesetValue() may trigger a refilter. If the current selection does not match the new ruleset, we want to switch away from it.
+                    // The default logic on WorkingBeatmap change is to switch to a matching ruleset (see workingBeatmapChanged()), but we don't want that here.
+                    // We perform an early selection attempt and clear out the beatmap selection to avoid a second ruleset change (revert).
+                    if (beatmap != null && !Carousel.SelectBeatmap(beatmap, false))
+                        beatmap = null;
                 }
 
                 // We may be arriving here due to another component changing the bindable Beatmap.
@@ -716,7 +716,7 @@ namespace osu.Game.Screens.Select
             if (decoupledRuleset.Value?.Equals(Ruleset.Value) == true)
                 return false;
 
-            Logger.Log($"decoupled ruleset transferred (\"{decoupledRuleset.Value}\" -> \"{Ruleset.Value}\"");
+            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.

From b881293b98410e47dfde82f3f330f8aeda7d2c96 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 20 Apr 2020 14:08:23 +0900
Subject: [PATCH 02280/10326] Allow 10k to be played on a single stage

---
 .../Beatmaps/ManiaBeatmapConverter.cs         |  2 +-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 67 +++++++++++++------
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index d904474815..189dd17934 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             {
                 TargetColumns = (int)Math.Max(1, roundedCircleSize);
 
-                if (TargetColumns >= 10)
+                if (TargetColumns > 10)
                 {
                     TargetColumns /= 2;
                     Dual = true;
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 2bd88fee90..e8698ef01c 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Rulesets.Mania
         {
             get
             {
-                for (int i = 1; i <= 9; i++)
+                for (int i = 1; i <= 10; i++)
                     yield return (int)PlayfieldType.Single + i;
                 for (int i = 2; i <= 18; i += 2)
                     yield return (int)PlayfieldType.Dual + i;
@@ -262,26 +262,53 @@ namespace osu.Game.Rulesets.Mania
             switch (getPlayfieldType(variant))
             {
                 case PlayfieldType.Single:
-                    return new VariantMappingGenerator
+                    switch (variant)
                     {
-                        LeftKeys = new[]
-                        {
-                            InputKey.A,
-                            InputKey.S,
-                            InputKey.D,
-                            InputKey.F
-                        },
-                        RightKeys = new[]
-                        {
-                            InputKey.J,
-                            InputKey.K,
-                            InputKey.L,
-                            InputKey.Semicolon
-                        },
-                        SpecialKey = InputKey.Space,
-                        SpecialAction = ManiaAction.Special1,
-                        NormalActionStart = ManiaAction.Key1,
-                    }.GenerateKeyBindingsFor(variant, out _);
+                        case 10:
+                            // 10K is special because it extents one key towards the centre of the keyboard (V/N), rather than towards the edges of the keyboard.
+                            return new VariantMappingGenerator
+                            {
+                                LeftKeys = new[]
+                                {
+                                    InputKey.A,
+                                    InputKey.S,
+                                    InputKey.D,
+                                    InputKey.F,
+                                    InputKey.V
+                                },
+                                RightKeys = new[]
+                                {
+                                    InputKey.N,
+                                    InputKey.J,
+                                    InputKey.K,
+                                    InputKey.L,
+                                    InputKey.Semicolon,
+                                },
+                                NormalActionStart = ManiaAction.Key1,
+                            }.GenerateKeyBindingsFor(variant, out _);
+
+                        default:
+                            return new VariantMappingGenerator
+                            {
+                                LeftKeys = new[]
+                                {
+                                    InputKey.A,
+                                    InputKey.S,
+                                    InputKey.D,
+                                    InputKey.F
+                                },
+                                RightKeys = new[]
+                                {
+                                    InputKey.J,
+                                    InputKey.K,
+                                    InputKey.L,
+                                    InputKey.Semicolon
+                                },
+                                SpecialKey = InputKey.Space,
+                                SpecialAction = ManiaAction.Special1,
+                                NormalActionStart = ManiaAction.Key1,
+                            }.GenerateKeyBindingsFor(variant, out _);
+                    }
 
                 case PlayfieldType.Dual:
                     int keys = getDualStageKeyCount(variant);

From 5b4f69bb8cabf89c41aff3b16c3c081975474236 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Mon, 20 Apr 2020 13:32:51 +0800
Subject: [PATCH 02281/10326] Moved flying hit objects to separate files

---
 .../Objects/Drawables/DrawableCentreHit.cs    | 17 --------------
 .../Drawables/DrawableFlyingCentreHit.cs      | 23 +++++++++++++++++++
 .../Objects/Drawables/DrawableFlyingRimHit.cs | 23 +++++++++++++++++++
 .../Objects/Drawables/DrawableRimHit.cs       | 14 -----------
 4 files changed, 46 insertions(+), 31 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index b6f6f04821..4979135f50 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -2,10 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -26,18 +23,4 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             MainPiece.AccentColour = colours.PinkDarker;
         }
     }
-
-    public class DrawableFlyingCentreHit : DrawableCentreHit
-    {
-        protected override void CheckForResult(bool userTriggered, double timeOffset)
-        {
-            ApplyResult(r => r.Type = HitResult.Good);
-        }
-
-        public DrawableFlyingCentreHit(double time, bool isStrong = false)
-            : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
-        {
-            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-        }
-    }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs
new file mode 100644
index 0000000000..826a4467f8
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs
@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Taiko.Objects.Drawables
+{
+    public class DrawableFlyingCentreHit : DrawableCentreHit
+    {
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            ApplyResult(r => r.Type = HitResult.Good);
+        }
+
+        public DrawableFlyingCentreHit(double time, bool isStrong = false)
+            : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
+        {
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs
new file mode 100644
index 0000000000..4a6fed8302
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs
@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Taiko.Objects.Drawables
+{
+    public class DrawableFlyingRimHit : DrawableRimHit
+    {
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            ApplyResult(r => r.Type = HitResult.Good);
+        }
+
+        public DrawableFlyingRimHit(double time, bool isStrong = false)
+            : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
+        {
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index e5cfc0562b..c10c195019 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -26,18 +26,4 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             MainPiece.AccentColour = colours.BlueDarker;
         }
     }
-
-    public class DrawableFlyingRimHit : DrawableRimHit
-    {
-        protected override void CheckForResult(bool userTriggered, double timeOffset)
-        {
-            ApplyResult(r => r.Type = HitResult.Good);
-        }
-
-        public DrawableFlyingRimHit(double time, bool isStrong = false)
-            : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
-        {
-            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-        }
-    }
 }

From 5d96d672268cbdc0b7cb20d4a9adc47a4acd451c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 20 Apr 2020 14:40:37 +0900
Subject: [PATCH 02282/10326] Add special key definition just for sanity

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index e8698ef01c..2147776d03 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -284,6 +284,8 @@ namespace osu.Game.Rulesets.Mania
                                     InputKey.L,
                                     InputKey.Semicolon,
                                 },
+                                SpecialKey = InputKey.Space,
+                                SpecialAction = ManiaAction.Special1,
                                 NormalActionStart = ManiaAction.Key1,
                             }.GenerateKeyBindingsFor(variant, out _);
 

From 5464746d3d899a136bfa392789d351559d6f5752 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 15:25:58 +0900
Subject: [PATCH 02283/10326] Switch to using CompositeDrawable

---
 .../Dashboard/Friends/FriendDisplay.cs        | 23 ++++++++-----------
 osu.Game/Overlays/OverlayView.cs              | 14 ++---------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index 9764f82199..7c4a0a4164 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -34,16 +34,17 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
         private Drawable currentContent;
 
-        private readonly FriendOnlineStreamControl onlineStreamControl;
-        private readonly Box background;
-        private readonly Box controlBackground;
-        private readonly UserListToolbar userListToolbar;
-        private readonly Container itemsPlaceholder;
-        private readonly LoadingLayer loading;
+        private FriendOnlineStreamControl onlineStreamControl;
+        private Box background;
+        private Box controlBackground;
+        private UserListToolbar userListToolbar;
+        private Container itemsPlaceholder;
+        private LoadingLayer loading;
 
-        public FriendDisplay()
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
         {
-            AddRange(new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new Container
                 {
@@ -121,12 +122,8 @@ namespace osu.Game.Overlays.Dashboard.Friends
                         }
                     }
                 }
-            });
-        }
+            };
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
             background.Colour = colourProvider.Background4;
             controlBackground.Colour = colourProvider.Background5;
         }
diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
index e3a07fc2de..724658f22f 100644
--- a/osu.Game/Overlays/OverlayView.cs
+++ b/osu.Game/Overlays/OverlayView.cs
@@ -9,29 +9,19 @@ using osu.Game.Online.API;
 namespace osu.Game.Overlays
 {
     /// <summary>
-    /// Drawable which used to represent online content in <see cref="FullscreenOverlay"/>.
+    /// A subview containing online content, to be displayed inside a <see cref="FullscreenOverlay"/>.
     /// </summary>
     /// <typeparam name="T">Response type</typeparam>
-    public abstract class OverlayView<T> : Container, IOnlineComponent
+    public abstract class OverlayView<T> : CompositeDrawable, IOnlineComponent
         where T : class
     {
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        protected override Container<Drawable> Content => content;
-
-        private readonly FillFlowContainer content;
-
         protected OverlayView()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-
-            AddInternal(content = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-            });
         }
 
         protected override void LoadComplete()

From 99e13b8ed9c124484b4410eb9b03da4f2be03997 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 15:32:50 +0900
Subject: [PATCH 02284/10326] Add better xml documentation and extract fetch
 method

---
 osu.Game/Overlays/OverlayView.cs | 33 ++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
index 724658f22f..3e2c54c726 100644
--- a/osu.Game/Overlays/OverlayView.cs
+++ b/osu.Game/Overlays/OverlayView.cs
@@ -11,13 +11,18 @@ namespace osu.Game.Overlays
     /// <summary>
     /// A subview containing online content, to be displayed inside a <see cref="FullscreenOverlay"/>.
     /// </summary>
-    /// <typeparam name="T">Response type</typeparam>
+    /// <remarks>
+    /// Automatically performs a data fetch on load.
+    /// </remarks>
+    /// <typeparam name="T">The type of the API response.</typeparam>
     public abstract class OverlayView<T> : CompositeDrawable, IOnlineComponent
         where T : class
     {
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
+        private APIRequest<T> request;
+
         protected OverlayView()
         {
             RelativeSizeAxes = Axes.X;
@@ -30,20 +35,36 @@ namespace osu.Game.Overlays
             API.Register(this);
         }
 
-        private APIRequest<T> request;
-
+        /// <summary>
+        /// Create the API request for fetching data.
+        /// </summary>
         protected abstract APIRequest<T> CreateRequest();
 
+        /// <summary>
+        /// Fired when results arrive from the main API request.
+        /// </summary>
+        /// <param name="response"></param>
         protected abstract void OnSuccess(T response);
 
+        /// <summary>
+        /// Force a re-request for data from the API.
+        /// </summary>
+        protected void PerformFetch()
+        {
+            request?.Cancel();
+
+            request = CreateRequest();
+            request.Success += response => Schedule(() => OnSuccess(response));
+
+            API.Queue(request);
+        }
+
         public virtual void APIStateChanged(IAPIProvider api, APIState state)
         {
             switch (state)
             {
                 case APIState.Online:
-                    request = CreateRequest();
-                    request.Success += response => Schedule(() => OnSuccess(response));
-                    api.Queue(request);
+                    PerformFetch();
                     break;
             }
         }

From 6b89c638c9aa2db2744a4d65bad92774e1e49a3a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 15:34:48 +0900
Subject: [PATCH 02285/10326] Move load to bdl

---
 osu.Game/Overlays/DashboardOverlay.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 86c0f3bd83..a72c3f4fa5 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -19,14 +19,19 @@ namespace osu.Game.Overlays
     {
         private CancellationTokenSource cancellationToken;
 
-        private readonly Box background;
-        private readonly Container content;
-        private readonly DashboardOverlayHeader header;
-        private readonly LoadingLayer loading;
-        private readonly OverlayScrollContainer scrollFlow;
+        private Box background;
+        private Container content;
+        private DashboardOverlayHeader header;
+        private LoadingLayer loading;
+        private OverlayScrollContainer scrollFlow;
 
         public DashboardOverlay()
             : base(OverlayColourScheme.Purple)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
             Children = new Drawable[]
             {
@@ -61,17 +66,14 @@ namespace osu.Game.Overlays
                 },
                 loading = new LoadingLayer(content),
             };
-        }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
             background.Colour = ColourProvider.Background5;
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
             header.Current.BindValueChanged(onTabChanged);
         }
 

From e61a90d4695ca1ca8ee6aa479b541d29e6cf08f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 15:50:48 +0900
Subject: [PATCH 02286/10326] Throw instead of returning zero

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

diff --git a/osu.Game/Utils/OrderAttribute.cs b/osu.Game/Utils/OrderAttribute.cs
index 4959caa726..aded7f9814 100644
--- a/osu.Game/Utils/OrderAttribute.cs
+++ b/osu.Game/Utils/OrderAttribute.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Utils
                 if (type.GetField(i.ToString()).GetCustomAttributes(typeof(OrderAttribute), false).FirstOrDefault() is OrderAttribute attr)
                     return attr.Order;
 
-                return 0;
+                throw new ArgumentException($"Not all values of {nameof(T)} have {nameof(OrderAttribute)} specified.");
             });
         }
     }

From 801f02a3d7bb28b842a7dfd7e1d39b404b7d9690 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 17:48:02 +0900
Subject: [PATCH 02287/10326] Fix inline executions of APIRequest.Perform not
 getting result populated early enough

---
 osu.Game/Online/API/APIRequest.cs | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 47600e4f68..0bba04cac3 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -18,24 +18,32 @@ namespace osu.Game.Online.API
 
         public T Result { get; private set; }
 
-        protected APIRequest()
-        {
-            base.Success += () => TriggerSuccess(((OsuJsonWebRequest<T>)WebRequest)?.ResponseObject);
-        }
-
         /// <summary>
         /// Invoked on successful completion of an API request.
         /// This will be scheduled to the API's internal scheduler (run on update thread automatically).
         /// </summary>
         public new event APISuccessHandler<T> Success;
 
+        protected override void PostProcess()
+        {
+            base.PostProcess();
+            Result = ((OsuJsonWebRequest<T>)WebRequest)?.ResponseObject;
+        }
+
         internal void TriggerSuccess(T result)
         {
             if (Result != null)
                 throw new InvalidOperationException("Attempted to trigger success more than once");
 
             Result = result;
-            Success?.Invoke(result);
+
+            TriggerSuccess();
+        }
+
+        internal override void TriggerSuccess()
+        {
+            base.TriggerSuccess();
+            Success?.Invoke(Result);
         }
     }
 
@@ -99,6 +107,8 @@ namespace osu.Game.Online.API
             if (checkAndScheduleFailure())
                 return;
 
+            PostProcess();
+
             API.Schedule(delegate
             {
                 if (cancelled) return;
@@ -107,7 +117,14 @@ namespace osu.Game.Online.API
             });
         }
 
-        internal void TriggerSuccess()
+        /// <summary>
+        /// Perform any post-processing actions after a successful request.
+        /// </summary>
+        protected virtual void PostProcess()
+        {
+        }
+
+        internal virtual void TriggerSuccess()
         {
             Success?.Invoke();
         }

From 3f3ff5fdb1b145f7ac885a691f7f0fbe93d1b99c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2020 09:24:40 +0000
Subject: [PATCH 02288/10326] Bump Humanizer from 2.7.9 to 2.8.2

Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.7.9 to 2.8.2.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.7.9...v2.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5facb04117..35ee0864e1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="DiffPlex" Version="1.6.1" />
-    <PackageReference Include="Humanizer" Version="2.7.9" />
+    <PackageReference Include="Humanizer" Version="2.8.2" />
     <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" />
diff --git a/osu.iOS.props b/osu.iOS.props
index dda1ee5c42..0200fca9a3 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -76,7 +76,7 @@
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.1" />
-    <PackageReference Include="Humanizer" Version="2.7.9" />
+    <PackageReference Include="Humanizer" Version="2.8.2" />
     <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" />

From b3d4b4a3f42696861d8c17cd395423e4a2656f74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 18:25:39 +0900
Subject: [PATCH 02289/10326] Add back missing fill flow

---
 .../Dashboard/Friends/FriendDisplay.cs        | 124 +++++++++---------
 1 file changed, 65 insertions(+), 59 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index 7c4a0a4164..79fda99c73 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -44,78 +44,84 @@ namespace osu.Game.Overlays.Dashboard.Friends
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            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[]
+                    new Container
                     {
-                        controlBackground = new Box
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Children = new Drawable[]
                         {
-                            RelativeSizeAxes = Axes.Both
-                        },
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Padding = new MarginPadding
+                            controlBackground = new Box
                             {
-                                Top = 20,
-                                Horizontal = 45
+                                RelativeSizeAxes = Axes.Both
                             },
-                            Child = onlineStreamControl = new FriendOnlineStreamControl(),
-                        }
-                    }
-                },
-                new Container
-                {
-                    Name = "User List",
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Children = new Drawable[]
-                    {
-                        background = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both
-                        },
-                        new FillFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Vertical,
-                            Margin = new MarginPadding { Bottom = 20 },
-                            Children = new Drawable[]
+                            new Container
                             {
-                                new Container
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Padding = new MarginPadding
                                 {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Padding = new MarginPadding
-                                    {
-                                        Horizontal = 40,
-                                        Vertical = 20
-                                    },
-                                    Child = userListToolbar = new UserListToolbar
-                                    {
-                                        Anchor = Anchor.CentreRight,
-                                        Origin = Anchor.CentreRight,
-                                    }
+                                    Top = 20,
+                                    Horizontal = 45
                                 },
-                                new Container
+                                Child = onlineStreamControl = new FriendOnlineStreamControl(),
+                            }
+                        }
+                    },
+                    new Container
+                    {
+                        Name = "User List",
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Children = new Drawable[]
+                        {
+                            background = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both
+                            },
+                            new FillFlowContainer
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Direction = FillDirection.Vertical,
+                                Margin = new MarginPadding { Bottom = 20 },
+                                Children = new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Children = new Drawable[]
+                                    new Container
                                     {
-                                        itemsPlaceholder = new Container
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Padding = new MarginPadding
                                         {
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Padding = new MarginPadding { Horizontal = 50 }
+                                            Horizontal = 40,
+                                            Vertical = 20
                                         },
-                                        loading = new LoadingLayer(itemsPlaceholder)
+                                        Child = userListToolbar = new UserListToolbar
+                                        {
+                                            Anchor = Anchor.CentreRight,
+                                            Origin = Anchor.CentreRight,
+                                        }
+                                    },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Children = new Drawable[]
+                                        {
+                                            itemsPlaceholder = new Container
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                AutoSizeAxes = Axes.Y,
+                                                Padding = new MarginPadding { Horizontal = 50 }
+                                            },
+                                            loading = new LoadingLayer(itemsPlaceholder)
+                                        }
                                     }
                                 }
                             }

From 8ebc2ae03dc6080028f5406d361f42f8d68855cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Apr 2020 20:48:35 +0900
Subject: [PATCH 02290/10326] Never run subtree masking

---
 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 b14927bcd5..e847dcec40 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -398,7 +398,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
         }
 
-        public override bool UpdateSubTreeMasking(Drawable source, RectangleF maskingBounds) => AllJudged && base.UpdateSubTreeMasking(source, maskingBounds);
+        public override bool UpdateSubTreeMasking(Drawable source, RectangleF maskingBounds) => false;
 
         protected override void UpdateAfterChildren()
         {

From a541f9268205f76c1eb4321faefeb1721d4f0f8f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 20 Apr 2020 13:56:15 +0200
Subject: [PATCH 02291/10326] Resolve ruleset dependencies on game core /
 framework assemblies by checking already loaded assemblies in AppDomain.

---
 osu.Game/Rulesets/RulesetStore.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 7e165311a3..543134cfb4 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -62,10 +62,13 @@ namespace osu.Game.Rulesets
             var asm = new AssemblyName(args.Name);
 
             // the requesting assembly may be located out of the executable's base directory, thus requiring manual resolving of its dependencies.
-            // this assumes the only explicit dependency of the ruleset is the game core assembly.
-            // the ruleset dependency on the game core assembly requires manual resolving, transitive dependencies should be resolved automatically
-            if (asm.Name.Equals(typeof(OsuGame).Assembly.GetName().Name, StringComparison.Ordinal))
-                return Assembly.GetExecutingAssembly();
+            // this attempts resolving the ruleset dependencies on game core and framework assemblies by returning assemblies with the same assembly name
+            // already loaded in the AppDomain.
+            foreach (var curAsm in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                if (asm.Name.Equals(curAsm.GetName().Name, StringComparison.Ordinal))
+                    return curAsm;
+            }
 
             return loadedAssemblies.Keys.FirstOrDefault(a => a.FullName == asm.FullName);
         }

From 4e271ff46fcae5132bcc7ef235117518cd8f1268 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 20 Apr 2020 21:28:36 +0900
Subject: [PATCH 02292/10326] Add support for 10K mod + 20K dual stages

---
 .../DualStageVariantGenerator.cs              |  64 ++++++++
 osu.Game.Rulesets.Mania/ManiaInputManager.cs  |   6 +
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 152 +-----------------
 osu.Game.Rulesets.Mania/Mods/ManiaModKey10.cs |  13 ++
 .../SingleStageVariantGenerator.cs            |  41 +++++
 .../VariantMappingGenerator.cs                |  61 +++++++
 6 files changed, 189 insertions(+), 148 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/DualStageVariantGenerator.cs
 create mode 100644 osu.Game.Rulesets.Mania/Mods/ManiaModKey10.cs
 create mode 100644 osu.Game.Rulesets.Mania/SingleStageVariantGenerator.cs
 create mode 100644 osu.Game.Rulesets.Mania/VariantMappingGenerator.cs

diff --git a/osu.Game.Rulesets.Mania/DualStageVariantGenerator.cs b/osu.Game.Rulesets.Mania/DualStageVariantGenerator.cs
new file mode 100644
index 0000000000..8d39e08b26
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/DualStageVariantGenerator.cs
@@ -0,0 +1,64 @@
+// Copyright (c) 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.Input.Bindings;
+
+namespace osu.Game.Rulesets.Mania
+{
+    public class DualStageVariantGenerator
+    {
+        private readonly int singleStageVariant;
+        private readonly InputKey[] stage1LeftKeys;
+        private readonly InputKey[] stage1RightKeys;
+        private readonly InputKey[] stage2LeftKeys;
+        private readonly InputKey[] stage2RightKeys;
+
+        public DualStageVariantGenerator(int singleStageVariant)
+        {
+            this.singleStageVariant = singleStageVariant;
+
+            // 10K is special because it expands towards the centre of the keyboard (VM/BN), rather than towards the edges of the keyboard.
+            if (singleStageVariant == 10)
+            {
+                stage1LeftKeys = new[] { InputKey.Q, InputKey.W, InputKey.E, InputKey.R, InputKey.V };
+                stage1RightKeys = new[] { InputKey.M, InputKey.I, InputKey.O, InputKey.P, InputKey.BracketLeft };
+
+                stage2LeftKeys = new[] { InputKey.S, InputKey.D, InputKey.F, InputKey.G, InputKey.B };
+                stage2RightKeys = new[] { InputKey.N, InputKey.J, InputKey.K, InputKey.L, InputKey.Semicolon };
+            }
+            else
+            {
+                stage1LeftKeys = new[] { InputKey.Q, InputKey.W, InputKey.E, InputKey.R };
+                stage1RightKeys = new[] { InputKey.I, InputKey.O, InputKey.P, InputKey.BracketLeft };
+
+                stage2LeftKeys = new[] { InputKey.S, InputKey.D, InputKey.F, InputKey.G };
+                stage2RightKeys = new[] { InputKey.J, InputKey.K, InputKey.L, InputKey.Semicolon };
+            }
+        }
+
+        public IEnumerable<KeyBinding> GenerateMappings()
+        {
+            var stage1Bindings = new VariantMappingGenerator
+            {
+                LeftKeys = stage1LeftKeys,
+                RightKeys = stage1RightKeys,
+                SpecialKey = InputKey.V,
+                SpecialAction = ManiaAction.Special1,
+                NormalActionStart = ManiaAction.Key1
+            }.GenerateKeyBindingsFor(singleStageVariant, out var nextNormal);
+
+            var stage2Bindings = new VariantMappingGenerator
+            {
+                LeftKeys = stage2LeftKeys,
+                RightKeys = stage2RightKeys,
+                SpecialKey = InputKey.B,
+                SpecialAction = ManiaAction.Special2,
+                NormalActionStart = nextNormal
+            }.GenerateKeyBindingsFor(singleStageVariant, out _);
+
+            return stage1Bindings.Concat(stage2Bindings);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaInputManager.cs b/osu.Game.Rulesets.Mania/ManiaInputManager.cs
index 292990fd7e..186fc4b15d 100644
--- a/osu.Game.Rulesets.Mania/ManiaInputManager.cs
+++ b/osu.Game.Rulesets.Mania/ManiaInputManager.cs
@@ -78,5 +78,11 @@ namespace osu.Game.Rulesets.Mania
 
         [Description("Key 18")]
         Key18,
+
+        [Description("Key 19")]
+        Key19,
+
+        [Description("Key 20")]
+        Key20,
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 2147776d03..21315e4bfb 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -202,6 +202,7 @@ namespace osu.Game.Rulesets.Mania
                             new ManiaModKey7(),
                             new ManiaModKey8(),
                             new ManiaModKey9(),
+                            new ManiaModKey10(),
                             new ManiaModKey1(),
                             new ManiaModKey2(),
                             new ManiaModKey3()),
@@ -252,7 +253,7 @@ namespace osu.Game.Rulesets.Mania
             {
                 for (int i = 1; i <= 10; i++)
                     yield return (int)PlayfieldType.Single + i;
-                for (int i = 2; i <= 18; i += 2)
+                for (int i = 2; i <= 20; i += 2)
                     yield return (int)PlayfieldType.Dual + i;
             }
         }
@@ -262,102 +263,10 @@ namespace osu.Game.Rulesets.Mania
             switch (getPlayfieldType(variant))
             {
                 case PlayfieldType.Single:
-                    switch (variant)
-                    {
-                        case 10:
-                            // 10K is special because it extents one key towards the centre of the keyboard (V/N), rather than towards the edges of the keyboard.
-                            return new VariantMappingGenerator
-                            {
-                                LeftKeys = new[]
-                                {
-                                    InputKey.A,
-                                    InputKey.S,
-                                    InputKey.D,
-                                    InputKey.F,
-                                    InputKey.V
-                                },
-                                RightKeys = new[]
-                                {
-                                    InputKey.N,
-                                    InputKey.J,
-                                    InputKey.K,
-                                    InputKey.L,
-                                    InputKey.Semicolon,
-                                },
-                                SpecialKey = InputKey.Space,
-                                SpecialAction = ManiaAction.Special1,
-                                NormalActionStart = ManiaAction.Key1,
-                            }.GenerateKeyBindingsFor(variant, out _);
-
-                        default:
-                            return new VariantMappingGenerator
-                            {
-                                LeftKeys = new[]
-                                {
-                                    InputKey.A,
-                                    InputKey.S,
-                                    InputKey.D,
-                                    InputKey.F
-                                },
-                                RightKeys = new[]
-                                {
-                                    InputKey.J,
-                                    InputKey.K,
-                                    InputKey.L,
-                                    InputKey.Semicolon
-                                },
-                                SpecialKey = InputKey.Space,
-                                SpecialAction = ManiaAction.Special1,
-                                NormalActionStart = ManiaAction.Key1,
-                            }.GenerateKeyBindingsFor(variant, out _);
-                    }
+                    return new SingleStageVariantGenerator(variant).GenerateMappings();
 
                 case PlayfieldType.Dual:
-                    int keys = getDualStageKeyCount(variant);
-
-                    var stage1Bindings = new VariantMappingGenerator
-                    {
-                        LeftKeys = new[]
-                        {
-                            InputKey.Q,
-                            InputKey.W,
-                            InputKey.E,
-                            InputKey.R,
-                        },
-                        RightKeys = new[]
-                        {
-                            InputKey.X,
-                            InputKey.C,
-                            InputKey.V,
-                            InputKey.B
-                        },
-                        SpecialKey = InputKey.S,
-                        SpecialAction = ManiaAction.Special1,
-                        NormalActionStart = ManiaAction.Key1
-                    }.GenerateKeyBindingsFor(keys, out var nextNormal);
-
-                    var stage2Bindings = new VariantMappingGenerator
-                    {
-                        LeftKeys = new[]
-                        {
-                            InputKey.Number7,
-                            InputKey.Number8,
-                            InputKey.Number9,
-                            InputKey.Number0
-                        },
-                        RightKeys = new[]
-                        {
-                            InputKey.K,
-                            InputKey.L,
-                            InputKey.Semicolon,
-                            InputKey.Quote
-                        },
-                        SpecialKey = InputKey.I,
-                        SpecialAction = ManiaAction.Special2,
-                        NormalActionStart = nextNormal
-                    }.GenerateKeyBindingsFor(keys, out _);
-
-                    return stage1Bindings.Concat(stage2Bindings);
+                    return new DualStageVariantGenerator(getDualStageKeyCount(variant)).GenerateMappings();
             }
 
             return Array.Empty<KeyBinding>();
@@ -393,59 +302,6 @@ namespace osu.Game.Rulesets.Mania
         {
             return (PlayfieldType)Enum.GetValues(typeof(PlayfieldType)).Cast<int>().OrderByDescending(i => i).First(v => variant >= v);
         }
-
-        private class VariantMappingGenerator
-        {
-            /// <summary>
-            /// All the <see cref="InputKey"/>s available to the left hand.
-            /// </summary>
-            public InputKey[] LeftKeys;
-
-            /// <summary>
-            /// All the <see cref="InputKey"/>s available to the right hand.
-            /// </summary>
-            public InputKey[] RightKeys;
-
-            /// <summary>
-            /// The <see cref="InputKey"/> for the special key.
-            /// </summary>
-            public InputKey SpecialKey;
-
-            /// <summary>
-            /// The <see cref="ManiaAction"/> at which the normal columns should begin.
-            /// </summary>
-            public ManiaAction NormalActionStart;
-
-            /// <summary>
-            /// The <see cref="ManiaAction"/> for the special column.
-            /// </summary>
-            public ManiaAction SpecialAction;
-
-            /// <summary>
-            /// Generates a list of <see cref="KeyBinding"/>s for a specific number of columns.
-            /// </summary>
-            /// <param name="columns">The number of columns that need to be bound.</param>
-            /// <param name="nextNormalAction">The next <see cref="ManiaAction"/> to use for normal columns.</param>
-            /// <returns>The keybindings.</returns>
-            public IEnumerable<KeyBinding> GenerateKeyBindingsFor(int columns, out ManiaAction nextNormalAction)
-            {
-                ManiaAction currentNormalAction = NormalActionStart;
-
-                var bindings = new List<KeyBinding>();
-
-                for (int i = LeftKeys.Length - columns / 2; i < LeftKeys.Length; i++)
-                    bindings.Add(new KeyBinding(LeftKeys[i], currentNormalAction++));
-
-                if (columns % 2 == 1)
-                    bindings.Add(new KeyBinding(SpecialKey, SpecialAction));
-
-                for (int i = 0; i < columns / 2; i++)
-                    bindings.Add(new KeyBinding(RightKeys[i], currentNormalAction++));
-
-                nextNormalAction = currentNormalAction;
-                return bindings;
-            }
-        }
     }
 
     public enum PlayfieldType
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModKey10.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModKey10.cs
new file mode 100644
index 0000000000..684370fc3d
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModKey10.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.
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModKey10 : ManiaKeyMod
+    {
+        public override int KeyCount => 10;
+        public override string Name => "Ten Keys";
+        public override string Acronym => "10K";
+        public override string Description => @"Play with ten keys.";
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/SingleStageVariantGenerator.cs b/osu.Game.Rulesets.Mania/SingleStageVariantGenerator.cs
new file mode 100644
index 0000000000..2069329d9a
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/SingleStageVariantGenerator.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.Collections.Generic;
+using osu.Framework.Input.Bindings;
+
+namespace osu.Game.Rulesets.Mania
+{
+    public class SingleStageVariantGenerator
+    {
+        private readonly int variant;
+        private readonly InputKey[] leftKeys;
+        private readonly InputKey[] rightKeys;
+
+        public SingleStageVariantGenerator(int variant)
+        {
+            this.variant = variant;
+
+            // 10K is special because it expands towards the centre of the keyboard (V/N), rather than towards the edges of the keyboard.
+            if (variant == 10)
+            {
+                leftKeys = new[] { InputKey.A, InputKey.S, InputKey.D, InputKey.F, InputKey.V };
+                rightKeys = new[] { InputKey.N, InputKey.J, InputKey.K, InputKey.L, InputKey.Semicolon };
+            }
+            else
+            {
+                leftKeys = new[] { InputKey.A, InputKey.S, InputKey.D, InputKey.F };
+                rightKeys = new[] { InputKey.J, InputKey.K, InputKey.L, InputKey.Semicolon };
+            }
+        }
+
+        public IEnumerable<KeyBinding> GenerateMappings() => new VariantMappingGenerator
+        {
+            LeftKeys = leftKeys,
+            RightKeys = rightKeys,
+            SpecialKey = InputKey.Space,
+            SpecialAction = ManiaAction.Special1,
+            NormalActionStart = ManiaAction.Key1,
+        }.GenerateKeyBindingsFor(variant, out _);
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/VariantMappingGenerator.cs b/osu.Game.Rulesets.Mania/VariantMappingGenerator.cs
new file mode 100644
index 0000000000..878d1088a6
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/VariantMappingGenerator.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.Collections.Generic;
+using osu.Framework.Input.Bindings;
+
+namespace osu.Game.Rulesets.Mania
+{
+    public class VariantMappingGenerator
+    {
+        /// <summary>
+        /// All the <see cref="InputKey"/>s available to the left hand.
+        /// </summary>
+        public InputKey[] LeftKeys;
+
+        /// <summary>
+        /// All the <see cref="InputKey"/>s available to the right hand.
+        /// </summary>
+        public InputKey[] RightKeys;
+
+        /// <summary>
+        /// The <see cref="InputKey"/> for the special key.
+        /// </summary>
+        public InputKey SpecialKey;
+
+        /// <summary>
+        /// The <see cref="ManiaAction"/> at which the normal columns should begin.
+        /// </summary>
+        public ManiaAction NormalActionStart;
+
+        /// <summary>
+        /// The <see cref="ManiaAction"/> for the special column.
+        /// </summary>
+        public ManiaAction SpecialAction;
+
+        /// <summary>
+        /// Generates a list of <see cref="KeyBinding"/>s for a specific number of columns.
+        /// </summary>
+        /// <param name="columns">The number of columns that need to be bound.</param>
+        /// <param name="nextNormalAction">The next <see cref="ManiaAction"/> to use for normal columns.</param>
+        /// <returns>The keybindings.</returns>
+        public IEnumerable<KeyBinding> GenerateKeyBindingsFor(int columns, out ManiaAction nextNormalAction)
+        {
+            ManiaAction currentNormalAction = NormalActionStart;
+
+            var bindings = new List<KeyBinding>();
+
+            for (int i = LeftKeys.Length - columns / 2; i < LeftKeys.Length; i++)
+                bindings.Add(new KeyBinding(LeftKeys[i], currentNormalAction++));
+
+            if (columns % 2 == 1)
+                bindings.Add(new KeyBinding(SpecialKey, SpecialAction));
+
+            for (int i = 0; i < columns / 2; i++)
+                bindings.Add(new KeyBinding(RightKeys[i], currentNormalAction++));
+
+            nextNormalAction = currentNormalAction;
+            return bindings;
+        }
+    }
+}

From 9b6e26583bdb69c01219ab2b9ceb8d554883d1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Apr 2020 21:42:43 +0200
Subject: [PATCH 02293/10326] Add xmldocs

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index cf3a5a7199..e21faf321e 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -28,7 +28,14 @@ namespace osu.Game.Screens.Select
 {
     public class BeatmapCarousel : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
+        /// <summary>
+        /// Height of the area above the carousel that should be treated as visible due to transparency of elements in front of it.
+        /// </summary>
         public float BleedTop;
+
+        /// <summary>
+        /// Height of the area below the carousel that should be treated as visible due to transparency of elements in front of it.
+        /// </summary>
         public float BleedBottom;
 
         /// <summary>

From e3cd3cf1da7e8e9458697caccf6bb30c008d5791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Apr 2020 21:43:07 +0200
Subject: [PATCH 02294/10326] Convert to auto-properties

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index e21faf321e..1bbd7c1270 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -31,12 +31,12 @@ namespace osu.Game.Screens.Select
         /// <summary>
         /// Height of the area above the carousel that should be treated as visible due to transparency of elements in front of it.
         /// </summary>
-        public float BleedTop;
+        public float BleedTop { get; set; }
 
         /// <summary>
         /// Height of the area below the carousel that should be treated as visible due to transparency of elements in front of it.
         /// </summary>
-        public float BleedBottom;
+        public float BleedBottom { get; set; }
 
         /// <summary>
         /// Triggered when the <see cref="BeatmapSets"/> loaded change and are completely loaded.

From 4c689c6ad2585087d8495514f755e4c25579b9d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 10:56:04 +0900
Subject: [PATCH 02295/10326] Add constant for max stage keys

---
 .../Beatmaps/ManiaBeatmapConverter.cs                    | 2 +-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs                  | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 189dd17934..4187e39b43 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             {
                 TargetColumns = (int)Math.Max(1, roundedCircleSize);
 
-                if (TargetColumns > 10)
+                if (TargetColumns > ManiaRuleset.MAX_STAGE_KEYS)
                 {
                     TargetColumns /= 2;
                     Dual = true;
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 21315e4bfb..a37aaa8cc4 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -35,6 +35,11 @@ namespace osu.Game.Rulesets.Mania
 {
     public class ManiaRuleset : Ruleset, ILegacyRuleset
     {
+        /// <summary>
+        /// The maximum number of supported keys in a single stage.
+        /// </summary>
+        public const int MAX_STAGE_KEYS = 10;
+
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableManiaRuleset(this, beatmap, mods);
 
         public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
@@ -251,9 +256,9 @@ namespace osu.Game.Rulesets.Mania
         {
             get
             {
-                for (int i = 1; i <= 10; i++)
+                for (int i = 1; i <= MAX_STAGE_KEYS; i++)
                     yield return (int)PlayfieldType.Single + i;
-                for (int i = 2; i <= 20; i += 2)
+                for (int i = 2; i <= MAX_STAGE_KEYS * 2; i += 2)
                     yield return (int)PlayfieldType.Dual + i;
             }
         }

From a91c63819b0f781f1fdba608aa398a6612bb2e61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 11:51:20 +0900
Subject: [PATCH 02296/10326] Refactor updateCompletionState implementation for
 legibility and code share

---
 osu.Game/Screens/Play/Player.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 2f3807753a..ece4c6307e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -423,8 +423,6 @@ namespace osu.Game.Screens.Play
             if (!this.IsCurrentScreen())
                 return;
 
-            // cancel push delegate in case judges reverted
-            // after delegate may have already been scheduled.
             if (!completionState.NewValue)
             {
                 completionProgressDelegate?.Cancel();
@@ -433,8 +431,11 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
+            if (completionProgressDelegate != null)
+                throw new InvalidOperationException($"{nameof(updateCompletionState)} was fired more than once");
+
             // Only show the completion screen if the player hasn't failed
-            if (HealthProcessor.HasFailed || completionProgressDelegate != null)
+            if (HealthProcessor.HasFailed)
                 return;
 
             ValidForResume = false;
@@ -442,7 +443,7 @@ namespace osu.Game.Screens.Play
             if (!showResults) return;
 
             using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
-                scheduleGotoRanking();
+                completionProgressDelegate = Schedule(GotoRanking);
         }
 
         protected virtual ScoreInfo CreateScore()
@@ -694,12 +695,6 @@ namespace osu.Game.Screens.Play
             storyboardReplacesBackground.Value = false;
         }
 
-        private void scheduleGotoRanking()
-        {
-            completionProgressDelegate?.Cancel();
-            completionProgressDelegate = Schedule(GotoRanking);
-        }
-
         #endregion
     }
 }

From 9373520bca1ebc0f38d16bca5163eb9ed2e28a5c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Tue, 21 Apr 2020 05:59:37 +0300
Subject: [PATCH 02297/10326] Add constant for special colour of catcher on
 default skin

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index f37dae29dd..97d0fb0ada 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -25,6 +25,14 @@ namespace osu.Game.Rulesets.Catch.UI
     {
         public static readonly Color4 DEFAULT_HYPER_DASH_COLOUR = Color4.Red;
 
+        /// <summary>
+        /// The default colour used directly for <see cref="Catcher.Colour"/>.
+        /// </summary>
+        /// <remarks>
+        /// This colour is only used when no skin overrides <see cref="CatchSkinColour.HyperDash"/>.
+        /// </remarks>
+        public static readonly Color4 DEFAULT_CATCHER_HYPER_DASH_COLOUR = Color4.OrangeRed;
+
         /// <summary>
         /// Whether we are hyper-dashing or not.
         /// </summary>
@@ -285,7 +293,13 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (hyperDashing)
             {
-                this.FadeColour(hyperDashColour == DefaultHyperDashColour ? Color4.OrangeRed : hyperDashColour, hyper_dash_transition_length, Easing.OutQuint);
+                // special behaviour for catcher colour if no skin overrides.
+                var catcherColour =
+                    hyperDashColour == DEFAULT_HYPER_DASH_COLOUR
+                        ? DEFAULT_CATCHER_HYPER_DASH_COLOUR
+                        : hyperDashColour;
+
+                this.FadeColour(catcherColour, hyper_dash_transition_length, Easing.OutQuint);
                 this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint);
             }
             else

From 282d1001093ac757eac1e65933577d1ac035e9d7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Tue, 21 Apr 2020 06:09:57 +0300
Subject: [PATCH 02298/10326] Fix XMLDoc references

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 97d0fb0ada..056e838419 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Catch.UI
         public static readonly Color4 DEFAULT_HYPER_DASH_COLOUR = Color4.Red;
 
         /// <summary>
-        /// The default colour used directly for <see cref="Catcher.Colour"/>.
+        /// The default colour used directly for this <see cref="Catcher"/>'s <see cref="Drawable.Colour"/>.
         /// </summary>
         /// <remarks>
         /// This colour is only used when no skin overrides <see cref="CatchSkinColour.HyperDash"/>.

From 3b0099c687edce710dfcac9ac2d8d0e1a67153f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 12:26:43 +0900
Subject: [PATCH 02299/10326] Refactor tests

---
 .../TestSceneCompletionCancellation.cs        | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
index a3fb17942f..512584bd42 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
@@ -46,46 +46,54 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestCancelCompletionOnRewind()
         {
-            cancelCompletionSteps();
+            complete();
+            cancel();
 
-            AddAssert("no attempt to push ranking", () => !((FakeRankingPushPlayer)Player).GotoRankingInvoked);
+            checkNoRanking();
         }
 
         [Test]
         public void TestReCompleteAfterCancellation()
         {
-            cancelCompletionSteps();
-
-            // Attempt completing again.
-            AddStep("seek to completion again", () => track.Seek(5000));
-            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            complete();
+            cancel();
+            complete();
 
             AddUntilStep("attempted to push ranking", () => ((FakeRankingPushPlayer)Player).GotoRankingInvoked);
         }
 
         /// <summary>
-        /// Tests whether can still pause after cancelling completion
-        /// by reverting <see cref="IScreen.ValidForResume"/> back to true.
+        /// Tests whether can still pause after cancelling completion by reverting <see cref="IScreen.ValidForResume"/> back to true.
         /// </summary>
         [Test]
         public void TestCanPauseAfterCancellation()
         {
-            cancelCompletionSteps();
+            complete();
+            cancel();
 
             AddStep("pause", () => Player.Pause());
             AddAssert("paused successfully", () => Player.GameplayClockContainer.IsPaused.Value);
+
+            checkNoRanking();
         }
 
-        private void cancelCompletionSteps()
+        private void complete()
         {
             AddStep("seek to completion", () => track.Seek(5000));
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+        }
 
+        private void cancel()
+        {
             AddStep("rewind to cancel", () => track.Seek(4000));
             AddUntilStep("completion cleared by processor", () => !Player.ScoreProcessor.HasCompleted.Value);
+        }
 
+        private void checkNoRanking()
+        {
             // wait to ensure there was no attempt of pushing the results screen.
             AddWaitStep("wait", resultsDisplayWaitCount);
+            AddAssert("no attempt to push ranking", () => !((FakeRankingPushPlayer)Player).GotoRankingInvoked);
         }
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)

From 9252b7876b6221c5a9cc3128de91796278a4d2dd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 13:58:23 +0900
Subject: [PATCH 02300/10326] Don't serialise AllControlPoints

---
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index d33a922a32..af6ca24165 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <summary>
         /// All control points, of all types.
         /// </summary>
+        [JsonIgnore]
         public IEnumerable<ControlPoint> AllControlPoints => Groups.SelectMany(g => g.ControlPoints).ToArray();
 
         /// <summary>

From 72fb34f82cf1ae65ad7a96ed98a40a12aae7b26b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 14:19:05 +0900
Subject: [PATCH 02301/10326] Fix overriding control points incorrectly

---
 .../Formats/LegacyBeatmapDecoderTest.cs       |  5 ++++
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  | 30 +++++++++----------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 33f484a9aa..acb30a6277 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -241,6 +241,11 @@ namespace osu.Game.Tests.Beatmaps.Formats
             {
                 var controlPoints = decoder.Decode(stream).ControlPointInfo;
 
+                Assert.That(controlPoints.TimingPoints.Count, Is.EqualTo(4));
+                Assert.That(controlPoints.DifficultyPoints.Count, Is.EqualTo(3));
+                Assert.That(controlPoints.EffectPoints.Count, Is.EqualTo(3));
+                Assert.That(controlPoints.SamplePoints.Count, Is.EqualTo(3));
+
                 Assert.That(controlPoints.DifficultyPointAt(500).SpeedMultiplier, Is.EqualTo(1.5).Within(0.1));
                 Assert.That(controlPoints.DifficultyPointAt(1500).SpeedMultiplier, Is.EqualTo(1.5).Within(0.1));
                 Assert.That(controlPoints.DifficultyPointAt(2500).SpeedMultiplier, Is.EqualTo(0.75).Within(0.1));
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 33bb9774df..388abf4648 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -386,17 +386,10 @@ namespace osu.Game.Beatmaps.Formats
                 SampleVolume = sampleVolume,
                 CustomSampleBank = customSampleBank,
             }, timingChange);
-
-            // To handle the scenario where a non-timing line shares the same time value as a subsequent timing line but
-            // appears earlier in the file, we buffer non-timing control points and rewrite them *after* control points from the timing line
-            // with the same time value (allowing them to overwrite as necessary).
-            //
-            // The expected outcome is that we prefer the non-timing line's adjustments over the timing line's adjustments when time is equal.
-            if (timingChange)
-                flushPendingPoints();
         }
 
         private readonly List<ControlPoint> pendingControlPoints = new List<ControlPoint>();
+        private readonly HashSet<Type> pendingControlPointTypes = new HashSet<Type>();
         private double pendingControlPointsTime;
 
         private void addControlPoint(double time, ControlPoint point, bool timingChange)
@@ -405,21 +398,28 @@ namespace osu.Game.Beatmaps.Formats
                 flushPendingPoints();
 
             if (timingChange)
-            {
-                beatmap.ControlPointInfo.Add(time, point);
-                return;
-            }
+                pendingControlPoints.Insert(0, point);
+            else
+                pendingControlPoints.Add(point);
 
-            pendingControlPoints.Add(point);
             pendingControlPointsTime = time;
         }
 
         private void flushPendingPoints()
         {
-            foreach (var p in pendingControlPoints)
-                beatmap.ControlPointInfo.Add(pendingControlPointsTime, p);
+            // Changes from non-timing-points are added to the end of the list (see addControlPoint()) and should override any changes from timing-points (added to the start of the list).
+            for (int i = pendingControlPoints.Count - 1; i >= 0; i--)
+            {
+                var type = pendingControlPoints[i].GetType();
+                if (pendingControlPointTypes.Contains(type))
+                    continue;
+
+                pendingControlPointTypes.Add(type);
+                beatmap.ControlPointInfo.Add(pendingControlPointsTime, pendingControlPoints[i]);
+            }
 
             pendingControlPoints.Clear();
+            pendingControlPointTypes.Clear();
         }
 
         private void handleHitObject(string line)

From 89320b510c10a2aad660ab9c3938565828520fde Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 15:13:19 +0900
Subject: [PATCH 02302/10326] Apply class renaming

---
 .../Online/TestSceneBeatmapListingOverlay.cs  |  2 +-
 ...> TestSceneBeatmapListingSearchControl.cs} | 26 ++++++++---------
 ... TestSceneBeatmapListingSortTabControl.cs} |  5 ++--
 ...dler.cs => BeatmapListingFilterControl.cs} | 28 +++++++++----------
 ...tion.cs => BeatmapListingSearchControl.cs} |  4 +--
 osu.Game/Overlays/BeatmapListingOverlay.cs    |  2 +-
 6 files changed, 33 insertions(+), 34 deletions(-)
 rename osu.Game.Tests/Visual/UserInterface/{TestSceneBeatmapListingSearchSection.cs => TestSceneBeatmapListingSearchControl.cs} (76%)
 rename osu.Game.Tests/Visual/UserInterface/{TestSceneBeatmapListingSort.cs => TestSceneBeatmapListingSortTabControl.cs} (91%)
 rename osu.Game/Overlays/BeatmapListing/{BeatmapListingSearchHandler.cs => BeatmapListingFilterControl.cs} (85%)
 rename osu.Game/Overlays/BeatmapListing/{BeatmapListingSearchSection.cs => BeatmapListingSearchControl.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index f80687e142..64d1a9ddcd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual.Online
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(BeatmapListingOverlay),
-            typeof(BeatmapListingSearchHandler)
+            typeof(BeatmapListingFilterControl)
         };
 
         protected override bool UseOnlineAPI => true;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
similarity index 76%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index 69e3fbd75f..d6ede950df 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -15,19 +15,19 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneBeatmapListingSearchSection : OsuTestScene
+    public class TestSceneBeatmapListingSearchControl : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(BeatmapListingSearchSection),
+            typeof(BeatmapListingSearchControl),
         };
 
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private readonly BeatmapListingSearchSection section;
+        private readonly BeatmapListingSearchControl control;
 
-        public TestSceneBeatmapListingSearchSection()
+        public TestSceneBeatmapListingSearchControl()
         {
             OsuSpriteText query;
             OsuSpriteText ruleset;
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuSpriteText genre;
             OsuSpriteText language;
 
-            Add(section = new BeatmapListingSearchSection
+            Add(control = new BeatmapListingSearchControl
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -56,19 +56,19 @@ namespace osu.Game.Tests.Visual.UserInterface
                 }
             });
 
-            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);
-            section.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);
-            section.Language.BindValueChanged(l => language.Text = $"Language: {l.NewValue}", true);
+            control.Query.BindValueChanged(q => query.Text = $"Query: {q.NewValue}", true);
+            control.Ruleset.BindValueChanged(r => ruleset.Text = $"Ruleset: {r.NewValue}", true);
+            control.Category.BindValueChanged(c => category.Text = $"Category: {c.NewValue}", true);
+            control.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);
+            control.Language.BindValueChanged(l => language.Text = $"Language: {l.NewValue}", true);
         }
 
         [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);
+            AddStep("Set beatmap", () => control.BeatmapSet = beatmap_set);
+            AddStep("Set beatmap (no cover)", () => control.BeatmapSet = no_cover_beatmap_set);
+            AddStep("Set null beatmap", () => control.BeatmapSet = null);
         }
 
         private static readonly BeatmapSetInfo beatmap_set = new BeatmapSetInfo
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
similarity index 91%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
index a5fa085abf..f643d4e3fe 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
@@ -13,18 +13,17 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneBeatmapListingSort : OsuTestScene
+    public class TestSceneBeatmapListingSortTabControl : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(BeatmapListingSortTabControl),
             typeof(OverlaySortTabControl<>),
         };
 
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        public TestSceneBeatmapListingSort()
+        public TestSceneBeatmapListingSortTabControl()
         {
             BeatmapListingSortTabControl control;
             OsuSpriteText current;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchHandler.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
similarity index 85%
rename from osu.Game/Overlays/BeatmapListing/BeatmapListingSearchHandler.cs
rename to osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index ce3d37fb98..8817031bce 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchHandler.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -21,7 +21,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
-    public class BeatmapListingSearchHandler : CompositeDrawable
+    public class BeatmapListingFilterControl : CompositeDrawable
     {
         public Action<List<BeatmapSetInfo>> SearchFinished;
         public Action SearchStarted;
@@ -32,13 +32,13 @@ namespace osu.Game.Overlays.BeatmapListing
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        private readonly BeatmapListingSearchSection searchSection;
+        private readonly BeatmapListingSearchControl searchControl;
         private readonly BeatmapListingSortTabControl sortControl;
         private readonly Box sortControlBackground;
 
         private SearchBeatmapSetsRequest getSetsRequest;
 
-        public BeatmapListingSearchHandler()
+        public BeatmapListingFilterControl()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -62,7 +62,7 @@ namespace osu.Game.Overlays.BeatmapListing
                             Radius = 3,
                             Offset = new Vector2(0f, 1f),
                         },
-                        Child = searchSection = new BeatmapListingSearchSection(),
+                        Child = searchControl = new BeatmapListingSearchControl(),
                     },
                     new Container
                     {
@@ -99,17 +99,17 @@ namespace osu.Game.Overlays.BeatmapListing
             var sortCriteria = sortControl.Current;
             var sortDirection = sortControl.SortDirection;
 
-            searchSection.Query.BindValueChanged(query =>
+            searchControl.Query.BindValueChanged(query =>
             {
                 sortCriteria.Value = string.IsNullOrEmpty(query.NewValue) ? DirectSortCriteria.Ranked : DirectSortCriteria.Relevance;
                 sortDirection.Value = SortDirection.Descending;
                 queueUpdateSearch(true);
             });
 
-            searchSection.Ruleset.BindValueChanged(_ => queueUpdateSearch());
-            searchSection.Category.BindValueChanged(_ => queueUpdateSearch());
-            searchSection.Genre.BindValueChanged(_ => queueUpdateSearch());
-            searchSection.Language.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.Ruleset.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.Category.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.Genre.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.Language.BindValueChanged(_ => queueUpdateSearch());
 
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
@@ -129,13 +129,13 @@ namespace osu.Game.Overlays.BeatmapListing
 
         private void updateSearch()
         {
-            getSetsRequest = new SearchBeatmapSetsRequest(searchSection.Query.Value, searchSection.Ruleset.Value)
+            getSetsRequest = new SearchBeatmapSetsRequest(searchControl.Query.Value, searchControl.Ruleset.Value)
             {
-                SearchCategory = searchSection.Category.Value,
+                SearchCategory = searchControl.Category.Value,
                 SortCriteria = sortControl.Current.Value,
                 SortDirection = sortControl.SortDirection.Value,
-                Genre = searchSection.Genre.Value,
-                Language = searchSection.Language.Value
+                Genre = searchControl.Genre.Value,
+                Language = searchControl.Language.Value
             };
 
             getSetsRequest.Success += response => Schedule(() => onSearchFinished(response));
@@ -147,7 +147,7 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             var beatmaps = response.BeatmapSets.Select(r => r.ToBeatmapSet(rulesets)).ToList();
 
-            searchSection.BeatmapSet = response.Total == 0 ? null : beatmaps.First();
+            searchControl.BeatmapSet = response.Total == 0 ? null : beatmaps.First();
 
             SearchFinished?.Invoke(beatmaps);
         }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
similarity index 97%
rename from osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
rename to osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 3f9cc211df..9ae2696a22 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -17,7 +17,7 @@ using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
-    public class BeatmapListingSearchSection : CompositeDrawable
+    public class BeatmapListingSearchControl : CompositeDrawable
     {
         public Bindable<string> Query => textBox.Current;
 
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
 
-        public BeatmapListingSearchSection()
+        public BeatmapListingSearchControl()
         {
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 31dd692528..e16924464d 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays
                         Children = new Drawable[]
                         {
                             new BeatmapListingHeader(),
-                            new BeatmapListingSearchHandler
+                            new BeatmapListingFilterControl
                             {
                                 SearchStarted = onSearchStarted,
                                 SearchFinished = onSearchFinished,

From 5e3fad86cffb380f93eb78d1e541bb050b94094c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 15:28:25 +0900
Subject: [PATCH 02303/10326] Fix relax replays playing back incorrectly

---
 osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs | 13 +++++++++++--
 osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs     | 18 ++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
index 1ef235f764..16414261a5 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
@@ -9,17 +9,26 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
-    public class CatchModRelax : ModRelax, IApplicableToDrawableRuleset<CatchHitObject>
+    public class CatchModRelax : ModRelax, IApplicableToDrawableRuleset<CatchHitObject>, IApplicableToPlayer
     {
         public override string Description => @"Use the mouse to control the catcher.";
 
+        private DrawableRuleset<CatchHitObject> drawableRuleset;
+
         public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
         {
-            drawableRuleset.Cursor.Add(new MouseInputHelper((CatchPlayfield)drawableRuleset.Playfield));
+            this.drawableRuleset = drawableRuleset;
+        }
+
+        public void ApplyToPlayer(Player player)
+        {
+            if (!drawableRuleset.HasReplayLoaded.Value)
+                drawableRuleset.Cursor.Add(new MouseInputHelper((CatchPlayfield)drawableRuleset.Playfield));
         }
 
         private class MouseInputHelper : Drawable, IKeyBindingHandler<CatchAction>, IRequireHighFrequencyMousePosition
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 9b0759d9d2..9a7b967117 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -11,11 +11,12 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
 using static osu.Game.Input.Handlers.ReplayInputHandler;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModRelax : ModRelax, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>
+    public class OsuModRelax : ModRelax, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToPlayer
     {
         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();
@@ -33,15 +34,28 @@ namespace osu.Game.Rulesets.Osu.Mods
         private ReplayState<OsuAction> state;
         private double lastStateChangeTime;
 
+        private bool hasReplay;
+
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
         {
             // grab the input manager for future use.
             osuInputManager = (OsuInputManager)drawableRuleset.KeyBindingInputManager;
-            osuInputManager.AllowUserPresses = false;
+        }
+
+        public void ApplyToPlayer(Player player)
+        {
+            if (osuInputManager.ReplayInputHandler != null)
+            {
+                hasReplay = true;
+                return;
+            }
         }
 
         public void Update(Playfield playfield)
         {
+            if (hasReplay)
+                return;
+
             bool requiresHold = false;
             bool requiresHit = false;
 

From c2ed6491a9953dce878acf3d36c2c4b9d35b0716 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 15:37:50 +0900
Subject: [PATCH 02304/10326] Move and shorten enum names

---
 .../TestSceneBeatmapSearchFilter.cs           |  5 +-
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 96 ++-----------------
 .../BeatmapListingSearchControl.cs            | 21 ++--
 .../Overlays/BeatmapListing/SearchCategory.cs | 26 +++++
 .../Overlays/BeatmapListing/SearchGenre.cs    | 25 +++++
 .../Overlays/BeatmapListing/SearchLanguage.cs | 47 +++++++++
 6 files changed, 119 insertions(+), 101 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/SearchCategory.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/SearchGenre.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/SearchLanguage.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
index fac58a6754..283fe03af3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
@@ -8,7 +8,6 @@ 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;
 using osuTK;
@@ -41,8 +40,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Children = new Drawable[]
                 {
                     new BeatmapSearchRulesetFilterRow(),
-                    new BeatmapSearchFilterRow<BeatmapSearchCategory>("Categories"),
-                    new BeatmapSearchFilterRow<BeatmapSearchCategory>("Header Name")
+                    new BeatmapSearchFilterRow<SearchCategory>("Categories"),
+                    new BeatmapSearchFilterRow<SearchCategory>("Header Name")
                 }
             });
         }
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 1206563b18..8345be5f82 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -1,26 +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.ComponentModel;
 using osu.Framework.IO.Network;
 using osu.Game.Overlays;
+using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Overlays.Direct;
 using osu.Game.Rulesets;
-using osu.Game.Utils;
 
 namespace osu.Game.Online.API.Requests
 {
     public class SearchBeatmapSetsRequest : APIRequest<SearchBeatmapSetsResponse>
     {
-        public BeatmapSearchCategory SearchCategory { get; set; }
+        public SearchCategory SearchCategory { get; set; }
 
         public DirectSortCriteria SortCriteria { get; set; }
 
         public SortDirection SortDirection { get; set; }
 
-        public BeatmapSearchGenre Genre { get; set; }
+        public SearchGenre Genre { get; set; }
 
-        public BeatmapSearchLanguage Language { get; set; }
+        public SearchLanguage Language { get; set; }
 
         private readonly string query;
         private readonly RulesetInfo ruleset;
@@ -32,11 +31,11 @@ namespace osu.Game.Online.API.Requests
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
 
-            SearchCategory = BeatmapSearchCategory.Any;
+            SearchCategory = SearchCategory.Any;
             SortCriteria = DirectSortCriteria.Ranked;
             SortDirection = SortDirection.Descending;
-            Genre = BeatmapSearchGenre.Any;
-            Language = BeatmapSearchLanguage.Any;
+            Genre = SearchGenre.Any;
+            Language = SearchLanguage.Any;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -49,10 +48,10 @@ namespace osu.Game.Online.API.Requests
 
             req.AddParameter("s", SearchCategory.ToString().ToLowerInvariant());
 
-            if (Genre != BeatmapSearchGenre.Any)
+            if (Genre != SearchGenre.Any)
                 req.AddParameter("g", ((int)Genre).ToString());
 
-            if (Language != BeatmapSearchLanguage.Any)
+            if (Language != SearchLanguage.Any)
                 req.AddParameter("l", ((int)Language).ToString());
 
             req.AddParameter("sort", $"{SortCriteria.ToString().ToLowerInvariant()}_{directionString}");
@@ -62,81 +61,4 @@ namespace osu.Game.Online.API.Requests
 
         protected override string Target => @"beatmapsets/search";
     }
-
-    public enum BeatmapSearchCategory
-    {
-        Any,
-
-        [Description("Has Leaderboard")]
-        Leaderboard,
-        Ranked,
-        Qualified,
-        Loved,
-        Favourites,
-
-        [Description("Pending & WIP")]
-        Pending,
-        Graveyard,
-
-        [Description("My Maps")]
-        Mine,
-    }
-
-    public enum BeatmapSearchGenre
-    {
-        Any = 0,
-        Unspecified = 1,
-
-        [Description("Video Game")]
-        VideoGame = 2,
-        Anime = 3,
-        Rock = 4,
-        Pop = 5,
-        Other = 6,
-        Novelty = 7,
-
-        [Description("Hip Hop")]
-        HipHop = 9,
-        Electronic = 10
-    }
-
-    [HasOrderedElements]
-    public enum BeatmapSearchLanguage
-    {
-        [Order(0)]
-        Any,
-
-        [Order(11)]
-        Other,
-
-        [Order(1)]
-        English,
-
-        [Order(6)]
-        Japanese,
-
-        [Order(2)]
-        Chinese,
-
-        [Order(10)]
-        Instrumental,
-
-        [Order(7)]
-        Korean,
-
-        [Order(3)]
-        French,
-
-        [Order(4)]
-        German,
-
-        [Order(9)]
-        Swedish,
-
-        [Order(8)]
-        Spanish,
-
-        [Order(5)]
-        Italian
-    }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 9ae2696a22..2ecdb18667 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.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.Online.API.Requests;
 using osuTK;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps.Drawables;
@@ -23,11 +22,11 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<RulesetInfo> Ruleset => modeFilter.Current;
 
-        public Bindable<BeatmapSearchCategory> Category => categoryFilter.Current;
+        public Bindable<SearchCategory> Category => categoryFilter.Current;
 
-        public Bindable<BeatmapSearchGenre> Genre => genreFilter.Current;
+        public Bindable<SearchGenre> Genre => genreFilter.Current;
 
-        public Bindable<BeatmapSearchLanguage> Language => languageFilter.Current;
+        public Bindable<SearchLanguage> Language => languageFilter.Current;
 
         public BeatmapSetInfo BeatmapSet
         {
@@ -46,9 +45,9 @@ namespace osu.Game.Overlays.BeatmapListing
 
         private readonly BeatmapSearchTextBox textBox;
         private readonly BeatmapSearchRulesetFilterRow modeFilter;
-        private readonly BeatmapSearchFilterRow<BeatmapSearchCategory> categoryFilter;
-        private readonly BeatmapSearchFilterRow<BeatmapSearchGenre> genreFilter;
-        private readonly BeatmapSearchFilterRow<BeatmapSearchLanguage> languageFilter;
+        private readonly BeatmapSearchFilterRow<SearchCategory> categoryFilter;
+        private readonly BeatmapSearchFilterRow<SearchGenre> genreFilter;
+        private readonly BeatmapSearchFilterRow<SearchLanguage> languageFilter;
 
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
@@ -103,9 +102,9 @@ namespace osu.Game.Overlays.BeatmapListing
                                 Children = new Drawable[]
                                 {
                                     modeFilter = new BeatmapSearchRulesetFilterRow(),
-                                    categoryFilter = new BeatmapSearchFilterRow<BeatmapSearchCategory>(@"Categories"),
-                                    genreFilter = new BeatmapSearchFilterRow<BeatmapSearchGenre>(@"Genre"),
-                                    languageFilter = new BeatmapSearchFilterRow<BeatmapSearchLanguage>(@"Language"),
+                                    categoryFilter = new BeatmapSearchFilterRow<SearchCategory>(@"Categories"),
+                                    genreFilter = new BeatmapSearchFilterRow<SearchGenre>(@"Genre"),
+                                    languageFilter = new BeatmapSearchFilterRow<SearchLanguage>(@"Language"),
                                 }
                             }
                         }
@@ -113,7 +112,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 }
             });
 
-            categoryFilter.Current.Value = BeatmapSearchCategory.Leaderboard;
+            categoryFilter.Current.Value = SearchCategory.Leaderboard;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/BeatmapListing/SearchCategory.cs b/osu.Game/Overlays/BeatmapListing/SearchCategory.cs
new file mode 100644
index 0000000000..84859bf5b5
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SearchCategory.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 System.ComponentModel;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public enum SearchCategory
+    {
+        Any,
+
+        [Description("Has Leaderboard")]
+        Leaderboard,
+        Ranked,
+        Qualified,
+        Loved,
+        Favourites,
+
+        [Description("Pending & WIP")]
+        Pending,
+        Graveyard,
+
+        [Description("My Maps")]
+        Mine,
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/SearchGenre.cs b/osu.Game/Overlays/BeatmapListing/SearchGenre.cs
new file mode 100644
index 0000000000..b12bba6249
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SearchGenre.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 System.ComponentModel;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public enum SearchGenre
+    {
+        Any = 0,
+        Unspecified = 1,
+
+        [Description("Video Game")]
+        VideoGame = 2,
+        Anime = 3,
+        Rock = 4,
+        Pop = 5,
+        Other = 6,
+        Novelty = 7,
+
+        [Description("Hip Hop")]
+        HipHop = 9,
+        Electronic = 10
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
new file mode 100644
index 0000000000..dac7e4f1a2
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SearchLanguage.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 osu.Game.Utils;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    [HasOrderedElements]
+    public enum SearchLanguage
+    {
+        [Order(0)]
+        Any,
+
+        [Order(11)]
+        Other,
+
+        [Order(1)]
+        English,
+
+        [Order(6)]
+        Japanese,
+
+        [Order(2)]
+        Chinese,
+
+        [Order(10)]
+        Instrumental,
+
+        [Order(7)]
+        Korean,
+
+        [Order(3)]
+        French,
+
+        [Order(4)]
+        German,
+
+        [Order(9)]
+        Swedish,
+
+        [Order(8)]
+        Spanish,
+
+        [Order(5)]
+        Italian
+    }
+}

From eeb76120106b08a108f8036c95391a77fc5f968f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 15:40:08 +0900
Subject: [PATCH 02305/10326] Update DirectOverlay implementation

---
 osu.Game/Overlays/Direct/FilterControl.cs | 6 +++---
 osu.Game/Overlays/DirectOverlay.cs        | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Direct/FilterControl.cs b/osu.Game/Overlays/Direct/FilterControl.cs
index e5b2b5cc34..4ab5544550 100644
--- a/osu.Game/Overlays/Direct/FilterControl.cs
+++ b/osu.Game/Overlays/Direct/FilterControl.cs
@@ -6,20 +6,20 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Overlays.SearchableList;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Direct
 {
-    public class FilterControl : SearchableListFilterControl<DirectSortCriteria, BeatmapSearchCategory>
+    public class FilterControl : SearchableListFilterControl<DirectSortCriteria, SearchCategory>
     {
         private DirectRulesetSelector rulesetSelector;
 
         protected override Color4 BackgroundColour => Color4Extensions.FromHex(@"384552");
         protected override DirectSortCriteria DefaultTab => DirectSortCriteria.Ranked;
-        protected override BeatmapSearchCategory DefaultCategory => BeatmapSearchCategory.Leaderboard;
+        protected override SearchCategory DefaultCategory => SearchCategory.Leaderboard;
 
         protected override Drawable CreateSupplementaryControls() => rulesetSelector = new DirectRulesetSelector();
 
diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index 3eb88be690..5ed39af0dc 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -16,6 +16,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Overlays.Direct;
 using osu.Game.Overlays.SearchableList;
 using osu.Game.Rulesets;
@@ -24,7 +25,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class DirectOverlay : SearchableListOverlay<DirectTab, DirectSortCriteria, BeatmapSearchCategory>
+    public class DirectOverlay : SearchableListOverlay<DirectTab, DirectSortCriteria, SearchCategory>
     {
         private const float panel_padding = 10f;
 
@@ -40,7 +41,7 @@ namespace osu.Game.Overlays
         protected override Color4 TrianglesColourDark => Color4Extensions.FromHex(@"3f5265");
 
         protected override SearchableListHeader<DirectTab> CreateHeader() => new Header();
-        protected override SearchableListFilterControl<DirectSortCriteria, BeatmapSearchCategory> CreateFilterControl() => new FilterControl();
+        protected override SearchableListFilterControl<DirectSortCriteria, SearchCategory> CreateFilterControl() => new FilterControl();
 
         private IEnumerable<BeatmapSetInfo> beatmapSets;
 

From 1f0b7465e2410c8c69d16f31becd52e076602901 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 16:06:40 +0900
Subject: [PATCH 02306/10326] Add back missing line

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 9a7b967117..7b1941b7f9 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -49,6 +49,8 @@ namespace osu.Game.Rulesets.Osu.Mods
                 hasReplay = true;
                 return;
             }
+
+            osuInputManager.AllowUserPresses = false;
         }
 
         public void Update(Playfield playfield)

From 594cef14738f99d3f0fa3466756bcf151c3df4ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 15:47:43 +0900
Subject: [PATCH 02307/10326] Fix BeatmapListingOverlay not taking focus

---
 .../BeatmapListing/BeatmapListingFilterControl.cs    |  2 ++
 .../BeatmapListing/BeatmapListingSearchControl.cs    |  2 ++
 osu.Game/Overlays/BeatmapListingOverlay.cs           | 12 +++++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 8817031bce..8c50409783 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -159,5 +159,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
             base.Dispose(isDisposing);
         }
+
+        public void TakeFocus() => searchControl.TakeFocus();
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 2ecdb18667..29c4fe0d2e 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -121,6 +121,8 @@ namespace osu.Game.Overlays.BeatmapListing
             background.Colour = colourProvider.Dark6;
         }
 
+        public void TakeFocus() => textBox.TakeFocus();
+
         private class BeatmapSearchTextBox : SearchTextBox
         {
             protected override Color4 SelectionColour => Color4.Gray;
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index e16924464d..000ca6b91c 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Input.Events;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
@@ -35,6 +36,8 @@ namespace osu.Game.Overlays
         {
         }
 
+        private BeatmapListingFilterControl filterControl;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -57,7 +60,7 @@ namespace osu.Game.Overlays
                         Children = new Drawable[]
                         {
                             new BeatmapListingHeader(),
-                            new BeatmapListingFilterControl
+                            filterControl = new BeatmapListingFilterControl
                             {
                                 SearchStarted = onSearchStarted,
                                 SearchFinished = onSearchFinished,
@@ -88,6 +91,13 @@ namespace osu.Game.Overlays
             };
         }
 
+        protected override void OnFocus(FocusEvent e)
+        {
+            base.OnFocus(e);
+
+            filterControl.TakeFocus();
+        }
+
         private CancellationTokenSource cancellationToken;
 
         private void onSearchStarted()

From 1cec0575b78203dbc257b4d72851012d37eeac91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 16:00:00 +0900
Subject: [PATCH 02308/10326] Remove unused classes and replace overlay in game

---
 .../Visual/Online/TestSceneDirectOverlay.cs   | 215 -------------
 osu.Game.Tests/Visual/TestSceneOsuGame.cs     |   7 +
 .../API/Requests/SearchBeatmapSetsRequest.cs  |   5 +-
 osu.Game/OsuGame.cs                           |   8 +-
 .../BeatmapListingFilterControl.cs            |   3 +-
 .../BeatmapListingSortTabControl.cs           |  13 +-
 .../Overlays/BeatmapListing/SortCriteria.cs   |  17 +
 .../Overlays/Direct/DirectRulesetSelector.cs  |  93 ------
 osu.Game/Overlays/Direct/FilterControl.cs     |  47 ---
 osu.Game/Overlays/Direct/Header.cs            |  43 ---
 osu.Game/Overlays/DirectOverlay.cs            | 299 ------------------
 osu.Game/Overlays/SocialOverlay.cs            |   6 -
 osu.Game/Overlays/SortDirection.cs            |  11 +
 osu.Game/Overlays/Toolbar/Toolbar.cs          |   2 +-
 ...tton.cs => ToolbarBeatmapListingButton.cs} |   8 +-
 osu.Game/Screens/Menu/ButtonSystem.cs         |   4 +-
 osu.Game/Screens/Menu/MainMenu.cs             |   4 +-
 17 files changed, 57 insertions(+), 728 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneDirectOverlay.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/SortCriteria.cs
 delete mode 100644 osu.Game/Overlays/Direct/DirectRulesetSelector.cs
 delete mode 100644 osu.Game/Overlays/Direct/FilterControl.cs
 delete mode 100644 osu.Game/Overlays/Direct/Header.cs
 delete mode 100644 osu.Game/Overlays/DirectOverlay.cs
 create mode 100644 osu.Game/Overlays/SortDirection.cs
 rename osu.Game/Overlays/Toolbar/{ToolbarDirectButton.cs => ToolbarBeatmapListingButton.cs} (63%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectOverlay.cs
deleted file mode 100644
index d9873ea243..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectOverlay.cs
+++ /dev/null
@@ -1,215 +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 NUnit.Framework;
-using osu.Game.Beatmaps;
-using osu.Game.Overlays;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    [TestFixture]
-    public class TestSceneDirectOverlay : OsuTestScene
-    {
-        private DirectOverlay direct;
-
-        protected override bool UseOnlineAPI => true;
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Add(direct = new DirectOverlay());
-            newBeatmaps();
-
-            AddStep(@"toggle", direct.ToggleVisibility);
-            AddStep(@"result counts", () => direct.ResultAmounts = new DirectOverlay.ResultCounts(1, 4, 13));
-            AddStep(@"trigger disabled", () => Ruleset.Disabled = !Ruleset.Disabled);
-        }
-
-        private void newBeatmaps()
-        {
-            direct.BeatmapSets = new[]
-            {
-                new BeatmapSetInfo
-                {
-                    OnlineBeatmapSetID = 578332,
-                    Metadata = new BeatmapMetadata
-                    {
-                        Title = @"OrVid",
-                        Artist = @"An",
-                        AuthorString = @"RLC",
-                        Source = @"",
-                        Tags = @"acuticnotes an-fillnote revid tear tearvid encrpted encryption axi axivid quad her hervid recoll",
-                    },
-                    OnlineInfo = new BeatmapSetOnlineInfo
-                    {
-                        Covers = new BeatmapSetOnlineCovers
-                        {
-                            Card = @"https://assets.ppy.sh/beatmaps/578332/covers/card.jpg?1494591390",
-                            Cover = @"https://assets.ppy.sh/beatmaps/578332/covers/cover.jpg?1494591390",
-                        },
-                        Preview = @"https://b.ppy.sh/preview/578332.mp3",
-                        PlayCount = 97,
-                        FavouriteCount = 72,
-                    },
-                    Beatmaps = new List<BeatmapInfo>
-                    {
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 5.35f,
-                            Metadata = new BeatmapMetadata(),
-                        },
-                    },
-                },
-                new BeatmapSetInfo
-                {
-                    OnlineBeatmapSetID = 599627,
-                    Metadata = new BeatmapMetadata
-                    {
-                        Title = @"tiny lamp",
-                        Artist = @"fhana",
-                        AuthorString = @"Sotarks",
-                        Source = @"ぎんぎつね",
-                        Tags = @"lantis junichi sato yuxuki waga kevin mitsunaga towana gingitsune opening op full ver version kalibe collab collaboration",
-                    },
-                    OnlineInfo = new BeatmapSetOnlineInfo
-                    {
-                        Covers = new BeatmapSetOnlineCovers
-                        {
-                            Card = @"https://assets.ppy.sh/beatmaps/599627/covers/card.jpg?1494539318",
-                            Cover = @"https://assets.ppy.sh/beatmaps/599627/covers/cover.jpg?1494539318",
-                        },
-                        Preview = @"https//b.ppy.sh/preview/599627.mp3",
-                        PlayCount = 3082,
-                        FavouriteCount = 14,
-                    },
-                    Beatmaps = new List<BeatmapInfo>
-                    {
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 5.81f,
-                            Metadata = new BeatmapMetadata(),
-                        },
-                    },
-                },
-                new BeatmapSetInfo
-                {
-                    OnlineBeatmapSetID = 513268,
-                    Metadata = new BeatmapMetadata
-                    {
-                        Title = @"At Gwanghwamun",
-                        Artist = @"KYUHYUN",
-                        AuthorString = @"Cerulean Veyron",
-                        Source = @"",
-                        Tags = @"soul ballad kh super junior sj suju 슈퍼주니어 kt뮤직 sm엔터테인먼트 s.m.entertainment kt music 1st mini album ep",
-                    },
-                    OnlineInfo = new BeatmapSetOnlineInfo
-                    {
-                        Covers = new BeatmapSetOnlineCovers
-                        {
-                            Card = @"https://assets.ppy.sh/beatmaps/513268/covers/card.jpg?1494502863",
-                            Cover = @"https://assets.ppy.sh/beatmaps/513268/covers/cover.jpg?1494502863",
-                        },
-                        Preview = @"https//b.ppy.sh/preview/513268.mp3",
-                        PlayCount = 2762,
-                        FavouriteCount = 15,
-                    },
-                    Beatmaps = new List<BeatmapInfo>
-                    {
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 0.9f,
-                            Metadata = new BeatmapMetadata(),
-                        },
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 1.1f,
-                        },
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 2.02f,
-                        },
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 3.49f,
-                        },
-                    },
-                },
-                new BeatmapSetInfo
-                {
-                    OnlineBeatmapSetID = 586841,
-                    Metadata = new BeatmapMetadata
-                    {
-                        Title = @"RHAPSODY OF BLUE SKY",
-                        Artist = @"fhana",
-                        AuthorString = @"[Kamiya]",
-                        Source = @"小林さんちのメイドラゴン",
-                        Tags = @"kobayashi san chi no maidragon aozora no opening anime maid dragon oblivion karen dynamix imoutosan pata-mon gxytcgxytc",
-                    },
-                    OnlineInfo = new BeatmapSetOnlineInfo
-                    {
-                        Covers = new BeatmapSetOnlineCovers
-                        {
-                            Card = @"https://assets.ppy.sh/beatmaps/586841/covers/card.jpg?1494052741",
-                            Cover = @"https://assets.ppy.sh/beatmaps/586841/covers/cover.jpg?1494052741",
-                        },
-                        Preview = @"https//b.ppy.sh/preview/586841.mp3",
-                        PlayCount = 62317,
-                        FavouriteCount = 161,
-                    },
-                    Beatmaps = new List<BeatmapInfo>
-                    {
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 1.26f,
-                            Metadata = new BeatmapMetadata(),
-                        },
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 2.01f,
-                        },
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 2.87f,
-                        },
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 3.76f,
-                        },
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 3.93f,
-                        },
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 4.37f,
-                        },
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 5.13f,
-                        },
-                        new BeatmapInfo
-                        {
-                            Ruleset = Ruleset.Value,
-                            StarDifficulty = 5.42f,
-                        },
-                    },
-                },
-            };
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/TestSceneOsuGame.cs b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
index 8793d880e3..d68217dcfd 100644
--- a/osu.Game.Tests/Visual/TestSceneOsuGame.cs
+++ b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
@@ -47,8 +47,15 @@ namespace osu.Game.Tests.Visual
             typeof(IdleTracker),
             typeof(OnScreenDisplay),
             typeof(NotificationOverlay),
+<<<<<<< HEAD
             typeof(DirectOverlay),
             typeof(DashboardOverlay),
+||||||| parent of 96a3a08a9... Remove unused classes and replace overlay in game
+            typeof(DirectOverlay),
+            typeof(SocialOverlay),
+=======
+            typeof(SocialOverlay),
+>>>>>>> 96a3a08a9... Remove unused classes and replace overlay in game
             typeof(ChannelManager),
             typeof(ChatOverlay),
             typeof(SettingsOverlay),
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 8345be5f82..047496b473 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -4,7 +4,6 @@
 using osu.Framework.IO.Network;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
-using osu.Game.Overlays.Direct;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Online.API.Requests
@@ -13,7 +12,7 @@ namespace osu.Game.Online.API.Requests
     {
         public SearchCategory SearchCategory { get; set; }
 
-        public DirectSortCriteria SortCriteria { get; set; }
+        public SortCriteria SortCriteria { get; set; }
 
         public SortDirection SortDirection { get; set; }
 
@@ -32,7 +31,7 @@ namespace osu.Game.Online.API.Requests
             this.ruleset = ruleset;
 
             SearchCategory = SearchCategory.Any;
-            SortCriteria = DirectSortCriteria.Ranked;
+            SortCriteria = SortCriteria.Ranked;
             SortDirection = SortDirection.Descending;
             Genre = SearchGenre.Any;
             Language = SearchLanguage.Any;
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index c861b84835..f5f7d0cef4 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -65,7 +65,7 @@ namespace osu.Game
 
         private NowPlayingOverlay nowPlaying;
 
-        private DirectOverlay direct;
+        private BeatmapListingOverlay beatmapListing;
 
         private DashboardOverlay dashboard;
 
@@ -610,7 +610,7 @@ namespace osu.Game
             loadComponentSingleFile(screenshotManager, Add);
 
             //overlay elements
-            loadComponentSingleFile(direct = new DirectOverlay(), overlayContent.Add, true);
+            loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(dashboard = new DashboardOverlay(), overlayContent.Add, true);
             var rankingsOverlay = loadComponentSingleFile(new RankingsOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(channelManager = new ChannelManager(), AddInternal, true);
@@ -670,7 +670,7 @@ namespace osu.Game
             }
 
             // ensure only one of these overlays are open at once.
-            var singleDisplayOverlays = new OverlayContainer[] { chatOverlay, dashboard, direct, changelogOverlay, rankingsOverlay };
+            var singleDisplayOverlays = new OverlayContainer[] { chatOverlay, dashboard, beatmapListing, changelogOverlay, rankingsOverlay };
 
             foreach (var overlay in singleDisplayOverlays)
             {
@@ -865,7 +865,7 @@ namespace osu.Game
                     return true;
 
                 case GlobalAction.ToggleDirect:
-                    direct.ToggleVisibility();
+                    beatmapListing.ToggleVisibility();
                     return true;
 
                 case GlobalAction.ToggleGameplayMouseButtons:
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 8c50409783..4dd60c7113 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -14,7 +14,6 @@ using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
-using osu.Game.Overlays.Direct;
 using osu.Game.Rulesets;
 using osuTK;
 using osuTK.Graphics;
@@ -101,7 +100,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
             searchControl.Query.BindValueChanged(query =>
             {
-                sortCriteria.Value = string.IsNullOrEmpty(query.NewValue) ? DirectSortCriteria.Ranked : DirectSortCriteria.Relevance;
+                sortCriteria.Value = string.IsNullOrEmpty(query.NewValue) ? SortCriteria.Ranked : SortCriteria.Relevance;
                 sortDirection.Value = SortDirection.Descending;
                 queueUpdateSearch(true);
             });
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
index 27c43b092a..4c77a736ac 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
@@ -8,17 +8,16 @@ 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<DirectSortCriteria>
+    public class BeatmapListingSortTabControl : OverlaySortTabControl<SortCriteria>
     {
         public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>(Overlays.SortDirection.Descending);
 
         public BeatmapListingSortTabControl()
         {
-            Current.Value = DirectSortCriteria.Ranked;
+            Current.Value = SortCriteria.Ranked;
         }
 
         protected override SortTabControl CreateControl() => new BeatmapSortTabControl
@@ -30,7 +29,7 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
 
-            protected override TabItem<DirectSortCriteria> CreateTabItem(DirectSortCriteria value) => new BeatmapSortTabItem(value)
+            protected override TabItem<SortCriteria> CreateTabItem(SortCriteria value) => new BeatmapSortTabItem(value)
             {
                 SortDirection = { BindTarget = SortDirection }
             };
@@ -40,12 +39,12 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
 
-            public BeatmapSortTabItem(DirectSortCriteria value)
+            public BeatmapSortTabItem(SortCriteria value)
                 : base(value)
             {
             }
 
-            protected override TabButton CreateTabButton(DirectSortCriteria value) => new BeatmapTabButton(value)
+            protected override TabButton CreateTabButton(SortCriteria value) => new BeatmapTabButton(value)
             {
                 Active = { BindTarget = Active },
                 SortDirection = { BindTarget = SortDirection }
@@ -67,7 +66,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
             private readonly SpriteIcon icon;
 
-            public BeatmapTabButton(DirectSortCriteria value)
+            public BeatmapTabButton(SortCriteria value)
                 : base(value)
             {
                 Add(icon = new SpriteIcon
diff --git a/osu.Game/Overlays/BeatmapListing/SortCriteria.cs b/osu.Game/Overlays/BeatmapListing/SortCriteria.cs
new file mode 100644
index 0000000000..e409cbdda7
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SortCriteria.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public enum SortCriteria
+    {
+        Title,
+        Artist,
+        Difficulty,
+        Ranked,
+        Rating,
+        Plays,
+        Favourites,
+        Relevance
+    }
+}
diff --git a/osu.Game/Overlays/Direct/DirectRulesetSelector.cs b/osu.Game/Overlays/Direct/DirectRulesetSelector.cs
deleted file mode 100644
index 106aaa616b..0000000000
--- a/osu.Game/Overlays/Direct/DirectRulesetSelector.cs
+++ /dev/null
@@ -1,93 +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.Containers;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.Direct
-{
-    public class DirectRulesetSelector : RulesetSelector
-    {
-        public override bool HandleNonPositionalInput => !Current.Disabled && base.HandleNonPositionalInput;
-
-        public override bool HandlePositionalInput => !Current.Disabled && base.HandlePositionalInput;
-
-        public override bool PropagatePositionalInputSubTree => !Current.Disabled && base.PropagatePositionalInputSubTree;
-
-        public DirectRulesetSelector()
-        {
-            TabContainer.Masking = false;
-            TabContainer.Spacing = new Vector2(10, 0);
-            AutoSizeAxes = Axes.Both;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Current.BindDisabledChanged(value => SelectedTab.FadeColour(value ? Color4.DarkGray : Color4.White, 200, Easing.OutQuint), true);
-        }
-
-        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new DirectRulesetTabItem(value);
-
-        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
-        {
-            Direction = FillDirection.Horizontal,
-            AutoSizeAxes = Axes.Both,
-        };
-
-        private class DirectRulesetTabItem : TabItem<RulesetInfo>
-        {
-            private readonly ConstrainedIconContainer iconContainer;
-
-            public DirectRulesetTabItem(RulesetInfo value)
-                : base(value)
-            {
-                AutoSizeAxes = Axes.Both;
-
-                Children = new Drawable[]
-                {
-                    iconContainer = new ConstrainedIconContainer
-                    {
-                        Icon = value.CreateInstance().CreateIcon(),
-                        Size = new Vector2(32),
-                    },
-                    new HoverClickSounds()
-                };
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                updateState();
-            }
-
-            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() => iconContainer.FadeColour(IsHovered || Active.Value ? Color4.White : Color4.Gray, 120, Easing.InQuad);
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Direct/FilterControl.cs b/osu.Game/Overlays/Direct/FilterControl.cs
deleted file mode 100644
index 4ab5544550..0000000000
--- a/osu.Game/Overlays/Direct/FilterControl.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.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Game.Graphics;
-using osu.Game.Overlays.BeatmapListing;
-using osu.Game.Overlays.SearchableList;
-using osu.Game.Rulesets;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.Direct
-{
-    public class FilterControl : SearchableListFilterControl<DirectSortCriteria, SearchCategory>
-    {
-        private DirectRulesetSelector rulesetSelector;
-
-        protected override Color4 BackgroundColour => Color4Extensions.FromHex(@"384552");
-        protected override DirectSortCriteria DefaultTab => DirectSortCriteria.Ranked;
-        protected override SearchCategory DefaultCategory => SearchCategory.Leaderboard;
-
-        protected override Drawable CreateSupplementaryControls() => rulesetSelector = new DirectRulesetSelector();
-
-        public Bindable<RulesetInfo> Ruleset => rulesetSelector.Current;
-
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, Bindable<RulesetInfo> ruleset)
-        {
-            DisplayStyleControl.Dropdown.AccentColour = colours.BlueDark;
-            rulesetSelector.Current.BindTo(ruleset);
-        }
-    }
-
-    public enum DirectSortCriteria
-    {
-        Title,
-        Artist,
-        Difficulty,
-        Ranked,
-        Rating,
-        Plays,
-        Favourites,
-        Relevance,
-    }
-}
diff --git a/osu.Game/Overlays/Direct/Header.cs b/osu.Game/Overlays/Direct/Header.cs
deleted file mode 100644
index 5b3e394a18..0000000000
--- a/osu.Game/Overlays/Direct/Header.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 System.ComponentModel;
-using osu.Framework.Extensions.Color4Extensions;
-using osuTK.Graphics;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Overlays.SearchableList;
-
-namespace osu.Game.Overlays.Direct
-{
-    public class Header : SearchableListHeader<DirectTab>
-    {
-        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) };
-        protected override IconUsage Icon => OsuIcon.ChevronDownCircle;
-
-        public Header()
-        {
-            Tabs.Current.Value = DirectTab.NewestMaps;
-            Tabs.Current.TriggerChange();
-        }
-    }
-
-    public enum DirectTab
-    {
-        Search,
-
-        [Description("Newest Maps")]
-        NewestMaps = DirectSortCriteria.Ranked,
-
-        [Description("Top Rated")]
-        TopRated = DirectSortCriteria.Rating,
-
-        [Description("Most Played")]
-        MostPlayed = DirectSortCriteria.Plays,
-    }
-}
diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
deleted file mode 100644
index 5ed39af0dc..0000000000
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ /dev/null
@@ -1,299 +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 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;
-using osu.Game.Audio;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API.Requests;
-using osu.Game.Overlays.BeatmapListing;
-using osu.Game.Overlays.Direct;
-using osu.Game.Overlays.SearchableList;
-using osu.Game.Rulesets;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays
-{
-    public class DirectOverlay : SearchableListOverlay<DirectTab, DirectSortCriteria, SearchCategory>
-    {
-        private const float panel_padding = 10f;
-
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
-        private readonly FillFlowContainer resultCountsContainer;
-        private readonly OsuSpriteText resultCountsText;
-        private FillFlowContainer<DirectPanel> panels;
-
-        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, SearchCategory> CreateFilterControl() => new FilterControl();
-
-        private IEnumerable<BeatmapSetInfo> beatmapSets;
-
-        public IEnumerable<BeatmapSetInfo> BeatmapSets
-        {
-            get => beatmapSets;
-            set
-            {
-                if (ReferenceEquals(beatmapSets, value)) return;
-
-                beatmapSets = value?.ToList();
-
-                if (beatmapSets == null) return;
-
-                var artists = new List<string>();
-                var songs = new List<string>();
-                var tags = new List<string>();
-
-                foreach (var s in beatmapSets)
-                {
-                    artists.Add(s.Metadata.Artist);
-                    songs.Add(s.Metadata.Title);
-                    tags.AddRange(s.Metadata.Tags.Split(' '));
-                }
-
-                ResultAmounts = new ResultCounts(distinctCount(artists), distinctCount(songs), distinctCount(tags));
-            }
-        }
-
-        private ResultCounts resultAmounts;
-
-        public ResultCounts ResultAmounts
-        {
-            get => resultAmounts;
-            set
-            {
-                if (value == ResultAmounts) return;
-
-                resultAmounts = value;
-
-                updateResultCounts();
-            }
-        }
-
-        public DirectOverlay()
-            : base(OverlayColourScheme.Blue)
-        {
-            ScrollFlow.Children = new Drawable[]
-            {
-                resultCountsContainer = new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
-                    Margin = new MarginPadding { Top = 5 },
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Text = "Found ",
-                            Font = OsuFont.GetFont(size: 15)
-                        },
-                        resultCountsText = new OsuSpriteText
-                        {
-                            Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold)
-                        },
-                    }
-                },
-            };
-
-            Filter.Search.Current.ValueChanged += text =>
-            {
-                if (!string.IsNullOrEmpty(text.NewValue))
-                {
-                    Header.Tabs.Current.Value = DirectTab.Search;
-
-                    if (Filter.Tabs.Current.Value == DirectSortCriteria.Ranked)
-                        Filter.Tabs.Current.Value = DirectSortCriteria.Relevance;
-                }
-                else
-                {
-                    Header.Tabs.Current.Value = DirectTab.NewestMaps;
-
-                    if (Filter.Tabs.Current.Value == DirectSortCriteria.Relevance)
-                        Filter.Tabs.Current.Value = DirectSortCriteria.Ranked;
-                }
-            };
-            ((FilterControl)Filter).Ruleset.ValueChanged += _ => queueUpdateSearch();
-            Filter.DisplayStyleControl.DisplayStyle.ValueChanged += style => recreatePanels(style.NewValue);
-            Filter.DisplayStyleControl.Dropdown.Current.ValueChanged += _ => queueUpdateSearch();
-
-            Header.Tabs.Current.ValueChanged += tab =>
-            {
-                if (tab.NewValue != DirectTab.Search)
-                {
-                    currentQuery.Value = string.Empty;
-                    Filter.Tabs.Current.Value = (DirectSortCriteria)Header.Tabs.Current.Value;
-                    queueUpdateSearch();
-                }
-            };
-
-            currentQuery.ValueChanged += text => queueUpdateSearch(!string.IsNullOrEmpty(text.NewValue));
-
-            currentQuery.BindTo(Filter.Search.Current);
-
-            Filter.Tabs.Current.ValueChanged += tab =>
-            {
-                if (Header.Tabs.Current.Value != DirectTab.Search && tab.NewValue != (DirectSortCriteria)Header.Tabs.Current.Value)
-                    Header.Tabs.Current.Value = DirectTab.Search;
-
-                queueUpdateSearch();
-            };
-
-            updateResultCounts();
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            resultCountsContainer.Colour = colours.Yellow;
-        }
-
-        private void updateResultCounts()
-        {
-            resultCountsContainer.FadeTo(ResultAmounts == null ? 0f : 1f, 200, Easing.OutQuint);
-            if (ResultAmounts == null) return;
-
-            resultCountsText.Text = "Artist".ToQuantity(ResultAmounts.Artists) + ", " +
-                                    "Song".ToQuantity(ResultAmounts.Songs) + ", " +
-                                    "Tag".ToQuantity(ResultAmounts.Tags);
-        }
-
-        private void recreatePanels(PanelDisplayStyle displayStyle)
-        {
-            if (panels != null)
-            {
-                panels.FadeOut(200);
-                panels.Expire();
-                panels = null;
-            }
-
-            if (BeatmapSets == null) return;
-
-            var newPanels = new FillFlowContainer<DirectPanel>
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Spacing = new Vector2(panel_padding),
-                Margin = new MarginPadding { Top = 10 },
-                ChildrenEnumerable = BeatmapSets.Select<BeatmapSetInfo, DirectPanel>(b =>
-                {
-                    switch (displayStyle)
-                    {
-                        case PanelDisplayStyle.Grid:
-                            return new DirectGridPanel(b)
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                            };
-
-                        default:
-                            return new DirectListPanel(b);
-                    }
-                })
-            };
-
-            LoadComponentAsync(newPanels, p =>
-            {
-                if (panels != null) ScrollFlow.Remove(panels);
-                ScrollFlow.Add(panels = newPanels);
-            });
-        }
-
-        protected override void PopIn()
-        {
-            base.PopIn();
-
-            // Queries are allowed to be run only on the first pop-in
-            if (getSetsRequest == null)
-                queueUpdateSearch();
-        }
-
-        private SearchBeatmapSetsRequest getSetsRequest;
-
-        private readonly Bindable<string> currentQuery = new Bindable<string>(string.Empty);
-
-        private ScheduledDelegate queryChangedDebounce;
-
-        [Resolved]
-        private PreviewTrackManager previewTrackManager { get; set; }
-
-        private void queueUpdateSearch(bool queryTextChanged = false)
-        {
-            BeatmapSets = null;
-            ResultAmounts = null;
-
-            getSetsRequest?.Cancel();
-
-            queryChangedDebounce?.Cancel();
-            queryChangedDebounce = Scheduler.AddDelayed(updateSearch, queryTextChanged ? 500 : 100);
-        }
-
-        private void updateSearch()
-        {
-            if (!IsLoaded)
-                return;
-
-            if (State.Value == Visibility.Hidden)
-                return;
-
-            if (API == null)
-                return;
-
-            previewTrackManager.StopAnyPlaying(this);
-
-            getSetsRequest = new SearchBeatmapSetsRequest(currentQuery.Value, ((FilterControl)Filter).Ruleset.Value)
-            {
-                SearchCategory = Filter.DisplayStyleControl.Dropdown.Current.Value,
-                SortCriteria = Filter.Tabs.Current.Value
-            };
-
-            getSetsRequest.Success += response =>
-            {
-                Task.Run(() =>
-                {
-                    var sets = response.BeatmapSets.Select(r => r.ToBeatmapSet(rulesets)).ToList();
-
-                    // may not need scheduling; loads async internally.
-                    Schedule(() =>
-                    {
-                        BeatmapSets = sets;
-                        recreatePanels(Filter.DisplayStyleControl.DisplayStyle.Value);
-                    });
-                });
-            };
-
-            API.Queue(getSetsRequest);
-        }
-
-        private int distinctCount(List<string> list) => list.Distinct().ToArray().Length;
-
-        public class ResultCounts
-        {
-            public readonly int Artists;
-            public readonly int Songs;
-            public readonly int Tags;
-
-            public ResultCounts(int artists, int songs, int tags)
-            {
-                Artists = artists;
-                Songs = songs;
-                Tags = tags;
-            }
-        }
-    }
-}
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index 02f7c9b0d3..9548573b4f 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -239,10 +239,4 @@ namespace osu.Game.Overlays
             }
         }
     }
-
-    public enum SortDirection
-    {
-        Ascending,
-        Descending
-    }
 }
diff --git a/osu.Game/Overlays/SortDirection.cs b/osu.Game/Overlays/SortDirection.cs
new file mode 100644
index 0000000000..3af9614972
--- /dev/null
+++ b/osu.Game/Overlays/SortDirection.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.Overlays
+{
+    public enum SortDirection
+    {
+        Ascending,
+        Descending
+    }
+}
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 897587d198..227347112c 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Overlays.Toolbar
                     {
                         new ToolbarChangelogButton(),
                         new ToolbarRankingsButton(),
-                        new ToolbarDirectButton(),
+                        new ToolbarBeatmapListingButton(),
                         new ToolbarChatButton(),
                         new ToolbarSocialButton(),
                         new ToolbarMusicButton(),
diff --git a/osu.Game/Overlays/Toolbar/ToolbarDirectButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
similarity index 63%
rename from osu.Game/Overlays/Toolbar/ToolbarDirectButton.cs
rename to osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index 1d07a3ae70..eecb368ee9 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarDirectButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
@@ -6,17 +6,17 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarDirectButton : ToolbarOverlayToggleButton
+    public class ToolbarBeatmapListingButton : ToolbarOverlayToggleButton
     {
-        public ToolbarDirectButton()
+        public ToolbarBeatmapListingButton()
         {
             SetIcon(OsuIcon.ChevronDownCircle);
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(DirectOverlay direct)
+        private void load(BeatmapListingOverlay beatmapListing)
         {
-            StateContainer = direct;
+            StateContainer = beatmapListing;
         }
     }
 }
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index fe538728e3..30e5e9702e 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Menu
 
         public Action OnEdit;
         public Action OnExit;
-        public Action OnDirect;
+        public Action OnBeatmapListing;
         public Action OnSolo;
         public Action OnSettings;
         public Action OnMulti;
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Menu
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
-            buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnDirect?.Invoke(), 0, Key.D));
+            buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 174eadfe26..0589e4d12b 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Menu
         private SongTicker songTicker;
 
         [BackgroundDependencyLoader(true)]
-        private void load(DirectOverlay direct, SettingsOverlay settings, RankingsOverlay rankings, OsuConfigManager config, SessionStatics statics)
+        private void load(BeatmapListingOverlay beatmapListing, SettingsOverlay settings, RankingsOverlay rankings, OsuConfigManager config, SessionStatics statics)
         {
             holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
@@ -133,7 +133,7 @@ namespace osu.Game.Screens.Menu
             };
 
             buttons.OnSettings = () => settings?.ToggleVisibility();
-            buttons.OnDirect = () => direct?.ToggleVisibility();
+            buttons.OnBeatmapListing = () => beatmapListing?.ToggleVisibility();
             buttons.OnChart = () => rankings?.ShowSpotlights();
 
             LoadComponentAsync(background = new BackgroundScreenDefault());

From 9b9b710ded76bfc99d326f94c9fd6a40c69f9412 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 16:03:18 +0900
Subject: [PATCH 02309/10326] Move and rename remaining direct classes

---
 .../Online/TestSceneDirectDownloadButton.cs   |  6 ++---
 .../Visual/Online/TestSceneDirectPanel.cs     | 18 +++++++--------
 osu.Game.Tests/Visual/TestSceneOsuGame.cs     |  9 +-------
 .../BeatmapDownloadTrackingComposite.cs       |  2 +-
 .../Panels/BeatmapPanel.cs}                   |  8 +++----
 .../Panels/BeatmapPanelDownloadButton.cs}     |  6 ++---
 .../Panels/BeatmapPanelGrid.cs}               | 16 +++++++-------
 .../Panels/BeatmapPanelList.cs}               | 22 +++++++++----------
 .../Panels}/DownloadProgressBar.cs            |  2 +-
 .../Panels}/IconPill.cs                       |  2 +-
 .../Panels}/PlayButton.cs                     |  2 +-
 osu.Game/Overlays/BeatmapListingOverlay.cs    |  6 ++---
 .../Buttons/HeaderDownloadButton.cs           |  2 +-
 .../BeatmapSet/Buttons/PreviewButton.cs       |  2 +-
 osu.Game/Overlays/BeatmapSet/Header.cs        |  4 ++--
 .../Beatmaps/PaginatedBeatmapContainer.cs     |  4 ++--
 .../Overlays/Rankings/SpotlightsLayout.cs     |  4 ++--
 .../Screens/Multi/DrawableRoomPlaylistItem.cs |  4 ++--
 18 files changed, 56 insertions(+), 63 deletions(-)
 rename osu.Game/Overlays/{Direct => }/BeatmapDownloadTrackingComposite.cs (94%)
 rename osu.Game/Overlays/{Direct/DirectPanel.cs => BeatmapListing/Panels/BeatmapPanel.cs} (96%)
 rename osu.Game/Overlays/{Direct/PanelDownloadButton.cs => BeatmapListing/Panels/BeatmapPanelDownloadButton.cs} (93%)
 rename osu.Game/Overlays/{Direct/DirectGridPanel.cs => BeatmapListing/Panels/BeatmapPanelGrid.cs} (97%)
 rename osu.Game/Overlays/{Direct/DirectListPanel.cs => BeatmapListing/Panels/BeatmapPanelList.cs} (97%)
 rename osu.Game/Overlays/{Direct => BeatmapListing/Panels}/DownloadProgressBar.cs (97%)
 rename osu.Game/Overlays/{Direct => BeatmapListing/Panels}/IconPill.cs (96%)
 rename osu.Game/Overlays/{Direct => BeatmapListing/Panels}/PlayButton.cs (98%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
index f612992bf6..9fe873cb6a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
@@ -9,7 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Online;
-using osu.Game.Overlays.Direct;
+using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Tests.Resources;
 using osuTK;
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Online
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(PanelDownloadButton)
+            typeof(BeatmapPanelDownloadButton)
         };
 
         private TestDownloadButton downloadButton;
@@ -143,7 +143,7 @@ namespace osu.Game.Tests.Visual.Online
             return beatmap;
         }
 
-        private class TestDownloadButton : PanelDownloadButton
+        private class TestDownloadButton : BeatmapPanelDownloadButton
         {
             public new bool DownloadEnabled => base.DownloadEnabled;
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
index cb08cded37..5809f93d90 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
@@ -8,7 +8,7 @@ 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.Overlays.BeatmapListing.Panels;
 using osu.Game.Rulesets;
 using osu.Game.Users;
 using osuTK;
@@ -20,8 +20,8 @@ namespace osu.Game.Tests.Visual.Online
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(DirectGridPanel),
-            typeof(DirectListPanel),
+            typeof(BeatmapPanelGrid),
+            typeof(BeatmapPanelList),
             typeof(IconPill)
         };
 
@@ -126,12 +126,12 @@ namespace osu.Game.Tests.Visual.Online
                     Spacing = new Vector2(5, 20),
                     Children = new Drawable[]
                     {
-                        new DirectGridPanel(normal),
-                        new DirectGridPanel(undownloadable),
-                        new DirectGridPanel(manyDifficulties),
-                        new DirectListPanel(normal),
-                        new DirectListPanel(undownloadable),
-                        new DirectListPanel(manyDifficulties),
+                        new BeatmapPanelGrid(normal),
+                        new BeatmapPanelGrid(undownloadable),
+                        new BeatmapPanelGrid(manyDifficulties),
+                        new BeatmapPanelList(normal),
+                        new BeatmapPanelList(undownloadable),
+                        new BeatmapPanelList(manyDifficulties),
                     },
                 },
             };
diff --git a/osu.Game.Tests/Visual/TestSceneOsuGame.cs b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
index d68217dcfd..2eaac2a45f 100644
--- a/osu.Game.Tests/Visual/TestSceneOsuGame.cs
+++ b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
@@ -47,15 +47,8 @@ namespace osu.Game.Tests.Visual
             typeof(IdleTracker),
             typeof(OnScreenDisplay),
             typeof(NotificationOverlay),
-<<<<<<< HEAD
-            typeof(DirectOverlay),
+            typeof(BeatmapListingOverlay),
             typeof(DashboardOverlay),
-||||||| parent of 96a3a08a9... Remove unused classes and replace overlay in game
-            typeof(DirectOverlay),
-            typeof(SocialOverlay),
-=======
-            typeof(SocialOverlay),
->>>>>>> 96a3a08a9... Remove unused classes and replace overlay in game
             typeof(ChannelManager),
             typeof(ChatOverlay),
             typeof(SettingsOverlay),
diff --git a/osu.Game/Overlays/Direct/BeatmapDownloadTrackingComposite.cs b/osu.Game/Overlays/BeatmapDownloadTrackingComposite.cs
similarity index 94%
rename from osu.Game/Overlays/Direct/BeatmapDownloadTrackingComposite.cs
rename to osu.Game/Overlays/BeatmapDownloadTrackingComposite.cs
index fd04a1541e..f6b5b181c3 100644
--- a/osu.Game/Overlays/Direct/BeatmapDownloadTrackingComposite.cs
+++ b/osu.Game/Overlays/BeatmapDownloadTrackingComposite.cs
@@ -5,7 +5,7 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Online;
 
-namespace osu.Game.Overlays.Direct
+namespace osu.Game.Overlays
 {
     public abstract class BeatmapDownloadTrackingComposite : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
diff --git a/osu.Game/Overlays/Direct/DirectPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
similarity index 96%
rename from osu.Game/Overlays/Direct/DirectPanel.cs
rename to osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
index 4ad8e95512..f260bf1573 100644
--- a/osu.Game/Overlays/Direct/DirectPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
@@ -26,9 +26,9 @@ using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Overlays.Direct
+namespace osu.Game.Overlays.BeatmapListing.Panels
 {
-    public abstract class DirectPanel : OsuClickableContainer, IHasContextMenu
+    public abstract class BeatmapPanel : OsuClickableContainer, IHasContextMenu
     {
         public readonly BeatmapSetInfo SetInfo;
 
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Direct
 
         protected Action ViewBeatmap;
 
-        protected DirectPanel(BeatmapSetInfo setInfo)
+        protected BeatmapPanel(BeatmapSetInfo setInfo)
         {
             Debug.Assert(setInfo.OnlineBeatmapSetID != null);
 
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Direct
             if (SetInfo.Beatmaps.Count > maximum_difficulty_icons)
             {
                 foreach (var ruleset in SetInfo.Beatmaps.Select(b => b.Ruleset).Distinct())
-                    icons.Add(new GroupedDifficultyIcon(SetInfo.Beatmaps.FindAll(b => b.Ruleset.Equals(ruleset)), ruleset, this is DirectListPanel ? Color4.White : colours.Gray5));
+                    icons.Add(new GroupedDifficultyIcon(SetInfo.Beatmaps.FindAll(b => b.Ruleset.Equals(ruleset)), ruleset, this is BeatmapPanelList ? Color4.White : colours.Gray5));
             }
             else
             {
diff --git a/osu.Game/Overlays/Direct/PanelDownloadButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
similarity index 93%
rename from osu.Game/Overlays/Direct/PanelDownloadButton.cs
rename to osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
index 387ced6acb..589f2d5072 100644
--- a/osu.Game/Overlays/Direct/PanelDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
@@ -11,9 +11,9 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 
-namespace osu.Game.Overlays.Direct
+namespace osu.Game.Overlays.BeatmapListing.Panels
 {
-    public class PanelDownloadButton : BeatmapDownloadTrackingComposite
+    public class BeatmapPanelDownloadButton : BeatmapDownloadTrackingComposite
     {
         protected bool DownloadEnabled => button.Enabled.Value;
 
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Direct
         private readonly DownloadButton button;
         private Bindable<bool> noVideoSetting;
 
-        public PanelDownloadButton(BeatmapSetInfo beatmapSet)
+        public BeatmapPanelDownloadButton(BeatmapSetInfo beatmapSet)
             : base(beatmapSet)
         {
             InternalChild = shakeContainer = new ShakeContainer
diff --git a/osu.Game/Overlays/Direct/DirectGridPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelGrid.cs
similarity index 97%
rename from osu.Game/Overlays/Direct/DirectGridPanel.cs
rename to osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelGrid.cs
index 2528ccec41..caa7eb6441 100644
--- a/osu.Game/Overlays/Direct/DirectGridPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelGrid.cs
@@ -1,25 +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 osuTK;
-using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+using osuTK.Graphics;
 
-namespace osu.Game.Overlays.Direct
+namespace osu.Game.Overlays.BeatmapListing.Panels
 {
-    public class DirectGridPanel : DirectPanel
+    public class BeatmapPanelGrid : BeatmapPanel
     {
         private const float horizontal_padding = 10;
         private const float vertical_padding = 5;
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Direct
         protected override PlayButton PlayButton => playButton;
         protected override Box PreviewBar => progressBar;
 
-        public DirectGridPanel(BeatmapSetInfo beatmap)
+        public BeatmapPanelGrid(BeatmapSetInfo beatmap)
             : base(beatmap)
         {
             Width = 380;
@@ -156,7 +156,7 @@ namespace osu.Game.Overlays.Direct
                                         },
                                     },
                                 },
-                                new PanelDownloadButton(SetInfo)
+                                new BeatmapPanelDownloadButton(SetInfo)
                                 {
                                     Size = new Vector2(50, 30),
                                     Margin = new MarginPadding(horizontal_padding),
diff --git a/osu.Game/Overlays/Direct/DirectListPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelList.cs
similarity index 97%
rename from osu.Game/Overlays/Direct/DirectListPanel.cs
rename to osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelList.cs
index b64142dfe7..3245ddea99 100644
--- a/osu.Game/Overlays/Direct/DirectListPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelList.cs
@@ -1,25 +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 osuTK;
-using osuTK.Graphics;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Colour;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Framework.Allocation;
+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.Beatmaps.Drawables;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+using osuTK.Graphics;
 
-namespace osu.Game.Overlays.Direct
+namespace osu.Game.Overlays.BeatmapListing.Panels
 {
-    public class DirectListPanel : DirectPanel
+    public class BeatmapPanelList : BeatmapPanel
     {
         private const float transition_duration = 120;
         private const float horizontal_padding = 10;
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Direct
         private const float height = 70;
 
         private FillFlowContainer statusContainer;
-        protected PanelDownloadButton DownloadButton;
+        protected BeatmapPanelDownloadButton DownloadButton;
         private PlayButton playButton;
         private Box progressBar;
 
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Direct
         protected override PlayButton PlayButton => playButton;
         protected override Box PreviewBar => progressBar;
 
-        public DirectListPanel(BeatmapSetInfo beatmap)
+        public BeatmapPanelList(BeatmapSetInfo beatmap)
             : base(beatmap)
         {
             RelativeSizeAxes = Axes.X;
@@ -151,7 +151,7 @@ namespace osu.Game.Overlays.Direct
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
                                     AutoSizeAxes = Axes.Both,
-                                    Child = DownloadButton = new PanelDownloadButton(SetInfo)
+                                    Child = DownloadButton = new BeatmapPanelDownloadButton(SetInfo)
                                     {
                                         Size = new Vector2(height - vertical_padding * 3),
                                         Margin = new MarginPadding { Left = vertical_padding * 2, Right = vertical_padding },
diff --git a/osu.Game/Overlays/Direct/DownloadProgressBar.cs b/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
similarity index 97%
rename from osu.Game/Overlays/Direct/DownloadProgressBar.cs
rename to osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
index 9a8644efd2..93cf8799b5 100644
--- a/osu.Game/Overlays/Direct/DownloadProgressBar.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osuTK.Graphics;
 
-namespace osu.Game.Overlays.Direct
+namespace osu.Game.Overlays.BeatmapListing.Panels
 {
     public class DownloadProgressBar : BeatmapDownloadTrackingComposite
     {
diff --git a/osu.Game/Overlays/Direct/IconPill.cs b/osu.Game/Overlays/BeatmapListing/Panels/IconPill.cs
similarity index 96%
rename from osu.Game/Overlays/Direct/IconPill.cs
rename to osu.Game/Overlays/BeatmapListing/Panels/IconPill.cs
index d63bb2a292..1cb6c84f13 100644
--- a/osu.Game/Overlays/Direct/IconPill.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/IconPill.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Overlays.Direct
+namespace osu.Game.Overlays.BeatmapListing.Panels
 {
     public class IconPill : CircularContainer
     {
diff --git a/osu.Game/Overlays/Direct/PlayButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
similarity index 98%
rename from osu.Game/Overlays/Direct/PlayButton.cs
rename to osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
index d9f335b6a7..e95fdeecf4 100644
--- a/osu.Game/Overlays/Direct/PlayButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Overlays.Direct
+namespace osu.Game.Overlays.BeatmapListing.Panels
 {
     public class PlayButton : Container
     {
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 000ca6b91c..a024e2c74e 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -17,7 +17,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.BeatmapListing;
-using osu.Game.Overlays.Direct;
+using osu.Game.Overlays.BeatmapListing.Panels;
 using osuTK;
 
 namespace osu.Game.Overlays
@@ -118,14 +118,14 @@ namespace osu.Game.Overlays
                 return;
             }
 
-            var newPanels = new FillFlowContainer<DirectPanel>
+            var newPanels = new FillFlowContainer<BeatmapPanel>
             {
                 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)
+                ChildrenEnumerable = beatmaps.Select<BeatmapSetInfo, BeatmapPanel>(b => new BeatmapPanelGrid(b)
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
index e64256b850..56c0052bfe 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
@@ -13,7 +13,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online;
 using osu.Game.Online.API;
-using osu.Game.Overlays.Direct;
+using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
index 7eae05e4a9..6accce7d77 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -11,7 +11,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Overlays.Direct;
+using osu.Game.Overlays.BeatmapListing.Panels;
 using osuTK;
 
 namespace osu.Game.Overlays.BeatmapSet.Buttons
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 11dc424183..17fa689cd2 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -15,8 +15,8 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
+using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Overlays.BeatmapSet.Buttons;
-using osu.Game.Overlays.Direct;
 using osu.Game.Rulesets;
 using osuTK;
 using osuTK.Graphics;
@@ -274,7 +274,7 @@ namespace osu.Game.Overlays.BeatmapSet
             {
                 case DownloadState.LocallyAvailable:
                     // temporary for UX until new design is implemented.
-                    downloadButtonsContainer.Child = new PanelDownloadButton(BeatmapSet.Value)
+                    downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value)
                     {
                         Width = 50,
                         RelativeSizeAxes = Axes.Y,
diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index fcd12e2b54..5f70dc4d75 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays.Direct;
+using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Users;
 using osuTK;
 
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
 
         protected override Drawable CreateDrawableItem(APIBeatmapSet model) => !model.OnlineBeatmapSetID.HasValue
             ? null
-            : new DirectGridPanel(model.ToBeatmapSet(Rulesets))
+            : new BeatmapPanelGrid(model.ToBeatmapSet(Rulesets))
             {
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
index 6f06eecd6e..895fa94af5 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -12,10 +12,10 @@ 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;
+using osu.Game.Overlays.BeatmapListing.Panels;
 
 namespace osu.Game.Overlays.Rankings
 {
@@ -140,7 +140,7 @@ namespace osu.Game.Overlays.Rankings
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
                     Spacing = new Vector2(10),
-                    Children = response.BeatmapSets.Select(b => new DirectGridPanel(b.ToBeatmapSet(rulesets))
+                    Children = response.BeatmapSets.Select(b => new BeatmapPanelGrid(b.ToBeatmapSet(rulesets))
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index d7dcca9809..c024304856 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -21,7 +21,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.Chat;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Overlays.Direct;
+using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play.HUD;
@@ -210,7 +210,7 @@ namespace osu.Game.Screens.Multi
             return true;
         }
 
-        private class PlaylistDownloadButton : PanelDownloadButton
+        private class PlaylistDownloadButton : BeatmapPanelDownloadButton
         {
             public PlaylistDownloadButton(BeatmapSetInfo beatmapSet)
                 : base(beatmapSet)

From b8a1831d98feb8fc6752a2755b66df55de66c832 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 17:14:04 +0900
Subject: [PATCH 02310/10326] Read line widths from skin

---
 osu.Game/Skinning/LegacySkin.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 91f970d19f..003fa24d5b 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -249,6 +249,14 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.RightStageImage:
                     return SkinUtils.As<TValue>(getManiaImage(existing, "StageRight"));
+
+                case LegacyManiaSkinConfigurationLookups.LeftLineWidth:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnLineWidth[maniaLookup.TargetColumn.Value]));
+
+                case LegacyManiaSkinConfigurationLookups.RightLineWidth:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnLineWidth[maniaLookup.TargetColumn.Value + 1]));
             }
 
             return null;

From 0a2b585c65ca963a1fac0eb917328f329b722d54 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 17:14:49 +0900
Subject: [PATCH 02311/10326] Apply missing scale

---
 osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 6504321bb2..1a097405ac 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -67,6 +67,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = leftLineWidth,
+                    Scale = new Vector2(0.740f, 1),
                     Colour = lineColour,
                     Alpha = hasLeftLine ? 1 : 0
                 },
@@ -76,6 +77,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Y,
                     Width = rightLineWidth,
+                    Scale = new Vector2(0.740f, 1),
                     Colour = lineColour,
                     Alpha = hasRightLine ? 1 : 0
                 },

From a41ac50e2f052854032131e62d12407e6fd3242d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 17:15:06 +0900
Subject: [PATCH 02312/10326] Line widths should not receive scale factor

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

diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 2db902c182..a988bd589f 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Skinning
                 switch (pair.Key)
                 {
                     case "ColumnLineWidth":
-                        parseArrayValue(pair.Value, currentConfig.ColumnLineWidth);
+                        parseArrayValue(pair.Value, currentConfig.ColumnLineWidth, false);
                         break;
 
                     case "ColumnSpacing":
@@ -124,7 +124,7 @@ namespace osu.Game.Skinning
             pendingLines.Clear();
         }
 
-        private void parseArrayValue(string value, float[] output)
+        private void parseArrayValue(string value, float[] output, bool applyScaleFactor = true)
         {
             string[] values = value.Split(',');
 
@@ -133,7 +133,7 @@ namespace osu.Game.Skinning
                 if (i >= output.Length)
                     break;
 
-                output[i] = float.Parse(values[i], CultureInfo.InvariantCulture) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
+                output[i] = float.Parse(values[i], CultureInfo.InvariantCulture) * (applyScaleFactor ? LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR : 1);
             }
         }
     }

From 4642a6093c2b6e5fa559059567e77863125e2c2a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 17:15:13 +0900
Subject: [PATCH 02313/10326] Add test

---
 .../Resources/special-skin/mania-key1@2x.png    | Bin 0 -> 12914 bytes
 .../Resources/special-skin/skin.ini             |   6 ++++++
 .../Skinning/TestSceneColumnBackground.cs       |   2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-key1@2x.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-key1@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-key1@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa681f6f223ea44319b3a383935237d1a2e4b345
GIT binary patch
literal 12914
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
new file mode 100644
index 0000000000..56564776b3
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
@@ -0,0 +1,6 @@
+[General]
+Version: 2.4
+
+[Mania]
+Keys: 4
+ColumnLineWidth: 3,1,3,1,1
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
index d6bacbe59e..bde323f187 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, 0), _ => new DefaultColumnBackground())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, 1), _ => new DefaultColumnBackground())
                         {
                             RelativeSizeAxes = Axes.Both
                         }

From a82efa626e9d95f98ccad220f14a3ab4fdb76690 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Tue, 21 Apr 2020 11:36:09 +0300
Subject: [PATCH 02314/10326] Add XMLDoc for default hyper-dash colour constant

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

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 056e838419..6f5e8be92c 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public class Catcher : SkinReloadableDrawable, IKeyBindingHandler<CatchAction>
     {
+        /// <summary>
+        /// The default colour used for all hyper-dashing components. (catcher drawables and fruit)
+        /// </summary>
         public static readonly Color4 DEFAULT_HYPER_DASH_COLOUR = Color4.Red;
 
         /// <summary>

From ee62739b08e09feeda55b78d5a49dd68a857de0e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Tue, 21 Apr 2020 11:41:53 +0300
Subject: [PATCH 02315/10326] Simplify process of adding catcher trails

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs     | 29 +++++++----------------
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs |  4 +---
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 6f5e8be92c..92f2977c40 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public Container ExplodingFruitTarget;
 
-        private Container additiveTarget;
+        private readonly Container additiveTarget;
         private Container<CatcherTrailSprite> dashTrails;
         private Container<CatcherTrailSprite> hyperDashTrails;
         private Container<CatcherTrailSprite> endGlowSprites;
@@ -116,8 +116,10 @@ namespace osu.Game.Rulesets.Catch.UI
         private int hyperDashDirection;
         private float hyperDashTargetPosition;
 
-        public Catcher(BeatmapDifficulty difficulty = null)
+        public Catcher(BeatmapDifficulty difficulty = null, Container additiveTarget = null)
         {
+            this.additiveTarget = additiveTarget;
+
             RelativePositionAxes = Axes.X;
             X = 0.5f;
 
@@ -155,27 +157,14 @@ namespace osu.Game.Rulesets.Catch.UI
                 }
             };
 
-            updateCatcher();
-        }
-
-        /// <summary>
-        /// Sets container target to provide catcher additive trails content in.
-        /// </summary>
-        /// <param name="target">The container to add catcher trails in.</param>
-        public void SetAdditiveTarget(Container target)
-        {
-            if (additiveTarget == target)
-                return;
-
-            additiveTarget?.RemoveRange(new[] { dashTrails, hyperDashTrails, endGlowSprites });
-
-            additiveTarget = target;
             additiveTarget?.AddRange(new[]
             {
-                dashTrails ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = Color4.White },
-                hyperDashTrails ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashColour },
-                endGlowSprites ??= new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashEndGlowColour },
+                dashTrails = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = Color4.White },
+                hyperDashTrails = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashColour },
+                endGlowSprites = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashEndGlowColour }
             });
+
+            updateCatcher();
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 641b81599e..1dd94afa9e 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -33,9 +33,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             RelativeSizeAxes = Axes.X;
             Height = CATCHER_SIZE;
-
-            Child = MovableCatcher = new Catcher(difficulty);
-            MovableCatcher.SetAdditiveTarget(this);
+            Child = MovableCatcher = new Catcher(difficulty, this);
         }
 
         public static float GetCatcherSize(BeatmapDifficulty difficulty)

From c8c2b51108a1a0b80c80d5b846c2925231e80e3a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Tue, 21 Apr 2020 11:44:10 +0300
Subject: [PATCH 02316/10326] Remove redundant property set

Co-Authored-By: Dean Herbert <pe@ppy.sh>
---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 92f2977c40..7ecb245617 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             additiveTarget?.AddRange(new[]
             {
-                dashTrails = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = Color4.White },
+                dashTrails = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both },
                 hyperDashTrails = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashColour },
                 endGlowSprites = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashEndGlowColour }
             });

From d1c701a9972a42af10021bccb5d528ddb51f71c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 18:34:56 +0900
Subject: [PATCH 02317/10326] Rename existing test to something more relevant

---
 .../{TestSceneTaikoPlayfield.cs => TestSceneHits.cs}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Rulesets.Taiko.Tests/{TestSceneTaikoPlayfield.cs => TestSceneHits.cs} (99%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
similarity index 99%
rename from osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
rename to osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 0d9e813c60..c2ca578dfa 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -24,7 +24,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
-    public class TestSceneTaikoPlayfield : OsuTestScene
+    public class TestSceneHits : OsuTestScene
     {
         private const double default_duration = 1000;
         private const float scroll_time = 1000;

From e74f9024836b56b4485d724d867fa1f71ea0a5b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 18:40:18 +0900
Subject: [PATCH 02318/10326] Add playfield test scene

---
 .../Skinning/TestSceneTaikoPlayfield.cs       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
new file mode 100644
index 0000000000..e255baf459
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
+{
+    public class TestSceneTaikoPlayfield : TaikoSkinnableTestScene
+    {
+        [Cached(typeof(IScrollingInfo))]
+        private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
+        {
+            Direction = { Value = ScrollingDirection.Left },
+            TimeRange = { Value = 5000 },
+        };
+
+        public TestSceneTaikoPlayfield()
+        {
+            AddStep("Load playfield", () => SetContents(() => new TaikoPlayfield(new ControlPointInfo())
+            {
+                Height = 0.4f,
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+            }));
+        }
+    }
+}

From bfc17bf4c09ac2493748c3751f3921b374746086 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 19:00:34 +0900
Subject: [PATCH 02319/10326] Add taiko hit target skinning

---
 .../metrics-skin/approachcircle@2x.png        | Bin 0 -> 13816 bytes
 .../metrics-skin/taikobigcircle@2x.png        | Bin 0 -> 12145 bytes
 .../Resources/old-skin/approachcircle.png     | Bin 0 -> 10333 bytes
 .../Resources/special-skin/approachcircle.png | Bin 0 -> 4504 bytes
 .../special-skin/taikobigcircle@2x.png        | Bin 0 -> 12374 bytes
 .../Skinning/TestSceneTaikoPlayfield.cs       |  10 +++++
 .../Skinning/LegacyHitTarget.cs               |  41 ++++++++++++++++++
 .../Skinning/TaikoLegacySkinTransformer.cs    |   6 +++
 .../TaikoSkinComponents.cs                    |   3 +-
 osu.Game.Rulesets.Taiko/UI/HitTarget.cs       |   2 +
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |   7 +--
 11 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/approachcircle@2x.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taikobigcircle@2x.png
 create mode 100755 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/approachcircle.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/approachcircle.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle@2x.png
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/LegacyHitTarget.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/approachcircle@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/approachcircle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..72ef665478b758c364197aa79f238230e229b3c4
GIT binary patch
literal 13816
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
X;|*6ltxe$d|7PiG>1$T1+eQB$HM;D+

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taikobigcircle@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taikobigcircle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..440e5b55e52c8629f69272993a75b1a56002fb60
GIT binary patch
literal 12145
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
T_QV;1z<|yL1I<!(+sOX`>BKZ6

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/approachcircle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/approachcircle.png
new file mode 100755
index 0000000000000000000000000000000000000000..5aba6887564782a216c030b6a0143830612193ee
GIT binary patch
literal 10333
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
H<7ECnYE>!V

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/approachcircle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/approachcircle.png
new file mode 100644
index 0000000000000000000000000000000000000000..56d6d34c1abf6ab153c9cef62eecff3016d21ed9
GIT binary patch
literal 4504
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d8b60da9e79009e8b3e78b2003d883974b139a5
GIT binary patch
literal 12374
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
Qd;A||`ImC#G8P~IA7%MrKL7v#

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
index e255baf459..730eed0e0f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.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.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
@@ -12,6 +16,12 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 {
     public class TestSceneTaikoPlayfield : TaikoSkinnableTestScene
     {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
+        {
+            typeof(HitTarget),
+            typeof(LegacyHitTarget),
+        }).ToList();
+
         [Cached(typeof(IScrollingInfo))]
         private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
         {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitTarget.cs
new file mode 100644
index 0000000000..51aea9b9ab
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitTarget.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.Skinning
+{
+    public class LegacyHitTarget : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new Sprite
+                {
+                    Texture = skin.GetTexture("approachcircle"),
+                    Scale = new Vector2(0.73f),
+                    Alpha = 0.7f,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                new Sprite
+                {
+                    Texture = skin.GetTexture("taikobigcircle"),
+                    Scale = new Vector2(0.7f),
+                    Alpha = 0.5f,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 3af7df07c4..6b59718173 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -49,6 +49,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                 case TaikoSkinComponents.DrumRollTick:
                     return this.GetAnimation("sliderscorepoint", false, false);
+
+                case TaikoSkinComponents.HitTarget:
+                    if (GetTexture("taikobigcircle") != null)
+                        return new LegacyHitTarget();
+
+                    return null;
             }
 
             return source.GetDrawableComponent(component);
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index 156ea71c16..775eeb4e38 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -10,6 +10,7 @@ namespace osu.Game.Rulesets.Taiko
         RimHit,
         DrumRollBody,
         DrumRollTick,
-        Swell
+        Swell,
+        HitTarget
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitTarget.cs b/osu.Game.Rulesets.Taiko/UI/HitTarget.cs
index 2bb208bd1d..88886508af 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitTarget.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public HitTarget()
         {
+            RelativeSizeAxes = Axes.Both;
+
             Children = new Drawable[]
             {
                 new Box
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index bde9085c23..375d9995c0 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
@@ -42,7 +43,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private readonly Container<HitExplosion> hitExplosionContainer;
         private readonly Container<KiaiHitExplosion> kiaiExplosionContainer;
         private readonly JudgementContainer<DrawableTaikoJudgement> judgementContainer;
-        internal readonly HitTarget HitTarget;
+        internal readonly Drawable HitTarget;
 
         private readonly ProxyContainer topLevelHitContainer;
         private readonly ProxyContainer barlineContainer;
@@ -90,7 +91,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
                             Masking = true,
-                            Children = new Drawable[]
+                            Children = new[]
                             {
                                 hitExplosionContainer = new Container<HitExplosion>
                                 {
@@ -98,7 +99,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                                     FillMode = FillMode.Fit,
                                     Blending = BlendingParameters.Additive,
                                 },
-                                HitTarget = new HitTarget
+                                HitTarget = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.HitTarget), _ => new HitTarget())
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.Centre,

From ed9663985b439dba6b5c51281ba40cd6cb2e1c07 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 20:55:33 +0900
Subject: [PATCH 02320/10326] Rename panels

---
 .../Visual/Online/TestSceneDirectPanel.cs        | 16 ++++++++--------
 .../BeatmapListing/Panels/BeatmapPanel.cs        |  2 +-
 .../{BeatmapPanelGrid.cs => GridBeatmapPanel.cs} |  4 ++--
 .../{BeatmapPanelList.cs => ListBeatmapPanel.cs} |  4 ++--
 osu.Game/Overlays/BeatmapListingOverlay.cs       |  2 +-
 .../Beatmaps/PaginatedBeatmapContainer.cs        |  2 +-
 osu.Game/Overlays/Rankings/SpotlightsLayout.cs   |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)
 rename osu.Game/Overlays/BeatmapListing/Panels/{BeatmapPanelGrid.cs => GridBeatmapPanel.cs} (98%)
 rename osu.Game/Overlays/BeatmapListing/Panels/{BeatmapPanelList.cs => ListBeatmapPanel.cs} (99%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
index 5809f93d90..d6ed654bac 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Tests.Visual.Online
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(BeatmapPanelGrid),
-            typeof(BeatmapPanelList),
+            typeof(GridBeatmapPanel),
+            typeof(ListBeatmapPanel),
             typeof(IconPill)
         };
 
@@ -126,12 +126,12 @@ namespace osu.Game.Tests.Visual.Online
                     Spacing = new Vector2(5, 20),
                     Children = new Drawable[]
                     {
-                        new BeatmapPanelGrid(normal),
-                        new BeatmapPanelGrid(undownloadable),
-                        new BeatmapPanelGrid(manyDifficulties),
-                        new BeatmapPanelList(normal),
-                        new BeatmapPanelList(undownloadable),
-                        new BeatmapPanelList(manyDifficulties),
+                        new GridBeatmapPanel(normal),
+                        new GridBeatmapPanel(undownloadable),
+                        new GridBeatmapPanel(manyDifficulties),
+                        new ListBeatmapPanel(normal),
+                        new ListBeatmapPanel(undownloadable),
+                        new ListBeatmapPanel(manyDifficulties),
                     },
                 },
             };
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
index f260bf1573..88c15776cd 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
             if (SetInfo.Beatmaps.Count > maximum_difficulty_icons)
             {
                 foreach (var ruleset in SetInfo.Beatmaps.Select(b => b.Ruleset).Distinct())
-                    icons.Add(new GroupedDifficultyIcon(SetInfo.Beatmaps.FindAll(b => b.Ruleset.Equals(ruleset)), ruleset, this is BeatmapPanelList ? Color4.White : colours.Gray5));
+                    icons.Add(new GroupedDifficultyIcon(SetInfo.Beatmaps.FindAll(b => b.Ruleset.Equals(ruleset)), ruleset, this is ListBeatmapPanel ? Color4.White : colours.Gray5));
             }
             else
             {
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelGrid.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
similarity index 98%
rename from osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelGrid.cs
rename to osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index caa7eb6441..84d35da096 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelGrid.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -19,7 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapListing.Panels
 {
-    public class BeatmapPanelGrid : BeatmapPanel
+    public class GridBeatmapPanel : BeatmapPanel
     {
         private const float horizontal_padding = 10;
         private const float vertical_padding = 5;
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         protected override PlayButton PlayButton => playButton;
         protected override Box PreviewBar => progressBar;
 
-        public BeatmapPanelGrid(BeatmapSetInfo beatmap)
+        public GridBeatmapPanel(BeatmapSetInfo beatmap)
             : base(beatmap)
         {
             Width = 380;
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelList.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
similarity index 99%
rename from osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelList.cs
rename to osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 3245ddea99..433ea37f06 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelList.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -19,7 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapListing.Panels
 {
-    public class BeatmapPanelList : BeatmapPanel
+    public class ListBeatmapPanel : BeatmapPanel
     {
         private const float transition_duration = 120;
         private const float horizontal_padding = 10;
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         protected override PlayButton PlayButton => playButton;
         protected override Box PreviewBar => progressBar;
 
-        public BeatmapPanelList(BeatmapSetInfo beatmap)
+        public ListBeatmapPanel(BeatmapSetInfo beatmap)
             : base(beatmap)
         {
             RelativeSizeAxes = Axes.X;
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index a024e2c74e..f680f7c67b 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Overlays
                 Spacing = new Vector2(10),
                 Alpha = 0,
                 Margin = new MarginPadding { Vertical = 15 },
-                ChildrenEnumerable = beatmaps.Select<BeatmapSetInfo, BeatmapPanel>(b => new BeatmapPanelGrid(b)
+                ChildrenEnumerable = beatmaps.Select<BeatmapSetInfo, BeatmapPanel>(b => new GridBeatmapPanel(b)
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index 5f70dc4d75..191f3c908a 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
 
         protected override Drawable CreateDrawableItem(APIBeatmapSet model) => !model.OnlineBeatmapSetID.HasValue
             ? null
-            : new BeatmapPanelGrid(model.ToBeatmapSet(Rulesets))
+            : new GridBeatmapPanel(model.ToBeatmapSet(Rulesets))
             {
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
index 895fa94af5..917509e842 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Overlays.Rankings
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
                     Spacing = new Vector2(10),
-                    Children = response.BeatmapSets.Select(b => new BeatmapPanelGrid(b.ToBeatmapSet(rulesets))
+                    Children = response.BeatmapSets.Select(b => new GridBeatmapPanel(b.ToBeatmapSet(rulesets))
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,

From 6193b80589790cc4f90a6141cd34fa6900b2723f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 21:20:57 +0900
Subject: [PATCH 02321/10326] 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 d2bdbc8b61..25942863c5 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.417.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.421.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 35ee0864e1..9c17c453a6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,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.417.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.421.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.412.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 0200fca9a3..07ea4b9c2a 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.Framework.iOS" Version="2020.417.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.421.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.412.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.417.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.421.0" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From e9a2e92adf3573c27096b796d99db094f2fd6f5d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 14:43:22 +0900
Subject: [PATCH 02322/10326] Fix incorrect beatmap comments

---
 osu.Game.Tests/Resources/hitobject-combo-offset.osu | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Resources/hitobject-combo-offset.osu b/osu.Game.Tests/Resources/hitobject-combo-offset.osu
index c1f0dab8e9..d39a3e8548 100644
--- a/osu.Game.Tests/Resources/hitobject-combo-offset.osu
+++ b/osu.Game.Tests/Resources/hitobject-combo-offset.osu
@@ -5,27 +5,27 @@ osu file format v14
 255,193,1000,49,0,0:0:0:0:
 // Combo index = 4
 
-// Slider with new combo followed by circle with no new combo
+// Spinner with new combo followed by circle with no new combo
 256,192,2000,12,0,2000,0:0:0:0:
 255,193,3000,1,0,0:0:0:0:
 // Combo index = 5
 
-// Slider without new combo followed by circle with no new combo
+// Spinner without new combo followed by circle with no new combo
 256,192,4000,8,0,5000,0:0:0:0:
 255,193,6000,1,0,0:0:0:0:
 // Combo index = 5
 
-// Slider without new combo followed by circle with new combo
+// Spinner without new combo followed by circle with new combo
 256,192,7000,8,0,8000,0:0:0:0:
 255,193,9000,5,0,0:0:0:0:
 // Combo index = 6
 
-// Slider with new combo and offset (1) followed by circle with new combo and offset (3)
+// Spinner with new combo and offset (1) followed by circle with new combo and offset (3)
 256,192,10000,28,0,11000,0:0:0:0:
 255,193,12000,53,0,0:0:0:0:
 // Combo index = 11
 
-// Slider with new combo and offset (2) followed by slider with no new combo followed by circle with no new combo
+// Spinner with new combo and offset (2) followed by slider with no new combo followed by circle with no new combo
 256,192,13000,44,0,14000,0:0:0:0:
 256,192,15000,8,0,16000,0:0:0:0:
 255,193,17000,1,0,0:0:0:0:

From 9713d903884469c247397ae3f7bd223fd0df21e9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 14:47:12 +0900
Subject: [PATCH 02323/10326] Always apply beatmap converter/processor

---
 .../Formats/LegacyBeatmapEncoderTest.cs       | 61 +++++++++++++++++--
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index f2b3a16f68..62cf2cec43 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -1,14 +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;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.IO.Serialization;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Taiko;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Beatmaps.Formats
@@ -29,26 +36,68 @@ namespace osu.Game.Tests.Beatmaps.Formats
             Assert.That(encoded.Serialize(), Is.EqualTo(decoded.Serialize()));
         }
 
-        private Beatmap decode(string filename, out Beatmap encoded)
+        private IBeatmap decode(string filename, out IBeatmap encoded)
         {
-            using (var stream = TestResources.OpenResource(filename))
+            using (var stream = TestResources.GetStore().GetStream(filename))
             using (var sr = new LineBufferedReader(stream))
             {
-                var legacyDecoded = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(sr);
+                var legacyDecoded = convert(new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(sr));
 
                 using (var ms = new MemoryStream())
                 using (var sw = new StreamWriter(ms))
-                using (var sr2 = new LineBufferedReader(ms))
+                using (var sr2 = new LineBufferedReader(ms, true))
                 {
                     new LegacyBeatmapEncoder(legacyDecoded).Encode(sw);
-                    sw.Flush();
 
+                    sw.Flush();
                     ms.Position = 0;
 
-                    encoded = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(sr2);
+                    encoded = convert(new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(sr2));
+
                     return legacyDecoded;
                 }
             }
         }
+
+        private IBeatmap convert(IBeatmap beatmap)
+        {
+            switch (beatmap.BeatmapInfo.RulesetID)
+            {
+                case 0:
+                    beatmap.BeatmapInfo.Ruleset = new OsuRuleset().RulesetInfo;
+                    break;
+
+                case 1:
+                    beatmap.BeatmapInfo.Ruleset = new TaikoRuleset().RulesetInfo;
+                    break;
+
+                case 2:
+                    beatmap.BeatmapInfo.Ruleset = new CatchRuleset().RulesetInfo;
+                    break;
+
+                case 3:
+                    beatmap.BeatmapInfo.Ruleset = new ManiaRuleset().RulesetInfo;
+                    break;
+            }
+
+            return new TestWorkingBeatmap(beatmap).GetPlayableBeatmap(beatmap.BeatmapInfo.Ruleset);
+        }
+
+        private class TestWorkingBeatmap : WorkingBeatmap
+        {
+            private readonly IBeatmap beatmap;
+
+            public TestWorkingBeatmap(IBeatmap beatmap)
+                : base(beatmap.BeatmapInfo, null)
+            {
+                this.beatmap = beatmap;
+            }
+
+            protected override IBeatmap GetBeatmap() => beatmap;
+
+            protected override Texture GetBackground() => throw new NotImplementedException();
+
+            protected override Track GetTrack() => throw new NotImplementedException();
+        }
     }
 }

From 8ea76244a26699bc98a27926315292ee44a83897 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 14:48:32 +0900
Subject: [PATCH 02324/10326] Fix only single beatmap being tested

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 62cf2cec43..01edafcf31 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -23,14 +23,12 @@ namespace osu.Game.Tests.Beatmaps.Formats
     [TestFixture]
     public class LegacyBeatmapEncoderTest
     {
-        private const string normal = "Soleily - Renatus (Gamu) [Insane].osu";
-
         private static IEnumerable<string> allBeatmaps => TestResources.GetStore().GetAvailableResources().Where(res => res.EndsWith(".osu"));
 
         [TestCaseSource(nameof(allBeatmaps))]
-        public void TestDecodeEncodedBeatmap(string name)
+        public void TestBeatmap(string name)
         {
-            var decoded = decode(normal, out var encoded);
+            var decoded = decode(name, out var encoded);
 
             Assert.That(decoded.HitObjects.Count, Is.EqualTo(encoded.HitObjects.Count));
             Assert.That(encoded.Serialize(), Is.EqualTo(decoded.Serialize()));

From 1e7e7417ed77dcec18944565b826c28919490a94 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 14:49:31 +0900
Subject: [PATCH 02325/10326] Fix testing relying on control point order

---
 .../Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 01edafcf31..bcc873b0b7 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -9,6 +10,7 @@ using NUnit.Framework;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.IO.Serialization;
@@ -30,10 +32,22 @@ namespace osu.Game.Tests.Beatmaps.Formats
         {
             var decoded = decode(name, out var encoded);
 
-            Assert.That(decoded.HitObjects.Count, Is.EqualTo(encoded.HitObjects.Count));
+            sort(decoded);
+            sort(encoded);
+
             Assert.That(encoded.Serialize(), Is.EqualTo(decoded.Serialize()));
         }
 
+        private void sort(IBeatmap beatmap)
+        {
+            // Sort control points to ensure a sane ordering, as they may be parsed in different orders. This works because each group contains only uniquely-typed control points.
+            foreach (var g in beatmap.ControlPointInfo.Groups)
+            {
+                ArrayList.Adapter((IList)g.ControlPoints).Sort(
+                    Comparer<ControlPoint>.Create((c1, c2) => string.Compare(c1.GetType().ToString(), c2.GetType().ToString(), StringComparison.Ordinal)));
+            }
+        }
+
         private IBeatmap decode(string filename, out IBeatmap encoded)
         {
             using (var stream = TestResources.GetStore().GetStream(filename))

From 21949ac499ab3ece38ddfb799a4f704a0a589c4b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 14:49:43 +0900
Subject: [PATCH 02326/10326] Add osu! test beatmap

---
 .../Resources/sample-beatmap-osu.osu          | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/sample-beatmap-osu.osu

diff --git a/osu.Game.Tests/Resources/sample-beatmap-osu.osu b/osu.Game.Tests/Resources/sample-beatmap-osu.osu
new file mode 100644
index 0000000000..27c96077e6
--- /dev/null
+++ b/osu.Game.Tests/Resources/sample-beatmap-osu.osu
@@ -0,0 +1,32 @@
+osu file format v14
+
+[General]
+SampleSet: Normal
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:5
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:3.59999990463257
+SliderTickRate:2
+
+[TimingPoints]
+24,352.941176470588,4,1,1,100,1,0
+6376,-50,4,1,1,100,0,0
+
+[HitObjects]
+98,69,24,1,0,0:0:0:0:
+419,72,200,1,2,0:0:0:0:
+81,314,376,1,6,0:0:0:0:
+423,321,553,1,12,0:0:0:0:
+86,192,729,2,0,P|459:193|460:193,1,359.999990463257
+86,192,1259,2,0,P|246:82|453:203,1,449.999988079071
+86,192,1876,2,0,B|256:30|257:313|464:177,1,359.999990463257
+86,55,2406,2,12,B|447:51|447:51|452:348|452:348|78:344,1,989.999973773957,14|2,0:0|0:0,0:0:0:0:
+256,192,3553,12,0,4259,0:0:0:0:
+67,57,4435,5,0,0:0:0:0:
+440,52,4612,5,0,0:0:0:0:
+86,181,4788,6,0,L|492:183,1,359.999990463257
\ No newline at end of file

From a702a521f8c4af9fe4d645fcbd472466b6ba6ff5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 14:52:58 +0900
Subject: [PATCH 02327/10326] Fix not being able to serialise converted
 beatmaps

---
 .../Converters/TypedListConverter.cs              | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
index 6d244bff60..837650eb0a 100644
--- a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
+++ b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -43,13 +44,13 @@ namespace osu.Game.IO.Serialization.Converters
             var list = new List<T>();
 
             var obj = JObject.Load(reader);
-            var lookupTable = serializer.Deserialize<List<string>>(obj["lookup_table"].CreateReader());
+            var lookupTable = serializer.Deserialize<List<string>>(obj["$lookup_table"].CreateReader());
 
-            foreach (var tok in obj["items"])
+            foreach (var tok in obj["$items"])
             {
                 var itemReader = tok.CreateReader();
 
-                var typeName = lookupTable[(int)tok["type"]];
+                var typeName = lookupTable[(int)tok["$type"]];
                 var instance = (T)Activator.CreateInstance(Type.GetType(typeName));
                 serializer.Populate(itemReader, instance);
 
@@ -61,7 +62,7 @@ namespace osu.Game.IO.Serialization.Converters
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            var list = (List<T>)value;
+            var list = (IList)value;
 
             var lookupTable = new List<string>();
             var objects = new List<JObject>();
@@ -84,16 +85,16 @@ namespace osu.Game.IO.Serialization.Converters
                 }
 
                 var itemObject = JObject.FromObject(item, serializer);
-                itemObject.AddFirst(new JProperty("type", typeId));
+                itemObject.AddFirst(new JProperty("$type", typeId));
                 objects.Add(itemObject);
             }
 
             writer.WriteStartObject();
 
-            writer.WritePropertyName("lookup_table");
+            writer.WritePropertyName("$lookup_table");
             serializer.Serialize(writer, lookupTable);
 
-            writer.WritePropertyName("items");
+            writer.WritePropertyName("$items");
             serializer.Serialize(writer, objects);
 
             writer.WriteEndObject();

From 3093c3e1857c8d5bc7fce5f5b8fa21b3bfeead05 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 14:55:17 +0900
Subject: [PATCH 02328/10326] Fix custom sample set not being written correctly

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index fe63eec3f9..7721d50227 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -10,6 +11,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Beatmaps.Formats
@@ -159,7 +161,7 @@ namespace osu.Game.Beatmaps.Formats
                     beatLength = -100 / difficultyPoint.SpeedMultiplier;
 
                 // Apply the control point to a hit sample to uncover legacy properties (e.g. suffix)
-                HitSampleInfo tempHitSample = samplePoint.ApplyTo(new HitSampleInfo());
+                HitSampleInfo tempHitSample = samplePoint.ApplyTo(new ConvertHitObjectParser.LegacyHitSampleInfo());
 
                 // Convert effect flags to the legacy format
                 LegacyEffectFlags effectFlags = LegacyEffectFlags.None;
@@ -172,7 +174,7 @@ namespace osu.Game.Beatmaps.Formats
                 writer.Write(FormattableString.Invariant($"{beatLength},"));
                 writer.Write(FormattableString.Invariant($"{(int)beatmap.ControlPointInfo.TimingPointAt(group.Time).TimeSignature},"));
                 writer.Write(FormattableString.Invariant($"{(int)toLegacySampleBank(tempHitSample.Bank)},"));
-                writer.Write(FormattableString.Invariant($"{toLegacyCustomSampleBank(tempHitSample.Suffix)},"));
+                writer.Write(FormattableString.Invariant($"{toLegacyCustomSampleBank(tempHitSample)},"));
                 writer.Write(FormattableString.Invariant($"{tempHitSample.Volume},"));
                 writer.Write(FormattableString.Invariant($"{(timingPoint != null ? '1' : '0')},"));
                 writer.Write(FormattableString.Invariant($"{(int)effectFlags}"));
@@ -326,7 +328,7 @@ namespace osu.Game.Beatmaps.Formats
 
             if (!banksOnly)
             {
-                string customSampleBank = toLegacyCustomSampleBank(samples.FirstOrDefault(s => !string.IsNullOrEmpty(s.Name))?.Suffix);
+                string customSampleBank = toLegacyCustomSampleBank(samples.FirstOrDefault(s => !string.IsNullOrEmpty(s.Name)));
                 string sampleFilename = samples.FirstOrDefault(s => string.IsNullOrEmpty(s.Name))?.LookupNames.First() ?? string.Empty;
                 int volume = samples.FirstOrDefault()?.Volume ?? 100;
 
@@ -382,6 +384,15 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
-        private string toLegacyCustomSampleBank(string sampleSuffix) => string.IsNullOrEmpty(sampleSuffix) ? "0" : sampleSuffix;
+        private string toLegacyCustomSampleBank(HitSampleInfo hitSampleInfo)
+        {
+            if (hitSampleInfo == null)
+                return "0";
+
+            if (hitSampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy)
+                return legacy.CustomSampleBank.ToString(CultureInfo.InvariantCulture);
+
+            return "0";
+        }
     }
 }

From d8d85e5b08980c80a9f5f0a917dafe16a1ce71a1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 15:04:04 +0900
Subject: [PATCH 02329/10326] Don't output certain properties if they don't
 exist

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 7721d50227..3ba68c6086 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Beatmaps.Formats
         {
             writer.WriteLine("[General]");
 
-            writer.WriteLine(FormattableString.Invariant($"AudioFilename: {Path.GetFileName(beatmap.Metadata.AudioFile)}"));
+            if (beatmap.Metadata.AudioFile != null) writer.WriteLine(FormattableString.Invariant($"AudioFilename: {Path.GetFileName(beatmap.Metadata.AudioFile)}"));
             writer.WriteLine(FormattableString.Invariant($"AudioLeadIn: {beatmap.BeatmapInfo.AudioLeadIn}"));
             writer.WriteLine(FormattableString.Invariant($"PreviewTime: {beatmap.Metadata.PreviewTime}"));
             // Todo: Not all countdown types are supported by lazer yet
@@ -105,15 +105,15 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine("[Metadata]");
 
             writer.WriteLine(FormattableString.Invariant($"Title: {beatmap.Metadata.Title}"));
-            writer.WriteLine(FormattableString.Invariant($"TitleUnicode: {beatmap.Metadata.TitleUnicode}"));
+            if (beatmap.Metadata.TitleUnicode != null) writer.WriteLine(FormattableString.Invariant($"TitleUnicode: {beatmap.Metadata.TitleUnicode}"));
             writer.WriteLine(FormattableString.Invariant($"Artist: {beatmap.Metadata.Artist}"));
-            writer.WriteLine(FormattableString.Invariant($"ArtistUnicode: {beatmap.Metadata.ArtistUnicode}"));
+            if (beatmap.Metadata.ArtistUnicode != null) writer.WriteLine(FormattableString.Invariant($"ArtistUnicode: {beatmap.Metadata.ArtistUnicode}"));
             writer.WriteLine(FormattableString.Invariant($"Creator: {beatmap.Metadata.AuthorString}"));
             writer.WriteLine(FormattableString.Invariant($"Version: {beatmap.BeatmapInfo.Version}"));
-            writer.WriteLine(FormattableString.Invariant($"Source: {beatmap.Metadata.Source}"));
-            writer.WriteLine(FormattableString.Invariant($"Tags: {beatmap.Metadata.Tags}"));
-            writer.WriteLine(FormattableString.Invariant($"BeatmapID: {beatmap.BeatmapInfo.OnlineBeatmapID ?? 0}"));
-            writer.WriteLine(FormattableString.Invariant($"BeatmapSetID: {beatmap.BeatmapInfo.BeatmapSet?.OnlineBeatmapSetID ?? -1}"));
+            if (beatmap.Metadata.Source != null) writer.WriteLine(FormattableString.Invariant($"Source: {beatmap.Metadata.Source}"));
+            if (beatmap.Metadata.Tags != null) writer.WriteLine(FormattableString.Invariant($"Tags: {beatmap.Metadata.Tags}"));
+            if (beatmap.BeatmapInfo.OnlineBeatmapID != null) writer.WriteLine(FormattableString.Invariant($"BeatmapID: {beatmap.BeatmapInfo.OnlineBeatmapID}"));
+            if (beatmap.BeatmapInfo.BeatmapSet?.OnlineBeatmapSetID != null) writer.WriteLine(FormattableString.Invariant($"BeatmapSetID: {beatmap.BeatmapInfo.BeatmapSet.OnlineBeatmapSetID}"));
         }
 
         private void handleDifficulty(TextWriter writer)

From 1421e876b11479cdb4d7d313dc84124c9f3c254d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 15:04:43 +0900
Subject: [PATCH 02330/10326] Remove implicit new combo from spinners

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

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 3ba68c6086..f1f0a0a5de 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Beatmaps.Formats
                     break;
 
                 case IHasEndTime _:
-                    type |= LegacyHitObjectType.Spinner | LegacyHitObjectType.NewCombo;
+                    type |= LegacyHitObjectType.Spinner;
                     break;
 
                 default:

From 516e6a4bb10586bfa3505bf776f7ab263d6a8ddd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 15:05:24 +0900
Subject: [PATCH 02331/10326] Fix overlapping control points not written
 correctly

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index f1f0a0a5de..44ccbb350d 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Beatmaps.Formats
             handleEvents(writer);
 
             writer.WriteLine();
-            handleTimingPoints(writer);
+            handleControlPoints(writer);
 
             writer.WriteLine();
             handleHitObjects(writer);
@@ -139,7 +139,7 @@ namespace osu.Game.Beatmaps.Formats
                 writer.WriteLine(FormattableString.Invariant($"{(int)LegacyEventType.Break},{b.StartTime},{b.EndTime}"));
         }
 
-        private void handleTimingPoints(TextWriter writer)
+        private void handleControlPoints(TextWriter writer)
         {
             if (beatmap.ControlPointInfo.Groups.Count == 0)
                 return;
@@ -148,17 +148,27 @@ namespace osu.Game.Beatmaps.Formats
 
             foreach (var group in beatmap.ControlPointInfo.Groups)
             {
-                var timingPoint = group.ControlPoints.OfType<TimingControlPoint>().FirstOrDefault();
-                var difficultyPoint = beatmap.ControlPointInfo.DifficultyPointAt(group.Time);
-                var samplePoint = beatmap.ControlPointInfo.SamplePointAt(group.Time);
-                var effectPoint = beatmap.ControlPointInfo.EffectPointAt(group.Time);
+                var groupTimingPoint = group.ControlPoints.OfType<TimingControlPoint>().FirstOrDefault();
 
-                // Convert beat length the legacy format
-                double beatLength;
-                if (timingPoint != null)
-                    beatLength = timingPoint.BeatLength;
-                else
-                    beatLength = -100 / difficultyPoint.SpeedMultiplier;
+                // If the group contains a timing control point, it needs to be output separately.
+                if (groupTimingPoint != null)
+                {
+                    writer.Write(FormattableString.Invariant($"{groupTimingPoint.Time},"));
+                    writer.Write(FormattableString.Invariant($"{groupTimingPoint.BeatLength},"));
+                    outputControlPointEffectsAt(groupTimingPoint.Time, true);
+                }
+
+                // Output any remaining effects as secondary non-timing control point.
+                var difficultyPoint = beatmap.ControlPointInfo.DifficultyPointAt(group.Time);
+                writer.Write(FormattableString.Invariant($"{group.Time},"));
+                writer.Write(FormattableString.Invariant($"{-100 / difficultyPoint.SpeedMultiplier},"));
+                outputControlPointEffectsAt(group.Time, false);
+            }
+
+            void outputControlPointEffectsAt(double time, bool isTimingPoint)
+            {
+                var samplePoint = beatmap.ControlPointInfo.SamplePointAt(time);
+                var effectPoint = beatmap.ControlPointInfo.EffectPointAt(time);
 
                 // Apply the control point to a hit sample to uncover legacy properties (e.g. suffix)
                 HitSampleInfo tempHitSample = samplePoint.ApplyTo(new ConvertHitObjectParser.LegacyHitSampleInfo());
@@ -170,13 +180,11 @@ namespace osu.Game.Beatmaps.Formats
                 if (effectPoint.OmitFirstBarLine)
                     effectFlags |= LegacyEffectFlags.OmitFirstBarLine;
 
-                writer.Write(FormattableString.Invariant($"{group.Time},"));
-                writer.Write(FormattableString.Invariant($"{beatLength},"));
-                writer.Write(FormattableString.Invariant($"{(int)beatmap.ControlPointInfo.TimingPointAt(group.Time).TimeSignature},"));
+                writer.Write(FormattableString.Invariant($"{(int)beatmap.ControlPointInfo.TimingPointAt(time).TimeSignature},"));
                 writer.Write(FormattableString.Invariant($"{(int)toLegacySampleBank(tempHitSample.Bank)},"));
                 writer.Write(FormattableString.Invariant($"{toLegacyCustomSampleBank(tempHitSample)},"));
                 writer.Write(FormattableString.Invariant($"{tempHitSample.Volume},"));
-                writer.Write(FormattableString.Invariant($"{(timingPoint != null ? '1' : '0')},"));
+                writer.Write(FormattableString.Invariant($"{(isTimingPoint ? '1' : '0')},"));
                 writer.Write(FormattableString.Invariant($"{(int)effectFlags}"));
                 writer.WriteLine();
             }

From d27ca725f946d7a85da2c37bbb9ee53bd5efb95e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 08:51:21 +0900
Subject: [PATCH 02332/10326] Use IEnumerable<T> instead

---
 osu.Game/IO/Serialization/Converters/TypedListConverter.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
index 837650eb0a..64f1ebeb1a 100644
--- a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
+++ b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -62,7 +61,7 @@ namespace osu.Game.IO.Serialization.Converters
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            var list = (IList)value;
+            var list = (IEnumerable<T>)value;
 
             var lookupTable = new List<string>();
             var objects = new List<JObject>();

From ee278a2e1bd3e460a7092e2348c84f0d305f8cb3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 15:55:36 +0900
Subject: [PATCH 02333/10326] Add taiko/catch/mania sample beatmaps

---
 .../Resources/sample-beatmap-catch.osu        | 30 +++++++++++++
 .../Resources/sample-beatmap-mania.osu        | 39 +++++++++++++++++
 .../Resources/sample-beatmap-taiko.osu        | 42 +++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/sample-beatmap-catch.osu
 create mode 100644 osu.Game.Tests/Resources/sample-beatmap-mania.osu
 create mode 100644 osu.Game.Tests/Resources/sample-beatmap-taiko.osu

diff --git a/osu.Game.Tests/Resources/sample-beatmap-catch.osu b/osu.Game.Tests/Resources/sample-beatmap-catch.osu
new file mode 100644
index 0000000000..09ef762e3e
--- /dev/null
+++ b/osu.Game.Tests/Resources/sample-beatmap-catch.osu
@@ -0,0 +1,30 @@
+osu file format v14
+
+[General]
+SampleSet: Normal
+StackLeniency: 0.7
+Mode: 2
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:5
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:3.59999990463257
+SliderTickRate:2
+
+[TimingPoints]
+24,352.941176470588,4,1,1,100,1,0
+6376,-50,4,1,1,100,0,0
+
+[HitObjects]
+32,183,24,5,0,0:0:0:0:
+106,123,200,1,10,0:0:0:0:
+199,108,376,1,2,0:0:0:0:
+305,105,553,5,4,0:0:0:0:
+386,112,729,1,14,0:0:0:0:
+486,197,906,5,12,0:0:0:0:
+14,199,1082,2,0,L|473:198,1,449.999988079071
+14,199,1700,6,6,P|248:33|490:222,1,629.9999833107,0|8,0:0|0:0,0:0:0:0:
+10,190,2494,2,8,B|252:29|254:335|468:167,1,449.999988079071,10|12,0:0|0:0,0:0:0:0:
+256,192,3112,12,0,3906,0:0:0:0:
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/sample-beatmap-mania.osu b/osu.Game.Tests/Resources/sample-beatmap-mania.osu
new file mode 100644
index 0000000000..04d6a31ab6
--- /dev/null
+++ b/osu.Game.Tests/Resources/sample-beatmap-mania.osu
@@ -0,0 +1,39 @@
+osu file format v14
+
+[General]
+SampleSet: Normal
+StackLeniency: 0.7
+Mode: 3
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:5
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:3.59999990463257
+SliderTickRate:2
+
+[TimingPoints]
+24,352.941176470588,4,1,1,100,1,0
+6376,-50,4,1,1,100,0,0
+
+[HitObjects]
+51,192,24,1,0,0:0:0:0:
+153,192,200,1,0,0:0:0:0:
+358,192,376,1,0,0:0:0:0:
+460,192,553,1,0,0:0:0:0:
+460,192,729,128,0,1435:0:0:0:0:
+358,192,906,128,0,1612:0:0:0:0:
+256,192,1082,128,0,1788:0:0:0:0:
+153,192,1259,128,0,1965:0:0:0:0:
+51,192,1435,128,0,2141:0:0:0:0:
+51,192,2318,1,12,0:0:0:0:
+153,192,2318,1,4,0:0:0:0:
+256,192,2318,1,6,0:0:0:0:
+358,192,2318,1,14,0:0:0:0:
+460,192,2318,1,0,0:0:0:0:
+51,192,2494,128,0,2582:0:0:0:0:
+153,192,2494,128,14,2582:0:0:0:0:
+256,192,2494,128,6,2582:0:0:0:0:
+358,192,2494,128,4,2582:0:0:0:0:
+460,192,2494,128,12,2582:0:0:0:0:
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/sample-beatmap-taiko.osu b/osu.Game.Tests/Resources/sample-beatmap-taiko.osu
new file mode 100644
index 0000000000..94b4288336
--- /dev/null
+++ b/osu.Game.Tests/Resources/sample-beatmap-taiko.osu
@@ -0,0 +1,42 @@
+osu file format v14
+
+[General]
+SampleSet: Normal
+StackLeniency: 0.7
+Mode: 1
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:5
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:3.59999990463257
+SliderTickRate:2
+
+[TimingPoints]
+24,352.941176470588,4,1,1,100,1,0
+6376,-50,4,1,1,100,0,0
+
+[HitObjects]
+231,129,24,1,0,0:0:0:0:
+231,129,200,1,0,0:0:0:0:
+231,129,376,1,0,0:0:0:0:
+231,129,553,1,0,0:0:0:0:
+231,129,729,1,0,0:0:0:0:
+373,132,906,1,4,0:0:0:0:
+373,132,1082,1,4,0:0:0:0:
+373,132,1259,1,4,0:0:0:0:
+373,132,1435,1,4,0:0:0:0:
+231,129,1788,1,8,0:0:0:0:
+231,129,1964,1,8,0:0:0:0:
+231,129,2140,1,8,0:0:0:0:
+231,129,2317,1,8,0:0:0:0:
+231,129,2493,1,8,0:0:0:0:
+373,132,2670,1,12,0:0:0:0:
+373,132,2846,1,12,0:0:0:0:
+373,132,3023,1,12,0:0:0:0:
+373,132,3199,1,12,0:0:0:0:
+51,189,3553,2,0,L|150:188,1,89.9999976158143
+52,191,3906,2,0,L|512:189,1,449.999988079071
+26,196,4612,2,4,L|501:195,1,449.999988079071
+17,242,5318,2,10,P|250:69|495:243,1,629.9999833107,0|8,0:0|0:0,0:0:0:0:
\ No newline at end of file

From ea0ebc8527035e4884acebd77e5cad73de3200e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 16:04:58 +0900
Subject: [PATCH 02334/10326] Implement beatmap encoding for all legacy
 rulesets

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 53 ++++++++++++-------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 44ccbb350d..af0adb65a5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
+using osuTK;
 
 namespace osu.Game.Beatmaps.Formats
 {
@@ -197,32 +198,40 @@ namespace osu.Game.Beatmaps.Formats
 
             writer.WriteLine("[HitObjects]");
 
-            // TODO: implement other legacy rulesets
+            foreach (var h in beatmap.HitObjects)
+                handleHitObject(writer, h);
+        }
+
+        private void handleHitObject(TextWriter writer, HitObject hitObject)
+        {
+            Vector2 position = new Vector2(256, 192);
+
             switch (beatmap.BeatmapInfo.RulesetID)
             {
                 case 0:
-                    foreach (var h in beatmap.HitObjects)
-                        handleOsuHitObject(writer, h);
+                    position = ((IHasPosition)hitObject).Position;
+                    break;
+
+                case 2:
+                    position.X = ((IHasXPosition)hitObject).X * 512;
+                    break;
+
+                case 3:
+                    int totalColumns = (int)Math.Max(1, beatmap.BeatmapInfo.BaseDifficulty.CircleSize);
+                    position.X = (int)Math.Ceiling(((IHasXPosition)hitObject).X * (512f / totalColumns));
                     break;
             }
-        }
 
-        private void handleOsuHitObject(TextWriter writer, HitObject hitObject)
-        {
-            var positionData = (IHasPosition)hitObject;
-
-            writer.Write(FormattableString.Invariant($"{positionData.X},"));
-            writer.Write(FormattableString.Invariant($"{positionData.Y},"));
+            writer.Write(FormattableString.Invariant($"{position.X},"));
+            writer.Write(FormattableString.Invariant($"{position.Y},"));
             writer.Write(FormattableString.Invariant($"{hitObject.StartTime},"));
             writer.Write(FormattableString.Invariant($"{(int)getObjectType(hitObject)},"));
 
-            writer.Write(hitObject is IHasCurve
-                ? FormattableString.Invariant($"0,")
-                : FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
+            writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
 
             if (hitObject is IHasCurve curveData)
             {
-                addCurveData(writer, curveData, positionData);
+                addCurveData(writer, curveData, position);
                 writer.Write(getSampleBank(hitObject.Samples, zeroBanks: true));
             }
             else
@@ -237,11 +246,15 @@ namespace osu.Game.Beatmaps.Formats
 
         private static LegacyHitObjectType getObjectType(HitObject hitObject)
         {
-            var comboData = (IHasCombo)hitObject;
+            LegacyHitObjectType type = 0;
 
-            var type = (LegacyHitObjectType)(comboData.ComboOffset << 4);
+            if (hitObject is IHasCombo combo)
+            {
+                type = (LegacyHitObjectType)(combo.ComboOffset << 4);
 
-            if (comboData.NewCombo) type |= LegacyHitObjectType.NewCombo;
+                if (combo.NewCombo)
+                    type |= LegacyHitObjectType.NewCombo;
+            }
 
             switch (hitObject)
             {
@@ -261,7 +274,7 @@ namespace osu.Game.Beatmaps.Formats
             return type;
         }
 
-        private void addCurveData(TextWriter writer, IHasCurve curveData, IHasPosition positionData)
+        private void addCurveData(TextWriter writer, IHasCurve curveData, Vector2 position)
         {
             PathType? lastType = null;
 
@@ -297,13 +310,13 @@ namespace osu.Game.Beatmaps.Formats
                     else
                     {
                         // New segment with the same type - duplicate the control point
-                        writer.Write(FormattableString.Invariant($"{positionData.X + point.Position.Value.X}:{positionData.Y + point.Position.Value.Y}|"));
+                        writer.Write(FormattableString.Invariant($"{position.X + point.Position.Value.X}:{position.Y + point.Position.Value.Y}|"));
                     }
                 }
 
                 if (i != 0)
                 {
-                    writer.Write(FormattableString.Invariant($"{positionData.X + point.Position.Value.X}:{positionData.Y + point.Position.Value.Y}"));
+                    writer.Write(FormattableString.Invariant($"{position.X + point.Position.Value.X}:{position.Y + point.Position.Value.Y}"));
                     writer.Write(i != curveData.Path.ControlPoints.Count - 1 ? "|" : ",");
                 }
             }

From d957614fc96fe142dccaeec1030de08e3f4c7453 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 16:33:19 +0900
Subject: [PATCH 02335/10326] Cleanup handling of mania samples

---
 .../Beatmaps/ManiaBeatmapConverter.cs         | 21 +--------
 .../Legacy/DistanceObjectPatternGenerator.cs  | 10 ++--
 .../Legacy/EndTimeObjectPatternGenerator.cs   | 15 ++----
 .../Objects/Drawables/DrawableHoldNote.cs     |  5 ++
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   | 46 +++++++++++++++----
 5 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 4187e39b43..b803caa1b7 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -238,9 +238,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                     {
                         StartTime = HitObject.StartTime,
                         Duration = endTimeData.Duration,
-                        Column = column,
-                        Head = { Samples = sampleInfoListAt(HitObject.StartTime) },
-                        Tail = { Samples = sampleInfoListAt(endTimeData.EndTime) },
+                        Samples = HitObject.Samples,
+                        NodeSamples = (HitObject as IHasRepeats)?.NodeSamples
                     });
                 }
                 else if (HitObject is IHasXPosition)
@@ -255,22 +254,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                 return pattern;
             }
-
-            /// <summary>
-            /// Retrieves the sample info list at a point in time.
-            /// </summary>
-            /// <param name="time">The time to retrieve the sample info list from.</param>
-            /// <returns></returns>
-            private IList<HitSampleInfo> sampleInfoListAt(double time)
-            {
-                if (!(HitObject is IHasCurve curveData))
-                    return HitObject.Samples;
-
-                double segmentTime = (curveData.EndTime - HitObject.StartTime) / curveData.SpanCount();
-
-                int index = (int)(segmentTime == 0 ? 0 : (time - HitObject.StartTime) / segmentTime);
-                return curveData.NodeSamples[index];
-            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 315ef96e49..d8d5b67c0e 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -505,16 +505,14 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             }
             else
             {
-                var holdNote = new HoldNote
+                newObject = new HoldNote
                 {
                     StartTime = startTime,
-                    Column = column,
                     Duration = endTime - startTime,
-                    Head = { Samples = sampleInfoListAt(startTime) },
-                    Tail = { Samples = sampleInfoListAt(endTime) }
+                    Column = column,
+                    Samples = HitObject.Samples,
+                    NodeSamples = (HitObject as IHasRepeats)?.NodeSamples
                 };
-
-                newObject = holdNote;
             }
 
             pattern.Add(newObject);
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
index b3be08e1f7..907bed0d65 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -64,21 +64,14 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (holdNote)
             {
-                var hold = new HoldNote
+                newObject = new HoldNote
                 {
                     StartTime = HitObject.StartTime,
+                    Duration = endTime - HitObject.StartTime,
                     Column = column,
-                    Duration = endTime - HitObject.StartTime
+                    Samples = HitObject.Samples,
+                    NodeSamples = (HitObject as IHasRepeats)?.NodeSamples
                 };
-
-                if (hold.Head.Samples == null)
-                    hold.Head.Samples = new List<HitSampleInfo>();
-
-                hold.Head.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_NORMAL });
-
-                hold.Tail.Samples = HitObject.Samples;
-
-                newObject = hold;
             }
             else
             {
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index a9ef661aaa..bc3a136a6a 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -127,6 +127,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             bodyPiece.Anchor = bodyPiece.Origin = e.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
         }
 
+        public override void PlaySamples()
+        {
+            // The hold note does not play samples itself.
+        }
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 049bf55f90..04f8fd8c99 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.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 osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
@@ -28,7 +30,9 @@ namespace osu.Game.Rulesets.Mania.Objects
             set
             {
                 duration = value;
-                Tail.StartTime = EndTime;
+
+                if (Tail != null)
+                    Tail.StartTime = EndTime;
             }
         }
 
@@ -38,8 +42,12 @@ namespace osu.Game.Rulesets.Mania.Objects
             set
             {
                 base.StartTime = value;
-                Head.StartTime = value;
-                Tail.StartTime = EndTime;
+
+                if (Head != null)
+                    Head.StartTime = value;
+
+                if (Tail != null)
+                    Tail.StartTime = EndTime;
             }
         }
 
@@ -49,20 +57,26 @@ namespace osu.Game.Rulesets.Mania.Objects
             set
             {
                 base.Column = value;
-                Head.Column = value;
-                Tail.Column = value;
+
+                if (Head != null)
+                    Head.Column = value;
+
+                if (Tail != null)
+                    Tail.Column = value;
             }
         }
 
+        public List<IList<HitSampleInfo>> NodeSamples { get; set; }
+
         /// <summary>
         /// The head note of the hold.
         /// </summary>
-        public readonly Note Head = new Note();
+        public Note Head { get; private set; }
 
         /// <summary>
         /// The tail note of the hold.
         /// </summary>
-        public readonly TailNote Tail = new TailNote();
+        public TailNote Tail { get; private set; }
 
         /// <summary>
         /// The time between ticks of this hold.
@@ -83,8 +97,19 @@ namespace osu.Game.Rulesets.Mania.Objects
 
             createTicks();
 
-            AddNested(Head);
-            AddNested(Tail);
+            AddNested(Head = new Note
+            {
+                StartTime = StartTime,
+                Column = Column,
+                Samples = getNodeSamples(0),
+            });
+
+            AddNested(Tail = new TailNote
+            {
+                StartTime = EndTime,
+                Column = Column,
+                Samples = getNodeSamples(1),
+            });
         }
 
         private void createTicks()
@@ -105,5 +130,8 @@ namespace osu.Game.Rulesets.Mania.Objects
         public override Judgement CreateJudgement() => new IgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        private IList<HitSampleInfo> getNodeSamples(int nodeIndex) =>
+            nodeIndex < NodeSamples?.Count ? NodeSamples[nodeIndex] : Samples;
     }
 }

From cc0c82aaebac82c2d3a7eb1844eac44dab47da31 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 16:44:26 +0900
Subject: [PATCH 02336/10326] Implement IHasXPosition on ManiaHitObject

---
 .../Beatmaps/ManiaBeatmapConverter.cs                    | 3 +--
 osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs        | 9 ++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index b803caa1b7..cb583ac1a9 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -13,7 +13,6 @@ using osu.Game.Rulesets.Mania.Beatmaps.Patterns;
 using osu.Game.Rulesets.Mania.MathUtils;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy;
 using osuTK;
-using osu.Game.Audio;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps
 {
@@ -67,7 +66,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             }
         }
 
-        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition || h is ManiaHitObject);
+        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition);
 
         protected override Beatmap<ManiaHitObject> ConvertBeatmap(IBeatmap original)
         {
diff --git a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
index 995e1516cb..27bf50493d 100644
--- a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
@@ -5,11 +5,12 @@ using osu.Framework.Bindables;
 using osu.Game.Rulesets.Mania.Objects.Types;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Objects
 {
-    public abstract class ManiaHitObject : HitObject, IHasColumn
+    public abstract class ManiaHitObject : HitObject, IHasColumn, IHasXPosition
     {
         public readonly Bindable<int> ColumnBindable = new Bindable<int>();
 
@@ -20,5 +21,11 @@ namespace osu.Game.Rulesets.Mania.Objects
         }
 
         protected override HitWindows CreateHitWindows() => new ManiaHitWindows();
+
+        #region LegacyBeatmapEncoder
+
+        float IHasXPosition.X => Column;
+
+        #endregion
     }
 }

From d8fdd73e170e8117961a3da8d1ef31e85738c9c2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 16:45:01 +0900
Subject: [PATCH 02337/10326] Implement IHasCurve on DrumRoll

---
 .../Beatmaps/TaikoBeatmapConverter.cs         |  6 ++--
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs   | 29 ++++++++++++++++++-
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  |  8 +++--
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 695ada3a00..caf645d5a2 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
         /// osu! is generally slower than taiko, so a factor is added to increase
         /// speed. This must be used everywhere slider length or beat length is used.
         /// </summary>
-        private const float legacy_velocity_multiplier = 1.4f;
+        public const float LEGACY_VELOCITY_MULTIPLIER = 1.4f;
 
         /// <summary>
         /// Because swells are easier in taiko than spinners are in osu!,
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             // Rewrite the beatmap info to add the slider velocity multiplier
             original.BeatmapInfo = original.BeatmapInfo.Clone();
             original.BeatmapInfo.BaseDifficulty = original.BeatmapInfo.BaseDifficulty.Clone();
-            original.BeatmapInfo.BaseDifficulty.SliderMultiplier *= legacy_velocity_multiplier;
+            original.BeatmapInfo.BaseDifficulty.SliderMultiplier *= LEGACY_VELOCITY_MULTIPLIER;
 
             Beatmap<TaikoHitObject> converted = base.ConvertBeatmap(original);
 
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                     double speedAdjustedBeatLength = timingPoint.BeatLength / speedAdjustment;
 
                     // The true distance, accounting for any repeats. This ends up being the drum roll distance later
-                    double distance = distanceData.Distance * spans * legacy_velocity_multiplier;
+                    double distance = distanceData.Distance * spans * LEGACY_VELOCITY_MULTIPLIER;
 
                     // The velocity of the taiko hit object - calculated as the velocity of a drum roll
                     double taikoVelocity = taiko_base_distance * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier / speedAdjustedBeatLength;
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index aacd78f176..ad0cd2f2a8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -3,15 +3,20 @@
 
 using osu.Game.Rulesets.Objects.Types;
 using System;
+using System.Collections.Generic;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Beatmaps;
 using osu.Game.Rulesets.Taiko.Judgements;
+using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoHitObject, IHasEndTime
+    public class DrumRoll : TaikoHitObject, IHasEndTime, IHasCurve
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
@@ -26,6 +31,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public double Duration { get; set; }
 
+        /// <summary>
+        /// Velocity of this <see cref="DrumRoll"/>.
+        /// </summary>
+        public double Velocity { get; private set; }
+
         /// <summary>
         /// Numer of ticks per beat length.
         /// </summary>
@@ -54,6 +64,10 @@ namespace osu.Game.Rulesets.Taiko.Objects
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
+            DifficultyControlPoint difficultyPoint = controlPointInfo.DifficultyPointAt(StartTime);
+
+            double scoringDistance = base_distance * difficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier;
+            Velocity = scoringDistance / timingPoint.BeatLength;
 
             tickSpacing = timingPoint.BeatLength / TickRate;
             overallDifficulty = difficulty.OverallDifficulty;
@@ -93,5 +107,18 @@ namespace osu.Game.Rulesets.Taiko.Objects
         public override Judgement CreateJudgement() => new TaikoDrumRollJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        #region LegacyBeatmapEncoder
+
+        double IHasDistance.Distance => Duration * Velocity;
+
+        int IHasRepeats.RepeatCount { get => 0; set { } }
+
+        List<IList<HitSampleInfo>> IHasRepeats.NodeSamples => new List<IList<HitSampleInfo>>();
+
+        SliderPath IHasCurve.Path
+            => new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(1) }, ((IHasDistance)this).Distance / TaikoBeatmapConverter.LEGACY_VELOCITY_MULTIPLIER);
+
+        #endregion
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index af0adb65a5..4b760f1983 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -125,7 +125,12 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine(FormattableString.Invariant($"CircleSize: {beatmap.BeatmapInfo.BaseDifficulty.CircleSize}"));
             writer.WriteLine(FormattableString.Invariant($"OverallDifficulty: {beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty}"));
             writer.WriteLine(FormattableString.Invariant($"ApproachRate: {beatmap.BeatmapInfo.BaseDifficulty.ApproachRate}"));
-            writer.WriteLine(FormattableString.Invariant($"SliderMultiplier: {beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier}"));
+
+            // Taiko adjusts the slider multiplier (see: TaikoBeatmapConverter.LEGACY_VELOCITY_MULTIPLIER)
+            writer.WriteLine(beatmap.BeatmapInfo.RulesetID == 1
+                ? FormattableString.Invariant($"SliderMultiplier: {beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier / 1.4f}")
+                : FormattableString.Invariant($"SliderMultiplier: {beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier}"));
+
             writer.WriteLine(FormattableString.Invariant($"SliderTickRate: {beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate}"));
         }
 
@@ -226,7 +231,6 @@ namespace osu.Game.Beatmaps.Formats
             writer.Write(FormattableString.Invariant($"{position.Y},"));
             writer.Write(FormattableString.Invariant($"{hitObject.StartTime},"));
             writer.Write(FormattableString.Invariant($"{(int)getObjectType(hitObject)},"));
-
             writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
 
             if (hitObject is IHasCurve curveData)

From 1f962f5c563d80f40208aa8f5e8fa0d1b54389d9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 17:20:37 +0900
Subject: [PATCH 02338/10326] Reword comment

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index bc3a136a6a..770dd73e7a 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public override void PlaySamples()
         {
-            // The hold note does not play samples itself.
+            // Samples are played by the head/tail notes.
         }
 
         protected override void Update()

From 6da0872ae55d9b07d2d1fe55a4db02455b18a9a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 17:29:23 +0900
Subject: [PATCH 02339/10326] Use the last node sample for the tail note

---
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 04f8fd8c99..eea2c31260 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Mania.Objects
             {
                 StartTime = EndTime,
                 Column = Column,
-                Samples = getNodeSamples(1),
+                Samples = getNodeSamples((NodeSamples?.Count - 1) ?? 1),
             });
         }
 

From ba12e23d9eed0b48effa40f7734c1485adfa91cd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 17:31:49 +0900
Subject: [PATCH 02340/10326] Fix inspection

---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index ad0cd2f2a8..dc2f277e58 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -16,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoHitObject, IHasEndTime, IHasCurve
+    public class DrumRoll : TaikoHitObject, IHasCurve
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.

From 0c74f1aaa91c70e7984bbe9c93b68509d6b09d38 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Apr 2020 09:08:33 +0900
Subject: [PATCH 02341/10326] Fix now playing output showing empty brackets
 when no difficulty specified

---
 osu.Game/Beatmaps/BeatmapInfo.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 68d113ce40..90c100db05 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -149,7 +149,12 @@ namespace osu.Game.Beatmaps
             }
         }
 
-        public override string ToString() => $"{Metadata} [{Version}]".Trim();
+        public override string ToString()
+        {
+            string version = string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
+
+            return $"{Metadata} {version}".Trim();
+        }
 
         public bool Equals(BeatmapInfo other)
         {

From 360c9f8e387bffbb2d4d19d07465d412d0d94e75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Apr 2020 09:19:34 +0900
Subject: [PATCH 02342/10326] Add test coverage and handle null creator

---
 .../Beatmaps/ToStringFormattingTest.cs        | 61 +++++++++++++++++++
 osu.Game/Beatmaps/BeatmapMetadata.cs          |  6 +-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Beatmaps/ToStringFormattingTest.cs

diff --git a/osu.Game.Tests/Beatmaps/ToStringFormattingTest.cs b/osu.Game.Tests/Beatmaps/ToStringFormattingTest.cs
new file mode 100644
index 0000000000..c477bbd9cf
--- /dev/null
+++ b/osu.Game.Tests/Beatmaps/ToStringFormattingTest.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 NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Beatmaps
+{
+    [TestFixture]
+    public class ToStringFormattingTest
+    {
+        [Test]
+        public void TestArtistTitle()
+        {
+            var beatmap = new BeatmapInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Artist = "artist",
+                    Title = "title"
+                }
+            };
+
+            Assert.That(beatmap.ToString(), Is.EqualTo("artist - title"));
+        }
+
+        [Test]
+        public void TestArtistTitleCreator()
+        {
+            var beatmap = new BeatmapInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Artist = "artist",
+                    Title = "title",
+                    Author = new User { Username = "creator" }
+                }
+            };
+
+            Assert.That(beatmap.ToString(), Is.EqualTo("artist - title (creator)"));
+        }
+
+        [Test]
+        public void TestArtistTitleCreatorDifficulty()
+        {
+            var beatmap = new BeatmapInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Artist = "artist",
+                    Title = "title",
+                    Author = new User { Username = "creator" }
+                },
+                Version = "difficulty"
+            };
+
+            Assert.That(beatmap.ToString(), Is.EqualTo("artist - title (creator) [difficulty]"));
+        }
+    }
+}
diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 001f319307..775d78f1fb 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -53,7 +53,11 @@ namespace osu.Game.Beatmaps
         public string AudioFile { get; set; }
         public string BackgroundFile { get; set; }
 
-        public override string ToString() => $"{Artist} - {Title} ({Author})";
+        public override string ToString()
+        {
+            string author = Author == null ? string.Empty : $"({Author})";
+            return $"{Artist} - {Title} {author}".Trim();
+        }
 
         [JsonIgnore]
         public string[] SearchableTerms => new[]

From 95de2c6f7f9d82a6c8c72e94280d8b7257766ad7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 22 Apr 2020 05:04:07 +0300
Subject: [PATCH 02343/10326] Mark Catcher.additiveTarget to never be null

And provide empty containers instead.
---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs              | 3 ++-
 .../Difficulty/CatchDifficultyCalculator.cs                    | 3 ++-
 osu.Game.Rulesets.Catch/UI/Catcher.cs                          | 3 ++-
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs                      | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index acc5f4e428..3a3e664690 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -23,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new Catcher
+            SetContents(() => new Catcher(new Container())
             {
                 RelativePositionAxes = Axes.None,
                 Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 4d9dbbbc5f..fbdf437b7b 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Catch.Difficulty.Skills;
@@ -71,7 +72,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
         protected override Skill[] CreateSkills(IBeatmap beatmap)
         {
-            using (var catcher = new Catcher(beatmap.BeatmapInfo.BaseDifficulty))
+            using (var catcher = new Catcher(new Container(), beatmap.BeatmapInfo.BaseDifficulty))
                 halfCatcherWidth = catcher.CatchWidth * 0.5f;
 
             return new Skill[]
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 7ecb245617..029de2cac0 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
@@ -116,7 +117,7 @@ namespace osu.Game.Rulesets.Catch.UI
         private int hyperDashDirection;
         private float hyperDashTargetPosition;
 
-        public Catcher(BeatmapDifficulty difficulty = null, Container additiveTarget = null)
+        public Catcher([NotNull] Container additiveTarget, BeatmapDifficulty difficulty = null)
         {
             this.additiveTarget = additiveTarget;
 
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 1dd94afa9e..37d177b936 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             RelativeSizeAxes = Axes.X;
             Height = CATCHER_SIZE;
-            Child = MovableCatcher = new Catcher(difficulty, this);
+            Child = MovableCatcher = new Catcher(this, difficulty);
         }
 
         public static float GetCatcherSize(BeatmapDifficulty difficulty)

From 9ab0f6d8bc5a160f9859305a4a70e3d889f644ec Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 22 Apr 2020 05:12:29 +0300
Subject: [PATCH 02344/10326] Separate trail-related logic to its own container

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs         | 120 ++++-----------
 .../UI/CatcherTrailDisplay.cs                 | 137 ++++++++++++++++++
 2 files changed, 168 insertions(+), 89 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 029de2cac0..e30988d8f7 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -8,7 +8,6 @@ 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;
@@ -37,6 +36,11 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </remarks>
         public static readonly Color4 DEFAULT_CATCHER_HYPER_DASH_COLOUR = Color4.OrangeRed;
 
+        /// <summary>
+        /// The duration between transitioning to hyper-dash state.
+        /// </summary>
+        public const double HYPER_DASH_TRANSITION_DURATION = 180;
+
         /// <summary>
         /// Whether we are hyper-dashing or not.
         /// </summary>
@@ -49,10 +53,10 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public Container ExplodingFruitTarget;
 
-        private readonly Container additiveTarget;
-        private Container<CatcherTrailSprite> dashTrails;
-        private Container<CatcherTrailSprite> hyperDashTrails;
-        private Container<CatcherTrailSprite> endGlowSprites;
+        [NotNull]
+        private readonly Container trailsTarget;
+
+        private CatcherTrailDisplay trails;
 
         public CatcherAnimationState CurrentState { get; private set; }
 
@@ -66,33 +70,23 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         internal float CatchWidth => CatcherArea.CATCHER_SIZE * Math.Abs(Scale.X) * allowed_catch_range;
 
-        protected bool Dashing
+        /// <summary>
+        /// The drawable catcher for <see cref="CurrentState"/>.
+        /// </summary>
+        internal Drawable CurrentDrawableCatcher => currentCatcher.Drawable;
+
+        private bool dashing;
+
+        public bool Dashing
         {
             get => dashing;
-            set
+            protected set
             {
                 if (value == dashing) return;
 
                 dashing = value;
 
-                Trail |= dashing;
-            }
-        }
-
-        /// <summary>
-        /// 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 || additiveTarget == null) return;
-
-                trail = value;
-
-                if (Trail)
-                    beginTrail();
+                trails.DisplayTrail |= dashing;
             }
         }
 
@@ -109,17 +103,13 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private int currentDirection;
 
-        private bool dashing;
-
-        private bool trail;
-
         private double hyperDashModifier = 1;
         private int hyperDashDirection;
         private float hyperDashTargetPosition;
 
-        public Catcher([NotNull] Container additiveTarget, BeatmapDifficulty difficulty = null)
+        public Catcher([NotNull] Container trailsTarget, BeatmapDifficulty difficulty = null)
         {
-            this.additiveTarget = additiveTarget;
+            this.trailsTarget = trailsTarget;
 
             RelativePositionAxes = Axes.X;
             X = 0.5f;
@@ -158,12 +148,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 }
             };
 
-            additiveTarget?.AddRange(new[]
-            {
-                dashTrails = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both },
-                hyperDashTrails = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashColour },
-                endGlowSprites = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = hyperDashEndGlowColour }
-            });
+            trailsTarget.Add(trails = new CatcherTrailDisplay(this));
 
             updateCatcher();
         }
@@ -257,7 +242,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 if (wasHyperDashing)
                 {
                     updateCatcherColour(false);
-                    Trail &= Dashing;
+                    trails.DisplayTrail &= Dashing;
                 }
             }
             else
@@ -269,21 +254,15 @@ namespace osu.Game.Rulesets.Catch.UI
                 if (!wasHyperDashing)
                 {
                     updateCatcherColour(true);
-                    Trail = true;
 
-                    var hyperDashEndGlow = createAdditiveSprite(endGlowSprites);
-                    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);
+                    trails.DisplayTrail = true;
+                    trails.DisplayEndGlow();
                 }
             }
         }
 
         private void updateCatcherColour(bool hyperDashing)
         {
-            const float hyper_dash_transition_length = 180;
-
             if (hyperDashing)
             {
                 // special behaviour for catcher colour if no skin overrides.
@@ -292,17 +271,17 @@ namespace osu.Game.Rulesets.Catch.UI
                         ? DEFAULT_CATCHER_HYPER_DASH_COLOUR
                         : hyperDashColour;
 
-                this.FadeColour(catcherColour, hyper_dash_transition_length, Easing.OutQuint);
-                this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint);
+                this.FadeColour(catcherColour, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+                this.FadeTo(0.2f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
             }
             else
             {
-                this.FadeColour(Color4.White, hyper_dash_transition_length, Easing.OutQuint);
-                this.FadeTo(1f, hyper_dash_transition_length, Easing.OutQuint);
+                this.FadeColour(Color4.White, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+                this.FadeTo(1f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
             }
 
-            hyperDashTrails?.FadeColour(hyperDashColour, hyper_dash_transition_length, Easing.OutQuint);
-            endGlowSprites?.FadeColour(hyperDashEndGlowColour, hyper_dash_transition_length, Easing.OutQuint);
+            trails.HyperDashTrailsColour = hyperDashColour;
+            trails.EndGlowSpritesColour = hyperDashEndGlowColour;
         }
 
         public bool OnPressed(CatchAction action)
@@ -453,22 +432,6 @@ namespace osu.Game.Rulesets.Catch.UI
             (currentCatcher.Drawable as IFramedAnimation)?.GotoFrame(0);
         }
 
-        private void beginTrail()
-        {
-            if (!dashing && !HyperDashing)
-            {
-                Trail = false;
-                return;
-            }
-
-            var additive = createAdditiveSprite(HyperDashing ? hyperDashTrails : dashTrails);
-
-            additive.FadeTo(0.4f).FadeOut(800, Easing.OutQuint);
-            additive.Expire(true);
-
-            Scheduler.AddDelayed(beginTrail, HyperDashing ? 25 : 50);
-        }
-
         private void updateState(CatcherAnimationState state)
         {
             if (CurrentState == state)
@@ -478,27 +441,6 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
-        private CatcherTrailSprite createAdditiveSprite(Container<CatcherTrailSprite> target)
-        {
-            if (target == null)
-                return null;
-
-            var tex = (currentCatcher.Drawable as TextureAnimation)?.CurrentFrame ?? ((Sprite)currentCatcher.Drawable).Texture;
-
-            var sprite = new CatcherTrailSprite(tex)
-            {
-                Anchor = Anchor,
-                Scale = Scale,
-                Blending = BlendingParameters.Additive,
-                RelativePositionAxes = RelativePositionAxes,
-                Position = Position
-            };
-
-            target.Add(sprite);
-
-            return sprite;
-        }
-
         private void removeFromPlateWithTransform(DrawableHitObject fruit, Action<DrawableHitObject> action)
         {
             if (ExplodingFruitTarget != null)
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
new file mode 100644
index 0000000000..afbfac9a51
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
@@ -0,0 +1,137 @@
+// Copyright (c) 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.Animations;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.UI
+{
+    /// <summary>
+    /// Represents a component responsible for displaying
+    /// the appropriate catcher trails when requested to.
+    /// </summary>
+    public class CatcherTrailDisplay : CompositeDrawable
+    {
+        private readonly Catcher catcher;
+
+        private readonly Container<CatcherTrailSprite> dashTrails;
+        private readonly Container<CatcherTrailSprite> hyperDashTrails;
+        private readonly Container<CatcherTrailSprite> endGlowSprites;
+
+        private Color4 hyperDashTrailsColour;
+
+        public Color4 HyperDashTrailsColour
+        {
+            get => hyperDashTrailsColour;
+            set
+            {
+                if (hyperDashTrailsColour == value)
+                    return;
+
+                hyperDashTrailsColour = value;
+                hyperDashTrails.FadeColour(hyperDashTrailsColour, Catcher.HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+            }
+        }
+
+        private Color4 endGlowSpritesColour;
+
+        public Color4 EndGlowSpritesColour
+        {
+            get => endGlowSpritesColour;
+            set
+            {
+                if (endGlowSpritesColour == value)
+                    return;
+
+                endGlowSpritesColour = value;
+                endGlowSprites.FadeColour(endGlowSpritesColour, Catcher.HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+            }
+        }
+
+        private bool trail;
+
+        /// <summary>
+        /// Whether to start displaying trails following the catcher.
+        /// </summary>
+        public bool DisplayTrail
+        {
+            get => trail;
+            set
+            {
+                if (trail == value)
+                    return;
+
+                trail = value;
+
+                if (trail)
+                    displayTrail();
+            }
+        }
+
+        public CatcherTrailDisplay(Catcher catcher)
+        {
+            this.catcher = catcher ?? throw new ArgumentNullException(nameof(catcher));
+
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new[]
+            {
+                dashTrails = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both },
+                hyperDashTrails = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR },
+                endGlowSprites = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR },
+            };
+        }
+
+        /// <summary>
+        /// Displays a single end-glow catcher sprite.
+        /// </summary>
+        public void DisplayEndGlow()
+        {
+            var endGlow = createTrailSprite(endGlowSprites);
+
+            endGlow.MoveToOffset(new Vector2(0, -10), 1200, Easing.In);
+            endGlow.ScaleTo(endGlow.Scale * 0.95f).ScaleTo(endGlow.Scale * 1.2f, 1200, Easing.In);
+            endGlow.FadeOut(1200);
+            endGlow.Expire(true);
+        }
+
+        private void displayTrail()
+        {
+            if (!catcher.Dashing && !catcher.HyperDashing)
+            {
+                DisplayTrail = false;
+                return;
+            }
+
+            var sprite = createTrailSprite(catcher.HyperDashing ? hyperDashTrails : dashTrails);
+
+            sprite.FadeTo(0.4f).FadeOut(800, Easing.OutQuint);
+            sprite.Expire(true);
+
+            Scheduler.AddDelayed(displayTrail, catcher.HyperDashing ? 25 : 50);
+        }
+
+        private CatcherTrailSprite createTrailSprite(Container<CatcherTrailSprite> target)
+        {
+            var texture = (catcher.CurrentDrawableCatcher as TextureAnimation)?.CurrentFrame ?? ((Sprite)catcher.CurrentDrawableCatcher).Texture;
+
+            var sprite = new CatcherTrailSprite(texture)
+            {
+                Anchor = catcher.Anchor,
+                Scale = catcher.Scale,
+                Blending = BlendingParameters.Additive,
+                RelativePositionAxes = catcher.RelativePositionAxes,
+                Position = catcher.Position
+            };
+
+            target.Add(sprite);
+
+            return sprite;
+        }
+    }
+}

From 5d3475a5ed32b45c6b3fca5fdd823fab0e2141f9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 22 Apr 2020 05:12:51 +0300
Subject: [PATCH 02345/10326] Retrieve CatcherTrailDisplay for asserting
 colours set correctly

---
 .../TestSceneHyperDashColouring.cs                          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 347b71f3ff..0c8ade9018 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -113,6 +113,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         private void checkHyperDashCatcherColour(ISkin skin, Color4 expectedCatcherColour, Color4? expectedEndGlowColour = null)
         {
             CatcherArea catcherArea = null;
+            CatcherTrailDisplay trails = null;
 
             AddStep("create hyper-dashing catcher", () =>
             {
@@ -123,6 +124,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     Scale = new Vector2(4f),
                 }, skin);
 
+                trails = catcherArea.OfType<CatcherTrailDisplay>().Single();
                 catcherArea.MovableCatcher.SetHyperDashState(2);
                 catcherArea.MovableCatcher.FinishTransforms();
             });
@@ -132,8 +134,8 @@ namespace osu.Game.Rulesets.Catch.Tests
                     ? catcherArea.MovableCatcher.Colour == Catcher.DEFAULT_CATCHER_HYPER_DASH_COLOUR
                     : catcherArea.MovableCatcher.Colour == expectedCatcherColour);
 
-            AddAssert("catcher trails colours are correct", () => catcherArea.OfType<Container<CatcherTrailSprite>>().Any(c => c.Colour == expectedCatcherColour));
-            AddAssert("catcher end-glow colours are correct", () => catcherArea.OfType<Container<CatcherTrailSprite>>().Any(c => c.Colour == (expectedEndGlowColour ?? expectedCatcherColour)));
+            AddAssert("catcher trails colours are correct", () => trails.HyperDashTrailsColour == expectedCatcherColour);
+            AddAssert("catcher end-glow colours are correct", () => trails.EndGlowSpritesColour == (expectedEndGlowColour ?? expectedCatcherColour));
 
             AddStep("finish hyper-dashing", () =>
             {

From 2d4077e71313c8fdb2c03bddd65db9b0a9555ae5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 22 Apr 2020 05:25:40 +0300
Subject: [PATCH 02346/10326] Reword special default hyper-dash colour constant
 a bit

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

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index e30988d8f7..08e438db56 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -29,7 +29,8 @@ namespace osu.Game.Rulesets.Catch.UI
         public static readonly Color4 DEFAULT_HYPER_DASH_COLOUR = Color4.Red;
 
         /// <summary>
-        /// The default colour used directly for this <see cref="Catcher"/>'s <see cref="Drawable.Colour"/>.
+        /// The default hyper-dash colour used directly for this
+        /// <see cref="Catcher"/>'s <see cref="Drawable.Colour"/>.
         /// </summary>
         /// <remarks>
         /// This colour is only used when no skin overrides <see cref="CatchSkinColour.HyperDash"/>.

From f841eb7e0607b19feb84b0cc896b027390128663 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 22 Apr 2020 07:27:15 +0300
Subject: [PATCH 02347/10326] Replace constructing a whole Catcher with static
 calculation methods

---
 .../Difficulty/CatchDifficultyCalculator.cs   |  3 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs         | 36 +++++++++++++++----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 4d9dbbbc5f..d99325ff87 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -71,8 +71,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
         protected override Skill[] CreateSkills(IBeatmap beatmap)
         {
-            using (var catcher = new Catcher(beatmap.BeatmapInfo.BaseDifficulty))
-                halfCatcherWidth = catcher.CatchWidth * 0.5f;
+            halfCatcherWidth = Catcher.CalculateCatchWidth(beatmap.BeatmapInfo.BaseDifficulty) * 0.5f;
 
             return new Skill[]
             {
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 920d804e72..ee806b7b99 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -44,11 +44,6 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         private const float allowed_catch_range = 0.8f;
 
-        /// <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) * allowed_catch_range;
-
         protected bool Dashing
         {
             get => dashing;
@@ -79,6 +74,11 @@ namespace osu.Game.Rulesets.Catch.UI
             }
         }
 
+        /// <summary>
+        /// Width of the area that can be used to attempt catches during gameplay.
+        /// </summary>
+        private readonly float catchWidth;
+
         private Container<DrawableHitObject> caughtFruit;
 
         private CatcherSprite catcherIdle;
@@ -106,7 +106,9 @@ namespace osu.Game.Rulesets.Catch.UI
 
             Size = new Vector2(CatcherArea.CATCHER_SIZE);
             if (difficulty != null)
-                Scale = new Vector2(1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
+                Scale = CalculateScale(difficulty);
+
+            catchWidth = CalculateCatchWidth(Scale);
         }
 
         [BackgroundDependencyLoader]
@@ -139,6 +141,26 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
+        /// <summary>
+        /// Calculates the scale of the catcher based off the provided beatmap difficulty.
+        /// </summary>
+        internal static Vector2 CalculateScale(BeatmapDifficulty difficulty)
+            => new Vector2(1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
+
+        /// <summary>
+        /// Calculates the width of the area used for attempting catches in gameplay.
+        /// </summary>
+        internal static float CalculateCatchWidth(Vector2 scale)
+            => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * allowed_catch_range;
+
+        /// <summary>
+        /// Calculates the width of the area used for attempting catches in gameplay.
+        /// </summary>
+        /// <param name="difficulty"></param>
+        /// <returns></returns>
+        internal static float CalculateCatchWidth(BeatmapDifficulty difficulty)
+            => CalculateCatchWidth(CalculateScale(difficulty));
+
         /// <summary>
         /// Add a caught fruit to the catcher's stack.
         /// </summary>
@@ -177,7 +199,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <returns>Whether the catch is possible.</returns>
         public bool AttemptCatch(CatchHitObject fruit)
         {
-            var halfCatchWidth = CatchWidth * 0.5f;
+            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;

From fccb30e031a40e08533e5ce2f862cbe81d6fc504 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 22 Apr 2020 07:36:59 +0300
Subject: [PATCH 02348/10326] Adjust documents

*whoops*
---
 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 ee806b7b99..4dace76008 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -150,14 +150,14 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
+        /// <param name="scale">The scale of the catcher.</param>
         internal static float CalculateCatchWidth(Vector2 scale)
             => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * allowed_catch_range;
 
         /// <summary>
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
-        /// <param name="difficulty"></param>
-        /// <returns></returns>
+        /// <param name="difficulty">The beatmap difficulty.</param>
         internal static float CalculateCatchWidth(BeatmapDifficulty difficulty)
             => CalculateCatchWidth(CalculateScale(difficulty));
 

From 883788dd5aec1b228328812fb4ea14043c299118 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 22 Apr 2020 07:37:49 +0300
Subject: [PATCH 02349/10326] Privatize externally-unused methods

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 4dace76008..daf9456919 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             Size = new Vector2(CatcherArea.CATCHER_SIZE);
             if (difficulty != null)
-                Scale = CalculateScale(difficulty);
+                Scale = calculateScale(difficulty);
 
             catchWidth = CalculateCatchWidth(Scale);
         }
@@ -144,7 +144,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// Calculates the scale of the catcher based off the provided beatmap difficulty.
         /// </summary>
-        internal static Vector2 CalculateScale(BeatmapDifficulty difficulty)
+        private static Vector2 calculateScale(BeatmapDifficulty difficulty)
             => new Vector2(1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
 
         /// <summary>
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         /// <param name="difficulty">The beatmap difficulty.</param>
         internal static float CalculateCatchWidth(BeatmapDifficulty difficulty)
-            => CalculateCatchWidth(CalculateScale(difficulty));
+            => CalculateCatchWidth(calculateScale(difficulty));
 
         /// <summary>
         /// Add a caught fruit to the catcher's stack.

From 58af75ad576396258285b2722dfb07d1176f7889 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 13:45:12 +0900
Subject: [PATCH 02350/10326] Add back missing line

---
 osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index cb583ac1a9..1c8116754f 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -237,6 +237,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                     {
                         StartTime = HitObject.StartTime,
                         Duration = endTimeData.Duration,
+                        Column = column,
                         Samples = HitObject.Samples,
                         NodeSamples = (HitObject as IHasRepeats)?.NodeSamples
                     });

From 7cdc9a599c6ffb39c7635e63cbf8fa57bbcb2684 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 16:27:07 +0900
Subject: [PATCH 02351/10326] Fix mania holds written as spinners

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 4b760f1983..fc853a7a68 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine();
         }
 
-        private static LegacyHitObjectType getObjectType(HitObject hitObject)
+        private LegacyHitObjectType getObjectType(HitObject hitObject)
         {
             LegacyHitObjectType type = 0;
 
@@ -267,7 +267,10 @@ namespace osu.Game.Beatmaps.Formats
                     break;
 
                 case IHasEndTime _:
-                    type |= LegacyHitObjectType.Spinner;
+                    if (beatmap.BeatmapInfo.RulesetID == 3)
+                        type |= LegacyHitObjectType.Hold;
+                    else
+                        type |= LegacyHitObjectType.Spinner;
                     break;
 
                 default:

From 3b805daa0b1fedac05e46e26fa6e77ba9cc1b4dc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 16:40:07 +0900
Subject: [PATCH 02352/10326] Fix hold note end time being written incorrectly

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index fc853a7a68..b5a8f1604c 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -240,8 +240,9 @@ namespace osu.Game.Beatmaps.Formats
             }
             else
             {
-                if (hitObject is IHasEndTime endTimeData)
-                    writer.Write(FormattableString.Invariant($"{endTimeData.EndTime},"));
+                if (hitObject is IHasEndTime _)
+                    addEndTimeData(writer, hitObject);
+
                 writer.Write(getSampleBank(hitObject.Samples));
             }
 
@@ -344,6 +345,20 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
+        private void addEndTimeData(TextWriter writer, HitObject hitObject)
+        {
+            var endTimeData = (IHasEndTime)hitObject;
+            var type = getObjectType(hitObject);
+
+            char suffix = ',';
+
+            // Holds write the end time as if it's part of sample data.
+            if (type == LegacyHitObjectType.Hold)
+                suffix = ':';
+
+            writer.Write(FormattableString.Invariant($"{endTimeData.EndTime}{suffix}"));
+        }
+
         private string getSampleBank(IList<HitSampleInfo> samples, bool banksOnly = false, bool zeroBanks = false)
         {
             LegacySampleBank normalBank = toLegacySampleBank(samples.SingleOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)?.Bank);

From 730b5ea1a986a6772520d8babd185ede3543c2ab Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 22 Apr 2020 10:40:21 +0300
Subject: [PATCH 02353/10326] Make the Catcher.Colour assertion read better

---
 .../TestSceneHyperDashColouring.cs                  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 0c8ade9018..1e1746efb3 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -130,9 +130,16 @@ namespace osu.Game.Rulesets.Catch.Tests
             });
 
             AddAssert("catcher colour is correct", () =>
-                expectedCatcherColour == Catcher.DEFAULT_HYPER_DASH_COLOUR
-                    ? catcherArea.MovableCatcher.Colour == Catcher.DEFAULT_CATCHER_HYPER_DASH_COLOUR
-                    : catcherArea.MovableCatcher.Colour == expectedCatcherColour);
+            {
+                var expected = expectedCatcherColour;
+
+                if (expected == Catcher.DEFAULT_HYPER_DASH_COLOUR)
+                    // The expected colour for Catcher.Colour is another colour
+                    // for the default skin, assert with that instead.
+                    expected = Catcher.DEFAULT_CATCHER_HYPER_DASH_COLOUR;
+
+                return catcherArea.MovableCatcher.Colour == expected;
+            });
 
             AddAssert("catcher trails colours are correct", () => trails.HyperDashTrailsColour == expectedCatcherColour);
             AddAssert("catcher end-glow colours are correct", () => trails.EndGlowSpritesColour == (expectedEndGlowColour ?? expectedCatcherColour));

From bffe6742e0cde53ce1ce4c6f76546e79eca41abd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 22 Apr 2020 10:43:49 +0300
Subject: [PATCH 02354/10326] Replace finishing catcher transforms with
 until-true step

---
 osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 1e1746efb3..589bafe400 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -126,10 +126,9 @@ namespace osu.Game.Rulesets.Catch.Tests
 
                 trails = catcherArea.OfType<CatcherTrailDisplay>().Single();
                 catcherArea.MovableCatcher.SetHyperDashState(2);
-                catcherArea.MovableCatcher.FinishTransforms();
             });
 
-            AddAssert("catcher colour is correct", () =>
+            AddUntilStep("catcher colour is correct", () =>
             {
                 var expected = expectedCatcherColour;
 

From 44405d4771b76649e64fd7bd81e13cef17977b71 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Wed, 22 Apr 2020 15:50:23 +0800
Subject: [PATCH 02355/10326] Moved result to load complete for flying hits

---
 .../Objects/Drawables/DrawableFlyingCentreHit.cs               | 3 ++-
 .../Objects/Drawables/DrawableFlyingRimHit.cs                  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs
index 826a4467f8..f70d940bd2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs
@@ -9,8 +9,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     public class DrawableFlyingCentreHit : DrawableCentreHit
     {
-        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
             ApplyResult(r => r.Type = HitResult.Good);
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs
index 4a6fed8302..9005dac653 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs
@@ -9,8 +9,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     public class DrawableFlyingRimHit : DrawableRimHit
     {
-        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
             ApplyResult(r => r.Type = HitResult.Good);
         }
 

From 9c22d2f1dd167cd6b28ec2bdd7a3949219773209 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 17:41:24 +0900
Subject: [PATCH 02356/10326] Use platform bindings for editor actions

---
 osu.Game/Screens/Edit/Editor.cs | 49 +++++++++++++++++----------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 9a1f450dc6..5665f4b25d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -22,6 +22,7 @@ using osu.Game.Screens.Edit.Design;
 using osuTK.Input;
 using System.Collections.Generic;
 using osu.Framework;
+using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
@@ -37,7 +38,7 @@ using osu.Game.Users;
 namespace osu.Game.Screens.Edit
 {
     [Cached(typeof(IBeatSnapProvider))]
-    public class Editor : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>, IBeatSnapProvider
+    public class Editor : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>, IKeyBindingHandler<PlatformAction>, IBeatSnapProvider
     {
         public override float BackgroundParallaxAmount => 0.1f;
 
@@ -230,6 +231,30 @@ namespace osu.Game.Screens.Edit
             clock.ProcessFrame();
         }
 
+        public bool OnPressed(PlatformAction action)
+        {
+            switch (action.ActionType)
+            {
+                case PlatformActionType.Undo:
+                    undo();
+                    return true;
+
+                case PlatformActionType.Redo:
+                    redo();
+                    return true;
+
+                case PlatformActionType.Save:
+                    saveBeatmap();
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(PlatformAction action)
+        {
+        }
+
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             switch (e.Key)
@@ -241,28 +266,6 @@ namespace osu.Game.Screens.Edit
                 case Key.Right:
                     seek(e, 1);
                     return true;
-
-                case Key.S:
-                    if (e.ControlPressed)
-                    {
-                        saveBeatmap();
-                        return true;
-                    }
-
-                    break;
-
-                case Key.Z:
-                    if (e.ControlPressed)
-                    {
-                        if (e.ShiftPressed)
-                            redo();
-                        else
-                            undo();
-
-                        return true;
-                    }
-
-                    break;
             }
 
             return base.OnKeyDown(e);

From 8b0274fedd51ff2e897930786b4c04187f541daa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 17:55:50 +0900
Subject: [PATCH 02357/10326] Remove obsolete methods

---
 .../Objects/Drawables/DrawableHitObject.cs    | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e847dcec40..1316ac1156 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -180,11 +179,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void apply(HitObject hitObject)
         {
-#pragma warning disable 618 // can be removed 20200417
-            if (GetType().GetMethod(nameof(AddNested), BindingFlags.NonPublic | BindingFlags.Instance)?.DeclaringType != typeof(DrawableHitObject))
-                return;
-#pragma warning restore 618
-
             if (nestedHitObjects.IsValueCreated)
             {
                 nestedHitObjects.Value.Clear();
@@ -194,8 +188,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
             foreach (var h in hitObject.NestedHitObjects)
             {
                 var drawableNested = CreateNestedHitObject(h) ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
-
-                addNested(drawableNested);
                 AddNestedHitObject(drawableNested);
             }
         }
@@ -208,13 +200,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
         }
 
-        /// <summary>
-        /// Adds a nested <see cref="DrawableHitObject"/>. This should not be used except for legacy nested <see cref="DrawableHitObject"/> usages.
-        /// </summary>
-        /// <param name="h"></param>
-        [Obsolete("Use AddNestedHitObject() / ClearNestedHitObjects() / CreateNestedHitObject() instead.")] // can be removed 20200417
-        protected virtual void AddNested(DrawableHitObject h) => addNested(h);
-
         /// <summary>
         /// Invoked by the base <see cref="DrawableHitObject"/> to remove all previously-added nested <see cref="DrawableHitObject"/>s.
         /// </summary>
@@ -229,17 +214,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <returns>The drawable representation for <paramref name="hitObject"/>.</returns>
         protected virtual DrawableHitObject CreateNestedHitObject(HitObject hitObject) => null;
 
-        private void addNested(DrawableHitObject hitObject)
-        {
-            // Todo: Exists for legacy purposes, can be removed 20200417
-
-            hitObject.OnNewResult += (d, r) => OnNewResult?.Invoke(d, r);
-            hitObject.OnRevertResult += (d, r) => OnRevertResult?.Invoke(d, r);
-            hitObject.ApplyCustomUpdateState += (d, j) => ApplyCustomUpdateState?.Invoke(d, j);
-
-            nestedHitObjects.Value.Add(hitObject);
-        }
-
         #region State / Transform Management
 
         /// <summary>

From e1142b424d2f140dbb61521920c33336d5f0992e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 18:14:21 +0900
Subject: [PATCH 02358/10326] Fix test failures

---
 .../Editor/TestSceneEditorChangeStates.cs     | 41 ++++---------------
 osu.Game/Screens/Edit/Editor.cs               | 12 +++---
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
index dd1b6cf6aa..efc2a6f552 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
@@ -10,24 +10,22 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
-using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editor
 {
     public class TestSceneEditorChangeStates : ScreenTestScene
     {
         private EditorBeatmap editorBeatmap;
+        private TestEditor editor;
 
         public override void SetUpSteps()
         {
             base.SetUpSteps();
 
-            Screens.Edit.Editor editor = null;
-
             AddStep("load editor", () =>
             {
                 Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
-                LoadScreen(editor = new Screens.Edit.Editor());
+                LoadScreen(editor = new TestEditor());
             });
 
             AddUntilStep("wait for editor to load", () => editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
@@ -160,36 +158,15 @@ namespace osu.Game.Tests.Visual.Editor
             AddAssert("no hitobject added", () => addedObject == null);
         }
 
-        private void addUndoSteps()
+        private void addUndoSteps() => AddStep("undo", () => editor.Undo());
+
+        private void addRedoSteps() => AddStep("redo", () => editor.Redo());
+
+        private class TestEditor : Screens.Edit.Editor
         {
-            AddStep("press undo", () =>
-            {
-                InputManager.PressKey(Key.LControl);
-                InputManager.PressKey(Key.Z);
-            });
+            public new void Undo() => base.Undo();
 
-            AddStep("release keys", () =>
-            {
-                InputManager.ReleaseKey(Key.LControl);
-                InputManager.ReleaseKey(Key.Z);
-            });
-        }
-
-        private void addRedoSteps()
-        {
-            AddStep("press redo", () =>
-            {
-                InputManager.PressKey(Key.LControl);
-                InputManager.PressKey(Key.LShift);
-                InputManager.PressKey(Key.Z);
-            });
-
-            AddStep("release keys", () =>
-            {
-                InputManager.ReleaseKey(Key.LControl);
-                InputManager.ReleaseKey(Key.LShift);
-                InputManager.ReleaseKey(Key.Z);
-            });
+            public new void Redo() => base.Redo();
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 5665f4b25d..54e4af94a4 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -158,8 +158,8 @@ namespace osu.Game.Screens.Edit
                                 {
                                     Items = new[]
                                     {
-                                        undoMenuItem = new EditorMenuItem("Undo", MenuItemType.Standard, undo),
-                                        redoMenuItem = new EditorMenuItem("Redo", MenuItemType.Standard, redo)
+                                        undoMenuItem = new EditorMenuItem("Undo", MenuItemType.Standard, Undo),
+                                        redoMenuItem = new EditorMenuItem("Redo", MenuItemType.Standard, Redo)
                                     }
                                 }
                             }
@@ -236,11 +236,11 @@ namespace osu.Game.Screens.Edit
             switch (action.ActionType)
             {
                 case PlatformActionType.Undo:
-                    undo();
+                    Undo();
                     return true;
 
                 case PlatformActionType.Redo:
-                    redo();
+                    Redo();
                     return true;
 
                 case PlatformActionType.Save:
@@ -329,9 +329,9 @@ namespace osu.Game.Screens.Edit
             return base.OnExiting(next);
         }
 
-        private void undo() => changeHandler.RestoreState(-1);
+        protected void Undo() => changeHandler.RestoreState(-1);
 
-        private void redo() => changeHandler.RestoreState(1);
+        protected void Redo() => changeHandler.RestoreState(1);
 
         private void resetTrack(bool seekToStart = false)
         {

From 93151f761215c135ae625241532fa6b899e73747 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 18:32:59 +0900
Subject: [PATCH 02359/10326] Add back necessary events + addition to list

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 1316ac1156..0047142cbd 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -188,6 +188,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
             foreach (var h in hitObject.NestedHitObjects)
             {
                 var drawableNested = CreateNestedHitObject(h) ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
+
+                drawableNested.OnNewResult += (d, r) => OnNewResult?.Invoke(d, r);
+                drawableNested.OnRevertResult += (d, r) => OnRevertResult?.Invoke(d, r);
+                drawableNested.ApplyCustomUpdateState += (d, j) => ApplyCustomUpdateState?.Invoke(d, j);
+
+                nestedHitObjects.Value.Add(drawableNested);
                 AddNestedHitObject(drawableNested);
             }
         }

From 0a34fddcc3cfda42bc40e393374b7c0decd824d8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 19:38:27 +0900
Subject: [PATCH 02360/10326] Fix TestBeatmap not setting appropriate ruleset
 ID

---
 osu.Game/Tests/Beatmaps/TestBeatmap.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index 96e3c037a3..a7c84bf692 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Tests.Beatmaps
             HitObjects = baseBeatmap.HitObjects;
 
             BeatmapInfo.Ruleset = ruleset;
+            BeatmapInfo.RulesetID = ruleset.ID ?? 0;
             BeatmapInfo.BeatmapSet.Metadata = BeatmapInfo.Metadata;
             BeatmapInfo.BeatmapSet.Beatmaps = new List<BeatmapInfo> { BeatmapInfo };
             BeatmapInfo.BeatmapSet.OnlineInfo = new BeatmapSetOnlineInfo

From 08982e0e00da8fe144793a8b7fa49713fdf98145 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 19:49:21 +0900
Subject: [PATCH 02361/10326] Ensure editor tests wait for load to complete

---
 .../Editor/TestSceneEditorChangeStates.cs     | 21 +++++++------------
 osu.Game/Tests/Visual/EditorTestScene.cs      | 10 ++++++++-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
index dd1b6cf6aa..c68015d1a2 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
@@ -4,35 +4,28 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editor
 {
-    public class TestSceneEditorChangeStates : ScreenTestScene
+    public class TestSceneEditorChangeStates : EditorTestScene
     {
+        public TestSceneEditorChangeStates()
+            : base(new OsuRuleset())
+        {
+        }
+
         private EditorBeatmap editorBeatmap;
 
         public override void SetUpSteps()
         {
             base.SetUpSteps();
 
-            Screens.Edit.Editor editor = null;
-
-            AddStep("load editor", () =>
-            {
-                Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
-                LoadScreen(editor = new Screens.Edit.Editor());
-            });
-
-            AddUntilStep("wait for editor to load", () => editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
-                                                          && editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true);
-            AddStep("get beatmap", () => editorBeatmap = editor.ChildrenOfType<EditorBeatmap>().Single());
+            AddStep("get beatmap", () => editorBeatmap = Editor.ChildrenOfType<EditorBeatmap>().Single());
         }
 
         [Test]
diff --git a/osu.Game/Tests/Visual/EditorTestScene.cs b/osu.Game/Tests/Visual/EditorTestScene.cs
index 80bc3bdb87..88e50d4858 100644
--- a/osu.Game/Tests/Visual/EditorTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorTestScene.cs
@@ -3,9 +3,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Testing;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
 namespace osu.Game.Tests.Visual
 {
@@ -13,6 +17,8 @@ namespace osu.Game.Tests.Visual
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Editor), typeof(EditorScreen) };
 
+        protected Editor Editor { get; private set; }
+
         private readonly Ruleset ruleset;
 
         protected EditorTestScene(Ruleset ruleset)
@@ -30,7 +36,9 @@ namespace osu.Game.Tests.Visual
         {
             base.SetUpSteps();
 
-            AddStep("Load editor", () => LoadScreen(new Editor()));
+            AddStep("load editor", () => LoadScreen(Editor = new Editor()));
+            AddUntilStep("wait for editor to load", () => Editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
+                                                          && Editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true);
         }
     }
 }

From 617d27ace9620128db73f1da44278d2111d801a0 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Wed, 22 Apr 2020 15:19:29 +0200
Subject: [PATCH 02362/10326] Restart branch

---
 .../Skinning/TaikoLegacySkinTransformer.cs    | 12 ++-
 .../TaikoSkinComponents.cs                    |  1 +
 .../UI/DefaultTaikoDonTextureAnimation.cs     | 60 ++++++++++++++
 .../UI/DrawableTaikoCharacter.cs              | 80 +++++++++++++++++++
 .../UI/TaikoDonAnimationState.cs              | 13 +++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 39 +++++++--
 6 files changed, 196 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/UI/DefaultTaikoDonTextureAnimation.cs
 create mode 100644 osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
 create mode 100644 osu.Game.Rulesets.Taiko/UI/TaikoDonAnimationState.cs

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 78eec94590..722dbf2671 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
@@ -32,9 +33,16 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                         return new LegacyInputDrum();
 
                     return null;
-            }
 
-            return source.GetDrawableComponent(component);
+                case TaikoSkinComponents.TaikoDon:
+                    if (GetTexture("pippidonclear0") != null)
+                        return new DrawableTaikoCharacter();
+
+                    return null;
+
+                default:
+                    return source.GetDrawableComponent(component);
+            }
         }
 
         public Texture GetTexture(string componentName) => source.GetTexture(componentName);
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index 6d4581db80..a68cc54efa 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -6,5 +6,6 @@ namespace osu.Game.Rulesets.Taiko
     public enum TaikoSkinComponents
     {
         InputDrum,
+        TaikoDon
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultTaikoDonTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/DefaultTaikoDonTextureAnimation.cs
new file mode 100644
index 0000000000..1fefed953d
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultTaikoDonTextureAnimation.cs
@@ -0,0 +1,60 @@
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public sealed class DefaultTaikoDonTextureAnimation : TextureAnimation
+    {
+        private readonly TaikoDonAnimationState _state;
+        private int currentFrame;
+
+        public DefaultTaikoDonTextureAnimation(TaikoDonAnimationState state) : base(false)
+        {
+            _state = state;
+            this.Stop();
+
+            Origin = Anchor.BottomLeft;
+            Anchor = Anchor.BottomLeft;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            for (int i = 0;; i++)
+            {
+                var textureName = $"pippidon{_getStateString(_state)}{i}";
+                Texture texture = skin.GetTexture(textureName);
+
+                if (texture == null)
+                    break;
+
+                AddFrame(texture);
+            }
+        }
+
+        /// <summary>
+        /// Advances the current frame by one.
+        /// </summary>
+        public void Move()
+        {
+            if (FrameCount <= currentFrame)
+                currentFrame = 0;
+
+            GotoFrame(currentFrame);
+
+            currentFrame++;
+        }
+
+        private string _getStateString(TaikoDonAnimationState state) => state switch
+        {
+            TaikoDonAnimationState.Clear => "clear",
+            TaikoDonAnimationState.Fail  => "fail",
+            TaikoDonAnimationState.Idle  => "idle",
+            TaikoDonAnimationState.Kiai  => "kiai",
+            _ => null
+        };
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
new file mode 100644
index 0000000000..897670d049
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
@@ -0,0 +1,80 @@
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public sealed class DrawableTaikoCharacter : BeatSyncedContainer
+    {
+        private static DefaultTaikoDonTextureAnimation idleDrawable, clearDrawable, kiaiDrawable, failDrawable;
+
+        private TaikoDonAnimationState state;
+
+        public DrawableTaikoCharacter()
+        {
+            RelativeSizeAxes = Axes.Both;
+            //Size = new Vector2(1f, 2.5f);
+            //Origin = Anchor.BottomLeft;
+            var xd = new Vector2(1);
+        }
+
+        private DefaultTaikoDonTextureAnimation getStateDrawable() => State switch
+        {
+            TaikoDonAnimationState.Idle  => idleDrawable,
+            TaikoDonAnimationState.Clear => clearDrawable,
+            TaikoDonAnimationState.Kiai  => kiaiDrawable,
+            TaikoDonAnimationState.Fail  => failDrawable,
+            _                            => null
+        };
+
+        public TaikoDonAnimationState State
+        {
+            get => state;
+            set
+            {
+                state = value;
+
+                foreach (var child in InternalChildren)
+                    child.Hide();
+
+                getStateDrawable().Show();
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            InternalChildren = new[]
+            {
+                idleDrawable = new DefaultTaikoDonTextureAnimation(TaikoDonAnimationState.Idle),
+                clearDrawable = new DefaultTaikoDonTextureAnimation(TaikoDonAnimationState.Clear),
+                kiaiDrawable = new DefaultTaikoDonTextureAnimation(TaikoDonAnimationState.Kiai),
+                failDrawable = new DefaultTaikoDonTextureAnimation(TaikoDonAnimationState.Fail),
+            };
+
+            // sets the state, to make sure we have the correct sprite loaded and set.
+            State = TaikoDonAnimationState.Idle;
+        }
+
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        {
+            base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
+
+            getStateDrawable().Move();
+
+            //var signature = timingPoint.TimeSignature == TimeSignatures.SimpleQuadruple ? 4 : 3;
+            //var length = timingPoint.BeatLength;
+            //var rate = 1000d / length;
+            //adjustableClock.Rate = rate;
+            //
+            //// Start animating on the first beat.
+            //if (beatIndex < 1)
+            //    adjustableClock.Start();
+            // Logger.GetLogger(LoggingTarget.Information).Add($"Length = {length}ms | Rate = {rate}x | BPM = {timingPoint.BPM} / {signature}");
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoDonAnimationState.cs b/osu.Game.Rulesets.Taiko/UI/TaikoDonAnimationState.cs
new file mode 100644
index 0000000000..773710ee7e
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoDonAnimationState.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.
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public enum TaikoDonAnimationState
+    {
+        Idle,
+        Clear,
+        Kiai,
+        Fail
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index bde9085c23..d5cabb8662 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -19,6 +19,9 @@ using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
 using osuTK;
 using osuTK.Graphics;
+using osu.Game.Rulesets.Scoring;
+using osu.Framework.Bindables;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -53,6 +56,10 @@ namespace osu.Game.Rulesets.Taiko.UI
         private readonly Box overlayBackground;
         private readonly Box background;
 
+        private readonly SkinnableDrawable characterDrawable;
+
+        private Bindable<double> frameTime = new Bindable<double>(100);
+
         public TaikoPlayfield(ControlPointInfo controlPoints)
         {
             InternalChildren = new Drawable[]
@@ -186,6 +193,12 @@ namespace osu.Game.Rulesets.Taiko.UI
                 {
                     Name = "Top level hit objects",
                     RelativeSizeAxes = Axes.Both,
+                },
+                characterDrawable = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoDon), _ => new Container(), confineMode: ConfineMode.ScaleToFit)
+                {
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.TopLeft,
+                    RelativePositionAxes = Axes.None
                 }
             };
         }
@@ -254,16 +267,28 @@ namespace osu.Game.Rulesets.Taiko.UI
 
                     break;
             }
-        }
 
-        private class ProxyContainer : LifetimeManagementContainer
-        {
-            public new MarginPadding Padding
+            if (characterDrawable.Drawable is DrawableTaikoCharacter character)
             {
-                set => base.Padding = value;
+                if (result.Type == HitResult.Miss && result.Judgement.AffectsCombo)
+                {
+                    character.State = TaikoDonAnimationState.Fail;
+                }
+                else
+                {
+                    character.State = judgedObject.HitObject.Kiai ? TaikoDonAnimationState.Kiai : TaikoDonAnimationState.Idle;
+                }
             }
-
-            public void Add(Drawable proxy) => AddInternal(proxy);
         }
     }
+
+    class ProxyContainer : LifetimeManagementContainer
+    {
+        public new MarginPadding Padding
+        {
+            set => base.Padding = value;
+        }
+
+        public void Add(Drawable proxy) => AddInternal(proxy);
+    }
 }

From 26779a57b4b211ab86e9bdd41d194c1d7271e5e5 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Wed, 22 Apr 2020 22:49:30 +0800
Subject: [PATCH 02363/10326] Exposed public ability to unproxy content

---
 .../Objects/Drawables/DrawableTaikoHitObject.cs                 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 5f892dd2fa..b2f9086184 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -76,6 +76,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         public Drawable CreateProxiedContent() => proxiedContent.CreateProxy();
 
+        public void RemoveProxiedContent() => UnproxyContent();
+
         public abstract bool OnPressed(TaikoAction action);
 
         public virtual void OnReleased(TaikoAction action)

From 2600518b1bfdfc39809dc5221a7b2e783e7fd0bb Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Wed, 22 Apr 2020 22:50:00 +0800
Subject: [PATCH 02364/10326] Moved drumroll container and removed rewound
 notes

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 31 ++++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index e947795fe5..70839ce806 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -119,7 +119,14 @@ namespace osu.Game.Rulesets.Taiko.UI
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
                             Masking = true,
-                            Child = HitObjectContainer
+                            Children = new Drawable[]
+                            {
+                                HitObjectContainer,
+                                drumRollHitContainer = new ScrollingHitObjectContainer
+                                {
+                                    Name = "Drumroll hit"
+                                }
+                            }
                         },
                         kiaiExplosionContainer = new Container<KiaiHitExplosion>
                         {
@@ -135,14 +142,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                             RelativeSizeAxes = Axes.Y,
                             Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
                             Blending = BlendingParameters.Additive
-                        },
-                        drumRollHitContainer = new ScrollingHitObjectContainer
-                        {
-                            Name = "Drumroll hit",
-                            RelativeSizeAxes = Axes.Both,
-                            FillMode = FillMode.Stretch,
-                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Width = 1.0f
                         }
                     }
                 },
@@ -282,6 +281,20 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (Time.Elapsed < 0)
+            {
+                foreach (DrawableHit taikoHit in drumRollHitContainer.Objects)
+                {
+                    taikoHit.RemoveProxiedContent();
+                    drumRollHitContainer.Remove(taikoHit);
+                }
+            }
+        }
+
         private class ProxyContainer : LifetimeManagementContainer
         {
             public new MarginPadding Padding

From 40f11ed15c944dd0007a5d637a1215c2ac33c902 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 10:37:05 +0900
Subject: [PATCH 02365/10326] Resolve broken test scene

---
 .../Visual/Editor/TestSceneEditorChangeStates.cs           | 7 ++++---
 osu.Game/Tests/Visual/EditorTestScene.cs                   | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
index 7b4747592a..efdcc6f78b 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Tests.Visual.Editor
         }
 
         private EditorBeatmap editorBeatmap;
-        private TestEditor editor;
 
         public override void SetUpSteps()
         {
@@ -153,9 +152,11 @@ namespace osu.Game.Tests.Visual.Editor
             AddAssert("no hitobject added", () => addedObject == null);
         }
 
-        private void addUndoSteps() => AddStep("undo", () => editor.Undo());
+        private void addUndoSteps() => AddStep("undo", () => ((TestEditor)Editor).Undo());
 
-        private void addRedoSteps() => AddStep("redo", () => editor.Redo());
+        private void addRedoSteps() => AddStep("redo", () => ((TestEditor)Editor).Redo());
+
+        protected override Screens.Edit.Editor CreateEditor() => new TestEditor();
 
         private class TestEditor : Screens.Edit.Editor
         {
diff --git a/osu.Game/Tests/Visual/EditorTestScene.cs b/osu.Game/Tests/Visual/EditorTestScene.cs
index 88e50d4858..caf2bc0ff1 100644
--- a/osu.Game/Tests/Visual/EditorTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorTestScene.cs
@@ -36,9 +36,11 @@ namespace osu.Game.Tests.Visual
         {
             base.SetUpSteps();
 
-            AddStep("load editor", () => LoadScreen(Editor = new Editor()));
+            AddStep("load editor", () => LoadScreen(Editor = CreateEditor()));
             AddUntilStep("wait for editor to load", () => Editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
                                                           && Editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true);
         }
+
+        protected virtual Editor CreateEditor() => new Editor();
     }
 }

From 86ef73aa27934b377c5a931c0e66b2f96cc0fc9a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 11:16:59 +0900
Subject: [PATCH 02366/10326] Implement HitObjectContainer.Clear()

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs               | 9 +++++++++
 .../Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index dea981c3ad..f4f66f1272 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -43,6 +43,15 @@ namespace osu.Game.Rulesets.UI
             return true;
         }
 
+        public virtual void Clear(bool disposeChildren = true)
+        {
+            ClearInternal(disposeChildren);
+
+            foreach (var kvp in startTimeMap)
+                kvp.Value.bindable.UnbindAll();
+            startTimeMap.Clear();
+        }
+
         public int IndexOf(DrawableHitObject hitObject) => IndexOfInternal(hitObject);
 
         private void onStartTimeChanged(DrawableHitObject hitObject)
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 108f98d5fc..57f58be55a 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -58,6 +58,14 @@ namespace osu.Game.Rulesets.UI.Scrolling
             return result;
         }
 
+        public override void Clear(bool disposeChildren = true)
+        {
+            base.Clear(disposeChildren);
+
+            initialStateCache.Invalidate();
+            hitObjectInitialStateCache.Clear();
+        }
+
         private float scrollLength;
 
         protected override void Update()

From 6df45164face4fb8b31e3cb7a9cfaf9d97003ec7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 11:17:16 +0900
Subject: [PATCH 02367/10326] Expose direction from scrolling test container

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

diff --git a/osu.Game/Tests/Visual/ScrollingTestContainer.cs b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
index 3b741fcf1d..994f23577d 100644
--- a/osu.Game/Tests/Visual/ScrollingTestContainer.cs
+++ b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
@@ -30,6 +30,11 @@ namespace osu.Game.Tests.Visual
             set => scrollingInfo.TimeRange.Value = value;
         }
 
+        public ScrollingDirection Direction
+        {
+            set => scrollingInfo.Direction.Value = value;
+        }
+
         public IScrollingInfo ScrollingInfo => scrollingInfo;
 
         [Cached(Type = typeof(IScrollingInfo))]

From 6376128bde406d3340feb7f9dd946d8bdae77225 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 23 Apr 2020 05:33:28 +0300
Subject: [PATCH 02368/10326] Remove unnecessary using directive

---
 osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 57930a21fa..d99325ff87 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Catch.Difficulty.Skills;

From ca56e6c0d2a1fb09749bd8f4070cfeaed947048c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 12:10:26 +0900
Subject: [PATCH 02369/10326] Rename taiko HitTarget classes to avoid conflict
 with mania

---
 .../Skinning/TestSceneTaikoPlayfield.cs                   | 4 ++--
 .../{LegacyHitTarget.cs => TaikoLegacyHitTarget.cs}       | 8 +++++---
 .../Skinning/TaikoLegacySkinTransformer.cs                | 2 +-
 .../UI/{HitTarget.cs => TaikoHitTarget.cs}                | 6 ++----
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs              | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename osu.Game.Rulesets.Taiko/Skinning/{LegacyHitTarget.cs => TaikoLegacyHitTarget.cs} (80%)
 rename osu.Game.Rulesets.Taiko/UI/{HitTarget.cs => TaikoHitTarget.cs} (95%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
index 730eed0e0f..cdd6f9ab19 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
         {
-            typeof(HitTarget),
-            typeof(LegacyHitTarget),
+            typeof(TaikoHitTarget),
+            typeof(TaikoLegacyHitTarget),
         }).ToList();
 
         [Cached(typeof(IScrollingInfo))]
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
similarity index 80%
rename from osu.Game.Rulesets.Taiko/Skinning/LegacyHitTarget.cs
rename to osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
index 51aea9b9ab..b80f273d24 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
@@ -10,7 +10,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
 {
-    public class LegacyHitTarget : CompositeDrawable
+    public class TaikoLegacyHitTarget : CompositeDrawable
     {
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
@@ -22,7 +22,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 new Sprite
                 {
                     Texture = skin.GetTexture("approachcircle"),
-                    Scale = new Vector2(0.73f),
+                    RelativeSizeAxes = Axes.Both,
+                    Size = new Vector2(0.73f) * 0.625f,
                     Alpha = 0.7f,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -30,7 +31,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 new Sprite
                 {
                     Texture = skin.GetTexture("taikobigcircle"),
-                    Scale = new Vector2(0.7f),
+                    RelativeSizeAxes = Axes.Both,
+                    Size = new Vector2(0.7f) * 0.625f,
                     Alpha = 0.5f,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 6b59718173..eaa69283e4 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                 case TaikoSkinComponents.HitTarget:
                     if (GetTexture("taikobigcircle") != null)
-                        return new LegacyHitTarget();
+                        return new TaikoLegacyHitTarget();
 
                     return null;
             }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitTarget.cs b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
similarity index 95%
rename from osu.Game.Rulesets.Taiko/UI/HitTarget.cs
rename to osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
index 88886508af..7de1593ab6 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
@@ -13,14 +13,14 @@ namespace osu.Game.Rulesets.Taiko.UI
     /// <summary>
     /// A component that is displayed at the hit position in the taiko playfield.
     /// </summary>
-    internal class HitTarget : Container
+    internal class TaikoHitTarget : Container
     {
         /// <summary>
         /// Thickness of all drawn line pieces.
         /// </summary>
         private const float border_thickness = 2.5f;
 
-        public HitTarget()
+        public TaikoHitTarget()
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -41,7 +41,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    FillMode = FillMode.Fit,
                     Scale = new Vector2(TaikoHitObject.DEFAULT_STRONG_SIZE),
                     Masking = true,
                     BorderColour = Color4.White,
@@ -63,7 +62,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    FillMode = FillMode.Fit,
                     Scale = new Vector2(TaikoHitObject.DEFAULT_SIZE),
                     Masking = true,
                     BorderColour = Color4.White,
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 375d9995c0..69c9003434 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                                     FillMode = FillMode.Fit,
                                     Blending = BlendingParameters.Additive,
                                 },
-                                HitTarget = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.HitTarget), _ => new HitTarget())
+                                HitTarget = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.HitTarget), _ => new TaikoHitTarget())
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.Centre,

From 8d5732aabd87662ec038358e63b630e23153605b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 12:17:11 +0900
Subject: [PATCH 02370/10326] Make placements happen on mouse down

---
 .../TestSceneSliderPlacementBlueprint.cs      | 17 ++++++++++++++++
 .../HitCircles/HitCirclePlacementBlueprint.cs | 20 +++++++++++++------
 .../Components/PathControlPointPiece.cs       |  4 +++-
 .../Sliders/SliderPlacementBlueprint.cs       | 10 +++++-----
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs
index 9fc479953e..fe9973f4d8 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs
@@ -259,6 +259,23 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertControlPointType(2, PathType.PerfectCurve);
         }
 
+        [Test]
+        public void TestBeginPlacementWithoutReleasingMouse()
+        {
+            addMovementStep(new Vector2(200));
+            AddStep("press left button", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(400, 200));
+            AddStep("release left button", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertLength(200);
+            assertControlPointCount(2);
+            assertControlPointType(0, PathType.Linear);
+        }
+
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
 
         private void addClickStep(MouseButton button)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index 407f5f540e..2f400160b8 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -6,6 +6,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
 {
@@ -28,16 +29,23 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
             circlePiece.UpdateFrom(HitObject);
         }
 
-        protected override bool OnClick(ClickEvent e)
+        protected override bool OnMouseDown(MouseDownEvent e)
         {
-            EndPlacement(true);
-            return true;
+            if (e.Button == MouseButton.Left)
+            {
+                BeginPlacement();
+                return true;
+            }
+
+            return base.OnMouseDown(e);
         }
 
-        public override void UpdatePosition(Vector2 screenSpacePosition)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
-            BeginPlacement();
-            HitObject.Position = ToLocalSpace(screenSpacePosition);
+            if (e.Button == MouseButton.Left)
+                EndPlacement(true);
         }
+
+        public override void UpdatePosition(Vector2 screenSpacePosition) => HitObject.Position = ToLocalSpace(screenSpacePosition);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index fed149b5c5..d0c1eb5317 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         public Action<PathControlPointPiece, MouseButtonEvent> RequestSelection;
 
         public readonly BindableBool IsSelected = new BindableBool();
-
         public readonly PathControlPoint ControlPoint;
 
         private readonly Slider slider;
@@ -146,6 +145,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override bool OnDragStart(DragStartEvent e)
         {
+            if (RequestSelection == null)
+                return false;
+
             if (e.Button == MouseButton.Left)
             {
                 changeHandler?.BeginChange();
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 9af972dbce..ac30f5a762 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -82,8 +82,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             }
         }
 
-        protected override bool OnClick(ClickEvent e)
+        protected override bool OnMouseDown(MouseDownEvent e)
         {
+            if (e.Button != MouseButton.Left)
+                return base.OnMouseDown(e);
+
             switch (state)
             {
                 case PlacementState.Initial:
@@ -91,9 +94,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     break;
 
                 case PlacementState.Body:
-                    if (e.Button != MouseButton.Left)
-                        break;
-
                     if (canPlaceNewControlPoint(out var lastPoint))
                     {
                         // Place a new point by detatching the current cursor.
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                         currentSegmentLength = 1;
                     }
 
-                    return true;
+                    break;
             }
 
             return true;

From 58bf288595a2fc16f3491c614480bd1d997d0afe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 12:17:48 +0900
Subject: [PATCH 02371/10326] Remove DrawableHit's custom sizing logic

Turns out this was unnecessary and never actually being used.
---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 9333e5f144..fe9a89f2be 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -92,8 +92,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             // The input manager processes all input prior to us updating, so this is the perfect time
             // for us to remove the extra press blocking, before input is handled in the next frame
             pressHandledThisFrame = false;
-
-            Size = BaseSize * Parent.RelativeChildSize;
         }
 
         protected override void UpdateStateTransforms(ArmedState state)

From c59096a9419c3087d35137350bc480a90972d3c6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 12:05:34 +0900
Subject: [PATCH 02372/10326] Fix note placement

---
 .../ManiaPlacementBlueprintTestScene.cs       |  2 -
 .../TestSceneNotePlacementBlueprint.cs        | 42 +++++++++++++++++++
 .../Blueprints/ManiaPlacementBlueprint.cs     |  2 +-
 .../Edit/Blueprints/NotePlacementBlueprint.cs |  9 ++++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
index afde1c9521..aac77c9c1c 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
@@ -41,8 +41,6 @@ namespace osu.Game.Rulesets.Mania.Tests
                 AccentColour = Color4.OrangeRed,
                 Clock = new FramedClock(new StopwatchClock()), // No scroll
             });
-
-            AddStep("change direction", () => ((ScrollingTestContainer)HitObjectContainer).Flip());
         }
 
         protected override Container CreateHitObjectContainer() => new ScrollingTestContainer(ScrollingDirection.Down) { RelativeSizeAxes = Axes.Both };
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs
index d7b539a2a0..2d97e61aa5 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs
@@ -1,17 +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.Linq;
+using NUnit.Framework;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
     public class TestSceneNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            this.ChildrenOfType<HitObjectContainer>().ForEach(c => c.Clear());
+
+            ResetPlacement();
+
+            ((ScrollingTestContainer)HitObjectContainer).Direction = ScrollingDirection.Down;
+        });
+
+        [Test]
+        public void TestPlaceBeforeCurrentTimeDownwards()
+        {
+            AddStep("move mouse before current time", () => InputManager.MoveMouseTo(this.ChildrenOfType<Column>().Single().ScreenSpaceDrawQuad.BottomLeft - new Vector2(0, 10)));
+
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("note start time < 0", () => getNote().StartTime < 0);
+        }
+
+        [Test]
+        public void TestPlaceAfterCurrentTimeDownwards()
+        {
+            AddStep("move mouse after current time", () => InputManager.MoveMouseTo(this.ChildrenOfType<Column>().Single()));
+
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("note start time > 0", () => getNote().StartTime > 0);
+        }
+
+        private Note getNote() => this.ChildrenOfType<DrawableNote>().FirstOrDefault()?.HitObject;
+
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableNote((Note)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint();
     }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 6ddf212266..f228daa5e3 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 return base.OnMouseDown(e);
 
             HitObject.Column = Column.Index;
-            BeginPlacement(TimeAt(e.ScreenSpaceMousePosition));
+            BeginPlacement(TimeAt(e.ScreenSpaceMousePosition), true);
             return true;
         }
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index 32c6a6fd07..fd8ef52cef 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
@@ -26,5 +27,13 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             Width = SnappedWidth;
             Position = SnappedMousePosition;
         }
+
+        public override void UpdatePosition(Vector2 screenSpacePosition)
+        {
+            base.UpdatePosition(screenSpacePosition);
+
+            // Continue updating the position until placement is finished on mouse up.
+            BeginPlacement(TimeAt(screenSpacePosition), true);
+        }
     }
 }

From 37f7e0a7349967077f701cf8c3e263573f2f31e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 12:33:34 +0900
Subject: [PATCH 02373/10326] Restructure TaikoPlayfield for better skin
 support

---
 .../Skinning/TestSceneTaikoPlayfield.cs       |   6 +-
 .../Skinning/TaikoLegacySkinTransformer.cs    |  18 ++
 .../TaikoSkinComponents.cs                    |   4 +-
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs    |   2 +-
 .../UI/PlayfieldBackground.cs                 |  61 ++++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 187 ++++++++----------
 6 files changed, 165 insertions(+), 113 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/UI/PlayfieldBackground.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
index cdd6f9ab19..3c7360a6bd 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
@@ -5,7 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.Taiko.UI;
@@ -20,6 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         {
             typeof(TaikoHitTarget),
             typeof(TaikoLegacyHitTarget),
+            typeof(PlayfieldBackground),
         }).ToList();
 
         [Cached(typeof(IScrollingInfo))]
@@ -33,10 +36,11 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         {
             AddStep("Load playfield", () => SetContents(() => new TaikoPlayfield(new ControlPointInfo())
             {
-                Height = 0.4f,
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
             }));
+
+            AddRepeatStep("change height", () => this.ChildrenOfType<TaikoPlayfield>().ForEach(p => p.Height = Math.Max(0.2f, (p.Height + 0.2f) % 1f)), 50);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index eaa69283e4..919788f08a 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.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.Taiko.Skinning
 {
@@ -55,6 +56,23 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                         return new TaikoLegacyHitTarget();
 
                     return null;
+
+                case TaikoSkinComponents.PlayfieldBackgroundRight:
+                    if (GetTexture("taiko-bar-right") != null)
+                        return this.GetAnimation("taiko-bar-right", false, false).With(d =>
+                        {
+                            d.RelativeSizeAxes = Axes.Both;
+                            d.Size = Vector2.One;
+                        });
+
+                    return null;
+
+                case TaikoSkinComponents.PlayfieldBackgroundLeft:
+                    // This is displayed inside LegacyInputDrum. It is required to be there for layout purposes (can be seen on legacy skins).
+                    if (GetTexture("taiko-bar-right") != null)
+                        return Drawable.Empty();
+
+                    return null;
             }
 
             return source.GetDrawableComponent(component);
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index 775eeb4e38..60a2be7f99 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Rulesets.Taiko
         DrumRollBody,
         DrumRollTick,
         Swell,
-        HitTarget
+        HitTarget,
+        PlayfieldBackgroundLeft,
+        PlayfieldBackgroundRight
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index 404960c26f..d4118d38b6 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             JudgedObject = judgedObject;
 
-            Anchor = Anchor.CentreLeft;
+            Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
             RelativeSizeAxes = Axes.Both;
diff --git a/osu.Game.Rulesets.Taiko/UI/PlayfieldBackground.cs b/osu.Game.Rulesets.Taiko/UI/PlayfieldBackground.cs
new file mode 100644
index 0000000000..39fb6c0476
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/PlayfieldBackground.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 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 osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public class PlayfieldBackground : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Name = "Transparent playfield background";
+            RelativeSizeAxes = Axes.Both;
+            Masking = true;
+            BorderColour = colours.Gray1;
+
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Shadow,
+                Colour = Color4.Black.Opacity(0.2f),
+                Radius = 5,
+            };
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colours.Gray0,
+                    Alpha = 0.6f
+                },
+                new Container
+                {
+                    Name = "Border",
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    MaskingSmoothness = 0,
+                    BorderThickness = 2,
+                    AlwaysPresent = true,
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                            AlwaysPresent = true
+                        }
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 69c9003434..4587e896ba 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -6,7 +6,6 @@ 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.ControlPoints;
 using osu.Game.Graphics;
@@ -25,162 +24,132 @@ namespace osu.Game.Rulesets.Taiko.UI
 {
     public class TaikoPlayfield : ScrollingPlayfield
     {
+        private readonly ControlPointInfo controlPoints;
+
         /// <summary>
         /// Default height of a <see cref="TaikoPlayfield"/> when inside a <see cref="DrawableTaikoRuleset"/>.
         /// </summary>
         public const float DEFAULT_HEIGHT = 178;
 
-        /// <summary>
-        /// The offset from <see cref="left_area_size"/> which the center of the hit target lies at.
-        /// </summary>
-        public const float HIT_TARGET_OFFSET = 100;
-
         /// <summary>
         /// The size of the left area of the playfield. This area contains the input drum.
         /// </summary>
-        private const float left_area_size = 240;
+        private const float left_area_size = 180;
 
-        private readonly Container<HitExplosion> hitExplosionContainer;
-        private readonly Container<KiaiHitExplosion> kiaiExplosionContainer;
-        private readonly JudgementContainer<DrawableTaikoJudgement> judgementContainer;
-        internal readonly Drawable HitTarget;
+        private Container<HitExplosion> hitExplosionContainer;
+        private Container<KiaiHitExplosion> kiaiExplosionContainer;
+        private JudgementContainer<DrawableTaikoJudgement> judgementContainer;
+        internal Drawable HitTarget;
 
-        private readonly ProxyContainer topLevelHitContainer;
-        private readonly ProxyContainer barlineContainer;
+        private ProxyContainer topLevelHitContainer;
+        private ProxyContainer barlineContainer;
+        private Container rightArea;
+        private Container leftArea;
 
-        private readonly Container overlayBackgroundContainer;
-        private readonly Container backgroundContainer;
-
-        private readonly Box overlayBackground;
-        private readonly Box background;
+        private Container hitTargetOffsetContent;
 
         public TaikoPlayfield(ControlPointInfo controlPoints)
+        {
+            this.controlPoints = controlPoints;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
         {
             InternalChildren = new Drawable[]
             {
-                backgroundContainer = new Container
-                {
-                    Name = "Transparent playfield background",
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Shadow,
-                        Colour = Color4.Black.Opacity(0.2f),
-                        Radius = 5,
-                    },
-                    Children = new Drawable[]
-                    {
-                        background = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0.6f
-                        },
-                    }
-                },
-                new Container
+                new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.PlayfieldBackgroundRight), _ => new PlayfieldBackground()),
+                rightArea = new Container
                 {
                     Name = "Right area",
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = left_area_size },
+                    RelativePositionAxes = Axes.Both,
+                    Masking = true,
                     Children = new Drawable[]
                     {
                         new Container
                         {
                             Name = "Masked elements before hit objects",
                             RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Masking = true,
+                            FillMode = FillMode.Fit,
                             Children = new[]
                             {
                                 hitExplosionContainer = new Container<HitExplosion>
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    FillMode = FillMode.Fit,
                                     Blending = BlendingParameters.Additive,
                                 },
                                 HitTarget = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.HitTarget), _ => new TaikoHitTarget())
                                 {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.Centre,
                                     RelativeSizeAxes = Axes.Both,
-                                    FillMode = FillMode.Fit
                                 }
                             }
                         },
-                        barlineContainer = new ProxyContainer
+                        hitTargetOffsetContent = new Container
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET }
-                        },
-                        new Container
-                        {
-                            Name = "Hit objects",
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Masking = true,
-                            Child = HitObjectContainer
-                        },
-                        kiaiExplosionContainer = new Container<KiaiHitExplosion>
-                        {
-                            Name = "Kiai hit explosions",
-                            RelativeSizeAxes = Axes.Both,
-                            FillMode = FillMode.Fit,
-                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Blending = BlendingParameters.Additive
-                        },
-                        judgementContainer = new JudgementContainer<DrawableTaikoJudgement>
-                        {
-                            Name = "Judgements",
-                            RelativeSizeAxes = Axes.Y,
-                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Blending = BlendingParameters.Additive
+                            Children = new Drawable[]
+                            {
+                                barlineContainer = new ProxyContainer
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                },
+                                new Container
+                                {
+                                    Name = "Hit objects",
+                                    RelativeSizeAxes = Axes.Both,
+                                    Child = HitObjectContainer
+                                },
+                                kiaiExplosionContainer = new Container<KiaiHitExplosion>
+                                {
+                                    Name = "Kiai hit explosions",
+                                    RelativeSizeAxes = Axes.Both,
+                                    FillMode = FillMode.Fit,
+                                    Blending = BlendingParameters.Additive
+                                },
+                                judgementContainer = new JudgementContainer<DrawableTaikoJudgement>
+                                {
+                                    Name = "Judgements",
+                                    RelativeSizeAxes = Axes.Y,
+                                    Blending = BlendingParameters.Additive
+                                },
+                            }
                         },
                     }
                 },
-                overlayBackgroundContainer = new Container
+                leftArea = new Container
                 {
                     Name = "Left overlay",
-                    RelativeSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode = FillMode.Fit,
+                    BorderColour = colours.Gray0,
                     Size = new Vector2(left_area_size, 1),
                     Children = new Drawable[]
                     {
-                        overlayBackground = new Box
+                        new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.PlayfieldBackgroundLeft), _ => new Container
                         {
                             RelativeSizeAxes = Axes.Both,
-                        },
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    Colour = colours.Gray1,
+                                    RelativeSizeAxes = Axes.Both,
+                                },
+                                new Box
+                                {
+                                    Anchor = Anchor.TopRight,
+                                    RelativeSizeAxes = Axes.Y,
+                                    Width = 10,
+                                    Colour = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
+                                },
+                            }
+                        }),
                         new InputDrum(controlPoints)
                         {
-                            Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreRight,
-                            Scale = new Vector2(0.9f),
-                            Margin = new MarginPadding { Right = 20 }
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
                         },
-                        new Box
-                        {
-                            Anchor = Anchor.TopRight,
-                            RelativeSizeAxes = Axes.Y,
-                            Width = 10,
-                            Colour = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
-                        },
-                    }
-                },
-                new Container
-                {
-                    Name = "Border",
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    MaskingSmoothness = 0,
-                    BorderThickness = 2,
-                    AlwaysPresent = true,
-                    Children = new[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            AlwaysPresent = true
-                        }
                     }
                 },
                 topLevelHitContainer = new ProxyContainer
@@ -191,14 +160,12 @@ namespace osu.Game.Rulesets.Taiko.UI
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        protected override void Update()
         {
-            overlayBackgroundContainer.BorderColour = colours.Gray0;
-            overlayBackground.Colour = colours.Gray1;
+            base.Update();
 
-            backgroundContainer.BorderColour = colours.Gray1;
-            background.Colour = colours.Gray0;
+            rightArea.Padding = new MarginPadding { Left = leftArea.DrawWidth };
+            hitTargetOffsetContent.Padding = new MarginPadding { Left = HitTarget.DrawWidth / 2 };
         }
 
         public override void Add(DrawableHitObject h)

From 49568a3d562884e8960b8ac5d728f476de872d37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 12:19:30 +0900
Subject: [PATCH 02374/10326] Adjust input drum to work with new playfield
 changes

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs | 9 +++++++++
 osu.Game.Rulesets.Taiko/UI/InputDrum.cs             | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
index c61e35692b..276a9d76a8 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
@@ -78,6 +78,15 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             }
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            // Relying on RelativeSizeAxes.Both + FillMode.Fit doesn't work due to the precise pixel layout requirements.
+            // This is a bit ugly but makes the non-legacy implementations a lot cleaner to implement.
+            Scale = new Vector2(Parent.DrawHeight / Size.Y);
+        }
+
         /// <summary>
         /// A half-drum. Contains one centre and one rim hit.
         /// </summary>
diff --git a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
index 422ea2f929..38026517d9 100644
--- a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
@@ -31,7 +31,6 @@ namespace osu.Game.Rulesets.Taiko.UI
             sampleMapping = new DrumSampleMapping(controlPoints);
 
             RelativeSizeAxes = Axes.Both;
-            FillMode = FillMode.Fit;
         }
 
         [BackgroundDependencyLoader]
@@ -40,6 +39,8 @@ namespace osu.Game.Rulesets.Taiko.UI
             Child = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.InputDrum), _ => new Container
             {
                 RelativeSizeAxes = Axes.Both,
+                FillMode = FillMode.Fit,
+                Scale = new Vector2(0.9f),
                 Children = new Drawable[]
                 {
                     new TaikoHalfDrum(false)

From 2e022fbcb5e47519e57a3c973cbb58295e636788 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 12:47:57 +0900
Subject: [PATCH 02375/10326] Add comment about padding update computation

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 4587e896ba..4e0ef64ce1 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -164,6 +164,8 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             base.Update();
 
+            // Padding is required to be updated for elements which are based on "absolute" X sized elements.
+            // This is basically allowing for correct alignment as relative pieces move around them.
             rightArea.Padding = new MarginPadding { Left = leftArea.DrawWidth };
             hitTargetOffsetContent.Padding = new MarginPadding { Left = HitTarget.DrawWidth / 2 };
         }

From 22d2607ff58eb51bfa38d04e08a097011caabf8e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 12:53:09 +0900
Subject: [PATCH 02376/10326] Only commit if placement is active

---
 .../Edit/Blueprints/NotePlacementBlueprint.cs                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index fd8ef52cef..888ce695c2 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             base.UpdatePosition(screenSpacePosition);
 
             // Continue updating the position until placement is finished on mouse up.
-            BeginPlacement(TimeAt(screenSpacePosition), true);
+            BeginPlacement(TimeAt(screenSpacePosition), PlacementActive);
         }
     }
 }

From 4f0b5a34d3a1325b77d9901cfd43d6af55a0e29c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 12:53:23 +0900
Subject: [PATCH 02377/10326] Fix hold note placement body sized incorrectly

---
 .../Objects/Drawables/DrawableHoldNote.cs                    | 5 ++++-
 .../Objects/Drawables/Pieces/DefaultBodyPiece.cs             | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index a9ef661aaa..d63c0326a7 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -51,7 +51,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             AddRangeInternal(new[]
             {
-                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece())
+                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
+                {
+                    RelativeSizeAxes = Axes.Both
+                })
                 {
                     RelativeSizeAxes = Axes.X
                 },
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
index 0ee0a14df3..bc4a095395 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
@@ -34,7 +34,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
 
         public DefaultBodyPiece()
         {
-            RelativeSizeAxes = Axes.Both;
             Blending = BlendingParameters.Additive;
 
             AddLayout(subtractionCache);

From 61d2580e1c847cde16cfb4bb023dcc978730e636 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 13:07:30 +0900
Subject: [PATCH 02378/10326] Fix gap to left of InputDrum on legacy skins

---
 .../Skinning/LegacyInputDrum.cs               | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
index 276a9d76a8..1e8cade01d 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
@@ -20,36 +20,41 @@ namespace osu.Game.Rulesets.Taiko.Skinning
     {
         private LegacyHalfDrum left;
         private LegacyHalfDrum right;
+        private Container content;
 
         public LegacyInputDrum()
         {
-            Size = new Vector2(180, 200);
+            RelativeSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
-            Children = new Drawable[]
+            Child = content = new Container
             {
-                new Sprite
+                Size = new Vector2(180, 200),
+                Children = new Drawable[]
                 {
-                    Texture = skin.GetTexture("taiko-bar-left")
-                },
-                left = new LegacyHalfDrum(false)
-                {
-                    Name = "Left Half",
-                    RelativeSizeAxes = Axes.Both,
-                    RimAction = TaikoAction.LeftRim,
-                    CentreAction = TaikoAction.LeftCentre
-                },
-                right = new LegacyHalfDrum(true)
-                {
-                    Name = "Right Half",
-                    RelativeSizeAxes = Axes.Both,
-                    Origin = Anchor.TopRight,
-                    Scale = new Vector2(-1, 1),
-                    RimAction = TaikoAction.RightRim,
-                    CentreAction = TaikoAction.RightCentre
+                    new Sprite
+                    {
+                        Texture = skin.GetTexture("taiko-bar-left")
+                    },
+                    left = new LegacyHalfDrum(false)
+                    {
+                        Name = "Left Half",
+                        RelativeSizeAxes = Axes.Both,
+                        RimAction = TaikoAction.LeftRim,
+                        CentreAction = TaikoAction.LeftCentre
+                    },
+                    right = new LegacyHalfDrum(true)
+                    {
+                        Name = "Right Half",
+                        RelativeSizeAxes = Axes.Both,
+                        Origin = Anchor.TopRight,
+                        Scale = new Vector2(-1, 1),
+                        RimAction = TaikoAction.RightRim,
+                        CentreAction = TaikoAction.RightCentre
+                    }
                 }
             };
 
@@ -84,7 +89,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
             // Relying on RelativeSizeAxes.Both + FillMode.Fit doesn't work due to the precise pixel layout requirements.
             // This is a bit ugly but makes the non-legacy implementations a lot cleaner to implement.
-            Scale = new Vector2(Parent.DrawHeight / Size.Y);
+            content.Scale = new Vector2(DrawHeight / content.Size.Y);
         }
 
         /// <summary>

From 4032d669596a2031eca223c37bc2cddb9a102725 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 13:17:46 +0900
Subject: [PATCH 02379/10326] Apply same legacy scale adjust logic to
 TaikoLegacyHitTarget

---
 .../Skinning/TaikoLegacyHitTarget.cs          | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
index b80f273d24..7c1e65f569 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -12,32 +13,47 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 {
     public class TaikoLegacyHitTarget : CompositeDrawable
     {
+        private Container content;
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
+            InternalChild = content = new Container
             {
-                new Sprite
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new Drawable[]
                 {
-                    Texture = skin.GetTexture("approachcircle"),
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(0.73f) * 0.625f,
-                    Alpha = 0.7f,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
-                new Sprite
-                {
-                    Texture = skin.GetTexture("taikobigcircle"),
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(0.7f) * 0.625f,
-                    Alpha = 0.5f,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
+                    new Sprite
+                    {
+                        Texture = skin.GetTexture("approachcircle"),
+                        Scale = new Vector2(0.73f),
+                        Alpha = 0.7f,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
+                    new Sprite
+                    {
+                        Texture = skin.GetTexture("taikobigcircle"),
+                        Scale = new Vector2(0.7f),
+                        Alpha = 0.5f,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
+                }
             };
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // Relying on RelativeSizeAxes.Both + FillMode.Fit doesn't work due to the precise pixel layout requirements.
+            // This is a bit ugly but makes the non-legacy implementations a lot cleaner to implement.
+            content.Scale = new Vector2(DrawHeight / TaikoPlayfield.DEFAULT_HEIGHT);
+        }
     }
 }

From 559487b20583fa087760f0410da44d8d35927892 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 13:23:49 +0900
Subject: [PATCH 02380/10326] Move playfield background implementation to its
 own file

---
 .../Skinning/TestSceneTaikoPlayfield.cs       |  2 +-
 .../Skinning/TaikoLegacySkinTransformer.cs    |  2 +
 .../UI/PlayfieldBackgroundLeft.cs             | 37 +++++++++++++++++++
 ...kground.cs => PlayfieldBackgroundRight.cs} |  2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 25 +------------
 5 files changed, 43 insertions(+), 25 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/UI/PlayfieldBackgroundLeft.cs
 rename osu.Game.Rulesets.Taiko/UI/{PlayfieldBackground.cs => PlayfieldBackgroundRight.cs} (96%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
index 3c7360a6bd..16b3c036a3 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         {
             typeof(TaikoHitTarget),
             typeof(TaikoLegacyHitTarget),
-            typeof(PlayfieldBackground),
+            typeof(PlayfieldBackgroundRight),
         }).ToList();
 
         [Cached(typeof(IScrollingInfo))]
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 919788f08a..15bbd32eb1 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -59,11 +59,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                 case TaikoSkinComponents.PlayfieldBackgroundRight:
                     if (GetTexture("taiko-bar-right") != null)
+                    {
                         return this.GetAnimation("taiko-bar-right", false, false).With(d =>
                         {
                             d.RelativeSizeAxes = Axes.Both;
                             d.Size = Vector2.One;
                         });
+                    }
 
                     return null;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/PlayfieldBackgroundLeft.cs b/osu.Game.Rulesets.Taiko/UI/PlayfieldBackgroundLeft.cs
new file mode 100644
index 0000000000..2a8890a95d
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/PlayfieldBackgroundLeft.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.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 osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    internal class PlayfieldBackgroundLeft : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            RelativeSizeAxes = Axes.Both;
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colours.Gray1,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new Box
+                {
+                    Anchor = Anchor.TopRight,
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 10,
+                    Colour = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/PlayfieldBackground.cs b/osu.Game.Rulesets.Taiko/UI/PlayfieldBackgroundRight.cs
similarity index 96%
rename from osu.Game.Rulesets.Taiko/UI/PlayfieldBackground.cs
rename to osu.Game.Rulesets.Taiko/UI/PlayfieldBackgroundRight.cs
index 39fb6c0476..44bfdacf37 100644
--- a/osu.Game.Rulesets.Taiko/UI/PlayfieldBackground.cs
+++ b/osu.Game.Rulesets.Taiko/UI/PlayfieldBackgroundRight.cs
@@ -12,7 +12,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    public class PlayfieldBackground : CompositeDrawable
+    public class PlayfieldBackgroundRight : CompositeDrawable
     {
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 4e0ef64ce1..1e8d37e3e5 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -3,10 +3,8 @@
 
 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.Shapes;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -18,7 +16,6 @@ using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Skinning;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -58,7 +55,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             InternalChildren = new Drawable[]
             {
-                new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.PlayfieldBackgroundRight), _ => new PlayfieldBackground()),
+                new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.PlayfieldBackgroundRight), _ => new PlayfieldBackgroundRight()),
                 rightArea = new Container
                 {
                     Name = "Right area",
@@ -126,25 +123,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Size = new Vector2(left_area_size, 1),
                     Children = new Drawable[]
                     {
-                        new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.PlayfieldBackgroundLeft), _ => new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    Colour = colours.Gray1,
-                                    RelativeSizeAxes = Axes.Both,
-                                },
-                                new Box
-                                {
-                                    Anchor = Anchor.TopRight,
-                                    RelativeSizeAxes = Axes.Y,
-                                    Width = 10,
-                                    Colour = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
-                                },
-                            }
-                        }),
+                        new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.PlayfieldBackgroundLeft), _ => new PlayfieldBackgroundLeft()),
                         new InputDrum(controlPoints)
                         {
                             Anchor = Anchor.CentreLeft,

From 12c235027df835b189669ade2313f8128b4d31ea Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 13:28:27 +0900
Subject: [PATCH 02381/10326] Remove stale file

---
 .../Edit/Masks/ManiaSelectionBlueprint.cs      | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Edit/Masks/ManiaSelectionBlueprint.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/Masks/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Masks/ManiaSelectionBlueprint.cs
deleted file mode 100644
index 433db79ae0..0000000000
--- a/osu.Game.Rulesets.Mania/Edit/Masks/ManiaSelectionBlueprint.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 osu.Framework.Graphics;
-using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects.Drawables;
-
-namespace osu.Game.Rulesets.Mania.Edit.Masks
-{
-    public abstract class ManiaSelectionBlueprint : OverlaySelectionBlueprint
-    {
-        protected ManiaSelectionBlueprint(DrawableHitObject drawableObject)
-            : base(drawableObject)
-        {
-            RelativeSizeAxes = Axes.None;
-        }
-    }
-}

From f804be25d13e785dd7a0152f7b9b7c79d93d3138 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 13:36:33 +0900
Subject: [PATCH 02382/10326] Remove incorrect area sizing (now using fillmode
 / relative instead)

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 1e8d37e3e5..8402ebb4c4 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -28,11 +27,6 @@ namespace osu.Game.Rulesets.Taiko.UI
         /// </summary>
         public const float DEFAULT_HEIGHT = 178;
 
-        /// <summary>
-        /// The size of the left area of the playfield. This area contains the input drum.
-        /// </summary>
-        private const float left_area_size = 180;
-
         private Container<HitExplosion> hitExplosionContainer;
         private Container<KiaiHitExplosion> kiaiExplosionContainer;
         private JudgementContainer<DrawableTaikoJudgement> judgementContainer;
@@ -120,7 +114,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     RelativeSizeAxes = Axes.Both,
                     FillMode = FillMode.Fit,
                     BorderColour = colours.Gray0,
-                    Size = new Vector2(left_area_size, 1),
                     Children = new Drawable[]
                     {
                         new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.PlayfieldBackgroundLeft), _ => new PlayfieldBackgroundLeft()),

From b4e1ad81d07d89f4ea9b62dc684c1562629cb472 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 13:48:08 +0900
Subject: [PATCH 02383/10326] Fix alignment of right half of legacy input drum

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
index 1e8cade01d..81d645e294 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             const float ratio = 1.6f;
 
             // because the right half is flipped, we need to position using width - position to get the true "topleft" origin position
-            float negativeScaleAdjust = Width / ratio;
+            float negativeScaleAdjust = content.Width / ratio;
 
             if (skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.1m)
             {

From 2a1cc35541f46c8bc36d8447fddce0d7c37589de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 14:01:50 +0900
Subject: [PATCH 02384/10326] Add test scene

---
 .../Skinning/TestSceneDrawableBarLine.cs      | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
new file mode 100644
index 0000000000..a1a5c8c836
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
@@ -0,0 +1,90 @@
+// Copyright (c) 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;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
+{
+    [TestFixture]
+    public class TestSceneDrawableBarLine : TaikoSkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
+        {
+            typeof(DrawableBarLine),
+        }).ToList();
+
+        [Cached(typeof(IScrollingInfo))]
+        private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
+        {
+            Direction = { Value = ScrollingDirection.Left },
+            TimeRange = { Value = 5000 },
+        };
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddStep("Bar line ", () => SetContents(() =>
+            {
+                var hoc = new ScrollingHitObjectContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Height = 0.8f
+                };
+
+                hoc.Add(new DrawableBarLine(createBarLineAtCurrentTime())
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                });
+
+                return hoc;
+            }));
+
+            AddStep("Bar line (major)", () => SetContents(() =>
+            {
+                var hoc = new ScrollingHitObjectContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Height = 0.8f
+                };
+
+                hoc.Add(new DrawableBarLineMajor(createBarLineAtCurrentTime(true))
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                });
+
+                return hoc;
+            }));
+        }
+
+        private BarLine createBarLineAtCurrentTime(bool major = false)
+        {
+            var drumroll = new BarLine
+            {
+                Major = major,
+                StartTime = Time.Current + 1000,
+            };
+
+            var cpi = new ControlPointInfo();
+            cpi.Add(0, new TimingControlPoint { BeatLength = 500 });
+
+            drumroll.ApplyDefaults(cpi, new BeatmapDifficulty());
+
+            return drumroll;
+        }
+    }
+}

From 12f156dcecdb34228c7cb4209b09fbfc00d79821 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 14:32:48 +0900
Subject: [PATCH 02385/10326] Add taiko barline skinning support

---
 .../Objects/Drawables/DrawableBarLine.cs      | 13 +++++----
 .../Objects/Drawables/DrawableBarLineMajor.cs |  2 +-
 .../Skinning/LegacyBarLine.cs                 | 27 +++++++++++++++++++
 .../Skinning/TaikoLegacySkinTransformer.cs    |  6 +++++
 .../TaikoSkinComponents.cs                    |  3 ++-
 5 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/LegacyBarLine.cs

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
index e9caabbcc8..1e08e921a6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Objects;
 using osuTK;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -27,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// <summary>
         /// The visual line tracker.
         /// </summary>
-        protected Box Tracker;
+        protected SkinnableDrawable Line;
 
         /// <summary>
         /// The bar line.
@@ -45,13 +46,15 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             RelativeSizeAxes = Axes.Y;
             Width = tracker_width;
 
-            AddInternal(Tracker = new Box
+            AddInternal(Line = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.BarLine), _ => new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                EdgeSmoothness = new Vector2(0.5f, 0),
+            })
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                EdgeSmoothness = new Vector2(0.5f, 0),
-                Alpha = 0.75f
+                Alpha = 0.75f,
             });
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.cs
index 4d3a1a3f8a..62aab3524b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 }
             });
 
-            Tracker.Alpha = 1f;
+            Line.Alpha = 1f;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyBarLine.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyBarLine.cs
new file mode 100644
index 0000000000..7d08a21ab1
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyBarLine.cs
@@ -0,0 +1,27 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.Skinning
+{
+    public class LegacyBarLine : Sprite
+    {
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            Texture = skin.GetTexture("taiko-barline");
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            RelativeSizeAxes = Axes.Both;
+            Size = new Vector2(1, 0.88f);
+            FillMode = FillMode.Fill;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 15bbd32eb1..447d6ae455 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -75,6 +75,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                         return Drawable.Empty();
 
                     return null;
+
+                case TaikoSkinComponents.BarLine:
+                    if (GetTexture("taiko-barline") != null)
+                        return new LegacyBarLine();
+
+                    return null;
             }
 
             return source.GetDrawableComponent(component);
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index 60a2be7f99..a90ce608b2 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -13,6 +13,7 @@ namespace osu.Game.Rulesets.Taiko
         Swell,
         HitTarget,
         PlayfieldBackgroundLeft,
-        PlayfieldBackgroundRight
+        PlayfieldBackgroundRight,
+        BarLine
     }
 }

From 8f31846defad9ea469b4aedd5970355177c20d69 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 14:39:34 +0900
Subject: [PATCH 02386/10326] Add playfield background to test scene to better
 understand bounds

---
 .../Skinning/TestSceneDrawableBarLine.cs      | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
index a1a5c8c836..e72f42a0b4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
@@ -7,10 +7,12 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
 
@@ -36,11 +38,19 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         {
             AddStep("Bar line ", () => SetContents(() =>
             {
-                var hoc = new ScrollingHitObjectContainer
+                ScrollingHitObjectContainer hoc;
+
+                var cont = new Container
                 {
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.8f,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Height = 0.8f
+                    Children = new Drawable[]
+                    {
+                        new TaikoPlayfield(new ControlPointInfo()),
+                        hoc = new ScrollingHitObjectContainer()
+                    }
                 };
 
                 hoc.Add(new DrawableBarLine(createBarLineAtCurrentTime())
@@ -49,16 +59,24 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     Origin = Anchor.Centre,
                 });
 
-                return hoc;
+                return cont;
             }));
 
             AddStep("Bar line (major)", () => SetContents(() =>
             {
-                var hoc = new ScrollingHitObjectContainer
+                ScrollingHitObjectContainer hoc;
+
+                var cont = new Container
                 {
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.8f,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Height = 0.8f
+                    Children = new Drawable[]
+                    {
+                        new TaikoPlayfield(new ControlPointInfo()),
+                        hoc = new ScrollingHitObjectContainer()
+                    }
                 };
 
                 hoc.Add(new DrawableBarLineMajor(createBarLineAtCurrentTime(true))
@@ -67,7 +85,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     Origin = Anchor.Centre,
                 });
 
-                return hoc;
+                return cont;
             }));
         }
 
@@ -76,7 +94,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             var drumroll = new BarLine
             {
                 Major = major,
-                StartTime = Time.Current + 1000,
+                StartTime = Time.Current + 2000,
             };
 
             var cpi = new ControlPointInfo();

From ab93c819b54f930211c507f28ea23b3ae9ca6cfa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 15:26:03 +0900
Subject: [PATCH 02387/10326] Add metric right background element

---
 .../metrics-skin/taiko-bar-right@2x.png          | Bin 0 -> 7830 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-bar-right@2x.png

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-bar-right@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-bar-right@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ca8a40d88a13e447d26cd8c0e777173d8e60445
GIT binary patch
literal 7830
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
Of{?|_1M@zM+V&ruzN7m9

literal 0
HcmV?d00001


From 712331a2fe524fb6a3c7a8d77a8095d50d7c83d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 15:26:20 +0900
Subject: [PATCH 02388/10326] Add metric barline element

---
 .../Resources/metrics-skin/taiko-barline@2x.png  | Bin 0 -> 1551 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-barline@2x.png

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-barline@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-barline@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e44f3309585d83ce100c59f08e880582b4feb70
GIT binary patch
literal 1551
zcmbVMU5MON6wZ{kw7awwY(eVFC539K`JE)YxozB?o!NE*W;@Idbc)#aZgOWP&LlTY
z?sjIkAY}zbL=i1mw)!H1|5kh|XzBV=MQ9PhC&357H&+pT5E1cae!{NQzg`HrKi~b%
z`OZD(JX4uFzH4m%7{_tD>~g8f{yR7>cY4QmHoJE9^jGY+Gb*1-IBxvj^viLpuiVFR
z+xGjlI;}g8K$ip}^2h=fdqKp|9Cvi87a_NeDOkWwKeYHCKf1vK-?R9Wx+6PL5x4yE
za*XGf=W6b9+ciCY>S1uS2N^+tDFVHq6DF`{@qJ#%=IOS?gFb||ExwQ%1a+qZiX_HB
z7Y)Hxv`H{wii)AhdE+6V%8Dt;lai7bWCh9w)F;4j@XT85HDI-LY-o$EEWSl)1SP54
z?TX#JNaCiXm?q;;B~=v|LP(ZEih4qr92hZ_aN@>(M12y1lo2hEMQZWP(}9E_%4ox6
z7$z1lsfQv-5#>};ALzLmE?SH`edC@h;SLUPNE3!tGHlc$lq4<kH`LkjCIc+Aj+5EA
zqc1^_nMmmDc_w2RkUOH2+ERq2Do)5^?Bdz;%*_L-ng|wSj3|j~gmgv^RT;SqRHhm{
z=pfe*QxS(YT)`zovBj&hDhskE$oZNw3DrDQ^~16WWqAN~i03z!HbYeg)u5(8UE2g@
zN#h}k{uS)GutDMgG0A>_npld$CJ(Ye!XoLAm>Fi?<u~rz#bPBU4Zp(<lIrmpV9yo}
z#WV~-6_vibjsxv5p(u2*U9xx<9?|zbsHnQ$P_Qd#is}iPiWdYE>4u<b=0qNQ$k2_(
z=zfW~i)j*!?tB09{)yOUMTk0g&6Ad9nmw@WC+uC9hQ%|F&kbiCAM_IjA~!7ri+9ru
zz#c!`_U}3Z1KMs2Gtz&^ivcVl4cbL9E;L!R{zK+T%zY^>+JO@3uOj<r8wz{`XI&$m
zX6=eCvWAC4*5zW>&em@wpRrbW#V!?Ut#8&}JTi7s-n;eFd&ciS@k0B%Kc0J_?4qB(
z*TISbbBCY4^~B8d&Np-Cetmq}Ufa6&_8Z*%mSbms;PUc8@%f9RvG&gN?(Np^H=k6l
ze|tfB^=o~-@X}2>{%rM=*J_o*wteBD`X%?&B}MrB@+uv7etTPg%f9f%>j%$#ywcvY
s=a&z1@BMr=_vr4Y_SNCqmUoYQcxCnFFCUw_oVILxcCPgP%-NMc0h$5s%m4rY

literal 0
HcmV?d00001


From e3a3144236fe6e2790dafb5198248392b9227145 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 23 Apr 2020 11:07:55 +0300
Subject: [PATCH 02389/10326] Rename editor tests namespace from "Editor" to
 "Editing"

---
 osu.Game.Tests/{Editor => Editing}/EditorChangeHandlerTest.cs | 2 +-
 .../{Editor => Editing}/LegacyEditorBeatmapPatcherTest.cs     | 2 +-
 .../TestSceneHitObjectComposerDistanceSnapping.cs             | 2 +-
 .../Visual/{Editor => Editing}/TestSceneBeatDivisorControl.cs | 2 +-
 .../Visual/{Editor => Editing}/TestSceneComposeScreen.cs      | 2 +-
 .../Visual/{Editor => Editing}/TestSceneDistanceSnapGrid.cs   | 2 +-
 .../Visual/{Editor => Editing}/TestSceneEditorChangeStates.cs | 4 ++--
 .../{Editor => Editing}/TestSceneEditorComposeRadioButtons.cs | 2 +-
 .../Visual/{Editor => Editing}/TestSceneEditorMenuBar.cs      | 2 +-
 .../Visual/{Editor => Editing}/TestSceneEditorSeekSnapping.cs | 2 +-
 .../{Editor => Editing}/TestSceneEditorSummaryTimeline.cs     | 2 +-
 .../Visual/{Editor => Editing}/TestSceneHitObjectComposer.cs  | 2 +-
 .../Visual/{Editor => Editing}/TestScenePlaybackControl.cs    | 2 +-
 .../TestSceneTimelineBlueprintContainer.cs                    | 2 +-
 .../{Editor => Editing}/TestSceneTimelineTickDisplay.cs       | 2 +-
 .../Visual/{Editor => Editing}/TestSceneTimingScreen.cs       | 2 +-
 .../Visual/{Editor => Editing}/TestSceneWaveform.cs           | 2 +-
 .../{Editor => Editing}/TestSceneZoomableScrollContainer.cs   | 2 +-
 .../Visual/{Editor => Editing}/TimelineTestScene.cs           | 2 +-
 19 files changed, 20 insertions(+), 20 deletions(-)
 rename osu.Game.Tests/{Editor => Editing}/EditorChangeHandlerTest.cs (98%)
 rename osu.Game.Tests/{Editor => Editing}/LegacyEditorBeatmapPatcherTest.cs (99%)
 rename osu.Game.Tests/{Editor => Editing}/TestSceneHitObjectComposerDistanceSnapping.cs (99%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneBeatDivisorControl.cs (98%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneComposeScreen.cs (96%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneDistanceSnapGrid.cs (99%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneEditorChangeStates.cs (98%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneEditorComposeRadioButtons.cs (97%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneEditorMenuBar.cs (99%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneEditorSeekSnapping.cs (99%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneEditorSummaryTimeline.cs (95%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneHitObjectComposer.cs (98%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestScenePlaybackControl.cs (96%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneTimelineBlueprintContainer.cs (95%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneTimelineTickDisplay.cs (95%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneTimingScreen.cs (96%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneWaveform.cs (98%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneZoomableScrollContainer.cs (99%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TimelineTestScene.cs (99%)

diff --git a/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
similarity index 98%
rename from osu.Game.Tests/Editor/EditorChangeHandlerTest.cs
rename to osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
index 9613f250c4..feda1ae0e9 100644
--- a/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs
+++ b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
@@ -5,7 +5,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Edit;
 
-namespace osu.Game.Tests.Editor
+namespace osu.Game.Tests.Editing
 {
     [TestFixture]
     public class EditorChangeHandlerTest
diff --git a/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
similarity index 99%
rename from osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
rename to osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
index c24418d688..a3ab677d96 100644
--- a/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
+++ b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
@@ -17,7 +17,7 @@ using osu.Game.Screens.Edit;
 using osuTK;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
-namespace osu.Game.Tests.Editor
+namespace osu.Game.Tests.Editing
 {
     [TestFixture]
     public class LegacyEditorBeatmapPatcherTest
diff --git a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
similarity index 99%
rename from osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
rename to osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index 3cb5909ba9..168ec0f09d 100644
--- a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Osu.Edit;
 using osu.Game.Screens.Edit;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Tests.Editor
+namespace osu.Game.Tests.Editing
 {
     [HeadlessTest]
     public class TestSceneHitObjectComposerDistanceSnapping : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index fd7a5980f3..f6e69fd8bf 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -14,7 +14,7 @@ using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneBeatDivisorControl : OsuManualInputManagerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeScreen.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneComposeScreen.cs
index a8830824c0..6f5655006e 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeScreen.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneComposeScreen : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index f49256a633..417d16fdb0 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneDistanceSnapGrid : EditorClockTestScene
     {
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
index efc2a6f552..d85bf15d52 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneEditorChangeStates : ScreenTestScene
     {
@@ -162,7 +162,7 @@ namespace osu.Game.Tests.Visual.Editor
 
         private void addRedoSteps() => AddStep("redo", () => editor.Redo());
 
-        private class TestEditor : Screens.Edit.Editor
+        private class TestEditor : Editor
         {
             public new void Undo() => base.Undo();
 
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeRadioButtons.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
similarity index 97%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorComposeRadioButtons.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
index 1709067d5d..2deeaef1f6 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeRadioButtons.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
@@ -7,7 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit.Components.RadioButtons;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorComposeRadioButtons : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorMenuBar.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorMenuBar.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
index 53c2d62067..2cbdacb61c 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorMenuBar.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Components.Menus;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorMenuBar : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorSeekSnapping.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorSeekSnapping.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
index 3118e0cabe..41d1459103 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorSeekSnapping.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorSeekSnapping : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorSummaryTimeline.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
index 2e04eb50ca..c92423545d 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorSummaryTimeline.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorSummaryTimeline : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
index e41c2427fb..ddaca26220 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
@@ -20,7 +20,7 @@ using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneHitObjectComposer : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestScenePlaybackControl.cs b/osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Editor/TestScenePlaybackControl.cs
rename to osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
index 0d4fe4366d..3af976cae0 100644
--- a/osu.Game.Tests/Visual/Editor/TestScenePlaybackControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
@@ -9,7 +9,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Screens.Edit.Components;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestScenePlaybackControl : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
index 4d8f877575..5ab2f49b4a 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
@@ -7,7 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneTimelineBlueprintContainer : TimelineTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
index 43a3cd6122..e33040acdc 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
@@ -8,7 +8,7 @@ using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneTimelineTickDisplay : TimelineTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
index ae09a7fa47..a6dbe9571e 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Timing;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneTimingScreen : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs b/osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs
index e2762f3d5f..0c1296b82c 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Osu;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneWaveform : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
index 19d19c2759..082268d824 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
@@ -15,7 +15,7 @@ using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneZoomableScrollContainer : OsuManualInputManagerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
rename to osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 7081eb3af5..56b2860e96 100644
--- a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -18,7 +18,7 @@ using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public abstract class TimelineTestScene : EditorClockTestScene
     {

From 0a840a26133b76a1bbd80b9d77782843460e28d9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 17:41:33 +0900
Subject: [PATCH 02390/10326] Fix mania not getting its own selection handler

---
 osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
index d744036b4c..cea27498c3 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
@@ -30,5 +30,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             return base.CreateBlueprintFor(hitObject);
         }
+
+        protected override SelectionHandler CreateSelectionHandler() => new ManiaSelectionHandler();
     }
 }

From 4ebb28d3e7fdc0a412643f5e4a3effce353e9ebe Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 17:52:54 +0900
Subject: [PATCH 02391/10326] wip

---
 .../Edit/Blueprints/HoldNoteSelectionBlueprint.cs          | 2 ++
 osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs      | 4 ++--
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs  | 7 +++++--
 osu.Game/Tests/Beatmaps/TestBeatmap.cs                     | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
index d569d68b59..43d43ef252 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
@@ -76,5 +76,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         }
 
         public override Quad SelectionQuad => ScreenSpaceDrawQuad;
+
+        public override Vector2 SelectionPoint => DrawableObject.Head.ScreenSpaceDrawQuad.Centre;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 9069a636a8..78f159b733 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             var maniaBlueprint = (ManiaSelectionBlueprint)moveEvent.Blueprint;
             int lastColumn = maniaBlueprint.DrawableObject.HitObject.Column;
 
-            adjustOrigins(maniaBlueprint);
+            // adjustOrigins(maniaBlueprint);
             performDragMovement(moveEvent);
             performColumnMovement(lastColumn, moveEvent);
 
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             // When scrolling downwards the anchor position is at the bottom of the screen, however the movement event assumes the anchor is at the top of the screen.
             // This causes the delta to assume a positive hitobject position, and which can be corrected for by subtracting the parent height.
             if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
-                delta -= moveEvent.Blueprint.Parent.DrawHeight; // todo: probably wrong
+                delta -= moveEvent.Blueprint.Parent.DrawHeight; // todo: definitely wrong
 
             foreach (var selectionBlueprint in SelectedBlueprints)
             {
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index ad16e22e5e..0823be01f8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -401,15 +401,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             HitObject draggedObject = movementBlueprint.HitObject;
 
-            // The final movement position, relative to screenSpaceMovementStartPosition
+            // The final movement position, relative to movementBlueprintOriginalPosition
             Vector2 movePosition = movementBlueprintOriginalPosition.Value + e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
 
-            (Vector2 snappedPosition, double snappedTime) = snapProvider.GetSnappedPosition(ToLocalSpace(movePosition), draggedObject.StartTime);
+            (Vector2 snappedPosition, _) = snapProvider.GetSnappedPosition(ToLocalSpace(movePosition), draggedObject.StartTime);
 
             // Move the hitobjects
             if (!selectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, ToScreenSpace(snappedPosition))))
                 return true;
 
+            // Todo: Temp
+            (_, double snappedTime) = snapProvider.GetSnappedPosition(ToLocalSpace(snappedPosition), draggedObject.StartTime);
+
             // Apply the start time at the newly snapped-to position
             double offset = snappedTime - draggedObject.StartTime;
             foreach (HitObject obj in selectionHandler.SelectedHitObjects)
diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index 96e3c037a3..a7c84bf692 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Tests.Beatmaps
             HitObjects = baseBeatmap.HitObjects;
 
             BeatmapInfo.Ruleset = ruleset;
+            BeatmapInfo.RulesetID = ruleset.ID ?? 0;
             BeatmapInfo.BeatmapSet.Metadata = BeatmapInfo.Metadata;
             BeatmapInfo.BeatmapSet.Beatmaps = new List<BeatmapInfo> { BeatmapInfo };
             BeatmapInfo.BeatmapSet.OnlineInfo = new BeatmapSetOnlineInfo

From b471a240cc9f1510a945352937ddd6b3834fb8f7 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Thu, 23 Apr 2020 16:59:56 +0800
Subject: [PATCH 02392/10326] Fixed merge typo in playfield members

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index a13a818f68..d44de496f4 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private readonly Container<KiaiHitExplosion> kiaiExplosionContainer;
         private readonly JudgementContainer<DrawableTaikoJudgement> judgementContainer;
         private readonly ScrollingHitObjectContainer drumRollHitContainer;
-        internal readonly HitTarget HitTarget;
+        internal readonly Drawable HitTarget;
 
         private readonly ProxyContainer topLevelHitContainer;
         private readonly ProxyContainer barlineContainer;

From a9897ba627311977186f50a9db0b97326e8351b4 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Thu, 23 Apr 2020 18:15:12 +0800
Subject: [PATCH 02393/10326] Moved proxy behaviour to drumroll container

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index d44de496f4..07f3fe4e01 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -195,7 +195,8 @@ namespace osu.Game.Rulesets.Taiko.UI
                 {
                     Name = "Top level hit objects",
                     RelativeSizeAxes = Axes.Both,
-                }
+                },
+                drumRollHitContainer.CreateProxy()
             };
         }
 
@@ -241,7 +242,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                 drawableHit = new DrawableFlyingCentreHit(Time.Current, isStrong);
 
             drumRollHitContainer.Add(drawableHit);
-            topLevelHitContainer.Add(drawableHit.CreateProxiedContent());
+
         }
 
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)

From f1ae8af5818958f67b057151ed3c58726fccfa44 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Thu, 23 Apr 2020 18:16:05 +0800
Subject: [PATCH 02394/10326] Removed un-needed using directives

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index d4d073ee94..f767403c65 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -1,11 +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.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 

From dded4f8176265a4bc5571856424edd9eef883943 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Thu, 23 Apr 2020 18:17:31 +0800
Subject: [PATCH 02395/10326] Fixed syntax warnings in Taiko playfield

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 07f3fe4e01..f4982fa7e6 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -242,7 +242,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                 drawableHit = new DrawableFlyingCentreHit(Time.Current, isStrong);
 
             drumRollHitContainer.Add(drawableHit);
-
         }
 
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
@@ -289,8 +288,9 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             if (Time.Elapsed < 0)
             {
-                foreach (DrawableHit taikoHit in drumRollHitContainer.Objects)
+                foreach (var o in drumRollHitContainer.Objects)
                 {
+                    var taikoHit = (DrawableHit)o;
                     taikoHit.RemoveProxiedContent();
                     drumRollHitContainer.Remove(taikoHit);
                 }

From 0a0ea39431ebf6432c0aa7eb071591931074a7fc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 23 Apr 2020 13:24:18 +0300
Subject: [PATCH 02396/10326] Mark the top ruleset creation method as
 can-be-null

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 25ac768272..83db86c0a0 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
@@ -145,6 +146,7 @@ namespace osu.Game.Tests.Visual
         /// <remarks>
         /// When testing against ruleset-specific components, this method must be overriden to their ruleset.
         /// </remarks>
+        [CanBeNull]
         protected virtual Ruleset CreateRuleset() => null;
 
         protected virtual IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset);

From c059588a09a761d6c92304d71b77218c836c915f Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Thu, 23 Apr 2020 18:26:40 +0800
Subject: [PATCH 02397/10326] Removed un-needed unproxy method

---
 .../Objects/Drawables/DrawableTaikoHitObject.cs                 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index e0ff236297..1be04f1760 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -76,8 +76,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         public Drawable CreateProxiedContent() => proxiedContent.CreateProxy();
 
-        public void RemoveProxiedContent() => UnproxyContent();
-
         public abstract bool OnPressed(TaikoAction action);
 
         public virtual void OnReleased(TaikoAction action)

From 1fa3764a1db26d70a124437d3c6ae6e70c780674 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Thu, 23 Apr 2020 18:26:53 +0800
Subject: [PATCH 02398/10326] Cleaned up Update method in Taiko Playfield

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index f4982fa7e6..3d371d5260 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -286,14 +286,12 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             base.Update();
 
+            // When rewinding, make sure to remove any auxilliary hit notes that were
+            // spawned and played during a drumroll.
             if (Time.Elapsed < 0)
             {
                 foreach (var o in drumRollHitContainer.Objects)
-                {
-                    var taikoHit = (DrawableHit)o;
-                    taikoHit.RemoveProxiedContent();
-                    drumRollHitContainer.Remove(taikoHit);
-                }
+                    drumRollHitContainer.Remove(o);
             }
         }
 

From 2fa47992dc58f0c8293be22eba14673391181933 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 23 Apr 2020 13:25:06 +0300
Subject: [PATCH 02399/10326] Seal the ruleset creation methods and let
 abstract method take their place

Also makes `CreatePlayerRuleset()` and `CreateRulesetForSkinProvider()` not-null to avoid unwanted behaviour with their derivers
---
 .../CatchSkinnableTestScene.cs                |  2 +-
 .../Mods/TestSceneCatchModPerfect.cs          |  4 +--
 .../TestSceneCatchPlayer.cs                   |  2 +-
 .../Mods/TestSceneManiaModPerfect.cs          |  4 +--
 .../Skinning/ManiaSkinnableTestScene.cs       |  4 +--
 .../TestSceneManiaPlayer.cs                   |  2 +-
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   |  4 +--
 .../Mods/TestSceneOsuModDoubleTime.cs         |  4 +--
 .../Mods/TestSceneOsuModPerfect.cs            |  4 +--
 .../OsuSkinnableTestScene.cs                  |  2 +-
 .../TestSceneMissHitWindowJudgements.cs       |  4 +--
 .../TestSceneOsuPlayer.cs                     |  2 +-
 .../Mods/TestSceneTaikoModPerfect.cs          |  4 +--
 .../TaikoSkinnableTestScene.cs                |  2 +-
 .../TestSceneTaikoPlayer.cs                   |  2 +-
 .../Visual/Gameplay/TestPlayerTestScene.cs    |  2 +-
 osu.Game/Tests/Visual/PlayerTestScene.cs      | 30 ++++++++++++++-----
 osu.Game/Tests/Visual/SkinnableTestScene.cs   | 19 +++++++-----
 18 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
index c0060af74a..0c46b078b5 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(CatchLegacySkinTransformer),
         };
 
-        protected override Ruleset CreateRuleset() => new CatchRuleset();
+        protected override Ruleset CreateRulesetForSkinProvider() => new CatchRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
index 1e69a3f1b6..3e06e78dba 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
 {
     public class TestSceneCatchModPerfect : ModPerfectTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
+
         public TestSceneCatchModPerfect()
             : base(new CatchModPerfect())
         {
@@ -50,7 +52,5 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
         // We only care about testing misses, hits are tested via JuiceStream
         [TestCase(true)]
         public void TestTinyDroplet(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new TinyDroplet { StartTime = 1000 }), shouldMiss);
-
-        protected override Ruleset CreateRuleset() => new CatchRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs
index 722f3b5a3b..e1de461e3b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(CatchRuleset),
         };
 
-        protected override Ruleset CreateRuleset() => new CatchRuleset();
+        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index 72ef58ec73..2e3b21aed7 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -10,6 +10,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
 {
     public class TestSceneManiaModPerfect : ModPerfectTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
         public TestSceneManiaModPerfect()
             : base(new ManiaModPerfect())
         {
@@ -22,7 +24,5 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         [TestCase(false)]
         [TestCase(true)]
         public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HoldNote { StartTime = 1000, EndTime = 3000 }), shouldMiss);
-
-        protected override Ruleset CreateRuleset() => new ManiaRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index f41ba4db42..a3c1d518c5 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             typeof(ManiaSettingsSubsection)
         };
 
+        protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
+
         protected ManiaSkinnableTestScene()
         {
             scrollingInfo.Direction.Value = ScrollingDirection.Down;
@@ -58,8 +60,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             AddStep("change direction to up", () => scrollingInfo.Direction.Value = ScrollingDirection.Up);
         }
 
-        protected override Ruleset CreateRuleset() => new ManiaRuleset();
-
         private class TestScrollingInfo : IScrollingInfo
         {
             public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs
index 11663605e2..f4640fd05b 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             typeof(ManiaRuleset),
         };
 
-        protected override Ruleset CreateRuleset() => new ManiaRuleset();
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 6c5949ca85..7c396054f1 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public class TestSceneOsuModDifficultyAdjust : ModTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
         [Test]
         public void TestNoAdjustment() => CreateModTest(new ModTestData
         {
@@ -77,7 +79,5 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             return Player.ScoreProcessor.JudgedHits >= 2;
         }
-
-        protected override Ruleset CreateRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
index c61ef2724b..94ef6140e9 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
@@ -10,6 +10,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public class TestSceneOsuModDoubleTime : ModTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
         [TestCase(0.5)]
         [TestCase(1.01)]
         [TestCase(1.5)]
@@ -26,7 +28,5 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                                       Precision.AlmostEquals(Player.GameplayClockContainer.GameplayClock.Rate, mod.SpeedChange.Value)
             });
         }
-
-        protected override Ruleset CreateRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
index ddbbf9554c..985baa8cf5 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public class TestSceneOsuModPerfect : ModPerfectTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
         public TestSceneOsuModPerfect()
             : base(new OsuModPerfect())
         {
@@ -48,7 +50,5 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 
             CreateHitObjectTest(new HitObjectTestData(spinner), shouldMiss);
         }
-
-        protected override Ruleset CreateRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
index 1458270193..90ebbd9f04 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             typeof(OsuLegacySkinTransformer),
         };
 
-        protected override Ruleset CreateRuleset() => new OsuRuleset();
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
index 13457ccaf9..f3221ffe32 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneMissHitWindowJudgements : ModTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
         [Test]
         public void TestMissViaEarlyHit()
         {
@@ -61,8 +63,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
         }
 
-        protected override Ruleset CreateRuleset() => new OsuRuleset();
-
         private class TestAutoMod : OsuModAutoplay
         {
             public override Score CreateReplayScore(IBeatmap beatmap) => new Score
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs
index 102f8bf841..4ae19624c0 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             typeof(OsuRuleset),
         };
 
-        protected override Ruleset CreateRuleset() => new OsuRuleset();
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
index a9c962bfa0..a83cc16413 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
 {
     public class TestSceneTaikoModPerfect : ModPerfectTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new TestTaikoRuleset();
+
         public TestSceneTaikoModPerfect()
             : base(new TaikoModPerfect())
         {
@@ -29,8 +31,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         [TestCase(true)]
         public void TestSwell(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Swell { StartTime = 1000, EndTime = 3000 }), shouldMiss);
 
-        protected override Ruleset CreateRuleset() => new TestTaikoRuleset();
-
         private class TestTaikoRuleset : TaikoRuleset
         {
             public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new TestTaikoHealthProcessor();
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs
index 98e6c2ec52..6db2a6907f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoSkinnableTestScene.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
             typeof(TaikoLegacySkinTransformer),
         };
 
-        protected override Ruleset CreateRuleset() => new TaikoRuleset();
+        protected override Ruleset CreateRulesetForSkinProvider() => new TaikoRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs
index 4c5ab7eabf..bc6f664942 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
             typeof(TaikoRuleset)
         };
 
-        protected override Ruleset CreateRuleset() => new TaikoRuleset();
+        protected override Ruleset CreatePlayerRuleset() => new TaikoRuleset();
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestPlayerTestScene.cs b/osu.Game.Tests/Visual/Gameplay/TestPlayerTestScene.cs
index 2130171449..bbf0136b00 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestPlayerTestScene.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestPlayerTestScene.cs
@@ -11,6 +11,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     /// </summary>
     public abstract class TestPlayerTestScene : PlayerTestScene
     {
-        protected override Ruleset CreateRuleset() => new OsuRuleset();
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index f5e78fbbd1..53abf83e72 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
@@ -23,6 +24,22 @@ namespace osu.Game.Tests.Visual
 
         protected OsuConfigManager LocalConfig;
 
+        /// <summary>
+        /// Creates the ruleset for setting up the <see cref="Player"/> component.
+        /// </summary>
+        [NotNull]
+        protected abstract Ruleset CreatePlayerRuleset();
+
+        protected sealed override Ruleset CreateRuleset() => CreatePlayerRuleset();
+
+        [NotNull]
+        private readonly Ruleset ruleset;
+
+        protected PlayerTestScene()
+        {
+            ruleset = CreatePlayerRuleset();
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -46,7 +63,7 @@ namespace osu.Game.Tests.Visual
 
             action?.Invoke();
 
-            AddStep(CreateRuleset().RulesetInfo.Name, LoadPlayer);
+            AddStep(ruleset.Description, LoadPlayer);
             AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
         }
 
@@ -56,28 +73,27 @@ namespace osu.Game.Tests.Visual
 
         protected void LoadPlayer()
         {
-            var beatmap = CreateBeatmap(Ruleset.Value);
+            var beatmap = CreateBeatmap(ruleset.RulesetInfo);
 
             Beatmap.Value = CreateWorkingBeatmap(beatmap);
+            Ruleset.Value = ruleset.RulesetInfo;
             SelectedMods.Value = Array.Empty<Mod>();
 
-            var rulesetInstance = Ruleset.Value.CreateInstance();
-
             if (!AllowFail)
             {
-                var noFailMod = rulesetInstance.GetAllMods().FirstOrDefault(m => m is ModNoFail);
+                var noFailMod = ruleset.GetAllMods().FirstOrDefault(m => m is ModNoFail);
                 if (noFailMod != null)
                     SelectedMods.Value = new[] { noFailMod };
             }
 
             if (Autoplay)
             {
-                var mod = rulesetInstance.GetAutoplayMod();
+                var mod = ruleset.GetAutoplayMod();
                 if (mod != null)
                     SelectedMods.Value = SelectedMods.Value.Concat(mod.Yield()).ToArray();
             }
 
-            Player = CreatePlayer(rulesetInstance);
+            Player = CreatePlayer(ruleset);
             LoadScreen(Player);
         }
 
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index d648afd504..98164031b0 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
@@ -13,6 +14,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -26,16 +28,17 @@ namespace osu.Game.Tests.Visual
         private Skin specialSkin;
         private Skin oldSkin;
 
+        /// <summary>
+        /// Creates the ruleset for adding the ruleset-specific skin transforming component.
+        /// </summary>
+        [NotNull]
+        protected abstract Ruleset CreateRulesetForSkinProvider();
+
+        protected sealed override Ruleset CreateRuleset() => CreateRulesetForSkinProvider();
+
         protected SkinnableTestScene()
             : base(2, 3)
         {
-            // avoid running silently incorrectly.
-            if (CreateRuleset() == null)
-            {
-                throw new InvalidOperationException(
-                    $"No ruleset provided, override {nameof(CreateRuleset)} to the ruleset belonging to the skinnable content."
-                    + "This is required to add the legacy skin transformer for the content to behave as expected.");
-            }
         }
 
         [BackgroundDependencyLoader]
@@ -110,7 +113,7 @@ namespace osu.Game.Tests.Visual
                         {
                             new OutlineBox { Alpha = autoSize ? 1 : 0 },
                             mainProvider.WithChild(
-                                new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider, beatmap))
+                                new SkinProvidingContainer(CreateRulesetForSkinProvider().CreateLegacySkinProvider(mainProvider, beatmap))
                                 {
                                     Child = created,
                                     RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,

From ea29f7c34435635b1b9f2a3e5a12acdefce1d100 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 4 Mar 2020 17:01:37 +0100
Subject: [PATCH 02400/10326] Use an OsuAnimatedButton in LoginPlaceholder to
 get the correct  animations.

---
 .../Online/Placeholders/LoginPlaceholder.cs   | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Online/Placeholders/LoginPlaceholder.cs b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
index 73b0fa27c3..a17fb8f2b1 100644
--- a/osu.Game/Online/Placeholders/LoginPlaceholder.cs
+++ b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
@@ -4,43 +4,39 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 
 namespace osu.Game.Online.Placeholders
 {
     public sealed class LoginPlaceholder : Placeholder
     {
-        [Resolved(CanBeNull = true)]
-        private LoginOverlay login { get; set; }
-
         public LoginPlaceholder(string actionMessage)
         {
-            AddIcon(FontAwesome.Solid.UserLock, cp =>
+            AddArbitraryDrawable(new LoginButton(actionMessage));
+        }
+
+        private class LoginButton : OsuAnimatedButton
+        {
+            [Resolved(CanBeNull = true)]
+            private LoginOverlay login { get; set; }
+
+            public LoginButton(string actionMessage)
             {
-                cp.Font = cp.Font.With(size: TEXT_SIZE);
-                cp.Padding = new MarginPadding { Right = 10 };
-            });
+                AutoSizeAxes = Axes.Both;
 
-            AddText(actionMessage);
-        }
+                Child = new OsuTextFlowContainer(cp => cp.Font = cp.Font.With(size: TEXT_SIZE))
+                        .With(t => t.AutoSizeAxes = Axes.Both)
+                        .With(t => t.AddIcon(FontAwesome.Solid.UserLock, icon =>
+                        {
+                            icon.Padding = new MarginPadding { Right = 10 };
+                        }))
+                        .With(t => t.AddText(actionMessage))
+                        .With(t => t.Margin = new MarginPadding(5));
 
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            this.ScaleTo(0.8f, 4000, Easing.OutQuint);
-            return base.OnMouseDown(e);
-        }
-
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            this.ScaleTo(1, 1000, Easing.OutElastic);
-            base.OnMouseUp(e);
-        }
-
-        protected override bool OnClick(ClickEvent e)
-        {
-            login?.Show();
-            return base.OnClick(e);
+                Action = () => login?.Show();
+            }
         }
     }
 }

From b1b3e01abdc6dc7ccde647f262b1936cc6e7265b Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 4 Mar 2020 22:59:48 +0100
Subject: [PATCH 02401/10326] Apply review suggestion.

---
 .../Online/Placeholders/LoginPlaceholder.cs   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Placeholders/LoginPlaceholder.cs b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
index a17fb8f2b1..543c108642 100644
--- a/osu.Game/Online/Placeholders/LoginPlaceholder.cs
+++ b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
@@ -26,14 +26,20 @@ namespace osu.Game.Online.Placeholders
             {
                 AutoSizeAxes = Axes.Both;
 
-                Child = new OsuTextFlowContainer(cp => cp.Font = cp.Font.With(size: TEXT_SIZE))
-                        .With(t => t.AutoSizeAxes = Axes.Both)
-                        .With(t => t.AddIcon(FontAwesome.Solid.UserLock, icon =>
-                        {
-                            icon.Padding = new MarginPadding { Right = 10 };
-                        }))
-                        .With(t => t.AddText(actionMessage))
-                        .With(t => t.Margin = new MarginPadding(5));
+                var textFlowContainer = new OsuTextFlowContainer(cp => cp.Font = cp.Font.With(size: TEXT_SIZE))
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Margin = new MarginPadding(5)
+                };
+
+                Child = textFlowContainer;
+
+                textFlowContainer.AddIcon(FontAwesome.Solid.UserLock, icon =>
+                {
+                    icon.Padding = new MarginPadding { Right = 10 };
+                });
+
+                textFlowContainer.AddText(actionMessage);
 
                 Action = () => login?.Show();
             }

From e136ecec5f131087bd2f1f2ba4df3ee79576adde Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 6 Mar 2020 22:12:02 +0100
Subject: [PATCH 02402/10326] Create ClickablePlaceholder and make of use it
 where applicable.

---
 .../SongSelect/TestSceneBeatmapLeaderboard.cs |  2 +-
 .../TestSceneDeleteLocalScore.cs              |  2 +-
 osu.Game/Online/Leaderboards/Leaderboard.cs   |  5 +-
 .../RetrievalFailurePlaceholder.cs            | 65 -------------------
 .../Placeholders/ClickablePlaceholder.cs      | 38 +++++++++++
 .../Online/Placeholders/LoginPlaceholder.cs   | 39 ++---------
 6 files changed, 49 insertions(+), 102 deletions(-)
 delete mode 100644 osu.Game/Online/Leaderboards/RetrievalFailurePlaceholder.cs
 create mode 100644 osu.Game/Online/Placeholders/ClickablePlaceholder.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
index 1198488bda..44c77b1bd3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             typeof(Placeholder),
             typeof(MessagePlaceholder),
-            typeof(RetrievalFailurePlaceholder),
+            typeof(ClickablePlaceholder),
             typeof(UserTopScoreContainer),
             typeof(Leaderboard<BeatmapLeaderboardScope, ScoreInfo>),
         };
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index a812b4dc79..fdeff7e434 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             typeof(Placeholder),
             typeof(MessagePlaceholder),
-            typeof(RetrievalFailurePlaceholder),
+            typeof(ClickablePlaceholder),
             typeof(UserTopScoreContainer),
             typeof(Leaderboard<BeatmapLeaderboardScope, ScoreInfo>),
             typeof(LeaderboardScore),
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index e2a817aaff..cb70cfb97f 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -10,6 +10,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
@@ -133,9 +134,9 @@ namespace osu.Game.Online.Leaderboards
                 switch (placeholderState = value)
                 {
                     case PlaceholderState.NetworkFailure:
-                        replacePlaceholder(new RetrievalFailurePlaceholder
+                        replacePlaceholder(new ClickablePlaceholder(@"Couldn't fetch scores!", FontAwesome.Solid.Sync)
                         {
-                            OnRetry = UpdateScores,
+                            Action = UpdateScores,
                         });
                         break;
 
diff --git a/osu.Game/Online/Leaderboards/RetrievalFailurePlaceholder.cs b/osu.Game/Online/Leaderboards/RetrievalFailurePlaceholder.cs
deleted file mode 100644
index d109f28e72..0000000000
--- a/osu.Game/Online/Leaderboards/RetrievalFailurePlaceholder.cs
+++ /dev/null
@@ -1,65 +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.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics.Containers;
-using osu.Game.Online.Placeholders;
-using osuTK;
-
-namespace osu.Game.Online.Leaderboards
-{
-    public class RetrievalFailurePlaceholder : Placeholder
-    {
-        public Action OnRetry;
-
-        public RetrievalFailurePlaceholder()
-        {
-            AddArbitraryDrawable(new RetryButton
-            {
-                Action = () => OnRetry?.Invoke(),
-                Padding = new MarginPadding { Right = 10 }
-            });
-
-            AddText(@"Couldn't retrieve scores!");
-        }
-
-        public class RetryButton : OsuHoverContainer
-        {
-            private readonly SpriteIcon icon;
-
-            public new Action Action;
-
-            public RetryButton()
-            {
-                AutoSizeAxes = Axes.Both;
-
-                Child = new OsuClickableContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Action = () => Action?.Invoke(),
-                    Child = icon = new SpriteIcon
-                    {
-                        Icon = FontAwesome.Solid.Sync,
-                        Size = new Vector2(TEXT_SIZE),
-                        Shadow = true,
-                    },
-                };
-            }
-
-            protected override bool OnMouseDown(MouseDownEvent e)
-            {
-                icon.ScaleTo(0.8f, 4000, Easing.OutQuint);
-                return base.OnMouseDown(e);
-            }
-
-            protected override void OnMouseUp(MouseUpEvent e)
-            {
-                icon.ScaleTo(1, 1000, Easing.OutElastic);
-                base.OnMouseUp(e);
-            }
-        }
-    }
-}
diff --git a/osu.Game/Online/Placeholders/ClickablePlaceholder.cs b/osu.Game/Online/Placeholders/ClickablePlaceholder.cs
new file mode 100644
index 0000000000..936ad79c64
--- /dev/null
+++ b/osu.Game/Online/Placeholders/ClickablePlaceholder.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 System;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Online.Placeholders
+{
+    public class ClickablePlaceholder : Placeholder
+    {
+        public Action Action;
+
+        public ClickablePlaceholder(string actionMessage, IconUsage icon)
+        {
+            OsuTextFlowContainer textFlow;
+
+            AddArbitraryDrawable(new OsuAnimatedButton
+            {
+                AutoSizeAxes = Framework.Graphics.Axes.Both,
+                Child = textFlow = new OsuTextFlowContainer(cp => cp.Font = cp.Font.With(size: TEXT_SIZE))
+                {
+                    AutoSizeAxes = Framework.Graphics.Axes.Both,
+                    Margin = new Framework.Graphics.MarginPadding(5)
+                },
+                Action = () => Action?.Invoke()
+            });
+
+            textFlow.AddIcon(icon, i =>
+            {
+                i.Padding = new Framework.Graphics.MarginPadding { Right = 10 };
+            });
+
+            textFlow.AddText(actionMessage);
+        }
+    }
+}
diff --git a/osu.Game/Online/Placeholders/LoginPlaceholder.cs b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
index 543c108642..f8a326a52e 100644
--- a/osu.Game/Online/Placeholders/LoginPlaceholder.cs
+++ b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
@@ -2,47 +2,20 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 
 namespace osu.Game.Online.Placeholders
 {
-    public sealed class LoginPlaceholder : Placeholder
+    public sealed class LoginPlaceholder : ClickablePlaceholder
     {
+        [Resolved(CanBeNull = true)]
+        private LoginOverlay login { get; set; }
+
         public LoginPlaceholder(string actionMessage)
+            : base(actionMessage, FontAwesome.Solid.UserLock)
         {
-            AddArbitraryDrawable(new LoginButton(actionMessage));
-        }
-
-        private class LoginButton : OsuAnimatedButton
-        {
-            [Resolved(CanBeNull = true)]
-            private LoginOverlay login { get; set; }
-
-            public LoginButton(string actionMessage)
-            {
-                AutoSizeAxes = Axes.Both;
-
-                var textFlowContainer = new OsuTextFlowContainer(cp => cp.Font = cp.Font.With(size: TEXT_SIZE))
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Margin = new MarginPadding(5)
-                };
-
-                Child = textFlowContainer;
-
-                textFlowContainer.AddIcon(FontAwesome.Solid.UserLock, icon =>
-                {
-                    icon.Padding = new MarginPadding { Right = 10 };
-                });
-
-                textFlowContainer.AddText(actionMessage);
-
-                Action = () => login?.Show();
-            }
+            Action = () => login?.Show();
         }
     }
 }

From 029d15f2a2f19ed2f88bb61d58af947df3411702 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Thu, 23 Apr 2020 20:14:39 +0800
Subject: [PATCH 02403/10326] Fixed syntax warning for playfield children

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 3d371d5260..66894fe883 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public TaikoPlayfield(ControlPointInfo controlPoints)
         {
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 backgroundContainer = new Container
                 {

From 085b6ae25f0f6bd4c01b4077090d01be35ef3b67 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 23 Apr 2020 20:24:03 +0200
Subject: [PATCH 02404/10326] Add background video for showcase scene
 (Tournament Client)

---
 .../Screens/Showcase/ShowcaseScreen.cs                | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
index d809dfc994..1bf67fe607 100644
--- a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
+++ b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.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;
 
 namespace osu.Game.Tournament.Screens.Showcase
 {
@@ -10,7 +12,14 @@ namespace osu.Game.Tournament.Screens.Showcase
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(new TournamentLogo());
+            AddRangeInternal(new Drawable[] {
+                new TournamentLogo(),
+                new TourneyVideo("showcase")
+                {
+                    Loop = true,
+                    RelativeSizeAxes = Axes.Both,
+                }
+            });
         }
     }
 }

From 28dcfe867c3afc866791d2d43934ae0a7626586d Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 23 Apr 2020 21:09:12 +0200
Subject: [PATCH 02405/10326] Add Chroma keying to the background of the
 showcase video.

---
 .../Screens/Showcase/ShowcaseScreen.cs            | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
index 1bf67fe607..85cf8d2e1f 100644
--- a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
+++ b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
@@ -4,11 +4,14 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Tournament.Components;
+using osu.Framework.Graphics.Shapes;
+using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Showcase
 {
-    public class ShowcaseScreen : BeatmapInfoScreen
+    public class ShowcaseScreen : BeatmapInfoScreen, IProvideVideo
     {
+        private Box chroma;
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -18,6 +21,16 @@ namespace osu.Game.Tournament.Screens.Showcase
                 {
                     Loop = true,
                     RelativeSizeAxes = Axes.Both,
+                },
+                chroma = new Box
+                        {
+                            // chroma key area for stable gameplay
+                            Name = "chroma",
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Height = 695,
+                            Width = 1366,
+                            Colour = new Color4(0, 255, 0, 255),
                 }
             });
         }

From dba737105ee9d74050d55fdd61e525a4cc388973 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Apr 2020 08:57:01 +0900
Subject: [PATCH 02406/10326] Update test scene for dynamic compilation

---
 .../Skinning/TestSceneDrawableBarLine.cs                       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
index e72f42a0b4..58d69fc32a 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
@@ -12,6 +12,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
@@ -24,6 +25,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
         {
             typeof(DrawableBarLine),
+            typeof(LegacyBarLine),
+            typeof(BarLine),
         }).ToList();
 
         [Cached(typeof(IScrollingInfo))]

From 608596c3b39a83d61fa21d30dd92eab4334bfee5 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 24 Apr 2020 02:50:10 +0200
Subject: [PATCH 02407/10326] Rename DefaultTaikoDonTextureAnimation to
 TaikoDonTextureAnimation

---
 .../UI/DrawableTaikoCharacter.cs                   | 14 ++++++--------
 ...ureAnimation.cs => TaikoDonTextureAnimation.cs} | 11 ++++++-----
 2 files changed, 12 insertions(+), 13 deletions(-)
 rename osu.Game.Rulesets.Taiko/UI/{DefaultTaikoDonTextureAnimation.cs => TaikoDonTextureAnimation.cs} (79%)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
index 897670d049..85f18b3ec7 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
@@ -1,16 +1,14 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
-using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
     public sealed class DrawableTaikoCharacter : BeatSyncedContainer
     {
-        private static DefaultTaikoDonTextureAnimation idleDrawable, clearDrawable, kiaiDrawable, failDrawable;
+        private static TaikoDonTextureAnimation idleDrawable, clearDrawable, kiaiDrawable, failDrawable;
 
         private TaikoDonAnimationState state;
 
@@ -22,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             var xd = new Vector2(1);
         }
 
-        private DefaultTaikoDonTextureAnimation getStateDrawable() => State switch
+        private TaikoDonTextureAnimation getStateDrawable() => State switch
         {
             TaikoDonAnimationState.Idle  => idleDrawable,
             TaikoDonAnimationState.Clear => clearDrawable,
@@ -50,10 +48,10 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             InternalChildren = new[]
             {
-                idleDrawable = new DefaultTaikoDonTextureAnimation(TaikoDonAnimationState.Idle),
-                clearDrawable = new DefaultTaikoDonTextureAnimation(TaikoDonAnimationState.Clear),
-                kiaiDrawable = new DefaultTaikoDonTextureAnimation(TaikoDonAnimationState.Kiai),
-                failDrawable = new DefaultTaikoDonTextureAnimation(TaikoDonAnimationState.Fail),
+                idleDrawable = new TaikoDonTextureAnimation(TaikoDonAnimationState.Idle),
+                clearDrawable = new TaikoDonTextureAnimation(TaikoDonAnimationState.Clear),
+                kiaiDrawable = new TaikoDonTextureAnimation(TaikoDonAnimationState.Kiai),
+                failDrawable = new TaikoDonTextureAnimation(TaikoDonAnimationState.Fail),
             };
 
             // sets the state, to make sure we have the correct sprite loaded and set.
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultTaikoDonTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoDonTextureAnimation.cs
similarity index 79%
rename from osu.Game.Rulesets.Taiko/UI/DefaultTaikoDonTextureAnimation.cs
rename to osu.Game.Rulesets.Taiko/UI/TaikoDonTextureAnimation.cs
index 1fefed953d..315cd57f13 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultTaikoDonTextureAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoDonTextureAnimation.cs
@@ -6,18 +6,19 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    public sealed class DefaultTaikoDonTextureAnimation : TextureAnimation
+    public sealed class TaikoDonTextureAnimation : TextureAnimation
     {
-        private readonly TaikoDonAnimationState _state;
+        private readonly TaikoDonAnimationState state;
         private int currentFrame;
 
-        public DefaultTaikoDonTextureAnimation(TaikoDonAnimationState state) : base(false)
+        public TaikoDonTextureAnimation(TaikoDonAnimationState state) : base(false)
         {
-            _state = state;
+            this.state = state;
             this.Stop();
 
             Origin = Anchor.BottomLeft;
             Anchor = Anchor.BottomLeft;
+            AutoSizeAxes = Axes.Y;
         }
 
         [BackgroundDependencyLoader]
@@ -25,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             for (int i = 0;; i++)
             {
-                var textureName = $"pippidon{_getStateString(_state)}{i}";
+                var textureName = $"pippidon{_getStateString(state)}{i}";
                 Texture texture = skin.GetTexture(textureName);
 
                 if (texture == null)

From bbe831698c5b315a373d16ef2b5996f682607619 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 24 Apr 2020 02:50:33 +0200
Subject: [PATCH 02408/10326] Remove unused code

---
 .../UI/DrawableTaikoCharacter.cs                    | 13 -------------
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs        |  1 -
 2 files changed, 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
index 85f18b3ec7..aace96aa9b 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
@@ -15,9 +15,6 @@ namespace osu.Game.Rulesets.Taiko.UI
         public DrawableTaikoCharacter()
         {
             RelativeSizeAxes = Axes.Both;
-            //Size = new Vector2(1f, 2.5f);
-            //Origin = Anchor.BottomLeft;
-            var xd = new Vector2(1);
         }
 
         private TaikoDonTextureAnimation getStateDrawable() => State switch
@@ -63,16 +60,6 @@ namespace osu.Game.Rulesets.Taiko.UI
             base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
             getStateDrawable().Move();
-
-            //var signature = timingPoint.TimeSignature == TimeSignatures.SimpleQuadruple ? 4 : 3;
-            //var length = timingPoint.BeatLength;
-            //var rate = 1000d / length;
-            //adjustableClock.Rate = rate;
-            //
-            //// Start animating on the first beat.
-            //if (beatIndex < 1)
-            //    adjustableClock.Start();
-            // Logger.GetLogger(LoggingTarget.Information).Add($"Length = {length}ms | Rate = {rate}x | BPM = {timingPoint.BPM} / {signature}");
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index f4e24afb32..c86a6f61b2 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -22,7 +22,6 @@ using osuTK;
 using osuTK.Graphics;
 using osu.Game.Rulesets.Scoring;
 using osu.Framework.Bindables;
-using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {

From 6de08db65316679f99830c6448540aeb5b89ea06 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 24 Apr 2020 02:50:47 +0200
Subject: [PATCH 02409/10326] Add removed skin component back

---
 osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index bd98c2ea87..ff7590c561 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -6,6 +6,7 @@ namespace osu.Game.Rulesets.Taiko
     public enum TaikoSkinComponents
     {
         InputDrum,
+        CentreHit,
         RimHit,
         DrumRollBody,
         DrumRollTick,

From 1c13fa6c6199ed5a51d985f140b209fb804ddd4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Apr 2020 10:27:32 +0900
Subject: [PATCH 02410/10326] Fix editor crashing when entering with no beatmap
 selected

---
 .../Edit/Compose/Components/Timeline/Timeline.cs      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 1cb4f737c1..8e6b3d5424 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -60,9 +60,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 waveform.Waveform = b.NewValue.Waveform;
                 track = b.NewValue.Track;
 
-                MaxZoom = getZoomLevelForVisibleMilliseconds(500);
-                MinZoom = getZoomLevelForVisibleMilliseconds(10000);
-                Zoom = getZoomLevelForVisibleMilliseconds(2000);
+                if (track.Length > 0)
+                {
+                    MaxZoom = getZoomLevelForVisibleMilliseconds(500);
+                    MinZoom = getZoomLevelForVisibleMilliseconds(10000);
+                    Zoom = getZoomLevelForVisibleMilliseconds(2000);
+                }
             }, true);
         }
 
@@ -135,7 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void scrollToTrackTime()
         {
-            if (!track.IsLoaded)
+            if (!track.IsLoaded || track.Length == 0)
                 return;
 
             ScrollTo((float)(adjustableClock.CurrentTime / track.Length) * Content.DrawWidth, false);

From ca692f30e66fabf102579803561c96ef2d176d9b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Apr 2020 12:27:56 +0900
Subject: [PATCH 02411/10326] Do full placement on mouse down

---
 .../Blueprints/HitCircles/HitCirclePlacementBlueprint.cs  | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index 2f400160b8..dad199715e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -33,19 +33,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
         {
             if (e.Button == MouseButton.Left)
             {
-                BeginPlacement();
+                EndPlacement(true);
                 return true;
             }
 
             return base.OnMouseDown(e);
         }
 
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            if (e.Button == MouseButton.Left)
-                EndPlacement(true);
-        }
-
         public override void UpdatePosition(Vector2 screenSpacePosition) => HitObject.Position = ToLocalSpace(screenSpacePosition);
     }
 }

From 2b0deec491f5260a3c68763cfaccf45384ec32a0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Apr 2020 13:20:41 +0900
Subject: [PATCH 02412/10326] Finish note placement on mouse down

---
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs    |  7 +++++++
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs       |  6 ------
 .../Edit/Blueprints/NotePlacementBlueprint.cs        | 12 +++++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 7bbde400ea..b3dd392202 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
 using osuTK;
@@ -46,6 +47,12 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             bodyPiece.Height = (bottomPosition - topPosition).Y;
         }
 
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            base.OnMouseUp(e);
+            EndPlacement(true);
+        }
+
         private double originalStartTime;
 
         public override void UpdatePosition(Vector2 screenSpacePosition)
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index f228daa5e3..400abb6380 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -54,12 +54,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             return true;
         }
 
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            EndPlacement(true);
-            base.OnMouseUp(e);
-        }
-
         public override void UpdatePosition(Vector2 screenSpacePosition)
         {
             if (!PlacementActive)
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index 888ce695c2..2b7b383dbe 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
@@ -28,12 +28,14 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             Position = SnappedMousePosition;
         }
 
-        public override void UpdatePosition(Vector2 screenSpacePosition)
+        protected override bool OnMouseDown(MouseDownEvent e)
         {
-            base.UpdatePosition(screenSpacePosition);
+            base.OnMouseDown(e);
 
-            // Continue updating the position until placement is finished on mouse up.
-            BeginPlacement(TimeAt(screenSpacePosition), PlacementActive);
+            // Place the note immediately.
+            EndPlacement(true);
+
+            return true;
         }
     }
 }

From dbf39be6070c863109150cc8610cc275ee1aca1a Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 24 Apr 2020 06:59:05 +0200
Subject: [PATCH 02413/10326] Decide on the name "Mascot", add testing, bug
 fixed, etc.

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs  | 155 ++++++++++++++++++
 .../Skinning/TaikoLegacySkinTransformer.cs    |   2 +-
 .../UI/DrawableTaikoCharacter.cs              |  65 --------
 .../UI/DrawableTaikoMascot.cs                 |  99 +++++++++++
 .../UI/TaikoDonTextureAnimation.cs            |  61 -------
 ...nState.cs => TaikoMascotAnimationState.cs} |   2 +-
 .../UI/TaikoMascotTextureAnimation.cs         |  88 ++++++++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |  16 +-
 8 files changed, 353 insertions(+), 135 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
 delete mode 100644 osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
 create mode 100644 osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
 delete mode 100644 osu.Game.Rulesets.Taiko/UI/TaikoDonTextureAnimation.cs
 rename osu.Game.Rulesets.Taiko/UI/{TaikoDonAnimationState.cs => TaikoMascotAnimationState.cs} (86%)
 create mode 100644 osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
new file mode 100644
index 0000000000..dc89fa3a59
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.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 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.ControlPoints;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Judgements;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
+{
+    [TestFixture]
+    public class TestSceneDrawableTaikoMascot : TaikoSkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
+        {
+            typeof(DrawableTaikoMascot),
+        }).ToList();
+
+        [Cached(typeof(IScrollingInfo))]
+        private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
+        {
+            Direction = { Value = ScrollingDirection.Left },
+            TimeRange = { Value = 5000 },
+        };
+
+        private readonly List<DrawableTaikoMascot> mascots = new List<DrawableTaikoMascot>();
+        private readonly List<SkinnableDrawable> skinnables = new List<SkinnableDrawable>();
+        private readonly List<TaikoPlayfield> playfields = new List<TaikoPlayfield>();
+
+        [Test]
+        public void TestStateTextures()
+        {
+            AddStep("Create mascot (idle)", () =>
+            {
+                skinnables.Clear();
+                SetContents(() =>
+                {
+                    var skinnable = getMascot();
+                    skinnables.Add(skinnable);
+                    return skinnable;
+                });
+            });
+
+            AddUntilStep("Wait for SkinnableDrawable", () => skinnables.Any(d => d.Drawable is DrawableTaikoMascot));
+
+            AddStep("Collect mascots", () =>
+            {
+                mascots.Clear();
+
+                foreach (var skinnable in skinnables)
+                {
+                    if (skinnable.Drawable is DrawableTaikoMascot mascot)
+                        mascots.Add(mascot);
+                }
+            });
+
+            AddStep("Clear state", () => setState(TaikoMascotAnimationState.Clear));
+
+            AddStep("Kiai state", () => setState(TaikoMascotAnimationState.Kiai));
+
+            AddStep("Fail state", () => setState(TaikoMascotAnimationState.Fail));
+        }
+
+        private void setState(TaikoMascotAnimationState state)
+        {
+            foreach (var mascot in mascots)
+            {
+                if (mascot == null)
+                    continue;
+
+                mascot.Dumb = true;
+                mascot.State = state;
+            }
+        }
+
+        private SkinnableDrawable getMascot() =>
+            new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoDon), _ => new Container(), confineMode: ConfineMode.ScaleToFit)
+            {
+                RelativePositionAxes = Axes.Both
+            };
+
+        [Test]
+        public void TestPlayfield()
+        {
+            AddStep("Create playfield", () =>
+            {
+                playfields.Clear();
+                SetContents(() =>
+                {
+                    var playfield = new TaikoPlayfield(new ControlPointInfo())
+                    {
+                        Height = 0.4f,
+                        Anchor = Anchor.BottomLeft,
+                        Origin = Anchor.BottomLeft,
+                    };
+
+                    playfields.Add(playfield);
+
+                    return playfield;
+                });
+            });
+
+            AddUntilStep("Wait for SkinnableDrawable", () => playfields.Any(p => p.ChildrenOfType<DrawableTaikoMascot>().Any()));
+
+            AddStep("Collect mascots", () =>
+            {
+                mascots.Clear();
+
+                foreach (var playfield in playfields)
+                {
+                    var mascot = playfield.ChildrenOfType<DrawableTaikoMascot>().SingleOrDefault();
+
+                    if (mascot != null)
+                        mascots.Add(mascot);
+                }
+            });
+
+            AddStep("Create hit (miss)", () =>
+            {
+                foreach (var playfield in playfields)
+                    addJudgement(playfield, HitResult.Miss);
+            });
+
+            AddAssert("Check if state is fail", () => mascots.Where(d => d != null).All(d => d.PlayfieldState.Value == TaikoMascotAnimationState.Fail));
+
+            AddStep("Create hit (great)", () =>
+            {
+                foreach (var playfield in playfields)
+                    addJudgement(playfield, HitResult.Great);
+            });
+
+            AddAssert("Check if state is idle", () => mascots.Where(d => d != null).All(d => d.PlayfieldState.Value == TaikoMascotAnimationState.Idle));
+        }
+
+        private void addJudgement(TaikoPlayfield playfield, HitResult result)
+        {
+            playfield.OnNewResult(new DrawableRimHit(new Hit()), new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = result });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index cc79822417..dfc9297a33 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                 case TaikoSkinComponents.TaikoDon:
                     if (GetTexture("pippidonclear0") != null)
-                        return new DrawableTaikoCharacter();
+                        return new DrawableTaikoMascot();
 
                     return null;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
deleted file mode 100644
index aace96aa9b..0000000000
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoCharacter.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
-using osu.Framework.Graphics.Textures;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics.Containers;
-
-namespace osu.Game.Rulesets.Taiko.UI
-{
-    public sealed class DrawableTaikoCharacter : BeatSyncedContainer
-    {
-        private static TaikoDonTextureAnimation idleDrawable, clearDrawable, kiaiDrawable, failDrawable;
-
-        private TaikoDonAnimationState state;
-
-        public DrawableTaikoCharacter()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-
-        private TaikoDonTextureAnimation getStateDrawable() => State switch
-        {
-            TaikoDonAnimationState.Idle  => idleDrawable,
-            TaikoDonAnimationState.Clear => clearDrawable,
-            TaikoDonAnimationState.Kiai  => kiaiDrawable,
-            TaikoDonAnimationState.Fail  => failDrawable,
-            _                            => null
-        };
-
-        public TaikoDonAnimationState State
-        {
-            get => state;
-            set
-            {
-                state = value;
-
-                foreach (var child in InternalChildren)
-                    child.Hide();
-
-                getStateDrawable().Show();
-            }
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            InternalChildren = new[]
-            {
-                idleDrawable = new TaikoDonTextureAnimation(TaikoDonAnimationState.Idle),
-                clearDrawable = new TaikoDonTextureAnimation(TaikoDonAnimationState.Clear),
-                kiaiDrawable = new TaikoDonTextureAnimation(TaikoDonAnimationState.Kiai),
-                failDrawable = new TaikoDonTextureAnimation(TaikoDonAnimationState.Fail),
-            };
-
-            // sets the state, to make sure we have the correct sprite loaded and set.
-            State = TaikoDonAnimationState.Idle;
-        }
-
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
-        {
-            base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
-
-            getStateDrawable().Move();
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
new file mode 100644
index 0000000000..fbac1e9d0b
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -0,0 +1,99 @@
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public sealed class DrawableTaikoMascot : BeatSyncedContainer
+    {
+        private static TaikoMascotTextureAnimation idleDrawable, clearDrawable, kiaiDrawable, failDrawable;
+        private EffectControlPoint lastEffectControlPoint;
+        private TaikoMascotAnimationState state;
+
+        public Bindable<TaikoMascotAnimationState> PlayfieldState;
+
+        /// <summary>
+        /// Determines if there should be no "state logic", intended for testing.
+        /// </summary>
+        public bool Dumb { get; set; }
+
+        public TaikoMascotAnimationState State
+        {
+            get => state;
+            set
+            {
+                state = value;
+
+                foreach (var child in InternalChildren)
+                    child.Hide();
+
+                var drawable = getStateDrawable(State);
+
+                drawable?.Show();
+            }
+        }
+
+        public DrawableTaikoMascot(TaikoMascotAnimationState startingState = TaikoMascotAnimationState.Idle)
+        {
+            RelativeSizeAxes = Axes.Both;
+            PlayfieldState = new Bindable<TaikoMascotAnimationState>();
+            PlayfieldState.BindValueChanged((b) =>
+            {
+                if (lastEffectControlPoint != null)
+                    State = getFinalAnimationState(lastEffectControlPoint, b.NewValue);
+            });
+
+            State = startingState;
+        }
+
+        private TaikoMascotTextureAnimation getStateDrawable(TaikoMascotAnimationState state) => state switch
+        {
+            TaikoMascotAnimationState.Idle  => idleDrawable,
+            TaikoMascotAnimationState.Clear => clearDrawable,
+            TaikoMascotAnimationState.Kiai  => kiaiDrawable,
+            TaikoMascotAnimationState.Fail  => failDrawable,
+            _                               => null
+        };
+
+        private TaikoMascotAnimationState getFinalAnimationState(EffectControlPoint effectPoint, TaikoMascotAnimationState playfieldState)
+        {
+            if (playfieldState == TaikoMascotAnimationState.Fail)
+                return playfieldState;
+
+            return effectPoint.KiaiMode ? TaikoMascotAnimationState.Kiai : TaikoMascotAnimationState.Idle;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            InternalChildren = new[]
+            {
+                idleDrawable = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Idle),
+                clearDrawable = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Clear),
+                kiaiDrawable = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Kiai),
+                failDrawable = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Fail),
+            };
+
+            // making sure we have the correct sprite set
+            State = state;
+        }
+
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        {
+            base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
+
+            if (!Dumb)
+                State = getFinalAnimationState(lastEffectControlPoint = effectPoint, PlayfieldState.Value);
+
+            if (State == TaikoMascotAnimationState.Clear)
+                return;
+
+            var drawable = getStateDrawable(State);
+            drawable.Move();
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoDonTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoDonTextureAnimation.cs
deleted file mode 100644
index 315cd57f13..0000000000
--- a/osu.Game.Rulesets.Taiko/UI/TaikoDonTextureAnimation.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Animations;
-using osu.Framework.Graphics.Textures;
-using osu.Game.Skinning;
-
-namespace osu.Game.Rulesets.Taiko.UI
-{
-    public sealed class TaikoDonTextureAnimation : TextureAnimation
-    {
-        private readonly TaikoDonAnimationState state;
-        private int currentFrame;
-
-        public TaikoDonTextureAnimation(TaikoDonAnimationState state) : base(false)
-        {
-            this.state = state;
-            this.Stop();
-
-            Origin = Anchor.BottomLeft;
-            Anchor = Anchor.BottomLeft;
-            AutoSizeAxes = Axes.Y;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
-        {
-            for (int i = 0;; i++)
-            {
-                var textureName = $"pippidon{_getStateString(state)}{i}";
-                Texture texture = skin.GetTexture(textureName);
-
-                if (texture == null)
-                    break;
-
-                AddFrame(texture);
-            }
-        }
-
-        /// <summary>
-        /// Advances the current frame by one.
-        /// </summary>
-        public void Move()
-        {
-            if (FrameCount <= currentFrame)
-                currentFrame = 0;
-
-            GotoFrame(currentFrame);
-
-            currentFrame++;
-        }
-
-        private string _getStateString(TaikoDonAnimationState state) => state switch
-        {
-            TaikoDonAnimationState.Clear => "clear",
-            TaikoDonAnimationState.Fail  => "fail",
-            TaikoDonAnimationState.Idle  => "idle",
-            TaikoDonAnimationState.Kiai  => "kiai",
-            _ => null
-        };
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoDonAnimationState.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimationState.cs
similarity index 86%
rename from osu.Game.Rulesets.Taiko/UI/TaikoDonAnimationState.cs
rename to osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimationState.cs
index 773710ee7e..02bf245b7b 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoDonAnimationState.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimationState.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    public enum TaikoDonAnimationState
+    public enum TaikoMascotAnimationState
     {
         Idle,
         Clear,
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
new file mode 100644
index 0000000000..19a533156e
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
@@ -0,0 +1,88 @@
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public sealed class TaikoMascotTextureAnimation : TextureAnimation
+    {
+        private const float clear_animation_speed = 1000 / 10F;
+        private static readonly int[] clear_animation_sequence = new[] { 0, 1, 2, 3, 4, 5, 6, 5, 6, 5, 4, 3, 2, 1, 0 };
+        private int currentFrame;
+
+        public TaikoMascotAnimationState State { get; }
+
+        public TaikoMascotTextureAnimation(TaikoMascotAnimationState state)
+            : base(true)
+        {
+            State = state;
+
+            // We're animating on beat if it's not the clear animation
+            if (state == TaikoMascotAnimationState.Clear)
+                DefaultFrameLength = clear_animation_speed;
+            else
+                this.Stop();
+
+            Origin = Anchor.BottomLeft;
+            Anchor = Anchor.BottomLeft;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            if (State == TaikoMascotAnimationState.Clear)
+            {
+                foreach (var textureIndex in clear_animation_sequence)
+                {
+                    var textureName = _getStateTextureName(textureIndex);
+                    Texture texture = skin.GetTexture(textureName);
+
+                    if (texture == null)
+                        break;
+
+                    AddFrame(texture);
+                }
+            }
+            else
+            {
+                for (int i = 0;; i++)
+                {
+                    var textureName = _getStateTextureName(i);
+                    Texture texture = skin.GetTexture(textureName);
+
+                    if (texture == null)
+                        break;
+
+                    AddFrame(texture);
+                }
+            }
+        }
+
+        /// <summary>Advances the current frame by one.</summary>
+        public void Move()
+        {
+            if (FrameCount == 0) // Frames are apparently broken
+                return;
+
+            if (FrameCount <= currentFrame)
+                currentFrame = 0;
+
+            GotoFrame(currentFrame);
+
+            currentFrame += 1;
+        }
+
+        private string _getStateTextureName(int i) => $"pippidon{_getStateString(State)}{i}";
+
+        private string _getStateString(TaikoMascotAnimationState state) => state switch
+        {
+            TaikoMascotAnimationState.Clear => "clear",
+            TaikoMascotAnimationState.Fail  => "fail",
+            TaikoMascotAnimationState.Idle  => "idle",
+            TaikoMascotAnimationState.Kiai  => "kiai",
+            _ => null
+        };
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index c86a6f61b2..3bf5d084ee 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -268,16 +268,18 @@ namespace osu.Game.Rulesets.Taiko.UI
                     break;
             }
 
-            if (characterDrawable.Drawable is DrawableTaikoCharacter character)
+            if (characterDrawable.Drawable is DrawableTaikoMascot mascot)
             {
-                if (result.Type == HitResult.Miss && result.Judgement.AffectsCombo)
+                var isFailing = result.Type == HitResult.Miss;
+
+                // Only take combo in consideration when it's not a strong hit (it's always false)
+                if (!(judgedObject.HitObject is StrongHitObject))
                 {
-                    character.State = TaikoDonAnimationState.Fail;
-                }
-                else
-                {
-                    character.State = judgedObject.HitObject.Kiai ? TaikoDonAnimationState.Kiai : TaikoDonAnimationState.Idle;
+                    if (isFailing)
+                        isFailing = result.Judgement.AffectsCombo;
                 }
+
+                mascot.PlayfieldState.Value = isFailing ? TaikoMascotAnimationState.Fail : TaikoMascotAnimationState.Idle;
             }
         }
     }

From ac44185f091266d551080feb35c8d3c4caf2da00 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 24 Apr 2020 07:09:20 +0200
Subject: [PATCH 02414/10326] Fix formatting

---
 .../UI/DrawableTaikoMascot.cs                 | 19 +++++++++++--------
 .../UI/TaikoMascotTextureAnimation.cs         | 19 +++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index fbac1e9d0b..dae0b47900 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             RelativeSizeAxes = Axes.Both;
             PlayfieldState = new Bindable<TaikoMascotAnimationState>();
-            PlayfieldState.BindValueChanged((b) =>
+            PlayfieldState.BindValueChanged(b =>
             {
                 if (lastEffectControlPoint != null)
                     State = getFinalAnimationState(lastEffectControlPoint, b.NewValue);
@@ -50,14 +50,17 @@ namespace osu.Game.Rulesets.Taiko.UI
             State = startingState;
         }
 
-        private TaikoMascotTextureAnimation getStateDrawable(TaikoMascotAnimationState state) => state switch
+        private TaikoMascotTextureAnimation getStateDrawable(TaikoMascotAnimationState state)
         {
-            TaikoMascotAnimationState.Idle  => idleDrawable,
-            TaikoMascotAnimationState.Clear => clearDrawable,
-            TaikoMascotAnimationState.Kiai  => kiaiDrawable,
-            TaikoMascotAnimationState.Fail  => failDrawable,
-            _                               => null
-        };
+            return state switch
+            {
+                TaikoMascotAnimationState.Idle => idleDrawable,
+                TaikoMascotAnimationState.Clear => clearDrawable,
+                TaikoMascotAnimationState.Kiai => kiaiDrawable,
+                TaikoMascotAnimationState.Fail => failDrawable,
+                _ => null
+            };
+        }
 
         private TaikoMascotAnimationState getFinalAnimationState(EffectControlPoint effectPoint, TaikoMascotAnimationState playfieldState)
         {
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
index 19a533156e..dd4785ea81 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Taiko.UI
     public sealed class TaikoMascotTextureAnimation : TextureAnimation
     {
         private const float clear_animation_speed = 1000 / 10F;
-        private static readonly int[] clear_animation_sequence = new[] { 0, 1, 2, 3, 4, 5, 6, 5, 6, 5, 4, 3, 2, 1, 0 };
+        private static readonly int[] clear_animation_sequence = { 0, 1, 2, 3, 4, 5, 6, 5, 6, 5, 4, 3, 2, 1, 0 };
         private int currentFrame;
 
         public TaikoMascotAnimationState State { get; }
@@ -76,13 +76,16 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private string _getStateTextureName(int i) => $"pippidon{_getStateString(State)}{i}";
 
-        private string _getStateString(TaikoMascotAnimationState state) => state switch
+        private string _getStateString(TaikoMascotAnimationState state)
         {
-            TaikoMascotAnimationState.Clear => "clear",
-            TaikoMascotAnimationState.Fail  => "fail",
-            TaikoMascotAnimationState.Idle  => "idle",
-            TaikoMascotAnimationState.Kiai  => "kiai",
-            _ => null
-        };
+            return state switch
+            {
+                TaikoMascotAnimationState.Clear => "clear",
+                TaikoMascotAnimationState.Fail => "fail",
+                TaikoMascotAnimationState.Idle => "idle",
+                TaikoMascotAnimationState.Kiai => "kiai",
+                _ => null
+            };
+        }
     }
 }

From abb687286be341b609ab92705f012f5c9a6a4496 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 23 Apr 2020 22:34:00 -0700
Subject: [PATCH 02415/10326] Fix score multiplier being cut off in mod select
 at higher ui scales

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index e9b3598625..b94f5cb570 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         new Dimension(GridSizeMode.Absolute, 90),
                         new Dimension(GridSizeMode.Distributed),
-                        new Dimension(GridSizeMode.Absolute, 70),
+                        new Dimension(GridSizeMode.AutoSize),
                     },
                     Content = new[]
                     {
@@ -197,7 +197,8 @@ namespace osu.Game.Overlays.Mods
                             // Footer
                             new Container
                             {
-                                RelativeSizeAxes = Axes.Both,
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
                                 Origin = Anchor.TopCentre,
                                 Anchor = Anchor.TopCentre,
                                 Children = new Drawable[]
@@ -215,7 +216,6 @@ namespace osu.Game.Overlays.Mods
                                         AutoSizeAxes = Axes.Y,
                                         RelativeSizeAxes = Axes.X,
                                         Width = content_width,
-                                        Direction = FillDirection.Horizontal,
                                         Padding = new MarginPadding
                                         {
                                             Vertical = 15,

From 118db03b56ec35eba67b900b930a73d61838e191 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 23 Apr 2020 22:41:38 -0700
Subject: [PATCH 02416/10326] Fix vertical spacing and score multiplier
 splitting apart

Also cleans up margin and its hacks (alignment done with anchor/origin now).
---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 73 +++++++++++-----------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b94f5cb570..6ab72bc02a 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -57,6 +57,8 @@ namespace osu.Game.Overlays.Mods
         protected Color4 HighMultiplierColour;
 
         private const float content_width = 0.8f;
+        private const float footer_button_spacing = 20;
+
         private readonly FillFlowContainer footerContainer;
 
         private SampleChannel sampleOn, sampleOff;
@@ -216,6 +218,7 @@ namespace osu.Game.Overlays.Mods
                                         AutoSizeAxes = Axes.Y,
                                         RelativeSizeAxes = Axes.X,
                                         Width = content_width,
+                                        Spacing = new Vector2(footer_button_spacing, footer_button_spacing / 2),
                                         Padding = new MarginPadding
                                         {
                                             Vertical = 15,
@@ -228,10 +231,8 @@ namespace osu.Game.Overlays.Mods
                                                 Width = 180,
                                                 Text = "Deselect All",
                                                 Action = DeselectAll,
-                                                Margin = new MarginPadding
-                                                {
-                                                    Right = 20
-                                                }
+                                                Origin = Anchor.CentreLeft,
+                                                Anchor = Anchor.CentreLeft,
                                             },
                                             CustomiseButton = new TriangleButton
                                             {
@@ -239,49 +240,47 @@ namespace osu.Game.Overlays.Mods
                                                 Text = "Customisation",
                                                 Action = () => ModSettingsContainer.Alpha = ModSettingsContainer.Alpha == 1 ? 0 : 1,
                                                 Enabled = { Value = false },
-                                                Margin = new MarginPadding
-                                                {
-                                                    Right = 20
-                                                }
+                                                Origin = Anchor.CentreLeft,
+                                                Anchor = Anchor.CentreLeft,
                                             },
                                             CloseButton = new TriangleButton
                                             {
                                                 Width = 180,
                                                 Text = "Close",
                                                 Action = Hide,
-                                                Margin = new MarginPadding
-                                                {
-                                                    Right = 20
-                                                }
+                                                Origin = Anchor.CentreLeft,
+                                                Anchor = Anchor.CentreLeft,
                                             },
-                                            new OsuSpriteText
+                                            new FillFlowContainer
                                             {
-                                                Text = @"Score Multiplier:",
-                                                Font = OsuFont.GetFont(size: 30),
-                                                Margin = new MarginPadding
+                                                AutoSizeAxes = Axes.Both,
+                                                Spacing = new Vector2(footer_button_spacing / 2, 0),
+                                                Origin = Anchor.CentreLeft,
+                                                Anchor = Anchor.CentreLeft,
+                                                Children = new Drawable[]
                                                 {
-                                                    Top = 5,
-                                                    Right = 10
-                                                }
+                                                    new OsuSpriteText
+                                                    {
+                                                        Text = @"Score Multiplier:",
+                                                        Font = OsuFont.GetFont(size: 30),
+                                                        Origin = Anchor.CentreLeft,
+                                                        Anchor = Anchor.CentreLeft,
+                                                    },
+                                                    MultiplierLabel = new OsuSpriteText
+                                                    {
+                                                        Font = OsuFont.GetFont(size: 30, weight: FontWeight.Bold, fixedWidth: true),
+                                                        Origin = Anchor.CentreLeft,
+                                                        Anchor = Anchor.CentreLeft,
+                                                    },
+                                                    UnrankedLabel = new OsuSpriteText
+                                                    {
+                                                        Text = @"(Unranked)",
+                                                        Font = OsuFont.GetFont(size: 30, weight: FontWeight.Bold),
+                                                        Origin = Anchor.CentreLeft,
+                                                        Anchor = Anchor.CentreLeft,
+                                                    },
+                                                },
                                             },
-                                            MultiplierLabel = new OsuSpriteText
-                                            {
-                                                Font = OsuFont.GetFont(size: 30, weight: FontWeight.Bold),
-                                                Margin = new MarginPadding
-                                                {
-                                                    Top = 5
-                                                }
-                                            },
-                                            UnrankedLabel = new OsuSpriteText
-                                            {
-                                                Text = @"(Unranked)",
-                                                Font = OsuFont.GetFont(size: 30, weight: FontWeight.Bold),
-                                                Margin = new MarginPadding
-                                                {
-                                                    Top = 5,
-                                                    Left = 10
-                                                }
-                                            }
                                         }
                                     }
                                 },

From 0f6ec274f9547881484b73559e6d27a0e709eaad Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 23 Apr 2020 22:44:17 -0700
Subject: [PATCH 02417/10326] Add transitions to footer when flowing to another
 row

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 6ab72bc02a..a7b7e50422 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -219,6 +219,8 @@ namespace osu.Game.Overlays.Mods
                                         RelativeSizeAxes = Axes.X,
                                         Width = content_width,
                                         Spacing = new Vector2(footer_button_spacing, footer_button_spacing / 2),
+                                        LayoutDuration = 100,
+                                        LayoutEasing = Easing.OutQuint,
                                         Padding = new MarginPadding
                                         {
                                             Vertical = 15,

From 84aa37d7c3a9cd1b92c792441b1ea6e217d03d0e Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 24 Apr 2020 07:57:16 +0200
Subject: [PATCH 02418/10326] Fix all local tests

---
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs         | 5 ++++-
 osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs | 5 ++++-
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs              | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index dae0b47900..f05c335456 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.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.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
index dd4785ea81..4a95717c8c 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.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.Animations;
 using osu.Framework.Graphics.Textures;
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 3bf5d084ee..6d9d263141 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -284,7 +284,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         }
     }
 
-    class ProxyContainer : LifetimeManagementContainer
+    internal class ProxyContainer : LifetimeManagementContainer
     {
         public new MarginPadding Padding
         {

From 8ae119ab62e68968f84caff0d101281bee5d88e9 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 24 Apr 2020 08:05:57 +0200
Subject: [PATCH 02419/10326] Fix last formatting error

---
 osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
index 4a95717c8c..922b2d08b6 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
             else
             {
-                for (int i = 0;; i++)
+                for (int i = 0; true; i++)
                 {
                     var textureName = _getStateTextureName(i);
                     Texture texture = skin.GetTexture(textureName);

From 05b3db0147aadad9a8114d9f74f4cfdfd045aa14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Apr 2020 16:56:18 +0900
Subject: [PATCH 02420/10326] Remove masking

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 8402ebb4c4..6f7d4a1854 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -55,7 +55,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Name = "Right area",
                     RelativeSizeAxes = Axes.Both,
                     RelativePositionAxes = Axes.Both,
-                    Masking = true,
                     Children = new Drawable[]
                     {
                         new Container

From cbcd915ec8489caf449c02f42f3e3abf801a69fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Apr 2020 18:18:10 +0900
Subject: [PATCH 02421/10326] Fix crash on switching comments page at an
 inopportune time

---
 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 591a9dc86e..e7bfeaf968 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Overlays.Comments
             request?.Cancel();
             loadCancellation?.Cancel();
             request = new GetCommentsRequest(id.Value, type.Value, Sort.Value, currentPage++, 0);
-            request.Success += onSuccess;
+            request.Success += res => Schedule(() => onSuccess(res));
             api.PerformAsync(request);
         }
 

From 39a593120cbf84493263f6b1ec7cc99a8f7c390c Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Fri, 24 Apr 2020 17:00:35 +0200
Subject: [PATCH 02422/10326] Fixed CodeInspect errors

---
 .../Screens/Showcase/ShowcaseScreen.cs        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
index 85cf8d2e1f..e48ec63d01 100644
--- a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
+++ b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
@@ -11,26 +11,26 @@ namespace osu.Game.Tournament.Screens.Showcase
 {
     public class ShowcaseScreen : BeatmapInfoScreen, IProvideVideo
     {
-        private Box chroma;
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddRangeInternal(new Drawable[] {
+            AddRangeInternal(new Drawable[]
+            {
                 new TournamentLogo(),
                 new TourneyVideo("showcase")
                 {
                     Loop = true,
                     RelativeSizeAxes = Axes.Both,
                 },
-                chroma = new Box
-                        {
-                            // chroma key area for stable gameplay
-                            Name = "chroma",
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Height = 695,
-                            Width = 1366,
-                            Colour = new Color4(0, 255, 0, 255),
+                new Box
+                {
+                    // chroma key area for stable gameplay
+                    Name = "chroma",
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    Height = 695,
+                    Width = 1366,
+                    Colour = new Color4(0, 255, 0, 255),
                 }
             });
         }

From 2be3a8184d0c2e3726a29683d3c18cd2d96ca9fe Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Sat, 25 Apr 2020 00:15:37 +0800
Subject: [PATCH 02423/10326] Removed modifications to drum roll object

---
 .../Objects/Drawables/DrawableDrumRoll.cs     | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index e416c23c30..5e731e5ad6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -36,14 +36,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private Color4 colourIdle;
         private Color4 colourEngaged;
 
-        private bool judgingStarted;
-
-        /// <summary>
-        /// A handler action for when the drumroll has been hit,
-        /// regardless of any judgement.
-        /// </summary>
-        public Action<TaikoAction, bool> OnHit;
-
         public DrawableDrumRoll(DrumRoll drumRoll)
             : base(drumRoll)
         {
@@ -103,27 +95,15 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.DrumRollBody),
             _ => new ElongatedCirclePiece());
 
-        public override bool OnPressed(TaikoAction action)
-        {
-            if (judgingStarted)
-                OnHit.Invoke(action, HitObject.IsStrong);
-
-            return false;
-        }
+        public override bool OnPressed(TaikoAction action) => false;
 
         private void onNewResult(DrawableHitObject obj, JudgementResult result)
         {
             if (!(obj is DrawableDrumRollTick))
                 return;
 
-            DrawableDrumRollTick drumRollTick = (DrawableDrumRollTick)obj;
-
             if (result.Type > HitResult.Miss)
-            {
-                OnHit.Invoke(drumRollTick.JudgedAction, HitObject.IsStrong);
-                judgingStarted = true;
                 rollingHits++;
-            }
             else
                 rollingHits--;
 

From 477fe72fcf8d4966ea25f7ee476305b0a2019112 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Sat, 25 Apr 2020 00:15:59 +0800
Subject: [PATCH 02424/10326] Changed note playback to happen on new result

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 66894fe883..a03010af00 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -12,6 +12,8 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
@@ -222,24 +224,23 @@ namespace osu.Game.Rulesets.Taiko.UI
                     barlineContainer.Add(barline.CreateProxy());
                     break;
 
-                case DrawableDrumRoll drumRoll:
-                    drumRoll.OnHit += onDrumrollArbitraryHit;
-                    break;
-
                 case DrawableTaikoHitObject taikoObject:
                     topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
                     break;
             }
         }
 
-        private void onDrumrollArbitraryHit(TaikoAction action, bool isStrong)
+        private void playDrumrollHit(DrawableDrumRollTick drumrollTick)
         {
-            DrawableHit drawableHit;
+            TaikoAction action = drumrollTick.JudgedAction;
+            bool isStrong = drumrollTick.HitObject.IsStrong;
+            double time = drumrollTick.HitObject.GetEndTime();
 
+            DrawableHit drawableHit;
             if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
-                drawableHit = new DrawableFlyingRimHit(Time.Current, isStrong);
+                drawableHit = new DrawableFlyingRimHit(time, isStrong);
             else
-                drawableHit = new DrawableFlyingCentreHit(Time.Current, isStrong);
+                drawableHit = new DrawableFlyingCentreHit(time, isStrong);
 
             drumRollHitContainer.Add(drawableHit);
         }
@@ -249,6 +250,9 @@ namespace osu.Game.Rulesets.Taiko.UI
             if (!DisplayJudgements.Value)
                 return;
 
+            if ((judgedObject is DrawableDrumRollTick) && result.Type != HitResult.Miss)
+                playDrumrollHit((DrawableDrumRollTick)judgedObject);
+
             if (!judgedObject.DisplayResult)
                 return;
 

From 364f5bf7885ac853a968b7796cdbd37f4f006b1b Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 24 Apr 2020 22:57:23 +0200
Subject: [PATCH 02425/10326] Update
 osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
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.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
index 922b2d08b6..2c04d3e1dc 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 {
     public sealed class TaikoMascotTextureAnimation : TextureAnimation
     {
-        private const float clear_animation_speed = 1000 / 10F;
+        private const float clear_animation_speed = 1000 / 10f;
         private static readonly int[] clear_animation_sequence = { 0, 1, 2, 3, 4, 5, 6, 5, 6, 5, 4, 3, 2, 1, 0 };
         private int currentFrame;
 

From 4b60be87b591a2bb6d8b1b5378790e7a0509e478 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 24 Apr 2020 16:34:41 -0700
Subject: [PATCH 02426/10326] Move unranked label under multiplier number to
 avoid width changes

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 30 +++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index a7b7e50422..36d21c8b46 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -268,18 +268,30 @@ namespace osu.Game.Overlays.Mods
                                                         Origin = Anchor.CentreLeft,
                                                         Anchor = Anchor.CentreLeft,
                                                     },
-                                                    MultiplierLabel = new OsuSpriteText
+                                                    new FillFlowContainer
                                                     {
-                                                        Font = OsuFont.GetFont(size: 30, weight: FontWeight.Bold, fixedWidth: true),
-                                                        Origin = Anchor.CentreLeft,
-                                                        Anchor = Anchor.CentreLeft,
-                                                    },
-                                                    UnrankedLabel = new OsuSpriteText
-                                                    {
-                                                        Text = @"(Unranked)",
-                                                        Font = OsuFont.GetFont(size: 30, weight: FontWeight.Bold),
+                                                        AutoSizeAxes = Axes.Both,
                                                         Origin = Anchor.CentreLeft,
                                                         Anchor = Anchor.CentreLeft,
+                                                        Direction = FillDirection.Vertical,
+                                                        LayoutDuration = 100,
+                                                        LayoutEasing = Easing.OutQuint,
+                                                        Children = new Drawable[]
+                                                        {
+                                                            MultiplierLabel = new OsuSpriteText
+                                                            {
+                                                                Font = OsuFont.GetFont(size: 25, weight: FontWeight.Bold, fixedWidth: true),
+                                                                Origin = Anchor.TopCentre,
+                                                                Anchor = Anchor.TopCentre,
+                                                            },
+                                                            UnrankedLabel = new OsuSpriteText
+                                                            {
+                                                                Text = @"(Unranked)",
+                                                                Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold),
+                                                                Origin = Anchor.TopCentre,
+                                                                Anchor = Anchor.TopCentre,
+                                                            },
+                                                        }
                                                     },
                                                 },
                                             },

From 3cc0b21eaef64e58730d8a7732230290a1dc10b1 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Sat, 25 Apr 2020 13:18:02 +0800
Subject: [PATCH 02427/10326] Added more smart checking to removing rewound
 drumroll hits

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index a03010af00..cae6b1c80b 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -295,7 +295,10 @@ namespace osu.Game.Rulesets.Taiko.UI
             if (Time.Elapsed < 0)
             {
                 foreach (var o in drumRollHitContainer.Objects)
-                    drumRollHitContainer.Remove(o);
+                {
+                    if (o.HitObject.StartTime >= Time.Current)
+                        drumRollHitContainer.Remove(o);
+                }
             }
         }
 

From c1c930c472208bd5b0fddde8389863863c06de93 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Sat, 25 Apr 2020 13:47:20 +0800
Subject: [PATCH 02428/10326] Fixed linting warnings

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs      | 2 +-
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 203d37006a..d1d2571ec7 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.PlayfieldBackgroundRight), _ => new PlayfieldBackgroundRight()),
                 rightArea = new Container
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index b5a8f1604c..7727f25967 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -240,7 +240,7 @@ namespace osu.Game.Beatmaps.Formats
             }
             else
             {
-                if (hitObject is IHasEndTime _)
+                if (hitObject is IHasEndTime)
                     addEndTimeData(writer, hitObject);
 
                 writer.Write(getSampleBank(hitObject.Samples));

From 37cc1ed5a244cae4d2cddbf2c8dc54e9c2ea5c34 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 25 Apr 2020 09:45:11 +0300
Subject: [PATCH 02429/10326] Fix potential null reference while hiding toolbar

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 227347112c..bac73c4379 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override void PopOut()
         {
-            userButton?.StateContainer.Hide();
+            userButton.StateContainer?.Hide();
 
             this.MoveToY(-DrawSize.Y, transition_time, Easing.OutQuint);
             this.FadeOut(transition_time);

From 1953c8fc107d87a9941597ec94235a180f05b339 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 25 Apr 2020 09:53:09 +0300
Subject: [PATCH 02430/10326] Fix ruleset selector not receiving key input on
 toolbar absence

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index bac73c4379..301747acbc 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -33,6 +33,10 @@ namespace osu.Game.Overlays.Toolbar
 
         private readonly Bindable<OverlayActivation> overlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
+        // Required for toolbar components that need to listen for key input
+        // to invoke specific actions while toolbar is in hidden state.
+        public override bool PropagateNonPositionalInputSubTree => true;
+
         public Toolbar()
         {
             RelativeSizeAxes = Axes.X;

From f0ebbb1807aaf293751bce16c6c08c7bae15ea6d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 25 Apr 2020 09:54:37 +0300
Subject: [PATCH 02431/10326] Rewrite toolbar test scene and add test cases

---
 .../Visual/Menus/TestSceneToolbar.cs          | 62 ++++++++++++++++---
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index f24589ed35..8fbbc8ebd8 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -5,13 +5,17 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Overlays.Toolbar;
+using osu.Game.Rulesets;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestSceneToolbar : OsuTestScene
+    public class TestSceneToolbar : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -21,24 +25,62 @@ namespace osu.Game.Tests.Visual.Menus
             typeof(ToolbarNotificationButton),
         };
 
-        public TestSceneToolbar()
+        private Toolbar toolbar;
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = toolbar = new Toolbar { State = { Value = Visibility.Visible } };
+        });
+
+        [Test]
+        public void TestNotificationCounter()
         {
-            var toolbar = new Toolbar { State = { Value = Visibility.Visible } };
             ToolbarNotificationButton notificationButton = null;
 
-            AddStep("create toolbar", () =>
-            {
-                Add(toolbar);
-                notificationButton = toolbar.Children.OfType<FillFlowContainer>().Last().Children.OfType<ToolbarNotificationButton>().First();
-            });
-
-            void setNotifications(int count) => AddStep($"set notification count to {count}", () => notificationButton.NotificationCount.Value = count);
+            AddStep("retrieve notification button", () => notificationButton = toolbar.ChildrenOfType<ToolbarNotificationButton>().Single());
 
             setNotifications(1);
             setNotifications(2);
             setNotifications(3);
             setNotifications(0);
             setNotifications(144);
+
+            void setNotifications(int count)
+                => AddStep($"set notification count to {count}",
+                    () => notificationButton.NotificationCount.Value = count);
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestRulesetSwitchingShortcut(bool toolbarHidden)
+        {
+            ToolbarRulesetSelector rulesetSelector = null;
+
+            if (toolbarHidden)
+                AddStep("hide toolbar", () => toolbar.Hide());
+
+            AddStep("retrieve ruleset selector", () => rulesetSelector = toolbar.ChildrenOfType<ToolbarRulesetSelector>().Single());
+
+            for (int i = 0; i < 4; i++)
+            {
+                var expected = rulesets.AvailableRulesets.ElementAt(i);
+                var numberKey = Key.Number1 + i;
+
+                AddStep($"switch to ruleset {i} via shortcut", () =>
+                {
+                    InputManager.PressKey(Key.ControlLeft);
+                    InputManager.PressKey(numberKey);
+
+                    InputManager.ReleaseKey(Key.ControlLeft);
+                    InputManager.ReleaseKey(numberKey);
+                });
+
+                AddUntilStep("ruleset switched", () => rulesetSelector.Current.Value.Equals(expected));
+            }
         }
     }
 }

From ce47b7ca932f85b2ac323b0c220da2eaa88dd3ef Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:21:01 +0300
Subject: [PATCH 02432/10326] Unnest in SetUpSteps

---
 .../TestSceneBeatmapRecommendations.cs        | 59 ++++++++++++-------
 1 file changed, 38 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index ec5fe65fdd..3f2117a4f8 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -36,31 +36,48 @@ namespace osu.Game.Tests.Visual.SongSelect
                     switch (req)
                     {
                         case GetUserRequest userRequest:
-
-                            decimal pp = userRequest.Ruleset.ID switch
-                            {
-                                0 => 336, // Expected recommended star difficulty 2*
-                                1 => 928, // Expected recommended star difficulty 3*
-                                2 => 1905, // Expected recommended star difficulty 4*
-                                3 => 3329, // Expected recommended star difficulty 5*
-                                _ => 0
-                            };
-
-                            userRequest.TriggerSuccess(new User
-                            {
-                                Username = @"Dummy",
-                                Id = 1001,
-                                Statistics = new UserStatistics
-                                {
-                                    PP = pp
-                                }
-                            });
+                            userRequest.TriggerSuccess(getUser(userRequest.Ruleset.ID));
                             break;
                     }
                 };
-                // Force recommender to calculate its star ratings again
-                recommender.APIStateChanged(API, APIState.Online);
             });
+
+            // Force recommender to calculate its star ratings again
+            AddStep("calculate recommended SRs", () => recommender.APIStateChanged(API, APIState.Online));
+
+            User getUser(int? rulesetID)
+            {
+                return new User
+                {
+                    Username = @"Dummy",
+                    Id = 1001,
+                    Statistics = new UserStatistics
+                    {
+                        PP = getNecessaryPP(rulesetID)
+                    }
+                };
+            }
+
+            decimal getNecessaryPP(int? rulesetID)
+            {
+                switch (rulesetID)
+                {
+                    case 0:
+                        return 336;
+
+                    case 1:
+                        return 928;
+
+                    case 2:
+                        return 1905;
+
+                    case 3:
+                        return 3329;
+
+                    default:
+                        return 0;
+                }
+            }
         }
 
         [Test]

From 52416ea90a49f2632a2173ab1c55ca458883b4bc Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:22:19 +0300
Subject: [PATCH 02433/10326] Use GetRuleset

---
 .../SongSelect/TestSceneBeatmapRecommendations.cs  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 3f2117a4f8..aed1729d7d 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -99,10 +99,10 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestBestRulesetIsRecommended()
         {
-            var osuRuleset = rulesets.AvailableRulesets.First(r => r.ID == 0);
-            var taikoRuleset = rulesets.AvailableRulesets.First(r => r.ID == 1);
-            var catchRuleset = rulesets.AvailableRulesets.First(r => r.ID == 2);
-            var maniaRuleset = rulesets.AvailableRulesets.First(r => r.ID == 3);
+            var osuRuleset = rulesets.GetRuleset(0);
+            var taikoRuleset = rulesets.GetRuleset(1);
+            var catchRuleset = rulesets.GetRuleset(2);
+            var maniaRuleset = rulesets.GetRuleset(3);
 
             var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
             var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, maniaRuleset });
@@ -117,9 +117,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestSecondBestRulesetIsRecommended()
         {
-            var osuRuleset = rulesets.AvailableRulesets.First(r => r.ID == 0);
-            var taikoRuleset = rulesets.AvailableRulesets.First(r => r.ID == 1);
-            var catchRuleset = rulesets.AvailableRulesets.First(r => r.ID == 2);
+            var osuRuleset = rulesets.GetRuleset(0);
+            var taikoRuleset = rulesets.GetRuleset(1);
+            var catchRuleset = rulesets.GetRuleset(2);
 
             var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
             var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, taikoRuleset });

From e906ec4d92d8d75467684630a80c606053ff7484 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:25:07 +0300
Subject: [PATCH 02434/10326] Fix typo

---
 .../Visual/SongSelect/TestSceneBeatmapRecommendations.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index aed1729d7d..f3a118572f 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -174,12 +174,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             return () => imported;
         }
 
-        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID, int expextedDiff)
+        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID, int expectedDiff)
         {
             AddStep("present beatmap", () => Game.PresentBeatmap(getImport()));
 
             AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is Screens.Select.SongSelect);
-            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID + 1024 * expextedDiff);
+            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID + 1024 * expectedDiff);
         }
     }
 }

From e65acc34018df7f77594ae8fff8c369a62a01ef8 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:36:19 +0300
Subject: [PATCH 02435/10326] Other review suggestions

---
 .../TestSceneBeatmapRecommendations.cs        | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index f3a118572f..f49dae4033 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -87,12 +87,12 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             for (int i = 0; i < 5; i++)
             {
-                importFunctions.Add(importBeatmap(i, new List<RulesetInfo> { null, null, null, null, null }));
+                importFunctions.Add(importBeatmap(i, Enumerable.Repeat(rulesets.GetRuleset(0), 5)));
             }
 
             for (int i = 0; i < 5; i++)
             {
-                presentAndConfirm(importFunctions[i], i, 2);
+                presentAndConfirm(importFunctions[i], 2);
             }
         }
 
@@ -108,10 +108,10 @@ namespace osu.Game.Tests.Visual.SongSelect
             var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, maniaRuleset });
 
             // Make sure we are on standard ruleset
-            presentAndConfirm(osuImport, 0, 1);
+            presentAndConfirm(osuImport, 1);
 
             // Present mixed difficulty set, expect ruleset with highest star difficulty
-            presentAndConfirm(mixedImport, 1, 3);
+            presentAndConfirm(mixedImport, 3);
         }
 
         [Test]
@@ -125,13 +125,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, taikoRuleset });
 
             // Make sure we are on standard ruleset
-            presentAndConfirm(osuImport, 0, 1);
+            presentAndConfirm(osuImport, 1);
 
             // Present mixed difficulty set, expect ruleset with highest star difficulty
-            presentAndConfirm(mixedImport, 1, 2);
+            presentAndConfirm(mixedImport, 2);
         }
 
-        private Func<BeatmapSetInfo> importBeatmap(int importID, List<RulesetInfo> rulesets)
+        private Func<BeatmapSetInfo> importBeatmap(int importID, IEnumerable<RulesetInfo> rulesetEnumerable)
         {
             BeatmapSetInfo imported = null;
             AddStep($"import beatmap {importID}", () =>
@@ -147,14 +147,14 @@ namespace osu.Game.Tests.Visual.SongSelect
                 var beatmaps = new List<BeatmapInfo>();
                 int difficultyID = 1;
 
-                foreach (RulesetInfo r in rulesets)
+                foreach (RulesetInfo r in rulesetEnumerable)
                 {
                     beatmaps.Add(new BeatmapInfo
                     {
                         OnlineBeatmapID = importID + 1024 * difficultyID,
                         Metadata = metadata,
                         BaseDifficulty = difficulty,
-                        Ruleset = r ?? rulesets.First(),
+                        Ruleset = r ?? rulesets.AvailableRulesets.First(),
                         StarDifficulty = difficultyID,
                     });
                     difficultyID++;
@@ -174,12 +174,16 @@ namespace osu.Game.Tests.Visual.SongSelect
             return () => imported;
         }
 
-        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID, int expectedDiff)
+        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int expectedDiff)
         {
             AddStep("present beatmap", () => Game.PresentBeatmap(getImport()));
 
             AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is Screens.Select.SongSelect);
-            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID + 1024 * expectedDiff);
+            AddUntilStep("recommended beatmap displayed", () =>
+            {
+                int? expectedID = getImport().Beatmaps[expectedDiff - 1].OnlineBeatmapID;
+                return Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == expectedID;
+            });
         }
     }
 }

From f68a7401b9577ca357ac931129133306b632a159 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:37:18 +0300
Subject: [PATCH 02436/10326] Fix comment

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index f49dae4033..a6e3e0c1c6 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             // Make sure we are on standard ruleset
             presentAndConfirm(osuImport, 1);
 
-            // Present mixed difficulty set, expect ruleset with highest star difficulty
+            // Present mixed difficulty set, expect ruleset with second highest star difficulty
             presentAndConfirm(mixedImport, 2);
         }
 

From cea582992fa9075899d36d0a4792c7fe13db4bce Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:47:12 +0300
Subject: [PATCH 02437/10326] Fix early return check

---
 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 eb86ef4116..9707475cc7 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -339,7 +339,7 @@ namespace osu.Game
                     menuScreen.LoadToSolo();
 
                 // we might even already be at the song
-                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && difficultyCriteria(Beatmap.Value.BeatmapInfo))
+                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && (difficultyCriteria?.Invoke(Beatmap.Value.BeatmapInfo) ?? true))
                 {
                     return;
                 }

From 16f53991a898e4b7aae75c8bbfc4935b6876cf57 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:50:00 +0300
Subject: [PATCH 02438/10326] Test presenting same beatmap more than once

---
 osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
index 27f5b29738..eb73fded2f 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
@@ -55,8 +55,14 @@ namespace osu.Game.Tests.Visual.Navigation
             var secondimport = importBeatmap(3);
             presentAndConfirm(secondimport);
 
+            // Test presenting same beatmap more than once
+            presentAndConfirm(secondimport);
+
             presentSecondDifficultyAndConfirm(firstImport, 1);
             presentSecondDifficultyAndConfirm(secondimport, 3);
+
+            // Test presenting same beatmap more than once
+            presentSecondDifficultyAndConfirm(secondimport, 3);
         }
 
         [Test]

From b50e8471d20fd113db31027692d472524b0d02f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 25 Apr 2020 18:23:09 +0900
Subject: [PATCH 02439/10326] Reword comment

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 301747acbc..1b748cb672 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -33,8 +33,7 @@ namespace osu.Game.Overlays.Toolbar
 
         private readonly Bindable<OverlayActivation> overlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
-        // Required for toolbar components that need to listen for key input
-        // to invoke specific actions while toolbar is in hidden state.
+        // Toolbar components like RulesetSelector should receive keyboard input events even when the toolbar is hidden.
         public override bool PropagateNonPositionalInputSubTree => true;
 
         public Toolbar()

From a756486a4d74073f7e131ff47235ba91d892649f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 25 Apr 2020 20:35:46 +0200
Subject: [PATCH 02440/10326] Make settings section icons actual drawables.

---
 osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs  | 8 +++++++-
 osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs    | 8 +++++++-
 osu.Game/Overlays/Settings/Sections/AudioSection.cs       | 8 ++++++--
 osu.Game/Overlays/Settings/Sections/DebugSection.cs       | 7 ++++++-
 osu.Game/Overlays/Settings/Sections/GameplaySection.cs    | 7 ++++++-
 osu.Game/Overlays/Settings/Sections/GeneralSection.cs     | 7 ++++++-
 osu.Game/Overlays/Settings/Sections/GraphicsSection.cs    | 7 ++++++-
 osu.Game/Overlays/Settings/Sections/InputSection.cs       | 7 ++++++-
 osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs | 7 ++++++-
 osu.Game/Overlays/Settings/Sections/OnlineSection.cs      | 7 ++++++-
 osu.Game/Overlays/Settings/Sections/SkinSection.cs        | 6 +++++-
 osu.Game/Overlays/Settings/SettingsSection.cs             | 3 +--
 osu.Game/Overlays/Settings/SidebarButton.cs               | 7 ++++---
 13 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
index 56e93b6a1e..214da69dfb 100644
--- a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.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.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays.Settings;
@@ -9,7 +10,12 @@ namespace osu.Game.Overlays.KeyBinding
 {
     public class GlobalKeyBindingsSection : SettingsSection
     {
-        public override IconUsage Icon => FontAwesome.Solid.Globe;
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            RelativeSizeAxes = Axes.Both,
+            Icon = FontAwesome.Solid.Globe
+        };
+
         public override string Header => "Global";
 
         public GlobalKeyBindingsSection(GlobalActionContainer manager)
diff --git a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
index 1f4042c57c..b2814907eb 100644
--- a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.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.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Overlays.Settings;
@@ -10,7 +11,12 @@ namespace osu.Game.Overlays.KeyBinding
 {
     public class RulesetBindingsSection : SettingsSection
     {
-        public override IconUsage Icon => (ruleset.CreateInstance().CreateIcon() as SpriteIcon)?.Icon ?? OsuIcon.Hot;
+        public override Drawable CreateIcon() => ruleset?.CreateInstance()?.CreateIcon() ?? new SpriteIcon
+        {
+            RelativeSizeAxes = Axes.Both,
+            Icon = OsuIcon.Hot
+        };
+
         public override string Header => ruleset.Name;
 
         private readonly RulesetInfo ruleset;
diff --git a/osu.Game/Overlays/Settings/Sections/AudioSection.cs b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
index b18488b616..5f55b268d0 100644
--- a/osu.Game/Overlays/Settings/Sections/AudioSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
@@ -13,9 +13,13 @@ namespace osu.Game.Overlays.Settings.Sections
     {
         public override string Header => "Audio";
 
-        public override IEnumerable<string> FilterTerms => base.FilterTerms.Concat(new[] { "sound" });
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            RelativeSizeAxes = Axes.Both,
+            Icon = FontAwesome.Solid.VolumeUp
+        };
 
-        public override IconUsage Icon => FontAwesome.Solid.VolumeUp;
+        public override IEnumerable<string> FilterTerms => base.FilterTerms.Concat(new[] { "sound" });
 
         public AudioSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSection.cs b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
index f62de0b243..a3ca6cf6de 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
@@ -10,7 +10,12 @@ namespace osu.Game.Overlays.Settings.Sections
     public class DebugSection : SettingsSection
     {
         public override string Header => "Debug";
-        public override IconUsage Icon => FontAwesome.Solid.Bug;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            RelativeSizeAxes = Axes.Both,
+            Icon = FontAwesome.Solid.Bug
+        };
 
         public DebugSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index 97d9d3c697..38f68b97ba 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -13,7 +13,12 @@ namespace osu.Game.Overlays.Settings.Sections
     public class GameplaySection : SettingsSection
     {
         public override string Header => "Gameplay";
-        public override IconUsage Icon => FontAwesome.Regular.Circle;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            RelativeSizeAxes = Axes.Both,
+            Icon = FontAwesome.Regular.Circle
+        };
 
         public GameplaySection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
index d9947f16cc..bc87281f20 100644
--- a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
@@ -10,7 +10,12 @@ namespace osu.Game.Overlays.Settings.Sections
     public class GeneralSection : SettingsSection
     {
         public override string Header => "General";
-        public override IconUsage Icon => FontAwesome.Solid.Cog;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            RelativeSizeAxes = Axes.Both,
+            Icon = FontAwesome.Solid.Cog
+        };
 
         public GeneralSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
index 89caa3dc8f..3ac6686e36 100644
--- a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
@@ -10,7 +10,12 @@ namespace osu.Game.Overlays.Settings.Sections
     public class GraphicsSection : SettingsSection
     {
         public override string Header => "Graphics";
-        public override IconUsage Icon => FontAwesome.Solid.Laptop;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            RelativeSizeAxes = Axes.Both,
+            Icon = FontAwesome.Solid.Laptop
+        };
 
         public GraphicsSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index 2a348b4e03..2c395d325a 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -10,7 +10,12 @@ namespace osu.Game.Overlays.Settings.Sections
     public class InputSection : SettingsSection
     {
         public override string Header => "Input";
-        public override IconUsage Icon => FontAwesome.Regular.Keyboard;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            RelativeSizeAxes = Axes.Both,
+            Icon = FontAwesome.Solid.Keyboard
+        };
 
         public InputSection(KeyBindingPanel keyConfig)
         {
diff --git a/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs b/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
index 0f3acd5b7f..69f00d1549 100644
--- a/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
@@ -11,7 +11,12 @@ namespace osu.Game.Overlays.Settings.Sections
     public class MaintenanceSection : SettingsSection
     {
         public override string Header => "Maintenance";
-        public override IconUsage Icon => FontAwesome.Solid.Wrench;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            RelativeSizeAxes = Axes.Both,
+            Icon = FontAwesome.Solid.Wrench
+        };
 
         public MaintenanceSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
index 80295690c0..c22174f050 100644
--- a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
@@ -10,7 +10,12 @@ namespace osu.Game.Overlays.Settings.Sections
     public class OnlineSection : SettingsSection
     {
         public override string Header => "Online";
-        public override IconUsage Icon => FontAwesome.Solid.GlobeAsia;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            RelativeSizeAxes = Axes.Both,
+            Icon = FontAwesome.Solid.GlobeAsia
+        };
 
         public OnlineSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index b229014c84..3edfc4346f 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -19,7 +19,11 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override string Header => "Skin";
 
-        public override IconUsage Icon => FontAwesome.Solid.PaintBrush;
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            RelativeSizeAxes = Axes.Both,
+            Icon = FontAwesome.Solid.PaintBrush
+        };
 
         private readonly Bindable<SkinInfo> dropdownBindable = new Bindable<SkinInfo> { Default = SkinInfo.Default };
         private readonly Bindable<int> configBindable = new Bindable<int>();
diff --git a/osu.Game/Overlays/Settings/SettingsSection.cs b/osu.Game/Overlays/Settings/SettingsSection.cs
index be3696029e..97e4ba9da7 100644
--- a/osu.Game/Overlays/Settings/SettingsSection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSection.cs
@@ -11,7 +11,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Settings
 {
@@ -20,7 +19,7 @@ namespace osu.Game.Overlays.Settings
         protected FillFlowContainer FlowContent;
         protected override Container<Drawable> Content => FlowContent;
 
-        public abstract IconUsage Icon { get; }
+        public abstract Drawable CreateIcon();
         public abstract string Header { get; }
 
         public IEnumerable<IFilterable> FilterableChildren => Children.OfType<IFilterable>();
diff --git a/osu.Game/Overlays/Settings/SidebarButton.cs b/osu.Game/Overlays/Settings/SidebarButton.cs
index 68836bc6b3..30a53b351d 100644
--- a/osu.Game/Overlays/Settings/SidebarButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarButton.cs
@@ -11,12 +11,13 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Settings
 {
     public class SidebarButton : OsuButton
     {
-        private readonly SpriteIcon drawableIcon;
+        private readonly ConstrainedIconContainer iconContainer;
         private readonly SpriteText headerText;
         private readonly Box selectionIndicator;
         private readonly Container text;
@@ -30,7 +31,7 @@ namespace osu.Game.Overlays.Settings
             {
                 section = value;
                 headerText.Text = value.Header;
-                drawableIcon.Icon = value.Icon;
+                iconContainer.Icon = value.CreateIcon();
             }
         }
 
@@ -78,7 +79,7 @@ namespace osu.Game.Overlays.Settings
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                         },
-                        drawableIcon = new SpriteIcon
+                        iconContainer = new ConstrainedIconContainer
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,

From 801968ed515e32990af009c4bfa2ee4a04c97b5e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 26 Apr 2020 21:17:40 +0200
Subject: [PATCH 02441/10326] Remove un-needed RelativeSizeAxes specifications.

---
 osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs  | 1 -
 osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs    | 1 -
 osu.Game/Overlays/Settings/Sections/AudioSection.cs       | 1 -
 osu.Game/Overlays/Settings/Sections/DebugSection.cs       | 1 -
 osu.Game/Overlays/Settings/Sections/GraphicsSection.cs    | 1 -
 osu.Game/Overlays/Settings/Sections/InputSection.cs       | 1 -
 osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs | 1 -
 osu.Game/Overlays/Settings/Sections/OnlineSection.cs      | 1 -
 osu.Game/Overlays/Settings/Sections/SkinSection.cs        | 1 -
 9 files changed, 9 deletions(-)

diff --git a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
index 214da69dfb..5b44c486a3 100644
--- a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
@@ -12,7 +12,6 @@ namespace osu.Game.Overlays.KeyBinding
     {
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            RelativeSizeAxes = Axes.Both,
             Icon = FontAwesome.Solid.Globe
         };
 
diff --git a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
index b2814907eb..332fb6c8fc 100644
--- a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
@@ -13,7 +13,6 @@ namespace osu.Game.Overlays.KeyBinding
     {
         public override Drawable CreateIcon() => ruleset?.CreateInstance()?.CreateIcon() ?? new SpriteIcon
         {
-            RelativeSizeAxes = Axes.Both,
             Icon = OsuIcon.Hot
         };
 
diff --git a/osu.Game/Overlays/Settings/Sections/AudioSection.cs b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
index 5f55b268d0..69538358f1 100644
--- a/osu.Game/Overlays/Settings/Sections/AudioSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
@@ -15,7 +15,6 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            RelativeSizeAxes = Axes.Both,
             Icon = FontAwesome.Solid.VolumeUp
         };
 
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSection.cs b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
index a3ca6cf6de..44d4088972 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
@@ -13,7 +13,6 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            RelativeSizeAxes = Axes.Both,
             Icon = FontAwesome.Solid.Bug
         };
 
diff --git a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
index 3ac6686e36..c1b4b0bbcb 100644
--- a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
@@ -13,7 +13,6 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            RelativeSizeAxes = Axes.Both,
             Icon = FontAwesome.Solid.Laptop
         };
 
diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index 2c395d325a..b43453f53d 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -13,7 +13,6 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            RelativeSizeAxes = Axes.Both,
             Icon = FontAwesome.Solid.Keyboard
         };
 
diff --git a/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs b/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
index 69f00d1549..73c88b8e71 100644
--- a/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
@@ -14,7 +14,6 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            RelativeSizeAxes = Axes.Both,
             Icon = FontAwesome.Solid.Wrench
         };
 
diff --git a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
index c22174f050..150cddb388 100644
--- a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
@@ -13,7 +13,6 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            RelativeSizeAxes = Axes.Both,
             Icon = FontAwesome.Solid.GlobeAsia
         };
 
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 3edfc4346f..75c8db1612 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -21,7 +21,6 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            RelativeSizeAxes = Axes.Both,
             Icon = FontAwesome.Solid.PaintBrush
         };
 

From a436f8e6d42165e5bf392fb2cf2be3a9378e72b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 26 Apr 2020 22:54:01 +0200
Subject: [PATCH 02442/10326] Trim other leftover RelativeSizeAxes

---
 osu.Game/Overlays/Settings/Sections/GameplaySection.cs | 1 -
 osu.Game/Overlays/Settings/Sections/GeneralSection.cs  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index 38f68b97ba..aca507f20a 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -16,7 +16,6 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            RelativeSizeAxes = Axes.Both,
             Icon = FontAwesome.Regular.Circle
         };
 
diff --git a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
index bc87281f20..fefc3fe6a7 100644
--- a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
@@ -13,7 +13,6 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            RelativeSizeAxes = Axes.Both,
             Icon = FontAwesome.Solid.Cog
         };
 

From 3c1730d0caaa933263b950a20ba1aadbde16522a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 26 Apr 2020 23:59:24 +0200
Subject: [PATCH 02443/10326] Expose SongBar's height

---
 osu.Game.Tournament/Components/SongBar.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index 8d766ec9ba..e86fd890c1 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tournament.Components
     {
         private BeatmapInfo beatmap;
 
-        private const float height = 145;
+        public const float HEIGHT = 145 / 2f;
 
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
@@ -157,7 +157,7 @@ namespace osu.Game.Tournament.Components
                 new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = height / 2,
+                    Height = HEIGHT,
                     Width = 0.5f,
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -229,7 +229,7 @@ namespace osu.Game.Tournament.Components
                 {
                     RelativeSizeAxes = Axes.X,
                     Width = 0.5f,
-                    Height = height / 2,
+                    Height = HEIGHT,
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
                 }

From b9e0fed4679d5b7c6193cb1c48ef8659eaa59f3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 27 Apr 2020 00:02:58 +0200
Subject: [PATCH 02444/10326] Use SongBar height instead of hard-coded
 dimensions

---
 .../Screens/Showcase/ShowcaseScreen.cs        | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
index e48ec63d01..aea531e88d 100644
--- a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
+++ b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Tournament.Components;
 using osu.Framework.Graphics.Shapes;
 using osuTK.Graphics;
@@ -22,15 +23,19 @@ namespace osu.Game.Tournament.Screens.Showcase
                     Loop = true,
                     RelativeSizeAxes = Axes.Both,
                 },
-                new Box
+                new Container
                 {
-                    // chroma key area for stable gameplay
-                    Name = "chroma",
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Height = 695,
-                    Width = 1366,
-                    Colour = new Color4(0, 255, 0, 255),
+                    Padding = new MarginPadding { Bottom = SongBar.HEIGHT },
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new Box
+                    {
+                        // chroma key area for stable gameplay
+                        Name = "chroma",
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = new Color4(0, 255, 0, 255),
+                    }
                 }
             });
         }

From 743b4f05b3640e728319a1eed500e73bf760de63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Apr 2020 08:36:36 +0900
Subject: [PATCH 02445/10326] Rename out of place variable

---
 .../Skinning/TestSceneDrawableBarLine.cs                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
index 58d69fc32a..cffe47f62a 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         private BarLine createBarLineAtCurrentTime(bool major = false)
         {
-            var drumroll = new BarLine
+            var barline = new BarLine
             {
                 Major = major,
                 StartTime = Time.Current + 2000,
@@ -103,9 +103,9 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             var cpi = new ControlPointInfo();
             cpi.Add(0, new TimingControlPoint { BeatLength = 500 });
 
-            drumroll.ApplyDefaults(cpi, new BeatmapDifficulty());
+            barline.ApplyDefaults(cpi, new BeatmapDifficulty());
 
-            return drumroll;
+            return barline;
         }
     }
 }

From 75c588c59d8f8548b8c1b307bc7a5dc3daaf91e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Apr 2020 08:36:48 +0900
Subject: [PATCH 02446/10326] Remove stray space

---
 .../Skinning/TestSceneDrawableBarLine.cs                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
index cffe47f62a..70493aa69a 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddStep("Bar line ", () => SetContents(() =>
+            AddStep("Bar line", () => SetContents(() =>
             {
                 ScrollingHitObjectContainer hoc;
 

From dc6acf6ec9f133225a45391723c7b2b9647688fe Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 27 Apr 2020 01:40:57 +0200
Subject: [PATCH 02447/10326] Various code changes, fixes

---
 .../Resources/old-skin/pippidonclear0.png     | Bin 0 -> 72589 bytes
 .../Resources/old-skin/pippidonclear1.png     | Bin 0 -> 40613 bytes
 .../Resources/old-skin/pippidonclear2.png     | Bin 0 -> 73308 bytes
 .../Resources/old-skin/pippidonclear3.png     | Bin 0 -> 34541 bytes
 .../Resources/old-skin/pippidonclear4.png     | Bin 0 -> 71177 bytes
 .../Resources/old-skin/pippidonclear5.png     | Bin 0 -> 77056 bytes
 .../Resources/old-skin/pippidonclear6.png     | Bin 0 -> 78392 bytes
 .../Resources/old-skin/pippidonclear7.png     | Bin 0 -> 77056 bytes
 .../Resources/old-skin/pippidonclear8.png     | Bin 0 -> 71177 bytes
 .../Resources/old-skin/pippidonfail0.png      | Bin 0 -> 67970 bytes
 .../Resources/old-skin/pippidonfail1.png      | Bin 0 -> 69118 bytes
 .../Resources/old-skin/pippidonfail2.png      | Bin 0 -> 73351 bytes
 .../Resources/old-skin/pippidonidle0.png      | Bin 0 -> 68649 bytes
 .../Resources/old-skin/pippidonidle1.png      | Bin 0 -> 69329 bytes
 .../Resources/old-skin/pippidonkiai0.png      | Bin 0 -> 76964 bytes
 .../Resources/old-skin/pippidonkiai1.png      | Bin 0 -> 75434 bytes
 .../Skinning/TestSceneDrawableTaikoMascot.cs  | 191 ++++++++++++------
 .../UI/DrawableTaikoMascot.cs                 |  99 ++++-----
 .../UI/TaikoMascotTextureAnimation.cs         |  39 ++--
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |  14 +-
 20 files changed, 207 insertions(+), 136 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear0.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear1.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear2.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear3.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear4.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear5.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear6.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear7.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear8.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail0.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail1.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail2.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle0.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle1.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai0.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai1.png

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear0.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear0.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5f4d03e2a61075513c85f24ab39280c31f591d9
GIT binary patch
literal 72589
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear1.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b239cc561c5cfccc67f04badfa8ab1b54ef6852f
GIT binary patch
literal 40613
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear2.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear2.png
new file mode 100644
index 0000000000000000000000000000000000000000..491b1944b04257cd0f434e3a7d19fd35104871a6
GIT binary patch
literal 73308
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
F{{s0XwQ>Le

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear3.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear3.png
new file mode 100644
index 0000000000000000000000000000000000000000..31e0b91e9fdcb82988b6b8d7b2505a38fdf70358
GIT binary patch
literal 34541
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear4.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear4.png
new file mode 100644
index 0000000000000000000000000000000000000000..de64264914cc8330093550eab1f0ffaa01e91be9
GIT binary patch
literal 71177
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%0Dr63wml-6F*tONlh7MSGocvsq)+w
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
L&GqVZUE=-^HyYM<

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear5.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear5.png
new file mode 100644
index 0000000000000000000000000000000000000000..417af6c61166c727b9ab50cdd14a498c68744e0d
GIT binary patch
literal 77056
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
S-AwW`#1E{fu22Os|L{NMEB7e?

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear6.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear6.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cec7a105d569aa2f9d4b37f709496b29eb96e2a
GIT binary patch
literal 78392
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
H9i#sbzl81d

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear7.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear7.png
new file mode 100644
index 0000000000000000000000000000000000000000..417af6c61166c727b9ab50cdd14a498c68744e0d
GIT binary patch
literal 77056
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
S-AwW`#1E{fu22Os|L{NMEB7e?

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear8.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear8.png
new file mode 100644
index 0000000000000000000000000000000000000000..de64264914cc8330093550eab1f0ffaa01e91be9
GIT binary patch
literal 71177
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%0Dr63wml-6F*tONlh7MSGocvsq)+w
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
L&GqVZUE=-^HyYM<

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail0.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail0.png
new file mode 100644
index 0000000000000000000000000000000000000000..a25325815275dfe5e34358f3509f93fa273ba40f
GIT binary patch
literal 67970
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail1.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dcaeb92e3bf4650be65948ebacd9a7ae8bc24ed
GIT binary patch
literal 69118
zcmV*4Ky|-~P)<h;3K|Lk000e1NJLTq00EEy00Bh^1^@s6!c4nR00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D|D{PpK~#8N>|F<Z
zQ`H+iN!oOmmKMt1doLNXx9q*eKgb3ZL57p*Kv}X>kRdW<38H`^dkD&s4YK#{-WmUU
zUh<N(ls0LTHZ48;E_v@IP2RijzVCeNepjK_>yeFYWaH(8LZL8jWy3*`J6I)}(xS<r
z0M?17HNJ8`(+K5k0?9@;USebuh{M2+B~iGD<|>+6G&kcbkMTVchDNkl(PBi46D{6&
zEK>;PYy!zfHeO<66NuemNgN~#57E3Wnx|;)qVY4dI!GK5qJ@bTZrtWE5{Yb)I4!aX
zBpcayiIGhpb_F|=t|}4-iNZ%Tf6)R(%V}&mMB{t>94(DV(Sk*LWNeQ`3lWXSX_1g*
zoK{F@6G%3)@e(7OK<ox~BwbZ>Q;|4G7P&>sCt3mHYjx2oh(-%U2HjWJMEgy&>!RHf
z?XGA~M59IG)FhHkAlb;qON?v+u?y&qB6-kVMGJ$(LDDE9S{czgh~_7n{JF%SyNYhB
zb)uaW?XqY$MWZz$yR_)eayn!aNH((Z5+j>H(gb#%ObTA2(Os2SG!jQi(He?YTQs_~
ztO2c!zeM{*wDY3f5RGmvk_bu0>4bHX1d=_dvhfl@9_)OT8<EsQkoaMd_Y=R$c>dwa
zMpgmG2g!rvz~Fd*X!%7eE*h<lE~1f4OcqDsLjLIW`8X6PR}}6!y`a7S7-x5^!@S8m
zjGvG|qSz<e2GK|&v_zhY7A>07Ss~d3l8wv`S?Kd&X5%&kl!UyW6y(2?|5pAx%Y8P2
z4~gZ2BJU?|1YhL`UCyGBbNnrv<=<o@^Fa=llRR>XR#3E3qLmk|muPfnnaE@IwR7+<
zSjf1S5WzRDVpPd0#ytsiS<MmcZ_zG^c3(7RX));TRLCZfY&bLIfhd!M++-myH$Kcv
zo0J>(+2qg4jgVgn`F;8Gmd)~S2nu~7DT0uXC4MDw$c>sMT@-SzKN|&tOfLMJY-A2_
z+*p!FVbN%H)Df+{XdFKhd6cUAD&Ahd3O>1*i1lJbK7ND|`DnaI;Mlk-8cF0|(df#0
zCK?0oPK9g&$wqoY9$2z)W=kyOEswMDVU$UM52YnR$nWtuA85H*e$Mjy3CnHyH~3k(
z@oz2vj^INgx1@-|vhkQDagZcP8hrTahKMr0%8kcmQn4fxwrn^bI3_qo81o=2Fy2vC
zw0feEJeY+gq1^{#@!Gp@!z(94BPrv=s2-R*f17bnihF!6+CQTGCmLfR94}6VYy!zf
zYG5gVxlMt~S4&|ne@2Go`+SuNK;Gu7Ws~1eOb&9Bg}wYfQzO~vI*>nO`5Tt!ByY>_
zGwqTBff^<Mp5Md2CuCxfg*ypBew7>FBMHc_G9mDR=Qdpu+?FSd$&<#|nC~x>icBW*
zcgc;&CKTrY#|y^@({$;RDkoY4(YlIeB9F1#H={_kYF3j65&!R>7*wN^aZef#vqU>0
z+C|asiN<l_RLCZfY$OK`gv5fKO%}?Q8oR8)%by`+K`l4=J${aV!@rfc<yXt^Vw1^%
z53MZR<&qHmdv0@L7Jbl6pJW;(kMTYE_bktWkY6pq&)X9u5JDy!k_dDAPl@(GG`b`>
zfsB*JEN3BGk_rEY-y>TmZ2UfFw@~E1X5aIE%J)EiwS;^<^0mp0aJFmYxpSOwjB#EE
z-BvY38!j5hpoG~sF2O%P-?j~YH?N>$iK@muNr{*(8ndz(OecX**>Eak6G%1)%ZFPQ
z;+Dc(7W9c<Wldie=sd>8?~=byZt^jHr!4&CCjYJcz4A7XlQ87Gdb$i`3qw9XekZ}t
zX9mcGK(b)Y{}s_lBqWr?WI};KG9i&zy1HbmM{azGWkH-#kngkQn32bYe19$P7a@}c
zuZPzqTVHIlb(hiCWeHv%iGpzt1}qr)epj?0(WLP==j5NrQK1$$ZHD*RmFQY^m~l_K
z=U<CP3xov1$%WY#NH#JQ@<T2Qa`{z$xcLysO@8p%C<rVyf4<61whrX?`M2_S%fdq5
z=5c<8ld610qsxe{BR-V;JDEKA8Tq{A!N~X11f^05r9ynI!bOa6SF!C1SEUC$T>Rnd
zo)<aXgP?Zt67RV{rBp#BUX@C2i&yb?3VB<+r_;wGULTEkZ4~0-A`lrJfvEUsL}|kj
zr3prC+)c#CM<8B9x%fixO$tZ~3;MWE8ed5$p~jY&Oh_b_t}cED8;Qh{SY+YM2i%bY
zSRPZnSG-3Y2fUxMOOUS|AH1jh499_dPc6xVeIUE@c)h$<Hu)N5qRdD#;h5yOWx6io
z9t@hlC7Lug$INJp3M1EWGgS!R*B@^;WA?5D-uIcJS!QCfKb#8L1d=r&Kh&0jTW+$D
z=Ab7T$gh0B`APvGH`#5(CJO>K`F)!5%s`<=#yA4MLlzL0zfV{Wsx*^<3|ALH0<P|&
z1;NcFFFaL2@KX81$JHO+9zO75^Yw#=e*oNb=Y@CSK<M%WK<~xNa2%9(9^uiRBe-+z
zH13An!lU>bh>O2~$jFD#=_ogoge)j2DCn{{A(~7kvSq^eWH%Ruu56viO(qmeEnX%S
zSqSr$NUJdBJ>{6<xM7EqFgPaY_-BlOiUPNJoTS3f@$>vU{x&<pl00~gw8GeA0<|O)
zepbF7BE89k<CfROz&WjtzM|C>&DAHT3e!(rgnQmRVmEcz`c_G7TuASx1m1tfK#q$>
zE0wd-d4HV>*#wfgA>SxIl!?hgCJLD(WTKEsg2LXCDEKOqglrYa8YJ`EsdaIm-y>_1
zgx$y>DUcx4t{(7I=Z23uAN)M?!PhGYIsEg%J5OQcELj5XMN2{N!_#$MD0F&gPF%x-
z{m1a{t#i1mIfm%SzYrHoPDm0ImhvlwCnXCtQBEqOP?fC`l8M|bNkt|W*;0`;d6`%&
zg>h;u72bc|dyXTH3laqt3A%GQfsT@tajCkZkx1lmlUTU$_jxWne`XsoZI!~3jWHuj
z*B-B#pOcAFCdBjtua)jp&N650<2~a(K3v)yrTT8-W~vZ<W+#SK>ulVUuI+cxHjBpo
zV0|nq5<Koy$R?1?0r`f=B$1dX<cE{5GD##w6f#-JE(Xh23IY0c`Owpv;NSE6<lpAD
z&EQy~%SS0*CAW~u6)rAbf*8Evs`P}b!VPMbyF?OdH&3{G3X35iKm3c7gjex$@Xl2j
z9=_5unx&w88j8r@&)~wj^EeZJ7O|Rxh>p03cn#(I3qb+G2bO}LA0+!wxNy#ZOez$x
ziHSuf6j_tEBpL3@<YJ9>&+#CW2gi+E`-xFwW+l-gZ6O-9ba@O}3!VeXjATLIKZ^{K
zI3J2eLLr&3(K3;*i{~s8prgU-B{4F1&Ois_A9QKqyTc3N{z`9drV6{?uZACIl0PNz
z{>>NdsAv~Nqx*{YR=zh*gKPqEKCtuUhg2qs#AG427ZC+XLM94JlHe<ef)6<#c4~(F
zJDV*E7nO?;`f9kidJ96x4-X~XM}hEi$q6r4cX+sa!pqYO?%uv|_w$EaKp?ye=7uVN
zKInaU3fVA0r-NqidE7sC3CHf9!c*Nb#6}AXC5lRCijcKZOLq{3EJ;NcJeIKq%SHlX
z<NItfnXpk<B_<PjTyo5CEYY1qYlGvdglP3eqf18~r_Vtp#toGTz4)iqYLS%uF@o2^
zM)KGr8iUAeye1x_B}O9QdCTYPXcFNylPH<GE5|>03_rvP&P%1-)EwW5fwdD@ADsK~
zlW5G?BZ=~U^4_EeN!o;L0?Aldk_8(dJQ77xBw<MwmMt++ST?$yiit+|0zb>|vxz8N
zUDSdo+@NyJ4`0_p$f+)f0I%E#$Xx*bg-au6)$-65pywhR_JZoh1BCo}0T-@Z$EE1|
z(5TKJKI%B)V;>+omU6@@$izYoos9%SZJu)qsLhj|<YpOnkO_xBl-O0ovB@z=4S+YD
znQ^pQ8Bl&*G>*9h<I2a&S5h>RlPQ!z8f`oxqawvCPc;GL>mV`GDq&-Ns5_$ZdSsU#
z&)3n`2(O#hOah^6jww@o{_sQm3tf@PBJx=<rdBD92lq|)m3{w>Xbhgq^FR3Iaz8i~
zvI!)8A(I7PNfvUGiGrG)Y)NonT5ijY52>Y9!9h(;u(W7=sCkUv$A_J;k|+$Z1`>t0
zYheTmq6o^7A3+66Ay?%paH&)RdKZ~{vXO3}b#mki!cN}CmD^8nCFU;TR9B&kzXEOC
zb!g%rAuc{PrED)t@PmBl`FdNl!=lMC2iZ*|lZs3xBodMc#}vmK)2V57FgC_uG7ATC
zoSDX&uXhe<OxY?+D39pI3yYu^>pAe8`38dx)XcAoMk3*P^L%A%ghb*95}|9C1j02v
zUKNc5!e=zq1akbN5t#SYkH$Ue`nWF0PSH+_CYLZFd6F2N4%r0aILMvIhmMk$uZhWm
zuOtPM1O>lL5OU+gYDp9vzzpCe4rueYtRf17>&XKyZiV5YDuP_<0?6Z&4?+2hA)s6(
zxK%F>y@&KnWW!0Jh>S-3xx3Kbeu{|u&+zccT|A6<geURAh)~`Yq;eH;G1m|q6PjGc
z7a_9_1r%Lgbe&MEXDYGmCL)=TNcdTfF~&UP!hv*IH51J=U_9JC;OWj(=(NcYgH@tI
zY+MXtVtINd@H}`?XGGg88Z(p_2cm0BUWAE%Ab-xDup|&#AVWn<HG$keb_5^PX>Qz;
z&X<<ea?$9z;&t&Ju<sp3h-pSPf!Gi1G&W1JNXoj9EeY9*kconWlZ`<+KBRO#QOn~t
z|Bl~dHBm5NtyX(M?OqsOs-hB61o;Z0$Xgu#rOLy-YGLSd@Taqpm7vh*puBn)(H9>g
z<koH6dwdfQBOl;#+-*c@uOc@3Kg7n;Q}rAuz$gr;#WVAVb5iI&k>{n*3gOse*>a9e
z3Q(5t;MkVn>+LJKJnbz%D5E&fCJ7?pxo#1S*=e*$NF)@xa%@B<5qk;W!~`-#G%9~K
z6Ue;_7x7`GSB!fS_yr3^W9l}qhkeiM;6*znc@WtIl6uIUM6yV1U9fRrSrUdNS+J2P
zWU}BxSy42mK=SWolCX*_JlwpY78Zq%tFS2C3L(f(kVSz~@GoBhu9XTy?`C?&v+)u`
z5fy{@<JWQL$UiuJ`#5ez{)w1q%Btr;!An;V(}I`@L>CdA^c;_LlhSQP>1P^PIdcR^
z6Ez(LgGCaL(D3KTkLSr)0T<QaN`7=}QTWpJL+#z30rtcMGFUV|+cptM66C@76fF;u
z2WOqrEl1Lp<2p`@Yyz<j>=?Ghgz=&{g-jM~BnnIGf-V5=^Y8iOrAQX;ZXR$`yGd>+
zl}is4b<c}p1qvf~t?F=nrG)sF>=;FsfkuP)yLa*I+6g?ob_S6l_YfByF06-e#K%QS
zt|=FVC)6sYM0>%_#TUMw1>o;p7&-G7g-iaNP?gLBz3+>yOl5c!g0~;Snd3Wf`q3|l
zilyvL01^oW7~NWQsc_75%u?A&H}bFq<yCB4EFz*32yC7wh3#t5D1dpc6vCD+EqjoN
zC4n#oLIUA)ZWVzrV19br4lL}?KQn>k!Sg10FlCok6v>Ykl+(JdWMmUa@_3PzLCZpp
zTUf>?_;B&nk}TLNiN?4E$whwfk|hiecYg$Ultz)jN+?;e33Sns`0dCC;vK{ND(Kk-
zO{X(eJR4aB@qb;ymEAjV?$O@}(_Vy9Pes~x=sC<>ibA2Th8&vmsGUC#a@Q{bRV`-P
zz8KL*PT{Y0OL5`>lYkOHb_G!@X2M2>kcTBmpuu6!BtkJlCOa+%OJQuet~kvWIioBs
z0-4V?pJSOo=)$s!K*AqC!JPJ8aOD_J%><b|81tYhD6c*!Cj&S&c@WtI@;qcKgHJ``
z7zPP|1BPmyOcs2VOE>V9^DDS28Ta`&Bp%|0gyE)khqrqn<nbzpk_9WHYNL91rENvz
z4OAi^hZi0_3B{?iIq>z^H}D{Ozw|eHg%A4l+XQtDj^%9F3~Klf?<4x*ZNxr%22DgP
zbTKiaiPyMzXhc&nGtJWnZeBUy>gxx0zZ`H66t~sa6M7#n=+!A2jaDK2_k-BCV<{fT
z|05nqD$VwVUf~CYTP+0Ws-khVs_^MmFWHQ`_-j{i<omfedh<CVNq~$Z4;hqQ(J@ho
z63qe>yaz<%gF>OqOeR`TBoSIEG8v`@R1|4}@cEWqSdxkNA_Ae+ar4wEeASXmg_yu|
zpjEU=G$sR(?3fY9n=dCU*m{nZa*HyDukt=$2{|4_YmD1+OEpnt6NmwF=gU?G34={`
zNy%0Q$wIa)NDz!&@Rel^n3=-Q@_SOSE<E7s>WLicGN_Qh7CQCsfW{pwBQU2o+}#yW
z^9&N<@v|^2`sNAd&1oeb9D^UYfJX;3oAI5rosFbHzkl@ZGq`s02rfT8hfwWh(SJ`w
z3lTSp&#A58BsifLC=AA@N|6J()x}UWS6LLS@+!O<R<SyZE%vYT*t_97+>7~5d}{(B
z=rHIM`QW8$f#&7wA>e<_lZ}tXKD>+l(?7!5hwGr#QZ5@nSE{GGXNHo849YL2Fo#7X
zh>h^ZveNN((HI|LfSp-dw4m70sU;DaKsXPC76`MjUPvIcI+k?mgi}XpV3@$)rfJDk
zWV+j!{l*EBmX?Pt=SF$M8)4}kk>wW~WtuF|NgTA&cn-A4_*-n;mtA}|k;%(UAo4|8
zl7<}1NK6=(Rt6ibjB28BCb#?qCP^C1hGN`;lc|&{5BRGqqH3{MFzCacsNcMtc+dDj
zD{%43Q;hF5A4jf#EA8vW*zNVkM!46iEbV7Q+*DyX#O=F)`zJ5p+=Fv?sJjGx{Bd!!
z`D{8CdJZL3N%$#CqPTx4lxfix>N>1?kr1kz4{&7Rk2n*y8cIErhSDE;G1S$n2B=@O
z35pEt23<0>#QvS~DNa6IVBB*~(53Y(lrq=^3Pr|25({cMzK|LcAz4_?L?0m<<wODk
zA#v;*Hxe6G(wk<2{CkH)J1Cm$Vv~u@)^oBX4%s`x^W*u@Gs11kGrmt5N02;79JIt}
z>9Fy{NvgDnNG3MLie5$nkvpE9N}(^420NaOq#!rh%8;|9=tSm|CjaeoAX!jDW1!pI
zkDjPis0%)sKLS;26%p?l52pg#_T0yy?(Lz`)8ZAQ*`p0w%vdaKzpPL`4Z*XG$8hSu
z^SBXrO$d{Jpwv<6%vk6ZIgvwE7qv<>M8V!|#iQ(k+Y5JM=UpLKG*phA14?CORL$K8
zm4^(5E;omKLg;VY#`5W`P~zOs=>>^|JVzp&V7OK^S|rRWBdN&RzO5v}XP>pOIP+ev
zg+*bFg?F#R<I-jPH0~YzcI>&#HvSHYYollk@Lv~Ao&ag9Yb`Nx@SJ!KlvlDxgpFPj
zk_bOTi9<op-yl(tG)P+P2fEGpDwCKTE3&FzUM2#u?0D+^GHJ-2PYZ)LfN6?stntIA
zhK1rtGDMQ35#&=wv{JYmbwczV``-*d*J_wFbpm<}s12nZx-~RhgCT8ZW6yam6=2XL
zd-mN3kJ>bdULt5Ti2mgt96!1j|3#k?debp+gVV<ilp5%j<%Bg_3mWaV46`~?f?kmq
zC4CyAYTa(|dQA*{L3qUF`7?0%f?>QlJ1EaW!$T}fqR2vXrD&YpEyo*DLn4#|Otq&X
zSzWaEMWft!5%}E{)|M&8w1OCuA)(L$uqC)p31UecvS)-cio`~l#nwbLT1v7DONLA$
zd{CI4eNHs?1<8zVHJQ+?cJsXq1d^CIEE$_jO|sw(kjqdvG#(>aBuN<Vu70RhvJHlg
z8;q(As^Pa4$1r`)dnT(uMoGW6*mz_ff&$4^_QPK%AE8^zc8J%}0v033y(M0o`Gd5b
z)uH+8GOq4CfPbDG6W6~_3}7lw*{~;=#idj=MG22Gh}1mA-I#UaA)>6!9H2~#h>DPA
zu^T~Q$i|u>BoUejsUZ={4=S0Q;LGfl0iuye63Yo$NV5ne-DgbAwImMN>afLSL>b24
zp)jHR;(1VJktpa=XM0UFmYJc<OHy`OK<*Q!h3yiJmJt&UNF;Ksi07B=xn*Sn;YF~?
zjLnXh8JnFfGd6DkXZ6r5rG}AY$NPI0LG7}wF!;j(Xwb9@+}#v7eeMxH8#EtBZ?2Pq
zvNH7IUe_$x2kZX&3ZCxv@5^YRvkYl76ThFDF74~ZxbEJ2J-q5VzndX7P=-e0!H>Ie
z`0C#X)*pmIljP*Lmj{ZRQuX5;YJUXy1|etOLdcOLA3R<BppVx;8y6=GG|}SY5HDJI
zNF*MIJ;IZiM+nzF5{k}UVFhu5xixYtbAoa$QHB<UB?aON(KyrIl0>W$mI9O|lp&NE
zEFwv__Q#@8zVQ1=2K+t>WLdLkjDwvm69);4zs1k<_fq;z3J{Wqto+Ir2a|S+ipKM3
zD;kwyel~&p;sTrjMU~KqUk$mRBuDZ*XeBKb&2kP6&zJp@>|B(rN+7%dnr?EZCpPui
z`E0F3BbmtTo&bTqWrd~D9>YE#f;zPdAcwcX8oYf!3NznZhmE@y3N4scX+qR1F%YZv
zeJV)Cc)$U;bUhMHYc(_devo@pw3<mPJ?lXAI0XMK-h>19cR{B;AZ{wh`pXM<Wogu@
z-W}C?4uOY|3@#~&o+LmK5)~4PC+Du?&bgDgaPt)I#+`#+cR}>8wVs^J0m`<R*l0vX
zo2(}eAetp45!n)vC+<;L%0m4`pj=^Gf!aSwglnEqi=&+3%7JtVQInMGi7~#w?`8o=
zem{Sk0@+%t!%~jX-A-A>-z9NyB62t5egfI$qE=z-qM^uJp$dEoRD)XO2j$a?P)A<F
z)8KPBef${ak3VMov;<x^NsXmcWO5~m&=TP}zi?n=H3E@4oE=JQf}JiC2RoW(9?j3z
zq9tkSd3)tXF~0`r-1C3<->60?n8#D}hvB_vq48L;;4l`>pM|G!bRj;E^0_+W*OLnz
zVtH61R^0A)I)9DLN2W>pdT|-udaZ+Zz1q@#W`^?a6P#PJ4o4sF6hoK&oC-;qg`if}
zMAItWQ04X4;b!Nqpk#=NkHxLu58>aFdvG=E9Ab5+#DhT(OXkN5NQ67owh{}=lt_dR
zwJgl(0;de2yPNxbk3yJn4SpAigql4&(pKUi_<gi^D97ls;_p!DW&DNSlAfZ`t74L0
zrK*-k*I6@>zg#(Z<)qkqF*GN4;Jf()aqLG^`ZKSa@tChgV;wZcY-m048eZ5ZS%pA&
z!ffnJ`35r!ft}8oqq4b2;-K3~{;UbPb5un2l5H_~%5XHQn-{*`=01px*W-^JSMlZO
z>9`!cL;P{VK)H<ko{jOx=^qj3m*A@%hT9Lcc(qak#Oau!NGqg;utHc;Cv!q|{T_}j
zU5!&Ae?p<-vz?8c>N<Gy)1Tn2a{QRmiXk5%)UW&dPvFq@<+v5SO9%*hWHL7><C1V^
zQF3x3pG+c*QBd$x;3wy{p@J&A#A%JNQRWc*UXld~N{(^ZN*shNpJcZ?V;yq&e9k$e
z=Y-@U4T{Q@Dq-M`E%3=jKC>Q?5ANa5S>5sTY}2#G^XJ4yT4<cSLiYx(C|*mFR!CML
z5T2}T=CQ*`9I}Zi6GuJK=&v+&I>GDA<y!&G>I}r-FZ!WIX>VB00b|#kyZjWN4qS|V
z7gs=+%q(Gl*XsE7@EVjT%KM!@h!aC|Y|r^vyZ2LRpBY(whyMnb@=R0DJYY?xW7Fs0
z-w;90S}H!-AiPx7FnsblczIApr7vQXz{4|FaB#yCTn^tU1O?@5<^|<kR7|8G5|d>`
zVM%tBEfEep29Rkv$QDCVkmZdmOW5cFrywO!@O#;~O`&TGaS$?j(DhDPMunF$j8+Fr
z=QC(86BatY_b!@`8=a!X@gi`h{2x<0Vat4a;3TkvIMIv?cd<4X`-CpIB>N*X69`XI
z?re&EntAL+vNc^*>~xkKV8Q+8g5v?cWze+x8yK_T9aJjr0ap$O3*5RFhDD$5#j1_7
z5v656z8LPR(pdfTO4NOoe3ibq_ZX;Cp#fryg14w|2Q>U5^UO|v^wVbSJh%YyI;QDo
zLx!ue9EOfxjetN7=Zr(Fc*24oKER>Hi*V-IPeL5hrEg#86#-BxD!^amg8+{l@b}LJ
zAD>)Mxwu24i-txYg_!VAJbN072hooZt`~~2_NsXJZHw7Z)+H(nPeD%sNlSzpH|L4a
zZ9{=cH^Ym5K$blu4ogs&%70@kaS*aRqasXMMkSa*a>_9-+C?kGB*#W=*?<zYYo?k!
zWJErFh7o!A)e_hz><gxK%2o((dXjFJ%t|0ULD}k%nOb&NF|b8HVMozui6kJ7oIb_T
zuwrja{c$`>74m?J-(rE_&=_pp@E_(*`4YDxcbf(&XBn$hO`%ukg+AKsCUQ{}#GJWH
z(X|&1ob-oA=mqch{T3^BPBtF#!5b3~K$$yZ1y4%QJh+cNGsojj6#JOUS~g5j<iVRm
z*P&1et{vtah!Udm*0Iz0^{1(b&~PGk>cK2U7iAd~^el@CW$U6y-KOv=%rK?l!B!YW
zlC&)vpTKzW`x>#srj3b3=;5=tefkJ)+`oWZF~`K;7*g6(0_9zJWVp17qY)ICBo2}Y
z1MAE}VgOvONtGHRNDX+YRAXiGpe&;tqhRSP8ndiSvTW|1tMCmn^qD<yYRw9K{l;+P
zo)ioELNqR`OU;xMmrSOcB{Cy{koDP-v^p5;V8_zTqt!vSW|1@IvyvK29q!|u2d|cV
z10OFLhguc=p-QAXXtjDA{^vesjQ9>mZ~Y_&njyHv!LCv^K(i9<QLtrQELku}jA)KC
zaUw!<`tZGPF=BiJyG#;HE$%(i;?;^x5v^s}AEB-U^}#C>W=Px42R$w<n1;VEEI0LW
zHWH#v;n8UR&e-SF+l+=@jPY=t2K#2rz_Eubgz&J<8c`~8ptye{)M)Sq3O0Nd9zyiU
zWRV(>Sfa#J9{nr?XI8Ak-?t8lXW)>K#HN6GlAz3E?JSFBfVuITXuCyY41n_?=-#5x
ze32{5o}l!gyrQRs!FicHSjC%b&CB!BP@r^4jNkKz&GC+uKv&j?Ac{~4?2lQZ{UsVx
zduf%CP@h9)A`rQg*^!B@4mqu@lW4pFCgM=Lx}kVLbBz7+3v};RE<ub##=|F3nEvi2
z{Pf2+h_fhxp;y&LgS_ofVnh$<y*=>zm}$5lJJ0Z*xYuuXpMy{5bx2cb5_>=^6!?$+
zw+PF2Opx|TY_HEe2BjOvqw^sA)<yh2bAZrbGrr7-v%*bT4ew6d43BgOnx_`=;z_)E
z@E`oV<#WVp=_*eiDn${zQlt&)4jv63H6LC3gX9)1p33_>j^e<<t+)~Wi#Yh=m?h<2
zNLVnmI+OKF)>$SRm-VI4WYCB4kmOuh_5yVUKCBF&QW++BaM7+_qOo|RG#F}k>w>=X
zXQ$a^^&-6IlN(PBF(MKOU08pJ#?)kHsWBVtIb;?B;R(^av$Q%mpM#D&b~X!}F@H5d
zklf#=DB3r82UEWvihMz8=}RoZOaJ4yix@v_0`5m2;1R=dMIiF3|A&@ubcUh|*M1V_
z`;4Ek>&67pVTQ&2>z95T%l{k?FONjQlMKS$2eGJMxfLR{9Q(j4C5EH?s86JAXTa@!
z>#%42`_So=w1l%Ez*Ou`ug*i2E**?VoEMa+&*EdSe$o&;jG>%)9-Pr$HGem>9{Cy6
zs`PtKNG5kr|A#HB=iyP@iz^)`s+~olNllxAle4qw*5Z5)N4v5pmMF6r!=+D(UKCbG
zWtwhj(Ik0RxkYmfUa`bs<Uu4sAUj24aPox&;%ruOQjj~CzCl_SWN3L7C})tfoB*?|
z_`cNHZfXzIDAWt<f8K?Ko8CeGB*-HoQiFH8EkeKk-2{1X=>U!o@hO+~Xj|qByf$OB
zi9BL=|BGF>7MaL{>AG`%9_=*bLFCEhhEC1iFzx{-uWlAs<Y>hyW$1Jo99uF5yVi}&
zCXW=5OWg|PyE;F45ELANuI}jb#WED};(WH}QO36&I*$G_UCD!>TdY9Ek{I^I9CWTY
z8wyoh@hm(q>XZtlw2r$GlpT~U6yA)ZQke5iDy@$6G4RCXsR#T`{x;W|H<3rNDwQ2h
z9#K!9$>bq}{z;}G(?okAc{)3R$el~OmsSVOIl8KNlUeuWf1)J_E-|}mc%SdE?c_2v
zZd~}e>?-2lV|UTGd_Sz)J5dNV)(;bcPFVznJtknl@Q;z}t+wKq4PC=B8b5ED4~0>)
zS1XHS!N#wVKR5ZxvC!F|^Dr4;(A2K*b}<C=HTrwFyNc=D8HcEl2iQKP70#Yud@>u!
zL8r)#cAejbtE2Q>2f<gTM9(R6P{wbdkTMD7?2X7rh>uHp&Qy9pDHOuW{n}&n@J~_3
z`$N&kbXp{YtBV>gE++B84W`P{tHG2?CgD)_P>LkhLG1;0njHHefl+I%FPd~xIRbOy
zz2CPwlst%QKfGt$l0XZD+A<l1B=SN{)R_r{=f+NC5<DYDyrE>}s-pE4t*L0dxl%`~
zg*H^L)L?Agw;x|EdL02tOy<*xZkRrD6<W1whg%VUiX+CSRn-HXD@{d{uZBQdI$<jA
zp=n<uM)Rw2&j({he~#KU9Gl@3B8<f=w}8l`E$<g1Uv6*ItIV=E2An&=B#Mkdbl4;O
zI<+|-Kh93iwFVV@yP)7JnR9hXcOhFlOq_};fo~@uky!0M?4GwM!|h<7B0=aic?905
z`IXQMsoa}EcfExbLQr9CBO2qX6zCM}6!5$-dy@#ikK{x-Mus56(F8TAy`P>w?r`#m
z{_``;cz=U&Pa+Sd?$WnMw-q&j7p6%%BZ06}d9&oX9SoE+J%AHwNFMalP(v^=gr84Q
z4C?tEemyoHwJLF$P2(FDh>6jmdHF$@zG^JA#<ixovRomL;TSObefSM(27RJbsz*yV
z;$j%%YJ>u<UwH?^$2Js$&UnbqU`*!jLtx$ENF2Nv22UGf;68$CdyVTNuFEj-?4IVf
zR8K0sq0`1=*XP|474zaCW;QIKtb%5PhC8)3ml8Y#OEmv@Jj&&yZYM*J!}pir)@eg_
zU`C@v_vU!F{|xxJju2;Nez@q$^6^UG%959@r8Y_BmF^`HizA+V*#hASP}cD`CE51w
z#<h0Owz5R@m6O;#trmv0GL%Cyf&{WzG^Xw{O_GylG7W(wCJ(Cm^a*lmHOYf6EB2_=
z!CX?aOi*jAT(=8zmh}~bz^wgPBKTQ6YM1PavyZomA28}eia<0iI}uH0d;)Ee=S^G1
zm7CahVz&6aAtjKd*=MdD0@tK}!i3a%Aec#Y`IZK=rtQbpk7uAkS;cd6R8j(otz4Ph
z$m4EY8$@#+;kym4xAeqcGl$_xIIBZsBPHmCve~pqFXYVYI6;wK@D^jZ)hE;7?@H%@
z0Sf(nY*{@C(M}?1e9INY(6@%8u=`{wSw;p|4CNwlMo_-A6pdC0C-cz+pwHUgt}I#J
z$!>ajSWGBckE`a|A1=3!AZE`X%;?+{KYo%xKG51&EgEYhF@YeZ36)Njg(Y_;+1S$Z
zV9bM#eMaio(Gq#6T|MwxwNd!ym&wQ*_~Oxd_f{mD*Y1I*aTe7l6{XRs>Bq>?iSEwl
zq0s5E^*td3<F-iqUaIogxa%iWt&s9Ve(#YE5m8DM5jsp#YnvwpmLxfKDGJjD&&AQp
z8!+vQMd&*)bqhpA34LL3yE)i-lJkIo>H$+xamqkxJ3Vmer@8oRzu~vD3Ybj<MSgfI
z1L3anFf><Bc&bHn^MZ$`FT6Z`;OgN4wU;Mcy}aP+?FAPfU$_VQK;hyltXq}z8WJCc
zvwtqe$%8C>Dh9i%Bi{M!Yk0aQkzbxk@$AWCEcmhyv^q|yFra?f@n}5oU8m7l<HBO_
z>+Fp<6+R0}qemi%tSruh;JUOdF38+-xh~WTHF6ul?%;F;S{?LXjuMTvuF$eW3-sE+
z1q@Sxh$m2n--a&g7CfS#KoNHb@%l%Ia(ReT`qMb}(K8(VBSCD6*UDH2S8k-Bl&ci8
zGpIpxE=-cTv9l0}Ode!;+45kDE*F&M(vb|9n`};R_q-T4>N|}3xNWj-p6i!F(4t{C
zglWtJS*2`*?ma(-TU}bHN#oj##n^X!k~k@?G^b+X#N`<BRt>9EkF%Ga;++nYFyZ^L
zs9mcN+(~)KfNOjFzUvky4jF^{(MK`3<ENOisBe;PIBW6oJHO!j)q|yNf7gNN@by$_
z+tGM>av!!X=Der$n0w_o=v5^Vq^gQyLB)`}NGas4RtX+O^1)rNkWAyWOnzg*!n5mk
z;^!l8NE&eWS7xDn4_4dBTKI4GUs$>AEzws7;jB>Pz`(J;BY%*oWJbnAr^DVE>#+Or
zTquppBCyO!M3gCGl~G8plOeC($GIVN>rmLHVHB9ar<|@U&Sj&l<HN)Fi=-qUUb;q5
zix;9jq7kos3avI2af(pHiWa8`M~pHQ(W)?n$3H`OOc-KfB837eJ{v9!hHwR9g$)sW
zOOLykw779ugYbwX4GEG5iIL<%U!%Mp2+2cEVRmW@#F9MNnIsR(;$fWQVG_e7b2Y+(
zbw8lts|Dp1H<QHqWB1XzO;1E?&8`$LRcrJdH5J;Tv`Ujk+|i3zwW6Qs7?ws*pnbhh
z#qafpT5X*~XUX@mJ(ghi$#wW}!VL86SNVmmHChWZKH7?fKTZ)E!aa1UGY<1NkF?o!
zl^83Qp2V1OEZ8YVqN*|a%%xT8Sj0TJhYgdOL6b>W2-GQy!e3PjuN10*V#2g{E0_l!
zLeF#;kB+^y=G`+kV*mZO5TJe=gTMGdkW#unZ|MTg#n?M{A@<#1i5-KC3G%3kfuC)0
zx=gc^-)+X`>vN&dT#zOhJ`FL&?kGGdP+4%1b3^1ZCnOeoXi2>BjIYq!B2OOV0##I^
zO|X>5Ny+O}g4f3DI3OCcZD?W9>X27Wq~*cSBx`Ni``NG+GI_{BBnBfm$Ajh^i-*w(
zXd;gu&8A}a>0M}2KY8*vzVA9(w(gREJp5c+pvT0S$&!a6E*`(Go^2!#pnzu+Oj_8(
zYVsg*=5WREuR5b-U{y?*)F0EvY{%ng&zDvR3De+>#*;9A`CCHh-a+G1gD_{)J832l
zqFi;x01b#YrYSoToa^!1r#&(ydFWMDP}b)?4C?s<22P)iS|j=(U!FV&5RZ<h1IU92
zi`0nUt&EN>+hj@dAZVr49ytU#)yzmW;9>MXxcDcR2X`)19oi9HioYi*5s9+0XbCW_
zmW@^d(|VbqV$WCzg*4q_6xy_K=rT*-Um|J9EtTMJurVM`tAa$q9RInZZ555=Nb7^g
z$)5a-JO?CMWF&#e<RJ&lIf;gr2Lt9zWuuQtGUbSglXv2q4Id((_*8NR($(|N(4kxJ
z1SLswyEQ?lX^Wr>U`F1Haqi3S5o%1?RVsooasEVMa#KOD4OPnL#)z38AeUQ7EMEVP
zut=8U$_;Zy(#d0Y(V$#U9Qcn_b6xOS)p1z5>tm>0?K38CpR!n+Jss*z9iKX0n9)?u
zG7A*YE9;?p&QI{xfbY?L@)#7XUJ5?qaY+yD*j4F=9yQ0JU?Wav%DP}?R_i_=3u{Dv
zhV<C+`*%`7L}x>#!EMkWV3;^pUukZL1t=rwR$?*_6<o$FsPIyDrS(cU+Gxqh1VRDM
z<!~t&NG7xpD9G7JDv28jL2mpk1wRAd{4QEb{0<TW*JkH>@cdrZxZ<Kw`$VJVLH|A<
zUVhfn@_3=!$`Tpn!r~9`2JlYFmIqm$mIoJoVgy+t4~0U7ufI8rf&FTv7*BZeOos*)
z+v91hIbfdOs}Y)iAuP}oRQu>Zj$`dFLq&(s{ii^;MpN+h+Cj-$I>{j<EFM2^euRl*
zdLl-5Rai3((Qm*TIJjd!4qW*KI{i~2ND8B8ubKF8a&_eNv){zTDZ^G_!Ft2QAf<R9
z-k9&WjHs}k2eEPU|3r^*{5m_tuv0Zg!`#hLy?a~u7Rs2+Cq9{c#L^N=$t;Ky*STrx
zSX>O2ms?h#Q{4rq+?i$ToC|ub4yz{3#eY#VpwYx2G~AQ|Pl3ve8VX&m9U>Q7q~Nwn
z&?W;C6lEP*mf2oZq&feDu6$0CmQ#pdB)~X|<VK5u=R;DGiHGM%g5m?pR}ut?hK<1<
z?(;o<j(^ARuzF->1cC6&*=d%kx+D);988^KO)CR=h=0pgokZ_$6;pKWgo|!yUu_`H
zKb0r_iM!z004=98HkADJD8eGK=95u~(a@S>+^Q*lJ-!rq0@IcmbNhZQ)+{=Y+4EnQ
z2*VOSE|t)C;#$1fQH6qesnpm9yq#|}nTkKoERgn<Li>ATKFj*pA9VSx9n&4rRut6B
zXy}#IP&Ze5)a}~?UU`$ZM6+REJPmt>c~jbon_vi3`?=J@+h1*l%4#u{eu#MziSK57
zir~0qLZ*ZvE}k-20!{fPqOsT_7YL%pP65mhq~%Ivc}S9wlZdEPvynV#?NA;j_7++G
zCb#95m_$f^v{tw+TP>DW4BxkzIAkO~sq}!{S?nAJkC>LhfO%ulm~mxtTdi1s60i42
znLJ`d*SynyN&@o8;aV53ea_%<%4B%*t0jom{3dPFb@k=<lhaHdME)Q*wCqtDecOH^
zNZCvhzAlx~`_oP6+C*zt@*u8X4aM$rbfX&Jp<)+12IpqXcY5-mU%RZ&XpDJtAzF+Z
zl1&~N0KXhL@oHg)Gz|#W{DVvT=&5l&xCeS+;GmIEyR?9}SAtkJ=V@@M2+Auey?k&f
zBvO!0DS|?q0-pk&)&Mn4rmoS-;aVJ=sKIg$i5s)R*b?va^CURBuBbWEJw@hbV3)pa
z2FdA9r+LNSBZ-heY$gvPy$OWBM}m;clW?8~)7MxGk<m7jlWNW8f6=p3Mak4p4qQ-a
z=BSnU?ceW>M<6X$)A7S^pigPmpFqt1(>M{bT+oc<SU{g<BT%m~6C%<MrsDc|d7{_Y
z#^~SmTPY=&@K)zU$y_>=FKu7p&XnLc+l+-qXO4jsF2s71_6M`oj^1<L8dpq_&Eqx@
zBRhVN9+Sqxr>r@#ARFlmS{gNnza_>$y)%5ublCU%x6%{mjPNd=2Sd7!hf-Am-kv5B
zq1<B7ib+2540Xz}q^tv5AzKb45xSXZ?NG>bHaN+I)(#))q#Awhd|!U$=h;XU{Cj56
zFt$O$pxcV>Dw#BR3sOZKGSZVkNCoU{GPz}8M7pe)u4^KX)tgSCTiXgLk_T&BZCZQ~
z^VWSTzMPhrfEc7*`pgtBhQXQ=4*#;+G?A!)XJd?+I}mOr8z}AY6Nad}yAQgKsD?pr
zEQ3ms7x$u$LigCdYhpZls>R@zQ-u|_&3HtpN6NgYKJqK$o*f}Ne#e>xaK?4AIqA>a
zr6>B=Ux1;XPenj7^L?_Be#qhChKhw-825y9i#dh|*PVA=n82Fl(YxLUP`f3_+N4I>
zUbMtB)OkE*S4YZ_iG;$PLY~5&RsvmRDK$B+A;&aGM3ye9G?PVANG}3m=dzP&^3jLD
z&ZnBsS(nUkFp<a7pU$9rhm<W3;>6$gFnYp!(CZDsE((v<wLgJJZR=)nYmWSfoAHOF
zZPvvaJNZ2XB{Qo%HOMIp-Ll1i@}>OH_pQ<x^X_7Jsfu9E)M<z_a$Z`%5-7j@`X8E9
z>WV+k3ZX8I6>&YP66oA-F;wEgwKwj3y%ta7&2BPhfl65o9V^bpsLyAjNQZ<)^Rkh#
zV8TGH{$s?JAuB~8WZS_t-%8ugic%e#p=Ig!;NxvdwxDWB<(Km{=sls9N)v?-S$Znt
zPJ{HiX#Ng6nSmjBq9D_CnTlbOa8su4!RwvMSViT}LiHHZV>IG*@><9W)G9C(xnJ*U
z+)o*ocI<>gV@N+O?%N1W+E=%VxKaaVkd-W&1H;Bt!^&-I(6VVOL{djc1MWYK$2+}$
zz`*{U@i>-M7YuMwzJeYtr^Bs!>dK)c2i3(}*m-@e=xtit&VyX)c6jH56{y;;15}CE
zE6#>fAeT=N@_9>@IwV|pb^x(4jOjWr>I{ApC4D<fE1McY5@{qF6Mv`(lTheYvFF^7
zOoQ}z()b&eL31)Ui-z?O&EzcV+io64y;sMoho74JlsD(&PUK$W5umVF7nJ*8oN>=O
z{1;+gh`(K@&d5P}b1*#I6sTP_2xDje559(?xi%v_QjY~+|ASUlUdQ@fADY%Qp#_%5
z?M?h|{1SM!p=Z$k_<ivzD0ECjaSm`5zsi9l@aE^=AxBO=%h_;NaE?ulmgc%_di_oO
z{ljwOo^yiIsMCna!U|#N!vxAR`r|0eDAVLr+m}vrar6a~kuBpM@?!Dqd}c971X8JB
zJIwl_A3UuHJ}^!7_pN8~(|*p0F~D2(Dw<50VcfGGES@Ig(B9*?{eZ4R$AiIjy0&bc
zbsiO?$In|Xp>>rZnEWYMQrssx*l-Pcm&$06Zwgv{H5J+dj>)`={N)gC$E-2#Wjsh8
z^-GOL>kmJMhvKDsb~7bP)o%lLrFqSr!`JpWZ7^Mif8JbZP>R*QO&TTz6)g}>E|jeh
z#zI~?E5wmc9XnEvdyp*T)wbwAG|e*ianFavn`a@XA2}vv+`JQs58s|(o>!sBjZW{*
zfZp9?Vp@&5_3KD8Pl;nU7okss;W%=F6F8j<w73raeIMOwe}G{FJK%EgFQRh|raxmh
zf$F~K+i?bpfAqQ_635(9Rw({s*BU6&p)`s$U>WpRi@k#eL*Ip)-9v-fa1=bXK!xIl
zI&DOh_6Y7AvZ$2pq-Zd7EONLr=f?!fH?H2sWFQ7f7z=sntPn>N2s@M=OO=@U({x>N
z^zgWZ&p%&@>c+LlQ$kpT7L)pYhexr8rG2h*+_2<OsERS9VmpGmc1EK@?+X$!xIS)#
z??9i{eXxA#8ECZ`FO@XnVLNl_Dc)=`9o^cr!Ld6(SR@Q6r9z4AYs^90*<Zn>v13=W
z3tsgHLNv}($EbR~H_`B|F;HidN2US=PPP85T5c$#&0zZ9dpAkj&J4QWT6CCz96qLb
zL{xxfmpm(J*gGRDQ@~LK!VaW4#|~x3%C0L$xJ~5IzwJB>7|OXhDTA)7t*eh?$7%C?
zj{w(JDE9VH<6i1ebX<S5DDe?=3dZ(<2+bM1KfW&}zWu8pEM~!_Ke!h9l^db>VBmVR
zYtR`x&&)Kfq9{RG6%C6_!RucxLqLC)4RbIw8vJo=i@2%G5X^W4y46PG@sr`6O&*yN
zIo<t`%iXN-TnagZIH3|bJ1W;}jXd575>qJWnusR5vE*1tHi4uO{9enfEBXpK)0|`?
zxvt9RZH4#e^n{z6b;YLcK8(hv6Q`IoaGjzk+6@raL!xD9Q-l2P_C}j>pNQ`?_-1wb
z2l#&7I~dV!0q#9yigo(o;geW=JNs{RsXqwIw~kCuQCO!ahKl~9G2nwAQEco0=sj$A
z+ocAN7jHwPX1j4OW1&>!Lg)A9!^e=VoQ+Hf5`WP`EIMI8obEL4?Ky7Tb6(K2XgBaH
zVTG8IH7Lud98++}g%)3`ScoGCM7BOG1LyQnnF=JjtNrl7?9Wl6i0MWo3(j@;xc4kP
zi#Pa689Z%VXdo07?K5MX2pZl+2<^{AkFcr=5sg32Oh>Q!<8b+!<I9vsM(eTtk6Y63
zP5HbB9z^dK9cc(J>J)iU#B(6}4fqk&KOGBgzVs^ssE8E(aDJOOmyA!hq}#4#{SS~g
zkV7gPnHd$Dvb2do#xf=R_@SNBwzH#fu_`F)&n#XO$SbU(!5FVx?wxWjn?O<tIdCpp
zAM_D2*kt;xb~VSKQ+ruZr;L-wZsYeeEQ)A=pKA{kd$+G~&wj|!qdEEwSqv{1x`lZE
z^|<)#XS~sDG)|s3mt(g#uHFd6ghA`@W}o&r_xLAq#4tgG#F58s0Qz)Ujz-g`LRmFI
zDq*_d&cdyT(>jOsQPRIHYIN-NQdF_c>If`V7AmDV_IW<+0yHcw;pE`hYd?Gje7#MT
zE=U#(!ZMi7gS0~Aa_<=h3NOlAo&%M6%f@4T-!24aZvx>-@g&K@G%x5IWapBdCF>)1
zj!KxkbP(LFtQQg+2aNAG%{<pZRSs=C{11Ayb$@R&DilNasWVa1Yc%u<L%{5M*mk_t
z{zKfpZ+~~zrK?XduKOIU*fCaeoe_-3<a8Z`-YvhwYqLIuTjNU7@$`oBX$bzju~XdC
zjGr{<rYw$*@6U0{3a;6(9bD-#pG6!*qdSKCJGu0@^CMSKA(RWEPHX~&5sS{r!SwXB
zLiigb1^yn1i@#0fox+PUm{t*k{d8M!pXW!CW4wl5A}afo+2jJ7&)41r!VBR=@C4bJ
z%)DYxn@+56r;#XK+<F(x&nu7O>|?pUlLEDJc7v;fGmiA$9;i~G7L;!0Nl#Zoe!&}!
z-<Ja1_Qa@8pX1=QZ^V_wNyOppIs`plor?~$Cd0j**-xAixcdDz=(N8Z_c9K2S+?)`
zCA?h>nLF9Y{Gi||Q^Z{8Q=t#W@xPsaSpb4oNXvIVhmW^uz7>Txg%TBJ%amS6Ss^lM
z@HZH9;qQ?cXaVsYXbn;J(!`_NLVjgqJepo1`hn>oBEe8zlX&=jBonKN#GVAgA7w}K
zM0ip>K_*U{0_Vj78sMYZy|`%=Lc?|VV&Y7(WpL@Zs+ywwX#2aaED^i;Z~Qvu8>~Aq
z8TuIW<V3yT#oPfo?NYzW5&^l$v;2M~RKBCo;kAzN>fOLD$pLABGCT_V@6r0O^982@
zMSYr~Ol|A3^|Fz9P^?Z<la)`L4?i#VjXO?`oW6l5;8n-CCxOD3BqF=99Ffw?@1lU`
zZ_#>S=aB?R81(d%6pgU~o(C%jbIu)O&()2uRgK3gipEk>oK`_{VG;nphZYLuw``T9
zc<%Nh5dM&CeaII@mTNAWL>_KxPmKHM1LW|vE^~-!yI+5}3HPH98urC?wXOFC^r@}?
zkpkj(oyDK;&Bf|HAK^*tXHdkmw7vmqWpPX#y%az0nVRCNh_+(Dv|&&va*7VrK^OWF
zR&U=1%^}CFAZRV_EZZWi4<`t0Dtyr9t<SPuS6L7_%NK!*(wr6>qdSVwd#pU}{NQ-3
zUAt%E+376wMcHTR#<B-w`6?3!zn_{XWh_a96SGMSH0fBwh}u>|(cTd4O=BA*8eJ+K
zMPtzaRncmS#v4Gwp|a2Klh2>O!{1BRwPjBWgg?ekBa6}cAj{FuCZSq^Zus8_b2;af
zaOYtxeppA>jv=sC*rOeCbSEF#8K-aH$oR!r`OAB_6Y~WW8m`S^fJ%`MuT>d|zt0@N
zu=kq?5;VSHN4#3q8*OS1kt`4ew9sqjVeL<|pg3n(y)7f4(CD!53g>;WvUJ9xN`cPE
z703`;HnJL6L7<2`m0$yu`n$M!l&i*O4pi*eT_}|F2$?`v5(PUwFx;lLoK`oMrE*TT
zqTh@b1Brt&mevKyfSEs|MSDlIA)@sWjmK$q&>G=qxlJKVLU~IxmPaP3kZ?#o47QR;
z<k|I<-~8PdT2l5R5KHSrW=67{#K7L3L72X50@O5$tN>?VfBeRLL}|IWmask)h0vrQ
zuh)K{i{{oBTd;ij3|xqqD1_!|<2&L#MK07YIS_xHIE-a~e1N<`N~wO8BfvhHzi}jL
z75<;`2(SMato%-lgRACZkLigAD>flUd%(Dtad1)OL94f?827S~6;YvZH2|qVR==S<
znPu#Si_W=HVNzffgmSqWLhWkOEGc9uh$-Y{H<nE?g+xe99(0e9vFLsxaWoa}ZP935
za7`utE|qwm(2J}e9%m!Dk>t3b-vH5A9^f_6_`Upo{tkc7k_ex>4tt12eko5_p7+5Z
z4ox{;w1kFb`l4o?1WcVQ&Ylm(&Xe*Y{DL}jbQ2@ZekrWcs}EuICyTJ_?#Ix_Y!nw@
zuyPa%KUB}(2Y>F_gLQ{KMd5<(4kHdrc!-`_x%V>^&(Yd=1c=ui!<w&00C&^BHrK&Z
z8%%wYk!Vn3Aly_AF#EFMG{{#)D7-G_`CPYy|3+MD#cc+lPWwUP`87FOD42OM6y#K<
z(>gO<maQZOS~U!e(_KZ962bx9MWcC6qDnv*W%C4~Z>QHVW8MfX**XGKKC6$Oz4M@Q
zWjA=cn+aP$CKM80JJI;P{C>K%7$2cai{zE0C8E$X*pLVc+ZM$j!?L63wj!I+2RBSK
zDOlm_ogcdo{Ee!W48h`*!1c}hHkyq6mko=}=vB2baMS{5i;|bp2G#ZZ*!Rs|{1?9#
ziuk{cM+py<3uuX{i{8hp^^2qnX(WZa_oLCGdQUuwJ8C>4I#E>@-M?4?y%)!b;}N<2
z5Z3+LTa1#7P2Kf&DTz^E?az*VBmq+Uh0U9B^2}B|i3}IYM!c|^<DgQwi1CsSes1|u
zB!4j!u38;|RZ5ESoIwNH3dHGk_+tEE=(WEYj{t8@ID$esC@V7uW{hir8&7r{_oS?o
z)uJ5`?O)MuiN=}8smVr>Wh>oD>=0T8{Y0a1r;s+0hOeg^`p^9urP{TDS5Ag7l7>De
z60Wy)Amsiw9NM@K`_~8K?vn)1I?t0&9es&^ipGE}*Jr0D%cXW%-^t|LPAh@P3`urm
z765&1OxvY7C0$&Dk^}MQxrJ7jE<bxY94+fMfkw~eeu0{~CZgP=wAH&JqSqb5hC^GR
z(fni*j;!cf#Je#*nl>8kx>wCG;;_WO|2{;=7QIaFJ0i%fDO$}kTV#&J&M_l#H+r3M
zFXPau-C|U3#KkJJVTnlb9BrD?A6K8HT-cK7&rlRakZTo`39O3J<trelVI{bDIFD7w
ztgEFTeT>`DON>W=SDTJOi`MTM_naU5m(0a4$38?%tW>Rm0+^(+STvT-_)j!WVq+?)
zt?CeEC@mRTIUg^YsggNSty(?|*!U;B3Ybge+XB_CLwI<04(1Nqja&B;)c)gjaN(a{
zMPp!?>kpGeI2n!~l&&SMB9nhl{}@?PPTi#iB3+=jR{%y&9bq+j#E8?H{q7PIc|chm
z6$V+q!eCNRh%fzj!fdSBKN?!i3W+=zu+HsP7t=mkfg{&ephHi`lgGm+T({h~lME_X
z4#L7^-$1Q2yZj!;?!w^-H0m4+2JUai95C)>90JreQ8Al5UWlTVn+QvzoKW=g7)as;
zU<$TEe;JSB)?xp>53q38+xT?ihuApfdtBdm2vLu@gm%V)b1I4lC9I}>a_<&sE!OIB
zcGT=M5bkaX=7iAQB4;znZmiTu7%J$Lp0bQ(imvH~&-?l_4A_1o)#O2F3)Mwn>vj0(
zuhW<?p{Mbv1pW?PSq#oIU{BdjGE3mfN{a=;5AjF%r8KW-eK4BO=)ZK474mk#-`6(6
zO>Ncp;l`bKG_2kfG1|-0e$6}|qTDBp5v2~w;4o~S{2`vjZ!{heC#Ecn*E_wB_ougk
zpRetj*!4T&f_=rvFlFzhjAtRhm0M4t6i-WyiYZT`<Skjb@Ce3zG6XvPL*r4PakWV(
zJb(!nj=`~yzr@+#uZ?>d1qHgbU5@gN9guOCg+TEdCqz<wbTl44x{XKsj$`|&Sy1Z5
z0JQ=-MLww9>Z7=_G-{SAgM7`a!aENi<@Cpm1OH;#=Jw*w%dQj!8s`55jYm6PX|fj<
zfATs`-8Ge4qV`Uo+#jNy5{)U9%ulw}FH8Z&xH9D{Go-!}O}a^y0s}DS@P6ouGGEDl
zh`D?bL(7vlOyD`M5{+wU&=R3`PnVozQKd!imI;K+$crTFGAlrWo7xR;_UmUgd1y3(
zQ9oE|A`d7lpu+GpOd5Rr4C^KiHIWCcj$*#8@#FgS_~N@xsUi>J(D5+5-snRd*niWi
zS?O1AhGF-iXE^b%KfK(n>u&OQ??JUOYS5Qro3Ske_MDu9xD#}%+8?S%&u}L6kZ~{L
zki(@C%4U;Cir`36it!h6<sr^5{};cX-)%K{5K8?$=wp7um8dCL_3t~F@%4vTH)#%T
z|9K1=n>{UQL(V!vu~u3ZM%82Qy(PH!N9LHBPSkDMAHLout&(z)vkc{6Iund|%sOFc
z2K5Biou&}ya;c0<NU@aDPoCo7*pCqT%)W(Q-GwqS@7{GwBZ7jGl`rWMkpt>HCi#`p
zLLmHGIlYW(HKW|@Fv<GJ=~*8A-?!ck@g!J}Uv{#PpaGTrTS6C*I*mvX8jhc)_CbVp
zkF>8;1fom*&$0gS95iWIND|PgMa_!w2*@R@m~MUX{oLa(Tr(s(MuR^OKE%|4t1x~*
z4_w~A8O5xuK1|T<_s*o2=+fjviTot!gRybhCsGQsy>Vm3b|`cizcO6Idi~QhC|?FJ
zOX=phtJpZ{3oQQeJsb-j1;o--oe-RS>+4b*CHy*~q-aHb+rrPas`NZqLZN>m#L~|=
zA3hC>cl5>daRYE*?g|87Gt_2tG}LM}ye*cwB^3I*Sh90ALe4RM>-;FuxGB8U2@1qg
z^J5w;g;;9cSY&b%27QgRU>K9&dKMCiEZVXe57$3`-_r`8T!EN#`-*W-0yB6xF_9Tx
z@+3pajg?v#7C%7p;7DYCEpvx^h{oBF5`nz=+7x{M+eh3?5iG*_)%#m8dntqEdgxtB
zqhJ4JP*h3i8?_e4ri{nghd)Z&T=KPl$8Ry_%ZA7mASH&S8M_ZX#F$>Aa6kGShV-3>
zw<lCbfS>uhFJFC%DFc>b@A(ag*WE<fz|Poo^c!g%bX)N>Bpw}Kc^j95Hye)t<^21h
z=BHm6_w0jpBL^c&v(>nlG4N0o$Jnn9W)sK@pb<~q-3wQ-Z}qph8uf<|vd=FstWe}d
zUiV6<Ql>VV4tx!Ti*a0vXG%O{eAG311wx}$ID7CW4z6E?iw_SXR*ccakS4aO>!O5f
zV>GT`3;9}96TfGC)6QT@&+3Vv;A#Zp&I#eFtc#&TzD7U^&TVsUY@Iy;f1djiTAh@n
zL?O>I8gzlMN+jJ_jDp(Y#**bMNr*8B&bp+m<-8BZMI>4K{ozA!eZ~F-R}an<3d;MR
z8~3CPtU01FeU)w^Y8MfyB@nU?Cz#OcAnh`6PU%mkg}+ZxT)1`~xpG?PCVD1Ltzo%N
zcoh4Wv|rGD6q?Q)CvB$&KfYDP6g$YJu7%xaRw8!*PuD)sYIRuh!yQa|zk_(t;xMr1
z9CRI85pHfuteCb3tG0fFXzfL~C<>xW<3X6ZY%p@9fxC{MevHn|yO`X2tjpE0?PB=1
zGI<QsgqYv|!J4gogn&rj#j_HlX^l@%zt?c%UN&UVkMZd4P3-)BrVz3_#Q-oYswRVF
z(M$Qig4zw5pw*x{@bk?fELh5y<e}BYAR;^rf3E!pJ2!8_wa_Eb>YvZ_(7RMbewXHG
z-M9(zHLLCrg5NWD8TQ@$(72ZnZp!KyH0pZ<=5y|f1dkuw#;nh4B0R!G>|6t4zGxJ>
zOoye=wIv&if|#<F769EB40ur9az;7*`zEQf<m7RvDkNC5J<XtdY($VL#zNv-CK^dm
zj)jD#W-Rccn4ipxqE1b>6|E4{h<&B-YY6nWKF09t>Z5oVYnYe8;9kAjoW!1b6!GB<
zegk-?EM|(@1uB&iojV1fW8?S50~d_%*S>|hW4ED4qv7~|^Sg-A-ADC;{qghey_mH+
zZR9~zt&j_&-kvP3#qdR3+-c|bIa0|Hd*ImapEI01Torjxt5@37wX+%?KYM`HQ-|TZ
zS<P@Ye7%W0s6^y)Ylsf@XJNsHZJ7V-*LZzg2L$-%wu(FmmC_wKa^yyrA#L#Owng~)
zk3D$3)n~}#QA>Qk<l>f~(44`&m|0k~V>rJ1@Dp6$aa6K~?1_R!%ShLh6k>J9vE=K4
zco_QBsf#W8=Pd|7H#%WV-~-F-RLV)Ywv;VbK=DO$hJJEd0QW_^DjEg2dEp>|0adHx
z(vNHG8WZ7sl1imbu0@_ViA#>@NY|p8G-;A}O^C^pCmXkt1iy%Pn!YgEtm-D3q~iN{
z1>)Ofi-hUSeoGnAF~Il%U*d73p$3(^O9xaP*^hw>X+Jf{U$iVv|HZisafsADM4+k)
zUa4=tne2q8hZ_0I<;Gt>-^R0;)3|(h7a}yb;GrssPrh1*&%W-4BKg&JNe`w$Sgu+j
zoZ23RTTcy>4CD3pkmIr+{9mO-n|dgNBk<?%pNpHCu|@2v73qbtwYa==HV6vnlbbhU
z)vCc_d~vx~gXcppp4~G3o$$Z+=3>bEz0tUB4Fve`aZLU5LMRkUsMTJm+OQhh_i2an
zWt-vl$!B;P#lXB_-k3tjut@C*oVxxy&hPmT{&Al0DOK2lYEq9Fy<S+_`=HPn7H-Sy
z-V{2$j~M3$Pl85&9~Te)jiL?O!_!4PSJF}E0?+Bm$xFByas+yF8Zxa8b|N1zc@BlG
znjeXTf5XP0I&TPH`F)hXROoT=m#xrVyM<y+8$#`2pNYqw;g4}-x8xb(Z6<M00MW!E
zQ$?lbKJbgkK9<>6ru2hCK6OyNF4Kms!?pXdxcJ!Mx}x8;Ucpy{$(**~;ZnR9ig+8`
zI||Xy-z->&C&5VvyVHUy<#S`q?1>5HY;<YfA4B_<fTw%f9_YmI^;Ti>55omPnFDqE
zZfu6?`aR=b>TpeHEed^tfLZ!O;fDtOSO+c}L}YX{Hct5jzZ`f^2qHO+TOllt`gmvf
zPnfy+3$$rl8UemG<dWL}R~K*8s{ab+Z(f9NzTbvQdAkULG5;3V?syva6ISi|9~O-3
zk271gBPNZ*-J@IqAs)?1COJHV@cp_UP{_+%fHgvU3~ML!#Y1hh%@R1hP^nfcczH;k
ze1b6w=EPE)W(QKLr=~U*FPAZuNYTi!oTx~b7=<}=hk0BItpC1gBR(!&3E__oM4VRS
zt;G3@CQwu1HIV}-q=njHJNU=^B02kt<$$FQadmM;{hCdM@Z_F#STc2s&@PPWhpJal
zxR-sj(0ctxN!l9mF!nF}@Fi2S?T<Ds^PqoET5N_vbMDk>#Kt*hc$X{Thdv!R55zeB
zbSH51`?Sp(KXEPNQzeUfHG!{B>N4)K8gBi47V{<!!-bH=;w~GM9t!Wy4Zp&Y-@Ze~
zzOTSTSPJO@y246VD34hi=irA`+flRd|DaSbvB&_rQbRR6uwnlo%pcnYCpK<?HkCxe
zax30Sv(_9D69so~7cAMi7^QNs0=WTUnj_fou^<tJ#wp!dMH<zCt2%+urKd(F5DFv;
z;MANsg$m73OA@&t8cE~_(dgomNF+EU1aIdniVMH*OtVYt(W*7ZEeSG_(E^g<IJOc9
zFPt5~5lp`x354c`lnvnN5s0CaS>MY#L`3PaZ`T&%9#Gu9CUp4|rWmFcE@euiu$OFw
z=&<z1#d!F{{#J;an+ryN+6bNNe<XU;1t%YD!kkaGN*OQq23=Wif7S`P-I%jrz?q0&
zp}dp2f{U8JuOLKw#<-U;kgU#ToO}9mgTnCirfpcV{%yoqtODt($b}Ez`v$|mcpY9|
z*13i44TZu51&S8O7i*_s?dI)hP~t7PD9p90SoS|cdl*{|kHpvGdgJm|+bimFPK&?V
zpzslq@zK!el!CC-_-6Y8R0`}ZjvD0dv$#Xp{9zwFbkRE<iEvSd!XBJcZ34YDavX$m
zll!T4vB(0PX}xqKF@26CazZo)xamreNQC&ZZD+hAh~)CYL#ZN?$cK+G<0n&%FM=*J
z{x)m2(1m96L_&U^9l$$Hm66ikbl3BGRz>NuoNHno4xf00J5fw+<^$x9>J`nwZ+oD@
z8zY5)GH5kV<Nn6NDZe^Iu>1MCVZy?0XjE#L7(Q{ByX<pZxbS?6r9BW7=!T(hy(6xR
zw?RBo+H<(NGIiF~)g6b#gKI1slR@xMmP66{_Py_!4OHj$%=-=-508ODchPWAz{{l|
z7XGjnO}aD_Lfjc7r2+xD^JC(Q5AoxspHZjyP;p-7!hKZK!ZmxaYVQ!td;dK=I%0@x
zS_29eUk`Jhd!#N78lyR*P^d6#%a^E`cc7$j5D#Pa<F^m{;;~R&osC2)m3$Q*ZV6%#
zT$`HyImU@o>&BA7;UZfiOqru4!a>7SVVVmpfJgx^5s6l-#pjJ*!_xLG5dO$IMU!N6
zZpkW)D3Bm-%<ua}G+IA$EJtfAf$+ka;=zvK$e}}C`VM9~HLB5AymBvPP>`>fv{Gz@
zN&8B-X7FjtD)9D$i!i?nc*rg>Jyx$@iu(`kZ-o$fb9>{9H6u_ipsO_ZV`R6f;^rCO
zv?C}-It{1=KUdaNGvLtun@~jCc3q0tIQ;#T_0cjG74yHEYIQ6tK%>`T`)3QW@A?cW
zwjd+WqZC$e`yGW#neVgnK#8C{`7m|G$Cy2TGm81P5l@%-!B+^`_B4Jq7Hs$*e)-}H
z#6?O)29pIX5Fc-I3?x?k)9B1HR-tsoXB$37o&1BjCmp*Tu?xRX>W`;V2-$g1s(Bl@
zx|tMdb_}OGP}!E_AXZAr7sAq=MG~PF$e0Mrrfe5&k!TFw^D`2W96x#yZ|5(LL4u?g
zRxXR9!+PV<_O<Z2dK=o6D{yYeV9Y5~4*gtxq}1K%Lla~~@;jKm%kO7UjzXK?ZIcDU
zyT)5Zi$jiom?}ehxcg)16wW2I4&ma`|2}6nk4m{zhtA&=e6kxF^?6rlD26#8!SN@s
zaM~Zz#6?G-cws+$``aXx&e;(+o?gO<Gv+#0_C&tio+w|yoGz$Qok7@YLn4B;h}`s#
zutAyKlX0NSuXcCNiF!Gq6+N)y^B?d}@N7xw$|&Gd4J&r+gtw1bpgJSy+NxNsG!}0E
z2BZ2fhK~zZNHs&DzlRe~=3@G!j=1!z*)5k8NFd%hO$7<XA4egMP7(_!m2Q~w(|DB6
zX?A&DeYyjGemM-`_DBV@6MXafA*VV)b|j<1yqT76thAo7Od>2xLCu5NG<0FnC(St#
z3q@NY8neGlZmoEY4u74$gKrma#klr^&_$5Ofd0cVed!vU6l9VJ{5x73>qXln8dHcV
z)Od`)t+Rzd_*s$#34|R%zn)3r2YFOQ*$T|+wGP|1oD%}wP}fPPD1?e-tY2`-7PwZe
zfFhn;Xp7Ke<N77I|Hv^`2vMd)09Ngrg^^>Yi{EkFsBYb}rEyDKRoqEj{x8wfmIAJy
z6PBpODvTKcA5~=p<a7QR#*P4={#{?KG?0g$@lOLv1vJ7BJAQ>)ZQWcBX8;9zyTL87
ze(xHzt@x237Oq2NM!fD{tll#MYbH-Z=>3F~AT8mU+bloyx(H|@O>)l!mC6Itf1ZfK
zUMv!8z{R_pv2*?y#HQ9M<N%b<T?6iFQ#KLLjB9w%YeSjIn`;l@K!-dZe42P1L=^6<
z{UXOjs8w=dB^E=Z|4MdkJ>Rhg@HmAdEeyIRHi$Muw4I{yJIOF4B+fsvIR+wUU$Fz&
z5v(&Jb%Kk^1r4h-fQt>L<eINniC#4bJ*8`9__neCRD2nY-yA7!p&<bIDE4nGpS#at
zRtQlruP26%tb}&W?UN9Y6s}!0KZuO;<n*+SK+Z(m6#f6Aag;tN<)2VveObVvckt_<
zaPZOBf;`OWmR0h0z_-7yg~Ev!fJzRoDld#$^fp#4UyHIi`blw38MLr2g)PLqS%Yz9
z*I&=YE$FSvQNm&oDSbF%Ba$AUZfYOQSpPY4yO}F7oW8OeM>Z~&`qmjx>D3lcyU|f2
zfr>Y$iObnoX^n$ef+Rv`IR!rh+;nL%tyQ*07-Zfn+Dy^rind%d#!G0ikW?6~<tsnW
z3c^c8<LvowMB}0}bW?C~A`%ln%ioZ!57Df4Kl4I)!Mt#G0L?L`?;6}!9{w1Ru$FwX
zh!x}F@*T7Gn@?E;y4>c$W_Oe+j#55ct&ta^!%r&~<Iz*w1g@<hnK~-&x%0q7Y}oXj
zaZmh?st^jkW?9WNd8jVlLX3*;%!~s`uUh$+Z{i>Y=dp!9<Ig*@rHZ&RY8L2?nVaZ!
z$ovQ@SqSrYe2x$LErgE?*OxOt2pZi1tlT~Xdlt+~uyid6#I=~&a#83b5Ec63XEdjO
z06tqf6TYr2dQ0fB`_MF8Ji@Bu8IL@5D#6Y5xmoFyo0OmQ;!t+lOG1!DDA38cbZN=f
z2rULKXvJ&>R!U{g{sGZQBC|!~+6`>8L|Y)*HqjXCU}`XlgMY{RN&FsaIx>0KoW{!w
zmEBiz{KG`AK^|35zN&@xkOD6J7lLQ;=4_Ly#ko?WV^MeTTjJq0xJ&LwAI6%+M;&T~
zI0EzuFZ}KlhIe}dVHz_5RQ9U@mzvfSNa*2f(8p%%{11g&Jp|UOXxw{waAVKk`0Xmm
z!(70ygl~I%v7XOxR)P}E2RFd7EnlH(0OOD*aUn#{W9+~B1y+7C4B_#H06QN=y}Q|M
zrx0>5E(sTwC5jcxgAZnY4G)zeZI)Kfh7IFz|N3*j{B(y(XphCbDhWl><d&hghC)(~
zgV@WBWeM3Dkz*rtH!+ybOf6a%bVJc9q3|G~&^lq`HVK0<1(F6o$Ir7PNkojXFi1x$
zhpaA<2VpIN@N;tdE<1o#%_QrC>4mk*Hn3^(;OdzqI+B?fIKukK)7m_*!BNl`&5z1C
z4SrL)&Q^Z+jZ{KDGk_Uu=dQ${eT}jB<l`=aJj`o?1gaaN+Qg5Id)DE<s}~Yv{A2|D
zbtT{)WKP?B84wX1iq*e;1%;MMp#cHv#`tzCy#-kl{yB4E`qr`NRr^yxA_>?0xD~k>
z-+t5ycWz!uqPCVEnkdS_<WcjLf_UfSZ%p%2bo#4U@$E-aUuQI`l&ve|BDq2W<t1xL
z(bdAN9!gAmxv>(1f{lV+CKCF)>3+H^8Z{RN!$}adF672ztQbtPVa+Xmo<f3x`Z?l|
zVJ(4>Dan}Z4L<eEx0MLQ$14ZAz1x|aR^#X)T1f_YD9S)vgw;?Sk5`5c6@%E2+k89n
z05+{T;q+Drm;M;l_Xo6mwINR4;gY=OY#ncx+Gss#p}33I-bMp1MHs63W+Y1aSY+J1
z1fW{De%9xR*O?dXa#z*Fl2zY8sWxe;SrV+XHE33Md_HC#+*FN>M-7P5p2E_3U2*GZ
zf(dI9;v-Wg5Q?y7EefDVj~U{J3|3B*b|-!kmPvXqjFlLL8`p=68%tH0K-oz*mgRg9
zM}i%|p+{4WrXI<F%*r?k34+!IEfhHxLc(AG-O}2Sj6>0qgf)_f3@H-`1L*7o)09|G
zbum<}Wql^i<EN3h8O)fB0Y$v*TjVe~X!8Z4Y>o!fHYfc3Fl#<S4AW4Y4qTye`NDrt
zr(`Fr+3~(Kw?qc3mX^-(Cb~^q3uO-5w0PFeidJOw{0{|66iAq<lhtu_@p9aVGA(&3
zIKKiG&X^6K0uGG*IT>nqu8O5UE<i3fbA2m<OE3Jqx<4+jO=yYftSqR?EU-Sqs-R`H
zapKu9c!h37|A52umP;|GjDk-dKjc!;=rDmY)RI8x)v-<cOFc*eGNF(dND!8dB$Fax
zB!;yoPiuoFmu!KUoR#^!${=qp>*sIm-*ZQ32(+FE1xlAl5NL8Zs<!JRddFZ^UJu)g
zUE9rM<_w^_>g<JJw5t3r#(mTskBw`jn4l<$HZ`WB&gY*&?_s(PRwL}7uv9g2|7Q$z
zio6IY<lJjJ*b{e7oW<`K=SxZpp;zR=7sDo@K<)HXo}2}FiUnZxu4O12Ximd5AP$EQ
zOf_yBV9O)}W@Zikq7y3RHp~%WovvLszr(fNhGil$0$hNrLY~TSPdF=`0bj~c3L$&U
z2gy)abBp*Hnp*4ynLwnARw-2|TeK{={HnG1ZSf9qb4hd*B!!TxQTh^yTkZ1jcdcjK
zi^jZ(U&F>p+z!LjkXXF;zZH0`VN0BTNNv?r?q3KUf0Xd)hc`difZYAN8jsqJTUYLj
zfz8-j#zEmy6don5pEH!15gQYW)oZ7SJ~tE$<&5qA_1;2_*X1$z@<AyC#{8`dQKwih
z<B_DHv(Yu{=M#YU7LJqFNg)*an^?1LCW7xjzerYkp={j-P`jDjwN%6z2$JI<vKuP{
z?WDB9S^^<c@?v?>rj#i+wHsdRZg2@%i!&F^>u$RV0?`&v|A}O^%gYlBfy==Mard4%
zu8<LkiPd7w>T_sTsUKEt8;5uu<5&i8wzi*38+7mZBkE220=oR>YN)Bf#juPe4??9Y
z0FMGDFKCtp-6ubPHAPt52aHF6SMu~i->(K5_g-#%x@tD+7wa#^c+z4>=VH5ZUNBD}
z-kUiCYNa9epwaEe`uQ^uXI`HpUEx==G~8TS3d;m0BFXEdQ>IF><je|d2!wahl0dk|
zp>)yi>O6S0o%N}h5s|TY5M}ni=W)-NKx*E;ouE`2CNAoQHvZj5tDv*m>t{dEU3KYN
zF#0w93Zq7L#l5IKJZgATK&7mKR+VO;)9mlz)hz9G!W5Cw2y<nuEMt+|C2b^_S#WaA
zI$Q`{ZQK*r?N$fVHksC#&W6CGRbQZC;USWulo%@a)OmMash%Hw2XfvV#T9TjW)%+1
zS)3v95ViQx5}pZUBxR?i1;YK*U8oZvB?4iW^8)4g2h$u30R(|u?xm0~$RfWx1w42h
zi8!5k@>IdRoXnp7V7_@dKXV1xT?cm|%#c-_ZU_m}V%C&BX!B|h?728ckcm01mh)Ar
z<{FLvO<99HLwZ1;hSeD@p}hSVdQ<!<<B-?G`Z1GP@%YLeY&|wh^2HNsWqy3UVlG%e
zDjNwgaqTClo9AsoA_?aLSQ|ut9!hlXQvtP#{7>3r#fANMzQwg2=Iqb(0tIZD!WH3R
zPUj`44e}wNHIklzbi2bE0^x|4Q+RpNykH5X@>hb|)%u%!XbWeboBjHEUP)lur7OzR
zWElj*x!;RAfjhTeT%*UHpw)5g)MIq1JqlmW>xXcQdQ@BhE6A-E-gt90Do+|~_u`T<
zw}PRIW4d?7BEZj}8D>>*PQ%a3W{P`l$ed$l(C|T15LD2#zH~McK#7U#-$FIN(W0-+
zf>!Tk5;Zo1b*SE)H3Hr$gXON!KfvlgXCw5MxpYi=A$PU1P<xoN4ylkc04N92<@q3)
z5-AY~-{%F>)Z)dmMzJJy-QC<#yOC|RjQ-wZUc89wS@^svmmx@h__TUeXoK<t9ggol
z;_QCMA}${IWY}7CY|$2HAFUG|DM#-WP^+4tQ{4q<HER}B)vR9<*cQY+4uQfV9XO+q
zBVX2ze_Y=BC+^0W7fLJT-vVv_XD)u3jpyOw;)QYFbw+OWMCcTT1Pgbcv?=B#^7^A^
zpO1t^Z%B35>JDS$!ezp=N#A&gPqpI00%heV6UdB~76@Hf)@$NU1ZxO{7f1r3I?Mn%
z2?cIyf3zP|pPN?W>Qzp3G{8-n4+>Sr5ii$W&+TTOi}3H+Gh%=lcN_q^$Og8aiA5X6
zC!EvaQX16*KSrM~m%^{NIk@i#JbrLZj8a1eTt>pXm}4q0I|CT3{dNC$qMr?xwo;K3
zAIxQi+HBWVO2}Qf07eX{47K-S<Wj$ZoZe}dsa*zDL-ky*8~1=4v8!<6J66I-Ke&m}
zP|UrQ7z3v3p$sK~$QB6qvm}9#8F_KMND_!C>h0%N3Iz*TzmBy=qsM~~&ZIZM&o$%c
z0TeE5t^oWX;trw>?rOV(<k6?$2iS3PrWhsWoMDCX6?CsP2^A*~Pt}|bTk$x=OyC&_
z-_p#($eK8^coCws=Go>gYV=3p5-;C;kJRGT9%ay{d?@M`X@*kysJEsKY8N*QoihY(
zs=Cs?QvVRY-1;4%7Y%9E=>fGKC|#%=+}&t!m_Rd&GF5hArOn*RAlO16yn2(AE1a_&
zygjYgsvbX!LU0^QtQZjBoALf&553uy5}~~<RSC8?NJ`^hpNGG1E)(QoHgP;uHPLU_
zY<TrfSlYpncp8=QMdmn^^f|I-5Irh75_>OkX=(#}UCZFDF9(RNOsQOE2vjOJbevKS
zRfaT&yF0~B+EKhnZuDt2OqxqY=;Jrxx7EonaAi-Z1c3xrE|EA6!t(Bvsk}(pjg{$;
z9D#7u^P+fhyhxf`CdMdPvYar<j5}7~$<rvrXw4Z|x%0FCG7g&EXR-g5dA@~0aN}bK
zWMV}|1HT^TdM;*oyA(x_X=|V_m%f^5Xngu<T`z)Ck#?=pS@GM~6QI)@#uNkRZw~$#
z9v-Y*kqukm>ysOGYDPirYQJQQ?&BMvj8AuIn~L0}*p;}k#kN&E(*o~mMd9L_K<1In
zEL~Vx&H^DlkTB#J2-#Ai46c7(?v(^Z!cxSUzo`A1C3H~rSBzWf57o^F_-V@z(8nw>
z9uX#H;HxO?fawXG3zbuyaI&PYYZ1|#3C!7aL7Xn*ClR_R?4wmW8}3}bh;vVVHtume
zwZv;ZGA_$7vx7l(d&1R4jgepUheBzX2d&Ut#M;9<5dDnBY8?+(VNH4Hxiq>7^ybLc
z2jy(0G*go!5WXi{AS4iz&&k!r9rfCAg+}Xf<D%Jpr5AnYRXObw<5B}fbSyT^nuK_b
z*(%84S{2{?JRKg?1MG|(LWz3sqxYn1mT@=ko>bH@y`iyKIyIx9R%Sf{;RLl`fBaBv
z83N}jg+E4q^$}d{s6l5V?I>NX2-;R;Ej)wRixx8A?`2!1ZAZgR2jp@|P&kvML7^bK
zud<vAi|<jS@*+tf4EjhS*4;G-`SRMPAv}Iyo@e2v%muwFxu13%{+#e0LN(?TOK+Eo
zSi55#N|$nsYlUvU);;T>w7<CmsX}`Re=PVRUDFBmPo4-BCu2*t5H2dUc!0AOF6{pk
z52DQrbTzIy45doHoNK*1JBH2ej-0N>T3O<G*z<T3o}6_2<XRUo==1pGlIjN<K><kF
zN|{PB;eMvGLQ*0SnI$P*P4wxl&W`|p+Xy7&iFu~AmrKU@h5!3%0d7T^-3%V8vRJic
z6{=PCv2{ren-C~^?u%s;;i@#R+ITB^DXx5BE_2~%L|)AJ8R&#kmA*Onjs~yh&uv@{
z)If_l)MYU6<L*+4@oYFBShaW9u(!mPaguKQe*C;)3-p}f>p+k|f`STJu24uMCXh@A
zYY0RRqMLjVfgbt9jj*09<F!CUnAv^e<(B>g67kzX9J;koP`p8axhYHF+aH#ocCGZO
z%T(vp0(f`uR3T;z#7phxz@x>8`sskQ?`T9m<JvJ954|F55y-`D+wnBcP%@l>^KOH_
zKw!YjwOCeWL*pJbQ6X1*;~sE3b_Fi3{?oYU7*Lq{70w5hDuD}^O1T^Zp=pvOEf8Ly
z%#;#x=S&a`N)hq#LV!nx8}|TT@ANIEr@a3Jn|FLAo^V4UL8T%9<0mgbt5)f^s1ZGO
zgU2^St19n`J;OLrXf9#hq1DhGcYJw~n8=JPX>AFemh0JM4QK^rY~S~zNhv9oqd8i&
zF9C%jQ@XQX8Yq>n82Qz^;yxL|x||!b;or>&zwg*`MlL=caCI>y&rqJSvIk|W90y5G
z9y=vobi$NyGJ)_yNt@i3P^gI66=Mxp!Xql$oPp)*ZyN!n2|69NP5%NK9oLRGXo(%0
ze1Ks?3=8q6CwzU}@X?~)DB;)6ctk+E8CzCtgd)tb@rkG?Cm|5M5WAU9&q^9+*ZhJo
zjiEpvtI4+NHyVDv+15v9K(R7~P_Ix=;~t>VZo#4D>y3MkflBQPl}iE(gsvDK$h2;(
z<W5*75Hcj2^jQ~`3(D6rEeT>3Xo1AUS`bLy^ebg?^{ZvLAG^-D2UH5`fzKAvM{PWi
zMuZEwf8&nzseq-51z_^hN$_zomv|0|{|+a<G@qj*5EGU0DZGSUm+_@k>;bN~z2oE-
zp=lYeCzo3dG;N!8XV_;&4EyqRAqNZ#+9`xR`Pb7e2)^yOVv8!Zi?DiVY?#163=fb%
zvXl!;CJ$a1FVHk~SncY8nr&^<-eX808nck~E1f=*2xEUcj{WymnjUgL*Xo$Hc`|b5
zNN^KV1;*U2-H64fBUa+#6|;NJ8Z@bw2XDVO3rdB-mB+eCCquu((?#2*eMcZB#+<~E
zk)Q>V6>xRyE<|Z}8~1<)4ST@P+xpTz*~oYV6%In<!flOv;yKhE$I-QpvqETrBwF`G
zc3<&emLd>d2rr5k#|$j`tVkyCQ0GPAe8vn0D-kBRBi2M93b>cD&4Nh{ln<U_!ylWW
z&|Wm`D+2K0S6`u0$+YL@Gbv#I-aBYjry~yR-;ElTZR-!EFn@-=Qx^R?O%wx)V@Mp+
z-@-3ve}LxDC28N@a25j5=yc+mGdJjh+jV%Y7|DjZW@=?oba}Uxw4II2g~8K%i09E<
zDfh^uKM?lBF|iOAHN|Oy_?WDyvvK=H^4Mwdq7#-cj8{w_9fLg*eAM~j?<;YM)rgGY
zENH_dD}}-jN>_u>bR;f)zXNfamBu}wO|22=-K)HD?|CqdFFID2;?xY*%Ub*GA@u3d
zMQEU5_;Sfd2(&S!nQ(J+!6$P&qe)rw@}>&yer#H|49egz;}QEICN_Q6J4p#Ty&#ZG
z9s{{^;v62varH<8sug<;dHl1jkIaa`{JGGyNE_pxfbIzX`Ei4B$G%WYGnFY;O`x2W
zEssq3R3t|ryf6|7rM+pEou7LUTwe57FF=G4x^a4g1)^3sK806x;{gsnqK0TFubbDS
zAwK(IFkBPdyM)+t;2xS+7=~sQ-okgE@5KE_&j+<*<A4QIwqe}lA<*h$@zu0BsNXpC
z^{hPI75L`YPf*m?yjDb{AiYD=elYIY4>57hVS#9++@;KoeOs9hZWzxBg%A2n$X??-
zGh^_VU8Ty{G7jGV1L5KJFO28zB}8e$vi_8$a?6w?@**nWaT17Zg_y3|&Ba|jG{zk(
z5g8-IhLJ!#RgNc+LyNwJLU&BsRw{B~`ohl;6qpQq2$V0EUsxC6IQM7+CeC^T^(%G4
zpw{1E?_Upb>&{bLzx@mohOEL@-;EMlbPUD~{S4jzm-ccjIdcF%{Qe!hR0iva!Mux+
z-{HYr`)WZk@eZgInF<ISk7kH*FY_TfJQ7#JjvDuvx?3M*OQd5~VK(fJoCSi=tVnC)
zo*16GLpb@vCc9h8E^cZ;R0&*I{Dn+Q9>j|Xgpdh@&2-gVD$-U&#R##XH)!-83G2bw
z9jeQ>aUskcjPCI25Y%s0!npTh1O)=W|GOGJ8hs*2CrDaq_LsjW;q?w3(WCwtw68q~
z%eIac*Aam}jYnblgf>tm7z?RKsp1~^a`rrl><EQE7~8K1E%(9=Y2Pl;JIMq-LB9Hj
z&XH1_8XQ}>MqGnj#aV$)g9ZqNDpNlD*|5OS>0N|yHx$3*yq>+ce@9f5dHHR7K*7{c
z{c{9j*)knoL?H47$(D$jK-_Gr8O4}FWGvkl1`EW^&Q&%O<Lu9Cg#b3Jd%@Y};};AS
zq$lmB2wDR(e;R>xKW{~e9BrhGiFn<0TnpchN3n-Qhv-nRNN-H~VL04u3j-w!j;r?F
z%As)u^U7%o?OE(uI?uRg2ROJ?gSAi~9uZf}3yWnYa1<ZDZeA?PUtI;wJ7ibf%?j|#
zmm4jLniC<k+I={^e6w-Seo!PN5Xx6e0%6Nku!cb7Cc)Fgwld@zK_DTwABZnAXuxV0
z#}qA;arx1&#w}re)b51b0m-|r62n#8-}?0mV%w?3c;}4;a91TvIlg@V3U>W@74deS
z&Ok!?V&z*2e(!qpFNoM}c9*0DdMAoJMBFv6!;+bBXZuk^=?)wBfJP0wO7o(!ku@;%
z%g#cXt14~NmAvcP?}&*vuOMm<C=!a?Oi3D+coBgR^2L!dO&96uWgCI$v_SApa~&o(
zSH}`aOuRYUsBr1xHpgpZ<nU48gXtZx{qS$7U38%M9z*QraqM3hKCml39=aCKLhUP*
z3+MMjrxrtud!p0z5jeVIp>Z#5aCEUaTM+T&k#Q^Yfd243hxUkjV#ttlRpvvVv7M#u
zY-A1i=Fg3~`Rg0^n6AGY=T?{%QhPvYcIL>C<!q+JiwH!%D84VhO7QlzZO((1F0A_x
zjC;ZYadqrMN`7j?%u?d}m5cBw4eoZvILa0G!P*0#V(AZCQ9f5Up~rhcr+<KDo5x{j
zn@{oJv3&*erPGFzD>Cj!oiT2u70yE-;i1lv5oQY_Lqc&q?znLesF=SQ{Cyl7&&x*o
zW5k!Q3yGIU+NQg8&!t}xZ%6T-h(P3TPW+l_keme~LnaXkzFZ;62C#Ns#4~dl4Yz~~
z%iA4QYOu<t;dDddPhjb1YY=6~=1ny`+=13@iet;MuQBiIpHa-085;`hySM<|>khV?
zC9-JZCLF(;F#F0~8ED)}8=T376&_{(c`lB|_3eknU^ciD^>9b)*Lz9Z*~nVRRkRQ)
z1Q^x}A;L9#aO04n+Oj>MOek_Gs4QEiLvjRSc~R2mm~G-4m_s^XEhGyh#7rP+cgF_N
zgL-y>x2l104_Liv8SXx`j~~;=ONAb<SHkvF3-RTImB{DO2v>rSWA{I4uQPS?!hKBq
zX0qsTb8v-OSsmY*YurmCoQFRU78{wVCKJYqb3Ji>m+9Vksw(2u*D`iZ|7<u8Z;a|E
z9v8!8XI2|HveSO^vJzElwv@4%5-AY~-)EC9lB;P21lc%`LkO;@aI?m#_DFjvk(AJ+
z8kem!q#H9GcisnU(`<!U!q3+g{okpNou`-M$Dg-D7xkQ9(<X$4#-L@B0nq8qu_9)G
zHLLd#TuPKQ9!VSY#v}%3K%^$xS(3u6LbT|+8&T$DhT?u@;ih)1B9x7cL$$^gkV{?L
zxF@X7@Z*TFQxQ;AvLZM0;YC+t$%>|J<}v5YA7I?G9+4I<3pY<wT}Fo?;ElG(>1r;L
z_Vb?$aqd6+SECK|cN0QB2;JMKzKlggcs%Nq>w)0-6UHM3RL<K6`Fi#+?qw}R=mmjf
zBE9SOj@^Rr%qu$9Z&25`m5r<jg~AohYn$bVPJas*Hky~gP79QZmxn<3p4=p;1cBr&
zW(Y7@3o4q?G3K%$YERpO@Tq}bsX&VkgP>CwW(ddWu3<{QnTU*bF10rzLW5V!_P~=^
z%T!$jD&~0u)jpnP+_x8;=i0TZDCp_i%p|yUe6Mj!K#Zx@!^}SNY-COJp3p%MiFv`f
ze@@wF#X?mUTWl;jIwXm(nWmnrlrHeiX`>5D$gNn7*?;7!uze<bYT(hh5-Q~|Yw&;H
zT904W+bg3f?Ff(5qHdX<co<`zSD+WSqgwvKsQ$^9#v@r1dR-`@ZaHq<1$%-SI9Eb0
z8~1=9by;}&WEW1%>hSdPMM*z%M(5qw69~6MmEI&=SeeKce;zL)5X+0=XQX-8t}ZSJ
zxo_KpPrcWYb@l032dUP`flw&x7<TkwnEvq>cp4IC*v~+OgvO&m+1_{%V_40O(2Fjv
zRp@P0`f!r*h<)KqSy&{H_(z!|l{fhET}0_F825lG#VZ-NvXRx%zK6wHA^KZ5`|~fx
zz0@PCRlP~h0+C^oJdA<ZN+5*NqJWqt&c5|!l7lvPPP8oDOI(1#>bVoO53}CioS^~S
zry=oZTIqkdC(cC%Gd}7S8;x?~-!~qyKNL>ndsXP4A?B%Vi*RKWuI}OFLBp75Vnh2k
zUz4`8k@eBMPeZ7c`Hg$P-&c<qw^9#1vc`gHGF~KAEJdv8iuF1jf*;x#j27RdRGP~@
zXyWad4rK-M4DSLz*N)OQ%c-o`G#CF}50&=Q8+Y$Vqg9puxD#n!$xaVXG%7V7CEt73
zc*HSqb8&p^$yzA%;fQ>eG55e$oV|J0xWzd+rBJ$#;}=8AhI7Eh#S3Nf)->)3<xg`A
zPtK;Tz^UFMO+PCjIki+K5ngdTH{vxKgg&ut5*WXP>Ay1K)0se6sjyAk|3RlHDDB4T
zuHgM%GZB~0_wmBHr)XKDH*Q9lgK>I=FPfJ77)3`8Gahjq+|-UwpSB))JPUqo+;(2X
zN5|q${59hqP|UBau)^(FMKc>tiTHT4b=-bX7vq)?CHmX=_xGK~y;LHLEa@yGISYi1
zsWPT?8Ldu>&}TNzBBljmQTJREpMEYZ8R}+LP|>%$aSu3rZ5@8!l70d8eLJtBO_T0Y
z9W4_SfoN5IDhiG0Z#>{wsMU^7pSA_h!tI|{ZErk1c}0x=e~o*<tM#+fce6UeBOc@H
zcUNJ{IzvgJ+6}A0U1eBif%x}P!gPCE@v>PUGKomg>vaeZv2kG{g)jv((1j(V_VE8f
zuQbe1*Xu(t<-M;E66RQKfU%Z!OOB#XpWcYno--a5P~=DZM$?g}znRn=4YgBQAV5fr
z^SiLFo;hkNo(N$rwjS2Pu$@H_9rFyav6;iQ=qNmStig^GGqK?7!8rZTWq7#zp>&Bx
z#&^ZI)&7mpJE<?Q_p-!5UWmwW+bjsKbzvDq*J|ur9@$!G3*<umpbp{&8cG!0jM#%^
zGyj02lEO$H3qRYAk?#*gyzZv)sDPpvy0o2xoL$p580+rtToy=Zobw0KuiZaw+yVmC
z<>2e%TqJBykT?ds_9h0m9*X;SGiJROojwjBArEnI&wrTx?spg_&ZT$b9_Zife;D%G
z5WL%dBtGc=K0fO=1uG^l#qsS&5gr~2oz8wT<*)5m#sA^Z>hEL5`xC`;tVQEqmTs(j
zxVdk?anE+>UJ?uBg<>@_!mu!uwNTOmaWPvU@fLGJ(i^4UYypK!S81DdjTSDNkNbA2
zlVu5#$CP0!F!AfR#Y18C^(&O+(Y@z4@Odr$T_J8llX516>zreW-4}r~<sU?u*DWcL
zr?OCl49Z7V#PSKt@G$lW?nLduJG}=XG}K&HC%y3a(KE~*u?Q1CY=B>nPQvBj&3G8I
z54R$J$Cc16IP>@?{C)ce?7s93e)!`<jGNK{9a`2vtNKmRwLxbLZaEYadQHZX50>Nb
z=A#G+euTLAaES!0K}>82Zk;!K3hqW7!M}fBMg3Z3;i@!OUOsolT$R~YSbHv+1vXnC
zQPH+rAeIE8$v^_p<_kpAybXkKFqC5njz5kWqgEg>Cvp|V*myyf;!;C}oO>D~J}WGH
zel9l7@cxTH@)+Jun7|u85_@JLsa96U|3)l?XT8eCBk2pZhiyeL9gQfxa}!9cRwGEx
z9H*&T?N#Ge*2M9DPZ_s>XK^PmrQcWLSv6OXNDuhu^u*B{T#nj$w*WKxG`cI|Sw4)b
zVViO2#<y6#cRW7%vIDxbX@Cxm+M{Qq-WbvPZA|O`B{oi9kLxEcA~Nc!L>LU1YqXJg
z_Us{!?25$Ee=X;FL}SgYRZyxF$n9CicuZKPk=IgPisz+wVa3GQMgSxbPC%3q7n^Ye
zLKJzk9+a;AjC;U_T}!cL-6_oYU@J!VT7*80K1G|VqtK+xn`l_34;q*2i6#}hp+ULM
zs9mz7IMxpxU-<yTyL^X*UmwER|3dIIRAVBRE;Ywt<B^%d!ZA-+^i<VHpRtR9GR2KY
z(jRIM=dwWb%232bX6#r<4k4$mi+gBr<>(cGDBmh;r|&+9ykp!l;N*jKSUqQNx@yeN
zZi+FXOIw<30_a1;_g%n~xP7=7ydFC*&c-*J-o}6tP0+qsW3+AD9IYF^hPDmb;`Mf~
zW6GzE5T;3JUHp6J5Bz&R0D*qy`5>{n^9Vj`;g+@u&-JJEZ0Ursi9o1b$Hdy^@{tI{
z)l49<aTzN#IJvNSz6#L07^>W|PS)r#uVMQ4gRpAn1pIk+K2F?SBTVLPxE;Amn6Z2D
zAo>6v#U93EVd7s8+kvAumto_+Ntp0y7qon}IoehojPY+QL;X_yap?Mw(tHycIb2(y
z=fp+O7qYE}n7!e2<u~+C5p~;n%b7em|DVuq4OWtiA{X)(b)I=NjzFX~Vcdg@DXrc#
z8K=+PHy&|3Hh!}%!L#EiNWY<fB;?s`==4_+FGwa<cSf>i5`*!}4WExeSeSXND)kR>
z{jbz5HLcUXJXu&WEErOcSR1pbp0hygyvA^95LhlZl-_R{_tFN97=+itwqebmAK*#|
z&2KY2UAm$3XWu~=knzIX!`I1H&(l6dtQ~3#ISRLKn>FDaE&=fI%DM#d=bT+am_A=x
zCSG?73&($nkkIs5g7}})X-koH6wW?cBNRuAf|>%B6HIME5-zMPZGj}XI9eca8ry0~
zNd%&{ut045dwW84^)4<>*nu^NPC*y3#CS9z6bgS7@oj~M6+b|e${(S5)sN7!#>b+4
zg2olcp}1drc)L^-pG;YxM5!L&!6N%q@k}e+d~7en?@;KUA<Bu%ncT9NrxM_qON@)G
zHGwc*tHZtE2rM4E1T)r6Hy(W+7oYu#Uw^unU~-)!px4LaUerb7p7Y~I><ybMN;7Wq
z0s`R|@io(ti9%0SNCbsK!F<I+qE!%$DMLd=6NZEf$_I7AiCb&Mu657|i|y?$bFk^q
z7t(%^TU)f6^}V#6UQj*_#f?S#vFFJ-Xk#}D6EvZ}mo<+3T`Qwz#TMu?rUyzEQ6pD?
zH{9IR!rWzl7#b1B;ChT6cOFLI(1yS8*Pnmk)U|_%&`=|JzAtr(LTHqKIEsDnKjV>%
zLClqlSUbD1anCu>q5QX~`lg}Gj59$e?&H)CK7>Bbuo7MUGH+wjGA2c29xx>~HZ}^6
z9!KNKx$C(8-wiyta|@5}-@ucHHxU+fA5j{*Wm0yj<Z`QvF>{xrdPO&f5$T~{4r0O=
zh78Hf0G%Qa-s-Xnxos$IqY*M>`j|?%`}Dl=2$;U}jc6>%&4Uz7>6^KbMkHr}$c!jA
z=yW=vx!7)jxVxDLU7Sv;ijpo+==2C%@+X#0`4YSCj)6XAP6F~Eag_9Hi_fQS!QOv2
zVac|U=-46;%9qNC+yQFj5JrZtXg*%T-taWEoH>AkK?>BV<byF&T42roi8y%XcZ`2$
zC5j2lg%i#!q14~PzB^NKVuFD{GYam0xy1FRWN@Z0f<v7%1`>Mq7WB#o#yy}wdFNcd
zmdYP9r7j=5gr7hE4b%QN3vai67rh(xLHl}b(Y8q=^zU9BpHJ?LHLFKs&;GA*_P@<|
z5Oz|K2d~dMfBfUv!#K4558S%txC+X@uTNu%kaUJp{{UBxndb>v1NL?z3xqoqh<uf;
zkW2+@2!t>Zh(;F&?Q>Sxi$MZWt1Sp5oq|Z30~fG;%mQpU`4P05W#$>hMtG^pVbaL&
z@yFT47&xpt^5%Afg{RGG@Ne?wQeyOkrr2{~8MbZTkA|g&OY51-Pza^s^wW9RGkzEp
z8MKg+!qZEb&_TvM=Rk0TbCxp+xp)V9jX9`Xx?#qba3@iOg+Ic%zpr8K<n8#R>vX))
z_-(Xq*cU^_b;taz1F-Y*S2!QM77t^0AzCMdn-FsL2}<j+d+&1GdF+^29^GT-Z>26M
zosqck&|K!<8fb(pOjOE*0bw?hh=E@+8LS}?jzAM-#0%3nPGbXu2)KKwja#CZ^p3Yc
zo-Evql|O%q2eF??7Jwxb3O}@{FdQfT+l}F$w1TG{*SB(a1FF}^gS7`IV9Bx#DCFH-
zbfDbDdfbfIj9<sKLws!d&w<d33sooz826k5p|LjBRZAy?JdP40{+@Bq9R&-Sm4WmE
z3FFC=hxlc|ZcOSq0|Q$C)Icl0j79fWgYee79r68+{y2PhCho;<fL3={jB&?L`U}?_
z$Bo^opFo!!uHJl#;5ds?KbZs%;y7#FdeDWXN$7#0yNX#!bnB2nGDf>h171WRG86KG
z*i6i*(Z?b>#x^U$!-7EK9ZVqCW`B#Vr{5F2ZZ4TFBacU2Y+k<u%Xd$Jp93p<(CTX4
zwlsF1TZ%W^e+3s~C1B!l%nAH4fhASaf2?>Zoy!6V*Mz5fLY5;D92O-kRztlbwK6yS
zyrfNsf`q{e#p@Pq#po`h(4$FL^laY*b5{1oftxdMJ9-o1wMPY6q)$dvVz6?<!9A;u
zd-lbS6~BuA9j{p08?5XdVMBFti9oaovRGNBf-|#eg=9Gbk%>bl5ec*)Vq$E&+1_5}
z5)fLcuN;F%^EYGP)dga(C!AW&SVz6${jvA#M$~RpL=y1n0Us|{Ok4Uo*8Q>(IbCZQ
zkBU(faUQ3>cHH7oFM_{I`fJk3AyOBS&?D?5co1bSmgnUX2rqZD0%T9nb@SJ+Co%PZ
z)A2_0H_@X_V=P=b2>;$&gOK=>&>Kn2S#TrVG4b6CC(^!9Q$|3czk|?o=5qfjfdmp8
zXX--=QMyND0^xp^A`qE8_>7yLbDgk2Vr^VZBUizk#x3!s!rWFw+n+>Yem;ud{##<w
z9AzjK0eGv&3@qRC1^hFpnn&F_g|PJJZ{evjXKbAMZ#5olOZyU;wjj_Ww{gok5R34H
z9$_Z{EuyD!=3ud(dv3U>?C0my>oquc^c+6y`5`(t?ud^*Ylpp;XG%4nbjFnrofYm1
z595}7@hsFiU70CCA;jYC|EymYf&>y3lYoS2fl%Acaux_7lLs%%^qlL(wZ_ESrZ<+a
zZLTAuAc5F<0vXeEH|<>yh31&?hyk9eviN51MvR}`Q_7&qNYtra5DS-m1GTb<w9mn}
zbK3;y<I`_mOm2U3IR>YI@)_cvIoD)D4)kE1`J8h4<bgtwitLI+2z~qzbKhQo?hSk3
z?RQ(_=*^{w(w>uCLzxBneH>$ng(h_CI6dgmka73Hb>mj@pkfjpo?sC*S{w|9(gL9n
za7JT1MWp1y;zjX7O+G7~xYn>}zHL2%iUx`=G&qv^zyx2sEN$Bhf6rWoSj`&ao&kYw
zweZW{?P%An4BQ+u?rlbk)@AU)xY?pF3>vLgkm-Mm=1SY?0so*pru*Ow&}*I|;<j^T
zV#P;BLFZzA(1Y@EI#lWruZhI0!Sm3iLu+g~HWkm}4~b{Mac*2kqDU#nBw_fdoM%iX
z4{x-sGX<sm+8Os*L(H7+og64gpWIH6_RB#)bHtKBY!j?bfEN*nC3*1TOa!9WM<Do_
zZCaDN+6Ar(b199`+y5E2(vIj&f8li43h_{ytv{yd{`l)ElrQZLiz+Hkf!BvsM^T@K
z#y#NJ#b2fQD(L}rK5-9R%mMw32HlPEPn>H3qll{y1+kgu3Kb}o`U04LZ8(CSO@`pN
zGoOp+CS%svuosw3*tDNnaM}~)@?}hgYFnU(8Us2`z&q3bhXQ$v8IJ<bG>;H3tc#RD
z_tk^{62y9_Ine@<v#_$91;Ps=Q}E(UQE3Y5|NgelY?DDD?xr*cAVQy{wvy%Z_~XEz
z;36+FT$P3J&64G)RLMKtg5|cr*Gr9|?+q3mY?vDpr@MrE%M)5pj)MA?Vo<1@h(Ls1
z^7KK%H0z8;%>7{KjVZhonq}&m-LJObuPsOL@vOHH63<dLnNG2M4j!svDDEH&q-n>N
zQeQhOcy4W~k3{eBeW6mhq3kQ>F%hr7jmQTnThSzt>wj%E?nw&yCDF313oEe&Vp0=1
z`}OWc+a7vXl`#HXEeIscJ{3OWwx7h)c%}dvz<~LuQx>67i-OW`+6qpPy!S8`|NQ$1
zTejZ9`jzK!@Yq9~zVHOWp;~e6#t)_u9p9*dd>(a-d%*sa>0^cHd_3W;4K(gK2cAB)
zpE6+&L_P_T;&g;U5r}}iwg=CmqMzZ*86Sy<C1J^&%#0%b72)gYm_TB^?zNFiZCGyF
z8BwS3n;12h#a9icM$NXISZdf-2+K0`Ov;&9v{G)}P7tG|Nh;3+p`10lP%;rxvOr`4
zF{PzwwHiFUW1ZhmhDul<zV2oM35&K*F8kr#TP-FEDln+qM09<l3T(}~WPPhkSHm&1
z{Q@+r+7%s|wZfqOui~wDo1*h;weVVl=4e#DC*JG60Jm>Pq?t(kece#Ix_O=DDD6?i
z9=2^(Yig0t!<-T440symT&|s`PaaBEHlbDo!7CMsN8f+?Bf>SAZ(>|>s8g?=am)U2
zQ7SOx-BDsIgEL){K!sf0F=@qkSguByE0-@^g>peK8RpJaQ*EmkA}*n%rA%e&ne4)%
zrzcaIsn%K`%#GzX;x+Mj^5ijCB+*)ss{<^`iHFB0$VNyNRF`h!TJ-P6J+8Y^1*4~R
zw>jG?Slq_9+I@*8wHxD?qf_xT?jLA{Rv~A{D8&8c`p6Gr4q(-usd%N@E9g?|ecZm2
zww(C?eZa|ta$-RgZX8NjF4|Ej5ac{AEFvWOfm5ko!Qtkrvu;X1xVzaNL<^5_-ZJ&6
zfl84dUEXPJ+;a>XcdUjAL5_*Bq!z_|TjTS!6XEKba4mc{Hy`+@^BVVrDe)-fMX-XO
zCGfg1fX;ztIf*b!5eOlZ2nodWRK*Db2@QXWc)nu;^5iy8VvE(Koj@*b_(ND9X4CQY
z&TrT>yPQ_U@#9a>tYU9$IW`*_qq~8@GL@<s{9U`EfJYbPR(FS9RaJVA;JOKiuKj>I
z)tY0%;FXAtOWl1hUm>3`+ga?`fd3w(kH(t2Tm^BB&XZXX5&sZcgEzn_@XTVxO|{Zp
z2oKv+_`Cx$Xu^?$P`^}Hcz8H=JsDQ{eS5|jDTe6`$m`J%U#$8ZUY^e{gTS=z+&RoC
z@sFeKCtFd0?yGY@Eimp$V33U#2(?fWh>g<Jd61F|%hC#wBxQVj9KvHl5FTk;Dq`7+
z=FA11K0M9!pw2xuPvG%(semyvdl~mq2Fc^d{#)qOsw3`18cLq%6*-XKqca8!`yHca
zuE4M_=i&9w=A+-2b1;0wQZy?3Dcn_!MJE`7-|@O@_-@lUbglC-E?u*|N~w>h0u_tb
zH0}Y9w3nd_PdJ0#5%8!}MyQm|Q(ZPv`^aesgc?(b#k?F3l?PlzvlV4)RyS^Cez+(K
zVeqv6#y!WPM2Y+u@a8Nbpc88R=?MnRi~6+2r^~)ZVBm{a5zUvsuyIQ$LE3vpe?`)W
z6;k%(iIv7ZNuK^I8kKTB@EmZ?WQ5y<<SY;p2Kz-O5K|vT#fKp*+_uR-4Z7BqZjOxb
z2iBJWNDS4ZX9(8w9vINNVGpZ|BJ!e6pMHYZdkm0j*$^u6kaVjz3j;q}fI=n8z)R4k
zT71x5G*5ABg9_(Cqjv^i^z_x}P-V6tn-bFB(O3TW%_VrV#rxR*&m(C~bZf!&Me4p*
z+qfs7y@;?s5>AA41oXaM@KzX>^K}Mj^^Xwq&^cycGgBtSqFS_vn&gq(Ba$>4G_E16
z7bjc5E0t(it_N}lrB?|YB|7!1h7Qdpi{~^ISukmYLJ@%0HK$_6hG{5L*zBT83dPEq
zm9SXd(_~Y5<2bIOO$ilL%BgY6@ej(^EN6ib6o)c_$QLRhS{sUoA-0ib!BTmIpf(rt
z3q6+l%ASw69fm@~EI1N^D_$SdM%uOp_aDZiZ<`^A&=@QjA7Q<``^m4U(6KcXWS3+>
zQmNLr3x@x18N7uxBI8QP7L4dL9KZf?*QVG|({9XvH)yzwxm-T=m$dC@6!S66hIa-?
z<sc3oGVWz8v~faDax*JNUT&!i>UxO3t5va+aWC`2Raq2o&Fm`#Yx)Uu7nLUljBkNg
z%MCIfNgw#RR>$b^>+tTZp78Tcx#UlkCgu|VI)q83+Fyjw#|g6WIKUVrvm}sAi{uD|
ztVnT4UllLZ<X?%^J;UQL+x!mRo-XipF|&He)zoJloxezdW03Z0WnSbjVBLDvF+x6!
z?LHk3V+;bzRaqKC#&3X64%;-Wpo%3h`m^Pz;QyvXV8o-CgBabfKh~|iC}nk7gM4}X
z;ifeEQm==l&zy*o<>_Lv?fy9ucdi<gfs966Xe9J{a}eFzGxh7BkC-+R$_#YHq!oI&
z;q^A7;F}};>!*2o1!Cm1p(vgAHRBP-L8-`xnni|T*4iJ?s(m>@VAjowFI+UQc!CU{
z)$2o`4N2N1&)CT6bxVzV5}1N2$3G}nDQ8nqU7Z)n5eP4eqL2ha@-S5?jMF^9<43l|
zKv+&Bw^u&n9`parlmBeR-6-?l`nu#nzMzyJRK`7i{rN0*otJ%)-ss)+OL%jM!Bjx$
z>WVI(e1=99nSN*x#^IXNcz^Uj96Nqn+D{3do+{*YGxtdt>x5|>?+*2E_6l?g=dnU=
z2Rlb9Z_G3COzX^r{k*+XPawJca-n=sbK_p-L!(l|&|_>X<6inBSFSvmzH%noHTx7Q
ziz*iOf}64=8kQT2nag)z%8K_;I3L%&w_d4ob#)WpVNi%UA@<qzr04w5_kZGysSG~l
zDeIZY1j4s7t^10w#)Tyl2!j@qZmo%r#--gSxM?+%;@%V~XbwDu#H210ixcjmEY?KG
z?UN5met8Ob92}2n<Gv6?Vwg4hO5Qh7v{o%?JGG$8t8u?ks8Re4;}KeCS1`8sL_7^i
znP9n^VZH$K>|VX@I+Rx(FHE(${NSrH#BrPf_v6kvMHEpR5iM?l*#hxRWBKM0pS>gg
zx8sUs>4f5b?J;V>falUz(;LiydS`N9Oq=}+@_W){Y`uU_8lK3hegz$y%*3LfH{+AV
z@1j!4+;DZVT~T0ig|FHiWRG}3MTJ<EP?n<%u~q>Na|$mGGFl%b5N8<rsYXgJED{DU
zlKILei60vuhui1Q!PeDTYt%NEGmq4!E^w;2FAO2QS;Nnt$4pAeVcXi{xD~la+Eyy-
zq4Ar1xb1_s!>6G{U^C+$@L$*t%pSegxR*T2mMLxA66dAAkMOf8=akz6MRTOS#*@9F
z(_O&bv*|ODGC61?VxZTW2_#2g+LmxFS*|qdSMF=v%N+1?t%3I!O@)uQbF3Z134GOR
zmBhDO=c7-{X$Vv|hu)<OtV>0AlVY6Zb9YD2R<kkphr{^s_mz12vpy)0J0MN59sX^A
zmpP^z@i=LZO7PW-#w`idDp}Qo{w~T?%GXTmz9Nz%5P~GaizZvr<dV!S&PKm~|2kr9
z^J1ZS?|P!Q3_qzC!ZQ9+g3h%H5$CT-MfhYCES|C}=4nVARxMa3^cMr;H7wK;o;mGX
z0kp^aKfueyU`_CM)^A@c`YGkHQMau*m6v1b;SJmSBsC~jA#K)|J;DAue_)ewFXNz%
z;(#{0u>A6-b=JNDpDg$gx!ui+i8(XelqK-~=d)0(pmVJoL(m#|bJG9t)4mm${=s+X
zS@Bzx_Wlrg-Fl*sXJ?f2?}M882cub;_t3T8r+Dj)g;>4y7&h(u4Rg25#h?kjP`-2?
zcvw`#NGoy&m}9z;Ay1M_M?bc4iE&E;-5(?nIsQQpPnIPRUYMMPMYbesnsSUDh221K
z(s82~qCin$E-K`pu^u<~?J#azk7w5tYN{%il(mTSS3+>%u_17-R8~dpL9a{O_Jpg@
zNNU#XXWSE-NBqCove;npB!^nf$_Z`8tm!_mW1-395YVat^okefxu-WS-uyemZFx;}
zYyt};SK+kxk4oi%PZ!LVg0;?!Ky__=Id3IismB!Ww7QBMi|Vb*VDO@L_-5xjSh@FW
zEZg-B=53paFE&iU2g}A{*z|$uG^_)H0&^uOL1J&@D`KAX7!mQzEF6s>q5ONzRI872
zl&POGflyn?)bS4@B@2YlG+kJ778Z#_LU8O&Tze#iM68Cpy8=NTX4lE>8@A7ThzL&P
z`qCwT4;VcEWzk=V*BJzJ#T?Dx=I$83blpxvpfc6S(P7<kR$@&aKHhHdRGNj$<LJ~U
z7uW(8R?Oi<agb;6XAu^bu_Zt>(Hddh8VH2hb%90G=E9Ouyj)52Z8}DLr}M=_=n*LG
z-wj{>xDXYq(VBN|@^B^;uWFWM5z!&frSisz{by08r7NhA^Wo+Iqb#NH%+&D@A|(Q$
zbe0K(_6Ac8B-V(Gy^C89Z6go{jms4)Z`=d!huiM1(LF~P$rH%4&{*u>`LndGhX<<F
zc3jm@7o`h|``0(_0oU)RoQ=iov_KDYDsQOPK9!2CL1BOAnNY}jVE?W+WvgTeVub}F
zucxn2c*DaprN_g1yfL*m8kVGm>O2Bk4^K2KH5L<p{1`<FoBjFOunuMG6c>GHNaK%+
z3zsIMTH?l@1Re-l9Es<DWNP;nVT}dC3#H{jv+JyA65`?_ac28JHupe_&gR9G;&gWr
zd)v04u|5%L>ryC#e(T0F+>AIXZM!JTAgD<-Y1>h7QJGEV@Ys|WOHzyR=j&<q%WCv@
zp|sUEm`W6>^r~^oIdJysUm2>BMMat8A4;KYxVzf-`JS-+V>GWuOT=+*6>H(5ERMdf
z&BXiPzlos0Z1PAAyu4I!F?t+gG~v&wvM2T>P>3iDEZtX`KK?;iOCYiZ!VZx7Nh>UY
ze|K&dM8ZAmQNMF_C@p5B-`u*vxMdv_iiEdGpF;hRjbHx;7C<BldKQ73%6?j9QizW;
zdqUk^Ql81o)N>EZHFx!4i2KjBa`~x6V4D`uTilC`#-q41LWuME${0k(n2Fm(;R%(>
zzSaVZ@Qs`I7J9d3y{C*RtIst~Y8DuVg)7#h--PzU0?t~6AJY@AN)<d*hLSb0dSQWB
zh!&PMx%gn8aZi$=4Bk?H(!`Ym=$RhYNK;-Y8Iw;oRWuW2T)zJg9@*%&&Xv;(x!laY
z_v_ben@^%k#PgaICf;4RU|v13K<?5hmMcjsV&l!@!pqINJbHI`bHP5Ym#qs+9}7e;
zh%1+?^JEBdA*b^je=+W*KceEy{qCx8hr){aMYe)L-2oqV#M{G`NTov33yi-M@$QJp
zlh$L(>d`1tET15g^shISm7sEUg^#O&Ks5T;1TL)T*jR){o9g{h>d@6<8UM)i)(4Ri
zf$$<J5#=B{3B*Jh!LjFY=Dcka0=Ym>$^7OeAs@zEHf~u5rC@zaq(mT(pP45e`UW|+
zBsI$xJc~6?C@Npcx>Q+DkA%V1m@wO``=%CU^EppCFLCU`-VAeNMa3K9AB3CALyR@Y
zSgRD=9s1VB!c}WfA*ic3V2**=9SUCrxi`kh*B9g4ZC{~oi?SI$K`^U8<>Cf^FGI?+
zRv(vuK+bPoZ`_hVrCTnbD9``Ms9|nbSo4HX<!1-*=^}$t;<Ez~A0LjNXRhO>)u79!
zWqY&lU8lc`sK2bw#`5w>IKe6Saq{aChsBuv+HM6MJ2~pn`D+N*8dfJ`YHo+o))mzA
z@=ECHicLoXDO|51bc*CFkESOc#_hv{E9p}cEHR=qi3mjD7y>asfx<<KVCKdzF=fJf
z)Xg^muBz5T39(^On-@T@D1yB1ZP2mCR4iZlCsywI0Ubs(gW5Ii-<=IJlnONh0}SM^
zqvt?+H7JrNPbILVWyPEFGs^_f32UAZ_6aXoj)Rz@-qA79IC=W8w3fInXg8>-=zOy<
zziz{P5Z}THQ%~>SPhQxlUCi+Xg_|P<0&wEjO+qZNo49mrbyO{F-DE{?--MrwiA*{8
zZZEjhDFq*u6HO}AhvLY_h0;Tq-iX(k3B=vi6N*IEt|P$WeRW?ehEIO_AC_<U0`GSH
z5lzZ}j4Jv2p}2or<ngErUzf5{(NKky2CNXui5FayLGVx&hp%g81iHP70-h~U&i{4v
zsxt@6eprtmcFx7y^9G?nu|f`=3-PiePhrDEX1(O)7uvQMx74<;JWUY);Mx<G8CW(-
zOy`9)5|vEJPLL-PQo5PqAa^4FMR1sD*D3_&bVot2D#ktF(*2az6qeyvgRA(NrOV^+
z<O9wW1TuopIj-s}gZU>Pn^zUA@k&bs1zMN)?~@}Tfy73$o6`?f^O{#&bOxMzyc3a*
z4pt=rjouu<cUOChhr_W7hb3HHybzQp2<=DL#`_BgVB*rz_<Y6Z_<Z$3(Kh0<6?-vh
z`B{u#d<E|=I*+kSj$rc29hkl0CoJB!R1n4z%-c2t184O>;Zg<RBEByhjz_@?#&tpT
zF;GOsNN%hLm(C$J-c&7v3OEC?asZu7lO^0&gtY`>8AxYGm?jj)Y3^g~+>|HGS;Ex?
zXj0caA0tHjAM~fp!S3Xs$emmKXU-f6jY~cT6BKAJ%W&nYNh`2B{`+kYVzq{K&6SD(
zyz$X%7BrVU`~woY7NTR)HxsFJx7JSO#?tC<<J9T|B_PrT@fHN);o+Sw7D!Uy>~&w?
z+z1TFjly{XQMO=CR4bMP^-6i8MR_l@t>A`cWjs*5h!2Y7_Jfb7pEy^;e1vSIFN#+#
zBm|_Zc-CW~2sX?GIkt6~@m&cd4f@&X#^N@W@t2A~2%20py<`I6v~G3;V&h`*+s2*T
zv<bc6?;uQZ0}&|ocX0hT!(0t(pteYXjL|)k*7<l5ns+sq)V>>b3Q;=gwCxH_bR4!E
zWUVcO`>Lo<E!3`LeZ0lnFOjyWOJBjIEnWZtF3z<K>p!Q~Av*mG00}z1r3*_Ch{Ac+
zj?ad3!oyt$mC+rq4Spu2@1DG7a>-NJP&1}ELIR=UO=Ubw#6JjI2!vu<CJ@tlvN5sI
zxb*NeqGD_#)ndhSA&)y(<TK#NquWqexe`-OwK@Hf<=M}lesN{r&i!kP8*C^QLIH8?
z$A!|iJ@L=?TM(i7!?2_9#rSEX;NoJf{Q-FTCk&$d=1BkLP^%QJW888MgvOu6txJwy
z;@1*73&l{SauEcQo#vX2<e^sU;AULDIO6UTgq^*Ckmv*zHcp9_CF382wFJT^iv&Uj
zWhMblGDFlzAY5|+{~R{eytfKo9tzZ}Y8G0tibIIrVx7P!l8<o^GxlzJvGo$@uSWHP
zW-Dax+3yh?VovQ%D}qm7$M5(5Fj*h36zGhW9nIxhtU>TYbEX*K8<hU;q+-20L+?ax
zEGlV7ewr<<C!Jo<>&*n>s1)98=%Cd`ixvyLE?)F`=2phlY6ZMi29HS0-AA~%C4o1F
zGLqJZ9RHvUeJKfqpy_2vAf{YXjV1;^e!0cCXC0W%+y9g9V#_#*F8&{!KA!ZdUWrk(
zT}R`V0cVbxDy$@l&wd;arLp9IPX7o$P8*1*$g~HlIr!JET`q=&q2i{ivJmEMd>`&=
z+l0^c3kk2=%b3}bp5P)=dDM<A^I|Km2Oq@4nB>#6?Fq|Cs*adM__9H#)nWRODd^w4
zH@Y-vg;sTIqiLPeXkM=jUaMadZ5uSj>rH!L{(Ilx!M(fC=}bClrh$vALMUDa<?+^)
zXE=C2LH#Rgs<Qh^j(=n+SS#t|KspJ8ok8;86mqFUqGF<O{QR*LC-o&p`AYeb+s%-T
z#p<;ewCA9@k#ZRiw^C(<ur_PUx9{A7#RTx@P_cYYw5>fvT!i6rg9Ta5o7@BUFJ6`Q
zQ;S23mf%6GdA;MlE#E}(VzyUsy?e)e&3c6o+{-v{Vp%e%T-IEt%sCK;e-?fIT#-7*
z!NP@=O(1E))nlj7zF`yWIQ<Q7MeIgM{7J;=43n{?Y76>@h|ylggXsPE`S29H-nA(v
zzA+8q;i+4xG^4<BCQ%y0IiFPoAT)flv@Jl{__t`(faLifSt|ZP*rF=SaS$>oO){#@
zlFFvh#N%G{ahy4ATPbpPH=t9i_QpN&WzjqEU^7eRr;L2Q=9T<z1z$sGLN8DP(AxQC
z^V_JBw}<hFU_$K)ELz+H2UaY!IanJbzVFoGKk?^(v&F+;P%4W0G{@9sL#1t7@#Kkl
zfh-05p!3g|319hN?=A?em~qcJaPH<dgrt+=rqi1(5T%1_re#&=^%@-Ae+h4m94?-*
z=c{c~iA!oVLA^c%hp&E%{%!i<-mR3YSUU?eI-MX!1A*w{Z;I<MW%O{+(gLBZWb8Og
zrSHnH<tZU^vQtPP6xU={Q`(9~6O8%quQKjgk3mzrLaj6iEv5b@4%~bot$UslO4c#E
zu|nd{;-5pNx-&__RRyd)G#lk|bun2Ydi`DOIyDKi-)o3HOXuRLE(THJEoM?!PGpk;
zKw>{CA`+Lj9l(zt4#dwJ`-u-3+$#mV8e`|#AK{XUq#Y(7+z&RdgYKcs80&-3d$^&L
zH`kta9%%K!IJRVFx;%N7m7cRhAhv_#aqdDWrhPP02vy_rsPGlaRZBE3GX(GUU4Wm~
zAH%l&S21tiZj2th6m4oxfS1Y~GYpPDj&c3Q2r^H`rQk#e4-bdNxQ0x8)Nj(O5j<#_
zeMQ-srK}G^kyH>%L6tpea7rsv4!DvEXP<FtKl-3t-QC=g-?u(a-}nXY?iST$QviRy
zXWhxzd-+?#0rw8*({wOgTPN?2=fl3@t*TN?gJ@J{7?$szh?IUhR*cJcy3EJsLvzHQ
z;l`WchFl)y5a?SHKHj;Z*7_nkDh}b%VZzjoM5z9PkZAu3E5WR(=JjZR-Dg%Ir(f#w
z@Go9@ipF&so35jBuA!(pX`-~95s3NqDAw%gCkBS8<XMJ;C9{XmIF6jKeq5ynpN(yf
zc%31h*1Gx!cyInlX*(O%;o+kP_;Sb${QF>~cs|`w(ys-^eDNMiRx#JUOA1<DJm!yE
zhAoG_6wj7nE>72m6ESSsFlpPF@ym}tW6rmR^9+lKKwLbzLLv)JI-@`9q-b&~ugN^g
zDzH`0qU5A0M#;-K2s=kYOl*v>1Ww`C)pYw=4|3Jmuiq4}hS-5V=675?obseXg*f$M
zzV(cI;zX|eg(uHac6GQ3E8)A%Z(-T;?Wj@kO}Hux8{Z*f@i_V<E<9X^zpu{6!5g3B
z_@f!P9KHx)npIF}PngKVQ&kSlD~-aQG>``?(f_vmxQRSy+Lv$JMcU3NxVL^qScEN&
zd(Huk{s|6#KP7=x=m=P*@n+B*!c2`rzg)$s2W#P`EQuk5HemiQvr;4vLZx)Y$Qc7s
z$g8&T2=LcG`;A-936&ThzTUvj&4!v+RK$(sL2w{3Ej7!g@5)FGfsjS1CXhfV`AoeQ
zuZhF=GuImTtVfmV1yS1H5Wr<R?D5E>P(4mr1FlrJn-IE&O9;`N#+tc*NJ2R!khEI2
zDS`EeCu8NWThX=o*C>{w9fE{4;p<XG2+-nCDma7PLwq);lwC!_$f<q>MSWXiK(8OL
zY0pns`p0<qr;<E~C&4;wU1!c-^Hi3DS}N6&flw+@H*Xz@%$y0QF8zcjF^;v0^cK%}
zb_~RJ+&FtdD0MCH`L}D)y?<33tNtqSTJzS%ZQyZ?b(JYH3i*Y2h>eZFm4|;x`x<Qm
zmm6gw{o9uAD=Q>Z=7X&+EWSZM0^L{)T+ofxRWwfMkR)j?{|Y#L=`Z9CNO>_OORQad
z1n<1xRs4WPXqw(=S8fghhnojfk`QdMa%4wnbpJ@Zf$G}W{?BR@%5U3m6AvCo;_A%^
z+z)X@WV}jf6bfM(7~b<x>yX=5gIvA}<PGvhpud|$LTLes?%S{SV)BgtiEB2bFILXm
zA5}m8T-we^sO~(*;;%*ti))whh;yJ+?sn+${vxOx<Vl`9rh&NchBd4^*8Lc7&v;AP
z&W3fkckcn*-4)20Gj)rUef!=VY&iUdwC$!Wfo+ElO54tc0DmBFAn@sDTQG0-5b0P%
zRD?9CT7YE1qIf@w#!OYFdNRtM`Er!4fURm4A6=?x>?vj!uwytY-Q+up)7-)Q@wQtb
z?fTS2klQQLwn86){g-!3+sQ&`%k@eyi_0L*AIJTTrPKG=TpgImlgkTrYXqTdvz+)}
zs~qUp+81xOF|=OI{m`^lAS#s&K(3r=ClBKGy-3WTGs8q4dW9b<^%^8?XEd}0a-oJ_
zUE`kf;PRv2ap#8hg*R=1!98YSfn-O~ZAQL)c~VUtoC9+FjL9Poca?LlS>i2p(>#Ja
z;>A$e{-a^d4=UkC@{mE|pofO8e!h_kiIh2znx}-FA;&=&7`kt45{X2|MB$g;cR*uf
z5`~wC5?wmbm@yz!vklRk4;%Mhj3OiY!A)f-%*eSUKdzaDbLR~)1!o0ocYQi+IiAIv
zXWp0d>kL)#^jo1WB~*F69rPC2G0uTFZ2Nu!V(mcSi9tg=VHQ?4futu6{qhfPM3^f|
z)GT8zw(2ZUy8;FC7}V7>mmcHVGlS<Nk^73Wk+qfRZ_Sdk&n=PKr-VJm&LPV_6pa}N
zl4Bt*J`VSyj^fx6+kKdCf6+rST?vIg7=P|dkQSFTTwKtiN-y!_hSKSg+H)A$Z8E|m
zo%5d2b+uvDN&I@mT$9U1SrWC!e`MTq4rogiKuHg0n^*`ui2e)bc33ekQUS~CI+cq`
z3Y2EU@wk8O8a|&sPLMdoiMS7noajG^37*aa>Jx?X8G`3jHopJlXXx~F!U)EQGt5L6
zpb|}aNCJ`Pf0(>8SrMrr5E2Cm#L|t$8HA>(eDRtv%pU)P)X}yer>_edmVeE-C%!oT
zPs9n$Bqap&YlmFwHpV^R+>@X2$$*uJk9WSf)wXR{@c#G_V(@XC5ehVGI1+jv+v7Hl
zM$L}hpto4~%Nal`bLX!4h_G`^(%`}}Ym!`yFt@qrb2c1=izm+Et$uHt=Z%Ov+^X7e
z<j(6%b=iOdK`>1bxc4v;dk-6uUkvUm6M+y+A0vUt0dx*38zo`pL24}!b_h)~rl>L7
zfYOlZ2ol?dMTFtVe|zvO#I}c=v4u|-j*v7ELaD!nJ$tPPqzUz)?OS8T7YO@OfI?=?
zuFo)G*iX{Fv*5sAck%Xs!H73KEI_dw?UAQz#-{GR2<kdzkWcMg6AOuG?J4~I-M4n7
z5UyWkX@Mw(s+lu~p;|&V?2kB2B&H4i3U9sD4I%NzjYok}{v9x4Mjs&qoF@w~m%kxp
zSH|kO2k<oB5U)uh`-=W^no^XFbZ0rA7HdbOg+TbUSy~~Kil&J&;c@5j%a68aQ4}xk
zkMe<yjC+FZwY!BCVnvnS;)U^Ajq&2djGDYY3`;kEh<AG}wkoyP(KvSc2?ll^j40!p
z>4dwoIvRfRwQ<imQMXxl(WlNQMGstAi?9%b%fo&!6Nrm3jW@4z8DN<nEEn_3vOmzX
zNmuMVGfQajhH4H(F1I@Pc<}_dy9<f!B=GU#qIAX`fv^Y-R;^erDX9eO02)E%nR7o#
zAdG*=?yD?oeGsW75Q0w|2}2I1vmzjyWQD}WMq|~&^$0giEVUZ+F^--*)FiYNnq%0%
z?}D_Q67uxxiE6p{xAJ90WA)A{==SQzh>SLITe@S_@>A&9qIUvKORp$^_T8pJ?_u4t
zw;2WR)^(A?#rZO_^!h9KW8Pe;?2J8N$gDFHh~5}P_wq=neP$zd&<o<&x9u4EHS3G7
z7rlv4qXsX7<nj5E1<0Szuy&6#z)cMlFgP_#*tqOC?nN7tdvtnF#K)WD3W<W6t{nf!
z^6o1lEd;`jAz84a$hc(Q1ENWYiHpIxM+fobSpxr{RcP9=5=!J~YTRSh#{Je=Ap(^r
zjYT=XH^s>rCip1?#~r+~7?q2*#gE?}lG5+e3n5{#7|~-n#*FEMaLsAsQ8DlYd9*A(
z2A&O^Yc28@q24Q<j9boyv!OrZ)?sE$rX7YQ*v;+;$pSHwQyyW3WEba6Js2mLH*P5=
zPwj!bQM*OACUE;m<S}{4w<uQJdC0>QG`EnDQ9_h0n!Qw<KRr_(@X#bEdP+r_u6&wQ
z+~$YUQQBk-(n25vJBS2gX@!_<y4d)e_+i=>F@TH*tOSEqqdt94Y#CHPeaucA+HWp6
zm=bDFoq`%UKTNRBHwE~ZPu@VQN^j%fo?FQ-gPT^+Wp?2B6LhLI7VCG3^U$+v4A3cy
zp^WDT$Ul;6p=1u^e!VN)RnA9tO8rA@-aK0jIQ#f0sU@4BP|ExPwTpp7vXMG)0jb0P
z{3iPId3S^!D%5E<7zOh<SLFky>$+JKnRxc>83w#Q0)O9Jj3>d5MZ1N&5vI!FRHRwM
zNhXjipM51Gtpp-lA?z?YrI)iXrOu0pj==WcezVz)MZDIbJj&%V%tR;S-&7p1+6vJN
zb+O{qp=eur67(vw`-KDe%)|BQ+^sR1l^cXrOHU#+LTeWrla|esXIkvscNg92PC>6$
z?Qs4v*GW&Pgecw0pkSa5dR^vHP8wDIpXev&ddP`z%`P0CJKvZ^l~$OENa2$3(O^J5
z+m)3%xVU&?(WdWEvtU1A$t7H_na{`8ZKJUE+kc_am~_t!MUXf}#y%|Z&+#)@_w#qg
zz2`uAM?X7b!Ls{`54b%<i&MkaQYJ}(QbjyoC?FaOIkCcFKhY%Tet>^5{I>HjUa4xk
z3is15cQA553!xc46L-QBMLp)A(Tujncddiwzy)mCxDR3aHBe|S8;=@5f#{_wg;KdI
zp+)=V=sc_$a`?Ex!_DCTOl~e2t&C`4q=pFsdhjR=zpp!mZEM!ya`0YpzR3r7IcLSk
zr8QdA>jK|yO^ipK8!WNEdGufe#~W5(bS7{q-hr>LLcuC!jYm?4$zzI&duMRD_Ukws
zUoP$?ZOdSVgDba%w0J3WOZ$Ve=Kjqam@#S&PCeL~z#?Jh<>0>a(0v%Q{?e+~rXD$b
z4AzGwXno|$Ws+aK`+UGTPzo9MS*~QUXk7oCfpiiHNhF&<tN=gE)F*a(DbZ?*#`?xm
zO#@$VUv#ZE2@AK5OjaN#h0q9~SA&mn{1)$xfLA~C7D89uzJ_7nN+`pl@MzgV?6`Ig
zahjD->XTmhiUkz?U5miaBLKPmb0dGj0w__T7(6`H2n&fsWM~v3Bcc%z7L7Z%@8I6k
zn|K;~57F8?2_A-|K(caG<bg(SUcOcjF9fMup>d}H@MvIInbDaM_s@B(Ufx}txY;FV
z3*-zrh1tt#H~6}|hLO{jK*b3hsl=ya%82_z1rq4qWD4f~G}stiH-k#Ub#V)wA+s;D
zf->jy{^OWF`77LyHdozc(bC!9uSeN(mKCzo5413)ndXV^`Py}x(WjRw)t=68M$zfh
zrQ*z32iJyRkdrBve83qKeks%pdl3ky*f95wwK&+Z%|xTAAbAnX1hvJ1i<^+s*Y>Hs
z8+Sg&+r3*tD}+9mdoAWZ2MuSmGQMjYl%bKhzw`k1-uPFDupPo8d49z-dqFR{#7k8i
zh5bsPQk7Rwqi1Jm#0cFzdo}j{{T<?Uw~U_@pXH)Eo~_Vm=xCrAl^W;8sVP%%>Y;J%
z78^m!OX>F|bRlEKps{xlN`d-?K1S1#!;Sm4<MXkV5vMbh!D&}>oKSj3CpjCP!PFaf
zvq>baV9aUC8xyea$}(~H44qlnrzPfX{T5zs={vEOE~`R$pC^wbtPg6REVIGd^Bf%{
zjvqw3B$`|}k=o=-F*@vFE0TejRzZ`FvoD#(M(Jph5D#NdVE-;dl~Y^Mtac#kmNB>z
z6#8)7Q2u3gEF>{>IfTYP>NWJ7Jq~?4&PUClPoP#d5Eoz(ElULyiX8Azl}0|#MyQsr
z7v601Iri>7iHmpkVDF{xB~A8?PJ!rF+Z~g?dlNHOZ%5Vq^zs=B#wqk+xDojiewft?
zCnkL)BowV*=S0=<?~6W5U5zZ3>MtJW29@V0qR(wtCX$C9`)@D9qZ8Jpd?y8^#eA2D
z@CdwUVN6eVA?Wgn&u5&cB}+h|P+{VV&(N;Md*bdH;%hg<|G<(7={o_K1rn1Y4`RW$
z%Z*zSNFZ{JCf<EoAFD-Uh7aW)Cl6BYWqH??40~80#Q)p73OK2%K6+-hyQu}1?iA?;
zDHQ}M2|+?X6+uCe5D`HUr4%vgE&&mc1|>v5MCtC_?%tX2o;P!6XO?BVVBhg~o%d#j
znc4U5{hxnd{sRXwxQRwZG3aArpJT-qb#Zb*>ng*s;jgJ#T68-O2jKN?FDdN~=msg{
zFaxb;zHEFo`-s?n5dR!lg&PrvgjU3P@F-YYVx=hxXRD&{bSMrVuhJ-0z7ndpu8UfY
zN}x(9C%C)WC>cBHfo>50ARYGnb_U-~`2x42_nR~@!b(#Pt?CX%sUd@m&lD^K{qh@r
z-Tk)s&0Ig3L$i`o;n$!M)@<30!~}LD&RIpx&H6<Qn>Y`)E}1WW{PKflh)$vs2{iP3
z4eS4!Zjp(T5|PnD;0b*+l_jJi6QCtByz_9J589}lyI9x4vK{N->SWktE;m8)pfZq}
z$h&*@0ZNxPZ81&qV1m$1G3aq&ux7s)i^QN+!VFYeAN0>YSs60fKu!?|!KFqwRv9sB
ziNQ{My~R+Lps!aGoVd6bJ|4XGnL|i~4kKS#i0wx|GCX158hu-i%5*FwJ?Ik?aA^E&
zT#06*!vs|HcoEf_yo919N~3)3;wa*i2ro~)ve!uwZ)c&2YO<w;#tXac!NWK#n7$J$
z)_tusf;5M_O#^i3_aPkWGptmwaA@3UT#3m19{BZ(zlZ7*$3l1FD%LOCfat`zf<$s|
zy^-jvyL^aVAHS8lR7eA}#<oF3qQQcxS+p0n{4-Zcs7MPWk=sIaWMvBh70I}F_b!I^
z>W(<w4doubJN#$7)VGQ8)!YG#L?35K(sfn0Ze!fJ!<e`N#x-_}!Hydw54!8Q{{l&a
zK|!YP(gRbdERdWu!nuT`8;ci{E#6HkYGnL*te<b#y(_cuaM9w;X)h;lz8||EJN6$%
zrhCSx18e^<+=yd9JO<T^^gx%X^YH51bunUeB@F20i5J=yL8H1wQLeO$&|I=d9t5qG
z(!O^1_^U41dF)rTuRR)CO>*Ca(1c@Hv!o{ue)tA-p`5=32Q9`-gq1e)f&Z8!Lx!5R
zUU~F=?^Sr%juxvedoDzC(4sjLxdaDib35wH!CITl7IE>>f)vu11Jq#4mjdiEZ}6xv
zgO|4x>i8M9QszC}wR(keoLflC4N3Bt{q=X|<UvxPwL$HIu@1ViMv1|IxlG-q<w1c|
zsO-_4BoJOWntA3mA-9dsAtp8otA1LpXx&*sovL2w+KFB<gH{=sumnLr>`{($1cHpV
z&732I#?J~-wg2b~ywW@g%^MaI7Ke>RMQToif!d0GPFS#GG?p&eh*C~%6)lWlu=#4}
z7Oa@q4*siuR-P*e(0RGzg=gOecaO{r;u4cnoRi8HNB0S@!Po8s@%PdLnlsSqZ)1=D
zLY!Mng)!r>vr1-x*n}9w#$_zf&wV1wmsIOSvIA>t2UKX0+)?{M7(GR~1CmD>-_*&2
zICS_3KL7M%<C!AAD97j?kb!b;n<xthIiV@@I9Uo^T19RU2$`7bGMU-b+JyUrTnO2T
zwF~|-K9f1HI{od*o#1I}a9e5hcd+%!erWIH%;r%ir_9FvxFtejyQ0_IU!hNnMED8o
zAWP0XBN*#Ab1}JDTza6tz5NT7u>af&yw&}4SZjo8YlKexz1t3r#NSGVe!)<3JO_4$
zpF`&MZP4j0HHai1cXXIK1eKh|D%of`1x?}!th=-h*M2*Oqzv9fd)s6NNJxwo1fu9Z
z83Kh71F>og_^g2&ctt;;$S@#Q$L1C}4_b_Ak;l!OchIdXcR5wS2|!|C?{;PZ-4KJG
z6$%}?t>|r`yrZXu9+*O9eGoZGAOsnh7o2yWvw^`SLt?!^e0(@&d^#h`ZA9og8Zcm(
zxJ!l%9$ms3{PX=z<v2UI^W9SX8}x%>I=8Mh9Ip*1EhbrVDXPDiD)+>c2^N1zVg`NP
zO!Zv7KO6x;ng3&5oHUsH<3Jofwih*hx{1Hn;NoEqp)>ba;g^wZ5f_$vus^TSZupyG
zF|u|vW6-4%@6bCrpy{+Bc*b2=A}K1BvxWGrSh{~2PVd-*hzulsxjHik#DIvzFvP}Y
z-drvsem;rhaRTaTMNE7m&fN)xe{eDhWCn2w(fIrDYU3H;VVkwBanpjgJA_jB_<Qp}
z5Lmf#7BwiG0L#T-zCYbo43taaV8#{GCAq-)zCvex5IH@~$-umza-R^g^)4|KRW2$z
z68B>cVdfaaUc#9LZ~V})ZQ<+CTsfzE=Va8+NZ7?~*|Uc5?FX>u+zjzqG4OS4i}&aD
zLzS|u4@$=M+Yd2rzz=w?W*@v<{{yUFeiA{Uy2sW5(DGQiJrG+z`w>NbvgRD8(p;vj
zD|Vj!9y7)*f`e5R!wUkT@#nE|;`4}om|T>YUq~ul6kQv?Aq0QMT5y|h8*2e;Yt;U9
z2$~lkXVJqfyU^&4V$-gn*t76M1gDcB=izS3xIuJMfVhuYi;UBi#kh!V=JQ3KSe&~X
zjd^d6!?d?P!@<8F3Pp>GdB(A1@><-AWSD_)K<_>SjK|prb1AqX6#JPy&KQ00FaW;3
z7A5GkDt;A%#eoc*Q<lj-SB&*a;@~7Hl;lC=27&ORl9_3F&__t-CZQ;Zj)}tj)pHRU
zoi%IE$HN96d^%3d1cSRnlW+_>w(l0-nt5#zH}2q<Z6AqW9i+I6K3n)1o~`z%58{~`
zMbK}|^Kh_r!C$vlV%W&eXj#2GMh#ew3)jMg_GEmc0JCxC|MV}Wzxgsk18<_7U-tGk
zVC-e!=yuq7WFMX>@v8AzF}roQvE}p5hza8*&R@9pZHMY^8FOW6^l7iP3Lo~z^OYt*
zr)4r<&VcF0|D9fh3)|KsHjNqY?vq@^nWPUyWEkZ{*1%RcjEm4^QW)T28;47Q2XXq=
z8cZ4SJU$=15I1j8VNYMS?pm@P>-T>t?h|FP1}$rhz>7nYcP7maY=qKKPLR2K8s5>s
zz+hCX$}UVMa7A;QZtlOpNIL6080(N02Y)C9m>h)`IZYr0XAIe!W*&Wo3_$G_LlLvF
zaWM#wJBtzBW@fpPw_Be&Xj-nH@r(iWWeEHsbFM5+Ts$_+83~>Kl9&Ouc%$D$v~N>J
z(N<Ez##)08ZA)YG@ozA==eO{(tqcFSqgcIT3_3OLhSB|(;`o072o2X^$pS$hQ-%ma
zvc>1iCz!Uu%nqW&w2h9B!L2~cV$Ap?H`q8BiV^c04JV9*y;TNWSyt(<w_+oDpj+LK
zpf|I+ass<|e~z2~oI>Jb)KGU{mM|GWVRr8K<judb0wzb$-|k&-_D9M!l=QJh1vi6d
zK&QWp-!FZJH~PGeF9$Bd?W?yD85M|xgb1bPL#K;Fd_uUe;sfzfpGo-Qr+3A_GU%8U
zJYK?}FJ6a6oBhl@2Fqy)rj?5QP*@&yYS%|tvP+n9ij~UjvBKtglwZ>F;A@4NFj68X
z>p;vwX8|LUbY#lH!r@|2+9@-GO%}hKy&63RWUZFt^yM&gY1S3dNrt?Aja7FH{@`OI
zmCRVv#sg#D#kI(F%5lAt1F`PU=}KyDdSG?(^*hm6`@^5uwq`Z%MqUxW;Ral+E24SL
zuGsbOV%Tb3Fm=u%yxO;%@n2;R*KQ|b&~w9aA!w8F88M5kE1;3vNK~DYa|M;zMby6I
zSif<A_;HU<IWAkIHClem;@$KSxn@7s9~PRajy>vf2G-i9cy-7ul&a$Qi1rj68Hq1G
zt}e*K5Vz{t@*~XKFibhlF4))Yt}qs#=JqH4_io{xKEn|df7JMl0UC`DN;=j=*-~}k
zRJMe&h$1fC!#}rni?w5Fi4GsTrubmt0z6Yb`;6=129%)7Dvc$5@7_a{DkXkTGDr~2
zv|_sB88Mh~MKg-Zund%|Fhgz;2tR<l&zV5SG7C5wiow!qrAx1sl{I`l8sqS(?I=++
z^C_HMh?7U}#1G4ciZ4qLYJnED-6!Ii&)CN?ZCsi)2Zyg2s-WF$>SFhaU*K0FbFm73
zzkgsHPG1Pc`LixqIsHxCh}s1^ZAFZpvJ9^e^o4^%_RWvL5Ix@OHXXaq%oS&bd!^Hq
zMt%3usQrE?=sXHm?&#UiKgaPq{H>{@TG<|GF!~$gS^9|C@)y?Z`a+OM*0T3fgSAx`
zyxQk|_|;|a&t$}kS^N3>^~Itv#FiSC9*kd3Ov|y&q}cNRzOc!|O%C0s51}CsF`?gN
zTnPD1tS`#k^ue`T&8G*3%$<t5Wh~>5nFU2xF>j%urc=az{^Cv4sAi$ykvvEk)GA3H
zGVVcFyd;lDg=HZ}Zn&@rUT6j-WH6m8lKvO^6%|)jQc@xUB2S=ii+7R1bbAXhpgwFu
zD^&J0w09>N{2RUuF}sqtjZF<fn|BHF_*Qv8TS$LC>+?*L2f^<zR>V&6vEDxRC$2{w
zfV<5z82`m8yzyGe93c+|<G&iS3cJp59|B1pMbW9^`>6S8&jLptM2)fI;ATx-A$53o
zC%cI<0*B6x(D$Xu;)1jIH)oKT^edLEnvC0rER!#osAXrC1$M*#GNNOY>6#<35nsRz
zE$(z@lYI|OfrPt9QGByyHYSW-snj!RG-*q6zTU3(IDEP~`{cp6Q`wSflLw0gf1JNM
zC3#Q+QE;pggXF=uErW~ZI}57hkqUB)KnPxR-WW1C%|J3b)krp4R90n7Y&1?i+=MB^
zR%FSvFY0ZF3Ez!_mBwI(YIQg8+qQ+!B&PmhjC<_b^OYbEx-&KC(Q-Im?3wj8>UST8
z;oK!Jtl9Q4N;@~l=gXI1X#Wzhx6i(GND_a-svizw!RF7BH93t3UVL^EiWlJB47r)t
zi*J7+erxK&z_WPf_w2BHt~UDi{s>yD<ZX_#3%zc?xV9hR>aOJO2sT1QxL7AAQTWH5
z#RLDGuSalo0xFiK8<(^2>4TM(1D@;N42yTKz?v-w(7oj+DB;)=_Ewc(t1YJ_ta#Ye
z6LWbC7OdKfvERQ5cc-kA2dxetaV;x|Ys$FC<KQ0<j1lim#@laNBz$mjF-E&Z3~6~#
zUQuo_i$W!jG>}^^EC~`6Zz*R7U0IBZ))RxSEas;ulGewgG8Qe~gy%a~=4qyoAncrX
zdoRR>KR#5>X%4q8{|U;B8mgR|<MJ2Z<M6F1%5gc@j#ztmiJ}o^1<|ny*z{X0{#djT
zu?b;f5e!E4aye%a?Av_>1N-$yydXt_mD(?~oQWd63Qo);EnNO?HV&ViVLUT{^(=!&
z9)g}LJqysCyo%L}CnF&#=Q<GRHNI%$_a>UZ^%}I+)>!e$a9jybuJ|7{@LP<XW!eiO
z$3ZKTHAXR6Pxva-a1hePx2U1eI4#`18-&hnUdHJwhm6lCN-Pyz_Pk+`jRA8iw@mz@
z*1$VLFN#VYX&^T(5P}z<H;Jw+Rv58A0fST<#4wo&!Qof&-s|t;);(GVnFC!&AAZ{h
zMeGe3Ky*$0er*9Xx9PsL#HssKEDR`Fv}A@l=cWc)OaGk>Mu}ok7&EUY=5HC1qvUbz
zW*FWc@U9toXwjnPdru5`5Eb7Z1$UeJ#xo-{rJ*ll5wy${v~|m4z=&zEvubaACi~Fn
z?_%GLDVRHPB7%>c6UvO`c657p{BAtT9WX<PnL@>V#NU_OtMMs<;zIT|r0Awa9&}l)
zT(J#hN*75<9xPO0!!1Vq*`~zY@?g5IN*)<NUJwXPK(e{HD~qX9hs7|(L+*qfz~FY{
z5E`EOdJf-Wj`;A?2|^kelfCsfv3u?$!?770%xVh`TwZ|ob$ep*562N3pSgJwA*No1
zvPIFnK`~S;<EZ#va|(eWv3Rx3D1;;=$8u^G?}PGhjxe4*IcVE{jL`6tT@%G@YbXVS
z*+Ei;Qt1D|3^-aD8t-KVdYcAHEJ=b%7@-ME@zsXDIDN-5Sbr(-G<12;ubqDTieh@I
z{j|~tyXaQ%Go(kS<ty>`4@QqpZ(zVcQ)?1}GKV?4i^cdy4CZRfn1^|`l}a8NfYs#5
zlZ}VT_~esMj7K>J-VF0W@J6w308@Ldl9H0(0G2>$zaM!HH;>uk`QA-ooq^U9=BQkw
zIR5@62seWbn@xo!Tt)Hll5nn>y!lZ%cNd&L6CnhGA-_K=@fLRP+lWm+o`k)VFUnUf
z4qKb_-FMV@IEiywV~mMS#L)Ji<K(^MG}n^Ot<Y@hPsXz+3w9O#@NiEkB9o3QmFlf4
z4Tocc%mvX?gWlB%wVrK-tB0;3PG{<vnqg?&r$XyI7#fW=^a<yL5Td-GFp5HaitUaQ
z^?|s&KLK6(8)_VK6D%6#p4@cHuoceJobsC$u&$;=5regsR&!Gdm_PnFi(0kH;pRQl
zuA?LlYNvEp(E~!OgNZ#%@L_urdP(Rl;Z>J1N<})zD*}<=%`v}0EEr&1ggU%cLSh20
z`=5eUXk|2MTRBq#niHz=3-z($r#(o}2MA%H$F<w%QKwF4K~V;^PFvCwb*nyukbiXu
zNxUZB6RQZ1u=uOkxpyPBE<6nnpEB?*Qxx`gc^lqjeaW~1OR?p6@+M1eHr4R_7aO3_
zW|B<{5K6_^<IKGXXdRwMqYh1=DUmbX2K7$%sPSw|Tsm|M2|Bv3GY*a2b7I0U6{-$2
z_U*;R7lv_C@)pA>aq-?+G^^1Pr7Bvww{i=#Xg!57&H2v^#mDW8SXjWd%|2G#uiP=6
zjQ<<A{4ucWSWKKU#Q2N?k_Y|cOwm0khHOtlZGjc$bZ7BBDrIL9c}*Z(3LMfz<Y1aF
z`v{OOtm5ONaO(U?`1v+P^;*T042z7y&BYehQQr9D*mgw->k)?g$L^zI2Schap?7yi
znf9$wSyLZ(uO}czcT>DKK_QZmxGUJYeG~Stx`fhItD=~%hZ1AS3;g)SUd&xNPW%qK
zUxjSbmO!^peu0%!!KgIPDr_p1fd6h!RI+tPvHmGyBH08<q*k^1IQN%7lJpth-(F+a
zQp~hch7+x`IBx@uO%3ScFNo_;PisoVW9zRc@z%Sq3N1Kq6bsIKTDhKX;-?DzfelCt
zn?=IEo865|7H5M|1ED?+tg%_Y@o%(gQ4<$$SQIkSs-Vl9nGvj7WDJ(ESh}pJz{+5`
zN*-B2Zf9Yo1V5M}nHgA2xaTTnUgtAnus4aRb5IG-M%c7-Bc6RGb6q*(67=X;<4v3k
zVh3h2loi^P{{()cEHn}Y8ll<+FWZhC|7=2R(oTg)Bs3ZiG%Vc((^q_eDpkBPMP!-9
z$>VqM;`3dRXe?mUXk5_aja6`}m9sl8<`?2N9)&}*O3)R_euZ(WICUM%=8qEsmfa`P
zhsO0I<^~(j%pvZ7^m^!`mWsLXXj)WJ`({|MZVnnWF_KRnf>ua~5O)D$<nTUf1r7|8
z(c&O^rssvA_&Ra&2Hx&93MZ}`*1Qp1%(N`{BuRr72iuY`%ZkK7i-hE&#yhfsye1HW
zA5NDQ$%5POF%H5&MI$k~iD9bht6KC0Y&*6ZekGGzt7in~&pbr?HZLPyXV~9brzwm6
zugr&Sv*dV)IW#eGxc&Vm?7jZ0QXgOrR+f)>|5Lm^vSp6+wMvQj1RYveeH~Xqw<+g(
z!LJ=!eTfo1`zYrsGKRR{|HJAHqr}Zlzkij+S-j8TCF5BtND72L`dgu!?lV4-46UX(
z2EFt?CeG^(#~i5l$t<{Bxs7f}I1nL3U>?Nx^9(GmWIcz6D`k-J$utngt*(1b!}8rz
z1;JXdDv5!9P3|bhAQ^+?OyFVgoGH38%gWrHt|AM_YZsOTZyIkN*`I^Q9Mm^hB%nC`
zLu0Sw#1?-%-{(0vIcD6K<Ws~MPC7sA|C62M;{{`d;>!6T)N1w|^xU;6C2XwW+PDUu
zY1|IB=iP88>c03l^sI>=rw_(~KX>55{v@>QQXdZX>8M1R#QYiiuwh?v+@n^hKB)XZ
zZW^T`Gq5gG4CUiX<J|Sb;##KND@0>cTio-S#<NtQb%e&Qm3Utr=n^gpEsF}P0ebP-
z|6JIMT}yAEO5-{xQOqT`6)p?#s~96;u-!{&=-dsFuC0vjQ&SK@S6xvrz_*CdD(%xJ
zkBG<wOdhrbgNF{lk@G)`dtz8S0@CW(F2<i?kUSXNVhMpv&y^NO-rcmP82L#cl0-Np
zi7+#Zehzj-w9@Hyco2CG*ACmFUH3+?x661ixn_g1iqOAupV`7<f$1+J_P7Qm+djTy
ztlq&6J}nxcUhNkVdpZ_@aje6jD<fX{oZTy~p;_0qV&UeD<{23skIBP-z{5yGOAR(*
zZ2QSNXsz;Ivwa$1SEVe9Kk&rm`v-+|NOng)0-JKs*fubpqyekqf=fCJf#z(?)-rr1
z6Ep&2&SUfHKk(p^2mEUIz{?}=`?k})!;CFz?9|+u0?ZCNRzlaJWx}lm3MxnxOvB|q
z9ZX@iw@aTm9t1?=`x%Gu*1&hL?eJVg#aV1#MXQ5k!FEZsI9LcK1LV9C6dv?$h;LTB
zAAF=wfto2_qh_d*N+ywC1VWgTh$IjW`X*_GFm=j`H6qvj|3>IFU$lC@rZ5&VW&v1R
zY0$7^9qe3o5ux#hRL_9;^C<POG#u-u-6ouAq9xlthnnTu;mU~<NYK-53IxSm!1Y76
zX!~+Kv2ZhP5j_saP6lAzvbBgzH0=Leqe@@+HqM!S5DF`t>sE)$Mc`)05k=6a3azIS
zIL{cwe6y(zjeRFEF`}SPykh#?M12tcy|4{imz_XZU=dWP=>->OlLt0WLE+1U4-yKA
zghH9EQn()pEf$gu<0$zNh^JJxm%mF`O~nOiFvdX=NiW91-+Sp=7$y!`ib>-qW5>a-
za6j~{xC5qpE3FO|PBG3wR-v1U&-2rnx5WZ6DyB>UWbBp4e2y}P{_&J#q9TLHPXdwP
zOfV-9o>Ox$rS~Q##^LOhLx>M3i{|aBWjGVY#mNRWnl{2OtM@63ojs*4J-Cj#6<Qir
zSUS*pd!urTF1WC7DU$S5aDW>D{~|7^E}FLW6(p6txpw44B2MrBOVMVDhoQw$O<x*T
z6?1M!zQPF4#to5hBme=iskedG>1~8%kwy$8HE10K=`<BYB8W#9EM}~M^oi)CJ2>*s
zX8gAFjF_#ZP@$Ta(5SPoU}P8UB1{(-T}19K292L>&Uwyw179QQu;z+_oU6(tma_no
z7<XZ0bv=oTZZ;nwvRSvm<;F}ZS{iB9a7b{Iww=G8!HC||@#R;a;LMH9VtrgdY`h^$
z(FkdEFi1`kq4LQ;frLPUpeKWisifK9IrFg@e<h(%5HQt|Rtedk=0AU7#)M2EM}7p+
zQ-WVcNlZ<FH<UfI*c6Lh4hM?C8>{$q+?-3|;}4eNo$;+QGzkf6U0+W>jOnuniK)dx
zQ!!&~UP9NI^Tf)@*dpKY$@6&Nf6{mc)Ga;$s}D^Qi;)UU))5pMi-mJeVdl3z6>=l=
zR!z{O`8#mwnRDG|3nMh~3E23-TL?=qBqx}IeZ{msJB(*pM8bLKB7cM?F?n7X;DCxA
z?J;WFdwB7sib9~~Kape>)cV=XlP)mRqw$!cfyAT{>yM<vV?HWGBt~{52PM&s+o4!E
zWh;K&{tF(&9#_@{UD?5*to1X2)&+gb^!=Jg&-oF8B9-h;$_;ZOkdIVSx!4#`XY)kX
zf-vC8FQE0pN4`cSmX-{OiSOt4JSr>;ISK-S5d1=}G~RTYnA8+#fsjPFkE_%Sgb7>)
zGd^2{0dF=`CUZu>Rwe&?>3i%rK2@CY@717Q(b1?mX_WGMdRR5QGU9ax@*&=NWgb47
z*TZ<0J@^O5;f?lFaOB1!ab~y|dQAy*syhb7hP<MjtH>I(mv3Rw+`&R*u;|zl8qak?
zZOL4Uc&dm$4qenwf=Dcj88sR=)G5{(AACIwEnE5tt2u)jPay(ldt{Wb!Y>5l=dX6+
z*k6ZmGweT84>*a)=tyNJQzJ+oOvg2^{G>%e%YsTMrGg?WG5~%Se+DfX=Fl?*lZ3)!
zKC)JX<if>I!s7c$Kq`zVC<H?AOX;%WB%paIYeYyQ7BwP8JZfRyyk&U#m6|5CB0b!^
zAA?t#jli`qc5SAR_CWWx-@vt7+AYE(?_9#qpSLug30v2?CjLCT5k<UmuD~xKBoTw#
zeu!hYmWeYXi3lsaNrksidE^Jmxr(eIV96$IJ^sF!Cl;;`Xk5ks_Q?gN*@L)ear==J
zu>e{<x6e)n_nfI+tRqIxcnhuCmWPc^;UyBz>{y}8KMaV*jtyt9bJbQ{y!|hN;_1SD
zeB1oM5L2+60$lDANKjU=2$^ytqonaTNHU@2@tYW|OeK?%tYpz4U1TbWn4usM2*K6G
ziNL@XEfEIOtBFxp465UtFbax!Jc}hOSD;;ojQ3XBf7Bm?y7WejaT{DKZEXx3y%;*b
z$HyGb&z**&7n66;>(OE|zTNny@hs;M9F~OF+DyRFo5>_X)F|E;&rY0WJX4Vs93DR&
zm&2DB&y28Z0gWpy(wsyR5VO@#h^V)4xrjC8hH75z@!l811d&vRi<3q?XMFJ~1l?e)
zo{x-5KtOOL{`uoN4sHDlr%wHi+mUCHpi7P+r3W(tVP+NM9R#<NWQ@atIP7d);pg4}
z<%(58r3zJ0rG6DuYg!q%&)voK^Y?M@rax}qx`ER-4&h<ce~61qHRYQY35n`gG5CGV
z>Y`>qYlQzmB@rVE8i5d!L>OR@g@z;%=3TO%xhc)1lvh)%-Le`D8!~K?KKQ48HS-w0
z_;P?aHstoZSa(6sDYKz-OTAce%gDY$LoyT>+Gzc7@Wd{ZEk!qL&Lc8fkA5x2<F6Y_
z#aZ%wsp;Dv^(I*Et)U|0&_u^#_1Nx+)v@`i0eYdMXnk0uoL$8=HN*-c*@2{}b&psi
zoYocHTcPKxJ<;>6_V94iC_(2Z8S#nYFBX4tXjn9EKa9e`^?&2^U;p98?W^#Qyp71D
z+t8&T)Rdsbt+A^QjcrqLOX>(NzKx{tZ^ZSxWlkX6{fpKHJrlffrkhvXtqwXj?SV0K
z--2Ihccl%=<G@P(h-e+IUJb_g6PMukV_R@H{3zIq&kQ_a?1No<=>w&YlCCYrM;I3&
z$vi4N3mNj7K;#FLB+Lh&=MN#P%OAv;2&FnngnigaA}r!~UJOnm1%6&Fu;$mLXwWEQ
zn-nn~@=nhM`1SC|;!6!mgs=VUX!pgWM}q2B*Y9D$tnT6>8GN!WE4_&|hbQOQ9@(iO
zCQgsR?WSVyxu3-EOO6lLEjt9YM}KNOQ;}Ij9XyWpYhM+!E4kN|#(9LWX>)J0C}ldw
z9fmG?Ei{R2!(<6NZ3WaS)fBzoeH~5PRDg>kHE1yep)f-#U)4Ax7(8d6sRSWTxp`Z3
zOgy3lAqV<L;`q)pxN!0c?%ceEyFoV*6nk5c^d0fL87_D{*j@<MWudXI0*y^&aa=_V
zZZT`Q{t&$a`l$Kl1o8;%Z9On^>QcNmypteeijvGDG(v~j<2GR7+F1w)`v*xn@dq0~
z65*g*fY}msYtf}eHk9=xg_=b2ia_{*yt|wsQge`jaXu#rgg1mYjFOYbe4cJAy0fGu
z!t|t8Vwgz8*RwH}uUUeYZ7Ud`NgEG?VlklgB>a1i^MYS&gE}7Xqwc5gD(4cHKG}#r
z{ofHsdT~uW@#}9p(V%|r_d()99nt-3Y&bkyTmVCM7B5AUnxj$a&5Q;9RXmD|v%kcV
zt8<KJ;;w2up!HfUF0IKkntMn%2Yu{XF%F13nbP~A5lV>{9JEE@=}-*CJW8NwiIVX2
z@q~AA5BQcXf^t<$qHNV7aI&`+b5SfNv6_@eF_erbJ{r#nE^9>_6aQl-qH->dmB$q4
z@;wQONrD_=5FH(l8|NS3_Qm_Sb?H9tT)T+}{`U|R6@c*gKtU1#NK(?``3-4<o1y8o
zrJ=PIWMOS23mdLe)AD^hlCD7?JP1Ldf#P?HAD9AlOFfS@dl#cZdFq(i13&)Gy%-GZ
zIvM-VFAzkT+<icR0kj{*kR(D&gl`~IrhgHhV&pb~@PlYfk|anNT&c7w<ls4H63K->
zM4FAfVZ1rgOeE1TUt4Bpu@fG9XYqLj#Xaib`|lT^bI)4FXVS*$OQ9IlZa8j7v0aY%
z5{)a`mYIaoqZzL^SRadj*alssVPmSAK0UGX%-jsupkx=+{3Z@vibY#!br=GSOh4_?
zW-h$C=Tz{w@L}_NJrR;%+L;a-r@??Dv&HiWNe`fpSue&mu{bOP`{{wgSVPyFhGh<d
zNR)Fi1cPYAGLy$z<(Q;oc%F~S;D7R1Bi<t(lLULjCPpJp7li~dk`O7#BvSmlWa~HM
z5R{_vh1RYzG*%=ES{4<>(^(|wq#!{ckM6=rvK`WGJSKkAU#Tm}NzmFFJ>Ul{+d3KH
zkru&wW@3FO2K}JiM}&cVKF167s1PkA$SndfCl1bbW>B%Phrt8Zdax3dgupllXBXc~
zi-Uy0RmDJ+9I|UBNrvxd#G8@xc4Ck%Oe9j&qc&zu{~mpYHZ(qyHg+8F$B5no5td-c
z<=1Ka(7nMFxD9BJ>r-~%kFX7b#<q&tVS{hyZbi?&wUzhf6{r=?9QP|`FB&H_Btvg5
zZVNl`ot4m3$(XgJ!V*d6E@1h0y~UC@bQjQzsj2l^BW73b#I+s|p&!K^gFgNs^l^WQ
zg_xWsUeKXf6&fEw62*m8;VT}6Rc>8L3}IntvsW8s0bMxsL7j~!2C&)at1o_msXz2n
zD%o=b6p0@WUWD&9jz>f!Lmmo9BFDuLlSQdNp<kOXQeLS9VvcMO2>+pURZ%yfl_5!k
z852yrXU;Ys>xofb45>r#hwx@_WiwzUd)ZKO(s50nBiWwQhM&c_2y<{*bZ8<GANOkb
zc+6b9Ij*(xW6}Z(qn53@ijPLUDzq<lK@dMe`z(6aAC1jdeGnhiTU?+(*jrV`+U@I5
z#LHIcdBk=V>9t_UDbNymx7T-A|A(w$5e(|k9vx;f(5@mYI6rL`j^3SVJQHy2DJ&7X
zD)S5CCddCLh~yx2afhMRGix+|L1NWwOF(NQ^fjvz(1>GY6E0<N`I?qoE+Q8C0L!h5
zs~72mMZ3R58Q<Lfeu~Bab(@2gyCxwvj-p2a4`_vO-($M6SSv#JKvvAPrvf=iAkylf
zOG;WCj9rj0#H>?Na+!L^CPcD`;&HQpY){`J-B|QDva_bF4kgL(yGTq-ziJ|e%*s&U
z?OqWhht9#6X&urn;EIY)#M~LDF?Zeoq466{R{L(yICd81^I+xF!{%AkuG$_6(GiG?
zjY3>}v{DIQrFspteYF+pH7Je}MV!(ltgM1t-8QQ<0C%Dd?Zx%t68G-E0gjEIj{QRN
z8mv-ZHM$q#k_`Kw)56qxt~3h90sx&byoKUI7Y=mdQ4D>Oc+>|$&*Q{EG1q96OK=U#
zAt8_XXeTTN7eNAI+40eeR)RRTVkcq4b1=T9SP&Wy@tA(ApWKH|5J+-I250LU7`t#I
zhIVqz69q0hPLGD=y5ih}t;S~*xy0_Q>&0N7oa<sx!Igo^LWi6p5Ob?T%tFQDAaO9_
zEcg4M%ZbF2S=E6zjUbsYjgS6E2C(=%t&t*Puug>EVT#Ooy8EG5t8w^p`5-tsru~)o
z{G%{?`~fWAJWQM!v<<y5$x~Jrrv_$}*lPVy&Z7=q9`*)0cCCg=C2ezjf*(J81D(5e
z6q=DCxL4f16FSUd^}33zAoSOL*tBz~5X8nfgt(p>mvM$;6$J!wf<W3EkAYgn2Vlm}
z6H%u!b<@1T&x?*?=*TYSt}I#{%)~e*25UqZ3z0pz3LSDn%<(fQp-B$1mlZ7y1`Jrc
z@rD@eTt|z+B*|@U?BMBI0o99lLj%9p(9mxn>Xmv0<-A+L&ep;o&40r|Vxl_2)+UX`
zpjAV{p!4{Y81ze;)Ux2vn^?1d5_&WmkAPsKka!GeJ@kM7S-kM<1ceZYjF1Pxt#Il7
zx)`(()24JmucrMmcGy<jxMwnZa|AW(mw~-DSwjv<NIS1yMcQ!h(gx+6lN&1PV|NOT
zp9-al0)r&WxR6&-Ka?&`uXx^}<0}nO)ytwoHkD+$&}pJcg*XrFp@NC*{^2RfgBFKu
zgviSAL1Hk+&O{t;PNmVJ(ojr&|7ZMt`WTL0U5^8o7GmG|Mc8+4CH}g&2d6IF#=OtB
zpjEYjaCfk%@8IW9{b()*S3k3|XoWD?&aLPe<T9C)p<w|ya$_M{*XWIZPco$Pc$6#c
ziu!$q;2B@?QyS2?D!UYV+cp#?bxlDy$&oy|6&}VMz|!?^pnt3Pv35@ol9F;pF}Zpz
z8Zo-$zrjYs%dH|iXgTsjanl$|<Gs^C7r{(T6$J;D`_mVzPzg>B1_dv#z|O@(KO6^p
zJ5weZ-7|EVQ_Cfr$t==BiR}F0ypWPS80(PaL3h$nF=&C1trhaHwQ)j+TEp?j(SNc1
zzaKIBv*+Pg(hUxF8l{sb)A85>+RI&o3Vu#_>x1X9^WR0ddhaUcP5Tvop3K@cfuBhU
z%A!JkFTaN*LX(m?nsj$5h=>ZuwU9k{v3*x8`~I*}W04vzUkk<YbxZKyJ)w!F0vl~v
zbgKI<HthHZzn|EH9Vb@d*FRQa)w)0Ma<fn1Zu5*F6T{`CFuEMP2^0GF#+S3s3L-Q8
zoGc+I6qqz{noyIIHL_|x+(uqSwouF)t*X2x4h$|^O~MhOejHSeRTKbNSRfiyZdnbf
zZ77<Xpf|sM6CWX`=<ra$UqAw(M})GkP!mX2V<6__AuSK4)^eZF0b-DuO}DyAu@0Cx
za|*h2eO6)gtRP0%6>Apk#h9@}5fWqGh*PmR{uYB42uXw{0q-_zMR;?S-@%-BPxrED
zU8OIktsD>EVs=UvR(KS!{@Wdx|I>W<#~F4nG>4N_b#!Xl0~3CD3+&#`-=Es$iHwfJ
zvN`+l^}M+VO-OE;VXY~N3A481&3;9*R6|0-`)S5LOqn%AoEcnk)>a)c@S{0M@+k;`
z&L<lhogN!U_CZ)8H?jkCnj*0BS|(n|;zU)EbBOz0=u96ghgyvf7H&R(=bNwsAa4;G
zuEVnxJK}oaUgI;0oM9Y9W@9l9lCwVRCj?m`5WYw|k}HhlK{paD4_X{dTQXT4cD9b_
z(c&Y_Svy9tEOG+ZZrsP4JwL+Uf7qhN1d<3V0_ntNkc-4Y5@Fz;Qr1Lf9&Vnnv+_gx
zx;;^)W_c`Ivm60&+;<?kpp=$`w{3m&>edhMPJ3DW8|DXO3?X8&^>02B$M0?spJ_06
z%DO&}>8n3StA?4+@;P-b3|(4xK}?dNhn!AR487Za1E+3}-<nrN<`8}OAFN&didYQB
zj<AlspmAbCMHZk76XT&6{z8LhR-c%fT0<(VGBkPX!+)X?y&C$cACyBE>sr|Q=LS?M
zN5wyH!HWHsm0!o7*Gx$(B#UpwV0I`KS2jFjAidBbD+EIFAW2X#%YZrERt%O?`&Wdu
zqrDe~51fMuGy5s7shk9BBj!%~1*0ch^fBTMWWF8SeDVe}SCJWDjK|Q?t^6(<Ya6(^
zq^`N^#h+Euu?b!u_Bvi2-X_bxJ3ayE*X#ovxGGzvXwj|BSD3f5N2c0&heqhpv(ZSL
zddS)(LW4S9AE3^Z_l)N%ateQaI2IQ|lkb<-W4<u;GFYt1wA=W7(8cb6CgIV&N6ewq
zR)CdL53y2cAe;0W6{$cUK1uMe!7}u7>3|(4m%=ljjPBmer{U*6KQf*v3M-k7E(_jp
z_Qx`6AB78<_1%$KsE$k5m9##%yON1KTpWGz<!5X0@mD!d9t1mWzBjQemakz}uL-m|
zxGI@G%x`67J55b$2h7=40ud=XZW`f?N*<l@{nuM@=+bJuH8$(yL9h|t!o6R@$Bs#8
zyl6TcIJ6wsZ(H=&NfRW=AExcZe-AerpAjaXRVUOP`#<BEikw8Fx8D~x%HZcV1k_n*
zm~54%3S9{F5uZU9)KxsrN|!tct?r6=?{w$_dqN*AG+OZ)DpH3&p31!eCA>>3O(ydT
z9v&V-?wA7jl$+8$&L?@EGcJ}V44EYmX?-vQfr6SXG`ZUnSDr#1jt<`Vbka|FeRyl7
zvuJLCMpECN4KVzTX~t)i?`MV<tsz<-tPhb1<Frm5Det9UwXSbJEMK(;yUxr<_kJ~V
ztUZFOuz%iojY((*gd|+WmAmN(Br}}86o&5?eJ*CDAv0O8@x@Co4~IUhK_nGv!?y_P
z7VT<05%VkYJP^a}ARdFbz0d^@6l%#XagS0{O45c#FNh;*sUROgBoSf`C$hXrg$YSP
z;u<A);jK`uVvhH{$_$)conUQc;mW3T;}eoV3MDe*!s3$@uQVbVG-u%+>oFKKS8lD1
zwH?L`{uYzx4N|Oxyud^MV03Kt3Qk=#1-NKw7)p!{Aepd#7JrdKawWX#qjAL-G3uND
zp-v4S*yj?_J@Ajhvo%^HL1zg1j~uoR<34Gj9H)iwNF91L8H<zmmMiCUsWdJ5Au5f3
zTRDFkp^1ut_CYY>?u85OKNeayN7(tgL08NJ`aF^xnuusD8Q%_iy|Jwg8y9-65HrUt
zWjZMs`lvaAKn@t6kkG(ZTNdR#s-tzwrl{SdijsX79vXu%F~Y;+aQgV)IQQTv;&j}r
z=+Skjx2X@U%SiEk8Qb6HsYcvE=))%}hwOi~aM3<=?m};Q{$R?xzhLIVfryHsQ$x`h
zs9kVleOZxCQ!?Wk;!}dm5D3|paRpi)bX&2P6(fzN)%8k?k1>Dyq+Dxq_BdR*?vKh9
zOuGv5<}&|}S^*=L{9_d2Aj*}fk99k@qgq9eTu%v%j!i`EGA|%Jku{D$ua=YW&4#o|
zfC0PNQ}^S`Zw84UZb<+2uz3+(XZ{Gi_0yr~#D@7J@Q>f&f93=p1l~kY!b2o#x%T+?
znGKCSG*%^HlUM|0?A=hdSP2xVRTVZ(DnXx1yD(jz{WT6>oo+l6ux|^E3p+B4-xu=>
zbdd|heMyd&YBU~bUcNit_@F16bgG?hmSI?UB9{Jm6u&N6j|%}ugmPiIGauX3Xq|**
z<H$0qj3;kAZO})3D;Cf?<(L8Vzs~J|w`cy%|F5Sq6S5~lBTQ~+#y?hx!A`8yI9S<R
z=z3yhlt85QA@}8A#uXbGvQ?%chN~5Q5xf6gk77k~(QlOoX3zT>W8Up;JWCyOzh8?U
zUE82&5i^Z47je%&0<CKIGIjeM{q{19nUdU^AvN6hPe9u`JrERsR5{mcN@LKl)j(Bx
z3!hLVCL;d#GdTCx23&Z!9kIHUyYyuoY-taxQgG1}fv<BJlqp{qCEB%tz7+ME>_d~N
z!-|pZgkVqhziXV{hAwWmc+Jwy<ZaskGr#!)tzN8}>0JdAlZ52C7=e%bPQi&gKZ|E9
zyCvwYD?;n~rKR;#XrNPKL~LYA)b|^VUye>ox!+r!V%hwY7(K3|vNwql40tUN<AfMj
z#NZ2=_hmle$S9@D*au?@%td8+I0-}{4@U<NOr7;{zL5vfzjqrntxK)V64k4;#NuUJ
zaPNKqhP}}v&&Y$gcr!s*9|jGREmG=t;C@(-2ivzVn7#vn@hqq}psr`nCz?FMSM9;N
z_s3!7Fa7cF{RP<~4}!g`G)b2bnRo~nLswwuiTAN+dK0V|-T`|?zlqB;zeddO|0qO|
z70}9SRfk^LWay*5vm_6VD>~F1j-4krqeHjMlLuifR#g3JF8Jm63{0E2MCoc^4t`%!
z$Z#Mj|2y;MIpY5{kq6zkFTB<*U&({;D&?M1v8FeM@=wM=Qgz!r?Z}7)!V@kLS|3b@
zWm+tEG%^uL+p2G1`>F4h4z>A-pin)!)EfdD8z&5y@D`qHTLHz3+A5Xqc@19G5w9%9
zx;^8Sb1O{=oV@TSih4cXzxOaO9<6KjG+7_eR>R;A*Fjf|m;MQZusZ(!XfsYlOoLX>
zuGgu-84gw@;cf4WQbqjW?d=5{TW)})K}bj_9{4{%U?g|J3qmxBCxd%tQ0TBliHCJL
zl=dhOzpC}&)2=0S9$fS3gT;l*-fe><9c#o=K#<3nx4*?3W7;W+5;=v3!ATg}{v#Z{
zu~aNLCJ;(!pi}nVC~4Sx!@8uH7rx?YM=?0DjYBJsxg;si#IZ&kYs9hgK0cq%3p9gZ
zmKtKWE64U$m2mjK-6&ZscU+bk#kTF&G5FQS=G*JCOZYr7Sj5c6dEADA>Ai&t86gnP
zIxZCk8MqrDb5lncpM$GYX&gUs3Kc5meSuGExP4zN9kE`#g`r`?b(BxIdLsd?8?;88
zj@B*kOo_hO^3UwYYErxlpS`~YbC>>)B13tue(|xWKJm${`MCVaW*iEhBQ$A40i=Xh
zQxs)g>fyO|&!P9I_9#}&1x`YRr}829-xl0s7(6zfM@2?p@5<kCVAl~`zIzD)aaV=K
zmUe$Lb8!1wM{RkOa4ZWyznUoh+;c$1vc^{*#li8zaW$N-rDQNZG5E!)nE2hmTuD!l
zjR)TC{xvooG2hBKC!rC4gOObLNOCcrTRv|Mjn?d3{M{Ps65{Qpg+%WpZenh(^?2w4
zx{6<Fh%?nH`U<xF_Z4g(vu^SVKYn!tlRoWcP9O}Nvw50IASsc8K&ZN~e*oQ9jD4^p
zZZ9zu>*KlVZ{xR<-{e`=)sukWP@sFG|KVKVX62k)a4uf86&>3>USI_T$Dw77UMA~9
zqpg8KQ#NH-Yc5F8oV|`kKaCLN!L?-oTe@_t*9V_08j6x7EV?ac3M856SO%lxaAemR
z>{z)EXD^?@y{M~*)!h(+Cu4C;X7*SKE5*mIEK2)SM)68@;8CSAwB<`fZ)b~uO<S;S
z4{Kv3G-y|2B);1^T38;rr^%Bnr~Gd*e%Sn}Nr>hzXaSXi)~>oRXlej<V)^H0HN9E;
z65@kl%klmvY$%bxU>4T5E8jFH5NbvX#h|~LS|SO=e3O<!f%FK32h1yB`(pOG;tobk
zBVrmaT%6poXx<LIJfJ>L3q5!x9|q{rzr`?|4%lRT2B=qRD3<S^1TXi;$B4cd{~Kn_
z=l&E1>!We038*}7xN`iY;rf@0@yE>x#xpTloZ8{LUuL0xog!jx8K2A{aQaenkBCgd
zg)_JD%a42T@5z(69dZR>iB~c$gq74?VXfF{-4L6^K)T@`mUL{3&BuN~NntVNHW&+=
zJAM<UFC1^$|0SzX+<EjsYwX3bSjrklp`7s1L0A+tqqw}q(2D2T|4VU=8D3X5nBrEo
zxoUA(LKpImP&`g6$F|xsIP}k6_?686_AeuPFT&cr6U+&Osg+B_DAYmp^aw<{ub7z5
z2r%nD-V#GG;QhQ?;=ilgl`UQiJJ|Ga-=13-Gjt>##wIsqWb5}&7jD3S&a7)p9U)<H
zXj5Y#?#2ABoa;5^G31kN(0OHDQ_oLqAN4UF#{HxmJ6Ki5_iNXnL(AeqFe^{xI(RRl
zV)VFmI|Q4)+lRjn9>I103kYE#JWG3zJK~!eYtU<up|e0<fa%;*hOfqVYd;VqXepQ2
z4^3lTRuF(;PjYad7%BKk4osL-ju~&u<DB~JAmLx=L*F%?05yDiV#n!k@+F3u5(C=K
z#EySwm}g<J50*^hWnoXDOyf<@7U%0!o2dd&nvqBp*A>yAVw*xw9^~JPSHjS<@dONf
zwSxtDP@8>u@NBfKmv(mA#ucY<H-_`kfGVy{o>=lAWab&+Y3GZ|<(%`3JO~OLcNYz6
zRrAEh^Lk+0$yqph`B&^Z@E3-^`U9RVIS`(<^@XC8vBpZ(ygQ;(ue`OgxufO8ult}?
zrQ~h~5?Y5A(7I0-27(Z_4n2gH(p;?4dg2ckI-XToF^Y>f@o#&A$U{IEwZeF0K$pHR
z6$tVm!o$Omlw`pV?0rRM=aY0BJgSKo0%VjxsMaurm&Jn$fw(%mqQ#5cj=XS!#Buw6
zH2&B58?<Ts9FAOHB%ZVEYt*dT+i<V_ES&5gA0YA%ip8SYKMF0=*s=t6Xz&X6sCaS_
zZ%n}?lJtpiu+LvXMq%vcY=zoYJuz`kS8Vy`3;cP0BX%746C(yMM1#_U;bYfGiB+Wp
z_e&o+^&Pl4<skza!Gwzye@sD1r{sOX34QdhLS$vnwN>Dda1ok><n(o0Z8>y*y{Yjm
z{}B-tX5L4S2fP7Xv^-7{BWro%PdG9{AS4V*0BMCNu(7s9^(N(wXN3pxiF)kbbroIf
zPe8+3&GGZ0$q0!&tN2FEM|flyen0gU){W|dH@kd?C5unv?3G~Lyb~c_kHLNaD4e|%
zgt4!DkIP}d89yEH5}L79t+eY!3Oeky$z5!N;%*{@o30cfkWf6_Y*0rK%7<URfXyeS
z;lR1I*!ue)c<+BJ(75dX1fet)gyMs0UY$_4dH&rGHs;*$`+OyxRe~J~^f87i?WYC$
z7(?40i7GzzQOuiqYyKl%*cjo_A&5_~h>_D}#jGnyAcYd?#XuPAV2Lkx;A$ua({~jT
z@$syLJqQ0ljVh1#?LRG`Kl=KeFszz;5F6Gm!>x!zh>3k<LOm92!sh7U3<q036nCtO
zG9_w4ml%(rkbAfgx?Ko_<m|t8&1S*3PhaENlZhi^zr)4Ism3#4K&Maf<#HwnJUIx9
zibix~A{?Dug#~G_2J#aNX70y?=>yFyRYz#O1c~HffIHWabRGI&y6Tc;(Whfq<MlC?
zmREk^#@z@ssnZe<gAFZ-1b7qXiebJVh|(mhupvDQgpdj0v_wqH$cC9Jwoj5s$Q&4m
zy)LYUIaBtcO|}1_N$qC%Y+g^CzPABk5f4+62elBg03)>Yjj}I=$=*#&N)#4Js4@Zn
zy|V^ePE5j{b2D%zaJ^VFmfPJPIkFPh=FWpA{K=h<<%^dWq98eQX3L&m1X(^=@kKW$
zM-(sWs_a6U-{e6Ie6KYsx+kZzY7i}^j%A(7lL}op>+zDw!&X}!onI?B?(y9}pF(Vc
zMb9!WTDi_C2nwb9ib&4_p%h@NcA0@i3q-LiOL@1zzT-cmT<IsUN;(xV|2`l%3Kwq1
zV)u$;IPlvBTnhXX5i!>vXK9ciIC1EoVHzKYWCO;Hm~g=U6wG2H37e7+(t?A%18i;V
zU}aqzCGFdwcDY6<(Xla-%Jbu%3|QR@#DdR<L8CKttYs=`zjjkFd-aoLg%mXG+I0;B
z`n_O^wdpmU(0XqWM;Xxr3n=0aKp$?}s7ZmNRaIQRyT3pXH^pQ3h7+;<)NCOK6i)%y
zJ+rR97sEUQtI!n@5*cw}kw931E(t`bY%A(n8~gs+gDT~p%w}(KVj2VlM&a_MU~F6X
zJN`TI53UEEMR42&M8^goA$`(dGc}s8oIJr|P$S_#;sqsH@H(*olNX2$D4!97?msRI
z8C6e{RJePhqrD@n?5o06Qy;Z_YM^ZWXJOl-O0IRI%_*FjJP&^dd}cfoB2MFjAAVeo
zmtL-6d`3lP!K(ZojVIyAHA9Ltp>dlb)RnwTFV0!SAt~@xX!Vx;zBpHo{re|M`R2cS
zj=O?3sMrZt1Gr<h0?GjHZOe2^7OZeL!Z0zOEE7A2kRE~1+K}zrWeXF<<nVGYh2>lS
zMu*1UJT35uiPhoi)j;fBaR`V1_z&0aUd4mxtB8!hirCl)BqXLv7=$@#oEPJa7_25@
zsu9V9lZWKNZFKowf&{^9#}&ZrH4+COc}}a2gU5_Elc0G{t3~Gfrb;aKcEUQbD*|hq
z3UJf<qL^b5_?9ROpW5}|+@wx{YWJ=UiNvx=-H@o`<ubtAwh>nDUxYf93uA}boWX&=
z{n4k>^GMXQ6_bFe-TadWee`0ns#uHnDB4wj2P^(C><5ycICwk=FSe<Q$Y?Hg1w5e7
z?U)#BVM6w!Y$%j&tn>(kYA&nLDd<>*&iy~wP*K@ee8jLVnEYA6P32`A<I*L6eDlEy
z{QmbIJd8alEQ<(1CYG(UQ-LH6k^-#^Y8oUANg7Pylf=Qv!w;khE3+{u$z}R82ML1K
z90xPn<n!`5bE2sw1}pvfdb+MJYhk6>+StOz#vS%n&aky|fVIXJTCFXtwRU0{AFafr
zm3Xu^4jTty;n>64R=i&jlZ~CDcof5d7LOwwT%Dn{vxCOk3L5sQ5ksTVDm{|;oYK6{
zN}P-D*YlCDTUjfw>BZ1$tZ{4Ia_svvxgwn?=FkE^ZJLdS&vG|p6`4g$ToRtE{uZu;
z8g@%$+PBvG7qMtLjh-MRJwRe$Uxb7`Fg{@kZ}-Yrzity+w59HvKVXN0-p$8h>)*o4
zGk|h|{fTIfoDze95qck_=b_LcJp!S-h3X=kII#<FKQS7KVMC$Ss>*xVa^h1Vn50Lh
z;2<Uzc)#Bd`1y}nh>i0{RCJm_X-*6Zf5tFqUC_5l%|g1T=yXm=8XSB-Cy)I1QVZb)
z<VE52la@uwL2~9Gp-3X3+lwT^DlodgC}p`tFYkf$S*1xRISH*o7+UeDG0q8%ASR9A
z4QoL@)`C+6VI<F$48zf?8peM*7lU4_B8aa5IJ%!Oj2pB9i?@t6o{78SDl8B?HphN)
zkQ6!w!T#HfXQ`utPdgmGutktbo=tfREc<akhQ8AgNjj5vitGOyF<7ud>x11qDF+Ir
z`-(`9Kqv&M9m_3jn~Cwd7!-i;^KOM-4{bn=iW#fu%_}f(dq{^F*nV=3&~P5vPeHnw
z_(;ovP0&afk|ZQiFr!LlRY@0BYNWyOIPJqAbqy8?uci5*<mAdQClqO|kVtslNhTx`
z4qjy51Clw(hX0;J`mOS3m1P3<cJ{Ed6;_WR9xH88yxe9y#?5&irLxgnu`uHF`2e(Q
z(Hy2eS&luSaeBva`~*NBy%k{(J~S`P<9eb?h--=E0;bB-_SN3R&&R$^cc;gkhJSD(
z>Q-os2VwshpHY6}S}_iaLF<G2R8wZq^H3<Q4<bDR;Q@seH<2=rgD6gHS7&$puirvU
zo7Yt-&MGLl`!Esps@Fqc=vlGIOn)C|E6tD_VlV(MT~U%K_?jFf3K9khM!Kg`k_M5L
zi6bvAub3Q?OgN-fB3)c067xZFA<0M!hUCNd$+!w1`R_R-Iq~yJTKq2gD2F6D`MdaN
z{yZTc&5>=wa&~e<%_7|~b@@~@Yfvm-+wVU~h>p>tQN^Bk7<))L*IU<w)`M>Of)9Pd
zHAFpl6)`cUt_@sM+<1k-Xj<@enbYd#yj85=UQNg1+pV9%owGX+5G7Xpp!O57;m^;F
z&nUm~x)`i>l+6>Vcou5wgGi4+2ns0@24f#==gw_xnUJmskWyYvvHzc4C|lB`G~_$R
z4OoDmejSUj<o$~&{JHr(TQGC~Vw#?u!P2sjWI^kKgM`6J!+*yKLc);lsoc;u<ONU7
zIw6sy9FjOB=}2pY$Ncy5Ir(`h2fr^Rf$*4+=NyFjIS2nezh7EP=7c3ljqj1aU;ZWz
zeh1Gj;Op54!`_{Z*WalJPj~)o73tyCHZ!p6)GXy#FD|{-husW#i3>L3{0AXC)VN`q
zVU1A`)0f3!Jgzfl<<QeXS)<Gq#`zlg^~LIgKcYm@N2X7XA}m6WFUGCH%=tr+l*Hw)
zfJ8B04DL_BL>gu=&`ZHL<c2(WVvrF6;fki9km<ZMF=;PT>xF}z13EVvkEOdl%=b-S
zh!`RIn^t@UXCG`*3it##NojSk)h#U#Y7+Eo(b7n1U2vEa1}{#2Ob{uoDR3n*aHK{W
zQZUQol!LEv@K}B(hxvC9@|;7${9GQ(&*Cuu9giD)56Ok|g>E<|39x+uiIA@;aCY)R
zySgJWW$`dnE$3|UBUC(!l`Ae_)O)RrXX3_qE)sX7V7C_1MXf~8T~lf|*BaL!wR)~g
zZd=K9M`e|LTe=z_l{rGUXF0Fu@bynK(YjOB9B;D7ZWA}}L}OUjN!a<{9OJVJ_&b@g
zuulyBPRbH`FZkP~C!)|IRRS@GAQP@-E_U-RZP{zX)L7BOr5x7(b_lJT(9@N_xNtEP
zEt)=ypb+we0usbVG3aAuMwRqk($bKGL9&pOp`d9LQkF`=F9o<1<{UhhWRdbX<)b_%
z<T;0gJWlyY@R<Kr4oM_j&hk6ubMko(5+6x~P6)avsEp7ZN&!KOMFFQ;_2S*|@%*pQ
zrJb)38pan?Jc9qu2cUg(UP8(-aqV0`6<4yka$FFhk3Wx)TfNN#(p-ORhfbFeU077=
zxCW_YP|h&k*GCL)WM@(|TwRKxVd?Iev1%e}RL}nYG8BKo!j{;!?H_zJ;vL*cwvGtO
z2L{WRiotwz3Kd#R^jstg*;&wJMV=!g1i}a2KrVi6Ys*E?lwR%&Ld!(Cxh*QciFF6R
zfsdDzO?eOgDZ^g=4lDMIH_y7_#9SbT%$#7}AYYU-`DvI0avAaB%VR0*2_Bn2pV}i~
zew-5WHTjto?|e>@hCDVOe4dYzL}-ODA%GSL6EnC;8TZ%c^CltT;Zh#`dr!lZS>533
ztg=XIxaS{*dexgiXDq_gIFAx)-b>1HL4!Ui1d;c8A~wdfH$DY3Jp#MLV2V7odS*LP
zk)unLwP)qTU<Zs>#2}%V<_Bexr%MGis?Zg$PkarHTlm4-gF0@;!Cfu63+Rz^QP}YL
zV(d8bC8Fb!yGRSrEAf{YJH(*kN!K?oHpzoZsZQk&aW67RAQS@BAi4Ot@L5jG4H5>5
zp=gjc)^_OIaXMx%9|3n(G~@$r-it<yIvsH*$h0R1C#uYxU?()@ZPWTF^uEh%LXwFj
z4T8t!Lq5+(Ng|vpR63|-(p;r>NfKd9jgKT51@?AMXfBkJd7CGrLTSZYs=^F()mARm
z%(Uk|oCZSUIM{Gpzz`QS0pUTv7|)b7NlkvW7>rBu50EZp5(wuA)ABe!m~qH?!O{Wd
zDU(D@L_)YYd!v{`Jv6G-4jucqMTOc$h0<XSS66#DIvCz6_tlS#iWAmG3~mHk<LJiY
z_<hR?TngHQ$Y>fBCh+%h&~3#OEGnHOIKGL=HY5*4`BVu+Ec6T#2>(Y_klF!V5Y!IX
z=ZPwhQWqiyY;Ek(r}ZSvUjG5yot1x=XW(AhgF4N@<|Cho2|*=60i)>Oib3mxX0o(C
z3cc?#k0D7#l8B6l&=Mhu(0R}K)JY5(=YdwMRs7!5zx@g?b*o&UGX3%!obOeAJ0dKR
zGFZU=MQB{c7>)}NbkW-objS3&D44l87mLBvd9F#CB@9R_TD=&YBUDyNB9t|30!Jd@
z9O*6w=M3kP1(6W!BWG_b2*kDwiaPqiPAIitEt8O8lyiZRw-FF?9T9Q25Ep0iP?&?i
zk0h~D3=#*e4hHvG8^+&Fw;N@LA~aP35tlcE1VZqDi<|ZZwF6eCGgE@QADMP4B#Cry
z`~klG^&_~s<lTzj^XEhK>)aNBp-hrcz{$YW6q=yS+m>cBC#rhq^9P(m(i)-9fpdvj
zH!PT>Qo?NmC?xp2NkDkJSH+N?ALFC1yTidwWf6(mC41n3Oy#v{0<F6#?X*BZAAbsg
zH|T*ff!U7Sc97XjbPF+cmmUEbkmkBHS2Sp?((6HaLm5Nw2m8uBXFTWo9wCw}KoZ+t
zF=VWRzl{nfWd_-XUJDa>5GsLWjz9=nA=1QTAe81MgX;aopk|=lOcsm1Q1@N@w0#OZ
z+<1?37k3`U;e}`W<IFwA%1xkF!=C+|tf|F5ROBDbg#@iyCTK9eMop8MevFHdP)x$X
z*~tTq%Jjq1z0*<5Cv*Pprxi`g55m>3?aHy<rn(@I@08<$0DZz8gx%?Zgaj(|3Mhb?
zuFDq9GVZ}_CRs~iE{HfkC~K&&@@A7rn4Lw7gk-|G!Z-;t`shyQ>(c$15keth@ca0i
zNMMY`(9&RfE-fOu)EE%qk0-hDeYB1&gr!O#nI{l=V|i2Qf}j?_pgP?TY;!_wQn`Ul
zyK7SZHOyW+1+}UdWh<pzK}3`u-5R}zKd;P3Ts(~n1w2?L27_Qsy;G}33m!O^Xijk9
zOP3af0t2R;Q>+Exo~9%j1$MS}DCO1?-z=Vkb{(sTxoLc%kfKeMw{SLalX9%nmW7p9
z>WvBW8Vs68-5-dUXk&cFAh78L;E!c2QU;`@X8*V~DXmpGM@SS@UP&hALw0JQ@<DQu
zgd)j=!k;9?LB*183K9in0xb->sQ5_I;3J8H#723+f5U(O2vh>eJb@5=f;W{nlsAqf
zLU$H50a_x|CQVuZQ+!{n*B?_?ypK}Fd0%r5k-{Jz)bSH+JN~6054tB6aI!KNk5M~L
zTAHH_fYE$bt&f5S3JJ~^`n{!lRAy)~mGfmWNFvId;(Vk_>+L=hF=0;c0<mXAexYI6
z{<smbM>*DMionWyy>gu2hz}Zzu%Io*Gi5zeFf$dFaSwU}SjZ~_(y0n(Ge|{45((#t
zBohwK8F|dX*Qns~z5F-)_mV*PeY7Y@4kRzStvL8w_{it@I)w?}Z{e~^36(&^#mxeN
z5PXsgT9OD^pFu9B-SrTIeo7OGIM_SF)2TLwy!;kM&g=nKXOmKyCGaO-ycmgo9bQ)o
z22*TyPi=x}yVP_pi$T{FCrDbFj*9$+R7xluC<Ic*ML4IZX`1Ggi?b&hm+6C*2WG(2
zEqn9nNd(tG&5~Ua5Jw}M6WhsHjh?^IMXg8B-H(lD%6g<QrfI~CCTjk46;bn-0qKl_
zbA*Gw49)`*1aCa&3<-mea!B&vdr3Z$K=^wo2l(9_BnwFxBp1HM-;^eCNT>uNZb%jh
zgfJ%&nw4}v(1$JE53FjEH(LRFXBBg7gty)viH`lALD^Csu(5gU=RX2gi{82(hVg^G
zz~0lF5fsiO4ih*z=u@SpL(7Aj4$V|%VsUb0X0octdr0BH#m~413Bx=t!VE1wn&uOm
zGnRC1fkmsnM$<N&c7+E?Vl7lG-WE|w^w3h;X$66>SUThDDW{>2J%->rL&Q2YEj0>e
zSuDsOD%+pa8;~I({TT3%Br!<KL=Mgk4s-J0d-**i5q>A-gdCjz6{7$E4dO{eK~$1d
z_&i_d`!f8SR00tfHyZ>(@I~G*vOY~oSs+H27Mm~j7K7S>Y0(oT5=YzeDChnRnzd|!
zm)~gvH&;72JKMs=$zG6(l|mMYiF(Au#^K?;Fl_#DAAZ@o1-ByqL{xNuxyy>+Bwzq+
zofw>`v^=DblNv^LCaa3PgA@#$FH}rqy$CH@&MB5&Ths$^j}mY9Dj50dM2w!*n_H9=
z3UIrEilrMOL6^K&x5j&i_#c;B-h)jNBkuJ>TpU9T3b-cCiv{UQrgwnuBfgfC>yh(D
z&K>h%4t}2`2|i|;Fj7J#5OLA7NgxE@K*lGD(ET7YYUHBtAO^`qY6vE9PZ8#BTU&d<
zPFq9_C)itwVeJH+J_(_5{)o{92yM$BiAnK@j*UsV)vTO|G>y5@3!5c!qDsqy<dM^p
zRYmTDi(k$uDkjXnp-YQy(o|D@>C$Ri?iH*(JO|E>{HISh?)k^znd)_g5TinGfW~u!
z(7W?vhtPP$KInspaElar?iId947!pTO{XiFaR$Cd;r+xzC6JsU5Q1-#?gyzk$|4{Z
ziZQdMjTjUF7H+N7U}a?`ZjP8`$)<2>;6$XlBUX)KagaEeZAC4I&(lm+$>Yg|R7~jS
zreb35(xO5_mlpk2rny9yRw>sOSh?XF)N4xJ<>|$#OW}B~Ni}hilJi0|p3BAJ;d0Ac
zB!x~yu)isVo@<UVM_DXLrH%?6*CgErPX&1pDuFy|=4BPUl9cwGAk;D_#94^L$-`1v
zW<@cr_D3-opOA40PPRvol$7*1^5FaV@2Gas;@~C-{A_-vbX!Rut4bbEHhAwS9XY2c
ze3<sh+5r}zF(6BKC8NgjUL!Ux7FPoI;DwjEVb0i<U1wBN*%lT^2n0k3y$DIX6lv0x
zfgpsI(816m(p8EmDln8Fkc3AdC?pg?aOiaeq)Bl=5~(7ffHXltx}X#l9A$Ja^WK{O
z@BX=Koqg{<-`?Lo``mTzDb4JZ<wkqO2z7mb6InQdxnD4%vW6DV%Yd1PbBwWC_b&1Y
zK7;5cFP}8Cb4RXdv{<aAUlg{u6y!)LjkO)5rpYupxD5?YR)*Yzb@BwMXm$077%+vB
z$r;S5coAj8OWPhRR|jq2;SENZ`TW8%#%S4>srTXQqr~v}4Z{z#ba8L5ioNDHtaaFi
z;Bo0P!3t{gZS8yv?CDIKxQ>g5OB=Y*;1=~wjQxRZhHQUx-{&a35<gX@Cr7PqF7_v(
z2LFn4;5aAhYuXtcoQcbEH`Q9eUY^J%W&ZhEL_p-o!RcLVJS6|V2MT}%70dA7x%q-w
z6p_)eX4%nbFSkTus;l+R_^)_XgZHVFHob1~b4KPZMMF18$C3}&b4k1bghqMt347jM
z@0=}1jkd0#803Qs+{S)GhSYrM>qbi>iPR}KbxWv6#io9XGk-Khf~!ao-Qmkp6jM&1
zMP*w<&^~s6#}pupfGz?z`em+m_U^xgFFaW|wm9FdqbMX0q(fSIzpw;cuXO1fJ2uQG
zX{tRkTD(|ba_pnym?wYdRWu^vN{CyvwAjb5@XpRXUpr~9NUY{Q-8ARh@*s~u*^RpR
zXTqY&_hb$>Y~l<SR>p+&hAD;hK1y1!LUET7N+*q0sBO$Ksfgj+yxG$V^Gfd_dlcB)
z&OVg^Ar52@LeQwQRC>YFe1|iUSL|eW{~Aq{R})efvBSw`=n&{7q3AMe>vq%i(PGh2
zTmJSo8*=9B;%}|v-D^dDJKy>+^O<L-Yo{%!4tdc!(Q<KfZt=K5%r$?wNR1}(avCDp
z)pDwpKcP1p`orCv6G5>!0R*({fIFNM*8J;{^u`>gpW~BWRS>j-yQ~n-3dbx&A_Mzd
zlSn#A0FRxS>|oKG4))PuVddkaW%7?7X~pJG-x{H@FkWTk;;x>7<IWuh?_M{174K<x
zwoR0%wS<1Qk%(>zN{c~l3RTB*<}a^pp6Y=hYEi^Xn{L*K<?se1!Zoe@VYnpEZOlfj
zHU$6@Q%!O6*H+jWo<|;?y?Z<&mv`Xp&i_EU8VS+hqWT<mc1}m2KnT2dyi^w(cXW<;
zzsLJq9iB!EteIaRO4fx(N|&s52*}y*I<PETHO_Dw?ep&C=O(U6M2Ctxj9u=4>c;iT
zRC)}|nXb>2Sf_P=Q)0BbCf1xg8;~EFtm<h6{bh}<fJT2k-K{w3%lIQArQVBwn*08f
zA_sqyYDh7HmQukr-ab?#)XVAb3L&1j^4<1!eqA0=M$b^O(r@YdTvuKgGCA|GqQ=RX
zH6j0L_4rfEj2P6JRLNbqQt5Pay4oln`5aez{_YMc*WXxcIULE@&YyfnR?EL1>$5e(
zCDrHJ{rl2<rr?s$4_-7`uL3xBiC8aS%{{bkrJ{54v2sEsr1;%>LYpp@<JlBXq7t-n
zGo{N$EofPcu<((H2>Jb3_hl7}5>ntKXWOTRHtC(ndLPAEUj52(yd+D#<t?4%dG5j9
ziaylfrx6hqcJU=zTah{8s{tkUqHMvD3hI4p%YZ~@P8Ed~p=cA?0&r(2efg+#)u~_Y
zT<&QH3}>qLVgjI;FAltB@`9rFa!$k(TIcBO43mh6R0T$V({<=9q^33aM5>goWXF$5
zL8Fh*J{evCYwXra$<At4!Si4vrJ?2DPKU{9?iq6oui{G&xNxN_X6%iw+w(Z&Y;dC5
zr>LW<wC>&+ZUOah?~Prlu<L!0s0S9<VrbM0+n!XFPn@2Y5(Wt0upC*&1Ww1DF!rnz
zqvwH0VS}ag9PvZ9cdyvnU_{}too8gZ*{`X&7%AJlyF>fv?rj|ATayHZ>+UVBv=|2(
zXiWr4wRTx^&Xq*bu?HAT+>$Pm@j|&ICd~}{`;xon+PlWkEe!YQuA3S+o}LYR-6)<?
z7-a=ga2N^FBE<lLD6Q&Wb|lMrlfNMY=ZT=)iQ`*XfA7TEOb=tPow6);&r1pYb?Ccs
zOk}1kW#$$&cJ&E(Zl_xtC;a+^>vM5RVB-ynLSSspsQ~pinP9D{adoM}FFVY&iY`vz
z_=##v(hzIw;&$Q^E0PaC_{XBI*C_(RSzZt{-SDq;?D(uy(RS&4rWt!qXL@stU1Q$b
zmTi1=OCa*v`_QKM1o;uYy7t(!+@=P$-7kabLP8fEKiHmri3Z1m6@%54y4PQ8K`ou)
zC*w^K$p8Tl$N(+^fmN?WO)p)mpQlc{@ZW2EBAQH{3;**e+`QL02&COc0IXXCk;CTz
zx0m#<c<4`}IxZ^shQ`G)Y00?FD<9^U+#t?|2HsQD(>orM)!Tc8{KHWI96t4M7f^`R
z;AnaJL*wmgL1Fm_8Pi^alNDKNh*I)9wvN}q11ldfM42Y5NK8NxgAn<AHL?b0b>PVq
z@skV7+A#=(GMeD>hrKgML2+n8hI@NhfK|@p=CxiF;{|#_R?l$dyRF%~%{9*R=T8%E
z#0i*MbR>#<Ri&Uk4`}(Ur(I`K-)nL`wmW4JFr~Kkx!hkNFiKUNk`R1|<9Rzesx<6E
zSrW)Y@%$HLZokQYmcrky?tYT=@<~yz5xP~upCe8@S&g9On1K+Ks2bwGiDZsHav!im
z`*`P8bvEJLd@RYD3?3i95Iz{}bmq<A+nsf3*hX=yBAY;%$WGYM=jdc{^w;;danEJy
z1!I1`p%zvO)9#d!^b(d#J`~i$T%xr%lCP=|IYd@S7=ysZ1D2Kxpr-Sq!*Jy$q(+cQ
zlQCRX8b=WRi2#wS;ID-jr3Oj0(vlw8X6$(_x?ok-c|l&*hujMvs!ND3K|AXerNUIX
z-unKM`8ixjjQ&;eoph!s@S{&}a|b)y$0tNmL2}2q$go#lsf6l(Ekxdiot$%qB<k+J
z@~%hL+}ZH$$6N~#^1o~7L_V8Ep|Xn(!Z_f(x6=OfD@w9L`jQW+NH>Msu1}yD{qqeE
z@(K;;i8NLAVle3mG<WK?zEVBHGH+LDfdGB;QQnbV$C=_%cV{XcY1kSnwlC*lY5bLo
z+Wpo%j2&Vkv5*$rXXooZBf3A~U9GD9+ggL~LBhyjSNNj=Q&F;V0~Z*3l^XHFn2RJc
z1n-6OT60<1ym>miIa{&a%9^n6S9dbL{L&F+b3!*=kf*&Yf@VTrESGrD=-r#a?=faG
zpgCv?rmg7&E2J{PjV$ch%OxRKv|)8gNwde9$=ld6wR6`X=-KQWodG};H|nh?yePF9
z*mF++FQv7JFCSzY-q6`A1RMXRF{lQd*sRa!=a>J4HWa`s*}$@67~4^u1wSW9JKH%f
zT-tYWG61Ak+iiq(MOmPHV3$$K>WZq}dQ|nVf>Cbq_^^-xZ-cq>4H0B2o8>2Va#xqA
zu9Y!B;>f+M%`nCZhFM>K@oYZ5s)7Fw?p=R#sv_tDe;62l4h+puRA_%IY{0C&bqU$F
ztq*?J<eo=)1gwbh3?u+1Xa;4K>Aed$yZmdjzrYQXbeU4RH3FX0WC%p%2=gQX++f@1
z0}I;nl<k4Xplkl?=6+cK-|uVae%8m+5`{`mpa9s0bV~otz}iFn$P1i~Mc71e;+zv#
zGa#x=sB|bokAeB&u!!K#dk7Ger>L47dJ2>><iSY!=Y<ByA&a2YJR9`o;p3J42r!fX
nqt2at$jzZL>;F@k*pUM{+LA<8ToBvz2zcSm?aXSi-sHal2n~nH

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail2.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f0b1d4f59fa046156fb8911ba14cb73ccb60710
GIT binary patch
literal 73351
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
BEpq?>

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle0.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle0.png
new file mode 100644
index 0000000000000000000000000000000000000000..dde0adabb403485d9f92830f5ab95a4b4396ad83
GIT binary patch
literal 68649
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
OK*OB3F|9W7i2WDz654kF

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle1.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7295e95efe9c962cf5e5cee94ff928241b81765c
GIT binary patch
literal 69329
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%0DW8d%49(wA_m-Wzf
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
K%$b<;G5-Nz>y;7!

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai0.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai0.png
new file mode 100644
index 0000000000000000000000000000000000000000..911378cbe91f2a6fbaa7d2ee1f8e71de3f7e2d75
GIT binary patch
literal 76964
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai1.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f89568bca25c2a7bbef738d024c2f2f25ac398e0
GIT binary patch
literal 75434
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%0D=N>o|8~=n^yQP8b;63t|r%
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%0DYz4H_
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
E2j`LGcmMzZ

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index dc89fa3a59..d11bfa05ba 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -6,9 +6,9 @@ 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.Bindables;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -18,7 +18,6 @@ using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Skinning
@@ -38,35 +37,28 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             TimeRange = { Value = 5000 },
         };
 
+        [Cached(typeof(IBindable<WorkingBeatmap>))]
+        private Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+
         private readonly List<DrawableTaikoMascot> mascots = new List<DrawableTaikoMascot>();
-        private readonly List<SkinnableDrawable> skinnables = new List<SkinnableDrawable>();
         private readonly List<TaikoPlayfield> playfields = new List<TaikoPlayfield>();
+        private readonly List<DrawableTaikoRuleset> rulesets = new List<DrawableTaikoRuleset>();
 
         [Test]
         public void TestStateTextures()
         {
+            AddStep("Set beatmap", () => setBeatmap());
+
             AddStep("Create mascot (idle)", () =>
-            {
-                skinnables.Clear();
-                SetContents(() =>
-                {
-                    var skinnable = getMascot();
-                    skinnables.Add(skinnable);
-                    return skinnable;
-                });
-            });
-
-            AddUntilStep("Wait for SkinnableDrawable", () => skinnables.Any(d => d.Drawable is DrawableTaikoMascot));
-
-            AddStep("Collect mascots", () =>
             {
                 mascots.Clear();
 
-                foreach (var skinnable in skinnables)
+                SetContents(() =>
                 {
-                    if (skinnable.Drawable is DrawableTaikoMascot mascot)
-                        mascots.Add(mascot);
-                }
+                    var mascot = new TestDrawableTaikoMascot();
+                    mascots.Add(mascot);
+                    return mascot;
+                });
             });
 
             AddStep("Clear state", () => setState(TaikoMascotAnimationState.Clear));
@@ -76,59 +68,25 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             AddStep("Fail state", () => setState(TaikoMascotAnimationState.Fail));
         }
 
-        private void setState(TaikoMascotAnimationState state)
-        {
-            foreach (var mascot in mascots)
-            {
-                if (mascot == null)
-                    continue;
-
-                mascot.Dumb = true;
-                mascot.State = state;
-            }
-        }
-
-        private SkinnableDrawable getMascot() =>
-            new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoDon), _ => new Container(), confineMode: ConfineMode.ScaleToFit)
-            {
-                RelativePositionAxes = Axes.Both
-            };
-
         [Test]
         public void TestPlayfield()
         {
-            AddStep("Create playfield", () =>
+            AddStep("Set beatmap", () => setBeatmap());
+
+            AddStep("Create ruleset", () =>
             {
-                playfields.Clear();
+                rulesets.Clear();
                 SetContents(() =>
                 {
-                    var playfield = new TaikoPlayfield(new ControlPointInfo())
-                    {
-                        Height = 0.4f,
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.BottomLeft,
-                    };
-
-                    playfields.Add(playfield);
-
-                    return playfield;
+                    var ruleset = new TaikoRuleset();
+                    var drawableRuleset = new DrawableTaikoRuleset(ruleset, beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
+                    rulesets.Add(drawableRuleset);
+                    return drawableRuleset;
                 });
             });
 
-            AddUntilStep("Wait for SkinnableDrawable", () => playfields.Any(p => p.ChildrenOfType<DrawableTaikoMascot>().Any()));
-
-            AddStep("Collect mascots", () =>
-            {
-                mascots.Clear();
-
-                foreach (var playfield in playfields)
-                {
-                    var mascot = playfield.ChildrenOfType<DrawableTaikoMascot>().SingleOrDefault();
-
-                    if (mascot != null)
-                        mascots.Add(mascot);
-                }
-            });
+            AddStep("Collect playfields", collectPlayfields);
+            AddStep("Collect mascots", collectMascots);
 
             AddStep("Create hit (miss)", () =>
             {
@@ -136,7 +94,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     addJudgement(playfield, HitResult.Miss);
             });
 
-            AddAssert("Check if state is fail", () => mascots.Where(d => d != null).All(d => d.PlayfieldState.Value == TaikoMascotAnimationState.Fail));
+            AddUntilStep("Wait for fail state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Fail));
 
             AddStep("Create hit (great)", () =>
             {
@@ -144,12 +102,111 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     addJudgement(playfield, HitResult.Great);
             });
 
-            AddAssert("Check if state is idle", () => mascots.Where(d => d != null).All(d => d.PlayfieldState.Value == TaikoMascotAnimationState.Idle));
+            AddUntilStep("Wait for idle state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Idle));
+        }
+
+        [Test]
+        public void TestKiai()
+        {
+            AddStep("Set beatmap", () => setBeatmap(true));
+
+            AddUntilStep("Wait for beatmap to be loaded", () => beatmap.Value.Track.IsLoaded);
+
+            AddStep("Create kiai ruleset", () =>
+            {
+                beatmap.Value.Track.Start();
+
+                rulesets.Clear();
+                SetContents(() =>
+                {
+                    var ruleset = new TaikoRuleset();
+                    var drawableRuleset = new DrawableTaikoRuleset(ruleset, beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
+                    rulesets.Add(drawableRuleset);
+                    return drawableRuleset;
+                });
+            });
+
+            AddStep("Collect playfields", collectPlayfields);
+            AddStep("Collect mascots", collectMascots);
+
+            AddUntilStep("Wait for fail state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Fail));
+
+            AddStep("Create hit (great)", () =>
+            {
+                foreach (var playfield in playfields)
+                    addJudgement(playfield, HitResult.Great);
+            });
+
+            AddUntilStep("Wait for kiai state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Kiai));
+        }
+
+        private void setBeatmap(bool kiai = false)
+        {
+            var controlPointInfo = new ControlPointInfo();
+            controlPointInfo.Add(0, new TimingControlPoint { BeatLength = 90 });
+
+            if (kiai)
+                controlPointInfo.Add(0, new EffectControlPoint { KiaiMode = true });
+
+            beatmap.Value = CreateWorkingBeatmap(new Beatmap
+            {
+                HitObjects = new List<HitObject> { new Hit { Type = HitType.Centre } },
+                BeatmapInfo = new BeatmapInfo
+                {
+                    BaseDifficulty = new BeatmapDifficulty(),
+                    Metadata = new BeatmapMetadata
+                    {
+                        Artist = @"Unknown",
+                        Title = @"Sample Beatmap",
+                        AuthorString = @"Craftplacer",
+                    },
+                    Ruleset = new TaikoRuleset().RulesetInfo
+                },
+                ControlPointInfo = controlPointInfo
+            });
+        }
+
+        private void setState(TaikoMascotAnimationState state)
+        {
+            foreach (var mascot in mascots)
+                mascot?.ShowState(state);
+        }
+
+        private void collectPlayfields()
+        {
+            playfields.Clear();
+            foreach (var ruleset in rulesets) playfields.Add(ruleset.ChildrenOfType<TaikoPlayfield>().Single());
+        }
+
+        private void collectMascots()
+        {
+            mascots.Clear();
+
+            foreach (var playfield in playfields)
+            {
+                var mascot = playfield.ChildrenOfType<DrawableTaikoMascot>()
+                                      .SingleOrDefault();
+
+                if (mascot != null) mascots.Add(mascot);
+            }
         }
 
         private void addJudgement(TaikoPlayfield playfield, HitResult result)
         {
             playfield.OnNewResult(new DrawableRimHit(new Hit()), new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = result });
         }
+
+        private class TestDrawableTaikoMascot : DrawableTaikoMascot
+        {
+            public TestDrawableTaikoMascot(TaikoMascotAnimationState startingState = TaikoMascotAnimationState.Idle)
+                : base(startingState)
+            {
+            }
+
+            protected override TaikoMascotAnimationState GetFinalAnimationState(EffectControlPoint effectPoint, TaikoMascotAnimationState playfieldState)
+            {
+                return State;
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index f05c335456..2c94f5f1cb 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
@@ -11,68 +12,29 @@ using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    public sealed class DrawableTaikoMascot : BeatSyncedContainer
+    public class DrawableTaikoMascot : BeatSyncedContainer
     {
-        private static TaikoMascotTextureAnimation idleDrawable, clearDrawable, kiaiDrawable, failDrawable;
+        private TaikoMascotTextureAnimation idleDrawable, clearDrawable, kiaiDrawable, failDrawable;
         private EffectControlPoint lastEffectControlPoint;
-        private TaikoMascotAnimationState state;
 
         public Bindable<TaikoMascotAnimationState> PlayfieldState;
 
-        /// <summary>
-        /// Determines if there should be no "state logic", intended for testing.
-        /// </summary>
-        public bool Dumb { get; set; }
-
-        public TaikoMascotAnimationState State
-        {
-            get => state;
-            set
-            {
-                state = value;
-
-                foreach (var child in InternalChildren)
-                    child.Hide();
-
-                var drawable = getStateDrawable(State);
-
-                drawable?.Show();
-            }
-        }
+        public TaikoMascotAnimationState State { get; private set; }
 
         public DrawableTaikoMascot(TaikoMascotAnimationState startingState = TaikoMascotAnimationState.Idle)
         {
             RelativeSizeAxes = Axes.Both;
+
             PlayfieldState = new Bindable<TaikoMascotAnimationState>();
             PlayfieldState.BindValueChanged(b =>
             {
                 if (lastEffectControlPoint != null)
-                    State = getFinalAnimationState(lastEffectControlPoint, b.NewValue);
+                    ShowState(GetFinalAnimationState(lastEffectControlPoint, b.NewValue));
             });
 
             State = startingState;
         }
 
-        private TaikoMascotTextureAnimation getStateDrawable(TaikoMascotAnimationState state)
-        {
-            return state switch
-            {
-                TaikoMascotAnimationState.Idle => idleDrawable,
-                TaikoMascotAnimationState.Clear => clearDrawable,
-                TaikoMascotAnimationState.Kiai => kiaiDrawable,
-                TaikoMascotAnimationState.Fail => failDrawable,
-                _ => null
-            };
-        }
-
-        private TaikoMascotAnimationState getFinalAnimationState(EffectControlPoint effectPoint, TaikoMascotAnimationState playfieldState)
-        {
-            if (playfieldState == TaikoMascotAnimationState.Fail)
-                return playfieldState;
-
-            return effectPoint.KiaiMode ? TaikoMascotAnimationState.Kiai : TaikoMascotAnimationState.Idle;
-        }
-
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
@@ -84,21 +46,60 @@ namespace osu.Game.Rulesets.Taiko.UI
                 failDrawable = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Fail),
             };
 
-            // making sure we have the correct sprite set
+            ShowState(State);
+        }
+
+        public void ShowState(TaikoMascotAnimationState state)
+        {
+            foreach (var child in InternalChildren)
+                child.Hide();
+
             State = state;
+
+            var drawable = getStateDrawable(State);
+            drawable.Show();
+        }
+
+        private TaikoMascotTextureAnimation getStateDrawable(TaikoMascotAnimationState state)
+        {
+            switch (state)
+            {
+                case TaikoMascotAnimationState.Idle:
+                    return idleDrawable;
+
+                case TaikoMascotAnimationState.Clear:
+                    return clearDrawable;
+
+                case TaikoMascotAnimationState.Kiai:
+                    return kiaiDrawable;
+
+                case TaikoMascotAnimationState.Fail:
+                    return failDrawable;
+
+                default:
+                    throw new ArgumentException($"There's no case for animation state ${state} available", nameof(state));
+            }
+        }
+
+        protected virtual TaikoMascotAnimationState GetFinalAnimationState(EffectControlPoint effectPoint, TaikoMascotAnimationState playfieldState)
+        {
+            if (playfieldState == TaikoMascotAnimationState.Fail)
+                return playfieldState;
+
+            return effectPoint.KiaiMode ? TaikoMascotAnimationState.Kiai : TaikoMascotAnimationState.Idle;
         }
 
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
         {
             base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
-            if (!Dumb)
-                State = getFinalAnimationState(lastEffectControlPoint = effectPoint, PlayfieldState.Value);
+            var state = GetFinalAnimationState(lastEffectControlPoint = effectPoint, PlayfieldState.Value);
+            ShowState(state);
 
-            if (State == TaikoMascotAnimationState.Clear)
+            if (state == TaikoMascotAnimationState.Clear)
                 return;
 
-            var drawable = getStateDrawable(State);
+            var drawable = getStateDrawable(state);
             drawable.Move();
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
index 2c04d3e1dc..c8e97b9f8b 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
@@ -39,7 +40,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             {
                 foreach (var textureIndex in clear_animation_sequence)
                 {
-                    var textureName = _getStateTextureName(textureIndex);
+                    var textureName = getStateTextureName(textureIndex);
                     Texture texture = skin.GetTexture(textureName);
 
                     if (texture == null)
@@ -52,7 +53,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             {
                 for (int i = 0; true; i++)
                 {
-                    var textureName = _getStateTextureName(i);
+                    var textureName = getStateTextureName(i);
                     Texture texture = skin.GetTexture(textureName);
 
                     if (texture == null)
@@ -63,10 +64,13 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
-        /// <summary>Advances the current frame by one.</summary>
+        /// <summary>
+        /// Advances the current frame by one.
+        /// </summary>
         public void Move()
         {
-            if (FrameCount == 0) // Frames are apparently broken
+            // Check whether there are frames before causing a crash.
+            if (FrameCount == 0)
                 return;
 
             if (FrameCount <= currentFrame)
@@ -77,18 +81,27 @@ namespace osu.Game.Rulesets.Taiko.UI
             currentFrame += 1;
         }
 
-        private string _getStateTextureName(int i) => $"pippidon{_getStateString(State)}{i}";
+        private string getStateTextureName(int i) => $"pippidon{getStateString(State)}{i}";
 
-        private string _getStateString(TaikoMascotAnimationState state)
+        private string getStateString(TaikoMascotAnimationState state)
         {
-            return state switch
+            switch (state)
             {
-                TaikoMascotAnimationState.Clear => "clear",
-                TaikoMascotAnimationState.Fail => "fail",
-                TaikoMascotAnimationState.Idle => "idle",
-                TaikoMascotAnimationState.Kiai => "kiai",
-                _ => null
-            };
+                case TaikoMascotAnimationState.Clear:
+                    return "clear";
+
+                case TaikoMascotAnimationState.Fail:
+                    return "fail";
+
+                case TaikoMascotAnimationState.Idle:
+                    return "idle";
+
+                case TaikoMascotAnimationState.Kiai:
+                    return "kiai";
+
+                default:
+                    throw new ArgumentException($"There's no case for animation state ${state} available", nameof(state));
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 6d9d263141..ebb3e0e786 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -282,15 +282,15 @@ namespace osu.Game.Rulesets.Taiko.UI
                 mascot.PlayfieldState.Value = isFailing ? TaikoMascotAnimationState.Fail : TaikoMascotAnimationState.Idle;
             }
         }
-    }
 
-    internal class ProxyContainer : LifetimeManagementContainer
-    {
-        public new MarginPadding Padding
+        private class ProxyContainer : LifetimeManagementContainer
         {
-            set => base.Padding = value;
-        }
+            public new MarginPadding Padding
+            {
+                set => base.Padding = value;
+            }
 
-        public void Add(Drawable proxy) => AddInternal(proxy);
+            public void Add(Drawable proxy) => AddInternal(proxy);
+        }
     }
 }

From fcded206559d688f0d363d12508b666ee779abd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Apr 2020 08:58:01 +0900
Subject: [PATCH 02448/10326] Don't specify IProvideVideo interface for now

---
 osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
index aea531e88d..9785b7e647 100644
--- a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
+++ b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
@@ -10,7 +10,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Showcase
 {
-    public class ShowcaseScreen : BeatmapInfoScreen, IProvideVideo
+    public class ShowcaseScreen : BeatmapInfoScreen // IProvideVideo
     {
         [BackgroundDependencyLoader]
         private void load()

From d46643ec5270942bb0e590fb5c2febea0101ba02 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 27 Apr 2020 02:10:12 +0200
Subject: [PATCH 02449/10326] Rework special case for strong hits

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index ebb3e0e786..9a2cfad8a4 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -270,16 +270,12 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             if (characterDrawable.Drawable is DrawableTaikoMascot mascot)
             {
-                var isFailing = result.Type == HitResult.Miss;
+                var miss = result.Type == HitResult.Miss;
 
-                // Only take combo in consideration when it's not a strong hit (it's always false)
-                if (!(judgedObject.HitObject is StrongHitObject))
-                {
-                    if (isFailing)
-                        isFailing = result.Judgement.AffectsCombo;
-                }
+                if (miss && judgedObject.HitObject is StrongHitObject)
+                    miss = result.Judgement.AffectsCombo;
 
-                mascot.PlayfieldState.Value = isFailing ? TaikoMascotAnimationState.Fail : TaikoMascotAnimationState.Idle;
+                mascot.PlayfieldState.Value = miss ? TaikoMascotAnimationState.Fail : TaikoMascotAnimationState.Idle;
             }
         }
 

From 48168dddcec916967327057454f649fe884a02d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Apr 2020 10:54:32 +0900
Subject: [PATCH 02450/10326] Adjust editor timeline current marker to promote
 tick visibility

---
 .../Compose/Components/Timeline/CentreMarker.cs     | 13 ++++++++++---
 .../Edit/Compose/Components/Timeline/Timeline.cs    |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
index 0d4c48b5f6..0d2b35132e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class CentreMarker : CompositeDrawable
     {
-        private const float triangle_width = 20;
+        private const float triangle_width = 15;
         private const float triangle_height = 10;
         private const float bar_width = 2;
 
         public CentreMarker()
         {
             RelativeSizeAxes = Axes.Y;
-            Size = new Vector2(20, 1);
+            Size = new Vector2(triangle_width, 1);
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -39,6 +39,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     Origin = Anchor.BottomCentre,
                     Size = new Vector2(triangle_width, triangle_height),
                     Scale = new Vector2(1, -1)
+                },
+                new Triangle
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Size = new Vector2(triangle_width, triangle_height),
+                    Scale = new Vector2(1, 1)
                 }
             };
         }
@@ -46,7 +53,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Colour = colours.Red;
+            Colour = colours.RedDark;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 8e6b3d5424..25f3cfc285 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             });
 
             // We don't want the centre marker to scroll
-            AddInternal(new CentreMarker());
+            AddInternal(new CentreMarker { Depth = float.MaxValue });
 
             WaveformVisible.ValueChanged += visible => waveform.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
 

From 104c61d622589b199dd859abf3dfb2e6f0d0e7f0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 27 Apr 2020 11:06:23 +0900
Subject: [PATCH 02451/10326] Remove unnecessary scale

---
 .../Screens/Edit/Compose/Components/Timeline/CentreMarker.cs     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
index 0d2b35132e..8c8b38d9ea 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
@@ -45,7 +45,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     Size = new Vector2(triangle_width, triangle_height),
-                    Scale = new Vector2(1, 1)
                 }
             };
         }

From 8a47a615dbb44c3e236f8b4b61ebe1609a9bcefe Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 26 Apr 2020 19:29:22 -0700
Subject: [PATCH 02452/10326] Remove unranked label from footer

---
 .../TestSceneModSelectOverlay.cs              | 12 --------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 29 ++-----------------
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 2294cd6966..769c660f48 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -117,8 +117,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         public void TestManiaMods()
         {
             changeRuleset(3);
-
-            testRankedText(new ManiaRuleset().GetModsFor(ModType.Conversion).First(m => m is ManiaModRandom));
         }
 
         [Test]
@@ -217,15 +215,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             checkLabelColor(() => Color4.White);
         }
 
-        private void testRankedText(Mod mod)
-        {
-            AddUntilStep("check for ranked", () => modSelect.UnrankedLabel.Alpha == 0);
-            selectNext(mod);
-            AddUntilStep("check for unranked", () => modSelect.UnrankedLabel.Alpha != 0);
-            selectPrevious(mod);
-            AddUntilStep("check for ranked", () => modSelect.UnrankedLabel.Alpha == 0);
-        }
-
         private void selectNext(Mod mod) => AddStep($"left click {mod.Name}", () => modSelect.GetModButton(mod)?.SelectNext(1));
 
         private void selectPrevious(Mod mod) => AddStep($"right click {mod.Name}", () => modSelect.GetModButton(mod)?.SelectNext(-1));
@@ -272,7 +261,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
 
             public new OsuSpriteText MultiplierLabel => base.MultiplierLabel;
-            public new OsuSpriteText UnrankedLabel => base.UnrankedLabel;
             public new TriangleButton DeselectAllButton => base.DeselectAllButton;
 
             public new Color4 LowMultiplierColour => base.LowMultiplierColour;
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 36d21c8b46..914e730c27 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -37,7 +37,6 @@ namespace osu.Game.Overlays.Mods
         protected readonly TriangleButton CloseButton;
 
         protected readonly OsuSpriteText MultiplierLabel;
-        protected readonly OsuSpriteText UnrankedLabel;
 
         protected override bool BlockNonPositionalInput => false;
 
@@ -268,30 +267,11 @@ namespace osu.Game.Overlays.Mods
                                                         Origin = Anchor.CentreLeft,
                                                         Anchor = Anchor.CentreLeft,
                                                     },
-                                                    new FillFlowContainer
+                                                    MultiplierLabel = new OsuSpriteText
                                                     {
-                                                        AutoSizeAxes = Axes.Both,
+                                                        Font = OsuFont.GetFont(size: 25, weight: FontWeight.Bold, fixedWidth: true),
                                                         Origin = Anchor.CentreLeft,
                                                         Anchor = Anchor.CentreLeft,
-                                                        Direction = FillDirection.Vertical,
-                                                        LayoutDuration = 100,
-                                                        LayoutEasing = Easing.OutQuint,
-                                                        Children = new Drawable[]
-                                                        {
-                                                            MultiplierLabel = new OsuSpriteText
-                                                            {
-                                                                Font = OsuFont.GetFont(size: 25, weight: FontWeight.Bold, fixedWidth: true),
-                                                                Origin = Anchor.TopCentre,
-                                                                Anchor = Anchor.TopCentre,
-                                                            },
-                                                            UnrankedLabel = new OsuSpriteText
-                                                            {
-                                                                Text = @"(Unranked)",
-                                                                Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold),
-                                                                Origin = Anchor.TopCentre,
-                                                                Anchor = Anchor.TopCentre,
-                                                            },
-                                                        }
                                                     },
                                                 },
                                             },
@@ -340,7 +320,6 @@ namespace osu.Game.Overlays.Mods
         {
             LowMultiplierColour = colours.Red;
             HighMultiplierColour = colours.Green;
-            UnrankedLabel.Colour = colours.Blue;
 
             availableMods = osu.AvailableMods.GetBoundCopy();
 
@@ -444,12 +423,10 @@ namespace osu.Game.Overlays.Mods
         private void updateMods()
         {
             var multiplier = 1.0;
-            var ranked = true;
 
             foreach (var mod in SelectedMods.Value)
             {
                 multiplier *= mod.ScoreMultiplier;
-                ranked &= mod.Ranked;
             }
 
             MultiplierLabel.Text = $"{multiplier:N2}x";
@@ -459,8 +436,6 @@ namespace osu.Game.Overlays.Mods
                 MultiplierLabel.FadeColour(LowMultiplierColour, 200);
             else
                 MultiplierLabel.FadeColour(Color4.White, 200);
-
-            UnrankedLabel.FadeTo(ranked ? 0 : 1, 200);
         }
 
         private void updateModSettings(ValueChangedEvent<IReadOnlyList<Mod>> selectedMods)

From 1b9362041a4e4019c84f41f8230aca4f3d194459 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 26 Apr 2020 19:50:11 -0700
Subject: [PATCH 02453/10326] Revert multiplier number changes and set width

Safe arbitrary width taken from "0.00x" (highest width of 67), rounded to the nearest tenth.
---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 914e730c27..09f4befbc1 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -269,9 +269,10 @@ namespace osu.Game.Overlays.Mods
                                                     },
                                                     MultiplierLabel = new OsuSpriteText
                                                     {
-                                                        Font = OsuFont.GetFont(size: 25, weight: FontWeight.Bold, fixedWidth: true),
+                                                        Font = OsuFont.GetFont(size: 30, weight: FontWeight.Bold),
                                                         Origin = Anchor.CentreLeft,
                                                         Anchor = Anchor.CentreLeft,
+                                                        Width = 70, // to avoid footer from flowing when clicking mods
                                                     },
                                                 },
                                             },

From dd36b839b9bb4bd558a7218e8e86c37334f86b5a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 27 Apr 2020 12:01:31 +0900
Subject: [PATCH 02454/10326] Refactor

---
 .../Objects/Drawables/DrawableDrumRollTick.cs |  2 -
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 38 ++++++++++---------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index 536dd1209c..e12d1a0ba9 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -24,8 +24,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             FillMode = FillMode.Fit;
         }
 
-        public override bool DisplayResult => false;
-
         protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.DrumRollTick),
             _ => new TickPiece
             {
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index d1d2571ec7..6103dea1fd 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -181,29 +181,11 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
-        private void playDrumrollHit(DrawableDrumRollTick drumrollTick)
-        {
-            TaikoAction action = drumrollTick.JudgedAction;
-            bool isStrong = drumrollTick.HitObject.IsStrong;
-            double time = drumrollTick.HitObject.GetEndTime();
-
-            DrawableHit drawableHit;
-            if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
-                drawableHit = new DrawableFlyingRimHit(time, isStrong);
-            else
-                drawableHit = new DrawableFlyingCentreHit(time, isStrong);
-
-            drumRollHitContainer.Add(drawableHit);
-        }
-
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             if (!DisplayJudgements.Value)
                 return;
 
-            if ((judgedObject is DrawableDrumRollTick) && result.Type != HitResult.Miss)
-                playDrumrollHit((DrawableDrumRollTick)judgedObject);
-
             if (!judgedObject.DisplayResult)
                 return;
 
@@ -214,6 +196,11 @@ namespace osu.Game.Rulesets.Taiko.UI
                         hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongNestedHit)judgedObject).MainObject)?.VisualiseSecondHit();
                     break;
 
+                case TaikoDrumRollTickJudgement _:
+                    if (result.IsHit)
+                        playDrumrollHit((DrawableDrumRollTick)judgedObject);
+                    break;
+
                 default:
                     judgementContainer.Add(new DrawableTaikoJudgement(result, judgedObject)
                     {
@@ -237,6 +224,21 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
+        private void playDrumrollHit(DrawableDrumRollTick drumrollTick)
+        {
+            TaikoAction action = drumrollTick.JudgedAction;
+            bool isStrong = drumrollTick.HitObject.IsStrong;
+            double time = drumrollTick.HitObject.GetEndTime();
+
+            DrawableHit drawableHit;
+            if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
+                drawableHit = new DrawableFlyingRimHit(time, isStrong);
+            else
+                drawableHit = new DrawableFlyingCentreHit(time, isStrong);
+
+            drumRollHitContainer.Add(drawableHit);
+        }
+
         private class ProxyContainer : LifetimeManagementContainer
         {
             public new MarginPadding Padding

From 81df22d2a77b1b85d4c14ade4da13532ede7a3f3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 27 Apr 2020 12:17:36 +0900
Subject: [PATCH 02455/10326] Improve test scene

---
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index c2ca578dfa..1822180795 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
     [TestFixture]
     public class TestSceneHits : OsuTestScene
     {
-        private const double default_duration = 1000;
+        private const double default_duration = 3000;
         private const float scroll_time = 1000;
 
         protected override double TimePerAction => default_duration * 2;
@@ -45,6 +45,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             AddStep("Miss :(", addMissJudgement);
             AddStep("DrumRoll", () => addDrumRoll(false));
             AddStep("Strong DrumRoll", () => addDrumRoll(true));
+            AddStep("Kiai DrumRoll", () => addDrumRoll(true, kiai: true));
             AddStep("Swell", () => addSwell());
             AddStep("Centre", () => addCentreHit(false));
             AddStep("Strong Centre", () => addCentreHit(true));
@@ -192,7 +193,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             drawableRuleset.Playfield.Add(new DrawableSwell(swell));
         }
 
-        private void addDrumRoll(bool strong, double duration = default_duration)
+        private void addDrumRoll(bool strong, double duration = default_duration, bool kiai = false)
         {
             addBarLine(true);
             addBarLine(true, scroll_time + duration);
@@ -202,9 +203,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 StartTime = drawableRuleset.Playfield.Time.Current + scroll_time,
                 IsStrong = strong,
                 Duration = duration,
+                TickRate = 8,
             };
 
-            d.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            var cpi = new ControlPointInfo();
+            cpi.Add(-10000, new EffectControlPoint { KiaiMode = kiai });
+
+            d.ApplyDefaults(cpi, new BeatmapDifficulty());
 
             drawableRuleset.Playfield.Add(new DrawableDrumRoll(d));
         }

From 7dc090cc24ccd64f19aa5f010ded2c99871f176d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 27 Apr 2020 12:23:53 +0900
Subject: [PATCH 02456/10326] Add support for hit explosions

---
 .../Objects/Drawables/DrawableDrumRollTick.cs |  7 ++--
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs    | 10 +++---
 .../UI/KiaiHitExplosion.cs                    | 10 +++---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 34 +++++++++++--------
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index e12d1a0ba9..62405cf047 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -13,10 +13,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     public class DrawableDrumRollTick : DrawableTaikoHitObject<DrumRollTick>
     {
         /// <summary>
-        /// The action type that the user took which caused this tick to
-        /// have been judged as "hit"
+        /// The hit type corresponding to the <see cref="TaikoAction"/> that the user pressed to hit this <see cref="DrawableDrumRollTick"/>.
         /// </summary>
-        public TaikoAction JudgedAction;
+        public HitType JudgementType;
 
         public DrawableDrumRollTick(DrumRollTick tick)
             : base(tick)
@@ -57,7 +56,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         public override bool OnPressed(TaikoAction action)
         {
-            JudgedAction = action;
+            JudgementType = action == TaikoAction.LeftRim || action == TaikoAction.RightRim ? HitType.Rim : HitType.Centre;
             return UpdateResult(true);
         }
 
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index d4118d38b6..fbaae7e322 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -21,16 +21,14 @@ namespace osu.Game.Rulesets.Taiko.UI
         public override bool RemoveWhenNotAlive => true;
 
         public readonly DrawableHitObject JudgedObject;
+        private readonly HitType type;
 
         private readonly Box innerFill;
 
-        private readonly bool isRim;
-
-        public HitExplosion(DrawableHitObject judgedObject, bool isRim)
+        public HitExplosion(DrawableHitObject judgedObject, HitType type)
         {
-            this.isRim = isRim;
-
             JudgedObject = judgedObject;
+            this.type = type;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -58,7 +56,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            innerFill.Colour = isRim ? colours.BlueDarker : colours.PinkDarker;
+            innerFill.Colour = type == HitType.Rim ? colours.BlueDarker : colours.PinkDarker;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
index e80b463481..3a307bb3bb 100644
--- a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
@@ -18,14 +18,12 @@ namespace osu.Game.Rulesets.Taiko.UI
         public override bool RemoveWhenNotAlive => true;
 
         public readonly DrawableHitObject JudgedObject;
+        private readonly HitType type;
 
-        private readonly bool isRim;
-
-        public KiaiHitExplosion(DrawableHitObject judgedObject, bool isRim)
+        public KiaiHitExplosion(DrawableHitObject judgedObject, HitType type)
         {
-            this.isRim = isRim;
-
             JudgedObject = judgedObject;
+            this.type = type;
 
             Anchor = Anchor.CentreLeft;
             Origin = Anchor.Centre;
@@ -53,7 +51,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
-                Colour = isRim ? colours.BlueDarker : colours.PinkDarker,
+                Colour = type == HitType.Rim ? colours.BlueDarker : colours.PinkDarker,
                 Radius = 60,
             };
         }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 6103dea1fd..a19c08ae7e 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -10,7 +10,6 @@ using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
@@ -197,8 +196,13 @@ namespace osu.Game.Rulesets.Taiko.UI
                     break;
 
                 case TaikoDrumRollTickJudgement _:
-                    if (result.IsHit)
-                        playDrumrollHit((DrawableDrumRollTick)judgedObject);
+                    if (!result.IsHit)
+                        return;
+
+                    var drawableTick = (DrawableDrumRollTick)judgedObject;
+
+                    addDrumRollHit(drawableTick);
+                    addExplosion(drawableTick, drawableTick.JudgementType);
                     break;
 
                 default:
@@ -213,25 +217,19 @@ namespace osu.Game.Rulesets.Taiko.UI
                     if (!result.IsHit)
                         break;
 
-                    bool isRim = (judgedObject.HitObject as Hit)?.Type == HitType.Rim;
-
-                    hitExplosionContainer.Add(new HitExplosion(judgedObject, isRim));
-
-                    if (judgedObject.HitObject.Kiai)
-                        kiaiExplosionContainer.Add(new KiaiHitExplosion(judgedObject, isRim));
+                    addExplosion(judgedObject, (judgedObject.HitObject as Hit)?.Type ?? HitType.Centre);
 
                     break;
             }
         }
 
-        private void playDrumrollHit(DrawableDrumRollTick drumrollTick)
+        private void addDrumRollHit(DrawableDrumRollTick drawableTick)
         {
-            TaikoAction action = drumrollTick.JudgedAction;
-            bool isStrong = drumrollTick.HitObject.IsStrong;
-            double time = drumrollTick.HitObject.GetEndTime();
+            bool isStrong = drawableTick.HitObject.IsStrong;
+            double time = drawableTick.HitObject.GetEndTime();
 
             DrawableHit drawableHit;
-            if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
+            if (drawableTick.JudgementType == HitType.Rim)
                 drawableHit = new DrawableFlyingRimHit(time, isStrong);
             else
                 drawableHit = new DrawableFlyingCentreHit(time, isStrong);
@@ -239,6 +237,14 @@ namespace osu.Game.Rulesets.Taiko.UI
             drumRollHitContainer.Add(drawableHit);
         }
 
+        private void addExplosion(DrawableHitObject drawableObject, HitType type)
+        {
+            hitExplosionContainer.Add(new HitExplosion(drawableObject, type));
+
+            if (drawableObject.HitObject.Kiai)
+                kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
+        }
+
         private class ProxyContainer : LifetimeManagementContainer
         {
             public new MarginPadding Padding

From 2630fc1405260ce60ad9d7aa533c483d90a91147 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 27 Apr 2020 12:27:43 +0900
Subject: [PATCH 02457/10326] Break instead of return for consistency

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index a19c08ae7e..1fce70122d 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
                 case TaikoDrumRollTickJudgement _:
                     if (!result.IsHit)
-                        return;
+                        break;
 
                     var drawableTick = (DrawableDrumRollTick)judgedObject;
 
@@ -218,7 +218,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                         break;
 
                     addExplosion(judgedObject, (judgedObject.HitObject as Hit)?.Type ?? HitType.Centre);
-
                     break;
             }
         }

From 20ae973e4afba59b5e87645dffbf7964b0ea0676 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 27 Apr 2020 12:29:11 +0900
Subject: [PATCH 02458/10326] Use max result instead of GOOD

---
 .../Objects/Drawables/DrawableFlyingCentreHit.cs               | 3 +--
 .../Objects/Drawables/DrawableFlyingRimHit.cs                  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs
index f70d940bd2..105ff62812 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs
@@ -3,7 +3,6 @@
 
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -12,7 +11,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            ApplyResult(r => r.Type = HitResult.Good);
+            ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
 
         public DrawableFlyingCentreHit(double time, bool isStrong = false)
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs
index 9005dac653..e8cbd6e54f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs
@@ -3,7 +3,6 @@
 
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -12,7 +11,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            ApplyResult(r => r.Type = HitResult.Good);
+            ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
 
         public DrawableFlyingRimHit(double time, bool isStrong = false)

From 7731d45f13ce88392716c640dbdaa79b23d965ce Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 26 Apr 2020 20:30:56 -0700
Subject: [PATCH 02459/10326] Remove unnecessary usings

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 769c660f48..ec6ee6bc83 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -14,8 +14,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Mods.Sections;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mania;
-using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;

From ff736a22dd9f4e1835b07ec8f25c7507045ed8b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Apr 2020 14:41:19 +0900
Subject: [PATCH 02460/10326] Fix typos in comment

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 1fce70122d..cd05d8e2f9 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -150,8 +150,8 @@ namespace osu.Game.Rulesets.Taiko.UI
             rightArea.Padding = new MarginPadding { Left = leftArea.DrawWidth };
             hitTargetOffsetContent.Padding = new MarginPadding { Left = HitTarget.DrawWidth / 2 };
 
-            // When rewinding, make sure to remove any auxilliary hit notes that were
-            // spawned and played during a drumroll.
+            // When rewinding, make sure to remove any auxiliary hit notes that were
+            // spawned and played during a drum roll.
             if (Time.Elapsed < 0)
             {
                 foreach (var o in drumRollHitContainer.Objects)

From b9f28c83731a4ca823c0090f654fab57d9da979f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Apr 2020 16:13:28 +0900
Subject: [PATCH 02461/10326] Combine hit types and remove old drumroll hits
 using a more efficient method

---
 .../Skinning/TestSceneDrawableHit.cs          | 10 +++---
 .../TestSceneHits.cs                          |  4 +--
 .../Objects/Drawables/DrawableCentreHit.cs    | 21 -----------
 ...lyingCentreHit.cs => DrawableFlyingHit.cs} |  7 ++--
 .../Objects/Drawables/DrawableFlyingRimHit.cs | 23 ------------
 .../Objects/Drawables/DrawableHit.cs          | 26 +++++++++-----
 .../Objects/Drawables/DrawableRimHit.cs       | 21 -----------
 .../UI/DrawableTaikoRuleset.cs                |  5 +--
 .../UI/DrumRollHitContainer.cs                | 35 +++++++++++++++++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 28 ++-------------
 10 files changed, 67 insertions(+), 113 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
 rename osu.Game.Rulesets.Taiko/Objects/Drawables/{DrawableFlyingCentreHit.cs => DrawableFlyingHit.cs} (72%)
 delete mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs
 delete mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
 create mode 100644 osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
index 6d6da1fb5b..6a3c98a514 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
         {
             typeof(DrawableHit),
-            typeof(DrawableCentreHit),
-            typeof(DrawableRimHit),
             typeof(LegacyHit),
             typeof(LegacyCirclePiece),
         }).ToList();
@@ -30,25 +28,25 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddStep("Centre hit", () => SetContents(() => new DrawableCentreHit(createHitAtCurrentTime())
+            AddStep("Centre hit", () => SetContents(() => new DrawableHit(createHitAtCurrentTime())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             }));
 
-            AddStep("Centre hit (strong)", () => SetContents(() => new DrawableCentreHit(createHitAtCurrentTime(true))
+            AddStep("Centre hit (strong)", () => SetContents(() => new DrawableHit(createHitAtCurrentTime(true))
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             }));
 
-            AddStep("Rim hit", () => SetContents(() => new DrawableRimHit(createHitAtCurrentTime())
+            AddStep("Rim hit", () => SetContents(() => new DrawableHit(createHitAtCurrentTime())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             }));
 
-            AddStep("Rim hit (strong)", () => SetContents(() => new DrawableRimHit(createHitAtCurrentTime(true))
+            AddStep("Rim hit (strong)", () => SetContents(() => new DrawableHit(createHitAtCurrentTime(true))
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 1822180795..23adb79083 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -224,7 +224,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            drawableRuleset.Playfield.Add(new DrawableCentreHit(h));
+            drawableRuleset.Playfield.Add(new DrawableHit(h));
         }
 
         private void addRimHit(bool strong)
@@ -237,7 +237,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            drawableRuleset.Playfield.Add(new DrawableRimHit(h));
+            drawableRuleset.Playfield.Add(new DrawableHit(h));
         }
 
         private class TestStrongNestedHit : DrawableStrongNestedHit
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
deleted file mode 100644
index a87da44415..0000000000
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ /dev/null
@@ -1,21 +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.Taiko.Objects.Drawables.Pieces;
-using osu.Game.Skinning;
-
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables
-{
-    public class DrawableCentreHit : DrawableHit
-    {
-        public override TaikoAction[] HitActions { get; } = { TaikoAction.LeftCentre, TaikoAction.RightCentre };
-
-        public DrawableCentreHit(Hit hit)
-            : base(hit)
-        {
-        }
-
-        protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.CentreHit),
-            _ => new CentreHitCirclePiece(), confineMode: ConfineMode.ScaleToFit);
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
similarity index 72%
rename from osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs
rename to osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
index 105ff62812..86822e3ae8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
@@ -6,7 +6,10 @@ using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableFlyingCentreHit : DrawableCentreHit
+    /// <summary>
+    /// A hit used specifically for drum rolls, where spawning flying hits is required.
+    /// </summary>
+    public class DrawableFlyingHit : DrawableHit
     {
         protected override void LoadComplete()
         {
@@ -14,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
 
-        public DrawableFlyingCentreHit(double time, bool isStrong = false)
+        public DrawableFlyingHit(double time, bool isStrong = false)
             : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
         {
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs
deleted file mode 100644
index e8cbd6e54f..0000000000
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingRimHit.cs
+++ /dev/null
@@ -1,23 +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.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables
-{
-    public class DrawableFlyingRimHit : DrawableRimHit
-    {
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            ApplyResult(r => r.Type = r.Judgement.MaxResult);
-        }
-
-        public DrawableFlyingRimHit(double time, bool isStrong = false)
-            : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
-        {
-            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index fe9a89f2be..d2671eadda 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -8,31 +8,45 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public abstract class DrawableHit : DrawableTaikoHitObject<Hit>
+    public class DrawableHit : DrawableTaikoHitObject<Hit>
     {
         /// <summary>
         /// A list of keys which can result in hits for this HitObject.
         /// </summary>
-        public abstract TaikoAction[] HitActions { get; }
+        public TaikoAction[] HitActions { get; }
 
         /// <summary>
         /// The action that caused this <see cref="DrawableHit"/> to be hit.
         /// </summary>
-        public TaikoAction? HitAction { get; private set; }
+        public TaikoAction? HitAction
+        {
+            get;
+            private set;
+        }
 
         private bool validActionPressed;
 
         private bool pressHandledThisFrame;
 
-        protected DrawableHit(Hit hit)
+        public DrawableHit(Hit hit)
             : base(hit)
         {
             FillMode = FillMode.Fit;
+
+            HitActions =
+                HitObject.Type == HitType.Centre
+                    ? new[] { TaikoAction.LeftCentre, TaikoAction.RightCentre }
+                    : new[] { TaikoAction.LeftRim, TaikoAction.RightRim };
         }
 
+        protected override SkinnableDrawable CreateMainPiece() => HitObject.Type == HitType.Centre
+            ? new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.CentreHit), _ => new CentreHitCirclePiece(), confineMode: ConfineMode.ScaleToFit)
+            : new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.RimHit), _ => new RimHitCirclePiece(), confineMode: ConfineMode.ScaleToFit);
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             Debug.Assert(HitObject.HitWindows != null);
@@ -58,7 +72,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             if (pressHandledThisFrame)
                 return true;
-
             if (Judged)
                 return false;
 
@@ -66,14 +79,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             // Only count this as handled if the new judgement is a hit
             var result = UpdateResult(true);
-
             if (IsHit)
                 HitAction = action;
 
             // Regardless of whether we've hit or not, any secondary key presses in the same frame should be discarded
             // E.g. hitting a non-strong centre as a strong should not fall through and perform a hit on the next note
             pressHandledThisFrame = true;
-
             return result;
         }
 
@@ -81,7 +92,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             if (action == HitAction)
                 HitAction = null;
-
             base.OnReleased(action);
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
deleted file mode 100644
index f767403c65..0000000000
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ /dev/null
@@ -1,21 +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.Taiko.Objects.Drawables.Pieces;
-using osu.Game.Skinning;
-
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables
-{
-    public class DrawableRimHit : DrawableHit
-    {
-        public override TaikoAction[] HitActions { get; } = { TaikoAction.LeftRim, TaikoAction.RightRim };
-
-        public DrawableRimHit(Hit hit)
-            : base(hit)
-        {
-        }
-
-        protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.RimHit),
-            _ => new RimHitCirclePiece(), confineMode: ConfineMode.ScaleToFit);
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index e4a4b555a7..a6a00fe242 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -49,10 +49,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             switch (h)
             {
                 case Hit hit:
-                    if (hit.Type == HitType.Centre)
-                        return new DrawableCentreHit(hit);
-                    else
-                        return new DrawableRimHit(hit);
+                    return new DrawableHit(hit);
 
                 case DrumRoll drumRoll:
                     return new DrawableDrumRoll(drumRoll);
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
new file mode 100644
index 0000000000..9ef944b412
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.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.Containers;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    internal class DrumRollHitContainer : ScrollingHitObjectContainer
+    {
+        protected override void Update()
+        {
+            base.Update();
+
+            // Remove any auxiliary hit notes that were spawned during a drum roll but subsequently rewound.
+            for (var i = AliveInternalChildren.Count - 1; i >= 0; i--)
+            {
+                var flyingHit = (DrawableFlyingHit)AliveInternalChildren[i];
+                if (Time.Current < flyingHit.HitObject.StartTime)
+                    Remove(flyingHit);
+            }
+        }
+
+        protected override void OnChildLifetimeBoundaryCrossed(LifetimeBoundaryCrossedEvent e)
+        {
+            base.OnChildLifetimeBoundaryCrossed(e);
+
+            // ensure all old hits are removed on becoming alive (may miss being in the AliveInternalChildren list above).
+            if (e.Kind == LifetimeBoundaryKind.Start && e.Direction == LifetimeBoundaryCrossingDirection.Backward)
+                Remove((DrawableHitObject)e.Child);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index cd05d8e2f9..28706ef0d3 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -93,10 +93,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                                     Children = new Drawable[]
                                     {
                                         HitObjectContainer,
-                                        drumRollHitContainer = new ScrollingHitObjectContainer
-                                        {
-                                            Name = "Drumroll hit"
-                                        }
+                                        drumRollHitContainer = new DrumRollHitContainer()
                                     }
                                 },
                                 kiaiExplosionContainer = new Container<KiaiHitExplosion>
@@ -149,23 +146,11 @@ namespace osu.Game.Rulesets.Taiko.UI
             // This is basically allowing for correct alignment as relative pieces move around them.
             rightArea.Padding = new MarginPadding { Left = leftArea.DrawWidth };
             hitTargetOffsetContent.Padding = new MarginPadding { Left = HitTarget.DrawWidth / 2 };
-
-            // When rewinding, make sure to remove any auxiliary hit notes that were
-            // spawned and played during a drum roll.
-            if (Time.Elapsed < 0)
-            {
-                foreach (var o in drumRollHitContainer.Objects)
-                {
-                    if (o.HitObject.StartTime >= Time.Current)
-                        drumRollHitContainer.Remove(o);
-                }
-            }
         }
 
         public override void Add(DrawableHitObject h)
         {
             h.OnNewResult += OnNewResult;
-
             base.Add(h);
 
             switch (h)
@@ -184,7 +169,6 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             if (!DisplayJudgements.Value)
                 return;
-
             if (!judgedObject.DisplayResult)
                 return;
 
@@ -226,20 +210,12 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             bool isStrong = drawableTick.HitObject.IsStrong;
             double time = drawableTick.HitObject.GetEndTime();
-
-            DrawableHit drawableHit;
-            if (drawableTick.JudgementType == HitType.Rim)
-                drawableHit = new DrawableFlyingRimHit(time, isStrong);
-            else
-                drawableHit = new DrawableFlyingCentreHit(time, isStrong);
-
-            drumRollHitContainer.Add(drawableHit);
+            drumRollHitContainer.Add(new DrawableFlyingHit(time, isStrong));
         }
 
         private void addExplosion(DrawableHitObject drawableObject, HitType type)
         {
             hitExplosionContainer.Add(new HitExplosion(drawableObject, type));
-
             if (drawableObject.HitObject.Kiai)
                 kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
         }

From 52cf1e18590fbef3e2f221e19a2dc126af2f4ad5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Apr 2020 16:48:17 +0900
Subject: [PATCH 02462/10326] Fix hit type not being provided and hit time
 offset not being considered

---
 .../Objects/Drawables/DrawableFlyingHit.cs      | 17 +++++++++++------
 .../UI/DrumRollHitContainer.cs                  |  2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs    |  9 ++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
index 86822e3ae8..460e760629 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
@@ -11,16 +11,21 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     /// </summary>
     public class DrawableFlyingHit : DrawableHit
     {
+        public DrawableFlyingHit(DrawableDrumRollTick drumRollTick)
+            : base(new IgnoreHit
+            {
+                StartTime = drumRollTick.HitObject.StartTime + drumRollTick.Result.TimeOffset,
+                IsStrong = drumRollTick.HitObject.IsStrong,
+                Type = drumRollTick.JudgementType
+            })
+        {
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
             ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
-
-        public DrawableFlyingHit(double time, bool isStrong = false)
-            : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
-        {
-            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
index 9ef944b412..fde42bec04 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             for (var i = AliveInternalChildren.Count - 1; i >= 0; i--)
             {
                 var flyingHit = (DrawableFlyingHit)AliveInternalChildren[i];
-                if (Time.Current < flyingHit.HitObject.StartTime)
+                if (Time.Current <= flyingHit.HitObject.StartTime)
                     Remove(flyingHit);
             }
         }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 28706ef0d3..4bc6cb8e4b 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -9,7 +9,6 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
@@ -206,12 +205,8 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
-        private void addDrumRollHit(DrawableDrumRollTick drawableTick)
-        {
-            bool isStrong = drawableTick.HitObject.IsStrong;
-            double time = drawableTick.HitObject.GetEndTime();
-            drumRollHitContainer.Add(new DrawableFlyingHit(time, isStrong));
-        }
+        private void addDrumRollHit(DrawableDrumRollTick drawableTick) =>
+            drumRollHitContainer.Add(new DrawableFlyingHit(drawableTick));
 
         private void addExplosion(DrawableHitObject drawableObject, HitType type)
         {

From acf95fca9cdd8b12027d907838738fa0216845b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 27 Apr 2020 17:14:00 +0900
Subject: [PATCH 02463/10326] Remove old, now unnecessary method

---
 .../Edit/ManiaSelectionHandler.cs             | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 78f159b733..d290e4ec24 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -35,35 +35,12 @@ namespace osu.Game.Rulesets.Mania.Edit
             var maniaBlueprint = (ManiaSelectionBlueprint)moveEvent.Blueprint;
             int lastColumn = maniaBlueprint.DrawableObject.HitObject.Column;
 
-            // adjustOrigins(maniaBlueprint);
             performDragMovement(moveEvent);
             performColumnMovement(lastColumn, moveEvent);
 
             return true;
         }
 
-        /// <summary>
-        /// Ensures that the position of hitobjects remains centred to the mouse position.
-        /// E.g. The hitobject position will change if the editor scrolls while a hitobject is dragged.
-        /// </summary>
-        /// <param name="reference">The <see cref="ManiaSelectionBlueprint"/> that received the drag event.</param>
-        private void adjustOrigins(ManiaSelectionBlueprint reference)
-        {
-            var referenceParent = (HitObjectContainer)reference.DrawableObject.Parent;
-
-            float offsetFromReferenceOrigin = reference.DragPosition.Y - reference.DrawableObject.OriginPosition.Y;
-            float targetPosition = referenceParent.ToLocalSpace(reference.ScreenSpaceDragPosition).Y - offsetFromReferenceOrigin;
-
-            // Flip the vertical coordinate space when scrolling downwards
-            if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
-                targetPosition -= referenceParent.DrawHeight;
-
-            float movementDelta = targetPosition - reference.DrawableObject.Position.Y;
-
-            foreach (var b in SelectedBlueprints.OfType<ManiaSelectionBlueprint>())
-                b.DrawableObject.Y += movementDelta;
-        }
-
         private void performDragMovement(MoveSelectionEvent moveEvent)
         {
             float delta = moveEvent.InstantDelta.Y;

From 03863d901b221e31baa22af9f65de9490ae276d4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Apr 2020 08:59:09 +0000
Subject: [PATCH 02464/10326] Bump Microsoft.NET.Test.Sdk from 16.5.0 to 16.6.1

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.5.0 to 16.6.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.5.0...v16.6.1)

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 8c371db257..cbd3dc5518 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.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference 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 6855b99f28..77c871718b 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.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference 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 217707b180..2fcfa1deb7 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.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference 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 f6054a5d6f..28b8476a22 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.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference 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 35eb3fa161..5ee887cb64 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.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference 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 3b45fc83fd..aa37326a49 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.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
   </ItemGroup>

From c0b225ffc8e5c27bc4c624468994f61b698daab5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Apr 2020 08:59:34 +0000
Subject: [PATCH 02465/10326] Bump ppy.osu.Game.Resources from 2020.412.0 to
 2020.427.0

Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2020.412.0 to 2020.427.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2020.412.0...2020.427.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 25942863c5..73fbe3ab2e 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.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.421.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9c17c453a6..3b05eb82d7 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,7 @@
     <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.421.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 07ea4b9c2a..f3202693f3 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.421.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From ca055581af91975ed44438b25863ad0b33c7e9c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Apr 2020 18:18:11 +0900
Subject: [PATCH 02466/10326] Fix taiko hit target alpha on legacy skins

---
 osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
index 7c1e65f569..e522fb7c10 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     {
                         Texture = skin.GetTexture("approachcircle"),
                         Scale = new Vector2(0.73f),
-                        Alpha = 0.7f,
+                        Alpha = 0.47f, // eyeballed to match stable
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                     },
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     {
                         Texture = skin.GetTexture("taikobigcircle"),
                         Scale = new Vector2(0.7f),
-                        Alpha = 0.5f,
+                        Alpha = 0.22f, // eyeballed to match stable
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                     },

From b88dd442526c8a58a9bd992101b5d7b5da33e3a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 27 Apr 2020 19:47:25 +0900
Subject: [PATCH 02467/10326] Fix movement not working correctly in down-scroll

---
 .../Blueprints/ManiaSelectionBlueprint.cs     | 20 +++++++++++++++++++
 .../Edit/ManiaSelectionHandler.cs             | 19 +++++++-----------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 9f57160f99..14d52dd08e 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -74,5 +74,25 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             DrawableObject.AlwaysAlive = false;
             base.Hide();
         }
+
+        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition)
+        {
+            var baseDelta = base.GetInstantDelta(screenSpacePosition);
+
+            if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
+            {
+                // The parent of DrawableObject is the scrolling hitobject container (SHOC).
+                // In the coordinate-space of the SHOC, the screen-space position at the hit target is equal to the height of the SHOC,
+                // but this is not what we want as it means a slight movement downwards results in a delta greater than the height of the SHOC.
+                // To get around this issue, the height of the SHOC is subtracted from the delta.
+                //
+                // Ideally this should be a _negative_ value in the case described above, however this code gives a _positive_ delta.
+                // This is intentional as the delta is added to the hitobject's position (see: ManiaSelectionHandler) and a negative delta would move them towards the top of the screen instead,
+                // which would cause the delta to get increasingly larger as additional movements are performed.
+                return new Vector2(baseDelta.X, baseDelta.Y - DrawableObject.Parent.DrawHeight);
+            }
+
+            return baseDelta;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index d290e4ec24..8dfc97f87a 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -45,11 +45,6 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
             float delta = moveEvent.InstantDelta.Y;
 
-            // When scrolling downwards the anchor position is at the bottom of the screen, however the movement event assumes the anchor is at the top of the screen.
-            // This causes the delta to assume a positive hitobject position, and which can be corrected for by subtracting the parent height.
-            if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
-                delta -= moveEvent.Blueprint.Parent.DrawHeight; // todo: definitely wrong
-
             foreach (var selectionBlueprint in SelectedBlueprints)
             {
                 var b = (OverlaySelectionBlueprint)selectionBlueprint;
@@ -57,24 +52,24 @@ namespace osu.Game.Rulesets.Mania.Edit
                 var hitObject = b.DrawableObject;
                 var objectParent = (HitObjectContainer)hitObject.Parent;
 
-                // StartTime could be used to adjust the position if only one movement event was received per frame.
-                // However this is not the case and ScrollingHitObjectContainer performs movement in UpdateAfterChildren() so the position must also be updated to be valid for further movement events
+                // We receive multiple movement events per frame such that we can't rely on updating the start time
+                // since the scrolling hitobject container requires at least one update frame to update the position.
+                // However the position needs to be valid for future movement events to calculate the correct deltas.
                 hitObject.Y += delta;
 
                 float targetPosition = hitObject.Position.Y;
 
-                // The scrolling algorithm always assumes an anchor at the top of the screen, so the position must be flipped when scrolling downwards to reflect a top anchor
                 if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
+                {
+                    // When scrolling downwards, the position is _negative_ when the object's start time is after the current time (e.g. in the middle of the stage).
+                    // However all scrolling algorithms upwards scrolling, meaning that a positive (inverse) position is expected in the same scenario.
                     targetPosition = -targetPosition;
-
-                objectParent.Remove(hitObject);
+                }
 
                 hitObject.HitObject.StartTime = scrollingInfo.Algorithm.TimeAt(targetPosition,
                     editorClock.CurrentTime,
                     scrollingInfo.TimeRange.Value,
                     objectParent.DrawHeight);
-
-                objectParent.Add(hitObject);
             }
         }
 

From ece6e2db5cca33bacff5301804a18cc6b9dd3eaa Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 27 Apr 2020 13:12:31 +0200
Subject: [PATCH 02468/10326] Change removed class

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index d11bfa05ba..93b5803e87 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -193,7 +193,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         private void addJudgement(TaikoPlayfield playfield, HitResult result)
         {
-            playfield.OnNewResult(new DrawableRimHit(new Hit()), new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = result });
+            playfield.OnNewResult(new DrawableHit(new Hit()), new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = result });
         }
 
         private class TestDrawableTaikoMascot : DrawableTaikoMascot

From cebc0fc0466d61db6f22c19358c8d22ce5f12d09 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 27 Apr 2020 20:35:24 +0900
Subject: [PATCH 02469/10326] Attempt to fix multiple selection movements

---
 .../Edit/ManiaHitObjectComposer.cs            | 28 ++++++++++++++++++-
 .../Edit/ManiaSelectionHandler.cs             | 14 ----------
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs  | 16 +++++++++++
 .../Compose/Components/BlueprintContainer.cs  | 10 +++----
 4 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 62b609610f..8d012c63ac 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
@@ -37,7 +38,32 @@ namespace osu.Game.Rulesets.Mania.Edit
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-        public int TotalColumns => ((ManiaPlayfield)drawableRuleset.Playfield).TotalColumns;
+        public ManiaPlayfield Playfield => ((ManiaPlayfield)drawableRuleset.Playfield);
+
+        public int TotalColumns => Playfield.TotalColumns;
+
+        public override (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time)
+        {
+            var hoc = Playfield.GetColumn(0).HitObjectContainer;
+
+            position.Y -= ToLocalSpace(hoc.ScreenSpaceDrawQuad.TopLeft).Y;
+
+            float targetPosition = position.Y;
+
+            if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
+            {
+                // When scrolling downwards, the position is _negative_ when the object's start time is after the current time (e.g. in the middle of the stage).
+                // However all scrolling algorithms upwards scrolling, meaning that a positive (inverse) position is expected in the same scenario.
+                targetPosition = -targetPosition;
+            }
+
+            double targetTime = drawableRuleset.ScrollingInfo.Algorithm.TimeAt(targetPosition,
+                EditorClock.CurrentTime,
+                drawableRuleset.ScrollingInfo.TimeRange.Value,
+                hoc.DrawHeight);
+
+            return base.GetSnappedPosition(position, targetTime);
+        }
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
         {
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 8dfc97f87a..989e0f5b01 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -56,20 +56,6 @@ namespace osu.Game.Rulesets.Mania.Edit
                 // since the scrolling hitobject container requires at least one update frame to update the position.
                 // However the position needs to be valid for future movement events to calculate the correct deltas.
                 hitObject.Y += delta;
-
-                float targetPosition = hitObject.Position.Y;
-
-                if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
-                {
-                    // When scrolling downwards, the position is _negative_ when the object's start time is after the current time (e.g. in the middle of the stage).
-                    // However all scrolling algorithms upwards scrolling, meaning that a positive (inverse) position is expected in the same scenario.
-                    targetPosition = -targetPosition;
-                }
-
-                hitObject.HitObject.StartTime = scrollingInfo.Algorithm.TimeAt(targetPosition,
-                    editorClock.CurrentTime,
-                    scrollingInfo.TimeRange.Value,
-                    objectParent.DrawHeight);
             }
         }
 
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index 2dec468654..f9faa262ed 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -87,6 +87,22 @@ namespace osu.Game.Rulesets.Mania.UI
             return found;
         }
 
+        public Column GetColumn(int index)
+        {
+            foreach (var stage in stages)
+            {
+                if (index >= stage.Columns.Count)
+                {
+                    index -= stage.Columns.Count;
+                    continue;
+                }
+
+                return stage.Columns[index];
+            }
+
+            throw new ArgumentOutOfRangeException(nameof(index));
+        }
+
         /// <summary>
         /// Retrieves the total amount of columns across all stages in this playfield.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 0823be01f8..8910684463 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -401,18 +401,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             HitObject draggedObject = movementBlueprint.HitObject;
 
-            // The final movement position, relative to movementBlueprintOriginalPosition
+            // The final movement position, relative to movementBlueprintOriginalPosition.
             Vector2 movePosition = movementBlueprintOriginalPosition.Value + e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
 
-            (Vector2 snappedPosition, _) = snapProvider.GetSnappedPosition(ToLocalSpace(movePosition), draggedObject.StartTime);
+            // Retrieve a snapped position.
+            (Vector2 snappedPosition, double snappedTime) = snapProvider.GetSnappedPosition(ToLocalSpace(movePosition), draggedObject.StartTime);
 
-            // Move the hitobjects
+            // Move the hitobjects.
             if (!selectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, ToScreenSpace(snappedPosition))))
                 return true;
 
-            // Todo: Temp
-            (_, double snappedTime) = snapProvider.GetSnappedPosition(ToLocalSpace(snappedPosition), draggedObject.StartTime);
-
             // Apply the start time at the newly snapped-to position
             double offset = snappedTime - draggedObject.StartTime;
             foreach (HitObject obj in selectionHandler.SelectedHitObjects)

From be59ee945a5ead6fe5d8d7cbeaad058e8180bf7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Apr 2020 22:22:32 +0900
Subject: [PATCH 02470/10326] Add taiko hit explosion skinning support

---
 .../Skinning/TestSceneHitExplosion.cs         | 79 +++++++++++++++++++
 .../Skinning/LegacyHitExplosion.cs            | 29 +++++++
 .../Skinning/TaikoLegacySkinTransformer.cs    | 27 +++++++
 .../TaikoSkinComponents.cs                    |  5 +-
 .../UI/DefaultHitExplosion.cs                 | 54 +++++++++++++
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs    | 50 ++++++------
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |  7 +-
 7 files changed, 221 insertions(+), 30 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
 create mode 100644 osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
new file mode 100644
index 0000000000..ca0c60b67a
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -0,0 +1,79 @@
+// Copyright (c) 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;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Skinning;
+using osu.Game.Rulesets.Taiko.UI;
+
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
+{
+    [TestFixture]
+    public class TestSceneHitExplosion : TaikoSkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
+        {
+            typeof(HitExplosion),
+            typeof(LegacyHitExplosion),
+            typeof(DefaultHitExplosion),
+        }).ToList();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddStep("Great", () => SetContents(() => getContentFor(HitResult.Great)));
+            AddStep("Good", () => SetContents(() => getContentFor(HitResult.Good)));
+            AddStep("Miss", () => SetContents(() => getContentFor(HitResult.Miss)));
+        }
+
+        private Drawable getContentFor(HitResult type)
+        {
+            DrawableTaikoHitObject hit;
+
+            return new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    hit = createHit(type),
+                    new HitExplosion(hit)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                }
+            };
+        }
+
+        private DrawableTaikoHitObject createHit(HitResult type) => new TestDrawableHit(new Hit { StartTime = Time.Current }, type);
+
+        private class TestDrawableHit : DrawableTaikoHitObject
+        {
+            private readonly HitResult type;
+
+            public TestDrawableHit(Hit hit, HitResult type)
+                : base(hit)
+            {
+                this.type = type;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Result.Type = type;
+            }
+
+            public override bool OnPressed(TaikoAction action) => false;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
new file mode 100644
index 0000000000..d29b574866
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.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.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Rulesets.Taiko.Skinning
+{
+    public class LegacyHitExplosion : CompositeDrawable
+    {
+        public LegacyHitExplosion(Drawable sprite)
+        {
+            InternalChild = sprite;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            AutoSizeAxes = Axes.Both;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            this.FadeIn(120);
+            this.ScaleTo(0.6f).Then().ScaleTo(1, 240, Easing.OutElastic);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 447d6ae455..bea1c6bdcf 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -81,11 +81,38 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                         return new LegacyBarLine();
 
                     return null;
+
+                case TaikoSkinComponents.TaikoExplosionGood:
+                case TaikoSkinComponents.TaikoExplosionGreat:
+                case TaikoSkinComponents.TaikoExplosionMiss:
+
+                    var sprite = this.GetAnimation(getHitname(taikoComponent.Component), true, false);
+                    if (sprite != null)
+                        return new LegacyHitExplosion(sprite);
+
+                    return null;
             }
 
             return source.GetDrawableComponent(component);
         }
 
+        private string getHitname(TaikoSkinComponents component)
+        {
+            switch (component)
+            {
+                case TaikoSkinComponents.TaikoExplosionMiss:
+                    return "taiko-hit0";
+
+                case TaikoSkinComponents.TaikoExplosionGood:
+                    return "taiko-hit100";
+
+                case TaikoSkinComponents.TaikoExplosionGreat:
+                    return "taiko-hit300";
+            }
+
+            return string.Empty;
+        }
+
         public Texture GetTexture(string componentName) => source.GetTexture(componentName);
 
         public SampleChannel GetSample(ISampleInfo sampleInfo) => source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index a90ce608b2..fd091f97d0 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -14,6 +14,9 @@ namespace osu.Game.Rulesets.Taiko
         HitTarget,
         PlayfieldBackgroundLeft,
         PlayfieldBackgroundRight,
-        BarLine
+        BarLine,
+        TaikoExplosionMiss,
+        TaikoExplosionGood,
+        TaikoExplosionGreat,
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
new file mode 100644
index 0000000000..aa444d0494
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Objects;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    internal class DefaultHitExplosion : CircularContainer
+    {
+        [Resolved]
+        private DrawableHitObject judgedObject { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            BorderColour = Color4.White;
+            BorderThickness = 1;
+
+            Alpha = 0.15f;
+            Masking = true;
+
+            if (judgedObject.Result.Type == HitResult.Miss)
+                return;
+
+            bool isRim = (judgedObject.HitObject as Hit)?.Type == HitType.Rim;
+
+            InternalChildren = new[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = isRim ? colours.BlueDarker : colours.PinkDarker,
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            this.ScaleTo(3f, 1000, Easing.OutQuint);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index fbaae7e322..9bef93d834 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -1,15 +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;
 using osuTK;
-using osuTK.Graphics;
 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.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -20,15 +20,12 @@ namespace osu.Game.Rulesets.Taiko.UI
     {
         public override bool RemoveWhenNotAlive => true;
 
+        [Cached(typeof(DrawableHitObject))]
         public readonly DrawableHitObject JudgedObject;
-        private readonly HitType type;
 
-        private readonly Box innerFill;
-
-        public HitExplosion(DrawableHitObject judgedObject, HitType type)
+        public HitExplosion(DrawableHitObject judgedObject)
         {
             JudgedObject = judgedObject;
-            this.type = type;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -37,35 +34,36 @@ namespace osu.Game.Rulesets.Taiko.UI
             Size = new Vector2(TaikoHitObject.DEFAULT_SIZE);
 
             RelativePositionAxes = Axes.Both;
-
-            BorderColour = Color4.White;
-            BorderThickness = 1;
-
-            Alpha = 0.15f;
-            Masking = true;
-
-            Children = new[]
-            {
-                innerFill = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                }
-            };
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
-            innerFill.Colour = type == HitType.Rim ? colours.BlueDarker : colours.PinkDarker;
+            Child = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(JudgedObject.Result?.Type ?? HitResult.Great)), _ => new DefaultHitExplosion());
+        }
+
+        private TaikoSkinComponents getComponentName(HitResult resultType)
+        {
+            switch (resultType)
+            {
+                case HitResult.Miss:
+                    return TaikoSkinComponents.TaikoExplosionMiss;
+
+                case HitResult.Good:
+                    return TaikoSkinComponents.TaikoExplosionGood;
+
+                case HitResult.Great:
+                    return TaikoSkinComponents.TaikoExplosionGreat;
+            }
+
+            throw new ArgumentException("Invalid result type", nameof(resultType));
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            this.ScaleTo(3f, 1000, Easing.OutQuint);
             this.FadeOut(500);
-
             Expire(true);
         }
 
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 4bc6cb8e4b..6a78c0a1fb 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -185,7 +185,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     var drawableTick = (DrawableDrumRollTick)judgedObject;
 
                     addDrumRollHit(drawableTick);
-                    addExplosion(drawableTick, drawableTick.JudgementType);
                     break;
 
                 default:
@@ -200,7 +199,9 @@ namespace osu.Game.Rulesets.Taiko.UI
                     if (!result.IsHit)
                         break;
 
-                    addExplosion(judgedObject, (judgedObject.HitObject as Hit)?.Type ?? HitType.Centre);
+                    var type = (judgedObject.HitObject as Hit)?.Type ?? HitType.Centre;
+
+                    addExplosion(judgedObject, type);
                     break;
             }
         }
@@ -210,7 +211,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private void addExplosion(DrawableHitObject drawableObject, HitType type)
         {
-            hitExplosionContainer.Add(new HitExplosion(drawableObject, type));
+            hitExplosionContainer.Add(new HitExplosion(drawableObject));
             if (drawableObject.HitObject.Kiai)
                 kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
         }

From df55439f8b15d167491fba706987278f50bd4ac0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Apr 2020 23:24:12 +0900
Subject: [PATCH 02471/10326] Remove undetected usings

---
 osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index ca0c60b67a..3a9779c93b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -8,8 +8,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;

From a34ec03efc685c706004fb578da9fddb1f5855d2 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 27 Apr 2020 12:44:20 -0700
Subject: [PATCH 02472/10326] Reword width 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/Overlays/Mods/ModSelectOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 09f4befbc1..b32875f723 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -272,7 +272,7 @@ namespace osu.Game.Overlays.Mods
                                                         Font = OsuFont.GetFont(size: 30, weight: FontWeight.Bold),
                                                         Origin = Anchor.CentreLeft,
                                                         Anchor = Anchor.CentreLeft,
-                                                        Width = 70, // to avoid footer from flowing when clicking mods
+                                                        Width = 70, // to prevent footer from flowing when clicking mods
                                                     },
                                                 },
                                             },

From c0493026500db4fe91dd727176c84c2fcfec383f Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 27 Apr 2020 22:23:04 +0200
Subject: [PATCH 02473/10326] Update
 osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
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.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
index c8e97b9f8b..be1864049a 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     return "kiai";
 
                 default:
-                    throw new ArgumentException($"There's no case for animation state ${state} available", nameof(state));
+                    throw new ArgumentOutOfRangeException(nameof(state), $"There's no case for animation state {state} available");
             }
         }
     }

From 5caa4dedc2cd28b3bbd098a47a80c62349000b43 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 27 Apr 2020 22:27:03 +0200
Subject: [PATCH 02474/10326] Update
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
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.Rulesets.Taiko/UI/DrawableTaikoMascot.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index 2c94f5f1cb..a90bf11af5 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     return failDrawable;
 
                 default:
-                    throw new ArgumentException($"There's no case for animation state ${state} available", nameof(state));
+                    throw new ArgumentOutOfRangeException(nameof(state), $"There's no animation available for state {state}");
             }
         }
 

From 0972442b3a6bbc64845d7a79b926454310c014ef Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 27 Apr 2020 23:17:19 +0200
Subject: [PATCH 02475/10326] Use test scene beatmap bindable

---
 .../.idea/projectSettingsUpdater.xml          |  2 +-
 .../Skinning/TestSceneDrawableTaikoMascot.cs  | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
index 4bb9f4d2a0..7515e76054 100644
--- a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
+++ b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="2" />
+    <option name="vcsConfiguration" value="1" />
   </component>
 </project>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 93b5803e87..3a78ad76a6 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -37,13 +37,18 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             TimeRange = { Value = 5000 },
         };
 
-        [Cached(typeof(IBindable<WorkingBeatmap>))]
-        private Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+        private Bindable<WorkingBeatmap> workingBeatmap;
 
         private readonly List<DrawableTaikoMascot> mascots = new List<DrawableTaikoMascot>();
         private readonly List<TaikoPlayfield> playfields = new List<TaikoPlayfield>();
         private readonly List<DrawableTaikoRuleset> rulesets = new List<DrawableTaikoRuleset>();
 
+        [BackgroundDependencyLoader]
+        private void load(Bindable<WorkingBeatmap> beatmap)
+        {
+            workingBeatmap = beatmap;
+        }
+
         [Test]
         public void TestStateTextures()
         {
@@ -79,7 +84,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 SetContents(() =>
                 {
                     var ruleset = new TaikoRuleset();
-                    var drawableRuleset = new DrawableTaikoRuleset(ruleset, beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
+                    var drawableRuleset = new DrawableTaikoRuleset(ruleset, workingBeatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
                     rulesets.Add(drawableRuleset);
                     return drawableRuleset;
                 });
@@ -110,17 +115,17 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         {
             AddStep("Set beatmap", () => setBeatmap(true));
 
-            AddUntilStep("Wait for beatmap to be loaded", () => beatmap.Value.Track.IsLoaded);
+            AddUntilStep("Wait for beatmap to be loaded", () => workingBeatmap.Value.Track.IsLoaded);
 
             AddStep("Create kiai ruleset", () =>
             {
-                beatmap.Value.Track.Start();
+                workingBeatmap.Value.Track.Start();
 
                 rulesets.Clear();
                 SetContents(() =>
                 {
                     var ruleset = new TaikoRuleset();
-                    var drawableRuleset = new DrawableTaikoRuleset(ruleset, beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
+                    var drawableRuleset = new DrawableTaikoRuleset(ruleset, workingBeatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
                     rulesets.Add(drawableRuleset);
                     return drawableRuleset;
                 });
@@ -148,7 +153,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             if (kiai)
                 controlPointInfo.Add(0, new EffectControlPoint { KiaiMode = true });
 
-            beatmap.Value = CreateWorkingBeatmap(new Beatmap
+            workingBeatmap.Value = CreateWorkingBeatmap(new Beatmap
             {
                 HitObjects = new List<HitObject> { new Hit { Type = HitType.Centre } },
                 BeatmapInfo = new BeatmapInfo

From c8ee941952c9e9de3c55dae188e40037f1a2366f Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 27 Apr 2020 23:17:33 +0200
Subject: [PATCH 02476/10326] Fix formatting

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 3a78ad76a6..a0ab3e5c25 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -180,7 +180,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         private void collectPlayfields()
         {
             playfields.Clear();
-            foreach (var ruleset in rulesets) playfields.Add(ruleset.ChildrenOfType<TaikoPlayfield>().Single());
+            foreach (var ruleset in rulesets)
+                playfields.Add(ruleset.ChildrenOfType<TaikoPlayfield>().Single());
         }
 
         private void collectMascots()

From 9b3c1e41267e5e6f59effceddcb361f17df54490 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 27 Apr 2020 23:17:52 +0200
Subject: [PATCH 02477/10326] Remove unused bindables

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 020df5e9e4..d94503fa67 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -3,7 +3,6 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
@@ -44,8 +43,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private SkinnableDrawable mascotDrawable;
 
-        private Bindable<double> frameTime = new Bindable<double>(100);
-
         public TaikoPlayfield(ControlPointInfo controlPoints)
         {
             this.controlPoints = controlPoints;

From 834eeb6d9862fdd1f0badc6125b1ae5a0007d70e Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 27 Apr 2020 23:18:26 +0200
Subject: [PATCH 02478/10326] Reduce duplicate texture retrieval code

---
 .../UI/TaikoMascotTextureAnimation.cs         | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
index c8e97b9f8b..6fc8df66ae 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
@@ -5,7 +5,6 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.UI
@@ -40,30 +39,33 @@ namespace osu.Game.Rulesets.Taiko.UI
             {
                 foreach (var textureIndex in clear_animation_sequence)
                 {
-                    var textureName = getStateTextureName(textureIndex);
-                    Texture texture = skin.GetTexture(textureName);
-
-                    if (texture == null)
+                    if (!addFrame(skin, textureIndex))
                         break;
-
-                    AddFrame(texture);
                 }
             }
             else
             {
                 for (int i = 0; true; i++)
                 {
-                    var textureName = getStateTextureName(i);
-                    Texture texture = skin.GetTexture(textureName);
-
-                    if (texture == null)
+                    if (!addFrame(skin, i))
                         break;
-
-                    AddFrame(texture);
                 }
             }
         }
 
+        private bool addFrame(ISkinSource skin, int textureIndex)
+        {
+            var textureName = getStateTextureName(textureIndex);
+            var texture = skin.GetTexture(textureName);
+
+            if (texture == null)
+                return false;
+
+            AddFrame(texture);
+
+            return true;
+        }
+
         /// <summary>
         /// Advances the current frame by one.
         /// </summary>

From 96660b2cca73a642f07cb35e0dd8e5bfd22cb89a Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 27 Apr 2020 23:18:40 +0200
Subject: [PATCH 02479/10326] Flip frame count check

---
 osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
index 6fc8df66ae..6ceb5cd08e 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             if (FrameCount == 0)
                 return;
 
-            if (FrameCount <= currentFrame)
+            if (currentFrame >= FrameCount)
                 currentFrame = 0;
 
             GotoFrame(currentFrame);

From 74d36cad784f2c1c3f3ca94f6eca84745d4b50f0 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 27 Apr 2020 23:19:18 +0200
Subject: [PATCH 02480/10326] Change state variables

---
 .../UI/DrawableTaikoMascot.cs                 | 27 +++++++++++--------
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index 2c94f5f1cb..e66a045881 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -4,7 +4,6 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps.ControlPoints;
@@ -16,8 +15,7 @@ namespace osu.Game.Rulesets.Taiko.UI
     {
         private TaikoMascotTextureAnimation idleDrawable, clearDrawable, kiaiDrawable, failDrawable;
         private EffectControlPoint lastEffectControlPoint;
-
-        public Bindable<TaikoMascotAnimationState> PlayfieldState;
+        private TaikoMascotAnimationState playfieldState;
 
         public TaikoMascotAnimationState State { get; private set; }
 
@@ -25,13 +23,6 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             RelativeSizeAxes = Axes.Both;
 
-            PlayfieldState = new Bindable<TaikoMascotAnimationState>();
-            PlayfieldState.BindValueChanged(b =>
-            {
-                if (lastEffectControlPoint != null)
-                    ShowState(GetFinalAnimationState(lastEffectControlPoint, b.NewValue));
-            });
-
             State = startingState;
         }
 
@@ -60,6 +51,20 @@ namespace osu.Game.Rulesets.Taiko.UI
             drawable.Show();
         }
 
+        /// <summary>
+        /// Sets the playfield state used for determining the final state.
+        /// </summary>
+        /// <remarks>
+        /// If you're looking to change the state manually, please look at <see cref="ShowState"/>.
+        /// </remarks>
+        public void SetPlayfieldState(TaikoMascotAnimationState state)
+        {
+            playfieldState = state;
+
+            if (lastEffectControlPoint != null)
+                ShowState(GetFinalAnimationState(lastEffectControlPoint, playfieldState));
+        }
+
         private TaikoMascotTextureAnimation getStateDrawable(TaikoMascotAnimationState state)
         {
             switch (state)
@@ -93,7 +98,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
-            var state = GetFinalAnimationState(lastEffectControlPoint = effectPoint, PlayfieldState.Value);
+            var state = GetFinalAnimationState(lastEffectControlPoint = effectPoint, playfieldState);
             ShowState(state);
 
             if (state == TaikoMascotAnimationState.Clear)
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index d94503fa67..41879f173e 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -220,7 +220,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                 if (miss && judgedObject.HitObject is StrongHitObject)
                     miss = result.Judgement.AffectsCombo;
 
-                mascot.PlayfieldState.Value = miss ? TaikoMascotAnimationState.Fail : TaikoMascotAnimationState.Idle;
+                mascot.SetPlayfieldState(miss ? TaikoMascotAnimationState.Fail : TaikoMascotAnimationState.Idle);
             }
         }
 

From f387fe310f04cf87f182961e6209477bb6a9394a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Apr 2020 11:07:31 +0900
Subject: [PATCH 02481/10326] Fix regressing hits test

---
 .../DrawableTestHit.cs                        | 29 +++++++++++++++++++
 .../Skinning/TestSceneHitExplosion.cs         | 21 +-------------
 .../TestSceneHits.cs                          | 12 +++-----
 3 files changed, 34 insertions(+), 28 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
new file mode 100644
index 0000000000..1db07b3244
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.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.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    internal class DrawableTestHit : DrawableTaikoHitObject
+    {
+        private readonly HitResult type;
+
+        public DrawableTestHit(Hit hit, HitResult type = HitResult.Great)
+            : base(hit)
+        {
+            this.type = type;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Result.Type = type;
+        }
+
+        public override bool OnPressed(TaikoAction action) => false;
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index 3a9779c93b..791c438c94 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -53,25 +53,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             };
         }
 
-        private DrawableTaikoHitObject createHit(HitResult type) => new TestDrawableHit(new Hit { StartTime = Time.Current }, type);
-
-        private class TestDrawableHit : DrawableTaikoHitObject
-        {
-            private readonly HitResult type;
-
-            public TestDrawableHit(Hit hit, HitResult type)
-                : base(hit)
-            {
-                this.type = type;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                Result.Type = type;
-            }
-
-            public override bool OnPressed(TaikoAction action) => false;
-        }
+        private DrawableTaikoHitObject createHit(HitResult type) => new DrawableTestHit(new Hit { StartTime = Time.Current }, type);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 23adb79083..44452d70c1 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -149,6 +149,8 @@ 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) };
 
+            Add(h);
+
             ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
         }
 
@@ -164,6 +166,8 @@ 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) };
 
+            Add(h);
+
             ((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 });
         }
@@ -249,13 +253,5 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             public override bool OnPressed(TaikoAction action) => false;
         }
-
-        private class DrawableTestHit : DrawableHitObject<TaikoHitObject>
-        {
-            public DrawableTestHit(TaikoHitObject hitObject)
-                : base(hitObject)
-            {
-            }
-        }
     }
 }

From 84641765c5858976fc2fa43606e77f60d4f7e7f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Apr 2020 11:08:19 +0900
Subject: [PATCH 02482/10326] Adjust exceptions and fix capitalisation

---
 .../Skinning/TaikoLegacySkinTransformer.cs                 | 7 ++++---
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs                 | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index bea1c6bdcf..f0df612e18 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.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.Sample;
 using osu.Framework.Bindables;
@@ -86,7 +87,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 case TaikoSkinComponents.TaikoExplosionGreat:
                 case TaikoSkinComponents.TaikoExplosionMiss:
 
-                    var sprite = this.GetAnimation(getHitname(taikoComponent.Component), true, false);
+                    var sprite = this.GetAnimation(getHitName(taikoComponent.Component), true, false);
                     if (sprite != null)
                         return new LegacyHitExplosion(sprite);
 
@@ -96,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             return source.GetDrawableComponent(component);
         }
 
-        private string getHitname(TaikoSkinComponents component)
+        private string getHitName(TaikoSkinComponents component)
         {
             switch (component)
             {
@@ -110,7 +111,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     return "taiko-hit300";
             }
 
-            return string.Empty;
+            throw new ArgumentOutOfRangeException(nameof(component), "Invalid result type");
         }
 
         public Texture GetTexture(string componentName) => source.GetTexture(componentName);
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index 9bef93d834..35a54d6ea7 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     return TaikoSkinComponents.TaikoExplosionGreat;
             }
 
-            throw new ArgumentException("Invalid result type", nameof(resultType));
+            throw new ArgumentOutOfRangeException(nameof(resultType), "Invalid result type");
         }
 
         protected override void LoadComplete()

From 62be138aa912ca3cd77e53d3df39cff877b3f7f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Apr 2020 11:46:08 +0900
Subject: [PATCH 02483/10326] Avoid calls on MusicController executing before
 it may have finished loading

---
 .../TestSceneNowPlayingOverlay.cs              | 17 +++++++++--------
 osu.Game/Overlays/MusicController.cs           | 18 +++++++++++-------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index 2ea9aec50a..e2913833a7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
@@ -47,18 +47,19 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestPrevTrackBehavior()
         {
-            AddStep(@"Play track", () =>
-            {
-                musicController.NextTrack();
-                currentBeatmap = Beatmap.Value;
-            });
+            AddStep(@"Next track", () => musicController.NextTrack());
+            AddStep("Store track", () => currentBeatmap = Beatmap.Value);
 
             AddStep(@"Seek track to 6 second", () => musicController.SeekTo(6000));
             AddUntilStep(@"Wait for current time to update", () => currentBeatmap.Track.CurrentTime > 5000);
-            AddAssert(@"Check action is restart track", () => musicController.PreviousTrack() == PreviousTrackResult.Restart);
-            AddUntilStep("Wait for current time to update", () => Precision.AlmostEquals(currentBeatmap.Track.CurrentTime, 0));
+
+            AddStep(@"Set previous", () => musicController.PreviousTrack());
+
             AddAssert(@"Check track didn't change", () => currentBeatmap == Beatmap.Value);
-            AddAssert(@"Check action is not restart", () => musicController.PreviousTrack() != PreviousTrackResult.Restart);
+            AddUntilStep("Wait for current time to update", () => currentBeatmap.Track.CurrentTime < 5000);
+
+            AddStep(@"Set previous", () => musicController.PreviousTrack());
+            AddAssert(@"Check track did change", () => currentBeatmap != Beatmap.Value);
         }
     }
 }
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index d788929739..6d269aa944 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -172,10 +172,15 @@ namespace osu.Game.Overlays
         }
 
         /// <summary>
-        /// Play the previous track or restart the current track if it's current time below <see cref="restart_cutoff_point"/>
+        /// Play the previous track or restart the current track if it's current time below <see cref="restart_cutoff_point"/>.
         /// </summary>
-        /// <returns>The <see cref="PreviousTrackResult"/> that indicate the decided action</returns>
-        public PreviousTrackResult PreviousTrack()
+        public void PreviousTrack() => Schedule(() => prev());
+
+        /// <summary>
+        /// Play the previous track or restart the current track if it's current time below <see cref="restart_cutoff_point"/>.
+        /// </summary>
+        /// <returns>The <see cref="PreviousTrackResult"/> that indicate the decided action.</returns>
+        private PreviousTrackResult prev()
         {
             var currentTrackPosition = current?.Track.CurrentTime;
 
@@ -204,8 +209,7 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Play the next random or playlist track.
         /// </summary>
-        /// <returns>Whether the operation was successful.</returns>
-        public bool NextTrack() => next();
+        public void NextTrack() => Schedule(() => next());
 
         private bool next(bool instant = false)
         {
@@ -319,13 +323,13 @@ namespace osu.Game.Overlays
                     return true;
 
                 case GlobalAction.MusicNext:
-                    if (NextTrack())
+                    if (next())
                         onScreenDisplay?.Display(new MusicControllerToast("Next track"));
 
                     return true;
 
                 case GlobalAction.MusicPrev:
-                    switch (PreviousTrack())
+                    switch (prev())
                     {
                         case PreviousTrackResult.Restart:
                             onScreenDisplay?.Display(new MusicControllerToast("Restart track"));

From 4fff08d241a2158da662863426e07fa1f1621f8a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 12:19:39 +0900
Subject: [PATCH 02484/10326] Remove unused using

---
 .../Visual/UserInterface/TestSceneNowPlayingOverlay.cs           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index e2913833a7..9944e6f9d0 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
@@ -4,7 +4,6 @@
 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.Rulesets.Osu;

From 81e73acb1a05863fbda05603e3505a8fe5c79931 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Apr 2020 12:14:22 +0900
Subject: [PATCH 02485/10326] Fix tests failing when not run in certain order

---
 .../TestSceneNowPlayingOverlay.cs             | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index 9944e6f9d0..a9c52bd189 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -43,9 +44,29 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep(@"hide", () => nowPlayingOverlay.Hide());
         }
 
+        [Resolved]
+        private BeatmapManager manager { get; set; }
+
         [Test]
         public void TestPrevTrackBehavior()
         {
+            // ensure we have at least two beatmaps available.
+            AddRepeatStep("import beatmap", () => manager.Import(new BeatmapSetInfo
+            {
+                Beatmaps = new List<BeatmapInfo>
+                {
+                    new BeatmapInfo
+                    {
+                        BaseDifficulty = new BeatmapDifficulty(),
+                    }
+                },
+                Metadata = new BeatmapMetadata
+                {
+                    Artist = "a test map",
+                    Title = "title",
+                }
+            }).Wait(), 5);
+
             AddStep(@"Next track", () => musicController.NextTrack());
             AddStep("Store track", () => currentBeatmap = Beatmap.Value);
 
@@ -54,11 +75,11 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep(@"Set previous", () => musicController.PreviousTrack());
 
-            AddAssert(@"Check track didn't change", () => currentBeatmap == Beatmap.Value);
+            AddAssert(@"Check beatmap didn't change", () => currentBeatmap == Beatmap.Value);
             AddUntilStep("Wait for current time to update", () => currentBeatmap.Track.CurrentTime < 5000);
 
             AddStep(@"Set previous", () => musicController.PreviousTrack());
-            AddAssert(@"Check track did change", () => currentBeatmap != Beatmap.Value);
+            AddAssert(@"Check beatmap did change", () => currentBeatmap != Beatmap.Value);
         }
     }
 }

From 743a92bbbedcd696d7df90bb07dd1bdb049e0b79 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Apr 2020 12:40:56 +0900
Subject: [PATCH 02486/10326] Use a local database for now playing test

---
 .../UserInterface/TestSceneNowPlayingOverlay.cs   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index a9c52bd189..ee922a073a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
@@ -4,9 +4,12 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Graphics;
+using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 
 namespace osu.Game.Tests.Visual.UserInterface
@@ -21,9 +24,14 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private NowPlayingOverlay nowPlayingOverlay;
 
+        private RulesetStore rulesets;
+
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio, GameHost host)
         {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
 
             nowPlayingOverlay = new NowPlayingOverlay
@@ -44,9 +52,10 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep(@"hide", () => nowPlayingOverlay.Hide());
         }
 
-        [Resolved]
         private BeatmapManager manager { get; set; }
 
+        private int importId = 0;
+
         [Test]
         public void TestPrevTrackBehavior()
         {
@@ -62,7 +71,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 },
                 Metadata = new BeatmapMetadata
                 {
-                    Artist = "a test map",
+                    Artist = $"a test map {importId++}",
                     Title = "title",
                 }
             }).Wait(), 5);

From 0d752dc7b847cc162a3076f72c20e487833e724e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Apr 2020 12:55:57 +0900
Subject: [PATCH 02487/10326] Remove redundant initialisation

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index ee922a073a..532744a0fc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private BeatmapManager manager { get; set; }
 
-        private int importId = 0;
+        private int importId;
 
         [Test]
         public void TestPrevTrackBehavior()

From 832fa74a5e06146fc7572b841f7d957c9d44afdc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Apr 2020 13:26:42 +0900
Subject: [PATCH 02488/10326] Reword comment slightly

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b32875f723..3d0ad1a594 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -272,7 +272,7 @@ namespace osu.Game.Overlays.Mods
                                                         Font = OsuFont.GetFont(size: 30, weight: FontWeight.Bold),
                                                         Origin = Anchor.CentreLeft,
                                                         Anchor = Anchor.CentreLeft,
-                                                        Width = 70, // to prevent footer from flowing when clicking mods
+                                                        Width = 70, // make width fixed so reflow doesn't occur when multiplier number changes.
                                                     },
                                                 },
                                             },

From 7342e0015161a7b7e339370ac4aa6aadcee6f3ce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 14:00:14 +0900
Subject: [PATCH 02489/10326] Convert positions to local HOC coordinate space

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 8d012c63ac..b415c9f0c9 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -46,9 +46,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
             var hoc = Playfield.GetColumn(0).HitObjectContainer;
 
-            position.Y -= ToLocalSpace(hoc.ScreenSpaceDrawQuad.TopLeft).Y;
-
-            float targetPosition = position.Y;
+            float targetPosition = hoc.ToLocalSpace(ToScreenSpace(position)).Y;
 
             if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
             {

From da30eafa3020d3c1479e32ca4e37f43e114098ad Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 14:47:45 +0900
Subject: [PATCH 02490/10326] Prevent potential exception

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

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 5062c92afe..7170d425e2 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public PassThroughInputManager KeyBindingInputManager;
 
-        public override double GameplayStartTime => Objects.First().StartTime - 2000;
+        public override double GameplayStartTime => Objects.FirstOrDefault()?.StartTime - 2000 ?? 0;
 
         private readonly Lazy<Playfield> playfield;
 

From d905ef53b37ac287c2072fb8bcb26c8704211c27 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 14:47:52 +0900
Subject: [PATCH 02491/10326] Add test scene for mania composer

---
 .../TestSceneManiaHitObjectComposer.cs        | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
new file mode 100644
index 0000000000..3cd2530f36
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
@@ -0,0 +1,69 @@
+// Copyright (c) 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.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Edit;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Screens.Edit;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public class TestSceneManiaHitObjectComposer : EditorClockTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ManiaBlueprintContainer)
+        };
+
+        [Cached(typeof(EditorBeatmap))]
+        [Cached(typeof(IBeatSnapProvider))]
+        private readonly EditorBeatmap editorBeatmap;
+
+        protected override Container<Drawable> Content { get; }
+
+        private ManiaHitObjectComposer composer;
+
+        public TestSceneManiaHitObjectComposer()
+        {
+            base.Content.Add(new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    editorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition { Columns = 4 }))
+                    {
+                        BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo }
+                    },
+                    Content = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    }
+                },
+            });
+
+            for (int i = 0; i < 10; i++)
+            {
+                editorBeatmap.Add(new Note { StartTime = 100 * i });
+            }
+        }
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Children = new Drawable[]
+            {
+                composer = new ManiaHitObjectComposer(new ManiaRuleset())
+            };
+
+            BeatDivisor.Value = 8;
+        });
+    }
+}

From 330521a2ae7f268b1645c03fc7feab010c48ce74 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 15:34:10 +0900
Subject: [PATCH 02492/10326] Fix lifetime override not working

---
 .../Drawables/DrawableManiaHitObject.cs       | 62 +++++++++++++++++--
 1 file changed, 56 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 88888001b4..a44d8b09aa 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -13,11 +13,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
     public abstract class DrawableManiaHitObject : DrawableHitObject<ManiaHitObject>
     {
-        /// <summary>
-        /// Whether this <see cref="DrawableManiaHitObject"/> should always remain alive.
-        /// </summary>
-        internal bool AlwaysAlive;
-
         /// <summary>
         /// The <see cref="ManiaAction"/> which causes this <see cref="DrawableManiaHitObject{TObject}"/> to be hit.
         /// </summary>
@@ -54,7 +49,62 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             Direction.BindValueChanged(OnDirectionChanged, true);
         }
 
-        protected override bool ShouldBeAlive => AlwaysAlive || base.ShouldBeAlive;
+        private double computedLifetimeStart;
+
+        public override double LifetimeStart
+        {
+            get => base.LifetimeStart;
+            set
+            {
+                computedLifetimeStart = value;
+
+                if (!AlwaysAlive)
+                    base.LifetimeStart = value;
+            }
+        }
+
+        private double computedLifetimeEnd;
+
+        public override double LifetimeEnd
+        {
+            get => base.LifetimeEnd;
+            set
+            {
+                computedLifetimeEnd = value;
+
+                if (!AlwaysAlive)
+                    base.LifetimeEnd = value;
+            }
+        }
+
+        private bool alwaysAlive;
+
+        /// <summary>
+        /// Whether this <see cref="DrawableManiaHitObject"/> should always remain alive.
+        /// </summary>
+        internal bool AlwaysAlive
+        {
+            get => alwaysAlive;
+            set
+            {
+                if (alwaysAlive == value)
+                    return;
+
+                alwaysAlive = value;
+
+                if (value)
+                {
+                    // Set the base lifetimes directly, to avoid mangling the computed lifetimes
+                    base.LifetimeStart = double.MinValue;
+                    base.LifetimeEnd = double.MaxValue;
+                }
+                else
+                {
+                    LifetimeStart = computedLifetimeStart;
+                    LifetimeEnd = computedLifetimeEnd;
+                }
+            }
+        }
 
         protected virtual void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
         {

From 3eb7c8755c1ed9e21a36ab0cee16047aab20f6e1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 15:34:41 +0900
Subject: [PATCH 02493/10326] Cleanup

---
 .../TestSceneManiaHitObjectComposer.cs        |  4 +--
 .../Blueprints/ManiaSelectionBlueprint.cs     | 29 -------------------
 .../Edit/ManiaSelectionHandler.cs             | 11 -------
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
index 3cd2530f36..180ceb94f4 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
@@ -29,8 +29,6 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         protected override Container<Drawable> Content { get; }
 
-        private ManiaHitObjectComposer composer;
-
         public TestSceneManiaHitObjectComposer()
         {
             base.Content.Add(new Container
@@ -60,7 +58,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             Children = new Drawable[]
             {
-                composer = new ManiaHitObjectComposer(new ManiaRuleset())
+                new ManiaHitObjectComposer(new ManiaRuleset())
             };
 
             BeatDivisor.Value = 8;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 14d52dd08e..b03bf7c078 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -3,8 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Input.Events;
-using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -15,13 +13,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
     public class ManiaSelectionBlueprint : OverlaySelectionBlueprint
     {
-        public Vector2 ScreenSpaceDragPosition { get; private set; }
-        public Vector2 DragPosition { get; private set; }
-
         public new DrawableManiaHitObject DrawableObject => (DrawableManiaHitObject)base.DrawableObject;
 
-        protected IClock EditorClock { get; private set; }
-
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
@@ -34,12 +27,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             RelativeSizeAxes = Axes.None;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IAdjustableClock clock)
-        {
-            EditorClock = clock;
-        }
-
         protected override void Update()
         {
             base.Update();
@@ -47,22 +34,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             Position = Parent.ToLocalSpace(DrawableObject.ToScreenSpace(Vector2.Zero));
         }
 
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            ScreenSpaceDragPosition = e.ScreenSpaceMousePosition;
-            DragPosition = DrawableObject.ToLocalSpace(e.ScreenSpaceMousePosition);
-
-            return base.OnMouseDown(e);
-        }
-
-        protected override void OnDrag(DragEvent e)
-        {
-            base.OnDrag(e);
-
-            ScreenSpaceDragPosition = e.ScreenSpaceMousePosition;
-            DragPosition = DrawableObject.ToLocalSpace(e.ScreenSpaceMousePosition);
-        }
-
         public override void Show()
         {
             DrawableObject.AlwaysAlive = true;
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 989e0f5b01..11e9b56a53 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -4,11 +4,9 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -22,14 +20,6 @@ namespace osu.Game.Rulesets.Mania.Edit
         [Resolved]
         private IManiaHitObjectComposer composer { get; set; }
 
-        private IClock editorClock;
-
-        [BackgroundDependencyLoader]
-        private void load(IAdjustableClock clock)
-        {
-            editorClock = clock;
-        }
-
         public override bool HandleMovement(MoveSelectionEvent moveEvent)
         {
             var maniaBlueprint = (ManiaSelectionBlueprint)moveEvent.Blueprint;
@@ -50,7 +40,6 @@ namespace osu.Game.Rulesets.Mania.Edit
                 var b = (OverlaySelectionBlueprint)selectionBlueprint;
 
                 var hitObject = b.DrawableObject;
-                var objectParent = (HitObjectContainer)hitObject.Parent;
 
                 // We receive multiple movement events per frame such that we can't rely on updating the start time
                 // since the scrolling hitobject container requires at least one update frame to update the position.

From 31c3fd86b9ffc1117cff3628a4441309255c504b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Apr 2020 16:22:00 +0900
Subject: [PATCH 02494/10326] Avoid using internal EF methods in tests

---
 osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs b/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
index 2d4587341d..b7b48ec06a 100644
--- a/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
+++ b/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
@@ -1,9 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Internal;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Objects;
@@ -137,7 +137,7 @@ namespace osu.Game.Tests.Beatmaps
             var hitCircle = new HitCircle { StartTime = 1000 };
             editorBeatmap.Add(hitCircle);
             Assert.That(editorBeatmap.HitObjects.Count(h => h == hitCircle), Is.EqualTo(1));
-            Assert.That(editorBeatmap.HitObjects.IndexOf(hitCircle), Is.EqualTo(3));
+            Assert.That(Array.IndexOf(editorBeatmap.HitObjects.ToArray(), hitCircle), Is.EqualTo(3));
         }
 
         /// <summary>
@@ -161,7 +161,7 @@ namespace osu.Game.Tests.Beatmaps
 
             hitCircle.StartTime = 0;
             Assert.That(editorBeatmap.HitObjects.Count(h => h == hitCircle), Is.EqualTo(1));
-            Assert.That(editorBeatmap.HitObjects.IndexOf(hitCircle), Is.EqualTo(1));
+            Assert.That(Array.IndexOf(editorBeatmap.HitObjects.ToArray(), hitCircle), Is.EqualTo(1));
         }
 
         /// <summary>

From f3fbb3cdc6595bda5e66382b01027bcdf4498ce1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Apr 2020 16:49:43 +0900
Subject: [PATCH 02495/10326] Add to banned symbols

---
 CodeAnalysis/BannedSymbols.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CodeAnalysis/BannedSymbols.txt b/CodeAnalysis/BannedSymbols.txt
index a92191a439..4d7135a195 100644
--- a/CodeAnalysis/BannedSymbols.txt
+++ b/CodeAnalysis/BannedSymbols.txt
@@ -4,3 +4,4 @@ M:System.ValueType.Equals(System.Object)~System.Boolean;Don't use object.Equals(
 M:System.Nullable`1.Equals(System.Object)~System.Boolean;Use == instead.
 T:System.IComparable;Don't use non-generic IComparable. Use generic version instead.
 M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
+T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
\ No newline at end of file

From c3a41c8476d97a5710e90b6da19e72787b026449 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Apr 2020 16:56:36 +0900
Subject: [PATCH 02496/10326] Also avoid using internal TypeExtensions

---
 CodeAnalysis/BannedSymbols.txt | 3 ++-
 osu.Game/Screens/OsuScreen.cs  | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CodeAnalysis/BannedSymbols.txt b/CodeAnalysis/BannedSymbols.txt
index 4d7135a195..e34626a59e 100644
--- a/CodeAnalysis/BannedSymbols.txt
+++ b/CodeAnalysis/BannedSymbols.txt
@@ -4,4 +4,5 @@ M:System.ValueType.Equals(System.Object)~System.Boolean;Don't use object.Equals(
 M:System.Nullable`1.Equals(System.Object)~System.Boolean;Use == instead.
 T:System.IComparable;Don't use non-generic IComparable. Use generic version instead.
 M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
-T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
\ No newline at end of file
+T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
+T:Microsoft.EntityFrameworkCore.Internal.TypeExtensions;Don't use internal extension methods.
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 61e94ae969..2124a66a75 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Internal;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -31,7 +30,7 @@ namespace osu.Game.Screens
         /// <summary>
         /// A user-facing title for this screen.
         /// </summary>
-        public virtual string Title => GetType().ShortDisplayName();
+        public virtual string Title => GetType().Name;
 
         public string Description => Title;
 

From e5131400e77d7ba9c213259ad883fc715206b9f7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 18:34:39 +0900
Subject: [PATCH 02497/10326] Remove now unnecessary position manipulation

---
 .../Edit/ManiaSelectionHandler.cs             | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 11e9b56a53..55245198c8 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -25,29 +24,11 @@ namespace osu.Game.Rulesets.Mania.Edit
             var maniaBlueprint = (ManiaSelectionBlueprint)moveEvent.Blueprint;
             int lastColumn = maniaBlueprint.DrawableObject.HitObject.Column;
 
-            performDragMovement(moveEvent);
             performColumnMovement(lastColumn, moveEvent);
 
             return true;
         }
 
-        private void performDragMovement(MoveSelectionEvent moveEvent)
-        {
-            float delta = moveEvent.InstantDelta.Y;
-
-            foreach (var selectionBlueprint in SelectedBlueprints)
-            {
-                var b = (OverlaySelectionBlueprint)selectionBlueprint;
-
-                var hitObject = b.DrawableObject;
-
-                // We receive multiple movement events per frame such that we can't rely on updating the start time
-                // since the scrolling hitobject container requires at least one update frame to update the position.
-                // However the position needs to be valid for future movement events to calculate the correct deltas.
-                hitObject.Y += delta;
-            }
-        }
-
         private void performColumnMovement(int lastColumn, MoveSelectionEvent moveEvent)
         {
             var currentColumn = composer.ColumnAt(moveEvent.ScreenSpacePosition);

From a7a680b4862e5adf6d0579b81534f07b169488c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 18:34:55 +0900
Subject: [PATCH 02498/10326] Fix horizontal drag not working

---
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index f9faa262ed..6960d15f31 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.UI
             {
                 foreach (var column in stage.Columns)
                 {
-                    if (column.ReceivePositionalInputAt(screenSpacePosition))
+                    if (column.ReceivePositionalInputAt(new Vector2(screenSpacePosition.X, column.ScreenSpaceDrawQuad.Centre.Y)))
                     {
                         found = column;
                         break;

From f93291e25b4967edd658d3e309d33905684d5343 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 18:35:22 +0900
Subject: [PATCH 02499/10326] Remove unused override

---
 .../Blueprints/ManiaSelectionBlueprint.cs     | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index b03bf7c078..b8574b804e 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -45,25 +45,5 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             DrawableObject.AlwaysAlive = false;
             base.Hide();
         }
-
-        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition)
-        {
-            var baseDelta = base.GetInstantDelta(screenSpacePosition);
-
-            if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
-            {
-                // The parent of DrawableObject is the scrolling hitobject container (SHOC).
-                // In the coordinate-space of the SHOC, the screen-space position at the hit target is equal to the height of the SHOC,
-                // but this is not what we want as it means a slight movement downwards results in a delta greater than the height of the SHOC.
-                // To get around this issue, the height of the SHOC is subtracted from the delta.
-                //
-                // Ideally this should be a _negative_ value in the case described above, however this code gives a _positive_ delta.
-                // This is intentional as the delta is added to the hitobject's position (see: ManiaSelectionHandler) and a negative delta would move them towards the top of the screen instead,
-                // which would cause the delta to get increasingly larger as additional movements are performed.
-                return new Vector2(baseDelta.X, baseDelta.Y - DrawableObject.Parent.DrawHeight);
-            }
-
-            return baseDelta;
-        }
     }
 }

From 7d54d4b800234bb017602dc49e8b2c4a5134193e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 18:35:37 +0900
Subject: [PATCH 02500/10326] Improve test scene

---
 .../TestSceneManiaHitObjectComposer.cs        | 171 ++++++++++++++----
 .../Edit/ManiaHitObjectComposer.cs            |   2 +
 osu.Game/Tests/Visual/EditorClockTestScene.cs |   2 +-
 3 files changed, 140 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
index 180ceb94f4..4ce2424ffa 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
@@ -3,16 +3,23 @@
 
 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.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
 using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
@@ -23,45 +30,141 @@ namespace osu.Game.Rulesets.Mania.Tests
             typeof(ManiaBlueprintContainer)
         };
 
-        [Cached(typeof(EditorBeatmap))]
-        [Cached(typeof(IBeatSnapProvider))]
-        private readonly EditorBeatmap editorBeatmap;
-
-        protected override Container<Drawable> Content { get; }
-
-        public TestSceneManiaHitObjectComposer()
-        {
-            base.Content.Add(new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    editorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition { Columns = 4 }))
-                    {
-                        BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo }
-                    },
-                    Content = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    }
-                },
-            });
-
-            for (int i = 0; i < 10; i++)
-            {
-                editorBeatmap.Add(new Note { StartTime = 100 * i });
-            }
-        }
+        private TestComposer composer;
 
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Children = new Drawable[]
-            {
-                new ManiaHitObjectComposer(new ManiaRuleset())
-            };
-
             BeatDivisor.Value = 8;
+            Clock.Seek(0);
+
+            Child = composer = new TestComposer { RelativeSizeAxes = Axes.Both };
         });
+
+        [Test]
+        public void TestDragOffscreenSelectionVerticallyUpScroll()
+        {
+            DrawableHitObject lastObject = null;
+            Vector2 originalPosition = Vector2.Zero;
+
+            AddStep("seek to last object", () =>
+            {
+                lastObject = this.ChildrenOfType<DrawableHitObject>().Single(d => d.HitObject == composer.EditorBeatmap.HitObjects.Last());
+                Clock.Seek(composer.EditorBeatmap.HitObjects.Last().StartTime);
+            });
+
+            AddStep("select all objects", () => composer.EditorBeatmap.SelectedHitObjects.AddRange(composer.EditorBeatmap.HitObjects));
+
+            AddStep("click last object", () =>
+            {
+                originalPosition = lastObject.DrawPosition;
+
+                InputManager.MoveMouseTo(lastObject);
+                InputManager.PressButton(MouseButton.Left);
+            });
+
+            AddStep("move mouse downwards", () =>
+            {
+                InputManager.MoveMouseTo(lastObject, new Vector2(0, 20));
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddAssert("hitobjects not moved columns", () => composer.EditorBeatmap.HitObjects.All(h => ((ManiaHitObject)h).Column == 0));
+            AddAssert("hitobjects moved downwards", () => lastObject.DrawPosition.Y - originalPosition.Y > 0);
+            AddAssert("hitobjects not moved too far", () => lastObject.DrawPosition.Y - originalPosition.Y < 50);
+        }
+
+        [Test]
+        public void TestDragOffscreenSelectionVerticallyDownScroll()
+        {
+            DrawableHitObject lastObject = null;
+            Vector2 originalPosition = Vector2.Zero;
+
+            AddStep("set down scroll", () => ((Bindable<ScrollingDirection>)composer.Composer.ScrollingInfo.Direction).Value = ScrollingDirection.Down);
+
+            AddStep("seek to last object", () =>
+            {
+                lastObject = this.ChildrenOfType<DrawableHitObject>().Single(d => d.HitObject == composer.EditorBeatmap.HitObjects.Last());
+                Clock.Seek(composer.EditorBeatmap.HitObjects.Last().StartTime);
+            });
+
+            AddStep("select all objects", () => composer.EditorBeatmap.SelectedHitObjects.AddRange(composer.EditorBeatmap.HitObjects));
+
+            AddStep("click last object", () =>
+            {
+                originalPosition = lastObject.DrawPosition;
+
+                InputManager.MoveMouseTo(lastObject);
+                InputManager.PressButton(MouseButton.Left);
+            });
+
+            AddStep("move mouse upwards", () =>
+            {
+                InputManager.MoveMouseTo(lastObject, new Vector2(0, -20));
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddAssert("hitobjects not moved columns", () => composer.EditorBeatmap.HitObjects.All(h => ((ManiaHitObject)h).Column == 0));
+            AddAssert("hitobjects moved upwards", () => originalPosition.Y - lastObject.DrawPosition.Y > 0);
+            AddAssert("hitobjects not moved too far", () => originalPosition.Y - lastObject.DrawPosition.Y < 50);
+        }
+
+        [Test]
+        public void TestDragOffscreenSelectionHorizontally()
+        {
+            DrawableHitObject lastObject = null;
+            Vector2 originalPosition = Vector2.Zero;
+
+            AddStep("seek to last object", () =>
+            {
+                lastObject = this.ChildrenOfType<DrawableHitObject>().Single(d => d.HitObject == composer.EditorBeatmap.HitObjects.Last());
+                originalPosition = lastObject.DrawPosition;
+
+                Clock.Seek(composer.EditorBeatmap.HitObjects.Last().StartTime);
+            });
+
+            AddStep("select all objects", () => composer.EditorBeatmap.SelectedHitObjects.AddRange(composer.EditorBeatmap.HitObjects));
+
+            AddStep("click last object", () =>
+            {
+                InputManager.MoveMouseTo(lastObject);
+                InputManager.PressButton(MouseButton.Left);
+            });
+
+            AddStep("move mouse right", () =>
+            {
+                InputManager.MoveMouseTo(lastObject, new Vector2(40, 0));
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddAssert("hitobjects moved columns", () => composer.EditorBeatmap.HitObjects.All(h => ((ManiaHitObject)h).Column == 1));
+
+            // Todo: They'll have moved vertically by half the height of a note. Probably a problem.
+            AddAssert("hitobjects not moved vertically", () => lastObject.DrawPosition.Y - originalPosition.Y < 10);
+        }
+
+        private class TestComposer : CompositeDrawable
+        {
+            [Cached(typeof(EditorBeatmap))]
+            [Cached(typeof(IBeatSnapProvider))]
+            public readonly EditorBeatmap EditorBeatmap;
+
+            public readonly ManiaHitObjectComposer Composer;
+
+            public TestComposer()
+            {
+                InternalChildren = new Drawable[]
+                {
+                    EditorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition { Columns = 4 }))
+                    {
+                        BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo }
+                    },
+                    Composer = new ManiaHitObjectComposer(new ManiaRuleset())
+                };
+
+                for (int i = 0; i < 10; i++)
+                    EditorBeatmap.Add(new Note { StartTime = 100 * i });
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index b415c9f0c9..fba80f92d2 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public ManiaPlayfield Playfield => ((ManiaPlayfield)drawableRuleset.Playfield);
 
+        public IScrollingInfo ScrollingInfo => drawableRuleset.ScrollingInfo;
+
         public int TotalColumns => Playfield.TotalColumns;
 
         public override (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time)
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 58a443ed3d..830e6ed363 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tests.Visual
     /// Provides a clock, beat-divisor, and scrolling capability for test cases of editor components that
     /// are preferrably tested within the presence of a clock and seek controls.
     /// </summary>
-    public abstract class EditorClockTestScene : OsuTestScene
+    public abstract class EditorClockTestScene : OsuManualInputManagerTestScene
     {
         protected readonly BindableBeatDivisor BeatDivisor = new BindableBeatDivisor();
         protected new readonly EditorClock Clock;

From ff24a15760167b1db112239b6c3418870654f5a1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 18:36:24 +0900
Subject: [PATCH 02501/10326] Fix vertical drag in down-scroll scenarios

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index fba80f92d2..af465af16a 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -52,9 +52,9 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
             {
-                // When scrolling downwards, the position is _negative_ when the object's start time is after the current time (e.g. in the middle of the stage).
-                // However all scrolling algorithms upwards scrolling, meaning that a positive (inverse) position is expected in the same scenario.
-                targetPosition = -targetPosition;
+                // We're dealing with screen coordinates in which the position decreases towards the centre of the screen resulting in an increase in start time.
+                // The scrolling algorithm assumes a top anchor meaning an increase in time corresponds to an increase in position, so when scrolling downwards the coordinates need to be flipped.
+                targetPosition = hoc.DrawHeight - targetPosition;
             }
 
             double targetTime = drawableRuleset.ScrollingInfo.Algorithm.TimeAt(targetPosition,

From db12fafc2c3187220488e6235acc4f93cfa97687 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 18:53:30 +0900
Subject: [PATCH 02502/10326] Update comment

---
 .../TestSceneManiaHitObjectComposer.cs                       | 5 +++--
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs       | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
index 4ce2424ffa..a84fe83245 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
@@ -139,8 +140,8 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddAssert("hitobjects moved columns", () => composer.EditorBeatmap.HitObjects.All(h => ((ManiaHitObject)h).Column == 1));
 
-            // Todo: They'll have moved vertically by half the height of a note. Probably a problem.
-            AddAssert("hitobjects not moved vertically", () => lastObject.DrawPosition.Y - originalPosition.Y < 10);
+            // Todo: They'll move vertically by the height of a note since there's no snapping and the selection point is the middle of the note.
+            AddAssert("hitobjects not moved vertically", () => lastObject.DrawPosition.Y - originalPosition.Y <= DefaultNotePiece.NOTE_HEIGHT);
         }
 
         private class TestComposer : CompositeDrawable
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index af465af16a..dfa933baad 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -53,7 +53,8 @@ namespace osu.Game.Rulesets.Mania.Edit
             if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
             {
                 // We're dealing with screen coordinates in which the position decreases towards the centre of the screen resulting in an increase in start time.
-                // The scrolling algorithm assumes a top anchor meaning an increase in time corresponds to an increase in position, so when scrolling downwards the coordinates need to be flipped.
+                // The scrolling algorithm instead assumes a top anchor meaning an increase in time corresponds to an increase in position,
+                // so when scrolling downwards the coordinates need to be flipped.
                 targetPosition = hoc.DrawHeight - targetPosition;
             }
 

From ff3928465c06a7e578afe1088a9b0a045ea2eca7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 18:55:58 +0900
Subject: [PATCH 02503/10326] Add xmldoc

---
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index 6960d15f31..1af7d06998 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -87,8 +87,17 @@ namespace osu.Game.Rulesets.Mania.UI
             return found;
         }
 
+        /// <summary>
+        /// Retrieves a <see cref="Column"/> by index.
+        /// </summary>
+        /// <param name="index">The index of the column.</param>
+        /// <returns>The <see cref="Column"/> corresponding to the given index.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">If <paramref name="index"/> is less than 0 or greater than <see cref="TotalColumns"/>.</exception>
         public Column GetColumn(int index)
         {
+            if (index < 0 || index > TotalColumns - 1)
+                throw new ArgumentOutOfRangeException(nameof(index));
+
             foreach (var stage in stages)
             {
                 if (index >= stage.Columns.Count)

From 1aaab40228baa33ccb6cadadf07e84805fa48f66 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 19:23:33 +0900
Subject: [PATCH 02504/10326] Fix mods affecting mania scroll speed

---
 .../UI/DrawableManiaRuleset.cs                | 25 ++++++++++++++++---
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  8 +++---
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 14cad39b04..39f3331fbb 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -2,7 +2,9 @@
 // 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.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
@@ -48,6 +50,10 @@ namespace osu.Game.Rulesets.Mania.UI
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
+        private readonly Bindable<double> configTimeRange = new Bindable<double>();
+
+        // Stores the current speed adjustment active in gameplay.
+        private readonly Track speedAdjustmentTrack = new TrackVirtual(1000);
 
         public DrawableManiaRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)
@@ -58,6 +64,9 @@ namespace osu.Game.Rulesets.Mania.UI
         [BackgroundDependencyLoader]
         private void load()
         {
+            foreach (var mod in Mods.OfType<IApplicableToTrack>())
+                mod.ApplyToTrack(speedAdjustmentTrack);
+
             bool isForCurrentRuleset = Beatmap.BeatmapInfo.Ruleset.Equals(Ruleset.RulesetInfo);
 
             foreach (var p in ControlPoints)
@@ -76,7 +85,8 @@ namespace osu.Game.Rulesets.Mania.UI
             Config.BindWith(ManiaRulesetSetting.ScrollDirection, configDirection);
             configDirection.BindValueChanged(direction => Direction.Value = (ScrollingDirection)direction.NewValue, true);
 
-            Config.BindWith(ManiaRulesetSetting.ScrollTime, TimeRange);
+            Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
+            configTimeRange.BindValueChanged(_ => updateTimeRange());
         }
 
         protected override void AdjustScrollSpeed(int amount)
@@ -86,10 +96,19 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private double relativeTimeRange
         {
-            get => MAX_TIME_RANGE / TimeRange.Value;
-            set => TimeRange.Value = MAX_TIME_RANGE / value;
+            get => MAX_TIME_RANGE / configTimeRange.Value;
+            set => configTimeRange.Value = MAX_TIME_RANGE / value;
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            updateTimeRange();
+        }
+
+        private void updateTimeRange() => TimeRange.Value = configTimeRange.Value * speedAdjustmentTrack.AggregateTempo.Value * speedAdjustmentTrack.AggregateFrequency.Value;
+
         /// <summary>
         /// Retrieves the column that intersects a screen-space position.
         /// </summary>
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 5062c92afe..0a1c35c7c6 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.UI
         /// The mods which are to be applied.
         /// </summary>
         [Cached(typeof(IReadOnlyList<Mod>))]
-        private readonly IReadOnlyList<Mod> mods;
+        protected readonly IReadOnlyList<Mod> Mods;
 
         private FrameStabilityContainer frameStabilityContainer;
 
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.UI
                 throw new ArgumentException($"{GetType()} expected the beatmap to contain hitobjects of type {typeof(TObject)}.", nameof(beatmap));
 
             Beatmap = tBeatmap;
-            this.mods = mods?.ToArray() ?? Array.Empty<Mod>();
+            Mods = mods?.ToArray() ?? Array.Empty<Mod>();
 
             RelativeSizeAxes = Axes.Both;
 
@@ -204,7 +204,7 @@ namespace osu.Game.Rulesets.UI
                         .WithChild(ResumeOverlay)));
             }
 
-            applyRulesetMods(mods, config);
+            applyRulesetMods(Mods, config);
 
             loadObjects(cancellationToken);
         }
@@ -224,7 +224,7 @@ namespace osu.Game.Rulesets.UI
 
             Playfield.PostProcess();
 
-            foreach (var mod in mods.OfType<IApplicableToDrawableHitObjects>())
+            foreach (var mod in Mods.OfType<IApplicableToDrawableHitObjects>())
                 mod.ApplyToDrawableHitObjects(Playfield.AllHitObjects);
         }
 

From 7868c0dad5cff824fe5bf7c90c0a8d4dea71d5eb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Apr 2020 20:15:56 +0900
Subject: [PATCH 02505/10326] Fix test case failures

---
 .../TestSceneManiaHitObjectComposer.cs                   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
index a84fe83245..286e3f6e50 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
@@ -119,8 +119,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddStep("seek to last object", () =>
             {
                 lastObject = this.ChildrenOfType<DrawableHitObject>().Single(d => d.HitObject == composer.EditorBeatmap.HitObjects.Last());
-                originalPosition = lastObject.DrawPosition;
-
                 Clock.Seek(composer.EditorBeatmap.HitObjects.Last().StartTime);
             });
 
@@ -128,13 +126,18 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddStep("click last object", () =>
             {
+                originalPosition = lastObject.DrawPosition;
+
                 InputManager.MoveMouseTo(lastObject);
                 InputManager.PressButton(MouseButton.Left);
             });
 
             AddStep("move mouse right", () =>
             {
-                InputManager.MoveMouseTo(lastObject, new Vector2(40, 0));
+                var firstColumn = composer.Composer.Playfield.GetColumn(0);
+                var secondColumn = composer.Composer.Playfield.GetColumn(1);
+
+                InputManager.MoveMouseTo(lastObject, new Vector2(secondColumn.ScreenSpaceDrawQuad.Centre.X - firstColumn.ScreenSpaceDrawQuad.Centre.X + 1, 0));
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 

From 119000f1ab2157762863743d25d111b936f6a4a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Apr 2020 21:43:35 +0900
Subject: [PATCH 02506/10326] Reduce database includes where possible

---
 osu.Game/Beatmaps/BeatmapManager.cs        | 54 ++++++++++++++++++++--
 osu.Game/Beatmaps/BeatmapStore.cs          | 12 +++++
 osu.Game/Overlays/MusicController.cs       |  2 +-
 osu.Game/Screens/Menu/IntroScreen.cs       |  2 +-
 osu.Game/Screens/Select/BeatmapCarousel.cs |  2 +-
 osu.Game/Screens/Select/SongSelect.cs      |  2 +-
 6 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 6542866936..5651d07566 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -246,6 +246,12 @@ namespace osu.Game.Beatmaps
             if (beatmapInfo?.BeatmapSet == null || beatmapInfo == DefaultBeatmap?.BeatmapInfo)
                 return DefaultBeatmap;
 
+            if (beatmapInfo.BeatmapSet.Files == null)
+            {
+                var info = beatmapInfo;
+                beatmapInfo = QueryBeatmap(b => b.ID == info.ID);
+            }
+
             lock (workingCache)
             {
                 var working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == beatmapInfo.ID);
@@ -287,13 +293,34 @@ namespace osu.Game.Beatmaps
         /// Returns a list of all usable <see cref="BeatmapSetInfo"/>s.
         /// </summary>
         /// <returns>A list of available <see cref="BeatmapSetInfo"/>.</returns>
-        public List<BeatmapSetInfo> GetAllUsableBeatmapSets() => GetAllUsableBeatmapSetsEnumerable().ToList();
+        public List<BeatmapSetInfo> GetAllUsableBeatmapSets(IncludedDetails includes = IncludedDetails.All) => GetAllUsableBeatmapSetsEnumerable(includes).ToList();
 
         /// <summary>
-        /// Returns a list of all usable <see cref="BeatmapSetInfo"/>s.
+        /// Returns a list of all usable <see cref="BeatmapSetInfo"/>s. Note that files are not populated.
         /// </summary>
+        /// <param name="includes">The level of detail to include in the returned objects.</param>
         /// <returns>A list of available <see cref="BeatmapSetInfo"/>.</returns>
-        public IQueryable<BeatmapSetInfo> GetAllUsableBeatmapSetsEnumerable() => beatmaps.ConsumableItems.Where(s => !s.DeletePending && !s.Protected);
+        public IQueryable<BeatmapSetInfo> GetAllUsableBeatmapSetsEnumerable(IncludedDetails includes)
+        {
+            IQueryable<BeatmapSetInfo> queryable;
+
+            switch (includes)
+            {
+                case IncludedDetails.Minimal:
+                    queryable = beatmaps.BeatmapSetsOverview;
+                    break;
+
+                case IncludedDetails.AllButFiles:
+                    queryable = beatmaps.BeatmapSetsWithoutFiles;
+                    break;
+
+                default:
+                    queryable = beatmaps.ConsumableItems;
+                    break;
+            }
+
+            return queryable.Where(s => !s.DeletePending && !s.Protected);
+        }
 
         /// <summary>
         /// Perform a lookup query on available <see cref="BeatmapSetInfo"/>s.
@@ -482,4 +509,25 @@ namespace osu.Game.Beatmaps
             }
         }
     }
+
+    /// <summary>
+    /// The level of detail to include in database results.
+    /// </summary>
+    public enum IncludedDetails
+    {
+        /// <summary>
+        /// Only include beatmap difficulties and set level metadata.
+        /// </summary>
+        Minimal,
+
+        /// <summary>
+        /// Include all difficulties, rulesets, difficulty metadata but no files.
+        /// </summary>
+        AllButFiles,
+
+        /// <summary>
+        /// Include everything.
+        /// </summary>
+        All
+    }
 }
diff --git a/osu.Game/Beatmaps/BeatmapStore.cs b/osu.Game/Beatmaps/BeatmapStore.cs
index a2279fdb14..642bafd2ac 100644
--- a/osu.Game/Beatmaps/BeatmapStore.cs
+++ b/osu.Game/Beatmaps/BeatmapStore.cs
@@ -87,6 +87,18 @@ namespace osu.Game.Beatmaps
             base.Purge(items, context);
         }
 
+        public IQueryable<BeatmapSetInfo> BeatmapSetsOverview => ContextFactory.Get().BeatmapSetInfo
+                                                                               .Include(s => s.Metadata)
+                                                                               .Include(s => s.Beatmaps)
+                                                                               .AsNoTracking();
+
+        public IQueryable<BeatmapSetInfo> BeatmapSetsWithoutFiles => ContextFactory.Get().BeatmapSetInfo
+                                                                                   .Include(s => s.Metadata)
+                                                                                   .Include(s => s.Beatmaps).ThenInclude(s => s.Ruleset)
+                                                                                   .Include(s => s.Beatmaps).ThenInclude(b => b.BaseDifficulty)
+                                                                                   .Include(s => s.Beatmaps).ThenInclude(b => b.Metadata)
+                                                                                   .AsNoTracking();
+
         public IQueryable<BeatmapInfo> Beatmaps =>
             ContextFactory.Get().BeatmapInfo
                           .Include(b => b.BeatmapSet).ThenInclude(s => s.Metadata)
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 6d269aa944..c872f82b32 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Overlays
             beatmaps.ItemAdded += handleBeatmapAdded;
             beatmaps.ItemRemoved += handleBeatmapRemoved;
 
-            beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets().OrderBy(_ => RNG.Next()));
+            beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets(IncludedDetails.Minimal).OrderBy(_ => RNG.Next()));
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 26455b1dbd..d2296573a6 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Menu
 
             if (!MenuMusic.Value)
             {
-                var sets = beatmaps.GetAllUsableBeatmapSets();
+                var sets = beatmaps.GetAllUsableBeatmapSets(IncludedDetails.Minimal);
                 if (sets.Count > 0)
                     setInfo = beatmaps.QueryBeatmapSet(s => s.ID == sets[RNG.Next(0, sets.Count - 1)].ID);
             }
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index f989ab2787..5a4a03662a 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Screens.Select
             loadBeatmapSets(GetLoadableBeatmaps());
         }
 
-        protected virtual IEnumerable<BeatmapSetInfo> GetLoadableBeatmaps() => beatmaps.GetAllUsableBeatmapSetsEnumerable();
+        protected virtual IEnumerable<BeatmapSetInfo> GetLoadableBeatmaps() => beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.AllButFiles);
 
         public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet) => Schedule(() =>
         {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 0d07a335cf..c07465ca44 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Screens.Select
                 Schedule(() =>
                 {
                     // if we have no beatmaps but osu-stable is found, let's prompt the user to import.
-                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable().Any() && beatmaps.StableInstallationAvailable)
+                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && beatmaps.StableInstallationAvailable)
                     {
                         dialogOverlay.Push(new ImportFromStablePopup(() =>
                         {

From 902326e7ac175923a5a1dbcc40adcbdb218f8f29 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Tue, 28 Apr 2020 22:24:19 +0200
Subject: [PATCH 02507/10326] Slight refactoring

---
 .idea/.idea.osu.Desktop/.idea/discord.xml     |  9 ++++
 .../Skinning/TestSceneDrawableTaikoMascot.cs  | 41 +++++++------------
 2 files changed, 24 insertions(+), 26 deletions(-)
 create mode 100644 .idea/.idea.osu.Desktop/.idea/discord.xml

diff --git a/.idea/.idea.osu.Desktop/.idea/discord.xml b/.idea/.idea.osu.Desktop/.idea/discord.xml
new file mode 100644
index 0000000000..59b11d1d39
--- /dev/null
+++ b/.idea/.idea.osu.Desktop/.idea/discord.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="true" />
+  </component>
+  <component name="ProjectNotificationSettings">
+    <option name="askShowProject" value="false" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index a0ab3e5c25..41d7156e7e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -93,21 +93,11 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             AddStep("Collect playfields", collectPlayfields);
             AddStep("Collect mascots", collectMascots);
 
-            AddStep("Create hit (miss)", () =>
-            {
-                foreach (var playfield in playfields)
-                    addJudgement(playfield, HitResult.Miss);
-            });
+            AddStep("Create hit (great)", () => addJudgement(HitResult.Miss));
+            AddUntilStep("Wait for idle state", () => checkForState(TaikoMascotAnimationState.Fail));
 
-            AddUntilStep("Wait for fail state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Fail));
-
-            AddStep("Create hit (great)", () =>
-            {
-                foreach (var playfield in playfields)
-                    addJudgement(playfield, HitResult.Great);
-            });
-
-            AddUntilStep("Wait for idle state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Idle));
+            AddStep("Create hit (great)", () => addJudgement(HitResult.Great));
+            AddUntilStep("Wait for idle state", () => checkForState(TaikoMascotAnimationState.Idle));
         }
 
         [Test]
@@ -134,15 +124,10 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             AddStep("Collect playfields", collectPlayfields);
             AddStep("Collect mascots", collectMascots);
 
-            AddUntilStep("Wait for fail state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Fail));
+            AddUntilStep("Wait for idle state", () => checkForState(TaikoMascotAnimationState.Fail));
 
-            AddStep("Create hit (great)", () =>
-            {
-                foreach (var playfield in playfields)
-                    addJudgement(playfield, HitResult.Great);
-            });
-
-            AddUntilStep("Wait for kiai state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Kiai));
+            AddStep("Create hit (great)", () => addJudgement(HitResult.Great));
+            AddUntilStep("Wait for idle state", () => checkForState(TaikoMascotAnimationState.Kiai));
         }
 
         private void setBeatmap(bool kiai = false)
@@ -190,18 +175,22 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
             foreach (var playfield in playfields)
             {
-                var mascot = playfield.ChildrenOfType<DrawableTaikoMascot>()
+                var mascot = playfield.ChildrenOfType<TestDrawableTaikoMascot>()
                                       .SingleOrDefault();
 
-                if (mascot != null) mascots.Add(mascot);
+                if (mascot != null)
+                    mascots.Add(mascot);
             }
         }
 
-        private void addJudgement(TaikoPlayfield playfield, HitResult result)
+        private void addJudgement(HitResult result)
         {
-            playfield.OnNewResult(new DrawableHit(new Hit()), new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = result });
+            foreach (var playfield in playfields)
+                playfield.OnNewResult(new DrawableHit(new Hit()), new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = result });
         }
 
+        private bool checkForState(TaikoMascotAnimationState state) => mascots.All(d => d.State == state);
+
         private class TestDrawableTaikoMascot : DrawableTaikoMascot
         {
             public TestDrawableTaikoMascot(TaikoMascotAnimationState startingState = TaikoMascotAnimationState.Idle)

From 0d285ac0f40e8343eb4462389c9366177bd409b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 28 Apr 2020 23:17:52 +0200
Subject: [PATCH 02508/10326] Revert unrelated change to Rider configuration

---
 .idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
index 7515e76054..4bb9f4d2a0 100644
--- a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
+++ b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="1" />
+    <option name="vcsConfiguration" value="2" />
   </component>
 </project>
\ No newline at end of file

From 24216b6600106282f68565b85677dd260ef186c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 28 Apr 2020 23:22:50 +0200
Subject: [PATCH 02509/10326] Remove unnecessary lists

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs  | 50 ++-----------------
 1 file changed, 5 insertions(+), 45 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index a0ab3e5c25..ae7dc71cc9 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -39,9 +39,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         private Bindable<WorkingBeatmap> workingBeatmap;
 
-        private readonly List<DrawableTaikoMascot> mascots = new List<DrawableTaikoMascot>();
-        private readonly List<TaikoPlayfield> playfields = new List<TaikoPlayfield>();
-        private readonly List<DrawableTaikoRuleset> rulesets = new List<DrawableTaikoRuleset>();
+        private IEnumerable<TestDrawableTaikoMascot> mascots => this.ChildrenOfType<TestDrawableTaikoMascot>();
+        private IEnumerable<TaikoPlayfield> playfields => this.ChildrenOfType<TaikoPlayfield>();
 
         [BackgroundDependencyLoader]
         private void load(Bindable<WorkingBeatmap> beatmap)
@@ -56,14 +55,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
             AddStep("Create mascot (idle)", () =>
             {
-                mascots.Clear();
-
-                SetContents(() =>
-                {
-                    var mascot = new TestDrawableTaikoMascot();
-                    mascots.Add(mascot);
-                    return mascot;
-                });
+                SetContents(() => new TestDrawableTaikoMascot());
             });
 
             AddStep("Clear state", () => setState(TaikoMascotAnimationState.Clear));
@@ -80,19 +72,13 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
             AddStep("Create ruleset", () =>
             {
-                rulesets.Clear();
                 SetContents(() =>
                 {
                     var ruleset = new TaikoRuleset();
-                    var drawableRuleset = new DrawableTaikoRuleset(ruleset, workingBeatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
-                    rulesets.Add(drawableRuleset);
-                    return drawableRuleset;
+                    return new DrawableTaikoRuleset(ruleset, workingBeatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
                 });
             });
 
-            AddStep("Collect playfields", collectPlayfields);
-            AddStep("Collect mascots", collectMascots);
-
             AddStep("Create hit (miss)", () =>
             {
                 foreach (var playfield in playfields)
@@ -121,19 +107,13 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             {
                 workingBeatmap.Value.Track.Start();
 
-                rulesets.Clear();
                 SetContents(() =>
                 {
                     var ruleset = new TaikoRuleset();
-                    var drawableRuleset = new DrawableTaikoRuleset(ruleset, workingBeatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
-                    rulesets.Add(drawableRuleset);
-                    return drawableRuleset;
+                    return new DrawableTaikoRuleset(ruleset, workingBeatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
                 });
             });
 
-            AddStep("Collect playfields", collectPlayfields);
-            AddStep("Collect mascots", collectMascots);
-
             AddUntilStep("Wait for fail state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Fail));
 
             AddStep("Create hit (great)", () =>
@@ -177,26 +157,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 mascot?.ShowState(state);
         }
 
-        private void collectPlayfields()
-        {
-            playfields.Clear();
-            foreach (var ruleset in rulesets)
-                playfields.Add(ruleset.ChildrenOfType<TaikoPlayfield>().Single());
-        }
-
-        private void collectMascots()
-        {
-            mascots.Clear();
-
-            foreach (var playfield in playfields)
-            {
-                var mascot = playfield.ChildrenOfType<DrawableTaikoMascot>()
-                                      .SingleOrDefault();
-
-                if (mascot != null) mascots.Add(mascot);
-            }
-        }
-
         private void addJudgement(TaikoPlayfield playfield, HitResult result)
         {
             playfield.OnNewResult(new DrawableHit(new Hit()), new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = result });

From 15bbedca8796a4c91975592ae6005d211195449b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 28 Apr 2020 23:24:21 +0200
Subject: [PATCH 02510/10326] Remove unnecessary beatmap field

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs  | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index ae7dc71cc9..8f45fec3f9 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -37,17 +36,9 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             TimeRange = { Value = 5000 },
         };
 
-        private Bindable<WorkingBeatmap> workingBeatmap;
-
         private IEnumerable<TestDrawableTaikoMascot> mascots => this.ChildrenOfType<TestDrawableTaikoMascot>();
         private IEnumerable<TaikoPlayfield> playfields => this.ChildrenOfType<TaikoPlayfield>();
 
-        [BackgroundDependencyLoader]
-        private void load(Bindable<WorkingBeatmap> beatmap)
-        {
-            workingBeatmap = beatmap;
-        }
-
         [Test]
         public void TestStateTextures()
         {
@@ -75,7 +66,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 SetContents(() =>
                 {
                     var ruleset = new TaikoRuleset();
-                    return new DrawableTaikoRuleset(ruleset, workingBeatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
+                    return new DrawableTaikoRuleset(ruleset, Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
                 });
             });
 
@@ -101,16 +92,16 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         {
             AddStep("Set beatmap", () => setBeatmap(true));
 
-            AddUntilStep("Wait for beatmap to be loaded", () => workingBeatmap.Value.Track.IsLoaded);
+            AddUntilStep("Wait for beatmap to be loaded", () => Beatmap.Value.Track.IsLoaded);
 
             AddStep("Create kiai ruleset", () =>
             {
-                workingBeatmap.Value.Track.Start();
+                Beatmap.Value.Track.Start();
 
                 SetContents(() =>
                 {
                     var ruleset = new TaikoRuleset();
-                    return new DrawableTaikoRuleset(ruleset, workingBeatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
+                    return new DrawableTaikoRuleset(ruleset, Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
                 });
             });
 
@@ -133,7 +124,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             if (kiai)
                 controlPointInfo.Add(0, new EffectControlPoint { KiaiMode = true });
 
-            workingBeatmap.Value = CreateWorkingBeatmap(new Beatmap
+            Beatmap.Value = CreateWorkingBeatmap(new Beatmap
             {
                 HitObjects = new List<HitObject> { new Hit { Type = HitType.Centre } },
                 BeatmapInfo = new BeatmapInfo

From e7e529ab99944f62bbc31f711295519950426b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 28 Apr 2020 23:26:10 +0200
Subject: [PATCH 02511/10326] Remove unnecessary null checks

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 8f45fec3f9..83bf64eb46 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     addJudgement(playfield, HitResult.Miss);
             });
 
-            AddUntilStep("Wait for fail state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Fail));
+            AddUntilStep("Wait for fail state", () => mascots.All(d => d.State == TaikoMascotAnimationState.Fail));
 
             AddStep("Create hit (great)", () =>
             {
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     addJudgement(playfield, HitResult.Great);
             });
 
-            AddUntilStep("Wait for idle state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Idle));
+            AddUntilStep("Wait for idle state", () => mascots.All(d => d.State == TaikoMascotAnimationState.Idle));
         }
 
         [Test]
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 });
             });
 
-            AddUntilStep("Wait for fail state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Fail));
+            AddUntilStep("Wait for fail state", () => mascots.All(d => d.State == TaikoMascotAnimationState.Fail));
 
             AddStep("Create hit (great)", () =>
             {
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     addJudgement(playfield, HitResult.Great);
             });
 
-            AddUntilStep("Wait for kiai state", () => mascots.Where(d => d != null).All(d => d.State == TaikoMascotAnimationState.Kiai));
+            AddUntilStep("Wait for kiai state", () => mascots.All(d => d.State == TaikoMascotAnimationState.Kiai));
         }
 
         private void setBeatmap(bool kiai = false)

From d7b072dd6e90138a6607deff4c9943c019733cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 29 Apr 2020 00:00:01 +0200
Subject: [PATCH 02512/10326] Fix post-merge test regression

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 83bf64eb46..4eeeb52e2f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -14,7 +14,6 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
@@ -150,7 +149,10 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         private void addJudgement(TaikoPlayfield playfield, HitResult result)
         {
-            playfield.OnNewResult(new DrawableHit(new Hit()), new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = result });
+            var hit = new DrawableTestHit(new Hit(), result);
+            Add(hit);
+
+            playfield.OnNewResult(hit, new JudgementResult(hit.HitObject, new TaikoJudgement()) { Type = result });
         }
 
         private class TestDrawableTaikoMascot : DrawableTaikoMascot

From 00918ecb6d6c47f6c131fca8991448825e9297e3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 29 Apr 2020 04:43:49 +0300
Subject: [PATCH 02513/10326] Replace interval collection with a more-specific
 immutable component

Covers all small changes into one commit:
 - Remove generics and use `double` type instead.
 - Make the component immutable and not enumerable for simplicity of it's worth.
 - Make the component more-specific (to time period tracking)
 - Apply small adjustments to the component
---
 osu.Game/Lists/IntervalList.cs  | 111 --------------------------------
 osu.Game/Utils/PeriodTracker.cs |  90 ++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 111 deletions(-)
 delete mode 100644 osu.Game/Lists/IntervalList.cs
 create mode 100644 osu.Game/Utils/PeriodTracker.cs

diff --git a/osu.Game/Lists/IntervalList.cs b/osu.Game/Lists/IntervalList.cs
deleted file mode 100644
index 580015bb96..0000000000
--- a/osu.Game/Lists/IntervalList.cs
+++ /dev/null
@@ -1,111 +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;
-using System.Collections.Generic;
-using osu.Framework.Lists;
-
-namespace osu.Game.Lists
-{
-    /// <summary>
-    /// Represents a list of intervals that can be used for whether a specific value falls into one of them.
-    /// </summary>
-    /// <typeparam name="T">The type of interval values.</typeparam>
-    public class IntervalList<T> : IEnumerable<Interval<T>>
-        where T : struct, IConvertible
-    {
-        private static readonly IComparer<T> type_comparer = Comparer<T>.Default;
-
-        private readonly SortedList<Interval<T>> intervals = new SortedList<Interval<T>>((x, y) => type_comparer.Compare(x.Start, y.Start));
-        private int nearestIndex;
-
-        public Interval<T> this[int i]
-        {
-            get => intervals[i];
-            set => intervals[i] = value;
-        }
-
-        /// <summary>
-        /// Whether the provided value is in any interval added to this list.
-        /// </summary>
-        /// <param name="value">The value to check for.</param>
-        public bool IsInAnyInterval(T value)
-        {
-            if (intervals.Count == 0)
-                return false;
-
-            // Clamp the nearest index in case there were intervals
-            // removed from the list causing the index to go out of range.
-            nearestIndex = Math.Clamp(nearestIndex, 0, intervals.Count - 1);
-
-            if (type_comparer.Compare(value, this[nearestIndex].End) > 0)
-            {
-                while (type_comparer.Compare(value, this[nearestIndex].End) > 0 && nearestIndex < intervals.Count - 1)
-                    nearestIndex++;
-            }
-            else
-            {
-                while (type_comparer.Compare(value, this[nearestIndex].Start) < 0 && nearestIndex > 0)
-                    nearestIndex--;
-            }
-
-            var nearestInterval = this[nearestIndex];
-
-            return type_comparer.Compare(value, nearestInterval.Start) >= 0 &&
-                   type_comparer.Compare(value, nearestInterval.End) <= 0;
-        }
-
-        /// <summary>
-        /// Adds a new interval to the list.
-        /// </summary>
-        /// <param name="start">The start value of the interval.</param>
-        /// <param name="end">The end value of the interval.</param>
-        public void Add(T start, T end) => Add(new Interval<T>(start, end));
-
-        /// <summary>
-        /// Adds a new interval to the list
-        /// </summary>
-        /// <param name="interval">The interval to add.</param>
-        public void Add(Interval<T> interval) => intervals.Add(interval);
-
-        /// <summary>
-        /// Removes an existing interval from the list.
-        /// </summary>
-        /// <param name="interval">The interval to remove.</param>
-        /// <returns>Whether the provided interval exists in the list and has been removed.</returns>
-        public bool Remove(Interval<T> interval) => intervals.Remove(interval);
-
-        /// <summary>
-        /// Removes all intervals from the list.
-        /// </summary>
-        public void Clear() => intervals.Clear();
-
-        public IEnumerator<Interval<T>> GetEnumerator() => intervals.GetEnumerator();
-
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-    }
-
-    public readonly struct Interval<T>
-        where T : struct, IConvertible
-    {
-        /// <summary>
-        /// The start value of this interval.
-        /// </summary>
-        public readonly T Start;
-
-        /// <summary>
-        /// The end value of this interval.
-        /// </summary>
-        public readonly T End;
-
-        public Interval(T start, T end)
-        {
-            if (Comparer<T>.Default.Compare(start, end) >= 0)
-                throw new ArgumentException($"Invalid interval, {nameof(start)} must be less than {nameof(end)}", nameof(start));
-
-            Start = start;
-            End = end;
-        }
-    }
-}
diff --git a/osu.Game/Utils/PeriodTracker.cs b/osu.Game/Utils/PeriodTracker.cs
new file mode 100644
index 0000000000..589f061c1d
--- /dev/null
+++ b/osu.Game/Utils/PeriodTracker.cs
@@ -0,0 +1,90 @@
+// Copyright (c) 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;
+
+namespace osu.Game.Utils
+{
+    /// <summary>
+    /// Represents a tracking component used for whether a
+    /// specific time falls into any of the provided periods.
+    /// </summary>
+    public class PeriodTracker
+    {
+        private readonly List<Period> periods = new List<Period>();
+        private int nearestIndex;
+
+        /// <summary>
+        /// The list of periods to add to the tracker for using the required check methods.
+        /// </summary>
+        public IEnumerable<Period> Periods
+        {
+            set
+            {
+                var sortedValue = value?.ToList();
+                sortedValue?.Sort();
+
+                if (sortedValue != null && periods.SequenceEqual(sortedValue))
+                    return;
+
+                periods.Clear();
+                nearestIndex = 0;
+
+                if (value?.Any() != true)
+                    return;
+
+                periods.AddRange(sortedValue);
+            }
+        }
+
+        /// <summary>
+        /// Whether the provided time is in any of the added periods.
+        /// </summary>
+        /// <param name="time">The time value to check for.</param>
+        public bool Contains(double time)
+        {
+            if (periods.Count == 0)
+                return false;
+
+            if (time > periods[nearestIndex].End)
+            {
+                while (time > periods[nearestIndex].End && nearestIndex < periods.Count - 1)
+                    nearestIndex++;
+            }
+            else
+            {
+                while (time < periods[nearestIndex].Start && nearestIndex > 0)
+                    nearestIndex--;
+            }
+
+            var nearest = periods[nearestIndex];
+            return time >= nearest.Start && time <= nearest.End;
+        }
+    }
+
+    public readonly struct Period : IComparable<Period>
+    {
+        /// <summary>
+        /// The start time of this period.
+        /// </summary>
+        public readonly double Start;
+
+        /// <summary>
+        /// The end time of this period.
+        /// </summary>
+        public readonly double End;
+
+        public Period(double start, double end)
+        {
+            if (start >= end)
+                throw new ArgumentException($"Invalid period provided, {nameof(start)} must be less than {nameof(end)}", nameof(start));
+
+            Start = start;
+            End = end;
+        }
+
+        public int CompareTo(Period other) => Start.CompareTo(other.Start);
+    }
+}

From 587f946dc63ba8315b8f90b8b1cd9b5d42a9fc06 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 29 Apr 2020 04:58:08 +0300
Subject: [PATCH 02514/10326] Adjust, simplify and make the test code more
 flexible to some degree

---
 osu.Game.Tests/Lists/IntervalListTest.cs      | 115 ------------------
 osu.Game.Tests/NonVisual/PeriodTrackerTest.cs | 103 ++++++++++++++++
 2 files changed, 103 insertions(+), 115 deletions(-)
 delete mode 100644 osu.Game.Tests/Lists/IntervalListTest.cs
 create mode 100644 osu.Game.Tests/NonVisual/PeriodTrackerTest.cs

diff --git a/osu.Game.Tests/Lists/IntervalListTest.cs b/osu.Game.Tests/Lists/IntervalListTest.cs
deleted file mode 100644
index 0958f0fa7c..0000000000
--- a/osu.Game.Tests/Lists/IntervalListTest.cs
+++ /dev/null
@@ -1,115 +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 NUnit.Framework;
-using osu.Game.Lists;
-
-namespace osu.Game.Tests.Lists
-{
-    [TestFixture]
-    public class IntervalListTest
-    {
-        // this is intended to be unordered to test adding intervals in unordered way.
-        private static readonly (double, double)[] test_intervals =
-        {
-            (-9.1d, -8.3d),
-            (-3.4d, 2.1d),
-            (9.0d, 50.0d),
-            (5.25d, 10.50d),
-        };
-
-        [Test]
-        public void TestCheckValueInsideSingleInterval()
-        {
-            var list = new IntervalList<double> { { 1.0d, 2.0d } };
-
-            Assert.IsTrue(list.IsInAnyInterval(1.0d));
-            Assert.IsTrue(list.IsInAnyInterval(1.5d));
-            Assert.IsTrue(list.IsInAnyInterval(2.0d));
-        }
-
-        [Test]
-        public void TestCheckValuesInsideIntervals()
-        {
-            var list = new IntervalList<double>();
-
-            foreach (var (start, end) in test_intervals)
-                list.Add(start, end);
-
-            Assert.IsTrue(list.IsInAnyInterval(-8.75d));
-            Assert.IsTrue(list.IsInAnyInterval(1.0d));
-            Assert.IsTrue(list.IsInAnyInterval(7.89d));
-            Assert.IsTrue(list.IsInAnyInterval(9.8d));
-            Assert.IsTrue(list.IsInAnyInterval(15.83d));
-        }
-
-        [Test]
-        public void TestCheckValuesInRandomOrder()
-        {
-            var list = new IntervalList<double>();
-
-            foreach (var (start, end) in test_intervals)
-                list.Add(start, end);
-
-            Assert.IsTrue(list.IsInAnyInterval(9.8d));
-            Assert.IsTrue(list.IsInAnyInterval(7.89d));
-            Assert.IsTrue(list.IsInAnyInterval(1.0d));
-            Assert.IsTrue(list.IsInAnyInterval(15.83d));
-            Assert.IsTrue(list.IsInAnyInterval(-8.75d));
-        }
-
-        [Test]
-        public void TestCheckValuesOutOfIntervals()
-        {
-            var list = new IntervalList<double>();
-
-            foreach (var (start, end) in test_intervals)
-                list.Add(start, end);
-
-            Assert.IsFalse(list.IsInAnyInterval(-9.2d));
-            Assert.IsFalse(list.IsInAnyInterval(2.2d));
-            Assert.IsFalse(list.IsInAnyInterval(5.15d));
-            Assert.IsFalse(list.IsInAnyInterval(51.2d));
-        }
-
-        [Test]
-        public void TestCheckValueAfterRemovedInterval()
-        {
-            var list = new IntervalList<int> { { 50, 100 }, { 150, 200 }, { 250, 300 } };
-
-            Assert.IsTrue(list.IsInAnyInterval(75));
-            Assert.IsTrue(list.IsInAnyInterval(175));
-            Assert.IsTrue(list.IsInAnyInterval(275));
-
-            list.Remove(list[1]);
-
-            Assert.IsFalse(list.IsInAnyInterval(175));
-            Assert.IsTrue(list.IsInAnyInterval(75));
-            Assert.IsTrue(list.IsInAnyInterval(275));
-        }
-
-        [Test]
-        public void TestCheckValueAfterAddedInterval()
-        {
-            var list = new IntervalList<int> { { 50, 100 }, { 250, 300 } };
-
-            Assert.IsFalse(list.IsInAnyInterval(175));
-            Assert.IsTrue(list.IsInAnyInterval(75));
-            Assert.IsTrue(list.IsInAnyInterval(275));
-
-            list.Add(150, 200);
-
-            Assert.IsTrue(list.IsInAnyInterval(175));
-        }
-
-        [Test]
-        public void TestReversedIntervalThrows()
-        {
-            var list = new IntervalList<int>();
-
-            Assert.Throws<ArgumentException>(() => list.Add(50, 25));
-            Assert.Throws<ArgumentException>(() => list.Add(new Interval<int>(50, 25)));
-        }
-    }
-}
diff --git a/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs b/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs
new file mode 100644
index 0000000000..39eea2b386
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs
@@ -0,0 +1,103 @@
+// Copyright (c) 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.Utils;
+using osu.Game.Utils;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class PeriodTrackerTest
+    {
+        private static readonly Period[] test_single_period = { new Period(1.0, 2.0) };
+
+        // this is intended to be unordered to test adding periods in unordered way.
+        private static readonly Period[] test_periods =
+        {
+            new Period(-9.1, -8.3),
+            new Period(-3.4, 2.1),
+            new Period(9.0, 50.0),
+            new Period(5.25, 10.50)
+        };
+
+        [Test]
+        public void TestCheckValueInsideSinglePeriod()
+        {
+            var tracker = new PeriodTracker { Periods = test_single_period };
+
+            var period = test_single_period.Single();
+            Assert.IsTrue(tracker.Contains(period.Start));
+            Assert.IsTrue(tracker.Contains(getMidTime(period)));
+            Assert.IsTrue(tracker.Contains(period.End));
+        }
+
+        [Test]
+        public void TestCheckValuesInsidePeriods()
+        {
+            var tracker = new PeriodTracker { Periods = test_periods };
+
+            foreach (var period in test_periods)
+                Assert.IsTrue(tracker.Contains(getMidTime(period)));
+        }
+
+        [Test]
+        public void TestCheckValuesInRandomOrder()
+        {
+            var tracker = new PeriodTracker { Periods = test_periods };
+
+            foreach (var period in test_periods.OrderBy(_ => RNG.Next()))
+                Assert.IsTrue(tracker.Contains(getMidTime(period)));
+        }
+
+        [Test]
+        public void TestCheckValuesOutOfPeriods()
+        {
+            var tracker = new PeriodTracker
+            {
+                Periods = new[]
+                {
+                    new Period(1.0, 2.0),
+                    new Period(3.0, 4.0)
+                }
+            };
+
+            Assert.IsFalse(tracker.Contains(0.9), "Time before first period is being considered inside");
+
+            Assert.IsFalse(tracker.Contains(2.1), "Time right after first period is being considered inside");
+            Assert.IsFalse(tracker.Contains(2.9), "Time right before second period is being considered inside");
+
+            Assert.IsFalse(tracker.Contains(4.1), "Time after last period is being considered inside");
+        }
+
+        [Test]
+        public void TestNullRemovesExistingPeriods()
+        {
+            var tracker = new PeriodTracker { Periods = test_single_period };
+
+            var period = test_single_period.Single();
+            Assert.IsTrue(tracker.Contains(getMidTime(period)));
+
+            tracker.Periods = null;
+            Assert.IsFalse(tracker.Contains(getMidTime(period)));
+        }
+
+        [Test]
+        public void TestReversedPeriodHandling()
+        {
+            var tracker = new PeriodTracker();
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                tracker.Periods = new[]
+                {
+                    new Period(2.0, 1.0)
+                };
+            });
+        }
+
+        private double getMidTime(Period period) => period.Start + (period.End - period.Start) / 2;
+    }
+}

From 8d899f4e7742e93b8afa0432e865685e3b92e71f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 29 Apr 2020 05:07:58 +0300
Subject: [PATCH 02515/10326] Apply changes to the BreakTracker and more
 adjustment

---
 osu.Game/Screens/Play/BreakTracker.cs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Play/BreakTracker.cs b/osu.Game/Screens/Play/BreakTracker.cs
index c2eb069ee6..e30c0c6dec 100644
--- a/osu.Game/Screens/Play/BreakTracker.cs
+++ b/osu.Game/Screens/Play/BreakTracker.cs
@@ -2,20 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Timing;
-using osu.Game.Lists;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Utils;
 
 namespace osu.Game.Screens.Play
 {
     public class BreakTracker : Component
     {
         private readonly ScoreProcessor scoreProcessor;
-
         private readonly double gameplayStartTime;
 
+        private readonly PeriodTracker tracker = new PeriodTracker();
+
         /// <summary>
         /// Whether the gameplay is currently in a break.
         /// </summary>
@@ -23,22 +25,14 @@ namespace osu.Game.Screens.Play
 
         private readonly BindableBool isBreakTime = new BindableBool();
 
-        private readonly IntervalList<double> breakIntervals = new IntervalList<double>();
-
         public IReadOnlyList<BreakPeriod> Breaks
         {
             set
             {
                 isBreakTime.Value = false;
-                breakIntervals.Clear();
 
-                foreach (var b in value)
-                {
-                    if (!b.HasEffect)
-                        continue;
-
-                    breakIntervals.Add(b.StartTime, b.EndTime - BreakOverlay.BREAK_FADE_DURATION);
-                }
+                tracker.Periods = value?.Where(b => b.HasEffect)
+                                       .Select(b => new Period(b.StartTime, b.EndTime - BreakOverlay.BREAK_FADE_DURATION));
             }
         }
 
@@ -54,7 +48,7 @@ namespace osu.Game.Screens.Play
 
             var time = Clock.CurrentTime;
 
-            isBreakTime.Value = breakIntervals.IsInAnyInterval(time)
+            isBreakTime.Value = tracker.Contains(time)
                                 || time < gameplayStartTime
                                 || scoreProcessor?.HasCompleted == true;
         }

From 6e76e5900a4d965eddecb7dc2223d47cf8d2c38b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 29 Apr 2020 05:08:38 +0300
Subject: [PATCH 02516/10326] Rename is-in-any check method to a more legible
 name

---
 osu.Game.Tests/NonVisual/PeriodTrackerTest.cs | 22 +++++++++----------
 osu.Game/Screens/Play/BreakTracker.cs         |  2 +-
 osu.Game/Utils/PeriodTracker.cs               |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs b/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs
index 39eea2b386..f033672576 100644
--- a/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs
+++ b/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs
@@ -29,9 +29,9 @@ namespace osu.Game.Tests.NonVisual
             var tracker = new PeriodTracker { Periods = test_single_period };
 
             var period = test_single_period.Single();
-            Assert.IsTrue(tracker.Contains(period.Start));
-            Assert.IsTrue(tracker.Contains(getMidTime(period)));
-            Assert.IsTrue(tracker.Contains(period.End));
+            Assert.IsTrue(tracker.IsInAny(period.Start));
+            Assert.IsTrue(tracker.IsInAny(getMidTime(period)));
+            Assert.IsTrue(tracker.IsInAny(period.End));
         }
 
         [Test]
@@ -40,7 +40,7 @@ namespace osu.Game.Tests.NonVisual
             var tracker = new PeriodTracker { Periods = test_periods };
 
             foreach (var period in test_periods)
-                Assert.IsTrue(tracker.Contains(getMidTime(period)));
+                Assert.IsTrue(tracker.IsInAny(getMidTime(period)));
         }
 
         [Test]
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.NonVisual
             var tracker = new PeriodTracker { Periods = test_periods };
 
             foreach (var period in test_periods.OrderBy(_ => RNG.Next()))
-                Assert.IsTrue(tracker.Contains(getMidTime(period)));
+                Assert.IsTrue(tracker.IsInAny(getMidTime(period)));
         }
 
         [Test]
@@ -64,12 +64,12 @@ namespace osu.Game.Tests.NonVisual
                 }
             };
 
-            Assert.IsFalse(tracker.Contains(0.9), "Time before first period is being considered inside");
+            Assert.IsFalse(tracker.IsInAny(0.9), "Time before first period is being considered inside");
 
-            Assert.IsFalse(tracker.Contains(2.1), "Time right after first period is being considered inside");
-            Assert.IsFalse(tracker.Contains(2.9), "Time right before second period is being considered inside");
+            Assert.IsFalse(tracker.IsInAny(2.1), "Time right after first period is being considered inside");
+            Assert.IsFalse(tracker.IsInAny(2.9), "Time right before second period is being considered inside");
 
-            Assert.IsFalse(tracker.Contains(4.1), "Time after last period is being considered inside");
+            Assert.IsFalse(tracker.IsInAny(4.1), "Time after last period is being considered inside");
         }
 
         [Test]
@@ -78,10 +78,10 @@ namespace osu.Game.Tests.NonVisual
             var tracker = new PeriodTracker { Periods = test_single_period };
 
             var period = test_single_period.Single();
-            Assert.IsTrue(tracker.Contains(getMidTime(period)));
+            Assert.IsTrue(tracker.IsInAny(getMidTime(period)));
 
             tracker.Periods = null;
-            Assert.IsFalse(tracker.Contains(getMidTime(period)));
+            Assert.IsFalse(tracker.IsInAny(getMidTime(period)));
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/BreakTracker.cs b/osu.Game/Screens/Play/BreakTracker.cs
index e30c0c6dec..eb77cb9369 100644
--- a/osu.Game/Screens/Play/BreakTracker.cs
+++ b/osu.Game/Screens/Play/BreakTracker.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Play
 
             var time = Clock.CurrentTime;
 
-            isBreakTime.Value = tracker.Contains(time)
+            isBreakTime.Value = tracker.IsInAny(time)
                                 || time < gameplayStartTime
                                 || scoreProcessor?.HasCompleted == true;
         }
diff --git a/osu.Game/Utils/PeriodTracker.cs b/osu.Game/Utils/PeriodTracker.cs
index 589f061c1d..49b372bb27 100644
--- a/osu.Game/Utils/PeriodTracker.cs
+++ b/osu.Game/Utils/PeriodTracker.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Utils
         /// Whether the provided time is in any of the added periods.
         /// </summary>
         /// <param name="time">The time value to check for.</param>
-        public bool Contains(double time)
+        public bool IsInAny(double time)
         {
             if (periods.Count == 0)
                 return false;

From 024f10a494f124e632652cae331bbcce1dbf3c39 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 29 Apr 2020 13:24:31 +0900
Subject: [PATCH 02517/10326] Use non-generic bindable
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.Rulesets.Mania/UI/DrawableManiaRuleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 39f3331fbb..fa26e6d713 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania.UI
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
-        private readonly Bindable<double> configTimeRange = new Bindable<double>();
+        private readonly Bindable<double> configTimeRange = new BindableDouble();
 
         // Stores the current speed adjustment active in gameplay.
         private readonly Track speedAdjustmentTrack = new TrackVirtual(1000);

From 0c95d11fdb0db19fc1610774961ffe376241d3e5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Apr 2020 13:27:33 +0900
Subject: [PATCH 02518/10326] Remove unnecessary value change binding

---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index fa26e6d713..00fa68d088 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -86,7 +86,6 @@ namespace osu.Game.Rulesets.Mania.UI
             configDirection.BindValueChanged(direction => Direction.Value = (ScrollingDirection)direction.NewValue, true);
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
-            configTimeRange.BindValueChanged(_ => updateTimeRange());
         }
 
         protected override void AdjustScrollSpeed(int amount)

From 4f332ace1426b1c6840d0b4af3aad2e4a8e58e14 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Apr 2020 14:27:21 +0900
Subject: [PATCH 02519/10326] Use 0 length

---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 00fa68d088..f3f843f366 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mania.UI
         private readonly Bindable<double> configTimeRange = new BindableDouble();
 
         // Stores the current speed adjustment active in gameplay.
-        private readonly Track speedAdjustmentTrack = new TrackVirtual(1000);
+        private readonly Track speedAdjustmentTrack = new TrackVirtual(0);
 
         public DrawableManiaRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)

From c73d45bc01de6d2d2175c028400bb4c6d727c2f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Apr 2020 15:23:28 +0900
Subject: [PATCH 02520/10326] Reduce initial channel load overhead by only
 loading history on active channel

---
 osu.Game/Online/Chat/ChannelManager.cs    | 12 ++++++------
 osu.Game/Overlays/Chat/DrawableChannel.cs |  8 ++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 822f628dd2..53872ddcba 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -93,6 +93,12 @@ namespace osu.Game.Online.Chat
         {
             if (!(e.NewValue is ChannelSelectorTabItem.ChannelSelectorTabChannel))
                 JoinChannel(e.NewValue);
+
+            if (e.NewValue?.MessagesLoaded == false)
+            {
+                // let's fetch a small number of messages to bring us up-to-date with the backlog.
+                fetchInitalMessages(e.NewValue);
+            }
         }
 
         /// <summary>
@@ -375,12 +381,6 @@ namespace osu.Game.Online.Chat
             if (CurrentChannel.Value == null)
                 CurrentChannel.Value = channel;
 
-            if (!channel.MessagesLoaded)
-            {
-                // let's fetch a small number of messages to bring us up-to-date with the backlog.
-                fetchInitalMessages(channel);
-            }
-
             return channel;
         }
 
diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 6019657cf0..d63faebae4 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -105,6 +105,14 @@ namespace osu.Game.Overlays.Chat
 
         private void newMessagesArrived(IEnumerable<Message> newMessages)
         {
+            if (newMessages.Min(m => m.Id) < chatLines.Max(c => c.Message.Id))
+            {
+                // there is a case (on initial population) that we may receive past messages and need to reorder.
+                // easiest way is to just combine messages and recreate drawables (less worrying about day separators etc.)
+                newMessages = newMessages.Concat(chatLines.Select(c => c.Message)).OrderBy(m => m.Id).ToList();
+                ChatLineFlow.Clear();
+            }
+
             bool shouldScrollToEnd = scroll.IsScrolledToEnd(10) || !chatLines.Any() || newMessages.Any(m => m is LocalMessage);
 
             // Add up to last Channel.MAX_HISTORY messages

From d1ec99ffd9c790bf57f10a9592bd9e06b7b4df53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Apr 2020 16:51:22 +0900
Subject: [PATCH 02521/10326] Further improve beatmap carousel load performance
 by avoiding incorrect query construction

---
 osu.Game/Beatmaps/BeatmapManager.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 5651d07566..b8dfac0342 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -300,7 +300,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="includes">The level of detail to include in the returned objects.</param>
         /// <returns>A list of available <see cref="BeatmapSetInfo"/>.</returns>
-        public IQueryable<BeatmapSetInfo> GetAllUsableBeatmapSetsEnumerable(IncludedDetails includes)
+        public IEnumerable<BeatmapSetInfo> GetAllUsableBeatmapSetsEnumerable(IncludedDetails includes)
         {
             IQueryable<BeatmapSetInfo> queryable;
 
@@ -319,7 +319,10 @@ namespace osu.Game.Beatmaps
                     break;
             }
 
-            return queryable.Where(s => !s.DeletePending && !s.Protected);
+            // AsEnumerable used here to avoid applying the WHERE in sql. When done so, ef core 2.x uses an incorrect ORDER BY
+            // clause which causes queries to take 5-10x longer.
+            // TODO: remove if upgrading to EF core 3.x.
+            return queryable.AsEnumerable().Where(s => !s.DeletePending && !s.Protected);
         }
 
         /// <summary>

From 4a101ca7151cbb1bc75bb0ce5143cc863e7aa265 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Wed, 29 Apr 2020 10:46:32 +0200
Subject: [PATCH 02522/10326] Revert project config file change

---
 .idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
index 4bb9f4d2a0..7515e76054 100644
--- a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
+++ b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="2" />
+    <option name="vcsConfiguration" value="1" />
   </component>
 </project>
\ No newline at end of file

From 48733a7e2f5c4d0d02666950e5d61fe04d435f25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Apr 2020 17:53:25 +0900
Subject: [PATCH 02523/10326] Change taiko hit explosion animation to match
 stable for skins

---
 .../Skinning/LegacyHitExplosion.cs               | 10 ++++++++--
 .../UI/DefaultHitExplosion.cs                    |  3 +++
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs       | 16 +++++++---------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
index d29b574866..42d4a34b9d 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
@@ -22,8 +22,14 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         {
             base.LoadComplete();
 
-            this.FadeIn(120);
-            this.ScaleTo(0.6f).Then().ScaleTo(1, 240, Easing.OutElastic);
+            const double animation_time = 120;
+
+            this.FadeInFromZero(animation_time).Then().FadeOut(animation_time * 1.5);
+
+            this.ScaleTo(0.6f)
+                .Then().ScaleTo(1.1f, animation_time * 0.8)
+                .Then().ScaleTo(0.9f, animation_time * 0.4)
+                .Then().ScaleTo(1f, animation_time * 0.2);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
index aa444d0494..a0ca5f1c39 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
@@ -49,6 +49,9 @@ namespace osu.Game.Rulesets.Taiko.UI
             base.LoadComplete();
 
             this.ScaleTo(3f, 1000, Easing.OutQuint);
+            this.FadeOut(500);
+
+            Expire(true);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index 35a54d6ea7..f0585b9c50 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -23,6 +23,12 @@ namespace osu.Game.Rulesets.Taiko.UI
         [Cached(typeof(DrawableHitObject))]
         public readonly DrawableHitObject JudgedObject;
 
+        private SkinnableDrawable skinnable;
+
+        public override double LifetimeStart => skinnable.Drawable.LifetimeStart;
+
+        public override double LifetimeEnd => skinnable.Drawable.LifetimeEnd;
+
         public HitExplosion(DrawableHitObject judgedObject)
         {
             JudgedObject = judgedObject;
@@ -39,7 +45,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(JudgedObject.Result?.Type ?? HitResult.Great)), _ => new DefaultHitExplosion());
+            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(JudgedObject.Result?.Type ?? HitResult.Great)), _ => new DefaultHitExplosion());
         }
 
         private TaikoSkinComponents getComponentName(HitResult resultType)
@@ -59,14 +65,6 @@ namespace osu.Game.Rulesets.Taiko.UI
             throw new ArgumentOutOfRangeException(nameof(resultType), "Invalid result type");
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            this.FadeOut(500);
-            Expire(true);
-        }
-
         /// <summary>
         /// Transforms this hit explosion to visualise a secondary hit.
         /// </summary>

From 511f7aeb28084553d2d60fb035aa4c296f856df8 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Wed, 29 Apr 2020 10:55:39 +0200
Subject: [PATCH 02524/10326] Remove rider plugin config

---
 .idea/.idea.osu.Desktop/.idea/discord.xml | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 .idea/.idea.osu.Desktop/.idea/discord.xml

diff --git a/.idea/.idea.osu.Desktop/.idea/discord.xml b/.idea/.idea.osu.Desktop/.idea/discord.xml
deleted file mode 100644
index 59b11d1d39..0000000000
--- a/.idea/.idea.osu.Desktop/.idea/discord.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DiscordProjectSettings">
-    <option name="show" value="true" />
-  </component>
-  <component name="ProjectNotificationSettings">
-    <option name="askShowProject" value="false" />
-  </component>
-</project>
\ No newline at end of file

From 43e768240f8a1dcba8179efef6dcd09c8f150934 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Wed, 29 Apr 2020 10:57:07 +0200
Subject: [PATCH 02525/10326] Revert "Revert project config file change"

This reverts commit 4a101ca7151cbb1bc75bb0ce5143cc863e7aa265.
---
 .idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
index 7515e76054..4bb9f4d2a0 100644
--- a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
+++ b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="1" />
+    <option name="vcsConfiguration" value="2" />
   </component>
 </project>
\ No newline at end of file

From 6e2ed0c4f3f4389e32e84d548262b5037daa015e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 29 Apr 2020 20:28:46 +0200
Subject: [PATCH 02526/10326] Refactor mascot to only contain state transitions

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs  |  47 ++++----
 .../UI/DrawableTaikoMascot.cs                 | 109 +++++++-----------
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |   8 +-
 3 files changed, 67 insertions(+), 97 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 2966c90b5e..f37c723a36 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -41,26 +42,25 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         [Test]
         public void TestStateTextures()
         {
-            AddStep("Set beatmap", () => setBeatmap());
+            AddStep("set beatmap", () => setBeatmap());
 
-            AddStep("Create mascot (idle)", () =>
+            AddStep("create mascot", () =>
             {
                 SetContents(() => new TestDrawableTaikoMascot());
             });
 
-            AddStep("Clear state", () => setState(TaikoMascotAnimationState.Clear));
-
-            AddStep("Kiai state", () => setState(TaikoMascotAnimationState.Kiai));
-
-            AddStep("Fail state", () => setState(TaikoMascotAnimationState.Fail));
+            AddStep("clear state", () => setState(TaikoMascotAnimationState.Clear));
+            AddStep("kiai state", () => setState(TaikoMascotAnimationState.Kiai));
+            AddStep("fail state", () => setState(TaikoMascotAnimationState.Fail));
+            AddStep("idle state", () => setState(TaikoMascotAnimationState.Idle));
         }
 
         [Test]
         public void TestPlayfield()
         {
-            AddStep("Set beatmap", () => setBeatmap());
+            AddStep("set beatmap", () => setBeatmap());
 
-            AddStep("Create ruleset", () =>
+            AddStep("create drawable ruleset", () =>
             {
                 SetContents(() =>
                 {
@@ -69,21 +69,21 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 });
             });
 
-            AddStep("Create hit (great)", () => addJudgement(HitResult.Miss));
-            AddUntilStep("Wait for idle state", () => checkForState(TaikoMascotAnimationState.Fail));
+            AddStep("new judgement (miss)", () => addJudgement(HitResult.Miss));
+            AddUntilStep("wait for fail state", () => assertState(TaikoMascotAnimationState.Fail));
 
-            AddStep("Create hit (great)", () => addJudgement(HitResult.Great));
-            AddUntilStep("Wait for idle state", () => checkForState(TaikoMascotAnimationState.Idle));
+            AddStep("new judgement (great)", () => addJudgement(HitResult.Great));
+            AddUntilStep("wait for idle state", () => assertState(TaikoMascotAnimationState.Idle));
         }
 
         [Test]
         public void TestKiai()
         {
-            AddStep("Set beatmap", () => setBeatmap(true));
+            AddStep("set beatmap", () => setBeatmap(true));
 
-            AddUntilStep("Wait for beatmap to be loaded", () => Beatmap.Value.Track.IsLoaded);
+            AddUntilStep("wait for beatmap to be loaded", () => Beatmap.Value.Track.IsLoaded);
 
-            AddStep("Create kiai ruleset", () =>
+            AddStep("create drawable ruleset", () =>
             {
                 Beatmap.Value.Track.Start();
 
@@ -94,10 +94,10 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 });
             });
 
-            AddUntilStep("Wait for idle state", () => checkForState(TaikoMascotAnimationState.Fail));
+            AddUntilStep("wait for fail state", () => assertState(TaikoMascotAnimationState.Fail));
 
-            AddStep("Create hit (great)", () => addJudgement(HitResult.Great));
-            AddUntilStep("Wait for kiai state", () => checkForState(TaikoMascotAnimationState.Kiai));
+            AddStep("new judgement (great)", () => addJudgement(HitResult.Great));
+            AddUntilStep("wait for kiai state", () => assertState(TaikoMascotAnimationState.Kiai));
         }
 
         private void setBeatmap(bool kiai = false)
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         private void setState(TaikoMascotAnimationState state)
         {
             foreach (var mascot in mascots)
-                mascot?.ShowState(state);
+                mascot.State.Value = state;
         }
 
         private void addJudgement(HitResult result)
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             }
         }
 
-        private bool checkForState(TaikoMascotAnimationState state) => mascots.All(d => d.State == state);
+        private bool assertState(TaikoMascotAnimationState state) => mascots.All(d => d.State.Value == state);
 
         private class TestDrawableTaikoMascot : DrawableTaikoMascot
         {
@@ -152,10 +152,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             {
             }
 
-            protected override TaikoMascotAnimationState GetFinalAnimationState(EffectControlPoint effectPoint, TaikoMascotAnimationState playfieldState)
-            {
-                return State;
-            }
+            public new Bindable<TaikoMascotAnimationState> State => base.State;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index 7c4dfe2da7..be744de5f4 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -1,29 +1,36 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
+using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
     public class DrawableTaikoMascot : BeatSyncedContainer
     {
-        private TaikoMascotTextureAnimation idleDrawable, clearDrawable, kiaiDrawable, failDrawable;
-        private EffectControlPoint lastEffectControlPoint;
-        private TaikoMascotAnimationState playfieldState;
+        protected Bindable<TaikoMascotAnimationState> State { get; }
 
-        public TaikoMascotAnimationState State { get; private set; }
+        private readonly Dictionary<TaikoMascotAnimationState, TaikoMascotTextureAnimation> animations;
+        private Drawable currentAnimation;
+
+        private bool lastHitMissed;
+        private bool kiaiMode;
 
         public DrawableTaikoMascot(TaikoMascotAnimationState startingState = TaikoMascotAnimationState.Idle)
         {
             RelativeSizeAxes = Axes.Both;
 
-            State = startingState;
+            State = new Bindable<TaikoMascotAnimationState>(startingState);
+            animations = new Dictionary<TaikoMascotAnimationState, TaikoMascotTextureAnimation>();
         }
 
         [BackgroundDependencyLoader]
@@ -31,81 +38,53 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             InternalChildren = new[]
             {
-                idleDrawable = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Idle),
-                clearDrawable = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Clear),
-                kiaiDrawable = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Kiai),
-                failDrawable = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Fail),
+                animations[TaikoMascotAnimationState.Idle] = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Idle),
+                animations[TaikoMascotAnimationState.Clear] = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Clear),
+                animations[TaikoMascotAnimationState.Kiai] = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Kiai),
+                animations[TaikoMascotAnimationState.Fail] = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Fail),
             };
 
-            ShowState(State);
+            updateState();
         }
 
-        public void ShowState(TaikoMascotAnimationState state)
+        protected override void LoadComplete()
         {
-            foreach (var child in InternalChildren)
-                child.Hide();
+            base.LoadComplete();
 
-            State = state;
-
-            var drawable = getStateDrawable(State);
-            drawable.Show();
+            animations.Values.ForEach(animation => animation.Hide());
+            State.BindValueChanged(mascotStateChanged, true);
         }
 
-        /// <summary>
-        /// Sets the playfield state used for determining the final state.
-        /// </summary>
-        /// <remarks>
-        /// If you're looking to change the state manually, please look at <see cref="ShowState"/>.
-        /// </remarks>
-        public void SetPlayfieldState(TaikoMascotAnimationState state)
+        public void OnNewResult(JudgementResult result)
         {
-            playfieldState = state;
-
-            if (lastEffectControlPoint != null)
-                ShowState(GetFinalAnimationState(lastEffectControlPoint, playfieldState));
-        }
-
-        private TaikoMascotTextureAnimation getStateDrawable(TaikoMascotAnimationState state)
-        {
-            switch (state)
-            {
-                case TaikoMascotAnimationState.Idle:
-                    return idleDrawable;
-
-                case TaikoMascotAnimationState.Clear:
-                    return clearDrawable;
-
-                case TaikoMascotAnimationState.Kiai:
-                    return kiaiDrawable;
-
-                case TaikoMascotAnimationState.Fail:
-                    return failDrawable;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(state), $"There's no animation available for state {state}");
-            }
-        }
-
-        protected virtual TaikoMascotAnimationState GetFinalAnimationState(EffectControlPoint effectPoint, TaikoMascotAnimationState playfieldState)
-        {
-            if (playfieldState == TaikoMascotAnimationState.Fail)
-                return playfieldState;
-
-            return effectPoint.KiaiMode ? TaikoMascotAnimationState.Kiai : TaikoMascotAnimationState.Idle;
+            lastHitMissed = result.Type == HitResult.Miss && result.Judgement.AffectsCombo;
+            updateState();
         }
 
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
         {
-            base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
+            kiaiMode = effectPoint.KiaiMode;
+            updateState();
+        }
 
-            var state = GetFinalAnimationState(lastEffectControlPoint = effectPoint, playfieldState);
-            ShowState(state);
+        private void updateState()
+        {
+            State.Value = getNextState();
+        }
 
-            if (state == TaikoMascotAnimationState.Clear)
-                return;
+        private TaikoMascotAnimationState getNextState()
+        {
+            if (lastHitMissed)
+                return TaikoMascotAnimationState.Fail;
 
-            var drawable = getStateDrawable(state);
-            drawable.Move();
+            return kiaiMode ? TaikoMascotAnimationState.Kiai : TaikoMascotAnimationState.Idle;
+        }
+
+        private void mascotStateChanged(ValueChangedEvent<TaikoMascotAnimationState> state)
+        {
+            currentAnimation?.Hide();
+            currentAnimation = animations[state.NewValue];
+            currentAnimation.Show();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index c6e867a5d9..084a11d523 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Skinning;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -216,12 +215,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             if (mascotDrawable.Drawable is DrawableTaikoMascot mascot)
             {
-                var miss = result.Type == HitResult.Miss;
-
-                if (miss && judgedObject.HitObject is StrongHitObject)
-                    miss = result.Judgement.AffectsCombo;
-
-                mascot.SetPlayfieldState(miss ? TaikoMascotAnimationState.Fail : TaikoMascotAnimationState.Idle);
+                mascot.OnNewResult(result);
             }
         }
 

From e81d33dcec78ce816fc823214ea99a0e524c69da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 29 Apr 2020 21:27:02 +0200
Subject: [PATCH 02527/10326] Refactor mascot animations to split logic paths

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs  |  35 ++----
 .../UI/DrawableTaikoMascot.cs                 |  19 +--
 .../UI/TaikoMascotAnimation.cs                | 116 ++++++++++++++++++
 .../UI/TaikoMascotTextureAnimation.cs         | 109 ----------------
 4 files changed, 133 insertions(+), 146 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
 delete mode 100644 osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index f37c723a36..28065c401c 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -27,6 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
         {
             typeof(DrawableTaikoMascot),
+            typeof(TaikoMascotAnimation)
         }).ToList();
 
         [Cached(typeof(IScrollingInfo))]
@@ -36,23 +36,18 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             TimeRange = { Value = 5000 },
         };
 
-        private IEnumerable<TestDrawableTaikoMascot> mascots => this.ChildrenOfType<TestDrawableTaikoMascot>();
+        private IEnumerable<DrawableTaikoMascot> mascots => this.ChildrenOfType<DrawableTaikoMascot>();
         private IEnumerable<TaikoPlayfield> playfields => this.ChildrenOfType<TaikoPlayfield>();
 
         [Test]
-        public void TestStateTextures()
+        public void TestStateAnimations()
         {
             AddStep("set beatmap", () => setBeatmap());
 
-            AddStep("create mascot", () =>
-            {
-                SetContents(() => new TestDrawableTaikoMascot());
-            });
-
-            AddStep("clear state", () => setState(TaikoMascotAnimationState.Clear));
-            AddStep("kiai state", () => setState(TaikoMascotAnimationState.Kiai));
-            AddStep("fail state", () => setState(TaikoMascotAnimationState.Fail));
-            AddStep("idle state", () => setState(TaikoMascotAnimationState.Idle));
+            AddStep("clear state", () => SetContents(() => new TaikoMascotAnimation(TaikoMascotAnimationState.Clear)));
+            AddStep("idle state", () => SetContents(() => new TaikoMascotAnimation(TaikoMascotAnimationState.Idle)));
+            AddStep("kiai state", () => SetContents(() => new TaikoMascotAnimation(TaikoMascotAnimationState.Kiai)));
+            AddStep("fail state", () => SetContents(() => new TaikoMascotAnimation(TaikoMascotAnimationState.Fail)));
         }
 
         [Test]
@@ -126,12 +121,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             });
         }
 
-        private void setState(TaikoMascotAnimationState state)
-        {
-            foreach (var mascot in mascots)
-                mascot.State.Value = state;
-        }
-
         private void addJudgement(HitResult result)
         {
             foreach (var playfield in playfields)
@@ -144,15 +133,5 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         }
 
         private bool assertState(TaikoMascotAnimationState state) => mascots.All(d => d.State.Value == state);
-
-        private class TestDrawableTaikoMascot : DrawableTaikoMascot
-        {
-            public TestDrawableTaikoMascot(TaikoMascotAnimationState startingState = TaikoMascotAnimationState.Idle)
-                : base(startingState)
-            {
-            }
-
-            public new Bindable<TaikoMascotAnimationState> State => base.State;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index be744de5f4..bfc1d958c2 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -17,9 +17,10 @@ namespace osu.Game.Rulesets.Taiko.UI
 {
     public class DrawableTaikoMascot : BeatSyncedContainer
     {
-        protected Bindable<TaikoMascotAnimationState> State { get; }
+        public IBindable<TaikoMascotAnimationState> State => state;
 
-        private readonly Dictionary<TaikoMascotAnimationState, TaikoMascotTextureAnimation> animations;
+        private readonly Bindable<TaikoMascotAnimationState> state;
+        private readonly Dictionary<TaikoMascotAnimationState, TaikoMascotAnimation> animations;
         private Drawable currentAnimation;
 
         private bool lastHitMissed;
@@ -29,8 +30,8 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             RelativeSizeAxes = Axes.Both;
 
-            State = new Bindable<TaikoMascotAnimationState>(startingState);
-            animations = new Dictionary<TaikoMascotAnimationState, TaikoMascotTextureAnimation>();
+            state = new Bindable<TaikoMascotAnimationState>(startingState);
+            animations = new Dictionary<TaikoMascotAnimationState, TaikoMascotAnimation>();
         }
 
         [BackgroundDependencyLoader]
@@ -38,10 +39,10 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             InternalChildren = new[]
             {
-                animations[TaikoMascotAnimationState.Idle] = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Idle),
-                animations[TaikoMascotAnimationState.Clear] = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Clear),
-                animations[TaikoMascotAnimationState.Kiai] = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Kiai),
-                animations[TaikoMascotAnimationState.Fail] = new TaikoMascotTextureAnimation(TaikoMascotAnimationState.Fail),
+                animations[TaikoMascotAnimationState.Idle] = new TaikoMascotAnimation(TaikoMascotAnimationState.Idle),
+                animations[TaikoMascotAnimationState.Clear] = new TaikoMascotAnimation(TaikoMascotAnimationState.Clear),
+                animations[TaikoMascotAnimationState.Kiai] = new TaikoMascotAnimation(TaikoMascotAnimationState.Kiai),
+                animations[TaikoMascotAnimationState.Fail] = new TaikoMascotAnimation(TaikoMascotAnimationState.Fail),
             };
 
             updateState();
@@ -69,7 +70,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private void updateState()
         {
-            State.Value = getNextState();
+            state.Value = getNextState();
         }
 
         private TaikoMascotAnimationState getNextState()
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
new file mode 100644
index 0000000000..1e289c1a74
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
@@ -0,0 +1,116 @@
+// Copyright (c) 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.Track;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public sealed class TaikoMascotAnimation : BeatSyncedContainer
+    {
+        private readonly TextureAnimation textureAnimation;
+
+        private int currentFrame;
+
+        public TaikoMascotAnimation(TaikoMascotAnimationState state)
+        {
+            InternalChild = textureAnimation = createTextureAnimation(state).With(animation =>
+            {
+                animation.Origin = animation.Anchor = Anchor.BottomLeft;
+                RelativeSizeAxes = Axes.Both;
+            });
+
+            RelativeSizeAxes = Axes.Both;
+            Origin = Anchor = Anchor.BottomLeft;
+        }
+
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        {
+            // assume that if the animation is playing on its own, it's independent from the beat and doesn't need to be touched.
+            if (textureAnimation.FrameCount == 0 || textureAnimation.IsPlaying)
+                return;
+
+            textureAnimation.GotoFrame(currentFrame);
+            currentFrame = (currentFrame + 1) % textureAnimation.FrameCount;
+        }
+
+        private static TextureAnimation createTextureAnimation(TaikoMascotAnimationState state)
+        {
+            switch (state)
+            {
+                case TaikoMascotAnimationState.Clear:
+                    return new ClearMascotTextureAnimation();
+
+                case TaikoMascotAnimationState.Idle:
+                case TaikoMascotAnimationState.Kiai:
+                case TaikoMascotAnimationState.Fail:
+                    return new ManualMascotTextureAnimation(state);
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(state), $"Mascot animations for state {state} are not supported");
+            }
+        }
+
+        private class ManualMascotTextureAnimation : TextureAnimation
+        {
+            private readonly TaikoMascotAnimationState state;
+
+            public ManualMascotTextureAnimation(TaikoMascotAnimationState state)
+            {
+                this.state = state;
+
+                IsPlaying = false;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(ISkinSource skin)
+            {
+                for (int frameIndex = 0; true; frameIndex++)
+                {
+                    var texture = getAnimationFrame(skin, state, frameIndex);
+
+                    if (texture == null)
+                        break;
+
+                    AddFrame(texture);
+                }
+            }
+        }
+
+        private class ClearMascotTextureAnimation : TextureAnimation
+        {
+            private const float clear_animation_speed = 1000 / 10f;
+
+            private static readonly int[] clear_animation_sequence = { 0, 1, 2, 3, 4, 5, 6, 5, 6, 5, 4, 3, 2, 1, 0 };
+
+            public ClearMascotTextureAnimation()
+            {
+                DefaultFrameLength = clear_animation_speed;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(ISkinSource skin)
+            {
+                foreach (var frameIndex in clear_animation_sequence)
+                {
+                    var texture = getAnimationFrame(skin, TaikoMascotAnimationState.Clear, frameIndex);
+
+                    if (texture == null)
+                        continue;
+
+                    AddFrame(texture);
+                }
+            }
+        }
+
+        private static Texture getAnimationFrame(ISkinSource skin, TaikoMascotAnimationState state, int frameIndex)
+            => skin.GetTexture($"pippidon{state.ToString().ToLower()}{frameIndex}");
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
deleted file mode 100644
index 080d30c3f2..0000000000
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
+++ /dev/null
@@ -1,109 +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.Graphics;
-using osu.Framework.Graphics.Animations;
-using osu.Game.Skinning;
-
-namespace osu.Game.Rulesets.Taiko.UI
-{
-    public sealed class TaikoMascotTextureAnimation : TextureAnimation
-    {
-        private const float clear_animation_speed = 1000 / 10f;
-        private static readonly int[] clear_animation_sequence = { 0, 1, 2, 3, 4, 5, 6, 5, 6, 5, 4, 3, 2, 1, 0 };
-        private int currentFrame;
-
-        public TaikoMascotAnimationState State { get; }
-
-        public TaikoMascotTextureAnimation(TaikoMascotAnimationState state)
-            : base(true)
-        {
-            State = state;
-
-            // We're animating on beat if it's not the clear animation
-            if (state == TaikoMascotAnimationState.Clear)
-                DefaultFrameLength = clear_animation_speed;
-            else
-                this.Stop();
-
-            Origin = Anchor.BottomLeft;
-            Anchor = Anchor.BottomLeft;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
-        {
-            if (State == TaikoMascotAnimationState.Clear)
-            {
-                foreach (var textureIndex in clear_animation_sequence)
-                {
-                    if (!addFrame(skin, textureIndex))
-                        break;
-                }
-            }
-            else
-            {
-                for (int i = 0; true; i++)
-                {
-                    if (!addFrame(skin, i))
-                        break;
-                }
-            }
-        }
-
-        private bool addFrame(ISkinSource skin, int textureIndex)
-        {
-            var textureName = getStateTextureName(textureIndex);
-            var texture = skin.GetTexture(textureName);
-
-            if (texture == null)
-                return false;
-
-            AddFrame(texture);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Advances the current frame by one.
-        /// </summary>
-        public void Move()
-        {
-            // Check whether there are frames before causing a crash.
-            if (FrameCount == 0)
-                return;
-
-            if (currentFrame >= FrameCount)
-                currentFrame = 0;
-
-            GotoFrame(currentFrame);
-
-            currentFrame += 1;
-        }
-
-        private string getStateTextureName(int i) => $"pippidon{getStateString(State)}{i}";
-
-        private string getStateString(TaikoMascotAnimationState state)
-        {
-            switch (state)
-            {
-                case TaikoMascotAnimationState.Clear:
-                    return "clear";
-
-                case TaikoMascotAnimationState.Fail:
-                    return "fail";
-
-                case TaikoMascotAnimationState.Idle:
-                    return "idle";
-
-                case TaikoMascotAnimationState.Kiai:
-                    return "kiai";
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(state), $"There's no case for animation state {state} available");
-            }
-        }
-    }
-}

From 9d6720e7e6b11f327b56c6135c46bd6711f5580b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 29 Apr 2020 21:30:13 +0200
Subject: [PATCH 02528/10326] Scope up parameter

---
 osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
index 1e289c1a74..b9af8f0106 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
-        private static Texture getAnimationFrame(ISkinSource skin, TaikoMascotAnimationState state, int frameIndex)
+        private static Texture getAnimationFrame(ISkin skin, TaikoMascotAnimationState state, int frameIndex)
             => skin.GetTexture($"pippidon{state.ToString().ToLower()}{frameIndex}");
     }
 }

From 47b040b7d8888283497858e4be2734bc2a6c5341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 29 Apr 2020 21:42:28 +0200
Subject: [PATCH 02529/10326] Cover strong hit miss exemption in tests

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 28065c401c..81ea9c0755 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -64,11 +64,14 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 });
             });
 
-            AddStep("new judgement (miss)", () => addJudgement(HitResult.Miss));
-            AddUntilStep("wait for fail state", () => assertState(TaikoMascotAnimationState.Fail));
+            AddStep("miss result for normal hit", () => addJudgement(HitResult.Miss, new TaikoJudgement()));
+            AddUntilStep("state is fail", () => assertState(TaikoMascotAnimationState.Fail));
 
-            AddStep("new judgement (great)", () => addJudgement(HitResult.Great));
-            AddUntilStep("wait for idle state", () => assertState(TaikoMascotAnimationState.Idle));
+            AddStep("great result for normal hit", () => addJudgement(HitResult.Great, new TaikoJudgement()));
+            AddUntilStep("state is idle", () => assertState(TaikoMascotAnimationState.Idle));
+
+            AddStep("miss result for strong hit", () => addJudgement(HitResult.Miss, new TaikoStrongJudgement()));
+            AddAssert("state remains idle", () => assertState(TaikoMascotAnimationState.Idle));
         }
 
         [Test]
@@ -89,10 +92,10 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 });
             });
 
-            AddUntilStep("wait for fail state", () => assertState(TaikoMascotAnimationState.Fail));
+            AddUntilStep("state is fail", () => assertState(TaikoMascotAnimationState.Fail));
 
-            AddStep("new judgement (great)", () => addJudgement(HitResult.Great));
-            AddUntilStep("wait for kiai state", () => assertState(TaikoMascotAnimationState.Kiai));
+            AddStep("great result for normal hit", () => addJudgement(HitResult.Great, new TaikoJudgement()));
+            AddUntilStep("state is kiai", () => assertState(TaikoMascotAnimationState.Kiai));
         }
 
         private void setBeatmap(bool kiai = false)
@@ -121,14 +124,14 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             });
         }
 
-        private void addJudgement(HitResult result)
+        private void addJudgement(HitResult result, Judgement judgement)
         {
             foreach (var playfield in playfields)
             {
                 var hit = new DrawableTestHit(new Hit(), result);
                 Add(hit);
 
-                playfield.OnNewResult(hit, new JudgementResult(hit.HitObject, new TaikoJudgement()) { Type = result });
+                playfield.OnNewResult(hit, new JudgementResult(hit.HitObject, judgement) { Type = result });
             }
         }
 

From 0d917ca339fbc6783587913a7190eab9733add91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 29 Apr 2020 21:52:09 +0200
Subject: [PATCH 02530/10326] Ensure correct behaviour for clear animation

---
 osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
index b9af8f0106..ee1389147d 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
@@ -103,7 +103,8 @@ namespace osu.Game.Rulesets.Taiko.UI
                     var texture = getAnimationFrame(skin, TaikoMascotAnimationState.Clear, frameIndex);
 
                     if (texture == null)
-                        continue;
+                        // as per https://osu.ppy.sh/help/wiki/Skinning/osu!taiko#pippidon
+                        break;
 
                     AddFrame(texture);
                 }

From b0e97793b6bea128746817734051055dcb484dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Apr 2020 00:14:27 +0200
Subject: [PATCH 02531/10326] Implement transitions into and from clear state

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs  | 40 ++++++++++++++++---
 .../UI/DrawableTaikoMascot.cs                 | 16 ++++----
 .../UI/TaikoMascotAnimation.cs                | 10 +++++
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 81ea9c0755..0018899769 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -50,6 +52,31 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             AddStep("fail state", () => SetContents(() => new TaikoMascotAnimation(TaikoMascotAnimationState.Fail)));
         }
 
+        [Test]
+        public void TestClearStateTransition()
+        {
+            AddStep("set beatmap", () => setBeatmap());
+
+            // the bindables need to be independent for each content cell to prevent interference,
+            // as if some of the skins don't implement the animation they'll immediately revert to the previous state from the clear state.
+            var states = new List<Bindable<TaikoMascotAnimationState>>();
+
+            AddStep("create mascot", () => SetContents(() =>
+            {
+                var state = new Bindable<TaikoMascotAnimationState>(TaikoMascotAnimationState.Clear);
+                states.Add(state);
+                return new DrawableTaikoMascot { State = { BindTarget = state } };
+            }));
+
+            AddStep("set clear state", () => states.ForEach(state => state.Value = TaikoMascotAnimationState.Clear));
+            AddStep("miss", () => mascots.ForEach(mascot => mascot.OnNewResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss })));
+            AddAssert("skins with animations remain in clear state", () => mascots.Any(mascot => mascot.State.Value == TaikoMascotAnimationState.Clear));
+            AddUntilStep("state reverts to fail", () => someMascotsIn(TaikoMascotAnimationState.Fail));
+
+            AddStep("set clear state again", () => states.ForEach(state => state.Value = TaikoMascotAnimationState.Clear));
+            AddAssert("skins with animations change to clear", () => someMascotsIn(TaikoMascotAnimationState.Clear));
+        }
+
         [Test]
         public void TestPlayfield()
         {
@@ -65,13 +92,13 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             });
 
             AddStep("miss result for normal hit", () => addJudgement(HitResult.Miss, new TaikoJudgement()));
-            AddUntilStep("state is fail", () => assertState(TaikoMascotAnimationState.Fail));
+            AddUntilStep("state is fail", () => allMascotsIn(TaikoMascotAnimationState.Fail));
 
             AddStep("great result for normal hit", () => addJudgement(HitResult.Great, new TaikoJudgement()));
-            AddUntilStep("state is idle", () => assertState(TaikoMascotAnimationState.Idle));
+            AddUntilStep("state is idle", () => allMascotsIn(TaikoMascotAnimationState.Idle));
 
             AddStep("miss result for strong hit", () => addJudgement(HitResult.Miss, new TaikoStrongJudgement()));
-            AddAssert("state remains idle", () => assertState(TaikoMascotAnimationState.Idle));
+            AddAssert("state remains idle", () => allMascotsIn(TaikoMascotAnimationState.Idle));
         }
 
         [Test]
@@ -92,10 +119,10 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 });
             });
 
-            AddUntilStep("state is fail", () => assertState(TaikoMascotAnimationState.Fail));
+            AddUntilStep("state is fail", () => allMascotsIn(TaikoMascotAnimationState.Fail));
 
             AddStep("great result for normal hit", () => addJudgement(HitResult.Great, new TaikoJudgement()));
-            AddUntilStep("state is kiai", () => assertState(TaikoMascotAnimationState.Kiai));
+            AddUntilStep("state is kiai", () => allMascotsIn(TaikoMascotAnimationState.Kiai));
         }
 
         private void setBeatmap(bool kiai = false)
@@ -135,6 +162,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             }
         }
 
-        private bool assertState(TaikoMascotAnimationState state) => mascots.All(d => d.State.Value == state);
+        private bool allMascotsIn(TaikoMascotAnimationState state) => mascots.All(d => d.State.Value == state);
+        private bool someMascotsIn(TaikoMascotAnimationState state) => mascots.Any(d => d.State.Value == state);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index bfc1d958c2..f4bc841c15 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private readonly Bindable<TaikoMascotAnimationState> state;
         private readonly Dictionary<TaikoMascotAnimationState, TaikoMascotAnimation> animations;
-        private Drawable currentAnimation;
+        private TaikoMascotAnimation currentAnimation;
 
         private bool lastHitMissed;
         private bool kiaiMode;
@@ -44,8 +44,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                 animations[TaikoMascotAnimationState.Kiai] = new TaikoMascotAnimation(TaikoMascotAnimationState.Kiai),
                 animations[TaikoMascotAnimationState.Fail] = new TaikoMascotAnimation(TaikoMascotAnimationState.Fail),
             };
-
-            updateState();
         }
 
         protected override void LoadComplete()
@@ -53,28 +51,32 @@ namespace osu.Game.Rulesets.Taiko.UI
             base.LoadComplete();
 
             animations.Values.ForEach(animation => animation.Hide());
-            State.BindValueChanged(mascotStateChanged, true);
+            state.BindValueChanged(mascotStateChanged, true);
         }
 
         public void OnNewResult(JudgementResult result)
         {
             lastHitMissed = result.Type == HitResult.Miss && result.Judgement.AffectsCombo;
-            updateState();
         }
 
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
         {
             kiaiMode = effectPoint.KiaiMode;
-            updateState();
         }
 
-        private void updateState()
+        protected override void Update()
         {
+            base.Update();
             state.Value = getNextState();
         }
 
         private TaikoMascotAnimationState getNextState()
         {
+            // don't change state if current animation is playing
+            // (used for clear state - others are manually animated on new beats)
+            if (currentAnimation != null && !currentAnimation.Completed)
+                return state.Value;
+
             if (lastHitMissed)
                 return TaikoMascotAnimationState.Fail;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
index ee1389147d..165e00cc73 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
@@ -29,6 +29,15 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             RelativeSizeAxes = Axes.Both;
             Origin = Anchor = Anchor.BottomLeft;
+            AlwaysPresent = true;
+        }
+
+        public bool Completed => !textureAnimation.IsPlaying || textureAnimation.PlaybackPosition >= textureAnimation.Duration;
+
+        public override void Show()
+        {
+            base.Show();
+            textureAnimation.Seek(0);
         }
 
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
@@ -93,6 +102,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             public ClearMascotTextureAnimation()
             {
                 DefaultFrameLength = clear_animation_speed;
+                Loop = false;
             }
 
             [BackgroundDependencyLoader]

From 783dc58ef0f600073ef115f4e4868902f96473ea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Apr 2020 09:41:56 +0900
Subject: [PATCH 02532/10326] Move taiko additive blending locally to avoid
 applying to legacy skins

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs | 2 ++
 osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs         | 2 ++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs           | 3 ---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
index 42d4a34b9d..c44da9ce1e 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             Origin = Anchor.Centre;
 
             AutoSizeAxes = Axes.Both;
+
+            Blending = BlendingParameters.Additive;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
index 3a307bb3bb..067d390894 100644
--- a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Rulesets.Taiko.UI
             RelativeSizeAxes = Axes.Both;
             Size = new Vector2(TaikoHitObject.DEFAULT_SIZE, 1);
 
+            Blending = BlendingParameters.Additive;
+
             Masking = true;
             Alpha = 0.25f;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 6a78c0a1fb..5c763cb332 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -68,7 +68,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                                 hitExplosionContainer = new Container<HitExplosion>
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Blending = BlendingParameters.Additive,
                                 },
                                 HitTarget = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.HitTarget), _ => new TaikoHitTarget())
                                 {
@@ -100,13 +99,11 @@ namespace osu.Game.Rulesets.Taiko.UI
                                     Name = "Kiai hit explosions",
                                     RelativeSizeAxes = Axes.Both,
                                     FillMode = FillMode.Fit,
-                                    Blending = BlendingParameters.Additive
                                 },
                                 judgementContainer = new JudgementContainer<DrawableTaikoJudgement>
                                 {
                                     Name = "Judgements",
                                     RelativeSizeAxes = Axes.Y,
-                                    Blending = BlendingParameters.Additive
                                 },
                             }
                         },

From 49a98fde7374055a8b2aa5286b733ec3673f55ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Apr 2020 09:57:14 +0900
Subject: [PATCH 02533/10326] Move to non-legacy class

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs | 2 --
 osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs      | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
index c44da9ce1e..42d4a34b9d 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             Origin = Anchor.Centre;
 
             AutoSizeAxes = Axes.Both;
-
-            Blending = BlendingParameters.Additive;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
index a0ca5f1c39..9943a58e3e 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Rulesets.Taiko.UI
             BorderColour = Color4.White;
             BorderThickness = 1;
 
+            Blending = BlendingParameters.Additive;
+
             Alpha = 0.15f;
             Masking = true;
 

From cf4e79cf38490ecb85f213b154dc7eef3ffb14ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Apr 2020 11:51:06 +0900
Subject: [PATCH 02534/10326] Show loading spinner when carousel is not ready
 to be displayed

---
 .../SongSelect/TestScenePlaySongSelect.cs     |  1 +
 osu.Game/Screens/Select/SongSelect.cs         | 33 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 39e04ed39a..aed8e19fb2 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -797,6 +797,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             AddStep("create song select", () => LoadScreen(songSelect = new TestSongSelect()));
             AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
+            AddUntilStep("wait for carousel loaded", () => songSelect.Carousel.IsAlive);
         }
 
         private void addManyTestMaps()
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index c07465ca44..6b896694ea 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -34,6 +34,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Select
@@ -92,6 +93,8 @@ namespace osu.Game.Screens.Select
         private SampleChannel sampleChangeDifficulty;
         private SampleChannel sampleChangeBeatmap;
 
+        private Container carouselContainer;
+
         protected BeatmapDetailArea BeatmapDetails { get; private set; }
 
         private readonly Bindable<RulesetInfo> decoupledRuleset = new Bindable<RulesetInfo>();
@@ -105,9 +108,22 @@ namespace osu.Game.Screens.Select
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
 
+            LoadComponentAsync(Carousel = new BeatmapCarousel
+            {
+                AllowSelection = false, // delay any selection until our bindables are ready to make a good choice.
+                Anchor = Anchor.CentreRight,
+                Origin = Anchor.CentreRight,
+                RelativeSizeAxes = Axes.Both,
+                BleedTop = FilterControl.HEIGHT,
+                BleedBottom = Footer.HEIGHT,
+                SelectionChanged = updateSelectedBeatmap,
+                BeatmapSetsChanged = carouselBeatmapsLoaded,
+                GetRecommendedBeatmap = (recommender = new DifficultyRecommender()).GetRecommendedBeatmap,
+            }, c => carouselContainer.Child = c);
+
             AddRangeInternal(new Drawable[]
             {
-                recommender = new DifficultyRecommender(),
+                recommender,
                 new ResetScrollContainer(() => Carousel.ScrollToSelected())
                 {
                     RelativeSizeAxes = Axes.Y,
@@ -139,7 +155,7 @@ namespace osu.Game.Screens.Select
                                             Padding = new MarginPadding { Right = -150 },
                                         },
                                     },
-                                    new Container
+                                    carouselContainer = new Container
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         Padding = new MarginPadding
@@ -147,18 +163,7 @@ namespace osu.Game.Screens.Select
                                             Top = FilterControl.HEIGHT,
                                             Bottom = Footer.HEIGHT
                                         },
-                                        Child = Carousel = new BeatmapCarousel
-                                        {
-                                            AllowSelection = false, // delay any selection until our bindables are ready to make a good choice.
-                                            Anchor = Anchor.CentreRight,
-                                            Origin = Anchor.CentreRight,
-                                            RelativeSizeAxes = Axes.Both,
-                                            BleedTop = FilterControl.HEIGHT,
-                                            BleedBottom = Footer.HEIGHT,
-                                            SelectionChanged = updateSelectedBeatmap,
-                                            BeatmapSetsChanged = carouselBeatmapsLoaded,
-                                            GetRecommendedBeatmap = recommender.GetRecommendedBeatmap,
-                                        },
+                                        Child = new LoadingSpinner(true) { State = { Value = Visibility.Visible } }
                                     }
                                 },
                             }

From 21c6ac8c43725f8739dcaea3a2b6105e7feab142 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Apr 2020 12:12:28 +0900
Subject: [PATCH 02535/10326] Allow closing the game during intro

---
 osu.Game/OsuGame.cs                  | 5 +----
 osu.Game/Screens/Menu/IntroScreen.cs | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index f5f7d0cef4..8e62819c95 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -914,10 +914,7 @@ namespace osu.Game
             if (ScreenStack.CurrentScreen is Loader)
                 return false;
 
-            if (introScreen == null)
-                return true;
-
-            if (!introScreen.DidLoadMenu || !(ScreenStack.CurrentScreen is IntroScreen))
+            if (introScreen.DidLoadMenu && !(ScreenStack.CurrentScreen is IntroScreen))
             {
                 Scheduler.Add(introScreen.MakeCurrent);
                 return true;
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index d2296573a6..736202ee52 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -96,8 +96,6 @@ namespace osu.Game.Screens.Menu
             Track = introBeatmap.Track;
         }
 
-        public override bool OnExiting(IScreen next) => !DidLoadMenu;
-
         public override void OnResuming(IScreen last)
         {
             this.FadeIn(300);

From 48af4d4eb4fc3ef8abf757ab512211defddee949 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Apr 2020 16:18:15 +0900
Subject: [PATCH 02536/10326] Fix skinned taiko hit explosions not being
 removed on rewind

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
index 42d4a34b9d..b5ec2e8def 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 .Then().ScaleTo(1.1f, animation_time * 0.8)
                 .Then().ScaleTo(0.9f, animation_time * 0.4)
                 .Then().ScaleTo(1f, animation_time * 0.2);
+
+            Expire(true);
         }
     }
 }

From d0a8c0fa71bfe372a535380d258eb259b7f60dd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Apr 2020 16:42:38 +0900
Subject: [PATCH 02537/10326] Add kiai support to osu!taiko skinned playfields

---
 .../Skinning/TestSceneTaikoPlayfield.cs       | 18 ++++++
 .../TaikoLegacyPlayfieldBackgroundRight.cs    | 57 +++++++++++++++++++
 .../Skinning/TaikoLegacySkinTransformer.cs    |  9 +--
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  4 +-
 osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs |  4 ++
 5 files changed, 82 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
index 16b3c036a3..ae5dd1e622 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
@@ -9,6 +9,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Taiko.Beatmaps;
 using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -34,6 +35,18 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         public TestSceneTaikoPlayfield()
         {
+            TaikoBeatmap beatmap;
+            bool kiai = false;
+
+            AddStep("set beatmap", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(beatmap = new TaikoBeatmap());
+
+                beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 1000 });
+
+                Beatmap.Value.Track.Start();
+            });
+
             AddStep("Load playfield", () => SetContents(() => new TaikoPlayfield(new ControlPointInfo())
             {
                 Anchor = Anchor.CentreLeft,
@@ -41,6 +54,11 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             }));
 
             AddRepeatStep("change height", () => this.ChildrenOfType<TaikoPlayfield>().ForEach(p => p.Height = Math.Max(0.2f, (p.Height + 0.2f) % 1f)), 50);
+
+            AddStep("Toggle kiai", () =>
+            {
+                Beatmap.Value.Beatmap.ControlPointInfo.Add(0, new EffectControlPoint { KiaiMode = (kiai = !kiai) });
+            });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs
new file mode 100644
index 0000000000..7508c75231
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.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 osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.Skinning
+{
+    public class TaikoLegacyPlayfieldBackgroundRight : BeatSyncedContainer
+    {
+        private Sprite kiai;
+
+        private bool kiaiDisplayed;
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new Sprite
+                {
+                    Texture = skin.GetTexture("taiko-bar-right"),
+                    RelativeSizeAxes = Axes.Both,
+                    Size = Vector2.One,
+                },
+                kiai = new Sprite
+                {
+                    Texture = skin.GetTexture("taiko-bar-right-glow"),
+                    RelativeSizeAxes = Axes.Both,
+                    Size = Vector2.One,
+                    Alpha = 0,
+                }
+            };
+        }
+
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        {
+            base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
+
+            if (effectPoint.KiaiMode != kiaiDisplayed)
+            {
+                kiaiDisplayed = effectPoint.KiaiMode;
+
+                kiai.ClearTransforms();
+                kiai.FadeTo(kiaiDisplayed ? 1 : 0, 200);
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index f0df612e18..5dfc7ec0df 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
 {
@@ -60,13 +59,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                 case TaikoSkinComponents.PlayfieldBackgroundRight:
                     if (GetTexture("taiko-bar-right") != null)
-                    {
-                        return this.GetAnimation("taiko-bar-right", false, false).With(d =>
-                        {
-                            d.RelativeSizeAxes = Axes.Both;
-                            d.Size = Vector2.One;
-                        });
-                    }
+                        return new TaikoLegacyPlayfieldBackgroundRight();
 
                     return null;
 
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index f30340956a..d2804bdc05 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Beatmaps
 
         public override string ToString() => BeatmapInfo.ToString();
 
-        public bool BeatmapLoaded => beatmapLoadTask?.IsCompleted ?? false;
+        public virtual bool BeatmapLoaded => beatmapLoadTask?.IsCompleted ?? false;
 
         public IBeatmap Beatmap
         {
@@ -233,7 +233,7 @@ namespace osu.Game.Beatmaps
         protected abstract Texture GetBackground();
         private readonly RecyclableLazy<Texture> background;
 
-        public bool TrackLoaded => track.IsResultAvailable;
+        public virtual bool TrackLoaded => track.IsResultAvailable;
         public Track Track => track.Value;
         protected abstract Track GetTrack();
         private RecyclableLazy<Track> track;
diff --git a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
index 8f8afb87d4..cdf9170701 100644
--- a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
@@ -27,6 +27,10 @@ namespace osu.Game.Tests.Beatmaps
             this.storyboard = storyboard;
         }
 
+        public override bool TrackLoaded => true;
+
+        public override bool BeatmapLoaded => true;
+
         protected override IBeatmap GetBeatmap() => beatmap;
 
         protected override Storyboard GetStoryboard() => storyboard ?? base.GetStoryboard();

From 9bec42bc7ee8e59a1e9faebdc9388350259a7212 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Apr 2020 20:03:46 +0900
Subject: [PATCH 02538/10326] Fix mania crashing on undo/redo

---
 osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index 17eba87076..45a0a5c485 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -84,7 +84,11 @@ namespace osu.Game.Screens.Edit
         {
             using (var stream = new MemoryStream(state))
             using (var reader = new LineBufferedReader(stream, true))
-                return new PassThroughWorkingBeatmap(Decoder.GetDecoder<Beatmap>(reader).Decode(reader)).GetPlayableBeatmap(editorBeatmap.BeatmapInfo.Ruleset);
+            {
+                var decoded = Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
+                decoded.BeatmapInfo.Ruleset = editorBeatmap.BeatmapInfo.Ruleset;
+                return new PassThroughWorkingBeatmap(decoded).GetPlayableBeatmap(editorBeatmap.BeatmapInfo.Ruleset);
+            }
         }
 
         private class PassThroughWorkingBeatmap : WorkingBeatmap

From c96bc5c51cdfe0f607ebd9925ab160358fb10a81 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Apr 2020 20:39:41 +0900
Subject: [PATCH 02539/10326] Fix undo/redo behaving poorly with simultaneous
 objects

---
 .../Editing/LegacyEditorBeatmapPatcherTest.cs | 25 +++++++++++++++++++
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 20 ++++++++++++---
 .../Edit/LegacyEditorBeatmapPatcher.cs        |  6 +++--
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
index a3ab677d96..ff17f23d50 100644
--- a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
+++ b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
@@ -304,6 +304,31 @@ namespace osu.Game.Tests.Editing
             runTest(patch);
         }
 
+        [Test]
+        public void TestChangeHitObjectAtSameTime()
+        {
+            current.AddRange(new[]
+            {
+                new HitCircle { StartTime = 500, Position = new Vector2(50) },
+                new HitCircle { StartTime = 500, Position = new Vector2(100) },
+                new HitCircle { StartTime = 500, Position = new Vector2(150) },
+                new HitCircle { StartTime = 500, Position = new Vector2(200) },
+            });
+
+            var patch = new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 500, Position = new Vector2(150) },
+                    new HitCircle { StartTime = 500, Position = new Vector2(100) },
+                    new HitCircle { StartTime = 500, Position = new Vector2(50) },
+                    new HitCircle { StartTime = 500, Position = new Vector2(200) },
+                }
+            };
+
+            runTest(patch);
+        }
+
         private void runTest(IBeatmap patch)
         {
             // Due to the method of testing, "patch" comes in without having been decoded via a beatmap decoder.
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index a2d2f08ce9..2e8e03bc73 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -136,14 +136,26 @@ namespace osu.Game.Screens.Edit
         /// <param name="hitObject">The <see cref="HitObject"/> to add.</param>
         public void Add(HitObject hitObject)
         {
-            trackStartTime(hitObject);
-
             // Preserve existing sorting order in the beatmap
             var insertionIndex = findInsertionIndex(PlayableBeatmap.HitObjects, hitObject.StartTime);
-            mutableHitObjects.Insert(insertionIndex + 1, hitObject);
+            Insert(insertionIndex + 1, hitObject);
+        }
+
+        /// <summary>
+        /// Inserts a <see cref="HitObject"/> into this <see cref="EditorBeatmap"/>.
+        /// </summary>
+        /// <remarks>
+        /// It is the invoker's responsibility to make sure that <see cref="HitObject"/> sorting order is maintained.
+        /// </remarks>
+        /// <param name="index">The index to insert the <see cref="HitObject"/> at.</param>
+        /// <param name="hitObject">The <see cref="HitObject"/> to insert.</param>
+        public void Insert(int index, HitObject hitObject)
+        {
+            trackStartTime(hitObject);
+
+            mutableHitObjects.Insert(index, hitObject);
 
             HitObjectAdded?.Invoke(hitObject);
-
             updateHitObject(hitObject, true);
         }
 
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index 17eba87076..04faba6478 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -63,8 +63,10 @@ namespace osu.Game.Screens.Edit
                 }
             }
 
-            // Make the removal indices are sorted so that iteration order doesn't get messed up post-removal.
+            // Sort the indices to ensure that removal + insertion indices don't get jumbled up post-removal or post-insertion.
+            // This isn't strictly required, but the differ makes no guarantees about order.
             toRemove.Sort();
+            toAdd.Sort();
 
             // Apply the changes.
             for (int i = toRemove.Count - 1; i >= 0; i--)
@@ -74,7 +76,7 @@ namespace osu.Game.Screens.Edit
             {
                 IBeatmap newBeatmap = readBeatmap(newState);
                 foreach (var i in toAdd)
-                    editorBeatmap.Add(newBeatmap.HitObjects[i]);
+                    editorBeatmap.Insert(i, newBeatmap.HitObjects[i]);
             }
         }
 

From 000c34dc26ea9d815f0f76c32510f1a0b5f600a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Apr 2020 21:01:53 +0900
Subject: [PATCH 02540/10326] Move recommender to field construction

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 6b896694ea..a7e27c27ba 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Select
 
         protected BeatmapCarousel Carousel { get; private set; }
 
-        private DifficultyRecommender recommender;
+        private readonly DifficultyRecommender recommender = new DifficultyRecommender();
 
         private BeatmapInfoWedge beatmapInfoWedge;
         private DialogOverlay dialogOverlay;
@@ -118,7 +118,7 @@ namespace osu.Game.Screens.Select
                 BleedBottom = Footer.HEIGHT,
                 SelectionChanged = updateSelectedBeatmap,
                 BeatmapSetsChanged = carouselBeatmapsLoaded,
-                GetRecommendedBeatmap = (recommender = new DifficultyRecommender()).GetRecommendedBeatmap,
+                GetRecommendedBeatmap = recommender.GetRecommendedBeatmap,
             }, c => carouselContainer.Child = c);
 
             AddRangeInternal(new Drawable[]

From 99677ac17149bff748d96954bae2e8ab0fe6bafe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Apr 2020 21:41:57 +0200
Subject: [PATCH 02541/10326] Expand test coverage of state transitions

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs  | 123 ++++++++++++------
 1 file changed, 86 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 0018899769..cdd2a38e19 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Humanizer;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -16,6 +17,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
@@ -38,9 +40,17 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             TimeRange = { Value = 5000 },
         };
 
+        private TaikoScoreProcessor scoreProcessor;
+
         private IEnumerable<DrawableTaikoMascot> mascots => this.ChildrenOfType<DrawableTaikoMascot>();
         private IEnumerable<TaikoPlayfield> playfields => this.ChildrenOfType<TaikoPlayfield>();
 
+        [SetUp]
+        public void SetUp()
+        {
+            scoreProcessor = new TaikoScoreProcessor();
+        }
+
         [Test]
         public void TestStateAnimations()
         {
@@ -78,51 +88,63 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         }
 
         [Test]
-        public void TestPlayfield()
+        public void TestIdleState()
         {
             AddStep("set beatmap", () => setBeatmap());
 
-            AddStep("create drawable ruleset", () =>
-            {
-                SetContents(() =>
-                {
-                    var ruleset = new TaikoRuleset();
-                    return new DrawableTaikoRuleset(ruleset, Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
-                });
-            });
+            createDrawableRuleset();
 
-            AddStep("miss result for normal hit", () => addJudgement(HitResult.Miss, new TaikoJudgement()));
-            AddUntilStep("state is fail", () => allMascotsIn(TaikoMascotAnimationState.Fail));
-
-            AddStep("great result for normal hit", () => addJudgement(HitResult.Great, new TaikoJudgement()));
-            AddUntilStep("state is idle", () => allMascotsIn(TaikoMascotAnimationState.Idle));
-
-            AddStep("miss result for strong hit", () => addJudgement(HitResult.Miss, new TaikoStrongJudgement()));
-            AddAssert("state remains idle", () => allMascotsIn(TaikoMascotAnimationState.Idle));
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
+            assertStateAfterResult(new JudgementResult(new StrongHitObject(), new TaikoStrongJudgement()) { Type = HitResult.Miss }, TaikoMascotAnimationState.Idle);
         }
 
         [Test]
-        public void TestKiai()
+        public void TestKiaiState()
         {
             AddStep("set beatmap", () => setBeatmap(true));
 
-            AddUntilStep("wait for beatmap to be loaded", () => Beatmap.Value.Track.IsLoaded);
+            createDrawableRuleset();
 
-            AddStep("create drawable ruleset", () =>
-            {
-                Beatmap.Value.Track.Start();
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Good }, TaikoMascotAnimationState.Kiai);
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoStrongJudgement()) { Type = HitResult.Miss }, TaikoMascotAnimationState.Kiai);
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss }, TaikoMascotAnimationState.Fail);
+        }
 
-                SetContents(() =>
-                {
-                    var ruleset = new TaikoRuleset();
-                    return new DrawableTaikoRuleset(ruleset, Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
-                });
-            });
+        [Test]
+        public void TestMissState()
+        {
+            AddStep("set beatmap", () => setBeatmap());
 
-            AddUntilStep("state is fail", () => allMascotsIn(TaikoMascotAnimationState.Fail));
+            createDrawableRuleset();
 
-            AddStep("great result for normal hit", () => addJudgement(HitResult.Great, new TaikoJudgement()));
-            AddUntilStep("state is kiai", () => allMascotsIn(TaikoMascotAnimationState.Kiai));
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss }, TaikoMascotAnimationState.Fail);
+            assertStateAfterResult(new JudgementResult(new DrumRoll(), new TaikoDrumRollJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Fail);
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Good }, TaikoMascotAnimationState.Idle);
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestClearStateOnComboMilestone(bool kiai)
+        {
+            AddStep("set beatmap", () => setBeatmap(kiai));
+
+            createDrawableRuleset();
+
+            AddRepeatStep("reach 49 combo", () => applyNewResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }), 49);
+
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Good }, TaikoMascotAnimationState.Clear);
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestClearStateOnClearedSwell(bool kiai)
+        {
+            AddStep("set beatmap", () => setBeatmap(kiai));
+
+            createDrawableRuleset();
+
+            assertStateAfterResult(new JudgementResult(new Swell(), new TaikoSwellJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Clear);
         }
 
         private void setBeatmap(bool kiai = false)
@@ -141,24 +163,51 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     BaseDifficulty = new BeatmapDifficulty(),
                     Metadata = new BeatmapMetadata
                     {
-                        Artist = @"Unknown",
-                        Title = @"Sample Beatmap",
-                        AuthorString = @"Craftplacer",
+                        Artist = "Unknown",
+                        Title = "Sample Beatmap",
+                        AuthorString = "Craftplacer",
                     },
                     Ruleset = new TaikoRuleset().RulesetInfo
                 },
                 ControlPointInfo = controlPointInfo
             });
+
+            scoreProcessor.ApplyBeatmap(Beatmap.Value.Beatmap);
         }
 
-        private void addJudgement(HitResult result, Judgement judgement)
+        private void createDrawableRuleset()
+        {
+            AddUntilStep("wait for beatmap to be loaded", () => Beatmap.Value.Track.IsLoaded);
+
+            AddStep("create drawable ruleset", () =>
+            {
+                Beatmap.Value.Track.Start();
+
+                SetContents(() =>
+                {
+                    var ruleset = new TaikoRuleset();
+                    return new DrawableTaikoRuleset(ruleset, Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo));
+                });
+            });
+        }
+
+        private void assertStateAfterResult(JudgementResult judgementResult, TaikoMascotAnimationState expectedState)
+        {
+            AddStep($"{judgementResult.Type.ToString().ToLower()} result for {judgementResult.Judgement.GetType().Name.Humanize(LetterCasing.LowerCase)}",
+                () => applyNewResult(judgementResult));
+
+            AddAssert($"state is {expectedState.ToString().ToLower()}", () => allMascotsIn(expectedState));
+        }
+
+        private void applyNewResult(JudgementResult judgementResult)
         {
             foreach (var playfield in playfields)
             {
-                var hit = new DrawableTestHit(new Hit(), result);
+                var hit = new DrawableTestHit(new Hit(), judgementResult.Type);
                 Add(hit);
 
-                playfield.OnNewResult(hit, new JudgementResult(hit.HitObject, judgement) { Type = result });
+                playfield.OnNewResult(hit, judgementResult);
+                scoreProcessor.ApplyResult(judgementResult);
             }
         }
 

From 22fde8d2a0e7ac158358af6839f91c528853d07e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Apr 2020 21:58:05 +0200
Subject: [PATCH 02542/10326] Implement partial clear transition logic

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs  |  3 ++-
 .../UI/DrawableTaikoMascot.cs                 | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index cdd2a38e19..f74de47425 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -201,13 +201,14 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         private void applyNewResult(JudgementResult judgementResult)
         {
+            scoreProcessor.ApplyResult(judgementResult);
+
             foreach (var playfield in playfields)
             {
                 var hit = new DrawableTestHit(new Hit(), judgementResult.Type);
                 Add(hit);
 
                 playfield.OnNewResult(hit, judgementResult);
-                scoreProcessor.ApplyResult(judgementResult);
             }
         }
 
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index f4bc841c15..2df0cae2e3 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -11,7 +11,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private readonly Dictionary<TaikoMascotAnimationState, TaikoMascotAnimation> animations;
         private TaikoMascotAnimation currentAnimation;
 
-        private bool lastHitMissed;
+        private bool lastObjectHit;
         private bool kiaiMode;
 
         public DrawableTaikoMascot(TaikoMascotAnimationState startingState = TaikoMascotAnimationState.Idle)
@@ -56,7 +56,18 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public void OnNewResult(JudgementResult result)
         {
-            lastHitMissed = result.Type == HitResult.Miss && result.Judgement.AffectsCombo;
+            // TODO: missing support for clear/fail state transition at end of beatmap gameplay
+
+            if (triggerComboClear(result) || triggerSwellClear(result))
+            {
+                state.Value = TaikoMascotAnimationState.Clear;
+                return;
+            }
+
+            if (!result.Judgement.AffectsCombo)
+                return;
+
+            lastObjectHit = result.IsHit;
         }
 
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
@@ -77,7 +88,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             if (currentAnimation != null && !currentAnimation.Completed)
                 return state.Value;
 
-            if (lastHitMissed)
+            if (!lastObjectHit)
                 return TaikoMascotAnimationState.Fail;
 
             return kiaiMode ? TaikoMascotAnimationState.Kiai : TaikoMascotAnimationState.Idle;
@@ -89,5 +100,11 @@ namespace osu.Game.Rulesets.Taiko.UI
             currentAnimation = animations[state.NewValue];
             currentAnimation.Show();
         }
+
+        private bool triggerComboClear(JudgementResult judgementResult)
+            => (judgementResult.ComboAtJudgement + 1) % 50 == 0 && judgementResult.Judgement.AffectsCombo && judgementResult.IsHit;
+
+        private bool triggerSwellClear(JudgementResult judgementResult)
+            => judgementResult.Judgement is TaikoSwellJudgement && judgementResult.IsHit;
     }
 }

From 5cfc05e12afe54aca75b6c92ba91e3d0ad35a277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Apr 2020 22:03:39 +0200
Subject: [PATCH 02543/10326] Ensure correct initial state

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs              | 8 ++++++++
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs         | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index f74de47425..e23f63e245 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -62,6 +62,14 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             AddStep("fail state", () => SetContents(() => new TaikoMascotAnimation(TaikoMascotAnimationState.Fail)));
         }
 
+        [Test]
+        public void TestInitialState()
+        {
+            AddStep("create mascot", () => SetContents(() => new DrawableTaikoMascot()));
+
+            AddAssert("mascot initially idle", () => allMascotsIn(TaikoMascotAnimationState.Idle));
+        }
+
         [Test]
         public void TestClearStateTransition()
         {
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index 2df0cae2e3..1b7d011d8a 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private readonly Dictionary<TaikoMascotAnimationState, TaikoMascotAnimation> animations;
         private TaikoMascotAnimation currentAnimation;
 
-        private bool lastObjectHit;
+        private bool lastObjectHit = true;
         private bool kiaiMode;
 
         public DrawableTaikoMascot(TaikoMascotAnimationState startingState = TaikoMascotAnimationState.Idle)

From db4c8b2ba59c6a59ab4a19eec2d548f28022242e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Apr 2020 22:16:25 +0200
Subject: [PATCH 02544/10326] Fix transition out of clear state

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs               | 7 ++++---
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs          | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index e23f63e245..aee057602a 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -144,15 +144,16 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Good }, TaikoMascotAnimationState.Clear);
         }
 
-        [TestCase(true)]
-        [TestCase(false)]
-        public void TestClearStateOnClearedSwell(bool kiai)
+        [TestCase(true, TaikoMascotAnimationState.Kiai)]
+        [TestCase(false, TaikoMascotAnimationState.Idle)]
+        public void TestClearStateOnClearedSwell(bool kiai, TaikoMascotAnimationState expectedStateAfterClear)
         {
             AddStep("set beatmap", () => setBeatmap(kiai));
 
             createDrawableRuleset();
 
             assertStateAfterResult(new JudgementResult(new Swell(), new TaikoSwellJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Clear);
+            AddUntilStep($"state reverts to {expectedStateAfterClear.ToString().ToLower()}", () => allMascotsIn(expectedStateAfterClear));
         }
 
         private void setBeatmap(bool kiai = false)
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index 1b7d011d8a..089f5c87a2 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -61,7 +61,8 @@ namespace osu.Game.Rulesets.Taiko.UI
             if (triggerComboClear(result) || triggerSwellClear(result))
             {
                 state.Value = TaikoMascotAnimationState.Clear;
-                return;
+                // never play fail immediately after clear.
+                lastObjectHit = true;
             }
 
             if (!result.Judgement.AffectsCombo)

From f5526890cc3ffe85b45861fc3f46c1d24df8db05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Apr 2020 22:51:22 +0200
Subject: [PATCH 02545/10326] Add comment about animation presence

---
 osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
index 165e00cc73..452272211d 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
@@ -24,11 +24,12 @@ namespace osu.Game.Rulesets.Taiko.UI
             InternalChild = textureAnimation = createTextureAnimation(state).With(animation =>
             {
                 animation.Origin = animation.Anchor = Anchor.BottomLeft;
-                RelativeSizeAxes = Axes.Both;
             });
 
             RelativeSizeAxes = Axes.Both;
             Origin = Anchor = Anchor.BottomLeft;
+
+            // needs to be always present to prevent the animation clock consuming time spent when not present.
             AlwaysPresent = true;
         }
 

From 1e7b10320f8ba2cd7148f2734f216495f38846d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 May 2020 00:19:12 +0200
Subject: [PATCH 02546/10326] Adjust mascot positioning in playfield layout

---
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs |  2 +-
 .../UI/TaikoMascotAnimation.cs                    |  2 ++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs      | 15 +++++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index 089f5c87a2..eb885872c5 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public DrawableTaikoMascot(TaikoMascotAnimationState startingState = TaikoMascotAnimationState.Idle)
         {
-            RelativeSizeAxes = Axes.Both;
+            Origin = Anchor = Anchor.BottomLeft;
 
             state = new Bindable<TaikoMascotAnimationState>(startingState);
             animations = new Dictionary<TaikoMascotAnimationState, TaikoMascotAnimation>();
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
index 452272211d..0bf6bc7d49 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -24,6 +25,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             InternalChild = textureAnimation = createTextureAnimation(state).With(animation =>
             {
                 animation.Origin = animation.Anchor = Anchor.BottomLeft;
+                animation.Scale = new Vector2(0.6f);
             });
 
             RelativeSizeAxes = Axes.Both;
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 084a11d523..2edc697d66 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -130,18 +130,21 @@ namespace osu.Game.Rulesets.Taiko.UI
                         },
                     }
                 },
+                mascotDrawable = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoDon), _ => Empty())
+                {
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.TopLeft,
+                    RelativePositionAxes = Axes.None,
+                    RelativeSizeAxes = Axes.None,
+                    X = 15,
+                    Y = 45
+                },
                 topLevelHitContainer = new ProxyContainer
                 {
                     Name = "Top level hit objects",
                     RelativeSizeAxes = Axes.Both,
                 },
                 drumRollHitContainer.CreateProxy(),
-                mascotDrawable = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoDon), _ => new Container(), confineMode: ConfineMode.ScaleToFit)
-                {
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.TopLeft,
-                    RelativePositionAxes = Axes.None
-                }
             };
         }
 

From 05183c6e6fb1683bd6fa94021c7e69c2572cb8e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 May 2020 00:24:39 +0200
Subject: [PATCH 02547/10326] Final test touch-ups

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs             | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index aee057602a..492f628482 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -9,6 +9,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -65,7 +66,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         [Test]
         public void TestInitialState()
         {
-            AddStep("create mascot", () => SetContents(() => new DrawableTaikoMascot()));
+            AddStep("create mascot", () => SetContents(() => new DrawableTaikoMascot { RelativeSizeAxes = Axes.Both }));
 
             AddAssert("mascot initially idle", () => allMascotsIn(TaikoMascotAnimationState.Idle));
         }
@@ -83,13 +84,13 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             {
                 var state = new Bindable<TaikoMascotAnimationState>(TaikoMascotAnimationState.Clear);
                 states.Add(state);
-                return new DrawableTaikoMascot { State = { BindTarget = state } };
+                return new DrawableTaikoMascot { State = { BindTarget = state }, RelativeSizeAxes = Axes.Both };
             }));
 
             AddStep("set clear state", () => states.ForEach(state => state.Value = TaikoMascotAnimationState.Clear));
             AddStep("miss", () => mascots.ForEach(mascot => mascot.OnNewResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss })));
-            AddAssert("skins with animations remain in clear state", () => mascots.Any(mascot => mascot.State.Value == TaikoMascotAnimationState.Clear));
-            AddUntilStep("state reverts to fail", () => someMascotsIn(TaikoMascotAnimationState.Fail));
+            AddAssert("skins with animations remain in clear state", () => someMascotsIn(TaikoMascotAnimationState.Clear));
+            AddUntilStep("state reverts to fail", () => allMascotsIn(TaikoMascotAnimationState.Fail));
 
             AddStep("set clear state again", () => states.ForEach(state => state.Value = TaikoMascotAnimationState.Clear));
             AddAssert("skins with animations change to clear", () => someMascotsIn(TaikoMascotAnimationState.Clear));

From d021e213b216b994c343184d400c5aa7bfa25fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 May 2020 00:29:03 +0200
Subject: [PATCH 02548/10326] Reword comment

---
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index eb885872c5..9328b607e6 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             if (triggerComboClear(result) || triggerSwellClear(result))
             {
                 state.Value = TaikoMascotAnimationState.Clear;
-                // never play fail immediately after clear.
+                // always consider a clear equivalent to a hit to avoid clear -> miss transitions
                 lastObjectHit = true;
             }
 

From e0ae9f791c357a040f0ff06180451bf20dca2428 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 1 May 2020 11:56:40 +0900
Subject: [PATCH 02549/10326] 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 73fbe3ab2e..336479c40a 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.421.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.501.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3b05eb82d7..acb7fe5fbe 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,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.421.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.501.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f3202693f3..6662e57dcd 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.Framework.iOS" Version="2020.421.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.501.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.421.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.501.0" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 700214d249d2938977c6161e4dcea22b712b1025 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 30 Apr 2020 22:13:38 -0700
Subject: [PATCH 02550/10326] Truncate beatmap title and artist on score panel

---
 .../Ranking/TestSceneExpandedPanelMiddleContent.cs     |  5 ++++-
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs     | 10 ++++++++--
 osu.Game/Screens/Ranking/ScorePanel.cs                 |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 52d8ea0480..328a0e0c27 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -20,6 +20,7 @@ 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.Screens.Ranking.Expanded.Accuracy;
 using osu.Game.Screens.Ranking.Expanded.Statistics;
@@ -74,6 +75,8 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             var beatmap = new TestBeatmap(rulesetStore.GetRuleset(0));
             beatmap.Metadata.Author = author;
+            beatmap.Metadata.Title = "Verrrrrrrrrrrrrrrrrrry looooooooooooooooooooooooong beatmap title";
+            beatmap.Metadata.Artist = "Verrrrrrrrrrrrrrrrrrry looooooooooooooooooooooooong beatmap artist";
 
             return new TestWorkingBeatmap(beatmap);
         }
@@ -114,7 +117,7 @@ namespace osu.Game.Tests.Visual.Ranking
 
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
-                Size = new Vector2(500, 700);
+                Size = new Vector2(ScorePanel.EXPANDED_WIDTH, 700);
                 Children = new Drawable[]
                 {
                     new Box
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index b058cc142b..fd8ac33aef 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -35,6 +35,8 @@ namespace osu.Game.Screens.Ranking.Expanded
 
         private RollingCounter<long> scoreCounter;
 
+        private const float padding = 10;
+
         /// <summary>
         /// Creates a new <see cref="ExpandedPanelMiddleContent"/>.
         /// </summary>
@@ -46,7 +48,7 @@ namespace osu.Game.Screens.Ranking.Expanded
             RelativeSizeAxes = Axes.Both;
             Masking = true;
 
-            Padding = new MarginPadding { Vertical = 10, Horizontal = 10 };
+            Padding = new MarginPadding(padding);
         }
 
         [BackgroundDependencyLoader]
@@ -92,13 +94,17 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 Origin = Anchor.TopCentre,
                                 Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
+                                MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
+                                Truncate = true,
                             },
                             new OsuSpriteText
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
-                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold)
+                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
+                                MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
+                                Truncate = true,
                             },
                             new Container
                             {
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index a1adfcc500..c055df7ccc 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Width of the panel when expanded.
         /// </summary>
-        private const float expanded_width = 360;
+        public const float EXPANDED_WIDTH = 360;
 
         /// <summary>
         /// Height of the panel when expanded.
@@ -183,7 +183,7 @@ namespace osu.Game.Screens.Ranking
             switch (state)
             {
                 case PanelState.Expanded:
-                    this.ResizeTo(new Vector2(expanded_width, expanded_height), resize_duration, Easing.OutQuint);
+                    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);

From 8955b98cbb5be1a6768b97ad4b3ef7390b81bef6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Apr 2020 17:38:37 +0900
Subject: [PATCH 02551/10326] Add basic taiko scroller implementation

---
 .../old-skin/taiko-slider-fail@2x.png         | Bin 0 -> 141234 bytes
 .../Resources/old-skin/taiko-slider@2x.png    | Bin 0 -> 127176 bytes
 .../Skinning/TestSceneTaikoPlayfield.cs       |   2 +
 .../Skinning/TestSceneTaikoScroller.cs        |  16 ++++
 .../Skinning/LegacyTaikoScroller.cs           |  83 ++++++++++++++++++
 .../Skinning/TaikoLegacySkinTransformer.cs    |   6 ++
 .../TaikoSkinComponents.cs                    |   1 +
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |   7 ++
 8 files changed, 115 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-slider-fail@2x.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-slider@2x.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-slider-fail@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-slider-fail@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef597210f1c9e6e805b9d3f4399b70e057b51866
GIT binary patch
literal 141234
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%0DbICSRi1->iw)J4JfN
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-slider@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-slider@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..05b8c5783f4bde04d74aab93db8c17f5e73c5060
GIT binary patch
literal 127176
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
index ae5dd1e622..e02ad53ed8 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             typeof(TaikoHitTarget),
             typeof(TaikoLegacyHitTarget),
             typeof(PlayfieldBackgroundRight),
+            typeof(LegacyTaikoScroller),
         }).ToList();
 
         [Cached(typeof(IScrollingInfo))]
@@ -51,6 +52,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
+                Height = 0.6f,
             }));
 
             AddRepeatStep("change height", () => this.ChildrenOfType<TaikoPlayfield>().ForEach(p => p.Height = Math.Max(0.2f, (p.Height + 0.2f) % 1f)), 50);
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
new file mode 100644
index 0000000000..e4673430d6
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.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.Framework.Graphics;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
+{
+    public class TestSceneTaikoScroller : TaikoSkinnableTestScene
+    {
+        public TestSceneTaikoScroller()
+        {
+            AddStep("Load scroller", () => SetContents(() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Drawable.Empty())));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
new file mode 100644
index 0000000000..6276eb1e8a
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.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 System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Taiko.Skinning
+{
+    public class LegacyTaikoScroller : CompositeDrawable
+    {
+        public LegacyTaikoScroller()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            foreach (var sprite in InternalChildren)
+            {
+                sprite.X -= (float)Time.Elapsed * 0.1f;
+
+                if (sprite.X + sprite.DrawWidth < 0)
+                    sprite.Expire();
+            }
+
+            var last = InternalChildren.LastOrDefault();
+
+            if (last == null || last.ScreenSpaceDrawQuad.TopRight.X < ScreenSpaceDrawQuad.TopRight.X)
+            {
+                AddInternal(new ScrollerSprite { X = last == null ? 0 : last.X + last.DrawWidth });
+            }
+        }
+
+        private class ScrollerSprite : CompositeDrawable
+        {
+            private Sprite passingSprite;
+            private Sprite failingSprite;
+
+            private bool passing = true;
+
+            public bool Passing
+            {
+                get => passing;
+                set
+                {
+                    if (value == passing)
+                        return;
+
+                    passing = value;
+
+                    if (passing)
+                    {
+                        passingSprite.Show();
+                        failingSprite.FadeOut(200);
+                    }
+                    else
+                    {
+                        failingSprite.FadeIn(200);
+                        passingSprite.Delay(200).FadeOut();
+                    }
+                }
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(ISkinSource skin)
+            {
+                AutoSizeAxes = Axes.Both;
+
+                InternalChildren = new Drawable[]
+                {
+                    passingSprite = new Sprite { Texture = skin.GetTexture("taiko-slider") },
+                    failingSprite = new Sprite { Texture = skin.GetTexture("taiko-slider-fail"), Alpha = 0 },
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 5dfc7ec0df..0212cdfd9e 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -85,6 +85,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                         return new LegacyHitExplosion(sprite);
 
                     return null;
+
+                case TaikoSkinComponents.TaikoScroller:
+                    if (GetTexture("taiko-slider") != null)
+                        return new LegacyTaikoScroller();
+
+                    return null;
             }
 
             return source.GetDrawableComponent(component);
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index fd091f97d0..877351534a 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -18,5 +18,6 @@ namespace osu.Game.Rulesets.Taiko
         TaikoExplosionMiss,
         TaikoExplosionGood,
         TaikoExplosionGreat,
+        TaikoScroller
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 5c763cb332..a5edcc1357 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -50,6 +50,13 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             InternalChildren = new[]
             {
+                new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Drawable.Empty())
+                {
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.TopLeft,
+                    RelativeSizeAxes = Axes.X,
+                    Height = 100,
+                },
                 new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.PlayfieldBackgroundRight), _ => new PlayfieldBackgroundRight()),
                 rightArea = new Container
                 {

From 5e430c726cd73c5bdafeb9fffdcd5be53c3e530a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 May 2020 19:25:55 +0900
Subject: [PATCH 02552/10326] Add testing resources

---
 .../metrics-skin/taiko-slider-fail@2x.png     | Bin 0 -> 187725 bytes
 .../metrics-skin/taiko-slider@2x.png          | Bin 0 -> 189590 bytes
 .../old-skin/taiko-slider-fail@2x.png         | Bin 141234 -> 102010 bytes
 .../Resources/old-skin/taiko-slider@2x.png    | Bin 127176 -> 96449 bytes
 .../special-skin/taiko-slider-fail.png        | Bin 0 -> 61156 bytes
 .../Resources/special-skin/taiko-slider.png   | Bin 0 -> 65012 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-slider-fail@2x.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-slider@2x.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-slider-fail.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-slider.png

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-slider-fail@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-slider-fail@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac0fef86266d4b0667f4b62a4513175bcb5c5968
GIT binary patch
literal 187725
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
Mx0;I8^5&uc1rZMb&;S4c

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-slider@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-slider@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..cca9310322c0dd435a896d38604a0c105c2d155d
GIT binary patch
literal 189590
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%0A$$p
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
Jz4X`6{|AouG4lWb

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-slider-fail@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-slider-fail@2x.png
index ef597210f1c9e6e805b9d3f4399b70e057b51866..2d9974a701fa4cbb8fa5fed9174260611d312751 100644
GIT binary patch
literal 102010
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

literal 141234
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%0DbICSRi1->iw)J4JfN
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-slider@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-slider@2x.png
index 05b8c5783f4bde04d74aab93db8c17f5e73c5060..07b2f167e05f2ece819d34d2a98fe091fdfccd38 100644
GIT binary patch
literal 96449
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
Q5P%;=IaS#TX|vG(1MkGfH~;_u

literal 127176
zcmZ5{1ymf}vhEn}?(XhELa^ZOE<@1Z?vTMPL4pT@6WrYg4GzJBhu|JG_~Sq4ym!yL
zwR%>q>FMdNs$EsRtM<2})m7y%P)Sh%004%9ytF0&fQStM0Hu);U(O72dU(Guh>fI*
zBmhtwkM>}W@baD7LS9n^0Ptf30AOJNz}?F!*d74j$qfJ;Kmh=ebO3<JC96$C^yLS{
zcS>^7FZ_jW-?o2vVJI&02JQd=8ty+I;Ph(H!^__R3eu9=K1)ZB-W?pRo|LFTC7n0J
zw<}q%<-F>Lt@)yoiDeXNSrSv3*%s@p-uR0KT?^gsk{sUf^Id<;*<lbDHp0YxAB$Qj
zqkzxAla#-xtl~BCYi(I@H))1*jEY$sSb~6G=5_2c(c}H$KAROERU!`+-g{R=xH#|J
z9ZyI7Z-UCvMhQOx550k)|0X+$`gH{4|Ii+KFg>wo%bEf;(SKjlga!)6{x{XAU`K^~
z1upxe_e)9q55aS3u#tiPCUBGl;gOj7sb~V~f6n}iJxWt!|L3N6Q54Gfm-j!s!cN}&
z?~CeBla^usCX+Bnb{~i4{4|c!rXQo3SWS+ol>ZUqA69dW&HjJy*cRqk=(;W|b4(g=
z0HyZ4>QSWmkJ|sRTqD~El8Y0d#ZSvG7iVkWf5bQ#gvE1!^*U71W|0_L%ZI>4^;o+9
zpTM5f`qW1fCDM`^Lc!YqG7xhlkV4Q;w<1XV8HR)1w22;eV#={1fzSM3&w?6JV<W$Y
zh!sj^@Pjh`C9Z@8Y%sElzzUXKTfUb#nIC+?jbDNH-v$oAK@M|7H=BkNPRig8`GXSw
zrQb3S^>2ye0pf&RQXl*|Et&0miA2;Mk^j~V9w9;P@D?8jNhca1h8<b@pD}?uN$1=@
z7}lTe)?fM`9fk9D$ac$sC0QYdVgE7gKMX(+EU_r-f&;cv2(Po0q{jV69xq-mkoi=s
z&7zY9^ym3}DSLG^#$LOaxIPo)f9S}Gzj@WzCoP00HB;KY5YQZkw*Z9os4@@P(<cH5
z<^S~*ieRzpZ3>&!%DS5p)dNa7`$eST)7#hM#fX}D)nQW9|E<0kRR}^atk2p28nL^X
zqQU5*YDm0Tfk});|1Wi}rE~61f@#t16zvlRd&;a>R77X@s)oMoc+ueh$HM<IGj`2u
zY~(N?q70=_G*}U5LlaXzJQO$beOha3qyi@d_aD1KU*}>4ddeBh>#SkU{KT-xn&k6K
zMEAr+qcCK-l&Pi~`fn3`jg_EAXO3Y<ujrS|m<#)YMjxsyUx8~}C`pY20wEH0WtJ+1
zHFeC?e3cIs88PJfbhb*=rz02ssBF?stH;l`7wh@I6eav3>JY+x2K^`*sCF)@h3#gA
zYc}^O*lo<$X(E%AC?n6-Qt}TmHaD}nLg;j0d*wKi1Ks7{uUDVAOI$wu&29%9b&5oX
zi^zw^DBfisUW5PbU)bCw%=H_rW1s#R!PhUg1V~W~mHd`!mZ@?<-GL72lQLGKYukrH
zqp`8M^_lG*)nAQIbs>=~2lMaIm~*?V+jWo5Fck@0Q7R^)T8)^5{*TyRq9Pf5KTj|&
z3Sp~&oF=@b-U&HsY((_6Ey*82NIHme<8{=hBSSK@FYa+kDFgO3ar)>$R)%zm_a=bo
z4HJgw>G9}I%j%Lu#<`b4sY#6X9#7tsATJFz%D+>?s;nTPQR_6O`#0Ee9INAC2UA1n
z*T|iwOte!d_u#Z}k?+_ReG*+Q_LNgHl3i|wkC*XmLMu<w4mmnXG$35Mh8zh3@gUmY
z7^7HVU--J;>*z^c9oe+Tb)-EFok9+!XuEYQdPHr29B|=T0rz#9%EEec6H$6t{~biR
zMlRzS4Tl69U$A%}nl#Y+JiIrc3`$U5&CE+~L4<IQg3ITENu2K4czhv3*J4l~M4|g)
zcx!b#T9H$QL#^~nTG-=o2;n4Hi#AhBLo0wLPAQ@DzOVU;5^B;CAL4x5neulZW0kEy
z&*1;LYC?|yQrReJUWHP@28ac!u2HN9W~wFhKwhQ{mLP`We@4PLhsKI~6P+z}Bh=`6
zt&t+BelT6WphnpBYYCS|c6u3SKP0oya9R1(;MU1#62`u_nWuz)+SQ@bq#oNw2fI%w
zq0_GvuYpy5)b~l8xM-$fQaXoW#}bSX+W+W{KEmGQ7Jd(FSmfNF9!mL;ZiC=K=Glx!
zB`6y#zu1Kg=>@=>7Jv$ri$kCT{p@%u;K_3)i7&P5ay*!*8^wX$%C%J1fd*%mH*$~)
zd&(p|v^G|#2J^4AkR)ytR2B0`+X(BpTlI*3I+rR;l8c?J?IA8^L{}mGhNC_ncl7`a
z=Uc}l*epT`KUQUgl>a;G0A`nNwJ9A7udp^#eF;5RZ+v^R*m5~NVr|h(F}z-Zf~Rbf
z8L^b};nvX!gYQ8%PatfJZNB&jSg12lHE`ZBoI2j>3*mM?yZ;{GCBe(!_(B;lV-Wog
z+NQg%HpZsq-=vx6t$K%0&aP4?Aa*jMv+fGQPd*)t6elxC`f1&|ZJ+O3a)pKj*w?EP
zd;E`+G6oERnOxN)<e90Fj+zP9ckL^&cT9mg8sWC}11wT!b~W`ciAO9S*B45M?QpYl
zM*}@d=)}HX2Xx%|-fyi-(hi+R1iqw<HYBs2v<$~?zlhChNn-g$<J54mTz1g=sr7)n
z{Uuw##)WeD$TR=D)_?{N`v%Ru7*8n~UK)Ldm*CQtn9~^n0^2F9l5-lzGGb2Z*@yBA
zmh>F77RG(@;`b1}oW91K%BC?W;W(P^qqTI9{tZJwr~LA|)fJt0Hi9i4!54s2^~zze
zpPc70qYzjpY<ZUktoH^+u5WV=ZJ|ItDD^uX;`@9x8JY1svd@r3*=+7a^L`;gW`XXo
z<|{G~>Q5vpnJ>Xv=PFof$A*sU)<)|Jj@>gD^G8?Qw*8Vs_@|8lU{74c$E6SEnSK6T
zVW0b@^76YG5qwz=!@dlMQ9x7F7b1LL;+|jMyqo?v36GRN8ZxtV&_rPq!}lx&wJ^*Z
z!!XJ9-Pa9YF4$O&J1OrFh@@8Kw}!!%cXARlY*QkL$Ex1eai=D83?;j~>;aRZvDUU~
zoia<<t!@)|qu?kDdUFK`@lo)T1)@8g_K&wMsO9&rx@f5-d`%Eg{KPyO|J_4-BISwE
z)hg^Gi>10Qb>t~4b*?UVk(v7ar-n%YdQr;K_3NL~0`>AxS&>#RtgVS=G&j6kOe)E0
zwzWr*eWv%^>S2=AtIRs=a%w*iFq+avY1M8dRi*M6)8t-fEAM5=?-gQc-?twxJ|jUc
zQ4L?0FKYjz=TzQA;@HJXmI4HKQw9a0)Nx&&V9V2wOJw;$@y(=WO$)3x?3916eAfHA
zejcOlE5O4j@mF#jjSPvs)7E9gIWau$2h$NEgh=*{RHA`;-ZJg7+F&g0<3m#pVubYr
zYV+w8d|#aKdsb|N5YjuOMCuC^jMvn;Y|L&t($^#hz7#vH$<r#X22FUz>7I7)H)OHK
zc-v*kFEjYh6uW2c?Kv;t`N|pgD@oKU(~TqX1jQPHc~b(s=GeyMw`rY5fo5lu<k-1=
z&6Nlr_JF|cU%&kZL~Jzs%1-F?zOCN281frarMLp=`kMXC;8|`3ZEmYiaZUad9%SJs
zoet|C2&xfbJ3l2FMTY!eO^xEO{oZ()FPel+V(zSM1=Ay!1Y+mQi?81>LZ5)oA*$ry
zK`a0p5#&Af%^Md_Y)Y{)sZcEB5~89ZaHV)OjBXukY!!t)3!?ggGOD>>fJ$mgyM-VD
zc{%U#CPt`cds*Z0a&#&8w|5%_awz5u$=PX_{+V}5H<>@44>oA+#yd%Qkwh0o?9sHC
zY)j)k#+?r~_7q0Tl4gb%;X@u0<ZoU9f}ReM>HbsrrHiSglfX3F5>faUcgINI^mG3A
z8RIpo8_Uiog!rH2!tX=yanLx02<Z=gct}agF07mAJ%%9qyvzXwa!10(L`pQa09Kw7
z;e3c6$H2`G(zlU|H+~yiHqvdMr4zp6Hl>6I3n3$y5O4z1TOlSf5>WJ(t3J5ODbX&{
z8iYK6@9fwNajD#o?3%#K%Ai4MIaInNpZub|I4d)M8t?I|EUAYS@nx@-CWkL(?~PjK
zXuET5;3>f?4aOuEiz0Oi=GpgOH|X*FHa1IQr9n!o<~tfl8HTet7zh8-S(^bffCD?G
z0`tX17de;>EA~4#?4Brd1rUvc$fE?$|HMGY;-|T16ng}A-G*fcS4JFuzle}~UuMb@
z2JZRN)0S=kNl)DGK0)6*Z4I*lyDBiHJ*?;=gybzFLqd?sRI5tvJ5pe;&f%UMc7Wz*
z8ER5av&A>jWCcR=3J|?W+=`bOd>d-HK~?#>dOSm^&t~Lh7*jm(=Gk+@|5@tDR|=(}
z?y(&L7$B8|>?%M=#E|za2XZK~I=<gzpxqA#wJ;x$y`SRfg{KvkzRw9aJTE~m-fTbH
z+2kc`d!U&v*W~I7lWMNOYm;KUoM#Od9vR;XGBCX%&`B|)60-d*DIp=a@#Q`RL(qyv
zV2n@?1Iv*ED%fK`K|eWXAGwaWa<A8adtkK@{Q+ymr`DYfqH}9DznZAhR9mr>I{BK|
zv8x4rwGnhP+TP7+)&7`p$*1+bh{Gc$Dy(k3#Y!WeJtuydlg|7(2BjoSf*PB7xs+gl
ziLBC*o9(W&KUjg5JP3>1)x9y2@-^fm1weP=kUqpf79}!zZ37(&1TJGW4HpynN+cpj
zuA|n-iWRi_!;FH^efGWI*GXiThk+8}?P+kfYS}+@--q3qc(>#fqi0CW$9sEXfZlV<
zhXsG{)EU*W7j6$@wW?!1Y?ME_?2HO;LkTaNM<Eyv>$PE5Y`)h;c`DDWM>l>dh%JvW
zx)(9(7DxWaE~{q@m?I6%`AvKEpr0R!uxs!%6j|&hlCD>COsH1DqJQIIyC2YeuF$sS
zA=KS}r+IByJFLHzrmmZR+OWt_=Nc(8X^!JC)7fV4Y5e=TG_xV*fW32&7>|s^oqj!q
zP$NrD+F$t3Tlk+FRJ|daZq$zR$PA;cOVdz(K2Oy5!taTOe_Gu<QCa(J$KaG+Z_OP+
z_`S6)_5p@S18+7<Hcot$@2N9_)JW5QbbF+vi>f~HZj;8sqJP7G-FWGu_)|hu0}Ttm
zTWpbiE|cI+MiKQ_o$#F(4yTv}gII$zLR*n%?=gk<cJDBX%rd&aXAl3O0y%X+jDwUF
zW_YGDH)2v_-8->hYfp1QH4A|tgR~vbT!|`ff^-D7yg8#pqM#BX(JCcmR-ER8_L?<4
zNnx{F|Gi}P4T_caQ1#2Kk9q2Q*R+H}fzCg9b?a1Xk_*PR8rbd`JXGmhw)74RO=Sgm
zxtS8<+PLpM?a<XH>qSEyh-=&>hKa4yS#1&=n@YH7my(_R(cB+lU!!`x<XB{8T5);b
zDDqp<PXnBuS)e<*8~gE~KYmQ%%9zO0aGNRyPtIh~q)VXjEn5{Sy_Dl`N1ONf;{y#o
z1of5?HH8O-#(%u)L^t`wNQe>xEn-ZA!9tgTa7U`)&9w&$c=kO^?g=Zm^IdaSZQ$+>
z?Lde00fU+sI4do2-<v3ZB584L==PDe>gQ(qf@Al}$Ob#GxhQyr+<-DuoTOR+v~tdO
z$@-gj@dDuZOI=&nceNz*rOKT6bx?qMpD<6%?c19o;xai2{(ZkXuWFYg?YPG|3fj6;
zE_<j7Y9zbTyY;)vf+b|N$gQB3qa+o^9)=dwkc+t%)#&O%o7Q$&iHfWBSVI{&SXDS2
zoo)?IN;L)7tWK_~<K&pjsN}lBJq`0ZOt)ROEfmV_zW&{jVcH_ni`JEWRn$9luhofq
zaWGmUWZmtY8qI1W0r!ej>EfBZaGa>Gv_g6BI@-`YHUColc650!lQX%M^j>!Yea@)B
zc#%hK#1{*;Tf2&OPj+2Z-JD-z@03R_mR4r9-*%oCRulLXxxJQ#B6jopFUwuaRo!^S
zI*=9QBe(2FUZAM0qIaB}0zTDRCc4*c{4{=Ge{Sn?Z6s$-wP}xLr)u;On5=GM`Ldh`
z3J^=E8#7O3Yz{kI*c*;-<iFPOwzeo@bSUd(jp4n>lW!$t`E<L86r9-kRqt{y2>QTX
z^H9dDKUS~6uuB3=)BXA*D&3D|S;piE0~y&Rv{m=6Y{61|<1RRMj!&llodtT!O*L@+
z(JHqyk^g;mqi^d$ZV3ikAf(j|w!gb%ks@*XDW>%|>E7Xf<D#pI?};(_ePaXVJEPVT
zo6EqRvQ)&5-lEU@bDb!z1ZYvJubfU00uD>G3ra71MY|pw0<yZ+TZ4IZOyg}h8dSMw
zYK&*5OVzPVY80ur%_hce3y;dwT0RD(SE?Fc?PyR$j};RMl7Y)^9D%@4B&|X9Nxq`&
z4!di-swXYk+JWJ!`=(}YBD6(?+%5moqtQX3N#P{4-$=m=k8~TY@xU~yKWxT^>?{}Q
z<rOoaWj$N1^2Tk^(PSNd6SQK~%^y$g3xYzsP0Z=>Md997(Ah)=6xW|RamTa;+Fy~%
z6>sS&D!)o+Ji+YvEH2=GX+#Q2Ghs+isf$Lg_BtP!c5cS=y0Gsra74oSBl3(&ige!$
z%00fW8(6;$dxRectM5h(0E#N!t=;(Zw04!tj#=F5@vc|t^dB6U@daE{LMJmtDzDM~
zDPNNLmVvLQI3%XF!NEo9b{FksWcnKYaxC{9btUV)@2rG^AT7tmuw605YW`OjNxyc)
zSW*LV`inX=l`y!B1o1~4j2&93wP<_QUE(#64g`9?Tf64ye>1hyZ7|~U&g3uI7rv9k
zzjO;Ir>j=1OD(Q(U_fEtf_Zj>7f=6`X2uOc^t{9%VK!orI-?9aOu8iZkxHw3-kkF#
zd|Cj@^VOQTyM%<ZMB^LT@#o7-hv;o9F8G?B;f_&WC&H29;*R`IYc+zp1*GM$8erpu
zsQScNQHQ;~{PpgT7SH&5Q^!YPy+2Rxorhq>(?6d_Ov6NX(r8TN6tlCwPb_<@P-T$i
zpdvR9TeysD%`}5<o>ew#&45dXcY@VT;#c>2lLXCs`+<s-oIhIPym!i#Uj4pHQhgn%
zPmB!8%VcD>TGhk<jM!!6nTS{wtQ>Kh-h!b5{Qd#d7?f~<1t=C*NmKIz;0FV?7TvYd
zF*1D-AlhM-T=`=FU^uj+Pdxt78IjNoapJ=#MjXp*yZcZ19n=mLgDDJp2nNft@~=FU
z(eVdLrN|fgrVeQ;1-HTs3|n?v?Yw3`R`!kzc$=OuzE@A>X1?#po;1-PBW0IBM9rp3
z_a-~TPE{C4L&}>9rtKo+&EsxY9fGt!C=@xG0Djl$pP4*tURAw`4$GZIUqq-GCvry<
zkJ<U$)U<~SVIPspxhBM}Nm94#NpYOmO2c#c`xQRRv(fqta$r{v|1qgD4fm?xoIkIV
za;aSVwj^q0z8EMp3~u#x)}SB^&-5%9|2^xX_jnW_w5&il{Fs?rf%VZZs};j%+zcuE
z?}9`}ss0A+X+q^EPu#`&o7!p+-Ih(2pHgYmxus;r>F~RZPK+OVpuDuF!2sRfr2vIg
z(?%;ibjSW+UsW8$G6JdOzeKN}@Fd*p)?!H4=!gdgwDNH>yMR`GO>;`qJlu;M*j^Uj
zDX`VUXvNzUs5$;>ZuLyH)UY#$W{T4qr*nMGR|w-hP9;4{5lcM)x4b28viaRrTvN?M
zknt7!donJ^tKKr!o4`#Sw?nNab`x5R0F+RtM1(-4=27ZylN?^*uDOwZDFmsWWfAj)
zAxJE4j}&%P7i$i+3iH<X>`Fwa+m*hUq|%$-?)BdWBpnCBL&3n;*rr>-<tjfn)pu9i
z#{_k0Vn=VU371UaUUI+IthCeZdvr*Y*HBk(u!4z#F!TdhKCEg7d_ny{6bz-qCGC4B
zxwt3>-R5<9dhNU2@@j2xXbVk1F=r`A_2WgdV8!WA#>{WeiGg%F5fk{m2;2L7yf-qG
z^i7k_n<Zw0FSYZ{gBh&&nPX~AYR6CM$%inNvqotx(KuaRw_YVx*6FB#t<dm|W-O&|
z^l2&el^@zN9sm8G@nWtPIp56JpGGlslxc%Ylcdx3wNJpF*oaNt??tz{w2%Z_gKJ4C
zt-3p%5x<=rsD_Wf0kC&|;lCDQDY#3LiTivgaWKPP$rdgRn0YGmqzGGt0Vu3LAY2$@
z=q)ouuGuKBGd`tC&O%Ne5H^08A-+n>`*{6Rt;u(A&%P-I9C4nYLr(4<+LWkjciew<
zXzgQ2KcXp7Zn1Uvyg@dw?!L}#7V{U6EW>44SnXb6OS7($dPFCx@*8=I{<Rd9LTFoH
z(|n@o*Q$&*RA(*1@2t1D@mliiLb~f7%FIGTF~&S)pHaq0q{WL@StZlL>miQ3b>B+(
zN8gQ9oUcWxYu}MC!-;EN%GGgkP=yHs<#RlIC#Ewf$=f;!T>2XZlZ;?ABmS<OGQeyA
zO6|5@CR@i^xi*JxBD-v(Y_zHYj1I4*O5IW&v$ttfArJ?qq3hzt&Li3icY0q=BFogT
zaSh*Kub&am4yXV`T`~L?o(LXg{M%o~xKPop8bt*rH{UsrzPSNj+@PLQYtBE2U1@Bj
zOfvrDW#Guj;rVu5cZ?TEcQx@*Vss@|88Go8h4k+>1{EjapBm@#-%c%e>NDKEG%=MA
z0*-P&q`Kb#yq~b(Gta=NWkuoSSJ>Z2^6}Axp+9J*tS-wCcM&v;CHB}IdF=!1j-W<t
zm$RU}iUCOiG=!WtSg79RToz6TwCE+=%OmC^ORxq}D11+B1G^T@&m`U7adR-r=C=H7
z6)SjuJi*OE+ma9;8#@8s$SPr~cOSjKT)xdGinQ|N{%#xA$|`HfFl<p@eQ6*}J*sHT
zb#Nh!6M1k^I!C859q;-HP@DW+01;gUI3pPQyL{5pdhD~b&Tm{@;!We~c*P*ab|=Rv
zl$SD!E%dX6G}FGvGKZ$)e#??_bVF>uq23eQc8%)wh~)|}Pklfn4?jaaM@LE|nr>Si
zO9|{qXQ}sG#Hk6)aw|JF9vG*BINkENiU#u41QGZgbhjSPo4>T3Yrd*4ox=r?8U}K@
zNPJe;5xx}AIy_)=w^8|QJyYvVe>t%j7wQ2qLz#NE{gw{qdaQl1Sz-m0i0DCaLD=aX
zC_=Z(5*<~|<FssGg9#4-FZv3yofF{B3Bus@@<n#50TXM~c%lDv*Wpk|1Bgr0wlC<b
z$LY6&O6X<0rvXjNLFwpeer_D<n{s?ZDu6BjK*XjM_XjGM-AVA|lg%H@u~*PG$!~*#
zji1uZ4J0Bxl@ICRb#3nZ+$?XTy_eQE5>VgJVFwJuR98uF|CZM6Y+E=fhTkS2i+!5o
zuP%6{?$iMLEsi4nmSQdm?`=JN%N6>Ez?G9A{6I~h7A$?M{Vq6NsO&V%&LdbEd9m`$
z&8$#v=xIs*dqxZd1Q=UEAb+IUxU{JYaCmy{xb5C5%35yQ(DHRuZuEx9Abq#L)z&z@
zTS;8(=92?K0!{i(c$O3M2HG@*&~&a+m}F5~>1bPC=%2Eg+A6xl(kT417KcWF3*_~(
ztBzFOvSo;`nE|ilab~g%Nu4tvp`GQxu3tdiNnr=UzN^CrI@w~Iq+qMgmCL7(q6v%l
zBCyBi2UMw8&7>tVHf8}NDyv=V*MHvV(qcJ4LMk0GRe;rxRD9<W?@k}3)>`hA33FZ#
zY8G^sTCGN(GD2@?7APG9lRt@0?Wj`VTkZ(J_kbJQ@j!c`I+u}@#9Mn6(2O^b&l}9=
z9X0+Xu*PGsN=WZ6VoAY&lD^_zpmivO7mdU?d?t#3f#Z8?V^EWlnL%S#nb;({AQ4mC
zsoeW&L_p0hu$HJ7jY{dI@buK%dRw7ke$aZ$ej8b#>pa+NJCiB-qh+bRwn@BDN)0(|
zgv`h*%3<KW>Fw5~Mrp+T6Gt24WGo`@)yhk}p$q+`gf<kKU9hINQ|XHp;UOe5gea2x
zd`6yq?P?GQF&Bh3!xioB^r=edrQFep#a9f><2v*%feShF%Pk7j{Ub3!y9cEAsIB}Q
z{sUWm?1fT6P^QnZ`Rs8j!LqB1q)3cvmb*zzFeNqmlkAW84K@M?Q6-^c&Mbe}I~g(C
zR7gEu)^>ir>uXkiBrgydZdX4#rzS>42?3P{8wcniwn<d4uRHSgcv4C7>iZxCg2wB(
z8^tXYTa?F|6g3a)KXRw#YgVydBzBU3<DRiyMkCJ`WN)H^T<sCUPg$7-nlTQH#}FJo
z2zT-NZqQ<u+@CzM!Ke65qF#Dv#{To1;)!)~LBKS_>*FU=kQWi_F@YYxS>2~fEA9@W
zmd9t*tXq7S#~%;0Y&vmNZ)oL1OJ67X8Y0NthCA!&#-!QZP<UhQ<a5Rv?|iwRcxlOX
zp*nC9;1AK>{KTK4be}r8Ol(Yd#Q%O~k}m&Ap-yb}Le&HHo)Ux&=6aH~j;3DMV^=`f
zCSq%o)2W7XT3e2B9ujp4%ElMXc8)Y#COHxl|AqfWY+&y%!x?uHXSX;(RY4$A%Hox(
zXiVhm#7nSJe9c#uWd5^rf1P(L*sEG5Y7E0Jw-S@MKc;p#Gx&}3;e7ctk3W^m4i-d-
zIWT8H^bJ1SqP`Su&Dd_UUsfmaVRI(SAM(>ggI+Mmi+NfsrYpVi?avP^<M=pWYbTjq
zFe2FLkz^zK8AHGQGu4LHhk{`<6?rhu;BjapT3pbZ*!)Yn_d>;bP2V1a2-VO8<7eCf
z?%rGXkFBp^vGH4@BighG^A;)m8)5lx)=!T$r*pO6B-0Zqz9I75y(Z5j=GvpnI#0`A
znb3(+`f-f2{-rw7Q%Z0ca!!IetyLfA;hRpPF&325M~$Pb1Qzg5BIfR!wjXqNb841P
z5W1t>n8)f{l4ZmKEtt*DM0xURpI-Q=Rw*5Z(+v3qhBUbppNNe!{KgWR^{wz_@27ev
zRytz2Bg(aanRFl5t=7U-YkvCJ`$@V(#!PS5P}cu<^cdZ;Y1JwM1YOACSUo%Gg64pT
z=TFjifiolk%$8W_4hQ-`?DC5*WBtaKn7A7uz2j{H;-^0$VW>-6SG&QDN>jT$u$>Y4
z_cwLfvv+k(_i=6DyVb=6!mnA*4Cj4Q_%)}E@N9pWyBU$Rlt%t+KHCWHO0ocZ9g^I~
zp3uqI5yJelSq{dxK{#kimLtSa43p;Erj$Q#zY_SaX9BuVIv!r5MgwwjwiO@|4j&*t
z#fnrVDVHmlN(O=_g!7O{s<l~|EDf&OdAjp@h%FAAHTTL8q!Q299XDr-9>(U*WC$Tm
z1jd|f;N{LL``K(H39l7Wgt!MG)(k8iNqfZf78Lyeg{)CThS8!nfzLr>%1V$V7Iq&w
znR{C8^<SdYP#5!);m^wjMPsa_zK(ZIey9t?NKW^oaK2}zn#K$i>jP6{7-bb^S299~
zFn4BXr`mm!KKmbO*hJksLvmFXToquy7dZx4t9fgbHxSKbTOqeI8>KfnMe;<5E17o?
zZjo8Dq_&x>I-P6Xo9jWj9ThU&yPk`sR;FyCu0QxVJ&dGD4<uN{%~{@T#XSaQs1FY$
zPUo;m?gSyaX)>)6@RWTRF`x&il4!kd8fr77k`ul8<qc|nf@Gx&f!I4Ls_~V!;Q_1V
zP6YjQh<dV*(t_;pz;m)oZ-<M<ljOOr^?aQv>xcc!;LM;|liWdOZf`-CZP&6I-`nz&
zxgj7B3}{>>X!G-YoJGj&kY)I@k_r3K2cMpSFIK`AQLt83qF?zu{W`jZoyXR(S}zZe
zPXw|VbAHl)OD@N;akdOAp9H0Kr<vtK=R?QuBwnYw%c!PV6^D{%wmj)EtcoyT1E9~#
zfVG!e^X7=6EL)Y?9_(qX#B?L!bdue*9)(PIhms}-;jNMy5;6|k9-O`Nyb;K&4-vTk
zp<5T7XeJa8woL1eS7{cV96!?{H>y-rk>vi3e6&uN0mC6QBkQPC7a2($&|vL<pKpBv
zCNv}blsJq?#<Z(AC(oG363QLBhgh0^w`f*Gduiw;CfN6~o{o?{eb(YOk#9Mr99L{d
z`y$~Hvdd*3e0W^}F`)Gzd^euX3b#DvC-lxFEJQe+2;)Rl={3n3%_D(Z-$8I~)SjUB
z0HrJYq3<;&&Df5UGoZd1oJOTL(z|C-H6Pqz*TOQgKR#N4e-PX#Nl_TA_mk~2q1EW;
z2tt$uf<yZ$c(4==4}tU1WM2T)oSm;kgZ(n<2d69|!V*s29u2iM&bSgcNj#3CkE|vn
z8NB7GHV2B+$xJDaSjyqnUvhBb@5%|EH;jUf#6zS$QssBEsbDr-`Tuk!wbnI~(1U(;
zzhZp`CT+Wq$UB9(cUIP|h^l{Olbza)jad2i^o0(-+6|DVw7<LVrffM6V^1G4_C%p!
z<xeunZRRpq&#OdmVAB6Cef32|ocF`~_So|Uefofgh3Fpzn>I27vP8|{_p~a5Jol9q
zCc8@kD+-y_1qB<WSzuVUd+GOz(ow^DZvdS?tln(K<a<nJavvgh5FlONGRYn5(6c}+
zj&&sX%nA$ZvnTew`dgD>((6~r)!z9So(F^moA70XXqST<z7Po$pEUnCX13f>6C4Fb
zVv*H+nJ}4bTuq8^qT65CGt1TVyK)@gvM!>{T^f4o0Ie#~I$rU6+1O$gj~SOdj1gQ}
zxA^5?@#JPN$CVQFml1$0;Fq27OM82N!L<aZkDE<h&%q6x+<lgvMHC?jgyo=v<+Gn2
zzUqurK%kXmrRC`DtiU}A-^v4q3cy030$;uMMg=~?vT@#gsRJ%!0BsvhA0f?lrIR*{
zTU@Qk%9n}A^_@$mJ4v;RWAKe8qiMwzSZ@->fRL=6z*S-##%TI_0`j=?LutIt0?PGh
zdVEt$vTa?cJkUbP@l<5he7M0IhQSO;@}!FLW5;;Aq*6<Kr*`Q=nUrv%?~MZmXoZkD
z8AhLx@47^Ce$SkJGb)KX;g-_h$5|e>T~+6kT?4i?&=RTRZ@N)lnoqyNqx%}NRP=Pq
zE?tIQ%&k1UH3koI%fdrW?+>@zPqtchetv9SDi}Y269(N+A{V7&U9VtCWAJckar8O5
zS3&3SYC@r3+4d7x9M$Hk)BV-G2m~6s+2YX#S{;F@9LrtUh-FU^@}oy@hg<Rfn9A-3
z<DKGheoCFR{#EIkx0Njf`FQ-+uCvDPr-5RnbHm)+t3wfmSS*<}WzaAB<=L7+Zf;RC
zGayzM+J+IlJV$}>3-t_LTTtD~x2`<-$Rjs<X%3%nmmpmeh~5`-q~FI9pHaP}^4`ZU
zW@`H5AvL+2>?I@X$p~v{&9Tcy2$0^om??n-#=IObUnZuWE@WR2F@tKDPH7`|=(#=l
zTz-dFWPO8^l6;e5ZQWS@n{u<sYoGR~R~8C<4J=~Zwz^B&U!F>Ny5EZjvhBj=_-MI)
z&W}r)Ij(au_`YBbu8ESROr>kku<fYwjhox}Kw-K3{3#EN1I|8#Q4t?eHBRCUdq4cS
z6M$Oq+;RZO1Ywn)UxnnIn{kj{A^4gDDAu^9b9cieQR?7^43wTa`Z-_`!d6C0R{8DL
zTc6p&POxUrx0)Nx11-y7QfXxPDlML91@7!{!?%xH{poPxOC3u}-qMew`I{~K^gn#&
z1F?Y3exH#5+(GJTw*eao&mn9DCp~&6C4H5N;}oTAPE4omC%ommO)ANqL*NDH=S*0j
z^BEV^UQ=Jx)c@7#QcpxkxL)2@1a#hxB~P69a;<(TZK)+go$5>_ttKXaBP>)4ZT1`8
zy5{TL^oK)?wU_PO3!EDbtOO!Ht8C|heb_6gBa8Q27R(fP%HI77SrzG6sdqy1NfO*K
zyAbrkZfsW<zcht8gLb<T_V7M-VsFWgkOP?H!B^EBAN@@E#*AleCsN1>QN1XN#L|eG
z&)8MW(8)^^2uk+xN*$sDE73cKz{hk<53@h@zpZqlXsH;`mh3j^be(tD64V@v=^48}
zhw`gJ$nO%){C{$dtuS3nau0)it0LM-tI@IvQDo+kB>|X=ac6a6%opV|fr&A;$SvDk
zfXN3msJ#Fk7R&*vcO#ZJ^i~lt#YWdITPbg@{1JG-ii&5~7OkmNFOtiSbKQYR{F-_w
zWU!_Hmpo9}-uOYeVF4kpCV;TzFY)bBhKu>774H|q&a{3>arscYFiGJ$c%$K{j`Q*&
zYF-ra)QCw#La1LPMFOf=DpFA;9y6~b26vPquSx;d2*Ee~_un;Jqni|=3K`nv5Ww)D
zXHz(97`wuNmX(6t=aNU2^YshAjrkl`HhLBGNzmKhFRhg2yW|qOpEn4&dG}`;{hs#X
z5VMfnvHO$xAYVIjCRgfbO*CN#cTp7<cR<TPpG<mmXEnG=JZ-$^1w~4!`zFs30bQiz
zTF*9+`uVOw!?VZQaZfXI$q=DREHQ^H8eD{_Zt`?G$oEBrviwky!GtANcpdE}rj2D{
znqg$s#P2BB(nB?V&t9J}?enO8o*W9=Q1FM<2A>C?;2)jc4`e+(q*+Q{@u<wul<e*&
zv0QA0+?JL4b9?p*<4Q7cfAr;)r2YG;T7Vk_mSRm_ly2oa44d8x_7(F)Uwo!^IdGRE
z0Z&mB=8t({a_+QpC8}St#W<Tbqois;#=1y|+gm+M7Gg^MgLjGt5X+JWf{&}Sq}!6C
zt(i_F>03x`up_`tXbx4e?1}Z=RbtYpy|c32p60fgE&G!%MM)cXo-_X*aGf3(_Kr4~
zS8f&=;Z`vJ9(&{}5tr$hDxaAPU73=gTu;Ox!|AOBF);;5pN<aO^2;m9?&^6&&m=^G
zO7t>pM5`gti9zw&O^SR0)tSMgrZn&3bPdbJ8-?&VlyE7xFj_q3Q3SFKc$9rBgu*km
zKZ^F4GO*8*flC1wPNP+}UBe>h_J_`oJTd(Ppk>>poJDI83n*yH?q%_QzF=A~)?t5G
zU&4l2^NY9NYS{7W3!Y<&1GirhUwyxoF!+`eJN65l;zKF4Cj`O&6v_1Ac&w9sZeA2Q
z90sERnmvA0B-~oED-Pe2yl;CzhBxEi0y210G{;_#8Z>oe|52)ZYQjb#)ljPN<I=he
z*Ms@cDJXH6wfeb?(uK}7EBf+2r=9t{Gg5zdAaS_#4C_tALdN~ot2b~T_t`nr?Y-s1
z?OgY4(EBCr<o5XC0V#Y-gF1iSlOE3X#qPXg1y=rY6oP97yo;0mhRk!W3DF!8PDo{_
zGootHE9dCkHH&O}MdnTYC&xJO{R!UFoT0_t1rOt^wir^{j|}ENTnHHp<lg$$mzOXE
zz5lGtoJ{)7=%efoYXQ&4E^p;=9_WKL^q270uSrsD0~;Er8VFZ$j?y4}U1B@@>~__!
zNDy?=F)>Yt!N`x7g}O-!>Q!@vn&bdOJor$MN8@^Whn7Q#$5X6tnw1-^J?s8{%oGCX
z!dax``>p?&MOk*#AL?T&+`QKmQ)+=ILQkAaA#gN=@^wL?U@fyTU4g~0v=v2EEs44<
zy=E&3b3d7NJ%!J`zeyeuxL6H`{SVWb(U*iQwa$~`zmF94MEhsCHb(hM(G)+tlWmig
zl36I-r9nYvs2cw=*H+56ptkK^qLK8JSoCO-6<>fNB7dj3Y*E5C^bv(7fr^c}S2BCD
z>zjx#09jBLjmyf@<}ha*C6{G1qkJ5DtIetJmGjJ!`S4xwmghxViY0Xw&-X0abu*uS
zmX@3VFQUW*wb`l)2n<g=mD!3lVBsy_KTWG&R&A9T-(_Eqa$50f*jfNrC7AjPmbiv3
zJiDYVQ=PH2*Cklh-fR^F{qAi}@RQ9Wv`o}pcb#q`uy-|j+$Y%9V=NX3zQa_ZkuCMN
zHy{SYw-%x;<P_&Dmq~cdsx{xq<#?2jSdnfSi`=di=@GRm)Eeie1zH+h{s>+5^~&h^
zK}A58VfH!GB$PQezlE!esVezvh1pxxZ-f#`A5X@Og*ZAu6~+^rhP&r(9RfGpmyZ!`
z60EZ?ZcrmpVk)(3hq+wqH$iKDfC8X%hj-lvqpc$(ChGKP+x~IcklYaH1~lM%OG>8W
zru$;lTuOO48PX1MOX!i0$VwZ~$>XyC^Z5LdOVw+nkry#tDqUuJ19X2ZvSWX9y5dl^
zS$w8^X*=~^+_3`ZKs}5biueXJg`nym#p#a$y1`E84C6#YDuhkCFfB7cT&EIEd>}kF
zR4@&el!Mfiy8m}eiWn=rIbO3PL5NwgKCMtvB`i2?xa2S+CizG}rK9YdnI~;t)ijIp
zvH+uh6=T8XXRFE41mEpEwzfp?AD*9;H&RDuLkRge3QXM%6oh4(*DPn>W)Om=14KLZ
z418_1)ay!o#^f*Lr@yoswG<!re?R_9vszhnw-836I<!AcOH+PFy`Uq*vfawo<-Bg8
z@s#$ndo20SsHk44&3UV-<)7bn&f3eF?L<O<AA>yK_pL1eW2>iPTOBSArh-6iQEfNW
zEQaHm<oHQjP1iqXFp^*Q-|0XlfAp!hajF=cp4dOGmZxh3+$FF+qK~f6+oHDSv(8rm
z%k@6GX~bB$;ii5#3A)b7_FX1q{#KZ2@0$OU6L#cN5qh(s=eDt!1D-;x3NZSKCYjjd
zzD4{;@M|xz2pH}bk6SE^`H_mC|7pworTf6`E8mQ}Meg(K24)karCY<;{pCdH!tn=h
z<hfMjM~U$;DGW$Rc^HCJ7FQy7lb+cRaet(m0FCv))o;n1xM3t<Lpr$qGij}YH2?rT
z=gj?s1b9`?og@ua4pWdM%q588<t$RymaHh_84l&nLto^qNkq~$%eD%CCp@Hf9rc3G
z61q!*qdlW8wq!G5jJ;C50_#czGg&xUc7JC?9uA7i;<sT-pH)ej>BN4O7CiIf3SBdy
z(r46|u(0&MS=2ag+m||~WFUEl&0KVzjknrDBZssY<i4IM+<V~&Qq_a`aThG<(f|nt
zG)R0)p<6dIkNf6flq$<#_f$x>rBrDH`@Y>=h6=Cdf~Q^3^eMX#cOah28Agb-NhflJ
zF(8!-aNH<rfNd}ck!4n(?F*v-d^?3WJqg1Erf>!^qnXYbaLCICuVm;9*0C+S&iB$q
zOY)8DnJY_gcKwPq@LN+NQ)}ubjsK#HDJuA`YWEJkVw#NnHb6=D_1)wnoUJ>v8Kh%H
zcadHa%3X}Q2U%U?L%@E7d7D<<ekNg@oT>GOx$ZAt+ibdi!?uC3mbXNQuHhnP5RiEC
ze4>9+C5K>kNb1k|_sRdgyHHGjyRcQKxW`(yqw!En*hG+o?>+E7E;_KP4TBK)T?~|q
zVeCKaVoqPKl-M_;r?iLLa1D(R=+D2beH+3~EKd7`Iq8#}2y70*_Ssg0&6Ruc_Mzy3
znO`t}`)AjNC}9ss_9sK8pG6bC|Ngd*4#w=l@!5{=|Hiu$`0{#>3wX=Z7ik0Ovo!kA
zw)}$_fzf$*g;?XN#E@i2fv)Ipz2n~^R&o^~c?jQ%7bW(TeG6mjd?!|b-qfOQyNZ|V
zGZ=52XXCFLkn6eZY=CW<+v;V;w1gb);ezA=>}io3e_P2nAtO#85d4WDw=&@?@0*B+
zzwc0|GnGQ5g|0bs-#eL}Dv-(-ZuPiH24unx3x>QaIwlZOscG6|NnL(x4il(*CLwgW
zzUF<+(N@&wS~ddd;#NW%hBivT%#3xhixbqD&A(2uWNgr*B_CRf_!)nzs?r*QaHwUh
z9jU;VpWd%wFaj#pUw{Z`Qs!5n8b5^xlXmo)#k!HY#1uX`p>@Qpl3-Cle;B(71_h9r
z8i#$Is4<2uY4<V^7gSb|Aj)hQVD+{~bR<psj7G4dQsj{}OiXZ_=Sm-=APQW@v35-q
zel*J>dkw&ogAL4Fd+AEhPt9R3=}Pdl$&mYO+jHU`_uu7SV<fkSjm8sCf(i}ivJgP*
zcWhXjxlU-{!%bYJ!a-!0jVt(U^u&4mGW=88>Xt-l(1fwVn%dNM?zPy^7lg?!vcpMR
ztn-~(PRCqjF=+_-{Y40V`yXjjBne!x!9~Vhf-E%e4;DzlwS6Jn#4k9y<5T4wD|F%v
z;Cz+!E%T{F+a`WM_$KAl&q<G1ZRQNw=;cfb1FdA~JDg=jD?HQhDC<U_%r`bNVS3%@
z#qme^4L}|gqi#;!2*^~re=N1V?xdx;rurv~Kt3I6t@D&xS(hFu+9)M+Peb?y+}krN
zMbt$_YA%Pw*@u+)=kjtS#TyX$gZaivaeY(8Nu-1U`qmvNww+G;-Iann$W|rh_k7r1
z@%HT$KQ}+iL_s0elJN_Aozmy7*&OdqJ6s!+EEc}cg{l;`gRGt^1R!DySNmXESTv}o
zr>u{sUX>W))Khj+Hjns*8bi^DM4J{}gqmPvKKQtc8D#$|SQcFI1AkWoY)k*4fceqX
zfDV+<Xhm2W2;yn|v}~B@LmvAI-+j9UV=XS&i>zZ+b)p$o`RebyH6xz^g5km@iWD~E
zFi5LbRXdO5#leP@nspB$X1p|=!!((8mLUb%$pQKY-2$=YC*E+{B4xXE@t_1oEWnTN
zSZZi&#+3m)H9;~%b@oIry<qqq1N3)H4YtM5o!o6^3yIJlqGR8bfq&FSbf}<r%RMj?
zoaj~>W%YDrInAFo7ABd$!7r$b%~7quF1fK|u8x(5Xqjqm2iA9llTi|-{O~lDrW|rV
zlpT%<Ae4dUd4shCIM36&sr3B>%s5$`f9htCUXfH_fdYP@xI)_(WGMaGwcIO9yc$gg
zVf*c{Ka`wZtg+jA!E+aFb$Y4m3dDe)0r_~-x!_(Hfs8u0J6g@NXUr&Ze1M~d{#)i4
zBDL2Ckw#CcK0CmD-to?cutQqev=>lbi~^_pO$N^43F63BAOFj;A4b*#bIo6LNpk9H
zK3jA!9a6t3MgdarkGCO0C7~69wT+nUN+!&!T|<A8r#-#CYVUDl$oV_%&|Zcpt24P*
zO;BQ2(MNE^Jk~z`(;E*@8Xg?r$Q5RfBRdyl*R|*9$S-#GYMXpwbXhk;<HIEzbONb9
zfTm0lQq2%kvylkRu!C;3%fZ6bO6R#T0-)St8gpO4S3QEr{lLz!(->j5P5XLgm&y_z
zg|KKb6nH%r(7qb9KsB@6vUH+_R+M_ix0nSWwUBVvq(Nc)co9QJ+B^s|5(BX3ylgv3
z@zaO~&DFBHSpZ*<o-bHU+Fha!+amG!aDq^JEVnuYhA}d8lg3vrEcY6;PCC=@9Cl6>
z<G-TS7a5M0iRYF4q!Q%_^A0GVsc+fhGDEocc4C_3&4l|%f3|v8xsnCgqrDu9E0Fbn
z4*4J%NT^l*mzgWQMu`$dW^H=Bm?%WN!fl|tangd$JDLynq%PYmP<sv<t~Wijl9cgB
z2rkV*9BYtyF0>Hy-@G-x2rqr2JS?<~R@ILbpr+5ClIIA1WLZgvl&<ibrRGU{8GRW!
zT!td-!*XAp!{~9Mg&2EuYc`6<K<Eo^in1g9g2<wwNyAyGNI2ZSd@g&PYp26#{-$VI
zPagx#L@r3kuPBU35b*QReWw(R$$IuYu2?5c7RJo%K|<$}(4DRzy-G4Y%3&<mos0J(
z9Kzi!2{xl6Jz^RL;T{o;!Ec=*gIJ5F<<k@t0eCfDGPR)Hlm3{$p}=EY6APMFJ!GpO
zc)ql3Qemi@<0Zhab<sGv8A$$2vawYi`$k{KJ~U4lDnx@e-R<7Vwvkbd%!Q;&BL8S4
z!M?b~$R^Ujy~mHSJ#U@35T?2oIUJRk(x0R(fXBXlw+Hm5**U=xXLXEj!C3Jbz_v~q
z>;YyyB65Gga@o6&;>EPB{(;3W8(i8xfQ6kjJwOB-*zHFY&n%A)d5a5>s8i;(5YnoD
z?K__3F-kBxO`eu+%s3L_5$T>G?ezU3NKYTGinP7(1AR2Ww7#&N?@rhgTQ6Stvx03Q
z)|vLhaOS-p%Ds3xawU4yAg&t}WUEXcCMiWaTUp~~en+@5tM`e=*rW&0`9beKMu?E@
zJr2Po&Flsh@Q_Vn`6yB-k*KzeHjTYGObcjI^Qt71-$m>#5ppQ&Jdy_3!B+mk@GZ1b
z_nd5m%}%t;WdlwMtwhwfCng>@n?Md%fx3eOEa))kIItZi$51zYa1fiEziTsIrYkeo
zDMGbHAp5yjyXg960Mom-8%<b53&mLZx=pO*%fxS(UwNg(({o^N@z}_7;59_n&T^;?
zDl-S7{#+6MswzR_Ru{#XM*V>^(f)MsDv#w)wid04uUrH<7fvm5cq&T7gY*Pn#_wfT
zw<0ALn(;fR=C6EK`l7~kKaN^a+fP8jXOGAJ^F81nBe7!9%vNQCK<hxxqVXK`RXHb4
zf|_!TlF39@dXWbY%WkzMN4pbxPvKVxrMH=Z0HM2{lM3}JJW<4|ptPU}k3aRb5?a@_
zika4>cHz5AA|^kY&b7O2<Gr^W;X}p)&V#O67V>+SrneO*OP`1y8W~1Si0;9jGnT$t
z%R<7j%Hmp<KiG!43nK3?7dbW-%>bMq2y9hf64?MP$+siDW&1>DdkUW?E!fD9)~@2q
z^e-QbP|aer&oX=n^1f_#v)J|Ut;VS=v>emAap<91CCRCulv^2)0;WunIK^W+Jfyd7
zx2jPt{_KmfZZ?rc><&0jk^$EcQ`LZIlc0qh0&8#d47C*@!X0(;ci<oLBmfHqQsR9%
z6dd5T;gZ3KLQ&U`>^sw|GZ^eH0cCWBG_^7{^jc4=ci7eF3%WJk2iZ0ry6n3o^T#>~
zKp5G_x8iHv4=fcXIGXjwpXd-c8lR_R|LSMJT%bOzDAhHjHa@8Ot;t~n(vX3<%!l$T
zt-+Qf?a$6g)48@qAvSA8BRe=uG4P0po`^^s3=H7gz7T%fmX)@nhd*JBU!WZMm_F!T
zU6@^6aXxP!w#g3fDCG?wLgu>m6`8I`i%-3W6D(IQ>6>F#*#Zv*>~Lj=Q$`riK9j@L
zv-ny`#Z|bbXM+A{!GAP^>FWK0LaUglmUG_3NN3q{(QX^JxzJsHvHPlc%VA_W?9NNU
zagSk#aD_RWHHtnnQTn@eIoL-@-}fSYMEXJJepVK3(VdFhpRDFD>zUm<grQ`g5m!^$
z$uzZ;Ob_u%zW|kQihWV%OYEEu^GJ3g-@<M0-Ztg=_VYH&09-bi!nk&vpig4I*64S9
zg=;AejiutIw*9=v##Ki99$0cEK7gkjYq_1=keY8amJZ%eUqw!vm0mEy(v=v#ztw`P
zh|{bPIwG-)VmWXUPkyIa0Wp5qzHr^HHf}*_b&#C%()7ba6JbOzks%gIjMg#(Svv#2
z#Vx;y`wL^8*b{?JcEShb>L1($`=vqIXz?9~d8Sis5f1C%5=QXBrb&IJv~qyl4wsad
zs8=r6B=g7`=(=k(XjP}eDJq!j8CVlEJ|*WC(w`LWUaQ5B{7lg*c95)|t1)p~`Wx6W
zJ{O>@BDVwE&+KPp{X|o3St<0)k=yxeLYyFE8D8*==rh9=BgvRct`AOcQFy@YRCAzh
zI}>&JZLqPV1z!><JW<vb--o?BsAAUTc+ztJSyvP6CgH5H<=s3rwr2d(Ix|`Gp0Z>C
z@Uq8D7TXsH`a|e)ZQdq696YmNm{iiiYGaG5-)h_c%THQnL!AIRpVHI{cfv&iOOqzk
zqOVv=^7DdTv4806&8LP_v4hA+5Xea8F8c#4C;}WY{@juNU1I$^7?Dr^s=-%SSW^W#
z&fXZyrIn9YZ@$)H({PP9IG7Q63?%j8RUd7y?|8u3HR9Qk^UJ0g0g-OWxukf?sqc&<
zMC~1%+no)jlGi$7nI}8H(d`g0m>p2BGBO7O98Lp!8|Ocztw{H7@%-vDY+H{J^w`ch
zCT<(EJn@A_BvvVxbe}J#al4q@+-lS<bu|O{ZoE!c$Jddv9*yVcEtj=Sq6k`e-HszA
zT5-`9-!M-fw^ZHlg$H=bjalEmZ_*H8|CIEw`b@a7h}19Jxs0&TRh-2v9d-AxBSnAM
zh0N*-9j?~x1^AiIxs{#TS!gi-<q~5>4lA|T6y(+GBxb$tlGT6DVaDy`l?bsyhOpXs
z-zmvn{`$5J6q;O$eI<tTe*hFg>%I#Ti+;nC!h1kpQB;?#+-+6G!nNzdIyg<-{1N#Z
zpA#>97Ee;4BP)e^<l@eDPb)Hwalwq=91(=U%+0{?Ovew#IlvZP7As&(0n+rlub!`6
z1s?l1!0Y~g&ew22Ni@fRx%<WMCIG7!fg4W)SDyi{KPUYBszicGBDlUO!jEbo4g$K3
zTKw}CO+aNFYBEY~q8vr_Zp^n6@XDWv4Mm->5C@Xf9P(HR!z}@F6%8jOh&Xm9M5b9M
zap0+-@0c{`FJZujhQNkL5si)rrT5S<0=fe>Gz>O0j0o9x&(~HFudRZwiocm9p{aB?
zPHb)v3f&Fa5>;o*CCP+3TpUr>3-VeNDU&s(m+$OXffGL{7SrSlMm}cWF|uDgQ@gE?
zXF#UNRF#^k+fsu_FzXO`MW&y;7l;HKNX4D0JYTymlsK(1;J|}o&$%nl05@LHH*+7F
z1oppP@nM}{b0tg5@vdA8GEAAuNgmjUgd&2$m7Xt&K*?%j2Z6)y@9v8nKO)}I>J@P=
z+m=~=+w&Vlfe7McdsEK?c0Q_-1D$NN?6t_$951N9>PqX;eZZ|h4NTwK+Y0Oy@g{KN
zaYIH>>O%Ib@@F9ovSR|hAPkh4`ESD@71pl<mu~=<9~TRGCyxQsCxGGElI1YUboi~n
zi@zsa(B#VIvv3ON7AfEZAKimCM%wllRiDLnT^&2d4)yJs{ZW!Bs7fq6|2z3b5oE%S
zHdn&vp!7}NRtohH3Qe#6!3VKUCiwWv10V#>`8$B|Lx8!tTouTA*jxrKd{+ceItN)^
zxf{6}=h_RvbH4%H`Li`uP5=Ngh>z|A4*Y<ad@Q^OTzf{WY+5>%Oga<)xYWjYny*fk
zbw_S51kI{B`0@;>0cM{@?sLG6zshx0aYg>*o(C*BR`)zm&#B*daJ!ab<r47RC-r_p
z)4{94wsN1jY5UNWV=OWiQ%1z0>AXp!X<49>3#6QHQOsAhHn1w@ixv2lNCO+WQuGW}
z2oh;sFfs}@Jc4Ls6lgT;Sp;+$3~Xc!jgc{6MuhP7b;PSH;HxW$S639bN5-u-LczIN
zE;ssDwI~)cL5pS~6TAovBQm7~XL39+$|Bv4L<)Hz-4Mhv@brHL-t<rC=QSUq4!OBg
z3{8oJBk?lQ{SQ)8dX~v|njdH7y{dh+(kH6&ohHwD%XzztNTB9l);Sp!F2h!@=q_Cw
zqrkogfcd+CtIrCHgqhob`MWduMaAX{F|MhTZ-PWZo*dFF5OQtOl&g|sAMzl*4|W2=
zheV*rgXR!$;-`gs$L_vuVD^4s?Mq188jG|hmRXI+=ZK(Lk|=vpsL=MAOH&9$!fuDH
zFQN8>E48>(=?9$qDX6+4wJdTdN#*SZaQNN8iTC$*|Fybs;|XDnsEvn-+#r9cj>{ku
zsJ%^yu{9@e6~abDP;!+{Mp_lB@*OfIkTGCw0a$-h>|uJ_hf0)@Kx-U0@J8VDSMqZ+
z^BK%z>!bIk4`jsnD9f1buc(~+kOxr%<lc(%Tz*p{J=i;|Yp97>0Dz^_z?rWSZOqcv
z<X`hUBXyhpMYP}4dqSZ*l8tYnSp*#W0f5z6j3n>#-w^Dr52zIyXTB;dA`ZQ^D^;}X
z5jB9B+r{su4+0xYz}2UKt4{-$pAhbjR8UqU2`DRsV2uz^Cu(0IN4YFg!%Zs#*F-gn
zfbp9U0010#;y(d=i@rt)Rwi)(h{?6h7w5_);No}1@xIprV|(*)hNms$L0-z>vDr^`
zs7%+QR7txRq(KdY!RQ#+*qHb`yp2rK2N|8L90c5}jE9HO7#;>@#7Z*0zJ_>ZSy(8n
zu2>cOx}~c%btRrbCTPkG%eQJF6G*Fs^nyj|cUb1iNnXw>K~<uvmI&9M1ulFG*#8Dw
zg%?$fAL`Vvj~)QFUKYpFvQ$D^CaAyMvqSk7{1nUmdC={PLhA#GwX1XjjS*n){lc}8
zt1dTJ^6yyYMa>fl*F~vZC9Rd!_%_8pb=}OX$a2ATOpynGF0&neKQOYd2X7O=+-raf
zU&-pn*3P8$k1T6UkO)RyQPv1%yfD|=d9Ya#6s?3-0;^`6J7>23B857pCg1zy5#Y|B
z6D!!aD>iTF{STn`p=n(}pIcD%WfBM41s8nh7G>@QJr~o$lsVJplCVs0?T>Kv>14c#
zgiet~g1lu-p>K+sz}gLcKBi@DRt_hw+a9w!{h!NSkvz^Vo3W7xxv>lSkJ?u;VnUwV
zaVSYF0Kl`qAr?NHZo;%Qc|rQF{5vHTDi8{QrJwdA6q>ydsMAT4Sy&zer@jardNa_f
z(Z|-c=kxxj)k&IGPmamU^B)(M5mP}q*L4g{00$ltKR~#ix{{CySDpblWp<_`kOl$W
zK&|9~j~Tp;C}=eF>+*bf78siCcQp+LPJdarNK--iY_<rIY22tO+%~A#SO6}34_G{n
zbliO9Pk_mz!2Sn>8wZKj7{D50F9vO2f#f)*`YC1q1Jz|v&gBuYa)x?7Gk)$EM%iSL
zKgmEPX)j*~qyb}Kqoat%#xug8Q)PER{dGvmSGK6bBWMhd0J8vijCgewd}UdX3LA3Y
zDs$n0mbj(-^^plyE`Y0n4oSbrHIMCnl}LE*<G|hr3RW^(*^qLmV>&SR0I+rr*jUZR
zD%C%`>S9G+Gv#l2thlr^{oqrwp1%wjhy?NY1&Y75>i}<yv5Zc@o&MHJK5fqhW==OK
zMM`}$ju}tQ*OyH2k=>+xHghj9|4{9(%ZkYpV$UYNpc4hMToUGD2}{33?L$GGQ|~Iw
z!FDdZ$OG$w(Sp9Bs9zxaD!^E}F80m5`TfB0_aU`Z*sj?7R^Zy>z``r}y5NaRND%dA
zTJmWqQgT)$46=nsF6)upbwE5zE)1Cr#5u5ZCQl&9GTnFyIQK2Ooay4N*ht(`ADq*D
zSP%QPvaXVuZJaap3RIjTjBW=PMs>mRj;}l+bdkB}ge5|5qR>TBp%kHDxxq^wqcd*&
z;*TBwC9g~h;Jc}44qL0h^%sFg3mBcNl(&X>19<f-0C;Yn88MlZe|=V;aNydLz`i$R
zn}P-O2E$Xp%q@aky6Jtw%~jMCg9xP%3<&4~Dw7A);O#T{wC!<VBM%q@X6^<i@9cL~
z^&e~3fbac^P}&2TfNh$kI(-)=aYpBW+1teV*1B+qclKdm<9hzqjT^w#WKWmT`Apfe
zcslU`ty&@&x#omg59NC=tqrW<C>P&1j;fSs4I!GGKx1wXntS)7F+C&5gJvs`2c5!q
z^3bb%7!&V%Y#fd0Swxf5U_&jjux@M9Zk>>VLo<IbjAJS%%7xRsg)I(KTo_x3W<X#4
zrH&2p8qgXQu42kne#!VXB{6mc*z;zfISQ;@5HdccIHpj>oq#N2E#L9Z>QB7qW7G<L
zGi>6ZaQ{#RmmYPmh&1vpET=p!Qtqn?6H2}^75=WhrYO0KlF#I|k$K?6U+A&R6b5Wu
z0angrK}BvX%(~27VsOd0>UG<F0oxP4)(3^;flX04JS}uJj<{;uXIdP2jQsp+_EzA5
zzb!U$-|plAAf93JHsJENghve?BX#jiSvbd%I51^xF}D!IaKZdX3wDj!cIyHLx?hkH
zvd@8oSVC_cE3$*?PETU(DscKs3ZbHw-KYn1{^u!U^b%AXqx#*_<bi9EqB^dbW7^RV
z^}r3^0E2Vjv0nk!Zz$gsC)${CkNnHcZIerz7L<!yYUuTwo7vE$cZ4oQb94qC3m<Ri
zzXdFw0uH{hGi!vX1=bt^HWm{XUb6FH%9C&aiciQm7A8&_3z~c+8#ln8`uD*7e>ZHZ
z+%Gg*z@B@>@A$ichyOXSz5q?(mJE#YpBe@L#XFw|1n6LlY2S@{E|1N>$wj1sPo_Dt
ztdfInGHCvd<UntRDd%H1^}DJD1J8U6*jxdloPDN(qwEimhNo{hnQ(J(;R0Z5O<1#C
zej@J<PhA-!@4fQ0h`;AvVD5IYa#M~oF)i3~V~G&wd20hsD&FlD0NE22TN~KZETQ<f
zu5j|WSG~p<qR~-A<Ku|NCcuV<9O(vBf+pYeGGCdkU%sr>L}Pjen4SUR81c$7;*}-D
z%gf+xW%E|ey1-^GV2h(1Xq*EP-$;*B;apXAa;V1T3=9!ezvEI7!T?0sib9S=@u9@y
zG4S&51Bc!wRvCN4Ro9*}eO1GT#t5+g?ZCdb0$08VocjW>d?s5gD#tFl2LuDsy&pgv
z8x~SLeLZ>ku9~d3dn^)6xyHDN+;_8f1sL61m~Ia3wPXx5#vS>tlQ5=S%M5#Ds9dd@
zTxV)Js(fYqQu&KHWUqo_d2W&sKq7w;3Yw?^9Q_HgS46Kd`x@Zl*G1Vlvi21jl|xxS
zMoM_Pg4viy8BK#5q;5_zX$ue7mT=97a&m=D&R`4}+YcOn7jWT`%vw0zgG0v4`f&z;
zGp5M(Mtb04yt)0)0mt8?jmbOW%Nw2pPW(CG`CmhBUZc)!xOpv3e#RKd#5{x2lT;-P
z+{lluoX3jdn`O~d>j}p6+n3LYd05oS0^94r=`ZMHlrKr3j6r4}MU9UfysICS%}t!S
ziM@=Ii*F_AdHy^l;&>JoLHw9<JTxuZ)^5hRKLr*}TiTdxXX?4=7rA1|qP|o5eU%{<
z3iR_GSt$^a9WGfLzxcspzogd(Bm1bV@3t`0#6zfIc~4zL=drmgtP!H7SjACs6$5K;
zWG;--K9XgBwRcUdaFLTZDHLwp5WeW<@2gavfEqC}BL<KQk0K{eXy2(42Iaj61b9O0
zzsg!3NI#se32c;XR^<9iu7GO@Gu^q@0tep@Ox)h@s_H+^e-n7|57Ldr7)P=ihi89*
zqz{niax6%WRXJd56}bE)uyhU}l=_*8upw0P7+5+BTzUf7TutN)u3t|NW2MjH#$E_K
zA4dsK57Wmo1Y;%LEFRBax7|mDJMyQ~;d&e@oJEMnC(xXoM{D1HG^S<{jf{dd0$E=x
zWS>;&o`PSgakaudjDZaeBO0F+)(In{qR-vhN?hE)_||MPtf37j^byu@O13cbG2)8(
z8Ox5DArH&4GUb|-J2{d~?vn9>w}nD>&uh!QL$CMIO+>)hAz<HIfbrwP4czKwx?a_O
z0@QK#ml@Yo`K~@$Z~Kx7=6sBti`hsv^I9|nOjYnBzOf+YbLqQa+B=kgwfDtX7N#C+
z52GsYn_>^5p^3ywf&q;t(ha<=KSm$tEI}KJJg3G{EfJL8fp-JbeVQi@%>tMH3}_pR
z9jN&`**=IdLTOX-J*CIUw>vdnmMW{UO$KxuR_g;>pW<VMpnhA2-z?hd=sa-kMd4RG
zxvp)_Eaz8hxr}RIOl;u(&_4k7zNWIysB5U}n;$(W_5fHqt#6<#f2sVVSSOhC6Kz#A
z^l-vD+WG+0m~F(*y#>xQZ&Rs!WDu3=T#U+^$H3S=;hjR3`{WmZl`GjiD>olA3Q5Qo
z+;I2AW1f4)G|c&`tG{d?mqnBgLOU+<cp%3z%7RXgX>y#45<SD@&A{A)m7i<dqrCw<
z`YXv?p6hK#eiQ1qk!w?257*)lKc~#;+qV&8xV61@mKI@`!tFQ9iqX>Vu){XZEaNS~
zOfQ}Wj=mF`8JcfaQ^)iEs^scYuDdqUI#tPjG9X<I#sMG#&VL=4I3`ws1@sqk0I?wK
zg%HpwicEOj<N@F$4=7VY({x^%6{_Kl1~7IIn12H>^V+a707!`ECE%IgATAhvfJp?z
zai%L*eFMvQ>A4{tnC>{pmHjZrO0JDH=3WQfCFrVYn~$WD0#tl!ng#cHSvwTefhC+Z
z8i>Xx5RFeF8XFtDN#9OGnfk5rF0{oLp5v~sOB>?8XlxwOm~g2QudE<mT1YGtr0X(e
z5^Ao%N)-@Fnq2L}E#JDfG*Z=mvV1sMh3a+1l1(L4B3V{0<X&@S;kmB>N8b&MA1+^S
zR!|kv4KQH#Zt+__1)TmIaN#>hEiEV)I;u>rrlhXQ1G*^d^{Q?L7>tSWwF-u&fr&$c
zP`A7z(nS$<U5&$-uu8t`CxK({0Gh*e{_&Pj0K}UB-xRJ0c?`4@Wk7osKrF)17OPnK
zmWUs33eqlK2av>NNY3NzI^P1YCGH=;37CItAKz6Z_FlOBtt?EoAt^(uo0`W;+lvd_
z!Wye!Nk8Vu+9EXv3-hw=3vZXyRC`r1zE3ED0kH^b&)vd3Xf6#!9yZfdSMct=7kJ}8
z%=AQq@Xd8AyAvM<uD>AqQ!O)xc9219yWI5G?o)W@^UxQ09Ou3f-Ri*TLvq%K3W=be
zFP;{gV*|kX?*NNu?B&Q26T~&^BXj4uy*kRjd~<_vwN6q!gK=*5$0!&_Q;P#?lVte=
z&%7PT^BuW?atWOJV_^Ln2u4X<H@_oJ9H#-Mtm>g(2b6b8eOuJ~E{MlHlJJb&1Y8f~
zk(0x`!3mdtM$UniOF}?X350^WPooV@f{n}x-)K}>UHRseMoGpz244B35QwL4@qf;M
z`f>J~{VqYkE`m*Xc9I9wDgg7Ei$GAXHHU$@`++@g1jdf`yE+B~YWMuy$AQg7<$|uP
zw+h#$aB6PkMVRg91#g~DGtE~CQ0~i-1)3>=EnE#PAO*~Psq2+p6jdY*noU6(OiUsg
zH8!UX=pKAzvN{QzGGszk5<x*UHYP|Y0P*Sy;-y8z%S+%}1!RI2t|Um32{v+o3OAl9
z4Yv^!vW*+7vzgNNQ?vdUc=0!Z`~Gf6bw;Cy%JT7Jz@0x2ocJ-|^q&A{zABWs=>i_&
zZ(2-!qODEHisbw4P&b1H)&TZbT!9!hfWvPE&V2*8@rr+zs=Q>wt?vhJeqTZU%^v%1
zR{E5FVfJ3&>UTt2P&ZEoGV;JA5oBCbxhNM^5N(Vi667%_;z$G%Vf%yGNCFpmAkX*Q
ztB23tp6nkc_X;!gNmQS%9v^ut24b&+UVPHguoyQV`R5t2X)TOpK@!;(sl`?$AGFNA
z3d%K|L@?5$#{Gp;z@aw+H%<bV9?NIt@<*SZDpugRYx#Prx4+60T-rQIIhV)g-|QM-
zb&pIfRCFzHG{XQfevenMJlrYRSO8A`VSZdpVGs(*oI;mLiNDmGAVt|l`@U>|BVJ`f
zfuZq>KYHw!=!ivv5GxF^ncU>qGTXKJyOC~4Sp;*uinoOO37MA4=9we`RUWEwfdki{
z0`@!@HdXEyUj7r{#m_jSP#t~{S_6FHA`H4l9+(^PF(y`;9)1sS;v>N9eL!ov-&NCp
zn9ca=<G_pm9n{8R%p?-hK7hfh6t{)BeE7>#o3cJ#-DmpRR0suYxEfkS9F!plisD-8
zqm-pV6OG9!H23U9bMJmc;}c-5UT!S8%Tc6+^HJ0lO-|}azplq^wGfR@pfNKiHrr-Q
z5D7eMe}(z7+<{#brsAglb@KABs1DT>T{%uCd$P`0wi+xAkAU?nz|;v~bboF2R`77$
zLvs|EzZW?2c5%FTR`@hdtI|en_Pg|hPb9cj40~^&%$QKnjd$>^F(y`wwl~CH3g%_%
z7Ns0aO-CY%fD=CmOx9_MQwIj%yBL}UF8`TWd<W3|Ty9<qdO@G<+~QipCLb4V3K}pt
zC~~Euo%<3A@_ck2*mu8~IM5sd7GKThmE4>52d34F948Mw)CJPm1N~4bw5EXOIB+>p
zp2y0j%G7*^v@|f6N*6s#u~MFjr*4|8#>s*cWw@D)W`SZX;@a8}<iV9^k#ogFm4hM(
z2*331=PInA5-{rs<ayEN^=V{jS&$<PU@S;v7Pm#Fd*sA@(fs|uO+N=r?qc`I&wm`a
z{=7k|EA2~??=j)xIQ`50#8+1NViJXQcE2l*<C53|!K?2rCKPf5P3{>B1XeR_&prMG
zf|=LQ1aR$HI)Aln1;R9!VRFR=-vX9i2KGK!xoiOy(B1@|{3!7Jr#fD>7!crs%hzCT
zK+h?F3djT7;4OcRVPNkY#HLwC-Uo~y?eQwQ0R`3M+pEB1zamyI#VUay{xVYmm7a1#
zNL5$QWt)!CE2Isp08M~31Xpd-B~@TmR<~%v2e)KXU?I@4wSi@Iw0F8nSQMc#F)2uc
zeStLS8#+<k`w|4caeGK2q)8@ZLUU#o(Z~qEIr!ElNV1L0UY)p7WP*)gpvI2WQBg`H
zXmPYvUvlyX!!k`7Czf9Y4t{@+R$lf%F%t~|Gq;P4HAnXX%jbcO#G=eXBDnS>O3^io
zgdWyS)sodgARKrQm_AWYJxv@EhjMSa><Sf|CJ@x$<N@LSBtQp?fVK0$+C@hkmVf6(
z3gCh{J0%;tNCaD0K!4%mi(NU<|GJI=;NU~R&}4F=^ykAfz|yP0)>?i%gwh`{me<=X
zp93yFCfpj2?MwW)cNzUwKTIA6mQDf7XY)jXlQb|2Pb%Ln4_L~=Aj``n3*<2~;_IJ^
zv_3S;nMB%Ja~0lN2joV!;N<oE^VIOt9Wso1Uf7S43!MQp5~4s}Gj$Aw<Us@2^E%*`
zp9l8+fFP@OE0)g!&;FXeFp<zPXs(P57sa}sL862;D=U3LiP9TFq4A3!Jo-z18!Qw>
zlAVI3qewSVDPaONe|O#tQ{wWI!kh^ZtC!3Qi<)4|7l8G}EG&+5TR6LYPJv#nv2g>~
zTma@?Q}`MJYQVy2;G4fJ1O?YXX@rsH?EwJ}*ho;T^??X*Ps&__x%@kE1UT|u;MSiK
z?uv%CxwSzrn%j%N1zdSr8QA08fY0Qr0d0Vfg^x}k9qhBd1DQ2Jjs!4>1MOjx08_}w
z?QxK$$>UhRUyH&M;=t_Z^68M*i^8pOm7S#1l}$vL8qR=dbR5n3d9?N&Kr}HKNP~W&
zsxrUKHP?9Bjcc7$M{7usTGO-QyKHYMWP+`o+rp4<LsS@`$-B(>33*tK4?vEXP$!0R
zoRAyKwwHt=X7Z-4)R$+ib|J}z*uU)9yMXEAVspgREBWt2vobU4o|5@Ug-RW$NwLrc
zFvq#qo14E|{OZKmKCwVT*%QG^ARv*mZ1c0lv%s+*5PsAH3~=Cvu?L`Ob?<0XPWQsL
zdt^4rxz?ree1DirBVZuF3c_*<d@Z7bNEn&TTOX*YHphU4lX{yctPaxa>UX++4LJKS
zaPo74P>5Q<*d72;k~$mIZn`9thnT+?IQw;Ab6Lze)OknxGsBRd7btTgeU9UpL*&Li
zB0RZ|*7>QrLOE|TH(4&2r<e*|hnpF$T4=~~YA!~k!(Dll{V8w~{K~l(d63G7$l8Q$
z5hE4WXaaj50&e>&z`pMXT9fDwwh>|c^si=eO59c~eWcZa?Hya%n))pP$hR4ygR(~P
zxz{Y48r}X~+B2swHGc7fM}DcQ`GOgVX0P4XHDSdZboShnXO!bMaOUg4wdaIM?2VU!
ztIq<fm&L|b%~7$z768`X$lMqi0;{(hBlTEqu&ZZ*);KV6+^2#9DuDy9d=B{TzXsN?
zCqeWFA6yg#)PW-F1JZR7^^?S>i#%u!0|y=gZuv>z*bj?M+PAy4L9d$OjpxPQ2dbc~
zuI876W~{Du(F?~30apr_r1`CjI3N^=G7l{d8Lp<NxH&3gIe-fHIO7(?gHX&iXXnw}
zcMy%K8L**YY%3vg$HMXsm@AxF!k8sJ<2om<k$r(<GT-gKgE2(IBWO&`pfNcm`ryq?
z<Th7#)>ZDn8pez$x&;DLs@)tvAXXCRtlE;5Vqn0^DPZ4Q2S9<^4I+U7;|GDGKOmG&
z>kEk-U(*M&3oH^!Ss<v#i~-X(0S7DYdr*YYd7w2RHp7IyXMs)DlE?9;P#hlUQaQIX
zhGv0FUqi0FP?loUJeRs|voy0<BT&aa=K=kN_xtkpCJ_Nc6TrUL0z-}!%|lbb&=lC{
zys$`Ujf=4@Y5;K?%=G=P<|F0PcvJK%Xa5X1{Y9Z4YL19LXWPOu=0z=F>L%dq*N}H%
zq!I)Gtz#^b^BsA6TPTRQxh9^JhY`I$H(eG<Yw`+p#0do{C!W!*JK~;U<&d*NRgS&L
z19h`w(}LA>S!A<3XtaQX-v`|BSAqR+>mqUBT`PUgKf$%9fEPcRC#h5dAlKevqx@>4
z^Y~t@<6uFZbYi7YcAiMw*Q6g%Nr2PAI*KBR>%vV0VNsyI6#2n(E(U~#vXXIg6?pZ_
zz^bu1a=ayWV_y({^e{XFOdJGXzNoK)U}A#{#yPlY4ri8uTG?(MpZr~5>>x08tH;X<
zD24R};PL+`Hp;QBnh6N#0la*++SvVwPy|gL0S>+m*!PB=v6o7(n<d`>p8FVtpI?GW
zkChbwvVf+NP_7D49)jnH1cAJu>sGGkHc8H{h@puCSDK_^zlxipN(6%v7DZ@GObNnZ
zcn5sDI}NOaQ0N<0CSUbiqQYdjZDnzf#(35mLUV2}Ft-=+$}-xEHxMr^KyMR@g@A-C
z9u+1{@3k;BuDZHXy=bhkOA}CJQ7$LeN!aExaON|>i68Gtec3@(NR61e1$gN10k8fk
z@U4GYQ<05DL$%jM7we<jm^cI+ep7ezm^uQSYl-=tgzu_%6=xq7Zj6q6fA8yQkP!_5
z)3*aRp4P+F&66dhVnp3USq-<n7qwrK@s<ADw#l-*7B*Jiejtg*?4nTk56=i|gOO?R
zcX%3Lo{OTUjuYLc98b4^%_Z>DUj^G**1tXZ-Kl@q7l2b=0ABqPFghnTg5UoTFnOZi
z)#w4wwlI4;aPtR&=YB_@-<YHUx#}5O9kMjkQ(^90x$O5iF^}`}YR+M9!Y+cda@$-L
z(tU{Qni|d>*L<GaA2!Q6uW-}SKrNSQiC|m&%oxBLz@fJRM}Gtu-PiH+)Q6(F?SV|i
zIq>3dBew!y(=WvO_(<+?$dmJ;=X1=F$a~Ch-*&m+K35!TS@QQ;dUlH-Tp%9{VZjVD
z8@wTKfa#4vHBD0=Wc3Pg`YXWJDwVN*zJ488yOuq?Nd}mOjANa+P{;-?eN(t%40!RQ
zz}<fv7@kEyO}P9x@Wg)x)~;t^CV}I{E(ZkoqsV8g5xLkzP$do;!@z+zh=F_RM86-k
z9`viZz48aZ%K4-W77GDoWk70a0FZkQP#YVohnaG}cvXI7;y@FE3zYaBSr$-X#m^Ou
zj-xR(jc9zbiz|2odIsA{(xNa5MWjIwiGeDJ#>NqijRSl3qrJ3%_QG}Wjdds;fbuNr
zGn)j1g&;`7xFgIqxu+-mU;r+D894AZV5Hj{D*K?zM8c7`0?+;~aN|@pWiwgiZV?GR
zsE=BTNYvw=d+IOq#uBi0Rs2@32-j39c~Dd)7oPmD!eV0bXiuwd;IZ!=VwLiZXMy%w
zR;Q9Ikg{oP_;5A}0d>`-=|08=%QclK2&BQ_p|Ul|-q!%Lw+O3&4q<KnQ4>HU{NGdG
zpH0cixzGij{48+#^TLhVfj0nqUk{88+9vE3+QThB3S52yxbze>*C}a|F>>;~#ah~a
z3`cwC&QlST>@P>8Ns$HVUFJ0_QDCn(FM@zOt~pT?nV?#AC+B8(W|>O-z%#1@2KsNr
zgsY;%ZwHRP9~j-!aoKwhSAEwcvt0N(u<#0`_kz?_QI1eh#!cfdwf}+sJ&~)A^y{_-
zRxT0(uFD1Y<!&~}DXk0{nq}AqEny#mgD8}`A|YE<C6ATW5vsD~#w)_#Tih-dE={F!
ztgxI?>7T^o$ahW}qhvCCDzPDd8;ih;zXsg-H-x|zP#y6W@WLm6lb;vw+SBrY+8l@8
zFef0O9K1*clSEL%rjCgfa{C_=?$vez`q`Y8P6B5>Z}ivP*ykX>YCs(actR?O<4nLz
z1=f-l2Ssswhyz)!d>UoRfPyev+C&&@w$PZGK{PoH*4*Z<wRQu1tq;ncOYD6}{Jr!|
zI=+iEC^|0+?*$qSG^S_Kn4Se+Uqk!GHMEx&@+4*Y%tpI*5(#Sk#Q8eoJRuV#F`@Kf
z<^(1+scr-3J_p?NGySPA5?xZ9uU*qO;4M;OmMXG+f;6!8(b3~_yDW41D?+)@8U<Qo
z!Z&$yL?{QFBVr*$5!S8>S0bwkY0%z~8R!4H>f7i2#v8!*{w?t4U)&kioONOJ5ODM(
zz~L=m@p<6J<G}T&gcZN^nQjsZrZs|j?DM{ieoYbu=3f(mP}qi$@4C^dg*<S9uiXGU
z^#vf_Oh-tq3;?Y!Fmygxy#$>6BjEI(2se3qUoSR}9qHFf><+(q76GsQ8^D+UQL^8s
zL&>S-SrFC%VIYF@i#zQ-2hWd5r2d8%kX#mbM5Pv*7P&Mks-J35tqgL<MdeVf$|zaB
zF$5fWCvf}&!0?=WOeIdOkJ2aD-baati#LE*{yVg`Ba_y23`v-_Z-`}1ZT3k%BtXZc
zLLF8LHod<dt`G<g6Lf272<C$!Uw*DLYT3DIePAf=7te^*E0>>A6C)}RbmeloLrj%P
zlsQn$1zQ*M>{)mlXvpFx&%uzzS$Y*X`3c~}pGQDNteh1tixy8O0<OZQ%Lc49UgX=X
zr5*QG;Tf>)AqI3U0NN4&u7q)j$@jrG3Lnm@wL$m}I|FY6&wmVPw?$pHdA7f=N+85a
zKM`kyuu2@5=Dl3@El`DDo+p?|!5c;#g$&5a+YaKOjKaS%nNXB25RFfwF+GE5bUc?#
zz%~QbcWFv+*w59l))X*)LL6Uz7T8=!;u7+pRi<S5_@vy{?@9yM&<L7)52880AMM2(
zC9M)TQMUjhqaM^S*;hd!5*YM8jVZr47XG29U(@fZvY<xA`Q;~oNB#q_DOaBwS!j!U
zh$56KwmQ)p(E6zKSOv-#S$~^rz}A^8Jhu-)132++;hw~XvkwawBGmkgBIBqqSDDTC
zzjO|G^4Ed;{%T+9cA&wUz|>vhceD*GJP%xZ9Juxbu(6D^pOLE+)76TWW1HfPF=W2j
z4H7{v98CVo_m-YZ3_!mhPzK2hJO7AS{I|EJv4|Td8w<cIpBI)ixwr;VFLgKam~&)=
zeex~GZ87dHo&{De0H^;5m^cFLc|9=yTCs;nFY2u>jLZS||25zn|4XLmG&lcM>nqih
z7}sK|Tz>KyWnDnsMynLLmIkvbS>-&<vz)nm<Dv)^NX&BaZA5|3xy8K;eT^}($KtW~
z04F}+{-y`L-|a|bay^`p@T;E%RxShWIMXNOHYi7?Ur==qNWM))X6Hq+PFjpAq=L)c
zP#uJVpCLh$*0`4Ug(UBjf`Y63va*>v$ug}E7!#W%yAsJ2n=ZGu`ZU)4uIU?TW=cTL
zk*v^&WFpx|qY6|}GHJQ;9bo)0u=i~UC<6|h`7-eQ?}(L3=}zZTsitlaWEm8pm<_4v
zlE(o7HA8mVQ^$bg?*I<IdFNOg3=&@b6G7IdE8^s@jdV1Zs{-P-Vty|P1ZALyv01T2
zaO8@AL*q(zZ$Y>|AIkSzZsoojUZDK%fH+{yrm!}cng(k~Yl8xTJ7B=TJi-`#Oqomr
zS=h`SS@fAZfJ@)dlh7tQuzbJfF?DVW>k}fNF+GjO^fcnNRm3;03#$aJJ*ks8u7oLz
zR1hKEXe|{}S>nOSv`LS%G-3!D6N&tZD6zx^FmV)^yVt0%L0e8%^e!Fcz5E#P%qPVH
zBB}6jt)5hg1h2eZ#on1j0{NWgLMkdOtrHGhd=xnLb~?S~3&8pfnmkaSUm1%T8BeV%
zq;d6rO1Xai8^HXXz~QhTf*lQD>Q3=H{$XI@Md0eAz}3gZLcKWYpQKVGvK&h=C5-b-
zd24zWkWo2TJ|#j1VL-4#7<4EEk=ln{d=%JP5$=IH>@&44e0>2p^?6`xHOrY9o-DMR
z<rtd~S}Cz5%dQa3>C_+wmQDf7r-9SIFI=MSc_T3YP{sP`0}eb0oOloL;vXsxMva%T
z9;PYP=><hLGN3396_dx*d*gIcyf|)Aej*tM@oC2MeSekvsl5E15e3X34VclET*_x<
zY;27J$KMCs^g&=~x?(v82qidx$_Z~Q0;fKWOqPsw9fS0UqUs`(zZ_DA;oz~MS8x{J
zvG~1^RIpt0A`}Yh*N22it}6sWNw%Y;b%NI6D?&s@BE)){+{~xwfuL+=q1;Qjv`O=}
zJ&Wn8NQP18s=K3CKMjl?1SZ0!%3j!91fKnvm?%<=xsQU6b7xo(NCV1(5=@=$i>8hP
z_x>y}cW1wgzH_m14mkbCNUf3p<P=A0pRBq4$e_6|iet+p#6#iPb>e_K)AkE1CLE&i
z31Mw8Hc`V%3g{br_AoG46Bivzw8nw)W7+xmG2r?WVk2MkK2`BrbWEMw!Uh1*$S9(b
zQ8f1KL%eVu?Hkv@+gr%momv-W7||A)5+T<<mHvyzV&0!BMIsS?^h1DkrO<#Vs0%@q
z_tIm)bDspRKCAd>m-3;0FIQJQoAp~u@w!bU7|&i?vE3F2-WCbe@zPmf`64h*xc#{H
zyq!GgcAI|oH-PCAz{IhRliK-c08_V%--$n$kqMU{6$B8F$x=lwjiM;;;>gzD8wjq8
zwgWuh&$SnT%@wg<O;pn5C6&ec0&wzkV&4NTZn1(}yJq%tQ9|ZRi$6qJc-#hVyeP<o
z+1CJ(&qA;P`F`*H3&7<kfom@rWm9xumIavF-x>)6YMw-nJr=71bF+0viLAQ5f+x}I
zrZnn#_qM$dk`u*3j5wCR<|uIUj{rA)02rDoDBpIG4+~Hixp4ARqVI~^&|DL#i<tp^
z>{E1>oH6V2mP!OcC3i){wL&8Rs!n}K2$4?X7e8?Lm&(<=Ly?vq+E>DPDd%z>1>L#8
z{>pNlq}gf7WAiW6)F{8^s^3U;lT_K57oQUYPa~{AcH-L8z~lc4SU8zi08+$(b?^%$
zK|tpy>KmA;WRvZF-)n$3|6^cm5H_;hq2Mv_?5_fAmlKo1HZ*Ib9QkOHkZu7v9UJN<
z4lKfRzlj4DMQBXVqP71J8q>32t)bdqSwN3bL?Bcl4`e?#b1yKm$B4&(we$6n6x#?a
ziV%&Cp)oUuXlNK{Z-H-a=1qYWnN!qQW}BOdl**zS)vYFwmo+0M$OFcN<-zd}_>{Ka
z)#Z;%j{%SVTi}J?6PxYE_P$QnOXtJ1fI7dou711qrd>4GVpaPDK)5iQxkbOWwF;a~
z_D69k`HbUiZzA1gpeA>@{-*7Q1J|Af4!t?-M^_3A7@h}a?gkFM1DL%NXp8_GH!`;|
zw)!`ZUAYi*ZCjjx-h*20t-t1iwg>>5OThAZVDg9`iC~+$uP1vR5adDOzI3()397=?
zEVt@*5D@c=vBP3PXsLqt5m5u!doS?HXN5~Cb6!wH8kqB<qI#ub6<CpJ@zh1U*7`Kd
zES0(zossLk*cO{Q=Y6iU%6$X2@0KMi*jc)uB&iqkTg_HH>*L<gByih@fd~ISu<t>?
zeTph$2lUV8BdnYUp8L-LZ)cVUIoCz1Clrp{=H!6(EoRn|C6<af^yan1r>>P9Z;kkk
zU;L3nzohHoD;CPo<ultori-KG9wtpE)wHbn7Ob4fy;o&Im!_{MRP?Ex${-kmQiPnj
zc`Ce0v$-u`<s>ls0KgjMUe0a+-vVC#UEqb^PB!$CN<if&-;e6ooZyR8f9BNY$?{r2
zKoQhFNggvWMFC_A%}HPIroRsi&-A<aI~(V}44nU3HmJwaom{N=D}=H#K=vJR+Rt;&
z!Q&V_Ci)3&e-&f1FC|=I2J+X{P$O<Cq{?!V_j7liK4DrvnZL$b!)VU!L2KV3L}TM%
zQ5c_g4qS^cl<VF~!{od%EX?^4>B$Yv0E;gPfm_`RM&?y?tc}YoKTdCxahnYdqcJ&+
z#>AwUIBaZaUIL_CD<w=t$`s)o$lQ0zdQjv}M#!3s0r&iMyI)(Ycs!t!ze|q+kNrE~
z#XkU6uIPOwhe9Mk@B3_Fly7zCe4+&EOv{RT(x&EM=G=>^^S7d7_4zkf#Xbn>N=E=!
zo&lE56K$D0k5ymzrW~e~k3*kprE@N1ZD?x+SicJFdtI$>WcPpp!?VEb-N4~@0CV?<
zjkGrw1VJRf2lcN{U(JcXs;;1d4lkfyFu8wEF3dbO{&FL1a}`*86__|wU77jHXTi2s
zjJ};IW2$-%L*{0VZ-~+Tx7NSN<A&H1As2CgF+2sdH-QU}XY-)6=n7e2?lB4E_3NhI
zg?j#69HM@5`Wthu!?Sm4>Uk`>AMd!9`#8C$X2JbZ7V(Kk{1kpb*>Z+yGNL9orgC4T
z|CQhA@Dy;zPXcfF2f+T<i_MY;1_LT<Qh5Hqi2f?o9T<xf(>+<au4CXluXi-Q4IUfc
z3MrE%uzj<(JAA)Ammb|aE?vevMNGOWQlEqoDVh&vm?;^PS<X$@5wrlQrEN1`qD+`!
zyi}O^^IWKClT7%$j)?sj<gv+EQY`4oS>VhkfulcJ{6cmURxSX~{hHV)nOZ??b7NG|
z`XE>)1at*zU(}lHcWHJu)~^7k{vh86kgEfbojX_GAPu8@@p8=-p1R_RR)laPO!K8_
zTixPgEl?_sJxsVMnng6GY>FJPdr-8>#6=`b-A*rrU=3jEHsJb`+4tshRYc{vgT`kz
zG>qon18C0gMSJ0faBsA^q11<=&;~NmQ0=4S2Ff{$su<vjtC0O~048s?7lsylT^ITQ
zE{KB{KLuQW$znwoD--+Vr|Pn`zR;BBiD#|TB7vMI)mS%K;vEz*?<&F!v-=V^<~`<f
zaxVOyPaaOn7z_7BwmLG;4eM}Q8Rc=hqOa&L09^PsFmoGl_y=l!FS`v4m^>kVw|p2_
zItg5O1i1JeVCjO0BHb5JAo_RtF4gxNFbJsd9@I8xVsi<&@k;fLm7AmB>kDMxr0rWt
z^;6n2F)?mR#Idr`a+H0)(lyss8)!5{mv-$*fVZLT&$%72_g>}s^*-0!D^jbmx-1MT
z#8Kx=#qNz9->S7gF?E7I_rRG}CFFFHxn(89^CxaA<^CR{v%noc4&3@dvERW!!l#Y~
zKn`7a4!HaXQkgrpcs9^kf$XnBOr>p$+^5ObM**C&6b0z`wYo7X6PJeD#;lIQo9R&I
zs;crPl~v7E3Ec6$nVpgSdK|}K%7CDf32En|4k)IOYAUvEb$0y;VDAqABQ_JbU4{!^
z6P5>?YlL}_(pUkSG%)I$+UFn$qX9jEDzu*aCUD~2{VvfCMADXD`nWJ-wwe{H{t1=y
zShqgVQZ@*J?2uOWbJGW+8N)+~UmRAIT(E>i42`Mj;G$?Zz*m7;<aQ$GrmYD~-eOO0
z@>bx+vjDc-#6cNifx2fqA!?v8Gl#~^9OC6A#5b-XUR}u+)kKj(93+3^L}|fefXnBW
z8=A&I%rd{tECO!+3BR&f_0at!61ecQ{_^hw*I!mPsv~4T069}}p7iJG)I#kS?Td*>
zA_1tEOz4XHl^(t;Qz1y5tIxT19k~7qFmn^I@TypOtj442h`3(3AA_x&E(PWbzaut7
z4f`R~hl%6jcgu%>rPILqM}Ujp1{Tf~6HaP)z<{8O?}Kx(Lb@tOX2pi=GA%%i4@tYv
zk&J1+$+!t1vrtmU2BwUs$(SRRvmDts8!_P%ec^dv`i^?*=H=fK)|+fdtQwC-fM^(q
zhLYci@Mqs>iSXtq&=>=n!{XN%5&Ke6h}*!)FF;$M2}MT&Rp*(%jx?6?9`zSXzv~*~
zm}T*DQ)Nlhe{X|=IA!{-C=xoxNLq|W;!mTYT+he?tBYjDbUozg9Qdst0&e<Y@eK^R
zHB2Fj%HM67hXXJDmZDQoi2-#V1cFe=&CykY0eLx=d=!6D!Ad9;rQKyhp{XfHiiEh5
z)(M=qm4=b8EY2Y&RQg>;G^KG_`3cvDNUd~;^#l-U1Cn63l}&b{2-*ut2PyfnNfZ7U
z!qlGw&2eDl0CqjLmW2}V%Hu%0oi$D#>kT(;yz)HH{BeUt&a>(ERZRf_Rgjz9%5$mA
zdFtb0<G$Ijak?87+T*2%f$PsCeTBNYQ4DbN+~`--{sPJBfP^^UvOgiL6S!8+0&+oL
zzGK8INeK9c6_60D)k0%>7R{*{#gZ=cg#i}GMInu0pfx4@skSD8=A>{_6t!Ueexep|
z=sm#3bzo}|*jxlQ7KMNG_PSh^kwm82m8GpY!?q8i@o_{G6X5G>h;Lj+duahNk2CZ1
z#0?9Bvbro4+M|?1$OK&m9C!;bakzY8NIi5fCvXXIaPs%X%2ZSKOJzW2UHQcmB@j<0
zX`JU}LakpX7dKgyn!AWda9SbA1yx1X2ND;)D>hTU{G?9iQ*l9%`Np|e;FYXWSLS{k
z+?-wNe^YCf<QH!OPyPqs!T)>MkFFb-I11c)6u9+Af#oy6x$gkyzX{wpWms0_=Wn8m
z<KRSC?l_=k*z47s$aBS0-`mg>Dv#kKv(Wo;q-{L=ykuV`N#*29ta!N4JW3>PU^vfQ
zl0=cP`imkF7A514)Z<)vyj}v~;@5$5U)B|ong@p1;zGrU0|+H@V_5u}qoS%8&w#Hj
zX!Rr8p1IJ{yiUHuS_lKnH{fYmz;hN(K4n7jJw^9L5m>Vc)@Xn=nm{8GBtX;<VNnBU
zG=vT_`B~k<x~zQ7y{}9Hp*ap5dp~gS9bl|zF&HOKIeAVmfEy%qQZA2v?9w-Z#TSw3
z69{>f$H;t=s^L6oqPi|p(Kw_>;-Fx`mRW97PAWq{I2ZbJBeVlTfiW~S!L*F|f@h(#
zL5Y4K**P$?5oH+}!h|Zw(!qK$&CZ7soVhhl3dw$}mI$_$Hk<=f_n_Vh*fzw%^S}!q
z1J-Zk2SRgzbXgs6j-rW25I6%mfseUAag*>1`}KbY-1!mUrXNJu_ryfScDcC#oca`P
zaiFeFHCL~?`eYd6K@o9a6L9-V9MD8UG&+XH^sMm39<aONYiTfhFEDmc5C&02E0yNB
z_?d_|1fj5U4!HJ2eU=H^5Nvn^jr|AFnBNP&a1HU|Lbi_!AQTup7Gp<RAIj>dRQ7BD
zw|=Cv!j#fO*P*oLz?JU-CqE4=oHXP;rT@<L>9AOlN%Gf_`8ZX~olGPU&p;N%PbpaF
z+Q{}yo6EqnpS0J3kw=+xGdx{sY;#>?V(kj>+{b{se!;7*0xDwsFmUT(;ZkGyJaFz?
z!0E35i)WpEdT?XZOLShx&b}nKxRi;-2vspUC;m$1F|+7xxS$qOmqw~SM;1wrpMcmi
zEnU@}q%B<<MUk*hP|4Fv-vw^|@p@jt%DHUCvpKIZ-8ko5sl<kbUM%|FjU^G*ZfoyB
zo#$|6523up9*B99sf4b9FsNju;8T_=X$orq)@*?_n?S3X9<yc(tkDE(HoEV+%11sJ
zKMdUS_rzizzeI^sMqZ|KSKE$$JotnI@f^1Li8q0hpD@0Co$z*V)~&`@j&pJ;x9G+#
zMYItGWL%5hx&)!Xjc`Vg1ayH#yr%M15QVlSM8IL4AUb^7(m>`#`arV~3S@2Ph&S5@
zWSYMrSqzqu9h}FRWdujYOd~mF$gC6OGO?(ke}B{WV%H+x0?zyqaOR7m5w?|$NaQ9Z
zxeZTMQo&9hP#Y)9^IV*OfC?yOQqKWwZ30jI25|Oa;J&{MOr7ZWBMbmKY=f_S0@z44
zQA>qrWQwJ9BW2l7$Yb%B8+}K*iX}-eGwCf*<g4f1CJstj8;G#R#3ULsbBIPpYpM2t
z9STMWq2ot^q3Q1A7YzZ!^8gya)h9$)n!h4jy5^lb?OSd%!RGd%F}oL7T0ngLnixBz
zOerm6<!Z>(_iZ8*9ep=2woj>;4wRy<y7f}Tdt`9sd%(#*0G7@e@*mHys*I)e0nhq)
z*{@4kkSUuZYou_|GxeEBs4G3M=khI@-~I@q=oagP5_uJc742oFl_6~}JX8M3bMtrc
zd%*OUfkSWau&x8VFn$2I^#i~y?+4EO8SvPz1M6Z%wB{z5&|?-Fqy>~jmq`OaSI(=7
z_u<Ke5VzddUI(J4eZf_065!G@Pt7Nj>s7ZN9MUpe)j6r2D|qH^o+tYtq&kKua}gLN
zmIsnhSiS@-y$Vbm>8v8#>%f!$4p?8Ii31yHU@o+j^=n>(c&^kdLpn^V1iUh4Dy#Z=
zq2*Yw2m@cTz>g?k%_dlD2yCb&{x(}+trnuzkiO3;{IjVYjM?*vn!sIuvjlliOM#R>
zEFVNwkk+RsGwOlW!6oIo_*G!-vaWNCd7`W2&^H-3^^?ZlTv{C%B!kix^=j^fRIqvE
zvE1zQE|`T-;B-8hd9w`LKqo}KqkLT1N#$G`5jBxb2#moim#3*%c9e;9qsBAyx71u#
z83f7AFhIYMSeg7a#({~Ouq&~45qRmpWg8{O#*eZ-0O*ElArH7E+&m5ls0)Rg4RS7A
zGyLiQ3%L0Qf!jVLOiOnaYHEAe9tEyF2CKyZU<l6UfUOSVhN~iP;(#V6J0=dCq<|-J
z5HU0+r_r3518cSFsq=u{hx1<n4!+awPq$NSE{Qw>bVLy_J&S017FbyVzi}N{Q~bws
zo=NVqk82DAx0`z()IcOquqNx7-`XYM*?$i#zN!!h#LCK?3}`4#G#QX-=iE{*P5v7c
zi-c~ZSNL3N*0k(mBN0R~3y1`-M=mA~sIsUVCwp0e+BQ*@=P!RsEb5pzQA=$Hcz`kB
z$oBzLM}RN>6QI4>?-K12^kDvLYnN(UwC#Vu+rX7)gv&G50OoE3=I+SPl~@Ff%m6Ei
zk`FxBzE%B=xj8og@R&nY>16f8^7|l|7ELKJ$$(4W>zqJ%_M^b^SvP5*5(BpJk{kMx
zII}$9vFWKnXXmVYzsdA$*J{6Blz*9Y05&v)XlMv*Xc%m02&^^aPZA6=CXNCl`}$o9
z2MpqnBpRdw-5?p%uzq0T7DHD+{G1jDYFy<xIWPX!ZIA9tD)?F{FxSm~`h8W>rraGh
zwFm`lgEhkv)(IR^5H%jaQezr1P?)Eqrp^A!VWFTMtAk>C-TZhA%-)CECw1Eam%j;|
z`dwgaJ@Hx2GvDRhSZ$_G94!NCS@Iwtpf6B`PqcxT{s_469pIjy1@_$E@6z?60_sa@
zYXvy@$-F>n5(kvBKno{G1q=dlP@P<0jfQYjG(DSb$Q2M!6<aI7xi12T-U&3vYEFAu
zq}^Wa_frlw#wWohrhxS|;KnuZm1TXhB3DM<@<CvD#*&CjmhJ%7WDAId#g{YkAYEzM
z)`<jaQl=5YrhLuGxj>#sP~+H&=^_%0@Vc!CdO{?S4{a%qom>#b%o7P&b=dFo4KKQ8
zma|RqTW<gWfB;EEK~&I<k@`)^Yw;HF%&!3t`~$HWX+ZBVbsX4pCvf5MewSniqepXK
zAL2kBQ)AWj7lDh9iOq=t0Gq&t$AC*u0W&uPd+yTR9*xWbE0>Uyg;{o-tql_8ircZa
zDJ_@dPs$`HWpB6jO=_b^j8lvOh%%Se7asv`dVlqLJNp&j{MYluxk(zB*V6fnIbN!I
zlkB~yUOWI~d%hXha(lmVbF76v?uh`$^^$~v4_QDF1&s#S@Gzp`k(4ZmhK9Q|mi7oa
z{i1@ktHRYzw4E1;u>xxbg<z26f~=QrV&WJu{{V3DThPb?nKwxksKkO9&y0&Kt(;pa
zU!uUGe<#TYB7lrX>B#-``;@z*ruqRp*@hae6Exw}YYzfKF!stbe_xt+u`@6w4Oa(i
zeq0=weGPUM+AF}RPXbpTqfOJT8|J|}s8%5l0+|p{H*6DWt;?W%@vdG0zVk1DgAW0B
z{#5r|h4i;}>Q8dvX<%z9NnYJpogfZ!N+_eRmVF8IO~my0#IsZ-4t%T&eC{*OS*wNS
z%p4k1)7|&W8L+cq%1K+xz_~902j3w!;;RE&D<aLU6+L_h?{iQYvOY#efzdIrtxe#@
zb?_zO_5*PY3{L~M|2f|TlfS*NO0eX$dNCsmG`UXc&sDil)&tScn;RnY#7#qP9-z86
zGRsv+B$yX1H`J;8ubY_2XJFKueI>uk!ocU6`!W5A1JepY=4(}2%D-yAVv<twc>OBy
z!fya~{5)!J8v$-?ZRCO&V`0A55&BFT!01y<5<#^<SUM**TVK1TrJF3B1zS{Y*M?yR
zhVJg}ZjeU0yJMugJ7k8EZjh3aQo0*PL>d7>5ClO|K)ONT+t2ZS|A2#;+55iNx~}sC
z-o*_vXqFMyrgeY&(a7JS#j$b=wp&Bw{`gHz!&^7WFGS3YM+lcx8DkeV<yZ&-QQ;Y3
z)9W?)4aufp%;0OgsJf<ZdS5d}-7~xXw8;@g@-5bxw1hZc;l0MSI=6H4xhvcMwhwN?
zpOjI|@PQOAPFnmUW+0KMClcQ?tM}v#bT8Em^AofkI<_Ls#+|{rb(@AvHt2!x7bCMY
z3W8r`8_rr@Rr-84_>awSj_fbTTZ~o)We^n?FDSRO-ByyOQ)b<qwAR(-GV`NDS$fPZ
z@Wsb$D=qKR-yDMw2M9SOW+eVJqq$&z_7P!&j~C|n9xud|KrddLt_~7_-Km|xl_Bna
z4%w26>n8MgpitC_<X?eSFN<!!W)HF3+48#z!~E7!8l+HHpSFNZiAU>q!U$&rgCKAp
zgRynqK+Cj^x?#uoskqZIm&vv+6^BJ}JMST=<Uw;2>P$Yp9MUY%GOhJePOkcgCGjFq
zBtjN`!A!7H%UD0nV)Z(c-eiy=QuE!3{g^<-GU)m*xNw~*J|>n5K|@D6k*&{Oq-O}e
zLAR9QvmeZ6-&kf%bB+8ZDyrLI&eo)<mdTlfkrcD)Dl@4#*8Rh|x<?Eo?gT}>XlBfm
zFK2(Zsj?fp1hjq4f?AG{@*Dj{EaR*~sKp;xHfAMzbZ3y6d1WA$A-vVFvQ_mLqfs!F
zwfeV3Eo-E23fMk80v=J*e$1k0-X?$1Ufe&AMI2z8NTq+uj_?!*XDpnYf5`h~(R;2+
zmsE^&z~eD(%l#9l-Lh25w}-JOg(FGca5VAj2H%|Sc1ZY%4YJ#~LSmFs7Nr{fWEpQD
zBXNGwo)wXcBIc4>4E3vx`rDHje)cX}CE%F$U*8EQjh>PM*^RLFxYMsBJxh!G73<e<
zYxjYOc@@Cc`uI9gM$Y9e@Pk2o5zu)GwF6jcd-5BrOVF$I^6u~1SkO)C1h&MN$qp3<
z`TE~lUC-)_F*|}GZ9kL$Nqqw-YT`fQxC`&=iN*km`EfOydT4c`?~nw`>?}bF9qjI*
zZ=%z#$;XPnl2rnF^?UEuCE#Nwn(zlG?SFReo>Cq(fvQIQx9hvRf~S`%@C!U}5U`bc
zU9<j$FSO^$VT~Gf*BWej3$emY!QKch+BSE0$IMMZMa6tAM0XWxbO>@X_g?|FOa-kM
z@gtL*IA9Paw6M*c7qmBsLLH1YOa37@FifkWx!Zn55`lZQricT5&G+M}5Z?Q`JdU>e
z4VJkv9}5axfl;;9Yo5_aM(k{ITh`&TiW-P&rt&BY>GovK@tw|PhH8zF*4DCMtWAg;
z3a9m*3O6gR<&v<Nvg^AK+nI+!=XjZq_?`y}j}T|^2b_(J$TtHMS&|^>n!%`n>hv*#
z`B&KD7fr9VcO5cLKE<MTn(_V#efQ%}t>(9k(dJD-i?7Sf`|j!FoC)bYQu;$Pviikx
z!J8(rT(U-Yc-v}VA<f)`^H0T=25Ut7%*}Rxg^7#1r?YA^K`a>HMRx{DE%fM&xucV~
z8t#d7j3S_302#P>hU^}LQy=3`*Xdx{mfk%|oZbok^KW1mk-2MV4gPqfo7x_oF{mKR
zJC4r0G=1_$A}-V<>vf9pP@O>d55?sS08>)XZhnrR*&P7m&|qKKo)jKkFlPe!HS(m|
z$;@}ey^2L9SC{#-BrT>@#f^74uEY<=`Ge!^7aGMbV&y+Z;(h)w@B{*qauDiBKJR}K
za>5HIDncb~>!|oYE~;YWbd!{`lJ7+rSHpREc+W%f0`zj2RX>NLqZ5#(q+o4Ag>PMO
z|A0lw;8->g+=1%8T5eh}*#Pr5boMy6p_+z2QrF0(5(QIEoBxLL&MDX;d)b2;igYZ=
zL;eQjNSVAq))?~R#PDFL)Fw`END9w+SPbT6{DgiIw>g+(jNyAR_wQogr$yzU4%=bd
z|EJ@`qHo@RM(8o|{YD(AXMqioNHXU@my6rA)OwPQvouikKxX?REb~tW_b+4u=k`U>
zdF}-PvrFlb1M3o{m`qDRXWU+wxTB!HsG{~OVOO^unu#)0IU1`ZKkw)BWqbzYG?2@N
zgOq-p^bIZk=<%&QrMJeTs;yl6`EQwkzhU*<ulN@fgazZA{jul%uzOhHL(%q-Y&TZy
z5Lct{d`URd30l?hpP+FFagPNvTQmP_lpg@zXX<TP7V-hL6$9yZw|`{SFp+fO+*e2(
z_aEG{S>{+z9{FQUB=gDupA(dWr#5{L7t`#k$_tUrOs+kKe?>YuR?98Z7_l{#I_Nt-
z?gAJfS9(13>+s(176`eaqmlT%tpnucW)Bfdz}&ur2iHgg6yn7E^Ii;4IaM$TpcVam
zftdJmJ}l2Wz|;_$l4!$Hhv<PN&XboY+IiB>d4I`SM@9~S`IY_q&@ux_g4KVY00cs)
zEx0N-NDseqV_VVd2v`)OVo|PU6j{x^mbU_+SClOz*_a{et?H-@8ix_gS26j2o!C=9
zI9&jB8A1$4E3<<}3u6osB8<gY{M;@V>=|D}v(@(#_o5V2ZbA-|AJ_clM^}tCD%Vjw
zpC{2T;tG8B1vbJ4IailrnoF4>(ZZ)I7f5%3m<KWjX@(Wy##_Po5SKiEz3dA1`*>3g
z)&Qr9oGh#$<^#uxY)Pg8-c=u((3-B-UVYe7cR*ey_ncbMrs6BuvH~7WKK2!7O|8zH
zcAE!Bb29c{uMYv__z)QO35x<BBlX-La?|&EmQKACRsU?~btZzBN{~s5i7vKZ%A#nl
zNAsuNAr!b*uUe6`LA8^J2|<85)zp)iEsPX@O>r1j$N#P``wad2BP<>DKX}e?OHnF{
zS`x@y{G=lwYAYcNYC?G(X3C7JyCb9S^(DbZl9cFA_fq*qT;CcxD#X2AD6*sZd~0^b
zXz*3@QzvzZE`O;<?fpgF4s8PnOSddMIzdP4!5Y2gS@qaXGp4f28$eV;0Df`W6Q=h@
z3WA3YRL~!2A~d!R24DA60Mc_D7NS1`ia2l2c9<q)lu0%WLV8q&kpoixcb9vIMny^a
z&xEk4|CPm=r?s2*UA0TO1gg8$*KeBhV$bHJmBD{V15s))-cyT_!`Qn6x509X?$l$9
zO>tdmwTbcSj0)3=fc(||gsZ`VcKBmB`5{-A_*hC-r3GVyDRW-o{Ej6V@-X%1JSsy*
zLid30c8p~s!WUc*NrSPTV;R4~Sosxja|Ow|oW%|#y7FKjf1jUxXA^qsf&9+S4NxJ9
z!Ln@hcLQd(g*`7HEOX`;26xX=N1*ADoGc^a8%C;^5;kq@Ih-ZY++$ZHam8{*2bIf=
za~k8)1kiMJY}GZ=4}N0bD+%^&WqV)Zb=xd2VxCSvlbG7H5}}#xaQx=<DYf9r3!`Mm
z_%n>zJZdo~{i_20Ss$*11MDxOgvqHUEy({CbXbB|_v_>G)9s93q_RYM^`UeB<7yTg
z`b`INJpQab7j#AZISdY7N3(no<p-jMo>&xt5nA{dZncOB%-a>pS?d{p93=Vsgh7rB
zxhTfudo5DpVZF(>cWIgc+lPvmoWmah6|X1C4%YTnNOF3K%phO&Dll<G@w3SOSBDw6
zG~VqO9@GOS>Qe1;fx6b6-H~xoM`^Jp4jp#}ypLMekiIAGKiT~3>U{W^f!+;uj=ztC
z<UL;~cMF0pjd)u;iXM9Mrhc8jg054|K6?2T_T5By0W0FQy1pt0c()*Zgs70rjJ3-B
zp9ogmDkl`5S<I?FWGmQA#c*J~h?(^IB6CxqM9G`lBAK&55b#ytI{qOKMDthA$cbtn
z#L3jb5+BABx&@kikxivAxJyU}D@|grep*F-Pv4WIjx^@o#Q+DeIH+@yqr4QnQ{Tz-
z|CfVFoSS)TCX)Zyn!^4Erb@rn9go7)hn4u;Gmasd0hO`qKV3dSNEy%g8KXN6vOO2b
zQapc`g|KSJJmSCjQppAzeIja7NFPP5@ha|o$A4QPUq%vjHgI{(aeuY?DA9;~++sc+
zz1lg{Zm++j)KUU-KeweGzv8MIP)U7ru6#%BG>Fs33z0K(W_6J|_kzU=UH;P<G1%i~
z_9-Ru++`hiv?A^n{&vWw!=8S1LXV9E9LGp1KHUa46<sTtMU-PI{}HNGT07_1h<&EF
zABjEzJJQxTD)ki#Jo9d>1hx2$z{*~g&Y_Hq!1KwI{h)qCrdG&{i{A#r?cUA4WRK*C
zqDQ0C|I}BhQ1me-id0skF<}Y?uHEF!=3HV`>amC+<C$e&zfDPeWseGy78}a^Cum?@
z*<zL*JC3t~Xc?@c7@8#p^gE%^AEV^ovV!-ucP4Ze3)NVi&r;xm62}9&5?vLb)(&{j
zg_`g3*-#JOzXLfEIX@!6Mdh-h!atW*F(phGt1fst`PvD<)Lt*alYnRMBRYTza+_)L
z02%^Qzi=!=g%5S`*<>4Tgp%DNfX;|Ykrt)lCu*2&ly0W@DFY$5k6Fy_6gFk+1$5d`
z<`D+7h8K*DHI;D~J^>iLSR%vnh`Fz>_f`gLO4`3aBr~9`AIoCcV<(F!%62uQzkXza
z{w9I$Gkb55$djH<yHCB+q;9mv=lXbjM`b(jsE5x9es(gKL2K*ukM*c?FD>HK#uih?
zzliov#ed0wO)OE!#VgciOK==qrx<nAvn8Ez=3bG+5{{@R{L>FPU?U25&`uQBC4nu+
z+T#{#|E`$&QmQkbM}Gg_-pHp9weQjf-uoO#$1N9x)UgP2lEp3h*Ye|n`RG9_U*j=<
zxa7pN>D}Dtz5U&A-gj>eu)dvFz`LJeI%Xab;PxB5YIKaRIC@gryKb1xrP&6opA5_8
zSa7!mkm{_!4Z#0zT}gH(DH6Tt-uG#_OJH5sN@8*_t{s$SM@)bu`c~O~&3nj0kAf@O
zQK(svT*b~^YFR8Ql}eXT|Jsk&IX%=ocRaSr`qd8i>3JlwvJ4LOtvvKv9ww6Hi-!bT
zq~^b%_r7}dIf~#ugb6e<3ZK)1IzqTp=i=?45j3V2N_`!P!T(_qd*t(8Ty7z0;g5SS
zNz3f-CL<@J$Cif+gW$nkLnOkEa9s{<r{mO`&6OCd$qNd;WToAhl<2?IAB-*^tZmkZ
zOWpoNZAwv&<HZ18n9w>?R&STD$D9E=*{dB=p%>bR9pdbTC&x^L|4Np29<t(#fb?<8
zR-lDt662YHm}xF(r`-v5@-%~(qeH<Rob)?gFFQ#Ai{Bc{)7LnDfyoGHU1?b2p<NEB
zeBc_%6J$7JK$Y73v8hZ@Ak^wS^%X7>#ZNY?(iIO*Fh&CcrD5GlftaQ1v7sLJI(i_)
z3JY|{2zsS?E{W!Djrwy1rNIi-MqRYcQ&`Xh+xMJfwAwF{l^A~WOw(MF!^4MU-7<TQ
zYBj=ChwZDLt+>yG5$%tR5!|C-pqEmSXy0$@NRi{G?_=Y?c5XcutaO2km9ddk&F88)
zpN%Tnu37W4!+*lkQM$$$lAV(k8Ug%nb~<4e&%Pg=R<63viBGp9k#qSN8ewBIXpgJ2
z$IR}L-(YPG#*G3mR+(|wJ74~C7$ZPq#mLc_VHOgm+rh|3YPfM*VdVc#DF2nu)c0uW
zvoIXMJZ$t1el(>bzW`+kr;n~uqXqcV+u)6WH0)l#%)q$zzLI*@E}s(s&@Rr&TK1mC
z;DeVLQl19vwZ7<;HWs}oMfW%xLv-MWU#L_41kg__{rF+OFf1QPVI7_!D1R0|@7j#O
zG6<l-<a3wU<(JZR4Awg6vF+bu4AW1(jup1CLc0Skf2kwi3H#kA6Ov+%TsgWbROTQU
zll2`%V)H-Is3e#~2sv&NP*=pWi!xx3VoK6n*jFZ={r#XDlYD2_r*WJVii{SrjpbJY
zcBMmUpe}p@0Lanq=j^q;>rswD39*Lp9A|lJKgLpDRTE+C6i>Q{>f|j}gWCJ5X`G^y
zh~<D4f=W3;?<<Q?UpsQ&xy#0R5Zporq^WPLCAmR!CpEMR)T=?Jy{|5rq-q<*t8QMZ
zJ{<lnV)$vQMR&u^jKoKzLYHl}AZHf{Ny+baCu*iST>*740ObIR#e%BA`SwY~ca<+^
ztB-9_y(0CUTn2$Hu^)aby^=)UW!9676PLYvK-|89`VXG+4V-f}aYt68n&CHcCF1Uo
ziNK{FJ~{5e50?;Rp7EFO(V;$~q~n8o1E}u*{5C#CvRmq}U^P%%*r$K-v(>39LX8rb
z%Q40%Vv8i~)**yguHVq-==eJ9gEG>SUiQhlNhJz<FIcP@V_2!S2G2AfbNo`{Lg~gA
z${9_+dn5WR_~${ldApi+9SCTgIsl%>-fL<}h=m*Cq6A4hLd}%s$FBeWYr_e=iO%61
z(Gww3cP!vbhtRapwE82%d+2x`T3jSzpi+VSE>K3xP6z30N}16QR;*6t<)JTAl=90n
zaE^$Yk9#j3aexI=ol|c&Hn0~knOdv)qQU9{O~<fgAQ+Q=og6q6@+)e^(Q2dP#n|Bm
zrQKFMD=R@tTC@_5+X5`HiHBOxK~^YLa97@ngfH^oSE7C=!VY@Gd3wMGO9IBt1K_+c
zA$%M%QlF)A5ws~O6w7-9D>l1SyKWz?iPX$lwV^jE_yEtPKyig`nCfr?qZzTZNZ^&t
zLNcXLh$1)lvS7XB!)LxO&x-Y_EYJvs8f6Wha~x5Yl1Wj6`$!R<FV_Umk}o!2a#*I@
z=XqO|OB&>Z5E>f?JH--i{Xt<DX^-0O@}pvS%jusY(^D4EM{_oD6S(;C@)NUy^iI$n
zGHN;-aRriV%hE@sC{?+2vQNZ$?^U~^f;VkIXum+zj|8RN;D4H-{iN;vVz5Uq01koO
z_C%_CPx=N{cO`42id-TN@tJi7VkSwuQ$??Ksqkl6ZV6G8e9VZPQ}>sE>u_xv#+UZt
z<r(mn3SpGavQU`>>$eSywpDv7lfahBs1$C1bZO+YWP>#Dgy(OI<Xy5C9|PeZBy$hs
zWg=Yhc&D093Z!9C2hN^Rex2&T7ERCmmW`MAib=9e0#3kpmcwa&Uv?DBYxF+r*P?jj
z)X>WEsF*P_Xhp}<)e%nE+lMUDM!9MTuCfx<{07P^nro0`+GCx&PH=-XmekcD;#{eQ
z*LnOtz?815sehMNn%AxKa72KvGl*^^Zdf_A@)w&tdftxr7Y3`RVN7|Xc|wMtf3rF4
zu+w><4xDfVx%U>a_njGZhQ`c#{dOH**%~;6M9+;c=!;;+nR1#w@+r+=&XzO|>oTjZ
zo0AikfsYKMl+T?Z&o}=C{Q$1=0Ty9`(v&r!u_>q<t0&;MgXn+nUPG^W<m}qkb!75>
zJn(Kzhz)O2V-$)gnDMh-V^Pq`gM}EA{e}<Sq6}46>CUE8xak_d+&D&VF%oOub#4bR
zJ&(wSoUHPh*%>74VR|)kmtfWtzR^?oD8jS(Iy%I0+?Di7%I=n%Nc4Nj-`}0cVJBR#
zb7{cu1>W5!4=f?eHNMD-#F0m|$>@H5Ol-A+NPowy>Y6$bTlV>?W<GG|N#}1;BYMaf
zgo`dek3GqjE!)WvYsfu_X?Z8gFU4m3-cu!;1=lcn3REpyf}zamgUA_xG~vG$Y~WA~
zQs>=Hh~E82i%laQ<IIh|i7XAdNKaUJic1ud!qQx0Ox+6Dn0Sw<^a2%P-L;94!D7i^
z*OdH%X$xyB=RiYVoz#mh3p~*Dy;B1616pW*-*9YCz%Pm`D#A0;cx5EdJQh|d=)FVe
zy&nclY>7=7)AQr~X&-dPY0>XxOhOL94Q3Sa8d5CSg0Ts<6dxAkfsM?BJoT>1PI<Rx
zLU(GA)U$;82dT+&Cp&|PmfBGFiI(KdO6G--f}+mx66G!>1iUi|RS)^a${_-45G-}!
z)4T#aAMC9t8lnphJ?Q@8euIS?mptB0;p9&4%_Oi>^Rjfs6Io=9C&;S}Xkw)2Vz}h%
z>nkR(?NKZNlcGU2=F9p>oW6gt;gY&PmA^iwt5Mg)sC4My>s$wHNkk;967kybx!&75
zc;o(;^Scx-2)izC50a()4~|jB@3hb2E?5?7ZM568HX{blA%h>{fy2S%66lJbL~;Ns
z*{n5EuFkh4YxYjPcQAn_M=W6eNC{-5*UqN6Dc{>c>vP8%*S`AGRG>x`7e9pRg-lpF
z#i1&cUCGY{pc&-a86+BmmM_>>la~vMHM2fuGh(6MeHun$e0;z14Ef8O7vNC$!oU7@
zKTb}uQX)P2Rfq4|RsZ+0?I4UlG7q%aRV)f8lUYJ#CR3J``q94(mtiikrRMZCplVgQ
z=iX+dzEeHuvFFC0Gz_KnK)@dcAHIE6w$OK97ti(Jx>VXwRcpqHR4_Bw!;R~>H(OMU
zLyCs{6Wn2RCPg|?9!myy(@7ApQqq1k4X2s`WAP>7%v5`pnXKoJ_EN|gqaTRK#TbMs
zRpv5jo?v;%@<SbQ-9t&cd}#iS7(v~*x{EK9OiIuO?$h8W57me<&3rT>6vZ$mib?cJ
zMwNk*+zCP!8qcn`lh;yX2QR-O=MgmA%p5SUS>Ac&J7qUzb`03KNhMv$^VJjf<a^36
z?R168@M`E9T&tJN=t5kVY6hJDk<S+F+giCBtOg?ouh<62O&?J&qAi4%{|SAbdn1U0
z?@}5^cKir=q{&^DTAu10TS0J>MVRG|(~BA=bqs&0Yg1I^J)9|*ArklAciAA4MHS#}
zyO`N&LMc@R3rYFyky*@_m8@$~3bV4!<>jGJVS2hlFl7YGYNz!dI6gjb7trE%7{fJ6
z&>A9e@*;%zAB;;S5@0A{>o}HA5d6l2-^z5h5o`;RT=I1-%3$|!(A=#e<%pOlAr|V{
z*5RSLb(Pc+KMH$`uJ?ye7>6;eZ&n1ljn{}V=9H@NMCa{Her2D_+CYvebQaSs`-d|l
zvx_G2o!H`&Ti63c1+k|765l8peTtEt5<iRJdUn<9_Qg&Wr@;S?b74p{lo~sZ%tAsg
z4`V@H)a3a9FzUY~p;&lGZ7zy`4dv~zmV|hNK83Kts^nSCpiBg&9Rg&gn}uTEX1-rD
zM39M6mM6IgD_Yo6%b{3?5dt!9_gj_Y6n^@RO1>_iTMvMatJMCb`P*CO$o2tNh)NOW
z>d+F0K7;gG7tfP<0$Ba*1J*w9O!f=JD-aS=U4vn7-cU73LJj14iQRV3?u|BfbmI97
zAD9GBv^FMghSL%c83_ZUW22^{5Jl|zCyGS3In6OlOsLyF>dfqWq8gq1E=~I`(BCg^
zuWAvy#-w}q8bH~Q;j|+XGx_Ku@@u7E!WBGPcw;$k{98#sGx}5np8g?tC(<WR8m}|v
zWw%P!nTSmdE3ibx7zwzu>=w_x(H?2#Sfs%WS_hs;eD<KT@XExZaZ58O_6Xr!!iNhH
z?dOU?XNk_j?#`r{0i3yCNY+op-n$yhn5wi~T=gUpn(elmW;BzLNNpkSlqq2{$9y0c
zXm8b#$Hps{P2T94A1AC-UDS5pxN@bsWw^)AYu8*wgM`8ya^%uy*5Wb*%#?q!&W8A=
zte}<sts3hoA~92omUnULB_9wh3*qTRjw;uHP6!ZMy{!9ZG&;yms5q3vhb%ULt0{{<
z)yI?m2Whqdw7U*u>-$=|R?jv3v3mMm{Q_^9hcuOuQoiI7uBuX$qjriJa#i3Q8(_Uz
z6TiHtp2a|Y^Hny8Pe@dc7fQ8?QMfcs>FwWP6fSMHRVr?+$Ynd95Vs;a-{Qw&DFL*|
zANyGE8+(swO%2xhC3f>AnZ9T9ndMjE+#lErN-RAsCNPdP{ro=scRk^#U|?LZx^air
zpyaeiRF!vCsyp|lDFua8L;8oPQSRt{)oVxb?5CK+QQzc@6WK&0d&j!vkAbZB@1}tS
zi^2(djC}Aj+Am<VY7>KaU+-;qm(w7Cwl$%sLR*{2{k7Gn#Mc33`?G!MGz3`j3~kD}
z6#^FYctK_m)aK0If<|Y@N%DpP5B6@o*j*9s@tq>tm*)fh$mN!BvcpY{IT2MpzW|P?
z01h_~%%&gY?wNQfrj2ZK`+)fQEW!Ue{xz<_KU1l!E@eUPq3kD<Oq6^h<jhz6i}5HE
zDSGC|Z92xEp*TzRByD8!>+AIqgkxRG1xmly3~z6eHFZnULa%YN4EK%>lqWR1StETv
z?<}uvM|A)!cNBnO(B%IqZ<N5V_YzHubh4X6-@Zk&f-|rB23s<npMC26fk=kuN_Fo3
zgQW}E7omoqs_ZXb53GN+Bt7E}739z*yUQ<>^K18OPKPWy3H(G6yishJ&T8jBZ2hD~
z`PV<+wfDWVPZ}xS7g@FR+E7#q)<~BhFT9U{n%qys0vIuMlY|o+By`<R)ph#ao)4vJ
zsj%Cug_Z9`!}n!~S&Xy4<zEXyuBgqFt87gGR*tCTKCv9!Y=QEtaSwq$@d|%_{a$5g
zWS%lM5FNKtGrks>1{%lurzkQQ#f>81Z#H5rm;ZVGBu(dv{AR>)o}Yr3b^cZYz&bQ<
z5VqC04ZKp?-)F77<G(V`Kc$H#oH15qWas}p-&?_jxu0g@=RoX4B(ONPIpV`g4j791
zmUmuIG{peAbGR6=W?^?TVOZ#ztBx<p!y>0d<-yG!_{ivkkKaV2Coa$NDq<sXixDr7
zDm<S0=YbHJnO*A(pB<H>etsDYQ5lZ-7&jC6RRHvi`t)uPtMBnG{DYn1)3{Ck^tbN1
zNR~Rh?cFh#!8%hqd&STRc4x&X-)MbL9Y%)kDgq40cX~HjAuk%-e5luvDQ2p4gV<Ms
znDgbNobm;K-iwg2dM%1Yuh+)|ljIVJ^`otAK<Sufc3KcUopL&wjAvqCY~_V08_pkS
z6flJ(<+w}Q+P+rx&&0lSTMp-;N;A~J>^5tA;Uu(1xs$aUdv|Dz{(=D7BP_U8HFHFd
z0|deT19h=Qhn0K8GUnr-W}!(`uk97^CbI`A3nmL7Ss;d(5S#B23;l?xUf8bYpxXyo
zXDy_M0Xp#;Gav17!U5itP#`%(J~zwHFAYZ8IN||l^ihVUR!V&Xx!FeD<Lz>2V>bbD
zS5Yl!3Qy%%Bk(qDe!k#L+}H;;_6gR-*{zf*fYMY(7)V$~FQ$t^$nZ_rD?ph0<!Qyo
zDlhMx-YT^mJiXcRs*&udpOu$YYBBPwcx52hV2A<Kc*dxt&xQKViY<(#Vi-9c`&846
z0^eaMiW#SZiz$F{=@+M&>-rn2t{6e;2sZEYBw-&U6LR5Am;k#>M?`!yYk}W|v-UK~
zCOx$2xBgS_DpfZtd!-3E;cr7~8?3mssE^DFbNxyuzy3*zB8!S5*Kq^O`brIi)3X;s
z@;MSw_r<81du7PXfqOnDIa6G>BHhp|v%A6GY`qR2!|X0T1f;~gy?IE~U-Z4%Y*h3{
zNolFx#q?Lc$S+S;BFy4es=VGov>D+I({R+_<3SKt;&-?UaF9U0bL-Ao$Pc%SHLO94
zpw<Z$$-T-GE`9I#*zec6lUX5O5J*}0RwK>yi&rKD)`PG4&&iyj=8&;n8e6&^#j*mq
zln^a&Q$B)q5xCJw#Exte1AWMo8)AMa`%A_#yQ_kj?$L6JV@3kX6z*h!-`~B?d`d;|
zGza_FMHXcLMv8g==DO?0@4zs9pD;2^Oi7gg^ZoTf;_fwjyK}}E0j6?!obw_IOZJ{8
zHU1$=DN31ctUvt(6`Rbs!>a!mLu~4By9khoh_M%01c@8MB?76K5VMG?>VO_aRo$CH
zc*hFE_meV`AuC?^VL43rhrqDhr`900kQGV>k_w_0Ses(}&t+?LO9moE&9fvx_@(+=
zeoe8p-*_t;+fqSz_ZW#47lhULZ5UZD3uDm_|Hgg~E{^^~@05W6>4o-kc;fN;2Rm(o
z#5!qqMkIEp6y1@QPntUYqJoe>XKY}KJs3)H`*$7r*Vzob|K>-D*YEGcv3gOadbFSq
zt7!I#^z)4Jm!DZPkR&DK2(d{uP@_=j>j{gn(!xnu1;WD0e^D7do5gTzHG1FfS)oR-
z5OL4^!~l#k5n6b~c5(z>AfQMtet|j{$Z@0SNM33a#2y~;^-!r~G}lUza`x<knXumm
z#6y-&<q_7)e%{N<gVVMlz8H_Ue{E=kpZkTSgheGWhYiQwXNU7*<d&JzAPbn1(L>)L
z-Y6nD-)YA#5acN;5G0g_zD!S|mOvA2yy<nkPg)fJ4_ll+vyf#ySWjGzo^pmEybWCC
ztB+GxxS~u|dF^ky&{4n6O+~2c&O>wElur(sv8Rex`j*6-Iqwr5xGZS-Gg5o*IrYVc
z>?ioX<piBSu@j;wlp(&s5r^t8tkHmIrR8gY#ezru_zH#-P)Yt}$6ijd%A{fJM8m9-
z(F9x_?ZBDMm{d6VS)U@hX0_G4t!uIt(|k%4Hr51ij$bo*pZP!|=6a=i+}>{b9SY%K
z-kUb8x{{JBrYJKqQw0h@NC_emHQ%V@YfC-)#15k%exjn*KB_$!kD5QJtm8^O9nRJj
zwT<&O&(WpJF0l^w;Pb^t_d9EA{X}ht!Q^A7F+T;?6CHvNipx*Sb1o%m9Mn)aQ_W38
zmxp#5YW~oYd}e~8rJ*za)_JBw6h5<UAly<^$0NkFv3#W{S`B?t3wL%V$T>!5Ox1X;
zYF=h*{p8O7`8j+DN8x27C=s2X_-4QutK+`%*N1}Fyjm94!_sTU*EdC)NW&j7@9GY8
zII_Aie;5YV4u1F<Qw|lg-Df`C9L<`ZA$qICngDH8=HK%x3beB4C9Hj`Ne(-+rAG%N
z%*fuY9_AE>{o88@#&w7s`0-s0d_lR#+Fa&dQ@7@NXwxn9C`Dl#H$NQLfi7g0{F9tY
z#m<*9C1ISOZTSN`BY`Dpl^pBdho$$bcuD1TgSn%wuQ|^U5=}n!>+Rnnse{S9kCWuW
zmU&ckw|hdkXVB39za8zg2l(oH80&}$HDdc@tnZY`UmBb=T_%OHeP9JW4m-Tsu#~eU
zg!CbLkQZf&xLZYVeLj5zkRt*6dp1ur`DnWlt7PB1qT)J%s~a%w0I+V@8y0F3B`6Kj
z7_0YWurs^du!N=_`=>YsOI@5qLYa59^_D~&7o?k?AQ^`I6K)L?vt!^adC`(L0?>1Q
z{vay;7ifK_6faNt55ADQYfeU&`&pRE9(X{Zn(>C4^pdFzY+Vv`Wxfbevq&w9)NLnI
z26sZ%0ILthua~+rp67x<X_3U4;mkbP`oD|1cn@Vfoklr)W)<8#@hCa}_acu~M0(LF
z!`|c7nT2-Hs$Y?!C4rz$bS?=MV#`11KKd~{#{OfB{q(XCw$%vm#SDdz7Cn*NutvJZ
zpglb5BrKVRCUwO6wJ<{!%_-T$Iy~Q)m-1ca9jmqU@i2W-G#UHotIGWw{ge3uIv*Rp
z@fgpYS2LF5t(r6dqHl#Z*G~@L3*;n=RrE;M)UMXcd;ki8mam4}%8k6SPBj2)QJQ``
zZ4++#QkJyF;Uo9PEf@Wuv+y6^?zZazE*@5c_gf=mB-%o(A@TCx1i*=VF0TmUM&8g0
z4rC4IAu#M}DD+I(?*33{Ft2|_KxOh^#q_A+hb?}py>WT+wzqM85n_ZOFK_lyv>T7Y
zOwlz}?(3*JqzL&MoAFxDi7Go;xD|5oUJT2jsB0{aF-W;`Jkd1<v?monm&xguqlSmH
zaasshr@U>60ilsvqwt0kbzRax{nS?N8dxo)u%zw>K`QH9uTRPS4>m=`OHaa}RL*5@
z3KgSG7^E>J<rXm=)`$hv&Ez=9t8kOH=0Y|QV4%1&JL9TWdlCanl;==Eb1;n6oA1}7
zjMLN`+J^F&V5m9-etb?n_fQOQLh<*}{(f@vYCO`OQv8<Q`+g?fm{_c?z*kY>9wfL)
zKOG(2PPhpb#79H!MG=iEBVw`BqZ^>PzqKA(q8#3NUVL-vlR?sv<K7VT-5$#KgjPxd
zKMCQ_y80R^wpRE?<0cze?>QL7n#S9u2-8nCno&_HB9&^%x7?R*hTvmU=FJhiV|_rc
zMQOn?8-pCs?Ap+uAr2f0hx*d&6&lZ*oIIrlcfwK&5Uad?Hf_F;;JYov`Q6k?X*@Uk
z?Oi6?YhZ}-LwxSg$4xR5V!z6`3G4N0oLfPV@M5?-9wc_%r}&Dm@te(8SrI!dUEQI(
zi2|RmvY+b<_qaZb->qF0W0dl!N{p(ig7TS=Z&tlh>pjR7v}S<<xC2<?4-%#QhDT3F
zs;taAfd8=H7B9A)WSDC*-ozNcvGKh`+cW;kWKz6IF3!3qcDn^zHY?TCA+EeskZjIt
zR0Vm@Vs5GecYl>%`lDPeCPU{G8$)8Si*+PpzWLhO`K|4>CQ*Qtk98RHGZL3v@`ssT
z&5O!eYSu9%HD>lmE3=<d;dNPQn6WhUws79KLz>zpK-kS(8{HoSPI7`(UR>`nAD9G~
z7%pSJk_=3iISu7CN7oiJjFTtNdthj)NZWzYqhfrMquJP@U$^FQ)i$E-O3Se-#~xkB
zDS9#=X!JP>!S7U>L73W-41F?xNnY?X+S!+|*IEwqM~Jr>!`LD0r+!(3?*f4n+t4WG
zFiUHfaRgZg2CKxYs{Q-G6$^v`FyXpIgWJgh3P1GlhxJO*AgO$@(}f7#Oot*X9lxDr
z@_e9whO18_T~-%FfYI@Y?~VeVvTId$-`^!{U#Kh&^stW-dWXzN)RT{gdbCD9xD1?y
zd4Iw#H%oTJ)LFSPePcknOd<FWIqh`h;zLO274VRkBnqFjSZl&)b<g}rQ7qeq_sqM5
z2L18Im~rg@Zd|#9NDBL3H+-a7-)Il`8@vR$eRs`>cj}C)Gw4S=P(Ng6t(#uu`y>F`
z0Q~K5WtUGfFUj;`Mt&&vJY#x!l`ZGxDcjjnZrHwzy*_9BuNg{pID+Pmeb3#pJ%m#>
zts7;|gN`{Cr@clqzB%Tdw1cdXb2iRr`yz>K6mcs9eY(E4nY|a0Cog(@(d2JVidhk*
z;Xsl<S7sT8aeMuY*0rw!q`wX{p*I<_w(&R@3nhIfca^nYOVP7ksYRs1IPU(bXJD2d
zHnQV6$y|LB&RRI%&E1-lnEUYIh9-jR6c~bA9MZE@n?LAs6O_9DJ2beF)LY(q)GVIh
z&;6pU_O?QH&bX)If&R3jB;$rNB})D;A0tsbW5oN3uXF>4-z_8}55B>dz(9fhe5bBa
zjjeyz=DYsO7^Qj!VaIFwf+E7D&DXM#a&n!B$DGW7w19z#18r&@^-tHS00ZR@BTnVz
zX*b_nvFdq70x(}VVepv&v=2v<9~yyqwuz$@r$Nl^QiTyxN&tail#&Vu)iY;6t1J}x
zowwl`d{Xf!=T^byEZaitFnLAiw~#zd{)-QJWE^6C_AM>Vxv+mn5z?#cciNVwvzphn
zS-ylV7lB3NItOV?d?qBBXg-uxw$Qp__*07XJI=>LR-7^6Lq?oSasRpQrGD#eIbNJ&
zZLuIX<=o}5n9C*vK!5#AkAtN6-p*NDo2ejgqR$eWzmaqn&(vP-s&`7UHoWT}$Nd}4
z5{w--GG5l-IA55C7O&*!kr1DPK-EtuKTHir6yrtR{_y*?pv4bLA|;E=8GZ%G7Yvj%
z;OoC=>#K@k4j5<Wj4NDRBUx077?k-N^cZc-;ppI>!z$J$Iubr>^6cB?7OdK=FUgb=
zuH?0bb`~*#I$V@+*L8BCmI+<O+Tx+c8h@++y)|m_v(|qb&ED76f0t)@+OmzLiuRuM
zCtQvwrgM$uf1eb^T)r_q^|4WmBcsuw8E2cNCRyL%vY8sK{^4eex+T{wazLssUBdP%
z9qXG(^&c#ZF5{UGE_HX-72Y3@($euUj@q@k$|M6UOel){?jhd)tPojrKn?9&b0ec+
z0o(1r>t@QbG~!lK*BtVf_Lh_7P?t8>#iR_!(Yv4Nr-;d8K#P+?#!g~Fu)#l%4#YJL
z5DdigKEmwqv;@<WBvNFg7yAY9p&;56XVsz;6%{hBkR3AWSmiRQaBq~O9dmT^a@q1X
zj8buR1ser@+ezl|`Ga)yK4CU^sYJ;$AOqs%iywi~sRpsmUSgWZm(6I>UcdSu`sa^u
zUF2jHsw?1JI3?bUgR3{{=@_xwiswf}50p)gTz+~BlnQb%GR^#{vd;`W1PiFMA9q~l
z_)@<pPrM&}umV4-*eQ0!MV<xSTV=u(=0%;GjEScADWIW{4eGN4!Ieo3XFfgvV$#LN
zvLcdXL5jOwPsHug^-VrAH3wgJi#_T^R(4UyV2^7ei%LQm0W%dl-NV3F*ZzJC%YVGy
zyE;Ip#4(G%y>79Gr8q-rXs}bAUbSWGKnU^q8R%{501cT%vu=-gyNpP8_LDBPnSDh#
zZ;XE1yQ5DShWgh_n%u;@PRcB-P2DLQ@mu4c{i6(2hDUyxlq^khnEe^SpLI?+@p6;a
z(n)3uNi@Xc``C)CxUcq7WC)f@%9XXE>62ObM_pg;`i+kuLX5Ips*h(SXeFE+-)rGU
zN*eAY5uOxw5e8#>;==c0IeB?4IU&P6{tf0Fj57CEieDxlL%Bs7+mHqo#h<`|`16`^
z2g*4t4ljfLH#4fG@gS`tii$*RbAfUz#^1Fxpxbd9AkVDopw9Zb)?w+1-B+gBn=v3k
zaqP&PTrX{<e|2mU{f$KD#-jMsaSHcRyLgPkV5U*j9rkb-=Sx=NUlu}Rs0txTK~}E=
zA9J`wa+Dxp$0X<8PN+wo(*CF!jBMi}7Lr&=IA)wi?BgLcGj;LyJf?L7Z3PDoCF>_=
zmAJ9bf%G`OXX@#Y*pT3Kqz*S@w`jus!ga5y+R86^-VXvI(IdAg5jp_P#N9JRc!)m0
zFC8!IKGyK$W3W_u4{8W64Xrm);VY&cVxYKG^bfnK8D^N;^hdOHP_*0LsdS$tNkGw#
z2(aVKu3()`<Fvhfi_gbb*5Bi9m^kT+aCnD6e!IDtqn&Z3@aeJ0k6zHYd3&T(kwXNS
z=CA7wR7n7uUW_6jb$LvM$aNqQkoaVm8?4Wt+WKIs5U3jIn4B;zTl`N4@U_Bvp9%Se
ztp@(_3daS!A{u*G{7X)v8r$|Hb<oY<h<o9;t<g~2V#d&>3>SDKGX4n-zHcYDKxi+&
zKuA<slk;WS99(=G%)%7|Z_}?aq_wH+@LDPA5@{9HU2i7!+-3S1u&NF5aj=Q;_j^CB
zzw?LAl@*tnH4Q231o>;E&T5^RcmiCSk`}eF5N#yti@Y2XEOTOvcb9G>F0G}5xU6*e
z%<5=uymyn@S@hHOUllh;+OsRJAANzSoEC_7ueslG@e&Omd}S*is{J=9e?tv!YZI2U
zpYD;hnDZQJY;)vxq~+|Rf<it<|3U~)cD7w1r+4wK#KxOry6856NSf$gLVUW$q8esM
zAg?s{p{cqu@2oQ+xn0shdfV#nsR?uwkxEG^Ld@wEUjowL{|@EC`1rb5nr5FIQ=mT&
zCz2bV4BwSuTMRCqu+dTr$HBK`K~gvC5W7_hB;nd*l{$%--AihIX|z-Fqa5JWrs3Sk
z9ldw0t$VVa>c+lzJk~zJX##EaVJYl}I~5kP{<WZl_;8zC2z7J19iaSukj3x1CiK3a
zM0{v;NXZ}$<{?6qcX9e4q0>2K>dw9<@IIDA<m|!1o(Y?t<q;|j$FUVpH7Q+$jzVnC
zRWy`;2Ce@@l@Ag&Z@gv8TF(#BxPQA}=SvBIU#WffNJO&4ae;z~$@;!E`mSB*M7EXE
z=(~V~2aO%021{Q)6o@?*_B<+hVpr*dj%N3{hGS0KQA$qg<Too*V)lTl$U{72Ct9@w
zH3qIXDg@I<$jT#`uhH*22U^KcP*8~9FDWYEchtWBI8-9&FhjA^L()o<BlI}JsMs1N
zASM0g_Flx@y0`8&HMb!-8<n4x09dIsoM&yea23BoJs@e2DJgcg_V3Ifc2U}C?A^=@
zSo0Dr(+~N`(0L+X*9X3;CjDt?HI58O&hHp+lq89ZoMeio`*D54=xWZ+0hRAXY<WtS
z8^=v4bQS|F=<&;J)iVQP)bM?Gq~?XZTuzD-0VUBq0Gnc@r1dd&l9N*@jgK*mL~#yd
z99GYBO&K+9Il&Qp1c75(galsx=vrAn2|6Qy?l?f5`DRy`o^YpMx-ZV6QHQdfZdL;n
z-H2x;t<Hpk%fe_pSu7MX(-`0Z0PKIAktcp(BmkhbIZ{*HA7c<dl7apEFG`B(OZyM=
zIYT1>Uqi~XoJe=x!7Kd`;{bbR0K`2|P}>+zLr4_Os3313sA87q`msI}lRLkn-U{u%
zO5A5J@bR5lsf4j^2yJ{^fCkv(yZY<58Sbm1#+_q>G&%}3#w%qHary(!Nf)`yBo{{L
z$<yFgu_PNdqK+Ic0PAt}@W4^DR1h@Y*7JLFEYPX0OPEn?PvJEQQmK1xLng-Xu2uig
zP!i&c7jkP5@_Z1I76*G!p)fz8%sm(}`;1%1mk>%t11`)*QwC(%zR1YPke&~>SVxVL
zr$)Cwjo)`~P|b9PANVZD2}`E^-ZyLWvi!Vw#kFxHx*$!UNU`1DR8-3we}F#E38ROs
z#>j`<DBr&-Gm7F$H5-*?A(A@2;WbDp-6h%;>pnqlo^>=)Ftc*yy=^h0Bkp4Tm?A~K
zAn?9A2CnkrmrGEZaA~VQ$8%DHUr<-zw1V+N3?M~f8A}3es?)<OrCy8gkb8-$sF)_c
z5OjMlp=WK$zb~_3sJoeqolEgTCX3{g6>Wyh7J%cfkv>1b${rD?)=+yoL{DF*>H_Fm
z8olrS%VyW=;@iK}3%p9r##qz)X3$X5|6bXcEB{@>a)C=&w-t_2K#-yFR~BO?7pfA@
z37M~`t=Q=D309$)UFUtLB8|33FT4+G5tBA3ys~zBmqNiF*P2UpEP2QopOim(CX<6#
zEC)#iUXl0!)bpoj`CD+iaWRuuJK#bO>f!zN7R~1(VzHewb*go{wR>Wly-*w5FnsW(
z9pWz!5CqTXuxYSd74<%^9SS$=U%D3KF!B_fUBYc{Ad#?|7#*AOx5>_MjtgUIU#p;^
z9e*USt!PNzB>%y`Hgbjjb^u4}susX<X+I{g|6Bl+No$C|(tvjG&({g0O*0E7L_!d9
zwJe%wFB&-|?y$U^oRR-W;InRsWDgAzt!z4x<Z4Ck<guav$Zb<!-vcb0da9+SfFsP{
zgUp%FRvDaJi)y?z`x%N+6vtb?REvVmSe&oio2axWQ5lP8BwJ;}pWd0xuR>y?%yG?f
zAMviMv7=$mHF?}kF}>H)r>uA#pT+g6%Ll8CA*e0^g~IGT>ksBMza7S6qWly17oE$2
zA^7eB_7A|e47!ITiX;8S($Lf)>v%1j`k+E@33M2L-=y~_zcsEc!g~C?D*?T8e_A#d
ziZUc$=6ek!<1?b={Q3r3v}jqz1L}{1FbZ<e_~`iQDXCrxi$b7$w~M4JTpHtE6n$%=
z*EIYxw}8rTi2}Um5lfF``tj0sV_dnqJVH%Dp8by8ZsUmjuTUh_-wrwmD<0CJ*nibt
zvJ$x-LDRKTiF)gD0kUqk^MuI^k5cX}B|S$U`p?^GTvyHhw70DQfa9O_Mng%UJE!q!
zim<tY#Jj^7+jJ`TPo~}F=4?M$MXVS|5{v7JeBs_gI}>W!-0xZW{XluWBzaP**{#t|
zGB-5P$DYhw>phn>Av*;qW`@<FkgIB^FWRsAJ|kc5eUoj+3AKNw*L>6y8?+28c(%(j
zUCuwl=c|RUHW%nXGtYsGqvP<$gZZfVVK4CXD?s@KopFQRg~880lL(%hxHdn$2K@+C
z-Vd^!L};U{I9y=;DE?!g{Nw8oltk%FJLGx|_buac<!t-7smyv5Q0XF2^9zMce{gZ<
z;elQpH~@Fpgek4=2Zo_3tsDskzYvdN>=)9tQR@T^GOaHAb;fUeQZi=T$A%Vf4(N&c
z9tJ^z@?3p9Ynd+DoHhb^#*l~%!V1*AQ(=HH=@H^7%N|hnw7@TfD=sd+sd#O$=RrNO
zn!0!Mk~}z@)5|Ib?qvRJ|LuNQl3MiYzlJ~gt_(QYZoGGWM71D`V2n&gN*c1Q#oLO?
z5?u5@U`<<kE9Xz=d(`(fA>0Ac+!NQ(WHDI1QmMppuT%FE4iNj=z1i0*`Tmb9t&<nI
z_AQds2OF<cFcTVV4tQj|hF;S1_u!EitGK*dSqYHK;;MOyrW&PB?Udy_g6oph%_;i%
zLZ-(lkmULX;;vihiB{aWpj9wetMA|~={#)eOMl;Jkb!^b^3_zVUiMDD<(}GS`($_{
zFDUKVc=uQ}fGqn-#CY?gkNxHcKGW7dWwY@K;cpshSPi!j2h1|LE>T--IjZ2_|M7A_
zjn8!O?w`7pQWGml`(&DjNa!O5#aV?Hr0lyMQCc2Zgce&hT`#f-)GF3Zqkg{r(XZzF
z9nuSgIB(mEW6qYs=wgN#{kskJgERFF?l5`Wxo^g*Tro?1u;~d&6+B#&<A)g;zOGVv
zG?Y03K*uQ+_<YF>*B_E{e59s!)S}0#TR51>4^jL8U|?=!fX01JhD`{$2KNv-zaJNW
zAd2aWcXwAtk*?o*?WFLK{<g^7#hlAWm(rh6thd?X{_#Wcr&Cg27hJ?LI_K{DI$M;d
z>}N}PRH@`{*&h=ep~b%N#o@6rt(S>2xy5pJ)5ynbo5I?#F}YG*(y_mhF<*Cu^OGji
z4fO6j%O$MhcaFB2_$}BQ>A{B2lHULQ!%xy*8jPdGXk)vn>f&i%6!-%Ms(3J&>hK|i
zYfTErqOYLSb}-;8bJY?Ph2{dq;sY)WW>jNajzj=#sjbQhQNZKW4neu3sZxqc$it$E
z{>Sxs7zt)5%Xy>lqiazT^n2wqBL5lJSD<uSU*XYB(vuJ5hK0D=y9_HQ<uAa;dXENg
z1|xpR6O6=9&zO7#R}bdxOCT#P(xc;C^@Q|+XH8Vn=T6aqIdI$VHIh&A^?|zUJAAJ?
zrz~_#-d9#E#F{Kp^6cJUg`c+pgi9EKgA?yp34A4t&Wwsl<PmgKX)mrj<S)jA9ecth
z)4P;vI40-9(>aFg2d<P!PH?_wqK#`h@bNu5K0(T8oO05tT>j(>1KLbCu!KBk*TI;%
z9&OeybFFHte!1B2g>&m*YVm8*SFV;XzahcuaW*cOvVDI(k;dLhMdH+WFzWkBa1lZz
zf|NSO+rI^-cWG&?k*f`52%O1;!Rtjf<{~jH?;ET|@1|O03>mYzs^XH!U|(iHd~C<5
ztZB#($7t8<e4+yGskd)qm7p2lI@SJm)0s-`)IGzjKqWH2H157W9-n;g{EpK}_ZXZC
zdm2(1_{b?4U|X49Dj<+Bm!Q^WlG_w=^xvzvVsz#bq0a2TF;SBp#zZHkOiPOVvAvpe
zk<7DCbLWs^#+a1QUdglsuHDO6ru(socAqA=Ce%DOB!JIF4^L$KOI%DJYovaa!HfgB
z2%8XHi0){rXF6)-xB5bU?}}xyZ-}w#YTiWm-z?}LG8dq8Qz8dof`MHe3JSKAdqXm;
zk9N+quh8IYZJ0oV4f058z~Da<I>^^>{h;RhR3+EEJ8VbkuGH^?Xa8~Ry|)~;LQ#^B
zwZ>wlkpKy`1K{|E)d#$Y_$hgo(u*S?E~%!p>^Oyl=oF20h&nhP`zS9$A@=4<q5QVf
zGmm<-pe60IbCwU)O4S#D2a(0d%oWFR7)?zb1B^zHvl(02Wyfdh7|GklGq?*w(kyrW
zU7nzuh<V*wAljU&2}E#4bVG25>T>oVK7OZStX8oBE)F)yF9H^vJlGGIG0%Ii1)IV#
z#Gj0zo29SoU7!7SUqR>XE&!l=D{iaCogo8u-OUc$@2FBm$2DT5avFiF#`3ne6(uiV
z0f+fZjo|e=hm8@gIB$6~2Hh!1g1{rxv#|S4)QiDAUg)zM{IQWJS7#e?p=av@{dAiV
z9ul|#jEG^ic#Yo%P4wy(@1}D&{PMe$?4ZtKy;uXa^OBFe>c7^>3+3$GL1!zRq77Ec
zVJ-qX%+5(M+d>HO#st;U^HWyr1;H>=6n5Y4j~nyFCCnJ{qLvTE7>+Nx(WYeIh<K#M
z${CthP9|xxk{3XBPfiEDW_2}g+{aXDYhM62hv45u4Q~VVS=M{TqX=DcCz66_BcZC`
zoq`mU*@lq+j+HVy>7(_m<_4{{UeUW7HKQPqYb+22MTwRmb+<fx9nuhPm5z2$jJDAC
zO9?$&y2BjX8_5HDN8RMVD5JdcZB^-_27bg~*81OprNBT42^Q=j!ayvwO4DsgiM*|z
znyfpP8XLtI)j`1dstnOx*7bG~ExiJyM4G2yDwBHAqiK<ERuO}4f`KB(grPZ!p7nnm
zU4>tiT@&4=yE}!YLpqm6Ktj3~0V$F0S{i8;B&0(SDV5Hp1OWk&kZzD}kpA}l{)6Xt
zpL=KKoH=tw7l7gs0Oa2Vq1)xb^T!HiU&<nsY;g=(^yMNC82kSOe|E2bdvaSEha!xF
zx@6~e7kkZ^fbuYYyoZ+P!fCvSkMC~Z^EYLgpIhpluRiw=is9ed4*sZ(14i6!`giXQ
zU2sQVXZFXLq?s}gPyjXol>LaHo-YnhVn;i@Y5z?<;8$9Fd>v^rgQc+eAyiZ74TsQ}
zTNQAt6E7zSviv~en1m<1vb@{pc3ob(cf!}YdpA?PUlbnN-#w+4K_ISIS2X3*KIms?
zP%ZVHl_~7faEPh4T`$0=#UYRa<23MmeOV7vHT(zn%@f3ho2}EYT&oi&q9x?kBhDA4
z=IOrN{>(GNNw=UUae}|jh%<*=(m%>*cub_@S!9rnODMap?In)j*Z9I^hp#e#Hla4)
zS9^VPtxZi{viodGdNrMcApT_MU-oAi`&Ft`oQ^42B4$z9>&-KKTHCH!W+a``Bk;>G
z;Em`YuFai>-%#+zD9TvAaF+_>(joU@=o+o&ut8TAhb+4u3m<!TPWf~HB=u8k@k{_p
z(@!lzcP#iL$hT2`$A|d~{{Z=Z(NE=B(Gm8nf_Fftot+&Mug9W*w#sv032P&Ig9OmL
z@{NYm^2=w8+JobXb09Cr2@=stAalYL{+kHwc0Y&i1>OwJnCZ|3y^7WtC;9QS0n<6n
z#n($}#s7p{+%10`WY!z><t@b#;#W{3T+L8%WBlEJd%XV5p^ii3vc@yzFed534;Hz;
z-|Gv0*KyBV`)g8kqdoGkwSRZ0HF$jNTgged_|PJxn3t5o%Di~ON!)bKo-&jIT)JP1
z>cdUpi<A`2d=~ln*wQJegWAS?I$YlxYVJ=e@eqXm6N=pAM;<UDH?<4wkGuRYbncAc
z|FDUHb68^b;yk)>Z=&isTb?NUD4KXbyGK+*b>W{2_E#@S>th7l4w+*%FOa9R6fgNL
zu->i3aO|4T2Z09MnqIy>ob_&YXM6F%bICqHx0@Sy9b6=Cr}%5m<7$%YxLpDV>SMK`
z{`;0=xP6JR{mWk)U%8?}&x3@QgJfPLCYFDpdb(WsMgLU1VsI}5__T`F2pOGpjs1aH
z=)2#~tKR=14seE5{yM8EL!tH|hKFj=pTg!`Wf^VJ&Qv&2L)KvJu<mM?TCUTLW(b99
z?g#jI^i?WWgG(!7TCkQ9Te}u6>IDNVE-D7uL-!3=PU75N(MCmhbY56BZ?Z<7`Ubwj
zsHo|<%8qT7fI8W7AKnq1g6+%#{z~*lmiNK{%^6^~#@~V*;(D7;7PqZG>U7k#lcu!^
z$Por#yMZ3UF7BnRd^e<slsgsu4i9pBW;mC;*xXi2v-r8*4oYIpWjo9;rtq25&b;O0
z+)m;h3bdUGBs|TNz3>`Kv`@+@F8N{)9Zyr%NPIqS&mr(*h;CH&DksEuaUm%%j2zd*
z(8Lg4@M}RD;}iK8R)HI>2rM^q32~_kJh?#`2a}n=?l-qgj!>r(>X*?7t;+OIWfA-t
zVFxS)plwc0fFO4*KpeX3!yBWcL54q`zP|*OyWB-*83VVhjrRz;f9>3%>vaS}SZBhx
zi3fzW_Dme3T%fsT(O(E98c~H*a(&^he9Vu=oLNpG0Ks{%l-HwIJj-(V4}8nE@_4-=
zFN8Tgu=U;8oId{A9Siz)>e!JO?u+&OoV>O!$8=!d0^Cpo5@^>?H*cac2?3deK>k*9
z3*=ITk~Q5M2>FkV9kaf=y(pce_&&gq0ri;lt4^F&o(U>K<A@(b0fY#0UuK`QGS4y$
z=g7s5%sQPN&UYi%-qXycoeH}LawQTk#!We-MVl53@N^B}ok5swlSx(`Um_#!h&>5T
z$f+50i4|lzv6!cV72F6+La={xewTQ;`qUl%B(p8`NF}{mc9tOVDw{0=8r_%7?YKNd
zq%M8}8XrR82=iLw7PL3TU5s;^d7bv%{nk}dOIJ)ReJKFR{b>JS<Pyw?ExrhrdBAi2
z8OeGyTRJxFq;g3eXd%LRjRr4?CUezue#WOKdTpfn6gOc|L-c@&d2vQtA$tBAM>221
zuKZjIn_Clz`zgZMY|tvwINd#(XAswvQ?d)xN+>Z@iqBw*Fb&dI=hAOHoS0)J@KN5$
zV6@i^qw`;qhvbDZ9mQbG7cB=)4muz*m#+pSMlv;dZb@A}brXQz>!!(83m1T<!%d%#
z1m^f$?XdX>k1E&3Go>+G&S02IA>=s_>07@{zX|dx3qN43?R-*^x9MknS|9lt&;C{o
z3*TV74doWAG^9PsQIvxffy%Zk#*TaEwaW54rh<VjeDpSG`P+Ls8~Pq>edR7l?)Ly@
zM{W>di!79$mzR`EW4FWm&aV^ur3^UujSag=VN{7EG`m>-QZ(w8KKsK5hWLA7_R_FD
z{;#uq&+xBjxn%4^&eNUA=+~@HlSI6m)azJ>bIkgOcWAHu4hzC=DAx<}RZi)#QW2wk
zhGN8mwF)pc0h!)6QmwB9!{7Uzsr?Fw4#>N)o!e^Wu$0%3ze#XYc(U0lNBa`oD3385
zVy``xT<)F*P<6i2*e8)W?1k%TfT8t+<P<x!A1=FDfcTjw^^q`@D}?|y6s+1iIhF`Q
z06+|Tk6D?i1Ub<ZO>!S>#n4Jstb+*gdz2Zndd>VuKymezY$$5<ebV)u|JnlD>p_x;
z5rA2N6Jp)5Hs;B)h|RJwso)Wm46ILCqo%EQAm;m7&|Z>Ob-ZZR5ZYZ`9|{6+38N8V
z7Nj$*L!Rmuwr}8@uWJQ@<6r0KH50%yDY@R>2J*0;+qpJU$H%>&eCYie+wj4%e4=IZ
z^bpJHmiTCF8t9M*z^niXJ$Zl;`o24qb_&V4<W0TsIIx9SC`Nj>l}IXZP0NcJLMU_2
zuXeo83LmY1Jfy+sXskt2{yHtJ!)v|e-Op{CyOJ$03$Pbt&%n=LUl;=M=(oNcI$htN
zqTX7m(;$S)@CHn{)yN1~OO&F9?}>a-GqeZti~y!9HS}rc+ND@+6&NvoChB#VvKEq^
zZ;TFa02D2C9ENzCvi%$JY9ETdXLuF&2sij9*%d`kt!K5~hR>@6IJ{BeBghOovBEow
zU>dpc3{WL6p>w7B**HG7!cJ27tu1C`oEv8T;qOw*r|zuTVDdX7NxVQNBo!_#Ie$wI
zecFk}^2v7~N0db@n28u+#3G>nrZwQ*^Kn1+>^JQFtfZzhaT8&qACzd#nf4cSSD4*G
z6lvtuNrhKutf2?Ng#PO(%}S4x6U;0p#f7)o+MO7+4vB2VI}J-ra6ZOwC5bQ@>eWsM
zCy}(_8~o_OrkzMTXfc8kL2)o~p=3%dGuJjjY+~#Sr|WI+G2s^oD~NXN>fH`)j5NZ9
z|2A8$<$`~C<^f`BsnT+#_;>rJ@Zq9EAZdta_HvS8{JpKrBK=Qd)kj=A=fvlMe=BoA
zCB5!`R6Pr>z0%Uu2m6ZaypfaEv}N-3I~lLVBc5gB6jsH%rhpVH)gnS(0%<EF6uzF1
zk7?AVr3s6L6XB$~KQ-%m3t(0X^042`CPps<{_WK$g>Fud%K^EZ0vR*K)Afz;-biz*
zF>02KFXCD}&{d62Z@R{Q>sW31cKI`soa$VO#w>`q=|s=LGWNxnI%LI|)uHSZ9yPgG
zpP9Pkbc{(h9v3)^Dgxs9{@U=mxD%)C@(?gB-v!3<eQ9ArCezM;&Rct<*g2Y@N&MLb
z(U>vncV396?4HZyTsk)Pi)|%Kv)Nsxn7^cwtCx1l{#<{fqoVH1uur-DH=A_G;{~62
zU8UI9QM&O(eUI?{8h&+#koD}lf`+|t!#q23Ij&s%6~LytQ%x_Jk;~@(l0O^ENi)$R
z6ZeZsZDfiA=5Bp0t~F}y7vYR^lp|msqNv6%q)(8ilFQfq6Ad9*ooYW17j8w4Ryy%y
z?m1B#vHkO6-?Aj3Nj#f%jYFl!qt=cS4auf&tcOHF)sG1Tzzy?h2r!#KZ-LtNF3*`*
zrk)EO?=!c^7+PoeBXd~orT$u<o!p;R=<qav*&>MQsPDmqP-bkO;Mr6LJ&%$%k;;|*
ztk>{gWdJq|Cwyw2-ptDj%?0qt0pa%KG7Q|wsx}Oep9(W7@+|D1<0@YRue%?aYEc!F
z|1jTbRlu5ra6sM=D_bLI_VzlS5#d>?1@`pCXC#K(RTrk<AW}Ep-K@!>g};<#T?DjK
z;EveyuRAHDra`|QIx?$O<qY>q@N9xI3-9=lO+>@FtEUde;fuJne*H~W9WHm5k7){Q
zdR@pHzGNeXaFNUWnt5To`au1^Kj=ueTd2(bfl*zHj(2rFQ2$GvPbw|jegph=%H!Tj
zo@A|}uXp(3Q5zIc`Z{UuB@?aYf|TGXtm+>v1HuQHIy;;ZgArIPXhoV6uI>sH4$H=_
z+3k#IzX-FUl3ETXlREzV$+ozp_HgkOU+nM&V}I8!BlDb1Cj*nja`}g<rIr{1>VF6r
z(i5q;Qtu2QZ*vve^^3tNZBw8JXLN|P$=bsi0gd^v>M#S>8^8F`LKs`m99r!`$bG31
zbQ!wlkFY(su1k@@eRCV=djUg|GuAa+l~gE(Xid|R2<n#dz>5^C&BYy&>*-oG*u=Hl
ziUsveQ6nd~MR~tPTMJ{fDQCW7`{5rUKnoYI0H>FUQ}10cqls%kqL=NFukuG7Yb&=D
z^qRj~;i;f{gvxBcz`E7Raq2d=#x%x6Y5G%xTAvIQ=k`9zhR=|3Eaj{zn{l{hm7nN;
z1%iGECP~_>eIKAfDg?f68?8sF%d$BR`#72KJNP{LoHNPnDe$9uBLG>a_Cori$Xt@L
z4`yK!-hF-qsycJQqO|ZEspC1+ety7t7)i`ns7`dP*K6%}YQLOts0&bZAT;SPcE#I5
z#UZ0UUxG8_SDRvGej6=;25qTrBVfC~APFa^@H562xFAy7aOhs0n!&0o0u^0H&=a{6
z;<x(^-5SabeivK-gc8P2$rZeFZUuk&3aYFG=?%$rmdg+Mvp0>mlilFtpC+?@Vf0|n
z-TdalO8mXKGLJ(!;K1M_`Yl%Ka`NZ53))<K8=UVBoo$r}7@ozqJpP*}osxC#bLO`6
z9l0iECo_E7lyfQA$e774Q+u>d2T;mO@w38c+yn-|aYt^K5F&s9m@KnleQ<8efV#1~
zjrr4b-A8H|QTn}Fl-syH#N90k(2c}uy7yS#QA5$?Lt<L{w%i%9x2y0`0=HBY<A2k`
zp5L-0nOPzT$?lV1;RtZr!teF(^qbLX8z4Z`ECu&F7%r&BbPCUweXRsU6Uq0OU<|F7
zu^VWQzy>+1w3~XrHy$&yU|m!0DHHMTehtNqGEW{mwQu2wP~U{Y?|RDdxUBD7m+>AL
z$G*qP9U&SU2f#MuE)Ny<Ll!p>0B*l0L6n|)9QJcxMvQ7gYL~li)ZKyZ_#hcXPI$qR
z=tD#b4b!$!xRljc&&dGj=b3$>!&QIAo+b0!mwoVs4S;epkU%4OW!AE?&7Jo0<JI^-
zKeN3#T>R>k998w|3~_+TQIvv4;9yvBa;S&6#FE^jJ;A4xC3!`n#MNQA{>R`fPv0=Q
zrVFQf6<6f;a}a#KIN58o4}?3|<erqEVQqW%TIoIVB6m8ya3iiZAEa*N5&n{u3W69H
za>2TJbOSG>S_HRUhUp{8q~Dk$Biy>N#xMD`5i#ZBpW6t=qu&&+ZYQ4vD=z&YK3axo
z?eymb?=k{R^On=J*5wVjbh11~p2zZ7Z{#(FSW72VCeO&UE}Ug%ohI(k3Pi;uQ(|m5
z9`8DgnVR=wZp3w?+h=G-v(6wRN4W>yRyyK0vdr}6duDI2HGfUic)-OujeRJMAdBm_
z1*BTY;>pY61g?f_BY0>M2ybvr(sW2WHiR5xB16P$$?Yfm!PgCBEC;f<lU<&2Fo6G<
z51~vYklJo=xj&fgNBzu)<^9t~?-Uo;H^$XH8!&kQY|dg!CGEKR<n6ehc20dy=aP%w
z&4A+5Z$$;sq(KPcQL%3nz@w5Z_KHg6%_qf_vzpGXk&YkD#{>vOCx|u8E<cI~@j<GH
z;#iTFf#<sx0c9W}i$F|c88dqQaAvi0KsW6HW-ReOQKU|1;R=T<x_CTk?gyfgsFefl
z7WlWlOa0Pd+TV+zGv%cD6wJIaa}FVPR63+*fmo*HkG$@{4C8U!2~e#eMrn5a_j=2Z
z3P&HsdtAE(>5Wwj`2}A(+WUWr1Rx6m)TxZG*vT!H+i*MwpR?tH@br9>3`|w3sffb2
zmhk3-vpYM|5W#@?YgYFg)8Z;&WT#j~=?Jcme>IP$@b#iExzMRruG#dbP8tRBqD^r)
zX*i>uY*a}HH=w&L4Ch~azTsi=zDnvhkh=*s`(-i4&HdT=3l|$bAl5`k)803M&#44o
z@E!mDeW%&1T_tI$;n$k@dx(GeS}b)rp2<vXUdOSi^s7y>VmrrPL+c5x^WV6)ajf1(
zI)&f9ex$VM2*EpE<iE18i1(7MvFr2Pz&qd2l3n!9#H!pwhXXGHd~-L@5W|WRKajpd
z9{m<Y>gF4Ls~H>WlBsIV>UK|S-37^6e?tGO9$bk({tadf7EFI7<09w-f5t4#p<^HX
zmJ1I72M<%%Z6kXfo2y#=d9|b!r$mng<S!Zw{;PK<ckPk(^b})gb)p&_jn`ARpjpi!
zN0+q{OujFdnZei=FYp)l-?hgxVhePF{{@F{VaR=5J9U$K0mV}#g#<Eo0a1V=wjQiw
zK^q7KpbJt~MhIhCrQ`g3i7$zGONEHwb~9PJsTgkl8)EqJh@@stN#aTfvUy~@ufVWD
zN$3!lL4hLAiL@+{@^!bKXW8R*y^+@0XX{lM(*^*g#k6)!%C9cyvwWW5H)$TBvJh9;
z#1gdQhz>nvcqyyPDzsH<OKdk?3&8zdp-<ogtt&ICMbGV}{^%oJPIBWE_~0U_p!`~z
z#dM6pqf=SF4~_MJb2MY!z+vy=3g%ZPA>k(&LukYq;r%+n?HzP(=ur5@Zaw8Z8=wPR
zR#*#h5B|Z4m_>yXBOE9*W%20efrJO|!K4x!Eme+}K-|JhJxEN{d}~$Pw>g!etJz(>
zG0`PGCAIg;4a=TwjS2Vr=F}J)dRS*)E*4KpGEhr0qfwit24Wo&@kxYS3y?P1dU#u6
zIoVDY9D+=-o&-QA?cRl{YUSC|J1l~tDG1WV4~LkH=0<$Rr%2M%y)7Cygy^)0LH^ed
zuvfAKZPz!uL{1YsP%fvvv2Q>I3A5Jka%GSyc?vY@Q)h(Dvudq{0^m=tNy|*eXVw>l
z@!D9qr4$&o7E4{?FI^>qXflU?%BOG-n6d}{-Xc6~VW_hd4bHIYg3<$GzC2I$Kr)=F
z(db0LWB_9T?2Wi@l}>(RW@f4`PNod{2pd1F<8U0fIu{-Qw0>pi#PG*x{|f;`y=Pa!
zTw+Ucl6ds>$s(4FNh%hugi2j;SONf4_I&9a%>m&paTU-t0sojK{|HT|Q)YfOJG;}?
zi5Gk?j=FDH_<WT>fdY;9!%se&Ba6r-sHx5aOk{=OKeA|$PuOiASZ6;{ML>795B0In
z%^3Hh&R38`|8g+{ivCPFdC;^U)3!KY)ZZCpvi{mGXm5e>@&hOIIiggvkd`O}wyt|O
z$AzsDOJPW`6^<gn!3wKwGdBE!7l1Q=%YHOp18kJj>mcA4fKU}6ek&fhkRO80_&KSS
z(Zi&*Va9z64RbZ4^@l&87;n!plCpB~goCSuOq#P_onCa2Nz$o3HW!~L{!~nCr89pc
z+rjoooBA=)A8>@*8cxwpHon{ZYM#I#(_rGbg*KFA!{7jj;$gzV?C(49>=?Y~ci-Sz
zKEaxJ=rZb%E#=E)*w}B5|4{bVcYh7t`XF^QD-W)ev-nB?wc~N|Hal_S&(zw0q;F=>
z$xP>9r#ER+fLTYI*?_PSP0HhjM<-=4T8Y_}fegSbUV@`QO@XL*%71Sf<{7}K8^6Ze
zmdC*&jF3&Ux_-Ls^+5QkL%}*93{jLJYYM`7!ZRmtIFzG%RUY!pE!fWU+<ZdO#fGE`
zYA?z9J5>#*+`TscAr21!?Gh>_<S-T;GTUY5vIWuf(uM2wmaJq-RI3UifH$&_k+ELH
zr*N(|pbG<)Uj&IS8^d<=R%|%lv&&Mb;GfY6iTCTK1hG%NAV=E|A1Oy4O%I0a8)fJA
zGsOBc{To+usykJqo>$uC{@sDpWX)?f$`4mpfcA(osY5O#ev&aCz9G&c9rH_RZA3Lb
zNVu;#E#flsX;2EpuboNuy*|%_!Oc(c;@)S3H%G6AVxP;EpU@AsP>6ZW9~X@YDqcSr
zK6rr`F&63C?HaC)ayY>&@?g5r^<AQX6p15r`etj&*d2F>_hu4W)|#MFwr~n9*#r(g
zb3nQ1WL>VG{5{?fpBNKj{^e}DIpKr}={D|u;5+F?VkY`jHv#!-Y}*C!W)PnleCC2%
z^|g1tny1Y_{Solk$QB?rSoUi{&a_FlvG~u()hzwu?2^T_nq*dYn8da9o|{73c@3sb
zo<9+Y#F|4_2>>$W@h$F}wtvu&5{{~{+-k%93w}4&fDdox(8XZ@|D(CjqfoKFo?hul
zamrtdSiW#GX$HZhX%3Cjt%4n7IR3_Y`+mhh28@~m8VT!Kju5C}Uht5makrY-=XQ%M
zwU0C6X-mOejzXC$J0fjWkAPmBLd3rn;8-?S$3a3TQ0C6fhMH$*_s@e0BaZKf=8%J?
z5jpxt51IOF;eszn_kDMS2>_lFXm>wxF!{wLt_<PZ9~s=23Eiw*@6FRE5vaa@&E1UK
zUhF)7(Qr<N2s}%oE+lIk<!zqwdr5)va&qb}-NHr%9QW`~qYZh&Z3Lt|`4;!clut&R
z)y6RTOmhF_k8jW4JI9v2oVodgPi<oF8Qg-0O#R`BW#<_?Jf-|+>7;S%;v0JIKA(Fy
zUDl|COq7JV5ZVhtq?%?HUF>l8j&qNFv50fo?ZMrO7AEElj*u5K_zuc{<>i1n;I{VN
z$3gC=qw9%)qqnTJL88_i6T8t3Z%!4ln+2+0rXQ)Wf<`)UnjWOXqZ3|aWl<~}E)lh@
z#V%YrT90B)U}Av~3yI3#%F3c|U*lIUC<$LJbz@3jWH*Igo`rk9A|~WlR|@2|Cm#lT
zE<@;+2OQ|kbhXnr{8d>ja*@_OK(RkRpDI#%<h5>}yM>XgHr~ImQgC~?`F>Gh7oE%p
zA=+#E2lzJ;26`1t>%Wk%XJuEc>+s%qr)dhIK1huQay}#_I74w2Pj*2VPOtFt8C)rC
zARpq0_^lZMV~tM>wF`jqwS<}}5r`TvHT(NpOR#<T59d+c+FSWcAI*eClFQW26+Bp?
z6y9`=mwS0zdKs}j02~2PuirV=rw8R-=*GoT9~`i11EN>%^PcSm@V>?cLKQz5wrsp#
z#|=^*^}yvP)MeS4r3G;RlOB3U&8{o-x)_9~vQKmpELc@K?(B4H#J>at{Mx<BycVo2
zfSg)z8ZxH#M-fj$sUdX=9J_S7DG*D|kMGi)B8WkMnzuU^HJM<cr<~z;KV{y!1+dyp
z*>kv$?fk@C*yu;!ZJoQP1`MkJ*-!5Ok(5D-wlAi3C=AOh&vZH&{jV(1UY+>#FEdpX
zGffFa;4VTt&t64OJu*YjGy*O|=mh;nEMHyJJyT|w-#Gk+V>vN~Q--O0UTjejGwppo
zQuPxjA039D*M9?!#%^_Cg|t|v{CFH&VlJXB$YLB@oL9%s2&fGhK?*>{$Sb0Vv#=t7
zti;Ih5gJ7Sli`KWZiy6+>@$i2mC)e8+Y^0sZYOTr$|$gmk#8FILE;eX2!7j^(PiRf
z5gb;~_6(O7{_-#r5Sc0*3lY(MWVaGfH6vM<VLWDKGQ7?4-=oCQ$L{Pj2QarC`7S?x
zpj{N|-f~(#m2wASy-U;i?o*{Fi&q9O76o*tJyGVX+oD2UvGc|y3e7L{xVxzV@mi%{
zFOw3&0Rf-klJqYI`%B_QMo$oclY)rTS?%ww)CPjI&#=muE6N7U3;$lTMd0~5(lU9u
z#ISsw`ckl=(L@+TrR)nJSJ{f4_mdUDC1addSeYgwk&t<pLxAh<VpD?WsQKw@qMK1W
z)oL`+QON0xH8^zZ5TxYt#vVjJmf7%ZaL<wyRJCCrS4vSZ$CEd#wtuNN;J2W<9UxQw
zay~4uva!n-$-uYVZOj9`)$9beVO+3SOdXUd1^YT4QX8nkVI3WDv*_j;$idx<f*|f%
zueCN6Qdci9qsRntQ5JuT!-&m`JA4?1HShGmI=+|NeX9F|rwdBhga$CFqpcFSjG<b{
zA&Im*1ylq#6E1wchg{`HDE>;SJiNAGS1i#x7*Th)IJ7>qR_=QIDW#rt5(~aJ4_Q3_
zjV4<H%iQjlYsr;rSO1OkLaT4Z<^^G+Bfegm;fNfq>(GkSUIdJxa(EsUjo{B}Vx}bc
z*mfXMicaN)F{*6Z@>?g0N8#AdK;{CV-I~ps)7v@JD0?2(g^wZvl6@#Wy~v~%mh@o<
zSLJVoTZE^1(D-hVn1M2h**7o8pCiD}0A`ZI!_T#9t+)oMk#eWwCb13LDm-UTy4onD
z^*G8R2srUGMZamBF8h}~Qh;8}y$e<~{LFGAm%9~f61~H%WiPbP*#$=%1k6Gh)!pkk
zsqx|NYI1K26YRF}M@1E*6N+%OzqSUF9M0dceC__kOz$w|eR91;60(yK-ruQDv3m$O
zyoyDag-QB7#TDCzzWLOsFtJ-$Uspt_lFT|8BjGMAu-6ITrZaC!{z|~$O4@y$OkN9P
zSk+`YTmr`2AU@L>xqZf)zi~xh)qt#mdEBoUxV0M!?G(FTV%@jS9?lT~iHa~&f5yPe
z;9}gT<QlEh6aFmcKiT)w1aCxSr`AXbPKCyQyObBQsVFM{<*oUTAYT~~yQcFK{4+b;
z;bq9ZRwhvc5iTpk+RGt|QG=^rMnJwNrRn>7rF*QI(IC1u44LU|QpP)q7E*ygGb57k
zf!GatF~ggX6Z(^wXN56Zg&F{uci}@zw!g{V8vxvH$M%7;>4IySKpxwh3Ox5lH^}JN
zcj8(fB;3$L&hk)mxdxJ}C7*O-W)Jas4}}H?Xv;P2T&dV=0Pxu&VP{PM5%)>1cf=}z
z3hOh?5ptL(9P?dOEE53)6Dp6frssWr6%1;6Fh4z)yD=h@!4_@c#yBO0@3)*2zT+4n
z^O2#_sD6AON^)WyvQ4sm7bEf`)H)m|D3AgA!sdnGtMG=5i1t(gmk_o#pD_`(GZHlw
zA1ceT>XYc<u$kSc$sX<p6@?DYcC8PCQDV41KSx(gS^LjQbb&s<gu1YrGi8<Hv5K2n
zDU>9VhO)&a)EIlX3dlq0UrO?Ym(YLQmQr<h`LX7T*p<LPh?JA!-FGav;*Mu<-NGpZ
zU_^uf>+8nwXwAvl+Auu-l}_OFqVY=tveo#Zg^YIVI!eV>tegj0OxFpV`xciS&~zfV
z{3$H0{$11;Bu$VpCIRIl-$nwj=^B46H4#Wsn=J9Ibk-Y#nhrY#)&}~*ZvLI1+gS4?
zqslIT6e?RW>p0>>46orC+NaTz`O)^3zUytFYSgDuvVLEd5wC>-f_}LEzpVjNOn7bs
zU4%#Z_v){Hf{p*NPDc#d+zF|&v5*6x(dUMaH@!gcXDug5ySD`jFH7n-Hzy+o5)x33
zisYgbV-xBU|H6q69c&5XQJfFL?gyF%W?{zByn)9IJ5BKC3gvPvy}QfsA51<$^l7C+
z7wM@FUxCEQQl-0ac2u{!n|O+t5rEvAW`!6rzmkA1$<W)J)}1o#czO4zno2kJ2q$nE
zl3nS@l8V$LiIjJ~{{#Q`6$l+_;rq4~rERq`9D1-@i-<fk{T-s-khs#<EqFcwE}Z<J
zQqoSKypBb97W#MHax;X+{+X=Cu#(c`k5ZGBaSP@MV)X9)TeCGJ`D`=3%!75fIn&U%
zqM`!1>CN@Q^x`2eW-*~rIMzN1CH?JiCou2MhfJncd^!XJ*Odse*dM{n{V@L^Y2_8^
z1@GM}JQSq35{!_+M=HA0s4=C($o~b;4g7$CA&^@D5X@|_sxp|r*2a%TJr;Vpp~AOp
z7zXjbZS9`*t_9!r%fC##;ZH@~e{c#AWQpS*p;?3C(%T37#DHKgWq%(D!w2XnMAXNN
zv-mOW!e3r~r8;Rx%%dR0xk`K=yf|{vMyA4@s5b$66=oD5JZAu-ULMS`TV_7X;l2}$
z>2R4sNWjvp)fApLbtag^%FfP3(-WQul+{rh`Bs*u+LC*%gk&mkiWum*XR>DO)_db|
zjvSFBC!d8_EAWr>9jt724_ti>E@v&APvnV>Td7$oo<&CvPEI_^nOJ_U3r40AS=zTZ
zY~OOd!v<yr$u=5AL=BUZz*4EUYG#~^tJ(>q9@{WNS&RUS9b5&)z1Sk&A_GvtJqw2R
zgJwLmtvvS2Pz4~4`RG52U6%L@;vpskpMUVmZunzs##*>HVBrpQ*fLx{N)_?xDu&J(
zn;5j;XJ1E^F<CV9Ul411S1GN!wZ{HR-jXLA&qF!D**LCvOyzy<mPx=xSq|P4yZqf{
zo6|4)KV+|Vh@8lW<MdEnIzuIHqSkf-m6gBkDN2>Kzt_sjJo1X)?@BFw!bR$)pAcKT
z_H|JwU;c4ppU}}n=QEb1#oMj$gNO&Y7n=oBJsN?U-%Iv~vwcb&oU(aW@id>Ys1tkV
z#v>K<7HpyTmBRG_H00}(5ZX9jy8UQ-@AvOXd|Z~F{#TA1llEWYX=fmk&%@|3YsQ5~
zzwG)lWQZD71|(;}(}6^)P+G;C7x=>F-(cNe*u#zd2&)e0rFfk6`kKN}{%%w~?Uv`A
zomc}bT0A9fDqjh>v5lUL;7b)2DC#x`3$Y0`1;5p!G#Pv9V?+bux0~5(!7>WrNYy=O
zo4hM-<*Lj(_Ge5qabW0Ha{N;?SfHptV=lpVh~mP2_eA!I@lv6wF=aJ;q&<=~ek|Ks
zxvma(>`$==n*BiIbTLSY;AvdcGKJOn?6gpgU(K}NeqStR=ug=FW(}S2K=3EPv~-SA
z1Qg(!v1@hKNx(i_iFrhf5~q~)iwX?nM5v@Kn@ZP$%ilN5UM1{w$cv!I_#zXj3VLM;
z2iK<FI=OmQIDUu7reZ2joiw+o(T~@@wk!6@rDvv>R1x_0CwsfXGH^TzL4uL=-+dO#
z;r%9DpO!?rS>gj0$_D&7Sd^#wD?8X$GH|hW-bUswPkRmchxI*ta^eQdv|0JeDOFR2
zQZ-@La|t~Bibz%UXn`s2WMxxxJ}E+b1Tp=~%m2Kkab~I8UK~NN2EwDa*9;O#S&k+q
zuPA4CWVT(isITrKolVfhw4!?6Kc>U{NhMW&B=dsKxN8q<E|H)O8U6GzgV(l-RBZ7_
zx8-&HYOTO9HtW<0L;n@Cn{USm2^Mmn7sNg<#;h!iaD>0Rhv@`xv7;mC&)yjSRSV#V
z#0xQ?FhFLNB6JJ24<i*1fjV2TaJ&}^=GdO~k;418w7B;%=}<5SV?+7GIcVtpu_`v7
zv@kMNKwyn}f-d@0M7KuiEhCxkkLNq*UM@dJiree(d3o)HmX)sIy*yoW)&!y=HeV_D
zrGAbqwHrOu8;3E~UUM&h$3hLcK`&lqUm4000}2`ma~@QYcLb>NES0%n#yFxA*Mj%z
zKgAbym5NEuHU2UoYdx^;eo8x6L3-RdKNQbIXK<zLg2*iLT?_>a%kPnh@U_NZmXxNG
zgZt8GOqFcLroqz}T{=cJ^@pxv-4{r}Ujs{a$ndVTzmLXK#(3Yjyt0BWUfZHwFupE^
zO9V!aGtJ;$4_rp~T}FvRu1iPmVX`i-q4Ks+1jARm?|%T8Of+-K37|z_*KJW^4pT9x
z&~&<>FeaIvA_BYn7HiPFg(_Y0;CsBvB7|iTred#XH&`SrdhXI1o}>fE2{&@1tXkyt
zu2Yo!TZW9dFhbE6U<al>33-9T(GiFln(g3kbYIoYYgH6D65j_>%4`8_nE2Gjb2E~E
z#S|G+z9*{c#DD7A9vKltco-MaGMJ}7iPzOvCw+3le<k>o#Fp<C^BFtAd^xI*Exq3x
zq5A9#7B*{`R^|S-HWrJ$5%>P89=ERac80zv<?=g#xjX^1>js*#!m<b>a^JvEc<%>S
zc`us9em^W?<R{{Q&oxZ>sL)HA-_nYMl{IG_`<_S>0&#w93>J+k(#Etz%7na}86x-j
z@DCQdkU{$Pw5QIL@tl}Q_|H)((+~9#CO>dI^+bv;8QbP+ufDVu|2Mfq^ZdEL4wQ!I
zlqEv_FY9D|&zZz-H*Zwxw?Lhs!DRoeV~*oh?Ky-$VxO-}n&-R%wXLW2(0u<^=;#f`
z$1;@u-w6}2Me{|Z)wQ6Vj8+X3XZ-UDb?rHO8fF^%h@N1nppRy1Mpd5^_1-+@F=(Ks
z5QGm1aM}LZev9X|Bhe@-oq>W45my<Rbc#-36jCWKi51F#HY@SL=Pk)84F0+$ocO=w
zDd+vPZPwxXcEpxS4`Phi1f}e=40TjejsomjWodDjm-xCY2Tbej5Nef<UO^&mb#1O^
zzx2C|8;md}z8T<8wG~?t9g5Eh44Tx1KgeG*3tAqbTy^!r14kM9@VfekZ%zne7$wI5
z1M?@}+>K_wIsf$jWo4mS*MvVjEKyB0CeQNj!X`+b)_FiBr*!k4&;FdpY;yNpPXwHE
zM~l4siJtTWO)uf#lkq&TE}LQ_FF@`Wbf`&VHpg!2=mR<1m|jO2LRx1>VRp#>IYeGX
z!s{PqICSx4FyRX{cK^HMU$BS0x8k|mgf+0%980xFhY*e)95^J9K@ikHv-$gMzOJ1l
zeoAm)=Lc=(NuRw^*fX7oGiOutW}gu|QVng4_UJ)1-~DIMieLD{2^hWmz>X33luPbh
zI}nHc-C{1?4oPjr${vXl;C@fVJ;G^=r%&tN!K)W)fG*Hrcn2W}{N@x_^g?JIBT`ab
z$JbdOvyTSgRPX*9PyW#LTtWTB>?HX6xc#a3ecT=I`e^4yob0EVk54=$1ZBuq+uM7K
z`t0}Z-a)yWc=;qhmv;*r4oVGD<>`MJK?N#j-BkD|y+*;(YxJJsSba=R%?$3^G6v&M
z*yQkVW&-o&8p;>+rVyGu0L$9pT_71YHsn(Czx-nHrJ#8YF8mM;Fyr%~SHZYFi3tY1
z5Z*snf>w7hG+ni-D*@dp+fOgKmyz2-i3}2BXNyc2xgemY(D~iss)?&eQp22f<Kd^m
z7}^Tuo&|=D^jaVB1Wh8By<(@@e=pRsYR@9tSmoNhJBoAIept)7P38-*>Pj?>_a%~X
z_cO(&EJQdxp7!MzIGdjjsgp{5jE5fKlb9A^?!O8)B}KT4ag^v1_)z>HdNlHB=d}#X
z&0elECvm01JRF80iuskiGtb{=H+Nv-5m9tZk8iXoK`Cp%N)t72{9CEs@s$CZ3Z<0C
z&#lEV7doBwmvgafC-$(wN2lX1;Od<v{^iAZSg8cp1$(M6ksS65A%`h4q=6gMI$%li
zx{Z~i!5y(oqIlVY#p2VF%~mGJZ`_3Zq-u1gT+Z{}sXEcx(OvlL$;_~4vdqH;{w$v6
zUtYcs1qzPCCtn$H3b#bPyZ;im5jB6AC1J{*TWS}R1QdRQ%%3h`RwqNM+X(*rYnnN@
zibZ|1#^aTdnYrI}v)@%{qTG1daT7zE4X?-e|7PbZT@Fj)H;DaOnn%0O;YP!#E8!cD
zAgX6tf@ujxd80Q41JYg90_}_+^p<f}E)4`LuU&^i=MZdu3#j_;Hh|J`rc*4Ruv_Y}
ziTcnn%qZKq<Z_F3W(j;9q}sl+tbn>yu#}MwE1ukaOEJRp^Hh3pa=U78=re%!?=<hu
z1!+pTeH;x;q+tE6G+pQl^)He9jVOFa+Go818|kK(%pxUvG<V&444SG?oQj<@2_kSl
z=j$O&o2XDXKvazCN5>biU-*^<rmS**j1xp$bfP2ggiyFh$osbl1rl{#3Jdiie>i*F
z8{QBN&%FLpCsKnUJHaAOMYyi+$CpVcU<PNY^5;2y{$4yy;)Ut}?KpFDk|dCXi1+Z{
zI2kwNe+}O4;2WkH7{<vUGx$SmS@_L8b?ptv{oEB5hx%;|9+nl%m75Qax!kFx8GC_`
zDdT^<iyM#5*l<U6EfAcEixVI6Y#jQdAqgqxn=`g52e3gfZp&gSG{ehhb5xJTACi+m
zg%u_IT)@O$%MJ*n%0%W@4Cyioqj^3QvI3Z)1OwfJBPYexDyg0Rdg16m?i}lxR_0oZ
zPl75w{*POCYap~yx-%+9blIc~7Y<~z9Wcl8q(4{0eTWDh)$$5+2^?FsLO;%KA8(a{
zuBi2<i`V|{1W$7?G*MAjwb>sEK#2jW``&8xQ*A7U%EbLZe8lpEFc>-bCb8h_AjP~W
zH6=?z^(p;y<0#Sng(L6em_CSP^~tydZ@MDQZMT<17dO8|je6YCx_M-Xi`Z-FmfAS=
zeufPW;H%a033-YkQE$knO$X^uetm?7<U&)K7Uc|g3uCT_*Jq2zi?ZmDCGo5KZ%%78
z9i2^rDk?0A*~dly(F3f`n2vDF$RO?No$MKzpaLQ632<>vL+T3L5uE(+lP`5|U})0K
zQfaI8Ik&#&)b3i%ii8@)fH$)dQ`(uxQGFy9V16ZTZ}wR#T8dI}eZ0wtygJKh%!m-~
z9?j>u<hBy6gga?soaLqVC6j?daA1q>M0N5=^?f2slrA2N0Pp6s2=z4m;t@>0h^=?a
zSnS1F{U;!m#ydAxu(4IvWsx%^s#vk`{T)lcMVQ5{@cF}d(7)XbOU<IqII<)xMWuHv
zEEsaO2m@O=yU3sEM7PW0Urq+%_T05=>Ag|f%M8qA#Imt3rI+G-ymgH)cNn>Dl|b<a
z_|EbT^G5NQi&i4HHhHlbJpD*9lNt#?)R{Ssj$%Sf+|)csIl**!QoI@K{HfkF!|{(+
zmW1T18$=h7d2Wjm@^P098@Okc>$_W~<CmZ1i}xQyc}wmS^f&LIFz6Z|COt=unHfg9
zysOMWl$T5cEiFWeIL1zC@*1={_{r8)hP@TvbpH_Yd$Kvu`aP4aSI0l-Ha?JFOK*`a
z9Dp<8{*i*>dbnA|CL#0PkX4md5BJi$huiF~h*VE|K%~VLZUJy5MCue1Ie81(YfGjg
zvf0zcQeDbrCJ8=1ZMk|hON=kpv?HSxn5v|~?*_>&`?M-!(LArmo?oUwBM@~UTzir_
z+j;c_8K$&<gTgxSPt3z1K#h%^sbecIFc!TcVyG+^;UZz8w_C*h(K(SI_m!z2L6Y7z
z1VYucd~S9$Vf-ig>v`=tEk#tm^b=f0^!K&sRNMI(Dd$?jugS%)sP?12xShWsxqUel
z$Y8MZ8KXl<!b_EAWyk$)JZBb4%aTY)=PH{4<W39LdO<e+e^ie1UtOAK4k+nG29e$U
zY^8qXdMxvFpaqLutM;E|4=M)FAr0^I>JO}C2uyL+TgpdigM#*zKoTiq7e#+Bxd`*3
z_bcXbvEM`-5bJ!Dw#qKczuzB+!zO^_5~tip_u=;6SL^}hm!H~eqefOq%}(*!8adPq
z7mLRn{s3@9$D7*1k^xr-Y=7?vPRXT@$%`Dy7x4BV`XrgP_Z7UZcZOM1-Q-G?GZO%8
z0tS9kkX~a#`5d%1hoe7IZdI1dAnqna+;b3DkTJULcR_j1bVSQp96)I{w19jKX)4H|
zUGahBEws!Cg6Fvbg23j63KkTDUID9`p><oEEVH8cjVvs{i0i7tVwFev8y>zoL==He
z*d=##x*`6V{ojSg4-5-Ba~WDUhkK5KF))fn9_LN<JN7l|$bF2sPh9ZNB7eilWdI>{
ztK4A}EdVO`WJG8HQ#(K@6Me65ByWpUl-r0%RYK#`Kv;}TGLV1KnfvDNw`C2$MBEql
zrWM_n(?H5v`+j_C@{Pv@3KLlhL7|LQ(JFNgTm5*nO(R4Bn*`Q+;U9+&b)>YM7WR27
z#l?@cHbYZzC++L}b2@KQMe!{bvE*tXfJ{@s`yXZjLqr(8DlYxYjnTEl_Fz?H_1IgA
zJj0t>S}t*sS5mx0axdNE%@~wV8IYkut&#q5{$WhVp<j`wT^%PzakdiBWKu*p_u;A8
zGEW*c2@+nur1$Apgp!VEAWJQC_$jR@F1{F&SOvpZ7h;;s7xOYjuWI(H(#qCk6!IOj
z3+BSM138XHBxz_Fs<APNMHv+Lq=lUhA}9eM6hmdDA2;3!jxRWT?I^foEuAs;#heNK
zYp#zNQ6dNjBZsa{9O)Leqql8pe|<k?iQm}pcyZthy`t5x(XAPoD)IR@+{g{AKuBvF
z`M4BsMG+!i1FoESJru=Y&tqF5t^nq*!j{3tB3S0*q<M4>w|N^;?pa>Ky_JN%!Fo@}
zi3GIgDUe=^WN*K)k2)It5i`yt`m8)d0nGZ(DdP6NaOD)d^jfOTjuufU1+B832%eKH
zvh^J3kb|Kxv}K&SRmpgDur9-FFwP_u<w4{_9gj@6FB=Y{xRmqg<C6AdQQRWzsu|O|
z7Y+*VV-)8P+2sBVp`!0Xdha5&Oi6dXq>7C;W`0eW@y_S8w~#1I_tn$>;PHpE<K)nx
z-oMhGH*GKy3SedppW2hbs7P@o{+=(3ox7B?Fg;aAQTsf7GiX0Vdd!G|6jbd#e=7hW
zv3FwC&`x+$ge@FnR-#`nsLDx!_!BI)O_~+XuRtf`gi&ve*|3t}VCW|d@{C9mikUO#
z9{zPfiDOOHr2Caq$80Gq*_zM7U9vz67YQ@DrkH%n#V^r_k4B0OhFMyBJ!<?O-eLGg
zbErij4O^N4#&5SRq*|03leBDUk$vefN(1GEza<I2f^Inzf0|Sc3I*<8K`}y6mLj8$
z<f7E3j@xn1kDv1*f-OJliICEMa~Op$8Et%JG2m!X1P%zsmzi?aUe@j!a$q3)@H>~B
z((T2N@-<%~lMt1T>PcgOxEu`s;$*D~`%l^V7h4YsB8;+*I%#DscO9ksgJICc?2YDY
zDF$VR-{uNcRkbygu5uE(1>Ha>Wl5{6eLLm&4Ze+?C3B=~ExC_NbgG(uN#J}@|3>w2
z*=r2ZH6y9~&1<J~PNm00#2|?SKy5%$t28I(!6B@T27RpBHgOSBm(mG(v}X-IipOcZ
zNgbQ|_WP9rrmZTXK+3AoL$9Dw4>-l#(uPK6EU@9gW)P1*Cx8$Oq9I3wQLKopw%G4k
zq)IoU91`@W#pG4ypSDz+TQF@UA$}*E48A?IaInhSowTpi#nWBpVltT`qE0&#tUdh^
z`dK`|Xw|-8O5;@bmzl2NiDJ#xvq4I(V4XUUr&fW&Bdaj8;12xYhxn;@aySvb{{bJh
zt|P_(6}S8^!&&rWvmkon;qJ>KXr=5&MVja+?$v73)601PcI<m+|FKw)BK}r@zDM-@
zkC!2VT`$&3Ge|w;!Q?SG0~jp>ao0!grez+~^Hi2PMw8+Fat~<#6Q35HDHaodi)Hh6
zMzeNP<#yA$Krh@hOzIsJQB5co27MDa6da+cZur&rmSA(h=4oe8$gH0rLp%{`pXxNR
zA|yC7Kjgn|bZ(S7UltJA)c6@4RmInfbu;3nMFg?70u-cr6%ye%mF%YX*;}5|ZUOpa
z{17zE^p5V9@65*-H-M4MZX4)S<!F@hC&?nh+QJtCQD$h6+8qTj((wfcLC|b=Zmgrw
zAX{<;0K($YYPtTbDduCo32kIi2YDyc3uf^dew^kGB1iXaZB+n8gb$n`(|z^Ro>XwP
z*WPV8M(?p&?Y6JCyvZ5vzl=pV2*8_{44<eB7xbZZkcel~N~h`v4mRiGDChDQX^Ur&
zT@qo=iv0o8ro+OD!wNYyE9I2@oU7nyZ}{R?P|Mxcy{q#1!n#MN>rZbA-Ld`Bhk%Uh
z*FGjn{V^O)9^{!uAAIx)E_2^56P<@CPsxq-e}S02ar*bkRs%CA0grKi28`OLDo~Ux
zyoKrf*T(l||1_Da@>x3J;L|ruzQb=27n)z}MLP6Dp69lGvWv16hWAP(VisyusMQt#
zzO82A05C$AC&~&2nIcTOfY|Y}A}YkMD_(h%g*DWnQY+*z9i8q$1!t`6k)ipH?vI@^
z&!CFnvC!93FC;|)f(W6}W_%kqg5oJt^NNdtP7}@P=0q%pJ5(iCJiha8U4e#O+x@Sd
zVFVQ?H}!$|Nm&|wQ(K!KNedKhu-nE?VxLZrj}>yt$~6WdFl$}-!H+eacdJ0Z5^v@m
zVgAc=;q7ziF3b9TH^7abp(9(+zSPs4d84V#)WYvzn<5c@*vmAIr%vPL&X25dEcwB3
zyZ<whCrsbczJN&I60098Sl?X|2~WERTCQLT;^r&-a94fNNl&Wk%A2TV%Hxdl%b6v6
zo4bH{#-tX*v~mBYMnrnx60`MbRJjCuB>f7^1!pBWsQyc!cK*V(%BOmmkequX?(Dov
zQv7r4Ysknc06vN(!ia}CcwYF9x8S$0u*%9uyBsfh5H=2U9{JQm)Vyy8QkvxuEL(-C
z)>v8t2<Tff13`s^0<Xl=W-q?dPrqK|_c<3hi0o6PKr7u=)}MRAe-h0-uk;CIi2^}i
z&Y*<t0br6sQF+V>)6aV0#kI7fLr=%xj4=BVpM}pq#nU#}k{>+?z8Wilg@)zWJdGT9
z{OU?k5qu!(=|~reh$aC>!?YX+KI-a3eyf2}^23)4CJ8E})E?tGe{*W8K}G${K)Eng
zjXv&D`pG(ITa0^WwiPACZ~XfWSL!c#53`PcI6VtQx$#3UdbCj`5(fk5?W`m5?q0S>
zYh0SI*!r0kYQ?Jt=Bu5`jUmDp%@#0#icz_BU#6@ursB5<Z?cBj&o3DQPBFTT<LCmr
zU}0)HKERke39SLK=^GJEW^>0Z`XTB+?avCI_M;l|SVGd8NX9~1N()u#`LU~2nrWp1
zMYvNY$G)(!VE86HM*%ocRPIkdG6=6Hmk;01ce1;sQX!!)UnBeQ$S(Dxr<Jfhq;dJ9
zUgNKS5M`t~hwHkV6mL>h89LrPRq`j7pT7(*{r-wd-jNSwPC7(?;lx$t{zqf7l3^{H
zpQ<}S56z6}5ag=4yfV7Ge6fJm&+Tout&WyTx{dJNs1<VBOqaYkUwKnX8}QJ5sUMT^
z(^5EfT3*EExhJD_xAidp8i;(ac?b)3gYNn7*j48J+q`Q|gsHLWThQ}P%+A2+JPp$G
zKSZ(floCu*<;RHf=#LP}iF)-(_$7%}__3PL%o|1OLiTPM+5)7t8c&tbsD+aRV*XHx
z@OnM0;2tYvD6;F<_i+ST#P(V8Q1mm!y4g4>hPYmR_UvB|3r7+~nDCj!;p$-k62u1K
zX_!qKw$~gHs^7aZD}Z5j<yHo!6(L-4peJ}Z%<-qx)UUvi3<a{{F%3-5J^2cTO*zEk
zSJyO)sfo$W9z?zAxw5mmhKFfuTVU$1yAH%+FtF*Bn{890nub}PjU*x*?rOnUKP+vJ
z!VP@0g1kZ(OGH}^$7gMcY80JIy#asAt26&AW2AV1t!tKk3NPQj$sNdkao;9bfc_ox
zbrEVr^UJwV^z+mcm!CgVmWrE`|IM-Na*~JG@@q~Nt=TFWR^5ec3?BWJ3+==|T5itp
zkP$yrobNa`FPk}qt=**)P72F!&Yq@K?KLi0S_jby78VMh&AWk!f*&6$=wdOvtZ>na
z%N8Z()-%;S@@R>lg0LorMEGG7NOB_wcTJefj&hC({;@h2Pr8B^OdX^}Q!xqJ)|wD2
zE;caCWVM1VLP#N_+?bg}5Ay2(Q8yR&Htg2{^N#nkF@*A)vb^h8RT!OsR1~F}9I!hm
zNtjYy4k*9p8yOc!4sgzie=>l_l9sNLW74O_o{#%kgaAZL`ll7fJHOTRSE%Hkqc%)!
z!MXxY7O(}DZQQ)r_Z$vWiv6I`-$Ga+GAH|fu<)HmhXdDGo+Tp47bpQ8SP?wd`tuzb
zWFGKmJkT?~hjl~u+4rH(oIB4m8bJi+Ta|2K9B$43<LD|J;r{>sg>#zeZl-(F9HvcA
zO`Ktvu3_p<e@u7xuuXS67J6!$Iny!S`MdA$UwFS?uh%mkMW`doC>haoGqVEUuNXVH
zoj`?88g9@D1pRWzkL!gg&^&x%HvzDJWW0PkfmwSwz1ODsnASR7m)Laxl)c#4v1$IN
z%<_XzM{j3Ub^bvj2Gtj?5XOT*HXM)?@~txtpJ&d7aTp_L7CpV9?Hp_qniNqNu1XQs
z>0Pr6sBjw|H?j5dFc<VkHv?ux`{1)1u5(Od^9TFP*N>(u7#hwQt|$DGgs*~tJhm_M
z<<)h^(zsZfWn!zMjC6-p85U=&tLUybAi$cx?A}vCs~I@oGWnOqmL6O;a?$i`P9jsh
zOnc%Tw_Ql-gEIN&Mx)pFEsG>o(e%D|XxRI@V|fgl6(l4#UP$z@gk-hX_?JfrnI4Y`
zIfo_WgZZo_B$OVEpywGbHndJf;Hk-wu#*n6Sy&|>V3B}i*Wzhif}VW7D8RS2jpFl+
z5PD+)&pE!-HJHbY`2&tgw7O+QN*dD}bpPv<DJLvVUQi+E351rGf4cjs0`Z{G&1VwI
zpHh6wz0#B%ZKBRS!Zk=)Vulns-W^Lp93>C(=X7biZ!|)2eX6;QyOYhT*@lPe?AAAQ
z?LK$SyddXJESxn!D7d8`yXK=ajo({HcXZ0-%R*$%s!*dk;8{8B@As&i%3xC9?b5N>
zjVt>Xpajmdb?$GcQ3yyxQM?8yIaG42dQ7*G%Ghycj7H{4#sSNJ3?k2|Vf~BWF@0kK
zZqE663X*&+<Ac|~@soG;d!j5hlQRgD@8pNh**%RsJmi8G_oQLMgWd0O6v_IyRLMXD
zJViZIjg*A4+_plg2Y*%eo%V7+3nbcH_NGFESV+I#Jx3&etW(3qsJ)JLf%sC@{B`lk
zb^aqQETPfK!O>>w`n>;1OzOK3fIt|PL+zw>qXdtm%X-KAAGN?H5D#`qO+WpYR^c~K
z?6!0jel!z^WO5eMuk<j^lobZZfnpzLybe0Yg|HiIbY3`wvT3u7HN}5WqMUW!PSpEv
zOaFu>2GgJa4>nI9mnGaNs_iI&Mf`IiAikjav(#NSJe;XsOXZ>6;0y=;xs;=Z!xgYI
z-VEy(ZrH|x+CK4R>gE{tU9GQ70u*%b*#^Fk1WfIYvhH4t@1A37z(yB75#1|O_O@ln
z3w)ChirPD7_l+==1#u1R*6BTi#5py|XoWjXb%dnSRhZJ4(r-fgRP+SCfAB%Bh>8-+
zrNQbv&Zdkc&!IE-`joF$lyKTi>pLKU3QcBVqx*pAPhHp3XBfx#wX|^(RcH>1>M;Ps
zIudU*3y1n$^pG9FJu#aM8{3MHW4uY0Jg&<)m(nM;7>s&!CyBY&8s}OB$dWV!z*Bvq
z#igmp&IlNl0unw;EzeF}BWsYr`^;+yt8r*EmMY->B8%tjj%Ze5x1qEE18Mik=j(!q
z+pD{rR{!C-ww5VL5bw+6zy(8%L-hchhMDqbijTNuBpZ5qrc~EgTmm)zszksz)9&K|
zj$#Tse31fdW*Y)u-|6O-u--ocwmk*%8Lx#TS{?gjp`eGuZ@g3{*21v{E>5q%=32j4
zOI9uI(83_7yB|D0Ilc(~{3YWKrzj>oI@MUA<tr@AlDI0%HHf9COu5>Jc>kUSS9~T5
zED%Iddro?E0!{TCE~^0Z$pb27L1#0D3lEW|_DPE8YNNO%oi#@Z3UZd+d}CuXPp-Pi
zBPsDFYEt(zitGQ>`j%>$={V<?e@j~^RBR^-9XavB=N8Q<Wqh_1qR?7h9N>xwPf?yc
zW?)!)74vx8gX?hlWm<L)k{{IZW!UGRu>S2f!M4vtBOpu<1)}jb^9!Q5d1FY7MWb6i
z-WLU?h^Z9JT+>Y~6w4eZxWn{*-k)8a*gAf-^To&Pa(|I7Bs!Fh8i8<ZX}<<cKN{At
zy&(Nhjq6h^mMN4)qlBEBfQ6fmV>R|~(ZWg>=}e=B(si_#?J~O!{Px;e9%AM|bMi}V
zFR##XN%-E);fCFONd2fYR<joO(|9fGsI-VeHX~d&lk-#k{=qq*5|sGAKHt~($>Bd9
zorrtzckdv<8MgVNXl}!C^3FYFX1Xnl!q+x=y!y(Nh$7<eT--gaeVi0}N4}P)w`6zm
zua00ifmF&JaWf+XX3Lf!+B1^Tk)!+fzkhxqv6F3CSs5*8aDU>rEsYTu>gL2E5AbR)
zDnP_$qHnK9Gfskj9z&{wtQLMdm}BCw3NAyj?SNr0)4pIg6N@Om(VrQ6;&1OZf6Cin
z$}6Y7K=B`kT!mN!DfU?xhohsVXN}|`R;an=`c}qSpi?|gb`;*ZhU%O|Q;}z5PZ2CU
zs+(c+%?gm+2Ew@S*1AzIVk7En4tt6Muht6v*7`8eCQ``QT#eywxump~=d)_kX4Ima
zj*=>!t&Q^-!p&~{Zp#02n$=b6kKV;5Dzo$WZu$cY04Z8c!@Di{OP@^U&hMnVTg{hz
zY^erFrwUz-gZn>?PG4B*i7)iX?nqmRJi{F&3ou4pp|r^U6XF=CV<?UeeeNt{>Legz
zh=(B4U}3}-_-HtLjmS9^?gL7oaI<GR*=$Nt-FfVA-R=3ZhvN6pi8oLabFGHIVL=3!
z?=i(fsS|T=dV%Zk0rN>w%=lk9GS%wtH!`^7Ydgp>$z$_@yR}<Mn-Mq3SaGufH2#So
zP0k+clQXWRQlnY)+jfW15$4_Z6WKeMXDU9S+=rre_Sq)!<@Jdkoy4gbd_w_V3mwVx
znC-fLV|18w3Hy4=P&H6O6^hN``2v}n7;k*>=HMu!X32^%QJ_DJd|GwIuGl$EE1N-O
zu$4-r8qdUWBr_*}Y^h+p-zbkBjqYf{6bjqqR9Hxdj31!F>t@k_!9IZn;cfy5lR||i
zYxy7ffN#FUXG{)PN;N)Mmd(G(G~HYVb7?`e9IziS5Nx0r%Q%Y5xaEgl)(ySmFA=S_
zFJAv8NbE_tbaDSjQEsUvnXaye!;0hB^5&f|dubnubE5TQv;G&=h3sl9eIZI+>sWZ-
zMFS@@Oq`!2N#K_(@j<4hyysA;jfyfHre^YSydBu{ruST1>`*OEOogVL^7<`#n+of$
zH;GUBgsHjq@K7+*w|flm@P6vCm1(PNSn;I$B$+GRe2bmYr7c3P>TpOSgLz9ARz#YK
zZt&($ly0P&A1L}TbfWrd=y+%Mew!KdxwEs>VPUTIj7zwjuCiRxI)}q7B*f%!)Wk^g
zf;ol+#K1{!J0TIWy@_l`gt4yWvMPsgIgpqT&pvmNd9$_nh2)koFS39oh-bN6@>=z+
z*2qrs8_s2reFaq}HhJkZli{^a7ukONV1$6DOq6*P_HG(2^Xiq}lY+|AcHZfl35&s>
zt4V!WMkVk01vCskse`eRBie-!?YV1ZpEwXZ`OD-_0a{P`qjR#1l85n;M3wa5(Y8X<
zExG|=gM23|Q=y_`4Gb*D23x}-!b?4G!p8u;+*+rfq;IO;?Z0{1-1nWTU9CT9Mk^#2
z0RH?*ukz$CwL?>V;1}|k6p>qT<oqeeq6NqhN202=o^~_l-&PV&r@pgtCS9+2Jts*o
zuMbU>WX*1yq35Bk5*eG4>5gPsr=Iq;=}qyxz{cl&-@Xmg4;AEUs>m`z>eNIRp5bQ?
zP8fmRzczo&e!U@(`^hD-(9)uTCH`$k^yP){e#V~2sbc)Sxip6-nitkB|4UP$fSHgO
z!jk!Mb5cSwdbnY6C%Z)gVh)%-37&TuF~B4BmWr0bV<*WYG7}YbbsBwZ!p$iqPe2UN
zd*VIcUfidsUpTS}X_aAHPLh8@%jT{-qy&?itXzYmP!rgrbW<WXiwRkE5%KuK$3{5E
zhI~U?o#b6kBqslcxNm&si#D=gLv#PMzcD^JVvZlRq0>sNgGjN@)-v=;=tMNegM#$H
z?DQ||Wj&P;;FqGq(_7V9cJS9=oORlrbM)Yv?Tu%Kd?=u=G0TzDg}fFu981ORq2i)y
ztpa-_@oayfjX24YtVL!G5U?1YY~a}}D43Rcx_HO;b3C!N%6fa`R#C(~5sgyd7PrgZ
z<T0Rp!DXtGxafuBM}qePdM3;<qe%1p9oLZP)J?7tuO2gDN)yS8FS?5K_VBRS1{p%e
zrBepfe%sOe4~P74dg6bitI~CU1M5ynO=?lNobGp^68f^jFirLG@%2F{;}s$-iBe-d
zR&u{SHp2R}nq2p#jKA)+Fc7;Was)rozW9Qm7{dEp`ptLDTI&{yA*~4SGcg|=vi)IV
zWhD1@;bP`9-)K@)f4d<8Qz*v;s-NJ=l6mgLyNyKK{0hu@&otX@@})eMB-+d+S{tg@
zQ3VTq4=ol=Ik=5$?#ua5Immc8yp9h%yF^@=H#xa=r*?f~K_L%Qd_ToSa02O5SLcUA
zu_>-Xz%tB^+4k5X#4F^6?toa89Hr<rUUfPz>p2OI4hWX}`Fv59epWB!xhEqbmW&#q
zy$o|0=W>%-f}Pk{Q41b~G}n&SVls)9NMhV^d1LqdJ=qZwLMQ_Z?K;#v)xC8X`5FIw
zLD;l^(^`lqav{Sw>GNAR`4>R)aW{qZHXQhisyq6WwbSyo%y+-`0Guh>!*q^~hvq)g
zSSy^>78uDt@C%s)mwvQRA1OOt*1Z{jyb6H4^YSCAP2c{<flNlR=sT8I-gF=HIo7J9
z>jMeNae&bhbYDu+L6n|lrB9B=nV<r}vW~YEYi=l+SD$zUGj;z;QDFqPOJh8m3i!Ob
zdqW)fyi;NTQ$IEpcvIE4@U&U3$fv4(-*|Bq^3z5#o++9cc6KvhWBx%|u1nfh<D~Rw
zZ*pLm2NHrjN!@xV)~3@dCmh+JD6L;HM)#os-@@e9(STzGCJ&}WaIt3nf5D1G^l=nc
z;Xxo8FY6)hNc&L!j&((Pq)vH;C<1FXu2(Oke1(DC%%zD^;VWdq2!Omf#0<)VA^1PS
zv_%C{i;LS3!*mBFp7L&8;dlM0W1!8Xd0Lqgh~E8PA5RPi$hL1|oleDi=u_w;zE5It
z*-(eznC&}mld-170lsjv0b?&1u)JUIH<B#V@p;_#5QU83j3-~@j4ZGY(qiK7o7fX!
zi_-vH)r3G4vg|;FC&Xr_jj>Jc_uf?2W|<PL*f^y(NUplkSs^P42sU-UNzK|-{F)~W
z!U4oUMQ&|CV*v0>xJnnHLjaf8%T&eY0NSlQG!|KFS)|FW#7!lT6vK7u6AMKp@{&n#
zXHd|4+O?j70m!-!Y;!Qcl&@W?S@qnulz<?G?PL>CqeyD}>T_m3Yraapl&d*beUD(P
z^9;nfxLGT3_CV_A8$nv#wH?T5|0Emgn>-+J)1EYu<4Jlk*WM`?DDvA~gHV3j3vJ=I
z9ecFt&T%L9e{K6)iA;s&DXcOHg>_-iYi#h<t1nB2n&Kg^wik!&@FzJz)a0Y06bqEe
zV~Gwe<L}0bBTT(p^Z&CM=mmHR!DJ+0GStim#LR1$mZPGKyX%SYx7JR#rJ0Q;Pwm8z
z4|`Z}_b^-mj#Q}H(X+(g9K|@S?-Ux%-t|m}Mw7!5U0fgp?5N&tCtfkJ=f#I3H)N>0
z`FH30D-fdR<w4>|F%C5I++rc0gRcJbS|zFpn_Zv8li^sW=?bq#!BTvP;(1-&*tYMR
zz8ZaS30EixyP`MAcGvw`#O{CF%r3G4c<rV4ibx2EbIuZ%<;s~ONWVl=%8(pHzb!UP
zi?cY3QNkMCZslWbW<maS@ZR~-WItzRC?-)Mig1pX=bJ|-#uMP`^fuX%M@kLUKU+5|
zI={IYn<y{obT5t$yGZjfSy~@5(CuY}Nglz>QdszvYIv(ex;MoS958*mpMw?(Nd~AL
zy1|0Z+~7bqG(p%!XrxC07CXAq-Hg9*YOwh|zQfbUs^%fLCUP*7@;fVHJN{u6g@llA
z*3Sc-keu;Jk#sROKN9<eg|sfB20eOoh6Y{~GTYQPw?+ZXyf9pRp4yY4LgVl2N}kdb
z1KlQr?SU?KNRqD)pQ4bej|4|qA$SClw)t$KRLeS6l7veyuwJkpX7InBS4973fTNRH
z;SteQ6X7XsoAj?q{ZU#L?hZhG`#J}IqS|a7HL5gWv*YjPb#8iTnO1gViESBROH&?w
z$OMJ!8a9tSQ%SN{3F!vu;-552J6NaN3VFt)CVpdCcP~UlNoZei{Iw-YQF<0U^x~Lf
zE%Oc^vtYV((I6CH@1K{#ee!}A#7Cp<;3m^vfB?WsA6`ERk498{+SOD5Ldcn82*wf3
zPcyTvL)s0=XSj9&8QlaX?K%v`{+4<E7`E-cdCP7s-*8*V>@%kjw;=?$yE9n?#v&+C
zbqYd;Dz+5^WYp3!luj+1`Z|`e+bvSY4!sTA|L8NyuL_I7)oz_KkNyg;u0<(%(VbBc
z%Ts>|=^}Jolwi>PE1MX}HC>3rri=zzk+5Z%_n2761+t_wCq^o~oPODCsTROJ?j<Hv
z;xBw_VV$pFW?U%ud4l6*f+8kUx?b;fT=`j-MC(^XSlm`aqu`xXZD0+Ebo=i`o<FQ{
zy7;2VI(FaN$_)5&0^Iw~dHRPb-f)x_`x=12oLTu*Epy`MYJRLA(V`!;9hwF~|6z(J
zka_MJ8vqC5*{+Is)t>?g=rhrsEu>)if3yEzv}ql~>nh0y=m7NOrc7xd!gm0&$wmn)
zY+aj)5rXkO;4)3&qCwwxEokOWw!pU%5{A<S7ty?i>@v#JGpj?Vz3WvHY9dm1YXCuV
zRTrr9;3+a9Aj$p)thV|79e@IqTE_P3#|X=C0wCd@<Y*@ZM8E%J^Vv|iP~O}ApVMP~
z50MV?;aur-wDR-#35)*bS=z)`$vs%+SEOh-zTajQ%08GyFme0j%=9+DEn#f+#QglX
z%f!Bu&Oh%FK$yM=ak)?u+wajORSwg!Vi6W&2G1CWmgHKQ(oPace`7qtt8?p{M}FF2
z$Lvqdn=1of+}1-U)sJn2fMUqfW0S_`rjSdLU-uMtND-6**P~mmQ(gw|7Lc&hu1aL*
zP9y&Oa(NHf(6HX~_3EBn2y0BK^$IsYK1O$dtTld(dTs?uM1%+nYU&9|ygOtgeEDVU
zV=+5FD-Vm5oLM2z$zADJLl^r$sfyLG+Jygr@kPdey|v!=j5mwJ`s#{U6MHY@s1Lx#
zA;hiMVspOUYyR*x2>Lf0YJL`2RjqMYZ40li&Tty0RvRer_Y7qVVFnww47)~00ewXO
z4#ka}Q40NIdwu0MiGPcl&46rC8>TDxywnwN1FM>GzwO$VQMJ^SRlcNH5JUzo=qf$U
z|A|ZA3JY7uyoiW=CLHqAdWrgKZjM}d??`M6zU)^>v?+$|A$^9>M59yl>HXkfTyHYg
zhWJS%y)Jyzjy!H-`pch|$^1^=aV}peF*M~Ke&tc0^P|05mj@BOpS~ylFM_)8;j?|z
z1$L514{$T&CcEt_De@iL!RwO<j`|+q4|nUtnB8}n>0?zn^74TnLrD4LF*fb@FqucC
z4^?G3)QPTB;flNKj^}Af<$kU3b1=_{3XYmS<dzqa(DUx;4(2UvUr!yvj8)h5Cvk_2
ziU$RsONs^!qDg1dnga#hcX(5wiWc6r7*YHzqSx~H%IZ7S?>=5Fd<m{Oov}5)JJxY#
zfFb(oUX3de9&CAhdwLqPGW!$85{cdYsGsoTbYH2UBNfkNZV~+6clz;H{E0b0q$V`A
z<v%{lr;fh1HA%2o7Uti@e~E({KnrhYF-r%K+*JZ{d2!y~u>(@?zR>sK-l3}&wIv+8
z7;!y1XCduz&w$ssb3bo@3R|i0J8)t$h?HKszVIb&LW<U4&oBb>uMbfNqk(PpD;5#L
zCYV2cPyMMg^vm#1Bd>H{Z<V6yo^k_T?gKE*+5!M;MN^N$gll_Nf1SE96nj7q0Cp{W
z4+Ps$zrWhU>24{O<DSUCR1Q|hWE9eA<c#}<hPem_hSMxDd0WTiu<f0S7LqRyk8YEk
znsi8BCv^@&Bk^BwfrvLPfw>Qs%-QEH>b%{Kk6VB8lGm!KSC?uvRHgs@+Cu2uDRG>Y
zA8fFDr#{RUDvqpg+>GyvJ8p;@3PuELnoBK9d7)bFtzb@^A#rhAh|7C1jC+~ZC3kc#
zS|6t%Zm^rT1Vm-JI#EMq*v$h+x4JSQkjBlQ@t9MSS`=^Wuz1MKrnT{t^<vgjK;O!A
z+e&M@ST28^DJi9V;sIbZV{Nm%c2g4h7)z0jrZNgE10V^e&30dlC6=i54-j&!f06AP
z_2abMXj>Q1`<J!0weZ2E7Iv6%u1|2RhO=|4D~Dj4?U1AA!Qh_Ixj(?>7P3FnqLz5l
zSh;{=$|JNmxaNKePonUwuLHSqbG)Bc_y_yLzIGSMSyyzWc~XW+mWOodVNP9ury(>N
z{dHLN)%7lIzZJ`)<1#>Tbh_@qLzw|>t&727O-YEQGLJX0c1f_aHF-Vm;hPJV^kfi0
zy=^Z-AR$65pCRW^sY{9ag!OIS0Zwo-H`Y_sR)Wvb<(V5sWr&mg+#O9yn|x|A%*HAB
z{V$iX+(k>tESQoq*~QYIjvkxmM6QCgec+E+bnVeQ^w}d$bj$=z69CTjLKTamHK4|*
zH+t)7<FVM$L`WhMhgK+YAYM`sYmp9l@;3LR)fC@aW*xNbK%3#}W^aWbc&*c3)8Iqn
zH@31~m9s4jW%XOZ4`-NF{<IlUd`9X*KR8?%8cP-^$N>b`AjxBfDW|ubUXw%vQZwx7
zzsFA`v8`~FlT&j<gyMFeVzvS6dK7@wyA;gx729IrYlW46KkDp(aijt$X4T~k*U(6~
z`!l8j@g=$oco+A8nwoe*CMM`_Bop^vEMw>sTvNEv=etK3?}Dc=|EJDw;Ma?&8Kb|S
z64zC+WOQ*cM*yhvP+PzG_K+9*;l71CA?IvD9}aum+j0ToIm$NvBTRJX8<_4dVphzO
zQoR1nvtst+xTWkF2}mHH_0uc8^y2u6Aze{BQxarq)puR0T&tL40UqKbe4EHKHUsQ|
zRPhg1I!51$K06E)WY*~8Gz47~hX4@K7#q;ssT(UH9}l~557TGcd)`j^LL|0t6$|g}
zduCK5Rf_)J5aIQZ(M`Bk6s5onKtzF*5A-<jDBiz-(E38;*E=n!i3wIZWg7ED{@-L3
zyFp3~2ig{j4SXP95O?hZG!a~`*@Qo{1O)MrKt3Fl0*bd@fyiRj8*gL<<UyUAf*_sy
zAm%>}2YF}6{4onkr}y&P*CKi1cF(Jx8xlu!iwo$+yMCm)^WifGbpLe&9Ny=kemzV3
z+4b1>*U6cr*GRx!CO+70m(#dwsb#yf21Vt^jsjfo#Txvip@QpPWS03aK97+B7b>IP
za*x)!T$t2w2f3X!DXo)Zlh@jj8p+kAsi@m{*8hii@;t0;Z!bMb-P!*qXN`>FdUhlc
zbbf6)&ps_`{*I=wC1wd!?=wCri~1x8&A(-+)wn!fs^}rcJN+^MWCK9Ey<%YC8`-fj
z@bEBds2)#tNH4m663Xa3i-7h}WrpBj@Lu0w;?`pU_~Dn3c%spU+vzl_g<$ERU`rSK
z<h3v``he5@vKmB=v7+pgMEl5NEj^yQ$6J5M&6EB_+49LHb?Hjg`}OCH&;i?M?|d`>
z`{V)Vt@f8!8NXwf$vAHEy$%DPB<y~j^^rk(v=&4Aa0q;kh6S!goV%wTEyG`nY$z&V
zRm+^5x9`$Z88Fy>viamIHKf=yr597KEq$#M|C-;6mu<;W*IEJ#dk~ay4;0$|`h)*A
z=vl=jbaw^jwOY6S-`#aYb$54AqSV*lTMhwXtQfx)9B&*1_)v~btaJ+s!YQIu)hk7X
z{@^%2BxNQdd-?sgkTCa#5`IqCxA=_b$IbkYkpL4<^Za!CzPvFWlA@lR$`IHe)!j5$
z92jG1jCgdNbNifCqf%D?2ipB_It1jmz4)=F&6m#a@sVyWP@Unn6CdN)FnjAsErU6Y
zWy(J3E|1?k35bN@%pZp&XAV5hUv^ZjXC4p;O}#4oz%#{utB0609OesCs3#<&;YfN#
zl>9>m`h95OX}P<<B~4$lq-VXlg8%!K3GG8EHwudI(K)$bo_cfsdZB~`)RL5tuhgQH
z*Ll<7$DSg}8-h(JTF1uG5RLe)M<D^X131Q~(W{|FsXdX{NxGd6Cov#GMa9H+zVisK
zUsNE!4J&Xu)9~f(PXkn13-Gnh*50vPJ?v8%@7TsMx?PZIfSIFq7CO`Yr1dOsCYw3`
z_WF}Nfpd2v5~Q9%{YZ|1eQO%`h$hr0ZqMST;shLb$#)gt<!O=$`q5MhS;FtJ<T}F#
z|Keb-qK&5!jPleKfhW>1#Pz1ki&BS3xdTv_eTl>&db?23@HTQmjd#${2~jAWA~d_~
zJca6&sO%EkQLkRcR`fQ9LQ#L@YJ18v&z5C3BFiks*x`QsYEt9+_{>q~I!E2XW27)8
zFx_u5q}d~NI!tIqI^#ScX|`~H@Y(mNa0K{i=ot4!*1bn7_tf)|5x}tK(5{1rN9Wo_
zX$3}lSV5S3%?RIlnbH-dHb(WICl4n))D{{bKE0Wxd$N?KikyA0Ltj3~!#Z>Fs*&Mb
z`Z3RdPOdhU_RbJt`!vf8sIpQp9*{U3u=y)udiFKs&q)gE@WBFOsw!_%SmV|+^*kDG
zkOx=f60|dkaCFOAFOPqpej!qUN1b?L10<mLiNohZFU<Y}HOQW?<h;7=vZR(EQ8ave
zJmH=>@U&w$#9s9WI{p)P`J9MG`#@RxQ*YA@`n~~fvxjL*+(`4{y$o9>YZ3JdnaKgx
zsE_99U#su@0L~V`=9(`yEaV9Hu?#T&*8ME)KImJR?c&p0C<<=1;b!^EO8!i)4=-JQ
zg%|%fF1^H6a6t=l*hCG6#QypfwX1P1Tpim|{Krg`zz+ZbnFQx8yw3+$cVSdBILuMj
zv*`6o5idtBI9k*MgxC-V*ayoCHKfaF3`nf4?A+@we2`o{biCcUXWvrGyi?BRY!DG}
z6R|0nDeAHDv~<;S^Hz_FZ#|yBcmcTka6G<8o+r;~lh@qy7x6Ljd2IXl#d8DBeiE7O
zXQ0Jox~st^&oHBUw=f(@d_9Sie~ra~7Uj@Ju5YpUMVZ^K#`jKT?Th>>U-tZp6gevr
z_Z&2fen3QnBn$~|ei79+;O{$w1E4eClUkXjpDYg~S;BuPK{s_jGU373Qx(@2+K?qQ
zcXaR6Cd80nViPnLWu;hoKa%k>C{!g`ZV_x`l=@?0iGJ!An_?yDeA3vbsgQV#2gO|h
zh%!I(B99ZHD6&;%bl0q#{HL&ku|QmD_2@uyR+%>eRCBL~R>F7#h-$3pIeuWrm_O!e
zFS@+W?dba^=4IsX86?;(!<6tmg!67;*$&Mw4-7<yfDZ!ySfv~MUi{|~szvd+ar}oL
zH5Ip{Vzu779ePx-HQl%xJvoHHD<#r)#jCQyaO2y$-IP&xx!GWQ`{_Gz>DMDvIx)qi
zL8rEs>H0{V#l?3lV^uD8IB7hM6|rxIX_^E7CK|+gt$rTE=8;(A#LrdhcNF1Fz+xA(
zxiS2#=Ak@A)QsFKz}l3BpIlI&vs&!7#!vs<7dIxZ-4R|NHVKVAJMdpHw<Sq^n5uVA
zt-A`Lst^*#udD)<YiGeWD{OL|^6mIb!Kj$FTf}V$K%$j!>FOnVrUS9+`lt5$G<LSi
zFeSH<Qm3HB)|mis>rqJP5|LK0<b?%m_7k#xtZtWwZR|YPA7`$Lz0<r^#G)^>5tDYE
z3ar*~W-h`^>~Vo2?*>fFe;_Jjk(xp%vwUi=kF*M4iy3N}KyfuI=d7BNZ5bP@x6%2H
zlb)8)T>a?M4C})AH4vh&8%o5t{bV?2-n7Z5gMy!uS3k|kzu+~n$!uu%y@#+S9RXsL
zpJLe6o^I~Xt9#9-Wbf`vPW9PM1dG3!-n;j!KQ>Ux12KnMpL01IPD|caM5Yr(BT+kr
z7U&1z67?z+2yzH5zT}HHqQD6>{~UXX<YmGbs$ud>u+9#0E*RPlg+T}-&cyFGZBxFr
z4wYqxUNl0zQnS8&yEZ7gV1g_3ie5fWw$5aZi%XiB2Cx#Yam!*NIX+_AyI$W~;;8&b
zS`TX^4S>-tixPM4^dpHM|L5SjRQP21?A%3n@K5>WE9HvgE~i`|Db#i@UyNmz3q;_F
zaT>u^Y1g^70=`JhKT$Y|(`m*9;+OtC+#<ERTgr`j9Yo%DGS43V?s19UT}pj%#n_`o
zTs*C__*?J1CDc%^C?8KnQd?!>UV}nggcqX=7Gs*ZR5?IyF2WRPHlj`E8w*B`Syvj|
zH=;~>UAwW)e6QS9JaIa&x-0pr!WJ(-T~A*3Jp>RAdBrL>^XcNdlZf{Jc8ETGPJ;UU
z3Laz;7gD0{U_wr{Lc#>Nokh3;+=LqN%&(Xb4J$-T!Nl&TEr<vHM=zdJqPB(C>k+WW
z#bMNr8`S7eY~OJ-gzOD`>&vzCl&V$&HwkP7AD=+GKz<rRGx9vwMxv_>VcN`x<NSL%
zc9qS5f&}PZZrm1}b*5LXT)}`vo!VtmK@m?#uFJv8{|%2a{YbCzEt2Jh1OTk<;r81i
zt>}H~bbq53hJyol)n=Jo0F?_EFY_3RtF0=1`B<@R<QnvqcmDeI;yYySXa}BdtwlIt
zq`5rQ<$euJ!WYpaTtP{A<y}B`hx-hssPr`b|JPl(AgBTe8%mpa`pNJ(+t?Us;Pfum
zZJ_4t_iJB<*2}1G;kn;n3(`f9^CidD620DVG)p&J+a!p<Z_NrQchoYSjl;eDQhU&J
zh~(ivp74M5%v;j_|GoY71!Fpd9DY~RLD0wxNc+cl6v+h1zfnb<Cu~q07Ga<Z;#eZ~
zb@IEBmLEuS4|>b;u@ouU)B_o#9V>TNZW8NI1hR$Rz_<p=Hv-1T&ocKi|GWs%_C-$Z
z?fL~kTfLyI4MlwoWh-xinP@_%??BvieIACgb8%>tH5q20Tnj+*O%AY3aTIviJ#mM{
z?Yo8$Nt|W}${H7dF2qmH$^YF>_PLG(^>laFjtR2ir(zQYK0^LrH^@S0bItHy&lVD$
z(9n%Hj*g|RRlSyl-|ry|tiVe_c&*ntr~|5Nr$`W9_4}v~EYZ(vPts5~EdV`;t`vlf
z6<$Vc-U(Q0E$W-8bD17X-_D(knZ(1L0~n~<0!Y+@D&q&i?CU=dN@39gpI3+bH6v7x
zxN7YA?MzJfMoR-+Y92Tnfe{Gc6aX9-#%<_8%IZY}N)eP57L!!&lIw?3&*253&P*^l
zSu$E;{3S{xqht1z5)HEbA1N=m-hJ|}<ryGm+3FAjWfqQEnds69a1lpz<lyPH1{m}I
zcJ8<-bG5N`{|yfv=BK`RF)Z{?><$A6iv89FM&MzVpR@?@ubTn2wG;C#;ZX2$LO7mI
zWAM;fW%kc2IqqW0L>9;Q`RuO`8PVNL*ixEP-CuWuCN#)j&}v1i&lOg}6_gEy9q=Q8
zTON>S(MJzGpUj(mQr_&*X)2K9^gMan9wdoNE;?d&Q^*qL{MAl<a=SYkaosRoGqnq<
zx&4Sz4Z&``VPU0Lzf1?c4YwD8alKCB{&uY?MMNhO8fBk66Y#b`>C`4meq|n;8KdF*
z)v$Q@<*V9YK^X*q-Bz!RKq_gU<k2Y)0p3{yGp%${$gXabNB*hvBqJV`02g5Of&s#{
zzn^^)!II-3`91lixu-f$3L;58`puA>&d`KilA>fO&G1vjPYCeIh^q`?Zg7+T!GQ~U
z;c3+>A3(-^^l{%q4`^j7Fec3CY2(E5Xhr4@Tdb?c%9Tvn=8eG^y|MG<uO8SV&IP~f
z>R|EpSh{pr8N&Kz`mIe4%WcSfPvhf{{F&Tu@oRuHJ>X2!n(`2AU!>R8Z?DBAtm+kj
z>$1M3UEAA51aMk-J}^_M;CtL`cU_KUdUH8JqHd}EJ8$(LhTj_^cTaX5R2l3}o^I%$
zu*ALt6FS&KgnkRyE>)z^`(|JwX7G<j7Lj>$ohNFKnj%2zb0GxKS8L2e`1j3R|F&-j
zr-_ib-57}KS}ybpCiJ3Os-(5n>0Qe!`rf8jKAl~8!h5$+T`)J8Q<vPhwKBx{1@*jK
z6laEF(v&uQau1f2gX}5#rWnN_QK*rr7mn@uaF-k7(%vj3`LV>2RGg9`!n|n9BOeDp
z0eJaXSnnrARN5PE^b!uD3V4R2#T+ri2>o+sjM@D);@OvOrAhoEe`&b-0vPt2R)bZI
z%QZZG_j{0Lb>P8kS_lmA`|n20Jqwyl9@=@=?L6Y;(wqTuDIde{<<ve<8<yIwzibP%
z@?&MunrGXJ5MqUsWK*u&2`Qiu2Q7<PzQ_xqibb#MR^1wCu6%iO7p6kFG%?UKL&7EJ
zv6MY=pQa?*DE$W^vppJQeQ8osqK-ju<>cn{i(=Cc1}823T0Y-3?QLFI*adDFmOaXa
zp0pm1g6YTaSp~5i;}VKQ5U~^?zPqXVFdeBEISIsDotVzMSzh|a$DRpra2<?BbGqN=
zp_W%5e}noPV7(ncdBKtd`(L2F708Heq}dMo{rjpP%FlW%+M%ufWUcQllu-a22>^9x
zYjk~`QNp3}4ZAdZvZx`$eOXmq3y_pkhb2-lB1opMX^$@>4?W`8FqDqQzvaZaDK-U1
zrkKw9r<%6x&h+mk0K4qa4>cgUb9{ia4uFUqPOj2juYd}TD$36pt#sSm^#7q}QDI>5
zU6wA-wWWoU7)!^JA*h5uM8HxPKX19MYAM?H5{*svrgp?%O5rNgH{j^$x#rhc0|(A+
zAD6HY(Ias&7by@*A=-WQw*2-VWo<Kdu9^6^XY|d&kF|+UlE>eCPhSBnJ(dF|s*NtK
zpW<<rI&sc9J^K{FkmerReN@nw*K*NnCUhwq0!}oNU?X&Q$X8F?;;543rO2*eohgZR
z2&WX^An=gck$M?T@O$F+18)POzTqXtz-fiJ(H=n+B0V*W<;EzNlHBXHsf|Vgi1v%m
zarY$p$NJNoN@ZIl0O7ia;bs7E)c%uHW8G@C?yMc#q0|UvOW~OjuOGkvy@mH}mg#FO
z&#RHQ^d*bad#X>A*(DeP?Y5BnQ*|c8PYwP1V|SiE`-8Jq!b%LjoogCnSot6Y#(1`q
z&b47?maA5nRccw>7drR2&oh}84nl_CSNeb0y#cX%FQBr#P&YeTm!hAA^{|dC8u?rn
z51zpvImcz6eUN^u4Yco}GkG+EuXUmFe1T!oBcjJ=al>E*Ce;SiXE#XtpU^_(!r@8u
z`=4yv{2H*Lrf1Jwtvaxmx~u#ybD>QGj~}^U1?zO>O5W<#$I_BDK+>N|MF53Y7GJ)`
zOAS++A~<}S@Oi7SXxVR{Q={@!fuQQnQlG)fr3K#K5BpN?7neZ6$NXt*5Yc)k4!u7g
z90sv<?Nc8b^N#K~=$nW=+)?}*<j5k}{c)#muXd$LN`{nc=STV2Q+Quh&XDwKVFJ0<
z0O7WKX~%Qi;G+zory$%*w9f5+7s{A|;!XaU)g8XBgCl_>um&XB+%gQDYHGTvB8Uf5
zod1^>vbl#0=!QOhJ2L6S`QihMcyTRM*Og#)1(4SO{v~-Xab))>h+cmDif3;dV)L7~
z*CC}b_1lef<CXYDy)uE1sITPhuV$V`{`2C25#A2Wp^$xYbXA~h9cOt(cusI0pw|dI
zcud{5A(kKNvQjQgyMMs&Mg{<#-U2Lkkda&WX?Z*t+`Oakj*D3V2R^P20C$a!6c%Nx
zU;cvwmO6_R?dZ=$=atxF%6XVWSrQOQ3IL^<BeO=<MQ+-$9FIV$b?_6wgWsAY8vgp2
z)>tkXlbRa2*NWo+SZZf6zBbRd$vyLDFnmUGQsoE-Lq!?TOQv=b-gDO>+8JzEwfAD<
zL7G9cj-wzaD`;i#v)XfV_pLnCgXV^hGzMlc!xJ;PRw;b-4fI<;sx`$TgBG^;7y+Ts
zTh9+b?9EP_;od@bm&n-xT5JX?I^;6%qjr<c*L=b3TH%3SY{u`GT(|`c+Zlriv6#pX
z!36svpg^-<Ly6XwE-e~E7%x|-)am^3wKzyz4odGF`s%?zQ*QA~0?}P0+y<YR+4T;T
ziE&o%?F)TVt10(UN%{G^Y@!$OVgf4`ZSt>0!V-`3|GSZ|{ln+J%Gl)c2jcoiKVAM?
z(O~W3!FT0HM|lrB6!F8G@4Y>0EK@?qgfAmF0rYb|aai<1FvW>%>>Dc_xC=xgNX1_U
z;@$fnbATl`k9{f?N;U*X;&$|D3zKpwrIm{2F_Ty-Nu}hZ<{4exP`kG5|IS1RgWv2U
z-o9JPm^No2wn#0)%%{AQ+$#uAz%ZW5Y_nU3`O{t2IsboL2C!fGpO14$QQtydL{J7?
z7*hbskXXOYQRpoiNVo7?{L`*ta<88%;ZPf(p#IOyr{NgXQ%^#PwL{kCT!bsj7>h3)
zfg}3w`!{C2cZ-bJPkm(av6@JSH$=A#x2N~SQ`30Q`Gy8L^jc#TADa#a(=`b;L|y39
zBnL8y3Ohj>R-HvjpVdrXtp^qMCy(_|MBkzc4{L@qC_#)4N@0oZ^D?eld>|s&h2}$p
zCt@RM{2vb*K}*DN;gKBNk?J;g$5(5{hDg-MH}TVV39tej+&!;7b<7+aVEqNQzMw!Y
z_yY49HiKfru<3+Sud-XFJHzE%n~)7#2vK|FVhiHytf3#<>t^l}9i9@+`YFWzy)z<w
zN4G+}ueIh-(6BB3xz&I;kQ{-%?@w7mH2L{6uZ*Os$@#obO*aVp149$?wj0myCL_uC
zfqi!C!lee}YNgY7>cvAo@wXU6M6|X5c{Lc^7SwOoMeK}6Q|cgR-0do4?SX4zW&~RQ
zw}_|k=TF@Nwq{~eqP5huHm&l7@R4%R9}Eq7T3eMt!X5XC*1`w@M(@TSvm{lv>NBKI
zqw{=`Lvqv!OdQ1IzN?8LZA3*CtGSr@#i^cYsLAfDr3c;I@FHujxX~>kq!M#1eJM)w
z*_hYx8`5K$$IE#BR*rN1?rr5Echm2NPU77&Sm7BOGwsTv@q1D&RyLC0;k=rP4Rev~
zxvVi|O=g|B@W*n>ur{KGA^nFG5LCGkxpiNIMUCow%aIV4j8G_t@Cn!(9i_xiFO%r-
z^1fSK1Xr8CI>Ako*FSXlPfYA*MLw?N^@|YIQVU5*b{KGafayH(tDq7Lq#a-87~p$1
z%df$kI?6kQt-MxNg{b~`d0FLBm=IvmG;pwBcHEFddF|(^z0z=fcD49B07v4IM5vW$
zDTu1}+!{u7cR4NxsSM^7y8XU>Qyr3X$i{@OYsaYeI9KDUK`r7Us9u_X#k-mO%Z?bh
zL&9Ma*2lHxK7JjuaE;9Tit4BC5OBuD-4Q+qFwYSDM7tH}Tqxt41PO)QZ)oyVPK=Ia
z6L`OaK&CiMMQ(q8Lx2f(jm(*_@gNxcJ0kO~n@kq7d@$AinaJ#hT7Q$Yk4A(<y9Yz7
zKV39g4OYPT)|-jAVTMuH;8)DO(nsQ9!Ad2Q6(G>(H6bw6OBTIv`h%VEz4*pA#iD!i
zbA;-nOzqtl$CfMiWRe(S4JCRG>v$}*D%kl=W>Ea2RS3sXS_s&0O9ue$m=7$a(w#9N
z+1QA^rft({O&tfdZatcRQ#!bfPSP2leSA+NosjP6gZQ)SxA5Vxg-a)V>>k>*`PDTH
z$m{@P8O%r*j+gDe^;2kf3t)et_nsdJ$*z>etCTIhxLrh1tpLsa@hbb4Khc+{=qyQb
zOaXBBPutoO|5#}PG&NC^#Uh0}3@H&inBe#isQXJG)i2(N-*K<ikS*=V@OtYw#javH
zxA0>Fj8#p!f+db0T8t<0;ndT=`god+3~LbF?L$~8Lno1$rRS89`^CBnp`Id0&I+J6
zH;y^|m3f7w@ox&Xz=UPgjXU?DXW_5QR|`?pq%ruT74kcWuL%1s%Khmco%Qh-<(2q&
z-TD@&c^BSN>t{dgFFIdbDv7X26}{C76NMOgQf=OS$r035Vt7l#^0-QtEH6nS=FT15
zI{pF_DCg_d=kaG3jN<JcmC-4XnghyR)F65pW1kUvGK1!4`%ri0f2%vtP=a`}Xc7=(
zH~{MN{n``H38*zB!5xo$-D2q6vD`%fbB_?$pn0cv!US=AZ}s}I?JRWbZ_wM(!WCUp
zsZA78YcnPdlPAT;r`7R|Sg`Hy7fNpN5}Zs^AmgJR`~m5>^5Y3xR)oZx&m)-vS5ugF
z>8gqedh_2?MXj{tw+1H63dWguQni~!$trjecJYHUo42mpbr)iVjL-$APt!w_83G`y
z3*Y|5P2NM0+~px+6;RnPxa`fyU-EfCm)ls?bLjxcOAO*Aep=Ye26Kz}isRR>0}|{k
zsL>Je3LWcPacDSfwY7|<LQa8M^i23hp8jdp<QcI92QpdE5@3p`VI~1?t;l~yT9O;_
z#kH#LrM=1GyXgwqmm<+aLu*C(MRGhPWF9o-lbwBDgVzd{P>OYcv0rg6ed2cN0zdlB
zzv<V!HJ#E&KM3;}({>2+8d)(;>)|bOTKwfICpPN905ubUe0T<bP=_DyAsswUUP`uN
z2W~zU{Ua6sD$@x?z^&262NVzSaxVm+_r&WV845r5l9cG?*N(Z`*|Vc!Y$OeIlw_ub
zDYx*a4RoqwrCiGu3xnzsdsifD!F(yhK%B}9;1juj_tQ}fDG7$@I+sEG?*G>CUQq7?
z?=6`BXv%#cq$fbOnL?=f__^&8<Hj|Qf<j`Cz+w9MewpBpwkL5S>TNu>GV+V8iV{Qd
za7jJ8`UEr7jboFGD`>X*b89JciV&4Cd3_&R=U_SQ?TXjU%lTzdywIh>e!>X-I21BT
z0K7#(^nx15RT!!$C8%IZlP8-K@m`|(6eY%O2FSm1LhWBWwyfhM>w3Mitx8LLE4^u!
zK5(U@^Ew1{mE8lm+f4ZSgVG>DJBT)`#j7y%oN)0peVOlRP49102MC4dm}<C~6*GgQ
zT#Fy>C+bWFr7PB)UqKOOCfA~mplGOVWjc*c3B(N$sXvfNrk2OY%rPxHYK3KF39OW@
zRLm8y)F7{jV8B~?^g-eG<RIVB!xDMY;LTZJk~4ohSrYR<AZ0r*fW~C^yd^d@pTOp~
z>gQf_6Q7LeBz%DqK}M#{mL1pxpEyz++K@@FUZeswBSdiTJk^p2^cUFLljK!cXFI9?
z2BD?Ox6Pc}pVlPLBG>mAr`-pz@y!v6y!wpL@-bVR9X&cF7g?fz@AAr9{*ArFg*kv5
z+yHM2u>KM<n`K#s5FTU(756Tr_HbYer*1tPN_l**TGioy5r_>SCesm7@KK@6)P<-G
z>=fzhXRvSg;@q%jo{N1q;Qu*+^a;283e%bTCE66Pf)$1>qo4F|XrH6ZIyN?FuRV{k
z)*bl2l%<tJW4<c6%y5a~Yf_TBlfYe^!bg$XYsXWWU;NzPm3J!ilSG!c{L!8n#BFb*
ze;`*~Ibw$68g#bLy#wd&gMQSmbY}67WDuQv-;H7&Ni&b)NWu1ki~qD6s+|@7{|X==
z1w<*ZBc{qJ+{X_vPeOvc?A<+~pDuKwiBw;RWsnSZ)%q({`kn{9_wf9vnMp5_rg{AP
zsC1kEe@6&<2i*X_5|PWm0WS8yCok9H|GCibF}Zu+Xd)``1262;o`SYmrZoDVw006X
z%;^QW<w4*ZEbwcV^PUru@q8t_<PW{N_)9{mr|h{Ad9ICFdY%-Un3Yf?-<}T%STqky
zNUe|5CtGrF&fqJ=ycLiu2{!KnnRgI<?@N|0d~n1u;@0E#R^e$Tb1_IFcoVxvNioEv
z>fD*nevP8B3XYaB@m}teQKc!5Dz$I}&b`ZBOU6B$+s8LxKfRVb45OCtqLm0?$*IB2
zHal+3Piu)ndyrEQVnAV!^@;YUY&RMXgLh2`udV6OVOlk6f>i=#W1mqhJa!2sI*)et
zLQ;9lfsagja(B8@;h6M79WYJ_hD{a!*&gWI@Z14rwfl#s)(>bR0p-hmTHU{7Tb$r{
zFM=C2{))0>xw;LtvHTJ~^=`%k8$V`%BRmoWWx?#h5kDCVx!7zA49-S|5On6!t!I|R
zt={Uw2eUQ2Le@fB0Py{R6EBnG4Z1)n-Z5to%_MSUT)*jzjdARLg+&w_xTB3<Cs4eB
zX$T~YH;hWDJ4Ef{Gf?i->hddDcIe-9Wy{%X%8C`2EfmvO?Cf?rJ$P3`1prLs0gfi8
z=nql|spqXx*Ka2lLwEI43`rSJh~+W}XOJQ?6yI@Oqd;1=?IQmJ;n5HiNbY_Nu_|YZ
zl^frNRsh4QW^26#YtNW5GRE4wm>XbXMo0pp|ASm@7eS`q9DtZP6*C9`@wDABj>eZ5
zj!$D{CqcFkfwn-?BI-v#YTdVu3}jAAG%!Vz2GY8bFi?9uJji0Gf}5-WT2D~9;L>@e
zfR(4p-I#l5CU?z@an}J@{9CKH#6FX6p8D@e5<ST2D=OmSQ+qxCAyJG|3N{@qz<;4C
zn~~5pr@!6p%=gFro+r!7OLCw+Sxx%hY?}DI2Y?h2ddK!FN+<0dHU{3X^RWB{W-)Fh
za6oNP0C04bW7X}>S<pppy47PUraP^;U%R!T+Z+f5`^dwJdpcBALb&g~2YZIE0wx*d
z(w-9OWrhDj6!othQDuKOyN&<~SfvbaOu9DgDbY+T6-Cdxv|u)d<Ws?Gk+gT0#3Q{{
z9VHlP4W_sRz+0-MEMQ6lUB_7t*taPfWY|Ow3#Ev#_xKXNMiIOp75l8j3}g1|A{d8T
zX)H0mZTN2NHX9-?BVBfx*QNViR=BxA{70UBnlu8-1Dkg3Zmrq|97afVvXc?wsCaRm
z-)kTulO!yzSf<@^EOp)kj58zAeIjx6MIJwJ_Yn{oFrWFgfcRWwyBer@3DzVAY7zrJ
zUV`;HMt%%W91x=0R({zg<<{fQ*Ht-S++YYu!~JNkP!QU52S;2JOCuJOy^B7VZ3lx6
z@KQicvbts9let!>LALLEu%Ym=RYVwduq4*JJUT;x7So35<3t0<6DVF0a((P1iWL?_
zFV$N@dmm%Vk$Zju!lb$Kt4?_?n84*8kA<pC#`D8XLg7HeX%fkp-<d%-XSN6|rHmJs
zPYK!GsortvL_x(0?G||+j1+ox#}TJ6H7myTOYSKatlE~Wqn+;m!b)+ADqR~hfUj=c
z86=m0mciv_#K?v>Ta`tDlqafbSPccm73MTQKa@@bgI9Dwr<Y&W0v<6+Tm}>-^&(5N
zb=fLZe#Y^FE#u;vAYy%*!?q1TgoFMqRr?;VHHfa&6Ee4~+^!9JBjWxv1tIv}LN`}B
z)A7vo6J_4ax6(rFz#y_vdhxLP!J;QU@@A@uK4n4sq<APW&~7R12`}@}zT}V29Z7b%
zzczPb|K(VT=`d#o0^yGWM}KQDoM)SbD)~R`tc6wI=r}CBetvaD-e@PI=8eIEfy|PP
zh<{@F)nZfI9CK~FvbB@@l3L{vjV-oW--KFdu&LC|z8^U#mcMRck$qh=5E?>Yv+|c0
zVf-M3q48pDxjt()en9ng;jx<p!u)AQ_~Je*aTJ`@Jp$<WIaidNe?6&#kbbv4h*r<8
zuGG~&LE<#h13Aq2A=D1zh)9mf6=NmB`QKSUMn96dKOjrLCv)@2WYss+A9)w?{aLX)
z-YO2r!w0F4)+q+4<M#EE@nBdMDpM6AbvoC!8Tb%ljh!rK#Pr`|{J6;0T4j&TL9gA^
zFOL<2K!M=JO`324rH2w*ng1EmG|Tzc1H;1>cVB(9`^md!Q-#T$D825c@;9qzPZjU`
z?9()NGVR23S5l>kXW`z~D8N0hlS5XlGwE0a1LFPk{Yv;W`6nT@(CpE!(^X@0Z)JUi
ztsmpP8o|f#a7TCU&GV?%V-SXK2bQ_8K<(pA2>`tpXdDth9`ED~L~8WPF1;OU7n`k?
zN|-B6X6pwOCPc_m3#Cll(1{$u3PKK?kQk=@*c}*tsBz%=WiJ{~c{vp_+0`b~51<$O
z_4}+d<^W7;@>*{(Pa3r`j5@HKan$$C51-GPp^OpO(^cQ`svn0t65b_e;W%?ZWN|zd
zq<6sg9%Ul`$I)5%HTnI0cmbokyBlfg7$DLO(l7)BB&C~8@(W0(w19xpjS>TtE<x!S
z(jeXa?DzZ$d+pr!ea`t@@9T|3_~cOn=p~bAh>;m4)Z6LUIMSVe4A2M225wqe_Zfny
zlxqH#K907jf}2_7K@w=Yo7OahdZ(b0=-zFRoyEv>Ak&Bu$1(tD=MF3A`!K=VHGIAD
z+!H!3ocN#cdzV9vX;eX<lX;Mpy8zqGd4bn9oy2&d3_(Mn2$jOtNMmceAyO=0?kBqU
z{vi-{W(HdegB{BDQc4Rbi^#fcLyphGBWTaaes(6<MvH>H>YKa+IW}0?1jn<;K-sy*
zu%0PWAq9`;-*O6Rc@@vRk#<RdR(GJF734OQTM)x-h&I<6d%<EMQ~5<Y!}mvESjYGQ
z**s!cUzz|rS&p`gSyiO~+s{lRqmv9537jELmuj8l&S0dv|85VYgvK`3-=909dT-cW
zcl8+@rS|E$-XrhRyj6U#XB4wV2;3EU4$2mY9S15MVP0Bt6u^d~NrxNm_ovYcoi!aK
zHC84N1s<Ym#g+HIt{S_k$p>un66fl#y5gyHw*hybopMNFef3QHsz4y_UJ53T0P|dB
zq3}pcqiLZh(cdoF-I4O$_xM{)Z+j)#AT6~ZrUw&b$tt8uwn#qNI_pY=TX}XBUEBA?
z@9-U~4ZfAk>Na8bJ+;l#5(nzJ0zt^*6NY=};AkUFp7iU%sPxJ|3%y^a|2$?;G%t5m
zzfL{mfWBwnCKq^330yeH{!93=XM1VNXq_L<rYTM?31QQnXhk9*YLd1_Y@W#lh9r`x
zDN|SxyQe3o8GSpBv6xlEz}+Gf8UT^SX%zvFS{cRlw+F-9@t{YbNg1pcW1!-TWY5~P
zBK0%ppxC4sWK1|=z*cK&NDe|t_!O1GKC3aEiW5WN`~wc$&Ep!o1-b}CaLiFl*m6P;
zIEmf^w`wmQR|i_7T%|*Pje;gWGCaw(IURmlcw0tV1T53Nw_sl3!sWn%L*+<bLyTbC
zJVM^4qvih6Z`bSyXvOvq#f&7Xt9b%9Hu>I;iC1Rm>;H{HH{lKqa*(7VI?>z7mklG*
z3Hlxw%8}^!L%Bgmij3)(JztxJv`Xm9V-VIxQF`%PZa8uXL;PB^|N18;MU9hR+}Ud@
zBghLc61gW7uTTeGQ~xGSz@T$o%B<PDwa$S}oVmA^&EgXU#wpKgthi*cer^7Su)~kn
zcL~hb1DOR2*89Gmq6P@Gve{us_UQMJe-~r#zF859)eU2A?#HJ>%ADxIlGwmeK-+^g
ztQs#bRHUQP%4d5WdFfp;>rFbukvv}2K7qa#PI|;dZMK30@5>|2Fwd+_XNxrgX1nA}
zle`HqmS4%Zw|-r=%=u&dv&|(bvhyJ!P>}ZC@J)g3N+%qYOn0t0y#LUYR0Uks`xg1B
zpFlbM{C~Ic^wON{f}h;*K$f&@?0P-S7?QE9n{J+$t|g^8ka-xI6#sp50<3%BuS*+U
z)_?6w)@($bIgj^tKYyZSW~u4uG&Xf`MqLeofkW>K%FRkUa6oNsql-$xu2#n7`ku_j
z5aA+3eeE`{h)4bV|Kw)-I^GakLgipe=0vJX)Mo2>132ZEVU^89Fn3=;s4T@7Y-+uQ
zE?n6MK73DN3l|oE)X1MD`iPFHs=*PMEzne_m-Kl&lY|&f94qQCro*4x-gsm`1fOxW
z`PKUr)y;(1L1v)=PwBAl8${(KY0r@oE7+Tryvcf&^-mvlHp#PI6)E5fGdJ`AYg-XU
z4XrCjKJZ`xUYdu})TGtPCN!IV9_`%fbINYVykc}G?un%7PNY+73(y~`5$wiaY8wLJ
zkl-r5M>Ui2uUIaN)f&D==Wg>e*Uwc32(>DX1=2C`=j@qa&{I4FTHhS#zG#ZnqGI$d
zG?&~?{yKL%S$Zp(nMD>Ir1G<v3^aEu2Dd_;TLAR+*BZ}QJ@@S}kg!`xb|Oq?)hGit
zg|`IRrG_p&pA=t`KXc`RpRIyM(Yd=vM|jtpSBfi9rJ{x~gt$Su#a(}Qs3GN_)4VDd
zeddH`Y3IeE<5O`9?p!rL?yzv7ntg<(!Ut2K1gzMitB(@roKvIglj|_%9^uJgtm{7c
zIthCN8WfV(27|tIV6^ln0wM)3dVdVX#N;t{oe*_2YGWm!r#B|rEK%wwhW6uqN)yUf
z|MKs*29_O}Mm<;Ll$)y!(60vcw-VnJ06+Y4s<)GGf>OGwT99^eiY@M;tP2NAwpBh}
z)qsN~;1B!A>TNg`y7J9OjIyqPX~z)_B7D<3WXW~r31=C*A@m7rfCI}-K&NLp^5wYM
z$un-Vo1bW*nB%D<TR++7CB!{`;&`NR-}QIFPpO^gm2L)}o(V|~ZY8k*iT*VcpXZS-
zzN%7_CEZzi1IAUiZvDEETjqets5jC2M&PYe>TjJH)wW=&fHh3k_@>w;09oYd5Z!;a
zWL%8^`-;|0BB49`C5ayd5H+WStYQ7SEGs>S5HErIVxPQT0LDN0)BBKOv?P!@Cz3DD
z?&4#f9A2JGdH>qF_@lwh$Qv@rmL62SbC6fZLsS|LGyWk+x$?UI2PJ`l>A<DJpQqUK
zKiZu>h+pRh`gCmpIFjBvKpY7VPDXoDVqv2u+$@30AK}B{2IyjnOe(B!t!V&8AO`@k
z{)!;P|C!MVg7UN(Ed#V%Zm^d|?t7lU%bXcEi^&2JsBP+Sq`Z8u-iML?=L6xHh=PZ?
z-Y>ev+fN4ag%59w+y=k|%<~c+v^9ygr<O$9YHZl}^P%Gmjb1KL1%5f)`>sL*=H4yG
zMxT<eD&k15%!>E;!zwdh+wW)*aq^yv(y7LtrhyA=YyAY9seY5XkgyMgt%LFr5Gt0D
z_w?mdvjDJh|K!owFrLF!e&~|WxoX5`ApK4|42}7c(3+x{ag2YvZ!a!RUJr8oGsIId
ze+fx=SLq1SmsU*)><HI<7SeK)!*7GVNg)wTxl>@WI7(9#Ot@23@+kQ)CKi&5OTV*<
zaq02pAtIMXkNAiqR3oEgXeQ-<x3Sw3m6BDnwP0n2ThRPcwFJ5;$*vP`KhMX#{LIA5
z6^=C&_}-f8=4K>!3msnD`&VDgTZH_xS=7XsqwqO|D&J7$#W%e-S6dc$&}}AZfFgwB
zPtb?zugLAN=Q(_0Fr=Hvoj8Dc1*h`$@EU?x1qYVwDk{3(H55(DtEw4~Tu-X3f7ml-
zK1{nHuAo<<w2p>Sn*ZU5c;SB2*DMZ#jgw)}i4)Scmq@qEKE><$%&wnlwKzm3V^gU#
zAVe)IJCU6N3ha0FwDE#g25<p?53aZh>jcI$ZNOY0EmuQfv_Ewy)h^XT;hz7$4^lBN
zVKh<FZm1PaWV<MD!_Na5oF}VNP244~TXrOB*3EiJDs$19ka1}sJjr#mPoKdzz32-J
zm}`uI?w7<>CPTNN646ecxAXvHNL~-XCv*TaA926csBss;0?l~zF93%@G!<TJDDgUf
z3e$kPW2sH2OOTd#42iR)fJPegYRo`;!#j5iDF-OPHxn`NNQL_Ogl`!tgAY*@5#%&}
zJ?Vlzf-ajlF|}p$;hIl2(8Jg8YVD6|Yr*9@JY}O9d`OrYWX>L?i{<s--wRS%utMm=
zbSP+aav*2DhwgvM2prg`fMAXflld4B%Q+_wiFn4Y=aBejaz+>ZPxDD^Mkf+djMXm5
zqT(M45?5uAGmXgcvo~R1OQ4Y}fz3|d+x$Y_luor^eX5uOG(*#){gds&1BfN@+g$e{
z_ieZ*Y`na_?6|4bNKs?hM>+=$h3_LXz9M^oTA1CKta>PBD_1fUCJnPhxW1tD-t(;Y
zSVqJpXfr3tco|SiF?#$RdnI`h>^Fm&3c4BNK5IX8yGC&$$BM{f)l@B0qvnG4qx?xN
z!j@FSV5*(%)qZg4D$q(+N_+&g5v;M&*go(2ETa9!>j>Rfr5*7}?L^(hWteX5kW(-Q
zkQfT$E$!ny(Nc@qevvrzVe^}Yh{^10<nNGRMWcD#77R~Vde*4CG3=LEmMii1Y5ZhF
z!XkQtJSE55tD?+F5hc9P{YBPz5pUXk*S@kl<pOKKab7zAU9^zbFD<IJCm?F607QDY
zBpkS7j=;z{xq$>g`!9@YU-ZK)T1)TZ6L%?P#`BU7UO|+2w88AyZ7uj(_#k}C-GcfB
zOxn_?tu8ER9Rg@mu-Ts*%}k6=XuPg4c@<0H)T0c;EQWha#eIYNGt7PWYsz>^V`WN)
z4J<x0_Q0^bWrUqjARC`R)Q4ZrSphu|(({W>Tc4L59!%M=Gy);d`jZgwN{%S5R$D5+
zJLSM&6)sOQ^MAg2zbGAMKMymE4VDj6Ny5RoIkV19T4+s$+(%AN=(O7!z|(>f6M!Wa
z>Y&0S^Ia8s6TCEZDMUPK+LQ5aY}!X_y0nj$!Y%0j_mlH2kl02){^xGgo96A_8wI>k
z%a4A7ynCx4zc5_{IAZZXlO8u%K(fj0K<0(duchI!X3HRQVEF`KzuefggwF(?&yZc<
zHn^2*gm`focorbP9I)~tKp5%aA`c#Q{*0|vH?kke3`IyuMGiDkxwk5U9*+Kcgg_Aw
zgysAQy~Q7L#DqW?)Op_lb=IAUh546d?m4lO)Vf8gMuC~xs{%;8rtPUV+PUy@&kteJ
zp%i5rdcskppqB`#900-s2&k>?^?PHa$aSY^XQM_(7^~=0|4|3P(YJ7$$d_BxA3`()
zV)BUj+2(Fb*t^jMFWw&_sH3%*i)QZI0)!Qg7*)S~A$y0wz75|#Lr%Grhx(_L^)Q@e
zi=yg$<ysO-M!cMT_t=8vP(4@_3Sl=5xVny2&USQVuP{mB^n!#96DMmbvTYB;kU%U8
zu4w9l4@w#6y>3_8i<cBg<RBhHiPR+XkR32`4#<2B#Q<Zr@Ore03PzN1XbSJ|Yb7a}
z4(|a#fYD{}KkJbi57V^ZsWx#YEd1UUNV-;+CNR0byGo5u7nEd!(RCaS3KnDu^*=}1
ze}BK*v?L?B^$1+TeKyVp6w}UjcGmCdc0?D~+UUj6u+=aec*v=zToBLA`QnHc%G-Gf
zn<qA6Yb?H?5c{UU&&(1-iq6umm7!tQ-FmPjY?~Ap0=NnIY$REC*<4pwR}>j}b5msD
z?u7dz(ESD)$tu?<KeKN9>$5V0%B{lilrMLw8khj!-VK(#8z^6PiF1GaWIn3HCt~;M
zH^x$tA_WR*BERd-Ut8hkq6x&IqoWCj212A2cCj*Zzr&YgUv|<>iRBz@^A}VAlsPL{
zg?iLtp3kzl<Qj&Z5Qq^L=hbl8(lO~ZR4+C)jO#6J3flcH8`+ub>=XuLlZj4MdNSak
z?4EFUj=rKduLOiYke)C`@YdtKY+c)+U|3$)RZROTx(P>_&jtBc<oIvA1|f-h8!HK$
z1sh9>@>DwoYLhto%tzXOUpn?*&k&0b|7G>a%pm=9156Zhu6gq>D~ef)i=5x{J!B|M
zONnyq5*~acmm`88e!SEEAP4n<L5KI}?qqBv5rAH+Yz?0&LCcRb7n635(*0-h<KsZ0
zPNkF0EWxkg1Pe+4eGq%yH@3C$kq1L-*>)N(rf~okzYSsZ)7E*~(toZ%uMh7+?|~P?
zxH-N+NPo@71d%w#Skl@-2)^#By08UKQ0M3flxU`eSw8PI3oQw>?Zoy`x~nOz_xBzD
zvMc+-wg8jHGWwt&jv27F3Th2ADJv`B^MMoSdHq(uY-~LW-F*jpAVBs$AYnuSC$k7T
zCgG90Dwp_*X?^^O98sjEAcsbd{V^3N+7Xy4SprGT<9F?686?-61b5kz{1862S2(~*
zESA8{xmpyuFl3*Q8Q`tqPv)L~zJ)Qnk-DY76<g@j`z-!n$fx691DypR!pyAl<#~b(
zmT}Dytfg;AteWwL6>R<VKoPx#M+{F-?dmKc?S+Rt5RsTC42&Uc$70q09a{cN)<){q
z5`997VFX=X8qpunNu-KkV8oh#_A(}A!?2yOmH!d@wwODBIp-8VoA@;_gY1<gltrpi
zFD&IS2xFQPH+r|hTyelJNlcE=%R4OnK~?D)^Qu+lBcqp3HV}N*RGkH%c*4z5P4!gi
z1K!lUCNtgfqmb-uN`Drn)gAS%17?NNM}K}knm<Ez-5JIH*)A}Q=P$ROTu7x*M+c~I
zfnKpJNlx=@UlUik*1N{C-e3VmRM|YPE8|4s)vtJq&gHf7ZUoKQbEwHxKy99iL%+1C
zr6e+TbMq&3zc;6qujP0A17ttE8Q~WQonY@E=6=QxNRs^|OCn(NssM-hzY|;_sia^8
zYy#tpGHXactiNY*3K8;bh2!Q>U4M;34l`ukML>bM)=5i1S^z+>6Sjzt)01yMkQ))C
z=j}buI%wRha!rn9**-`%a*HCITs49MCAi1=!TBo2pKV9u|MULy=}xKQCzWb(1>VwC
zIs66-G184a2&}D}Jc`vs2n!G^+BmKOQRi8p@>TrNs*et{=mGG~0Q|cRzK7;u>92kC
zUS%e;0b^lakx*7Iqlf<5A(cw#+Hhme@7auT;|h)wJW^RV@hU#Cu|{2;@^@MnmHjFX
z8vi6!QeyFB{=;fOCBVbdTHL28|1(^zK<<@SLXa6VOI$i;!z+jZv#lECS|(}RnGR}{
z>7zT7_0#6)>yKw>oeW_dG=Rzz#cOBS`jwKa!&9+(-}{1Bh?<$gTnwIUKA9Fcz|&U5
z{NYg3TW38oo1Jf2I8yp$apA~xmJb4V=)y~h_|*AUvLVu7-O3LD`WM3Jz!LA%_DL;y
z9ebxn@n;_cB9RmZn?3mzo&v`NZ}d_+Llv<pQq>|L%K{T=iMd`!F!ajErlf?MbQ$mz
z)o`%DFK8tIQ}tZh-U*Ap=@54@8IU(j8`&4{{f<c>&rcz`6d4v%3n#SX&MWytf*?HC
zd8CjC?MDZ%cy<YLEq<a@y(eCwC5ZXiwEO0UlV{d!==^}ghhj<P>36@TQWp-F^w+Of
z7~g_P@z)t3Mncz~`9A<yI&4gdSANSCP~s8OH#>q4rnow=!bW~>QC=9bOnty~Y(t6w
z`sW?p3A0q}a@2(?I?@e@_(M^oO@1q&`6%5%Jauc4Ai@GU3{i3ufh?fEd2GljzEeEr
zacc}h`FyH4<*QKVfhgDX-_N;0LX;znQ8V4N+25H04hw+~GVW0^%Q`yQe0-?(bi-v)
z<ZUj6r%>?9sttOvxXP~Av<`arUdfM5fRp5Lm%f$BlHNvatoSS)VZT&kBLJoQs+PoC
zeiry?|Ect@?z97{wA1KJeHS!%QtcFH=O38$m*WMuTH~&S#px;~z9mwT4>VqASU*?!
z+(|hmO9>7lB(594&yuhl3?u1d8lZ`VZWnwY0)1V@_IdSr+MkXI;AbO-AdrdFH#>%2
zxsha}a$DO@;d|Ypj_5h-pAO#x+PY5V0(IAMx%QiQ?&3(U<rW_i0C;1>P^f3lA@a>f
z_if<dPp9X@QWz@cN$F~GLSCn!z$Z*8U7;wqBMkP7J(vFa2F{s_akI5}FXio~{;Aa2
z42r$E5a9KFEhnH?FI4w7ch5J&wXv=uK;TxMj>S6VDVlRZd(3inl6<EZljBO^ioWi<
zYX1p#pcMPCeX>tN7Bm^3Rn7}5Ls2THFO`KhkPZG8L^yRS;6TpCmVPSE4In7RK=Ts?
zcfVhwT<_>K{-bqR2ocgQM-QT+>aIUJw}yF%wT+a=bXW*5emwksz4vbNv|#}a#@jYr
zU8Xq}1jPNS?{JM}E6V2b5908=_g7z8beXgxuNwTDxv6WlsS3nX3!^|5?aZ|v2}9h<
zh1aKWht%~;tKK!0D}IISbGR${n{iBq%0&Kp)J84b!6O#U%){~8Zb(ows>azln*-^8
zC;+227>6No-7RN`eAsD}z?Vgk%V8L54PAzQe1^Pq>`Q0%mE*J04JI)SX7k(|L;h99
zej~8h`I<b?C_T_kJ2c#+_RBLJNGOkOq=bg5gFuHqD)T*-PjZ$$h}kNQk!)k0TluKn
z_TPXiCK4z?Ql^w6pu1lTVCZ~ts`JA~>DQBw*K6^aFM}Lnru%d|foRSfb$|0~8(lj~
zHE##PlDr;&_LqTM&33}^H=SY{p)&?x2OXKFlYFpBJIZP!TDpEtS{sUS48JTH*)OWV
zzZ$iic!|Bq;Il{W=?`x6GHy3y+dcaomp*PYIAPHqh%dCwzi}06`@v_?t2g2K)g%wM
zBhKbuyXw1bWQ32+*3*G3Vl*DP^<C1MKeT+PJ&4JmIvmLp&Z$ENz;_MW+lJfPAh4>j
zP0ayYROx!v-Tn{S^F~qOe1B8E9!IRVymGBzp&A<lCdon2llP7giX5QXsSX-baJ`AZ
zb0l}ztVmECu$JCfxP!t+e+|;P(^5z>V@18HCZu86JVN|^PFTSYi{eWqHMIdBw*MZ)
z6o2=PwlGUk|8_-`3lEA?qJBqrz_!SYD+HuX<dmwdt**Rq_E-T}cY)~78|#g5E1KO|
z>r(hl^GQ!PC3P`o_<FXwhnSDfl~Bm)_ra8`bub{N92-qQ4L`S`&>`)noO2JPsJIBB
zV`%3gL**?^iX8TW&?b0q-Wv3VgO~?dJokA}<K@dle2f5ph1!-CXH53N;&sJ9wBgFn
zXb20#GcCabRTY7b+dYI6wmrHan_D?w@eQtMzQuV(wL|8M$e0DWcz`kspk+UcB?|o`
zUVmHN3-I`)#-poS2odPUSZa&XlHyCY;Zo#t&Q@IY;}M4h#IajIl@kB+r{B&F`m9H6
z=V3Idmne&mlN^53wrw|SD7l85{F!sO!&t<O#hv`%vnERTA{klv+yPTURP=z*qk{LQ
zgZRAuGb@p(&4UUffq)=paF}y*L(}3B=1dpRX-vCi!o8bpt~&#Z$kK(`)0?A{OJ*!%
zAY;8iG1j;x9r-tP;qo#av^V3{u!TWlY4DXZ<~X&BNFEqX_Nu}wj&ZRUAB91V?5w?9
zO3x!xnGaid1B%qhKKk-dBNG*p1H|B|L%NCALX5-wmR)CmRP;XI2N0Y~(M^D7S4w1O
zDXENO2PMTjg8*S6?@m10+nd=7|E|+0kIU#Zs41&PL;}Y1v0lB(km#N9gFwn{6RM8C
z^mk>-rPkY!!dMunQieo>63TEn!A5n|`gUq9{f=2Dugxiu^;ysR|99g_@0px_63Bq@
zEOnHc!q*XgcW7K-N6>x~{mG}ZP}Hk#%D-9-Zy+aH1`r)6g;+#ez?NqP*hs04B>oGu
z!iGJFdA?<63)7~#D*g3L%*Gs|=DC|x8or9jS^7Xc9DLXBR}(_<r9xBy12<b_<z$9e
z@6QPHnB4{vGztIAM--_B;L}9znZHR972q{s_uMrAorG=qPOjp2uN*#a-jrTy3{S0a
zYB-7dK&@&q9zrK{1vsAS#(>C}NfSH+ZXhCIaqyp9@Mb|^rVaQ78#hN8`X$95a=e`m
zaj0B|9CqqPc?O=SpyddGjHO|2YiV@nH1W(4fwNCO$XObEvO>#DIf&2#El!Pwt~5o5
zj1CGZ{Rco^n)4aKLC8OOC(K0-4@}~RBK=Gt1cj=@0?)o+rfzTP9A1ay4Pw&H;f7^R
zt;$c-WPwTAf|>?^`O|Gt>Cc(O<}ls=7iH)ly7&XbYdg8br?2ZIMpp#8B%Y7uvp@k^
zM_{V9bu@r-6o&dMr{UQi)<<qR)vl4+j_Vo3QL4dCl?_dD6GBMM9D%U7ORo%>+o<D&
z;S{89KsfI$4|X!$cD29sgDQkn52kqJzXiYRqG-Erc344@I1R%Qhv{l)kCST`IN+Ls
z=K3=t;+%ZISLwP*I&e)yBeI{axY$|0wp{5en&q+#quG^?TL>63HKLih);<HZ7{v2~
z|Mb!Bo(|}bbA#zkH#xH2L}03S)$2|xJ-Xe%2QexUDVbD&Jh_sDxc;(u$#EkL`Zj#E
zJCpR+p;OUf(?x4mjS8*|<XG%;5RDdk<vWA&cLiV4KF&q~#`BC}z0F^de_W8TY%EfP
zuIW>LZ`upb4k=??=C9LR-5;cS`+^q>L&s4AoLI^0C8%v?%{)Q5^7a4&n&ekoZ2+;N
zP25azr**^~Vv~YQtYZJ+;?pB=bN7TQywWn11yuL7YX7Iy@VzvF;`(qoQ`b@W(nH;`
z1`5Fhw!ZC#FH=<|Az%4Ki@gMRqjwe_7@36_3(vLTbh_ZXR`o{uIDvdF98uS&tg;pU
z<G2{a*mq>SAW-J};NQ8F9tpY6yCiAj5Brz9|LKUHqcfZF^^Q7TEEk^X3h#{cb6$rx
z_KWhgX}K#%%~BFNnT_N1Y-SJ>d6ALY<BwjFd)9ThTIE`n6ql$AK#^~n4CM{l1|V$t
zcday`_I7`TwzgZj>yu0Ez9k@Xk1%GsAhClBy6dGb-Guc2vaPXL@VNKGP7qj2-JKo^
zOu^m!0no}nkZ~)(c!5d$cdKrQt2>JX*1R=NyA<A*6x{436W!f0lME2kboVk8ci*ac
z#k+8F=ab%=wZ)~uqc%3w2d-&DBzt`DHngr@9~EF}TD8|!bCa@hN1=Zia#;gtRY-rf
zQT-GzzMS=vw#vV_Xh^`U?07x~ghLQJIZ3{IPE#fmaM=DM8Rx~jOw(FiRu89~9_j&g
zYPMO0Dlwruz?xfB;L3j&VFJ{2?>h)3ACU&KWq~cO&?^QMVDrxV6m%i0HnqKte(8YU
zI7Yai{79}|Exx6%u@oqz*WAzkd=yTS9sGL1UncDBGhk;t@=$Y#`ZJ=6bu#U|{IX@L
zG*I&kzQojEds^PCN@>8!v?GFUmLfShTKv;XzK`V&Gwnksha2){VR@$mgpZ2@!7{)I
z0K+@0(ETb^O7<Ijj)8!E4LrFmDBzn%dVC69_kpmi*-FueKN+Pk?fAc2v4PpUfPVV#
zr!V!}ZX*|m-MLgh>|j+X7)bBD8yE`zCPX>kuPy3={+yAt-Qpqp??g9cjE(j#+Y7Xh
zKy~*oVK)R{y1wo9-xX7mvEe71?D>>^fX3sY@6ACH?tm;oJ`5?9|Lp8f)GGNt7Buak
z4(AO7BTKu1r`n`tFLQooPJhY%5A{RnnuVMjgF5slw>{9Xl9%DAkU8zYdLn8NJjKK9
zHaL04-}Z+<*{-^IIU3}{sH$}&qfsqG_C*si%zJm}fVJeI9QF>TEJM<(5DYI3<6+`>
z*Ax3gn_!n_b7T(#YWxn~TuUGRgeJS(A6r0kuE)p=qDUal`RdAq9G989LaB}h2)WmQ
z{>q^dVMMM3MO#{Kp^v#2tFgv>h~~Hm?u|%GxuTA#Vwcv(XY_py1h3WN!#~`^O>4ek
zbPNMwLv!4$4i2lN|NZeuogqd36vSe@buaSg{bxpQ5LN%`)i}P4;6YaA9#&$_BQBi9
zz=6DJAlLft1NWDmC5Wka=_rzkjp$9V(qW2&OX>H#qhL~}t)A%5s-kYFwV3q#lfUtM
zXQ`lAu_sPI6LOew;gf{gBh-3}J5}Ke07slD|4dp2*9glKN*GsVN`OS_c;Cy+N+t_Y
zs?V%EQvy*50vsnesc5pg_9{}9yOk-rL27}KO;0cU_+MC0*zJV8hFzU;VL-FN<4?q%
z7ps6=riojqYI%C1e5&x;FZ)Z6W8%Tb12OIC>{+%7Ux;okpZq-<xQhTTb+lERG;BPh
zll9!AUt1f<sn6M`)S-;@4STkME{C5OmN^t*?&W60(wPvVqmGpeoS73SH77Hx9imln
zN@D2o4J5ekAo%xR=j6qtx0{VQ&DvGz@s89Rf(_-Z<e7IZWdwP5eaL@cWV4M?yauR)
z^@U+DrfHA?0@8`M?vk61yts-`N#}}XD)o756~+Ahw886HW)M7Uh*@w5F4z+zfos3<
z!7=jRqah+|gJz(2^j!Gro8a`>Tny~_Mw^~G5J~8tV%Rk0BO+Y78InerOh(O}4fBW|
zp-U^L5H~6!7WO>MBPIM4YqC(k-k_Q@J-Nm?+d6iF`7LkaPnH~(P$buEX21Q*OOIgI
zCUf*=5B$~UGkNBEX;wH6btZr)1lhw~r1&ea1db){8~m2#2Obp~wNE$cJrrQByx`3*
zXV<6xfX%t_SauOMkCYTOk&?4}aj7#s`SP58_Kt^4Xr%2KPG3ZF^k4Kad?^jtw+iOB
z{&Gp5Y*}(?_!fW<J<JNCX>+;~@!VJbJgdlmHsDi8Tk52Ou&n|O-0!!kkccF4_{yBA
z^hj9LyP%671*Dq^`JaI&6o_1xj8_f5Sb|dI;66f{v)XkM?kNsRnbd2U5`#E-RkpQ(
z14A?|<y4-rH)HAmtRdl6CJ_BK0K=}>{<OOZ8%^q&gAeNb9>jQl-@&)uS@3TCci+8o
zS&)CZtn>e7k}J@G4bc6O68*gYE}|T~7M{`;-aMo3OxDq5GazP|5|bm@@zt#cyOhHh
zTQhW=Jp|W&x>@J$WN>@JI!rJIy@1#%PxJ}};<K~5T0yal?Qgqds7tAW=#$TR;fg{3
z<|Yu3%q6D?h-SP-Yg@x>0V6?#U$ZqW*$p(x5{rwRR>FsT?P^j4|GA++ivY#Kfft$4
zoIp3u&N8^;UJ&s(#&4yN<wR&2@&QEnhACTX@ld|H%D^|AKH8r>E*<pdLF{-c9(h1e
znwCuYZ5mi8avejW#>@pVb7k}uVnIE;Gv`^*!m6CsgP9=_1!}IgNKeJza3IQxIY&qS
zcY`PeHvbxQHh3@HoW8?NTSbRs4BH#39Frso1|J3sf`}xc?{m)%vOoKoePgCw#)6}n
z(EOwdy@2&k2NPibg1<drCQqc>dDrl<c*Y0*x7UxK)B>5SYr%_)xN2?QG2H$`_jVCD
zIxLX+cEBl2>6ZdmTk?5cvF4BNLQ6^3!YK{Dk&;;M@gX_AW7q`=>O=ul)!Cp_&h!ci
z$U)NLVBmzM*F3y^RS3kG%VIw(_?p0%wE019L*#SA*~obK*wXA|Q{^;}F-Q%F6znRJ
z9rAjqB~0v`gu%?^PcG0fdR$-Cp*UdqkwuNh#ZoX`6cmt9sfQB*_#Wbh1ZvwM-{%>B
zb^HL%Um-=xUGc`xMhAEWO#rGG2g=vi0_@o2K$%@W3;wdUaq#I?9G`K3$)jO^xXTgG
zH$U2e>31w#QsCXZyfADv?27|5@56Y%IpSVY;4?ZC#EDBi9UN&Pm$sLLU6i`sDHqcE
z^)HMq5p-H$Qfia=GtdDLIc4YLn&AuV*1LX~N(JG&P9i^@1T*hIq61ha6R|JkEB;Cw
z%y=CphfFk+#ON(jW=my-;Z+v+bdOqM96o3w|2zR)!*PijV2?Pk6JO*~iJp4{nd|h$
zRqnSb@<Fyikr?sCP>IA#zc=tZCJY@9uwX}WRZ=qd<upP;|M=~jF7ASSz9fcKFaqNv
z1j(=xOD_8grlc|n*C{&BZ;&IgywF3zb0az0qgS>$=?WcEfV8IX5$VGehrO81%r=$s
zXw!F0?9E&5ypUC&WUsMiT^gU%!o7SuLlPM+Swhw?|I|V=fj`hM93Y<uGN7LVr{fy$
z3xoVIGv}({@;{%N+O{U*#|n+x3NZ<yr7M8vyP|Xh33qPbOHXSY=w7sL6qVih`*4M4
zNg+W3AC|nybJojat4{|bS*ZlIMw}7pbcJrf@HNo!^%HhpI9uH65OUjS_uUL8HFma(
zm~qDs^nm(cbtITxEm@3@$n#%329kBRWfn1kSDf7TZcI2!U6<j1E6BF!&vV#2^+2|z
z`N0uJ(!r{L<_7ho`4==M>{)uuEL<MMQ54A^vMS3wQgt@*mDkG7+K+hCnHabzENgK+
zVR?=`pQdE-VhK*g>!6W&SwJ?fs%q|}AAWb&yEc2Q%8xAxyrtzKu_?^uXHpjo$X+_#
ztuxaw(MdCK!IKp8%)YPlJaUhZ#B84fEqKBn+)scedf!cVJfT^+&aae~D{Z;keTETL
z7?Lw<4Q-w;>1}i#6T-X#nKnB5=)Fo?pYSn_0>aZT#p+HE>N7rPT)aS?qNnV?)=fV&
ze&ySv5qySO`=4wmQKX(Hi`u)vbOw%2?xPB_n8e%R>#8lzsTDKS(iP~tF1Yg!_$yyW
zh8aDz5W;Hdi==n?Sct_Kti@wv9fY$(l<ch-&tarSNOcBHz9c7a;T&U4!eC>ML=Cvs
znt+h(MgX#^vvMV4MevqoA#rklN2vy1&P2IzOXa8Mm?Tx&0jKA0eq?bfy-!Cj@q13l
zA$#9Ht;7TD3d^=^?+EE|xmM5oLyuHmwW}OOws21kTWFgLYfZP<0K^q=_`AM526vy?
z!uE57j*;6@$cz7u+IXKtE03y{A>(=ai{pfzXVD+0Au}N_x1TSv4pY{&hce$y{G5K-
zl`yWG<EywO7pk=$(ns5h;k8!hDoFF?*XQEIAim*sR9EfTtiA^Ems9A=z(aZ%6dLg@
zHi(Hj%fBffB-@lH=jVB<VY@?SVxsm)ze+zl>OsJO`L-2-#blKEbwZ(b=8b6AyUPAK
z?7@Cl5cft0X{xuWhZBzSN|CJVk5EH=m|j2ZKf_~e`zs;wFRU`@$uv{je*uI}?dXT=
zLJ8GN!Eq<bfad$0of94cKox_1@XRx}kAm_S+Q?HAt-G4fn%+qOqDSoGr6+V9_t35C
z8HV|;#;ks0CqDOl0haXG=RUD*!Dp3j9=brBR(FT}pU#4|xB$Z=*mzw0dbimM-QdYD
zNCoki?I9NOf?NiY(y@$6AipQW9U$VI{_DM~E)c@Ur(t4>;KVw*<*yB42B88{crClN
zg8uB&zns!an^2Pa?reCI9k!S%RWLjTXiU=CUBFp>;GgVHyTJKs&%wkG%K)A!yfnAK
ze3gm#YJ%W15t(E*{$#2qY{jHlGFTs3Tts4D<o|is%Ecg=T_Im`SD3-cS<Wxq7)Wh4
zognOcUlA*A7z1qk5yG&$q#Z@)%vg>@)TG0)bYSqVbxJ6d>QiZa+<r$+qB(|}?^t*@
zq>X({Oj(b8Q!4&^UBs`@i1)T2KHWpS#F@|i;8|u)9s7DDjZO=<NK)<nEj1t#c>Gt8
zXQWIY89`hGGb(WWxH_}MFXXR|NcKNOL%X~#+<;1luWkqIDq(~gSQMId>X;ul=CbXm
zdpM2V%{H42ED4{%<#KEcS>hviizr=#TxVaogWg)^=YSa>+)-;s80HIb*5knRFxL`!
z$2W%>eI$SI(FkF%eiX1Ij(5&G^?``meWj(Wx|q9ZlhnNmcSpv(W_s5lF@B2ft&@3E
z13rHjX~0?_S^>fx!G18$#ozwEen*?ip3|=Ffe4v*gb)*Gr+>2z!pH_BMA`E!7C8`q
zsRM!Fvc1aQl#OLhM)NEH$-0475hQSVTQ<4f=f{nRFiqh^)mP$<%2`Kc9TB+Dr`5G{
zQL%jY6wh*ftBC~@pv$V{fs8!8m^UO~M-}e)L{oPmCX#HB<RB!W-QNb=eP7X~cC@{9
zs(dLodilT8p@6kfL61ZY_zr96J2eXxp~YE`xQF}BN7$oF*sn?8fA?*!N%eV(`-9R2
zdJpv*XO^2G1=#H(!lxp6c+5p1u3pw(%VtE;QEcYPQLU2)ib;Dp;y5Tqk*OImuMfSS
z;<Zq!U>MyP87TQ~+Wp{sr~j@oOzlotI(t}INx$^<SfM<DWmgp>)UGIN!<1-pfmZD_
zQ!)AqVLzp|Iw$b6C2wqKS)ewusRQim$3vAb7Uj4Vs#|&`Br(5{t!^6Xe#AAgb8d(1
z^nh63GJ9U25yCKAtHgaJo?-xJj<8&R=T9hl6k-F=DdbsYYRPC9T(VmK&oiWQXSr_V
zx}Z}~*Mjhubo&LdxIEZZ0X(W;x+-TKj8*5~OdmjOf$u<Kid??Z-%N`HyfXPCPF?YH
z#eEed-m1kxnxBM^fT$O+2l}Mw+HZQTB@BM2vT%Ei$sE&bHgMfSbtaY|m-<jaAbXmR
zTwewI$j#(rFc~vU1Zcn!+Oy#V?NU?QId;K}&J6>&mu9TtAzNd^O7HfibkX{NB9$`}
z(eCFyMiqZRhvCqlQ(=dJMXOwR+>2glb*rJFruD#^5jyx6iSoYI4{6W@C$$_)E3qUR
zRm=Nws~UkXeabnXF~L~hY|8FdFU2PrhoV(M&*9Wxgg#%bmMc+;8)?Zie6Si%6w%+v
zfp!w2f7}YFDtx=?=-N|Xj7avn52^VCY&$tjh(U>e#M+oOKKsBHBitMHkcbXGwR^w)
z{vBx9P3Y>HT>pnqU-ifWz{<(oa8QQ2$?`mVUDfcKd_|O8wr;vqVLA6rwXPYZ(4?5e
z*IpcfXO$I1&(Bb4W?)1r(TgGmV+^r`g=pzvdgBHXX^Xly>$@r87CFJGYW>JDA~rkD
zv~W68&ec}w2@N~=z<+vQ2`s;vL`4Lga6F$Yj|lNnNb#+z4s^xHd0ZTJ7ILm)wYZ9y
zF-SXM!J<wEiwhF#sWozyPIA+0+Cx(bXiax{;0`}0TGj>jJc9iwt`o!YeS(m5T}0Qv
z!!cLxh~R6A5bQuq%xCQIjwgFoGW3la=6Jpd$X?$mwpYGnv)V&2iwIpQJn%k*ndK@G
z$8<Gn<AP*CI`vSqLHxbW_j?z#0HUTKn8qC}_~_LDQC2@jVv&;vvPWJX*p|PdGgYW=
z39~`q_`9Pu!!O_^1vo-ihL2q0XTX;yZg_vEv`Tva3W-l>pOv)><%H=}VkL|&5ES>4
zcWwnE+A$&-ZcY+#_$RL_sAR{1Y-B~9RPYZ;jvbU%>qu)nmgOoRUpBL#ApA51oyJHr
z_f6quEA*-QE-f)yWSye3#=kHeW4sAnJ%!)YhTn0DgDRs!xXcdSx}+vF2HEfl18YYW
zr&<5<R0kR}1pPtfs9ZY6`~>jWjZoJdrRN6k%8KlTn3va+XnzGu9uGrk`8}(mAe9LV
z;{_v0l?28m^x3a$r#lYO`p<cV$Y1HT0~rg*p9+xCJWT6*735`}27z*^RR2cRwz_!@
z{i$@Rv%xQkZ*5gA5nzgioh^cCK3lcU9{xuQv`@3z<#+|(>E*zyMAhvDo2d6di{0@n
z1g6-1vVMyb|I8hR>&`eJ{wvz#Y-t2YDjzDD@|l5hgGihl|5R?^<qsx(1RStsm8BCu
zhID$A%)Jb0BvZ@P1wVZFwI_*xWYUTydrn-}nenU%Eh5me8c9{u5WVD|E?&iRXH^lG
zTF{V-K+HaX&$2(y?*j0tB-mDg-06XY#p^~wLrD9H4ffO!3!1lZoIy@XwggRst^2PO
z0YynRH&)19RYdC(hUZno-B~7SWf}Fp9}S;oBOX<Hd|vfvvz?OHu=V%62mXXR`N&ta
z1lk3XVF*mp?5lobs^mZpr?So#=5H4yuqzRvVB7N+n@3|5Oq7T)5{@Nb8^L-6wz<_W
z)8VoZv=!2`O*~wB72oZ=S^LVh+*Szg>i+)c>L5Q8^Y(lG0<Ep*`R=A#|J}=y5{VKk
zMs&4A^+ZXam1l*BKVJ$2eB~{M4s{rW>UR5Ub3qx8t=&-~N1YxWbvK(8@#ph}VQiB*
zST*6vwbM0y64vu~OZ9x{LRUgOl@t+}xfQq|oN#VYb??R@k}7quIt4jI-@oAcO0vx-
z<nt|LL`~g>Z*1h~O<x11EOo!GIs_BW^XF1~7+wnfnL#93v|Ef+#C9q=quesaPIs^U
z945tL)PD!(QysaJCCaqMw7j;9vC~l)^|_^k=lG)H6|m0z8^bWP0u|FHL@S--3%8aS
zKgIlU_-2KPUx2<$a05wr@EoCj7xiy-yD2j=Ki~Pa&kNYFYJy@CrdN*O6}ul7;hMsj
zwgC|oFk5{f<fZASlj#jPVzDSV_P4yx4KStoqytIO6_p*93-O}6kMA^SD#-8|0qEC{
z{R3$Okn^L~G*Ii{Zd$ArAbZ=^un@A#5yi;XQ1w1`lN~!5b*iRD<3s0}y2Y+Y@$j3E
z#UH<|2g8=@IF$DvnRkw?F(a9Ml<R8g4<1kcsPA8s3^wI$Uzq3LcUCJv?t2Qc!uHGI
z+bd&Q<}U(@2Hugb`h+pI`QT*dj!66{`$yyuXSy$V$224Fzcg9TNtFx>V8G`5;955&
zNrXWH&O-ZXcJ5xf96b`CP8Z4ccRnJ~M|aQEt|)Y%yt$@jO%H)hN4M9#%5{WY@AFrd
z93RgZcevlo`uFfua}oQX<r};`_}jFV^5VvESzyNr7Q(ysVrhxGuw>efC{U%(_EYCJ
z;)8DF*_#$sCD#dKp&Oeqx^hE;#?=OlwhR+cHKXUIoKOeQ>_}}^b}MJKP1X0k{7G~o
z_n06csgpF|#-Uk&?zR1X1IfIyMn=Jzv|0y7Og#?kBnyvDzhgd;eMntoGqQmhDnLyW
zF@s0FTC2&U);&KJQo*0I`K`sLJOf1N^vxw7jMKaosjQRShYvNk5$qU?=Jy(t^9wVc
z0Czr<#a%iJg=Z&*o}`p)&H|I}sgKW}h~~Q0&ne0OrAKDL$XB8V5U{D_)k1R2T|x%8
zTpOcBxh(Rd(Cx&9^EMjIY?t>OS03OlKptZ+RD8z!;IuiX<kPzaEJ^@n;Wn*JyDU{K
z6cAyp3&cD-lZ6SbUD<tOdtoMsu0-$VQmniDIkYZInzw?*m2Qu}bnE%yg5i_DyRUI|
zf7rvf*LyMQOT)1N^m>9|b(+UK$hd6g#<DQKxUc>f)0t54z9c}a?#$^EnGuS&GROWu
zd@d*01(A07j7fAx*H=MT@_0Reoa@Xd!Q-_;EcyEhL|b7-#!wRTfD#DLdw3n@Jmktp
zQ4_+5T@${}SS_|H^?~Azvbcvn1lcgFH0j(V&jQ~+!W4J_!roK|$rRpA@VaIbkp75t
z_Hn!HoH|d#r}zB**1?4nfIO@rbrKhcAGnd;g4CXsx)yU%j05}3#VI18y~HU&_#PdU
z1|IT&=&K&IWj*Vj28F1N=8^o65^{v;SQe1IdutJY^z6s$)iUCZD(QoVig@~G@)gj?
ztZ<95@+y5JjPn`zArI_Hyw1BUXPQ=eg+1~w-Ruk;O^B`6HTAyQX(oAr;Ws8u(sM2w
zJ7p-!+5mpuQVgimJS=klHfF>r+>aZ7^|?6RC%^0it)@NNJTUrBKo){UuUCf@;r_IO
zDLz@$6Y<B`0rq=0eLo_4$w*A_?p!+0-SJTo^~ePHv_+Hgsa+FErT~<ENP>?!8hwoS
zm)5YxR*|)-NbUM#uztVrG1X06JpI=mI;MOF*bUIVBUJz9ji_1#06adczfd&d#H}lR
zDeKp53Wsc~7?$A?z~GgGJl>cI1N5eoZ+YxSqcG9t3;yh4T_Rw!VUOb%BT}`Bi>a8k
z$AK3*nwqIKCW$ddlr*=JtglR#{79Y88j&jue^h<aX1e+0pBv-;dg^<zUyf)t9Om6w
zFeYuSaWDhmI7H<h?jy7}M&7+Ua+0z$D7s@+um!xK)y7IDa@;WZ5sT9`An)=Cgk;Xr
z@!Rp|hf=boW}Y&>xXCc8Yu)wOPD9I!t}u=-yCMHphVdY3lgD^e<i{@-U6W+;IHIQG
z;pQ$#dJlF~UTNr>McaC`4tB~BVB=1WCip8oLz*j)Inyj}lN<CGj4Epd5#9fKtGyUR
z*>>CYZ}HO#7Ch%=4`#mOllM{B*~;1P1E6Ej+x$#Ph@T&POuO05BlrD(BT*l5rARO_
znn)A)k#524YAIC&VAvY|aX%A)@kyZB)Qf@LTjpnakQz39`y^)Y1TeR7`0P!M_SswL
zqiGt6?(!a&No=tbn)ZA%0jBB#2JA{80+@Dcxa*2qYg!I9X0|N^0TzN^LuXqp&p$}4
zhAOK@z4?ahO9K3F3S<L{25;CCvYeepLsM%8_)=)(c8^~IPR>cqXr4Jzi(tnQWd0NG
zg<u+(5#5N*zGIOZrWz(p6tiP`6Ex1Jc>3g*&FZugNh`&^f-P!=TEWWr$v+!|&alER
z-SQK4G&^0AA2e~A&Ob8yF~V0=&~s4Gr+Meq-Cw2SxX0IMVeL~R@?w>v10uqxJY{Ep
z2k4s?b-sL*9Kw1<j$mH#!-WN^xEb(<S<s#RJ2d}>AAQwAK<3<8rGG25iZ*Jq*a@P3
zFW1=#ll61Q!B?t4xLez3;e}oAcZP=gGtV3D`b;UiuJLyqS>-^J@oi^RT&_Q9ANBHm
z(L9&K4tJ-wekplhxh@~`TE8!pkaVBvuP^h^cjjF<Q%>MN&PHjU!p|qi?6#woQ$Krt
z(+MD^Lge}V^k%+IUvy~x?vW2Kgso*q;%|l|bcnEVPV_SBGF*H=T>qN|cuEQfcU*)6
zYeMmP2Bve3PY9Zy3;Gjvg?GMN!4c5J%lg_jlG;%}=c<-Aa;8FdWj$|=eM?U}YlMwD
z^#EpdkvR#bd(4VH>HO?1M*$vmT#t)(avP3{1E2c1<I;U6df(H|Ht97srac@TaNzQ1
zduK%A+K>}9HW^iBbeITB=}?%EOdbMt!<ddgD&UTeMl~B#a+0T2%gW%cV5<16AFNle
zZdXFD*mUt1R(Md4N1zunc!58E^;2E%i+iIt@HsQH8N$Pwf|Zz(##%zu*4VWClf%yJ
z1vrx^rF29a`Dn&F&a}zrZ<|i&VTlvBlExJlr<iosk-W8oA^iVB(w`FJH?Va4&~jBH
z2;uo-GLXC~gazKXjW#7DKHiJC{oSIqd4cmi&nm{M%O4VOEeJTc`QN%g7dOkEMnJFd
zk9!3j?NrkFS^u5=P|z~sxKG-D;QcoKnzZ}ruL^~d1>LEuJLv9Ct@CHaNu_l;S_dz#
zu1fcEcT0&m8;qm&O<?s9(AfAkH`nl~b0vkIjfe^kt#lV!s|zh!XU__LE+_EO$<pGZ
z!a;7HP*kL#wEK~1d5NXYL;)rmmc?5m2jY;^AA@iPFAX()ZFNX_0*dZtfSkys3lMI5
z2o}vYhU{#wqs^OB91=*f!px}5h0@@%rc$4L#}!9fVf!@l=xG~y_r!RdV}pTaWOVXR
zlZI4qb(pe?7G17%T_Du|s4OJtU%sg--X$Ao+7E??7fL}D`7WDTU)SMvoYNsgySpue
z-5(jz=aWq&m@0M>j&+erOjA_kEIEpdT(;tv`*)~hX3ZJu79%*7#5^V3QDT3xA%484
zfZMS<0chm=GTK&<)zb~!4GCUy+QJV%au|9w7xUY>ZO?zL?9=_Dc-=*aXwq{Zk;>&)
z@%shRn6hXwSZh3gNQ#lQMbKkeTwqFoH%_iDT5-nOOXc#_4Z2zO`agj6gB-Gb0Fm@W
z>bbejiJi>$rJVUdIF8(`JX#Oaj_q=8n2&&d4v(Ge7``R=jBmc)LTKf=nDosSyU7mg
zx3Ma8lGdT9Q|v%Sijy6F_lULWd)*#RI0z===Ki=C-@#ZO<U$efNyOLxJ8#WXr6F(i
zDppI&@0P}rmNlUh18URR1_$W_3RlZg`;u(=i71iR{WdJ{@dUIbPtMl{4Ts|`#F!jd
zXD0UNlehmO&yZ0kk29J+XGWr^&Au8Jk4=Cc#(wQf#fgc6m%_Un*xN&B+PvxF%;+)I
z0Q0RQY5&b&+x>v!K-Hlv+W3a=sdOZbkx_BIP+GtL&LduMYRzvNvZ#Ojg9qr7n>d&o
zzN0**P#}~&AwW`vGg2Sk9SQ!pL&}c>A&tmgE<~dZZeCC`h*+STE@1DdFP02DGLVIy
z5`zBIQwWSQnla++&O$=(|JH)Dx}M3pSJ88>V2!>Xlt&c-i9V}VXPU38)Si7>&4>VF
za{fE0d<e5)AcFk(%Z~%59zgCrpw}1|a(7_QCHFwTXwg6Qy2;Q6Yw6Jn7BFig@S{QC
z#iakqv<g6xWck+K8e09y6J6w6qJ{TA1mNrQc>$Z3d$z=EC%lu^@F`qf3~ELk+BVE&
z;ciNg!qXv8fEDN;2wBz&=sqrokBw~jxasp(wa@khFL+^ZPFukvw0lmK;q@uM-Z*DI
z0}=l7B}k}K847oN3B(#1u?thwA#V4Pwro${A%O(cVaQ&VAV({mS2s^eL~S7FI^e?V
zJ7kZQHRHvukX66edcl$Ei4eE9`(UWQ^!$Ruw*>K(`DNpfs}<{hZ%2xcA-}mhgl1<+
zzql>e+!p2xi4#!g0Up1HmaflBXf>+8<X24*mh}NbZD{`w-9RG0%`4na7~T31jF@$L
z-`?yzfIp`HM}@jQ;DHC#!2R;e8IT|nAOXmjdHo&<kyr(3M&4#{D6n9q86k`8GK2}Y
zy%PZQT;18u$=dfmkMfWl=LQ1?WH%K?NEt2o#BtUSu6vAhpT?H(Q_$X4D+}ea{w2Wt
zy};-GF|d0jE8`N9(q|({+pKiDwP%4-uLn-Q8CZW!ULkwoD}ZNy3Apo2c2W8a=`&|t
z%tv^X4IM8sEP}uQ3kaA3lREY`R4Ai+zA5b5FTWGG`+^@#bAboRWgGC|FpyC3ox43{
zacK+h!=VytG?)<00N?iWz{2^gije2!Qy`oGAti`f^T7Hy0+)Z0=gTy|n@eN(H2@}$
zCaix#l;@tm2UvPV^?4>f05(2H&S&OnF3(7J95>X^ks|?|J_D?-DG))2HHwmNR`aE?
zR3L5C0-!^9CLjY<*gHdCCTVl4!0W#^!x=iWz*~L@`0szs{GJ3EH-N0XCSz`<>2S~0
zMInmVavs@1GU*&xkd`R`4(R#@_Bsa|P&s!&d8-T2j6ahgUq9P=9hGR#W35@>u^$0?
zXQzE9$Cs8K0bci0z{md{u=%{ncTic?rz7I@MTg=0vh|I2yL_R8L<?BBsQLszUY_UD
zl75@%s%?42%#ULQB=q~rm`C&8n*WYtwGD?>TST@vF<q~$)l%L9`d@FIj@k-Ak!e4m
z@l)Ge?Wdt5ONLU_wz3denzmL>H_7~4n+`Jx?K)~%RvdSdLj@op&TljpWSZ_l5aeN-
z1uD>N7kKb~VE3F_BjNUKq%rDZV)c_QYzFn8E;Ol?*#uNzy%LgR!wZ4_gMePhGfU~N
zJ-G!S>7!DJK)?b9zJ2ly+u%pa^xGBzWG7t|5<q_otha$C3LH?HJqJATlfZNT61eq2
z_bsMM&g9zkI0YA=7VKJk9dP<hz}jm9thf`aGiiTgxr;M>enh{whUz0aUeNJGzo*7n
zQGg)mZ%G1p_P+ubzdi#}T{PSSzVIJ2_gkPOcp#Z^gHez)G-eXazBO;P1kj!VL}HC}
z>Fa>yd#2s+<4bE_2HbcjFua0vp3s|2j&*v<kHuNOYc63e{>XElJq?_G12B8mI=3Wk
zJgq<ks`RwKaW;>;W-}Hvbi_%|#hn&#-zDJ8Y2d{dRX7VsKx)A>0Sq*M8?}&4%-Un1
zg*3d80Ms}TW&Z-eYyL3M?k067ZMg5tfm06yH=oYhMU7!pf_Xh#&NI9bNS@0Z!8wn+
z00(RSXFY;FV1cefl5sHSVIa*iY1ksDa3dGaE2UbFCvRwU^6(n0u7|wWbZrot)}93(
z{}EvB(zI{x_|xoJ;PrnU_{9GX+;}P(3n<UQ=!|kkb^s<O%ewR<l0Rnim^M-!%lS6}
z%Z~uh{tB>rEq`fa`~*K{+I<m0>8578`8sN+W}E|#N(iHd{N!5mz!!2TG*l7YqA1(s
z5GRH<KMM@D>aFuQD0^mmzytRK=g$EzUjgpiAz?nWa2{pe198G&+hLAUAOR%Zp_Jh~
z6KuxWp4@Vt2DBW^bB%Ik$?;5mF33JBB+A@t?*ZXDNB2R(Fh<rr#02z9!)h??bpZ!P
znJ)0)4*&}f126q&b1ZNvJ85W^Ru5Qx9dPQ6z{>9n5B<{L1h!sqds(<#M32L_)=>Rq
z$0em{dOzfRArupQ^*zA3uk@eu+%E%rx3cp?JP_#h?EU85J~~tcE;Te7i8gTlJAr5Z
znWv1%ABTQJcG;O_;LMZ2!hJO~UIMp2J@GDUsG&ngE_ros7I@@g;PxFQZyfArprBq<
zQ!k!uED{e@Mj`<cV0sWj0&}N;SN%c0J#YLz;H^KV_HEBaO_J`AJl0dNK;iG?@r?@w
z$PUuIZ>NO<2WcKun5ld2QO~8J@l##li=sC0_+JDTADZ?Zog8Y<0k8Qhz-NCRc;T&P
zUMLST30bymn4+Q(MqGUh_bBiH0G93t_O7daSNLK3*q7JPM5zG~jxrT}*fw|&vgUyc
zG_cQ?gW~ob7rOPK;xZ?B0P7_{!odM>^%`*VrUfL}o(9_cfF8$;R|3d6+&=SfPbNlK
z9}75ef(CUwOBWd6I5yHafx|ILrtZ`UxS;zyMgsKFE+W=Zao?<ie&?Zd=4*h3`+;YF
z7U<u}3q(|SYR>~JuLf411eTr%2Ms7)`yg10&`^e=VKf>7c)&nfV}o7ZSBIuA{ukif
zSHKBC?%xK!_+NS80LTP$A9&D&E;@Ro-<6kt2YB!g0P`28-J;`5ORohM9s=%uj^}5A
zJh+_lw2Z|Z_g!`7fc4h`E03bOv4KUK&jEw&Y4=`34NZ@VlvjHH)Ecn13f#D<fP~>7
z;awAufb#n~4z@@<6|_ZmDrY3$_v`+cd;OA2ZwAi161euM{1{?;5NI+i`#tyUGX|n*
zMe>7Bc5nd*)axqsEMPnoY~Wy~3*2)7SXrt5tQ!iWDlz4~KtlvP{^x<^C#HR8Cyzu6
zc<lRCsKd|v^KgT=GQ7z|@23Q?pwprm;M|vGX^ZzKay{~TnFc60^we(LFpek{xfE#&
z3!1O>uMyd&X>_y8(R6BIaokA`fjb|8>0+jttC&xxjH|)ex!lpFKp`P}$_~~u9pKVM
z;QU$O+6}b;nvORY#foXy*A~{o%7#}$A_&;)Bj^R0(|zB+akJ*Wfg1!cVx#m^sP{oG
zjWG85(@uq<q+K!d9j5&T#qdWW19Q^;j)1{lb>M)~+ylTPKMuV3FMzGjngUPM1D0M5
ztUL)UJXQ@fpmgp1nRS+d_i*3UG+aL$I`X8wn{pr{1v_DZpULsvF9O#;q89(===1*$
z80=*Aa^44aUe+*1!O(ai96GXrrBo=4f&MP={=Wje>dyja--MIHL`{+eaN)awyMG5P
zUzYO43|~gAh7CTKl<)L_2fustxy&Xb><T>pMQN_%h8jAg#D%=zjD8F|A_1IP2TrX5
z*RCshL&kv6A(^$&Te2>KCcQoaNPP=ufycfJrnQYlPyR{Ztv{O8q32w^o|wzafPT|n
z&*4x{L(iP=T<;(@)4gjR5c$=}2hi>)*>3$*UjNY0<jMIA9P@(!@W`JA)?PpDmY;08
z^v%HR8Q`hE2gFG@HvN2TS(ZynX#(G$PtWKo=L>0c_DhsEhNjK}&|3rcZ<%1MGh~q?
zJy*_=)=;g~Zk9kef+QFvs3iNYMU$!Zw~mV!BVmH9O)Gejl+g-Ey&!@(A<iqCp9T8c
zz)-SFAixe|NB@EBxx~^up47PJQi2CvKhPT2rl<{^I|rOO1Khj?T)zSA?IBw`LnQmj
z`;=M-Qp*Y3gGMlu6kvuvf>~Z4yIg>Cd8{_RB>5P7c=9;QA!~3J$Up-QM4&>Jgz94*
zU8p6p?|5|?xbFeAAW$9DUIgy@v%s}q2X4L#SbCMR1YLX-5H%@U2D`xZk0#$&GOlq8
zmfH(s+K;5+CmI5PG<*TwmoUJ0W9*dK6bhJS=($h-dtm)_WL!$<&gX#Vf71;V_`m~K
zInuO-CQO3cC-0A)ueZIsz=!`1uy`Nvz;^%_zEW9bHB=wXJpin{5xDug89%G%jdcFd
z0HILx2weh!oiCC(r@s%}_&BikN)?K)wl-e^=I;aUK5JgL!4Dcb&crPQ%Pr1n%d|Q#
zY6IslsKu7AU03o(EY(8GaUzICQI?j<#K`_%`^VK<H2^HZI@`VHOMr8)2CjT8OE>0f
zBAYl30{|~Lkn<F9l(W-)vV${ZkqbnK&HNZjPB?c4IQ{=`@4cffIqt*EukXum-n=*A
zO%9j=0V0qDNRR}@Ac{exD2kLsdDoUGTT6wtBuhT4wRL>fd)6XlTef7MRr1P~CDU3_
zS|!R7Nil*E3?MN?jvN3pn4Htg@!sA)>h`_Wb*rkYZ+JKTzH|C?cXf5DuBxu8U#RJ-
zRkPGD8-uN#p|>Y6!U|D!OsAxU#Ra(Kr(oBc+WkfX!1O)vx_=KxeifE3*XlZ8tT&=B
zYpshN`({1t+SZ?Q;vj6krS={ZhhXU%X)g<Tw;kyr^;An4_|W@yf2iFLA>_biHk8W;
zULn1mEaraV4?Wo)7*GQvJHHRMy**q*yPLW2Sy(t(oxwe6T<P18Jpi<k_~yRY$ZJOt
zY#LV$&rO?Py$H)INurc1_oT5KJAMFWxbX+o8@pcZJySYud;Yiyi-Q^=hS{*!G=KDU
zMT%|+6U+`ma;?gQk;!`k6kuRbeTSP5!>*k$J`VeSpq?Dy{?-#Og&l8)$-7}>Cr$PF
zed!2X_=Y1rJ<lWvE<${H=C#yXE^E?E-=&3Jfg}IAJaM^05D?<3KwKAf7PkD8)dovg
zn}y2{!I>{WaZ#DI4~j48rZIjHF5O?%q|FlCncF@V&a3$f*5+Y&qIutKY?l%=_S5`g
zLVsfGL-<_oCi}KyQKSaBr>3gf@s)l?Ic~**zEED51-+Yh!&^UCwgB=zu!{S_XKR9M
z`Yz7?k!3Ky5{`CEKV++?jQI&%eFxn_zETI;<~B$K2YOwJN|W8Y;P6ebd2{c!r|WU;
z+{!+-`E2^yd|v&SKCWXfxBfUBcz3%~TF@Dpf?cnLb6<txO5@jSlu#FP`gYdwWP5NF
z4!px|xj8rr*T0kRdO}AaE{wVfmpPGdZ5SU|-52S{T&|1?5e!Yjfe*l@Ticxy8$(=#
z8;{c1U~<;rb`!Cg0=JUN?E>yMIiZ%76=iOG{kjq;BvuJAW%FZAJ5Zm1x#D^#vRKw=
z4`aIdv8#$2+qQi(O&vJj-6ury4PM0QZC%Q)yT?eZ5t2BSZ;_-=xf3up2D^4B;la?5
zRwuN|^sGfc_sb8G5~x%JD~>X!AFpg%zKhVm*ych=w)F|yO_wx4O}(SLMtlA*VD1#`
zdowIugkvA8PMmCBCrfZ(J>E(+q#hx3E{lyI$xq3mPxQHZ1CD(ZPJSGAze#oSCvR?B
zvh@rj)3EDpaPBiy{tXqYq4F9W{|UW~U0x>xYsvpJUWXe;Vdgm)-=i!NCJxZh|8H;%
zcH9FOzX{&<Vu(7T)C)p~VsnFGwJwHgf0p!dz3HC_1R(83_2MPCdR@Coj55hh>f-|3
z^8q!e6_ZhPW7zX5*mD=0e++A%u2PRgM%xsu?NqNzBg5^I`TuvhO|otK<~69XkN^e;
zV8;&SB5GhD{an33P1~TscdNNv3)3o(3z=kn_<eBG54G-@g!<XE7hd{)c=A8vA1ey^
z=Qo*<yaq6_4@Rd|n<y@p>y+{wsfl1@>m6l_P0RI$r<5>d<wp7XRLhXF?`{c8#oeGZ
z>T~+U4^0o?o3KRR_gNm;ED=l#1pOFPk8OS#9QX+soM?ASY#eh(VST>cPmxW#C9*aC
z!aa<Ps0RMNy>R1(GC7``*9L}-MvzUIkO&X-ITc)UA;enRq|zx+fRHsHP>%q?XL?){
zw^Z$r=s(DmNiyZ~str(0PQuO|uw}|_Vbo1O*3v3meKb9w>zZ&%Xb+9nLG2vebqWzk
z=P|1w!Ew#=-%yJyzDsamJC@}ix!(!Rd%k$hN=sW_vBfd-TyYJ~-wzkQ3R~}l1K$tR
zucgKnmJrUKAAn0=gW^oBFffX$lY%Duw(p`3u(^a%i|5rcyjgXWx7=R8_1)InVCH${
z*1(38d7+yL)pGS|xQ1wi4-dn^1F&x&T)PIBud4aj^f*)d;I<zk)sC*XK6O0*J^w3w
z>Yr$WMJ(~N6v-SG2i5_9YU5VcrWLa58d{iFa4@Kpji#qzpa=gu8`V$F(;u$qdGox-
z!S9D#-oG*LE!4-hJF4ZeQ~&S2dVA}gu=!wP*WY{yRv)+byY%~ogylIdG{j&xjUx$V
zvgSOn#ZLwnv25#MQK4+kS>7)U!`>f;9dDy$+Qps9jfcaH4Lr)wEj2)JeRE&@yaZRk
zIT}t;1Y5VNWn~4fT!U-ZVQsCP9koP@qVm2bOu*<&==ZPbd{{aoW?s%rmz-KFE=jo0
z62a7dOiAHORn4p9m_BzzDN@3j>Fuy%yV@=ks%6?N@1?bn584@Adji&1s90kp9lb=e
z*PQdfHxGjR@0x>IUK&nU^Lm{kP|)7jv_{aM(<hJgPI%}D6XAiIrsq9qIRClwhADKa
z$hx)d%0!%Hf8E!gg_)x;wgdLR3wFOHJ@K3n#^5;Y`yn{~Cq_F=w`eTy>#h<jarJ>k
z1KamrnS+bpR!TOTZ>sa5BiQ{$IR0@%3)x(o0!jS)g3xY4<~xWjYx5YMB~hkH+Qvfz
zYCg8zdz97lr7Nnx5k>IIpSHLzvIrA&cHag2?uD~QjML)uB}$&bK-U}z`tj5;?Rd$U
zT(4A0U(*y0q+A-swa*y?qa#Y$XxldRFM{5xKcaTMQ<DS<c}Z@!=Phu@&usKd3wfD4
zRXa`u_BKeX3=l%ck!<lUep^{m6dKS+-*Ow2*3}$PYl+gX(Z^4{b7XIyS=(w&OeZ0Q
zSRix*K3`y2KJrY<0{ytl@*r7{?S{iY4deB8hPs%z2s4kR!$SSAnNrVINkN;Td71b8
zP~kwH_Z=C5eS6e0H?JD{H)hH%jv%FdlQN$xn<1w(hcs)1*eDw@IE4r`#~Q$AMrSiS
zwuM)O2HNS#AV=~OkAcC0YWQ#822+!Mtt_+5cMF$}RG&Xto0bU9v=^F6w`p;OU>)eS
zXd=6;5we~$>m5Rb1d^{ew$2L4f3`tn*D+r`Woo-8b1W@ghGYL9octTu{XMYnoiMs<
z<I<oP*!31Tf1jGSz{F;4RLXGemlE6?VF^o@8W11=quXHn%i+os>F4u3lOS{(&9Xd5
ztmR#O-elP^tp>{H7hrV^ZhKG01M1~U>qFf0Q*iddYMdI~B5e*b+W>#Xl2}`uR)+xs
z0;>?A<hZW(T9cbqnoLc$`b)QmdfE%2=j5q#H?l38u=8Gc#V^u#N}t`vl_%iIKk&!t
z^#A+n44i*JxooYM!ExC6TD2@)hPe|;n6NsRjwcoc9fb%Gx|J-Uf@=`bB{VQy8Et<Z
z9DF|v^y$QY^WTB>#dNwhLbEHrkmqT|fJ<m&sNVP8JfW5Y`(buYStZQQmCcXK_to7T
zC7Ssv0INX3)MCO>cA6nX@J)j15*C<#Pb13n8$e3pu3Hjqor0}fl#8Ol!ECc`(~VIS
zDc3-S;l|##)x_&?^%1+!K-?H@9PJV~ZB*wgONd}TQ<kfmkmn6`Ym~L$>$FqYSx^4U
za*O4<c9O43WlMx)U}${_&VCLqd;zw-3iiGertWNCnsgJ<0NnHs;F;g9Z40O3dHyG^
ze~ioOWbvZ^nXW&p;tWl|&}QZOXlOz$iOZ_(uc!(T^lJ-3H{x@_n<YH32@v!?Y;sHw
za|sa&1=VK0<!4}cMAfk+eN^3rc6`Un;J_Q;)He)a0MrNy^y8`azGX3mm!^e+?y{&x
zh)}F<`-BEVL$GZtOm9<)TfIu2HbbL=hR}L>qxveN+u>FJ3~_(hfh=8wnHOQ^1-SGG
zTz}4Og=Er63Pom_nR!83A#Ay&@oSImP|MEO!qOF(eGz7l!)ky#aTyQTP(*;x>G-tX
zZTq2%DM(262S(t~kHhviwENB5%gkfh4GZ(z*sKm*6<Q+|U7qKv=eUmR8AAqE8hyv9
zNwvf=%+JG(S(urH)zxwwU7IJlpCM3)sWzl+^C85J{oI-xo(6zbh+vo^>y7@J=a1B6
zW>b@@@jtm)?VH+H`nzRmYZVI0%BIt~@hlV<)9)Y+gpH%0w75dF#!caYS?AaD&Y^;X
zR=<CzkvH$<jh{FFWep-{<sb9BL{Q*+Ha%XksD!E4AA^a5u;-mh(W5X_cM|sn+wOs>
z+u`~%)i7Jz&9rFqwcA`4N}wi8FRj~6`e%;A#RuKj9~@Ugg@k^u1BC9US;7OGP{2H<
zufZ-<7~2EW-&Ji_4^XXVvn-Gj?)hmr^MEl(UmmGXSsxe{2eD^K%~fD*n?eL#V335{
z+!H0~Gc~D%29uk+%lfz;Hd?tZk1(MX{TH(hdgwjn32TM65wFAiS(tlKEi>go@U?|%
zUDFGSLVDi6_)RtNKQh(4>yJ&VW#_Bm`HyPujf`jLhP3KI1|{LU5L@TP6(=Mt2_HWI
zxBRSXVD&TcI^1~NV^&J7)Y#c5#J+D{FBD&8nbq;tpS7-ZiSvawdOw|s3AOCs3rovN
zkT5&1%#kZ|B^cU2P+k|oWp$7$6V1}t(0v!%1PP9Ye)2r!eg|VCs=+@s36m45vs3fT
zIWRT3y1_Z%m2aoh&sUag;rcN%T=0{pVb*B<l2^mKRk&QuxU|LVNh|XmLI(-^Des1+
zXEWWGg`OX3UE;Dr(A!+4QthBv^6rI#eI3UzcM=vp45vN{yWa{s-wH!b?6~zBhkg{U
z{YveBqU6x(b+zwwS5qdj)(%;^0^_^W#~07Txv!C$+dw}Ll$PDfTy1zB*Jk}xPYB(M
z&zjU#U+N@vqRZOeWwEgTz0^!{o(L24I@Tvl*nS%vcq5$ps%9CG4DRcLgW6zWiFCbV
z?K2ju@0P61b1L&6Xu^wRt@kG;Ho>+n%366)6K3{u{gBme2vvOZQIB<LJ=gG^>w3mg
zNoj%$8%J>o=1;@?iL&dR7uCABmaa$4vaZ(w$#HX?=fB@>ifeG@OK|wT5H(ph{rdAt
zc;HGCU)pqHTJ;EnT``E%ujqq(wgEr$cw#bH(6%E~oaA^Rsy$waV9(p&;E$HIrusZj
zES-eXLN)D@Mc>!c)(nfymYi*0UkBnF^mQGpG&EvIxQ7~3{+!{}3*~#yEXGEZq<i-c
z^%I_7RDy)L1z21v56YCEt8(k4oRpulCRrj<1OE+cv&QyaSF{*qUOX|bga%tS!|<@t
zd2*D0S3Qum6qh^OMOh47eVCf^rRTTESX;}O7Oq>Y2yQ|IOsO)`V49{bm37~MIE~<P
zO`^YZmhd2CU^~y?Uq9v9TzRjF>5};$)8hHQlgnx)m3IOv=u%u;#}^7!mm6_O`JX-W
z2{`u|n7$Wwy+bL22x&GShFx!f3tuDsPcZ)rdI#0)oEmFWn4o{(#S1X5%~!E<9Zr8i
zDW@c4mVe83Ry)HPCTuA6DtYu;J#W_Ku6<WuH?s6slYUpBknZp5@d{D(TwQoDzE4?g
zIr~w`{UaDC3lowFk<D-O>VFI;zn->yPW3HfQf`NmI$O6Ua9Si7!V6tkp!Zoyadp2?
zP>M!Vn_<gjT4>M@bwXCVA+!IS5b*!6MD^q&uaJW5vhHe!X4NfczXrQsS5FEGS**>$
z{EM(~s%%|w5|++uLPD)f>w-k5#gW<OfZDz*oi98{%GSy?xOfD1zrH!wEv>@2uPdR9
zO#w4#cIggGuO2~M7<C&qZ496Gh3&Y$3{S!>KdpT03W~AAF!55D{f;}`5^P#Du0bYS
zSTlYGd8|$9y>7^Jx58ah7D=Oda-#a2i_5UEsDufNOR&764Kia07Ah}Tepbu-<{?Ce
z5|`6tbVO+hO^m~)akXztdwt(l&dqR_>mqZz)0ul7)@JgRJ*d@Y6Y|jv7if)Wakbh#
zS_rO=nmJf#drqIbo4o1KZ+W;I-ScG$4SWKr5X?CdlI_$r*WmI4aP?a-c^m9}J51f(
z9rgT1ap>>E#cx66(Jaog=*`k}OX4kEs)nyGz^VJ7xZ=LAPiwB<>VR&fS>>#edZL?f
zSpoanx%$3sPA}7ik!`NOy+4@$IR}!mPkI1w>r3G9+u-<@P;OGoN=R`za$G`LHJ3Xb
zrUjE(*QCZ2jbpmU(^$LK#CUbyxJ@0b4Ag3T<*!-CLjMaP$CBfDtRAz33CXq2d>M%0
zwjYCu{dFa$04!gI#Z$0wQV9&^Pr~xmTH%1rnkY+nV6&!A;_Byg3wmC>@g0~v1mg{Q
zGFiF^XTK6Q_kqwB21Pj2p+r%2&{5yU6PASQzSCnZ4CC0;?eNl{gOTkbq)QRO{(l5V
z|2-6EYZcbwavVK9ldw3h-FJo)p6<Tyos~BttpRL1-$u>P%WMoe8b{9e*{A{C2*$_M
zqQA@X3aqTa@~T>|l-FzPsZ;G~<hWIcupo+HcnC&EmF2|fs1g*6j->rx+seD^o8yRQ
zmUArSKG{w>Je^$buRcUjIkT2eYRhZhGS`oU<~i4~gv>M!(9qAUGd4hoV7^zLW1-it
z_js=nlDD${VY!klD-UMmuaJAWTp3mNv1`?u;W1_R8l`GoA8B=BA+A~{%p6t1*U_D@
z^DVIL^-$>J!KH+e?XdsdaN=*NX$#l<Pt1Wm$G^j6nY3`RJdm&kC+~B2g0lpTc}?^C
zt<GpCb=Nz&Zlc|z%fGFyU*hY-y4tXX0yXW}WIIZP2Kshcc(CaJY<+cO-^x^CdDAaI
zbiAstw3H|;X>N^TfO5TFDhm}V)(4Th&8pWsg#p!P7#~yXu~D_u2qC&Wk2D)^9>d;G
zPN+H0Cs6PS3q0+JdOw#-X(8dv{c!fHuxYmvB8+Z@(QPoY6-Ks{*HbXORn5E8*OXxC
z94wtyf`UX~u)b6k2AGxwkQNlUgaRRg15>%s3=bY-X#*}rtHDi;UGvIgYDwB<sr0a<
zi<yR<nqEDI2oSmnT{vKdnH?f?TVJ9A-1I&;_&zEV%nE6Sw!(q;!wbKUw=r88l%*;x
zs1X=oAKcW}%_6Ijp4CXIG)P?yqNujv<lXn&Yr}}j1NWmaWgIG%V0BFi64usWeO*mf
zxn8U`9E!#2vlokomXoISG&HEphKGmJYp0MV<k1}hBA;-;3`;s$NvCRP8yx-s3~g!G
z2MOcaBh;2N%lle|bZlIi>lGRuzzq>lx;j{O9V;Jib*DLxu)wF$)-1t7FOrq_^5na^
ztY4y>;l?pvhrS{xh#c{#j!ncRix44#q9!;<2GJs_15_13LIL8UnizEH5}f{PxbSJ%
z{(9K{78u^%-0#+H-1LKR=8Ld$BRxoGQ~0Q$X$>b-G>DD;gtcWj{~#<~hNWxiX9%@6
z${HB7U8WDKjt$56ziaJ{%lGY)kDN!zO%D$d9wcqq8sULvd60xB`+MHo{C6DR54V0F
zTzRlMm{=?-A;R)<T2X1eysWNO<E7@nN!~Apfk7A^gux-zj~E_O_p2G4#7N_fQq<}o
z@+#LsxPqPk#^v)u1PS%DFC4g(5=@1J2$;VBi<i=ZFVk9QV5lrq*sg>MBU4JiFf^sY
zho)e-yc9<AJ!>Ztufer%DuKb`X;?S|rS)1tflYYevNUiB4)kqTJpH?ZU4g-j)5#1^
z!O&!V|Hrj?ID0=VUbLi-Yn>rr>4GHdR>Xx-FA?I}WMmuM`3tb+j&?t7=QH(6*zqQ~
z_*J#<a|@N_#wg3hK|Q$K++-bdU1wkfZvH{IeiSZ0o<8PtVU)Gs$rK7zi-1nW<(AC0
zw#C=?x4jw;{x}SDxYo(yNm#vBTh8=%)XP@4<hO3bRd>|mCe0^M$TA0S_c!(l5^V2N
z&$Wd#t#Hrh%7d=_=gWH`u8hokxLgk;$IOY9la9XWwkSDfPWEYrtuMi)FT?B;aNDmo
z@7r`E17mRW{|wLmVRqasw-K%Z|K#}9r^22oj}?M1OlUpzxGD-cC(ri`ak18E<ZTz&
z+I=>6oVvRr)2-3aCK%lTBRgPhk8<hO3iiAQW*&p})oQ()SPCQqkfsK+&1brAVA4#R
zZtZWilaM}fX!*`+w>ImW_$(Mhp3j$8lJ-Qr3dPH?bfvc3nakj)5-ubHh2bqQI9V1n
zOv2D+rI<FjnWj&q+bnK83}^l-T?UgSNtdkh>2g<;q<xkpg8q&4?GP)&PQaHJHy^D3
zx);8ccK?_+9Xd6=dK8&Nxf6*ZD&Hm9wuRMTIY*a9Z+|7+`A<|OFNAU6@5AhKuy8h=
zmNxeT`Z0at*Gi@4P>D{(v0(e&W|%L3Sod|xT6g=tTg{0vbu(Nk3lL)M8O{CFGY5!$
zv);2`ah3NZUs<u#38}nj><^B?;U9<XZ)o@1hH>o?Qe{dnPv(BCZ9}@erNYDn!HMgi
z;;ehXUZ><t+nR6Y2us4_4yadRUtL<~b^4jyc`q>E1zEpPn}2Ni$(zS4n(4OvM7!M-
ze(J|6H`A76GUb9csb}Kus1&CsR<6{ERKpU@)|IPJT86@CQ$JtVvG470>QgXxn##9}
zQ%=UK-#ga-v*pFs$#)5aTzFk$)hRrX`lNN_`M+7)*IDP7rv#qUZQopP*V^iGpAmvN
zN%HV!HBtH4cIB>ZbZ1#$upLIHH?E!=*$H?3HmqJz6RIZ5;#pWYr?hI5dK~TfOL6UY
zhic!_3`@?9jXDa_>DW*0+t9W{aG%(?*8cBN>ofNo*H5B*+6^J?3SYPnvn^q3V*r$j
zRjZvCO(19N`xdl#r3Iysuz21bKM~{&jF&ALHp7m$!RA*q=bJam<u9vrsaLocA~^8v
zSH2VJZL1I=qb<-Z@(8E0uCe*1`ma$KAU%P+QNLN!Cado2qxx`z=}-}&U?odS!=|Mh
zMamrV)_({G-i^J*A~=bL;pU%#r~jRj)cbz4y7hrin=uLB2+a|nRf5j+%c~Xt=r%Rr
zyuReuVDM>yi&ji?@RfOU-?dEKT%PM>N4wu9oa>Lc-!BQz%9pM@D0#Dfx>1X(mALX(
zXj~zjti0Du>la(z3$0H=ED`kcLN$tY3j}jQWuGO2-ac8r2;&WO@Opu$05AOsc<A3|
z#Ea}2z~KMJdRQJpv=5~Y*?2<!XN?ZNxUQG=y}RKb8S<_+E8F2o*t84Acf$B?7~4@6
z7?cGC105s?jS5PTFtQW2+?_tQHUo?2)S&Ca8KsOie+CvWt2vgFfk@x~AW#3Q7xF|S
zG-{cjgpF*0Ew`%eD^Do5caYs~F!!6;rgi;yeEBA6AK2bg7m{ZQ5o}%-Y!*S40rq()
zE|!%SF2U_Dg{aMz{tM5k`3)+ri4DPl&4rOoaG<Aii2EWlzW)8p@9R3&31nGi4vxXt
zbOSfAC}Id5i_C%0D@0LM&{o-wU~D(s{lCNHOWOT}-OKnv*#E<D;;*o(#w2MS$JK4!
zpDt9llQ=cP(;N*8{ac&+A=}A*!q^Vj`5OHoY}yAmUa0O@-oboU*EWbSH~`-_GUM4M
zN7wU_xkLrn|6VxoKDuhIljZYjpvyH`a_FSWSk9|7;@bU^9fT|2`RW<hKGa^zrN!m)
zA)9MIE4&SK%5!uB_2fM>pSki~_RY)Zx$>7SPdW0L8I&bNun9R+$CJm4wN5(eC7J&q
znOr&XpRLRfs>di%sV|o=hyVd#`X1PJ7hHZ!?Z?>vA(j7#@!yES+xf3Yh?*51YPBFV
z4_})sZyXoiZx<p+=%9a}Elq6cV+$LbhFgCGcH9jUdz8DeUSMbnrlw%Za2s4&f%&qP
z!rUn(RG2%h!isCu45pcV#Z;R%pzkH5$!fn&-%aHkOy8}wUjy2$KBefq{bHAPxKC?5
z<sl(bb10b>J{3##<k=m9gd}ZTi*6xV6BetbbR8~y4)*+D>%Xgyi(gS`k<34mWp&`P
zLP*lMUcrI6Zz?Kuf-56io7HtZVd5YSDJd6*YTH(}aur<Gq#|r3B0%UiT#Z$;u@*(J
z=eyzMKifMEv39cO`{2gYaP29q1DN_uh!w$sOJJbI^HqM3-8soCJTMzc1H-WYt-wI~
zKAZNzjbqyT03m{d)U)OofDx+b!U7wn@F~*sUwIjsR_@BCZfp13<mbktweO>sw^X?!
zW8lZKudf9=jSk@2w74!iw76^nN^?I%h#=pzHwYDw>-&SFFuD~ME`;49EC2a~2-bXN
zi<cop&~9zjB8;k+wok51T8L0_u~SOdk#VVd!qWNHeYbAojt{`)f2Q0S#Hc|Jy&Y5Y
zA8~bB9i8iXsK-5#w5M7_NZT9S?RFjSCkn|sS%QQvXjf;oYw!I(VEfD3{gfL=VFV^`
zR?8kOJdR=U0?eF%a}U6&FF{<i^c8hM0%Z0jdyNpmR6TuSfZ++HbeV)rz66FIhShof
z;^p&l^pCCkt}q87RtTwM+T+#;5A<zAkN{Q7g)H|*i5o>zkdXXW3o%^yJZyV?`z+yC
zuff$v?ZN}ojgd=$kfdqWekxypwQU$0xBQ7Z2A?ot;wH<p#!5&!dqN3EcfJ~?916{G
z!LGPbv+YXP4o<foq>I#2`;bsACcPpDWkz)OKZU!0NrVSYBZ6Cg8ipqPKT~i^?e$}3
zT-&j_A2rI}PWJb`**+)6#NPUzvDv2FLK;^-(vR<a9lZA6b*JzEVBxg;-F)vYd2i!!
zx!6kBk!W#6<!whi+qHz=Chzz5<(KVu!r}M8!MDRefSG(&{>$t3z=f^jXwy9NX|b7R
z_O5W7CY?Dkpa>AEY(7+0o-i=KiFwS1@0={M&h7Mp;eMo^c8IUfkmnkCpQ)2crH2eh
z04gmu?SZ|ohu8dbxa%KF`?elJ{^zdt>-1ge{1_Er`W5xJ8yfv~S^oytK(wtr5jt2N
z$JN1h*P_Qu;=0aRUxibD-rR4Thl^iQmOVD%LDu4GgSpydHj4%Q8~DCi=(pc!GM_Ed
z#*Jd-s_op@;pm^iiO<5d@2L4;&fX6fzNv(wCWXQ5`$#*fV~{xzIt`ysJ~PbrGn+gN
zul{A2*x&9q={<(Fz%4%o&-{+sH#-A`g8F$T$68ULg?22q-2qdFp|}FY<??z3)|Zv(
z?E12*>|GPy3~o{yoy*tV?_;`OkP5uHxEiW10oC9b-2RiW_bu&y^2XTzKA3%4`Onnf
zQ%?t9Igor9PRReJ-VW06L|W5i>LqZ=(Bks>jP=zoS@n_7orDh7*VG5)rtIWl<&y8r
z{Ys0|hMA9sH>>v2_2;0p-u!=>>7vLMX3N{QW48Sy%<Qlx!h?#2pa>9Zxb6LL=4)!c
zCkPV)ByoK1Bbq_Tb)>#)4S5IfL;G!6akBn#zVNJLozBz$FTC;B)F6^jWt&A2sGGlY
zs|al?WNi<Q!q%78UT5oV%H`eqa{cXA{eF#nzbu!Cwzft+*GRVYxHhYVB&=ATv^kE`
z@sev?e+q6qUOP`nt0}F)rLR{9`;++(TuK)qZi`%kfRF+1P81%5x+yZlD|w~_SDsWt
zg4q-4a$>&E)o0WkFbCeIlyVcIf$(>i`mgN_eCWM9KGg1q5CRC%{NDd&xc67oz^~96
z#`eJK49p#`)$q&usrY^xwy=7%{gbfG`(WGcDld%ffK9vAAj#w*HITRUHrTY+fBltN
zSh^hkysjT;C;0R0L|j%Yws^j{QKa0&yyjoQwwJg2tr}-=lkyvT?NPg*N>gJ7{0+VY
zSGeG&UM((ArmEvRjqrl<^$Y%bA@8;?Oz2MX<h_Z#YQjxWZuz#{qO=AVF4*%#p&V!L
z8({anu=#*;*{2UA>uYn{w(knlkNGSTY}#sB+esQ^<@+R^ii@!K`$gL~VQ?HutE%Jc
z(i((pw*}24^tw{lwT4E82hGqFZ=|m2)_k#a8D?LEy>FEIN$08m4mVy5vtHAW^)q?;
z&gS;?-O2)_=A44knqD}c{co=4Kc08MG;bd~YrxwzW?|mPH^6S5XM4tl7h&gHHnxmk
z{svt7R`vOHD+!l1g83d<?vC=d8@jPCla-g}&nm${Y2E(*I%^AX<9Qg}1|yRyZ1EDz
zooP;Auv62phZy+KdqjZH6YP35-1~ou_Qpmqbthc;wi;mfnXF|Ewl}NsXKO4iT~@+^
z!3JDdMG?##2Lgp3&1xw1J0WK3m30Ab`Jdpf{|$yG+x_ItWBdRtU4;2l>BbwlHANtQ
zV^~PjOf9bc-$RX;#L=zFlr?E!LcRu~2q$}&M)KaoJ{aGvpQQFD_NfkkaaDy)?1!DN
zf_>ku{*ObORP?oZxbRS80|2ftTbw){{Lp&`rELt;_rg#Q{VN(}>Sj3h3FY1(t3Brv
zOgB>Z<h_Q}bL}TYa1bg?2&qeYU5F4xY5?lSb4rNN?|s?01dsh^IB{S0Ky9+GAM0iE
zx_5S+V;(OI!GX7?HKBDzx53q?)wiifaM0{Q<E;L8Xgedc|6~gb5w6E^RncL65e5cf
zasyrL9{mHQ_~~-@XzNqD+(PCN9GLsAaNl=rH}$khvV<v>bX-@8J8?+~?G`S;+*$WE
zUC-3%Y1pHP1wyCc^QCVKOP1IDOBmbU?x*h$3Ij0pQn>I{Rq-X{`9VOw#*ObBm-hP7
z<+Ax}of=WYlgd(Ia7;;yi_2ky+gXS&Per|DJz2(gz`g$$9C&+gYHV$J8C-n`*5<MY
za$JLM;%DDaBkqcP$9KHaZs8OaRGqnaKKni)&nt8%q5n45wi&kB6d;rt+5}r~Rc?y*
zzEQdM8{Jl0Uta%C)iTC+|BXnCylnxOA7_`_w=H+T_`cS@lZ&_nXZ{MVd`)R0E}w_B
z8_KO>G!Qm_MY9<ghHFP_HQy@F9CuE=Bc0;bQm>VPs|@D3Z`L(BB@c$akGUP%wq3fY
z25I-a0S1QJ{U+_9RD?%<3r^mr_NCmX$=f%!g$<6v*tAkI*zyw9HrREKvPyH_cR<A*
z->uFa+En)2zODvCH=>L-^6nvo^sQ{$t~$|{cju17&hJvz=B;M-J8=5b`Gg0)#q~~k
z6+Sw3(7O@0wxQ>n@4RpxW>3Q0IpuCDPg-_Dn)NAtF5>SYWX^+)W#T5d`A6Zok5t3V
zj(gJa^!Yiq(WrmK<bF$6;L>BT^Pc*zH8`#&l$yRv`INqXRGHJ3)|&UcLVotW3GV)d
zwEw_fV_+0+`+0cmL(1e-@>z3fr54xrJKfjYekWXcJlo%VJ#(x`9_cNb(J?Lz!`9pV
zac&%|UT>rGkJ$m&2dvFDgMQrX%qC$aO{rmEAgwhwFrb8Y?b0<l^_Ot@es{+_8ie6#
zCFB|24kO!PWE+f5!^kuYZ*gmfHp1xkaLvtjAaz>%$Rj++J9siO1qa`u<_5ZPJiD(D
zG8d39yj!^T3_SQjc-;qkyNzq3xC-C?b+~Y(8rJRKv(<!_!CkM0&HGik8yKzcUPGJJ
zVp3d&l^K{j4HqA2UYpj$CeU`Z8Ep47&-2~GT-)wdagSJ@|G*R!Ci5?)Sb^hz0eAe<
z`o2LP&VH_b;epLft}p%SwJ_=QvTf!$S02#cC1f5Bou#Yxxcy{V)n$kPp<8ej(u4~~
z)Eo%H#&O_XaP=`Yv64&c&-DY|2%<<m+vFkDA#arN-D=tMdezyv`gFC@&w382_?yGP
zkP;jmdS|<zWMi1P2@d@Oc>Yh?{Um~puEjO7MRmwVwkWHmvF&Qm)<t0$Zut>acdX9B
z$_>@=TDei3cuVRFA&X{d`>oEvvgJS4ssR8Owl;!oz)(M~Z|iLhy#t(d;FDvEXS1KB
z6`c7PT>P?MvyURIoq>fjj*fc)Mz$(p!svDw-J#Ya(@MxNwnGUp^Ci5pK=5_=eJ&YV
ziPVFgO<qk*ozbmu_}xlLXMC4xQ|sq8Dnw`}&9K_J{+tpb-21`aa?j~wZ4r+A8eDy{
z-A~f}*z(`h;pX&(Z48XU_^7f-xcErzv$U$M;0p7#U2N$SDojYuwT*Wq?Tn<&VXk$q
zJ`6XWR+i?iV)+tWc_g3kz~!DO#GOuFtAb9ex07cIsk>e6RrB3Kuay<vO9Gi5K?De$
zM#zuB#v}hp4KD6^eY@YFkBH#TpNDV#3s}CP1?Oxm<k7CRZTpBzaQ1$<`G=b4=B6;L
zCTQMzD?I(jX@BNIYq{r_l#kASV*mHSwWr|HL+yT&-lm_lxP;E45!Y3X4phw?Pw%%g
zPi1wwYy;Ox2i@m$H|ZEh5iGPpfN<eHIQuF0yfq=)pj<_)UxfJ!wP}{bAK8)?D2z?R
z*v|6yj_SM@pys}K`Xg$v(!6KZH%eJfG|_d1)MxFX5!VfQtq?}H!{P6*{y&E%vW17;
zicecLi`f_9$gjX_Kd1zUz0BGiJoq8F_I&NJUdRWXz=_Yo&F@t%4O_wLES&h<#=J}D
zplzsyQm8;dKW=kD2GzEPeqEao;n<(TJ^!{fR)qlPz69&*jR_C3ga!4uBI?HS94fTR
zn~y@$r&HZM^*Mv`5jvPW!i3d1c;H{d&R4*J?}feJ)jwJr?PPch-0^ep=&xt{%gYKk
z!<xm?Rb`2=^Ht5eW^onHeqBvG=z4DPTi09$hRYMv_8Sr0{<ARi0xVtgm$R(!WIsXj
zp&wgEW9qQdo&=!D={GO}<2#irlM4@*Z;{bxm%6352yyRM6Q@AkdGW?E_y4zDdC%oS
z!0fCQ%1QxA$K2^MKx5&YQY_f0d2=p(9ghDcm5C>POV&5=9Z#;Ycoi0|xCa0R#$jYq
zJ<r0W+R2kc?&FH1lQmE(^;CD^5?p6l2S7S(YzG{ES9!jVa`@0#eht?~G+*06mhiw<
zmP#e1OmO61DIvn>j&{FAYgoRjtSx3w=dUBBT^r8oJRJWd-25IGZnA5v<l3wA8{2;H
z4cfW{2{yr~PoQ9)>zl*GblaRLH<;U{lA3qw%xB=hdz$+#Kq(`g{bIKJqP)U`tagd-
zJ9P`Lx;iAU`SMxFed`SiIVLoffe*b$CQ<G<LMNcIows-yE<6awJ_c8xg5na4ZSzkI
zBs9jRJ+LwhvoF*h^Zj({(W><Mg!Zi$FDl>Tg(ess&74r09E+D)mZW__-ihYo670EG
zX;k(b10%5cFr52p?LbsQi1w&ZB}BW@7B+VZrVh1k!qe4Rc=6LpNGbFt_2#{rbwN$o
zz2olsw7{3IDdBpj;%f8xw4Ad#_i+jKd^ZekfN$|@kHB+(pe6-1JL_hr-q(pYkB3ft
zn4s?$S5<p$WiI_(K3bvJA#@gvOinsDRxMjexUI}?+6{-^Rr~LZQ7%D!_jNsE$g{UQ
zJzcI(eEa%RT!hO<V8^R_Z%%~83-I8tsEI_g1}#JAhdL@x`@uX`TvbA;sY6OBs~M~<
zz>A+!ik!aZ+~{<v_gS*q8(G4tN?Rj9us(N8wMPcVnwu8qzXBH@v<nLA5gz0f)OC9~
zY;=68QC#WQ%W2+ahybAz$@&?Z$88NTfTc@t=@EGGlWLN#^#vH7YMuFBKeO%S>Swh&
z(^`vydISid%=)Ka(b&D$m*C7-Rh}xY`Qu7Oo=qMBLb5*hfbu&(d8j$Upl)JpryB6N
z_Dp^OLc2TDok+cdxTQ6iJ*o0wvpQf2i5Az|Lc3E(XeG@MAPkPfP2UUKZmYk1&z(|B
z=yT?MuV$u`t*z%vAM+f2*>)F<?`iI{n#?>4&;BkH*X^Bm-{8M3PDp&;09=Trn(sUl
zY2)+`p~3^(c3}`+_7kw{9@zR)<=$^}I}D9OVL<&ai8bMYWsZ)*AY6J3qJaDR!a9i%
z0fK%!OOQ}pg3AxW^s9Qux_<5?JoKx|N<43ywx2By8WA7>l*&Sc$;0;Yn1{7RyYQfs
z(x=`yX1sdZLz%+)b)_`4<F!ppfEb?nFUlRNPhp`ROCLQvb;}+sgY9rFDguJ8Vc<hQ
zAOeKWLpL2O?<ecjwtmcVZsi&=tXzjHPr#|q!i8_Cf$pJAz3*3YqbLl();r+z7d5T6
z^0CxUi0T6NeJ_z^+p*U3$@DAK1jzMr;{`ZzA1qxlexw;|{rz?1KY;UF>SZ0$-?6v~
z7axWfJ_fTVRM_~g{t+f@yA!TFsVuE3jlFUj)$F6CpB@(FC~v(?<k>gslE^rgXmL#*
z@=utYhqVPb{wbvy4BEGeGU^xOI(_|3yM+ew9>C@U%7=KP?U&K*Fn>-7uE3waLh_y~
ztX`aLy@=ZXz9sD{@wB#M6v5`3V9RYyd{BeA<M8DF4eKjVilJEUxEJ+KJnC3U7Z{jA
z1B*bx4Abj;sP31Hb>;eT`hSs}1L^I`n%X$c{?0<1i88`GgOPDb)ki}U%Cca1O0~%*
z55d;km37pXTVdNB5DmKTfA!h&d}5LR-{)$-w7M?Ji&=M7){*^KMSx(eQ$mClWr?u;
z<;s0*H*@1Tc;wfVHB`+2CPqDlqu*%MQRa5flB50L%7^PKFkcoT6zUWrtS>2R+2tAS
zUfBN`8`*YE<(DWsju|g?%=`~(@%21eIX6zHePoLlrLQ@E8n(Sm&0EwAu08=LK4no_
zC@<h>N8}V9m~D?<!<T=uj>q`(SS6mNesjg~K5MUjgw91Q5IU7ctPrxUvo;IYpHcqd
z&fgC!S5?DzWP9gpwRAEgTa+pDrAPc7Qj<Iq{=AwNNxs<s=K8dS<072=yc)DMCrg$J
zyK(ZmF{;EbDb3mQ55TccsLAFcl$L%k3lpLUrtg9?UxxMNYPh(V$WODhxTYHDfF-PV
zpca?VI_k}Pg#qQpZQmQ4RL@09WBA7Nwg0zH!PVBYg}c(vJZEegcD$xF&%1C2p8Sth
zU(lfw7P|KJaFZ-I1HR*p_@tKqOmESM`=TgP|F5mLxGt{xS6Oq8%p6zO33;B-cW5`h
zIx5SJ5h$POX8l!KRYHWVcf!cFcE4eLTzdi@`wduIs;%=9q)qFlSuPNZE6NZ5);g>h
z<C3zLUAfWj)W}C8u8hoZpKGIBuGeCiKLPvRmR(PVaP%W;t|!xiF)3d@D+K*LT<rwg
zelOEZi<Ufurg1-giw;685IPo%MBQbD5NBOSmjFlU_4=afJfFK?%~-#5NtyJGY->(M
z-fwKZRcY(boij9}^)(*tXac^cxt*bDv1u<%zpTFZSzl6abG%juIkhY@-?5)?eNWrB
zO@fSb;-VVJJ^xKO@ku32AXbz0H9D}{i41L0dHT%P8ZTpgoe!I&#nq?~VSNdXcc2!R
z&_Z(Ly<|PS8E$?TY`M9)k5U+d(QR=3h0e1;s9Z0H#VJwxACYJQ>i?C2Vbxi0Hp`dc
z@!wFB-B&CR%Ilb_1%cJ_z+qKj*6E4nU`kUrHjW$T)@bu)2oJJc7Dye_V|WH6Q^y@v
zQ7f}Bc~G@Y>Sgw{a^(?XabP=^3U};pIA&Wl2{YTcHsv_OdMfFUMg^b<SB}8sOPi;)
zyir^_0#E)9tgluru~LFk(iT&Cy_Vo?<F@^SZxDIf54JF^U0W)_&R5p)2oYR(D6M!9
z(pG49d5s;5RXf}`?(9QZtPIRCsv1iKV;pN`M!6=NatUGsS-c3(eAqEzGFrK^C@rMk
z+oNRAFU3qx51%DM5+@Ffn|Z$+Y1}t;Ugt6Jp&yw3P`e*Oun}uzFgE^sak~Abhntw^
zRjy_J31T&C{p@kL@O3!%d00HF;*Lx!%|9W42&V5YYe+8v$xldIHzGmE+fE{eU9YNt
z;@#q^nv5IEkJNl#>oLpwNQGa;_U)4NvX$}FepGv{xCjep;o`U8)Mu0{31S%SF=4{y
z{jhoiu0Ka(Wvq|$Vw3t{6)mo9x8)Z)$3-~)cV#Uu*SG1!UYO7jx$<7Q&9eWEYLKoK
zj7*m6&hyoKg8zS4v+WCOQhM3O)?E8g9+1<ImD94c42OTXxzD&d3y=Pq>cGdPvMa|D
zl}YbY``VIp;!|lJSI^V8_4-{uu7}yq#rQwy_p97f+m1bTinL#P4{v=G)rLpLu_#i$
z(6=@)__g_<vZ`9Xss<%feL7=pJ!Wp(_BWb1U)`0mLP*w;v7f{%!nKEB;$~%e+YOw*
zACCT4H7`tM@Um1}zg6lnvkpV6fAqRcOYeRlr2XK^d*-q6?W*ls4|6ABEpdO?guZcG
zzn}3hjU30#@gu!mVSB$+nn&q#^>u`D>$U%FwUf-};rYLU>qiX%fom=$i*;kj+(><i
zD_?lxdh=5f)hf*jxJ8b*LQ4<<LMP*!xXWdxXYRX9%6!)cHE_ImMon6E?mn1536zv&
zLbH5c_bP*<FmV9Rd`0ay(-bvpVmI3aZwJ1oegRN%Rk<%RpWpXRef^WoiK|Sy%6Mqp
zD5?q*E_HncRFh%*Hz}iJfP{1kN(v|qGElk<5Ev!R=<Xb$NGQ@V0qO1@C4#in=<YE<
zQW%48zVScr`~SZ0oadZ9i~G8MckI5eewafiV4;_Ep)U^s)CH!*baA|n2xyycCH3%)
z_y_B>&~W?c!vJjkOr4^sH7Y-t-|^D*Y)zz-uHDts`8V?g?P?(jLs2>u<<}RN;Gm|p
z*$T?%C2gqSD7WSrvT3^2Pr-Qv?*%)$bKsH26_G;{aCh)BS3D!vvLwj)*T>*h`*#t-
zCd;Dt?o28T&L6&}1-)m>NjsdnE3)YN(g>D@e$U6L()#2>j0=W+YMB9I7S|ZNvTw6`
zDgRr0BfaVE?<t$D-$7iJgO8W1htcN81y|V?zjM=ZjCee#W}L2q&YFA%rIu+;48zX|
zXABDcd(W(VuH_#N+M2fZY*Xn%iDv6gIyjbdEdGvg;?(1zy=Pbb>!pH%-D{Ff$1Vn`
zM`0y9QH`CQwym#<Mbl<VrS2hMkO~~!ZfWta3$hOF_2&$|HONn;+Qr*U%T^uwt~3=g
zNp}ZNSYFQBOzZ^kG#oo;h?@Uyd(>kiuTS&fqr;(zImrB(=G~yRlaf3EUjfz}yv>A>
znLi%khG0^A>ADkc5Am~&_NJmcQ`RQXLG8|k`$^7N>y*TjPvL_Pla@sYm_CXzORL}C
zK#fzbmkQ%kv)|T-Ssqn%rD4H%rb=$nF{HZR|FgyKLQH&mNGT<+ppr$kx7|d296A<|
zzV#~benZ>0E}LHj#Nm1NAtJ@`QVMJd=s+2izW)5wM~GlVm?2K|>Q$aFobJbY1KJUl
zdBrI4TYkSA4`%k}%Fv4;t5%6(-i_3u<V3znB<~*M)$>n+mSx4d?A;5*Gru3vFJ|9f
zYAqImFRh91g6>gx`299|8XkMi`cr&I;%~I`q-c@Fe50}Ww`b{Lkxk#O7nXeRu<_p3
zu!uD(GR<PGHXW<JMVEt&Db-}dhtFIb58D`jG?e-a8HYlYSGyahw9kLIK4B9L)=M*Y
zS~5k3Svs;*$T1c)^Gqt6sOOcrixQGO<~I(3#21OQxq!$=Vo`co2&Z?JY6j1<(AKT6
zZ)l)^V2-h6y*}u8;VQR=zRBxeg&aQeWPn_SlZ@;kBAk>C)i<BE3=;FL9oLBO*vz*-
z`bMdSJo@h3J;k%gP=6(*+QUyu5V)*yYwdBWSoZL_&zQWJdPtQN{;Q~Ti&<*&qR`>p
zl!x5$5$-6h{5wnBg+~*#+Kr$h%12+v1CV_4n1cGuRtl{fO+&MlnlUxohH-;R$~mv8
zMq_hnlbkC`z0arKryXjg_9H!Nr*ikWEFV5@8F8oVvuEkRU(Rq3k&09fRv%WTek5^J
zFZ7LUE03m|KouQlts|#HN7*+8DsgU&;|Aenyr_XY$C&bBeZxP7JD<&7w||SH_%3|H
zG}MmsHz*iR<m4BOUD@vR^kIl=k$~THgEztWLl<XNz@Y#$w_Vp%*?cGga`4g6kT{Nh
zM_%1SCqL!6+pneO$ho__9_m@^Ki*UXu3Gn%ye*65N%iG=xcplL>`PD~TOd_7Q3>%T
z+1NgkUR}fbs@1U$MoWQ$;xmg<$mgn00%wI5ZcciER9C1Ce=k;p+v+m+>6F!hS~d4!
zaUbuq`)9D27_6wNchk|U0}l5wCZ;&vP(Dd}Dpfv&d09LcInk(TmC*c(Tuzxd`$ov+
zH@o-t0ye-pA9v<M9l56?m*<BuKun6cCFG=nj+_?>kBKkARbR%@7us0-wxlvwsmh#u
zs(9)rKpf9OKaV)z@doBc-1*ti+yt#CIC^5xdZQcGQEngEJXaAzw|X6J?>~y%pZ4Q4
zsv(qbpAm0}6_5C+y^DDRE3JWycI^svcX>nQC-Rle&mH`RIKIi|_K7yO?q<|6ie~N6
z@T&NElWTf$@QG#dE8x!XIU+`X7F1hjL-cl3@ySaH^85(1pr(O<yEnYeJmdRT4NGL`
zB|zap<>B>MWWxPy2O;A(F`Bk!CKfj`GPjSLF45*bHRp2`7#)2)coRlr`eKMdScFmW
zr=*{vnoupV^~{uV%c~F^mkTVkO1|Zkr^g$*?3yafVm0|U$c$~Zc6Khy&GtzzRpLS8
ziaP7Ko@Szw?OjBzBUU$K7XaV7BK&s;*doH*%xAFT2K~qaOh88E0LCq0TkylQomM03
z8Y^Vkc$6+$*|wJnb#3yj4onQZdE2<o_!jEnk0{%&-AkyJMFmMqucI+~Z~P2X=PRy?
zmXY85(7o1g%>j`Q#{2ZFCl~BRc}mQM0zd||D7d&|xv*GHg|6Y?#o<oG?ML-!oEx_?
zQX=Zp233(4XQ#?$ql}XQ`s_?-AFqs_<R#yEd=UL-FWLByr(XC5;f?SSm+5yCK>&l(
zrrun`%Hf{t-(H1!+tr8UH>?JEP_oFTps!msBKV`X<!<EWty()6=+(~?+1h~y&C;K5
z;woiLkmyz;`gs!R0}^%hpM~a7FSoU~<e4*X+puPjoaE<GMybEbFAumq<PDY|Bj;Ni
zj1A8qF)ruGSycWQ8gZh<7+RWTj+P&K%J$6XV02}}rglEs>~^`S&aw8+jbh4}`;br8
zAI*pZ^HJ|r5AV-W*r+!&jtqL+Ww-i(j-}~}rNYM`Jfs2h8-of`m(I8wi7<HDWiPwS
z2d!s+(fIlzX3*uF(d9JHZdIXsh}d&~U;Om~^q0V59(2qBjN#Ll)M{|F(Av5=_VhW|
z?#Z?|;Li+}Ff#Ar(MY(-VcU2I{8r^bC^#Hz$vAA^SyG(5ue_I7IMnx%`;JNlB_tV8
zJ;xK-v_H;E95b-J;Dh&6d`G_#K~JCm*(r%z;Wq6)vTVd7nUoL1P!Y(89CX>odR)&o
z|HN$<tGfxE#U>>jJ5FpBJ#2hopfzBVqa$k~a{TUP1A=z-M{O0VB82Eb?A_a@uY373
zyrxO@1|vf#xx8XSaAfk>02$b4Y;5hy#~=pj8A*$Hz)NO`jaxX=f_Y6|g(kG6)XVyl
zta(Oztk2PF1vl??Yj-$hqsrPEKY6}C4F2>%pW{qEdZ6N?T6OxZts^_QM`-m=A2ypK
zk|NTox4PYEx^-K%&@W!ym}A3y52zuw^TKBH4mb#`xsh!@_~#}f`&>hOYqjZhMWNao
z$hn#<t$yP=;PXn?u&~UV3jw16Y*5}(?$*~B^@IFlr@59IV^t<cTz?jzy-Pi#+H<Q-
z_cH_TB2k(m2NvcEnfxu|xl6T~ps4fmk3Q9f;PI_<MbYZ~@+BM1{HW=8f!?^syd_AB
zU?QRpasPK$>%l|>E$Veaoa$+NKU!V^pC%}%#hNP3u-RWl`4#@6Khl1rfN2VfRWmkb
zd8RS7nr`|NZ_0D+m}@ppeX5E|7zgajbbhPS`l_T>;x}QE+!M!+4Q0aVyPjo^Z+T)x
z@EtC3FW@O0nO7~evQbB!p1zmtHf8~w829H_t^y|9nI(3%FXKozo03G-&wL(zw3mb*
z105VgaaMN@yUq^3z&rtKVaF&VdcDhcE^XHuoR4G}bmqU9xqy1_)9d07|1$H;j$75N
zs=?vuAQRUz*mN&;i`?{)r?!en^Bo4{mG#m<;5$Mx-=r)XzPAVARlr^|S1wkDcIkSq
zt_oDSsJ52pvy>Hw^N%haF4t!CCtiRW4Wee<g^M){0xlnJGB&!+b_S>EKXdXukL~xL
z4#t~$uk@>jU%d>YsP=xaP`djtcuW0ggH=~I0PrhUvyS8p!ykdKZ<KT2G1{q$i}Go5
zf2}k6@cugZ9!V9_^9+IeTPpMF165O>p}{YwER*>wVxXATtl*HxB>HQTmq5uPL*K3^
zl~A$t=LW~z6|t7a+NCMWYwWXPBj2f#XU-){=pE{eBV1A9LYG$`Fwk<-edL8<16@TY
zb#Pf&nVM%DRG_?TmeamiiQG~8G<Pkg)M;{#Cl#IS^}$3OM~U0#^kP-u7S}(V(yH8Z
zUyj#sjsxzcoIIu77)+&L`&fhsByK*z(rA~#BT-IC=F#E4_5Er7%Q^j)(G<UXUEOwX
zo9}SW&!uRU>YM-0WN@g%2<Ix$(@%HT#}?t>TfAuU3b3UfVVzyEeRJZv8M&7!f6?f&
z2RVpy=d`o~w!#Cme>#GOo+*w{9<Pt@_a9SdBz!S;2P(rdwF-4Y)G4~k<yBt|9Z?Gg
z;|t1v@zVdaux#CJFX~GESk==$h0V9-zC?YK+8cq2n0P{4*WQ7`llpBl1mB<`_;`_E
z|F*8oXG;>hspCO6A@&^K6L5FO+NMWjcGX!;jYh3Q>9GO~R0p>^g7c{V@KO2jhGB!0
zc>I(?=|G_Dwz@Ir4B(;r1oqhgQ=3-13`1?H9kPp>zEA7qa}m@nrk=Hezj*YQJiabE
zZ`)kse5Z(NG&lk1v_7P8Ac!^G=4m?4M+H@2%m%Mnx~Ig4Mdb^FV)?YO2ViGt<J_V5
z+DR3Br-J8Hcs|hhkPQ$<N6F^FX+ZvXo-Hp3EYAZ4vUhhrd$NDEUWG1SML0h~s?GbZ
z)&(BvUJPe^3%_p?FA3LNADL2_oREKAw6gad3ZVRY<LvBjz3jQsH&4$VYifEaK4B`<
zYJFcT4v8>;<BAG(zD|6A2X4MIdTZyI{bfV0;1Kev$V^%<{)kO`9nSi*M1Cl6{(PLq
zXFRWWQ*C>kAyYb+)@T7fv9>1)f)X0wxy}bWopW(juxbTVORbc{Y+B<X@~5{8s&;k<
ztq%mrvWT!bs4g3boTdX>0%%>DgWVRR7{s%s0o_WRrK-31jg^%teDOlet0TX(9?`fc
zicIq-ZXZ#ZYq-jdiWT3HDw)z?0w68YktXN@6h|Gic{a71F(RlVP+H%VW&w{7Caka=
zyiZ}iU20~jF6CrL6L%9oC-<(#F>)6n)`&*=6NAG0nE;DwJDt_Tv<Qa6eMQ-{!_F;r
zV;E6aCN+ERo(*O%4@J$Ec_T3dtJ5CYX4pXVfL|hYx)iuI2l45P1KZ2&R<&UMp;n?E
zK;W?fYwGqiHLaV53iTtUu|N%MnmhMHME*O+`_tP>Dnn{Q%yyq~*dz0TarkPdZ0d+9
z9Pr>}$9BxAZeN5T&7zGF_l%2sxtD8s0K@(jm?>YY)fyjF;zrQH_T1q{8{M~E{Trg4
zvyL0>RN1sZ7*?amxMi45-nUzY@TBz(pSb0_;_q?+hC8RHmjdI{iBu}_)sO=uzL)9g
zWMYpx4-hStt>E)`*n(n*sVCMpgtbv1almIjB_rco3PnTy&-@-Hp|h!(r9$1hw=#-`
zJauY@1HYcp@nK%%Iqy(EJ>`q#owhPSULK^;WETc6AeVIxvF7ihIxp24tu;ZDNN0>x
z+a=<Q|2&lE7C<X#O}b{EO%!9MFz|(KLxCUIav$c^JZNd$=Mk9O`c37LvoU12ptp?T
zoEz-Vu=XZ8a#m-{Bt#TeY%d*U%O6ETK7`>%Nx!O<uKX^oBm(msN|C1uKtNvjOh4|@
zssiG6*zwxBb1KzaHHj$r75inyP;{5eFa43uykr6gjter4A<1Cq+>Lh7KzX)a!)Zdm
z41I1dcU=rHCn@_@D_8*SXJDS=i*=^kE-54uv}1?$Cy;F@D~w1EP)fRsY_7Woqj*nz
z!H&6FDy9m;zsXf9hIqXL1`+0)EryjNZ`QfDY4pvP8Bqw+ws#$cj`MWWyBoR=HTCYp
z4W=&(HJOIs-qN#m%FT_j`qwCg({(|XS~L*1I|&?c@l&e96b^~b{iN?>+ic>tbQ!gx
z-a+PlLr<pNSv`t1*dl(A@7`|O1p~s&o)ZAtpRp)}k()Br_Sjv$5sx6!CFrGTx*>D$
z-~5rUV0S+ot@ze-aN40l-`1=^w`eQturIZ7HB~?Qt7+>JF1*a=_{5PMKBAWgf^xwR
zmU!Qb2WvIsK)zS*uSxpcj3x;SspG6r@mmrffuKZ~lCwmjUu#rz&)a=R>njuc98DYV
z;_cjqj=2>hZcnh;;k1!Fkji!+V)&I%l94n<N^mulj~}_<q+*lPNL=jfu<A;dlC3ju
z4X)Mn+O&HjG@p$~qkEl9QW0$0|4d&fiE|#k=V%;wfFGhMZRXOpsGZdn;%4E2xvcUk
zFAapuAA0ZUmX$Ux+Dr5BwJl$b<ba@-^PWRL@_9<m%7e0<=e_uyF^>Qs^6-Jch%v^Q
zJ0Be7l?6=J8kFR%wF)wugw#+-^;u8d8Zw*|*2TBD-PIi-&F<!j)gTNAAJGg)rf$#0
zZC<_iWzd+GF=J9M@=g%aX1Zh-kIvI594ObbK3j*oX@CX#bib7khCxr1SCXX&0j`wU
ze}c_=MXQsvqgP@oS=Af(E{1c=IW9$FYadljJ*mc+zWec0F%Q4#Shh8#<;297wfn|<
z+K6DQR*M?^ya6@yt3Wh92SfKx;zB^;bma7mPN*m4mT<`QZmC6JSZKmiZRv@Zz)lm2
z{O&rDO}=2i0F@|XAF^Ebnf&3jssQ|Hz4{4}I~_G^f4ZeY)2|*8i;j!qttpw8zjlPZ
zz{xKuO{~7_ZTh9kP97{-GS~7GFDNB@<sjZ`@4}Jve&9QOblop6$Y!0?98vo<27G2+
z@=<#3VG=}wpr%-T8(3j|c0UjSB*=*bt)~E`?!u;9%kfibSZcV)b1l((d5jlu1WS~t
zX_>urikiK&tJN2WjL~!^cho$C>(fxEGtQ(&aG+!4Hs;6K2Cfm)vYBHZf-YTA&xAyv
z$FJ}CXrtf#Xp5$!@+;Wc%yRb`R^uH4You7PAM_20QLZXjY@l|Upe4TJ)1GkvimMpE
zW0UsF(Tn(#`V6Vqgsb6{7k<X*o#0o=0Af0pNOTaT^=K1M{b)&^<0zG(DJiHhkw+-Q
zYW=!#^*C{A{fc0Ky*u2Ar*5g9xv`#-$JzdZF{1iXC)MTIUeDG#Be+7my><k(?VPF%
zNPl8N)6z8Z_kg)isL-#3bsJlqlKk2xd5%g*x0H;l7uNKbOj{^<O|ZDnRt@6KIj0lq
zy561EcB+TtEMF=<u}dp=hn&=Ae^clWu`GIFoa_~S(PVH3f6#J&qDA<?XmsOe1>}iz
z1u*hbAn~xWQjtebklR;zUhBczxZE1;Wj^5+*=5lYmZ<Gpst?HB?YlGpOXi7*E)6<S
zlPAI!ra0GU?@_6xPQ{J;hzZI>zXI|8jEm1Mws4AdYo>WyhubiX;GQ{x2-ubC%x|~1
zZ6vik*N3|hp62dA{EDzK;-(u{cIuY-wb0fjsT1<e5nD8>%IDJn!NAsK1Lg(cL6(Ll
z#!{mQJR4WKIQkwVR<EgV7^%Men)bBED8qa4r{cE<+7)$g2GvD!Y9xJY=EjzOfk~fv
z1xu6)EtH8+yJa~Ez<ejV^u6)wEwsdL0*~vok4=n#P!g;_*kM+h=@>?k5$q`n4_YYr
zmHel$?Mekn2w1+X8ee(8UPl;qsR0jFok!13`>tDNt;aB8_sA}<#TS9HPqAelSdIFo
z_-onSVW|j>5p}RpW-#z>hxB!`8sw<oS;4hjZuMETi%^Q0pqVLv2f{{oO!}x69u-h|
z!;aO#hkphS@2q%(;HOD_{On;r=cqE#UVj1u5d)>K*#V1C?P#3PlbY`?dwjy)wANaa
zCd>895G!8i+ukz7T9Yp=pqE<$?JIF2`4$${4crfuW(p7@(-I596f4?^xBT?CvU`R8
zVgnUpEPrj&>QuXSh9}1!26ujApMT@}LB`WsK9EAemLr_w`++Dpc0sLY$m^qF@R#>O
z14?{cf)692LAbomrUCR$S6$QXgS|vwN@*rAYSB0f!5w}Az<_z*%5^Du=-3M%(S!P5
zh<p2%#FVFQWhv&{R0_Y2MEwskE(x#}4gzbfDH6O>N7x$$PCX(6R|hmm0DH`Nh?I{6
zFJ>Md1Cq}!`laKj-aWL0*hGL8fl{&jgV45VA}M{CJF93<S)cLf!hzDDs@}3F9?ARq
zGTJ+T3*cOsm_jFDZw9Y&y}kl?<OmBpaEO9&?!p=Gyg+u09&vqi2=C=HG{U-STb@VU
zpoXdjTIS`B?od5qvsL=t>lJJL1I1mlrwlv#N=f*`q+yZ@diNOt0P~@oN}F8nr8G{O
z*vhFV6TVd_sHC2{r#`Q$0Y@<-{q~v<v9e3i<M&HYqCXwRW+47f*GzgV=9RMz8&uEk
z%|>%$Rkaw0lFC9{8VD*;AY#7Q%hNr0h_&KeYU?~6);dUg^W&K0?vOAgix}%a4zZ<?
z;M!x;#w}@BBy1S3>k0kbj%eyUhYYag6Mrd-{#(7~0lp&#%cD}p0sZ9qG*s$C8D1q}
zY(FEB{*h;d62I*v@`>*{TnGquov=nw!y<a*$%x>MH~v~I6<QjmyRdYWsQ~k53<EC6
zT~1LuQMtNe%Bp~Iz_N5%evr@}n+UJOmQkp+f8oplAm<SLc*U$ACEE2sQfoT@J4crY
z@a-d9q|2r547y-T{^C^!Md``8B!vTVqxpn{0(5TN2dYf*9F`GNEaf;1gr0v=MowN^
zzi)l)uDbT4)a3xMaH@AJinU|)bQot{uzfG-vkElJc7~Ut3@aqy!d>yUuEZ#=x)W39
zn^GQDPy3}oDvllKABGAZ0i^`KQz>>30f2GmcrkCO%A_;DeE)+{JUSO^+__PeIJ4Vq
z(d>X7&eJ$|iUt$(-QIP&^mkctw3myN(O?d%rI>E;H9pM9*WmnPSNJX~D7Z@~Gr|Gk
zd<M{HHRyi?V2;zs<+sdOPfs-DrhbH^HsYRR&#!4w5-C2;k4hJMCUIuabXv50%;qt^
z(bkQxf7N_GFWEWkU><huA)P2=Sg0!5p!r(gf{~?bmZ*jh5RcJMmEIOolw&u^7NNIK
zTOp<Hru=IS-}vdTdaWm`T)0lnv4i%rk<~`Cz5dF`V2X95x6S>AD;&PK$r@%7Mp}aS
z^M@Mj$1gGm*q^=43b$a5qLa`6V)7Z80YQj9;0K5F1yh*(F=|5fnJqICpW};r(tjpS
zG^TATM$ZmW3^}qV#?o?mSV%4aK+v*SfLZO@fHx(yfSnc));$F{w`)kt(w*SQdHoU}
z<4c4Wz@HgqBTr@R`&GVBJ>+ZUFskhIIO54WLj=i2-|YM!{`U@9wPi>y*HLEOL=FnF
z*>xD^0TWsS^`vIHoR-P5y$~4pclvU(d@JWqvIg-4zDo&+Y5tuzjx($VCwb7d$BcuV
z60wG~K0pFVq1f=F8w;2H!>@I@-44kuzS%@(=VAe9`OaU8M>Vhz<I10M-pJwE<c6(4
zP)~$|p<Ry9GIyp-cUW6;QS5h00(N>zHozOOpibw~uSrG_&F$`7NKg*Wpr{Lm*P*qY
zcvL^EFPLsR854$&X+8}!E;2J}9p^fIn|%j%Jp{E*)Q>hxcFh2~I#LSCkfGtF=Rtg;
zM`MS7h^~yWAvTXs7~m2W!lq4Q{}jXZysiT;_8tU;r{*{*953*2wHaZ>p8(6|^^ohc
z*LnuK^)+9(qpOMUe#U$YmfTEx=DT@^2?LS1xz8(DIErXQ*1M@URI-Lw1_K+GiG^-)
zG&+U?Z??j9=%MvVr=H*en>Bcm=cK3(O4_tvTLqT;$s^gB3m~9K007B37&`cIXOWHb
zBm;B_=sFgeaJxx^^B!1h9jsEZ{7K&MJ-I8lg<`tMD@Yg%N;iLRX2_m-8EG7Hgj$a5
z#j2wulpHe$tmCeq-KK(+V$^MUV!f_wD-bBLT=p#eaKk-|9Q~g)nIjC>_IfvmM5sA_
zI)^Rk7rF+~X4M~!;de)a?!^U@Os6bXe5l!ytCG!gMvo^R<p<yOHzBS3gX7?<ih4pq
zNWY9P%5z;2(}MB$;{3dY%1d*Ux{M2}Vki5+C(9l&Op>$a_p)>{QIdj0*H2n2;OP%5
z`S{L=sFk?j$r<-yrtrLA;@*#!cZYhn2KvuOe9r^z5dE$Swlqm@Op;QNP1Ixy)8VA}
zN__`GMChKRP!Nk&(6F&yz(JRi%b0XDHXOt$z_*Bnj;8%tJHz-eec68BDXm{3KRbwu
zXpTqYu>RQkRhTMs-kg@KuYB7YYY8eJax`SxO$vjKr<15p-6kL2d!*!o)pOA{EKpJ9
zmClUSid(`57lrZ4gi|&RXUb>Fnv2xv2DVcU-z%DSy<1{X3L7l|6cmt7-*5?ZY6Gb2
zn>n<=(KLva)nz>hqK)V$X4v9s%EPT%G(!}--PlK;urYoxvv9_lPBg`SK2pu>=(Be*
zW>)lQ<xp=h%Qr|?F#0(8`9uAz_W^V{i96fZsrrg7Nr`kMpvJ#vRiu?kM^fWhLkT1Z
zu6)CoiAkR8@O%BRe3$kPqdE6G$G+s1jg-|%jLXSI7b=*dVS#|>APUmQ+>IX<5g?0s
zrLe=zwM+`?qwMYQt^J~rLz~fDcrdNB9M8ec?-D^na#R9~>N%`9G|0X>JnHU)5aMqI
z5XnIZviS8MS+}+Ik814@)QFV_$e9gWgmbD*KzyiWE^Vqj>KVkp=dvMvRCrVelGp$s
zO!VMmg(8@j#+FlF%0O0H0lQ$-(2?K5y-T=N^gGQW?(*`E`*S?y2nG`%fdbGlx=EO7
zk8^Vl@THY{Ts`wG`<IpdMkF;GIEX46?K8{#a-Wvv&jS7KsDn{P-^sU7YzefAW=gQ3
zVN%uc&7O$Nu{qjPv3uxfOoZ1;1FIBBij{B+oK=sF)(sfzE}<`|<h&tI4m>#fumb0%
z3zfcn-?f(<X_?e~{Z)`jPRN_I2P-#WSW8t^7ug3z*)H||4ZW{-{&?;xy!JAE{UHgs
zI-aKkjtE^n@~;%=R_q|o_iS`wgZzR?8^mPX%V9lAGBzsYhpb64Wwn*rRH0&4o?$@*
z&g{(qhm90=yq~^I7<0CItUlXYu=A2np~$H)y-F7qv}x!mW78khe@(2A+!UBhfgK5G
z99De}V}>XS)I`lD(>uyR>8F$bM(1xY9ohI?Uzp#78S^IS`vBJ(ik2DnK!=IkN;r?0
z%lTo|XCvrOHh5AG!?7JfDeRdl01EG)uvi*5vi9fguhpjZ0s)h}-^WtNI?whE%;6Hg
z1mu6aJcb)h%E>N2{e#8+;g=qD)l}<uemAQwxZSfvD>H#!T?#eRi}%yauWGFfm{ry_
zc6b5`RuZs@c#0Lfq=OSVR9Mgi3Olr5REkWZ5a}C+hSXkrF(c$aQJ2k-e_6I<Cszyr
z%ZFJhXOV)<1D8Efo_l_atMBS&);VI)`SK3aW!CBC6(-T;<jOaKsNsSVYQp(iabSCk
zud-e{`bmNic0REzumu(!rLp-pYP^E#9?MURW3Y8^6S$E9h}xM3#R=?iD*&ZJy1e8=
z#=4req=n<t9^~gAZ~T1VzHPR3PlNe%`J&&sYrOuny#`FTJ8J%8qQ_xAYz+CQuD+~b
zg|?=yJz!hCPvsx16slJ33%9CMHM>EFjg*I$^K_-)zX;SRal?R-rN68*JcK@c0d`FT
zWzb(uLtOUVUAAx=2RVv74J?;Tp+sRiF_56}vZIZ+OLw)}`~ERNK<Ev}Yiu^IJBQEA
zjwIjlNC%Ij<zJ$TlyomZfqyi_0%JyFe_cQK*|{hw$l02+d1@~gjx@;EeQ+u*#}~?f
zf&`wR{o;xLP8k~jqn=F4CR)ZKt{dAVMB=Icg$Cgb|ND&x@4Ha8Kh>IsR-_Z_iiV<G
z@2Q`={C3^UwspvGg;B{IF;+>L`j-QjKUG*@g-WO)SdVDS)s)F-;l<it!hdPU4n{ad
z_d4*fO*doTg5pJ@uS=nR(H7A~G`u@~Z0&I&<5Du0+b)Mf-zqO=SbHv&ClCOG?O09#
zD2ZPojHU1slJuXXKmho;U2PKh>2aXcC01Jn60nCWD21_EuGUCITd=v2QigmXV1Lo;
zyH#m^!qS9_GV{b`x#jdZcm8;CL`n=^{R{DWWB21`bMim1g|SU4vc$}`iMb0x{jyc(
z2LA#~q3pf={ovA{cs4b*%yJowUQ3@>%&UT{J&#WEJ_rM@h9a@^*KM2R`A<|~Y#TXm
z@NXF->awtqpn}i0o&mf2kCllpx1Qs?HFkR|AaU-vDwv}%{e(aPpg555Pu63^GjsV_
zg0B-A>aZV-;bS!)0FULdr3xuY03P0}uL)C415`}Wo1y<g3IN@*1<GOjtY9lC^1en#
ze)?x3=b#L+rIC>3BG0H-HsoKU^lwxEz3+Gm{ZXT`pWrYchf39A4_z`hKNkMK3I1zP
zd!h-$5?JR009svPw0#~1_uODI*sR^Zoc`lt7ssxI$tbK|X->@>)gm?^Dp>>gyT$zH
zm5!|n1HGyyru^&z$grICbQ1md3i}^W&G(f8=!s*2BC0imFWC=ek6EbylLGdB?*%^)
zx`jpT!hF%|%oX?FaKm)OIi3O2W3&^#vO1q${SV!Lb>{D%YK-C7kQr*C{$J1t6lQ>T
ztX%YLC4Hg9pIQGdp8vR{@T#8ypVCqS|FvlUP1b`j0=ozNF9d9WtSG>LHU9^xB5cOU
zzuW!K%_JM%fAaa~y*)OF`v0Q&gp8^W6?Er6K>hQ_QXdtRg8r{xhlTz>5nz|z|7MqS
z2P@Y8Z+1F8w-f>QT|cVay#(Ok;Bb39f9qjs?qMZm;bw(>!4VODEG8iQSm5#F*TND~
vViHoqA_Brsq=bd_S5M#mR|7|9OFL`d|9^uAZ5kWc1~{tEwUjDAW?}yaz#`rv

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-slider-fail.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-slider-fail.png
new file mode 100644
index 0000000000000000000000000000000000000000..78c6ef6e21ef6a4830e57aaa218b73bb333d783c
GIT binary patch
literal 61156
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-slider.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-slider.png
new file mode 100644
index 0000000000000000000000000000000000000000..b824e4585b4bc678e5a5165b97f647b9ac0d7fa6
GIT binary patch
literal 65012
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

literal 0
HcmV?d00001


From afcb45f28b0c650e472fbe9826c88498bc1fad37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 May 2020 19:48:31 +0900
Subject: [PATCH 02553/10326] Move to playfield

---
 .../UI/DrawableTaikoRuleset.cs                | 19 +++++++++++++++++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |  7 -------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index a6a00fe242..c0a6c4582c 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -16,11 +17,15 @@ using osu.Game.Replays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
     public class DrawableTaikoRuleset : DrawableScrollingRuleset<TaikoHitObject>
     {
+        private SkinnableDrawable scroller;
+
         protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Overlapping;
 
         protected override bool UserScrollSpeedAdjustment => false;
@@ -36,6 +41,20 @@ namespace osu.Game.Rulesets.Taiko.UI
         private void load()
         {
             new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(bar.Major ? new DrawableBarLineMajor(bar) : new DrawableBarLine(bar)));
+
+            AddInternal(scroller = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Empty())
+            {
+                RelativeSizeAxes = Axes.X,
+                Depth = float.MaxValue
+            });
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            var playfieldScreen = Playfield.ScreenSpaceDrawQuad;
+            scroller.Height = ToLocalSpace(playfieldScreen.TopLeft + new Vector2(0, playfieldScreen.Height / 20)).Y;
         }
 
         public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TaikoPlayfieldAdjustmentContainer();
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index a5edcc1357..5c763cb332 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -50,13 +50,6 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             InternalChildren = new[]
             {
-                new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Drawable.Empty())
-                {
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.TopLeft,
-                    RelativeSizeAxes = Axes.X,
-                    Height = 100,
-                },
                 new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.PlayfieldBackgroundRight), _ => new PlayfieldBackgroundRight()),
                 rightArea = new Container
                 {

From 510df8b282c97c046ee86a309f25681d30ce2d27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 May 2020 19:49:01 +0900
Subject: [PATCH 02554/10326] Improve tiling logic

---
 .../Skinning/LegacyTaikoScroller.cs           | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 6276eb1e8a..2bcef0223c 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -21,19 +21,28 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         {
             base.Update();
 
-            foreach (var sprite in InternalChildren)
+            while (true)
             {
-                sprite.X -= (float)Time.Elapsed * 0.1f;
+                float? additiveX = null;
 
-                if (sprite.X + sprite.DrawWidth < 0)
-                    sprite.Expire();
-            }
+                foreach (var sprite in InternalChildren)
+                {
+                    // add the x coordinates and perform re-layout on all sprites as spacing may change with gameplay scale.
+                    sprite.X = additiveX ??= sprite.X - (float)Time.Elapsed * 0.1f;
 
-            var last = InternalChildren.LastOrDefault();
+                    additiveX += sprite.DrawWidth - 1;
 
-            if (last == null || last.ScreenSpaceDrawQuad.TopRight.X < ScreenSpaceDrawQuad.TopRight.X)
-            {
-                AddInternal(new ScrollerSprite { X = last == null ? 0 : last.X + last.DrawWidth });
+                    if (sprite.X + sprite.DrawWidth < 0)
+                        sprite.Expire();
+                }
+
+                var last = InternalChildren.LastOrDefault();
+
+                // only break from this loop once we have saturated horizontal space completely.
+                if (last != null && last.ScreenSpaceDrawQuad.TopRight.X >= ScreenSpaceDrawQuad.TopRight.X)
+                    break;
+
+                AddInternal(new ScrollerSprite());
             }
         }
 

From 6ff31fb7866f030bc6c617dbb58215435955dd67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 May 2020 19:49:23 +0900
Subject: [PATCH 02555/10326] Fix sizing when gameplay scale is adjusted

---
 .../Skinning/LegacyTaikoScroller.cs                 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 2bcef0223c..f0bdfa4e63 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -79,7 +79,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             [BackgroundDependencyLoader]
             private void load(ISkinSource skin)
             {
-                AutoSizeAxes = Axes.Both;
+                AutoSizeAxes = Axes.X;
+                RelativeSizeAxes = Axes.Y;
+
+                FillMode = FillMode.Fit;
 
                 InternalChildren = new Drawable[]
                 {
@@ -87,6 +90,14 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     failingSprite = new Sprite { Texture = skin.GetTexture("taiko-slider-fail"), Alpha = 0 },
                 };
             }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                foreach (var c in InternalChildren)
+                    c.Scale = new Vector2(DrawHeight / c.Height);
+            }
         }
     }
 }

From 3033ab80ced82d8d73bab1865d3db897809ca8f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 May 2020 19:49:30 +0900
Subject: [PATCH 02556/10326] Add passing/failing test

---
 .../Skinning/TestSceneTaikoScroller.cs         |  7 +++++--
 .../Skinning/LegacyTaikoScroller.cs            | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
index e4673430d6..19661bbcbb 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Graphics;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Skinning
@@ -10,7 +12,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     {
         public TestSceneTaikoScroller()
         {
-            AddStep("Load scroller", () => SetContents(() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Drawable.Empty())));
+            AddStep("Load scroller", () => SetContents(() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Empty())));
+            AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.Passing = !passing));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index f0bdfa4e63..90fb1934df 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
 {
@@ -17,6 +18,23 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             RelativeSizeAxes = Axes.Both;
         }
 
+        private bool passing = true;
+
+        public bool Passing
+        {
+            get => passing;
+            set
+            {
+                if (value == passing)
+                    return;
+
+                passing = value;
+
+                foreach (var sprite in InternalChildren.OfType<ScrollerSprite>())
+                    sprite.Passing = passing;
+            }
+        }
+
         protected override void Update()
         {
             base.Update();

From ff1d63060dba823c0ea149f13f9b6b83e795944e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 May 2020 20:05:56 +0900
Subject: [PATCH 02557/10326] Add and consume passing state in GameplayBeatmap

---
 .../Skinning/TestSceneTaikoScroller.cs        |  2 +-
 .../Skinning/LegacyTaikoScroller.cs           | 33 +++++++++++--------
 osu.Game/Screens/Play/GameplayBeatmap.cs      | 12 +++++++
 osu.Game/Screens/Play/Player.cs               |  1 +
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
index 19661bbcbb..3d1ccadd6e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         public TestSceneTaikoScroller()
         {
             AddStep("Load scroller", () => SetContents(() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Empty())));
-            AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.Passing = !passing));
+            AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.Passing.Value = !passing));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 90fb1934df..f61ee0301d 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -3,9 +3,11 @@
 
 using System.Linq;
 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.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -18,23 +20,26 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             RelativeSizeAxes = Axes.Both;
         }
 
-        private bool passing = true;
-
-        public bool Passing
+        [BackgroundDependencyLoader(true)]
+        private void load(GameplayBeatmap gameplayBeatmap)
         {
-            get => passing;
-            set
-            {
-                if (value == passing)
-                    return;
-
-                passing = value;
-
-                foreach (var sprite in InternalChildren.OfType<ScrollerSprite>())
-                    sprite.Passing = passing;
-            }
+            if (gameplayBeatmap != null)
+                ((IBindable<bool>)Passing).BindTo(gameplayBeatmap.Passing);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Passing.BindValueChanged(passing =>
+            {
+                foreach (var sprite in InternalChildren.OfType<ScrollerSprite>())
+                    sprite.Passing = passing.NewValue;
+            }, true);
+        }
+
+        public Bindable<bool> Passing = new BindableBool(true);
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index d7f939a883..0afa189e66 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play
 {
@@ -38,5 +41,14 @@ namespace osu.Game.Screens.Play
         public IEnumerable<BeatmapStatistic> GetStatistics() => PlayableBeatmap.GetStatistics();
 
         public IBeatmap Clone() => PlayableBeatmap.Clone();
+
+        public IBindable<bool> Passing => passing;
+
+        private readonly BindableBool passing = new BindableBool(true);
+
+        public void OnNewResult(JudgementResult result)
+        {
+            passing.Value = result.Type > HitResult.Miss;
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ece4c6307e..eeb514b4be 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -193,6 +193,7 @@ namespace osu.Game.Screens.Play
             {
                 HealthProcessor.ApplyResult(r);
                 ScoreProcessor.ApplyResult(r);
+                gameplayBeatmap.OnNewResult(r);
             };
 
             DrawableRuleset.OnRevertResult += r =>

From 2913a8183538f823858aace50834f9e38a74b726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 May 2020 16:59:45 +0200
Subject: [PATCH 02558/10326] Improve test code quality & safety

---
 .../Visual/Navigation/OsuGameTestScene.cs     |   2 +-
 .../TestSceneBeatmapRecommendations.cs        | 122 +++++++++---------
 2 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 31afce86ae..a3ef33b916 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual.Navigation
         }
 
         [SetUpSteps]
-        public void SetUpSteps()
+        public virtual void SetUpSteps()
         {
             AddStep("Create new game instance", () =>
             {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index a6e3e0c1c6..5fb4e80b51 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -11,23 +11,25 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Taiko;
 using osu.Game.Screens.Select;
 using osu.Game.Tests.Visual.Navigation;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.SongSelect
 {
-    [HeadlessTest]
     public class TestSceneBeatmapRecommendations : OsuGameTestScene
     {
+        protected override bool UseOnlineAPI => false;
+
         [Resolved]
         private DifficultyRecommender recommender { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         [SetUpSteps]
-        public new void SetUpSteps()
+        public override void SetUpSteps()
         {
             AddStep("register request handling", () =>
             {
@@ -42,6 +44,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                 };
             });
 
+            base.SetUpSteps();
+
             // Force recommender to calculate its star ratings again
             AddStep("calculate recommended SRs", () => recommender.APIStateChanged(API, APIState.Online));
 
@@ -83,97 +87,89 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestPresentedBeatmapIsRecommended()
         {
-            var importFunctions = new List<Func<BeatmapSetInfo>>();
+            List<BeatmapSetInfo> beatmapSets = null;
+            const int import_count = 5;
 
-            for (int i = 0; i < 5; i++)
+            AddStep("import 5 maps", () =>
             {
-                importFunctions.Add(importBeatmap(i, Enumerable.Repeat(rulesets.GetRuleset(0), 5)));
-            }
+                beatmapSets = new List<BeatmapSetInfo>();
 
-            for (int i = 0; i < 5; i++)
-            {
-                presentAndConfirm(importFunctions[i], 2);
-            }
+                for (int i = 0; i < import_count; ++i)
+                {
+                    beatmapSets.Add(importBeatmapSet(i, Enumerable.Repeat(new OsuRuleset().RulesetInfo, 5)));
+                }
+            });
+
+            AddAssert("all sets imported", () => ensureAllBeatmapSetsImported(beatmapSets));
+
+            presentAndConfirm(() => beatmapSets[3], 2);
         }
 
         [Test]
         public void TestBestRulesetIsRecommended()
         {
-            var osuRuleset = rulesets.GetRuleset(0);
-            var taikoRuleset = rulesets.GetRuleset(1);
-            var catchRuleset = rulesets.GetRuleset(2);
-            var maniaRuleset = rulesets.GetRuleset(3);
+            BeatmapSetInfo osuSet = null, mixedSet = null;
 
-            var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
-            var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, maniaRuleset });
+            AddStep("create osu! beatmapset", () => osuSet = importBeatmapSet(0, new[] { new OsuRuleset().RulesetInfo }));
+            AddStep("create mixed beatmapset", () => mixedSet = importBeatmapSet(1,
+                new[] { new TaikoRuleset().RulesetInfo, new CatchRuleset().RulesetInfo, new ManiaRuleset().RulesetInfo }));
+
+            AddAssert("all sets imported", () => ensureAllBeatmapSetsImported(new[] { osuSet, mixedSet }));
 
             // Make sure we are on standard ruleset
-            presentAndConfirm(osuImport, 1);
+            presentAndConfirm(() => osuSet, 1);
 
             // Present mixed difficulty set, expect ruleset with highest star difficulty
-            presentAndConfirm(mixedImport, 3);
+            presentAndConfirm(() => mixedSet, 3);
         }
 
         [Test]
         public void TestSecondBestRulesetIsRecommended()
         {
-            var osuRuleset = rulesets.GetRuleset(0);
-            var taikoRuleset = rulesets.GetRuleset(1);
-            var catchRuleset = rulesets.GetRuleset(2);
+            BeatmapSetInfo osuSet = null, mixedSet = null;
 
-            var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
-            var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, taikoRuleset });
+            AddStep("create osu! beatmapset", () => osuSet = importBeatmapSet(0, new[] { new OsuRuleset().RulesetInfo }));
+            AddStep("create mixed beatmapset", () => mixedSet = importBeatmapSet(1,
+                new[] { new TaikoRuleset().RulesetInfo, new CatchRuleset().RulesetInfo, new TaikoRuleset().RulesetInfo }));
+
+            AddAssert("all sets imported", () => ensureAllBeatmapSetsImported(new[] { osuSet, mixedSet }));
 
             // Make sure we are on standard ruleset
-            presentAndConfirm(osuImport, 1);
+            presentAndConfirm(() => osuSet, 1);
 
             // Present mixed difficulty set, expect ruleset with second highest star difficulty
-            presentAndConfirm(mixedImport, 2);
+            presentAndConfirm(() => mixedSet, 2);
         }
 
-        private Func<BeatmapSetInfo> importBeatmap(int importID, IEnumerable<RulesetInfo> rulesetEnumerable)
+        private BeatmapSetInfo importBeatmapSet(int importID, IEnumerable<RulesetInfo> difficultyRulesets)
         {
-            BeatmapSetInfo imported = null;
-            AddStep($"import beatmap {importID}", () =>
+            var metadata = new BeatmapMetadata
             {
-                var difficulty = new BeatmapDifficulty();
-                var metadata = new BeatmapMetadata
-                {
-                    Artist = "SomeArtist",
-                    AuthorString = "SomeAuthor",
-                    Title = $"import {importID}"
-                };
+                Artist = "SomeArtist",
+                AuthorString = "SomeAuthor",
+                Title = $"import {importID}"
+            };
 
-                var beatmaps = new List<BeatmapInfo>();
-                int difficultyID = 1;
-
-                foreach (RulesetInfo r in rulesetEnumerable)
+            var beatmapSet = new BeatmapSetInfo
+            {
+                Hash = Guid.NewGuid().ToString(),
+                OnlineBeatmapSetID = importID,
+                Metadata = metadata,
+                Beatmaps = difficultyRulesets.Select((ruleset, difficultyIndex) => new BeatmapInfo
                 {
-                    beatmaps.Add(new BeatmapInfo
-                    {
-                        OnlineBeatmapID = importID + 1024 * difficultyID,
-                        Metadata = metadata,
-                        BaseDifficulty = difficulty,
-                        Ruleset = r ?? rulesets.AvailableRulesets.First(),
-                        StarDifficulty = difficultyID,
-                    });
-                    difficultyID++;
-                }
-
-                imported = Game.BeatmapManager.Import(new BeatmapSetInfo
-                {
-                    Hash = Guid.NewGuid().ToString(),
-                    OnlineBeatmapSetID = importID,
+                    OnlineBeatmapID = importID * 1024 + difficultyIndex,
                     Metadata = metadata,
-                    Beatmaps = beatmaps,
-                }).Result;
-            });
+                    BaseDifficulty = new BeatmapDifficulty(),
+                    Ruleset = ruleset,
+                    StarDifficulty = difficultyIndex + 1
+                }).ToList()
+            };
 
-            AddAssert($"import {importID} succeeded", () => imported != null);
-
-            return () => imported;
+            return Game.BeatmapManager.Import(beatmapSet).Result;
         }
 
+        private bool ensureAllBeatmapSetsImported(IEnumerable<BeatmapSetInfo> beatmapSets) => beatmapSets.All(set => set != null);
+
         private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int expectedDiff)
         {
             AddStep("present beatmap", () => Game.PresentBeatmap(getImport()));

From 9f091f3a5635cdca80c15511a7e888c70f0536f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 May 2020 17:02:28 +0200
Subject: [PATCH 02559/10326] Do not query API for custom rulesets

---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 4d48cc3fe7..e9c7f6c464 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -68,7 +68,8 @@ namespace osu.Game.Screens.Select
 
         private void calculateRecommendedDifficulties()
         {
-            rulesets.AvailableRulesets.ForEach(rulesetInfo =>
+            // only query API for built-in rulesets
+            rulesets.AvailableRulesets.Where(ruleset => ruleset.ID <= 3).ForEach(rulesetInfo =>
             {
                 var req = new GetUserRequest(api.LocalUser.Value.Id, rulesetInfo);
 

From 623611d9dc03e210f75615a260cde554aaef2a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 May 2020 17:15:35 +0200
Subject: [PATCH 02560/10326] Simplify ruleset ordering

---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index e9c7f6c464..0dc4ff95ca 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -88,10 +88,9 @@ namespace osu.Game.Screens.Select
 
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
-            bestRulesetOrder ??= recommendedStarDifficulty.ToList()
-                                                          .OrderBy(pair => pair.Value)
+            bestRulesetOrder ??= recommendedStarDifficulty.OrderByDescending(pair => pair.Value)
                                                           .Select(pair => pair.Key)
-                                                          .Reverse();
+                                                          .ToList();
 
             return moveCurrentRulesetToFirst();
         }

From 3cf60e6e00483b9fd39c001073e29517f2e2ed9e Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 1 May 2020 19:08:56 +0300
Subject: [PATCH 02561/10326] Add failing test

---
 .../TestSceneBeatmapRecommendations.cs        | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 5fb4e80b51..68f31c5c73 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -141,6 +141,23 @@ namespace osu.Game.Tests.Visual.SongSelect
             presentAndConfirm(() => mixedSet, 2);
         }
 
+        [Test]
+        public void TestCorrectStarRatingIsUsed()
+        {
+            BeatmapSetInfo osuSet = null, maniaSet = null;
+
+            AddStep("create osu! beatmapset", () => osuSet = importBeatmapSet(0, new[] { new OsuRuleset().RulesetInfo }));
+            AddStep("create mania beatmapset", () => maniaSet = importBeatmapSet(1, Enumerable.Repeat(new ManiaRuleset().RulesetInfo, 10)));
+
+            AddAssert("all sets imported", () => ensureAllBeatmapSetsImported(new[] { osuSet, maniaSet }));
+
+            // Make sure we are on standard ruleset
+            presentAndConfirm(() => osuSet, 1);
+
+            // Present mania set, expect the difficulty that matches recommended mania star rating
+            presentAndConfirm(() => maniaSet, 5);
+        }
+
         private BeatmapSetInfo importBeatmapSet(int importID, IEnumerable<RulesetInfo> difficultyRulesets)
         {
             var metadata = new BeatmapMetadata
@@ -161,7 +178,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Metadata = metadata,
                     BaseDifficulty = new BeatmapDifficulty(),
                     Ruleset = ruleset,
-                    StarDifficulty = difficultyIndex + 1
+                    StarDifficulty = difficultyIndex + 1,
+                    Version = $"SR{difficultyIndex + 1}"
                 }).ToList()
             };
 

From 1c04d58d6e55f2a09a237c53a4a2b700ecf0d74d Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 1 May 2020 19:44:35 +0300
Subject: [PATCH 02562/10326] Fix recommender's incorrect usage of current
 ruleset

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

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 0dc4ff95ca..0753bbc5bd 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Select
 
             foreach (var r in getBestRulesetOrder())
             {
-                recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars);
+                recommendedStarDifficulty.TryGetValue(r, out var stars);
 
                 beatmap = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
                 {

From d30e4061cce9ef69ffeb08b342a9f77109b8935e Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 1 May 2020 19:46:49 +0300
Subject: [PATCH 02563/10326] Add clarifying comment about pp choice

---
 .../Visual/SongSelect/TestSceneBeatmapRecommendations.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 68f31c5c73..fc14af3ab5 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -67,16 +67,16 @@ namespace osu.Game.Tests.Visual.SongSelect
                 switch (rulesetID)
                 {
                     case 0:
-                        return 336;
+                        return 336; // recommended star rating of 2
 
                     case 1:
-                        return 928;
+                        return 928; // SR 3
 
                     case 2:
-                        return 1905;
+                        return 1905; // SR 4
 
                     case 3:
-                        return 3329;
+                        return 3329; // SR 5
 
                     default:
                         return 0;

From 811874773288186d4e93620e44024331ebb59615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 2 May 2020 01:33:33 +0200
Subject: [PATCH 02564/10326] Make PeriodTracker actually immutable

---
 osu.Game.Tests/NonVisual/PeriodTrackerTest.cs | 54 +++++++------------
 osu.Game/Screens/Play/BreakTracker.cs         |  8 +--
 osu.Game/Utils/PeriodTracker.cs               | 35 +++---------
 3 files changed, 29 insertions(+), 68 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs b/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs
index f033672576..62c7732b66 100644
--- a/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs
+++ b/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs
@@ -12,10 +12,9 @@ namespace osu.Game.Tests.NonVisual
     [TestFixture]
     public class PeriodTrackerTest
     {
-        private static readonly Period[] test_single_period = { new Period(1.0, 2.0) };
+        private static readonly Period[] single_period = { new Period(1.0, 2.0) };
 
-        // this is intended to be unordered to test adding periods in unordered way.
-        private static readonly Period[] test_periods =
+        private static readonly Period[] unordered_periods =
         {
             new Period(-9.1, -8.3),
             new Period(-3.4, 2.1),
@@ -26,43 +25,40 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestCheckValueInsideSinglePeriod()
         {
-            var tracker = new PeriodTracker { Periods = test_single_period };
+            var tracker = new PeriodTracker(single_period);
 
-            var period = test_single_period.Single();
+            var period = single_period.Single();
             Assert.IsTrue(tracker.IsInAny(period.Start));
-            Assert.IsTrue(tracker.IsInAny(getMidTime(period)));
+            Assert.IsTrue(tracker.IsInAny(getMidpoint(period)));
             Assert.IsTrue(tracker.IsInAny(period.End));
         }
 
         [Test]
         public void TestCheckValuesInsidePeriods()
         {
-            var tracker = new PeriodTracker { Periods = test_periods };
+            var tracker = new PeriodTracker(unordered_periods);
 
-            foreach (var period in test_periods)
-                Assert.IsTrue(tracker.IsInAny(getMidTime(period)));
+            foreach (var period in unordered_periods)
+                Assert.IsTrue(tracker.IsInAny(getMidpoint(period)));
         }
 
         [Test]
         public void TestCheckValuesInRandomOrder()
         {
-            var tracker = new PeriodTracker { Periods = test_periods };
+            var tracker = new PeriodTracker(unordered_periods);
 
-            foreach (var period in test_periods.OrderBy(_ => RNG.Next()))
-                Assert.IsTrue(tracker.IsInAny(getMidTime(period)));
+            foreach (var period in unordered_periods.OrderBy(_ => RNG.Next()))
+                Assert.IsTrue(tracker.IsInAny(getMidpoint(period)));
         }
 
         [Test]
         public void TestCheckValuesOutOfPeriods()
         {
-            var tracker = new PeriodTracker
+            var tracker = new PeriodTracker(new[]
             {
-                Periods = new[]
-                {
-                    new Period(1.0, 2.0),
-                    new Period(3.0, 4.0)
-                }
-            };
+                new Period(1.0, 2.0),
+                new Period(3.0, 4.0)
+            });
 
             Assert.IsFalse(tracker.IsInAny(0.9), "Time before first period is being considered inside");
 
@@ -72,32 +68,18 @@ namespace osu.Game.Tests.NonVisual
             Assert.IsFalse(tracker.IsInAny(4.1), "Time after last period is being considered inside");
         }
 
-        [Test]
-        public void TestNullRemovesExistingPeriods()
-        {
-            var tracker = new PeriodTracker { Periods = test_single_period };
-
-            var period = test_single_period.Single();
-            Assert.IsTrue(tracker.IsInAny(getMidTime(period)));
-
-            tracker.Periods = null;
-            Assert.IsFalse(tracker.IsInAny(getMidTime(period)));
-        }
-
         [Test]
         public void TestReversedPeriodHandling()
         {
-            var tracker = new PeriodTracker();
-
             Assert.Throws<ArgumentException>(() =>
             {
-                tracker.Periods = new[]
+                _ = new PeriodTracker(new[]
                 {
                     new Period(2.0, 1.0)
-                };
+                });
             });
         }
 
-        private double getMidTime(Period period) => period.Start + (period.End - period.Start) / 2;
+        private double getMidpoint(Period period) => period.Start + (period.End - period.Start) / 2;
     }
 }
diff --git a/osu.Game/Screens/Play/BreakTracker.cs b/osu.Game/Screens/Play/BreakTracker.cs
index 79da548336..51e21656e1 100644
--- a/osu.Game/Screens/Play/BreakTracker.cs
+++ b/osu.Game/Screens/Play/BreakTracker.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play
         private readonly ScoreProcessor scoreProcessor;
         private readonly double gameplayStartTime;
 
-        private readonly PeriodTracker tracker = new PeriodTracker();
+        private PeriodTracker breaks;
 
         /// <summary>
         /// Whether the gameplay is currently in a break.
@@ -31,8 +31,8 @@ namespace osu.Game.Screens.Play
             {
                 isBreakTime.Value = false;
 
-                tracker.Periods = value?.Where(b => b.HasEffect)
-                                       .Select(b => new Period(b.StartTime, b.EndTime - BreakOverlay.BREAK_FADE_DURATION));
+                breaks = new PeriodTracker(value.Where(b => b.HasEffect)
+                                                .Select(b => new Period(b.StartTime, b.EndTime - BreakOverlay.BREAK_FADE_DURATION)));
             }
         }
 
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Play
 
             var time = Clock.CurrentTime;
 
-            isBreakTime.Value = tracker.IsInAny(time)
+            isBreakTime.Value = breaks?.IsInAny(time) == true
                                 || time < gameplayStartTime
                                 || scoreProcessor?.HasCompleted.Value == true;
         }
diff --git a/osu.Game/Utils/PeriodTracker.cs b/osu.Game/Utils/PeriodTracker.cs
index 49b372bb27..ba77702247 100644
--- a/osu.Game/Utils/PeriodTracker.cs
+++ b/osu.Game/Utils/PeriodTracker.cs
@@ -8,41 +8,22 @@ using System.Linq;
 namespace osu.Game.Utils
 {
     /// <summary>
-    /// Represents a tracking component used for whether a
-    /// specific time falls into any of the provided periods.
+    /// Represents a tracking component used for whether a specific time instant falls into any of the provided periods.
     /// </summary>
     public class PeriodTracker
     {
-        private readonly List<Period> periods = new List<Period>();
+        private readonly List<Period> periods;
         private int nearestIndex;
 
-        /// <summary>
-        /// The list of periods to add to the tracker for using the required check methods.
-        /// </summary>
-        public IEnumerable<Period> Periods
+        public PeriodTracker(IEnumerable<Period> periods)
         {
-            set
-            {
-                var sortedValue = value?.ToList();
-                sortedValue?.Sort();
-
-                if (sortedValue != null && periods.SequenceEqual(sortedValue))
-                    return;
-
-                periods.Clear();
-                nearestIndex = 0;
-
-                if (value?.Any() != true)
-                    return;
-
-                periods.AddRange(sortedValue);
-            }
+            this.periods = periods.OrderBy(period => period.Start).ToList();
         }
 
         /// <summary>
         /// Whether the provided time is in any of the added periods.
         /// </summary>
-        /// <param name="time">The time value to check for.</param>
+        /// <param name="time">The time value to check.</param>
         public bool IsInAny(double time)
         {
             if (periods.Count == 0)
@@ -64,7 +45,7 @@ namespace osu.Game.Utils
         }
     }
 
-    public readonly struct Period : IComparable<Period>
+    public readonly struct Period
     {
         /// <summary>
         /// The start time of this period.
@@ -79,12 +60,10 @@ namespace osu.Game.Utils
         public Period(double start, double end)
         {
             if (start >= end)
-                throw new ArgumentException($"Invalid period provided, {nameof(start)} must be less than {nameof(end)}", nameof(start));
+                throw new ArgumentException($"Invalid period provided, {nameof(start)} must be less than {nameof(end)}");
 
             Start = start;
             End = end;
         }
-
-        public int CompareTo(Period other) => Start.CompareTo(other.Start);
     }
 }

From deb87517d01019bca4b9a121118d52172600e74f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 2 May 2020 14:35:12 +0900
Subject: [PATCH 02565/10326] Add local beatmap lookup cache

---
 osu.Game/Beatmaps/BeatmapManager.cs           |  68 +------
 .../Beatmaps/BeatmapManager_UpdateQueue.cs    | 180 ++++++++++++++++++
 osu.Game/Database/ArchiveModelManager.cs      |   2 +-
 osu.Game/osu.Game.csproj                      |   1 +
 4 files changed, 183 insertions(+), 68 deletions(-)
 create mode 100644 osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b8dfac0342..22451382a3 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -17,7 +17,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Lists;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Framework.Threading;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
 using osu.Game.IO;
@@ -78,7 +77,7 @@ namespace osu.Game.Beatmaps
             beatmaps.BeatmapHidden += b => BeatmapHidden?.Invoke(b);
             beatmaps.BeatmapRestored += b => BeatmapRestored?.Invoke(b);
 
-            updateQueue = new BeatmapUpdateQueue(api);
+            updateQueue = new BeatmapUpdateQueue(api, storage);
             exportStorage = storage.GetStorageForDirectory("exports");
         }
 
@@ -446,71 +445,6 @@ namespace osu.Game.Beatmaps
             protected override Texture GetBackground() => null;
             protected override Track GetTrack() => null;
         }
-
-        private class BeatmapUpdateQueue
-        {
-            private readonly IAPIProvider api;
-
-            private const int update_queue_request_concurrency = 4;
-
-            private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(update_queue_request_concurrency, nameof(BeatmapUpdateQueue));
-
-            public BeatmapUpdateQueue(IAPIProvider api)
-            {
-                this.api = api;
-            }
-
-            public Task UpdateAsync(BeatmapSetInfo beatmapSet, CancellationToken cancellationToken)
-            {
-                if (api?.State != APIState.Online)
-                    return Task.CompletedTask;
-
-                LogForModel(beatmapSet, "Performing online lookups...");
-                return Task.WhenAll(beatmapSet.Beatmaps.Select(b => UpdateAsync(beatmapSet, b, cancellationToken)).ToArray());
-            }
-
-            // todo: expose this when we need to do individual difficulty lookups.
-            protected Task UpdateAsync(BeatmapSetInfo beatmapSet, BeatmapInfo beatmap, CancellationToken cancellationToken)
-                => Task.Factory.StartNew(() => update(beatmapSet, beatmap), cancellationToken, TaskCreationOptions.HideScheduler, updateScheduler);
-
-            private void update(BeatmapSetInfo set, BeatmapInfo beatmap)
-            {
-                if (api?.State != APIState.Online)
-                    return;
-
-                var req = new GetBeatmapRequest(beatmap);
-
-                req.Failure += fail;
-
-                try
-                {
-                    // intentionally blocking to limit web request concurrency
-                    api.Perform(req);
-
-                    var res = req.Result;
-
-                    if (res != null)
-                    {
-                        beatmap.Status = res.Status;
-                        beatmap.BeatmapSet.Status = res.BeatmapSet.Status;
-                        beatmap.BeatmapSet.OnlineBeatmapSetID = res.OnlineBeatmapSetID;
-                        beatmap.OnlineBeatmapID = res.OnlineBeatmapID;
-
-                        LogForModel(set, $"Online retrieval mapped {beatmap} to {res.OnlineBeatmapSetID} / {res.OnlineBeatmapID}.");
-                    }
-                }
-                catch (Exception e)
-                {
-                    fail(e);
-                }
-
-                void fail(Exception e)
-                {
-                    beatmap.OnlineBeatmapID = null;
-                    LogForModel(set, $"Online retrieval failed for {beatmap} ({e.Message})");
-                }
-            }
-        }
     }
 
     /// <summary>
diff --git a/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs b/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs
new file mode 100644
index 0000000000..aa8be823f7
--- /dev/null
+++ b/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.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;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Dapper;
+using Microsoft.Data.Sqlite;
+using osu.Framework.IO.Network;
+using osu.Framework.Logging;
+using osu.Framework.Platform;
+using osu.Framework.Threading;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using SharpCompress.Compressors;
+using SharpCompress.Compressors.BZip2;
+
+namespace osu.Game.Beatmaps
+{
+    public partial class BeatmapManager
+    {
+        private class BeatmapUpdateQueue
+        {
+            private readonly IAPIProvider api;
+            private readonly Storage storage;
+
+            private const int update_queue_request_concurrency = 4;
+
+            private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(update_queue_request_concurrency, nameof(BeatmapUpdateQueue));
+
+            private FileWebRequest cacheDownloadRequest;
+
+            private const string cache_database_name = "online.db";
+
+            public BeatmapUpdateQueue(IAPIProvider api, Storage storage)
+            {
+                this.api = api;
+                this.storage = storage;
+
+                if (!storage.Exists(cache_database_name))
+                    prepareLocalCache();
+            }
+
+            public Task UpdateAsync(BeatmapSetInfo beatmapSet, CancellationToken cancellationToken)
+            {
+                if (api?.State != APIState.Online)
+                    return Task.CompletedTask;
+
+                LogForModel(beatmapSet, "Performing online lookups...");
+                return Task.WhenAll(beatmapSet.Beatmaps.Select(b => UpdateAsync(beatmapSet, b, cancellationToken)).ToArray());
+            }
+
+            // todo: expose this when we need to do individual difficulty lookups.
+            protected Task UpdateAsync(BeatmapSetInfo beatmapSet, BeatmapInfo beatmap, CancellationToken cancellationToken)
+                => Task.Factory.StartNew(() => update(beatmapSet, beatmap), cancellationToken, TaskCreationOptions.HideScheduler, updateScheduler);
+
+            private void update(BeatmapSetInfo set, BeatmapInfo beatmap)
+            {
+                if (cacheDownloadRequest == null && storage.Exists(cache_database_name))
+                {
+                    try
+                    {
+                        using (var db = new SqliteConnection(storage.GetDatabaseConnectionString("online")))
+                        {
+                            var found = db.QueryFirstOrDefault<CachedOnlineBeatmapLookup>(
+                                "SELECT * FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path", beatmap);
+
+                            if (found != null)
+                            {
+                                var status = (BeatmapSetOnlineStatus)found.approved;
+
+                                beatmap.Status = status;
+                                beatmap.BeatmapSet.Status = status;
+                                beatmap.BeatmapSet.OnlineBeatmapSetID = found.beatmapset_id;
+                                beatmap.OnlineBeatmapID = found.beatmap_id;
+
+                                LogForModel(set, $"Cached local retrieval for {beatmap}.");
+                                return;
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogForModel(set, $"Cached local retrieval for {beatmap} failed with {ex}.");
+                    }
+                }
+
+                if (api?.State != APIState.Online)
+                    return;
+
+                var req = new GetBeatmapRequest(beatmap);
+
+                req.Failure += fail;
+
+                try
+                {
+                    // intentionally blocking to limit web request concurrency
+                    api.Perform(req);
+
+                    var res = req.Result;
+
+                    if (res != null)
+                    {
+                        beatmap.Status = res.Status;
+                        beatmap.BeatmapSet.Status = res.BeatmapSet.Status;
+                        beatmap.BeatmapSet.OnlineBeatmapSetID = res.OnlineBeatmapSetID;
+                        beatmap.OnlineBeatmapID = res.OnlineBeatmapID;
+
+                        LogForModel(set, $"Online retrieval mapped {beatmap} to {res.OnlineBeatmapSetID} / {res.OnlineBeatmapID}.");
+                    }
+                }
+                catch (Exception e)
+                {
+                    fail(e);
+                }
+
+                void fail(Exception e)
+                {
+                    beatmap.OnlineBeatmapID = null;
+                    LogForModel(set, $"Online retrieval failed for {beatmap} ({e.Message})");
+                }
+            }
+
+            private void prepareLocalCache()
+            {
+                string cacheFilePath = storage.GetFullPath(cache_database_name);
+                string compressedCacheFilePath = $"{cacheFilePath}.bz2";
+
+                cacheDownloadRequest = new FileWebRequest(compressedCacheFilePath, $"https://assets.ppy.sh/client-resources/{cache_database_name}.bz2");
+
+                cacheDownloadRequest.Failed += ex =>
+                {
+                    File.Delete(compressedCacheFilePath);
+                    File.Delete(cacheFilePath);
+
+                    Logger.Log($"{nameof(BeatmapUpdateQueue)}'s online cache download failed: {ex}", LoggingTarget.Database);
+                };
+
+                cacheDownloadRequest.Finished += () =>
+                {
+                    try
+                    {
+                        using (var stream = File.OpenRead(cacheDownloadRequest.Filename))
+                        using (var outStream = File.OpenWrite(cacheFilePath))
+                        using (var bz2 = new BZip2Stream(stream, CompressionMode.Decompress, false))
+                            bz2.CopyTo(outStream);
+
+                        // set to null on completion to allow lookups to begin using the new source
+                        cacheDownloadRequest = null;
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.Log($"{nameof(BeatmapUpdateQueue)}'s online cache extraction failed: {ex}", LoggingTarget.Database);
+                    }
+                    finally
+                    {
+                        File.Delete(compressedCacheFilePath);
+                        File.Delete(cacheFilePath);
+                    }
+                };
+
+                cacheDownloadRequest.PerformAsync();
+            }
+
+            [Serializable]
+            [SuppressMessage("ReSharper", "InconsistentNaming")]
+            private class CachedOnlineBeatmapLookup
+            {
+                public int approved { get; set; }
+
+                public int? beatmapset_id { get; set; }
+
+                public int? beatmap_id { get; set; }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 5e237d2ecb..839f9075e5 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -245,7 +245,7 @@ namespace osu.Game.Database
         /// </summary>
         protected abstract string[] HashableFileTypes { get; }
 
-        protected static void LogForModel(TModel model, string message, Exception e = null)
+        internal static void LogForModel(TModel model, string message, Exception e = null)
         {
             string prefix = $"[{(model?.Hash ?? "?????").Substring(0, 5)}]";
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index acb7fe5fbe..81818360a4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,6 +18,7 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
+    <PackageReference Include="Dapper" Version="2.0.35" />
     <PackageReference Include="DiffPlex" Version="1.6.1" />
     <PackageReference Include="Humanizer" Version="2.8.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />

From 917393697cf36c61c3356719bd39fbaac2208947 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 2 May 2020 14:38:46 +0900
Subject: [PATCH 02566/10326] 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 336479c40a..8214fa2f2c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.501.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.502.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index acb7fe5fbe..eae763c412 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,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.501.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.502.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 6662e57dcd..9ff7e3fc02 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.Framework.iOS" Version="2020.501.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.502.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.501.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.502.0" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From b9b57792514d43a92dc5d2de7b84b248a487ad28 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 May 2020 09:31:56 +0900
Subject: [PATCH 02567/10326] Move deletion to catch instead of finally

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

diff --git a/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs b/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs
index aa8be823f7..be4bd0d30d 100644
--- a/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs
@@ -154,11 +154,11 @@ namespace osu.Game.Beatmaps
                     catch (Exception ex)
                     {
                         Logger.Log($"{nameof(BeatmapUpdateQueue)}'s online cache extraction failed: {ex}", LoggingTarget.Database);
+                        File.Delete(cacheFilePath);
                     }
                     finally
                     {
                         File.Delete(compressedCacheFilePath);
-                        File.Delete(cacheFilePath);
                     }
                 };
 

From 035b513b68347b6144fa06c9727a2bb404c46b29 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 May 2020 09:32:33 +0900
Subject: [PATCH 02568/10326] Use QuerySingle instead of QueryFirst

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

diff --git a/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs b/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs
index be4bd0d30d..84901f9b50 100644
--- a/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Beatmaps
                     {
                         using (var db = new SqliteConnection(storage.GetDatabaseConnectionString("online")))
                         {
-                            var found = db.QueryFirstOrDefault<CachedOnlineBeatmapLookup>(
+                            var found = db.QuerySingleOrDefault<CachedOnlineBeatmapLookup>(
                                 "SELECT * FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path", beatmap);
 
                             if (found != null)

From 6fef4eeb8f9fd1e46e3b8553b03496c201d911b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 May 2020 09:35:48 +0900
Subject: [PATCH 02569/10326] Rename class and extract out lookup method

---
 osu.Game/Beatmaps/BeatmapManager.cs           |  6 +-
 ...eatmapManager_BeatmapOnlineLookupQueue.cs} | 83 +++++++++++--------
 2 files changed, 51 insertions(+), 38 deletions(-)
 rename osu.Game/Beatmaps/{BeatmapManager_UpdateQueue.cs => BeatmapManager_BeatmapOnlineLookupQueue.cs} (71%)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 22451382a3..19d1162d23 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Beatmaps
         private readonly BeatmapStore beatmaps;
         private readonly AudioManager audioManager;
         private readonly GameHost host;
-        private readonly BeatmapUpdateQueue updateQueue;
+        private readonly BeatmapOnlineLookupQueue onlineLookupQueue;
         private readonly Storage exportStorage;
 
         public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, AudioManager audioManager, GameHost host = null,
@@ -77,7 +77,7 @@ namespace osu.Game.Beatmaps
             beatmaps.BeatmapHidden += b => BeatmapHidden?.Invoke(b);
             beatmaps.BeatmapRestored += b => BeatmapRestored?.Invoke(b);
 
-            updateQueue = new BeatmapUpdateQueue(api, storage);
+            onlineLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
             exportStorage = storage.GetStorageForDirectory("exports");
         }
 
@@ -104,7 +104,7 @@ namespace osu.Game.Beatmaps
 
             bool hadOnlineBeatmapIDs = beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0);
 
-            await updateQueue.UpdateAsync(beatmapSet, cancellationToken);
+            await onlineLookupQueue.UpdateAsync(beatmapSet, cancellationToken);
 
             // ensure at least one beatmap was able to retrieve or keep an online ID, else drop the set ID.
             if (hadOnlineBeatmapIDs && !beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0))
diff --git a/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
similarity index 71%
rename from osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs
rename to osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index 84901f9b50..2bd7529ab0 100644
--- a/osu.Game/Beatmaps/BeatmapManager_UpdateQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -22,20 +22,20 @@ namespace osu.Game.Beatmaps
 {
     public partial class BeatmapManager
     {
-        private class BeatmapUpdateQueue
+        private class BeatmapOnlineLookupQueue
         {
             private readonly IAPIProvider api;
             private readonly Storage storage;
 
             private const int update_queue_request_concurrency = 4;
 
-            private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(update_queue_request_concurrency, nameof(BeatmapUpdateQueue));
+            private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(update_queue_request_concurrency, nameof(BeatmapOnlineLookupQueue));
 
             private FileWebRequest cacheDownloadRequest;
 
             private const string cache_database_name = "online.db";
 
-            public BeatmapUpdateQueue(IAPIProvider api, Storage storage)
+            public BeatmapOnlineLookupQueue(IAPIProvider api, Storage storage)
             {
                 this.api = api;
                 this.storage = storage;
@@ -55,38 +55,12 @@ namespace osu.Game.Beatmaps
 
             // todo: expose this when we need to do individual difficulty lookups.
             protected Task UpdateAsync(BeatmapSetInfo beatmapSet, BeatmapInfo beatmap, CancellationToken cancellationToken)
-                => Task.Factory.StartNew(() => update(beatmapSet, beatmap), cancellationToken, TaskCreationOptions.HideScheduler, updateScheduler);
+                => Task.Factory.StartNew(() => lookup(beatmapSet, beatmap), cancellationToken, TaskCreationOptions.HideScheduler, updateScheduler);
 
-            private void update(BeatmapSetInfo set, BeatmapInfo beatmap)
+            private void lookup(BeatmapSetInfo set, BeatmapInfo beatmap)
             {
-                if (cacheDownloadRequest == null && storage.Exists(cache_database_name))
-                {
-                    try
-                    {
-                        using (var db = new SqliteConnection(storage.GetDatabaseConnectionString("online")))
-                        {
-                            var found = db.QuerySingleOrDefault<CachedOnlineBeatmapLookup>(
-                                "SELECT * FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path", beatmap);
-
-                            if (found != null)
-                            {
-                                var status = (BeatmapSetOnlineStatus)found.approved;
-
-                                beatmap.Status = status;
-                                beatmap.BeatmapSet.Status = status;
-                                beatmap.BeatmapSet.OnlineBeatmapSetID = found.beatmapset_id;
-                                beatmap.OnlineBeatmapID = found.beatmap_id;
-
-                                LogForModel(set, $"Cached local retrieval for {beatmap}.");
-                                return;
-                            }
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        LogForModel(set, $"Cached local retrieval for {beatmap} failed with {ex}.");
-                    }
-                }
+                if (checkLocalCache(set, beatmap))
+                    return;
 
                 if (api?.State != APIState.Online)
                     return;
@@ -136,7 +110,7 @@ namespace osu.Game.Beatmaps
                     File.Delete(compressedCacheFilePath);
                     File.Delete(cacheFilePath);
 
-                    Logger.Log($"{nameof(BeatmapUpdateQueue)}'s online cache download failed: {ex}", LoggingTarget.Database);
+                    Logger.Log($"{nameof(BeatmapOnlineLookupQueue)}'s online cache download failed: {ex}", LoggingTarget.Database);
                 };
 
                 cacheDownloadRequest.Finished += () =>
@@ -153,7 +127,7 @@ namespace osu.Game.Beatmaps
                     }
                     catch (Exception ex)
                     {
-                        Logger.Log($"{nameof(BeatmapUpdateQueue)}'s online cache extraction failed: {ex}", LoggingTarget.Database);
+                        Logger.Log($"{nameof(BeatmapOnlineLookupQueue)}'s online cache extraction failed: {ex}", LoggingTarget.Database);
                         File.Delete(cacheFilePath);
                     }
                     finally
@@ -165,6 +139,45 @@ namespace osu.Game.Beatmaps
                 cacheDownloadRequest.PerformAsync();
             }
 
+            private bool checkLocalCache(BeatmapSetInfo set, BeatmapInfo beatmap)
+            {
+                // download is in progress (or was, and failed).
+                if (cacheDownloadRequest != null)
+                    return false;
+
+                // database is unavailable.
+                if (!storage.Exists(cache_database_name))
+                    return false;
+
+                try
+                {
+                    using (var db = new SqliteConnection(storage.GetDatabaseConnectionString("online")))
+                    {
+                        var found = db.QuerySingleOrDefault<CachedOnlineBeatmapLookup>(
+                            "SELECT * FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path", beatmap);
+
+                        if (found != null)
+                        {
+                            var status = (BeatmapSetOnlineStatus)found.approved;
+
+                            beatmap.Status = status;
+                            beatmap.BeatmapSet.Status = status;
+                            beatmap.BeatmapSet.OnlineBeatmapSetID = found.beatmapset_id;
+                            beatmap.OnlineBeatmapID = found.beatmap_id;
+
+                            LogForModel(set, $"Cached local retrieval for {beatmap}.");
+                            return true;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogForModel(set, $"Cached local retrieval for {beatmap} failed with {ex}.");
+                }
+
+                return false;
+            }
+
             [Serializable]
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             private class CachedOnlineBeatmapLookup

From 68d40cf79064efc39f89631a80873f0886df99f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 May 2020 13:25:57 +0900
Subject: [PATCH 02570/10326] Fix test failures due to online cache download

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

diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index 2bd7529ab0..2c79a664c5 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -9,6 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Dapper;
 using Microsoft.Data.Sqlite;
+using osu.Framework.Development;
 using osu.Framework.IO.Network;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -40,7 +41,8 @@ namespace osu.Game.Beatmaps
                 this.api = api;
                 this.storage = storage;
 
-                if (!storage.Exists(cache_database_name))
+                // avoid downloading / using cache for unit tests.
+                if (!DebugUtils.IsNUnitRunning && !storage.Exists(cache_database_name))
                     prepareLocalCache();
             }
 

From cea6be5e52324d706b6120ffdaf340609b923447 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 May 2020 23:55:44 +0900
Subject: [PATCH 02571/10326] Expose as JudgementResult instead of "passing"
 state

---
 .../Skinning/TestSceneTaikoScroller.cs                 |  5 ++++-
 .../Skinning/LegacyTaikoScroller.cs                    | 10 ++++++----
 osu.Game/Screens/Play/GameplayBeatmap.cs               | 10 +++-------
 osu.Game/Screens/Play/Player.cs                        |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
index 3d1ccadd6e..e26f410b71 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
@@ -3,6 +3,8 @@
 
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Skinning;
 
@@ -13,7 +15,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         public TestSceneTaikoScroller()
         {
             AddStep("Load scroller", () => SetContents(() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Empty())));
-            AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.Passing.Value = !passing));
+            AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.LastResult.Value =
+                new JudgementResult(null, new Judgement()) { Type = passing ? HitResult.Perfect : HitResult.Miss }));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index f61ee0301d..027fe1f302 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -7,6 +7,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
@@ -24,21 +26,21 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         private void load(GameplayBeatmap gameplayBeatmap)
         {
             if (gameplayBeatmap != null)
-                ((IBindable<bool>)Passing).BindTo(gameplayBeatmap.Passing);
+                ((IBindable<JudgementResult>)LastResult).BindTo(gameplayBeatmap.LastJudgementResult);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            Passing.BindValueChanged(passing =>
+            LastResult.BindValueChanged(result =>
             {
                 foreach (var sprite in InternalChildren.OfType<ScrollerSprite>())
-                    sprite.Passing = passing.NewValue;
+                    sprite.Passing = result.NewValue == null || result.NewValue.Type > HitResult.Miss;
             }, true);
         }
 
-        public Bindable<bool> Passing = new BindableBool(true);
+        public Bindable<JudgementResult> LastResult = new Bindable<JudgementResult>();
 
         protected override void Update()
         {
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 0afa189e66..64894544f4 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -9,7 +9,6 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play
 {
@@ -42,13 +41,10 @@ namespace osu.Game.Screens.Play
 
         public IBeatmap Clone() => PlayableBeatmap.Clone();
 
-        public IBindable<bool> Passing => passing;
+        private readonly Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();
 
-        private readonly BindableBool passing = new BindableBool(true);
+        public IBindable<JudgementResult> LastJudgementResult => lastJudgementResult;
 
-        public void OnNewResult(JudgementResult result)
-        {
-            passing.Value = result.Type > HitResult.Miss;
-        }
+        public void ApplyResult(JudgementResult result) => lastJudgementResult.Value = result;
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index eeb514b4be..f20d2504f7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -193,7 +193,7 @@ namespace osu.Game.Screens.Play
             {
                 HealthProcessor.ApplyResult(r);
                 ScoreProcessor.ApplyResult(r);
-                gameplayBeatmap.OnNewResult(r);
+                gameplayBeatmap.ApplyResult(r);
             };
 
             DrawableRuleset.OnRevertResult += r =>

From a1cd007cadfdb120f3a977e258676fedad854081 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 May 2020 14:43:47 +0900
Subject: [PATCH 02572/10326] Fix song select tests potentially failing due to
 difficulty panels not yet displayed

---
 .../Visual/SongSelect/TestScenePlaySongSelect.cs     | 12 +++++++++---
 osu.Game/Beatmaps/BeatmapManager.cs                  |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index aed8e19fb2..802c324c90 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
-            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+            waitForInitialSelection();
 
             WorkingBeatmap selected = null;
 
@@ -135,7 +135,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
-            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+            waitForInitialSelection();
 
             WorkingBeatmap selected = null;
 
@@ -189,7 +189,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
-            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+            waitForInitialSelection();
 
             WorkingBeatmap selected = null;
 
@@ -769,6 +769,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Check first item in group selected", () => Beatmap.Value.BeatmapInfo == groupIcon.Items.First().Beatmap);
         }
 
+        private void waitForInitialSelection()
+        {
+            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+            AddUntilStep("wait for difficulty panels visible", () => songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>().Any());
+        }
+
         private int getBeatmapIndex(BeatmapSetInfo set, BeatmapInfo info) => set.Beatmaps.FindIndex(b => b == info);
 
         private int getCurrentBeatmapIndex() => getBeatmapIndex(songSelect.Carousel.SelectedBeatmapSet, songSelect.Carousel.SelectedBeatmap);
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 19d1162d23..1b29f14c9b 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Beatmaps
         {
             var beatmapIds = beatmapSet.Beatmaps.Where(b => b.OnlineBeatmapID.HasValue).Select(b => b.OnlineBeatmapID).ToList();
 
-            LogForModel(beatmapSet, "Validating online IDs...");
+            LogForModel(beatmapSet, $"Validating online IDs for {beatmapSet.Beatmaps.Count} beatmaps...");
 
             // ensure all IDs are unique
             if (beatmapIds.GroupBy(b => b).Any(g => g.Count() > 1))

From 02b9f51bdd4c2e0c2b07cefea40b54b4f0bbc0b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 May 2020 13:31:49 +0900
Subject: [PATCH 02573/10326] Add failing test

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 802c324c90..851801d38a 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -24,10 +24,12 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Taiko;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Carousel;
 using osu.Game.Screens.Select.Filter;
+using osu.Game.Users;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.SongSelect
@@ -769,6 +771,70 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Check first item in group selected", () => Beatmap.Value.BeatmapInfo == groupIcon.Items.First().Beatmap);
         }
 
+        [Test]
+        public void TestChangeRulesetWhilePresentingScore()
+        {
+            changeRuleset(0);
+
+            createSongSelect();
+
+            addRulesetImportStep(0);
+            addRulesetImportStep(1);
+
+            AddStep("present score", () =>
+            {
+                var presentBeatmap = manager.QueryBeatmap(b => b.RulesetID == 0);
+                var switchBeatmap = manager.QueryBeatmap(b => b.RulesetID == 1);
+
+                // this ruleset change should be overridden by the present.
+                Ruleset.Value = switchBeatmap.Ruleset;
+
+                songSelect.PresentScore(new ScoreInfo
+                {
+                    User = new User { Username = "woo" },
+                    Beatmap = presentBeatmap,
+                    Ruleset = presentBeatmap.Ruleset
+                });
+            });
+
+            AddUntilStep("wait for results screen presented", () => !songSelect.IsCurrentScreen());
+
+            AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.Equals(manager.QueryBeatmap(b => b.RulesetID == 0)));
+            AddAssert("check ruleset is correct for score", () => Ruleset.Value.ID == 0);
+        }
+
+        [Test]
+        public void TestChangeBeatmapWhilePresentingScore()
+        {
+            changeRuleset(0);
+
+            createSongSelect();
+
+            addRulesetImportStep(0);
+            addRulesetImportStep(1);
+
+            AddStep("present score", () =>
+            {
+                var presentBeatmap = manager.QueryBeatmap(b => b.RulesetID == 0);
+                var switchBeatmap = manager.QueryBeatmap(b => b.RulesetID == 1);
+
+                // this beatmap change should be overridden by the present.
+                Beatmap.Value = manager.GetWorkingBeatmap(switchBeatmap);
+
+                songSelect.PresentScore(new ScoreInfo
+                {
+                    User = new User { Username = "woo" },
+                    Beatmap = presentBeatmap,
+                    Ruleset = presentBeatmap.Ruleset
+                });
+            });
+
+            AddUntilStep("wait for results screen presented", () => !songSelect.IsCurrentScreen());
+
+            AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.Equals(manager.QueryBeatmap(b => b.RulesetID == 0)));
+            AddAssert("check ruleset is correct for score", () => Ruleset.Value.ID == 0);
+        }
+
         private void waitForInitialSelection()
         {
             AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
@@ -882,6 +948,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             public WorkingBeatmap CurrentBeatmapDetailsBeatmap => BeatmapDetails.Beatmap;
             public new BeatmapCarousel Carousel => base.Carousel;
 
+            public new void PresentScore(ScoreInfo score) => base.PresentScore(score);
+
             protected override bool OnStart()
             {
                 StartRequested?.Invoke();

From 06f58dd3e35a6d233845dbd73482e2638d22156f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 May 2020 14:04:30 +0900
Subject: [PATCH 02574/10326] Ensure correct beatmap and ruleset when
 presenting a score from song select

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

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 179aab54a3..21ddc5685d 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Users;
@@ -32,9 +33,12 @@ namespace osu.Game.Screens.Select
                 Edit();
             }, Key.Number4);
 
-            ((PlayBeatmapDetailArea)BeatmapDetails).Leaderboard.ScoreSelected += score => this.Push(new ResultsScreen(score));
+            ((PlayBeatmapDetailArea)BeatmapDetails).Leaderboard.ScoreSelected += PresentScore;
         }
 
+        protected void PresentScore(ScoreInfo score) =>
+            FinaliseSelection(score.Beatmap, score.Ruleset, () => this.Push(new ResultsScreen(score)));
+
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
         public override void OnResuming(IScreen last)
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a7e27c27ba..2b373ab7e0 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -342,13 +342,17 @@ namespace osu.Game.Screens.Select
         /// Call to make a selection and perform the default action for this SongSelect.
         /// </summary>
         /// <param name="beatmap">An optional beatmap to override the current carousel selection.</param>
-        /// <param name="performStartAction">Whether to trigger <see cref="OnStart"/>.</param>
-        public void FinaliseSelection(BeatmapInfo beatmap = null, bool performStartAction = true)
+        /// <param name="ruleset">An optional ruleset to override the current carousel selection.</param>
+        /// <param name="customStartAction">An optional custom action to perform instead of <see cref="OnStart"/>.</param>
+        public void FinaliseSelection(BeatmapInfo beatmap = null, RulesetInfo ruleset = null, Action customStartAction = null)
         {
             // This is very important as we have not yet bound to screen-level bindables before the carousel load is completed.
             if (!Carousel.BeatmapSetsLoaded)
                 return;
 
+            if (ruleset != null)
+                Ruleset.Value = ruleset;
+
             transferRulesetValue();
 
             // while transferRulesetValue will flush, it only does so if the ruleset changes.
@@ -369,7 +373,12 @@ namespace osu.Game.Screens.Select
                 selectionChangedDebounce = null;
             }
 
-            if (performStartAction && OnStart())
+            if (customStartAction != null)
+            {
+                customStartAction();
+                Carousel.AllowSelection = false;
+            }
+            else if (OnStart())
                 Carousel.AllowSelection = false;
         }
 

From 81889e0034115e5a22f4882b1f6e98703d9acf50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 May 2020 15:19:36 +0900
Subject: [PATCH 02575/10326] Fix tests potentially selecting a deleted beatmap

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 851801d38a..81fd1b66e5 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -774,6 +774,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestChangeRulesetWhilePresentingScore()
         {
+            BeatmapInfo getPresentBeatmap() => manager.QueryBeatmap(b => !b.BeatmapSet.DeletePending && b.RulesetID == 0);
+            BeatmapInfo getSwitchBeatmap() => manager.QueryBeatmap(b => !b.BeatmapSet.DeletePending && b.RulesetID == 1);
+
             changeRuleset(0);
 
             createSongSelect();
@@ -783,55 +786,52 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("present score", () =>
             {
-                var presentBeatmap = manager.QueryBeatmap(b => b.RulesetID == 0);
-                var switchBeatmap = manager.QueryBeatmap(b => b.RulesetID == 1);
-
                 // this ruleset change should be overridden by the present.
-                Ruleset.Value = switchBeatmap.Ruleset;
+                Ruleset.Value = getSwitchBeatmap().Ruleset;
 
                 songSelect.PresentScore(new ScoreInfo
                 {
                     User = new User { Username = "woo" },
-                    Beatmap = presentBeatmap,
-                    Ruleset = presentBeatmap.Ruleset
+                    Beatmap = getPresentBeatmap(),
+                    Ruleset = getPresentBeatmap().Ruleset
                 });
             });
 
             AddUntilStep("wait for results screen presented", () => !songSelect.IsCurrentScreen());
 
-            AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.Equals(manager.QueryBeatmap(b => b.RulesetID == 0)));
+            AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.Equals(getPresentBeatmap()));
             AddAssert("check ruleset is correct for score", () => Ruleset.Value.ID == 0);
         }
 
         [Test]
         public void TestChangeBeatmapWhilePresentingScore()
         {
-            changeRuleset(0);
+            BeatmapInfo getPresentBeatmap() => manager.QueryBeatmap(b => !b.BeatmapSet.DeletePending && b.RulesetID == 0);
+            BeatmapInfo getSwitchBeatmap() => manager.QueryBeatmap(b => !b.BeatmapSet.DeletePending && b.RulesetID == 1);
 
-            createSongSelect();
+            changeRuleset(0);
 
             addRulesetImportStep(0);
             addRulesetImportStep(1);
 
+            createSongSelect();
+
             AddStep("present score", () =>
             {
-                var presentBeatmap = manager.QueryBeatmap(b => b.RulesetID == 0);
-                var switchBeatmap = manager.QueryBeatmap(b => b.RulesetID == 1);
-
                 // this beatmap change should be overridden by the present.
-                Beatmap.Value = manager.GetWorkingBeatmap(switchBeatmap);
+                Beatmap.Value = manager.GetWorkingBeatmap(getSwitchBeatmap());
 
                 songSelect.PresentScore(new ScoreInfo
                 {
                     User = new User { Username = "woo" },
-                    Beatmap = presentBeatmap,
-                    Ruleset = presentBeatmap.Ruleset
+                    Beatmap = getPresentBeatmap(),
+                    Ruleset = getPresentBeatmap().Ruleset
                 });
             });
 
             AddUntilStep("wait for results screen presented", () => !songSelect.IsCurrentScreen());
 
-            AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.Equals(manager.QueryBeatmap(b => b.RulesetID == 0)));
+            AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.Equals(getPresentBeatmap()));
             AddAssert("check ruleset is correct for score", () => Ruleset.Value.ID == 0);
         }
 

From 46b0526db7afd25e1a962420ee8235df1f109801 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 4 May 2020 15:27:04 +0900
Subject: [PATCH 02576/10326] Remove hack limiting max number of ticks

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 19219cc1ba..01011645bd 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -58,8 +58,6 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             SliderEventDescriptor? lastEvent = null;
 
-            int ticksGenerated = 0;
-
             foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset))
             {
                 // generate tiny droplets since the last point
@@ -75,9 +73,6 @@ namespace osu.Game.Rulesets.Catch.Objects
 
                         for (double t = timeBetweenTiny; t < sinceLastTick; t += timeBetweenTiny)
                         {
-                            if (ticksGenerated++ >= 10000)
-                                break;
-
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,

From 6d3a24ff01cdeea9bf52d164087279989b277b6d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 4 May 2020 15:55:42 +0900
Subject: [PATCH 02577/10326] Reorder tick hit results

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 0c895bd086..b057af2a50 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -44,9 +44,24 @@ namespace osu.Game.Rulesets.Scoring
         [Description(@"Perfect")]
         Perfect,
 
-        SmallTickHit,
+        /// <summary>
+        /// Indicates small tick miss.
+        /// </summary>
         SmallTickMiss,
-        LargeTickHit,
+
+        /// <summary>
+        /// Indicates a small tick hit.
+        /// </summary>
+        SmallTickHit,
+
+        /// <summary>
+        /// Indicates a large tick miss.
+        /// </summary>
         LargeTickMiss,
+
+        /// <summary>
+        /// Indicates a large tick hit.
+        /// </summary>
+        LargeTickHit
     }
 }

From 6621d363da05951e3208f785f472190802638789 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 May 2020 17:01:05 +0900
Subject: [PATCH 02578/10326] Add basic custom data directory support

---
 .../NonVisual/CustomDataDirectoryTest.cs      | 88 +++++++++++++++++++
 .../Configuration/StorageConfigManager.cs     | 30 +++++++
 osu.Game/OsuGameBase.cs                       | 23 ++++-
 3 files changed, 139 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
 create mode 100644 osu.Game/Configuration/StorageConfigManager.cs

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
new file mode 100644
index 0000000000..2d5f1f238f
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -0,0 +1,88 @@
+// Copyright (c) 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.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Platform;
+using osu.Game.Configuration;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class CustomDataDirectoryTest
+    {
+        [Test]
+        public void TestDefaultDirectory()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestDefaultDirectory)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+                    var storage = osu.Dependencies.Get<Storage>();
+
+                    string defaultStorageLocation = Path.Combine(Environment.CurrentDirectory, $"headless-{nameof(TestDefaultDirectory)}");
+
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public void TestCustomDirectory()
+        {
+            using (var host = new HeadlessGameHost(nameof(TestCustomDirectory)))
+            {
+                string headlessPrefix = $"headless-{nameof(TestCustomDirectory)}";
+
+                // need access before the game has constructed its own storage yet.
+                Storage storage = new DesktopStorage(headlessPrefix, host);
+                // manual cleaning so we can prepare a config file.
+                storage.DeleteDirectory(string.Empty);
+
+                using (var storageConfig = new StorageConfigManager(storage))
+                    storageConfig.Set(StorageConfig.FullPath, Path.Combine(Environment.CurrentDirectory, "custom-path"));
+
+                try
+                {
+                    var osu = loadOsu(host);
+
+                    // switch to DI'd storage
+                    storage = osu.Dependencies.Get<Storage>();
+
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(Environment.CurrentDirectory, "custom-path")));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        private OsuGameBase loadOsu(GameHost host)
+        {
+            var osu = new OsuGameBase();
+            Task.Run(() => host.Run(osu));
+            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
+            return osu;
+        }
+
+        private static void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 60000)
+        {
+            Task task = Task.Run(() =>
+            {
+                while (!result()) Thread.Sleep(200);
+            });
+
+            Assert.IsTrue(task.Wait(timeout), failureMessage);
+        }
+    }
+}
diff --git a/osu.Game/Configuration/StorageConfigManager.cs b/osu.Game/Configuration/StorageConfigManager.cs
new file mode 100644
index 0000000000..929f8f22ad
--- /dev/null
+++ b/osu.Game/Configuration/StorageConfigManager.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.Configuration;
+using osu.Framework.Platform;
+
+namespace osu.Game.Configuration
+{
+    public class StorageConfigManager : IniConfigManager<StorageConfig>
+    {
+        protected override string Filename => "storage.ini";
+
+        public StorageConfigManager(Storage storage)
+            : base(storage)
+        {
+        }
+
+        protected override void InitialiseDefaults()
+        {
+            base.InitialiseDefaults();
+
+            Set(StorageConfig.FullPath, string.Empty);
+        }
+    }
+
+    public enum StorageConfig
+    {
+        FullPath,
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 609b6ce98e..fe25197294 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -132,6 +132,8 @@ namespace osu.Game
 
             dependencies.Cache(contextFactory = new DatabaseContextFactory(Storage));
 
+            dependencies.CacheAs(Storage);
+
             var largeStore = new LargeTextureStore(Host.CreateTextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures")));
             largeStore.AddStore(Host.CreateTextureLoaderStore(new OnlineStore()));
             dependencies.Cache(largeStore);
@@ -300,8 +302,13 @@ namespace osu.Game
         {
             base.SetHost(host);
 
-            if (Storage == null)
-                Storage = host.Storage;
+            var storageConfig = new StorageConfigManager(host.Storage);
+
+            var customStoragePath = storageConfig.Get<string>(StorageConfig.FullPath);
+
+            Storage = !string.IsNullOrEmpty(customStoragePath)
+                ? new CustomStorage(customStoragePath, host)
+                : host.Storage;
 
             if (LocalConfig == null)
                 LocalConfig = new OsuConfigManager(Storage);
@@ -353,5 +360,17 @@ namespace osu.Game
                 public override bool ChangeFocusOnClick => false;
             }
         }
+
+        /// <summary>
+        /// A storage pointing to an absolute location specified by the user to store game data files.
+        /// </summary>
+        private class CustomStorage : NativeStorage
+        {
+            public CustomStorage(string fullPath, GameHost host)
+                : base(string.Empty, host)
+            {
+                BasePath = fullPath;
+            }
+        }
     }
 }

From 62d433c9c57b2de866d579f4bfbad543eadc9649 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 4 May 2020 17:01:07 +0900
Subject: [PATCH 02579/10326] Adjust diffcalc test value

---
 osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
index 51fe0b035d..ee416e5a38 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Catch";
 
-        [TestCase(4.2058561036909863d, "diffcalc-test")]
+        [TestCase(4.050601681491468d, "diffcalc-test")]
         public void Test(double expected, string name)
             => base.Test(expected, name);
 

From 5edabbdee25e38e3e0d1ab08296e5a4f6119e79b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 May 2020 17:35:35 +0900
Subject: [PATCH 02580/10326] Redirect log output to custom data directory

---
 osu.Game/OsuGameBase.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index fe25197294..f92db4e111 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -71,6 +71,8 @@ namespace osu.Game
 
         protected MenuCursorContainer MenuCursorContainer;
 
+        protected StorageConfigManager StorageConfig;
+
         private Container content;
 
         protected override Container<Drawable> Content => content;
@@ -302,13 +304,17 @@ namespace osu.Game
         {
             base.SetHost(host);
 
-            var storageConfig = new StorageConfigManager(host.Storage);
+            StorageConfig = new StorageConfigManager(host.Storage);
 
-            var customStoragePath = storageConfig.Get<string>(StorageConfig.FullPath);
+            var customStoragePath = StorageConfig.Get<string>(Configuration.StorageConfig.FullPath);
 
-            Storage = !string.IsNullOrEmpty(customStoragePath)
-                ? new CustomStorage(customStoragePath, host)
-                : host.Storage;
+            if (!string.IsNullOrEmpty(customStoragePath))
+            {
+                Storage = new CustomStorage(customStoragePath, host);
+                Logger.Storage = Storage.GetStorageForDirectory("logs");
+            }
+            else
+                Storage = host.Storage;
 
             if (LocalConfig == null)
                 LocalConfig = new OsuConfigManager(Storage);

From e2593ac3e77e82d14c776ef4cf6c19c60ac697b3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 4 May 2020 08:56:18 +0000
Subject: [PATCH 02581/10326] Bump Microsoft.CodeAnalysis.FxCopAnalyzers from
 2.9.8 to 3.0.0

Bumps [Microsoft.CodeAnalysis.FxCopAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 2.9.8 to 3.0.0.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v2.9.8...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 21b8b402e0..fbe300458e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,7 +18,7 @@
   <ItemGroup Label="Code Analysis">
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="2.9.8" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup Label="Code Analysis">
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis\osu.ruleset</CodeAnalysisRuleSet>

From 4ee2e6cd47add8c964d61445cca16a271b6236dc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 4 May 2020 08:57:09 +0000
Subject: [PATCH 02582/10326] Bump Humanizer from 2.8.2 to 2.8.11

Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.2 to 2.8.11.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.8.2...v2.8.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 91c89cbc20..9db5fe562c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -20,7 +20,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Dapper" Version="2.0.35" />
     <PackageReference Include="DiffPlex" Version="1.6.1" />
-    <PackageReference Include="Humanizer" Version="2.8.2" />
+    <PackageReference Include="Humanizer" Version="2.8.11" />
     <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" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 9ff7e3fc02..82253a0418 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -76,7 +76,7 @@
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.1" />
-    <PackageReference Include="Humanizer" Version="2.8.2" />
+    <PackageReference Include="Humanizer" Version="2.8.11" />
     <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" />

From fe31bac505bb59891325fc59afb4ba597df3e052 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 4 May 2020 18:20:20 +0900
Subject: [PATCH 02583/10326] Fix build error

---
 osu.Game/Overlays/SearchableList/DisplayStyleControl.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs b/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
index a33f4eb30d..5ecb477a2f 100644
--- a/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
+++ b/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
@@ -91,6 +91,8 @@ namespace osu.Game.Overlays.SearchableList
 
             protected override void Dispose(bool isDisposing)
             {
+                base.Dispose(isDisposing);
+
                 bindable.ValueChanged -= Bindable_ValueChanged;
             }
         }

From 969412a4265aa3c94f0a6112552b5ad9287f4908 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 4 May 2020 10:28:42 +0000
Subject: [PATCH 02584/10326] Bump Microsoft.CodeAnalysis.BannedApiAnalyzers
 from 2.9.8 to 3.0.0

Bumps [Microsoft.CodeAnalysis.BannedApiAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 2.9.8 to 3.0.0.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v2.9.8...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 21b8b402e0..5d011dfdc5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,7 +16,7 @@
     <EmbeddedResource Include="Resources\**\*.*" />
   </ItemGroup>
   <ItemGroup Label="Code Analysis">
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="2.9.8" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.0.0" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
   </ItemGroup>

From c987af988c98745a8039372563b87717a7691e46 Mon Sep 17 00:00:00 2001
From: alex <mashkal2000@gmail.com>
Date: Mon, 4 May 2020 18:26:12 -0700
Subject: [PATCH 02585/10326] Fix typo

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

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 2124a66a75..35bb4fa34f 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens
     {
         /// <summary>
         /// The amount of negative padding that should be applied to game background content which touches both the left and right sides of the screen.
-        /// This allows for the game content to be pushed byt he options/notification overlays without causing black areas to appear.
+        /// This allows for the game content to be pushed by the options/notification overlays without causing black areas to appear.
         /// </summary>
         public const float HORIZONTAL_OVERFLOW_PADDING = 50;
 

From 0e2ccac33b916abc63e9aa4e8cb474e6761fb22e Mon Sep 17 00:00:00 2001
From: alex <mashkal2000@gmail.com>
Date: Mon, 4 May 2020 18:31:11 -0700
Subject: [PATCH 02586/10326] Add spaces to comments

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs  | 10 ++++-----
 osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs |  2 +-
 .../Replays/CatchAutoGenerator.cs             |  6 ++---
 .../Beatmaps/OsuBeatmapProcessor.cs           | 18 +++++++--------
 osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs |  2 +-
 .../Drawables/Pieces/MainCirclePiece.cs       |  2 +-
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 22 +++++++++----------
 .../NonVisual/ControlPointInfoTest.cs         |  2 +-
 .../NonVisual/FramedReplayInputHandlerTest.cs |  6 ++---
 osu.Game/Beatmaps/BeatmapManager.cs           |  2 +-
 osu.Game/Graphics/Backgrounds/Triangles.cs    |  4 ++--
 .../Graphics/Containers/OsuScrollContainer.cs |  2 +-
 osu.Game/IPC/ArchiveImportIPCChannel.cs       |  2 +-
 osu.Game/Online/API/APIAccess.cs              |  8 +++----
 osu.Game/Online/API/APIRequest.cs             |  2 +-
 osu.Game/Online/Chat/Channel.cs               |  2 +-
 osu.Game/Online/Chat/MessageFormatter.cs      |  4 ++--
 osu.Game/OsuGame.cs                           |  4 ++--
 .../BeatmapListing/Panels/GridBeatmapPanel.cs |  2 +-
 osu.Game/Overlays/BeatmapSet/Header.cs        |  2 +-
 osu.Game/Overlays/ChatOverlay.cs              |  2 +-
 osu.Game/Overlays/DialogOverlay.cs            |  2 +-
 osu.Game/Overlays/Music/PlaylistItem.cs       |  2 +-
 osu.Game/Overlays/MusicController.cs          |  2 +-
 osu.Game/Overlays/News/NewsArticleCover.cs    |  2 +-
 .../Notifications/ProgressNotification.cs     |  2 +-
 osu.Game/Overlays/NowPlayingOverlay.cs        |  2 +-
 osu.Game/Overlays/OSD/Toast.cs                |  2 +-
 .../Components/OverlinedInfoContainer.cs      |  2 +-
 .../Profile/Header/MedalHeaderContainer.cs    |  2 +-
 .../SearchableListFilterControl.cs            |  2 +-
 osu.Game/Overlays/Toolbar/ToolbarButton.cs    |  2 +-
 osu.Game/Overlays/VolumeOverlay.cs            |  2 +-
 .../Replays/FramedReplayInputHandler.cs       |  6 ++---
 osu.Game/Rulesets/RulesetStore.cs             |  6 ++---
 osu.Game/Screens/BackgroundScreen.cs          |  2 +-
 osu.Game/Screens/Menu/IntroScreen.cs          |  2 +-
 osu.Game/Screens/Menu/LogoVisualisation.cs    | 10 ++++-----
 osu.Game/Screens/Menu/MainMenu.cs             |  2 +-
 osu.Game/Screens/Play/BreakOverlay.cs         |  2 +-
 .../Screens/Play/HUD/PlayerSettingsOverlay.cs |  2 +-
 osu.Game/Screens/Play/KeyCounter.cs           |  4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs         |  6 ++---
 osu.Game/Screens/Select/BeatmapCarousel.cs    |  2 +-
 .../Select/BeatmapDetailAreaTabControl.cs     |  2 +-
 osu.Game/Screens/Select/BeatmapDetails.cs     |  4 ++--
 .../Screens/Select/Details/AdvancedStats.cs   |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         |  2 +-
 48 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 60b47a8b3a..ade8460dd7 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -43,7 +43,7 @@ namespace osu.Desktop.Updater
 
         private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
         {
-            //should we schedule a retry on completion of this check?
+            // should we schedule a retry on completion of this check?
             bool scheduleRecheck = true;
 
             try
@@ -52,7 +52,7 @@ namespace osu.Desktop.Updater
 
                 var info = await updateManager.CheckForUpdate(!useDeltaPatching);
                 if (info.ReleasesToApply.Count == 0)
-                    //no updates available. bail and retry later.
+                    // no updates available. bail and retry later.
                     return;
 
                 if (notification == null)
@@ -81,8 +81,8 @@ namespace osu.Desktop.Updater
                     {
                         logger.Add(@"delta patching failed; will attempt full download!");
 
-                        //could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
-                        //try again without deltas.
+                        // could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
+                        // try again without deltas.
                         checkForUpdateAsync(false, notification);
                         scheduleRecheck = false;
                     }
@@ -101,7 +101,7 @@ namespace osu.Desktop.Updater
             {
                 if (scheduleRecheck)
                 {
-                    //check again in 30 minutes.
+                    // check again in 30 minutes.
                     Scheduler.AddDelayed(() => checkForUpdateAsync(), 60000 * 30);
                 }
             }
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
index 16414261a5..c1d24395e4 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Catch.Mods
                 RelativeSizeAxes = Axes.Both;
             }
 
-            //disable keyboard controls
+            // disable keyboard controls
             public bool OnPressed(CatchAction action) => true;
 
             public void OnReleased(CatchAction action)
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index b90b5812a6..7a33cb0577 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Catch.Replays
 
                 if (lastPosition - catcher_width_half < h.X && lastPosition + catcher_width_half > h.X)
                 {
-                    //we are already in the correct range.
+                    // we are already in the correct range.
                     lastTime = h.StartTime;
                     addFrame(h.StartTime, lastPosition);
                     return;
@@ -72,14 +72,14 @@ namespace osu.Game.Rulesets.Catch.Replays
                 }
                 else if (dashRequired)
                 {
-                    //we do a movement in two parts - the dash part then the normal part...
+                    // we do a movement in two parts - the dash part then the normal part...
                     double timeAtNormalSpeed = positionChange / movement_speed;
                     double timeWeNeedToSave = timeAtNormalSpeed - timeAvailable;
                     double timeAtDashSpeed = timeWeNeedToSave / 2;
 
                     float midPosition = (float)Interpolation.Lerp(lastPosition, h.X, (float)timeAtDashSpeed / timeAvailable);
 
-                    //dash movement
+                    // dash movement
                     addFrame(h.StartTime - timeAvailable + 1, lastPosition, true);
                     addFrame(h.StartTime - timeAvailable + timeAtDashSpeed, midPosition);
                     addFrame(h.StartTime, h.X);
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
index 3a829f72fa..f51f04bf87 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         double stackThreshold = objectN.TimePreempt * beatmap.BeatmapInfo.StackLeniency;
 
                         if (objectN.StartTime - endTime > stackThreshold)
-                            //We are no longer within stacking range of the next object.
+                            // We are no longer within stacking range of the next object.
                             break;
 
                         if (Vector2Extensions.Distance(stackBaseObject.Position, objectN.Position) < stack_distance
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                 }
             }
 
-            //Reverse pass for stack calculation.
+            // Reverse pass for stack calculation.
             int extendedStartIndex = startIndex;
 
             for (int i = extendedEndIndex; i > startIndex; i--)
@@ -124,7 +124,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         double endTime = objectN.GetEndTime();
 
                         if (objectI.StartTime - endTime > stackThreshold)
-                            //We are no longer within stacking range of the previous object.
+                            // We are no longer within stacking range of the previous object.
                             break;
 
                         // HitObjects before the specified update range haven't been reset yet
@@ -145,20 +145,20 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
 
                             for (int j = n + 1; j <= i; j++)
                             {
-                                //For each object which was declared under this slider, we will offset it to appear *below* the slider end (rather than above).
+                                // For each object which was declared under this slider, we will offset it to appear *below* the slider end (rather than above).
                                 OsuHitObject objectJ = beatmap.HitObjects[j];
                                 if (Vector2Extensions.Distance(objectN.EndPosition, objectJ.Position) < stack_distance)
                                     objectJ.StackHeight -= offset;
                             }
 
-                            //We have hit a slider.  We should restart calculation using this as the new base.
-                            //Breaking here will mean that the slider still has StackCount of 0, so will be handled in the i-outer-loop.
+                            // We have hit a slider.  We should restart calculation using this as the new base.
+                            // Breaking here will mean that the slider still has StackCount of 0, so will be handled in the i-outer-loop.
                             break;
                         }
 
                         if (Vector2Extensions.Distance(objectN.Position, objectI.Position) < stack_distance)
                         {
-                            //Keep processing as if there are no sliders.  If we come across a slider, this gets cancelled out.
+                            // Keep processing as if there are no sliders.  If we come across a slider, this gets cancelled out.
                             //NOTE: Sliders with start positions stacking are a special case that is also handled here.
 
                             objectN.StackHeight = objectI.StackHeight + 1;
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         if (objectN is Spinner) continue;
 
                         if (objectI.StartTime - objectN.StartTime > stackThreshold)
-                            //We are no longer within stacking range of the previous object.
+                            // We are no longer within stacking range of the previous object.
                             break;
 
                         if (Vector2Extensions.Distance(objectN.EndPosition, objectI.Position) < stack_distance)
@@ -221,7 +221,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                     }
                     else if (Vector2Extensions.Distance(beatmap.HitObjects[j].Position, position2) < stack_distance)
                     {
-                        //Case for sliders - bump notes down and right, rather than up and left.
+                        // Case for sliders - bump notes down and right, rather than up and left.
                         sliderStack++;
                         beatmap.HitObjects[j].StackHeight -= sliderStack;
                         startTime = beatmap.HitObjects[j].GetEndTime();
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
index 44dba7715a..5e80d08667 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     Vector2 originalPosition = drawable.Position;
                     Vector2 appearOffset = new Vector2(MathF.Cos(theta), MathF.Sin(theta)) * appearDistance;
 
-                    //the - 1 and + 1 prevents the hit objects to appear in the wrong position.
+                    // 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;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
index e364c96426..cb3787a493 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
                     using (BeginDelayedSequence(flash_in, true))
                     {
-                        //after the flash, we can hide some elements that were behind it
+                        // after the flash, we can hide some elements that were behind it
                         ring.FadeOut();
                         circle.FadeOut();
                         number.FadeOut();
diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index c6095ae404..ba6f5fc85c 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportWhenClosed()
         {
-            //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
+            // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
             using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportWhenClosed)))
             {
                 try
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportThenDelete()
         {
-            //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
+            // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
             using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenDelete)))
             {
                 try
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportThenImport()
         {
-            //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
+            // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
             using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImport)))
             {
                 try
@@ -96,7 +96,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportCorruptThenImport()
         {
-            //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
+            // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
             using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportCorruptThenImport)))
             {
                 try
@@ -138,7 +138,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestRollbackOnFailure()
         {
-            //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
+            // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
             using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestRollbackOnFailure)))
             {
                 try
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportThenImportDifferentHash()
         {
-            //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
+            // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
             using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportDifferentHash)))
             {
                 try
@@ -246,7 +246,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportThenDeleteThenImport()
         {
-            //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
+            // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
             using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenDeleteThenImport)))
             {
                 try
@@ -274,7 +274,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [TestCase(false)]
         public async Task TestImportThenDeleteThenImportWithOnlineIDMismatch(bool set)
         {
-            //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
+            // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
             using (HeadlessGameHost host = new CleanRunHeadlessGameHost($"{nameof(TestImportThenDeleteThenImportWithOnlineIDMismatch)}-{set}"))
             {
                 try
@@ -308,7 +308,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportWithDuplicateBeatmapIDs()
         {
-            //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
+            // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
             using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportWithDuplicateBeatmapIDs)))
             {
                 try
@@ -695,12 +695,12 @@ namespace osu.Game.Tests.Beatmaps.IO
             waitForOrAssert(() => (resultSets = store.QueryBeatmapSets(s => s.OnlineBeatmapSetID == 241526)).Any(),
                 @"BeatmapSet did not import to the database in allocated time.", timeout);
 
-            //ensure we were stored to beatmap database backing...
+            // ensure we were stored to beatmap database backing...
             Assert.IsTrue(resultSets.Count() == 1, $@"Incorrect result count found ({resultSets.Count()} but should be 1).");
             IEnumerable<BeatmapInfo> queryBeatmaps() => store.QueryBeatmaps(s => s.BeatmapSet.OnlineBeatmapSetID == 241526 && s.BaseDifficultyID > 0);
             IEnumerable<BeatmapSetInfo> queryBeatmapSets() => store.QueryBeatmapSets(s => s.OnlineBeatmapSetID == 241526);
 
-            //if we don't re-check here, the set will be inserted but the beatmaps won't be present yet.
+            // if we don't re-check here, the set will be inserted but the beatmaps won't be present yet.
             waitForOrAssert(() => queryBeatmaps().Count() == 12,
                 @"Beatmaps did not import to the database in allocated time", timeout);
             waitForOrAssert(() => queryBeatmapSets().Count() == 1,
diff --git a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
index 158954106d..830e4bc603 100644
--- a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
+++ b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.NonVisual
             Assert.That(cpi.TimingPoints.Count, Is.EqualTo(2));
             Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(2));
 
-            cpi.Add(1000, new TimingControlPoint()); //is redundant
+            cpi.Add(1000, new TimingControlPoint()); // is redundant
 
             Assert.That(cpi.Groups.Count, Is.EqualTo(2));
             Assert.That(cpi.TimingPoints.Count, Is.EqualTo(2));
diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index 7df7df22ea..92a60663de 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -46,12 +46,12 @@ namespace osu.Game.Tests.NonVisual
             confirmCurrentFrame(0);
             confirmNextFrame(1);
 
-            //if we hit the first frame perfectly, time should progress to it.
+            // if we hit the first frame perfectly, time should progress to it.
             setTime(1000, 1000);
             confirmCurrentFrame(1);
             confirmNextFrame(2);
 
-            //in between non-important frames should progress based on input.
+            // in between non-important frames should progress based on input.
             setTime(1200, 1200);
             confirmCurrentFrame(1);
 
@@ -144,7 +144,7 @@ namespace osu.Game.Tests.NonVisual
             confirmCurrentFrame(2);
             confirmNextFrame(1);
 
-            //ensure each frame plays out until start
+            // ensure each frame plays out until start
             setTime(-500, 1000);
             confirmCurrentFrame(1);
             confirmNextFrame(0);
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 19d1162d23..d7c30dc9ff 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -381,7 +381,7 @@ namespace osu.Game.Beatmaps
             foreach (var file in files.Where(f => f.Filename.EndsWith(".osu")))
             {
                 using (var raw = Files.Store.GetStream(file.FileInfo.StoragePath))
-                using (var ms = new MemoryStream()) //we need a memory stream so we can seek
+                using (var ms = new MemoryStream()) // we need a memory stream so we can seek
                 using (var sr = new LineBufferedReader(ms))
                 {
                     raw.CopyTo(ms);
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index 590e4b2a5c..27027202ce 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -193,8 +193,8 @@ namespace osu.Game.Graphics.Backgrounds
 
             float u1 = 1 - RNG.NextSingle(); //uniform(0,1] random floats
             float u2 = 1 - RNG.NextSingle();
-            float randStdNormal = (float)(Math.Sqrt(-2.0 * Math.Log(u1)) * Math.Sin(2.0 * Math.PI * u2)); //random normal(0,1)
-            var scale = Math.Max(triangleScale * (mean + std_dev * randStdNormal), 0.1f); //random normal(mean,stdDev^2)
+            float randStdNormal = (float)(Math.Sqrt(-2.0 * Math.Log(u1)) * Math.Sin(2.0 * Math.PI * u2)); // random normal(0,1)
+            var scale = Math.Max(triangleScale * (mean + std_dev * randStdNormal), 0.1f); // random normal(mean,stdDev^2)
 
             return new TriangleParticle { Scale = scale };
         }
diff --git a/osu.Game/Graphics/Containers/OsuScrollContainer.cs b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
index 1824fcd878..d504a11b22 100644
--- a/osu.Game/Graphics/Containers/OsuScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Graphics.Containers
             {
                 if (!base.OnMouseDown(e)) return false;
 
-                //note that we are changing the colour of the box here as to not interfere with the hover effect.
+                // note that we are changing the colour of the box here as to not interfere with the hover effect.
                 box.FadeColour(highlightColour, 100);
                 return true;
             }
diff --git a/osu.Game/IPC/ArchiveImportIPCChannel.cs b/osu.Game/IPC/ArchiveImportIPCChannel.cs
index 484db932f8..029908ec9d 100644
--- a/osu.Game/IPC/ArchiveImportIPCChannel.cs
+++ b/osu.Game/IPC/ArchiveImportIPCChannel.cs
@@ -32,7 +32,7 @@ namespace osu.Game.IPC
         {
             if (importer == null)
             {
-                //we want to contact a remote osu! to handle the import.
+                // we want to contact a remote osu! to handle the import.
                 await SendMessageAsync(new ArchiveImportMessage { Path = path });
                 return;
             }
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index adfef1d11f..4945f7f185 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Online.API
 
                     case APIState.Offline:
                     case APIState.Connecting:
-                        //work to restore a connection...
+                        // work to restore a connection...
                         if (!HasLogin)
                         {
                             State = APIState.Offline;
@@ -180,7 +180,7 @@ namespace osu.Game.Online.API
                         break;
                 }
 
-                //hard bail if we can't get a valid access token.
+                // hard bail if we can't get a valid access token.
                 if (authentication.RequestAccessToken() == null)
                 {
                     Logout();
@@ -274,7 +274,7 @@ namespace osu.Game.Online.API
             {
                 req.Perform(this);
 
-                //we could still be in initialisation, at which point we don't want to say we're Online yet.
+                // we could still be in initialisation, at which point we don't want to say we're Online yet.
                 if (IsLoggedIn) State = APIState.Online;
 
                 failureCount = 0;
@@ -339,7 +339,7 @@ namespace osu.Game.Online.API
                     log.Add($@"API failure count is now {failureCount}");
 
                     if (failureCount < 3)
-                        //we might try again at an api level.
+                        // we might try again at an api level.
                         return false;
 
                     if (State == APIState.Online)
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 0bba04cac3..0f8acbb7af 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Online.API
             if (checkAndScheduleFailure())
                 return;
 
-            if (!WebRequest.Aborted) //could have been aborted by a Cancel() call
+            if (!WebRequest.Aborted) // could have been aborted by a Cancel() call
             {
                 Logger.Log($@"Performing request {this}", LoggingTarget.Network);
                 WebRequest.Perform();
diff --git a/osu.Game/Online/Chat/Channel.cs b/osu.Game/Online/Chat/Channel.cs
index 6f67a95f53..dbb2da5c03 100644
--- a/osu.Game/Online/Chat/Channel.cs
+++ b/osu.Game/Online/Chat/Channel.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Online.Chat
         /// </summary>
         public event Action<Message> MessageRemoved;
 
-        public bool ReadOnly => false; //todo not yet used.
+        public bool ReadOnly => false; // todo: not yet used.
 
         public override string ToString() => Name;
 
diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 717de18c14..6af2561c89 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -78,13 +78,13 @@ namespace osu.Game.Online.Chat
                 {
                     result.Text = result.Text.Remove(index, m.Length).Insert(index, displayText);
 
-                    //since we just changed the line display text, offset any already processed links.
+                    // since we just changed the line display text, offset any already processed links.
                     result.Links.ForEach(l => l.Index -= l.Index > index ? m.Length - displayText.Length : 0);
 
                     var details = GetLinkDetails(linkText);
                     result.Links.Add(new Link(linkText, index, displayText.Length, linkActionOverride ?? details.Action, details.Argument));
 
-                    //adjust the offset for processing the current matches group.
+                    // adjust the offset for processing the current matches group.
                     captureOffset += m.Length - displayText.Length;
                 }
             }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 8e62819c95..fdc8d94352 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -609,7 +609,7 @@ namespace osu.Game
 
             loadComponentSingleFile(screenshotManager, Add);
 
-            //overlay elements
+            // overlay elements
             loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(dashboard = new DashboardOverlay(), overlayContent.Add, true);
             var rankingsOverlay = loadComponentSingleFile(new RankingsOverlay(), overlayContent.Add, true);
@@ -781,7 +781,7 @@ namespace osu.Game
             {
                 var previousLoadStream = asyncLoadStream;
 
-                //chain with existing load stream
+                // chain with existing load stream
                 asyncLoadStream = Task.Run(async () =>
                 {
                     if (previousLoadStream != null)
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index 84d35da096..28c36e6c56 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
             : base(beatmap)
         {
             Width = 380;
-            Height = 140 + vertical_padding; //full height of all the elements plus vertical padding (autosize uses the image)
+            Height = 140 + vertical_padding; // full height of all the elements plus vertical padding (autosize uses the image)
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 17fa689cd2..1ff08aab2c 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                                     {
                                                         Anchor = Anchor.BottomLeft,
                                                         Origin = Anchor.BottomLeft,
-                                                        Margin = new MarginPadding { Left = 3, Bottom = 4 }, //To better lineup with the font
+                                                        Margin = new MarginPadding { Left = 3, Bottom = 4 }, // To better lineup with the font
                                                     },
                                                 }
                                             },
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 34afc3c431..5ba55f6d45 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -358,7 +358,7 @@ namespace osu.Game.Overlays
 
         protected override void OnFocus(FocusEvent e)
         {
-            //this is necessary as textbox is masked away and therefore can't get focus :(
+            // this is necessary as textbox is masked away and therefore can't get focus :(
             textbox.TakeFocus();
             base.OnFocus(e);
         }
diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 59d748bc5d..9f9dbdbaf1 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays
         {
             if (v != Visibility.Hidden) return;
 
-            //handle the dialog being dismissed.
+            // handle the dialog being dismissed.
             dialog.Delay(PopupDialog.EXIT_DURATION).Expire();
 
             if (dialog == CurrentDialog)
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index de2f916946..840fa51b4f 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Music
         {
             text.Clear();
 
-            //space after the title to put a space between the title and artist
+            // space after the title to put a space between the title and artist
             titleSprites = text.AddText(title.Value + @"  ", sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular)).OfType<SpriteText>();
 
             text.AddText(artist.Value, sprite =>
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index c872f82b32..ded641b262 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Overlays
                 }
                 else
                 {
-                    //figure out the best direction based on order in playlist.
+                    // figure out the best direction based on order in playlist.
                     var last = BeatmapSets.TakeWhile(b => b.ID != current.BeatmapSetInfo?.ID).Count();
                     var next = beatmap.NewValue == null ? -1 : BeatmapSets.TakeWhile(b => b.ID != beatmap.NewValue.BeatmapSetInfo?.ID).Count();
 
diff --git a/osu.Game/Overlays/News/NewsArticleCover.cs b/osu.Game/Overlays/News/NewsArticleCover.cs
index cca0cfb4a0..e3f5a8cea3 100644
--- a/osu.Game/Overlays/News/NewsArticleCover.cs
+++ b/osu.Game/Overlays/News/NewsArticleCover.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Overlays.News
             public string TooltipText => date.ToString("dddd dd MMMM yyyy hh:mm:ss UTCz").ToUpper();
         }
 
-        //fake API data struct to use for now as a skeleton for data, as there is no API struct for news article info for now
+        // fake API data struct to use for now as a skeleton for data, as there is no API struct for news article info for now
         public class ArticleInfo
         {
             public string Title { get; set; }
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 99836705c4..3105ecd742 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Notifications
         {
             base.LoadComplete();
 
-            //we may have received changes before we were displayed.
+            // we may have received changes before we were displayed.
             updateState();
         }
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 118cb037cb..ebb4a96d14 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -261,7 +261,7 @@ namespace osu.Game.Overlays
                 // todo: this can likely be replaced with WorkingBeatmap.GetBeatmapAsync()
                 Task.Run(() =>
                 {
-                    if (beatmap?.Beatmap == null) //this is not needed if a placeholder exists
+                    if (beatmap?.Beatmap == null) // this is not needed if a placeholder exists
                     {
                         title.Text = @"Nothing to play";
                         artist.Text = @"Nothing to play";
diff --git a/osu.Game/Overlays/OSD/Toast.cs b/osu.Game/Overlays/OSD/Toast.cs
index 5d36cac20e..1497ca8fa8 100644
--- a/osu.Game/Overlays/OSD/Toast.cs
+++ b/osu.Game/Overlays/OSD/Toast.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.OSD
 
             InternalChildren = new Drawable[]
             {
-                new Container //this container exists just to set a minimum width for the toast
+                new Container // this container exists just to set a minimum width for the toast
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs b/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
index b11e41f90f..9f56a34aa6 100644
--- a/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     {
                         Font = OsuFont.GetFont(size: big ? 40 : 18, weight: FontWeight.Light)
                     },
-                    new Container //Add a minimum size to the FillFlowContainer
+                    new Container // Add a minimum size to the FillFlowContainer
                     {
                         Width = minimumWidth,
                     }
diff --git a/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
index a5938a3fe7..e7df4eb5eb 100644
--- a/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Profile.Header
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background5,
                 },
-                new Container //artificial shadow
+                new Container // artificial shadow
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = 3,
diff --git a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
index 117f905de4..d31470e685 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Overlays.SearchableList
                                         RelativeSizeAxes = Axes.X,
                                     },
                                 },
-                                new Box //keep the tab strip part of autosize, but don't put it in the flow container
+                                new Box // keep the tab strip part of autosize, but don't put it in the flow container
                                 {
                                     RelativeSizeAxes = Axes.X,
                                     Height = 1,
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index d6b810366d..3d66d3c28e 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Overlays.Toolbar
                 tooltipContainer = new FillFlowContainer
                 {
                     Direction = FillDirection.Vertical,
-                    RelativeSizeAxes = Axes.Both, //stops us being considered in parent's autosize
+                    RelativeSizeAxes = Axes.Both, // stops us being considered in parent's autosize
                     Anchor = TooltipAnchor.HasFlag(Anchor.x0) ? Anchor.BottomLeft : Anchor.BottomRight,
                     Origin = TooltipAnchor,
                     Position = new Vector2(TooltipAnchor.HasFlag(Anchor.x0) ? 5 : -5, 5),
diff --git a/osu.Game/Overlays/VolumeOverlay.cs b/osu.Game/Overlays/VolumeOverlay.cs
index b484921cce..676d2c941a 100644
--- a/osu.Game/Overlays/VolumeOverlay.cs
+++ b/osu.Game/Overlays/VolumeOverlay.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays
                     {
                         volumeMeterEffect = new VolumeMeter("EFFECTS", 125, colours.BlueDarker)
                         {
-                            Margin = new MarginPadding { Top = 100 + MuteButton.HEIGHT } //to counter the mute button and re-center the volume meters
+                            Margin = new MarginPadding { Top = 100 + MuteButton.HEIGHT } // to counter the mute button and re-center the volume meters
                         },
                         volumeMeterMaster = new VolumeMeter("MASTER", 150, colours.PinkDarker),
                         volumeMeterMusic = new VolumeMeter("MUSIC", 125, colours.BlueDarker),
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 7e17396fde..55d82c4083 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Replays
         {
             int newFrame = nextFrameIndex;
 
-            //ensure we aren't at an extent.
+            // ensure we aren't at an extent.
             if (newFrame == currentFrameIndex) return false;
 
             currentFrameIndex = newFrame;
@@ -99,8 +99,8 @@ namespace osu.Game.Rulesets.Replays
                 if (frame == null)
                     return false;
 
-                return IsImportant(frame) && //a button is in a pressed state
-                       Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan; //the next frame is within an allowable time span
+                return IsImportant(frame) && // a button is in a pressed state
+                       Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
             }
         }
 
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 543134cfb4..f302f8700f 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Rulesets
 
                 var instances = loadedAssemblies.Values.Select(r => (Ruleset)Activator.CreateInstance(r)).ToList();
 
-                //add all legacy rulesets first to ensure they have exclusive choice of primary key.
+                // add all legacy rulesets first to ensure they have exclusive choice of primary key.
                 foreach (var r in instances.Where(r => r is ILegacyRuleset))
                 {
                     if (context.RulesetInfo.SingleOrDefault(dbRuleset => dbRuleset.ID == r.RulesetInfo.ID) == null)
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets
 
                 context.SaveChanges();
 
-                //add any other modes
+                // add any other modes
                 foreach (var r in instances.Where(r => !(r is ILegacyRuleset)))
                 {
                     if (context.RulesetInfo.FirstOrDefault(ri => ri.InstantiationInfo == r.RulesetInfo.InstantiationInfo) == null)
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets
 
                 context.SaveChanges();
 
-                //perform a consistency check
+                // perform a consistency check
                 foreach (var r in context.RulesetInfo)
                 {
                     try
diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index 5dfaceccf5..0f3615b7a9 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
-            //we don't want to handle escape key.
+            // we don't want to handle escape key.
             return false;
         }
 
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 736202ee52..0d5f3d1142 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.Menu
             this.FadeIn(300);
 
             double fadeOutTime = exit_delay;
-            //we also handle the exit transition.
+            // we also handle the exit transition.
             if (MenuVoice.Value)
                 seeya.Play();
             else
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 67537fa9df..0db7f2a2dc 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Screens.Menu
             private IShader shader;
             private Texture texture;
 
-            //Assuming the logo is a circle, we don't need a second dimension.
+            // Assuming the logo is a circle, we don't need a second dimension.
             private float size;
 
             private Color4 colour;
@@ -209,13 +209,13 @@ namespace osu.Game.Screens.Menu
                             float rotation = MathUtils.DegreesToRadians(i / (float)bars_per_visualiser * 360 + j * 360 / visualiser_rounds);
                             float rotationCos = MathF.Cos(rotation);
                             float rotationSin = MathF.Sin(rotation);
-                            //taking the cos and sin to the 0..1 range
+                            // taking the cos and sin to the 0..1 range
                             var barPosition = new Vector2(rotationCos / 2 + 0.5f, rotationSin / 2 + 0.5f) * size;
 
                             var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(MathUtils.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * audioData[i]);
-                            //The distance between the position and the sides of the bar.
+                            // The distance between the position and the sides of the bar.
                             var bottomOffset = new Vector2(-rotationSin * barSize.X / 2, rotationCos * barSize.X / 2);
-                            //The distance between the bottom side of the bar and the top side.
+                            // The distance between the bottom side of the bar and the top side.
                             var amplitudeOffset = new Vector2(rotationCos * barSize.Y, rotationSin * barSize.Y);
 
                             var rectangle = new Quad(
@@ -231,7 +231,7 @@ namespace osu.Game.Screens.Menu
                                 colourInfo,
                                 null,
                                 vertexBatch.AddAction,
-                                //barSize by itself will make it smooth more in the X axis than in the Y axis, this reverts that.
+                                // barSize by itself will make it smooth more in the X axis than in the Y axis, this reverts that.
                                 Vector2.Divide(inflation, barSize.Yx));
                         }
                     }
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 0589e4d12b..f0da2482d6 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Screens.Menu
 
             (Background as BackgroundScreenDefault)?.Next();
 
-            //we may have consumed our preloaded instance, so let's make another.
+            // we may have consumed our preloaded instance, so let's make another.
             preloadSongSelect();
 
             if (Beatmap.Value.Track != null && music?.IsUserPaused != true)
diff --git a/osu.Game/Screens/Play/BreakOverlay.cs b/osu.Game/Screens/Play/BreakOverlay.cs
index c978f4e96d..36f825b8f6 100644
--- a/osu.Game/Screens/Play/BreakOverlay.cs
+++ b/osu.Game/Screens/Play/BreakOverlay.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Screens.Play
             FinishTransforms(true);
             Scheduler.CancelDelayedTasks();
 
-            if (breaks == null) return; //we need breaks.
+            if (breaks == null) return; // we need breaks.
 
             foreach (var b in breaks)
             {
diff --git a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
index d201b5d30e..fc80983834 100644
--- a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play.HUD
         protected override void PopIn() => this.FadeIn(fade_duration);
         protected override void PopOut() => this.FadeOut(fade_duration);
 
-        //We want to handle keyboard inputs all the time in order to trigger ToggleVisibility() when not visible
+        // We want to handle keyboard inputs all the time in order to trigger ToggleVisibility() when not visible
         public override bool PropagateNonPositionalInputSubTree => true;
 
         protected override bool OnKeyDown(KeyDownEvent e)
diff --git a/osu.Game/Screens/Play/KeyCounter.cs b/osu.Game/Screens/Play/KeyCounter.cs
index f4109a63d0..98df73a5e6 100644
--- a/osu.Game/Screens/Play/KeyCounter.cs
+++ b/osu.Game/Screens/Play/KeyCounter.cs
@@ -124,8 +124,8 @@ namespace osu.Game.Screens.Play
                     }
                 }
             };
-            //Set this manually because an element with Alpha=0 won't take it size to AutoSizeContainer,
-            //so the size can be changing between buttonSprite and glowSprite.
+            // Set this manually because an element with Alpha=0 won't take it size to AutoSizeContainer,
+            // so the size can be changing between buttonSprite and glowSprite.
             Height = buttonSprite.DrawHeight;
             Width = buttonSprite.DrawWidth;
         }
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index c0d88feda2..93a734589c 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -314,8 +314,8 @@ namespace osu.Game.Screens.Play
 
                         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.
+                        // 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)
@@ -360,7 +360,7 @@ namespace osu.Game.Screens.Play
         {
             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.
+                // 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());
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 5a4a03662a..96b779cd20 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Screens.Select
             // 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.
+            // check if we can/need to maintain our current selection.
             if (previouslySelectedID != null)
                 select((CarouselItem)newSet.Beatmaps.FirstOrDefault(b => b.Beatmap.ID == previouslySelectedID) ?? newSet);
 
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
index f4bf1ab059..63711e3e50 100644
--- a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Select
             set => tabs.Current = value;
         }
 
-        public Action<BeatmapDetailAreaTabItem, bool> OnFilter; //passed the selected tab and if mods is checked
+        public Action<BeatmapDetailAreaTabItem, bool> OnFilter; // passed the selected tab and if mods is checked
 
         public IReadOnlyList<BeatmapDetailAreaTabItem> TabItems
         {
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index aebb8e9d87..9669a1391c 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -201,7 +201,7 @@ namespace osu.Game.Screens.Select
                 Schedule(() =>
                 {
                     if (beatmap != requestedBeatmap)
-                        //the beatmap has been changed since we started the lookup.
+                        // the beatmap has been changed since we started the lookup.
                         return;
 
                     var b = res.ToBeatmap(rulesets);
@@ -222,7 +222,7 @@ namespace osu.Game.Screens.Select
                 Schedule(() =>
                 {
                     if (beatmap != requestedBeatmap)
-                        //the beatmap has been changed since we started the lookup.
+                        // the beatmap has been changed since we started the lookup.
                         return;
 
                     updateMetrics();
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index af0d36ea9a..02822ea608 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Select.Details
                 AutoSizeAxes = Axes.Y,
                 Children = new[]
                 {
-                    FirstValue = new StatisticRow(), //circle size/key amount
+                    FirstValue = new StatisticRow(), // circle size/key amount
                     HpDrain = new StatisticRow { Title = "HP Drain" },
                     Accuracy = new StatisticRow { Title = "Accuracy" },
                     ApproachRate = new StatisticRow { Title = "Approach Rate" },
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a7e27c27ba..5b7c9082f3 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -798,7 +798,7 @@ namespace osu.Game.Screens.Select
                 Masking = true;
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
-                Width = panel_overflow; //avoid horizontal masking so the panels don't clip when screen stack is pushed.
+                Width = panel_overflow; // avoid horizontal masking so the panels don't clip when screen stack is pushed.
                 InternalChild = Content = new Container
                 {
                     RelativeSizeAxes = Axes.Both,

From aff74db80da54a35a438a4e6443569107e5403a1 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 5 May 2020 10:40:10 +0200
Subject: [PATCH 02587/10326] Publicly expose HUDOverlay in Player.

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ece4c6307e..af724d97a2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Screens.Play
 
         protected DrawableRuleset DrawableRuleset { get; private set; }
 
-        protected HUDOverlay HUDOverlay { get; private set; }
+        public HUDOverlay HUDOverlay { get; private set; }
 
         public bool LoadedBeatmapSuccessfully => DrawableRuleset?.Objects.Any() == true;
 

From 7781408643a682358c463077bf76a6d35a4bc1c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 May 2020 18:27:10 +0900
Subject: [PATCH 02588/10326] Update in line with framework storage changes

---
 osu.Desktop/OsuGameDesktop.cs           | 78 +++++++++++------------
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 84 +++++++++++--------------
 osu.Game/IO/OsuStorage.cs               | 26 ++++++++
 osu.Game/IO/WrappedStorage.cs           | 80 +++++++++++++++++++++++
 osu.Game/OsuGameBase.cs                 | 26 +-------
 5 files changed, 179 insertions(+), 115 deletions(-)
 create mode 100644 osu.Game/IO/OsuStorage.cs
 create mode 100644 osu.Game/IO/WrappedStorage.cs

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index f05ee48914..9351e17419 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -6,15 +6,14 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.Win32;
 using osu.Desktop.Overlays;
 using osu.Framework.Platform;
 using osu.Game;
 using osuTK.Input;
-using Microsoft.Win32;
 using osu.Desktop.Updater;
 using osu.Framework;
 using osu.Framework.Logging;
-using osu.Framework.Platform.Windows;
 using osu.Framework.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Updater;
@@ -37,7 +36,11 @@ namespace osu.Desktop
             try
             {
                 if (Host is DesktopGameHost desktopHost)
-                    return new StableStorage(desktopHost);
+                {
+                    string stablePath = getStableInstallPath();
+                    if (!string.IsNullOrEmpty(stablePath))
+                        return new DesktopStorage(stablePath, desktopHost);
+                }
             }
             catch (Exception)
             {
@@ -47,6 +50,35 @@ namespace osu.Desktop
             return null;
         }
 
+        private string getStableInstallPath()
+        {
+            static bool checkExists(string p) => Directory.Exists(Path.Combine(p, "Songs"));
+
+            string stableInstallPath;
+
+            try
+            {
+                using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+            }
+            catch
+            {
+            }
+
+            stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
+            if (checkExists(stableInstallPath))
+                return stableInstallPath;
+
+            stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
+            if (checkExists(stableInstallPath))
+                return stableInstallPath;
+
+            return null;
+        }
+
         protected override UpdateManager CreateUpdateManager()
         {
             switch (RuntimeInfo.OS)
@@ -111,45 +143,5 @@ namespace osu.Desktop
 
             Task.Factory.StartNew(() => Import(filePaths), TaskCreationOptions.LongRunning);
         }
-
-        /// <summary>
-        /// A method of accessing an osu-stable install in a controlled fashion.
-        /// </summary>
-        private class StableStorage : WindowsStorage
-        {
-            protected override string LocateBasePath()
-            {
-                static bool checkExists(string p) => Directory.Exists(Path.Combine(p, "Songs"));
-
-                string stableInstallPath;
-
-                try
-                {
-                    using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                        stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
-
-                    if (checkExists(stableInstallPath))
-                        return stableInstallPath;
-                }
-                catch
-                {
-                }
-
-                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
-                if (checkExists(stableInstallPath))
-                    return stableInstallPath;
-
-                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
-                if (checkExists(stableInstallPath))
-                    return stableInstallPath;
-
-                return null;
-            }
-
-            public StableStorage(DesktopGameHost host)
-                : base(string.Empty, host)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index eefa9fcfe6..53ba597a7e 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -8,7 +8,6 @@ using Microsoft.Win32;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Framework.Platform.Windows;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Legacy;
@@ -52,7 +51,12 @@ namespace osu.Game.Tournament.IPC
 
             try
             {
-                Storage = new StableStorage(host as DesktopGameHost);
+                var path = findStablePath();
+
+                if (string.IsNullOrEmpty(path))
+                    return null;
+
+                Storage = new DesktopStorage(path, host as DesktopGameHost);
 
                 const string file_ipc_filename = "ipc.txt";
                 const string file_ipc_state_filename = "ipc-state.txt";
@@ -145,64 +149,50 @@ namespace osu.Game.Tournament.IPC
             return Storage;
         }
 
-        /// <summary>
-        /// A method of accessing an osu-stable install in a controlled fashion.
-        /// </summary>
-        private class StableStorage : WindowsStorage
+        private string findStablePath()
         {
-            protected override string LocateBasePath()
-            {
-                static bool checkExists(string p)
-                {
-                    return File.Exists(Path.Combine(p, "ipc.txt"));
-                }
+            static bool checkExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
 
-                string stableInstallPath = string.Empty;
+            string stableInstallPath = string.Empty;
+
+            try
+            {
+                try
+                {
+                    stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
+
+                    if (checkExists(stableInstallPath))
+                        return stableInstallPath;
+                }
+                catch
+                {
+                }
 
                 try
                 {
-                    try
-                    {
-                        stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
+                    using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                        stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
 
-                        if (checkExists(stableInstallPath))
-                            return stableInstallPath;
-                    }
-                    catch
-                    {
-                    }
-
-                    try
-                    {
-                        using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                            stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
-
-                        if (checkExists(stableInstallPath))
-                            return stableInstallPath;
-                    }
-                    catch
-                    {
-                    }
-
-                    stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
                     if (checkExists(stableInstallPath))
                         return stableInstallPath;
-
-                    stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
-                    if (checkExists(stableInstallPath))
-                        return stableInstallPath;
-
-                    return null;
                 }
-                finally
+                catch
                 {
-                    Logger.Log($"Stable path for tourney usage: {stableInstallPath}");
                 }
-            }
 
-            public StableStorage(DesktopGameHost host)
-                : base(string.Empty, host)
+                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+
+                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+
+                return null;
+            }
+            finally
             {
+                Logger.Log($"Stable path for tourney usage: {stableInstallPath}");
             }
         }
     }
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
new file mode 100644
index 0000000000..ee42c491d1
--- /dev/null
+++ b/osu.Game/IO/OsuStorage.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.Logging;
+using osu.Framework.Platform;
+using osu.Game.Configuration;
+
+namespace osu.Game.IO
+{
+    public class OsuStorage : WrappedStorage
+    {
+        public OsuStorage(GameHost host)
+            : base(host.Storage, string.Empty)
+        {
+            var storageConfig = new StorageConfigManager(host.Storage);
+
+            var customStoragePath = storageConfig.Get<string>(StorageConfig.FullPath);
+
+            if (!string.IsNullOrEmpty(customStoragePath))
+            {
+                ChangeTargetStorage(host.GetStorage(customStoragePath));
+                Logger.Storage = UnderlyingStorage.GetStorageForDirectory("logs");
+            }
+        }
+    }
+}
diff --git a/osu.Game/IO/WrappedStorage.cs b/osu.Game/IO/WrappedStorage.cs
new file mode 100644
index 0000000000..705bbf6840
--- /dev/null
+++ b/osu.Game/IO/WrappedStorage.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 System.IO;
+using osu.Framework.Platform;
+
+namespace osu.Game.IO
+{
+    /// <summary>
+    /// A storage which wraps another storage and delegates implementation, potentially mutating the lookup path.
+    /// </summary>
+    public class WrappedStorage : Storage
+    {
+        protected Storage UnderlyingStorage { get; private set; }
+
+        private readonly string subPath;
+
+        public WrappedStorage(Storage underlyingStorage, string subPath = null)
+            : base(string.Empty)
+        {
+            ChangeTargetStorage(underlyingStorage);
+
+            this.subPath = subPath;
+        }
+
+        protected virtual string MutatePath(string path) => !string.IsNullOrEmpty(subPath) ? Path.Combine(subPath, path) : path;
+
+        protected void ChangeTargetStorage(Storage newStorage)
+        {
+            UnderlyingStorage = newStorage;
+        }
+
+        public override string GetFullPath(string path, bool createIfNotExisting = false) =>
+            UnderlyingStorage.GetFullPath(MutatePath(path), createIfNotExisting);
+
+        public override bool Exists(string path) =>
+            UnderlyingStorage.Exists(MutatePath(path));
+
+        public override bool ExistsDirectory(string path) =>
+            UnderlyingStorage.ExistsDirectory(MutatePath(path));
+
+        public override void DeleteDirectory(string path) =>
+            UnderlyingStorage.DeleteDirectory(MutatePath(path));
+
+        public override void Delete(string path) =>
+            UnderlyingStorage.Delete(MutatePath(path));
+
+        public override IEnumerable<string> GetDirectories(string path) =>
+            UnderlyingStorage.GetDirectories(MutatePath(path));
+
+        public override IEnumerable<string> GetFiles(string path, string pattern = "*") =>
+            UnderlyingStorage.GetFiles(MutatePath(path), pattern);
+
+        public override Stream GetStream(string path, FileAccess access = FileAccess.Read, FileMode mode = FileMode.OpenOrCreate) =>
+            UnderlyingStorage.GetStream(MutatePath(path), access, mode);
+
+        public override string GetDatabaseConnectionString(string name) =>
+            UnderlyingStorage.GetDatabaseConnectionString(MutatePath(name));
+
+        public override void DeleteDatabase(string name) => UnderlyingStorage.DeleteDatabase(MutatePath(name));
+
+        public override void OpenInNativeExplorer() => UnderlyingStorage.OpenInNativeExplorer();
+
+        public override Storage GetStorageForDirectory(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                throw new ArgumentException("Must be non-null and not empty string", nameof(path));
+
+            if (!path.EndsWith(Path.DirectorySeparatorChar))
+                path += Path.DirectorySeparatorChar;
+
+            // create non-existing path.
+            GetFullPath(path, true);
+
+            return new WrappedStorage(this, path);
+        }
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index f92db4e111..d9f9e2de42 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -71,8 +71,6 @@ namespace osu.Game
 
         protected MenuCursorContainer MenuCursorContainer;
 
-        protected StorageConfigManager StorageConfig;
-
         private Container content;
 
         protected override Container<Drawable> Content => content;
@@ -304,17 +302,7 @@ namespace osu.Game
         {
             base.SetHost(host);
 
-            StorageConfig = new StorageConfigManager(host.Storage);
-
-            var customStoragePath = StorageConfig.Get<string>(Configuration.StorageConfig.FullPath);
-
-            if (!string.IsNullOrEmpty(customStoragePath))
-            {
-                Storage = new CustomStorage(customStoragePath, host);
-                Logger.Storage = Storage.GetStorageForDirectory("logs");
-            }
-            else
-                Storage = host.Storage;
+            Storage = new OsuStorage(host);
 
             if (LocalConfig == null)
                 LocalConfig = new OsuConfigManager(Storage);
@@ -366,17 +354,5 @@ namespace osu.Game
                 public override bool ChangeFocusOnClick => false;
             }
         }
-
-        /// <summary>
-        /// A storage pointing to an absolute location specified by the user to store game data files.
-        /// </summary>
-        private class CustomStorage : NativeStorage
-        {
-            public CustomStorage(string fullPath, GameHost host)
-                : base(string.Empty, host)
-            {
-                BasePath = fullPath;
-            }
-        }
     }
 }

From ed83ac188e20c2b9e6e00de7083b90e1974dc9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 May 2020 23:25:25 +0200
Subject: [PATCH 02589/10326] Remove special case for moving catcher sprite

---
 .../TestSceneHyperDashColouring.cs              | 12 +-----------
 osu.Game.Rulesets.Catch/UI/Catcher.cs           | 17 +----------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 589bafe400..1e708cce4b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -128,17 +128,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 catcherArea.MovableCatcher.SetHyperDashState(2);
             });
 
-            AddUntilStep("catcher colour is correct", () =>
-            {
-                var expected = expectedCatcherColour;
-
-                if (expected == Catcher.DEFAULT_HYPER_DASH_COLOUR)
-                    // The expected colour for Catcher.Colour is another colour
-                    // for the default skin, assert with that instead.
-                    expected = Catcher.DEFAULT_CATCHER_HYPER_DASH_COLOUR;
-
-                return catcherArea.MovableCatcher.Colour == expected;
-            });
+            AddUntilStep("catcher colour is correct", () => catcherArea.MovableCatcher.Colour == expectedCatcherColour);
 
             AddAssert("catcher trails colours are correct", () => trails.HyperDashTrailsColour == expectedCatcherColour);
             AddAssert("catcher end-glow colours are correct", () => trails.EndGlowSpritesColour == (expectedEndGlowColour ?? expectedCatcherColour));
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 2022cffb40..520cfeee70 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -28,15 +28,6 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public static readonly Color4 DEFAULT_HYPER_DASH_COLOUR = Color4.Red;
 
-        /// <summary>
-        /// The default hyper-dash colour used directly for this
-        /// <see cref="Catcher"/>'s <see cref="Drawable.Colour"/>.
-        /// </summary>
-        /// <remarks>
-        /// This colour is only used when no skin overrides <see cref="CatchSkinColour.HyperDash"/>.
-        /// </remarks>
-        public static readonly Color4 DEFAULT_CATCHER_HYPER_DASH_COLOUR = Color4.OrangeRed;
-
         /// <summary>
         /// The duration between transitioning to hyper-dash state.
         /// </summary>
@@ -288,13 +279,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             if (hyperDashing)
             {
-                // special behaviour for catcher colour if no skin overrides.
-                var catcherColour =
-                    hyperDashColour == DEFAULT_HYPER_DASH_COLOUR
-                        ? DEFAULT_CATCHER_HYPER_DASH_COLOUR
-                        : hyperDashColour;
-
-                this.FadeColour(catcherColour, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+                this.FadeColour(hyperDashColour, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
                 this.FadeTo(0.2f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
             }
             else

From 52d1e2b5f889dd193aad2c10b0f3b40f87e24f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 May 2020 23:27:01 +0200
Subject: [PATCH 02590/10326] Improve xmldoc

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

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 520cfeee70..40c7d6a9b5 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Rulesets.Catch.UI
     public class Catcher : SkinReloadableDrawable, IKeyBindingHandler<CatchAction>
     {
         /// <summary>
-        /// The default colour used for all hyper-dashing components. (catcher drawables and fruit)
+        /// The default colour used to tint hyper-dash fruit, along with the moving catcher, its trail
+        /// and end glow/after-image during a hyper-dash.
         /// </summary>
         public static readonly Color4 DEFAULT_HYPER_DASH_COLOUR = Color4.Red;
 

From 25f73c0b9f30d2c3dc129d02f0bd8a61e738374c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 May 2020 23:40:36 +0200
Subject: [PATCH 02591/10326] Add [NotNull] annotation

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

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
index afbfac9a51..64fb4b2196 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
@@ -73,7 +74,7 @@ namespace osu.Game.Rulesets.Catch.UI
             }
         }
 
-        public CatcherTrailDisplay(Catcher catcher)
+        public CatcherTrailDisplay([NotNull] Catcher catcher)
         {
             this.catcher = catcher ?? throw new ArgumentNullException(nameof(catcher));
 

From b44a70ef9ab7240d3a9a285654996889e8e67910 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 7 May 2020 01:46:37 +0300
Subject: [PATCH 02592/10326] Let the catcher be responsible for stopping the
 trails

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs             | 2 +-
 osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 40c7d6a9b5..558555af96 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 dashing = value;
 
-                trails.DisplayTrail |= dashing;
+                trails.DisplayTrail = value || HyperDashing;
             }
         }
 
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
index 64fb4b2196..bab3cb748b 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
@@ -103,11 +103,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void displayTrail()
         {
-            if (!catcher.Dashing && !catcher.HyperDashing)
-            {
-                DisplayTrail = false;
+            if (!DisplayTrail)
                 return;
-            }
 
             var sprite = createTrailSprite(catcher.HyperDashing ? hyperDashTrails : dashTrails);
 

From 5186da8412ded39b4216cab60c0858fe05b42f71 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 7 May 2020 11:37:04 +0900
Subject: [PATCH 02593/10326] Fix potential song select nullref

---
 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 6d760df065..1e4f6aeda1 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Select.Carousel
                 terms.Add(Beatmap.Version);
 
                 foreach (var criteriaTerm in criteria.SearchTerms)
-                    match &= terms.Any(term => term.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0);
+                    match &= terms.Any(term => term?.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0);
             }
 
             Filtered.Value = !match;

From e91e4a73af89e719e05c1f349836433079a2523e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 7 May 2020 12:22:07 +0900
Subject: [PATCH 02594/10326] Fix catch crashing when finishing maps

---
 .../Scoring/Legacy/ScoreInfoExtensions.cs     | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index 9745d1abef..6f73a284a2 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Scoring.Legacy
             switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
             {
                 case 3:
-                    return scoreInfo.Statistics[HitResult.Perfect];
+                    return getCount(scoreInfo, HitResult.Perfect);
             }
 
             return null;
@@ -35,10 +35,10 @@ namespace osu.Game.Scoring.Legacy
                 case 0:
                 case 1:
                 case 3:
-                    return scoreInfo.Statistics[HitResult.Great];
+                    return getCount(scoreInfo, HitResult.Great);
 
                 case 2:
-                    return scoreInfo.Statistics[HitResult.Perfect];
+                    return getCount(scoreInfo, HitResult.Perfect);
             }
 
             return null;
@@ -65,10 +65,10 @@ namespace osu.Game.Scoring.Legacy
             switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
             {
                 case 3:
-                    return scoreInfo.Statistics[HitResult.Good];
+                    return getCount(scoreInfo, HitResult.Good);
 
                 case 2:
-                    return scoreInfo.Statistics[HitResult.SmallTickMiss];
+                    return getCount(scoreInfo, HitResult.SmallTickMiss);
             }
 
             return null;
@@ -94,13 +94,13 @@ namespace osu.Game.Scoring.Legacy
             {
                 case 0:
                 case 1:
-                    return scoreInfo.Statistics[HitResult.Good];
+                    return getCount(scoreInfo, HitResult.Good);
 
                 case 3:
-                    return scoreInfo.Statistics[HitResult.Ok];
+                    return getCount(scoreInfo, HitResult.Ok);
 
                 case 2:
-                    return scoreInfo.Statistics[HitResult.LargeTickHit];
+                    return getCount(scoreInfo, HitResult.LargeTickHit);
             }
 
             return null;
@@ -131,10 +131,10 @@ namespace osu.Game.Scoring.Legacy
             {
                 case 0:
                 case 3:
-                    return scoreInfo.Statistics[HitResult.Meh];
+                    return getCount(scoreInfo, HitResult.Meh);
 
                 case 2:
-                    return scoreInfo.Statistics[HitResult.SmallTickHit];
+                    return getCount(scoreInfo, HitResult.SmallTickHit);
             }
 
             return null;
@@ -156,9 +156,17 @@ namespace osu.Game.Scoring.Legacy
         }
 
         public static int? GetCountMiss(this ScoreInfo scoreInfo) =>
-            scoreInfo.Statistics[HitResult.Miss];
+            getCount(scoreInfo, HitResult.Miss);
 
         public static void SetCountMiss(this ScoreInfo scoreInfo, int value) =>
             scoreInfo.Statistics[HitResult.Miss] = value;
+
+        private static int? getCount(ScoreInfo scoreInfo, HitResult result)
+        {
+            if (scoreInfo.Statistics.TryGetValue(result, out var existing))
+                return existing;
+
+            return null;
+        }
     }
 }

From 401c516503239f341c73396e5539e7b78f2b1078 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 7 May 2020 13:04:08 +0900
Subject: [PATCH 02595/10326] Expose searchable terms from beatmap info instead

---
 osu.Game/Beatmaps/BeatmapInfo.cs                    | 5 +++++
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 8 ++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 90c100db05..3860f12baa 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -149,6 +149,11 @@ namespace osu.Game.Beatmaps
             }
         }
 
+        public string[] SearchableTerms => new[]
+        {
+            Version
+        }.Concat(Metadata?.SearchableTerms ?? Enumerable.Empty<string>()).Where(s => !string.IsNullOrEmpty(s)).ToArray();
+
         public override string ToString()
         {
             string version = string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 1e4f6aeda1..ed54c158db 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.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 osu.Game.Beatmaps;
 using osu.Game.Screens.Select.Filter;
@@ -55,13 +54,10 @@ namespace osu.Game.Screens.Select.Carousel
 
             if (match)
             {
-                var terms = new List<string>();
-
-                terms.AddRange(Beatmap.Metadata.SearchableTerms);
-                terms.Add(Beatmap.Version);
+                var terms = Beatmap.SearchableTerms;
 
                 foreach (var criteriaTerm in criteria.SearchTerms)
-                    match &= terms.Any(term => term?.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0);
+                    match &= terms.Any(term => term.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0);
             }
 
             Filtered.Value = !match;

From 259ef688110bfbc6e9eed2f7b8779af8b65bbb3e Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 6 May 2020 22:29:37 -0700
Subject: [PATCH 02596/10326] Fix date tooltip not showing in 24-hour format

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

diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs
index 8c520f4e10..8b6df4a834 100644
--- a/osu.Game/Graphics/DrawableDate.cs
+++ b/osu.Game/Graphics/DrawableDate.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Graphics
                     return false;
 
                 dateText.Text = $"{date:d MMMM yyyy} ";
-                timeText.Text = $"{date:hh:mm:ss \"UTC\"z}";
+                timeText.Text = $"{date:HH:mm:ss \"UTC\"z}";
                 return true;
             }
 

From 09759565faee8f9f96fbc48aacaa7a8ad7842eb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 May 2020 14:49:58 +0900
Subject: [PATCH 02597/10326] Add support for 3v3 tournament chroma key layout

---
 osu.Game.Tournament/Models/LadderInfo.cs      |  6 ++
 .../Screens/Gameplay/GameplayScreen.cs        | 83 +++++++++++++++++--
 2 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index c2e6da9ca5..7794019437 100644
--- a/osu.Game.Tournament/Models/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.cs
@@ -32,5 +32,11 @@ namespace osu.Game.Tournament.Models
             MinValue = 640,
             MaxValue = 1366,
         };
+
+        public Bindable<int> PlayersPerTeam = new BindableInt(4)
+        {
+            MinValue = 3,
+            MaxValue = 4,
+        };
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 64a5cd6dec..e4e3842369 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
         [Resolved]
         private TournamentMatchChatDisplay chat { get; set; }
 
-        private Box chroma;
+        private Drawable chroma;
 
         [BackgroundDependencyLoader]
         private void load(LadderInfo ladder, MatchIPCInfo ipc, Storage storage)
@@ -61,16 +61,30 @@ namespace osu.Game.Tournament.Screens.Gameplay
                     Y = 110,
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
-                    Children = new Drawable[]
+                    Children = new[]
                     {
-                        chroma = new Box
+                        chroma = new Container
                         {
-                            // chroma key area for stable gameplay
-                            Name = "chroma",
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Height = 512,
-                            Colour = new Color4(0, 255, 0, 255),
+                            Children = new Drawable[]
+                            {
+                                new ChromaArea
+                                {
+                                    Name = "Left chroma",
+                                    RelativeSizeAxes = Axes.Both,
+                                    Width = 0.5f,
+                                },
+                                new ChromaArea
+                                {
+                                    Name = "Right chroma",
+                                    RelativeSizeAxes = Axes.Both,
+                                    Anchor = Anchor.TopRight,
+                                    Origin = Anchor.TopRight,
+                                    Width = 0.5f,
+                                }
+                            }
                         },
                     }
                 },
@@ -98,9 +112,15 @@ namespace osu.Game.Tournament.Screens.Gameplay
                         },
                         new SettingsSlider<int>
                         {
-                            LabelText = "Chroma Width",
+                            LabelText = "Chroma width",
                             Bindable = LadderInfo.ChromaKeyWidth,
                             KeyboardStep = 1,
+                        },
+                        new SettingsSlider<int>
+                        {
+                            LabelText = "Players per team",
+                            Bindable = LadderInfo.PlayersPerTeam,
+                            KeyboardStep = 1,
                         }
                     }
                 }
@@ -201,5 +221,54 @@ namespace osu.Game.Tournament.Screens.Gameplay
                 lastState = state.NewValue;
             }
         }
+
+        private class ChromaArea : CompositeDrawable
+        {
+            [Resolved]
+            private LadderInfo ladder { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                // chroma key area for stable gameplay
+                Colour = new Color4(0, 255, 0, 255);
+
+                ladder.PlayersPerTeam.BindValueChanged(performLayout, true);
+            }
+
+            private void performLayout(ValueChangedEvent<int> playerCount)
+            {
+                switch (playerCount.NewValue)
+                {
+                    case 3:
+                        InternalChildren = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Width = 0.5f,
+                                Height = 0.5f,
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                            },
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Anchor = Anchor.BottomLeft,
+                                Origin = Anchor.BottomLeft,
+                                Height = 0.5f,
+                            },
+                        };
+                        break;
+
+                    default:
+                        InternalChild = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        };
+                        break;
+                }
+            }
+        }
     }
 }

From 836efe3f7c697448b82a1f3b053ef0dd85f3efc0 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Thu, 7 May 2020 08:07:22 +0200
Subject: [PATCH 02598/10326] Initial commit

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs        |  4 +++-
 .../Settings/Sections/General/UpdateSettings.cs     | 13 ++++++++++++-
 osu.Game/Updater/SimpleUpdateManager.cs             |  4 +++-
 osu.Game/Updater/UpdateManager.cs                   |  6 ++++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index ade8460dd7..b287dd6527 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -37,10 +37,12 @@ namespace osu.Desktop.Updater
             if (game.IsDeployedBuild)
             {
                 Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
-                Schedule(() => Task.Run(() => checkForUpdateAsync()));
+                CheckForUpdate();
             }
         }
 
+        public override void CheckForUpdate() => Schedule(() => Task.Run(() => checkForUpdateAsync()));
+
         private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
         {
             // should we schedule a retry on completion of this check?
diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 188c9c05ef..71deeee693 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -5,15 +5,19 @@ using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
+using osu.Game.Updater;
 
 namespace osu.Game.Overlays.Settings.Sections.General
 {
     public class UpdateSettings : SettingsSubsection
     {
+        [Resolved(CanBeNull = true)]
+        private UpdateManager updateManager { get; set; }
+
         protected override string Header => "Updates";
 
         [BackgroundDependencyLoader]
-        private void load(Storage storage, OsuConfigManager config)
+        private void load(Storage storage, OsuConfigManager config, OsuGameBase game)
         {
             Add(new SettingsEnumDropdown<ReleaseStream>
             {
@@ -21,6 +25,13 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
+            Add(new SettingsButton
+            {
+                Text = "Check for updates",
+                Action = () => updateManager?.CheckForUpdate(),
+                Enabled = { Value = game.IsDeployedBuild }
+            });
+
             if (RuntimeInfo.IsDesktop)
             {
                 Add(new SettingsButton
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 1e8a96444f..41248ed796 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -30,9 +30,11 @@ namespace osu.Game.Updater
             version = game.Version;
 
             if (game.IsDeployedBuild)
-                Schedule(() => Task.Run(checkForUpdateAsync));
+                CheckForUpdate();
         }
 
+        public override void CheckForUpdate() => Schedule(() => Task.Run(checkForUpdateAsync));
+
         private async void checkForUpdateAsync()
         {
             try
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 28a295215f..f628bde324 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Logging;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
@@ -44,6 +45,11 @@ namespace osu.Game.Updater
             config.Set(OsuSetting.Version, version);
         }
 
+        public virtual void CheckForUpdate()
+        {
+            Logger.Log("CheckForUpdate was called on the base class (UpdateManager)", LoggingTarget.Information);
+        }
+
         private class UpdateCompleteNotification : SimpleNotification
         {
             private readonly string version;

From 83be5455d3529707cbac2192e538984fc351eea4 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 7 May 2020 08:52:36 +0200
Subject: [PATCH 02599/10326] Disable the display of HUD through DisplayHud
 property.

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 9 +++++++++
 osu.Game/Screens/Play/Player.cs         | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 5062c92afe..ff1f67783e 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -487,6 +487,15 @@ namespace osu.Game.Rulesets.UI
 
         protected virtual ResumeOverlay CreateResumeOverlay() => null;
 
+        /// <summary>
+        /// Whether to display the HUD with this ruleset.
+        /// Override to false to completely disable the display of the HUD with this ruleset. 
+        /// </summary>
+        /// <remarks>
+        /// HUD refers here to <see cref="HUDOverlay"/> in player as well as <see cref="BreakOverlay"/>.
+        /// </remarks>
+        public virtual bool DisplayHud => true;
+
         /// <summary>
         /// Sets a replay to be used, overriding local input.
         /// </summary>
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index af724d97a2..375976ea6c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Screens.Play
 
         protected DrawableRuleset DrawableRuleset { get; private set; }
 
-        public HUDOverlay HUDOverlay { get; private set; }
+        protected HUDOverlay HUDOverlay { get; private set; }
 
         public bool LoadedBeatmapSuccessfully => DrawableRuleset?.Objects.Any() == true;
 
@@ -184,6 +184,13 @@ namespace osu.Game.Screens.Play
             addGameplayComponents(GameplayClockContainer, Beatmap.Value, playableBeatmap);
             addOverlayComponents(GameplayClockContainer, Beatmap.Value);
 
+            if (!DrawableRuleset.DisplayHud)
+            {
+                HUDOverlay.ShowHud.Value = false;
+                HUDOverlay.ShowHud.Disabled = true;
+                BreakOverlay.Hide();
+            }
+
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
             // bind clock into components that require it

From 83998d5ba5a661a284bb19b54d711f8bc583f6ad Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 7 May 2020 09:39:14 +0200
Subject: [PATCH 02600/10326] Trim whitespace.

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

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index ff1f67783e..57fbb7f1a5 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -489,7 +489,7 @@ namespace osu.Game.Rulesets.UI
 
         /// <summary>
         /// Whether to display the HUD with this ruleset.
-        /// Override to false to completely disable the display of the HUD with this ruleset. 
+        /// Override to false to completely disable the display of the HUD with this ruleset.
         /// </summary>
         /// <remarks>
         /// HUD refers here to <see cref="HUDOverlay"/> in player as well as <see cref="BreakOverlay"/>.

From 90e17853a80af4b970a1cae6481c287c124d6fef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 May 2020 18:12:11 +0900
Subject: [PATCH 02601/10326] Update tests in line with framework changes

---
 osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 2d5f1f238f..b82339281e 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.NonVisual
                     var osu = loadOsu(host);
                     var storage = osu.Dependencies.Get<Storage>();
 
-                    string defaultStorageLocation = Path.Combine(Environment.CurrentDirectory, $"headless-{nameof(TestDefaultDirectory)}");
+                    string defaultStorageLocation = Path.Combine(Environment.CurrentDirectory, $"headless", nameof(TestDefaultDirectory));
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
                 }
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.NonVisual
         {
             using (var host = new HeadlessGameHost(nameof(TestCustomDirectory)))
             {
-                string headlessPrefix = $"headless-{nameof(TestCustomDirectory)}";
+                string headlessPrefix = Path.Combine("headless", nameof(TestCustomDirectory));
 
                 // need access before the game has constructed its own storage yet.
                 Storage storage = new DesktopStorage(headlessPrefix, host);

From d21c42a222ffe2f569b66fa7a5deb177374e247a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 May 2020 20:59:29 +0900
Subject: [PATCH 02602/10326] 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 8214fa2f2c..af699af1ba 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.502.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.507.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 91c89cbc20..397d48f7b8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.502.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.507.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 9ff7e3fc02..036f87541f 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.Framework.iOS" Version="2020.502.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.507.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.502.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.507.0" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 4ac5ed71f4f82b1f9a4b47677e30e00ac3e230d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 May 2020 21:48:57 +0900
Subject: [PATCH 02603/10326] Remove redundant string interpolation

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

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index b82339281e..d741bc5de1 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.NonVisual
                     var osu = loadOsu(host);
                     var storage = osu.Dependencies.Get<Storage>();
 
-                    string defaultStorageLocation = Path.Combine(Environment.CurrentDirectory, $"headless", nameof(TestDefaultDirectory));
+                    string defaultStorageLocation = Path.Combine(Environment.CurrentDirectory, "headless", nameof(TestDefaultDirectory));
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
                 }

From 754afb9c0bbd5d049352c455ec1122de69a9a9fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 May 2020 18:31:17 +0900
Subject: [PATCH 02604/10326] Expose ContextFactory to allow for connection
 flushing

---
 osu.Game/OsuGameBase.cs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d9f9e2de42..d0c06df8ea 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -121,7 +121,7 @@ namespace osu.Game
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-        private DatabaseContextFactory contextFactory;
+        protected DatabaseContextFactory ContextFactory;
 
         protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
 
@@ -130,7 +130,7 @@ namespace osu.Game
         {
             Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly));
 
-            dependencies.Cache(contextFactory = new DatabaseContextFactory(Storage));
+            dependencies.Cache(ContextFactory = new DatabaseContextFactory(Storage));
 
             dependencies.CacheAs(Storage);
 
@@ -161,7 +161,7 @@ namespace osu.Game
 
             runMigrations();
 
-            dependencies.Cache(SkinManager = new SkinManager(Storage, contextFactory, Host, Audio, new NamespacedResourceStore<byte[]>(Resources, "Skins/Legacy")));
+            dependencies.Cache(SkinManager = new SkinManager(Storage, ContextFactory, Host, Audio, new NamespacedResourceStore<byte[]>(Resources, "Skins/Legacy")));
             dependencies.CacheAs<ISkinSource>(SkinManager);
 
             if (API == null) API = new APIAccess(LocalConfig);
@@ -170,12 +170,12 @@ namespace osu.Game
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
-            dependencies.Cache(RulesetStore = new RulesetStore(contextFactory, Storage));
-            dependencies.Cache(FileStore = new FileStore(contextFactory, Storage));
+            dependencies.Cache(RulesetStore = new RulesetStore(ContextFactory, Storage));
+            dependencies.Cache(FileStore = new FileStore(ContextFactory, Storage));
 
             // ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup()
-            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Host));
-            dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Host, defaultBeatmap));
+            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, ContextFactory, Host));
+            dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, ContextFactory, RulesetStore, API, Audio, Host, defaultBeatmap));
 
             // this should likely be moved to ArchiveModelManager when another case appers where it is necessary
             // to have inter-dependent model managers. this could be obtained with an IHasForeign<T> interface to
@@ -189,8 +189,8 @@ namespace osu.Game
             BeatmapManager.ItemRemoved += i => ScoreManager.Delete(getBeatmapScores(i), true);
             BeatmapManager.ItemAdded += i => ScoreManager.Undelete(getBeatmapScores(i), true);
 
-            dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
-            dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
+            dependencies.Cache(KeyBindingStore = new KeyBindingStore(ContextFactory, RulesetStore));
+            dependencies.Cache(SettingsStore = new SettingsStore(ContextFactory));
             dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore));
             dependencies.Cache(new SessionStatics());
             dependencies.Cache(new OsuColour());
@@ -279,7 +279,7 @@ namespace osu.Game
         {
             try
             {
-                using (var db = contextFactory.GetForWrite(false))
+                using (var db = ContextFactory.GetForWrite(false))
                     db.Context.Migrate();
             }
             catch (Exception e)
@@ -288,12 +288,12 @@ namespace osu.Game
 
                 // if we failed, let's delete the database and start fresh.
                 // todo: we probably want a better (non-destructive) migrations/recovery process at a later point than this.
-                contextFactory.ResetDatabase();
+                ContextFactory.ResetDatabase();
 
                 Logger.Log("Database purged successfully.", LoggingTarget.Database);
 
                 // only run once more, then hard bail.
-                using (var db = contextFactory.GetForWrite(false))
+                using (var db = ContextFactory.GetForWrite(false))
                     db.Context.Migrate();
             }
         }

From 49a03f1c06ca6824fc8e131ddd1e8f845c4ea1f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 May 2020 18:31:36 +0900
Subject: [PATCH 02605/10326] Add basic blocking migration, move not copy

---
 osu.Game/IO/OsuStorage.cs | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index ee42c491d1..f6cac2f4f1 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.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.IO;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
@@ -9,10 +11,15 @@ namespace osu.Game.IO
 {
     public class OsuStorage : WrappedStorage
     {
+        private readonly GameHost host;
+        private readonly StorageConfigManager storageConfig;
+
         public OsuStorage(GameHost host)
             : base(host.Storage, string.Empty)
         {
-            var storageConfig = new StorageConfigManager(host.Storage);
+            this.host = host;
+
+            storageConfig = new StorageConfigManager(host.Storage);
 
             var customStoragePath = storageConfig.Get<string>(StorageConfig.FullPath);
 
@@ -22,5 +29,34 @@ namespace osu.Game.IO
                 Logger.Storage = UnderlyingStorage.GetStorageForDirectory("logs");
             }
         }
+
+        public void Migrate(string newLocation)
+        {
+            string oldLocation = GetFullPath(".");
+
+            // ensure the new location has no files present, else hard abort
+            if (Directory.Exists(newLocation))
+            {
+                if (Directory.GetFiles(newLocation).Length > 0)
+                    throw new InvalidOperationException("Migration destination already has files present");
+
+                Directory.Delete(newLocation, true);
+            }
+
+            Directory.Move(oldLocation, newLocation);
+
+            Directory.CreateDirectory(newLocation);
+            // temporary
+            Directory.CreateDirectory(oldLocation);
+
+            // move back exceptions for now
+            Directory.Move(Path.Combine(newLocation, "cache"), Path.Combine(oldLocation, "cache"));
+            File.Move(Path.Combine(newLocation, "framework.ini"), Path.Combine(oldLocation, "framework.ini"));
+
+            ChangeTargetStorage(host.GetStorage(newLocation));
+
+            storageConfig.Set(StorageConfig.FullPath, newLocation);
+            storageConfig.Save();
+        }
     }
 }

From 7a2020fd4561e461ef7700a5178d7b05a8c23b6b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 May 2020 19:00:59 +0900
Subject: [PATCH 02606/10326] User copy operation instead of move

---
 osu.Game/IO/OsuStorage.cs | 63 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 8 deletions(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index f6cac2f4f1..955aae7b68 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
@@ -14,6 +15,14 @@ namespace osu.Game.IO
         private readonly GameHost host;
         private readonly StorageConfigManager storageConfig;
 
+        internal static readonly string[] IGNORE_DIRECTORIES = { "cache" };
+
+        internal static readonly string[] IGNORE_FILES =
+        {
+            "framework.ini",
+            "storage.ini"
+        };
+
         public OsuStorage(GameHost host)
             : base(host.Storage, string.Empty)
         {
@@ -43,20 +52,58 @@ namespace osu.Game.IO
                 Directory.Delete(newLocation, true);
             }
 
-            Directory.Move(oldLocation, newLocation);
+            var source = new DirectoryInfo(oldLocation);
+            var destination = new DirectoryInfo(newLocation);
 
-            Directory.CreateDirectory(newLocation);
-            // temporary
-            Directory.CreateDirectory(oldLocation);
-
-            // move back exceptions for now
-            Directory.Move(Path.Combine(newLocation, "cache"), Path.Combine(oldLocation, "cache"));
-            File.Move(Path.Combine(newLocation, "framework.ini"), Path.Combine(oldLocation, "framework.ini"));
+            copyRecursive(source, destination);
 
             ChangeTargetStorage(host.GetStorage(newLocation));
 
             storageConfig.Set(StorageConfig.FullPath, newLocation);
             storageConfig.Save();
+
+            deleteRecursive(source);
+        }
+
+        private static void deleteRecursive(DirectoryInfo target, bool topLevelExcludes = true)
+        {
+            foreach (System.IO.FileInfo fi in target.GetFiles())
+            {
+                if (IGNORE_FILES.Contains(fi.Name))
+                    continue;
+
+                fi.Delete();
+            }
+
+            foreach (DirectoryInfo dir in target.GetDirectories())
+            {
+                if (IGNORE_DIRECTORIES.Contains(dir.Name))
+                    continue;
+
+                dir.Delete(true);
+            }
+        }
+
+        private static void copyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true)
+        {
+            // based off example code https://docs.microsoft.com/en-us/dotnet/api/system.io.directoryinfo
+            Directory.CreateDirectory(destination.FullName);
+
+            foreach (System.IO.FileInfo fi in source.GetFiles())
+            {
+                if (IGNORE_FILES.Contains(fi.Name))
+                    continue;
+
+                fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true);
+            }
+
+            foreach (DirectoryInfo dir in source.GetDirectories())
+            {
+                if (IGNORE_DIRECTORIES.Contains(dir.Name))
+                    continue;
+
+                copyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);
+            }
         }
     }
 }

From 5e65bda8d8ba49b5213fcf163861bdee4ebddb6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 May 2020 19:01:19 +0900
Subject: [PATCH 02607/10326] Add test coverage

---
 .../NonVisual/CustomDataDirectoryTest.cs      | 60 ++++++++++++++++++-
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index d741bc5de1..7f08fad5be 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -7,14 +7,23 @@ using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
+using osu.Game.IO;
 
 namespace osu.Game.Tests.NonVisual
 {
     [TestFixture]
     public class CustomDataDirectoryTest
     {
+        [SetUp]
+        public void SetUp()
+        {
+            if (Directory.Exists(customPath))
+                Directory.Delete(customPath, true);
+        }
+
         [Test]
         public void TestDefaultDirectory()
         {
@@ -36,6 +45,8 @@ namespace osu.Game.Tests.NonVisual
             }
         }
 
+        private string customPath => Path.Combine(Environment.CurrentDirectory, "custom-path");
+
         [Test]
         public void TestCustomDirectory()
         {
@@ -49,7 +60,7 @@ namespace osu.Game.Tests.NonVisual
                 storage.DeleteDirectory(string.Empty);
 
                 using (var storageConfig = new StorageConfigManager(storage))
-                    storageConfig.Set(StorageConfig.FullPath, Path.Combine(Environment.CurrentDirectory, "custom-path"));
+                    storageConfig.Set(StorageConfig.FullPath, customPath);
 
                 try
                 {
@@ -58,7 +69,52 @@ namespace osu.Game.Tests.NonVisual
                     // switch to DI'd storage
                     storage = osu.Dependencies.Get<Storage>();
 
-                    Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(Environment.CurrentDirectory, "custom-path")));
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(customPath));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public void TestMigration()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigration)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+                    var storage = osu.Dependencies.Get<Storage>();
+
+                    // ensure we perform a save
+                    host.Dependencies.Get<FrameworkConfigManager>().Save();
+
+                    // ensure we "use" cache
+                    host.Storage.GetStorageForDirectory("cache");
+
+                    string defaultStorageLocation = Path.Combine(Environment.CurrentDirectory, "headless", nameof(TestMigration));
+
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
+
+                    (storage as OsuStorage)?.Migrate(customPath);
+
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(customPath));
+
+                    foreach (var file in OsuStorage.IGNORE_FILES)
+                    {
+                        Assert.That(host.Storage.Exists(file), Is.True);
+                        Assert.That(storage.Exists(file), Is.False);
+                    }
+
+                    foreach (var dir in OsuStorage.IGNORE_DIRECTORIES)
+                    {
+                        Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
+                        Assert.That(storage.ExistsDirectory(dir), Is.False);
+                    }
+
+                    Assert.That(new StreamReader(host.Storage.GetStream("storage.ini")).ReadToEnd().Contains($"FullPath = {customPath}"));
                 }
                 finally
                 {

From c025814f403dc5fcf4f07342791387986c526809 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Thu, 7 May 2020 23:04:18 +0200
Subject: [PATCH 02608/10326] Finalize changes

---
 osu.Game/OsuGame.cs                                | 14 +++++++++++---
 .../Settings/Sections/General/UpdateSettings.cs    |  7 ++-----
 osu.Game/Updater/SimpleUpdateManager.cs            |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index fdc8d94352..00b967c243 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -90,7 +90,7 @@ namespace osu.Game
 
         protected BackButton BackButton;
 
-        protected SettingsPanel Settings;
+        protected SettingsOverlay Settings;
 
         private VolumeOverlay volume;
         private OsuLogo osuLogo;
@@ -609,6 +609,9 @@ namespace osu.Game
 
             loadComponentSingleFile(screenshotManager, Add);
 
+            // dependency on notification overlay
+            loadComponentSingleFile(CreateUpdateManager(), Add, true);
+
             // overlay elements
             loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(dashboard = new DashboardOverlay(), overlayContent.Add, true);
@@ -641,7 +644,6 @@ 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 };
@@ -765,11 +767,17 @@ namespace osu.Game
 
         private Task asyncLoadStream;
 
+        /// <summary>
+        /// Schedules loading the provided <paramref name="d"/> in a single file.
+        /// </summary>
+        /// <param name="d">The component to load.</param>
+        /// <param name="add">The method to invoke for adding the component.</param>
+        /// <param name="cache">Whether to cache the component as type <typeparamref name="T"/> into the game dependencies before any scheduling.</param>
         private T loadComponentSingleFile<T>(T d, Action<T> add, bool cache = false)
             where T : Drawable
         {
             if (cache)
-                dependencies.Cache(d);
+                dependencies.CacheAs(d);
 
             if (d is OverlayContainer overlay)
                 overlays.Add(overlay);
diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 71deeee693..233a382b54 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -11,13 +11,10 @@ namespace osu.Game.Overlays.Settings.Sections.General
 {
     public class UpdateSettings : SettingsSubsection
     {
-        [Resolved(CanBeNull = true)]
-        private UpdateManager updateManager { get; set; }
-
         protected override string Header => "Updates";
 
         [BackgroundDependencyLoader]
-        private void load(Storage storage, OsuConfigManager config, OsuGameBase game)
+        private void load(Storage storage, OsuConfigManager config, OsuGameBase game, UpdateManager updateManager)
         {
             Add(new SettingsEnumDropdown<ReleaseStream>
             {
@@ -28,7 +25,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
             Add(new SettingsButton
             {
                 Text = "Check for updates",
-                Action = () => updateManager?.CheckForUpdate(),
+                Action = () => updateManager.CheckForUpdate(),
                 Enabled = { Value = game.IsDeployedBuild }
             });
 
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 41248ed796..234fe8be8b 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Updater
                 CheckForUpdate();
         }
 
-        public override void CheckForUpdate() => Schedule(() => Task.Run(checkForUpdateAsync));
+        public override void CheckForUpdate() => Schedule(() => Task.Run(() => checkForUpdateAsync()));
 
         private async void checkForUpdateAsync()
         {

From 92872496b86db2681da81cc151223e5707464940 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Thu, 7 May 2020 23:27:28 +0200
Subject: [PATCH 02609/10326] Convert to method groups

because Inspector said so.
---
 osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs | 2 +-
 osu.Game/Updater/SimpleUpdateManager.cs                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 233a382b54..5ddd12f667 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
             Add(new SettingsButton
             {
                 Text = "Check for updates",
-                Action = () => updateManager.CheckForUpdate(),
+                Action = updateManager.CheckForUpdate,
                 Enabled = { Value = game.IsDeployedBuild }
             });
 
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 234fe8be8b..41248ed796 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Updater
                 CheckForUpdate();
         }
 
-        public override void CheckForUpdate() => Schedule(() => Task.Run(() => checkForUpdateAsync()));
+        public override void CheckForUpdate() => Schedule(() => Task.Run(checkForUpdateAsync));
 
         private async void checkForUpdateAsync()
         {

From 72b6bb25a5c1125f038d4b079e2e57fd31fdbcd1 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 8 May 2020 00:33:33 +0200
Subject: [PATCH 02610/10326] Allow nulls and hide if missing dependencies

---
 .../Settings/Sections/General/UpdateSettings.cs   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 5ddd12f667..23ca752f6e 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
     {
         protected override string Header => "Updates";
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuConfigManager config, OsuGameBase game, UpdateManager updateManager)
         {
             Add(new SettingsEnumDropdown<ReleaseStream>
@@ -22,12 +22,15 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
-            Add(new SettingsButton
+            if (game != null && updateManager != null)
             {
-                Text = "Check for updates",
-                Action = updateManager.CheckForUpdate,
-                Enabled = { Value = game.IsDeployedBuild }
-            });
+                Add(new SettingsButton
+                {
+                    Text = "Check for updates",
+                    Action = updateManager.CheckForUpdate,
+                    Enabled = { Value = game.IsDeployedBuild }
+                });
+            }
 
             if (RuntimeInfo.IsDesktop)
             {

From 477bd7fa613c75a6b535324cf59e42bdb7dce669 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 8 May 2020 00:35:27 +0200
Subject: [PATCH 02611/10326] Change to Resolved attribute

---
 .../Overlays/Settings/Sections/General/UpdateSettings.cs  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 23ca752f6e..5af6a060ee 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -11,10 +11,16 @@ namespace osu.Game.Overlays.Settings.Sections.General
 {
     public class UpdateSettings : SettingsSubsection
     {
+        [Resolved(CanBeNull = true)]
+        private OsuGameBase game { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private UpdateManager updateManager { get; set; }
+
         protected override string Header => "Updates";
 
         [BackgroundDependencyLoader(true)]
-        private void load(Storage storage, OsuConfigManager config, OsuGameBase game, UpdateManager updateManager)
+        private void load(Storage storage, OsuConfigManager config)
         {
             Add(new SettingsEnumDropdown<ReleaseStream>
             {

From a7792070bc01f4108515f665f5ff17dc750c25e4 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 8 May 2020 01:08:17 +0200
Subject: [PATCH 02612/10326] Final changes to DI fields and values

---
 .../Settings/Sections/General/UpdateSettings.cs        | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 5af6a060ee..58966e8a4c 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -11,16 +11,13 @@ namespace osu.Game.Overlays.Settings.Sections.General
 {
     public class UpdateSettings : SettingsSubsection
     {
-        [Resolved(CanBeNull = true)]
-        private OsuGameBase game { get; set; }
-
         [Resolved(CanBeNull = true)]
         private UpdateManager updateManager { get; set; }
 
         protected override string Header => "Updates";
 
-        [BackgroundDependencyLoader(true)]
-        private void load(Storage storage, OsuConfigManager config)
+        [BackgroundDependencyLoader]
+        private void load(Storage storage, OsuConfigManager config, OsuGameBase game)
         {
             Add(new SettingsEnumDropdown<ReleaseStream>
             {
@@ -28,7 +25,8 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
-            if (game != null && updateManager != null)
+            // We shouldn't display the button for the base UpdateManager (without updating logic)
+            if (updateManager != null && updateManager.GetType() != typeof(UpdateManager))
             {
                 Add(new SettingsButton
                 {

From 75e65766ffcf0e3e1820407534bcd0104d469adb Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 8 May 2020 01:09:16 +0200
Subject: [PATCH 02613/10326] Annotate dependency

---
 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 00b967c243..899056e179 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -609,7 +609,7 @@ namespace osu.Game
 
             loadComponentSingleFile(screenshotManager, Add);
 
-            // dependency on notification overlay
+            // dependency on notification overlay, dependent by settings overlay
             loadComponentSingleFile(CreateUpdateManager(), Add, true);
 
             // overlay elements

From e6ad28a1cbb66359faa430446ae1d7b1fbc75b64 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 8 May 2020 02:09:37 +0200
Subject: [PATCH 02614/10326] Use property instead of type checking

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs                  | 2 ++
 osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs | 4 ++--
 osu.Game/Updater/SimpleUpdateManager.cs                       | 2 ++
 osu.Game/Updater/UpdateManager.cs                             | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index b287dd6527..2834f1f71d 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -22,6 +22,8 @@ namespace osu.Desktop.Updater
 {
     public class SquirrelUpdateManager : osu.Game.Updater.UpdateManager
     {
+        public override bool CanPerformUpdate => true;
+
         private UpdateManager updateManager;
         private NotificationOverlay notificationOverlay;
 
diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 58966e8a4c..b832e8930a 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -25,8 +25,8 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
-            // We shouldn't display the button for the base UpdateManager (without updating logic)
-            if (updateManager != null && updateManager.GetType() != typeof(UpdateManager))
+            // We should only display the button for UpdateManagers that do update the client
+            if (updateManager != null && updateManager.CanPerformUpdate)
             {
                 Add(new SettingsButton
                 {
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 41248ed796..5cc42090f4 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Updater
     /// </summary>
     public class SimpleUpdateManager : UpdateManager
     {
+        public override bool CanPerformUpdate => true;
+
         private string version;
 
         [Resolved]
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index f628bde324..f8c8bfe967 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Updater
     /// </summary>
     public class UpdateManager : CompositeDrawable
     {
+        public virtual bool CanPerformUpdate => false;
+
         [Resolved]
         private OsuConfigManager config { get; set; }
 

From 7f61f27be1e3031266110c0f64a812bc2a787829 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 8 May 2020 02:33:12 +0200
Subject: [PATCH 02615/10326] Use null-conditional operator when checking
 against UpdateManager

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index b832e8930a..6ea9c975de 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
             });
 
             // We should only display the button for UpdateManagers that do update the client
-            if (updateManager != null && updateManager.CanPerformUpdate)
+            if (updateManager?.CanPerformUpdate == true)
             {
                 Add(new SettingsButton
                 {

From 3c24ca08d042782166b0e1a7e1ce7297062e309e Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 8 May 2020 02:48:27 +0200
Subject: [PATCH 02616/10326] Check whether the build is deployed within the
 public check updates method

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs | 15 +++++++++------
 osu.Game/Updater/SimpleUpdateManager.cs      | 12 +++++++++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 2834f1f71d..a3b21b4bd9 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -26,6 +26,7 @@ namespace osu.Desktop.Updater
 
         private UpdateManager updateManager;
         private NotificationOverlay notificationOverlay;
+        private OsuGameBase gameBase;
 
         public Task PrepareUpdateAsync() => UpdateManager.RestartAppWhenExited();
 
@@ -34,16 +35,18 @@ namespace osu.Desktop.Updater
         [BackgroundDependencyLoader]
         private void load(NotificationOverlay notification, OsuGameBase game)
         {
+            gameBase = game;
             notificationOverlay = notification;
 
-            if (game.IsDeployedBuild)
-            {
-                Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
-                CheckForUpdate();
-            }
+            Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
+            CheckForUpdate();
         }
 
-        public override void CheckForUpdate() => Schedule(() => Task.Run(() => checkForUpdateAsync()));
+        public override void CheckForUpdate()
+        {
+            if (gameBase.IsDeployedBuild)
+                Schedule(() => Task.Run(() => checkForUpdateAsync()));
+        }
 
         private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
         {
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 5cc42090f4..8513ea94b4 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -26,16 +26,22 @@ namespace osu.Game.Updater
         [Resolved]
         private GameHost host { get; set; }
 
+        private OsuGameBase gameBase;
+
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game)
         {
+            gameBase = game;
             version = game.Version;
 
-            if (game.IsDeployedBuild)
-                CheckForUpdate();
+            CheckForUpdate();
         }
 
-        public override void CheckForUpdate() => Schedule(() => Task.Run(checkForUpdateAsync));
+        public override void CheckForUpdate()
+        {
+            if (gameBase.IsDeployedBuild)
+                Schedule(() => Task.Run(checkForUpdateAsync));
+        }
 
         private async void checkForUpdateAsync()
         {

From ebd1df8c2822a76c683b1b0f01e6e7677c3a8f70 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Fri, 8 May 2020 02:50:58 +0200
Subject: [PATCH 02617/10326] Change property name to CanCheckForUpdate

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs                 | 2 +-
 .../Overlays/Settings/Sections/General/UpdateSettings.cs     | 4 ++--
 osu.Game/Updater/SimpleUpdateManager.cs                      | 2 +-
 osu.Game/Updater/UpdateManager.cs                            | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index a3b21b4bd9..5c553f18f4 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -22,7 +22,7 @@ namespace osu.Desktop.Updater
 {
     public class SquirrelUpdateManager : osu.Game.Updater.UpdateManager
     {
-        public override bool CanPerformUpdate => true;
+        public override bool CanCheckForUpdate => true;
 
         private UpdateManager updateManager;
         private NotificationOverlay notificationOverlay;
diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index b832e8930a..cadffd9d86 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -25,8 +25,8 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
-            // We should only display the button for UpdateManagers that do update the client
-            if (updateManager != null && updateManager.CanPerformUpdate)
+            // We should only display the button for UpdateManagers that do check for updates
+            if (updateManager != null && updateManager.CanCheckForUpdate)
             {
                 Add(new SettingsButton
                 {
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 8513ea94b4..d4e8aed5ae 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Updater
     /// </summary>
     public class SimpleUpdateManager : UpdateManager
     {
-        public override bool CanPerformUpdate => true;
+        public override bool CanCheckForUpdate => true;
 
         private string version;
 
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index f8c8bfe967..41bbfb76a5 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -17,7 +17,10 @@ namespace osu.Game.Updater
     /// </summary>
     public class UpdateManager : CompositeDrawable
     {
-        public virtual bool CanPerformUpdate => false;
+        /// <summary>
+        /// Whether this UpdateManager is capable of checking for updates.
+        /// </summary>
+        public virtual bool CanCheckForUpdate => false;
 
         [Resolved]
         private OsuConfigManager config { get; set; }

From b6f232e39428ce2e056c821cf229c15717c1d134 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 May 2020 10:27:48 +0900
Subject: [PATCH 02618/10326] 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 8214fa2f2c..af699af1ba 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.502.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.507.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9db5fe562c..47804ed06e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.502.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.507.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 82253a0418..86cffa9fba 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.Framework.iOS" Version="2020.502.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.507.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.502.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.507.0" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From d6840d880a0df25e310c7ee32f7427f0d4baf675 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 May 2020 10:38:31 +0900
Subject: [PATCH 02619/10326] Update StableStorage implementation in line with
 framework changes

---
 osu.Desktop/OsuGameDesktop.cs           | 78 +++++++++++------------
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 84 +++++++++++--------------
 2 files changed, 72 insertions(+), 90 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index f05ee48914..9351e17419 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -6,15 +6,14 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.Win32;
 using osu.Desktop.Overlays;
 using osu.Framework.Platform;
 using osu.Game;
 using osuTK.Input;
-using Microsoft.Win32;
 using osu.Desktop.Updater;
 using osu.Framework;
 using osu.Framework.Logging;
-using osu.Framework.Platform.Windows;
 using osu.Framework.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Updater;
@@ -37,7 +36,11 @@ namespace osu.Desktop
             try
             {
                 if (Host is DesktopGameHost desktopHost)
-                    return new StableStorage(desktopHost);
+                {
+                    string stablePath = getStableInstallPath();
+                    if (!string.IsNullOrEmpty(stablePath))
+                        return new DesktopStorage(stablePath, desktopHost);
+                }
             }
             catch (Exception)
             {
@@ -47,6 +50,35 @@ namespace osu.Desktop
             return null;
         }
 
+        private string getStableInstallPath()
+        {
+            static bool checkExists(string p) => Directory.Exists(Path.Combine(p, "Songs"));
+
+            string stableInstallPath;
+
+            try
+            {
+                using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+            }
+            catch
+            {
+            }
+
+            stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
+            if (checkExists(stableInstallPath))
+                return stableInstallPath;
+
+            stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
+            if (checkExists(stableInstallPath))
+                return stableInstallPath;
+
+            return null;
+        }
+
         protected override UpdateManager CreateUpdateManager()
         {
             switch (RuntimeInfo.OS)
@@ -111,45 +143,5 @@ namespace osu.Desktop
 
             Task.Factory.StartNew(() => Import(filePaths), TaskCreationOptions.LongRunning);
         }
-
-        /// <summary>
-        /// A method of accessing an osu-stable install in a controlled fashion.
-        /// </summary>
-        private class StableStorage : WindowsStorage
-        {
-            protected override string LocateBasePath()
-            {
-                static bool checkExists(string p) => Directory.Exists(Path.Combine(p, "Songs"));
-
-                string stableInstallPath;
-
-                try
-                {
-                    using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                        stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
-
-                    if (checkExists(stableInstallPath))
-                        return stableInstallPath;
-                }
-                catch
-                {
-                }
-
-                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
-                if (checkExists(stableInstallPath))
-                    return stableInstallPath;
-
-                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
-                if (checkExists(stableInstallPath))
-                    return stableInstallPath;
-
-                return null;
-            }
-
-            public StableStorage(DesktopGameHost host)
-                : base(string.Empty, host)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index eefa9fcfe6..53ba597a7e 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -8,7 +8,6 @@ using Microsoft.Win32;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Framework.Platform.Windows;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Legacy;
@@ -52,7 +51,12 @@ namespace osu.Game.Tournament.IPC
 
             try
             {
-                Storage = new StableStorage(host as DesktopGameHost);
+                var path = findStablePath();
+
+                if (string.IsNullOrEmpty(path))
+                    return null;
+
+                Storage = new DesktopStorage(path, host as DesktopGameHost);
 
                 const string file_ipc_filename = "ipc.txt";
                 const string file_ipc_state_filename = "ipc-state.txt";
@@ -145,64 +149,50 @@ namespace osu.Game.Tournament.IPC
             return Storage;
         }
 
-        /// <summary>
-        /// A method of accessing an osu-stable install in a controlled fashion.
-        /// </summary>
-        private class StableStorage : WindowsStorage
+        private string findStablePath()
         {
-            protected override string LocateBasePath()
-            {
-                static bool checkExists(string p)
-                {
-                    return File.Exists(Path.Combine(p, "ipc.txt"));
-                }
+            static bool checkExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
 
-                string stableInstallPath = string.Empty;
+            string stableInstallPath = string.Empty;
+
+            try
+            {
+                try
+                {
+                    stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
+
+                    if (checkExists(stableInstallPath))
+                        return stableInstallPath;
+                }
+                catch
+                {
+                }
 
                 try
                 {
-                    try
-                    {
-                        stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
+                    using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                        stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
 
-                        if (checkExists(stableInstallPath))
-                            return stableInstallPath;
-                    }
-                    catch
-                    {
-                    }
-
-                    try
-                    {
-                        using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                            stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
-
-                        if (checkExists(stableInstallPath))
-                            return stableInstallPath;
-                    }
-                    catch
-                    {
-                    }
-
-                    stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
                     if (checkExists(stableInstallPath))
                         return stableInstallPath;
-
-                    stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
-                    if (checkExists(stableInstallPath))
-                        return stableInstallPath;
-
-                    return null;
                 }
-                finally
+                catch
                 {
-                    Logger.Log($"Stable path for tourney usage: {stableInstallPath}");
                 }
-            }
 
-            public StableStorage(DesktopGameHost host)
-                : base(string.Empty, host)
+                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+
+                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+
+                return null;
+            }
+            finally
             {
+                Logger.Log($"Stable path for tourney usage: {stableInstallPath}");
             }
         }
     }

From af5e1f8298ad47fdbd783e3dedcb5ba0038aa898 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 May 2020 14:22:07 +0900
Subject: [PATCH 02620/10326] Commit autogenerated rider VCS settings update

---
 .idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
index 4bb9f4d2a0..7515e76054 100644
--- a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
+++ b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="2" />
+    <option name="vcsConfiguration" value="1" />
   </component>
 </project>
\ No newline at end of file

From 9f64882f371aeae723e646871cbdfe5bb250f168 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 May 2020 14:48:38 +0900
Subject: [PATCH 02621/10326] 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 af699af1ba..a406cdf08a 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.507.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.508.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 47804ed06e..5ccfaaac9e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.507.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.508.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 86cffa9fba..dc83d937f7 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.Framework.iOS" Version="2020.507.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.508.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.507.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.508.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 8b5de7403f317cd87be9315976632d08873b021a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 May 2020 15:12:29 +0900
Subject: [PATCH 02622/10326] Fix android usage of obsoleted VersionCode

---
 osu.Android/OsuGameAndroid.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 84f215f930..19ed7ffcf5 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -18,7 +18,8 @@ namespace osu.Android
 
                 try
                 {
-                    string versionName = packageInfo.VersionCode.ToString();
+                    // todo: needs checking before play store redeploy.
+                    string versionName = packageInfo.VersionName;
                     // undo play store version garbling
                     return new Version(int.Parse(versionName.Substring(0, 4)), int.Parse(versionName.Substring(4, 4)), int.Parse(versionName.Substring(8, 1)));
                 }

From c5589d278b17f30196272e26ac506dbfb2a3e46d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 May 2020 15:35:25 +0900
Subject: [PATCH 02623/10326] Revert "Commit autogenerated rider VCS settings
 update"

This reverts commit af5e1f8298ad47fdbd783e3dedcb5ba0038aa898.
---
 .idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
index 7515e76054..4bb9f4d2a0 100644
--- a/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
+++ b/.idea/.idea.osu.Desktop/.idea/projectSettingsUpdater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="1" />
+    <option name="vcsConfiguration" value="2" />
   </component>
 </project>
\ No newline at end of file

From 30dd158c33ef1c3968dd7432ffa3fc78f2aff460 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 8 May 2020 09:37:50 +0200
Subject: [PATCH 02624/10326] Rename property to AllowGameplayOverlays and
 update XMLDoc accordingly.

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 8 ++++----
 osu.Game/Screens/Play/Player.cs         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 57fbb7f1a5..e1c21209c2 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -488,13 +488,13 @@ namespace osu.Game.Rulesets.UI
         protected virtual ResumeOverlay CreateResumeOverlay() => null;
 
         /// <summary>
-        /// Whether to display the HUD with this ruleset.
-        /// Override to false to completely disable the display of the HUD with this ruleset.
+        /// Whether to display gameplay overlays with this ruleset.
+        /// Override to false to completely disable the display of gameplay overlays.
         /// </summary>
         /// <remarks>
-        /// HUD refers here to <see cref="HUDOverlay"/> in player as well as <see cref="BreakOverlay"/>.
+        /// Gameplay overlays refer here to <see cref="HUDOverlay"/> in player as well as <see cref="BreakOverlay"/>.
         /// </remarks>
-        public virtual bool DisplayHud => true;
+        public virtual bool AllowGameplayOverlays => true;
 
         /// <summary>
         /// Sets a replay to be used, overriding local input.
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 375976ea6c..acc8dc9c7c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Play
             addGameplayComponents(GameplayClockContainer, Beatmap.Value, playableBeatmap);
             addOverlayComponents(GameplayClockContainer, Beatmap.Value);
 
-            if (!DrawableRuleset.DisplayHud)
+            if (!DrawableRuleset.AllowGameplayOverlays)
             {
                 HUDOverlay.ShowHud.Value = false;
                 HUDOverlay.ShowHud.Disabled = true;

From a59db976d66fab80cb3035dd779c59db6070d68c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 May 2020 18:05:06 +0900
Subject: [PATCH 02625/10326] Fix loading a ruleset with a new version
 specification causing a crash

---
 osu.Game/Rulesets/RulesetInfo.cs  | 16 +++++++++++++++-
 osu.Game/Rulesets/RulesetStore.cs | 12 ++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/RulesetInfo.cs b/osu.Game/Rulesets/RulesetInfo.cs
index afd499cb9e..2e32b96084 100644
--- a/osu.Game/Rulesets/RulesetInfo.cs
+++ b/osu.Game/Rulesets/RulesetInfo.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Newtonsoft.Json;
 
 namespace osu.Game.Rulesets
@@ -15,7 +16,20 @@ namespace osu.Game.Rulesets
 
         public string ShortName { get; set; }
 
-        public string InstantiationInfo { get; set; }
+        private string instantiationInfo;
+
+        public string InstantiationInfo
+        {
+            get => instantiationInfo;
+            set => instantiationInfo = abbreviateInstantiationInfo(value);
+        }
+
+        private string abbreviateInstantiationInfo(string value)
+        {
+            // exclude version onwards, matching only on namespace and type.
+            // this is mainly to allow for new versions of already loaded rulesets to "upgrade" from old.
+            return string.Join(',', value.Split(',').Take(2));
+        }
 
         [JsonIgnore]
         public bool Available { get; set; }
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index f302f8700f..b8f2abd766 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -93,7 +93,9 @@ namespace osu.Game.Rulesets
                 // add any other modes
                 foreach (var r in instances.Where(r => !(r is ILegacyRuleset)))
                 {
-                    if (context.RulesetInfo.FirstOrDefault(ri => ri.InstantiationInfo == r.RulesetInfo.InstantiationInfo) == null)
+                    // todo: StartsWith can be changed to Equals on 2020-11-08
+                    // This is to give users enough time to have their database use new abbreviated info).
+                    if (context.RulesetInfo.FirstOrDefault(ri => r.RulesetInfo.InstantiationInfo.StartsWith(ri.InstantiationInfo)) == null)
                         context.RulesetInfo.Add(r.RulesetInfo);
                 }
 
@@ -104,13 +106,7 @@ namespace osu.Game.Rulesets
                 {
                     try
                     {
-                        var instanceInfo = ((Ruleset)Activator.CreateInstance(Type.GetType(r.InstantiationInfo, asm =>
-                        {
-                            // for the time being, let's ignore the version being loaded.
-                            // this allows for debug builds to successfully load rulesets (even though debug rulesets have a 0.0.0 version).
-                            asm.Version = null;
-                            return Assembly.Load(asm);
-                        }, null))).RulesetInfo;
+                        var instanceInfo = ((Ruleset)Activator.CreateInstance(Type.GetType(r.InstantiationInfo))).RulesetInfo;
 
                         r.Name = instanceInfo.Name;
                         r.ShortName = instanceInfo.ShortName;

From dcfef6b44383c48246ab2a648b13855d13e8834c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 8 May 2020 18:46:37 +0900
Subject: [PATCH 02626/10326] Add clear method to EditorBeatmap

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 2e8e03bc73..23c8c9f605 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 System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -201,6 +202,25 @@ namespace osu.Game.Screens.Edit
             updateHitObject(null, true);
         }
 
+        /// <summary>
+        /// Clears all <see cref="HitObjects"/> from this <see cref="EditorBeatmap"/>.
+        /// </summary>
+        public void Clear()
+        {
+            var removed = HitObjects.ToList();
+
+            mutableHitObjects.Clear();
+
+            foreach (var b in startTimeBindables)
+                b.Value.UnbindAll();
+            startTimeBindables.Clear();
+
+            foreach (var h in removed)
+                HitObjectRemoved?.Invoke(h);
+
+            updateHitObject(null, true);
+        }
+
         private void trackStartTime(HitObject hitObject)
         {
             startTimeBindables[hitObject] = hitObject.StartTimeBindable.GetBoundCopy();

From efff2bf15df6d588bcb6335c6bcac54c572fe23a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 8 May 2020 18:49:19 +0900
Subject: [PATCH 02627/10326] Add HitObject to DefaultsApplied event

---
 osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs     | 2 +-
 .../Objects/Drawables/Connections/FollowPointConnection.cs | 2 +-
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs   | 7 +++++--
 osu.Game/Rulesets/Objects/HitObject.cs                     | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index a6c3be7e5a..c3b4d2625e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -399,7 +399,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             public TestSlider()
             {
-                DefaultsApplied += () =>
+                DefaultsApplied += _ =>
                 {
                     HeadCircle.HitWindows = new TestHitWindows();
                     TailCircle.HitWindows = new TestHitWindows();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 6f09bbcd57..8a0ef22c4a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         private void bindEvents(DrawableOsuHitObject drawableObject)
         {
             drawableObject.HitObject.PositionBindable.BindValueChanged(_ => scheduleRefresh());
-            drawableObject.HitObject.DefaultsApplied += scheduleRefresh;
+            drawableObject.HitObject.DefaultsApplied += _ => scheduleRefresh();
         }
 
         private void scheduleRefresh()
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 0047142cbd..3838e52f9b 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             samplesBindable.CollectionChanged += (_, __) => loadSamples();
 
             updateState(ArmedState.Idle, true);
-            onDefaultsApplied();
+            apply(HitObject);
         }
 
         private void loadSamples()
@@ -175,7 +175,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
             AddInternal(Samples);
         }
 
-        private void onDefaultsApplied() => apply(HitObject);
+        private void onDefaultsApplied(HitObject hitObject)
+        {
+            apply(hitObject);
+        }
 
         private void apply(HitObject hitObject)
         {
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 9a8efdde84..cffbdbae08 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Objects
         /// <summary>
         /// Invoked after <see cref="ApplyDefaults"/> has completed on this <see cref="HitObject"/>.
         /// </summary>
-        public event Action DefaultsApplied;
+        public event Action<HitObject> DefaultsApplied;
 
         public readonly Bindable<double> StartTimeBindable = new BindableDouble();
 
@@ -124,7 +124,7 @@ namespace osu.Game.Rulesets.Objects
             foreach (var h in nestedHitObjects)
                 h.ApplyDefaults(controlPointInfo, difficulty);
 
-            DefaultsApplied?.Invoke();
+            DefaultsApplied?.Invoke(this);
         }
 
         protected virtual void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)

From 22dda3fe0231dc01c66591724097aef72e3c7f1a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 8 May 2020 18:49:58 +0900
Subject: [PATCH 02628/10326] Make ScrollingHitObjectContainer respond to
 defaults applied events

---
 .../Objects/Drawables/DrawableHitObject.cs    |  3 +
 .../Scrolling/ScrollingHitObjectContainer.cs  | 69 +++++++++++++------
 2 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 3838e52f9b..ba6571fe1a 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
     [Cached(typeof(DrawableHitObject))]
     public abstract class DrawableHitObject : SkinReloadableDrawable
     {
+        public event Action<DrawableHitObject> DefaultsApplied;
+
         public readonly HitObject HitObject;
 
         /// <summary>
@@ -178,6 +180,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private void onDefaultsApplied(HitObject hitObject)
         {
             apply(hitObject);
+            DefaultsApplied?.Invoke(this);
         }
 
         private void apply(HitObject hitObject)
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 57f58be55a..3e01bb1d31 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -16,17 +16,23 @@ namespace osu.Game.Rulesets.UI.Scrolling
     {
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+        private readonly Dictionary<DrawableHitObject, Cached> hitObjectInitialStateCache = new Dictionary<DrawableHitObject, Cached>();
 
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        private readonly LayoutValue initialStateCache = new LayoutValue(Invalidation.RequiredParentSizeToFit | Invalidation.DrawInfo);
+        // Responds to changes in the layout. When the layout is changes, all hit object states must be recomputed.
+        private readonly LayoutValue layoutCache = new LayoutValue(Invalidation.RequiredParentSizeToFit | Invalidation.DrawInfo);
+
+        // A combined cache across all hit object states to reduce per-update iterations.
+        // When invalidated, one or more (but not necessarily all) hitobject states must be re-validated.
+        private readonly Cached combinedObjCache = new Cached();
 
         public ScrollingHitObjectContainer()
         {
             RelativeSizeAxes = Axes.Both;
 
-            AddLayout(initialStateCache);
+            AddLayout(layoutCache);
         }
 
         [BackgroundDependencyLoader]
@@ -35,13 +41,14 @@ namespace osu.Game.Rulesets.UI.Scrolling
             direction.BindTo(scrollingInfo.Direction);
             timeRange.BindTo(scrollingInfo.TimeRange);
 
-            direction.ValueChanged += _ => initialStateCache.Invalidate();
-            timeRange.ValueChanged += _ => initialStateCache.Invalidate();
+            direction.ValueChanged += _ => layoutCache.Invalidate();
+            timeRange.ValueChanged += _ => layoutCache.Invalidate();
         }
 
         public override void Add(DrawableHitObject hitObject)
         {
-            initialStateCache.Invalidate();
+            combinedObjCache.Invalidate();
+            hitObject.DefaultsApplied += onDefaultsApplied;
             base.Add(hitObject);
         }
 
@@ -51,8 +58,10 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (result)
             {
-                initialStateCache.Invalidate();
+                combinedObjCache.Invalidate();
                 hitObjectInitialStateCache.Remove(hitObject);
+
+                hitObject.DefaultsApplied -= onDefaultsApplied;
             }
 
             return result;
@@ -60,23 +69,45 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         public override void Clear(bool disposeChildren = true)
         {
+            foreach (var h in Objects)
+                h.DefaultsApplied -= onDefaultsApplied;
+
             base.Clear(disposeChildren);
 
-            initialStateCache.Invalidate();
+            combinedObjCache.Invalidate();
             hitObjectInitialStateCache.Clear();
         }
 
+        private void onDefaultsApplied(DrawableHitObject drawableObject)
+        {
+            // The cache may not exist if the hitobject state hasn't been computed yet (e.g. if the hitobject was added + defaults applied in the same frame).
+            // In such a case, combinedObjCache will take care of updating the hitobject.
+            if (hitObjectInitialStateCache.TryGetValue(drawableObject, out var objCache))
+            {
+                combinedObjCache.Invalidate();
+                objCache.Invalidate();
+            }
+        }
+
         private float scrollLength;
 
         protected override void Update()
         {
             base.Update();
 
-            if (!initialStateCache.IsValid)
+            if (!layoutCache.IsValid)
             {
                 foreach (var cached in hitObjectInitialStateCache.Values)
                     cached.Invalidate();
+                combinedObjCache.Invalidate();
 
+                scrollingInfo.Algorithm.Reset();
+
+                layoutCache.Validate();
+            }
+
+            if (!combinedObjCache.IsValid)
+            {
                 switch (direction.Value)
                 {
                     case ScrollingDirection.Up:
@@ -89,15 +120,21 @@ namespace osu.Game.Rulesets.UI.Scrolling
                         break;
                 }
 
-                scrollingInfo.Algorithm.Reset();
-
                 foreach (var obj in Objects)
                 {
+                    if (!hitObjectInitialStateCache.TryGetValue(obj, out var objCache))
+                        objCache = hitObjectInitialStateCache[obj] = new Cached();
+
+                    if (objCache.IsValid)
+                        return;
+
                     computeLifetimeStartRecursive(obj);
                     computeInitialStateRecursive(obj);
+
+                    objCache.Validate();
                 }
 
-                initialStateCache.Validate();
+                combinedObjCache.Validate();
             }
         }
 
@@ -109,8 +146,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 computeLifetimeStartRecursive(obj);
         }
 
-        private readonly Dictionary<DrawableHitObject, Cached> hitObjectInitialStateCache = new Dictionary<DrawableHitObject, Cached>();
-
         private double computeOriginAdjustedLifetimeStart(DrawableHitObject hitObject)
         {
             float originAdjustment = 0.0f;
@@ -142,12 +177,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
         // Cant use AddOnce() since the delegate is re-constructed every invocation
         private void computeInitialStateRecursive(DrawableHitObject hitObject) => hitObject.Schedule(() =>
         {
-            if (!hitObjectInitialStateCache.TryGetValue(hitObject, out var cached))
-                cached = hitObjectInitialStateCache[hitObject] = new Cached();
-
-            if (cached.IsValid)
-                return;
-
             if (hitObject.HitObject is IHasEndTime e)
             {
                 switch (direction.Value)
@@ -171,8 +200,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 // Nested hitobjects don't need to scroll, but they do need accurate positions
                 updatePosition(obj, hitObject.HitObject.StartTime);
             }
-
-            cached.Validate();
         });
 
         protected override void UpdateAfterChildrenLife()

From d67facf8e4c28443840af1519ec7be669ef552d3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 8 May 2020 18:50:06 +0900
Subject: [PATCH 02629/10326] Add test scene

---
 .../TestSceneManiaHitObjectComposer.cs        | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
index 286e3f6e50..1554a956a2 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
@@ -10,10 +10,13 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit;
+using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -48,6 +51,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             DrawableHitObject lastObject = null;
             Vector2 originalPosition = Vector2.Zero;
 
+            setScrollStep(ScrollingDirection.Up);
+
             AddStep("seek to last object", () =>
             {
                 lastObject = this.ChildrenOfType<DrawableHitObject>().Single(d => d.HitObject == composer.EditorBeatmap.HitObjects.Last());
@@ -81,7 +86,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             DrawableHitObject lastObject = null;
             Vector2 originalPosition = Vector2.Zero;
 
-            AddStep("set down scroll", () => ((Bindable<ScrollingDirection>)composer.Composer.ScrollingInfo.Direction).Value = ScrollingDirection.Down);
+            setScrollStep(ScrollingDirection.Down);
 
             AddStep("seek to last object", () =>
             {
@@ -116,6 +121,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             DrawableHitObject lastObject = null;
             Vector2 originalPosition = Vector2.Zero;
 
+            setScrollStep(ScrollingDirection.Down);
+
             AddStep("seek to last object", () =>
             {
                 lastObject = this.ChildrenOfType<DrawableHitObject>().Single(d => d.HitObject == composer.EditorBeatmap.HitObjects.Last());
@@ -147,6 +154,46 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("hitobjects not moved vertically", () => lastObject.DrawPosition.Y - originalPosition.Y <= DefaultNotePiece.NOTE_HEIGHT);
         }
 
+        [Test]
+        public void TestDragHoldNoteSelectionVertically()
+        {
+            setScrollStep(ScrollingDirection.Down);
+
+            AddStep("setup beatmap", () =>
+            {
+                composer.EditorBeatmap.Clear();
+                composer.EditorBeatmap.Add(new HoldNote
+                {
+                    Column = 1,
+                    EndTime = 200
+                });
+            });
+
+            DrawableHoldNote holdNote = null;
+
+            AddStep("grab hold note", () =>
+            {
+                holdNote = this.ChildrenOfType<DrawableHoldNote>().FirstOrDefault();
+                InputManager.MoveMouseTo(holdNote);
+                InputManager.PressButton(MouseButton.Left);
+            });
+
+            AddStep("move drag upwards", () =>
+            {
+                InputManager.MoveMouseTo(holdNote, new Vector2(0, -100));
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddAssert("head note positioned correctly", () => Precision.AlmostEquals(holdNote.ScreenSpaceDrawQuad.BottomLeft, holdNote.Head.ScreenSpaceDrawQuad.BottomLeft));
+            AddAssert("tail note positioned correctly", () => Precision.AlmostEquals(holdNote.ScreenSpaceDrawQuad.TopLeft, holdNote.Tail.ScreenSpaceDrawQuad.BottomLeft));
+
+            AddAssert("head blueprint positioned correctly", () => this.ChildrenOfType<HoldNoteNoteSelectionBlueprint>().ElementAt(0).DrawPosition == holdNote.Head.DrawPosition);
+            AddAssert("tail blueprint positioned correctly", () => this.ChildrenOfType<HoldNoteNoteSelectionBlueprint>().ElementAt(1).DrawPosition == holdNote.Tail.DrawPosition);
+        }
+
+        private void setScrollStep(ScrollingDirection direction)
+            => AddStep($"set scroll direction = {direction}", () => ((Bindable<ScrollingDirection>)composer.Composer.ScrollingInfo.Direction).Value = direction);
+
         private class TestComposer : CompositeDrawable
         {
             [Cached(typeof(EditorBeatmap))]

From abd1115c6d1dcf068e7eccd48a987dc27fe54839 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 May 2020 19:08:43 +0900
Subject: [PATCH 02630/10326] Fix test failures

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d9f9e2de42..cf39c03f9d 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -302,7 +302,8 @@ namespace osu.Game
         {
             base.SetHost(host);
 
-            Storage = new OsuStorage(host);
+            if (Storage == null) // may be non-null for certain tests
+                Storage = new OsuStorage(host);
 
             if (LocalConfig == null)
                 LocalConfig = new OsuConfigManager(Storage);

From 1a31e1f10fe91f646e18b285c6312a4d8ebf86be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 May 2020 19:13:41 +0900
Subject: [PATCH 02631/10326] Also check for AffectsCombo to avoid too many
 passing switches

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 027fe1f302..8cf8b9e05d 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -35,8 +35,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
             LastResult.BindValueChanged(result =>
             {
+                var r = result.NewValue;
+
+                bool passing = r == null || (r.Judgement.AffectsCombo && r.Type > HitResult.Miss);
+
                 foreach (var sprite in InternalChildren.OfType<ScrollerSprite>())
-                    sprite.Passing = result.NewValue == null || result.NewValue.Type > HitResult.Miss;
+                    sprite.Passing = passing;
             }, true);
         }
 

From 115cbf25ae21c9f1a1d950f0783c875ff3bfd082 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 May 2020 19:15:19 +0900
Subject: [PATCH 02632/10326] Fix new sprites not getting spawned with correct
 passing state

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 8cf8b9e05d..9ddfe75b40 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 ((IBindable<JudgementResult>)LastResult).BindTo(gameplayBeatmap.LastJudgementResult);
         }
 
+        private bool passing;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -37,7 +39,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             {
                 var r = result.NewValue;
 
-                bool passing = r == null || (r.Judgement.AffectsCombo && r.Type > HitResult.Miss);
+                passing = r == null || (r.Judgement.AffectsCombo && r.Type > HitResult.Miss);
 
                 foreach (var sprite in InternalChildren.OfType<ScrollerSprite>())
                     sprite.Passing = passing;
@@ -71,7 +73,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 if (last != null && last.ScreenSpaceDrawQuad.TopRight.X >= ScreenSpaceDrawQuad.TopRight.X)
                     break;
 
-                AddInternal(new ScrollerSprite());
+                AddInternal(new ScrollerSprite
+                {
+                    Passing = passing
+                });
             }
         }
 

From be3b77cf25708ceb77d14d830a473f09d0403bfc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 8 May 2020 20:09:59 +0900
Subject: [PATCH 02633/10326] Fix potentially skipping hitobject updates

---
 osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 3e01bb1d31..ea72061216 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                         objCache = hitObjectInitialStateCache[obj] = new Cached();
 
                     if (objCache.IsValid)
-                        return;
+                        continue;
 
                     computeLifetimeStartRecursive(obj);
                     computeInitialStateRecursive(obj);

From 5c2778d5f08288211a1cd57b14beb85e456a513b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 May 2020 20:33:02 +0900
Subject: [PATCH 02634/10326] Change comparison direction

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

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index b8f2abd766..b3026bf2b7 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets
                 {
                     // todo: StartsWith can be changed to Equals on 2020-11-08
                     // This is to give users enough time to have their database use new abbreviated info).
-                    if (context.RulesetInfo.FirstOrDefault(ri => r.RulesetInfo.InstantiationInfo.StartsWith(ri.InstantiationInfo)) == null)
+                    if (context.RulesetInfo.FirstOrDefault(ri => ri.InstantiationInfo.StartsWith(r.RulesetInfo.InstantiationInfo)) == null)
                         context.RulesetInfo.Add(r.RulesetInfo);
                 }
 

From d1976b194d9bd2314775eb56dcbb1125738d0075 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 9 May 2020 10:42:56 +0300
Subject: [PATCH 02635/10326] Check local availability before disabling buttons

---
 .../BeatmapListing/Panels/BeatmapPanelDownloadButton.cs         | 2 +-
 osu.Game/Overlays/BeatmapSet/Header.cs                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
index 589f2d5072..6d5862ee2b 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         [BackgroundDependencyLoader(true)]
         private void load(OsuGame game, BeatmapManager beatmaps, OsuConfigManager osuConfig)
         {
-            if (BeatmapSet.Value?.OnlineInfo?.Availability?.DownloadDisabled ?? false)
+            if ((BeatmapSet.Value?.OnlineInfo?.Availability?.DownloadDisabled ?? false) && State.Value != DownloadState.LocallyAvailable)
             {
                 button.Enabled.Value = false;
                 button.TooltipText = "this beatmap is currently not available for download.";
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 1ff08aab2c..06e31277dd 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -264,7 +264,7 @@ namespace osu.Game.Overlays.BeatmapSet
         {
             if (BeatmapSet.Value == null) return;
 
-            if (BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false)
+            if ((BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false) && State.Value != DownloadState.LocallyAvailable)
             {
                 downloadButtonsContainer.Clear();
                 return;

From 74cbe9306c6403c4bb7e99303306b1be194666c3 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Sat, 9 May 2020 16:39:46 +0800
Subject: [PATCH 02636/10326] Use strongly-typed JsonConerter.

---
 .../Serialization/Converters/TypedListConverter.cs | 12 ++++--------
 .../Serialization/Converters/Vector2Converter.cs   | 14 +++++---------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
index 64f1ebeb1a..25fe335047 100644
--- a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
+++ b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
@@ -14,7 +14,7 @@ namespace osu.Game.IO.Serialization.Converters
     /// reconstruct the objects with their original types.
     /// </summary>
     /// <typeparam name="T">The type of objects contained in the <see cref="List{T}"/> this attribute is attached to.</typeparam>
-    public class TypedListConverter<T> : JsonConverter
+    public class TypedListConverter<T> : JsonConverter<List<T>>
     {
         private readonly bool requiresTypeVersion;
 
@@ -36,9 +36,7 @@ namespace osu.Game.IO.Serialization.Converters
             this.requiresTypeVersion = requiresTypeVersion;
         }
 
-        public override bool CanConvert(Type objectType) => objectType == typeof(List<T>);
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        public override List<T> ReadJson(JsonReader reader, Type objectType, List<T> existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
             var list = new List<T>();
 
@@ -59,14 +57,12 @@ namespace osu.Game.IO.Serialization.Converters
             return list;
         }
 
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        public override void WriteJson(JsonWriter writer, List<T> value, JsonSerializer serializer)
         {
-            var list = (IEnumerable<T>)value;
-
             var lookupTable = new List<string>();
             var objects = new List<JObject>();
 
-            foreach (var item in list)
+            foreach (var item in value)
             {
                 var type = item.GetType();
                 var assemblyName = type.Assembly.GetName();
diff --git a/osu.Game/IO/Serialization/Converters/Vector2Converter.cs b/osu.Game/IO/Serialization/Converters/Vector2Converter.cs
index bf5edeef94..46447b607b 100644
--- a/osu.Game/IO/Serialization/Converters/Vector2Converter.cs
+++ b/osu.Game/IO/Serialization/Converters/Vector2Converter.cs
@@ -11,26 +11,22 @@ namespace osu.Game.IO.Serialization.Converters
     /// <summary>
     /// A type of <see cref="JsonConverter"/> that serializes only the X and Y coordinates of a <see cref="Vector2"/>.
     /// </summary>
-    public class Vector2Converter : JsonConverter
+    public class Vector2Converter : JsonConverter<Vector2>
     {
-        public override bool CanConvert(Type objectType) => objectType == typeof(Vector2);
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        public override Vector2 ReadJson(JsonReader reader, Type objectType, Vector2 existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
             var obj = JObject.Load(reader);
             return new Vector2((float)obj["x"], (float)obj["y"]);
         }
 
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        public override void WriteJson(JsonWriter writer, Vector2 value, JsonSerializer serializer)
         {
-            var vector = (Vector2)value;
-
             writer.WriteStartObject();
 
             writer.WritePropertyName("x");
-            writer.WriteValue(vector.X);
+            writer.WriteValue(value.X);
             writer.WritePropertyName("y");
-            writer.WriteValue(vector.Y);
+            writer.WriteValue(value.Y);
 
             writer.WriteEndObject();
         }

From 55e0d91f37591061869917968a0897ff10ef726d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 9 May 2020 18:09:17 +0900
Subject: [PATCH 02637/10326] Fix download button being disabled after
 importing a download disabled beatmap

---
 .../Panels/BeatmapPanelDownloadButton.cs      | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
index 6d5862ee2b..67782dfe3f 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
@@ -50,13 +50,6 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         [BackgroundDependencyLoader(true)]
         private void load(OsuGame game, BeatmapManager beatmaps, OsuConfigManager osuConfig)
         {
-            if ((BeatmapSet.Value?.OnlineInfo?.Availability?.DownloadDisabled ?? false) && State.Value != DownloadState.LocallyAvailable)
-            {
-                button.Enabled.Value = false;
-                button.TooltipText = "this beatmap is currently not available for download.";
-                return;
-            }
-
             noVideoSetting = osuConfig.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
             button.Action = () =>
@@ -81,6 +74,26 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                         break;
                 }
             };
+
+            State.BindValueChanged(state =>
+            {
+                switch (state.NewValue)
+                {
+                    case DownloadState.LocallyAvailable:
+                        button.Enabled.Value = true;
+                        button.TooltipText = string.Empty;
+                        break;
+
+                    default:
+                        if (BeatmapSet.Value?.OnlineInfo?.Availability?.DownloadDisabled ?? false)
+                        {
+                            button.Enabled.Value = false;
+                            button.TooltipText = "this beatmap is currently not available for download.";
+                        }
+
+                        break;
+                }
+            }, true);
         }
     }
 }

From 80a193a61608397d3a0b01e6e115445d2e26783b Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Sat, 9 May 2020 17:34:40 +0800
Subject: [PATCH 02638/10326] Use IEnumerable<T> for TypedListConverter.

---
 .../IO/Serialization/Converters/TypedListConverter.cs  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
index 25fe335047..ec0036dae2 100644
--- a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
+++ b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
@@ -9,12 +9,12 @@ using Newtonsoft.Json.Linq;
 namespace osu.Game.IO.Serialization.Converters
 {
     /// <summary>
-    /// A type of <see cref="JsonConverter"/> that serializes a <see cref="List{T}"/> alongside
+    /// A type of <see cref="JsonConverter"/> that serializes an <see cref="IEnumerable{T}"/> alongside
     /// a lookup table for the types contained. The lookup table is used in deserialization to
     /// reconstruct the objects with their original types.
     /// </summary>
-    /// <typeparam name="T">The type of objects contained in the <see cref="List{T}"/> this attribute is attached to.</typeparam>
-    public class TypedListConverter<T> : JsonConverter<List<T>>
+    /// <typeparam name="T">The type of objects contained in the <see cref="IEnumerable{T}"/> this attribute is attached to.</typeparam>
+    public class TypedListConverter<T> : JsonConverter<IEnumerable<T>>
     {
         private readonly bool requiresTypeVersion;
 
@@ -36,7 +36,7 @@ namespace osu.Game.IO.Serialization.Converters
             this.requiresTypeVersion = requiresTypeVersion;
         }
 
-        public override List<T> ReadJson(JsonReader reader, Type objectType, List<T> existingValue, bool hasExistingValue, JsonSerializer serializer)
+        public override IEnumerable<T> ReadJson(JsonReader reader, Type objectType, IEnumerable<T> existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
             var list = new List<T>();
 
@@ -57,7 +57,7 @@ namespace osu.Game.IO.Serialization.Converters
             return list;
         }
 
-        public override void WriteJson(JsonWriter writer, List<T> value, JsonSerializer serializer)
+        public override void WriteJson(JsonWriter writer, IEnumerable<T> value, JsonSerializer serializer)
         {
             var lookupTable = new List<string>();
             var objects = new List<JObject>();

From fa711a6456a4ca25eb74a3fda8da3977e13a8a63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 9 May 2020 19:11:51 +0900
Subject: [PATCH 02639/10326] Fix null reference causing hard freeze if game is
 forcefully closed during disclaimer

---
 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 fdc8d94352..b86be9858f 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -914,7 +914,7 @@ namespace osu.Game
             if (ScreenStack.CurrentScreen is Loader)
                 return false;
 
-            if (introScreen.DidLoadMenu && !(ScreenStack.CurrentScreen is IntroScreen))
+            if (introScreen?.DidLoadMenu == true && !(ScreenStack.CurrentScreen is IntroScreen))
             {
                 Scheduler.Add(introScreen.MakeCurrent);
                 return true;

From 3f78ddf482b7b74c399aa4adf0791156813860e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 9 May 2020 19:13:18 +0900
Subject: [PATCH 02640/10326] Add CanBeNull hinting

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index b86be9858f..3caffb6db5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -18,6 +18,7 @@ using osu.Game.Screens.Menu;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Development;
@@ -97,6 +98,7 @@ namespace osu.Game
 
         private MainMenu menuScreen;
 
+        [CanBeNull]
         private IntroScreen introScreen;
 
         private Bindable<int> configRuleset;

From bbebd26efb46b2091a53a966c08faca896b20e15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 9 May 2020 20:13:31 +0900
Subject: [PATCH 02641/10326] Use DirectoryInfo in more places

---
 osu.Game/IO/OsuStorage.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 955aae7b68..e178cb0a02 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -41,20 +41,18 @@ namespace osu.Game.IO
 
         public void Migrate(string newLocation)
         {
-            string oldLocation = GetFullPath(".");
+            var source = new DirectoryInfo(GetFullPath("."));
+            var destination = new DirectoryInfo(newLocation);
 
             // ensure the new location has no files present, else hard abort
-            if (Directory.Exists(newLocation))
+            if (destination.Exists)
             {
-                if (Directory.GetFiles(newLocation).Length > 0)
+                if (destination.GetFiles().Length > 0)
                     throw new InvalidOperationException("Migration destination already has files present");
 
-                Directory.Delete(newLocation, true);
+                deleteRecursive(destination);
             }
 
-            var source = new DirectoryInfo(oldLocation);
-            var destination = new DirectoryInfo(newLocation);
-
             copyRecursive(source, destination);
 
             ChangeTargetStorage(host.GetStorage(newLocation));

From 5dda94187e54d3980507872f69947330a5bfc62d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 9 May 2020 20:13:37 +0900
Subject: [PATCH 02642/10326] Add more edge case testing

---
 .../NonVisual/CustomDataDirectoryTest.cs      | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 7f08fad5be..8688ecd078 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -123,6 +123,56 @@ namespace osu.Game.Tests.NonVisual
             }
         }
 
+        [Test]
+        public void TestMigrationBetweenTwoTargets()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationBetweenTwoTargets)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+                    var storage = osu.Dependencies.Get<Storage>();
+
+                    string customPath2 = $"{customPath}-2";
+
+                    const string database_filename = "client.db";
+
+                    Assert.DoesNotThrow(() => (storage as OsuStorage)?.Migrate(customPath));
+                    Assert.That(File.Exists(Path.Combine(customPath, database_filename)));
+
+                    Assert.DoesNotThrow(() => (storage as OsuStorage)?.Migrate(customPath2));
+                    Assert.That(File.Exists(Path.Combine(customPath2, database_filename)));
+
+                    Assert.DoesNotThrow(() => (storage as OsuStorage)?.Migrate(customPath));
+                    Assert.That(File.Exists(Path.Combine(customPath, database_filename)));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public void TestMigrationToSameTargetFails()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationToSameTargetFails)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+                    var storage = osu.Dependencies.Get<Storage>();
+
+                    Assert.DoesNotThrow(() => (storage as OsuStorage)?.Migrate(customPath));
+                    Assert.Throws<InvalidOperationException>(() => (storage as OsuStorage)?.Migrate(customPath));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         private OsuGameBase loadOsu(GameHost host)
         {
             var osu = new OsuGameBase();

From 3565fe1cb27602557d3b6e8522feb2e792f08a67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 10 May 2020 07:51:39 +0900
Subject: [PATCH 02643/10326] Fix incorrect passing logic

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 9ddfe75b40..8f2c25e9b2 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -39,7 +39,11 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             {
                 var r = result.NewValue;
 
-                passing = r == null || (r.Judgement.AffectsCombo && r.Type > HitResult.Miss);
+                // always ignore hitobjects that don't affect combo (drumroll ticks etc.)
+                if (r?.Judgement.AffectsCombo == false)
+                    return;
+
+                passing = r == null || r.Type > HitResult.Miss;
 
                 foreach (var sprite in InternalChildren.OfType<ScrollerSprite>())
                     sprite.Passing = passing;

From 5902cd81a40ed2fbf21a92f6bb041cc1d8b3bcd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 10 May 2020 07:52:54 +0900
Subject: [PATCH 02644/10326] Move passing transforms to post-load for safety

---
 .../Skinning/LegacyTaikoScroller.cs           | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 8f2c25e9b2..1ecdb839fb 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -101,16 +101,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                     passing = value;
 
-                    if (passing)
-                    {
-                        passingSprite.Show();
-                        failingSprite.FadeOut(200);
-                    }
-                    else
-                    {
-                        failingSprite.FadeIn(200);
-                        passingSprite.Delay(200).FadeOut();
-                    }
+                    if (IsLoaded)
+                        updatePassing();
                 }
             }
 
@@ -127,6 +119,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     passingSprite = new Sprite { Texture = skin.GetTexture("taiko-slider") },
                     failingSprite = new Sprite { Texture = skin.GetTexture("taiko-slider-fail"), Alpha = 0 },
                 };
+
+                updatePassing();
             }
 
             protected override void Update()
@@ -136,6 +130,20 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 foreach (var c in InternalChildren)
                     c.Scale = new Vector2(DrawHeight / c.Height);
             }
+
+            private void updatePassing()
+            {
+                if (passing)
+                {
+                    passingSprite.Show();
+                    failingSprite.FadeOut(200);
+                }
+                else
+                {
+                    failingSprite.FadeIn(200);
+                    passingSprite.Delay(200).FadeOut();
+                }
+            }
         }
     }
 }

From 384862d48b5e614488ca4d19354c2481aca74a8d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 10 May 2020 13:17:37 +0900
Subject: [PATCH 02645/10326] Fix incorrect relative paths when using
 GetStorageForDirectory

---
 .../NonVisual/CustomDataDirectoryTest.cs      | 45 ++++++++++++++++++-
 osu.Game/IO/WrappedStorage.cs                 | 12 ++++-
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index d741bc5de1..7c559ea6d2 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -36,6 +37,8 @@ namespace osu.Game.Tests.NonVisual
             }
         }
 
+        private string customPath => Path.Combine(Environment.CurrentDirectory, "custom-path");
+
         [Test]
         public void TestCustomDirectory()
         {
@@ -49,7 +52,7 @@ namespace osu.Game.Tests.NonVisual
                 storage.DeleteDirectory(string.Empty);
 
                 using (var storageConfig = new StorageConfigManager(storage))
-                    storageConfig.Set(StorageConfig.FullPath, Path.Combine(Environment.CurrentDirectory, "custom-path"));
+                    storageConfig.Set(StorageConfig.FullPath, customPath);
 
                 try
                 {
@@ -58,7 +61,45 @@ namespace osu.Game.Tests.NonVisual
                     // switch to DI'd storage
                     storage = osu.Dependencies.Get<Storage>();
 
-                    Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(Environment.CurrentDirectory, "custom-path")));
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(customPath));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public void TestSubDirectoryLookup()
+        {
+            using (var host = new HeadlessGameHost(nameof(TestSubDirectoryLookup)))
+            {
+                string headlessPrefix = Path.Combine("headless", nameof(TestSubDirectoryLookup));
+
+                // need access before the game has constructed its own storage yet.
+                Storage storage = new DesktopStorage(headlessPrefix, host);
+                // manual cleaning so we can prepare a config file.
+                storage.DeleteDirectory(string.Empty);
+
+                using (var storageConfig = new StorageConfigManager(storage))
+                    storageConfig.Set(StorageConfig.FullPath, customPath);
+
+                try
+                {
+                    var osu = loadOsu(host);
+
+                    // switch to DI'd storage
+                    storage = osu.Dependencies.Get<Storage>();
+
+                    string actualTestFile = Path.Combine(customPath, "rulesets", "test");
+
+                    File.WriteAllText(actualTestFile, "test");
+
+                    var rulesetStorage = storage.GetStorageForDirectory("rulesets");
+                    var lookupPath = rulesetStorage.GetFiles(".").Single();
+
+                    Assert.That(lookupPath, Is.EqualTo("test"));
                 }
                 finally
                 {
diff --git a/osu.Game/IO/WrappedStorage.cs b/osu.Game/IO/WrappedStorage.cs
index 705bbf6840..cc59e2cc28 100644
--- a/osu.Game/IO/WrappedStorage.cs
+++ b/osu.Game/IO/WrappedStorage.cs
@@ -48,10 +48,18 @@ namespace osu.Game.IO
             UnderlyingStorage.Delete(MutatePath(path));
 
         public override IEnumerable<string> GetDirectories(string path) =>
-            UnderlyingStorage.GetDirectories(MutatePath(path));
+            ToLocalRelative(UnderlyingStorage.GetDirectories(MutatePath(path)));
+
+        public IEnumerable<string> ToLocalRelative(IEnumerable<string> paths)
+        {
+            string localRoot = GetFullPath(string.Empty);
+
+            foreach (var path in paths)
+                yield return Path.GetRelativePath(localRoot, UnderlyingStorage.GetFullPath(path));
+        }
 
         public override IEnumerable<string> GetFiles(string path, string pattern = "*") =>
-            UnderlyingStorage.GetFiles(MutatePath(path), pattern);
+            ToLocalRelative(UnderlyingStorage.GetFiles(MutatePath(path), pattern));
 
         public override Stream GetStream(string path, FileAccess access = FileAccess.Read, FileMode mode = FileMode.OpenOrCreate) =>
             UnderlyingStorage.GetStream(MutatePath(path), access, mode);

From 738c6da594f8a0838e33c7c0d8a73d3f79ef510a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 10 May 2020 13:39:20 +0900
Subject: [PATCH 02646/10326] Implement midi keybindings

---
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 58ca2143f9..01d5991d3e 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -250,6 +250,28 @@ namespace osu.Game.Overlays.KeyBinding
             finalise();
         }
 
+        protected override bool OnMidiDown(MidiDownEvent e)
+        {
+            if (!HasFocus)
+                return false;
+
+            bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState));
+            finalise();
+
+            return true;
+        }
+
+        protected override void OnMidiUp(MidiUpEvent e)
+        {
+            if (!HasFocus)
+            {
+                base.OnMidiUp(e);
+                return;
+            }
+
+            finalise();
+        }
+
         private void clear()
         {
             bindTarget.UpdateKeyCombination(InputKey.None);

From 2f12c4126a10676982cc301c58e98ab376d2f493 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 10 May 2020 13:49:08 +0900
Subject: [PATCH 02647/10326] Apply suggestions 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>
---
 .../TestSceneManiaHitObjectComposer.cs                          | 2 +-
 osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
index 1554a956a2..48159c817d 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddStep("grab hold note", () =>
             {
-                holdNote = this.ChildrenOfType<DrawableHoldNote>().FirstOrDefault();
+                holdNote = this.ChildrenOfType<DrawableHoldNote>().Single();
                 InputManager.MoveMouseTo(holdNote);
                 InputManager.PressButton(MouseButton.Left);
             });
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index ea72061216..15e625872d 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        // Responds to changes in the layout. When the layout is changes, all hit object states must be recomputed.
+        // Responds to changes in the layout. When the layout changes, all hit object states must be recomputed.
         private readonly LayoutValue layoutCache = new LayoutValue(Invalidation.RequiredParentSizeToFit | Invalidation.DrawInfo);
 
         // A combined cache across all hit object states to reduce per-update iterations.

From 44fdf1e6b05b033977287647e126e4ed99b898e4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 10 May 2020 20:09:41 +0900
Subject: [PATCH 02648/10326] Reword xmldoc

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 5f0a4b0975..9a10b7d1b2 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -488,12 +488,8 @@ namespace osu.Game.Rulesets.UI
         protected virtual ResumeOverlay CreateResumeOverlay() => null;
 
         /// <summary>
-        /// Whether to display gameplay overlays with this ruleset.
-        /// Override to false to completely disable the display of gameplay overlays.
+        /// Whether to display gameplay overlays, such as <see cref="HUDOverlay"/> and <see cref="BreakOverlay"/>.
         /// </summary>
-        /// <remarks>
-        /// Gameplay overlays refer here to <see cref="HUDOverlay"/> in player as well as <see cref="BreakOverlay"/>.
-        /// </remarks>
         public virtual bool AllowGameplayOverlays => true;
 
         /// <summary>

From 5bab53b04ce53325aab9991f2b811034580ef957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 10 May 2020 17:05:30 +0200
Subject: [PATCH 02649/10326] Centralise trail visibility state management

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 558555af96..9cce46d730 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 dashing = value;
 
-                trails.DisplayTrail = value || HyperDashing;
+                updateTrailVisibility();
             }
         }
 
@@ -255,10 +255,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 hyperDashDirection = 0;
 
                 if (wasHyperDashing)
-                {
-                    updateCatcherColour(false);
-                    trails.DisplayTrail &= Dashing;
-                }
+                    runHyperDashStateTransition(false);
             }
             else
             {
@@ -268,16 +265,18 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 if (!wasHyperDashing)
                 {
-                    updateCatcherColour(true);
-
-                    trails.DisplayTrail = true;
                     trails.DisplayEndGlow();
+                    runHyperDashStateTransition(true);
                 }
             }
         }
 
-        private void updateCatcherColour(bool hyperDashing)
+        private void runHyperDashStateTransition(bool hyperDashing)
         {
+            trails.HyperDashTrailsColour = hyperDashColour;
+            trails.EndGlowSpritesColour = hyperDashEndGlowColour;
+            updateTrailVisibility();
+
             if (hyperDashing)
             {
                 this.FadeColour(hyperDashColour, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
@@ -288,11 +287,10 @@ namespace osu.Game.Rulesets.Catch.UI
                 this.FadeColour(Color4.White, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
                 this.FadeTo(1f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
             }
-
-            trails.HyperDashTrailsColour = hyperDashColour;
-            trails.EndGlowSpritesColour = hyperDashEndGlowColour;
         }
 
+        private void updateTrailVisibility() => trails.DisplayTrail = Dashing || HyperDashing;
+
         public bool OnPressed(CatchAction action)
         {
             switch (action)
@@ -393,7 +391,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage)?.Value ??
                 hyperDashColour;
 
-            updateCatcherColour(HyperDashing);
+            runHyperDashStateTransition(HyperDashing);
         }
 
         protected override void Update()

From 1d999bb634de168c5acb1f3abbc5fd12d5596e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 10 May 2020 18:32:38 +0200
Subject: [PATCH 02650/10326] Integrate PeriodTracker changes

---
 .../Scoring/DrainingHealthProcessor.cs        | 56 +++++--------------
 1 file changed, 15 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index b36e42326c..1958efdd6f 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -5,9 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Scoring
 {
@@ -49,33 +49,7 @@ namespace osu.Game.Rulesets.Scoring
         private double targetMinimumHealth;
         private double drainRate = 1;
 
-        private readonly List<(double startTime, double endTime)> nonDrainSections = new List<(double, double)>();
-        private int currentNonDrainSection;
-
-        private bool isInNonDrainSection
-        {
-            get
-            {
-                if (nonDrainSections.Count == 0)
-                    return false;
-
-                var time = Time.Current;
-
-                if (time > nonDrainSections[currentNonDrainSection].endTime)
-                {
-                    while (time > nonDrainSections[currentNonDrainSection].endTime && currentNonDrainSection < nonDrainSections.Count - 1)
-                        currentNonDrainSection++;
-                }
-                else
-                {
-                    while (time < nonDrainSections[currentNonDrainSection].startTime && currentNonDrainSection > 0)
-                        currentNonDrainSection--;
-                }
-
-                var closestSection = nonDrainSections[currentNonDrainSection];
-                return time >= closestSection.startTime && time <= closestSection.endTime;
-            }
-        }
+        private PeriodTracker noDrainPeriodTracker;
 
         /// <summary>
         /// Creates a new <see cref="DrainingHealthProcessor"/>.
@@ -90,7 +64,7 @@ namespace osu.Game.Rulesets.Scoring
         {
             base.Update();
 
-            if (isInNonDrainSection)
+            if (noDrainPeriodTracker?.IsInAny(Time.Current) == true)
                 return;
 
             // When jumping in and out of gameplay time within a single frame, health should only be drained for the period within the gameplay time
@@ -102,23 +76,23 @@ namespace osu.Game.Rulesets.Scoring
 
         public override void ApplyBeatmap(IBeatmap beatmap)
         {
-            nonDrainSections.Clear();
-
             this.beatmap = beatmap;
 
             if (beatmap.HitObjects.Count > 0)
                 gameplayEndTime = beatmap.HitObjects[^1].GetEndTime();
 
-            // Ranges between the end of last hit object before a break
-            // and the start of first hit object after a break should
-            // not allow HP draining. (with break periods in)
-            foreach (BreakPeriod b in beatmap.Breaks)
-            {
-                var startTime = beatmap.HitObjects.LastOrDefault(h => h.GetEndTime() < b.StartTime)?.GetEndTime() ?? double.MinValue;
-                var endTime = beatmap.HitObjects.FirstOrDefault(h => h.StartTime > b.EndTime)?.StartTime ?? double.MaxValue;
-
-                nonDrainSections.Add((startTime, endTime));
-            }
+            noDrainPeriodTracker = new PeriodTracker(beatmap.Breaks.Select(breakPeriod => new Period(
+                beatmap.HitObjects
+                       .Select(hitObject => hitObject.GetEndTime())
+                       .Where(endTime => endTime < breakPeriod.StartTime)
+                       .DefaultIfEmpty(double.MinValue)
+                       .Last(),
+                beatmap.HitObjects
+                       .Select(hitObject => hitObject.StartTime)
+                       .Where(startTime => startTime > breakPeriod.EndTime)
+                       .DefaultIfEmpty(double.MaxValue)
+                       .First()
+            )));
 
             targetMinimumHealth = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, min_health_target, mid_health_target, max_health_target);
 

From 916d8245e6c951a5b9d31d61a7aec3226f2c4922 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 May 2020 12:50:47 +0900
Subject: [PATCH 02651/10326] Don't timeout on long beatmap load when debugging

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index d2804bdc05..bf2b9944a4 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -84,7 +85,7 @@ namespace osu.Game.Beatmaps
 
         public IBeatmap GetPlayableBeatmap(RulesetInfo ruleset, IReadOnlyList<Mod> mods = null, TimeSpan? timeout = null)
         {
-            using (var cancellationSource = new CancellationTokenSource(timeout ?? TimeSpan.FromSeconds(10)))
+            using (var cancellationSource = createCancellationTokenSource(timeout))
             {
                 mods ??= Array.Empty<Mod>();
 
@@ -181,6 +182,15 @@ namespace osu.Game.Beatmaps
                 beatmapLoadTask = null;
         }
 
+        private CancellationTokenSource createCancellationTokenSource(TimeSpan? timeout)
+        {
+            if (Debugger.IsAttached)
+                // ignore timeout when debugger is attached (may be breakpointing / debugging).
+                return new CancellationTokenSource();
+
+            return new CancellationTokenSource(timeout ?? TimeSpan.FromSeconds(10));
+        }
+
         private Task<IBeatmap> loadBeatmapAsync() => beatmapLoadTask ??= Task.Factory.StartNew(() =>
         {
             // Todo: Handle cancellation during beatmap parsing

From b4d790c076904a1bd24bd086fae7d159ccd06614 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 May 2020 12:53:54 +0900
Subject: [PATCH 02652/10326] Fix taiko sample mapping for strong hits

---
 .../Beatmaps/TaikoBeatmapConverter.cs         | 30 +++++++++++++++++--
 .../Objects/Drawables/DrawableHit.cs          |  8 +++++
 .../Drawables/DrawableTaikoHitObject.cs       |  4 +--
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index caf645d5a2..822931396a 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -167,13 +167,39 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
                 default:
                 {
-                    bool isRim = samples.Any(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE);
+                    bool isRimDefinition(HitSampleInfo s) => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE;
+
+                    bool isRim = samples.Any(isRimDefinition);
+
+                    if (isRim)
+                    {
+                        // consume then remove the rim definition sample types.
+                        var updatedSamples = samples.Where(s => !isRimDefinition(s)).ToList();
+
+                        // strong + rim always maps to whistle.
+                        if (strong)
+                        {
+                            for (var i = 0; i < updatedSamples.Count; i++)
+                            {
+                                var s = samples[i];
+
+                                if (s.Name != HitSampleInfo.HIT_FINISH)
+                                    continue;
+
+                                var sClone = s.Clone();
+                                sClone.Name = HitSampleInfo.HIT_WHISTLE;
+                                updatedSamples[i] = sClone;
+                            }
+                        }
+
+                        samples = updatedSamples;
+                    }
 
                     yield return new Hit
                     {
                         StartTime = obj.StartTime,
                         Type = isRim ? HitType.Rim : HitType.Centre,
-                        Samples = obj.Samples,
+                        Samples = samples,
                         IsStrong = strong
                     };
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index d2671eadda..d4dc3316e7 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -2,9 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Graphics;
+using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
@@ -47,6 +49,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ? new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.CentreHit), _ => new CentreHitCirclePiece(), confineMode: ConfineMode.ScaleToFit)
             : new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.RimHit), _ => new RimHitCirclePiece(), confineMode: ConfineMode.ScaleToFit);
 
+        protected override IEnumerable<HitSampleInfo> GetSamples()
+        {
+            // normal and claps are always handled by the drum (see DrumSampleMapping).
+            return HitObject.Samples.Where(s => s.Name != HitSampleInfo.HIT_NORMAL && s.Name != HitSampleInfo.HIT_CLAP);
+        }
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             Debug.Assert(HitObject.HitWindows != null);
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 1be04f1760..90daf3950c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -165,8 +165,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return base.CreateNestedHitObject(hitObject);
         }
 
-        // Normal and clap samples are handled by the drum
-        protected override IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples.Where(s => s.Name != HitSampleInfo.HIT_NORMAL && s.Name != HitSampleInfo.HIT_CLAP);
+        // Most osu!taiko hitsounds are managed by the drum (see DrumSampleMapping).
+        protected override IEnumerable<HitSampleInfo> GetSamples() => Enumerable.Empty<HitSampleInfo>();
 
         protected abstract SkinnableDrawable CreateMainPiece();
 

From f1959338446a0c98345330e61d6beb8ca8deed6c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 11 May 2020 13:03:59 +0900
Subject: [PATCH 02653/10326] Fix hardrock potentially taking a long time to
 load

---
 osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
index cf6677a55d..e0577dd464 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
@@ -28,8 +28,11 @@ namespace osu.Game.Rulesets.Osu.Mods
             slider.NestedHitObjects.OfType<SliderTick>().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
             slider.NestedHitObjects.OfType<SliderRepeat>().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
 
-            foreach (var point in slider.Path.ControlPoints)
+            var controlPoints = slider.Path.ControlPoints.Select(p => new PathControlPoint(p.Position.Value, p.Type.Value)).ToArray();
+            foreach (var point in controlPoints)
                 point.Position.Value = new Vector2(point.Position.Value.X, -point.Position.Value.Y);
+
+            slider.Path = new SliderPath(controlPoints, slider.Path.ExpectedDistance.Value);
         }
     }
 }

From 43342c57b885f3baabf0fc73212d1adf679677da Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 11 May 2020 07:13:06 +0200
Subject: [PATCH 02654/10326] Fix switch case

... caused by a poor merge
---
 osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index f0d0ce05b5..1096b8db00 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -91,6 +91,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     if (GetTexture("taiko-slider") != null)
                         return new LegacyTaikoScroller();
 
+                    return null;
+
                 case TaikoSkinComponents.TaikoDon:
                     if (GetTexture("pippidonclear0") != null)
                         return new DrawableTaikoMascot();

From d61388880364b45b49ac037c9d04bd0427fcf80c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 11 May 2020 14:50:02 +0900
Subject: [PATCH 02655/10326] Add initial changes

---
 .../Preprocessing/StaminaCheeseDetector.cs    |  95 ++++++++++++
 .../Preprocessing/TaikoDifficultyHitObject.cs |  30 +++-
 .../TaikoDifficultyHitObjectRhythm.cs         | 124 +++++++++++++++
 .../Difficulty/Skills/Colour.cs               | 144 ++++++++++++++++++
 .../Difficulty/Skills/SpeedInvariantRhythm.cs | 133 ++++++++++++++++
 .../Difficulty/Skills/Stamina.cs              | 103 +++++++++++++
 .../Difficulty/Skills/Strain.cs               |  95 ------------
 .../Difficulty/TaikoDifficultyCalculator.cs   |  99 +++++++++++-
 .../Difficulty/TaikoPerformanceCalculator.cs  |  10 +-
 9 files changed, 726 insertions(+), 107 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
 delete mode 100644 osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
new file mode 100644
index 0000000000..ffdf4cb82a
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.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;
+using System.Collections.Generic;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+
+namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
+{
+    public class StaminaCheeseDetector
+    {
+
+        private const int roll_min_repetitions = 12;
+        private const int tl_min_repetitions = 16;
+
+        private List<TaikoDifficultyHitObject> hitObjects;
+
+        public void FindCheese(List<TaikoDifficultyHitObject> difficultyHitObjects)
+        {
+            this.hitObjects = difficultyHitObjects;
+            findRolls(3);
+            findRolls(4);
+            findTLTap(0, true);
+            findTLTap(1, true);
+            findTLTap(0, false);
+            findTLTap(1, false);
+        }
+
+        private void findRolls(int patternLength)
+        {
+            List<TaikoDifficultyHitObject> history = new List<TaikoDifficultyHitObject>();
+
+            int repititionStart = 0;
+
+            for (int i = 0; i < hitObjects.Count; i++)
+            {
+                history.Add(hitObjects[i]);
+                if (history.Count < 2 * patternLength) continue;
+                if (history.Count > 2 * patternLength) history.RemoveAt(0);
+
+                bool isRepeat = true;
+                for (int j = 0; j < patternLength; j++)
+                {
+                    if (history[j].IsKat != history[j + patternLength].IsKat)
+                    {
+                        isRepeat = false;
+                    }
+                }
+
+                if (!isRepeat)
+                {
+                    repititionStart = i - 2 * patternLength;
+                }
+
+                int repeatedLength = i - repititionStart;
+
+                if (repeatedLength >= roll_min_repetitions)
+                {
+                    // Console.WriteLine("Found Roll Cheese.\tStart: " + repititionStart + "\tEnd: " + i);
+                    for (int j = repititionStart; j < i; j++)
+                    {
+                        (hitObjects[i]).StaminaCheese = true;
+                    }
+                }
+
+            }
+        }
+
+        private void findTLTap(int parity, bool kat)
+        {
+            int tl_length = -2;
+            for (int i = parity; i < hitObjects.Count; i += 2)
+            {
+                if (kat == hitObjects[i].IsKat)
+                {
+                    tl_length += 2;
+                }
+                else
+                {
+                    tl_length = -2;
+                }
+
+                if (tl_length >= tl_min_repetitions)
+                {
+                    // Console.WriteLine("Found TL Cheese.\tStart: " + (i - tl_length) + "\tEnd: " + i);
+                    for (int j = i - tl_length; j < i; j++)
+                    {
+                        (hitObjects[i]).StaminaCheese = true;
+                    }
+                }
+            }
+        }
+
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
index 6807142327..abad494e62 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.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.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -10,11 +11,36 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
     public class TaikoDifficultyHitObject : DifficultyHitObject
     {
         public readonly bool HasTypeChange;
+        public readonly bool HasTimingChange;
+        public readonly TaikoDifficultyHitObjectRhythm Rhythm;
+        public readonly bool IsKat;
 
-        public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, double clockRate)
+        public bool StaminaCheese = false;
+
+        public readonly int RhythmID;
+
+        public readonly double NoteLength;
+
+        public readonly int n;
+        private int counter = 0;
+
+        public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate)
             : base(hitObject, lastObject, clockRate)
         {
-            HasTypeChange = (lastObject as Hit)?.Type != (hitObject as Hit)?.Type;
+            NoteLength = DeltaTime;
+            double prevLength = (lastObject.StartTime - lastLastObject.StartTime) / clockRate;
+            Rhythm = TaikoDifficultyHitObjectRhythm.GetClosest(NoteLength / prevLength);
+            RhythmID = Rhythm.ID;
+            HasTypeChange = lastObject is RimHit != hitObject is RimHit;
+            IsKat = lastObject is RimHit;
+            HasTimingChange = !TaikoDifficultyHitObjectRhythm.IsRepeat(RhythmID);
+
+            n = counter;
+            counter++;
         }
+
+        public const int CONST_RHYTHM_ID = 0;
+
+
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
new file mode 100644
index 0000000000..74b3d285aa
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.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;
+
+namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
+{
+    public class TaikoDifficultyHitObjectRhythm
+    {
+
+        private static TaikoDifficultyHitObjectRhythm[] commonRhythms;
+        private static TaikoDifficultyHitObjectRhythm constRhythm;
+        private static int constRhythmID;
+
+        public int ID = 0;
+        public readonly double Difficulty;
+        private readonly double ratio;
+
+        private static void initialiseCommonRhythms()
+        {
+
+            /*
+
+                ALCHYRS CODE
+
+            If (change < 0.48) Then 'sometimes gaps are slightly different due to position rounding
+                Return 0.65 'This number increases value of anything that more than doubles speed. Affects doubles.
+            ElseIf (change < 0.52) Then
+                Return 0.5 'speed doubling - this one affects pretty much every map other than stream maps
+            ElseIf change <= 0.9 Then
+                Return 1.0 'This number increases value of 1/4 -> 1/6 and other weird rhythms.
+            ElseIf change < 0.95 Then
+                Return 0.25 '.9
+            ElseIf change > 1.95 Then
+                Return 0.3 'half speed or more - this affects pretty much every map
+            ElseIf change > 1.15 Then
+                Return 0.425 'in between - this affects (mostly) 1/6 -> 1/4
+            ElseIf change > 1.05 Then
+                Return 0.15 '.9, small speed changes
+
+            */
+
+
+            commonRhythms = new TaikoDifficultyHitObjectRhythm[]
+            {
+                new TaikoDifficultyHitObjectRhythm(1, 1, 0.1),
+                new TaikoDifficultyHitObjectRhythm(2, 1, 0.3),
+                new TaikoDifficultyHitObjectRhythm(1, 2, 0.5),
+                new TaikoDifficultyHitObjectRhythm(3, 1, 0.3),
+                new TaikoDifficultyHitObjectRhythm(1, 3, 0.35),
+                new TaikoDifficultyHitObjectRhythm(3, 2, 0.6),
+                new TaikoDifficultyHitObjectRhythm(2, 3, 0.4),
+                new TaikoDifficultyHitObjectRhythm(5, 4, 0.5),
+                new TaikoDifficultyHitObjectRhythm(4, 5, 0.7)
+            };
+
+            for (int i = 0; i < commonRhythms.Length; i++)
+            {
+                commonRhythms[i].ID = i;
+            }
+
+            constRhythmID = 0;
+            constRhythm = commonRhythms[constRhythmID];
+
+        }
+
+        public bool IsRepeat()
+        {
+            return ID == constRhythmID;
+        }
+
+        public static bool IsRepeat(int id)
+        {
+            return id == constRhythmID;
+        }
+
+        public bool IsSpeedup()
+        {
+            return ratio < 1.0;
+        }
+
+        public bool IsLargeSpeedup()
+        {
+            return ratio < 0.49;
+        }
+
+        private TaikoDifficultyHitObjectRhythm(double ratio, double difficulty)
+        {
+            this.ratio = ratio;
+            this.Difficulty = difficulty;
+        }
+
+        private TaikoDifficultyHitObjectRhythm(int numerator, int denominator, double difficulty)
+        {
+            this.ratio = ((double)numerator) / ((double)denominator);
+            this.Difficulty = difficulty;
+        }
+
+        // Code is inefficient - we are searching exhaustively through the sorted list commonRhythms
+        public static TaikoDifficultyHitObjectRhythm GetClosest(double ratio)
+        {
+            if (commonRhythms == null)
+            {
+                initialiseCommonRhythms();
+            }
+
+            TaikoDifficultyHitObjectRhythm closestRhythm = commonRhythms[0];
+            double closestDistance = Double.MaxValue;
+
+            foreach (TaikoDifficultyHitObjectRhythm r in commonRhythms)
+            {
+                if (Math.Abs(r.ratio - ratio) < closestDistance)
+                {
+                    closestRhythm = r;
+                    closestDistance = Math.Abs(r.ratio - ratio);
+                }
+            }
+
+            return closestRhythm;
+
+        }
+
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
new file mode 100644
index 0000000000..6ed826f345
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -0,0 +1,144 @@
+// Copyright (c) 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.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
+{
+    public class Colour : Skill
+    {
+        protected override double SkillMultiplier => 1;
+        protected override double StrainDecayBase => 0.3;
+
+        private ColourSwitch lastColourSwitch = ColourSwitch.None;
+        private int sameColourCount = 1;
+
+        private int[] previousDonLengths = {0, 0}, previousKatLengths = {0, 0};
+        private int sameTypeCount = 1;
+        // TODO: make this smarter (dont initialise with "Don")
+        private bool previousIsKat = false;
+
+        protected override double StrainValueOf(DifficultyHitObject current)
+        {
+            return StrainValueOfNew(current);
+        }
+
+        protected double StrainValueOfNew(DifficultyHitObject current)
+        {
+
+            double returnVal = 0.0;
+            double returnMultiplier = 1.0;
+
+            if (previousIsKat != ((TaikoDifficultyHitObject) current).IsKat)
+            {
+                returnVal = 1.5 - (1.75 / (sameTypeCount + 0.65));
+
+                if (previousIsKat)
+                {
+                    if (sameTypeCount % 2 == previousDonLengths[0] % 2)
+                    {
+                        returnMultiplier *= 0.8;
+                    }
+
+                    if (previousKatLengths[0] == sameTypeCount)
+                    {
+                        returnMultiplier *= 0.525;
+                    }
+
+                    if (previousKatLengths[1] == sameTypeCount)
+                    {
+                        returnMultiplier *= 0.75;
+                    }
+
+                    previousKatLengths[1] = previousKatLengths[0];
+                    previousKatLengths[0] = sameTypeCount;
+                }
+                else
+                {
+                    if (sameTypeCount % 2 == previousKatLengths[0] % 2)
+                    {
+                        returnMultiplier *= 0.8;
+                    }
+
+                    if (previousDonLengths[0] == sameTypeCount)
+                    {
+                        returnMultiplier *= 0.525;
+                    }
+
+                    if (previousDonLengths[1] == sameTypeCount)
+                    {
+                        returnMultiplier *= 0.75;
+                    }
+
+                    previousDonLengths[1] = previousDonLengths[0];
+                    previousDonLengths[0] = sameTypeCount;
+                }
+
+
+                sameTypeCount = 1;
+                previousIsKat = ((TaikoDifficultyHitObject) current).IsKat;
+
+            }
+
+            else
+            {
+                sameTypeCount += 1;
+            }
+
+            return Math.Min(1.25, returnVal) * returnMultiplier;
+        }
+
+        protected double StrainValueOfOld(DifficultyHitObject current)
+        {
+
+            double addition = 0;
+
+            // We get an extra addition if we are not a slider or spinner
+            if (current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000)
+            {
+                if (hasColourChange(current))
+                    addition = 0.75;
+            }
+            else
+            {
+                lastColourSwitch = ColourSwitch.None;
+                sameColourCount = 1;
+            }
+
+            return addition;
+        }
+
+
+        private bool hasColourChange(DifficultyHitObject current)
+        {
+            var taikoCurrent = (TaikoDifficultyHitObject) current;
+
+            if (!taikoCurrent.HasTypeChange)
+            {
+                sameColourCount++;
+                return false;
+            }
+
+            var oldColourSwitch = lastColourSwitch;
+            var newColourSwitch = sameColourCount % 2 == 0 ? ColourSwitch.Even : ColourSwitch.Odd;
+
+            lastColourSwitch = newColourSwitch;
+            sameColourCount = 1;
+
+            // We only want a bonus if the parity of the color switch changes
+            return oldColourSwitch != ColourSwitch.None && oldColourSwitch != newColourSwitch;
+        }
+
+        private enum ColourSwitch
+        {
+            None,
+            Even,
+            Odd
+        }
+
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
new file mode 100644
index 0000000000..b48cfc675f
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
@@ -0,0 +1,133 @@
+// Copyright (c) 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.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
+
+namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
+{
+    public class Rhythm : Skill
+    {
+
+        protected override double SkillMultiplier => 1;
+        protected override double StrainDecayBase => 0;
+        private const double strain_decay = 0.96;
+        private double currentStrain = 0.0;
+
+        private readonly List<TaikoDifficultyHitObject> ratioObjectHistory = new List<TaikoDifficultyHitObject>();
+        private int ratioHistoryLength = 0;
+        private const int ratio_history_max_length = 8;
+
+        private int rhythmLength = 0;
+
+        // Penalty for repeated sequences of rhythm changes
+        private double repititionPenalty(double timeSinceRepititionMS)
+        {
+            double t = Math.Atan(timeSinceRepititionMS / 3000) / (Math.PI / 2);
+            return t;
+        }
+
+        private double repititionPenalty(int notesSince)
+        {
+            double t = notesSince * 150;
+            t = Math.Atan(t / 3000) / (Math.PI / 2);
+            return t;
+        }
+
+        // Penalty for short patterns
+        // Must be low to buff maps like wizodmiot
+        // Must not be too low for maps like inverse world
+        private double patternLengthPenalty(int patternLength)
+        {
+            double shortPatternPenalty = Math.Min(0.15 * patternLength, 1.0);
+            double longPatternPenalty = Math.Max(Math.Min(2.5 - 0.15 * patternLength, 1.0), 0.0);
+            return Math.Min(shortPatternPenalty, longPatternPenalty);
+        }
+
+        // Penalty for notes so slow that alting is not necessary.
+        private double speedPenalty(double noteLengthMS)
+        {
+            if (noteLengthMS < 80) return 1;
+            if (noteLengthMS < 160) return Math.Max(0, 1.4 - 0.005 * noteLengthMS);
+            if (noteLengthMS < 300) return 0.6;
+            return 0.0;
+        }
+
+        // Penalty for the first rhythm change in a pattern
+        private const double first_burst_penalty = 0.1;
+        private bool prevIsSpeedup = true;
+
+        protected override double StrainValueOf(DifficultyHitObject dho)
+        {
+            currentStrain *= strain_decay;
+
+            TaikoDifficultyHitObject currentHO = (TaikoDifficultyHitObject) dho;
+            rhythmLength += 1;
+            if (!currentHO.HasTimingChange)
+            {
+                return 0.0;
+            }
+
+            double objectDifficulty = currentHO.Rhythm.Difficulty;
+
+            // find repeated ratios
+
+            ratioObjectHistory.Add(currentHO);
+            ratioHistoryLength += 1;
+            if (ratioHistoryLength > ratio_history_max_length)
+            {
+                ratioObjectHistory.RemoveAt(0);
+                ratioHistoryLength -= 1;
+            }
+
+            for (int l = 2; l <= ratio_history_max_length / 2; l++)
+            {
+                for (int start = ratioHistoryLength - l - 1; start >= 0; start--)
+                {
+                    bool samePattern = true;
+                    for (int i = 0; i < l; i++)
+                    {
+                        if (ratioObjectHistory[start + i].RhythmID != ratioObjectHistory[ratioHistoryLength - l + i].RhythmID)
+                        {
+                            samePattern = false;
+                        }
+                    }
+
+                    if (samePattern) // Repitition found!
+                    {
+                        int notesSince = currentHO.n - ratioObjectHistory[start].n;
+                        objectDifficulty *= repititionPenalty(notesSince);
+                        break;
+                    }
+                }
+            }
+
+
+            if (currentHO.Rhythm.IsSpeedup())
+            {
+                objectDifficulty *= 1;
+                if (currentHO.Rhythm.IsLargeSpeedup()) objectDifficulty *= 1;
+                if (prevIsSpeedup) objectDifficulty *= 1;
+
+                prevIsSpeedup = true;
+            }
+            else
+            {
+                prevIsSpeedup = false;
+            }
+
+            objectDifficulty *= patternLengthPenalty(rhythmLength);
+            objectDifficulty *= speedPenalty(currentHO.NoteLength);
+
+            rhythmLength = 0;
+
+            currentStrain += objectDifficulty;
+            return currentStrain;
+
+        }
+
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
new file mode 100644
index 0000000000..349f4c29fa
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -0,0 +1,103 @@
+// Copyright (c) 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 System.Collections.Generic;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
+{
+    public class Stamina : Skill
+    {
+
+        private int hand;
+        private int noteNumber = 0;
+
+        protected override double SkillMultiplier => 1;
+        protected override double StrainDecayBase => 0.4;
+        // i only add strain every second note so its kind of like using 0.16
+
+        private readonly int maxHistoryLength = 2;
+        private List<double> noteDurationHistory = new List<double>();
+
+        private List<TaikoDifficultyHitObject> lastHitObjects = new List<TaikoDifficultyHitObject>();
+
+        private double offhandObjectDuration = double.MaxValue;
+
+        // Penalty for tl tap or roll
+        private double cheesePenalty(double last2NoteDuration)
+        {
+            if (last2NoteDuration > 125) return 1;
+            if (last2NoteDuration < 100) return 0.6;
+
+            return 0.6 + (last2NoteDuration - 100) * 0.016;
+        }
+
+        private double speedBonus(double last2NoteDuration)
+        {
+            // note that we are only looking at every 2nd note, so a 300bpm stream has a note duration of 100ms.
+            if (last2NoteDuration >= 200) return 0;
+            double bonus = 200 - last2NoteDuration;
+            bonus *= bonus;
+            return bonus / 100000;
+        }
+
+        protected override double StrainValueOf(DifficultyHitObject current)
+        {
+            noteNumber += 1;
+
+            TaikoDifficultyHitObject currentHO = (TaikoDifficultyHitObject) current;
+
+            if (noteNumber % 2 == hand)
+            {
+                lastHitObjects.Add(currentHO);
+                noteDurationHistory.Add(currentHO.NoteLength + offhandObjectDuration);
+
+                if (noteNumber == 1)
+                    return 1;
+
+                if (noteDurationHistory.Count > maxHistoryLength)
+                    noteDurationHistory.RemoveAt(0);
+
+                double shortestRecentNote = min(noteDurationHistory);
+                double bonus = 0;
+                bonus += speedBonus(shortestRecentNote);
+
+                double objectStaminaStrain = 1 + bonus;
+                if (currentHO.StaminaCheese) objectStaminaStrain *= cheesePenalty(currentHO.NoteLength + offhandObjectDuration);
+
+                return objectStaminaStrain;
+            }
+
+            offhandObjectDuration = currentHO.NoteLength;
+            return 0;
+        }
+
+        private static double min(List<double> l)
+        {
+            double minimum = double.MaxValue;
+
+            foreach (double d in l)
+            {
+                if (d < minimum)
+                    minimum = d;
+            }
+            return minimum;
+        }
+
+        public Stamina(bool rightHand)
+        {
+            hand = 0;
+            if (rightHand)
+            {
+                hand = 1;
+            }
+        }
+
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs
deleted file mode 100644
index c6fe273b50..0000000000
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.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 osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Skills;
-using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Taiko.Objects;
-
-namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
-{
-    public class Strain : Skill
-    {
-        private const double rhythm_change_base_threshold = 0.2;
-        private const double rhythm_change_base = 2.0;
-
-        protected override double SkillMultiplier => 1;
-        protected override double StrainDecayBase => 0.3;
-
-        private ColourSwitch lastColourSwitch = ColourSwitch.None;
-
-        private int sameColourCount = 1;
-
-        protected override double StrainValueOf(DifficultyHitObject current)
-        {
-            double addition = 1;
-
-            // We get an extra addition if we are not a slider or spinner
-            if (current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000)
-            {
-                if (hasColourChange(current))
-                    addition += 0.75;
-
-                if (hasRhythmChange(current))
-                    addition += 1;
-            }
-            else
-            {
-                lastColourSwitch = ColourSwitch.None;
-                sameColourCount = 1;
-            }
-
-            double additionFactor = 1;
-
-            // Scale the addition factor linearly from 0.4 to 1 for DeltaTime from 0 to 50
-            if (current.DeltaTime < 50)
-                additionFactor = 0.4 + 0.6 * current.DeltaTime / 50;
-
-            return additionFactor * addition;
-        }
-
-        private bool hasRhythmChange(DifficultyHitObject current)
-        {
-            // We don't want a division by zero if some random mapper decides to put two HitObjects at the same time.
-            if (current.DeltaTime == 0 || Previous.Count == 0 || Previous[0].DeltaTime == 0)
-                return false;
-
-            double timeElapsedRatio = Math.Max(Previous[0].DeltaTime / current.DeltaTime, current.DeltaTime / Previous[0].DeltaTime);
-
-            if (timeElapsedRatio >= 8)
-                return false;
-
-            double difference = Math.Log(timeElapsedRatio, rhythm_change_base) % 1.0;
-
-            return difference > rhythm_change_base_threshold && difference < 1 - rhythm_change_base_threshold;
-        }
-
-        private bool hasColourChange(DifficultyHitObject current)
-        {
-            var taikoCurrent = (TaikoDifficultyHitObject)current;
-
-            if (!taikoCurrent.HasTypeChange)
-            {
-                sameColourCount++;
-                return false;
-            }
-
-            var oldColourSwitch = lastColourSwitch;
-            var newColourSwitch = sameColourCount % 2 == 0 ? ColourSwitch.Even : ColourSwitch.Odd;
-
-            lastColourSwitch = newColourSwitch;
-            sameColourCount = 1;
-
-            // We only want a bonus if the parity of the color switch changes
-            return oldColourSwitch != ColourSwitch.None && oldColourSwitch != newColourSwitch;
-        }
-
-        private enum ColourSwitch
-        {
-            None,
-            Even,
-            Odd
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 32d49ea39c..68da0f0e02 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -19,39 +20,121 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 {
     public class TaikoDifficultyCalculator : DifficultyCalculator
     {
-        private const double star_scaling_factor = 0.04125;
+
+        private const double rhythmSkillMultiplier = 0.15;
+        private const double colourSkillMultiplier = 0.01;
+        private const double staminaSkillMultiplier = 0.02;
 
         public TaikoDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
         }
 
+        private double readingPenalty(double staminaDifficulty)
+        {
+            return Math.Max(0, 1 - staminaDifficulty / 14);
+            // return 1;
+        }
+
+        private double norm(double p, double v1, double v2, double v3)
+        {
+            return Math.Pow(
+                Math.Pow(v1, p) +
+                Math.Pow(v2, p) +
+                Math.Pow(v3, p)
+                , 1 / p);
+        }
+
+        private double rescale(double sr)
+        {
+            if (sr <= 1) return sr;
+            sr -= 1;
+            sr = 1.5 * Math.Pow(sr, 0.76);
+            sr += 1;
+            return sr;
+        }
+
+        private double combinedDifficulty(Skill colour, Skill rhythm, Skill stamina1, Skill stamina2)
+        {
+
+            double staminaRating = (stamina1.DifficultyValue() + stamina2.DifficultyValue()) * staminaSkillMultiplier;
+            double readingPenalty = this.readingPenalty(staminaRating);
+
+
+            double difficulty = 0;
+            double weight = 1;
+            List<double> peaks = new List<double>();
+            for (int i = 0; i < colour.StrainPeaks.Count; i++)
+            {
+                double colourPeak = colour.StrainPeaks[i] * colourSkillMultiplier * readingPenalty;
+                double rhythmPeak = rhythm.StrainPeaks[i] * rhythmSkillMultiplier;
+                double staminaPeak = (stamina1.StrainPeaks[i] + stamina2.StrainPeaks[i]) * staminaSkillMultiplier;
+                peaks.Add(norm(2, colourPeak, rhythmPeak, staminaPeak));
+            }
+            foreach (double strain in peaks.OrderByDescending(d => d))
+            {
+                difficulty += strain * weight;
+                weight *= 0.9;
+            }
+
+            return difficulty;
+        }
+
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
         {
             if (beatmap.HitObjects.Count == 0)
                 return new TaikoDifficultyAttributes { Mods = mods, Skills = skills };
 
+            double staminaRating = (skills[2].DifficultyValue() + skills[3].DifficultyValue()) * staminaSkillMultiplier;
+            double readingPenalty = this.readingPenalty(staminaRating);
+
+            double colourRating = skills[0].DifficultyValue() * colourSkillMultiplier * readingPenalty;
+            double rhythmRating = skills[1].DifficultyValue() * rhythmSkillMultiplier;
+            double combinedRating = combinedDifficulty(skills[0], skills[1], skills[2], skills[3]);
+
+            // Console.WriteLine("colour\t" + colourRating);
+            // Console.WriteLine("rhythm\t" + rhythmRating);
+            // Console.WriteLine("stamina\t" + staminaRating);
+            double separatedRating = norm(1.5, colourRating, rhythmRating, staminaRating);
+            // Console.WriteLine("combinedRating\t" + combinedRating);
+            // Console.WriteLine("separatedRating\t" + separatedRating);
+            double starRating = 1.4 * separatedRating + 0.5 * combinedRating;
+            starRating = rescale(starRating);
+
             HitWindows hitWindows = new TaikoHitWindows();
             hitWindows.SetDifficulty(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty);
 
             return new TaikoDifficultyAttributes
             {
-                StarRating = skills.Single().DifficultyValue() * star_scaling_factor,
+                StarRating = starRating,
                 Mods = mods,
                 // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be removed in the future
                 GreatHitWindow = (int)(hitWindows.WindowFor(HitResult.Great)) / clockRate,
                 MaxCombo = beatmap.HitObjects.Count(h => h is Hit),
                 Skills = skills
             };
+
         }
 
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
         {
-            for (int i = 1; i < beatmap.HitObjects.Count; i++)
-                yield return new TaikoDifficultyHitObject(beatmap.HitObjects[i], beatmap.HitObjects[i - 1], clockRate);
+            List<TaikoDifficultyHitObject> taikoDifficultyHitObjects = new List<TaikoDifficultyHitObject>();
+            for (int i = 2; i < beatmap.HitObjects.Count; i++)
+            {
+                taikoDifficultyHitObjects.Add(new TaikoDifficultyHitObject(beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate));
+            }
+            new StaminaCheeseDetector().FindCheese(taikoDifficultyHitObjects);
+            for (int i = 0; i < taikoDifficultyHitObjects.Count; i++)
+                yield return taikoDifficultyHitObjects[i];
         }
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[] { new Strain() };
+        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
+        {
+            new Colour(),
+            new Rhythm(),
+            new Stamina(true),
+            new Stamina(false),
+        };
 
         protected override Mod[] DifficultyAdjustmentMods => new Mod[]
         {
@@ -60,5 +143,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             new TaikoModEasy(),
             new TaikoModHardRock(),
         };
+
+        /*
+        protected override DifficultyAttributes VirtualCalculate(IBeatmap beatmap, Mod[] mods, double clockRate)
+            => taikoCalculate(beatmap, mods, clockRate);
+        */
+
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
index 3a0fb64622..70249db0f6 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
@@ -31,10 +31,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         public override double Calculate(Dictionary<string, double> categoryDifficulty = null)
         {
             mods = Score.Mods;
-            countGreat = Score.Statistics[HitResult.Great];
-            countGood = Score.Statistics[HitResult.Good];
-            countMeh = Score.Statistics[HitResult.Meh];
-            countMiss = Score.Statistics[HitResult.Miss];
+            countGreat = Convert.ToInt32(Score.Statistics[HitResult.Great]);
+            countGood = Convert.ToInt32(Score.Statistics[HitResult.Good]);
+            countMeh = Convert.ToInt32(Score.Statistics[HitResult.Meh]);
+            countMiss = Convert.ToInt32(Score.Statistics[HitResult.Miss]);
 
             // Don't count scores made with supposedly unranked mods
             if (mods.Any(m => !m.Ranked))
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             double strainValue = Math.Pow(5.0 * Math.Max(1.0, Attributes.StarRating / 0.0075) - 4.0, 2.0) / 100000.0;
 
             // Longer maps are worth more
-            double lengthBonus = 1 + 0.1 * Math.Min(1.0, totalHits / 1500.0);
+            double lengthBonus = 1 + 0.1f * Math.Min(1.0, totalHits / 1500.0);
             strainValue *= lengthBonus;
 
             // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available

From 779af48802ad135529b9e60e0d9df58871fc03f8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 11 May 2020 14:53:42 +0900
Subject: [PATCH 02656/10326] Resolve errors + auto-format

---
 .../Preprocessing/StaminaCheeseDetector.cs       |  7 ++-----
 .../Preprocessing/TaikoDifficultyHitObject.cs    | 10 +++++-----
 .../Difficulty/Skills/Colour.cs                  | 16 ++++++----------
 .../Difficulty/Skills/SpeedInvariantRhythm.cs    |  9 ++++-----
 .../Difficulty/Skills/Stamina.cs                 | 11 ++++-------
 .../Difficulty/TaikoDifficultyCalculator.cs      |  9 ++++-----
 6 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
index ffdf4cb82a..4f645d7e51 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.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 System;
 using System.Collections.Generic;
-using osu.Game.Rulesets.Difficulty.Preprocessing;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 {
     public class StaminaCheeseDetector
     {
-
         private const int roll_min_repetitions = 12;
         private const int tl_min_repetitions = 16;
 
@@ -39,6 +36,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
                 if (history.Count > 2 * patternLength) history.RemoveAt(0);
 
                 bool isRepeat = true;
+
                 for (int j = 0; j < patternLength; j++)
                 {
                     if (history[j].IsKat != history[j + patternLength].IsKat)
@@ -62,13 +60,13 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
                         (hitObjects[i]).StaminaCheese = true;
                     }
                 }
-
             }
         }
 
         private void findTLTap(int parity, bool kat)
         {
             int tl_length = -2;
+
             for (int i = parity; i < hitObjects.Count; i += 2)
             {
                 if (kat == hitObjects[i].IsKat)
@@ -90,6 +88,5 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
                 }
             }
         }
-
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
index abad494e62..42c23a3d14 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.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.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -27,12 +26,15 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
         public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate)
             : base(hitObject, lastObject, clockRate)
         {
+            var lastHit = lastObject as Hit;
+            var currentHit = hitObject as Hit;
+
             NoteLength = DeltaTime;
             double prevLength = (lastObject.StartTime - lastLastObject.StartTime) / clockRate;
             Rhythm = TaikoDifficultyHitObjectRhythm.GetClosest(NoteLength / prevLength);
             RhythmID = Rhythm.ID;
-            HasTypeChange = lastObject is RimHit != hitObject is RimHit;
-            IsKat = lastObject is RimHit;
+            HasTypeChange = lastHit?.Type != currentHit?.Type;
+            IsKat = lastHit?.Type == HitType.Rim;
             HasTimingChange = !TaikoDifficultyHitObjectRhythm.IsRepeat(RhythmID);
 
             n = counter;
@@ -40,7 +42,5 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
         }
 
         public const int CONST_RHYTHM_ID = 0;
-
-
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index 6ed826f345..8b3cc0bb8f 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -17,8 +17,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         private ColourSwitch lastColourSwitch = ColourSwitch.None;
         private int sameColourCount = 1;
 
-        private int[] previousDonLengths = {0, 0}, previousKatLengths = {0, 0};
+        private int[] previousDonLengths = { 0, 0 }, previousKatLengths = { 0, 0 };
+
         private int sameTypeCount = 1;
+
         // TODO: make this smarter (dont initialise with "Don")
         private bool previousIsKat = false;
 
@@ -29,11 +31,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
         protected double StrainValueOfNew(DifficultyHitObject current)
         {
-
             double returnVal = 0.0;
             double returnMultiplier = 1.0;
 
-            if (previousIsKat != ((TaikoDifficultyHitObject) current).IsKat)
+            if (previousIsKat != ((TaikoDifficultyHitObject)current).IsKat)
             {
                 returnVal = 1.5 - (1.75 / (sameTypeCount + 0.65));
 
@@ -78,10 +79,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
                     previousDonLengths[0] = sameTypeCount;
                 }
 
-
                 sameTypeCount = 1;
-                previousIsKat = ((TaikoDifficultyHitObject) current).IsKat;
-
+                previousIsKat = ((TaikoDifficultyHitObject)current).IsKat;
             }
 
             else
@@ -94,7 +93,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
         protected double StrainValueOfOld(DifficultyHitObject current)
         {
-
             double addition = 0;
 
             // We get an extra addition if we are not a slider or spinner
@@ -112,10 +110,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return addition;
         }
 
-
         private bool hasColourChange(DifficultyHitObject current)
         {
-            var taikoCurrent = (TaikoDifficultyHitObject) current;
+            var taikoCurrent = (TaikoDifficultyHitObject)current;
 
             if (!taikoCurrent.HasTypeChange)
             {
@@ -139,6 +136,5 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             Even,
             Odd
         }
-
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
index b48cfc675f..cdd1d2d5d0 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
@@ -11,7 +11,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 {
     public class Rhythm : Skill
     {
-
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0;
         private const double strain_decay = 0.96;
@@ -64,8 +63,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         {
             currentStrain *= strain_decay;
 
-            TaikoDifficultyHitObject currentHO = (TaikoDifficultyHitObject) dho;
+            TaikoDifficultyHitObject currentHO = (TaikoDifficultyHitObject)dho;
             rhythmLength += 1;
+
             if (!currentHO.HasTimingChange)
             {
                 return 0.0;
@@ -77,6 +77,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
             ratioObjectHistory.Add(currentHO);
             ratioHistoryLength += 1;
+
             if (ratioHistoryLength > ratio_history_max_length)
             {
                 ratioObjectHistory.RemoveAt(0);
@@ -88,6 +89,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
                 for (int start = ratioHistoryLength - l - 1; start >= 0; start--)
                 {
                     bool samePattern = true;
+
                     for (int i = 0; i < l; i++)
                     {
                         if (ratioObjectHistory[start + i].RhythmID != ratioObjectHistory[ratioHistoryLength - l + i].RhythmID)
@@ -105,7 +107,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
                 }
             }
 
-
             if (currentHO.Rhythm.IsSpeedup())
             {
                 objectDifficulty *= 1;
@@ -126,8 +127,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
             currentStrain += objectDifficulty;
             return currentStrain;
-
         }
-
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index 349f4c29fa..1ecca886df 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -1,24 +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.Linq;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 {
     public class Stamina : Skill
     {
-
         private int hand;
         private int noteNumber = 0;
 
         protected override double SkillMultiplier => 1;
+
         protected override double StrainDecayBase => 0.4;
         // i only add strain every second note so its kind of like using 0.16
 
@@ -51,7 +47,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         {
             noteNumber += 1;
 
-            TaikoDifficultyHitObject currentHO = (TaikoDifficultyHitObject) current;
+            TaikoDifficultyHitObject currentHO = (TaikoDifficultyHitObject)current;
 
             if (noteNumber % 2 == hand)
             {
@@ -87,17 +83,18 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
                 if (d < minimum)
                     minimum = d;
             }
+
             return minimum;
         }
 
         public Stamina(bool rightHand)
         {
             hand = 0;
+
             if (rightHand)
             {
                 hand = 1;
             }
         }
-
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 68da0f0e02..26e92a1ea1 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 {
     public class TaikoDifficultyCalculator : DifficultyCalculator
     {
-
         private const double rhythmSkillMultiplier = 0.15;
         private const double colourSkillMultiplier = 0.01;
         private const double staminaSkillMultiplier = 0.02;
@@ -56,14 +55,13 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         private double combinedDifficulty(Skill colour, Skill rhythm, Skill stamina1, Skill stamina2)
         {
-
             double staminaRating = (stamina1.DifficultyValue() + stamina2.DifficultyValue()) * staminaSkillMultiplier;
             double readingPenalty = this.readingPenalty(staminaRating);
 
-
             double difficulty = 0;
             double weight = 1;
             List<double> peaks = new List<double>();
+
             for (int i = 0; i < colour.StrainPeaks.Count; i++)
             {
                 double colourPeak = colour.StrainPeaks[i] * colourSkillMultiplier * readingPenalty;
@@ -71,6 +69,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 double staminaPeak = (stamina1.StrainPeaks[i] + stamina2.StrainPeaks[i]) * staminaSkillMultiplier;
                 peaks.Add(norm(2, colourPeak, rhythmPeak, staminaPeak));
             }
+
             foreach (double strain in peaks.OrderByDescending(d => d))
             {
                 difficulty += strain * weight;
@@ -113,16 +112,17 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 MaxCombo = beatmap.HitObjects.Count(h => h is Hit),
                 Skills = skills
             };
-
         }
 
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
         {
             List<TaikoDifficultyHitObject> taikoDifficultyHitObjects = new List<TaikoDifficultyHitObject>();
+
             for (int i = 2; i < beatmap.HitObjects.Count; i++)
             {
                 taikoDifficultyHitObjects.Add(new TaikoDifficultyHitObject(beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate));
             }
+
             new StaminaCheeseDetector().FindCheese(taikoDifficultyHitObjects);
             for (int i = 0; i < taikoDifficultyHitObjects.Count; i++)
                 yield return taikoDifficultyHitObjects[i];
@@ -148,6 +148,5 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         protected override DifficultyAttributes VirtualCalculate(IBeatmap beatmap, Mod[] mods, double clockRate)
             => taikoCalculate(beatmap, mods, clockRate);
         */
-
     }
 }

From b0ed39f32baafa5de158cf95b7dc025bf6ce4d6c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 11 May 2020 14:57:47 +0900
Subject: [PATCH 02657/10326] Do not use statics

---
 .../Preprocessing/TaikoDifficultyHitObject.cs |  6 +-
 .../TaikoDifficultyHitObjectRhythm.cs         | 67 +++++++------------
 .../Difficulty/Skills/Colour.cs               |  5 +-
 .../Difficulty/Skills/SpeedInvariantRhythm.cs |  6 +-
 .../Difficulty/TaikoDifficultyCalculator.cs   |  3 +-
 5 files changed, 36 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
index 42c23a3d14..75b1b3e268 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
         public readonly int n;
         private int counter = 0;
 
-        public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate)
+        public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate, TaikoDifficultyHitObjectRhythm rhythm)
             : base(hitObject, lastObject, clockRate)
         {
             var lastHit = lastObject as Hit;
@@ -31,11 +31,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 
             NoteLength = DeltaTime;
             double prevLength = (lastObject.StartTime - lastLastObject.StartTime) / clockRate;
-            Rhythm = TaikoDifficultyHitObjectRhythm.GetClosest(NoteLength / prevLength);
+            Rhythm = rhythm.GetClosest(NoteLength / prevLength);
             RhythmID = Rhythm.ID;
             HasTypeChange = lastHit?.Type != currentHit?.Type;
             IsKat = lastHit?.Type == HitType.Rim;
-            HasTimingChange = !TaikoDifficultyHitObjectRhythm.IsRepeat(RhythmID);
+            HasTimingChange = !rhythm.IsRepeat(RhythmID);
 
             n = counter;
             counter++;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
index 74b3d285aa..8a6f0e5bfe 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
@@ -7,18 +7,36 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 {
     public class TaikoDifficultyHitObjectRhythm
     {
-
-        private static TaikoDifficultyHitObjectRhythm[] commonRhythms;
-        private static TaikoDifficultyHitObjectRhythm constRhythm;
-        private static int constRhythmID;
+        private readonly TaikoDifficultyHitObjectRhythm[] commonRhythms;
+        private readonly TaikoDifficultyHitObjectRhythm constRhythm;
+        private int constRhythmID;
 
         public int ID = 0;
         public readonly double Difficulty;
         private readonly double ratio;
 
-        private static void initialiseCommonRhythms()
+        public bool IsRepeat()
         {
+            return ID == constRhythmID;
+        }
 
+        public bool IsRepeat(int id)
+        {
+            return id == constRhythmID;
+        }
+
+        public bool IsSpeedup()
+        {
+            return ratio < 1.0;
+        }
+
+        public bool IsLargeSpeedup()
+        {
+            return ratio < 0.49;
+        }
+
+        public TaikoDifficultyHitObjectRhythm()
+        {
             /*
 
                 ALCHYRS CODE
@@ -40,8 +58,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 
             */
 
-
-            commonRhythms = new TaikoDifficultyHitObjectRhythm[]
+            commonRhythms = new[]
             {
                 new TaikoDifficultyHitObjectRhythm(1, 1, 0.1),
                 new TaikoDifficultyHitObjectRhythm(2, 1, 0.3),
@@ -61,33 +78,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 
             constRhythmID = 0;
             constRhythm = commonRhythms[constRhythmID];
-
-        }
-
-        public bool IsRepeat()
-        {
-            return ID == constRhythmID;
-        }
-
-        public static bool IsRepeat(int id)
-        {
-            return id == constRhythmID;
-        }
-
-        public bool IsSpeedup()
-        {
-            return ratio < 1.0;
-        }
-
-        public bool IsLargeSpeedup()
-        {
-            return ratio < 0.49;
-        }
-
-        private TaikoDifficultyHitObjectRhythm(double ratio, double difficulty)
-        {
-            this.ratio = ratio;
-            this.Difficulty = difficulty;
         }
 
         private TaikoDifficultyHitObjectRhythm(int numerator, int denominator, double difficulty)
@@ -97,13 +87,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
         }
 
         // Code is inefficient - we are searching exhaustively through the sorted list commonRhythms
-        public static TaikoDifficultyHitObjectRhythm GetClosest(double ratio)
+        public TaikoDifficultyHitObjectRhythm GetClosest(double ratio)
         {
-            if (commonRhythms == null)
-            {
-                initialiseCommonRhythms();
-            }
-
             TaikoDifficultyHitObjectRhythm closestRhythm = commonRhythms[0];
             double closestDistance = Double.MaxValue;
 
@@ -117,8 +102,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
             }
 
             return closestRhythm;
-
         }
-
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index 8b3cc0bb8f..da255dcdd7 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -17,12 +17,13 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         private ColourSwitch lastColourSwitch = ColourSwitch.None;
         private int sameColourCount = 1;
 
-        private int[] previousDonLengths = { 0, 0 }, previousKatLengths = { 0, 0 };
+        private readonly int[] previousDonLengths = { 0, 0 };
+        private readonly int[] previousKatLengths = { 0, 0 };
 
         private int sameTypeCount = 1;
 
         // TODO: make this smarter (dont initialise with "Don")
-        private bool previousIsKat = false;
+        private bool previousIsKat;
 
         protected override double StrainValueOf(DifficultyHitObject current)
         {
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
index cdd1d2d5d0..2d99bac7a9 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
@@ -14,13 +14,13 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0;
         private const double strain_decay = 0.96;
-        private double currentStrain = 0.0;
+        private double currentStrain;
 
         private readonly List<TaikoDifficultyHitObject> ratioObjectHistory = new List<TaikoDifficultyHitObject>();
-        private int ratioHistoryLength = 0;
+        private int ratioHistoryLength;
         private const int ratio_history_max_length = 8;
 
-        private int rhythmLength = 0;
+        private int rhythmLength;
 
         // Penalty for repeated sequences of rhythm changes
         private double repititionPenalty(double timeSinceRepititionMS)
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 26e92a1ea1..6e1fae01ee 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -117,10 +117,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
         {
             List<TaikoDifficultyHitObject> taikoDifficultyHitObjects = new List<TaikoDifficultyHitObject>();
+            var rhythm = new TaikoDifficultyHitObjectRhythm();
 
             for (int i = 2; i < beatmap.HitObjects.Count; i++)
             {
-                taikoDifficultyHitObjects.Add(new TaikoDifficultyHitObject(beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate));
+                taikoDifficultyHitObjects.Add(new TaikoDifficultyHitObject(beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate, rhythm));
             }
 
             new StaminaCheeseDetector().FindCheese(taikoDifficultyHitObjects);

From 77041bdbb571a738da0c22f10948059642502bb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 May 2020 16:19:47 +0900
Subject: [PATCH 02658/10326] Move implementation to DrawableHit to avoid
 "breaking" legacy encoding

---
 .../Beatmaps/TaikoBeatmapConverter.cs         | 24 -----------------
 .../Objects/Drawables/DrawableHit.cs          | 27 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 822931396a..d324441285 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -171,30 +171,6 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
                     bool isRim = samples.Any(isRimDefinition);
 
-                    if (isRim)
-                    {
-                        // consume then remove the rim definition sample types.
-                        var updatedSamples = samples.Where(s => !isRimDefinition(s)).ToList();
-
-                        // strong + rim always maps to whistle.
-                        if (strong)
-                        {
-                            for (var i = 0; i < updatedSamples.Count; i++)
-                            {
-                                var s = samples[i];
-
-                                if (s.Name != HitSampleInfo.HIT_FINISH)
-                                    continue;
-
-                                var sClone = s.Clone();
-                                sClone.Name = HitSampleInfo.HIT_WHISTLE;
-                                updatedSamples[i] = sClone;
-                            }
-                        }
-
-                        samples = updatedSamples;
-                    }
-
                     yield return new Hit
                     {
                         StartTime = obj.StartTime,
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index d4dc3316e7..d332f90cd4 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -52,7 +52,32 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override IEnumerable<HitSampleInfo> GetSamples()
         {
             // normal and claps are always handled by the drum (see DrumSampleMapping).
-            return HitObject.Samples.Where(s => s.Name != HitSampleInfo.HIT_NORMAL && s.Name != HitSampleInfo.HIT_CLAP);
+            var samples = HitObject.Samples.Where(s => s.Name != HitSampleInfo.HIT_NORMAL && s.Name != HitSampleInfo.HIT_CLAP);
+
+            if (HitObject.Type == HitType.Rim && HitObject.IsStrong)
+            {
+                // strong + rim always maps to whistle.
+                // TODO: this should really be in the legacy decoder, but can't be because legacy encoding parity would be broken.
+                // when we add a taiko editor, this is probably not going to play nice.
+
+                var corrected = samples.ToList();
+
+                for (var i = 0; i < corrected.Count; i++)
+                {
+                    var s = corrected[i];
+
+                    if (s.Name != HitSampleInfo.HIT_FINISH)
+                        continue;
+
+                    var sClone = s.Clone();
+                    sClone.Name = HitSampleInfo.HIT_WHISTLE;
+                    corrected[i] = sClone;
+                }
+
+                return corrected;
+            }
+
+            return samples;
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)

From 93440874db8d92e300d0e62508e5cf44e343f4bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 May 2020 16:30:54 +0900
Subject: [PATCH 02659/10326] Refactor beatmap encoder test to be a bit easier
 to understand

---
 .../Formats/LegacyBeatmapEncoderTest.cs       | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index bcc873b0b7..64efe08929 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -28,14 +28,15 @@ namespace osu.Game.Tests.Beatmaps.Formats
         private static IEnumerable<string> allBeatmaps => TestResources.GetStore().GetAvailableResources().Where(res => res.EndsWith(".osu"));
 
         [TestCaseSource(nameof(allBeatmaps))]
-        public void TestBeatmap(string name)
+        public void TestEncodeDecodeStability(string name)
         {
-            var decoded = decode(name, out var encoded);
+            var decoded = decodeFromLegacy(TestResources.GetStore().GetStream(name));
+            var decodedAfterEncode = decodeFromLegacy(encodeToLegacy(decoded));
 
             sort(decoded);
-            sort(encoded);
+            sort(decodedAfterEncode);
 
-            Assert.That(encoded.Serialize(), Is.EqualTo(decoded.Serialize()));
+            Assert.That(decodedAfterEncode.Serialize(), Is.EqualTo(decoded.Serialize()));
         }
 
         private void sort(IBeatmap beatmap)
@@ -48,27 +49,22 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private IBeatmap decode(string filename, out IBeatmap encoded)
+        private IBeatmap decodeFromLegacy(Stream stream)
         {
-            using (var stream = TestResources.GetStore().GetStream(filename))
-            using (var sr = new LineBufferedReader(stream))
-            {
-                var legacyDecoded = convert(new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(sr));
+            using (var reader = new LineBufferedReader(stream))
+                return convert(new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(reader));
+        }
 
-                using (var ms = new MemoryStream())
-                using (var sw = new StreamWriter(ms))
-                using (var sr2 = new LineBufferedReader(ms, true))
-                {
-                    new LegacyBeatmapEncoder(legacyDecoded).Encode(sw);
+        private Stream encodeToLegacy(IBeatmap beatmap)
+        {
+            var stream = new MemoryStream();
 
-                    sw.Flush();
-                    ms.Position = 0;
+            using (var writer = new StreamWriter(stream, leaveOpen: true))
+                new LegacyBeatmapEncoder(beatmap).Encode(writer);
 
-                    encoded = convert(new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(sr2));
+            stream.Position = 0;
 
-                    return legacyDecoded;
-                }
-            }
+            return stream;
         }
 
         private IBeatmap convert(IBeatmap beatmap)

From 7f7d5e6617a127de2729e01b53b7c7b34608dfc1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 May 2020 16:37:08 +0900
Subject: [PATCH 02660/10326] Fix apparently required argument

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 64efe08929..b1782f7f08 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -6,6 +6,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
@@ -59,7 +60,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         {
             var stream = new MemoryStream();
 
-            using (var writer = new StreamWriter(stream, leaveOpen: true))
+            using (var writer = new StreamWriter(stream, Encoding.UTF8, leaveOpen: true))
                 new LegacyBeatmapEncoder(beatmap).Encode(writer);
 
             stream.Position = 0;

From b9e5009dd5066fb3976725592b04c63812a622c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 May 2020 17:09:34 +0900
Subject: [PATCH 02661/10326] 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 a406cdf08a..69f897128c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.508.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.511.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5ccfaaac9e..c6dba8da13 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.508.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.511.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index dc83d937f7..f78fd2e4ff 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.Framework.iOS" Version="2020.508.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.511.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.508.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.511.0" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From ca6e6f7496f5468df67644e47c6b1c01bd0b82c6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 11 May 2020 17:26:11 +0900
Subject: [PATCH 02662/10326] Add required parameter for android build

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index b1782f7f08..30331e98d2 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         {
             var stream = new MemoryStream();
 
-            using (var writer = new StreamWriter(stream, Encoding.UTF8, leaveOpen: true))
+            using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
                 new LegacyBeatmapEncoder(beatmap).Encode(writer);
 
             stream.Position = 0;

From 6c350db0973c74f0294cc975c2c2b3aa26bf17a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 May 2020 21:37:07 +0900
Subject: [PATCH 02663/10326] Add connection flushing support

---
 .../NonVisual/CustomDataDirectoryTest.cs           | 14 ++++++--------
 osu.Game/Database/DatabaseContextFactory.cs        |  8 ++++++++
 osu.Game/OsuGameBase.cs                            |  8 ++++++++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 4bce5056ce..ed83ff358c 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Tests.NonVisual
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
 
-                    (storage as OsuStorage)?.Migrate(customPath);
+                    osu.Migrate(customPath);
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(customPath));
 
@@ -170,19 +170,18 @@ namespace osu.Game.Tests.NonVisual
                 try
                 {
                     var osu = loadOsu(host);
-                    var storage = osu.Dependencies.Get<Storage>();
 
                     string customPath2 = $"{customPath}-2";
 
                     const string database_filename = "client.db";
 
-                    Assert.DoesNotThrow(() => (storage as OsuStorage)?.Migrate(customPath));
+                    Assert.DoesNotThrow(() => osu.Migrate(customPath));
                     Assert.That(File.Exists(Path.Combine(customPath, database_filename)));
 
-                    Assert.DoesNotThrow(() => (storage as OsuStorage)?.Migrate(customPath2));
+                    Assert.DoesNotThrow(() => osu.Migrate(customPath2));
                     Assert.That(File.Exists(Path.Combine(customPath2, database_filename)));
 
-                    Assert.DoesNotThrow(() => (storage as OsuStorage)?.Migrate(customPath));
+                    Assert.DoesNotThrow(() => osu.Migrate(customPath));
                     Assert.That(File.Exists(Path.Combine(customPath, database_filename)));
                 }
                 finally
@@ -200,10 +199,9 @@ namespace osu.Game.Tests.NonVisual
                 try
                 {
                     var osu = loadOsu(host);
-                    var storage = osu.Dependencies.Get<Storage>();
 
-                    Assert.DoesNotThrow(() => (storage as OsuStorage)?.Migrate(customPath));
-                    Assert.Throws<InvalidOperationException>(() => (storage as OsuStorage)?.Migrate(customPath));
+                    Assert.DoesNotThrow(() => osu.Migrate(customPath));
+                    Assert.Throws<InvalidOperationException>(() => osu.Migrate(customPath));
                 }
                 finally
                 {
diff --git a/osu.Game/Database/DatabaseContextFactory.cs b/osu.Game/Database/DatabaseContextFactory.cs
index 1ed5fb3268..1cceb59b11 100644
--- a/osu.Game/Database/DatabaseContextFactory.cs
+++ b/osu.Game/Database/DatabaseContextFactory.cs
@@ -160,5 +160,13 @@ namespace osu.Game.Database
                 }
             }
         }
+
+        public void FlushConnections()
+        {
+            foreach (var context in threadContexts.Values)
+                context.Dispose();
+
+            recycleThreadContexts();
+        }
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 8fbde67afe..6282f5cb8b 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -328,6 +328,8 @@ namespace osu.Game
         {
             base.Dispose(isDisposing);
             RulesetStore?.Dispose();
+
+            ContextFactory.FlushConnections();
         }
 
         private class OsuUserInputManager : UserInputManager
@@ -355,5 +357,11 @@ namespace osu.Game
                 public override bool ChangeFocusOnClick => false;
             }
         }
+
+        public void Migrate(string path)
+        {
+            ContextFactory.FlushConnections();
+            (Storage as OsuStorage)?.Migrate(path);
+        }
     }
 }

From a11be07bb122b3e1c186cfc418d31a48a1f8869d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 May 2020 21:38:27 +0900
Subject: [PATCH 02664/10326] Move log storage location after migration
 complete

---
 osu.Game/IO/OsuStorage.cs     | 9 ++++++---
 osu.Game/IO/WrappedStorage.cs | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index e178cb0a02..7e1c676324 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -33,10 +33,13 @@ namespace osu.Game.IO
             var customStoragePath = storageConfig.Get<string>(StorageConfig.FullPath);
 
             if (!string.IsNullOrEmpty(customStoragePath))
-            {
                 ChangeTargetStorage(host.GetStorage(customStoragePath));
-                Logger.Storage = UnderlyingStorage.GetStorageForDirectory("logs");
-            }
+        }
+
+        protected override void ChangeTargetStorage(Storage newStorage)
+        {
+            base.ChangeTargetStorage(newStorage);
+            Logger.Storage = UnderlyingStorage.GetStorageForDirectory("logs");
         }
 
         public void Migrate(string newLocation)
diff --git a/osu.Game/IO/WrappedStorage.cs b/osu.Game/IO/WrappedStorage.cs
index cc59e2cc28..646faba9eb 100644
--- a/osu.Game/IO/WrappedStorage.cs
+++ b/osu.Game/IO/WrappedStorage.cs
@@ -27,7 +27,7 @@ namespace osu.Game.IO
 
         protected virtual string MutatePath(string path) => !string.IsNullOrEmpty(subPath) ? Path.Combine(subPath, path) : path;
 
-        protected void ChangeTargetStorage(Storage newStorage)
+        protected virtual void ChangeTargetStorage(Storage newStorage)
         {
             UnderlyingStorage = newStorage;
         }

From 984f27c107ed817ee677a4642e995c594b8805db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 May 2020 21:38:41 +0900
Subject: [PATCH 02665/10326] Add simple retry logic on file copy failure (may
 be in use)

---
 osu.Game/IO/OsuStorage.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 7e1c676324..7c0b90e208 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
@@ -95,7 +96,20 @@ namespace osu.Game.IO
                 if (IGNORE_FILES.Contains(fi.Name))
                     continue;
 
-                fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true);
+                int tries = 5;
+
+                while (tries-- > 0)
+                {
+                    try
+                    {
+                        fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true);
+                        break;
+                    }
+                    catch (Exception)
+                    {
+                        Thread.Sleep(50);
+                    }
+                }
             }
 
             foreach (DirectoryInfo dir in source.GetDirectories())

From e650b10b5e1adfb00123064e043d5768eb0e409f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 May 2020 19:03:13 +0200
Subject: [PATCH 02666/10326] Add test case for maximal break

---
 .../TestSceneDrainingHealthProcessor.cs       | 75 +++++++++----------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
index 2f83ea4832..e50b2231bf 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.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.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
@@ -43,52 +41,61 @@ namespace osu.Game.Tests.Gameplay
         }
 
         [Test]
-        public void TestHealthNotDrainedBeforeBreak()
+        public void TestHealthDrainBetweenBreakAndObjects()
         {
-            createProcessor(createBeatmap(0, 2000,
-                new BreakPeriod(400, 600), new BreakPeriod(1200, 1400)));
+            createProcessor(createBeatmap(0, 2000, new BreakPeriod(325, 375)));
 
-            setTime(300);
+            //               275    300    325    350    375    400    425
+            // hitobjects            o                           o
+            // break                        [-------------]
+            // no drain              [---------------------------]
+
+            setTime(285);
             setHealth(1);
 
-            setTime(400);
-            assertHealthEqualTo(1);
+            setTime(295);
+            assertHealthNotEqualTo(1);
 
-            setTime(1100);
+            setTime(305);
             setHealth(1);
 
-            setTime(1200);
+            setTime(315);
             assertHealthEqualTo(1);
+
+            setTime(365);
+            assertHealthEqualTo(1);
+
+            setTime(395);
+            assertHealthEqualTo(1);
+
+            setTime(425);
+            assertHealthNotEqualTo(1);
         }
 
         [Test]
-        public void TestHealthNotDrainedDuringBreak()
+        public void TestHealthDrainDuringMaximalBreak()
         {
-            createProcessor(createBeatmap(0, 2000, new BreakPeriod(0, 1200)));
+            createProcessor(createBeatmap(0, 2000, new BreakPeriod(300, 400)));
 
-            setTime(700);
-            assertHealthEqualTo(1);
-            setTime(900);
-            assertHealthEqualTo(1);
-        }
+            //               275    300    325    350    375    400    425
+            // hitobjects            o                           o
+            // break                 [---------------------------]
+            // no drain              [---------------------------]
 
-        [Test]
-        public void TestHealthNotDrainedAfterBreak()
-        {
-            createProcessor(createBeatmap(0, 2000,
-                new BreakPeriod(400, 600), new BreakPeriod(1200, 1400)));
-
-            setTime(600);
+            setTime(285);
             setHealth(1);
 
-            setTime(700);
-            assertHealthEqualTo(1);
+            setTime(295);
+            assertHealthNotEqualTo(1);
 
-            setTime(1400);
+            setTime(305);
             setHealth(1);
 
-            setTime(1500);
+            setTime(395);
             assertHealthEqualTo(1);
+
+            setTime(425);
+            assertHealthNotEqualTo(1);
         }
 
         [Test]
@@ -154,24 +161,16 @@ namespace osu.Game.Tests.Gameplay
         {
             var beatmap = new Beatmap
             {
-                BeatmapInfo = { BaseDifficulty = { DrainRate = 5 } },
+                BeatmapInfo = { BaseDifficulty = { DrainRate = 10 } },
             };
 
-            double time = startTime;
-
-            while (time <= endTime)
+            for (double time = startTime; time <= endTime; time += 100)
             {
                 beatmap.HitObjects.Add(new JudgeableHitObject { StartTime = time });
-
-                // leave a 100ms gap between the start and end of a break period.
-                time += (getCurrentBreak(breaks, time)?.Duration ?? 0) + 100;
             }
 
             beatmap.Breaks.AddRange(breaks);
 
-            static BreakPeriod getCurrentBreak(IEnumerable<BreakPeriod> breaks, double time) =>
-                breaks?.FirstOrDefault(b => time >= b.StartTime && time <= b.EndTime);
-
             return beatmap;
         }
 

From 848a3fb6d74ec3b443029cc048934c1df4ea728f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 May 2020 19:06:36 +0200
Subject: [PATCH 02667/10326] Take hitobject start/end times into account in
 drain

---
 osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index 1958efdd6f..982f527517 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -84,12 +84,12 @@ namespace osu.Game.Rulesets.Scoring
             noDrainPeriodTracker = new PeriodTracker(beatmap.Breaks.Select(breakPeriod => new Period(
                 beatmap.HitObjects
                        .Select(hitObject => hitObject.GetEndTime())
-                       .Where(endTime => endTime < breakPeriod.StartTime)
+                       .Where(endTime => endTime <= breakPeriod.StartTime)
                        .DefaultIfEmpty(double.MinValue)
                        .Last(),
                 beatmap.HitObjects
                        .Select(hitObject => hitObject.StartTime)
-                       .Where(startTime => startTime > breakPeriod.EndTime)
+                       .Where(startTime => startTime >= breakPeriod.EndTime)
                        .DefaultIfEmpty(double.MaxValue)
                        .First()
             )));

From 35e7cee458f66391d6bb7e705a34fdfeb2bb65a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=8C=E7=A9=BA=E7=99=BD=E3=80=8D?= <「空白」>
Date: Tue, 12 May 2020 03:18:47 +0900
Subject: [PATCH 02668/10326] Squash commits from private fork

Temporary comments left to-remove later
---
 .../Online/API/Requests/ResponseWithCursor.cs |  9 ++
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 27 +++++-
 .../API/Requests/SearchBeatmapSetsResponse.cs |  2 +-
 .../BeatmapListingFilterControl.cs            | 57 +++++++----
 .../BeatmapListing/BeatmapListingPager.cs     | 92 ++++++++++++++++++
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 94 ++++++++++++++-----
 6 files changed, 236 insertions(+), 45 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs

diff --git a/osu.Game/Online/API/Requests/ResponseWithCursor.cs b/osu.Game/Online/API/Requests/ResponseWithCursor.cs
index e38e73dd01..51e88ca52b 100644
--- a/osu.Game/Online/API/Requests/ResponseWithCursor.cs
+++ b/osu.Game/Online/API/Requests/ResponseWithCursor.cs
@@ -13,4 +13,13 @@ namespace osu.Game.Online.API.Requests
         [JsonProperty("cursor")]
         public dynamic CursorJson;
     }
+
+    public abstract class ResponseWithCursor<T> : ResponseWithCursor where T : class
+    {
+        /// <summary>
+        /// Cursor deserialized into T class type (cannot implicitly convert type to object using raw Cursor)
+        /// </summary>
+        [JsonProperty("cursor")]
+        public T Cursor;
+    }
 }
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 047496b473..fb2cc66dd8 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -5,11 +5,21 @@ using osu.Framework.IO.Network;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Rulesets;
+using Newtonsoft.Json;
 
 namespace osu.Game.Online.API.Requests
 {
     public class SearchBeatmapSetsRequest : APIRequest<SearchBeatmapSetsResponse>
     {
+        public class Cursor
+        {
+            [JsonProperty("approved_date")]
+            public string ApprovedDate;
+
+            [JsonProperty("_id")]
+            public string Id;
+        }
+
         public SearchCategory SearchCategory { get; set; }
 
         public SortCriteria SortCriteria { get; set; }
@@ -22,17 +32,20 @@ namespace osu.Game.Online.API.Requests
 
         private readonly string query;
         private readonly RulesetInfo ruleset;
+        private readonly Cursor cursor;
 
         private string directionString => SortDirection == SortDirection.Descending ? @"desc" : @"asc";
 
-        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset)
+        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, Cursor cursor = null,
+            SearchCategory searchCategory = SearchCategory.Any, SortCriteria sortCriteria = SortCriteria.Ranked, SortDirection sortDirection = SortDirection.Descending)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
+            this.cursor = cursor;
 
-            SearchCategory = SearchCategory.Any;
-            SortCriteria = SortCriteria.Ranked;
-            SortDirection = SortDirection.Descending;
+            SearchCategory = searchCategory;
+            SortCriteria = sortCriteria;
+            SortDirection = sortDirection;
             Genre = SearchGenre.Any;
             Language = SearchLanguage.Any;
         }
@@ -55,6 +68,12 @@ namespace osu.Game.Online.API.Requests
 
             req.AddParameter("sort", $"{SortCriteria.ToString().ToLowerInvariant()}_{directionString}");
 
+            if (cursor != null)
+            {
+                req.AddParameter("cursor[_id]", cursor.Id);
+                req.AddParameter("cursor[approved_date]", cursor.ApprovedDate);
+            }
+
             return req;
         }
 
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
index 3c4fb11ed1..2adf7004e8 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
@@ -7,7 +7,7 @@ using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class SearchBeatmapSetsResponse : ResponseWithCursor
+    public class SearchBeatmapSetsResponse : ResponseWithCursor<SearchBeatmapSetsRequest.Cursor>
     {
         [JsonProperty("beatmapsets")]
         public IEnumerable<APIBeatmapSet> BeatmapSets;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 4dd60c7113..c3e8505ddc 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -13,7 +12,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 using osuTK;
 using osuTK.Graphics;
@@ -24,6 +22,8 @@ namespace osu.Game.Overlays.BeatmapListing
     {
         public Action<List<BeatmapSetInfo>> SearchFinished;
         public Action SearchStarted;
+        /// <summary> List of currently displayed beatmap entries </summary>
+        private List<BeatmapSetInfo> currentBeatmaps;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapListingSortTabControl sortControl;
         private readonly Box sortControlBackground;
 
-        private SearchBeatmapSetsRequest getSetsRequest;
+        private BeatmapListingPager beatmapListingPager;
 
         public BeatmapListingFilterControl()
         {
@@ -115,12 +115,13 @@ namespace osu.Game.Overlays.BeatmapListing
         }
 
         private ScheduledDelegate queryChangedDebounce;
+        private ScheduledDelegate queryPagingDebounce;
 
         private void queueUpdateSearch(bool queryTextChanged = false)
         {
             SearchStarted?.Invoke();
 
-            getSetsRequest?.Cancel();
+            beatmapListingPager?.Reset();
 
             queryChangedDebounce?.Cancel();
             queryChangedDebounce = Scheduler.AddDelayed(updateSearch, queryTextChanged ? 500 : 100);
@@ -128,37 +129,55 @@ namespace osu.Game.Overlays.BeatmapListing
 
         private void updateSearch()
         {
-            getSetsRequest = new SearchBeatmapSetsRequest(searchControl.Query.Value, searchControl.Ruleset.Value)
-            {
-                SearchCategory = searchControl.Category.Value,
-                SortCriteria = sortControl.Current.Value,
-                SortDirection = sortControl.SortDirection.Value,
-                Genre = searchControl.Genre.Value,
-                Language = searchControl.Language.Value
-            };
+            beatmapListingPager = new BeatmapListingPager(
+                api,
+                rulesets,
+                searchControl.Query.Value,
+                searchControl.Ruleset.Value,
+                searchControl.Category.Value,
+                sortControl.Current.Value,
+                sortControl.SortDirection.Value
+            );
 
-            getSetsRequest.Success += response => Schedule(() => onSearchFinished(response));
+            queryPagingDebounce?.Cancel();
+            queryPagingDebounce = null;
+            beatmapListingPager.PageFetched += onSearchFinished;
 
-            api.Queue(getSetsRequest);
+            AddPageToResult();
         }
 
-        private void onSearchFinished(SearchBeatmapSetsResponse response)
+        private void onSearchFinished(List<BeatmapSetInfo> beatmaps)
         {
-            var beatmaps = response.BeatmapSets.Select(r => r.ToBeatmapSet(rulesets)).ToList();
-
-            searchControl.BeatmapSet = response.Total == 0 ? null : beatmaps.First();
+            queryPagingDebounce = Scheduler.AddDelayed(() => queryPagingDebounce = null, 1000);
 
+            if (currentBeatmaps == null || !beatmapListingPager.IsPastFirstPage)
+                currentBeatmaps = beatmaps;
+            else
+                currentBeatmaps.AddRange(beatmaps);
+            
             SearchFinished?.Invoke(beatmaps);
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            getSetsRequest?.Cancel();
+            beatmapListingPager?.Reset();
             queryChangedDebounce?.Cancel();
+            queryPagingDebounce?.Cancel();
 
             base.Dispose(isDisposing);
         }
 
         public void TakeFocus() => searchControl.TakeFocus();
+
+        /// <summary> Request next 50 matches if available </summary>
+        public void AddPageToResult()
+        {
+            if (beatmapListingPager == null || !beatmapListingPager.CanFetchNextPage)
+                return;
+            if (queryPagingDebounce != null)
+                return;
+
+            beatmapListingPager.FetchNextPage();
+        }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
new file mode 100644
index 0000000000..66faf8df7a
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
@@ -0,0 +1,92 @@
+// Copyright (c) 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.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapListingPager
+    {
+        private readonly IAPIProvider api;
+        private readonly RulesetStore rulesets;
+        private readonly string query;
+        private readonly RulesetInfo ruleset;
+        private readonly SearchCategory searchCategory;
+        private readonly SortCriteria sortCriteria;
+        private readonly SortDirection sortDirection;
+
+        public event PageFetchHandler PageFetched;
+        private SearchBeatmapSetsRequest getSetsRequest;
+        private SearchBeatmapSetsResponse lastResponse;
+
+        /// <summary> Reports end of results </summary>
+        private bool isLastPageFetched = false;
+        /// <summary> Job in process lock flag </summary>
+        private bool isFetching => getSetsRequest != null;
+        /// <summary> Whether beatmaps should be appended or replaced </summary>
+        public bool IsPastFirstPage { get; private set; } = false;
+        /// <summary> call FetchNextPage() safe-check </summary>
+        public bool CanFetchNextPage => !isLastPageFetched && !isFetching;
+
+        public BeatmapListingPager(IAPIProvider api, RulesetStore rulesets, string query, RulesetInfo ruleset, SearchCategory searchCategory = SearchCategory.Any, SortCriteria sortCriteria = SortCriteria.Ranked, SortDirection sortDirection = SortDirection.Descending)
+        {
+            this.api = api;
+            this.rulesets = rulesets;
+            this.query = query;
+            this.ruleset = ruleset;
+            this.searchCategory = searchCategory;
+            this.sortCriteria = sortCriteria;
+            this.sortDirection = sortDirection;
+        }
+
+        public void FetchNextPage()
+        {
+            if (isFetching)
+                return;
+
+            if (lastResponse != null)
+                IsPastFirstPage = true;
+
+            getSetsRequest = new SearchBeatmapSetsRequest(
+                query,
+                ruleset,
+                lastResponse?.Cursor,
+                searchCategory,
+                sortCriteria,
+                sortDirection);
+
+            getSetsRequest.Success += response =>
+            {
+                var sets = response.BeatmapSets.Select(responseJson => responseJson.ToBeatmapSet(rulesets)).ToList();
+
+                if (sets.Count == 0)
+                    isLastPageFetched = true;
+
+                lastResponse = response;
+                getSetsRequest = null;
+
+                PageFetched?.Invoke(sets);
+            };
+
+            api.Queue(getSetsRequest);
+        }
+
+        public void Reset()
+        {
+            isLastPageFetched = false;
+            IsPastFirstPage = false;
+
+            lastResponse = null;
+
+            getSetsRequest?.Cancel();
+            getSetsRequest = null;
+        }
+
+        public delegate void PageFetchHandler(List<BeatmapSetInfo> sets);
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index f680f7c67b..c495c8d21b 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -30,13 +30,21 @@ namespace osu.Game.Overlays
         private Drawable currentContent;
         private LoadingLayer loadingLayer;
         private Container panelTarget;
+        private FillFlowContainer<BeatmapPanel> foundContent;
+        private NotFoundDrawable notFoundContent;
+
+        private OverlayScrollContainer resultScrollContainer;
+        /// <summary> Scroll distance threshold from results tail, higher means sooner </summary>
+        private const int pagination_scroll_distance = 500;
+        /// <summary> This is paging event flag </summary>
+        private bool shouldAddNextPage => resultScrollContainer.ScrollableExtent > 0 && resultScrollContainer.IsScrolledToEnd(pagination_scroll_distance);
 
         public BeatmapListingOverlay()
             : base(OverlayColourScheme.Blue)
         {
         }
 
-        private BeatmapListingFilterControl filterControl;
+        private BeatmapListingFilterControl filterControl;//actual search settings
 
         [BackgroundDependencyLoader]
         private void load()
@@ -48,7 +56,7 @@ namespace osu.Game.Overlays
                     RelativeSizeAxes = Axes.Both,
                     Colour = ColourProvider.Background6
                 },
-                new OverlayScrollContainer
+                resultScrollContainer = new OverlayScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarVisible = false,
@@ -80,9 +88,14 @@ namespace osu.Game.Overlays
                                     {
                                         AutoSizeAxes = Axes.Y,
                                         RelativeSizeAxes = Axes.X,
-                                        Padding = new MarginPadding { Horizontal = 20 }
-                                    },
-                                    loadingLayer = new LoadingLayer(panelTarget)
+                                        Padding = new MarginPadding { Horizontal = 20 },
+                                        Children = new Drawable[]
+                                        {
+                                            foundContent = new FillFlowContainer<BeatmapPanel>(),
+                                            notFoundContent = new NotFoundDrawable(),
+                                            loadingLayer = new LoadingLayer(panelTarget)
+                                        }
+                                    }
                                 }
                             },
                         }
@@ -112,27 +125,52 @@ namespace osu.Game.Overlays
 
         private void onSearchFinished(List<BeatmapSetInfo> beatmaps)
         {
+            //No matches case
             if (!beatmaps.Any())
             {
-                LoadComponentAsync(new NotFoundDrawable(), addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
+                LoadComponentAsync(notFoundContent, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
                 return;
             }
 
-            var newPanels = new FillFlowContainer<BeatmapPanel>
+            //New query case
+            if (!shouldAddNextPage)
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Spacing = new Vector2(10),
-                Alpha = 0,
-                Margin = new MarginPadding { Vertical = 15 },
-                ChildrenEnumerable = beatmaps.Select<BeatmapSetInfo, BeatmapPanel>(b => new GridBeatmapPanel(b)
+                //Spawn new child
+                var newPanels = new FillFlowContainer<BeatmapPanel>
                 {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                })
-            };
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Spacing = new Vector2(10),
+                    Alpha = 0,
+                    Margin = new MarginPadding { Vertical = 15 },
+                    ChildrenEnumerable = beatmaps.Select<BeatmapSetInfo, BeatmapPanel>(b => new GridBeatmapPanel(b)
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                    })
+                };
 
-            LoadComponentAsync(newPanels, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
+                foundContent = newPanels;
+                LoadComponentAsync(foundContent, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
+            }
+
+            //Pagination case
+            else
+            {
+
+                beatmaps.ForEach(x =>
+                {
+                    LoadComponentAsync(new GridBeatmapPanel(x)
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                    }, loaded =>
+                    {
+                        foundContent.Add(loaded);
+                        loaded.FadeIn(200, Easing.OutQuint);
+                    });
+                });
+            }
         }
 
         private void addContentToPlaceholder(Drawable content)
@@ -149,13 +187,18 @@ namespace osu.Game.Overlays
                 // 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);
+                lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y)
+                    .Then().Schedule(() => panelTarget.Remove(lastContent));
             }
 
-            panelTarget.Add(currentContent = content);
-            currentContent.FadeIn(200, Easing.OutQuint);
+            if (!content.IsAlive)
+                panelTarget.Add(content);
+            content.FadeIn(200, Easing.OutQuint);
+
+            currentContent = content;
         }
 
+
         protected override void Dispose(bool isDisposing)
         {
             cancellationToken?.Cancel();
@@ -203,5 +246,14 @@ namespace osu.Game.Overlays
                 });
             }
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (shouldAddNextPage)
+                filterControl.AddPageToResult();
+
+        }
     }
 }

From e5821ff2b28df51ed81585d6f2825b688fce5d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 May 2020 22:53:05 +0200
Subject: [PATCH 02669/10326] Integrate GameplayBeatmap changes

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs  | 23 ++++++-------
 .../UI/DrawableTaikoMascot.cs                 | 32 +++++++++++++------
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |  9 +-----
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 492f628482..bd3b360577 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using Humanizer;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
@@ -76,23 +75,14 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         {
             AddStep("set beatmap", () => setBeatmap());
 
-            // the bindables need to be independent for each content cell to prevent interference,
-            // as if some of the skins don't implement the animation they'll immediately revert to the previous state from the clear state.
-            var states = new List<Bindable<TaikoMascotAnimationState>>();
+            AddStep("create mascot", () => SetContents(() => new DrawableTaikoMascot { RelativeSizeAxes = Axes.Both }));
 
-            AddStep("create mascot", () => SetContents(() =>
-            {
-                var state = new Bindable<TaikoMascotAnimationState>(TaikoMascotAnimationState.Clear);
-                states.Add(state);
-                return new DrawableTaikoMascot { State = { BindTarget = state }, RelativeSizeAxes = Axes.Both };
-            }));
-
-            AddStep("set clear state", () => states.ForEach(state => state.Value = TaikoMascotAnimationState.Clear));
-            AddStep("miss", () => mascots.ForEach(mascot => mascot.OnNewResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss })));
+            AddStep("set clear state", () => mascots.ForEach(mascot => mascot.State.Value = TaikoMascotAnimationState.Clear));
+            AddStep("miss", () => mascots.ForEach(mascot => mascot.LastResult.Value = new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss }));
             AddAssert("skins with animations remain in clear state", () => someMascotsIn(TaikoMascotAnimationState.Clear));
             AddUntilStep("state reverts to fail", () => allMascotsIn(TaikoMascotAnimationState.Fail));
 
-            AddStep("set clear state again", () => states.ForEach(state => state.Value = TaikoMascotAnimationState.Clear));
+            AddStep("set clear state again", () => mascots.ForEach(mascot => mascot.State.Value = TaikoMascotAnimationState.Clear));
             AddAssert("skins with animations change to clear", () => someMascotsIn(TaikoMascotAnimationState.Clear));
         }
 
@@ -220,6 +210,11 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
                 playfield.OnNewResult(hit, judgementResult);
             }
+
+            foreach (var mascot in mascots)
+            {
+                mascot.LastResult.Value = judgementResult;
+            }
         }
 
         private bool allMascotsIn(TaikoMascotAnimationState state) => mascots.All(d => d.State.Value == state);
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index 9328b607e6..105baa84cc 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -12,14 +12,15 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Taiko.Judgements;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
     public class DrawableTaikoMascot : BeatSyncedContainer
     {
-        public IBindable<TaikoMascotAnimationState> State => state;
+        public readonly Bindable<TaikoMascotAnimationState> State;
+        public readonly Bindable<JudgementResult> LastResult;
 
-        private readonly Bindable<TaikoMascotAnimationState> state;
         private readonly Dictionary<TaikoMascotAnimationState, TaikoMascotAnimation> animations;
         private TaikoMascotAnimation currentAnimation;
 
@@ -30,12 +31,14 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             Origin = Anchor = Anchor.BottomLeft;
 
-            state = new Bindable<TaikoMascotAnimationState>(startingState);
+            State = new Bindable<TaikoMascotAnimationState>(startingState);
+            LastResult = new Bindable<JudgementResult>();
+
             animations = new Dictionary<TaikoMascotAnimationState, TaikoMascotAnimation>();
         }
 
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        [BackgroundDependencyLoader(true)]
+        private void load(TextureStore textures, GameplayBeatmap gameplayBeatmap)
         {
             InternalChildren = new[]
             {
@@ -44,6 +47,9 @@ namespace osu.Game.Rulesets.Taiko.UI
                 animations[TaikoMascotAnimationState.Kiai] = new TaikoMascotAnimation(TaikoMascotAnimationState.Kiai),
                 animations[TaikoMascotAnimationState.Fail] = new TaikoMascotAnimation(TaikoMascotAnimationState.Fail),
             };
+
+            if (gameplayBeatmap != null)
+                ((IBindable<JudgementResult>)LastResult).BindTo(gameplayBeatmap.LastJudgementResult);
         }
 
         protected override void LoadComplete()
@@ -51,16 +57,22 @@ namespace osu.Game.Rulesets.Taiko.UI
             base.LoadComplete();
 
             animations.Values.ForEach(animation => animation.Hide());
-            state.BindValueChanged(mascotStateChanged, true);
+
+            State.BindValueChanged(mascotStateChanged, true);
+            LastResult.BindValueChanged(onNewResult);
         }
 
-        public void OnNewResult(JudgementResult result)
+        private void onNewResult(ValueChangedEvent<JudgementResult> resultChangedEvent)
         {
+            var result = resultChangedEvent.NewValue;
+            if (result == null)
+                return;
+
             // TODO: missing support for clear/fail state transition at end of beatmap gameplay
 
             if (triggerComboClear(result) || triggerSwellClear(result))
             {
-                state.Value = TaikoMascotAnimationState.Clear;
+                State.Value = TaikoMascotAnimationState.Clear;
                 // always consider a clear equivalent to a hit to avoid clear -> miss transitions
                 lastObjectHit = true;
             }
@@ -79,7 +91,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         protected override void Update()
         {
             base.Update();
-            state.Value = getNextState();
+            State.Value = getNextState();
         }
 
         private TaikoMascotAnimationState getNextState()
@@ -87,7 +99,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             // don't change state if current animation is playing
             // (used for clear state - others are manually animated on new beats)
             if (currentAnimation != null && !currentAnimation.Completed)
-                return state.Value;
+                return State.Value;
 
             if (!lastObjectHit)
                 return TaikoMascotAnimationState.Fail;
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 0fe0d6165b..21676510ad 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -40,8 +40,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private Container hitTargetOffsetContent;
 
-        private SkinnableDrawable mascotDrawable;
-
         public TaikoPlayfield(ControlPointInfo controlPoints)
         {
             this.controlPoints = controlPoints;
@@ -127,7 +125,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                         },
                     }
                 },
-                mascotDrawable = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoDon), _ => Empty())
+                new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoDon), _ => Empty())
                 {
                     Origin = Anchor.BottomLeft,
                     Anchor = Anchor.TopLeft,
@@ -212,11 +210,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     addExplosion(judgedObject, type);
                     break;
             }
-
-            if (mascotDrawable.Drawable is DrawableTaikoMascot mascot)
-            {
-                mascot.OnNewResult(result);
-            }
         }
 
         private void addDrumRollHit(DrawableDrumRollTick drawableTick) =>

From bf719f98d5c664a0282b4bd186070dfa0fed0ccc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 11:08:30 +0900
Subject: [PATCH 02670/10326] Fix beatmap skins providing fallback version
 lookup, preceding user skins

---
 osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs | 6 +++---
 osu.Game/Skinning/LegacyBeatmapSkin.cs                   | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index 685decf097..8deed75a56 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -152,11 +152,12 @@ namespace osu.Game.Tests.Skins
         }
 
         [Test]
-        public void TestSetBeatmapVersionNoFallback()
+        public void TestSetBeatmapVersionFallsBackToUserSkin()
         {
+            // completely ignoring beatmap versions for simplicity.
             AddStep("Set user skin version 2.3", () => userSource.Configuration.LegacyVersion = 2.3m);
             AddStep("Set beatmap skin version null", () => beatmapSource.Configuration.LegacyVersion = 1.7m);
-            AddAssert("Check legacy version lookup", () => requester.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value == 1.7m);
+            AddAssert("Check legacy version lookup", () => requester.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value == 2.3m);
         }
 
         [Test]
@@ -172,7 +173,6 @@ namespace osu.Game.Tests.Skins
         public void TestIniWithNoVersionFallsBackTo1()
         {
             AddStep("Parse skin with no version", () => userSource.Configuration = new LegacySkinDecoder().Decode(new LineBufferedReader(new MemoryStream())));
-            AddStep("Set beatmap skin version null", () => beatmapSource.Configuration.LegacyVersion = null);
             AddAssert("Check legacy version lookup", () => requester.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value == 1.0m);
         }
 
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 21533e58cd..87bca856a3 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -27,9 +27,11 @@ namespace osu.Game.Skinning
             switch (lookup)
             {
                 case LegacySkinConfiguration.LegacySetting s when s == LegacySkinConfiguration.LegacySetting.Version:
-                    if (Configuration.LegacyVersion is decimal version)
-                        return SkinUtils.As<TValue>(new Bindable<decimal>(version));
+                    // For lookup simplicity, ignore beatmap-level versioning completely.
 
+                    // If it is decided that we need this due to beatmaps somehow using it, the default (1.0 specified in LegacySkinDecoder.CreateTemplateObject)
+                    // needs to be removed else it will cause incorrect skin behaviours. This is due to the config lookup having no context of which skin
+                    // it should be returning the version for.
                     return null;
             }
 

From a5c1b461f6985d4c369a8f57336de16f4e07c662 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 11:14:51 +0900
Subject: [PATCH 02671/10326] Fix null reference in difficulty recommender

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

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 20cdca858a..0dd3341a93 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Select
         {
             base.Dispose(isDisposing);
 
-            api.Unregister(this);
+            api?.Unregister(this);
         }
     }
 }

From 3b1680583e2ff39976485b1991355daa7c9ec13e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 11:31:08 +0900
Subject: [PATCH 02672/10326] Fix taiko scroller not following gameplay time

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 1ecdb839fb..4cf1af3b8f 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -17,6 +17,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 {
     public class LegacyTaikoScroller : CompositeDrawable
     {
+        [Resolved(canBeNull: true)]
+        private GameplayClock gameplayClock { get; set; }
+
         public LegacyTaikoScroller()
         {
             RelativeSizeAxes = Axes.Both;
@@ -63,7 +66,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 foreach (var sprite in InternalChildren)
                 {
                     // add the x coordinates and perform re-layout on all sprites as spacing may change with gameplay scale.
-                    sprite.X = additiveX ??= sprite.X - (float)Time.Elapsed * 0.1f;
+                    sprite.X = additiveX ??= sprite.X - (float)(gameplayClock ?? Clock).ElapsedFrameTime * 0.1f;
 
                     additiveX += sprite.DrawWidth - 1;
 

From e9804bf11be0c535540bde81c09909ba2ecdb132 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 11:55:12 +0900
Subject: [PATCH 02673/10326] 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 69f897128c..650ebde54d 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.427.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.511.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c6dba8da13..ee6206e166 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.511.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f78fd2e4ff..cbf8600c62 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.511.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From e4a23b3e7d7eb065578f48c2d53e7981e37c6a59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 12:39:04 +0900
Subject: [PATCH 02674/10326] Fix ignored excluding more than top level

---
 osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs | 10 ++++++++++
 osu.Game/IO/OsuStorage.cs                           |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index ed83ff358c..ef2b20de64 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -133,6 +133,9 @@ namespace osu.Game.Tests.NonVisual
                     // ensure we "use" cache
                     host.Storage.GetStorageForDirectory("cache");
 
+                    // for testing nested files are not ignored (only top level)
+                    host.Storage.GetStorageForDirectory("test-nested").GetStorageForDirectory("cache");
+
                     string defaultStorageLocation = Path.Combine(Environment.CurrentDirectory, "headless", nameof(TestMigration));
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
@@ -141,6 +144,13 @@ namespace osu.Game.Tests.NonVisual
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(customPath));
 
+                    // ensure cache was not moved
+                    Assert.That(host.Storage.ExistsDirectory("cache"));
+
+                    // ensure nested cache was moved
+                    Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
+                    Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
+
                     foreach (var file in OsuStorage.IGNORE_FILES)
                     {
                         Assert.That(host.Storage.Exists(file), Is.True);
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 7c0b90e208..6dc25e871c 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -71,7 +71,7 @@ namespace osu.Game.IO
         {
             foreach (System.IO.FileInfo fi in target.GetFiles())
             {
-                if (IGNORE_FILES.Contains(fi.Name))
+                if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
                     continue;
 
                 fi.Delete();
@@ -79,7 +79,7 @@ namespace osu.Game.IO
 
             foreach (DirectoryInfo dir in target.GetDirectories())
             {
-                if (IGNORE_DIRECTORIES.Contains(dir.Name))
+                if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
                     continue;
 
                 dir.Delete(true);
@@ -93,7 +93,7 @@ namespace osu.Game.IO
 
             foreach (System.IO.FileInfo fi in source.GetFiles())
             {
-                if (IGNORE_FILES.Contains(fi.Name))
+                if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
                     continue;
 
                 int tries = 5;
@@ -114,7 +114,7 @@ namespace osu.Game.IO
 
             foreach (DirectoryInfo dir in source.GetDirectories())
             {
-                if (IGNORE_DIRECTORIES.Contains(dir.Name))
+                if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
                     continue;
 
                 copyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);

From 75a40578e85690ae62bf089ae77ad06519b4ef08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 12:39:52 +0900
Subject: [PATCH 02675/10326] Revert ContextFactory to private

---
 osu.Game/OsuGameBase.cs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 6282f5cb8b..11a3834c71 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -121,7 +121,7 @@ namespace osu.Game
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-        protected DatabaseContextFactory ContextFactory;
+        private DatabaseContextFactory contextFactory;
 
         protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
 
@@ -130,7 +130,7 @@ namespace osu.Game
         {
             Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly));
 
-            dependencies.Cache(ContextFactory = new DatabaseContextFactory(Storage));
+            dependencies.Cache(contextFactory = new DatabaseContextFactory(Storage));
 
             dependencies.CacheAs(Storage);
 
@@ -161,7 +161,7 @@ namespace osu.Game
 
             runMigrations();
 
-            dependencies.Cache(SkinManager = new SkinManager(Storage, ContextFactory, Host, Audio, new NamespacedResourceStore<byte[]>(Resources, "Skins/Legacy")));
+            dependencies.Cache(SkinManager = new SkinManager(Storage, contextFactory, Host, Audio, new NamespacedResourceStore<byte[]>(Resources, "Skins/Legacy")));
             dependencies.CacheAs<ISkinSource>(SkinManager);
 
             if (API == null) API = new APIAccess(LocalConfig);
@@ -170,12 +170,12 @@ namespace osu.Game
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
-            dependencies.Cache(RulesetStore = new RulesetStore(ContextFactory, Storage));
-            dependencies.Cache(FileStore = new FileStore(ContextFactory, Storage));
+            dependencies.Cache(RulesetStore = new RulesetStore(contextFactory, Storage));
+            dependencies.Cache(FileStore = new FileStore(contextFactory, Storage));
 
             // ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup()
-            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, ContextFactory, Host));
-            dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, ContextFactory, RulesetStore, API, Audio, Host, defaultBeatmap));
+            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Host));
+            dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Host, defaultBeatmap));
 
             // this should likely be moved to ArchiveModelManager when another case appers where it is necessary
             // to have inter-dependent model managers. this could be obtained with an IHasForeign<T> interface to
@@ -189,8 +189,8 @@ namespace osu.Game
             BeatmapManager.ItemRemoved += i => ScoreManager.Delete(getBeatmapScores(i), true);
             BeatmapManager.ItemAdded += i => ScoreManager.Undelete(getBeatmapScores(i), true);
 
-            dependencies.Cache(KeyBindingStore = new KeyBindingStore(ContextFactory, RulesetStore));
-            dependencies.Cache(SettingsStore = new SettingsStore(ContextFactory));
+            dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
+            dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
             dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore));
             dependencies.Cache(new SessionStatics());
             dependencies.Cache(new OsuColour());
@@ -279,7 +279,7 @@ namespace osu.Game
         {
             try
             {
-                using (var db = ContextFactory.GetForWrite(false))
+                using (var db = contextFactory.GetForWrite(false))
                     db.Context.Migrate();
             }
             catch (Exception e)
@@ -288,12 +288,12 @@ namespace osu.Game
 
                 // if we failed, let's delete the database and start fresh.
                 // todo: we probably want a better (non-destructive) migrations/recovery process at a later point than this.
-                ContextFactory.ResetDatabase();
+                contextFactory.ResetDatabase();
 
                 Logger.Log("Database purged successfully.", LoggingTarget.Database);
 
                 // only run once more, then hard bail.
-                using (var db = ContextFactory.GetForWrite(false))
+                using (var db = contextFactory.GetForWrite(false))
                     db.Context.Migrate();
             }
         }
@@ -329,7 +329,7 @@ namespace osu.Game
             base.Dispose(isDisposing);
             RulesetStore?.Dispose();
 
-            ContextFactory.FlushConnections();
+            contextFactory.FlushConnections();
         }
 
         private class OsuUserInputManager : UserInputManager
@@ -360,7 +360,7 @@ namespace osu.Game
 
         public void Migrate(string path)
         {
-            ContextFactory.FlushConnections();
+            contextFactory.FlushConnections();
             (Storage as OsuStorage)?.Migrate(path);
         }
     }

From a86c7f478c8b251ceec760ce860fa21658505dee Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Tue, 12 May 2020 05:49:35 +0200
Subject: [PATCH 02676/10326] Initial commit

---
 osu.Game/OsuGame.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 3caffb6db5..6e202b6315 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -91,7 +91,7 @@ namespace osu.Game
 
         protected BackButton BackButton;
 
-        protected SettingsPanel Settings;
+        protected SettingsOverlay Settings;
 
         private VolumeOverlay volume;
         private OsuLogo osuLogo;
@@ -767,11 +767,17 @@ namespace osu.Game
 
         private Task asyncLoadStream;
 
+        /// <summary>
+        /// Schedules loading the provided <paramref name="d"/> in a single file.
+        /// </summary>
+        /// <param name="d">The component to load.</param>
+        /// <param name="add">The method to invoke for adding the component.</param>
+        /// <param name="cache">Whether to cache the component as type <typeparamref name="T"/> into the game dependencies before any scheduling.</param>
         private T loadComponentSingleFile<T>(T d, Action<T> add, bool cache = false)
             where T : Drawable
         {
             if (cache)
-                dependencies.Cache(d);
+                dependencies.CacheAs(d);
 
             if (d is OverlayContainer overlay)
                 overlays.Add(overlay);

From 39c36998c99509104c60f23cdce61a70e64e3c59 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Tue, 12 May 2020 06:06:31 +0200
Subject: [PATCH 02677/10326] Revert changes that are to be resolved in #9002

---
 osu.Game/OsuGame.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 899056e179..294180cb30 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -90,7 +90,7 @@ namespace osu.Game
 
         protected BackButton BackButton;
 
-        protected SettingsOverlay Settings;
+        protected SettingsPanel Settings;
 
         private VolumeOverlay volume;
         private OsuLogo osuLogo;
@@ -767,17 +767,11 @@ namespace osu.Game
 
         private Task asyncLoadStream;
 
-        /// <summary>
-        /// Schedules loading the provided <paramref name="d"/> in a single file.
-        /// </summary>
-        /// <param name="d">The component to load.</param>
-        /// <param name="add">The method to invoke for adding the component.</param>
-        /// <param name="cache">Whether to cache the component as type <typeparamref name="T"/> into the game dependencies before any scheduling.</param>
         private T loadComponentSingleFile<T>(T d, Action<T> add, bool cache = false)
             where T : Drawable
         {
             if (cache)
-                dependencies.CacheAs(d);
+                dependencies.Cache(d);
 
             if (d is OverlayContainer overlay)
                 overlays.Add(overlay);

From 949e17cc0e8f4666d87b9be541b5c31b3e5686a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 15:23:47 +0900
Subject: [PATCH 02678/10326] Rework scroller to support backwards playback

---
 .../Skinning/TestSceneTaikoScroller.cs        | 20 ++++++-
 .../Skinning/LegacyTaikoScroller.cs           | 52 +++++++++++--------
 .../UI/DrawableTaikoRuleset.cs                |  2 +-
 3 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
index e26f410b71..9a2ada7f72 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Skinning;
@@ -12,11 +13,28 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 {
     public class TestSceneTaikoScroller : TaikoSkinnableTestScene
     {
+        private readonly ManualClock clock = new ManualClock();
+
+        private bool reversed;
+
         public TestSceneTaikoScroller()
         {
-            AddStep("Load scroller", () => SetContents(() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Empty())));
+            AddStep("Load scroller", () => SetContents(() =>
+                new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Empty())
+                {
+                    Clock = new FramedClock(clock)
+                }));
             AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.LastResult.Value =
                 new JudgementResult(null, new Judgement()) { Type = passing ? HitResult.Perfect : HitResult.Miss }));
+
+            AddToggleStep("toggle playback direction", reversed => this.reversed = reversed);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            clock.CurrentTime += (reversed ? -1 : 1) * Clock.ElapsedFrameTime;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 4cf1af3b8f..b3a325ea68 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -17,9 +17,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 {
     public class LegacyTaikoScroller : CompositeDrawable
     {
-        [Resolved(canBeNull: true)]
-        private GameplayClock gameplayClock { get; set; }
-
         public LegacyTaikoScroller()
         {
             RelativeSizeAxes = Axes.Both;
@@ -59,31 +56,42 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         {
             base.Update();
 
-            while (true)
+            bool wideEnough() =>
+                InternalChildren.Any()
+                && InternalChildren.First().ScreenSpaceDrawQuad.Width * InternalChildren.Count >= ScreenSpaceDrawQuad.Width * 2;
+
+            // store X before checking wide enough so if we perform layout there is no positional discrepancy.
+            float currentX = (InternalChildren?.FirstOrDefault()?.X ?? 0) - (float)Clock.ElapsedFrameTime * 0.1f;
+
+            // ensure we have enough sprites
+            if (!wideEnough())
             {
-                float? additiveX = null;
+                ClearInternal();
 
-                foreach (var sprite in InternalChildren)
-                {
-                    // add the x coordinates and perform re-layout on all sprites as spacing may change with gameplay scale.
-                    sprite.X = additiveX ??= sprite.X - (float)(gameplayClock ?? Clock).ElapsedFrameTime * 0.1f;
+                while (!wideEnough())
+                    AddInternal(new ScrollerSprite { Passing = passing });
+            }
 
-                    additiveX += sprite.DrawWidth - 1;
+            var first = InternalChildren.First();
+            var last = InternalChildren.Last();
 
-                    if (sprite.X + sprite.DrawWidth < 0)
-                        sprite.Expire();
-                }
+            foreach (var sprite in InternalChildren)
+            {
+                // add the x coordinates and perform re-layout on all sprites as spacing may change with gameplay scale.
+                sprite.X = currentX;
+                currentX += sprite.DrawWidth - 1;
+            }
 
-                var last = InternalChildren.LastOrDefault();
+            if (first.ScreenSpaceDrawQuad.TopLeft.X >= ScreenSpaceDrawQuad.TopLeft.X)
+            {
+                foreach (var internalChild in InternalChildren)
+                    internalChild.X -= first.DrawWidth;
+            }
 
-                // only break from this loop once we have saturated horizontal space completely.
-                if (last != null && last.ScreenSpaceDrawQuad.TopRight.X >= ScreenSpaceDrawQuad.TopRight.X)
-                    break;
-
-                AddInternal(new ScrollerSprite
-                {
-                    Passing = passing
-                });
+            if (last.ScreenSpaceDrawQuad.TopRight.X <= ScreenSpaceDrawQuad.TopRight.X)
+            {
+                foreach (var internalChild in InternalChildren)
+                    internalChild.X += first.DrawWidth;
             }
         }
 
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index c0a6c4582c..21d595a97a 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(bar.Major ? new DrawableBarLineMajor(bar) : new DrawableBarLine(bar)));
 
-            AddInternal(scroller = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Empty())
+            FrameStableComponents.Add(scroller = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Empty())
             {
                 RelativeSizeAxes = Axes.X,
                 Depth = float.MaxValue

From c7d8793c1d96bd817d36ad1ae918ab4c6048fa33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 15:44:14 +0900
Subject: [PATCH 02679/10326] Remove unnecessary overlap

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index b3a325ea68..28114ac74f 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             {
                 // add the x coordinates and perform re-layout on all sprites as spacing may change with gameplay scale.
                 sprite.X = currentX;
-                currentX += sprite.DrawWidth - 1;
+                currentX += sprite.DrawWidth;
             }
 
             if (first.ScreenSpaceDrawQuad.TopLeft.X >= ScreenSpaceDrawQuad.TopLeft.X)

From c04f2b0840ded76704dc37210273285d2bf8200a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 15:51:59 +0900
Subject: [PATCH 02680/10326] Reposition taiko playfield to be closer to the
 top of the screen

---
 .../UI/TaikoPlayfieldAdjustmentContainer.cs            | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
index 980f5ea340..1041456020 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
@@ -13,18 +13,16 @@ namespace osu.Game.Rulesets.Taiko.UI
         private const float default_relative_height = TaikoPlayfield.DEFAULT_HEIGHT / 768;
         private const float default_aspect = 16f / 9f;
 
-        public TaikoPlayfieldAdjustmentContainer()
-        {
-            Anchor = Anchor.CentreLeft;
-            Origin = Anchor.CentreLeft;
-        }
-
         protected override void Update()
         {
             base.Update();
 
             float aspectAdjust = Math.Clamp(Parent.ChildSize.X / Parent.ChildSize.Y, 0.4f, 4) / default_aspect;
             Size = new Vector2(1, default_relative_height * aspectAdjust);
+
+            // Position the taiko playfield exactly one playfield from the top of the screen.
+            RelativePositionAxes = Axes.Y;
+            Y = Size.Y;
         }
     }
 }

From e28e89213f07767c12b2eed7d0a5b3063a5ef82b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 16:58:47 +0900
Subject: [PATCH 02681/10326] Fix incorrect spawning when scale adjustments are
 applied to child sprites

---
 .../Skinning/TestSceneTaikoScroller.cs                   | 3 ++-
 osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs  | 9 ++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
index 9a2ada7f72..39e6bc2d6d 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
@@ -22,7 +22,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             AddStep("Load scroller", () => SetContents(() =>
                 new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Empty())
                 {
-                    Clock = new FramedClock(clock)
+                    Clock = new FramedClock(clock),
+                    Height = 0.4f,
                 }));
             AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.LastResult.Value =
                 new JudgementResult(null, new Judgement()) { Type = passing ? HitResult.Perfect : HitResult.Miss }));
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 28114ac74f..3ec6be8a6c 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -64,13 +64,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             float currentX = (InternalChildren?.FirstOrDefault()?.X ?? 0) - (float)Clock.ElapsedFrameTime * 0.1f;
 
             // ensure we have enough sprites
-            if (!wideEnough())
-            {
-                ClearInternal();
-
-                while (!wideEnough())
-                    AddInternal(new ScrollerSprite { Passing = passing });
-            }
+            while (!wideEnough())
+                AddInternal(new ScrollerSprite { Passing = passing });
 
             var first = InternalChildren.First();
             var last = InternalChildren.Last();

From de50b725d59be235c0be5ccee68d20f648c0c045 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 20:08:35 +0900
Subject: [PATCH 02682/10326] Fix mod failure checks executing actual game
 logic

---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs     |  3 ++-
 osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs |  3 ++-
 osu.Game/Rulesets/Mods/IApplicableFailOverride.cs |  5 +++--
 osu.Game/Rulesets/Mods/ModAutoplay.cs             |  3 ++-
 osu.Game/Rulesets/Mods/ModBlockFail.cs            |  2 +-
 osu.Game/Rulesets/Mods/ModEasy.cs                 | 13 +++++--------
 osu.Game/Rulesets/Mods/ModSuddenDeath.cs          |  3 ++-
 osu.Game/Screens/Play/Player.cs                   |  4 ++--
 osu.Game/Screens/Play/ReplayPlayer.cs             |  2 +-
 osu.Game/Tests/Visual/ModPerfectTestScene.cs      |  2 +-
 osu.Game/Tests/Visual/ModTestScene.cs             |  6 ++++--
 11 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index fe46876050..d75f4c70d7 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };
 
-        public bool AllowFail => false;
+        public bool PerformFail() => false;
+
         public bool RestartOnFail => false;
 
         private OsuInputManager inputManager;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
index e82722e7a2..1908988739 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
@@ -33,7 +33,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
             public new HUDOverlay HUDOverlay => base.HUDOverlay;
-            public new bool AllowFail => base.AllowFail;
+
+            public bool AllowFail => base.CheckModsAllowFailure();
 
             protected override bool PauseOnFocusLost => false;
 
diff --git a/osu.Game/Rulesets/Mods/IApplicableFailOverride.cs b/osu.Game/Rulesets/Mods/IApplicableFailOverride.cs
index 120bfc9a23..8c99d739cb 100644
--- a/osu.Game/Rulesets/Mods/IApplicableFailOverride.cs
+++ b/osu.Game/Rulesets/Mods/IApplicableFailOverride.cs
@@ -11,10 +11,11 @@ namespace osu.Game.Rulesets.Mods
         /// <summary>
         /// Whether we should allow failing at the current point in time.
         /// </summary>
-        bool AllowFail { get; }
+        /// <returns>Whether the fail should be allowed to proceed. Return false to block.</returns>
+        bool PerformFail();
 
         /// <summary>
-        /// Whether we want to restart on fail. Only used if <see cref="AllowFail"/> is true.
+        /// Whether we want to restart on fail. Only used if <see cref="PerformFail"/> returns true.
         /// </summary>
         bool RestartOnFail { get; }
     }
diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index e51b8b6457..945dd444be 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -27,7 +27,8 @@ namespace osu.Game.Rulesets.Mods
         public override string Description => "Watch a perfect automated play through the song.";
         public override double ScoreMultiplier => 1;
 
-        public bool AllowFail => false;
+        public bool PerformFail() => false;
+
         public bool RestartOnFail => false;
 
         public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };
diff --git a/osu.Game/Rulesets/Mods/ModBlockFail.cs b/osu.Game/Rulesets/Mods/ModBlockFail.cs
index 7d7ecfa416..1fde5abad4 100644
--- a/osu.Game/Rulesets/Mods/ModBlockFail.cs
+++ b/osu.Game/Rulesets/Mods/ModBlockFail.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
         /// <summary>
         /// We never fail, 'yo.
         /// </summary>
-        public bool AllowFail => false;
+        public bool PerformFail() => false;
 
         public bool RestartOnFail => false;
 
diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index c1c4124b98..7cf9656810 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -48,17 +48,14 @@ namespace osu.Game.Rulesets.Mods
             retries = Retries.Value;
         }
 
-        public bool AllowFail
+        public bool PerformFail()
         {
-            get
-            {
-                if (retries == 0) return true;
+            if (retries == 0) return true;
 
-                health.Value = health.MaxValue;
-                retries--;
+            health.Value = health.MaxValue;
+            retries--;
 
-                return false;
-            }
+            return false;
         }
 
         public bool RestartOnFail => false;
diff --git a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
index 8799431f1d..df10262845 100644
--- a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
+++ b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
@@ -20,7 +20,8 @@ namespace osu.Game.Rulesets.Mods
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
 
-        public bool AllowFail => true;
+        public bool PerformFail() => true;
+
         public bool RestartOnFail => true;
 
         public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a2735c8c55..1ec3a69b24 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Screens.Play
         /// Whether failing should be allowed.
         /// By default, this checks whether all selected mods allow failing.
         /// </summary>
-        protected virtual bool AllowFail => Mods.Value.OfType<IApplicableFailOverride>().All(m => m.AllowFail);
+        protected virtual bool CheckModsAllowFailure() => Mods.Value.OfType<IApplicableFailOverride>().All(m => m.PerformFail());
 
         private readonly bool allowPause;
         private readonly bool showResults;
@@ -485,7 +485,7 @@ namespace osu.Game.Screens.Play
 
         private bool onFail()
         {
-            if (!AllowFail)
+            if (!CheckModsAllowFailure())
                 return false;
 
             HasFailed = true;
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 0d2ddb7b01..f0c76163f1 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Play
         private readonly Score score;
 
         // Disallow replays from failing. (see https://github.com/ppy/osu/issues/6108)
-        protected override bool AllowFail => false;
+        protected override bool CheckModsAllowFailure() => false;
 
         public ReplayPlayer(Score score, bool allowPause = true, bool showResults = true)
             : base(allowPause, showResults)
diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
index 5948283428..c16352bead 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual
             {
             }
 
-            protected override bool AllowFail => true;
+            protected override bool CheckModsAllowFailure() => false;
 
             public bool CheckFailed(bool failed)
             {
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 8b41fb5075..b5b3084097 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -64,12 +64,14 @@ namespace osu.Game.Tests.Visual
 
         protected class ModTestPlayer : TestPlayer
         {
-            protected override bool AllowFail { get; }
+            private readonly bool allowFail;
+
+            protected override bool CheckModsAllowFailure() => allowFail;
 
             public ModTestPlayer(bool allowFail)
                 : base(false, false)
             {
-                AllowFail = allowFail;
+                this.allowFail = allowFail;
             }
         }
 

From 44319c1b719c64468de0594e22c48c357c3c62ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 20:26:34 +0900
Subject: [PATCH 02683/10326] Commit missed change

---
 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 c16352bead..95a62bbf65 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual
             {
             }
 
-            protected override bool CheckModsAllowFailure() => false;
+            protected override bool CheckModsAllowFailure() => true;
 
             public bool CheckFailed(bool failed)
             {

From f07d95ac59e77eb1fbfeaae58ece62b26828de46 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Tue, 12 May 2020 21:49:55 +0800
Subject: [PATCH 02684/10326] Use IReadOnlyList<T> for TypedListConverter.

---
 .../IO/Serialization/Converters/TypedListConverter.cs  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
index ec0036dae2..f98fa05821 100644
--- a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
+++ b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
@@ -9,12 +9,12 @@ using Newtonsoft.Json.Linq;
 namespace osu.Game.IO.Serialization.Converters
 {
     /// <summary>
-    /// A type of <see cref="JsonConverter"/> that serializes an <see cref="IEnumerable{T}"/> alongside
+    /// A type of <see cref="JsonConverter"/> that serializes an <see cref="IReadOnlyList{T}"/> alongside
     /// a lookup table for the types contained. The lookup table is used in deserialization to
     /// reconstruct the objects with their original types.
     /// </summary>
-    /// <typeparam name="T">The type of objects contained in the <see cref="IEnumerable{T}"/> this attribute is attached to.</typeparam>
-    public class TypedListConverter<T> : JsonConverter<IEnumerable<T>>
+    /// <typeparam name="T">The type of objects contained in the <see cref="IReadOnlyList{T}"/> this attribute is attached to.</typeparam>
+    public class TypedListConverter<T> : JsonConverter<IReadOnlyList<T>>
     {
         private readonly bool requiresTypeVersion;
 
@@ -36,7 +36,7 @@ namespace osu.Game.IO.Serialization.Converters
             this.requiresTypeVersion = requiresTypeVersion;
         }
 
-        public override IEnumerable<T> ReadJson(JsonReader reader, Type objectType, IEnumerable<T> existingValue, bool hasExistingValue, JsonSerializer serializer)
+        public override IReadOnlyList<T> ReadJson(JsonReader reader, Type objectType, IReadOnlyList<T> existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
             var list = new List<T>();
 
@@ -57,7 +57,7 @@ namespace osu.Game.IO.Serialization.Converters
             return list;
         }
 
-        public override void WriteJson(JsonWriter writer, IEnumerable<T> value, JsonSerializer serializer)
+        public override void WriteJson(JsonWriter writer, IReadOnlyList<T> value, JsonSerializer serializer)
         {
             var lookupTable = new List<string>();
             var objects = new List<JObject>();

From 0c60b10757b1d605cb1d15c20c510a3b9a63ddbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=8C=E7=A9=BA=E7=99=BD=E3=80=8D?= <「空白」>
Date: Wed, 13 May 2020 01:14:11 +0900
Subject: [PATCH 02685/10326] Fix code factor issues

> ran "dotnet format --check", shouldn't return whitespace errors anymore
---
 .../Overlays/BeatmapListing/BeatmapListingFilterControl.cs   | 2 +-
 osu.Game/Overlays/BeatmapListingOverlay.cs                   | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index c3e8505ddc..3f06bc20ed 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 currentBeatmaps = beatmaps;
             else
                 currentBeatmaps.AddRange(beatmaps);
-            
+
             SearchFinished?.Invoke(beatmaps);
         }
 
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index c495c8d21b..115fe02999 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays
         {
         }
 
-        private BeatmapListingFilterControl filterControl;//actual search settings
+        private BeatmapListingFilterControl filterControl;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -157,7 +157,6 @@ namespace osu.Game.Overlays
             //Pagination case
             else
             {
-
                 beatmaps.ForEach(x =>
                 {
                     LoadComponentAsync(new GridBeatmapPanel(x)
@@ -198,7 +197,6 @@ namespace osu.Game.Overlays
             currentContent = content;
         }
 
-
         protected override void Dispose(bool isDisposing)
         {
             cancellationToken?.Cancel();
@@ -253,7 +251,6 @@ namespace osu.Game.Overlays
 
             if (shouldAddNextPage)
                 filterControl.AddPageToResult();
-
         }
     }
 }

From 82190a07b82f439c8e221c2420ca9b61e7d7e944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=8C=E7=A9=BA=E7=99=BD=E3=80=8D?= <「空白」>
Date: Wed, 13 May 2020 02:01:38 +0900
Subject: [PATCH 02686/10326] Remove temporary comments

> Removes unnecessary xmldoc comments
---
 osu.Game/Online/API/Requests/ResponseWithCursor.cs            | 3 ---
 .../Overlays/BeatmapListing/BeatmapListingFilterControl.cs    | 2 --
 osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs       | 4 ----
 osu.Game/Overlays/BeatmapListingOverlay.cs                    | 2 --
 4 files changed, 11 deletions(-)

diff --git a/osu.Game/Online/API/Requests/ResponseWithCursor.cs b/osu.Game/Online/API/Requests/ResponseWithCursor.cs
index 51e88ca52b..b0fe9eea28 100644
--- a/osu.Game/Online/API/Requests/ResponseWithCursor.cs
+++ b/osu.Game/Online/API/Requests/ResponseWithCursor.cs
@@ -16,9 +16,6 @@ namespace osu.Game.Online.API.Requests
 
     public abstract class ResponseWithCursor<T> : ResponseWithCursor where T : class
     {
-        /// <summary>
-        /// Cursor deserialized into T class type (cannot implicitly convert type to object using raw Cursor)
-        /// </summary>
         [JsonProperty("cursor")]
         public T Cursor;
     }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 3f06bc20ed..ac5ad96f7c 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Overlays.BeatmapListing
     {
         public Action<List<BeatmapSetInfo>> SearchFinished;
         public Action SearchStarted;
-        /// <summary> List of currently displayed beatmap entries </summary>
         private List<BeatmapSetInfo> currentBeatmaps;
 
         [Resolved]
@@ -169,7 +168,6 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public void TakeFocus() => searchControl.TakeFocus();
 
-        /// <summary> Request next 50 matches if available </summary>
         public void AddPageToResult()
         {
             if (beatmapListingPager == null || !beatmapListingPager.CanFetchNextPage)
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
index 66faf8df7a..4c8902d314 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
@@ -24,13 +24,9 @@ namespace osu.Game.Overlays.BeatmapListing
         private SearchBeatmapSetsRequest getSetsRequest;
         private SearchBeatmapSetsResponse lastResponse;
 
-        /// <summary> Reports end of results </summary>
         private bool isLastPageFetched = false;
-        /// <summary> Job in process lock flag </summary>
         private bool isFetching => getSetsRequest != null;
-        /// <summary> Whether beatmaps should be appended or replaced </summary>
         public bool IsPastFirstPage { get; private set; } = false;
-        /// <summary> call FetchNextPage() safe-check </summary>
         public bool CanFetchNextPage => !isLastPageFetched && !isFetching;
 
         public BeatmapListingPager(IAPIProvider api, RulesetStore rulesets, string query, RulesetInfo ruleset, SearchCategory searchCategory = SearchCategory.Any, SortCriteria sortCriteria = SortCriteria.Ranked, SortDirection sortDirection = SortDirection.Descending)
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 115fe02999..ba92181ac5 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -34,9 +34,7 @@ namespace osu.Game.Overlays
         private NotFoundDrawable notFoundContent;
 
         private OverlayScrollContainer resultScrollContainer;
-        /// <summary> Scroll distance threshold from results tail, higher means sooner </summary>
         private const int pagination_scroll_distance = 500;
-        /// <summary> This is paging event flag </summary>
         private bool shouldAddNextPage => resultScrollContainer.ScrollableExtent > 0 && resultScrollContainer.IsScrolledToEnd(pagination_scroll_distance);
 
         public BeatmapListingOverlay()

From e321494f15c182beec3e8c911341968cbfa73417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=8C=E7=A9=BA=E7=99=BD=E3=80=8D?= <「空白」>
Date: Wed, 13 May 2020 02:15:24 +0900
Subject: [PATCH 02687/10326] Fix sort-by handling

> Add other cursor fields for paging different sortings
> Sorted as they show in GUI code-wise for more readability for now
---
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index fb2cc66dd8..2987d554af 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -13,8 +13,29 @@ namespace osu.Game.Online.API.Requests
     {
         public class Cursor
         {
+            [JsonProperty("title.raw")]
+            public string Title;
+
+            [JsonProperty("artist.raw")]
+            public string Artist;
+
+            [JsonProperty("beatmaps.difficultyrating")]
+            public string Difficulty;
+
             [JsonProperty("approved_date")]
-            public string ApprovedDate;
+            public string Ranked;
+
+            [JsonProperty("rating")]
+            public string Rating;
+
+            [JsonProperty("play_count")]
+            public string Plays;
+
+            [JsonProperty("favourite_count")]
+            public string Favourites;
+
+            [JsonProperty("_score")]
+            public string Relevance;
 
             [JsonProperty("_id")]
             public string Id;
@@ -70,8 +91,24 @@ namespace osu.Game.Online.API.Requests
 
             if (cursor != null)
             {
+                if (cursor.Title != null)
+                    req.AddParameter("cursor[title.raw]", cursor.Title);
+                if (cursor.Artist != null)
+                    req.AddParameter("cursor[artist.raw]", cursor.Artist);
+                if (cursor.Difficulty != null)
+                    req.AddParameter("cursor[beatmaps.difficultyrating]", cursor.Difficulty);
+                if (cursor.Ranked != null)
+                    req.AddParameter("cursor[approved_date]", cursor.Ranked);
+                if (cursor.Rating != null)
+                    req.AddParameter("cursor[rating]", cursor.Rating);
+                if (cursor.Plays != null)
+                    req.AddParameter("cursor[play_count]", cursor.Plays);
+                if (cursor.Favourites != null)
+                    req.AddParameter("cursor[favourite_count]", cursor.Favourites);
+                if (cursor.Relevance != null)
+                    req.AddParameter("cursor[_score]", cursor.Relevance);
+
                 req.AddParameter("cursor[_id]", cursor.Id);
-                req.AddParameter("cursor[approved_date]", cursor.ApprovedDate);
             }
 
             return req;

From 942cc48e99ac41a480c48faa9270534d31225e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 May 2020 20:26:11 +0200
Subject: [PATCH 02688/10326] Improve mascot scaling

---
 .../UI/TaikoMascotAnimation.cs                  |  2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs    | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
index 0bf6bc7d49..01cf88a87e 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             InternalChild = textureAnimation = createTextureAnimation(state).With(animation =>
             {
                 animation.Origin = animation.Anchor = Anchor.BottomLeft;
-                animation.Scale = new Vector2(0.6f);
+                animation.Scale = new Vector2(0.51f); // close enough to stable
             });
 
             RelativeSizeAxes = Axes.Both;
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 21676510ad..5940ee8b69 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Layout;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -15,6 +16,7 @@ using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -32,6 +34,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private JudgementContainer<DrawableTaikoJudgement> judgementContainer;
         private ScrollingHitObjectContainer drumRollHitContainer;
         internal Drawable HitTarget;
+        private SkinnableDrawable mascot;
 
         private ProxyContainer topLevelHitContainer;
         private ProxyContainer barlineContainer;
@@ -40,9 +43,14 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private Container hitTargetOffsetContent;
 
+        private readonly LayoutValue<float> playfieldScaleLayout = new LayoutValue<float>(Invalidation.DrawSize);
+        private float playfieldScale => playfieldScaleLayout.IsValid ? playfieldScaleLayout.Value : playfieldScaleLayout.Value = DrawHeight / DEFAULT_HEIGHT;
+
         public TaikoPlayfield(ControlPointInfo controlPoints)
         {
             this.controlPoints = controlPoints;
+
+            AddLayout(playfieldScaleLayout);
         }
 
         [BackgroundDependencyLoader]
@@ -125,14 +133,13 @@ namespace osu.Game.Rulesets.Taiko.UI
                         },
                     }
                 },
-                new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoDon), _ => Empty())
+                mascot = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoDon), _ => Empty())
                 {
                     Origin = Anchor.BottomLeft,
                     Anchor = Anchor.TopLeft,
-                    RelativePositionAxes = Axes.None,
+                    RelativePositionAxes = Axes.Y,
                     RelativeSizeAxes = Axes.None,
-                    X = 15,
-                    Y = 45
+                    Y = 0.2f
                 },
                 topLevelHitContainer = new ProxyContainer
                 {
@@ -151,6 +158,8 @@ namespace osu.Game.Rulesets.Taiko.UI
             // This is basically allowing for correct alignment as relative pieces move around them.
             rightArea.Padding = new MarginPadding { Left = leftArea.DrawWidth };
             hitTargetOffsetContent.Padding = new MarginPadding { Left = HitTarget.DrawWidth / 2 };
+
+            mascot.Scale = new Vector2(playfieldScale);
         }
 
         public override void Add(DrawableHitObject h)

From cabf3a89b1e79edcd452900477a684ad4f5b3bd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=8C=E7=A9=BA=E7=99=BD=E3=80=8D?= <「空白」>
Date: Wed, 13 May 2020 03:44:57 +0900
Subject: [PATCH 02689/10326] More robust cursor parsing solution

> Change cursor request to return last response's entire cursor structure
---
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 54 +++----------------
 1 file changed, 8 insertions(+), 46 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 2987d554af..e1df7fe6d3 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -2,10 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.IO.Network;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Rulesets;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
 
 namespace osu.Game.Online.API.Requests
 {
@@ -13,32 +16,8 @@ namespace osu.Game.Online.API.Requests
     {
         public class Cursor
         {
-            [JsonProperty("title.raw")]
-            public string Title;
-
-            [JsonProperty("artist.raw")]
-            public string Artist;
-
-            [JsonProperty("beatmaps.difficultyrating")]
-            public string Difficulty;
-
-            [JsonProperty("approved_date")]
-            public string Ranked;
-
-            [JsonProperty("rating")]
-            public string Rating;
-
-            [JsonProperty("play_count")]
-            public string Plays;
-
-            [JsonProperty("favourite_count")]
-            public string Favourites;
-
-            [JsonProperty("_score")]
-            public string Relevance;
-
-            [JsonProperty("_id")]
-            public string Id;
+            [JsonExtensionData]
+            public IDictionary<string, JToken> Properties;
         }
 
         public SearchCategory SearchCategory { get; set; }
@@ -89,27 +68,10 @@ namespace osu.Game.Online.API.Requests
 
             req.AddParameter("sort", $"{SortCriteria.ToString().ToLowerInvariant()}_{directionString}");
 
-            if (cursor != null)
+            cursor?.Properties.ForEach(x =>
             {
-                if (cursor.Title != null)
-                    req.AddParameter("cursor[title.raw]", cursor.Title);
-                if (cursor.Artist != null)
-                    req.AddParameter("cursor[artist.raw]", cursor.Artist);
-                if (cursor.Difficulty != null)
-                    req.AddParameter("cursor[beatmaps.difficultyrating]", cursor.Difficulty);
-                if (cursor.Ranked != null)
-                    req.AddParameter("cursor[approved_date]", cursor.Ranked);
-                if (cursor.Rating != null)
-                    req.AddParameter("cursor[rating]", cursor.Rating);
-                if (cursor.Plays != null)
-                    req.AddParameter("cursor[play_count]", cursor.Plays);
-                if (cursor.Favourites != null)
-                    req.AddParameter("cursor[favourite_count]", cursor.Favourites);
-                if (cursor.Relevance != null)
-                    req.AddParameter("cursor[_score]", cursor.Relevance);
-
-                req.AddParameter("cursor[_id]", cursor.Id);
-            }
+                req.AddParameter("cursor[" + x.Key + "]", x.Value?.ToString());
+            });
 
             return req;
         }

From 5962dedd35947eab90642aef09a6dee8547e3ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=8C=E7=A9=BA=E7=99=BD=E3=80=8D?= <「空白」>
Date: Wed, 13 May 2020 05:04:39 +0900
Subject: [PATCH 02690/10326] Reimplement cursor as part of WebRequest
 extensions

> Added WebRequestExtensions
> Moved Cursor request logic from SearchBeatmapSetsRequest
---
 osu.Game/Extensions/WebRequestExtensions.cs   | 25 +++++++++++++++++++
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 16 ++----------
 .../API/Requests/SearchBeatmapSetsResponse.cs |  3 ++-
 3 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 osu.Game/Extensions/WebRequestExtensions.cs

diff --git a/osu.Game/Extensions/WebRequestExtensions.cs b/osu.Game/Extensions/WebRequestExtensions.cs
new file mode 100644
index 0000000000..c8e3c564a5
--- /dev/null
+++ b/osu.Game/Extensions/WebRequestExtensions.cs
@@ -0,0 +1,25 @@
+using osu.Framework.IO.Network;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace osu.Game.Extensions
+{
+    public class Cursor
+    {
+        [JsonExtensionData]
+        public IDictionary<string, JToken> Properties;
+    }
+
+    public static class WebRequestExtensions
+    {
+        public static void AddCursor(this WebRequest webRequest, Cursor cursor)
+        {
+            cursor?.Properties.ForEach(x =>
+            {
+                webRequest.AddParameter("cursor[" + x.Key + "]", x.Value.ToString());
+            });
+        }
+    }
+}
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index e1df7fe6d3..a49cb70c37 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -2,24 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.IO.Network;
-using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Extensions;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Rulesets;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System.Collections.Generic;
 
 namespace osu.Game.Online.API.Requests
 {
     public class SearchBeatmapSetsRequest : APIRequest<SearchBeatmapSetsResponse>
     {
-        public class Cursor
-        {
-            [JsonExtensionData]
-            public IDictionary<string, JToken> Properties;
-        }
-
         public SearchCategory SearchCategory { get; set; }
 
         public SortCriteria SortCriteria { get; set; }
@@ -68,10 +59,7 @@ namespace osu.Game.Online.API.Requests
 
             req.AddParameter("sort", $"{SortCriteria.ToString().ToLowerInvariant()}_{directionString}");
 
-            cursor?.Properties.ForEach(x =>
-            {
-                req.AddParameter("cursor[" + x.Key + "]", x.Value?.ToString());
-            });
+            req.AddCursor(cursor);
 
             return req;
         }
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
index 2adf7004e8..a4d2c0e871 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
@@ -3,11 +3,12 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Game.Extensions;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class SearchBeatmapSetsResponse : ResponseWithCursor<SearchBeatmapSetsRequest.Cursor>
+    public class SearchBeatmapSetsResponse : ResponseWithCursor<Cursor>
     {
         [JsonProperty("beatmapsets")]
         public IEnumerable<APIBeatmapSet> BeatmapSets;

From 7874045b1f82e34dac1df8eb8d849f25a878ab97 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 12 May 2020 21:12:48 +0200
Subject: [PATCH 02691/10326] Allow disabling SkipOverlay through
 AllowGameplayOverlays.

---
 osu.Game/Screens/Play/Player.cs      | 6 +++++-
 osu.Game/Screens/Play/SkipOverlay.cs | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a2735c8c55..b24cef8eae 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -83,6 +83,8 @@ namespace osu.Game.Screens.Play
 
         private BreakTracker breakTracker;
 
+        private SkipOverlay skipOverlay;
+
         protected ScoreProcessor ScoreProcessor { get; private set; }
 
         protected HealthProcessor HealthProcessor { get; private set; }
@@ -189,6 +191,8 @@ namespace osu.Game.Screens.Play
                 HUDOverlay.ShowHud.Value = false;
                 HUDOverlay.ShowHud.Disabled = true;
                 BreakOverlay.Hide();
+                skipOverlay.Disabled = true;
+                skipOverlay.Hide();
             }
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
@@ -290,7 +294,7 @@ namespace osu.Game.Screens.Play
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre
                 },
-                new SkipOverlay(DrawableRuleset.GameplayStartTime)
+                skipOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
                 {
                     RequestSkip = GameplayClockContainer.Skip
                 },
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index ac7e509c2c..757dcd21ed 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private GameplayClock gameplayClock { get; set; }
 
+        public bool Disabled { get; set; }
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         /// <summary>
@@ -105,7 +107,8 @@ namespace osu.Game.Screens.Play
             button.Action = () => RequestSkip?.Invoke();
             displayTime = gameplayClock.CurrentTime;
 
-            Show();
+            if (!Disabled)
+                Show();
         }
 
         protected override void PopIn() => this.FadeIn(fade_time);
@@ -121,7 +124,7 @@ namespace osu.Game.Screens.Play
             remainingTimeBox.Width = (float)Interpolation.Lerp(remainingTimeBox.Width, progress, Math.Clamp(Time.Elapsed / 40, 0, 1));
 
             button.Enabled.Value = progress > 0;
-            State.Value = progress > 0 ? Visibility.Visible : Visibility.Hidden;
+            State.Value = progress > 0 && !Disabled ? Visibility.Visible : Visibility.Hidden;
         }
 
         protected override bool OnMouseMove(MouseMoveEvent e)

From bbf4c687a8b155499cf50634ce545888f3ee0770 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 11:09:17 +0900
Subject: [PATCH 02692/10326] Improve xmldoc

---
 osu.Game/OsuGame.cs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6e202b6315..7ecd7851d7 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -768,18 +768,19 @@ namespace osu.Game
         private Task asyncLoadStream;
 
         /// <summary>
-        /// Schedules loading the provided <paramref name="d"/> in a single file.
+        /// Queues loading the provided component in sequential fashion.
+        /// This operation is limited to a single thread to avoid saturating all cores.
         /// </summary>
-        /// <param name="d">The component to load.</param>
-        /// <param name="add">The method to invoke for adding the component.</param>
+        /// <param name="component">The component to load.</param>
+        /// <param name="loadCompleteAction">An action to invoke on load completion (generally to add the component to the hierarchy).</param>
         /// <param name="cache">Whether to cache the component as type <typeparamref name="T"/> into the game dependencies before any scheduling.</param>
-        private T loadComponentSingleFile<T>(T d, Action<T> add, bool cache = false)
+        private T loadComponentSingleFile<T>(T component, Action<T> loadCompleteAction, bool cache = false)
             where T : Drawable
         {
             if (cache)
-                dependencies.CacheAs(d);
+                dependencies.CacheAs(component);
 
-            if (d is OverlayContainer overlay)
+            if (component is OverlayContainer overlay)
                 overlays.Add(overlay);
 
             // schedule is here to ensure that all component loads are done after LoadComplete is run (and thus all dependencies are cached).
@@ -797,12 +798,12 @@ namespace osu.Game
 
                     try
                     {
-                        Logger.Log($"Loading {d}...", level: LogLevel.Debug);
+                        Logger.Log($"Loading {component}...", level: LogLevel.Debug);
 
                         // Since this is running in a separate thread, it is possible for OsuGame to be disposed after LoadComponentAsync has been called
                         // throwing an exception. To avoid this, the call is scheduled on the update thread, which does not run if IsDisposed = true
                         Task task = null;
-                        var del = new ScheduledDelegate(() => task = LoadComponentAsync(d, add));
+                        var del = new ScheduledDelegate(() => task = LoadComponentAsync(component, loadCompleteAction));
                         Scheduler.Add(del);
 
                         // The delegate won't complete if OsuGame has been disposed in the meantime
@@ -817,7 +818,7 @@ namespace osu.Game
 
                         await task;
 
-                        Logger.Log($"Loaded {d}!", level: LogLevel.Debug);
+                        Logger.Log($"Loaded {component}!", level: LogLevel.Debug);
                     }
                     catch (OperationCanceledException)
                     {
@@ -825,7 +826,7 @@ namespace osu.Game
                 });
             });
 
-            return d;
+            return component;
         }
 
         protected override bool OnScroll(ScrollEvent e)

From 78f1b230e924b7065d629919f7b2ac0c42dcdc47 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 13 May 2020 14:43:50 +0900
Subject: [PATCH 02693/10326] Disable right-click placement in the mania editor

---
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs             | 4 ++++
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs                | 4 ++++
 .../Edit/Blueprints/NotePlacementBlueprint.cs                 | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index b3dd392202..c63e30e98a 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -7,6 +7,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
@@ -49,6 +50,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
+            if (e.Button != MouseButton.Left)
+                return;
+
             base.OnMouseUp(e);
             EndPlacement(true);
         }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 400abb6380..3fb03d642f 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
@@ -46,6 +47,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
+            if (e.Button != MouseButton.Left)
+                return false;
+
             if (Column == null)
                 return base.OnMouseDown(e);
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index 2b7b383dbe..a4c0791253 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -5,6 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
@@ -30,6 +31,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
+            if (e.Button != MouseButton.Left)
+                return false;
+
             base.OnMouseDown(e);
 
             // Place the note immediately.

From 8500f8fe767c4f7362cf4c6c38685de270cdf77a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 May 2020 18:12:58 +0900
Subject: [PATCH 02694/10326] Add basic implementation

---
 .../Settings/TestSceneDirectorySelector.cs    | 195 ++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
new file mode 100644
index 0000000000..416d978c69
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
@@ -0,0 +1,195 @@
+// Copyright (c) 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 System.Linq;
+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.Platform;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    public class TestSceneDirectorySelector : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
+        {
+            Add(new DirectorySelector { RelativeSizeAxes = Axes.Both });
+        }
+    }
+
+    public class DirectorySelector : CompositeDrawable
+    {
+        private Storage root;
+        private FillFlowContainer directoryFlow;
+        private CurrentDirectoryDisplay current;
+
+        [Resolved]
+        private GameHost host { get; set; }
+
+        private readonly Bindable<string> currentDirectory = new Bindable<string>();
+
+        public DirectorySelector(Storage root = null)
+        {
+            this.root = root;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Padding = new MarginPadding(10);
+
+            if (root == null)
+                root = host.GetStorage("/Users/");
+
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        current = new CurrentDirectoryDisplay
+                        {
+                            CurrentDirectory = { BindTarget = currentDirectory },
+                            RelativeSizeAxes = Axes.X,
+                            Height = 50,
+                        },
+                        new OsuScrollContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Child = directoryFlow = new FillFlowContainer
+                            {
+                                AutoSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.X,
+                                Direction = FillDirection.Vertical,
+                            }
+                        }
+                    }
+                },
+            };
+
+            currentDirectory.BindValueChanged(updateDisplay);
+            currentDirectory.Value = root.GetFullPath(string.Empty);
+        }
+
+        private void updateDisplay(ValueChangedEvent<string> directory)
+        {
+            root = host.GetStorage(directory.NewValue);
+
+            directoryFlow.Clear();
+
+            directoryFlow.Add(new ParentDirectoryRow(getParentPath()) { CurrentDirectory = { BindTarget = currentDirectory }, });
+
+            foreach (var dir in root.GetDirectories(string.Empty))
+                directoryFlow.Add(new DirectoryRow(dir, root.GetFullPath(dir)) { CurrentDirectory = { BindTarget = currentDirectory }, });
+        }
+
+        private string getParentPath() => Path.GetFullPath(Path.Combine(root.GetFullPath(string.Empty), ".."));
+
+        public class CurrentDirectoryDisplay : CompositeDrawable
+        {
+            public readonly Bindable<string> CurrentDirectory = new Bindable<string>();
+
+            public CurrentDirectoryDisplay()
+            {
+                FillFlowContainer flow;
+
+                InternalChildren = new Drawable[]
+                {
+                    flow = new FillFlowContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.X,
+                        Spacing = new Vector2(10),
+                        Height = 20,
+                        Direction = FillDirection.Horizontal,
+                    },
+                };
+
+                CurrentDirectory.BindValueChanged(dir =>
+                {
+                    flow.Clear();
+
+                    flow.Add(new OsuSpriteText { Text = "Current Directory: " });
+
+                    var pieces = dir.NewValue.Split(Path.DirectorySeparatorChar);
+
+                    pieces[0] = "/";
+
+                    for (int i = 0; i < pieces.Length; i++)
+                    {
+                        flow.Add(new DirectoryRow(pieces[i], Path.Combine(pieces.Take(i + 1).ToArray()))
+                        {
+                            CurrentDirectory = { BindTarget = CurrentDirectory },
+                            RelativeSizeAxes = Axes.Y,
+                            Size = new Vector2(100, 1)
+                        });
+                    }
+                });
+            }
+        }
+
+        private class ParentDirectoryRow : DirectoryRow
+        {
+            public override IconUsage Icon => FontAwesome.Solid.Folder;
+
+            public ParentDirectoryRow(string fullPath)
+                : base("..", fullPath)
+            {
+            }
+        }
+
+        private class DirectoryRow : OsuButton
+        {
+            private readonly string fullPath;
+
+            public readonly Bindable<string> CurrentDirectory = new Bindable<string>();
+
+            public DirectoryRow(string display, string fullPath)
+            {
+                this.fullPath = fullPath;
+
+                RelativeSizeAxes = Axes.X;
+                Height = 20;
+
+                BackgroundColour = OsuColour.Gray(0.1f);
+
+                AddRange(new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Icon = Icon,
+                        Size = new Vector2(20)
+                    },
+                    new OsuSpriteText
+                    {
+                        X = 25,
+                        Text = display,
+                        Font = OsuFont.Default.With(size: 20)
+                    }
+                });
+
+                Action = PerformDirectoryTraversal;
+            }
+
+            protected virtual void PerformDirectoryTraversal()
+            {
+                CurrentDirectory.Value = fullPath;
+            }
+
+            public virtual IconUsage Icon => FontAwesome.Regular.Folder;
+        }
+    }
+}

From 2c83417c41e29be9a5e474df65a7806dbf747577 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 18:08:43 +0900
Subject: [PATCH 02695/10326] Switch to using DirectoryInfo/DriveInfo

---
 .../Settings/TestSceneDirectorySelector.cs    | 122 +++++++++---------
 1 file changed, 64 insertions(+), 58 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
index 416d978c69..beb5353115 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.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.IO;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -8,11 +9,11 @@ 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.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Settings
@@ -28,18 +29,17 @@ namespace osu.Game.Tests.Visual.Settings
 
     public class DirectorySelector : CompositeDrawable
     {
-        private Storage root;
         private FillFlowContainer directoryFlow;
-        private CurrentDirectoryDisplay current;
 
         [Resolved]
         private GameHost host { get; set; }
 
-        private readonly Bindable<string> currentDirectory = new Bindable<string>();
+        [Cached]
+        private readonly Bindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
 
-        public DirectorySelector(Storage root = null)
+        public DirectorySelector(string initialPath = null)
         {
-            this.root = root;
+            currentDirectory.Value = new DirectoryInfo(initialPath ??= Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
         }
 
         protected override void LoadComplete()
@@ -48,9 +48,6 @@ namespace osu.Game.Tests.Visual.Settings
 
             Padding = new MarginPadding(10);
 
-            if (root == null)
-                root = host.GetStorage("/Users/");
-
             InternalChildren = new Drawable[]
             {
                 new FillFlowContainer
@@ -59,9 +56,8 @@ namespace osu.Game.Tests.Visual.Settings
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        current = new CurrentDirectoryDisplay
+                        new CurrentDirectoryDisplay
                         {
-                            CurrentDirectory = { BindTarget = currentDirectory },
                             RelativeSizeAxes = Axes.X,
                             Height = 50,
                         },
@@ -79,29 +75,39 @@ namespace osu.Game.Tests.Visual.Settings
                 },
             };
 
-            currentDirectory.BindValueChanged(updateDisplay);
-            currentDirectory.Value = root.GetFullPath(string.Empty);
+            currentDirectory.BindValueChanged(updateDisplay, true);
         }
 
-        private void updateDisplay(ValueChangedEvent<string> directory)
+        private void updateDisplay(ValueChangedEvent<DirectoryInfo> directory)
         {
-            root = host.GetStorage(directory.NewValue);
-
             directoryFlow.Clear();
 
-            directoryFlow.Add(new ParentDirectoryRow(getParentPath()) { CurrentDirectory = { BindTarget = currentDirectory }, });
+            if (directory.NewValue == null)
+            {
+                // var drives = DriveInfo.GetDrives();
+                //
+                // foreach (var drive in drives)
+                //     directoryFlow.Add(new DirectoryRow(drive.RootDirectory));
+            }
+            else
+            {
+                directoryFlow.Add(new ParentDirectoryRow(currentDirectory.Value.Parent));
 
-            foreach (var dir in root.GetDirectories(string.Empty))
-                directoryFlow.Add(new DirectoryRow(dir, root.GetFullPath(dir)) { CurrentDirectory = { BindTarget = currentDirectory }, });
+                foreach (var dir in currentDirectory.Value.GetDirectories().OrderBy(d => d.Name))
+                {
+                    if ((dir.Attributes & FileAttributes.Hidden) == 0)
+                        directoryFlow.Add(new DirectoryRow(dir));
+                }
+            }
         }
 
-        private string getParentPath() => Path.GetFullPath(Path.Combine(root.GetFullPath(string.Empty), ".."));
-
         public class CurrentDirectoryDisplay : CompositeDrawable
         {
-            public readonly Bindable<string> CurrentDirectory = new Bindable<string>();
+            [Resolved]
+            private Bindable<DirectoryInfo> currentDirectory { get; set; }
 
-            public CurrentDirectoryDisplay()
+            [BackgroundDependencyLoader]
+            private void load()
             {
                 FillFlowContainer flow;
 
@@ -118,26 +124,26 @@ namespace osu.Game.Tests.Visual.Settings
                     },
                 };
 
-                CurrentDirectory.BindValueChanged(dir =>
+                currentDirectory.BindValueChanged(dir =>
                 {
                     flow.Clear();
 
-                    flow.Add(new OsuSpriteText { Text = "Current Directory: " });
-
-                    var pieces = dir.NewValue.Split(Path.DirectorySeparatorChar);
-
-                    pieces[0] = "/";
-
-                    for (int i = 0; i < pieces.Length; i++)
+                    flow.Add(new OsuSpriteText
                     {
-                        flow.Add(new DirectoryRow(pieces[i], Path.Combine(pieces.Take(i + 1).ToArray()))
-                        {
-                            CurrentDirectory = { BindTarget = CurrentDirectory },
-                            RelativeSizeAxes = Axes.Y,
-                            Size = new Vector2(100, 1)
-                        });
+                        Text = "Current Directory: ",
+                        Font = OsuFont.Default.With(size: DirectoryRow.HEIGHT),
+                    });
+
+                    flow.Add(new DirectoryRow(null, "Computer"));
+
+                    DirectoryInfo traverse = dir.NewValue;
+
+                    while (traverse != null)
+                    {
+                        flow.Add(new DirectoryRow(traverse));
+                        traverse = traverse.Parent;
                     }
-                });
+                }, true);
             }
         }
 
@@ -145,48 +151,48 @@ namespace osu.Game.Tests.Visual.Settings
         {
             public override IconUsage Icon => FontAwesome.Solid.Folder;
 
-            public ParentDirectoryRow(string fullPath)
-                : base("..", fullPath)
+            public ParentDirectoryRow(DirectoryInfo directory)
+                : base(directory, "..")
             {
             }
         }
 
-        private class DirectoryRow : OsuButton
+        private class DirectoryRow : CompositeDrawable
         {
-            private readonly string fullPath;
+            public const float HEIGHT = 20;
 
-            public readonly Bindable<string> CurrentDirectory = new Bindable<string>();
+            private readonly DirectoryInfo directory;
 
-            public DirectoryRow(string display, string fullPath)
+            [Resolved]
+            private Bindable<DirectoryInfo> currentDirectory { get; set; }
+
+            public DirectoryRow(DirectoryInfo directory, string display = null)
             {
-                this.fullPath = fullPath;
+                this.directory = directory;
 
-                RelativeSizeAxes = Axes.X;
-                Height = 20;
+                AutoSizeAxes = Axes.X;
+                Height = HEIGHT;
 
-                BackgroundColour = OsuColour.Gray(0.1f);
-
-                AddRange(new Drawable[]
+                AddRangeInternal(new Drawable[]
                 {
                     new SpriteIcon
                     {
                         Icon = Icon,
-                        Size = new Vector2(20)
+                        Size = new Vector2(HEIGHT)
                     },
                     new OsuSpriteText
                     {
-                        X = 25,
-                        Text = display,
-                        Font = OsuFont.Default.With(size: 20)
+                        X = HEIGHT + 5,
+                        Text = display ?? directory.Name,
+                        Font = OsuFont.Default.With(size: HEIGHT)
                     }
                 });
-
-                Action = PerformDirectoryTraversal;
             }
 
-            protected virtual void PerformDirectoryTraversal()
+            protected override bool OnClick(ClickEvent e)
             {
-                CurrentDirectory.Value = fullPath;
+                currentDirectory.Value = directory;
+                return true;
             }
 
             public virtual IconUsage Icon => FontAwesome.Regular.Folder;

From 49e4fc6cba39028b5be157b975a26ae85e2e2161 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 18:37:14 +0900
Subject: [PATCH 02696/10326] Move to better namespace

---
 .../Settings/TestSceneDirectorySelector.cs    | 184 +-----------
 .../UserInterfaceV2/DirectorySelector.cs      | 261 ++++++++++++++++++
 2 files changed, 262 insertions(+), 183 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
index beb5353115..0cd0f13b5f 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
@@ -1,20 +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.IO;
-using System.Linq;
 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.Framework.Platform;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osuTK;
+using osu.Game.Graphics.UserInterfaceV2;
 
 namespace osu.Game.Tests.Visual.Settings
 {
@@ -26,176 +16,4 @@ namespace osu.Game.Tests.Visual.Settings
             Add(new DirectorySelector { RelativeSizeAxes = Axes.Both });
         }
     }
-
-    public class DirectorySelector : CompositeDrawable
-    {
-        private FillFlowContainer directoryFlow;
-
-        [Resolved]
-        private GameHost host { get; set; }
-
-        [Cached]
-        private readonly Bindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
-
-        public DirectorySelector(string initialPath = null)
-        {
-            currentDirectory.Value = new DirectoryInfo(initialPath ??= Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Padding = new MarginPadding(10);
-
-            InternalChildren = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
-                    Children = new Drawable[]
-                    {
-                        new CurrentDirectoryDisplay
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 50,
-                        },
-                        new OsuScrollContainer
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Child = directoryFlow = new FillFlowContainer
-                            {
-                                AutoSizeAxes = Axes.Y,
-                                RelativeSizeAxes = Axes.X,
-                                Direction = FillDirection.Vertical,
-                            }
-                        }
-                    }
-                },
-            };
-
-            currentDirectory.BindValueChanged(updateDisplay, true);
-        }
-
-        private void updateDisplay(ValueChangedEvent<DirectoryInfo> directory)
-        {
-            directoryFlow.Clear();
-
-            if (directory.NewValue == null)
-            {
-                // var drives = DriveInfo.GetDrives();
-                //
-                // foreach (var drive in drives)
-                //     directoryFlow.Add(new DirectoryRow(drive.RootDirectory));
-            }
-            else
-            {
-                directoryFlow.Add(new ParentDirectoryRow(currentDirectory.Value.Parent));
-
-                foreach (var dir in currentDirectory.Value.GetDirectories().OrderBy(d => d.Name))
-                {
-                    if ((dir.Attributes & FileAttributes.Hidden) == 0)
-                        directoryFlow.Add(new DirectoryRow(dir));
-                }
-            }
-        }
-
-        public class CurrentDirectoryDisplay : CompositeDrawable
-        {
-            [Resolved]
-            private Bindable<DirectoryInfo> currentDirectory { get; set; }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                FillFlowContainer flow;
-
-                InternalChildren = new Drawable[]
-                {
-                    flow = new FillFlowContainer
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.X,
-                        Spacing = new Vector2(10),
-                        Height = 20,
-                        Direction = FillDirection.Horizontal,
-                    },
-                };
-
-                currentDirectory.BindValueChanged(dir =>
-                {
-                    flow.Clear();
-
-                    flow.Add(new OsuSpriteText
-                    {
-                        Text = "Current Directory: ",
-                        Font = OsuFont.Default.With(size: DirectoryRow.HEIGHT),
-                    });
-
-                    flow.Add(new DirectoryRow(null, "Computer"));
-
-                    DirectoryInfo traverse = dir.NewValue;
-
-                    while (traverse != null)
-                    {
-                        flow.Add(new DirectoryRow(traverse));
-                        traverse = traverse.Parent;
-                    }
-                }, true);
-            }
-        }
-
-        private class ParentDirectoryRow : DirectoryRow
-        {
-            public override IconUsage Icon => FontAwesome.Solid.Folder;
-
-            public ParentDirectoryRow(DirectoryInfo directory)
-                : base(directory, "..")
-            {
-            }
-        }
-
-        private class DirectoryRow : CompositeDrawable
-        {
-            public const float HEIGHT = 20;
-
-            private readonly DirectoryInfo directory;
-
-            [Resolved]
-            private Bindable<DirectoryInfo> currentDirectory { get; set; }
-
-            public DirectoryRow(DirectoryInfo directory, string display = null)
-            {
-                this.directory = directory;
-
-                AutoSizeAxes = Axes.X;
-                Height = HEIGHT;
-
-                AddRangeInternal(new Drawable[]
-                {
-                    new SpriteIcon
-                    {
-                        Icon = Icon,
-                        Size = new Vector2(HEIGHT)
-                    },
-                    new OsuSpriteText
-                    {
-                        X = HEIGHT + 5,
-                        Text = display ?? directory.Name,
-                        Font = OsuFont.Default.With(size: HEIGHT)
-                    }
-                });
-            }
-
-            protected override bool OnClick(ClickEvent e)
-            {
-                currentDirectory.Value = directory;
-                return true;
-            }
-
-            public virtual IconUsage Icon => FontAwesome.Regular.Folder;
-        }
-    }
 }
diff --git a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
new file mode 100644
index 0000000000..5dcaacf0a4
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
@@ -0,0 +1,261 @@
+// Copyright (c) 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;
+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.Input.Events;
+using osu.Framework.Platform;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    public class DirectorySelector : CompositeDrawable
+    {
+        private FillFlowContainer directoryFlow;
+
+        [Resolved]
+        private GameHost host { get; set; }
+
+        [Cached]
+        private readonly Bindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
+
+        public DirectorySelector(string initialPath = null)
+        {
+            currentDirectory.Value = new DirectoryInfo(initialPath ??= Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Padding = new MarginPadding(10);
+
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new CurrentDirectoryDisplay
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 50,
+                        },
+                        new OsuScrollContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Child = directoryFlow = new FillFlowContainer
+                            {
+                                AutoSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.X,
+                                Direction = FillDirection.Vertical,
+                                Spacing = new Vector2(2),
+                            }
+                        }
+                    }
+                },
+            };
+
+            currentDirectory.BindValueChanged(updateDisplay, true);
+        }
+
+        private void updateDisplay(ValueChangedEvent<DirectoryInfo> directory)
+        {
+            directoryFlow.Clear();
+
+            if (directory.NewValue == null)
+            {
+                var drives = DriveInfo.GetDrives();
+
+                foreach (var drive in drives)
+                    directoryFlow.Add(new DirectoryRow(drive.RootDirectory));
+            }
+            else
+            {
+                directoryFlow.Add(new ParentDirectoryRow(currentDirectory.Value.Parent));
+
+                foreach (var dir in currentDirectory.Value.GetDirectories().OrderBy(d => d.Name))
+                {
+                    if ((dir.Attributes & FileAttributes.Hidden) == 0)
+                        directoryFlow.Add(new DirectoryRow(dir));
+                }
+            }
+        }
+
+        public class CurrentDirectoryDisplay : CompositeDrawable
+        {
+            [Resolved]
+            private Bindable<DirectoryInfo> currentDirectory { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                FillFlowContainer flow;
+
+                InternalChildren = new Drawable[]
+                {
+                    flow = new FillFlowContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.X,
+                        Spacing = new Vector2(5),
+                        Height = DirectoryRow.HEIGHT,
+                        Direction = FillDirection.Horizontal,
+                    },
+                };
+
+                currentDirectory.BindValueChanged(dir =>
+                {
+                    flow.Clear();
+
+                    flow.Add(new OsuSpriteText
+                    {
+                        Text = "Current Directory: ",
+                        Font = OsuFont.Default.With(size: DirectoryRow.HEIGHT),
+                    });
+
+                    flow.Add(new ComputerRow());
+
+                    List<DirectoryRow> traversalRows = new List<DirectoryRow>();
+
+                    DirectoryInfo traverse = dir.NewValue;
+
+                    while (traverse != null)
+                    {
+                        traversalRows.Insert(0, new CurrentDisplayRow(traverse));
+                        traverse = traverse.Parent;
+                    }
+
+                    flow.AddRange(traversalRows);
+                }, true);
+            }
+
+            private class ComputerRow : CurrentDisplayRow
+            {
+                public override IconUsage? Icon => null;
+
+                public ComputerRow()
+                    : base(null, "Computer")
+                {
+                }
+            }
+
+            private class CurrentDisplayRow : DirectoryRow
+            {
+                public CurrentDisplayRow(DirectoryInfo directory, string displayName = null)
+                    : base(directory, displayName)
+                {
+                }
+
+                [BackgroundDependencyLoader]
+                private void load()
+                {
+                    Flow.Add(new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Icon = FontAwesome.Solid.ChevronRight,
+                        Size = new Vector2(FONT_SIZE / 2)
+                    });
+                }
+            }
+        }
+
+        private class ParentDirectoryRow : DirectoryRow
+        {
+            public override IconUsage? Icon => FontAwesome.Solid.Folder;
+
+            public ParentDirectoryRow(DirectoryInfo directory)
+                : base(directory, "..")
+            {
+            }
+        }
+
+        private class DirectoryRow : CompositeDrawable
+        {
+            public const float HEIGHT = 20;
+
+            protected const float FONT_SIZE = 16;
+
+            private readonly DirectoryInfo directory;
+            private readonly string displayName;
+
+            protected FillFlowContainer Flow;
+
+            [Resolved]
+            private Bindable<DirectoryInfo> currentDirectory { get; set; }
+
+            public DirectoryRow(DirectoryInfo directory, string displayName = null)
+            {
+                this.directory = directory;
+                this.displayName = displayName;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                AutoSizeAxes = Axes.Both;
+
+                Masking = true;
+                CornerRadius = 5;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = colours.GreySeafoamDarker,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    Flow = new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.X,
+                        Height = 20,
+                        Margin = new MarginPadding { Vertical = 2, Horizontal = 5 },
+                        Direction = FillDirection.Horizontal,
+                        Spacing = new Vector2(5),
+                    }
+                };
+
+                if (Icon.HasValue)
+                {
+                    Flow.Add(new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Icon = Icon.Value,
+                        Size = new Vector2(FONT_SIZE)
+                    });
+                }
+
+                Flow.Add(new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Text = displayName ?? directory.Name,
+                    Font = OsuFont.Default.With(size: FONT_SIZE)
+                });
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                currentDirectory.Value = directory;
+                return true;
+            }
+
+            public virtual IconUsage? Icon => FontAwesome.Regular.Folder;
+        }
+    }
+}

From 246812e0b1b550c0bebb63739ad67a4b45f0f124 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 18:42:20 +0900
Subject: [PATCH 02697/10326] Change breadcrumb display icons to match design

---
 .../UserInterfaceV2/DirectorySelector.cs        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
index 5dcaacf0a4..1cd4ab6f01 100644
--- a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
             private class ComputerRow : CurrentDisplayRow
             {
-                public override IconUsage? Icon => null;
+                protected override IconUsage? Icon => null;
 
                 public ComputerRow()
                     : base(null, "Computer")
@@ -171,12 +171,14 @@ namespace osu.Game.Graphics.UserInterfaceV2
                         Size = new Vector2(FONT_SIZE / 2)
                     });
                 }
+
+                protected override IconUsage? Icon => Directory.Name.Contains("/") ? base.Icon : null;
             }
         }
 
         private class ParentDirectoryRow : DirectoryRow
         {
-            public override IconUsage? Icon => FontAwesome.Solid.Folder;
+            protected override IconUsage? Icon => FontAwesome.Solid.Folder;
 
             public ParentDirectoryRow(DirectoryInfo directory)
                 : base(directory, "..")
@@ -190,7 +192,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
             protected const float FONT_SIZE = 16;
 
-            private readonly DirectoryInfo directory;
+            protected readonly DirectoryInfo Directory;
+
             private readonly string displayName;
 
             protected FillFlowContainer Flow;
@@ -200,7 +203,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
             public DirectoryRow(DirectoryInfo directory, string displayName = null)
             {
-                this.directory = directory;
+                Directory = directory;
                 this.displayName = displayName;
             }
 
@@ -244,18 +247,18 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    Text = displayName ?? directory.Name,
+                    Text = displayName ?? Directory.Name,
                     Font = OsuFont.Default.With(size: FONT_SIZE)
                 });
             }
 
             protected override bool OnClick(ClickEvent e)
             {
-                currentDirectory.Value = directory;
+                currentDirectory.Value = Directory;
                 return true;
             }
 
-            public virtual IconUsage? Icon => FontAwesome.Regular.Folder;
+            protected virtual IconUsage? Icon => Directory.Name.Contains("/") ? FontAwesome.Solid.Database : FontAwesome.Regular.Folder;
         }
     }
 }

From e9e03d038d780f13d62a3b29e9c6243148f10ebc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 18:52:10 +0900
Subject: [PATCH 02698/10326] Tidy up naming and structure

---
 .../UserInterfaceV2/DirectorySelector.cs      | 87 +++++++++----------
 1 file changed, 43 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
index 1cd4ab6f01..427b9a1eff 100644
--- a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
@@ -34,10 +34,9 @@ namespace osu.Game.Graphics.UserInterfaceV2
             currentDirectory.Value = new DirectoryInfo(initialPath ??= Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            base.LoadComplete();
-
             Padding = new MarginPadding(10);
 
             InternalChildren = new Drawable[]
@@ -80,30 +79,30 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 var drives = DriveInfo.GetDrives();
 
                 foreach (var drive in drives)
-                    directoryFlow.Add(new DirectoryRow(drive.RootDirectory));
+                    directoryFlow.Add(new DirectoryPiece(drive.RootDirectory));
             }
             else
             {
-                directoryFlow.Add(new ParentDirectoryRow(currentDirectory.Value.Parent));
+                directoryFlow.Add(new ParentDirectoryPiece(currentDirectory.Value.Parent));
 
                 foreach (var dir in currentDirectory.Value.GetDirectories().OrderBy(d => d.Name))
                 {
                     if ((dir.Attributes & FileAttributes.Hidden) == 0)
-                        directoryFlow.Add(new DirectoryRow(dir));
+                        directoryFlow.Add(new DirectoryPiece(dir));
                 }
             }
         }
 
-        public class CurrentDirectoryDisplay : CompositeDrawable
+        private class CurrentDirectoryDisplay : CompositeDrawable
         {
             [Resolved]
             private Bindable<DirectoryInfo> currentDirectory { get; set; }
 
+            private FillFlowContainer flow;
+
             [BackgroundDependencyLoader]
             private void load()
             {
-                FillFlowContainer flow;
-
                 InternalChildren = new Drawable[]
                 {
                     flow = new FillFlowContainer
@@ -112,50 +111,48 @@ namespace osu.Game.Graphics.UserInterfaceV2
                         Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.X,
                         Spacing = new Vector2(5),
-                        Height = DirectoryRow.HEIGHT,
+                        Height = DirectoryPiece.HEIGHT,
                         Direction = FillDirection.Horizontal,
                     },
                 };
 
-                currentDirectory.BindValueChanged(dir =>
-                {
-                    flow.Clear();
-
-                    flow.Add(new OsuSpriteText
-                    {
-                        Text = "Current Directory: ",
-                        Font = OsuFont.Default.With(size: DirectoryRow.HEIGHT),
-                    });
-
-                    flow.Add(new ComputerRow());
-
-                    List<DirectoryRow> traversalRows = new List<DirectoryRow>();
-
-                    DirectoryInfo traverse = dir.NewValue;
-
-                    while (traverse != null)
-                    {
-                        traversalRows.Insert(0, new CurrentDisplayRow(traverse));
-                        traverse = traverse.Parent;
-                    }
-
-                    flow.AddRange(traversalRows);
-                }, true);
+                currentDirectory.BindValueChanged(updateDisplay, true);
             }
 
-            private class ComputerRow : CurrentDisplayRow
+            private void updateDisplay(ValueChangedEvent<DirectoryInfo> dir)
+            {
+                flow.Clear();
+
+                List<DirectoryPiece> pathPieces = new List<DirectoryPiece>();
+
+                DirectoryInfo ptr = dir.NewValue;
+
+                while (ptr != null)
+                {
+                    pathPieces.Insert(0, new CurrentDisplayPiece(ptr));
+                    ptr = ptr.Parent;
+                }
+
+                flow.ChildrenEnumerable = new Drawable[]
+                {
+                    new OsuSpriteText { Text = "Current Directory: ", Font = OsuFont.Default.With(size: DirectoryPiece.HEIGHT), },
+                    new ComputerPiece(),
+                }.Concat(pathPieces);
+            }
+
+            private class ComputerPiece : CurrentDisplayPiece
             {
                 protected override IconUsage? Icon => null;
 
-                public ComputerRow()
+                public ComputerPiece()
                     : base(null, "Computer")
                 {
                 }
             }
 
-            private class CurrentDisplayRow : DirectoryRow
+            private class CurrentDisplayPiece : DirectoryPiece
             {
-                public CurrentDisplayRow(DirectoryInfo directory, string displayName = null)
+                public CurrentDisplayPiece(DirectoryInfo directory, string displayName = null)
                     : base(directory, displayName)
                 {
                 }
@@ -172,21 +169,21 @@ namespace osu.Game.Graphics.UserInterfaceV2
                     });
                 }
 
-                protected override IconUsage? Icon => Directory.Name.Contains("/") ? base.Icon : null;
+                protected override IconUsage? Icon => Directory.Name.Contains(Path.DirectorySeparatorChar) ? base.Icon : null;
             }
         }
 
-        private class ParentDirectoryRow : DirectoryRow
+        private class ParentDirectoryPiece : DirectoryPiece
         {
             protected override IconUsage? Icon => FontAwesome.Solid.Folder;
 
-            public ParentDirectoryRow(DirectoryInfo directory)
+            public ParentDirectoryPiece(DirectoryInfo directory)
                 : base(directory, "..")
             {
             }
         }
 
-        private class DirectoryRow : CompositeDrawable
+        private class DirectoryPiece : CompositeDrawable
         {
             public const float HEIGHT = 20;
 
@@ -201,7 +198,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
             [Resolved]
             private Bindable<DirectoryInfo> currentDirectory { get; set; }
 
-            public DirectoryRow(DirectoryInfo directory, string displayName = null)
+            public DirectoryPiece(DirectoryInfo directory, string displayName = null)
             {
                 Directory = directory;
                 this.displayName = displayName;
@@ -258,7 +255,9 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 return true;
             }
 
-            protected virtual IconUsage? Icon => Directory.Name.Contains("/") ? FontAwesome.Solid.Database : FontAwesome.Regular.Folder;
+            protected virtual IconUsage? Icon => Directory.Name.Contains(Path.DirectorySeparatorChar)
+                ? FontAwesome.Solid.Database
+                : FontAwesome.Regular.Folder;
         }
     }
 }

From c048d9b6ae215eb0923ba39d060e5ae1adb0ace7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 18:55:06 +0900
Subject: [PATCH 02699/10326] Fix incorrect assignment

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

diff --git a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
index 427b9a1eff..59de931df5 100644
--- a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
         public DirectorySelector(string initialPath = null)
         {
-            currentDirectory.Value = new DirectoryInfo(initialPath ??= Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
+            currentDirectory.Value = new DirectoryInfo(initialPath ?? Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
         }
 
         [BackgroundDependencyLoader]

From 00efeb7cc6db07eac414dab21366b041fa46f6ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 19:19:58 +0900
Subject: [PATCH 02700/10326] Fix spawning too many sprites due to not yet
 populated sizing

---
 .../Skinning/LegacyTaikoScroller.cs                   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 3ec6be8a6c..03813e0a99 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 {
     public class LegacyTaikoScroller : CompositeDrawable
     {
+        public Bindable<JudgementResult> LastResult = new Bindable<JudgementResult>();
+
         public LegacyTaikoScroller()
         {
             RelativeSizeAxes = Axes.Both;
@@ -50,21 +52,16 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             }, true);
         }
 
-        public Bindable<JudgementResult> LastResult = new Bindable<JudgementResult>();
-
         protected override void Update()
         {
             base.Update();
 
-            bool wideEnough() =>
-                InternalChildren.Any()
-                && InternalChildren.First().ScreenSpaceDrawQuad.Width * InternalChildren.Count >= ScreenSpaceDrawQuad.Width * 2;
-
             // store X before checking wide enough so if we perform layout there is no positional discrepancy.
             float currentX = (InternalChildren?.FirstOrDefault()?.X ?? 0) - (float)Clock.ElapsedFrameTime * 0.1f;
 
             // ensure we have enough sprites
-            while (!wideEnough())
+            if (!InternalChildren.Any()
+                || InternalChildren.First().ScreenSpaceDrawQuad.Width * InternalChildren.Count < ScreenSpaceDrawQuad.Width * 2)
                 AddInternal(new ScrollerSprite { Passing = passing });
 
             var first = InternalChildren.First();

From 49e616b7e561ab940a2fa10f294af179f2b39e91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 20:19:14 +0900
Subject: [PATCH 02701/10326] Also check for directory presence before
 migrating

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

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 6dc25e871c..b060add03b 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -51,7 +51,7 @@ namespace osu.Game.IO
             // ensure the new location has no files present, else hard abort
             if (destination.Exists)
             {
-                if (destination.GetFiles().Length > 0)
+                if (destination.GetFiles().Length > 0 || destination.GetDirectories().Length > 0)
                     throw new InvalidOperationException("Migration destination already has files present");
 
                 deleteRecursive(destination);

From ad1d050fb437673f35380f8751c7a3f7cc68c7e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 20:29:15 +0900
Subject: [PATCH 02702/10326] Throw exception on copy timeout

---
 osu.Game/IO/OsuStorage.cs | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index b060add03b..71b01ce479 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -96,20 +96,7 @@ namespace osu.Game.IO
                 if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
                     continue;
 
-                int tries = 5;
-
-                while (tries-- > 0)
-                {
-                    try
-                    {
-                        fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true);
-                        break;
-                    }
-                    catch (Exception)
-                    {
-                        Thread.Sleep(50);
-                    }
-                }
+                attemptCopy(fi, Path.Combine(destination.FullName, fi.Name));
             }
 
             foreach (DirectoryInfo dir in source.GetDirectories())
@@ -120,5 +107,26 @@ namespace osu.Game.IO
                 copyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);
             }
         }
+
+        private static void attemptCopy(System.IO.FileInfo fileInfo, string destination)
+        {
+            int tries = 5;
+
+            while (true)
+            {
+                try
+                {
+                    fileInfo.CopyTo(destination, true);
+                    return;
+                }
+                catch (Exception)
+                {
+                    if (tries-- == 0)
+                        throw;
+                }
+
+                Thread.Sleep(50);
+            }
+        }
     }
 }

From 1ac9c7c15a88fe24132084b93c2d619cfb46b2da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=8C=E7=A9=BA=E7=99=BD=E3=80=8D?= <「空白」>
Date: Thu, 14 May 2020 00:04:31 +0900
Subject: [PATCH 02703/10326] Add license header to WebRequestExtensions

---
 osu.Game/Extensions/WebRequestExtensions.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Extensions/WebRequestExtensions.cs b/osu.Game/Extensions/WebRequestExtensions.cs
index c8e3c564a5..f92f707d30 100644
--- a/osu.Game/Extensions/WebRequestExtensions.cs
+++ b/osu.Game/Extensions/WebRequestExtensions.cs
@@ -1,4 +1,7 @@
-using osu.Framework.IO.Network;
+// Copyright (c) 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.Framework.Extensions.IEnumerableExtensions;
 using System.Collections.Generic;
 using Newtonsoft.Json;

From 0933217389f9b08c4d64815b31fa352cd8a4ce16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 May 2020 18:53:47 +0200
Subject: [PATCH 02704/10326] Simplify mascot scaling

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 5940ee8b69..ded1fc0933 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Layout;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -43,14 +42,9 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private Container hitTargetOffsetContent;
 
-        private readonly LayoutValue<float> playfieldScaleLayout = new LayoutValue<float>(Invalidation.DrawSize);
-        private float playfieldScale => playfieldScaleLayout.IsValid ? playfieldScaleLayout.Value : playfieldScaleLayout.Value = DrawHeight / DEFAULT_HEIGHT;
-
         public TaikoPlayfield(ControlPointInfo controlPoints)
         {
             this.controlPoints = controlPoints;
-
-            AddLayout(playfieldScaleLayout);
         }
 
         [BackgroundDependencyLoader]
@@ -159,7 +153,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             rightArea.Padding = new MarginPadding { Left = leftArea.DrawWidth };
             hitTargetOffsetContent.Padding = new MarginPadding { Left = HitTarget.DrawWidth / 2 };
 
-            mascot.Scale = new Vector2(playfieldScale);
+            mascot.Scale = new Vector2(DrawHeight / DEFAULT_HEIGHT);
         }
 
         public override void Add(DrawableHitObject h)

From 43450b54853712698da7909e31568a5ecd6b4566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=8C=E7=A9=BA=E7=99=BD=E3=80=8D?= <「空白」>
Date: Thu, 14 May 2020 01:57:03 +0900
Subject: [PATCH 02705/10326] Resolve remaining InspectCode issues

> CI should now pass build test
---
 osu.Game/Extensions/WebRequestExtensions.cs         |  2 ++
 .../Online/API/Requests/SearchBeatmapSetsRequest.cs | 13 ++++++-------
 .../Overlays/BeatmapListing/BeatmapListingPager.cs  |  4 ++--
 osu.Game/Overlays/BeatmapListingOverlay.cs          |  3 +--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Extensions/WebRequestExtensions.cs b/osu.Game/Extensions/WebRequestExtensions.cs
index f92f707d30..80c8b147bf 100644
--- a/osu.Game/Extensions/WebRequestExtensions.cs
+++ b/osu.Game/Extensions/WebRequestExtensions.cs
@@ -6,11 +6,13 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using JetBrains.Annotations;
 
 namespace osu.Game.Extensions
 {
     public class Cursor
     {
+        [UsedImplicitly]
         [JsonExtensionData]
         public IDictionary<string, JToken> Properties;
     }
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index a49cb70c37..0c3272c7de 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -11,15 +11,15 @@ namespace osu.Game.Online.API.Requests
 {
     public class SearchBeatmapSetsRequest : APIRequest<SearchBeatmapSetsResponse>
     {
-        public SearchCategory SearchCategory { get; set; }
+        public SearchCategory SearchCategory { get; }
 
-        public SortCriteria SortCriteria { get; set; }
+        public SortCriteria SortCriteria { get; }
 
-        public SortDirection SortDirection { get; set; }
+        public SortDirection SortDirection { get; }
 
-        public SearchGenre Genre { get; set; }
+        public SearchGenre Genre { get; }
 
-        public SearchLanguage Language { get; set; }
+        public SearchLanguage Language { get; }
 
         private readonly string query;
         private readonly RulesetInfo ruleset;
@@ -27,8 +27,7 @@ namespace osu.Game.Online.API.Requests
 
         private string directionString => SortDirection == SortDirection.Descending ? @"desc" : @"asc";
 
-        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, Cursor cursor = null,
-            SearchCategory searchCategory = SearchCategory.Any, SortCriteria sortCriteria = SortCriteria.Ranked, SortDirection sortDirection = SortDirection.Descending)
+        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, Cursor cursor = null, SearchCategory searchCategory = SearchCategory.Any, SortCriteria sortCriteria = SortCriteria.Ranked, SortDirection sortDirection = SortDirection.Descending)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
index 4c8902d314..f55e37ebc7 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
@@ -24,9 +24,9 @@ namespace osu.Game.Overlays.BeatmapListing
         private SearchBeatmapSetsRequest getSetsRequest;
         private SearchBeatmapSetsResponse lastResponse;
 
-        private bool isLastPageFetched = false;
+        private bool isLastPageFetched;
         private bool isFetching => getSetsRequest != null;
-        public bool IsPastFirstPage { get; private set; } = false;
+        public bool IsPastFirstPage { get; private set; }
         public bool CanFetchNextPage => !isLastPageFetched && !isFetching;
 
         public BeatmapListingPager(IAPIProvider api, RulesetStore rulesets, string query, RulesetInfo ruleset, SearchCategory searchCategory = SearchCategory.Any, SortCriteria sortCriteria = SortCriteria.Ranked, SortDirection sortDirection = SortDirection.Descending)
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index ba92181ac5..e26f084ea4 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -184,8 +184,7 @@ namespace osu.Game.Overlays
                 // 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)
-                    .Then().Schedule(() => panelTarget.Remove(lastContent));
+                lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y).Then().Schedule(() => panelTarget.Remove(lastContent));
             }
 
             if (!content.IsAlive)

From 9ba1a8af885b2334822506ee5d789ca19fff9902 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 09:44:21 +0900
Subject: [PATCH 02706/10326] Fix mascot getting stuck in clear state on rewind

---
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs  | 6 +++---
 osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index 105baa84cc..407ab30e12 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -96,9 +96,9 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private TaikoMascotAnimationState getNextState()
         {
-            // don't change state if current animation is playing
-            // (used for clear state - others are manually animated on new beats)
-            if (currentAnimation != null && !currentAnimation.Completed)
+            // don't change state if current animation is still playing (and we haven't rewound before it).
+            // used for clear state - others are manually animated on new beats.
+            if (currentAnimation?.Completed == false && currentAnimation.DisplayTime <= Time.Current)
                 return State.Value;
 
             if (!lastObjectHit)
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
index 01cf88a87e..cce2be7758 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private int currentFrame;
 
+        public double DisplayTime;
+
         public TaikoMascotAnimation(TaikoMascotAnimationState state)
         {
             InternalChild = textureAnimation = createTextureAnimation(state).With(animation =>
@@ -40,6 +42,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         public override void Show()
         {
             base.Show();
+            DisplayTime = Time.Current;
             textureAnimation.Seek(0);
         }
 

From 76af6f25f1ccd0e0f2e6697ed7fdc8d5546ebc15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 09:56:30 +0900
Subject: [PATCH 02707/10326] Remove pointless test resources

---
 .../Resources/old-skin/pippidonclear0.png       | Bin 72589 -> 0 bytes
 .../Resources/old-skin/pippidonclear1.png       | Bin 40613 -> 0 bytes
 .../Resources/old-skin/pippidonclear2.png       | Bin 73308 -> 0 bytes
 .../Resources/old-skin/pippidonclear3.png       | Bin 34541 -> 0 bytes
 .../Resources/old-skin/pippidonclear4.png       | Bin 71177 -> 0 bytes
 .../Resources/old-skin/pippidonclear5.png       | Bin 77056 -> 0 bytes
 .../Resources/old-skin/pippidonclear6.png       | Bin 78392 -> 0 bytes
 .../Resources/old-skin/pippidonclear7.png       | Bin 77056 -> 0 bytes
 .../Resources/old-skin/pippidonclear8.png       | Bin 71177 -> 0 bytes
 .../Resources/old-skin/pippidonfail0.png        | Bin 67970 -> 0 bytes
 .../Resources/old-skin/pippidonfail1.png        | Bin 69118 -> 0 bytes
 .../Resources/old-skin/pippidonfail2.png        | Bin 73351 -> 0 bytes
 .../Resources/old-skin/pippidonidle0.png        | Bin 68649 -> 0 bytes
 .../Resources/old-skin/pippidonidle1.png        | Bin 69329 -> 0 bytes
 .../Resources/old-skin/pippidonkiai0.png        | Bin 76964 -> 0 bytes
 .../Resources/old-skin/pippidonkiai1.png        | Bin 75434 -> 0 bytes
 16 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear0.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear1.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear2.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear3.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear4.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear5.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear6.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear7.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear8.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail0.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail1.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail2.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle0.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle1.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai0.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai1.png

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear0.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear0.png
deleted file mode 100644
index a5f4d03e2a61075513c85f24ab39280c31f591d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72589
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear1.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear1.png
deleted file mode 100644
index b239cc561c5cfccc67f04badfa8ab1b54ef6852f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40613
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear2.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear2.png
deleted file mode 100644
index 491b1944b04257cd0f434e3a7d19fd35104871a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 73308
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
F{{s0XwQ>Le

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear3.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear3.png
deleted file mode 100644
index 31e0b91e9fdcb82988b6b8d7b2505a38fdf70358..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34541
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear4.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear4.png
deleted file mode 100644
index de64264914cc8330093550eab1f0ffaa01e91be9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 71177
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%0Dr63wml-6F*tONlh7MSGocvsq)+w
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
L&GqVZUE=-^HyYM<

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear5.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear5.png
deleted file mode 100644
index 417af6c61166c727b9ab50cdd14a498c68744e0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77056
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
S-AwW`#1E{fu22Os|L{NMEB7e?

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear6.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear6.png
deleted file mode 100644
index 5cec7a105d569aa2f9d4b37f709496b29eb96e2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 78392
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
H9i#sbzl81d

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear7.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear7.png
deleted file mode 100644
index 417af6c61166c727b9ab50cdd14a498c68744e0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77056
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
S-AwW`#1E{fu22Os|L{NMEB7e?

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear8.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonclear8.png
deleted file mode 100644
index de64264914cc8330093550eab1f0ffaa01e91be9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 71177
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%0Dr63wml-6F*tONlh7MSGocvsq)+w
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
L&GqVZUE=-^HyYM<

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail0.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail0.png
deleted file mode 100644
index a25325815275dfe5e34358f3509f93fa273ba40f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 67970
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail1.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail1.png
deleted file mode 100644
index 2dcaeb92e3bf4650be65948ebacd9a7ae8bc24ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69118
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail2.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonfail2.png
deleted file mode 100644
index 0f0b1d4f59fa046156fb8911ba14cb73ccb60710..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 73351
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
BEpq?>

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle0.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle0.png
deleted file mode 100644
index dde0adabb403485d9f92830f5ab95a4b4396ad83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 68649
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
OK*OB3F|9W7i2WDz654kF

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle1.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonidle1.png
deleted file mode 100644
index 7295e95efe9c962cf5e5cee94ff928241b81765c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69329
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%0DW8d%49(wA_m-Wzf
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
K%$b<;G5-Nz>y;7!

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai0.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai0.png
deleted file mode 100644
index 911378cbe91f2a6fbaa7d2ee1f8e71de3f7e2d75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76964
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai1.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/pippidonkiai1.png
deleted file mode 100644
index f89568bca25c2a7bbef738d024c2f2f25ac398e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 75434
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%0D=N>o|8~=n^yQP8b;63t|r%
z)ctoUlNTXv%ZFILe*>~Ik8{VwdJgE`dL&+*^b`iaF&~aTwpuef=n^+%CYY_G3Ea8_
zqxF!1=sSEIdUY6rE+%$RDD036d&p!(oX~TyQAR<*ZCsAMh|sH{D7tYP&XQ6no&DLc
zynZ*0p41Ytq5F}NMcGefaI^45r;)WY0O%d<oeUv048YB(1mxuMK^3={l!g>X!?1PZ
zgy$L-l;C<=Dsr;8q-yjFlCev9L&!g$%NqISY1q^#6R?^RdFn#RJ{Ph}QeGO0bENP|
z?y~)2^1FEA{VCO6#M{5#gD(%AKxXO*Zr{smI64h}0j2g0k2E1mS?bvd_BnTOD<PR3
z$U%Hc43c8A5a`n$j-Hy2t4v@9^UhEI!Y3QoAv%U!ByyNqbip%SLf|y<BNTa5Dk-K_
zBt^M6dv+gE5_O-D%)_%Q+V^-0dgfYMiPj7#iN1ovn?Az2^LtQI%=_OhZTjN%0TVHM
z>F4kW@vqi>sV&r^?<|E^uMqScF&f?54M0z0D;VnABUjIr8D2^#<YbI0x#*sI%uqUc
z{UYMSE}(V(T`24WATg|46a%M#F((lk%cs@QH}J-=sbg#1WsrV2dfC7^g<aF}IVdTL
z<0hAH$!yV0o(_?hW|R5V20iBhm?a!UXf!R><cxLtAAKdkRYScdnfYYR>l{spJbjs}
zCR-_mFz1Kp-)1mAT>Aseq*W_?PPQCNKm8xGc6m3AzM((nb?b?o-c-w5Gn5&d!O1BA
zhPg?IPKseaLjmrk#UnE^5nX%qfVqw4eB!AYz=59*V&PvuBR%CHJ0gOk%LvTx(Gx{e
zK82ip7F}X^JB(Rkr;(kh`_#e%0^7p9NA1F1A4TNHe!>sC*Wz;I4$iosL|t8&_5SuV
zuc6nRsW338#_G{A`s_|6!FOkZ-(}cngaq_PH+>_Ro7*#$az{ZvyQrDftSrlABh(0-
zh`x>ZJJ%496A7h9JJv~YaTT>fnjVQ`x2~}fLjlSpu9z@&YPCrTtAaX2>$V+Waq|i;
zBxXQSmW}+}J4n;FLK{;ni0mq@M%4+{S*f_3nuCHoZZ$dmsASbpk1kmAjTTO+36ZCt
zhZK@RC+O^wiAr}h4OzG=__GB+q3eL^7d`y-@(=jw*glk%GAo<?lYVUnLHgKdP-@u6
zR%&JgZ#yr@vojHw62(q;0pjvaU=(p3y{Bp>XFK`eBf@g<!rO1K;Ts#3hz-!L)p$%E
zJqua=o@9DoTbo65nB6*s(>Fp<$gD42LX&tC{oAu)H1+rYE#!Imh~4})mYqC^jI^Vy
zn^!<;*%dE!9fT)8_yXQtylZW}>KYPUTNg8U^zMpw{l>swVSoTr1EeymJ1?)86ID*^
zGjHNVOe~V4t|Bm>8BXr)n5F&j`K7Xg9Gt%$!CB!7Ju6I_@&t^G>ekuOoP&v57Zk+a
zL{tKWNtYlsEfMzm#c&K9#x6eHcAg@)wkW=L43V*w!YOG2ES0s2*1XO|zM*G=zK9_5
z)N={>X~<ON6#B(}voLl}_3_bnZ)V}EqbE^P$fqE%wC#;9J*Ge*p*}+M<aq|e!lo1Z
z;QYvmRutOW)~ys^O_Y=XPfeeN>>S?j8sIz{{a^Y9c^w)rMqDp90Y!yeh?h<=HTQy%
zC7-Y4zl5?xhGT2rz>jCPsk43B*bc&nlb*zcFPFm3t(rtlO%N&js9k4`#rQA2!+Xyy
zz@kCp(4p;A7@P46k*K8KwObppc=sA?_-QU=N4{qr08J>@fO}^)Lf}&hmzLxpJ*+(a
zNL}y>w8HRSQxFiu8)%e%eAAV1$PX>!_H_w$ZUbC{AvLFX6Ase90j!aCgT5^N=rr8X
zdEeepkta{0kSCrdT*;EB3{;%J+t~zQ(tGc7^--&W99KWQz7%mu`}qSRb4(BLMP4WE
zS$?H4w{YOt*KA9{4V|a9YlA6EDBFT&putChoaR}0tn9o|DlN~z*BFS3G9fGGOC;(N
zD=T{_y#Heby36D^_vdTa8@63lmQoCV*Kzpf!~db@OHb+C_pT|(of9}P5Q9GZ81F6o
z8jA)DM@J_1`bK=VND7Gzz40$T+q(&;|9KImXa44nSA~Iv6&#FtUw&Cx4sxRE??&u2
zV+fw`@`kM=KY3f6ABL6TVJL~KU&ql9l-*~;%dOJlED9$l!<W1qLauq8UjYpfdFqj9
zY(`&1u;MAIM(x~wbHH@;>{EUG>gk=4SQi$?^p=m;_4FP9i~i4W0IWb$zuVftI5h@q
zzn;s6o5`$$k)UJy0T?^&NmyEGZfIx5e#ZHIdvmS|;!M~tC^*Q+{5KY|(j3T3$Q7nr
zyey1i;I6i89(|Mw+*<b*wp`uAw)5B>VvIiiGw{Dvzr(L5FNVz>y6Ij0EYR=6cd_8j
zPw@VLk!a;VQGLA^=3T_rQ`_+4$vw#4@;YR><f*6(<<Idq=SS)aMK+34;<)YlKwg>d
zZ@+^nfez5q=Mx>?jX8vvlRxM@W2K>)6{ffH;c8T?pij`3H99$D>CpqEnL7Ps4N*7h
zk?5BatawuM;jD31yq{NZj9UC^wG%1|_Cx>q^>@h0;#YoB8q&vGxpM9lZD5)hiQkvb
zM}GcUZr{UuBxbeijzKfatI2Buy6Ad5`2;!zlLaegL)RRv-}XO9V|AbTQ6M_Mn28RB
z>go`&0eaY)H)=vGU6Z`=J^X%YKX1V^fgj)DNxbvZPq25W<|b(7xCc97$Y-Bm(M#{*
zt$t(R;xU?iZ#J-379lQr8<w6pi~}3qLh)4!sHlt|WeQ~Hhzz`>^oAKA#!?A-jC~2g
zt@#}9bkF^B{WfHckg-x6@+53*)e%1Q!&7)5iM)`4m^4$T)_i?MUa;cnLs#_0tK+HW
z^d8N6cy*8V0K0!agYA(NN=k9tB6JAqjG}=ragS*l>Ah=M{molQ&pgEK+c^)#oM1mZ
z{_SjTU(<vPa>o;$dcxjWHH0h(!#}@#48v?4FGNytCtvreGYky9VQT$oSg*Aqf6v$W
z{`_IcWfV0hM&H(t;e~I%f>q;s>U4r{Z-0#a>T4{XH5X$;#>2pbU!6`aoMWLI@a@)>
z$l3Nj6f)K7UWTE8CG-t>%R45Q7GpIG-@a||cwk#D=MRyac@o>gPN67+<~?<XiIXpe
zcvYH*B0;A@NtCmM3}PV#vCgdd`igv2Ry;Y<Ig_QMUq4Lv=w+^QQdQ8h>m3``AvcRJ
zb4SaYN4j`vCHtbutxH(-{X(Q?P$(l!?DoTR!7g}V&HGxLfTx-Nq3=D7*+CxaLJ84{
z`*8CQ_MWBX7rHKx6y+nM_#qQvTEN`G4GK?n^_)kV;^-^*>i8bW3TS~36C9^8SorI=
zu%Mvg{|I!e2aoNASHJ!qiw2H{D_QkyG)Hq^87T*`^!Q$cZ+aEQiF^iBk%<+Ij7d6x
zf`%4HRuS^*Jd6+UVK2^yC||yH5{1XU<hFGMNlI{+aWJz`uY(~??9Lh$xuq_j+}jTi
zLDC@gkvYMNrw>aXnwGGV<CR<4O3dst0WPl9e~(K?W3eMLl5O$PM7}PqkU4Z7x2;J`
z!%t%Ms*lwIFSYE3nH^j)=cmu0udgMASK-9^?f$R6k3nrav$Jf-PFgAUg&&1z-9ptf
zbb~?cE#&2wPXy}<TMG+FbhzNFv5+a`*tYdM<md2iKr4&B`0yKA6T<EO=P;5QV&KOg
zVDVGWVR)yB>WSHsq6n-#yB`O4e}>X1cCO4^U}nY-bL1NG=@}Za5!CRR@buzWzETR2
z-)_c07RJ}3&=r!lLz$*kayyetgL*Xj!a8@^)JN&)-_VDo?vjQeWPVe8AZNvQ_8))=
zAI_;U9DLvRtB{*>f!n4$@#FpcAUD>m*+T^~R{i-EGSYd0r;x8_I=8~BKP-i%z4q@w
z8YOh;WrZo@pM|G8O;xZitt=5MLodQ+&vI^G7Z|4BZItlIcGd>W63}i(+7u|*xdfrn
zR4am=YvW)neEBo@wEhp7@YT>}LVvvS*|&JR&v33l2tjid$F6L_?>l~iI5P$omb^Px
zp+UI|8r2og2DMVVjFJ-$;?$*0?7ek2f;M2+{bYaN`zK&23mb(}(#0V}+0>wtnxn3F
zA$=$kbNY}}^@)Zc6j4K>&+&M_DR6M8{$-Qn3$XqsEkxoIBH25Jps)`ms?;3j=XYb}
zKi@NfKfvu9ng-(8&TTROr!QgSth*bKk_e8S(-klG?FXq9jo84&P5*lO6r@*=ar@dv
zFDD+wg}M!&q>kI)oIH7tHpLMq@ayGEOh8iEmo~?op2N_2B<195fv~VM#mJ?f;lp8L
z;Nm`-9bvk_?)%8woAJxF^Kh`|>_U|4X;$kx&V2*@0^4yBbTooKd?O690~9u`JM;rb
z!pcTn)P%k$WdRUeHl+U51eR-_`iMMzIC9lcuS65BG&bUXtpLyd7`b3}wZ3>_&!@j5
zA(b+45@HPXbke9V-tz2r{JME1(o=bXr((d*cJ7MTR(=UPC;HgBh4R)<S@I0#bm*uK
z@k&bAgTn{c=wu?6V&vteNvb{FU@Y~7p$Q*S_ozY@olc(q18FHoxcye{1JQHN8!%Km
zEn6T+3cA1bBHkV~7Qt;Mu>*7uDsku5RwSpCvVAG!680>m<`#llIhtT>@3C-j<`*E+
zT*+@YZlU-t<+0Zd`o3Kd>_kQJ)X<e7h&;IxNJn+zvZ<@c(}yCfoy=hh@F#z~+V}Bv
zmjUo_ss1IYAjsw`SGZMjgo$|vIJeha^?r-<JMqi5-<iPki>pXfXNL^HE33YSt)n{d
zM@?onkey4HoOZD^1EziX5e5hKVeiFHMqRwMAK9BehDd`KcU9yRQuw59CwtA!9heC~
z1H4BU`LUmI^kx_nF*!F<e7;XFxcTVbh-fZ!d2SkB9Q`;3b{P$^guJ{8+zhAEmm)67
zY+-uCBWx<t{_)XxI?xMZJwEGg^xcEFd*)ZwETHz0Fi{!d9}Im1eiE2L{ar`a1eXn2
z^JE;?U=nMFx`;e|n2HmwG?73)2<}6gn|q+oyg4<l=sUXp0xrc<wI`k+XK&<n9;VuB
z80HuEV%63)%(CJIo?HeqIu5~WtG|S!Q`M8eTR&fi-=F&gx9`Zfh#zg@?{A2iFT4p4
zm499-&&EI3Zop=bc9&oml<GWH25fE3Aa|kb`O!pPQh?t>FLD+lxda9Tv_sc<np-vf
zsM2BT08F1aA7euXLeIdJ2?w*}m3g3Y3Pl-|$4hgN4t09^O|);_n?JzbXXA}1l%DvN
z-`4^1;EAxZQLlg{L8kzf`=e}{l*rR_$qXgSonqr@JWla}oU3M9yFO^&l|Fm*T-dxF
zxmg#vZOWxRERft(4ae-#e*Ce04N{W#@CVosaD2N_c<1+T;Nr@Cyee@H3dSE%xAEh=
zS8(QV0!nHTX&9FT>^!8zzdMwONl+cEB_kjA!^_>fa4Cn0f}Hc%a4ig`Nwi)-JLFSY
zDjnl(ErLNKRqD|NrH6mS?O48yqP_D#jOsapS!{K=mHxZ584`>!&n(64u7jaZWeOQo
zq0PWdZSiUh_aFy67ScmKAC{MO2AjjqqNMP_Rk+%~*x3smE4yq+KWP|4^O+>_<Q38S
zg;U!%px%bml6)RCqb5Yvs1<bJl-ba)!HQ2yFT<uNs?W%~4ji01qo5bn6loX~MYC?l
z8YIN;;17rmF(ha_KK%PzxVu*`@Wj9wZ7|*27i+_A<L9pyaTT13`1#;UP-e+vyW;W7
zvp?gH7hlGXmCqu1?ME=6pR5j0#L<+m=3z=()}f2|3E+sx!^q#SJ!`(8M7K*$DIbt8
zGtFqY`Y0k}0<rGqbtuYGxbHf>wIkX+F<$j(3$-DjlQnw2^etZPH4cWRK`_x%!pwyX
zT+I{m;xm{UNcS7>RlX8&g57Ul>m=m?`&t+f)DZ@Tm4Xmxi9NY&s8=IDea#}J0qP?1
z_q%E+!y5Mi$8;Elk+W69qH5T`d>dj?1&dV=qdXiSvuxN8E4^|A8+Wb2y;z}csUCXx
zPQcQ?m&41WY8OpK^x3DMxO4$}dwF8}+0*!Q!!rEy^%-WR0nu@6<Z(%c-(UL!U(c9}
z)$14IWXVOu8y29Q#2eFAEP^w2b#=trN{rEuKL<}Qeo{!O$iUj`cVT^4J4>*Ob?mM&
zHuZp+m<*Li6UDI~*!95&4!F8^M_}*A>XZw;1s*?tJ^0ODj0K~fN3dM;R=fZiVtuC0
zgNHjGJFh59!pg84D2Ue0B&^bZ1gvb-5m$7jkZCU@EF-_X)?GHW6?uA|5F1au5V>m9
zv4}%hk8G?CqI{6jGT`Ew6DX$Q!3?QoXE?NKSk4%e8|Sfg&+oW>mnLt>Y!soL$9R0V
z{(JcPK3w1hyuBot{qlPV@(98HbBD0$;419-bPcw?`aXVN`XUZzoIsSc1U~r&7+~28
zuYdeKp8M@x*pb7ko(z7h172(&1OwyN+<tcYaqJB{3Bzp7FTpORldnT8EbO5#t-8cx
zbEhaR8QbGxP%4XLmzx=;cse3z6u*qVg}Oni78D>t(BrcZJWspfjsAW7F{eWZ_3HD~
z<RiFt<Y&lrV9gsl`ykkfish*xaU%5~kr({(T6Njf=Edn$P!A-yYN!{Y%DdbtvNCta
zu-BfV&1$)FAqzY2C9*Bvs`PetM^4Yl+;)ASa(0Kd|A<>rB=G!e`Z$foFB^X3COGR#
z|8bsJ@b(9Acj$(r7xrND-BY-1n#>L9x|Dii>d?3F>@Ppyv9F$jZ!6;lTW;jGnXvSA
z^b4doTKWl;xDt60(*0j?k86@5xo$<CCS4VFl&a&=Lww;^+>GYxc*4%1JN!nyz@^}A
zp?;8nxHJ88<0Ff;N~ifRqo+UB85XhsO0nx^I7-j`!#}7+=<Xik;Ryr7O7oR;g9su|
zf~D0^%G!!NUCQ)<gauHvoQ#vY>77Qxv4+J@MA(`QNL9tgi}Wlo%FO`^z53rBMe7zL
zG>Rr!c>%Mv?2q67U4@`F4~9wB2AcR8JkbYVEdCfa7M*e7%vRiuQNpLp8q-$1hv73?
zacK(3y`w28;%8$2QLu3!uNNhAx`Xx6sgTC<qa96AOmV9^#Lh+xvDc$lv|Cvw$BE2X
z6y#iDU9vvL__)IV5lJ8XU%<>tACvlyf`tw5RxZxJihob;MX3%}!s@wnf~8Fx)gGst
zl=FbBdGd^qXwfmwXx0X`5qWwJ^)@tfLERB~qSXrBWBg+^x@rp9Iox&i63R;XoY59m
z9Z=S~{$Z1**G^;YwX5u|<15PRNj$Ogk2UDfp?(4{K;L2TWM6#$#s6Sy-2+!bH)BIW
zCbqn>6iO{kB941|ET#oGLnPsS*mv%ph4|EJZd+57=u+gxhVV2{K+lW@dyf|K^BZtJ
ziWaXaU}4=A!9iWQLf9=dAKE`T9@7F@$E-?Vc0J}ea`$}0ZEF*8+o5oEsI=gd4Caa=
zPkP#@B2PmJngym0L?4Wg|6_PNcS7IEe0WlIoZEd17ZS@?Tn0HhAirJxs|8)y^C$AN
z&vDzdu;{gyzeWFk4RDZGfGql<Q~mJM(xvcr8IEgLx8R4XH}LDM&zV@No}@ucO;{&6
zd<L`XdA}}og#W~(bD1+WMG3P&b%jLV3D%{Ck7Q)cy_hq|N<YJGcl32d@MDv>?G~C3
z<Yw(L=>>Rr@S|r+N3kmO5(*P}7o4`x*E7UmM@xuk)fW$GDjCc)uSp_LaeB4U;(GD0
z7pC5YJ^;-E3;uX7);Pz-*uajkR8PM?2wA{a|J}%L4qmiqrQ2YiO1YNnOej~hm#4MM
zD7^XJAdQw(BbUtJ$$t29(L!`?Jr+?ByYb!S>-hDlPpS;BY$(HD=!Hq%F6>P6BaxW9
zry#zxhTGNzC34-R88$SsgH)oK4!0>$l5iWlVl&tUT?`{>Fb3G#!PKI~jBk$k_YJ_a
zZCa~i^ixxg;KsghwH{LGXyXSX<4V>%`7}vW$wNXHlh*w54-<KMoQ4u4@+9XJS)+~)
z@6dlFOlrv0kyilx8xh5Bj$Cfv+O|CkyEM!K%FVx}+F~N_V8XeBG!1ncgQf=Hv#-C#
zlupx-5Eq7Jq2c)Lna?#Y^aiX`8TiC(*gEv&_9^~)UsfSk$x0KHJglg)1~E3VgxHMI
z89iczZ9qygf89Adw}MN^P;R@0rbFUA8MeRmGL9_z47ac6bMbc7(SFWr=-Qf(9id6s
zZ8t8Xm`XNkky76Qu(4MMB#@Czs|9u9mw%YZQ}05(4D~kTIHvB8`yie!!RSA;=DagU
ze>;Mx6h2Q45#nHn0;h&eR(aa<Vn`g0xr?oDeZ}R((KM7QxMyE0e6e{sK7agmloXa=
z>6r^y^ZfrH)39!K9@z#1y=kh0@66-k(_wt&!IEk9L0-n!&(#G|sT2x_M=XcDvJB@k
zqfsi0;wD^sIUAz&nEzOD@@7EXrZre|D;4kWS&x;Uy^4!RQ=q73iHNO>DJFL60}C5I
z1#)r0Rctx90SZ+hhc+<u2x3MlUnE5Z=_<KwwC<O$N#yAbsdu3dAXxE~h=Gn_bgQ;7
zH?RJm(+R$~e?JOx`9%kmtD;L_!}FO;eBx!8nDI3f^D@ukm+<S@`NbBkO^({LZ~e@-
zPvQ3!-=V9$557Bf2`6@zcU+o4%En0@?A#&N<5yQ@rC&!;u4YmlD72gats+vX0rXrS
zEs>XB+=9!AG+b1|)VwW%tbH}=9&AA~loVtlFOLe=-^J1E>#_W+*ARB1`U2sdo_`7x
z1HG8ak;Vd7qiH3q_Ub&)>ev2`wvb3@&Xt4omE7Ng$ZO3n|1gmk{PBXwt3P2t+rBkM
z)nsIpVf)>9_9DEQZDSRToF3D;?S@bk&;>8_9SJ>s@^2|{<JxwtIIs&x{|V)vpam#h
zL%&h3_~pR=uzuIy@a|M8A4P-7%4NT@wF@K$e3Xqytd9(dX8b}165aWZ_1Uj2dc-1Y
z@)J%XC53mLxj1{lZFtLsYg448B%cW=8N-AUQE@x4_Q#J9Ps?+vfL6lx82&Uoyi}90
zWhwaM(nS=fHLR$3O&D4D!pyQ#SwIS6A#Ej%C9Tzp`B0O{(_{3;B<#YZEB7Hx&79GG
z%!nE-nxjAOL_$Wn#oOQA0i~w&G7U#I;SEe^H<+m*J2%Q=oDJQFUsnErYv;9_pWT9;
ziC{lHcxy2CmV)*0_hMu?fA=iP<ayjNTl*lms0tD{6hn#b5}Zq!S@0+sxn;$L2$dJ2
zq%eZr4Tc!vXacVge!{MWriDTwhmkR9rGNs*Z|%U&&p$?1HTlSbMucFNzo&W<Ha6iD
z@=turZEFLCPhU7XQQV3eGMvehrw^{R$=8}ho_ZQm2*Dpu&T!6E)7GOsTmq|Kx=udw
zt7ng+FfW|jr<2&KP0hJ&>WcHzpQ3{=KPRA6WMTKkQ&_#|LuPg9ZlX~W+)Dt~zWX88
zpFYXeq@)qb41Y&t449>QM#C`H*PSJACKhRDyxB-7!*=2NJ>FF#HE$0;k51h1wuPpL
zo>&i3)B6k>Wj@x0?!>h{7pwHo({C9x^Hp>Tph;NLkqrDD6${y|Q{29$F?0(=dq=f1
zgrK3v{UWdNORTzklHRDI$P0_0I0m`7!=wi7NKP!muGlp8BD|}{!6pDXJtlD5nu2P=
z4w*V1wsu3feTp$(bLkRRKmQ(=HL^KCsfxdN@(rv!vyOfKSoUiepi6L1=nZ{S^^Ari
z)nTb3sh$KHs>$3WC{DVFl;kLG+s)A(o|C3>+buLb^z`&lRP>;MCo8y)KmPp=acs0)
z6|VlanAoZvOw9RJ+6nQ;5r6e>t%OvP*tRh-hhDi~o<v=6*N~!WW%9Kqk*7DL2?6S9
z$dc!*c*51$AI9`ZHJn(n1qo?Pv^Yc<;^o|+GzQg?@7*5H4;}>*GrlLLA9UHp%lLEd
zS6W%Tq)DP~mtw)Bx%m71TCTt`6`u$W7>B++XQ0SVbN(P{r6H_#vDDXHhoW_q3S244
zWY^S9b_p9}w2L(y+{oT(p(!F)h>?`Qdk*gB+P$N=^3&(l76uA_;YD=u;@9se%W|;o
zP9{n&Z07bg4f*AzW*(|N4q>j7ZXOazjSq&adqFy0QRLMHJFRVlVbit)jL2JG1+o%$
zQm>ywVLqR$hDxK^x8<#EZIC@^7GCVqg{$RC<Y%41mnY9*<A?uN8$#9CTs@PDm!{0Y
z&hUTORYhwE#Axk54x@XGM_va$1+k_uGuE9jnUq(jZ}yahAH<b7vi=k>mbQkAcT0ip
z#(?hO>}=rr(I}i*xeX^i{|<*1F2?S+-@>Z7FXQ8x&tcZMC-MHSzq!bosvtMa$}8cx
z9bUC_-qKov(Om|^$dvz$lj4sd=FUN_So6GJUR@fK3};GeLpP})@*4NcS10oHMl^h&
zyOu;=9Xjdi=!t-#-MLJPRgoNDh&>7HS5ffs*-n<4EAdwyC6g9oT<5M_$v+}FVJ}u5
z-itH)%2&rW6^{OM1<yYF22S1jmtB3u?1%{7zT+^t*GS}arHb~N#mrnYlijsJuBSWy
zzqTojJ&BZLe!07qr3*X;Yxf#%p)y%%r8vD}Emq8#i`kD)$IFYJ!-C&F#e&U0VBwx$
z@zK7Y@aw77*mY$sZp3T`<%zF}^o+B(yYbg**VMFqY8rZasUlyL`Pgwg9Wo8ARjG)9
zdm!36Rk|n14NjK45JuT3A}@qba&)k=hJ~ftbMpWf)*VDbN_l*0Pxneg6Rl8YXab)B
zbJ4ZqVD^pZV=Hj++7WD7{v|RsTOYVVZ2e+8=6tXOH=?(&J$~%y?mY&NbsvDN2BcoD
z33H1|DNeOYNtwn+nvF(yVUoK3L7<fx9Q?FXxu}K86c+&}m;Qh`vuEP1HDBQGb9~je
zf}9InO<kIMBbN%@<8^`l&D!uVBqUU=@@CAI9yj_au2L0|l6VaFZtT{$HBa&K?WL8%
zj7hM_lCLQ88hzKQ?n=QQPj5~=42itjITP&Q3gc>Auf@!GzjOH_3UYZ@jh?;>oO(^<
zwzUoU=ZE-rV^%RAaYM<6{=9k<n_ge8l@+mdffj0QT=Xwq{dEoExH5(O?4+~%NIc!8
z7c%?L<o30JnQf(2c3MSNriJlsBcO=7hzp6ltA_mXecW6$d)Kv4CGoe?@#kyvv2goe
zh>6`+t^1|EL?>Uyz0H5C_8uf~bT9PwP^HOM7Gmq|B$R|5;P*9%k)<yr`s5(tAPp8o
zo-|h{mOLF3B5MSZ=bk6gmqN;huGQtM$;kzFM=>j&b3?FUu32jo1@Nm=bwS3!XYiP}
z1B}i13h7iRd)b-uIJ#bY3#A?g3H;{&?Z*7ozacGopXw+Zqd5=7vt7C&eaIZu5$zy0
zXI6u#njcKV$jTm#&>F>^Lr6~I*LaXW-mdkdmmj~W5pyX9OBTO{RcAM_5fpDEY8tuh
z9`;;3fx<%7f%~AWuoGv!p|04Lo_rGVH-yrnnnU5;7dCe4M2%!W+#g|6l`hwt>O`I_
zcj{TFhfzoG8yY#n#K{c?^f9X7c6cgc@-kI>WcBMlSyj%M#TXGBz)l?>rWAAU05<>i
zGt$!<Cw_j<ucz_aieHeEd0ce_uyz=Tm%4OC`iNImN3@5?+6H1hwbh_iO3Iq(Om`hg
zDU3x?egwB|W#Izv;e3727PLdsogA$G?h{;yV53|mzaUUsT+hnFt(}Kedk@mOr#E_e
z@i}dvEW(bM49Fr*@cSBq{PO-T>Wq|RP}5|9PDP%E3l&A)pEb@2Z)V{NyCB+qkP@b$
zkvsMxKToylRAho~ttzeV(g|forts-I2VS14h#qADc0?p%(_725mfxm2PH(-2cbEN$
zjP!%5BY>rCKg{pa38`b=QXSDQrBWvHV)_}ikB)1GYXxPA3}>=SxEq`Zwlar>E!_$&
zXal)SjxArlivwZo9#NfhZIYD{jr1$ki#&yfPk;48NDTN@ut^E$kaOc-Zd+53U%r!V
zrMWVi@F9^GB5ZUf^7N);0@6@|!@|@KUY)BJ?!saqGxj=UMfbRUQ}Z@Zx>F5P-BZx2
zBcATi0R|>irI2Rok7HNjErcD@ZgGH$q$C#M<Ilc9R1EpxdCaYQF@bN7)bSsvj%c4!
zGb<Pv=_bc}@grc#D{dV}LWXKQFEU17pO!QR+GOA2kFoaBaVQn(sw3K^RCXJY1*s^g
z#$`ja3bsHGA3l_s=JvKF=Aks|EVr*I><lX1lVnAZzzY+v8uiQHFY@FcBCDN-4fMt&
z^6F3;cXLx%SytW2<mCfbvZ=5FKismibU<NX<5jXx8#)Iaz1ynx%5X0H4)!e9UY5Cv
z(5U9qnTv5UVlO+P{H(9ksyki|X^ZqppK$xSLMakMYNVT_VWrirHfcsE5<-!c$tS5I
zf4pPI#=C~=O9>l@oL%u3{(k#8WZcx9VN+M4k6*#BVK*Qz(PgN!0v9q%aqm38lDR63
znA|@8>Icx%=Mxb|-?@tX>+88~O<`<U>7FEU7p!>FTaC{1->=xTPj5nRC|L5`8`832
ze{<t%BWq$~WVn@IZpnF?nQ*R?#zLWQj3I5i!AQyrJx#*y&o9ExCEK`tZ9y)fO`q??
z+N&p3p<ZlMV-bS6or94*<qK|K*VtR=#$8h)<0sskGg-xPD9qypz}n0iK10gu7c>`c
zM=SB+hIQC@BL`R4RUb{#n2_i6z(2ntIq@ieK!>Cxry=WHxeK)_eA`%}i>Io{zAOrR
zG7C|9hfkZX2}EX<a(|KTlE70VE52$=x}MzsVkGF)s|ewf>M3Bc*a#jLW-z2jt04Y-
z7&5bjNfQx5>~t5OT^*SNXQQ(Z@3JA1lL~P3!VbvtwI@b*Zx`Z+ZJW4i@Px$B6OV<o
zLgD1kIjg!c@Up7rN7FEc#e8w~=1Q4Dj!Ok4T*5n|y`2pVjT+}St1l#;$w&7fEB6wT
z;&x$Qd@OQvo8AcP!ViC9Qv|c%b>N4;pPbA{WMte_?NyBlGjV6UOx8RfJQ5jo2Zh)E
z<hC_|*v=nD#_B~;g2)R3uT@K)-bAqEN#xyB`!FzcgsIdHl4`s~d3SCgFOT=DQGC3)
zE&bER#r*s(<cjHh@#joxX2@+7W)*Pznug{j_J6w$VR!g~&s0e$q(gUDww(!u4)eO-
zkB<fW(Nr~LwMk(~4UW!cfIQ*^V$xNKtVAa07r-x!X-?#@!Q;iVyV%9YcetT3vAD5*
zE4STLAa~O4OUIFuaZ+_ew<yXIaiORP1-UgZplKCs3oqNQ+;&0EMVu(kL+QQi+<rq*
zI0wT_T507gSz=ld`ujy*=urfpyn52r*wh&&4ppZYCKp9<MgofR`IW9FX6`6<ZrofS
zlA?Uvy1otJS1C4~$*oZ<ba4^kskv{$%1yn1S7T6)jre5X@TChVD~;!lxq1x4FndoF
zv}s(wuAxW*10xM4!LNqm63rAkX)MI?p~y&2<F<{Z{&4Bd57(O$aiO<yp+W-n+|2Wc
zxpAUN<#CEScn&9SQ{}V9`%t%&Wr#j-Otn`vmX^Ty!L*o@bXS4!n<<c8`Gb3`p-7~r
za5h(mHj|(W;gf>UYgOdQau+57)Z=_pQ(M^iRUK(SBA=9<#(GG8!pg$J7D{^;Zo9Ft
z*trBdL$9fZ-ePoU+ZiJU&P1F3Rfm8!6gj(IOPOJiEa!9f5U#Ff$n)1;a<<x{FE)aS
zY4!R4HHECKd5e5bVGQzf`Bj#-QWv;&DR=cX7ZMKqjfA-Ksy$K)IgVuJAw8+-jIt6>
z?O|3lpE9DcNJ~pV{=J8<sO|N{ICk&wWlJ;D&LC8j1zA=Gx8G1)O)D9jbb|_-D_HXy
zp*l-m5P5nt4l^?oc=xEferIVJa3zhhDe~CanxNEFH(`5KA-#GGzlKLbR>)sS*7p4{
z+06%opV4gLl8P9xuF-~#zKrGNZjrFCn=lIdN43{@7??P*j+ZYjs7*@bvPQJc8irC?
zh8wJtqQWgi2YY+y)1A;rBwmllg%xXX=F1;(;*)Q1WYK3h_}&LNw)hKNSh)#zE+-?G
z-EtLEb|l0U;<xZyYGX?vIU^TwM{2fObp?$m4kxpbZX@{OD^i#j16l6F!#3^hfbL$Z
zRr~BSU%6GlZtM;GegpBbR)?dLVNL#R5)Z*`qZN^-;Q@&{y`kW);f4%iu^3kR5;(b6
z9i>4RTU=qe1#4-p$Hiwi2I8_(+&udik`nox6C$xKCIvcU;{V<N`wCixihj?SIg`C7
z|J{r7E@Nj}HcXSM57*KK#ddzMwbQ;&zC^)9USoqy-6D@VkEm3YVv0=AyL~XftwTx*
zOL6M^Kk(rb&tu*@Z(zZOHF$gTYAo3HGv3{~0t<Klf_HYT!fU^Nf@kMX!*erc;QKi*
z;>ZV|;pDPE@xM1-K}_6k)vJ}0laqkF+k7BEV{_-=dECirT!AMPihLBy9-h6BF6S99
zy~61Tk(3yQ?5uETB2AN{tvarSAkh#kc~UBk-ANTip0?@5sTZj%@**)@jV0CQkk83c
zpj4Grk+3x?YqUrb+nxWz{_D(wSEV}k_v?q@GhTqbgO(MZ!TLfBdn^R4o%*ScuulK#
zajjN?uMNfiUEyFyKc&X5n<^<&GD}#|yvi>MC=)`Fmdg9G$scduR(Cm<Xw~PT4?f3?
z$xq<*Rc~TX_}@r~-N}XhmK5IP=6JYpTxCA9(v!H5zQWv#h>72h^%wqN9l%dm`0tN6
zdwV_mg&&+uEG~#bYJPmRMKg3sW^@cPGqqcbxmG9(QB+pDXfXfI&TzHnuLrp-2FG*d
zC`fL2Y`>wspK6PP)RlCX{*tk+_M$YD`z`s30<RuRh{PhaGM83s2`ApoV#7w&6(ll)
znJUYot}%@Y#hPokP@K<Kh%q+ni09h3L%(T!!ZKap$cA@syz#C&^onNke-90Z-OjJL
z{l-9MX%FWz1;l#V^~)<1#VCu`PI4)2Q<|56+-!ceww1XHJbDNV>9kAq=^I$^)bsdY
z&mV|S*vZ7F?vY<gMW!mLS2fNuWf9J17c*n5@m0PwGZlq-{CRF%lt?SBok1dDx;MVx
zaJI!8Nl|x_VG!2v%25i-N)d=8>Vg%oF@Yy4ioD>ec_4gJPht)mY4z@xoWyj<%XkYy
zPhthbMoKxGesU$EV^oVA#D*9X7=Vdi&WFB6PuatnFe?C4x;@RV2|AVJ|GS7^&R>9O
zc;keO5jJuoW}&K+B54JANiM`GH&lDgizHbVvyl0TxHh(CFf!KeNR+JV<6r%R7v6gV
zCnNsh@}z5%xQrqsoG71=Z7fQPGMUk+;~TOXk_E%G7L0x6DHs}45hoxk{Q}~1qfpX7
znJY7|l)#ZLI65)ZXj@|!V8s`rZDG=tEO~Vhr$k~0sZI4(pgcDdWpch(l;~SPU#a^a
z(dNL<*m(V}dX=fO;~+ft((ACX(%8AGH8kQ`@XI^s;ysq_@mE4({BE2)@EasW<rCDp
z#MsadW@g$=Z=fhkfjmp7?c01PRmyQTldfNO(~C^d!%4g6DJQi6Ti$vFi?^*qPF8t#
zQf-o%nS`9{=Tv)*M@eaZ#X{DNN^TvDQB$cN+B&P|X_Wamk|cxdZo^i<>QxR&C!r$Y
zqz|Q0EBStrr#GqS8{#lDwuOaz^;V!fF9&j!$m<(QVW4A?H_T4O?(p--&Ezd*iJ=GP
z_w9>5V=DQ)DiIl@L}++1SLmd+<gk%+G#>*0P<-5hw-<i|M+c#7oC0TV96-VP#j1VX
zBDW8Om9@6h8<Zg`wF&rJ>xlgJMWm?~$dNzZ+JVnmq7BmHa<S>tH}T!s(<scnq&lj7
z3iECwJDbmu-<TNcOPR=1#+1fKSy;DNu*XKQds$@0ZO6t&Lhoh+bIpq?=_KhdiM#Mu
zV?tk*$P3oI`V$x$n!~9rpGdzdN(yq>@RN^`E|bgH3vgZ@ogvx%B`)78cZKxx?S)BS
zyvX^|s-w7Agb(L@fenkdBEJ?P#5wuE`B3)b)>7n&p%YxNVEi~pE%{Y*<U9TI(ivDB
z(aeI1x{%*~5S(qb|GV7DE!0Tlfi4jzUO`?SKj~^|=>(e~?W}Z7ypx5EU%ZXgXHIaX
z>~slTdzbR_(b(yQjLq%XeaX8q8yovNhTC<VF$Pvv`~)nOhP;#+2bt!sbwS_>jov{O
zMV_F2YV_^7H=^)KBYhLJ>QaMsQ&bFvDw?IVBopGwJ(O0FUOtT9uisV2H=9}X#M5(M
zhr>fg+%Aqlpsg`J-1s;Ced8C%YM6t`%mKFld<mDoc@u7x+-MKyi7y_*+|HdLG2kn-
z%L>D>a^E%>r|Q<KDmAr2kiH0FJ@&=5NK%mu^3vv&-k>x$7R5#U2*kq76drvvA6b)d
zD+7mrd<W~Ugz7l!VmVP+rHH$9OSRWH=-WCq4UuOSd60G8Mid6d5)Aa>?_(O7pO0n6
z?X^Ry{kkJkvi4vUqQ*_6itixwB&5*PxHl7tM6fnAgrz#c!Gnm54b_&syd(n(rEX^N
zMM?z{ul|G7WYt0skrcB+dSKw>>fJN~R_yz996gZ>Ncj5nNvwNqC8|n?o|*yt`_UGh
zy7&{MCf4w(V@e)FHZGd^?FSg$sS89BenC=d>VBO0O}8nB32TWx%q$;%ZW=;CaUQ^>
zl4u^#Po7hjiBcJFB=|`skQkA-QgcwbxzJS~VO@9<v*0z8`=mZ(q-P@I>P6LF<6zY~
z5Dt#oo%5&-Mkd}cHL81hlfnJ_b171Y)TB@-?lwT=sfoyO!olrUXc|Khd3sUW7DT?n
zJBwgvY5=_&jB|adITUi$l6GYt@=EIF>#8s2=XPNKolN$g{Nf5<*MS)K{sJb(+-{9f
zO#9%;zId)}0OI4W;)e^Tn3!)=J<5~LM)3bG_yuQDcfqb$4^#d(pZzGR2kU^FmnmjU
zeFp8?kbj;|q!OoZ??K7h&$!2Rh1{_%?Cq%tjrJ%i%7&a>{LO_DQ5mk&^~$axB@EDx
z5|(HXT9JD3=QY?6mxGLy`U`?4$jiBh!sN#F%X@Y6Lti`AiRvI>UQL*jTQ0b}YOnUR
znKBZt4!k>$Ru=DyOGT0L!L<psr3#VPID*I%v`uar!6(nd-qyji28CxBSy(`+EYDkV
zm&&K<fc(fKNJ-><@%o0XFn7#k1h=id6-J|zUi0RoN81qGxV8)5?A(RDzg<9XJ`kG-
z{Po6<*b#RDHmnbs@cJUyI@N!|XxKB|@T7kr+`UI}`xFKA*O|T0lj+X2L4J8pSM^1u
z6^iojAw`kgZ2a<Nw?mPf!y6^~2ClHO)@+#R&9m{?6LA7j5j#~!8V`9%3=(rw8)+2_
z4_y}i_5qMuG;RVzCo?m64e77it37%K5{&brs2E-oqmq(<OZBT!LFYm&eqdfe<9CiA
z^7jk89cvuqGjf%dYkpN2S(rm4E*Fo49PKBnGRjWIwtMN^$bmloh}PZF|D|!&uF9>B
zZhdVqsZCF~cnrj~n_Kb8cR%35u_XLB|643Sb`Sw3N{pELCW5;+Y#|Yi0H%LC4@3Nn
zA(rsgbWuSlV*gskZR-N^%LlL_jGn&s(m+!gx2pwW6vtDR!KM#op3KhXXCsYG9bo3I
zxuj&Y)+TA!PdImjoeO1CD5#>qxwJeK)NY}t*6<lW6)uk2y9R4RcUv2nnpd=OYfnJu
z9x#&f)_iXERTRdZhO!>g%>R>02DHWno~S7D^ll`PG>)R#Ij)Nli%ntjkkv#cb~ez{
z<3o#xw0!O4Yp;m(?7v9Q<o&3Y)_pMkxwqg}4;|KH-+bDaPve=^t}wR_!R1?9F>U5l
ze82ZAbaJuA=%+tG$Z-E^^XS(FGjn}(aP9(AGv231><ita+R_cy5(hR^t&}rE<J^nO
zgI?rb)n3y^kr$7=ylie;Dz%0~2p<Wh2@(>^a4aJkg?YLQm3$bnIr&JvSDuQvF>vsA
z#7Jj0jBX^CjiE^}S_gHkx1zS0IvS3u<YF`;-=Ca~B5ro4?o^m~)r!Cq6-AyzokX7e
z9qQ$+Vm$-si)(g)nA%&jp>DY=qo`E-R*S;W42AiT+_tx`6LM}|uCX|8O&GJUH~q`^
zF}<?~>)qR;s4x@;#!eX3Yb08Ac89qJ!^^Gxe3^w;Zc53^glby4p~R(=)+fF)((j=#
zr*V_A)s|v;4vLES9P+j%#;|m$RLG%0#2q?}bCKi&Z%hYCWpZ*7k#V{4SH1=gei9a{
za75iALXXx#2zqR)YQOG?^(7eQP8KDv%XgDfp}1c6ET8nRMS5y&*V;vLzsQr%h2opk
ziY=n3cS+4Y5Mwh#=<ApF%1Rwv)Wr^gZ1lj-j$gib00*w@!o{P>TyFdN;Ob?LNl(tj
z#O|%Qo}S{ESM1(`%R4Wtp3!hpQ%dpOAAhS$0}|Z=MyR%QLtdvL@a2-VY0YpzQGNt&
z>lLCzQU3`kT|h(Z0+9?Q#r%lS$J_u0b#(Vt2f1o)Up|2R?8X<=iWKEXAwMQUwbyvG
z9^4620)m)QXy}C35;LnF7}=^l8&x-KXx^bq4`vARk!m@aS0Rc%#ckIG?he#J+Ezj2
z>7D3X3qE<Z=}vhj^dC~Xjx1p+OrcAPTLr_~l6QNMA9(MDGdT3~7f9lbvU<^De0$7(
z{!L8l(FW$$y>TOIAJ+c60z22maFekO>AFhTO}}>jmpB)7T6Ki=ss=u2|KdW`o^GH5
z=Rs^_CNWUwpVK%Zl;B395{es#RY#g8)CI+rD)>|wVgm$NYR-L-#|CIulBl?ZZX(TU
zjj{lzA{&3cgcd3ee(7!4+GwxF!vnD2xKEH90%p!q9jHG6lSaeNO3<Gy9FDnH&s;Xz
zH;5~WJZ%d?&-vpylw#-`)-2$r?A|b~XzdHHszpewp6)$>E0j&hW%uyg<;&Rl-j670
zfC1Tgs6SqL|9#94X$@chp=^W@h7*4;#ktTjF5;#>P%^4bOZH+#=#}zBR3Z~h?(sPH
zJ#>wcxi=ds3yV6mLlWz4m9dSVE2SosvV7dj=kH93#1&FQ&4o|q<tvdug%+A1SCW&t
zYqGI%53t3v{fD!Ap?p41o7g$_$3VBXuxUV)oPdFeKKi;jsP=$sX{jj9s>5=41}%o-
zrB}ODCGsTj>amPSkLrWgEJP-zU^hs4bd3%^H%I=+xft7qSpupF9Lfdq&B+tk_eaAD
zB#<Be<+a~n$=nw(A*c%u-OESB-g8KMcp;ewAotOp-!Egu_6<l(5EcoE(8G5;te<>S
zwXa)>gNDG-QM;A9vNIx(QJPS%r~_T0h>t{8mMXGF>If5a&CONFN`TCQdR#C%AT{?M
zikm{P4`akzFJMUU6KqSnmZ70Z8$8+C4c*^<S#_l0^z7P)%acW9rH27wbq|x(#qCj1
z<OQJ@8V|GN4NPhlc?!NUH>fD`B8XL~hqaB@<hRk<x7@EC8@m_3ulgR*F*W2Vs0GGs
z@G^8(cl>zpd+a>?2l_nG1J3ox2yk*=JbqaHJ+9o?!A>xLPFx&@q07r(aNCVRzDFB$
zw4r`ndp8#4(La-`L{WN@>PXW=oEd{Wm9=eXD20)I!@^`MLW`heB~3F~o4hm=MU7va
ziG$`qUix||0$r(KwstTy4a5`O+hXW~Pc$m3e&ff$+L8~sC71Ep>)~~B&QVykvc8ju
zb)e#1E(m?4^B@xG!Pu<k@Dlp4R)*ys9zw5J`(czsk-aA-^%(^lhk@Ka`GXJMIDvJq
zeOzNcn%Y94lT-+#9s4bv>$q6-T39}Q{Nf{=2;a+oP5!Q;WMz*}o6E(lHzr<&HqbZJ
zZYbrQ=v0Vr>NZ5QE{OAzP*|ABZA;jQ)xuMAE-b$GY7_8@RDnW~hun;&lV8Z54WPdM
zYZW?pKF)4n&7~n$LIMYuVR*eqKTMdr2<G;h&BE&AqmN!r<;kqhCnnTs^(%D<N*&DE
zRAtJkg`V=(h{R$TKO}~bMBdh<@+`SQZUbgO>qu75$#}7I2n>w*OqpdR@%aAYIc#3C
zTL;q`Rg;iZhF@QM2RlO#sdL;LnYP2+exs4!uDm>8W1(>D081O~O}-MDsaGJ&XuMo4
z52LIo6D2bKI@Q;gz$(C>+tvhBuv)2TtgG)KC<~Ak!$%Y~6)Y{q`1YTlFn{_A7@Kxb
z9jzxKDJ*RIU|h$k`1tuZF#3N>VeRdrdQfwing9cO^iU`L%gzahvJMH$IFZ*up0BDb
zc{P-`21-4cSk^o-LU~{uOz(@pNz?5xJ!`_dn9;r~>y&s4IXB}JzS^)J7mw=xVou8d
zetz~HtO-2=Dx^UeN!#JozQd6}<`r(gvB~Q^9FDe{&C_x}G=$xsl*8=VrfJcZ$%~+n
z^A@dvf*CUwnzJJHIq#+Rt+e_fLVjwpYP;!R$RuRiTa)nTpL_7!;P>HbJ50SgyhcPu
zY*gw8OWVF^<39<n515Qkrapl;fB6}0$8@VKY8r%A*SDE86jrvXTsHDl+`Lr#h%)Z#
z5H+$TPyZ)NUTX93*>4MDV~F(17m^s{r>eGe0~HRpp1cTM0|&D`{%b|t-Gd(&e}a@W
z-Q8@IwQ}XNA7I7#qg>Hn!bsW{FL&#W+)26(m#hi7u{rwM7_gB}g}D?h5Sf?)`K1OH
zSI`n=Y-p_%+-PD+jY;_G3i+DF;)X|YXakYh5~6&5blKD(;c@krV%GoO#=i$QV)K?T
z%%8jrLxN@^&}{;IoyQ``eF8f9Oh(UusTd#f7#0nE2LGG(BEETd36`z?9h1KL4k6D?
z=fX6#1-&+1FYP*6A=plx1qK)5YoBADf)bQ8<SR!jL%;h){(+B2aq{N&HRKsqVIrkf
zujLb0;zo!ppn}zXhCBmjSJgx;yMecapTXLBOHiPLXacg}|DO9fzCL|eT@=Dd8jKga
zc0u8E-DaGu4fYn^FfuJqv7ildvMwX<o^DFq)s<4JfuIt3GyR$~t=1J1c{5|}*3_*p
z5`9}J*(j!|Lt^CUCdKskX5*v3zsKqwf8ej(e`D45Kd@rcZ}@86D!l#c&lvv27wGot
zGYA;a2BvH<R!fa-5JHYDsyi~!!&&V?NY0B#Nm}g+m6N<H9~|XsT<EK^<kgV7h9+K3
z>>j?<+r-fcM#g-PR>p1~Npa)E2p6>JfoFR6=iDPiY4L4*efAVKe!fpN8Kxb`g8%3B
z<@n<G0Tku&wI8kQ`eR<#?kJtQgd1rzHS&D>z|xWr0n-*VAF(Sb7qZ-@7fzU4Qhq;~
z8W?kKM@?a7DuRQ#b_=xB7eixf7`SRK5!-)}iir^IS_Q-0im(4#lz$UtS8EqaNsC>T
z<*UN!V$_KxPgLp%DS?iu&BJ}SHm!UimGYfIX-Pg5CA!VYQjv_o&tpcrZtTPJ6UJF-
zN3m?n-}raQUM_B3)1)x{+W6it`0UVb6y%&|?`s0T){`*5Pk$6X_B9j_SuxyL6b5#M
zkL|-pX$|FGVgf`L*QxfJ4mq?8S%s;F3x!y)Tfy62^OJp=z}nma)<G>I-w-NZE&-zk
z!Od0W#ZVUG?9K36rP@}o|CHs?ID*J)T<mMMUFd@<#SqmZ1*2QX)-bo=<LTw4RM=ZL
zA(Yi&`qXD=<32>S2Snc8jWtI$VZ*|IxX6c!(0(5KxU{16Qm733HpXK2AJ=f=U^>Dh
zspvP5kit5TY;g5ph1G)em(nO~`(!P?*te4_Bu*1RL%WW_gaOl#Hu5$8iA|V(4s4hy
z(yq|wWrrdz>qe8ChRi7~AKIBcWL0-vA=gj8p<~q5z?u^69i*_e)u3<cKL|zE2zUir
zp_i>bXWS8C>FJOu9v;6fVWV56@`1ZT<7VhX2dE<Ul-gLocFv}7G3GCvGI=&i8aaP9
zS<l1fd<YY1XZ`^DJZCPQz@}RV@x`Q<uyWQC{IzfsexCgu7L0fu<ND0TpuW>EdhA#{
z`SMK6e0wg&&lrpTy?SCm&yg6`YdRk5|11_wT!7zS`UU?kJ%nS2GqCH+ZTMp6CS<0a
zfrrmHyw;}|+D!Tod7Y^WRMSV#p$(*#+9_PEMp=Zz$uh`pH*V><`^lG=U)bj4%+)a7
zy+dGU-buCBG@xje4s2v@t=$FBk2Hn`yf0pW_FawbVQSun+t1Fq3xq#Bl(H<NQkZ!~
z3tpo_U!BO84>p)3UmKC9@Tb;Niqv4wFUv)~j_SPDM3KE09veAF9rZ);^LzH~$I9?z
zd~)n8US0Vu-q`Rz{BYuDoQwDeiHW>5PA(Tpkx*Q4m227A#}J*k11BTb;pgMu<F$2P
z;k6&W#oHgei6vXtA~k6rJiLcuroRXBr!Pmbb<-TCS4DoOQE;@cV|DU+5EmN-Wkl18
zvMHz_@@7)ai@c*fFtByg5_uc@4zP9$s_c_(p-xn^;t9&=V(H0@B`Kd3w^ViqS$8jR
z+chDo9GpTIBR?0bBav4_3!-ZCjucX4qi+JS9>ujPkyNb3S<X6OYhwXFUka<_Q7ST!
znz$F~$uvQFneFo{9_vC`X#%p+j^Jk41|-Gr;*RC!W<z1^3$ak^wwX|3Zi`;_bk#oe
zQfLrGc~@~NI|-!?sE4U(isa=(Wpnd~2N%>8F4N-7=eb32O#(3+-Fn+0WX@Bn11;1C
z>3vyV=y!JQKbRQ`g8D0P>Q2l<-IL;?O4=g`yztL7CiK<a+3Gi-5FbS?jB;|@8yi}|
zz=+SxmeK^Y&NS=<ZbWTDTvD{^$bE>+xe!Ndn?Y#rIT_QtzlPVweTg@o{1b1_+ljZI
zUW1p$EWxmLbK&hc8m4Al)T`U>hbDKIZut?XzMBKveJdb((AU;v@v?H&dWr+Ok}lm%
zN7?zx#nKxSS!wx&EjH4;B~SRYbHLcZcI?}0cRfOFu(s`qKD|b2G>YiI291F3x8w;&
zA1k<5NYWUUl>*tr7CIGGTB|@$rVCOKdaa6l`HQnHMJ)?Ia3XK%025Pw$U@<1lA^{-
zwJN=P8K+LH!H&a6IM+)#BF?hv(0VdHA2T1z-~1nT?c0ovM}Nbzogd+y)h}SdvhjH9
zqkeenn~C`7&$;;P=o0KcwGLZ%9>DhtR^ipbZ^FxYv^oQw0L8|KhHt=^dp9Cy^<3^V
zGzSX3dcwxeN42LtGE&YVBkqi9ukk6ZAo2=H%}My`3%M}|3>X6krva)Xjf6;wu|Dny
zo;F%_poRKC33;hx=>5<N=k~Vct8;U6qM(SXc@C<yfG<0#f-Xi9TS4fxCi0bDm?}Ie
z+56rfjZzh49T+>gL2AZFYGh{@!YI9Q@?)4LMq=yVU*qJZ&1@8+TE5MOs@C=cFfL>|
zzJB}#tlzN`&;I^4X1vi0!2x0}37LrzjYjwwSei_sj@f_>#c1D^8SvdZ>*2|F`(n|?
zMcB_of5j_bVnpzhu%N;RqVnjBf}9KZ>+E)H->?j3m-efUHeCwZ_JOy9=G_$!pv=Rz
zm~0fJ#HtQ7G8L}&5-o{5(Qf)Myx6%b8!c&f;aN@idJn;fC!bO6wNPKotFYn;5`JeJ
zCL$^wpe(EzH%@Td)lpJZsiHcGJB8#_6nc$Noh8q`0j0rIDoblM@k-bRwT7hy|0TKN
z$c>O@);K*D+kX8Rx1zT)o4tfPCNc2F;E?h7{K?t)WzR2o^6Mwy;;dI`K|@_2ADk2G
zv>*FmIDR|w16F<WGoJ4?i_0)6K#PEGMsCE9>%M`-kv~*Nn<lhStG}(8dexpbiBG%=
z@x|4uy~f3$LTGTQmMfd}efKRq+oeDB^mRWeZ(`ONuaBP$x9;s#M_Q;ameoWXi$zS|
zx!l3L<`7q+qiU?Dkd;>{^$Q6+Il1XCiM+=Ay%j}X5cf(VuPCGZ9<=vxJUV#7&W!(7
zMTM!**Kz(DN^iVt#X{V=x0UVDhZe!saWG!#-5-lT{|t|PI2I2{jbCS|D%P-x?)Y^3
zQvCAfy9jALrIO!1C-Vfp+xaJ~c6_Ni(ln9S1j0<)p_Gi$;yc)toB&yFmg-33VOU|@
zEi2M)>Rn@Yos4|<V~p+CM<<=B098(Vb;u-ic)Z0;(@<!nUomvDB6KMgl#(u&YxC`_
z43(K#H3_+ulEjhkh5(^JUcW@1{s~$0wN%}QQ=`ZeWXV@>UDk*d>*ZP*v41KyKuK{t
z407sOFRz}Q|N0f&ytjpIvCklqqFwM5EF3fh3pOr8yRNm!X4e2{R50e1f%tdl_jqsc
zbl5r3LM*<+%gZ{0Z;$MS&8CmJ{iaA>=P_`!*Ud8gn=x^~nO{|VjfbJ6{PHhM)4prb
z#>o`ZpId;T-G-{mR%#P^k5~Fm#_0E7QXOfbA=H$NSIh>5nT3_t24xqeptPEx53=y@
z<*AFxkf@X5Q$isUd9voUYRS`!my5ij1bLaY3zea2N)}2ZNc5fAKP*6WvZ|h`4k-Kc
zeVmKl&9+G3jnKKnD9j%_3A28jQ*XCSeXw;h!D|~n#z#}1fUnPZc7%5c<Y%A7*Qbub
za?c8Gzo{X!bU+^+gi;bY85eLdCyGn;+n5+h%E!_rI?Ao%*2xFYz4S3&?lBN%);&~5
zH4pj!=l7qENlO>0j<nDa$P;5xgUFNYWZpMAEiSwZy}QR$dzGQ|+i69WQooQ`YSmp+
zQQ#}R0a^07sydhtgEH?)CFU?R;;rUe8M?_|V}1BH{26+Z^Mg~UTH7{b@ap)9n7m+k
zqlAl5ImE|48IKR1o`v>76S+=@AfaD=a4Rg&HqF$#Zq}YKH02AgXcL+%IdL-$@)N66
zM;eEUB41QkDbhi!I0rgm{L*DuG-d|8J;!M@^??!waB~=mFJE1b$zQyuI@&@*q1gDE
zvXsi1YGxExnn>mJ==SZZi{_NXM<c(ml8cZ;R<PnpgVlz1LlGp9L|qVgp>c2`pH@4u
zrf3ussU1vIrS0PLwV%JnC_5SdoH@cpw9wZH@E?meCrrkeSBG=GZ(~6dF%w?xhsE>f
zp?ABn>Q%Sox>>d3FPKJ!a{En*f`CD=vC&)!yqd^JJAu%otL&mvUurtXlzL+oMU|~8
ztwSMqJztrL#qWNBc|9k<-g%hX7^oLw1DKk3!DAs$W6AR0&}CY0)dMYP0*i;FcPeA*
znO*vz2mWd*GiIvLA#r*nie+k%Cqb_$@TA2W7kPqSoP0xq<6lJya%1CF+ciU?YGUsQ
zb5%{)oZ@U4<YsW&+M;0dmx#Q}hbg*vjKoU=hhp5DjVtgK8T42Oyz|yO7|?MzJ3;)c
zZ*tNe?BDzyj53>63ATb(9nsoOvvn}5MNxtyw^C4YX07Ug?r}3NzjKpv^EG!@)e^cy
z{kphf%2&&=aLfce)9rCMIu2)}sUY@Qs+r-dh)Bw%)DG~NfVYOci6!r^!R%#U!Q0<N
zH5=4|CLnKs`9s#q70ZCc!Ux^j357XO6hBy?MU)+jqJm0+DT3~5bkda&L|(AosV5Qq
zLL5qk3<b%xpFp)~?GH;U-U(iqp9+IJSGjF%V19l#{*AiLK4d-@(ek993#NZMy~zl?
zK%cR`cyhwC@bys@Ghx5smB?L)T(=l{<-K{6ptplPL}FXjo_5J()_hph$#UPIj&ZVf
zP)E8X<>x`xNK*t9lH28l8JPLqxA<}8T6{k9J-j#cbqoxA3L)N8(8hBjd_Bg&%WVwW
zdQZfNc8_Czzqwd4?iGCf>Qa3C;~yBY_#Jc}>{jJ!%twXHOyKm|(>T6-J+gEdoMpxY
z{$Xz4xX@^17d$BDd3lLY-gwY2uPn%@xX_etfr|ckY8pfM=+tuvRy_HJ)Js*V&}?36
z?L#5``?Z6U$`~vyiH8vzmS_V?8*uyDW^UL|_<QugluzE{7BMwNCd})~jWR5(`|t;p
zh1eZ-9Ln|Y^ZQMNQrE69w+dA4X%`W@<n~9!q2%%o)e+sIG<Sx95nsJ2y(AN9ch%7j
zjRLp+!c`wVo*jcxpTCcVt5)En)vNLOsx?^g$6r{zVJ&{zxCS4r`3cj%U4p)g7NFzA
zo^W*rjI<l(-z2!T=QuuF^FMsFc_kvY9aJ6FJ`X8z%`Fy9zIYA=1rOHEl@;DaS>iR-
zUO731mDUiE=29b}*P10yJqf)yy$RVfRKJSrW)w_J^RjE-ZCY9Bp_N#V_dzQQ5FcN=
zQdo7x^3+Bgie#M+8)?vDr#GfgLaR2qi$AU_G`e`~^BH)xM=$R45|rp{Rp=#{U)aO#
zHw7p~vWKJYDjMZvoWhkWyJ}oCqBR@>U}MXtrpV2_f*ad5bK6xxcU>{N4YQfCmYPN@
zy4lV0;OJaqa4X1-+5Kb**xB$!NNB$?0tuQ5MG+^MQFoCGU?@(~j`4UuG})@oJ5~*p
z=Pp0t4oZruSjnv{Mp$xXcQ;+@cd{xO6x2J=1SSc+V9jd`y~T?c<HHX>q;0BoLVXt1
z@S|+gRL@E*7Kst!-U$O{3}m|xhbACyY(I@taj7Vir^C$H7Y@BNzYrs7-}g9oYY(#q
z%h1t#FqZuBR=sWj89Sxdt`_3R%6&Nf`!4KVvmYB*?ZnOPCvbK5Ropmn8(D>>u=BKr
zL3#e6dO-^*eERi9^6_i9mK4Q~l(NxIBA2JgttUH2O`t@eQY=A0%pshPzQgvksA6iA
zh%Yuncc}p+E_^<2U7@tFfjs9RqVC2qV<8XMlN4~ea~rY8j^iF{F-MOh`fz!p{Y(1~
z;_Ti7IIwLuwyxiXo$GfY^-=^={bCrJnZwxP5%!lfB1O#fJhf{bF2<bW_J_0{2)ABc
zwBG5_3Rm-oOjA*Tu{A%hLwJ0}Ts8E;c!S);%pYyKjpeopnuy)G^J}DMb8c`lrjN2l
zy%vR0(j+GNaLMr22o*)1933R`<dCJc*R%#&kCy7Tck6&5PYkP-ubWnW-8g&)Cu3qE
zV?CS5&=Y<GCaE6P4AQ$-u;Ji#6c^lPr%{4=1E-?<gl?)wYe#;80{<>rkMBNTf$#p_
zgzaaJVb|5eI1#lMm*Xzt@a<3>j*7&QTT$43^dwGgIe_$omtbh+0(%dedi(t;ZMn5m
zJ6yUPi}Z|}+_9A0bo44KgFHZcanp6dJUJFu5_8z^r=3yQ{gf0XKq4`QXS?ALi)x5d
z(=ha2iiqt<QMe%|D*}Z@(Ks2Gi?AFS&L*bdSoA#{z7v5%QI~Nr;xvv#9>RrtXK+37
zJfhPsAvx<RlC!Vk(%qxjd-eoQoDD<H`Mpp^Cc~k98;HsO(t<{akIcfZ^ZO7RdyU=m
z`WV`F06hD2Q9Y_XoS4b`Fyk(Z8EIetxE8TVS0I<mRjri!OIZU9%>5A3Yogk1QmT|;
z^S=w(<7BvVRy*}vw^^e|404;$0~&ML2=7ZTNIgfz$ye@8$X%0FTF6=GwSk5==B?YQ
z>%C^lvNfJ#U36|eGSm2^{D#Ip81nKoZo4*+<-YFS^>}B-^H})rzu0ho9b%%lA}8Yn
z%1UXt#h+V><)(cK%}h($kAs)j<D(--@bZUC@%5B9ac(EO*y{N+^cw1l7rJ(XxpgmY
zUm;J$Z>LXk;h;@{{LW+G>7lAwsS^}985s%1;qO)Zx`BqxW(q^-R|ut)6^0`*b{CT3
zc5^iY3Ue=V#o(z9K~=^T#ii3kwUXVq_wH=P%ELSH@xJ|7v2ZRfeEYNNS^o|096Ey^
zUYdg&TQr}PFZu9xB&P8?Vk`}Sd7HW!b@hQp-jufFVMLryKvHhi^Oj}Ic*`ryLP>Ir
z>Il2PB12JJq+XXn7ZuIelDme!pw@iy1icx(fgtkS6-_-+o`PAKoQJ-4v>MO}7OJyD
z5jG~_r?_oRAYz|o`#mOxN<OaH%ETSsZENR4j=P(W6*Jz(cP9>F&5@&=cvHVdNu#Xn
z`oY0vI9xnO!_8|9Y#ax{)FPx(LaD;sP+YpW9$%a|g*QL{25VmY9wl`+FBKX8`STdk
z%ANh1yqS=haRf1cf5B}xHZm(G^t0C2X^s^-w}0ITLs6z~CO-=^laaRZHT-rh8FwNm
z6~=?mC{a(}jVmGPVmk~Sy`R8{&TnAmxaD~7oul~nlau)V>94S0&}fVqH5ktBBia2@
zgyi@=Sa;|kmY+L=O>e!3#Eblh?NKJ;awfKHTZO;Q9Kf6}7viTE<|95#GucMTRg)5T
z0de=jxP1o;4|w!emG#sj51Vimh&gcvnduR#Jx)U@pSJoyVSX~iskc;nKz2-}blYUL
zlbDf<Mk^v;(OpAhOY%O^olW)N=qz$I$t|7RW7zN!u(YV<P+Cun8@qPnT6{PZiee0P
z@kN1Och!Rp!~D{I>^r>^r7}LOGsL489)DrvL)|9{_X_a+tFPn73%3w^cQ?Bk3t(m2
zALD}hVp_+3=o#1*Jv$9YNZ*<0+PWKhJG-F2lM{Nnxv}r<ha9CVie!b%qRWH4Bn3&y
z*V)ishMZ$(;oGSzEN$!Ni#0YDp)B7K$1X>sxR82zC1UcG=;hK1r4E(z)HepU(Km1<
zy+rldbVEjVI=krdU>Yz;bwu+}75$Q9KjGlnzwz(+6UfgdKWh0sMd<*XTzjBTt4?^T
z(+E8I)N6SC(}kEje+r&_VH74l)ej>lc0jM*&hTsJ2#;PJ;5TRlY|Gr>l@o_jdv7E&
zi?ggWp56F2a4}JaJF(HQxN!$A-Mg}mvz~swCQN=laQxc^`19OZZuDDLnuaS0Q3z!s
zZygZ{W0%&D+SG5Zf&~8LCm-O~Yca^pJkO5kVO*P@=sjsT{{$^Tdg8`x$A|g+DY9nI
zkN;r*HA<<%LEaEbSVNXMg>H$J>`8-sJ3`{gmx8>o|0_f$a(w^^I;lT>G4hR4(O3F+
zTAO$!1t;^HM4rk!b!3fO0$^<Ji;gxPXw``iH+vX#V(#rZg=2RqhCLT<R-Q2ID8z_2
zjM77^aq`v<h`51<7*7wFiXP+2Q~Xv%b}q1L&YSr4(rtF3oPt=-0bSaT#AAaWgUg6l
zVBpgedT#9?vUP{p$QUAXYu3&A1KwSs?>`W39Y>){ukq-~MklESrpU<4W}QSnH|KCE
zF&p>J-$FpUp0IbS+lA~A?1GGgS8ySoStv?2T4J4t3;SB8okyvj(TJGYAuBZuNeK^z
ze`yP)q5!uFEzrrW74+F?Leo$o@zi4<W6hOY2*0_VopQeX8YS{_cJG6}K^-uwV}DG0
z`Z>I?XcqcC)(3%IU14v-&!tcfBpSlg^-Yb!b<NmMZf(Ivuk9Vtdgx%d>bbzFC=Ic4
zSLEizaIUz7#OpYdSc<aH^RV^o3=6x5tgLBfocwetzBzpyvI1JdPpU|rW(hL0ZsO?O
zI9$4X4ThJ_ut&^c<?ULlg<A9qF=ub#{7+xu$FNAGB=8Yvc8)_Z?}d4=^3<+7k*xUY
z(h66E{PCas?>oe$t1Wf1$c6YwH`bW0mZG0mM;Q3^<qrO_=0y~ha{hP{F^UDHNmug6
zlTVPM8#ynErl=_L^y`qwlQW%?&oGtaB5j~=V2f@xPG~=zbpPQ{n(iBiqHsJWfmz&1
z5Sg@sd#`b-M;peTO{<WV%MX7=VjIk!@d8?Rt3IP&0Xt=XJpVCPT!}(v$`SUDOwd1M
z7>4wH4yJ+qRq4YXj+oum2COG;({n6(ib@ccDdwzPMOii?lkVW!$$RM6zYi>IYvIIG
zK@&Q%5<6zi-(y2Mie_QMQaS5@+JvA~+PLNPOU-QHb9*<=MY9o;Qg;is3iI#5yr=}O
zokrD43~Ec!`Smz<YZEq|y@KrYQ=E}N3+Q}W55<)Bo|xFK7w2Z^_jqq+q1$oE_UbaZ
zPNGj~tbN-%quub4a7rkIOwSbY88RmH8Js~78Xu1sX3^U#Y~UE+UZ>Y@s$5w98$Ld;
zi;al*s25M)vGDclzyw|o^3oLU{>aF<fs^-AaN%}5ZtvTN(o3O83%!Ai=y(+7%2B3g
zhMa^{q+Y#&*i+{bz5f_aZ2S#tjvvL=OGl8G#Ye5^>AT|1-h<J3cJ1fj>Wd4r;;Tz5
zT#+kRitz2vpF>v6CAcHYoNi>{hH+<2j~f-(2EnQQa1<70WBay`_(yry_zBkN-;irU
zm~_=B6-AydIU$UaYWPu<4b_AbLn%QICpUDP+@I|}9QsmsZ_98p{5tY;qfjbwM&}N_
zAUCN+*H{B)G2u9Td?V{P_;djJhEACI#MAH$sD6d!j%5e%)uAIuh@k~HVgv?_!`R+4
zVN_4|ksdou2CaIalcN*j(u$FpeU}}PAwDx2aTnt;eCi13>r;POJ3N9Nk+kmwF2?a8
zl|{uF=x1n(;=snwJz^CbiSYDd6ctocBUdXZ5uIC#p4K+dcMeb;t3NckT6}s9{yKjM
z7cTBXSxEx7hQrNsC?4w=fXUqk<Avo5(0O!cn3=I(w}HY-|DMD?cu0G64(ScY*mT?~
zvO!*M4Er$oNJzVZvk{4~kIRH}NEa@LO>^by-&^s{`aig!1;WCn4`v2AqML&sTHEWR
z)GmnKA7XBVs#N44Co=-KlEQH)G7LwU;Gd3)!I2ARuzT-L>^pi0M?){-P*@mtUO9%7
zkw=l162^5BJYw_-9)>4B`4sv_+C6DBooH7}8*9fm|6<Egb=qulvye$oLQP!+xjrN`
zuW4l&gn({i5PM-W&W5VzfM~+?IBR!Vqo@n=&DV35uX-wqJRyWp(pMzqq%cY`B`NFT
z?TfzCMzY=7A(uMg(Ej~MOT7+xnF#$H+)?a7q4)L2>g3-zbo~hD7bgsjJ@M)r&%?%!
zn>u)aG&cD8c;Ocay-AB)l(2Ceh&jRSpx<o<|AYphZ|8~jR#u3~C`1+;mXbi<PS1ov
zgbY2#_pG&8(5NRjPJy#`vss5o?kyQI<#zDwOKFN57lpMOauP2fQHL%YqO3F>iJ2k<
zcNhRYgZeM!<OKfsulVlBF2r%2d<i55UKrS`KW4S-hG$oNh>($On8nsWWv>GI{cY@x
z(QVQI1X_3^C%zcbnVIa`%|%gRG>%6_BKKk>d^+}n)IzsPe`)2vh}g0Pc}D)QaguVQ
zkh*eZ%|^Vn>KEi@o#gfnO#?Bvb34pivkbka^+5Ltqu^^5h+w%GCZ<lv7P+CgxJY&H
zmT*>nLEdfTWZmMzSF>3Mkd<*0c{!1+Q%GfoQ)Ra_xoKXVJ`1iL{ZvP^hqFEJihCFo
zjPlcG-{NZA71a?gV*rUfi8qNnxfr<dfRVXBI`x@|vl|!Sb}Bb&Cov~qJQaeb8EUQg
z<B5ttFS)^l$QtqsQQl0>HzY63N0MF%a_Uf*+r>p6om4q&N{gdW7~k*+gRHDXCIIDm
zbo3>ruyv_^bg=V_^*DK#X5`s<6G<_ql_MmBU*{jx0FuCdc&6ttu68UzD_Fljb__Sp
z*RAZ~z`3I^%*UGj0Q~syc4`EqS807j<5FznihdRb+#H6kiHtvtgdHE(dnGLWyP^}T
zvHZv$RTLF1O6iQJd-lX@vtPy&-_3y)ALXl6NI(Za6@uRn{(?oLo`<;=A2v%9lp90;
z!0XS?M);vy+|8#e^5XB}_q%tndHs7h`SIsSxL*6~wSdXcrnf)FYpcFPZg#oAKNk{$
z$G-fGS**OI(ELTe@xFNex7YFQ=3lY={g3e3s96})ZaSP@N5RszFN~yZIhR>w8F~=v
znCEtEi{MGMTaeihC|x?`s;Ld}%=SKVCtS71i8jSil33GZ5A|kh!OkttN137&d&2jr
zj&MIY4UvWLN$MapF7U+tmOQBp%^p&MYr3;(wE<^l=vlWxC%-Om^{$=Eg%)q#-f;rQ
zqhq;AN=Q85)N73D(fV=g=tkU0QJ++pOZ_o#{<JC=E2O5D;gipoAv)m*x9{XK7$b+i
z46%)7Yix>LgV8$k49?t3=DugKEDiQaGW4ES`v?*G{K?0ebr+M)te9jb02%0DYz4H_
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
E2j`LGcmMzZ


From 134a94e86d9ca21565b9a537860e2abef1d6556b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 10:02:47 +0900
Subject: [PATCH 02708/10326] Rename enum members (no idea what a TaikoDon is)

---
 .../Skinning/TestSceneTaikoScroller.cs                        | 2 +-
 .../Skinning/TaikoLegacySkinTransformer.cs                    | 4 ++--
 osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs                | 4 ++--
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs            | 2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
index e26f410b71..520961d3ce 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     {
         public TestSceneTaikoScroller()
         {
-            AddStep("Load scroller", () => SetContents(() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Empty())));
+            AddStep("Load scroller", () => SetContents(() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Scroller), _ => Empty())));
             AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.LastResult.Value =
                 new JudgementResult(null, new Judgement()) { Type = passing ? HitResult.Perfect : HitResult.Miss }));
         }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 1096b8db00..6e9a37eb93 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -87,13 +87,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                     return null;
 
-                case TaikoSkinComponents.TaikoScroller:
+                case TaikoSkinComponents.Scroller:
                     if (GetTexture("taiko-slider") != null)
                         return new LegacyTaikoScroller();
 
                     return null;
 
-                case TaikoSkinComponents.TaikoDon:
+                case TaikoSkinComponents.Mascot:
                     if (GetTexture("pippidonclear0") != null)
                         return new DrawableTaikoMascot();
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index edad36f7d6..ac4fb51661 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Taiko
         TaikoExplosionMiss,
         TaikoExplosionGood,
         TaikoExplosionGreat,
-        TaikoScroller,
-        TaikoDon,
+        Scroller,
+        Mascot,
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index c0a6c4582c..9b37af1111 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(bar.Major ? new DrawableBarLineMajor(bar) : new DrawableBarLine(bar)));
 
-            AddInternal(scroller = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoScroller), _ => Empty())
+            AddInternal(scroller = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Scroller), _ => Empty())
             {
                 RelativeSizeAxes = Axes.X,
                 Depth = float.MaxValue
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index ded1fc0933..dabdfe6f44 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                         },
                     }
                 },
-                mascot = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoDon), _ => Empty())
+                mascot = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Mascot), _ => Empty())
                 {
                     Origin = Anchor.BottomLeft,
                     Anchor = Anchor.TopLeft,

From 149cb93e8cb314a87c7a0f7a97293ebac98372cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 13:18:37 +0900
Subject: [PATCH 02709/10326] Add very basic error handling when a directory
 cannot be enumerated

---
 .../UserInterfaceV2/DirectorySelector.cs      | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
index 59de931df5..ee428c0047 100644
--- a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
@@ -16,6 +16,7 @@ using osu.Framework.Platform;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterfaceV2
 {
@@ -74,22 +75,31 @@ namespace osu.Game.Graphics.UserInterfaceV2
         {
             directoryFlow.Clear();
 
-            if (directory.NewValue == null)
+            try
             {
-                var drives = DriveInfo.GetDrives();
-
-                foreach (var drive in drives)
-                    directoryFlow.Add(new DirectoryPiece(drive.RootDirectory));
-            }
-            else
-            {
-                directoryFlow.Add(new ParentDirectoryPiece(currentDirectory.Value.Parent));
-
-                foreach (var dir in currentDirectory.Value.GetDirectories().OrderBy(d => d.Name))
+                if (directory.NewValue == null)
                 {
-                    if ((dir.Attributes & FileAttributes.Hidden) == 0)
-                        directoryFlow.Add(new DirectoryPiece(dir));
+                    var drives = DriveInfo.GetDrives();
+
+                    foreach (var drive in drives)
+                        directoryFlow.Add(new DirectoryPiece(drive.RootDirectory));
                 }
+                else
+                {
+                    directoryFlow.Add(new ParentDirectoryPiece(currentDirectory.Value.Parent));
+
+                    foreach (var dir in currentDirectory.Value.GetDirectories().OrderBy(d => d.Name))
+                    {
+                        if ((dir.Attributes & FileAttributes.Hidden) == 0)
+                            directoryFlow.Add(new DirectoryPiece(dir));
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                currentDirectory.Value = directory.OldValue;
+
+                this.FlashColour(Color4.Red, 300);
             }
         }
 

From ff6642190f0d6e85cdff7eb3b2998fef0f9fb974 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 14 May 2020 07:26:47 +0300
Subject: [PATCH 02710/10326] Update colour retrieval logic

---
 .../CatchSkinColourDecodingTest.cs                          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
index 57228210d6..7deeec527f 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
@@ -19,9 +19,9 @@ namespace osu.Game.Rulesets.Catch.Tests
             var rawSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, store);
             var skin = new CatchLegacySkinTransformer(rawSkin);
 
-            Assert.AreEqual(new Color4(232, 185, 35, 255), skin.GetHyperDashCatcherColour()?.Value);
-            Assert.AreEqual(new Color4(232, 74, 35, 255), skin.GetHyperDashCatcherAfterImageColour()?.Value);
-            Assert.AreEqual(new Color4(0, 255, 255, 255), skin.GetHyperDashFruitColour()?.Value);
+            Assert.AreEqual(new Color4(232, 185, 35, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value);
+            Assert.AreEqual(new Color4(232, 74, 35, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage)?.Value);
+            Assert.AreEqual(new Color4(0, 255, 255, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value);
         }
 
         private class TestLegacySkin : LegacySkin

From 5e09a1b33485663dbb69fa53b44b12861849831c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 14:23:12 +0900
Subject: [PATCH 02711/10326] Use Action rather than custom handler

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

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
index f55e37ebc7..dc9f30cab3 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -20,7 +21,8 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly SortCriteria sortCriteria;
         private readonly SortDirection sortDirection;
 
-        public event PageFetchHandler PageFetched;
+        public event Action<List<BeatmapSetInfo>> PageFetched;
+
         private SearchBeatmapSetsRequest getSetsRequest;
         private SearchBeatmapSetsResponse lastResponse;
 
@@ -82,7 +84,5 @@ namespace osu.Game.Overlays.BeatmapListing
             getSetsRequest?.Cancel();
             getSetsRequest = null;
         }
-
-        public delegate void PageFetchHandler(List<BeatmapSetInfo> sets);
     }
 }

From fa3373e5f306e0f64afeccefa9977c02584b2f5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 14:24:43 +0900
Subject: [PATCH 02712/10326] Reorder file and change naming slightly

---
 .../BeatmapListingFilterControl.cs            | 30 +++++++++----------
 osu.Game/Overlays/BeatmapListingOverlay.cs    |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index ac5ad96f7c..92822794b7 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Overlays.BeatmapListing
 
         private BeatmapListingPager beatmapListingPager;
 
+        private ScheduledDelegate queryChangedDebounce;
+        private ScheduledDelegate queryPagingDebounce;
+
         public BeatmapListingFilterControl()
         {
             RelativeSizeAxes = Axes.X;
@@ -113,8 +116,17 @@ namespace osu.Game.Overlays.BeatmapListing
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
         }
 
-        private ScheduledDelegate queryChangedDebounce;
-        private ScheduledDelegate queryPagingDebounce;
+        public void TakeFocus() => searchControl.TakeFocus();
+
+        public void ShowMore()
+        {
+            if (beatmapListingPager == null || !beatmapListingPager.CanFetchNextPage)
+                return;
+            if (queryPagingDebounce != null)
+                return;
+
+            beatmapListingPager.FetchNextPage();
+        }
 
         private void queueUpdateSearch(bool queryTextChanged = false)
         {
@@ -142,7 +154,7 @@ namespace osu.Game.Overlays.BeatmapListing
             queryPagingDebounce = null;
             beatmapListingPager.PageFetched += onSearchFinished;
 
-            AddPageToResult();
+            ShowMore();
         }
 
         private void onSearchFinished(List<BeatmapSetInfo> beatmaps)
@@ -165,17 +177,5 @@ namespace osu.Game.Overlays.BeatmapListing
 
             base.Dispose(isDisposing);
         }
-
-        public void TakeFocus() => searchControl.TakeFocus();
-
-        public void AddPageToResult()
-        {
-            if (beatmapListingPager == null || !beatmapListingPager.CanFetchNextPage)
-                return;
-            if (queryPagingDebounce != null)
-                return;
-
-            beatmapListingPager.FetchNextPage();
-        }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index e26f084ea4..4aa754491c 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Overlays
             base.Update();
 
             if (shouldAddNextPage)
-                filterControl.AddPageToResult();
+                filterControl.ShowMore();
         }
     }
 }

From 04c99735264be3cd769bc085d7958727c6b83bda Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 14:33:31 +0900
Subject: [PATCH 02713/10326] Clean up cancellation logic

---
 .../BeatmapListingFilterControl.cs            | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 92822794b7..3df4d5d588 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -122,6 +122,7 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             if (beatmapListingPager == null || !beatmapListingPager.CanFetchNextPage)
                 return;
+
             if (queryPagingDebounce != null)
                 return;
 
@@ -132,14 +133,15 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             SearchStarted?.Invoke();
 
-            beatmapListingPager?.Reset();
+            cancelSearch();
 
-            queryChangedDebounce?.Cancel();
             queryChangedDebounce = Scheduler.AddDelayed(updateSearch, queryTextChanged ? 500 : 100);
         }
 
         private void updateSearch()
         {
+            cancelSearch();
+
             beatmapListingPager = new BeatmapListingPager(
                 api,
                 rulesets,
@@ -150,13 +152,20 @@ namespace osu.Game.Overlays.BeatmapListing
                 sortControl.SortDirection.Value
             );
 
-            queryPagingDebounce?.Cancel();
-            queryPagingDebounce = null;
             beatmapListingPager.PageFetched += onSearchFinished;
 
             ShowMore();
         }
 
+        private void cancelSearch()
+        {
+            beatmapListingPager?.Reset();
+            queryChangedDebounce?.Cancel();
+
+            queryPagingDebounce?.Cancel();
+            queryPagingDebounce = null;
+        }
+
         private void onSearchFinished(List<BeatmapSetInfo> beatmaps)
         {
             queryPagingDebounce = Scheduler.AddDelayed(() => queryPagingDebounce = null, 1000);
@@ -171,9 +180,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
         protected override void Dispose(bool isDisposing)
         {
-            beatmapListingPager?.Reset();
-            queryChangedDebounce?.Cancel();
-            queryPagingDebounce?.Cancel();
+            cancelSearch();
 
             base.Dispose(isDisposing);
         }

From c836c9319bb0b6d28fa378e4412b9d4fc7d47e71 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 15:35:11 +0900
Subject: [PATCH 02714/10326] Combine pagination logic into
 BeatmapListingFilterControl

---
 .../BeatmapListingFilterControl.cs            | 118 +++++++++++-------
 .../BeatmapListing/BeatmapListingPager.cs     |  88 -------------
 osu.Game/Overlays/BeatmapListingOverlay.cs    |  69 +++++-----
 3 files changed, 111 insertions(+), 164 deletions(-)
 delete mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 3df4d5d588..41c99d5d03 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -12,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 using osuTK;
 using osuTK.Graphics;
@@ -20,9 +22,34 @@ namespace osu.Game.Overlays.BeatmapListing
 {
     public class BeatmapListingFilterControl : CompositeDrawable
     {
+        /// <summary>
+        /// Fired when a search finishes. Contains only new items in the case of pagination.
+        /// </summary>
         public Action<List<BeatmapSetInfo>> SearchFinished;
+
+        /// <summary>
+        /// Fired when search criteria change.
+        /// </summary>
         public Action SearchStarted;
-        private List<BeatmapSetInfo> currentBeatmaps;
+
+        /// <summary>
+        /// True when pagination has reached the end of available results.
+        /// </summary>
+        private bool noMoreResults;
+
+        /// <summary>
+        /// The current page fetched of results (zero index).
+        /// </summary>
+        public int CurrentPage { get; private set; }
+
+        private readonly BeatmapListingSearchControl searchControl;
+        private readonly BeatmapListingSortTabControl sortControl;
+        private readonly Box sortControlBackground;
+
+        private ScheduledDelegate queryChangedDebounce;
+
+        private SearchBeatmapSetsRequest getSetsRequest;
+        private SearchBeatmapSetsResponse lastResponse;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -30,19 +57,11 @@ namespace osu.Game.Overlays.BeatmapListing
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        private readonly BeatmapListingSearchControl searchControl;
-        private readonly BeatmapListingSortTabControl sortControl;
-        private readonly Box sortControlBackground;
-
-        private BeatmapListingPager beatmapListingPager;
-
-        private ScheduledDelegate queryChangedDebounce;
-        private ScheduledDelegate queryPagingDebounce;
-
         public BeatmapListingFilterControl()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
+
             InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -118,69 +137,80 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public void TakeFocus() => searchControl.TakeFocus();
 
-        public void ShowMore()
+        /// <summary>
+        /// Fetch the next page of results. May result in a no-op if a fetch is already in progress, or if there are no results left.
+        /// </summary>
+        public void FetchNextPage()
         {
-            if (beatmapListingPager == null || !beatmapListingPager.CanFetchNextPage)
+            // there may be no results left.
+            if (noMoreResults)
                 return;
 
-            if (queryPagingDebounce != null)
+            // there may already be an active request.
+            if (getSetsRequest != null)
                 return;
 
-            beatmapListingPager.FetchNextPage();
+            if (lastResponse != null)
+                CurrentPage++;
+
+            performRequest();
         }
 
         private void queueUpdateSearch(bool queryTextChanged = false)
         {
             SearchStarted?.Invoke();
 
-            cancelSearch();
+            resetSearch();
 
-            queryChangedDebounce = Scheduler.AddDelayed(updateSearch, queryTextChanged ? 500 : 100);
+            queryChangedDebounce = Scheduler.AddDelayed(() =>
+            {
+                resetSearch();
+                FetchNextPage();
+            }, queryTextChanged ? 500 : 100);
         }
 
-        private void updateSearch()
+        private void performRequest()
         {
-            cancelSearch();
-
-            beatmapListingPager = new BeatmapListingPager(
-                api,
-                rulesets,
+            getSetsRequest = new SearchBeatmapSetsRequest(
                 searchControl.Query.Value,
                 searchControl.Ruleset.Value,
+                lastResponse?.Cursor,
                 searchControl.Category.Value,
                 sortControl.Current.Value,
-                sortControl.SortDirection.Value
-            );
+                sortControl.SortDirection.Value);
 
-            beatmapListingPager.PageFetched += onSearchFinished;
+            getSetsRequest.Success += response =>
+            {
+                var sets = response.BeatmapSets.Select(responseJson => responseJson.ToBeatmapSet(rulesets)).ToList();
 
-            ShowMore();
+                if (sets.Count == 0)
+                    noMoreResults = true;
+
+                lastResponse = response;
+                getSetsRequest = null;
+
+                SearchFinished?.Invoke(sets);
+            };
+
+            api.Queue(getSetsRequest);
         }
 
-        private void cancelSearch()
+        private void resetSearch()
         {
-            beatmapListingPager?.Reset();
+            noMoreResults = false;
+            CurrentPage = 0;
+
+            lastResponse = null;
+
+            getSetsRequest?.Cancel();
+            getSetsRequest = null;
+
             queryChangedDebounce?.Cancel();
-
-            queryPagingDebounce?.Cancel();
-            queryPagingDebounce = null;
-        }
-
-        private void onSearchFinished(List<BeatmapSetInfo> beatmaps)
-        {
-            queryPagingDebounce = Scheduler.AddDelayed(() => queryPagingDebounce = null, 1000);
-
-            if (currentBeatmaps == null || !beatmapListingPager.IsPastFirstPage)
-                currentBeatmaps = beatmaps;
-            else
-                currentBeatmaps.AddRange(beatmaps);
-
-            SearchFinished?.Invoke(beatmaps);
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            cancelSearch();
+            resetSearch();
 
             base.Dispose(isDisposing);
         }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.cs
deleted file mode 100644
index dc9f30cab3..0000000000
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingPager.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 System;
-using System.Collections.Generic;
-using System.Linq;
-using osu.Game.Beatmaps;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Rulesets;
-
-namespace osu.Game.Overlays.BeatmapListing
-{
-    public class BeatmapListingPager
-    {
-        private readonly IAPIProvider api;
-        private readonly RulesetStore rulesets;
-        private readonly string query;
-        private readonly RulesetInfo ruleset;
-        private readonly SearchCategory searchCategory;
-        private readonly SortCriteria sortCriteria;
-        private readonly SortDirection sortDirection;
-
-        public event Action<List<BeatmapSetInfo>> PageFetched;
-
-        private SearchBeatmapSetsRequest getSetsRequest;
-        private SearchBeatmapSetsResponse lastResponse;
-
-        private bool isLastPageFetched;
-        private bool isFetching => getSetsRequest != null;
-        public bool IsPastFirstPage { get; private set; }
-        public bool CanFetchNextPage => !isLastPageFetched && !isFetching;
-
-        public BeatmapListingPager(IAPIProvider api, RulesetStore rulesets, string query, RulesetInfo ruleset, SearchCategory searchCategory = SearchCategory.Any, SortCriteria sortCriteria = SortCriteria.Ranked, SortDirection sortDirection = SortDirection.Descending)
-        {
-            this.api = api;
-            this.rulesets = rulesets;
-            this.query = query;
-            this.ruleset = ruleset;
-            this.searchCategory = searchCategory;
-            this.sortCriteria = sortCriteria;
-            this.sortDirection = sortDirection;
-        }
-
-        public void FetchNextPage()
-        {
-            if (isFetching)
-                return;
-
-            if (lastResponse != null)
-                IsPastFirstPage = true;
-
-            getSetsRequest = new SearchBeatmapSetsRequest(
-                query,
-                ruleset,
-                lastResponse?.Cursor,
-                searchCategory,
-                sortCriteria,
-                sortDirection);
-
-            getSetsRequest.Success += response =>
-            {
-                var sets = response.BeatmapSets.Select(responseJson => responseJson.ToBeatmapSet(rulesets)).ToList();
-
-                if (sets.Count == 0)
-                    isLastPageFetched = true;
-
-                lastResponse = response;
-                getSetsRequest = null;
-
-                PageFetched?.Invoke(sets);
-            };
-
-            api.Queue(getSetsRequest);
-        }
-
-        public void Reset()
-        {
-            isLastPageFetched = false;
-            IsPastFirstPage = false;
-
-            lastResponse = null;
-
-            getSetsRequest?.Cancel();
-            getSetsRequest = null;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 4aa754491c..225a8a0578 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -4,7 +4,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -34,8 +36,6 @@ namespace osu.Game.Overlays
         private NotFoundDrawable notFoundContent;
 
         private OverlayScrollContainer resultScrollContainer;
-        private const int pagination_scroll_distance = 500;
-        private bool shouldAddNextPage => resultScrollContainer.ScrollableExtent > 0 && resultScrollContainer.IsScrolledToEnd(pagination_scroll_distance);
 
         public BeatmapListingOverlay()
             : base(OverlayColourScheme.Blue)
@@ -121,51 +121,45 @@ namespace osu.Game.Overlays
                 loadingLayer.Show();
         }
 
+        private Task panelLoadDelegate;
+
         private void onSearchFinished(List<BeatmapSetInfo> beatmaps)
         {
-            //No matches case
-            if (!beatmaps.Any())
+            var newPanels = beatmaps.Select<BeatmapSetInfo, BeatmapPanel>(b => new GridBeatmapPanel(b)
             {
-                LoadComponentAsync(notFoundContent, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
-                return;
-            }
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+            });
 
-            //New query case
-            if (!shouldAddNextPage)
+            if (filterControl.CurrentPage == 0)
             {
-                //Spawn new child
-                var newPanels = new FillFlowContainer<BeatmapPanel>
+                //No matches case
+                if (!newPanels.Any())
+                {
+                    LoadComponentAsync(notFoundContent, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
+                    return;
+                }
+
+                // spawn new children with the contained so we only clear old content at the last moment.
+                var content = new FillFlowContainer<BeatmapPanel>
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Spacing = new Vector2(10),
                     Alpha = 0,
                     Margin = new MarginPadding { Vertical = 15 },
-                    ChildrenEnumerable = beatmaps.Select<BeatmapSetInfo, BeatmapPanel>(b => new GridBeatmapPanel(b)
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                    })
+                    ChildrenEnumerable = newPanels
                 };
 
-                foundContent = newPanels;
-                LoadComponentAsync(foundContent, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
+                panelLoadDelegate = LoadComponentAsync(foundContent = content, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
             }
-
-            //Pagination case
             else
             {
-                beatmaps.ForEach(x =>
+                panelLoadDelegate = LoadComponentsAsync(newPanels, loaded =>
                 {
-                    LoadComponentAsync(new GridBeatmapPanel(x)
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                    }, loaded =>
-                    {
-                        foundContent.Add(loaded);
-                        loaded.FadeIn(200, Easing.OutQuint);
-                    });
+                    lastFetchDisplayedTime = Time.Current;
+                    foundContent.AddRange(loaded);
+                    loaded.ForEach(p => p.FadeIn(200, Easing.OutQuint));
                 });
             }
         }
@@ -173,6 +167,7 @@ namespace osu.Game.Overlays
         private void addContentToPlaceholder(Drawable content)
         {
             loadingLayer.Hide();
+            lastFetchDisplayedTime = Time.Current;
 
             var lastContent = currentContent;
 
@@ -242,12 +237,22 @@ namespace osu.Game.Overlays
             }
         }
 
+        private const double time_between_fetches = 500;
+
+        private double lastFetchDisplayedTime;
+
         protected override void Update()
         {
             base.Update();
 
-            if (shouldAddNextPage)
-                filterControl.ShowMore();
+            const int pagination_scroll_distance = 500;
+
+            bool shouldShowMore = panelLoadDelegate?.IsCompleted != false
+                                  && Time.Current - lastFetchDisplayedTime > time_between_fetches
+                                  && (resultScrollContainer.ScrollableExtent > 0 && resultScrollContainer.IsScrolledToEnd(pagination_scroll_distance));
+
+            if (shouldShowMore)
+                filterControl.FetchNextPage();
         }
     }
 }

From facde2c8e17edd2804dfee0921f29caafcd04648 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 16:01:07 +0900
Subject: [PATCH 02715/10326] Remove unnecessary generic specification on
 cursor

---
 osu.Game/Extensions/WebRequestExtensions.cs   | 15 ++++----------
 osu.Game/Online/API/Requests/Cursor.cs        | 20 +++++++++++++++++++
 .../Online/API/Requests/ResponseWithCursor.cs | 11 +---------
 .../API/Requests/SearchBeatmapSetsResponse.cs |  3 +--
 4 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Online/API/Requests/Cursor.cs

diff --git a/osu.Game/Extensions/WebRequestExtensions.cs b/osu.Game/Extensions/WebRequestExtensions.cs
index 80c8b147bf..b940c7498b 100644
--- a/osu.Game/Extensions/WebRequestExtensions.cs
+++ b/osu.Game/Extensions/WebRequestExtensions.cs
@@ -3,22 +3,15 @@
 
 using osu.Framework.IO.Network;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using JetBrains.Annotations;
+using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Extensions
 {
-    public class Cursor
-    {
-        [UsedImplicitly]
-        [JsonExtensionData]
-        public IDictionary<string, JToken> Properties;
-    }
-
     public static class WebRequestExtensions
     {
+        /// <summary>
+        /// Add a pagination cursor to the web request in the format required by osu-web.
+        /// </summary>
         public static void AddCursor(this WebRequest webRequest, Cursor cursor)
         {
             cursor?.Properties.ForEach(x =>
diff --git a/osu.Game/Online/API/Requests/Cursor.cs b/osu.Game/Online/API/Requests/Cursor.cs
new file mode 100644
index 0000000000..f21445ca32
--- /dev/null
+++ b/osu.Game/Online/API/Requests/Cursor.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.Collections.Generic;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace osu.Game.Online.API.Requests
+{
+    /// <summary>
+    /// A collection of parameters which should be passed to the search endpoint to fetch the next page.
+    /// </summary>
+    public class Cursor
+    {
+        [UsedImplicitly]
+        [JsonExtensionData]
+        public IDictionary<string, JToken> Properties;
+    }
+}
diff --git a/osu.Game/Online/API/Requests/ResponseWithCursor.cs b/osu.Game/Online/API/Requests/ResponseWithCursor.cs
index b0fe9eea28..d52e999722 100644
--- a/osu.Game/Online/API/Requests/ResponseWithCursor.cs
+++ b/osu.Game/Online/API/Requests/ResponseWithCursor.cs
@@ -7,16 +7,7 @@ namespace osu.Game.Online.API.Requests
 {
     public abstract class ResponseWithCursor
     {
-        /// <summary>
-        /// A collection of parameters which should be passed to the search endpoint to fetch the next page.
-        /// </summary>
         [JsonProperty("cursor")]
-        public dynamic CursorJson;
-    }
-
-    public abstract class ResponseWithCursor<T> : ResponseWithCursor where T : class
-    {
-        [JsonProperty("cursor")]
-        public T Cursor;
+        public Cursor Cursor;
     }
 }
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
index a4d2c0e871..3c4fb11ed1 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
@@ -3,12 +3,11 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using osu.Game.Extensions;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class SearchBeatmapSetsResponse : ResponseWithCursor<Cursor>
+    public class SearchBeatmapSetsResponse : ResponseWithCursor
     {
         [JsonProperty("beatmapsets")]
         public IEnumerable<APIBeatmapSet> BeatmapSets;

From 6bb06e9d611aeb9255c28a5936f59c0cdc2559f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 22:57:31 +0900
Subject: [PATCH 02716/10326] Expose CurrentDirectory bindable for consumption

---
 .../Graphics/UserInterfaceV2/DirectorySelector.cs   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
index ee428c0047..6ea026ad3d 100644
--- a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
@@ -28,11 +28,11 @@ namespace osu.Game.Graphics.UserInterfaceV2
         private GameHost host { get; set; }
 
         [Cached]
-        private readonly Bindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
+        public readonly Bindable<DirectoryInfo> CurrentDirectory = new Bindable<DirectoryInfo>();
 
         public DirectorySelector(string initialPath = null)
         {
-            currentDirectory.Value = new DirectoryInfo(initialPath ?? Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
+            CurrentDirectory.Value = new DirectoryInfo(initialPath ?? Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
         }
 
         [BackgroundDependencyLoader]
@@ -68,7 +68,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 },
             };
 
-            currentDirectory.BindValueChanged(updateDisplay, true);
+            CurrentDirectory.BindValueChanged(updateDisplay, true);
         }
 
         private void updateDisplay(ValueChangedEvent<DirectoryInfo> directory)
@@ -86,9 +86,9 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 }
                 else
                 {
-                    directoryFlow.Add(new ParentDirectoryPiece(currentDirectory.Value.Parent));
+                    directoryFlow.Add(new ParentDirectoryPiece(CurrentDirectory.Value.Parent));
 
-                    foreach (var dir in currentDirectory.Value.GetDirectories().OrderBy(d => d.Name))
+                    foreach (var dir in CurrentDirectory.Value.GetDirectories().OrderBy(d => d.Name))
                     {
                         if ((dir.Attributes & FileAttributes.Hidden) == 0)
                             directoryFlow.Add(new DirectoryPiece(dir));
@@ -97,8 +97,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
             }
             catch (Exception)
             {
-                currentDirectory.Value = directory.OldValue;
-
+                CurrentDirectory.Value = directory.OldValue;
                 this.FlashColour(Color4.Red, 300);
             }
         }

From cb0b25ac55c7db5e6b1cc4a941971676690388ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 22:57:41 +0900
Subject: [PATCH 02717/10326] Throw better exceptions from OsuStorage

---
 osu.Game/IO/OsuStorage.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 71b01ce479..8109631ef9 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -48,11 +48,14 @@ namespace osu.Game.IO
             var source = new DirectoryInfo(GetFullPath("."));
             var destination = new DirectoryInfo(newLocation);
 
+            if (source.FullName == destination.FullName)
+                throw new ArgumentException("Destination provided is already the current location", nameof(newLocation));
+
             // ensure the new location has no files present, else hard abort
             if (destination.Exists)
             {
                 if (destination.GetFiles().Length > 0 || destination.GetDirectories().Length > 0)
-                    throw new InvalidOperationException("Migration destination already has files present");
+                    throw new ArgumentException("Destination provided already has files or directories present", nameof(newLocation));
 
                 deleteRecursive(destination);
             }

From 0b73063a89ba56edc8fe0d364fe105375fd63c3f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 22:58:05 +0900
Subject: [PATCH 02718/10326] Add basic (working) migration UI

---
 .../Sections/Maintenance/GeneralSettings.cs   |  9 +-
 .../Maintenance/MigrationRunScreen.cs         | 88 +++++++++++++++++++
 .../Maintenance/MigrationSelectScreen.cs      | 57 ++++++++++++
 3 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
 create mode 100644 osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 832673703b..8bdeadae5c 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
@@ -26,8 +27,14 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton undeleteButton;
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, DialogOverlay dialogOverlay)
+        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, DialogOverlay dialogOverlay, OsuGame game)
         {
+            Add(importBeatmapsButton = new SettingsButton
+            {
+                Text = "Migrate storage to new location",
+                Action = () => game.PerformFromScreen(menu => menu.Push(new MigrationSelectScreen()))
+            });
+
             if (beatmaps.SupportsImportFromStable)
             {
                 Add(importBeatmapsButton = new SettingsButton
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
new file mode 100644
index 0000000000..76f01dc4b9
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
@@ -0,0 +1,88 @@
+// Copyright (c) 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 System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
+using osu.Framework.Screens;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class MigrationRunScreen : OsuScreen
+    {
+        private readonly DirectoryInfo destination;
+
+        [Resolved]
+        private OsuGame game { get; set; }
+
+        public override bool AllowBackButton => false;
+
+        public override bool AllowExternalScreenChange => false;
+
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        private Task migrationTask;
+
+        public MigrationRunScreen(DirectoryInfo destination)
+        {
+            this.destination = destination;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Text = "Migration in progress",
+                            Font = OsuFont.Default.With(size: 48)
+                        },
+                        new LoadingSpinner(true)
+                        {
+                            State = { Value = Visibility.Visible }
+                        }
+                    }
+                },
+            };
+
+            Beatmap.Value = Beatmap.Default;
+
+            migrationTask = Task.Run(() => game.Migrate(destination.FullName))
+                                .ContinueWith(t =>
+                                {
+                                    if (t.IsFaulted)
+                                        Logger.Log($"Error during migration: {t.Exception?.Message}", level: LogLevel.Error);
+
+                                    Schedule(this.Exit);
+                                });
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            // block until migration is finished
+            if (migrationTask?.IsCompleted == false)
+                return true;
+
+            return base.OnExiting(next);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
new file mode 100644
index 0000000000..d1c2f6d6ee
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Screens;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Screens;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class MigrationSelectScreen : OsuScreen
+    {
+        private DirectorySelector directorySelector;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.Relative, 0.8f),
+                    new Dimension(),
+                },
+                Content = new[]
+                {
+                    new Drawable[] { directorySelector = new DirectorySelector { RelativeSizeAxes = Axes.Both } },
+                    new Drawable[]
+                    {
+                        new OsuButton
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Width = 300,
+                            Text = "Start",
+                            Action = start
+                        },
+                    }
+                }
+            };
+        }
+
+        private void start()
+        {
+            var target = directorySelector.CurrentDirectory.Value;
+            if (target.GetDirectories().Length > 0 || target.GetFiles().Length > 0)
+                target = target.CreateSubdirectory("osu-lazer");
+
+            ValidForResume = false;
+            this.Push(new MigrationRunScreen(target));
+        }
+    }
+}

From 06f507496a0d4bb8865d226ea9af6d220a5ab4fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 23:02:28 +0900
Subject: [PATCH 02719/10326] Delete migration source if no files exist after
 completion

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

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 8109631ef9..443f4fdb69 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -87,6 +87,9 @@ namespace osu.Game.IO
 
                 dir.Delete(true);
             }
+
+            if (target.GetFiles().Length == 0 && target.GetDirectories().Length == 0)
+                target.Delete();
         }
 
         private static void copyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true)

From d04079f6ab7911b5d7f8fd633019993137b0fc65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 17:40:30 +0900
Subject: [PATCH 02720/10326] Fix directory selector not masking properly

---
 .../UserInterfaceV2/DirectorySelector.cs      | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
index 6ea026ad3d..ae34281bfb 100644
--- a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
@@ -40,19 +40,25 @@ namespace osu.Game.Graphics.UserInterfaceV2
         {
             Padding = new MarginPadding(10);
 
-            InternalChildren = new Drawable[]
+            InternalChild = new GridContainer
             {
-                new FillFlowContainer
+                RelativeSizeAxes = Axes.Both,
+                RowDimensions = new[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
-                    Children = new Drawable[]
+                    new Dimension(GridSizeMode.Absolute, 50),
+                    new Dimension(),
+                },
+                Content = new[]
+                {
+                    new Drawable[]
                     {
                         new CurrentDirectoryDisplay
                         {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 50,
+                            RelativeSizeAxes = Axes.Both,
                         },
+                    },
+                    new Drawable[]
+                    {
                         new OsuScrollContainer
                         {
                             RelativeSizeAxes = Axes.Both,
@@ -65,7 +71,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
                             }
                         }
                     }
-                },
+                }
             };
 
             CurrentDirectory.BindValueChanged(updateDisplay, true);

From 4e4a779d6827d76323702fad328c451c3e3fb000 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 17:40:43 +0900
Subject: [PATCH 02721/10326] Improve overall UI

---
 .../Sections/General/UpdateSettings.cs        |  10 +-
 .../Sections/Maintenance/GeneralSettings.cs   |   7 --
 .../Maintenance/MigrationRunScreen.cs         |  29 ++++-
 .../Maintenance/MigrationSelectScreen.cs      | 105 +++++++++++++++---
 4 files changed, 123 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 188c9c05ef..b5d07ee7b1 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -4,7 +4,9 @@
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Platform;
+using osu.Framework.Screens;
 using osu.Game.Configuration;
+using osu.Game.Overlays.Settings.Sections.Maintenance;
 
 namespace osu.Game.Overlays.Settings.Sections.General
 {
@@ -13,7 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
         protected override string Header => "Updates";
 
         [BackgroundDependencyLoader]
-        private void load(Storage storage, OsuConfigManager config)
+        private void load(Storage storage, OsuConfigManager config, OsuGame game)
         {
             Add(new SettingsEnumDropdown<ReleaseStream>
             {
@@ -28,6 +30,12 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     Text = "Open osu! folder",
                     Action = storage.OpenInNativeExplorer,
                 });
+
+                Add(new SettingsButton
+                {
+                    Text = "Change folder location...",
+                    Action = () => game.PerformFromScreen(menu => menu.Push(new MigrationSelectScreen()))
+                });
             }
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 8bdeadae5c..1dd079a8ab 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
@@ -29,12 +28,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         [BackgroundDependencyLoader]
         private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, DialogOverlay dialogOverlay, OsuGame game)
         {
-            Add(importBeatmapsButton = new SettingsButton
-            {
-                Text = "Migrate storage to new location",
-                Action = () => game.PerformFromScreen(menu => menu.Push(new MigrationSelectScreen()))
-            });
-
             if (beatmaps.SupportsImportFromStable)
             {
                 Add(importBeatmapsButton = new SettingsButton
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
index 76f01dc4b9..b29cd0d630 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens;
+using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -28,6 +29,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        public override bool HideOverlaysOnEnter => true;
+
         private Task migrationTask;
 
         public MigrationRunScreen(DirectoryInfo destination)
@@ -47,6 +50,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     Direction = FillDirection.Vertical,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    Spacing = new Vector2(10),
                     Children = new Drawable[]
                     {
                         new OsuSpriteText
@@ -54,12 +58,26 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Text = "Migration in progress",
-                            Font = OsuFont.Default.With(size: 48)
+                            Font = OsuFont.Default.With(size: 40)
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Text = "This could take a few minutes depending on the speed of your disk(s).",
+                            Font = OsuFont.Default.With(size: 30)
                         },
                         new LoadingSpinner(true)
                         {
                             State = { Value = Visibility.Visible }
-                        }
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Text = "Please avoid interacting with the game!",
+                            Font = OsuFont.Default.With(size: 30)
+                        },
                     }
                 },
             };
@@ -76,6 +94,13 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                                 });
         }
 
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            this.FadeOut().Delay(250).Then().FadeIn(250);
+        }
+
         public override bool OnExiting(IScreen next)
         {
             // block until migration is finished
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index d1c2f6d6ee..c1aa7f095c 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -1,13 +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;
+using System.IO;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Logging;
+using osu.Framework.Platform;
 using osu.Framework.Screens;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Screens;
+using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -15,40 +23,101 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
     {
         private DirectorySelector directorySelector;
 
+        public override bool AllowExternalScreenChange => false;
+
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        public override bool HideOverlaysOnEnter => true;
+
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuGame game, Storage storage, OsuColour colours)
         {
-            InternalChild = new GridContainer
+            game.Toolbar.Hide();
+
+            // begin selection in the parent directory of the current storage location
+            var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
+
+            InternalChild = new Container
             {
+                Masking = true,
+                CornerRadius = 10,
                 RelativeSizeAxes = Axes.Both,
-                RowDimensions = new[]
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(0.5f, 0.8f),
+                Children = new Drawable[]
                 {
-                    new Dimension(GridSizeMode.Relative, 0.8f),
-                    new Dimension(),
-                },
-                Content = new[]
-                {
-                    new Drawable[] { directorySelector = new DirectorySelector { RelativeSizeAxes = Axes.Both } },
-                    new Drawable[]
+                    new Box
                     {
-                        new OsuButton
+                        Colour = colours.GreySeafoamDark,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Width = 300,
-                            Text = "Start",
-                            Action = start
+                            new Dimension(),
+                            new Dimension(GridSizeMode.Relative, 0.8f),
+                            new Dimension(),
                         },
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Text = "Please select a new location",
+                                    Font = OsuFont.Default.With(size: 40)
+                                },
+                            },
+                            new Drawable[]
+                            {
+                                directorySelector = new DirectorySelector(initialPath)
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                }
+                            },
+                            new Drawable[]
+                            {
+                                new TriangleButton
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Width = 300,
+                                    Text = "Begin folder migration",
+                                    Action = start
+                                },
+                            }
+                        }
                     }
                 }
             };
         }
 
+        public override void OnSuspending(IScreen next)
+        {
+            base.OnSuspending(next);
+
+            this.FadeOut(250);
+        }
+
         private void start()
         {
             var target = directorySelector.CurrentDirectory.Value;
-            if (target.GetDirectories().Length > 0 || target.GetFiles().Length > 0)
-                target = target.CreateSubdirectory("osu-lazer");
+
+            try
+            {
+                if (target.GetDirectories().Length > 0 || target.GetFiles().Length > 0)
+                    target = target.CreateSubdirectory("osu-lazer");
+            }
+            catch (Exception e)
+            {
+                Logger.Log($"Error during migration: {e?.Message}", level: LogLevel.Error);
+                return;
+            }
 
             ValidForResume = false;
             this.Push(new MigrationRunScreen(target));

From 0ef3bae26a4483fd12c21a34ff38d3fe6f69775d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 14 May 2020 18:34:51 +0900
Subject: [PATCH 02722/10326] Expose playfield from IManiaHitObjectComposer

---
 .../ManiaPlacementBlueprintTestScene.cs                         | 2 +-
 .../ManiaSelectionBlueprintTestScene.cs                         | 2 +-
 osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs         | 2 +-
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs          | 2 --
 osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs           | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
index aac77c9c1c..39d5f50459 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
@@ -49,6 +49,6 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         public Column ColumnAt(Vector2 screenSpacePosition) => column;
 
-        public int TotalColumns => 1;
+        public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
index b598893e8c..d6dee92ba6 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
@@ -33,6 +33,6 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         public Column ColumnAt(Vector2 screenSpacePosition) => column;
 
-        public int TotalColumns => 1;
+        public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
index f64bab1fae..9b5d290fa8 100644
--- a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Mania.Edit
     {
         Column ColumnAt(Vector2 screenSpacePosition);
 
-        int TotalColumns { get; }
+        ManiaPlayfield Playfield { get; }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index dfa933baad..d7c0889c0d 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -42,8 +42,6 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public IScrollingInfo ScrollingInfo => drawableRuleset.ScrollingInfo;
 
-        public int TotalColumns => Playfield.TotalColumns;
-
         public override (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time)
         {
             var hoc = Playfield.GetColumn(0).HitObjectContainer;
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 55245198c8..83049ff959 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                     maxColumn = obj.Column;
             }
 
-            columnDelta = Math.Clamp(columnDelta, -minColumn, composer.TotalColumns - 1 - maxColumn);
+            columnDelta = Math.Clamp(columnDelta, -minColumn, composer.Playfield.TotalColumns - 1 - maxColumn);
 
             foreach (var obj in SelectedHitObjects.OfType<ManiaHitObject>())
                 obj.Column += columnDelta;

From a5826116479b547084fa2d3d0fab0211ab83089a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 19:05:35 +0900
Subject: [PATCH 02723/10326] Add test coverage

---
 .../Settings/TestSceneMigrationScreens.cs     | 36 +++++++++++++++++++
 .../Maintenance/MigrationRunScreen.cs         |  6 ++--
 .../Maintenance/MigrationSelectScreen.cs      | 10 +++---
 3 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneMigrationScreens.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneMigrationScreens.cs b/osu.Game.Tests/Visual/Settings/TestSceneMigrationScreens.cs
new file mode 100644
index 0000000000..2883e54385
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneMigrationScreens.cs
@@ -0,0 +1,36 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.IO;
+using System.Threading;
+using osu.Framework.Screens;
+using osu.Game.Overlays.Settings.Sections.Maintenance;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    public class TestSceneMigrationScreens : ScreenTestScene
+    {
+        public TestSceneMigrationScreens()
+        {
+            AddStep("Push screen", () => Stack.Push(new TestMigrationSelectScreen()));
+        }
+
+        private class TestMigrationSelectScreen : MigrationSelectScreen
+        {
+            protected override void BeginMigration(DirectoryInfo target) => this.Push(new TestMigrationRunScreen());
+
+            private class TestMigrationRunScreen : MigrationRunScreen
+            {
+                protected override void PerformMigration()
+                {
+                    Thread.Sleep(3000);
+                }
+
+                public TestMigrationRunScreen()
+                    : base(null)
+                {
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
index b29cd0d630..b0b61554eb 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
     {
         private readonly DirectoryInfo destination;
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
 
         public override bool AllowBackButton => false;
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
             Beatmap.Value = Beatmap.Default;
 
-            migrationTask = Task.Run(() => game.Migrate(destination.FullName))
+            migrationTask = Task.Run(PerformMigration)
                                 .ContinueWith(t =>
                                 {
                                     if (t.IsFaulted)
@@ -94,6 +94,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                                 });
         }
 
+        protected virtual void PerformMigration() => game?.Migrate(destination.FullName);
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index c1aa7f095c..79d842a617 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -29,10 +29,10 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         public override bool HideOverlaysOnEnter => true;
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(OsuGame game, Storage storage, OsuColour colours)
         {
-            game.Toolbar.Hide();
+            game?.Toolbar.Hide();
 
             // begin selection in the parent directory of the current storage location
             var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
@@ -115,12 +115,14 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             }
             catch (Exception e)
             {
-                Logger.Log($"Error during migration: {e?.Message}", level: LogLevel.Error);
+                Logger.Log($"Error during migration: {e.Message}", level: LogLevel.Error);
                 return;
             }
 
             ValidForResume = false;
-            this.Push(new MigrationRunScreen(target));
+            BeginMigration(target);
         }
+
+        protected virtual void BeginMigration(DirectoryInfo target) => this.Push(new MigrationRunScreen(target));
     }
 }

From 16585f767edb0f877cd04eba61ef662f7ecdca59 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 14 May 2020 19:17:24 +0900
Subject: [PATCH 02724/10326] Add initial beat snap grid implementation

---
 .../TestSceneManiaBeatSnapGrid.cs             |  73 ++++++
 .../Edit/ManiaBeatSnapGrid.cs                 | 233 ++++++++++++++++++
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs  |   2 +
 3 files changed, 308 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
 create mode 100644 osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
new file mode 100644
index 0000000000..84419313e6
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.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.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Edit;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Edit;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [Cached(typeof(IManiaHitObjectComposer))]
+    public class TestSceneManiaBeatSnapGrid : EditorClockTestScene, IManiaHitObjectComposer
+    {
+        [Cached(typeof(IScrollingInfo))]
+        private ScrollingTestContainer.TestScrollingInfo scrollingInfo = new ScrollingTestContainer.TestScrollingInfo();
+
+        [Cached(typeof(EditorBeatmap))]
+        private EditorBeatmap editorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition()));
+
+        private readonly ManiaBeatSnapGrid beatSnapGrid;
+
+        public TestSceneManiaBeatSnapGrid()
+        {
+            editorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 200 });
+            editorBeatmap.ControlPointInfo.Add(10000, new TimingControlPoint { BeatLength = 200 });
+
+            BeatDivisor.Value = 3;
+
+            // Some sane defaults
+            scrollingInfo.Algorithm.Algorithm = ScrollVisualisationMethod.Constant;
+            scrollingInfo.Direction.Value = ScrollingDirection.Up;
+            scrollingInfo.TimeRange.Value = 1000;
+
+            Children = new Drawable[]
+            {
+                Playfield = new ManiaPlayfield(new List<StageDefinition>
+                {
+                    new StageDefinition { Columns = 4 },
+                    new StageDefinition { Columns = 3 }
+                })
+                {
+                    Clock = new FramedClock(new StopwatchClock())
+                },
+                beatSnapGrid = new ManiaBeatSnapGrid()
+            };
+        }
+
+        protected override bool OnMouseMove(MouseMoveEvent e)
+        {
+            // We're providing a constant scroll algorithm.
+            float relativePosition = Playfield.Stages[0].HitObjectContainer.ToLocalSpace(e.ScreenSpaceMousePosition).Y / Playfield.Stages[0].HitObjectContainer.DrawHeight;
+            double timeValue = scrollingInfo.TimeRange.Value * relativePosition;
+
+            beatSnapGrid.SetRange(timeValue, timeValue);
+
+            return true;
+        }
+
+        public Column ColumnAt(Vector2 screenSpacePosition) => null;
+
+        public ManiaPlayfield Playfield { get; }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
new file mode 100644
index 0000000000..5a3fe29770
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -0,0 +1,233 @@
+// Copyright (c) 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.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.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Edit;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Edit
+{
+    public class ManiaBeatSnapGrid : CompositeDrawable
+    {
+        [Resolved]
+        private IManiaHitObjectComposer composer { get; set; }
+
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; }
+
+        [Resolved]
+        private IScrollingInfo scrollingInfo { get; set; }
+
+        [Resolved]
+        private Bindable<WorkingBeatmap> working { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Resolved]
+        private BindableBeatDivisor beatDivisor { get; set; }
+
+        private readonly List<Grid> grids = new List<Grid>();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            foreach (var stage in composer.Playfield.Stages)
+            {
+                var grid = new Grid(stage);
+                grids.Add(grid);
+
+                AddInternal(grid);
+            }
+
+            beatDivisor.BindValueChanged(_ => createLines(), true);
+        }
+
+        private void createLines()
+        {
+            foreach (var grid in grids)
+                grid.Clear();
+
+            for (int i = 0; i < beatmap.ControlPointInfo.TimingPoints.Count; i++)
+            {
+                var point = beatmap.ControlPointInfo.TimingPoints[i];
+                var until = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : working.Value.Track.Length;
+
+                int beat = 0;
+
+                for (double t = point.Time; t < until; t += point.BeatLength / beatDivisor.Value)
+                {
+                    var indexInBeat = beat % beatDivisor.Value;
+                    Color4 colour;
+
+                    if (indexInBeat == 0)
+                        colour = BindableBeatDivisor.GetColourFor(1, colours);
+                    else
+                    {
+                        var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
+                        colour = BindableBeatDivisor.GetColourFor(divisor, colours);
+                    }
+
+                    foreach (var grid in grids)
+                        grid.Add(new DrawableGridLine(t, colour));
+
+                    beat++;
+                }
+            }
+        }
+
+        public (Vector2 position, double time)? GetSnappedPosition(Vector2 position)
+        {
+            float minDist = float.PositiveInfinity;
+            DrawableGridLine minDistLine = null;
+            Vector2 minDistLinePosition = Vector2.Zero;
+
+            foreach (var grid in grids)
+            {
+                foreach (var line in grid.AliveObjects.OfType<DrawableGridLine>())
+                {
+                    Vector2 linePos = line.ToSpaceOfOtherDrawable(line.OriginPosition, this);
+                    float d = Vector2.Distance(position, linePos);
+
+                    if (d < minDist)
+                    {
+                        minDist = d;
+                        minDistLine = line;
+                        minDistLinePosition = linePos;
+                    }
+                }
+            }
+
+            if (minDistLine == null)
+                return null;
+
+            float noteOffset = (scrollingInfo.Direction.Value == ScrollingDirection.Up ? 1 : -1) * DefaultNotePiece.NOTE_HEIGHT / 2;
+            return (new Vector2(position.X, minDistLinePosition.Y + noteOffset), minDistLine.HitObject.StartTime);
+        }
+
+        public void SetRange(double minTime, double maxTime) => Schedule(() =>
+        {
+            var linesBefore = new List<DrawableGridLine>();
+            var linesDuring = new List<DrawableGridLine>();
+            var linesAfter = new List<DrawableGridLine>();
+
+            foreach (var grid in grids)
+            {
+                linesBefore.Clear();
+                linesDuring.Clear();
+                linesAfter.Clear();
+
+                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
+                {
+                    if (line.HitObject.StartTime < minTime)
+                        linesBefore.Add(line);
+                    else if (line.HitObject.StartTime <= maxTime)
+                        linesDuring.Add(line);
+                    else
+                        linesAfter.Add(line);
+                }
+
+                foreach (var l in linesDuring)
+                    l.Colour = OsuColour.Gray(0.5f);
+
+                for (int i = 0; i < linesBefore.Count; i++)
+                {
+                    int offset = (linesBefore.Count - i - 1) / beatDivisor.Value;
+                    linesBefore[i].Colour = OsuColour.Gray(0.5f / (offset + 1));
+                }
+
+                for (int i = 0; i < linesAfter.Count; i++)
+                {
+                    int offset = i / beatDivisor.Value;
+                    linesAfter[i].Colour = OsuColour.Gray(0.5f / (offset + 1));
+                }
+            }
+        });
+
+        private class Grid : ScrollingHitObjectContainer
+        {
+            [Resolved]
+            private IManiaHitObjectComposer composer { get; set; }
+
+            private readonly Stage stage;
+
+            public Grid(Stage stage)
+            {
+                this.stage = stage;
+
+                RelativeSizeAxes = Axes.None;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                Clock = composer.Playfield.Clock;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                var parentQuad = Parent.ToLocalSpace(stage.HitObjectContainer.ScreenSpaceDrawQuad);
+                Position = parentQuad.TopLeft;
+                Size = parentQuad.Size;
+            }
+        }
+
+        private class DrawableGridLine : DrawableHitObject
+        {
+            [Resolved]
+            private IScrollingInfo scrollingInfo { get; set; }
+
+            private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+            public DrawableGridLine(double startTime, Color4 colour)
+                : base(new HitObject { StartTime = startTime })
+            {
+                RelativeSizeAxes = Axes.X;
+                Height = 2;
+
+                AddInternal(new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colour
+                });
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                direction.BindTo(scrollingInfo.Direction);
+                direction.BindValueChanged(onDirectionChanged, true);
+            }
+
+            private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+            {
+                Origin = Anchor = direction.NewValue == ScrollingDirection.Up
+                    ? Anchor.TopLeft
+                    : Anchor.BottomLeft;
+            }
+
+            protected override void UpdateStateTransforms(ArmedState state)
+            {
+                using (BeginAbsoluteSequence(HitObject.StartTime + 1000))
+                    this.FadeOut();
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index 1af7d06998..271e432e8d 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Mania.UI
     [Cached]
     public class ManiaPlayfield : ScrollingPlayfield
     {
+        public IReadOnlyList<Stage> Stages => stages;
+
         private readonly List<Stage> stages = new List<Stage>();
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => stages.Any(s => s.ReceivePositionalInputAt(screenSpacePos));

From 91d1b15d5ad141444259933678490df5db29794c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 14 May 2020 19:55:07 +0900
Subject: [PATCH 02725/10326] Integrate grid with the mania composer

---
 .../Edit/ManiaHitObjectComposer.cs            | 58 +++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index d7c0889c0d..11523dd384 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -6,9 +6,12 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Objects;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Input;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -20,12 +23,27 @@ namespace osu.Game.Rulesets.Mania.Edit
     public class ManiaHitObjectComposer : HitObjectComposer<ManiaHitObject>, IManiaHitObjectComposer
     {
         private DrawableManiaEditRuleset drawableRuleset;
+        private ManiaBeatSnapGrid beatSnapGrid;
+        private InputManager inputManager;
 
         public ManiaHitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(beatSnapGrid = new ManiaBeatSnapGrid());
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            inputManager = GetContainingInputManager();
+        }
+
         /// <summary>
         /// Retrieves the column that intersects a screen-space position.
         /// </summary>
@@ -42,11 +60,43 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public IScrollingInfo ScrollingInfo => drawableRuleset.ScrollingInfo;
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (BlueprintContainer.CurrentTool is SelectTool)
+            {
+                if (EditorBeatmap.SelectedHitObjects.Any())
+                {
+                    beatSnapGrid.SetRange(EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
+                    beatSnapGrid.Show();
+                }
+                else
+                    beatSnapGrid.Hide();
+            }
+            else
+            {
+                var placementTime = GetSnappedPosition(ToLocalSpace(inputManager.CurrentState.Mouse.Position), 0).time;
+                beatSnapGrid.SetRange(placementTime, placementTime);
+
+                beatSnapGrid.Show();
+            }
+        }
+
         public override (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time)
         {
-            var hoc = Playfield.GetColumn(0).HitObjectContainer;
+            var beatSnapped = beatSnapGrid.GetSnappedPosition(position);
 
-            float targetPosition = hoc.ToLocalSpace(ToScreenSpace(position)).Y;
+            if (beatSnapped != null)
+                return beatSnapped.Value;
+
+            return base.GetSnappedPosition(position, getTimeFromPosition(ToScreenSpace(position)));
+        }
+
+        private double getTimeFromPosition(Vector2 screenSpacePosition)
+        {
+            var hoc = Playfield.Stages[0].HitObjectContainer;
+            float targetPosition = hoc.ToLocalSpace(screenSpacePosition).Y;
 
             if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
             {
@@ -56,12 +106,10 @@ namespace osu.Game.Rulesets.Mania.Edit
                 targetPosition = hoc.DrawHeight - targetPosition;
             }
 
-            double targetTime = drawableRuleset.ScrollingInfo.Algorithm.TimeAt(targetPosition,
+            return drawableRuleset.ScrollingInfo.Algorithm.TimeAt(targetPosition,
                 EditorClock.CurrentTime,
                 drawableRuleset.ScrollingInfo.TimeRange.Value,
                 hoc.DrawHeight);
-
-            return base.GetSnappedPosition(position, targetTime);
         }
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)

From 42c3d892cd93a3671de896af87136244b36856c2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 14 May 2020 19:55:14 +0900
Subject: [PATCH 02726/10326] Only update alive lines

---
 osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 5a3fe29770..320912ed5b 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                 linesDuring.Clear();
                 linesAfter.Clear();
 
-                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
+                foreach (var line in grid.AliveObjects.OfType<DrawableGridLine>())
                 {
                     if (line.HitObject.StartTime < minTime)
                         linesBefore.Add(line);

From 0e334940745c5958a30a877083907ca391282953 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 14 May 2020 19:58:39 +0900
Subject: [PATCH 02727/10326] Fix flashing when changing beat divisor

---
 osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs    | 12 ++++++++++--
 .../Edit/ManiaHitObjectComposer.cs                   |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 320912ed5b..9cb9256a7e 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -119,7 +119,15 @@ namespace osu.Game.Rulesets.Mania.Edit
             return (new Vector2(position.X, minDistLinePosition.Y + noteOffset), minDistLine.HitObject.StartTime);
         }
 
-        public void SetRange(double minTime, double maxTime) => Schedule(() =>
+        public void SetRange(double minTime, double maxTime)
+        {
+            if (LoadState >= LoadState.Ready)
+                setRange(minTime, maxTime);
+            else
+                Schedule(() => setRange(minTime, maxTime));
+        }
+
+        private void setRange(double minTime, double maxTime)
         {
             var linesBefore = new List<DrawableGridLine>();
             var linesDuring = new List<DrawableGridLine>();
@@ -156,7 +164,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                     linesAfter[i].Colour = OsuColour.Gray(0.5f / (offset + 1));
                 }
             }
-        });
+        }
 
         private class Grid : ScrollingHitObjectContainer
         {
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 11523dd384..1266761d12 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -60,9 +60,9 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public IScrollingInfo ScrollingInfo => drawableRuleset.ScrollingInfo;
 
-        protected override void Update()
+        protected override void UpdateAfterChildren()
         {
-            base.Update();
+            base.UpdateAfterChildren();
 
             if (BlueprintContainer.CurrentTool is SelectTool)
             {

From 3441ab457d7d05dffa990117aa7ab3b84ceaa709 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 14 May 2020 20:06:34 +0900
Subject: [PATCH 02728/10326] Fix hitobjects placed at non-beatsnapped times

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 3fb03d642f..5fe53557b3 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -24,10 +24,15 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         protected Column Column;
 
         /// <summary>
-        /// The current mouse position, snapped to the closest column.
+        /// The current beat-snapped mouse position, snapped to the closest column.
         /// </summary>
         protected Vector2 SnappedMousePosition { get; private set; }
 
+        /// <summary>
+        /// The gameplay time at the current beat-snapped mouse position (<see cref="SnappedMousePosition"/>).
+        /// </summary>
+        protected double SnappedTime { get; private set; }
+
         /// <summary>
         /// The width of the closest column to the current mouse position.
         /// </summary>
@@ -39,6 +44,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
+        [Resolved]
+        private IDistanceSnapProvider snapProvider { get; set; }
+
         protected ManiaPlacementBlueprint(T hitObject)
             : base(hitObject)
         {
@@ -54,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 return base.OnMouseDown(e);
 
             HitObject.Column = Column.Index;
-            BeginPlacement(TimeAt(e.ScreenSpaceMousePosition), true);
+            BeginPlacement(SnappedTime, true);
             return true;
         }
 
@@ -70,6 +78,10 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             // Snap to the column
             var parentPos = Parent.ToLocalSpace(Column.ToScreenSpace(new Vector2(Column.DrawWidth / 2, 0)));
             SnappedMousePosition = new Vector2(parentPos.X, Parent.ToLocalSpace(screenSpacePosition).Y);
+
+            SnappedTime = TimeAt(screenSpacePosition);
+            if (snapProvider != null)
+                (SnappedMousePosition, SnappedTime) = snapProvider.GetSnappedPosition(SnappedMousePosition, SnappedTime);
         }
 
         protected double TimeAt(Vector2 screenSpacePosition)

From f3b1c32a85050ace4ad7f410913ea3665312e3de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 20:18:57 +0900
Subject: [PATCH 02729/10326] Update test logic for new exception type

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

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index ef2b20de64..7a20bd364b 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Tests.NonVisual
                     var osu = loadOsu(host);
 
                     Assert.DoesNotThrow(() => osu.Migrate(customPath));
-                    Assert.Throws<InvalidOperationException>(() => osu.Migrate(customPath));
+                    Assert.Throws<ArgumentException>(() => osu.Migrate(customPath));
                 }
                 finally
                 {

From 42f446faa9a8d19a0a49d970b8139e7bf28cf4c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 21:10:04 +0900
Subject: [PATCH 02730/10326] Fix remaining test failure

---
 osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index b5d07ee7b1..95a1868392 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
     {
         protected override string Header => "Updates";
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuConfigManager config, OsuGame game)
         {
             Add(new SettingsEnumDropdown<ReleaseStream>
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Add(new SettingsButton
                 {
                     Text = "Change folder location...",
-                    Action = () => game.PerformFromScreen(menu => menu.Push(new MigrationSelectScreen()))
+                    Action = () => game?.PerformFromScreen(menu => menu.Push(new MigrationSelectScreen()))
                 });
             }
         }

From e390d70b707c97909404b8f596dc2908a66605b4 Mon Sep 17 00:00:00 2001
From: Fukashi13 <48766178+Fukashi13@users.noreply.github.com>
Date: Thu, 14 May 2020 14:33:12 +0200
Subject: [PATCH 02731/10326] bestMatch changes on entering section with screen
 top border

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index a3125614aa..8b866c8d21 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -189,15 +189,15 @@ namespace osu.Game.Graphics.Containers
                 headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
                 headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
 
-                T bestMatch = null;
-                float minDiff = float.MaxValue;
+                T bestMatch = Children.FirstOrDefault();
+                float minDiff = float.MinValue;
                 float scrollOffset = FixedHeader?.LayoutSize.Y ?? 0;
 
                 foreach (var section in Children)
                 {
-                    float diff = Math.Abs(scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset);
+                    float diff = scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 
-                    if (diff < minDiff)
+                    if ((minDiff < diff) & (diff < 0))
                     {
                         minDiff = diff;
                         bestMatch = section;

From 155e918ca3063b4c03146144cc3b8f9a035d5566 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 21:40:26 +0900
Subject: [PATCH 02732/10326] Remove unused parameter

---
 .../Overlays/Settings/Sections/Maintenance/GeneralSettings.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 1dd079a8ab..832673703b 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton undeleteButton;
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, DialogOverlay dialogOverlay, OsuGame game)
+        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, DialogOverlay dialogOverlay)
         {
             if (beatmaps.SupportsImportFromStable)
             {

From ef8375b442d78dea8737ef91b6bb5b3ecbf6e7ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 22:42:42 +0900
Subject: [PATCH 02733/10326] Add protection against migrating to a nested
 folder

---
 .../NonVisual/CustomDataDirectoryTest.cs      | 24 +++++++++++++++++++
 osu.Game/IO/OsuStorage.cs                     |  6 +++++
 2 files changed, 30 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index ef2b20de64..433067ffdd 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -220,6 +220,30 @@ namespace osu.Game.Tests.NonVisual
             }
         }
 
+        [Test]
+        public void TestMigrationToNestedTargetFails()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationToSameTargetFails)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+
+                    Assert.DoesNotThrow(() => osu.Migrate(customPath));
+
+                    string subFolder = Path.Combine(customPath, "sub");
+
+                    Directory.CreateDirectory(subFolder);
+
+                    Assert.Throws<ArgumentException>(() => osu.Migrate(subFolder));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         private OsuGameBase loadOsu(GameHost host)
         {
             var osu = new OsuGameBase();
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 71b01ce479..7c0af16a63 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -48,6 +48,12 @@ namespace osu.Game.IO
             var source = new DirectoryInfo(GetFullPath("."));
             var destination = new DirectoryInfo(newLocation);
 
+            if (source.FullName == destination.FullName)
+                throw new ArgumentException("Destination provided is already the current location", nameof(newLocation));
+
+            if (destination.FullName.Contains(source.FullName))
+                throw new ArgumentException("Destination provided is inside the source", nameof(newLocation));
+
             // ensure the new location has no files present, else hard abort
             if (destination.Exists)
             {

From 827d75b152f17af984b9823dc4322a185fdaaa55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 22:44:27 +0900
Subject: [PATCH 02734/10326] Revert "Add protection against migrating to a
 nested folder"

This reverts commit ef8375b442d78dea8737ef91b6bb5b3ecbf6e7ee.
---
 .../NonVisual/CustomDataDirectoryTest.cs      | 24 -------------------
 osu.Game/IO/OsuStorage.cs                     |  6 -----
 2 files changed, 30 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 433067ffdd..ef2b20de64 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -220,30 +220,6 @@ namespace osu.Game.Tests.NonVisual
             }
         }
 
-        [Test]
-        public void TestMigrationToNestedTargetFails()
-        {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationToSameTargetFails)))
-            {
-                try
-                {
-                    var osu = loadOsu(host);
-
-                    Assert.DoesNotThrow(() => osu.Migrate(customPath));
-
-                    string subFolder = Path.Combine(customPath, "sub");
-
-                    Directory.CreateDirectory(subFolder);
-
-                    Assert.Throws<ArgumentException>(() => osu.Migrate(subFolder));
-                }
-                finally
-                {
-                    host.Exit();
-                }
-            }
-        }
-
         private OsuGameBase loadOsu(GameHost host)
         {
             var osu = new OsuGameBase();
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 7c0af16a63..71b01ce479 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -48,12 +48,6 @@ namespace osu.Game.IO
             var source = new DirectoryInfo(GetFullPath("."));
             var destination = new DirectoryInfo(newLocation);
 
-            if (source.FullName == destination.FullName)
-                throw new ArgumentException("Destination provided is already the current location", nameof(newLocation));
-
-            if (destination.FullName.Contains(source.FullName))
-                throw new ArgumentException("Destination provided is inside the source", nameof(newLocation));
-
             // ensure the new location has no files present, else hard abort
             if (destination.Exists)
             {

From 364aa5aa129af4dbf996d4942b2f4884b6d53dbd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 22:42:42 +0900
Subject: [PATCH 02735/10326] Add protection against migrating to a nested
 folder

---
 .../NonVisual/CustomDataDirectoryTest.cs      | 24 +++++++++++++++++++
 osu.Game/IO/OsuStorage.cs                     |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 7a20bd364b..e8f052cdeb 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -220,6 +220,30 @@ namespace osu.Game.Tests.NonVisual
             }
         }
 
+        [Test]
+        public void TestMigrationToNestedTargetFails()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationToSameTargetFails)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+
+                    Assert.DoesNotThrow(() => osu.Migrate(customPath));
+
+                    string subFolder = Path.Combine(customPath, "sub");
+
+                    Directory.CreateDirectory(subFolder);
+
+                    Assert.Throws<ArgumentException>(() => osu.Migrate(subFolder));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         private OsuGameBase loadOsu(GameHost host)
         {
             var osu = new OsuGameBase();
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 443f4fdb69..e3888c0c28 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -51,6 +51,9 @@ namespace osu.Game.IO
             if (source.FullName == destination.FullName)
                 throw new ArgumentException("Destination provided is already the current location", nameof(newLocation));
 
+            if (destination.FullName.Contains(source.FullName))
+                throw new ArgumentException("Destination provided is inside the source", nameof(newLocation));
+
             // ensure the new location has no files present, else hard abort
             if (destination.Exists)
             {

From 6ec55eb400a480dbf475565fdf48589b7e0ea50d Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 14 May 2020 21:51:39 +0200
Subject: [PATCH 02736/10326] Give mappool scene its own video

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index b4c6d589d7..2c4fed8d86 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tournament.Screens.MapPool
         {
             InternalChildren = new Drawable[]
             {
-                new TourneyVideo("gameplay")
+                new TourneyVideo("mappool")
                 {
                     Loop = true,
                     RelativeSizeAxes = Axes.Both,

From 1768beb690a9733f3ebf966c6576b8006c011984 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 14 May 2020 21:52:10 +0200
Subject: [PATCH 02737/10326] Rename class SeeingEditorScreen to
 SeedingEditorScreen

---
 .../Screens/Editors/SeedingEditorScreen.cs                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
index 46bb7b83e3..52f761e50a 100644
--- a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Tournament.Screens.Editors
 {
-    public class SeedingEditorScreen : TournamentEditorScreen<SeedingEditorScreen.SeeingResultRow, SeedingResult>
+    public class SeedingEditorScreen : TournamentEditorScreen<SeedingEditorScreen.SeedingResultRow, SeedingResult>
     {
         private readonly TournamentTeam team;
 
@@ -30,14 +30,14 @@ namespace osu.Game.Tournament.Screens.Editors
             this.team = team;
         }
 
-        public class SeeingResultRow : CompositeDrawable, IModelBacked<SeedingResult>
+        public class SeedingResultRow : CompositeDrawable, IModelBacked<SeedingResult>
         {
             public SeedingResult Model { get; }
 
             [Resolved]
             private LadderInfo ladderInfo { get; set; }
 
-            public SeeingResultRow(TournamentTeam team, SeedingResult round)
+            public SeedingResultRow(TournamentTeam team, SeedingResult round)
             {
                 Model = round;
 
@@ -281,6 +281,6 @@ namespace osu.Game.Tournament.Screens.Editors
             }
         }
 
-        protected override SeeingResultRow CreateDrawable(SeedingResult model) => new SeeingResultRow(team, model);
+        protected override SeedingResultRow CreateDrawable(SeedingResult model) => new SeedingResultRow(team, model);
     }
 }

From 097fcfd9ad35832a190a9bee0f7bfd14f33aa146 Mon Sep 17 00:00:00 2001
From: Fukashi13 <48766178+Fukashi13@users.noreply.github.com>
Date: Fri, 15 May 2020 00:06:58 +0200
Subject: [PATCH 02738/10326] Update
 osu.Game/Graphics/Containers/SectionsContainer.cs
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/Containers/SectionsContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 8b866c8d21..5192a7ddea 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Graphics.Containers
                 {
                     float diff = scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 
-                    if ((minDiff < diff) & (diff < 0))
+                    if (minDiff < diff && diff < 0)
                     {
                         minDiff = diff;
                         bestMatch = section;

From 25bbb02999481de9adecaa38f51e3e6293018bcd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 May 2020 22:57:41 +0900
Subject: [PATCH 02739/10326] Throw better exceptions from OsuStorage

---
 osu.Game/IO/OsuStorage.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 71b01ce479..8109631ef9 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -48,11 +48,14 @@ namespace osu.Game.IO
             var source = new DirectoryInfo(GetFullPath("."));
             var destination = new DirectoryInfo(newLocation);
 
+            if (source.FullName == destination.FullName)
+                throw new ArgumentException("Destination provided is already the current location", nameof(newLocation));
+
             // ensure the new location has no files present, else hard abort
             if (destination.Exists)
             {
                 if (destination.GetFiles().Length > 0 || destination.GetDirectories().Length > 0)
-                    throw new InvalidOperationException("Migration destination already has files present");
+                    throw new ArgumentException("Destination provided already has files or directories present", nameof(newLocation));
 
                 deleteRecursive(destination);
             }

From 19f117ae53fe3058ed251bd687a7cb8266e75cf8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 20:18:57 +0900
Subject: [PATCH 02740/10326] Update test logic for new exception type

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

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index ef2b20de64..7a20bd364b 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Tests.NonVisual
                     var osu = loadOsu(host);
 
                     Assert.DoesNotThrow(() => osu.Migrate(customPath));
-                    Assert.Throws<InvalidOperationException>(() => osu.Migrate(customPath));
+                    Assert.Throws<ArgumentException>(() => osu.Migrate(customPath));
                 }
                 finally
                 {

From 0690d81bbb1bc7ee969b7e07050a565138b5b5c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 May 2020 22:42:42 +0900
Subject: [PATCH 02741/10326] Add protection against migrating to a nested
 folder

---
 .../NonVisual/CustomDataDirectoryTest.cs      | 48 +++++++++++++++++++
 osu.Game/IO/OsuStorage.cs                     |  9 +++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 7a20bd364b..2a98a6dbc6 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -220,6 +220,54 @@ namespace osu.Game.Tests.NonVisual
             }
         }
 
+        [Test]
+        public void TestMigrationToNestedTargetFails()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationToSameTargetFails)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+
+                    Assert.DoesNotThrow(() => osu.Migrate(customPath));
+
+                    string subFolder = Path.Combine(customPath, "sub");
+
+                    Directory.CreateDirectory(subFolder);
+
+                    Assert.Throws<ArgumentException>(() => osu.Migrate(subFolder));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public void TestMigrationToSeeminglyNestedTarget()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationToSeeminglyNestedTarget)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+
+                    Assert.DoesNotThrow(() => osu.Migrate(customPath));
+
+                    string subFolder = customPath + "sub";
+
+                    Directory.CreateDirectory(subFolder);
+
+                    osu.Migrate(subFolder);
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         private OsuGameBase loadOsu(GameHost host)
         {
             var osu = new OsuGameBase();
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 8109631ef9..ac28a05375 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -48,9 +48,16 @@ namespace osu.Game.IO
             var source = new DirectoryInfo(GetFullPath("."));
             var destination = new DirectoryInfo(newLocation);
 
-            if (source.FullName == destination.FullName)
+            // using Uri is the easiest way to check equality and contains (https://stackoverflow.com/a/7710620)
+            var sourceUri = new Uri(source.FullName + Path.DirectorySeparatorChar);
+            var destinationUri = new Uri(destination.FullName + Path.DirectorySeparatorChar);
+
+            if (sourceUri == destinationUri)
                 throw new ArgumentException("Destination provided is already the current location", nameof(newLocation));
 
+            if (sourceUri.IsBaseOf(destinationUri))
+                throw new ArgumentException("Destination provided is inside the source", nameof(newLocation));
+
             // ensure the new location has no files present, else hard abort
             if (destination.Exists)
             {

From 7641507c90f770bab9e096dad63132001cc532d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 May 2020 10:45:57 +0900
Subject: [PATCH 02742/10326] Ensure test directories are deleted before
 subsequent run

---
 osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 2a98a6dbc6..d69bf94ee2 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -233,6 +233,9 @@ namespace osu.Game.Tests.NonVisual
 
                     string subFolder = Path.Combine(customPath, "sub");
 
+                    if (Directory.Exists(subFolder))
+                        Directory.Delete(subFolder, true);
+
                     Directory.CreateDirectory(subFolder);
 
                     Assert.Throws<ArgumentException>(() => osu.Migrate(subFolder));
@@ -255,11 +258,14 @@ namespace osu.Game.Tests.NonVisual
 
                     Assert.DoesNotThrow(() => osu.Migrate(customPath));
 
-                    string subFolder = customPath + "sub";
+                    string seeminglySubFolder = customPath + "sub";
 
-                    Directory.CreateDirectory(subFolder);
+                    if (Directory.Exists(seeminglySubFolder))
+                        Directory.Delete(seeminglySubFolder, true);
 
-                    osu.Migrate(subFolder);
+                    Directory.CreateDirectory(seeminglySubFolder);
+
+                    osu.Migrate(seeminglySubFolder);
                 }
                 finally
                 {

From 94cf99bf978305b7f45eb0bfb1323c34e3525bb5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 May 2020 12:21:02 +0900
Subject: [PATCH 02743/10326] Fix mute button falling off the screen when UI
 scaling is used

---
 osu.Game/Overlays/VolumeOverlay.cs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/VolumeOverlay.cs b/osu.Game/Overlays/VolumeOverlay.cs
index 676d2c941a..eb639431ae 100644
--- a/osu.Game/Overlays/VolumeOverlay.cs
+++ b/osu.Game/Overlays/VolumeOverlay.cs
@@ -46,6 +46,13 @@ namespace osu.Game.Overlays
                     Width = 300,
                     Colour = ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.75f), Color4.Black.Opacity(0))
                 },
+                muteButton = new MuteButton
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Margin = new MarginPadding(10),
+                    Current = { BindTarget = IsMuted }
+                },
                 new FillFlowContainer
                 {
                     Direction = FillDirection.Vertical,
@@ -56,19 +63,11 @@ namespace osu.Game.Overlays
                     Margin = new MarginPadding { Left = offset },
                     Children = new Drawable[]
                     {
-                        volumeMeterEffect = new VolumeMeter("EFFECTS", 125, colours.BlueDarker)
-                        {
-                            Margin = new MarginPadding { Top = 100 + MuteButton.HEIGHT } // to counter the mute button and re-center the volume meters
-                        },
+                        volumeMeterEffect = new VolumeMeter("EFFECTS", 125, colours.BlueDarker),
                         volumeMeterMaster = new VolumeMeter("MASTER", 150, colours.PinkDarker),
                         volumeMeterMusic = new VolumeMeter("MUSIC", 125, colours.BlueDarker),
-                        muteButton = new MuteButton
-                        {
-                            Margin = new MarginPadding { Top = 100 },
-                            Current = { BindTarget = IsMuted }
-                        }
                     }
-                },
+                }
             });
 
             volumeMeterMaster.Bindable.BindTo(audio.Volume);

From aea192080a51f014d79da5caad8ce70507d65a74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 May 2020 13:02:46 +0900
Subject: [PATCH 02744/10326] Fix incorrect storage name

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

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index d69bf94ee2..743c924bbd 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -223,7 +223,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigrationToNestedTargetFails()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationToSameTargetFails)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationToNestedTargetFails)))
             {
                 try
                 {

From 4cbd51feb965fe78ba3429728205715788a83558 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 May 2020 13:08:15 +0900
Subject: [PATCH 02745/10326] Fix test errors

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 5fe53557b3..184356b89c 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private IDistanceSnapProvider snapProvider { get; set; }
 
         protected ManiaPlacementBlueprint(T hitObject)

From 6ca102bc3fb44d751986c3daa141825d8ed094ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 May 2020 13:19:03 +0900
Subject: [PATCH 02746/10326] Attempt delete operations more than once

---
 osu.Game/IO/OsuStorage.cs | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 5393cbf7ae..499bcb4063 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -84,7 +84,7 @@ namespace osu.Game.IO
                 if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
                     continue;
 
-                fi.Delete();
+                attemptOperation(() => fi.Delete());
             }
 
             foreach (DirectoryInfo dir in target.GetDirectories())
@@ -92,11 +92,11 @@ namespace osu.Game.IO
                 if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
                     continue;
 
-                dir.Delete(true);
+                attemptOperation(() => dir.Delete(true));
             }
 
             if (target.GetFiles().Length == 0 && target.GetDirectories().Length == 0)
-                target.Delete();
+                attemptOperation(target.Delete);
         }
 
         private static void copyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true)
@@ -109,7 +109,7 @@ namespace osu.Game.IO
                 if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
                     continue;
 
-                attemptCopy(fi, Path.Combine(destination.FullName, fi.Name));
+                attemptOperation(() => fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true));
             }
 
             foreach (DirectoryInfo dir in source.GetDirectories())
@@ -121,24 +121,27 @@ namespace osu.Game.IO
             }
         }
 
-        private static void attemptCopy(System.IO.FileInfo fileInfo, string destination)
+        /// <summary>
+        /// Attempt an IO operation multiple times and only throw if none of the attempts succeed.
+        /// </summary>
+        /// <param name="action">The action to perform.</param>
+        /// <param name="attempts">The number of attempts (250ms wait between each).</param>
+        private static void attemptOperation(Action action, int attempts = 10)
         {
-            int tries = 5;
-
             while (true)
             {
                 try
                 {
-                    fileInfo.CopyTo(destination, true);
+                    action();
                     return;
                 }
                 catch (Exception)
                 {
-                    if (tries-- == 0)
+                    if (attempts-- == 0)
                         throw;
                 }
 
-                Thread.Sleep(50);
+                Thread.Sleep(250);
             }
         }
     }

From 392d44e1fbe8fcf6f334fe31134821a01e7adbf5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 May 2020 15:49:50 +0900
Subject: [PATCH 02747/10326] Always fully display one beat

---
 .../Edit/ManiaBeatSnapGrid.cs                 | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 9cb9256a7e..63e887714b 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -149,6 +150,29 @@ namespace osu.Game.Rulesets.Mania.Edit
                         linesAfter.Add(line);
                 }
 
+                // Snapping will always happen on one of the two lines around minTime (the "target" line).
+                // One of those lines may exist in linesBefore and the other may exist in linesAfter, depending on whether such a line exists, and the target changes when the mid-point is crossed.
+                // For display purposes, one complete beat is shown at the maximum brightness such that the target line should always be bright.
+                bool targetLineIsLastLineBefore = false;
+
+                if (linesBefore.Count > 0 && linesAfter.Count > 0)
+                    targetLineIsLastLineBefore = Math.Abs(linesBefore[^1].HitObject.StartTime - minTime) <= Math.Abs(linesAfter[0].HitObject.StartTime - minTime);
+                else if (linesBefore.Count > 0)
+                    targetLineIsLastLineBefore = true;
+
+                if (targetLineIsLastLineBefore)
+                {
+                    // Move the last line before to linesDuring
+                    linesDuring.Insert(0, linesBefore[^1]);
+                    linesBefore.RemoveAt(linesBefore.Count - 1);
+                }
+                else if (linesAfter.Count > 0) // = false does not guarantee that a line after exists (maybe at the bottom of the screen)
+                {
+                    // Move the first line after to linesDuring
+                    linesDuring.Insert(0, linesAfter[0]);
+                    linesAfter.RemoveAt(0);
+                }
+
                 foreach (var l in linesDuring)
                     l.Colour = OsuColour.Gray(0.5f);
 

From 1c6c128d1100ca3aa8ddd151c2f46a08701c30ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 May 2020 15:51:54 +0900
Subject: [PATCH 02748/10326] Add const

---
 osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 63e887714b..77d42a0927 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -24,6 +24,11 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public class ManiaBeatSnapGrid : CompositeDrawable
     {
+        /// <summary>
+        /// The brightness of bar lines one beat around the time range from <see cref="SetRange"/>.
+        /// </summary>
+        private const float first_beat_brightness = 0.5f;
+
         [Resolved]
         private IManiaHitObjectComposer composer { get; set; }
 
@@ -174,18 +179,18 @@ namespace osu.Game.Rulesets.Mania.Edit
                 }
 
                 foreach (var l in linesDuring)
-                    l.Colour = OsuColour.Gray(0.5f);
+                    l.Colour = OsuColour.Gray(first_beat_brightness);
 
                 for (int i = 0; i < linesBefore.Count; i++)
                 {
                     int offset = (linesBefore.Count - i - 1) / beatDivisor.Value;
-                    linesBefore[i].Colour = OsuColour.Gray(0.5f / (offset + 1));
+                    linesBefore[i].Colour = OsuColour.Gray(first_beat_brightness / (offset + 1));
                 }
 
                 for (int i = 0; i < linesAfter.Count; i++)
                 {
                     int offset = i / beatDivisor.Value;
-                    linesAfter[i].Colour = OsuColour.Gray(0.5f / (offset + 1));
+                    linesAfter[i].Colour = OsuColour.Gray(first_beat_brightness / (offset + 1));
                 }
             }
         }

From 238d87f97611be6b137e8bcc9c30073e318518a8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 May 2020 15:56:32 +0900
Subject: [PATCH 02749/10326] Add comment about gray usage

---
 osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 77d42a0927..31ebb7bc1c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -178,6 +178,8 @@ namespace osu.Game.Rulesets.Mania.Edit
                     linesAfter.RemoveAt(0);
                 }
 
+                // Grays are used rather than transparency since the lines appear on a coloured mania playfield.
+
                 foreach (var l in linesDuring)
                     l.Colour = OsuColour.Gray(first_beat_brightness);
 

From aec2520ef41155ea14e7bdf0c68fce4a45c7e3e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 May 2020 17:31:06 +0900
Subject: [PATCH 02750/10326] Avoid disabling a host-level bindable from osu!
 code

---
 .../Settings/Sections/Input/MouseSettings.cs         | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index e7f2f21465..65fc07d1d9 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -17,12 +17,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         protected override string Header => "Mouse";
 
         private readonly BindableBool rawInputToggle = new BindableBool();
+        private Bindable<double> sensitivityBindable = new BindableDouble();
         private Bindable<string> ignoredInputHandler;
         private SensitivitySetting sensitivity;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
         {
+            var configSensitivity = config.GetBindable<double>(FrameworkSetting.CursorSensitivity);
+
+            // use local bindable to avoid changing enabled state of game host's bindable.
+            sensitivityBindable = configSensitivity.GetUnboundCopy();
+            configSensitivity.BindValueChanged(val => sensitivityBindable.Value = val.NewValue);
+            sensitivityBindable.BindValueChanged(val => configSensitivity.Value = val.NewValue);
+
             Children = new Drawable[]
             {
                 new SettingsCheckbox
@@ -33,7 +41,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 sensitivity = new SensitivitySetting
                 {
                     LabelText = "Cursor sensitivity",
-                    Bindable = config.GetBindable<double>(FrameworkSetting.CursorSensitivity)
+                    Bindable = sensitivityBindable
                 },
                 new SettingsCheckbox
                 {
@@ -60,7 +68,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
             {
                 rawInputToggle.Disabled = true;
-                sensitivity.Bindable.Disabled = true;
+                sensitivityBindable.Disabled = true;
             }
             else
             {

From 98125102a768b5a711b5cab4367969f68e38b95f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 May 2020 18:07:41 +0900
Subject: [PATCH 02751/10326] Add cancellation token support to
 CreateNestedHitObjects()

---
 osu.Game.Rulesets.Catch/Objects/BananaShower.cs |  5 +++--
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs  |  5 +++--
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs     |  5 +++--
 osu.Game.Rulesets.Osu/Objects/Slider.cs         |  5 +++--
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs     |  5 +++--
 osu.Game.Rulesets.Taiko/Objects/Swell.cs        |  5 +++--
 .../Objects/TaikoHitObject.cs                   |  5 +++--
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs    |  3 ++-
 osu.Game/Rulesets/Objects/HitObject.cs          | 17 ++++++++++++++---
 9 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index c3488aec11..96ab66048a 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 System.Threading;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
 
@@ -14,9 +15,9 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public override Judgement CreateJudgement() => new IgnoreJudgement();
 
-        protected override void CreateNestedHitObjects()
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
-            base.CreateNestedHitObjects();
+            base.CreateNestedHitObjects(cancellationToken);
             createBananas();
         }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 01011645bd..4f9a289739 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -45,9 +46,9 @@ namespace osu.Game.Rulesets.Catch.Objects
             TickDistance = scoringDistance / difficulty.SliderTickRate;
         }
 
-        protected override void CreateNestedHitObjects()
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
-            base.CreateNestedHitObjects();
+            base.CreateNestedHitObjects(cancellationToken);
 
             var dropletSamples = Samples.Select(s => new HitSampleInfo
             {
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index eea2c31260..d8bdaa071b 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -91,9 +92,9 @@ namespace osu.Game.Rulesets.Mania.Objects
             tickSpacing = timingPoint.BeatLength / difficulty.SliderTickRate;
         }
 
-        protected override void CreateNestedHitObjects()
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
-            base.CreateNestedHitObjects();
+            base.CreateNestedHitObjects(cancellationToken);
 
             createTicks();
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index e5d6c20738..bc6fca2338 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -6,6 +6,7 @@ using osu.Game.Rulesets.Objects.Types;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using System.Linq;
+using System.Threading;
 using osu.Framework.Caching;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -133,9 +134,9 @@ namespace osu.Game.Rulesets.Osu.Objects
             TickDistance = scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier;
         }
 
-        protected override void CreateNestedHitObjects()
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
-            base.CreateNestedHitObjects();
+            base.CreateNestedHitObjects(cancellationToken);
 
             foreach (var e in
                 SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset))
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index dc2f277e58..8bbad220ac 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -4,6 +4,7 @@
 using osu.Game.Rulesets.Objects.Types;
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -73,14 +74,14 @@ namespace osu.Game.Rulesets.Taiko.Objects
             overallDifficulty = difficulty.OverallDifficulty;
         }
 
-        protected override void CreateNestedHitObjects()
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             createTicks();
 
             RequiredGoodHits = NestedHitObjects.Count * Math.Min(0.15, 0.05 + 0.10 / 6 * overallDifficulty);
             RequiredGreatHits = NestedHitObjects.Count * Math.Min(0.30, 0.10 + 0.20 / 6 * overallDifficulty);
 
-            base.CreateNestedHitObjects();
+            base.CreateNestedHitObjects(cancellationToken);
         }
 
         private void createTicks()
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index 2f06066a16..3a4023b3e5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Threading;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
@@ -29,9 +30,9 @@ namespace osu.Game.Rulesets.Taiko.Objects
             set => throw new NotSupportedException($"{nameof(Swell)} cannot be a strong hitobject.");
         }
 
-        protected override void CreateNestedHitObjects()
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
-            base.CreateNestedHitObjects();
+            base.CreateNestedHitObjects(cancellationToken);
 
             for (int i = 0; i < RequiredHits; i++)
                 AddNested(new SwellTick());
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
index c41727557b..206bfcfdb2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.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.Threading;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -32,9 +33,9 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public virtual bool IsStrong { get; set; }
 
-        protected override void CreateNestedHitObjects()
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
-            base.CreateNestedHitObjects();
+            base.CreateNestedHitObjects(cancellationToken);
 
             if (IsStrong)
                 AddNested(new StrongHitObject { StartTime = this.GetEndTime() });
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index fb1eb7adbf..49b57c3f30 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.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.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -90,7 +91,7 @@ namespace osu.Game.Rulesets.Edit
         public abstract void UpdatePosition(Vector2 screenSpacePosition);
 
         /// <summary>
-        /// Invokes <see cref="Objects.HitObject.ApplyDefaults(ControlPointInfo,BeatmapDifficulty)"/>,
+        /// Invokes <see cref="Objects.HitObject.ApplyDefaults(ControlPointInfo,BeatmapDifficulty, CancellationToken)"/>,
         /// refreshing <see cref="Objects.HitObject.NestedHitObjects"/> and parameters for the <see cref="HitObject"/>.
         /// </summary>
         protected void ApplyDefaultsToHitObject() => HitObject.ApplyDefaults(beatmap.Value.Beatmap.ControlPointInfo, beatmap.Value.Beatmap.BeatmapInfo.BaseDifficulty);
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index cffbdbae08..8ff2bdefb3 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
@@ -99,7 +100,8 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         /// <param name="controlPointInfo">The control points.</param>
         /// <param name="difficulty">The difficulty settings to use.</param>
-        public void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty, CancellationToken cancellationToken = default)
         {
             ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
@@ -108,7 +110,7 @@ namespace osu.Game.Rulesets.Objects
 
             nestedHitObjects.Clear();
 
-            CreateNestedHitObjects();
+            CreateNestedHitObjects(cancellationToken);
 
             if (this is IHasComboInformation hasCombo)
             {
@@ -122,7 +124,7 @@ namespace osu.Game.Rulesets.Objects
             nestedHitObjects.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime));
 
             foreach (var h in nestedHitObjects)
-                h.ApplyDefaults(controlPointInfo, difficulty);
+                h.ApplyDefaults(controlPointInfo, difficulty, cancellationToken);
 
             DefaultsApplied?.Invoke(this);
         }
@@ -136,6 +138,15 @@ namespace osu.Game.Rulesets.Objects
             HitWindows?.SetDifficulty(difficulty.OverallDifficulty);
         }
 
+        protected virtual void CreateNestedHitObjects(CancellationToken cancellationToken)
+        {
+            // ReSharper disable once MethodSupportsCancellation (https://youtrack.jetbrains.com/issue/RIDER-44520)
+#pragma warning disable 618
+            CreateNestedHitObjects();
+#pragma warning restore 618
+        }
+
+        [Obsolete("Use the overload with cancellation support instead.")] // can be removed 20201115
         protected virtual void CreateNestedHitObjects()
         {
         }

From 4079642d58572f7b342071e572b0b21c08e15b8b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 May 2020 18:13:47 +0900
Subject: [PATCH 02752/10326] Actually pass in the cancellation token

---
 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 bf2b9944a4..9ea023a030 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Beatmaps
                     if (cancellationSource.IsCancellationRequested)
                         throw new BeatmapLoadTimeoutException(BeatmapInfo);
 
-                    obj.ApplyDefaults(converted.ControlPointInfo, converted.BeatmapInfo.BaseDifficulty);
+                    obj.ApplyDefaults(converted.ControlPointInfo, converted.BeatmapInfo.BaseDifficulty, cancellationSource.Token);
                 }
 
                 foreach (var mod in mods.OfType<IApplicableToHitObject>())

From 4719fcc2913eaa002f0ac62f7f47b0a670c78f42 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 May 2020 18:17:39 +0900
Subject: [PATCH 02753/10326] Actually use the cancellation token

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs    |  4 +++-
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs       |  6 ++++--
 osu.Game.Rulesets.Osu/Objects/Slider.cs           |  2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs               | 15 +++++++++++----
 osu.Game/Rulesets/Objects/SliderEventGenerator.cs | 10 +++++++---
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 4f9a289739..d32595c2e1 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             SliderEventDescriptor? lastEvent = null;
 
-            foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset))
+            foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken))
             {
                 // generate tiny droplets since the last point
                 if (lastEvent != null)
@@ -74,6 +74,8 @@ namespace osu.Game.Rulesets.Catch.Objects
 
                         for (double t = timeBetweenTiny; t < sinceLastTick; t += timeBetweenTiny)
                         {
+                            cancellationToken.ThrowIfCancellationRequested();
+
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index d8bdaa071b..e6f722a8a9 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Mania.Objects
         {
             base.CreateNestedHitObjects(cancellationToken);
 
-            createTicks();
+            createTicks(cancellationToken);
 
             AddNested(Head = new Note
             {
@@ -113,13 +113,15 @@ namespace osu.Game.Rulesets.Mania.Objects
             });
         }
 
-        private void createTicks()
+        private void createTicks(CancellationToken cancellationToken)
         {
             if (tickSpacing == 0)
                 return;
 
             for (double t = StartTime + tickSpacing; t <= EndTime - tickSpacing; t += tickSpacing)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 AddNested(new HoldNoteTick
                 {
                     StartTime = t,
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index bc6fca2338..6ba0e1c6aa 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             base.CreateNestedHitObjects(cancellationToken);
 
             foreach (var e in
-                SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset))
+                SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken))
             {
                 switch (e.Type)
                 {
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 9ea023a030..8126311cbd 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -129,12 +129,19 @@ namespace osu.Game.Beatmaps
                 processor?.PreProcess();
 
                 // Compute default values for hitobjects, including creating nested hitobjects in-case they're needed
-                foreach (var obj in converted.HitObjects)
+                try
                 {
-                    if (cancellationSource.IsCancellationRequested)
-                        throw new BeatmapLoadTimeoutException(BeatmapInfo);
+                    foreach (var obj in converted.HitObjects)
+                    {
+                        if (cancellationSource.IsCancellationRequested)
+                            throw new BeatmapLoadTimeoutException(BeatmapInfo);
 
-                    obj.ApplyDefaults(converted.ControlPointInfo, converted.BeatmapInfo.BaseDifficulty, cancellationSource.Token);
+                        obj.ApplyDefaults(converted.ControlPointInfo, converted.BeatmapInfo.BaseDifficulty, cancellationSource.Token);
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                    throw new BeatmapLoadTimeoutException(BeatmapInfo);
                 }
 
                 foreach (var mod in mods.OfType<IApplicableToHitObject>())
diff --git a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
index e9ee3833b7..5f1c1cf6a0 100644
--- a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
+++ b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
@@ -4,13 +4,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 
 namespace osu.Game.Rulesets.Objects
 {
     public static class SliderEventGenerator
     {
         public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
-                                                                  double? legacyLastTickOffset)
+                                                                  double? legacyLastTickOffset, CancellationToken cancellationToken = default)
         {
             // A very lenient maximum length of a slider for ticks to be generated.
             // This exists for edge cases such as /b/1573664 where the beatmap has been edited by the user, and should never be reached in normal usage.
@@ -37,7 +38,7 @@ namespace osu.Game.Rulesets.Objects
                     var spanStartTime = startTime + span * spanDuration;
                     var reversed = span % 2 == 1;
 
-                    var ticks = generateTicks(span, spanStartTime, spanDuration, reversed, length, tickDistance, minDistanceFromEnd);
+                    var ticks = generateTicks(span, spanStartTime, spanDuration, reversed, length, tickDistance, minDistanceFromEnd, cancellationToken);
 
                     if (reversed)
                     {
@@ -108,12 +109,15 @@ namespace osu.Game.Rulesets.Objects
         /// <param name="length">The length of the path.</param>
         /// <param name="tickDistance">The distance between each tick.</param>
         /// <param name="minDistanceFromEnd">The distance from the end of the path at which ticks are not allowed to be added.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>A <see cref="SliderEventDescriptor"/> for each tick. If <paramref name="reversed"/> is true, the ticks will be returned in reverse-StartTime order.</returns>
         private static IEnumerable<SliderEventDescriptor> generateTicks(int spanIndex, double spanStartTime, double spanDuration, bool reversed, double length, double tickDistance,
-                                                                        double minDistanceFromEnd)
+                                                                        double minDistanceFromEnd, CancellationToken cancellationToken = default)
         {
             for (var d = tickDistance; d <= length; d += tickDistance)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 if (d >= length - minDistanceFromEnd)
                     break;
 

From 9b6525bb03a09323b38ec1e2296d63ce1a73a5d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 May 2020 18:44:47 +0900
Subject: [PATCH 02754/10326] Fix applied platform/user offsets being incorrect
 when rate adjust mods are active

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 591e969ad8..2f85d6ad1e 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -78,10 +78,10 @@ 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 ? 15 : 0 };
+            platformOffsetClock = new HardwareCorrectionOffsetClock(adjustableClock) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
 
             // the final usable gameplay clock with user-set offsets applied.
-            userOffsetClock = new FramedOffsetClock(platformOffsetClock);
+            userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
 
             // the clock to be exposed via DI to children.
             GameplayClock = new GameplayClock(userOffsetClock);
@@ -248,5 +248,16 @@ namespace osu.Game.Screens.Play
                 speedAdjustmentsApplied = false;
             }
         }
+
+        private class HardwareCorrectionOffsetClock : FramedOffsetClock
+        {
+            // we always want to apply the same real-time offset, so it should be adjusted by the playback rate to achieve this.
+            public override double CurrentTime => SourceTime + Offset * Rate;
+
+            public HardwareCorrectionOffsetClock(IClock source, bool processSource = true)
+                : base(source, processSource)
+            {
+            }
+        }
     }
 }

From 6cd1753459451bfe6672e149c1099ee5e514dd55 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 May 2020 18:51:44 +0900
Subject: [PATCH 02755/10326] Add overload to prevent crashes (bosu)

---
 osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs | 10 +++++-----
 osu.Game/Rulesets/Objects/SliderEventGenerator.cs    |  8 ++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
index 9fba0f1668..6c8133660f 100644
--- a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
+++ b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestSingleSpan()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, null).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, null, default).ToArray();
 
             Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
             Assert.That(events[0].Time, Is.EqualTo(start_time));
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestRepeat()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 2, null).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 2, null, default).ToArray();
 
             Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
             Assert.That(events[0].Time, Is.EqualTo(start_time));
@@ -52,7 +52,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestNonEvenTicks()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, 300, span_duration, 2, null).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, 300, span_duration, 2, null, default).ToArray();
 
             Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
             Assert.That(events[0].Time, Is.EqualTo(start_time));
@@ -85,7 +85,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestLegacyLastTickOffset()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, 100).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, 100, default).ToArray();
 
             Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LegacyLastTick));
             Assert.That(events[2].Time, Is.EqualTo(900));
@@ -97,7 +97,7 @@ namespace osu.Game.Tests.Beatmaps
             const double velocity = 5;
             const double min_distance = velocity * 10;
 
-            var events = SliderEventGenerator.Generate(start_time, span_duration, velocity, velocity, span_duration, 2, 0).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, velocity, velocity, span_duration, 2, 0, default).ToArray();
 
             Assert.Multiple(() =>
             {
diff --git a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
index 5f1c1cf6a0..6df0041e7a 100644
--- a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
+++ b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
@@ -10,6 +10,14 @@ namespace osu.Game.Rulesets.Objects
 {
     public static class SliderEventGenerator
     {
+        [Obsolete("Use the overload with cancellation support instead.")] // can be removed 20201115
+        public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
+                                                                  double? legacyLastTickOffset)
+        {
+            return Generate(startTime, spanDuration, velocity, tickDistance, totalDistance, spanCount, legacyLastTickOffset, default);
+        }
+
+        // ReSharper disable once MethodOverloadWithOptionalParameter
         public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
                                                                   double? legacyLastTickOffset, CancellationToken cancellationToken = default)
         {

From 65345109991272e138f5e6f9658ee1da9802b127 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 May 2020 19:25:14 +0900
Subject: [PATCH 02756/10326] Use cancellation token in taiko swell/drumroll

---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs | 6 ++++--
 osu.Game.Rulesets.Taiko/Objects/Swell.cs    | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 8bbad220ac..7b11bce520 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
-            createTicks();
+            createTicks(cancellationToken);
 
             RequiredGoodHits = NestedHitObjects.Count * Math.Min(0.15, 0.05 + 0.10 / 6 * overallDifficulty);
             RequiredGreatHits = NestedHitObjects.Count * Math.Min(0.30, 0.10 + 0.20 / 6 * overallDifficulty);
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
             base.CreateNestedHitObjects(cancellationToken);
         }
 
-        private void createTicks()
+        private void createTicks(CancellationToken cancellationToken)
         {
             if (tickSpacing == 0)
                 return;
@@ -93,6 +93,8 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
             for (double t = StartTime; t < EndTime + tickSpacing / 2; t += tickSpacing)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 AddNested(new DrumRollTick
                 {
                     FirstTick = first,
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index 3a4023b3e5..390f8d1f3b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -35,7 +35,10 @@ namespace osu.Game.Rulesets.Taiko.Objects
             base.CreateNestedHitObjects(cancellationToken);
 
             for (int i = 0; i < RequiredHits; i++)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
                 AddNested(new SwellTick());
+            }
         }
 
         public override Judgement CreateJudgement() => new TaikoSwellJudgement();

From c55eb8335135359ee20ee7a3900392b35981b6da Mon Sep 17 00:00:00 2001
From: Fukashi13 <48766178+Fukashi13@users.noreply.github.com>
Date: Fri, 15 May 2020 14:03:45 +0200
Subject: [PATCH 02757/10326] last section gets selected when scrolling to
 bottom of list

---
 .../Graphics/Containers/SectionsContainer.cs  | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 5192a7ddea..b9ed9b90fc 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -189,23 +189,18 @@ namespace osu.Game.Graphics.Containers
                 headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
                 headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
 
-                T bestMatch = Children.FirstOrDefault();
-                float minDiff = float.MinValue;
                 float scrollOffset = FixedHeader?.LayoutSize.Y ?? 0;
+                Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 
-                foreach (var section in Children)
+                if (scrollContainer.IsScrolledToEnd())
                 {
-                    float diff = scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
-
-                    if (minDiff < diff && diff < 0)
-                    {
-                        minDiff = diff;
-                        bestMatch = section;
-                    }
+                    SelectedSection.Value = Children.LastOrDefault();
+                }
+                else
+                {
+                    SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault()
+                        ?? Children.FirstOrDefault();
                 }
-
-                if (bestMatch != null)
-                    SelectedSection.Value = bestMatch;
             }
         }
 

From 6416ace70d07f8a5d67bfd469ee93e73f1af5266 Mon Sep 17 00:00:00 2001
From: Fukashi13 <48766178+Fukashi13@users.noreply.github.com>
Date: Fri, 15 May 2020 14:31:05 +0200
Subject: [PATCH 02758/10326] fixed indent

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

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index b9ed9b90fc..d739f56828 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -199,7 +199,7 @@ namespace osu.Game.Graphics.Containers
                 else
                 {
                     SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault()
-                        ?? Children.FirstOrDefault();
+                                            ?? Children.FirstOrDefault();
                 }
             }
         }

From 4096463d02d8ac096f6e4c7d1d23d89b9575e0c9 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 15 May 2020 19:43:01 +0200
Subject: [PATCH 02759/10326] Move SkipOverlay internal alpha manipulation to a
 nested container and adjust visual tests.

---
 .../Visual/Gameplay/TestSceneSkipOverlay.cs   | 30 ++++++++++++-------
 osu.Game/Screens/Play/Player.cs               |  1 -
 osu.Game/Screens/Play/SkipOverlay.cs          | 27 +++++++++--------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index 6a0f86fe53..7c4ae4fc52 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -2,9 +2,9 @@
 // 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.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneSkipOverlay : OsuManualInputManagerTestScene
     {
-        private SkipOverlay skip;
+        private TestSkipOverlay skip;
         private int requestCount;
 
         private double increment;
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    skip = new SkipOverlay(skip_time)
+                    skip = new TestSkipOverlay(skip_time)
                     {
                         RequestSkip = () =>
                         {
@@ -56,19 +56,19 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestFadeOnIdle()
         {
             AddStep("move mouse", () => InputManager.MoveMouseTo(Vector2.Zero));
-            AddUntilStep("fully visible", () => skip.Children.First().Alpha == 1);
-            AddUntilStep("wait for fade", () => skip.Children.First().Alpha < 1);
+            AddUntilStep("fully visible", () => skip.OverlayContents.Alpha == 1);
+            AddUntilStep("wait for fade", () => skip.OverlayContents.Alpha < 1);
 
             AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
-            AddUntilStep("fully visible", () => skip.Children.First().Alpha == 1);
-            AddUntilStep("wait for fade", () => skip.Children.First().Alpha < 1);
+            AddUntilStep("fully visible", () => skip.OverlayContents.Alpha == 1);
+            AddUntilStep("wait for fade", () => skip.OverlayContents.Alpha < 1);
         }
 
         [Test]
         public void TestClickableAfterFade()
         {
             AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
-            AddUntilStep("wait for fade", () => skip.Children.First().Alpha == 0);
+            AddUntilStep("wait for fade", () => skip.OverlayContents.Alpha == 0);
             AddStep("click", () => InputManager.Click(MouseButton.Left));
             checkRequestCount(1);
         }
@@ -105,13 +105,23 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
             AddStep("button down", () => InputManager.PressButton(MouseButton.Left));
-            AddUntilStep("wait for overlay disappear", () => !skip.IsPresent);
-            AddAssert("ensure button didn't disappear", () => skip.Children.First().Alpha > 0);
+            AddUntilStep("wait for overlay disappear", () => !skip.Child.IsPresent);
+            AddAssert("ensure button didn't disappear", () => skip.OverlayContents.Alpha > 0);
             AddStep("button up", () => InputManager.ReleaseButton(MouseButton.Left));
             checkRequestCount(0);
         }
 
         private void checkRequestCount(int expected) =>
             AddAssert($"request count is {expected}", () => requestCount == expected);
+
+        private class TestSkipOverlay : SkipOverlay
+        {
+            public TestSkipOverlay(double startTime)
+                : base(startTime)
+            {
+            }
+
+            public Drawable OverlayContents => (Child as Container).Child;
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index b24cef8eae..02c7b671a3 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -191,7 +191,6 @@ namespace osu.Game.Screens.Play
                 HUDOverlay.ShowHud.Value = false;
                 HUDOverlay.ShowHud.Disabled = true;
                 BreakOverlay.Hide();
-                skipOverlay.Disabled = true;
                 skipOverlay.Hide();
             }
 
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 757dcd21ed..fec35df4e3 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -24,13 +24,14 @@ using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Play
 {
-    public class SkipOverlay : VisibilityContainer, IKeyBindingHandler<GlobalAction>
+    public class SkipOverlay : Container, IKeyBindingHandler<GlobalAction>
     {
         private readonly double startTime;
 
         public Action RequestSkip;
 
         private Button button;
+        private ButtonContainer buttonContainer;
         private Box remainingTimeBox;
 
         private FadeContainer fadeContainer;
@@ -39,8 +40,6 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private GameplayClock gameplayClock { get; set; }
 
-        public bool Disabled { get; set; }
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         /// <summary>
@@ -63,9 +62,10 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader(true)]
         private void load(OsuColour colours)
         {
-            Children = new Drawable[]
+            Child = buttonContainer = new ButtonContainer
             {
-                fadeContainer = new FadeContainer
+                RelativeSizeAxes = Axes.Both,
+                Child = fadeContainer = new FadeContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
@@ -106,15 +106,8 @@ namespace osu.Game.Screens.Play
 
             button.Action = () => RequestSkip?.Invoke();
             displayTime = gameplayClock.CurrentTime;
-
-            if (!Disabled)
-                Show();
         }
 
-        protected override void PopIn() => this.FadeIn(fade_time);
-
-        protected override void PopOut() => this.FadeOut(fade_time);
-
         protected override void Update()
         {
             base.Update();
@@ -124,13 +117,14 @@ namespace osu.Game.Screens.Play
             remainingTimeBox.Width = (float)Interpolation.Lerp(remainingTimeBox.Width, progress, Math.Clamp(Time.Elapsed / 40, 0, 1));
 
             button.Enabled.Value = progress > 0;
-            State.Value = progress > 0 && !Disabled ? Visibility.Visible : Visibility.Hidden;
+            buttonContainer.State.Value = progress > 0 ? Visibility.Visible : Visibility.Hidden;
         }
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
             if (!e.HasAnyButtonPressed)
                 fadeContainer.Show();
+
             return base.OnMouseMove(e);
         }
 
@@ -217,6 +211,13 @@ namespace osu.Game.Screens.Play
             public override void Show() => State = Visibility.Visible;
         }
 
+        private class ButtonContainer : VisibilityContainer
+        {
+            protected override void PopIn() => this.FadeIn(fade_time);
+
+            protected override void PopOut() => this.FadeOut(fade_time);
+        }
+
         private class Button : OsuClickableContainer
         {
             private Color4 colourNormal;

From ed9d6f28297c2801e1e6ad87bb81205e8d66c5e0 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 15 May 2020 22:58:15 +0200
Subject: [PATCH 02760/10326] Fix CI inspection.

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index 7c4ae4fc52..e093542d1e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            public Drawable OverlayContents => (Child as Container).Child;
+            public Drawable OverlayContents => (Child as Container)?.Child;
         }
     }
 }

From c47f02c3b72cd1f499817cd133a34dfbf9777c55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 16 May 2020 08:24:02 +0900
Subject: [PATCH 02761/10326] Update second instance of disabling bindable

---
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 65fc07d1d9..f139a704bc 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 {
                     bool raw = !handler.NewValue.Contains("Raw");
                     rawInputToggle.Value = raw;
-                    sensitivity.Bindable.Disabled = !raw;
+                    sensitivityBindable.Disabled = !raw;
                 };
 
                 ignoredInputHandler.TriggerChange();

From 08bb5cbcbff6e1b42fa1715224aa989cd308b073 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 16 May 2020 02:57:58 +0200
Subject: [PATCH 02762/10326] Introduce model to store path of stable osu!

---
 osu.Game.Tournament/Models/StableInfo.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 osu.Game.Tournament/Models/StableInfo.cs

diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
new file mode 100644
index 0000000000..b89160536d
--- /dev/null
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Tournament.Models
+{
+    /// <summary>
+    /// Holds the complete data required to operate the tournament system.
+    /// </summary>
+    [Serializable]
+    public class StableInfo
+    {
+        public Bindable<string> StablePath = new Bindable<string>(string.Empty);
+    }
+}

From c40b3b905313a78ee229bdd49589d26c32f27bfd Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 16 May 2020 02:59:48 +0200
Subject: [PATCH 02763/10326] Refactored stable path finding and added json
 config detection.

This also migrates the values found in the other methods to the configuration file.
---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 173 ++++++++++++++++++------
 1 file changed, 135 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 53ba597a7e..321a4ad0aa 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -4,6 +4,8 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 using Microsoft.Win32;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
@@ -35,7 +37,15 @@ namespace osu.Game.Tournament.IPC
         private int lastBeatmapId;
         private ScheduledDelegate scheduled;
 
-        public Storage Storage { get; private set; }
+        [Resolved]
+        private StableInfo stableInfo { get; set; }
+
+        private const string stable_config = "tournament/stable.json";
+
+        public Storage IPCStorage { get; private set; }
+
+        [Resolved]
+        private Storage tournamentStorage { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -47,7 +57,7 @@ namespace osu.Game.Tournament.IPC
         {
             scheduled?.Cancel();
 
-            Storage = null;
+            IPCStorage = null;
 
             try
             {
@@ -56,20 +66,20 @@ namespace osu.Game.Tournament.IPC
                 if (string.IsNullOrEmpty(path))
                     return null;
 
-                Storage = new DesktopStorage(path, host as DesktopGameHost);
+                IPCStorage = new DesktopStorage(path, host as DesktopGameHost);
 
                 const string file_ipc_filename = "ipc.txt";
                 const string file_ipc_state_filename = "ipc-state.txt";
                 const string file_ipc_scores_filename = "ipc-scores.txt";
                 const string file_ipc_channel_filename = "ipc-channel.txt";
 
-                if (Storage.Exists(file_ipc_filename))
+                if (IPCStorage.Exists(file_ipc_filename))
                 {
                     scheduled = Scheduler.AddDelayed(delegate
                     {
                         try
                         {
-                            using (var stream = Storage.GetStream(file_ipc_filename))
+                            using (var stream = IPCStorage.GetStream(file_ipc_filename))
                             using (var sr = new StreamReader(stream))
                             {
                                 var beatmapId = int.Parse(sr.ReadLine());
@@ -101,7 +111,7 @@ namespace osu.Game.Tournament.IPC
 
                         try
                         {
-                            using (var stream = Storage.GetStream(file_ipc_channel_filename))
+                            using (var stream = IPCStorage.GetStream(file_ipc_channel_filename))
                             using (var sr = new StreamReader(stream))
                             {
                                 ChatChannel.Value = sr.ReadLine();
@@ -114,7 +124,7 @@ namespace osu.Game.Tournament.IPC
 
                         try
                         {
-                            using (var stream = Storage.GetStream(file_ipc_state_filename))
+                            using (var stream = IPCStorage.GetStream(file_ipc_state_filename))
                             using (var sr = new StreamReader(stream))
                             {
                                 State.Value = (TourneyState)Enum.Parse(typeof(TourneyState), sr.ReadLine());
@@ -127,7 +137,7 @@ namespace osu.Game.Tournament.IPC
 
                         try
                         {
-                            using (var stream = Storage.GetStream(file_ipc_scores_filename))
+                            using (var stream = IPCStorage.GetStream(file_ipc_scores_filename))
                             using (var sr = new StreamReader(stream))
                             {
                                 Score1.Value = int.Parse(sr.ReadLine());
@@ -146,54 +156,141 @@ namespace osu.Game.Tournament.IPC
                 Logger.Error(e, "Stable installation could not be found; disabling file based IPC");
             }
 
-            return Storage;
+            return IPCStorage;
         }
 
+        private static bool checkExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
+
         private string findStablePath()
         {
-            static bool checkExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
-
             string stableInstallPath = string.Empty;
 
             try
             {
-                try
+                List<Func<string>> stableFindMethods = new List<Func<string>>
                 {
-                    stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
+                    findFromJsonConfig,
+                    findFromEnvVar,
+                    findFromRegistry,
+                    findFromLocalAppData,
+                    findFromDotFolder
+                };
 
-                    if (checkExists(stableInstallPath))
+                foreach (var r in stableFindMethods)
+                {
+                    stableInstallPath = r.Invoke();
+
+                    if (stableInstallPath != null)
+                    {
                         return stableInstallPath;
-                }
-                catch
-                {
+                    }
                 }
 
-                try
-                {
-                    using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                        stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
-
-                    if (checkExists(stableInstallPath))
-                        return stableInstallPath;
-                }
-                catch
-                {
-                }
-
-                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
-                if (checkExists(stableInstallPath))
-                    return stableInstallPath;
-
-                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
-                if (checkExists(stableInstallPath))
-                    return stableInstallPath;
-
-                return null;
+                return stableInstallPath;
             }
             finally
             {
                 Logger.Log($"Stable path for tourney usage: {stableInstallPath}");
             }
         }
+
+        private void saveStablePath()
+        {
+            using (var stream = tournamentStorage.GetStream(stable_config, FileAccess.Write, FileMode.Create))
+            using (var sw = new StreamWriter(stream))
+            {
+                sw.Write(JsonConvert.SerializeObject(stableInfo,
+                    new JsonSerializerSettings
+                    {
+                        Formatting = Formatting.Indented,
+                        NullValueHandling = NullValueHandling.Ignore,
+                        DefaultValueHandling = DefaultValueHandling.Ignore,
+                    }));
+            }
+        }
+
+        private string findFromEnvVar()
+        {
+            try
+            {
+                Logger.Log("Trying to find stable with environment variables");
+                string stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
+
+                if (checkExists(stableInstallPath))
+                {
+                    stableInfo.StablePath.Value = stableInstallPath;
+                    saveStablePath();
+                    return stableInstallPath;
+                }
+            }
+            catch
+            {
+            }
+
+            return null;
+        }
+
+        private string findFromJsonConfig()
+        {
+            try
+            {
+                Logger.Log("Trying to find stable through the json config");
+                return stableInfo.StablePath.Value;
+            }
+            catch
+            {
+            }
+
+            return null;
+        }
+
+        private string findFromLocalAppData()
+        {
+            Logger.Log("Trying to find stable in %LOCALAPPDATA%");
+            string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
+
+            if (checkExists(stableInstallPath))
+            {
+                stableInfo.StablePath.Value = stableInstallPath;
+                saveStablePath();
+                return stableInstallPath;
+            }
+
+            return null;
+        }
+
+        private string findFromDotFolder()
+        {
+            Logger.Log("Trying to find stable in dotfolders");
+            string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
+
+            if (checkExists(stableInstallPath))
+            {
+                stableInfo.StablePath.Value = stableInstallPath;
+                saveStablePath();
+                return stableInstallPath;
+            }
+
+            return null;
+        }
+
+        private string findFromRegistry()
+        {
+            Logger.Log("Trying to find stable in registry");
+
+            string stableInstallPath;
+
+            using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+
+            if (checkExists(stableInstallPath))
+            {
+                stableInfo.StablePath.Value = stableInstallPath;
+                saveStablePath();
+                return stableInstallPath;
+            }
+
+            return null;
+        }
     }
 }

From 9944a514da95181dd6c4be222b2bd5d3e069dee4 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 16 May 2020 03:00:37 +0200
Subject: [PATCH 02764/10326] Dependency cache the ipc location file

---
 osu.Game.Tournament/TournamentGameBase.cs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 85db9e61fb..31c56c7fc4 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Tournament
     {
         private const string bracket_filename = "bracket.json";
 
+        private const string stable_config = "tournament/stable.json";
+
         private LadderInfo ladder;
 
         private Storage storage;
@@ -43,6 +45,7 @@ namespace osu.Game.Tournament
 
         private Bindable<Size> windowSize;
         private FileBasedIPC ipc;
+        private StableInfo stableInfo;
 
         private Drawable heightWarning;
 
@@ -71,6 +74,7 @@ namespace osu.Game.Tournament
             }), true);
 
             readBracket();
+            readStableConfig();
 
             ladder.CurrentMatch.Value = ladder.Matches.FirstOrDefault(p => p.Current.Value);
 
@@ -141,6 +145,23 @@ namespace osu.Game.Tournament
             });
         }
 
+        private void readStableConfig()
+        {
+            if (storage.Exists(stable_config))
+            {
+                using (Stream stream = storage.GetStream(stable_config, FileAccess.Read, FileMode.Open))
+                using (var sr = new StreamReader(stream))
+                {
+                    stableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());
+                }
+            }
+
+            if (stableInfo == null)
+                stableInfo = new StableInfo();
+
+            dependencies.Cache(stableInfo);
+        }
+
         private void readBracket()
         {
             if (storage.Exists(bracket_filename))

From 3fc888ef95f62154cf1e32aa178036926da550cb Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 16 May 2020 03:03:10 +0200
Subject: [PATCH 02765/10326] User interface setup for custom IPC location

Right now makes use of another ActionableInfo field. Probably a better idea to add an extra button to the Current IPC Storage actionable field.
---
 .../Components/IPCNotFoundDialog.cs           |  27 ++++
 osu.Game.Tournament/Screens/SetupScreen.cs    |  34 +++-
 .../Screens/StablePathSelectScreen.cs         | 149 ++++++++++++++++++
 3 files changed, 207 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Tournament/Components/IPCNotFoundDialog.cs
 create mode 100644 osu.Game.Tournament/Screens/StablePathSelectScreen.cs

diff --git a/osu.Game.Tournament/Components/IPCNotFoundDialog.cs b/osu.Game.Tournament/Components/IPCNotFoundDialog.cs
new file mode 100644
index 0000000000..d4f9edc182
--- /dev/null
+++ b/osu.Game.Tournament/Components/IPCNotFoundDialog.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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.Overlays.Dialog;
+
+namespace osu.Game.Tournament.Components
+{
+    public class IPCNotFoundDialog : PopupDialog
+    {
+        public IPCNotFoundDialog()
+        {
+            BodyText = "Select a directory that contains an osu! Cutting Edge installation";
+
+            Icon = FontAwesome.Regular.Angry;
+            HeaderText = @"This is an invalid IPC Directory!";
+            Buttons = new PopupDialogButton[]
+            {
+                new PopupDialogOkButton
+                {
+                    Text = @"Alright.",
+                    Action = () => { Expire(); }
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index c91379b2d6..93edd73ff8 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -15,6 +15,8 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Tournament.IPC;
+using osu.Framework.Platform;
+using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 
@@ -26,6 +28,7 @@ namespace osu.Game.Tournament.Screens
 
         private LoginOverlay loginOverlay;
         private ActionableInfo resolution;
+        private const string stable_config = "tournament/stable.json";
 
         [Resolved]
         private MatchIPCInfo ipc { get; set; }
@@ -36,8 +39,17 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private TournamentSceneManager sceneManager { get; set; }
+
         private Bindable<Size> windowSize;
 
+        [Resolved]
+        private Storage storage { get; set; }
+
+        [Resolved]
+        private StableInfo stableInfo { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig)
         {
@@ -62,7 +74,6 @@ namespace osu.Game.Tournament.Screens
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
-
             fillFlow.Children = new Drawable[]
             {
                 new ActionableInfo
@@ -74,11 +85,28 @@ namespace osu.Game.Tournament.Screens
                         fileBasedIpc?.LocateStableStorage();
                         reload();
                     },
-                    Value = fileBasedIpc?.Storage?.GetFullPath(string.Empty) ?? "Not found",
-                    Failing = fileBasedIpc?.Storage == null,
+                    Value = fileBasedIpc?.IPCStorage?.GetFullPath(string.Empty) ?? "Not found",
+                    Failing = fileBasedIpc?.IPCStorage == null,
                     Description = "The osu!stable installation which is currently being used as a data source. If a source is not found, make sure you have created an empty ipc.txt in your stable cutting-edge installation, and that it is registered as the default osu! install."
                 },
                 new ActionableInfo
+                {
+                    Label = "Custom IPC source",
+                    ButtonText = "Change path",
+                    Action = () =>
+                    {
+                        stableInfo.StablePath.BindValueChanged(_ =>
+                        {
+                            fileBasedIpc?.LocateStableStorage();
+                            Schedule(reload);
+                        });
+                        sceneManager.SetScreen(new StablePathSelectScreen());
+                    },
+                    Value = fileBasedIpc?.IPCStorage?.GetFullPath(string.Empty) ?? "Not found",
+                    Failing = fileBasedIpc?.IPCStorage == null,
+                    Description = "The osu!stable installation which is currently being used as a data source. If a source is not found, you can manually select the desired osu! installation that you want to use."
+                },
+                new ActionableInfo
                 {
                     Label = "Current User",
                     ButtonText = "Change Login",
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
new file mode 100644
index 0000000000..1faacc727f
--- /dev/null
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.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 System.IO;
+using Newtonsoft.Json;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Logging;
+using osu.Framework.Platform;
+using osu.Game.Tournament.Models;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Overlays;
+using osu.Game.Tournament.IPC;
+using osu.Game.Tournament.Components;
+using osuTK;
+
+namespace osu.Game.Tournament.Screens
+{
+    public class StablePathSelectScreen : TournamentScreen
+    {
+        private DirectorySelector directorySelector;
+
+        private const string stable_config = "tournament/stable.json";
+
+        [Resolved]
+        private StableInfo stableInfo { get; set; }
+
+        [Resolved]
+        private MatchIPCInfo ipc { get; set; }
+
+        private DialogOverlay overlay;
+
+        [Resolved(canBeNull: true)]
+        private TournamentSceneManager sceneManager { get; set; }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(Storage storage, OsuColour colours)
+        {
+            // begin selection in the parent directory of the current storage location
+            var initialPath = new DirectoryInfo(stableInfo.StablePath.Value).FullName;
+
+            AddInternal(new Container
+            {
+                Masking = true,
+                CornerRadius = 10,
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(0.5f, 0.8f),
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = colours.GreySeafoamDark,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
+                        {
+                            new Dimension(),
+                            new Dimension(GridSizeMode.Relative, 0.8f),
+                            new Dimension(),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Text = "Please select a new location",
+                                    Font = OsuFont.Default.With(size: 40)
+                                },
+                            },
+                            new Drawable[]
+                            {
+                                directorySelector = new DirectorySelector(initialPath)
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                }
+                            },
+                            new Drawable[]
+                            {
+                                new TriangleButton
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Width = 300,
+                                    Text = "Select stable path",
+                                    Action = () => { start(storage); }
+                                },
+                            }
+                        }
+                    }
+                }
+            });
+        }
+
+        private static bool checkExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
+
+        private void start(Storage storage)
+        {
+            var target = directorySelector.CurrentDirectory.Value.FullName;
+
+            if (checkExists(target))
+            {
+                stableInfo.StablePath.Value = target;
+
+                try
+                {
+                    using (var stream = storage.GetStream(stable_config, FileAccess.Write, FileMode.Create))
+                    using (var sw = new StreamWriter(stream))
+                    {
+                        sw.Write(JsonConvert.SerializeObject(stableInfo,
+                            new JsonSerializerSettings
+                            {
+                                Formatting = Formatting.Indented,
+                                NullValueHandling = NullValueHandling.Ignore,
+                                DefaultValueHandling = DefaultValueHandling.Ignore,
+                            }));
+                    }
+
+                    sceneManager?.SetScreen(typeof(SetupScreen));
+                }
+                catch (Exception e)
+                {
+                    Logger.Log($"Error during migration: {e.Message}", level: LogLevel.Error);
+                }
+            }
+            else
+            {
+                overlay = new DialogOverlay();
+                overlay.Push(new IPCNotFoundDialog());
+                AddInternal(overlay);
+                Logger.Log("Folder is not an osu! stable CE directory");
+                // Return an error in the picker that the directory does not contain ipc.txt
+            }
+        }
+    }
+}

From c931bae70ec13b10f45c89ad67d223c635046186 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 16 May 2020 03:07:27 +0200
Subject: [PATCH 02766/10326] Add back button to TournamentScreen and the
 inputhandler for it

---
 .../Screens/Editors/TournamentEditorScreen.cs | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 8e5df72cc8..11cb072c6b 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -9,6 +9,9 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
+using osu.Framework.Input.Bindings;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays.Settings;
@@ -17,7 +20,7 @@ using osuTK;
 
 namespace osu.Game.Tournament.Screens.Editors
 {
-    public abstract class TournamentEditorScreen<TDrawable, TModel> : TournamentScreen, IProvideVideo
+    public abstract class TournamentEditorScreen<TDrawable, TModel> : TournamentScreen, IProvideVideo, IKeyBindingHandler<GlobalAction>
         where TDrawable : Drawable, IModelBacked<TModel>
         where TModel : class, new()
     {
@@ -25,8 +28,19 @@ namespace osu.Game.Tournament.Screens.Editors
 
         private FillFlowContainer<TDrawable> flow;
 
+        [Resolved(canBeNull: true)]
+        private TournamentSceneManager sceneManager { get; set; }
+
         protected ControlPanel ControlPanel;
 
+        protected virtual bool IsSubScreen => false;
+
+        protected virtual System.Type ParentScreen { get; set; }
+
+        private BackButton backButton;
+
+        private System.Action backAction => () => sceneManager?.SetScreen(ParentScreen);
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -70,6 +84,19 @@ namespace osu.Game.Tournament.Screens.Editors
                 }
             });
 
+            if (IsSubScreen)
+            {
+                BackButton.Receptor receptor = new BackButton.Receptor();
+                backButton = new BackButton(receptor)
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Action = () => { backAction.Invoke(); }
+                };
+                AddInternal(backButton);
+                backButton.Show();
+            }
+
             Storage.CollectionChanged += (_, args) =>
             {
                 switch (args.Action)
@@ -88,6 +115,22 @@ namespace osu.Game.Tournament.Screens.Editors
                 flow.Add(CreateDrawable(model));
         }
 
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.Back:
+                    backAction.Invoke();
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
+
         protected abstract TDrawable CreateDrawable(TModel model);
     }
 }

From bf6ce390ff39d6db4c82897daf561af332491502 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 16 May 2020 03:07:51 +0200
Subject: [PATCH 02767/10326] Add sub screen implementation to
 SeedingEditorScreen

---
 osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
index 52f761e50a..0f980ec9a3 100644
--- a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
@@ -25,6 +25,13 @@ namespace osu.Game.Tournament.Screens.Editors
 
         protected override BindableList<SeedingResult> Storage => team.SeedingResults;
 
+        [Resolved(canBeNull: true)]
+        private TournamentSceneManager sceneManager { get; set; }
+
+        protected override bool IsSubScreen => true;
+
+        protected override System.Type ParentScreen => typeof(TeamEditorScreen);
+
         public SeedingEditorScreen(TournamentTeam team)
         {
             this.team = team;

From 9d3df14179b740231e25bbb45f1d7b51e94b5840 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 16 May 2020 11:03:27 +0900
Subject: [PATCH 02768/10326] Remove unused variable

---
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index f139a704bc..d27ab63fb7 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly BindableBool rawInputToggle = new BindableBool();
         private Bindable<double> sensitivityBindable = new BindableDouble();
         private Bindable<string> ignoredInputHandler;
-        private SensitivitySetting sensitivity;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
@@ -38,7 +37,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     LabelText = "Raw input",
                     Bindable = rawInputToggle
                 },
-                sensitivity = new SensitivitySetting
+                new SensitivitySetting
                 {
                     LabelText = "Cursor sensitivity",
                     Bindable = sensitivityBindable

From b1243d6a8787a71701898de661a91fd457a827b7 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 16 May 2020 04:05:01 +0200
Subject: [PATCH 02769/10326] Add padding to so the back button is not in the
 way

---
 .../Screens/Editors/TournamentEditorScreen.cs | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 11cb072c6b..bca0814d3a 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -44,6 +44,18 @@ namespace osu.Game.Tournament.Screens.Editors
         [BackgroundDependencyLoader]
         private void load()
         {
+            BackButton.Receptor receptor = new BackButton.Receptor();
+            backButton = new BackButton(receptor)
+            {
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.BottomLeft,
+                Action = () =>
+                {
+                    if (IsSubScreen)
+                        backAction.Invoke();
+                }
+            };
+
             AddRangeInternal(new Drawable[]
             {
                 new Box
@@ -56,6 +68,7 @@ namespace osu.Game.Tournament.Screens.Editors
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
+                    Padding = new MarginPadding { Bottom = backButton.Height },
                     Child = flow = new FillFlowContainer<TDrawable>
                     {
                         Direction = FillDirection.Vertical,
@@ -64,6 +77,7 @@ namespace osu.Game.Tournament.Screens.Editors
                         Spacing = new Vector2(20)
                     },
                 },
+                backButton,
                 ControlPanel = new ControlPanel
                 {
                     Children = new Drawable[]
@@ -85,17 +99,7 @@ namespace osu.Game.Tournament.Screens.Editors
             });
 
             if (IsSubScreen)
-            {
-                BackButton.Receptor receptor = new BackButton.Receptor();
-                backButton = new BackButton(receptor)
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    Action = () => { backAction.Invoke(); }
-                };
-                AddInternal(backButton);
                 backButton.Show();
-            }
 
             Storage.CollectionChanged += (_, args) =>
             {

From 648999a2de9e9cfc0bc25e804337c8d6f2d6cf30 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 16 May 2020 18:17:12 +0900
Subject: [PATCH 02770/10326] Remove all RequiredTypes usages

---
 .../CatchSkinnableTestScene.cs                |  9 -------
 .../TestSceneBananaShower.cs                  | 15 -----------
 .../TestSceneCatcher.cs                       |  9 -------
 .../TestSceneDrawableHitObjects.cs            | 10 -------
 .../TestSceneDrawableHitObjectsHidden.cs      |  5 ----
 .../TestSceneFruitObjects.cs                  | 19 --------------
 .../TestSceneHyperDash.cs                     |  6 -----
 .../Skinning/ManiaSkinnableTestScene.cs       | 10 -------
 .../Skinning/TestSceneDrawableJudgement.cs    |  7 -----
 .../Skinning/TestSceneHitExplosion.cs         |  9 -------
 .../Skinning/TestSceneKeyArea.cs              |  9 -------
 .../Skinning/TestSceneStageBackground.cs      | 10 -------
 .../Skinning/TestSceneStageForeground.cs      |  9 -------
 .../TestSceneColumn.cs                        | 10 -------
 .../TestSceneManiaHitObjectComposer.cs        |  7 -----
 .../TestSceneNotes.cs                         |  8 ------
 .../OsuSkinnableTestScene.cs                  |  9 -------
 .../TestSceneDrawableJudgement.cs             |  7 -----
 .../TestSceneGameplayCursor.cs                | 14 ----------
 .../TestSceneHitCircle.cs                     |  7 -----
 .../TestSceneHitCircleHidden.cs               |  5 ----
 .../TestSceneOsuDistanceSnapGrid.cs           |  7 -----
 .../TestScenePathControlPointVisualiser.cs    | 10 -------
 .../TestSceneResumeOverlay.cs                 |  7 -----
 .../TestSceneSlider.cs                        | 18 -------------
 .../TestSceneSliderHidden.cs                  |  5 ----
 .../TestSceneSliderInput.cs                   | 14 ----------
 .../TestSceneSliderSelectionBlueprint.cs      | 12 ---------
 .../TestSceneSpinner.cs                       | 10 -------
 .../TestSceneSpinnerHidden.cs                 |  5 ----
 .../TestSceneSpinnerSelectionBlueprint.cs     |  9 -------
 .../TestSceneSpinnerSpunOut.cs                | 11 --------
 .../Skinning/TaikoSkinnableTestScene.cs       |  9 -------
 .../Skinning/TestSceneDrawableBarLine.cs      | 11 --------
 .../Skinning/TestSceneDrawableDrumRoll.cs     | 11 --------
 .../Skinning/TestSceneDrawableHit.cs          | 11 --------
 .../Skinning/TestSceneDrawableTaikoMascot.cs  |  7 -----
 .../Skinning/TestSceneHitExplosion.cs         | 11 --------
 .../Skinning/TestSceneInputDrum.cs            | 10 -------
 .../Skinning/TestSceneTaikoPlayfield.cs       | 11 --------
 .../Background/TestSceneUserDimBackgrounds.cs | 11 --------
 .../Editing/TestSceneBeatDivisorControl.cs    |  2 --
 .../TestSceneEditorComposeRadioButtons.cs     |  4 ---
 .../Visual/Editing/TestSceneEditorMenuBar.cs  |  4 ---
 .../Editing/TestSceneEditorSummaryTimeline.cs |  4 ---
 .../Editing/TestSceneHitObjectComposer.cs     | 18 -------------
 .../TestSceneTimelineBlueprintContainer.cs    |  7 -----
 .../Visual/Editing/TestSceneTimingScreen.cs   | 14 ----------
 .../Visual/Editing/TimelineTestScene.cs       | 10 -------
 .../Visual/Gameplay/TestSceneBreakTracker.cs  |  6 -----
 .../Visual/Gameplay/TestSceneFailAnimation.cs |  8 ------
 .../Gameplay/TestSceneGameplayMenuOverlay.cs  |  3 ---
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs |  9 -------
 .../Visual/Gameplay/TestSceneKeyCounter.cs    |  9 -------
 .../Visual/Gameplay/TestSceneMedalOverlay.cs  |  9 -------
 .../TestSceneNightcoreBeatContainer.cs        |  7 -----
 .../Gameplay/TestSceneReplayDownloadButton.cs |  7 -----
 .../Gameplay/TestSceneScrollingHitObjects.cs  |  3 ---
 .../Visual/Gameplay/TestSceneSongProgress.cs  |  6 -----
 osu.Game.Tests/Visual/Menus/IntroTestScene.cs |  9 -------
 .../Visual/Menus/TestSceneToolbar.cs          | 10 -------
 .../TestSceneDrawableRoomPlaylist.cs          |  7 -----
 .../Multiplayer/TestSceneLoungeRoomInfo.cs    |  6 -----
 .../TestSceneLoungeRoomsContainer.cs          |  7 -----
 .../Multiplayer/TestSceneMatchHeader.cs       |  7 -----
 .../TestSceneMatchLeaderboardChatDisplay.cs   |  7 -----
 .../TestSceneMatchSettingsOverlay.cs          |  6 -----
 .../Multiplayer/TestSceneMatchSongSelect.cs   |  6 -----
 .../Multiplayer/TestSceneMatchSubScreen.cs    | 10 -------
 .../Multiplayer/TestSceneMultiScreen.cs       | 11 --------
 .../TestSceneOverlinedParticipants.cs         |  9 -------
 .../Visual/Multiplayer/TestSceneRoomStatus.cs |  9 -------
 .../Online/TestSceneAccountCreationOverlay.cs | 13 ----------
 .../Online/TestSceneBeatmapListingOverlay.cs  |  9 -------
 .../Online/TestSceneBeatmapRulesetSelector.cs |  7 -----
 .../Online/TestSceneBeatmapSetOverlay.cs      | 26 -------------------
 .../TestSceneBeatmapSetOverlayDetails.cs      |  6 -----
 .../TestSceneBeatmapSetOverlaySuccessRate.cs  |  7 -----
 .../Online/TestSceneChangelogOverlay.cs       | 12 ---------
 .../Online/TestSceneChannelTabControl.cs      |  6 -----
 .../Online/TestSceneChatLineTruncation.cs     | 10 -------
 .../Visual/Online/TestSceneChatLink.cs        | 12 ---------
 .../Visual/Online/TestSceneChatOverlay.cs     | 13 ----------
 .../Online/TestSceneCommentsContainer.cs      | 15 -----------
 .../Visual/Online/TestSceneCommentsHeader.cs  |  9 -------
 .../Visual/Online/TestSceneCommentsPage.cs    |  6 -----
 .../Online/TestSceneDashboardOverlay.cs       | 11 --------
 .../Online/TestSceneDirectDownloadButton.cs   |  7 -----
 .../Visual/Online/TestSceneDirectPanel.cs     |  8 ------
 .../Online/TestSceneExternalLinkButton.cs     |  4 ---
 .../Visual/Online/TestSceneFriendDisplay.cs   |  7 -----
 .../Online/TestSceneHistoricalSection.cs      | 10 -------
 .../Visual/Online/TestSceneKudosuHistory.cs   |  5 ----
 .../Online/TestSceneLeaderboardModSelector.cs |  7 -----
 .../TestSceneLeaderboardScopeSelector.cs      |  7 -----
 .../Online/TestSceneProfileCounterPill.cs     |  7 -----
 .../Online/TestSceneProfileRulesetSelector.cs |  8 ------
 .../Visual/Online/TestSceneRankGraph.cs       |  9 -------
 .../Online/TestSceneRankingsCountryFilter.cs  |  8 ------
 .../Visual/Online/TestSceneRankingsHeader.cs  |  9 -------
 .../Visual/Online/TestSceneRankingsOverlay.cs | 15 -----------
 .../TestSceneRankingsSpotlightSelector.cs     |  5 ----
 .../Visual/Online/TestSceneRankingsTables.cs  | 12 ---------
 .../Visual/Online/TestSceneScoresContainer.cs | 10 -------
 .../Visual/Online/TestSceneShowMoreButton.cs  |  7 -----
 .../Visual/Online/TestSceneSocialOverlay.cs   | 11 --------
 .../Online/TestSceneSpotlightsLayout.cs       |  8 ------
 .../Online/TestSceneTotalCommentsCounter.cs   |  7 -----
 .../Visual/Online/TestSceneUserPanel.cs       |  8 ------
 .../Online/TestSceneUserProfileHeader.cs      | 16 ------------
 .../Online/TestSceneUserProfileOverlay.cs     | 13 ----------
 .../TestSceneUserProfilePreviousUsernames.cs  |  6 -----
 .../TestSceneUserProfileRecentSection.cs      | 10 -------
 .../Online/TestSceneUserProfileScores.cs      |  9 -------
 .../Visual/Online/TestSceneUserRanks.cs       | 10 -------
 .../Visual/Online/TestSceneVotePill.cs        |  7 -----
 .../Visual/Ranking/TestSceneAccuracyCircle.cs | 10 -------
 .../TestSceneExpandedPanelMiddleContent.cs    | 15 -----------
 .../Visual/Ranking/TestSceneResultsScreen.cs  |  8 ------
 .../Visual/Ranking/TestSceneScorePanel.cs     |  8 ------
 .../Settings/TestSceneKeyBindingPanel.cs      | 13 ----------
 .../Visual/Settings/TestSceneSettingsPanel.cs |  9 -------
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 15 -----------
 .../SongSelect/TestSceneBeatmapLeaderboard.cs | 11 --------
 .../SongSelect/TestScenePlaySongSelect.cs     | 18 -------------
 osu.Game.Tests/Visual/TestSceneOsuGame.cs     |  5 ----
 .../UserInterface/TestSceneBackButton.cs      |  7 -----
 .../TestSceneBeatSyncedContainer.cs           |  5 ----
 .../TestSceneBeatmapListingSearchControl.cs   |  7 -----
 .../TestSceneBeatmapListingSortTabControl.cs  |  7 -----
 .../TestSceneBeatmapSearchFilter.cs           |  8 ------
 .../UserInterface/TestSceneButtonSystem.cs    |  8 ------
 .../UserInterface/TestSceneCommentEditor.cs   |  8 ------
 .../TestSceneDeleteLocalScore.cs              | 12 ---------
 .../TestSceneFooterButtonMods.cs              |  6 -----
 .../TestSceneFriendsOnlineStatusControl.cs    | 10 -------
 .../TestSceneHoldToConfirmOverlay.cs          |  9 -------
 .../TestSceneLabelledSwitchButton.cs          |  8 ------
 .../UserInterface/TestSceneLabelledTextBox.cs |  7 -----
 .../UserInterface/TestSceneLoadingLayer.cs    |  4 ---
 .../TestSceneLogoTrackingContainer.cs         | 14 ----------
 .../TestSceneModSelectOverlay.cs              | 16 ------------
 .../TestSceneNotificationOverlay.cs           | 11 --------
 .../UserInterface/TestSceneNumberBox.cs       |  7 -----
 .../Visual/UserInterface/TestSceneOsuMenu.cs  |  8 ------
 .../UserInterface/TestSceneOverlayHeader.cs   | 14 ----------
 .../TestSceneOverlayHeaderBackground.cs       |  7 -----
 .../TestSceneOverlayRulesetSelector.cs        |  8 ------
 .../TestSceneOverlayScrollContainer.cs        |  7 -----
 .../UserInterface/TestScenePlaylistOverlay.cs |  7 -----
 .../UserInterface/TestScenePopupDialog.cs     | 11 --------
 .../TestSceneStatefulMenuItem.cs              |  9 -------
 .../UserInterface/TestSceneToggleMenuItem.cs  |  9 -------
 .../TestSceneToolbarRulesetSelector.cs        |  8 ------
 .../UserInterface/TestSceneUserListToolbar.cs | 10 -------
 .../UserInterface/TestSceneVolumePieces.cs    |  4 ---
 .../TestSceneDrawableTournamentMatch.cs       |  9 -------
 .../TestSceneDrawableTournamentTeam.cs        | 13 ----------
 .../Components/TestSceneMatchHeader.cs        |  9 -------
 .../Components/TestSceneRoundDisplay.cs       |  8 ------
 .../Screens/TestSceneGameplayScreen.cs        | 15 -----------
 osu.Game/Tests/Visual/EditorTestScene.cs      |  4 ---
 osu.Game/Tests/Visual/ModTestScene.cs         |  5 ----
 163 files changed, 1471 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
index 0c46b078b5..378772fea3 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
@@ -1,21 +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.Game.Rulesets.Catch.Skinning;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
     public abstract class CatchSkinnableTestScene : SkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(CatchRuleset),
-            typeof(CatchLegacySkinTransformer),
-        };
-
         protected override Ruleset CreateRulesetForSkinProvider() => new CatchRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
index 024c4cefb0..27a2d5bd0a 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.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;
-using System.Collections.Generic;
 using NUnit.Framework;
 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;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -15,17 +11,6 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class TestSceneBananaShower : PlayerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(BananaShower),
-            typeof(Banana),
-            typeof(DrawableBananaShower),
-            typeof(DrawableBanana),
-
-            typeof(CatchRuleset),
-            typeof(DrawableCatchRuleset),
-        };
-
         public TestSceneBananaShower()
             : base(new CatchRuleset())
         {
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 3a3e664690..6eeda2c731 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -4,9 +4,6 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Catch.UI;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
@@ -15,12 +12,6 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class TestSceneCatcher : CatchSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(CatcherArea),
-            typeof(CatcherSprite)
-        }).ToList();
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
index df5494aab0..a7094c00be 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.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.Linq;
 using NUnit.Framework;
@@ -22,15 +21,6 @@ namespace osu.Game.Rulesets.Catch.Tests
 {
     public class TestSceneDrawableHitObjects : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Catcher),
-            typeof(DrawableCatchRuleset),
-            typeof(DrawableFruit),
-            typeof(DrawableJuiceStream),
-            typeof(DrawableBanana)
-        };
-
         private DrawableCatchRuleset drawableRuleset;
         private double playfieldTime => drawableRuleset.Playfield.Time.Current;
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs
index 8c3dfef39c..62fe5dca2c 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.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.Catch.Mods;
 
@@ -11,8 +8,6 @@ namespace osu.Game.Rulesets.Catch.Tests
 {
     public class TestSceneDrawableHitObjectsHidden : TestSceneDrawableHitObjects
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(CatchModHidden) }).ToList();
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index cd674bb754..c07e4fdad3 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -2,13 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
-using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -16,22 +13,6 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class TestSceneFruitObjects : CatchSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(CatchHitObject),
-            typeof(Fruit),
-            typeof(FruitPiece),
-            typeof(Droplet),
-            typeof(Banana),
-            typeof(BananaShower),
-            typeof(DrawableCatchHitObject),
-            typeof(DrawableFruit),
-            typeof(DrawableDroplet),
-            typeof(DrawableBanana),
-            typeof(DrawableBananaShower),
-            typeof(Pulp),
-        }).ToList();
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 49ff9df4d7..0a142a52f8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.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 NUnit.Framework;
 using osu.Framework.Testing;
@@ -18,11 +17,6 @@ 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.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index a3c1d518c5..1d84a2dfcb 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.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 System;
-using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osu.Game.Tests.Visual;
@@ -27,13 +24,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ManiaRuleset),
-            typeof(ManiaLegacySkinTransformer),
-            typeof(ManiaSettingsSubsection)
-        };
-
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
         protected ManiaSkinnableTestScene()
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
index 6ab8a68176..497b80950a 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.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 osu.Framework.Extensions;
 using osu.Framework.Graphics;
@@ -15,12 +14,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
     public class TestSceneDrawableJudgement : ManiaSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DrawableJudgement),
-            typeof(DrawableManiaJudgement)
-        };
-
         public TestSceneDrawableJudgement()
         {
             foreach (HitResult result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
index 5f046574ba..a692c0b697 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.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 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.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
@@ -21,12 +18,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
     [TestFixture]
     public class TestSceneHitExplosion : ManiaSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DrawableNote),
-            typeof(DrawableManiaHitObject),
-        };
-
         public TestSceneHitExplosion()
         {
             int runcount = 0;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
index c8f901285a..7e80419944 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
@@ -1,12 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Skinning;
 using osuTK;
@@ -15,12 +12,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
     public class TestSceneKeyArea : ManiaSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DefaultKeyArea),
-            typeof(LegacyKeyArea)
-        };
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
index a8fc68188a..87c84cf89c 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
@@ -1,12 +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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Skinning;
 
@@ -14,12 +10,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
     public class TestSceneStageBackground : ManiaSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(DefaultStageBackground),
-            typeof(LegacyStageBackground),
-        }).ToList();
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
index d436445b59..4e99068ed5 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
@@ -1,23 +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;
-using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
     public class TestSceneStageForeground : ManiaSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(LegacyStageForeground),
-        }).ToList();
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index 5e06002f41..d9b1ad22fa 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -12,7 +12,6 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
@@ -24,15 +23,6 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class TestSceneColumn : ManiaInputTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Column),
-            typeof(ColumnBackground),
-            typeof(ColumnHitObjectArea),
-            typeof(DefaultKeyArea),
-            typeof(DefaultHitTarget)
-        };
-
         [Cached(typeof(IReadOnlyList<Mod>))]
         private IReadOnlyList<Mod> mods { get; set; } = Array.Empty<Mod>();
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
index 48159c817d..6274bb1005 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.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;
@@ -29,11 +27,6 @@ namespace osu.Game.Rulesets.Mania.Tests
 {
     public class TestSceneManiaHitObjectComposer : EditorClockTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ManiaBlueprintContainer)
-        };
-
         private TestComposer composer;
 
         [SetUp]
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 8dae5e6d84..ea6a1e2e6a 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.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;
@@ -30,12 +28,6 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class TestSceneNotes : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DrawableNote),
-            typeof(DrawableHoldNote)
-        };
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
index 90ebbd9f04..a0a38fc47b 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
@@ -1,21 +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.Game.Rulesets.Osu.Skinning;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     public abstract class OsuSkinnableTestScene : SkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OsuRuleset),
-            typeof(OsuLegacySkinTransformer),
-        };
-
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index f867630df6..c81edf4e07 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.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 osu.Framework.Extensions;
 using osu.Framework.Graphics;
@@ -15,12 +14,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneDrawableJudgement : OsuSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(DrawableJudgement),
-            typeof(DrawableOsuJudgement)
-        }).ToList();
-
         public TestSceneDrawableJudgement()
         {
             foreach (HitResult result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index 22dacc6f5e..38c2bb9b95 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -2,16 +2,12 @@
 // 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;
 using osu.Framework.Graphics;
 using osu.Framework.Testing.Input;
 using osu.Game.Configuration;
-using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.UI.Cursor;
-using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 using osuTK;
 
@@ -20,16 +16,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneGameplayCursor : OsuSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(GameplayCursorContainer),
-            typeof(OsuCursorContainer),
-            typeof(OsuCursor),
-            typeof(LegacyCursor),
-            typeof(LegacyCursorTrail),
-            typeof(CursorTrail)
-        }).ToList();
-
         [Cached]
         private GameplayBeatmap gameplayBeatmap;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index e117729f01..37df0d6e37 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -8,8 +8,6 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
-using System.Collections.Generic;
-using System;
 using osu.Game.Rulesets.Mods;
 using System.Linq;
 using NUnit.Framework;
@@ -20,11 +18,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneHitCircle : OsuSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DrawableHitCircle)
-        };
-
         private int depthIndex;
 
         public TestSceneHitCircle()
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs
index 21ebce8c23..45125204b6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.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;
 
@@ -12,8 +9,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneHitCircleHidden : TestSceneHitCircle
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
index 0ae49790cd..c182aa5d63 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
@@ -2,7 +2,6 @@
 // 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;
@@ -16,7 +15,6 @@ using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Edit;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Tests.Visual;
 using osuTK;
 using osuTK.Graphics;
@@ -28,11 +26,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         private const double beat_length = 100;
         private static readonly Vector2 grid_position = new Vector2(512, 384);
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(CircularDistanceSnapGrid)
-        };
-
         [Cached(typeof(EditorBeatmap))]
         private readonly EditorBeatmap editorBeatmap;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/TestScenePathControlPointVisualiser.cs
index cbe14ff4d2..21fa283b6d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestScenePathControlPointVisualiser.cs
@@ -1,10 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using Humanizer;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
@@ -19,13 +16,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestScenePathControlPointVisualiser : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(StringHumanizeExtensions),
-            typeof(PathControlPointPiece),
-            typeof(PathControlPointConnectionPiece)
-        };
-
         private Slider slider;
         private PathControlPointVisualiser visualiser;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
index f4809b0c9b..a7967c407a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -14,11 +12,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneResumeOverlay : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OsuResumeOverlay),
-        };
-
         public TestSceneResumeOverlay()
         {
             ManualOsuInputManager osuInputManager;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index eb6130c8a6..a9404f665a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -21,29 +20,12 @@ using osu.Game.Rulesets.Judgements;
 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;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
     public class TestSceneSlider : OsuSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Slider),
-            typeof(SliderTick),
-            typeof(SliderTailCircle),
-            typeof(SliderBall),
-            typeof(SliderBody),
-            typeof(SnakingSliderBody),
-            typeof(DrawableSlider),
-            typeof(DrawableSliderTick),
-            typeof(DrawableSliderTail),
-            typeof(DrawableSliderHead),
-            typeof(DrawableSliderRepeat),
-            typeof(DrawableOsuHitObject)
-        };
-
         private Container content;
 
         protected override Container<Drawable> Content
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs
index d0ee1bddb5..b2bd727c6a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.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;
 
@@ -12,8 +9,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneSliderHidden : TestSceneSlider
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index b0c2e56c3e..b543b6fa94 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.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.Linq;
 using NUnit.Framework;
@@ -13,8 +12,6 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
@@ -27,17 +24,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneSliderInput : RateAdjustedBeatmapTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(SliderBall),
-            typeof(DrawableSlider),
-            typeof(DrawableSliderTick),
-            typeof(DrawableSliderRepeat),
-            typeof(DrawableOsuHitObject),
-            typeof(DrawableSliderHead),
-            typeof(DrawableSliderTail),
-        };
-
         private const double time_before_slider = 250;
         private const double time_slider_start = 1500;
         private const double time_during_slide_1 = 2500;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs
index 5dd2bd18a8..d5be538d94 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.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 NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -22,16 +20,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneSliderSelectionBlueprint : SelectionBlueprintTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(SliderSelectionBlueprint),
-            typeof(SliderCircleSelectionBlueprint),
-            typeof(SliderBodyPiece),
-            typeof(SliderCircle),
-            typeof(PathControlPointVisualiser),
-            typeof(PathControlPointPiece)
-        };
-
         private Slider slider;
         private DrawableSlider drawableObject;
         private TestSliderBlueprint blueprint;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index f53b64c729..65bed071cd 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.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.Graphics;
@@ -12,7 +10,6 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -20,13 +17,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneSpinner : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(SpinnerDisc),
-            typeof(DrawableSpinner),
-            typeof(DrawableOsuHitObject)
-        };
-
         private readonly Container content;
         protected override Container<Drawable> Content => content;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs
index dd863deed2..91b6a05fe3 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.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;
 
@@ -12,8 +9,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneSpinnerHidden : TestSceneSpinner
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs
index d777ca3610..011463ab14 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs
@@ -1,14 +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.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners;
-using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Tests.Visual;
@@ -18,12 +15,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneSpinnerSelectionBlueprint : SelectionBlueprintTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(SpinnerSelectionBlueprint),
-            typeof(SpinnerPiece)
-        };
-
         public TestSceneSpinnerSelectionBlueprint()
         {
             var spinner = new Spinner
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs
index e406f9ddff..d1210db6b1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.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.Graphics;
@@ -12,7 +10,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -20,14 +17,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneSpinnerSpunOut : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(SpinnerDisc),
-            typeof(DrawableSpinner),
-            typeof(DrawableOsuHitObject),
-            typeof(OsuModSpunOut)
-        };
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TaikoSkinnableTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TaikoSkinnableTestScene.cs
index 161154b1a7..69250a14e1 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TaikoSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TaikoSkinnableTestScene.cs
@@ -1,21 +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.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 {
     public abstract class TaikoSkinnableTestScene : SkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(TaikoRuleset),
-            typeof(TaikoLegacySkinTransformer),
-        };
-
         protected override Ruleset CreateRulesetForSkinProvider() => new TaikoRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
index 70493aa69a..f6aec20d53 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.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.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -12,7 +9,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
@@ -22,13 +18,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     [TestFixture]
     public class TestSceneDrawableBarLine : TaikoSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(DrawableBarLine),
-            typeof(LegacyBarLine),
-            typeof(BarLine),
-        }).ToList();
-
         [Cached(typeof(IScrollingInfo))]
         private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
         {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs
index 554894bf68..44646e5fc9 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.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.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -11,7 +8,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
 
@@ -20,13 +16,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     [TestFixture]
     public class TestSceneDrawableDrumRoll : TaikoSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(DrawableDrumRoll),
-            typeof(DrawableDrumRollTick),
-            typeof(LegacyDrumRoll),
-        }).ToList();
-
         [Cached(typeof(IScrollingInfo))]
         private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
         {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
index 6a3c98a514..9930d97d31 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.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.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -11,20 +8,12 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 {
     [TestFixture]
     public class TestSceneDrawableHit : TaikoSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(DrawableHit),
-            typeof(LegacyHit),
-            typeof(LegacyCirclePiece),
-        }).ToList();
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index bd3b360577..d200c44a02 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.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.Linq;
 using Humanizer;
@@ -27,12 +26,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     [TestFixture]
     public class TestSceneDrawableTaikoMascot : TaikoSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(DrawableTaikoMascot),
-            typeof(TaikoMascotAnimation)
-        }).ToList();
-
         [Cached(typeof(IScrollingInfo))]
         private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
         {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index 791c438c94..2b5efec7f9 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.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.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -11,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.Taiko.UI;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Skinning
@@ -19,13 +15,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     [TestFixture]
     public class TestSceneHitExplosion : TaikoSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(HitExplosion),
-            typeof(LegacyHitExplosion),
-            typeof(DefaultHitExplosion),
-        }).ToList();
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
index 412027ca61..fa6c9da174 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
@@ -1,15 +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.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.Taiko.UI;
 using osuTK;
 
@@ -18,12 +14,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     [TestFixture]
     public class TestSceneInputDrum : TaikoSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(InputDrum),
-            typeof(LegacyInputDrum),
-        }).ToList();
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
index e02ad53ed8..7b7e2c43d1 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
@@ -2,15 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Taiko.Beatmaps;
-using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
@@ -19,14 +16,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 {
     public class TestSceneTaikoPlayfield : TaikoSkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
-        {
-            typeof(TaikoHitTarget),
-            typeof(TaikoLegacyHitTarget),
-            typeof(PlayfieldBackgroundRight),
-            typeof(LegacyTaikoScroller),
-        }).ToList();
-
         [Cached(typeof(IScrollingInfo))]
         private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
         {
diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index f97aa48f11..76d0c7a50f 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.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 System.Threading;
 using NUnit.Framework;
@@ -39,15 +37,6 @@ namespace osu.Game.Tests.Visual.Background
     [TestFixture]
     public class TestSceneUserDimBackgrounds : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ScreenWithBeatmapBackground),
-            typeof(PlayerLoader),
-            typeof(Player),
-            typeof(UserDimContainer),
-            typeof(OsuScreen)
-        };
-
         private DummySongSelect songSelect;
         private TestPlayerLoader playerLoader;
         private LoadBlockingTestPlayer player;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index f6e69fd8bf..6cf5e6a987 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.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 NUnit.Framework;
 using osu.Framework.Graphics;
@@ -18,7 +17,6 @@ namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneBeatDivisorControl : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(BindableBeatDivisor) };
         private BeatDivisorControl beatDivisorControl;
         private BindableBeatDivisor bindableBeatDivisor;
 
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
index 2deeaef1f6..e4d7e025a8 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit.Components.RadioButtons;
@@ -12,8 +10,6 @@ namespace osu.Game.Tests.Visual.Editing
     [TestFixture]
     public class TestSceneEditorComposeRadioButtons : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(DrawableRadioButton) };
-
         public TestSceneEditorComposeRadioButtons()
         {
             RadioButtonCollection collection;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
index 2cbdacb61c..3cb44d9ae8 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -15,8 +13,6 @@ namespace osu.Game.Tests.Visual.Editing
     [TestFixture]
     public class TestSceneEditorMenuBar : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(EditorMenuBar), typeof(ScreenSelectionTabControl) };
-
         public TestSceneEditorMenuBar()
         {
             Add(new Container
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
index c92423545d..3adc1bd425 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -15,8 +13,6 @@ namespace osu.Game.Tests.Visual.Editing
     [TestFixture]
     public class TestSceneEditorSummaryTimeline : EditorClockTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(SummaryTimeline) };
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
index ddaca26220..7ca24346aa 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
@@ -1,9 +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 JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Timing;
@@ -13,11 +11,8 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Edit;
-using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
-using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Editing
@@ -25,19 +20,6 @@ namespace osu.Game.Tests.Visual.Editing
     [TestFixture]
     public class TestSceneHitObjectComposer : EditorClockTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(SelectionHandler),
-            typeof(DragBox),
-            typeof(HitObjectComposer),
-            typeof(OsuHitObjectComposer),
-            typeof(BlueprintContainer),
-            typeof(NotNullAttribute),
-            typeof(HitCirclePiece),
-            typeof(HitCircleSelectionBlueprint),
-            typeof(HitCirclePlacementBlueprint),
-        };
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
index 5ab2f49b4a..e931be044c 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
@@ -12,11 +10,6 @@ namespace osu.Game.Tests.Visual.Editing
     [TestFixture]
     public class TestSceneTimelineBlueprintContainer : TimelineTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(TimelineHitObjectBlueprint),
-        };
-
         public override Drawable CreateTestComponent() => new TimelineBlueprintContainer();
 
         protected override void LoadComplete()
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
index a6dbe9571e..2a7f9389d1 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Osu.Beatmaps;
@@ -14,18 +12,6 @@ namespace osu.Game.Tests.Visual.Editing
     [TestFixture]
     public class TestSceneTimingScreen : EditorClockTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ControlPointTable),
-            typeof(ControlPointSettings),
-            typeof(Section<>),
-            typeof(TimingSection),
-            typeof(EffectSection),
-            typeof(SampleSection),
-            typeof(DifficultySection),
-            typeof(RowAttribute)
-        };
-
         [Cached(typeof(EditorBeatmap))]
         private readonly EditorBeatmap editorBeatmap;
 
diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 56b2860e96..01ef7e6170 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.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 osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
@@ -22,14 +20,6 @@ namespace osu.Game.Tests.Visual.Editing
 {
     public abstract class TimelineTestScene : EditorClockTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(TimelineArea),
-            typeof(Timeline),
-            typeof(TimelineButton),
-            typeof(CentreMarker)
-        };
-
         protected TimelineArea TimelineArea { get; private set; }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
index a6f996c30d..be17721b88 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBreakTracker.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.Linq;
 using NUnit.Framework;
@@ -15,11 +14,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneBreakTracker : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(BreakOverlay),
-        };
-
         private readonly BreakOverlay breakOverlay;
 
         private readonly TestBreakTracker breakTracker;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs
index de257c9e53..85aaf20a19 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.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.Graphics.Containers;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -18,13 +17,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             return new FailPlayer();
         }
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(TestSceneAllRulesetPlayers),
-            typeof(TestPlayer),
-            typeof(Player),
-        };
-
         protected override void AddCheckSteps()
         {
             AddUntilStep("wait for fail", () => Player.HasFailed);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
index ea3e0c2293..e8b8c7c8e9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -20,8 +19,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     [Description("player pause/fail screens")]
     public class TestSceneGameplayMenuOverlay : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(FailOverlay), typeof(PauseOverlay) };
-
         private FailOverlay failOverlay;
         private PauseOverlay pauseOverlay;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 1527cba6fc..253b8d9c55 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
 using osu.Game.Rulesets.Judgements;
 using osu.Framework.Utils;
 using osu.Framework.Graphics;
@@ -22,13 +20,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneHitErrorMeter : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(HitErrorMeter),
-            typeof(BarHitErrorMeter),
-            typeof(ColourHitErrorMeter)
-        };
-
         private BarHitErrorMeter barMeter;
         private BarHitErrorMeter barMeter2;
         private ColourHitErrorMeter colourMeter;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 593dcd245c..d7a3f80256 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.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.Graphics;
@@ -15,13 +13,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneKeyCounter : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(KeyCounterKeyboard),
-            typeof(KeyCounterMouse),
-            typeof(KeyCounterDisplay)
-        };
-
         public TestSceneKeyCounter()
         {
             KeyCounterKeyboard testCounter;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMedalOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMedalOverlay.cs
index 41722b430e..0ada3cf05f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMedalOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMedalOverlay.cs
@@ -1,11 +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.Game.Overlays;
-using osu.Game.Overlays.MedalSplash;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -13,12 +10,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneMedalOverlay : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(MedalOverlay),
-            typeof(DrawableMedal),
-        };
-
         public TestSceneMedalOverlay()
         {
             AddStep(@"display", () =>
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
index 3473b03eaf..951ee1489d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.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 osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Beatmaps.Timing;
@@ -15,11 +13,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneNightcoreBeatContainer : TestSceneBeatSyncedContainer
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ModNightcore<>)
-        };
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
index c9561a70fa..a35437a286 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
@@ -7,8 +7,6 @@ using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Scoring;
 using osu.Game.Users;
-using System;
-using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Ranking;
@@ -21,11 +19,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ReplayDownloadButton)
-        };
-
         private TestReplayDownloadButton downloadButton;
 
         public TestSceneReplayDownloadButton()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
index d03716db2e..0d15e495e3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
@@ -17,7 +17,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Timing;
-using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Graphics;
@@ -27,8 +26,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneScrollingHitObjects : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Playfield) };
-
         [Cached(typeof(IReadOnlyList<Mod>))]
         private IReadOnlyList<Mod> mods { get; set; } = Array.Empty<Mod>();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index b9b13d7bd8..733e8f4290 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -20,11 +19,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneSongProgress : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(SongProgressBar),
-        };
-
         private SongProgress progress;
         private TestSongProgressGraph graph;
         private readonly Container progressContainer;
diff --git a/osu.Game.Tests/Visual/Menus/IntroTestScene.cs b/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
index 33811f9529..2d2f1a1618 100644
--- a/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
+++ b/osu.Game.Tests/Visual/Menus/IntroTestScene.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -18,13 +16,6 @@ namespace osu.Game.Tests.Visual.Menus
     [TestFixture]
     public abstract class IntroTestScene : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(StartupScreen),
-            typeof(IntroScreen),
-            typeof(IntroTestScene),
-        };
-
         [Cached]
         private OsuLogo logo;
 
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index 8fbbc8ebd8..b4985cad9f 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.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;
@@ -17,14 +15,6 @@ namespace osu.Game.Tests.Visual.Menus
     [TestFixture]
     public class TestSceneToolbar : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ToolbarButton),
-            typeof(ToolbarRulesetSelector),
-            typeof(ToolbarRulesetTabButton),
-            typeof(ToolbarNotificationButton),
-        };
-
         private Toolbar toolbar;
 
         [Resolved]
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 713ba13439..5ef4dd6773 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.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.Linq;
 using NUnit.Framework;
@@ -22,12 +21,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneDrawableRoomPlaylist : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DrawableRoomPlaylist),
-            typeof(DrawableRoomPlaylistItem)
-        };
-
         private TestPlaylist playlist;
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
index 1e1bc9725c..8b74eb5f27 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -2,7 +2,6 @@
 // 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;
@@ -14,11 +13,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneLoungeRoomInfo : MultiplayerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(RoomInfo)
-        };
-
         [SetUp]
         public void Setup() => Schedule(() =>
         {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index b5d946d049..77b41c89b0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -23,12 +22,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneLoungeRoomsContainer : MultiplayerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(RoomsContainer),
-            typeof(DrawableRoom)
-        };
-
         [Cached(Type = typeof(IRoomManager))]
         private TestRoomManager roomManager = new TestRoomManager();
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index cf40995fc0..38eb3181bf 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.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 osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
@@ -14,11 +12,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMatchHeader : MultiplayerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Header)
-        };
-
         public TestSceneMatchHeader()
         {
             Room.Playlist.Add(new PlaylistItem
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs
index e46386b263..72bbc11cd0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Multi.Match.Components;
@@ -12,11 +10,6 @@ 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()
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 047e9d860d..d2e8c22c39 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -2,7 +2,6 @@
 // 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;
@@ -18,11 +17,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMatchSettingsOverlay : MultiplayerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(MatchSettingsOverlay)
-        };
-
         [Cached(Type = typeof(IRoomManager))]
         private TestRoomManager roomManager = new TestRoomManager();
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 2c6f34d8a6..5cff2d7d05 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -23,12 +23,6 @@ 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; }
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index 7f79e306ad..d678d5a814 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -20,7 +19,6 @@ 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
 {
@@ -28,14 +26,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Screens.Multi.Multiplayer),
-            typeof(MatchSubScreen),
-            typeof(Header),
-            typeof(Footer)
-        };
-
         [Cached(typeof(IRoomManager))]
         private readonly TestRoomManager roomManager = new TestRoomManager();
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
index dfe61a4dda..61859c9da3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
@@ -1,11 +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 NUnit.Framework;
-using osu.Game.Screens.Multi.Lounge;
-using osu.Game.Screens.Multi.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -14,13 +10,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Screens.Multi.Multiplayer),
-            typeof(LoungeSubScreen),
-            typeof(FilterControl)
-        };
-
         public TestSceneMultiScreen()
         {
             Screens.Multi.Multiplayer multi = new Screens.Multi.Multiplayer();
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
index 1fc258a225..7ea3bba23f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Multi.Components;
@@ -12,13 +10,6 @@ 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()
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
index 74d1645f6d..1925e0ef4f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
@@ -13,13 +11,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneRoomStatus : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(RoomStatusEnded),
-            typeof(RoomStatusOpen),
-            typeof(RoomStatusPlaying)
-        };
-
         public TestSceneRoomStatus()
         {
             Child = new FillFlowContainer
diff --git a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
index a53a818065..6c8ec917ba 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
@@ -1,30 +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 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.AccountCreation;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneAccountCreationOverlay : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ErrorTextFlowContainer),
-            typeof(AccountCreationBackground),
-            typeof(ScreenEntry),
-            typeof(ScreenWarning),
-            typeof(ScreenWelcome),
-            typeof(AccountCreationScreen),
-        };
-
         private readonly Container userPanelArea;
 
         private Bindable<User> localUser;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 64d1a9ddcd..6cb1687d1f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -1,22 +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.Collections.Generic;
 using osu.Game.Overlays;
 using NUnit.Framework;
-using osu.Game.Overlays.BeatmapListing;
 
 namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneBeatmapListingOverlay : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(BeatmapListingOverlay),
-            typeof(BeatmapListingFilterControl)
-        };
-
         protected override bool UseOnlineAPI => true;
 
         private readonly BeatmapListingOverlay overlay;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs
index 8b077c8de3..eb34187cd6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs
@@ -8,7 +8,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Rulesets;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -16,12 +15,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneBeatmapRulesetSelector : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(BeatmapRulesetSelector),
-            typeof(BeatmapRulesetTabItem),
-        };
-
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index 5ca2c9868f..c5d1fd6887 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -6,8 +6,6 @@ using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapSet;
-using osu.Game.Overlays.BeatmapSet.Buttons;
-using osu.Game.Overlays.BeatmapSet.Scores;
 using osu.Game.Rulesets;
 using osu.Game.Users;
 using System;
@@ -21,30 +19,6 @@ namespace osu.Game.Tests.Visual.Online
     {
         private readonly TestBeatmapSetOverlay overlay;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Header),
-            typeof(ScoreTable),
-            typeof(ScoreTableRowBackground),
-            typeof(DrawableTopScore),
-            typeof(ScoresContainer),
-            typeof(AuthorInfo),
-            typeof(BasicStats),
-            typeof(BeatmapPicker),
-            typeof(Details),
-            typeof(HeaderDownloadButton),
-            typeof(FavouriteButton),
-            typeof(Header),
-            typeof(HeaderButton),
-            typeof(Info),
-            typeof(PreviewButton),
-            typeof(SuccessRate),
-            typeof(BeatmapAvailability),
-            typeof(BeatmapRulesetSelector),
-            typeof(BeatmapRulesetTabItem),
-            typeof(NotSupporterPlaceholder)
-        };
-
         protected override bool UseOnlineAPI => true;
 
         public TestSceneBeatmapSetOverlay()
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs
index dea1e710b5..f7099b0615 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.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.Linq;
 using NUnit.Framework;
@@ -17,11 +16,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneBeatmapSetOverlayDetails : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Details)
-        };
-
         private RatingsExposingDetails details;
 
         [Cached]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
index 03003daf81..4cb22bf1fe 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.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;
@@ -21,11 +19,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneBeatmapSetOverlaySuccessRate : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Details)
-        };
-
         private GraphExposingSuccessRate successRate;
 
         [Cached]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 22d20f7098..02f6de2269 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.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 NUnit.Framework;
 using osu.Game.Online.API.Requests.Responses;
@@ -15,17 +14,6 @@ namespace osu.Game.Tests.Visual.Online
     {
         private TestChangelogOverlay changelog;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ChangelogUpdateStreamControl),
-            typeof(ChangelogUpdateStreamItem),
-            typeof(ChangelogHeader),
-            typeof(ChangelogContent),
-            typeof(ChangelogListing),
-            typeof(ChangelogSingleBuild),
-            typeof(ChangelogBuild),
-        };
-
         protected override bool UseOnlineAPI => true;
 
         [SetUp]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChannelTabControl.cs b/osu.Game.Tests/Visual/Online/TestSceneChannelTabControl.cs
index 1fb3f4ba45..73e1fc9b35 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChannelTabControl.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChannelTabControl.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.Linq;
 using osu.Framework.Extensions.Color4Extensions;
@@ -21,11 +20,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneChannelTabControl : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ChannelTabControl),
-        };
-
         private readonly TestTabControl channelTabControl;
 
         public TestSceneChannelTabControl()
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs
index 4773e84a5e..8408b7dd60 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs
@@ -2,12 +2,10 @@
 // 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.Graphics.Containers;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays.Chat;
 using osu.Game.Users;
@@ -19,14 +17,6 @@ namespace osu.Game.Tests.Visual.Online
     {
         private readonly TestChatLineContainer textContainer;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ChatLine),
-            typeof(Message),
-            typeof(LinkFlowContainer),
-            typeof(MessageFormatter)
-        };
-
         public TestSceneChatLineTruncation()
         {
             Add(textContainer = new TestChatLineContainer
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index 7a257a1603..9e69530a77 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -11,7 +10,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Chat;
@@ -27,16 +25,6 @@ namespace osu.Game.Tests.Visual.Online
         private readonly DialogOverlay dialogOverlay;
         private Color4 linkColour;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ChatLine),
-            typeof(Message),
-            typeof(LinkFlowContainer),
-            typeof(DummyEchoMessage),
-            typeof(LocalEchoMessage),
-            typeof(MessageFormatter)
-        };
-
         public TestSceneChatLink()
         {
             Add(dialogOverlay = new DialogOverlay { Depth = float.MinValue });
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 14924dda21..05b33e4386 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.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.Linq;
 using NUnit.Framework;
@@ -14,7 +13,6 @@ using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Chat;
 using osu.Game.Overlays.Chat.Selection;
 using osu.Game.Overlays.Chat.Tabs;
 using osu.Game.Users;
@@ -24,17 +22,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneChatOverlay : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ChatLine),
-            typeof(DrawableChannel),
-            typeof(ChannelSelectorTabItem),
-            typeof(ChannelTabControl),
-            typeof(ChannelTabItem),
-            typeof(PrivateChannelTabItem),
-            typeof(TabCloseButton)
-        };
-
         private TestChatOverlay chatOverlay;
         private ChannelManager channelManager;
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index ece280659c..42e6b9087c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.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 NUnit.Framework;
 using osu.Game.Online.API.Requests;
 using osu.Framework.Graphics.Containers;
@@ -18,19 +16,6 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneCommentsContainer : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(CommentsContainer),
-            typeof(CommentsHeader),
-            typeof(DrawableComment),
-            typeof(HeaderButton),
-            typeof(OverlaySortTabControl<>),
-            typeof(ShowChildrenButton),
-            typeof(DeletedCommentsCounter),
-            typeof(VotePill),
-            typeof(CommentsPage),
-        };
-
         protected override bool UseOnlineAPI => true;
 
         [Cached]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
index c688d600a3..03eac5d85b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -14,13 +12,6 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneCommentsHeader : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(CommentsHeader),
-            typeof(HeaderButton),
-            typeof(OverlaySortTabControl<>),
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
index a28a0107a1..7fdf0708e0 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
@@ -20,12 +20,6 @@ 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);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.cs
index df95f24686..960d3fa248 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.cs
@@ -1,24 +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.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Dashboard;
-using osu.Game.Overlays.Dashboard.Friends;
 
 namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneDashboardOverlay : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DashboardOverlay),
-            typeof(DashboardOverlayHeader),
-            typeof(FriendDisplay)
-        };
-
         protected override bool UseOnlineAPI => true;
 
         private readonly DashboardOverlay overlay;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
index 9fe873cb6a..684ce10820 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.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;
@@ -18,11 +16,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneDirectDownloadButton : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(BeatmapPanelDownloadButton)
-        };
-
         private TestDownloadButton downloadButton;
 
         [Resolved]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
index d6ed654bac..74ece5da05 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -18,13 +17,6 @@ namespace osu.Game.Tests.Visual.Online
     [Cached(typeof(IPreviewTrackOwner))]
     public class TestSceneDirectPanel : OsuTestScene, IPreviewTrackOwner
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(GridBeatmapPanel),
-            typeof(ListBeatmapPanel),
-            typeof(IconPill)
-        };
-
         private BeatmapSetInfo getUndownloadableBeatmapSet() => new BeatmapSetInfo
         {
             OnlineBeatmapSetID = 123,
diff --git a/osu.Game.Tests/Visual/Online/TestSceneExternalLinkButton.cs b/osu.Game.Tests/Visual/Online/TestSceneExternalLinkButton.cs
index 637b577021..31bb276cd4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneExternalLinkButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneExternalLinkButton.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 osu.Game.Graphics.UserInterface;
 using osuTK;
 
@@ -10,8 +8,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneExternalLinkButton : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ExternalLinkButton) };
-
         public TestSceneExternalLinkButton()
         {
             Child = new ExternalLinkButton("https://osu.ppy.sh/home")
diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
index 0b5ff1c960..72033fc121 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
@@ -16,13 +16,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneFriendDisplay : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(FriendDisplay),
-            typeof(FriendOnlineStreamControl),
-            typeof(UserListToolbar)
-        };
-
         protected override bool UseOnlineAPI => true;
 
         [Cached]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs b/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
index d098ea8b16..3ecca85ef1 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -11,7 +9,6 @@ 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;
 
 namespace osu.Game.Tests.Visual.Online
@@ -21,13 +18,6 @@ namespace osu.Game.Tests.Visual.Online
     {
         protected override bool UseOnlineAPI => true;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(HistoricalSection),
-            typeof(PaginatedMostPlayedBeatmapContainer),
-            typeof(DrawableMostPlayedBeatmap),
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneKudosuHistory.cs b/osu.Game.Tests/Visual/Online/TestSceneKudosuHistory.cs
index 325d657f0e..2231139856 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneKudosuHistory.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneKudosuHistory.cs
@@ -16,11 +16,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneKudosuHistory : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DrawableKudosuHistoryItem),
-        };
-
         private readonly Box background;
 
         public TestSceneKudosuHistory()
diff --git a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
index 7327e80d06..54e655d4ec 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Overlays.BeatmapSet;
-using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Graphics;
@@ -23,11 +21,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneLeaderboardModSelector : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(LeaderboardModSelector),
-        };
-
         public TestSceneLeaderboardModSelector()
         {
             LeaderboardModSelector modSelector;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs
index f9a7bc99c3..afa559280c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Overlays.BeatmapSet;
-using System;
-using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Screens.Select.Leaderboards;
@@ -17,11 +15,6 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(LeaderboardScopeSelector),
-        };
-
         public TestSceneLeaderboardScopeSelector()
         {
             Bindable<BeatmapLeaderboardScope> scope = new Bindable<BeatmapLeaderboardScope>();
diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
index 5e2b125521..eaa989f0de 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -14,11 +12,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneProfileCounterPill : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(CounterPill)
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
index 826624f686..6a847e4269 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
@@ -3,8 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Profile.Header.Components;
-using System;
-using System.Collections.Generic;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
@@ -18,12 +16,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneProfileRulesetSelector : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ProfileRulesetSelector),
-            typeof(ProfileRulesetTabItem),
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
index 8f7e7498a9..3b31192259 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankGraph.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 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;
@@ -20,12 +17,6 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneRankGraph : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(RankGraph),
-            typeof(LineGraph)
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
index 79862deb16..458ba80712 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.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 osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Rankings;
@@ -18,12 +16,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneRankingsCountryFilter : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(CountryFilter),
-            typeof(CountryPill)
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
index 1e711b3cd7..677952681c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Overlays;
@@ -14,13 +12,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneRankingsHeader : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(RankingsOverlayHeader),
-            typeof(CountryFilter),
-            typeof(CountryPill)
-        };
-
         [Cached]
         private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Green);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
index 83e5cd0fe7..626f545b91 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.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 osu.Game.Overlays.Rankings.Tables;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
 using NUnit.Framework;
@@ -17,18 +14,6 @@ namespace osu.Game.Tests.Visual.Online
     {
         protected override bool UseOnlineAPI => true;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(PerformanceTable),
-            typeof(ScoresTable),
-            typeof(CountriesTable),
-            typeof(TableRowBackground),
-            typeof(UserBasedTable),
-            typeof(RankingsTable<>),
-            typeof(RankingsOverlay),
-            typeof(RankingsOverlayHeader)
-        };
-
         [Cached(typeof(RankingsOverlay))]
         private readonly RankingsOverlay rankingsOverlay;
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
index f27ab1e775..997db827f3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -15,11 +15,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneRankingsSpotlightSelector : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(SpotlightSelector),
-        };
-
         protected override bool UseOnlineAPI => true;
 
         [Cached]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
index 8542a5e46e..a3b102dc76 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.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 osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Rankings.Tables;
 using osu.Framework.Graphics;
@@ -24,16 +22,6 @@ namespace osu.Game.Tests.Visual.Online
     {
         protected override bool UseOnlineAPI => true;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(PerformanceTable),
-            typeof(ScoresTable),
-            typeof(CountriesTable),
-            typeof(TableRowBackground),
-            typeof(UserBasedTable),
-            typeof(RankingsTable<>)
-        };
-
         [Resolved]
         private IAPIProvider api { get; set; }
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
index 51f4089058..0cb8cc22ec 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -20,15 +19,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneScoresContainer : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DrawableTopScore),
-            typeof(TopScoreUserSection),
-            typeof(TopScoreStatisticsSection),
-            typeof(ScoreTable),
-            typeof(ScoreTableRowBackground),
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.cs b/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.cs
index b9fbbfef6b..273f593c32 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.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 osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Allocation;
@@ -12,11 +10,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneShowMoreButton : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ShowMoreButton),
-        };
-
         public TestSceneShowMoreButton()
         {
             TestButton button = null;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs
index 24341cbd05..77e77d90c1 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs
@@ -1,11 +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.Game.Overlays;
-using osu.Game.Overlays.Social;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
@@ -15,14 +12,6 @@ namespace osu.Game.Tests.Visual.Online
     {
         protected override bool UseOnlineAPI => true;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(UserPanel),
-            typeof(FilterControl),
-            typeof(UserGridPanel),
-            typeof(UserListPanel)
-        };
-
         public TestSceneSocialOverlay()
         {
             SocialOverlay s = new SocialOverlay
diff --git a/osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs
index d025a8d7c2..266dcb013b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -19,12 +17,6 @@ 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]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs b/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs
index 8ecbf0891b..f168ae5035 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.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 osu.Framework.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Overlays.Comments;
@@ -14,11 +12,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneTotalCommentsCounter : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(TotalCommentsCounter),
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index a38f045e7f..f763e50067 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -2,7 +2,6 @@
 // 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;
@@ -17,13 +16,6 @@ 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 Bindable<UserActivity> activity = new Bindable<UserActivity>();
         private readonly Bindable<UserStatus> status = new Bindable<UserStatus>();
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
index 523de4e38f..04b741b2bb 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
@@ -2,15 +2,11 @@
 // 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.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Profile;
-using osu.Game.Overlays.Profile.Header;
-using osu.Game.Overlays.Profile.Header.Components;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
@@ -19,18 +15,6 @@ namespace osu.Game.Tests.Visual.Online
     {
         protected override bool UseOnlineAPI => true;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ProfileHeader),
-            typeof(RankGraph),
-            typeof(LineGraph),
-            typeof(TabControlOverlayHeader<>.OverlayHeaderTabControl),
-            typeof(CentreHeaderContainer),
-            typeof(BottomHeaderContainer),
-            typeof(DetailHeaderContainer),
-            typeof(ProfileHeaderButton)
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index 15f9c9a013..7ade24f4de 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -2,16 +2,12 @@
 // 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;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Profile;
-using osu.Game.Overlays.Profile.Header.Components;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
@@ -26,15 +22,6 @@ namespace osu.Game.Tests.Visual.Online
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ProfileHeader),
-            typeof(RankGraph),
-            typeof(LineGraph),
-            typeof(SectionsContainer<>),
-            typeof(SupporterIcon)
-        };
-
         public static readonly User TEST_USER = new User
         {
             Username = @"Somebody",
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
index 048a1950fd..1e9d62f379 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
@@ -2,7 +2,6 @@
 // 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;
@@ -17,11 +16,6 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneUserProfilePreviousUsernames : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(PreviousUsernames)
-        };
-
         [Resolved]
         private IAPIProvider api { get; set; }
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs
index 06091f3c81..0973076c40 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.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.Linq;
 using NUnit.Framework;
@@ -14,7 +13,6 @@ 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;
 
 namespace osu.Game.Tests.Visual.Online
@@ -22,14 +20,6 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneUserProfileRecentSection : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(RecentSection),
-            typeof(DrawableRecentActivity),
-            typeof(PaginatedRecentActivityContainer),
-            typeof(MedalIcon)
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
index f1e745bd14..5dca218531 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using osu.Game.Overlays.Profile.Sections;
 using osu.Game.Overlays.Profile.Sections.Ranks;
 using osu.Framework.Graphics;
 using osu.Game.Scoring;
@@ -19,13 +17,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneUserProfileScores : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DrawableProfileScore),
-            typeof(DrawableProfileWeightedScore),
-            typeof(ProfileItemContainer),
-        };
-
         public TestSceneUserProfileScores()
         {
             var firstScore = new ScoreInfo
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs b/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
index c8e94b2915..c22cff4af6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserRanks.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -12,7 +10,6 @@ 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.Ranks;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
@@ -22,13 +19,6 @@ namespace osu.Game.Tests.Visual.Online
     {
         protected override bool UseOnlineAPI => true;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DrawableProfileScore),
-            typeof(DrawableProfileWeightedScore),
-            typeof(RanksSection)
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
index 770cef8f1b..9bb29541ec 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneVotePill.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Comments;
@@ -15,11 +13,6 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneVotePill : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(VotePill)
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index 0781cba924..1e87893f39 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -2,7 +2,6 @@
 // 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;
@@ -23,15 +22,6 @@ 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 TestLowDRank()
         {
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 328a0e0c27..106b4187ee 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -22,8 +21,6 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 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;
@@ -35,18 +32,6 @@ namespace osu.Game.Tests.Visual.Ranking
         [Resolved]
         private RulesetStore rulesetStore { get; set; }
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ExpandedPanelMiddleContent),
-            typeof(AccuracyCircle),
-            typeof(AccuracyStatistic),
-            typeof(ComboStatistic),
-            typeof(CounterStatistic),
-            typeof(StarRatingDisplay),
-            typeof(StatisticDisplay),
-            typeof(TotalScoreCounter)
-        };
-
         [Test]
         public void TestMapWithKnownMapper()
         {
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index bd5b039bc1..aa0ce89d93 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -26,14 +26,6 @@ namespace osu.Game.Tests.Visual.Ranking
     {
         private BeatmapManager beatmaps;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ResultsScreen),
-            typeof(RetryButton),
-            typeof(ReplayDownloadButton),
-            typeof(TestPlayer)
-        };
-
         [BackgroundDependencyLoader]
         private void load(BeatmapManager beatmaps)
         {
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
index 1e55885385..78511b1be1 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -2,7 +2,6 @@
 // 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;
@@ -19,13 +18,6 @@ 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()
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 426ff988c4..745820696a 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -1,11 +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.Game.Overlays;
-using osu.Game.Overlays.KeyBinding;
 
 namespace osu.Game.Tests.Visual.Settings
 {
@@ -14,16 +11,6 @@ namespace osu.Game.Tests.Visual.Settings
     {
         private readonly KeyBindingPanel panel;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(KeyBindingRow),
-            typeof(GlobalKeyBindingsSection),
-            typeof(KeyBindingRow),
-            typeof(KeyBindingsSubsection),
-            typeof(RulesetBindingsSection),
-            typeof(VariantBindingsSubsection),
-        };
-
         public TestSceneKeyBindingPanel()
         {
             Child = panel = new KeyBindingPanel();
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
index 668fdf2c20..115d2fec7d 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
@@ -1,13 +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.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Tests.Visual.Settings
 {
@@ -17,12 +14,6 @@ namespace osu.Game.Tests.Visual.Settings
         private readonly SettingsPanel settings;
         private readonly DialogOverlay dialogOverlay;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(SettingsFooter),
-            typeof(SettingsOverlay),
-        };
-
         public TestSceneSettingsPanel()
         {
             settings = new SettingsOverlay
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index f68ed4154b..2f12194ede 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -26,21 +26,6 @@ namespace osu.Game.Tests.Visual.SongSelect
         private TestBeatmapCarousel carousel;
         private RulesetStore rulesets;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(CarouselItem),
-            typeof(CarouselGroup),
-            typeof(CarouselGroupEagerSelect),
-            typeof(CarouselBeatmap),
-            typeof(CarouselBeatmapSet),
-
-            typeof(DrawableCarouselItem),
-            typeof(CarouselItemState),
-
-            typeof(DrawableCarouselBeatmap),
-            typeof(DrawableCarouselBeatmapSet),
-        };
-
         private readonly Stack<BeatmapSetInfo> selectedSets = new Stack<BeatmapSetInfo>();
         private readonly HashSet<int> eagerSelectedIDs = new HashSet<int>();
 
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
index 1198488bda..48b718c04d 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
@@ -2,14 +2,12 @@
 // 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.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays;
-using osu.Game.Online.Placeholders;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Select.Leaderboards;
@@ -20,15 +18,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public class TestSceneBeatmapLeaderboard : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Placeholder),
-            typeof(MessagePlaceholder),
-            typeof(RetrievalFailurePlaceholder),
-            typeof(UserTopScoreContainer),
-            typeof(Leaderboard<BeatmapLeaderboardScope, ScoreInfo>),
-        };
-
         private readonly FailableLeaderboard leaderboard;
 
         [Cached]
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 81fd1b66e5..a7e2dbeccb 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -45,24 +45,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private WorkingBeatmap defaultBeatmap;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Screens.Select.SongSelect),
-            typeof(BeatmapCarousel),
-
-            typeof(CarouselItem),
-            typeof(CarouselGroup),
-            typeof(CarouselGroupEagerSelect),
-            typeof(CarouselBeatmap),
-            typeof(CarouselBeatmapSet),
-
-            typeof(DrawableCarouselItem),
-            typeof(CarouselItemState),
-
-            typeof(DrawableCarouselBeatmap),
-            typeof(DrawableCarouselBeatmapSet),
-        };
-
         private TestSongSelect songSelect;
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/Visual/TestSceneOsuGame.cs b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
index 2eaac2a45f..22ae5257e7 100644
--- a/osu.Game.Tests/Visual/TestSceneOsuGame.cs
+++ b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
@@ -34,11 +34,6 @@ namespace osu.Game.Tests.Visual
     [TestFixture]
     public class TestSceneOsuGame : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OsuLogo),
-        };
-
         private IReadOnlyList<Type> requiredGameDependencies => new[]
         {
             typeof(OsuGame),
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBackButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBackButton.cs
index b7d7053dcd..2440911c11 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBackButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBackButton.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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -14,11 +12,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneBackButton : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(TwoLayerButton)
-        };
-
         public TestSceneBackButton()
         {
             BackButton button;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
index b0b673d6a4..4c32e995e8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
@@ -26,11 +26,6 @@ namespace osu.Game.Tests.Visual.UserInterface
     {
         private readonly NowPlayingOverlay np;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(BeatSyncedContainer)
-        };
-
         [Cached]
         private MusicController musicController = new MusicController();
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index d6ede950df..a4698a9a32 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -17,11 +15,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneBeatmapListingSearchControl : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(BeatmapListingSearchControl),
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
index f643d4e3fe..5364f0bef5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -15,11 +13,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneBeatmapListingSortTabControl : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OverlaySortTabControl<>),
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
index 283fe03af3..37b7b64615 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -16,12 +14,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneBeatmapSearchFilter : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(BeatmapSearchFilterRow<>),
-            typeof(BeatmapSearchRulesetFilterRow)
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs
index f0e1c38525..1bb5cadc6a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.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 NUnit.Framework;
 using osu.Framework.Graphics;
@@ -17,13 +16,6 @@ namespace osu.Game.Tests.Visual.UserInterface
     [TestFixture]
     public class TestSceneButtonSystem : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ButtonSystem),
-            typeof(ButtonArea),
-            typeof(Button)
-        };
-
         private OsuLogo logo;
         private ButtonSystem buttons;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index cef04a4c18..d0a2ca83e3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -17,12 +15,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneCommentEditor : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(CommentEditor),
-            typeof(CancellableCommentEditor),
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index a812b4dc79..eb4750a597 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.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.Linq;
 using NUnit.Framework;
@@ -15,7 +14,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Leaderboards;
-using osu.Game.Online.Placeholders;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
@@ -29,16 +27,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneDeleteLocalScore : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Placeholder),
-            typeof(MessagePlaceholder),
-            typeof(RetrievalFailurePlaceholder),
-            typeof(UserTopScoreContainer),
-            typeof(Leaderboard<BeatmapLeaderboardScope, ScoreInfo>),
-            typeof(LeaderboardScore),
-        };
-
         private readonly ContextMenuContainer contextMenuContainer;
         private readonly BeatmapLeaderboard leaderboard;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
index 63197ed26a..1e3b1c2ffd 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
@@ -14,12 +14,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneFooterButtonMods : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(FooterButtonMods),
-            typeof(FooterButton)
-        };
-
         private readonly TestFooterButtonMods footerButtonMods;
 
         public TestSceneFooterButtonMods()
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
index f6dcf78d55..9fa5c83dba 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.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.Linq;
 using NUnit.Framework;
@@ -15,15 +14,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneFriendsOnlineStatusControl : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(FriendOnlineStreamControl),
-            typeof(FriendsOnlineStatusItem),
-            typeof(OverlayStreamControl<>),
-            typeof(OverlayStreamItem<>),
-            typeof(FriendStream)
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
index feef1dae6b..cea91d422e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
@@ -1,11 +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.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Menu;
 
@@ -15,12 +12,6 @@ namespace osu.Game.Tests.Visual.UserInterface
     {
         protected override double TimePerAction => 100; // required for the early exit test, since hold-to-confirm delay is 200ms
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ExitConfirmOverlay),
-            typeof(HoldToConfirmContainer),
-        };
-
         public TestSceneHoldToConfirmOverlay()
         {
             bool fired = false;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs
index 6ca4d9fa4c..903f1242b4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,12 +10,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneLabelledSwitchButton : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(LabelledSwitchButton),
-            typeof(SwitchButton)
-        };
-
         [TestCase(false)]
         [TestCase(true)]
         public void TestSwitchButton(bool hasDescription) => createSwitchButton(hasDescription);
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledTextBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledTextBox.cs
index 8208b55952..c11ba0aa59 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledTextBox.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledTextBox.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -14,11 +12,6 @@ namespace osu.Game.Tests.Visual.UserInterface
     [TestFixture]
     public class TestSceneLabelledTextBox : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(LabelledTextBox),
-        };
-
         [TestCase(false)]
         [TestCase(true)]
         public void TestTextBox(bool hasDescription) => createTextBox(hasDescription);
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
index 7e9654715b..1be191fc29 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -19,8 +17,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         private Drawable dimContent;
         private LoadingLayer overlay;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(LoadingSpinner) };
-
         private Container content;
 
         [SetUp]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
index 4e394b5ed8..010e4330d7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
@@ -2,17 +2,14 @@
 // 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.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Utils;
 using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.Play;
 using osuTK;
 using osuTK.Graphics;
 
@@ -20,17 +17,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneLogoTrackingContainer : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(PlayerLoader),
-            typeof(Player),
-            typeof(LogoTrackingContainer),
-            typeof(ButtonSystem),
-            typeof(ButtonSystemState),
-            typeof(Menu),
-            typeof(MainMenu)
-        };
-
         private OsuLogo logo;
         private TestLogoTrackingContainer trackingContainer;
         private Container transferContainer;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index ec6ee6bc83..ce691bff70 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -12,12 +12,10 @@ using osu.Framework.Testing;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
-using osu.Game.Overlays.Mods.Sections;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
@@ -27,20 +25,6 @@ namespace osu.Game.Tests.Visual.UserInterface
     [Description("mod select and icon display")]
     public class TestSceneModSelectOverlay : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ModDisplay),
-            typeof(ModSection),
-            typeof(ModIcon),
-            typeof(ModButton),
-            typeof(ModButtonEmpty),
-            typeof(DifficultyReductionSection),
-            typeof(DifficultyIncreaseSection),
-            typeof(AutomationSection),
-            typeof(ConversionSection),
-            typeof(FunSection),
-        };
-
         private RulesetStore rulesets;
         private ModDisplay modDisplay;
         private TestModSelectOverlay modSelect;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index f8ace73168..43ba23e6c6 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.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.Linq;
 using NUnit.Framework;
@@ -18,16 +17,6 @@ namespace osu.Game.Tests.Visual.UserInterface
     [TestFixture]
     public class TestSceneNotificationOverlay : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(NotificationSection),
-            typeof(SimpleNotification),
-            typeof(ProgressNotification),
-            typeof(ProgressCompletionNotification),
-            typeof(IHasCompletionTarget),
-            typeof(Notification)
-        };
-
         private NotificationOverlay notificationOverlay;
 
         private readonly List<ProgressNotification> progressingNotifications = new List<ProgressNotification>();
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNumberBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNumberBox.cs
index f73450db60..97a3f62b2d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNumberBox.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNumberBox.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -14,11 +12,6 @@ namespace osu.Game.Tests.Visual.UserInterface
     [TestFixture]
     public class TestSceneNumberBox : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OsuNumberBox),
-        };
-
         private OsuNumberBox numberBox;
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
index 9ea76c2c7b..387deea76c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMenu.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.Graphics;
@@ -14,12 +12,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneOsuMenu : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OsuMenu),
-            typeof(DrawableOsuMenuItem)
-        };
-
         private OsuMenu menu;
         private bool actionPerformed;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index c81ec9f663..60af5b37ef 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -3,8 +3,6 @@
 
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
-using System;
-using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Allocation;
@@ -15,18 +13,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneOverlayHeader : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OverlayHeader),
-            typeof(TabControlOverlayHeader<>),
-            typeof(BreadcrumbControlOverlayHeader),
-            typeof(TestNoControlHeader),
-            typeof(TestStringTabControlHeader),
-            typeof(TestEnumTabControlHeader),
-            typeof(TestBreadcrumbControlHeader),
-            typeof(OverlayHeaderBackground)
-        };
-
         private readonly FillFlowContainer flow;
 
         public TestSceneOverlayHeader()
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.cs
index 5a0b28e24a..db414d23a0 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.cs
@@ -3,8 +3,6 @@
 
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
-using System;
-using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osuTK;
 
@@ -12,11 +10,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneOverlayHeaderBackground : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OverlayHeaderBackground)
-        };
-
         public TestSceneOverlayHeaderBackground()
         {
             Add(new BasicScrollContainer
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
index 8a98127793..f4fa41a3b7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
@@ -2,8 +2,6 @@
 // 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;
@@ -20,12 +18,6 @@ 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>();
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
index e9e63613c0..7fa730e02b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayScrollContainer.cs
@@ -3,8 +3,6 @@
 
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
-using System;
-using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Shapes;
@@ -17,11 +15,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneOverlayScrollContainer : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OverlayScrollContainer)
-        };
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
index 7476b52b49..a470244f53 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
@@ -2,7 +2,6 @@
 // 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;
@@ -16,12 +15,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestScenePlaylistOverlay : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(PlaylistOverlay),
-            typeof(Playlist)
-        };
-
         private readonly BindableList<BeatmapSetInfo> beatmapSets = new BindableList<BeatmapSetInfo>();
 
         [SetUp]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
index 7207506ccd..8e53c7c402 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
@@ -1,12 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Tests.Visual.UserInterface
@@ -14,14 +11,6 @@ namespace osu.Game.Tests.Visual.UserInterface
     [TestFixture]
     public class TestScenePopupDialog : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(PopupDialogOkButton),
-            typeof(PopupDialogCancelButton),
-            typeof(PopupDialogButton),
-            typeof(DialogButton),
-        };
-
         public TestScenePopupDialog()
         {
             AddStep("new popup", () =>
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
index 85fea73bf5..29aeb6a4b2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
@@ -2,7 +2,6 @@
 // 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;
@@ -14,14 +13,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneStatefulMenuItem : OsuManualInputManagerTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OsuMenu),
-            typeof(StatefulMenuItem),
-            typeof(TernaryStateMenuItem),
-            typeof(DrawableStatefulMenuItem),
-        };
-
         [Test]
         public void TestTernaryMenuItem()
         {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneToggleMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneToggleMenuItem.cs
index 2abda56a28..9fb8e747f3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneToggleMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneToggleMenuItem.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 osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 
@@ -10,13 +8,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneToggleMenuItem : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OsuMenu),
-            typeof(ToggleMenuItem),
-            typeof(DrawableStatefulMenuItem)
-        };
-
         public TestSceneToggleMenuItem()
         {
             Add(new OsuMenu(Direction.Vertical, true)
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs
index 9738f73548..cdfbb14cba 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs
@@ -3,8 +3,6 @@
 
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Toolbar;
-using System;
-using System.Collections.Generic;
 using osu.Framework.Graphics;
 using System.Linq;
 using NUnit.Framework;
@@ -16,12 +14,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneToolbarRulesetSelector : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ToolbarRulesetSelector),
-            typeof(ToolbarRulesetTabButton),
-        };
-
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs
index 1546972580..8f7140ed7c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -15,14 +13,6 @@ 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);
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneVolumePieces.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneVolumePieces.cs
index 2fe6240b22..c8478c8eca 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneVolumePieces.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneVolumePieces.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 osu.Framework.Graphics;
 using osu.Game.Overlays.Volume;
 using osuTK;
@@ -12,8 +10,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneVolumePieces : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(VolumeMeter), typeof(MuteButton) };
-
         protected override void LoadComplete()
         {
             VolumeMeter meter;
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
index e65b708fea..f98f55dfbc 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
@@ -1,11 +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.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Ladder.Components;
 
@@ -13,12 +10,6 @@ namespace osu.Game.Tournament.Tests.Components
 {
     public class TestSceneDrawableTournamentMatch : TournamentTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(TournamentMatch),
-            typeof(DrawableTournamentTeam),
-        };
-
         public TestSceneDrawableTournamentMatch()
         {
             Container<DrawableTournamentMatch> level1;
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
index 01edcb66e4..376c59ec2d 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.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 osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Tests.Visual;
@@ -17,17 +15,6 @@ 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)
         {
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs b/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
index 9f885ed827..b29e4964b6 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
@@ -1,12 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using 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;
 
@@ -14,12 +11,6 @@ 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.Tests/Components/TestSceneRoundDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs
index 6f71627ce4..13bca7bea1 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.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 osu.Framework.Graphics;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
@@ -11,12 +9,6 @@ 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[]
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index 34fa7a4997..c1159dc000 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.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;
-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;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
@@ -16,17 +12,6 @@ namespace osu.Game.Tournament.Tests.Screens
         [Cached]
         private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay { Width = 0.5f };
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(TeamScore),
-            typeof(TeamScoreDisplay),
-            typeof(TeamDisplay),
-            typeof(MatchHeader),
-            typeof(MatchScoreDisplay),
-            typeof(BeatmapInfoScreen),
-            typeof(SongBar),
-        };
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Tests/Visual/EditorTestScene.cs b/osu.Game/Tests/Visual/EditorTestScene.cs
index caf2bc0ff1..2f6e6fb599 100644
--- a/osu.Game/Tests/Visual/EditorTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorTestScene.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 osu.Framework.Allocation;
 using osu.Framework.Testing;
@@ -15,8 +13,6 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class EditorTestScene : ScreenTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Editor), typeof(EditorScreen) };
-
         protected Editor Editor { get; private set; }
 
         private readonly Ruleset ruleset;
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 8b41fb5075..1fa638b3d8 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -14,11 +14,6 @@ namespace osu.Game.Tests.Visual
     {
         protected sealed override bool HasCustomSteps => true;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ModTestScene)
-        };
-
         protected ModTestScene(Ruleset ruleset)
             : base(ruleset)
         {

From 2bde4fc3eed85600b421a2cb30e83e310a5f68de Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 16 May 2020 18:17:32 +0900
Subject: [PATCH 02771/10326] Initial implementation of contracted score panel

---
 .../Scoring/OsuScoreProcessor.cs              |   2 +-
 .../TestSceneContractedPanelMiddleContent.cs  | 118 ++++++++
 .../ContractedPanelMiddleContent.cs           | 255 ++++++++++++++++++
 osu.Game/Screens/Ranking/ScorePanel.cs        |  11 +-
 4 files changed, 381 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
 create mode 100644 osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 1de7d488f3..79a6ea7e92 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
-    internal class OsuScoreProcessor : ScoreProcessor
+    public class OsuScoreProcessor : ScoreProcessor
     {
         protected override JudgementResult CreateResult(HitObject hitObject, Judgement judgement) => new OsuJudgementResult(hitObject, judgement);
 
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
new file mode 100644
index 0000000000..af3d13777c
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
@@ -0,0 +1,118 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.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;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
+using osu.Game.Screens.Ranking.Contracted;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestSceneContractedPanelMiddleContent : OsuTestScene
+    {
+        [Resolved]
+        private RulesetStore rulesetStore { get; set; }
+
+        [Test]
+        public void TestMapWithKnownMapper()
+        {
+            var author = new User { Username = "mapper_name" };
+
+            AddStep("show example score", () => showPanel(createTestBeatmap(author), createTestScore()));
+
+            AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Text == "mapper_name"));
+        }
+
+        [Test]
+        public void TestMapWithUnknownMapper()
+        {
+            AddStep("show example score", () => showPanel(createTestBeatmap(null), createTestScore()));
+
+            AddAssert("mapped by text not present", () =>
+                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text, "mapped", "by")));
+        }
+
+        private void showPanel(WorkingBeatmap workingBeatmap, ScoreInfo score)
+        {
+            Child = new ContractedPanelMiddleContentContainer(workingBeatmap, score);
+        }
+
+        private WorkingBeatmap createTestBeatmap(User author)
+        {
+            var beatmap = new TestBeatmap(rulesetStore.GetRuleset(0));
+            beatmap.Metadata.Author = author;
+            beatmap.Metadata.Title = "Verrrrrrrrrrrrrrrrrrry looooooooooooooooooooooooong beatmap title";
+            beatmap.Metadata.Artist = "Verrrrrrrrrrrrrrrrrrry looooooooooooooooooooooooong beatmap artist";
+
+            return new TestWorkingBeatmap(beatmap);
+        }
+
+        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 },
+            }
+        };
+
+        private bool containsAny(string text, params string[] stringsToMatch) => stringsToMatch.Any(text.Contains);
+
+        private class ContractedPanelMiddleContentContainer : Container
+        {
+            [Cached]
+            private Bindable<WorkingBeatmap> workingBeatmap { get; set; }
+
+            public ContractedPanelMiddleContentContainer(WorkingBeatmap beatmap, ScoreInfo score)
+            {
+                workingBeatmap = new Bindable<WorkingBeatmap>(beatmap);
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                Size = new Vector2(ScorePanel.CONTRACTED_WIDTH, 700);
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4Extensions.FromHex("#353535"),
+                    },
+                    new ContractedPanelMiddleContent(score),
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
new file mode 100644
index 0000000000..5ecb3fbd0b
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -0,0 +1,255 @@
+// Copyright (c) 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;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Leaderboards;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Users;
+using osu.Game.Users.Drawables;
+using osu.Game.Utils;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Ranking.Contracted
+{
+    /// <summary>
+    /// The content that appears in the middle of a contracted <see cref="ScorePanel"/>.
+    /// </summary>
+    public class ContractedPanelMiddleContent : CompositeDrawable
+    {
+        private readonly ScoreInfo score;
+
+        /// <summary>
+        /// Creates a new <see cref="ContractedPanelMiddleContent"/>.
+        /// </summary>
+        /// <param name="score">The <see cref="ScoreInfo"/> to display.</param>
+        public ContractedPanelMiddleContent(ScoreInfo score)
+        {
+            this.score = score;
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
+                            {
+                                new Container
+                                {
+                                    Name = "Background",
+                                    RelativeSizeAxes = Axes.Both,
+                                    Masking = true,
+                                    CornerExponent = 2.5f,
+                                    CornerRadius = 20,
+                                    EdgeEffect = new EdgeEffectParameters
+                                    {
+                                        Colour = Color4.Black.Opacity(0.25f),
+                                        Type = EdgeEffectType.Shadow,
+                                        Radius = 1,
+                                        Offset = new Vector2(0, 4)
+                                    },
+                                    Children = new Drawable[]
+                                    {
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = Color4Extensions.FromHex("444")
+                                        },
+                                        new UserCoverBackground
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            User = score.User,
+                                        },
+                                    }
+                                },
+                                new Container
+                                {
+                                    Name = "Background overlay",
+                                    RelativeSizeAxes = Axes.Both,
+                                    Padding = new MarginPadding { Bottom = -1 },
+                                    Child = new Container
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Masking = true,
+                                        CornerExponent = 2.5f,
+                                        CornerRadius = 20,
+                                        Child = new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.5f), Color4Extensions.FromHex("#444"))
+                                        }
+                                    }
+                                },
+                                new Container
+                                {
+                                    Name = "Foreground",
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
+                                        new FillFlowContainer
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Padding = new MarginPadding(10),
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 10),
+                                            Children = new Drawable[]
+                                            {
+                                                new UpdateableAvatar(score.User)
+                                                {
+                                                    Anchor = Anchor.TopCentre,
+                                                    Origin = Anchor.TopCentre,
+                                                    Size = new Vector2(140),
+                                                    Masking = true,
+                                                    CornerExponent = 2.5f,
+                                                    CornerRadius = 20,
+                                                    EdgeEffect = new EdgeEffectParameters
+                                                    {
+                                                        Colour = Color4.Black.Opacity(0.25f),
+                                                        Type = EdgeEffectType.Shadow,
+                                                        Radius = 8,
+                                                        Offset = new Vector2(0, 4),
+                                                    }
+                                                },
+                                                new OsuSpriteText
+                                                {
+                                                    Anchor = Anchor.TopCentre,
+                                                    Origin = Anchor.TopCentre,
+                                                    Text = score.UserString,
+                                                    Font = OsuFont.GetFont(size: 16, weight: FontWeight.SemiBold)
+                                                },
+                                                new FillFlowContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Direction = FillDirection.Vertical,
+                                                    Spacing = new Vector2(0, 5),
+                                                    ChildrenEnumerable = score.SortedStatistics.Select(s => createStatistic(s.Key.GetDescription(), s.Value.ToString()))
+                                                },
+                                                new FillFlowContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Margin = new MarginPadding { Top = 10 },
+                                                    Direction = FillDirection.Vertical,
+                                                    Spacing = new Vector2(0, 5),
+                                                    Children = new[]
+                                                    {
+                                                        createStatistic("Max Combo", $"x{score.MaxCombo}"),
+                                                        createStatistic("Accuracy", $"{score.Accuracy.FormatAccuracy()}"),
+                                                    }
+                                                },
+                                                new ModDisplay
+                                                {
+                                                    Anchor = Anchor.TopCentre,
+                                                    Origin = Anchor.TopCentre,
+                                                    AutoSizeAxes = Axes.Both,
+                                                    ExpansionMode = ExpansionMode.AlwaysExpanded,
+                                                    DisplayUnrankedText = false,
+                                                    Current = { Value = score.Mods },
+                                                    Scale = new Vector2(0.5f),
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                    },
+                    new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Vertical = 5 },
+                            Child = new GridContainer
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Content = new[]
+                                {
+                                    new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            Text = score.TotalScore.ToString(),
+                                            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, fixedWidth: true),
+                                            Spacing = new Vector2(-1, 0)
+                                        },
+                                    },
+                                    new Drawable[]
+                                    {
+                                        new Container
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Padding = new MarginPadding { Top = 2 },
+                                            Child = new DrawableRank(score.Rank)
+                                            {
+                                                Anchor = Anchor.Centre,
+                                                Origin = Anchor.Centre,
+                                            }
+                                        }
+                                    },
+                                },
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(GridSizeMode.AutoSize),
+                                }
+                            }
+                        }
+                    },
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(),
+                    new Dimension(GridSizeMode.Absolute, 45),
+                }
+            };
+        }
+
+        private Drawable createStatistic(string key, string value) => new Container
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Children = new Drawable[]
+            {
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Text = key,
+                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
+                },
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Text = value,
+                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                    Colour = Color4Extensions.FromHex("#FFDD55")
+                }
+            }
+        };
+    }
+}
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index c055df7ccc..bf57cb4dd9 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Scoring;
+using osu.Game.Screens.Ranking.Contracted;
 using osu.Game.Screens.Ranking.Expanded;
 using osuTK;
 using osuTK.Graphics;
@@ -21,12 +22,12 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Width of the panel when contracted.
         /// </summary>
-        private const float contracted_width = 160;
+        public const float CONTRACTED_WIDTH = 160;
 
         /// <summary>
         /// Height of the panel when contracted.
         /// </summary>
-        private const float contracted_height = 320;
+        private const float contracted_height = 385;
 
         /// <summary>
         /// Width of the panel when expanded.
@@ -71,7 +72,7 @@ namespace osu.Game.Screens.Ranking
         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");
+        private static readonly Color4 contracted_middle_layer_colour = Color4Extensions.FromHex("#353535");
 
         public event Action<PanelState> StateChanged;
 
@@ -193,10 +194,12 @@ namespace osu.Game.Screens.Ranking
                     break;
 
                 case PanelState.Contracted:
-                    this.ResizeTo(new Vector2(contracted_width, contracted_height), resize_duration, Easing.OutQuint);
+                    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);
+
+                    middleLayerContentContainer.Add(topLayerContent = new ContractedPanelMiddleContent(score).With(d => d.Alpha = 0));
                     break;
             }
 

From 3df92925ee704dce60d127c04557d3aaac15c9c3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 16 May 2020 18:22:07 +0900
Subject: [PATCH 02772/10326] Add score panel test

---
 .../Visual/Ranking/TestSceneScorePanel.cs          | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
index 1e55885385..7431002c02 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -107,13 +107,23 @@ namespace osu.Game.Tests.Visual.Ranking
             addPanelStep(score);
         }
 
-        private void addPanelStep(ScoreInfo score) => AddStep("add panel", () =>
+        [Test]
+        public void TestContractedPanel()
+        {
+            var score = createScore();
+            score.Accuracy = 0.925;
+            score.Rank = ScoreRank.A;
+
+            addPanelStep(score, PanelState.Contracted);
+        }
+
+        private void addPanelStep(ScoreInfo score, PanelState state = PanelState.Expanded) => AddStep("add panel", () =>
         {
             Child = new ScorePanel(score)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                State = PanelState.Expanded
+                State = state
             };
         });
 

From 9b7b1ef605aa3fc7dbe22682dae4bc496974d28c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 16 May 2020 18:23:18 +0900
Subject: [PATCH 02773/10326] Add cover urls

---
 .../Visual/Ranking/TestSceneContractedPanelMiddleContent.cs      | 1 +
 osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
index af3d13777c..f7694c10ec 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
@@ -72,6 +72,7 @@ namespace osu.Game.Tests.Visual.Ranking
             {
                 Id = 2,
                 Username = "peppy",
+                CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
             },
             Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
             Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
index 7431002c02..27905f95fd 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -133,6 +133,7 @@ namespace osu.Game.Tests.Visual.Ranking
             {
                 Id = 2,
                 Username = "peppy",
+                CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
             },
             Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
             Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },

From 0279bcf3c8cc2ee3bc53f5b7aaa9925870dae71c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 16 May 2020 18:28:22 +0900
Subject: [PATCH 02774/10326] Fix missed issues

---
 osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
index 78511b1be1..880e331b92 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -10,7 +10,6 @@ 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;
 
@@ -18,7 +17,6 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneScorePanel : OsuTestScene
     {
-
         [Test]
         public void TestDRank()
         {

From 8c5ccf574b3e6fbf6e26a85491713f3acf71ab7a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 16 May 2020 18:28:15 +0900
Subject: [PATCH 02775/10326] Add better fix for 1px bleed

---
 .../ContractedPanelMiddleContent.cs           | 153 ++++++++----------
 1 file changed, 66 insertions(+), 87 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index 5ecb3fbd0b..1d7d5c4130 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -53,22 +53,22 @@ namespace osu.Game.Screens.Ranking.Contracted
                         new Container
                         {
                             RelativeSizeAxes = Axes.Both,
+                            Masking = true,
+                            CornerExponent = 2.5f,
+                            CornerRadius = 20,
+                            EdgeEffect = new EdgeEffectParameters
+                            {
+                                Colour = Color4.Black.Opacity(0.25f),
+                                Type = EdgeEffectType.Shadow,
+                                Radius = 1,
+                                Offset = new Vector2(0, 4)
+                            },
                             Children = new Drawable[]
                             {
-                                new Container
+                                // Buffered container is used to prevent 1px bleed outside the masking region
+                                new BufferedContainer
                                 {
-                                    Name = "Background",
                                     RelativeSizeAxes = Axes.Both,
-                                    Masking = true,
-                                    CornerExponent = 2.5f,
-                                    CornerRadius = 20,
-                                    EdgeEffect = new EdgeEffectParameters
-                                    {
-                                        Colour = Color4.Black.Opacity(0.25f),
-                                        Type = EdgeEffectType.Shadow,
-                                        Radius = 1,
-                                        Offset = new Vector2(0, 4)
-                                    },
                                     Children = new Drawable[]
                                     {
                                         new Box
@@ -81,95 +81,74 @@ namespace osu.Game.Screens.Ranking.Contracted
                                             RelativeSizeAxes = Axes.Both,
                                             User = score.User,
                                         },
-                                    }
-                                },
-                                new Container
-                                {
-                                    Name = "Background overlay",
-                                    RelativeSizeAxes = Axes.Both,
-                                    Padding = new MarginPadding { Bottom = -1 },
-                                    Child = new Container
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Masking = true,
-                                        CornerExponent = 2.5f,
-                                        CornerRadius = 20,
-                                        Child = new Box
+                                        new Box
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                             Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.5f), Color4Extensions.FromHex("#444"))
-                                        }
+                                        },
                                     }
                                 },
-                                new Container
+                                new FillFlowContainer
                                 {
-                                    Name = "Foreground",
                                     RelativeSizeAxes = Axes.Both,
+                                    Padding = new MarginPadding(10),
+                                    Direction = FillDirection.Vertical,
+                                    Spacing = new Vector2(0, 10),
                                     Children = new Drawable[]
                                     {
+                                        new UpdateableAvatar(score.User)
+                                        {
+                                            Anchor = Anchor.TopCentre,
+                                            Origin = Anchor.TopCentre,
+                                            Size = new Vector2(140),
+                                            Masking = true,
+                                            CornerExponent = 2.5f,
+                                            CornerRadius = 20,
+                                            EdgeEffect = new EdgeEffectParameters
+                                            {
+                                                Colour = Color4.Black.Opacity(0.25f),
+                                                Type = EdgeEffectType.Shadow,
+                                                Radius = 8,
+                                                Offset = new Vector2(0, 4),
+                                            }
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Anchor = Anchor.TopCentre,
+                                            Origin = Anchor.TopCentre,
+                                            Text = score.UserString,
+                                            Font = OsuFont.GetFont(size: 16, weight: FontWeight.SemiBold)
+                                        },
                                         new FillFlowContainer
                                         {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Padding = new MarginPadding(10),
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
                                             Direction = FillDirection.Vertical,
-                                            Spacing = new Vector2(0, 10),
-                                            Children = new Drawable[]
+                                            Spacing = new Vector2(0, 5),
+                                            ChildrenEnumerable = score.SortedStatistics.Select(s => createStatistic(s.Key.GetDescription(), s.Value.ToString()))
+                                        },
+                                        new FillFlowContainer
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Margin = new MarginPadding { Top = 10 },
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 5),
+                                            Children = new[]
                                             {
-                                                new UpdateableAvatar(score.User)
-                                                {
-                                                    Anchor = Anchor.TopCentre,
-                                                    Origin = Anchor.TopCentre,
-                                                    Size = new Vector2(140),
-                                                    Masking = true,
-                                                    CornerExponent = 2.5f,
-                                                    CornerRadius = 20,
-                                                    EdgeEffect = new EdgeEffectParameters
-                                                    {
-                                                        Colour = Color4.Black.Opacity(0.25f),
-                                                        Type = EdgeEffectType.Shadow,
-                                                        Radius = 8,
-                                                        Offset = new Vector2(0, 4),
-                                                    }
-                                                },
-                                                new OsuSpriteText
-                                                {
-                                                    Anchor = Anchor.TopCentre,
-                                                    Origin = Anchor.TopCentre,
-                                                    Text = score.UserString,
-                                                    Font = OsuFont.GetFont(size: 16, weight: FontWeight.SemiBold)
-                                                },
-                                                new FillFlowContainer
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Direction = FillDirection.Vertical,
-                                                    Spacing = new Vector2(0, 5),
-                                                    ChildrenEnumerable = score.SortedStatistics.Select(s => createStatistic(s.Key.GetDescription(), s.Value.ToString()))
-                                                },
-                                                new FillFlowContainer
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Margin = new MarginPadding { Top = 10 },
-                                                    Direction = FillDirection.Vertical,
-                                                    Spacing = new Vector2(0, 5),
-                                                    Children = new[]
-                                                    {
-                                                        createStatistic("Max Combo", $"x{score.MaxCombo}"),
-                                                        createStatistic("Accuracy", $"{score.Accuracy.FormatAccuracy()}"),
-                                                    }
-                                                },
-                                                new ModDisplay
-                                                {
-                                                    Anchor = Anchor.TopCentre,
-                                                    Origin = Anchor.TopCentre,
-                                                    AutoSizeAxes = Axes.Both,
-                                                    ExpansionMode = ExpansionMode.AlwaysExpanded,
-                                                    DisplayUnrankedText = false,
-                                                    Current = { Value = score.Mods },
-                                                    Scale = new Vector2(0.5f),
-                                                }
+                                                createStatistic("Max Combo", $"x{score.MaxCombo}"),
+                                                createStatistic("Accuracy", $"{score.Accuracy.FormatAccuracy()}"),
                                             }
+                                        },
+                                        new ModDisplay
+                                        {
+                                            Anchor = Anchor.TopCentre,
+                                            Origin = Anchor.TopCentre,
+                                            AutoSizeAxes = Axes.Both,
+                                            ExpansionMode = ExpansionMode.AlwaysExpanded,
+                                            DisplayUnrankedText = false,
+                                            Current = { Value = score.Mods },
+                                            Scale = new Vector2(0.5f),
                                         }
                                     }
                                 }

From cfa5a81e7844eb136f7e1fed6a04b3374788709e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 16 May 2020 18:28:25 +0900
Subject: [PATCH 02776/10326] Cleanup testscene

---
 osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
index 3b8ce7d837..0dbafb18bc 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -10,7 +10,6 @@ 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;
 
@@ -18,7 +17,6 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneScorePanel : OsuTestScene
     {
-
         [Test]
         public void TestDRank()
         {

From e3c1112b5ab10e981ce59c1c2a851ecdcf7a0dbb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 16 May 2020 19:00:20 +0900
Subject: [PATCH 02777/10326] Initial integration into results screen

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 57 +++++++++++++++++++++--
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index cfba1e6e3e..f2458d9f1f 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -10,6 +11,9 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Play;
@@ -31,11 +35,18 @@ namespace osu.Game.Screens.Ranking
         [Resolved(CanBeNull = true)]
         private Player player { get; set; }
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
         public readonly ScoreInfo Score;
 
         private readonly bool allowRetry;
 
         private Drawable bottomPanel;
+        private Container<ScorePanel> contractedPanels;
 
         public ResultsScreen(ScoreInfo score, bool allowRetry = true)
         {
@@ -52,12 +63,29 @@ namespace osu.Game.Screens.Ranking
             {
                 new ResultsScrollContainer
                 {
-                    Child = new ScorePanel(Score)
+                    Children = new Drawable[]
                     {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        State = PanelState.Expanded
-                    },
+                        new ScorePanel(Score)
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            State = PanelState.Expanded
+                        },
+                        new OsuScrollContainer(Direction.Horizontal)
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            ScrollbarVisible = false,
+                            Child = contractedPanels = new FillFlowContainer<ScorePanel>
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Direction = FillDirection.Horizontal,
+                                AutoSizeAxes = Axes.Both
+                            }
+                        }
+                    }
                 },
                 bottomPanel = new Container
                 {
@@ -105,6 +133,25 @@ namespace osu.Game.Screens.Ranking
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            var req = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
+
+            req.Success += r =>
+            {
+                contractedPanels.ChildrenEnumerable = r.Scores.Select(s => s.CreateScoreInfo(rulesets)).Select(s => new ScorePanel(s)
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    State = PanelState.Contracted
+                });
+            };
+
+            api.Queue(req);
+        }
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);

From 358345cee72cf0e0c6ae57936ee8df27de4d72ac Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 16 May 2020 12:50:56 +0200
Subject: [PATCH 02778/10326] Change logic for parentscreen/subscreen relation

---
 .../Screens/TestSceneSeedingEditorScreen.cs      |  2 +-
 .../Screens/Editors/SeedingEditorScreen.cs       |  7 ++-----
 .../Screens/Editors/TeamEditorScreen.cs          |  6 +++---
 .../Screens/Editors/TournamentEditorScreen.cs    | 16 +++++++++-------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
index 17cccd34b6..8d12d5393d 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             var match = CreateSampleMatch();
 
-            Add(new SeedingEditorScreen(match.Team1.Value)
+            Add(new SeedingEditorScreen(match.Team1.Value, new TeamEditorScreen())
             {
                 Width = 0.85f // create room for control panel
             });
diff --git a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
index 0f980ec9a3..0973a7dc75 100644
--- a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
@@ -28,11 +28,8 @@ namespace osu.Game.Tournament.Screens.Editors
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
-        protected override bool IsSubScreen => true;
-
-        protected override System.Type ParentScreen => typeof(TeamEditorScreen);
-
-        public SeedingEditorScreen(TournamentTeam team)
+        public SeedingEditorScreen(TournamentTeam team, TournamentScreen parentScreen)
+            : base(parentScreen)
         {
             this.team = team;
         }
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 81487f1bcf..dbfcfe4225 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tournament.Screens.Editors
             });
         }
 
-        protected override TeamRow CreateDrawable(TournamentTeam model) => new TeamRow(model);
+        protected override TeamRow CreateDrawable(TournamentTeam model) => new TeamRow(model, this);
 
         private void addAllCountries()
         {
@@ -63,7 +63,7 @@ namespace osu.Game.Tournament.Screens.Editors
             [Resolved]
             private LadderInfo ladderInfo { get; set; }
 
-            public TeamRow(TournamentTeam team)
+            public TeamRow(TournamentTeam team, TournamentScreen parent)
             {
                 Model = team;
 
@@ -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, parent));
                                 }
                             },
                         }
diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index bca0814d3a..c0b56f1e68 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -33,13 +33,15 @@ namespace osu.Game.Tournament.Screens.Editors
 
         protected ControlPanel ControlPanel;
 
-        protected virtual bool IsSubScreen => false;
-
-        protected virtual System.Type ParentScreen { get; set; }
-
+        private readonly TournamentScreen parentScreen;
         private BackButton backButton;
 
-        private System.Action backAction => () => sceneManager?.SetScreen(ParentScreen);
+        private System.Action backAction => () => sceneManager?.SetScreen(parentScreen.GetType());
+
+        protected TournamentEditorScreen(TournamentScreen parentScreen = null)
+        {
+            this.parentScreen = parentScreen;
+        }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -51,7 +53,7 @@ namespace osu.Game.Tournament.Screens.Editors
                 Origin = Anchor.BottomLeft,
                 Action = () =>
                 {
-                    if (IsSubScreen)
+                    if (parentScreen != null)
                         backAction.Invoke();
                 }
             };
@@ -98,7 +100,7 @@ namespace osu.Game.Tournament.Screens.Editors
                 }
             });
 
-            if (IsSubScreen)
+            if (parentScreen != null)
                 backButton.Show();
 
             Storage.CollectionChanged += (_, args) =>

From 2c0ac8cc36dd55c859c05b9deb14efdb90479ffb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 17 May 2020 17:25:26 +0900
Subject: [PATCH 02779/10326] Move padding to fill, not scroll container

---
 osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index c0b56f1e68..7043328aa7 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -70,13 +70,13 @@ namespace osu.Game.Tournament.Screens.Editors
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
-                    Padding = new MarginPadding { Bottom = backButton.Height },
                     Child = flow = new FillFlowContainer<TDrawable>
                     {
                         Direction = FillDirection.Vertical,
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        Spacing = new Vector2(20)
+                        Spacing = new Vector2(20),
+                        Padding = new MarginPadding { Bottom = backButton.Height * 2 },
                     },
                 },
                 backButton,

From 864c1a73ae0ac1a1217ea85d8977004d171ff8bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 17 May 2020 17:27:52 +0900
Subject: [PATCH 02780/10326] Only add back button if required

---
 .../Screens/Editors/TournamentEditorScreen.cs | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 7043328aa7..b92818b84a 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -46,18 +46,6 @@ namespace osu.Game.Tournament.Screens.Editors
         [BackgroundDependencyLoader]
         private void load()
         {
-            BackButton.Receptor receptor = new BackButton.Receptor();
-            backButton = new BackButton(receptor)
-            {
-                Anchor = Anchor.BottomLeft,
-                Origin = Anchor.BottomLeft,
-                Action = () =>
-                {
-                    if (parentScreen != null)
-                        backAction.Invoke();
-                }
-            };
-
             AddRangeInternal(new Drawable[]
             {
                 new Box
@@ -76,10 +64,8 @@ namespace osu.Game.Tournament.Screens.Editors
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Spacing = new Vector2(20),
-                        Padding = new MarginPadding { Bottom = backButton.Height * 2 },
                     },
                 },
-                backButton,
                 ControlPanel = new ControlPanel
                 {
                     Children = new Drawable[]
@@ -101,7 +87,21 @@ namespace osu.Game.Tournament.Screens.Editors
             });
 
             if (parentScreen != null)
-                backButton.Show();
+            {
+                AddInternal(backButton = new BackButton(new BackButton.Receptor())
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    State = { Value = Visibility.Visible },
+                    Action = () =>
+                    {
+                        if (parentScreen != null)
+                            backAction.Invoke();
+                    }
+                });
+
+                flow.Padding = new MarginPadding { Bottom = backButton.Height * 2 };
+            }
 
             Storage.CollectionChanged += (_, args) =>
             {
@@ -126,7 +126,7 @@ namespace osu.Game.Tournament.Screens.Editors
             switch (action)
             {
                 case GlobalAction.Back:
-                    backAction.Invoke();
+                    backAction?.Invoke();
                     return true;
             }
 

From 13d4997c9165401c5123fd8a995cb9c8d9cb52e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 17 May 2020 17:35:10 +0900
Subject: [PATCH 02781/10326] Remove custom back action logic (use receptor as
 intended)

---
 .../Screens/Editors/TournamentEditorScreen.cs | 30 ++-----------------
 osu.Game/Graphics/UserInterface/BackButton.cs |  8 +++--
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index b92818b84a..a5a2c5c15f 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -10,8 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Input.Bindings;
-using osu.Framework.Input.Bindings;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays.Settings;
@@ -20,7 +18,7 @@ using osuTK;
 
 namespace osu.Game.Tournament.Screens.Editors
 {
-    public abstract class TournamentEditorScreen<TDrawable, TModel> : TournamentScreen, IProvideVideo, IKeyBindingHandler<GlobalAction>
+    public abstract class TournamentEditorScreen<TDrawable, TModel> : TournamentScreen, IProvideVideo
         where TDrawable : Drawable, IModelBacked<TModel>
         where TModel : class, new()
     {
@@ -36,8 +34,6 @@ namespace osu.Game.Tournament.Screens.Editors
         private readonly TournamentScreen parentScreen;
         private BackButton backButton;
 
-        private System.Action backAction => () => sceneManager?.SetScreen(parentScreen.GetType());
-
         protected TournamentEditorScreen(TournamentScreen parentScreen = null)
         {
             this.parentScreen = parentScreen;
@@ -88,16 +84,12 @@ namespace osu.Game.Tournament.Screens.Editors
 
             if (parentScreen != null)
             {
-                AddInternal(backButton = new BackButton(new BackButton.Receptor())
+                AddInternal(backButton = new BackButton
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     State = { Value = Visibility.Visible },
-                    Action = () =>
-                    {
-                        if (parentScreen != null)
-                            backAction.Invoke();
-                    }
+                    Action = () => sceneManager?.SetScreen(parentScreen.GetType())
                 });
 
                 flow.Padding = new MarginPadding { Bottom = backButton.Height * 2 };
@@ -121,22 +113,6 @@ namespace osu.Game.Tournament.Screens.Editors
                 flow.Add(CreateDrawable(model));
         }
 
-        public bool OnPressed(GlobalAction action)
-        {
-            switch (action)
-            {
-                case GlobalAction.Back:
-                    backAction?.Invoke();
-                    return true;
-            }
-
-            return false;
-        }
-
-        public void OnReleased(GlobalAction action)
-        {
-        }
-
         protected abstract TDrawable CreateDrawable(TModel model);
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/BackButton.cs b/osu.Game/Graphics/UserInterface/BackButton.cs
index 88ba7ede6e..37a8f7b1b4 100644
--- a/osu.Game/Graphics/UserInterface/BackButton.cs
+++ b/osu.Game/Graphics/UserInterface/BackButton.cs
@@ -16,10 +16,8 @@ namespace osu.Game.Graphics.UserInterface
 
         private readonly TwoLayerButton button;
 
-        public BackButton(Receptor receptor)
+        public BackButton(Receptor receptor = null)
         {
-            receptor.OnBackPressed = () => button.Click();
-
             Size = TwoLayerButton.SIZE_EXTENDED;
 
             Child = button = new TwoLayerButton
@@ -30,6 +28,10 @@ namespace osu.Game.Graphics.UserInterface
                 Icon = OsuIcon.LeftCircle,
                 Action = () => Action?.Invoke()
             };
+
+            Add(receptor ??= new Receptor());
+
+            receptor.OnBackPressed = () => button.Click();
         }
 
         [BackgroundDependencyLoader]

From 76c5be7bc1039611957ac5ba2b781255ae36ee23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 17 May 2020 17:16:22 +0200
Subject: [PATCH 02782/10326] Disallow catch-specific judgements in mania

---
 .../Scoring/ManiaHitWindows.cs                    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
index 549f0f9214..289f8a00ef 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
@@ -7,5 +7,20 @@ namespace osu.Game.Rulesets.Mania.Scoring
 {
     public class ManiaHitWindows : HitWindows
     {
+        public override bool IsHitResultAllowed(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.Perfect:
+                case HitResult.Great:
+                case HitResult.Good:
+                case HitResult.Ok:
+                case HitResult.Meh:
+                case HitResult.Miss:
+                    return true;
+            }
+
+            return false;
+        }
     }
 }

From bc6b64b1d7a2ffc5310a69a69a08a8b1a01f0be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 17 May 2020 21:55:01 +0200
Subject: [PATCH 02783/10326] Add failing test

---
 .../NonVisual/BarLineGeneratorTest.cs         | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/BarLineGeneratorTest.cs

diff --git a/osu.Game.Tests/NonVisual/BarLineGeneratorTest.cs b/osu.Game.Tests/NonVisual/BarLineGeneratorTest.cs
new file mode 100644
index 0000000000..e663e1128e
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/BarLineGeneratorTest.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.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Tests.NonVisual
+{
+    public class BarLineGeneratorTest
+    {
+        [Test]
+        public void TestRoundingErrorCompensation()
+        {
+            // The aim of this test is to make sure bar line generation compensates for floating-point errors.
+            // The premise of the test is that we have a single timing point that should result in bar lines
+            // that start at a time point that is a whole number every seventh beat.
+
+            // The fact it's every seventh beat is important - it's a number indivisible by 2, which makes
+            // it susceptible to rounding inaccuracies. In fact this was originally spotted in cases of maps
+            // that met exactly this criteria.
+
+            const int beat_length_numerator = 2000;
+            const int beat_length_denominator = 7;
+            const TimeSignatures signature = TimeSignatures.SimpleQuadruple;
+
+            var beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitObject { StartTime = 0 },
+                    new HitObject { StartTime = 120_000 }
+                },
+                ControlPointInfo = new ControlPointInfo()
+            };
+
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint
+            {
+                BeatLength = (double)beat_length_numerator / beat_length_denominator,
+                TimeSignature = signature
+            });
+
+            var barLines = new BarLineGenerator<BarLine>(beatmap).BarLines;
+
+            for (int i = 0; i * beat_length_denominator < barLines.Count; i++)
+            {
+                var barLine = barLines[i * beat_length_denominator];
+                var expectedTime = beat_length_numerator * (int)signature * i;
+
+                // every seventh bar's start time should be at least greater than the whole number we expect.
+                // It cannot be less, as that can affect overlapping scroll algorithms
+                // (the previous timing point might be chosen incorrectly if this is not the case)
+                Assert.GreaterOrEqual(barLine.StartTime, expectedTime);
+
+                // on the other side, make sure we don't stray too far from the expected time either.
+                Assert.IsTrue(Precision.AlmostEquals(barLine.StartTime, expectedTime));
+
+                // check major/minor lines for good measure too
+                Assert.AreEqual(i % (int)signature == 0, barLine.Major);
+            }
+        }
+
+        private class BarLine : IBarLine
+        {
+            public double StartTime { get; set; }
+            public bool Major { get; set; }
+        }
+    }
+}

From 17ae392a759771801a8a3d325c4e630f4c60f770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 17 May 2020 22:08:49 +0200
Subject: [PATCH 02784/10326] Apply rounding to bar line start times

---
 osu.Game/Rulesets/Objects/BarLineGenerator.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/BarLineGenerator.cs b/osu.Game/Rulesets/Objects/BarLineGenerator.cs
index 5588e9c0b7..9556b52735 100644
--- a/osu.Game/Rulesets/Objects/BarLineGenerator.cs
+++ b/osu.Game/Rulesets/Objects/BarLineGenerator.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Utils;
@@ -46,6 +47,16 @@ namespace osu.Game.Rulesets.Objects
 
                 for (double t = currentTimingPoint.Time; Precision.DefinitelyBigger(endTime, t); t += barLength, currentBeat++)
                 {
+                    var roundedTime = Math.Round(t, MidpointRounding.AwayFromZero);
+
+                    // in the case of some bar lengths, rounding errors can cause t to be slightly less than
+                    // the expected whole number value due to floating point inaccuracies.
+                    // if this is the case, apply rounding.
+                    if (Precision.AlmostEquals(t, roundedTime))
+                    {
+                        t = roundedTime;
+                    }
+
                     BarLines.Add(new TBarLine
                     {
                         StartTime = t,

From 80d188ec91caa05af9c71854a25b8d543aae7f05 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 17 May 2020 22:26:42 +0200
Subject: [PATCH 02785/10326] Update xmldoc with accurate information about the
 model

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

diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index b89160536d..4818842151 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -7,7 +7,7 @@ using osu.Framework.Bindables;
 namespace osu.Game.Tournament.Models
 {
     /// <summary>
-    /// Holds the complete data required to operate the tournament system.
+    /// Holds the path to locate the osu! stable cutting-edge installation.
     /// </summary>
     [Serializable]
     public class StableInfo

From 4bc858a2159bc2c73033800a48381831f7a42276 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 17 May 2020 22:27:44 +0200
Subject: [PATCH 02786/10326] Force a read of the location file during
 detection

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 321a4ad0aa..0454ef4e41 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -232,15 +232,17 @@ namespace osu.Game.Tournament.IPC
 
         private string findFromJsonConfig()
         {
-            try
+            Logger.Log("Trying to find stable through the json config");
+            if (tournamentStorage.Exists(stable_config))
             {
-                Logger.Log("Trying to find stable through the json config");
-                return stableInfo.StablePath.Value;
+                using (Stream stream = tournamentStorage.GetStream(stable_config, FileAccess.Read, FileMode.Open))
+                using (var sr = new StreamReader(stream))
+                {
+                    stableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());
+                    return stableInfo.StablePath.Value;
+                }
             }
-            catch
-            {
-            }
-
+            
             return null;
         }
 

From fbbf51851ecad9f379d410cb60594d1ee81310e8 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 17 May 2020 22:28:24 +0200
Subject: [PATCH 02787/10326] Moved refresh button to directoryselector

---
 .../Screens/StablePathSelectScreen.cs         | 145 ++++++++++++------
 1 file changed, 97 insertions(+), 48 deletions(-)

diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 1faacc727f..8b75bd9290 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -43,75 +43,107 @@ namespace osu.Game.Tournament.Screens
         private void load(Storage storage, OsuColour colours)
         {
             // begin selection in the parent directory of the current storage location
-            var initialPath = new DirectoryInfo(stableInfo.StablePath.Value).FullName;
+            var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
 
-            AddInternal(new Container
+            if (!string.IsNullOrEmpty(stableInfo.StablePath.Value))
             {
-                Masking = true,
-                CornerRadius = 10,
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(0.5f, 0.8f),
-                Children = new Drawable[]
+                // If the original path info for osu! stable is not empty, set it to the parent directory of that location
+                initialPath = new DirectoryInfo(stableInfo.StablePath.Value).Parent?.FullName;
+            }
+
+            AddRangeInternal(new Drawable[]
+            {
+                new Container
                 {
-                    new Box
+                    Masking = true,
+                    CornerRadius = 10,
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(0.5f, 0.8f),
+                    Children = new Drawable[]
                     {
-                        Colour = colours.GreySeafoamDark,
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new GridContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        RowDimensions = new[]
+                        new Box
                         {
-                            new Dimension(),
-                            new Dimension(GridSizeMode.Relative, 0.8f),
-                            new Dimension(),
+                            Colour = colours.GreySeafoamDark,
+                            RelativeSizeAxes = Axes.Both,
                         },
-                        Content = new[]
+                        new GridContainer
                         {
-                            new Drawable[]
+                            RelativeSizeAxes = Axes.Both,
+                            RowDimensions = new[]
                             {
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Text = "Please select a new location",
-                                    Font = OsuFont.Default.With(size: 40)
-                                },
+                                new Dimension(),
+                                new Dimension(GridSizeMode.Relative, 0.8f),
+                                new Dimension(),
                             },
-                            new Drawable[]
+                            Content = new[]
                             {
-                                directorySelector = new DirectorySelector(initialPath)
+                                new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.Both,
+                                    new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Text = "Please select a new location",
+                                        Font = OsuFont.Default.With(size: 40)
+                                    },
+                                },
+                                new Drawable[]
+                                {
+                                    directorySelector = new DirectorySelector(initialPath)
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                    }
+                                },
+                                new Drawable[]
+                                {
+                                    new FillFlowContainer
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Direction = FillDirection.Horizontal,
+                                        Spacing = new Vector2(20),
+                                        Children = new Drawable[]
+                                        {
+                                            new TriangleButton
+                                            {
+                                                Anchor = Anchor.Centre,
+                                                Origin = Anchor.Centre,
+                                                Width = 300,
+                                                Text = "Select stable path",
+                                                Action = () => changePath(storage)
+                                            },
+                                            new TriangleButton
+                                            {
+                                                Anchor = Anchor.Centre,
+                                                Origin = Anchor.Centre,
+                                                Width = 300,
+                                                Text = "Auto detect",
+                                                Action = autoDetect
+                                            },
+                                        }
+                                    }
                                 }
-                            },
-                            new Drawable[]
-                            {
-                                new TriangleButton
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Width = 300,
-                                    Text = "Select stable path",
-                                    Action = () => { start(storage); }
-                                },
                             }
                         }
-                    }
+                    },
+                },
+                new BackButton
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    State = { Value = Visibility.Visible },
+                    Action = () => sceneManager?.SetScreen(typeof(SetupScreen))
                 }
             });
         }
 
-        private static bool checkExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
-
-        private void start(Storage storage)
+        private void changePath(Storage storage)
         {
             var target = directorySelector.CurrentDirectory.Value.FullName;
 
-            if (checkExists(target))
+            if (File.Exists(Path.Combine(target, "ipc.txt")))
             {
                 stableInfo.StablePath.Value = target;
 
@@ -145,5 +177,22 @@ namespace osu.Game.Tournament.Screens
                 // Return an error in the picker that the directory does not contain ipc.txt
             }
         }
+
+        private void autoDetect()
+        {
+            var fileBasedIpc = ipc as FileBasedIPC;
+            fileBasedIpc?.LocateStableStorage();
+            if (fileBasedIpc?.IPCStorage == null)
+            {
+                // Could not auto detect
+                overlay = new DialogOverlay();
+                overlay.Push(new IPCNotFoundDialog());
+                AddInternal(overlay);
+            }
+            else
+            {
+                sceneManager?.SetScreen(typeof(SetupScreen));
+            }
+        }
     }
 }

From a97100216ca3da33c3aba2b91971d6baf3eb24df Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 17 May 2020 22:28:54 +0200
Subject: [PATCH 02788/10326] Changed behaviour of refresh button in
 SetupScreen

---
 osu.Game.Tournament/Screens/SetupScreen.cs | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 93edd73ff8..dcaadc8247 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -82,20 +82,7 @@ namespace osu.Game.Tournament.Screens
                     ButtonText = "Refresh",
                     Action = () =>
                     {
-                        fileBasedIpc?.LocateStableStorage();
-                        reload();
-                    },
-                    Value = fileBasedIpc?.IPCStorage?.GetFullPath(string.Empty) ?? "Not found",
-                    Failing = fileBasedIpc?.IPCStorage == null,
-                    Description = "The osu!stable installation which is currently being used as a data source. If a source is not found, make sure you have created an empty ipc.txt in your stable cutting-edge installation, and that it is registered as the default osu! install."
-                },
-                new ActionableInfo
-                {
-                    Label = "Custom IPC source",
-                    ButtonText = "Change path",
-                    Action = () =>
-                    {
-                        stableInfo.StablePath.BindValueChanged(_ =>
+                         stableInfo.StablePath.BindValueChanged(_ =>
                         {
                             fileBasedIpc?.LocateStableStorage();
                             Schedule(reload);
@@ -104,7 +91,7 @@ namespace osu.Game.Tournament.Screens
                     },
                     Value = fileBasedIpc?.IPCStorage?.GetFullPath(string.Empty) ?? "Not found",
                     Failing = fileBasedIpc?.IPCStorage == null,
-                    Description = "The osu!stable installation which is currently being used as a data source. If a source is not found, you can manually select the desired osu! installation that you want to use."
+                    Description = "The osu!stable installation which is currently being used as a data source. If a source is not found, make sure you have created an empty ipc.txt in your stable cutting-edge installation."
                 },
                 new ActionableInfo
                 {

From 59b006f9ac8688b75fa6556fb286f27f37cdbbca Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 17 May 2020 22:46:43 +0200
Subject: [PATCH 02789/10326] Make IPC error dialog reusable

and inspectcode fixes
---
 .../{IPCNotFoundDialog.cs => IPCErrorDialog.cs}       | 11 +++++------
 osu.Game.Tournament/IPC/FileBasedIPC.cs               |  3 ++-
 osu.Game.Tournament/Screens/SetupScreen.cs            |  2 +-
 osu.Game.Tournament/Screens/StablePathSelectScreen.cs |  5 +++--
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename osu.Game.Tournament/Components/{IPCNotFoundDialog.cs => IPCErrorDialog.cs} (65%)

diff --git a/osu.Game.Tournament/Components/IPCNotFoundDialog.cs b/osu.Game.Tournament/Components/IPCErrorDialog.cs
similarity index 65%
rename from osu.Game.Tournament/Components/IPCNotFoundDialog.cs
rename to osu.Game.Tournament/Components/IPCErrorDialog.cs
index d4f9edc182..07fd0ac973 100644
--- a/osu.Game.Tournament/Components/IPCNotFoundDialog.cs
+++ b/osu.Game.Tournament/Components/IPCErrorDialog.cs
@@ -6,14 +6,13 @@ using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Tournament.Components
 {
-    public class IPCNotFoundDialog : PopupDialog
+    public class IPCErrorDialog : PopupDialog
     {
-        public IPCNotFoundDialog()
+        public IPCErrorDialog(string headerText, string bodyText)
         {
-            BodyText = "Select a directory that contains an osu! Cutting Edge installation";
-
-            Icon = FontAwesome.Regular.Angry;
-            HeaderText = @"This is an invalid IPC Directory!";
+            Icon = FontAwesome.Regular.SadTear;
+            HeaderText = headerText;
+            BodyText = bodyText;
             Buttons = new PopupDialogButton[]
             {
                 new PopupDialogOkButton
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 0454ef4e41..730779a46b 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -233,6 +233,7 @@ namespace osu.Game.Tournament.IPC
         private string findFromJsonConfig()
         {
             Logger.Log("Trying to find stable through the json config");
+
             if (tournamentStorage.Exists(stable_config))
             {
                 using (Stream stream = tournamentStorage.GetStream(stable_config, FileAccess.Read, FileMode.Open))
@@ -242,7 +243,7 @@ namespace osu.Game.Tournament.IPC
                     return stableInfo.StablePath.Value;
                 }
             }
-            
+
             return null;
         }
 
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index dcaadc8247..4f6d063b10 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Tournament.Screens
                     ButtonText = "Refresh",
                     Action = () =>
                     {
-                         stableInfo.StablePath.BindValueChanged(_ =>
+                        stableInfo.StablePath.BindValueChanged(_ =>
                         {
                             fileBasedIpc?.LocateStableStorage();
                             Schedule(reload);
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 8b75bd9290..35c2272918 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Tournament.Screens
             else
             {
                 overlay = new DialogOverlay();
-                overlay.Push(new IPCNotFoundDialog());
+                overlay.Push(new IPCErrorDialog("This is an invalid IPC Directory", "Select a directory that contains an osu! stable cutting edge installation and make sure it has an empty ipc.txt file in it."));
                 AddInternal(overlay);
                 Logger.Log("Folder is not an osu! stable CE directory");
                 // Return an error in the picker that the directory does not contain ipc.txt
@@ -182,11 +182,12 @@ namespace osu.Game.Tournament.Screens
         {
             var fileBasedIpc = ipc as FileBasedIPC;
             fileBasedIpc?.LocateStableStorage();
+
             if (fileBasedIpc?.IPCStorage == null)
             {
                 // Could not auto detect
                 overlay = new DialogOverlay();
-                overlay.Push(new IPCNotFoundDialog());
+                overlay.Push(new IPCErrorDialog("Failed to auto detect", "An osu! stable cutting-edge installation could not be auto detected.\nPlease try and manually point to the directory."));
                 AddInternal(overlay);
             }
             else

From 9bfdfbea43e14bbad24554a2d8758327882561a7 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 18 May 2020 00:47:31 +0200
Subject: [PATCH 02790/10326] Move stablestorage check to path selection screen

Also forced stablepath to be empty during auto detection so it checks other sources to load ipc from
---
 osu.Game.Tournament/IPC/FileBasedIPC.cs           | 15 +++++++--------
 osu.Game.Tournament/Screens/SetupScreen.cs        |  1 -
 .../Screens/StablePathSelectScreen.cs             |  4 ++++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 730779a46b..6d1cd7cc3c 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -232,16 +232,15 @@ namespace osu.Game.Tournament.IPC
 
         private string findFromJsonConfig()
         {
-            Logger.Log("Trying to find stable through the json config");
-
-            if (tournamentStorage.Exists(stable_config))
+            try
             {
-                using (Stream stream = tournamentStorage.GetStream(stable_config, FileAccess.Read, FileMode.Open))
-                using (var sr = new StreamReader(stream))
-                {
-                    stableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());
+                Logger.Log("Trying to find stable through the json config");
+
+                if (!string.IsNullOrEmpty(stableInfo.StablePath.Value))
                     return stableInfo.StablePath.Value;
-                }
+            }
+            catch
+            {
             }
 
             return null;
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 4f6d063b10..e0fc98e031 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -84,7 +84,6 @@ namespace osu.Game.Tournament.Screens
                     {
                         stableInfo.StablePath.BindValueChanged(_ =>
                         {
-                            fileBasedIpc?.LocateStableStorage();
                             Schedule(reload);
                         });
                         sceneManager.SetScreen(new StablePathSelectScreen());
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 35c2272918..5c488ae352 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -142,6 +142,7 @@ namespace osu.Game.Tournament.Screens
         private void changePath(Storage storage)
         {
             var target = directorySelector.CurrentDirectory.Value.FullName;
+            Logger.Log($"Changing Stable CE location to {target}");
 
             if (File.Exists(Path.Combine(target, "ipc.txt")))
             {
@@ -161,6 +162,8 @@ namespace osu.Game.Tournament.Screens
                             }));
                     }
 
+                    var fileBasedIpc = ipc as FileBasedIPC;
+                    fileBasedIpc?.LocateStableStorage();
                     sceneManager?.SetScreen(typeof(SetupScreen));
                 }
                 catch (Exception e)
@@ -180,6 +183,7 @@ namespace osu.Game.Tournament.Screens
 
         private void autoDetect()
         {
+            stableInfo.StablePath.Value = string.Empty; // This forces findStablePath() to look elsewhere.
             var fileBasedIpc = ipc as FileBasedIPC;
             fileBasedIpc?.LocateStableStorage();
 

From 7a839c1486cf96d322187474f34d3fd4f63c4b81 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 18 May 2020 00:50:08 +0200
Subject: [PATCH 02791/10326] Renamed Refresh button to Change source

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

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index e0fc98e031..478240f8b4 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Tournament.Screens
                 new ActionableInfo
                 {
                     Label = "Current IPC source",
-                    ButtonText = "Refresh",
+                    ButtonText = "Change source",
                     Action = () =>
                     {
                         stableInfo.StablePath.BindValueChanged(_ =>

From a0a54efd4ec7f8ab4b1aaebf965cdd2e693fee4e Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 18 May 2020 01:05:34 +0200
Subject: [PATCH 02792/10326] Fix test crashing because of sceneManager not
 being nullable

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

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 478240f8b4..1c479bdec4 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Tournament.Screens
                         {
                             Schedule(reload);
                         });
-                        sceneManager.SetScreen(new StablePathSelectScreen());
+                        sceneManager?.SetScreen(new StablePathSelectScreen());
                     },
                     Value = fileBasedIpc?.IPCStorage?.GetFullPath(string.Empty) ?? "Not found",
                     Failing = fileBasedIpc?.IPCStorage == null,

From 59ef6002bd9e3b32adbd00761456687c36ff312c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 May 2020 13:12:30 +0900
Subject: [PATCH 02793/10326] 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 650ebde54d..eaad4daf35 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.511.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.518.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ee6206e166..9112dfe46e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.511.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.518.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index cbf8600c62..3f0630af5f 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.Framework.iOS" Version="2020.511.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.518.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.511.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.518.0" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1865cd0762f6e99bfabba22a76ca2165e0b2c08d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 18 May 2020 15:10:59 +0900
Subject: [PATCH 02794/10326] Fix possible exceptions in performance
 calculators

---
 .../Difficulty/CatchPerformanceCalculator.cs        | 12 ++++++------
 .../Difficulty/ManiaPerformanceCalculator.cs        | 13 +++++++------
 .../Difficulty/OsuPerformanceCalculator.cs          |  9 +++++----
 .../Difficulty/TaikoPerformanceCalculator.cs        |  9 +++++----
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
index e7ce680365..2dc28fad35 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
@@ -4,12 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Scoring.Legacy;
 
 namespace osu.Game.Rulesets.Catch.Difficulty
 {
@@ -34,11 +34,11 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         {
             mods = Score.Mods;
 
-            fruitsHit = Score?.GetCount300() ?? Score.Statistics[HitResult.Perfect];
-            ticksHit = Score?.GetCount100() ?? 0;
-            tinyTicksHit = Score?.GetCount50() ?? 0;
-            tinyTicksMissed = Score?.GetCountKatu() ?? 0;
-            misses = Score.Statistics[HitResult.Miss];
+            fruitsHit = Score.Statistics.GetOrDefault(HitResult.Perfect);
+            ticksHit = Score.Statistics.GetOrDefault(HitResult.LargeTickHit);
+            tinyTicksHit = Score.Statistics.GetOrDefault(HitResult.SmallTickHit);
+            tinyTicksMissed = Score.Statistics.GetOrDefault(HitResult.SmallTickMiss);
+            misses = Score.Statistics.GetOrDefault(HitResult.Miss);
 
             // Don't count scores made with supposedly unranked mods
             if (mods.Any(m => !m.Ranked))
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
index 3f7a2baedd..91383c5548 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
@@ -37,12 +38,12 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         {
             mods = Score.Mods;
             scaledScore = Score.TotalScore;
-            countPerfect = Score.Statistics[HitResult.Perfect];
-            countGreat = Score.Statistics[HitResult.Great];
-            countGood = Score.Statistics[HitResult.Good];
-            countOk = Score.Statistics[HitResult.Ok];
-            countMeh = Score.Statistics[HitResult.Meh];
-            countMiss = Score.Statistics[HitResult.Miss];
+            countPerfect = Score.Statistics.GetOrDefault(HitResult.Perfect);
+            countGreat = Score.Statistics.GetOrDefault(HitResult.Great);
+            countGood = Score.Statistics.GetOrDefault(HitResult.Good);
+            countOk = Score.Statistics.GetOrDefault(HitResult.Ok);
+            countMeh = Score.Statistics.GetOrDefault(HitResult.Meh);
+            countMiss = Score.Statistics.GetOrDefault(HitResult.Miss);
 
             if (mods.Any(m => !m.Ranked))
                 return 0;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index ce8ecf02ac..4022b554f4 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
@@ -45,10 +46,10 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             mods = Score.Mods;
             accuracy = Score.Accuracy;
             scoreMaxCombo = Score.MaxCombo;
-            countGreat = Score.Statistics[HitResult.Great];
-            countGood = Score.Statistics[HitResult.Good];
-            countMeh = Score.Statistics[HitResult.Meh];
-            countMiss = Score.Statistics[HitResult.Miss];
+            countGreat = Score.Statistics.GetOrDefault(HitResult.Great);
+            countGood = Score.Statistics.GetOrDefault(HitResult.Good);
+            countMeh = Score.Statistics.GetOrDefault(HitResult.Meh);
+            countMiss = Score.Statistics.GetOrDefault(HitResult.Miss);
 
             // Don't count scores made with supposedly unranked mods
             if (mods.Any(m => !m.Ranked))
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
index 3a0fb64622..bc147b53ac 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
@@ -31,10 +32,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         public override double Calculate(Dictionary<string, double> categoryDifficulty = null)
         {
             mods = Score.Mods;
-            countGreat = Score.Statistics[HitResult.Great];
-            countGood = Score.Statistics[HitResult.Good];
-            countMeh = Score.Statistics[HitResult.Meh];
-            countMiss = Score.Statistics[HitResult.Miss];
+            countGreat = Score.Statistics.GetOrDefault(HitResult.Great);
+            countGood = Score.Statistics.GetOrDefault(HitResult.Good);
+            countMeh = Score.Statistics.GetOrDefault(HitResult.Meh);
+            countMiss = Score.Statistics.GetOrDefault(HitResult.Miss);
 
             // Don't count scores made with supposedly unranked mods
             if (mods.Any(m => !m.Ranked))

From d9bb90078b5f0b9d4c32635417f818fe1c562073 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 May 2020 17:47:47 +0900
Subject: [PATCH 02795/10326] Move grids to inside columns

---
 .../Edit/ManiaBeatSnapGrid.cs                 | 48 +++++++++----------
 osu.Game.Rulesets.Mania/UI/Column.cs          |  2 +
 .../UI/Components/ColumnHitObjectArea.cs      |  8 ++++
 3 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 31ebb7bc1c..9a998366e9 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -7,12 +7,10 @@ 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.Rulesets.Mania.Objects.Drawables.Pieces;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -22,7 +20,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    public class ManiaBeatSnapGrid : CompositeDrawable
+    public class ManiaBeatSnapGrid : Component
     {
         /// <summary>
         /// The brightness of bar lines one beat around the time range from <see cref="SetRange"/>.
@@ -54,15 +52,32 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
             foreach (var stage in composer.Playfield.Stages)
             {
-                var grid = new Grid(stage);
-                grids.Add(grid);
+                foreach (var column in stage.Columns)
+                {
+                    var grid = new Grid();
 
-                AddInternal(grid);
+                    grids.Add(grid);
+                    column.UnderlayElements.Add(grid);
+                }
             }
 
             beatDivisor.BindValueChanged(_ => createLines(), true);
         }
 
+        public override void Hide()
+        {
+            base.Hide();
+            foreach (var grid in grids)
+                grid.Hide();
+        }
+
+        public override void Show()
+        {
+            base.Show();
+            foreach (var grid in grids)
+                grid.Show();
+        }
+
         private void createLines()
         {
             foreach (var grid in grids)
@@ -145,7 +160,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                 linesDuring.Clear();
                 linesAfter.Clear();
 
-                foreach (var line in grid.AliveObjects.OfType<DrawableGridLine>())
+                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
                 {
                     if (line.HitObject.StartTime < minTime)
                         linesBefore.Add(line);
@@ -202,30 +217,11 @@ namespace osu.Game.Rulesets.Mania.Edit
             [Resolved]
             private IManiaHitObjectComposer composer { get; set; }
 
-            private readonly Stage stage;
-
-            public Grid(Stage stage)
-            {
-                this.stage = stage;
-
-                RelativeSizeAxes = Axes.None;
-            }
-
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-
                 Clock = composer.Playfield.Clock;
             }
-
-            protected override void Update()
-            {
-                base.Update();
-
-                var parentQuad = Parent.ToLocalSpace(stage.HitObjectContainer.ScreenSpaceDrawQuad);
-                Position = parentQuad.TopLeft;
-                Size = parentQuad.Size;
-            }
         }
 
         private class DrawableGridLine : DrawableHitObject
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 506a07f26b..511d6c8623 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         internal readonly Container TopLevelContainer;
 
+        public Container UnderlayElements => hitObjectArea.UnderlayElements;
+
         public Column(int index)
         {
             Index = index;
diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
index cb79bf7f43..b365ae45a9 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
@@ -12,6 +12,9 @@ namespace osu.Game.Rulesets.Mania.UI.Components
     public class ColumnHitObjectArea : HitObjectArea
     {
         public readonly Container Explosions;
+
+        public readonly Container UnderlayElements;
+
         private readonly Drawable hitTarget;
 
         public ColumnHitObjectArea(int columnIndex, HitObjectContainer hitObjectContainer)
@@ -19,6 +22,11 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         {
             AddRangeInternal(new[]
             {
+                UnderlayElements = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = 2,
+                },
                 hitTarget = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitTarget, columnIndex), _ => new DefaultHitTarget())
                 {
                     RelativeSizeAxes = Axes.X,

From 16e85ae0b1c0399b2a3dce77df4758b3c51f6079 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 May 2020 17:52:04 +0900
Subject: [PATCH 02796/10326] Remove Grid class

---
 .../Edit/ManiaBeatSnapGrid.cs                 | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 9a998366e9..5b13b1421c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         [Resolved]
         private BindableBeatDivisor beatDivisor { get; set; }
 
-        private readonly List<Grid> grids = new List<Grid>();
+        private readonly List<ScrollingHitObjectContainer> grids = new List<ScrollingHitObjectContainer>();
 
         [BackgroundDependencyLoader]
         private void load()
@@ -54,10 +54,10 @@ namespace osu.Game.Rulesets.Mania.Edit
             {
                 foreach (var column in stage.Columns)
                 {
-                    var grid = new Grid();
+                    var lineContainer = new ScrollingHitObjectContainer();
 
-                    grids.Add(grid);
-                    column.UnderlayElements.Add(grid);
+                    grids.Add(lineContainer);
+                    column.UnderlayElements.Add(lineContainer);
                 }
             }
 
@@ -212,18 +212,6 @@ namespace osu.Game.Rulesets.Mania.Edit
             }
         }
 
-        private class Grid : ScrollingHitObjectContainer
-        {
-            [Resolved]
-            private IManiaHitObjectComposer composer { get; set; }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                Clock = composer.Playfield.Clock;
-            }
-        }
-
         private class DrawableGridLine : DrawableHitObject
         {
             [Resolved]

From b43e9781566e45723dfe33ebc24fc8083edd0f96 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Mon, 18 May 2020 17:44:56 +0800
Subject: [PATCH 02797/10326] Unify to use double in
 CatchPerformanceCalculator.

---
 .../Difficulty/CatchPerformanceCalculator.cs  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
index 2dc28fad35..2ee7cea645 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
@@ -52,8 +52,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             // Longer maps are worth more
             double lengthBonus =
-                0.95f + 0.3f * Math.Min(1.0f, numTotalHits / 2500.0f) +
-                (numTotalHits > 2500 ? (float)Math.Log10(numTotalHits / 2500.0f) * 0.475f : 0.0f);
+                0.95 + 0.3 * Math.Min(1.0, numTotalHits / 2500.0) +
+                (numTotalHits > 2500 ? Math.Log10(numTotalHits / 2500.0) * 0.475 : 0.0);
 
             // Longer maps are worth more
             value *= lengthBonus;
@@ -65,14 +65,14 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             if (Attributes.MaxCombo > 0)
                 value *= Math.Min(Math.Pow(Score.MaxCombo, 0.8) / Math.Pow(Attributes.MaxCombo, 0.8), 1.0);
 
-            float approachRate = (float)Attributes.ApproachRate;
-            float approachRateFactor = 1.0f;
-            if (approachRate > 9.0f)
-                approachRateFactor += 0.1f * (approachRate - 9.0f); // 10% for each AR above 9
-            if (approachRate > 10.0f)
-                approachRateFactor += 0.1f * (approachRate - 10.0f); // Additional 10% at AR 11, 30% total
-            else if (approachRate < 8.0f)
-                approachRateFactor += 0.025f * (8.0f - approachRate); // 2.5% for each AR below 8
+            double approachRate = Attributes.ApproachRate;
+            double approachRateFactor = 1.0;
+            if (approachRate > 9.0)
+                approachRateFactor += 0.1 * (approachRate - 9.0); // 10% for each AR above 9
+            if (approachRate > 10.0)
+                approachRateFactor += 0.1 * (approachRate - 10.0); // Additional 10% at AR 11, 30% total
+            else if (approachRate < 8.0)
+                approachRateFactor += 0.025 * (8.0 - approachRate); // 2.5% for each AR below 8
 
             value *= approachRateFactor;
 
@@ -80,10 +80,10 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             {
                 value *= 1.05 + 0.075 * (10.0 - Math.Min(10.0, Attributes.ApproachRate)); // 7.5% for each AR below 10
                 // Hiddens gives almost nothing on max approach rate, and more the lower it is
-                if (approachRate <= 10.0f)
-                    value *= 1.05f + 0.075f * (10.0f - approachRate); // 7.5% for each AR below 10
-                else if (approachRate > 10.0f)
-                    value *= 1.01f + 0.04f * (11.0f - Math.Min(11.0f, approachRate)); // 5% at AR 10, 1% at AR 11
+                if (approachRate <= 10.0)
+                    value *= 1.05 + 0.075 * (10.0 - approachRate); // 7.5% for each AR below 10
+                else if (approachRate > 10.0)
+                    value *= 1.01 + 0.04 * (11.0 - Math.Min(11.0, approachRate)); // 5% at AR 10, 1% at AR 11
             }
 
             if (mods.Any(m => m is ModFlashlight))
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             return value;
         }
 
-        private float accuracy() => totalHits() == 0 ? 0 : Math.Clamp((float)totalSuccessfulHits() / totalHits(), 0, 1);
+        private double accuracy() => totalHits() == 0 ? 0 : Math.Clamp((double)totalSuccessfulHits() / totalHits(), 0, 1);
         private int totalHits() => tinyTicksHit + ticksHit + fruitsHit + misses + tinyTicksMissed;
         private int totalSuccessfulHits() => tinyTicksHit + ticksHit + fruitsHit;
         private int totalComboHits() => misses + ticksHit + fruitsHit;

From 373aae06109b845c078dcaaacab8deb5406094b3 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Mon, 18 May 2020 17:45:32 +0800
Subject: [PATCH 02798/10326] Use int for total hits in
 OsuPerformanceCalculator.

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 4022b554f4..c8c6db06d7 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -204,7 +204,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             return accuracyValue;
         }
 
-        private double totalHits => countGreat + countGood + countMeh + countMiss;
-        private double totalSuccessfulHits => countGreat + countGood + countMeh;
+        private int totalHits => countGreat + countGood + countMeh + countMiss;
+        private int totalSuccessfulHits => countGreat + countGood + countMeh;
     }
 }

From c20902f249883ab6a16ca95d3096463767cc015a Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Mon, 18 May 2020 18:22:03 +0800
Subject: [PATCH 02799/10326] Fix double in accuracy calculation in
 OsuPerformanceCalculator.

---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index c8c6db06d7..6f4c0f9cfa 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             int amountHitObjectsWithAccuracy = countHitCircles;
 
             if (amountHitObjectsWithAccuracy > 0)
-                betterAccuracyPercentage = ((countGreat - (totalHits - amountHitObjectsWithAccuracy)) * 6 + countGood * 2 + countMeh) / (amountHitObjectsWithAccuracy * 6);
+                betterAccuracyPercentage = ((countGreat - (totalHits - amountHitObjectsWithAccuracy)) * 6 + countGood * 2 + countMeh) / (double)(amountHitObjectsWithAccuracy * 6);
             else
                 betterAccuracyPercentage = 0;
 

From 49ee05c3c4dbd8b8d9d6f673fb887665b384b592 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 18 May 2020 19:37:49 +0900
Subject: [PATCH 02800/10326] Make into CompositeDrawable

---
 osu.Game/Screens/Play/SkipOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index fec35df4e3..b123757ded 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -24,7 +24,7 @@ using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Play
 {
-    public class SkipOverlay : Container, IKeyBindingHandler<GlobalAction>
+    public class SkipOverlay : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
         private readonly double startTime;
 
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader(true)]
         private void load(OsuColour colours)
         {
-            Child = buttonContainer = new ButtonContainer
+            InternalChild = buttonContainer = new ButtonContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = fadeContainer = new FadeContainer

From b35b150f3883609e62e31e8bb6216e82b888cc6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 May 2020 19:32:14 +0900
Subject: [PATCH 02801/10326] Simplify colouring logic

---
 .../Edit/ManiaBeatSnapGrid.cs                 | 66 +++----------------
 1 file changed, 9 insertions(+), 57 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 5b13b1421c..e771a9753f 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -22,10 +22,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public class ManiaBeatSnapGrid : Component
     {
-        /// <summary>
-        /// The brightness of bar lines one beat around the time range from <see cref="SetRange"/>.
-        /// </summary>
-        private const float first_beat_brightness = 0.5f;
+        private const double visible_range = 1500;
 
         [Resolved]
         private IManiaHitObjectComposer composer { get; set; }
@@ -150,64 +147,19 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         private void setRange(double minTime, double maxTime)
         {
-            var linesBefore = new List<DrawableGridLine>();
-            var linesDuring = new List<DrawableGridLine>();
-            var linesAfter = new List<DrawableGridLine>();
-
             foreach (var grid in grids)
             {
-                linesBefore.Clear();
-                linesDuring.Clear();
-                linesAfter.Clear();
-
                 foreach (var line in grid.Objects.OfType<DrawableGridLine>())
                 {
-                    if (line.HitObject.StartTime < minTime)
-                        linesBefore.Add(line);
-                    else if (line.HitObject.StartTime <= maxTime)
-                        linesDuring.Add(line);
+                    double lineTime = line.HitObject.StartTime;
+
+                    if (lineTime >= minTime && lineTime <= maxTime)
+                        line.Colour = Color4.White;
                     else
-                        linesAfter.Add(line);
-                }
-
-                // Snapping will always happen on one of the two lines around minTime (the "target" line).
-                // One of those lines may exist in linesBefore and the other may exist in linesAfter, depending on whether such a line exists, and the target changes when the mid-point is crossed.
-                // For display purposes, one complete beat is shown at the maximum brightness such that the target line should always be bright.
-                bool targetLineIsLastLineBefore = false;
-
-                if (linesBefore.Count > 0 && linesAfter.Count > 0)
-                    targetLineIsLastLineBefore = Math.Abs(linesBefore[^1].HitObject.StartTime - minTime) <= Math.Abs(linesAfter[0].HitObject.StartTime - minTime);
-                else if (linesBefore.Count > 0)
-                    targetLineIsLastLineBefore = true;
-
-                if (targetLineIsLastLineBefore)
-                {
-                    // Move the last line before to linesDuring
-                    linesDuring.Insert(0, linesBefore[^1]);
-                    linesBefore.RemoveAt(linesBefore.Count - 1);
-                }
-                else if (linesAfter.Count > 0) // = false does not guarantee that a line after exists (maybe at the bottom of the screen)
-                {
-                    // Move the first line after to linesDuring
-                    linesDuring.Insert(0, linesAfter[0]);
-                    linesAfter.RemoveAt(0);
-                }
-
-                // Grays are used rather than transparency since the lines appear on a coloured mania playfield.
-
-                foreach (var l in linesDuring)
-                    l.Colour = OsuColour.Gray(first_beat_brightness);
-
-                for (int i = 0; i < linesBefore.Count; i++)
-                {
-                    int offset = (linesBefore.Count - i - 1) / beatDivisor.Value;
-                    linesBefore[i].Colour = OsuColour.Gray(first_beat_brightness / (offset + 1));
-                }
-
-                for (int i = 0; i < linesAfter.Count; i++)
-                {
-                    int offset = i / beatDivisor.Value;
-                    linesAfter[i].Colour = OsuColour.Gray(first_beat_brightness / (offset + 1));
+                    {
+                        double timeSeparation = lineTime < minTime ? minTime - lineTime : lineTime - maxTime;
+                        line.Colour = OsuColour.Gray((float)Math.Max(0, 1 - timeSeparation / visible_range));
+                    }
                 }
             }
         }

From 2fd25f5ee6776fd9c17f3ae25a1e00a6d435ba42 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 18 May 2020 19:54:26 +0900
Subject: [PATCH 02802/10326] Fix tests

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index e093542d1e..12ada088a1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
             AddStep("button down", () => InputManager.PressButton(MouseButton.Left));
-            AddUntilStep("wait for overlay disappear", () => !skip.Child.IsPresent);
+            AddUntilStep("wait for overlay disappear", () => !skip.OverlayContents.IsPresent);
             AddAssert("ensure button didn't disappear", () => skip.OverlayContents.Alpha > 0);
             AddStep("button up", () => InputManager.ReleaseButton(MouseButton.Left));
             checkRequestCount(0);
@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            public Drawable OverlayContents => (Child as Container)?.Child;
+            public Drawable OverlayContents => (InternalChild as Container)?.Child;
         }
     }
 }

From f98ee2718552e1663318e7466d70cc51e983264d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 18 May 2020 20:01:00 +0900
Subject: [PATCH 02803/10326] Fix referencing wrong child

---
 .../Visual/Gameplay/TestSceneSkipOverlay.cs    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index 12ada088a1..7ed7a116b4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -56,19 +56,19 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestFadeOnIdle()
         {
             AddStep("move mouse", () => InputManager.MoveMouseTo(Vector2.Zero));
-            AddUntilStep("fully visible", () => skip.OverlayContents.Alpha == 1);
-            AddUntilStep("wait for fade", () => skip.OverlayContents.Alpha < 1);
+            AddUntilStep("fully visible", () => skip.FadingContent.Alpha == 1);
+            AddUntilStep("wait for fade", () => skip.FadingContent.Alpha < 1);
 
             AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
-            AddUntilStep("fully visible", () => skip.OverlayContents.Alpha == 1);
-            AddUntilStep("wait for fade", () => skip.OverlayContents.Alpha < 1);
+            AddUntilStep("fully visible", () => skip.FadingContent.Alpha == 1);
+            AddUntilStep("wait for fade", () => skip.FadingContent.Alpha < 1);
         }
 
         [Test]
         public void TestClickableAfterFade()
         {
             AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
-            AddUntilStep("wait for fade", () => skip.OverlayContents.Alpha == 0);
+            AddUntilStep("wait for fade", () => skip.FadingContent.Alpha == 0);
             AddStep("click", () => InputManager.Click(MouseButton.Left));
             checkRequestCount(1);
         }
@@ -105,8 +105,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
             AddStep("button down", () => InputManager.PressButton(MouseButton.Left));
-            AddUntilStep("wait for overlay disappear", () => !skip.OverlayContents.IsPresent);
-            AddAssert("ensure button didn't disappear", () => skip.OverlayContents.Alpha > 0);
+            AddUntilStep("wait for overlay disappear", () => !skip.OverlayContent.IsPresent);
+            AddAssert("ensure button didn't disappear", () => skip.FadingContent.Alpha > 0);
             AddStep("button up", () => InputManager.ReleaseButton(MouseButton.Left));
             checkRequestCount(0);
         }
@@ -121,7 +121,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            public Drawable OverlayContents => (InternalChild as Container)?.Child;
+            public Drawable OverlayContent => InternalChild;
+
+            public Drawable FadingContent => (OverlayContent as Container)?.Child;
         }
     }
 }

From 406f39e8bfc281fc91c3e96ce12077423974006f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 May 2020 21:27:26 +0900
Subject: [PATCH 02804/10326] Construct online visible lines

---
 .../TestSceneManiaBeatSnapGrid.cs             |   2 +-
 .../Edit/ManiaBeatSnapGrid.cs                 | 135 ++++++++++--------
 .../Edit/ManiaHitObjectComposer.cs            |   9 +-
 3 files changed, 81 insertions(+), 65 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
index 84419313e6..941cf4e7c8 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             float relativePosition = Playfield.Stages[0].HitObjectContainer.ToLocalSpace(e.ScreenSpaceMousePosition).Y / Playfield.Stages[0].HitObjectContainer.DrawHeight;
             double timeValue = scrollingInfo.TimeRange.Value * relativePosition;
 
-            beatSnapGrid.SetRange(timeValue, timeValue);
+            beatSnapGrid.SelectionTimeRange = (timeValue, timeValue);
 
             return true;
         }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index e771a9753f..a16fb52f01 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
@@ -22,7 +23,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public class ManiaBeatSnapGrid : Component
     {
-        private const double visible_range = 1500;
+        private const double visible_range = 750;
 
         [Resolved]
         private IManiaHitObjectComposer composer { get; set; }
@@ -44,6 +45,34 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         private readonly List<ScrollingHitObjectContainer> grids = new List<ScrollingHitObjectContainer>();
 
+        private readonly Cached lineCache = new Cached();
+
+        private (double start, double end)? selectionTimeRange;
+
+        public (double start, double end)? SelectionTimeRange
+        {
+            get => selectionTimeRange;
+            set
+            {
+                if (value == selectionTimeRange)
+                    return;
+
+                selectionTimeRange = value;
+                lineCache.Invalidate();
+            }
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!lineCache.IsValid)
+            {
+                lineCache.Validate();
+                createLines();
+            }
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -61,49 +90,65 @@ namespace osu.Game.Rulesets.Mania.Edit
             beatDivisor.BindValueChanged(_ => createLines(), true);
         }
 
-        public override void Hide()
-        {
-            base.Hide();
-            foreach (var grid in grids)
-                grid.Hide();
-        }
-
-        public override void Show()
-        {
-            base.Show();
-            foreach (var grid in grids)
-                grid.Show();
-        }
-
         private void createLines()
         {
             foreach (var grid in grids)
                 grid.Clear();
 
-            for (int i = 0; i < beatmap.ControlPointInfo.TimingPoints.Count; i++)
+            if (selectionTimeRange == null)
+                return;
+
+            var range = selectionTimeRange.Value;
+
+            var timingPoint = beatmap.ControlPointInfo.TimingPointAt(range.start - visible_range);
+
+            double time = timingPoint.Time;
+            int beat = 0;
+
+            // progress time until in the visible range.
+            while (time < range.start - visible_range)
             {
-                var point = beatmap.ControlPointInfo.TimingPoints[i];
-                var until = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : working.Value.Track.Length;
+                time += timingPoint.BeatLength / beatDivisor.Value;
+                beat++;
+            }
 
-                int beat = 0;
+            while (time < range.end + visible_range)
+            {
+                var nextTimingPoint = beatmap.ControlPointInfo.TimingPointAt(time);
 
-                for (double t = point.Time; t < until; t += point.BeatLength / beatDivisor.Value)
+                // switch to the next timing point if we have reached it.
+                if (nextTimingPoint != timingPoint)
                 {
-                    var indexInBeat = beat % beatDivisor.Value;
-                    Color4 colour;
+                    beat = 0;
+                    timingPoint = nextTimingPoint;
+                }
 
-                    if (indexInBeat == 0)
-                        colour = BindableBeatDivisor.GetColourFor(1, colours);
+                Color4 colour = BindableBeatDivisor.GetColourFor(
+                    BindableBeatDivisor.GetDivisorForBeatIndex(Math.Max(1, beat), beatDivisor.Value), colours);
+
+                foreach (var grid in grids)
+                    grid.Add(new DrawableGridLine(time, colour));
+
+                beat++;
+                time += timingPoint.BeatLength / beatDivisor.Value;
+            }
+
+            foreach (var grid in grids)
+            {
+                // required to update ScrollingHitObjectContainer's cache.
+                grid.UpdateSubTree();
+
+                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
+                {
+                    time = line.HitObject.StartTime;
+
+                    if (time >= range.start && time <= range.end)
+                        line.Alpha = 1;
                     else
                     {
-                        var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
-                        colour = BindableBeatDivisor.GetColourFor(divisor, colours);
+                        double timeSeparation = time < range.start ? range.start - time : time - range.end;
+                        line.Alpha = (float)Math.Max(0, 1 - timeSeparation / visible_range);
                     }
-
-                    foreach (var grid in grids)
-                        grid.Add(new DrawableGridLine(t, colour));
-
-                    beat++;
                 }
             }
         }
@@ -112,6 +157,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
             float minDist = float.PositiveInfinity;
             DrawableGridLine minDistLine = null;
+
             Vector2 minDistLinePosition = Vector2.Zero;
 
             foreach (var grid in grids)
@@ -137,33 +183,6 @@ namespace osu.Game.Rulesets.Mania.Edit
             return (new Vector2(position.X, minDistLinePosition.Y + noteOffset), minDistLine.HitObject.StartTime);
         }
 
-        public void SetRange(double minTime, double maxTime)
-        {
-            if (LoadState >= LoadState.Ready)
-                setRange(minTime, maxTime);
-            else
-                Schedule(() => setRange(minTime, maxTime));
-        }
-
-        private void setRange(double minTime, double maxTime)
-        {
-            foreach (var grid in grids)
-            {
-                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
-                {
-                    double lineTime = line.HitObject.StartTime;
-
-                    if (lineTime >= minTime && lineTime <= maxTime)
-                        line.Colour = Color4.White;
-                    else
-                    {
-                        double timeSeparation = lineTime < minTime ? minTime - lineTime : lineTime - maxTime;
-                        line.Colour = OsuColour.Gray((float)Math.Max(0, 1 - timeSeparation / visible_range));
-                    }
-                }
-            }
-        }
-
         private class DrawableGridLine : DrawableHitObject
         {
             [Resolved]
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 1266761d12..475320ece3 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -68,18 +68,15 @@ namespace osu.Game.Rulesets.Mania.Edit
             {
                 if (EditorBeatmap.SelectedHitObjects.Any())
                 {
-                    beatSnapGrid.SetRange(EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
-                    beatSnapGrid.Show();
+                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
                 }
                 else
-                    beatSnapGrid.Hide();
+                    beatSnapGrid.SelectionTimeRange = null;
             }
             else
             {
                 var placementTime = GetSnappedPosition(ToLocalSpace(inputManager.CurrentState.Mouse.Position), 0).time;
-                beatSnapGrid.SetRange(placementTime, placementTime);
-
-                beatSnapGrid.Show();
+                beatSnapGrid.SelectionTimeRange = (placementTime, placementTime);
             }
         }
 

From 013683c23ba1d02bf348ae6288d56b253adc9385 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 May 2020 00:17:13 +0900
Subject: [PATCH 02805/10326] Fix taiko rim markers incorrectly playing as
 whistle samples

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index d332f90cd4..1e1f9ae09b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -52,7 +52,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override IEnumerable<HitSampleInfo> GetSamples()
         {
             // normal and claps are always handled by the drum (see DrumSampleMapping).
-            var samples = HitObject.Samples.Where(s => s.Name != HitSampleInfo.HIT_NORMAL && s.Name != HitSampleInfo.HIT_CLAP);
+            // in addition, whistles are excluded as they are an alternative rim marker.
+
+            var samples = HitObject.Samples.Where(s =>
+                s.Name != HitSampleInfo.HIT_NORMAL
+                && s.Name != HitSampleInfo.HIT_CLAP
+                && s.Name != HitSampleInfo.HIT_WHISTLE);
 
             if (HitObject.Type == HitType.Rim && HitObject.IsStrong)
             {

From 9415e45aea5afb899edc21bd866accb0923c82eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 May 2020 20:11:19 +0200
Subject: [PATCH 02806/10326] Add overlay layer to enumeration type

---
 osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs b/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
index 48e8bdbb76..ea23c49c4a 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
@@ -9,6 +9,7 @@ namespace osu.Game.Beatmaps.Legacy
         Fail = 1,
         Pass = 2,
         Foreground = 3,
-        Video = 4
+        Overlay = 4,
+        Video = 5
     }
 }

From e9710b6f836578850646db5e78e06f8985066a35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 May 2020 09:43:05 +0900
Subject: [PATCH 02807/10326] Add taiko type conversion test coverage

---
 .../TaikoBeatmapConversionTest.cs             |   3 +-
 ...-type-conversions-expected-conversion.json | 116 ++++++++++++++++++
 .../Beatmaps/sample-to-type-conversions.osu   |  62 ++++++++++
 3 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/sample-to-type-conversions-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/sample-to-type-conversions.osu

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index 8c26ca70ac..f7729138ff 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [NonParallelizable]
         [TestCase("basic")]
         [TestCase("slider-generating-drumroll")]
+        [TestCase("sample-to-type-conversions")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
@@ -41,7 +42,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
     public struct ConvertValue : IEquatable<ConvertValue>
     {
         /// <summary>
-        /// A sane value to account for osu!stable using ints everwhere.
+        /// A sane value to account for osu!stable using ints everywhere.
         /// </summary>
         private const float conversion_lenience = 2;
 
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/sample-to-type-conversions-expected-conversion.json b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/sample-to-type-conversions-expected-conversion.json
new file mode 100644
index 0000000000..47ca6aef68
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/sample-to-type-conversions-expected-conversion.json
@@ -0,0 +1,116 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 110.0,
+      "Objects": [
+        {
+          "StartTime": 110.0,
+          "EndTime": 110.0,
+          "IsRim": false,
+          "IsCentre": true,
+          "IsDrumRoll": false,
+          "IsSwell": false,
+          "IsStrong": false
+        }
+      ]
+    },
+    {
+      "StartTime": 538.0,
+      "Objects": [
+        {
+          "StartTime": 538.0,
+          "EndTime": 538.0,
+          "IsRim": true,
+          "IsCentre": false,
+          "IsDrumRoll": false,
+          "IsSwell": false,
+          "IsStrong": false
+        }
+      ]
+    },
+    {
+      "StartTime": 967.0,
+      "Objects": [
+        {
+          "StartTime": 967.0,
+          "EndTime": 967.0,
+          "IsRim": true,
+          "IsCentre": false,
+          "IsDrumRoll": false,
+          "IsSwell": false,
+          "IsStrong": false
+        }
+      ]
+    },
+    {
+      "StartTime": 1395.0,
+      "Objects": [
+        {
+          "StartTime": 1395.0,
+          "EndTime": 1395.0,
+          "IsRim": true,
+          "IsCentre": false,
+          "IsDrumRoll": false,
+          "IsSwell": false,
+          "IsStrong": false
+        }
+      ]
+    },
+    {
+      "StartTime": 1824.0,
+      "Objects": [
+        {
+          "StartTime": 1824.0,
+          "EndTime": 1824.0,
+          "IsRim": false,
+          "IsCentre": true,
+          "IsDrumRoll": false,
+          "IsSwell": false,
+          "IsStrong": true
+        }
+      ]
+    },
+    {
+      "StartTime": 2252.0,
+      "Objects": [
+        {
+          "StartTime": 2252.0,
+          "EndTime": 2252.0,
+          "IsRim": true,
+          "IsCentre": false,
+          "IsDrumRoll": false,
+          "IsSwell": false,
+          "IsStrong": true
+        }
+      ]
+    },
+    {
+      "StartTime": 2681.0,
+      "Objects": [
+        {
+          "StartTime": 2681.0,
+          "EndTime": 2681.0,
+          "IsRim": true,
+          "IsCentre": false,
+          "IsDrumRoll": false,
+          "IsSwell": false,
+          "IsStrong": true
+        }
+      ]
+    },
+    {
+      "StartTime": 3110.0,
+      "Objects": [
+        {
+          "StartTime": 3110.0,
+          "EndTime": 3110.0,
+          "IsRim": true,
+          "IsCentre": false,
+          "IsDrumRoll": false,
+          "IsSwell": false,
+          "IsStrong": true
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/sample-to-type-conversions.osu b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/sample-to-type-conversions.osu
new file mode 100644
index 0000000000..a3537e7149
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/sample-to-type-conversions.osu
@@ -0,0 +1,62 @@
+osu file format v14
+
+[General]
+AudioFilename: audio.mp3
+AudioLeadIn: 0
+PreviewTime: -1
+Countdown: 0
+SampleSet: Normal
+StackLeniency: 0.5
+Mode: 1
+LetterboxInBreaks: 0
+WidescreenStoryboard: 1
+
+[Editor]
+Bookmarks: 110,13824,54967,82395,109824
+DistanceSpacing: 0.1
+BeatDivisor: 4
+GridSize: 32
+TimelineZoom: 3.099999
+
+[Metadata]
+Title:test
+TitleUnicode:test
+Artist:sample conversion
+ArtistUnicode:sample conversion
+Creator:banchobot
+Version:sample test
+Source:
+Tags:
+BeatmapID:0
+BeatmapSetID:-1
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:2
+OverallDifficulty:6
+ApproachRate:7
+SliderMultiplier:1.4
+SliderTickRate:4
+
+[Events]
+//Background and Video events
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+110,428.571428571429,4,1,0,100,1,0
+
+[HitObjects]
+256,192,110,5,0,0:0:0:0:
+256,192,538,1,8,0:0:0:0:
+256,192,967,1,2,0:0:0:0:
+256,192,1395,1,10,0:0:0:0:
+256,192,1824,1,4,0:0:0:0:
+256,192,2252,1,12,0:0:0:0:
+256,192,2681,1,6,0:0:0:0:
+256,192,3110,1,14,0:0:0:0:

From 3ee698cfa02bf3cb7d24f37761a75b211810b702 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 19 May 2020 12:39:09 +0900
Subject: [PATCH 02808/10326] Fix being able to press enter to create matches

---
 .../Screens/Multi/Match/Components/MatchSettingsOverlay.cs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 5d68de9ce6..54c4f8f7c7 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -133,7 +133,6 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                                     {
                                                                         RelativeSizeAxes = Axes.X,
                                                                         TabbableContentContainer = this,
-                                                                        OnCommit = (sender, text) => apply(),
                                                                     },
                                                                 },
                                                                 new Section("Duration")
@@ -196,7 +195,6 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                                         RelativeSizeAxes = Axes.X,
                                                                         TabbableContentContainer = this,
                                                                         ReadOnly = true,
-                                                                        OnCommit = (sender, text) => apply()
                                                                     },
                                                                 },
                                                                 new Section("Password (optional)")
@@ -207,7 +205,6 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                                         RelativeSizeAxes = Axes.X,
                                                                         TabbableContentContainer = this,
                                                                         ReadOnly = true,
-                                                                        OnCommit = (sender, text) => apply()
                                                                     },
                                                                 },
                                                             },
@@ -331,6 +328,9 @@ namespace osu.Game.Screens.Multi.Match.Components
 
             private void apply()
             {
+                if (!ApplyButton.Enabled.Value)
+                    return;
+
                 hideError();
 
                 RoomName.Value = NameField.Text;

From 6d3ca4ec43c2963f9fee14be4508fafe10287c73 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 19 May 2020 13:16:46 +0900
Subject: [PATCH 02809/10326] Fix failing tests

---
 .../Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index d2e8c22c39..34c6940552 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -69,6 +69,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 settings.NameField.Current.Value = expected_name;
                 settings.DurationField.Current.Value = expectedDuration;
+                Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = CreateBeatmap(Ruleset.Value).BeatmapInfo } });
 
                 roomManager.CreateRequested = r =>
                 {
@@ -89,6 +90,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("setup", () =>
             {
+                Room.Name.Value = "Test Room";
+                Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = CreateBeatmap(Ruleset.Value).BeatmapInfo } });
+
                 fail = true;
                 roomManager.CreateRequested = _ => !fail;
             });

From 052ad79fc6e012b3901214bf4005a263a2fa16e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 May 2020 16:44:22 +0900
Subject: [PATCH 02810/10326] Convert dangerous events to IBindables

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          |  4 +-
 osu.Game/Beatmaps/BeatmapManager.cs           | 13 ++--
 osu.Game/Database/ArchiveModelManager.cs      | 13 ++--
 .../DownloadableArchiveModelManager.cs        | 15 +++--
 osu.Game/Database/IModelDownloader.cs         |  7 +-
 osu.Game/Database/IModelManager.cs            |  7 +-
 osu.Game/Online/DownloadTrackingComposite.cs  | 65 ++++++++++++-------
 osu.Game/OsuGameBase.cs                       | 13 +++-
 osu.Game/Overlays/MusicController.cs          | 46 +++++++------
 .../Overlays/Settings/Sections/SkinSection.cs | 30 +++++----
 .../Multi/Match/Components/ReadyButton.cs     | 50 +++++++-------
 .../Screens/Multi/Match/MatchSubScreen.cs     | 26 ++++----
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 49 +++++++++-----
 .../Screens/Select/Carousel/TopLocalRank.cs   | 32 ++++-----
 .../Select/Leaderboards/BeatmapLeaderboard.cs | 15 ++---
 osu.Game/Skinning/SkinManager.cs              | 13 ++--
 16 files changed, 234 insertions(+), 164 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index ba6f5fc85c..43fab186aa 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -156,8 +156,8 @@ namespace osu.Game.Tests.Beatmaps.IO
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
                     // ReSharper disable once AccessToModifiedClosure
-                    manager.ItemAdded += _ => Interlocked.Increment(ref itemAddRemoveFireCount);
-                    manager.ItemRemoved += _ => Interlocked.Increment(ref itemAddRemoveFireCount);
+                    manager.ItemAdded.BindValueChanged(_ => Interlocked.Increment(ref itemAddRemoveFireCount));
+                    manager.ItemRemoved.BindValueChanged(_ => Interlocked.Increment(ref itemAddRemoveFireCount));
 
                     var imported = await LoadOszIntoOsu(osu);
 
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 34ad1df6bc..7aaf0ca08d 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -12,6 +12,7 @@ using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Lists;
@@ -38,12 +39,16 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Fired when a single difficulty has been hidden.
         /// </summary>
-        public event Action<BeatmapInfo> BeatmapHidden;
+        public IBindable<WeakReference<BeatmapInfo>> BeatmapHidden => beatmapHidden;
+
+        private readonly Bindable<WeakReference<BeatmapInfo>> beatmapHidden = new Bindable<WeakReference<BeatmapInfo>>();
 
         /// <summary>
         /// Fired when a single difficulty has been restored.
         /// </summary>
-        public event Action<BeatmapInfo> BeatmapRestored;
+        public IBindable<WeakReference<BeatmapInfo>> BeatmapRestored => beatmapRestored;
+
+        private readonly Bindable<WeakReference<BeatmapInfo>> beatmapRestored = new Bindable<WeakReference<BeatmapInfo>>();
 
         /// <summary>
         /// A default representation of a WorkingBeatmap to use when no beatmap is available.
@@ -74,8 +79,8 @@ namespace osu.Game.Beatmaps
             DefaultBeatmap = defaultBeatmap;
 
             beatmaps = (BeatmapStore)ModelStore;
-            beatmaps.BeatmapHidden += b => BeatmapHidden?.Invoke(b);
-            beatmaps.BeatmapRestored += b => BeatmapRestored?.Invoke(b);
+            beatmaps.BeatmapHidden += b => beatmapHidden.Value = new WeakReference<BeatmapInfo>(b);
+            beatmaps.BeatmapRestored += b => beatmapRestored.Value = new WeakReference<BeatmapInfo>(b);
 
             onlineLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
             exportStorage = storage.GetStorageForDirectory("exports");
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 839f9075e5..33b16cbaaf 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -11,6 +11,7 @@ using Humanizer;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using osu.Framework;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Logging;
@@ -56,13 +57,17 @@ namespace osu.Game.Database
         /// Fired when a new <typeparamref name="TModel"/> becomes available in the database.
         /// This is not guaranteed to run on the update thread.
         /// </summary>
-        public event Action<TModel> ItemAdded;
+        public IBindable<WeakReference<TModel>> ItemAdded => itemAdded;
+
+        private readonly Bindable<WeakReference<TModel>> itemAdded = new Bindable<WeakReference<TModel>>();
 
         /// <summary>
         /// Fired when a <typeparamref name="TModel"/> is removed from the database.
         /// This is not guaranteed to run on the update thread.
         /// </summary>
-        public event Action<TModel> ItemRemoved;
+        public IBindable<WeakReference<TModel>> ItemRemoved => itemRemoved;
+
+        private readonly Bindable<WeakReference<TModel>> itemRemoved = new Bindable<WeakReference<TModel>>();
 
         public virtual string[] HandledExtensions => new[] { ".zip" };
 
@@ -82,8 +87,8 @@ namespace osu.Game.Database
             ContextFactory = contextFactory;
 
             ModelStore = modelStore;
-            ModelStore.ItemAdded += item => handleEvent(() => ItemAdded?.Invoke(item));
-            ModelStore.ItemRemoved += s => handleEvent(() => ItemRemoved?.Invoke(s));
+            ModelStore.ItemAdded += item => handleEvent(() => itemAdded.Value = new WeakReference<TModel>(item));
+            ModelStore.ItemRemoved += item => handleEvent(() => itemRemoved.Value = new WeakReference<TModel>(item));
 
             Files = new FileStore(contextFactory, storage);
 
diff --git a/osu.Game/Database/DownloadableArchiveModelManager.cs b/osu.Game/Database/DownloadableArchiveModelManager.cs
index 1b90898c8d..8f469ca590 100644
--- a/osu.Game/Database/DownloadableArchiveModelManager.cs
+++ b/osu.Game/Database/DownloadableArchiveModelManager.cs
@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using osu.Framework.Bindables;
 
 namespace osu.Game.Database
 {
@@ -23,9 +24,13 @@ namespace osu.Game.Database
         where TModel : class, IHasFiles<TFileModel>, IHasPrimaryKey, ISoftDelete, IEquatable<TModel>
         where TFileModel : class, INamedFileInfo, new()
     {
-        public event Action<ArchiveDownloadRequest<TModel>> DownloadBegan;
+        public IBindable<WeakReference<ArchiveDownloadRequest<TModel>>> DownloadBegan => downloadBegan;
 
-        public event Action<ArchiveDownloadRequest<TModel>> DownloadFailed;
+        private readonly Bindable<WeakReference<ArchiveDownloadRequest<TModel>>> downloadBegan = new Bindable<WeakReference<ArchiveDownloadRequest<TModel>>>();
+
+        public IBindable<WeakReference<ArchiveDownloadRequest<TModel>>> DownloadFailed => downloadFailed;
+
+        private readonly Bindable<WeakReference<ArchiveDownloadRequest<TModel>>> downloadFailed = new Bindable<WeakReference<ArchiveDownloadRequest<TModel>>>();
 
         private readonly IAPIProvider api;
 
@@ -81,7 +86,7 @@ namespace osu.Game.Database
 
                     // for now a failed import will be marked as a failed download for simplicity.
                     if (!imported.Any())
-                        DownloadFailed?.Invoke(request);
+                        downloadFailed.Value = new WeakReference<ArchiveDownloadRequest<TModel>>(request);
 
                     currentDownloads.Remove(request);
                 }, TaskCreationOptions.LongRunning);
@@ -100,14 +105,14 @@ namespace osu.Game.Database
 
             api.PerformAsync(request);
 
-            DownloadBegan?.Invoke(request);
+            downloadBegan.Value = new WeakReference<ArchiveDownloadRequest<TModel>>(request);
             return true;
 
             void triggerFailure(Exception error)
             {
                 currentDownloads.Remove(request);
 
-                DownloadFailed?.Invoke(request);
+                downloadFailed.Value = new WeakReference<ArchiveDownloadRequest<TModel>>(request);
 
                 notification.State = ProgressNotificationState.Cancelled;
 
diff --git a/osu.Game/Database/IModelDownloader.cs b/osu.Game/Database/IModelDownloader.cs
index 99aeb4eacf..0cb633280e 100644
--- a/osu.Game/Database/IModelDownloader.cs
+++ b/osu.Game/Database/IModelDownloader.cs
@@ -1,8 +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.Game.Online.API;
 using System;
+using osu.Game.Online.API;
+using osu.Framework.Bindables;
 
 namespace osu.Game.Database
 {
@@ -17,13 +18,13 @@ namespace osu.Game.Database
         /// 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;
+        IBindable<WeakReference<ArchiveDownloadRequest<TModel>>> DownloadBegan { get; }
 
         /// <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;
+        IBindable<WeakReference<ArchiveDownloadRequest<TModel>>> DownloadFailed { get; }
 
         /// <summary>
         /// Checks whether a given <typeparamref name="TModel"/> is already available in the local store.
diff --git a/osu.Game/Database/IModelManager.cs b/osu.Game/Database/IModelManager.cs
index 1bdbbb48e6..852b385798 100644
--- a/osu.Game/Database/IModelManager.cs
+++ b/osu.Game/Database/IModelManager.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Bindables;
 
 namespace osu.Game.Database
 {
@@ -9,11 +10,11 @@ namespace osu.Game.Database
     /// Represents a model manager that publishes events when <typeparamref name="TModel"/>s are added or removed.
     /// </summary>
     /// <typeparam name="TModel">The model type.</typeparam>
-    public interface IModelManager<out TModel>
+    public interface IModelManager<TModel>
         where TModel : class
     {
-        event Action<TModel> ItemAdded;
+        IBindable<WeakReference<TModel>> ItemAdded { get; }
 
-        event Action<TModel> ItemRemoved;
+        IBindable<WeakReference<TModel>> ItemRemoved { get; }
     }
 }
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 0769be2998..47de7d75ed 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -34,6 +34,11 @@ namespace osu.Game.Online
             Model.Value = model;
         }
 
+        private IBindable<WeakReference<TModel>> managerAdded;
+        private IBindable<WeakReference<TModel>> managerRemoved;
+        private IBindable<WeakReference<ArchiveDownloadRequest<TModel>>> managerDownloadBegan;
+        private IBindable<WeakReference<ArchiveDownloadRequest<TModel>>> managerDownloadFailed;
+
         [BackgroundDependencyLoader(true)]
         private void load()
         {
@@ -47,23 +52,39 @@ namespace osu.Game.Online
                     attachDownload(manager.GetExistingDownload(modelInfo.NewValue));
             }, true);
 
-            manager.DownloadBegan += downloadBegan;
-            manager.DownloadFailed += downloadFailed;
-            manager.ItemAdded += itemAdded;
-            manager.ItemRemoved += itemRemoved;
+            managerDownloadBegan = manager.DownloadBegan.GetBoundCopy();
+            managerDownloadBegan.BindValueChanged(downloadBegan);
+            managerDownloadFailed = manager.DownloadFailed.GetBoundCopy();
+            managerDownloadFailed.BindValueChanged(downloadFailed);
+            managerAdded = manager.ItemAdded.GetBoundCopy();
+            managerAdded.BindValueChanged(itemAdded);
+            managerRemoved = manager.ItemRemoved.GetBoundCopy();
+            managerRemoved.BindValueChanged(itemRemoved);
         }
 
-        private void downloadBegan(ArchiveDownloadRequest<TModel> request) => Schedule(() =>
+        private void downloadBegan(ValueChangedEvent<WeakReference<ArchiveDownloadRequest<TModel>>> weakRequest)
         {
-            if (request.Model.Equals(Model.Value))
-                attachDownload(request);
-        });
+            if (weakRequest.NewValue.TryGetTarget(out var request))
+            {
+                Schedule(() =>
+                {
+                    if (request.Model.Equals(Model.Value))
+                        attachDownload(request);
+                });
+            }
+        }
 
-        private void downloadFailed(ArchiveDownloadRequest<TModel> request) => Schedule(() =>
+        private void downloadFailed(ValueChangedEvent<WeakReference<ArchiveDownloadRequest<TModel>>> weakRequest)
         {
-            if (request.Model.Equals(Model.Value))
-                attachDownload(null);
-        });
+            if (weakRequest.NewValue.TryGetTarget(out var request))
+            {
+                Schedule(() =>
+                {
+                    if (request.Model.Equals(Model.Value))
+                        attachDownload(null);
+                });
+            }
+        }
 
         private ArchiveDownloadRequest<TModel> attachedRequest;
 
@@ -107,9 +128,17 @@ namespace osu.Game.Online
 
         private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
 
-        private void itemAdded(TModel s) => setDownloadStateFromManager(s, DownloadState.LocallyAvailable);
+        private void itemAdded(ValueChangedEvent<WeakReference<TModel>> weakItem)
+        {
+            if (weakItem.NewValue.TryGetTarget(out var item))
+                setDownloadStateFromManager(item, DownloadState.LocallyAvailable);
+        }
 
-        private void itemRemoved(TModel s) => setDownloadStateFromManager(s, DownloadState.NotDownloaded);
+        private void itemRemoved(ValueChangedEvent<WeakReference<TModel>> weakItem)
+        {
+            if (weakItem.NewValue.TryGetTarget(out var item))
+                setDownloadStateFromManager(item, DownloadState.NotDownloaded);
+        }
 
         private void setDownloadStateFromManager(TModel s, DownloadState state) => Schedule(() =>
         {
@@ -125,14 +154,6 @@ namespace osu.Game.Online
         {
             base.Dispose(isDisposing);
 
-            if (manager != null)
-            {
-                manager.DownloadBegan -= downloadBegan;
-                manager.DownloadFailed -= downloadFailed;
-                manager.ItemAdded -= itemAdded;
-                manager.ItemRemoved -= itemRemoved;
-            }
-
             State.UnbindAll();
 
             attachDownload(null);
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 11a3834c71..c367c3b636 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -186,8 +186,17 @@ namespace osu.Game
                 return ScoreManager.QueryScores(s => beatmapIds.Contains(s.Beatmap.ID)).ToList();
             }
 
-            BeatmapManager.ItemRemoved += i => ScoreManager.Delete(getBeatmapScores(i), true);
-            BeatmapManager.ItemAdded += i => ScoreManager.Undelete(getBeatmapScores(i), true);
+            BeatmapManager.ItemRemoved.BindValueChanged(i =>
+            {
+                if (i.NewValue.TryGetTarget(out var item))
+                    ScoreManager.Delete(getBeatmapScores(item), true);
+            });
+
+            BeatmapManager.ItemAdded.BindValueChanged(i =>
+            {
+                if (i.NewValue.TryGetTarget(out var item))
+                    ScoreManager.Undelete(getBeatmapScores(item), true);
+            });
 
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index ded641b262..35f3cb0e25 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -60,11 +60,16 @@ namespace osu.Game.Overlays
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
+        private IBindable<WeakReference<BeatmapSetInfo>> managerAdded;
+        private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            beatmaps.ItemAdded += handleBeatmapAdded;
-            beatmaps.ItemRemoved += handleBeatmapRemoved;
+            managerAdded = beatmaps.ItemAdded.GetBoundCopy();
+            managerAdded.BindValueChanged(beatmapAdded);
+            managerRemoved = beatmaps.ItemRemoved.GetBoundCopy();
+            managerRemoved.BindValueChanged(beatmapRemoved);
 
             beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets(IncludedDetails.Minimal).OrderBy(_ => RNG.Next()));
         }
@@ -93,16 +98,28 @@ namespace osu.Game.Overlays
         /// </summary>
         public bool IsPlaying => current?.Track.IsRunning ?? false;
 
-        private void handleBeatmapAdded(BeatmapSetInfo set) => Schedule(() =>
+        private void beatmapAdded(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
-            if (!beatmapSets.Contains(set))
-                beatmapSets.Add(set);
-        });
+            if (weakSet.NewValue.TryGetTarget(out var set))
+            {
+                Schedule(() =>
+                {
+                    if (!beatmapSets.Contains(set))
+                        beatmapSets.Add(set);
+                });
+            }
+        }
 
-        private void handleBeatmapRemoved(BeatmapSetInfo set) => Schedule(() =>
+        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
-            beatmapSets.RemoveAll(s => s.ID == set.ID);
-        });
+            if (weakSet.NewValue.TryGetTarget(out var set))
+            {
+                Schedule(() =>
+                {
+                    beatmapSets.RemoveAll(s => s.ID == set.ID);
+                });
+            }
+        }
 
         private ScheduledDelegate seekDelegate;
 
@@ -299,17 +316,6 @@ namespace osu.Game.Overlays
             }
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (beatmaps != null)
-            {
-                beatmaps.ItemAdded -= handleBeatmapAdded;
-                beatmaps.ItemRemoved -= handleBeatmapRemoved;
-            }
-        }
-
         public bool OnPressed(GlobalAction action)
         {
             if (beatmap.Disabled)
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 75c8db1612..94080f5592 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.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.Bindables;
@@ -30,6 +31,9 @@ namespace osu.Game.Overlays.Settings.Sections
         [Resolved]
         private SkinManager skins { get; set; }
 
+        private IBindable<WeakReference<SkinInfo>> managerAdded;
+        private IBindable<WeakReference<SkinInfo>> managerRemoved;
+
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
@@ -66,8 +70,11 @@ namespace osu.Game.Overlays.Settings.Sections
                 },
             };
 
-            skins.ItemAdded += itemAdded;
-            skins.ItemRemoved += itemRemoved;
+            managerAdded = skins.ItemAdded.GetBoundCopy();
+            managerAdded.BindValueChanged(itemAdded);
+
+            managerRemoved = skins.ItemRemoved.GetBoundCopy();
+            managerRemoved.BindValueChanged(itemRemoved);
 
             config.BindWith(OsuSetting.Skin, configBindable);
 
@@ -82,19 +89,16 @@ namespace osu.Game.Overlays.Settings.Sections
             dropdownBindable.BindValueChanged(skin => configBindable.Value = skin.NewValue.ID);
         }
 
-        private void itemRemoved(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != s.ID).ToArray());
-
-        private void itemAdded(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Append(s).ToArray());
-
-        protected override void Dispose(bool isDisposing)
+        private void itemAdded(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
         {
-            base.Dispose(isDisposing);
+            if (weakItem.NewValue.TryGetTarget(out var item))
+                Schedule(() => skinDropdown.Items = skinDropdown.Items.Append(item).ToArray());
+        }
 
-            if (skins != null)
-            {
-                skins.ItemAdded -= itemAdded;
-                skins.ItemRemoved -= itemRemoved;
-            }
+        private void itemRemoved(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
+        {
+            if (weakItem.NewValue.TryGetTarget(out var item))
+                Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != item.ID).ToArray());
         }
 
         private class SizeSlider : OsuSliderBar<float>
diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index 8f484d3672..4420b2d58a 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -32,11 +32,16 @@ namespace osu.Game.Screens.Multi.Match.Components
             Text = "Start";
         }
 
+        private IBindable<WeakReference<BeatmapSetInfo>> managerAdded;
+        private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            beatmaps.ItemAdded += beatmapAdded;
-            beatmaps.ItemRemoved += beatmapRemoved;
+            managerAdded = beatmaps.ItemAdded.GetBoundCopy();
+            managerAdded.BindValueChanged(beatmapAdded);
+            managerRemoved = beatmaps.ItemRemoved.GetBoundCopy();
+            managerRemoved.BindValueChanged(beatmapRemoved);
 
             SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
 
@@ -56,24 +61,30 @@ namespace osu.Game.Screens.Multi.Match.Components
             hasBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId) != null;
         }
 
-        private void beatmapAdded(BeatmapSetInfo model)
+        private void beatmapAdded(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
-            int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
-            if (beatmapId == null)
-                return;
+            if (weakSet.NewValue.TryGetTarget(out var set))
+            {
+                int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
+                if (beatmapId == null)
+                    return;
 
-            if (model.Beatmaps.Any(b => b.OnlineBeatmapID == beatmapId))
-                Schedule(() => hasBeatmap = true);
+                if (set.Beatmaps.Any(b => b.OnlineBeatmapID == beatmapId))
+                    Schedule(() => hasBeatmap = true);
+            }
         }
 
-        private void beatmapRemoved(BeatmapSetInfo model)
+        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
-            int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
-            if (beatmapId == null)
-                return;
+            if (weakSet.NewValue.TryGetTarget(out var set))
+            {
+                int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
+                if (beatmapId == null)
+                    return;
 
-            if (model.Beatmaps.Any(b => b.OnlineBeatmapID == beatmapId))
-                Schedule(() => hasBeatmap = false);
+                if (set.Beatmaps.Any(b => b.OnlineBeatmapID == beatmapId))
+                    Schedule(() => hasBeatmap = false);
+            }
         }
 
         protected override void Update()
@@ -95,16 +106,5 @@ namespace osu.Game.Screens.Multi.Match.Components
 
             Enabled.Value = hasBeatmap && hasEnoughTime;
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (beatmaps != null)
-            {
-                beatmaps.ItemAdded -= beatmapAdded;
-                beatmaps.ItemRemoved -= beatmapRemoved;
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index eef53126c0..caa547ac72 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -50,6 +50,8 @@ namespace osu.Game.Screens.Multi.Match
         private LeaderboardChatDisplay leaderboardChatDisplay;
         private MatchSettingsOverlay settingsOverlay;
 
+        private IBindable<WeakReference<BeatmapSetInfo>> managerAdded;
+
         public MatchSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
@@ -181,7 +183,8 @@ namespace osu.Game.Screens.Multi.Match
             SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(selectedItemChanged));
             SelectedItem.Value = playlist.FirstOrDefault();
 
-            beatmapManager.ItemAdded += beatmapAdded;
+            managerAdded = beatmapManager.ItemAdded.GetBoundCopy();
+            managerAdded.BindValueChanged(beatmapAdded);
         }
 
         public override bool OnExiting(IScreen next)
@@ -214,13 +217,16 @@ namespace osu.Game.Screens.Multi.Match
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
-        private void beatmapAdded(BeatmapSetInfo model) => Schedule(() =>
+        private void beatmapAdded(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
-            if (Beatmap.Value != beatmapManager.DefaultBeatmap)
-                return;
+            Schedule(() =>
+            {
+                if (Beatmap.Value != beatmapManager.DefaultBeatmap)
+                    return;
 
-            updateWorkingBeatmap();
-        });
+                updateWorkingBeatmap();
+            });
+        }
 
         private void onStart()
         {
@@ -235,13 +241,5 @@ namespace osu.Game.Screens.Multi.Match
                     break;
             }
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (beatmapManager != null)
-                beatmapManager.ItemAdded -= beatmapAdded;
-        }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 96b779cd20..f23e1b1ef2 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -131,6 +131,11 @@ namespace osu.Game.Screens.Select
 
         private CarouselRoot root;
 
+        private IBindable<WeakReference<BeatmapSetInfo>> itemAdded;
+        private IBindable<WeakReference<BeatmapSetInfo>> itemRemoved;
+        private IBindable<WeakReference<BeatmapInfo>> itemHidden;
+        private IBindable<WeakReference<BeatmapInfo>> itemRestored;
+
         public BeatmapCarousel()
         {
             root = new CarouselRoot(this);
@@ -161,10 +166,14 @@ namespace osu.Game.Screens.Select
             RightClickScrollingEnabled.ValueChanged += enabled => scroll.RightMouseScrollbar = enabled.NewValue;
             RightClickScrollingEnabled.TriggerChange();
 
-            beatmaps.ItemAdded += beatmapAdded;
-            beatmaps.ItemRemoved += beatmapRemoved;
-            beatmaps.BeatmapHidden += beatmapHidden;
-            beatmaps.BeatmapRestored += beatmapRestored;
+            itemAdded = beatmaps.ItemAdded.GetBoundCopy();
+            itemAdded.BindValueChanged(beatmapAdded);
+            itemRemoved = beatmaps.ItemRemoved.GetBoundCopy();
+            itemRemoved.BindValueChanged(beatmapRemoved);
+            itemHidden = beatmaps.BeatmapHidden.GetBoundCopy();
+            itemHidden.BindValueChanged(beatmapHidden);
+            itemRestored = beatmaps.BeatmapRestored.GetBoundCopy();
+            itemRestored.BindValueChanged(beatmapRestored);
 
             loadBeatmapSets(GetLoadableBeatmaps());
         }
@@ -562,26 +571,34 @@ namespace osu.Game.Screens.Select
         {
             base.Dispose(isDisposing);
 
-            if (beatmaps != null)
-            {
-                beatmaps.ItemAdded -= beatmapAdded;
-                beatmaps.ItemRemoved -= beatmapRemoved;
-                beatmaps.BeatmapHidden -= beatmapHidden;
-                beatmaps.BeatmapRestored -= beatmapRestored;
-            }
-
             // aggressively dispose "off-screen" items to reduce GC pressure.
             foreach (var i in Items)
                 i.Dispose();
         }
 
-        private void beatmapRemoved(BeatmapSetInfo item) => RemoveBeatmapSet(item);
+        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakItem)
+        {
+            if (weakItem.NewValue.TryGetTarget(out var item))
+                RemoveBeatmapSet(item);
+        }
 
-        private void beatmapAdded(BeatmapSetInfo item) => UpdateBeatmapSet(item);
+        private void beatmapAdded(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakItem)
+        {
+            if (weakItem.NewValue.TryGetTarget(out var item))
+                UpdateBeatmapSet(item);
+        }
 
-        private void beatmapRestored(BeatmapInfo b) => UpdateBeatmapSet(beatmaps.QueryBeatmapSet(s => s.ID == b.BeatmapSetInfoID));
+        private void beatmapRestored(ValueChangedEvent<WeakReference<BeatmapInfo>> weakItem)
+        {
+            if (weakItem.NewValue.TryGetTarget(out var b))
+                UpdateBeatmapSet(beatmaps.QueryBeatmapSet(s => s.ID == b.BeatmapSetInfoID));
+        }
 
-        private void beatmapHidden(BeatmapInfo b) => UpdateBeatmapSet(beatmaps.QueryBeatmapSet(s => s.ID == b.BeatmapSetInfoID));
+        private void beatmapHidden(ValueChangedEvent<WeakReference<BeatmapInfo>> weakItem)
+        {
+            if (weakItem.NewValue.TryGetTarget(out var b))
+                UpdateBeatmapSet(beatmaps.QueryBeatmapSet(s => s.ID == b.BeatmapSetInfoID));
+        }
 
         private CarouselBeatmapSet createCarouselSet(BeatmapSetInfo beatmapSet)
         {
diff --git a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
index e981550c84..aed25787b0 100644
--- a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
+++ b/osu.Game/Screens/Select/Carousel/TopLocalRank.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.Bindables;
@@ -27,6 +28,9 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        private IBindable<WeakReference<ScoreInfo>> itemAdded;
+        private IBindable<WeakReference<ScoreInfo>> itemRemoved;
+
         public TopLocalRank(BeatmapInfo beatmap)
             : base(null)
         {
@@ -36,17 +40,24 @@ namespace osu.Game.Screens.Select.Carousel
         [BackgroundDependencyLoader]
         private void load()
         {
-            scores.ItemAdded += scoreChanged;
-            scores.ItemRemoved += scoreChanged;
+            itemAdded = scores.ItemAdded.GetBoundCopy();
+            itemAdded.BindValueChanged(scoreChanged);
+
+            itemRemoved = scores.ItemRemoved.GetBoundCopy();
+            itemRemoved.BindValueChanged(scoreChanged);
+
             ruleset.ValueChanged += _ => fetchAndLoadTopScore();
 
             fetchAndLoadTopScore();
         }
 
-        private void scoreChanged(ScoreInfo score)
+        private void scoreChanged(ValueChangedEvent<WeakReference<ScoreInfo>> weakScore)
         {
-            if (score.BeatmapInfoID == beatmap.ID)
-                fetchAndLoadTopScore();
+            if (weakScore.NewValue.TryGetTarget(out var score))
+            {
+                if (score.BeatmapInfoID == beatmap.ID)
+                    fetchAndLoadTopScore();
+            }
         }
 
         private ScheduledDelegate scheduledRankUpdate;
@@ -75,16 +86,5 @@ namespace osu.Game.Screens.Select.Carousel
                          .OrderByDescending(s => s.TotalScore)
                          .FirstOrDefault();
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (scores != null)
-            {
-                scores.ItemAdded -= scoreChanged;
-                scores.ItemRemoved -= scoreChanged;
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index e36493c82f..8e85eb4eb2 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private UserTopScoreContainer topScoreContainer;
 
+        private IBindable<WeakReference<ScoreInfo>> itemRemoved;
+
         /// <summary>
         /// Whether to apply the game's currently selected mods as a filter when retrieving scores.
         /// </summary>
@@ -104,7 +106,8 @@ namespace osu.Game.Screens.Select.Leaderboards
                 ScoreSelected = s => ScoreSelected?.Invoke(s)
             });
 
-            scoreManager.ItemRemoved += onScoreRemoved;
+            itemRemoved = scoreManager.ItemRemoved.GetBoundCopy();
+            itemRemoved.BindValueChanged(onScoreRemoved);
         }
 
         protected override void Reset()
@@ -113,7 +116,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             TopScore = null;
         }
 
-        private void onScoreRemoved(ScoreInfo score) => Schedule(RefreshScores);
+        private void onScoreRemoved(ValueChangedEvent<WeakReference<ScoreInfo>> score) => Schedule(RefreshScores);
 
         protected override bool IsOnlineScope => Scope != BeatmapLeaderboardScope.Local;
 
@@ -190,13 +193,5 @@ namespace osu.Game.Screens.Select.Leaderboards
         {
             Action = () => ScoreSelected?.Invoke(model)
         };
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (scoreManager != null)
-                scoreManager.ItemRemoved -= onScoreRemoved;
-        }
     }
 }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 3d469ab6e1..d65c74ef62 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -43,12 +43,15 @@ namespace osu.Game.Skinning
             this.audio = audio;
             this.legacyDefaultResources = legacyDefaultResources;
 
-            ItemRemoved += removedInfo =>
+            ItemRemoved.BindValueChanged(weakRemovedInfo =>
             {
-                // check the removed skin is not the current user choice. if it is, switch back to default.
-                if (removedInfo.ID == CurrentSkinInfo.Value.ID)
-                    CurrentSkinInfo.Value = SkinInfo.Default;
-            };
+                if (weakRemovedInfo.NewValue.TryGetTarget(out var removedInfo))
+                {
+                    // check the removed skin is not the current user choice. if it is, switch back to default.
+                    if (removedInfo.ID == CurrentSkinInfo.Value.ID)
+                        CurrentSkinInfo.Value = SkinInfo.Default;
+                }
+            });
 
             CurrentSkinInfo.ValueChanged += skin => CurrentSkin.Value = GetSkin(skin.NewValue);
             CurrentSkin.ValueChanged += skin =>

From d56466e2b9376318edc845c84c361fbf3927161d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 May 2020 19:07:35 +0900
Subject: [PATCH 02811/10326] Add very basic pooling of grid lines

---
 .../Edit/ManiaBeatSnapGrid.cs                 | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index a16fb52f01..067438af39 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -90,10 +90,17 @@ namespace osu.Game.Rulesets.Mania.Edit
             beatDivisor.BindValueChanged(_ => createLines(), true);
         }
 
+        private readonly Stack<DrawableGridLine> availableLines = new Stack<DrawableGridLine>();
+
         private void createLines()
         {
             foreach (var grid in grids)
-                grid.Clear();
+            {
+                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
+                    availableLines.Push(line);
+
+                grid.Clear(false);
+            }
 
             if (selectionTimeRange == null)
                 return;
@@ -127,7 +134,15 @@ namespace osu.Game.Rulesets.Mania.Edit
                     BindableBeatDivisor.GetDivisorForBeatIndex(Math.Max(1, beat), beatDivisor.Value), colours);
 
                 foreach (var grid in grids)
-                    grid.Add(new DrawableGridLine(time, colour));
+                {
+                    if (!availableLines.TryPop(out var line))
+                        line = new DrawableGridLine();
+
+                    line.HitObject.StartTime = time;
+                    line.Colour = colour;
+
+                    grid.Add(line);
+                }
 
                 beat++;
                 time += timingPoint.BeatLength / beatDivisor.Value;
@@ -190,17 +205,13 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-            public DrawableGridLine(double startTime, Color4 colour)
-                : base(new HitObject { StartTime = startTime })
+            public DrawableGridLine()
+                : base(new HitObject())
             {
                 RelativeSizeAxes = Axes.X;
                 Height = 2;
 
-                AddInternal(new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colour
-                });
+                AddInternal(new Box { RelativeSizeAxes = Axes.Both });
             }
 
             [BackgroundDependencyLoader]

From a6f3dc53f72e3100da0cb6d422a872522371e38e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 May 2020 23:01:36 +0900
Subject: [PATCH 02812/10326] Fix time value not being updated for next timing
 point

---
 osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 067438af39..5803c67b80 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -127,6 +127,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                 if (nextTimingPoint != timingPoint)
                 {
                     beat = 0;
+                    time = nextTimingPoint.Time;
                     timingPoint = nextTimingPoint;
                 }
 

From c28a9bdb804a05ee5fac61b5728931885650cdf5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 May 2020 23:02:20 +0900
Subject: [PATCH 02813/10326] Move load method up

---
 .../Edit/ManiaBeatSnapGrid.cs                 | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 5803c67b80..0b7834addb 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -51,7 +51,6 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public (double start, double end)? SelectionTimeRange
         {
-            get => selectionTimeRange;
             set
             {
                 if (value == selectionTimeRange)
@@ -62,17 +61,6 @@ namespace osu.Game.Rulesets.Mania.Edit
             }
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            if (!lineCache.IsValid)
-            {
-                lineCache.Validate();
-                createLines();
-            }
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -90,6 +78,17 @@ namespace osu.Game.Rulesets.Mania.Edit
             beatDivisor.BindValueChanged(_ => createLines(), true);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!lineCache.IsValid)
+            {
+                lineCache.Validate();
+                createLines();
+            }
+        }
+
         private readonly Stack<DrawableGridLine> availableLines = new Stack<DrawableGridLine>();
 
         private void createLines()

From 85156c62efd7900dbce4115e27f96327f4fd0345 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 May 2020 23:05:08 +0900
Subject: [PATCH 02814/10326] Add xmldoc and address some code quality concerns

---
 .../Edit/ManiaBeatSnapGrid.cs                 | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 0b7834addb..98e15e3fa8 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -21,12 +21,27 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
+    /// <summary>
+    /// A grid which displays coloured beat divisor lines in proximity to the selection or placement cursor.
+    /// </summary>
     public class ManiaBeatSnapGrid : Component
     {
         private const double visible_range = 750;
 
-        [Resolved]
-        private IManiaHitObjectComposer composer { get; set; }
+        /// <summary>
+        /// The range of time values of the current selection.
+        /// </summary>
+        public (double start, double end)? SelectionTimeRange
+        {
+            set
+            {
+                if (value == selectionTimeRange)
+                    return;
+
+                selectionTimeRange = value;
+                lineCache.Invalidate();
+            }
+        }
 
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
@@ -49,20 +64,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         private (double start, double end)? selectionTimeRange;
 
-        public (double start, double end)? SelectionTimeRange
-        {
-            set
-            {
-                if (value == selectionTimeRange)
-                    return;
-
-                selectionTimeRange = value;
-                lineCache.Invalidate();
-            }
-        }
-
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(IManiaHitObjectComposer composer)
         {
             foreach (var stage in composer.Playfield.Stages)
             {

From db4e3047ddf02cb09a7603c68a0ab854e1cfe6b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 May 2020 23:28:13 +0900
Subject: [PATCH 02815/10326] Add test for final sample output

---
 .../TestSceneSampleOutput.cs                  | 47 +++++++++++++++++++
 .../Objects/Drawables/DrawableHit.cs          |  2 +-
 .../Drawables/DrawableTaikoHitObject.cs       |  2 +-
 .../Objects/Drawables/DrawableHitObject.cs    |  2 +-
 .../Tests/Beatmaps/BeatmapConversionTest.cs   | 11 +++--
 5 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
new file mode 100644
index 0000000000..564ab91291
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.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 System.Linq;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    /// <summary>
+    /// Taiko has some interesting rules for legacy mappings.
+    /// </summary>
+    public class TestSceneSampleOutput : PlayerTestScene
+    {
+        public TestSceneSampleOutput()
+            : base(new TaikoRuleset())
+        {
+        }
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddAssert("has correct samples", () =>
+            {
+                var names = Player.DrawableRuleset.Playfield.AllHitObjects.OfType<DrawableHit>().Select(h => string.Join(',', h.GetSamples().Select(s => s.Name)));
+
+                var expected = new[]
+                {
+                    string.Empty,
+                    string.Empty,
+                    string.Empty,
+                    string.Empty,
+                    HitSampleInfo.HIT_FINISH,
+                    HitSampleInfo.HIT_WHISTLE,
+                    HitSampleInfo.HIT_WHISTLE,
+                    HitSampleInfo.HIT_WHISTLE,
+                };
+
+                return names.SequenceEqual(expected);
+            });
+        }
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TaikoBeatmapConversionTest().GetBeatmap("sample-to-type-conversions");
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 1e1f9ae09b..81b969eaf3 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ? new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.CentreHit), _ => new CentreHitCirclePiece(), confineMode: ConfineMode.ScaleToFit)
             : new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.RimHit), _ => new RimHitCirclePiece(), confineMode: ConfineMode.ScaleToFit);
 
-        protected override IEnumerable<HitSampleInfo> GetSamples()
+        public override IEnumerable<HitSampleInfo> GetSamples()
         {
             // normal and claps are always handled by the drum (see DrumSampleMapping).
             // in addition, whistles are excluded as they are an alternative rim marker.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 90daf3950c..3ab09d4cbe 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -166,7 +166,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         }
 
         // Most osu!taiko hitsounds are managed by the drum (see DrumSampleMapping).
-        protected override IEnumerable<HitSampleInfo> GetSamples() => Enumerable.Empty<HitSampleInfo>();
+        public override IEnumerable<HitSampleInfo> GetSamples() => Enumerable.Empty<HitSampleInfo>();
 
         protected abstract SkinnableDrawable CreateMainPiece();
 
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ba6571fe1a..33ea02c22f 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         protected SkinnableSound Samples { get; private set; }
 
-        protected virtual IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples;
+        public virtual IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples;
 
         private readonly Lazy<List<DrawableHitObject>> nestedHitObjects = new Lazy<List<DrawableHitObject>>();
         public IReadOnlyList<DrawableHitObject> NestedHitObjects => nestedHitObjects.IsValueCreated ? nestedHitObjects.Value : (IReadOnlyList<DrawableHitObject>)Array.Empty<DrawableHitObject>();
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index b60add6e3b..06e82394ec 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -99,7 +99,7 @@ namespace osu.Game.Tests.Beatmaps
 
         private ConvertResult convert(string name, Mod[] mods)
         {
-            var beatmap = getBeatmap(name);
+            var beatmap = GetBeatmap(name);
 
             var rulesetInstance = CreateRuleset();
             beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.RulesetID == rulesetInstance.RulesetInfo.ID ? rulesetInstance.RulesetInfo : new RulesetInfo();
@@ -143,14 +143,19 @@ namespace osu.Game.Tests.Beatmaps
             }
         }
 
-        private IBeatmap getBeatmap(string name)
+        public IBeatmap GetBeatmap(string name)
         {
             using (var resStream = openResource($"{resource_namespace}.{name}.osu"))
             using (var stream = new LineBufferedReader(resStream))
             {
                 var decoder = Decoder.GetDecoder<Beatmap>(stream);
                 ((LegacyBeatmapDecoder)decoder).ApplyOffsets = false;
-                return decoder.Decode(stream);
+                var beatmap = decoder.Decode(stream);
+
+                // not sure but seems to be required.
+                beatmap.BeatmapInfo.Ruleset = CreateRuleset().RulesetInfo;
+
+                return beatmap;
             }
         }
 

From da8729e6bde39ec4255d498cde1e50a7135d5601 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 May 2020 23:28:42 +0900
Subject: [PATCH 02816/10326] 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 650ebde54d..f0f16d3763 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.511.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.519.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ee6206e166..010ef8578a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.511.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.519.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index cbf8600c62..88b0c7dd8a 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.Framework.iOS" Version="2020.511.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.519.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.511.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.519.0" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From e21178570484780c8467f47529ea407a6fd5e24c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 May 2020 21:01:13 +0200
Subject: [PATCH 02817/10326] Add overlay layer to storyboard definition

---
 osu.Game/Storyboards/Storyboard.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index d13c874ee2..b0fb583d62 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -19,19 +19,26 @@ namespace osu.Game.Storyboards
 
         public double FirstEventTime => Layers.Min(l => l.Elements.FirstOrDefault()?.StartTime ?? 0);
 
+        /// <summary>
+        /// Depth of the currently front-most storyboard layer, excluding the overlay layer.
+        /// </summary>
+        private int minimumLayerDepth;
+
         public Storyboard()
         {
             layers.Add("Video", new StoryboardLayer("Video", 4, false));
             layers.Add("Background", new StoryboardLayer("Background", 3));
             layers.Add("Fail", new StoryboardLayer("Fail", 2) { VisibleWhenPassing = false, });
             layers.Add("Pass", new StoryboardLayer("Pass", 1) { VisibleWhenFailing = false, });
-            layers.Add("Foreground", new StoryboardLayer("Foreground", 0));
+            layers.Add("Foreground", new StoryboardLayer("Foreground", minimumLayerDepth = 0));
+
+            layers.Add("Overlay", new StoryboardLayer("Overlay", int.MinValue));
         }
 
         public StoryboardLayer GetLayer(string name)
         {
             if (!layers.TryGetValue(name, out var layer))
-                layers[name] = layer = new StoryboardLayer(name, layers.Values.Min(l => l.Depth) - 1);
+                layers[name] = layer = new StoryboardLayer(name, --minimumLayerDepth);
 
             return layer;
         }

From 6e27247cdf7bc46b4317cbb98f3dfb5b20c769a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 May 2020 22:10:02 +0200
Subject: [PATCH 02818/10326] Adjust storyboard decoder test in line with
 changes

---
 .../Beatmaps/Formats/LegacyStoryboardDecoderTest.cs      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 2fdeadca02..9ebedb3c80 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var storyboard = decoder.Decode(stream);
 
                 Assert.IsTrue(storyboard.HasDrawable);
-                Assert.AreEqual(5, storyboard.Layers.Count());
+                Assert.AreEqual(6, storyboard.Layers.Count());
 
                 StoryboardLayer background = storyboard.Layers.FirstOrDefault(l => l.Depth == 3);
                 Assert.IsNotNull(background);
@@ -56,6 +56,13 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.IsTrue(foreground.VisibleWhenPassing);
                 Assert.AreEqual("Foreground", foreground.Name);
 
+                StoryboardLayer overlay = storyboard.Layers.FirstOrDefault(l => l.Depth == int.MinValue);
+                Assert.IsNotNull(overlay);
+                Assert.IsEmpty(overlay.Elements);
+                Assert.IsTrue(overlay.VisibleWhenFailing);
+                Assert.IsTrue(overlay.VisibleWhenPassing);
+                Assert.AreEqual("Overlay", overlay.Name);
+
                 int spriteCount = background.Elements.Count(x => x.GetType() == typeof(StoryboardSprite));
                 int animationCount = background.Elements.Count(x => x.GetType() == typeof(StoryboardAnimation));
                 int sampleCount = background.Elements.Count(x => x.GetType() == typeof(StoryboardSampleInfo));

From 2398f2e537e8375b63f0de39b637751c1cbaca96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 May 2020 21:12:14 +0200
Subject: [PATCH 02819/10326] Expose drawable overlay layer

---
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs | 3 +++
 osu.Game/Storyboards/StoryboardLayer.cs              | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index c4d796e30b..ec461fa095 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.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 System.Threading;
 using osuTK;
 using osu.Framework.Allocation;
@@ -72,6 +73,8 @@ namespace osu.Game.Storyboards.Drawables
             }
         }
 
+        public DrawableStoryboardLayer OverlayLayer => Children.Single(layer => layer.Name == "Overlay");
+
         private void updateLayerVisibility()
         {
             foreach (var layer in Children)
diff --git a/osu.Game/Storyboards/StoryboardLayer.cs b/osu.Game/Storyboards/StoryboardLayer.cs
index 142bc60deb..1cde7cf67a 100644
--- a/osu.Game/Storyboards/StoryboardLayer.cs
+++ b/osu.Game/Storyboards/StoryboardLayer.cs
@@ -33,6 +33,6 @@ namespace osu.Game.Storyboards
         }
 
         public DrawableStoryboardLayer CreateDrawable()
-            => new DrawableStoryboardLayer(this) { Depth = Depth, };
+            => new DrawableStoryboardLayer(this) { Depth = Depth, Name = Name };
     }
 }

From ce4301c5b8a5a36dafb4dac54d04c4eb49920b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 May 2020 19:47:01 +0200
Subject: [PATCH 02820/10326] Add overlay layer to player by proxying

---
 osu.Game/Screens/Play/DimmableStoryboard.cs | 15 +++++++++++++--
 osu.Game/Screens/Play/Player.cs             |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index eabdee95fb..74c84f648c 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
 using osu.Game.Storyboards;
 using osu.Game.Storyboards.Drawables;
@@ -13,6 +14,8 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public class DimmableStoryboard : UserDimContainer
     {
+        public Container OverlayLayerContainer;
+
         private readonly Storyboard storyboard;
         private DrawableStoryboard drawableStoryboard;
 
@@ -24,6 +27,8 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load()
         {
+            Add(OverlayLayerContainer = new Container());
+
             initializeStoryboard(false);
         }
 
@@ -46,9 +51,15 @@ namespace osu.Game.Screens.Play
             drawableStoryboard = storyboard.CreateDrawable();
 
             if (async)
-                LoadComponentAsync(drawableStoryboard, Add);
+                LoadComponentAsync(drawableStoryboard, onStoryboardCreated);
             else
-                Add(drawableStoryboard);
+                onStoryboardCreated(drawableStoryboard);
+        }
+
+        private void onStoryboardCreated(DrawableStoryboard storyboard)
+        {
+            Add(storyboard);
+            OverlayLayerContainer.Add(storyboard.OverlayLayer.CreateProxy());
         }
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1ec3a69b24..77da038ab3 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -264,6 +264,7 @@ namespace osu.Game.Screens.Play
         {
             target.AddRange(new[]
             {
+                DimmableStoryboard.OverlayLayerContainer.CreateProxy(),
                 BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)
                 {
                     Clock = DrawableRuleset.FrameStableClock,

From 963806474148d80ddc706e0f47f8bf5d8a22e6a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 10:06:23 +0900
Subject: [PATCH 02821/10326] Tidy up ruleset assignment code

---
 osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index 06e82394ec..6ada632850 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -101,9 +101,6 @@ namespace osu.Game.Tests.Beatmaps
         {
             var beatmap = GetBeatmap(name);
 
-            var rulesetInstance = CreateRuleset();
-            beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.RulesetID == rulesetInstance.RulesetInfo.ID ? rulesetInstance.RulesetInfo : new RulesetInfo();
-
             var converterResult = new Dictionary<HitObject, IEnumerable<HitObject>>();
 
             var working = new ConversionWorkingBeatmap(beatmap)
@@ -115,7 +112,7 @@ namespace osu.Game.Tests.Beatmaps
                 }
             };
 
-            working.GetPlayableBeatmap(rulesetInstance.RulesetInfo, mods);
+            working.GetPlayableBeatmap(CreateRuleset().RulesetInfo, mods);
 
             return new ConvertResult
             {
@@ -152,8 +149,8 @@ namespace osu.Game.Tests.Beatmaps
                 ((LegacyBeatmapDecoder)decoder).ApplyOffsets = false;
                 var beatmap = decoder.Decode(stream);
 
-                // not sure but seems to be required.
-                beatmap.BeatmapInfo.Ruleset = CreateRuleset().RulesetInfo;
+                var rulesetInstance = CreateRuleset();
+                beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.RulesetID == rulesetInstance.RulesetInfo.ID ? rulesetInstance.RulesetInfo : new RulesetInfo();
 
                 return beatmap;
             }

From 76080368e900f2b866f46235eebff0f7bda19a6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 10:14:08 +0900
Subject: [PATCH 02822/10326] Mark test as headless

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

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
index 564ab91291..d541aa8de8 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
@@ -12,6 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
     /// <summary>
     /// Taiko has some interesting rules for legacy mappings.
     /// </summary>
+    [HeadlessTest]
     public class TestSceneSampleOutput : PlayerTestScene
     {
         public TestSceneSampleOutput()

From d31a59b07466eae570e1127624c30286666339b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 14:55:36 +0900
Subject: [PATCH 02823/10326] Fix logic results in infinite loop on default
 timing point return

---
 osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 98e15e3fa8..05990eadd7 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                 var nextTimingPoint = beatmap.ControlPointInfo.TimingPointAt(time);
 
                 // switch to the next timing point if we have reached it.
-                if (nextTimingPoint != timingPoint)
+                if (nextTimingPoint.Time > timingPoint.Time)
                 {
                     beat = 0;
                     time = nextTimingPoint.Time;

From 0bc3073d49aeff5ed5647fca342f158725222510 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 15:01:32 +0900
Subject: [PATCH 02824/10326] Fix test failures

---
 .../TestSceneManiaHitObjectComposer.cs             | 14 +++++++++-----
 osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs  |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
index 6274bb1005..bad3d7854e 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         public void TestDragOffscreenSelectionVerticallyUpScroll()
         {
             DrawableHitObject lastObject = null;
+            double originalTime = 0;
             Vector2 originalPosition = Vector2.Zero;
 
             setScrollStep(ScrollingDirection.Up);
@@ -49,6 +50,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddStep("seek to last object", () =>
             {
                 lastObject = this.ChildrenOfType<DrawableHitObject>().Single(d => d.HitObject == composer.EditorBeatmap.HitObjects.Last());
+                originalTime = lastObject.HitObject.StartTime;
                 Clock.Seek(composer.EditorBeatmap.HitObjects.Last().StartTime);
             });
 
@@ -64,19 +66,20 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddStep("move mouse downwards", () =>
             {
-                InputManager.MoveMouseTo(lastObject, new Vector2(0, 20));
+                InputManager.MoveMouseTo(lastObject, new Vector2(0, lastObject.ScreenSpaceDrawQuad.Height * 2));
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 
             AddAssert("hitobjects not moved columns", () => composer.EditorBeatmap.HitObjects.All(h => ((ManiaHitObject)h).Column == 0));
             AddAssert("hitobjects moved downwards", () => lastObject.DrawPosition.Y - originalPosition.Y > 0);
-            AddAssert("hitobjects not moved too far", () => lastObject.DrawPosition.Y - originalPosition.Y < 50);
+            AddAssert("hitobject has moved time", () => lastObject.HitObject.StartTime == originalTime + 125);
         }
 
         [Test]
         public void TestDragOffscreenSelectionVerticallyDownScroll()
         {
             DrawableHitObject lastObject = null;
+            double originalTime = 0;
             Vector2 originalPosition = Vector2.Zero;
 
             setScrollStep(ScrollingDirection.Down);
@@ -84,6 +87,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddStep("seek to last object", () =>
             {
                 lastObject = this.ChildrenOfType<DrawableHitObject>().Single(d => d.HitObject == composer.EditorBeatmap.HitObjects.Last());
+                originalTime = lastObject.HitObject.StartTime;
                 Clock.Seek(composer.EditorBeatmap.HitObjects.Last().StartTime);
             });
 
@@ -99,13 +103,13 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddStep("move mouse upwards", () =>
             {
-                InputManager.MoveMouseTo(lastObject, new Vector2(0, -20));
+                InputManager.MoveMouseTo(lastObject, new Vector2(0, -lastObject.ScreenSpaceDrawQuad.Height * 2));
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 
             AddAssert("hitobjects not moved columns", () => composer.EditorBeatmap.HitObjects.All(h => ((ManiaHitObject)h).Column == 0));
             AddAssert("hitobjects moved upwards", () => originalPosition.Y - lastObject.DrawPosition.Y > 0);
-            AddAssert("hitobjects not moved too far", () => originalPosition.Y - lastObject.DrawPosition.Y < 50);
+            AddAssert("hitobject has moved time", () => lastObject.HitObject.StartTime == originalTime + 125);
         }
 
         [Test]
@@ -207,7 +211,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 };
 
                 for (int i = 0; i < 10; i++)
-                    EditorBeatmap.Add(new Note { StartTime = 100 * i });
+                    EditorBeatmap.Add(new Note { StartTime = 125 * i });
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 05990eadd7..fa8f8a755a 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             foreach (var grid in grids)
             {
-                foreach (var line in grid.AliveObjects.OfType<DrawableGridLine>())
+                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
                 {
                     Vector2 linePos = line.ToSpaceOfOtherDrawable(line.OriginPosition, this);
                     float d = Vector2.Distance(position, linePos);

From 85088c9b3baa96ece3ad5a1404585eeb23e5c8bb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 May 2020 15:08:33 +0900
Subject: [PATCH 02825/10326] Privatise setter

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

diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index 74c84f648c..58eb95b7c6 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public class DimmableStoryboard : UserDimContainer
     {
-        public Container OverlayLayerContainer;
+        public Container OverlayLayerContainer { get; private set; }
 
         private readonly Storyboard storyboard;
         private DrawableStoryboard drawableStoryboard;

From c2697d39070d73ffbb2b7894a57088a85df2e127 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 20:49:01 +0900
Subject: [PATCH 02826/10326] Use DrawableSample in SkinnableSound class

---
 .../Objects/Drawables/DrawableHitObject.cs    | 11 ++-
 osu.Game/Skinning/SkinnableSound.cs           | 72 +++++++------------
 2 files changed, 32 insertions(+), 51 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 33ea02c22f..c32d4e441e 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -11,7 +11,6 @@ using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Threading;
-using osu.Framework.Audio;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
@@ -96,8 +95,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         protected virtual float SamplePlaybackPosition => 0.5f;
 
-        private readonly BindableDouble balanceAdjust = new BindableDouble();
-
         private BindableList<HitSampleInfo> samplesBindable;
         private Bindable<double> startTimeBindable;
         private Bindable<bool> userPositionalHitSounds;
@@ -173,7 +170,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             Samples = new SkinnableSound(samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)));
-            Samples.AddAdjustment(AdjustableProperty.Balance, balanceAdjust);
             AddInternal(Samples);
         }
 
@@ -360,8 +356,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             const float balance_adjust_amount = 0.4f;
 
-            balanceAdjust.Value = balance_adjust_amount * (userPositionalHitSounds.Value ? SamplePlaybackPosition - 0.5f : 0);
-            Samples?.Play();
+            if (Samples != null)
+            {
+                Samples.Balance.Value = balance_adjust_amount * (userPositionalHitSounds.Value ? SamplePlaybackPosition - 0.5f : 0);
+                Samples.Play();
+            }
         }
 
         protected override void Update()
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index a78c04ecd4..30320c89a6 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -4,11 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics.Audio;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 
 namespace osu.Game.Skinning
@@ -17,25 +17,32 @@ namespace osu.Game.Skinning
     {
         private readonly ISampleInfo[] hitSamples;
 
-        private List<(AdjustableProperty property, BindableDouble bindable)> adjustments;
-
-        private SampleChannel[] channels;
-
         [Resolved]
         private ISampleStore samples { get; set; }
 
+        public SkinnableSound(ISampleInfo hitSamples)
+            : this(new[] { hitSamples })
+        {
+        }
+
         public SkinnableSound(IEnumerable<ISampleInfo> hitSamples)
         {
             this.hitSamples = hitSamples.ToArray();
-        }
-
-        public SkinnableSound(ISampleInfo hitSamples)
-        {
-            this.hitSamples = new[] { hitSamples };
+            InternalChild = samplesContainer = new AudioContainer<DrawableSample>();
         }
 
         private bool looping;
 
+        private readonly AudioContainer<DrawableSample> samplesContainer;
+
+        public BindableNumber<double> Volume => samplesContainer.Volume;
+
+        public BindableNumber<double> Balance => samplesContainer.Balance;
+
+        public BindableNumber<double> Frequency => samplesContainer.Frequency;
+
+        public BindableNumber<double> Tempo => samplesContainer.Tempo;
+
         public bool Looping
         {
             get => looping;
@@ -45,33 +52,23 @@ namespace osu.Game.Skinning
 
                 looping = value;
 
-                channels?.ForEach(c => c.Looping = looping);
+                samplesContainer.ForEach(c => c.Looping = looping);
             }
         }
 
-        public void Play() => channels?.ForEach(c => c.Play());
-
-        public void Stop() => channels?.ForEach(c => c.Stop());
-
-        public void AddAdjustment(AdjustableProperty type, BindableDouble adjustBindable)
+        public void Play() => samplesContainer.ForEach(c =>
         {
-            if (adjustments == null) adjustments = new List<(AdjustableProperty, BindableDouble)>();
+            if (c.AggregateVolume.Value > 0)
+                c.Play();
+        });
 
-            adjustments.Add((type, adjustBindable));
-            channels?.ForEach(c => c.AddAdjustment(type, adjustBindable));
-        }
-
-        public void RemoveAdjustment(AdjustableProperty type, BindableDouble adjustBindable)
-        {
-            adjustments?.Remove((type, adjustBindable));
-            channels?.ForEach(c => c.RemoveAdjustment(type, adjustBindable));
-        }
+        public void Stop() => samplesContainer.ForEach(c => c.Stop());
 
         public override bool IsPresent => Scheduler.HasPendingTasks;
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
-            channels = hitSamples.Select(s =>
+            var channels = hitSamples.Select(s =>
             {
                 var ch = skin.GetSample(s);
 
@@ -88,27 +85,12 @@ namespace osu.Game.Skinning
                 {
                     ch.Looping = looping;
                     ch.Volume.Value = s.Volume / 100.0;
-
-                    if (adjustments != null)
-                    {
-                        foreach (var (property, bindable) in adjustments)
-                            ch.AddAdjustment(property, bindable);
-                    }
                 }
 
                 return ch;
-            }).Where(c => c != null).ToArray();
-        }
+            }).Where(c => c != null);
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (channels != null)
-            {
-                foreach (var c in channels)
-                    c.Dispose();
-            }
+            samplesContainer.ChildrenEnumerable = channels.Select(c => new DrawableSample(c));
         }
     }
 }

From 3354d48a38c90314caa376481b06a1d0e9f77fc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 17:48:43 +0900
Subject: [PATCH 02827/10326] Change snapping to be screen space coordinate
 based

---
 .../Blueprints/HoldNoteSelectionBlueprint.cs    |  2 +-
 .../Edit/ManiaHitObjectComposer.cs              | 16 +++++++++++-----
 .../TestSceneOsuDistanceSnapGrid.cs             |  8 +++++---
 .../Sliders/Components/PathControlPointPiece.cs |  4 ++--
 .../Sliders/SliderSelectionBlueprint.cs         |  2 +-
 .../Visual/Editing/TestSceneDistanceSnapGrid.cs |  8 +++++---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs     | 17 +++++++++++------
 ...SnapProvider.cs => IPositionSnapProvider.cs} | 11 +++++++++--
 .../Rulesets/Edit/OverlaySelectionBlueprint.cs  |  2 +-
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs    |  3 +++
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs    |  2 +-
 .../Compose/Components/BlueprintContainer.cs    |  8 ++++----
 .../Components/ComposeBlueprintContainer.cs     |  5 ++---
 .../Edit/Compose/Components/DistanceSnapGrid.cs |  2 +-
 .../Compose/Components/Timeline/Timeline.cs     | 12 ++++++------
 .../Timeline/TimelineHitObjectBlueprint.cs      |  4 ++--
 16 files changed, 65 insertions(+), 41 deletions(-)
 rename osu.Game/Rulesets/Edit/{IDistanceSnapProvider.cs => IPositionSnapProvider.cs} (84%)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
index 43d43ef252..1737c4d2e5 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
@@ -77,6 +77,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         public override Quad SelectionQuad => ScreenSpaceDrawQuad;
 
-        public override Vector2 SelectionPoint => DrawableObject.Head.ScreenSpaceDrawQuad.Centre;
+        public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.Head.ScreenSpaceDrawQuad.Centre;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index dfa933baad..9ba2cdeaec 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.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.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
@@ -44,26 +45,31 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public int TotalColumns => Playfield.TotalColumns;
 
-        public override (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time)
+        public override (Vector2 position, double time) SnapPositionToValidTime(Vector2 position)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
         {
             var hoc = Playfield.GetColumn(0).HitObjectContainer;
 
-            float targetPosition = hoc.ToLocalSpace(ToScreenSpace(position)).Y;
+            Vector2 targetPosition = hoc.ToLocalSpace(screenSpacePosition);
 
             if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
             {
                 // We're dealing with screen coordinates in which the position decreases towards the centre of the screen resulting in an increase in start time.
                 // The scrolling algorithm instead assumes a top anchor meaning an increase in time corresponds to an increase in position,
                 // so when scrolling downwards the coordinates need to be flipped.
-                targetPosition = hoc.DrawHeight - targetPosition;
+                targetPosition.Y = hoc.DrawHeight - targetPosition.Y;
             }
 
-            double targetTime = drawableRuleset.ScrollingInfo.Algorithm.TimeAt(targetPosition,
+            double targetTime = drawableRuleset.ScrollingInfo.Algorithm.TimeAt(targetPosition.Y,
                 EditorClock.CurrentTime,
                 drawableRuleset.ScrollingInfo.TimeRange.Value,
                 hoc.DrawHeight);
 
-            return base.GetSnappedPosition(position, targetTime);
+            return (targetPosition, targetTime);
         }
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
index c182aa5d63..f95f76b405 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Cached]
         private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
 
-        [Cached(typeof(IDistanceSnapProvider))]
+        [Cached(typeof(IPositionSnapProvider))]
         private readonly SnapProvider snapProvider = new SnapProvider();
 
         private TestOsuDistanceSnapGrid grid;
@@ -172,9 +172,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             }
         }
 
-        private class SnapProvider : IDistanceSnapProvider
+        private class SnapProvider : IPositionSnapProvider
         {
-            public (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time) => (position, time);
+            public (Vector2 position, double time) SnapPositionToValidTime(Vector2 position) => (position, 0);
+
+            public (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) => (screenSpacePosition, 0);
 
             public float GetBeatSnapDistanceAt(double referenceTime) => (float)beat_length;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index d0c1eb5317..abbef0772f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         private IEditorChangeHandler changeHandler { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private IDistanceSnapProvider snapProvider { get; set; }
+        private IPositionSnapProvider snapProvider { get; set; }
 
         [Resolved]
         private OsuColour colours { get; set; }
@@ -162,7 +162,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             if (ControlPoint == slider.Path.ControlPoints[0])
             {
                 // Special handling for the head control point - the position of the slider changes which means the snapped position and time have to be taken into account
-                (Vector2 snappedPosition, double snappedTime) = snapProvider?.GetSnappedPosition(e.MousePosition, slider.StartTime) ?? (e.MousePosition, slider.StartTime);
+                (Vector2 snappedPosition, double snappedTime) = snapProvider?.SnapScreenSpacePositionToValidTime(e.MousePosition) ?? (e.MousePosition, slider.StartTime);
                 Vector2 movementDelta = snappedPosition - slider.Position;
 
                 slider.Position += movementDelta;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index b7074b7ee5..6633136673 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -190,7 +190,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 SelectionPoint => ((DrawableSlider)DrawableObject).HeadCircle.ScreenSpaceDrawQuad.Centre;
+        public override Vector2 ScreenSpaceSelectionPoint => ((DrawableSlider)DrawableObject).HeadCircle.ScreenSpaceDrawQuad.Centre;
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => BodyPiece.ReceivePositionalInputAt(screenSpacePos);
 
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index 417d16fdb0..0e5e88c47a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Cached(typeof(EditorBeatmap))]
         private readonly EditorBeatmap editorBeatmap;
 
-        [Cached(typeof(IDistanceSnapProvider))]
+        [Cached(typeof(IPositionSnapProvider))]
         private readonly SnapProvider snapProvider = new SnapProvider();
 
         public TestSceneDistanceSnapGrid()
@@ -151,9 +151,11 @@ namespace osu.Game.Tests.Visual.Editing
                 => (Vector2.Zero, 0);
         }
 
-        private class SnapProvider : IDistanceSnapProvider
+        private class SnapProvider : IPositionSnapProvider
         {
-            public (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time) => (position, time);
+            public (Vector2 position, double time) SnapPositionToValidTime(Vector2 position) => (position, 0);
+
+            public (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) => (screenSpacePosition, 0);
 
             public float GetBeatSnapDistanceAt(double referenceTime) => 10;
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 883288d6d7..82e8fc8b10 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -245,8 +245,7 @@ namespace osu.Game.Rulesets.Edit
         {
             EditorBeatmap.PlacementObject.Value = hitObject;
 
-            if (distanceSnapGrid != null)
-                hitObject.StartTime = GetSnappedPosition(distanceSnapGrid.ToLocalSpace(inputManager.CurrentState.Mouse.Position), hitObject.StartTime).time;
+            hitObject.StartTime = SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position).time;
         }
 
         public void EndPlacement(HitObject hitObject, bool commit)
@@ -265,7 +264,11 @@ namespace osu.Game.Rulesets.Edit
 
         public void Delete(HitObject hitObject) => EditorBeatmap.Remove(hitObject);
 
-        public override (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time) => distanceSnapGrid?.GetSnappedPosition(position) ?? (position, time);
+        public override (Vector2 position, double time) SnapPositionToValidTime(Vector2 position) =>
+            distanceSnapGrid?.GetSnappedPosition(position) ?? (position, 0);
+
+        public override (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
+            => SnapPositionToValidTime(drawableRulesetWrapper.Playfield.ToLocalSpace(screenSpacePosition));
 
         public override float GetBeatSnapDistanceAt(double referenceTime)
         {
@@ -297,8 +300,8 @@ namespace osu.Game.Rulesets.Edit
     }
 
     [Cached(typeof(HitObjectComposer))]
-    [Cached(typeof(IDistanceSnapProvider))]
-    public abstract class HitObjectComposer : CompositeDrawable, IDistanceSnapProvider
+    [Cached(typeof(IPositionSnapProvider))]
+    public abstract class HitObjectComposer : CompositeDrawable, IPositionSnapProvider
     {
         internal HitObjectComposer()
         {
@@ -323,7 +326,9 @@ namespace osu.Game.Rulesets.Edit
         [CanBeNull]
         protected virtual DistanceSnapGrid CreateDistanceSnapGrid([NotNull] IEnumerable<HitObject> selectedHitObjects) => null;
 
-        public abstract (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time);
+        public abstract (Vector2 position, double time) SnapPositionToValidTime(Vector2 position);
+
+        public abstract (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
 
         public abstract float GetBeatSnapDistanceAt(double referenceTime);
 
diff --git a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
similarity index 84%
rename from osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
rename to osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
index c6e61f68da..93cb605132 100644
--- a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
@@ -5,9 +5,16 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public interface IDistanceSnapProvider
+    public interface IPositionSnapProvider
     {
-        (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time);
+        /// <summary>
+        /// Given a position (local to the provider), find a valid time snap
+        /// </summary>
+        /// <param name="position">The local position to be snapped.</param>
+        /// <returns>The time and position post-snapping.</returns>
+        (Vector2 position, double time) SnapPositionToValidTime(Vector2 position);
+
+        (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
 
         /// <summary>
         /// Retrieves the distance between two points within a timing point that are one beat length apart.
diff --git a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
index b4ae3f3fba..8202d3a1d1 100644
--- a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Edit
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.ReceivePositionalInputAt(screenSpacePos);
 
-        public override Vector2 SelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
+        public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
 
         public override Quad SelectionQuad => DrawableObject.ScreenSpaceDrawQuad;
 
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index fb1eb7adbf..c06e50950c 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -66,7 +66,10 @@ namespace osu.Game.Rulesets.Edit
         protected void BeginPlacement(double? startTime = null, bool commitStart = false)
         {
             HitObject.StartTime = startTime ?? EditorClock.CurrentTime;
+
+            // applies snapping to above time
             placementHandler.BeginPlacement(HitObject);
+
             PlacementActive |= commitStart;
         }
 
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index e6a63eae4f..71256093d5 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// The screen-space point that causes this <see cref="OverlaySelectionBlueprint"/> to be selected.
         /// </summary>
-        public virtual Vector2 SelectionPoint => ScreenSpaceDrawQuad.Centre;
+        public virtual Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.Centre;
 
         /// <summary>
         /// The screen-space quad that outlines this <see cref="OverlaySelectionBlueprint"/> for selections.
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 8910684463..d1cae6b3cd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
 
         [Resolved(canBeNull: true)]
-        private IDistanceSnapProvider snapProvider { get; set; }
+        private IPositionSnapProvider snapProvider { get; set; }
 
         protected BlueprintContainer()
         {
@@ -326,7 +326,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             foreach (var blueprint in SelectionBlueprints)
             {
-                if (blueprint.IsAlive && blueprint.IsPresent && rect.Contains(blueprint.SelectionPoint))
+                if (blueprint.IsAlive && blueprint.IsPresent && rect.Contains(blueprint.ScreenSpaceSelectionPoint))
                     blueprint.Select();
                 else
                     blueprint.Deselect();
@@ -384,7 +384,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // Movement is tracked from the blueprint of the earliest hitobject, since it only makes sense to distance snap from that hitobject
             movementBlueprint = selectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime).First();
-            movementBlueprintOriginalPosition = movementBlueprint.SelectionPoint; // todo: unsure if correct
+            movementBlueprintOriginalPosition = movementBlueprint.ScreenSpaceSelectionPoint; // todo: unsure if correct
         }
 
         /// <summary>
@@ -405,7 +405,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             Vector2 movePosition = movementBlueprintOriginalPosition.Value + e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
 
             // Retrieve a snapped position.
-            (Vector2 snappedPosition, double snappedTime) = snapProvider.GetSnappedPosition(ToLocalSpace(movePosition), draggedObject.StartTime);
+            (Vector2 snappedPosition, double snappedTime) = snapProvider.SnapScreenSpacePositionToValidTime(movePosition);
 
             // Move the hitobjects.
             if (!selectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, ToScreenSpace(snappedPosition))))
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 0eb77a8561..bb6094ebe8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -67,10 +67,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void updatePlacementPosition(Vector2 screenSpacePosition)
         {
-            Vector2 snappedGridPosition = composer.GetSnappedPosition(ToLocalSpace(screenSpacePosition), 0).position;
-            Vector2 snappedScreenSpacePosition = ToScreenSpace(snappedGridPosition);
+            Vector2 snappedPlayfieldPosition = composer.SnapScreenSpacePositionToValidTime(screenSpacePosition).position;
 
-            currentPlacement.UpdatePosition(snappedScreenSpacePosition);
+            currentPlacement.UpdatePosition(ToScreenSpace(snappedPlayfieldPosition));
         }
 
         #endregion
diff --git a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
index 3a42938fc1..8a92a2011d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected OsuColour Colours { get; private set; }
 
         [Resolved]
-        protected IDistanceSnapProvider SnapProvider { get; private set; }
+        protected IPositionSnapProvider SnapProvider { get; private set; }
 
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 25f3cfc285..1006da28df 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -17,9 +17,9 @@ using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    [Cached(typeof(IDistanceSnapProvider))]
+    [Cached(typeof(IPositionSnapProvider))]
     [Cached]
-    public class Timeline : ZoomableScrollContainer, IDistanceSnapProvider
+    public class Timeline : ZoomableScrollContainer, IPositionSnapProvider
     {
         public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
         public readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
@@ -181,12 +181,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private IBeatSnapProvider beatSnapProvider { get; set; }
 
-        public double GetTimeFromScreenSpacePosition(Vector2 position)
-            => getTimeFromPosition(Content.ToLocalSpace(position));
-
-        public (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time) =>
+        public (Vector2 position, double time) SnapPositionToValidTime(Vector2 position) =>
             (position, beatSnapProvider.SnapTime(getTimeFromPosition(position)));
 
+        public (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 position) =>
+            (position, beatSnapProvider.SnapTime(getTimeFromPosition(Content.ToLocalSpace(position))));
+
         private double getTimeFromPosition(Vector2 localPosition) =>
             (localPosition.X / Content.DrawWidth) * track.Length;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 16ba3ba89a..b5eae26f98 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -186,7 +186,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        public override Vector2 SelectionPoint => ScreenSpaceDrawQuad.TopLeft;
+        public override Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.TopLeft;
 
         public class DragBar : Container
         {
@@ -275,7 +275,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 OnDragHandled?.Invoke(e);
 
-                var time = timeline.GetTimeFromScreenSpacePosition(e.ScreenSpaceMousePosition);
+                var time = timeline.SnapScreenSpacePositionToValidTime(e.ScreenSpaceMousePosition).time;
 
                 switch (hitObject)
                 {

From c46bfc2532d139838ad6a94e11571f2c81430421 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 18:19:21 +0900
Subject: [PATCH 02828/10326] Create SnapResult class to hold various snapping
 results

---
 .../Edit/ManiaHitObjectComposer.cs            | 10 +----
 .../TestSceneOsuDistanceSnapGrid.cs           |  4 +-
 .../Components/PathControlPointPiece.cs       |  6 +--
 .../Editing/TestSceneDistanceSnapGrid.cs      |  4 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 17 ++++----
 .../Rulesets/Edit/IPositionSnapProvider.cs    | 27 ++++++++++---
 .../Compose/Components/BlueprintContainer.cs  | 15 ++++---
 .../Components/ComposeBlueprintContainer.cs   |  2 +-
 .../Compose/Components/Timeline/Timeline.cs   |  7 +---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 39 ++++++++++---------
 10 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 9ba2cdeaec..f7951fcc5d 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.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.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
@@ -45,12 +44,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public int TotalColumns => Playfield.TotalColumns;
 
-        public override (Vector2 position, double time) SnapPositionToValidTime(Vector2 position)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
+        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
         {
             var hoc = Playfield.GetColumn(0).HitObjectContainer;
 
@@ -69,7 +63,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                 drawableRuleset.ScrollingInfo.TimeRange.Value,
                 hoc.DrawHeight);
 
-            return (targetPosition, targetTime);
+            return new SnapResult(targetPosition, targetTime);
         }
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
index f95f76b405..0d0be2953b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
@@ -174,9 +174,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private class SnapProvider : IPositionSnapProvider
         {
-            public (Vector2 position, double time) SnapPositionToValidTime(Vector2 position) => (position, 0);
-
-            public (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) => (screenSpacePosition, 0);
+            public SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) => new SnapResult(screenSpacePosition, 0);
 
             public float GetBeatSnapDistanceAt(double referenceTime) => (float)beat_length;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index abbef0772f..834bf1892f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -162,11 +162,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             if (ControlPoint == slider.Path.ControlPoints[0])
             {
                 // Special handling for the head control point - the position of the slider changes which means the snapped position and time have to be taken into account
-                (Vector2 snappedPosition, double snappedTime) = snapProvider?.SnapScreenSpacePositionToValidTime(e.MousePosition) ?? (e.MousePosition, slider.StartTime);
-                Vector2 movementDelta = snappedPosition - slider.Position;
+                var result = snapProvider?.SnapScreenSpacePositionToValidTime(e.MousePosition);
+                Vector2 movementDelta = (result?.ScreenSpacePosition ?? e.MousePosition) - slider.Position;
 
                 slider.Position += movementDelta;
-                slider.StartTime = snappedTime;
+                slider.StartTime = result?.Time ?? slider.StartTime;
 
                 // Since control points are relative to the position of the slider, they all need to be offset backwards by the delta
                 for (int i = 1; i < slider.Path.ControlPoints.Count; i++)
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index 0e5e88c47a..8190cf5f89 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -153,9 +153,7 @@ namespace osu.Game.Tests.Visual.Editing
 
         private class SnapProvider : IPositionSnapProvider
         {
-            public (Vector2 position, double time) SnapPositionToValidTime(Vector2 position) => (position, 0);
-
-            public (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) => (screenSpacePosition, 0);
+            public SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) => new SnapResult(screenSpacePosition, 0);
 
             public float GetBeatSnapDistanceAt(double referenceTime) => 10;
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 82e8fc8b10..7e9bb850af 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -245,7 +245,8 @@ namespace osu.Game.Rulesets.Edit
         {
             EditorBeatmap.PlacementObject.Value = hitObject;
 
-            hitObject.StartTime = SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position).time;
+            if (SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position).Time is double time)
+                hitObject.StartTime = time;
         }
 
         public void EndPlacement(HitObject hitObject, bool commit)
@@ -264,11 +265,13 @@ namespace osu.Game.Rulesets.Edit
 
         public void Delete(HitObject hitObject) => EditorBeatmap.Remove(hitObject);
 
-        public override (Vector2 position, double time) SnapPositionToValidTime(Vector2 position) =>
-            distanceSnapGrid?.GetSnappedPosition(position) ?? (position, 0);
+        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
+        {
+            if (distanceSnapGrid == null) return new SnapResult(screenSpacePosition, null);
 
-        public override (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
-            => SnapPositionToValidTime(drawableRulesetWrapper.Playfield.ToLocalSpace(screenSpacePosition));
+            (Vector2 pos, double time) = distanceSnapGrid.GetSnappedPosition(distanceSnapGrid.ToLocalSpace(screenSpacePosition));
+            return new SnapResult(distanceSnapGrid.ToScreenSpace(pos), time);
+        }
 
         public override float GetBeatSnapDistanceAt(double referenceTime)
         {
@@ -326,9 +329,7 @@ namespace osu.Game.Rulesets.Edit
         [CanBeNull]
         protected virtual DistanceSnapGrid CreateDistanceSnapGrid([NotNull] IEnumerable<HitObject> selectedHitObjects) => null;
 
-        public abstract (Vector2 position, double time) SnapPositionToValidTime(Vector2 position);
-
-        public abstract (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
+        public abstract SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
 
         public abstract float GetBeatSnapDistanceAt(double referenceTime);
 
diff --git a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
index 93cb605132..d95800f403 100644
--- a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
@@ -8,13 +8,11 @@ namespace osu.Game.Rulesets.Edit
     public interface IPositionSnapProvider
     {
         /// <summary>
-        /// Given a position (local to the provider), find a valid time snap
+        /// Given a position, find a valid time snap.
         /// </summary>
-        /// <param name="position">The local position to be snapped.</param>
+        /// <param name="screenSpacePosition">The screen-space position to be snapped.</param>
         /// <returns>The time and position post-snapping.</returns>
-        (Vector2 position, double time) SnapPositionToValidTime(Vector2 position);
-
-        (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
+        SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
 
         /// <summary>
         /// Retrieves the distance between two points within a timing point that are one beat length apart.
@@ -55,4 +53,23 @@ namespace osu.Game.Rulesets.Edit
         /// <returns>A value that represents <paramref name="distance"/> snapped to the closest beat of the timing point.</returns>
         float GetSnappedDistanceFromDistance(double referenceTime, float distance);
     }
+
+    public class SnapResult
+    {
+        /// <summary>
+        /// The screen space position, potentially altered for snapping.
+        /// </summary>
+        public Vector2 ScreenSpacePosition;
+
+        /// <summary>
+        /// The resultant time for snapping, if a value could be attained.
+        /// </summary>
+        public double? Time;
+
+        public SnapResult(Vector2 screenSpacePosition, double? time)
+        {
+            ScreenSpacePosition = screenSpacePosition;
+            Time = time;
+        }
+    }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index d1cae6b3cd..e38df3d812 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -405,16 +405,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
             Vector2 movePosition = movementBlueprintOriginalPosition.Value + e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
 
             // Retrieve a snapped position.
-            (Vector2 snappedPosition, double snappedTime) = snapProvider.SnapScreenSpacePositionToValidTime(movePosition);
+            var result = snapProvider.SnapScreenSpacePositionToValidTime(movePosition);
 
             // Move the hitobjects.
-            if (!selectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, ToScreenSpace(snappedPosition))))
+            if (!selectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, result.ScreenSpacePosition)))
                 return true;
 
-            // Apply the start time at the newly snapped-to position
-            double offset = snappedTime - draggedObject.StartTime;
-            foreach (HitObject obj in selectionHandler.SelectedHitObjects)
-                obj.StartTime += offset;
+            if (result.Time.HasValue)
+            {
+                // Apply the start time at the newly snapped-to position
+                double offset = result.Time.Value - draggedObject.StartTime;
+                foreach (HitObject obj in selectionHandler.SelectedHitObjects)
+                    obj.StartTime += offset;
+            }
 
             return true;
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index bb6094ebe8..e1a4bca1d6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void updatePlacementPosition(Vector2 screenSpacePosition)
         {
-            Vector2 snappedPlayfieldPosition = composer.SnapScreenSpacePositionToValidTime(screenSpacePosition).position;
+            Vector2 snappedPlayfieldPosition = composer.SnapScreenSpacePositionToValidTime(screenSpacePosition).ScreenSpacePosition;
 
             currentPlacement.UpdatePosition(ToScreenSpace(snappedPlayfieldPosition));
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 1006da28df..ec2b11c0cf 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -181,11 +181,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private IBeatSnapProvider beatSnapProvider { get; set; }
 
-        public (Vector2 position, double time) SnapPositionToValidTime(Vector2 position) =>
-            (position, beatSnapProvider.SnapTime(getTimeFromPosition(position)));
-
-        public (Vector2 position, double time) SnapScreenSpacePositionToValidTime(Vector2 position) =>
-            (position, beatSnapProvider.SnapTime(getTimeFromPosition(Content.ToLocalSpace(position))));
+        public SnapResult SnapScreenSpacePositionToValidTime(Vector2 position) =>
+            new SnapResult(position, beatSnapProvider.SnapTime(getTimeFromPosition(Content.ToLocalSpace(position))));
 
         private double getTimeFromPosition(Vector2 localPosition) =>
             (localPosition.X / Content.DrawWidth) * track.Length;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index b5eae26f98..03e05b75c5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -275,32 +275,33 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 OnDragHandled?.Invoke(e);
 
-                var time = timeline.SnapScreenSpacePositionToValidTime(e.ScreenSpaceMousePosition).time;
-
-                switch (hitObject)
+                if (timeline.SnapScreenSpacePositionToValidTime(e.ScreenSpaceMousePosition).Time is double time)
                 {
-                    case IHasRepeats repeatHitObject:
-                        // find the number of repeats which can fit in the requested time.
-                        var lengthOfOneRepeat = repeatHitObject.Duration / (repeatHitObject.RepeatCount + 1);
-                        var proposedCount = Math.Max(0, (int)((time - hitObject.StartTime) / lengthOfOneRepeat) - 1);
+                    switch (hitObject)
+                    {
+                        case IHasRepeats repeatHitObject:
+                            // find the number of repeats which can fit in the requested time.
+                            var lengthOfOneRepeat = repeatHitObject.Duration / (repeatHitObject.RepeatCount + 1);
+                            var proposedCount = Math.Max(0, (int)((time - hitObject.StartTime) / lengthOfOneRepeat) - 1);
 
-                        if (proposedCount == repeatHitObject.RepeatCount)
-                            return;
+                            if (proposedCount == repeatHitObject.RepeatCount)
+                                return;
 
-                        repeatHitObject.RepeatCount = proposedCount;
-                        break;
+                            repeatHitObject.RepeatCount = proposedCount;
+                            break;
 
-                    case IHasEndTime endTimeHitObject:
-                        var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
+                        case IHasEndTime endTimeHitObject:
+                            var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
 
-                        if (endTimeHitObject.EndTime == snappedTime)
-                            return;
+                            if (endTimeHitObject.EndTime == snappedTime)
+                                return;
 
-                        endTimeHitObject.EndTime = snappedTime;
-                        break;
+                            endTimeHitObject.EndTime = snappedTime;
+                            break;
+                    }
+
+                    beatmap.UpdateHitObject(hitObject);
                 }
-
-                beatmap.UpdateHitObject(hitObject);
             }
 
             protected override void OnDragEnd(DragEndEvent e)

From ffb8d48fc30874ff81a7c4c6be3dad7fe70fc83b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 18:32:36 +0900
Subject: [PATCH 02829/10326] Fix osu!mania editor placement regressions

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs        | 2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs                   | 2 ++
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs      | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index f7951fcc5d..3e1d4f2f3a 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                 drawableRuleset.ScrollingInfo.TimeRange.Value,
                 hoc.DrawHeight);
 
-            return new SnapResult(targetPosition, targetTime);
+            return new SnapResult(screenSpacePosition, targetTime);
         }
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 7e9bb850af..5018b7bcb6 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -269,7 +269,9 @@ namespace osu.Game.Rulesets.Edit
         {
             if (distanceSnapGrid == null) return new SnapResult(screenSpacePosition, null);
 
+            // TODO: move distance snap grid to OsuHitObjectComposer.
             (Vector2 pos, double time) = distanceSnapGrid.GetSnappedPosition(distanceSnapGrid.ToLocalSpace(screenSpacePosition));
+
             return new SnapResult(distanceSnapGrid.ToScreenSpace(pos), time);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index e1a4bca1d6..95e2f41f1f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -67,9 +67,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void updatePlacementPosition(Vector2 screenSpacePosition)
         {
-            Vector2 snappedPlayfieldPosition = composer.SnapScreenSpacePositionToValidTime(screenSpacePosition).ScreenSpacePosition;
+            var snapResult = composer.SnapScreenSpacePositionToValidTime(screenSpacePosition);
 
-            currentPlacement.UpdatePosition(ToScreenSpace(snappedPlayfieldPosition));
+            currentPlacement.UpdatePosition(snapResult.ScreenSpacePosition);
         }
 
         #endregion

From 23bf0d000e1013594129a57e24020d4c0e5312b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 18:40:55 +0900
Subject: [PATCH 02830/10326] Implement mania beat snapping support

---
 .../Edit/ManiaHitObjectComposer.cs                   |  9 ++++++++-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs          | 12 ++++++------
 .../Compose/Components/ComposeBlueprintContainer.cs  |  9 ++++-----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 3e1d4f2f3a..053dcd0832 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -63,7 +63,14 @@ namespace osu.Game.Rulesets.Mania.Edit
                 drawableRuleset.ScrollingInfo.TimeRange.Value,
                 hoc.DrawHeight);
 
-            return new SnapResult(screenSpacePosition, targetTime);
+            targetTime = BeatSnapProvider.SnapTime(targetTime);
+
+            screenSpacePosition.Y = hoc.ToScreenSpace(
+                new Vector2(0, drawableRuleset.ScrollingInfo.Algorithm.PositionAt(targetTime, EditorClock.CurrentTime, drawableRuleset.ScrollingInfo.TimeRange.Value,
+                    hoc.DrawHeight))
+            ).Y;
+
+            return new SnapResult(screenSpacePosition, BeatSnapProvider.SnapTime(targetTime));
         }
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 5018b7bcb6..b45cdea751 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Edit
         private IAdjustableClock adjustableClock { get; set; }
 
         [Resolved]
-        private IBeatSnapProvider beatSnapProvider { get; set; }
+        protected IBeatSnapProvider BeatSnapProvider { get; private set; }
 
         protected ComposeBlueprintContainer BlueprintContainer { get; private set; }
 
@@ -278,27 +278,27 @@ namespace osu.Game.Rulesets.Edit
         public override float GetBeatSnapDistanceAt(double referenceTime)
         {
             DifficultyControlPoint difficultyPoint = EditorBeatmap.ControlPointInfo.DifficultyPointAt(referenceTime);
-            return (float)(100 * EditorBeatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier / beatSnapProvider.BeatDivisor);
+            return (float)(100 * EditorBeatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier / BeatSnapProvider.BeatDivisor);
         }
 
         public override float DurationToDistance(double referenceTime, double duration)
         {
-            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceTime);
+            double beatLength = BeatSnapProvider.GetBeatLengthAtTime(referenceTime);
             return (float)(duration / beatLength * GetBeatSnapDistanceAt(referenceTime));
         }
 
         public override double DistanceToDuration(double referenceTime, float distance)
         {
-            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceTime);
+            double beatLength = BeatSnapProvider.GetBeatLengthAtTime(referenceTime);
             return distance / GetBeatSnapDistanceAt(referenceTime) * beatLength;
         }
 
         public override double GetSnappedDurationFromDistance(double referenceTime, float distance)
-            => beatSnapProvider.SnapTime(referenceTime + DistanceToDuration(referenceTime, distance), referenceTime) - referenceTime;
+            => BeatSnapProvider.SnapTime(referenceTime + DistanceToDuration(referenceTime, distance), referenceTime) - referenceTime;
 
         public override float GetSnappedDistanceFromDistance(double referenceTime, float distance)
         {
-            var snappedEndTime = beatSnapProvider.SnapTime(referenceTime + DistanceToDuration(referenceTime, distance), referenceTime);
+            var snappedEndTime = BeatSnapProvider.SnapTime(referenceTime + DistanceToDuration(referenceTime, distance), referenceTime);
 
             return DurationToDistance(referenceTime, snappedEndTime - referenceTime);
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 95e2f41f1f..7982cba4e3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -11,7 +11,6 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
-using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
@@ -65,9 +64,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             createPlacement();
         }
 
-        private void updatePlacementPosition(Vector2 screenSpacePosition)
+        private void updatePlacementPosition()
         {
-            var snapResult = composer.SnapScreenSpacePositionToValidTime(screenSpacePosition);
+            var snapResult = composer.SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position);
 
             currentPlacement.UpdatePosition(snapResult.ScreenSpacePosition);
         }
@@ -84,7 +83,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 removePlacement();
 
             if (currentPlacement != null)
-                updatePlacementPosition(inputManager.CurrentState.Mouse.Position);
+                updatePlacementPosition();
         }
 
         protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
@@ -116,7 +115,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 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);
+                updatePlacementPosition();
             }
         }
 

From 970bd86d2e1df8b109046ff0265d01b850b9f435 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 18:46:15 +0900
Subject: [PATCH 02831/10326] Remove local TimeAt usage in mania placement

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs        |  2 +-
 .../Edit/ManiaHitObjectComposer.cs                    | 11 +++++++----
 osu.Game/Rulesets/Edit/HitObjectComposer.cs           |  3 +--
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs          |  5 +----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 3fb03d642f..4ebc4dae1a 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 return base.OnMouseDown(e);
 
             HitObject.Column = Column.Index;
-            BeginPlacement(TimeAt(e.ScreenSpaceMousePosition), true);
+            BeginPlacement(true);
             return true;
         }
 
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 053dcd0832..724786a1c0 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -46,19 +46,22 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
         {
-            var hoc = Playfield.GetColumn(0).HitObjectContainer;
+            var hoc = ColumnAt(screenSpacePosition)?.HitObjectContainer;
 
-            Vector2 targetPosition = hoc.ToLocalSpace(screenSpacePosition);
+            if (hoc == null)
+                return new SnapResult(screenSpacePosition, null);
+
+            Vector2 localPosition = hoc.ToLocalSpace(screenSpacePosition);
 
             if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
             {
                 // We're dealing with screen coordinates in which the position decreases towards the centre of the screen resulting in an increase in start time.
                 // The scrolling algorithm instead assumes a top anchor meaning an increase in time corresponds to an increase in position,
                 // so when scrolling downwards the coordinates need to be flipped.
-                targetPosition.Y = hoc.DrawHeight - targetPosition.Y;
+                localPosition.Y = hoc.DrawHeight - localPosition.Y;
             }
 
-            double targetTime = drawableRuleset.ScrollingInfo.Algorithm.TimeAt(targetPosition.Y,
+            double targetTime = drawableRuleset.ScrollingInfo.Algorithm.TimeAt(localPosition.Y,
                 EditorClock.CurrentTime,
                 drawableRuleset.ScrollingInfo.TimeRange.Value,
                 hoc.DrawHeight);
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index b45cdea751..1e328e6b6b 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -245,8 +245,7 @@ namespace osu.Game.Rulesets.Edit
         {
             EditorBeatmap.PlacementObject.Value = hitObject;
 
-            if (SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position).Time is double time)
-                hitObject.StartTime = time;
+            hitObject.StartTime = SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position).Time ?? EditorClock.CurrentTime;
         }
 
         public void EndPlacement(HitObject hitObject, bool commit)
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index c06e50950c..5c506926b8 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -61,12 +61,9 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// 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>
         /// <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)
+        protected void BeginPlacement(bool commitStart = false)
         {
-            HitObject.StartTime = startTime ?? EditorClock.CurrentTime;
-
             // applies snapping to above time
             placementHandler.BeginPlacement(HitObject);
 

From 82d6549161052871355aab9327e7a676e728081c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 19:05:03 +0900
Subject: [PATCH 02832/10326] Pass down snap result and remove local TimeAt
 usage

---
 .../Blueprints/HoldNotePlacementBlueprint.cs  | 17 +++++++------
 .../Blueprints/ManiaPlacementBlueprint.cs     | 25 +++----------------
 .../HitCircles/HitCirclePlacementBlueprint.cs |  3 +--
 .../Sliders/SliderPlacementBlueprint.cs       |  4 +--
 .../Spinners/SpinnerPlacementBlueprint.cs     |  3 +--
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs  |  4 +--
 .../Components/ComposeBlueprintContainer.cs   |  2 +-
 .../Visual/PlacementBlueprintTestScene.cs     |  4 +--
 8 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index c63e30e98a..5dbd84e370 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
 using osuTK;
@@ -59,23 +60,25 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         private double originalStartTime;
 
-        public override void UpdatePosition(Vector2 screenSpacePosition)
+        public override void UpdatePosition(SnapResult result)
         {
-            base.UpdatePosition(screenSpacePosition);
+            base.UpdatePosition(result);
 
             if (PlacementActive)
             {
-                var endTime = TimeAt(screenSpacePosition);
-
-                HitObject.StartTime = endTime < originalStartTime ? endTime : originalStartTime;
-                HitObject.Duration = Math.Abs(endTime - originalStartTime);
+                if (result.Time is double endTime)
+                {
+                    HitObject.StartTime = endTime < originalStartTime ? endTime : originalStartTime;
+                    HitObject.Duration = Math.Abs(endTime - originalStartTime);
+                }
             }
             else
             {
                 headPiece.Width = tailPiece.Width = SnappedWidth;
                 headPiece.X = tailPiece.X = SnappedMousePosition.X;
 
-                originalStartTime = HitObject.StartTime = TimeAt(screenSpacePosition);
+                if (result.Time is double startTime)
+                    originalStartTime = HitObject.StartTime = startTime;
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 4ebc4dae1a..4d10afd289 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -58,10 +58,10 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             return true;
         }
 
-        public override void UpdatePosition(Vector2 screenSpacePosition)
+        public override void UpdatePosition(SnapResult result)
         {
             if (!PlacementActive)
-                Column = ColumnAt(screenSpacePosition);
+                Column = ColumnAt(result.ScreenSpacePosition);
 
             if (Column == null) return;
 
@@ -69,26 +69,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             // Snap to the column
             var parentPos = Parent.ToLocalSpace(Column.ToScreenSpace(new Vector2(Column.DrawWidth / 2, 0)));
-            SnappedMousePosition = new Vector2(parentPos.X, Parent.ToLocalSpace(screenSpacePosition).Y);
-        }
-
-        protected double TimeAt(Vector2 screenSpacePosition)
-        {
-            if (Column == null)
-                return 0;
-
-            var hitObjectContainer = Column.HitObjectContainer;
-
-            // If we're scrolling downwards, a position of 0 is actually further away from the hit target
-            // so we need to flip the vertical coordinate in the hitobject container's space
-            var hitObjectPos = mouseToHitObjectPosition(Column.HitObjectContainer.ToLocalSpace(screenSpacePosition)).Y;
-            if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
-                hitObjectPos = hitObjectContainer.DrawHeight - hitObjectPos;
-
-            return scrollingInfo.Algorithm.TimeAt(hitObjectPos,
-                EditorClock.CurrentTime,
-                scrollingInfo.TimeRange.Value,
-                hitObjectContainer.DrawHeight);
+            SnappedMousePosition = new Vector2(parentPos.X, Parent.ToLocalSpace(result.ScreenSpacePosition).Y);
         }
 
         protected float PositionAt(double time)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index dad199715e..e12dec2668 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -5,7 +5,6 @@ using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
@@ -40,6 +39,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
             return base.OnMouseDown(e);
         }
 
-        public override void UpdatePosition(Vector2 screenSpacePosition) => HitObject.Position = ToLocalSpace(screenSpacePosition);
+        public override void UpdatePosition(SnapResult result) => HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index ac30f5a762..59ec92c79e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -67,13 +67,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             inputManager = GetContainingInputManager();
         }
 
-        public override void UpdatePosition(Vector2 screenSpacePosition)
+        public override void UpdatePosition(SnapResult result)
         {
             switch (state)
             {
                 case PlacementState.Initial:
                     BeginPlacement();
-                    HitObject.Position = ToLocalSpace(screenSpacePosition);
+                    HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
                     break;
 
                 case 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 74b563d922..546f0e5981 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
@@ -8,7 +8,6 @@ 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
@@ -61,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
             return true;
         }
 
-        public override void UpdatePosition(Vector2 screenSpacePosition)
+        public override void UpdatePosition(SnapResult result)
         {
         }
     }
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 5c506926b8..bab9bf71ef 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -86,8 +86,8 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Updates the position of this <see cref="PlacementBlueprint"/> to a new screen-space position.
         /// </summary>
-        /// <param name="screenSpacePosition">The screen-space position.</param>
-        public abstract void UpdatePosition(Vector2 screenSpacePosition);
+        /// <param name="snapResult">The snap result information.</param>
+        public abstract void UpdatePosition(SnapResult snapResult);
 
         /// <summary>
         /// Invokes <see cref="Objects.HitObject.ApplyDefaults(ControlPointInfo,BeatmapDifficulty)"/>,
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 7982cba4e3..0b5d8262fd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             var snapResult = composer.SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position);
 
-            currentPlacement.UpdatePosition(snapResult.ScreenSpacePosition);
+            currentPlacement.UpdatePosition(snapResult);
         }
 
         #endregion
diff --git a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
index dc67d28f63..a4e629b6f5 100644
--- a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Tests.Visual
         {
             base.Update();
 
-            currentBlueprint.UpdatePosition(InputManager.CurrentState.Mouse.Position);
+            currentBlueprint.UpdatePosition(new SnapResult(InputManager.CurrentState.Mouse.Position, null));
         }
 
         public override void Add(Drawable drawable)
@@ -81,7 +81,7 @@ namespace osu.Game.Tests.Visual
             if (drawable is PlacementBlueprint blueprint)
             {
                 blueprint.Show();
-                blueprint.UpdatePosition(InputManager.CurrentState.Mouse.Position);
+                blueprint.UpdatePosition(new SnapResult(InputManager.CurrentState.Mouse.Position, null));
             }
         }
 

From 62092e3f5b4c60b18505a502a311b5db3dc1aa6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 19:09:04 +0900
Subject: [PATCH 02833/10326] Propagate mania column in SnapResult

---
 .../Blueprints/ManiaPlacementBlueprint.cs     |  8 +-------
 .../Edit/ManiaHitObjectComposer.cs            | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 4d10afd289..2f1b38d564 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -33,9 +33,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         /// </summary>
         protected float SnappedWidth { get; private set; }
 
-        [Resolved]
-        private IManiaHitObjectComposer composer { get; set; }
-
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
@@ -61,7 +58,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         public override void UpdatePosition(SnapResult result)
         {
             if (!PlacementActive)
-                Column = ColumnAt(result.ScreenSpacePosition);
+                Column = (result as ManiaSnapResult)?.Column;
 
             if (Column == null) return;
 
@@ -85,9 +82,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             return hitObjectToMousePosition(Column.HitObjectContainer.ToSpaceOfOtherDrawable(new Vector2(0, pos), Parent)).Y;
         }
 
-        protected Column ColumnAt(Vector2 screenSpacePosition)
-            => composer.ColumnAt(screenSpacePosition);
-
         /// <summary>
         /// Converts a mouse position to a hitobject position.
         /// </summary>
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 724786a1c0..89ccf0019a 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -46,11 +46,13 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
         {
-            var hoc = ColumnAt(screenSpacePosition)?.HitObjectContainer;
+            var column = ColumnAt(screenSpacePosition);
 
-            if (hoc == null)
+            if (column == null)
                 return new SnapResult(screenSpacePosition, null);
 
+            var hoc = column.HitObjectContainer;
+
             Vector2 localPosition = hoc.ToLocalSpace(screenSpacePosition);
 
             if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
@@ -73,7 +75,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                     hoc.DrawHeight))
             ).Y;
 
-            return new SnapResult(screenSpacePosition, BeatSnapProvider.SnapTime(targetTime));
+            return new ManiaSnapResult(screenSpacePosition, BeatSnapProvider.SnapTime(targetTime), column);
         }
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
@@ -94,4 +96,15 @@ namespace osu.Game.Rulesets.Mania.Edit
             new HoldNoteCompositionTool()
         };
     }
+
+    public class ManiaSnapResult : SnapResult
+    {
+        public readonly Column Column;
+
+        public ManiaSnapResult(Vector2 screenSpacePosition, double time, Column column)
+            : base(screenSpacePosition, time)
+        {
+            Column = column;
+        }
+    }
 }

From 2f78866dfb452c091cca286ec1d7744a3c4deab3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 19:23:17 +0900
Subject: [PATCH 02834/10326] Move positioning out of mania blueprints

---
 .../Blueprints/HoldNotePlacementBlueprint.cs  |  7 +++-
 .../Blueprints/ManiaPlacementBlueprint.cs     | 42 -------------------
 .../Edit/Blueprints/NotePlacementBlueprint.cs | 20 +++++----
 .../Edit/ManiaHitObjectComposer.cs            | 17 ++++----
 4 files changed, 26 insertions(+), 60 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 5dbd84e370..055b92b39d 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -74,8 +74,11 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             }
             else
             {
-                headPiece.Width = tailPiece.Width = SnappedWidth;
-                headPiece.X = tailPiece.X = SnappedMousePosition.X;
+                if (result is ManiaSnapResult maniaResult)
+                {
+                    headPiece.Width = tailPiece.Width = maniaResult.Column.DrawWidth;
+                    headPiece.X = tailPiece.X = ToLocalSpace(result.ScreenSpacePosition).X;
+                }
 
                 if (result.Time is double startTime)
                     originalStartTime = HitObject.StartTime = startTime;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 2f1b38d564..e8c7aea814 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -23,16 +23,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         protected Column Column;
 
-        /// <summary>
-        /// The current mouse position, snapped to the closest column.
-        /// </summary>
-        protected Vector2 SnappedMousePosition { get; private set; }
-
-        /// <summary>
-        /// The width of the closest column to the current mouse position.
-        /// </summary>
-        protected float SnappedWidth { get; private set; }
-
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
@@ -59,14 +49,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         {
             if (!PlacementActive)
                 Column = (result as ManiaSnapResult)?.Column;
-
-            if (Column == null) return;
-
-            SnappedWidth = Column.DrawWidth;
-
-            // Snap to the column
-            var parentPos = Parent.ToLocalSpace(Column.ToScreenSpace(new Vector2(Column.DrawWidth / 2, 0)));
-            SnappedMousePosition = new Vector2(parentPos.X, Parent.ToLocalSpace(result.ScreenSpacePosition).Y);
         }
 
         protected float PositionAt(double time)
@@ -82,30 +64,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             return hitObjectToMousePosition(Column.HitObjectContainer.ToSpaceOfOtherDrawable(new Vector2(0, pos), Parent)).Y;
         }
 
-        /// <summary>
-        /// Converts a mouse position to a hitobject position.
-        /// </summary>
-        /// <remarks>
-        /// Blueprints are centred on the mouse position, such that the hitobject position is anchored at the top or bottom of the blueprint depending on the scroll direction.
-        /// </remarks>
-        /// <param name="mousePosition">The mouse position.</param>
-        /// <returns>The resulting hitobject position, acnhored at the top or bottom of the blueprint depending on the scroll direction.</returns>
-        private Vector2 mouseToHitObjectPosition(Vector2 mousePosition)
-        {
-            switch (scrollingInfo.Direction.Value)
-            {
-                case ScrollingDirection.Up:
-                    mousePosition.Y -= DefaultNotePiece.NOTE_HEIGHT / 2;
-                    break;
-
-                case ScrollingDirection.Down:
-                    mousePosition.Y += DefaultNotePiece.NOTE_HEIGHT / 2;
-                    break;
-            }
-
-            return mousePosition;
-        }
-
         /// <summary>
         /// Converts a hitobject position to a mouse position.
         /// </summary>
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index a4c0791253..5f6db2e6dd 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
 using osuTK.Input;
@@ -11,22 +12,25 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
     public class NotePlacementBlueprint : ManiaPlacementBlueprint<Note>
     {
+        private readonly EditNotePiece piece;
+
         public NotePlacementBlueprint()
             : base(new Note())
         {
-            Origin = Anchor.Centre;
+            RelativeSizeAxes = Axes.Both;
 
-            AutoSizeAxes = Axes.Y;
-
-            InternalChild = new EditNotePiece { RelativeSizeAxes = Axes.X };
+            InternalChild = piece = new EditNotePiece { Origin = Anchor.Centre };
         }
 
-        protected override void Update()
+        public override void UpdatePosition(SnapResult result)
         {
-            base.Update();
+            base.UpdatePosition(result);
 
-            Width = SnappedWidth;
-            Position = SnappedMousePosition;
+            if (result is ManiaSnapResult maniaResult)
+            {
+                piece.Width = maniaResult.Column.DrawWidth;
+                piece.Position = ToLocalSpace(result.ScreenSpacePosition);
+            }
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 89ccf0019a..c38952fd29 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -55,7 +55,9 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             Vector2 localPosition = hoc.ToLocalSpace(screenSpacePosition);
 
-            if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
+            var scrollInfo = drawableRuleset.ScrollingInfo;
+
+            if (scrollInfo.Direction.Value == ScrollingDirection.Down)
             {
                 // We're dealing with screen coordinates in which the position decreases towards the centre of the screen resulting in an increase in start time.
                 // The scrolling algorithm instead assumes a top anchor meaning an increase in time corresponds to an increase in position,
@@ -63,19 +65,18 @@ namespace osu.Game.Rulesets.Mania.Edit
                 localPosition.Y = hoc.DrawHeight - localPosition.Y;
             }
 
-            double targetTime = drawableRuleset.ScrollingInfo.Algorithm.TimeAt(localPosition.Y,
+            double targetTime = scrollInfo.Algorithm.TimeAt(localPosition.Y,
                 EditorClock.CurrentTime,
-                drawableRuleset.ScrollingInfo.TimeRange.Value,
+                scrollInfo.TimeRange.Value,
                 hoc.DrawHeight);
 
             targetTime = BeatSnapProvider.SnapTime(targetTime);
 
-            screenSpacePosition.Y = hoc.ToScreenSpace(
-                new Vector2(0, drawableRuleset.ScrollingInfo.Algorithm.PositionAt(targetTime, EditorClock.CurrentTime, drawableRuleset.ScrollingInfo.TimeRange.Value,
-                    hoc.DrawHeight))
-            ).Y;
+            var localPos = new Vector2(
+                hoc.DrawWidth / 2,
+                scrollInfo.Algorithm.PositionAt(targetTime, EditorClock.CurrentTime, scrollInfo.TimeRange.Value, hoc.DrawHeight));
 
-            return new ManiaSnapResult(screenSpacePosition, BeatSnapProvider.SnapTime(targetTime), column);
+            return new ManiaSnapResult(hoc.ToScreenSpace(localPos), BeatSnapProvider.SnapTime(targetTime), column);
         }
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)

From 26fb779f4d7b6929d90ecc434070d88401046387 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 19:52:57 +0900
Subject: [PATCH 02835/10326] Move remaining positioning logic local to hold
 note blueprint

---
 .../Blueprints/HoldNotePlacementBlueprint.cs  | 22 +++++++++-
 .../Blueprints/ManiaPlacementBlueprint.cs     | 41 -------------------
 2 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 055b92b39d..38a12ed2ed 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -2,11 +2,13 @@
 // 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.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Input;
 
@@ -37,8 +39,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             if (Column != null)
             {
-                headPiece.Y = PositionAt(HitObject.StartTime);
-                tailPiece.Y = PositionAt(HitObject.EndTime);
+                headPiece.Y = positionAt(HitObject.StartTime);
+                tailPiece.Y = positionAt(HitObject.EndTime);
             }
 
             var topPosition = new Vector2(headPiece.DrawPosition.X, Math.Min(headPiece.DrawPosition.Y, tailPiece.DrawPosition.Y));
@@ -84,5 +86,21 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                     originalStartTime = HitObject.StartTime = startTime;
             }
         }
+
+        [Resolved]
+        private IScrollingInfo scrollingInfo { get; set; }
+
+        private float positionAt(double time)
+        {
+            var pos = scrollingInfo.Algorithm.PositionAt(time,
+                EditorClock.CurrentTime,
+                scrollingInfo.TimeRange.Value,
+                Column.HitObjectContainer.DrawHeight);
+
+            if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
+                pos = Column.HitObjectContainer.DrawHeight - pos;
+
+            return Column.HitObjectContainer.ToSpaceOfOtherDrawable(new Vector2(0, pos), Parent).Y;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index e8c7aea814..e83495cec4 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -1,16 +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.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.UI.Scrolling;
-using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
@@ -23,9 +19,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         protected Column Column;
 
-        [Resolved]
-        private IScrollingInfo scrollingInfo { get; set; }
-
         protected ManiaPlacementBlueprint(T hitObject)
             : base(hitObject)
         {
@@ -50,39 +43,5 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             if (!PlacementActive)
                 Column = (result as ManiaSnapResult)?.Column;
         }
-
-        protected float PositionAt(double time)
-        {
-            var pos = scrollingInfo.Algorithm.PositionAt(time,
-                EditorClock.CurrentTime,
-                scrollingInfo.TimeRange.Value,
-                Column.HitObjectContainer.DrawHeight);
-
-            if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
-                pos = Column.HitObjectContainer.DrawHeight - pos;
-
-            return hitObjectToMousePosition(Column.HitObjectContainer.ToSpaceOfOtherDrawable(new Vector2(0, pos), Parent)).Y;
-        }
-
-        /// <summary>
-        /// Converts a hitobject position to a mouse position.
-        /// </summary>
-        /// <param name="hitObjectPosition">The hitobject position.</param>
-        /// <returns>The resulting mouse position, anchored at the centre of the hitobject.</returns>
-        private Vector2 hitObjectToMousePosition(Vector2 hitObjectPosition)
-        {
-            switch (scrollingInfo.Direction.Value)
-            {
-                case ScrollingDirection.Up:
-                    hitObjectPosition.Y += DefaultNotePiece.NOTE_HEIGHT / 2;
-                    break;
-
-                case ScrollingDirection.Down:
-                    hitObjectPosition.Y -= DefaultNotePiece.NOTE_HEIGHT / 2;
-                    break;
-            }
-
-            return hitObjectPosition;
-        }
     }
 }

From 19e2da9c73e03b674ad2525bc59bf8b6d8e16571 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 19:59:36 +0900
Subject: [PATCH 02836/10326] Fix down scrolling giving incorrect positioning
 data

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index c38952fd29..7ad2ce4699 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -72,11 +72,17 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             targetTime = BeatSnapProvider.SnapTime(targetTime);
 
-            var localPos = new Vector2(
+            localPosition = new Vector2(
                 hoc.DrawWidth / 2,
                 scrollInfo.Algorithm.PositionAt(targetTime, EditorClock.CurrentTime, scrollInfo.TimeRange.Value, hoc.DrawHeight));
 
-            return new ManiaSnapResult(hoc.ToScreenSpace(localPos), BeatSnapProvider.SnapTime(targetTime), column);
+            if (scrollInfo.Direction.Value == ScrollingDirection.Down)
+            {
+                // reapply the above.
+                localPosition.Y = hoc.DrawHeight - localPosition.Y;
+            }
+
+            return new ManiaSnapResult(hoc.ToScreenSpace(localPosition), BeatSnapProvider.SnapTime(targetTime), column);
         }
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)

From 7c9fbb6fcfb6a6fdfe6706bb1b320080a76ffc1b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 21:03:03 +0900
Subject: [PATCH 02837/10326] Split out classes

---
 .../Edit/ManiaHitObjectComposer.cs            | 11 -------
 .../Edit/ManiaSnapResult.cs                   | 20 +++++++++++++
 .../Rulesets/Edit/IPositionSnapProvider.cs    | 19 ------------
 osu.Game/Rulesets/Edit/SnapResult.cs          | 29 +++++++++++++++++++
 4 files changed, 49 insertions(+), 30 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Edit/ManiaSnapResult.cs
 create mode 100644 osu.Game/Rulesets/Edit/SnapResult.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 7ad2ce4699..3287c10531 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -103,15 +103,4 @@ namespace osu.Game.Rulesets.Mania.Edit
             new HoldNoteCompositionTool()
         };
     }
-
-    public class ManiaSnapResult : SnapResult
-    {
-        public readonly Column Column;
-
-        public ManiaSnapResult(Vector2 screenSpacePosition, double time, Column column)
-            : base(screenSpacePosition, time)
-        {
-            Column = column;
-        }
-    }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSnapResult.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSnapResult.cs
new file mode 100644
index 0000000000..b94f5e51c4
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSnapResult.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.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Edit
+{
+    public class ManiaSnapResult : SnapResult
+    {
+        public readonly Column Column;
+
+        public ManiaSnapResult(Vector2 screenSpacePosition, double time, Column column)
+            : base(screenSpacePosition, time)
+        {
+            Column = column;
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
index d95800f403..c854c06031 100644
--- a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
@@ -53,23 +53,4 @@ namespace osu.Game.Rulesets.Edit
         /// <returns>A value that represents <paramref name="distance"/> snapped to the closest beat of the timing point.</returns>
         float GetSnappedDistanceFromDistance(double referenceTime, float distance);
     }
-
-    public class SnapResult
-    {
-        /// <summary>
-        /// The screen space position, potentially altered for snapping.
-        /// </summary>
-        public Vector2 ScreenSpacePosition;
-
-        /// <summary>
-        /// The resultant time for snapping, if a value could be attained.
-        /// </summary>
-        public double? Time;
-
-        public SnapResult(Vector2 screenSpacePosition, double? time)
-        {
-            ScreenSpacePosition = screenSpacePosition;
-            Time = time;
-        }
-    }
 }
diff --git a/osu.Game/Rulesets/Edit/SnapResult.cs b/osu.Game/Rulesets/Edit/SnapResult.cs
new file mode 100644
index 0000000000..5d07d7b233
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/SnapResult.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 osuTK;
+
+namespace osu.Game.Rulesets.Edit
+{
+    /// <summary>
+    /// The result of a position/time snapping process.
+    /// </summary>
+    public class SnapResult
+    {
+        /// <summary>
+        /// The screen space position, potentially altered for snapping.
+        /// </summary>
+        public Vector2 ScreenSpacePosition;
+
+        /// <summary>
+        /// The resultant time for snapping, if a value could be attained.
+        /// </summary>
+        public double? Time;
+
+        public SnapResult(Vector2 screenSpacePosition, double? time)
+        {
+            ScreenSpacePosition = screenSpacePosition;
+            Time = time;
+        }
+    }
+}

From e3cec9cf6c7251c16d075bf0b27a8546f7ca0692 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 21:13:08 +0900
Subject: [PATCH 02838/10326] Simplify column assignment

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index e83495cec4..af57b4fa07 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -17,7 +17,20 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
     {
         protected new T HitObject => (T)base.HitObject;
 
-        protected Column Column;
+        private Column column;
+
+        public Column Column
+        {
+            get => column;
+            set
+            {
+                if (value == column)
+                    return;
+
+                column = value;
+                HitObject.Column = column.Index;
+            }
+        }
 
         protected ManiaPlacementBlueprint(T hitObject)
             : base(hitObject)
@@ -31,9 +44,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 return false;
 
             if (Column == null)
-                return base.OnMouseDown(e);
+                return false;
 
-            HitObject.Column = Column.Index;
             BeginPlacement(true);
             return true;
         }

From 63b5f1a376c1f6d3dce6c6040653297839acf04c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 21:14:20 +0900
Subject: [PATCH 02839/10326] Remove unnecessary
 IRequireHighFrequencyMousePosition

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs                | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index af57b4fa07..8d3b3ea583 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Objects;
@@ -11,8 +10,7 @@ using osuTK.Input;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public abstract class ManiaPlacementBlueprint<T> : PlacementBlueprint,
-                                                       IRequireHighFrequencyMousePosition // the playfield could be moving behind us
+    public abstract class ManiaPlacementBlueprint<T> : PlacementBlueprint
         where T : ManiaHitObject
     {
         protected new T HitObject => (T)base.HitObject;

From 69db62b78a0d996843a07afc152b8f2aeea1c7e4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 21:42:21 +0900
Subject: [PATCH 02840/10326] Combine implementation of time-to-position lookup

---
 .../ManiaPlacementBlueprintTestScene.cs       |  2 ++
 .../ManiaSelectionBlueprintTestScene.cs       |  2 ++
 .../Blueprints/HoldNotePlacementBlueprint.cs  | 23 ++++-----------
 .../Edit/IManiaHitObjectComposer.cs           |  2 ++
 .../Edit/ManiaHitObjectComposer.cs            | 28 ++++++++++++-------
 5 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
index aac77c9c1c..be3e205f36 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
@@ -49,6 +49,8 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         public Column ColumnAt(Vector2 screenSpacePosition) => column;
 
+        public Vector2 ScreenSpacePositionAtTime(double time, Column column = null) => Vector2.Zero;
+
         public int TotalColumns => 1;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
index b598893e8c..3d654466ed 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         public Column ColumnAt(Vector2 screenSpacePosition) => column;
 
+        public Vector2 ScreenSpacePositionAtTime(double time, Column column = null) => Vector2.Zero;
+
         public int TotalColumns => 1;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 38a12ed2ed..31bf76edd0 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -20,6 +20,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         private readonly EditNotePiece headPiece;
         private readonly EditNotePiece tailPiece;
 
+        [Resolved]
+        private IManiaHitObjectComposer composer { get; set; }
+
         public HoldNotePlacementBlueprint()
             : base(new HoldNote())
         {
@@ -39,8 +42,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             if (Column != null)
             {
-                headPiece.Y = positionAt(HitObject.StartTime);
-                tailPiece.Y = positionAt(HitObject.EndTime);
+                headPiece.Y = Parent.ToLocalSpace(composer.ScreenSpacePositionAtTime(HitObject.StartTime, Column)).Y;
+                tailPiece.Y = Parent.ToLocalSpace(composer.ScreenSpacePositionAtTime(HitObject.EndTime, Column)).Y;
             }
 
             var topPosition = new Vector2(headPiece.DrawPosition.X, Math.Min(headPiece.DrawPosition.Y, tailPiece.DrawPosition.Y));
@@ -86,21 +89,5 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                     originalStartTime = HitObject.StartTime = startTime;
             }
         }
-
-        [Resolved]
-        private IScrollingInfo scrollingInfo { get; set; }
-
-        private float positionAt(double time)
-        {
-            var pos = scrollingInfo.Algorithm.PositionAt(time,
-                EditorClock.CurrentTime,
-                scrollingInfo.TimeRange.Value,
-                Column.HitObjectContainer.DrawHeight);
-
-            if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
-                pos = Column.HitObjectContainer.DrawHeight - pos;
-
-            return Column.HitObjectContainer.ToSpaceOfOtherDrawable(new Vector2(0, pos), Parent).Y;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
index f64bab1fae..f1915cd85a 100644
--- a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
@@ -10,6 +10,8 @@ namespace osu.Game.Rulesets.Mania.Edit
     {
         Column ColumnAt(Vector2 screenSpacePosition);
 
+        Vector2 ScreenSpacePositionAtTime(double time, Column column = null);
+
         int TotalColumns { get; }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 3287c10531..0cae26b51c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -53,6 +53,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             var hoc = column.HitObjectContainer;
 
+            // convert to local space of column so we can snap and fetch correct location.
             Vector2 localPosition = hoc.ToLocalSpace(screenSpacePosition);
 
             var scrollInfo = drawableRuleset.ScrollingInfo;
@@ -65,24 +66,31 @@ namespace osu.Game.Rulesets.Mania.Edit
                 localPosition.Y = hoc.DrawHeight - localPosition.Y;
             }
 
-            double targetTime = scrollInfo.Algorithm.TimeAt(localPosition.Y,
-                EditorClock.CurrentTime,
-                scrollInfo.TimeRange.Value,
-                hoc.DrawHeight);
+            double targetTime = scrollInfo.Algorithm.TimeAt(localPosition.Y, EditorClock.CurrentTime, scrollInfo.TimeRange.Value, hoc.DrawHeight);
 
+            // apply beat snapping
             targetTime = BeatSnapProvider.SnapTime(targetTime);
 
-            localPosition = new Vector2(
-                hoc.DrawWidth / 2,
-                scrollInfo.Algorithm.PositionAt(targetTime, EditorClock.CurrentTime, scrollInfo.TimeRange.Value, hoc.DrawHeight));
+            // convert back to screen space
+            screenSpacePosition = ScreenSpacePositionAtTime(targetTime, column);
+
+            return new ManiaSnapResult(screenSpacePosition, targetTime, column);
+        }
+
+        public Vector2 ScreenSpacePositionAtTime(double time, Column column = null)
+        {
+            var hoc = (column ?? Playfield.GetColumn(0)).HitObjectContainer;
+            var scrollInfo = drawableRuleset.ScrollingInfo;
+
+            var pos = scrollInfo.Algorithm.PositionAt(time, EditorClock.CurrentTime, scrollInfo.TimeRange.Value, hoc.DrawHeight);
 
             if (scrollInfo.Direction.Value == ScrollingDirection.Down)
             {
-                // reapply the above.
-                localPosition.Y = hoc.DrawHeight - localPosition.Y;
+                // as explained above
+                pos = hoc.DrawHeight - pos;
             }
 
-            return new ManiaSnapResult(hoc.ToScreenSpace(localPosition), BeatSnapProvider.SnapTime(targetTime), column);
+            return hoc.ToScreenSpace(new Vector2(hoc.DrawWidth / 2, pos));
         }
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)

From b5a7023312d72670a155b6435354cccd817aa748 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 21:46:52 +0900
Subject: [PATCH 02841/10326] Seek to start time after placement, not end

---
 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 883288d6d7..10dffc6aa8 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -257,7 +257,7 @@ namespace osu.Game.Rulesets.Edit
             {
                 EditorBeatmap.Add(hitObject);
 
-                adjustableClock.Seek(hitObject.GetEndTime());
+                adjustableClock.Seek(hitObject.StartTime);
             }
 
             showGridFor(Enumerable.Empty<HitObject>());

From e09a1bf546d7bdd12cdd5670c2d0b2398c8242a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 May 2020 21:50:52 +0900
Subject: [PATCH 02842/10326] Only seek forwards if not already beyond the
 placed object

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 10dffc6aa8..67216b019d 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -257,7 +257,8 @@ namespace osu.Game.Rulesets.Edit
             {
                 EditorBeatmap.Add(hitObject);
 
-                adjustableClock.Seek(hitObject.StartTime);
+                if (adjustableClock.CurrentTime < hitObject.StartTime)
+                    adjustableClock.Seek(hitObject.StartTime);
             }
 
             showGridFor(Enumerable.Empty<HitObject>());

From e018d0744152e92df3e4559b7ce98551c30a57f2 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 20 May 2020 16:30:38 +0200
Subject: [PATCH 02843/10326] Use one constant for STABLE_CONFIG location
 string

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs               | 4 +---
 osu.Game.Tournament/Models/StableInfo.cs              | 4 ++++
 osu.Game.Tournament/Screens/SetupScreen.cs            | 1 -
 osu.Game.Tournament/Screens/StablePathSelectScreen.cs | 4 +---
 osu.Game.Tournament/TournamentGameBase.cs             | 8 ++++----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 6d1cd7cc3c..d2d74e94b2 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -40,8 +40,6 @@ namespace osu.Game.Tournament.IPC
         [Resolved]
         private StableInfo stableInfo { get; set; }
 
-        private const string stable_config = "tournament/stable.json";
-
         public Storage IPCStorage { get; private set; }
 
         [Resolved]
@@ -196,7 +194,7 @@ namespace osu.Game.Tournament.IPC
 
         private void saveStablePath()
         {
-            using (var stream = tournamentStorage.GetStream(stable_config, FileAccess.Write, FileMode.Create))
+            using (var stream = tournamentStorage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Write, FileMode.Create))
             using (var sw = new StreamWriter(stream))
             {
                 sw.Write(JsonConvert.SerializeObject(stableInfo,
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 4818842151..63423ca6fa 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
 using osu.Framework.Bindables;
 
 namespace osu.Game.Tournament.Models
@@ -13,5 +14,8 @@ namespace osu.Game.Tournament.Models
     public class StableInfo
     {
         public Bindable<string> StablePath = new Bindable<string>(string.Empty);
+
+        [JsonIgnore]
+        public const string STABLE_CONFIG = "tournament/stable.json";
     }
 }
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 1c479bdec4..9f8f81aa80 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Tournament.Screens
 
         private LoginOverlay loginOverlay;
         private ActionableInfo resolution;
-        private const string stable_config = "tournament/stable.json";
 
         [Resolved]
         private MatchIPCInfo ipc { get; set; }
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 5c488ae352..a42a5dc0fc 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -26,8 +26,6 @@ namespace osu.Game.Tournament.Screens
     {
         private DirectorySelector directorySelector;
 
-        private const string stable_config = "tournament/stable.json";
-
         [Resolved]
         private StableInfo stableInfo { get; set; }
 
@@ -150,7 +148,7 @@ namespace osu.Game.Tournament.Screens
 
                 try
                 {
-                    using (var stream = storage.GetStream(stable_config, FileAccess.Write, FileMode.Create))
+                    using (var stream = storage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Write, FileMode.Create))
                     using (var sw = new StreamWriter(stream))
                     {
                         sw.Write(JsonConvert.SerializeObject(stableInfo,
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 31c56c7fc4..00946399fb 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -147,7 +147,10 @@ namespace osu.Game.Tournament
 
         private void readStableConfig()
         {
-            if (storage.Exists(stable_config))
+            if (stableInfo == null)
+                stableInfo = new StableInfo();
+
+            if (storage.Exists(StableInfo.STABLE_CONFIG))
             {
                 using (Stream stream = storage.GetStream(stable_config, FileAccess.Read, FileMode.Open))
                 using (var sr = new StreamReader(stream))
@@ -156,9 +159,6 @@ namespace osu.Game.Tournament
                 }
             }
 
-            if (stableInfo == null)
-                stableInfo = new StableInfo();
-
             dependencies.Cache(stableInfo);
         }
 

From 1b8d657eade8b02ace6f42d5d97d45aa55e320c1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 May 2020 23:46:47 +0900
Subject: [PATCH 02844/10326] Implement score panel list

---
 .../Visual/Ranking/TestSceneScorePanelList.cs | 69 ++++++++++++++++
 osu.Game/Screens/Ranking/ScorePanel.cs        | 20 +++--
 osu.Game/Screens/Ranking/ScorePanelList.cs    | 80 +++++++++++++++++++
 3 files changed, 163 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
 create mode 100644 osu.Game/Screens/Ranking/ScorePanelList.cs

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
new file mode 100644
index 0000000000..4964af8784
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
@@ -0,0 +1,69 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.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.Tests.Beatmaps;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestSceneScorePanelList : OsuTestScene
+    {
+        public TestSceneScorePanelList()
+        {
+            var list = new ScorePanelList
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
+
+            Add(list);
+
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+            list.AddScore(createScore());
+        }
+
+        private ScoreInfo createScore() => new ScoreInfo
+        {
+            User = new User
+            {
+                Id = 2,
+                Username = "peppy",
+                CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+            },
+            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/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index bf57cb4dd9..baca2fd9e1 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking.Contracted;
 using osu.Game.Screens.Ranking.Expanded;
@@ -75,8 +76,7 @@ namespace osu.Game.Screens.Ranking
         private static readonly Color4 contracted_middle_layer_colour = Color4Extensions.FromHex("#353535");
 
         public event Action<PanelState> StateChanged;
-
-        private readonly ScoreInfo score;
+        public readonly ScoreInfo Score;
 
         private Container topLayerContainer;
         private Drawable topLayerBackground;
@@ -90,7 +90,7 @@ namespace osu.Game.Screens.Ranking
 
         public ScorePanel(ScoreInfo score)
         {
-            this.score = score;
+            Score = score;
         }
 
         [BackgroundDependencyLoader]
@@ -189,8 +189,8 @@ namespace osu.Game.Screens.Ranking
                     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));
+                    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:
@@ -199,7 +199,7 @@ namespace osu.Game.Screens.Ranking
                     topLayerBackground.FadeColour(contracted_top_layer_colour, resize_duration, Easing.OutQuint);
                     middleLayerBackground.FadeColour(contracted_middle_layer_colour, resize_duration, Easing.OutQuint);
 
-                    middleLayerContentContainer.Add(topLayerContent = new ContractedPanelMiddleContent(score).With(d => d.Alpha = 0));
+                    middleLayerContentContainer.Add(topLayerContent = new ContractedPanelMiddleContent(Score).With(d => d.Alpha = 0));
                     break;
             }
 
@@ -222,5 +222,13 @@ namespace osu.Game.Screens.Ranking
                 middleLayerContent?.FadeIn(content_fade_duration);
             }
         }
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            if (State == PanelState.Contracted)
+                State = PanelState.Expanded;
+
+            return true;
+        }
     }
 }
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
new file mode 100644
index 0000000000..cc6842b2dd
--- /dev/null
+++ b/osu.Game/Screens/Ranking/ScorePanelList.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 System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
+using osu.Game.Scoring;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking
+{
+    public class ScorePanelList : CompositeDrawable
+    {
+        private readonly Flow panels;
+        private ScorePanel expandedPanel;
+
+        public ScorePanelList()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChild = panels = new Flow
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Custom,
+                Direction = FillDirection.Horizontal,
+                AutoSizeAxes = Axes.Both,
+            };
+        }
+
+        public void AddScore(ScoreInfo score)
+        {
+            var panel = new ScorePanel(score)
+            {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+            };
+
+            panel.StateChanged += s => onPanelStateChanged(panel, s);
+
+            // Todo: Temporary
+            panel.State = expandedPanel == null ? PanelState.Expanded : PanelState.Contracted;
+
+            panels.Add(panel);
+        }
+
+        public void RemoveScore(ScoreInfo score) => panels.RemoveAll(p => p.Score == score);
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            if (expandedPanel != null)
+            {
+                var firstPanel = panels.FlowingChildren.First();
+                var target = expandedPanel.DrawPosition.X - firstPanel.DrawPosition.X + expandedPanel.DrawSize.X / 2;
+
+                panels.OriginPosition = new Vector2((float)Interpolation.Lerp(panels.OriginPosition.X, target, Math.Clamp(Math.Abs(Time.Elapsed) / 80, 0, 1)), panels.DrawHeight / 2);
+            }
+        }
+
+        private void onPanelStateChanged(ScorePanel panel, PanelState state)
+        {
+            if (state == PanelState.Contracted)
+                return;
+
+            if (expandedPanel != null)
+                expandedPanel.State = PanelState.Contracted;
+            expandedPanel = panel;
+        }
+
+        private class Flow : FillFlowContainer<ScorePanel>
+        {
+            // Todo: Order is wrong.
+            public override IEnumerable<Drawable> FlowingChildren => AliveInternalChildren.OfType<ScorePanel>().OrderBy(s => s.Score.TotalScore);
+        }
+    }
+}

From acba1f3ad667fdeae03a1708329e4c49f2ce4006 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 May 2020 23:46:54 +0900
Subject: [PATCH 02845/10326] Integrate score panel list into results screen

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 38 +++++++----------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index f2458d9f1f..652d158fbb 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Ranking
         private readonly bool allowRetry;
 
         private Drawable bottomPanel;
-        private Container<ScorePanel> contractedPanels;
+        private ScorePanelList panels;
 
         public ResultsScreen(ScoreInfo score, bool allowRetry = true)
         {
@@ -63,28 +63,9 @@ namespace osu.Game.Screens.Ranking
             {
                 new ResultsScrollContainer
                 {
-                    Children = new Drawable[]
+                    Child = panels = new ScorePanelList
                     {
-                        new ScorePanel(Score)
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            State = PanelState.Expanded
-                        },
-                        new OsuScrollContainer(Direction.Horizontal)
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            RelativeSizeAxes = Axes.Both,
-                            ScrollbarVisible = false,
-                            Child = contractedPanels = new FillFlowContainer<ScorePanel>
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Direction = FillDirection.Horizontal,
-                                AutoSizeAxes = Axes.Both
-                            }
-                        }
+                        RelativeSizeAxes = Axes.Both,
                     }
                 },
                 bottomPanel = new Container
@@ -117,6 +98,8 @@ namespace osu.Game.Screens.Ranking
                 }
             };
 
+            panels.AddScore(Score);
+
             if (player != null && allowRetry)
             {
                 buttons.Add(new RetryButton { Width = 300 });
@@ -141,12 +124,13 @@ namespace osu.Game.Screens.Ranking
 
             req.Success += r =>
             {
-                contractedPanels.ChildrenEnumerable = r.Scores.Select(s => s.CreateScoreInfo(rulesets)).Select(s => new ScorePanel(s)
+                foreach (var s in r.Scores.Select(s => s.CreateScoreInfo(rulesets)))
                 {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    State = PanelState.Contracted
-                });
+                    if (s.OnlineScoreID == Score.OnlineScoreID)
+                        continue;
+
+                    panels.AddScore(s);
+                }
             };
 
             api.Queue(req);

From 15ebe38303307f7bd5b6a24bc10bf72c3b926690 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 20 May 2020 17:13:35 +0200
Subject: [PATCH 02846/10326] Return null if path is not found, for clarity

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

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index d2d74e94b2..875bc4b4cd 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Tournament.IPC
                     }
                 }
 
-                return stableInstallPath;
+                return null;
             }
             finally
             {

From b1c957c5e1aec15b346cbbd61db973bdce1a1f76 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 20 May 2020 17:25:53 +0200
Subject: [PATCH 02847/10326] invert if-statement and early return + reuse of
 checkExists

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs       |  2 +-
 .../Screens/StablePathSelectScreen.cs         | 56 +++++++++----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 875bc4b4cd..cc19c9eaba 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Tournament.IPC
             return IPCStorage;
         }
 
-        private static bool checkExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
+        public bool checkExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
 
         private string findStablePath()
         {
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index a42a5dc0fc..dbb7a3b900 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -140,43 +140,43 @@ namespace osu.Game.Tournament.Screens
         private void changePath(Storage storage)
         {
             var target = directorySelector.CurrentDirectory.Value.FullName;
+            var fileBasedIpc = ipc as FileBasedIPC;
             Logger.Log($"Changing Stable CE location to {target}");
 
-            if (File.Exists(Path.Combine(target, "ipc.txt")))
-            {
-                stableInfo.StablePath.Value = target;
-
-                try
-                {
-                    using (var stream = storage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Write, FileMode.Create))
-                    using (var sw = new StreamWriter(stream))
-                    {
-                        sw.Write(JsonConvert.SerializeObject(stableInfo,
-                            new JsonSerializerSettings
-                            {
-                                Formatting = Formatting.Indented,
-                                NullValueHandling = NullValueHandling.Ignore,
-                                DefaultValueHandling = DefaultValueHandling.Ignore,
-                            }));
-                    }
-
-                    var fileBasedIpc = ipc as FileBasedIPC;
-                    fileBasedIpc?.LocateStableStorage();
-                    sceneManager?.SetScreen(typeof(SetupScreen));
-                }
-                catch (Exception e)
-                {
-                    Logger.Log($"Error during migration: {e.Message}", level: LogLevel.Error);
-                }
-            }
-            else
+            if (!fileBasedIpc.checkExists(target))
             {
                 overlay = new DialogOverlay();
                 overlay.Push(new IPCErrorDialog("This is an invalid IPC Directory", "Select a directory that contains an osu! stable cutting edge installation and make sure it has an empty ipc.txt file in it."));
                 AddInternal(overlay);
                 Logger.Log("Folder is not an osu! stable CE directory");
+                return;
                 // Return an error in the picker that the directory does not contain ipc.txt
             }
+
+            stableInfo.StablePath.Value = target;
+
+            try
+            {
+                using (var stream = storage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Write, FileMode.Create))
+                using (var sw = new StreamWriter(stream))
+                {
+                    sw.Write(JsonConvert.SerializeObject(stableInfo,
+                        new JsonSerializerSettings
+                        {
+                            Formatting = Formatting.Indented,
+                            NullValueHandling = NullValueHandling.Ignore,
+                            DefaultValueHandling = DefaultValueHandling.Ignore,
+                        }));
+                }
+
+             
+                fileBasedIpc?.LocateStableStorage();
+                sceneManager?.SetScreen(typeof(SetupScreen));
+            }
+            catch (Exception e)
+            {
+                Logger.Log($"Error during migration: {e.Message}", level: LogLevel.Error);
+            }
         }
 
         private void autoDetect()

From a5c2f97a76d0700d3498a78041160354f7851da4 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 20 May 2020 22:15:51 +0200
Subject: [PATCH 02848/10326] use common const in TournamentGameBase

---
 osu.Game.Tournament/TournamentGameBase.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 00946399fb..7d7d4f84aa 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -33,8 +33,6 @@ namespace osu.Game.Tournament
     {
         private const string bracket_filename = "bracket.json";
 
-        private const string stable_config = "tournament/stable.json";
-
         private LadderInfo ladder;
 
         private Storage storage;
@@ -152,7 +150,7 @@ namespace osu.Game.Tournament
 
             if (storage.Exists(StableInfo.STABLE_CONFIG))
             {
-                using (Stream stream = storage.GetStream(stable_config, FileAccess.Read, FileMode.Open))
+                using (Stream stream = storage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Read, FileMode.Open))
                 using (var sr = new StreamReader(stream))
                 {
                     stableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());

From d2416ce30d6e5a8925310a1fae04fc97ceedf6d3 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 20 May 2020 22:16:37 +0200
Subject: [PATCH 02849/10326] removed redundant code and use existing
 checkExists

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs       | 25 +++--------
 .../Screens/StablePathSelectScreen.cs         | 44 +++++++------------
 2 files changed, 21 insertions(+), 48 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index cc19c9eaba..74de5904e8 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -167,7 +167,7 @@ namespace osu.Game.Tournament.IPC
             {
                 List<Func<string>> stableFindMethods = new List<Func<string>>
                 {
-                    findFromJsonConfig,
+                    readFromStableInfo,
                     findFromEnvVar,
                     findFromRegistry,
                     findFromLocalAppData,
@@ -180,6 +180,7 @@ namespace osu.Game.Tournament.IPC
 
                     if (stableInstallPath != null)
                     {
+                        saveStablePath(stableInstallPath);
                         return stableInstallPath;
                     }
                 }
@@ -192,8 +193,10 @@ namespace osu.Game.Tournament.IPC
             }
         }
 
-        private void saveStablePath()
+        private void saveStablePath(string path)
         {
+            stableInfo.StablePath.Value = path;
+
             using (var stream = tournamentStorage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Write, FileMode.Create))
             using (var sw = new StreamWriter(stream))
             {
@@ -215,11 +218,7 @@ namespace osu.Game.Tournament.IPC
                 string stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
 
                 if (checkExists(stableInstallPath))
-                {
-                    stableInfo.StablePath.Value = stableInstallPath;
-                    saveStablePath();
                     return stableInstallPath;
-                }
             }
             catch
             {
@@ -228,7 +227,7 @@ namespace osu.Game.Tournament.IPC
             return null;
         }
 
-        private string findFromJsonConfig()
+        private string readFromStableInfo()
         {
             try
             {
@@ -250,11 +249,7 @@ namespace osu.Game.Tournament.IPC
             string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
 
             if (checkExists(stableInstallPath))
-            {
-                stableInfo.StablePath.Value = stableInstallPath;
-                saveStablePath();
                 return stableInstallPath;
-            }
 
             return null;
         }
@@ -265,11 +260,7 @@ namespace osu.Game.Tournament.IPC
             string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
 
             if (checkExists(stableInstallPath))
-            {
-                stableInfo.StablePath.Value = stableInstallPath;
-                saveStablePath();
                 return stableInstallPath;
-            }
 
             return null;
         }
@@ -284,11 +275,7 @@ namespace osu.Game.Tournament.IPC
                 stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
 
             if (checkExists(stableInstallPath))
-            {
-                stableInfo.StablePath.Value = stableInstallPath;
-                saveStablePath();
                 return stableInstallPath;
-            }
 
             return null;
         }
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index dbb7a3b900..68fdaa34f8 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -139,39 +139,26 @@ namespace osu.Game.Tournament.Screens
 
         private void changePath(Storage storage)
         {
-            var target = directorySelector.CurrentDirectory.Value.FullName;
-            var fileBasedIpc = ipc as FileBasedIPC;
-            Logger.Log($"Changing Stable CE location to {target}");
-
-            if (!fileBasedIpc.checkExists(target))
-            {
-                overlay = new DialogOverlay();
-                overlay.Push(new IPCErrorDialog("This is an invalid IPC Directory", "Select a directory that contains an osu! stable cutting edge installation and make sure it has an empty ipc.txt file in it."));
-                AddInternal(overlay);
-                Logger.Log("Folder is not an osu! stable CE directory");
-                return;
-                // Return an error in the picker that the directory does not contain ipc.txt
-            }
-
-            stableInfo.StablePath.Value = target;
-
             try
             {
-                using (var stream = storage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Write, FileMode.Create))
-                using (var sw = new StreamWriter(stream))
+                var target = directorySelector.CurrentDirectory.Value.FullName;
+                stableInfo.StablePath.Value = target;
+                var fileBasedIpc = ipc as FileBasedIPC;
+                Logger.Log($"Changing Stable CE location to {target}");
+
+                if (!fileBasedIpc.checkExists(target))
                 {
-                    sw.Write(JsonConvert.SerializeObject(stableInfo,
-                        new JsonSerializerSettings
-                        {
-                            Formatting = Formatting.Indented,
-                            NullValueHandling = NullValueHandling.Ignore,
-                            DefaultValueHandling = DefaultValueHandling.Ignore,
-                        }));
+                    overlay = new DialogOverlay();
+                    overlay.Push(new IPCErrorDialog("This is an invalid IPC Directory", "Select a directory that contains an osu! stable cutting edge installation and make sure it has an empty ipc.txt file in it."));
+                    AddInternal(overlay);
+                    Logger.Log("Folder is not an osu! stable CE directory");
+                    return;
+                    // Return an error in the picker that the directory does not contain ipc.txt
                 }
 
-             
-                fileBasedIpc?.LocateStableStorage();
-                sceneManager?.SetScreen(typeof(SetupScreen));
+
+                fileBasedIpc.LocateStableStorage();
+                sceneManager.SetScreen(typeof(SetupScreen));
             }
             catch (Exception e)
             {
@@ -181,7 +168,6 @@ namespace osu.Game.Tournament.Screens
 
         private void autoDetect()
         {
-            stableInfo.StablePath.Value = string.Empty; // This forces findStablePath() to look elsewhere.
             var fileBasedIpc = ipc as FileBasedIPC;
             fileBasedIpc?.LocateStableStorage();
 

From 585100207c05cb0bd0ddd50db488bbba15b53c60 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 20 May 2020 22:30:31 +0200
Subject: [PATCH 02850/10326] make CheckExists static public and removed
 unnecessary code

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs       | 10 ++---
 .../Screens/StablePathSelectScreen.cs         | 40 +++++++------------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 74de5904e8..d93bce8dfa 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Tournament.IPC
             return IPCStorage;
         }
 
-        public bool checkExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
+        public static bool CheckExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
 
         private string findStablePath()
         {
@@ -217,7 +217,7 @@ namespace osu.Game.Tournament.IPC
                 Logger.Log("Trying to find stable with environment variables");
                 string stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
 
-                if (checkExists(stableInstallPath))
+                if (CheckExists(stableInstallPath))
                     return stableInstallPath;
             }
             catch
@@ -248,7 +248,7 @@ namespace osu.Game.Tournament.IPC
             Logger.Log("Trying to find stable in %LOCALAPPDATA%");
             string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
 
-            if (checkExists(stableInstallPath))
+            if (CheckExists(stableInstallPath))
                 return stableInstallPath;
 
             return null;
@@ -259,7 +259,7 @@ namespace osu.Game.Tournament.IPC
             Logger.Log("Trying to find stable in dotfolders");
             string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
 
-            if (checkExists(stableInstallPath))
+            if (CheckExists(stableInstallPath))
                 return stableInstallPath;
 
             return null;
@@ -274,7 +274,7 @@ namespace osu.Game.Tournament.IPC
             using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
                 stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
 
-            if (checkExists(stableInstallPath))
+            if (CheckExists(stableInstallPath))
                 return stableInstallPath;
 
             return null;
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 68fdaa34f8..dcc26b8b1e 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -1,9 +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.IO;
-using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -139,31 +137,23 @@ namespace osu.Game.Tournament.Screens
 
         private void changePath(Storage storage)
         {
-            try
+            var target = directorySelector.CurrentDirectory.Value.FullName;
+            stableInfo.StablePath.Value = target;
+            Logger.Log($"Changing Stable CE location to {target}");
+
+            if (!FileBasedIPC.CheckExists(target))
             {
-                var target = directorySelector.CurrentDirectory.Value.FullName;
-                stableInfo.StablePath.Value = target;
-                var fileBasedIpc = ipc as FileBasedIPC;
-                Logger.Log($"Changing Stable CE location to {target}");
-
-                if (!fileBasedIpc.checkExists(target))
-                {
-                    overlay = new DialogOverlay();
-                    overlay.Push(new IPCErrorDialog("This is an invalid IPC Directory", "Select a directory that contains an osu! stable cutting edge installation and make sure it has an empty ipc.txt file in it."));
-                    AddInternal(overlay);
-                    Logger.Log("Folder is not an osu! stable CE directory");
-                    return;
-                    // Return an error in the picker that the directory does not contain ipc.txt
-                }
-
-
-                fileBasedIpc.LocateStableStorage();
-                sceneManager.SetScreen(typeof(SetupScreen));
-            }
-            catch (Exception e)
-            {
-                Logger.Log($"Error during migration: {e.Message}", level: LogLevel.Error);
+                overlay = new DialogOverlay();
+                overlay.Push(new IPCErrorDialog("This is an invalid IPC Directory", "Select a directory that contains an osu! stable cutting edge installation and make sure it has an empty ipc.txt file in it."));
+                AddInternal(overlay);
+                Logger.Log("Folder is not an osu! stable CE directory");
+                return;
+                // Return an error in the picker that the directory does not contain ipc.txt
             }
+
+            var fileBasedIpc = ipc as FileBasedIPC;
+            fileBasedIpc?.LocateStableStorage();
+            sceneManager?.SetScreen(typeof(SetupScreen));
         }
 
         private void autoDetect()

From ce223a2bd84c6362fd1f78aa6bef4feadc8bacb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 10:58:30 +0900
Subject: [PATCH 02851/10326] Silence hit sounds while seeking

---
 .../Objects/Drawables/DrawableHitObject.cs    |  6 ++++-
 .../Rulesets/UI/FrameStabilityContainer.cs    | 22 +++++++++++++++----
 osu.Game/Screens/Play/GameplayClock.cs        |  5 +++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index c32d4e441e..d594909cda 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Configuration;
+using osu.Game.Screens.Play;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Drawables
@@ -348,6 +349,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
         }
 
+        [Resolved(canBeNull: true)]
+        private GameplayClock gameplayClock { get; set; }
+
         /// <summary>
         /// Plays all the hit sounds for this <see cref="DrawableHitObject"/>.
         /// This is invoked automatically when this <see cref="DrawableHitObject"/> is hit.
@@ -356,7 +360,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             const float balance_adjust_amount = 0.4f;
 
-            if (Samples != null)
+            if (Samples != null && gameplayClock?.IsSeeking != true)
             {
                 Samples.Balance.Value = balance_adjust_amount * (userPositionalHitSounds.Value ? SamplePlaybackPosition - 0.5f : 0);
                 Samples.Play();
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 3ba28aad45..bc9401a095 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -29,14 +29,16 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         internal bool FrameStablePlayback = true;
 
-        [Cached]
-        public GameplayClock GameplayClock { get; }
+        public GameplayClock GameplayClock => stabilityGameplayClock;
+
+        [Cached(typeof(GameplayClock))]
+        private readonly StabilityGameplayClock stabilityGameplayClock;
 
         public FrameStabilityContainer(double gameplayStartTime = double.MinValue)
         {
             RelativeSizeAxes = Axes.Both;
 
-            GameplayClock = new GameplayClock(framedClock = new FramedClock(manualClock = new ManualClock()));
+            stabilityGameplayClock = new StabilityGameplayClock(framedClock = new FramedClock(manualClock = new ManualClock()));
 
             this.gameplayStartTime = gameplayStartTime;
         }
@@ -57,7 +59,7 @@ namespace osu.Game.Rulesets.UI
         {
             if (clock != null)
             {
-                parentGameplayClock = clock;
+                stabilityGameplayClock.ParentGameplayClock = parentGameplayClock = clock;
                 GameplayClock.IsPaused.BindTo(clock.IsPaused);
             }
         }
@@ -187,5 +189,17 @@ namespace osu.Game.Rulesets.UI
         }
 
         public ReplayInputHandler ReplayInputHandler { get; set; }
+
+        private class StabilityGameplayClock : GameplayClock
+        {
+            public IFrameBasedClock ParentGameplayClock;
+
+            public StabilityGameplayClock(FramedClock underlyingClock)
+                : base(underlyingClock)
+            {
+            }
+
+            public override bool IsSeeking => ParentGameplayClock != null && Math.Abs(CurrentTime - ParentGameplayClock.CurrentTime) > 200;
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index d5f75f6ad1..4f2cf5005c 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -31,6 +31,11 @@ namespace osu.Game.Screens.Play
 
         public bool IsRunning => underlyingClock.IsRunning;
 
+        /// <summary>
+        /// Whether an ongoing seek operation is active.
+        /// </summary>
+        public virtual bool IsSeeking => false;
+
         public void ProcessFrame()
         {
             // we do not want to process the underlying clock.

From c0e68f98540303aa02932718d1d96f2bf8a94c20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 10:59:30 +0900
Subject: [PATCH 02852/10326] Also support taiko drum

---
 osu.Game.Rulesets.Taiko/UI/InputDrum.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
index 38026517d9..06ccd45cb8 100644
--- a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
@@ -12,6 +12,7 @@ using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Taiko.Audio;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.UI
@@ -145,6 +146,9 @@ namespace osu.Game.Rulesets.Taiko.UI
                 centreHit.Colour = colours.Pink;
             }
 
+            [Resolved(canBeNull: true)]
+            private GameplayClock gameplayClock { get; set; }
+
             public bool OnPressed(TaikoAction action)
             {
                 Drawable target = null;
@@ -157,14 +161,16 @@ namespace osu.Game.Rulesets.Taiko.UI
                     target = centreHit;
                     back = centre;
 
-                    drumSample.Centre?.Play();
+                    if (gameplayClock?.IsSeeking != true)
+                        drumSample.Centre?.Play();
                 }
                 else if (action == RimAction)
                 {
                     target = rimHit;
                     back = rim;
 
-                    drumSample.Rim?.Play();
+                    if (gameplayClock?.IsSeeking != true)
+                        drumSample.Rim?.Play();
                 }
 
                 if (target != null)

From 83a5913b8d7a4ddb3adc9610b39e3e5e28041933 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 12:11:39 +0900
Subject: [PATCH 02853/10326] Undo beat snapping related changes

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs  | 16 ++--------------
 .../Edit/ManiaHitObjectComposer.cs              | 17 +++++------------
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 184356b89c..3fb03d642f 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -24,15 +24,10 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         protected Column Column;
 
         /// <summary>
-        /// The current beat-snapped mouse position, snapped to the closest column.
+        /// The current mouse position, snapped to the closest column.
         /// </summary>
         protected Vector2 SnappedMousePosition { get; private set; }
 
-        /// <summary>
-        /// The gameplay time at the current beat-snapped mouse position (<see cref="SnappedMousePosition"/>).
-        /// </summary>
-        protected double SnappedTime { get; private set; }
-
         /// <summary>
         /// The width of the closest column to the current mouse position.
         /// </summary>
@@ -44,9 +39,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        [Resolved(CanBeNull = true)]
-        private IDistanceSnapProvider snapProvider { get; set; }
-
         protected ManiaPlacementBlueprint(T hitObject)
             : base(hitObject)
         {
@@ -62,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 return base.OnMouseDown(e);
 
             HitObject.Column = Column.Index;
-            BeginPlacement(SnappedTime, true);
+            BeginPlacement(TimeAt(e.ScreenSpaceMousePosition), true);
             return true;
         }
 
@@ -78,10 +70,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             // Snap to the column
             var parentPos = Parent.ToLocalSpace(Column.ToScreenSpace(new Vector2(Column.DrawWidth / 2, 0)));
             SnappedMousePosition = new Vector2(parentPos.X, Parent.ToLocalSpace(screenSpacePosition).Y);
-
-            SnappedTime = TimeAt(screenSpacePosition);
-            if (snapProvider != null)
-                (SnappedMousePosition, SnappedTime) = snapProvider.GetSnappedPosition(SnappedMousePosition, SnappedTime);
         }
 
         protected double TimeAt(Vector2 screenSpacePosition)
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 475320ece3..7677ac6f07 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -82,18 +82,9 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public override (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time)
         {
-            var beatSnapped = beatSnapGrid.GetSnappedPosition(position);
+            var hoc = Playfield.GetColumn(0).HitObjectContainer;
 
-            if (beatSnapped != null)
-                return beatSnapped.Value;
-
-            return base.GetSnappedPosition(position, getTimeFromPosition(ToScreenSpace(position)));
-        }
-
-        private double getTimeFromPosition(Vector2 screenSpacePosition)
-        {
-            var hoc = Playfield.Stages[0].HitObjectContainer;
-            float targetPosition = hoc.ToLocalSpace(screenSpacePosition).Y;
+            float targetPosition = hoc.ToLocalSpace(ToScreenSpace(position)).Y;
 
             if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
             {
@@ -103,10 +94,12 @@ namespace osu.Game.Rulesets.Mania.Edit
                 targetPosition = hoc.DrawHeight - targetPosition;
             }
 
-            return drawableRuleset.ScrollingInfo.Algorithm.TimeAt(targetPosition,
+            double targetTime = drawableRuleset.ScrollingInfo.Algorithm.TimeAt(targetPosition,
                 EditorClock.CurrentTime,
                 drawableRuleset.ScrollingInfo.TimeRange.Value,
                 hoc.DrawHeight);
+
+            return base.GetSnappedPosition(position, targetTime);
         }
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)

From 6d29ff092869b2e58ae983c8919bec93b2b6cc9b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 May 2020 12:13:02 +0900
Subject: [PATCH 02854/10326] Fix banana showers not using cancellation token

---
 osu.Game.Rulesets.Catch/Objects/BananaShower.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index 96ab66048a..3a0b5ace53 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -18,10 +18,10 @@ namespace osu.Game.Rulesets.Catch.Objects
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             base.CreateNestedHitObjects(cancellationToken);
-            createBananas();
+            createBananas(cancellationToken);
         }
 
-        private void createBananas()
+        private void createBananas(CancellationToken cancellationToken)
         {
             double spacing = Duration;
             while (spacing > 100)
@@ -32,6 +32,8 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             for (double i = StartTime; i <= EndTime; i += spacing)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 AddNested(new Banana
                 {
                     Samples = Samples,

From 922b793a5aed03ee2ed1db3ae668eafc90a6eda8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 13:04:35 +0900
Subject: [PATCH 02855/10326] Update hit object composer tests

---
 .../TestSceneManiaHitObjectComposer.cs             | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
index 6274bb1005..bad3d7854e 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         public void TestDragOffscreenSelectionVerticallyUpScroll()
         {
             DrawableHitObject lastObject = null;
+            double originalTime = 0;
             Vector2 originalPosition = Vector2.Zero;
 
             setScrollStep(ScrollingDirection.Up);
@@ -49,6 +50,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddStep("seek to last object", () =>
             {
                 lastObject = this.ChildrenOfType<DrawableHitObject>().Single(d => d.HitObject == composer.EditorBeatmap.HitObjects.Last());
+                originalTime = lastObject.HitObject.StartTime;
                 Clock.Seek(composer.EditorBeatmap.HitObjects.Last().StartTime);
             });
 
@@ -64,19 +66,20 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddStep("move mouse downwards", () =>
             {
-                InputManager.MoveMouseTo(lastObject, new Vector2(0, 20));
+                InputManager.MoveMouseTo(lastObject, new Vector2(0, lastObject.ScreenSpaceDrawQuad.Height * 2));
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 
             AddAssert("hitobjects not moved columns", () => composer.EditorBeatmap.HitObjects.All(h => ((ManiaHitObject)h).Column == 0));
             AddAssert("hitobjects moved downwards", () => lastObject.DrawPosition.Y - originalPosition.Y > 0);
-            AddAssert("hitobjects not moved too far", () => lastObject.DrawPosition.Y - originalPosition.Y < 50);
+            AddAssert("hitobject has moved time", () => lastObject.HitObject.StartTime == originalTime + 125);
         }
 
         [Test]
         public void TestDragOffscreenSelectionVerticallyDownScroll()
         {
             DrawableHitObject lastObject = null;
+            double originalTime = 0;
             Vector2 originalPosition = Vector2.Zero;
 
             setScrollStep(ScrollingDirection.Down);
@@ -84,6 +87,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddStep("seek to last object", () =>
             {
                 lastObject = this.ChildrenOfType<DrawableHitObject>().Single(d => d.HitObject == composer.EditorBeatmap.HitObjects.Last());
+                originalTime = lastObject.HitObject.StartTime;
                 Clock.Seek(composer.EditorBeatmap.HitObjects.Last().StartTime);
             });
 
@@ -99,13 +103,13 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddStep("move mouse upwards", () =>
             {
-                InputManager.MoveMouseTo(lastObject, new Vector2(0, -20));
+                InputManager.MoveMouseTo(lastObject, new Vector2(0, -lastObject.ScreenSpaceDrawQuad.Height * 2));
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 
             AddAssert("hitobjects not moved columns", () => composer.EditorBeatmap.HitObjects.All(h => ((ManiaHitObject)h).Column == 0));
             AddAssert("hitobjects moved upwards", () => originalPosition.Y - lastObject.DrawPosition.Y > 0);
-            AddAssert("hitobjects not moved too far", () => originalPosition.Y - lastObject.DrawPosition.Y < 50);
+            AddAssert("hitobject has moved time", () => lastObject.HitObject.StartTime == originalTime + 125);
         }
 
         [Test]
@@ -207,7 +211,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 };
 
                 for (int i = 0; i < 10; i++)
-                    EditorBeatmap.Add(new Note { StartTime = 100 * i });
+                    EditorBeatmap.Add(new Note { StartTime = 125 * i });
             }
         }
     }

From 5ad7842b917e862d3d5ce722ff0b0169a7660d53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 13:33:02 +0900
Subject: [PATCH 02856/10326] Move ScreenSpacePositionAtTime to inside Column
 implementation

---
 .../ManiaPlacementBlueprintTestScene.cs        |  2 --
 .../ManiaSelectionBlueprintTestScene.cs        |  2 --
 .../Blueprints/HoldNotePlacementBlueprint.cs   |  5 ++---
 .../Edit/IManiaHitObjectComposer.cs            |  2 --
 .../Edit/ManiaHitObjectComposer.cs             | 18 +-----------------
 osu.Game.Rulesets.Mania/UI/Column.cs           | 13 +++++++++++++
 .../UI/Scrolling/ScrollingPlayfield.cs         |  4 ++--
 7 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
index be3e205f36..aac77c9c1c 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
@@ -49,8 +49,6 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         public Column ColumnAt(Vector2 screenSpacePosition) => column;
 
-        public Vector2 ScreenSpacePositionAtTime(double time, Column column = null) => Vector2.Zero;
-
         public int TotalColumns => 1;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
index 3d654466ed..b598893e8c 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
@@ -33,8 +33,6 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         public Column ColumnAt(Vector2 screenSpacePosition) => column;
 
-        public Vector2 ScreenSpacePositionAtTime(double time, Column column = null) => Vector2.Zero;
-
         public int TotalColumns => 1;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 31bf76edd0..8689d479b4 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -8,7 +8,6 @@ using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Input;
 
@@ -42,8 +41,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             if (Column != null)
             {
-                headPiece.Y = Parent.ToLocalSpace(composer.ScreenSpacePositionAtTime(HitObject.StartTime, Column)).Y;
-                tailPiece.Y = Parent.ToLocalSpace(composer.ScreenSpacePositionAtTime(HitObject.EndTime, Column)).Y;
+                headPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.StartTime, Column)).Y;
+                tailPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.EndTime, Column)).Y;
             }
 
             var topPosition = new Vector2(headPiece.DrawPosition.X, Math.Min(headPiece.DrawPosition.Y, tailPiece.DrawPosition.Y));
diff --git a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
index f1915cd85a..f64bab1fae 100644
--- a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
@@ -10,8 +10,6 @@ namespace osu.Game.Rulesets.Mania.Edit
     {
         Column ColumnAt(Vector2 screenSpacePosition);
 
-        Vector2 ScreenSpacePositionAtTime(double time, Column column = null);
-
         int TotalColumns { get; }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 0cae26b51c..5eafaefe37 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -72,27 +72,11 @@ namespace osu.Game.Rulesets.Mania.Edit
             targetTime = BeatSnapProvider.SnapTime(targetTime);
 
             // convert back to screen space
-            screenSpacePosition = ScreenSpacePositionAtTime(targetTime, column);
+            screenSpacePosition = column.ScreenSpacePositionAtTime(targetTime, column);
 
             return new ManiaSnapResult(screenSpacePosition, targetTime, column);
         }
 
-        public Vector2 ScreenSpacePositionAtTime(double time, Column column = null)
-        {
-            var hoc = (column ?? Playfield.GetColumn(0)).HitObjectContainer;
-            var scrollInfo = drawableRuleset.ScrollingInfo;
-
-            var pos = scrollInfo.Algorithm.PositionAt(time, EditorClock.CurrentTime, scrollInfo.TimeRange.Value, hoc.DrawHeight);
-
-            if (scrollInfo.Direction.Value == ScrollingDirection.Down)
-            {
-                // as explained above
-                pos = hoc.DrawHeight - pos;
-            }
-
-            return hoc.ToScreenSpace(new Vector2(hoc.DrawWidth / 2, pos));
-        }
-
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
         {
             drawableRuleset = new DrawableManiaEditRuleset(ruleset, beatmap, mods);
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 506a07f26b..3f85f449ce 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -140,5 +140,18 @@ namespace osu.Game.Rulesets.Mania.UI
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
             // This probably shouldn't exist as is, but the columns in the stage are separated by a 1px border
             => DrawRectangle.Inflate(new Vector2(Stage.COLUMN_SPACING / 2, 0)).Contains(ToLocalSpace(screenSpacePos));
+
+        public Vector2 ScreenSpacePositionAtTime(double time, Column column = null)
+        {
+            var pos = ScrollingInfo.Algorithm.PositionAt(time, Time.Current, ScrollingInfo.TimeRange.Value, HitObjectContainer.DrawHeight);
+
+            if (ScrollingInfo.Direction.Value == ScrollingDirection.Down)
+            {
+                // as explained above
+                pos = HitObjectContainer.DrawHeight - pos;
+            }
+
+            return HitObjectContainer.ToScreenSpace(new Vector2(HitObjectContainer.DrawWidth / 2, pos));
+        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index bf2203e176..fd143a3687 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -15,12 +15,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
 
         [Resolved]
-        private IScrollingInfo scrollingInfo { get; set; }
+        protected IScrollingInfo ScrollingInfo { get; private set; }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Direction.BindTo(scrollingInfo.Direction);
+            Direction.BindTo(ScrollingInfo.Direction);
         }
 
         protected sealed override HitObjectContainer CreateHitObjectContainer() => new ScrollingHitObjectContainer();

From bac78707de161819947b5b26ec4d7ea830ee1699 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 14:25:37 +0900
Subject: [PATCH 02857/10326] Move more logic to column to both clean things up
 and fix tests

---
 .../ManiaPlacementBlueprintTestScene.cs         |  9 +++++++++
 .../Edit/ManiaHitObjectComposer.cs              | 17 +----------------
 osu.Game.Rulesets.Mania/UI/Column.cs            | 16 ++++++++++++++++
 .../Tests/Visual/PlacementBlueprintTestScene.cs |  7 +++++--
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
index aac77c9c1c..547786847b 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
@@ -43,6 +44,14 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
         }
 
+        protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
+        {
+            var time = column.TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
+            var pos = column.ScreenSpacePositionAtTime(time);
+
+            return new ManiaSnapResult(pos, time, column);
+        }
+
         protected override Container CreateHitObjectContainer() => new ScrollingTestContainer(ScrollingDirection.Down) { RelativeSizeAxes = Axes.Both };
 
         protected override void AddHitObject(DrawableHitObject hitObject) => column.Add((DrawableManiaHitObject)hitObject);
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 5eafaefe37..9085033140 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -51,22 +51,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             if (column == null)
                 return new SnapResult(screenSpacePosition, null);
 
-            var hoc = column.HitObjectContainer;
-
-            // convert to local space of column so we can snap and fetch correct location.
-            Vector2 localPosition = hoc.ToLocalSpace(screenSpacePosition);
-
-            var scrollInfo = drawableRuleset.ScrollingInfo;
-
-            if (scrollInfo.Direction.Value == ScrollingDirection.Down)
-            {
-                // We're dealing with screen coordinates in which the position decreases towards the centre of the screen resulting in an increase in start time.
-                // The scrolling algorithm instead assumes a top anchor meaning an increase in time corresponds to an increase in position,
-                // so when scrolling downwards the coordinates need to be flipped.
-                localPosition.Y = hoc.DrawHeight - localPosition.Y;
-            }
-
-            double targetTime = scrollInfo.Algorithm.TimeAt(localPosition.Y, EditorClock.CurrentTime, scrollInfo.TimeRange.Value, hoc.DrawHeight);
+            double targetTime = column.TimeAtScreenSpacePosition(screenSpacePosition);
 
             // apply beat snapping
             targetTime = BeatSnapProvider.SnapTime(targetTime);
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 3f85f449ce..c582eb1c75 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -153,5 +153,21 @@ namespace osu.Game.Rulesets.Mania.UI
 
             return HitObjectContainer.ToScreenSpace(new Vector2(HitObjectContainer.DrawWidth / 2, pos));
         }
+
+        public double TimeAtScreenSpacePosition(Vector2 screenSpacePosition)
+        {
+            // convert to local space of column so we can snap and fetch correct location.
+            Vector2 localPosition = HitObjectContainer.ToLocalSpace(screenSpacePosition);
+
+            if (ScrollingInfo.Direction.Value == ScrollingDirection.Down)
+            {
+                // We're dealing with screen coordinates in which the position decreases towards the centre of the screen resulting in an increase in start time.
+                // The scrolling algorithm instead assumes a top anchor meaning an increase in time corresponds to an increase in position,
+                // so when scrolling downwards the coordinates need to be flipped.
+                localPosition.Y = HitObjectContainer.DrawHeight - localPosition.Y;
+            }
+
+            return ScrollingInfo.Algorithm.TimeAt(localPosition.Y, Time.Current, ScrollingInfo.TimeRange.Value, HitObjectContainer.DrawHeight);
+        }
     }
 }
diff --git a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
index a4e629b6f5..feecea473c 100644
--- a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
@@ -71,9 +71,12 @@ namespace osu.Game.Tests.Visual
         {
             base.Update();
 
-            currentBlueprint.UpdatePosition(new SnapResult(InputManager.CurrentState.Mouse.Position, null));
+            currentBlueprint.UpdatePosition(SnapForBlueprint(currentBlueprint));
         }
 
+        protected virtual SnapResult SnapForBlueprint(PlacementBlueprint blueprint) =>
+            new SnapResult(InputManager.CurrentState.Mouse.Position, null);
+
         public override void Add(Drawable drawable)
         {
             base.Add(drawable);
@@ -81,7 +84,7 @@ namespace osu.Game.Tests.Visual
             if (drawable is PlacementBlueprint blueprint)
             {
                 blueprint.Show();
-                blueprint.UpdatePosition(new SnapResult(InputManager.CurrentState.Mouse.Position, null));
+                blueprint.UpdatePosition(SnapForBlueprint(blueprint));
             }
         }
 

From a9a1c00cf1d2b54a757bc6a69a70cee31a39ce04 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 14:38:40 +0900
Subject: [PATCH 02858/10326] Move responsibility placement blueprint's
 StartTime set to within

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs         |  2 ++
 .../HitCircles/HitCirclePlacementBlueprint.cs          |  6 +++++-
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs     |  2 ++
 .../Blueprints/Spinners/SpinnerPlacementBlueprint.cs   |  4 ----
 osu.Game/Rulesets/Edit/HitObjectComposer.cs            |  2 --
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs           | 10 +++++++++-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 8d3b3ea583..d173da9d9a 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -50,6 +50,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         public override void UpdatePosition(SnapResult result)
         {
+            base.UpdatePosition(result);
+
             if (!PlacementActive)
                 Column = (result as ManiaSnapResult)?.Column;
         }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index e12dec2668..3dbbdcc5d0 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -39,6 +39,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
             return base.OnMouseDown(e);
         }
 
-        public override void UpdatePosition(SnapResult result) => HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
+        public override void UpdatePosition(SnapResult result)
+        {
+            base.UpdatePosition(result);
+            HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 59ec92c79e..4b99cc23ed 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -69,6 +69,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         public override void UpdatePosition(SnapResult result)
         {
+            base.UpdatePosition(result);
+
             switch (state)
             {
                 case PlacementState.Initial:
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
index 546f0e5981..cc4ed0eccf 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
@@ -59,9 +59,5 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
 
             return true;
         }
-
-        public override void UpdatePosition(SnapResult result)
-        {
-        }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 1e328e6b6b..6edd01cd15 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -244,8 +244,6 @@ namespace osu.Game.Rulesets.Edit
         public void BeginPlacement(HitObject hitObject)
         {
             EditorBeatmap.PlacementObject.Value = hitObject;
-
-            hitObject.StartTime = SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position).Time ?? EditorClock.CurrentTime;
         }
 
         public void EndPlacement(HitObject hitObject, bool commit)
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index bab9bf71ef..2fd8c4b9d9 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -10,6 +10,7 @@ using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
 
@@ -83,11 +84,18 @@ namespace osu.Game.Rulesets.Edit
             PlacementActive = false;
         }
 
+        [Resolved(canBeNull: true)]
+        private IFrameBasedClock editorClock { get; set; }
+
         /// <summary>
         /// Updates the position of this <see cref="PlacementBlueprint"/> to a new screen-space position.
         /// </summary>
         /// <param name="snapResult">The snap result information.</param>
-        public abstract void UpdatePosition(SnapResult snapResult);
+        public virtual void UpdatePosition(SnapResult snapResult)
+        {
+            if (!PlacementActive)
+                HitObject.StartTime = snapResult.Time ?? editorClock?.CurrentTime ?? Time.Current;
+        }
 
         /// <summary>
         /// Invokes <see cref="Objects.HitObject.ApplyDefaults(ControlPointInfo,BeatmapDifficulty)"/>,

From 776b842fdbbabff264fd6120833be30bacd57053 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 14:53:36 +0900
Subject: [PATCH 02859/10326] Remove unused using

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 2fd8c4b9d9..f0b63f8ea5 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -10,7 +10,6 @@ using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
 

From ce8b6b7383d2c32d7518b9a1091c1af1825bd334 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 15:15:24 +0900
Subject: [PATCH 02860/10326] Correctly account for blueprint origins

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 55 ++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index c582eb1c75..0fdefe6dc9 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -145,10 +146,21 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             var pos = ScrollingInfo.Algorithm.PositionAt(time, Time.Current, ScrollingInfo.TimeRange.Value, HitObjectContainer.DrawHeight);
 
-            if (ScrollingInfo.Direction.Value == ScrollingDirection.Down)
+            switch (ScrollingInfo.Direction.Value)
             {
-                // as explained above
-                pos = HitObjectContainer.DrawHeight - pos;
+                case ScrollingDirection.Down:
+                    // We're dealing with screen coordinates in which the position decreases towards the centre of the screen resulting in an increase in start time.
+                    // The scrolling algorithm instead assumes a top anchor meaning an increase in time corresponds to an increase in position,
+                    // so when scrolling downwards the coordinates need to be flipped.
+                    pos = HitObjectContainer.DrawHeight - pos;
+
+                    // Blueprints are centred on the mouse position, such that the hitobject position is anchored at the top or bottom of the blueprint depending on the scroll direction.
+                    pos -= DefaultNotePiece.NOTE_HEIGHT / 2;
+                    break;
+
+                case ScrollingDirection.Up:
+                    pos += DefaultNotePiece.NOTE_HEIGHT / 2;
+                    break;
             }
 
             return HitObjectContainer.ToScreenSpace(new Vector2(HitObjectContainer.DrawWidth / 2, pos));
@@ -159,15 +171,42 @@ namespace osu.Game.Rulesets.Mania.UI
             // convert to local space of column so we can snap and fetch correct location.
             Vector2 localPosition = HitObjectContainer.ToLocalSpace(screenSpacePosition);
 
-            if (ScrollingInfo.Direction.Value == ScrollingDirection.Down)
+            switch (ScrollingInfo.Direction.Value)
             {
-                // We're dealing with screen coordinates in which the position decreases towards the centre of the screen resulting in an increase in start time.
-                // The scrolling algorithm instead assumes a top anchor meaning an increase in time corresponds to an increase in position,
-                // so when scrolling downwards the coordinates need to be flipped.
-                localPosition.Y = HitObjectContainer.DrawHeight - localPosition.Y;
+                case ScrollingDirection.Down:
+                    // as above
+                    localPosition.Y = HitObjectContainer.DrawHeight - localPosition.Y;
+                    break;
             }
 
+            // offset for the fact that blueprints are centered, as above.
+            localPosition.Y -= DefaultNotePiece.NOTE_HEIGHT / 2;
+
             return ScrollingInfo.Algorithm.TimeAt(localPosition.Y, Time.Current, ScrollingInfo.TimeRange.Value, HitObjectContainer.DrawHeight);
         }
+
+        /// <summary>
+        /// Converts a mouse position to a hitobject position.
+        /// </summary>
+        /// <remarks>
+        /// Blueprints are centred on the mouse position, such that the hitobject position is anchored at the top or bottom of the blueprint depending on the scroll direction.
+        /// </remarks>
+        /// <param name="mousePosition">The mouse position.</param>
+        /// <returns>The resulting hitobject position, acnhored at the top or bottom of the blueprint depending on the scroll direction.</returns>
+        private Vector2 mouseToHitObjectPosition(Vector2 mousePosition)
+        {
+            switch (ScrollingInfo.Direction.Value)
+            {
+                case ScrollingDirection.Up:
+                    mousePosition.Y -= DefaultNotePiece.NOTE_HEIGHT / 2;
+                    break;
+
+                case ScrollingDirection.Down:
+                    mousePosition.Y += DefaultNotePiece.NOTE_HEIGHT / 2;
+                    break;
+            }
+
+            return mousePosition;
+        }
     }
 }

From a756e6d21241080204da38772a8e34ff9d9946a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 15:16:30 +0900
Subject: [PATCH 02861/10326] Add xmldoc and remove unnecessary parameter

---
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs         | 4 ++--
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs    | 2 +-
 osu.Game.Rulesets.Mania/UI/Column.cs                      | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 8689d479b4..b757c17a48 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -41,8 +41,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             if (Column != null)
             {
-                headPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.StartTime, Column)).Y;
-                tailPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.EndTime, Column)).Y;
+                headPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.StartTime)).Y;
+                tailPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.EndTime)).Y;
             }
 
             var topPosition = new Vector2(headPiece.DrawPosition.X, Math.Min(headPiece.DrawPosition.Y, tailPiece.DrawPosition.Y));
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 9085033140..cfb04c8e50 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             targetTime = BeatSnapProvider.SnapTime(targetTime);
 
             // convert back to screen space
-            screenSpacePosition = column.ScreenSpacePositionAtTime(targetTime, column);
+            screenSpacePosition = column.ScreenSpacePositionAtTime(targetTime);
 
             return new ManiaSnapResult(screenSpacePosition, targetTime, column);
         }
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 0fdefe6dc9..f7339fdacd 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -142,7 +142,10 @@ namespace osu.Game.Rulesets.Mania.UI
             // This probably shouldn't exist as is, but the columns in the stage are separated by a 1px border
             => DrawRectangle.Inflate(new Vector2(Stage.COLUMN_SPACING / 2, 0)).Contains(ToLocalSpace(screenSpacePos));
 
-        public Vector2 ScreenSpacePositionAtTime(double time, Column column = null)
+        /// <summary>
+        /// Given a time, return the screen space position within this column.
+        /// </summary>
+        public Vector2 ScreenSpacePositionAtTime(double time)
         {
             var pos = ScrollingInfo.Algorithm.PositionAt(time, Time.Current, ScrollingInfo.TimeRange.Value, HitObjectContainer.DrawHeight);
 
@@ -166,6 +169,9 @@ namespace osu.Game.Rulesets.Mania.UI
             return HitObjectContainer.ToScreenSpace(new Vector2(HitObjectContainer.DrawWidth / 2, pos));
         }
 
+        /// <summary>
+        /// Given a position in screen space, return the time within this column.
+        /// </summary>
         public double TimeAtScreenSpacePosition(Vector2 screenSpacePosition)
         {
             // convert to local space of column so we can snap and fetch correct location.

From 7dd3b3eeb56473e200d07af163204022126b5e11 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 15:16:59 +0900
Subject: [PATCH 02862/10326] Remove unused method

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index f7339fdacd..2d88670d77 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -190,29 +190,5 @@ namespace osu.Game.Rulesets.Mania.UI
 
             return ScrollingInfo.Algorithm.TimeAt(localPosition.Y, Time.Current, ScrollingInfo.TimeRange.Value, HitObjectContainer.DrawHeight);
         }
-
-        /// <summary>
-        /// Converts a mouse position to a hitobject position.
-        /// </summary>
-        /// <remarks>
-        /// Blueprints are centred on the mouse position, such that the hitobject position is anchored at the top or bottom of the blueprint depending on the scroll direction.
-        /// </remarks>
-        /// <param name="mousePosition">The mouse position.</param>
-        /// <returns>The resulting hitobject position, acnhored at the top or bottom of the blueprint depending on the scroll direction.</returns>
-        private Vector2 mouseToHitObjectPosition(Vector2 mousePosition)
-        {
-            switch (ScrollingInfo.Direction.Value)
-            {
-                case ScrollingDirection.Up:
-                    mousePosition.Y -= DefaultNotePiece.NOTE_HEIGHT / 2;
-                    break;
-
-                case ScrollingDirection.Down:
-                    mousePosition.Y += DefaultNotePiece.NOTE_HEIGHT / 2;
-                    break;
-            }
-
-            return mousePosition;
-        }
     }
 }

From 0db1ea6a9d460c208e5cf513625b34968f686aa2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 15:47:12 +0900
Subject: [PATCH 02863/10326] Fix failing tests

---
 .../TestSceneManiaHitObjectComposer.cs                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
index bad3d7854e..1a3fa29d4a 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddStep("move mouse downwards", () =>
             {
-                InputManager.MoveMouseTo(lastObject, new Vector2(0, lastObject.ScreenSpaceDrawQuad.Height * 2));
+                InputManager.MoveMouseTo(lastObject, new Vector2(0, lastObject.ScreenSpaceDrawQuad.Height * 4));
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddStep("move mouse upwards", () =>
             {
-                InputManager.MoveMouseTo(lastObject, new Vector2(0, -lastObject.ScreenSpaceDrawQuad.Height * 2));
+                InputManager.MoveMouseTo(lastObject, new Vector2(0, -lastObject.ScreenSpaceDrawQuad.Height * 4));
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 

From 8a47e2431bbe7c3207e75004d61fd5fcbce103f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 May 2020 17:13:22 +0900
Subject: [PATCH 02864/10326] Move distance snap grid implementation to
 OsuHitObjectComposer

---
 .../Edit/OsuHitObjectComposer.cs              | 64 +++++++++++++++-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 73 +++----------------
 .../Compose/Components/BlueprintContainer.cs  |  5 --
 3 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index cdf78a5902..9ba3e30445 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -4,6 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Caching;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
@@ -12,6 +16,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
@@ -32,9 +37,66 @@ namespace osu.Game.Rulesets.Osu.Edit
             new SpinnerCompositionTool()
         };
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            EditorBeatmap.SelectedHitObjects.CollectionChanged += (_, __) => updateDistanceSnapGrid();
+            EditorBeatmap.PlacementObject.ValueChanged += _ => updateDistanceSnapGrid();
+
+            LayerBelowRuleset.Add(distanceSnapGridContainer = new Container { RelativeSizeAxes = Axes.Both });
+        }
+
         protected override ComposeBlueprintContainer CreateBlueprintContainer() => new OsuBlueprintContainer(HitObjects);
 
-        protected override DistanceSnapGrid CreateDistanceSnapGrid(IEnumerable<HitObject> selectedHitObjects)
+        private DistanceSnapGrid distanceSnapGrid;
+        private Container distanceSnapGridContainer;
+
+        private readonly Cached distanceSnapGridCache = new Cached();
+        private double? lastDistanceSnapGridTime;
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!(BlueprintContainer.CurrentTool is SelectTool))
+            {
+                if (EditorClock.CurrentTime != lastDistanceSnapGridTime)
+                {
+                    distanceSnapGridCache.Invalidate();
+                    lastDistanceSnapGridTime = EditorClock.CurrentTime;
+                }
+
+                if (!distanceSnapGridCache.IsValid)
+                    updateDistanceSnapGrid();
+            }
+        }
+
+        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
+        {
+            if (distanceSnapGrid == null)
+                return base.SnapScreenSpacePositionToValidTime(screenSpacePosition);
+
+            (Vector2 pos, double time) = distanceSnapGrid.GetSnappedPosition(distanceSnapGrid.ToLocalSpace(screenSpacePosition));
+
+            return new SnapResult(distanceSnapGrid.ToScreenSpace(pos), time);
+        }
+
+        private void updateDistanceSnapGrid()
+        {
+            distanceSnapGridContainer.Clear();
+            distanceSnapGridCache.Invalidate();
+
+            if (BlueprintContainer.CurrentTool is SelectTool && !EditorBeatmap.SelectedHitObjects.Any())
+                return;
+
+            if ((distanceSnapGrid = createDistanceSnapGrid(EditorBeatmap.SelectedHitObjects)) != null)
+            {
+                distanceSnapGridContainer.Add(distanceSnapGrid);
+                distanceSnapGridCache.Validate();
+            }
+        }
+
+        private DistanceSnapGrid createDistanceSnapGrid(IEnumerable<HitObject> selectedHitObjects)
         {
             if (BlueprintContainer.CurrentTool is SpinnerCompositionTool)
                 return null;
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index b437d81054..fd8af0afd5 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -3,8 +3,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -52,8 +52,9 @@ namespace osu.Game.Rulesets.Edit
         protected ComposeBlueprintContainer BlueprintContainer { get; private set; }
 
         private DrawableEditRulesetWrapper<TObject> drawableRulesetWrapper;
-        private Container distanceSnapGridContainer;
-        private DistanceSnapGrid distanceSnapGrid;
+
+        protected readonly Container LayerBelowRuleset = new Container { RelativeSizeAxes = Axes.Both };
+
         private readonly List<Container> layerContainers = new List<Container>();
 
         private InputManager inputManager;
@@ -87,7 +88,7 @@ namespace osu.Game.Rulesets.Edit
 
             var layerBelowRuleset = drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
             {
-                distanceSnapGridContainer = new Container { RelativeSizeAxes = Axes.Both },
+                LayerBelowRuleset,
                 new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
             });
 
@@ -139,7 +140,7 @@ namespace osu.Game.Rulesets.Edit
 
             setSelectTool();
 
-            BlueprintContainer.SelectionChanged += selectionChanged;
+            EditorBeatmap.SelectedHitObjects.CollectionChanged += selectionChanged;
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
@@ -165,16 +166,6 @@ namespace osu.Game.Rulesets.Edit
             inputManager = GetContainingInputManager();
         }
 
-        private double lastGridUpdateTime;
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (EditorClock.CurrentTime != lastGridUpdateTime && !(BlueprintContainer.CurrentTool is SelectTool))
-                showGridFor(Enumerable.Empty<HitObject>());
-        }
-
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
@@ -188,19 +179,13 @@ namespace osu.Game.Rulesets.Edit
             });
         }
 
-        private void selectionChanged(IEnumerable<HitObject> selectedHitObjects)
+        private void selectionChanged(object sender, NotifyCollectionChangedEventArgs changedArgs)
         {
-            var hitObjects = selectedHitObjects.ToArray();
-
-            if (hitObjects.Any())
+            if (EditorBeatmap.SelectedHitObjects.Any())
             {
                 // ensure in selection mode if a selection is made.
                 setSelectTool();
-
-                showGridFor(hitObjects);
             }
-            else
-                distanceSnapGridContainer.Hide();
         }
 
         private void setSelectTool() => toolboxCollection.Items.First().Select();
@@ -209,30 +194,12 @@ namespace osu.Game.Rulesets.Edit
         {
             BlueprintContainer.CurrentTool = tool;
 
-            if (tool is SelectTool)
-                distanceSnapGridContainer.Hide();
-            else
-            {
+            if (!(tool is SelectTool))
                 EditorBeatmap.SelectedHitObjects.Clear();
-                showGridFor(Enumerable.Empty<HitObject>());
-            }
-        }
-
-        private void showGridFor(IEnumerable<HitObject> selectedHitObjects)
-        {
-            distanceSnapGridContainer.Clear();
-            distanceSnapGrid = CreateDistanceSnapGrid(selectedHitObjects);
-
-            if (distanceSnapGrid != null)
-            {
-                distanceSnapGridContainer.Child = distanceSnapGrid;
-                distanceSnapGridContainer.Show();
-            }
-
-            lastGridUpdateTime = EditorClock.CurrentTime;
         }
 
         public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
+
         public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(inputManager.CurrentState.Mouse.Position);
 
         protected abstract IReadOnlyList<HitObjectCompositionTool> CompositionTools { get; }
@@ -257,21 +224,11 @@ namespace osu.Game.Rulesets.Edit
                 if (adjustableClock.CurrentTime < hitObject.StartTime)
                     adjustableClock.Seek(hitObject.StartTime);
             }
-
-            showGridFor(Enumerable.Empty<HitObject>());
         }
 
         public void Delete(HitObject hitObject) => EditorBeatmap.Remove(hitObject);
 
-        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
-        {
-            if (distanceSnapGrid == null) return new SnapResult(screenSpacePosition, null);
-
-            // TODO: move distance snap grid to OsuHitObjectComposer.
-            (Vector2 pos, double time) = distanceSnapGrid.GetSnappedPosition(distanceSnapGrid.ToLocalSpace(screenSpacePosition));
-
-            return new SnapResult(distanceSnapGrid.ToScreenSpace(pos), time);
-        }
+        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) => new SnapResult(screenSpacePosition, null);
 
         public override float GetBeatSnapDistanceAt(double referenceTime)
         {
@@ -321,14 +278,6 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public abstract bool CursorInPlacementArea { get; }
 
-        /// <summary>
-        /// 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 point in time.</returns>
-        [CanBeNull]
-        protected virtual DistanceSnapGrid CreateDistanceSnapGrid([NotNull] IEnumerable<HitObject> selectedHitObjects) => null;
-
         public abstract SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
 
         public abstract float GetBeatSnapDistanceAt(double referenceTime);
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index e38df3d812..1e8a35c047 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.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.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
@@ -29,8 +28,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public abstract class BlueprintContainer : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
-        public event Action<IEnumerable<HitObject>> SelectionChanged;
-
         protected DragBox DragBox { get; private set; }
 
         protected Container<SelectionBlueprint> SelectionBlueprints { get; private set; }
@@ -88,8 +85,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                             SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
                         break;
                 }
-
-                SelectionChanged?.Invoke(selectedHitObjects);
             };
         }
 

From 700b5e0c73c75566a9b73267977111c819e6737c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 May 2020 17:47:14 +0900
Subject: [PATCH 02865/10326] Adjust design

---
 .../ContractedPanelMiddleContent.cs           | 30 ++++++-------------
 osu.Game/Screens/Ranking/ScorePanel.cs        |  6 ++--
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index 1d7d5c4130..a263a03a77 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -65,28 +65,16 @@ namespace osu.Game.Screens.Ranking.Contracted
                             },
                             Children = new Drawable[]
                             {
-                                // Buffered container is used to prevent 1px bleed outside the masking region
-                                new BufferedContainer
+                                new Box
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Children = new Drawable[]
-                                    {
-                                        new Box
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Colour = Color4Extensions.FromHex("444")
-                                        },
-                                        new UserCoverBackground
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            User = score.User,
-                                        },
-                                        new Box
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.5f), Color4Extensions.FromHex("#444"))
-                                        },
-                                    }
+                                    Colour = Color4Extensions.FromHex("444")
+                                },
+                                new UserCoverBackground
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    User = score.User,
+                                    Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0.5f), Color4Extensions.FromHex("#444").Opacity(0))
                                 },
                                 new FillFlowContainer
                                 {
@@ -100,7 +88,7 @@ namespace osu.Game.Screens.Ranking.Contracted
                                         {
                                             Anchor = Anchor.TopCentre,
                                             Origin = Anchor.TopCentre,
-                                            Size = new Vector2(140),
+                                            Size = new Vector2(110),
                                             Masking = true,
                                             CornerExponent = 2.5f,
                                             CornerRadius = 20,
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index baca2fd9e1..305d4ee921 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -23,12 +23,12 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Width of the panel when contracted.
         /// </summary>
-        public const float CONTRACTED_WIDTH = 160;
+        public const float CONTRACTED_WIDTH = 130;
 
         /// <summary>
         /// Height of the panel when contracted.
         /// </summary>
-        private const float contracted_height = 385;
+        private const float contracted_height = 355;
 
         /// <summary>
         /// Width of the panel when expanded.
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Height of the top layer when the panel is contracted.
         /// </summary>
-        private const float contracted_top_layer_height = 40;
+        private const float contracted_top_layer_height = 30;
 
         /// <summary>
         /// Duration for the panel to resize into its expanded/contracted size.

From b6a1d1a2fc5d9a1927b4994861b23c6f46f09fd4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 May 2020 18:07:31 +0900
Subject: [PATCH 02866/10326] Improve transforms between state changes

---
 osu.Game/Screens/Ranking/ScorePanel.cs     | 8 ++++----
 osu.Game/Screens/Ranking/ScorePanelList.cs | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 305d4ee921..2f6146a5e7 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -175,9 +175,6 @@ namespace osu.Game.Screens.Ranking
 
         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();
 
@@ -203,7 +200,10 @@ namespace osu.Game.Screens.Ranking
                     break;
             }
 
-            using (BeginDelayedSequence(resize_duration + top_layer_expand_delay, true))
+            bool topLayerExpanded = topLayerContainer.Y < 0;
+
+            // If the top layer was already expanded, then we don't need to wait for the resize and can instead transform immediately. This looks better when changing the panel state.
+            using (BeginDelayedSequence(topLayerExpanded ? 0 : resize_duration + top_layer_expand_delay, true))
             {
                 switch (state)
                 {
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index cc6842b2dd..894be7e775 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -68,6 +68,7 @@ namespace osu.Game.Screens.Ranking
 
             if (expandedPanel != null)
                 expandedPanel.State = PanelState.Contracted;
+
             expandedPanel = panel;
         }
 

From 9f868be872f0d55d9209536489008606f5dc171d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 May 2020 18:39:22 +0900
Subject: [PATCH 02867/10326] Create common TestScoreInfo type

---
 .../TestSceneContractedPanelMiddleContent.cs  | 32 +--------
 .../TestSceneExpandedPanelMiddleContent.cs    | 31 +--------
 .../TestSceneExpandedPanelTopContent.cs       |  4 +-
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 26 +-------
 .../Visual/Ranking/TestSceneScorePanel.cs     | 65 +++----------------
 .../Visual/Ranking/TestSceneScorePanelList.cs | 59 ++++-------------
 osu.Game/Tests/TestScoreInfo.cs               | 50 ++++++++++++++
 7 files changed, 80 insertions(+), 187 deletions(-)
 create mode 100644 osu.Game/Tests/TestScoreInfo.cs

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
index f7694c10ec..e1e00e3c2b 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -14,10 +13,7 @@ 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;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Ranking.Contracted;
@@ -37,7 +33,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             var author = new User { Username = "mapper_name" };
 
-            AddStep("show example score", () => showPanel(createTestBeatmap(author), createTestScore()));
+            AddStep("show example score", () => showPanel(createTestBeatmap(author), new TestScoreInfo(new OsuRuleset().RulesetInfo)));
 
             AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Text == "mapper_name"));
         }
@@ -45,7 +41,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestMapWithUnknownMapper()
         {
-            AddStep("show example score", () => showPanel(createTestBeatmap(null), createTestScore()));
+            AddStep("show example score", () => showPanel(createTestBeatmap(null), new TestScoreInfo(new OsuRuleset().RulesetInfo)));
 
             AddAssert("mapped by text not present", () =>
                 this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text, "mapped", "by")));
@@ -66,30 +62,6 @@ namespace osu.Game.Tests.Visual.Ranking
             return new TestWorkingBeatmap(beatmap);
         }
 
-        private ScoreInfo createTestScore() => new ScoreInfo
-        {
-            User = new User
-            {
-                Id = 2,
-                Username = "peppy",
-                CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
-            },
-            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 },
-            }
-        };
-
         private bool containsAny(string text, params string[] stringsToMatch) => stringsToMatch.Any(text.Contains);
 
         private class ContractedPanelMiddleContentContainer : Container
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 106b4187ee..69511b85c0 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -14,10 +13,7 @@ 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;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Ranking.Expanded;
@@ -37,7 +33,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             var author = new User { Username = "mapper_name" };
 
-            AddStep("show example score", () => showPanel(createTestBeatmap(author), createTestScore()));
+            AddStep("show example score", () => showPanel(createTestBeatmap(author), new TestScoreInfo(new OsuRuleset().RulesetInfo)));
 
             AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Text == "mapper_name"));
         }
@@ -45,7 +41,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestMapWithUnknownMapper()
         {
-            AddStep("show example score", () => showPanel(createTestBeatmap(null), createTestScore()));
+            AddStep("show example score", () => showPanel(createTestBeatmap(null), new TestScoreInfo(new OsuRuleset().RulesetInfo)));
 
             AddAssert("mapped by text not present", () =>
                 this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text, "mapped", "by")));
@@ -66,29 +62,6 @@ namespace osu.Game.Tests.Visual.Ranking
             return new TestWorkingBeatmap(beatmap);
         }
 
-        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 },
-            }
-        };
-
         private bool containsAny(string text, params string[] stringsToMatch) => stringsToMatch.Any(text.Contains);
 
         private class ExpandedPanelMiddleContentContainer : Container
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.cs
index afaa607099..a32bcbe7f0 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.cs
@@ -5,8 +5,8 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Ranking.Expanded;
-using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Ranking
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4Extensions.FromHex("#444"),
                     },
-                    new ExpandedPanelTopContent(new User { Id = 2, Username = "peppy" }),
+                    new ExpandedPanelTopContent(new TestScoreInfo(new OsuRuleset().RulesetInfo).User),
                 }
             };
         }
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index aa0ce89d93..242766ad4b 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.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;
@@ -11,13 +9,10 @@ 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.Tests.Beatmaps;
-using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
@@ -41,26 +36,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
         }
 
-        private TestSoloResults createResultsScreen() => new TestSoloResults(new ScoreInfo
-        {
-            TotalScore = 2845370,
-            Accuracy = 0.98,
-            MaxCombo = 123,
-            Rank = ScoreRank.A,
-            Date = DateTimeOffset.Now,
-            Statistics = new Dictionary<HitResult, int>
-            {
-                { HitResult.Great, 50 },
-                { HitResult.Good, 20 },
-                { HitResult.Meh, 50 },
-                { HitResult.Miss, 1 }
-            },
-            Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
-            User = new User
-            {
-                Username = "peppy",
-            }
-        });
+        private TestSoloResults createResultsScreen() => new TestSoloResults(new TestScoreInfo(new OsuRuleset().RulesetInfo));
 
         [Test]
         public void ResultsWithoutPlayer()
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
index 0dbafb18bc..fdb77c14a3 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -1,17 +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 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.Tests.Beatmaps;
-using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
@@ -20,9 +15,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestDRank()
         {
-            var score = createScore();
-            score.Accuracy = 0.5;
-            score.Rank = ScoreRank.D;
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Accuracy = 0.5, Rank = ScoreRank.D };
 
             addPanelStep(score);
         }
@@ -30,9 +23,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestCRank()
         {
-            var score = createScore();
-            score.Accuracy = 0.75;
-            score.Rank = ScoreRank.C;
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Accuracy = 0.75, Rank = ScoreRank.C };
 
             addPanelStep(score);
         }
@@ -40,9 +31,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestBRank()
         {
-            var score = createScore();
-            score.Accuracy = 0.85;
-            score.Rank = ScoreRank.B;
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Accuracy = 0.85, Rank = ScoreRank.B };
 
             addPanelStep(score);
         }
@@ -50,9 +39,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestARank()
         {
-            var score = createScore();
-            score.Accuracy = 0.925;
-            score.Rank = ScoreRank.A;
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Accuracy = 0.925, Rank = ScoreRank.A };
 
             addPanelStep(score);
         }
@@ -60,9 +47,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestSRank()
         {
-            var score = createScore();
-            score.Accuracy = 0.975;
-            score.Rank = ScoreRank.S;
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Accuracy = 0.975, Rank = ScoreRank.S };
 
             addPanelStep(score);
         }
@@ -70,9 +55,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestAlmostSSRank()
         {
-            var score = createScore();
-            score.Accuracy = 0.9999;
-            score.Rank = ScoreRank.S;
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Accuracy = 0.9999, Rank = ScoreRank.S };
 
             addPanelStep(score);
         }
@@ -80,9 +63,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestSSRank()
         {
-            var score = createScore();
-            score.Accuracy = 1;
-            score.Rank = ScoreRank.X;
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Accuracy = 1, Rank = ScoreRank.X };
 
             addPanelStep(score);
         }
@@ -90,9 +71,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestAllHitResults()
         {
-            var score = createScore();
-            score.Statistics[HitResult.Perfect] = 350;
-            score.Statistics[HitResult.Ok] = 200;
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Statistics = { [HitResult.Perfect] = 350, [HitResult.Ok] = 200 } };
 
             addPanelStep(score);
         }
@@ -100,9 +79,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestContractedPanel()
         {
-            var score = createScore();
-            score.Accuracy = 0.925;
-            score.Rank = ScoreRank.A;
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Accuracy = 0.925, Rank = ScoreRank.A };
 
             addPanelStep(score, PanelState.Contracted);
         }
@@ -116,29 +93,5 @@ namespace osu.Game.Tests.Visual.Ranking
                 State = state
             };
         });
-
-        private ScoreInfo createScore() => new ScoreInfo
-        {
-            User = new User
-            {
-                Id = 2,
-                Username = "peppy",
-                CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
-            },
-            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.Tests/Visual/Ranking/TestSceneScorePanelList.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
index 4964af8784..81a9b22992 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
@@ -1,16 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.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.Tests.Beatmaps;
-using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
@@ -26,44 +19,20 @@ namespace osu.Game.Tests.Visual.Ranking
 
             Add(list);
 
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
-            list.AddScore(createScore());
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
         }
-
-        private ScoreInfo createScore() => new ScoreInfo
-        {
-            User = new User
-            {
-                Id = 2,
-                Username = "peppy",
-                CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
-            },
-            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/Tests/TestScoreInfo.cs b/osu.Game/Tests/TestScoreInfo.cs
new file mode 100644
index 0000000000..155129e181
--- /dev/null
+++ b/osu.Game/Tests/TestScoreInfo.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 System;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Users;
+
+namespace osu.Game.Tests
+{
+    public class TestScoreInfo : ScoreInfo
+    {
+        public TestScoreInfo(RulesetInfo ruleset)
+        {
+            User = new User
+            {
+                Id = 2,
+                Username = "peppy",
+                CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+            };
+
+            Beatmap = new TestBeatmap(ruleset).BeatmapInfo;
+            Mods = new Mod[] { new TestModHardRock(), new TestModDoubleTime() };
+
+            TotalScore = 2845370;
+            Accuracy = 0.95;
+            MaxCombo = 999;
+            Rank = ScoreRank.S;
+            Date = DateTimeOffset.Now;
+
+            Statistics[HitResult.Miss] = 1;
+            Statistics[HitResult.Meh] = 50;
+            Statistics[HitResult.Good] = 100;
+            Statistics[HitResult.Great] = 300;
+        }
+
+        private class TestModHardRock : ModHardRock
+        {
+            public override double ScoreMultiplier => 1;
+        }
+
+        private class TestModDoubleTime : ModDoubleTime
+        {
+            public override double ScoreMultiplier => 1;
+        }
+    }
+}

From 45b59f574dcd09ba389adc85ec2619a177f92e5e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 May 2020 18:43:12 +0900
Subject: [PATCH 02868/10326] Fix TestSceneResultsScreen crashing

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

diff --git a/osu.Game/Tests/TestScoreInfo.cs b/osu.Game/Tests/TestScoreInfo.cs
index 155129e181..1193a29d70 100644
--- a/osu.Game/Tests/TestScoreInfo.cs
+++ b/osu.Game/Tests/TestScoreInfo.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Tests
             };
 
             Beatmap = new TestBeatmap(ruleset).BeatmapInfo;
+            Ruleset = ruleset;
+            RulesetID = ruleset.ID ?? 0;
             Mods = new Mod[] { new TestModHardRock(), new TestModDoubleTime() };
 
             TotalScore = 2845370;

From 717869225e55f0ff2a6cd27d9f797ffb9f62b868 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 May 2020 19:51:36 +0900
Subject: [PATCH 02869/10326] Rework list to use a scroll container + add
 spacing

---
 osu.Game/Screens/Ranking/ScorePanelList.cs | 60 ++++++++++++++--------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 894be7e775..52a9f27db8 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -1,12 +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.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Utils;
+using osu.Game.Graphics.Containers;
 using osu.Game.Scoring;
 using osuTK;
 
@@ -14,19 +13,36 @@ namespace osu.Game.Screens.Ranking
 {
     public class ScorePanelList : CompositeDrawable
     {
-        private readonly Flow panels;
+        /// <summary>
+        /// Normal spacing between all panels.
+        /// </summary>
+        private const float panel_spacing = 5;
+
+        /// <summary>
+        /// Spacing around both sides of the expanded panel. This is added on top of <see cref="panel_spacing"/>.
+        /// </summary>
+        private const float expanded_panel_spacing = 15;
+
+        private readonly Flow flow;
+        private readonly ScrollContainer<Drawable> scroll;
+
         private ScorePanel expandedPanel;
 
         public ScorePanelList()
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChild = panels = new Flow
+            InternalChild = scroll = new OsuScrollContainer(Direction.Horizontal)
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Custom,
-                Direction = FillDirection.Horizontal,
-                AutoSizeAxes = Axes.Both,
+                RelativeSizeAxes = Axes.Both,
+                Child = flow = new Flow
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(panel_spacing, 0),
+                    AutoSizeAxes = Axes.Both,
+                }
             };
         }
 
@@ -34,8 +50,8 @@ namespace osu.Game.Screens.Ranking
         {
             var panel = new ScorePanel(score)
             {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
             };
 
             panel.StateChanged += s => onPanelStateChanged(panel, s);
@@ -43,22 +59,14 @@ namespace osu.Game.Screens.Ranking
             // Todo: Temporary
             panel.State = expandedPanel == null ? PanelState.Expanded : PanelState.Contracted;
 
-            panels.Add(panel);
+            flow.Add(panel);
         }
 
-        public void RemoveScore(ScoreInfo score) => panels.RemoveAll(p => p.Score == score);
-
-        protected override void UpdateAfterChildren()
+        protected override void Update()
         {
-            base.UpdateAfterChildren();
+            base.Update();
 
-            if (expandedPanel != null)
-            {
-                var firstPanel = panels.FlowingChildren.First();
-                var target = expandedPanel.DrawPosition.X - firstPanel.DrawPosition.X + expandedPanel.DrawSize.X / 2;
-
-                panels.OriginPosition = new Vector2((float)Interpolation.Lerp(panels.OriginPosition.X, target, Math.Clamp(Math.Abs(Time.Elapsed) / 80, 0, 1)), panels.DrawHeight / 2);
-            }
+            flow.Padding = new MarginPadding { Horizontal = DrawWidth / 2f - ScorePanel.EXPANDED_WIDTH / 2f - expanded_panel_spacing };
         }
 
         private void onPanelStateChanged(ScorePanel panel, PanelState state)
@@ -67,9 +75,17 @@ namespace osu.Game.Screens.Ranking
                 return;
 
             if (expandedPanel != null)
+            {
+                expandedPanel.Margin = new MarginPadding(0);
                 expandedPanel.State = PanelState.Contracted;
+            }
 
             expandedPanel = panel;
+            expandedPanel.Margin = new MarginPadding { Horizontal = expanded_panel_spacing };
+
+            float panelOffset = flow.IndexOf(expandedPanel) * (ScorePanel.CONTRACTED_WIDTH + panel_spacing);
+
+            scroll.ScrollTo(panelOffset);
         }
 
         private class Flow : FillFlowContainer<ScorePanel>

From 7b82a5d792d4fae9103bff89de4db4e81a8e5063 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 May 2020 20:48:08 +0900
Subject: [PATCH 02870/10326] Fix score order

---
 osu.Game/Screens/Ranking/ScorePanelList.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 52a9f27db8..0e0ed4f60d 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -90,8 +90,7 @@ namespace osu.Game.Screens.Ranking
 
         private class Flow : FillFlowContainer<ScorePanel>
         {
-            // Todo: Order is wrong.
-            public override IEnumerable<Drawable> FlowingChildren => AliveInternalChildren.OfType<ScorePanel>().OrderBy(s => s.Score.TotalScore);
+            public override IEnumerable<Drawable> FlowingChildren => AliveInternalChildren.OfType<ScorePanel>().OrderByDescending(s => s.Score.TotalScore).ThenByDescending(s => s.Score.OnlineScoreID);
         }
     }
 }

From d0f74c2b683e949ba780c7d6e8011a184b5468d6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 May 2020 20:48:25 +0900
Subject: [PATCH 02871/10326] Refactor initial state

---
 .../Visual/Ranking/TestSceneScorePanelList.cs | 47 ++++++++++------
 osu.Game/Screens/Ranking/ResultsScreen.cs     |  4 +-
 osu.Game/Screens/Ranking/ScorePanelList.cs    | 54 +++++++++----------
 3 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
index 81a9b22992..f00bf7e151 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
@@ -1,38 +1,51 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Ranking;
+using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneScorePanelList : OsuTestScene
     {
-        public TestSceneScorePanelList()
+        private ScorePanelList list;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
-            var list = new ScorePanelList
+            Child = list = new ScorePanelList(new TestScoreInfo(new OsuRuleset().RulesetInfo))
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
 
-            Add(list);
+            Add(new Box
+            {
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                RelativeSizeAxes = Axes.Y,
+                Width = 1,
+                Colour = Color4.Red
+            });
+        });
 
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+        [Test]
+        public void TestSingleScore()
+        {
+        }
+
+        [Test]
+        public void TestManyScores()
+        {
+            AddStep("add many scores", () =>
+            {
+                for (int i = 0; i < 20; i++)
+                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 652d158fbb..cdceaa939e 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Ranking
             {
                 new ResultsScrollContainer
                 {
-                    Child = panels = new ScorePanelList
+                    Child = panels = new ScorePanelList(Score)
                     {
                         RelativeSizeAxes = Axes.Both,
                     }
@@ -98,8 +98,6 @@ namespace osu.Game.Screens.Ranking
                 }
             };
 
-            panels.AddScore(Score);
-
             if (player != null && allowRetry)
             {
                 buttons.Add(new RetryButton { Width = 300 });
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 0e0ed4f60d..c2fd487767 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Ranking
 
         private ScorePanel expandedPanel;
 
-        public ScorePanelList()
+        public ScorePanelList(ScoreInfo initialScore)
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -44,48 +44,48 @@ namespace osu.Game.Screens.Ranking
                     AutoSizeAxes = Axes.Both,
                 }
             };
+
+            AddScore(initialScore);
+            ShowScore(initialScore);
         }
 
         public void AddScore(ScoreInfo score)
         {
-            var panel = new ScorePanel(score)
+            flow.Add(new ScorePanel(score)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-            };
+            }.With(p =>
+            {
+                p.StateChanged += s =>
+                {
+                    if (s == PanelState.Expanded)
+                        ShowScore(score);
+                };
+            }));
+        }
 
-            panel.StateChanged += s => onPanelStateChanged(panel, s);
+        public void ShowScore(ScoreInfo score)
+        {
+            foreach (var p in flow.Where(p => p.Score != score))
+                p.State = PanelState.Contracted;
 
-            // Todo: Temporary
-            panel.State = expandedPanel == null ? PanelState.Expanded : PanelState.Contracted;
+            if (expandedPanel != null)
+                expandedPanel.Margin = new MarginPadding(0);
 
-            flow.Add(panel);
+            expandedPanel = flow.Single(p => p.Score == score);
+            expandedPanel.State = PanelState.Expanded;
+            expandedPanel.Margin = new MarginPadding { Horizontal = expanded_panel_spacing };
+
+            float scrollOffset = flow.IndexOf(expandedPanel) * (ScorePanel.CONTRACTED_WIDTH + panel_spacing);
+            scroll.ScrollTo(scrollOffset);
         }
 
         protected override void Update()
         {
             base.Update();
 
-            flow.Padding = new MarginPadding { Horizontal = DrawWidth / 2f - ScorePanel.EXPANDED_WIDTH / 2f - expanded_panel_spacing };
-        }
-
-        private void onPanelStateChanged(ScorePanel panel, PanelState state)
-        {
-            if (state == PanelState.Contracted)
-                return;
-
-            if (expandedPanel != null)
-            {
-                expandedPanel.Margin = new MarginPadding(0);
-                expandedPanel.State = PanelState.Contracted;
-            }
-
-            expandedPanel = panel;
-            expandedPanel.Margin = new MarginPadding { Horizontal = expanded_panel_spacing };
-
-            float panelOffset = flow.IndexOf(expandedPanel) * (ScorePanel.CONTRACTED_WIDTH + panel_spacing);
-
-            scroll.ScrollTo(panelOffset);
+            flow.Padding = new MarginPadding { Horizontal = DrawWidth / 2f - expandedPanel.DrawWidth / 2f - expanded_panel_spacing };
         }
 
         private class Flow : FillFlowContainer<ScorePanel>

From 45244683de150597b66234e5ee78b78c0f718189 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 May 2020 22:07:06 +0900
Subject: [PATCH 02872/10326] Fix scrolling (1-frame + maintain scroll
 position)

---
 .../Visual/Ranking/TestSceneScorePanelList.cs | 49 +++++++++++-
 osu.Game/Screens/Ranking/ScorePanel.cs        | 71 +++++++++-------
 osu.Game/Screens/Ranking/ScorePanelList.cs    | 80 ++++++++++++++++---
 3 files changed, 154 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
index f00bf7e151..89aef377c8 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
@@ -1,10 +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;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 using osuTK.Graphics;
 
@@ -12,12 +16,13 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneScorePanelList : OsuTestScene
     {
+        private ScoreInfo initialScore;
         private ScorePanelList list;
 
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Child = list = new ScorePanelList(new TestScoreInfo(new OsuRuleset().RulesetInfo))
+            Child = list = new ScorePanelList(initialScore = new TestScoreInfo(new OsuRuleset().RulesetInfo))
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -36,16 +41,52 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestSingleScore()
         {
+            assertPanelCentred();
         }
 
         [Test]
-        public void TestManyScores()
+        public void TestAddManyScoresAfter()
         {
-            AddStep("add many scores", () =>
+            AddStep("add scores", () =>
             {
                 for (int i = 0; i < 20; i++)
-                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo) { TotalScore = initialScore.TotalScore - i - 1 });
             });
+
+            assertPanelCentred();
         }
+
+        [Test]
+        public void TestAddManyScoresBefore()
+        {
+            AddStep("add scores", () =>
+            {
+                for (int i = 0; i < 20; i++)
+                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo) { TotalScore = initialScore.TotalScore + i + 1 });
+            });
+
+            assertPanelCentred();
+        }
+
+        [Test]
+        public void TestAddManyPanelsOnBothSides()
+        {
+            AddStep("add scores after", () =>
+            {
+                for (int i = 0; i < 20; i++)
+                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo) { TotalScore = initialScore.TotalScore - i - 1 });
+
+                for (int i = 0; i < 20; i++)
+                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo) { TotalScore = initialScore.TotalScore + i + 1 });
+            });
+
+            assertPanelCentred();
+        }
+
+        private void assertPanelCentred() => AddUntilStep("expanded panel centred", () =>
+        {
+            var expandedPanel = list.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+            return Precision.AlmostEquals(expandedPanel.ScreenSpaceDrawQuad.Centre.X, list.ScreenSpaceDrawQuad.Centre.X, 1);
+        });
     }
 }
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 2f6146a5e7..2933bbddd1 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -78,6 +78,8 @@ namespace osu.Game.Screens.Ranking
         public event Action<PanelState> StateChanged;
         public readonly ScoreInfo Score;
 
+        private Container content;
+
         private Container topLayerContainer;
         private Drawable topLayerBackground;
         private Container topLayerContentContainer;
@@ -96,41 +98,46 @@ namespace osu.Game.Screens.Ranking
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            InternalChild = content = new Container
             {
-                topLayerContainer = new Container
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new Drawable[]
                 {
-                    Name = "Top layer",
-                    RelativeSizeAxes = Axes.X,
-                    Height = 120,
-                    Children = new Drawable[]
+                    topLayerContainer = new Container
                     {
-                        new Container
+                        Name = "Top layer",
+                        RelativeSizeAxes = Axes.X,
+                        Height = 120,
+                        Children = new Drawable[]
                         {
-                            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 = topLayerBackground = new Box { RelativeSizeAxes = Axes.Both }
+                            },
+                            topLayerContentContainer = new Container { RelativeSizeAxes = Axes.Both }
+                        }
+                    },
+                    middleLayerContainer = new Container
                     {
-                        new Container
+                        Name = "Middle layer",
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            CornerRadius = 20,
-                            CornerExponent = 2.5f,
-                            Masking = true,
-                            Child = middleLayerBackground = new Box { RelativeSizeAxes = Axes.Both }
-                        },
-                        middleLayerContentContainer = new Container { RelativeSizeAxes = Axes.Both }
+                            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 }
+                        }
                     }
                 }
             };
@@ -181,7 +188,7 @@ namespace osu.Game.Screens.Ranking
             switch (state)
             {
                 case PanelState.Expanded:
-                    this.ResizeTo(new Vector2(EXPANDED_WIDTH, expanded_height), resize_duration, Easing.OutQuint);
+                    Size = new Vector2(EXPANDED_WIDTH, expanded_height);
 
                     topLayerBackground.FadeColour(expanded_top_layer_colour, resize_duration, Easing.OutQuint);
                     middleLayerBackground.FadeColour(expanded_middle_layer_colour, resize_duration, Easing.OutQuint);
@@ -191,7 +198,7 @@ namespace osu.Game.Screens.Ranking
                     break;
 
                 case PanelState.Contracted:
-                    this.ResizeTo(new Vector2(CONTRACTED_WIDTH, contracted_height), resize_duration, Easing.OutQuint);
+                    Size = new Vector2(CONTRACTED_WIDTH, contracted_height);
 
                     topLayerBackground.FadeColour(contracted_top_layer_colour, resize_duration, Easing.OutQuint);
                     middleLayerBackground.FadeColour(contracted_middle_layer_colour, resize_duration, Easing.OutQuint);
@@ -200,6 +207,8 @@ namespace osu.Game.Screens.Ranking
                     break;
             }
 
+            content.ResizeTo(Size, resize_duration, Easing.OutQuint);
+
             bool topLayerExpanded = topLayerContainer.Y < 0;
 
             // If the top layer was already expanded, then we don't need to wait for the resize and can instead transform immediately. This looks better when changing the panel state.
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index c2fd487767..6dd21ec49d 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Ranking
         private const float expanded_panel_spacing = 15;
 
         private readonly Flow flow;
-        private readonly ScrollContainer<Drawable> scroll;
+        private readonly Scroll scroll;
 
         private ScorePanel expandedPanel;
 
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Ranking
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChild = scroll = new OsuScrollContainer(Direction.Horizontal)
+            InternalChild = scroll = new Scroll
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = flow = new Flow
@@ -46,9 +46,13 @@ namespace osu.Game.Screens.Ranking
             };
 
             AddScore(initialScore);
-            ShowScore(initialScore);
+            presentScore(initialScore);
         }
 
+        /// <summary>
+        /// Adds a <see cref="ScoreInfo"/> to this list.
+        /// </summary>
+        /// <param name="score">The <see cref="ScoreInfo"/> to add.</param>
         public void AddScore(ScoreInfo score)
         {
             flow.Add(new ScorePanel(score)
@@ -60,24 +64,45 @@ namespace osu.Game.Screens.Ranking
                 p.StateChanged += s =>
                 {
                     if (s == PanelState.Expanded)
-                        ShowScore(score);
+                        presentScore(score);
                 };
             }));
+
+            // We want the scroll position to remain relative to the expanded panel. When a new panel is added after the expanded panel, nothing needs to be done.
+            // But when a panel is added before the expanded panel, we need to offset the scroll position by the width of the new panel.
+            if (expandedPanel != null && flow.GetPanelIndex(score) < flow.GetPanelIndex(expandedPanel.Score))
+            {
+                // A somewhat hacky property is used here because we need to:
+                // 1) Scroll after the scroll container's visible range is updated.
+                // 2) Scroll before the scroll container's scroll position is updated.
+                // Without this, we would have a 1-frame positioning error which looks very jarring.
+                scroll.InstantScrollTarget = (scroll.InstantScrollTarget ?? scroll.Target) + ScorePanel.CONTRACTED_WIDTH + panel_spacing;
+            }
         }
 
-        public void ShowScore(ScoreInfo score)
+        /// <summary>
+        /// Brings a <see cref="ScoreInfo"/> to the centre of the screen and expands it.
+        /// </summary>
+        /// <param name="score">The <see cref="ScoreInfo"/> to present.</param>
+        private void presentScore(ScoreInfo score)
         {
+            // Contract the old panel.
             foreach (var p in flow.Where(p => p.Score != score))
+            {
                 p.State = PanelState.Contracted;
+                p.Margin = new MarginPadding();
+            }
 
-            if (expandedPanel != null)
-                expandedPanel.Margin = new MarginPadding(0);
-
+            // Expand the new panel.
             expandedPanel = flow.Single(p => p.Score == score);
             expandedPanel.State = PanelState.Expanded;
             expandedPanel.Margin = new MarginPadding { Horizontal = expanded_panel_spacing };
 
-            float scrollOffset = flow.IndexOf(expandedPanel) * (ScorePanel.CONTRACTED_WIDTH + panel_spacing);
+            // Scroll to the new panel. This is done manually since we need:
+            // 1) To scroll after the scroll container's visible range is updated.
+            // 2) To account for the centre anchor/origins of panels.
+            // In the end, it's easier to compute the scroll position manually.
+            float scrollOffset = flow.GetPanelIndex(expandedPanel.Score) * (ScorePanel.CONTRACTED_WIDTH + panel_spacing);
             scroll.ScrollTo(scrollOffset);
         }
 
@@ -85,12 +110,45 @@ namespace osu.Game.Screens.Ranking
         {
             base.Update();
 
-            flow.Padding = new MarginPadding { Horizontal = DrawWidth / 2f - expandedPanel.DrawWidth / 2f - expanded_panel_spacing };
+            // Add padding to both sides such that the centre of an expanded panel on either side is in the middle of the screen.
+            flow.Padding = new MarginPadding { Horizontal = DrawWidth / 2f - ScorePanel.EXPANDED_WIDTH / 2f - expanded_panel_spacing };
         }
 
         private class Flow : FillFlowContainer<ScorePanel>
         {
-            public override IEnumerable<Drawable> FlowingChildren => AliveInternalChildren.OfType<ScorePanel>().OrderByDescending(s => s.Score.TotalScore).ThenByDescending(s => s.Score.OnlineScoreID);
+            public override IEnumerable<Drawable> FlowingChildren => applySorting(AliveInternalChildren);
+
+            public int GetPanelIndex(ScoreInfo score) => applySorting(Children).OfType<ScorePanel>().TakeWhile(s => s.Score != score).Count();
+
+            private IEnumerable<Drawable> applySorting(IEnumerable<Drawable> drawables) => drawables.OfType<ScorePanel>()
+                                                                                                    .OrderByDescending(s => s.Score.TotalScore)
+                                                                                                    .ThenByDescending(s => s.Score.OnlineScoreID);
+        }
+
+        private class Scroll : OsuScrollContainer
+        {
+            public new float Target => base.Target;
+
+            public Scroll()
+                : base(Direction.Horizontal)
+            {
+            }
+
+            /// <summary>
+            /// The target that will be scrolled to instantaneously next frame.
+            /// </summary>
+            public float? InstantScrollTarget;
+
+            protected override void UpdateAfterChildren()
+            {
+                if (InstantScrollTarget != null)
+                {
+                    ScrollTo(InstantScrollTarget.Value, false);
+                    InstantScrollTarget = null;
+                }
+
+                base.UpdateAfterChildren();
+            }
         }
     }
 }

From f5c80ac2d5c654794219db95fb5e2c8d48b5a7ce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 May 2020 22:07:24 +0900
Subject: [PATCH 02873/10326] Remove vertical line

---
 .../Visual/Ranking/TestSceneScorePanelList.cs         | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
index 89aef377c8..b32b3afbda 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
@@ -4,13 +4,11 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
-using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
@@ -27,15 +25,6 @@ namespace osu.Game.Tests.Visual.Ranking
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
-
-            Add(new Box
-            {
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-                RelativeSizeAxes = Axes.Y,
-                Width = 1,
-                Colour = Color4.Red
-            });
         });
 
         [Test]

From 899b9f8060928a5ed60984bc5eb073314ab63692 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 May 2020 22:26:04 +0900
Subject: [PATCH 02874/10326] Fix incorrect sorting order

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

diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 6dd21ec49d..ed6d07d078 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Screens.Ranking
 
             private IEnumerable<Drawable> applySorting(IEnumerable<Drawable> drawables) => drawables.OfType<ScorePanel>()
                                                                                                     .OrderByDescending(s => s.Score.TotalScore)
-                                                                                                    .ThenByDescending(s => s.Score.OnlineScoreID);
+                                                                                                    .ThenBy(s => s.Score.OnlineScoreID);
         }
 
         private class Scroll : OsuScrollContainer

From 8702a1b5a57ba9a70657b244eaec33797727caf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 May 2020 20:10:51 +0200
Subject: [PATCH 02875/10326] Fix test scene regression

---
 .../Visual/Gameplay/TestSceneScrollingHitObjects.cs          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
index 0d15e495e3..20b040dbc3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
@@ -16,6 +16,7 @@ using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Timing;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
@@ -221,7 +222,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 HitObject { StartTime = time, HitWindows = HitWindows.Empty })
             {
                 Origin = Anchor.Centre;
 
@@ -252,7 +253,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private class TestDrawableHitObject : DrawableHitObject<HitObject>
         {
             public TestDrawableHitObject(double time)
-                : base(new HitObject { StartTime = time })
+                : base(new HitObject { StartTime = time, HitWindows = HitWindows.Empty })
             {
                 Origin = Anchor.Custom;
                 OriginPosition = new Vector2(75 / 4.0f);

From 24d898c87031a62b21c98812e0ff2939392f7d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 May 2020 21:35:12 +0200
Subject: [PATCH 02876/10326] Demonstrate failure case in visual test scene

---
 .../Gameplay/TestSceneScrollingHitObjects.cs  | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
index 20b040dbc3..2f15e549f7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
@@ -78,19 +78,18 @@ namespace osu.Game.Tests.Visual.Gameplay
                 }
             };
 
-            setUpHitObjects();
+            hitObjectSpawnDelegate?.Cancel();
         });
 
-        private void setUpHitObjects()
+        private void setUpHitObjects() => AddStep("set up hit objects", () =>
         {
             scrollContainers.ForEach(c => c.ControlPoints.Add(new MultiplierControlPoint(0)));
 
             for (int i = spawn_rate / 2; i <= time_range; i += spawn_rate)
                 addHitObject(Time.Current + i);
 
-            hitObjectSpawnDelegate?.Cancel();
             hitObjectSpawnDelegate = Scheduler.AddDelayed(() => addHitObject(Time.Current + time_range), spawn_rate, true);
-        }
+        });
 
         private IList<MultiplierControlPoint> testControlPoints => new List<MultiplierControlPoint>
         {
@@ -102,6 +101,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestScrollAlgorithms()
         {
+            setUpHitObjects();
+
             AddStep("constant scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Constant));
             AddStep("overlapping scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Overlapping));
             AddStep("sequential scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Sequential));
@@ -114,6 +115,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestConstantScrollLifetime()
         {
+            setUpHitObjects();
+
             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
@@ -123,14 +126,40 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestSequentialScrollLifetime()
         {
+            setUpHitObjects();
+
             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 TestSlowSequentialScroll()
+        {
+            AddStep("set sequential scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Sequential));
+            AddStep("set time range", () => scrollContainers.ForEach(c => c.TimeRange = time_range));
+            AddStep("add control points", () => addControlPoints(
+                new List<MultiplierControlPoint>
+                {
+                    new MultiplierControlPoint { Velocity = 0.1 }
+                },
+                Time.Current + time_range));
+
+            // All of the hit objects added below should be immediately visible on screen
+            AddStep("add hit objects", () =>
+            {
+                for (int i = 0; i < 20; ++i)
+                {
+                    addHitObject(Time.Current + time_range * (2 + 0.1 * i));
+                }
+            });
+        }
+
         [Test]
         public void TestOverlappingScrollLifetime()
         {
+            setUpHitObjects();
+
             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));

From 4299bd05b4ca268e192a4f4d469f69bed4c6415b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 May 2020 21:39:15 +0200
Subject: [PATCH 02877/10326] Add test cases for sequential scroll algorithm

---
 .../ScrollAlgorithms/SequentialScrollTest.cs   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/ScrollAlgorithms/SequentialScrollTest.cs b/osu.Game.Tests/ScrollAlgorithms/SequentialScrollTest.cs
index 1f0c069f8d..bd578dcbc4 100644
--- a/osu.Game.Tests/ScrollAlgorithms/SequentialScrollTest.cs
+++ b/osu.Game.Tests/ScrollAlgorithms/SequentialScrollTest.cs
@@ -29,8 +29,22 @@ namespace osu.Game.Tests.ScrollAlgorithms
         [Test]
         public void TestDisplayStartTime()
         {
-            // Sequential scroll algorithm approximates the start time
-            // This should be fixed in the future
+            // easy cases - time range adjusted for velocity fits within control point duration
+            Assert.AreEqual(2500, algorithm.GetDisplayStartTime(5000, 0, 2500, 1)); // 5000 - (2500 / 1)
+            Assert.AreEqual(13750, algorithm.GetDisplayStartTime(15000, 0, 2500, 1)); // 15000 - (2500 / 2)
+            Assert.AreEqual(20000, algorithm.GetDisplayStartTime(25000, 0, 2500, 1)); // 25000 - (2500 / 0.5)
+
+            // hard case - time range adjusted for velocity exceeds control point duration
+
+            // 1st multiplier point takes 10000 / 2500 = 4 scroll lengths
+            // 2nd multiplier point takes 10000 / (2500 / 2) = 8 scroll lengths
+            // 3rd multiplier point takes 2500 / (2500 * 2) = 0.5 scroll lengths up to hitobject start
+
+            // absolute position of the hitobject = 1000 * (4 + 8 + 0.5) = 12500
+            // minus one scroll length allowance = 12500 - 1000 = 11500 = 11.5 [scroll lengths]
+            // therefore the start time lies within the second multiplier point (because 11.5 < 4 + 8)
+            // its exact time position is = 10000 + 7.5 * (2500 / 2) = 19375
+            Assert.AreEqual(19375, algorithm.GetDisplayStartTime(22500, 0, 2500, 1000));
         }
 
         [Test]

From 6f388b731ee97aedebc375370b429539cf8946d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 May 2020 21:41:56 +0200
Subject: [PATCH 02878/10326] Fix display start time in sequential scroll
 algorithm

---
 .../UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs b/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs
index 41f9ebdb82..0052c877f6 100644
--- a/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs
@@ -22,8 +22,7 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
 
         public double GetDisplayStartTime(double originTime, float offset, double timeRange, float scrollLength)
         {
-            double adjustedTime = TimeAt(-offset, originTime, timeRange, scrollLength);
-            return adjustedTime - timeRange - 1000;
+            return TimeAt(-(scrollLength + offset), originTime, timeRange, scrollLength);
         }
 
         public float GetLength(double startTime, double endTime, double timeRange, float scrollLength)

From 8a105bdbcfc554f4bd62217782d01632722a047a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 11:19:57 +0900
Subject: [PATCH 02879/10326] Remove unused ColumnAt method

---
 osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs | 2 --
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs  | 9 +--------
 osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs   | 2 +-
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs      | 8 --------
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
index 48e6b63064..5d9ad21cb7 100644
--- a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
@@ -8,8 +8,6 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public interface IManiaHitObjectComposer
     {
-        Column ColumnAt(Vector2 screenSpacePosition);
-
         ManiaPlayfield Playfield { get; }
 
         Vector2 ScreenSpacePositionAtTime(double time, Column column = null);
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 4795bdd8e2..d4cfab840d 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -44,13 +44,6 @@ namespace osu.Game.Rulesets.Mania.Edit
             inputManager = GetContainingInputManager();
         }
 
-        /// <summary>
-        /// Retrieves the column that intersects a screen-space position.
-        /// </summary>
-        /// <param name="screenSpacePosition">The screen-space position.</param>
-        /// <returns>The column which intersects with <paramref name="screenSpacePosition"/>.</returns>
-        public Column ColumnAt(Vector2 screenSpacePosition) => drawableRuleset.GetColumnByPosition(screenSpacePosition);
-
         private DependencyContainer dependencies;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -85,7 +78,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
         {
-            var column = ColumnAt(screenSpacePosition);
+            var column = Playfield.GetColumnByPosition(screenSpacePosition);
 
             if (column == null)
                 return new SnapResult(screenSpacePosition, null);
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 83049ff959..4ea71652bc 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         private void performColumnMovement(int lastColumn, MoveSelectionEvent moveEvent)
         {
-            var currentColumn = composer.ColumnAt(moveEvent.ScreenSpacePosition);
+            var currentColumn = composer.Playfield.GetColumnByPosition(moveEvent.ScreenSpacePosition);
             if (currentColumn == null)
                 return;
 
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index f3f843f366..94b5ee9486 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -23,7 +23,6 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -108,13 +107,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private void updateTimeRange() => TimeRange.Value = configTimeRange.Value * speedAdjustmentTrack.AggregateTempo.Value * speedAdjustmentTrack.AggregateFrequency.Value;
 
-        /// <summary>
-        /// Retrieves the column that intersects a screen-space position.
-        /// </summary>
-        /// <param name="screenSpacePosition">The screen-space position.</param>
-        /// <returns>The column which intersects with <paramref name="screenSpacePosition"/>.</returns>
-        public Column GetColumnByPosition(Vector2 screenSpacePosition) => Playfield.GetColumnByPosition(screenSpacePosition);
-
         public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new ManiaPlayfieldAdjustmentContainer();
 
         protected override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages);

From 9a2889abc54d2c5217bb5adbbd591be7c8dc7d97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 11:32:35 +0900
Subject: [PATCH 02880/10326] Remove remaining left-over test implementations

---
 .../ManiaPlacementBlueprintTestScene.cs                  | 3 ---
 .../ManiaSelectionBlueprintTestScene.cs                  | 9 +--------
 .../TestSceneManiaBeatSnapGrid.cs                        | 5 -----
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
index 9a50802454..fd18907d96 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -57,7 +56,5 @@ namespace osu.Game.Rulesets.Mania.Tests
         protected override void AddHitObject(DrawableHitObject hitObject) => column.Add((DrawableManiaHitObject)hitObject);
 
         public ManiaPlayfield Playfield => null;
-
-        public Vector2 ScreenSpacePositionAtTime(double time, Column column = null) => Vector2.Zero;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
index f7dffbbc1a..35fe596e98 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
@@ -7,7 +7,6 @@ using osu.Framework.Timing;
 using osu.Game.Rulesets.Mania.Edit;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -18,11 +17,9 @@ namespace osu.Game.Rulesets.Mania.Tests
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
-        private readonly Column column;
-
         protected ManiaSelectionBlueprintTestScene()
         {
-            Add(column = new Column(0)
+            Add(new Column(0)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -31,10 +28,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
         }
 
-        public Column ColumnAt(Vector2 screenSpacePosition) => column;
-
         public ManiaPlayfield Playfield => null;
-
-        public Vector2 ScreenSpacePositionAtTime(double time, Column column = null) => Vector2.Zero;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
index feda3cfb81..ce9546415f 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
@@ -14,7 +14,6 @@ using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
@@ -66,10 +65,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             return true;
         }
 
-        public Column ColumnAt(Vector2 screenSpacePosition) => null;
-
         public ManiaPlayfield Playfield { get; }
-
-        public Vector2 ScreenSpacePositionAtTime(double time, Column column = null) => Vector2.Zero;
     }
 }

From f364d0e8328070f77232472b1db3dcee7d9f4bdf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 11:35:26 +0900
Subject: [PATCH 02881/10326] Reduce IManiaHitObjectComposer scope

---
 .../ManiaPlacementBlueprintTestScene.cs               |  5 +----
 .../ManiaSelectionBlueprintTestScene.cs               |  9 ++-------
 .../Edit/IManiaHitObjectComposer.cs                   |  5 +----
 .../Edit/ManiaHitObjectComposer.cs                    | 11 +----------
 osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs |  4 ++--
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs    |  8 --------
 6 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
index 547786847b..fd18907d96 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -56,8 +55,6 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         protected override void AddHitObject(DrawableHitObject hitObject) => column.Add((DrawableManiaHitObject)hitObject);
 
-        public Column ColumnAt(Vector2 screenSpacePosition) => column;
-
-        public int TotalColumns => 1;
+        public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
index b598893e8c..35fe596e98 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
@@ -7,7 +7,6 @@ using osu.Framework.Timing;
 using osu.Game.Rulesets.Mania.Edit;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -18,11 +17,9 @@ namespace osu.Game.Rulesets.Mania.Tests
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
-        private readonly Column column;
-
         protected ManiaSelectionBlueprintTestScene()
         {
-            Add(column = new Column(0)
+            Add(new Column(0)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -31,8 +28,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
         }
 
-        public Column ColumnAt(Vector2 screenSpacePosition) => column;
-
-        public int TotalColumns => 1;
+        public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
index f64bab1fae..3818d0e15d 100644
--- a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
@@ -2,14 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Mania.UI;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
     public interface IManiaHitObjectComposer
     {
-        Column ColumnAt(Vector2 screenSpacePosition);
-
-        int TotalColumns { get; }
+        ManiaPlayfield Playfield { get; }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index cfb04c8e50..8367b4f5e9 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -26,13 +26,6 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
-        /// <summary>
-        /// Retrieves the column that intersects a screen-space position.
-        /// </summary>
-        /// <param name="screenSpacePosition">The screen-space position.</param>
-        /// <returns>The column which intersects with <paramref name="screenSpacePosition"/>.</returns>
-        public Column ColumnAt(Vector2 screenSpacePosition) => drawableRuleset.GetColumnByPosition(screenSpacePosition);
-
         private DependencyContainer dependencies;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -42,11 +35,9 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public IScrollingInfo ScrollingInfo => drawableRuleset.ScrollingInfo;
 
-        public int TotalColumns => Playfield.TotalColumns;
-
         public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
         {
-            var column = ColumnAt(screenSpacePosition);
+            var column = Playfield.GetColumnByPosition(screenSpacePosition);
 
             if (column == null)
                 return new SnapResult(screenSpacePosition, null);
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 55245198c8..4ea71652bc 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         private void performColumnMovement(int lastColumn, MoveSelectionEvent moveEvent)
         {
-            var currentColumn = composer.ColumnAt(moveEvent.ScreenSpacePosition);
+            var currentColumn = composer.Playfield.GetColumnByPosition(moveEvent.ScreenSpacePosition);
             if (currentColumn == null)
                 return;
 
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                     maxColumn = obj.Column;
             }
 
-            columnDelta = Math.Clamp(columnDelta, -minColumn, composer.TotalColumns - 1 - maxColumn);
+            columnDelta = Math.Clamp(columnDelta, -minColumn, composer.Playfield.TotalColumns - 1 - maxColumn);
 
             foreach (var obj in SelectedHitObjects.OfType<ManiaHitObject>())
                 obj.Column += columnDelta;
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index f3f843f366..94b5ee9486 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -23,7 +23,6 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -108,13 +107,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private void updateTimeRange() => TimeRange.Value = configTimeRange.Value * speedAdjustmentTrack.AggregateTempo.Value * speedAdjustmentTrack.AggregateFrequency.Value;
 
-        /// <summary>
-        /// Retrieves the column that intersects a screen-space position.
-        /// </summary>
-        /// <param name="screenSpacePosition">The screen-space position.</param>
-        /// <returns>The column which intersects with <paramref name="screenSpacePosition"/>.</returns>
-        public Column GetColumnByPosition(Vector2 screenSpacePosition) => Playfield.GetColumnByPosition(screenSpacePosition);
-
         public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new ManiaPlayfieldAdjustmentContainer();
 
         protected override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages);

From b2667bbb0210d00b9f6502362fc632f93bb9fa92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 11:45:58 +0900
Subject: [PATCH 02882/10326] Move protected implementation down

---
 .../Edit/ManiaHitObjectComposer.cs            | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 82a55b4965..683e921cbf 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -53,29 +53,6 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public IScrollingInfo ScrollingInfo => drawableRuleset.ScrollingInfo;
 
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            if (BlueprintContainer.CurrentTool is SelectTool)
-            {
-                if (EditorBeatmap.SelectedHitObjects.Any())
-                {
-                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
-                }
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
-            else
-            {
-                var result = SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position);
-                if (result.Time is double time)
-                    beatSnapGrid.SelectionTimeRange = (time, time);
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
-        }
-
         public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
         {
             var column = Playfield.GetColumnByPosition(screenSpacePosition);
@@ -111,5 +88,28 @@ namespace osu.Game.Rulesets.Mania.Edit
             new NoteCompositionTool(),
             new HoldNoteCompositionTool()
         };
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            if (BlueprintContainer.CurrentTool is SelectTool)
+            {
+                if (EditorBeatmap.SelectedHitObjects.Any())
+                {
+                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
+                }
+                else
+                    beatSnapGrid.SelectionTimeRange = null;
+            }
+            else
+            {
+                var result = SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position);
+                if (result.Time is double time)
+                    beatSnapGrid.SelectionTimeRange = (time, time);
+                else
+                    beatSnapGrid.SelectionTimeRange = null;
+            }
+        }
     }
 }

From d529a2aefac633bde0bcdf32e215e0d89af7bff6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 12:28:01 +0900
Subject: [PATCH 02883/10326] Remove left-over function

---
 .../Edit/ManiaBeatSnapGrid.cs                 | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index fa8f8a755a..e52cd5774c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -11,12 +11,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Edit
@@ -171,36 +169,6 @@ namespace osu.Game.Rulesets.Mania.Edit
             }
         }
 
-        public (Vector2 position, double time)? GetSnappedPosition(Vector2 position)
-        {
-            float minDist = float.PositiveInfinity;
-            DrawableGridLine minDistLine = null;
-
-            Vector2 minDistLinePosition = Vector2.Zero;
-
-            foreach (var grid in grids)
-            {
-                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
-                {
-                    Vector2 linePos = line.ToSpaceOfOtherDrawable(line.OriginPosition, this);
-                    float d = Vector2.Distance(position, linePos);
-
-                    if (d < minDist)
-                    {
-                        minDist = d;
-                        minDistLine = line;
-                        minDistLinePosition = linePos;
-                    }
-                }
-            }
-
-            if (minDistLine == null)
-                return null;
-
-            float noteOffset = (scrollingInfo.Direction.Value == ScrollingDirection.Up ? 1 : -1) * DefaultNotePiece.NOTE_HEIGHT / 2;
-            return (new Vector2(position.X, minDistLinePosition.Y + noteOffset), minDistLine.HitObject.StartTime);
-        }
-
         private class DrawableGridLine : DrawableHitObject
         {
             [Resolved]

From ce35d09e7dac2987f3cb439366eba75e0db0d7a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 12:45:37 +0900
Subject: [PATCH 02884/10326] Fix incorrect alpha application to lines on
 rewinding

---
 osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs        | 8 ++++++--
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index e52cd5774c..b5b6c08fca 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -199,10 +199,14 @@ namespace osu.Game.Rulesets.Mania.Edit
                     : Anchor.BottomLeft;
             }
 
+            protected override void UpdateInitialTransforms()
+            {
+                // don't perform any fading – we are handling that ourselves.
+            }
+
             protected override void UpdateStateTransforms(ArmedState state)
             {
-                using (BeginAbsoluteSequence(HitObject.StartTime + 1000))
-                    this.FadeOut();
+                LifetimeEnd = HitObject.StartTime + visible_range;
             }
         }
     }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index d594909cda..44afb7a227 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -257,7 +257,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 }
             }
 
-            if (state.Value != ArmedState.Idle && LifetimeEnd == double.MaxValue || HitObject.HitWindows == null)
+            if (LifetimeEnd == double.MaxValue && (state.Value != ArmedState.Idle || HitObject.HitWindows == null))
                 Expire();
 
             // apply any custom state overrides

From dd09d7830d108ff1de968035507f66199fc2ab57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 16:37:28 +0900
Subject: [PATCH 02885/10326] Cache and resolve editor clock as EditorClock in
 all cases

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 14 +++++--------
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs  | 11 +++++-----
 .../Edit/Components/PlaybackControl.cs        | 11 +++++-----
 .../Edit/Components/TimeInfoContainer.cs      |  5 ++---
 .../Timelines/Summary/Parts/MarkerPart.cs     | 15 +++++++------
 .../Timelines/Summary/SummaryTimeline.cs      |  5 ++---
 .../Compose/Components/BlueprintContainer.cs  |  5 ++---
 .../Compose/Components/Timeline/Timeline.cs   | 21 +++++++++----------
 osu.Game/Screens/Edit/Editor.cs               |  3 +--
 osu.Game/Screens/Edit/Timing/TimingScreen.cs  |  2 +-
 osu.Game/Tests/Visual/EditorClockTestScene.cs |  3 +--
 11 files changed, 41 insertions(+), 54 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index fd8af0afd5..1987148aed 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.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Configuration;
@@ -38,14 +37,11 @@ namespace osu.Game.Rulesets.Edit
         protected readonly Ruleset Ruleset;
 
         [Resolved]
-        protected IFrameBasedClock EditorClock { get; private set; }
+        protected EditorClock EditorClock { get; private set; }
 
         [Resolved]
         protected EditorBeatmap EditorBeatmap { get; private set; }
 
-        [Resolved]
-        private IAdjustableClock adjustableClock { get; set; }
-
         [Resolved]
         protected IBeatSnapProvider BeatSnapProvider { get; private set; }
 
@@ -68,7 +64,7 @@ namespace osu.Game.Rulesets.Edit
         }
 
         [BackgroundDependencyLoader]
-        private void load(IFrameBasedClock framedClock)
+        private void load()
         {
             Config = Dependencies.Get<RulesetConfigCache>().GetConfigFor(Ruleset);
 
@@ -76,7 +72,7 @@ namespace osu.Game.Rulesets.Edit
             {
                 drawableRulesetWrapper = new DrawableEditRulesetWrapper<TObject>(CreateDrawableRuleset(Ruleset, EditorBeatmap.PlayableBeatmap))
                 {
-                    Clock = framedClock,
+                    Clock = EditorClock,
                     ProcessCustomClock = false
                 };
             }
@@ -221,8 +217,8 @@ namespace osu.Game.Rulesets.Edit
             {
                 EditorBeatmap.Add(hitObject);
 
-                if (adjustableClock.CurrentTime < hitObject.StartTime)
-                    adjustableClock.Seek(hitObject.StartTime);
+                if (EditorClock.CurrentTime < hitObject.StartTime)
+                    EditorClock.Seek(hitObject.StartTime);
             }
         }
 
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index f0b63f8ea5..20584c66e5 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -6,10 +6,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
 
@@ -30,7 +30,8 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         protected readonly HitObject HitObject;
 
-        protected IClock EditorClock { get; private set; }
+        [Resolved]
+        protected EditorClock EditorClock { get; private set; }
 
         private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 
@@ -49,12 +50,10 @@ namespace osu.Game.Rulesets.Edit
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, IAdjustableClock clock)
+        private void load(IBindable<WorkingBeatmap> beatmap)
         {
             this.beatmap.BindTo(beatmap);
 
-            EditorClock = clock;
-
             ApplyDefaultsToHitObject();
         }
 
@@ -84,7 +83,7 @@ namespace osu.Game.Rulesets.Edit
         }
 
         [Resolved(canBeNull: true)]
-        private IFrameBasedClock editorClock { get; set; }
+        private EditorClock editorClock { get; set; }
 
         /// <summary>
         /// Updates the position of this <see cref="PlacementBlueprint"/> to a new screen-space position.
diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 897c6ec531..59b3d1c565 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
-using osu.Framework.Timing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -26,7 +25,7 @@ namespace osu.Game.Screens.Edit.Components
         private IconButton playButton;
 
         [Resolved]
-        private IAdjustableClock adjustableClock { get; set; }
+        private EditorClock editorClock { get; set; }
 
         private readonly BindableNumber<double> tempo = new BindableDouble(1);
 
@@ -87,17 +86,17 @@ namespace osu.Game.Screens.Edit.Components
 
         private void togglePause()
         {
-            if (adjustableClock.IsRunning)
-                adjustableClock.Stop();
+            if (editorClock.IsRunning)
+                editorClock.Stop();
             else
-                adjustableClock.Start();
+                editorClock.Start();
         }
 
         protected override void Update()
         {
             base.Update();
 
-            playButton.Icon = adjustableClock.IsRunning ? FontAwesome.Regular.PauseCircle : FontAwesome.Regular.PlayCircle;
+            playButton.Icon = editorClock.IsRunning ? FontAwesome.Regular.PauseCircle : FontAwesome.Regular.PlayCircle;
         }
 
         private class PlaybackTabControl : OsuTabControl<double>
diff --git a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
index 4bf21d240a..c1f54d7938 100644
--- a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
+++ b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Timing;
 using osu.Game.Graphics;
 
 namespace osu.Game.Screens.Edit.Components
@@ -15,7 +14,7 @@ namespace osu.Game.Screens.Edit.Components
         private readonly OsuSpriteText trackTimer;
 
         [Resolved]
-        private IAdjustableClock adjustableClock { get; set; }
+        private EditorClock editorClock { get; set; }
 
         public TimeInfoContainer()
         {
@@ -35,7 +34,7 @@ namespace osu.Game.Screens.Edit.Components
         {
             base.Update();
 
-            trackTimer.Text = TimeSpan.FromMilliseconds(adjustableClock.CurrentTime).ToString(@"mm\:ss\:fff");
+            trackTimer.Text = TimeSpan.FromMilliseconds(editorClock.CurrentTime).ToString(@"mm\:ss\:fff");
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
index 5d638d7919..82581dfc56 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 
@@ -20,14 +19,14 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// </summary>
     public class MarkerPart : TimelinePart
     {
-        private readonly Drawable marker;
+        private Drawable marker;
 
-        private readonly IAdjustableClock adjustableClock;
+        [Resolved]
+        private EditorClock editorClock { get; set; }
 
-        public MarkerPart(IAdjustableClock adjustableClock)
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            this.adjustableClock = adjustableClock;
-
             Add(marker = new MarkerVisualisation());
         }
 
@@ -59,14 +58,14 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                     return;
 
                 float markerPos = Math.Clamp(ToLocalSpace(screenPosition).X, 0, DrawWidth);
-                adjustableClock.Seek(markerPos / DrawWidth * Beatmap.Value.Track.Length);
+                editorClock.Seek(markerPos / DrawWidth * editorClock.TrackLength);
             });
         }
 
         protected override void Update()
         {
             base.Update();
-            marker.X = (float)adjustableClock.CurrentTime;
+            marker.X = (float)editorClock.CurrentTime;
         }
 
         protected override void LoadBeatmap(WorkingBeatmap beatmap)
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
index 20db2cac21..02cd4bccb4 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Timing;
 using osu.Game.Graphics;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 
@@ -18,11 +17,11 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
     public class SummaryTimeline : BottomBarContainer
     {
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, IAdjustableClock adjustableClock)
+        private void load(OsuColour colours)
         {
             Children = new Drawable[]
             {
-                new MarkerPart(adjustableClock) { RelativeSizeAxes = Axes.Both },
+                new MarkerPart { RelativeSizeAxes = Axes.Both },
                 new ControlPointPart
                 {
                     Anchor = Anchor.Centre,
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 1e8a35c047..fba7671fca 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -38,7 +37,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private IEditorChangeHandler changeHandler { get; set; }
 
         [Resolved]
-        private IAdjustableClock adjustableClock { get; set; }
+        private EditorClock editorClock { get; set; }
 
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
@@ -144,7 +143,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (clickedBlueprint == null)
                 return false;
 
-            adjustableClock?.Seek(clickedBlueprint.HitObject.StartTime);
+            editorClock?.Seek(clickedBlueprint.HitObject.StartTime);
             return true;
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index ec2b11c0cf..121f3dc213 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -9,7 +9,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Input.Events;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
@@ -25,7 +24,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         public readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
         [Resolved]
-        private IAdjustableClock adjustableClock { get; set; }
+        private EditorClock editorClock { get; set; }
 
         public Timeline()
         {
@@ -101,7 +100,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             Content.Margin = new MarginPadding { Horizontal = DrawWidth / 2 };
 
             // This needs to happen after transforms are updated, but before the scroll position is updated in base.UpdateAfterChildren
-            if (adjustableClock.IsRunning)
+            if (editorClock.IsRunning)
                 scrollToTrackTime();
         }
 
@@ -111,21 +110,21 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             if (handlingDragInput)
                 seekTrackToCurrent();
-            else if (!adjustableClock.IsRunning)
+            else if (!editorClock.IsRunning)
             {
                 // The track isn't running. There are two cases we have to be wary of:
                 // 1) The user flick-drags on this timeline: We want the track to follow us
                 // 2) The user changes the track time through some other means (scrolling in the editor or overview timeline): We want to follow the track time
 
                 // The simplest way to cover both cases is by checking whether the scroll position has changed and the audio hasn't been changed externally
-                if (Current != lastScrollPosition && adjustableClock.CurrentTime == lastTrackTime)
+                if (Current != lastScrollPosition && editorClock.CurrentTime == lastTrackTime)
                     seekTrackToCurrent();
                 else
                     scrollToTrackTime();
             }
 
             lastScrollPosition = Current;
-            lastTrackTime = adjustableClock.CurrentTime;
+            lastTrackTime = editorClock.CurrentTime;
         }
 
         private void seekTrackToCurrent()
@@ -133,7 +132,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (!track.IsLoaded)
                 return;
 
-            adjustableClock.Seek(Current / Content.DrawWidth * track.Length);
+            editorClock.Seek(Current / Content.DrawWidth * track.Length);
         }
 
         private void scrollToTrackTime()
@@ -141,7 +140,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (!track.IsLoaded || track.Length == 0)
                 return;
 
-            ScrollTo((float)(adjustableClock.CurrentTime / track.Length) * Content.DrawWidth, false);
+            ScrollTo((float)(editorClock.CurrentTime / track.Length) * Content.DrawWidth, false);
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)
@@ -164,15 +163,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private void beginUserDrag()
         {
             handlingDragInput = true;
-            trackWasPlaying = adjustableClock.IsRunning;
-            adjustableClock.Stop();
+            trackWasPlaying = editorClock.IsRunning;
+            editorClock.Stop();
         }
 
         private void endUserDrag()
         {
             handlingDragInput = false;
             if (trackWasPlaying)
-                adjustableClock.Start();
+                editorClock.Start();
         }
 
         [Resolved]
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 54e4af94a4..54c5a23c3e 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -83,8 +83,7 @@ namespace osu.Game.Screens.Edit
             clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
             clock.ChangeSource(sourceClock);
 
-            dependencies.CacheAs<IFrameBasedClock>(clock);
-            dependencies.CacheAs<IAdjustableClock>(clock);
+            dependencies.CacheAs(clock);
 
             // todo: remove caching of this and consume via editorBeatmap?
             dependencies.Cache(beatDivisor);
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index d9da3ff92d..f3d1ec2cbb 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Edit.Timing
         private Bindable<ControlPointGroup> selectedGroup = new Bindable<ControlPointGroup>();
 
         [Resolved]
-        private IAdjustableClock clock { get; set; }
+        private EditorClock clock { get; set; }
 
         protected override Drawable CreateMainContent() => new GridContainer
         {
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 830e6ed363..f0ec638fc9 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -30,8 +30,7 @@ namespace osu.Game.Tests.Visual
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
             dependencies.Cache(BeatDivisor);
-            dependencies.CacheAs<IFrameBasedClock>(Clock);
-            dependencies.CacheAs<IAdjustableClock>(Clock);
+            dependencies.CacheAs(Clock);
 
             return dependencies;
         }

From d18eb663b157d63a2c46816d86f5c3194604bc40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 16:40:52 +0900
Subject: [PATCH 02886/10326] Add tweening seek support to EditorClock

---
 .../Edit/OsuHitObjectComposer.cs              |   3 +-
 .../Visual/Editing/TimelineTestScene.cs       |  13 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |   2 +-
 .../Timelines/Summary/Parts/MarkerPart.cs     |   2 +-
 .../Compose/Components/BlueprintContainer.cs  |   2 +-
 osu.Game/Screens/Edit/Editor.cs               |   1 +
 osu.Game/Screens/Edit/EditorClock.cs          | 129 ++++++++++++++++--
 osu.Game/Screens/Edit/Timing/TimingScreen.cs  |   2 +-
 8 files changed, 129 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 9ba3e30445..df14b11e8a 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -104,7 +104,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             var objects = selectedHitObjects.ToList();
 
             if (objects.Count == 0)
-                return createGrid(h => h.StartTime <= EditorClock.CurrentTime);
+                // use accurate time value to give more instantaneous feedback to the user.
+                return createGrid(h => h.StartTime <= EditorClock.CurrentTimeAccurate);
 
             double minTime = objects.Min(h => h.StartTime);
             return createGrid(h => h.StartTime < minTime, objects.Count + 1);
diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 01ef7e6170..3652d41e67 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.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.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
@@ -69,7 +68,7 @@ namespace osu.Game.Tests.Visual.Editing
             private IBindable<WorkingBeatmap> beatmap { get; set; }
 
             [Resolved]
-            private IAdjustableClock adjustableClock { get; set; }
+            private EditorClock adjustableClock { get; set; }
 
             public AudioVisualiser()
             {
@@ -102,7 +101,7 @@ namespace osu.Game.Tests.Visual.Editing
 
         private class StartStopButton : OsuButton
         {
-            private IAdjustableClock adjustableClock;
+            private EditorClock editorClock;
             private bool started;
 
             public StartStopButton()
@@ -115,21 +114,21 @@ namespace osu.Game.Tests.Visual.Editing
             }
 
             [BackgroundDependencyLoader]
-            private void load(IAdjustableClock adjustableClock)
+            private void load(EditorClock editorClock)
             {
-                this.adjustableClock = adjustableClock;
+                this.editorClock = editorClock;
             }
 
             private void onClick()
             {
                 if (started)
                 {
-                    adjustableClock.Stop();
+                    editorClock.Stop();
                     Text = "Start";
                 }
                 else
                 {
-                    adjustableClock.Start();
+                    editorClock.Start();
                     Text = "Stop";
                 }
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 1987148aed..edbdd41d81 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Rulesets.Edit
                 EditorBeatmap.Add(hitObject);
 
                 if (EditorClock.CurrentTime < hitObject.StartTime)
-                    EditorClock.Seek(hitObject.StartTime);
+                    EditorClock.SeekTo(hitObject.StartTime);
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
index 82581dfc56..9e9ac93d23 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                     return;
 
                 float markerPos = Math.Clamp(ToLocalSpace(screenPosition).X, 0, DrawWidth);
-                editorClock.Seek(markerPos / DrawWidth * editorClock.TrackLength);
+                editorClock.SeekTo(markerPos / DrawWidth * editorClock.TrackLength);
             });
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index fba7671fca..cc417bbb10 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (clickedBlueprint == null)
                 return false;
 
-            editorClock?.Seek(clickedBlueprint.HitObject.StartTime);
+            editorClock?.SeekTo(clickedBlueprint.HitObject.StartTime);
             return true;
         }
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 54c5a23c3e..9f61589c36 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -84,6 +84,7 @@ namespace osu.Game.Screens.Edit
             clock.ChangeSource(sourceClock);
 
             dependencies.CacheAs(clock);
+            AddInternal(clock);
 
             // todo: remove caching of this and consume via editorBeatmap?
             dependencies.Cache(beatDivisor);
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index e5e47507f3..321a25170a 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -3,6 +3,8 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
@@ -13,7 +15,7 @@ namespace osu.Game.Screens.Edit
     /// <summary>
     /// A decoupled clock which adds editor-specific functionality, such as snapping to a user-defined beat divisor.
     /// </summary>
-    public class EditorClock : DecoupleableInterpolatingFramedClock
+    public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock
     {
         public readonly double TrackLength;
 
@@ -21,12 +23,11 @@ namespace osu.Game.Screens.Edit
 
         private readonly BindableBeatDivisor beatDivisor;
 
-        public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
-        {
-            this.beatDivisor = beatDivisor;
+        private readonly DecoupleableInterpolatingFramedClock underlyingClock;
 
-            ControlPointInfo = beatmap.Beatmap.ControlPointInfo;
-            TrackLength = beatmap.Track.Length;
+        public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
+            : this(beatmap.Beatmap.ControlPointInfo, beatmap.Track.Length, beatDivisor)
+        {
         }
 
         public EditorClock(ControlPointInfo controlPointInfo, double trackLength, BindableBeatDivisor beatDivisor)
@@ -35,6 +36,8 @@ namespace osu.Game.Screens.Edit
 
             ControlPointInfo = controlPointInfo;
             TrackLength = trackLength;
+
+            underlyingClock = new DecoupleableInterpolatingFramedClock();
         }
 
         /// <summary>
@@ -79,20 +82,30 @@ namespace osu.Game.Screens.Edit
 
         private void seek(int direction, bool snapped, double amount = 1)
         {
+            double current = CurrentTime;
+
+            // if a seek transform is active, use its end time instead of the reported current time.
+            var existingTransform = Transforms.OfType<TransformSeek>().FirstOrDefault();
+
+            // but only if the requested direction is in the same direction as the transform.
+            // this allows quick pivoting rather than resetting the transform for the first opposite direction movement.
+            if (existingTransform != null && Math.Sign(existingTransform.EndValue - current) == Math.Sign(direction))
+                current = existingTransform.EndValue;
+
             if (amount <= 0) throw new ArgumentException("Value should be greater than zero", nameof(amount));
 
-            var timingPoint = ControlPointInfo.TimingPointAt(CurrentTime);
+            var timingPoint = ControlPointInfo.TimingPointAt(current);
 
-            if (direction < 0 && timingPoint.Time == CurrentTime)
+            if (direction < 0 && timingPoint.Time == current)
                 // When going backwards and we're at the boundary of two timing points, we compute the seek distance with the timing point which we are seeking into
-                timingPoint = ControlPointInfo.TimingPointAt(CurrentTime - 1);
+                timingPoint = ControlPointInfo.TimingPointAt(current - 1);
 
             double seekAmount = timingPoint.BeatLength / beatDivisor.Value * amount;
-            double seekTime = CurrentTime + seekAmount * direction;
+            double seekTime = current + seekAmount * direction;
 
             if (!snapped || ControlPointInfo.TimingPoints.Count == 0)
             {
-                Seek(seekTime);
+                SeekTo(seekTime);
                 return;
             }
 
@@ -110,7 +123,7 @@ namespace osu.Game.Screens.Edit
 
             // Due to the rounding above, we may end up on the current beat. This will effectively cause 0 seeking to happen, but we don't want this.
             // Instead, we'll go to the next beat in the direction when this is the case
-            if (Precision.AlmostEquals(CurrentTime, seekTime))
+            if (Precision.AlmostEquals(current, seekTime))
             {
                 closestBeat += direction > 0 ? 1 : -1;
                 seekTime = timingPoint.Time + closestBeat * seekAmount;
@@ -125,7 +138,97 @@ namespace osu.Game.Screens.Edit
 
             // Ensure the sought point is within the boundaries
             seekTime = Math.Clamp(seekTime, 0, TrackLength);
-            Seek(seekTime);
+            SeekTo(seekTime);
+        }
+
+        /// <summary>
+        /// The current time of this clock, include any active transform seeks performed via <see cref="SeekTo"/>.
+        /// </summary>
+        public double CurrentTimeAccurate =>
+            Transforms.OfType<TransformSeek>().FirstOrDefault()?.EndValue ?? CurrentTime;
+
+        public double CurrentTime => underlyingClock.CurrentTime;
+
+        public void Reset()
+        {
+            ClearTransforms();
+            underlyingClock.Reset();
+        }
+
+        public void Start()
+        {
+            ClearTransforms();
+            underlyingClock.Start();
+        }
+
+        public void Stop()
+        {
+            underlyingClock.Stop();
+        }
+
+        public bool Seek(double position)
+        {
+            ClearTransforms();
+            return underlyingClock.Seek(position);
+        }
+
+        public void ResetSpeedAdjustments() => underlyingClock.ResetSpeedAdjustments();
+
+        double IAdjustableClock.Rate
+        {
+            get => underlyingClock.Rate;
+            set => underlyingClock.Rate = value;
+        }
+
+        double IClock.Rate => underlyingClock.Rate;
+
+        public bool IsRunning => underlyingClock.IsRunning;
+
+        public void ProcessFrame() => underlyingClock.ProcessFrame();
+
+        public double ElapsedFrameTime => underlyingClock.ElapsedFrameTime;
+
+        public double FramesPerSecond => underlyingClock.FramesPerSecond;
+
+        public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
+
+        public void ChangeSource(IClock source) => underlyingClock.ChangeSource(source);
+
+        public IClock Source => underlyingClock.Source;
+
+        public bool IsCoupled
+        {
+            get => underlyingClock.IsCoupled;
+            set => underlyingClock.IsCoupled = value;
+        }
+
+        private const double transform_time = 300;
+
+        public void SeekTo(double seekDestination)
+        {
+            if (IsRunning)
+                Seek(seekDestination);
+            else
+                transformSeekTo(seekDestination, transform_time, Easing.OutQuint);
+        }
+
+        private void transformSeekTo(double seek, double duration = 0, Easing easing = Easing.None)
+            => this.TransformTo(this.PopulateTransform(new TransformSeek(), seek, duration, easing));
+
+        private double currentTime
+        {
+            get => underlyingClock.CurrentTime;
+            set => underlyingClock.Seek(value);
+        }
+
+        private class TransformSeek : Transform<double, EditorClock>
+        {
+            public override string TargetMember => nameof(currentTime);
+
+            protected override void Apply(EditorClock clock, double time) =>
+                clock.currentTime = Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
+
+            protected override void ReadIntoStartValue(EditorClock clock) => StartValue = clock.currentTime;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index f3d1ec2cbb..59af88a049 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Edit.Timing
             selectedGroup.BindValueChanged(selected =>
             {
                 if (selected.NewValue != null)
-                    clock.Seek(selected.NewValue.Time);
+                    clock.SeekTo(selected.NewValue.Time);
             });
         }
 

From 866db629d6ce60b534e9082652c37c888c3cb42b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 18:23:24 +0900
Subject: [PATCH 02887/10326] Fix remaining test failures

---
 .../Visual/Editing/TestScenePlaybackControl.cs     |  7 +++----
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs | 14 +++++---------
 osu.Game/Screens/Edit/EditorClock.cs               |  5 +++++
 .../Tests/Visual/PlacementBlueprintTestScene.cs    |  3 ++-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs b/osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
index 3af976cae0..6aa884a197 100644
--- a/osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
@@ -4,8 +4,8 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components;
 using osuTK;
 
@@ -17,9 +17,8 @@ namespace osu.Game.Tests.Visual.Editing
         [BackgroundDependencyLoader]
         private void load()
         {
-            var clock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
-            Dependencies.CacheAs<IAdjustableClock>(clock);
-            Dependencies.CacheAs<IFrameBasedClock>(clock);
+            var clock = new EditorClock { IsCoupled = false };
+            Dependencies.CacheAs(clock);
 
             var playback = new PlaybackControl
             {
diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 01ef7e6170..2e7ccc8ad3 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -102,7 +102,9 @@ namespace osu.Game.Tests.Visual.Editing
 
         private class StartStopButton : OsuButton
         {
-            private IAdjustableClock adjustableClock;
+            [Resolved]
+            private EditorClock editorClock { get; set; }
+
             private bool started;
 
             public StartStopButton()
@@ -114,22 +116,16 @@ namespace osu.Game.Tests.Visual.Editing
                 Action = onClick;
             }
 
-            [BackgroundDependencyLoader]
-            private void load(IAdjustableClock adjustableClock)
-            {
-                this.adjustableClock = adjustableClock;
-            }
-
             private void onClick()
             {
                 if (started)
                 {
-                    adjustableClock.Stop();
+                    editorClock.Stop();
                     Text = "Start";
                 }
                 else
                 {
-                    adjustableClock.Start();
+                    editorClock.Start();
                     Text = "Stop";
                 }
 
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index e5e47507f3..d2bb1c8984 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -37,6 +37,11 @@ namespace osu.Game.Screens.Edit
             TrackLength = trackLength;
         }
 
+        public EditorClock()
+            : this(new ControlPointInfo(), 1000, new BindableBeatDivisor())
+        {
+        }
+
         /// <summary>
         /// Seek to the closest snappable beat from a time.
         /// </summary>
diff --git a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
index feecea473c..c3d74f21aa 100644
--- a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
@@ -8,6 +8,7 @@ using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 
 namespace osu.Game.Tests.Visual
@@ -32,7 +33,7 @@ namespace osu.Game.Tests.Visual
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.CacheAs<IAdjustableClock>(new StopwatchClock());
+            dependencies.CacheAs(new EditorClock());
 
             return dependencies;
         }

From 3e0ee310d0e0d7dd529c1e7c8a3e59f4a4e8ec7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 18:30:39 +0900
Subject: [PATCH 02888/10326] Remove now incorrect comment

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index f0b63f8ea5..e71ccc33a4 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -64,9 +64,7 @@ namespace osu.Game.Rulesets.Edit
         /// <param name="commitStart">Whether this call is committing a value for HitObject.StartTime and continuing with further adjustments.</param>
         protected void BeginPlacement(bool commitStart = false)
         {
-            // applies snapping to above time
             placementHandler.BeginPlacement(HitObject);
-
             PlacementActive |= commitStart;
         }
 

From af30d1201f0934fc49ee4857e0157611bdc4114c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 18:57:28 +0900
Subject: [PATCH 02889/10326] Fix slider path control point blueprint not
 working correctly

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 834bf1892f..c06904c0c2 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -162,8 +162,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             if (ControlPoint == slider.Path.ControlPoints[0])
             {
                 // Special handling for the head control point - the position of the slider changes which means the snapped position and time have to be taken into account
-                var result = snapProvider?.SnapScreenSpacePositionToValidTime(e.MousePosition);
-                Vector2 movementDelta = (result?.ScreenSpacePosition ?? e.MousePosition) - slider.Position;
+                var result = snapProvider?.SnapScreenSpacePositionToValidTime(e.ScreenSpaceMousePosition);
+
+                Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? e.ScreenSpaceMousePosition) - slider.Position;
 
                 slider.Position += movementDelta;
                 slider.StartTime = result?.Time ?? slider.StartTime;

From 5ea33f4c046ffdde090f21c67a9a26772083a24b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 19:23:07 +0900
Subject: [PATCH 02890/10326] Fix incorrect rounding in DragBar

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 4 ++--
 .../Compose/Components/Timeline/TimelineHitObjectBlueprint.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index ec2b11c0cf..61ed1743a9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -181,8 +181,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private IBeatSnapProvider beatSnapProvider { get; set; }
 
-        public SnapResult SnapScreenSpacePositionToValidTime(Vector2 position) =>
-            new SnapResult(position, beatSnapProvider.SnapTime(getTimeFromPosition(Content.ToLocalSpace(position))));
+        public SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) =>
+            new SnapResult(screenSpacePosition, beatSnapProvider.SnapTime(getTimeFromPosition(Content.ToLocalSpace(screenSpacePosition))));
 
         private double getTimeFromPosition(Vector2 localPosition) =>
             (localPosition.X / Content.DrawWidth) * track.Length;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 03e05b75c5..dd2f7a833e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -282,7 +282,7 @@ 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 = Math.Max(0, (int)((time - hitObject.StartTime) / lengthOfOneRepeat) - 1);
+                            var proposedCount = Math.Max(0, (int)Math.Round((time - hitObject.StartTime) / lengthOfOneRepeat) - 1);
 
                             if (proposedCount == repeatHitObject.RepeatCount)
                                 return;

From 8b79e142257652c1914d5381f8942f4cf20c1ae6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 19:49:49 +0900
Subject: [PATCH 02891/10326] Fix remaining test regressions

---
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs | 5 ++---
 osu.Game/Screens/Edit/Timing/TimingScreen.cs       | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 2e7ccc8ad3..fdb8781563 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.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.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
@@ -69,7 +68,7 @@ namespace osu.Game.Tests.Visual.Editing
             private IBindable<WorkingBeatmap> beatmap { get; set; }
 
             [Resolved]
-            private IAdjustableClock adjustableClock { get; set; }
+            private EditorClock editorClock { get; set; }
 
             public AudioVisualiser()
             {
@@ -96,7 +95,7 @@ namespace osu.Game.Tests.Visual.Editing
                 base.Update();
 
                 if (beatmap.Value.Track.IsLoaded)
-                    marker.X = (float)(adjustableClock.CurrentTime / beatmap.Value.Track.Length);
+                    marker.X = (float)(editorClock.CurrentTime / beatmap.Value.Track.Length);
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index f3d1ec2cbb..f22d7291d9 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.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.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
@@ -62,7 +61,7 @@ namespace osu.Game.Screens.Edit.Timing
             private IBindableList<ControlPointGroup> controlGroups;
 
             [Resolved]
-            private IFrameBasedClock clock { get; set; }
+            private EditorClock clock { get; set; }
 
             [Resolved]
             protected IBindable<WorkingBeatmap> Beatmap { get; private set; }

From 50059860498d63d2dbe8cd77b5840f2bf628a9da Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 22 May 2020 20:18:47 +0900
Subject: [PATCH 02892/10326] Cleanup test

---
 .../TestSceneContractedPanelMiddleContent.cs  | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
index e1e00e3c2b..972ac26b84 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
@@ -9,16 +9,13 @@ 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.Osu;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Ranking.Contracted;
 using osu.Game.Tests.Beatmaps;
-using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
@@ -29,22 +26,9 @@ namespace osu.Game.Tests.Visual.Ranking
         private RulesetStore rulesetStore { get; set; }
 
         [Test]
-        public void TestMapWithKnownMapper()
+        public void TestShowPanel()
         {
-            var author = new User { Username = "mapper_name" };
-
-            AddStep("show example score", () => showPanel(createTestBeatmap(author), new TestScoreInfo(new OsuRuleset().RulesetInfo)));
-
-            AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Text == "mapper_name"));
-        }
-
-        [Test]
-        public void TestMapWithUnknownMapper()
-        {
-            AddStep("show example score", () => showPanel(createTestBeatmap(null), new TestScoreInfo(new OsuRuleset().RulesetInfo)));
-
-            AddAssert("mapped by text not present", () =>
-                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text, "mapped", "by")));
+            AddStep("show example score", () => showPanel(createTestBeatmap(), new TestScoreInfo(new OsuRuleset().RulesetInfo)));
         }
 
         private void showPanel(WorkingBeatmap workingBeatmap, ScoreInfo score)
@@ -52,10 +36,9 @@ namespace osu.Game.Tests.Visual.Ranking
             Child = new ContractedPanelMiddleContentContainer(workingBeatmap, score);
         }
 
-        private WorkingBeatmap createTestBeatmap(User author)
+        private WorkingBeatmap createTestBeatmap()
         {
             var beatmap = new TestBeatmap(rulesetStore.GetRuleset(0));
-            beatmap.Metadata.Author = author;
             beatmap.Metadata.Title = "Verrrrrrrrrrrrrrrrrrry looooooooooooooooooooooooong beatmap title";
             beatmap.Metadata.Artist = "Verrrrrrrrrrrrrrrrrrry looooooooooooooooooooooooong beatmap artist";
 
@@ -75,7 +58,7 @@ namespace osu.Game.Tests.Visual.Ranking
 
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
-                Size = new Vector2(ScorePanel.CONTRACTED_WIDTH, 700);
+                Size = new Vector2(ScorePanel.CONTRACTED_WIDTH, 460);
                 Children = new Drawable[]
                 {
                     new Box

From 6bcc4c95cc0794260e82a7d70cfe06aa31e7c33f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 22 May 2020 20:19:23 +0900
Subject: [PATCH 02893/10326] Schedule api callback

---
 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 cdceaa939e..af748d8336 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Screens.Ranking
 
             var req = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
 
-            req.Success += r =>
+            req.Success += r => Schedule(() =>
             {
                 foreach (var s in r.Scores.Select(s => s.CreateScoreInfo(rulesets)))
                 {
@@ -129,7 +129,7 @@ namespace osu.Game.Screens.Ranking
 
                     panels.AddScore(s);
                 }
-            };
+            });
 
             api.Queue(req);
         }

From 80388feac4f6bbc7f87b617476c142f55511fa78 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 22 May 2020 20:39:02 +0900
Subject: [PATCH 02894/10326] Disable scroll user scroll controls in list

---
 osu.Game/Screens/Ranking/ResultsScreen.cs  | 69 +++++++++++++---------
 osu.Game/Screens/Ranking/ScorePanelList.cs |  4 ++
 2 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index af748d8336..133bdcca4a 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -59,42 +59,57 @@ namespace osu.Game.Screens.Ranking
         {
             FillFlowContainer buttons;
 
-            InternalChildren = new[]
+            InternalChild = new GridContainer
             {
-                new ResultsScrollContainer
+                RelativeSizeAxes = Axes.Both,
+                Content = new[]
                 {
-                    Child = panels = new ScorePanelList(Score)
+                    new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                    }
-                },
-                bottomPanel = new Container
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    RelativeSizeAxes = Axes.X,
-                    Height = TwoLayerButton.SIZE_EXTENDED.Y,
-                    Alpha = 0,
-                    Children = new Drawable[]
+                        new ResultsScrollContainer
+                        {
+                            Child = panels = new ScorePanelList(Score)
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                            }
+                        }
+                    },
+                    new[]
                     {
-                        new Box
+                        bottomPanel = new Container
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4Extensions.FromHex("#333")
-                        },
-                        buttons = new FillFlowContainer
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.Both,
-                            Spacing = new Vector2(5),
-                            Direction = FillDirection.Horizontal,
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            RelativeSizeAxes = Axes.X,
+                            Height = TwoLayerButton.SIZE_EXTENDED.Y,
+                            Alpha = 0,
                             Children = new Drawable[]
                             {
-                                new ReplayDownloadButton(Score) { Width = 300 },
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4Extensions.FromHex("#333")
+                                },
+                                buttons = new FillFlowContainer
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    AutoSizeAxes = Axes.Both,
+                                    Spacing = new Vector2(5),
+                                    Direction = FillDirection.Horizontal,
+                                    Children = new Drawable[]
+                                    {
+                                        new ReplayDownloadButton(Score) { Width = 300 },
+                                    }
+                                }
                             }
                         }
                     }
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(),
+                    new Dimension(GridSizeMode.AutoSize)
                 }
             };
 
@@ -171,7 +186,7 @@ namespace osu.Game.Screens.Ranking
             protected override void Update()
             {
                 base.Update();
-                content.Height = Math.Max(768, DrawHeight);
+                content.Height = Math.Max(768 - TwoLayerButton.SIZE_EXTENDED.Y, DrawHeight);
             }
         }
     }
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index ed6d07d078..97a132b9ff 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -149,6 +149,10 @@ namespace osu.Game.Screens.Ranking
 
                 base.UpdateAfterChildren();
             }
+
+            public override bool HandlePositionalInput => false;
+
+            public override bool HandleNonPositionalInput => false;
         }
     }
 }

From 9461097b0070c15f275c69ea67be7df638e80208 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 22 May 2020 20:50:21 +0900
Subject: [PATCH 02895/10326] Update with latest changes

---
 .../Difficulty/Skills/Colour.cs               | 198 ++++++++----------
 .../Difficulty/Skills/SpeedInvariantRhythm.cs |   8 +-
 .../Difficulty/TaikoDifficultyAttributes.cs   |   4 +
 .../Difficulty/TaikoDifficultyCalculator.cs   |  28 +--
 4 files changed, 114 insertions(+), 124 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index da255dcdd7..bd94c8aa65 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.IO;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
@@ -12,130 +14,108 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
     public class Colour : Skill
     {
         protected override double SkillMultiplier => 1;
-        protected override double StrainDecayBase => 0.3;
+        protected override double StrainDecayBase => 0.4;
 
-        private ColourSwitch lastColourSwitch = ColourSwitch.None;
-        private int sameColourCount = 1;
+        private bool prevIsKat = false;
 
-        private readonly int[] previousDonLengths = { 0, 0 };
-        private readonly int[] previousKatLengths = { 0, 0 };
+        private int currentMonoLength = 1;
+        private List<int> monoHistory = new List<int>();
+        private readonly int mono_history_max_length = 5;
+        private int monoHistoryLength = 0;
 
-        private int sameTypeCount = 1;
+        private double sameParityPenalty()
+        {
+            return 0.0;
+        }
 
-        // TODO: make this smarter (dont initialise with "Don")
-        private bool previousIsKat;
+        private double repititionPenalty(int notesSince)
+        {
+            double d = notesSince;
+            return Math.Atan(d / 30) / (Math.PI / 2);
+        }
+
+        private double patternLengthPenalty(int patternLength)
+        {
+            double shortPatternPenalty = Math.Min(0.25 * patternLength, 1.0);
+            double longPatternPenalty = Math.Max(Math.Min(2.5 - 0.15 * patternLength, 1.0), 0.0);
+            return Math.Min(shortPatternPenalty, longPatternPenalty);
+        }
 
         protected override double StrainValueOf(DifficultyHitObject current)
         {
-            return StrainValueOfNew(current);
-        }
+            double objectDifficulty = 0.0;
 
-        protected double StrainValueOfNew(DifficultyHitObject current)
-        {
-            double returnVal = 0.0;
-            double returnMultiplier = 1.0;
-
-            if (previousIsKat != ((TaikoDifficultyHitObject)current).IsKat)
-            {
-                returnVal = 1.5 - (1.75 / (sameTypeCount + 0.65));
-
-                if (previousIsKat)
-                {
-                    if (sameTypeCount % 2 == previousDonLengths[0] % 2)
-                    {
-                        returnMultiplier *= 0.8;
-                    }
-
-                    if (previousKatLengths[0] == sameTypeCount)
-                    {
-                        returnMultiplier *= 0.525;
-                    }
-
-                    if (previousKatLengths[1] == sameTypeCount)
-                    {
-                        returnMultiplier *= 0.75;
-                    }
-
-                    previousKatLengths[1] = previousKatLengths[0];
-                    previousKatLengths[0] = sameTypeCount;
-                }
-                else
-                {
-                    if (sameTypeCount % 2 == previousKatLengths[0] % 2)
-                    {
-                        returnMultiplier *= 0.8;
-                    }
-
-                    if (previousDonLengths[0] == sameTypeCount)
-                    {
-                        returnMultiplier *= 0.525;
-                    }
-
-                    if (previousDonLengths[1] == sameTypeCount)
-                    {
-                        returnMultiplier *= 0.75;
-                    }
-
-                    previousDonLengths[1] = previousDonLengths[0];
-                    previousDonLengths[0] = sameTypeCount;
-                }
-
-                sameTypeCount = 1;
-                previousIsKat = ((TaikoDifficultyHitObject)current).IsKat;
-            }
-
-            else
-            {
-                sameTypeCount += 1;
-            }
-
-            return Math.Min(1.25, returnVal) * returnMultiplier;
-        }
-
-        protected double StrainValueOfOld(DifficultyHitObject current)
-        {
-            double addition = 0;
-
-            // We get an extra addition if we are not a slider or spinner
             if (current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000)
             {
-                if (hasColourChange(current))
-                    addition = 0.75;
+
+                TaikoDifficultyHitObject currentHO = (TaikoDifficultyHitObject)current;
+
+                if (currentHO.IsKat == prevIsKat)
+                {
+                    currentMonoLength += 1;
+                }
+
+                else
+                {
+
+                    objectDifficulty = 1.0;
+
+                    if (monoHistoryLength > 0 && (monoHistory[monoHistoryLength - 1] + currentMonoLength) % 2 == 0)
+                    {
+                        objectDifficulty *= sameParityPenalty();
+                    }
+
+                    monoHistory.Add(currentMonoLength);
+                    monoHistoryLength += 1;
+
+                    if (monoHistoryLength > mono_history_max_length)
+                    {
+                        monoHistory.RemoveAt(0);
+                        monoHistoryLength -= 1;
+                    }
+
+                    for (int l = 2; l <= mono_history_max_length / 2; l++)
+                    {
+                        for (int start = monoHistoryLength - l - 1; start >= 0; start--)
+                        {
+                            bool samePattern = true;
+
+                            for (int i = 0; i < l; i++)
+                            {
+                                if (monoHistory[start + i] != monoHistory[monoHistoryLength - l + i])
+                                {
+                                    samePattern = false;
+                                }
+                            }
+
+                            if (samePattern) // Repitition found!
+                            {
+                                int notesSince = 0;
+                                for (int i = start; i < monoHistoryLength; i++) notesSince += monoHistory[i];
+                                objectDifficulty *= repititionPenalty(notesSince);
+                                break;
+                            }
+                        }
+                    }
+
+                    currentMonoLength = 1;
+                    prevIsKat = currentHO.IsKat;
+
+                }
+
             }
-            else
+
+            /*
+            string path = @"out.txt";
+            using (StreamWriter sw = File.AppendText(path))
             {
-                lastColourSwitch = ColourSwitch.None;
-                sameColourCount = 1;
+                if (((TaikoDifficultyHitObject)current).IsKat) sw.WriteLine("k    " + Math.Min(1.25, returnVal) * returnMultiplier);
+                else sw.WriteLine("d    " + Math.Min(1.25, returnVal) * returnMultiplier);
             }
+            */
 
-            return addition;
+            return objectDifficulty;
         }
 
-        private bool hasColourChange(DifficultyHitObject current)
-        {
-            var taikoCurrent = (TaikoDifficultyHitObject)current;
-
-            if (!taikoCurrent.HasTypeChange)
-            {
-                sameColourCount++;
-                return false;
-            }
-
-            var oldColourSwitch = lastColourSwitch;
-            var newColourSwitch = sameColourCount % 2 == 0 ? ColourSwitch.Even : ColourSwitch.Odd;
-
-            lastColourSwitch = newColourSwitch;
-            sameColourCount = 1;
-
-            // We only want a bonus if the parity of the color switch changes
-            return oldColourSwitch != ColourSwitch.None && oldColourSwitch != newColourSwitch;
-        }
-
-        private enum ColourSwitch
-        {
-            None,
-            Even,
-            Odd
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
index 2d99bac7a9..28198612b2 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
@@ -49,9 +49,13 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         // Penalty for notes so slow that alting is not necessary.
         private double speedPenalty(double noteLengthMS)
         {
+
             if (noteLengthMS < 80) return 1;
-            if (noteLengthMS < 160) return Math.Max(0, 1.4 - 0.005 * noteLengthMS);
-            if (noteLengthMS < 300) return 0.6;
+            // return Math.Max(0, 1.4 - 0.005 * noteLengthMS);
+            if (noteLengthMS < 210) return Math.Max(0, 1.4 - 0.005 * noteLengthMS);
+            if (noteLengthMS < 210) return 0.6;
+
+            currentStrain = 0.0;
             return 0.0;
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
index 75d3807bba..783f1ba696 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
@@ -7,6 +7,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 {
     public class TaikoDifficultyAttributes : DifficultyAttributes
     {
+        public double StaminaStrain;
+        public double RhythmStrain;
+        public double ColourStrain;
+        public double ApproachRate;
         public double GreatHitWindow;
         public int MaxCombo;
     }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 6e1fae01ee..2a6fa81a57 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -29,10 +29,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         {
         }
 
-        private double readingPenalty(double staminaDifficulty)
+        private double simpleColourPenalty(double staminaDifficulty, double colorDifficulty)
         {
-            return Math.Max(0, 1 - staminaDifficulty / 14);
-            // return 1;
+            return 0.79 - Math.Atan(staminaDifficulty / colorDifficulty - 12) / Math.PI / 2;
         }
 
         private double norm(double p, double v1, double v2, double v3)
@@ -48,15 +47,13 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         {
             if (sr <= 1) return sr;
             sr -= 1;
-            sr = 1.5 * Math.Pow(sr, 0.76);
+            sr = 1.6 * Math.Pow(sr, 0.7);
             sr += 1;
             return sr;
         }
 
-        private double combinedDifficulty(Skill colour, Skill rhythm, Skill stamina1, Skill stamina2)
+        private double combinedDifficulty(double staminaPenalty, Skill colour, Skill rhythm, Skill stamina1, Skill stamina2)
         {
-            double staminaRating = (stamina1.DifficultyValue() + stamina2.DifficultyValue()) * staminaSkillMultiplier;
-            double readingPenalty = this.readingPenalty(staminaRating);
 
             double difficulty = 0;
             double weight = 1;
@@ -64,9 +61,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             for (int i = 0; i < colour.StrainPeaks.Count; i++)
             {
-                double colourPeak = colour.StrainPeaks[i] * colourSkillMultiplier * readingPenalty;
+                double colourPeak = colour.StrainPeaks[i] * colourSkillMultiplier;
                 double rhythmPeak = rhythm.StrainPeaks[i] * rhythmSkillMultiplier;
-                double staminaPeak = (stamina1.StrainPeaks[i] + stamina2.StrainPeaks[i]) * staminaSkillMultiplier;
+                double staminaPeak = (stamina1.StrainPeaks[i] + stamina2.StrainPeaks[i]) * staminaSkillMultiplier * staminaPenalty;
                 peaks.Add(norm(2, colourPeak, rhythmPeak, staminaPeak));
             }
 
@@ -85,11 +82,13 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 return new TaikoDifficultyAttributes { Mods = mods, Skills = skills };
 
             double staminaRating = (skills[2].DifficultyValue() + skills[3].DifficultyValue()) * staminaSkillMultiplier;
-            double readingPenalty = this.readingPenalty(staminaRating);
-
-            double colourRating = skills[0].DifficultyValue() * colourSkillMultiplier * readingPenalty;
+            double colourRating = skills[0].DifficultyValue() * colourSkillMultiplier;
             double rhythmRating = skills[1].DifficultyValue() * rhythmSkillMultiplier;
-            double combinedRating = combinedDifficulty(skills[0], skills[1], skills[2], skills[3]);
+
+            double staminaPenalty = simpleColourPenalty(staminaRating, colourRating);
+            staminaRating *= staminaPenalty;
+
+            double combinedRating = combinedDifficulty(staminaPenalty, skills[0], skills[1], skills[2], skills[3]);
 
             // Console.WriteLine("colour\t" + colourRating);
             // Console.WriteLine("rhythm\t" + rhythmRating);
@@ -107,6 +106,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             {
                 StarRating = starRating,
                 Mods = mods,
+                StaminaStrain = staminaRating,
+                RhythmStrain = rhythmRating,
+                ColourStrain = colourRating,
                 // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be removed in the future
                 GreatHitWindow = (int)(hitWindows.WindowFor(HitResult.Great)) / clockRate,
                 MaxCombo = beatmap.HitObjects.Count(h => h is Hit),

From 12d65f305f24cdfd8dc0792d94eb4c6c5fa2f020 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 22:11:55 +0900
Subject: [PATCH 02896/10326] Simplify and fix incorrect seeking

---
 osu.Game/Screens/Edit/EditorClock.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 214b45f654..dd934c10cd 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -87,15 +87,7 @@ namespace osu.Game.Screens.Edit
 
         private void seek(int direction, bool snapped, double amount = 1)
         {
-            double current = CurrentTime;
-
-            // if a seek transform is active, use its end time instead of the reported current time.
-            var existingTransform = Transforms.OfType<TransformSeek>().FirstOrDefault();
-
-            // but only if the requested direction is in the same direction as the transform.
-            // this allows quick pivoting rather than resetting the transform for the first opposite direction movement.
-            if (existingTransform != null && Math.Sign(existingTransform.EndValue - current) == Math.Sign(direction))
-                current = existingTransform.EndValue;
+            double current = CurrentTimeAccurate;
 
             if (amount <= 0) throw new ArgumentException("Value should be greater than zero", nameof(amount));
 

From 83f4ba107f6b97185c0487bb75e45516e73aa52e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 May 2020 22:41:06 +0900
Subject: [PATCH 02897/10326] Fix defaults not being applied correctly to
 blueprints after StartTime is changed

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index e71ccc33a4..90a114bcdc 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Rulesets.Edit
 
         private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 
+        private Bindable<double> startTimeBindable;
+
         [Resolved]
         private IPlacementHandler placementHandler { get; set; }
 
@@ -55,7 +57,8 @@ namespace osu.Game.Rulesets.Edit
 
             EditorClock = clock;
 
-            ApplyDefaultsToHitObject();
+            startTimeBindable = HitObject.StartTimeBindable.GetBoundCopy();
+            startTimeBindable.BindValueChanged(_ => ApplyDefaultsToHitObject(), true);
         }
 
         /// <summary>

From 3d3cc2c15efbf4ac33e1a70cea6ec9dd4ecb8f5b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 22 May 2020 17:26:37 +0300
Subject: [PATCH 02898/10326] Dispose BeatmapOnlineLookupQueue cache download
 request

---
 osu.Game/Beatmaps/BeatmapManager.cs                        | 7 ++++++-
 .../Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs    | 7 ++++++-
 osu.Game/OsuGameBase.cs                                    | 1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 7aaf0ca08d..b286c054e9 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Beatmaps
     /// <summary>
     /// Handles the storage and retrieval of Beatmaps/WorkingBeatmaps.
     /// </summary>
-    public partial class BeatmapManager : DownloadableArchiveModelManager<BeatmapSetInfo, BeatmapSetFileInfo>
+    public partial class BeatmapManager : DownloadableArchiveModelManager<BeatmapSetInfo, BeatmapSetFileInfo>, IDisposable
     {
         /// <summary>
         /// Fired when a single difficulty has been hidden.
@@ -433,6 +433,11 @@ namespace osu.Game.Beatmaps
             return endTime - startTime;
         }
 
+        public void Dispose()
+        {
+            onlineLookupQueue?.Dispose();
+        }
+
         /// <summary>
         /// A dummy WorkingBeatmap for the purpose of retrieving a beatmap for star difficulty calculation.
         /// </summary>
diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index 2c79a664c5..d47d37806e 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Beatmaps
 {
     public partial class BeatmapManager
     {
-        private class BeatmapOnlineLookupQueue
+        private class BeatmapOnlineLookupQueue : IDisposable
         {
             private readonly IAPIProvider api;
             private readonly Storage storage;
@@ -180,6 +180,11 @@ namespace osu.Game.Beatmaps
                 return false;
             }
 
+            public void Dispose()
+            {
+                cacheDownloadRequest?.Dispose();
+            }
+
             [Serializable]
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             private class CachedOnlineBeatmapLookup
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index c367c3b636..453587df18 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -337,6 +337,7 @@ namespace osu.Game
         {
             base.Dispose(isDisposing);
             RulesetStore?.Dispose();
+            BeatmapManager?.Dispose();
 
             contextFactory.FlushConnections();
         }

From 554be1c4222eec67b7926c2a4a802b6130aeae35 Mon Sep 17 00:00:00 2001
From: Olle Kelderman <omkelderman@gmail.com>
Date: Fri, 22 May 2020 19:25:05 +0200
Subject: [PATCH 02899/10326] add the ability to set the size of the Tournament
 Client to an arbitrary value instead of a fixed 1080p option

---
 osu.Game.Tournament/Screens/SetupScreen.cs | 79 ++++++++++++++++++----
 1 file changed, 67 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index c91379b2d6..f9ec29d0c6 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tournament.Screens
         private FillFlowContainer fillFlow;
 
         private LoginOverlay loginOverlay;
-        private ActionableInfo resolution;
+        private ActionableInfoWithNumberBox resolution;
 
         [Resolved]
         private MatchIPCInfo ipc { get; set; }
@@ -108,18 +108,22 @@ namespace osu.Game.Tournament.Screens
                     Items = rulesets.AvailableRulesets,
                     Current = LadderInfo.Ruleset,
                 },
-                resolution = new ActionableInfo
+                resolution = new ActionableInfoWithNumberBox
                 {
                     Label = "Stream area resolution",
-                    ButtonText = "Set to 1080p",
-                    Action = () =>
+                    ButtonText = "Set size",
+                    Action = i =>
                     {
-                        windowSize.Value = new Size((int)(1920 / TournamentSceneManager.STREAM_AREA_WIDTH * TournamentSceneManager.REQUIRED_WIDTH), 1080);
+                        i = Math.Clamp(i, 480, 2160);
+                        windowSize.Value = new Size((int)(i * aspect_ratio / TournamentSceneManager.STREAM_AREA_WIDTH * TournamentSceneManager.REQUIRED_WIDTH), i);
+                        resolution.NumberValue = i;
                     }
                 },
             };
         }
 
+        private const float aspect_ratio = 16f / 9f;
+
         protected override void Update()
         {
             base.Update();
@@ -149,7 +153,7 @@ namespace osu.Game.Tournament.Screens
 
         private class ActionableInfo : LabelledDrawable<Drawable>
         {
-            private OsuButton button;
+            protected OsuButton Button;
 
             public ActionableInfo()
                 : base(true)
@@ -158,22 +162,22 @@ namespace osu.Game.Tournament.Screens
 
             public string ButtonText
             {
-                set => button.Text = value;
+                set => Button.Text = value;
             }
 
             public string Value
             {
-                set => valueText.Text = value;
+                set => ValueText.Text = value;
             }
 
             public bool Failing
             {
-                set => valueText.Colour = value ? Color4.Red : Color4.White;
+                set => ValueText.Colour = value ? Color4.Red : Color4.White;
             }
 
             public Action Action;
 
-            private TournamentSpriteText valueText;
+            protected TournamentSpriteText ValueText;
 
             protected override Drawable CreateComponent() => new Container
             {
@@ -181,12 +185,12 @@ namespace osu.Game.Tournament.Screens
                 RelativeSizeAxes = Axes.X,
                 Children = new Drawable[]
                 {
-                    valueText = new TournamentSpriteText
+                    ValueText = new TournamentSpriteText
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                     },
-                    button = new TriangleButton
+                    Button = new TriangleButton
                     {
                         Anchor = Anchor.CentreRight,
                         Origin = Anchor.CentreRight,
@@ -196,5 +200,56 @@ namespace osu.Game.Tournament.Screens
                 }
             };
         }
+
+        private class ActionableInfoWithNumberBox : ActionableInfo
+        {
+            public new Action<int> Action;
+
+            private OsuNumberBox numberBox;
+
+            public int NumberValue
+            {
+                get
+                {
+                    int.TryParse(numberBox.Text, out var val);
+                    return val;
+                }
+                set => numberBox.Text = value.ToString();
+            }
+
+            protected override Drawable CreateComponent() => new Container
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Children = new Drawable[]
+                {
+                    ValueText = new TournamentSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                    },
+                    numberBox = new OsuNumberBox
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Width = 100,
+                        Margin = new MarginPadding
+                        {
+                            Right = 110
+                        }
+                    },
+                    Button = new TriangleButton
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Size = new Vector2(100, 30),
+                        Action = () =>
+                        {
+                            if (numberBox.Text.Length > 0) Action?.Invoke(NumberValue);
+                        }
+                    },
+                }
+            };
+        }
     }
 }

From 0717dab8e4b730fcb11ff5d422ddf2f418aad01d Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Fri, 22 May 2020 19:51:08 +0200
Subject: [PATCH 02900/10326] Add StablePathSelectScreen visual test

---
 .../TestSceneStablePathSelectScreens.cs       | 30 +++++++++++++++++++
 .../Screens/StablePathSelectScreen.cs         |  5 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs
new file mode 100644
index 0000000000..f0c89ba4ca
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.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.Game.Tournament.Screens;
+using osu.Framework.Platform;
+
+namespace osu.Game.Tournament.Tests.Screens
+{
+    public class TestSceneStablePathSelectScreens : TournamentTestScene
+    {
+
+        public TestSceneStablePathSelectScreens()
+        {
+            AddStep("Add screen", () => Add(new TestSceneStablePathSelectScreen()));
+        }
+
+        private class TestSceneStablePathSelectScreen : StablePathSelectScreen
+        {
+            protected override void changePath(Storage storage)
+            {
+                Expire();
+            }
+
+            protected override void autoDetect()
+            {
+                Expire();
+            }
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index dcc26b8b1e..f706c42e1d 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -14,6 +14,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Components;
 using osuTK;
@@ -135,7 +136,7 @@ namespace osu.Game.Tournament.Screens
             });
         }
 
-        private void changePath(Storage storage)
+        protected virtual void changePath(Storage storage)
         {
             var target = directorySelector.CurrentDirectory.Value.FullName;
             stableInfo.StablePath.Value = target;
@@ -156,7 +157,7 @@ namespace osu.Game.Tournament.Screens
             sceneManager?.SetScreen(typeof(SetupScreen));
         }
 
-        private void autoDetect()
+        protected virtual void autoDetect()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
             fileBasedIpc?.LocateStableStorage();

From c6345ba6c94c41e53108b317c3199a3c98ed2cc1 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Fri, 22 May 2020 20:01:26 +0200
Subject: [PATCH 02901/10326] corrected styling issues

---
 .../Screens/TestSceneStablePathSelectScreens.cs          | 5 ++---
 osu.Game.Tournament/Screens/StablePathSelectScreen.cs    | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs
index f0c89ba4ca..4dfd4d35c8 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs
@@ -8,7 +8,6 @@ namespace osu.Game.Tournament.Tests.Screens
 {
     public class TestSceneStablePathSelectScreens : TournamentTestScene
     {
-
         public TestSceneStablePathSelectScreens()
         {
             AddStep("Add screen", () => Add(new TestSceneStablePathSelectScreen()));
@@ -16,12 +15,12 @@ namespace osu.Game.Tournament.Tests.Screens
 
         private class TestSceneStablePathSelectScreen : StablePathSelectScreen
         {
-            protected override void changePath(Storage storage)
+            protected override void ChangePath(Storage storage)
             {
                 Expire();
             }
 
-            protected override void autoDetect()
+            protected override void AutoDetect()
             {
                 Expire();
             }
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index f706c42e1d..609c601106 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -14,7 +14,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Dialog;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Components;
 using osuTK;
@@ -109,7 +108,7 @@ namespace osu.Game.Tournament.Screens
                                                 Origin = Anchor.Centre,
                                                 Width = 300,
                                                 Text = "Select stable path",
-                                                Action = () => changePath(storage)
+                                                Action = () => ChangePath(storage)
                                             },
                                             new TriangleButton
                                             {
@@ -117,7 +116,7 @@ namespace osu.Game.Tournament.Screens
                                                 Origin = Anchor.Centre,
                                                 Width = 300,
                                                 Text = "Auto detect",
-                                                Action = autoDetect
+                                                Action = AutoDetect
                                             },
                                         }
                                     }
@@ -136,7 +135,7 @@ namespace osu.Game.Tournament.Screens
             });
         }
 
-        protected virtual void changePath(Storage storage)
+        protected virtual void ChangePath(Storage storage)
         {
             var target = directorySelector.CurrentDirectory.Value.FullName;
             stableInfo.StablePath.Value = target;
@@ -157,7 +156,7 @@ namespace osu.Game.Tournament.Screens
             sceneManager?.SetScreen(typeof(SetupScreen));
         }
 
-        protected virtual void autoDetect()
+        protected virtual void AutoDetect()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
             fileBasedIpc?.LocateStableStorage();

From bc82c2d3b7b6995f77473ea9686f8404e16c3686 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 May 2020 10:44:53 +0900
Subject: [PATCH 02902/10326] Move drawable addition above event bindings

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 9ba3e30445..10f0855e33 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -40,10 +40,10 @@ namespace osu.Game.Rulesets.Osu.Edit
         [BackgroundDependencyLoader]
         private void load()
         {
+            LayerBelowRuleset.Add(distanceSnapGridContainer = new Container { RelativeSizeAxes = Axes.Both });
+
             EditorBeatmap.SelectedHitObjects.CollectionChanged += (_, __) => updateDistanceSnapGrid();
             EditorBeatmap.PlacementObject.ValueChanged += _ => updateDistanceSnapGrid();
-
-            LayerBelowRuleset.Add(distanceSnapGridContainer = new Container { RelativeSizeAxes = Axes.Both });
         }
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer() => new OsuBlueprintContainer(HitObjects);

From a8dbfe279159b3157b573f99a125c1fd4eda9060 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 May 2020 10:57:17 +0900
Subject: [PATCH 02903/10326] Fix distance snap grid not disappearing when
 exiting playfield

---
 .../Edit/OsuHitObjectComposer.cs              | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 10f0855e33..62287574ea 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -86,10 +86,24 @@ namespace osu.Game.Rulesets.Osu.Edit
             distanceSnapGridContainer.Clear();
             distanceSnapGridCache.Invalidate();
 
-            if (BlueprintContainer.CurrentTool is SelectTool && !EditorBeatmap.SelectedHitObjects.Any())
-                return;
+            switch (BlueprintContainer.CurrentTool)
+            {
+                case SelectTool _:
+                    if (!EditorBeatmap.SelectedHitObjects.Any())
+                        return;
 
-            if ((distanceSnapGrid = createDistanceSnapGrid(EditorBeatmap.SelectedHitObjects)) != null)
+                    distanceSnapGrid = createDistanceSnapGrid(EditorBeatmap.SelectedHitObjects);
+                    break;
+
+                default:
+                    if (!CursorInPlacementArea)
+                        return;
+
+                    distanceSnapGrid = createDistanceSnapGrid(Enumerable.Empty<HitObject>());
+                    break;
+            }
+
+            if (distanceSnapGrid != null)
             {
                 distanceSnapGridContainer.Add(distanceSnapGrid);
                 distanceSnapGridCache.Validate();

From 224a3ff462cbbaf45896578511f2769bc0134dda Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 May 2020 11:44:45 +0900
Subject: [PATCH 02904/10326] Add note about gameplay mechanics in osu!lazer

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 59d72247f5..336bf33f7e 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ 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.
 
+**IMPORTANT:** Gameplay mechanics (and other features which you may have come to know and love) are in a constant state of flux. Game balance and final quality-of-life passses come at the end of development, preceeded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to the stable releases of osu! (found on the website). We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
+
 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).

From edc46d1dce0e8f82e924de8becdb30a787b71031 Mon Sep 17 00:00:00 2001
From: Berkan Diler <b.diler@gmx.de>
Date: Sat, 23 May 2020 16:18:55 +0200
Subject: [PATCH 02905/10326] Fix osu.Game.Benchmarks

---
 osu.Game.Benchmarks/BenchmarkBeatmapParsing.cs | 6 +++---
 osu.Game.Benchmarks/osu.Game.Benchmarks.csproj | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Benchmarks/BenchmarkBeatmapParsing.cs b/osu.Game.Benchmarks/BenchmarkBeatmapParsing.cs
index 394fd75488..a6b7c8fcdb 100644
--- a/osu.Game.Benchmarks/BenchmarkBeatmapParsing.cs
+++ b/osu.Game.Benchmarks/BenchmarkBeatmapParsing.cs
@@ -8,7 +8,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.IO.Archives;
-using osu.Game.Resources;
+using osu.Game.Tests.Resources;
 
 namespace osu.Game.Benchmarks
 {
@@ -18,8 +18,8 @@ namespace osu.Game.Benchmarks
 
         public override void SetUp()
         {
-            using (var resources = new DllResourceStore(OsuResources.ResourceAssembly))
-            using (var archive = resources.GetStream("Beatmaps/241526 Soleily - Renatus.osz"))
+            using (var resources = new DllResourceStore(typeof(TestResources).Assembly))
+            using (var archive = resources.GetStream($"Resources/Archives/241526 Soleily - Renatus.osz"))
             using (var reader = new ZipArchiveReader(archive))
                 reader.GetStream("Soleily - Renatus (Gamu) [Insane].osu").CopyTo(beatmapStream);
         }
diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index 88fe8f1150..41e726e05c 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\osu.Game.Tests\osu.Game.Tests.csproj" />
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
 

From de60d509e8ac00b882d091b099f9171dfb4081f3 Mon Sep 17 00:00:00 2001
From: Berkan Diler <b.diler@gmx.de>
Date: Sat, 23 May 2020 17:01:34 +0200
Subject: [PATCH 02906/10326] Remove redundant string interpolation to fix CI

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

diff --git a/osu.Game.Benchmarks/BenchmarkBeatmapParsing.cs b/osu.Game.Benchmarks/BenchmarkBeatmapParsing.cs
index a6b7c8fcdb..1d207d04c7 100644
--- a/osu.Game.Benchmarks/BenchmarkBeatmapParsing.cs
+++ b/osu.Game.Benchmarks/BenchmarkBeatmapParsing.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Benchmarks
         public override void SetUp()
         {
             using (var resources = new DllResourceStore(typeof(TestResources).Assembly))
-            using (var archive = resources.GetStream($"Resources/Archives/241526 Soleily - Renatus.osz"))
+            using (var archive = resources.GetStream("Resources/Archives/241526 Soleily - Renatus.osz"))
             using (var reader = new ZipArchiveReader(archive))
                 reader.GetStream("Soleily - Renatus (Gamu) [Insane].osu").CopyTo(beatmapStream);
         }

From 5852a37eb7499ac3969def1845fd3e2115f3236d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 24 May 2020 11:48:56 +0900
Subject: [PATCH 02907/10326] Update with latest changes

---
 .../Difficulty/Skills/SpeedInvariantRhythm.cs                | 1 -
 .../Difficulty/TaikoDifficultyCalculator.cs                  | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
index 28198612b2..dd90463113 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
@@ -49,7 +49,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         // Penalty for notes so slow that alting is not necessary.
         private double speedPenalty(double noteLengthMS)
         {
-
             if (noteLengthMS < 80) return 1;
             // return Math.Max(0, 1.4 - 0.005 * noteLengthMS);
             if (noteLengthMS < 210) return Math.Max(0, 1.4 - 0.005 * noteLengthMS);
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 2a6fa81a57..dc2b68e0ca 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         private double simpleColourPenalty(double staminaDifficulty, double colorDifficulty)
         {
+            if (colorDifficulty <= 0) return 0.79 - 0.25;
             return 0.79 - Math.Atan(staminaDifficulty / colorDifficulty - 12) / Math.PI / 2;
         }
 
@@ -123,7 +124,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             for (int i = 2; i < beatmap.HitObjects.Count; i++)
             {
-                taikoDifficultyHitObjects.Add(new TaikoDifficultyHitObject(beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate, rhythm));
+                // Check for negative durations
+                if (beatmap.HitObjects[i].StartTime > beatmap.HitObjects[i - 1].StartTime && beatmap.HitObjects[i - 1].StartTime > beatmap.HitObjects[i - 2].StartTime)
+                    taikoDifficultyHitObjects.Add(new TaikoDifficultyHitObject(beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate, rhythm));
             }
 
             new StaminaCheeseDetector().FindCheese(taikoDifficultyHitObjects);

From c071fe61407440f6035d35f3fef2949036ad402e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 May 2020 13:44:11 +0900
Subject: [PATCH 02908/10326] Add the ability to export skins

---
 osu.Game/Beatmaps/BeatmapManager.cs           | 23 ---------------
 osu.Game/Database/ArchiveModelManager.cs      | 28 +++++++++++++++++++
 .../Overlays/Settings/Sections/SkinSection.cs | 24 ++++++++++++++++
 3 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b286c054e9..f626b45e42 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -27,7 +27,6 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
-using ZipArchive = SharpCompress.Archives.Zip.ZipArchive;
 
 namespace osu.Game.Beatmaps
 {
@@ -66,7 +65,6 @@ namespace osu.Game.Beatmaps
         private readonly AudioManager audioManager;
         private readonly GameHost host;
         private readonly BeatmapOnlineLookupQueue onlineLookupQueue;
-        private readonly Storage exportStorage;
 
         public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, AudioManager audioManager, GameHost host = null,
                               WorkingBeatmap defaultBeatmap = null)
@@ -83,7 +81,6 @@ namespace osu.Game.Beatmaps
             beatmaps.BeatmapRestored += b => beatmapRestored.Value = new WeakReference<BeatmapInfo>(b);
 
             onlineLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
-            exportStorage = storage.GetStorageForDirectory("exports");
         }
 
         protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize) =>
@@ -214,26 +211,6 @@ namespace osu.Game.Beatmaps
                 workingCache.Remove(working);
         }
 
-        /// <summary>
-        /// Exports a <see cref="BeatmapSetInfo"/> to an .osz package.
-        /// </summary>
-        /// <param name="set">The <see cref="BeatmapSetInfo"/> to export.</param>
-        public void Export(BeatmapSetInfo set)
-        {
-            var localSet = QueryBeatmapSet(s => s.ID == set.ID);
-
-            using (var archive = ZipArchive.Create())
-            {
-                foreach (var file in localSet.Files)
-                    archive.AddEntry(file.Filename, Files.Storage.GetStream(file.FileInfo.StoragePath));
-
-                using (var outputStream = exportStorage.GetStream($"{set}.osz", FileAccess.Write, FileMode.Create))
-                    archive.SaveTo(outputStream);
-
-                exportStorage.OpenInNativeExplorer();
-            }
-        }
-
         private readonly WeakList<WorkingBeatmap> workingCache = new WeakList<WorkingBeatmap>();
 
         /// <summary>
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 33b16cbaaf..3db367555f 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -22,6 +22,7 @@ using osu.Game.IO.Archives;
 using osu.Game.IPC;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Utils;
+using SharpCompress.Archives.Zip;
 using SharpCompress.Common;
 using FileInfo = osu.Game.IO.FileInfo;
 
@@ -82,6 +83,8 @@ namespace osu.Game.Database
         // ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised)
         private ArchiveImportIPCChannel ipc;
 
+        private readonly Storage exportStorage;
+
         protected ArchiveModelManager(Storage storage, IDatabaseContextFactory contextFactory, MutableDatabaseBackedStoreWithFileIncludes<TModel, TFileModel> modelStore, IIpcHost importHost = null)
         {
             ContextFactory = contextFactory;
@@ -90,6 +93,8 @@ namespace osu.Game.Database
             ModelStore.ItemAdded += item => handleEvent(() => itemAdded.Value = new WeakReference<TModel>(item));
             ModelStore.ItemRemoved += item => handleEvent(() => itemRemoved.Value = new WeakReference<TModel>(item));
 
+            exportStorage = storage.GetStorageForDirectory("exports");
+
             Files = new FileStore(contextFactory, storage);
 
             if (importHost != null)
@@ -369,6 +374,29 @@ namespace osu.Game.Database
             return item;
         }, cancellationToken, TaskCreationOptions.HideScheduler, import_scheduler).Unwrap();
 
+        /// <summary>
+        /// Exports an item to an legacy (.zip based) package.
+        /// </summary>
+        /// <param name="item">The item to export.</param>
+        public void Export(TModel item)
+        {
+            var retrievedItem = ModelStore.ConsumableItems.FirstOrDefault(s => s.ID == item.ID);
+
+            if (retrievedItem == null)
+                throw new ArgumentException("Specified model count not be found", nameof(item));
+
+            using (var archive = ZipArchive.Create())
+            {
+                foreach (var file in retrievedItem.Files)
+                    archive.AddEntry(file.Filename, Files.Storage.GetStream(file.FileInfo.StoragePath));
+
+                using (var outputStream = exportStorage.GetStream($"{item}{HandledExtensions.First()}", FileAccess.Write, FileMode.Create))
+                    archive.SaveTo(outputStream);
+
+                exportStorage.OpenInNativeExplorer();
+            }
+        }
+
         public void UpdateFile(TModel model, TFileModel file, Stream contents)
         {
             using (var usage = ContextFactory.GetForWrite())
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 94080f5592..a89f2c26c8 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Logging;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Skinning;
@@ -34,13 +35,33 @@ namespace osu.Game.Overlays.Settings.Sections
         private IBindable<WeakReference<SkinInfo>> managerAdded;
         private IBindable<WeakReference<SkinInfo>> managerRemoved;
 
+        private SettingsButton exportButton;
+
+        private Bindable<Skin> currentSkin;
+
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
             FlowContent.Spacing = new Vector2(0, 5);
+
             Children = new Drawable[]
             {
                 skinDropdown = new SkinSettingsDropdown(),
+                exportButton = new SettingsButton
+                {
+                    Text = "Export selected skin",
+                    Action = () =>
+                    {
+                        try
+                        {
+                            skins.Export(skins.CurrentSkin.Value.SkinInfo);
+                        }
+                        catch (Exception)
+                        {
+                            Logger.Log("Could not export current skin", level: LogLevel.Error);
+                        }
+                    }
+                },
                 new SettingsSlider<float, SizeSlider>
                 {
                     LabelText = "Menu cursor size",
@@ -81,6 +102,9 @@ namespace osu.Game.Overlays.Settings.Sections
             skinDropdown.Bindable = dropdownBindable;
             skinDropdown.Items = skins.GetAllUsableSkins().ToArray();
 
+            currentSkin = skins.CurrentSkin.GetBoundCopy();
+            currentSkin.BindValueChanged(skin => exportButton.Enabled.Value = skin.NewValue.SkinInfo.ID > 0);
+
             // Todo: This should not be necessary when OsuConfigManager is databased
             if (skinDropdown.Items.All(s => s.ID != configBindable.Value))
                 configBindable.Value = 0;

From f277b0c99f2a53f7b7bd92e0f748e1e206fe452c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 May 2020 22:30:56 +0900
Subject: [PATCH 02909/10326] Use better formatting for skin display (matching
 BeatmapMetadata)

---
 osu.Game/Skinning/SkinInfo.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index 6b9627188e..b9fe44ef3b 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -24,8 +24,6 @@ namespace osu.Game.Skinning
 
         public bool DeletePending { get; set; }
 
-        public string FullName => $"\"{Name}\" by {Creator}";
-
         public static SkinInfo Default { get; } = new SkinInfo
         {
             Name = "osu!lazer",
@@ -34,6 +32,10 @@ namespace osu.Game.Skinning
 
         public bool Equals(SkinInfo other) => other != null && ID == other.ID;
 
-        public override string ToString() => FullName;
+        public override string ToString()
+        {
+            string author = Creator == null ? string.Empty : $"({Creator})";
+            return $"{Name} {author}".Trim();
+        }
     }
 }

From 234fa2844574e81ac520b90974af0350b750f070 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 May 2020 22:34:31 +0900
Subject: [PATCH 02910/10326] Ensure export filename is valid

---
 osu.Game/Database/ArchiveModelManager.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 3db367555f..9fc1bfceb5 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -390,7 +390,7 @@ namespace osu.Game.Database
                 foreach (var file in retrievedItem.Files)
                     archive.AddEntry(file.Filename, Files.Storage.GetStream(file.FileInfo.StoragePath));
 
-                using (var outputStream = exportStorage.GetStream($"{item}{HandledExtensions.First()}", FileAccess.Write, FileMode.Create))
+                using (var outputStream = exportStorage.GetStream($"{getValidFilename(item.ToString())}{HandledExtensions.First()}", FileAccess.Write, FileMode.Create))
                     archive.SaveTo(outputStream);
 
                 exportStorage.OpenInNativeExplorer();
@@ -738,5 +738,12 @@ namespace osu.Game.Database
         }
 
         #endregion
+
+        private string getValidFilename(string filename)
+        {
+            foreach (char c in Path.GetInvalidFileNameChars())
+                filename = filename.Replace(c, '_');
+            return filename;
+        }
     }
 }

From 904d17224f75260783a416170ce6b53ee1edd8c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 May 2020 23:09:38 +0900
Subject: [PATCH 02911/10326] Fix english

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

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 9fc1bfceb5..f21f708f95 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -375,7 +375,7 @@ namespace osu.Game.Database
         }, cancellationToken, TaskCreationOptions.HideScheduler, import_scheduler).Unwrap();
 
         /// <summary>
-        /// Exports an item to an legacy (.zip based) package.
+        /// Exports an item to a legacy (.zip based) package.
         /// </summary>
         /// <param name="item">The item to export.</param>
         public void Export(TModel item)
@@ -383,7 +383,7 @@ namespace osu.Game.Database
             var retrievedItem = ModelStore.ConsumableItems.FirstOrDefault(s => s.ID == item.ID);
 
             if (retrievedItem == null)
-                throw new ArgumentException("Specified model count not be found", nameof(item));
+                throw new ArgumentException("Specified model could not be found", nameof(item));
 
             using (var archive = ZipArchive.Create())
             {

From 8ab65e4c5d3083682ea2fde406dbfcd229fca359 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 May 2020 23:15:24 +0900
Subject: [PATCH 02912/10326] Move implementation into own class

---
 .../Overlays/Settings/Sections/SkinSection.cs | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index a89f2c26c8..b84b9fec37 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -35,10 +35,6 @@ namespace osu.Game.Overlays.Settings.Sections
         private IBindable<WeakReference<SkinInfo>> managerAdded;
         private IBindable<WeakReference<SkinInfo>> managerRemoved;
 
-        private SettingsButton exportButton;
-
-        private Bindable<Skin> currentSkin;
-
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
@@ -47,21 +43,7 @@ namespace osu.Game.Overlays.Settings.Sections
             Children = new Drawable[]
             {
                 skinDropdown = new SkinSettingsDropdown(),
-                exportButton = new SettingsButton
-                {
-                    Text = "Export selected skin",
-                    Action = () =>
-                    {
-                        try
-                        {
-                            skins.Export(skins.CurrentSkin.Value.SkinInfo);
-                        }
-                        catch (Exception)
-                        {
-                            Logger.Log("Could not export current skin", level: LogLevel.Error);
-                        }
-                    }
-                },
+                new ExportSkinButton(),
                 new SettingsSlider<float, SizeSlider>
                 {
                     LabelText = "Menu cursor size",
@@ -102,9 +84,6 @@ namespace osu.Game.Overlays.Settings.Sections
             skinDropdown.Bindable = dropdownBindable;
             skinDropdown.Items = skins.GetAllUsableSkins().ToArray();
 
-            currentSkin = skins.CurrentSkin.GetBoundCopy();
-            currentSkin.BindValueChanged(skin => exportButton.Enabled.Value = skin.NewValue.SkinInfo.ID > 0);
-
             // Todo: This should not be necessary when OsuConfigManager is databased
             if (skinDropdown.Items.All(s => s.ID != configBindable.Value))
                 configBindable.Value = 0;
@@ -141,5 +120,35 @@ namespace osu.Game.Overlays.Settings.Sections
                 protected override DropdownMenu CreateMenu() => base.CreateMenu().With(m => m.MaxHeight = 200);
             }
         }
+
+        private class ExportSkinButton : SettingsButton
+        {
+            [Resolved]
+            private SkinManager skins { get; set; }
+
+            private Bindable<Skin> currentSkin;
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Text = "Export selected skin";
+                Action = export;
+
+                currentSkin = skins.CurrentSkin.GetBoundCopy();
+                currentSkin.BindValueChanged(skin => Enabled.Value = skin.NewValue.SkinInfo.ID > 0, true);
+            }
+
+            private void export()
+            {
+                try
+                {
+                    skins.Export(currentSkin.Value.SkinInfo);
+                }
+                catch (Exception e)
+                {
+                    Logger.Log($"Could not export current skin: {e.Message}", level: LogLevel.Error);
+                }
+            }
+        }
     }
 }

From 1062e07ec12f017da02a903f0ad1189468e8fe53 Mon Sep 17 00:00:00 2001
From: Olle Kelderman <omkelderman@gmail.com>
Date: Sun, 24 May 2020 22:24:46 +0200
Subject: [PATCH 02913/10326] refactor and implemented feedback:

- button text change
- renamed ActionableInfoWithNumberBox to ResolutionSelector and moved the clamping logic inside it
- also removed the ugly right margin and added the FillFlowContainer
---
 osu.Game.Tournament/Screens/SetupScreen.cs | 99 +++++++++++-----------
 1 file changed, 51 insertions(+), 48 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index f9ec29d0c6..33eefbe553 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tournament.Screens
         private FillFlowContainer fillFlow;
 
         private LoginOverlay loginOverlay;
-        private ActionableInfoWithNumberBox resolution;
+        private ResolutionSelector resolution;
 
         [Resolved]
         private MatchIPCInfo ipc { get; set; }
@@ -108,15 +108,13 @@ namespace osu.Game.Tournament.Screens
                     Items = rulesets.AvailableRulesets,
                     Current = LadderInfo.Ruleset,
                 },
-                resolution = new ActionableInfoWithNumberBox
+                resolution = new ResolutionSelector
                 {
                     Label = "Stream area resolution",
-                    ButtonText = "Set size",
+                    ButtonText = "Set height",
                     Action = i =>
                     {
-                        i = Math.Clamp(i, 480, 2160);
                         windowSize.Value = new Size((int)(i * aspect_ratio / TournamentSceneManager.STREAM_AREA_WIDTH * TournamentSceneManager.REQUIRED_WIDTH), i);
-                        resolution.NumberValue = i;
                     }
                 },
             };
@@ -167,17 +165,18 @@ namespace osu.Game.Tournament.Screens
 
             public string Value
             {
-                set => ValueText.Text = value;
+                set => valueText.Text = value;
             }
 
             public bool Failing
             {
-                set => ValueText.Colour = value ? Color4.Red : Color4.White;
+                set => valueText.Colour = value ? Color4.Red : Color4.White;
             }
 
             public Action Action;
 
-            protected TournamentSpriteText ValueText;
+            private TournamentSpriteText valueText;
+            protected FillFlowContainer FlowContainer;
 
             protected override Drawable CreateComponent() => new Container
             {
@@ -185,71 +184,75 @@ namespace osu.Game.Tournament.Screens
                 RelativeSizeAxes = Axes.X,
                 Children = new Drawable[]
                 {
-                    ValueText = new TournamentSpriteText
+                    valueText = new TournamentSpriteText
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                     },
-                    Button = new TriangleButton
+                    FlowContainer = new FillFlowContainer
                     {
                         Anchor = Anchor.CentreRight,
                         Origin = Anchor.CentreRight,
-                        Size = new Vector2(100, 30),
-                        Action = () => Action?.Invoke()
-                    },
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(10, 0),
+                        Children = new Drawable[]
+                        {
+                            Button = new TriangleButton
+                            {
+                                Size = new Vector2(100, 30),
+                                Action = () => Action?.Invoke()
+                            }
+                        }
+                    }
                 }
             };
         }
 
-        private class ActionableInfoWithNumberBox : ActionableInfo
+        private class ResolutionSelector : ActionableInfo
         {
+            private const int height_min_allowed_value = 480;
+            private const int height_max_allowed_value = 2160; // 4k
             public new Action<int> Action;
 
             private OsuNumberBox numberBox;
 
-            public int NumberValue
+            protected override Drawable CreateComponent()
             {
-                get
+                var drawable = base.CreateComponent();
+                FlowContainer.Insert(0, numberBox = new OsuNumberBox
                 {
-                    int.TryParse(numberBox.Text, out var val);
-                    return val;
-                }
-                set => numberBox.Text = value.ToString();
-            }
+                    Width = 100
+                });
+                FlowContainer.SetLayoutPosition(Button, 1);
 
-            protected override Drawable CreateComponent() => new Container
-            {
-                AutoSizeAxes = Axes.Y,
-                RelativeSizeAxes = Axes.X,
-                Children = new Drawable[]
+                base.Action = () =>
                 {
-                    ValueText = new TournamentSpriteText
+                    if (numberBox.Text.Length > 0)
                     {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                    },
-                    numberBox = new OsuNumberBox
-                    {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        Width = 100,
-                        Margin = new MarginPadding
+                        // box contains text
+                        if (!int.TryParse(numberBox.Text, out var number))
                         {
-                            Right = 110
+                            // at this point, the only reason we can arrive here is if the input number was too big to parse into an int
+                            // so clamp to max allowed value
+                            number = height_max_allowed_value;
                         }
-                    },
-                    Button = new TriangleButton
-                    {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        Size = new Vector2(100, 30),
-                        Action = () =>
+                        else
                         {
-                            if (numberBox.Text.Length > 0) Action?.Invoke(NumberValue);
+                            number = Math.Clamp(number, height_min_allowed_value, height_max_allowed_value);
                         }
-                    },
-                }
-            };
+
+                        // in case number got clamped, reset number in numberBox
+                        numberBox.Text = number.ToString();
+
+                        Action?.Invoke(number);
+                    }
+                    else
+                    {
+                        // TODO: input box was empty, give user feedback? do nothing?
+                    }
+                };
+                return drawable;
+            }
         }
     }
 }

From a174117880874df70d5cd07d210db4117a1d7cee Mon Sep 17 00:00:00 2001
From: Olle Kelderman <omkelderman@gmail.com>
Date: Mon, 25 May 2020 00:55:10 +0200
Subject: [PATCH 02914/10326] fix flowcontainer order properly and removed todo
 as its decided to do nothing there for now

---
 osu.Game.Tournament/Screens/SetupScreen.cs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 33eefbe553..bf328987fe 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Tournament.Screens
 
         private class ActionableInfo : LabelledDrawable<Drawable>
         {
-            protected OsuButton Button;
+            private OsuButton button;
 
             public ActionableInfo()
                 : base(true)
@@ -160,7 +160,7 @@ namespace osu.Game.Tournament.Screens
 
             public string ButtonText
             {
-                set => Button.Text = value;
+                set => button.Text = value;
             }
 
             public string Value
@@ -197,7 +197,7 @@ namespace osu.Game.Tournament.Screens
                         Spacing = new Vector2(10, 0),
                         Children = new Drawable[]
                         {
-                            Button = new TriangleButton
+                            button = new TriangleButton
                             {
                                 Size = new Vector2(100, 30),
                                 Action = () => Action?.Invoke()
@@ -219,11 +219,10 @@ namespace osu.Game.Tournament.Screens
             protected override Drawable CreateComponent()
             {
                 var drawable = base.CreateComponent();
-                FlowContainer.Insert(0, numberBox = new OsuNumberBox
+                FlowContainer.Insert(-1, numberBox = new OsuNumberBox
                 {
                     Width = 100
                 });
-                FlowContainer.SetLayoutPosition(Button, 1);
 
                 base.Action = () =>
                 {
@@ -246,10 +245,6 @@ namespace osu.Game.Tournament.Screens
 
                         Action?.Invoke(number);
                     }
-                    else
-                    {
-                        // TODO: input box was empty, give user feedback? do nothing?
-                    }
                 };
                 return drawable;
             }

From 1977affe7e6fac5e263011ba20768d1401dcafe3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 09:27:11 +0900
Subject: [PATCH 02915/10326] Fix OpenInNativeExplorer not working correctly
 for wrapped storages

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

diff --git a/osu.Game/IO/WrappedStorage.cs b/osu.Game/IO/WrappedStorage.cs
index 646faba9eb..cd775df0fd 100644
--- a/osu.Game/IO/WrappedStorage.cs
+++ b/osu.Game/IO/WrappedStorage.cs
@@ -69,7 +69,9 @@ namespace osu.Game.IO
 
         public override void DeleteDatabase(string name) => UnderlyingStorage.DeleteDatabase(MutatePath(name));
 
-        public override void OpenInNativeExplorer() => UnderlyingStorage.OpenInNativeExplorer();
+        public override void OpenInNativeExplorer() => UnderlyingStorage.OpenPathInNativeExplorer(subPath);
+
+        public override void OpenPathInNativeExplorer(string path) => UnderlyingStorage.OpenPathInNativeExplorer(MutatePath(path));
 
         public override Storage GetStorageForDirectory(string path)
         {

From 6904d5d2470c9164f593527a1bdc9d59a6d3f3bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 13:12:53 +0900
Subject: [PATCH 02916/10326] Remove unnecessary override

---
 osu.Game/IO/WrappedStorage.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/IO/WrappedStorage.cs b/osu.Game/IO/WrappedStorage.cs
index cd775df0fd..1dd3afbfae 100644
--- a/osu.Game/IO/WrappedStorage.cs
+++ b/osu.Game/IO/WrappedStorage.cs
@@ -69,8 +69,6 @@ namespace osu.Game.IO
 
         public override void DeleteDatabase(string name) => UnderlyingStorage.DeleteDatabase(MutatePath(name));
 
-        public override void OpenInNativeExplorer() => UnderlyingStorage.OpenPathInNativeExplorer(subPath);
-
         public override void OpenPathInNativeExplorer(string path) => UnderlyingStorage.OpenPathInNativeExplorer(MutatePath(path));
 
         public override Storage GetStorageForDirectory(string path)

From b44beb413729bb40dc5294c194454ea0707ddf3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 15:40:25 +0900
Subject: [PATCH 02917/10326] Remove double resolution of EditorClock

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 1e0507fc0a..e2bb8b5995 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         protected readonly HitObject HitObject;
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         protected EditorClock EditorClock { get; private set; }
 
         private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
@@ -85,9 +85,6 @@ namespace osu.Game.Rulesets.Edit
             PlacementActive = false;
         }
 
-        [Resolved(canBeNull: true)]
-        private EditorClock editorClock { get; set; }
-
         /// <summary>
         /// Updates the position of this <see cref="PlacementBlueprint"/> to a new screen-space position.
         /// </summary>
@@ -95,7 +92,7 @@ namespace osu.Game.Rulesets.Edit
         public virtual void UpdatePosition(SnapResult snapResult)
         {
             if (!PlacementActive)
-                HitObject.StartTime = snapResult.Time ?? editorClock?.CurrentTime ?? Time.Current;
+                HitObject.StartTime = snapResult.Time ?? EditorClock?.CurrentTime ?? Time.Current;
         }
 
         /// <summary>

From cd65fc860b56f7fb2132e547e93ab068e49b308b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 25 May 2020 16:15:55 +0900
Subject: [PATCH 02918/10326] Remove extra default application

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index e2bb8b5995..3541a78faa 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -56,8 +56,6 @@ namespace osu.Game.Rulesets.Edit
         {
             this.beatmap.BindTo(beatmap);
 
-            ApplyDefaultsToHitObject();
-
             startTimeBindable = HitObject.StartTimeBindable.GetBoundCopy();
             startTimeBindable.BindValueChanged(_ => ApplyDefaultsToHitObject(), true);
         }

From 6f4cd6111cbdeb04d4e22f88f1693bd9f05e9dad Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 25 May 2020 16:50:49 +0900
Subject: [PATCH 02919/10326] Drop obsoletion status for now

---
 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 8ff2bdefb3..6f9053d7cb 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -146,7 +146,6 @@ namespace osu.Game.Rulesets.Objects
 #pragma warning restore 618
         }
 
-        [Obsolete("Use the overload with cancellation support instead.")] // can be removed 20201115
         protected virtual void CreateNestedHitObjects()
         {
         }

From d09b579aeee7ca9ca75f78e3bc67754882f1800e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 09:32:24 +0000
Subject: [PATCH 02920/10326] Bump DiffPlex from 1.6.1 to 1.6.2

Bumps [DiffPlex](https://github.com/mmanela/diffplex) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/mmanela/diffplex/releases)
- [Commits](https://github.com/mmanela/diffplex/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 010ef8578a..dbaf0697a0 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Dapper" Version="2.0.35" />
-    <PackageReference Include="DiffPlex" Version="1.6.1" />
+    <PackageReference Include="DiffPlex" Version="1.6.2" />
     <PackageReference Include="Humanizer" Version="2.8.11" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 88b0c7dd8a..664a629369 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -75,7 +75,7 @@
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
-    <PackageReference Include="DiffPlex" Version="1.6.1" />
+    <PackageReference Include="DiffPlex" Version="1.6.2" />
     <PackageReference Include="Humanizer" Version="2.8.11" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />

From c4665048dbd036ee6f492eb45f00bde4a38eedd7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 09:34:26 +0000
Subject: [PATCH 02921/10326] Bump SharpCompress from 0.25.0 to 0.25.1

Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.25.0 to 0.25.1.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.25...0.25.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index dbaf0697a0..d8feb4df24 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="ppy.osu.Framework" Version="2020.519.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
-    <PackageReference Include="SharpCompress" Version="0.25.0" />
+    <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index 664a629369..6d74be5f85 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -81,7 +81,7 @@
     <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.519.0" />
-    <PackageReference Include="SharpCompress" Version="0.25.0" />
+    <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From af5fac471e56a2b819983ac49067e094e6ea8850 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 13:54:30 +0900
Subject: [PATCH 02922/10326] Remove unnecessary size propagation in
 HitObjectComposer

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 37 +++++----------------
 1 file changed, 9 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 1987148aed..e5479251b5 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -51,8 +51,6 @@ namespace osu.Game.Rulesets.Edit
 
         protected readonly Container LayerBelowRuleset = new Container { RelativeSizeAxes = Axes.Both };
 
-        private readonly List<Container> layerContainers = new List<Container>();
-
         private InputManager inputManager;
 
         private RadioButtonCollection toolboxCollection;
@@ -82,17 +80,6 @@ namespace osu.Game.Rulesets.Edit
                 return;
             }
 
-            var layerBelowRuleset = drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
-            {
-                LayerBelowRuleset,
-                new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
-            });
-
-            var layerAboveRuleset = drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChild(BlueprintContainer = CreateBlueprintContainer());
-
-            layerContainers.Add(layerBelowRuleset);
-            layerContainers.Add(layerAboveRuleset);
-
             InternalChild = new GridContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -116,9 +103,16 @@ namespace osu.Game.Rulesets.Edit
                             RelativeSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
-                                layerBelowRuleset,
+                                // layers below playfield
+                                drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
+                                {
+                                    LayerBelowRuleset,
+                                    new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
+                                }),
                                 drawableRulesetWrapper,
-                                layerAboveRuleset
+                                // layers above playfield
+                                drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer()
+                                                      .WithChild(BlueprintContainer = CreateBlueprintContainer())
                             }
                         }
                     },
@@ -162,19 +156,6 @@ namespace osu.Game.Rulesets.Edit
             inputManager = GetContainingInputManager();
         }
 
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            layerContainers.ForEach(l =>
-            {
-                l.Anchor = drawableRulesetWrapper.Playfield.Anchor;
-                l.Origin = drawableRulesetWrapper.Playfield.Origin;
-                l.Position = drawableRulesetWrapper.Playfield.Position;
-                l.Size = drawableRulesetWrapper.Playfield.Size;
-            });
-        }
-
         private void selectionChanged(object sender, NotifyCollectionChangedEventArgs changedArgs)
         {
             if (EditorBeatmap.SelectedHitObjects.Any())

From b8130bd3669f447a8179c13ba889207f261c262c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 18:26:21 +0900
Subject: [PATCH 02923/10326] Make mania selection blueprint abstract

---
 .../Edit/Blueprints/ManiaSelectionBlueprint.cs                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index b8574b804e..0089a9fbee 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public class ManiaSelectionBlueprint : OverlaySelectionBlueprint
+    public abstract class ManiaSelectionBlueprint : OverlaySelectionBlueprint
     {
         public new DrawableManiaHitObject DrawableObject => (DrawableManiaHitObject)base.DrawableObject;
 
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IManiaHitObjectComposer composer { get; set; }
 
-        public ManiaSelectionBlueprint(DrawableHitObject drawableObject)
+        protected ManiaSelectionBlueprint(DrawableHitObject drawableObject)
             : base(drawableObject)
         {
             RelativeSizeAxes = Axes.None;

From 2c16619ecd9efa009601eefd0fdc3068fc4e4838 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 18:26:28 +0900
Subject: [PATCH 02924/10326] Move time to position conversion to
 ScrollingHitObjectContainer

---
 osu.Game.Rulesets.Mania/UI/Column.cs          | 50 -----------
 .../Scrolling/ScrollingHitObjectContainer.cs  | 87 +++++++++++++++++++
 .../UI/Scrolling/ScrollingPlayfield.cs        | 13 +++
 3 files changed, 100 insertions(+), 50 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index be31954099..511d6c8623 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -17,7 +17,6 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -143,54 +142,5 @@ namespace osu.Game.Rulesets.Mania.UI
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
             // This probably shouldn't exist as is, but the columns in the stage are separated by a 1px border
             => DrawRectangle.Inflate(new Vector2(Stage.COLUMN_SPACING / 2, 0)).Contains(ToLocalSpace(screenSpacePos));
-
-        /// <summary>
-        /// Given a time, return the screen space position within this column.
-        /// </summary>
-        public Vector2 ScreenSpacePositionAtTime(double time)
-        {
-            var pos = ScrollingInfo.Algorithm.PositionAt(time, Time.Current, ScrollingInfo.TimeRange.Value, HitObjectContainer.DrawHeight);
-
-            switch (ScrollingInfo.Direction.Value)
-            {
-                case ScrollingDirection.Down:
-                    // We're dealing with screen coordinates in which the position decreases towards the centre of the screen resulting in an increase in start time.
-                    // The scrolling algorithm instead assumes a top anchor meaning an increase in time corresponds to an increase in position,
-                    // so when scrolling downwards the coordinates need to be flipped.
-                    pos = HitObjectContainer.DrawHeight - pos;
-
-                    // Blueprints are centred on the mouse position, such that the hitobject position is anchored at the top or bottom of the blueprint depending on the scroll direction.
-                    pos -= DefaultNotePiece.NOTE_HEIGHT / 2;
-                    break;
-
-                case ScrollingDirection.Up:
-                    pos += DefaultNotePiece.NOTE_HEIGHT / 2;
-                    break;
-            }
-
-            return HitObjectContainer.ToScreenSpace(new Vector2(HitObjectContainer.DrawWidth / 2, pos));
-        }
-
-        /// <summary>
-        /// Given a position in screen space, return the time within this column.
-        /// </summary>
-        public double TimeAtScreenSpacePosition(Vector2 screenSpacePosition)
-        {
-            // convert to local space of column so we can snap and fetch correct location.
-            Vector2 localPosition = HitObjectContainer.ToLocalSpace(screenSpacePosition);
-
-            switch (ScrollingInfo.Direction.Value)
-            {
-                case ScrollingDirection.Down:
-                    // as above
-                    localPosition.Y = HitObjectContainer.DrawHeight - localPosition.Y;
-                    break;
-            }
-
-            // offset for the fact that blueprints are centered, as above.
-            localPosition.Y -= DefaultNotePiece.NOTE_HEIGHT / 2;
-
-            return ScrollingInfo.Algorithm.TimeAt(localPosition.Y, Time.Current, ScrollingInfo.TimeRange.Value, HitObjectContainer.DrawHeight);
-        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 15e625872d..4ef2c04f23 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Layout;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
+using osuTK;
 
 namespace osu.Game.Rulesets.UI.Scrolling
 {
@@ -78,6 +79,92 @@ namespace osu.Game.Rulesets.UI.Scrolling
             hitObjectInitialStateCache.Clear();
         }
 
+        public double TimeAtScreenSpace(Vector2 screenSpacePosition)
+        {
+            // convert to local space of column so we can snap and fetch correct location.
+            Vector2 localPosition = ToLocalSpace(screenSpacePosition);
+
+            float position = 0;
+
+            switch (scrollingInfo.Direction.Value)
+            {
+                case ScrollingDirection.Up:
+                case ScrollingDirection.Down:
+                    position = localPosition.Y;
+                    break;
+
+                case ScrollingDirection.Right:
+                case ScrollingDirection.Left:
+                    position = localPosition.X;
+                    break;
+            }
+
+            flipPositionIfRequired(ref position);
+
+            return scrollingInfo.Algorithm.TimeAt(position, Time.Current, scrollingInfo.TimeRange.Value, getLength());
+        }
+
+        public Vector2 ScreenSpacePositionAtTime(double time)
+        {
+            var pos = scrollingInfo.Algorithm.PositionAt(time, Time.Current, scrollingInfo.TimeRange.Value, getLength());
+
+            flipPositionIfRequired(ref pos);
+
+            switch (scrollingInfo.Direction.Value)
+            {
+                case ScrollingDirection.Up:
+                case ScrollingDirection.Down:
+                    return ToScreenSpace(new Vector2(getBredth() / 2, pos));
+
+                default:
+                    return ToScreenSpace(new Vector2(pos, getBredth() / 2));
+            }
+        }
+
+        private float getLength()
+        {
+            switch (scrollingInfo.Direction.Value)
+            {
+                case ScrollingDirection.Left:
+                case ScrollingDirection.Right:
+                    return DrawWidth;
+
+                default:
+                    return DrawHeight;
+            }
+        }
+
+        private float getBredth()
+        {
+            switch (scrollingInfo.Direction.Value)
+            {
+                case ScrollingDirection.Up:
+                case ScrollingDirection.Down:
+                    return DrawWidth;
+
+                default:
+                    return DrawHeight;
+            }
+        }
+
+        private void flipPositionIfRequired(ref float position)
+        {
+            // We're dealing with screen coordinates in which the position decreases towards the centre of the screen resulting in an increase in start time.
+            // The scrolling algorithm instead assumes a top anchor meaning an increase in time corresponds to an increase in position,
+            // so when scrolling downwards the coordinates need to be flipped.
+
+            switch (scrollingInfo.Direction.Value)
+            {
+                case ScrollingDirection.Down:
+                    position = DrawHeight - position;
+                    break;
+
+                case ScrollingDirection.Right:
+                    position = DrawWidth - position;
+                    break;
+            }
+        }
+
         private void onDefaultsApplied(DrawableHitObject drawableObject)
         {
             // The cache may not exist if the hitobject state hasn't been computed yet (e.g. if the hitobject was added + defaults applied in the same frame).
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index fd143a3687..1ccde9b1e3 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
 
 namespace osu.Game.Rulesets.UI.Scrolling
 {
@@ -23,6 +24,18 @@ namespace osu.Game.Rulesets.UI.Scrolling
             Direction.BindTo(ScrollingInfo.Direction);
         }
 
+        /// <summary>
+        /// Given a position in screen space, return the time within this column.
+        /// </summary>
+        public virtual double TimeAtScreenSpacePosition(Vector2 screenSpacePosition) =>
+            ((ScrollingHitObjectContainer)HitObjectContainer).TimeAtScreenSpace(screenSpacePosition);
+
+        /// <summary>
+        /// Given a time, return the screen space position within this column.
+        /// </summary>
+        public virtual Vector2 ScreenSpacePositionAtTime(double time)
+            => ((ScrollingHitObjectContainer)HitObjectContainer).ScreenSpacePositionAtTime(time);
+
         protected sealed override HitObjectContainer CreateHitObjectContainer() => new ScrollingHitObjectContainer();
     }
 }

From e7442ec3a287d7887747bb392e5502bb8fcca387 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 19:21:53 +0900
Subject: [PATCH 02925/10326] Remove need for ManiaSnapResult

---
 .../ManiaPlacementBlueprintTestScene.cs       |  2 +-
 .../Blueprints/HoldNotePlacementBlueprint.cs  |  4 ++--
 .../Blueprints/ManiaPlacementBlueprint.cs     |  2 +-
 .../Edit/Blueprints/NotePlacementBlueprint.cs |  4 ++--
 .../Edit/ManiaHitObjectComposer.cs            | 19 ++--------------
 .../Edit/ManiaSnapResult.cs                   | 20 -----------------
 .../Edit/OsuHitObjectComposer.cs              |  2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 22 ++++++++++++++++++-
 osu.Game/Rulesets/Edit/SnapResult.cs          |  6 ++++-
 9 files changed, 35 insertions(+), 46 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Edit/ManiaSnapResult.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
index fd18907d96..1119a66f63 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             var time = column.TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
             var pos = column.ScreenSpacePositionAtTime(time);
 
-            return new ManiaSnapResult(pos, time, column);
+            return new SnapResult(pos, time, column);
         }
 
         protected override Container CreateHitObjectContainer() => new ScrollingTestContainer(ScrollingDirection.Down) { RelativeSizeAxes = Axes.Both };
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index b757c17a48..cd549ab6aa 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -78,9 +78,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             }
             else
             {
-                if (result is ManiaSnapResult maniaResult)
+                if (result.Playfield != null)
                 {
-                    headPiece.Width = tailPiece.Width = maniaResult.Column.DrawWidth;
+                    headPiece.Width = tailPiece.Width = result.Playfield.DrawWidth;
                     headPiece.X = tailPiece.X = ToLocalSpace(result.ScreenSpacePosition).X;
                 }
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index d173da9d9a..27a279e044 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             base.UpdatePosition(result);
 
             if (!PlacementActive)
-                Column = (result as ManiaSnapResult)?.Column;
+                Column = result.Playfield as Column;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index 5f6db2e6dd..684004b558 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -26,9 +26,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         {
             base.UpdatePosition(result);
 
-            if (result is ManiaSnapResult maniaResult)
+            if (result.Playfield != null)
             {
-                piece.Width = maniaResult.Column.DrawWidth;
+                piece.Width = result.Playfield.DrawWidth;
                 piece.Position = ToLocalSpace(result.ScreenSpacePosition);
             }
         }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 683e921cbf..83bf202674 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -53,23 +53,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public IScrollingInfo ScrollingInfo => drawableRuleset.ScrollingInfo;
 
-        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
-        {
-            var column = Playfield.GetColumnByPosition(screenSpacePosition);
-
-            if (column == null)
-                return new SnapResult(screenSpacePosition, null);
-
-            double targetTime = column.TimeAtScreenSpacePosition(screenSpacePosition);
-
-            // apply beat snapping
-            targetTime = BeatSnapProvider.SnapTime(targetTime);
-
-            // convert back to screen space
-            screenSpacePosition = column.ScreenSpacePositionAtTime(targetTime);
-
-            return new ManiaSnapResult(screenSpacePosition, targetTime, column);
-        }
+        protected override Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpacePosition) =>
+            Playfield.GetColumnByPosition(screenSpacePosition);
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
         {
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSnapResult.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSnapResult.cs
deleted file mode 100644
index b94f5e51c4..0000000000
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSnapResult.cs
+++ /dev/null
@@ -1,20 +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.Edit;
-using osu.Game.Rulesets.Mania.UI;
-using osuTK;
-
-namespace osu.Game.Rulesets.Mania.Edit
-{
-    public class ManiaSnapResult : SnapResult
-    {
-        public readonly Column Column;
-
-        public ManiaSnapResult(Vector2 screenSpacePosition, double time, Column column)
-            : base(screenSpacePosition, time)
-        {
-            Column = column;
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 62287574ea..9e7dc11fdd 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             (Vector2 pos, double time) = distanceSnapGrid.GetSnappedPosition(distanceSnapGrid.ToLocalSpace(screenSpacePosition));
 
-            return new SnapResult(distanceSnapGrid.ToScreenSpace(pos), time);
+            return new SnapResult(distanceSnapGrid.ToScreenSpace(pos), time, PlayfieldAtScreenSpacePosition(screenSpacePosition));
         }
 
         private void updateDistanceSnapGrid()
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 1987148aed..b26284c060 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -19,6 +19,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components.RadioButtons;
 using osu.Game.Screens.Edit.Compose;
@@ -224,7 +225,26 @@ namespace osu.Game.Rulesets.Edit
 
         public void Delete(HitObject hitObject) => EditorBeatmap.Remove(hitObject);
 
-        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) => new SnapResult(screenSpacePosition, null);
+        protected virtual Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpacePosition) => drawableRulesetWrapper.Playfield;
+
+        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
+        {
+            var playfield = PlayfieldAtScreenSpacePosition(screenSpacePosition);
+            double? targetTime = null;
+
+            if (playfield is ScrollingPlayfield scrollingPlayfield)
+            {
+                targetTime = scrollingPlayfield.TimeAtScreenSpacePosition(screenSpacePosition);
+
+                // apply beat snapping
+                targetTime = BeatSnapProvider.SnapTime(targetTime.Value);
+
+                // convert back to screen space
+                screenSpacePosition = scrollingPlayfield.ScreenSpacePositionAtTime(targetTime.Value);
+            }
+
+            return new SnapResult(screenSpacePosition, targetTime, playfield);
+        }
 
         public override float GetBeatSnapDistanceAt(double referenceTime)
         {
diff --git a/osu.Game/Rulesets/Edit/SnapResult.cs b/osu.Game/Rulesets/Edit/SnapResult.cs
index 5d07d7b233..31dd2b9496 100644
--- a/osu.Game/Rulesets/Edit/SnapResult.cs
+++ b/osu.Game/Rulesets/Edit/SnapResult.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.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Edit
@@ -20,10 +21,13 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public double? Time;
 
-        public SnapResult(Vector2 screenSpacePosition, double? time)
+        public readonly Playfield Playfield;
+
+        public SnapResult(Vector2 screenSpacePosition, double? time, Playfield playfield = null)
         {
             ScreenSpacePosition = screenSpacePosition;
             Time = time;
+            Playfield = playfield;
         }
     }
 }

From 827345ed88f6dd6792ebd1cfc4a16989cd163723 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 20:21:06 +0900
Subject: [PATCH 02926/10326] Fix mania offsets

---
 .../Blueprints/HoldNotePlacementBlueprint.cs  | 17 ++++++++++++++
 .../Edit/ManiaHitObjectComposer.cs            | 23 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index cd549ab6aa..500b26917d 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -8,6 +8,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Input;
 
@@ -22,6 +23,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IManiaHitObjectComposer composer { get; set; }
 
+        [Resolved]
+        private IScrollingInfo scrollingInfo { get; set; }
+
         public HoldNotePlacementBlueprint()
             : base(new HoldNote())
         {
@@ -43,6 +47,19 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             {
                 headPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.StartTime)).Y;
                 tailPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.EndTime)).Y;
+
+                switch (scrollingInfo.Direction.Value)
+                {
+                    case ScrollingDirection.Down:
+                        headPiece.Y -= headPiece.DrawHeight / 2;
+                        tailPiece.Y -= tailPiece.DrawHeight / 2;
+                        break;
+
+                    case ScrollingDirection.Up:
+                        headPiece.Y += headPiece.DrawHeight / 2;
+                        tailPiece.Y += tailPiece.DrawHeight / 2;
+                        break;
+                }
             }
 
             var topPosition = new Vector2(headPiece.DrawPosition.X, Math.Min(headPiece.DrawPosition.Y, tailPiece.DrawPosition.Y));
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 83bf202674..73cbadc97c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Input;
+using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -56,6 +57,28 @@ namespace osu.Game.Rulesets.Mania.Edit
         protected override Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpacePosition) =>
             Playfield.GetColumnByPosition(screenSpacePosition);
 
+        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
+        {
+            var result = base.SnapScreenSpacePositionToValidTime(screenSpacePosition);
+
+            switch (ScrollingInfo.Direction.Value)
+            {
+                case ScrollingDirection.Down:
+                    result.ScreenSpacePosition -= new Vector2(0, getNoteHeight() / 2);
+                    break;
+
+                case ScrollingDirection.Up:
+                    result.ScreenSpacePosition += new Vector2(0, getNoteHeight() / 2);
+                    break;
+            }
+
+            return result;
+        }
+
+        private float getNoteHeight() =>
+            Playfield.GetColumn(0).ToScreenSpace(new Vector2(DefaultNotePiece.NOTE_HEIGHT)).Y -
+            Playfield.GetColumn(0).ToScreenSpace(Vector2.Zero).Y;
+
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
         {
             drawableRuleset = new DrawableManiaEditRuleset(ruleset, beatmap, mods);

From 8fc60d12c910dabdb765a93a403ab928d488a506 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 22:09:09 +0900
Subject: [PATCH 02927/10326] Add back comments

---
 .../Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 4ef2c04f23..544468fd47 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -79,6 +79,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
             hitObjectInitialStateCache.Clear();
         }
 
+        /// <summary>
+        /// Given a position in screen space, return the time within this column.
+        /// </summary>
         public double TimeAtScreenSpace(Vector2 screenSpacePosition)
         {
             // convert to local space of column so we can snap and fetch correct location.
@@ -104,6 +107,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
             return scrollingInfo.Algorithm.TimeAt(position, Time.Current, scrollingInfo.TimeRange.Value, getLength());
         }
 
+        /// <summary>
+        /// Given a time, return the screen space position within this column.
+        /// </summary>
         public Vector2 ScreenSpacePositionAtTime(double time)
         {
             var pos = scrollingInfo.Algorithm.PositionAt(time, Time.Current, scrollingInfo.TimeRange.Value, getLength());

From cf341998c360fb3389dea953344c8bbc49cd11b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 22:55:21 +0900
Subject: [PATCH 02928/10326] 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 f0f16d3763..b7d08fb120 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.519.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.525.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d8feb4df24..d5017a436f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.519.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.525.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 6d74be5f85..19a36f1e1f 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.Framework.iOS" Version="2020.519.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.525.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.519.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.525.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 4c3900cfc8a390f61b0252abec07cb61f6309c87 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 May 2020 17:16:40 +0200
Subject: [PATCH 02929/10326] Remove unnecessary comments, simplify initialPath
 and clarified TestScene name

---
 .../Screens/TestSceneStablePathSelectScreens.cs       |  8 ++++----
 osu.Game.Tournament/Screens/StablePathSelectScreen.cs | 11 +----------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs
index 4dfd4d35c8..ce0626dd0f 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs
@@ -6,14 +6,14 @@ using osu.Framework.Platform;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneStablePathSelectScreens : TournamentTestScene
+    public class TestSceneStablePathSelectScreen : TournamentTestScene
     {
-        public TestSceneStablePathSelectScreens()
+        public TestSceneStablePathSelectScreen()
         {
-            AddStep("Add screen", () => Add(new TestSceneStablePathSelectScreen()));
+            AddStep("Add screen", () => Add(new StablePathSelectTestScreen()));
         }
 
-        private class TestSceneStablePathSelectScreen : StablePathSelectScreen
+        private class StablePathSelectTestScreen : StablePathSelectScreen
         {
             protected override void ChangePath(Storage storage)
             {
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 609c601106..d2c7225909 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -38,14 +38,7 @@ namespace osu.Game.Tournament.Screens
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuColour colours)
         {
-            // begin selection in the parent directory of the current storage location
-            var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
-
-            if (!string.IsNullOrEmpty(stableInfo.StablePath.Value))
-            {
-                // If the original path info for osu! stable is not empty, set it to the parent directory of that location
-                initialPath = new DirectoryInfo(stableInfo.StablePath.Value).Parent?.FullName;
-            }
+           var initialPath = new DirectoryInfo(storage.GetFullPath(stableInfo.StablePath.Value ?? string.Empty)).Parent?.FullName;
 
             AddRangeInternal(new Drawable[]
             {
@@ -148,7 +141,6 @@ namespace osu.Game.Tournament.Screens
                 AddInternal(overlay);
                 Logger.Log("Folder is not an osu! stable CE directory");
                 return;
-                // Return an error in the picker that the directory does not contain ipc.txt
             }
 
             var fileBasedIpc = ipc as FileBasedIPC;
@@ -163,7 +155,6 @@ namespace osu.Game.Tournament.Screens
 
             if (fileBasedIpc?.IPCStorage == null)
             {
-                // Could not auto detect
                 overlay = new DialogOverlay();
                 overlay.Push(new IPCErrorDialog("Failed to auto detect", "An osu! stable cutting-edge installation could not be auto detected.\nPlease try and manually point to the directory."));
                 AddInternal(overlay);

From 719da489221850d009c7a87389e3c25edf9a9bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 25 May 2020 20:11:00 +0200
Subject: [PATCH 02930/10326] Rename delegate argument

---
 osu.Game.Tournament/Screens/SetupScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index bf328987fe..0ecab449ec 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -112,9 +112,9 @@ namespace osu.Game.Tournament.Screens
                 {
                     Label = "Stream area resolution",
                     ButtonText = "Set height",
-                    Action = i =>
+                    Action = height =>
                     {
-                        windowSize.Value = new Size((int)(i * aspect_ratio / TournamentSceneManager.STREAM_AREA_WIDTH * TournamentSceneManager.REQUIRED_WIDTH), i);
+                        windowSize.Value = new Size((int)(height * aspect_ratio / TournamentSceneManager.STREAM_AREA_WIDTH * TournamentSceneManager.REQUIRED_WIDTH), height);
                     }
                 },
             };

From ca68d94cf7aa7acec4d638f61934836bd3c2b3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 25 May 2020 20:18:17 +0200
Subject: [PATCH 02931/10326] Invert if to reduce nesting

---
 osu.Game.Tournament/Screens/SetupScreen.cs | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 0ecab449ec..f8895f4703 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -226,25 +226,25 @@ namespace osu.Game.Tournament.Screens
 
                 base.Action = () =>
                 {
-                    if (numberBox.Text.Length > 0)
+                    if (string.IsNullOrEmpty(numberBox.Text))
+                        return;
+
+                    // box contains text
+                    if (!int.TryParse(numberBox.Text, out var number))
                     {
-                        // box contains text
-                        if (!int.TryParse(numberBox.Text, out var number))
-                        {
-                            // at this point, the only reason we can arrive here is if the input number was too big to parse into an int
-                            // so clamp to max allowed value
-                            number = height_max_allowed_value;
-                        }
-                        else
-                        {
-                            number = Math.Clamp(number, height_min_allowed_value, height_max_allowed_value);
-                        }
-
-                        // in case number got clamped, reset number in numberBox
-                        numberBox.Text = number.ToString();
-
-                        Action?.Invoke(number);
+                        // at this point, the only reason we can arrive here is if the input number was too big to parse into an int
+                        // so clamp to max allowed value
+                        number = height_max_allowed_value;
                     }
+                    else
+                    {
+                        number = Math.Clamp(number, height_min_allowed_value, height_max_allowed_value);
+                    }
+
+                    // in case number got clamped, reset number in numberBox
+                    numberBox.Text = number.ToString();
+
+                    Action?.Invoke(number);
                 };
                 return drawable;
             }

From 748f7fcd8b914ff7e84d0f29463142b18a6b244d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 25 May 2020 20:20:26 +0200
Subject: [PATCH 02932/10326] Rename constants

---
 osu.Game.Tournament/Screens/SetupScreen.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index f8895f4703..e1594de69e 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -210,8 +210,8 @@ namespace osu.Game.Tournament.Screens
 
         private class ResolutionSelector : ActionableInfo
         {
-            private const int height_min_allowed_value = 480;
-            private const int height_max_allowed_value = 2160; // 4k
+            private const int minimum_window_height = 480;
+            private const int maximum_window_height = 2160; // 4k
             public new Action<int> Action;
 
             private OsuNumberBox numberBox;
@@ -234,11 +234,11 @@ namespace osu.Game.Tournament.Screens
                     {
                         // at this point, the only reason we can arrive here is if the input number was too big to parse into an int
                         // so clamp to max allowed value
-                        number = height_max_allowed_value;
+                        number = maximum_window_height;
                     }
                     else
                     {
-                        number = Math.Clamp(number, height_min_allowed_value, height_max_allowed_value);
+                        number = Math.Clamp(number, minimum_window_height, maximum_window_height);
                     }
 
                     // in case number got clamped, reset number in numberBox

From d69111c665079d495906232e24a49c640c7fe6e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 10:17:34 +0900
Subject: [PATCH 02933/10326] Fix spelling of breadth

---
 .../Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 544468fd47..9b84b67241 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -120,10 +120,10 @@ namespace osu.Game.Rulesets.UI.Scrolling
             {
                 case ScrollingDirection.Up:
                 case ScrollingDirection.Down:
-                    return ToScreenSpace(new Vector2(getBredth() / 2, pos));
+                    return ToScreenSpace(new Vector2(getBreadth() / 2, pos));
 
                 default:
-                    return ToScreenSpace(new Vector2(pos, getBredth() / 2));
+                    return ToScreenSpace(new Vector2(pos, getBreadth() / 2));
             }
         }
 
@@ -140,7 +140,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
             }
         }
 
-        private float getBredth()
+        private float getBreadth()
         {
             switch (scrollingInfo.Direction.Value)
             {

From 417e31d77f87b66087e00c8918c83bef0fbfcbf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 10:17:56 +0900
Subject: [PATCH 02934/10326] Rename function for consistency

---
 osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs | 2 +-
 osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 9b84b67241..c817d84d5c 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// <summary>
         /// Given a position in screen space, return the time within this column.
         /// </summary>
-        public double TimeAtScreenSpace(Vector2 screenSpacePosition)
+        public double TimeAtScreenSpacePosition(Vector2 screenSpacePosition)
         {
             // convert to local space of column so we can snap and fetch correct location.
             Vector2 localPosition = ToLocalSpace(screenSpacePosition);
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 1ccde9b1e3..9dac3f4de1 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// Given a position in screen space, return the time within this column.
         /// </summary>
         public virtual double TimeAtScreenSpacePosition(Vector2 screenSpacePosition) =>
-            ((ScrollingHitObjectContainer)HitObjectContainer).TimeAtScreenSpace(screenSpacePosition);
+            ((ScrollingHitObjectContainer)HitObjectContainer).TimeAtScreenSpacePosition(screenSpacePosition);
 
         /// <summary>
         /// Given a time, return the screen space position within this column.

From 13bd6be8a3e2bf97ab9fb0bf19c7cf732ddcd5cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 11:29:56 +0900
Subject: [PATCH 02935/10326] Convert wait steps into until steps

---
 .../Background/TestSceneUserDimBackgrounds.cs | 53 ++++++-------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 76d0c7a50f..edba462bc2 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -79,11 +79,9 @@ namespace osu.Game.Tests.Visual.Background
                 InputManager.MoveMouseTo(playerLoader.ScreenPos);
                 InputManager.MoveMouseTo(playerLoader.VisualSettingsPos);
             });
-            waitForDim();
-            AddAssert("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
+            AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
             AddStep("Stop background preview", () => InputManager.MoveMouseTo(playerLoader.ScreenPos));
-            waitForDim();
-            AddAssert("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && playerLoader.IsBlurCorrect());
+            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && playerLoader.IsBlurCorrect());
         }
 
         /// <summary>
@@ -97,8 +95,7 @@ namespace osu.Game.Tests.Visual.Background
             performFullSetup();
             AddStep("Trigger hover event", () => playerLoader.TriggerOnHover());
             AddAssert("Background retained from song select", () => songSelect.IsBackgroundCurrent());
-            waitForDim();
-            AddAssert("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
+            AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
         }
 
         /// <summary>
@@ -114,15 +111,13 @@ namespace osu.Game.Tests.Visual.Background
                 player.ReplacesBackground.Value = true;
                 player.StoryboardEnabled.Value = true;
             });
-            waitForDim();
-            AddAssert("Background is invisible, storyboard is visible", () => songSelect.IsBackgroundInvisible() && player.IsStoryboardVisible);
+            AddUntilStep("Background is invisible, storyboard is visible", () => songSelect.IsBackgroundInvisible() && player.IsStoryboardVisible);
             AddStep("Disable Storyboard", () =>
             {
                 player.ReplacesBackground.Value = false;
                 player.StoryboardEnabled.Value = false;
             });
-            waitForDim();
-            AddAssert("Background is visible, storyboard is invisible", () => songSelect.IsBackgroundVisible() && !player.IsStoryboardVisible);
+            AddUntilStep("Background is visible, storyboard is invisible", () => songSelect.IsBackgroundVisible() && !player.IsStoryboardVisible);
         }
 
         /// <summary>
@@ -134,8 +129,7 @@ namespace osu.Game.Tests.Visual.Background
             performFullSetup();
             createFakeStoryboard();
             AddStep("Exit to song select", () => player.Exit());
-            waitForDim();
-            AddAssert("Background is visible", () => songSelect.IsBackgroundVisible());
+            AddUntilStep("Background is visible", () => songSelect.IsBackgroundVisible());
         }
 
         /// <summary>
@@ -145,14 +139,11 @@ namespace osu.Game.Tests.Visual.Background
         public void DisableUserDimBackgroundTest()
         {
             performFullSetup();
-            waitForDim();
-            AddAssert("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
+            AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
             AddStep("Enable user dim", () => songSelect.DimEnabled.Value = false);
-            waitForDim();
-            AddAssert("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsUserBlurDisabled());
+            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsUserBlurDisabled());
             AddStep("Disable user dim", () => songSelect.DimEnabled.Value = true);
-            waitForDim();
-            AddAssert("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
+            AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
         }
 
         /// <summary>
@@ -170,11 +161,9 @@ namespace osu.Game.Tests.Visual.Background
             });
             AddStep("Enable user dim", () => player.DimmableStoryboard.EnableUserDim.Value = true);
             AddStep("Set dim level to 1", () => songSelect.DimLevel.Value = 1f);
-            waitForDim();
-            AddAssert("Storyboard is invisible", () => !player.IsStoryboardVisible);
+            AddUntilStep("Storyboard is invisible", () => !player.IsStoryboardVisible);
             AddStep("Disable user dim", () => player.DimmableStoryboard.EnableUserDim.Value = false);
-            waitForDim();
-            AddAssert("Storyboard is visible", () => player.IsStoryboardVisible);
+            AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
         }
 
         /// <summary>
@@ -185,11 +174,9 @@ namespace osu.Game.Tests.Visual.Background
         {
             performFullSetup(true);
             AddStep("Pause", () => player.Pause());
-            waitForDim();
-            AddAssert("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
+            AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
             AddStep("Unpause", () => player.Resume());
-            waitForDim();
-            AddAssert("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
+            AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
         }
 
         /// <summary>
@@ -203,8 +190,7 @@ namespace osu.Game.Tests.Visual.Background
             AddStep("Transition to Results", () => player.Push(results =
                 new FadeAccessibleResults(new ScoreInfo { User = new User { Username = "osu!" } })));
             AddUntilStep("Wait for results is current", () => results.IsCurrentScreen());
-            waitForDim();
-            AddAssert("Screen is undimmed, original background retained", () =>
+            AddUntilStep("Screen is undimmed, original background retained", () =>
                 songSelect.IsBackgroundUndimmed() && songSelect.IsBackgroundCurrent() && results.IsBlurCorrect());
         }
 
@@ -216,8 +202,7 @@ namespace osu.Game.Tests.Visual.Background
         {
             performFullSetup();
             AddStep("Exit to song select", () => player.Exit());
-            waitForDim();
-            AddAssert("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsBlurCorrect());
+            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsBlurCorrect());
         }
 
         /// <summary>
@@ -229,15 +214,11 @@ namespace osu.Game.Tests.Visual.Background
             performFullSetup();
             AddStep("Move mouse to Visual Settings", () => InputManager.MoveMouseTo(playerLoader.VisualSettingsPos));
             AddStep("Resume PlayerLoader", () => player.Restart());
-            waitForDim();
-            AddAssert("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
+            AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
             AddStep("Move mouse to center of screen", () => InputManager.MoveMouseTo(playerLoader.ScreenPos));
-            waitForDim();
-            AddAssert("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && playerLoader.IsBlurCorrect());
+            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && playerLoader.IsBlurCorrect());
         }
 
-        private void waitForDim() => AddWaitStep("Wait for dim", 5);
-
         private void createFakeStoryboard() => AddStep("Create storyboard", () =>
         {
             player.StoryboardEnabled.Value = false;

From 2bf066d72c6099c47bd967a11424b35c13004500 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 11:30:36 +0900
Subject: [PATCH 02936/10326] Rename tests to match convention

---
 .../Background/TestSceneUserDimBackgrounds.cs | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index edba462bc2..d601f40afe 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Tests.Visual.Background
         /// Check if <see cref="PlayerLoader"/> properly triggers the visual settings preview when a user hovers over the visual settings panel.
         /// </summary>
         [Test]
-        public void PlayerLoaderSettingsHoverTest()
+        public void TestPlayerLoaderSettingsHover()
         {
             setupUserSettings();
             AddStep("Start player loader", () => songSelect.Push(playerLoader = new TestPlayerLoader(player = new LoadBlockingTestPlayer { BlockLoad = true })));
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Background
         /// We need to check that in this scenario, the dim and blur is still properly applied after entering player.
         /// </summary>
         [Test]
-        public void PlayerLoaderTransitionTest()
+        public void TestPlayerLoaderTransition()
         {
             performFullSetup();
             AddStep("Trigger hover event", () => playerLoader.TriggerOnHover());
@@ -102,7 +102,7 @@ namespace osu.Game.Tests.Visual.Background
         /// Make sure the background is fully invisible (Alpha == 0) when the background should be disabled by the storyboard.
         /// </summary>
         [Test]
-        public void StoryboardBackgroundVisibilityTest()
+        public void TestStoryboardBackgroundVisibility()
         {
             performFullSetup();
             createFakeStoryboard();
@@ -124,7 +124,7 @@ namespace osu.Game.Tests.Visual.Background
         /// When exiting player, the screen that it suspends/exits to needs to have a fully visible (Alpha == 1) background.
         /// </summary>
         [Test]
-        public void StoryboardTransitionTest()
+        public void TestStoryboardTransition()
         {
             performFullSetup();
             createFakeStoryboard();
@@ -136,7 +136,7 @@ namespace osu.Game.Tests.Visual.Background
         /// Ensure <see cref="UserDimContainer"/> is properly accepting user-defined visual changes for a background.
         /// </summary>
         [Test]
-        public void DisableUserDimBackgroundTest()
+        public void TestDisableUserDimBackground()
         {
             performFullSetup();
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
@@ -150,7 +150,7 @@ namespace osu.Game.Tests.Visual.Background
         /// Ensure <see cref="UserDimContainer"/> is properly accepting user-defined visual changes for a storyboard.
         /// </summary>
         [Test]
-        public void DisableUserDimStoryboardTest()
+        public void TestDisableUserDimStoryboard()
         {
             performFullSetup();
             createFakeStoryboard();
@@ -170,7 +170,7 @@ namespace osu.Game.Tests.Visual.Background
         /// Check if the visual settings container retains dim and blur when pausing
         /// </summary>
         [Test]
-        public void PauseTest()
+        public void TestPause()
         {
             performFullSetup(true);
             AddStep("Pause", () => player.Pause());
@@ -183,7 +183,7 @@ namespace osu.Game.Tests.Visual.Background
         /// Check if the visual settings container removes user dim when suspending <see cref="Player"/> for <see cref="ResultsScreen"/>
         /// </summary>
         [Test]
-        public void TransitionTest()
+        public void TestTransition()
         {
             performFullSetup();
             FadeAccessibleResults results = null;
@@ -198,7 +198,7 @@ namespace osu.Game.Tests.Visual.Background
         /// Check if background gets undimmed and unblurred when leaving <see cref="Player"/>  for <see cref="PlaySongSelect"/>
         /// </summary>
         [Test]
-        public void TransitionOutTest()
+        public void TestTransitionOut()
         {
             performFullSetup();
             AddStep("Exit to song select", () => player.Exit());
@@ -209,7 +209,7 @@ namespace osu.Game.Tests.Visual.Background
         /// Check if hovering on the visual settings dialogue after resuming from player still previews the background dim.
         /// </summary>
         [Test]
-        public void ResumeFromPlayerTest()
+        public void TestResumeFromPlayer()
         {
             performFullSetup();
             AddStep("Move mouse to Visual Settings", () => InputManager.MoveMouseTo(playerLoader.VisualSettingsPos));

From d041de63ce3f312e22a1cb7a23cdc5a292c33da8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 13:00:32 +0900
Subject: [PATCH 02937/10326] Allow SelectionHandler to provide custom context
 menu items without local hover check

---
 .../Compose/Components/SelectionHandler.cs    | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 764eae1056..9ecda9fdb8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -244,14 +244,21 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #region Context Menu
 
-        public virtual MenuItem[] ContextMenuItems
+        public MenuItem[] ContextMenuItems
         {
             get
             {
                 if (!selectedBlueprints.Any(b => b.IsHovered))
                     return Array.Empty<MenuItem>();
 
-                var items = new List<MenuItem>
+                var items = new List<MenuItem>();
+
+                items.AddRange(GetContextMenuItemsForSelection(selectedBlueprints));
+
+                if (selectedBlueprints.Count == 1)
+                    items.AddRange(selectedBlueprints[0].ContextMenuItems);
+
+                items.AddRange(new[]
                 {
                     new OsuMenuItem("Sound")
                     {
@@ -263,15 +270,20 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         }
                     },
                     new OsuMenuItem("Delete", MenuItemType.Destructive, deleteSelected),
-                };
-
-                if (selectedBlueprints.Count == 1)
-                    items.AddRange(selectedBlueprints[0].ContextMenuItems);
+                });
 
                 return items.ToArray();
             }
         }
 
+        /// <summary>
+        /// Provide context menu items relevant to current selection. Calling base is not required.
+        /// </summary>
+        /// <param name="selection">The current selection.</param>
+        /// <returns>The relevant menu items.</returns>
+        protected virtual IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
+            => Enumerable.Empty<MenuItem>();
+
         private MenuItem createHitSampleMenuItem(string name, string sampleName)
         {
             return new TernaryStateMenuItem(name, MenuItemType.Standard, setHitSampleState)

From aaf5596f9c0f619fc9eb63ab046f21a03885bb45 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 May 2020 15:54:07 +0900
Subject: [PATCH 02938/10326] Cleanup test

---
 .../TestSceneContractedPanelMiddleContent.cs      | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
index 972ac26b84..76cfe75b59 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -15,7 +14,6 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Ranking.Contracted;
-using osu.Game.Tests.Beatmaps;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
@@ -28,7 +26,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestShowPanel()
         {
-            AddStep("show example score", () => showPanel(createTestBeatmap(), new TestScoreInfo(new OsuRuleset().RulesetInfo)));
+            AddStep("show example score", () => showPanel(CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)), new TestScoreInfo(new OsuRuleset().RulesetInfo)));
         }
 
         private void showPanel(WorkingBeatmap workingBeatmap, ScoreInfo score)
@@ -36,17 +34,6 @@ namespace osu.Game.Tests.Visual.Ranking
             Child = new ContractedPanelMiddleContentContainer(workingBeatmap, score);
         }
 
-        private WorkingBeatmap createTestBeatmap()
-        {
-            var beatmap = new TestBeatmap(rulesetStore.GetRuleset(0));
-            beatmap.Metadata.Title = "Verrrrrrrrrrrrrrrrrrry looooooooooooooooooooooooong beatmap title";
-            beatmap.Metadata.Artist = "Verrrrrrrrrrrrrrrrrrry looooooooooooooooooooooooong beatmap artist";
-
-            return new TestWorkingBeatmap(beatmap);
-        }
-
-        private bool containsAny(string text, params string[] stringsToMatch) => stringsToMatch.Any(text.Contains);
-
         private class ContractedPanelMiddleContentContainer : Container
         {
             [Cached]

From 1768cbd1319ff8a6ab1da72846c2ec4c0a2ab65d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 May 2020 15:56:56 +0900
Subject: [PATCH 02939/10326] Format score same as expanded panel

---
 .../Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index a263a03a77..8cd0e7025e 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Screens.Ranking.Contracted
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
-                                            Text = score.TotalScore.ToString(),
+                                            Text = score.TotalScore.ToString("N0"),
                                             Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, fixedWidth: true),
                                             Spacing = new Vector2(-1, 0)
                                         },

From 906a317a3d35151baae2339a77671fbd82f34231 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 May 2020 16:26:53 +0900
Subject: [PATCH 02940/10326] Reduce casting

---
 osu.Game/Screens/Ranking/ScorePanelList.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 97a132b9ff..df2c66203b 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -118,11 +118,11 @@ namespace osu.Game.Screens.Ranking
         {
             public override IEnumerable<Drawable> FlowingChildren => applySorting(AliveInternalChildren);
 
-            public int GetPanelIndex(ScoreInfo score) => applySorting(Children).OfType<ScorePanel>().TakeWhile(s => s.Score != score).Count();
+            public int GetPanelIndex(ScoreInfo score) => applySorting(Children).TakeWhile(s => s.Score != score).Count();
 
-            private IEnumerable<Drawable> applySorting(IEnumerable<Drawable> drawables) => drawables.OfType<ScorePanel>()
-                                                                                                    .OrderByDescending(s => s.Score.TotalScore)
-                                                                                                    .ThenBy(s => s.Score.OnlineScoreID);
+            private IEnumerable<ScorePanel> applySorting(IEnumerable<Drawable> drawables) => drawables.OfType<ScorePanel>()
+                                                                                                      .OrderByDescending(s => s.Score.TotalScore)
+                                                                                                      .ThenBy(s => s.Score.OnlineScoreID);
         }
 
         private class Scroll : OsuScrollContainer

From a1ece4f308d51317b5d2c6d25df1555a434f9f00 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 May 2020 16:26:58 +0900
Subject: [PATCH 02941/10326] Add expansion/contraction test

---
 .../Visual/Ranking/TestSceneScorePanel.cs     | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
index fdb77c14a3..250fdc5ebd 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneScorePanel : OsuTestScene
     {
+        private ScorePanel panel;
+
         [Test]
         public void TestDRank()
         {
@@ -84,9 +86,24 @@ namespace osu.Game.Tests.Visual.Ranking
             addPanelStep(score, PanelState.Contracted);
         }
 
+        [Test]
+        public void TestExpandAndContract()
+        {
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Accuracy = 0.925, Rank = ScoreRank.A };
+
+            addPanelStep(score, PanelState.Contracted);
+            AddWaitStep("wait for transition", 10);
+
+            AddStep("expand panel", () => panel.State = PanelState.Expanded);
+            AddWaitStep("wait for transition", 10);
+
+            AddStep("contract panel", () => panel.State = PanelState.Contracted);
+            AddWaitStep("wait for transition", 10);
+        }
+
         private void addPanelStep(ScoreInfo score, PanelState state = PanelState.Expanded) => AddStep("add panel", () =>
         {
-            Child = new ScorePanel(score)
+            Child = panel = new ScorePanel(score)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

From c86a003ef94eccc990c6e13f7d0ea7159de03ec6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 May 2020 16:27:41 +0900
Subject: [PATCH 02942/10326] Adjust transition for smaller sizes

---
 osu.Game/Screens/Ranking/ScorePanel.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 2933bbddd1..a99b48e8f0 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -102,12 +102,14 @@ namespace osu.Game.Screens.Ranking
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
+                Size = new Vector2(40),
                 Children = new Drawable[]
                 {
                     topLayerContainer = new Container
                     {
                         Name = "Top layer",
                         RelativeSizeAxes = Axes.X,
+                        Alpha = 0,
                         Height = 120,
                         Children = new Drawable[]
                         {
@@ -214,6 +216,8 @@ namespace osu.Game.Screens.Ranking
             // If the top layer was already expanded, then we don't need to wait for the resize and can instead transform immediately. This looks better when changing the panel state.
             using (BeginDelayedSequence(topLayerExpanded ? 0 : resize_duration + top_layer_expand_delay, true))
             {
+                topLayerContainer.FadeIn();
+
                 switch (state)
                 {
                     case PanelState.Expanded:

From de0b6ec9f1941c64e19ab486748484351871074b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 May 2020 17:00:41 +0900
Subject: [PATCH 02943/10326] Create abstract implementation

---
 osu.Game/Screens/Play/Player.cs               |  2 +-
 osu.Game/Screens/Play/ReplayPlayer.cs         |  2 +-
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 27 ++++++++--------
 osu.Game/Screens/Ranking/SoloResultsScreen.cs | 32 +++++++++++++++++++
 osu.Game/Screens/Select/PlaySongSelect.cs     |  2 +-
 5 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Screens/Ranking/SoloResultsScreen.cs

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 3d4b20bec4..36198bcc65 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -479,7 +479,7 @@ namespace osu.Game.Screens.Play
 
         protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
 
-        protected virtual ResultsScreen CreateResults(ScoreInfo score) => new ResultsScreen(score);
+        protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score);
 
         #region Fail Logic
 
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index f0c76163f1..b443603128 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.Play
             this.Push(CreateResults(DrawableRuleset.ReplayScore.ScoreInfo));
         }
 
-        protected override ResultsScreen CreateResults(ScoreInfo score) => new ResultsScreen(score, false);
+        protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
 
         protected override ScoreInfo CreateScore() => score.ScoreInfo;
     }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 133bdcca4a..8db9cdc547 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
+using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -12,8 +12,6 @@ using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Play;
@@ -21,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking
 {
-    public class ResultsScreen : OsuScreen
+    public abstract class ResultsScreen : OsuScreen
     {
         protected const float BACKGROUND_BLUR = 20;
 
@@ -38,9 +36,6 @@ namespace osu.Game.Screens.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         public readonly ScoreInfo Score;
 
         private readonly bool allowRetry;
@@ -133,22 +128,28 @@ namespace osu.Game.Screens.Ranking
         {
             base.LoadComplete();
 
-            var req = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
-
-            req.Success += r => Schedule(() =>
+            var req = FetchScores(scores => Schedule(() =>
             {
-                foreach (var s in r.Scores.Select(s => s.CreateScoreInfo(rulesets)))
+                foreach (var s in scores)
                 {
                     if (s.OnlineScoreID == Score.OnlineScoreID)
                         continue;
 
                     panels.AddScore(s);
                 }
-            });
+            }));
 
-            api.Queue(req);
+            if (req != null)
+                api.Queue(req);
         }
 
+        /// <summary>
+        /// Performs a fetch/refresh of scores to be displayed.
+        /// </summary>
+        /// <param name="scoresCallback">A callback which should be called when fetching is completed. Scheduling is not required.</param>
+        /// <returns>An <see cref="APIRequest"/> responsible for the fetch operation. This will be queued and performed automatically.</returns>
+        protected virtual APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
new file mode 100644
index 0000000000..2b00748ed8
--- /dev/null
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Rulesets;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Ranking
+{
+    public class SoloResultsScreen : ResultsScreen
+    {
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        public SoloResultsScreen(ScoreInfo score, bool allowRetry = true)
+            : base(score, allowRetry)
+        {
+        }
+
+        protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
+        {
+            var req = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
+            req.Success += r => scoresCallback?.Invoke(r.Scores.Select(s => s.CreateScoreInfo(rulesets)));
+            return req;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 21ddc5685d..0a4c0e2085 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Select
         }
 
         protected void PresentScore(ScoreInfo score) =>
-            FinaliseSelection(score.Beatmap, score.Ruleset, () => this.Push(new ResultsScreen(score)));
+            FinaliseSelection(score.Beatmap, score.Ruleset, () => this.Push(new SoloResultsScreen(score)));
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 

From 7e1e26de2a3b3bc8e249ba75b417e4d5955d7c42 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 17:00:55 +0900
Subject: [PATCH 02944/10326] Allow HandleMovement by default

---
 .../Edit/Compose/Components/SelectionHandler.cs       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 9ecda9fdb8..7ab6340e07 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -74,9 +74,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Handles the selected <see cref="DrawableHitObject"/>s being moved.
         /// </summary>
+        /// <remarks>
+        /// Just returning true is enough to allow <see cref="HitObject.StartTime"/> updates to take place.
+        /// Custom implementation is only required if other attributes are to be considered, like changing columns.
+        /// </remarks>
         /// <param name="moveEvent">The move event.</param>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s were moved.</returns>
-        public virtual bool HandleMovement(MoveSelectionEvent moveEvent) => false;
+        /// <returns>
+        /// Whether any <see cref="DrawableHitObject"/>s could be moved.
+        /// Returning true will also propagate StartTime changes provided by the closest <see cref="IPositionSnapProvider.SnapScreenSpacePositionToValidTime"/>.
+        /// </returns>
+        public virtual bool HandleMovement(MoveSelectionEvent moveEvent) => true;
 
         public bool OnPressed(PlatformAction action)
         {

From c07a33b24fc02d33a6dd15da10605d16bb958005 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 May 2020 17:31:50 +0900
Subject: [PATCH 02945/10326] Fix ctor accessibility

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

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 8db9cdc547..97b56d22eb 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Ranking
         private Drawable bottomPanel;
         private ScorePanelList panels;
 
-        public ResultsScreen(ScoreInfo score, bool allowRetry = true)
+        protected ResultsScreen(ScoreInfo score, bool allowRetry = true)
         {
             Score = score;
             this.allowRetry = allowRetry;

From 6b5b2152991f3ba617b42f274fee646f37753ab7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 17:44:47 +0900
Subject: [PATCH 02946/10326] Split out IHasPath from IHasCurve to better
 define hitobjects

---
 .../Beatmaps/CatchBeatmapConverter.cs         |  2 +-
 .../Objects/JuiceStream.cs                    |  2 +-
 .../Legacy/DistanceObjectPatternGenerator.cs  |  2 +-
 .../Beatmaps/OsuBeatmapConverter.cs           |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  2 +-
 .../Beatmaps/TaikoBeatmapConverter.cs         |  2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs   | 10 +----
 .../Formats/LegacyBeatmapDecoderTest.cs       |  2 +-
 .../Beatmaps/Formats/OsuJsonDecoderTest.cs    |  2 +-
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 39 +++++++++++--------
 .../Rulesets/Objects/Legacy/ConvertSlider.cs  |  2 +-
 osu.Game/Rulesets/Objects/Types/IHasPath.cs   | 13 +++++++
 .../{IHasCurve.cs => IHasPathWithRepeats.cs}  | 20 +++++-----
 13 files changed, 57 insertions(+), 43 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Types/IHasPath.cs
 rename osu.Game/Rulesets/Objects/Types/{IHasCurve.cs => IHasPathWithRepeats.cs} (77%)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 90a6e609f0..27a9b63e9a 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
             switch (obj)
             {
-                case IHasCurve curveData:
+                case IHasPathWithRepeats curveData:
                     return new JuiceStream
                     {
                         StartTime = obj.StartTime,
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index d32595c2e1..24090e233a 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Catch.Objects
 {
-    public class JuiceStream : CatchHitObject, IHasCurve
+    public class JuiceStream : CatchHitObject, IHasPathWithRepeats
     {
         /// <summary>
         /// Positional distance that results in a duration of one second, before any speed adjustments.
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index d8d5b67c0e..1bd796511b 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -474,7 +474,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <returns></returns>
         private IList<HitSampleInfo> sampleInfoListAt(double time)
         {
-            if (!(HitObject is IHasCurve curveData))
+            if (!(HitObject is IHasPathWithRepeats curveData))
                 return HitObject.Samples;
 
             double segmentTime = (EndTime - HitObject.StartTime) / spanCount;
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
index 147d74c929..060a3919bd 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
 
             switch (original)
             {
-                case IHasCurve curveData:
+                case IHasPathWithRepeats curveData:
                     return new Slider
                     {
                         StartTime = original.StartTime,
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 6ba0e1c6aa..713d1a61f8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -17,7 +17,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    public class Slider : OsuHitObject, IHasCurve
+    public class Slider : OsuHitObject, IHasPathWithRepeats
     {
         public double EndTime
         {
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index d324441285..1a47be2282 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
                     if (!isForCurrentRuleset && tickSpacing > 0 && osuDuration < 2 * speedAdjustedBeatLength)
                     {
-                        List<IList<HitSampleInfo>> allSamples = obj is IHasCurve curveData ? curveData.NodeSamples : new List<IList<HitSampleInfo>>(new[] { samples });
+                        List<IList<HitSampleInfo>> allSamples = obj is IHasPathWithRepeats curveData ? curveData.NodeSamples : new List<IList<HitSampleInfo>>(new[] { samples });
 
                         int i = 0;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 7b11bce520..5f52160be1 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -3,9 +3,7 @@
 
 using osu.Game.Rulesets.Objects.Types;
 using System;
-using System.Collections.Generic;
 using System.Threading;
-using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
@@ -17,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoHitObject, IHasCurve
+    public class DrumRoll : TaikoHitObject, IHasPath
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
@@ -115,11 +113,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         double IHasDistance.Distance => Duration * Velocity;
 
-        int IHasRepeats.RepeatCount { get => 0; set { } }
-
-        List<IList<HitSampleInfo>> IHasRepeats.NodeSamples => new List<IList<HitSampleInfo>>();
-
-        SliderPath IHasCurve.Path
+        SliderPath IHasPath.Path
             => new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(1) }, ((IHasDistance)this).Distance / TaikoBeatmapConverter.LEGACY_VELOCITY_MULTIPLIER);
 
         #endregion
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index acb30a6277..dab923d75b 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -365,7 +365,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
-                var curveData = hitObjects[0] as IHasCurve;
+                var curveData = hitObjects[0] as IHasPathWithRepeats;
                 var positionData = hitObjects[0] as IHasPosition;
 
                 Assert.IsNotNull(positionData);
diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
index b034e66616..b4c78ce273 100644
--- a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         {
             var beatmap = decodeAsJson(normal);
 
-            var curveData = beatmap.HitObjects[0] as IHasCurve;
+            var curveData = beatmap.HitObjects[0] as IHasPathWithRepeats;
             var positionData = beatmap.HitObjects[0] as IHasPosition;
 
             Assert.IsNotNull(positionData);
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 7727f25967..d7e83fa471 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -233,9 +233,9 @@ namespace osu.Game.Beatmaps.Formats
             writer.Write(FormattableString.Invariant($"{(int)getObjectType(hitObject)},"));
             writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
 
-            if (hitObject is IHasCurve curveData)
+            if (hitObject is IHasPathWithRepeats curveData)
             {
-                addCurveData(writer, curveData, position);
+                addPathData(writer, curveData, position);
                 writer.Write(getSampleBank(hitObject.Samples, zeroBanks: true));
             }
             else
@@ -263,7 +263,7 @@ namespace osu.Game.Beatmaps.Formats
 
             switch (hitObject)
             {
-                case IHasCurve _:
+                case IHasPath _:
                     type |= LegacyHitObjectType.Slider;
                     break;
 
@@ -282,13 +282,13 @@ namespace osu.Game.Beatmaps.Formats
             return type;
         }
 
-        private void addCurveData(TextWriter writer, IHasCurve curveData, Vector2 position)
+        private void addPathData(TextWriter writer, IHasPath pathData, Vector2 position)
         {
             PathType? lastType = null;
 
-            for (int i = 0; i < curveData.Path.ControlPoints.Count; i++)
+            for (int i = 0; i < pathData.Path.ControlPoints.Count; i++)
             {
-                PathControlPoint point = curveData.Path.ControlPoints[i];
+                PathControlPoint point = pathData.Path.ControlPoints[i];
 
                 if (point.Type.Value != null)
                 {
@@ -325,23 +325,28 @@ namespace osu.Game.Beatmaps.Formats
                 if (i != 0)
                 {
                     writer.Write(FormattableString.Invariant($"{position.X + point.Position.Value.X}:{position.Y + point.Position.Value.Y}"));
-                    writer.Write(i != curveData.Path.ControlPoints.Count - 1 ? "|" : ",");
+                    writer.Write(i != pathData.Path.ControlPoints.Count - 1 ? "|" : ",");
                 }
             }
 
-            writer.Write(FormattableString.Invariant($"{curveData.RepeatCount + 1},"));
-            writer.Write(FormattableString.Invariant($"{curveData.Path.Distance},"));
+            var curveData = pathData as IHasPathWithRepeats;
 
-            for (int i = 0; i < curveData.NodeSamples.Count; i++)
-            {
-                writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(curveData.NodeSamples[i])}"));
-                writer.Write(i != curveData.NodeSamples.Count - 1 ? "|" : ",");
-            }
+            writer.Write(FormattableString.Invariant($"{(curveData?.RepeatCount ?? 0) + 1},"));
+            writer.Write(FormattableString.Invariant($"{pathData.Path.Distance},"));
 
-            for (int i = 0; i < curveData.NodeSamples.Count; i++)
+            if (curveData != null)
             {
-                writer.Write(getSampleBank(curveData.NodeSamples[i], true));
-                writer.Write(i != curveData.NodeSamples.Count - 1 ? "|" : ",");
+                for (int i = 0; i < curveData.NodeSamples.Count; i++)
+                {
+                    writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(curveData.NodeSamples[i])}"));
+                    writer.Write(i != curveData.NodeSamples.Count - 1 ? "|" : ",");
+                }
+
+                for (int i = 0; i < curveData.NodeSamples.Count; i++)
+                {
+                    writer.Write(getSampleBank(curveData.NodeSamples[i], true));
+                    writer.Write(i != curveData.NodeSamples.Count - 1 ? "|" : ",");
+                }
             }
         }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 924182b265..73192dc42e 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 : ConvertHitObject, IHasCurve, IHasLegacyLastTickOffset
+    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset
     {
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second.
diff --git a/osu.Game/Rulesets/Objects/Types/IHasPath.cs b/osu.Game/Rulesets/Objects/Types/IHasPath.cs
new file mode 100644
index 0000000000..567c24a4a2
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Types/IHasPath.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.
+
+namespace osu.Game.Rulesets.Objects.Types
+{
+    public interface IHasPath : IHasDistance
+    {
+        /// <summary>
+        /// The curve.
+        /// </summary>
+        SliderPath Path { get; }
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/Types/IHasCurve.cs b/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
similarity index 77%
rename from osu.Game/Rulesets/Objects/Types/IHasCurve.cs
rename to osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
index e98a888bd7..fba0fd7aff 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasCurve.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osuTK;
 
 namespace osu.Game.Rulesets.Objects.Types
@@ -8,15 +9,16 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that has a curve.
     /// </summary>
-    public interface IHasCurve : IHasDistance, IHasRepeats
+    public interface IHasPathWithRepeats : IHasPath, IHasRepeats
     {
-        /// <summary>
-        /// The curve.
-        /// </summary>
-        SliderPath Path { get; }
     }
 
-    public static class HasCurveExtensions
+    [Obsolete("Use IHasPathWithRepeats instead.")] // can be removed 20201126
+    public interface IHasCurve : IHasPathWithRepeats
+    {
+    }
+
+    public static class HasPathWithRepeatsExtensions
     {
         /// <summary>
         /// Computes the position on the curve relative to how much of the <see cref="HitObject"/> has been completed.
@@ -24,7 +26,7 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <param name="obj">The curve.</param>
         /// <param name="progress">[0, 1] where 0 is the start time of the <see cref="HitObject"/> and 1 is the end time of the <see cref="HitObject"/>.</param>
         /// <returns>The position on the curve.</returns>
-        public static Vector2 CurvePositionAt(this IHasCurve obj, double progress)
+        public static Vector2 CurvePositionAt(this IHasPathWithRepeats obj, double progress)
             => obj.Path.PositionAt(obj.ProgressAt(progress));
 
         /// <summary>
@@ -33,7 +35,7 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <param name="obj">The curve.</param>
         /// <param name="progress">[0, 1] where 0 is the start time of the <see cref="HitObject"/> and 1 is the end time of the <see cref="HitObject"/>.</param>
         /// <returns>[0, 1] where 0 is the beginning of the curve and 1 is the end of the curve.</returns>
-        public static double ProgressAt(this IHasCurve obj, double progress)
+        public static double ProgressAt(this IHasPathWithRepeats obj, double progress)
         {
             double p = progress * obj.SpanCount() % 1;
             if (obj.SpanAt(progress) % 2 == 1)
@@ -47,7 +49,7 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <param name="obj">The curve.</param>
         /// <param name="progress">[0, 1] where 0 is the beginning of the curve and 1 is the end of the curve.</param>
         /// <returns>[0, SpanCount) where 0 is the first run.</returns>
-        public static int SpanAt(this IHasCurve obj, double progress)
+        public static int SpanAt(this IHasPathWithRepeats obj, double progress)
             => (int)(progress * obj.SpanCount());
     }
 }

From b8e0a6f12725e464f179f03e53dd9f20625cd635 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 May 2020 12:37:44 +0900
Subject: [PATCH 02947/10326] Move sett from EndTime to Duration

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs     | 10 +++++-----
 osu.Game.Rulesets.Osu/Objects/Slider.cs            |  8 ++++----
 .../Objects/Drawables/DrawableSwell.cs             |  2 +-
 .../Gameplay/TestSceneDrawableScrollingRuleset.cs  |  6 +++---
 .../Objects/Legacy/Catch/ConvertHitObjectParser.cs |  6 +++---
 .../Objects/Legacy/Catch/ConvertSpinner.cs         |  4 ++--
 .../Objects/Legacy/ConvertHitObjectParser.cs       | 14 +++++++-------
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs  |  6 +++---
 .../Objects/Legacy/Mania/ConvertHitObjectParser.cs |  8 ++++----
 .../Rulesets/Objects/Legacy/Mania/ConvertHold.cs   |  4 ++--
 .../Objects/Legacy/Mania/ConvertSpinner.cs         |  4 ++--
 .../Objects/Legacy/Osu/ConvertHitObjectParser.cs   |  6 +++---
 .../Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs  |  4 ++--
 .../Objects/Legacy/Taiko/ConvertHitObjectParser.cs |  6 +++---
 .../Objects/Legacy/Taiko/ConvertSpinner.cs         |  4 ++--
 osu.Game/Rulesets/Objects/Types/IHasEndTime.cs     |  6 +++---
 .../Timeline/TimelineHitObjectBlueprint.cs         |  2 +-
 17 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index d32595c2e1..7c8d57e689 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -115,15 +115,15 @@ namespace osu.Game.Rulesets.Catch.Objects
             }
         }
 
-        public double EndTime
+        public float EndX => X + this.CurvePositionAt(1).X / CatchPlayfield.BASE_WIDTH;
+
+        public double Duration
         {
-            get => StartTime + this.SpanCount() * Path.Distance / Velocity;
+            get => this.SpanCount() * Path.Distance / Velocity;
             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;
-
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
 
         private readonly SliderPath path = new SliderPath();
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 6ba0e1c6aa..984a9bf956 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -19,14 +19,14 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class Slider : OsuHitObject, IHasCurve
     {
-        public double EndTime
+        public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity;
+
+        public double Duration
         {
-            get => StartTime + this.SpanCount() * Path.Distance / Velocity;
+            get => EndTime - StartTime;
             set => throw new System.NotSupportedException($"Adjust via {nameof(RepeatCount)} instead"); // can be implemented if/when needed.
         }
 
-        public double Duration => EndTime - StartTime;
-
         private readonly Cached<Vector2> endPositionCache = new Cached<Vector2>();
 
         public override Vector2 EndPosition => endPositionCache.IsValid ? endPositionCache.Value : endPositionCache.Value = Position + this.CurvePositionAt(1);
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 32f7acadc8..7294587b10 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -237,7 +237,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
                 case ArmedState.Miss:
                 case ArmedState.Hit:
-                    using (BeginAbsoluteSequence(Time.Current, true))
+                    using (BeginDelayedSequence(HitObject.Duration, true))
                     {
                         this.FadeOut(transition_duration, Easing.Out);
                         bodyContainer.ScaleTo(1.4f, transition_duration);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index b25b81c9af..08fd849fa6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -281,7 +281,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 yield return new TestHitObject
                 {
                     StartTime = original.StartTime,
-                    EndTime = (original as IHasEndTime)?.EndTime ?? (original.StartTime + 100)
+                    Duration = (original as IHasEndTime)?.Duration ?? 100
                 };
             }
         }
@@ -292,9 +292,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class TestHitObject : ConvertHitObject, IHasEndTime
         {
-            public double EndTime { get; set; }
+            public double EndTime => StartTime + Duration;
 
-            public double Duration => EndTime - StartTime;
+            public double Duration { get; set; }
         }
 
         private class DrawableTestHitObject : DrawableHitObject<TestHitObject>
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
index 43e8d01297..c10c8dc30f 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
             };
         }
 
-        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             // Convert spinners don't create the new combo themselves, but force the next non-spinner hitobject to create a new combo
             // Their combo offset is still added to that next hitobject's combo index
@@ -65,11 +65,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
 
             return new ConvertSpinner
             {
-                EndTime = endTime
+                Duration = duration
             };
         }
 
-        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return null;
         }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
index 9de311c9d7..4b0270064a 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
@@ -10,9 +10,9 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
     /// </summary>
     internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasXPosition, IHasCombo
     {
-        public double EndTime { get; set; }
+        public double EndTime => StartTime + Duration;
 
-        public double Duration => EndTime - StartTime;
+        public double Duration { get; set; }
 
         public float X => 256; // Required for CatchBeatmapConverter
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 9a60a0a75c..d8d90fddfa 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -189,9 +189,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
             }
             else if (type.HasFlag(LegacyHitObjectType.Spinner))
             {
-                double endTime = Math.Max(startTime, Parsing.ParseDouble(split[5]) + Offset);
+                double duration = Math.Max(0, Parsing.ParseDouble(split[5]) + Offset - startTime);
 
-                result = CreateSpinner(new Vector2(512, 384) / 2, combo, comboOffset, endTime);
+                result = CreateSpinner(new Vector2(512, 384) / 2, combo, comboOffset, duration);
 
                 if (split.Length > 6)
                     readCustomSampleBanks(split[6], bankInfo);
@@ -209,7 +209,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                     readCustomSampleBanks(string.Join(":", ss.Skip(1)), bankInfo);
                 }
 
-                result = CreateHold(pos, combo, comboOffset, endTime + Offset);
+                result = CreateHold(pos, combo, comboOffset, endTime + Offset - startTime);
             }
 
             if (result == null)
@@ -321,9 +321,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <param name="position">The position of the hit object.</param>
         /// <param name="newCombo">Whether the hit object creates a new combo.</param>
         /// <param name="comboOffset">When starting a new combo, the offset of the new combo relative to the current one.</param>
-        /// <param name="endTime">The spinner end time.</param>
+        /// <param name="duration">The spinner duration.</param>
         /// <returns>The hit object.</returns>
-        protected abstract HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double endTime);
+        protected abstract HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration);
 
         /// <summary>
         /// Creates a legacy Hold-type hit object.
@@ -331,8 +331,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <param name="position">The position of the hit object.</param>
         /// <param name="newCombo">Whether the hit object creates a new combo.</param>
         /// <param name="comboOffset">When starting a new combo, the offset of the new combo relative to the current one.</param>
-        /// <param name="endTime">The hold end time.</param>
-        protected abstract HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime);
+        /// <param name="duration">The hold end time.</param>
+        protected abstract HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration);
 
         private List<HitSampleInfo> convertSoundType(LegacyHitSoundType type, SampleBankInfo bankInfo)
         {
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 924182b265..0a3c1b40fd 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -26,13 +26,13 @@ namespace osu.Game.Rulesets.Objects.Legacy
         public List<IList<HitSampleInfo>> NodeSamples { get; set; }
         public int RepeatCount { get; set; }
 
-        public double EndTime
+        public double Duration
         {
-            get => StartTime + this.SpanCount() * Distance / Velocity;
+            get => this.SpanCount() * Distance / Velocity;
             set => throw new System.NotSupportedException($"Adjust via {nameof(RepeatCount)} instead"); // can be implemented if/when needed.
         }
 
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
 
         public double Velocity = 1;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
index f94c4aaa75..bc64518f40 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
@@ -37,21 +37,21 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
             };
         }
 
-        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return new ConvertSpinner
             {
                 X = position.X,
-                EndTime = endTime
+                Duration = duration
             };
         }
 
-        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return new ConvertHold
             {
                 X = position.X,
-                EndTime = endTime
+                Duration = duration
             };
         }
     }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
index 1d92d638dd..dcb66163e4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
@@ -9,8 +9,8 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
     {
         public float X { get; set; }
 
-        public double EndTime { get; set; }
+        public double Duration { get; set; }
 
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
index 7dc13e27cd..b731f7c8d8 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
@@ -10,9 +10,9 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
     /// </summary>
     internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasXPosition
     {
-        public double EndTime { get; set; }
+        public double Duration { get; set; }
 
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
 
         public float X { get; set; }
     }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
index b95ec703b6..75ecab0b8f 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
             };
         }
 
-        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             // Convert spinners don't create the new combo themselves, but force the next non-spinner hitobject to create a new combo
             // Their combo offset is still added to that next hitobject's combo index
@@ -66,11 +66,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
             return new ConvertSpinner
             {
                 Position = position,
-                EndTime = endTime
+                Duration = duration
             };
         }
 
-        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return null;
         }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
index 8b21aab411..a231237077 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
@@ -11,9 +11,9 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// </summary>
     internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasPosition, IHasCombo
     {
-        public double EndTime { get; set; }
+        public double Duration { get; set; }
 
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
 
         public Vector2 Position { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
index db65a61c90..13e3e84c6a 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
@@ -33,15 +33,15 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
             };
         }
 
-        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return new ConvertSpinner
             {
-                EndTime = endTime
+                Duration = duration
             };
         }
 
-        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return null;
         }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
index 8e28487f2f..0976106ec4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
     /// </summary>
     internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime
     {
-        public double EndTime { get; set; }
+        public double Duration { get; set; }
 
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
index bc7103c60d..5eb551e15c 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
@@ -13,12 +13,12 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <summary>
         /// The time at which the HitObject ends.
         /// </summary>
-        [JsonIgnore]
-        double EndTime { get; set; }
+        double EndTime { get; }
 
         /// <summary>
         /// The duration of the HitObject.
         /// </summary>
-        double Duration { get; }
+        [JsonIgnore]
+        double Duration { get; set; }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index dd2f7a833e..d6fc17f358 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -296,7 +296,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             if (endTimeHitObject.EndTime == snappedTime)
                                 return;
 
-                            endTimeHitObject.EndTime = snappedTime;
+                            endTimeHitObject.Duration = snappedTime - hitObject.StartTime;
                             break;
                     }
 

From cbd563e80b3b82aecf9b84e474197d9c12993b16 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 May 2020 12:38:39 +0900
Subject: [PATCH 02948/10326] Rename to IHasDuration

---
 .../Beatmaps/CatchBeatmapConverter.cs         |  2 +-
 .../Objects/BananaShower.cs                   |  2 +-
 .../TestSceneNotes.cs                         |  2 +-
 .../Beatmaps/ManiaBeatmapConverter.cs         |  6 ++---
 .../Legacy/EndTimeObjectPatternGenerator.cs   |  2 +-
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   |  2 +-
 .../Beatmaps/OsuBeatmapConverter.cs           |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs     |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs    |  2 +-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs      |  2 +-
 .../Beatmaps/TaikoBeatmapConverter.cs         |  2 +-
 osu.Game.Rulesets.Taiko/Objects/Swell.cs      |  2 +-
 .../TestSceneDrawableScrollingRuleset.cs      |  4 ++--
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  |  6 ++---
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  2 +-
 osu.Game/Rulesets/Objects/HitObject.cs        |  4 ++--
 .../Objects/Legacy/Catch/ConvertSpinner.cs    |  2 +-
 .../Objects/Legacy/Mania/ConvertHold.cs       |  2 +-
 .../Objects/Legacy/Mania/ConvertSpinner.cs    |  2 +-
 .../Objects/Legacy/Osu/ConvertSpinner.cs      |  2 +-
 .../Objects/Legacy/Taiko/ConvertSpinner.cs    |  2 +-
 .../Rulesets/Objects/Types/IHasDistance.cs    |  2 +-
 .../Rulesets/Objects/Types/IHasDuration.cs    | 24 +++++++++++++++++++
 .../Rulesets/Objects/Types/IHasEndTime.cs     | 20 ++++------------
 .../Rulesets/Objects/Types/IHasRepeats.cs     |  2 +-
 .../Scrolling/ScrollingHitObjectContainer.cs  |  2 +-
 .../Timeline/TimelineHitObjectBlueprint.cs    |  4 ++--
 27 files changed, 60 insertions(+), 48 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Types/IHasDuration.cs

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 90a6e609f0..0b370cf911 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0
                     }.Yield();
 
-                case IHasEndTime endTime:
+                case IHasDuration endTime:
                     return new BananaShower
                     {
                         StartTime = obj.StartTime,
diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index 3a0b5ace53..04a995c77e 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Catch.Objects
 {
-    public class BananaShower : CatchHitObject, IHasEndTime
+    public class BananaShower : CatchHitObject, IHasDuration
     {
         public override FruitVisualRepresentation VisualRepresentation => FruitVisualRepresentation.Banana;
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index ea6a1e2e6a..dd5fd93710 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
                 foreach (var obj in content.OfType<DrawableHitObject>())
                 {
-                    if (!(obj.HitObject is IHasEndTime endTime))
+                    if (!(obj.HitObject is IHasDuration endTime))
                         continue;
 
                     foreach (var nested in obj.NestedHitObjects)
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 1c8116754f..32abf5e7f9 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             }
             else
             {
-                float percentSliderOrSpinner = (float)beatmap.HitObjects.Count(h => h is IHasEndTime) / beatmap.HitObjects.Count;
+                float percentSliderOrSpinner = (float)beatmap.HitObjects.Count(h => h is IHasDuration) / beatmap.HitObjects.Count;
                 if (percentSliderOrSpinner < 0.2)
                     TargetColumns = 7;
                 else if (percentSliderOrSpinner < 0.3 || roundedCircleSize >= 5)
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                     break;
                 }
 
-                case IHasEndTime endTimeData:
+                case IHasDuration endTimeData:
                 {
                     conversion = new EndTimeObjectPatternGenerator(Random, original, beatmap, originalBeatmap);
 
@@ -231,7 +231,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                 var pattern = new Pattern();
 
-                if (HitObject is IHasEndTime endTimeData)
+                if (HitObject is IHasDuration endTimeData)
                 {
                     pattern.Add(new HoldNote
                     {
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
index 907bed0d65..d5286a3779 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         public EndTimeObjectPatternGenerator(FastRandom random, HitObject hitObject, ManiaBeatmap beatmap, IBeatmap originalBeatmap)
             : base(random, hitObject, beatmap, new Pattern(), originalBeatmap)
         {
-            endTime = (HitObject as IHasEndTime)?.EndTime ?? 0;
+            endTime = (HitObject as IHasDuration)?.EndTime ?? 0;
         }
 
         public override IEnumerable<Pattern> Generate()
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index e6f722a8a9..a100c9a58e 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mania.Objects
     /// <summary>
     /// Represents a hit object which requires pressing, holding, and releasing a key.
     /// </summary>
-    public class HoldNote : ManiaHitObject, IHasEndTime
+    public class HoldNote : ManiaHitObject, IHasDuration
     {
         public double EndTime
         {
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
index 147d74c929..3490d96b61 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / beatmap.ControlPointInfo.DifficultyPointAt(original.StartTime).SpeedMultiplier : 1
                     }.Yield();
 
-                case IHasEndTime endTimeData:
+                case IHasDuration endTimeData:
                     return new Spinner
                     {
                         StartTime = original.StartTime,
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 7b1941b7f9..5d191119b9 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     break;
 
                 // already hit or beyond the hittable end time.
-                if (h.IsHit || (h.HitObject is IHasEndTime hasEnd && time > hasEnd.EndTime))
+                if (h.IsHit || (h.HitObject is IHasDuration hasEnd && time > hasEnd.EndTime))
                     continue;
 
                 switch (h)
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
index 297a0fea79..3cad52faeb 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
 
             // Keep wiggling sliders and spinners for their duration
-            if (!(osuObject is IHasEndTime endTime))
+            if (!(osuObject is IHasDuration endTime))
                 return;
 
             amountWiggles = (int)(endTime.Duration / wiggle_duration);
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 0b8d03d118..418375c090 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    public class Spinner : OsuHitObject, IHasEndTime
+    public class Spinner : OsuHitObject, IHasDuration
     {
         public double EndTime
         {
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index d324441285..a4ec7211ca 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                     break;
                 }
 
-                case IHasEndTime endTimeData:
+                case IHasDuration endTimeData:
                 {
                     double hitMultiplier = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty, 3, 5, 7.5) * swell_hit_multiplier;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index 390f8d1f3b..8a63a89951 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class Swell : TaikoHitObject, IHasEndTime
+    public class Swell : TaikoHitObject, IHasDuration
     {
         public double EndTime
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 08fd849fa6..bd7e894cf8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -281,7 +281,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 yield return new TestHitObject
                 {
                     StartTime = original.StartTime,
-                    Duration = (original as IHasEndTime)?.Duration ?? 100
+                    Duration = (original as IHasDuration)?.Duration ?? 100
                 };
             }
         }
@@ -290,7 +290,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         #region HitObject
 
-        private class TestHitObject : ConvertHitObject, IHasEndTime
+        private class TestHitObject : ConvertHitObject, IHasDuration
         {
             public double EndTime => StartTime + Duration;
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 7727f25967..a8982238cf 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -240,7 +240,7 @@ namespace osu.Game.Beatmaps.Formats
             }
             else
             {
-                if (hitObject is IHasEndTime)
+                if (hitObject is IHasDuration)
                     addEndTimeData(writer, hitObject);
 
                 writer.Write(getSampleBank(hitObject.Samples));
@@ -267,7 +267,7 @@ namespace osu.Game.Beatmaps.Formats
                     type |= LegacyHitObjectType.Slider;
                     break;
 
-                case IHasEndTime _:
+                case IHasDuration _:
                     if (beatmap.BeatmapInfo.RulesetID == 3)
                         type |= LegacyHitObjectType.Hold;
                     else
@@ -347,7 +347,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void addEndTimeData(TextWriter writer, HitObject hitObject)
         {
-            var endTimeData = (IHasEndTime)hitObject;
+            var endTimeData = (IHasDuration)hitObject;
             var type = getObjectType(hitObject);
 
             char suffix = ',';
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 8126311cbd..ac399e37c4 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Beatmaps
                     length = emptyLength;
                     break;
 
-                case IHasEndTime endTime:
+                case IHasDuration endTime:
                     length = endTime.EndTime + excess_length;
                     break;
 
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 6f9053d7cb..e2cc98813a 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -175,10 +175,10 @@ namespace osu.Game.Rulesets.Objects
         /// Returns the end time of this object.
         /// </summary>
         /// <remarks>
-        /// This returns the <see cref="IHasEndTime.EndTime"/> where available, falling back to <see cref="HitObject.StartTime"/> otherwise.
+        /// This returns the <see cref="IHasDuration.EndTime"/> where available, falling back to <see cref="HitObject.StartTime"/> otherwise.
         /// </remarks>
         /// <param name="hitObject">The object.</param>
         /// <returns>The end time of this object.</returns>
-        public static double GetEndTime(this HitObject hitObject) => (hitObject as IHasEndTime)?.EndTime ?? hitObject.StartTime;
+        public static double GetEndTime(this HitObject hitObject) => (hitObject as IHasDuration)?.EndTime ?? hitObject.StartTime;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
index 4b0270064a..014494ec54 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 : ConvertHitObject, IHasEndTime, IHasXPosition, IHasCombo
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration, IHasXPosition, IHasCombo
     {
         public double EndTime => StartTime + Duration;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
index dcb66163e4..2fa4766c1d 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
@@ -5,7 +5,7 @@ using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Mania
 {
-    internal sealed class ConvertHold : ConvertHitObject, IHasXPosition, IHasEndTime
+    internal sealed class ConvertHold : ConvertHitObject, IHasXPosition, IHasDuration
     {
         public float X { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
index b731f7c8d8..c05aaceb9c 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
     /// <summary>
     /// Legacy osu!mania Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasXPosition
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration, IHasXPosition
     {
         public double Duration { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
index a231237077..e9e5ca8c94 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// <summary>
     /// Legacy osu! Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasPosition, IHasCombo
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration, IHasPosition, IHasCombo
     {
         public double Duration { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
index 0976106ec4..1d5ecb1ef3 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
     /// <summary>
     /// Legacy osu!taiko Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration
     {
         public double Duration { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Types/IHasDistance.cs b/osu.Game/Rulesets/Objects/Types/IHasDistance.cs
index e7f552115e..b497ca5da3 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasDistance.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDistance.cs
@@ -6,7 +6,7 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that has a positional length.
     /// </summary>
-    public interface IHasDistance : IHasEndTime
+    public interface IHasDistance : IHasDuration
     {
         /// <summary>
         /// The positional length of the HitObject.
diff --git a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
new file mode 100644
index 0000000000..2433f9597e
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Types/IHasDuration.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 Newtonsoft.Json;
+
+namespace osu.Game.Rulesets.Objects.Types
+{
+    /// <summary>
+    /// A HitObject that ends at a different time than its start time.
+    /// </summary>
+    public interface IHasDuration
+    {
+        /// <summary>
+        /// The time at which the HitObject ends.
+        /// </summary>
+        double EndTime { get; }
+
+        /// <summary>
+        /// The duration of the HitObject.
+        /// </summary>
+        [JsonIgnore]
+        double Duration { get; set; }
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
index 5eb551e15c..7395223c7e 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
@@ -1,24 +1,12 @@
-// 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 Newtonsoft.Json;
+using System;
 
 namespace osu.Game.Rulesets.Objects.Types
 {
-    /// <summary>
-    /// A HitObject that ends at a different time than its start time.
-    /// </summary>
-    public interface IHasEndTime
+    [Obsolete("Use IHasDuration instead.")] // can be removed 20201126
+    public interface IHasEndTime : IHasDuration
     {
-        /// <summary>
-        /// The time at which the HitObject ends.
-        /// </summary>
-        double EndTime { get; }
-
-        /// <summary>
-        /// The duration of the HitObject.
-        /// </summary>
-        [JsonIgnore]
-        double Duration { get; set; }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs b/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
index 256b1f3963..7a3fb16196 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that spans some length.
     /// </summary>
-    public interface IHasRepeats : IHasEndTime
+    public interface IHasRepeats : IHasDuration
     {
         /// <summary>
         /// The amount of times the HitObject repeats.
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index c817d84d5c..0dc3324559 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -270,7 +270,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         // Cant use AddOnce() since the delegate is re-constructed every invocation
         private void computeInitialStateRecursive(DrawableHitObject hitObject) => hitObject.Schedule(() =>
         {
-            if (hitObject.HitObject is IHasEndTime e)
+            if (hitObject.HitObject is IHasDuration e)
             {
                 switch (direction.Value)
                 {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index d6fc17f358..b95b3842b3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             shadowComponents.Add(circle);
 
-            if (hitObject is IHasEndTime)
+            if (hitObject is IHasDuration)
             {
                 DragBar dragBarUnderlay;
                 Container extensionBar;
@@ -290,7 +290,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             repeatHitObject.RepeatCount = proposedCount;
                             break;
 
-                        case IHasEndTime endTimeHitObject:
+                        case IHasDuration endTimeHitObject:
                             var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
 
                             if (endTimeHitObject.EndTime == snappedTime)

From f5c974dd897b0a7006b944e0103e4158d3d7667a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 May 2020 13:40:16 +0900
Subject: [PATCH 02949/10326] Hide non-alive selection blueprints by default

---
 .../Edit/Blueprints/OsuSelectionBlueprint.cs               | 2 ++
 osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs        | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
index b0e13808a5..8dd550bb96 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
     {
         protected new T HitObject => (T)DrawableObject.HitObject;
 
+        protected override bool AlwaysShowWhenSelected => true;
+
         protected OsuSelectionBlueprint(DrawableHitObject drawableObject)
             : base(drawableObject)
         {
diff --git a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
index 8202d3a1d1..75200e3027 100644
--- a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
@@ -15,7 +15,12 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public readonly DrawableHitObject DrawableObject;
 
-        protected override bool ShouldBeAlive => (DrawableObject.IsAlive && DrawableObject.IsPresent) || State == SelectionState.Selected;
+        /// <summary>
+        /// Whether the blueprint should be shown even when the <see cref="DrawableObject"/> is not alive.
+        /// </summary>
+        protected virtual bool AlwaysShowWhenSelected => false;
+
+        protected override bool ShouldBeAlive => (DrawableObject.IsAlive && DrawableObject.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
 
         protected OverlaySelectionBlueprint(DrawableHitObject drawableObject)
             : base(drawableObject.HitObject)

From f989f1aa0034d6283ee3d49169316a80713c0a55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 May 2020 16:08:47 +0900
Subject: [PATCH 02950/10326] Change event flow to avoid firing store delete
 events on update

---
 osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs  |  4 ++--
 osu.Game/Database/ArchiveModelManager.cs         |  8 ++++----
 osu.Game/Database/IModelManager.cs               |  2 +-
 osu.Game/Database/MutableDatabaseBackedStore.cs  | 16 +++++++++++-----
 osu.Game/Online/DownloadTrackingComposite.cs     |  8 ++++----
 osu.Game/OsuGameBase.cs                          |  2 +-
 osu.Game/Overlays/MusicController.cs             | 12 ++++++------
 .../Overlays/Settings/Sections/SkinSection.cs    | 10 +++++-----
 .../Multi/Match/Components/ReadyButton.cs        |  8 ++++----
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs   |  8 ++++----
 osu.Game/Screens/Select/BeatmapCarousel.cs       |  8 ++++----
 osu.Game/Screens/Select/Carousel/TopLocalRank.cs |  6 +++---
 12 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 43fab186aa..5eb11a3264 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
                     // ReSharper disable once AccessToModifiedClosure
-                    manager.ItemAdded.BindValueChanged(_ => Interlocked.Increment(ref itemAddRemoveFireCount));
+                    manager.ItemUpdated.BindValueChanged(_ => Interlocked.Increment(ref itemAddRemoveFireCount));
                     manager.ItemRemoved.BindValueChanged(_ => Interlocked.Increment(ref itemAddRemoveFireCount));
 
                     var imported = await LoadOszIntoOsu(osu);
@@ -166,7 +166,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     imported.Hash += "-changed";
                     manager.Update(imported);
 
-                    Assert.AreEqual(0, itemAddRemoveFireCount -= 2);
+                    Assert.AreEqual(0, itemAddRemoveFireCount -= 1);
 
                     checkBeatmapSetCount(osu, 1);
                     checkBeatmapCount(osu, 12);
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index f21f708f95..ae55a7b14a 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -55,12 +55,12 @@ namespace osu.Game.Database
         public Action<Notification> PostNotification { protected get; set; }
 
         /// <summary>
-        /// Fired when a new <typeparamref name="TModel"/> becomes available in the database.
+        /// Fired when a new or updated <typeparamref name="TModel"/> becomes available in the database.
         /// This is not guaranteed to run on the update thread.
         /// </summary>
-        public IBindable<WeakReference<TModel>> ItemAdded => itemAdded;
+        public IBindable<WeakReference<TModel>> ItemUpdated => itemUpdated;
 
-        private readonly Bindable<WeakReference<TModel>> itemAdded = new Bindable<WeakReference<TModel>>();
+        private readonly Bindable<WeakReference<TModel>> itemUpdated = new Bindable<WeakReference<TModel>>();
 
         /// <summary>
         /// Fired when a <typeparamref name="TModel"/> is removed from the database.
@@ -90,7 +90,7 @@ namespace osu.Game.Database
             ContextFactory = contextFactory;
 
             ModelStore = modelStore;
-            ModelStore.ItemAdded += item => handleEvent(() => itemAdded.Value = new WeakReference<TModel>(item));
+            ModelStore.ItemUpdated += item => handleEvent(() => itemUpdated.Value = new WeakReference<TModel>(item));
             ModelStore.ItemRemoved += item => handleEvent(() => itemRemoved.Value = new WeakReference<TModel>(item));
 
             exportStorage = storage.GetStorageForDirectory("exports");
diff --git a/osu.Game/Database/IModelManager.cs b/osu.Game/Database/IModelManager.cs
index 852b385798..7f7e5565f1 100644
--- a/osu.Game/Database/IModelManager.cs
+++ b/osu.Game/Database/IModelManager.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Database
     public interface IModelManager<TModel>
         where TModel : class
     {
-        IBindable<WeakReference<TModel>> ItemAdded { get; }
+        IBindable<WeakReference<TModel>> ItemUpdated { get; }
 
         IBindable<WeakReference<TModel>> ItemRemoved { get; }
     }
diff --git a/osu.Game/Database/MutableDatabaseBackedStore.cs b/osu.Game/Database/MutableDatabaseBackedStore.cs
index 4ca1eef989..c9d0c4bc41 100644
--- a/osu.Game/Database/MutableDatabaseBackedStore.cs
+++ b/osu.Game/Database/MutableDatabaseBackedStore.cs
@@ -16,7 +16,14 @@ namespace osu.Game.Database
     public abstract class MutableDatabaseBackedStore<T> : DatabaseBackedStore
         where T : class, IHasPrimaryKey, ISoftDelete
     {
-        public event Action<T> ItemAdded;
+        /// <summary>
+        /// Fired when an item was added or updated.
+        /// </summary>
+        public event Action<T> ItemUpdated;
+
+        /// <summary>
+        /// Fired when an item was removed.
+        /// </summary>
         public event Action<T> ItemRemoved;
 
         protected MutableDatabaseBackedStore(IDatabaseContextFactory contextFactory, Storage storage = null)
@@ -41,7 +48,7 @@ namespace osu.Game.Database
                 context.Attach(item);
             }
 
-            ItemAdded?.Invoke(item);
+            ItemUpdated?.Invoke(item);
         }
 
         /// <summary>
@@ -53,8 +60,7 @@ namespace osu.Game.Database
             using (var usage = ContextFactory.GetForWrite())
                 usage.Context.Update(item);
 
-            ItemRemoved?.Invoke(item);
-            ItemAdded?.Invoke(item);
+            ItemUpdated?.Invoke(item);
         }
 
         /// <summary>
@@ -91,7 +97,7 @@ namespace osu.Game.Database
                 item.DeletePending = false;
             }
 
-            ItemAdded?.Invoke(item);
+            ItemUpdated?.Invoke(item);
             return true;
         }
 
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 47de7d75ed..5d9cf612bb 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Online
             Model.Value = model;
         }
 
-        private IBindable<WeakReference<TModel>> managerAdded;
+        private IBindable<WeakReference<TModel>> managedUpdated;
         private IBindable<WeakReference<TModel>> managerRemoved;
         private IBindable<WeakReference<ArchiveDownloadRequest<TModel>>> managerDownloadBegan;
         private IBindable<WeakReference<ArchiveDownloadRequest<TModel>>> managerDownloadFailed;
@@ -56,8 +56,8 @@ namespace osu.Game.Online
             managerDownloadBegan.BindValueChanged(downloadBegan);
             managerDownloadFailed = manager.DownloadFailed.GetBoundCopy();
             managerDownloadFailed.BindValueChanged(downloadFailed);
-            managerAdded = manager.ItemAdded.GetBoundCopy();
-            managerAdded.BindValueChanged(itemAdded);
+            managedUpdated = manager.ItemUpdated.GetBoundCopy();
+            managedUpdated.BindValueChanged(itemUpdated);
             managerRemoved = manager.ItemRemoved.GetBoundCopy();
             managerRemoved.BindValueChanged(itemRemoved);
         }
@@ -128,7 +128,7 @@ namespace osu.Game.Online
 
         private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
 
-        private void itemAdded(ValueChangedEvent<WeakReference<TModel>> weakItem)
+        private void itemUpdated(ValueChangedEvent<WeakReference<TModel>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
                 setDownloadStateFromManager(item, DownloadState.LocallyAvailable);
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 453587df18..e7446975b9 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -192,7 +192,7 @@ namespace osu.Game
                     ScoreManager.Delete(getBeatmapScores(item), true);
             });
 
-            BeatmapManager.ItemAdded.BindValueChanged(i =>
+            BeatmapManager.ItemUpdated.BindValueChanged(i =>
             {
                 if (i.NewValue.TryGetTarget(out var item))
                     ScoreManager.Undelete(getBeatmapScores(item), true);
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 35f3cb0e25..92cf490be2 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -60,14 +60,14 @@ namespace osu.Game.Overlays
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
-        private IBindable<WeakReference<BeatmapSetInfo>> managerAdded;
+        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            managerAdded = beatmaps.ItemAdded.GetBoundCopy();
-            managerAdded.BindValueChanged(beatmapAdded);
+            managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
+            managerUpdated.BindValueChanged(beatmapUpdated);
             managerRemoved = beatmaps.ItemRemoved.GetBoundCopy();
             managerRemoved.BindValueChanged(beatmapRemoved);
 
@@ -98,14 +98,14 @@ namespace osu.Game.Overlays
         /// </summary>
         public bool IsPlaying => current?.Track.IsRunning ?? false;
 
-        private void beatmapAdded(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
             if (weakSet.NewValue.TryGetTarget(out var set))
             {
                 Schedule(() =>
                 {
-                    if (!beatmapSets.Contains(set))
-                        beatmapSets.Add(set);
+                    beatmapSets.Remove(set);
+                    beatmapSets.Add(set);
                 });
             }
         }
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index b84b9fec37..04390a1193 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Settings.Sections
         [Resolved]
         private SkinManager skins { get; set; }
 
-        private IBindable<WeakReference<SkinInfo>> managerAdded;
+        private IBindable<WeakReference<SkinInfo>> managerUpdated;
         private IBindable<WeakReference<SkinInfo>> managerRemoved;
 
         [BackgroundDependencyLoader]
@@ -73,8 +73,8 @@ namespace osu.Game.Overlays.Settings.Sections
                 },
             };
 
-            managerAdded = skins.ItemAdded.GetBoundCopy();
-            managerAdded.BindValueChanged(itemAdded);
+            managerUpdated = skins.ItemUpdated.GetBoundCopy();
+            managerUpdated.BindValueChanged(itemUpdated);
 
             managerRemoved = skins.ItemRemoved.GetBoundCopy();
             managerRemoved.BindValueChanged(itemRemoved);
@@ -92,10 +92,10 @@ namespace osu.Game.Overlays.Settings.Sections
             dropdownBindable.BindValueChanged(skin => configBindable.Value = skin.NewValue.ID);
         }
 
-        private void itemAdded(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
+        private void itemUpdated(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-                Schedule(() => skinDropdown.Items = skinDropdown.Items.Append(item).ToArray());
+                Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToArray());
         }
 
         private void itemRemoved(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index 4420b2d58a..e1f86fcc97 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -32,14 +32,14 @@ namespace osu.Game.Screens.Multi.Match.Components
             Text = "Start";
         }
 
-        private IBindable<WeakReference<BeatmapSetInfo>> managerAdded;
+        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            managerAdded = beatmaps.ItemAdded.GetBoundCopy();
-            managerAdded.BindValueChanged(beatmapAdded);
+            managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
+            managerUpdated.BindValueChanged(beatmapUpdated);
             managerRemoved = beatmaps.ItemRemoved.GetBoundCopy();
             managerRemoved.BindValueChanged(beatmapRemoved);
 
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             hasBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId) != null;
         }
 
-        private void beatmapAdded(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
             if (weakSet.NewValue.TryGetTarget(out var set))
             {
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index caa547ac72..e1d72d9600 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Multi.Match
         private LeaderboardChatDisplay leaderboardChatDisplay;
         private MatchSettingsOverlay settingsOverlay;
 
-        private IBindable<WeakReference<BeatmapSetInfo>> managerAdded;
+        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         public MatchSubScreen(Room room)
         {
@@ -183,8 +183,8 @@ namespace osu.Game.Screens.Multi.Match
             SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(selectedItemChanged));
             SelectedItem.Value = playlist.FirstOrDefault();
 
-            managerAdded = beatmapManager.ItemAdded.GetBoundCopy();
-            managerAdded.BindValueChanged(beatmapAdded);
+            managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
+            managerUpdated.BindValueChanged(beatmapUpdated);
         }
 
         public override bool OnExiting(IScreen next)
@@ -217,7 +217,7 @@ namespace osu.Game.Screens.Multi.Match
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
-        private void beatmapAdded(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
             Schedule(() =>
             {
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index f23e1b1ef2..2d714d1794 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Screens.Select
 
         private CarouselRoot root;
 
-        private IBindable<WeakReference<BeatmapSetInfo>> itemAdded;
+        private IBindable<WeakReference<BeatmapSetInfo>> itemUpdated;
         private IBindable<WeakReference<BeatmapSetInfo>> itemRemoved;
         private IBindable<WeakReference<BeatmapInfo>> itemHidden;
         private IBindable<WeakReference<BeatmapInfo>> itemRestored;
@@ -166,8 +166,8 @@ namespace osu.Game.Screens.Select
             RightClickScrollingEnabled.ValueChanged += enabled => scroll.RightMouseScrollbar = enabled.NewValue;
             RightClickScrollingEnabled.TriggerChange();
 
-            itemAdded = beatmaps.ItemAdded.GetBoundCopy();
-            itemAdded.BindValueChanged(beatmapAdded);
+            itemUpdated = beatmaps.ItemUpdated.GetBoundCopy();
+            itemUpdated.BindValueChanged(beatmapUpdated);
             itemRemoved = beatmaps.ItemRemoved.GetBoundCopy();
             itemRemoved.BindValueChanged(beatmapRemoved);
             itemHidden = beatmaps.BeatmapHidden.GetBoundCopy();
@@ -582,7 +582,7 @@ namespace osu.Game.Screens.Select
                 RemoveBeatmapSet(item);
         }
 
-        private void beatmapAdded(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakItem)
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
                 UpdateBeatmapSet(item);
diff --git a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
index aed25787b0..3ad57c1cb0 100644
--- a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
+++ b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private IBindable<WeakReference<ScoreInfo>> itemAdded;
+        private IBindable<WeakReference<ScoreInfo>> itemUpdated;
         private IBindable<WeakReference<ScoreInfo>> itemRemoved;
 
         public TopLocalRank(BeatmapInfo beatmap)
@@ -40,8 +40,8 @@ namespace osu.Game.Screens.Select.Carousel
         [BackgroundDependencyLoader]
         private void load()
         {
-            itemAdded = scores.ItemAdded.GetBoundCopy();
-            itemAdded.BindValueChanged(scoreChanged);
+            itemUpdated = scores.ItemUpdated.GetBoundCopy();
+            itemUpdated.BindValueChanged(scoreChanged);
 
             itemRemoved = scores.ItemRemoved.GetBoundCopy();
             itemRemoved.BindValueChanged(scoreChanged);

From 9a060cfb3acfac28816eb68f245e365153a9af46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 May 2020 20:44:15 +0900
Subject: [PATCH 02951/10326] Allow drag selections to occur from outside the
 playfield

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs                    | 1 +
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 3453bfbf63..99759bde3d 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -102,6 +102,7 @@ namespace osu.Game.Rulesets.Edit
                         {
                             Name = "Content",
                             RelativeSizeAxes = Axes.Both,
+                            Masking = true,
                             Children = new Drawable[]
                             {
                                 // layers below playfield
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index cc417bbb10..d07cffff0c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
 
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
         [Resolved(canBeNull: true)]
         private IPositionSnapProvider snapProvider { get; set; }
 

From 919ff92d15775e63bbb74083a3ce05b61ac53707 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 May 2020 22:56:12 +0900
Subject: [PATCH 02952/10326] Remove unused resolved composer

---
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs              | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 500b26917d..b5ec1e1a2a 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -20,9 +20,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         private readonly EditNotePiece headPiece;
         private readonly EditNotePiece tailPiece;
 
-        [Resolved]
-        private IManiaHitObjectComposer composer { get; set; }
-
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 

From 6be5917eb0c232d5ad34843736fc7c4781c36d02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 May 2020 23:15:16 +0900
Subject: [PATCH 02953/10326] Remove necessity for custom mania interface
 caching

---
 .../ManiaPlacementBlueprintTestScene.cs       |  4 +-
 .../ManiaSelectionBlueprintTestScene.cs       |  4 +-
 .../TestSceneManiaBeatSnapGrid.cs             | 60 ++++++++++++++++++-
 .../Blueprints/ManiaSelectionBlueprint.cs     |  3 -
 .../Edit/IManiaHitObjectComposer.cs           | 12 ----
 .../Edit/ManiaBeatSnapGrid.cs                 |  6 +-
 .../Edit/ManiaHitObjectComposer.cs            |  5 +-
 .../Edit/ManiaSelectionHandler.cs             |  9 ++-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  6 +-
 9 files changed, 76 insertions(+), 33 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
index 1119a66f63..0fe4a3c669 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Mania.Edit;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -19,8 +18,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    [Cached(Type = typeof(IManiaHitObjectComposer))]
-    public abstract class ManiaPlacementBlueprintTestScene : PlacementBlueprintTestScene, IManiaHitObjectComposer
+    public abstract class ManiaPlacementBlueprintTestScene : PlacementBlueprintTestScene
     {
         private readonly Column column;
 
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
index 35fe596e98..149f6582ab 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
@@ -4,15 +4,13 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
-using osu.Game.Rulesets.Mania.Edit;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    [Cached(Type = typeof(IManiaHitObjectComposer))]
-    public abstract class ManiaSelectionBlueprintTestScene : SelectionBlueprintTestScene, IManiaHitObjectComposer
+    public abstract class ManiaSelectionBlueprintTestScene : SelectionBlueprintTestScene
     {
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
index ce9546415f..639be0bc11 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
@@ -2,23 +2,27 @@
 // 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.Graphics;
 using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit;
 using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    [Cached(typeof(IManiaHitObjectComposer))]
-    public class TestSceneManiaBeatSnapGrid : EditorClockTestScene, IManiaHitObjectComposer
+    public class TestSceneManiaBeatSnapGrid : EditorClockTestScene
     {
         [Cached(typeof(IScrollingInfo))]
         private ScrollingTestContainer.TestScrollingInfo scrollingInfo = new ScrollingTestContainer.TestScrollingInfo();
@@ -50,7 +54,10 @@ namespace osu.Game.Rulesets.Mania.Tests
                 {
                     Clock = new FramedClock(new StopwatchClock())
                 },
-                beatSnapGrid = new ManiaBeatSnapGrid()
+                new TestHitObjectComposer(Playfield)
+                {
+                    Child = beatSnapGrid = new ManiaBeatSnapGrid()
+                }
             };
         }
 
@@ -67,4 +74,51 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         public ManiaPlayfield Playfield { get; }
     }
+
+    public class TestHitObjectComposer : HitObjectComposer
+    {
+        public override Playfield Playfield { get; }
+        public override IEnumerable<DrawableHitObject> HitObjects => Enumerable.Empty<DrawableHitObject>();
+        public override bool CursorInPlacementArea => false;
+
+        public TestHitObjectComposer(Playfield playfield)
+        {
+            Playfield = playfield;
+        }
+
+        public Drawable Child
+        {
+            set => InternalChild = value;
+        }
+
+        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public override float GetBeatSnapDistanceAt(double referenceTime)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public override float DurationToDistance(double referenceTime, double duration)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public override double DistanceToDuration(double referenceTime, float distance)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public override double GetSnappedDurationFromDistance(double referenceTime, float distance)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public override float GetSnappedDistanceFromDistance(double referenceTime, float distance)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 0089a9fbee..384f49d9b2 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -18,9 +18,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        [Resolved]
-        private IManiaHitObjectComposer composer { get; set; }
-
         protected ManiaSelectionBlueprint(DrawableHitObject drawableObject)
             : base(drawableObject)
         {
diff --git a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
deleted file mode 100644
index 3818d0e15d..0000000000
--- a/osu.Game.Rulesets.Mania/Edit/IManiaHitObjectComposer.cs
+++ /dev/null
@@ -1,12 +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.Mania.UI;
-
-namespace osu.Game.Rulesets.Mania.Edit
-{
-    public interface IManiaHitObjectComposer
-    {
-        ManiaPlayfield Playfield { get; }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index b5b6c08fca..2028cae9a5 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -11,6 +11,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -63,9 +65,9 @@ namespace osu.Game.Rulesets.Mania.Edit
         private (double start, double end)? selectionTimeRange;
 
         [BackgroundDependencyLoader]
-        private void load(IManiaHitObjectComposer composer)
+        private void load(HitObjectComposer composer)
         {
-            foreach (var stage in composer.Playfield.Stages)
+            foreach (var stage in ((ManiaPlayfield)composer.Playfield).Stages)
             {
                 foreach (var column in stage.Columns)
                 {
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 73cbadc97c..10d344242c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -20,8 +20,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    [Cached(Type = typeof(IManiaHitObjectComposer))]
-    public class ManiaHitObjectComposer : HitObjectComposer<ManiaHitObject>, IManiaHitObjectComposer
+    public class ManiaHitObjectComposer : HitObjectComposer<ManiaHitObject>
     {
         private DrawableManiaEditRuleset drawableRuleset;
         private ManiaBeatSnapGrid beatSnapGrid;
@@ -50,7 +49,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-        public ManiaPlayfield Playfield => ((ManiaPlayfield)drawableRuleset.Playfield);
+        public new ManiaPlayfield Playfield => ((ManiaPlayfield)drawableRuleset.Playfield);
 
         public IScrollingInfo ScrollingInfo => drawableRuleset.ScrollingInfo;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 4ea71652bc..65f40d7d0a 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -17,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         private IScrollingInfo scrollingInfo { get; set; }
 
         [Resolved]
-        private IManiaHitObjectComposer composer { get; set; }
+        private HitObjectComposer composer { get; set; }
 
         public override bool HandleMovement(MoveSelectionEvent moveEvent)
         {
@@ -31,7 +32,9 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         private void performColumnMovement(int lastColumn, MoveSelectionEvent moveEvent)
         {
-            var currentColumn = composer.Playfield.GetColumnByPosition(moveEvent.ScreenSpacePosition);
+            var maniaPlayfield = ((ManiaHitObjectComposer)composer).Playfield;
+
+            var currentColumn = maniaPlayfield.GetColumnByPosition(moveEvent.ScreenSpacePosition);
             if (currentColumn == null)
                 return;
 
@@ -50,7 +53,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                     maxColumn = obj.Column;
             }
 
-            columnDelta = Math.Clamp(columnDelta, -minColumn, composer.Playfield.TotalColumns - 1 - maxColumn);
+            columnDelta = Math.Clamp(columnDelta, -minColumn, maniaPlayfield.TotalColumns - 1 - maxColumn);
 
             foreach (var obj in SelectedHitObjects.OfType<ManiaHitObject>())
                 obj.Column += columnDelta;
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 3453bfbf63..0a2df64dde 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -48,6 +48,8 @@ namespace osu.Game.Rulesets.Edit
 
         protected ComposeBlueprintContainer BlueprintContainer { get; private set; }
 
+        public override Playfield Playfield => drawableRulesetWrapper.Playfield;
+
         private DrawableEditRulesetWrapper<TObject> drawableRulesetWrapper;
 
         protected readonly Container LayerBelowRuleset = new Container { RelativeSizeAxes = Axes.Both };
@@ -260,11 +262,13 @@ namespace osu.Game.Rulesets.Edit
     [Cached(typeof(IPositionSnapProvider))]
     public abstract class HitObjectComposer : CompositeDrawable, IPositionSnapProvider
     {
-        internal HitObjectComposer()
+        protected HitObjectComposer()
         {
             RelativeSizeAxes = Axes.Both;
         }
 
+        public abstract Playfield Playfield { get; }
+
         /// <summary>
         /// All the <see cref="DrawableHitObject"/>s.
         /// </summary>

From e4de20f0a5b6721519d6fa1baa4b2b2daf9222e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 May 2020 11:54:27 +0900
Subject: [PATCH 02954/10326] 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 b7d08fb120..7ea1f3140b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.525.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.528.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d5017a436f..3d2a4f3081 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.525.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.528.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 19a36f1e1f..8a7f75b515 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.Framework.iOS" Version="2020.525.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.528.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.525.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.528.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 912c999f4051a259c58c2dc8ec265193bb8f8bd6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 May 2020 19:05:35 +0900
Subject: [PATCH 02955/10326] Fix minor typo in OsuGameBase

---
 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 e7446975b9..5e44562144 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -229,8 +229,8 @@ namespace osu.Game
 
             FileStore.Cleanup();
 
-            if (API is APIAccess apiAcces)
-                AddInternal(apiAcces);
+            if (API is APIAccess apiAccess)
+                AddInternal(apiAccess);
             AddInternal(RulesetConfigCache);
 
             GlobalActionContainer globalBinding;

From a55ce261307b560ab303db9cbcf183e6c50bca43 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 20:46:17 +0900
Subject: [PATCH 02956/10326] Allow null score

---
 .../Visual/Ranking/TestSceneScorePanelList.cs | 38 ++++++++++++++++++-
 osu.Game/Screens/Ranking/ScorePanelList.cs    |  7 +++-
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
index b32b3afbda..a204d2bcbc 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
@@ -9,10 +9,11 @@ using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
-    public class TestSceneScorePanelList : OsuTestScene
+    public class TestSceneScorePanelList : OsuManualInputManagerTestScene
     {
         private ScoreInfo initialScore;
         private ScorePanelList list;
@@ -72,6 +73,41 @@ namespace osu.Game.Tests.Visual.Ranking
             assertPanelCentred();
         }
 
+        [Test]
+        public void TestNullScore()
+        {
+            AddStep("create panel with null score", () =>
+            {
+                Child = list = new ScorePanelList(null)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                };
+            });
+
+            AddStep("add many panels", () =>
+            {
+                for (int i = 0; i < 20; i++)
+                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo) { TotalScore = initialScore.TotalScore - i - 1 });
+
+                for (int i = 0; i < 20; i++)
+                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo) { TotalScore = initialScore.TotalScore + i + 1 });
+            });
+
+            AddWaitStep("wait for panel animation", 5);
+
+            AddAssert("no panel selected", () => list.ChildrenOfType<ScorePanel>().All(p => p.State != PanelState.Expanded));
+
+            AddStep("expand second panel", () =>
+            {
+                var expandedPanel = list.ChildrenOfType<ScorePanel>().OrderBy(p => p.DrawPosition.X).ElementAt(1);
+                InputManager.MoveMouseTo(expandedPanel);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            assertPanelCentred();
+        }
+
         private void assertPanelCentred() => AddUntilStep("expanded panel centred", () =>
         {
             var expandedPanel = list.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index df2c66203b..a30d911f04 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -45,8 +45,11 @@ namespace osu.Game.Screens.Ranking
                 }
             };
 
-            AddScore(initialScore);
-            presentScore(initialScore);
+            if (initialScore != null)
+            {
+                AddScore(initialScore);
+                presentScore(initialScore);
+            }
         }
 
         /// <summary>

From 666cbd0f40f2cf59a78d644caa3c1cb6a53b9588 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 21:08:47 +0900
Subject: [PATCH 02957/10326] Allow selected score to be programmatically
 changed

---
 .../Visual/Ranking/TestSceneScorePanelList.cs | 128 ++++++++++++------
 osu.Game/Screens/Ranking/ResultsScreen.cs     |   3 +-
 osu.Game/Screens/Ranking/ScorePanelList.cs    |  51 ++++---
 3 files changed, 120 insertions(+), 62 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
index a204d2bcbc..588cddea7d 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.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 NUnit.Framework;
 using osu.Framework.Graphics;
@@ -9,58 +10,121 @@ using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
-using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneScorePanelList : OsuManualInputManagerTestScene
     {
-        private ScoreInfo initialScore;
         private ScorePanelList list;
 
-        [SetUp]
-        public void Setup() => Schedule(() =>
+        [Test]
+        public void TestEmptyList()
         {
-            Child = list = new ScorePanelList(initialScore = new TestScoreInfo(new OsuRuleset().RulesetInfo))
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            };
-        });
+            createListStep(() => new ScorePanelList());
+        }
 
         [Test]
-        public void TestSingleScore()
+        public void TestEmptyListWithSelectedScore()
         {
+            createListStep(() => new ScorePanelList
+            {
+                SelectedScore = { Value = new TestScoreInfo(new OsuRuleset().RulesetInfo) }
+            });
+        }
+
+        [Test]
+        public void TestAddPanelAfterSelectingScore()
+        {
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+
+            createListStep(() => new ScorePanelList
+            {
+                SelectedScore = { Value = score }
+            });
+
+            AddStep("add panel", () => list.AddScore(score));
+
+            assertScoreState(score, true);
+            assertPanelCentred();
+        }
+
+        [Test]
+        public void TestAddPanelBeforeSelectingScore()
+        {
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+
+            createListStep(() => new ScorePanelList());
+
+            AddStep("add panel", () => list.AddScore(score));
+
+            assertScoreState(score, false);
+            assertPanelCentred();
+
+            AddStep("select score", () => list.SelectedScore.Value = score);
+
+            assertScoreState(score, true);
             assertPanelCentred();
         }
 
         [Test]
         public void TestAddManyScoresAfter()
         {
-            AddStep("add scores", () =>
+            var initialScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+
+            createListStep(() => new ScorePanelList());
+
+            AddStep("add initial panel and select", () =>
+            {
+                list.AddScore(initialScore);
+                list.SelectedScore.Value = initialScore;
+            });
+
+            AddStep("add many scores", () =>
             {
                 for (int i = 0; i < 20; i++)
                     list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo) { TotalScore = initialScore.TotalScore - i - 1 });
             });
 
+            assertScoreState(initialScore, true);
             assertPanelCentred();
         }
 
         [Test]
         public void TestAddManyScoresBefore()
         {
+            var initialScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+
+            createListStep(() => new ScorePanelList());
+
+            AddStep("add initial panel and select", () =>
+            {
+                list.AddScore(initialScore);
+                list.SelectedScore.Value = initialScore;
+            });
+
             AddStep("add scores", () =>
             {
                 for (int i = 0; i < 20; i++)
                     list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo) { TotalScore = initialScore.TotalScore + i + 1 });
             });
 
+            assertScoreState(initialScore, true);
             assertPanelCentred();
         }
 
         [Test]
         public void TestAddManyPanelsOnBothSides()
         {
+            var initialScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+
+            createListStep(() => new ScorePanelList());
+
+            AddStep("add initial panel and select", () =>
+            {
+                list.AddScore(initialScore);
+                list.SelectedScore.Value = initialScore;
+            });
+
             AddStep("add scores after", () =>
             {
                 for (int i = 0; i < 20; i++)
@@ -70,42 +134,19 @@ namespace osu.Game.Tests.Visual.Ranking
                     list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo) { TotalScore = initialScore.TotalScore + i + 1 });
             });
 
+            assertScoreState(initialScore, true);
             assertPanelCentred();
         }
 
-        [Test]
-        public void TestNullScore()
+        private void createListStep(Func<ScorePanelList> creationFunc)
         {
-            AddStep("create panel with null score", () =>
+            AddStep("create list", () => Child = list = creationFunc().With(d =>
             {
-                Child = list = new ScorePanelList(null)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                };
-            });
+                d.Anchor = Anchor.Centre;
+                d.Origin = Anchor.Centre;
+            }));
 
-            AddStep("add many panels", () =>
-            {
-                for (int i = 0; i < 20; i++)
-                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo) { TotalScore = initialScore.TotalScore - i - 1 });
-
-                for (int i = 0; i < 20; i++)
-                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo) { TotalScore = initialScore.TotalScore + i + 1 });
-            });
-
-            AddWaitStep("wait for panel animation", 5);
-
-            AddAssert("no panel selected", () => list.ChildrenOfType<ScorePanel>().All(p => p.State != PanelState.Expanded));
-
-            AddStep("expand second panel", () =>
-            {
-                var expandedPanel = list.ChildrenOfType<ScorePanel>().OrderBy(p => p.DrawPosition.X).ElementAt(1);
-                InputManager.MoveMouseTo(expandedPanel);
-                InputManager.Click(MouseButton.Left);
-            });
-
-            assertPanelCentred();
+            AddUntilStep("wait for load", () => list.IsLoaded);
         }
 
         private void assertPanelCentred() => AddUntilStep("expanded panel centred", () =>
@@ -113,5 +154,8 @@ namespace osu.Game.Tests.Visual.Ranking
             var expandedPanel = list.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
             return Precision.AlmostEquals(expandedPanel.ScreenSpaceDrawQuad.Centre.X, list.ScreenSpaceDrawQuad.Centre.X, 1);
         });
+
+        private void assertScoreState(ScoreInfo score, bool expanded)
+            => AddUntilStep($"correct score expanded = {expanded}", () => (list.ChildrenOfType<ScorePanel>().Single(p => p.Score == score).State == PanelState.Expanded) == expanded);
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 97b56d22eb..a4d1a3c26b 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -63,9 +63,10 @@ namespace osu.Game.Screens.Ranking
                     {
                         new ResultsScrollContainer
                         {
-                            Child = panels = new ScorePanelList(Score)
+                            Child = panels = new ScorePanelList
                             {
                                 RelativeSizeAxes = Axes.Both,
+                                SelectedScore = { Value = Score }
                             }
                         }
                     },
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index a30d911f04..89f5a47ee8 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
@@ -23,12 +24,13 @@ namespace osu.Game.Screens.Ranking
         /// </summary>
         private const float expanded_panel_spacing = 15;
 
+        public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
+
         private readonly Flow flow;
         private readonly Scroll scroll;
-
         private ScorePanel expandedPanel;
 
-        public ScorePanelList(ScoreInfo initialScore)
+        public ScorePanelList()
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -44,12 +46,13 @@ namespace osu.Game.Screens.Ranking
                     AutoSizeAxes = Axes.Both,
                 }
             };
+        }
 
-            if (initialScore != null)
-            {
-                AddScore(initialScore);
-                presentScore(initialScore);
-            }
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            SelectedScore.BindValueChanged(selectedScoreChanged, true);
         }
 
         /// <summary>
@@ -67,19 +70,24 @@ namespace osu.Game.Screens.Ranking
                 p.StateChanged += s =>
                 {
                     if (s == PanelState.Expanded)
-                        presentScore(score);
+                        SelectedScore.Value = p.Score;
                 };
             }));
 
-            // We want the scroll position to remain relative to the expanded panel. When a new panel is added after the expanded panel, nothing needs to be done.
-            // But when a panel is added before the expanded panel, we need to offset the scroll position by the width of the new panel.
-            if (expandedPanel != null && flow.GetPanelIndex(score) < flow.GetPanelIndex(expandedPanel.Score))
+            if (SelectedScore.Value == score)
+                selectedScoreChanged(new ValueChangedEvent<ScoreInfo>(SelectedScore.Value, SelectedScore.Value));
+            else
             {
-                // A somewhat hacky property is used here because we need to:
-                // 1) Scroll after the scroll container's visible range is updated.
-                // 2) Scroll before the scroll container's scroll position is updated.
-                // Without this, we would have a 1-frame positioning error which looks very jarring.
-                scroll.InstantScrollTarget = (scroll.InstantScrollTarget ?? scroll.Target) + ScorePanel.CONTRACTED_WIDTH + panel_spacing;
+                // We want the scroll position to remain relative to the expanded panel. When a new panel is added after the expanded panel, nothing needs to be done.
+                // But when a panel is added before the expanded panel, we need to offset the scroll position by the width of the new panel.
+                if (expandedPanel != null && flow.GetPanelIndex(score) < flow.GetPanelIndex(expandedPanel.Score))
+                {
+                    // A somewhat hacky property is used here because we need to:
+                    // 1) Scroll after the scroll container's visible range is updated.
+                    // 2) Scroll before the scroll container's scroll position is updated.
+                    // Without this, we would have a 1-frame positioning error which looks very jarring.
+                    scroll.InstantScrollTarget = (scroll.InstantScrollTarget ?? scroll.Target) + ScorePanel.CONTRACTED_WIDTH + panel_spacing;
+                }
             }
         }
 
@@ -87,17 +95,22 @@ namespace osu.Game.Screens.Ranking
         /// Brings a <see cref="ScoreInfo"/> to the centre of the screen and expands it.
         /// </summary>
         /// <param name="score">The <see cref="ScoreInfo"/> to present.</param>
-        private void presentScore(ScoreInfo score)
+        private void selectedScoreChanged(ValueChangedEvent<ScoreInfo> score)
         {
             // Contract the old panel.
-            foreach (var p in flow.Where(p => p.Score != score))
+            foreach (var p in flow.Where(p => p.Score != score.OldValue))
             {
                 p.State = PanelState.Contracted;
                 p.Margin = new MarginPadding();
             }
 
+            // Find the panel corresponding to the new score.
+            expandedPanel = flow.SingleOrDefault(p => p.Score == score.NewValue);
+
+            if (expandedPanel == null)
+                return;
+
             // Expand the new panel.
-            expandedPanel = flow.Single(p => p.Score == score);
             expandedPanel.State = PanelState.Expanded;
             expandedPanel.Margin = new MarginPadding { Horizontal = expanded_panel_spacing };
 

From ad99d854682af9e1404ff4a4e6f1d38e41a10ab1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 21:29:16 +0900
Subject: [PATCH 02958/10326] Resolve several positioning errors

---
 .../Visual/Ranking/TestSceneScorePanelList.cs | 69 ++++++++++++++++---
 osu.Game/Screens/Ranking/ScorePanelList.cs    | 15 +++-
 2 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
index 588cddea7d..e65dcb19b1 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
@@ -10,6 +10,7 @@ using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
@@ -45,7 +46,7 @@ namespace osu.Game.Tests.Visual.Ranking
             AddStep("add panel", () => list.AddScore(score));
 
             assertScoreState(score, true);
-            assertPanelCentred();
+            assertExpandedPanelCentred();
         }
 
         [Test]
@@ -58,16 +59,30 @@ namespace osu.Game.Tests.Visual.Ranking
             AddStep("add panel", () => list.AddScore(score));
 
             assertScoreState(score, false);
-            assertPanelCentred();
+            assertFirstPanelCentred();
 
             AddStep("select score", () => list.SelectedScore.Value = score);
 
             assertScoreState(score, true);
-            assertPanelCentred();
+            assertExpandedPanelCentred();
         }
 
         [Test]
-        public void TestAddManyScoresAfter()
+        public void TestAddManyNonExpandedPanels()
+        {
+            createListStep(() => new ScorePanelList());
+
+            AddStep("add many scores", () =>
+            {
+                for (int i = 0; i < 20; i++)
+                    list.AddScore(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            });
+
+            assertFirstPanelCentred();
+        }
+
+        [Test]
+        public void TestAddManyScoresAfterExpandedPanel()
         {
             var initialScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
 
@@ -86,11 +101,11 @@ namespace osu.Game.Tests.Visual.Ranking
             });
 
             assertScoreState(initialScore, true);
-            assertPanelCentred();
+            assertExpandedPanelCentred();
         }
 
         [Test]
-        public void TestAddManyScoresBefore()
+        public void TestAddManyScoresBeforeExpandedPanel()
         {
             var initialScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
 
@@ -109,11 +124,11 @@ namespace osu.Game.Tests.Visual.Ranking
             });
 
             assertScoreState(initialScore, true);
-            assertPanelCentred();
+            assertExpandedPanelCentred();
         }
 
         [Test]
-        public void TestAddManyPanelsOnBothSides()
+        public void TestAddManyPanelsOnBothSidesOfExpandedPanel()
         {
             var initialScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
 
@@ -135,7 +150,36 @@ namespace osu.Game.Tests.Visual.Ranking
             });
 
             assertScoreState(initialScore, true);
-            assertPanelCentred();
+            assertExpandedPanelCentred();
+        }
+
+        [Test]
+        public void TestSelectMultipleScores()
+        {
+            var firstScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+            var secondScore = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+
+            createListStep(() => new ScorePanelList());
+
+            AddStep("add scores and select first", () =>
+            {
+                list.AddScore(firstScore);
+                list.AddScore(secondScore);
+                list.SelectedScore.Value = firstScore;
+            });
+
+            assertScoreState(firstScore, true);
+            assertScoreState(secondScore, false);
+
+            AddStep("select second score", () =>
+            {
+                InputManager.MoveMouseTo(list.ChildrenOfType<ScorePanel>().Single(p => p.Score == secondScore));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            assertScoreState(firstScore, false);
+            assertScoreState(secondScore, true);
+            assertExpandedPanelCentred();
         }
 
         private void createListStep(Func<ScorePanelList> creationFunc)
@@ -149,13 +193,16 @@ namespace osu.Game.Tests.Visual.Ranking
             AddUntilStep("wait for load", () => list.IsLoaded);
         }
 
-        private void assertPanelCentred() => AddUntilStep("expanded panel centred", () =>
+        private void assertExpandedPanelCentred() => AddUntilStep("expanded panel centred", () =>
         {
             var expandedPanel = list.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
             return Precision.AlmostEquals(expandedPanel.ScreenSpaceDrawQuad.Centre.X, list.ScreenSpaceDrawQuad.Centre.X, 1);
         });
 
+        private void assertFirstPanelCentred()
+            => AddUntilStep("first panel centred", () => Precision.AlmostEquals(list.ChildrenOfType<ScorePanel>().First().ScreenSpaceDrawQuad.Centre.X, list.ScreenSpaceDrawQuad.Centre.X, 1));
+
         private void assertScoreState(ScoreInfo score, bool expanded)
-            => AddUntilStep($"correct score expanded = {expanded}", () => (list.ChildrenOfType<ScorePanel>().Single(p => p.Score == score).State == PanelState.Expanded) == expanded);
+            => AddUntilStep($"score expanded = {expanded}", () => (list.ChildrenOfType<ScorePanel>().Single(p => p.Score == score).State == PanelState.Expanded) == expanded);
     }
 }
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 89f5a47ee8..18db3f2af4 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.Ranking
         private void selectedScoreChanged(ValueChangedEvent<ScoreInfo> score)
         {
             // Contract the old panel.
-            foreach (var p in flow.Where(p => p.Score != score.OldValue))
+            foreach (var p in flow.Where(p => p.Score == score.OldValue))
             {
                 p.State = PanelState.Contracted;
                 p.Margin = new MarginPadding();
@@ -126,8 +126,19 @@ namespace osu.Game.Screens.Ranking
         {
             base.Update();
 
+            float offset = DrawWidth / 2f;
+
             // Add padding to both sides such that the centre of an expanded panel on either side is in the middle of the screen.
-            flow.Padding = new MarginPadding { Horizontal = DrawWidth / 2f - ScorePanel.EXPANDED_WIDTH / 2f - expanded_panel_spacing };
+
+            if (SelectedScore.Value != null)
+            {
+                // The expanded panel has extra padding applied to it, so it needs to be included into the offset.
+                offset -= ScorePanel.EXPANDED_WIDTH / 2f + expanded_panel_spacing;
+            }
+            else
+                offset -= ScorePanel.CONTRACTED_WIDTH / 2f;
+
+            flow.Padding = new MarginPadding { Horizontal = offset };
         }
 
         private class Flow : FillFlowContainer<ScorePanel>

From 47d5974f04c77d1a4e1b59beeb2bb85892fbba33 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 21:40:01 +0900
Subject: [PATCH 02959/10326] Improve results screen behaviour when changing
 selected score

---
 .../Screens/Ranking/ReplayDownloadButton.cs   |  3 ++
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 28 +++++++++++--------
 osu.Game/Screens/Ranking/SoloResultsScreen.cs |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index a36c86eafc..347fcb5f6e 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
@@ -13,6 +14,8 @@ namespace osu.Game.Screens.Ranking
 {
     public class ReplayDownloadButton : DownloadTrackingComposite<ScoreInfo, ScoreManager>
     {
+        public Bindable<ScoreInfo> Score => Model;
+
         private DownloadButton button;
         private ShakeContainer shakeContainer;
 
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index a4d1a3c26b..fbb9b95478 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -30,16 +31,17 @@ namespace osu.Game.Screens.Ranking
 
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
+        public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
+
+        public readonly ScoreInfo Score;
+        private readonly bool allowRetry;
+
         [Resolved(CanBeNull = true)]
         private Player player { get; set; }
 
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public readonly ScoreInfo Score;
-
-        private readonly bool allowRetry;
-
         private Drawable bottomPanel;
         private ScorePanelList panels;
 
@@ -47,6 +49,8 @@ namespace osu.Game.Screens.Ranking
         {
             Score = score;
             this.allowRetry = allowRetry;
+
+            SelectedScore.Value = score;
         }
 
         [BackgroundDependencyLoader]
@@ -66,7 +70,7 @@ namespace osu.Game.Screens.Ranking
                             Child = panels = new ScorePanelList
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                SelectedScore = { Value = Score }
+                                SelectedScore = { BindTarget = SelectedScore }
                             }
                         }
                     },
@@ -95,7 +99,11 @@ namespace osu.Game.Screens.Ranking
                                     Direction = FillDirection.Horizontal,
                                     Children = new Drawable[]
                                     {
-                                        new ReplayDownloadButton(Score) { Width = 300 },
+                                        new ReplayDownloadButton(null)
+                                        {
+                                            Score = { BindTarget = SelectedScore },
+                                            Width = 300
+                                        },
                                     }
                                 }
                             }
@@ -109,6 +117,9 @@ namespace osu.Game.Screens.Ranking
                 }
             };
 
+            if (Score != null)
+                panels.AddScore(Score);
+
             if (player != null && allowRetry)
             {
                 buttons.Add(new RetryButton { Width = 300 });
@@ -132,12 +143,7 @@ namespace osu.Game.Screens.Ranking
             var req = FetchScores(scores => Schedule(() =>
             {
                 foreach (var s in scores)
-                {
-                    if (s.OnlineScoreID == Score.OnlineScoreID)
-                        continue;
-
                     panels.AddScore(s);
-                }
             }));
 
             if (req != null)
diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index 2b00748ed8..3ae723683a 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Ranking
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
             var req = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
-            req.Success += r => scoresCallback?.Invoke(r.Scores.Select(s => s.CreateScoreInfo(rulesets)));
+            req.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
             return req;
         }
     }

From 013461377e89730ee381499d816c3e9bd3c4887d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 21:46:02 +0900
Subject: [PATCH 02960/10326] Fix potential nullref

---
 .../Gameplay/TestSceneReplayDownloadButton.cs   | 17 +++++++++++++++++
 .../Screens/Ranking/ReplayDownloadButton.cs     |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
index a35437a286..1809332bce 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep(@"locally available state", () => downloadButton.SetDownloadState(DownloadState.LocallyAvailable));
             AddStep(@"not downloaded state", () => downloadButton.SetDownloadState(DownloadState.NotDownloaded));
             createButton(false);
+            createButtonNoScore();
         }
 
         private void createButton(bool withReplay)
@@ -40,6 +41,22 @@ namespace osu.Game.Tests.Visual.Gameplay
                     Origin = Anchor.Centre,
                 };
             });
+
+            AddUntilStep("wait for load", () => downloadButton.IsLoaded);
+        }
+
+        private void createButtonNoScore()
+        {
+            AddStep("create button with null score", () =>
+            {
+                Child = downloadButton = new TestReplayDownloadButton(null)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                };
+            });
+
+            AddUntilStep("wait for load", () => downloadButton.IsLoaded);
         }
 
         private ScoreInfo getScoreInfo(bool replayAvailable)
diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index 347fcb5f6e..9d4e3af230 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Ranking
                 if (State.Value == DownloadState.LocallyAvailable)
                     return ReplayAvailability.Local;
 
-                if (!string.IsNullOrEmpty(Model.Value.Hash))
+                if (!string.IsNullOrEmpty(Model.Value?.Hash))
                     return ReplayAvailability.Online;
 
                 return ReplayAvailability.NotAvailable;

From 7ae2383288109693324d02cb6c39805a4df0a3f4 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 28 May 2020 15:03:49 +0200
Subject: [PATCH 02961/10326] move stable config declaration and initial
 reading

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs  | 29 +++++++-----------------
 osu.Game.Tournament/Models/StableInfo.cs |  2 --
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index d93bce8dfa..6a403c5a6a 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Tournament.IPC
 
         [Resolved]
         private StableInfo stableInfo { get; set; }
+        private const string STABLE_CONFIG = "tournament/stable.json";
 
         public Storage IPCStorage { get; private set; }
 
@@ -161,13 +162,14 @@ namespace osu.Game.Tournament.IPC
 
         private string findStablePath()
         {
-            string stableInstallPath = string.Empty;
+            if (!string.IsNullOrEmpty(stableInfo.StablePath.Value))
+                return stableInfo.StablePath.Value;
 
+            string stableInstallPath = string.Empty;
             try
             {
                 List<Func<string>> stableFindMethods = new List<Func<string>>
                 {
-                    readFromStableInfo,
                     findFromEnvVar,
                     findFromRegistry,
                     findFromLocalAppData,
@@ -180,7 +182,7 @@ namespace osu.Game.Tournament.IPC
 
                     if (stableInstallPath != null)
                     {
-                        saveStablePath(stableInstallPath);
+                        saveStableConfig(stableInstallPath);
                         return stableInstallPath;
                     }
                 }
@@ -193,11 +195,12 @@ namespace osu.Game.Tournament.IPC
             }
         }
 
-        private void saveStablePath(string path)
+
+        private void saveStableConfig(string path)
         {
             stableInfo.StablePath.Value = path;
 
-            using (var stream = tournamentStorage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Write, FileMode.Create))
+            using (var stream = tournamentStorage.GetStream(STABLE_CONFIG, FileAccess.Write, FileMode.Create))
             using (var sw = new StreamWriter(stream))
             {
                 sw.Write(JsonConvert.SerializeObject(stableInfo,
@@ -227,22 +230,6 @@ namespace osu.Game.Tournament.IPC
             return null;
         }
 
-        private string readFromStableInfo()
-        {
-            try
-            {
-                Logger.Log("Trying to find stable through the json config");
-
-                if (!string.IsNullOrEmpty(stableInfo.StablePath.Value))
-                    return stableInfo.StablePath.Value;
-            }
-            catch
-            {
-            }
-
-            return null;
-        }
-
         private string findFromLocalAppData()
         {
             Logger.Log("Trying to find stable in %LOCALAPPDATA%");
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 63423ca6fa..873e1c5e25 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -15,7 +15,5 @@ namespace osu.Game.Tournament.Models
     {
         public Bindable<string> StablePath = new Bindable<string>(string.Empty);
 
-        [JsonIgnore]
-        public const string STABLE_CONFIG = "tournament/stable.json";
     }
 }

From ee591829899d2fd64938bd9ac406e88ad72b9082 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 May 2020 18:12:19 +0900
Subject: [PATCH 02962/10326] Implement initial structure for room scores

---
 .../Requests/GetRoomPlaylistScoresRequest.cs  | 21 +++++
 osu.Game/Online/API/RoomScore.cs              | 79 +++++++++++++++++++
 .../Screens/Multi/Match/MatchSubScreen.cs     | 16 ++++
 .../Screens/Multi/Play/TimeshiftPlayer.cs     |  8 ++
 .../Multi/Ranking/TimeshiftResultsScreen.cs   | 34 ++++++++
 5 files changed, 158 insertions(+)
 create mode 100644 osu.Game/Online/API/Requests/GetRoomPlaylistScoresRequest.cs
 create mode 100644 osu.Game/Online/API/RoomScore.cs
 create mode 100644 osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs

diff --git a/osu.Game/Online/API/Requests/GetRoomPlaylistScoresRequest.cs b/osu.Game/Online/API/Requests/GetRoomPlaylistScoresRequest.cs
new file mode 100644
index 0000000000..dd7f80fd46
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetRoomPlaylistScoresRequest.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;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetRoomPlaylistScoresRequest : APIRequest<List<RoomScore>>
+    {
+        private readonly int roomId;
+        private readonly int playlistItemId;
+
+        public GetRoomPlaylistScoresRequest(int roomId, int playlistItemId)
+        {
+            this.roomId = roomId;
+            this.playlistItemId = playlistItemId;
+        }
+
+        protected override string Target => $@"rooms/{roomId}/playlist/{playlistItemId}/scores";
+    }
+}
diff --git a/osu.Game/Online/API/RoomScore.cs b/osu.Game/Online/API/RoomScore.cs
new file mode 100644
index 0000000000..5d0a9539aa
--- /dev/null
+++ b/osu.Game/Online/API/RoomScore.cs
@@ -0,0 +1,79 @@
+// Copyright (c) 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 Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+
+namespace osu.Game.Online.API
+{
+    public class RoomScore
+    {
+        [JsonProperty("id")]
+        public int ID { get; set; }
+
+        [JsonProperty("user_id")]
+        public int UserID { get; set; }
+
+        [JsonProperty("room_id")]
+        public int RoomID { get; set; }
+
+        [JsonProperty("playlist_item_id")]
+        public int PlaylistItemID { get; set; }
+
+        [JsonProperty("beatmap_id")]
+        public int BeatmapID { get; set; }
+
+        [JsonProperty("rank")]
+        [JsonConverter(typeof(StringEnumConverter))]
+        public ScoreRank Rank { get; set; }
+
+        [JsonProperty("total_score")]
+        public long TotalScore { get; set; }
+
+        [JsonProperty("accuracy")]
+        public double Accuracy { get; set; }
+
+        [JsonProperty("max_combo")]
+        public int MaxCombo { get; set; }
+
+        [JsonProperty("mods")]
+        public APIMod[] Mods { get; set; }
+
+        [JsonProperty("statistics")]
+        public Dictionary<HitResult, int> Statistics = new Dictionary<HitResult, int>();
+
+        [JsonProperty("passed")]
+        public bool Passed { get; set; }
+
+        [JsonProperty("ended_at")]
+        public DateTimeOffset EndedAt { get; set; }
+
+        public ScoreInfo CreateScoreInfo(PlaylistItem playlistItem)
+        {
+            var scoreInfo = new ScoreInfo
+            {
+                OnlineScoreID = ID,
+                TotalScore = TotalScore,
+                MaxCombo = MaxCombo,
+                Beatmap = playlistItem.Beatmap.Value,
+                BeatmapInfoID = playlistItem.BeatmapID,
+                Ruleset = playlistItem.Ruleset.Value,
+                RulesetID = playlistItem.RulesetID,
+                User = null, // todo: do we have a user object?
+                Accuracy = Accuracy,
+                Date = EndedAt,
+                Hash = string.Empty, // todo: temporary?
+                Rank = Rank,
+                Mods = Array.Empty<Mod>(), // todo: how?
+            };
+
+            return scoreInfo;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index caa547ac72..c37f51bcb4 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -10,6 +10,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.GameTypes;
 using osu.Game.Rulesets.Mods;
@@ -162,6 +164,9 @@ namespace osu.Game.Screens.Multi.Match
             };
         }
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -185,6 +190,17 @@ namespace osu.Game.Screens.Multi.Match
 
             managerAdded = beatmapManager.ItemAdded.GetBoundCopy();
             managerAdded.BindValueChanged(beatmapAdded);
+
+            if (roomId.Value != null)
+            {
+                var req = new GetRoomPlaylistScoresRequest(roomId.Value.Value, playlist[0].ID);
+
+                req.Success += scores =>
+                {
+                };
+
+                api.Queue(req);
+            }
         }
 
         public override bool OnExiting(IScreen next)
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 7f58de29fb..fbe9e3480f 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -14,7 +14,9 @@ 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
 {
@@ -88,6 +90,12 @@ namespace osu.Game.Screens.Multi.Play
             return false;
         }
 
+        protected override ResultsScreen CreateResults(ScoreInfo score)
+        {
+            Debug.Assert(roomId.Value != null);
+            return new TimeshiftResultsScreen(score, roomId.Value.Value, playlistItem);
+        }
+
         protected override ScoreInfo CreateScore()
         {
             submitScore();
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
new file mode 100644
index 0000000000..60cffc06df
--- /dev/null
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.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 System.Collections.Generic;
+using System.Linq;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
+
+namespace osu.Game.Screens.Multi.Ranking
+{
+    public class TimeshiftResultsScreen : ResultsScreen
+    {
+        private readonly int roomId;
+        private readonly PlaylistItem playlistItem;
+
+        public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry = true)
+            : base(score, allowRetry)
+        {
+            this.roomId = roomId;
+            this.playlistItem = playlistItem;
+        }
+
+        protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
+        {
+            var req = new GetRoomPlaylistScoresRequest(roomId, playlistItem.ID);
+            req.Success += r => scoresCallback?.Invoke(r.Select(s => s.CreateScoreInfo(playlistItem)));
+            return req;
+        }
+    }
+}

From 38502ba88c29615642e986c7dce99bbe16b92e87 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 14:54:51 +0900
Subject: [PATCH 02963/10326] Remove some unnecessary members

---
 osu.Game/Online/API/RoomScore.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/osu.Game/Online/API/RoomScore.cs b/osu.Game/Online/API/RoomScore.cs
index 5d0a9539aa..3ad6169833 100644
--- a/osu.Game/Online/API/RoomScore.cs
+++ b/osu.Game/Online/API/RoomScore.cs
@@ -20,15 +20,6 @@ namespace osu.Game.Online.API
         [JsonProperty("user_id")]
         public int UserID { get; set; }
 
-        [JsonProperty("room_id")]
-        public int RoomID { get; set; }
-
-        [JsonProperty("playlist_item_id")]
-        public int PlaylistItemID { get; set; }
-
-        [JsonProperty("beatmap_id")]
-        public int BeatmapID { get; set; }
-
         [JsonProperty("rank")]
         [JsonConverter(typeof(StringEnumConverter))]
         public ScoreRank Rank { get; set; }

From f9c64d7be38558d5b737ade5053622cbff276906 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 19:57:58 +0900
Subject: [PATCH 02964/10326] Implement creation of mods

---
 osu.Game/Online/API/RoomScore.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/RoomScore.cs b/osu.Game/Online/API/RoomScore.cs
index 3ad6169833..cb4f47c812 100644
--- a/osu.Game/Online/API/RoomScore.cs
+++ b/osu.Game/Online/API/RoomScore.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using osu.Game.Online.Multiplayer;
@@ -61,7 +62,7 @@ namespace osu.Game.Online.API
                 Date = EndedAt,
                 Hash = string.Empty, // todo: temporary?
                 Rank = Rank,
-                Mods = Array.Empty<Mod>(), // todo: how?
+                Mods = Mods.Select(m => m.ToMod(playlistItem.Ruleset.Value.CreateInstance())).ToArray()
             };
 
             return scoreInfo;

From 7ac08620b80e335f747be668dfe5eaeae2a78703 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 19:58:07 +0900
Subject: [PATCH 02965/10326] Add a user object for now

---
 osu.Game/Online/API/RoomScore.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/RoomScore.cs b/osu.Game/Online/API/RoomScore.cs
index cb4f47c812..00907eaa38 100644
--- a/osu.Game/Online/API/RoomScore.cs
+++ b/osu.Game/Online/API/RoomScore.cs
@@ -7,9 +7,9 @@ using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Users;
 
 namespace osu.Game.Online.API
 {
@@ -18,8 +18,8 @@ namespace osu.Game.Online.API
         [JsonProperty("id")]
         public int ID { get; set; }
 
-        [JsonProperty("user_id")]
-        public int UserID { get; set; }
+        [JsonProperty("user")]
+        public User User { get; set; }
 
         [JsonProperty("rank")]
         [JsonConverter(typeof(StringEnumConverter))]
@@ -57,7 +57,7 @@ namespace osu.Game.Online.API
                 BeatmapInfoID = playlistItem.BeatmapID,
                 Ruleset = playlistItem.Ruleset.Value,
                 RulesetID = playlistItem.RulesetID,
-                User = null, // todo: do we have a user object?
+                User = User,
                 Accuracy = Accuracy,
                 Date = EndedAt,
                 Hash = string.Empty, // todo: temporary?

From d88bfa2080f7c1dcf852dfa278fd7f068dd3d8dc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 20:07:51 +0900
Subject: [PATCH 02966/10326] Cache ruleset + fix possible nullrefs

---
 osu.Game/Online/API/RoomScore.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/RoomScore.cs b/osu.Game/Online/API/RoomScore.cs
index 00907eaa38..a1b08fe40e 100644
--- a/osu.Game/Online/API/RoomScore.cs
+++ b/osu.Game/Online/API/RoomScore.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Users;
@@ -48,6 +49,8 @@ namespace osu.Game.Online.API
 
         public ScoreInfo CreateScoreInfo(PlaylistItem playlistItem)
         {
+            var rulesetInstance = playlistItem.Ruleset.Value.CreateInstance();
+
             var scoreInfo = new ScoreInfo
             {
                 OnlineScoreID = ID,
@@ -62,7 +65,7 @@ namespace osu.Game.Online.API
                 Date = EndedAt,
                 Hash = string.Empty, // todo: temporary?
                 Rank = Rank,
-                Mods = Mods.Select(m => m.ToMod(playlistItem.Ruleset.Value.CreateInstance())).ToArray()
+                Mods = Mods?.Select(m => m.ToMod(rulesetInstance)).ToArray() ?? Array.Empty<Mod>()
             };
 
             return scoreInfo;

From 0e28ded80fc4b078b10c9666f1399ce8fa994aa8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 20:07:54 +0900
Subject: [PATCH 02967/10326] Forward statistics

---
 osu.Game/Online/API/RoomScore.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/API/RoomScore.cs b/osu.Game/Online/API/RoomScore.cs
index a1b08fe40e..3c7f8c9833 100644
--- a/osu.Game/Online/API/RoomScore.cs
+++ b/osu.Game/Online/API/RoomScore.cs
@@ -60,6 +60,7 @@ namespace osu.Game.Online.API
                 BeatmapInfoID = playlistItem.BeatmapID,
                 Ruleset = playlistItem.Ruleset.Value,
                 RulesetID = playlistItem.RulesetID,
+                Statistics = Statistics,
                 User = User,
                 Accuracy = Accuracy,
                 Date = EndedAt,

From 0f373acacb55be124e573144a8b112291ea82fdd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 20:08:45 +0900
Subject: [PATCH 02968/10326] Add test scene

---
 .../TestSceneTimeshiftResultsScreen.cs        | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
new file mode 100644
index 0000000000..7f43aea56e
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -0,0 +1,76 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Multi.Ranking;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneTimeshiftResultsScreen : ScreenTestScene
+    {
+        [Test]
+        public void TestShowResults()
+        {
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+            var roomScores = new List<RoomScore>();
+
+            for (int i = 0; i < 10; i++)
+            {
+                roomScores.Add(new RoomScore
+                {
+                    ID = i,
+                    Accuracy = 0.9 - 0.01 * i,
+                    EndedAt = DateTimeOffset.Now.Subtract(TimeSpan.FromHours(i)),
+                    Passed = true,
+                    Rank = ScoreRank.B,
+                    MaxCombo = 999,
+                    TotalScore = 999999 - i * 1000,
+                    User = new User
+                    {
+                        Id = 2,
+                        Username = $"peppy{i}",
+                        CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                    },
+                    Statistics =
+                    {
+                        { HitResult.Miss, 1 },
+                        { HitResult.Meh, 50 },
+                        { HitResult.Good, 100 },
+                        { HitResult.Great, 300 },
+                    }
+                });
+            }
+
+            AddStep("bind request handler", () => ((DummyAPIAccess)API).HandleRequest = request =>
+            {
+                switch (request)
+                {
+                    case GetRoomPlaylistScoresRequest r:
+                        r.TriggerSuccess(roomScores);
+                        break;
+                }
+            });
+
+            AddStep("load results", () =>
+            {
+                LoadScreen(new TimeshiftResultsScreen(score, 1, new PlaylistItem
+                {
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
+                }));
+            });
+
+            AddWaitStep("wait for display", 10);
+        }
+    }
+}

From a606f41297931301e66225c6ada60cf5fa6b326b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 22:25:00 +0900
Subject: [PATCH 02969/10326] Add button to open results

---
 .../TestSceneTimeshiftResultsScreen.cs        | 14 ++++++--
 .../Screens/Multi/Match/MatchSubScreen.cs     | 33 +++++++++++++++++--
 .../Multi/Ranking/TimeshiftResultsScreen.cs   |  2 +-
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index 7f43aea56e..d87a2e3408 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -19,9 +19,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneTimeshiftResultsScreen : ScreenTestScene
     {
         [Test]
-        public void TestShowResults()
+        public void TestShowResultsWithScore()
+        {
+            createResults(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+        }
+
+        [Test]
+        public void TestShowResultsNullScore()
+        {
+            createResults(null);
+        }
+
+        private void createResults(ScoreInfo score)
         {
-            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo);
             var roomScores = new List<RoomScore>();
 
             for (int i = 0; i < 10; i++)
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index c37f51bcb4..01a90139c3 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.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -10,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
@@ -18,6 +20,7 @@ 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.Multi.Ranking;
 using osu.Game.Screens.Select;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
@@ -114,10 +117,29 @@ namespace osu.Game.Screens.Multi.Match
                                                             {
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 Padding = new MarginPadding { Horizontal = 5 },
-                                                                Child = new OverlinedPlaylist(true) // Temporarily always allow selection
+                                                                Child = new GridContainer
                                                                 {
                                                                     RelativeSizeAxes = Axes.Both,
-                                                                    SelectedItem = { BindTarget = SelectedItem }
+                                                                    Content = new[]
+                                                                    {
+                                                                        new Drawable[]
+                                                                        {
+                                                                            new OverlinedPlaylist(true) // Temporarily always allow selection
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.Both,
+                                                                                SelectedItem = { BindTarget = SelectedItem }
+                                                                            }
+                                                                        },
+                                                                        new Drawable[]
+                                                                        {
+                                                                            new TriangleButton
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.X,
+                                                                                Text = "Show beatmap results",
+                                                                                Action = showBeatmapResults
+                                                                            }
+                                                                        }
+                                                                    }
                                                                 }
                                                             },
                                                             new Container
@@ -257,5 +279,12 @@ namespace osu.Game.Screens.Multi.Match
                     break;
             }
         }
+
+        private void showBeatmapResults()
+        {
+            Debug.Assert(roomId.Value != null);
+
+            this.Push(new TimeshiftResultsScreen(null, roomId.Value.Value, SelectedItem.Value, false));
+        }
     }
 }
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 60cffc06df..f2afe15d35 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Multi.Ranking
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
             var req = new GetRoomPlaylistScoresRequest(roomId, playlistItem.ID);
-            req.Success += r => scoresCallback?.Invoke(r.Select(s => s.CreateScoreInfo(playlistItem)));
+            req.Success += r => scoresCallback?.Invoke(r.Where(s => s.ID != Score?.OnlineScoreID).Select(s => s.CreateScoreInfo(playlistItem)));
             return req;
         }
     }

From 3731e76b10b99a1307e222355efe95df3a5efb2d Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 28 May 2020 15:28:27 +0200
Subject: [PATCH 02970/10326] Move stable_config declaration, rename testscene

---
 ...thSelectScreens.cs => TestSceneStablePathSelectScreen.cs} | 0
 osu.Game.Tournament/IPC/FileBasedIPC.cs                      | 5 +++--
 osu.Game.Tournament/Models/StableInfo.cs                     | 2 --
 osu.Game.Tournament/Screens/StablePathSelectScreen.cs        | 2 +-
 osu.Game.Tournament/TournamentGameBase.cs                    | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename osu.Game.Tournament.Tests/Screens/{TestSceneStablePathSelectScreens.cs => TestSceneStablePathSelectScreen.cs} (100%)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
similarity index 100%
rename from osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreens.cs
rename to osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 6a403c5a6a..8518b7f8da 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -39,7 +39,8 @@ namespace osu.Game.Tournament.IPC
 
         [Resolved]
         private StableInfo stableInfo { get; set; }
-        private const string STABLE_CONFIG = "tournament/stable.json";
+
+        public const string STABLE_CONFIG = "tournament/stable.json";
 
         public Storage IPCStorage { get; private set; }
 
@@ -166,6 +167,7 @@ namespace osu.Game.Tournament.IPC
                 return stableInfo.StablePath.Value;
 
             string stableInstallPath = string.Empty;
+
             try
             {
                 List<Func<string>> stableFindMethods = new List<Func<string>>
@@ -195,7 +197,6 @@ namespace osu.Game.Tournament.IPC
             }
         }
 
-
         private void saveStableConfig(string path)
         {
             stableInfo.StablePath.Value = path;
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 873e1c5e25..4818842151 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using Newtonsoft.Json;
 using osu.Framework.Bindables;
 
 namespace osu.Game.Tournament.Models
@@ -14,6 +13,5 @@ namespace osu.Game.Tournament.Models
     public class StableInfo
     {
         public Bindable<string> StablePath = new Bindable<string>(string.Empty);
-
     }
 }
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index d2c7225909..eace3c78d5 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tournament.Screens
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuColour colours)
         {
-           var initialPath = new DirectoryInfo(storage.GetFullPath(stableInfo.StablePath.Value ?? string.Empty)).Parent?.FullName;
+            var initialPath = new DirectoryInfo(storage.GetFullPath(stableInfo.StablePath.Value ?? string.Empty)).Parent?.FullName;
 
             AddRangeInternal(new Drawable[]
             {
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 7d7d4f84aa..dcfe646390 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -148,9 +148,9 @@ namespace osu.Game.Tournament
             if (stableInfo == null)
                 stableInfo = new StableInfo();
 
-            if (storage.Exists(StableInfo.STABLE_CONFIG))
+            if (storage.Exists(FileBasedIPC.STABLE_CONFIG))
             {
-                using (Stream stream = storage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Read, FileMode.Open))
+                using (Stream stream = storage.GetStream(FileBasedIPC.STABLE_CONFIG, FileAccess.Read, FileMode.Open))
                 using (var sr = new StreamReader(stream))
                 {
                     stableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());

From 46689a2fbc46281277feb6fe806b0f756e1bfddc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 11:46:08 +0900
Subject: [PATCH 02971/10326] Tidy up and complete xmldoc for HitObjectComposer

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 89 ++++++++++++++++-----
 osu.sln.DotSettings                         |  5 +-
 2 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 38576e02a0..c956439eb2 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -48,8 +48,6 @@ namespace osu.Game.Rulesets.Edit
 
         protected ComposeBlueprintContainer BlueprintContainer { get; private set; }
 
-        public override Playfield Playfield => drawableRulesetWrapper.Playfield;
-
         private DrawableEditRulesetWrapper<TObject> drawableRulesetWrapper;
 
         protected readonly Container LayerBelowRuleset = new Container { RelativeSizeAxes = Axes.Both };
@@ -61,7 +59,6 @@ namespace osu.Game.Rulesets.Edit
         protected HitObjectComposer(Ruleset ruleset)
         {
             Ruleset = ruleset;
-            RelativeSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
@@ -137,6 +134,49 @@ namespace osu.Game.Rulesets.Edit
             EditorBeatmap.SelectedHitObjects.CollectionChanged += selectionChanged;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            inputManager = GetContainingInputManager();
+        }
+
+        public override Playfield Playfield => drawableRulesetWrapper.Playfield;
+
+        public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
+
+        public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(inputManager.CurrentState.Mouse.Position);
+
+        /// <summary>
+        /// Defines all available composition tools, listed on the left side of the editor screen as button controls.
+        /// This should usually define one tool for each <see cref="HitObject"/> type used in the target ruleset.
+        /// </summary>
+        /// <remarks>
+        /// A "select" tool is automatically added as the first tool.
+        /// </remarks>
+        protected abstract IReadOnlyList<HitObjectCompositionTool> CompositionTools { get; }
+
+        /// <summary>
+        /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
+        /// </summary>
+        protected abstract ComposeBlueprintContainer CreateBlueprintContainer();
+
+        /// <summary>
+        /// Construct a drawable ruleset for the provided ruleset.
+        /// </summary>
+        /// <remarks>
+        /// Can be overridden to add editor-specific logical changes to a <see cref="Ruleset"/>'s standard <see cref="DrawableRuleset{TObject}"/>.
+        /// For example, hit animations or judgement logic may be changed to give a better editor user experience.
+        /// </remarks>
+        /// <param name="ruleset">The ruleset used to construct its drawable counterpart.</param>
+        /// <param name="beatmap">The loaded beatmap.</param>
+        /// <param name="mods">The mods to be applied.</param>
+        /// <returns>An editor-relevant <see cref="DrawableRuleset{TObject}"/></returns>.
+        protected virtual DrawableRuleset<TObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+            => (DrawableRuleset<TObject>)ruleset.CreateDrawableRulesetWith(beatmap, mods);
+
+        #region Tool selection logic
+
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (e.Key >= Key.Number1 && e.Key <= Key.Number9)
@@ -153,13 +193,6 @@ namespace osu.Game.Rulesets.Edit
             return base.OnKeyDown(e);
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            inputManager = GetContainingInputManager();
-        }
-
         private void selectionChanged(object sender, NotifyCollectionChangedEventArgs changedArgs)
         {
             if (EditorBeatmap.SelectedHitObjects.Any())
@@ -179,15 +212,9 @@ namespace osu.Game.Rulesets.Edit
                 EditorBeatmap.SelectedHitObjects.Clear();
         }
 
-        public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
+        #endregion
 
-        public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(inputManager.CurrentState.Mouse.Position);
-
-        protected abstract IReadOnlyList<HitObjectCompositionTool> CompositionTools { get; }
-
-        protected abstract ComposeBlueprintContainer CreateBlueprintContainer();
-
-        protected abstract DrawableRuleset<TObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null);
+        #region IPlacementHandler
 
         public void BeginPlacement(HitObject hitObject)
         {
@@ -209,6 +236,17 @@ namespace osu.Game.Rulesets.Edit
 
         public void Delete(HitObject hitObject) => EditorBeatmap.Remove(hitObject);
 
+        #endregion
+
+        #region IPositionSnapProvider
+
+        /// <summary>
+        /// Retrieve the relevant <see cref="Playfield"/> at a specified screen-space position.
+        /// In cases where a ruleset doesn't require custom logic (due to nested playfields, for example)
+        /// this will return the ruleset's main playfield.
+        /// </summary>
+        /// <param name="screenSpacePosition">The screen-space position to query.</param>
+        /// <returns>The most relevant <see cref="Playfield"/>.</returns>
         protected virtual Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpacePosition) => drawableRulesetWrapper.Playfield;
 
         public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
@@ -257,8 +295,14 @@ namespace osu.Game.Rulesets.Edit
 
             return DurationToDistance(referenceTime, snappedEndTime - referenceTime);
         }
+
+        #endregion
     }
 
+    /// <summary>
+    /// A non-generic definition of a HitObject composer class.
+    /// Generally used to access certain methods without requiring a generic type for <see cref="HitObjectComposer{T}" />.
+    /// </summary>
     [Cached(typeof(HitObjectComposer))]
     [Cached(typeof(IPositionSnapProvider))]
     public abstract class HitObjectComposer : CompositeDrawable, IPositionSnapProvider
@@ -268,10 +312,13 @@ namespace osu.Game.Rulesets.Edit
             RelativeSizeAxes = Axes.Both;
         }
 
+        /// <summary>
+        /// The target ruleset's playfield.
+        /// </summary>
         public abstract Playfield Playfield { get; }
 
         /// <summary>
-        /// All the <see cref="DrawableHitObject"/>s.
+        /// All <see cref="DrawableHitObject"/>s in currently loaded beatmap.
         /// </summary>
         public abstract IEnumerable<DrawableHitObject> HitObjects { get; }
 
@@ -280,6 +327,8 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public abstract bool CursorInPlacementArea { get; }
 
+        #region IPositionSnapProvider
+
         public abstract SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
 
         public abstract float GetBeatSnapDistanceAt(double referenceTime);
@@ -291,5 +340,7 @@ namespace osu.Game.Rulesets.Edit
         public abstract double GetSnappedDurationFromDistance(double referenceTime, float distance);
 
         public abstract float GetSnappedDistanceFromDistance(double referenceTime, float distance);
+
+        #endregion
     }
 }
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index e3b64c03b9..b9fc3de734 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -1,4 +1,4 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
@@ -905,14 +905,17 @@ private void load()
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobject/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=playfields/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

From 8fa8c561e7bc438eb5c64473d70d50e6de4c4584 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 12:20:50 +0900
Subject: [PATCH 02972/10326] Pass hitobjects as a parameter to
 CreateBlueprintContainer

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 4 +++-
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs     | 4 +++-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs            | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 10d344242c..7e2469a794 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -88,7 +89,8 @@ namespace osu.Game.Rulesets.Mania.Edit
             return drawableRuleset;
         }
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new ManiaBlueprintContainer(drawableRuleset.Playfield.AllHitObjects);
+        protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
+            => new ManiaBlueprintContainer(hitObjects);
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index de5c1e54d7..37019a7a05 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -46,7 +47,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             EditorBeatmap.PlacementObject.ValueChanged += _ => updateDistanceSnapGrid();
         }
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new OsuBlueprintContainer(HitObjects);
+        protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
+            => new OsuBlueprintContainer(hitObjects);
 
         private DistanceSnapGrid distanceSnapGrid;
         private Container distanceSnapGridContainer;
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index c956439eb2..8b9f531417 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Edit
                                 drawableRulesetWrapper,
                                 // layers above playfield
                                 drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer()
-                                                      .WithChild(BlueprintContainer = CreateBlueprintContainer())
+                                                      .WithChild(BlueprintContainer = CreateBlueprintContainer(HitObjects))
                             }
                         }
                     },
@@ -159,7 +159,9 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
         /// </summary>
-        protected abstract ComposeBlueprintContainer CreateBlueprintContainer();
+        /// <param name="hitObjects">A live collection of all <see cref="DrawableHitObject"/>s in the editor beatmap.</param>
+        protected virtual ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
+            => new ComposeBlueprintContainer(hitObjects);
 
         /// <summary>
         /// Construct a drawable ruleset for the provided ruleset.

From f9883373bbd86eb0513968d6dd487b95f4ce759f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 16:11:26 +0900
Subject: [PATCH 02973/10326] Flip direction to avoid breaking other usages

---
 osu.Game/Rulesets/Objects/Types/IHasDuration.cs | 16 +++++++++++++---
 osu.Game/Rulesets/Objects/Types/IHasEndTime.cs  | 16 +++++++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
index 2433f9597e..185fd5977b 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
@@ -8,17 +8,27 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that ends at a different time than its start time.
     /// </summary>
-    public interface IHasDuration
+#pragma warning disable 618
+    public interface IHasDuration : IHasEndTime
+#pragma warning restore 618
     {
+        double IHasEndTime.EndTime
+        {
+            get => EndTime;
+            set => Duration = (Duration - EndTime) + value;
+        }
+
+        double IHasEndTime.Duration => Duration;
+
         /// <summary>
         /// The time at which the HitObject ends.
         /// </summary>
-        double EndTime { get; }
+        new double EndTime { get; }
 
         /// <summary>
         /// The duration of the HitObject.
         /// </summary>
         [JsonIgnore]
-        double Duration { get; set; }
+        new double Duration { get; set; }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
index 7395223c7e..c3769c5909 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
@@ -2,11 +2,25 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
 
 namespace osu.Game.Rulesets.Objects.Types
 {
+    /// <summary>
+    /// A HitObject that ends at a different time than its start time.
+    /// </summary>
     [Obsolete("Use IHasDuration instead.")] // can be removed 20201126
-    public interface IHasEndTime : IHasDuration
+    public interface IHasEndTime
     {
+        /// <summary>
+        /// The time at which the HitObject ends.
+        /// </summary>
+        [JsonIgnore]
+        double EndTime { get; set; }
+
+        /// <summary>
+        /// The duration of the HitObject.
+        /// </summary>
+        double Duration { get; }
     }
 }

From 7d4e60f05e01b77932ffac10ab5f5735a85a3015 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 May 2020 16:06:25 +0900
Subject: [PATCH 02974/10326] Add basic setup for TaikoHitObjectComposer

---
 .../TestSceneTaikoHitObjectComposer.cs        | 58 +++++++++++++++++++
 .../TaikoHitObjectComposer.cs                 | 34 +++++++++++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  3 +
 3 files changed, 95 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs
 create mode 100644 osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs
new file mode 100644
index 0000000000..0fff08fab7
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs
@@ -0,0 +1,58 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Taiko.Beatmaps;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Screens.Edit;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneTaikoHitObjectComposer : EditorClockTestScene
+    {
+        private TestComposer composer;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            BeatDivisor.Value = 8;
+            Clock.Seek(0);
+
+            Child = composer = new TestComposer { RelativeSizeAxes = Axes.Both };
+        });
+
+        [Test]
+        public void BasicTest()
+        {
+        }
+
+        private class TestComposer : CompositeDrawable
+        {
+            [Cached(typeof(EditorBeatmap))]
+            [Cached(typeof(IBeatSnapProvider))]
+            public readonly EditorBeatmap EditorBeatmap;
+
+            public readonly TaikoHitObjectComposer Composer;
+
+            public TestComposer()
+            {
+                InternalChildren = new Drawable[]
+                {
+                    EditorBeatmap = new EditorBeatmap(new TaikoBeatmap())
+                    {
+                        BeatmapInfo = { Ruleset = new TaikoRuleset().RulesetInfo }
+                    },
+                    Composer = new TaikoHitObjectComposer(new TaikoRuleset())
+                };
+
+                for (int i = 0; i < 10; i++)
+                    EditorBeatmap.Add(new Hit { StartTime = 125 * i });
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
new file mode 100644
index 0000000000..069517fe46
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.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.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Edit.Compose.Components;
+
+namespace osu.Game.Rulesets.Taiko
+{
+    public class TaikoHitObjectComposer : HitObjectComposer<TaikoHitObject>
+    {
+        private DrawableTaikoRuleset drawableRuleset;
+
+        public TaikoHitObjectComposer(Ruleset ruleset)
+            : base(ruleset)
+        {
+        }
+
+        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new List<HitObjectCompositionTool>();
+
+        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new ComposeBlueprintContainer(drawableRuleset.Playfield.AllHitObjects);
+
+        protected override DrawableRuleset<TaikoHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+        {
+            return drawableRuleset = new DrawableTaikoRuleset(ruleset, beatmap, mods);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 74d9e68ad3..7be16471b4 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Taiko.Difficulty;
 using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Scoring;
 using System;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Skinning;
 
@@ -144,6 +145,8 @@ namespace osu.Game.Rulesets.Taiko
 
         public override Drawable CreateIcon() => new SpriteIcon { Icon = OsuIcon.RulesetTaiko };
 
+        public override HitObjectComposer CreateHitObjectComposer() => new TaikoHitObjectComposer(this);
+
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new TaikoDifficultyCalculator(this, beatmap);
 
         public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new TaikoPerformanceCalculator(this, beatmap, score);

From 90acba8c36ded4f5d6c3873d46c99e27a5ff9517 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 19:23:36 +0900
Subject: [PATCH 02975/10326] Introduce initial placement blueprint logic

---
 .../TestSceneTaikoHitObjectComposer.cs        |   8 +-
 .../TaikoHitObjectComposer.cs                 | 119 +++++++++++++++++-
 2 files changed, 119 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs
index 0fff08fab7..b5ee33fa8e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs
@@ -15,15 +15,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
 {
     public class TestSceneTaikoHitObjectComposer : EditorClockTestScene
     {
-        private TestComposer composer;
-
         [SetUp]
         public void Setup() => Schedule(() =>
         {
             BeatDivisor.Value = 8;
             Clock.Seek(0);
 
-            Child = composer = new TestComposer { RelativeSizeAxes = Axes.Both };
+            Child = new TestComposer { RelativeSizeAxes = Axes.Both };
         });
 
         [Test]
@@ -37,8 +35,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
             [Cached(typeof(IBeatSnapProvider))]
             public readonly EditorBeatmap EditorBeatmap;
 
-            public readonly TaikoHitObjectComposer Composer;
-
             public TestComposer()
             {
                 InternalChildren = new Drawable[]
@@ -47,7 +43,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                     {
                         BeatmapInfo = { Ruleset = new TaikoRuleset().RulesetInfo }
                     },
-                    Composer = new TaikoHitObjectComposer(new TaikoRuleset())
+                    new TaikoHitObjectComposer(new TaikoRuleset())
                 };
 
                 for (int i = 0; i < 10; i++)
diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
index 069517fe46..dfdc91f7dc 100644
--- a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
@@ -2,14 +2,22 @@
 // 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.Shapes;
+using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
+using osuTK;
+using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Taiko
 {
@@ -22,13 +30,120 @@ namespace osu.Game.Rulesets.Taiko
         {
         }
 
-        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new List<HitObjectCompositionTool>();
+        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new[]
+        {
+            new HitCompositionTool()
+        };
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new ComposeBlueprintContainer(drawableRuleset.Playfield.AllHitObjects);
+        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new TaikoBlueprintContainer(drawableRuleset.Playfield.AllHitObjects);
 
         protected override DrawableRuleset<TaikoHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
         {
             return drawableRuleset = new DrawableTaikoRuleset(ruleset, beatmap, mods);
         }
     }
+
+    public class TaikoBlueprintContainer : ComposeBlueprintContainer
+    {
+        public TaikoBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
+            : base(hitObjects)
+        {
+        }
+
+        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) =>
+            new TaikoSelectionBlueprint(hitObject);
+    }
+
+    public class TaikoSelectionBlueprint : OverlaySelectionBlueprint
+    {
+        public TaikoSelectionBlueprint(DrawableHitObject hitObject)
+            : base(hitObject)
+        {
+            RelativeSizeAxes = Axes.None;
+
+            AddInternal(new HitPiece { RelativeSizeAxes = Axes.Both });
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // Move the rectangle to cover the hitobjects
+            var topLeft = new Vector2(float.MaxValue, float.MaxValue);
+            var bottomRight = new Vector2(float.MinValue, float.MinValue);
+
+            topLeft = Vector2.ComponentMin(topLeft, Parent.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.TopLeft));
+            bottomRight = Vector2.ComponentMax(bottomRight, Parent.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.BottomRight));
+
+            Size = bottomRight - topLeft;
+            Position = topLeft;
+        }
+    }
+
+    public class HitCompositionTool : HitObjectCompositionTool
+    {
+        public HitCompositionTool()
+            : base(nameof(Hit))
+        {
+        }
+
+        public override PlacementBlueprint CreatePlacementBlueprint() => new HitPlacementBlueprint();
+    }
+
+    public class HitPlacementBlueprint : PlacementBlueprint
+
+    {
+        private readonly HitPiece piece;
+
+        public HitPlacementBlueprint()
+            : base(new Hit())
+        {
+            InternalChild = piece = new HitPiece
+            {
+                Size = new Vector2(TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT)
+            };
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            if (e.Button == MouseButton.Left)
+            {
+                EndPlacement(true);
+                return true;
+            }
+
+            return base.OnMouseDown(e);
+        }
+
+        public override void UpdatePosition(SnapResult snapResult)
+        {
+            piece.Position = ToLocalSpace(snapResult.ScreenSpacePosition);
+            base.UpdatePosition(snapResult);
+        }
+    }
+
+    public class HitPiece : CompositeDrawable
+    {
+        public HitPiece()
+        {
+            Origin = Anchor.Centre;
+
+            InternalChild = new CircularContainer
+            {
+                Masking = true,
+                BorderThickness = 10,
+                BorderColour = Color4.Yellow,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        AlwaysPresent = true,
+                        Alpha = 0,
+                        RelativeSizeAxes = Axes.Both
+                    }
+                }
+            };
+        }
+    }
 }

From 4b1a2b5bc2d1481120d60700270c7b48436d853c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 May 2020 22:36:49 +0900
Subject: [PATCH 02976/10326] Fix offsets

---
 osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
index dfdc91f7dc..c820b3eb92 100644
--- a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
@@ -61,7 +61,11 @@ namespace osu.Game.Rulesets.Taiko
         {
             RelativeSizeAxes = Axes.None;
 
-            AddInternal(new HitPiece { RelativeSizeAxes = Axes.Both });
+            AddInternal(new HitPiece
+            {
+                RelativeSizeAxes = Axes.Both,
+                Origin = Anchor.TopLeft
+            });
         }
 
         protected override void Update()

From 3487c1fd1b9e1d53df72f60cece30f890c239637 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 13:51:53 +0900
Subject: [PATCH 02977/10326] Add menus to mark as rim and strong

---
 .../TestSceneEditor.cs                        | 17 +++++
 osu.Game.Rulesets.Taiko/Objects/Hit.cs        | 10 ++-
 .../Objects/TaikoHitObject.cs                 |  9 ++-
 .../TaikoHitObjectComposer.cs                 | 70 +++++++++++++++++++
 .../UserInterface/TernaryStateMenuItem.cs     | 12 +---
 5 files changed, 105 insertions(+), 13 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs
new file mode 100644
index 0000000000..089a7ad00b
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    [TestFixture]
+    public class TestSceneEditor : EditorTestScene
+    {
+        public TestSceneEditor()
+            : base(new TaikoRuleset())
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 2aca701515..68cc8d0ead 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -1,13 +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.Bindables;
+
 namespace osu.Game.Rulesets.Taiko.Objects
 {
     public class Hit : TaikoHitObject
     {
+        public readonly Bindable<HitType> TypeBindable = new Bindable<HitType>();
+
         /// <summary>
         /// The <see cref="HitType"/> that actuates this <see cref="Hit"/>.
         /// </summary>
-        public HitType Type { get; set; }
+        public HitType Type
+        {
+            get => TypeBindable.Value;
+            set => TypeBindable.Value = value;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
index 206bfcfdb2..4de762ce30 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading;
+using osu.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -27,11 +28,17 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public const float DEFAULT_STRONG_SIZE = DEFAULT_SIZE * STRONG_SCALE;
 
+        public readonly Bindable<bool> IsStrongBindable = new BindableBool();
+
         /// <summary>
         /// Whether this HitObject is a "strong" type.
         /// Strong hit objects give more points for hitting the hit object with both keys.
         /// </summary>
-        public virtual bool IsStrong { get; set; }
+        public virtual bool IsStrong
+        {
+            get => IsStrongBindable.Value;
+            set => IsStrongBindable.Value = value;
+        }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
index c820b3eb92..beef2b6155 100644
--- a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
@@ -1,12 +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;
 using System.Collections.Generic;
+using System.Linq;
 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.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
@@ -50,10 +54,76 @@ namespace osu.Game.Rulesets.Taiko
         {
         }
 
+        protected override SelectionHandler CreateSelectionHandler() => new TaikoSelectionHandler();
+
         public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) =>
             new TaikoSelectionBlueprint(hitObject);
     }
 
+    public class TaikoSelectionHandler : SelectionHandler
+    {
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
+        {
+            if (selection.All(s => s.HitObject is Hit))
+            {
+                var hits = selection.Select(s => s.HitObject).OfType<Hit>();
+
+                yield return new TernaryStateMenuItem("Rim", action: state =>
+                {
+                    foreach (var h in hits)
+                    {
+                        switch (state)
+                        {
+                            case TernaryState.True:
+                                h.Type = HitType.Rim;
+                                break;
+
+                            case TernaryState.False:
+                                h.Type = HitType.Centre;
+                                break;
+                        }
+                    }
+                })
+                {
+                    State = { Value = getTernaryState(hits, h => h.Type == HitType.Rim) }
+                };
+            }
+
+            if (selection.All(s => s.HitObject is TaikoHitObject))
+            {
+                var hits = selection.Select(s => s.HitObject).OfType<TaikoHitObject>();
+
+                yield return new TernaryStateMenuItem("Strong", action: state =>
+                {
+                    foreach (var h in hits)
+                    {
+                        switch (state)
+                        {
+                            case TernaryState.True:
+                                h.IsStrong = true;
+                                break;
+
+                            case TernaryState.False:
+                                h.IsStrong = false;
+                                break;
+                        }
+                    }
+                })
+                {
+                    State = { Value = getTernaryState(hits, h => h.IsStrong) }
+                };
+            }
+        }
+
+        private TernaryState getTernaryState<T>(IEnumerable<T> selection, Func<T, bool> func)
+        {
+            if (selection.Any(func))
+                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
+
+            return TernaryState.False;
+        }
+    }
+
     public class TaikoSelectionBlueprint : OverlaySelectionBlueprint
     {
         public TaikoSelectionBlueprint(DrawableHitObject hitObject)
diff --git a/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs b/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs
index 2d9e2106d4..acf4065f49 100644
--- a/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs
@@ -11,23 +11,13 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class TernaryStateMenuItem : StatefulMenuItem<TernaryState>
     {
-        /// <summary>
-        /// Creates a new <see cref="TernaryStateMenuItem"/>.
-        /// </summary>
-        /// <param name="text">The text to display.</param>
-        /// <param name="type">The type of action which this <see cref="TernaryStateMenuItem"/> performs.</param>
-        public TernaryStateMenuItem(string text, MenuItemType type = MenuItemType.Standard)
-            : this(text, type, null)
-        {
-        }
-
         /// <summary>
         /// Creates a new <see cref="TernaryStateMenuItem"/>.
         /// </summary>
         /// <param name="text">The text to display.</param>
         /// <param name="type">The type of action which this <see cref="TernaryStateMenuItem"/> performs.</param>
         /// <param name="action">A delegate to be invoked when this <see cref="TernaryStateMenuItem"/> is pressed.</param>
-        public TernaryStateMenuItem(string text, MenuItemType type, Action<TernaryState> action)
+        public TernaryStateMenuItem(string text, MenuItemType type = MenuItemType.Standard, Action<TernaryState> action = null)
             : this(text, getNextState, type, action)
         {
         }

From 4e9631b54631655ee6d92742b14fb3c730d9a463 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 14:43:38 +0900
Subject: [PATCH 02978/10326] Support HitType bindable changes

---
 .../Objects/Drawables/DrawableHit.cs          | 24 ++++++++++++++++++-
 .../Drawables/DrawableTaikoHitObject.cs       | 21 ++++++++++++----
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 81b969eaf3..92ae7e0fd3 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -19,7 +21,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// <summary>
         /// A list of keys which can result in hits for this HitObject.
         /// </summary>
-        public TaikoAction[] HitActions { get; }
+        public TaikoAction[] HitActions { get; private set; }
 
         /// <summary>
         /// The action that caused this <see cref="DrawableHit"/> to be hit.
@@ -34,15 +36,35 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private bool pressHandledThisFrame;
 
+        private Bindable<HitType> type;
+
         public DrawableHit(Hit hit)
             : base(hit)
         {
             FillMode = FillMode.Fit;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            type = HitObject.TypeBindable.GetBoundCopy();
+            type.BindValueChanged(_ =>
+            {
+                updateType();
+                RecreatePieces();
+            });
+
+            updateType();
+        }
+
+        private void updateType()
+        {
             HitActions =
                 HitObject.Type == HitType.Centre
                     ? new[] { TaikoAction.LeftCentre, TaikoAction.RightCentre }
                     : new[] { TaikoAction.LeftRim, TaikoAction.RightRim };
+
+            RecreatePieces();
         }
 
         protected override SkinnableDrawable CreateMainPiece() => HitObject.Type == HitType.Centre
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 3ab09d4cbe..a3dfc9acc0 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -8,6 +8,7 @@ using osuTK;
 using System.Linq;
 using osu.Game.Audio;
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Objects;
@@ -115,10 +116,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         public new TObject HitObject;
 
-        protected readonly Vector2 BaseSize;
-        protected readonly SkinnableDrawable MainPiece;
+        protected Vector2 BaseSize;
+        protected SkinnableDrawable MainPiece;
 
-        private readonly Container<DrawableStrongNestedHit> strongHitContainer;
+        private Container<DrawableStrongNestedHit> strongHitContainer;
 
         protected DrawableTaikoHitObject(TObject hitObject)
             : base(hitObject)
@@ -129,11 +130,21 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Origin = Anchor.Custom;
 
             RelativeSizeAxes = Axes.Both;
+            AddInternal(strongHitContainer = new Container<DrawableStrongNestedHit>());
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RecreatePieces();
+        }
+
+        protected virtual void RecreatePieces()
+        {
             Size = BaseSize = new Vector2(HitObject.IsStrong ? TaikoHitObject.DEFAULT_STRONG_SIZE : TaikoHitObject.DEFAULT_SIZE);
 
+            Content.Clear();
             Content.Add(MainPiece = CreateMainPiece());
-
-            AddInternal(strongHitContainer = new Container<DrawableStrongNestedHit>());
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)

From 50fcd4149f42dae335f9e0eae0507c516a2c058e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 14:54:12 +0900
Subject: [PATCH 02979/10326] Support Strong bindable changes

---
 .../Objects/Drawables/DrawableTaikoHitObject.cs       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index a3dfc9acc0..929cf8a937 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using osu.Game.Audio;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Objects;
@@ -119,7 +120,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected Vector2 BaseSize;
         protected SkinnableDrawable MainPiece;
 
-        private Container<DrawableStrongNestedHit> strongHitContainer;
+        private Bindable<bool> isStrong;
+
+        private readonly Container<DrawableStrongNestedHit> strongHitContainer;
 
         protected DrawableTaikoHitObject(TObject hitObject)
             : base(hitObject)
@@ -130,20 +133,22 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Origin = Anchor.Custom;
 
             RelativeSizeAxes = Axes.Both;
+
             AddInternal(strongHitContainer = new Container<DrawableStrongNestedHit>());
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            RecreatePieces();
+            isStrong = HitObject.IsStrongBindable.GetBoundCopy();
+            isStrong.BindValueChanged(_ => RecreatePieces(), true);
         }
 
         protected virtual void RecreatePieces()
         {
             Size = BaseSize = new Vector2(HitObject.IsStrong ? TaikoHitObject.DEFAULT_STRONG_SIZE : TaikoHitObject.DEFAULT_SIZE);
 
-            Content.Clear();
+            MainPiece?.Expire();
             Content.Add(MainPiece = CreateMainPiece());
         }
 

From 910326623c8e24658565e63d95e77b707c244a4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 15:09:22 +0900
Subject: [PATCH 02980/10326] Place rim hits using right mosue for now

---
 .../TaikoHitObjectComposer.cs                 | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
index beef2b6155..5d7880278a 100644
--- a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
@@ -169,8 +169,10 @@ namespace osu.Game.Rulesets.Taiko
     {
         private readonly HitPiece piece;
 
+        private static Hit hit;
+
         public HitPlacementBlueprint()
-            : base(new Hit())
+            : base(hit = new Hit())
         {
             InternalChild = piece = new HitPiece
             {
@@ -180,13 +182,20 @@ namespace osu.Game.Rulesets.Taiko
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (e.Button == MouseButton.Left)
+            switch (e.Button)
             {
-                EndPlacement(true);
-                return true;
+                case MouseButton.Left:
+                    hit.Type = HitType.Centre;
+                    EndPlacement(true);
+                    return true;
+
+                case MouseButton.Right:
+                    hit.Type = HitType.Rim;
+                    EndPlacement(true);
+                    return true;
             }
 
-            return base.OnMouseDown(e);
+            return false;
         }
 
         public override void UpdatePosition(SnapResult snapResult)

From a2eec5d963dad4cbf4cda878eb7fefc36d3c5d91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 16:58:28 +0900
Subject: [PATCH 02981/10326] Fix strong bindable changes for DrumRolls

---
 .../Objects/Drawables/DrawableDrumRoll.cs       | 17 +++++++++++------
 osu.Game.Rulesets.Taiko/Objects/Swell.cs        |  6 ------
 .../Objects/TaikoHitObject.cs                   |  2 +-
 .../TaikoHitObjectComposer.cs                   |  2 ++
 .../Edit/Compose/Components/SelectionHandler.cs |  8 ++++----
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 5e731e5ad6..2c1c2d2bc1 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -48,12 +48,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             colourIdle = colours.YellowDark;
             colourEngaged = colours.YellowDarker;
 
-            updateColour();
-
-            Content.Add(tickContainer = new Container { RelativeSizeAxes = Axes.Both });
-
-            if (MainPiece.Drawable is IHasAccentColour accentMain)
-                accentMain.AccentColour = colourIdle;
+            Content.Add(tickContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Depth = float.MinValue
+            });
         }
 
         protected override void LoadComplete()
@@ -63,6 +62,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             OnNewResult += onNewResult;
         }
 
+        protected override void RecreatePieces()
+        {
+            base.RecreatePieces();
+            updateColour();
+        }
+
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
         {
             base.AddNestedHitObject(hitObject);
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index 390f8d1f3b..b4c09b884e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.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.Threading;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Judgements;
@@ -25,11 +24,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public int RequiredHits = 10;
 
-        public override bool IsStrong
-        {
-            set => throw new NotSupportedException($"{nameof(Swell)} cannot be a strong hitobject.");
-        }
-
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             base.CreateNestedHitObjects(cancellationToken);
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
index 4de762ce30..2922010001 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// Whether this HitObject is a "strong" type.
         /// Strong hit objects give more points for hitting the hit object with both keys.
         /// </summary>
-        public virtual bool IsStrong
+        public bool IsStrong
         {
             get => IsStrongBindable.Value;
             set => IsStrongBindable.Value = value;
diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
index 5d7880278a..802bb80fa3 100644
--- a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
@@ -107,6 +107,8 @@ namespace osu.Game.Rulesets.Taiko
                                 h.IsStrong = false;
                                 break;
                         }
+
+                        EditorBeatmap?.UpdateHitObject(h);
                     }
                 })
                 {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 7ab6340e07..38893f90a8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private Drawable outline;
 
         [Resolved(CanBeNull = true)]
-        private EditorBeatmap editorBeatmap { get; set; }
+        protected EditorBeatmap EditorBeatmap { get; private set; }
 
         [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }
@@ -117,7 +117,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         internal void HandleSelected(SelectionBlueprint blueprint)
         {
             selectedBlueprints.Add(blueprint);
-            editorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
+            EditorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
 
             UpdateVisibility();
         }
@@ -129,7 +129,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         internal void HandleDeselected(SelectionBlueprint blueprint)
         {
             selectedBlueprints.Remove(blueprint);
-            editorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
+            EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
 
             // We don't want to update visibility if > 0, since we may be deselecting blueprints during drag-selection
             if (selectedBlueprints.Count == 0)
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             changeHandler?.BeginChange();
 
             foreach (var h in selectedBlueprints.ToList())
-                editorBeatmap?.Remove(h.HitObject);
+                EditorBeatmap?.Remove(h.HitObject);
 
             changeHandler?.EndChange();
         }

From 280b0adb1dc532938d12e4fd966fb7be033030d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 May 2020 17:44:47 +0900
Subject: [PATCH 02982/10326] Split out IHasPath from IHasCurve to better
 define hitobjects

---
 .../Beatmaps/CatchBeatmapConverter.cs         |  2 +-
 .../Objects/JuiceStream.cs                    |  2 +-
 .../Legacy/DistanceObjectPatternGenerator.cs  |  2 +-
 .../Beatmaps/OsuBeatmapConverter.cs           |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  2 +-
 .../Beatmaps/TaikoBeatmapConverter.cs         |  2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs   | 10 +----
 .../Formats/LegacyBeatmapDecoderTest.cs       |  2 +-
 .../Beatmaps/Formats/OsuJsonDecoderTest.cs    |  2 +-
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 39 +++++++++++--------
 .../Rulesets/Objects/Legacy/ConvertSlider.cs  |  2 +-
 osu.Game/Rulesets/Objects/Types/IHasPath.cs   | 13 +++++++
 .../{IHasCurve.cs => IHasPathWithRepeats.cs}  | 20 +++++-----
 13 files changed, 57 insertions(+), 43 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Types/IHasPath.cs
 rename osu.Game/Rulesets/Objects/Types/{IHasCurve.cs => IHasPathWithRepeats.cs} (77%)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 90a6e609f0..27a9b63e9a 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
             switch (obj)
             {
-                case IHasCurve curveData:
+                case IHasPathWithRepeats curveData:
                     return new JuiceStream
                     {
                         StartTime = obj.StartTime,
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index d32595c2e1..24090e233a 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Catch.Objects
 {
-    public class JuiceStream : CatchHitObject, IHasCurve
+    public class JuiceStream : CatchHitObject, IHasPathWithRepeats
     {
         /// <summary>
         /// Positional distance that results in a duration of one second, before any speed adjustments.
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index d8d5b67c0e..1bd796511b 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -474,7 +474,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <returns></returns>
         private IList<HitSampleInfo> sampleInfoListAt(double time)
         {
-            if (!(HitObject is IHasCurve curveData))
+            if (!(HitObject is IHasPathWithRepeats curveData))
                 return HitObject.Samples;
 
             double segmentTime = (EndTime - HitObject.StartTime) / spanCount;
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
index 147d74c929..060a3919bd 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
 
             switch (original)
             {
-                case IHasCurve curveData:
+                case IHasPathWithRepeats curveData:
                     return new Slider
                     {
                         StartTime = original.StartTime,
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 6ba0e1c6aa..713d1a61f8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -17,7 +17,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    public class Slider : OsuHitObject, IHasCurve
+    public class Slider : OsuHitObject, IHasPathWithRepeats
     {
         public double EndTime
         {
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index d324441285..1a47be2282 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
                     if (!isForCurrentRuleset && tickSpacing > 0 && osuDuration < 2 * speedAdjustedBeatLength)
                     {
-                        List<IList<HitSampleInfo>> allSamples = obj is IHasCurve curveData ? curveData.NodeSamples : new List<IList<HitSampleInfo>>(new[] { samples });
+                        List<IList<HitSampleInfo>> allSamples = obj is IHasPathWithRepeats curveData ? curveData.NodeSamples : new List<IList<HitSampleInfo>>(new[] { samples });
 
                         int i = 0;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 7b11bce520..5f52160be1 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -3,9 +3,7 @@
 
 using osu.Game.Rulesets.Objects.Types;
 using System;
-using System.Collections.Generic;
 using System.Threading;
-using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
@@ -17,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoHitObject, IHasCurve
+    public class DrumRoll : TaikoHitObject, IHasPath
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
@@ -115,11 +113,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         double IHasDistance.Distance => Duration * Velocity;
 
-        int IHasRepeats.RepeatCount { get => 0; set { } }
-
-        List<IList<HitSampleInfo>> IHasRepeats.NodeSamples => new List<IList<HitSampleInfo>>();
-
-        SliderPath IHasCurve.Path
+        SliderPath IHasPath.Path
             => new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(1) }, ((IHasDistance)this).Distance / TaikoBeatmapConverter.LEGACY_VELOCITY_MULTIPLIER);
 
         #endregion
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index acb30a6277..dab923d75b 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -365,7 +365,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
-                var curveData = hitObjects[0] as IHasCurve;
+                var curveData = hitObjects[0] as IHasPathWithRepeats;
                 var positionData = hitObjects[0] as IHasPosition;
 
                 Assert.IsNotNull(positionData);
diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
index b034e66616..b4c78ce273 100644
--- a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         {
             var beatmap = decodeAsJson(normal);
 
-            var curveData = beatmap.HitObjects[0] as IHasCurve;
+            var curveData = beatmap.HitObjects[0] as IHasPathWithRepeats;
             var positionData = beatmap.HitObjects[0] as IHasPosition;
 
             Assert.IsNotNull(positionData);
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 7727f25967..d7e83fa471 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -233,9 +233,9 @@ namespace osu.Game.Beatmaps.Formats
             writer.Write(FormattableString.Invariant($"{(int)getObjectType(hitObject)},"));
             writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
 
-            if (hitObject is IHasCurve curveData)
+            if (hitObject is IHasPathWithRepeats curveData)
             {
-                addCurveData(writer, curveData, position);
+                addPathData(writer, curveData, position);
                 writer.Write(getSampleBank(hitObject.Samples, zeroBanks: true));
             }
             else
@@ -263,7 +263,7 @@ namespace osu.Game.Beatmaps.Formats
 
             switch (hitObject)
             {
-                case IHasCurve _:
+                case IHasPath _:
                     type |= LegacyHitObjectType.Slider;
                     break;
 
@@ -282,13 +282,13 @@ namespace osu.Game.Beatmaps.Formats
             return type;
         }
 
-        private void addCurveData(TextWriter writer, IHasCurve curveData, Vector2 position)
+        private void addPathData(TextWriter writer, IHasPath pathData, Vector2 position)
         {
             PathType? lastType = null;
 
-            for (int i = 0; i < curveData.Path.ControlPoints.Count; i++)
+            for (int i = 0; i < pathData.Path.ControlPoints.Count; i++)
             {
-                PathControlPoint point = curveData.Path.ControlPoints[i];
+                PathControlPoint point = pathData.Path.ControlPoints[i];
 
                 if (point.Type.Value != null)
                 {
@@ -325,23 +325,28 @@ namespace osu.Game.Beatmaps.Formats
                 if (i != 0)
                 {
                     writer.Write(FormattableString.Invariant($"{position.X + point.Position.Value.X}:{position.Y + point.Position.Value.Y}"));
-                    writer.Write(i != curveData.Path.ControlPoints.Count - 1 ? "|" : ",");
+                    writer.Write(i != pathData.Path.ControlPoints.Count - 1 ? "|" : ",");
                 }
             }
 
-            writer.Write(FormattableString.Invariant($"{curveData.RepeatCount + 1},"));
-            writer.Write(FormattableString.Invariant($"{curveData.Path.Distance},"));
+            var curveData = pathData as IHasPathWithRepeats;
 
-            for (int i = 0; i < curveData.NodeSamples.Count; i++)
-            {
-                writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(curveData.NodeSamples[i])}"));
-                writer.Write(i != curveData.NodeSamples.Count - 1 ? "|" : ",");
-            }
+            writer.Write(FormattableString.Invariant($"{(curveData?.RepeatCount ?? 0) + 1},"));
+            writer.Write(FormattableString.Invariant($"{pathData.Path.Distance},"));
 
-            for (int i = 0; i < curveData.NodeSamples.Count; i++)
+            if (curveData != null)
             {
-                writer.Write(getSampleBank(curveData.NodeSamples[i], true));
-                writer.Write(i != curveData.NodeSamples.Count - 1 ? "|" : ",");
+                for (int i = 0; i < curveData.NodeSamples.Count; i++)
+                {
+                    writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(curveData.NodeSamples[i])}"));
+                    writer.Write(i != curveData.NodeSamples.Count - 1 ? "|" : ",");
+                }
+
+                for (int i = 0; i < curveData.NodeSamples.Count; i++)
+                {
+                    writer.Write(getSampleBank(curveData.NodeSamples[i], true));
+                    writer.Write(i != curveData.NodeSamples.Count - 1 ? "|" : ",");
+                }
             }
         }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 924182b265..73192dc42e 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 : ConvertHitObject, IHasCurve, IHasLegacyLastTickOffset
+    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset
     {
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second.
diff --git a/osu.Game/Rulesets/Objects/Types/IHasPath.cs b/osu.Game/Rulesets/Objects/Types/IHasPath.cs
new file mode 100644
index 0000000000..567c24a4a2
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Types/IHasPath.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.
+
+namespace osu.Game.Rulesets.Objects.Types
+{
+    public interface IHasPath : IHasDistance
+    {
+        /// <summary>
+        /// The curve.
+        /// </summary>
+        SliderPath Path { get; }
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/Types/IHasCurve.cs b/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
similarity index 77%
rename from osu.Game/Rulesets/Objects/Types/IHasCurve.cs
rename to osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
index e98a888bd7..fba0fd7aff 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasCurve.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osuTK;
 
 namespace osu.Game.Rulesets.Objects.Types
@@ -8,15 +9,16 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that has a curve.
     /// </summary>
-    public interface IHasCurve : IHasDistance, IHasRepeats
+    public interface IHasPathWithRepeats : IHasPath, IHasRepeats
     {
-        /// <summary>
-        /// The curve.
-        /// </summary>
-        SliderPath Path { get; }
     }
 
-    public static class HasCurveExtensions
+    [Obsolete("Use IHasPathWithRepeats instead.")] // can be removed 20201126
+    public interface IHasCurve : IHasPathWithRepeats
+    {
+    }
+
+    public static class HasPathWithRepeatsExtensions
     {
         /// <summary>
         /// Computes the position on the curve relative to how much of the <see cref="HitObject"/> has been completed.
@@ -24,7 +26,7 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <param name="obj">The curve.</param>
         /// <param name="progress">[0, 1] where 0 is the start time of the <see cref="HitObject"/> and 1 is the end time of the <see cref="HitObject"/>.</param>
         /// <returns>The position on the curve.</returns>
-        public static Vector2 CurvePositionAt(this IHasCurve obj, double progress)
+        public static Vector2 CurvePositionAt(this IHasPathWithRepeats obj, double progress)
             => obj.Path.PositionAt(obj.ProgressAt(progress));
 
         /// <summary>
@@ -33,7 +35,7 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <param name="obj">The curve.</param>
         /// <param name="progress">[0, 1] where 0 is the start time of the <see cref="HitObject"/> and 1 is the end time of the <see cref="HitObject"/>.</param>
         /// <returns>[0, 1] where 0 is the beginning of the curve and 1 is the end of the curve.</returns>
-        public static double ProgressAt(this IHasCurve obj, double progress)
+        public static double ProgressAt(this IHasPathWithRepeats obj, double progress)
         {
             double p = progress * obj.SpanCount() % 1;
             if (obj.SpanAt(progress) % 2 == 1)
@@ -47,7 +49,7 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <param name="obj">The curve.</param>
         /// <param name="progress">[0, 1] where 0 is the beginning of the curve and 1 is the end of the curve.</param>
         /// <returns>[0, SpanCount) where 0 is the first run.</returns>
-        public static int SpanAt(this IHasCurve obj, double progress)
+        public static int SpanAt(this IHasPathWithRepeats obj, double progress)
             => (int)(progress * obj.SpanCount());
     }
 }

From a953f9e422810198b1d431b52f4b365c912c4e84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 May 2020 20:30:33 +0900
Subject: [PATCH 02983/10326] Add drum roll composition support

---
 .../TaikoHitObjectComposer.cs                 | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
index 802bb80fa3..d233cd5e7f 100644
--- a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
@@ -34,9 +34,10 @@ namespace osu.Game.Rulesets.Taiko
         {
         }
 
-        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new[]
+        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
-            new HitCompositionTool()
+            new HitCompositionTool(),
+            new DrumRollCompositionTool()
         };
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer() => new TaikoBlueprintContainer(drawableRuleset.Playfield.AllHitObjects);
@@ -156,6 +157,26 @@ namespace osu.Game.Rulesets.Taiko
         }
     }
 
+    public class DrumRollCompositionTool : HitObjectCompositionTool
+    {
+        public DrumRollCompositionTool()
+            : base(nameof(DrumRoll))
+        {
+        }
+
+        public override PlacementBlueprint CreatePlacementBlueprint() => new DrumRollPlacementBlueprint();
+    }
+
+    public class DrumRollPlacementBlueprint : PlacementBlueprint
+    {
+        private static DrumRoll drumRoll;
+
+        public DrumRollPlacementBlueprint()
+            : base(drumRoll = new DrumRoll())
+        {
+        }
+    }
+
     public class HitCompositionTool : HitObjectCompositionTool
     {
         public HitCompositionTool()

From 534dccc0c384a0e33a6fbe49c1b3b2acc97d56b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 May 2020 12:37:44 +0900
Subject: [PATCH 02984/10326] Move sett from EndTime to Duration

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs     | 10 +++++-----
 osu.Game.Rulesets.Osu/Objects/Slider.cs            |  8 ++++----
 .../Objects/Drawables/DrawableSwell.cs             |  2 +-
 .../Gameplay/TestSceneDrawableScrollingRuleset.cs  |  6 +++---
 .../Objects/Legacy/Catch/ConvertHitObjectParser.cs |  6 +++---
 .../Objects/Legacy/Catch/ConvertSpinner.cs         |  4 ++--
 .../Objects/Legacy/ConvertHitObjectParser.cs       | 14 +++++++-------
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs  |  6 +++---
 .../Objects/Legacy/Mania/ConvertHitObjectParser.cs |  8 ++++----
 .../Rulesets/Objects/Legacy/Mania/ConvertHold.cs   |  4 ++--
 .../Objects/Legacy/Mania/ConvertSpinner.cs         |  4 ++--
 .../Objects/Legacy/Osu/ConvertHitObjectParser.cs   |  6 +++---
 .../Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs  |  4 ++--
 .../Objects/Legacy/Taiko/ConvertHitObjectParser.cs |  6 +++---
 .../Objects/Legacy/Taiko/ConvertSpinner.cs         |  4 ++--
 osu.Game/Rulesets/Objects/Types/IHasEndTime.cs     |  6 +++---
 .../Timeline/TimelineHitObjectBlueprint.cs         |  2 +-
 17 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 24090e233a..2c96ee2b19 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -115,15 +115,15 @@ namespace osu.Game.Rulesets.Catch.Objects
             }
         }
 
-        public double EndTime
+        public float EndX => X + this.CurvePositionAt(1).X / CatchPlayfield.BASE_WIDTH;
+
+        public double Duration
         {
-            get => StartTime + this.SpanCount() * Path.Distance / Velocity;
+            get => this.SpanCount() * Path.Distance / Velocity;
             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;
-
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
 
         private readonly SliderPath path = new SliderPath();
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 713d1a61f8..705e88040f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -19,14 +19,14 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class Slider : OsuHitObject, IHasPathWithRepeats
     {
-        public double EndTime
+        public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity;
+
+        public double Duration
         {
-            get => StartTime + this.SpanCount() * Path.Distance / Velocity;
+            get => EndTime - StartTime;
             set => throw new System.NotSupportedException($"Adjust via {nameof(RepeatCount)} instead"); // can be implemented if/when needed.
         }
 
-        public double Duration => EndTime - StartTime;
-
         private readonly Cached<Vector2> endPositionCache = new Cached<Vector2>();
 
         public override Vector2 EndPosition => endPositionCache.IsValid ? endPositionCache.Value : endPositionCache.Value = Position + this.CurvePositionAt(1);
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 32f7acadc8..7294587b10 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -237,7 +237,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
                 case ArmedState.Miss:
                 case ArmedState.Hit:
-                    using (BeginAbsoluteSequence(Time.Current, true))
+                    using (BeginDelayedSequence(HitObject.Duration, true))
                     {
                         this.FadeOut(transition_duration, Easing.Out);
                         bodyContainer.ScaleTo(1.4f, transition_duration);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index b25b81c9af..08fd849fa6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -281,7 +281,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 yield return new TestHitObject
                 {
                     StartTime = original.StartTime,
-                    EndTime = (original as IHasEndTime)?.EndTime ?? (original.StartTime + 100)
+                    Duration = (original as IHasEndTime)?.Duration ?? 100
                 };
             }
         }
@@ -292,9 +292,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class TestHitObject : ConvertHitObject, IHasEndTime
         {
-            public double EndTime { get; set; }
+            public double EndTime => StartTime + Duration;
 
-            public double Duration => EndTime - StartTime;
+            public double Duration { get; set; }
         }
 
         private class DrawableTestHitObject : DrawableHitObject<TestHitObject>
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
index 43e8d01297..c10c8dc30f 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
             };
         }
 
-        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             // Convert spinners don't create the new combo themselves, but force the next non-spinner hitobject to create a new combo
             // Their combo offset is still added to that next hitobject's combo index
@@ -65,11 +65,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
 
             return new ConvertSpinner
             {
-                EndTime = endTime
+                Duration = duration
             };
         }
 
-        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return null;
         }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
index 9de311c9d7..4b0270064a 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
@@ -10,9 +10,9 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
     /// </summary>
     internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasXPosition, IHasCombo
     {
-        public double EndTime { get; set; }
+        public double EndTime => StartTime + Duration;
 
-        public double Duration => EndTime - StartTime;
+        public double Duration { get; set; }
 
         public float X => 256; // Required for CatchBeatmapConverter
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 9a60a0a75c..d8d90fddfa 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -189,9 +189,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
             }
             else if (type.HasFlag(LegacyHitObjectType.Spinner))
             {
-                double endTime = Math.Max(startTime, Parsing.ParseDouble(split[5]) + Offset);
+                double duration = Math.Max(0, Parsing.ParseDouble(split[5]) + Offset - startTime);
 
-                result = CreateSpinner(new Vector2(512, 384) / 2, combo, comboOffset, endTime);
+                result = CreateSpinner(new Vector2(512, 384) / 2, combo, comboOffset, duration);
 
                 if (split.Length > 6)
                     readCustomSampleBanks(split[6], bankInfo);
@@ -209,7 +209,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                     readCustomSampleBanks(string.Join(":", ss.Skip(1)), bankInfo);
                 }
 
-                result = CreateHold(pos, combo, comboOffset, endTime + Offset);
+                result = CreateHold(pos, combo, comboOffset, endTime + Offset - startTime);
             }
 
             if (result == null)
@@ -321,9 +321,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <param name="position">The position of the hit object.</param>
         /// <param name="newCombo">Whether the hit object creates a new combo.</param>
         /// <param name="comboOffset">When starting a new combo, the offset of the new combo relative to the current one.</param>
-        /// <param name="endTime">The spinner end time.</param>
+        /// <param name="duration">The spinner duration.</param>
         /// <returns>The hit object.</returns>
-        protected abstract HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double endTime);
+        protected abstract HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration);
 
         /// <summary>
         /// Creates a legacy Hold-type hit object.
@@ -331,8 +331,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <param name="position">The position of the hit object.</param>
         /// <param name="newCombo">Whether the hit object creates a new combo.</param>
         /// <param name="comboOffset">When starting a new combo, the offset of the new combo relative to the current one.</param>
-        /// <param name="endTime">The hold end time.</param>
-        protected abstract HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime);
+        /// <param name="duration">The hold end time.</param>
+        protected abstract HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration);
 
         private List<HitSampleInfo> convertSoundType(LegacyHitSoundType type, SampleBankInfo bankInfo)
         {
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 73192dc42e..cd2f9f88b8 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -26,13 +26,13 @@ namespace osu.Game.Rulesets.Objects.Legacy
         public List<IList<HitSampleInfo>> NodeSamples { get; set; }
         public int RepeatCount { get; set; }
 
-        public double EndTime
+        public double Duration
         {
-            get => StartTime + this.SpanCount() * Distance / Velocity;
+            get => this.SpanCount() * Distance / Velocity;
             set => throw new System.NotSupportedException($"Adjust via {nameof(RepeatCount)} instead"); // can be implemented if/when needed.
         }
 
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
 
         public double Velocity = 1;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
index f94c4aaa75..bc64518f40 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
@@ -37,21 +37,21 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
             };
         }
 
-        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return new ConvertSpinner
             {
                 X = position.X,
-                EndTime = endTime
+                Duration = duration
             };
         }
 
-        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return new ConvertHold
             {
                 X = position.X,
-                EndTime = endTime
+                Duration = duration
             };
         }
     }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
index 1d92d638dd..dcb66163e4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
@@ -9,8 +9,8 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
     {
         public float X { get; set; }
 
-        public double EndTime { get; set; }
+        public double Duration { get; set; }
 
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
index 7dc13e27cd..b731f7c8d8 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
@@ -10,9 +10,9 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
     /// </summary>
     internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasXPosition
     {
-        public double EndTime { get; set; }
+        public double Duration { get; set; }
 
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
 
         public float X { get; set; }
     }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
index b95ec703b6..75ecab0b8f 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
             };
         }
 
-        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             // Convert spinners don't create the new combo themselves, but force the next non-spinner hitobject to create a new combo
             // Their combo offset is still added to that next hitobject's combo index
@@ -66,11 +66,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
             return new ConvertSpinner
             {
                 Position = position,
-                EndTime = endTime
+                Duration = duration
             };
         }
 
-        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return null;
         }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
index 8b21aab411..a231237077 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
@@ -11,9 +11,9 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// </summary>
     internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasPosition, IHasCombo
     {
-        public double EndTime { get; set; }
+        public double Duration { get; set; }
 
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
 
         public Vector2 Position { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
index db65a61c90..13e3e84c6a 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
@@ -33,15 +33,15 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
             };
         }
 
-        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return new ConvertSpinner
             {
-                EndTime = endTime
+                Duration = duration
             };
         }
 
-        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime)
+        protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
             return null;
         }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
index 8e28487f2f..0976106ec4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
     /// </summary>
     internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime
     {
-        public double EndTime { get; set; }
+        public double Duration { get; set; }
 
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
index bc7103c60d..5eb551e15c 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
@@ -13,12 +13,12 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <summary>
         /// The time at which the HitObject ends.
         /// </summary>
-        [JsonIgnore]
-        double EndTime { get; set; }
+        double EndTime { get; }
 
         /// <summary>
         /// The duration of the HitObject.
         /// </summary>
-        double Duration { get; }
+        [JsonIgnore]
+        double Duration { get; set; }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index dd2f7a833e..d6fc17f358 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -296,7 +296,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             if (endTimeHitObject.EndTime == snappedTime)
                                 return;
 
-                            endTimeHitObject.EndTime = snappedTime;
+                            endTimeHitObject.Duration = snappedTime - hitObject.StartTime;
                             break;
                     }
 

From dd7dbfd5488efddef6d56f897876ce6cba4eb32d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 May 2020 12:38:39 +0900
Subject: [PATCH 02985/10326] Rename to IHasDuration

---
 .../Beatmaps/CatchBeatmapConverter.cs         |  2 +-
 .../Objects/BananaShower.cs                   |  2 +-
 .../TestSceneNotes.cs                         |  2 +-
 .../Beatmaps/ManiaBeatmapConverter.cs         |  6 ++---
 .../Legacy/EndTimeObjectPatternGenerator.cs   |  2 +-
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   |  2 +-
 .../Beatmaps/OsuBeatmapConverter.cs           |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs     |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs    |  2 +-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs      |  2 +-
 .../Beatmaps/TaikoBeatmapConverter.cs         |  2 +-
 osu.Game.Rulesets.Taiko/Objects/Swell.cs      |  2 +-
 .../TestSceneDrawableScrollingRuleset.cs      |  4 ++--
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  |  6 ++---
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  2 +-
 osu.Game/Rulesets/Objects/HitObject.cs        |  4 ++--
 .../Objects/Legacy/Catch/ConvertSpinner.cs    |  2 +-
 .../Objects/Legacy/Mania/ConvertHold.cs       |  2 +-
 .../Objects/Legacy/Mania/ConvertSpinner.cs    |  2 +-
 .../Objects/Legacy/Osu/ConvertSpinner.cs      |  2 +-
 .../Objects/Legacy/Taiko/ConvertSpinner.cs    |  2 +-
 .../Rulesets/Objects/Types/IHasDistance.cs    |  2 +-
 .../Rulesets/Objects/Types/IHasDuration.cs    | 24 +++++++++++++++++++
 .../Rulesets/Objects/Types/IHasEndTime.cs     | 20 ++++------------
 .../Rulesets/Objects/Types/IHasRepeats.cs     |  2 +-
 .../Scrolling/ScrollingHitObjectContainer.cs  |  2 +-
 .../Timeline/TimelineHitObjectBlueprint.cs    |  4 ++--
 27 files changed, 60 insertions(+), 48 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Types/IHasDuration.cs

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 27a9b63e9a..0de2060e2d 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0
                     }.Yield();
 
-                case IHasEndTime endTime:
+                case IHasDuration endTime:
                     return new BananaShower
                     {
                         StartTime = obj.StartTime,
diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index 3a0b5ace53..04a995c77e 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Catch.Objects
 {
-    public class BananaShower : CatchHitObject, IHasEndTime
+    public class BananaShower : CatchHitObject, IHasDuration
     {
         public override FruitVisualRepresentation VisualRepresentation => FruitVisualRepresentation.Banana;
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index ea6a1e2e6a..dd5fd93710 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
                 foreach (var obj in content.OfType<DrawableHitObject>())
                 {
-                    if (!(obj.HitObject is IHasEndTime endTime))
+                    if (!(obj.HitObject is IHasDuration endTime))
                         continue;
 
                     foreach (var nested in obj.NestedHitObjects)
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 1c8116754f..32abf5e7f9 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             }
             else
             {
-                float percentSliderOrSpinner = (float)beatmap.HitObjects.Count(h => h is IHasEndTime) / beatmap.HitObjects.Count;
+                float percentSliderOrSpinner = (float)beatmap.HitObjects.Count(h => h is IHasDuration) / beatmap.HitObjects.Count;
                 if (percentSliderOrSpinner < 0.2)
                     TargetColumns = 7;
                 else if (percentSliderOrSpinner < 0.3 || roundedCircleSize >= 5)
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                     break;
                 }
 
-                case IHasEndTime endTimeData:
+                case IHasDuration endTimeData:
                 {
                     conversion = new EndTimeObjectPatternGenerator(Random, original, beatmap, originalBeatmap);
 
@@ -231,7 +231,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                 var pattern = new Pattern();
 
-                if (HitObject is IHasEndTime endTimeData)
+                if (HitObject is IHasDuration endTimeData)
                 {
                     pattern.Add(new HoldNote
                     {
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
index 907bed0d65..d5286a3779 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         public EndTimeObjectPatternGenerator(FastRandom random, HitObject hitObject, ManiaBeatmap beatmap, IBeatmap originalBeatmap)
             : base(random, hitObject, beatmap, new Pattern(), originalBeatmap)
         {
-            endTime = (HitObject as IHasEndTime)?.EndTime ?? 0;
+            endTime = (HitObject as IHasDuration)?.EndTime ?? 0;
         }
 
         public override IEnumerable<Pattern> Generate()
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index e6f722a8a9..a100c9a58e 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mania.Objects
     /// <summary>
     /// Represents a hit object which requires pressing, holding, and releasing a key.
     /// </summary>
-    public class HoldNote : ManiaHitObject, IHasEndTime
+    public class HoldNote : ManiaHitObject, IHasDuration
     {
         public double EndTime
         {
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
index 060a3919bd..fcad356a1c 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / beatmap.ControlPointInfo.DifficultyPointAt(original.StartTime).SpeedMultiplier : 1
                     }.Yield();
 
-                case IHasEndTime endTimeData:
+                case IHasDuration endTimeData:
                     return new Spinner
                     {
                         StartTime = original.StartTime,
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 7b1941b7f9..5d191119b9 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     break;
 
                 // already hit or beyond the hittable end time.
-                if (h.IsHit || (h.HitObject is IHasEndTime hasEnd && time > hasEnd.EndTime))
+                if (h.IsHit || (h.HitObject is IHasDuration hasEnd && time > hasEnd.EndTime))
                     continue;
 
                 switch (h)
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
index 297a0fea79..3cad52faeb 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
 
             // Keep wiggling sliders and spinners for their duration
-            if (!(osuObject is IHasEndTime endTime))
+            if (!(osuObject is IHasDuration endTime))
                 return;
 
             amountWiggles = (int)(endTime.Duration / wiggle_duration);
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 0b8d03d118..418375c090 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    public class Spinner : OsuHitObject, IHasEndTime
+    public class Spinner : OsuHitObject, IHasDuration
     {
         public double EndTime
         {
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 1a47be2282..78550ed270 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                     break;
                 }
 
-                case IHasEndTime endTimeData:
+                case IHasDuration endTimeData:
                 {
                     double hitMultiplier = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty, 3, 5, 7.5) * swell_hit_multiplier;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index b4c09b884e..eeae6e79f8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class Swell : TaikoHitObject, IHasEndTime
+    public class Swell : TaikoHitObject, IHasDuration
     {
         public double EndTime
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 08fd849fa6..bd7e894cf8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -281,7 +281,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 yield return new TestHitObject
                 {
                     StartTime = original.StartTime,
-                    Duration = (original as IHasEndTime)?.Duration ?? 100
+                    Duration = (original as IHasDuration)?.Duration ?? 100
                 };
             }
         }
@@ -290,7 +290,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         #region HitObject
 
-        private class TestHitObject : ConvertHitObject, IHasEndTime
+        private class TestHitObject : ConvertHitObject, IHasDuration
         {
             public double EndTime => StartTime + Duration;
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index d7e83fa471..8c63ce6fcb 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -240,7 +240,7 @@ namespace osu.Game.Beatmaps.Formats
             }
             else
             {
-                if (hitObject is IHasEndTime)
+                if (hitObject is IHasDuration)
                     addEndTimeData(writer, hitObject);
 
                 writer.Write(getSampleBank(hitObject.Samples));
@@ -267,7 +267,7 @@ namespace osu.Game.Beatmaps.Formats
                     type |= LegacyHitObjectType.Slider;
                     break;
 
-                case IHasEndTime _:
+                case IHasDuration _:
                     if (beatmap.BeatmapInfo.RulesetID == 3)
                         type |= LegacyHitObjectType.Hold;
                     else
@@ -352,7 +352,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void addEndTimeData(TextWriter writer, HitObject hitObject)
         {
-            var endTimeData = (IHasEndTime)hitObject;
+            var endTimeData = (IHasDuration)hitObject;
             var type = getObjectType(hitObject);
 
             char suffix = ',';
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 8126311cbd..ac399e37c4 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Beatmaps
                     length = emptyLength;
                     break;
 
-                case IHasEndTime endTime:
+                case IHasDuration endTime:
                     length = endTime.EndTime + excess_length;
                     break;
 
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 6f9053d7cb..e2cc98813a 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -175,10 +175,10 @@ namespace osu.Game.Rulesets.Objects
         /// Returns the end time of this object.
         /// </summary>
         /// <remarks>
-        /// This returns the <see cref="IHasEndTime.EndTime"/> where available, falling back to <see cref="HitObject.StartTime"/> otherwise.
+        /// This returns the <see cref="IHasDuration.EndTime"/> where available, falling back to <see cref="HitObject.StartTime"/> otherwise.
         /// </remarks>
         /// <param name="hitObject">The object.</param>
         /// <returns>The end time of this object.</returns>
-        public static double GetEndTime(this HitObject hitObject) => (hitObject as IHasEndTime)?.EndTime ?? hitObject.StartTime;
+        public static double GetEndTime(this HitObject hitObject) => (hitObject as IHasDuration)?.EndTime ?? hitObject.StartTime;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
index 4b0270064a..014494ec54 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 : ConvertHitObject, IHasEndTime, IHasXPosition, IHasCombo
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration, IHasXPosition, IHasCombo
     {
         public double EndTime => StartTime + Duration;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
index dcb66163e4..2fa4766c1d 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
@@ -5,7 +5,7 @@ using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Mania
 {
-    internal sealed class ConvertHold : ConvertHitObject, IHasXPosition, IHasEndTime
+    internal sealed class ConvertHold : ConvertHitObject, IHasXPosition, IHasDuration
     {
         public float X { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
index b731f7c8d8..c05aaceb9c 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
     /// <summary>
     /// Legacy osu!mania Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasXPosition
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration, IHasXPosition
     {
         public double Duration { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
index a231237077..e9e5ca8c94 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// <summary>
     /// Legacy osu! Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasPosition, IHasCombo
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration, IHasPosition, IHasCombo
     {
         public double Duration { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
index 0976106ec4..1d5ecb1ef3 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
     /// <summary>
     /// Legacy osu!taiko Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration
     {
         public double Duration { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Types/IHasDistance.cs b/osu.Game/Rulesets/Objects/Types/IHasDistance.cs
index e7f552115e..b497ca5da3 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasDistance.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDistance.cs
@@ -6,7 +6,7 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that has a positional length.
     /// </summary>
-    public interface IHasDistance : IHasEndTime
+    public interface IHasDistance : IHasDuration
     {
         /// <summary>
         /// The positional length of the HitObject.
diff --git a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
new file mode 100644
index 0000000000..2433f9597e
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Types/IHasDuration.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 Newtonsoft.Json;
+
+namespace osu.Game.Rulesets.Objects.Types
+{
+    /// <summary>
+    /// A HitObject that ends at a different time than its start time.
+    /// </summary>
+    public interface IHasDuration
+    {
+        /// <summary>
+        /// The time at which the HitObject ends.
+        /// </summary>
+        double EndTime { get; }
+
+        /// <summary>
+        /// The duration of the HitObject.
+        /// </summary>
+        [JsonIgnore]
+        double Duration { get; set; }
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
index 5eb551e15c..7395223c7e 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
@@ -1,24 +1,12 @@
-// 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 Newtonsoft.Json;
+using System;
 
 namespace osu.Game.Rulesets.Objects.Types
 {
-    /// <summary>
-    /// A HitObject that ends at a different time than its start time.
-    /// </summary>
-    public interface IHasEndTime
+    [Obsolete("Use IHasDuration instead.")] // can be removed 20201126
+    public interface IHasEndTime : IHasDuration
     {
-        /// <summary>
-        /// The time at which the HitObject ends.
-        /// </summary>
-        double EndTime { get; }
-
-        /// <summary>
-        /// The duration of the HitObject.
-        /// </summary>
-        [JsonIgnore]
-        double Duration { get; set; }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs b/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
index 256b1f3963..7a3fb16196 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that spans some length.
     /// </summary>
-    public interface IHasRepeats : IHasEndTime
+    public interface IHasRepeats : IHasDuration
     {
         /// <summary>
         /// The amount of times the HitObject repeats.
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index c817d84d5c..0dc3324559 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -270,7 +270,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         // Cant use AddOnce() since the delegate is re-constructed every invocation
         private void computeInitialStateRecursive(DrawableHitObject hitObject) => hitObject.Schedule(() =>
         {
-            if (hitObject.HitObject is IHasEndTime e)
+            if (hitObject.HitObject is IHasDuration e)
             {
                 switch (direction.Value)
                 {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index d6fc17f358..b95b3842b3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             shadowComponents.Add(circle);
 
-            if (hitObject is IHasEndTime)
+            if (hitObject is IHasDuration)
             {
                 DragBar dragBarUnderlay;
                 Container extensionBar;
@@ -290,7 +290,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             repeatHitObject.RepeatCount = proposedCount;
                             break;
 
-                        case IHasEndTime endTimeHitObject:
+                        case IHasDuration endTimeHitObject:
                             var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
 
                             if (endTimeHitObject.EndTime == snappedTime)

From b2fad915898c445cfe8ef13888de52dc08d232d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 May 2020 20:33:12 +0900
Subject: [PATCH 02986/10326] Add swell and drumroll blueprints

---
 .../TaikoHitObjectComposer.cs                 | 155 +++++++++++++++++-
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs  |   6 +-
 2 files changed, 149 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
index d233cd5e7f..2bb037815e 100644
--- a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
@@ -14,7 +14,9 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI;
@@ -37,7 +39,8 @@ namespace osu.Game.Rulesets.Taiko
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
             new HitCompositionTool(),
-            new DrumRollCompositionTool()
+            new DrumRollCompositionTool(),
+            new SwellCompositionTool()
         };
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer() => new TaikoBlueprintContainer(drawableRuleset.Playfield.AllHitObjects);
@@ -157,6 +160,16 @@ namespace osu.Game.Rulesets.Taiko
         }
     }
 
+    public class SwellCompositionTool : HitObjectCompositionTool
+    {
+        public SwellCompositionTool()
+            : base(nameof(Swell))
+        {
+        }
+
+        public override PlacementBlueprint CreatePlacementBlueprint() => new SwellPlacementBlueprint();
+    }
+
     public class DrumRollCompositionTool : HitObjectCompositionTool
     {
         public DrumRollCompositionTool()
@@ -167,16 +180,110 @@ namespace osu.Game.Rulesets.Taiko
         public override PlacementBlueprint CreatePlacementBlueprint() => new DrumRollPlacementBlueprint();
     }
 
-    public class DrumRollPlacementBlueprint : PlacementBlueprint
+    public class SwellPlacementBlueprint : TaikoSpanPlacementBlueprint
     {
-        private static DrumRoll drumRoll;
-
-        public DrumRollPlacementBlueprint()
-            : base(drumRoll = new DrumRoll())
+        public SwellPlacementBlueprint()
+            : base(new Swell())
         {
         }
     }
 
+    public class DrumRollPlacementBlueprint : TaikoSpanPlacementBlueprint
+    {
+        public DrumRollPlacementBlueprint()
+            : base(new DrumRoll())
+        {
+        }
+    }
+
+    public class TaikoSpanPlacementBlueprint : PlacementBlueprint
+    {
+        private readonly HitPiece headPiece;
+        private readonly HitPiece tailPiece;
+
+        private readonly LengthPiece lengthPiece;
+
+        private readonly IHasDuration spanPlacementObject;
+
+        public TaikoSpanPlacementBlueprint(HitObject hitObject)
+            : base(hitObject)
+
+        {
+            spanPlacementObject = hitObject as IHasDuration;
+
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                headPiece = new HitPiece
+                {
+                    Size = new Vector2(TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT)
+                },
+                lengthPiece = new LengthPiece
+                {
+                    Height = TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT
+                },
+                tailPiece = new HitPiece
+                {
+                    Size = new Vector2(TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT)
+                }
+            };
+        }
+
+        private double originalStartTime;
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            if (e.Button != MouseButton.Left)
+                return false;
+
+            BeginPlacement(true);
+            return true;
+        }
+
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            if (e.Button != MouseButton.Left)
+                return;
+
+            base.OnMouseUp(e);
+            EndPlacement(true);
+        }
+
+        public override void UpdatePosition(SnapResult result)
+        {
+            base.UpdatePosition(result);
+
+            if (PlacementActive)
+            {
+                if (result.Time is double endTime)
+                {
+                    if (endTime < originalStartTime)
+                    {
+                        HitObject.StartTime = endTime;
+                        spanPlacementObject.Duration = Math.Abs(endTime - originalStartTime);
+                        headPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
+                        lengthPiece.X = headPiece.X;
+                        lengthPiece.Width = tailPiece.X - headPiece.X;
+                    }
+                    else
+                    {
+                        spanPlacementObject.Duration = Math.Abs(endTime - originalStartTime);
+                        tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
+                        lengthPiece.Width = tailPiece.X - headPiece.X;
+                    }
+                }
+            }
+            else
+            {
+                lengthPiece.Position = headPiece.Position = tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
+
+                if (result.Time is double startTime)
+                    originalStartTime = HitObject.StartTime = startTime;
+            }
+        }
+    }
+
     public class HitCompositionTool : HitObjectCompositionTool
     {
         public HitCompositionTool()
@@ -221,10 +328,40 @@ namespace osu.Game.Rulesets.Taiko
             return false;
         }
 
-        public override void UpdatePosition(SnapResult snapResult)
+        public override void UpdatePosition(SnapResult result)
         {
-            piece.Position = ToLocalSpace(snapResult.ScreenSpacePosition);
-            base.UpdatePosition(snapResult);
+            piece.Position = ToLocalSpace(result.ScreenSpacePosition);
+            base.UpdatePosition(result);
+        }
+    }
+
+    public class LengthPiece : CompositeDrawable
+    {
+        public LengthPiece()
+        {
+            Origin = Anchor.CentreLeft;
+
+            InternalChild = new Container
+            {
+                Masking = true,
+                Colour = Color4.Yellow,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 8,
+                    },
+                    new Box
+                    {
+                        Origin = Anchor.BottomLeft,
+                        Anchor = Anchor.BottomLeft,
+                        RelativeSizeAxes = Axes.X,
+                        Height = 8,
+                    }
+                }
+            };
         }
     }
 
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index bb89ba8311..02d5955ae6 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -87,11 +87,11 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Updates the position of this <see cref="PlacementBlueprint"/> to a new screen-space position.
         /// </summary>
-        /// <param name="snapResult">The snap result information.</param>
-        public virtual void UpdatePosition(SnapResult snapResult)
+        /// <param name="result">The snap result information.</param>
+        public virtual void UpdatePosition(SnapResult result)
         {
             if (!PlacementActive)
-                HitObject.StartTime = snapResult.Time ?? EditorClock?.CurrentTime ?? Time.Current;
+                HitObject.StartTime = result.Time ?? EditorClock?.CurrentTime ?? Time.Current;
         }
 
         /// <summary>

From 597f2848054977d21c2af3a68dff5df82a18c516 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 11:46:08 +0900
Subject: [PATCH 02987/10326] Tidy up and complete xmldoc for HitObjectComposer

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 89 ++++++++++++++++-----
 osu.sln.DotSettings                         |  5 +-
 2 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 38576e02a0..c956439eb2 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -48,8 +48,6 @@ namespace osu.Game.Rulesets.Edit
 
         protected ComposeBlueprintContainer BlueprintContainer { get; private set; }
 
-        public override Playfield Playfield => drawableRulesetWrapper.Playfield;
-
         private DrawableEditRulesetWrapper<TObject> drawableRulesetWrapper;
 
         protected readonly Container LayerBelowRuleset = new Container { RelativeSizeAxes = Axes.Both };
@@ -61,7 +59,6 @@ namespace osu.Game.Rulesets.Edit
         protected HitObjectComposer(Ruleset ruleset)
         {
             Ruleset = ruleset;
-            RelativeSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
@@ -137,6 +134,49 @@ namespace osu.Game.Rulesets.Edit
             EditorBeatmap.SelectedHitObjects.CollectionChanged += selectionChanged;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            inputManager = GetContainingInputManager();
+        }
+
+        public override Playfield Playfield => drawableRulesetWrapper.Playfield;
+
+        public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
+
+        public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(inputManager.CurrentState.Mouse.Position);
+
+        /// <summary>
+        /// Defines all available composition tools, listed on the left side of the editor screen as button controls.
+        /// This should usually define one tool for each <see cref="HitObject"/> type used in the target ruleset.
+        /// </summary>
+        /// <remarks>
+        /// A "select" tool is automatically added as the first tool.
+        /// </remarks>
+        protected abstract IReadOnlyList<HitObjectCompositionTool> CompositionTools { get; }
+
+        /// <summary>
+        /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
+        /// </summary>
+        protected abstract ComposeBlueprintContainer CreateBlueprintContainer();
+
+        /// <summary>
+        /// Construct a drawable ruleset for the provided ruleset.
+        /// </summary>
+        /// <remarks>
+        /// Can be overridden to add editor-specific logical changes to a <see cref="Ruleset"/>'s standard <see cref="DrawableRuleset{TObject}"/>.
+        /// For example, hit animations or judgement logic may be changed to give a better editor user experience.
+        /// </remarks>
+        /// <param name="ruleset">The ruleset used to construct its drawable counterpart.</param>
+        /// <param name="beatmap">The loaded beatmap.</param>
+        /// <param name="mods">The mods to be applied.</param>
+        /// <returns>An editor-relevant <see cref="DrawableRuleset{TObject}"/></returns>.
+        protected virtual DrawableRuleset<TObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+            => (DrawableRuleset<TObject>)ruleset.CreateDrawableRulesetWith(beatmap, mods);
+
+        #region Tool selection logic
+
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (e.Key >= Key.Number1 && e.Key <= Key.Number9)
@@ -153,13 +193,6 @@ namespace osu.Game.Rulesets.Edit
             return base.OnKeyDown(e);
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            inputManager = GetContainingInputManager();
-        }
-
         private void selectionChanged(object sender, NotifyCollectionChangedEventArgs changedArgs)
         {
             if (EditorBeatmap.SelectedHitObjects.Any())
@@ -179,15 +212,9 @@ namespace osu.Game.Rulesets.Edit
                 EditorBeatmap.SelectedHitObjects.Clear();
         }
 
-        public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
+        #endregion
 
-        public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(inputManager.CurrentState.Mouse.Position);
-
-        protected abstract IReadOnlyList<HitObjectCompositionTool> CompositionTools { get; }
-
-        protected abstract ComposeBlueprintContainer CreateBlueprintContainer();
-
-        protected abstract DrawableRuleset<TObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null);
+        #region IPlacementHandler
 
         public void BeginPlacement(HitObject hitObject)
         {
@@ -209,6 +236,17 @@ namespace osu.Game.Rulesets.Edit
 
         public void Delete(HitObject hitObject) => EditorBeatmap.Remove(hitObject);
 
+        #endregion
+
+        #region IPositionSnapProvider
+
+        /// <summary>
+        /// Retrieve the relevant <see cref="Playfield"/> at a specified screen-space position.
+        /// In cases where a ruleset doesn't require custom logic (due to nested playfields, for example)
+        /// this will return the ruleset's main playfield.
+        /// </summary>
+        /// <param name="screenSpacePosition">The screen-space position to query.</param>
+        /// <returns>The most relevant <see cref="Playfield"/>.</returns>
         protected virtual Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpacePosition) => drawableRulesetWrapper.Playfield;
 
         public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
@@ -257,8 +295,14 @@ namespace osu.Game.Rulesets.Edit
 
             return DurationToDistance(referenceTime, snappedEndTime - referenceTime);
         }
+
+        #endregion
     }
 
+    /// <summary>
+    /// A non-generic definition of a HitObject composer class.
+    /// Generally used to access certain methods without requiring a generic type for <see cref="HitObjectComposer{T}" />.
+    /// </summary>
     [Cached(typeof(HitObjectComposer))]
     [Cached(typeof(IPositionSnapProvider))]
     public abstract class HitObjectComposer : CompositeDrawable, IPositionSnapProvider
@@ -268,10 +312,13 @@ namespace osu.Game.Rulesets.Edit
             RelativeSizeAxes = Axes.Both;
         }
 
+        /// <summary>
+        /// The target ruleset's playfield.
+        /// </summary>
         public abstract Playfield Playfield { get; }
 
         /// <summary>
-        /// All the <see cref="DrawableHitObject"/>s.
+        /// All <see cref="DrawableHitObject"/>s in currently loaded beatmap.
         /// </summary>
         public abstract IEnumerable<DrawableHitObject> HitObjects { get; }
 
@@ -280,6 +327,8 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public abstract bool CursorInPlacementArea { get; }
 
+        #region IPositionSnapProvider
+
         public abstract SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
 
         public abstract float GetBeatSnapDistanceAt(double referenceTime);
@@ -291,5 +340,7 @@ namespace osu.Game.Rulesets.Edit
         public abstract double GetSnappedDurationFromDistance(double referenceTime, float distance);
 
         public abstract float GetSnappedDistanceFromDistance(double referenceTime, float distance);
+
+        #endregion
     }
 }
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index e3b64c03b9..b9fc3de734 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -1,4 +1,4 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
@@ -905,14 +905,17 @@ private void load()
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobject/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=playfields/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

From 3e973c176f0ccf506b2b07c94c5bf317a94f0b34 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 11:59:21 +0900
Subject: [PATCH 02988/10326] Remove unnecessary overrides

---
 osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
index 2bb037815e..16111f4abf 100644
--- a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
@@ -9,17 +9,14 @@ 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.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.UI;
-using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 using osuTK.Graphics;
@@ -29,8 +26,6 @@ namespace osu.Game.Rulesets.Taiko
 {
     public class TaikoHitObjectComposer : HitObjectComposer<TaikoHitObject>
     {
-        private DrawableTaikoRuleset drawableRuleset;
-
         public TaikoHitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
@@ -43,12 +38,7 @@ namespace osu.Game.Rulesets.Taiko
             new SwellCompositionTool()
         };
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new TaikoBlueprintContainer(drawableRuleset.Playfield.AllHitObjects);
-
-        protected override DrawableRuleset<TaikoHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
-        {
-            return drawableRuleset = new DrawableTaikoRuleset(ruleset, beatmap, mods);
-        }
+        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new TaikoBlueprintContainer(Playfield.AllHitObjects);
     }
 
     public class TaikoBlueprintContainer : ComposeBlueprintContainer

From 590931b17cfaccafd3bf8f0db168f4082a1dd8be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 12:20:50 +0900
Subject: [PATCH 02989/10326] Pass hitobjects as a parameter to
 CreateBlueprintContainer

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 4 +++-
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs     | 4 +++-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs            | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 10d344242c..7e2469a794 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -88,7 +89,8 @@ namespace osu.Game.Rulesets.Mania.Edit
             return drawableRuleset;
         }
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new ManiaBlueprintContainer(drawableRuleset.Playfield.AllHitObjects);
+        protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
+            => new ManiaBlueprintContainer(hitObjects);
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index de5c1e54d7..37019a7a05 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -46,7 +47,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             EditorBeatmap.PlacementObject.ValueChanged += _ => updateDistanceSnapGrid();
         }
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new OsuBlueprintContainer(HitObjects);
+        protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
+            => new OsuBlueprintContainer(hitObjects);
 
         private DistanceSnapGrid distanceSnapGrid;
         private Container distanceSnapGridContainer;
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index c956439eb2..8b9f531417 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Edit
                                 drawableRulesetWrapper,
                                 // layers above playfield
                                 drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer()
-                                                      .WithChild(BlueprintContainer = CreateBlueprintContainer())
+                                                      .WithChild(BlueprintContainer = CreateBlueprintContainer(HitObjects))
                             }
                         }
                     },
@@ -159,7 +159,9 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
         /// </summary>
-        protected abstract ComposeBlueprintContainer CreateBlueprintContainer();
+        /// <param name="hitObjects">A live collection of all <see cref="DrawableHitObject"/>s in the editor beatmap.</param>
+        protected virtual ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
+            => new ComposeBlueprintContainer(hitObjects);
 
         /// <summary>
         /// Construct a drawable ruleset for the provided ruleset.

From 7b52faa76d086ce98dd455e1475448e09c825870 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 12:45:09 +0900
Subject: [PATCH 02990/10326] Update override

---
 osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
index 16111f4abf..29e0e3a3c0 100644
--- a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
@@ -38,7 +38,8 @@ namespace osu.Game.Rulesets.Taiko
             new SwellCompositionTool()
         };
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new TaikoBlueprintContainer(Playfield.AllHitObjects);
+        protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
+            => new TaikoBlueprintContainer(hitObjects);
     }
 
     public class TaikoBlueprintContainer : ComposeBlueprintContainer

From 7f8f41715d31f74234e019b4de049c9e0acacc64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 13:15:43 +0900
Subject: [PATCH 02991/10326] Remove stray whitespace

---
 osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
index 29e0e3a3c0..b34a8e75cc 100644
--- a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
@@ -286,7 +286,6 @@ namespace osu.Game.Rulesets.Taiko
     }
 
     public class HitPlacementBlueprint : PlacementBlueprint
-
     {
         private readonly HitPiece piece;
 

From 3b6619a3608e7d60c7c22b541478ec62c4442335 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 16:11:26 +0900
Subject: [PATCH 02992/10326] Flip direction to avoid breaking other usages

---
 osu.Game/Rulesets/Objects/Types/IHasDuration.cs | 16 +++++++++++++---
 osu.Game/Rulesets/Objects/Types/IHasEndTime.cs  | 16 +++++++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
index 2433f9597e..185fd5977b 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
@@ -8,17 +8,27 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that ends at a different time than its start time.
     /// </summary>
-    public interface IHasDuration
+#pragma warning disable 618
+    public interface IHasDuration : IHasEndTime
+#pragma warning restore 618
     {
+        double IHasEndTime.EndTime
+        {
+            get => EndTime;
+            set => Duration = (Duration - EndTime) + value;
+        }
+
+        double IHasEndTime.Duration => Duration;
+
         /// <summary>
         /// The time at which the HitObject ends.
         /// </summary>
-        double EndTime { get; }
+        new double EndTime { get; }
 
         /// <summary>
         /// The duration of the HitObject.
         /// </summary>
         [JsonIgnore]
-        double Duration { get; set; }
+        new double Duration { get; set; }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
index 7395223c7e..c3769c5909 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
@@ -2,11 +2,25 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
 
 namespace osu.Game.Rulesets.Objects.Types
 {
+    /// <summary>
+    /// A HitObject that ends at a different time than its start time.
+    /// </summary>
     [Obsolete("Use IHasDuration instead.")] // can be removed 20201126
-    public interface IHasEndTime : IHasDuration
+    public interface IHasEndTime
     {
+        /// <summary>
+        /// The time at which the HitObject ends.
+        /// </summary>
+        [JsonIgnore]
+        double EndTime { get; set; }
+
+        /// <summary>
+        /// The duration of the HitObject.
+        /// </summary>
+        double Duration { get; }
     }
 }

From da289c474e2ceba450437a20572fa7d7d2b902f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 16:40:10 +0900
Subject: [PATCH 02993/10326] Split files out

---
 .../TestSceneTaikoHitObjectComposer.cs        |   1 +
 .../Blueprints/DrumRollPlacementBlueprint.cs  |  12 +
 .../Edit/Blueprints/HitPiece.cs               |  32 ++
 .../Edit/Blueprints/HitPlacementBlueprint.cs  |  49 +++
 .../Edit/Blueprints/LengthPiece.cs            |  37 ++
 .../Blueprints/SwellPlacementBlueprint.cs     |  12 +
 .../Blueprints/TaikoSpanPlacementBlueprint.cs | 101 +++++
 .../Edit/DrumRollCompositionTool.cs           |  17 +
 .../Edit/HitCompositionTool.cs                |  17 +
 .../Edit/SwellCompositionTool.cs              |  17 +
 .../Edit/TaikoBlueprintContainer.cs           |  20 +
 .../Edit/TaikoHitObjectComposer.cs            |  30 ++
 .../Edit/TaikoSelectionBlueprint.cs           |  41 ++
 .../Edit/TaikoSelectionHandler.cs             |  80 ++++
 .../TaikoHitObjectComposer.cs                 | 382 ------------------
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |   1 +
 16 files changed, 467 insertions(+), 382 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/TaikoSelectionBlueprint.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
 delete mode 100644 osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs
index b5ee33fa8e..34d5fdf857 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Taiko.Beatmaps;
+using osu.Game.Rulesets.Taiko.Edit;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Tests.Visual;
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.cs
new file mode 100644
index 0000000000..2f086891a9
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.cs
@@ -0,0 +1,12 @@
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
+{
+    public class DrumRollPlacementBlueprint : TaikoSpanPlacementBlueprint
+    {
+        public DrumRollPlacementBlueprint()
+            : base(new DrumRoll())
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs
new file mode 100644
index 0000000000..992fba1e29
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs
@@ -0,0 +1,32 @@
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
+{
+    public class HitPiece : CompositeDrawable
+    {
+        public HitPiece()
+        {
+            Origin = Anchor.Centre;
+
+            InternalChild = new CircularContainer
+            {
+                Masking = true,
+                BorderThickness = 10,
+                BorderColour = Color4.Yellow,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        AlwaysPresent = true,
+                        Alpha = 0,
+                        RelativeSizeAxes = Axes.Both
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
new file mode 100644
index 0000000000..c21aed32e8
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
@@ -0,0 +1,49 @@
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.UI;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
+{
+    public class HitPlacementBlueprint : PlacementBlueprint
+    {
+        private readonly HitPiece piece;
+
+        private static Hit hit;
+
+        public HitPlacementBlueprint()
+            : base(hit = new Hit())
+        {
+            InternalChild = piece = new HitPiece
+            {
+                Size = new Vector2(TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT)
+            };
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            switch (e.Button)
+            {
+                case MouseButton.Left:
+                    hit.Type = HitType.Centre;
+                    EndPlacement(true);
+                    return true;
+
+                case MouseButton.Right:
+                    hit.Type = HitType.Rim;
+                    EndPlacement(true);
+                    return true;
+            }
+
+            return false;
+        }
+
+        public override void UpdatePosition(SnapResult result)
+        {
+            piece.Position = ToLocalSpace(result.ScreenSpacePosition);
+            base.UpdatePosition(result);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs
new file mode 100644
index 0000000000..2139a852b2
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs
@@ -0,0 +1,37 @@
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
+{
+    public class LengthPiece : CompositeDrawable
+    {
+        public LengthPiece()
+        {
+            Origin = Anchor.CentreLeft;
+
+            InternalChild = new Container
+            {
+                Masking = true,
+                Colour = Color4.Yellow,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 8,
+                    },
+                    new Box
+                    {
+                        Origin = Anchor.BottomLeft,
+                        Anchor = Anchor.BottomLeft,
+                        RelativeSizeAxes = Axes.X,
+                        Height = 8,
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.cs
new file mode 100644
index 0000000000..180bf26f34
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.cs
@@ -0,0 +1,12 @@
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
+{
+    public class SwellPlacementBlueprint : TaikoSpanPlacementBlueprint
+    {
+        public SwellPlacementBlueprint()
+            : base(new Swell())
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
new file mode 100644
index 0000000000..b08cc68225
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
@@ -0,0 +1,101 @@
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.UI;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
+{
+    public class TaikoSpanPlacementBlueprint : PlacementBlueprint
+    {
+        private readonly HitPiece headPiece;
+        private readonly HitPiece tailPiece;
+
+        private readonly LengthPiece lengthPiece;
+
+        private readonly IHasDuration spanPlacementObject;
+
+        public TaikoSpanPlacementBlueprint(HitObject hitObject)
+            : base(hitObject)
+
+        {
+            spanPlacementObject = hitObject as IHasDuration;
+
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                headPiece = new HitPiece
+                {
+                    Size = new Vector2(TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT)
+                },
+                lengthPiece = new LengthPiece
+                {
+                    Height = TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT
+                },
+                tailPiece = new HitPiece
+                {
+                    Size = new Vector2(TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT)
+                }
+            };
+        }
+
+        private double originalStartTime;
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            if (e.Button != MouseButton.Left)
+                return false;
+
+            BeginPlacement(true);
+            return true;
+        }
+
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            if (e.Button != MouseButton.Left)
+                return;
+
+            base.OnMouseUp(e);
+            EndPlacement(true);
+        }
+
+        public override void UpdatePosition(SnapResult result)
+        {
+            base.UpdatePosition(result);
+
+            if (PlacementActive)
+            {
+                if (result.Time is double endTime)
+                {
+                    if (endTime < originalStartTime)
+                    {
+                        HitObject.StartTime = endTime;
+                        spanPlacementObject.Duration = Math.Abs(endTime - originalStartTime);
+                        headPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
+                        lengthPiece.X = headPiece.X;
+                        lengthPiece.Width = tailPiece.X - headPiece.X;
+                    }
+                    else
+                    {
+                        spanPlacementObject.Duration = Math.Abs(endTime - originalStartTime);
+                        tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
+                        lengthPiece.Width = tailPiece.X - headPiece.X;
+                    }
+                }
+            }
+            else
+            {
+                lengthPiece.Position = headPiece.Position = tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
+
+                if (result.Time is double startTime)
+                    originalStartTime = HitObject.StartTime = startTime;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs
new file mode 100644
index 0000000000..c17e22180a
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs
@@ -0,0 +1,17 @@
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Taiko.Edit.Blueprints;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Edit
+{
+    public class DrumRollCompositionTool : HitObjectCompositionTool
+    {
+        public DrumRollCompositionTool()
+            : base(nameof(DrumRoll))
+        {
+        }
+
+        public override PlacementBlueprint CreatePlacementBlueprint() => new DrumRollPlacementBlueprint();
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs
new file mode 100644
index 0000000000..7e8f245613
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs
@@ -0,0 +1,17 @@
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Taiko.Edit.Blueprints;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Edit
+{
+    public class HitCompositionTool : HitObjectCompositionTool
+    {
+        public HitCompositionTool()
+            : base(nameof(Hit))
+        {
+        }
+
+        public override PlacementBlueprint CreatePlacementBlueprint() => new HitPlacementBlueprint();
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs
new file mode 100644
index 0000000000..aa96a397d0
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs
@@ -0,0 +1,17 @@
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Taiko.Edit.Blueprints;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Edit
+{
+    public class SwellCompositionTool : HitObjectCompositionTool
+    {
+        public SwellCompositionTool()
+            : base(nameof(Swell))
+        {
+        }
+
+        public override PlacementBlueprint CreatePlacementBlueprint() => new SwellPlacementBlueprint();
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
new file mode 100644
index 0000000000..b7cda04705
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Screens.Edit.Compose.Components;
+
+namespace osu.Game.Rulesets.Taiko.Edit
+{
+    public class TaikoBlueprintContainer : ComposeBlueprintContainer
+    {
+        public TaikoBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
+            : base(hitObjects)
+        {
+        }
+
+        protected override SelectionHandler CreateSelectionHandler() => new TaikoSelectionHandler();
+
+        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) =>
+            new TaikoSelectionBlueprint(hitObject);
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
new file mode 100644
index 0000000000..7ad40903d2
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Screens.Edit.Compose.Components;
+
+namespace osu.Game.Rulesets.Taiko.Edit
+{
+    public class TaikoHitObjectComposer : HitObjectComposer<TaikoHitObject>
+    {
+        public TaikoHitObjectComposer(Ruleset ruleset)
+            : base(ruleset)
+        {
+        }
+
+        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
+        {
+            new HitCompositionTool(),
+            new DrumRollCompositionTool(),
+            new SwellCompositionTool()
+        };
+
+        protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
+            => new TaikoBlueprintContainer(hitObjects);
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionBlueprint.cs
new file mode 100644
index 0000000000..e3797a5fa6
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionBlueprint.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 osu.Framework.Graphics;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Edit.Blueprints;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.Edit
+{
+    public class TaikoSelectionBlueprint : OverlaySelectionBlueprint
+    {
+        public TaikoSelectionBlueprint(DrawableHitObject hitObject)
+            : base(hitObject)
+        {
+            RelativeSizeAxes = Axes.None;
+
+            AddInternal(new HitPiece
+            {
+                RelativeSizeAxes = Axes.Both,
+                Origin = Anchor.TopLeft
+            });
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // Move the rectangle to cover the hitobjects
+            var topLeft = new Vector2(float.MaxValue, float.MaxValue);
+            var bottomRight = new Vector2(float.MinValue, float.MinValue);
+
+            topLeft = Vector2.ComponentMin(topLeft, Parent.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.TopLeft));
+            bottomRight = Vector2.ComponentMax(bottomRight, Parent.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.BottomRight));
+
+            Size = bottomRight - topLeft;
+            Position = topLeft;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
new file mode 100644
index 0000000000..eebf6980fe
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.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 System.Linq;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Screens.Edit.Compose.Components;
+
+namespace osu.Game.Rulesets.Taiko.Edit
+{
+    public class TaikoSelectionHandler : SelectionHandler
+    {
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
+        {
+            if (selection.All(s => s.HitObject is Hit))
+            {
+                var hits = selection.Select(s => s.HitObject).OfType<Hit>();
+
+                yield return new TernaryStateMenuItem("Rim", action: state =>
+                {
+                    foreach (var h in hits)
+                    {
+                        switch (state)
+                        {
+                            case TernaryState.True:
+                                h.Type = HitType.Rim;
+                                break;
+
+                            case TernaryState.False:
+                                h.Type = HitType.Centre;
+                                break;
+                        }
+                    }
+                })
+                {
+                    State = { Value = getTernaryState(hits, h => h.Type == HitType.Rim) }
+                };
+            }
+
+            if (selection.All(s => s.HitObject is TaikoHitObject))
+            {
+                var hits = selection.Select(s => s.HitObject).OfType<TaikoHitObject>();
+
+                yield return new TernaryStateMenuItem("Strong", action: state =>
+                {
+                    foreach (var h in hits)
+                    {
+                        switch (state)
+                        {
+                            case TernaryState.True:
+                                h.IsStrong = true;
+                                break;
+
+                            case TernaryState.False:
+                                h.IsStrong = false;
+                                break;
+                        }
+
+                        EditorBeatmap?.UpdateHitObject(h);
+                    }
+                })
+                {
+                    State = { Value = getTernaryState(hits, h => h.IsStrong) }
+                };
+            }
+        }
+
+        private TernaryState getTernaryState<T>(IEnumerable<T> selection, Func<T, bool> func)
+        {
+            if (selection.Any(func))
+                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
+
+            return TernaryState.False;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
deleted file mode 100644
index b34a8e75cc..0000000000
--- a/osu.Game.Rulesets.Taiko/TaikoHitObjectComposer.cs
+++ /dev/null
@@ -1,382 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Edit.Tools;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Rulesets.Taiko.UI;
-using osu.Game.Screens.Edit.Compose.Components;
-using osuTK;
-using osuTK.Graphics;
-using osuTK.Input;
-
-namespace osu.Game.Rulesets.Taiko
-{
-    public class TaikoHitObjectComposer : HitObjectComposer<TaikoHitObject>
-    {
-        public TaikoHitObjectComposer(Ruleset ruleset)
-            : base(ruleset)
-        {
-        }
-
-        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
-        {
-            new HitCompositionTool(),
-            new DrumRollCompositionTool(),
-            new SwellCompositionTool()
-        };
-
-        protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
-            => new TaikoBlueprintContainer(hitObjects);
-    }
-
-    public class TaikoBlueprintContainer : ComposeBlueprintContainer
-    {
-        public TaikoBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
-            : base(hitObjects)
-        {
-        }
-
-        protected override SelectionHandler CreateSelectionHandler() => new TaikoSelectionHandler();
-
-        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) =>
-            new TaikoSelectionBlueprint(hitObject);
-    }
-
-    public class TaikoSelectionHandler : SelectionHandler
-    {
-        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
-        {
-            if (selection.All(s => s.HitObject is Hit))
-            {
-                var hits = selection.Select(s => s.HitObject).OfType<Hit>();
-
-                yield return new TernaryStateMenuItem("Rim", action: state =>
-                {
-                    foreach (var h in hits)
-                    {
-                        switch (state)
-                        {
-                            case TernaryState.True:
-                                h.Type = HitType.Rim;
-                                break;
-
-                            case TernaryState.False:
-                                h.Type = HitType.Centre;
-                                break;
-                        }
-                    }
-                })
-                {
-                    State = { Value = getTernaryState(hits, h => h.Type == HitType.Rim) }
-                };
-            }
-
-            if (selection.All(s => s.HitObject is TaikoHitObject))
-            {
-                var hits = selection.Select(s => s.HitObject).OfType<TaikoHitObject>();
-
-                yield return new TernaryStateMenuItem("Strong", action: state =>
-                {
-                    foreach (var h in hits)
-                    {
-                        switch (state)
-                        {
-                            case TernaryState.True:
-                                h.IsStrong = true;
-                                break;
-
-                            case TernaryState.False:
-                                h.IsStrong = false;
-                                break;
-                        }
-
-                        EditorBeatmap?.UpdateHitObject(h);
-                    }
-                })
-                {
-                    State = { Value = getTernaryState(hits, h => h.IsStrong) }
-                };
-            }
-        }
-
-        private TernaryState getTernaryState<T>(IEnumerable<T> selection, Func<T, bool> func)
-        {
-            if (selection.Any(func))
-                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
-
-            return TernaryState.False;
-        }
-    }
-
-    public class TaikoSelectionBlueprint : OverlaySelectionBlueprint
-    {
-        public TaikoSelectionBlueprint(DrawableHitObject hitObject)
-            : base(hitObject)
-        {
-            RelativeSizeAxes = Axes.None;
-
-            AddInternal(new HitPiece
-            {
-                RelativeSizeAxes = Axes.Both,
-                Origin = Anchor.TopLeft
-            });
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            // Move the rectangle to cover the hitobjects
-            var topLeft = new Vector2(float.MaxValue, float.MaxValue);
-            var bottomRight = new Vector2(float.MinValue, float.MinValue);
-
-            topLeft = Vector2.ComponentMin(topLeft, Parent.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.TopLeft));
-            bottomRight = Vector2.ComponentMax(bottomRight, Parent.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.BottomRight));
-
-            Size = bottomRight - topLeft;
-            Position = topLeft;
-        }
-    }
-
-    public class SwellCompositionTool : HitObjectCompositionTool
-    {
-        public SwellCompositionTool()
-            : base(nameof(Swell))
-        {
-        }
-
-        public override PlacementBlueprint CreatePlacementBlueprint() => new SwellPlacementBlueprint();
-    }
-
-    public class DrumRollCompositionTool : HitObjectCompositionTool
-    {
-        public DrumRollCompositionTool()
-            : base(nameof(DrumRoll))
-        {
-        }
-
-        public override PlacementBlueprint CreatePlacementBlueprint() => new DrumRollPlacementBlueprint();
-    }
-
-    public class SwellPlacementBlueprint : TaikoSpanPlacementBlueprint
-    {
-        public SwellPlacementBlueprint()
-            : base(new Swell())
-        {
-        }
-    }
-
-    public class DrumRollPlacementBlueprint : TaikoSpanPlacementBlueprint
-    {
-        public DrumRollPlacementBlueprint()
-            : base(new DrumRoll())
-        {
-        }
-    }
-
-    public class TaikoSpanPlacementBlueprint : PlacementBlueprint
-    {
-        private readonly HitPiece headPiece;
-        private readonly HitPiece tailPiece;
-
-        private readonly LengthPiece lengthPiece;
-
-        private readonly IHasDuration spanPlacementObject;
-
-        public TaikoSpanPlacementBlueprint(HitObject hitObject)
-            : base(hitObject)
-
-        {
-            spanPlacementObject = hitObject as IHasDuration;
-
-            RelativeSizeAxes = Axes.Both;
-
-            InternalChildren = new Drawable[]
-            {
-                headPiece = new HitPiece
-                {
-                    Size = new Vector2(TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT)
-                },
-                lengthPiece = new LengthPiece
-                {
-                    Height = TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT
-                },
-                tailPiece = new HitPiece
-                {
-                    Size = new Vector2(TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT)
-                }
-            };
-        }
-
-        private double originalStartTime;
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            if (e.Button != MouseButton.Left)
-                return false;
-
-            BeginPlacement(true);
-            return true;
-        }
-
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            if (e.Button != MouseButton.Left)
-                return;
-
-            base.OnMouseUp(e);
-            EndPlacement(true);
-        }
-
-        public override void UpdatePosition(SnapResult result)
-        {
-            base.UpdatePosition(result);
-
-            if (PlacementActive)
-            {
-                if (result.Time is double endTime)
-                {
-                    if (endTime < originalStartTime)
-                    {
-                        HitObject.StartTime = endTime;
-                        spanPlacementObject.Duration = Math.Abs(endTime - originalStartTime);
-                        headPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
-                        lengthPiece.X = headPiece.X;
-                        lengthPiece.Width = tailPiece.X - headPiece.X;
-                    }
-                    else
-                    {
-                        spanPlacementObject.Duration = Math.Abs(endTime - originalStartTime);
-                        tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
-                        lengthPiece.Width = tailPiece.X - headPiece.X;
-                    }
-                }
-            }
-            else
-            {
-                lengthPiece.Position = headPiece.Position = tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
-
-                if (result.Time is double startTime)
-                    originalStartTime = HitObject.StartTime = startTime;
-            }
-        }
-    }
-
-    public class HitCompositionTool : HitObjectCompositionTool
-    {
-        public HitCompositionTool()
-            : base(nameof(Hit))
-        {
-        }
-
-        public override PlacementBlueprint CreatePlacementBlueprint() => new HitPlacementBlueprint();
-    }
-
-    public class HitPlacementBlueprint : PlacementBlueprint
-    {
-        private readonly HitPiece piece;
-
-        private static Hit hit;
-
-        public HitPlacementBlueprint()
-            : base(hit = new Hit())
-        {
-            InternalChild = piece = new HitPiece
-            {
-                Size = new Vector2(TaikoHitObject.DEFAULT_SIZE * TaikoPlayfield.DEFAULT_HEIGHT)
-            };
-        }
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            switch (e.Button)
-            {
-                case MouseButton.Left:
-                    hit.Type = HitType.Centre;
-                    EndPlacement(true);
-                    return true;
-
-                case MouseButton.Right:
-                    hit.Type = HitType.Rim;
-                    EndPlacement(true);
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override void UpdatePosition(SnapResult result)
-        {
-            piece.Position = ToLocalSpace(result.ScreenSpacePosition);
-            base.UpdatePosition(result);
-        }
-    }
-
-    public class LengthPiece : CompositeDrawable
-    {
-        public LengthPiece()
-        {
-            Origin = Anchor.CentreLeft;
-
-            InternalChild = new Container
-            {
-                Masking = true,
-                Colour = Color4.Yellow,
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 8,
-                    },
-                    new Box
-                    {
-                        Origin = Anchor.BottomLeft,
-                        Anchor = Anchor.BottomLeft,
-                        RelativeSizeAxes = Axes.X,
-                        Height = 8,
-                    }
-                }
-            };
-        }
-    }
-
-    public class HitPiece : CompositeDrawable
-    {
-        public HitPiece()
-        {
-            Origin = Anchor.Centre;
-
-            InternalChild = new CircularContainer
-            {
-                Masking = true,
-                BorderThickness = 10,
-                BorderColour = Color4.Yellow,
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        AlwaysPresent = true,
-                        Alpha = 0,
-                        RelativeSizeAxes = Axes.Both
-                    }
-                }
-            };
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 7be16471b4..4cdd1fbc24 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Scoring;
 using System;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Taiko.Edit;
 using osu.Game.Rulesets.Taiko.Skinning;
 using osu.Game.Skinning;
 

From e0aae15c0a313549f29a610b0bc697a1fd2c9435 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 16:40:23 +0900
Subject: [PATCH 02994/10326] Hard type incoming ruleset

---
 osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index 7ad40903d2..cdc9672a8e 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
 {
     public class TaikoHitObjectComposer : HitObjectComposer<TaikoHitObject>
     {
-        public TaikoHitObjectComposer(Ruleset ruleset)
+        public TaikoHitObjectComposer(TaikoRuleset ruleset)
             : base(ruleset)
         {
         }

From b068992a15f43237bfb3693e0fca4daa63922fd8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 May 2020 18:58:34 +0900
Subject: [PATCH 02995/10326] Add missing licence headers

---
 .../Edit/Blueprints/DrumRollPlacementBlueprint.cs              | 3 +++
 osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs            | 3 +++
 .../Edit/Blueprints/HitPlacementBlueprint.cs                   | 3 +++
 osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs         | 3 +++
 .../Edit/Blueprints/SwellPlacementBlueprint.cs                 | 3 +++
 .../Edit/Blueprints/TaikoSpanPlacementBlueprint.cs             | 3 +++
 osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs        | 3 +++
 osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs             | 3 +++
 osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs           | 3 +++
 osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs        | 3 +++
 10 files changed, 30 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.cs
index 2f086891a9..eb07ce7635 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.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.
+
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs
index 992fba1e29..b02e3aa9ba 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.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.
+
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
index c21aed32e8..c5191ab241 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.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.
+
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Taiko.Objects;
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs
index 2139a852b2..6b651fd739 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.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.
+
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.cs
index 180bf26f34..95fa82a0f2 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.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.
+
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
index b08cc68225..7f96b5a46e 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.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.
+
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
diff --git a/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs
index c17e22180a..bf77c76670 100644
--- a/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.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.
+
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
diff --git a/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs
index 7e8f245613..e877cf6240 100644
--- a/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.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.
+
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
diff --git a/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs
index aa96a397d0..a6191fcedc 100644
--- a/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.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.
+
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
index b7cda04705..36227b0798 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.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.
+
 using System.Collections.Generic;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Drawables;

From affad4724867f9cda7a5d707a1edca3943e0c0a0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 29 May 2020 19:44:53 +0300
Subject: [PATCH 02996/10326] Fix genre/language search doesn't work

---
 .../Online/API/Requests/SearchBeatmapSetsRequest.cs | 13 ++++++++++---
 .../BeatmapListing/BeatmapListingFilterControl.cs   |  4 +++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 0c3272c7de..ce8b40aa30 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -27,7 +27,14 @@ namespace osu.Game.Online.API.Requests
 
         private string directionString => SortDirection == SortDirection.Descending ? @"desc" : @"asc";
 
-        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, Cursor cursor = null, SearchCategory searchCategory = SearchCategory.Any, SortCriteria sortCriteria = SortCriteria.Ranked, SortDirection sortDirection = SortDirection.Descending)
+        public SearchBeatmapSetsRequest(string query,
+            RulesetInfo ruleset,
+            Cursor cursor = null,
+            SearchCategory searchCategory = SearchCategory.Any,
+            SortCriteria sortCriteria = SortCriteria.Ranked,
+            SortDirection sortDirection = SortDirection.Descending,
+            SearchGenre genre = SearchGenre.Any,
+            SearchLanguage language = SearchLanguage.Any)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
@@ -36,8 +43,8 @@ namespace osu.Game.Online.API.Requests
             SearchCategory = searchCategory;
             SortCriteria = sortCriteria;
             SortDirection = sortDirection;
-            Genre = SearchGenre.Any;
-            Language = SearchLanguage.Any;
+            Genre = genre;
+            Language = language;
         }
 
         protected override WebRequest CreateWebRequest()
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 41c99d5d03..0ead5cc226 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -177,7 +177,9 @@ namespace osu.Game.Overlays.BeatmapListing
                 lastResponse?.Cursor,
                 searchControl.Category.Value,
                 sortControl.Current.Value,
-                sortControl.SortDirection.Value);
+                sortControl.SortDirection.Value,
+                searchControl.Genre.Value,
+                searchControl.Language.Value);
 
             getSetsRequest.Success += response =>
             {

From 9aa54ed89e059349ca257fbb5b27e8ceee5f835e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 29 May 2020 19:53:32 +0300
Subject: [PATCH 02997/10326] Fix serach control background never being updated

---
 .../Overlays/BeatmapListing/BeatmapListingFilterControl.cs     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 0ead5cc226..494a0df8f8 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -188,6 +188,9 @@ namespace osu.Game.Overlays.BeatmapListing
                 if (sets.Count == 0)
                     noMoreResults = true;
 
+                if (CurrentPage == 0)
+                    searchControl.BeatmapSet = sets.FirstOrDefault();
+
                 lastResponse = response;
                 getSetsRequest = null;
 

From 11057cd6a83859744ee3057112eef5a8b3daefca Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 29 May 2020 21:43:31 +0300
Subject: [PATCH 02998/10326] CI fix

---
 osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index ce8b40aa30..dde45b5aeb 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -27,7 +27,8 @@ namespace osu.Game.Online.API.Requests
 
         private string directionString => SortDirection == SortDirection.Descending ? @"desc" : @"asc";
 
-        public SearchBeatmapSetsRequest(string query,
+        public SearchBeatmapSetsRequest(
+            string query,
             RulesetInfo ruleset,
             Cursor cursor = null,
             SearchCategory searchCategory = SearchCategory.Any,

From 816f721f3dffb36ed0d6279237e9137bd791dba6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 30 May 2020 15:24:37 +0900
Subject: [PATCH 02999/10326] Move selection blueprint to correct namespace

---
 .../Edit/{ => Blueprints}/TaikoSelectionBlueprint.cs           | 3 +--
 osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs        | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Rulesets.Taiko/Edit/{ => Blueprints}/TaikoSelectionBlueprint.cs (93%)

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
similarity index 93%
rename from osu.Game.Rulesets.Taiko/Edit/TaikoSelectionBlueprint.cs
rename to osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
index e3797a5fa6..62f69122cc 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
@@ -4,10 +4,9 @@
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Edit.Blueprints;
 using osuTK;
 
-namespace osu.Game.Rulesets.Taiko.Edit
+namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
 {
     public class TaikoSelectionBlueprint : OverlaySelectionBlueprint
     {
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
index 36227b0798..35227b3c64 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Edit.Blueprints;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Taiko.Edit

From 82fe99cf4a54b90a473d43855238f2aa5ae58d65 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 31 May 2020 02:18:07 +0300
Subject: [PATCH 03000/10326] Replace any potential usage of
 Environment.CurrentDirectory with a new RuntimeInfo.StartupDirectory

Using `Environment.CurrentDirectory` for storing / reading files is dangerous as the current directory is mutable and can be changed when performing a certain operation (like opening solutions in roslyn type reference builder for example).
---
 osu.Desktop/Program.cs                           |  4 +---
 .../NonVisual/CustomDataDirectoryTest.cs         | 16 ++++++++--------
 osu.Game.Tests/Resources/TestResources.cs        |  5 +++--
 osu.Game/Rulesets/RulesetStore.cs                |  5 +++--
 osu.Game/Tests/Visual/OsuTestScene.cs            |  3 ++-
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index bd91bcc933..285a813d97 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -33,13 +33,11 @@ namespace osu.Desktop
                     if (args.Length > 0 && args[0].Contains('.')) // easy way to check for a file import in args
                     {
                         var importer = new ArchiveImportIPCChannel(host);
-                        // Restore the cwd so relative paths given at the command line work correctly
-                        Directory.SetCurrentDirectory(cwd);
 
                         foreach (var file in args)
                         {
                             Console.WriteLine(@"Importing {0}", file);
-                            if (!importer.ImportAsync(Path.GetFullPath(file)).Wait(3000))
+                            if (!importer.ImportAsync(Path.GetFullPath(file, cwd)).Wait(3000))
                                 throw new TimeoutException(@"IPC took too long to send");
                         }
 
diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 743c924bbd..1f6e92a535 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Platform;
@@ -35,8 +36,7 @@ namespace osu.Game.Tests.NonVisual
                     var osu = loadOsu(host);
                     var storage = osu.Dependencies.Get<Storage>();
 
-                    string defaultStorageLocation = Path.Combine(Environment.CurrentDirectory, "headless", nameof(TestDefaultDirectory));
-
+                    string defaultStorageLocation = RuntimeInfo.StartupStorage.GetFullPath(Path.Combine("headless", nameof(TestDefaultDirectory)));
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
                 }
                 finally
@@ -46,17 +46,17 @@ namespace osu.Game.Tests.NonVisual
             }
         }
 
-        private string customPath => Path.Combine(Environment.CurrentDirectory, "custom-path");
+        private string customPath { get; } = RuntimeInfo.StartupStorage.GetFullPath("custom-path");
 
         [Test]
         public void TestCustomDirectory()
         {
             using (var host = new HeadlessGameHost(nameof(TestCustomDirectory)))
             {
-                string headlessPrefix = Path.Combine("headless", nameof(TestCustomDirectory));
+                string defaultStorageLocation = RuntimeInfo.StartupStorage.GetFullPath(Path.Combine("headless", nameof(TestCustomDirectory)));
 
                 // need access before the game has constructed its own storage yet.
-                Storage storage = new DesktopStorage(headlessPrefix, host);
+                Storage storage = new DesktopStorage(defaultStorageLocation, host);
                 // manual cleaning so we can prepare a config file.
                 storage.DeleteDirectory(string.Empty);
 
@@ -84,10 +84,10 @@ namespace osu.Game.Tests.NonVisual
         {
             using (var host = new HeadlessGameHost(nameof(TestSubDirectoryLookup)))
             {
-                string headlessPrefix = Path.Combine("headless", nameof(TestSubDirectoryLookup));
+                string defaultStorageLocation = RuntimeInfo.StartupStorage.GetFullPath(Path.Combine("headless", nameof(TestSubDirectoryLookup)));
 
                 // need access before the game has constructed its own storage yet.
-                Storage storage = new DesktopStorage(headlessPrefix, host);
+                Storage storage = new DesktopStorage(defaultStorageLocation, host);
                 // manual cleaning so we can prepare a config file.
                 storage.DeleteDirectory(string.Empty);
 
@@ -136,7 +136,7 @@ namespace osu.Game.Tests.NonVisual
                     // for testing nested files are not ignored (only top level)
                     host.Storage.GetStorageForDirectory("test-nested").GetStorageForDirectory("cache");
 
-                    string defaultStorageLocation = Path.Combine(Environment.CurrentDirectory, "headless", nameof(TestMigration));
+                    string defaultStorageLocation = RuntimeInfo.StartupStorage.GetFullPath(Path.Combine("headless", nameof(TestMigration)));
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
 
diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index 8b892fbb2f..33b580f68f 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -3,6 +3,7 @@
 
 using System.IO;
 using NUnit.Framework;
+using osu.Framework;
 using osu.Framework.IO.Stores;
 
 namespace osu.Game.Tests.Resources
@@ -20,10 +21,10 @@ namespace osu.Game.Tests.Resources
             var temp = Path.GetTempFileName() + ".osz";
 
             using (var stream = GetTestBeatmapStream(virtualTrack))
-            using (var newFile = File.Create(temp))
+            using (var newFile = RuntimeInfo.StartupStorage.GetStream(temp, FileAccess.Write))
                 stream.CopyTo(newFile);
 
-            Assert.IsTrue(File.Exists(temp));
+            Assert.IsTrue(RuntimeInfo.StartupStorage.Exists(temp));
             return temp;
         }
     }
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index b3026bf2b7..5c49141064 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using osu.Framework;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Database;
@@ -153,14 +154,14 @@ namespace osu.Game.Rulesets
         {
             try
             {
-                string[] files = Directory.GetFiles(Environment.CurrentDirectory, $"{ruleset_library_prefix}.*.dll");
+                var files = RuntimeInfo.StartupStorage.GetFiles($"{ruleset_library_prefix}.*.dll");
 
                 foreach (string file in files.Where(f => !Path.GetFileName(f).Contains("Tests")))
                     loadRulesetFromFile(file);
             }
             catch (Exception e)
             {
-                Logger.Error(e, $"Could not load rulesets from directory {Environment.CurrentDirectory}");
+                Logger.Error(e, $"Could not load rulesets from directory {RuntimeInfo.StartupDirectory}");
             }
         }
 
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 5dc8714c07..2672022720 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
@@ -118,7 +119,7 @@ namespace osu.Game.Tests.Visual
                 }
             }
 
-            localStorage = new Lazy<Storage>(() => new NativeStorage($"{GetType().Name}-{Guid.NewGuid()}"));
+            localStorage = new Lazy<Storage>(() => RuntimeInfo.StartupStorage.GetStorageForDirectory($"{GetType().Name}-{Guid.NewGuid()}"));
         }
 
         [Resolved]

From b06017dbf16a868f353226c1bed6261bed79308c Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sun, 31 May 2020 11:28:54 +0800
Subject: [PATCH 03001/10326] supress horizontal scaling of left-and-right
 stages

---
 osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
index 7680526ac4..f177284399 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
@@ -52,10 +52,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
             base.Update();
 
             if (leftSprite?.Height > 0)
-                leftSprite.Scale = new Vector2(DrawHeight / leftSprite.Height);
+                leftSprite.Scale = new Vector2(1, DrawHeight / leftSprite.Height);
 
             if (rightSprite?.Height > 0)
-                rightSprite.Scale = new Vector2(DrawHeight / rightSprite.Height);
+                rightSprite.Scale = new Vector2(1, DrawHeight / rightSprite.Height);
         }
     }
 }

From f2dadeeeb5bbd96c2ff9e62f3b09464eb1c7ffc5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 31 May 2020 13:50:42 +0900
Subject: [PATCH 03002/10326] Allow horizontal scroll on results screen when
 not hovering expanded panel

---
 osu.Game/Screens/Ranking/ScorePanelList.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 18db3f2af4..1142297274 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
@@ -107,6 +108,9 @@ namespace osu.Game.Screens.Ranking
             // Find the panel corresponding to the new score.
             expandedPanel = flow.SingleOrDefault(p => p.Score == score.NewValue);
 
+            // handle horizontal scroll only when not hovering the expanded panel.
+            scroll.HandleScroll = () => expandedPanel?.IsHovered != true;
+
             if (expandedPanel == null)
                 return;
 
@@ -166,6 +170,11 @@ namespace osu.Game.Screens.Ranking
             /// </summary>
             public float? InstantScrollTarget;
 
+            /// <summary>
+            /// Whether this container should handle scroll trigger events.
+            /// </summary>
+            public Func<bool> HandleScroll;
+
             protected override void UpdateAfterChildren()
             {
                 if (InstantScrollTarget != null)
@@ -177,9 +186,9 @@ namespace osu.Game.Screens.Ranking
                 base.UpdateAfterChildren();
             }
 
-            public override bool HandlePositionalInput => false;
+            public override bool HandlePositionalInput => HandleScroll();
 
-            public override bool HandleNonPositionalInput => false;
+            public override bool HandleNonPositionalInput => HandleScroll();
         }
     }
 }

From e43217f5797c4699511078fbe3e3550a85b5a7b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 31 May 2020 20:01:13 +0900
Subject: [PATCH 03003/10326] Add test resources

---
 .../Resources/special-skin/mania-stage-left.png   | Bin 0 -> 165 bytes
 .../Resources/special-skin/mania-stage-right.png  | Bin 0 -> 899 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-stage-left.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-stage-right.png

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-stage-left.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-stage-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..03ca371c4e26972982544c5b8f7b02a85da9a823
GIT binary patch
literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9F3${@^GvDCf{D9B#o
z>Fdh=gqe+pPssgM@hqT_WQl7;iF1B#Zfaf$gL6@8Vo7R>LV0FMhJw4NZ$Nk>pEyvF
zyr+v}h{pNkHS5=>EAW|^m>2+o;RFsh)1E8|D=7xCTxMCBnie0RQU*^~KbLh*2~7Y-
CL?;CR

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-stage-right.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-stage-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..45b7be025591b85e6849824f181672905d129933
GIT binary patch
literal 899
zcmZ`%OK;Oa5FY1IO4N$d6BHyYw?YLq-XwrTEITw!ATg>-6jCWI9B`9OWAG!gH^fMs
zI20jqK%6;5NL)DdA0UCaqe%P;#E~l!?AobQT54-|W@o<nW@lz!)ix@#sf82(%&OIL
zoys}3rl;tB>DM2f3eKxn)?okJ#UJ$W5jWM2romOJPeYQMhd6`KAGifb20Fl9?n0#3
zx#ck?2Jq5=#2B+pB~w?}7RkihJvc=z=jnPg<R<LHSQI%oj8AlmgW~;?s!~~Uu}*NC
z9~h*|S5&PApD$|<spE97y5#|gi)?ZJhg(kpVv5mdlBTvUwH!;-+s+OaeXGa#K=vi7
zTA1j(Z<)3y`HB!AB&str68Hc@o+v_7tMMhr#rzHNx|k6PDW2zLx80HI<vZhWdQyZg
zAw3D9!C)W`u8EGji?aEA9%XVUmrGMb+Iwab-A~)zVn}kpQ^sD)HG0HwY@YGzJ5HY{
zg1{0*UwBXK8<R}7H!h17h?oau#SHpi7%@60gfUMT7St7{lNp(`>0!6zSQfU)As<Bq
z#TU&Z)&qxWu%<|+Ztp6BpKjxh-ZzO*I5s>Pv0_c*2zg-rmt793JK;hyD?z&F8uXqz
z>tP`)qhq#lFT<RN8XitF$VtapNXaOA8imx>r$&yxmMdzx*tmJN_4`a>W_2_g!Taje
r`qIzU@0rIC|JptGdXHOvF!Njj=r1MTeKD0y_QurP8|D4AM=$;YKmXm5

literal 0
HcmV?d00001


From 81b8898272fa1bf325afb85236bb0020be65667c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 31 May 2020 22:30:55 +0900
Subject: [PATCH 03004/10326] Fix incorrect type cast in encoder

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index d7e83fa471..ab1b8aecfd 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -233,9 +233,9 @@ namespace osu.Game.Beatmaps.Formats
             writer.Write(FormattableString.Invariant($"{(int)getObjectType(hitObject)},"));
             writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
 
-            if (hitObject is IHasPathWithRepeats curveData)
+            if (hitObject is IHasPath path)
             {
-                addPathData(writer, curveData, position);
+                addPathData(writer, path, position);
                 writer.Write(getSampleBank(hitObject.Samples, zeroBanks: true));
             }
             else

From 19be111da098a03227d645ee13f75b3b42b74814 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 31 May 2020 22:33:10 +0900
Subject: [PATCH 03005/10326] Move incorrect placed full stop
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/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 c956439eb2..6dd6e6815b 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Rulesets.Edit
         /// <param name="ruleset">The ruleset used to construct its drawable counterpart.</param>
         /// <param name="beatmap">The loaded beatmap.</param>
         /// <param name="mods">The mods to be applied.</param>
-        /// <returns>An editor-relevant <see cref="DrawableRuleset{TObject}"/></returns>.
+        /// <returns>An editor-relevant <see cref="DrawableRuleset{TObject}"/>.</returns>
         protected virtual DrawableRuleset<TObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             => (DrawableRuleset<TObject>)ruleset.CreateDrawableRulesetWith(beatmap, mods);
 

From e688033967bbd5000f0f515d8e63ccafa1ded00d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 31 May 2020 22:39:03 +0900
Subject: [PATCH 03006/10326] Fix incorrect xmldoc

---
 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 d8d90fddfa..9e936c7717 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -331,7 +331,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <param name="position">The position of the hit object.</param>
         /// <param name="newCombo">Whether the hit object creates a new combo.</param>
         /// <param name="comboOffset">When starting a new combo, the offset of the new combo relative to the current one.</param>
-        /// <param name="duration">The hold end time.</param>
+        /// <param name="duration">The hold duration.</param>
         protected abstract HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration);
 
         private List<HitSampleInfo> convertSoundType(LegacyHitSoundType type, SampleBankInfo bankInfo)

From 0027f44bd0d0a099a4bd1ce1b5a053b3c771d1b3 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 31 May 2020 16:27:05 +0200
Subject: [PATCH 03007/10326] Moved stableInfo read to FileBasedIPC

DI is also not needed anymore to access StableInfo, this goes through FileBasedIPC.
Note: directory selector now always navigates to the osu! lazer base path.
---
 osu.Game.Tournament/IPC/FileBasedIPC.cs       | 30 +++++++++++++++----
 osu.Game.Tournament/Screens/SetupScreen.cs    | 12 ++------
 .../Screens/StablePathSelectScreen.cs         | 10 ++-----
 osu.Game.Tournament/TournamentGameBase.cs     | 19 ------------
 4 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 8518b7f8da..4ec9d2012a 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -37,8 +37,7 @@ namespace osu.Game.Tournament.IPC
         private int lastBeatmapId;
         private ScheduledDelegate scheduled;
 
-        [Resolved]
-        private StableInfo stableInfo { get; set; }
+        private StableInfo stableInfo;
 
         public const string STABLE_CONFIG = "tournament/stable.json";
 
@@ -161,9 +160,11 @@ namespace osu.Game.Tournament.IPC
 
         public static bool CheckExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
 
+        public StableInfo GetStableInfo() => stableInfo;
+
         private string findStablePath()
         {
-            if (!string.IsNullOrEmpty(stableInfo.StablePath.Value))
+            if (!string.IsNullOrEmpty(readStableConfig()))
                 return stableInfo.StablePath.Value;
 
             string stableInstallPath = string.Empty;
@@ -184,7 +185,7 @@ namespace osu.Game.Tournament.IPC
 
                     if (stableInstallPath != null)
                     {
-                        saveStableConfig(stableInstallPath);
+                        SaveStableConfig(stableInstallPath);
                         return stableInstallPath;
                     }
                 }
@@ -197,7 +198,7 @@ namespace osu.Game.Tournament.IPC
             }
         }
 
-        private void saveStableConfig(string path)
+        public void SaveStableConfig(string path)
         {
             stableInfo.StablePath.Value = path;
 
@@ -214,6 +215,25 @@ namespace osu.Game.Tournament.IPC
             }
         }
 
+        private string readStableConfig()
+        {
+            if (stableInfo == null)
+                stableInfo = new StableInfo();
+
+            if (tournamentStorage.Exists(FileBasedIPC.STABLE_CONFIG))
+            {
+                using (Stream stream = tournamentStorage.GetStream(FileBasedIPC.STABLE_CONFIG, FileAccess.Read, FileMode.Open))
+                using (var sr = new StreamReader(stream))
+                {
+                    stableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());
+                }
+
+                return stableInfo.StablePath.Value;
+            }
+
+            return null;
+        }
+
         private string findFromEnvVar()
         {
             try
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 9f8f81aa80..da91fbba04 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -15,7 +15,6 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Tournament.IPC;
-using osu.Framework.Platform;
 using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
@@ -43,12 +42,6 @@ namespace osu.Game.Tournament.Screens
 
         private Bindable<Size> windowSize;
 
-        [Resolved]
-        private Storage storage { get; set; }
-
-        [Resolved]
-        private StableInfo stableInfo { get; set; }
-
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig)
         {
@@ -73,6 +66,7 @@ namespace osu.Game.Tournament.Screens
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
+            StableInfo stableInfo = fileBasedIpc?.GetStableInfo();
             fillFlow.Children = new Drawable[]
             {
                 new ActionableInfo
@@ -81,13 +75,13 @@ namespace osu.Game.Tournament.Screens
                     ButtonText = "Change source",
                     Action = () =>
                     {
-                        stableInfo.StablePath.BindValueChanged(_ =>
+                        stableInfo?.StablePath.BindValueChanged(_ =>
                         {
                             Schedule(reload);
                         });
                         sceneManager?.SetScreen(new StablePathSelectScreen());
                     },
-                    Value = fileBasedIpc?.IPCStorage?.GetFullPath(string.Empty) ?? "Not found",
+                    Value = fileBasedIpc?.IPCStorage.GetFullPath(string.Empty) ?? "Not found",
                     Failing = fileBasedIpc?.IPCStorage == null,
                     Description = "The osu!stable installation which is currently being used as a data source. If a source is not found, make sure you have created an empty ipc.txt in your stable cutting-edge installation."
                 },
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index eace3c78d5..2e1f0180a9 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Game.Tournament.Models;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -24,9 +23,6 @@ namespace osu.Game.Tournament.Screens
     {
         private DirectorySelector directorySelector;
 
-        [Resolved]
-        private StableInfo stableInfo { get; set; }
-
         [Resolved]
         private MatchIPCInfo ipc { get; set; }
 
@@ -38,7 +34,7 @@ namespace osu.Game.Tournament.Screens
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuColour colours)
         {
-            var initialPath = new DirectoryInfo(storage.GetFullPath(stableInfo.StablePath.Value ?? string.Empty)).Parent?.FullName;
+            var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
 
             AddRangeInternal(new Drawable[]
             {
@@ -131,7 +127,7 @@ namespace osu.Game.Tournament.Screens
         protected virtual void ChangePath(Storage storage)
         {
             var target = directorySelector.CurrentDirectory.Value.FullName;
-            stableInfo.StablePath.Value = target;
+            var fileBasedIpc = ipc as FileBasedIPC;
             Logger.Log($"Changing Stable CE location to {target}");
 
             if (!FileBasedIPC.CheckExists(target))
@@ -143,7 +139,7 @@ namespace osu.Game.Tournament.Screens
                 return;
             }
 
-            var fileBasedIpc = ipc as FileBasedIPC;
+            fileBasedIpc?.SaveStableConfig(target);
             fileBasedIpc?.LocateStableStorage();
             sceneManager?.SetScreen(typeof(SetupScreen));
         }
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index dcfe646390..85db9e61fb 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -43,7 +43,6 @@ namespace osu.Game.Tournament
 
         private Bindable<Size> windowSize;
         private FileBasedIPC ipc;
-        private StableInfo stableInfo;
 
         private Drawable heightWarning;
 
@@ -72,7 +71,6 @@ namespace osu.Game.Tournament
             }), true);
 
             readBracket();
-            readStableConfig();
 
             ladder.CurrentMatch.Value = ladder.Matches.FirstOrDefault(p => p.Current.Value);
 
@@ -143,23 +141,6 @@ namespace osu.Game.Tournament
             });
         }
 
-        private void readStableConfig()
-        {
-            if (stableInfo == null)
-                stableInfo = new StableInfo();
-
-            if (storage.Exists(FileBasedIPC.STABLE_CONFIG))
-            {
-                using (Stream stream = storage.GetStream(FileBasedIPC.STABLE_CONFIG, FileAccess.Read, FileMode.Open))
-                using (var sr = new StreamReader(stream))
-                {
-                    stableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());
-                }
-            }
-
-            dependencies.Cache(stableInfo);
-        }
-
         private void readBracket()
         {
             if (storage.Exists(bracket_filename))

From ce360a960f2d0d876a7c424baac0cd202edc336c Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 31 May 2020 16:50:13 +0200
Subject: [PATCH 03008/10326] use GameHost's GetStorage instead of local
 storage

This will now get the IPC Path again as the default path if one is present, else it will fall back to osu! lazer's base path.
---
 osu.Game.Tournament/Screens/StablePathSelectScreen.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 2e1f0180a9..50db0afa66 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -31,10 +31,14 @@ namespace osu.Game.Tournament.Screens
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuColour colours)
         {
-            var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
+            var fileBasedIpc = ipc as FileBasedIPC;
+            var initialPath = new DirectoryInfo(host.GetStorage(fileBasedIpc?.GetStableInfo().StablePath.Value).GetFullPath(string.Empty) ?? storage.GetFullPath(string.Empty)).Parent?.FullName;
 
             AddRangeInternal(new Drawable[]
             {

From 33d731644c092f7164687b1ceeed6ec3145bae4b Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 31 May 2020 17:35:53 +0200
Subject: [PATCH 03009/10326] Fix test crashing: NullReferenceException

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

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index da91fbba04..19ac84dea3 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Tournament.Screens
                         });
                         sceneManager?.SetScreen(new StablePathSelectScreen());
                     },
-                    Value = fileBasedIpc?.IPCStorage.GetFullPath(string.Empty) ?? "Not found",
+                    Value = fileBasedIpc?.IPCStorage?.GetFullPath(string.Empty) ?? "Not found",
                     Failing = fileBasedIpc?.IPCStorage == null,
                     Description = "The osu!stable installation which is currently being used as a data source. If a source is not found, make sure you have created an empty ipc.txt in your stable cutting-edge installation."
                 },

From 2c6887e610dec2babe5f1436b2406b31547b7a15 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 31 May 2020 19:49:03 +0300
Subject: [PATCH 03010/10326] Remove unnecessary use of and remove
 StartupStorage

---
 osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs | 10 +++++-----
 osu.Game/Rulesets/RulesetStore.cs                   |  2 +-
 osu.Game/Tests/Visual/OsuTestScene.cs               |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 1f6e92a535..f3d54d876a 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Tests.NonVisual
                     var osu = loadOsu(host);
                     var storage = osu.Dependencies.Get<Storage>();
 
-                    string defaultStorageLocation = RuntimeInfo.StartupStorage.GetFullPath(Path.Combine("headless", nameof(TestDefaultDirectory)));
+                    string defaultStorageLocation = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestDefaultDirectory));
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
                 }
                 finally
@@ -46,14 +46,14 @@ namespace osu.Game.Tests.NonVisual
             }
         }
 
-        private string customPath { get; } = RuntimeInfo.StartupStorage.GetFullPath("custom-path");
+        private string customPath => Path.Combine(RuntimeInfo.StartupDirectory, "custom-path");
 
         [Test]
         public void TestCustomDirectory()
         {
             using (var host = new HeadlessGameHost(nameof(TestCustomDirectory)))
             {
-                string defaultStorageLocation = RuntimeInfo.StartupStorage.GetFullPath(Path.Combine("headless", nameof(TestCustomDirectory)));
+                string defaultStorageLocation = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestCustomDirectory));
 
                 // need access before the game has constructed its own storage yet.
                 Storage storage = new DesktopStorage(defaultStorageLocation, host);
@@ -84,7 +84,7 @@ namespace osu.Game.Tests.NonVisual
         {
             using (var host = new HeadlessGameHost(nameof(TestSubDirectoryLookup)))
             {
-                string defaultStorageLocation = RuntimeInfo.StartupStorage.GetFullPath(Path.Combine("headless", nameof(TestSubDirectoryLookup)));
+                string defaultStorageLocation = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestSubDirectoryLookup));
 
                 // need access before the game has constructed its own storage yet.
                 Storage storage = new DesktopStorage(defaultStorageLocation, host);
@@ -136,7 +136,7 @@ namespace osu.Game.Tests.NonVisual
                     // for testing nested files are not ignored (only top level)
                     host.Storage.GetStorageForDirectory("test-nested").GetStorageForDirectory("cache");
 
-                    string defaultStorageLocation = RuntimeInfo.StartupStorage.GetFullPath(Path.Combine("headless", nameof(TestMigration)));
+                    string defaultStorageLocation = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestMigration));
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
 
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 5c49141064..10b6edca8c 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets
         {
             try
             {
-                var files = RuntimeInfo.StartupStorage.GetFiles($"{ruleset_library_prefix}.*.dll");
+                var files = Directory.GetFiles(Path.Combine(RuntimeInfo.StartupDirectory, $"{ruleset_library_prefix}.*.dll"));
 
                 foreach (string file in files.Where(f => !Path.GetFileName(f).Contains("Tests")))
                     loadRulesetFromFile(file);
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 2672022720..632d668a01 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Tests.Visual
                 }
             }
 
-            localStorage = new Lazy<Storage>(() => RuntimeInfo.StartupStorage.GetStorageForDirectory($"{GetType().Name}-{Guid.NewGuid()}"));
+            localStorage = new Lazy<Storage>(() => new NativeStorage(Path.Combine(RuntimeInfo.StartupDirectory, $"{GetType().Name}-{Guid.NewGuid()}")));
         }
 
         [Resolved]

From 53b58910c3d0faacf969685c45ba5620e90d5917 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Jun 2020 14:27:39 +0900
Subject: [PATCH 03011/10326] Invert interface definition

---
 osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs b/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
index fba0fd7aff..342b0ec1f6 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
@@ -9,12 +9,14 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that has a curve.
     /// </summary>
-    public interface IHasPathWithRepeats : IHasPath, IHasRepeats
+#pragma warning disable 618
+    public interface IHasPathWithRepeats : IHasCurve
+#pragma warning restore 618
     {
     }
 
     [Obsolete("Use IHasPathWithRepeats instead.")] // can be removed 20201126
-    public interface IHasCurve : IHasPathWithRepeats
+    public interface IHasCurve : IHasPath, IHasRepeats
     {
     }
 

From cac6e93575890d31ea6e4276d93b3b4698ea440c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Jun 2020 15:10:22 +0900
Subject: [PATCH 03012/10326] Restore original IHasCurve implementation

---
 .../Rulesets/Objects/Legacy/ConvertSlider.cs  |  5 +-
 osu.Game/Rulesets/Objects/Types/IHasCurve.cs  | 55 +++++++++++++++++++
 .../Objects/Types/IHasPathWithRepeats.cs      | 11 +---
 3 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Types/IHasCurve.cs

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 73192dc42e..c946e43df3 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -9,7 +9,10 @@ using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {
-    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset
+    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset,
+#pragma warning disable 618
+                                            IHasCurve
+#pragma warning restore 618
     {
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second.
diff --git a/osu.Game/Rulesets/Objects/Types/IHasCurve.cs b/osu.Game/Rulesets/Objects/Types/IHasCurve.cs
new file mode 100644
index 0000000000..26f50ffa31
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Types/IHasCurve.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 osuTK;
+
+namespace osu.Game.Rulesets.Objects.Types
+{
+    [Obsolete("Use IHasPathWithRepeats instead.")] // can be removed 20201126
+    public interface IHasCurve : IHasDistance, IHasRepeats
+    {
+        /// <summary>
+        /// The curve.
+        /// </summary>
+        SliderPath Path { get; }
+    }
+
+#pragma warning disable 618
+    [Obsolete("Use IHasPathWithRepeats instead.")] // can be removed 20201126
+    public static class HasCurveExtensions
+    {
+        /// <summary>
+        /// Computes the position on the curve relative to how much of the <see cref="HitObject"/> has been completed.
+        /// </summary>
+        /// <param name="obj">The curve.</param>
+        /// <param name="progress">[0, 1] where 0 is the start time of the <see cref="HitObject"/> and 1 is the end time of the <see cref="HitObject"/>.</param>
+        /// <returns>The position on the curve.</returns>
+        public static Vector2 CurvePositionAt(this IHasCurve obj, double progress)
+            => obj.Path.PositionAt(obj.ProgressAt(progress));
+
+        /// <summary>
+        /// Computes the progress along the curve relative to how much of the <see cref="HitObject"/> has been completed.
+        /// </summary>
+        /// <param name="obj">The curve.</param>
+        /// <param name="progress">[0, 1] where 0 is the start time of the <see cref="HitObject"/> and 1 is the end time of the <see cref="HitObject"/>.</param>
+        /// <returns>[0, 1] where 0 is the beginning of the curve and 1 is the end of the curve.</returns>
+        public static double ProgressAt(this IHasCurve obj, double progress)
+        {
+            double p = progress * obj.SpanCount() % 1;
+            if (obj.SpanAt(progress) % 2 == 1)
+                p = 1 - p;
+            return p;
+        }
+
+        /// <summary>
+        /// Determines which span of the curve the progress point is on.
+        /// </summary>
+        /// <param name="obj">The curve.</param>
+        /// <param name="progress">[0, 1] where 0 is the beginning of the curve and 1 is the end of the curve.</param>
+        /// <returns>[0, SpanCount) where 0 is the first run.</returns>
+        public static int SpanAt(this IHasCurve obj, double progress)
+            => (int)(progress * obj.SpanCount());
+    }
+#pragma warning restore 618
+}
diff --git a/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs b/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
index 342b0ec1f6..279946b44e 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.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 osuTK;
 
 namespace osu.Game.Rulesets.Objects.Types
@@ -9,14 +8,8 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that has a curve.
     /// </summary>
-#pragma warning disable 618
-    public interface IHasPathWithRepeats : IHasCurve
-#pragma warning restore 618
-    {
-    }
-
-    [Obsolete("Use IHasPathWithRepeats instead.")] // can be removed 20201126
-    public interface IHasCurve : IHasPath, IHasRepeats
+    // ReSharper disable once RedundantExtendsListEntry
+    public interface IHasPathWithRepeats : IHasPath, IHasRepeats
     {
     }
 

From 7a9ed78527d1f9c02d7e3509011cc6be5a8ec60b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 1 Jun 2020 11:57:32 +0300
Subject: [PATCH 03013/10326] Remove missed leftover usages

---
 osu.Game.Tests/Resources/TestResources.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index 33b580f68f..1c264f66e0 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -18,14 +18,14 @@ namespace osu.Game.Tests.Resources
 
         public static string GetTestBeatmapForImport(bool virtualTrack = false)
         {
-            var temp = Path.GetTempFileName() + ".osz";
+            var tempPath = Path.Combine(RuntimeInfo.StartupDirectory, Path.GetTempFileName() + ".osz");
 
             using (var stream = GetTestBeatmapStream(virtualTrack))
-            using (var newFile = RuntimeInfo.StartupStorage.GetStream(temp, FileAccess.Write))
+            using (var newFile = File.Create(tempPath))
                 stream.CopyTo(newFile);
 
-            Assert.IsTrue(RuntimeInfo.StartupStorage.Exists(temp));
-            return temp;
+            Assert.IsTrue(File.Exists(tempPath));
+            return tempPath;
         }
     }
 }

From fbd9ad411f85ceb5b8894701b830d5da8b6bac11 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Jun 2020 09:05:46 +0000
Subject: [PATCH 03014/10326] Bump DiffPlex from 1.6.2 to 1.6.3

Bumps [DiffPlex](https://github.com/mmanela/diffplex) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/mmanela/diffplex/releases)
- [Commits](https://github.com/mmanela/diffplex/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3d2a4f3081..305e4e0a92 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Dapper" Version="2.0.35" />
-    <PackageReference Include="DiffPlex" Version="1.6.2" />
+    <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.11" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 8a7f75b515..016f2ba35d 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -75,7 +75,7 @@
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
-    <PackageReference Include="DiffPlex" Version="1.6.2" />
+    <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.11" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />

From e9b09373e784e50a9bd6c718656df9dc2dd371b1 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 1 Jun 2020 17:41:04 +0200
Subject: [PATCH 03015/10326] Fix crashing if selected ruleset doesn't have an
 autoplay mod.

---
 osu.Game/Rulesets/Ruleset.cs              |  2 +-
 osu.Game/Screens/Select/PlaySongSelect.cs | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index bee11accca..8f41e421a3 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets
             return value;
         }
 
-        public ModAutoplay GetAutoplayMod() => GetAllMods().OfType<ModAutoplay>().First();
+        public ModAutoplay GetAutoplayMod() => GetAllMods().OfType<ModAutoplay>().FirstOrDefault();
 
         public virtual ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => null;
 
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 0a4c0e2085..71ab3715e0 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -49,8 +49,11 @@ namespace osu.Game.Screens.Select
 
             if (removeAutoModOnResume)
             {
-                var autoType = Ruleset.Value.CreateInstance().GetAutoplayMod().GetType();
-                ModSelect.DeselectTypes(new[] { autoType }, true);
+                var autoType = Ruleset.Value.CreateInstance().GetAutoplayMod()?.GetType();
+
+                if (autoType != null)
+                    ModSelect.DeselectTypes(new[] { autoType }, true);
+
                 removeAutoModOnResume = false;
             }
         }
@@ -78,14 +81,17 @@ namespace osu.Game.Screens.Select
             if (GetContainingInputManager().CurrentState?.Keyboard.ControlPressed == true)
             {
                 var auto = Ruleset.Value.CreateInstance().GetAutoplayMod();
-                var autoType = auto.GetType();
+                var autoType = auto?.GetType();
 
-                var mods = Mods.Value;
-
-                if (mods.All(m => m.GetType() != autoType))
+                if (autoType != null)
                 {
-                    Mods.Value = mods.Append(auto).ToArray();
-                    removeAutoModOnResume = true;
+                    var mods = Mods.Value;
+
+                    if (mods.All(m => m.GetType() != autoType))
+                    {
+                        Mods.Value = mods.Append(auto).ToArray();
+                        removeAutoModOnResume = true;
+                    }
                 }
             }
 

From fea5c8460a45026fbe667d780d484863437e804c Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 1 Jun 2020 22:50:24 +0200
Subject: [PATCH 03016/10326] Fixed path is empty exception

Also converted method to property get, private set
---
 osu.Game.Tournament/IPC/FileBasedIPC.cs       | 20 +++++++++----------
 osu.Game.Tournament/Screens/SetupScreen.cs    |  2 +-
 .../Screens/StablePathSelectScreen.cs         |  7 ++++++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 4ec9d2012a..44a010e506 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tournament.IPC
         private int lastBeatmapId;
         private ScheduledDelegate scheduled;
 
-        private StableInfo stableInfo;
+        public StableInfo StableInfo { get; private set; }
 
         public const string STABLE_CONFIG = "tournament/stable.json";
 
@@ -160,12 +160,10 @@ namespace osu.Game.Tournament.IPC
 
         public static bool CheckExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
 
-        public StableInfo GetStableInfo() => stableInfo;
-
         private string findStablePath()
         {
             if (!string.IsNullOrEmpty(readStableConfig()))
-                return stableInfo.StablePath.Value;
+                return StableInfo.StablePath.Value;
 
             string stableInstallPath = string.Empty;
 
@@ -186,7 +184,7 @@ namespace osu.Game.Tournament.IPC
                     if (stableInstallPath != null)
                     {
                         SaveStableConfig(stableInstallPath);
-                        return stableInstallPath;
+                        return null;
                     }
                 }
 
@@ -200,12 +198,12 @@ namespace osu.Game.Tournament.IPC
 
         public void SaveStableConfig(string path)
         {
-            stableInfo.StablePath.Value = path;
+            StableInfo.StablePath.Value = path;
 
             using (var stream = tournamentStorage.GetStream(STABLE_CONFIG, FileAccess.Write, FileMode.Create))
             using (var sw = new StreamWriter(stream))
             {
-                sw.Write(JsonConvert.SerializeObject(stableInfo,
+                sw.Write(JsonConvert.SerializeObject(StableInfo,
                     new JsonSerializerSettings
                     {
                         Formatting = Formatting.Indented,
@@ -217,18 +215,18 @@ namespace osu.Game.Tournament.IPC
 
         private string readStableConfig()
         {
-            if (stableInfo == null)
-                stableInfo = new StableInfo();
+            if (StableInfo == null)
+                StableInfo = new StableInfo();
 
             if (tournamentStorage.Exists(FileBasedIPC.STABLE_CONFIG))
             {
                 using (Stream stream = tournamentStorage.GetStream(FileBasedIPC.STABLE_CONFIG, FileAccess.Read, FileMode.Open))
                 using (var sr = new StreamReader(stream))
                 {
-                    stableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());
+                    StableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());
                 }
 
-                return stableInfo.StablePath.Value;
+                return StableInfo.StablePath.Value;
             }
 
             return null;
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 19ac84dea3..db7669184f 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tournament.Screens
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
-            StableInfo stableInfo = fileBasedIpc?.GetStableInfo();
+            StableInfo stableInfo = fileBasedIpc?.StableInfo;
             fillFlow.Children = new Drawable[]
             {
                 new ActionableInfo
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 50db0afa66..fee2696c4c 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -38,7 +38,12 @@ namespace osu.Game.Tournament.Screens
         private void load(Storage storage, OsuColour colours)
         {
             var fileBasedIpc = ipc as FileBasedIPC;
-            var initialPath = new DirectoryInfo(host.GetStorage(fileBasedIpc?.GetStableInfo().StablePath.Value).GetFullPath(string.Empty) ?? storage.GetFullPath(string.Empty)).Parent?.FullName;
+            var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
+
+            if (!string.IsNullOrEmpty(fileBasedIpc?.StableInfo.StablePath.Value))
+            {
+                initialPath = new DirectoryInfo(host.GetStorage(fileBasedIpc.StableInfo.StablePath.Value).GetFullPath(string.Empty)).Parent?.FullName;
+            }
 
             AddRangeInternal(new Drawable[]
             {

From 578c955658fb4846acb022b64d965896c9d0b897 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 2 Jun 2020 03:48:23 +0200
Subject: [PATCH 03017/10326] Add fallback intro screen

---
 .../Visual/Menus/TestSceneIntroFallback.cs    | 15 +++++
 osu.Game/Configuration/IntroSequence.cs       |  1 +
 osu.Game/Screens/Loader.cs                    |  3 +
 osu.Game/Screens/Menu/IntroFallback.cs        | 56 +++++++++++++++++++
 4 files changed, 75 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Menus/TestSceneIntroFallback.cs
 create mode 100644 osu.Game/Screens/Menu/IntroFallback.cs

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroFallback.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroFallback.cs
new file mode 100644
index 0000000000..cb32d6bf32
--- /dev/null
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroFallback.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 NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Game.Screens.Menu;
+
+namespace osu.Game.Tests.Visual.Menus
+{
+    [TestFixture]
+    public class TestSceneIntroFallback : IntroTestScene
+    {
+        protected override IScreen CreateScreen() => new IntroFallback();
+    }
+}
diff --git a/osu.Game/Configuration/IntroSequence.cs b/osu.Game/Configuration/IntroSequence.cs
index 1ee7da8bac..24f8c0f048 100644
--- a/osu.Game/Configuration/IntroSequence.cs
+++ b/osu.Game/Configuration/IntroSequence.cs
@@ -6,6 +6,7 @@ namespace osu.Game.Configuration
     public enum IntroSequence
     {
         Circles,
+        Fallback,
         Triangles,
         Random
     }
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index a5b55a24e5..690868bd36 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -51,6 +51,9 @@ namespace osu.Game.Screens
                 case IntroSequence.Circles:
                     return new IntroCircles();
 
+                case IntroSequence.Fallback:
+                    return new IntroFallback();
+
                 default:
                     return new IntroTriangles();
             }
diff --git a/osu.Game/Screens/Menu/IntroFallback.cs b/osu.Game/Screens/Menu/IntroFallback.cs
new file mode 100644
index 0000000000..bc01e9c502
--- /dev/null
+++ b/osu.Game/Screens/Menu/IntroFallback.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.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Screens;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Screens.Menu
+{
+    public class IntroFallback : IntroScreen
+    {
+        protected override string BeatmapHash => "64E00D7022195959BFA3109D09C2E2276C8F12F486B91FCF6175583E973B48F2";
+        protected override string BeatmapFile => "welcome.osz";
+        private const double delay_step_two = 3000;
+
+        private SampleChannel welcome;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            if (MenuVoice.Value)
+                welcome = audio.Samples.Get(@"welcome");
+        }
+
+        protected override void LogoArriving(OsuLogo logo, bool resuming)
+        {
+            base.LogoArriving(logo, resuming);
+
+            if (!resuming)
+            {
+                welcome?.Play();
+
+                Scheduler.AddDelayed(delegate
+                {
+                    StartTrack();
+
+                    PrepareMenuLoad();
+
+                    Scheduler.AddDelayed(LoadMenu, 0);
+                }, delay_step_two);
+
+                logo.ScaleTo(1);
+                logo.FadeIn();
+                logo.PlayIntro();
+            }
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            this.FadeOut(300);
+            base.OnSuspending(next);
+        }
+    }
+}

From 1ccdfd736429a43f913491a6d562086c97e5133d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Jun 2020 14:03:13 +0900
Subject: [PATCH 03018/10326] Pull playlist beatmap checksum from api

---
 osu.Game/Online/API/APIPlaylistBeatmap.cs     | 23 +++++++++++++++++++
 .../API/Requests/Responses/APIBeatmap.cs      |  2 +-
 osu.Game/Online/Multiplayer/PlaylistItem.cs   |  3 +--
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Online/API/APIPlaylistBeatmap.cs

diff --git a/osu.Game/Online/API/APIPlaylistBeatmap.cs b/osu.Game/Online/API/APIPlaylistBeatmap.cs
new file mode 100644
index 0000000000..4f7786e880
--- /dev/null
+++ b/osu.Game/Online/API/APIPlaylistBeatmap.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 Newtonsoft.Json;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Online.API
+{
+    public class APIPlaylistBeatmap : APIBeatmap
+    {
+        [JsonProperty("checksum")]
+        public string Checksum { get; set; }
+
+        public override BeatmapInfo ToBeatmap(RulesetStore rulesets)
+        {
+            var b = base.ToBeatmap(rulesets);
+            b.MD5Hash = Checksum;
+            return b;
+        }
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index e023a2502f..ae65ac09b2 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"max_combo")]
         private int? maxCombo { get; set; }
 
-        public BeatmapInfo ToBeatmap(RulesetStore rulesets)
+        public virtual BeatmapInfo ToBeatmap(RulesetStore rulesets)
         {
             var set = BeatmapSet?.ToBeatmapSet(rulesets);
 
diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Multiplayer/PlaylistItem.cs
index 9d6e8eb8e3..416091a1aa 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Multiplayer/PlaylistItem.cs
@@ -7,7 +7,6 @@ using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 
@@ -37,7 +36,7 @@ namespace osu.Game.Online.Multiplayer
         public readonly BindableList<Mod> RequiredMods = new BindableList<Mod>();
 
         [JsonProperty("beatmap")]
-        private APIBeatmap apiBeatmap { get; set; }
+        private APIPlaylistBeatmap apiBeatmap { get; set; }
 
         private APIMod[] allowedModsBacking;
 

From 68fbe9f4c144ad8be6be89286053fb08ccd5f50d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Jun 2020 14:03:50 +0900
Subject: [PATCH 03019/10326] Add checksum validation to the ready/start button

---
 .../Multi/Match/Components/ReadyButton.cs     | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index e1f86fcc97..a64f24dd7e 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using System.Linq.Expressions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -52,24 +53,14 @@ namespace osu.Game.Screens.Multi.Match.Components
 
         private void updateSelectedItem(PlaylistItem item)
         {
-            hasBeatmap = false;
-
-            int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
-            if (beatmapId == null)
-                return;
-
-            hasBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId) != null;
+            hasBeatmap = findBeatmap(expr => beatmaps.QueryBeatmap(expr));
         }
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
             if (weakSet.NewValue.TryGetTarget(out var set))
             {
-                int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
-                if (beatmapId == null)
-                    return;
-
-                if (set.Beatmaps.Any(b => b.OnlineBeatmapID == beatmapId))
+                if (findBeatmap(expr => set.Beatmaps.AsQueryable().FirstOrDefault(expr)))
                     Schedule(() => hasBeatmap = true);
             }
         }
@@ -78,15 +69,22 @@ namespace osu.Game.Screens.Multi.Match.Components
         {
             if (weakSet.NewValue.TryGetTarget(out var set))
             {
-                int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
-                if (beatmapId == null)
-                    return;
-
-                if (set.Beatmaps.Any(b => b.OnlineBeatmapID == beatmapId))
+                if (findBeatmap(expr => set.Beatmaps.AsQueryable().FirstOrDefault(expr)))
                     Schedule(() => hasBeatmap = false);
             }
         }
 
+        private bool findBeatmap(Func<Expression<Func<BeatmapInfo, bool>>, BeatmapInfo> expression)
+        {
+            int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
+            string checksum = SelectedItem.Value?.Beatmap.Value?.MD5Hash;
+
+            if (beatmapId == null || checksum == null)
+                return false;
+
+            return expression(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum) != null;
+        }
+
         protected override void Update()
         {
             base.Update();

From b41bb5a6824d8f4467b4178708cce88ace77011c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Jun 2020 14:04:00 +0900
Subject: [PATCH 03020/10326] Update databased MD5 hash on save

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

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index f626b45e42..e5907809f3 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -201,7 +201,9 @@ namespace osu.Game.Beatmaps
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
                     new LegacyBeatmapEncoder(beatmapContent).Encode(sw);
 
-                stream.Seek(0, SeekOrigin.Begin);
+                var attachedInfo = setInfo.Beatmaps.Single(b => b.ID == info.ID);
+                var md5Hash = stream.ComputeMD5Hash();
+                attachedInfo.MD5Hash = md5Hash;
 
                 UpdateFile(setInfo, setInfo.Files.Single(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase)), stream);
             }

From 17e91695e0cf982b76b34db1184aca8be4a7020b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Jun 2020 14:04:51 +0900
Subject: [PATCH 03021/10326] Add checksum validation to the panel download
 buttons

---
 .../Screens/Multi/DrawableRoomPlaylistItem.cs | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index c024304856..414c1f5748 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Screens.Multi
                     X = -18,
                     Children = new Drawable[]
                     {
-                        new PlaylistDownloadButton(item.Beatmap.Value.BeatmapSet)
+                        new PlaylistDownloadButton(item)
                         {
                             Size = new Vector2(50, 30)
                         },
@@ -212,9 +212,15 @@ namespace osu.Game.Screens.Multi
 
         private class PlaylistDownloadButton : BeatmapPanelDownloadButton
         {
-            public PlaylistDownloadButton(BeatmapSetInfo beatmapSet)
-                : base(beatmapSet)
+            private readonly PlaylistItem playlistItem;
+
+            [Resolved]
+            private BeatmapManager beatmapManager { get; set; }
+
+            public PlaylistDownloadButton(PlaylistItem playlistItem)
+                : base(playlistItem.Beatmap.Value.BeatmapSet)
             {
+                this.playlistItem = playlistItem;
                 Alpha = 0;
             }
 
@@ -223,11 +229,26 @@ namespace osu.Game.Screens.Multi
                 base.LoadComplete();
 
                 State.BindValueChanged(stateChanged, true);
+                FinishTransforms(true);
             }
 
             private void stateChanged(ValueChangedEvent<DownloadState> state)
             {
-                this.FadeTo(state.NewValue == DownloadState.LocallyAvailable ? 0 : 1, 500);
+                switch (state.NewValue)
+                {
+                    case DownloadState.LocallyAvailable:
+                        // Perform a local query of the beatmap by beatmap checksum, and reset the state if not matching.
+                        if (beatmapManager.QueryBeatmap(b => b.MD5Hash == playlistItem.Beatmap.Value.MD5Hash) == null)
+                            State.Value = DownloadState.NotDownloaded;
+                        else
+                            this.FadeTo(0, 500);
+
+                        break;
+
+                    default:
+                        this.FadeTo(1, 500);
+                        break;
+                }
             }
         }
 

From 46a209540e65ee40bbbd4020128e4e01fbb91ce8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Jun 2020 14:28:48 +0900
Subject: [PATCH 03022/10326] 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 7ea1f3140b..8dcd2f1c6f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.528.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.601.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 305e4e0a92..a70a263cdc 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.528.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.601.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 016f2ba35d..9652f967f2 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.Framework.iOS" Version="2020.528.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.601.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.528.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.601.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 90f9905ed0f142121d8e295f8df4873eee3682e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Jun 2020 14:29:17 +0900
Subject: [PATCH 03023/10326] Update resourcse

---
 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 8dcd2f1c6f..07be3ab0d2 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.512.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.601.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index a70a263cdc..4d6358575b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.601.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 9652f967f2..6b55fa51ff 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.601.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 3c85561cdce09b7531aac9ea14bd8a681c159d8c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Jun 2020 14:31:43 +0900
Subject: [PATCH 03024/10326] Add tests

---
 .../TestSceneDrawableRoomPlaylist.cs          | 73 +++++++++++++++++++
 osu.Game/Tests/Beatmaps/TestBeatmap.cs        | 21 +++++-
 2 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 5ef4dd6773..55b026eff6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -4,12 +4,18 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Platform;
 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.Overlays;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Multi;
@@ -23,6 +29,18 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         private TestPlaylist playlist;
 
+        private BeatmapManager manager;
+        private RulesetStore rulesets;
+
+        [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));
+
+            manager.Import(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo.BeatmapSet).Wait();
+        }
+
         [Test]
         public void TestNonEditableNonSelectable()
         {
@@ -182,6 +200,28 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
         }
 
+        [Test]
+        public void TestDownloadButtonHiddenInitiallyWhenBeatmapExists()
+        {
+            createPlaylist(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo);
+
+            AddAssert("download button hidden", () => !playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
+        }
+
+        [Test]
+        public void TestDownloadButtonVisibleInitiallyWhenBeatmapDoesNotExist()
+        {
+            var byOnlineId = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo;
+            byOnlineId.BeatmapSet.OnlineBeatmapSetID = 1337; // Some random ID that does not exist locally.
+
+            var byChecksum = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo;
+            byChecksum.MD5Hash = "1337"; // Some random checksum that does not exist locally.
+
+            createPlaylist(byOnlineId, byChecksum);
+
+            AddAssert("download buttons shown", () => playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().All(d => d.IsPresent));
+        }
+
         private void moveToItem(int index, Vector2? offset = null)
             => AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index), offset));
 
@@ -235,6 +275,39 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("wait for items to load", () => playlist.ItemMap.Values.All(i => i.IsLoaded));
         }
 
+        private void createPlaylist(params BeatmapInfo[] beatmaps)
+        {
+            AddStep("create playlist", () =>
+            {
+                Child = playlist = new TestPlaylist(false, false)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(500, 300)
+                };
+
+                int index = 0;
+
+                foreach (var b in beatmaps)
+                {
+                    playlist.Items.Add(new PlaylistItem
+                    {
+                        ID = index++,
+                        Beatmap = { Value = b },
+                        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;
diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index a7c84bf692..9fc20fd0f2 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -1,9 +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.Collections.Generic;
 using System.IO;
 using System.Text;
+using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.IO;
 using osu.Game.Rulesets;
@@ -43,10 +45,25 @@ namespace osu.Game.Tests.Beatmaps
         private static Beatmap createTestBeatmap()
         {
             using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(test_beatmap_data)))
-            using (var reader = new LineBufferedReader(stream))
-                return Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
+            {
+                using (var reader = new LineBufferedReader(stream))
+                {
+                    var b = Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
+
+                    b.BeatmapInfo.MD5Hash = test_beatmap_hash.Value.md5;
+                    b.BeatmapInfo.Hash = test_beatmap_hash.Value.sha2;
+
+                    return b;
+                }
+            }
         }
 
+        private static readonly Lazy<(string md5, string sha2)> test_beatmap_hash = new Lazy<(string md5, string sha2)>(() =>
+        {
+            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(test_beatmap_data)))
+                return (stream.ComputeMD5Hash(), stream.ComputeSHA2Hash());
+        });
+
         private const string test_beatmap_data = @"osu file format v14
 
 [General]

From 800c46f7524277b9aa8e9af5732bcfb06487a863 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Jun 2020 14:39:15 +0900
Subject: [PATCH 03025/10326] Fix test function override

---
 .../NonVisual/Skinning/LegacySkinTextureFallbackTest.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinTextureFallbackTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinTextureFallbackTest.cs
index 867af9c1b8..69e66942ab 100644
--- a/osu.Game.Tests/NonVisual/Skinning/LegacySkinTextureFallbackTest.cs
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinTextureFallbackTest.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Skinning;
 
@@ -103,7 +104,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
                 Textures = fileNames.ToDictionary(fileName => fileName, fileName => new Texture(1, 1));
             }
 
-            public override Texture Get(string name) => Textures.GetValueOrDefault(name);
+            public override Texture Get(string name, WrapMode wrapModeS, WrapMode wrapModeT) => Textures.GetValueOrDefault(name);
         }
     }
 }

From 6c8c95677f65d707cc9ac657138f1274a393b1b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Jun 2020 14:54:55 +0900
Subject: [PATCH 03026/10326] Fix incorrect usage of Directory.GetFiles

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

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 10b6edca8c..58a2ba056e 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets
         {
             try
             {
-                var files = Directory.GetFiles(Path.Combine(RuntimeInfo.StartupDirectory, $"{ruleset_library_prefix}.*.dll"));
+                var files = Directory.GetFiles(RuntimeInfo.StartupDirectory, $"{ruleset_library_prefix}.*.dll");
 
                 foreach (string file in files.Where(f => !Path.GetFileName(f).Contains("Tests")))
                     loadRulesetFromFile(file);

From 70c84811ed00a37b438cea3941000bba12ed418d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Jun 2020 15:49:51 +0900
Subject: [PATCH 03027/10326] Revert incorrect change

---
 osu.Game.Tests/Resources/TestResources.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index 1c264f66e0..e882229570 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -3,7 +3,6 @@
 
 using System.IO;
 using NUnit.Framework;
-using osu.Framework;
 using osu.Framework.IO.Stores;
 
 namespace osu.Game.Tests.Resources
@@ -18,7 +17,7 @@ namespace osu.Game.Tests.Resources
 
         public static string GetTestBeatmapForImport(bool virtualTrack = false)
         {
-            var tempPath = Path.Combine(RuntimeInfo.StartupDirectory, Path.GetTempFileName() + ".osz");
+            var tempPath = Path.GetTempFileName() + ".osz";
 
             using (var stream = GetTestBeatmapStream(virtualTrack))
             using (var newFile = File.Create(tempPath))

From fac96f6dddf9dba724fa0b298444694310c508af Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Jun 2020 17:02:01 +0900
Subject: [PATCH 03028/10326] Fix match beatmap not updating after re-download

---
 .../Multiplayer/TestSceneMatchSubScreen.cs    | 57 +++++++++++++++++--
 .../Match/Components/MatchSettingsOverlay.cs  |  2 +-
 .../Screens/Multi/Match/MatchSubScreen.cs     | 13 +----
 3 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index d678d5a814..6154e646f8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -5,7 +5,9 @@ using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Bindables;
+using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
@@ -29,14 +31,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached(typeof(IRoomManager))]
         private readonly TestRoomManager roomManager = new TestRoomManager();
 
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
+        private BeatmapManager manager;
+        private RulesetStore rulesets;
 
         private TestMatchSubScreen match;
 
+        [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));
+
+            manager.Import(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo.BeatmapSet).Wait();
+        }
+
         [SetUp]
         public void Setup() => Schedule(() =>
         {
@@ -75,10 +83,49 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("first playlist item selected", () => match.SelectedItem.Value == Room.Playlist[0]);
         }
 
+        [Test]
+        public void TestBeatmapUpdatedOnReImport()
+        {
+            BeatmapSetInfo importedSet = null;
+
+            AddStep("import altered beatmap", () =>
+            {
+                var beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo);
+                beatmap.BeatmapInfo.BaseDifficulty.CircleSize = 1;
+
+                importedSet = manager.Import(beatmap.BeatmapInfo.BeatmapSet).Result;
+            });
+
+            AddStep("load room", () =>
+            {
+                Room.Name.Value = "my awesome room";
+                Room.Host.Value = new User { Id = 2, Username = "peppy" };
+                Room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = importedSet.Beatmaps[0] },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
+                });
+            });
+
+            AddStep("create room", () =>
+            {
+                InputManager.MoveMouseTo(match.ChildrenOfType<MatchSettingsOverlay.CreateRoomButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("match has altered beatmap", () => match.Beatmap.Value.Beatmap.BeatmapInfo.BaseDifficulty.CircleSize == 1);
+
+            AddStep("re-import original beatmap", () => manager.Import(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo.BeatmapSet).Wait());
+
+            AddAssert("match has original beatmap", () => match.Beatmap.Value.Beatmap.BeatmapInfo.BaseDifficulty.CircleSize != 1);
+        }
+
         private class TestMatchSubScreen : MatchSubScreen
         {
             public new Bindable<PlaylistItem> SelectedItem => base.SelectedItem;
 
+            public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap;
+
             public TestMatchSubScreen(Room room)
                 : base(room)
             {
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 54c4f8f7c7..49a0fc434b 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -433,7 +433,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             }
         }
 
-        private class CreateRoomButton : TriangleButton
+        public class CreateRoomButton : TriangleButton
         {
             public CreateRoomButton()
             {
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index e1d72d9600..bbfbaf81af 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -207,6 +207,8 @@ namespace osu.Game.Screens.Multi.Match
                 Ruleset.Value = item.Ruleset.Value;
         }
 
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet) => Schedule(updateWorkingBeatmap);
+
         private void updateWorkingBeatmap()
         {
             var beatmap = SelectedItem.Value?.Beatmap.Value;
@@ -217,17 +219,6 @@ namespace osu.Game.Screens.Multi.Match
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
-        {
-            Schedule(() =>
-            {
-                if (Beatmap.Value != beatmapManager.DefaultBeatmap)
-                    return;
-
-                updateWorkingBeatmap();
-            });
-        }
-
         private void onStart()
         {
             switch (type.Value)

From dfb9687fb5bfc47670ea6b017410e46c76c5905c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Jun 2020 17:22:09 +0900
Subject: [PATCH 03029/10326] Extract update into PreUpdate(), add test

---
 osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs |  3 +++
 osu.Game/Beatmaps/BeatmapManager.cs             | 17 +++++++++++++----
 osu.Game/Database/ArchiveModelManager.cs        | 10 ++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 5eb11a3264..88bb39a521 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -602,6 +602,8 @@ namespace osu.Game.Tests.Beatmaps.IO
                     Beatmap beatmapToUpdate = (Beatmap)manager.GetWorkingBeatmap(setToUpdate.Beatmaps.First(b => b.RulesetID == 0)).Beatmap;
                     BeatmapSetFileInfo fileToUpdate = setToUpdate.Files.First(f => beatmapToUpdate.BeatmapInfo.Path.Contains(f.Filename));
 
+                    string oldMd5Hash = beatmapToUpdate.BeatmapInfo.MD5Hash;
+
                     using (var stream = new MemoryStream())
                     {
                         using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
@@ -624,6 +626,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     Beatmap updatedBeatmap = (Beatmap)manager.GetWorkingBeatmap(manager.QueryBeatmap(b => b.ID == beatmapToUpdate.BeatmapInfo.ID)).Beatmap;
                     Assert.That(updatedBeatmap.HitObjects.Count, Is.EqualTo(1));
                     Assert.That(updatedBeatmap.HitObjects[0].StartTime, Is.EqualTo(5000));
+                    Assert.That(updatedBeatmap.BeatmapInfo.MD5Hash, Is.Not.EqualTo(oldMd5Hash));
                 }
                 finally
                 {
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index e5907809f3..668ac6ee10 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -201,10 +201,6 @@ namespace osu.Game.Beatmaps
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
                     new LegacyBeatmapEncoder(beatmapContent).Encode(sw);
 
-                var attachedInfo = setInfo.Beatmaps.Single(b => b.ID == info.ID);
-                var md5Hash = stream.ComputeMD5Hash();
-                attachedInfo.MD5Hash = md5Hash;
-
                 UpdateFile(setInfo, setInfo.Files.Single(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase)), stream);
             }
 
@@ -213,6 +209,19 @@ namespace osu.Game.Beatmaps
                 workingCache.Remove(working);
         }
 
+        protected override void PreUpdate(BeatmapSetInfo item)
+        {
+            base.PreUpdate(item);
+
+            foreach (var info in item.Beatmaps)
+            {
+                var file = item.Files.FirstOrDefault(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+
+                using (var stream = Files.Store.GetStream(file))
+                    info.MD5Hash = stream.ComputeMD5Hash();
+            }
+        }
+
         private readonly WeakList<WorkingBeatmap> workingCache = new WeakList<WorkingBeatmap>();
 
         /// <summary>
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index ae55a7b14a..f7e81ae4bc 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -430,10 +430,20 @@ namespace osu.Game.Database
             {
                 item.Hash = computeHash(item);
 
+                PreUpdate(item);
+
                 ModelStore.Update(item);
             }
         }
 
+        /// <summary>
+        /// Perform any final actions before the update to database executes.
+        /// </summary>
+        /// <param name="item">The <typeparamref name="TModel"/> that is being updated.</param>
+        protected virtual void PreUpdate(TModel item)
+        {
+        }
+
         /// <summary>
         /// Delete an item from the manager.
         /// Is a no-op for already deleted items.

From 665530f1c3a9b43ac2925220ee41efc767919974 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Jun 2020 17:22:59 +0900
Subject: [PATCH 03030/10326] Remove excess newline

---
 .../Edit/Blueprints/TaikoSpanPlacementBlueprint.cs               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
index 7f96b5a46e..a88eff13a1 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
@@ -25,7 +25,6 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
 
         public TaikoSpanPlacementBlueprint(HitObject hitObject)
             : base(hitObject)
-
         {
             spanPlacementObject = hitObject as IHasDuration;
 

From 2aadb9deba79800cbbbc22ce0a960dd6c709cfe6 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 2 Jun 2020 11:04:56 +0200
Subject: [PATCH 03031/10326] Implement welcome and seeya samples

---
 osu.Game/Screens/Menu/IntroCircles.cs   |  2 +-
 osu.Game/Screens/Menu/IntroFallback.cs  | 16 ++++++++++++----
 osu.Game/Screens/Menu/IntroScreen.cs    |  4 ++--
 osu.Game/Screens/Menu/IntroTriangles.cs |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index aa9cee969c..08a170f606 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio)
         {
             if (MenuVoice.Value)
-                welcome = audio.Samples.Get(@"welcome");
+                welcome = audio.Samples.Get(@"Intro/welcome-lazer");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Menu/IntroFallback.cs b/osu.Game/Screens/Menu/IntroFallback.cs
index bc01e9c502..ea3c4fb040 100644
--- a/osu.Game/Screens/Menu/IntroFallback.cs
+++ b/osu.Game/Screens/Menu/IntroFallback.cs
@@ -13,15 +13,22 @@ namespace osu.Game.Screens.Menu
     {
         protected override string BeatmapHash => "64E00D7022195959BFA3109D09C2E2276C8F12F486B91FCF6175583E973B48F2";
         protected override string BeatmapFile => "welcome.osz";
-        private const double delay_step_two = 3000;
+        private const double delay_step_two = 2142;
 
         private SampleChannel welcome;
 
+        private SampleChannel pianoReverb;
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
+            seeya = audio.Samples.Get(@"Intro/seeya-fallback");
+            
             if (MenuVoice.Value)
-                welcome = audio.Samples.Get(@"welcome");
+            {
+                welcome = audio.Samples.Get(@"Intro/welcome-fallback");
+                pianoReverb = audio.Samples.Get(@"Intro/welcome_piano");
+            }
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -31,14 +38,15 @@ namespace osu.Game.Screens.Menu
             if (!resuming)
             {
                 welcome?.Play();
-
+                pianoReverb?.Play();
                 Scheduler.AddDelayed(delegate
                 {
                     StartTrack();
 
                     PrepareMenuLoad();
 
-                    Scheduler.AddDelayed(LoadMenu, 0);
+                    Scheduler.Add(LoadMenu);
+                    
                 }, delay_step_two);
 
                 logo.ScaleTo(1);
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 0d5f3d1142..20cd9671a0 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Menu
 
         private const int exit_delay = 3000;
 
-        private SampleChannel seeya;
+        protected SampleChannel seeya { get; set; }
 
         private LeasedBindable<WorkingBeatmap> beatmap;
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Menu
             MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
 
-            seeya = audio.Samples.Get(@"seeya");
+            seeya = audio.Samples.Get(@"Intro/seeya-lazer");
 
             BeatmapSetInfo setInfo = null;
 
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 188a49c147..b44fea99e8 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Menu
         private void load()
         {
             if (MenuVoice.Value && !MenuMusic.Value)
-                welcome = audio.Samples.Get(@"welcome");
+                welcome = audio.Samples.Get(@"Intro/welcome-lazer");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)

From 3ae97c963454bd407a0132242fac4a309c61b7e0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 2 Jun 2020 11:25:57 +0200
Subject: [PATCH 03032/10326] Change "Fallback" to "Welcome" visually

---
 osu.Game/Configuration/IntroSequence.cs | 2 +-
 osu.Game/Screens/Loader.cs              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/IntroSequence.cs b/osu.Game/Configuration/IntroSequence.cs
index 24f8c0f048..5672c44bbe 100644
--- a/osu.Game/Configuration/IntroSequence.cs
+++ b/osu.Game/Configuration/IntroSequence.cs
@@ -6,7 +6,7 @@ namespace osu.Game.Configuration
     public enum IntroSequence
     {
         Circles,
-        Fallback,
+        Welcome,
         Triangles,
         Random
     }
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index 690868bd36..9330226bda 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens
                 case IntroSequence.Circles:
                     return new IntroCircles();
 
-                case IntroSequence.Fallback:
+                case IntroSequence.Welcome:
                     return new IntroFallback();
 
                 default:

From 828180ad9b3e6006e70c811e107d340ae18b603e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Jun 2020 19:29:22 +0900
Subject: [PATCH 03033/10326] Add default

---
 osu.Game.Tournament/Screens/SetupScreen.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index e1594de69e..2bd0bcf2f2 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -211,7 +211,8 @@ namespace osu.Game.Tournament.Screens
         private class ResolutionSelector : ActionableInfo
         {
             private const int minimum_window_height = 480;
-            private const int maximum_window_height = 2160; // 4k
+            private const int maximum_window_height = 2160;
+
             public new Action<int> Action;
 
             private OsuNumberBox numberBox;
@@ -221,6 +222,7 @@ namespace osu.Game.Tournament.Screens
                 var drawable = base.CreateComponent();
                 FlowContainer.Insert(-1, numberBox = new OsuNumberBox
                 {
+                    Text = "1080",
                     Width = 100
                 });
 

From 78fddc895738ec770447f025bdc8a487bdd5c988 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Jun 2020 19:29:59 +0900
Subject: [PATCH 03034/10326] Make button match height

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

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 2bd0bcf2f2..cf8eb8bd6c 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -199,7 +199,7 @@ namespace osu.Game.Tournament.Screens
                         {
                             button = new TriangleButton
                             {
-                                Size = new Vector2(100, 30),
+                                Size = new Vector2(100, 40),
                                 Action = () => Action?.Invoke()
                             }
                         }

From 19d73af90d2ca01faf33c320ee9015d5a218b2d5 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 2 Jun 2020 12:51:42 +0200
Subject: [PATCH 03035/10326] Implement basic intro sequence

---
 osu.Game/Screens/Menu/IntroFallback.cs | 65 +++++++++++++++++++++++---
 osu.Game/Screens/Menu/IntroScreen.cs   |  6 +--
 2 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroFallback.cs b/osu.Game/Screens/Menu/IntroFallback.cs
index ea3c4fb040..7c23f00d3f 100644
--- a/osu.Game/Screens/Menu/IntroFallback.cs
+++ b/osu.Game/Screens/Menu/IntroFallback.cs
@@ -1,11 +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.Linq;
+using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Menu
 {
@@ -22,8 +27,8 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            seeya = audio.Samples.Get(@"Intro/seeya-fallback");
-            
+            Seeya = audio.Samples.Get(@"Intro/seeya-fallback");
+
             if (MenuVoice.Value)
             {
                 welcome = audio.Samples.Get(@"Intro/welcome-fallback");
@@ -45,13 +50,20 @@ namespace osu.Game.Screens.Menu
 
                     PrepareMenuLoad();
 
+                    logo.ScaleTo(1);
+                    logo.FadeIn();
+
                     Scheduler.Add(LoadMenu);
-                    
                 }, delay_step_two);
 
-                logo.ScaleTo(1);
-                logo.FadeIn();
-                logo.PlayIntro();
+                LoadComponentAsync(new FallbackIntroSequence
+                {
+                    RelativeSizeAxes = Axes.Both
+                }, t =>
+                {
+                    AddInternal(t);
+                    t.Start(delay_step_two);
+                });
             }
         }
 
@@ -60,5 +72,46 @@ namespace osu.Game.Screens.Menu
             this.FadeOut(300);
             base.OnSuspending(next);
         }
+
+        private class FallbackIntroSequence : Container
+        {
+            private OsuSpriteText welcomeText;
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Children = new Drawable[]
+                {
+                    welcomeText = new OsuSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Text = "welcome",
+                        Padding = new MarginPadding { Bottom = 10 },
+                        Font = OsuFont.GetFont(weight: FontWeight.Light, size: 42),
+                        Alpha = 0,
+                        Spacing = new Vector2(5),
+                    },
+                };
+            }
+
+            public void Start(double length)
+            {
+                if (Children.Any())
+                {
+                    // restart if we were already run previously.
+                    FinishTransforms(true);
+                    load();
+                }
+
+                double remainingTime() => length - TransformDelay;
+
+                using (BeginDelayedSequence(250, true))
+                {
+                    welcomeText.FadeIn(700);
+                    welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.5f), remainingTime(), Easing.Out);
+                }
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 20cd9671a0..8588e2a41b 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Menu
 
         private const int exit_delay = 3000;
 
-        protected SampleChannel seeya { get; set; }
+        protected SampleChannel Seeya { get; set; }
 
         private LeasedBindable<WorkingBeatmap> beatmap;
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Menu
             MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
 
-            seeya = audio.Samples.Get(@"Intro/seeya-lazer");
+            Seeya = audio.Samples.Get(@"Intro/seeya-lazer");
 
             BeatmapSetInfo setInfo = null;
 
@@ -103,7 +103,7 @@ namespace osu.Game.Screens.Menu
             double fadeOutTime = exit_delay;
             // we also handle the exit transition.
             if (MenuVoice.Value)
-                seeya.Play();
+                Seeya.Play();
             else
                 fadeOutTime = 500;
 

From 888b90b426f077a84e9b9e7e12fcba05858dbfde Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 2 Jun 2020 13:14:50 +0200
Subject: [PATCH 03036/10326] Rename IntroFallback classes to IntroLegacy

This commit also renames files accordingly with https://github.com/ppy/osu-resources/pull/103
---
 ...{TestSceneIntroFallback.cs => TestSceneIntroLegacy.cs} | 4 ++--
 osu.Game/Screens/Loader.cs                                | 2 +-
 osu.Game/Screens/Menu/IntroCircles.cs                     | 2 +-
 .../Screens/Menu/{IntroFallback.cs => IntroLegacy.cs}     | 8 ++++----
 osu.Game/Screens/Menu/IntroScreen.cs                      | 2 +-
 osu.Game/Screens/Menu/IntroTriangles.cs                   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename osu.Game.Tests/Visual/Menus/{TestSceneIntroFallback.cs => TestSceneIntroLegacy.cs} (70%)
 rename osu.Game/Screens/Menu/{IntroFallback.cs => IntroLegacy.cs} (92%)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroFallback.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroLegacy.cs
similarity index 70%
rename from osu.Game.Tests/Visual/Menus/TestSceneIntroFallback.cs
rename to osu.Game.Tests/Visual/Menus/TestSceneIntroLegacy.cs
index cb32d6bf32..7cb99467ad 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroFallback.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroLegacy.cs
@@ -8,8 +8,8 @@ using osu.Game.Screens.Menu;
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestSceneIntroFallback : IntroTestScene
+    public class TestSceneIntroLegacy : IntroTestScene
     {
-        protected override IScreen CreateScreen() => new IntroFallback();
+        protected override IScreen CreateScreen() => new IntroLegacy();
     }
 }
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index 9330226bda..aa959e7d35 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens
                     return new IntroCircles();
 
                 case IntroSequence.Welcome:
-                    return new IntroFallback();
+                    return new IntroLegacy();
 
                 default:
                     return new IntroTriangles();
diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index 08a170f606..113d496855 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio)
         {
             if (MenuVoice.Value)
-                welcome = audio.Samples.Get(@"Intro/welcome-lazer");
+                welcome = audio.Samples.Get(@"Intro/lazer/welcome");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Menu/IntroFallback.cs b/osu.Game/Screens/Menu/IntroLegacy.cs
similarity index 92%
rename from osu.Game/Screens/Menu/IntroFallback.cs
rename to osu.Game/Screens/Menu/IntroLegacy.cs
index 7c23f00d3f..c1a360bca1 100644
--- a/osu.Game/Screens/Menu/IntroFallback.cs
+++ b/osu.Game/Screens/Menu/IntroLegacy.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Menu
 {
-    public class IntroFallback : IntroScreen
+    public class IntroLegacy : IntroScreen
     {
         protected override string BeatmapHash => "64E00D7022195959BFA3109D09C2E2276C8F12F486B91FCF6175583E973B48F2";
         protected override string BeatmapFile => "welcome.osz";
@@ -27,12 +27,12 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            Seeya = audio.Samples.Get(@"Intro/seeya-fallback");
+            Seeya = audio.Samples.Get(@"Intro/legacy/seeya");
 
             if (MenuVoice.Value)
             {
-                welcome = audio.Samples.Get(@"Intro/welcome-fallback");
-                pianoReverb = audio.Samples.Get(@"Intro/welcome_piano");
+                welcome = audio.Samples.Get(@"Intro/legacy/welcome");
+                pianoReverb = audio.Samples.Get(@"Intro/legacy/welcome_piano");
             }
         }
 
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 8588e2a41b..d8769e3125 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Menu
             MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
 
-            Seeya = audio.Samples.Get(@"Intro/seeya-lazer");
+            Seeya = audio.Samples.Get(@"Intro/lazer/seeya");
 
             BeatmapSetInfo setInfo = null;
 
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index b44fea99e8..ef26038a6f 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Menu
         private void load()
         {
             if (MenuVoice.Value && !MenuMusic.Value)
-                welcome = audio.Samples.Get(@"Intro/welcome-lazer");
+                welcome = audio.Samples.Get(@"Intro/lazer/welcome");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)

From 3d78ec90ac879c6d064943629df1c2b2959a8dc1 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 2 Jun 2020 13:26:37 +0200
Subject: [PATCH 03037/10326] Rename legacy to welcome to match osu-resources

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

diff --git a/osu.Game/Screens/Menu/IntroLegacy.cs b/osu.Game/Screens/Menu/IntroLegacy.cs
index c1a360bca1..3980a0cc8b 100644
--- a/osu.Game/Screens/Menu/IntroLegacy.cs
+++ b/osu.Game/Screens/Menu/IntroLegacy.cs
@@ -27,12 +27,12 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            Seeya = audio.Samples.Get(@"Intro/legacy/seeya");
+            Seeya = audio.Samples.Get(@"Intro/welcome/seeya");
 
             if (MenuVoice.Value)
             {
-                welcome = audio.Samples.Get(@"Intro/legacy/welcome");
-                pianoReverb = audio.Samples.Get(@"Intro/legacy/welcome_piano");
+                welcome = audio.Samples.Get(@"Intro/welcome/welcome");
+                pianoReverb = audio.Samples.Get(@"Intro/welcome/welcome_piano");
             }
         }
 

From f63c66396f7a2f1f462377ae4a3b6c4c9e4dce40 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 2 Jun 2020 13:32:52 +0200
Subject: [PATCH 03038/10326] Apply review suggestions.

---
 .../Visual/Gameplay/TestSceneReplay.cs        |  2 +-
 osu.Game/Rulesets/Ruleset.cs                  |  2 ++
 osu.Game/Screens/Select/PlaySongSelect.cs     | 25 +++++++++++++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
index 1908988739..3a71d4ca54 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var beatmap = Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, Array.Empty<Mod>());
 
-            return new ScoreAccessibleReplayPlayer(ruleset.GetAutoplayMod().CreateReplayScore(beatmap));
+            return new ScoreAccessibleReplayPlayer(ruleset.GetAutoplayMod()?.CreateReplayScore(beatmap));
         }
 
         protected override void AddCheckSteps()
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 8f41e421a3..4f28607733 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Users;
+using JetBrains.Annotations;
 
 namespace osu.Game.Rulesets
 {
@@ -100,6 +101,7 @@ namespace osu.Game.Rulesets
             return value;
         }
 
+        [CanBeNull]
         public ModAutoplay GetAutoplayMod() => GetAllMods().OfType<ModAutoplay>().FirstOrDefault();
 
         public virtual ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => null;
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 71ab3715e0..a0201e696f 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -7,6 +7,8 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
@@ -20,6 +22,9 @@ namespace osu.Game.Screens.Select
         private bool removeAutoModOnResume;
         private OsuScreen player;
 
+        [Resolved]
+        private NotificationOverlay notifications { get; set; }
+
         public override bool AllowExternalScreenChange => true;
 
         protected override UserActivity InitialActivity => new UserActivity.ChoosingBeatmap();
@@ -83,15 +88,21 @@ namespace osu.Game.Screens.Select
                 var auto = Ruleset.Value.CreateInstance().GetAutoplayMod();
                 var autoType = auto?.GetType();
 
-                if (autoType != null)
-                {
-                    var mods = Mods.Value;
+                var mods = Mods.Value;
 
-                    if (mods.All(m => m.GetType() != autoType))
+                if (autoType == null)
+                {
+                    notifications.Post(new SimpleNotification
                     {
-                        Mods.Value = mods.Append(auto).ToArray();
-                        removeAutoModOnResume = true;
-                    }
+                        Text = "The current ruleset doesn't have an autoplay mod avalaible!"
+                    });
+                    return false;
+                }
+
+                if (mods.All(m => m.GetType() != autoType))
+                {
+                    Mods.Value = mods.Append(auto).ToArray();
+                    removeAutoModOnResume = true;
                 }
             }
 

From 61f906d9c462279b89881f1083758f493eb34450 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Jun 2020 21:02:09 +0900
Subject: [PATCH 03039/10326] Fix span piece being incorrect in some drag
 scenarios

---
 .../Blueprints/TaikoSpanPlacementBlueprint.cs | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
index a88eff13a1..468d980b23 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
@@ -48,6 +48,7 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
         }
 
         private double originalStartTime;
+        private Vector2 originalPosition;
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
@@ -73,22 +74,25 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
 
             if (PlacementActive)
             {
-                if (result.Time is double endTime)
+                if (result.Time is double dragTime)
                 {
-                    if (endTime < originalStartTime)
+                    if (dragTime < originalStartTime)
                     {
-                        HitObject.StartTime = endTime;
-                        spanPlacementObject.Duration = Math.Abs(endTime - originalStartTime);
+                        HitObject.StartTime = dragTime;
+                        spanPlacementObject.Duration = Math.Abs(dragTime - originalStartTime);
                         headPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
-                        lengthPiece.X = headPiece.X;
-                        lengthPiece.Width = tailPiece.X - headPiece.X;
+                        tailPiece.Position = originalPosition;
                     }
                     else
                     {
-                        spanPlacementObject.Duration = Math.Abs(endTime - originalStartTime);
+                        HitObject.StartTime = originalStartTime;
+                        spanPlacementObject.Duration = Math.Abs(dragTime - originalStartTime);
                         tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
-                        lengthPiece.Width = tailPiece.X - headPiece.X;
+                        headPiece.Position = originalPosition;
                     }
+
+                    lengthPiece.X = headPiece.X;
+                    lengthPiece.Width = tailPiece.X - headPiece.X;
                 }
             }
             else
@@ -96,7 +100,10 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
                 lengthPiece.Position = headPiece.Position = tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
 
                 if (result.Time is double startTime)
+                {
                     originalStartTime = HitObject.StartTime = startTime;
+                    originalPosition = ToLocalSpace(result.ScreenSpacePosition);
+                }
             }
         }
     }

From 275d95082a88f63e5bc0ba7be8d6efd4950fc30e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 2 Jun 2020 16:01:01 +0200
Subject: [PATCH 03040/10326] Fix crash in testing environment.

---
 osu.Game/Screens/Select/PlaySongSelect.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index a0201e696f..2236aa4d72 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Select
         private bool removeAutoModOnResume;
         private OsuScreen player;
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private NotificationOverlay notifications { get; set; }
 
         public override bool AllowExternalScreenChange => true;
@@ -92,7 +92,7 @@ namespace osu.Game.Screens.Select
 
                 if (autoType == null)
                 {
-                    notifications.Post(new SimpleNotification
+                    notifications?.Post(new SimpleNotification
                     {
                         Text = "The current ruleset doesn't have an autoplay mod avalaible!"
                     });

From a7f8c5935dd611843ff92c9d4193a94281b16a98 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Jun 2020 23:36:56 +0900
Subject: [PATCH 03041/10326] Expose LowestSuccessfulHitResult()

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

diff --git a/osu.Game/Rulesets/Scoring/HitWindows.cs b/osu.Game/Rulesets/Scoring/HitWindows.cs
index 018b50bd3d..77acbd4137 100644
--- a/osu.Game/Rulesets/Scoring/HitWindows.cs
+++ b/osu.Game/Rulesets/Scoring/HitWindows.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Scoring
         /// Retrieves the <see cref="HitResult"/> with the largest hit window that produces a successful hit.
         /// </summary>
         /// <returns>The lowest allowed successful <see cref="HitResult"/>.</returns>
-        protected HitResult LowestSuccessfulHitResult()
+        public HitResult LowestSuccessfulHitResult()
         {
             for (var result = HitResult.Meh; result <= HitResult.Perfect; ++result)
             {

From e98f51923a7c242cae1ec275726d2a18a82dd48b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Jun 2020 23:38:24 +0900
Subject: [PATCH 03042/10326] Add timing distribution to OsuScoreProcessor

---
 .../Scoring/OsuScoreProcessor.cs              | 76 +++++++++++++++++++
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 12 +++
 2 files changed, 88 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 79a6ea7e92..83339bd061 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -1,17 +1,93 @@
 // Copyright (c) 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.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
     public class OsuScoreProcessor : ScoreProcessor
     {
+        /// <summary>
+        /// The number of bins on each side of the timing distribution.
+        /// </summary>
+        private const int timing_distribution_bins = 25;
+
+        /// <summary>
+        /// The total number of bins in the timing distribution, including bins on both sides and the centre bin at 0.
+        /// </summary>
+        private const int total_timing_distribution_bins = timing_distribution_bins * 2 + 1;
+
+        /// <summary>
+        /// The centre bin, with a timing distribution very close to/at 0.
+        /// </summary>
+        private const int timing_distribution_centre_bin_index = timing_distribution_bins;
+
+        private TimingDistribution timingDistribution;
+
+        public override void ApplyBeatmap(IBeatmap beatmap)
+        {
+            var hitWindows = CreateHitWindows();
+            hitWindows.SetDifficulty(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty);
+
+            timingDistribution = new TimingDistribution(total_timing_distribution_bins, hitWindows.WindowFor(hitWindows.LowestSuccessfulHitResult()) / timing_distribution_bins);
+
+            base.ApplyBeatmap(beatmap);
+        }
+
+        protected override void OnResultApplied(JudgementResult result)
+        {
+            base.OnResultApplied(result);
+
+            if (result.IsHit)
+            {
+                int binOffset = (int)(result.TimeOffset / timingDistribution.BinSize);
+                timingDistribution.Bins[timing_distribution_centre_bin_index + binOffset]++;
+            }
+        }
+
+        protected override void OnResultReverted(JudgementResult result)
+        {
+            base.OnResultReverted(result);
+
+            if (result.IsHit)
+            {
+                int binOffset = (int)(result.TimeOffset / timingDistribution.BinSize);
+                timingDistribution.Bins[timing_distribution_centre_bin_index + binOffset]--;
+            }
+        }
+
+        public override void PopulateScore(ScoreInfo score)
+        {
+            base.PopulateScore(score);
+        }
+
+        protected override void Reset(bool storeResults)
+        {
+            base.Reset(storeResults);
+
+            timingDistribution.Bins.AsSpan().Clear();
+        }
+
         protected override JudgementResult CreateResult(HitObject hitObject, Judgement judgement) => new OsuJudgementResult(hitObject, judgement);
 
         public override HitWindows CreateHitWindows() => new OsuHitWindows();
     }
+
+    public class TimingDistribution
+    {
+        public readonly int[] Bins;
+        public readonly double BinSize;
+
+        public TimingDistribution(int binCount, double binSize)
+        {
+            Bins = new int[binCount];
+            BinSize = binSize;
+        }
+    }
 }
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 1f40f44dce..619547aef4 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -129,6 +129,12 @@ namespace osu.Game.Rulesets.Scoring
             }
 
             updateScore();
+
+            OnResultApplied(result);
+        }
+
+        protected virtual void OnResultApplied(JudgementResult result)
+        {
         }
 
         protected sealed override void RevertResultInternal(JudgementResult result)
@@ -154,6 +160,12 @@ namespace osu.Game.Rulesets.Scoring
             }
 
             updateScore();
+
+            OnResultReverted(result);
+        }
+
+        protected virtual void OnResultReverted(JudgementResult result)
+        {
         }
 
         private void updateScore()

From c7c94eb3fdd6c25363c9379bc9c881a407952171 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Jun 2020 23:38:50 +0900
Subject: [PATCH 03043/10326] Initial implementation of timing distribution
 graph

---
 .../TestSceneTimingDistributionGraph.cs       | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
new file mode 100644
index 0000000000..456ac19383
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
@@ -0,0 +1,103 @@
+// Copyright (c) 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Osu.Scoring;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestSceneTimingDistributionGraph : OsuTestScene
+    {
+        public TestSceneTimingDistributionGraph()
+        {
+            Add(new TimingDistributionGraph(createNormalDistribution())
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(300, 100)
+            });
+        }
+
+        private TimingDistribution createNormalDistribution()
+        {
+            var distribution = new TimingDistribution(51, 5);
+
+            // We create an approximately-normal distribution of 51 elements by using the 13th binomial row (14 initial elements) and subdividing the inner values twice.
+            var row = new List<int> { 1 };
+            for (int i = 0; i < 13; i++)
+                row.Add(row[i] * (13 - i) / (i + 1));
+
+            // Each subdivision yields 2n-1 total elements, so first subdivision will contain 27 elements, and the second will contain 53 elements.
+            for (int div = 0; div < 2; div++)
+            {
+                var newRow = new List<int> { 1 };
+
+                for (int i = 0; i < row.Count - 1; i++)
+                {
+                    newRow.Add((row[i] + row[i + 1]) / 2);
+                    newRow.Add(row[i + 1]);
+                }
+
+                row = newRow;
+            }
+
+            // After the subdivisions take place, we're left with 53 values which we use the inner 51 of.
+            for (int i = 1; i < row.Count - 1; i++)
+                distribution.Bins[i - 1] = row[i];
+
+            return distribution;
+        }
+    }
+
+    public class TimingDistributionGraph : CompositeDrawable
+    {
+        private readonly TimingDistribution distribution;
+
+        public TimingDistributionGraph(TimingDistribution distribution)
+        {
+            this.distribution = distribution;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            int maxCount = distribution.Bins.Max();
+
+            var bars = new Drawable[distribution.Bins.Length];
+            for (int i = 0; i < bars.Length; i++)
+                bars[i] = new Bar { Height = (float)distribution.Bins[i] / maxCount };
+
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Content = new[] { bars }
+            };
+        }
+
+        private class Bar : CompositeDrawable
+        {
+            public Bar()
+            {
+                Anchor = Anchor.BottomCentre;
+                Origin = Anchor.BottomCentre;
+
+                RelativeSizeAxes = Axes.Both;
+
+                Padding = new MarginPadding { Horizontal = 1 };
+
+                InternalChild = new Circle
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4Extensions.FromHex("#66FFCC")
+                };
+            }
+        }
+    }
+}

From dc41e74e1912ea9a49a641ab091ed536f6f5e38a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Jun 2020 23:47:18 +0900
Subject: [PATCH 03044/10326] Fix cursor trail not displaying

---
 osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index 37df5ec540..9bcb3abc63 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -237,6 +237,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     {
                         Position = new Vector2(part.Position.X - size.X / 2, part.Position.Y + size.Y / 2),
                         TexturePosition = textureRect.BottomLeft,
+                        TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.BottomLeft.Linear,
                         Time = part.Time
                     });
@@ -245,6 +246,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     {
                         Position = new Vector2(part.Position.X + size.X / 2, part.Position.Y + size.Y / 2),
                         TexturePosition = textureRect.BottomRight,
+                        TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.BottomRight.Linear,
                         Time = part.Time
                     });
@@ -253,6 +255,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     {
                         Position = new Vector2(part.Position.X + size.X / 2, part.Position.Y - size.Y / 2),
                         TexturePosition = textureRect.TopRight,
+                        TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.TopRight.Linear,
                         Time = part.Time
                     });
@@ -261,6 +264,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     {
                         Position = new Vector2(part.Position.X - size.X / 2, part.Position.Y - size.Y / 2),
                         TexturePosition = textureRect.TopLeft,
+                        TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.TopLeft.Linear,
                         Time = part.Time
                     });
@@ -290,6 +294,9 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             [VertexMember(2, VertexAttribPointerType.Float)]
             public Vector2 TexturePosition;
 
+            [VertexMember(4, VertexAttribPointerType.Float)]
+            public Vector4 TextureRect;
+
             [VertexMember(1, VertexAttribPointerType.Float)]
             public float Time;
 

From a2fdf9448394f451c2243e0e7c6ebd2ba72db94e Mon Sep 17 00:00:00 2001
From: Power Maker <42269909+power9maker@users.noreply.github.com>
Date: Tue, 2 Jun 2020 20:55:21 +0200
Subject: [PATCH 03045/10326] Add cursor rotation on right mouse button

---
 osu.Game/Graphics/Cursor/MenuCursor.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 580177d17a..740c809afc 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -83,10 +83,13 @@ namespace osu.Game.Graphics.Cursor
                 activeCursor.AdditiveLayer.FadeInFromZero(800, Easing.OutQuint);
             }
 
-            if (e.Button == MouseButton.Left && cursorRotate.Value)
+            if ((e.Button == MouseButton.Left || e.Button == MouseButton.Right) && cursorRotate.Value)
             {
-                dragRotationState = DragRotationState.DragStarted;
-                positionMouseDown = e.MousePosition;
+                if(!(dragRotationState == DragRotationState.Rotating))
+                {
+                    positionMouseDown = e.MousePosition;
+                    dragRotationState = DragRotationState.DragStarted;
+                }
             }
 
             return base.OnMouseDown(e);
@@ -94,13 +97,13 @@ namespace osu.Game.Graphics.Cursor
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            if (!e.IsPressed(MouseButton.Left) && !e.IsPressed(MouseButton.Right))
+            if (!e.IsPressed(MouseButton.Left) && !e.IsPressed(MouseButton.Middle) && !e.IsPressed(MouseButton.Right))
             {
                 activeCursor.AdditiveLayer.FadeOutFromOne(500, Easing.OutQuint);
                 activeCursor.ScaleTo(1, 500, Easing.OutElastic);
             }
 
-            if (e.Button == MouseButton.Left)
+            if (!e.IsPressed(MouseButton.Left) && !e.IsPressed(MouseButton.Right))
             {
                 if (dragRotationState == DragRotationState.Rotating)
                     activeCursor.RotateTo(0, 600 * (1 + Math.Abs(activeCursor.Rotation / 720)), Easing.OutElasticHalf);

From 85d0c04e61222d9734297f9365bb22fcfec6514a Mon Sep 17 00:00:00 2001
From: Power Maker <42269909+power9maker@users.noreply.github.com>
Date: Tue, 2 Jun 2020 20:57:02 +0200
Subject: [PATCH 03046/10326] Add cursor rotation on right mouse button

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

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 740c809afc..c92304b2d2 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -87,8 +87,8 @@ namespace osu.Game.Graphics.Cursor
             {
                 if(!(dragRotationState == DragRotationState.Rotating))
                 {
-                    positionMouseDown = e.MousePosition;
                     dragRotationState = DragRotationState.DragStarted;
+                    positionMouseDown = e.MousePosition;
                 }
             }
 

From 4ebc1d3721f50e758eb473465b90edcc7271c75f Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 2 Jun 2020 21:06:22 +0200
Subject: [PATCH 03047/10326] Add original sprite and visualiser

Notes: This is using a modified version of welcome.osz to facilitate the visualiser and the animation of the sprite is not accurate.
---
 ...ntroLegacy.cs => TestSceneIntroWelcome.cs} |   4 +-
 osu.Game/Screens/Loader.cs                    |   2 +-
 osu.Game/Screens/Menu/IntroLegacy.cs          | 117 --------------
 osu.Game/Screens/Menu/IntroWelcome.cs         | 152 ++++++++++++++++++
 4 files changed, 155 insertions(+), 120 deletions(-)
 rename osu.Game.Tests/Visual/Menus/{TestSceneIntroLegacy.cs => TestSceneIntroWelcome.cs} (70%)
 delete mode 100644 osu.Game/Screens/Menu/IntroLegacy.cs
 create mode 100644 osu.Game/Screens/Menu/IntroWelcome.cs

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroLegacy.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
similarity index 70%
rename from osu.Game.Tests/Visual/Menus/TestSceneIntroLegacy.cs
rename to osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
index 7cb99467ad..905f17ef0b 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroLegacy.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
@@ -8,8 +8,8 @@ using osu.Game.Screens.Menu;
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestSceneIntroLegacy : IntroTestScene
+    public class TestSceneIntroWelcome : IntroTestScene
     {
-        protected override IScreen CreateScreen() => new IntroLegacy();
+        protected override IScreen CreateScreen() => new IntroWelcome();
     }
 }
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index aa959e7d35..0bfabdaa15 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens
                     return new IntroCircles();
 
                 case IntroSequence.Welcome:
-                    return new IntroLegacy();
+                    return new IntroWelcome();
 
                 default:
                     return new IntroTriangles();
diff --git a/osu.Game/Screens/Menu/IntroLegacy.cs b/osu.Game/Screens/Menu/IntroLegacy.cs
deleted file mode 100644
index 3980a0cc8b..0000000000
--- a/osu.Game/Screens/Menu/IntroLegacy.cs
+++ /dev/null
@@ -1,117 +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 osuTK;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Screens;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-
-namespace osu.Game.Screens.Menu
-{
-    public class IntroLegacy : IntroScreen
-    {
-        protected override string BeatmapHash => "64E00D7022195959BFA3109D09C2E2276C8F12F486B91FCF6175583E973B48F2";
-        protected override string BeatmapFile => "welcome.osz";
-        private const double delay_step_two = 2142;
-
-        private SampleChannel welcome;
-
-        private SampleChannel pianoReverb;
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            Seeya = audio.Samples.Get(@"Intro/welcome/seeya");
-
-            if (MenuVoice.Value)
-            {
-                welcome = audio.Samples.Get(@"Intro/welcome/welcome");
-                pianoReverb = audio.Samples.Get(@"Intro/welcome/welcome_piano");
-            }
-        }
-
-        protected override void LogoArriving(OsuLogo logo, bool resuming)
-        {
-            base.LogoArriving(logo, resuming);
-
-            if (!resuming)
-            {
-                welcome?.Play();
-                pianoReverb?.Play();
-                Scheduler.AddDelayed(delegate
-                {
-                    StartTrack();
-
-                    PrepareMenuLoad();
-
-                    logo.ScaleTo(1);
-                    logo.FadeIn();
-
-                    Scheduler.Add(LoadMenu);
-                }, delay_step_two);
-
-                LoadComponentAsync(new FallbackIntroSequence
-                {
-                    RelativeSizeAxes = Axes.Both
-                }, t =>
-                {
-                    AddInternal(t);
-                    t.Start(delay_step_two);
-                });
-            }
-        }
-
-        public override void OnSuspending(IScreen next)
-        {
-            this.FadeOut(300);
-            base.OnSuspending(next);
-        }
-
-        private class FallbackIntroSequence : Container
-        {
-            private OsuSpriteText welcomeText;
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                Children = new Drawable[]
-                {
-                    welcomeText = new OsuSpriteText
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Text = "welcome",
-                        Padding = new MarginPadding { Bottom = 10 },
-                        Font = OsuFont.GetFont(weight: FontWeight.Light, size: 42),
-                        Alpha = 0,
-                        Spacing = new Vector2(5),
-                    },
-                };
-            }
-
-            public void Start(double length)
-            {
-                if (Children.Any())
-                {
-                    // restart if we were already run previously.
-                    FinishTransforms(true);
-                    load();
-                }
-
-                double remainingTime() => length - TransformDelay;
-
-                using (BeginDelayedSequence(250, true))
-                {
-                    welcomeText.FadeIn(700);
-                    welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.5f), remainingTime(), Easing.Out);
-                }
-            }
-        }
-    }
-}
diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
new file mode 100644
index 0000000000..fbed0bf654
--- /dev/null
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -0,0 +1,152 @@
+// Copyright (c) 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;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Screens;
+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 osuTK.Graphics;
+
+namespace osu.Game.Screens.Menu
+{
+    public class IntroWelcome : IntroScreen
+    {
+        protected override string BeatmapHash => "64E00D7022195959BFA3109D09C2E2276C8F12F486B91FCF6175583E973B48F2";
+        protected override string BeatmapFile => "welcome.osz";
+        private const double delay_step_two = 2142;
+        private SampleChannel welcome;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            Seeya = audio.Samples.Get(@"Intro/welcome/seeya");
+
+            if (MenuVoice.Value)
+                welcome = audio.Samples.Get(@"Intro/welcome/welcome");
+        }
+
+        protected override void LogoArriving(OsuLogo logo, bool resuming)
+        {
+            base.LogoArriving(logo, resuming);
+
+            if (!resuming)
+            {
+                welcome?.Play();
+                StartTrack();
+                Scheduler.AddDelayed(delegate
+                {
+                    PrepareMenuLoad();
+
+                    logo.ScaleTo(1);
+                    logo.FadeIn();
+
+                    Scheduler.Add(LoadMenu);
+                }, delay_step_two);
+
+                LoadComponentAsync(new WelcomeIntroSequence
+                {
+                    RelativeSizeAxes = Axes.Both
+                }, AddInternal);
+            }
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            this.FadeOut(300);
+            base.OnSuspending(next);
+        }
+
+        private class WelcomeIntroSequence : Container
+        {
+            private Sprite welcomeText;
+            private LogoVisualisation visualizer;
+            private Container elementContainer;
+            private Container circleContainer;
+            private Circle blackCircle;
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                Origin = Anchor.Centre;
+                Anchor = Anchor.Centre;
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        AutoSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            elementContainer = new Container
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    visualizer = new LogoVisualisation
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Alpha = 0.5f,
+                                        AccentColour = Color4.Blue,
+                                        Size = new Vector2(0.96f)
+                                    },
+                                    circleContainer = new Container
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                        Children = new Drawable[]
+                                        {
+                                            blackCircle = new Circle
+                                            {
+                                                Anchor = Anchor.Centre,
+                                                Origin = Anchor.Centre,
+                                                Size = new Vector2(480),
+                                                Colour = Color4.Black
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    welcomeText = new Sprite
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(0.5f),
+                        Texture = textures.Get(@"Welcome/welcome_text@2x")
+                    },
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                double remainingTime() => delay_step_two - TransformDelay;
+
+                using (BeginDelayedSequence(250, true))
+                {
+                    welcomeText.FadeIn(700);
+                    welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.5f), remainingTime(), Easing.Out).OnComplete(_ =>
+                    {
+                        elementContainer.Remove(visualizer);
+                        circleContainer.Remove(blackCircle);
+                        elementContainer.Remove(circleContainer);
+                        Remove(welcomeText);
+                        visualizer.Dispose();
+                        blackCircle.Dispose();
+                        welcomeText.Dispose();
+                    });
+                }
+            }
+        }
+    }
+}

From b79773cdb17524bc7fae1da25016cfe2ff90ac46 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 2 Jun 2020 21:50:50 +0200
Subject: [PATCH 03048/10326] Modify LogoVisualisation to allow color changes

Also change the color from blue to dark blue
---
 osu.Game/Screens/Menu/IntroWelcome.cs      | 3 ++-
 osu.Game/Screens/Menu/LogoVisualisation.cs | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index fbed0bf654..7c60048d1c 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -95,7 +95,8 @@ namespace osu.Game.Screens.Menu
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
                                         Alpha = 0.5f,
-                                        AccentColour = Color4.Blue,
+                                        isIntro = true,
+                                        AccentColour = Color4.DarkBlue,
                                         Size = new Vector2(0.96f)
                                     },
                                     circleContainer = new Container
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 0db7f2a2dc..0e77d8d171 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -70,6 +70,7 @@ namespace osu.Game.Screens.Menu
 
         private IShader shader;
         private readonly Texture texture;
+        public bool isIntro = false;
 
         private Bindable<User> user;
         private Bindable<Skin> skin;
@@ -88,8 +89,11 @@ namespace osu.Game.Screens.Menu
             user = api.LocalUser.GetBoundCopy();
             skin = skinManager.CurrentSkin.GetBoundCopy();
 
-            user.ValueChanged += _ => updateColour();
-            skin.BindValueChanged(_ => updateColour(), true);
+            if (!isIntro)
+            {
+                user.ValueChanged += _ => updateColour();
+                skin.BindValueChanged(_ => updateColour(), true);
+            }
         }
 
         private void updateAmplitudes()

From 9cd66dcdef26d39bd771f375b8a27fa25ddcb6bc Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 2 Jun 2020 21:54:39 +0200
Subject: [PATCH 03049/10326] Fix styling error

---
 osu.Game/Screens/Menu/IntroWelcome.cs      | 2 +-
 osu.Game/Screens/Menu/LogoVisualisation.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 7c60048d1c..9f9012cb2b 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Screens.Menu
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
                                         Alpha = 0.5f,
-                                        isIntro = true,
+                                        IsIntro = true,
                                         AccentColour = Color4.DarkBlue,
                                         Size = new Vector2(0.96f)
                                     },
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 0e77d8d171..c72b3a6576 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Menu
 
         private IShader shader;
         private readonly Texture texture;
-        public bool isIntro = false;
+        public bool IsIntro = false;
 
         private Bindable<User> user;
         private Bindable<Skin> skin;
@@ -89,7 +89,7 @@ namespace osu.Game.Screens.Menu
             user = api.LocalUser.GetBoundCopy();
             skin = skinManager.CurrentSkin.GetBoundCopy();
 
-            if (!isIntro)
+            if (!IsIntro)
             {
                 user.ValueChanged += _ => updateColour();
                 skin.BindValueChanged(_ => updateColour(), true);

From fa4d13a22b68440e885288f57157cfb2d3466007 Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Tue, 2 Jun 2020 22:25:25 +0200
Subject: [PATCH 03050/10326] Fixed whitespace

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

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index c92304b2d2..1aa7b68d1a 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Graphics.Cursor
 
             if ((e.Button == MouseButton.Left || e.Button == MouseButton.Right) && cursorRotate.Value)
             {
-                if(!(dragRotationState == DragRotationState.Rotating))
+                if (!(dragRotationState == DragRotationState.Rotating))
                 {
                     dragRotationState = DragRotationState.DragStarted;
                     positionMouseDown = e.MousePosition;

From 40e64eed475b7c09de60643671035e5cd0ec9967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Jun 2020 23:15:14 +0200
Subject: [PATCH 03051/10326] Add contributing guidelines

---
 CONTRIBUTING.md | 121 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..441521f9ef
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,121 @@
+# Contributing Guidelines
+
+Thank you for showing interest in the development of osu!lazer! We aim to provide a good collaborating environment for everyone involved, and as such have decided to list some of the most important things to keep in mind in the process. The guidelines below have been chosen based on past experience.
+
+These are not "official rules" *per se*, but following them will help everyone deal with things in the most efficient manner.
+
+## Table of contents
+
+1. [I would like to submit an issue!](#i-would-like-to-submit-an-issue)
+2. [I would like to submit a pull request!](#i-would-like-to-submit-a-pull-request)
+
+## I would like to submit an issue!
+
+When it comes to issues, bug reports and feature suggestions are welcomed, although please keep in mind that at any point in time, hundreds of issues are open, which vary in severity and the amount of time needed to address them. As such it's not uncommon for issues to remain unresolved for a long time or even closed outright if they are deemed not important enough to fix in the foreseeable future. Issues that are required to "go live" or otherwise achieve parity with stable are prioritised the most.
+
+* **Before submitting an issue, try searching existing issues first.**
+
+  For housekeeping purposes, we close issues that overlap with or duplicate other pre-existing issues - you can help us not have to do that by searching existing issues yourself first. The issue search box, as well as the issue tag system, are tools you can use to check if an issue has been reported before.
+
+* **When submitting a bug report, please try to include as much detail as possible.**
+
+  Bugs are not equal - some of them will be reproducible every time on pretty much all hardware, while others will be hard to track down due to being specific to particular hardware or even somewhat random in nature. As such, providing as much detail as possible when reporting a bug is hugely appreciated. A good starting set of information contains of:
+
+  * the in-game logs, which are located at:
+    * `%AppData%/osu/logs` (on Windows),
+    * `~/.local/share/osu/logs` (on Linux and macOS),
+    * `Android/Data/sh.ppy.osulazer/logs` (on Android),
+    * on iOS they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes,
+  * your system specifications (including the operating system and platform you are playing on),
+  * a reproduction scenario (list of steps you have performed leading up to the occurrence of the bug),
+  * a video or picture of the bug, if at all possible.
+
+* **Provide more information when asked to do so.**
+
+  Sometimes when a bug is more elusive or complicated, none of the information listed above will pinpoint a concrete cause of the problem. In this case we will most likely ask you for additional info, such as a Windows Event Log dump or a copy of your local lazer database (`client.db`). Providing that information is beneficial to both parties - we can track down the problem better, and hopefully fix it for you at some point once we know where it is!
+
+* **When submitting a feature proposal, please describe it in the most understandable way you can.**
+
+  Communicating your idea for a feature can often be hard, and we would like to avoid any misunderstandings. As such, please try to explain your idea in a short, but understandable manner - it's best to avoid jargon or terms and references that could be considered obscure. A mock-up picture (doesn't have to be good!) of the feature can also go a long way in explaining.
+
+* **Refrain from posting "+1" comments.**
+
+  If an issue has already been created, saying that you also experience it without providing any additional details doesn't really help us in any way. To express support for a proposal or indicate that you are also affected by a particular bug, you can use comment reactions instead.
+
+* **Refrain from asking if an issue has been resolved yet.**
+
+  As mentioned above, the issue tracker has hundreds of issues open at any given time. Currently the game is being worked on by two members of the core team, and a handful of outside contributors who offer their free time to help out. As such, it can happen that an issue gets placed on the backburner due to being less important; generally posting a comment demanding its resolution some months or years after it is reported is not very likely to increase its priority.
+
+* **Avoid long discussions about non-development topics.**
+
+  GitHub is mostly a developer space, and as such isn't really fit for lengthened discussions about gameplay mechanics (which might not even be in any way confirmed for the final release) and similar non-technical matters. Such matters are probably best addressed at the osu! forums.
+
+## I would like to submit a pull request!
+
+We also welcome pull requests from unaffiliated contributors. The issue tracker should provide plenty of issues that you can work on; we also mark issues that we think would be good for newcomers with the [`good-first-issue`](https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+label%3Agood-first-issue) label.
+
+However, do keep in mind that the core team is committed to bringing osu!lazer up to par with stable first and foremost, so depending on what your contribution concerns, it might not be merged and released right away. Our approach to managing issues and their priorities is described [in the wiki](https://github.com/ppy/osu/wiki/Project-management).
+
+Here are some key things to note before jumping in:
+
+* **Make sure you are comfortable with C\# and your development environment.**
+
+  While we are accepting of all kinds of contributions, we also have a certain quality standard we'd like to uphold and limited time to review your code. Therefore, we would like to avoid providing entry-level advice, and as such if you're not very familiar with C\# as a programming language, we'd recommend that you start off with a few personal projects to get acquainted with the language's syntax, toolchain and principles of object-oriented programming first.
+
+* **Make sure you are familiar with git and the pull request workflow.**
+
+  [git](https://git-scm.com/) is a distributed version control system that might not be very intuitive at the beginning if you're not familiar with version control. In particular, projects using git have a particular workflow for submitting code changes, which is called the pull request workflow.
+
+  To make things run more smoothly, we recommend that you look up some online resources to familiarise yourself with the git vocabulary and commands, and practice working with forks and submitting pull requests at your own pace. A high-level overview of the process can be found in [this article by GitHub](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests).
+
+* **Make sure to submit pull requests off of a topic branch.**
+
+  As described in the article linked in the previous point, topic branches help you parallelise your work and separate it from the main `master` branch, and additionally are easier for maintainers to work with. Working with multiple `master` branches across many remotes is difficult to keep track of, and it's easy to make a mistake and push to the wrong `master` branch by accident.
+
+* **Refrain from making changes through the GitHub web interface.**
+
+  Even though GitHub provides an option to edit code or replace files in the repository using the web interface, we strongly discourage using it in most scenarios. Editing files this way is inefficient and likely to introduce whitespace or file encoding changes that make it more difficult to review the code.
+
+  Code written through the web interface will also very likely be questioned outright by the reviewers, as it is likely that it has not been properly tested or that it will fail continuous integration checks. We strongly encourage using an IDE like [Visual Studio](https://visualstudio.microsoft.com/), [Visual Studio Code](https://code.visualstudio.com/) or [JetBrains Rider](https://www.jetbrains.com/rider/) instead.
+
+* **Add tests for your code whenever possible.**
+
+  Automated tests are an essential part of a quality and reliable codebase. They help to make the code more maintainable by ensuring it is safe to reorganise (or refactor) the code in various ways, and also prevent regressions - bugs that resurface after having been fixed at some point in the past. If it is viable, please put in the time to add tests, so that the changes you make can last for a (hopefully) very long time.
+
+* **Run tests before opening a pull request.**
+
+  Tying into the previous point, sometimes changes in one part of the codebase can result in unpredictable changes in behaviour in other pieces of the code. This is why it is best to always try to run tests before opening a PR.
+
+  Continuous integration will always run the tests for you (and us), too, but it is best not to rely on it, as there might be many builds queued at any time. Running tests on your own will help you be more certain that at the point of clicking the "Create pull request" button, your changes are as ready as can be.
+
+* **Run code style analysis before opening a pull request.**
+
+  As part of continuous integration, we also run code style analysis, which is supposed to make sure that your code is formatted the same way as all the pre-existing code in the repository. The reason we enforce a particular code style everywhere is to make sure the codebase is consistent in that regard - having one whitespace convention in one place and another one elsewhere causes disorganisation.
+
+* **Make sure to keep the *Allow edits from maintainers* check box checked.**
+
+  To speed up the merging process, collaborators and team members will sometimes want to push changes to your branch themselves, to make minor code style adjustments or to otherwise refactor the code without having to describe how they'd like the code to look like in painstaking detail. Having the *Allow edits from maintainers* check box checked lets them do that; without it they are forced to report issues back to you and wait for you to address them.
+
+* **Refrain from continually merging the master branch back to the PR.**
+
+  Unless there are merge conflicts that need resolution, there is no need to keep merging `master` back to a branch over and over again. One of the maintainers will merge `master` themselves before merging the PR itself anyway, and continual merge commits can cause CI to get overwhelmed due to queueing up too many builds.
+
+* **Refrain from force-pushing to the PR branch.**
+
+  Force-pushing should be avoided, as it can lead to accidentally overwriting a maintainer's changes or CI building wrong commits. We value all history in the project, so there is no need to squash or amend commits in most cases.
+
+  The cases in which force-pushing is warranted are very rare (such as accidentally leaking sensitive info in one of the files committed, adding unrelated files, or mis-merging a dependent PR).
+
+* **Be patient when waiting for the code to be reviewed and merged.**
+
+  As much as we'd like to review all contributions as fast as possible, our time is limited, as team members have to work on their own tasks in addition to reviewing code. As such, work needs to be prioritised, and it can unfortunately take weeks or months for your PR to be merged, depending on how important it is deemed to be.
+
+* **Don't mistake criticism of code for criticism of your person.**
+
+  As mentioned before, we are highly committed to quality when it comes to the lazer project. This means that contributions from less experienced community members can take multiple rounds of review to get to a mergeable state. We try our utmost best to never conflate a person with the code they authored, and to keep the discussion focused on the code at all times. Please consider our comments and requests a learning experience, and don't treat it as a personal attack.
+
+* **Feel free to reach out for help.**
+
+  If you're uncertain about some part of the codebase or some inner workings of the game and framework, please reach out either by leaving a comment in the relevant issue or PR thread, or by posting a message in the [development Discord server](https://discord.gg/ppy). We will try to help you as much as we can.
+
+  When it comes to which form of communication is best, GitHub generally lends better to longer-form discussions, while Discord is better for snappy call-and-response answers. Use your best discretion when deciding, and try to keep a single discussion in one place instead of moving back and forth.

From f4f84ede6a2ff88b3f0cf7517c89a59ef309ed20 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 3 Jun 2020 10:43:16 +0930
Subject: [PATCH 03052/10326] Fix results screen crashing for beatmaps with no
 online ID

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index fbb9b95478..145ba93573 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -140,14 +140,17 @@ namespace osu.Game.Screens.Ranking
         {
             base.LoadComplete();
 
-            var req = FetchScores(scores => Schedule(() =>
+            if (Score.Beatmap.OnlineBeatmapID != null)
             {
-                foreach (var s in scores)
-                    panels.AddScore(s);
-            }));
+                var req = FetchScores(scores => Schedule(() =>
+                {
+                    foreach (var s in scores)
+                        panels.AddScore(s);
+                }));
 
-            if (req != null)
-                api.Queue(req);
+                if (req != null)
+                    api.Queue(req);
+            }
         }
 
         /// <summary>

From 90213d079d33713d8729739675910ebe1cfdda24 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 3 Jun 2020 10:48:27 +0930
Subject: [PATCH 03053/10326] Include submission status in check

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 145ba93573..25c8205c30 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
@@ -140,7 +141,7 @@ namespace osu.Game.Screens.Ranking
         {
             base.LoadComplete();
 
-            if (Score.Beatmap.OnlineBeatmapID != null)
+            if (Score.Beatmap.OnlineBeatmapID != null && Score.Beatmap.Status > BeatmapSetOnlineStatus.Pending)
             {
                 var req = FetchScores(scores => Schedule(() =>
                 {

From 96e3c6e8e888d47069cc636c3049178cae09733b Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 3 Jun 2020 11:36:47 +0930
Subject: [PATCH 03054/10326] Move check to SoloResultsScreen

---
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 15 ++++++---------
 osu.Game/Screens/Ranking/SoloResultsScreen.cs |  4 ++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 25c8205c30..aff0540652 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -141,17 +141,14 @@ namespace osu.Game.Screens.Ranking
         {
             base.LoadComplete();
 
-            if (Score.Beatmap.OnlineBeatmapID != null && Score.Beatmap.Status > BeatmapSetOnlineStatus.Pending)
+            var req = FetchScores(scores => Schedule(() =>
             {
-                var req = FetchScores(scores => Schedule(() =>
-                {
-                    foreach (var s in scores)
-                        panels.AddScore(s);
-                }));
+                foreach (var s in scores)
+                    panels.AddScore(s);
+            }));
 
-                if (req != null)
-                    api.Queue(req);
-            }
+            if (req != null)
+                api.Queue(req);
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index 3ae723683a..9cf2e6757a 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -5,6 +5,7 @@ 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;
 using osu.Game.Rulesets;
@@ -24,6 +25,9 @@ namespace osu.Game.Screens.Ranking
 
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
+            if (Score.Beatmap.OnlineBeatmapID == null || Score.Beatmap.Status <= BeatmapSetOnlineStatus.Pending)
+                return null;
+
             var req = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
             req.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
             return req;

From 0d5a2cf96d089038615d8f30572ae4b7e9b7c7ed Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 3 Jun 2020 11:36:59 +0930
Subject: [PATCH 03055/10326] Add unit tests

---
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 41 ++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 242766ad4b..125aa0a1e7 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -36,12 +36,14 @@ namespace osu.Game.Tests.Visual.Ranking
                 Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
         }
 
-        private TestSoloResults createResultsScreen() => new TestSoloResults(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+        private TestResultsScreen createResultsScreen() => new TestResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+
+        private UnrankedSoloResultsScreen createUnrankedSoloResultsScreen() => new UnrankedSoloResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo));
 
         [Test]
         public void ResultsWithoutPlayer()
         {
-            TestSoloResults screen = null;
+            TestResultsScreen screen = null;
             OsuScreenStack stack;
 
             AddStep("load results", () =>
@@ -60,13 +62,23 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void ResultsWithPlayer()
         {
-            TestSoloResults screen = null;
+            TestResultsScreen screen = null;
 
             AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
             AddAssert("retry overlay present", () => screen.RetryOverlay != null);
         }
 
+        [Test]
+        public void ResultsForUnranked()
+        {
+            UnrankedSoloResultsScreen screen = null;
+
+            AddStep("load results", () => Child = new TestResultsContainer(screen = createUnrankedSoloResultsScreen()));
+            AddUntilStep("wait for loaded", () => screen.IsLoaded);
+            AddAssert("retry overlay present", () => screen.RetryOverlay != null);
+        }
+
         private class TestResultsContainer : Container
         {
             [Cached(typeof(Player))]
@@ -86,11 +98,11 @@ namespace osu.Game.Tests.Visual.Ranking
             }
         }
 
-        private class TestSoloResults : ResultsScreen
+        private class TestResultsScreen : ResultsScreen
         {
             public HotkeyRetryOverlay RetryOverlay;
 
-            public TestSoloResults(ScoreInfo score)
+            public TestResultsScreen(ScoreInfo score)
                 : base(score)
             {
             }
@@ -102,5 +114,24 @@ namespace osu.Game.Tests.Visual.Ranking
                 RetryOverlay = InternalChildren.OfType<HotkeyRetryOverlay>().SingleOrDefault();
             }
         }
+
+        private class UnrankedSoloResultsScreen : SoloResultsScreen
+        {
+            public HotkeyRetryOverlay RetryOverlay;
+
+            public UnrankedSoloResultsScreen(ScoreInfo score)
+                : base(score)
+            {
+                Score.Beatmap.OnlineBeatmapID = 0;
+                Score.Beatmap.Status = BeatmapSetOnlineStatus.Pending;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                RetryOverlay = InternalChildren.OfType<HotkeyRetryOverlay>().SingleOrDefault();
+            }
+        }
     }
 }

From b174daa94a5f7968ac9ef31b50257ecf6a96698d Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 3 Jun 2020 11:58:56 +0930
Subject: [PATCH 03056/10326] Remove unused using

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index aff0540652..fbb9b95478 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;

From 13622eff1f12e8338f96ff5005ccbc2a9e12b8f6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Jun 2020 12:54:07 +0900
Subject: [PATCH 03057/10326] Fix response value

---
 .../Multiplayer/TestSceneTimeshiftResultsScreen.cs       | 2 +-
 .../Online/API/Requests/GetRoomPlaylistScoresRequest.cs  | 9 ++++++++-
 osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index d87a2e3408..8559e7e2f4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 switch (request)
                 {
                     case GetRoomPlaylistScoresRequest r:
-                        r.TriggerSuccess(roomScores);
+                        r.TriggerSuccess(new RoomPlaylistScores { Scores = roomScores });
                         break;
                 }
             });
diff --git a/osu.Game/Online/API/Requests/GetRoomPlaylistScoresRequest.cs b/osu.Game/Online/API/Requests/GetRoomPlaylistScoresRequest.cs
index dd7f80fd46..38f852870b 100644
--- a/osu.Game/Online/API/Requests/GetRoomPlaylistScoresRequest.cs
+++ b/osu.Game/Online/API/Requests/GetRoomPlaylistScoresRequest.cs
@@ -2,10 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetRoomPlaylistScoresRequest : APIRequest<List<RoomScore>>
+    public class GetRoomPlaylistScoresRequest : APIRequest<RoomPlaylistScores>
     {
         private readonly int roomId;
         private readonly int playlistItemId;
@@ -18,4 +19,10 @@ namespace osu.Game.Online.API.Requests
 
         protected override string Target => $@"rooms/{roomId}/playlist/{playlistItemId}/scores";
     }
+
+    public class RoomPlaylistScores
+    {
+        [JsonProperty("scores")]
+        public List<RoomScore> Scores { get; set; }
+    }
 }
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index f2afe15d35..d95cee2ab8 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Multi.Ranking
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
             var req = new GetRoomPlaylistScoresRequest(roomId, playlistItem.ID);
-            req.Success += r => scoresCallback?.Invoke(r.Where(s => s.ID != Score?.OnlineScoreID).Select(s => s.CreateScoreInfo(playlistItem)));
+            req.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.ID != Score?.OnlineScoreID).Select(s => s.CreateScoreInfo(playlistItem)));
             return req;
         }
     }

From 22f4e9012c58e96b8b03f5e9bb4b9639efa83c34 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Jun 2020 12:54:16 +0900
Subject: [PATCH 03058/10326] Remove temporary code

---
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 01a90139c3..3609be2dfe 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -13,7 +13,6 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.GameTypes;
 using osu.Game.Rulesets.Mods;
@@ -212,17 +211,6 @@ namespace osu.Game.Screens.Multi.Match
 
             managerAdded = beatmapManager.ItemAdded.GetBoundCopy();
             managerAdded.BindValueChanged(beatmapAdded);
-
-            if (roomId.Value != null)
-            {
-                var req = new GetRoomPlaylistScoresRequest(roomId.Value.Value, playlist[0].ID);
-
-                req.Success += scores =>
-                {
-                };
-
-                api.Queue(req);
-            }
         }
 
         public override bool OnExiting(IScreen next)

From 74875f9b629715a1e5a13e65704af277fb2c8c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Jun 2020 06:47:10 +0200
Subject: [PATCH 03059/10326] Apply review suggestions & other cleanups

---
 CONTRIBUTING.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 441521f9ef..331534ad73 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,21 +11,21 @@ These are not "official rules" *per se*, but following them will help everyone d
 
 ## I would like to submit an issue!
 
-When it comes to issues, bug reports and feature suggestions are welcomed, although please keep in mind that at any point in time, hundreds of issues are open, which vary in severity and the amount of time needed to address them. As such it's not uncommon for issues to remain unresolved for a long time or even closed outright if they are deemed not important enough to fix in the foreseeable future. Issues that are required to "go live" or otherwise achieve parity with stable are prioritised the most.
+Issues, bug reports and feature suggestions are welcomed, though please keep in mind that at any point in time, hundreds of issues are open, which vary in severity and the amount of time needed to address them. As such it's not uncommon for issues to remain unresolved for a long time or even closed outright if they are deemed not important enough to fix in the foreseeable future. Issues that are required to "go live" or otherwise achieve parity with stable are prioritised the most.
 
 * **Before submitting an issue, try searching existing issues first.**
 
-  For housekeeping purposes, we close issues that overlap with or duplicate other pre-existing issues - you can help us not have to do that by searching existing issues yourself first. The issue search box, as well as the issue tag system, are tools you can use to check if an issue has been reported before.
+  For housekeeping purposes, we close issues that overlap with or duplicate other pre-existing issues - you can help us not to have to do that by searching existing issues yourself first. The issue search box, as well as the issue tag system, are tools you can use to check if an issue has been reported before.
 
 * **When submitting a bug report, please try to include as much detail as possible.**
 
-  Bugs are not equal - some of them will be reproducible every time on pretty much all hardware, while others will be hard to track down due to being specific to particular hardware or even somewhat random in nature. As such, providing as much detail as possible when reporting a bug is hugely appreciated. A good starting set of information contains of:
+  Bugs are not equal - some of them will be reproducible every time on pretty much all hardware, while others will be hard to track down due to being specific to particular hardware or even somewhat random in nature. As such, providing as much detail as possible when reporting a bug is hugely appreciated. A good starting set of information consists of:
 
   * the in-game logs, which are located at:
     * `%AppData%/osu/logs` (on Windows),
     * `~/.local/share/osu/logs` (on Linux and macOS),
     * `Android/Data/sh.ppy.osulazer/logs` (on Android),
-    * on iOS they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes,
+    * on iOS they can be obtained by connecting your device to your desktop and [copying the `logs` directory from the app's own document storage using iTunes](https://support.apple.com/en-us/HT201301#copy-to-computer),
   * your system specifications (including the operating system and platform you are playing on),
   * a reproduction scenario (list of steps you have performed leading up to the occurrence of the bug),
   * a video or picture of the bug, if at all possible.

From 030b55ae85460f8c1346c5d0574d7886e78bf3c9 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Wed, 3 Jun 2020 17:55:15 +1200
Subject: [PATCH 03060/10326] Add a section to global keybind settings for song
 select

---
 .../Input/Bindings/GlobalActionContainer.cs     | 17 +++++++++++++++++
 .../KeyBinding/GlobalKeyBindingsSection.cs      | 12 ++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 71771abede..568022b00e 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -56,6 +56,13 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.Minus }, GlobalAction.DecreaseScrollSpeed),
         };
 
+        public IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
+        {
+            new KeyBinding(InputKey.F1, GlobalAction.ToggleMods),
+            new KeyBinding(InputKey.F2, GlobalAction.SelectRandom),
+            new KeyBinding(InputKey.F3, GlobalAction.ToggleOptions)
+        };
+
         public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
         {
             new KeyBinding(new[] { InputKey.Alt, InputKey.Up }, GlobalAction.IncreaseVolume),
@@ -106,6 +113,16 @@ namespace osu.Game.Input.Bindings
         [Description("Toggle mute")]
         ToggleMute,
 
+        // Song select keybindings
+        [Description("Toggle mod selection overlay")]
+        ToggleMods,
+
+        [Description("Select a random beatmap")]
+        SelectRandom,
+
+        [Description("Toggle beatmap options overlay")]
+        ToggleOptions,
+
         // In-Game Keybindings
         [Description("Skip cutscene")]
         SkipCutscene,
diff --git a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
index 5b44c486a3..1ae6de4386 100644
--- a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Overlays.KeyBinding
         {
             Add(new DefaultBindingsSubsection(manager));
             Add(new AudioControlKeyBindingsSubsection(manager));
+            Add(new SongSelectKeyBindingSubsection(manager));
             Add(new InGameKeyBindingsSubsection(manager));
         }
 
@@ -35,6 +36,17 @@ namespace osu.Game.Overlays.KeyBinding
             }
         }
 
+        private class SongSelectKeyBindingSubsection : KeyBindingsSubsection
+        {
+            protected override string Header => "Song Select";
+
+            public SongSelectKeyBindingSubsection(GlobalActionContainer manager)
+                : base(null)
+            {
+                Defaults = manager.SongSelectKeyBindings;
+            }
+        }
+
         private class InGameKeyBindingsSubsection : KeyBindingsSubsection
         {
             protected override string Header => "In Game";

From 55953b9e858e3828f80abe54a6d4e5eed65f644f Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Wed, 3 Jun 2020 18:13:02 +1200
Subject: [PATCH 03061/10326] Add a keybinding for selecting the previous
 random beatmap Also gave the new actions more meaningful names

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 568022b00e..7257b0ce15 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -58,9 +58,10 @@ namespace osu.Game.Input.Bindings
 
         public IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
         {
-            new KeyBinding(InputKey.F1, GlobalAction.ToggleMods),
-            new KeyBinding(InputKey.F2, GlobalAction.SelectRandom),
-            new KeyBinding(InputKey.F3, GlobalAction.ToggleOptions)
+            new KeyBinding(InputKey.F1, GlobalAction.ToggleModSelection),
+            new KeyBinding(InputKey.F2, GlobalAction.SelectNextRandom),
+            new KeyBinding(new[] { InputKey.Shift, InputKey.F2 }, GlobalAction.SelectPreviousRandom),
+            new KeyBinding(InputKey.F3, GlobalAction.ToggleBeatmapOptions)
         };
 
         public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
@@ -115,13 +116,16 @@ namespace osu.Game.Input.Bindings
 
         // Song select keybindings
         [Description("Toggle mod selection overlay")]
-        ToggleMods,
+        ToggleModSelection,
 
         [Description("Select a random beatmap")]
-        SelectRandom,
+        SelectNextRandom,
+
+        [Description("Select the last random beatmap")]
+        SelectPreviousRandom,
 
         [Description("Toggle beatmap options overlay")]
-        ToggleOptions,
+        ToggleBeatmapOptions,
 
         // In-Game Keybindings
         [Description("Skip cutscene")]

From 1992a3db546126f536ddc9974cd5074bff5f4876 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jun 2020 15:50:00 +0900
Subject: [PATCH 03062/10326] Fix redundant override showing up in build
 warnings

---
 osu.Game/Rulesets/Objects/SliderEventGenerator.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
index 6df0041e7a..d8c6da86f9 100644
--- a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
+++ b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
@@ -11,6 +11,7 @@ namespace osu.Game.Rulesets.Objects
     public static class SliderEventGenerator
     {
         [Obsolete("Use the overload with cancellation support instead.")] // can be removed 20201115
+        // ReSharper disable once RedundantOverload.Global
         public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
                                                                   double? legacyLastTickOffset)
         {

From 5f1d44a2bef173fc2745e0e1212672db4e3b5d86 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jun 2020 15:52:47 +0900
Subject: [PATCH 03063/10326] Update inspectcode / CodeFileSanity versions used
 in CI

---
 build/InspectCode.cake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/InspectCode.cake b/build/InspectCode.cake
index 2e7a1d1b28..c8f4f37c94 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.2"
+#addin "nuget:?package=CodeFileSanity&version=0.0.36"
+#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2020.1.3"
 #tool "nuget:?package=NVika.MSBuild&version=1.0.1"
 var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
 

From 3c07defa1a48a4a778d7e21b9fe9e8fc9bd1abe5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Jun 2020 15:57:01 +0900
Subject: [PATCH 03064/10326] Push to main multiplayer screen instead

---
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs |  8 ++++----
 osu.Game/Screens/Multi/Multiplayer.cs          | 14 --------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 3609be2dfe..b0717d3d28 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -20,6 +20,7 @@ using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Multi.Ranking;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
@@ -260,10 +261,10 @@ namespace osu.Game.Screens.Multi.Match
             {
                 default:
                 case GameTypeTimeshift _:
-                    multiplayer?.Start(() => new TimeshiftPlayer(SelectedItem.Value)
+                    multiplayer?.Push(new PlayerLoader(() => new TimeshiftPlayer(SelectedItem.Value)
                     {
                         Exited = () => leaderboardChatDisplay.RefreshScores()
-                    });
+                    }));
                     break;
             }
         }
@@ -271,8 +272,7 @@ namespace osu.Game.Screens.Multi.Match
         private void showBeatmapResults()
         {
             Debug.Assert(roomId.Value != null);
-
-            this.Push(new TimeshiftResultsScreen(null, roomId.Value.Value, SelectedItem.Value, false));
+            multiplayer?.Push(new TimeshiftResultsScreen(null, roomId.Value.Value, SelectedItem.Value, false));
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 863a28609b..e724152e08 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.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.Extensions.Color4Extensions;
@@ -24,7 +23,6 @@ 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;
 
 namespace osu.Game.Screens.Multi
@@ -197,18 +195,6 @@ namespace osu.Game.Screens.Multi
             Logger.Log($"Polling adjusted (listing: {roomManager.TimeBetweenListingPolls}, selection: {roomManager.TimeBetweenSelectionPolls})");
         }
 
-        /// <summary>
-        /// Push a <see cref="Player"/> to the main screen stack to begin gameplay.
-        /// Generally called from a <see cref="MatchSubScreen"/> via DI resolution.
-        /// </summary>
-        public void Start(Func<Player> player)
-        {
-            if (!this.IsCurrentScreen())
-                return;
-
-            this.Push(new PlayerLoader(player));
-        }
-
         public void APIStateChanged(IAPIProvider api, APIState state)
         {
             if (state != APIState.Online)

From f3b514964894fd38c69cff189d59f71b04b2fe82 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Jun 2020 16:48:44 +0900
Subject: [PATCH 03065/10326] Move some suggestions to warnings, resolve issues

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs             | 2 +-
 osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs    | 3 +--
 .../Drawables/Connections/FollowPointConnection.cs       | 3 +--
 osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs          | 4 ++--
 osu.Game.Tests/Scores/IO/ImportScoreTest.cs              | 7 ++-----
 osu.Game.Tournament.Tests/LadderTestScene.cs             | 3 +--
 osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs   | 3 +--
 osu.Game.Tournament/TournamentGameBase.cs                | 7 ++-----
 osu.Game/Beatmaps/BeatmapManager.cs                      | 3 +--
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs        | 3 +--
 osu.Game/Online/Chat/ChannelManager.cs                   | 9 +++------
 osu.Game/Online/Chat/StandAloneChatDisplay.cs            | 3 +--
 osu.Game/OsuGameBase.cs                                  | 9 ++++-----
 osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs         | 3 +--
 osu.Game/Rulesets/Objects/HitObject.cs                   | 3 +--
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs          | 3 +--
 osu.Game/Scoring/ScoreInfo.cs                            | 8 ++------
 osu.Game/Screens/Edit/Timing/Section.cs                  | 2 +-
 .../Screens/Multi/Lounge/Components/FilterControl.cs     | 3 +--
 osu.Game/Screens/Select/BeatmapCarousel.cs               | 5 +----
 osu.Game/Users/Drawables/DrawableAvatar.cs               | 2 +-
 osu.sln.DotSettings                                      | 4 ++++
 22 files changed, 34 insertions(+), 58 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index ade8460dd7..dd50b05c75 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -48,7 +48,7 @@ namespace osu.Desktop.Updater
 
             try
             {
-                if (updateManager == null) updateManager = await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
+                updateManager ??= await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
 
                 var info = await updateManager.CheckForUpdate(!useDeltaPatching);
                 if (info.ReleasesToApply.Count == 0)
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 5cd2f1f581..918ed77683 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -35,8 +35,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
         {
             var catchCurrent = (CatchDifficultyHitObject)current;
 
-            if (lastPlayerPosition == null)
-                lastPlayerPosition = catchCurrent.LastNormalizedPosition;
+            lastPlayerPosition ??= catchCurrent.LastNormalizedPosition;
 
             float playerPosition = Math.Clamp(
                 lastPlayerPosition.Value,
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 8a0ef22c4a..2c41e6b0e9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -135,8 +135,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 fp.Alpha = 0;
                 fp.Scale = new Vector2(1.5f * osuEnd.Scale);
 
-                if (firstTransformStartTime == null)
-                    firstTransformStartTime = fadeInTime;
+                firstTransformStartTime ??= fadeInTime;
 
                 fp.AnimationStartTime = fadeInTime;
 
diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 5eb11a3264..195fec6278 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     var breakTemp = TestResources.GetTestBeatmapForImport();
 
                     MemoryStream brokenOsu = new MemoryStream();
-                    MemoryStream brokenOsz = new MemoryStream(File.ReadAllBytes(breakTemp));
+                    MemoryStream brokenOsz = new MemoryStream(await File.ReadAllBytesAsync(breakTemp));
 
                     File.Delete(breakTemp);
 
@@ -522,7 +522,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
                     using (var resourceForkFile = File.CreateText(resourceForkFilePath))
                     {
-                        resourceForkFile.WriteLine("adding content so that it's not empty");
+                        await resourceForkFile.WriteLineAsync("adding content so that it's not empty");
                     }
 
                     try
diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index 90bf419644..57f0d7e957 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -183,11 +183,8 @@ namespace osu.Game.Tests.Scores.IO
         {
             var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
 
-            if (score.Beatmap == null)
-                score.Beatmap = beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps.First();
-
-            if (score.Ruleset == null)
-                score.Ruleset = new OsuRuleset().RulesetInfo;
+            score.Beatmap ??= beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps.First();
+            score.Ruleset ??= new OsuRuleset().RulesetInfo;
 
             var scoreManager = osu.Dependencies.Get<ScoreManager>();
             await scoreManager.Import(score, archive);
diff --git a/osu.Game.Tournament.Tests/LadderTestScene.cs b/osu.Game.Tournament.Tests/LadderTestScene.cs
index b962d035ab..2f4373679c 100644
--- a/osu.Game.Tournament.Tests/LadderTestScene.cs
+++ b/osu.Game.Tournament.Tests/LadderTestScene.cs
@@ -24,8 +24,7 @@ namespace osu.Game.Tournament.Tests
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (Ladder.Ruleset.Value == null)
-                Ladder.Ruleset.Value = rulesetStore.AvailableRulesets.First();
+            Ladder.Ruleset.Value ??= rulesetStore.AvailableRulesets.First();
 
             Ruleset.BindTo(Ladder.Ruleset);
         }
diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index 8be66ff98c..e10154b722 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -47,8 +47,7 @@ namespace osu.Game.Tournament.Screens.Drawings
 
             this.storage = storage;
 
-            if (TeamList == null)
-                TeamList = new StorageBackedTeamList(storage);
+            TeamList ??= new StorageBackedTeamList(storage);
 
             if (!TeamList.Teams.Any())
             {
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 85db9e61fb..928c6deb3c 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -150,11 +150,8 @@ namespace osu.Game.Tournament
                     ladder = JsonConvert.DeserializeObject<LadderInfo>(sr.ReadToEnd());
             }
 
-            if (ladder == null)
-                ladder = new LadderInfo();
-
-            if (ladder.Ruleset.Value == null)
-                ladder.Ruleset.Value = RulesetStore.AvailableRulesets.First();
+            ladder ??= new LadderInfo();
+            ladder.Ruleset.Value ??= RulesetStore.AvailableRulesets.First();
 
             Ruleset.BindTo(ladder.Ruleset);
 
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index f626b45e42..0785f9ef0e 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -239,8 +239,7 @@ namespace osu.Game.Beatmaps
 
                 if (working == null)
                 {
-                    if (beatmapInfo.Metadata == null)
-                        beatmapInfo.Metadata = beatmapInfo.BeatmapSet.Metadata;
+                    beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 
                     workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store,
                         new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store)), beatmapInfo, audioManager));
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 388abf4648..be5cd78dc8 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -425,8 +425,7 @@ namespace osu.Game.Beatmaps.Formats
         private void handleHitObject(string line)
         {
             // If the ruleset wasn't specified, assume the osu!standard ruleset.
-            if (parser == null)
-                parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
+            parser ??= new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
 
             var obj = parser.Parse(line);
             if (obj != null)
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 53872ddcba..90d4c2a03b 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -114,8 +114,7 @@ namespace osu.Game.Online.Chat
         /// <param name="target">An optional target channel. If null, <see cref="CurrentChannel"/> will be used.</param>
         public void PostMessage(string text, bool isAction = false, Channel target = null)
         {
-            if (target == null)
-                target = CurrentChannel.Value;
+            target ??= CurrentChannel.Value;
 
             if (target == null)
                 return;
@@ -198,8 +197,7 @@ namespace osu.Game.Online.Chat
         /// <param name="target">An optional target channel. If null, <see cref="CurrentChannel"/> will be used.</param>
         public void PostCommand(string text, Channel target = null)
         {
-            if (target == null)
-                target = CurrentChannel.Value;
+            target ??= CurrentChannel.Value;
 
             if (target == null)
                 return;
@@ -378,8 +376,7 @@ namespace osu.Game.Online.Chat
                 }
             }
 
-            if (CurrentChannel.Value == null)
-                CurrentChannel.Value = channel;
+            CurrentChannel.Value ??= channel;
 
             return channel;
         }
diff --git a/osu.Game/Online/Chat/StandAloneChatDisplay.cs b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
index 4fbeac1db9..f8810c778f 100644
--- a/osu.Game/Online/Chat/StandAloneChatDisplay.cs
+++ b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
@@ -73,8 +73,7 @@ namespace osu.Game.Online.Chat
         [BackgroundDependencyLoader(true)]
         private void load(ChannelManager manager)
         {
-            if (ChannelManager == null)
-                ChannelManager = manager;
+            ChannelManager ??= manager;
         }
 
         protected virtual StandAloneDrawableChannel CreateDrawableChannel(Channel channel) =>
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 5e44562144..3e7311092e 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -164,7 +164,7 @@ namespace osu.Game
             dependencies.Cache(SkinManager = new SkinManager(Storage, contextFactory, Host, Audio, new NamespacedResourceStore<byte[]>(Resources, "Skins/Legacy")));
             dependencies.CacheAs<ISkinSource>(SkinManager);
 
-            if (API == null) API = new APIAccess(LocalConfig);
+            API ??= new APIAccess(LocalConfig);
 
             dependencies.CacheAs(API);
 
@@ -311,11 +311,10 @@ namespace osu.Game
         {
             base.SetHost(host);
 
-            if (Storage == null) // may be non-null for certain tests
-                Storage = new OsuStorage(host);
+            // may be non-null for certain tests
+            Storage ??= new OsuStorage(host);
 
-            if (LocalConfig == null)
-                LocalConfig = new OsuConfigManager(Storage);
+            LocalConfig ??= new OsuConfigManager(Storage);
         }
 
         private readonly List<ICanAcceptFiles> fileImporters = new List<ICanAcceptFiles>();
diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
index a72f182450..cb6abb7cc6 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
@@ -68,8 +68,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             if (!Items.Contains(channel))
                 AddItem(channel);
 
-            if (Current.Value == null)
-                Current.Value = channel;
+            Current.Value ??= channel;
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index e2cc98813a..1d60b266e3 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -133,8 +133,7 @@ namespace osu.Game.Rulesets.Objects
         {
             Kiai = controlPointInfo.EffectPointAt(StartTime + control_point_leniency).KiaiMode;
 
-            if (HitWindows == null)
-                HitWindows = CreateHitWindows();
+            HitWindows ??= CreateHitWindows();
             HitWindows?.SetDifficulty(difficulty.OverallDifficulty);
         }
 
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index bc9401a095..d574991fa0 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -181,8 +181,7 @@ namespace osu.Game.Rulesets.UI
         private void setClock()
         {
             // in case a parent gameplay clock isn't available, just use the parent clock.
-            if (parentGameplayClock == null)
-                parentGameplayClock = Clock;
+            parentGameplayClock ??= Clock;
 
             Clock = GameplayClock;
             ProcessCustomClock = false;
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index a40f436a6e..7b37c267bc 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -115,9 +115,7 @@ namespace osu.Game.Scoring
             get => User?.Username;
             set
             {
-                if (User == null)
-                    User = new User();
-
+                User ??= new User();
                 User.Username = value;
             }
         }
@@ -129,9 +127,7 @@ namespace osu.Game.Scoring
             get => User?.Id ?? 1;
             set
             {
-                if (User == null)
-                    User = new User();
-
+                User ??= new User();
                 User.Id = value ?? 1;
             }
         }
diff --git a/osu.Game/Screens/Edit/Timing/Section.cs b/osu.Game/Screens/Edit/Timing/Section.cs
index ccf1582486..603fb77f31 100644
--- a/osu.Game/Screens/Edit/Timing/Section.cs
+++ b/osu.Game/Screens/Edit/Timing/Section.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Edit.Timing
                     {
                         checkbox = new OsuCheckbox
                         {
-                            LabelText = typeof(T).Name.Replace(typeof(ControlPoint).Name, string.Empty)
+                            LabelText = typeof(T).Name.Replace(nameof(Beatmaps.ControlPoints.ControlPoint), string.Empty)
                         }
                     }
                 },
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 300418441e..2742ef3404 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -34,8 +34,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (filter == null)
-                filter = new Bindable<FilterCriteria>();
+            filter ??= new Bindable<FilterCriteria>();
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 2d714d1794..e174c46610 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -607,10 +607,7 @@ namespace osu.Game.Screens.Select
 
             // todo: remove the need for this.
             foreach (var b in beatmapSet.Beatmaps)
-            {
-                if (b.Metadata == null)
-                    b.Metadata = beatmapSet.Metadata;
-            }
+                b.Metadata ??= beatmapSet.Metadata;
 
             var set = new CarouselBeatmapSet(beatmapSet)
             {
diff --git a/osu.Game/Users/Drawables/DrawableAvatar.cs b/osu.Game/Users/Drawables/DrawableAvatar.cs
index 09750c5bfe..42d2dbb1c6 100644
--- a/osu.Game/Users/Drawables/DrawableAvatar.cs
+++ b/osu.Game/Users/Drawables/DrawableAvatar.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Users.Drawables
 
             Texture texture = null;
             if (user != null && user.Id > 1) texture = textures.Get($@"https://a.ppy.sh/{user.Id}");
-            if (texture == null) texture = textures.Get(@"Online/avatar-guest");
+            texture ??= textures.Get(@"Online/avatar-guest");
 
             ClickableArea clickableArea;
             Add(clickableArea = new ClickableArea
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index b9fc3de734..6e8ecb42d6 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -60,6 +60,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingAssignment/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
@@ -105,6 +106,8 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
@@ -222,6 +225,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseIndexFromEndExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameOfInsteadOfTypeOf/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>

From 8aa8d2c88011adafa5b84ac0adaa7ff88eddda35 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Jun 2020 16:59:37 +0900
Subject: [PATCH 03066/10326] Resolve NREs

---
 osu.Desktop/OsuGameDesktop.cs                  |  2 +-
 osu.Game.Tests/Chat/MessageFormatterTests.cs   | 10 +++++-----
 .../Visual/UserInterface/TestSceneOsuIcon.cs   |  2 +-
 .../Converters/TypedListConverter.cs           | 18 +++++++++++++++---
 osu.Game/Online/API/APIAccess.cs               |  2 +-
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 9351e17419..5f74883803 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -59,7 +59,7 @@ namespace osu.Desktop
             try
             {
                 using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString()?.Split('"')[1].Replace("osu!.exe", "");
 
                 if (checkExists(stableInstallPath))
                     return stableInstallPath;
diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index fbb0416c45..d1a859c84b 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -428,23 +428,23 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(5, result.Links.Count);
 
             Link f = result.Links.Find(l => l.Url == "https://osu.ppy.sh/wiki/wiki links");
-            Assert.AreEqual(44, f.Index);
+            Assert.AreEqual(44, f!.Index);
             Assert.AreEqual(10, f.Length);
 
             f = result.Links.Find(l => l.Url == "http://www.simple-test.com");
-            Assert.AreEqual(10, f.Index);
+            Assert.AreEqual(10, f!.Index);
             Assert.AreEqual(11, f.Length);
 
             f = result.Links.Find(l => l.Url == "http://google.com");
-            Assert.AreEqual(97, f.Index);
+            Assert.AreEqual(97, f!.Index);
             Assert.AreEqual(4, f.Length);
 
             f = result.Links.Find(l => l.Url == "https://osu.ppy.sh");
-            Assert.AreEqual(78, f.Index);
+            Assert.AreEqual(78, f!.Index);
             Assert.AreEqual(18, f.Length);
 
             f = result.Links.Find(l => l.Url == "\uD83D\uDE12");
-            Assert.AreEqual(101, f.Index);
+            Assert.AreEqual(101, f!.Index);
             Assert.AreEqual(3, f.Length);
         }
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuIcon.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuIcon.cs
index 061039b297..246eb119e8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuIcon.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuIcon.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             foreach (var p in typeof(OsuIcon).GetProperties(BindingFlags.Public | BindingFlags.Static))
-                flow.Add(new Icon($"{nameof(OsuIcon)}.{p.Name}", (IconUsage)p.GetValue(null)));
+                flow.Add(new Icon($"{nameof(OsuIcon)}.{p.Name}", (IconUsage)p.GetValue(null)!));
 
             AddStep("toggle shadows", () => flow.Children.ForEach(i => i.SpriteIcon.Shadow = !i.SpriteIcon.Shadow));
             AddStep("change icons", () => flow.Children.ForEach(i => i.SpriteIcon.Icon = new IconUsage((char)(i.SpriteIcon.Icon.Icon + 1))));
diff --git a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
index f98fa05821..ddfdf08f52 100644
--- a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
+++ b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
@@ -41,13 +41,25 @@ namespace osu.Game.IO.Serialization.Converters
             var list = new List<T>();
 
             var obj = JObject.Load(reader);
-            var lookupTable = serializer.Deserialize<List<string>>(obj["$lookup_table"].CreateReader());
 
-            foreach (var tok in obj["$items"])
+            if (!obj.TryGetValue("$lookup_table", out var lookupTableToken) || lookupTableToken == null)
+                return list;
+
+            var lookupTable = serializer.Deserialize<List<string>>(lookupTableToken.CreateReader());
+            if (lookupTable == null)
+                return list;
+
+            if (!obj.TryGetValue("$items", out var itemsToken) || itemsToken == null)
+                return list;
+
+            foreach (var tok in itemsToken)
             {
                 var itemReader = tok.CreateReader();
 
-                var typeName = lookupTable[(int)tok["$type"]];
+                if (!obj.TryGetValue("$type", out var typeToken) || typeToken == null)
+                    throw new JsonException("Expected $type token.");
+
+                var typeName = lookupTable[(int)typeToken];
                 var instance = (T)Activator.CreateInstance(Type.GetType(typeName));
                 serializer.Populate(itemReader, instance);
 
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 4945f7f185..f9e2da9af8 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Online.API
             {
                 try
                 {
-                    return JObject.Parse(req.GetResponseString()).SelectToken("form_error", true).ToObject<RegistrationRequest.RegistrationRequestErrors>();
+                    return JObject.Parse(req.GetResponseString()).SelectToken("form_error", true)!.ToObject<RegistrationRequest.RegistrationRequestErrors>();
                 }
                 catch
                 {

From 86a4664d9ba73522ae51320686f0f60082521a2e Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Wed, 3 Jun 2020 10:03:39 +0200
Subject: [PATCH 03067/10326] Add method for checking if cursor should rotate

---
 osu.Game/Graphics/Cursor/MenuCursor.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 1aa7b68d1a..e0b39ac311 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -83,8 +83,9 @@ namespace osu.Game.Graphics.Cursor
                 activeCursor.AdditiveLayer.FadeInFromZero(800, Easing.OutQuint);
             }
 
-            if ((e.Button == MouseButton.Left || e.Button == MouseButton.Right) && cursorRotate.Value)
+            if (shouldRotate(e) && cursorRotate.Value)
             {
+                // if cursor is already rotating don't reset its rotate origin
                 if (!(dragRotationState == DragRotationState.Rotating))
                 {
                     dragRotationState = DragRotationState.DragStarted;
@@ -97,13 +98,14 @@ namespace osu.Game.Graphics.Cursor
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            if (!e.IsPressed(MouseButton.Left) && !e.IsPressed(MouseButton.Middle) && !e.IsPressed(MouseButton.Right))
+            // cursor should go back to original size when none of main buttons are pressed
+            if (!(e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Middle) || e.IsPressed(MouseButton.Right)))
             {
                 activeCursor.AdditiveLayer.FadeOutFromOne(500, Easing.OutQuint);
                 activeCursor.ScaleTo(1, 500, Easing.OutElastic);
             }
 
-            if (!e.IsPressed(MouseButton.Left) && !e.IsPressed(MouseButton.Right))
+            if (!shouldRotate(e))
             {
                 if (dragRotationState == DragRotationState.Rotating)
                     activeCursor.RotateTo(0, 600 * (1 + Math.Abs(activeCursor.Rotation / 720)), Easing.OutElasticHalf);
@@ -125,6 +127,14 @@ namespace osu.Game.Graphics.Cursor
             activeCursor.ScaleTo(0.6f, 250, Easing.In);
         }
 
+        private static bool shouldRotate(MouseEvent e)
+        {
+            if (e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Right))
+                return true;
+            else
+                return false;
+        }
+
         public class Cursor : Container
         {
             private Container cursorContainer;

From 1ba3f0ac14dd2d293bf453972f26ebc3db98c544 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jun 2020 17:31:55 +0900
Subject: [PATCH 03068/10326] Fix chat history not being loaded for multiplayer
 matches

---
 osu.Game/Online/Chat/ChannelManager.cs | 51 ++++++++++++++------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 53872ddcba..6812052eeb 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -93,12 +93,6 @@ namespace osu.Game.Online.Chat
         {
             if (!(e.NewValue is ChannelSelectorTabItem.ChannelSelectorTabChannel))
                 JoinChannel(e.NewValue);
-
-            if (e.NewValue?.MessagesLoaded == false)
-            {
-                // let's fetch a small number of messages to bring us up-to-date with the backlog.
-                fetchInitalMessages(e.NewValue);
-            }
         }
 
         /// <summary>
@@ -240,7 +234,6 @@ namespace osu.Game.Online.Chat
                     }
 
                     JoinChannel(channel);
-                    CurrentChannel.Value = channel;
                     break;
 
                 case "help":
@@ -275,7 +268,7 @@ namespace osu.Game.Online.Chat
 
                     // join any channels classified as "defaults"
                     if (joinDefaults && defaultChannels.Any(c => c.Equals(channel.Name, StringComparison.OrdinalIgnoreCase)))
-                        JoinChannel(ch);
+                        joinChannel(ch);
                 }
             };
             req.Failure += error =>
@@ -296,7 +289,7 @@ namespace osu.Game.Online.Chat
         /// <param name="channel">The channel </param>
         private void fetchInitalMessages(Channel channel)
         {
-            if (channel.Id <= 0) return;
+            if (channel.Id <= 0 || channel.MessagesLoaded) return;
 
             var fetchInitialMsgReq = new GetMessagesRequest(channel);
             fetchInitialMsgReq.Success += messages =>
@@ -351,9 +344,10 @@ namespace osu.Game.Online.Chat
         /// Joins a channel if it has not already been joined.
         /// </summary>
         /// <param name="channel">The channel to join.</param>
-        /// <param name="alreadyJoined">Whether the channel has already been joined server-side. Will skip a join request.</param>
         /// <returns>The joined channel. Note that this may not match the parameter channel as it is a backed object.</returns>
-        public Channel JoinChannel(Channel channel, bool alreadyJoined = false)
+        public Channel JoinChannel(Channel channel) => joinChannel(channel, true);
+
+        private Channel joinChannel(Channel channel, bool fetchInitialMessages = false)
         {
             if (channel == null) return null;
 
@@ -362,21 +356,29 @@ namespace osu.Game.Online.Chat
             // ensure we are joined to the channel
             if (!channel.Joined.Value)
             {
-                if (alreadyJoined)
-                    channel.Joined.Value = true;
-                else
+                switch (channel.Type)
                 {
-                    switch (channel.Type)
-                    {
-                        case ChannelType.Public:
-                            var req = new JoinChannelRequest(channel, api.LocalUser.Value);
-                            req.Success += () => JoinChannel(channel, true);
-                            req.Failure += ex => LeaveChannel(channel);
-                            api.Queue(req);
-                            return channel;
-                    }
+                    case ChannelType.Private:
+                        // can't do this yet.
+                        break;
+
+                    default:
+                        var req = new JoinChannelRequest(channel, api.LocalUser.Value);
+                        req.Success += () =>
+                        {
+                            channel.Joined.Value = true;
+                            joinChannel(channel, fetchInitialMessages);
+                        };
+                        req.Failure += ex => LeaveChannel(channel);
+                        api.Queue(req);
+                        return channel;
                 }
             }
+            else
+            {
+                if (fetchInitialMessages)
+                    fetchInitalMessages(channel);
+            }
 
             if (CurrentChannel.Value == null)
                 CurrentChannel.Value = channel;
@@ -420,7 +422,8 @@ namespace osu.Game.Online.Chat
                     foreach (var channel in updates.Presence)
                     {
                         // we received this from the server so should mark the channel already joined.
-                        JoinChannel(channel, true);
+                        channel.Joined.Value = true;
+                        joinChannel(channel);
                     }
 
                     //todo: handle left channels

From 092f5b6521c1617d363d9c953a01438e4b38607e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Jun 2020 17:41:05 +0900
Subject: [PATCH 03069/10326] Fix incorrect reference + simplify

---
 .../Serialization/Converters/TypedListConverter.cs   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
index ddfdf08f52..50b28ea74b 100644
--- a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
+++ b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
@@ -42,24 +42,24 @@ namespace osu.Game.IO.Serialization.Converters
 
             var obj = JObject.Load(reader);
 
-            if (!obj.TryGetValue("$lookup_table", out var lookupTableToken) || lookupTableToken == null)
+            if (obj["$lookup_table"] == null)
                 return list;
 
-            var lookupTable = serializer.Deserialize<List<string>>(lookupTableToken.CreateReader());
+            var lookupTable = serializer.Deserialize<List<string>>(obj["$lookup_table"].CreateReader());
             if (lookupTable == null)
                 return list;
 
-            if (!obj.TryGetValue("$items", out var itemsToken) || itemsToken == null)
+            if (obj["$items"] == null)
                 return list;
 
-            foreach (var tok in itemsToken)
+            foreach (var tok in obj["$items"])
             {
                 var itemReader = tok.CreateReader();
 
-                if (!obj.TryGetValue("$type", out var typeToken) || typeToken == null)
+                if (tok["$type"] == null)
                     throw new JsonException("Expected $type token.");
 
-                var typeName = lookupTable[(int)typeToken];
+                var typeName = lookupTable[(int)tok["$type"]];
                 var instance = (T)Activator.CreateInstance(Type.GetType(typeName));
                 serializer.Populate(itemReader, instance);
 

From c0881e14ab176ac500e9308607b37f1368ac8d78 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Jun 2020 17:44:14 +0900
Subject: [PATCH 03070/10326] Add "struct can be made readonly" inspection

---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 6e8ecb42d6..85be2077be 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -199,6 +199,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StructCanBeMadeReadOnly/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>

From 3c7e5a5b42832d2d3b801b6baf09481b47a583e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jun 2020 18:00:31 +0900
Subject: [PATCH 03071/10326] Fix ChannelManager not being loaded in tests

---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 05b33e4386..0025a26baf 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -246,7 +246,12 @@ namespace osu.Game.Tests.Visual.Online
             {
                 ((BindableList<Channel>)ChannelManager.AvailableChannels).AddRange(channels);
 
-                Child = ChatOverlay = new TestChatOverlay { RelativeSizeAxes = Axes.Both, };
+                InternalChildren = new Drawable[]
+                {
+                    ChannelManager,
+                    ChatOverlay = new TestChatOverlay { RelativeSizeAxes = Axes.Both, },
+                };
+
                 ChatOverlay.Show();
             }
         }

From c155ab83399a51bdab44a48d5805463c8520318a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jun 2020 18:03:10 +0900
Subject: [PATCH 03072/10326] Check filenames and timestamps before reusing an
 already imported model

---
 osu.Game/Beatmaps/BeatmapManager.cs      |  4 ++--
 osu.Game/Database/ArchiveModelManager.cs | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index f626b45e42..e7cef13c68 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -258,9 +258,9 @@ namespace osu.Game.Beatmaps
         /// <returns>The first result for the provided query, or null if no results were found.</returns>
         public BeatmapSetInfo QueryBeatmapSet(Expression<Func<BeatmapSetInfo, bool>> query) => beatmaps.ConsumableItems.AsNoTracking().FirstOrDefault(query);
 
-        protected override bool CanUndelete(BeatmapSetInfo existing, BeatmapSetInfo import)
+        protected override bool CanReuseExisting(BeatmapSetInfo existing, BeatmapSetInfo import)
         {
-            if (!base.CanUndelete(existing, import))
+            if (!base.CanReuseExisting(existing, import))
                 return false;
 
             var existingIds = existing.Beatmaps.Select(b => b.OnlineBeatmapID).OrderBy(i => i);
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index ae55a7b14a..4d7d3e96e6 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -332,7 +332,7 @@ namespace osu.Game.Database
 
                         if (existing != null)
                         {
-                            if (CanUndelete(existing, item))
+                            if (CanReuseExisting(existing, item))
                             {
                                 Undelete(existing);
                                 LogForModel(item, $"Found existing {HumanisedModelName} for {item} (ID {existing.ID}) – skipping import.");
@@ -660,13 +660,29 @@ namespace osu.Game.Database
         protected TModel CheckForExisting(TModel model) => model.Hash == null ? null : ModelStore.ConsumableItems.FirstOrDefault(b => b.Hash == model.Hash);
 
         /// <summary>
-        /// After an existing <typeparamref name="TModel"/> is found during an import process, the default behaviour is to restore the existing
+        /// After an existing <typeparamref name="TModel"/> is found during an import process, the default behaviour is to use/restore the existing
         /// item and skip the import. This method allows changing that behaviour.
         /// </summary>
         /// <param name="existing">The existing model.</param>
         /// <param name="import">The newly imported model.</param>
         /// <returns>Whether the existing model should be restored and used. Returning false will delete the existing and force a re-import.</returns>
-        protected virtual bool CanUndelete(TModel existing, TModel import) => true;
+        protected virtual bool CanReuseExisting(TModel existing, TModel import) =>
+            getFilenames(existing.Files).SequenceEqual(getFilenames(import.Files)) &&
+            // poor-man's (cheap) equality comparison, avoiding hashing unnecessarily.
+            // can switch to full hash checks on a per-case basis (or for all) if we decide this is not a performance issue.
+            getTimestamps(existing.Files).SequenceEqual(getTimestamps(import.Files));
+
+        private IEnumerable<string> getFilenames(List<TFileModel> files)
+        {
+            foreach (var f in files.OrderBy(f => f.Filename))
+                yield return f.Filename;
+        }
+
+        private IEnumerable<long> getTimestamps(List<TFileModel> files)
+        {
+            foreach (var f in files.OrderBy(f => f.Filename))
+                yield return File.GetLastWriteTimeUtc(Files.Storage.GetFullPath(f.FileInfo.StoragePath)).ToFileTime();
+        }
 
         private DbSet<TModel> queryModel() => ContextFactory.Get().Set<TModel>();
 

From 012933545eccd4510dc3c0a70b040610dad0bf8d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jun 2020 18:30:27 +0900
Subject: [PATCH 03073/10326] Add test coverage

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 161 ++++++++++++++++++
 osu.Game/Database/ArchiveModelManager.cs      |   2 +-
 2 files changed, 162 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 5eb11a3264..12c9c92e90 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -12,6 +12,7 @@ using NUnit.Framework;
 using osu.Framework.Platform;
 using osu.Game.IPC;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
@@ -22,6 +23,7 @@ using SharpCompress.Archives;
 using SharpCompress.Archives.Zip;
 using SharpCompress.Common;
 using SharpCompress.Writers.Zip;
+using FileInfo = System.IO.FileInfo;
 
 namespace osu.Game.Tests.Beatmaps.IO
 {
@@ -93,6 +95,165 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
+        [Test]
+        public async Task TestImportThenImportWithReZip()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportWithNewerTimestamp)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+
+                    var temp = TestResources.GetTestBeatmapForImport();
+
+                    string extractedFolder = $"{temp}_extracted";
+                    Directory.CreateDirectory(extractedFolder);
+
+                    try
+                    {
+                        var imported = await LoadOszIntoOsu(osu);
+
+                        string hashBefore = hashFile(temp);
+
+                        using (var zip = ZipArchive.Open(temp))
+                            zip.WriteToDirectory(extractedFolder);
+
+                        using (var zip = ZipArchive.Create())
+                        {
+                            zip.AddAllFromDirectory(extractedFolder);
+                            zip.SaveTo(temp, new ZipWriterOptions(CompressionType.Deflate));
+                        }
+
+                        // zip files differ because different compression or encoder.
+                        Assert.AreNotEqual(hashBefore, hashFile(temp));
+
+                        var importedSecondTime = await osu.Dependencies.Get<BeatmapManager>().Import(temp);
+
+                        ensureLoaded(osu);
+
+                        // but contents doesn't, so existing should still be used.
+                        Assert.IsTrue(imported.ID == importedSecondTime.ID);
+                        Assert.IsTrue(imported.Beatmaps.First().ID == importedSecondTime.Beatmaps.First().ID);
+                    }
+                    finally
+                    {
+                        Directory.Delete(extractedFolder, true);
+                    }
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        private string hashFile(string filename)
+        {
+            using (var s = File.OpenRead(filename))
+                return s.ComputeMD5Hash();
+        }
+
+        [Test]
+        public async Task TestImportThenImportWithNewerTimestamp()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportWithNewerTimestamp)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+
+                    var temp = TestResources.GetTestBeatmapForImport();
+
+                    string extractedFolder = $"{temp}_extracted";
+                    Directory.CreateDirectory(extractedFolder);
+
+                    try
+                    {
+                        var imported = await LoadOszIntoOsu(osu);
+
+                        using (var zip = ZipArchive.Open(temp))
+                            zip.WriteToDirectory(extractedFolder);
+
+                        // change timestamp
+                        new FileInfo(Directory.GetFiles(extractedFolder).First()).LastWriteTime = DateTime.Now;
+
+                        using (var zip = ZipArchive.Create())
+                        {
+                            zip.AddAllFromDirectory(extractedFolder);
+                            zip.SaveTo(temp, new ZipWriterOptions(CompressionType.Deflate));
+                        }
+
+                        var importedSecondTime = await osu.Dependencies.Get<BeatmapManager>().Import(temp);
+
+                        ensureLoaded(osu);
+
+                        // check the newly "imported" beatmap is not the original.
+                        Assert.IsTrue(imported.ID != importedSecondTime.ID);
+                        Assert.IsTrue(imported.Beatmaps.First().ID != importedSecondTime.Beatmaps.First().ID);
+                    }
+                    finally
+                    {
+                        Directory.Delete(extractedFolder, true);
+                    }
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public async Task TestImportThenImportWithDifferentFilename()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportWithDifferentFilename)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+
+                    var temp = TestResources.GetTestBeatmapForImport();
+
+                    string extractedFolder = $"{temp}_extracted";
+                    Directory.CreateDirectory(extractedFolder);
+
+                    try
+                    {
+                        var imported = await LoadOszIntoOsu(osu);
+
+                        using (var zip = ZipArchive.Open(temp))
+                            zip.WriteToDirectory(extractedFolder);
+
+                        // change filename
+                        var firstFile = new FileInfo(Directory.GetFiles(extractedFolder).First());
+                        firstFile.MoveTo(Path.Combine(firstFile.DirectoryName, $"{firstFile.Name}-changed{firstFile.Extension}"));
+
+                        using (var zip = ZipArchive.Create())
+                        {
+                            zip.AddAllFromDirectory(extractedFolder);
+                            zip.SaveTo(temp, new ZipWriterOptions(CompressionType.Deflate));
+                        }
+
+                        var importedSecondTime = await osu.Dependencies.Get<BeatmapManager>().Import(temp);
+
+                        ensureLoaded(osu);
+
+                        // check the newly "imported" beatmap is not the original.
+                        Assert.IsTrue(imported.ID != importedSecondTime.ID);
+                        Assert.IsTrue(imported.Beatmaps.First().ID != importedSecondTime.Beatmaps.First().ID);
+                    }
+                    finally
+                    {
+                        Directory.Delete(extractedFolder, true);
+                    }
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         [Test]
         public async Task TestImportCorruptThenImport()
         {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 4d7d3e96e6..5ca9423de2 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -276,7 +276,7 @@ namespace osu.Game.Database
             // for now, concatenate all .osu files in the set to create a unique hash.
             MemoryStream hashable = new MemoryStream();
 
-            foreach (TFileModel file in item.Files.Where(f => HashableFileTypes.Any(f.Filename.EndsWith)))
+            foreach (TFileModel file in item.Files.Where(f => HashableFileTypes.Any(f.Filename.EndsWith)).OrderBy(f => f.Filename))
             {
                 using (Stream s = Files.Store.GetStream(file.FileInfo.StoragePath))
                     s.CopyTo(hashable);

From d002c0c03fbbbc2463edb9f9e1a8ee9b031a3ca0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 3 Jun 2020 11:39:08 +0200
Subject: [PATCH 03074/10326] Revert piano reverb to a separate sample

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 9f9012cb2b..7019e1f1a6 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Screens.Menu
         protected override string BeatmapFile => "welcome.osz";
         private const double delay_step_two = 2142;
         private SampleChannel welcome;
+        private SampleChannel pianoReverb;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
@@ -28,7 +29,10 @@ namespace osu.Game.Screens.Menu
             Seeya = audio.Samples.Get(@"Intro/welcome/seeya");
 
             if (MenuVoice.Value)
+            {
                 welcome = audio.Samples.Get(@"Intro/welcome/welcome");
+                pianoReverb = audio.Samples.Get(@"Intro/welcome/welcome_piano");
+            }
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -38,9 +42,11 @@ namespace osu.Game.Screens.Menu
             if (!resuming)
             {
                 welcome?.Play();
-                StartTrack();
+                pianoReverb?.Play();
+
                 Scheduler.AddDelayed(delegate
                 {
+                    StartTrack();
                     PrepareMenuLoad();
 
                     logo.ScaleTo(1);

From 6133c7d74784d0f848add452953ebf56aa39c0a2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Jun 2020 18:51:02 +0900
Subject: [PATCH 03075/10326] Change suggestion to warning

---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 85be2077be..85d5fce29a 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -141,6 +141,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantReadonlyModifier/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeSpecificationInDefaultExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>

From 25160dc220d9f2f0bde4125f0bafd7446e3ad354 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jun 2020 19:15:52 +0900
Subject: [PATCH 03076/10326] Fix test name

---
 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 12c9c92e90..12f06059f7 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportThenImportWithReZip()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportWithNewerTimestamp)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportWithReZip)))
             {
                 try
                 {

From f6d9f0597b970c9411c623392ffea35a8bcc0fe4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jun 2020 21:28:29 +0900
Subject: [PATCH 03077/10326] Add implicit join logic for multiplayer rooms

---
 osu.Game/Online/Chat/ChannelManager.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 6812052eeb..b17e0812da 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -358,6 +358,13 @@ namespace osu.Game.Online.Chat
             {
                 switch (channel.Type)
                 {
+                    case ChannelType.Multiplayer:
+                        // join is implicit. happens when you join a multiplayer game.
+                        // this will probably change in the future.
+                        channel.Joined.Value = true;
+                        joinChannel(channel, fetchInitialMessages);
+                        return channel;
+
                     case ChannelType.Private:
                         // can't do this yet.
                         break;

From 5ed3cd205f068d572caddc0ae01aa7ab8a580a6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jun 2020 22:35:01 +0900
Subject: [PATCH 03078/10326] Simplify reuse check using FileInfo IDs

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          |  9 +++++----
 osu.Game/Database/ArchiveModelManager.cs      | 20 +++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 12f06059f7..9b34eece5f 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -154,9 +154,9 @@ namespace osu.Game.Tests.Beatmaps.IO
         }
 
         [Test]
-        public async Task TestImportThenImportWithNewerTimestamp()
+        public async Task TestImportThenImportWithChangedFile()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportWithNewerTimestamp)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportWithChangedFile)))
             {
                 try
                 {
@@ -174,8 +174,9 @@ namespace osu.Game.Tests.Beatmaps.IO
                         using (var zip = ZipArchive.Open(temp))
                             zip.WriteToDirectory(extractedFolder);
 
-                        // change timestamp
-                        new FileInfo(Directory.GetFiles(extractedFolder).First()).LastWriteTime = DateTime.Now;
+                        // arbitrary write to non-hashed file
+                        using (var sw = new FileInfo(Directory.GetFiles(extractedFolder, "*.mp3").First()).AppendText())
+                            sw.WriteLine("text");
 
                         using (var zip = ZipArchive.Create())
                         {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 5ca9423de2..0fe8dd1268 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -667,10 +667,16 @@ namespace osu.Game.Database
         /// <param name="import">The newly imported model.</param>
         /// <returns>Whether the existing model should be restored and used. Returning false will delete the existing and force a re-import.</returns>
         protected virtual bool CanReuseExisting(TModel existing, TModel import) =>
-            getFilenames(existing.Files).SequenceEqual(getFilenames(import.Files)) &&
-            // poor-man's (cheap) equality comparison, avoiding hashing unnecessarily.
-            // can switch to full hash checks on a per-case basis (or for all) if we decide this is not a performance issue.
-            getTimestamps(existing.Files).SequenceEqual(getTimestamps(import.Files));
+            // for the best or worst, we copy and import files of a new import before checking whether
+            // it is a duplicate. so to check if anything has changed, we can just compare all FileInfo IDs.
+            getIDs(existing.Files).SequenceEqual(getIDs(import.Files)) &&
+            getFilenames(existing.Files).SequenceEqual(getFilenames(import.Files));
+
+        private IEnumerable<long> getIDs(List<TFileModel> files)
+        {
+            foreach (var f in files.OrderBy(f => f.Filename))
+                yield return f.FileInfo.ID;
+        }
 
         private IEnumerable<string> getFilenames(List<TFileModel> files)
         {
@@ -678,12 +684,6 @@ namespace osu.Game.Database
                 yield return f.Filename;
         }
 
-        private IEnumerable<long> getTimestamps(List<TFileModel> files)
-        {
-            foreach (var f in files.OrderBy(f => f.Filename))
-                yield return File.GetLastWriteTimeUtc(Files.Storage.GetFullPath(f.FileInfo.StoragePath)).ToFileTime();
-        }
-
         private DbSet<TModel> queryModel() => ContextFactory.Get().Set<TModel>();
 
         protected virtual string HumanisedModelName => $"{typeof(TModel).Name.Replace("Info", "").ToLower()}";

From 66ec2afe5cdcd9eb77adf5015966e5dcb652c1d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jun 2020 23:38:40 +0900
Subject: [PATCH 03079/10326] Remove broken import test

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 9b34eece5f..546bf758c1 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.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;
@@ -374,37 +374,6 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
-        [Test]
-        public async Task TestImportThenImportDifferentHash()
-        {
-            // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportDifferentHash)))
-            {
-                try
-                {
-                    var osu = loadOsu(host);
-                    var manager = osu.Dependencies.Get<BeatmapManager>();
-
-                    var imported = await LoadOszIntoOsu(osu);
-
-                    imported.Hash += "-changed";
-                    manager.Update(imported);
-
-                    var importedSecondTime = await LoadOszIntoOsu(osu);
-
-                    Assert.IsTrue(imported.ID != importedSecondTime.ID);
-                    Assert.IsTrue(imported.Beatmaps.First().ID < importedSecondTime.Beatmaps.First().ID);
-
-                    // only one beatmap will exist as the online set ID matched, causing purging of the first import.
-                    checkBeatmapSetCount(osu, 1);
-                }
-                finally
-                {
-                    host.Exit();
-                }
-            }
-        }
-
         [Test]
         public async Task TestImportThenDeleteThenImport()
         {

From 89d973416a1f9807b0d44bdb519c1c846ae5816d Mon Sep 17 00:00:00 2001
From: Power Maker <42269909+power9maker@users.noreply.github.com>
Date: Wed, 3 Jun 2020 20:35:44 +0200
Subject: [PATCH 03080/10326] Simplify shouldRotate method
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/Cursor/MenuCursor.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index e0b39ac311..40735d6de0 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -127,13 +127,7 @@ namespace osu.Game.Graphics.Cursor
             activeCursor.ScaleTo(0.6f, 250, Easing.In);
         }
 
-        private static bool shouldRotate(MouseEvent e)
-        {
-            if (e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Right))
-                return true;
-            else
-                return false;
-        }
+        private static bool shouldRotate(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Right);
 
         public class Cursor : Container
         {

From 3fa02a5782e95b0b92362ac83ad15ae6e1ae5caa Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Wed, 3 Jun 2020 20:43:47 +0200
Subject: [PATCH 03081/10326] Add method for any mouse button pressed.

---
 osu.Game/Graphics/Cursor/MenuCursor.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 40735d6de0..ad413f187a 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osuTK.Input;
 using osu.Framework.Utils;
+using osu.Game.Screens.Multi.Components;
 
 namespace osu.Game.Graphics.Cursor
 {
@@ -83,7 +84,7 @@ namespace osu.Game.Graphics.Cursor
                 activeCursor.AdditiveLayer.FadeInFromZero(800, Easing.OutQuint);
             }
 
-            if (shouldRotate(e) && cursorRotate.Value)
+            if (shouldRotateCursor(e) && cursorRotate.Value)
             {
                 // if cursor is already rotating don't reset its rotate origin
                 if (!(dragRotationState == DragRotationState.Rotating))
@@ -99,13 +100,13 @@ namespace osu.Game.Graphics.Cursor
         protected override void OnMouseUp(MouseUpEvent e)
         {
             // cursor should go back to original size when none of main buttons are pressed
-            if (!(e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Middle) || e.IsPressed(MouseButton.Right)))
+            if (!anyMouseButtonPressed(e))
             {
                 activeCursor.AdditiveLayer.FadeOutFromOne(500, Easing.OutQuint);
                 activeCursor.ScaleTo(1, 500, Easing.OutElastic);
             }
 
-            if (!shouldRotate(e))
+            if (!shouldRotateCursor(e))
             {
                 if (dragRotationState == DragRotationState.Rotating)
                     activeCursor.RotateTo(0, 600 * (1 + Math.Abs(activeCursor.Rotation / 720)), Easing.OutElasticHalf);
@@ -127,7 +128,9 @@ namespace osu.Game.Graphics.Cursor
             activeCursor.ScaleTo(0.6f, 250, Easing.In);
         }
 
-        private static bool shouldRotate(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Right);
+        private static bool shouldRotateCursor(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Right);
+
+        private static bool anyMouseButtonPressed(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Middle) || e.IsPressed(MouseButton.Right);
 
         public class Cursor : Container
         {

From eb15fc0bf9c4280de88ce215b98a4c8f4a36cdfa Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Wed, 3 Jun 2020 20:46:24 +0200
Subject: [PATCH 03082/10326] Remove unnecessary comment

---
 osu.Game/Graphics/Cursor/MenuCursor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index ad413f187a..33715ad7f1 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -99,7 +99,6 @@ namespace osu.Game.Graphics.Cursor
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            // cursor should go back to original size when none of main buttons are pressed
             if (!anyMouseButtonPressed(e))
             {
                 activeCursor.AdditiveLayer.FadeOutFromOne(500, Easing.OutQuint);

From 747ecd5ab23aaf5d625e6daee39d7cda2c6d826b Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Wed, 3 Jun 2020 20:50:37 +0200
Subject: [PATCH 03083/10326] Rename method to avoid confusion

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

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 33715ad7f1..df3eabe7c6 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -99,7 +99,7 @@ namespace osu.Game.Graphics.Cursor
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            if (!anyMouseButtonPressed(e))
+            if (!anyMainButtonPressed(e))
             {
                 activeCursor.AdditiveLayer.FadeOutFromOne(500, Easing.OutQuint);
                 activeCursor.ScaleTo(1, 500, Easing.OutElastic);
@@ -129,7 +129,7 @@ namespace osu.Game.Graphics.Cursor
 
         private static bool shouldRotateCursor(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Right);
 
-        private static bool anyMouseButtonPressed(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Middle) || e.IsPressed(MouseButton.Right);
+        private static bool anyMainButtonPressed(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Middle) || e.IsPressed(MouseButton.Right);
 
         public class Cursor : Container
         {

From ff220b2ebeece677fe1836fd0124f9a9939407de Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Wed, 3 Jun 2020 21:13:11 +0200
Subject: [PATCH 03084/10326] Remove unnecessary using statement.

---
 osu.Game/Graphics/Cursor/MenuCursor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index df3eabe7c6..f4a16c7727 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -15,7 +15,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osuTK.Input;
 using osu.Framework.Utils;
-using osu.Game.Screens.Multi.Components;
 
 namespace osu.Game.Graphics.Cursor
 {

From 939a76b08f32af92c6d425d7ff8003ad736d3126 Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Wed, 3 Jun 2020 21:42:23 +0200
Subject: [PATCH 03085/10326] Simplify negative equality expression

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

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index f4a16c7727..507d218fb8 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Graphics.Cursor
             if (shouldRotateCursor(e) && cursorRotate.Value)
             {
                 // if cursor is already rotating don't reset its rotate origin
-                if (!(dragRotationState == DragRotationState.Rotating))
+                if (dragRotationState != DragRotationState.Rotating)
                 {
                     dragRotationState = DragRotationState.DragStarted;
                     positionMouseDown = e.MousePosition;

From 611f64fd364525be3f98c553ce9501a4c3505291 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 3 Jun 2020 23:23:56 +0300
Subject: [PATCH 03086/10326] Add base ready-made abstract scene for osu! mod
 tests

---
 osu.Game.Rulesets.Osu.Tests/Mods/OsuModTestScene.cs  | 12 ++++++++++++
 .../Mods/TestSceneOsuModDifficultyAdjust.cs          |  5 +----
 .../Mods/TestSceneOsuModDoubleTime.cs                |  5 +----
 .../Mods/TestSceneOsuModHidden.cs                    |  5 +----
 4 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/OsuModTestScene.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/OsuModTestScene.cs b/osu.Game.Rulesets.Osu.Tests/Mods/OsuModTestScene.cs
new file mode 100644
index 0000000000..7697f46160
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/OsuModTestScene.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.Tests.Visual;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public class OsuModTestScene : ModTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 7c396054f1..49c1fe8540 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -9,14 +9,11 @@ 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
 {
-    public class TestSceneOsuModDifficultyAdjust : ModTestScene
+    public class TestSceneOsuModDifficultyAdjust : OsuModTestScene
     {
-        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
-
         [Test]
         public void TestNoAdjustment() => CreateModTest(new ModTestData
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
index 94ef6140e9..335ef31019 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
@@ -4,14 +4,11 @@
 using NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public class TestSceneOsuModDoubleTime : ModTestScene
+    public class TestSceneOsuModDoubleTime : OsuModTestScene
     {
-        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
-
         [TestCase(0.5)]
         [TestCase(1.01)]
         [TestCase(1.5)]
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
index 8ef2240c66..40f1c4a52f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
@@ -8,15 +8,12 @@ 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.Mods
 {
-    public class TestSceneOsuModHidden : ModTestScene
+    public class TestSceneOsuModHidden : OsuModTestScene
     {
-        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
-
         [Test]
         public void TestDefaultBeatmapTest() => CreateModTest(new ModTestData
         {

From 11da045d8cc54111157e76a9f91e6ae93a7b2c3d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 3 Jun 2020 23:43:18 +0300
Subject: [PATCH 03087/10326] Reorder declaration position of ruleset-creation
 methods

Should be recognized as a normal protected method in its declaring class.
---
 .../TestSceneHyperDash.cs                     |  1 -
 osu.Game/Tests/Visual/PlayerTestScene.cs      | 17 +++++++-------
 osu.Game/Tests/Visual/SkinnableTestScene.cs   | 23 +++++++++++--------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 83a6dc3d07..a0dcb86d57 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -16,7 +16,6 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class TestSceneHyperDash : TestSceneCatchPlayer
     {
-
         protected override bool Autoplay => true;
 
         [Test]
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 53abf83e72..d663848bbf 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -24,15 +24,6 @@ namespace osu.Game.Tests.Visual
 
         protected OsuConfigManager LocalConfig;
 
-        /// <summary>
-        /// Creates the ruleset for setting up the <see cref="Player"/> component.
-        /// </summary>
-        [NotNull]
-        protected abstract Ruleset CreatePlayerRuleset();
-
-        protected sealed override Ruleset CreateRuleset() => CreatePlayerRuleset();
-
-        [NotNull]
         private readonly Ruleset ruleset;
 
         protected PlayerTestScene()
@@ -97,6 +88,14 @@ namespace osu.Game.Tests.Visual
             LoadScreen(Player);
         }
 
+        /// <summary>
+        /// Creates the ruleset for setting up the <see cref="Player"/> component.
+        /// </summary>
+        [NotNull]
+        protected abstract Ruleset CreatePlayerRuleset();
+
+        protected sealed override Ruleset CreateRuleset() => CreatePlayerRuleset();
+
         protected virtual TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(false, false);
     }
 }
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 98164031b0..41147d3768 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -23,27 +23,24 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class SkinnableTestScene : OsuGridTestScene
     {
+        private readonly Ruleset ruleset;
+
         private Skin metricsSkin;
         private Skin defaultSkin;
         private Skin specialSkin;
         private Skin oldSkin;
 
-        /// <summary>
-        /// Creates the ruleset for adding the ruleset-specific skin transforming component.
-        /// </summary>
-        [NotNull]
-        protected abstract Ruleset CreateRulesetForSkinProvider();
-
-        protected sealed override Ruleset CreateRuleset() => CreateRulesetForSkinProvider();
-
         protected SkinnableTestScene()
             : base(2, 3)
         {
+            ruleset = CreateRulesetForSkinProvider();
         }
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SkinManager skinManager)
         {
+            Ruleset.Value = ruleset.RulesetInfo;
+
             var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly);
 
             metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
@@ -113,7 +110,7 @@ namespace osu.Game.Tests.Visual
                         {
                             new OutlineBox { Alpha = autoSize ? 1 : 0 },
                             mainProvider.WithChild(
-                                new SkinProvidingContainer(CreateRulesetForSkinProvider().CreateLegacySkinProvider(mainProvider, beatmap))
+                                new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(mainProvider, beatmap))
                                 {
                                     Child = created,
                                     RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,
@@ -126,6 +123,14 @@ namespace osu.Game.Tests.Visual
             };
         }
 
+        /// <summary>
+        /// Creates the ruleset for adding the corresponding skin transforming component.
+        /// </summary>
+        [NotNull]
+        protected abstract Ruleset CreateRulesetForSkinProvider();
+
+        protected sealed override Ruleset CreateRuleset() => CreateRulesetForSkinProvider();
+
         protected virtual IBeatmap CreateBeatmapForSkinProvider() => CreateWorkingBeatmap(Ruleset.Value).GetPlayableBeatmap(Ruleset.Value);
 
         private class OutlineBox : CompositeDrawable

From 136e10086acef397193487e11597623f2867f05b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 4 Jun 2020 00:37:06 +0300
Subject: [PATCH 03088/10326] Set the ruleset bindable value at the BDL for its
 subclasses usages

There are test scenes using current value of ruleset bindable on their BDL (example in TestSceneSliderSnaking's BDL)
---
 osu.Game/Tests/Visual/PlayerTestScene.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index d663848bbf..1e267726e0 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load()
         {
+            Ruleset.Value = ruleset.RulesetInfo;
+
             Dependencies.Cache(LocalConfig = new OsuConfigManager(LocalStorage));
             LocalConfig.GetBindable<double>(OsuSetting.DimLevel).Value = 1.0;
         }
@@ -67,7 +69,6 @@ namespace osu.Game.Tests.Visual
             var beatmap = CreateBeatmap(ruleset.RulesetInfo);
 
             Beatmap.Value = CreateWorkingBeatmap(beatmap);
-            Ruleset.Value = ruleset.RulesetInfo;
             SelectedMods.Value = Array.Empty<Mod>();
 
             if (!AllowFail)

From bbad70c3f0101fed3121bb894f28b3d6884a1322 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 4 Jun 2020 00:40:24 +0300
Subject: [PATCH 03089/10326] Fix mod perfect test scenes failing due to null
 ruleset provided

Just a workaround for now, a better fix may be to put the test data creation in an action that is guaranteed to be invoked after the test scene has fully loaded (all dependencies would've been resolved by then).
---
 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 bfd540093b..93b38a149c 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual
             Mod = mod,
             Beatmap = new Beatmap
             {
-                BeatmapInfo = { Ruleset = Ruleset.Value },
+                BeatmapInfo = { Ruleset = CreatePlayerRuleset().RulesetInfo },
                 HitObjects = { testData.HitObject }
             },
             Autoplay = !shouldMiss,

From c2fd2b861642a6fcac8412891d0365104c6ed6b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Jun 2020 23:20:43 +0200
Subject: [PATCH 03090/10326] Add notes about draft PRs & pushing

---
 CONTRIBUTING.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 331534ad73..9666f249e2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -92,6 +92,16 @@ Here are some key things to note before jumping in:
 
   As part of continuous integration, we also run code style analysis, which is supposed to make sure that your code is formatted the same way as all the pre-existing code in the repository. The reason we enforce a particular code style everywhere is to make sure the codebase is consistent in that regard - having one whitespace convention in one place and another one elsewhere causes disorganisation.
 
+* **Make sure that the pull request is complete before opening it.**
+
+  Whether it's fixing a bug or implementing new functionality, it's best that you make sure that the change you want to submit as a pull request is as complete as it can be before clicking the *Create pull request* button. Having to track if a pull request is ready for review or not places additional burden on reviewers.
+
+  Draft pull requests are an option, but use them sparingly and within reason. They are best suited to discuss code changes that cannot be easily described in natural language or have a potential large impact on the future direction of the project. When in doubt, don't open drafts unless a maintainer asks you to do so.
+
+* **Only push code when it's ready.**
+
+  As an extension of the above, when making changes to an already-open PR, please try to only push changes you are reasonably certain of. Pushing after every commit causes the continuous integration build queue to grow in size, slowing down work and taking up time that could be spent verifying other changes.
+
 * **Make sure to keep the *Allow edits from maintainers* check box checked.**
 
   To speed up the merging process, collaborators and team members will sometimes want to push changes to your branch themselves, to make minor code style adjustments or to otherwise refactor the code without having to describe how they'd like the code to look like in painstaking detail. Having the *Allow edits from maintainers* check box checked lets them do that; without it they are forced to report issues back to you and wait for you to address them.

From ddf5282d0e24d798a157d2c9704f8b30a7944731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Jun 2020 23:33:49 +0200
Subject: [PATCH 03091/10326] Move items from README.md to contributing
 guidelines

---
 CONTRIBUTING.md | 8 +++++++-
 README.md       | 6 ------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9666f249e2..6c327f01b3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,7 +52,7 @@ Issues, bug reports and feature suggestions are welcomed, though please keep in
 
 ## I would like to submit a pull request!
 
-We also welcome pull requests from unaffiliated contributors. The issue tracker should provide plenty of issues that you can work on; we also mark issues that we think would be good for newcomers with the [`good-first-issue`](https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+label%3Agood-first-issue) label.
+We also welcome pull requests from unaffiliated contributors. The [issue tracker](https://github.com/ppy/osu/issues) should provide plenty of issues that you can work on; we also mark issues that we think would be good for newcomers with the [`good-first-issue`](https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+label%3Agood-first-issue) label.
 
 However, do keep in mind that the core team is committed to bringing osu!lazer up to par with stable first and foremost, so depending on what your contribution concerns, it might not be merged and released right away. Our approach to managing issues and their priorities is described [in the wiki](https://github.com/ppy/osu/wiki/Project-management).
 
@@ -62,12 +62,18 @@ Here are some key things to note before jumping in:
 
   While we are accepting of all kinds of contributions, we also have a certain quality standard we'd like to uphold and limited time to review your code. Therefore, we would like to avoid providing entry-level advice, and as such if you're not very familiar with C\# as a programming language, we'd recommend that you start off with a few personal projects to get acquainted with the language's syntax, toolchain and principles of object-oriented programming first.
 
+  In addition, please take the time to take a look at and get acquainted with the [development and testing](https://github.com/ppy/osu-framework/wiki/Development-and-Testing) procedure we have set up.
+
 * **Make sure you are familiar with git and the pull request workflow.**
 
   [git](https://git-scm.com/) is a distributed version control system that might not be very intuitive at the beginning if you're not familiar with version control. In particular, projects using git have a particular workflow for submitting code changes, which is called the pull request workflow.
 
   To make things run more smoothly, we recommend that you look up some online resources to familiarise yourself with the git vocabulary and commands, and practice working with forks and submitting pull requests at your own pace. A high-level overview of the process can be found in [this article by GitHub](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests).
 
+* **Double-check designs before starting work on new functionality.**
+
+  When implementing new features, 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.
+
 * **Make sure to submit pull requests off of a topic branch.**
 
   As described in the article linked in the previous point, topic branches help you parallelise your work and separate it from the main `master` branch, and additionally are easier for maintainers to work with. Working with multiple `master` branches across many remotes is difficult to keep track of, and it's easy to make a mistake and push to the wrong `master` branch by accident.
diff --git a/README.md b/README.md
index 336bf33f7e..9e1cc20c8b 100644
--- a/README.md
+++ b/README.md
@@ -93,12 +93,6 @@ JetBrains ReSharper InspectCode is also used for wider rule sets. You can run it
 
 ## Contributing
 
-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%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**.
-
 Note that while we already have certain standards in place, nothing is set in stone. If you have an issue with the way code is structured, with any libraries we are using, or with any processes involved with contributing, *please* bring it up. We welcome all feedback so we can make contributing to this project as painless as possible.
 
 For those interested, we love to reward quality contributions via [bounties](https://docs.google.com/spreadsheets/d/1jNXfj_S3Pb5PErA-czDdC9DUu4IgUbe1Lt8E7CYUJuE/view?&rm=minimal#gid=523803337), paid out via PayPal or osu!supporter tags. Don't hesitate to [request a bounty](https://docs.google.com/forms/d/e/1FAIpQLSet_8iFAgPMG526pBZ2Kic6HSh7XPM3fE8xPcnWNkMzINDdYg/viewform) for your work on this project.

From af3daaaeafd294a740d9586ee56e13858b75b5e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Jun 2020 23:39:29 +0200
Subject: [PATCH 03092/10326] Add reference to contributing guidelines in
 README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 9e1cc20c8b..dc3ee63844 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,8 @@ JetBrains ReSharper InspectCode is also used for wider rule sets. You can run it
 
 ## Contributing
 
+When it comes to contributing to the project, the two main things you can do to help out are reporting issues and submitting pull requests. Based on past experiences, we have prepared a [list of contributing guidelines](CONTRIBUTING.md) that should hopefully ease you into our collaboration process and answer the most frequently-asked questions.
+
 Note that while we already have certain standards in place, nothing is set in stone. If you have an issue with the way code is structured, with any libraries we are using, or with any processes involved with contributing, *please* bring it up. We welcome all feedback so we can make contributing to this project as painless as possible.
 
 For those interested, we love to reward quality contributions via [bounties](https://docs.google.com/spreadsheets/d/1jNXfj_S3Pb5PErA-czDdC9DUu4IgUbe1Lt8E7CYUJuE/view?&rm=minimal#gid=523803337), paid out via PayPal or osu!supporter tags. Don't hesitate to [request a bounty](https://docs.google.com/forms/d/e/1FAIpQLSet_8iFAgPMG526pBZ2Kic6HSh7XPM3fE8xPcnWNkMzINDdYg/viewform) for your work on this project.

From c72592c52ce200cd1500d261f349d72caa99dd41 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 4 Jun 2020 00:44:28 +0300
Subject: [PATCH 03093/10326] Remove bindable-disabling logic and don't tie
 immediately to CreateRuleset()

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 1b0dff162b..88bd087215 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -72,22 +72,7 @@ namespace osu.Game.Tests.Visual
             Beatmap.SetDefault();
 
             Ruleset = Dependencies.Ruleset;
-
-            var definedRuleset = CreateRuleset()?.RulesetInfo;
-
-            if (definedRuleset != null)
-            {
-                // re-enable the bindable in case it was disabled.
-                // happens when restarting current test scene.
-                Ruleset.Disabled = false;
-
-                // Set global ruleset bindable to the ruleset defined
-                // for this test scene and disallow changing it.
-                Ruleset.Value = definedRuleset;
-                Ruleset.Disabled = true;
-            }
-            else
-                Ruleset.SetDefault();
+            Ruleset.SetDefault();
 
             SelectedMods = Dependencies.Mods;
             SelectedMods.SetDefault();
@@ -145,7 +130,7 @@ namespace osu.Game.Tests.Visual
         /// Creates the ruleset to be used for this test scene.
         /// </summary>
         /// <remarks>
-        /// When testing against ruleset-specific components, this method must be overriden to their ruleset.
+        /// When testing against ruleset-specific components, this method must be overriden to their corresponding ruleset.
         /// </remarks>
         [CanBeNull]
         protected virtual Ruleset CreateRuleset() => null;

From 741fa201492c41b916744315f28593f1e3c57cd9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 4 Jun 2020 00:47:10 +0300
Subject: [PATCH 03094/10326] Use CreateRuleset() for editor test scenes as
 well

---
 .../TestSceneEditor.cs                        |  3 ++-
 .../TestSceneEditor.cs                        |  5 +----
 .../TestSceneEditor.cs                        |  5 +----
 .../Editing/TestSceneEditorChangeStates.cs    |  8 +++-----
 osu.Game/Tests/Visual/EditorTestScene.cs      | 19 +++++++++++--------
 5 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneEditor.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneEditor.cs
index 7ed886be49..3b9c03b86a 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneEditor.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneEditor.cs
@@ -15,8 +15,9 @@ namespace osu.Game.Rulesets.Mania.Tests
     {
         private readonly Bindable<ManiaScrollingDirection> direction = new Bindable<ManiaScrollingDirection>();
 
+        protected override Ruleset CreateEditorRuleset() => new ManiaRuleset();
+
         public TestSceneEditor()
-            : base(new ManiaRuleset())
         {
             AddStep("upwards scroll", () => direction.Value = ManiaScrollingDirection.Up);
             AddStep("downwards scroll", () => direction.Value = ManiaScrollingDirection.Down);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneEditor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneEditor.cs
index 4aca34bf64..9239034a53 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneEditor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneEditor.cs
@@ -9,9 +9,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneEditor : EditorTestScene
     {
-        public TestSceneEditor()
-            : base(new OsuRuleset())
-        {
-        }
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs
index 089a7ad00b..411fe08bcf 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs
@@ -9,9 +9,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
     [TestFixture]
     public class TestSceneEditor : EditorTestScene
     {
-        public TestSceneEditor()
-            : base(new TaikoRuleset())
-        {
-        }
+        protected override Ruleset CreateEditorRuleset() => new TaikoRuleset();
     }
 }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
index 20862e9cac..293a6e6869 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
@@ -13,13 +14,10 @@ namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneEditorChangeStates : EditorTestScene
     {
-        public TestSceneEditorChangeStates()
-            : base(new OsuRuleset())
-        {
-        }
-
         private EditorBeatmap editorBeatmap;
 
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
         public override void SetUpSteps()
         {
             base.SetUpSteps();
diff --git a/osu.Game/Tests/Visual/EditorTestScene.cs b/osu.Game/Tests/Visual/EditorTestScene.cs
index 2f6e6fb599..4f9a5b53b8 100644
--- a/osu.Game/Tests/Visual/EditorTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorTestScene.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
@@ -15,17 +16,11 @@ namespace osu.Game.Tests.Visual
     {
         protected Editor Editor { get; private set; }
 
-        private readonly Ruleset ruleset;
-
-        protected EditorTestScene(Ruleset ruleset)
-        {
-            this.ruleset = ruleset;
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            Beatmap.Value = CreateWorkingBeatmap(ruleset.RulesetInfo);
+            Ruleset.Value = CreateEditorRuleset().RulesetInfo;
+            Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
         }
 
         public override void SetUpSteps()
@@ -37,6 +32,14 @@ namespace osu.Game.Tests.Visual
                                                           && Editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true);
         }
 
+        /// <summary>
+        /// Creates the ruleset for providing a corresponding beatmap to load the editor on.
+        /// </summary>
+        [NotNull]
+        protected abstract Ruleset CreateEditorRuleset();
+
+        protected sealed override Ruleset CreateRuleset() => CreateEditorRuleset();
+
         protected virtual Editor CreateEditor() => new Editor();
     }
 }

From 7e5db5e933aea2b39dbf7faf769f5e1ffba9322b Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 3 Jun 2020 23:49:06 +0200
Subject: [PATCH 03095/10326] Apply review suggestions

---
 .../Components/IPCErrorDialog.cs              |  2 +-
 osu.Game.Tournament/IPC/FileBasedIPC.cs       | 22 ++++++++++++-------
 .../Screens/StablePathSelectScreen.cs         |  4 +---
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Components/IPCErrorDialog.cs b/osu.Game.Tournament/Components/IPCErrorDialog.cs
index 07fd0ac973..dc039cd3bc 100644
--- a/osu.Game.Tournament/Components/IPCErrorDialog.cs
+++ b/osu.Game.Tournament/Components/IPCErrorDialog.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tournament.Components
                 new PopupDialogOkButton
                 {
                     Text = @"Alright.",
-                    Action = () => { Expire(); }
+                    Action = () => Expire()
                 }
             };
         }
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 44a010e506..aad44cd385 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Tournament.IPC
             return IPCStorage;
         }
 
-        public static bool CheckExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
+        private static bool ipcFileExistsInDirectory(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
 
         private string findStablePath()
         {
@@ -183,8 +183,8 @@ namespace osu.Game.Tournament.IPC
 
                     if (stableInstallPath != null)
                     {
-                        SaveStableConfig(stableInstallPath);
-                        return null;
+                        SetIPCLocation(stableInstallPath);
+                        return stableInstallPath;
                     }
                 }
 
@@ -196,8 +196,11 @@ namespace osu.Game.Tournament.IPC
             }
         }
 
-        public void SaveStableConfig(string path)
+        public bool SetIPCLocation(string path)
         {
+            if (!ipcFileExistsInDirectory(path))
+                return false;
+
             StableInfo.StablePath.Value = path;
 
             using (var stream = tournamentStorage.GetStream(STABLE_CONFIG, FileAccess.Write, FileMode.Create))
@@ -211,6 +214,9 @@ namespace osu.Game.Tournament.IPC
                         DefaultValueHandling = DefaultValueHandling.Ignore,
                     }));
             }
+
+            LocateStableStorage();
+            return true;
         }
 
         private string readStableConfig()
@@ -239,7 +245,7 @@ namespace osu.Game.Tournament.IPC
                 Logger.Log("Trying to find stable with environment variables");
                 string stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
 
-                if (CheckExists(stableInstallPath))
+                if (ipcFileExistsInDirectory(stableInstallPath))
                     return stableInstallPath;
             }
             catch
@@ -254,7 +260,7 @@ namespace osu.Game.Tournament.IPC
             Logger.Log("Trying to find stable in %LOCALAPPDATA%");
             string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
 
-            if (CheckExists(stableInstallPath))
+            if (ipcFileExistsInDirectory(stableInstallPath))
                 return stableInstallPath;
 
             return null;
@@ -265,7 +271,7 @@ namespace osu.Game.Tournament.IPC
             Logger.Log("Trying to find stable in dotfolders");
             string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
 
-            if (CheckExists(stableInstallPath))
+            if (ipcFileExistsInDirectory(stableInstallPath))
                 return stableInstallPath;
 
             return null;
@@ -280,7 +286,7 @@ namespace osu.Game.Tournament.IPC
             using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
                 stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
 
-            if (CheckExists(stableInstallPath))
+            if (ipcFileExistsInDirectory(stableInstallPath))
                 return stableInstallPath;
 
             return null;
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index fee2696c4c..ad0c06e4f9 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Tournament.Screens
             var fileBasedIpc = ipc as FileBasedIPC;
             Logger.Log($"Changing Stable CE location to {target}");
 
-            if (!FileBasedIPC.CheckExists(target))
+            if (!fileBasedIpc?.SetIPCLocation(target) ?? false)
             {
                 overlay = new DialogOverlay();
                 overlay.Push(new IPCErrorDialog("This is an invalid IPC Directory", "Select a directory that contains an osu! stable cutting edge installation and make sure it has an empty ipc.txt file in it."));
@@ -148,8 +148,6 @@ namespace osu.Game.Tournament.Screens
                 return;
             }
 
-            fileBasedIpc?.SaveStableConfig(target);
-            fileBasedIpc?.LocateStableStorage();
             sceneManager?.SetScreen(typeof(SetupScreen));
         }
 

From 782fddb6f1e722d0814c60d7caf1681e76581e9e Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 15:21:13 +1200
Subject: [PATCH 03096/10326] Modify FooterButton to implement
 IKeyBindingHandler for responding to hotkeys

---
 osu.Game/Screens/Select/FooterButton.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 35970cd960..a8393a81d4 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -12,10 +12,12 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.Containers;
+using osu.Game.Input.Bindings;
+using osu.Framework.Input.Bindings;
 
 namespace osu.Game.Screens.Select
 {
-    public class FooterButton : OsuClickableContainer
+    public class FooterButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
     {
         public const float SHEAR_WIDTH = 7.5f;
 
@@ -117,7 +119,7 @@ namespace osu.Game.Screens.Select
 
         public Action Hovered;
         public Action HoverLost;
-        public Key? Hotkey;
+        public GlobalAction? Hotkey;
 
         protected override void UpdateAfterChildren()
         {
@@ -167,15 +169,19 @@ namespace osu.Game.Screens.Select
             return base.OnClick(e);
         }
 
-        protected override bool OnKeyDown(KeyDownEvent e)
+        public virtual bool OnPressed(GlobalAction action)
         {
-            if (!e.Repeat && e.Key == Hotkey)
+            if (action == Hotkey)
             {
                 Click();
                 return true;
             }
+            return false;
+        }
 
-            return base.OnKeyDown(e);
+        public virtual void OnReleased(GlobalAction action)
+        {
+            
         }
     }
 }

From 18db31b50435802cac5b2c0437c293c611999575 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 15:25:05 +1200
Subject: [PATCH 03097/10326] Update FooterButtonMods to comply with the
 changes in FooterButton

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

diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index 02333da0dc..cde8113fa9 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -14,11 +14,12 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
-using osuTK.Input;
+using osu.Framework.Input.Bindings;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select
 {
-    public class FooterButtonMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
+    public class FooterButtonMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>, IKeyBindingHandler<GlobalAction>
     {
         public Bindable<IReadOnlyList<Mod>> Current
         {
@@ -57,7 +58,7 @@ namespace osu.Game.Screens.Select
             lowMultiplierColour = colours.Red;
             highMultiplierColour = colours.Green;
             Text = @"mods";
-            Hotkey = Key.F1;
+            Hotkey = GlobalAction.ToggleModSelection;
         }
 
         protected override void LoadComplete()

From 05e4499bc11890090477cbe8d027996399a9c60a Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 15:25:18 +1200
Subject: [PATCH 03098/10326] Update FooterButtonOptions to comply with the
 changes in FooterButton

---
 osu.Game/Screens/Select/FooterButtonOptions.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonOptions.cs b/osu.Game/Screens/Select/FooterButtonOptions.cs
index c000d8a8c8..e549656785 100644
--- a/osu.Game/Screens/Select/FooterButtonOptions.cs
+++ b/osu.Game/Screens/Select/FooterButtonOptions.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Graphics;
-using osuTK.Input;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select
 {
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Select
             SelectedColour = colours.Blue;
             DeselectedColour = SelectedColour.Opacity(0.5f);
             Text = @"options";
-            Hotkey = Key.F3;
+            Hotkey = GlobalAction.ToggleBeatmapOptions;
         }
     }
 }

From 568503ef991981f190e17f86d742d80082441560 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:07:50 +1200
Subject: [PATCH 03099/10326] Update FooterButtonRandom to comply with the
 changes in FooterButton FooterButtonRandom now has 2 Action variables, one
 for both primary and secondary

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 52 +++++++++++++------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index a42e6721db..728105200e 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -1,19 +1,22 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osuTK.Input;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select
 {
     public class FooterButtonRandom : FooterButton
     {
+        public Action PrimaryAction { get; set; }
+        public Action SecondaryAction { get; set; }
+
         private readonly SpriteText secondaryText;
         private bool secondaryActive;
 
@@ -37,21 +40,7 @@ namespace osu.Game.Screens.Select
             SelectedColour = colours.Green;
             DeselectedColour = SelectedColour.Opacity(0.5f);
             Text = @"random";
-            Hotkey = Key.F2;
-        }
-
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            secondaryActive = e.ShiftPressed;
-            updateText();
-            return base.OnKeyDown(e);
-        }
-
-        protected override void OnKeyUp(KeyUpEvent e)
-        {
-            secondaryActive = e.ShiftPressed;
-            updateText();
-            base.OnKeyUp(e);
+            Hotkey = GlobalAction.SelectNextRandom;
         }
 
         private void updateText()
@@ -67,5 +56,34 @@ namespace osu.Game.Screens.Select
                 secondaryText.FadeOut(120, Easing.InQuad);
             }
         }
+
+        public override bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.SelectPreviousRandom:
+                    secondaryActive = true;
+                    Action = SecondaryAction;
+                    updateText();
+                    Click();
+                    return true;
+                case GlobalAction.SelectNextRandom:
+                    Action = PrimaryAction;
+                    updateText();
+                    Click();
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        public override void OnReleased(GlobalAction action)
+        {
+            if (action == GlobalAction.SelectPreviousRandom)
+            {
+                secondaryActive = false;
+                updateText();
+            }
+        }
     }
 }

From aa08847bc9fb73b9f1c77dcb711726ef5abfe5e9 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:08:16 +1200
Subject: [PATCH 03100/10326] Set FooterButtonRandom actions properly when
 creating the button

---
 osu.Game/Screens/Select/SongSelect.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d613b0ae8d..e22c055047 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -272,7 +272,7 @@ namespace osu.Game.Screens.Select
             if (Footer != null)
             {
                 Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
-                Footer.AddButton(new FooterButtonRandom { Action = triggerRandom });
+                Footer.AddButton(new FooterButtonRandom { PrimaryAction = triggerNextRandom, SecondaryAction = triggerPreviousRandom });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null, Key.Number1);
@@ -496,12 +496,14 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private void triggerRandom()
+        private void triggerNextRandom()
         {
-            if (GetContainingInputManager().CurrentState.Keyboard.ShiftPressed)
-                Carousel.SelectPreviousRandom();
-            else
-                Carousel.SelectNextRandom();
+            Carousel.SelectNextRandom();
+        }
+
+        private void triggerPreviousRandom()
+        {
+            Carousel.SelectPreviousRandom();
         }
 
         public override void OnEntering(IScreen last)

From aeb736e9d2a78d7b913a6acfc35c2494fa0e2acd Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:13:50 +1200
Subject: [PATCH 03101/10326] Fix CodeFactor code style issues

---
 osu.Game/Screens/Select/FooterButton.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index a8393a81d4..6006d3cbfd 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -179,9 +179,6 @@ namespace osu.Game.Screens.Select
             return false;
         }
 
-        public virtual void OnReleased(GlobalAction action)
-        {
-            
-        }
+        public virtual void OnReleased(GlobalAction action) { }
     }
 }

From eb242085c689249663a938e171c5473b33139b18 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:24:32 +1200
Subject: [PATCH 03102/10326] Remove redundant interface from FooterButtonMods

---
 osu.Game/Screens/Select/FooterButtonMods.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index cde8113fa9..b98b48a0c0 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -14,12 +14,11 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Input.Bindings;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select
 {
-    public class FooterButtonMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>, IKeyBindingHandler<GlobalAction>
+    public class FooterButtonMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
     {
         public Bindable<IReadOnlyList<Mod>> Current
         {

From 7141bed78d2d5e9004a10a7cf92cd0b1f0cdf049 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:40:16 +1200
Subject: [PATCH 03103/10326] Remove redundant directive from FooterButton

---
 osu.Game/Screens/Select/FooterButton.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 6006d3cbfd..6ea519fb80 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -4,7 +4,6 @@
 using System;
 using osuTK;
 using osuTK.Graphics;
-using osuTK.Input;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;

From a78a8c0d0d4bd567aef4b3263edcde776d7fe743 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:59:04 +1200
Subject: [PATCH 03104/10326] Add missing blank lines

---
 osu.Game/Screens/Select/FooterButton.cs       | 1 +
 osu.Game/Screens/Select/FooterButtonRandom.cs | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 6ea519fb80..0502546de8 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -175,6 +175,7 @@ namespace osu.Game.Screens.Select
                 Click();
                 return true;
             }
+
             return false;
         }
 
diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 728105200e..fdb1159484 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -67,11 +67,13 @@ namespace osu.Game.Screens.Select
                     updateText();
                     Click();
                     return true;
+
                 case GlobalAction.SelectNextRandom:
                     Action = PrimaryAction;
                     updateText();
                     Click();
                     return true;
+
                 default:
                     return false;
             }

From 9920911390833ffb35fddffaaa62803ebf92ecd1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jun 2020 17:20:08 +0900
Subject: [PATCH 03105/10326] Fix tournament displayed beatmap potentially
 being out of order on quick changes

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 53ba597a7e..de4d482d13 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Tournament.IPC
 
         private int lastBeatmapId;
         private ScheduledDelegate scheduled;
+        private GetBeatmapRequest beatmapLookupRequest;
 
         public Storage Storage { get; private set; }
 
@@ -77,6 +78,8 @@ namespace osu.Game.Tournament.IPC
 
                                 if (lastBeatmapId != beatmapId)
                                 {
+                                    beatmapLookupRequest?.Cancel();
+
                                     lastBeatmapId = beatmapId;
 
                                     var existing = ladder.CurrentMatch.Value?.Round.Value?.Beatmaps.FirstOrDefault(b => b.ID == beatmapId && b.BeatmapInfo != null);
@@ -85,9 +88,9 @@ namespace osu.Game.Tournament.IPC
                                         Beatmap.Value = existing.BeatmapInfo;
                                     else
                                     {
-                                        var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = beatmapId });
-                                        req.Success += b => Beatmap.Value = b.ToBeatmap(Rulesets);
-                                        API.Queue(req);
+                                        beatmapLookupRequest = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = beatmapId });
+                                        beatmapLookupRequest.Success += b => Beatmap.Value = b.ToBeatmap(Rulesets);
+                                        API.Queue(beatmapLookupRequest);
                                     }
                                 }
 

From bd3e40a8cfd6c103d05f399db4186cfc1c6339b7 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 20:57:24 +1200
Subject: [PATCH 03106/10326] Move default return out of switch/case

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index fdb1159484..e2e5c63740 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -73,10 +73,9 @@ namespace osu.Game.Screens.Select
                     updateText();
                     Click();
                     return true;
-
-                default:
-                    return false;
             }
+
+            return false;
         }
 
         public override void OnReleased(GlobalAction action)

From df148cf9d1ffe5fbb9ed6caf3dd4727b215b971e Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 20:58:19 +1200
Subject: [PATCH 03107/10326] Rename secondaryAction to rewindSearch

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index e2e5c63740..e239211c04 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Select
         public Action SecondaryAction { get; set; }
 
         private readonly SpriteText secondaryText;
-        private bool secondaryActive;
+        private bool rewindSearch;
 
         public FooterButtonRandom()
         {
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Select
 
         private void updateText()
         {
-            if (secondaryActive)
+            if (rewindSearch)
             {
                 SpriteText.FadeOut(120, Easing.InQuad);
                 secondaryText.FadeIn(120, Easing.InQuad);
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Select
             switch (action)
             {
                 case GlobalAction.SelectPreviousRandom:
-                    secondaryActive = true;
+                    rewindSearch = true;
                     Action = SecondaryAction;
                     updateText();
                     Click();
@@ -82,7 +82,7 @@ namespace osu.Game.Screens.Select
         {
             if (action == GlobalAction.SelectPreviousRandom)
             {
-                secondaryActive = false;
+                rewindSearch = false;
                 updateText();
             }
         }

From 62984cb7f5da4380939200833cccfe06b4128816 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 20:58:53 +1200
Subject: [PATCH 03108/10326] Remove unused Hotkey assignment

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index e239211c04..1c3c699a2d 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Screens.Select
             SelectedColour = colours.Green;
             DeselectedColour = SelectedColour.Opacity(0.5f);
             Text = @"random";
-            Hotkey = GlobalAction.SelectNextRandom;
         }
 
         private void updateText()

From 8533d7573dbc1d468cadc4aa82ecc58ab0631c56 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 21:00:29 +1200
Subject: [PATCH 03109/10326] Rename FooterButtonRandom actions to better
 describe what they are used for

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 8 ++++----
 osu.Game/Screens/Select/SongSelect.cs         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 1c3c699a2d..9316d4e064 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Screens.Select
 {
     public class FooterButtonRandom : FooterButton
     {
-        public Action PrimaryAction { get; set; }
-        public Action SecondaryAction { get; set; }
+        public Action NextRandom { get; set; }
+        public Action PreviousRandom { get; set; }
 
         private readonly SpriteText secondaryText;
         private bool rewindSearch;
@@ -62,13 +62,13 @@ namespace osu.Game.Screens.Select
             {
                 case GlobalAction.SelectPreviousRandom:
                     rewindSearch = true;
-                    Action = SecondaryAction;
+                    Action = PreviousRandom;
                     updateText();
                     Click();
                     return true;
 
                 case GlobalAction.SelectNextRandom:
-                    Action = PrimaryAction;
+                    Action = NextRandom;
                     updateText();
                     Click();
                     return true;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index e22c055047..70034780d1 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -272,7 +272,7 @@ namespace osu.Game.Screens.Select
             if (Footer != null)
             {
                 Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
-                Footer.AddButton(new FooterButtonRandom { PrimaryAction = triggerNextRandom, SecondaryAction = triggerPreviousRandom });
+                Footer.AddButton(new FooterButtonRandom { NextRandom = triggerNextRandom, PreviousRandom = triggerPreviousRandom });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null, Key.Number1);

From cab132673aa226f77039311a005e0ac69379fb08 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 21:03:10 +1200
Subject: [PATCH 03110/10326] Break FooterButtonRandom creation into multiple
 lines

---
 osu.Game/Screens/Select/SongSelect.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 70034780d1..fdec0395bd 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -272,7 +272,11 @@ namespace osu.Game.Screens.Select
             if (Footer != null)
             {
                 Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
-                Footer.AddButton(new FooterButtonRandom { NextRandom = triggerNextRandom, PreviousRandom = triggerPreviousRandom });
+                Footer.AddButton(new FooterButtonRandom
+                {
+                    NextRandom = triggerNextRandom,
+                    PreviousRandom = triggerPreviousRandom
+                });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null, Key.Number1);

From cb6e4739107892079b84987a0322c2a5ba963a76 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 21:08:07 +1200
Subject: [PATCH 03111/10326] Remove triggerPreviousRandom from SongSelect

---
 osu.Game/Screens/Select/SongSelect.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index fdec0395bd..453ecd2b4e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -275,7 +275,7 @@ namespace osu.Game.Screens.Select
                 Footer.AddButton(new FooterButtonRandom
                 {
                     NextRandom = triggerNextRandom,
-                    PreviousRandom = triggerPreviousRandom
+                    PreviousRandom = Carousel.SelectPreviousRandom
                 });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
@@ -505,11 +505,6 @@ namespace osu.Game.Screens.Select
             Carousel.SelectNextRandom();
         }
 
-        private void triggerPreviousRandom()
-        {
-            Carousel.SelectPreviousRandom();
-        }
-
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);

From a40475e6aa95b2585e6d811824d5690fec21830a Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 21:09:47 +1200
Subject: [PATCH 03112/10326] Remove triggerNextRandom from SongSelect

---
 osu.Game/Screens/Select/SongSelect.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 453ecd2b4e..6ca53bcfa9 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -274,7 +274,7 @@ namespace osu.Game.Screens.Select
                 Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
                 Footer.AddButton(new FooterButtonRandom
                 {
-                    NextRandom = triggerNextRandom,
+                    NextRandom = () => Carousel.SelectNextRandom(),
                     PreviousRandom = Carousel.SelectPreviousRandom
                 });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
@@ -500,11 +500,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private void triggerNextRandom()
-        {
-            Carousel.SelectNextRandom();
-        }
-
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);

From 5d7bb8cb4e9e44eeb8a504f7d8e43f9046003aca Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 4 Jun 2020 21:33:38 +0900
Subject: [PATCH 03113/10326] Change format of date on 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 fd8ac33aef..81d5d113ae 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
-                        Text = $"Played on {score.Date.ToLocalTime():g}"
+                        Text = $"Played on {score.Date.ToLocalTime():d MMMM yyyy HH:mm}"
                     }
                 }
             };

From afcefe01bf74177240c59e70b3ea2b87745a4223 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 4 Jun 2020 21:48:55 +0900
Subject: [PATCH 03114/10326] Fix score panel not receiving input in some
 places

---
 osu.Game/Screens/Ranking/ScorePanel.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index a99b48e8f0..65fb901c89 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -243,5 +243,10 @@ namespace osu.Game.Screens.Ranking
 
             return true;
         }
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
+            => base.ReceivePositionalInputAt(screenSpacePos)
+               || topLayerContainer.ReceivePositionalInputAt(screenSpacePos)
+               || middleLayerContainer.ReceivePositionalInputAt(screenSpacePos);
     }
 }

From 9c1542f8979637fcea83b327b5252f2fae8933a1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 4 Jun 2020 22:17:00 +0900
Subject: [PATCH 03115/10326] Fix crash when pressing clear button twice

---
 .../Settings/TestSceneKeyBindingPanel.cs      | 45 ++++++++++++++++++-
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs |  5 ++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 745820696a..3d335995ac 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -1,13 +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.Diagnostics;
+using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Framework.Threading;
 using osu.Game.Overlays;
+using osu.Game.Overlays.KeyBinding;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Settings
 {
     [TestFixture]
-    public class TestSceneKeyBindingPanel : OsuTestScene
+    public class TestSceneKeyBindingPanel : OsuManualInputManagerTestScene
     {
         private readonly KeyBindingPanel panel;
 
@@ -21,5 +27,42 @@ namespace osu.Game.Tests.Visual.Settings
             base.LoadComplete();
             panel.Show();
         }
+
+        [Test]
+        public void TestClickTwiceOnClearButton()
+        {
+            KeyBindingRow firstRow = null;
+
+            AddStep("click first row", () =>
+            {
+                firstRow = panel.ChildrenOfType<KeyBindingRow>().First();
+                InputManager.MoveMouseTo(firstRow);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("schedule button clicks", () =>
+            {
+                var clearButton = firstRow.ChildrenOfType<KeyBindingRow.ClearButton>().Single();
+
+                InputManager.MoveMouseTo(clearButton);
+
+                int buttonClicks = 0;
+                ScheduledDelegate clickDelegate = null;
+
+                clickDelegate = Scheduler.AddDelayed(() =>
+                {
+                    InputManager.PressButton(MouseButton.Left);
+                    InputManager.ReleaseButton(MouseButton.Left);
+
+                    if (++buttonClicks == 2)
+                    {
+                        // ReSharper disable once AccessToModifiedClosure
+                        Debug.Assert(clickDelegate != null);
+                        // ReSharper disable once AccessToModifiedClosure
+                        clickDelegate.Cancel();
+                    }
+                }, 0, true);
+            });
+        }
     }
 }
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 01d5991d3e..eafb4572ca 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -274,6 +274,9 @@ namespace osu.Game.Overlays.KeyBinding
 
         private void clear()
         {
+            if (bindTarget == null)
+                return;
+
             bindTarget.UpdateKeyCombination(InputKey.None);
             finalise();
         }
@@ -333,7 +336,7 @@ namespace osu.Game.Overlays.KeyBinding
             }
         }
 
-        private class ClearButton : TriangleButton
+        public class ClearButton : TriangleButton
         {
             public ClearButton()
             {

From 6b88141e58b6d3863b1aeb9db41d39225cd00bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 Jun 2020 21:30:59 +0200
Subject: [PATCH 03116/10326] Add mania sample conversion test

---
 .../ManiaBeatmapSampleConversionTest.cs       | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
new file mode 100644
index 0000000000..dbf1cf5f72
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Utils;
+using osu.Game.Audio;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Tests.Beatmaps;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class ManiaBeatmapSampleConversionTest : BeatmapConversionTest<ConvertMapping<SampleConvertValue>, SampleConvertValue>
+    {
+        protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";
+
+        public void Test(string name) => base.Test(name);
+
+        protected override IEnumerable<SampleConvertValue> CreateConvertValue(HitObject hitObject)
+        {
+            yield return new SampleConvertValue
+            {
+                StartTime = hitObject.StartTime,
+                EndTime = hitObject.GetEndTime(),
+                Column = ((ManiaHitObject)hitObject).Column,
+                NodeSamples = getSampleNames((hitObject as HoldNote)?.NodeSamples)
+            };
+        }
+
+        private IList<IList<string>> getSampleNames(List<IList<HitSampleInfo>> hitSampleInfo)
+            => hitSampleInfo?.Select(samples =>
+                                (IList<string>)samples.Select(sample => sample.LookupNames.First()).ToList())
+                            .ToList();
+
+        protected override Ruleset CreateRuleset() => new ManiaRuleset();
+    }
+
+    public struct SampleConvertValue : IEquatable<SampleConvertValue>
+    {
+        /// <summary>
+        /// A sane value to account for osu!stable using ints everywhere.
+        /// </summary>
+        private const float conversion_lenience = 2;
+
+        public double StartTime;
+        public double EndTime;
+        public int Column;
+        public IList<IList<string>> NodeSamples;
+
+        public bool Equals(SampleConvertValue other)
+            => Precision.AlmostEquals(StartTime, other.StartTime, conversion_lenience)
+               && Precision.AlmostEquals(EndTime, other.EndTime, conversion_lenience)
+               && samplesEqual(NodeSamples, other.NodeSamples);
+
+        private static bool samplesEqual(ICollection<IList<string>> first, ICollection<IList<string>> second)
+        {
+            if (first == null && second == null)
+                return true;
+
+            // both items can't be null now, so if any single one is, then they're not equal
+            if (first == null || second == null)
+                return false;
+
+            return first.Count == second.Count
+                   && first.Zip(second).All(samples => samples.First.SequenceEqual(samples.Second));
+        }
+    }
+}

From 35544ede50069851ff7cfa0fecdf141fe94345db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 Jun 2020 21:54:19 +0200
Subject: [PATCH 03117/10326] Add failing test cases

---
 .../ManiaBeatmapSampleConversionTest.cs       |  2 ++
 .../convert-samples-expected-conversion.json  | 30 +++++++++++++++++++
 .../Testing/Beatmaps/convert-samples.osu      | 16 ++++++++++
 .../mania-samples-expected-conversion.json    | 25 ++++++++++++++++
 .../Testing/Beatmaps/mania-samples.osu        | 19 ++++++++++++
 5 files changed, 92 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples.osu
 create mode 100644 osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples.osu

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
index dbf1cf5f72..2f6918d263 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Mania.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";
 
+        [TestCase("convert-samples")]
+        [TestCase("mania-samples")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<SampleConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
new file mode 100644
index 0000000000..b8ce85eef5
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
@@ -0,0 +1,30 @@
+{
+  "Mappings": [{
+    "StartTime": 1000.0,
+    "Objects": [{
+      "StartTime": 1000.0,
+      "EndTime": 2750.0,
+      "Column": 1,
+      "NodeSamples": [
+        ["normal-hitnormal"],
+        ["soft-hitnormal"],
+        ["drum-hitnormal"]
+      ]
+    }, {
+      "StartTime": 1875.0,
+      "EndTime": 2750.0,
+      "Column": 0,
+      "NodeSamples": [
+        ["soft-hitnormal"],
+        ["drum-hitnormal"]
+      ]
+    }]
+  }, {
+    "StartTime": 3750.0,
+    "Objects": [{
+      "StartTime": 3750.0,
+      "EndTime": 3750.0,
+      "Column": 3
+    }]
+  }]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples.osu b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples.osu
new file mode 100644
index 0000000000..16b73992d2
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples.osu
@@ -0,0 +1,16 @@
+osu file format v14
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:5
+OverallDifficulty:5
+ApproachRate:5
+SliderMultiplier:1.4
+SliderTickRate:1
+
+[TimingPoints]
+0,500,4,1,0,100,1,0
+
+[HitObjects]
+88,99,1000,6,0,L|306:259,2,245,0|0|0,1:0|2:0|3:0,0:0:0:0:
+259,118,3750,1,0,0:0:0:0:
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
new file mode 100644
index 0000000000..e22540614d
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
@@ -0,0 +1,25 @@
+{
+  "Mappings": [{
+    "StartTime": 500.0,
+    "Objects": [{
+      "StartTime": 500.0,
+      "EndTime": 1500.0,
+      "Column": 0,
+      "NodeSamples": [
+        ["normal-hitnormal"],
+        []
+      ]
+    }]
+  }, {
+    "StartTime": 2000.0,
+    "Objects": [{
+      "StartTime": 2000.0,
+      "EndTime": 3000.0,
+      "Column": 2,
+      "NodeSamples": [
+        ["drum-hitnormal"],
+        []
+      ]
+    }]
+  }]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples.osu b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples.osu
new file mode 100644
index 0000000000..7c75b45e5f
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples.osu
@@ -0,0 +1,19 @@
+osu file format v14
+
+[General]
+Mode: 3
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:5
+OverallDifficulty:5
+ApproachRate:5
+SliderMultiplier:1.4
+SliderTickRate:1
+
+[TimingPoints]
+0,500,4,1,0,100,1,0
+
+[HitObjects]
+51,192,500,128,0,1500:1:0:0:0:
+256,192,2000,128,0,3000:3:0:0:0:

From ac019bddd61b798f86c0f9e545a5d1e45de5a746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 Jun 2020 22:28:55 +0200
Subject: [PATCH 03118/10326] Only play samples at start of hold note in mania
 maps

---
 .../Beatmaps/ManiaBeatmapConverter.cs               | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 32abf5e7f9..b025ac7992 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -6,6 +6,7 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 using osu.Framework.Utils;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -239,7 +240,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                         Duration = endTimeData.Duration,
                         Column = column,
                         Samples = HitObject.Samples,
-                        NodeSamples = (HitObject as IHasRepeats)?.NodeSamples
+                        NodeSamples = (HitObject as IHasRepeats)?.NodeSamples ?? defaultNodeSamples
                     });
                 }
                 else if (HitObject is IHasXPosition)
@@ -254,6 +255,16 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                 return pattern;
             }
+
+            /// <remarks>
+            /// osu!mania-specific beatmaps in stable only play samples at the start of the hold note.
+            /// </remarks>
+            private List<IList<HitSampleInfo>> defaultNodeSamples
+                => new List<IList<HitSampleInfo>>
+                {
+                    HitObject.Samples,
+                    new List<HitSampleInfo>()
+                };
         }
     }
 }

From c4cae006aa800e78f29b46dfcdccda0220838a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 Jun 2020 22:47:14 +0200
Subject: [PATCH 03119/10326] Correctly slice node sample list when converting

---
 .../Legacy/DistanceObjectPatternGenerator.cs       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 1bd796511b..b49b881656 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -472,15 +472,21 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// </summary>
         /// <param name="time">The time to retrieve the sample info list from.</param>
         /// <returns></returns>
-        private IList<HitSampleInfo> sampleInfoListAt(double time)
+        private IList<HitSampleInfo> sampleInfoListAt(double time) => nodeSamplesAt(time)?.First() ?? HitObject.Samples;
+
+        /// <summary>
+        /// Retrieves the list of node samples that occur at time greater than or equal to <paramref name="time"/>.
+        /// </summary>
+        /// <param name="time">The time to retrieve node samples at.</param>
+        private IEnumerable<IList<HitSampleInfo>> nodeSamplesAt(double time)
         {
             if (!(HitObject is IHasPathWithRepeats curveData))
-                return HitObject.Samples;
+                return null;
 
             double segmentTime = (EndTime - HitObject.StartTime) / spanCount;
 
             int index = (int)(segmentTime == 0 ? 0 : (time - HitObject.StartTime) / segmentTime);
-            return curveData.NodeSamples[index];
+            return curveData.NodeSamples.Skip(index);
         }
 
         /// <summary>
@@ -511,7 +517,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     Duration = endTime - startTime,
                     Column = column,
                     Samples = HitObject.Samples,
-                    NodeSamples = (HitObject as IHasRepeats)?.NodeSamples
+                    NodeSamples = nodeSamplesAt(startTime)?.ToList()
                 };
             }
 

From 4c6116e6e7c9aa1300430954ef4e6cbcc793f39b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 Jun 2020 23:50:58 +0200
Subject: [PATCH 03120/10326] Fix compilation failure in Android test project

---
 .../ManiaBeatmapSampleConversionTest.cs              | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
index 2f6918d263..d8f87195d1 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
@@ -58,17 +58,19 @@ namespace osu.Game.Rulesets.Mania.Tests
                && Precision.AlmostEquals(EndTime, other.EndTime, conversion_lenience)
                && samplesEqual(NodeSamples, other.NodeSamples);
 
-        private static bool samplesEqual(ICollection<IList<string>> first, ICollection<IList<string>> second)
+        private static bool samplesEqual(ICollection<IList<string>> firstSampleList, ICollection<IList<string>> secondSampleList)
         {
-            if (first == null && second == null)
+            if (firstSampleList == null && secondSampleList == null)
                 return true;
 
             // both items can't be null now, so if any single one is, then they're not equal
-            if (first == null || second == null)
+            if (firstSampleList == null || secondSampleList == null)
                 return false;
 
-            return first.Count == second.Count
-                   && first.Zip(second).All(samples => samples.First.SequenceEqual(samples.Second));
+            return firstSampleList.Count == secondSampleList.Count
+                   // cannot use .Zip() without the selector function as it doesn't compile in android test project
+                   && firstSampleList.Zip(secondSampleList, (first, second) => (first, second))
+                                     .All(samples => samples.first.SequenceEqual(samples.second));
         }
     }
 }

From 896177801a57e0bd2161309d05775be4d0d087bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 5 Jun 2020 00:07:27 +0200
Subject: [PATCH 03121/10326] Avoid creating copies of node samples every time

---
 .../Patterns/Legacy/DistanceObjectPatternGenerator.cs     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index b49b881656..9fbdf58e21 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -478,7 +478,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// Retrieves the list of node samples that occur at time greater than or equal to <paramref name="time"/>.
         /// </summary>
         /// <param name="time">The time to retrieve node samples at.</param>
-        private IEnumerable<IList<HitSampleInfo>> nodeSamplesAt(double time)
+        private List<IList<HitSampleInfo>> nodeSamplesAt(double time)
         {
             if (!(HitObject is IHasPathWithRepeats curveData))
                 return null;
@@ -486,7 +486,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             double segmentTime = (EndTime - HitObject.StartTime) / spanCount;
 
             int index = (int)(segmentTime == 0 ? 0 : (time - HitObject.StartTime) / segmentTime);
-            return curveData.NodeSamples.Skip(index);
+
+            // avoid slicing the list & creating copies, if at all possible.
+            return index == 0 ? curveData.NodeSamples : curveData.NodeSamples.Skip(index).ToList();
         }
 
         /// <summary>
@@ -517,7 +519,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     Duration = endTime - startTime,
                     Column = column,
                     Samples = HitObject.Samples,
-                    NodeSamples = nodeSamplesAt(startTime)?.ToList()
+                    NodeSamples = nodeSamplesAt(startTime)
                 };
             }
 

From c6c88a901ceaab95cab924c42b82e9723a601c30 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 5 Jun 2020 06:42:46 +0300
Subject: [PATCH 03122/10326] Add text box sample playback logic in OsuTextBox

Moved from osu!framework.
---
 osu.Game/Graphics/UserInterface/OsuTextBox.cs | 57 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 6f440d8138..f749326b0e 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -1,7 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
@@ -11,6 +14,7 @@ using osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -19,6 +23,18 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTextBox : BasicTextBox
     {
+        private readonly SampleChannel[] textAddedSamples = new SampleChannel[4];
+        private SampleChannel capsTextAddedSample;
+        private SampleChannel textRemovedSample;
+        private SampleChannel textCommittedSample;
+        private SampleChannel caretMovedSample;
+
+        /// <summary>
+        /// Whether to allow playing a different sample when inserting upper case text.
+        /// If set to false, same sample will be played for both letter cases.
+        /// </summary>
+        protected virtual bool AllowUpperCaseSamples => true;
+
         protected override float LeftRightPadding => 10;
 
         protected override float CaretWidth => 3;
@@ -41,15 +57,54 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colour)
+        private void load(OsuColour colour, AudioManager audio)
         {
             BackgroundUnfocused = Color4.Black.Opacity(0.5f);
             BackgroundFocused = OsuColour.Gray(0.3f).Opacity(0.8f);
             BackgroundCommit = BorderColour = colour.Yellow;
+
+            for (int i = 0; i < textAddedSamples.Length; i++)
+                textAddedSamples[i] = audio.Samples.Get($@"Keyboard/key-press-{1 + i}");
+
+            capsTextAddedSample = audio.Samples.Get(@"Keyboard/key-caps");
+            textRemovedSample = audio.Samples.Get(@"Keyboard/key-delete");
+            textCommittedSample = audio.Samples.Get(@"Keyboard/key-confirm");
+            caretMovedSample = audio.Samples.Get(@"Keyboard/key-movement");
         }
 
         protected override Color4 SelectionColour => new Color4(249, 90, 255, 255);
 
+        protected override void OnTextAdded(string added)
+        {
+            base.OnTextAdded(added);
+
+            if (added.Any(char.IsUpper) && AllowUpperCaseSamples)
+                capsTextAddedSample?.Play();
+            else
+                textAddedSamples[RNG.Next(0, 3)]?.Play();
+        }
+
+        protected override void OnTextRemoved(string removed)
+        {
+            base.OnTextRemoved(removed);
+
+            textRemovedSample?.Play();
+        }
+
+        protected override void OnTextCommitted(bool textChanged)
+        {
+            base.OnTextCommitted(textChanged);
+
+            textCommittedSample?.Play();
+        }
+
+        protected override void OnCaretMoved(bool selecting)
+        {
+            base.OnCaretMoved(selecting);
+
+            caretMovedSample?.Play();
+        }
+
         protected override void OnFocus(FocusEvent e)
         {
             BorderThickness = 3;

From 178bbf16d180483397555d5d2137194deaa31fea Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 5 Jun 2020 06:44:41 +0300
Subject: [PATCH 03123/10326] Fix password text boxes having distinguishable
 key sounds

Closes https://github.com/ppy/osu-framework/issues/3280
---
 osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index 0c82a869f8..11867cf103 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Graphics.UserInterface
             Child = new PasswordMaskChar(CalculatedTextSize),
         };
 
+        protected override bool AllowUpperCaseSamples => false;
+
         protected override bool AllowClipboardExport => false;
 
         private readonly CapsWarning warning;

From 495f89ddaebdb30558b571dd20346dce9ef04245 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 5 Jun 2020 06:45:42 +0300
Subject: [PATCH 03124/10326] Expand number text box test scene to one holding
 all OsuTextBox's types

---
 .../UserInterface/TestSceneNumberBox.cs       | 48 -----------
 .../UserInterface/TestSceneOsuTextBox.cs      | 80 +++++++++++++++++++
 2 files changed, 80 insertions(+), 48 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneNumberBox.cs
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneOsuTextBox.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNumberBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNumberBox.cs
deleted file mode 100644
index 97a3f62b2d..0000000000
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNumberBox.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    [TestFixture]
-    public class TestSceneNumberBox : OsuTestScene
-    {
-        private OsuNumberBox numberBox;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Child = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.X,
-                Padding = new MarginPadding { Horizontal = 250 },
-                Child = numberBox = new OsuNumberBox
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.X,
-                    PlaceholderText = "Insert numbers here"
-                }
-            };
-
-            clearInput();
-            AddStep("enter numbers", () => numberBox.Text = "987654321");
-            expectedValue("987654321");
-            clearInput();
-            AddStep("enter text + single number", () => numberBox.Text = "1 hello 2 world 3");
-            expectedValue("123");
-            clearInput();
-        }
-
-        private void clearInput() => AddStep("clear input", () => numberBox.Text = null);
-
-        private void expectedValue(string value) => AddAssert("expect number", () => numberBox.Text == value);
-    }
-}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuTextBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuTextBox.cs
new file mode 100644
index 0000000000..756928d3ec
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuTextBox.cs
@@ -0,0 +1,80 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneOsuTextBox : OsuTestScene
+    {
+        private readonly OsuNumberBox numberBox;
+
+        public TestSceneOsuTextBox()
+        {
+            Child = new Container
+            {
+                Masking = true,
+                CornerRadius = 10f,
+                AutoSizeAxes = Axes.Both,
+                Padding = new MarginPadding(15f),
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.DarkSlateGray,
+                        Alpha = 0.75f,
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding(50f),
+                        Spacing = new Vector2(0f, 50f),
+                        Children = new[]
+                        {
+                            new OsuTextBox
+                            {
+                                Width = 500f,
+                                PlaceholderText = "Normal textbox",
+                            },
+                            new OsuPasswordTextBox
+                            {
+                                Width = 500f,
+                                PlaceholderText = "Password textbox",
+                            },
+                            numberBox = new OsuNumberBox
+                            {
+                                Width = 500f,
+                                PlaceholderText = "Number textbox"
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [Test]
+        public void TestNumberBox()
+        {
+            clearTextbox(numberBox);
+            AddStep("enter numbers", () => numberBox.Text = "987654321");
+            expectedValue(numberBox, "987654321");
+
+            clearTextbox(numberBox);
+            AddStep("enter text + single number", () => numberBox.Text = "1 hello 2 world 3");
+            expectedValue(numberBox, "123");
+
+            clearTextbox(numberBox);
+        }
+
+        private void clearTextbox(OsuTextBox textBox) => AddStep("clear textbox", () => textBox.Text = null);
+        private void expectedValue(OsuTextBox textBox, string value) => AddAssert("expected textbox value", () => textBox.Text == value);
+    }
+}

From 0107e9ba16deb94cd8f04c5dcf36b7ca2a781adc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Jun 2020 19:18:00 +0900
Subject: [PATCH 03125/10326] Change lookups to use SingleOrDefault()

---
 osu.Game/Beatmaps/BeatmapManager.cs                | 2 +-
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 668ac6ee10..1f92d5461f 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Beatmaps
 
             foreach (var info in item.Beatmaps)
             {
-                var file = item.Files.FirstOrDefault(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+                var file = item.Files.SingleOrDefault(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
 
                 using (var stream = Files.Store.GetStream(file))
                     info.MD5Hash = stream.ComputeMD5Hash();
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index e62a9bb39d..39c5ccab27 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            private string getPathForFile(string filename) => BeatmapSetInfo.Files.FirstOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+            private string getPathForFile(string filename) => BeatmapSetInfo.Files.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
 
             private TextureStore textureStore;
 

From bb89114b70eb820096ae3dc1b371c0d3ce8c05c7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Jun 2020 20:52:27 +0900
Subject: [PATCH 03126/10326] Show a loading spinner on multiplayer lounge
 loads

---
 .../TestSceneLoungeRoomsContainer.cs          |  3 ++
 .../TestSceneMatchSettingsOverlay.cs          |  2 ++
 .../Multiplayer/TestSceneMatchSubScreen.cs    |  2 ++
 osu.Game/Screens/Multi/IRoomManager.cs        |  5 +++
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   | 33 +++++++++++++++++--
 osu.Game/Screens/Multi/RoomManager.cs         | 14 +++++++-
 6 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index 77b41c89b0..83f2297bd2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -141,6 +141,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             }
 
             public readonly BindableList<Room> Rooms = new BindableList<Room>();
+
+            public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
+
             IBindableList<Room> IRoomManager.Rooms => Rooms;
 
             public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room);
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 34c6940552..fdc20dc477 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -133,6 +133,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 remove { }
             }
 
+            public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
+
             public IBindableList<Room> Rooms { get; } = null;
 
             public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index d678d5a814..9d0c159549 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -93,6 +93,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 remove => throw new NotImplementedException();
             }
 
+            public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
+
             public IBindableList<Room> Rooms { get; } = new BindableList<Room>();
 
             public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs
index f6c979851e..bf75843c3e 100644
--- a/osu.Game/Screens/Multi/IRoomManager.cs
+++ b/osu.Game/Screens/Multi/IRoomManager.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Screens.Multi
         /// </summary>
         event Action RoomsUpdated;
 
+        /// <summary>
+        /// Whether an initial listing of rooms has been received.
+        /// </summary>
+        Bindable<bool> InitialRoomsReceived { get; }
+
         /// <summary>
         /// All the active <see cref="Room"/>s.
         /// </summary>
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 7c10f0f975..d4b6a3b79f 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -22,12 +22,16 @@ namespace osu.Game.Screens.Multi.Lounge
 
         protected readonly FilterControl Filter;
 
+        private readonly Bindable<bool> initialRoomsReceived = new Bindable<bool>();
+
         private readonly Container content;
         private readonly LoadingLayer loadingLayer;
 
         [Resolved]
         private Bindable<Room> selectedRoom { get; set; }
 
+        private bool joiningRoom;
+
         public LoungeSubScreen()
         {
             SearchContainer searchContainer;
@@ -73,6 +77,14 @@ namespace osu.Game.Screens.Multi.Lounge
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            initialRoomsReceived.BindTo(RoomManager.InitialRoomsReceived);
+            initialRoomsReceived.BindValueChanged(onInitialRoomsReceivedChanged, true);
+        }
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
@@ -126,12 +138,29 @@ namespace osu.Game.Screens.Multi.Lounge
 
         private void joinRequested(Room room)
         {
-            loadingLayer.Show();
+            joiningRoom = true;
+            updateLoadingLayer();
+
             RoomManager?.JoinRoom(room, r =>
             {
                 Open(room);
+                joiningRoom = false;
+                updateLoadingLayer();
+            }, _ =>
+            {
+                joiningRoom = false;
+                updateLoadingLayer();
+            });
+        }
+
+        private void onInitialRoomsReceivedChanged(ValueChangedEvent<bool> received) => updateLoadingLayer();
+
+        private void updateLoadingLayer()
+        {
+            if (joiningRoom || !initialRoomsReceived.Value)
+                loadingLayer.Show();
+            else
                 loadingLayer.Hide();
-            }, _ => loadingLayer.Hide());
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index ad461af57f..4d6ac46c84 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Screens.Multi
         public event Action RoomsUpdated;
 
         private readonly BindableList<Room> rooms = new BindableList<Room>();
+
+        public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>();
+
         public IBindableList<Room> Rooms => rooms;
 
         public double TimeBetweenListingPolls
@@ -62,7 +65,11 @@ namespace osu.Game.Screens.Multi
 
             InternalChildren = new Drawable[]
             {
-                listingPollingComponent = new ListingPollingComponent { RoomsReceived = onListingReceived },
+                listingPollingComponent = new ListingPollingComponent
+                {
+                    InitialRoomsReceived = { BindTarget = InitialRoomsReceived },
+                    RoomsReceived = onListingReceived
+                },
                 selectionPollingComponent = new SelectionPollingComponent { RoomReceived = onSelectedRoomReceived }
             };
         }
@@ -262,6 +269,8 @@ namespace osu.Game.Screens.Multi
         {
             public Action<List<Room>> RoomsReceived;
 
+            public readonly Bindable<bool> InitialRoomsReceived = new Bindable<bool>();
+
             [Resolved]
             private IAPIProvider api { get; set; }
 
@@ -273,6 +282,8 @@ namespace osu.Game.Screens.Multi
             {
                 currentFilter.BindValueChanged(_ =>
                 {
+                    InitialRoomsReceived.Value = false;
+
                     if (IsLoaded)
                         PollImmediately();
                 });
@@ -292,6 +303,7 @@ namespace osu.Game.Screens.Multi
 
                 pollReq.Success += result =>
                 {
+                    InitialRoomsReceived.Value = true;
                     RoomsReceived?.Invoke(result);
                     tcs.SetResult(true);
                 };

From 0f78af7252a08179cce65ee47d9bbe3acbf70c00 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 6 Jun 2020 19:19:30 +0300
Subject: [PATCH 03127/10326] Remove unnecessary disabled check

I have a bad memory here, til.
---
 osu.Game/Tests/Visual/OsuTestScene.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 88bd087215..e5d5442074 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -146,8 +146,7 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
         {
-            if (!Ruleset.Disabled)
-                Ruleset.Value = rulesets.AvailableRulesets.First();
+            Ruleset.Value = rulesets.AvailableRulesets.First();
         }
 
         protected override void Dispose(bool isDisposing)

From efd5e144103cfb7a06563674f23d712017550dd2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 6 Jun 2020 19:20:06 +0300
Subject: [PATCH 03128/10326] Clarify why ruleset bindable must be set at the
 BDL of any base test scene

---
 osu.Game/Tests/Visual/PlayerTestScene.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 1e267726e0..05b1eea6b3 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load()
         {
+            // There are test scenes using current value of the ruleset bindable
+            // on their BDLs (example in TestSceneSliderSnaking's BDL)
             Ruleset.Value = ruleset.RulesetInfo;
 
             Dependencies.Cache(LocalConfig = new OsuConfigManager(LocalStorage));

From 0e155c8eb9729106891708bee5eadc63acdf0ef6 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Sun, 7 Jun 2020 15:34:19 +1200
Subject: [PATCH 03129/10326] Don't switch FooterButtonRandon Action on
 pressed. Instead, create a new Action that invokes either NextRandom or
 PreviousRandom, depending on rewindSearch

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 9316d4e064..07de29a0ea 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -40,6 +40,17 @@ namespace osu.Game.Screens.Select
             SelectedColour = colours.Green;
             DeselectedColour = SelectedColour.Opacity(0.5f);
             Text = @"random";
+            Action = () =>
+            {
+                if (rewindSearch)
+                {
+                    PreviousRandom.Invoke();
+                }
+                else
+                {
+                    NextRandom.Invoke();
+                }
+            };
         }
 
         private void updateText()
@@ -58,23 +69,14 @@ namespace osu.Game.Screens.Select
 
         public override bool OnPressed(GlobalAction action)
         {
-            switch (action)
+            rewindSearch = action == GlobalAction.SelectPreviousRandom;
+            if (action != GlobalAction.SelectNextRandom && !rewindSearch)
             {
-                case GlobalAction.SelectPreviousRandom:
-                    rewindSearch = true;
-                    Action = PreviousRandom;
-                    updateText();
-                    Click();
-                    return true;
-
-                case GlobalAction.SelectNextRandom:
-                    Action = NextRandom;
-                    updateText();
-                    Click();
-                    return true;
+                return false;
             }
-
-            return false;
+            updateText();
+            Click();
+            return true;
         }
 
         public override void OnReleased(GlobalAction action)

From 7c04e9aca4a6a302ffd601fd4e406b645387daaa Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Sun, 7 Jun 2020 15:37:19 +1200
Subject: [PATCH 03130/10326] Move new GlobalAction keybinding entries to the
 end of the class. The new keybindings shouldn't mess with existing bindings
 anymore

---
 .../Input/Bindings/GlobalActionContainer.cs   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 7257b0ce15..bdfad68a13 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -114,19 +114,6 @@ namespace osu.Game.Input.Bindings
         [Description("Toggle mute")]
         ToggleMute,
 
-        // Song select keybindings
-        [Description("Toggle mod selection overlay")]
-        ToggleModSelection,
-
-        [Description("Select a random beatmap")]
-        SelectNextRandom,
-
-        [Description("Select the last random beatmap")]
-        SelectPreviousRandom,
-
-        [Description("Toggle beatmap options overlay")]
-        ToggleBeatmapOptions,
-
         // In-Game Keybindings
         [Description("Skip cutscene")]
         SkipCutscene,
@@ -173,5 +160,18 @@ namespace osu.Game.Input.Bindings
 
         [Description("Next Selection")]
         SelectNext,
+
+        // Song select keybindings
+        [Description("Toggle mod selection overlay")]
+        ToggleModSelection,
+
+        [Description("Select a random beatmap")]
+        SelectNextRandom,
+
+        [Description("Select the last random beatmap")]
+        SelectPreviousRandom,
+
+        [Description("Toggle beatmap options overlay")]
+        ToggleBeatmapOptions,
     }
 }

From 8b7718116ded732bd062ee103dd875b8af9a6ed5 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Sun, 7 Jun 2020 16:06:18 +1200
Subject: [PATCH 03131/10326] Add missing blank lines

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 07de29a0ea..2c4dd58763 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -70,10 +70,12 @@ namespace osu.Game.Screens.Select
         public override bool OnPressed(GlobalAction action)
         {
             rewindSearch = action == GlobalAction.SelectPreviousRandom;
+
             if (action != GlobalAction.SelectNextRandom && !rewindSearch)
             {
                 return false;
             }
+
             updateText();
             Click();
             return true;

From 101604e741c70ffa92f0b10c39191d687749316b Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 8 Jun 2020 00:39:33 +0200
Subject: [PATCH 03132/10326] Redesign classes and generally improve code

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs  | 20 +++------
 .../Sections/General/UpdateSettings.cs        | 14 +++---
 osu.Game/Updater/SimpleUpdateManager.cs       | 15 +------
 osu.Game/Updater/UpdateManager.cs             | 43 +++++++++++++------
 4 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 5c553f18f4..c55917fb5f 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -22,33 +22,25 @@ namespace osu.Desktop.Updater
 {
     public class SquirrelUpdateManager : osu.Game.Updater.UpdateManager
     {
-        public override bool CanCheckForUpdate => true;
-
         private UpdateManager updateManager;
         private NotificationOverlay notificationOverlay;
-        private OsuGameBase gameBase;
 
         public Task PrepareUpdateAsync() => UpdateManager.RestartAppWhenExited();
 
         private static readonly Logger logger = Logger.GetLogger("updater");
 
         [BackgroundDependencyLoader]
-        private void load(NotificationOverlay notification, OsuGameBase game)
+        private void load(NotificationOverlay notification)
         {
-            gameBase = game;
             notificationOverlay = notification;
 
             Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
-            CheckForUpdate();
+            Schedule(() => Task.Run(CheckForUpdateAsync));
         }
 
-        public override void CheckForUpdate()
-        {
-            if (gameBase.IsDeployedBuild)
-                Schedule(() => Task.Run(() => checkForUpdateAsync()));
-        }
+        protected override async Task InternalCheckForUpdateAsync() => await checkForUpdateAsync();
 
-        private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
+        private async Task checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
         {
             // should we schedule a retry on completion of this check?
             bool scheduleRecheck = true;
@@ -90,7 +82,7 @@ namespace osu.Desktop.Updater
 
                         // could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
                         // try again without deltas.
-                        checkForUpdateAsync(false, notification);
+                        await checkForUpdateAsync(false, notification);
                         scheduleRecheck = false;
                     }
                     else
@@ -109,7 +101,7 @@ namespace osu.Desktop.Updater
                 if (scheduleRecheck)
                 {
                     // check again in 30 minutes.
-                    Scheduler.AddDelayed(() => checkForUpdateAsync(), 60000 * 30);
+                    Scheduler.AddDelayed(async () => await checkForUpdateAsync(), 60000 * 30);
                 }
             }
         }
diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 62d1ef162f..4a2a50885e 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.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.Threading.Tasks;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Platform;
@@ -28,15 +29,12 @@ namespace osu.Game.Overlays.Settings.Sections.General
             });
 
             // We should only display the button for UpdateManagers that do check for updates
-            if (updateManager?.CanCheckForUpdate == true)
+            Add(new SettingsButton
             {
-                Add(new SettingsButton
-                {
-                    Text = "Check for updates",
-                    Action = updateManager.CheckForUpdate,
-                    Enabled = { Value = game.IsDeployedBuild }
-                });
-            }
+                Text = "Check for updates",
+                Action = () => Schedule(() => Task.Run(updateManager.CheckForUpdateAsync)),
+                Enabled = { Value = updateManager.CanCheckForUpdate }
+            });
 
             if (RuntimeInfo.IsDesktop)
             {
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index d4e8aed5ae..78d27ab754 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -19,31 +19,20 @@ namespace osu.Game.Updater
     /// </summary>
     public class SimpleUpdateManager : UpdateManager
     {
-        public override bool CanCheckForUpdate => true;
-
         private string version;
 
         [Resolved]
         private GameHost host { get; set; }
 
-        private OsuGameBase gameBase;
-
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game)
         {
-            gameBase = game;
             version = game.Version;
 
-            CheckForUpdate();
+            Schedule(() => Task.Run(CheckForUpdateAsync));
         }
 
-        public override void CheckForUpdate()
-        {
-            if (gameBase.IsDeployedBuild)
-                Schedule(() => Task.Run(checkForUpdateAsync));
-        }
-
-        private async void checkForUpdateAsync()
+        protected override async Task InternalCheckForUpdateAsync()
         {
             try
             {
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 41bbfb76a5..abe21f08a4 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.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.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Logging;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
@@ -18,9 +18,11 @@ namespace osu.Game.Updater
     public class UpdateManager : CompositeDrawable
     {
         /// <summary>
-        /// Whether this UpdateManager is capable of checking for updates.
+        /// Whether this UpdateManager should be or is capable of checking for updates.
         /// </summary>
-        public virtual bool CanCheckForUpdate => false;
+        public bool CanCheckForUpdate => game.IsDeployedBuild;
+
+        private string lastVersion;
 
         [Resolved]
         private OsuConfigManager config { get; set; }
@@ -35,24 +37,37 @@ namespace osu.Game.Updater
         {
             base.LoadComplete();
 
-            var version = game.Version;
-            var lastVersion = config.Get<string>(OsuSetting.Version);
+            Schedule(() => Task.Run(CheckForUpdateAsync));
 
-            if (game.IsDeployedBuild && version != lastVersion)
+            // 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, game.Version);
+        }
+
+        public async Task CheckForUpdateAsync()
+        {
+            if (!CanCheckForUpdate)
+                return;
+
+            await InternalCheckForUpdateAsync();
+        }
+
+        protected virtual Task InternalCheckForUpdateAsync()
+        {
+            // Query last version only *once*, so the user can re-check for updates, in case they closed the notification or else.
+            lastVersion ??= config.Get<string>(OsuSetting.Version);
+
+            var version = game.Version;
+
+            if (version != lastVersion)
             {
                 // 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));
             }
 
-            // 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);
-        }
-
-        public virtual void CheckForUpdate()
-        {
-            Logger.Log("CheckForUpdate was called on the base class (UpdateManager)", LoggingTarget.Information);
+            // we aren't doing any async in this method, so we return a completed task instead.
+            return Task.CompletedTask;
         }
 
         private class UpdateCompleteNotification : SimpleNotification

From 17cd9569ed2875c3fd418fc018b356eb2d092806 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 00:46:40 +0200
Subject: [PATCH 03133/10326] Introduce new storage class and manager

---
 .../Components/TourneyVideo.cs                |  4 +--
 osu.Game.Tournament/TournamentGameBase.cs     | 12 ++++---
 osu.Game.Tournament/TournamentStorage.cs      | 34 +++++++++++++++++--
 .../TournamentStorageManager.cs               | 30 ++++++++++++++++
 4 files changed, 70 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game.Tournament/TournamentStorageManager.cs

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 317c5f6a56..259cb95035 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Tournament.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(TournamentStorage storage)
+        private void load(NewTournamentStorage storage)
         {
-            var stream = storage.GetStream($@"videos/{filename}");
+            var stream = storage.VideoStorage.GetStream($@"{filename}");
 
             if (stream != null)
             {
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 85db9e61fb..427a33f871 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -19,6 +19,8 @@ using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Online.API.Requests;
+using osu.Framework.Logging;
+using osu.Game.Tournament.Configuration;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osu.Game.Users;
@@ -37,7 +39,7 @@ namespace osu.Game.Tournament
 
         private Storage storage;
 
-        private TournamentStorage tournamentStorage;
+        private NewTournamentStorage newTournamentStorage;
 
         private DependencyContainer dependencies;
 
@@ -52,15 +54,15 @@ namespace osu.Game.Tournament
         }
 
         [BackgroundDependencyLoader]
-        private void load(Storage storage, FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkConfigManager frameworkConfig)
         {
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
-            dependencies.CacheAs(tournamentStorage = new TournamentStorage(storage));
+            dependencies.CacheAs(newTournamentStorage = new NewTournamentStorage(Host));
 
-            Textures.AddStore(new TextureLoaderStore(tournamentStorage));
+            Textures.AddStore(new TextureLoaderStore(newTournamentStorage.VideoStorage));
 
-            this.storage = storage;
+            this.storage = newTournamentStorage;
 
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
             windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
diff --git a/osu.Game.Tournament/TournamentStorage.cs b/osu.Game.Tournament/TournamentStorage.cs
index 139ad3857b..defeceab93 100644
--- a/osu.Game.Tournament/TournamentStorage.cs
+++ b/osu.Game.Tournament/TournamentStorage.cs
@@ -2,18 +2,46 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.IO.Stores;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
+using osu.Game.IO;
+using osu.Game.Tournament.Configuration;
 
 namespace osu.Game.Tournament
 {
-    internal class TournamentStorage : NamespacedResourceStore<byte[]>
+    internal class TournamentVideoStorage : NamespacedResourceStore<byte[]>
     {
-        public TournamentStorage(Storage storage)
-            : base(new StorageBackedResourceStore(storage), "tournament")
+        public TournamentVideoStorage(Storage storage)
+            : base(new StorageBackedResourceStore(storage), "videos")
         {
             AddExtension("m4v");
             AddExtension("avi");
             AddExtension("mp4");
         }
     }
+
+    internal class NewTournamentStorage : WrappedStorage
+    {
+        private readonly GameHost host;
+        private readonly TournamentStorageManager storageConfig;
+        public readonly TournamentVideoStorage VideoStorage;
+
+        public NewTournamentStorage(GameHost host)
+            : base(host.Storage, string.Empty)
+        {
+            this.host = host;
+
+            storageConfig = new TournamentStorageManager(host.Storage);
+            var customTournamentPath = storageConfig.Get<string>(StorageConfig.CurrentTournament);
+
+            if (!string.IsNullOrEmpty(customTournamentPath))
+            {
+                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory("tournaments/" + customTournamentPath));
+            } else {
+                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory("tournaments/default"));
+            }
+            VideoStorage = new TournamentVideoStorage(this);
+            Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
+        }
+    }
 }
diff --git a/osu.Game.Tournament/TournamentStorageManager.cs b/osu.Game.Tournament/TournamentStorageManager.cs
new file mode 100644
index 0000000000..b1f84ecf44
--- /dev/null
+++ b/osu.Game.Tournament/TournamentStorageManager.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.Configuration;
+using osu.Framework.Platform;
+
+namespace osu.Game.Tournament.Configuration
+{
+    public class TournamentStorageManager : IniConfigManager<StorageConfig>
+    {
+        protected override string Filename => "tournament.ini";
+
+        public TournamentStorageManager(Storage storage)
+            : base(storage)
+        {
+        }
+
+        protected override void InitialiseDefaults()
+        {
+            base.InitialiseDefaults();
+            Set(StorageConfig.CurrentTournament, string.Empty);
+        }
+
+    }
+
+    public enum StorageConfig
+    {
+        CurrentTournament,
+    }
+}
\ No newline at end of file

From 9a20ffa8a35ac048b7279dec2fd3752061a12987 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 00:47:47 +0200
Subject: [PATCH 03134/10326] Rename to TournamentStorage

---
 osu.Game.Tournament/Components/TourneyVideo.cs | 2 +-
 osu.Game.Tournament/TournamentGameBase.cs      | 8 ++++----
 osu.Game.Tournament/TournamentStorage.cs       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 259cb95035..131fa9450d 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tournament.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(NewTournamentStorage storage)
+        private void load(TournamentStorage storage)
         {
             var stream = storage.VideoStorage.GetStream($@"{filename}");
 
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 427a33f871..991c586a56 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tournament
 
         private Storage storage;
 
-        private NewTournamentStorage newTournamentStorage;
+        private TournamentStorage tournamentStorage;
 
         private DependencyContainer dependencies;
 
@@ -58,11 +58,11 @@ namespace osu.Game.Tournament
         {
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
-            dependencies.CacheAs(newTournamentStorage = new NewTournamentStorage(Host));
+            dependencies.CacheAs(tournamentStorage = new TournamentStorage(Host));
 
-            Textures.AddStore(new TextureLoaderStore(newTournamentStorage.VideoStorage));
+            Textures.AddStore(new TextureLoaderStore(tournamentStorage.VideoStorage));
 
-            this.storage = newTournamentStorage;
+            this.storage = tournamentStorage;
 
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
             windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
diff --git a/osu.Game.Tournament/TournamentStorage.cs b/osu.Game.Tournament/TournamentStorage.cs
index defeceab93..e5d19831d0 100644
--- a/osu.Game.Tournament/TournamentStorage.cs
+++ b/osu.Game.Tournament/TournamentStorage.cs
@@ -20,13 +20,13 @@ namespace osu.Game.Tournament
         }
     }
 
-    internal class NewTournamentStorage : WrappedStorage
+    internal class TournamentStorage : WrappedStorage
     {
         private readonly GameHost host;
         private readonly TournamentStorageManager storageConfig;
         public readonly TournamentVideoStorage VideoStorage;
 
-        public NewTournamentStorage(GameHost host)
+        public TournamentStorage(GameHost host)
             : base(host.Storage, string.Empty)
         {
             this.host = host;

From ba5a747ac9e1b83ff38b28884d86952895d34ab9 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 03:03:57 +0200
Subject: [PATCH 03135/10326] Implement migration for TournamentStorage

---
 osu.Game.Tournament/TournamentStorage.cs | 75 ++++++++++++++++++++++--
 1 file changed, 70 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/TournamentStorage.cs b/osu.Game.Tournament/TournamentStorage.cs
index e5d19831d0..48eef76a28 100644
--- a/osu.Game.Tournament/TournamentStorage.cs
+++ b/osu.Game.Tournament/TournamentStorage.cs
@@ -1,10 +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;
+using System.Linq;
+using System.Threading;
 using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.IO;
+using System.IO;
 using osu.Game.Tournament.Configuration;
 
 namespace osu.Game.Tournament
@@ -32,16 +36,77 @@ namespace osu.Game.Tournament
             this.host = host;
 
             storageConfig = new TournamentStorageManager(host.Storage);
-            var customTournamentPath = storageConfig.Get<string>(StorageConfig.CurrentTournament);
+            var currentTournament = storageConfig.Get<string>(StorageConfig.CurrentTournament);
 
-            if (!string.IsNullOrEmpty(customTournamentPath))
+            if (!string.IsNullOrEmpty(currentTournament))
             {
-                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory("tournaments/" + customTournamentPath));
-            } else {
-                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory("tournaments/default"));
+                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory("tournaments" + Path.DirectorySeparatorChar + currentTournament));
             }
+            else
+            {
+                // Migrating old storage format to the new one.
+                Migrate();
+                Logger.Log("Migrating files from old storage to new.");
+            }
+
             VideoStorage = new TournamentVideoStorage(this);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }
+
+        private void Migrate()
+        {
+            var defaultPath = "tournaments/default";
+            var source = new DirectoryInfo(GetFullPath("tournament"));
+            var destination = new DirectoryInfo(GetFullPath(defaultPath));
+
+            Directory.CreateDirectory(destination.FullName);
+            
+            if (host.Storage.Exists("bracket.json"))
+            {   
+                Logger.Log("Migrating bracket to default tournament storage.");
+                var bracketFile = new System.IO.FileInfo(GetFullPath(string.Empty) + Path.DirectorySeparatorChar + GetFiles(string.Empty, "bracket.json").First());
+                attemptOperation(() => bracketFile.CopyTo(Path.Combine(destination.FullName, bracketFile.Name), true));
+            }
+
+            Logger.Log("Migrating other assets to default tournament storage.");
+            copyRecursive(source, destination);
+            ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(defaultPath));
+            storageConfig.Set<string>(StorageConfig.CurrentTournament, defaultPath);
+            storageConfig.Save();
+        }
+
+        private void copyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true)
+        {
+            // based off example code https://docs.microsoft.com/en-us/dotnet/api/system.io.directoryinfo
+
+            foreach (System.IO.FileInfo fi in source.GetFiles())
+            {
+                attemptOperation(() => fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true));
+            }
+
+            foreach (DirectoryInfo dir in source.GetDirectories())
+            {
+                copyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);
+            }
+        }
+
+        private void attemptOperation(Action action, int attempts = 10)
+        {
+            while (true)
+            {
+                try
+                {
+                    action();
+                    return;
+                }
+                catch (Exception)
+                {
+                    if (attempts-- == 0)
+                        throw;
+                }
+
+                Thread.Sleep(250);
+            }
+        }
     }
 }

From f01a86f5b1c4395e99aec8a37fe9aa7c2563c5dd Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 03:12:37 +0200
Subject: [PATCH 03136/10326] Fix styling issues and move StorageManager to
 Configuration Folder

---
 .../TournamentStorageManager.cs                  |  1 -
 osu.Game.Tournament/TournamentGameBase.cs        |  4 +---
 osu.Game.Tournament/TournamentStorage.cs         | 16 ++++++++--------
 3 files changed, 9 insertions(+), 12 deletions(-)
 rename osu.Game.Tournament/{ => Configuration}/TournamentStorageManager.cs (99%)

diff --git a/osu.Game.Tournament/TournamentStorageManager.cs b/osu.Game.Tournament/Configuration/TournamentStorageManager.cs
similarity index 99%
rename from osu.Game.Tournament/TournamentStorageManager.cs
rename to osu.Game.Tournament/Configuration/TournamentStorageManager.cs
index b1f84ecf44..6ccc2b6308 100644
--- a/osu.Game.Tournament/TournamentStorageManager.cs
+++ b/osu.Game.Tournament/Configuration/TournamentStorageManager.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Tournament.Configuration
             base.InitialiseDefaults();
             Set(StorageConfig.CurrentTournament, string.Empty);
         }
-
     }
 
     public enum StorageConfig
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 991c586a56..e3d310a497 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -19,8 +19,6 @@ using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Online.API.Requests;
-using osu.Framework.Logging;
-using osu.Game.Tournament.Configuration;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osu.Game.Users;
@@ -62,7 +60,7 @@ namespace osu.Game.Tournament
 
             Textures.AddStore(new TextureLoaderStore(tournamentStorage.VideoStorage));
 
-            this.storage = tournamentStorage;
+            storage = tournamentStorage;
 
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
             windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
diff --git a/osu.Game.Tournament/TournamentStorage.cs b/osu.Game.Tournament/TournamentStorage.cs
index 48eef76a28..d1c8635466 100644
--- a/osu.Game.Tournament/TournamentStorage.cs
+++ b/osu.Game.Tournament/TournamentStorage.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tournament
             else
             {
                 // Migrating old storage format to the new one.
-                Migrate();
+                migrate();
                 Logger.Log("Migrating files from old storage to new.");
             }
 
@@ -53,16 +53,16 @@ namespace osu.Game.Tournament
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }
 
-        private void Migrate()
+        private void migrate()
         {
-            var defaultPath = "tournaments/default";
+            const string default_path = "tournaments/default";
             var source = new DirectoryInfo(GetFullPath("tournament"));
-            var destination = new DirectoryInfo(GetFullPath(defaultPath));
+            var destination = new DirectoryInfo(GetFullPath(default_path));
 
             Directory.CreateDirectory(destination.FullName);
-            
+
             if (host.Storage.Exists("bracket.json"))
-            {   
+            {
                 Logger.Log("Migrating bracket to default tournament storage.");
                 var bracketFile = new System.IO.FileInfo(GetFullPath(string.Empty) + Path.DirectorySeparatorChar + GetFiles(string.Empty, "bracket.json").First());
                 attemptOperation(() => bracketFile.CopyTo(Path.Combine(destination.FullName, bracketFile.Name), true));
@@ -70,8 +70,8 @@ namespace osu.Game.Tournament
 
             Logger.Log("Migrating other assets to default tournament storage.");
             copyRecursive(source, destination);
-            ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(defaultPath));
-            storageConfig.Set<string>(StorageConfig.CurrentTournament, defaultPath);
+            ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_path));
+            storageConfig.Set(StorageConfig.CurrentTournament, default_path);
             storageConfig.Save();
         }
 

From bddd2b72ba257370e999a9f958f090cb83ef57c9 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Mon, 8 Jun 2020 15:05:53 +1200
Subject: [PATCH 03137/10326] Remove secondaryText and related code from
 FooterButtonRandom

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 2c4dd58763..7574d01a7b 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -17,22 +17,9 @@ namespace osu.Game.Screens.Select
         public Action NextRandom { get; set; }
         public Action PreviousRandom { get; set; }
 
-        private readonly SpriteText secondaryText;
         private bool rewindSearch;
 
-        public FooterButtonRandom()
-        {
-            TextContainer.Add(secondaryText = new OsuSpriteText
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Text = @"rewind",
-                Alpha = 0,
-            });
-
-            // force both text sprites to always be present to avoid width flickering while they're being swapped out
-            SpriteText.AlwaysPresent = secondaryText.AlwaysPresent = true;
-        }
+        public FooterButtonRandom() { }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
@@ -53,20 +40,6 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        private void updateText()
-        {
-            if (rewindSearch)
-            {
-                SpriteText.FadeOut(120, Easing.InQuad);
-                secondaryText.FadeIn(120, Easing.InQuad);
-            }
-            else
-            {
-                SpriteText.FadeIn(120, Easing.InQuad);
-                secondaryText.FadeOut(120, Easing.InQuad);
-            }
-        }
-
         public override bool OnPressed(GlobalAction action)
         {
             rewindSearch = action == GlobalAction.SelectPreviousRandom;
@@ -76,7 +49,6 @@ namespace osu.Game.Screens.Select
                 return false;
             }
 
-            updateText();
             Click();
             return true;
         }
@@ -86,7 +58,6 @@ namespace osu.Game.Screens.Select
             if (action == GlobalAction.SelectPreviousRandom)
             {
                 rewindSearch = false;
-                updateText();
             }
         }
     }

From 72ada020a2515a1ed839fecbeb0af52c3ce86abc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Jun 2020 13:42:16 +0900
Subject: [PATCH 03138/10326] Don't attempt to use virtual track for intro
 sequence clock

---
 osu.Game/Screens/Menu/IntroTriangles.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 188a49c147..cb05dcc932 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -7,6 +7,7 @@ using System.IO;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Audio.Track;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -61,7 +62,7 @@ namespace osu.Game.Screens.Menu
                 LoadComponentAsync(new TrianglesIntroSequence(logo, background)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Clock = new FramedClock(MenuMusic.Value ? Track : null),
+                    Clock = new FramedClock(MenuMusic.Value && !(Track is TrackVirtual) ? Track : null),
                     LoadMenu = LoadMenu
                 }, t =>
                 {

From dfed27bd4633e5b2d1268f8851fec97a698d61e6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Jun 2020 14:24:21 +0900
Subject: [PATCH 03139/10326] Add back stream seeking for sanity

---
 osu.Game/Beatmaps/BeatmapManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index f11e94e63d..4e3714a582 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -201,6 +201,8 @@ namespace osu.Game.Beatmaps
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
                     new LegacyBeatmapEncoder(beatmapContent).Encode(sw);
 
+                stream.Seek(0, SeekOrigin.Begin);
+
                 UpdateFile(setInfo, setInfo.Files.Single(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase)), stream);
             }
 

From ea9207e0ad21434d79eace9e527a3719ad1232c0 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Mon, 8 Jun 2020 17:31:31 +1200
Subject: [PATCH 03140/10326] Clean up FooterButtonRandom Removed unnecessary
 using statements Removed unnecessary constructor

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 7574d01a7b..363c2e4c10 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -4,10 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select
@@ -19,8 +16,6 @@ namespace osu.Game.Screens.Select
 
         private bool rewindSearch;
 
-        public FooterButtonRandom() { }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {

From 443977aa8d71071a7566a4be643ffea72b77fee1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Jun 2020 14:40:17 +0900
Subject: [PATCH 03141/10326] Remove PreUpdate, update hash in Save()

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 22 ++++++++--------------
 osu.Game/Database/ArchiveModelManager.cs | 11 -----------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 4e3714a582..cbcdf51551 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -203,7 +203,14 @@ namespace osu.Game.Beatmaps
 
                 stream.Seek(0, SeekOrigin.Begin);
 
-                UpdateFile(setInfo, setInfo.Files.Single(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase)), stream);
+                using (ContextFactory.GetForWrite())
+                {
+                    var beatmapInfo = setInfo.Beatmaps.Single(b => b.ID == info.ID);
+                    beatmapInfo.MD5Hash = stream.ComputeMD5Hash();
+
+                    stream.Seek(0, SeekOrigin.Begin);
+                    UpdateFile(setInfo, setInfo.Files.Single(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase)), stream);
+                }
             }
 
             var working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == info.ID);
@@ -211,19 +218,6 @@ namespace osu.Game.Beatmaps
                 workingCache.Remove(working);
         }
 
-        protected override void PreUpdate(BeatmapSetInfo item)
-        {
-            base.PreUpdate(item);
-
-            foreach (var info in item.Beatmaps)
-            {
-                var file = item.Files.SingleOrDefault(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
-
-                using (var stream = Files.Store.GetStream(file))
-                    info.MD5Hash = stream.ComputeMD5Hash();
-            }
-        }
-
         private readonly WeakList<WorkingBeatmap> workingCache = new WeakList<WorkingBeatmap>();
 
         /// <summary>
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index b9479af623..915d980d24 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -429,21 +429,10 @@ namespace osu.Game.Database
             using (ContextFactory.GetForWrite())
             {
                 item.Hash = computeHash(item);
-
-                PreUpdate(item);
-
                 ModelStore.Update(item);
             }
         }
 
-        /// <summary>
-        /// Perform any final actions before the update to database executes.
-        /// </summary>
-        /// <param name="item">The <typeparamref name="TModel"/> that is being updated.</param>
-        protected virtual void PreUpdate(TModel item)
-        {
-        }
-
         /// <summary>
         /// Delete an item from the manager.
         /// Is a no-op for already deleted items.

From 63003757c4fee77ca055861cb0538019509138a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Jun 2020 14:48:26 +0900
Subject: [PATCH 03142/10326] Remove WorkingBeatmap cache when deleting or
 updating a beatmap

---
 osu.Game/Beatmaps/BeatmapManager.cs | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index e7cef13c68..73e4c119e4 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -79,6 +79,8 @@ namespace osu.Game.Beatmaps
             beatmaps = (BeatmapStore)ModelStore;
             beatmaps.BeatmapHidden += b => beatmapHidden.Value = new WeakReference<BeatmapInfo>(b);
             beatmaps.BeatmapRestored += b => beatmapRestored.Value = new WeakReference<BeatmapInfo>(b);
+            beatmaps.ItemRemoved += removeWorkingCache;
+            beatmaps.ItemUpdated += removeWorkingCache;
 
             onlineLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
         }
@@ -206,9 +208,7 @@ namespace osu.Game.Beatmaps
                 UpdateFile(setInfo, setInfo.Files.Single(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase)), stream);
             }
 
-            var working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == info.ID);
-            if (working != null)
-                workingCache.Remove(working);
+            removeWorkingCache(info);
         }
 
         private readonly WeakList<WorkingBeatmap> workingCache = new WeakList<WorkingBeatmap>();
@@ -410,6 +410,24 @@ namespace osu.Game.Beatmaps
             return endTime - startTime;
         }
 
+        private void removeWorkingCache(BeatmapSetInfo info)
+        {
+            if (info.Beatmaps == null) return;
+
+            foreach (var b in info.Beatmaps)
+                removeWorkingCache(b);
+        }
+
+        private void removeWorkingCache(BeatmapInfo info)
+        {
+            lock (workingCache)
+            {
+                var working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == info.ID);
+                if (working != null)
+                    workingCache.Remove(working);
+            }
+        }
+
         public void Dispose()
         {
             onlineLookupQueue?.Dispose();

From dd61d6ed04f47aa77739e974b29949a898d79c74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Jun 2020 14:48:42 +0900
Subject: [PATCH 03143/10326] Attempt to reimport intro if a bad state is
 detected

---
 osu.Game/Screens/Menu/IntroScreen.cs    | 62 ++++++++++++++++---------
 osu.Game/Screens/Menu/IntroTriangles.cs |  5 +-
 2 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 0d5f3d1142..b99d8ae9d1 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -41,9 +41,9 @@ namespace osu.Game.Screens.Menu
 
         protected IBindable<bool> MenuMusic { get; private set; }
 
-        private WorkingBeatmap introBeatmap;
+        private WorkingBeatmap initialBeatmap;
 
-        protected Track Track { get; private set; }
+        protected Track Track => initialBeatmap?.Track;
 
         private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);
 
@@ -58,6 +58,11 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private AudioManager audio { get; set; }
 
+        /// <summary>
+        /// Whether the <see cref="Track"/> is provided by osu! resources, rather than a user beatmap.
+        /// </summary>
+        protected bool UsingThemedIntro { get; private set; }
+
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, SkinManager skinManager, BeatmapManager beatmaps, Framework.Game game)
         {
@@ -71,29 +76,45 @@ namespace osu.Game.Screens.Menu
 
             BeatmapSetInfo setInfo = null;
 
+            // if the user has requested not to play theme music, we should attempt to find a random beatmap from their collection.
             if (!MenuMusic.Value)
             {
                 var sets = beatmaps.GetAllUsableBeatmapSets(IncludedDetails.Minimal);
+
                 if (sets.Count > 0)
-                    setInfo = beatmaps.QueryBeatmapSet(s => s.ID == sets[RNG.Next(0, sets.Count - 1)].ID);
-            }
-
-            if (setInfo == null)
-            {
-                setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == BeatmapHash);
-
-                if (setInfo == null)
                 {
-                    // we need to import the default menu background beatmap
-                    setInfo = beatmaps.Import(new ZipArchiveReader(game.Resources.GetStream($"Tracks/{BeatmapFile}"), BeatmapFile)).Result;
-
-                    setInfo.Protected = true;
-                    beatmaps.Update(setInfo);
+                    setInfo = beatmaps.QueryBeatmapSet(s => s.ID == sets[RNG.Next(0, sets.Count - 1)].ID);
+                    initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
                 }
             }
 
-            introBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-            Track = introBeatmap.Track;
+            // we generally want a song to be playing on startup, so use the intro music even if a user has specified not to if no other track is available.
+            if (setInfo == null)
+            {
+                if (!loadThemedIntro())
+                {
+                    // if we detect that the theme track or beatmap is unavailable this is either first startup or things are in a bad state.
+                    // this could happen if a user has nuked their files store. for now, reimport to repair this.
+                    var import = beatmaps.Import(new ZipArchiveReader(game.Resources.GetStream($"Tracks/{BeatmapFile}"), BeatmapFile)).Result;
+                    import.Protected = true;
+                    beatmaps.Update(import);
+
+                    loadThemedIntro();
+                }
+            }
+
+            bool loadThemedIntro()
+            {
+                setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == BeatmapHash);
+
+                if (setInfo != null)
+                {
+                    initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
+                    UsingThemedIntro = !(Track is TrackVirtual);
+                }
+
+                return UsingThemedIntro;
+            }
         }
 
         public override void OnResuming(IScreen last)
@@ -119,7 +140,7 @@ namespace osu.Game.Screens.Menu
         public override void OnSuspending(IScreen next)
         {
             base.OnSuspending(next);
-            Track = null;
+            initialBeatmap = null;
         }
 
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
@@ -127,7 +148,7 @@ namespace osu.Game.Screens.Menu
         protected void StartTrack()
         {
             // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
-            if (MenuMusic.Value)
+            if (UsingThemedIntro)
                 Track.Restart();
         }
 
@@ -141,8 +162,7 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
-                beatmap.Value = introBeatmap;
-                introBeatmap = null;
+                beatmap.Value = initialBeatmap;
 
                 logo.MoveTo(new Vector2(0.5f));
                 logo.ScaleTo(Vector2.One);
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index cb05dcc932..225ad02ec4 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -7,7 +7,6 @@ using System.IO;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Audio.Track;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -47,7 +46,7 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (MenuVoice.Value && !MenuMusic.Value)
+            if (MenuVoice.Value && !UsingThemedIntro)
                 welcome = audio.Samples.Get(@"welcome");
         }
 
@@ -62,7 +61,7 @@ namespace osu.Game.Screens.Menu
                 LoadComponentAsync(new TrianglesIntroSequence(logo, background)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Clock = new FramedClock(MenuMusic.Value && !(Track is TrackVirtual) ? Track : null),
+                    Clock = new FramedClock(UsingThemedIntro ? Track : null),
                     LoadMenu = LoadMenu
                 }, t =>
                 {

From 68027fcc2c46dacfbfda5a64eb5745d40eae6c81 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Jun 2020 16:30:26 +0900
Subject: [PATCH 03144/10326] Update with latest changes

---
 .../Preprocessing/StaminaCheeseDetector.cs    |  37 +++--
 .../Preprocessing/TaikoDifficultyHitObject.cs |  28 ++--
 .../TaikoDifficultyHitObjectRhythm.cs         | 100 +-----------
 .../Difficulty/Skills/Colour.cs               | 153 +++++++++---------
 .../Difficulty/Skills/Rhythm.cs               | 115 +++++++++++++
 .../Difficulty/Skills/SpeedInvariantRhythm.cs | 135 ----------------
 .../Difficulty/Skills/Stamina.cs              |  79 ++++-----
 .../Difficulty/TaikoDifficultyCalculator.cs   |  71 ++++----
 .../Difficulty/TaikoPerformanceCalculator.cs  |   4 -
 9 files changed, 295 insertions(+), 427 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
 delete mode 100644 osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
index 4f645d7e51..b52dad5198 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
@@ -14,25 +14,26 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 
         public void FindCheese(List<TaikoDifficultyHitObject> difficultyHitObjects)
         {
-            this.hitObjects = difficultyHitObjects;
+            hitObjects = difficultyHitObjects;
             findRolls(3);
             findRolls(4);
-            findTLTap(0, true);
-            findTLTap(1, true);
-            findTLTap(0, false);
-            findTLTap(1, false);
+            findTlTap(0, true);
+            findTlTap(1, true);
+            findTlTap(0, false);
+            findTlTap(1, false);
         }
 
         private void findRolls(int patternLength)
         {
             List<TaikoDifficultyHitObject> history = new List<TaikoDifficultyHitObject>();
 
-            int repititionStart = 0;
+            int repetitionStart = 0;
 
             for (int i = 0; i < hitObjects.Count; i++)
             {
                 history.Add(hitObjects[i]);
                 if (history.Count < 2 * patternLength) continue;
+
                 if (history.Count > 2 * patternLength) history.RemoveAt(0);
 
                 bool isRepeat = true;
@@ -47,43 +48,41 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 
                 if (!isRepeat)
                 {
-                    repititionStart = i - 2 * patternLength;
+                    repetitionStart = i - 2 * patternLength;
                 }
 
-                int repeatedLength = i - repititionStart;
+                int repeatedLength = i - repetitionStart;
 
                 if (repeatedLength >= roll_min_repetitions)
                 {
-                    // Console.WriteLine("Found Roll Cheese.\tStart: " + repititionStart + "\tEnd: " + i);
-                    for (int j = repititionStart; j < i; j++)
+                    for (int j = repetitionStart; j < i; j++)
                     {
-                        (hitObjects[i]).StaminaCheese = true;
+                        hitObjects[i].StaminaCheese = true;
                     }
                 }
             }
         }
 
-        private void findTLTap(int parity, bool kat)
+        private void findTlTap(int parity, bool kat)
         {
-            int tl_length = -2;
+            int tlLength = -2;
 
             for (int i = parity; i < hitObjects.Count; i += 2)
             {
                 if (kat == hitObjects[i].IsKat)
                 {
-                    tl_length += 2;
+                    tlLength += 2;
                 }
                 else
                 {
-                    tl_length = -2;
+                    tlLength = -2;
                 }
 
-                if (tl_length >= tl_min_repetitions)
+                if (tlLength >= tl_min_repetitions)
                 {
-                    // Console.WriteLine("Found TL Cheese.\tStart: " + (i - tl_length) + "\tEnd: " + i);
-                    for (int j = i - tl_length; j < i; j++)
+                    for (int j = i - tlLength; j < i; j++)
                     {
-                        (hitObjects[i]).StaminaCheese = true;
+                        hitObjects[i].StaminaCheese = true;
                     }
                 }
             }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
index 75b1b3e268..cd45db2119 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
@@ -1,6 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -9,38 +12,31 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 {
     public class TaikoDifficultyHitObject : DifficultyHitObject
     {
-        public readonly bool HasTypeChange;
-        public readonly bool HasTimingChange;
         public readonly TaikoDifficultyHitObjectRhythm Rhythm;
         public readonly bool IsKat;
 
         public bool StaminaCheese = false;
 
-        public readonly int RhythmID;
-
         public readonly double NoteLength;
 
-        public readonly int n;
-        private int counter = 0;
+        public readonly int N;
 
-        public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate, TaikoDifficultyHitObjectRhythm rhythm)
+        public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate, int n, IEnumerable<TaikoDifficultyHitObjectRhythm> commonRhythms)
             : base(hitObject, lastObject, clockRate)
         {
-            var lastHit = lastObject as Hit;
             var currentHit = hitObject as Hit;
 
             NoteLength = DeltaTime;
             double prevLength = (lastObject.StartTime - lastLastObject.StartTime) / clockRate;
-            Rhythm = rhythm.GetClosest(NoteLength / prevLength);
-            RhythmID = Rhythm.ID;
-            HasTypeChange = lastHit?.Type != currentHit?.Type;
-            IsKat = lastHit?.Type == HitType.Rim;
-            HasTimingChange = !rhythm.IsRepeat(RhythmID);
+            Rhythm = getClosestRhythm(NoteLength / prevLength, commonRhythms);
+            IsKat = currentHit?.Type == HitType.Rim;
 
-            n = counter;
-            counter++;
+            N = n;
         }
 
-        public const int CONST_RHYTHM_ID = 0;
+        private TaikoDifficultyHitObjectRhythm getClosestRhythm(double ratio, IEnumerable<TaikoDifficultyHitObjectRhythm> commonRhythms)
+        {
+            return commonRhythms.OrderBy(x => Math.Abs(x.Ratio - ratio)).First();
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
index 8a6f0e5bfe..0ad885d9bd 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
@@ -1,107 +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;
-
 namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 {
     public class TaikoDifficultyHitObjectRhythm
     {
-        private readonly TaikoDifficultyHitObjectRhythm[] commonRhythms;
-        private readonly TaikoDifficultyHitObjectRhythm constRhythm;
-        private int constRhythmID;
-
-        public int ID = 0;
         public readonly double Difficulty;
-        private readonly double ratio;
+        public readonly double Ratio;
+        public readonly bool IsRepeat;
 
-        public bool IsRepeat()
+        public TaikoDifficultyHitObjectRhythm(int numerator, int denominator, double difficulty, bool isRepeat)
         {
-            return ID == constRhythmID;
-        }
-
-        public bool IsRepeat(int id)
-        {
-            return id == constRhythmID;
-        }
-
-        public bool IsSpeedup()
-        {
-            return ratio < 1.0;
-        }
-
-        public bool IsLargeSpeedup()
-        {
-            return ratio < 0.49;
-        }
-
-        public TaikoDifficultyHitObjectRhythm()
-        {
-            /*
-
-                ALCHYRS CODE
-
-            If (change < 0.48) Then 'sometimes gaps are slightly different due to position rounding
-                Return 0.65 'This number increases value of anything that more than doubles speed. Affects doubles.
-            ElseIf (change < 0.52) Then
-                Return 0.5 'speed doubling - this one affects pretty much every map other than stream maps
-            ElseIf change <= 0.9 Then
-                Return 1.0 'This number increases value of 1/4 -> 1/6 and other weird rhythms.
-            ElseIf change < 0.95 Then
-                Return 0.25 '.9
-            ElseIf change > 1.95 Then
-                Return 0.3 'half speed or more - this affects pretty much every map
-            ElseIf change > 1.15 Then
-                Return 0.425 'in between - this affects (mostly) 1/6 -> 1/4
-            ElseIf change > 1.05 Then
-                Return 0.15 '.9, small speed changes
-
-            */
-
-            commonRhythms = new[]
-            {
-                new TaikoDifficultyHitObjectRhythm(1, 1, 0.1),
-                new TaikoDifficultyHitObjectRhythm(2, 1, 0.3),
-                new TaikoDifficultyHitObjectRhythm(1, 2, 0.5),
-                new TaikoDifficultyHitObjectRhythm(3, 1, 0.3),
-                new TaikoDifficultyHitObjectRhythm(1, 3, 0.35),
-                new TaikoDifficultyHitObjectRhythm(3, 2, 0.6),
-                new TaikoDifficultyHitObjectRhythm(2, 3, 0.4),
-                new TaikoDifficultyHitObjectRhythm(5, 4, 0.5),
-                new TaikoDifficultyHitObjectRhythm(4, 5, 0.7)
-            };
-
-            for (int i = 0; i < commonRhythms.Length; i++)
-            {
-                commonRhythms[i].ID = i;
-            }
-
-            constRhythmID = 0;
-            constRhythm = commonRhythms[constRhythmID];
-        }
-
-        private TaikoDifficultyHitObjectRhythm(int numerator, int denominator, double difficulty)
-        {
-            this.ratio = ((double)numerator) / ((double)denominator);
-            this.Difficulty = difficulty;
-        }
-
-        // Code is inefficient - we are searching exhaustively through the sorted list commonRhythms
-        public TaikoDifficultyHitObjectRhythm GetClosest(double ratio)
-        {
-            TaikoDifficultyHitObjectRhythm closestRhythm = commonRhythms[0];
-            double closestDistance = Double.MaxValue;
-
-            foreach (TaikoDifficultyHitObjectRhythm r in commonRhythms)
-            {
-                if (Math.Abs(r.ratio - ratio) < closestDistance)
-                {
-                    closestRhythm = r;
-                    closestDistance = Math.Abs(r.ratio - ratio);
-                }
-            }
-
-            return closestRhythm;
+            Ratio = numerator / (double)denominator;
+            Difficulty = difficulty;
+            IsRepeat = isRepeat;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index bd94c8aa65..7c1623c54e 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
@@ -16,106 +15,100 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0.4;
 
-        private bool prevIsKat = false;
+        private NoteColour prevNoteColour = NoteColour.None;
 
         private int currentMonoLength = 1;
-        private List<int> monoHistory = new List<int>();
-        private readonly int mono_history_max_length = 5;
-        private int monoHistoryLength = 0;
+        private readonly List<int> monoHistory = new List<int>();
+        private const int mono_history_max_length = 5;
 
         private double sameParityPenalty()
         {
             return 0.0;
         }
 
-        private double repititionPenalty(int notesSince)
+        private double repetitionPenalty(int notesSince)
         {
-            double d = notesSince;
-            return Math.Atan(d / 30) / (Math.PI / 2);
+            double n = notesSince;
+            return Math.Min(1.0, 0.032 * n);
         }
 
-        private double patternLengthPenalty(int patternLength)
+        private double repetitionPenalties()
         {
-            double shortPatternPenalty = Math.Min(0.25 * patternLength, 1.0);
-            double longPatternPenalty = Math.Max(Math.Min(2.5 - 0.15 * patternLength, 1.0), 0.0);
-            return Math.Min(shortPatternPenalty, longPatternPenalty);
+            double penalty = 1.0;
+
+            monoHistory.Add(currentMonoLength);
+
+            if (monoHistory.Count > mono_history_max_length)
+                monoHistory.RemoveAt(0);
+
+            for (int l = 2; l <= mono_history_max_length / 2; l++)
+            {
+                for (int start = monoHistory.Count - l - 1; start >= 0; start--)
+                {
+                    bool samePattern = true;
+
+                    for (int i = 0; i < l; i++)
+                    {
+                        if (monoHistory[start + i] != monoHistory[monoHistory.Count - l + i])
+                        {
+                            samePattern = false;
+                        }
+                    }
+
+                    if (samePattern) // Repetition found!
+                    {
+                        int notesSince = 0;
+                        for (int i = start; i < monoHistory.Count; i++) notesSince += monoHistory[i];
+                        penalty *= repetitionPenalty(notesSince);
+                        break;
+                    }
+                }
+            }
+
+            return penalty;
         }
 
         protected override double StrainValueOf(DifficultyHitObject current)
         {
-            double objectDifficulty = 0.0;
-
-            if (current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000)
+            if (!(current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000))
             {
-
-                TaikoDifficultyHitObject currentHO = (TaikoDifficultyHitObject)current;
-
-                if (currentHO.IsKat == prevIsKat)
-                {
-                    currentMonoLength += 1;
-                }
-
-                else
-                {
-
-                    objectDifficulty = 1.0;
-
-                    if (monoHistoryLength > 0 && (monoHistory[monoHistoryLength - 1] + currentMonoLength) % 2 == 0)
-                    {
-                        objectDifficulty *= sameParityPenalty();
-                    }
-
-                    monoHistory.Add(currentMonoLength);
-                    monoHistoryLength += 1;
-
-                    if (monoHistoryLength > mono_history_max_length)
-                    {
-                        monoHistory.RemoveAt(0);
-                        monoHistoryLength -= 1;
-                    }
-
-                    for (int l = 2; l <= mono_history_max_length / 2; l++)
-                    {
-                        for (int start = monoHistoryLength - l - 1; start >= 0; start--)
-                        {
-                            bool samePattern = true;
-
-                            for (int i = 0; i < l; i++)
-                            {
-                                if (monoHistory[start + i] != monoHistory[monoHistoryLength - l + i])
-                                {
-                                    samePattern = false;
-                                }
-                            }
-
-                            if (samePattern) // Repitition found!
-                            {
-                                int notesSince = 0;
-                                for (int i = start; i < monoHistoryLength; i++) notesSince += monoHistory[i];
-                                objectDifficulty *= repititionPenalty(notesSince);
-                                break;
-                            }
-                        }
-                    }
-
-                    currentMonoLength = 1;
-                    prevIsKat = currentHO.IsKat;
-
-                }
-
+                prevNoteColour = NoteColour.None;
+                return 0.0;
             }
 
-            /*
-            string path = @"out.txt";
-            using (StreamWriter sw = File.AppendText(path))
-            {
-                if (((TaikoDifficultyHitObject)current).IsKat) sw.WriteLine("k    " + Math.Min(1.25, returnVal) * returnMultiplier);
-                else sw.WriteLine("d    " + Math.Min(1.25, returnVal) * returnMultiplier);
-            }
-            */
+            TaikoDifficultyHitObject hitObject = (TaikoDifficultyHitObject)current;
 
-            return objectDifficulty;
+            double objectStrain = 0.0;
+
+            NoteColour noteColour = hitObject.IsKat ? NoteColour.Ka : NoteColour.Don;
+
+            if (noteColour == NoteColour.Don && prevNoteColour == NoteColour.Ka ||
+                noteColour == NoteColour.Ka && prevNoteColour == NoteColour.Don)
+            {
+                objectStrain = 1.0;
+
+                if (monoHistory.Count < 2)
+                    objectStrain = 0.0;
+                else if ((monoHistory[^1] + currentMonoLength) % 2 == 0)
+                    objectStrain *= sameParityPenalty();
+
+                objectStrain *= repetitionPenalties();
+                currentMonoLength = 1;
+            }
+            else
+            {
+                currentMonoLength += 1;
+            }
+
+            prevNoteColour = noteColour;
+            return objectStrain;
         }
 
+        private enum NoteColour
+        {
+            Don,
+            Ka,
+            None
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
new file mode 100644
index 0000000000..c3e6ee4d12
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -0,0 +1,115 @@
+// Copyright (c) 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.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
+{
+    public class Rhythm : Skill
+    {
+        protected override double SkillMultiplier => 10;
+        protected override double StrainDecayBase => 0;
+        private const double strain_decay = 0.96;
+        private double currentStrain;
+
+        private readonly List<TaikoDifficultyHitObject> rhythmHistory = new List<TaikoDifficultyHitObject>();
+        private const int rhythm_history_max_length = 8;
+
+        private int notesSinceRhythmChange;
+
+        private double repetitionPenalty(int notesSince)
+        {
+            return Math.Min(1.0, 0.032 * notesSince);
+        }
+
+        // Finds repetitions and applies penalties
+        private double repetitionPenalties(TaikoDifficultyHitObject hitobject)
+        {
+            double penalty = 1;
+
+            rhythmHistory.Add(hitobject);
+
+            if (rhythmHistory.Count > rhythm_history_max_length)
+                rhythmHistory.RemoveAt(0);
+
+            for (int l = 2; l <= rhythm_history_max_length / 2; l++)
+            {
+                for (int start = rhythmHistory.Count - l - 1; start >= 0; start--)
+                {
+                    bool samePattern = true;
+
+                    for (int i = 0; i < l; i++)
+                    {
+                        if (rhythmHistory[start + i].Rhythm != rhythmHistory[rhythmHistory.Count - l + i].Rhythm)
+                        {
+                            samePattern = false;
+                        }
+                    }
+
+                    if (samePattern) // Repetition found!
+                    {
+                        int notesSince = hitobject.N - rhythmHistory[start].N;
+                        penalty *= repetitionPenalty(notesSince);
+                        break;
+                    }
+                }
+            }
+
+            return penalty;
+        }
+
+        private double patternLengthPenalty(int patternLength)
+        {
+            double shortPatternPenalty = Math.Min(0.15 * patternLength, 1.0);
+            double longPatternPenalty = Math.Max(Math.Min(2.5 - 0.15 * patternLength, 1.0), 0.0);
+            return Math.Min(shortPatternPenalty, longPatternPenalty);
+        }
+
+        // Penalty for notes so slow that alternating is not necessary.
+        private double speedPenalty(double noteLengthMs)
+        {
+            if (noteLengthMs < 80) return 1;
+            if (noteLengthMs < 210) return Math.Max(0, 1.4 - 0.005 * noteLengthMs);
+
+            currentStrain = 0.0;
+            notesSinceRhythmChange = 0;
+            return 0.0;
+        }
+
+        protected override double StrainValueOf(DifficultyHitObject current)
+        {
+            if (!(current.BaseObject is Hit))
+            {
+                currentStrain = 0.0;
+                notesSinceRhythmChange = 0;
+                return 0.0;
+            }
+
+            currentStrain *= strain_decay;
+
+            TaikoDifficultyHitObject hitobject = (TaikoDifficultyHitObject)current;
+            notesSinceRhythmChange += 1;
+
+            if (hitobject.Rhythm.IsRepeat)
+            {
+                return 0.0;
+            }
+
+            double objectStrain = hitobject.Rhythm.Difficulty;
+
+            objectStrain *= repetitionPenalties(hitobject);
+            objectStrain *= patternLengthPenalty(notesSinceRhythmChange);
+            objectStrain *= speedPenalty(hitobject.NoteLength);
+
+            notesSinceRhythmChange = 0;
+
+            currentStrain += objectStrain;
+            return currentStrain;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.cs
deleted file mode 100644
index dd90463113..0000000000
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/SpeedInvariantRhythm.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;
-using System.Collections.Generic;
-using osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Skills;
-using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
-
-namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
-{
-    public class Rhythm : Skill
-    {
-        protected override double SkillMultiplier => 1;
-        protected override double StrainDecayBase => 0;
-        private const double strain_decay = 0.96;
-        private double currentStrain;
-
-        private readonly List<TaikoDifficultyHitObject> ratioObjectHistory = new List<TaikoDifficultyHitObject>();
-        private int ratioHistoryLength;
-        private const int ratio_history_max_length = 8;
-
-        private int rhythmLength;
-
-        // Penalty for repeated sequences of rhythm changes
-        private double repititionPenalty(double timeSinceRepititionMS)
-        {
-            double t = Math.Atan(timeSinceRepititionMS / 3000) / (Math.PI / 2);
-            return t;
-        }
-
-        private double repititionPenalty(int notesSince)
-        {
-            double t = notesSince * 150;
-            t = Math.Atan(t / 3000) / (Math.PI / 2);
-            return t;
-        }
-
-        // Penalty for short patterns
-        // Must be low to buff maps like wizodmiot
-        // Must not be too low for maps like inverse world
-        private double patternLengthPenalty(int patternLength)
-        {
-            double shortPatternPenalty = Math.Min(0.15 * patternLength, 1.0);
-            double longPatternPenalty = Math.Max(Math.Min(2.5 - 0.15 * patternLength, 1.0), 0.0);
-            return Math.Min(shortPatternPenalty, longPatternPenalty);
-        }
-
-        // Penalty for notes so slow that alting is not necessary.
-        private double speedPenalty(double noteLengthMS)
-        {
-            if (noteLengthMS < 80) return 1;
-            // return Math.Max(0, 1.4 - 0.005 * noteLengthMS);
-            if (noteLengthMS < 210) return Math.Max(0, 1.4 - 0.005 * noteLengthMS);
-            if (noteLengthMS < 210) return 0.6;
-
-            currentStrain = 0.0;
-            return 0.0;
-        }
-
-        // Penalty for the first rhythm change in a pattern
-        private const double first_burst_penalty = 0.1;
-        private bool prevIsSpeedup = true;
-
-        protected override double StrainValueOf(DifficultyHitObject dho)
-        {
-            currentStrain *= strain_decay;
-
-            TaikoDifficultyHitObject currentHO = (TaikoDifficultyHitObject)dho;
-            rhythmLength += 1;
-
-            if (!currentHO.HasTimingChange)
-            {
-                return 0.0;
-            }
-
-            double objectDifficulty = currentHO.Rhythm.Difficulty;
-
-            // find repeated ratios
-
-            ratioObjectHistory.Add(currentHO);
-            ratioHistoryLength += 1;
-
-            if (ratioHistoryLength > ratio_history_max_length)
-            {
-                ratioObjectHistory.RemoveAt(0);
-                ratioHistoryLength -= 1;
-            }
-
-            for (int l = 2; l <= ratio_history_max_length / 2; l++)
-            {
-                for (int start = ratioHistoryLength - l - 1; start >= 0; start--)
-                {
-                    bool samePattern = true;
-
-                    for (int i = 0; i < l; i++)
-                    {
-                        if (ratioObjectHistory[start + i].RhythmID != ratioObjectHistory[ratioHistoryLength - l + i].RhythmID)
-                        {
-                            samePattern = false;
-                        }
-                    }
-
-                    if (samePattern) // Repitition found!
-                    {
-                        int notesSince = currentHO.n - ratioObjectHistory[start].n;
-                        objectDifficulty *= repititionPenalty(notesSince);
-                        break;
-                    }
-                }
-            }
-
-            if (currentHO.Rhythm.IsSpeedup())
-            {
-                objectDifficulty *= 1;
-                if (currentHO.Rhythm.IsLargeSpeedup()) objectDifficulty *= 1;
-                if (prevIsSpeedup) objectDifficulty *= 1;
-
-                prevIsSpeedup = true;
-            }
-            else
-            {
-                prevIsSpeedup = false;
-            }
-
-            objectDifficulty *= patternLengthPenalty(rhythmLength);
-            objectDifficulty *= speedPenalty(currentHO.NoteLength);
-
-            rhythmLength = 0;
-
-            currentStrain += objectDifficulty;
-            return currentStrain;
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index 1ecca886df..29c1c3c322 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -2,91 +2,78 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 {
     public class Stamina : Skill
     {
-        private int hand;
-        private int noteNumber = 0;
+        private readonly int hand;
 
         protected override double SkillMultiplier => 1;
-
         protected override double StrainDecayBase => 0.4;
-        // i only add strain every second note so its kind of like using 0.16
 
-        private readonly int maxHistoryLength = 2;
-        private List<double> noteDurationHistory = new List<double>();
-
-        private List<TaikoDifficultyHitObject> lastHitObjects = new List<TaikoDifficultyHitObject>();
+        private const int max_history_length = 2;
+        private readonly List<double> notePairDurationHistory = new List<double>();
 
         private double offhandObjectDuration = double.MaxValue;
 
         // Penalty for tl tap or roll
-        private double cheesePenalty(double last2NoteDuration)
+        private double cheesePenalty(double notePairDuration)
         {
-            if (last2NoteDuration > 125) return 1;
-            if (last2NoteDuration < 100) return 0.6;
+            if (notePairDuration > 125) return 1;
+            if (notePairDuration < 100) return 0.6;
 
-            return 0.6 + (last2NoteDuration - 100) * 0.016;
+            return 0.6 + (notePairDuration - 100) * 0.016;
         }
 
-        private double speedBonus(double last2NoteDuration)
+        private double speedBonus(double notePairDuration)
         {
-            // note that we are only looking at every 2nd note, so a 300bpm stream has a note duration of 100ms.
-            if (last2NoteDuration >= 200) return 0;
-            double bonus = 200 - last2NoteDuration;
+            if (notePairDuration >= 200) return 0;
+
+            double bonus = 200 - notePairDuration;
             bonus *= bonus;
             return bonus / 100000;
         }
 
         protected override double StrainValueOf(DifficultyHitObject current)
         {
-            noteNumber += 1;
-
-            TaikoDifficultyHitObject currentHO = (TaikoDifficultyHitObject)current;
-
-            if (noteNumber % 2 == hand)
+            if (!(current.BaseObject is Hit))
             {
-                lastHitObjects.Add(currentHO);
-                noteDurationHistory.Add(currentHO.NoteLength + offhandObjectDuration);
+                return 0.0;
+            }
 
-                if (noteNumber == 1)
+            TaikoDifficultyHitObject hitObject = (TaikoDifficultyHitObject)current;
+
+            if (hitObject.N % 2 == hand)
+            {
+                double objectStrain = 1;
+
+                if (hitObject.N == 1)
                     return 1;
 
-                if (noteDurationHistory.Count > maxHistoryLength)
-                    noteDurationHistory.RemoveAt(0);
+                notePairDurationHistory.Add(hitObject.NoteLength + offhandObjectDuration);
 
-                double shortestRecentNote = min(noteDurationHistory);
-                double bonus = 0;
-                bonus += speedBonus(shortestRecentNote);
+                if (notePairDurationHistory.Count > max_history_length)
+                    notePairDurationHistory.RemoveAt(0);
 
-                double objectStaminaStrain = 1 + bonus;
-                if (currentHO.StaminaCheese) objectStaminaStrain *= cheesePenalty(currentHO.NoteLength + offhandObjectDuration);
+                double shortestRecentNote = notePairDurationHistory.Min();
+                objectStrain += speedBonus(shortestRecentNote);
 
-                return objectStaminaStrain;
+                if (hitObject.StaminaCheese)
+                    objectStrain *= cheesePenalty(hitObject.NoteLength + offhandObjectDuration);
+
+                return objectStrain;
             }
 
-            offhandObjectDuration = currentHO.NoteLength;
+            offhandObjectDuration = hitObject.NoteLength;
             return 0;
         }
 
-        private static double min(List<double> l)
-        {
-            double minimum = double.MaxValue;
-
-            foreach (double d in l)
-            {
-                if (d < minimum)
-                    minimum = d;
-            }
-
-            return minimum;
-        }
-
         public Stamina(bool rightHand)
         {
             hand = 0;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index dc2b68e0ca..789fd7c63b 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -20,9 +20,22 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 {
     public class TaikoDifficultyCalculator : DifficultyCalculator
     {
-        private const double rhythmSkillMultiplier = 0.15;
-        private const double colourSkillMultiplier = 0.01;
-        private const double staminaSkillMultiplier = 0.02;
+        private const double rhythm_skill_multiplier = 0.014;
+        private const double colour_skill_multiplier = 0.01;
+        private const double stamina_skill_multiplier = 0.02;
+
+        private readonly TaikoDifficultyHitObjectRhythm[] commonRhythms =
+        {
+            new TaikoDifficultyHitObjectRhythm(1, 1, 0.0, true),
+            new TaikoDifficultyHitObjectRhythm(2, 1, 0.3, false),
+            new TaikoDifficultyHitObjectRhythm(1, 2, 0.5, false),
+            new TaikoDifficultyHitObjectRhythm(3, 1, 0.3, false),
+            new TaikoDifficultyHitObjectRhythm(1, 3, 0.35, false),
+            new TaikoDifficultyHitObjectRhythm(3, 2, 0.6, false),
+            new TaikoDifficultyHitObjectRhythm(2, 3, 0.4, false),
+            new TaikoDifficultyHitObjectRhythm(5, 4, 0.5, false),
+            new TaikoDifficultyHitObjectRhythm(4, 5, 0.7, false)
+        };
 
         public TaikoDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
             : base(ruleset, beatmap)
@@ -32,6 +45,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         private double simpleColourPenalty(double staminaDifficulty, double colorDifficulty)
         {
             if (colorDifficulty <= 0) return 0.79 - 0.25;
+
             return 0.79 - Math.Atan(staminaDifficulty / colorDifficulty - 12) / Math.PI / 2;
         }
 
@@ -46,25 +60,22 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         private double rescale(double sr)
         {
-            if (sr <= 1) return sr;
-            sr -= 1;
-            sr = 1.6 * Math.Pow(sr, 0.7);
-            sr += 1;
-            return sr;
+            if (sr < 0) return sr;
+
+            return 10.43 * Math.Log(sr / 8 + 1);
         }
 
-        private double combinedDifficulty(double staminaPenalty, Skill colour, Skill rhythm, Skill stamina1, Skill stamina2)
+        private double locallyCombinedDifficulty(double staminaPenalty, Skill colour, Skill rhythm, Skill stamina1, Skill stamina2)
         {
-
             double difficulty = 0;
             double weight = 1;
             List<double> peaks = new List<double>();
 
             for (int i = 0; i < colour.StrainPeaks.Count; i++)
             {
-                double colourPeak = colour.StrainPeaks[i] * colourSkillMultiplier;
-                double rhythmPeak = rhythm.StrainPeaks[i] * rhythmSkillMultiplier;
-                double staminaPeak = (stamina1.StrainPeaks[i] + stamina2.StrainPeaks[i]) * staminaSkillMultiplier * staminaPenalty;
+                double colourPeak = colour.StrainPeaks[i] * colour_skill_multiplier;
+                double rhythmPeak = rhythm.StrainPeaks[i] * rhythm_skill_multiplier;
+                double staminaPeak = (stamina1.StrainPeaks[i] + stamina2.StrainPeaks[i]) * stamina_skill_multiplier * staminaPenalty;
                 peaks.Add(norm(2, colourPeak, rhythmPeak, staminaPeak));
             }
 
@@ -82,21 +93,15 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             if (beatmap.HitObjects.Count == 0)
                 return new TaikoDifficultyAttributes { Mods = mods, Skills = skills };
 
-            double staminaRating = (skills[2].DifficultyValue() + skills[3].DifficultyValue()) * staminaSkillMultiplier;
-            double colourRating = skills[0].DifficultyValue() * colourSkillMultiplier;
-            double rhythmRating = skills[1].DifficultyValue() * rhythmSkillMultiplier;
+            double colourRating = skills[0].DifficultyValue() * colour_skill_multiplier;
+            double rhythmRating = skills[1].DifficultyValue() * rhythm_skill_multiplier;
+            double staminaRating = (skills[2].DifficultyValue() + skills[3].DifficultyValue()) * stamina_skill_multiplier;
 
             double staminaPenalty = simpleColourPenalty(staminaRating, colourRating);
             staminaRating *= staminaPenalty;
 
-            double combinedRating = combinedDifficulty(staminaPenalty, skills[0], skills[1], skills[2], skills[3]);
-
-            // Console.WriteLine("colour\t" + colourRating);
-            // Console.WriteLine("rhythm\t" + rhythmRating);
-            // Console.WriteLine("stamina\t" + staminaRating);
+            double combinedRating = locallyCombinedDifficulty(staminaPenalty, skills[0], skills[1], skills[2], skills[3]);
             double separatedRating = norm(1.5, colourRating, rhythmRating, staminaRating);
-            // Console.WriteLine("combinedRating\t" + combinedRating);
-            // Console.WriteLine("separatedRating\t" + separatedRating);
             double starRating = 1.4 * separatedRating + 0.5 * combinedRating;
             starRating = rescale(starRating);
 
@@ -111,7 +116,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 RhythmStrain = rhythmRating,
                 ColourStrain = colourRating,
                 // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be removed in the future
-                GreatHitWindow = (int)(hitWindows.WindowFor(HitResult.Great)) / clockRate,
+                GreatHitWindow = (int)hitWindows.WindowFor(HitResult.Great) / clockRate,
                 MaxCombo = beatmap.HitObjects.Count(h => h is Hit),
                 Skills = skills
             };
@@ -120,18 +125,23 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
         {
             List<TaikoDifficultyHitObject> taikoDifficultyHitObjects = new List<TaikoDifficultyHitObject>();
-            var rhythm = new TaikoDifficultyHitObjectRhythm();
 
             for (int i = 2; i < beatmap.HitObjects.Count; i++)
             {
                 // Check for negative durations
                 if (beatmap.HitObjects[i].StartTime > beatmap.HitObjects[i - 1].StartTime && beatmap.HitObjects[i - 1].StartTime > beatmap.HitObjects[i - 2].StartTime)
-                    taikoDifficultyHitObjects.Add(new TaikoDifficultyHitObject(beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate, rhythm));
+                {
+                    taikoDifficultyHitObjects.Add(
+                        new TaikoDifficultyHitObject(
+                            beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate, i, commonRhythms
+                        )
+                    );
+                }
             }
 
             new StaminaCheeseDetector().FindCheese(taikoDifficultyHitObjects);
-            for (int i = 0; i < taikoDifficultyHitObjects.Count; i++)
-                yield return taikoDifficultyHitObjects[i];
+            foreach (var hitobject in taikoDifficultyHitObjects)
+                yield return hitobject;
         }
 
         protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
@@ -149,10 +159,5 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             new TaikoModEasy(),
             new TaikoModHardRock(),
         };
-
-        /*
-        protected override DifficultyAttributes VirtualCalculate(IBeatmap beatmap, Mod[] mods, double clockRate)
-            => taikoCalculate(beatmap, mods, clockRate);
-        */
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
index 9585a6a369..e6dd9f5084 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
@@ -78,10 +78,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
             strainValue *= Math.Pow(0.985, countMiss);
 
-            // Combo scaling
-            if (Attributes.MaxCombo > 0)
-                strainValue *= Math.Min(Math.Pow(Score.MaxCombo, 0.5) / Math.Pow(Attributes.MaxCombo, 0.5), 1.0);
-
             if (mods.Any(m => m is ModHidden))
                 strainValue *= 1.025;
 

From 712fd6a944cc957bcff10721451ffe613c7180c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Jun 2020 17:49:45 +0900
Subject: [PATCH 03145/10326] Fetch existing private message channels on
 re-joining

---
 .../API/Requests/CreateChannelRequest.cs      | 34 +++++++++++++++++++
 .../API/Requests/Responses/APIChatChannel.cs  | 18 ++++++++++
 osu.Game/Online/Chat/Channel.cs               |  3 +-
 osu.Game/Online/Chat/ChannelManager.cs        | 29 ++++++++++------
 4 files changed, 73 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game/Online/API/Requests/CreateChannelRequest.cs
 create mode 100644 osu.Game/Online/API/Requests/Responses/APIChatChannel.cs

diff --git a/osu.Game/Online/API/Requests/CreateChannelRequest.cs b/osu.Game/Online/API/Requests/CreateChannelRequest.cs
new file mode 100644
index 0000000000..42cb201969
--- /dev/null
+++ b/osu.Game/Online/API/Requests/CreateChannelRequest.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.Linq;
+using System.Net.Http;
+using osu.Framework.IO.Network;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Chat;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class CreateChannelRequest : APIRequest<APIChatChannel>
+    {
+        private readonly Channel channel;
+
+        public CreateChannelRequest(Channel channel)
+        {
+            this.channel = channel;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.Method = HttpMethod.Post;
+
+            req.AddParameter("type", $"{ChannelType.PM}");
+            req.AddParameter("target_id", $"{channel.Users.First().Id}");
+
+            return req;
+        }
+
+        protected override string Target => @"chat/channels";
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/APIChatChannel.cs b/osu.Game/Online/API/Requests/Responses/APIChatChannel.cs
new file mode 100644
index 0000000000..fc3b2a8e31
--- /dev/null
+++ b/osu.Game/Online/API/Requests/Responses/APIChatChannel.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 System.Collections.Generic;
+using Newtonsoft.Json;
+using osu.Game.Online.Chat;
+
+namespace osu.Game.Online.API.Requests.Responses
+{
+    public class APIChatChannel
+    {
+        [JsonProperty(@"channel_id")]
+        public int? ChannelID { get; set; }
+
+        [JsonProperty(@"recent_messages")]
+        public List<Message> RecentMessages { get; set; }
+    }
+}
diff --git a/osu.Game/Online/Chat/Channel.cs b/osu.Game/Online/Chat/Channel.cs
index dbb2da5c03..8c1e1ad128 100644
--- a/osu.Game/Online/Chat/Channel.cs
+++ b/osu.Game/Online/Chat/Channel.cs
@@ -84,7 +84,8 @@ namespace osu.Game.Online.Chat
         public long? LastReadId;
 
         /// <summary>
-        /// Signalles if the current user joined this channel or not. Defaults to false.
+        /// Signals if the current user joined this channel or not. Defaults to false.
+        /// Note that this does not guarantee a join has completed. Check Id > 0 for confirmation.
         /// </summary>
         public Bindable<bool> Joined = new Bindable<bool>();
 
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index b17e0812da..9350887feb 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Online.Chat
                 return;
 
             CurrentChannel.Value = JoinedChannels.FirstOrDefault(c => c.Type == ChannelType.PM && c.Users.Count == 1 && c.Users.Any(u => u.Id == user.Id))
-                                   ?? new Channel(user);
+                                   ?? JoinChannel(new Channel(user));
         }
 
         private void currentChannelChanged(ValueChangedEvent<Channel> e)
@@ -140,7 +140,7 @@ namespace osu.Game.Online.Chat
                 target.AddLocalEcho(message);
 
                 // if this is a PM and the first message, we need to do a special request to create the PM channel
-                if (target.Type == ChannelType.PM && !target.Joined.Value)
+                if (target.Type == ChannelType.PM && target.Id == 0)
                 {
                     var createNewPrivateMessageRequest = new CreateNewPrivateMessageRequest(target.Users.First(), message);
 
@@ -356,26 +356,35 @@ namespace osu.Game.Online.Chat
             // ensure we are joined to the channel
             if (!channel.Joined.Value)
             {
+                channel.Joined.Value = true;
+
                 switch (channel.Type)
                 {
                     case ChannelType.Multiplayer:
                         // join is implicit. happens when you join a multiplayer game.
                         // this will probably change in the future.
-                        channel.Joined.Value = true;
                         joinChannel(channel, fetchInitialMessages);
                         return channel;
 
-                    case ChannelType.Private:
-                        // can't do this yet.
+                    case ChannelType.PM:
+                        var createRequest = new CreateChannelRequest(channel);
+                        createRequest.Success += resChannel =>
+                        {
+                            if (resChannel.ChannelID.HasValue)
+                            {
+                                channel.Id = resChannel.ChannelID.Value;
+
+                                handleChannelMessages(resChannel.RecentMessages);
+                                channel.MessagesLoaded = true; // this will mark the channel as having received messages even if there were none.
+                            }
+                        };
+
+                        api.Queue(createRequest);
                         break;
 
                     default:
                         var req = new JoinChannelRequest(channel, api.LocalUser.Value);
-                        req.Success += () =>
-                        {
-                            channel.Joined.Value = true;
-                            joinChannel(channel, fetchInitialMessages);
-                        };
+                        req.Success += () => joinChannel(channel, fetchInitialMessages);
                         req.Failure += ex => LeaveChannel(channel);
                         api.Queue(req);
                         return channel;

From ff555c41c6b667ebd91ba46f166cbd247ffeece3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 8 Jun 2020 08:57:44 +0000
Subject: [PATCH 03146/10326] Bump Sentry from 2.1.1 to 2.1.3

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.1 to 2.1.3.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.1...2.1.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 4d6358575b..c41d0a0cf6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.601.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
-    <PackageReference Include="Sentry" Version="2.1.1" />
+    <PackageReference Include="Sentry" Version="2.1.3" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From bbf8864f1478d609fe2eb7184cbd303e0cc9a14b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 8 Jun 2020 09:45:31 +0000
Subject: [PATCH 03147/10326] Bump Microsoft.Build.Traversal from 2.0.34 to
 2.0.48

Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.34 to 2.0.48.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.0.34...Microsoft.Build.Traversal.2.0.48)

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

diff --git a/global.json b/global.json
index 6c793a3f1d..bdb90eb0e9 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,6 @@
     "version": "3.1.100"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "2.0.34"
+    "Microsoft.Build.Traversal": "2.0.48"
   }
 }
\ No newline at end of file

From e0c94304c79637c86e9304e0471ce37bb139f223 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 8 Jun 2020 09:45:31 +0000
Subject: [PATCH 03148/10326] Bump Humanizer from 2.8.11 to 2.8.26

Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.11 to 2.8.26.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.8.11...v2.8.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c41d0a0cf6..8213719c01 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -20,7 +20,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Dapper" Version="2.0.35" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
-    <PackageReference Include="Humanizer" Version="2.8.11" />
+    <PackageReference Include="Humanizer" Version="2.8.26" />
     <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" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 6b55fa51ff..fd13455c63 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -76,7 +76,7 @@
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
-    <PackageReference Include="Humanizer" Version="2.8.11" />
+    <PackageReference Include="Humanizer" Version="2.8.26" />
     <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" />

From f80cdeac5ce2e6820dd3ba4cb0c6d6530e08105c Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 15:31:30 +0200
Subject: [PATCH 03149/10326] Change transforms to roughly match fallback
 visually

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 7019e1f1a6..8110b973f6 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -127,7 +127,10 @@ namespace osu.Game.Screens.Menu
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Scale = new Vector2(0.5f),
+                        Scale = new Vector2(0.3f),
+                        Width = 750,
+                        Height = 78,
+                        Alpha = 0,
                         Texture = textures.Get(@"Welcome/welcome_text@2x")
                     },
                 };
@@ -139,10 +142,11 @@ namespace osu.Game.Screens.Menu
 
                 double remainingTime() => delay_step_two - TransformDelay;
 
-                using (BeginDelayedSequence(250, true))
+                using (BeginDelayedSequence(0, true))
                 {
-                    welcomeText.FadeIn(700);
-                    welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.5f), remainingTime(), Easing.Out).OnComplete(_ =>
+                    welcomeText.ResizeHeightTo(welcomeText.Height*2, 500, Easing.In);
+                    welcomeText.FadeIn(remainingTime());
+                    welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.1f), remainingTime(), Easing.Out).OnComplete(_ =>
                     {
                         elementContainer.Remove(visualizer);
                         circleContainer.Remove(blackCircle);

From 8a021e0beb39a897816d8da99983eb9de6e4b419 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Jun 2020 22:35:01 +0900
Subject: [PATCH 03150/10326] Use save method in test

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 55368f6676..249a8caba9 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -1,11 +1,10 @@
-// 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;
 using System.IO;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -15,7 +14,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Resources;
@@ -730,25 +728,17 @@ namespace osu.Game.Tests.Beatmaps.IO
                     await osu.Dependencies.Get<BeatmapManager>().Import(temp);
 
                     BeatmapSetInfo setToUpdate = manager.GetAllUsableBeatmapSets()[0];
+
+                    var beatmapInfo = setToUpdate.Beatmaps.First(b => b.RulesetID == 0);
                     Beatmap beatmapToUpdate = (Beatmap)manager.GetWorkingBeatmap(setToUpdate.Beatmaps.First(b => b.RulesetID == 0)).Beatmap;
                     BeatmapSetFileInfo fileToUpdate = setToUpdate.Files.First(f => beatmapToUpdate.BeatmapInfo.Path.Contains(f.Filename));
 
                     string oldMd5Hash = beatmapToUpdate.BeatmapInfo.MD5Hash;
 
-                    using (var stream = new MemoryStream())
-                    {
-                        using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                        {
-                            beatmapToUpdate.HitObjects.Clear();
-                            beatmapToUpdate.HitObjects.Add(new HitCircle { StartTime = 5000 });
+                    beatmapToUpdate.HitObjects.Clear();
+                    beatmapToUpdate.HitObjects.Add(new HitCircle { StartTime = 5000 });
 
-                            new LegacyBeatmapEncoder(beatmapToUpdate).Encode(writer);
-                        }
-
-                        stream.Seek(0, SeekOrigin.Begin);
-
-                        manager.UpdateFile(setToUpdate, fileToUpdate, stream);
-                    }
+                    manager.Save(beatmapInfo, beatmapToUpdate);
 
                     // Check that the old file reference has been removed
                     Assert.That(manager.QueryBeatmapSet(s => s.ID == setToUpdate.ID).Files.All(f => f.ID != fileToUpdate.ID));

From 229a40e6e36ffcba060dc4a2f8594a9f5f6eda60 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 15:39:15 +0200
Subject: [PATCH 03151/10326] Code formatting fixed

Somehow slipped through after pushing
---
 osu.Game/Screens/Menu/IntroWelcome.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 8110b973f6..34be0b6a9f 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Screens.Menu
 
                 using (BeginDelayedSequence(0, true))
                 {
-                    welcomeText.ResizeHeightTo(welcomeText.Height*2, 500, Easing.In);
+                    welcomeText.ResizeHeightTo(welcomeText.Height * 2, 500, Easing.In);
                     welcomeText.FadeIn(remainingTime());
                     welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.1f), remainingTime(), Easing.Out).OnComplete(_ =>
                     {

From ce66b723908356476fdce35691e390a1e3a8b2b5 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 18:25:20 +0200
Subject: [PATCH 03152/10326] Refactor paths

---
 osu.Game.Tournament/TournamentStorage.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/TournamentStorage.cs b/osu.Game.Tournament/TournamentStorage.cs
index d1c8635466..32dd904b2f 100644
--- a/osu.Game.Tournament/TournamentStorage.cs
+++ b/osu.Game.Tournament/TournamentStorage.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tournament
         public readonly TournamentVideoStorage VideoStorage;
 
         public TournamentStorage(GameHost host)
-            : base(host.Storage, string.Empty)
+            : base(host.Storage.GetStorageForDirectory("tournaments"), string.Empty)
         {
             this.host = host;
 
@@ -40,11 +40,10 @@ namespace osu.Game.Tournament
 
             if (!string.IsNullOrEmpty(currentTournament))
             {
-                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory("tournaments" + Path.DirectorySeparatorChar + currentTournament));
+                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(currentTournament));
             }
             else
             {
-                // Migrating old storage format to the new one.
                 migrate();
                 Logger.Log("Migrating files from old storage to new.");
             }
@@ -55,8 +54,8 @@ namespace osu.Game.Tournament
 
         private void migrate()
         {
-            const string default_path = "tournaments/default";
-            var source = new DirectoryInfo(GetFullPath("tournament"));
+            const string default_path = "default";
+            var source = new DirectoryInfo(host.Storage.GetFullPath("tournament"));
             var destination = new DirectoryInfo(GetFullPath(default_path));
 
             Directory.CreateDirectory(destination.FullName);
@@ -64,7 +63,7 @@ namespace osu.Game.Tournament
             if (host.Storage.Exists("bracket.json"))
             {
                 Logger.Log("Migrating bracket to default tournament storage.");
-                var bracketFile = new System.IO.FileInfo(GetFullPath(string.Empty) + Path.DirectorySeparatorChar + GetFiles(string.Empty, "bracket.json").First());
+                var bracketFile = new System.IO.FileInfo(host.Storage.GetFullPath("bracket.json"));
                 attemptOperation(() => bracketFile.CopyTo(Path.Combine(destination.FullName, bracketFile.Name), true));
             }
 

From d2ae146c1ffb56dcb6eababc9df624008d50a589 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 19:51:44 +0200
Subject: [PATCH 03153/10326] Remove unnecessary parameters and implement
 delete

---
 osu.Game.Tournament/TournamentStorage.cs | 42 ++++++++++++++++--------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/TournamentStorage.cs b/osu.Game.Tournament/TournamentStorage.cs
index 32dd904b2f..87a2604d0b 100644
--- a/osu.Game.Tournament/TournamentStorage.cs
+++ b/osu.Game.Tournament/TournamentStorage.cs
@@ -13,17 +13,6 @@ using osu.Game.Tournament.Configuration;
 
 namespace osu.Game.Tournament
 {
-    internal class TournamentVideoStorage : NamespacedResourceStore<byte[]>
-    {
-        public TournamentVideoStorage(Storage storage)
-            : base(new StorageBackedResourceStore(storage), "videos")
-        {
-            AddExtension("m4v");
-            AddExtension("avi");
-            AddExtension("mp4");
-        }
-    }
-
     internal class TournamentStorage : WrappedStorage
     {
         private readonly GameHost host;
@@ -72,9 +61,10 @@ namespace osu.Game.Tournament
             ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_path));
             storageConfig.Set(StorageConfig.CurrentTournament, default_path);
             storageConfig.Save();
+            deleteRecursive(source);
         }
 
-        private void copyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true)
+        private void copyRecursive(DirectoryInfo source, DirectoryInfo destination)
         {
             // based off example code https://docs.microsoft.com/en-us/dotnet/api/system.io.directoryinfo
 
@@ -85,10 +75,26 @@ namespace osu.Game.Tournament
 
             foreach (DirectoryInfo dir in source.GetDirectories())
             {
-                copyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);
+                copyRecursive(dir, destination.CreateSubdirectory(dir.Name));
             }
         }
 
+        private void deleteRecursive(DirectoryInfo target)
+        {
+            foreach (System.IO.FileInfo fi in target.GetFiles())
+            {
+                attemptOperation(() => fi.Delete());
+            }
+
+            foreach (DirectoryInfo dir in target.GetDirectories())
+            {
+                attemptOperation(() => dir.Delete(true));
+            }
+
+            if (target.GetFiles().Length == 0 && target.GetDirectories().Length == 0)
+                attemptOperation(target.Delete);
+        }
+
         private void attemptOperation(Action action, int attempts = 10)
         {
             while (true)
@@ -108,4 +114,14 @@ namespace osu.Game.Tournament
             }
         }
     }
+    internal class TournamentVideoStorage : NamespacedResourceStore<byte[]>
+    {
+        public TournamentVideoStorage(Storage storage)
+            : base(new StorageBackedResourceStore(storage), "videos")
+        {
+            AddExtension("m4v");
+            AddExtension("avi");
+            AddExtension("mp4");
+        }
+    }
 }

From 2f15d7fbac96b253cda0b9c1156e660c9c40dee6 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 20:04:38 +0200
Subject: [PATCH 03154/10326] Code styling fixes

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

diff --git a/osu.Game.Tournament/TournamentStorage.cs b/osu.Game.Tournament/TournamentStorage.cs
index 87a2604d0b..49f3d69be1 100644
--- a/osu.Game.Tournament/TournamentStorage.cs
+++ b/osu.Game.Tournament/TournamentStorage.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using System.Threading;
 using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
@@ -114,6 +113,7 @@ namespace osu.Game.Tournament
             }
         }
     }
+    
     internal class TournamentVideoStorage : NamespacedResourceStore<byte[]>
     {
         public TournamentVideoStorage(Storage storage)

From e821d787b42993865b165f309d843cea5ae2bd38 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 20:13:02 +0200
Subject: [PATCH 03155/10326] Implement suggested changes

Note: LogoVisualisation is likely going to be needed in a separate PR to conform to the review.
---
 osu.Game/Screens/Menu/IntroWelcome.cs | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 34be0b6a9f..4534107ae8 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Menu
                 welcome?.Play();
                 pianoReverb?.Play();
 
-                Scheduler.AddDelayed(delegate
+                Scheduler.AddDelayed(() =>
                 {
                     StartTrack();
                     PrepareMenuLoad();
@@ -146,16 +146,7 @@ namespace osu.Game.Screens.Menu
                 {
                     welcomeText.ResizeHeightTo(welcomeText.Height * 2, 500, Easing.In);
                     welcomeText.FadeIn(remainingTime());
-                    welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.1f), remainingTime(), Easing.Out).OnComplete(_ =>
-                    {
-                        elementContainer.Remove(visualizer);
-                        circleContainer.Remove(blackCircle);
-                        elementContainer.Remove(circleContainer);
-                        Remove(welcomeText);
-                        visualizer.Dispose();
-                        blackCircle.Dispose();
-                        welcomeText.Dispose();
-                    });
+                    welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.1f), remainingTime(), Easing.Out).OnComplete(_ => Expire());
                 }
             }
         }

From 2a5e96002548e306ffe0837747029d0f3f62a4f1 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 21:15:51 +0200
Subject: [PATCH 03156/10326] Move user and skin specific settings to a
 subclass

---
 .../Screens/Menu/BasicLogoVisualisation.cs    | 229 ++++++++++++++++++
 osu.Game/Screens/Menu/LogoVisualisation.cs    | 216 +----------------
 2 files changed, 231 insertions(+), 214 deletions(-)
 create mode 100644 osu.Game/Screens/Menu/BasicLogoVisualisation.cs

diff --git a/osu.Game/Screens/Menu/BasicLogoVisualisation.cs b/osu.Game/Screens/Menu/BasicLogoVisualisation.cs
new file mode 100644
index 0000000000..ab86c38cb4
--- /dev/null
+++ b/osu.Game/Screens/Menu/BasicLogoVisualisation.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 osuTK;
+using osuTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Batches;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.OpenGL.Vertices;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Shaders;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Utils;
+
+namespace osu.Game.Screens.Menu
+{
+    public class BasicLogoVisualisation : Drawable, IHasAccentColour
+    {
+        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+
+        /// <summary>
+        /// The number of bars to jump each update iteration.
+        /// </summary>
+        private const int index_change = 5;
+
+        /// <summary>
+        /// The maximum length of each bar in the visualiser. Will be reduced when kiai is not activated.
+        /// </summary>
+        private const float bar_length = 600;
+
+        /// <summary>
+        /// The number of bars in one rotation of the visualiser.
+        /// </summary>
+        private const int bars_per_visualiser = 200;
+
+        /// <summary>
+        /// How many times we should stretch around the circumference (overlapping overselves).
+        /// </summary>
+        private const float visualiser_rounds = 5;
+
+        /// <summary>
+        /// How much should each bar go down each millisecond (based on a full bar).
+        /// </summary>
+        private const float decay_per_milisecond = 0.0024f;
+
+        /// <summary>
+        /// Number of milliseconds between each amplitude update.
+        /// </summary>
+        private const float time_between_updates = 50;
+
+        /// <summary>
+        /// The minimum amplitude to show a bar.
+        /// </summary>
+        private const float amplitude_dead_zone = 1f / bar_length;
+
+        private int indexOffset;
+
+        public Color4 AccentColour { get; set; }
+
+        private readonly float[] frequencyAmplitudes = new float[256];
+
+        private IShader shader;
+        private readonly Texture texture;
+
+        public BasicLogoVisualisation()
+        {
+            texture = Texture.WhitePixel;
+            Blending = BlendingParameters.Additive;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ShaderManager shaders, IBindable<WorkingBeatmap> beatmap)
+        {
+            this.beatmap.BindTo(beatmap);
+            shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
+        }
+
+        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;
+
+            float[] temporalAmplitudes = track?.CurrentAmplitudes.FrequencyAmplitudes;
+
+            for (int i = 0; i < bars_per_visualiser; i++)
+            {
+                if (track?.IsRunning ?? false)
+                {
+                    float targetAmplitude = (temporalAmplitudes?[(i + indexOffset) % bars_per_visualiser] ?? 0) * (effect?.KiaiMode == true ? 1 : 0.5f);
+                    if (targetAmplitude > frequencyAmplitudes[i])
+                        frequencyAmplitudes[i] = targetAmplitude;
+                }
+                else
+                {
+                    int index = (i + index_change) % bars_per_visualiser;
+                    if (frequencyAmplitudes[index] > frequencyAmplitudes[i])
+                        frequencyAmplitudes[i] = frequencyAmplitudes[index];
+                }
+            }
+
+            indexOffset = (indexOffset + index_change) % bars_per_visualiser;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            var delayed = Scheduler.AddDelayed(updateAmplitudes, time_between_updates, true);
+            delayed.PerformRepeatCatchUpExecutions = false;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            float decayFactor = (float)Time.Elapsed * decay_per_milisecond;
+
+            for (int i = 0; i < bars_per_visualiser; i++)
+            {
+                //3% of extra bar length to make it a little faster when bar is almost at it's minimum
+                frequencyAmplitudes[i] -= decayFactor * (frequencyAmplitudes[i] + 0.03f);
+                if (frequencyAmplitudes[i] < 0)
+                    frequencyAmplitudes[i] = 0;
+            }
+
+            Invalidate(Invalidation.DrawNode);
+        }
+
+        protected override DrawNode CreateDrawNode() => new VisualisationDrawNode(this);
+
+        private class VisualisationDrawNode : DrawNode
+        {
+            protected new BasicLogoVisualisation Source => (BasicLogoVisualisation)base.Source;
+
+            private IShader shader;
+            private Texture texture;
+
+            // Assuming the logo is a circle, we don't need a second dimension.
+            private float size;
+
+            private Color4 colour;
+            private float[] audioData;
+
+            private readonly QuadBatch<TexturedVertex2D> vertexBatch = new QuadBatch<TexturedVertex2D>(100, 10);
+
+            public VisualisationDrawNode(BasicLogoVisualisation source)
+                : base(source)
+            {
+            }
+
+            public override void ApplyState()
+            {
+                base.ApplyState();
+
+                shader = Source.shader;
+                texture = Source.texture;
+                size = Source.DrawSize.X;
+                colour = Source.AccentColour;
+                audioData = Source.frequencyAmplitudes;
+            }
+
+            public override void Draw(Action<TexturedVertex2D> vertexAction)
+            {
+                base.Draw(vertexAction);
+
+                shader.Bind();
+
+                Vector2 inflation = DrawInfo.MatrixInverse.ExtractScale().Xy;
+
+                ColourInfo colourInfo = DrawColourInfo.Colour;
+                colourInfo.ApplyChild(colour);
+
+                if (audioData != null)
+                {
+                    for (int j = 0; j < visualiser_rounds; j++)
+                    {
+                        for (int i = 0; i < bars_per_visualiser; i++)
+                        {
+                            if (audioData[i] < amplitude_dead_zone)
+                                continue;
+
+                            float rotation = MathUtils.DegreesToRadians(i / (float)bars_per_visualiser * 360 + j * 360 / visualiser_rounds);
+                            float rotationCos = MathF.Cos(rotation);
+                            float rotationSin = MathF.Sin(rotation);
+                            // taking the cos and sin to the 0..1 range
+                            var barPosition = new Vector2(rotationCos / 2 + 0.5f, rotationSin / 2 + 0.5f) * size;
+
+                            var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(MathUtils.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * audioData[i]);
+                            // The distance between the position and the sides of the bar.
+                            var bottomOffset = new Vector2(-rotationSin * barSize.X / 2, rotationCos * barSize.X / 2);
+                            // The distance between the bottom side of the bar and the top side.
+                            var amplitudeOffset = new Vector2(rotationCos * barSize.Y, rotationSin * barSize.Y);
+
+                            var rectangle = new Quad(
+                                Vector2Extensions.Transform(barPosition - bottomOffset, DrawInfo.Matrix),
+                                Vector2Extensions.Transform(barPosition - bottomOffset + amplitudeOffset, DrawInfo.Matrix),
+                                Vector2Extensions.Transform(barPosition + bottomOffset, DrawInfo.Matrix),
+                                Vector2Extensions.Transform(barPosition + bottomOffset + amplitudeOffset, DrawInfo.Matrix)
+                            );
+
+                            DrawQuad(
+                                texture,
+                                rectangle,
+                                colourInfo,
+                                null,
+                                vertexBatch.AddAction,
+                                // barSize by itself will make it smooth more in the X axis than in the Y axis, this reverts that.
+                                Vector2.Divide(inflation, barSize.Yx));
+                        }
+                    }
+                }
+
+                shader.Unbind();
+            }
+
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+
+                vertexBatch.Dispose();
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 0db7f2a2dc..e893ef91bb 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -1,90 +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 osuTK;
 using osuTK.Graphics;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Batches;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.OpenGL.Vertices;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Shaders;
-using osu.Framework.Graphics.Textures;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Skinning;
 using osu.Game.Online.API;
 using osu.Game.Users;
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Utils;
 
 namespace osu.Game.Screens.Menu
 {
-    public class LogoVisualisation : Drawable, IHasAccentColour
+    public class LogoVisualisation : BasicLogoVisualisation
     {
-        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
-
-        /// <summary>
-        /// The number of bars to jump each update iteration.
-        /// </summary>
-        private const int index_change = 5;
-
-        /// <summary>
-        /// The maximum length of each bar in the visualiser. Will be reduced when kiai is not activated.
-        /// </summary>
-        private const float bar_length = 600;
-
-        /// <summary>
-        /// The number of bars in one rotation of the visualiser.
-        /// </summary>
-        private const int bars_per_visualiser = 200;
-
-        /// <summary>
-        /// How many times we should stretch around the circumference (overlapping overselves).
-        /// </summary>
-        private const float visualiser_rounds = 5;
-
-        /// <summary>
-        /// How much should each bar go down each millisecond (based on a full bar).
-        /// </summary>
-        private const float decay_per_milisecond = 0.0024f;
-
-        /// <summary>
-        /// Number of milliseconds between each amplitude update.
-        /// </summary>
-        private const float time_between_updates = 50;
-
-        /// <summary>
-        /// The minimum amplitude to show a bar.
-        /// </summary>
-        private const float amplitude_dead_zone = 1f / bar_length;
-
-        private int indexOffset;
-
-        public Color4 AccentColour { get; set; }
-
-        private readonly float[] frequencyAmplitudes = new float[256];
-
-        private IShader shader;
-        private readonly Texture texture;
-
         private Bindable<User> user;
         private Bindable<Skin> skin;
 
-        public LogoVisualisation()
-        {
-            texture = Texture.WhitePixel;
-            Blending = BlendingParameters.Additive;
-        }
-
         [BackgroundDependencyLoader]
-        private void load(ShaderManager shaders, IBindable<WorkingBeatmap> beatmap, IAPIProvider api, SkinManager skinManager)
+        private void load(IAPIProvider api, SkinManager skinManager)
         {
-            this.beatmap.BindTo(beatmap);
-            shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
             user = api.LocalUser.GetBoundCopy();
             skin = skinManager.CurrentSkin.GetBoundCopy();
 
@@ -92,32 +26,6 @@ namespace osu.Game.Screens.Menu
             skin.BindValueChanged(_ => updateColour(), true);
         }
 
-        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;
-
-            float[] temporalAmplitudes = track?.CurrentAmplitudes.FrequencyAmplitudes;
-
-            for (int i = 0; i < bars_per_visualiser; i++)
-            {
-                if (track?.IsRunning ?? false)
-                {
-                    float targetAmplitude = (temporalAmplitudes?[(i + indexOffset) % bars_per_visualiser] ?? 0) * (effect?.KiaiMode == true ? 1 : 0.5f);
-                    if (targetAmplitude > frequencyAmplitudes[i])
-                        frequencyAmplitudes[i] = targetAmplitude;
-                }
-                else
-                {
-                    int index = (i + index_change) % bars_per_visualiser;
-                    if (frequencyAmplitudes[index] > frequencyAmplitudes[i])
-                        frequencyAmplitudes[i] = frequencyAmplitudes[index];
-                }
-            }
-
-            indexOffset = (indexOffset + index_change) % bars_per_visualiser;
-        }
-
         private void updateColour()
         {
             Color4 defaultColour = Color4.White.Opacity(0.2f);
@@ -127,125 +35,5 @@ namespace osu.Game.Screens.Menu
             else
                 AccentColour = defaultColour;
         }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            var delayed = Scheduler.AddDelayed(updateAmplitudes, time_between_updates, true);
-            delayed.PerformRepeatCatchUpExecutions = false;
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            float decayFactor = (float)Time.Elapsed * decay_per_milisecond;
-
-            for (int i = 0; i < bars_per_visualiser; i++)
-            {
-                //3% of extra bar length to make it a little faster when bar is almost at it's minimum
-                frequencyAmplitudes[i] -= decayFactor * (frequencyAmplitudes[i] + 0.03f);
-                if (frequencyAmplitudes[i] < 0)
-                    frequencyAmplitudes[i] = 0;
-            }
-
-            Invalidate(Invalidation.DrawNode);
-        }
-
-        protected override DrawNode CreateDrawNode() => new VisualisationDrawNode(this);
-
-        private class VisualisationDrawNode : DrawNode
-        {
-            protected new LogoVisualisation Source => (LogoVisualisation)base.Source;
-
-            private IShader shader;
-            private Texture texture;
-
-            // Assuming the logo is a circle, we don't need a second dimension.
-            private float size;
-
-            private Color4 colour;
-            private float[] audioData;
-
-            private readonly QuadBatch<TexturedVertex2D> vertexBatch = new QuadBatch<TexturedVertex2D>(100, 10);
-
-            public VisualisationDrawNode(LogoVisualisation source)
-                : base(source)
-            {
-            }
-
-            public override void ApplyState()
-            {
-                base.ApplyState();
-
-                shader = Source.shader;
-                texture = Source.texture;
-                size = Source.DrawSize.X;
-                colour = Source.AccentColour;
-                audioData = Source.frequencyAmplitudes;
-            }
-
-            public override void Draw(Action<TexturedVertex2D> vertexAction)
-            {
-                base.Draw(vertexAction);
-
-                shader.Bind();
-
-                Vector2 inflation = DrawInfo.MatrixInverse.ExtractScale().Xy;
-
-                ColourInfo colourInfo = DrawColourInfo.Colour;
-                colourInfo.ApplyChild(colour);
-
-                if (audioData != null)
-                {
-                    for (int j = 0; j < visualiser_rounds; j++)
-                    {
-                        for (int i = 0; i < bars_per_visualiser; i++)
-                        {
-                            if (audioData[i] < amplitude_dead_zone)
-                                continue;
-
-                            float rotation = MathUtils.DegreesToRadians(i / (float)bars_per_visualiser * 360 + j * 360 / visualiser_rounds);
-                            float rotationCos = MathF.Cos(rotation);
-                            float rotationSin = MathF.Sin(rotation);
-                            // taking the cos and sin to the 0..1 range
-                            var barPosition = new Vector2(rotationCos / 2 + 0.5f, rotationSin / 2 + 0.5f) * size;
-
-                            var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(MathUtils.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * audioData[i]);
-                            // The distance between the position and the sides of the bar.
-                            var bottomOffset = new Vector2(-rotationSin * barSize.X / 2, rotationCos * barSize.X / 2);
-                            // The distance between the bottom side of the bar and the top side.
-                            var amplitudeOffset = new Vector2(rotationCos * barSize.Y, rotationSin * barSize.Y);
-
-                            var rectangle = new Quad(
-                                Vector2Extensions.Transform(barPosition - bottomOffset, DrawInfo.Matrix),
-                                Vector2Extensions.Transform(barPosition - bottomOffset + amplitudeOffset, DrawInfo.Matrix),
-                                Vector2Extensions.Transform(barPosition + bottomOffset, DrawInfo.Matrix),
-                                Vector2Extensions.Transform(barPosition + bottomOffset + amplitudeOffset, DrawInfo.Matrix)
-                            );
-
-                            DrawQuad(
-                                texture,
-                                rectangle,
-                                colourInfo,
-                                null,
-                                vertexBatch.AddAction,
-                                // barSize by itself will make it smooth more in the X axis than in the Y axis, this reverts that.
-                                Vector2.Divide(inflation, barSize.Yx));
-                        }
-                    }
-                }
-
-                shader.Unbind();
-            }
-
-            protected override void Dispose(bool isDisposing)
-            {
-                base.Dispose(isDisposing);
-
-                vertexBatch.Dispose();
-            }
-        }
     }
 }

From d52e3f938637e26aa46e643d57ee6ed4eb25cacd Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 21:26:48 +0200
Subject: [PATCH 03157/10326] Removed logovisualisation changes

Now depends on https://github.com/ppy/osu/pull/9236 for accent color changes to apply
---
 osu.Game/Screens/Menu/IntroWelcome.cs      | 1 -
 osu.Game/Screens/Menu/LogoVisualisation.cs | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 4534107ae8..c1cfccaa69 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -101,7 +101,6 @@ namespace osu.Game.Screens.Menu
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
                                         Alpha = 0.5f,
-                                        IsIntro = true,
                                         AccentColour = Color4.DarkBlue,
                                         Size = new Vector2(0.96f)
                                     },
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index c72b3a6576..0db7f2a2dc 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -70,7 +70,6 @@ namespace osu.Game.Screens.Menu
 
         private IShader shader;
         private readonly Texture texture;
-        public bool IsIntro = false;
 
         private Bindable<User> user;
         private Bindable<Skin> skin;
@@ -89,11 +88,8 @@ namespace osu.Game.Screens.Menu
             user = api.LocalUser.GetBoundCopy();
             skin = skinManager.CurrentSkin.GetBoundCopy();
 
-            if (!IsIntro)
-            {
-                user.ValueChanged += _ => updateColour();
-                skin.BindValueChanged(_ => updateColour(), true);
-            }
+            user.ValueChanged += _ => updateColour();
+            skin.BindValueChanged(_ => updateColour(), true);
         }
 
         private void updateAmplitudes()

From 0b6ae08c93b16c7c055e99f493d52a91ff922a20 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 21:31:03 +0200
Subject: [PATCH 03158/10326] Removed unneeded properties

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index c1cfccaa69..38405fab6a 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -71,10 +71,6 @@ namespace osu.Game.Screens.Menu
         private class WelcomeIntroSequence : Container
         {
             private Sprite welcomeText;
-            private LogoVisualisation visualizer;
-            private Container elementContainer;
-            private Container circleContainer;
-            private Circle blackCircle;
 
             [BackgroundDependencyLoader]
             private void load(TextureStore textures)
@@ -90,12 +86,12 @@ namespace osu.Game.Screens.Menu
                         AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
-                            elementContainer = new Container
+                            new Container
                             {
                                 AutoSizeAxes = Axes.Both,
                                 Children = new Drawable[]
                                 {
-                                    visualizer = new LogoVisualisation
+                                    new LogoVisualisation
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         Anchor = Anchor.Centre,
@@ -104,12 +100,12 @@ namespace osu.Game.Screens.Menu
                                         AccentColour = Color4.DarkBlue,
                                         Size = new Vector2(0.96f)
                                     },
-                                    circleContainer = new Container
+                                    new Container
                                     {
                                         AutoSizeAxes = Axes.Both,
                                         Children = new Drawable[]
                                         {
-                                            blackCircle = new Circle
+                                            new Circle
                                             {
                                                 Anchor = Anchor.Centre,
                                                 Origin = Anchor.Centre,

From a60bb5feac2eae08be730b5def7e9a3df82c3c1d Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 8 Jun 2020 23:45:40 +0200
Subject: [PATCH 03159/10326] Rename baseclass, add xmldoc & change access to
 internal

---
 .../Screens/Menu/BasicLogoVisualisation.cs    | 229 -----------------
 osu.Game/Screens/Menu/LogoVisualisation.cs    | 233 ++++++++++++++++--
 .../Screens/Menu/MenuLogoVisualisation.cs     |  39 +++
 osu.Game/Screens/Menu/OsuLogo.cs              |   4 +-
 4 files changed, 254 insertions(+), 251 deletions(-)
 delete mode 100644 osu.Game/Screens/Menu/BasicLogoVisualisation.cs
 create mode 100644 osu.Game/Screens/Menu/MenuLogoVisualisation.cs

diff --git a/osu.Game/Screens/Menu/BasicLogoVisualisation.cs b/osu.Game/Screens/Menu/BasicLogoVisualisation.cs
deleted file mode 100644
index ab86c38cb4..0000000000
--- a/osu.Game/Screens/Menu/BasicLogoVisualisation.cs
+++ /dev/null
@@ -1,229 +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.Graphics;
-using osu.Framework.Graphics.Batches;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.OpenGL.Vertices;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Shaders;
-using osu.Framework.Graphics.Textures;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using System;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Utils;
-
-namespace osu.Game.Screens.Menu
-{
-    public class BasicLogoVisualisation : Drawable, IHasAccentColour
-    {
-        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
-
-        /// <summary>
-        /// The number of bars to jump each update iteration.
-        /// </summary>
-        private const int index_change = 5;
-
-        /// <summary>
-        /// The maximum length of each bar in the visualiser. Will be reduced when kiai is not activated.
-        /// </summary>
-        private const float bar_length = 600;
-
-        /// <summary>
-        /// The number of bars in one rotation of the visualiser.
-        /// </summary>
-        private const int bars_per_visualiser = 200;
-
-        /// <summary>
-        /// How many times we should stretch around the circumference (overlapping overselves).
-        /// </summary>
-        private const float visualiser_rounds = 5;
-
-        /// <summary>
-        /// How much should each bar go down each millisecond (based on a full bar).
-        /// </summary>
-        private const float decay_per_milisecond = 0.0024f;
-
-        /// <summary>
-        /// Number of milliseconds between each amplitude update.
-        /// </summary>
-        private const float time_between_updates = 50;
-
-        /// <summary>
-        /// The minimum amplitude to show a bar.
-        /// </summary>
-        private const float amplitude_dead_zone = 1f / bar_length;
-
-        private int indexOffset;
-
-        public Color4 AccentColour { get; set; }
-
-        private readonly float[] frequencyAmplitudes = new float[256];
-
-        private IShader shader;
-        private readonly Texture texture;
-
-        public BasicLogoVisualisation()
-        {
-            texture = Texture.WhitePixel;
-            Blending = BlendingParameters.Additive;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(ShaderManager shaders, IBindable<WorkingBeatmap> beatmap)
-        {
-            this.beatmap.BindTo(beatmap);
-            shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
-        }
-
-        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;
-
-            float[] temporalAmplitudes = track?.CurrentAmplitudes.FrequencyAmplitudes;
-
-            for (int i = 0; i < bars_per_visualiser; i++)
-            {
-                if (track?.IsRunning ?? false)
-                {
-                    float targetAmplitude = (temporalAmplitudes?[(i + indexOffset) % bars_per_visualiser] ?? 0) * (effect?.KiaiMode == true ? 1 : 0.5f);
-                    if (targetAmplitude > frequencyAmplitudes[i])
-                        frequencyAmplitudes[i] = targetAmplitude;
-                }
-                else
-                {
-                    int index = (i + index_change) % bars_per_visualiser;
-                    if (frequencyAmplitudes[index] > frequencyAmplitudes[i])
-                        frequencyAmplitudes[i] = frequencyAmplitudes[index];
-                }
-            }
-
-            indexOffset = (indexOffset + index_change) % bars_per_visualiser;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            var delayed = Scheduler.AddDelayed(updateAmplitudes, time_between_updates, true);
-            delayed.PerformRepeatCatchUpExecutions = false;
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            float decayFactor = (float)Time.Elapsed * decay_per_milisecond;
-
-            for (int i = 0; i < bars_per_visualiser; i++)
-            {
-                //3% of extra bar length to make it a little faster when bar is almost at it's minimum
-                frequencyAmplitudes[i] -= decayFactor * (frequencyAmplitudes[i] + 0.03f);
-                if (frequencyAmplitudes[i] < 0)
-                    frequencyAmplitudes[i] = 0;
-            }
-
-            Invalidate(Invalidation.DrawNode);
-        }
-
-        protected override DrawNode CreateDrawNode() => new VisualisationDrawNode(this);
-
-        private class VisualisationDrawNode : DrawNode
-        {
-            protected new BasicLogoVisualisation Source => (BasicLogoVisualisation)base.Source;
-
-            private IShader shader;
-            private Texture texture;
-
-            // Assuming the logo is a circle, we don't need a second dimension.
-            private float size;
-
-            private Color4 colour;
-            private float[] audioData;
-
-            private readonly QuadBatch<TexturedVertex2D> vertexBatch = new QuadBatch<TexturedVertex2D>(100, 10);
-
-            public VisualisationDrawNode(BasicLogoVisualisation source)
-                : base(source)
-            {
-            }
-
-            public override void ApplyState()
-            {
-                base.ApplyState();
-
-                shader = Source.shader;
-                texture = Source.texture;
-                size = Source.DrawSize.X;
-                colour = Source.AccentColour;
-                audioData = Source.frequencyAmplitudes;
-            }
-
-            public override void Draw(Action<TexturedVertex2D> vertexAction)
-            {
-                base.Draw(vertexAction);
-
-                shader.Bind();
-
-                Vector2 inflation = DrawInfo.MatrixInverse.ExtractScale().Xy;
-
-                ColourInfo colourInfo = DrawColourInfo.Colour;
-                colourInfo.ApplyChild(colour);
-
-                if (audioData != null)
-                {
-                    for (int j = 0; j < visualiser_rounds; j++)
-                    {
-                        for (int i = 0; i < bars_per_visualiser; i++)
-                        {
-                            if (audioData[i] < amplitude_dead_zone)
-                                continue;
-
-                            float rotation = MathUtils.DegreesToRadians(i / (float)bars_per_visualiser * 360 + j * 360 / visualiser_rounds);
-                            float rotationCos = MathF.Cos(rotation);
-                            float rotationSin = MathF.Sin(rotation);
-                            // taking the cos and sin to the 0..1 range
-                            var barPosition = new Vector2(rotationCos / 2 + 0.5f, rotationSin / 2 + 0.5f) * size;
-
-                            var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(MathUtils.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * audioData[i]);
-                            // The distance between the position and the sides of the bar.
-                            var bottomOffset = new Vector2(-rotationSin * barSize.X / 2, rotationCos * barSize.X / 2);
-                            // The distance between the bottom side of the bar and the top side.
-                            var amplitudeOffset = new Vector2(rotationCos * barSize.Y, rotationSin * barSize.Y);
-
-                            var rectangle = new Quad(
-                                Vector2Extensions.Transform(barPosition - bottomOffset, DrawInfo.Matrix),
-                                Vector2Extensions.Transform(barPosition - bottomOffset + amplitudeOffset, DrawInfo.Matrix),
-                                Vector2Extensions.Transform(barPosition + bottomOffset, DrawInfo.Matrix),
-                                Vector2Extensions.Transform(barPosition + bottomOffset + amplitudeOffset, DrawInfo.Matrix)
-                            );
-
-                            DrawQuad(
-                                texture,
-                                rectangle,
-                                colourInfo,
-                                null,
-                                vertexBatch.AddAction,
-                                // barSize by itself will make it smooth more in the X axis than in the Y axis, this reverts that.
-                                Vector2.Divide(inflation, barSize.Yx));
-                        }
-                    }
-                }
-
-                shader.Unbind();
-            }
-
-            protected override void Dispose(bool isDisposing)
-            {
-                base.Dispose(isDisposing);
-
-                vertexBatch.Dispose();
-            }
-        }
-    }
-}
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index e893ef91bb..6a28740d4e 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -1,39 +1,232 @@
 // Copyright (c) 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.Game.Skinning;
-using osu.Game.Online.API;
-using osu.Game.Users;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Batches;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.OpenGL.Vertices;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Shaders;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Utils;
 
 namespace osu.Game.Screens.Menu
 {
-    public class LogoVisualisation : BasicLogoVisualisation
+    /// <summary>
+    /// A visualiser that reacts to music coming from beatmaps.
+    /// </summary>
+    public class LogoVisualisation : Drawable, IHasAccentColour
     {
-        private Bindable<User> user;
-        private Bindable<Skin> skin;
+        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api, SkinManager skinManager)
+        /// <summary>
+        /// The number of bars to jump each update iteration.
+        /// </summary>
+        private const int index_change = 5;
+
+        /// <summary>
+        /// The maximum length of each bar in the visualiser. Will be reduced when kiai is not activated.
+        /// </summary>
+        private const float bar_length = 600;
+
+        /// <summary>
+        /// The number of bars in one rotation of the visualiser.
+        /// </summary>
+        private const int bars_per_visualiser = 200;
+
+        /// <summary>
+        /// How many times we should stretch around the circumference (overlapping overselves).
+        /// </summary>
+        private const float visualiser_rounds = 5;
+
+        /// <summary>
+        /// How much should each bar go down each millisecond (based on a full bar).
+        /// </summary>
+        private const float decay_per_milisecond = 0.0024f;
+
+        /// <summary>
+        /// Number of milliseconds between each amplitude update.
+        /// </summary>
+        private const float time_between_updates = 50;
+
+        /// <summary>
+        /// The minimum amplitude to show a bar.
+        /// </summary>
+        private const float amplitude_dead_zone = 1f / bar_length;
+
+        private int indexOffset;
+
+        public Color4 AccentColour { get; set; }
+
+        private readonly float[] frequencyAmplitudes = new float[256];
+
+        private IShader shader;
+        private readonly Texture texture;
+
+        public LogoVisualisation()
         {
-            user = api.LocalUser.GetBoundCopy();
-            skin = skinManager.CurrentSkin.GetBoundCopy();
-
-            user.ValueChanged += _ => updateColour();
-            skin.BindValueChanged(_ => updateColour(), true);
+            texture = Texture.WhitePixel;
+            Blending = BlendingParameters.Additive;
         }
 
-        private void updateColour()
+        [BackgroundDependencyLoader]
+        private void load(ShaderManager shaders, IBindable<WorkingBeatmap> beatmap)
         {
-            Color4 defaultColour = Color4.White.Opacity(0.2f);
+            this.beatmap.BindTo(beatmap);
+            shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
+        }
 
-            if (user.Value?.IsSupporter ?? false)
-                AccentColour = skin.Value.GetConfig<GlobalSkinColours, Color4>(GlobalSkinColours.MenuGlow)?.Value ?? defaultColour;
-            else
-                AccentColour = defaultColour;
+        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;
+
+            float[] temporalAmplitudes = track?.CurrentAmplitudes.FrequencyAmplitudes;
+
+            for (int i = 0; i < bars_per_visualiser; i++)
+            {
+                if (track?.IsRunning ?? false)
+                {
+                    float targetAmplitude = (temporalAmplitudes?[(i + indexOffset) % bars_per_visualiser] ?? 0) * (effect?.KiaiMode == true ? 1 : 0.5f);
+                    if (targetAmplitude > frequencyAmplitudes[i])
+                        frequencyAmplitudes[i] = targetAmplitude;
+                }
+                else
+                {
+                    int index = (i + index_change) % bars_per_visualiser;
+                    if (frequencyAmplitudes[index] > frequencyAmplitudes[i])
+                        frequencyAmplitudes[i] = frequencyAmplitudes[index];
+                }
+            }
+
+            indexOffset = (indexOffset + index_change) % bars_per_visualiser;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            var delayed = Scheduler.AddDelayed(updateAmplitudes, time_between_updates, true);
+            delayed.PerformRepeatCatchUpExecutions = false;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            float decayFactor = (float)Time.Elapsed * decay_per_milisecond;
+
+            for (int i = 0; i < bars_per_visualiser; i++)
+            {
+                //3% of extra bar length to make it a little faster when bar is almost at it's minimum
+                frequencyAmplitudes[i] -= decayFactor * (frequencyAmplitudes[i] + 0.03f);
+                if (frequencyAmplitudes[i] < 0)
+                    frequencyAmplitudes[i] = 0;
+            }
+
+            Invalidate(Invalidation.DrawNode);
+        }
+
+        protected override DrawNode CreateDrawNode() => new VisualisationDrawNode(this);
+
+        private class VisualisationDrawNode : DrawNode
+        {
+            protected new LogoVisualisation Source => (LogoVisualisation)base.Source;
+
+            private IShader shader;
+            private Texture texture;
+
+            // Assuming the logo is a circle, we don't need a second dimension.
+            private float size;
+
+            private Color4 colour;
+            private float[] audioData;
+
+            private readonly QuadBatch<TexturedVertex2D> vertexBatch = new QuadBatch<TexturedVertex2D>(100, 10);
+
+            public VisualisationDrawNode(LogoVisualisation source)
+                : base(source)
+            {
+            }
+
+            public override void ApplyState()
+            {
+                base.ApplyState();
+
+                shader = Source.shader;
+                texture = Source.texture;
+                size = Source.DrawSize.X;
+                colour = Source.AccentColour;
+                audioData = Source.frequencyAmplitudes;
+            }
+
+            public override void Draw(Action<TexturedVertex2D> vertexAction)
+            {
+                base.Draw(vertexAction);
+
+                shader.Bind();
+
+                Vector2 inflation = DrawInfo.MatrixInverse.ExtractScale().Xy;
+
+                ColourInfo colourInfo = DrawColourInfo.Colour;
+                colourInfo.ApplyChild(colour);
+
+                if (audioData != null)
+                {
+                    for (int j = 0; j < visualiser_rounds; j++)
+                    {
+                        for (int i = 0; i < bars_per_visualiser; i++)
+                        {
+                            if (audioData[i] < amplitude_dead_zone)
+                                continue;
+
+                            float rotation = MathUtils.DegreesToRadians(i / (float)bars_per_visualiser * 360 + j * 360 / visualiser_rounds);
+                            float rotationCos = MathF.Cos(rotation);
+                            float rotationSin = MathF.Sin(rotation);
+                            // taking the cos and sin to the 0..1 range
+                            var barPosition = new Vector2(rotationCos / 2 + 0.5f, rotationSin / 2 + 0.5f) * size;
+
+                            var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(MathUtils.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * audioData[i]);
+                            // The distance between the position and the sides of the bar.
+                            var bottomOffset = new Vector2(-rotationSin * barSize.X / 2, rotationCos * barSize.X / 2);
+                            // The distance between the bottom side of the bar and the top side.
+                            var amplitudeOffset = new Vector2(rotationCos * barSize.Y, rotationSin * barSize.Y);
+
+                            var rectangle = new Quad(
+                                Vector2Extensions.Transform(barPosition - bottomOffset, DrawInfo.Matrix),
+                                Vector2Extensions.Transform(barPosition - bottomOffset + amplitudeOffset, DrawInfo.Matrix),
+                                Vector2Extensions.Transform(barPosition + bottomOffset, DrawInfo.Matrix),
+                                Vector2Extensions.Transform(barPosition + bottomOffset + amplitudeOffset, DrawInfo.Matrix)
+                            );
+
+                            DrawQuad(
+                                texture,
+                                rectangle,
+                                colourInfo,
+                                null,
+                                vertexBatch.AddAction,
+                                // barSize by itself will make it smooth more in the X axis than in the Y axis, this reverts that.
+                                Vector2.Divide(inflation, barSize.Yx));
+                        }
+                    }
+                }
+
+                shader.Unbind();
+            }
+
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+
+                vertexBatch.Dispose();
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
new file mode 100644
index 0000000000..5eb3f1efa0
--- /dev/null
+++ b/osu.Game/Screens/Menu/MenuLogoVisualisation.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 osuTK.Graphics;
+using osu.Game.Skinning;
+using osu.Game.Online.API;
+using osu.Game.Users;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+
+namespace osu.Game.Screens.Menu
+{
+    internal class MenuLogoVisualisation : LogoVisualisation
+    {
+        private Bindable<User> user;
+        private Bindable<Skin> skin;
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api, SkinManager skinManager)
+        {
+            user = api.LocalUser.GetBoundCopy();
+            skin = skinManager.CurrentSkin.GetBoundCopy();
+
+            user.ValueChanged += _ => updateColour();
+            skin.BindValueChanged(_ => updateColour(), true);
+        }
+
+        private void updateColour()
+        {
+            Color4 defaultColour = Color4.White.Opacity(0.2f);
+
+            if (user.Value?.IsSupporter ?? false)
+                AccentColour = skin.Value.GetConfig<GlobalSkinColours, Color4>(GlobalSkinColours.MenuGlow)?.Value ?? defaultColour;
+            else
+                AccentColour = defaultColour;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 800520100e..9cadfd7df6 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Menu
         private readonly Container logoBeatContainer;
         private readonly Container logoAmplitudeContainer;
         private readonly Container logoHoverContainer;
-        private readonly LogoVisualisation visualizer;
+        private readonly MenuLogoVisualisation visualizer;
 
         private readonly IntroSequence intro;
 
@@ -139,7 +139,7 @@ namespace osu.Game.Screens.Menu
                                             AutoSizeAxes = Axes.Both,
                                             Children = new Drawable[]
                                             {
-                                                visualizer = new LogoVisualisation
+                                                visualizer = new MenuLogoVisualisation
                                                 {
                                                     RelativeSizeAxes = Axes.Both,
                                                     Origin = Anchor.Centre,

From 44dd7d65bee35d52cce4de57ab79080decb3dce9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 9 Jun 2020 18:21:37 +0900
Subject: [PATCH 03160/10326] Fix duplicate scores showing

---
 osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs |  2 +-
 osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs         | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs b/osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs
index 50b62cd6ed..8eb2952159 100644
--- a/osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs
+++ b/osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs
@@ -8,7 +8,7 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class SubmitRoomScoreRequest : APIRequest
+    public class SubmitRoomScoreRequest : APIRequest<RoomScore>
     {
         private readonly int scoreId;
         private readonly int roomId;
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index fbe9e3480f..cf0197d26b 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -97,22 +97,18 @@ namespace osu.Game.Screens.Multi.Play
         }
 
         protected override ScoreInfo CreateScore()
-        {
-            submitScore();
-            return base.CreateScore();
-        }
-
-        private void submitScore()
         {
             var score = base.CreateScore();
-
             score.TotalScore = (int)Math.Round(ScoreProcessor.GetStandardisedScore());
 
             Debug.Assert(token != null);
 
             var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score);
+            request.Success += s => score.OnlineScoreID = s.ID;
             request.Failure += e => Logger.Error(e, "Failed to submit score");
             api.Queue(request);
+
+            return score;
         }
 
         protected override void Dispose(bool isDisposing)

From 4fd5ff61eb1b6a01543689c04b2f84daf9160dd0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 9 Jun 2020 18:53:55 +0900
Subject: [PATCH 03161/10326] Add loading spinner

---
 .../TestSceneTimeshiftResultsScreen.cs        | 67 +++++++++++++++----
 .../Multi/Ranking/TimeshiftResultsScreen.cs   | 29 +++++++-
 2 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index 8559e7e2f4..66ebf9abda 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -18,19 +19,52 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneTimeshiftResultsScreen : ScreenTestScene
     {
+        private bool roomsReceived;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            roomsReceived = false;
+            bindHandler();
+        });
+
         [Test]
         public void TestShowResultsWithScore()
         {
             createResults(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            AddWaitStep("wait for display", 5);
         }
 
         [Test]
         public void TestShowResultsNullScore()
         {
             createResults(null);
+            AddWaitStep("wait for display", 5);
+        }
+
+        [Test]
+        public void TestShowResultsNullScoreWithDelay()
+        {
+            AddStep("bind delayed handler", () => bindHandler(3000));
+            createResults(null);
+            AddUntilStep("wait for rooms to be received", () => roomsReceived);
+            AddWaitStep("wait for display", 5);
         }
 
         private void createResults(ScoreInfo score)
+        {
+            AddStep("load results", () =>
+            {
+                LoadScreen(new TimeshiftResultsScreen(score, 1, new PlaylistItem
+                {
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
+                }));
+            });
+
+        }
+
+        private void bindHandler(double delay = 0)
         {
             var roomScores = new List<RoomScore>();
 
@@ -61,26 +95,31 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             }
 
-            AddStep("bind request handler", () => ((DummyAPIAccess)API).HandleRequest = request =>
+            ((DummyAPIAccess)API).HandleRequest = request =>
             {
                 switch (request)
                 {
                     case GetRoomPlaylistScoresRequest r:
-                        r.TriggerSuccess(new RoomPlaylistScores { Scores = roomScores });
+                        if (delay == 0)
+                            success();
+                        else
+                        {
+                            Task.Run(async () =>
+                            {
+                                await Task.Delay(TimeSpan.FromMilliseconds(delay));
+                                Schedule(success);
+                            });
+                        }
+
+                        void success()
+                        {
+                            r.TriggerSuccess(new RoomPlaylistScores { Scores = roomScores });
+                            roomsReceived = true;
+                        }
+
                         break;
                 }
-            });
-
-            AddStep("load results", () =>
-            {
-                LoadScreen(new TimeshiftResultsScreen(score, 1, new PlaylistItem
-                {
-                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
-                }));
-            });
-
-            AddWaitStep("wait for display", 10);
+            };
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index d95cee2ab8..5cafc974f1 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -4,6 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+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.API.Requests;
 using osu.Game.Online.Multiplayer;
@@ -17,6 +21,8 @@ namespace osu.Game.Screens.Multi.Ranking
         private readonly int roomId;
         private readonly PlaylistItem playlistItem;
 
+        private LoadingSpinner loadingLayer;
+
         public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry = true)
             : base(score, allowRetry)
         {
@@ -24,10 +30,31 @@ namespace osu.Game.Screens.Multi.Ranking
             this.playlistItem = playlistItem;
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(loadingLayer = new LoadingLayer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                X = -10,
+                State = { Value = Score == null ? Visibility.Visible : Visibility.Hidden },
+                Padding = new MarginPadding { Bottom = TwoLayerButton.SIZE_EXTENDED.Y }
+            });
+        }
+
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
             var req = new GetRoomPlaylistScoresRequest(roomId, playlistItem.ID);
-            req.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.ID != Score?.OnlineScoreID).Select(s => s.CreateScoreInfo(playlistItem)));
+
+            req.Success += r =>
+            {
+                scoresCallback?.Invoke(r.Scores.Where(s => s.ID != Score?.OnlineScoreID).Select(s => s.CreateScoreInfo(playlistItem)));
+                loadingLayer.Hide();
+            };
+
+            req.Failure += _ => loadingLayer.Hide();
+
             return req;
         }
     }

From 05b1edb9d88135667cf9893a414fa08e4cc4dad6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 9 Jun 2020 19:01:02 +0900
Subject: [PATCH 03162/10326] Fix incorrect beatmap showing

---
 .../Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs   | 1 -
 .../Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs  | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index 66ebf9abda..9fc7c336cb 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -61,7 +61,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     Ruleset = { Value = new OsuRuleset().RulesetInfo }
                 }));
             });
-
         }
 
         private void bindHandler(double delay = 0)
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 81d5d113ae..b06ef8ae83 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -4,11 +4,9 @@
 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.Localisation;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -52,9 +50,9 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load(Bindable<WorkingBeatmap> working)
+        private void load()
         {
-            var beatmap = working.Value.BeatmapInfo;
+            var beatmap = score.Beatmap;
             var metadata = beatmap.Metadata;
             var creator = metadata.Author?.Username;
 

From ab10732a788c8dbe09d658e19f35c2707c70c8cd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 9 Jun 2020 22:13:48 +0900
Subject: [PATCH 03163/10326] Remove usages of null-forgiving operator

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs      | 15 ++++++++++-----
 .../Visual/UserInterface/TestSceneOsuIcon.cs      |  8 +++++++-
 osu.Game/Online/API/APIAccess.cs                  |  3 ++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index d1a859c84b..600c820ce1 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -428,23 +428,28 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(5, result.Links.Count);
 
             Link f = result.Links.Find(l => l.Url == "https://osu.ppy.sh/wiki/wiki links");
-            Assert.AreEqual(44, f!.Index);
+            Assert.That(f, Is.Not.Null);
+            Assert.AreEqual(44, f.Index);
             Assert.AreEqual(10, f.Length);
 
             f = result.Links.Find(l => l.Url == "http://www.simple-test.com");
-            Assert.AreEqual(10, f!.Index);
+            Assert.That(f, Is.Not.Null);
+            Assert.AreEqual(10, f.Index);
             Assert.AreEqual(11, f.Length);
 
             f = result.Links.Find(l => l.Url == "http://google.com");
-            Assert.AreEqual(97, f!.Index);
+            Assert.That(f, Is.Not.Null);
+            Assert.AreEqual(97, f.Index);
             Assert.AreEqual(4, f.Length);
 
             f = result.Links.Find(l => l.Url == "https://osu.ppy.sh");
-            Assert.AreEqual(78, f!.Index);
+            Assert.That(f, Is.Not.Null);
+            Assert.AreEqual(78, f.Index);
             Assert.AreEqual(18, f.Length);
 
             f = result.Links.Find(l => l.Url == "\uD83D\uDE12");
-            Assert.AreEqual(101, f!.Index);
+            Assert.That(f, Is.Not.Null);
+            Assert.AreEqual(101, f.Index);
             Assert.AreEqual(3, f.Length);
         }
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuIcon.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuIcon.cs
index 246eb119e8..c5374d50ab 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuIcon.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuIcon.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 System.Reflection;
 using NUnit.Framework;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -45,7 +46,12 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             foreach (var p in typeof(OsuIcon).GetProperties(BindingFlags.Public | BindingFlags.Static))
-                flow.Add(new Icon($"{nameof(OsuIcon)}.{p.Name}", (IconUsage)p.GetValue(null)!));
+            {
+                var propValue = p.GetValue(null);
+                Debug.Assert(propValue != null);
+
+                flow.Add(new Icon($"{nameof(OsuIcon)}.{p.Name}", (IconUsage)propValue));
+            }
 
             AddStep("toggle shadows", () => flow.Children.ForEach(i => i.SpriteIcon.Shadow = !i.SpriteIcon.Shadow));
             AddStep("change icons", () => flow.Children.ForEach(i => i.SpriteIcon.Icon = new IconUsage((char)(i.SpriteIcon.Icon.Icon + 1))));
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index f9e2da9af8..4ea5c192fe 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ExceptionExtensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Configuration;
@@ -250,7 +251,7 @@ namespace osu.Game.Online.API
             {
                 try
                 {
-                    return JObject.Parse(req.GetResponseString()).SelectToken("form_error", true)!.ToObject<RegistrationRequest.RegistrationRequestErrors>();
+                    return JObject.Parse(req.GetResponseString()).SelectToken("form_error", true).AsNonNull().ToObject<RegistrationRequest.RegistrationRequestErrors>();
                 }
                 catch
                 {

From 7274213cce3d5a1776bcc715d0f90e73b235a808 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Jun 2020 23:30:42 +0900
Subject: [PATCH 03164/10326] 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 07be3ab0d2..596e5bfa8b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.601.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.609.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8213719c01..1d3bafbfd6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.601.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.609.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
     <PackageReference Include="Sentry" Version="2.1.3" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index fd13455c63..ad7850599b 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.Framework.iOS" Version="2020.601.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.609.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.601.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.609.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 7dc19220e51947f92b9c1dfe381d96098ffe637e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Jun 2020 23:38:54 +0900
Subject: [PATCH 03165/10326] Apply new resharper formatting fixes

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs | 11 ++++++-----
 .../Screens/Gameplay/Components/TeamScoreDisplay.cs   |  5 ++++-
 osu.Game/Rulesets/Mods/ModEasy.cs                     |  4 +++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index f5b20fd1c5..a69646507a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -61,7 +61,9 @@ namespace osu.Game.Rulesets.Osu.Tests
         private DrawableSlider slider;
 
         [SetUpSteps]
-        public override void SetUpSteps() { }
+        public override void SetUpSteps()
+        {
+        }
 
         [TestCase(0)]
         [TestCase(1)]
@@ -132,10 +134,9 @@ namespace osu.Game.Rulesets.Osu.Tests
             checkPositionChange(16600, sliderRepeat, positionDecreased);
         }
 
-        private void retrieveDrawableSlider(int index) => AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
-        {
-            slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(index);
-        });
+        private void retrieveDrawableSlider(int index) =>
+            AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
+                slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(index));
 
         private void ensureSnakingIn(double startTime) => checkPositionChange(startTime, sliderEnd, positionIncreased);
         private void ensureNoSnakingIn(double startTime) => checkPositionChange(startTime, sliderEnd, positionRemainsSame);
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
index 3e60a03f92..da55ba53ea 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
@@ -21,7 +21,10 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private TeamDisplay teamDisplay;
 
-        public bool ShowScore { set => teamDisplay.ShowScore = value; }
+        public bool ShowScore
+        {
+            set => teamDisplay.ShowScore = value;
+        }
 
         public TeamScoreDisplay(TeamColour teamColour)
         {
diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index 7cf9656810..c6f3930029 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -35,7 +35,9 @@ namespace osu.Game.Rulesets.Mods
 
         private BindableNumber<double> health;
 
-        public void ReadFromDifficulty(BeatmapDifficulty difficulty) { }
+        public void ReadFromDifficulty(BeatmapDifficulty difficulty)
+        {
+        }
 
         public void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {

From 880a1272288d04cf7eea92b94b39ca7037375e48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Jun 2020 00:08:48 +0900
Subject: [PATCH 03166/10326] Use async overload

---
 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 f145d90356..0151678db3 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
                         // arbitrary write to non-hashed file
                         using (var sw = new FileInfo(Directory.GetFiles(extractedFolder, "*.mp3").First()).AppendText())
-                            sw.WriteLine("text");
+                            await sw.WriteLineAsync("text");
 
                         using (var zip = ZipArchive.Create())
                         {

From 3ae1df07b0c13acefc6a700f07f7a9b74da4a102 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Jun 2020 00:09:29 +0900
Subject: [PATCH 03167/10326] Fix a couple more new formatting issues

---
 .../Screens/Gameplay/Components/TeamDisplay.cs               | 5 ++++-
 osu.Game/Rulesets/Mods/ModHardRock.cs                        | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 29908e8e7c..b01c93ae03 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -14,7 +14,10 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
     {
         private readonly TeamScore score;
 
-        public bool ShowScore { set => score.FadeTo(value ? 1 : 0, 200); }
+        public bool ShowScore
+        {
+            set => score.FadeTo(value ? 1 : 0, 200);
+        }
 
         public TeamDisplay(TournamentTeam team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
             : base(team)
diff --git a/osu.Game/Rulesets/Mods/ModHardRock.cs b/osu.Game/Rulesets/Mods/ModHardRock.cs
index 58c9a58408..0e589735c1 100644
--- a/osu.Game/Rulesets/Mods/ModHardRock.cs
+++ b/osu.Game/Rulesets/Mods/ModHardRock.cs
@@ -17,7 +17,9 @@ namespace osu.Game.Rulesets.Mods
         public override string Description => "Everything just got a bit harder...";
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModDifficultyAdjust) };
 
-        public void ReadFromDifficulty(BeatmapDifficulty difficulty) { }
+        public void ReadFromDifficulty(BeatmapDifficulty difficulty)
+        {
+        }
 
         public void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {

From 417919320cfa8400146832ca44bcce33ca660e8b Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 9 Jun 2020 17:28:42 +0200
Subject: [PATCH 03168/10326] change namespace to osu.Game.Tournament.IO

---
 osu.Game.Tournament/Components/TourneyVideo.cs    | 1 +
 osu.Game.Tournament/{ => IO}/TournamentStorage.cs | 2 +-
 osu.Game.Tournament/TournamentGameBase.cs         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename osu.Game.Tournament/{ => IO}/TournamentStorage.cs (99%)

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 131fa9450d..dcb08464dd 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Video;
 using osu.Framework.Timing;
 using osu.Game.Graphics;
+using osu.Game.Tournament.IO;
 
 namespace osu.Game.Tournament.Components
 {
diff --git a/osu.Game.Tournament/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
similarity index 99%
rename from osu.Game.Tournament/TournamentStorage.cs
rename to osu.Game.Tournament/IO/TournamentStorage.cs
index 49f3d69be1..7690051c7a 100644
--- a/osu.Game.Tournament/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -10,7 +10,7 @@ using osu.Game.IO;
 using System.IO;
 using osu.Game.Tournament.Configuration;
 
-namespace osu.Game.Tournament
+namespace osu.Game.Tournament.IO
 {
     internal class TournamentStorage : WrappedStorage
     {
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index e3d310a497..ccfbf37d48 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -20,6 +20,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Online.API.Requests;
 using osu.Game.Tournament.IPC;
+using osu.Game.Tournament.IO;
 using osu.Game.Tournament.Models;
 using osu.Game.Users;
 using osuTK;

From e57a2294743e216415aeffa3cfdc12514721dd49 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 9 Jun 2020 20:22:30 +0200
Subject: [PATCH 03169/10326] Move all the graphics related code to
 TournamentGame

---
 osu.Game.Tournament/TournamentGame.cs     | 97 +++++++++++++++++++++--
 osu.Game.Tournament/TournamentGameBase.cs | 94 +---------------------
 2 files changed, 92 insertions(+), 99 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 78bb66d553..8a0190b902 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -1,11 +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.Drawing;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Colour;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Tournament.Models;
+using osu.Game.Graphics;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tournament
@@ -21,17 +29,94 @@ namespace osu.Game.Tournament
         public static readonly Color4 ELEMENT_FOREGROUND_COLOUR = Color4Extensions.FromHex("#000");
 
         public static readonly Color4 TEXT_COLOUR = Color4Extensions.FromHex("#fff");
+        private Drawable heightWarning;
+        private Bindable<Size> windowSize;
+
+        [BackgroundDependencyLoader]
+        private void load(FrameworkConfigManager frameworkConfig)
+        {
+            windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
+            windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
+            {
+                var minWidth = (int)(size.NewValue.Height / 768f * TournamentSceneManager.REQUIRED_WIDTH) - 1;
+
+                heightWarning.Alpha = size.NewValue.Width < minWidth ? 1 : 0;
+            }), true);
+
+            AddRange(new[]
+            {
+                new Container
+                {
+                    CornerRadius = 10,
+                    Depth = float.MinValue,
+                    Position = new Vector2(5),
+                    Masking = true,
+                    AutoSizeAxes = Axes.Both,
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    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
+                {
+                    Masking = true,
+                    CornerRadius = 5,
+                    Depth = float.MinValue,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.Red,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new TournamentSpriteText
+                        {
+                            Text = "Please make the window wider",
+                            Font = OsuFont.Torus.With(weight: FontWeight.Bold),
+                            Colour = Color4.White,
+                            Padding = new MarginPadding(20)
+                        }
+                    }
+                },
+                new OsuContextMenuContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new TournamentSceneManager()
+                }
+            });
+        }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            Add(new OsuContextMenuContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Child = new TournamentSceneManager()
-            });
-
+            MenuCursorContainer.Cursor.AlwaysPresent = true; // required for tooltip display
             // we don't want to show the menu cursor as it would appear on stream output.
             MenuCursorContainer.Cursor.Alpha = 0;
         }
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 85db9e61fb..cc7bb863ed 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -2,28 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Configuration;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 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;
 
 namespace osu.Game.Tournament
@@ -40,19 +31,15 @@ namespace osu.Game.Tournament
         private TournamentStorage tournamentStorage;
 
         private DependencyContainer dependencies;
-
-        private Bindable<Size> windowSize;
         private FileBasedIPC ipc;
 
-        private Drawable heightWarning;
-
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             return dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
         }
 
         [BackgroundDependencyLoader]
-        private void load(Storage storage, FrameworkConfigManager frameworkConfig)
+        private void load(Storage storage)
         {
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
@@ -62,83 +49,12 @@ namespace osu.Game.Tournament
 
             this.storage = storage;
 
-            windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
-            windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
-            {
-                var minWidth = (int)(size.NewValue.Height / 768f * TournamentSceneManager.REQUIRED_WIDTH) - 1;
-
-                heightWarning.Alpha = size.NewValue.Width < minWidth ? 1 : 0;
-            }), true);
-
             readBracket();
 
             ladder.CurrentMatch.Value = ladder.Matches.FirstOrDefault(p => p.Current.Value);
 
             dependencies.CacheAs<MatchIPCInfo>(ipc = new FileBasedIPC());
             Add(ipc);
-
-            AddRange(new[]
-            {
-                new Container
-                {
-                    CornerRadius = 10,
-                    Depth = float.MinValue,
-                    Position = new Vector2(5),
-                    Masking = true,
-                    AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.BottomRight,
-                    Origin = Anchor.BottomRight,
-                    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
-                {
-                    Masking = true,
-                    CornerRadius = 5,
-                    Depth = float.MinValue,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    AutoSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = Color4.Red,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new TournamentSpriteText
-                        {
-                            Text = "Please make the window wider",
-                            Font = OsuFont.Torus.With(weight: FontWeight.Bold),
-                            Colour = Color4.White,
-                            Padding = new MarginPadding(20)
-                        }
-                    }
-                },
-            });
         }
 
         private void readBracket()
@@ -313,14 +229,6 @@ namespace osu.Game.Tournament
             API.Queue(req);
         }
 
-        protected override void LoadComplete()
-        {
-            MenuCursorContainer.Cursor.AlwaysPresent = true; // required for tooltip display
-            MenuCursorContainer.Cursor.Alpha = 0;
-
-            base.LoadComplete();
-        }
-
         protected virtual void SaveChanges()
         {
             foreach (var r in ladder.Rounds)

From af05ee67cbe67e0577a9cdb8bad11aa01dbfd22a Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 9 Jun 2020 20:30:15 +0200
Subject: [PATCH 03170/10326] move base.loadcomplete to the bottom

---
 osu.Game.Tournament/TournamentGame.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 8a0190b902..3392440902 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -114,11 +114,12 @@ namespace osu.Game.Tournament
 
         protected override void LoadComplete()
         {
-            base.LoadComplete();
-
             MenuCursorContainer.Cursor.AlwaysPresent = true; // required for tooltip display
+
             // we don't want to show the menu cursor as it would appear on stream output.
             MenuCursorContainer.Cursor.Alpha = 0;
+
+            base.LoadComplete();
         }
     }
 }

From c9b4fa92f57b6c6023cbedb9c43aa846b1c7b855 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 9 Jun 2020 20:40:54 +0200
Subject: [PATCH 03171/10326] Hide in-game cursor manually in the testbrowser

---
 osu.Game.Tournament.Tests/TournamentTestBrowser.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
index f7ad757926..3bc719be7c 100644
--- a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
@@ -19,6 +19,9 @@ namespace osu.Game.Tournament.Tests
                 Depth = 10
             }, AddInternal);
 
+            MenuCursorContainer.Cursor.AlwaysPresent = true;
+            MenuCursorContainer.Cursor.Alpha = 0;
+
             // Have to construct this here, rather than in the constructor, because
             // we depend on some dependencies to be loaded within OsuGameBase.load().
             Add(new TestBrowser());

From aacacd75f08f289fa77cc5d9be211145b8378b7d Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 9 Jun 2020 21:14:05 +0200
Subject: [PATCH 03172/10326] Remove abstract from the class

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

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index cc7bb863ed..bb8c134ecb 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -20,7 +20,7 @@ using osuTK.Input;
 namespace osu.Game.Tournament
 {
     [Cached(typeof(TournamentGameBase))]
-    public abstract class TournamentGameBase : OsuGameBase
+    public class TournamentGameBase : OsuGameBase
     {
         private const string bracket_filename = "bracket.json";
 

From 9dc1eab6ae702550a6c3c8a9c5734183816a870f Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Wed, 10 Jun 2020 13:05:11 +1200
Subject: [PATCH 03173/10326] Improve code readability of FooterButtonRandom
 OnPressed

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

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 363c2e4c10..b314971cb3 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Select
         {
             rewindSearch = action == GlobalAction.SelectPreviousRandom;
 
-            if (action != GlobalAction.SelectNextRandom && !rewindSearch)
+            if (action != GlobalAction.SelectNextRandom && action != GlobalAction.SelectPreviousRandom)
             {
                 return false;
             }

From 0f39558da2aa09555c0a50e5bb74b32325d07a16 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 10 Jun 2020 08:04:34 +0200
Subject: [PATCH 03174/10326] Apply review comment

---
 osu.Game.Tournament.Tests/TournamentTestBrowser.cs |  3 ---
 osu.Game.Tournament/TournamentGame.cs              | 10 ----------
 osu.Game.Tournament/TournamentGameBase.cs          |  9 +++++++++
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
index 3bc719be7c..f7ad757926 100644
--- a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
@@ -19,9 +19,6 @@ namespace osu.Game.Tournament.Tests
                 Depth = 10
             }, AddInternal);
 
-            MenuCursorContainer.Cursor.AlwaysPresent = true;
-            MenuCursorContainer.Cursor.Alpha = 0;
-
             // Have to construct this here, rather than in the constructor, because
             // we depend on some dependencies to be loaded within OsuGameBase.load().
             Add(new TestBrowser());
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 3392440902..7b1a174c1e 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -111,15 +111,5 @@ namespace osu.Game.Tournament
                 }
             });
         }
-
-        protected override void LoadComplete()
-        {
-            MenuCursorContainer.Cursor.AlwaysPresent = true; // required for tooltip display
-
-            // we don't want to show the menu cursor as it would appear on stream output.
-            MenuCursorContainer.Cursor.Alpha = 0;
-
-            base.LoadComplete();
-        }
     }
 }
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index bb8c134ecb..0160065cc4 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -228,6 +228,15 @@ namespace osu.Game.Tournament
 
             API.Queue(req);
         }
+        protected override void LoadComplete()
+        {
+            MenuCursorContainer.Cursor.AlwaysPresent = true; // required for tooltip display
+
+            // we don't want to show the menu cursor as it would appear on stream output.
+            MenuCursorContainer.Cursor.Alpha = 0;
+
+            base.LoadComplete();
+        }
 
         protected virtual void SaveChanges()
         {

From a43e1a0ae345722b922cd7b3bb0b533969657103 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 10 Jun 2020 08:41:13 +0200
Subject: [PATCH 03175/10326] Remove whitespace

---
 osu.Game.Tournament/TournamentGameBase.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 0160065cc4..d17b93bf5d 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -228,6 +228,7 @@ namespace osu.Game.Tournament
 
             API.Queue(req);
         }
+
         protected override void LoadComplete()
         {
             MenuCursorContainer.Cursor.AlwaysPresent = true; // required for tooltip display

From 4fb71eeb20dcf96a46a54d025eca6689489bf2a5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 10 Jun 2020 18:23:31 +0300
Subject: [PATCH 03176/10326] Move setting up the ruleset bindable to top-base
 test scene

---
 osu.Game/Tests/Visual/EditorTestScene.cs    |  1 -
 osu.Game/Tests/Visual/OsuTestScene.cs       |  2 +-
 osu.Game/Tests/Visual/PlayerTestScene.cs    | 14 ++------------
 osu.Game/Tests/Visual/SkinnableTestScene.cs |  7 +------
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Tests/Visual/EditorTestScene.cs b/osu.Game/Tests/Visual/EditorTestScene.cs
index 4f9a5b53b8..cd08f4712a 100644
--- a/osu.Game/Tests/Visual/EditorTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorTestScene.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load()
         {
-            Ruleset.Value = CreateEditorRuleset().RulesetInfo;
             Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
         }
 
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index e5d5442074..6d0fc199c4 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -146,7 +146,7 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
         {
-            Ruleset.Value = rulesets.AvailableRulesets.First();
+            Ruleset.Value = CreateRuleset()?.RulesetInfo ?? rulesets.AvailableRulesets.First();
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 05b1eea6b3..2c46e7f6d3 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -24,20 +24,9 @@ namespace osu.Game.Tests.Visual
 
         protected OsuConfigManager LocalConfig;
 
-        private readonly Ruleset ruleset;
-
-        protected PlayerTestScene()
-        {
-            ruleset = CreatePlayerRuleset();
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            // There are test scenes using current value of the ruleset bindable
-            // on their BDLs (example in TestSceneSliderSnaking's BDL)
-            Ruleset.Value = ruleset.RulesetInfo;
-
             Dependencies.Cache(LocalConfig = new OsuConfigManager(LocalStorage));
             LocalConfig.GetBindable<double>(OsuSetting.DimLevel).Value = 1.0;
         }
@@ -58,7 +47,7 @@ namespace osu.Game.Tests.Visual
 
             action?.Invoke();
 
-            AddStep(ruleset.Description, LoadPlayer);
+            AddStep(CreatePlayerRuleset().Description, LoadPlayer);
             AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
         }
 
@@ -68,6 +57,7 @@ namespace osu.Game.Tests.Visual
 
         protected void LoadPlayer()
         {
+            var ruleset = Ruleset.Value.CreateInstance();
             var beatmap = CreateBeatmap(ruleset.RulesetInfo);
 
             Beatmap.Value = CreateWorkingBeatmap(beatmap);
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 41147d3768..ea7cdaaac6 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -23,8 +23,6 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class SkinnableTestScene : OsuGridTestScene
     {
-        private readonly Ruleset ruleset;
-
         private Skin metricsSkin;
         private Skin defaultSkin;
         private Skin specialSkin;
@@ -33,14 +31,11 @@ namespace osu.Game.Tests.Visual
         protected SkinnableTestScene()
             : base(2, 3)
         {
-            ruleset = CreateRulesetForSkinProvider();
         }
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SkinManager skinManager)
         {
-            Ruleset.Value = ruleset.RulesetInfo;
-
             var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly);
 
             metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
@@ -110,7 +105,7 @@ namespace osu.Game.Tests.Visual
                         {
                             new OutlineBox { Alpha = autoSize ? 1 : 0 },
                             mainProvider.WithChild(
-                                new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(mainProvider, beatmap))
+                                new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider, beatmap))
                                 {
                                     Child = created,
                                     RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,

From b89dcb6a77de715a84faa28fd1b91fc37b167e5b Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Thu, 11 Jun 2020 13:02:47 +0930
Subject: [PATCH 03177/10326] Fix cursor not hiding with SDL2 backend

---
 osu.Desktop/OsuGameDesktop.cs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 5f74883803..bca30f3f9e 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -122,14 +122,22 @@ namespace osu.Desktop
         {
             base.SetHost(host);
 
-            if (host.Window is DesktopGameWindow desktopWindow)
+            switch (host.Window)
             {
-                desktopWindow.CursorState |= CursorState.Hidden;
+                // Legacy osuTK DesktopGameWindow
+                case DesktopGameWindow desktopGameWindow:
+                    desktopGameWindow.CursorState |= CursorState.Hidden;
+                    desktopGameWindow.SetIconFromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
+                    desktopGameWindow.Title = Name;
+                    desktopGameWindow.FileDrop += fileDrop;
+                    break;
 
-                desktopWindow.SetIconFromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
-                desktopWindow.Title = Name;
-
-                desktopWindow.FileDrop += fileDrop;
+                // SDL2 DesktopWindow
+                case DesktopWindow desktopWindow:
+                    desktopWindow.CursorState.Value |= CursorState.Hidden;
+                    desktopWindow.Title = Name;
+                    desktopWindow.FileDrop += fileDrop;
+                    break;
             }
         }
 

From 702bd2b65d4c4546a57d83b4decaee64304013af Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 11 Jun 2020 13:41:53 +0900
Subject: [PATCH 03178/10326] Fix potential nullref in test

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index a7e2dbeccb..f7d66ca5cf 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -38,13 +38,9 @@ namespace osu.Game.Tests.Visual.SongSelect
     public class TestScenePlaySongSelect : ScreenTestScene
     {
         private BeatmapManager manager;
-
         private RulesetStore rulesets;
-
         private MusicController music;
-
         private WorkingBeatmap defaultBeatmap;
-
         private TestSongSelect songSelect;
 
         [BackgroundDependencyLoader]
@@ -308,15 +304,13 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddAssert("random map selected", () => songSelect.CurrentBeatmap != defaultBeatmap);
 
-            var sortMode = config.GetBindable<SortMode>(OsuSetting.SongSelectSortingMode);
-
-            AddStep(@"Sort by Artist", delegate { sortMode.Value = SortMode.Artist; });
-            AddStep(@"Sort by Title", delegate { sortMode.Value = SortMode.Title; });
-            AddStep(@"Sort by Author", delegate { sortMode.Value = SortMode.Author; });
-            AddStep(@"Sort by DateAdded", delegate { sortMode.Value = SortMode.DateAdded; });
-            AddStep(@"Sort by BPM", delegate { sortMode.Value = SortMode.BPM; });
-            AddStep(@"Sort by Length", delegate { sortMode.Value = SortMode.Length; });
-            AddStep(@"Sort by Difficulty", delegate { sortMode.Value = SortMode.Difficulty; });
+            AddStep(@"Sort by Artist", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Artist));
+            AddStep(@"Sort by Title", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Title));
+            AddStep(@"Sort by Author", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Author));
+            AddStep(@"Sort by DateAdded", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.DateAdded));
+            AddStep(@"Sort by BPM", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.BPM));
+            AddStep(@"Sort by Length", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Length));
+            AddStep(@"Sort by Difficulty", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Difficulty));
         }
 
         [Test]

From 7b012f1def0eb2c0e8e1d0af48ff86184224a802 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 11 Jun 2020 14:55:49 +0900
Subject: [PATCH 03179/10326] Fix test failures

---
 .../Background/TestSceneUserDimBackgrounds.cs | 12 ++++++--
 .../TestSceneExpandedPanelMiddleContent.cs    | 30 +++++++++----------
 .../Expanded/ExpandedPanelMiddleContent.cs    |  2 +-
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index d601f40afe..19294d12fc 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens;
@@ -27,6 +28,7 @@ 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.Beatmaps;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 using osuTK;
@@ -186,9 +188,15 @@ namespace osu.Game.Tests.Visual.Background
         public void TestTransition()
         {
             performFullSetup();
+
             FadeAccessibleResults results = null;
-            AddStep("Transition to Results", () => player.Push(results =
-                new FadeAccessibleResults(new ScoreInfo { User = new User { Username = "osu!" } })));
+
+            AddStep("Transition to Results", () => player.Push(results = new FadeAccessibleResults(new ScoreInfo
+            {
+                User = new User { Username = "osu!" },
+                Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo
+            })));
+
             AddUntilStep("Wait for results is current", () => results.IsCurrentScreen());
             AddUntilStep("Screen is undimmed, original background retained", () =>
                 songSelect.IsBackgroundUndimmed() && songSelect.IsBackgroundCurrent() && results.IsBlurCorrect());
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 69511b85c0..7be44a62de 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -4,7 +4,6 @@
 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;
@@ -33,7 +32,10 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             var author = new User { Username = "mapper_name" };
 
-            AddStep("show example score", () => showPanel(createTestBeatmap(author), new TestScoreInfo(new OsuRuleset().RulesetInfo)));
+            AddStep("show example score", () => showPanel(new TestScoreInfo(new OsuRuleset().RulesetInfo)
+            {
+                Beatmap = createTestBeatmap(author)
+            }));
 
             AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Text == "mapper_name"));
         }
@@ -41,38 +43,34 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestMapWithUnknownMapper()
         {
-            AddStep("show example score", () => showPanel(createTestBeatmap(null), new TestScoreInfo(new OsuRuleset().RulesetInfo)));
+            AddStep("show example score", () => showPanel(new TestScoreInfo(new OsuRuleset().RulesetInfo)
+            {
+                Beatmap = createTestBeatmap(null)
+            }));
 
             AddAssert("mapped by text not present", () =>
                 this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text, "mapped", "by")));
         }
 
-        private void showPanel(WorkingBeatmap workingBeatmap, ScoreInfo score)
-        {
-            Child = new ExpandedPanelMiddleContentContainer(workingBeatmap, score);
-        }
+        private void showPanel(ScoreInfo score) => Child = new ExpandedPanelMiddleContentContainer(score);
 
-        private WorkingBeatmap createTestBeatmap(User author)
+        private BeatmapInfo createTestBeatmap(User author)
         {
-            var beatmap = new TestBeatmap(rulesetStore.GetRuleset(0));
+            var beatmap = new TestBeatmap(rulesetStore.GetRuleset(0)).BeatmapInfo;
+
             beatmap.Metadata.Author = author;
             beatmap.Metadata.Title = "Verrrrrrrrrrrrrrrrrrry looooooooooooooooooooooooong beatmap title";
             beatmap.Metadata.Artist = "Verrrrrrrrrrrrrrrrrrry looooooooooooooooooooooooong beatmap artist";
 
-            return new TestWorkingBeatmap(beatmap);
+            return beatmap;
         }
 
         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)
+            public ExpandedPanelMiddleContentContainer(ScoreInfo score)
             {
-                workingBeatmap = new Bindable<WorkingBeatmap>(beatmap);
-
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
                 Size = new Vector2(ScorePanel.EXPANDED_WIDTH, 700);
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index b06ef8ae83..01502c0913 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Ranking.Expanded
         private void load()
         {
             var beatmap = score.Beatmap;
-            var metadata = beatmap.Metadata;
+            var metadata = beatmap.BeatmapSet?.Metadata ?? beatmap.Metadata;
             var creator = metadata.Author?.Username;
 
             var topStatistics = new List<StatisticDisplay>

From b7c1cfbe6306b262db5eb1880c74fe105147df78 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 11 Jun 2020 15:07:14 +0900
Subject: [PATCH 03180/10326] Adjust display to avoid overlaps

---
 osu.Game/Screens/Multi/Components/OverlinedDisplay.cs | 2 +-
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs        | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
index 71cabd8b50..8d8d4cc404 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Screens.Multi.Components
                     },
                     new Drawable[]
                     {
-                        Content = new Container { Margin = new MarginPadding { Top = 5 } }
+                        Content = new Container { Padding = new MarginPadding { Top = 5 } }
                     }
                 }
             };
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 9296fe81bd..f837a407a5 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -130,6 +130,7 @@ namespace osu.Game.Screens.Multi.Match
                                                                                 SelectedItem = { BindTarget = SelectedItem }
                                                                             }
                                                                         },
+                                                                        null,
                                                                         new Drawable[]
                                                                         {
                                                                             new TriangleButton
@@ -139,6 +140,12 @@ namespace osu.Game.Screens.Multi.Match
                                                                                 Action = showBeatmapResults
                                                                             }
                                                                         }
+                                                                    },
+                                                                    RowDimensions = new[]
+                                                                    {
+                                                                        new Dimension(),
+                                                                        new Dimension(GridSizeMode.Absolute, 5),
+                                                                        new Dimension(GridSizeMode.AutoSize)
                                                                     }
                                                                 }
                                                             },

From c2e01e198f1da6682bd8d1601ffa207509ee0dfc Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 13:55:29 +0200
Subject: [PATCH 03181/10326] Rename tournamentStorage to storage

---
 osu.Game.Tournament/TournamentGameBase.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index ccfbf37d48..4c0c8cc28f 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -15,7 +15,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
 using osu.Framework.IO.Stores;
-using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Online.API.Requests;
@@ -36,9 +35,7 @@ namespace osu.Game.Tournament
 
         private LadderInfo ladder;
 
-        private Storage storage;
-
-        private TournamentStorage tournamentStorage;
+        private TournamentStorage storage;
 
         private DependencyContainer dependencies;
 
@@ -57,11 +54,9 @@ namespace osu.Game.Tournament
         {
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
-            dependencies.CacheAs(tournamentStorage = new TournamentStorage(Host));
+            dependencies.CacheAs(storage = new TournamentStorage(Host));
 
-            Textures.AddStore(new TextureLoaderStore(tournamentStorage.VideoStorage));
-
-            storage = tournamentStorage;
+            Textures.AddStore(new TextureLoaderStore(storage.VideoStorage));
 
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
             windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>

From b69ff307d83beb9aa40d81e00b8d8c16ab0b5b88 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 13:56:16 +0200
Subject: [PATCH 03182/10326] Fixed migration logic

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 33 ++++++++++++---------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 7690051c7a..a0f07c354b 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -15,15 +15,16 @@ namespace osu.Game.Tournament.IO
     internal class TournamentStorage : WrappedStorage
     {
         private readonly GameHost host;
-        private readonly TournamentStorageManager storageConfig;
         public readonly TournamentVideoStorage VideoStorage;
+        private const string default_tournament = "default";
 
         public TournamentStorage(GameHost host)
             : base(host.Storage.GetStorageForDirectory("tournaments"), string.Empty)
         {
             this.host = host;
 
-            storageConfig = new TournamentStorageManager(host.Storage);
+            TournamentStorageManager storageConfig = new TournamentStorageManager(host.Storage);
+
             var currentTournament = storageConfig.Get<string>(StorageConfig.CurrentTournament);
 
             if (!string.IsNullOrEmpty(currentTournament))
@@ -32,35 +33,39 @@ namespace osu.Game.Tournament.IO
             }
             else
             {
-                migrate();
                 Logger.Log("Migrating files from old storage to new.");
+                Migrate();
+                storageConfig.Set(StorageConfig.CurrentTournament, default_tournament);
+                storageConfig.Save();
+                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_tournament));
             }
 
             VideoStorage = new TournamentVideoStorage(this);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }
 
-        private void migrate()
+        internal void Migrate()
         {
-            const string default_path = "default";
             var source = new DirectoryInfo(host.Storage.GetFullPath("tournament"));
-            var destination = new DirectoryInfo(GetFullPath(default_path));
+            var destination = new DirectoryInfo(GetFullPath(default_tournament));
 
-            Directory.CreateDirectory(destination.FullName);
+            if (!destination.Exists)
+                destination.Create();
 
             if (host.Storage.Exists("bracket.json"))
             {
                 Logger.Log("Migrating bracket to default tournament storage.");
                 var bracketFile = new System.IO.FileInfo(host.Storage.GetFullPath("bracket.json"));
                 attemptOperation(() => bracketFile.CopyTo(Path.Combine(destination.FullName, bracketFile.Name), true));
+                bracketFile.Delete();
             }
 
-            Logger.Log("Migrating other assets to default tournament storage.");
-            copyRecursive(source, destination);
-            ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_path));
-            storageConfig.Set(StorageConfig.CurrentTournament, default_path);
-            storageConfig.Save();
-            deleteRecursive(source);
+            if (source.Exists)
+            {
+                Logger.Log("Migrating tournament assets to default tournament storage.");
+                copyRecursive(source, destination);
+                deleteRecursive(source);
+            }
         }
 
         private void copyRecursive(DirectoryInfo source, DirectoryInfo destination)
@@ -113,7 +118,7 @@ namespace osu.Game.Tournament.IO
             }
         }
     }
-    
+
     internal class TournamentVideoStorage : NamespacedResourceStore<byte[]>
     {
         public TournamentVideoStorage(Storage storage)

From 18a9e5a0a6e52069dba001144f26436c8e240d4a Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 13:57:29 +0200
Subject: [PATCH 03183/10326] Add NonVisual tests for custom tournaments

Can test the default directory from a clean instance, it can test a custom directory and can execute migration from an instance using the older directory setup.
---
 .../NonVisual/CustomTourneyDirectoryTest.cs   | 157 ++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs

diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
new file mode 100644
index 0000000000..757465d4ad
--- /dev/null
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -0,0 +1,157 @@
+// Copyright (c) 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.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Platform;
+using osu.Game.Tournament.Configuration;
+using osu.Game.Tournament.IO;
+using osu.Game.Tests;
+
+namespace osu.Game.Tournament.Tests.NonVisual
+{
+    [TestFixture]
+    public class CustomTourneyDirectoryTest
+    {
+        [SetUp]
+        public void SetUp()
+        {
+        }
+
+        [Test]
+        public void TestDefaultDirectory()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestDefaultDirectory)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+                    var storage = osu.Dependencies.Get<TournamentStorage>();
+                    var defaultStorage = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestDefaultDirectory), "tournaments", "default");
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorage));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public void TestCustomDirectory()
+        {
+            using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestCustomDirectory)))
+            {
+                string osuDesktopStorage = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestCustomDirectory));
+                const string custom_tournament = "custom";
+
+                // need access before the game has constructed its own storage yet.
+                Storage storage = new DesktopStorage(osuDesktopStorage, host);
+                // manual cleaning so we can prepare a config file.
+                storage.DeleteDirectory(string.Empty);
+
+                using (var storageConfig = new TournamentStorageManager(storage))
+                    storageConfig.Set(StorageConfig.CurrentTournament, custom_tournament);
+
+                try
+                {
+                    var osu = loadOsu(host);
+
+                    storage = osu.Dependencies.Get<TournamentStorage>();
+
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(tournamentBasePath(nameof(TestCustomDirectory)), "custom")));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public void TestMigration()
+        {
+            using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestMigration)))
+            {
+                string basePath = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestMigration), "tournament");
+
+                string videosPath = Path.Combine(basePath, "videos");
+                string modsPath = Path.Combine(basePath, "mods");
+                string flagsPath = Path.Combine(basePath, "flags");
+
+                Directory.CreateDirectory(videosPath);
+                Directory.CreateDirectory(modsPath);
+                Directory.CreateDirectory(flagsPath);
+
+                string bracketFile = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestMigration), "bracket.json");
+                string videoFile = Path.Combine(videosPath, "video.mp4");
+                string modFile = Path.Combine(modsPath, "mod.png");
+                string flagFile = Path.Combine(flagsPath, "flag.png");
+
+                File.WriteAllText(bracketFile, "{}");
+
+                File.WriteAllText(videoFile, "test");
+                File.WriteAllText(modFile, "test");
+                File.WriteAllText(flagFile, "test");
+
+                try
+                {
+                    var osu = loadOsu(host);
+
+                    var storage = osu.Dependencies.Get<TournamentStorage>();
+
+                    var migratedPath = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestMigration), "tournaments", "default");
+
+                    videosPath = Path.Combine(migratedPath, "videos");
+                    modsPath = Path.Combine(migratedPath, "mods");
+                    flagsPath = Path.Combine(migratedPath, "flags");
+
+                    videoFile = Path.Combine(videosPath, "video.mp4");
+                    modFile = Path.Combine(modsPath, "mod.png");
+                    flagFile = Path.Combine(flagsPath, "flag.png");
+
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(migratedPath));
+                    Assert.That(storage.GetFiles(".", "bracket.json").Single(), Is.EqualTo("bracket.json"));
+                    Assert.True(storage.Exists(videoFile));
+                    Assert.True(storage.Exists(modFile));
+                    Assert.True(storage.Exists(flagFile));
+                }
+                finally
+                {
+                    // Cleaning up after ourselves.
+                    host.Storage.Delete("tournament.ini");
+                    host.Storage.DeleteDirectory("tournaments");
+
+                    host.Exit();
+                }
+            }
+        }
+
+        private TournamentGameBase loadOsu(GameHost host)
+        {
+            var osu = new TournamentGameBase();
+            Task.Run(() => host.Run(osu));
+            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
+            return osu;
+        }
+
+        private static void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 90000)
+        {
+            Task task = Task.Run(() =>
+            {
+                while (!result()) Thread.Sleep(200);
+            });
+
+            Assert.IsTrue(task.Wait(timeout), failureMessage);
+        }
+
+        private string oldPath => Path.Combine(RuntimeInfo.StartupDirectory, "tournament");
+        private string tournamentBasePath(string testInstance) => Path.Combine(RuntimeInfo.StartupDirectory, "headless", testInstance, "tournaments");
+    }
+}
\ No newline at end of file

From a317b85fd823f1988a1514b93b99e59c866ea8ff Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 14:06:03 +0200
Subject: [PATCH 03184/10326] Remove misleading log

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index a0f07c354b..2379967125 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -33,7 +33,6 @@ namespace osu.Game.Tournament.IO
             }
             else
             {
-                Logger.Log("Migrating files from old storage to new.");
                 Migrate();
                 storageConfig.Set(StorageConfig.CurrentTournament, default_tournament);
                 storageConfig.Save();

From 5d49b709b99f5a8d1da59cfc76e5025423cd5977 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 14:09:21 +0200
Subject: [PATCH 03185/10326] Change access modifier public -> internal

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

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 2379967125..c6f314032f 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tournament.IO
     internal class TournamentStorage : WrappedStorage
     {
         private readonly GameHost host;
-        public readonly TournamentVideoStorage VideoStorage;
+        internal readonly TournamentVideoStorage VideoStorage;
         private const string default_tournament = "default";
 
         public TournamentStorage(GameHost host)

From 2964b457a01894c559c329d9ea98f895e66a9b55 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 15:05:28 +0200
Subject: [PATCH 03186/10326] Rename VideoStorage to VideoStore

---
 osu.Game.Tournament/Components/TourneyVideo.cs | 2 +-
 osu.Game.Tournament/IO/TournamentStorage.cs    | 8 ++++----
 osu.Game.Tournament/TournamentGameBase.cs      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index dcb08464dd..5a595f4f44 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tournament.Components
         [BackgroundDependencyLoader]
         private void load(TournamentStorage storage)
         {
-            var stream = storage.VideoStorage.GetStream($@"{filename}");
+            var stream = storage.VideoStore.GetStream($@"{filename}");
 
             if (stream != null)
             {
diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index c6f314032f..2eb052a2e3 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tournament.IO
     internal class TournamentStorage : WrappedStorage
     {
         private readonly GameHost host;
-        internal readonly TournamentVideoStorage VideoStorage;
+        internal readonly TournamentVideoResourceStore VideoStore;
         private const string default_tournament = "default";
 
         public TournamentStorage(GameHost host)
@@ -39,7 +39,7 @@ namespace osu.Game.Tournament.IO
                 ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_tournament));
             }
 
-            VideoStorage = new TournamentVideoStorage(this);
+            VideoStore = new TournamentVideoResourceStore(this);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }
 
@@ -118,9 +118,9 @@ namespace osu.Game.Tournament.IO
         }
     }
 
-    internal class TournamentVideoStorage : NamespacedResourceStore<byte[]>
+    internal class TournamentVideoResourceStore : NamespacedResourceStore<byte[]>
     {
-        public TournamentVideoStorage(Storage storage)
+        public TournamentVideoResourceStore(Storage storage)
             : base(new StorageBackedResourceStore(storage), "videos")
         {
             AddExtension("m4v");
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 4c0c8cc28f..9716f0cd5f 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tournament
 
             dependencies.CacheAs(storage = new TournamentStorage(Host));
 
-            Textures.AddStore(new TextureLoaderStore(storage.VideoStorage));
+            Textures.AddStore(new TextureLoaderStore(storage.VideoStore));
 
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
             windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>

From af1bbe78578f7388c7af7b08e42969038d9333e1 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 15:13:19 +0200
Subject: [PATCH 03187/10326] move TournamentVideoResourceStore to separate
 file

---
 osu.Game.Tournament/IO/TournamentStorage.cs   | 12 ------------
 .../IO/TournamentVideoResourceStore.cs        | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game.Tournament/IO/TournamentVideoResourceStore.cs

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 2eb052a2e3..ab7a5f63d2 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Threading;
-using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.IO;
@@ -117,15 +116,4 @@ namespace osu.Game.Tournament.IO
             }
         }
     }
-
-    internal class TournamentVideoResourceStore : NamespacedResourceStore<byte[]>
-    {
-        public TournamentVideoResourceStore(Storage storage)
-            : base(new StorageBackedResourceStore(storage), "videos")
-        {
-            AddExtension("m4v");
-            AddExtension("avi");
-            AddExtension("mp4");
-        }
-    }
 }
diff --git a/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs b/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs
new file mode 100644
index 0000000000..6a44240f65
--- /dev/null
+++ b/osu.Game.Tournament/IO/TournamentVideoResourceStore.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.IO
+{
+    internal class TournamentVideoResourceStore : NamespacedResourceStore<byte[]>
+    {
+        public TournamentVideoResourceStore(Storage storage)
+            : base(new StorageBackedResourceStore(storage), "videos")
+        {
+            AddExtension("m4v");
+            AddExtension("avi");
+            AddExtension("mp4");
+        }
+    }
+}
\ No newline at end of file

From 883185d3497832ab7309bb566f31010c8ef9a883 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 15:18:21 +0200
Subject: [PATCH 03188/10326] Add a comment to describe what's going on before
 the headless game starts

---
 .../NonVisual/CustomTourneyDirectoryTest.cs                      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 757465d4ad..867851e06b 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -79,6 +79,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
         {
             using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestMigration)))
             {
+                // Recreate the old setup that uses "tournament" as the base path.
                 string basePath = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestMigration), "tournament");
 
                 string videosPath = Path.Combine(basePath, "videos");

From 603054f5214beb6b4ae744d62e7b61c5a03e8f14 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 15:47:21 +0200
Subject: [PATCH 03189/10326] Remove unused property and reuse
 tournamentBasePath

---
 .../NonVisual/CustomTourneyDirectoryTest.cs                 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 867851e06b..7ac4e51711 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 {
                     var osu = loadOsu(host);
                     var storage = osu.Dependencies.Get<TournamentStorage>();
-                    var defaultStorage = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestDefaultDirectory), "tournaments", "default");
+                    var defaultStorage = Path.Combine(tournamentBasePath(nameof(TestDefaultDirectory)), "default");
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorage));
                 }
                 finally
@@ -107,7 +107,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
 
                     var storage = osu.Dependencies.Get<TournamentStorage>();
 
-                    var migratedPath = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestMigration), "tournaments", "default");
+                    var migratedPath = Path.Combine(tournamentBasePath(nameof(TestMigration)), "default");
 
                     videosPath = Path.Combine(migratedPath, "videos");
                     modsPath = Path.Combine(migratedPath, "mods");
@@ -151,8 +151,6 @@ namespace osu.Game.Tournament.Tests.NonVisual
 
             Assert.IsTrue(task.Wait(timeout), failureMessage);
         }
-
-        private string oldPath => Path.Combine(RuntimeInfo.StartupDirectory, "tournament");
         private string tournamentBasePath(string testInstance) => Path.Combine(RuntimeInfo.StartupDirectory, "headless", testInstance, "tournaments");
     }
 }
\ No newline at end of file

From 222ac863042e8367b8e4a582eabafb453a3a0531 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 15:52:14 +0200
Subject: [PATCH 03190/10326] Add newlines at the end of the file

---
 osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs             | 1 +
 .../NonVisual/CustomTourneyDirectoryTest.cs                     | 2 +-
 osu.Game.Tournament/Configuration/TournamentStorageManager.cs   | 2 +-
 osu.Game.Tournament/IO/TournamentVideoResourceStore.cs          | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index f3d54d876a..5f0ca303e3 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -293,3 +293,4 @@ namespace osu.Game.Tests.NonVisual
         }
     }
 }
+
diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 7ac4e51711..851efb9a3d 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -153,4 +153,4 @@ namespace osu.Game.Tournament.Tests.NonVisual
         }
         private string tournamentBasePath(string testInstance) => Path.Combine(RuntimeInfo.StartupDirectory, "headless", testInstance, "tournaments");
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game.Tournament/Configuration/TournamentStorageManager.cs b/osu.Game.Tournament/Configuration/TournamentStorageManager.cs
index 6ccc2b6308..653ea14352 100644
--- a/osu.Game.Tournament/Configuration/TournamentStorageManager.cs
+++ b/osu.Game.Tournament/Configuration/TournamentStorageManager.cs
@@ -26,4 +26,4 @@ namespace osu.Game.Tournament.Configuration
     {
         CurrentTournament,
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs b/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs
index 6a44240f65..1ccd20fe21 100644
--- a/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs
+++ b/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs
@@ -16,4 +16,4 @@ namespace osu.Game.Tournament.IO
             AddExtension("mp4");
         }
     }
-}
\ No newline at end of file
+}

From 1d4d749b539490f295036c00aa9740fb6d2403f4 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 15:56:34 +0200
Subject: [PATCH 03191/10326] Undo blank line removal

Was too excited to add blank lines before submitting the PR that I overdid it
---
 osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 5f0ca303e3..f3d54d876a 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -293,4 +293,3 @@ namespace osu.Game.Tests.NonVisual
         }
     }
 }
-

From c9dc17f3d8868679bb99b37ea425dff4624626eb Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 17:51:07 +0200
Subject: [PATCH 03192/10326] Introduce migrations for drawings

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 23 +++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index ab7a5f63d2..0879d27aac 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -54,8 +54,21 @@ namespace osu.Game.Tournament.IO
             {
                 Logger.Log("Migrating bracket to default tournament storage.");
                 var bracketFile = new System.IO.FileInfo(host.Storage.GetFullPath("bracket.json"));
-                attemptOperation(() => bracketFile.CopyTo(Path.Combine(destination.FullName, bracketFile.Name), true));
-                bracketFile.Delete();
+                moveFile(bracketFile, destination);
+            }
+
+            if (host.Storage.Exists("drawings.txt"))
+            {
+                Logger.Log("Migrating drawings to default tournament storage.");
+                var drawingsFile = new System.IO.FileInfo(host.Storage.GetFullPath("drawings.txt"));
+                moveFile(drawingsFile, destination);
+            }
+
+            if (host.Storage.Exists("drawings_results.txt"))
+            {
+                Logger.Log("Migrating drawings results to default tournament storage.");
+                var drawingsResultsFile = new System.IO.FileInfo(host.Storage.GetFullPath("drawings_results.txt"));
+                moveFile(drawingsResultsFile, destination);
             }
 
             if (source.Exists)
@@ -97,6 +110,12 @@ namespace osu.Game.Tournament.IO
                 attemptOperation(target.Delete);
         }
 
+        private void moveFile(System.IO.FileInfo file, DirectoryInfo destination)
+        {
+            attemptOperation(() => file.CopyTo(Path.Combine(destination.FullName, file.Name), true));
+            file.Delete();
+        }
+
         private void attemptOperation(Action action, int attempts = 10)
         {
             while (true)

From 327795ba9933f8bcf7447c1b4f62ebfa40e763e0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 18:00:47 +0200
Subject: [PATCH 03193/10326] Switch drawing storage to tournamentstorage

---
 osu.Game.Tournament/IO/TournamentStorage.cs                 | 2 +-
 .../Screens/Drawings/Components/StorageBackedTeamList.cs    | 6 +++---
 osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 0879d27aac..195448f2d5 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -11,7 +11,7 @@ using osu.Game.Tournament.Configuration;
 
 namespace osu.Game.Tournament.IO
 {
-    internal class TournamentStorage : WrappedStorage
+    public class TournamentStorage : WrappedStorage
     {
         private readonly GameHost host;
         internal readonly TournamentVideoResourceStore VideoStore;
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs b/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
index f96ec01cbb..ecc23181be 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using osu.Framework.Logging;
-using osu.Framework.Platform;
+using osu.Game.Tournament.IO;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Drawings.Components
@@ -14,9 +14,9 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
     {
         private const string teams_filename = "drawings.txt";
 
-        private readonly Storage storage;
+        private readonly TournamentStorage storage;
 
-        public StorageBackedTeamList(Storage storage)
+        public StorageBackedTeamList(TournamentStorage storage)
         {
             this.storage = storage;
         }
diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index 8be66ff98c..bf0d6f4871 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -12,9 +12,9 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
-using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.IO;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Drawings.Components;
 using osuTK;
@@ -36,12 +36,12 @@ namespace osu.Game.Tournament.Screens.Drawings
 
         private Task writeOp;
 
-        private Storage storage;
+        private TournamentStorage storage;
 
         public ITeamList TeamList;
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures, Storage storage)
+        private void load(TextureStore textures, TournamentStorage storage)
         {
             RelativeSizeAxes = Axes.Both;
 

From 32d86d6fab0a34f502de05fc5becec996b0947f0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 18:07:24 +0200
Subject: [PATCH 03194/10326] Create storage for config files of a tournament

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 195448f2d5..b658dfdb69 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -15,6 +15,7 @@ namespace osu.Game.Tournament.IO
     {
         private readonly GameHost host;
         internal readonly TournamentVideoResourceStore VideoStore;
+        internal readonly Storage ConfigurationStorage;
         private const string default_tournament = "default";
 
         public TournamentStorage(GameHost host)
@@ -38,6 +39,8 @@ namespace osu.Game.Tournament.IO
                 ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_tournament));
             }
 
+            ConfigurationStorage = UnderlyingStorage.GetStorageForDirectory("config");
+
             VideoStore = new TournamentVideoResourceStore(this);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }

From 592e3bf4c91bc6f976a80d1b416309c60503bcac Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 18:21:56 +0200
Subject: [PATCH 03195/10326] Implement migrations for the drawings config file

---
 osu.Game.Tournament/IO/TournamentStorage.cs        | 14 +++++++++++++-
 .../Screens/Drawings/DrawingsScreen.cs             |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index b658dfdb69..298d02e6bb 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Tournament.IO
         internal readonly TournamentVideoResourceStore VideoStore;
         internal readonly Storage ConfigurationStorage;
         private const string default_tournament = "default";
+        private const string config_directory = "config";
 
         public TournamentStorage(GameHost host)
             : base(host.Storage.GetStorageForDirectory("tournaments"), string.Empty)
@@ -39,7 +40,7 @@ namespace osu.Game.Tournament.IO
                 ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_tournament));
             }
 
-            ConfigurationStorage = UnderlyingStorage.GetStorageForDirectory("config");
+            ConfigurationStorage = UnderlyingStorage.GetStorageForDirectory(config_directory);
 
             VideoStore = new TournamentVideoResourceStore(this);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
@@ -49,9 +50,13 @@ namespace osu.Game.Tournament.IO
         {
             var source = new DirectoryInfo(host.Storage.GetFullPath("tournament"));
             var destination = new DirectoryInfo(GetFullPath(default_tournament));
+            var cfgDestination = new DirectoryInfo(GetFullPath(default_tournament + Path.DirectorySeparatorChar + config_directory));
 
             if (!destination.Exists)
                 destination.Create();
+            
+            if (!cfgDestination.Exists)
+                destination.CreateSubdirectory(config_directory);
 
             if (host.Storage.Exists("bracket.json"))
             {
@@ -67,6 +72,13 @@ namespace osu.Game.Tournament.IO
                 moveFile(drawingsFile, destination);
             }
 
+            if (host.Storage.Exists("drawings.ini"))
+            {
+                Logger.Log("Migrating drawing configuration to default tournament storage.");
+                var drawingsConfigFile = new System.IO.FileInfo(host.Storage.GetFullPath("drawings.ini"));
+                moveFile(drawingsConfigFile, cfgDestination);
+            }
+
             if (host.Storage.Exists("drawings_results.txt"))
             {
                 Logger.Log("Migrating drawings results to default tournament storage.");
diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index bf0d6f4871..7f2563c948 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Tournament.Screens.Drawings
                 return;
             }
 
-            drawingsConfig = new DrawingsConfigManager(storage);
+            drawingsConfig = new DrawingsConfigManager(storage.ConfigurationStorage);
 
             InternalChildren = new Drawable[]
             {

From 56a40e616b0688a4969577a6b5b540854556b8bc Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 11 Jun 2020 20:11:44 +0200
Subject: [PATCH 03196/10326] Add drawings to the migration test

---
 .../NonVisual/CustomTourneyDirectoryTest.cs   | 40 ++++++++++++++-----
 osu.Game.Tournament/IO/TournamentStorage.cs   |  2 +-
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 851efb9a3d..37f456ae96 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -48,7 +47,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
         {
             using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestCustomDirectory)))
             {
-                string osuDesktopStorage = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestCustomDirectory));
+                string osuDesktopStorage = basePath(nameof(TestCustomDirectory));
                 const string custom_tournament = "custom";
 
                 // need access before the game has constructed its own storage yet.
@@ -80,23 +79,34 @@ namespace osu.Game.Tournament.Tests.NonVisual
             using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestMigration)))
             {
                 // Recreate the old setup that uses "tournament" as the base path.
-                string basePath = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestMigration), "tournament");
+                string osuRoot = basePath(nameof(TestMigration));
 
-                string videosPath = Path.Combine(basePath, "videos");
-                string modsPath = Path.Combine(basePath, "mods");
-                string flagsPath = Path.Combine(basePath, "flags");
+                // Define all the paths for the old scenario
+                string oldPath = Path.Combine(osuRoot, "tournament");
+                string videosPath = Path.Combine(oldPath, "videos");
+                string modsPath = Path.Combine(oldPath, "mods");
+                string flagsPath = Path.Combine(oldPath, "flags");
 
                 Directory.CreateDirectory(videosPath);
                 Directory.CreateDirectory(modsPath);
                 Directory.CreateDirectory(flagsPath);
 
-                string bracketFile = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestMigration), "bracket.json");
+                // Define testing files corresponding to the specific file migrations that are needed
+                string bracketFile = Path.Combine(osuRoot, "bracket.json");
+
+                string drawingsConfig = Path.Combine(osuRoot, "drawings.ini");
+                string drawingsFile = Path.Combine(osuRoot, "drawings.txt");
+                string drawingsResult = Path.Combine(osuRoot, "drawings_results.txt");
+
+                // Define sample files to test recursive copying
                 string videoFile = Path.Combine(videosPath, "video.mp4");
                 string modFile = Path.Combine(modsPath, "mod.png");
                 string flagFile = Path.Combine(flagsPath, "flag.png");
 
                 File.WriteAllText(bracketFile, "{}");
-
+                File.WriteAllText(drawingsConfig, "test");
+                File.WriteAllText(drawingsFile, "test");
+                File.WriteAllText(drawingsResult, "test");
                 File.WriteAllText(videoFile, "test");
                 File.WriteAllText(modFile, "test");
                 File.WriteAllText(flagFile, "test");
@@ -118,7 +128,13 @@ namespace osu.Game.Tournament.Tests.NonVisual
                     flagFile = Path.Combine(flagsPath, "flag.png");
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(migratedPath));
-                    Assert.That(storage.GetFiles(".", "bracket.json").Single(), Is.EqualTo("bracket.json"));
+
+                    Assert.True(storage.Exists("bracket.json"));
+                    Assert.True(storage.Exists("drawings.txt"));
+                    Assert.True(storage.Exists("drawings_results.txt"));
+
+                    Assert.True(storage.ConfigurationStorage.Exists("drawings.ini"));
+
                     Assert.True(storage.Exists(videoFile));
                     Assert.True(storage.Exists(modFile));
                     Assert.True(storage.Exists(flagFile));
@@ -128,7 +144,6 @@ namespace osu.Game.Tournament.Tests.NonVisual
                     // Cleaning up after ourselves.
                     host.Storage.Delete("tournament.ini");
                     host.Storage.DeleteDirectory("tournaments");
-
                     host.Exit();
                 }
             }
@@ -151,6 +166,9 @@ namespace osu.Game.Tournament.Tests.NonVisual
 
             Assert.IsTrue(task.Wait(timeout), failureMessage);
         }
-        private string tournamentBasePath(string testInstance) => Path.Combine(RuntimeInfo.StartupDirectory, "headless", testInstance, "tournaments");
+
+        private string basePath(string testInstance) => Path.Combine(RuntimeInfo.StartupDirectory, "headless", testInstance);
+
+        private string tournamentBasePath(string testInstance) => Path.Combine(basePath(testInstance), "tournaments");
     }
 }
diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 298d02e6bb..05ee7a3618 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Tournament.IO
 
             if (!destination.Exists)
                 destination.Create();
-            
+
             if (!cfgDestination.Exists)
                 destination.CreateSubdirectory(config_directory);
 

From fca6a6d69f3724091c2f72b1f4ea7034614633d7 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Fri, 12 Jun 2020 09:46:21 +0930
Subject: [PATCH 03197/10326] Implement file drop with DragDrop event

---
 osu.Desktop/OsuGameDesktop.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index bca30f3f9e..cd31df316a 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -10,7 +10,6 @@ using Microsoft.Win32;
 using osu.Desktop.Overlays;
 using osu.Framework.Platform;
 using osu.Game;
-using osuTK.Input;
 using osu.Desktop.Updater;
 using osu.Framework;
 using osu.Framework.Logging;
@@ -129,22 +128,20 @@ namespace osu.Desktop
                     desktopGameWindow.CursorState |= CursorState.Hidden;
                     desktopGameWindow.SetIconFromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
                     desktopGameWindow.Title = Name;
-                    desktopGameWindow.FileDrop += fileDrop;
+                    desktopGameWindow.FileDrop += (_, e) => fileDrop(e.FileNames);
                     break;
 
                 // SDL2 DesktopWindow
                 case DesktopWindow desktopWindow:
                     desktopWindow.CursorState.Value |= CursorState.Hidden;
                     desktopWindow.Title = Name;
-                    desktopWindow.FileDrop += fileDrop;
+                    desktopWindow.DragDrop += f => fileDrop(new[] { f });
                     break;
             }
         }
 
-        private void fileDrop(object sender, FileDropEventArgs e)
+        private void fileDrop(string[] filePaths)
         {
-            var filePaths = e.FileNames;
-
             var firstExtension = Path.GetExtension(filePaths.First());
 
             if (filePaths.Any(f => Path.GetExtension(f) != firstExtension)) return;

From 5041c74c7a525de4261b2bf800f97222cd4ede4f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 11:30:15 +0900
Subject: [PATCH 03198/10326] Fix merge issue

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

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index bc9999381b..a779135345 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tournament
         }
 
         [BackgroundDependencyLoader]
-        private void load(Storage storage)
+        private void load()
         {
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 

From a48e36fd31d5e4850a3f132883173a794a457c25 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Jun 2020 12:58:33 +0900
Subject: [PATCH 03199/10326] Fix dotnet publish with runtime specification not
 working

---
 osu.Desktop/osu.Desktop.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index c34e1e1221..7a99c70999 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -30,6 +30,10 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.150" />
+    <!-- .NET 3.1 SDK seems to cause issues with a runtime specification. This will likely be resolved in .NET 5. -->
+    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />

From 91b6979c970cce7f6eadc11533b34848add6b8a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 13:38:20 +0900
Subject: [PATCH 03200/10326] Fix LoadingSpinner not always playing fade in
 animation

---
 osu.Game/Graphics/UserInterface/LoadingSpinner.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
index 4f4607c114..8174c4d5fe 100644
--- a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Graphics.UserInterface
     {
         private readonly SpriteIcon spinner;
 
+        protected override bool StartHidden => true;
+
         protected Container MainContents;
 
         public const float TRANSITION_DURATION = 500;

From 95f57ca88c3f17ddebe7e449d8345e9c672d98fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 18:05:23 +0900
Subject: [PATCH 03201/10326] Remove duplicate calls to CheckForUpdatesAsync

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs | 1 -
 osu.Game/Updater/SimpleUpdateManager.cs      | 2 --
 2 files changed, 3 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 3bd10215c2..748969ade5 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -35,7 +35,6 @@ namespace osu.Desktop.Updater
             notificationOverlay = notification;
 
             Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
-            Schedule(() => Task.Run(CheckForUpdateAsync));
         }
 
         protected override async Task InternalCheckForUpdateAsync() => await checkForUpdateAsync();
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 78d27ab754..b61c88a280 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -28,8 +28,6 @@ namespace osu.Game.Updater
         private void load(OsuGameBase game)
         {
             version = game.Version;
-
-            Schedule(() => Task.Run(CheckForUpdateAsync));
         }
 
         protected override async Task InternalCheckForUpdateAsync()

From 6beb28b685205a886e98235c6c332912b612ad18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 18:07:39 +0900
Subject: [PATCH 03202/10326] Rename method to be less bad

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs | 2 +-
 osu.Game/Updater/SimpleUpdateManager.cs      | 2 +-
 osu.Game/Updater/UpdateManager.cs            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 748969ade5..05c8e835ac 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -37,7 +37,7 @@ namespace osu.Desktop.Updater
             Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
         }
 
-        protected override async Task InternalCheckForUpdateAsync() => await checkForUpdateAsync();
+        protected override async Task PerformUpdateCheck() => await checkForUpdateAsync();
 
         private async Task checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
         {
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index b61c88a280..ebb9995c66 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Updater
             version = game.Version;
         }
 
-        protected override async Task InternalCheckForUpdateAsync()
+        protected override async Task PerformUpdateCheck()
         {
             try
             {
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index abe21f08a4..9037187e8d 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -49,10 +49,10 @@ namespace osu.Game.Updater
             if (!CanCheckForUpdate)
                 return;
 
-            await InternalCheckForUpdateAsync();
+            await PerformUpdateCheck();
         }
 
-        protected virtual Task InternalCheckForUpdateAsync()
+        protected virtual Task PerformUpdateCheck()
         {
             // Query last version only *once*, so the user can re-check for updates, in case they closed the notification or else.
             lastVersion ??= config.Get<string>(OsuSetting.Version);

From 3dd642a33667d53d5d78a857c1f5548e335f9882 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 18:29:21 +0900
Subject: [PATCH 03203/10326] Ensure only one update check can be running at a
 time

---
 osu.Game/Updater/UpdateManager.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 9037187e8d..06d6a39066 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -44,12 +44,22 @@ namespace osu.Game.Updater
             config.Set(OsuSetting.Version, game.Version);
         }
 
+        private readonly object updateTaskLock = new object();
+
+        private Task updateCheckTask;
+
         public async Task CheckForUpdateAsync()
         {
             if (!CanCheckForUpdate)
                 return;
 
-            await PerformUpdateCheck();
+            lock (updateTaskLock)
+                updateCheckTask ??= PerformUpdateCheck();
+
+            await updateCheckTask;
+
+            lock (updateTaskLock)
+                updateCheckTask = null;
         }
 
         protected virtual Task PerformUpdateCheck()

From 4f809767a5f9cf762244843021a6f33ac99c94af Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 18:36:36 +0900
Subject: [PATCH 03204/10326] Disable button while update check is in progress

---
 .../Settings/Sections/General/UpdateSettings.cs       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 4a2a50885e..869e6c9c51 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Overlays.Settings.Sections.General
 
         protected override string Header => "Updates";
 
+        private SettingsButton checkForUpdatesButton;
+
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuConfigManager config, OsuGame game)
         {
@@ -29,11 +31,14 @@ namespace osu.Game.Overlays.Settings.Sections.General
             });
 
             // We should only display the button for UpdateManagers that do check for updates
-            Add(new SettingsButton
+            Add(checkForUpdatesButton = new SettingsButton
             {
                 Text = "Check for updates",
-                Action = () => Schedule(() => Task.Run(updateManager.CheckForUpdateAsync)),
-                Enabled = { Value = updateManager.CanCheckForUpdate }
+                Action = () =>
+                {
+                    checkForUpdatesButton.Enabled.Value = false;
+                    Task.Run(updateManager.CheckForUpdateAsync).ContinueWith(t => Schedule(() => checkForUpdatesButton.Enabled.Value = true));
+                }
             });
 
             if (RuntimeInfo.IsDesktop)

From 6217fb26daf0a88c9c8bd867f1efb533c0c5c1bb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Jun 2020 18:50:25 +0900
Subject: [PATCH 03205/10326] Finish up design implementation of timing
 distribution graph

---
 .../TestSceneTimingDistributionGraph.cs       | 85 ++++++++++++++++++-
 1 file changed, 83 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
index 456ac19383..4129975166 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
@@ -8,6 +8,8 @@ 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.Rulesets.Osu.Scoring;
 using osuTK;
 
@@ -21,7 +23,7 @@ namespace osu.Game.Tests.Visual.Ranking
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Size = new Vector2(300, 100)
+                Size = new Vector2(400, 130)
             });
         }
 
@@ -58,6 +60,17 @@ namespace osu.Game.Tests.Visual.Ranking
 
     public class TimingDistributionGraph : CompositeDrawable
     {
+        /// <summary>
+        /// The number of data points shown on the axis below the graph.
+        /// </summary>
+        private const float axis_points = 5;
+
+        /// <summary>
+        /// An amount to adjust the value of the axis points by, effectively insetting the axis in the graph.
+        /// Without an inset, the final data point will be placed halfway outside the graph.
+        /// </summary>
+        private const float axis_value_inset = 0.2f;
+
         private readonly TimingDistribution distribution;
 
         public TimingDistributionGraph(TimingDistribution distribution)
@@ -74,11 +87,79 @@ namespace osu.Game.Tests.Visual.Ranking
             for (int i = 0; i < bars.Length; i++)
                 bars[i] = new Bar { Height = (float)distribution.Bins[i] / maxCount };
 
+            Container axisFlow;
+
             InternalChild = new GridContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Content = new[] { bars }
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Content = new[] { bars }
+                        }
+                    },
+                    new Drawable[]
+                    {
+                        axisFlow = new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y
+                        }
+                    },
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(),
+                    new Dimension(GridSizeMode.AutoSize),
+                }
             };
+
+            // We know the total number of bins on each side of the centre ((n - 1) / 2), and the size of each bin.
+            // So our axis will contain one centre element + 5 points on each side, each with a value depending on the number of bins * bin size.
+            int sideBins = (distribution.Bins.Length - 1) / 2;
+            double maxValue = sideBins * distribution.BinSize;
+            double axisValueStep = maxValue / axis_points * (1 - axis_value_inset);
+
+            axisFlow.Add(new OsuSpriteText
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Text = "0",
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
+            });
+
+            for (int i = 1; i <= axis_points; i++)
+            {
+                double axisValue = i * axisValueStep;
+                float position = (float)(axisValue / maxValue);
+                float alpha = 1f - position * 0.8f;
+
+                axisFlow.Add(new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativePositionAxes = Axes.X,
+                    X = -position / 2,
+                    Alpha = alpha,
+                    Text = axisValue.ToString("-0"),
+                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
+                });
+
+                axisFlow.Add(new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativePositionAxes = Axes.X,
+                    X = position / 2,
+                    Alpha = alpha,
+                    Text = axisValue.ToString("+0"),
+                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
+                });
+            }
         }
 
         private class Bar : CompositeDrawable

From 35f577375c53c9f1a7c2cc159c32d468a2d9ce41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 19:20:45 +0900
Subject: [PATCH 03206/10326] Restore notification code

---
 osu.Game/Updater/UpdateManager.cs | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 06d6a39066..35f9ad512f 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -39,6 +39,18 @@ namespace osu.Game.Updater
 
             Schedule(() => Task.Run(CheckForUpdateAsync));
 
+            // Query last version only *once*, so the user can re-check for updates, in case they closed the notification or else.
+            lastVersion ??= config.Get<string>(OsuSetting.Version);
+
+            var version = game.Version;
+
+            if (game.IsDeployedBuild && version != lastVersion)
+            {
+                // 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));
+            }
+
             // 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, game.Version);
@@ -62,23 +74,7 @@ namespace osu.Game.Updater
                 updateCheckTask = null;
         }
 
-        protected virtual Task PerformUpdateCheck()
-        {
-            // Query last version only *once*, so the user can re-check for updates, in case they closed the notification or else.
-            lastVersion ??= config.Get<string>(OsuSetting.Version);
-
-            var version = game.Version;
-
-            if (version != lastVersion)
-            {
-                // 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));
-            }
-
-            // we aren't doing any async in this method, so we return a completed task instead.
-            return Task.CompletedTask;
-        }
+        protected virtual Task PerformUpdateCheck() => Task.CompletedTask;
 
         private class UpdateCompleteNotification : SimpleNotification
         {

From 89cf146d18a804cca959ff18dfceb399bbb31828 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 19:24:50 +0900
Subject: [PATCH 03207/10326] Fix base UpdateManager thinking it can check for
 updates

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

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 35f9ad512f..d3a05deac5 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -20,7 +20,9 @@ namespace osu.Game.Updater
         /// <summary>
         /// Whether this UpdateManager should be or is capable of checking for updates.
         /// </summary>
-        public bool CanCheckForUpdate => game.IsDeployedBuild;
+        public bool CanCheckForUpdate => game.IsDeployedBuild &&
+                                         // only implementations will actually check for updates.
+                                         GetType() != typeof(UpdateManager);
 
         private string lastVersion;
 

From 446ce2590cf93c4c69072f0e384d803ded88fc16 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 19:25:54 +0900
Subject: [PATCH 03208/10326] Move local back in place

---
 osu.Game/Updater/UpdateManager.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index d3a05deac5..51f48264b8 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -24,8 +24,6 @@ namespace osu.Game.Updater
                                          // only implementations will actually check for updates.
                                          GetType() != typeof(UpdateManager);
 
-        private string lastVersion;
-
         [Resolved]
         private OsuConfigManager config { get; set; }
 
@@ -42,7 +40,7 @@ namespace osu.Game.Updater
             Schedule(() => Task.Run(CheckForUpdateAsync));
 
             // Query last version only *once*, so the user can re-check for updates, in case they closed the notification or else.
-            lastVersion ??= config.Get<string>(OsuSetting.Version);
+            var lastVersion = config.Get<string>(OsuSetting.Version);
 
             var version = game.Version;
 

From f5c3863e6d97f71b65f06de59f2754b03f71f642 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 19:26:46 +0900
Subject: [PATCH 03209/10326] Revert variable usage

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

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 51f48264b8..bcaaf8e343 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Updater
 
             // 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, game.Version);
+            config.Set(OsuSetting.Version, version);
         }
 
         private readonly object updateTaskLock = new object();

From 7ae421cc8e8a64f73a65e77e92c40c318f23b6a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 19:32:32 +0900
Subject: [PATCH 03210/10326] Revert more incorrect changes

---
 osu.Game/Updater/UpdateManager.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index bcaaf8e343..5da366bde9 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -39,11 +39,10 @@ namespace osu.Game.Updater
 
             Schedule(() => Task.Run(CheckForUpdateAsync));
 
-            // Query last version only *once*, so the user can re-check for updates, in case they closed the notification or else.
-            var lastVersion = config.Get<string>(OsuSetting.Version);
-
             var version = game.Version;
 
+            var lastVersion = config.Get<string>(OsuSetting.Version);
+
             if (game.IsDeployedBuild && version != lastVersion)
             {
                 // only show a notification if we've previously saved a version to the config file (ie. not the first run).

From 9746e24d1efb5e85e22053e867629fc77910c4e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jun 2020 19:40:54 +0900
Subject: [PATCH 03211/10326] Rename abstract TestScene

---
 osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs            | 2 +-
 .../Gameplay/{TestPlayerTestScene.cs => OsuPlayerTestScene.cs}  | 2 +-
 .../Visual/Gameplay/TestSceneCompletionCancellation.cs          | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs    | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs                | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestPlayerTestScene.cs => OsuPlayerTestScene.cs} (87%)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index 7d3d8b7f16..acefaa006a 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -25,7 +25,7 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Gameplay
 {
     [HeadlessTest]
-    public class TestSceneHitObjectSamples : TestPlayerTestScene
+    public class TestSceneHitObjectSamples : OsuPlayerTestScene
     {
         private readonly SkinInfo userSkinInfo = new SkinInfo();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestPlayerTestScene.cs b/osu.Game.Tests/Visual/Gameplay/OsuPlayerTestScene.cs
similarity index 87%
rename from osu.Game.Tests/Visual/Gameplay/TestPlayerTestScene.cs
rename to osu.Game.Tests/Visual/Gameplay/OsuPlayerTestScene.cs
index bbf0136b00..cbf8515567 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestPlayerTestScene.cs
+++ b/osu.Game.Tests/Visual/Gameplay/OsuPlayerTestScene.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Tests.Visual.Gameplay
     /// <summary>
     /// A <see cref="PlayerTestScene"/> with an arbitrary ruleset value to test with.
     /// </summary>
-    public abstract class TestPlayerTestScene : PlayerTestScene
+    public abstract class OsuPlayerTestScene : PlayerTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
     }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
index f87999ae61..79275d70a7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
@@ -16,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneCompletionCancellation : TestPlayerTestScene
+    public class TestSceneCompletionCancellation : OsuPlayerTestScene
     {
         private Track track;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
index 744eeed022..2a119f5199 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
@@ -16,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneGameplayRewinding : TestPlayerTestScene
+    public class TestSceneGameplayRewinding : OsuPlayerTestScene
     {
         [Resolved]
         private AudioManager audioManager { get; set; }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 411265d600..387ac42f67 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -16,7 +16,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestScenePause : TestPlayerTestScene
+    public class TestScenePause : OsuPlayerTestScene
     {
         protected new PausePlayer Player => (PausePlayer)base.Player;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
index 20911bfa4d..e43e5ba3ce 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
@@ -12,7 +12,7 @@ using osu.Game.Rulesets;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [HeadlessTest] // we alter unsafe properties on the game host to test inactive window state.
-    public class TestScenePauseWhenInactive : TestPlayerTestScene
+    public class TestScenePauseWhenInactive : OsuPlayerTestScene
     {
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {

From b076cf96b71b07bdd4929f2a92eaa7f303d66a98 Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Fri, 12 Jun 2020 13:20:09 +0200
Subject: [PATCH 03212/10326] move cursorRotate.Value check into
 shouldRotateCursor() method

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

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 507d218fb8..b89ad6a356 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Graphics.Cursor
                 activeCursor.AdditiveLayer.FadeInFromZero(800, Easing.OutQuint);
             }
 
-            if (shouldRotateCursor(e) && cursorRotate.Value)
+            if (shouldRotateCursor(e))
             {
                 // if cursor is already rotating don't reset its rotate origin
                 if (dragRotationState != DragRotationState.Rotating)
@@ -126,7 +126,7 @@ namespace osu.Game.Graphics.Cursor
             activeCursor.ScaleTo(0.6f, 250, Easing.In);
         }
 
-        private static bool shouldRotateCursor(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Right);
+        private bool shouldRotateCursor(MouseEvent e) => cursorRotate.Value && (e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Right));
 
         private static bool anyMainButtonPressed(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Middle) || e.IsPressed(MouseButton.Right);
 

From 7c3e7b65a820365799af5ebb590276263d28bb2a Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Fri, 12 Jun 2020 21:22:22 +0800
Subject: [PATCH 03213/10326] add custom file path support for osu\!mania
 judgement sprite

---
 .../Skinning/ManiaLegacySkinTransformer.cs    | 66 +++++++++++--------
 .../LegacyManiaSkinConfigurationLookup.cs     |  8 ++-
 osu.Game/Skinning/LegacySkin.cs               | 18 +++++
 3 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index e64178083a..9ba544ed59 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -11,6 +11,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
+using System.Collections.Generic;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
@@ -19,6 +20,36 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private readonly ISkin source;
         private readonly ManiaBeatmap beatmap;
 
+        /// <summary>
+        /// Mapping of <see cref="HitResult"/> to ther corresponding
+        /// <see cref="LegacyManiaSkinConfigurationLookups"/> value.
+        /// </summary>
+        private static readonly IReadOnlyDictionary<HitResult, LegacyManiaSkinConfigurationLookups> componentMapping
+            = new Dictionary<HitResult, LegacyManiaSkinConfigurationLookups>
+        {
+            { HitResult.Perfect, LegacyManiaSkinConfigurationLookups.Hit300g },
+            { HitResult.Great, LegacyManiaSkinConfigurationLookups.Hit300 },
+            { HitResult.Good, LegacyManiaSkinConfigurationLookups.Hit200 },
+            { HitResult.Ok, LegacyManiaSkinConfigurationLookups.Hit100 },
+            { HitResult.Meh, LegacyManiaSkinConfigurationLookups.Hit50 },
+            { HitResult.Miss, LegacyManiaSkinConfigurationLookups.Hit0 }
+        };
+
+        /// <summary>
+        /// Mapping of <see cref="HitResult"/> to their corresponding
+        /// default filenames.
+        /// </summary>
+        private static readonly IReadOnlyDictionary<HitResult, string> defaultName
+            = new Dictionary<HitResult, string>
+        {
+            { HitResult.Perfect, "mania-hit300g" },
+            { HitResult.Great, "mania-hit300" },
+            { HitResult.Good, "mania-hit200" },
+            { HitResult.Ok, "mania-hit100" },
+            { HitResult.Meh, "mania-hit50" },
+            { HitResult.Miss, "mania-hit0" }
+        };
+
         private Lazy<bool> isLegacySkin;
 
         /// <summary>
@@ -47,15 +78,15 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         public Drawable GetDrawableComponent(ISkinComponent component)
         {
+            if (!isLegacySkin.Value || !hasKeyTexture.Value)
+                return null;
+
             switch (component)
             {
                 case GameplaySkinComponent<HitResult> resultComponent:
-                    return getResult(resultComponent);
+                    return getResult(resultComponent.Component);
 
                 case ManiaSkinComponent maniaComponent:
-                    if (!isLegacySkin.Value || !hasKeyTexture.Value)
-                        return null;
-
                     switch (maniaComponent.Component)
                     {
                         case ManiaSkinComponents.ColumnBackground:
@@ -95,30 +126,13 @@ namespace osu.Game.Rulesets.Mania.Skinning
             return null;
         }
 
-        private Drawable getResult(GameplaySkinComponent<HitResult> resultComponent)
+        private Drawable getResult(HitResult result)
         {
-            switch (resultComponent.Component)
-            {
-                case HitResult.Miss:
-                    return this.GetAnimation("mania-hit0", true, true);
+            string image = GetConfig<ManiaSkinConfigurationLookup, string>(
+                new ManiaSkinConfigurationLookup(componentMapping[result])
+            )?.Value ?? defaultName[result];
 
-                case HitResult.Meh:
-                    return this.GetAnimation("mania-hit50", true, true);
-
-                case HitResult.Ok:
-                    return this.GetAnimation("mania-hit100", true, true);
-
-                case HitResult.Good:
-                    return this.GetAnimation("mania-hit200", true, true);
-
-                case HitResult.Great:
-                    return this.GetAnimation("mania-hit300", true, true);
-
-                case HitResult.Perfect:
-                    return this.GetAnimation("mania-hit300g", true, true);
-            }
-
-            return null;
+            return this.GetAnimation(image, true, true);
         }
 
         public Texture GetTexture(string componentName) => source.GetTexture(componentName);
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index c76d5c8784..4990ca8e60 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -43,6 +43,12 @@ namespace osu.Game.Skinning
         MinimumColumnWidth,
         LeftStageImage,
         RightStageImage,
-        BottomStageImage
+        BottomStageImage,
+        Hit300g,
+        Hit300,
+        Hit200,
+        Hit100,
+        Hit50,
+        Hit0,
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 003fa24d5b..390dc871e4 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -257,6 +257,24 @@ namespace osu.Game.Skinning
                 case LegacyManiaSkinConfigurationLookups.RightLineWidth:
                     Debug.Assert(maniaLookup.TargetColumn != null);
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnLineWidth[maniaLookup.TargetColumn.Value + 1]));
+
+                case LegacyManiaSkinConfigurationLookups.Hit0:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit0"));
+
+                case LegacyManiaSkinConfigurationLookups.Hit50:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit50"));
+
+                case LegacyManiaSkinConfigurationLookups.Hit100:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit100"));
+
+                case LegacyManiaSkinConfigurationLookups.Hit200:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit200"));
+
+                case LegacyManiaSkinConfigurationLookups.Hit300:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit300"));
+
+                case LegacyManiaSkinConfigurationLookups.Hit300g:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit300g"));
             }
 
             return null;

From 8924ff4ba6585e883b8da322d8d3b1662b1fcc76 Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Fri, 12 Jun 2020 15:43:19 +0200
Subject: [PATCH 03214/10326] Rename shouldRotateCursor() to
 shouldKeepRotating()

---
 osu.Game/Graphics/Cursor/MenuCursor.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index b89ad6a356..8305f33e25 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Graphics.Cursor
                 activeCursor.AdditiveLayer.FadeInFromZero(800, Easing.OutQuint);
             }
 
-            if (shouldRotateCursor(e))
+            if (shouldKeepRotating(e))
             {
                 // if cursor is already rotating don't reset its rotate origin
                 if (dragRotationState != DragRotationState.Rotating)
@@ -104,7 +104,7 @@ namespace osu.Game.Graphics.Cursor
                 activeCursor.ScaleTo(1, 500, Easing.OutElastic);
             }
 
-            if (!shouldRotateCursor(e))
+            if (!shouldKeepRotating(e))
             {
                 if (dragRotationState == DragRotationState.Rotating)
                     activeCursor.RotateTo(0, 600 * (1 + Math.Abs(activeCursor.Rotation / 720)), Easing.OutElasticHalf);
@@ -126,7 +126,7 @@ namespace osu.Game.Graphics.Cursor
             activeCursor.ScaleTo(0.6f, 250, Easing.In);
         }
 
-        private bool shouldRotateCursor(MouseEvent e) => cursorRotate.Value && (e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Right));
+        private bool shouldKeepRotating(MouseEvent e) => cursorRotate.Value && (e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Right));
 
         private static bool anyMainButtonPressed(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Middle) || e.IsPressed(MouseButton.Right);
 

From c9469dc0ddaf98b6d119e01581e09b7c209720fe Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Jun 2020 22:48:43 +0900
Subject: [PATCH 03215/10326] Add background

---
 .../TestSceneTimingDistributionGraph.cs        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
index 4129975166..73225ff599 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
@@ -19,12 +19,20 @@ namespace osu.Game.Tests.Visual.Ranking
     {
         public TestSceneTimingDistributionGraph()
         {
-            Add(new TimingDistributionGraph(createNormalDistribution())
+            Children = new Drawable[]
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(400, 130)
-            });
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4Extensions.FromHex("#333")
+                },
+                new TimingDistributionGraph(createNormalDistribution())
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(400, 130)
+                }
+            };
         }
 
         private TimingDistribution createNormalDistribution()

From ce56c457218879b78b14bd1226c300e27731e194 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Jun 2020 22:48:52 +0900
Subject: [PATCH 03216/10326] Implement the accuracy heatmap

---
 .../Ranking/TestSceneAccuracyHeatmap.cs       | 273 ++++++++++++++++++
 1 file changed, 273 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
new file mode 100644
index 0000000000..8386ee5992
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
@@ -0,0 +1,273 @@
+// Copyright (c) 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.Diagnostics;
+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.Input.Events;
+using osu.Framework.Utils;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestSceneAccuracyHeatmap : OsuManualInputManagerTestScene
+    {
+        private readonly Box background;
+        private readonly Drawable object1;
+        private readonly Drawable object2;
+        private readonly Heatmap heatmap;
+
+        public TestSceneAccuracyHeatmap()
+        {
+            Children = new[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4Extensions.FromHex("#333"),
+                },
+                object1 = new BorderCircle
+                {
+                    Position = new Vector2(256, 192),
+                    Colour = Color4.Yellow,
+                },
+                object2 = new BorderCircle
+                {
+                    Position = new Vector2(500, 300),
+                },
+                heatmap = new Heatmap
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Scheduler.AddDelayed(() =>
+            {
+                var randomPos = new Vector2(
+                    RNG.NextSingle(object1.DrawPosition.X - object1.DrawSize.X / 2, object1.DrawPosition.X + object1.DrawSize.X / 2),
+                    RNG.NextSingle(object1.DrawPosition.Y - object1.DrawSize.Y / 2, object1.DrawPosition.Y + object1.DrawSize.Y / 2));
+
+                // The background is used for ToLocalSpace() since we need to go _inside_ the DrawSizePreservingContainer (Content of TestScene).
+                heatmap.AddPoint(object2.Position, object1.Position, randomPos, RNG.NextSingle(10, 500));
+                InputManager.MoveMouseTo(background.ToScreenSpace(randomPos));
+            }, 1, true);
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            heatmap.AddPoint(object2.Position, object1.Position, background.ToLocalSpace(e.ScreenSpaceMouseDownPosition), 50);
+            return true;
+        }
+
+        private class Heatmap : CompositeDrawable
+        {
+            /// <summary>
+            /// Full size of the heatmap.
+            /// </summary>
+            private const float size = 100;
+
+            /// <summary>
+            /// Size of the inner circle containing the "hit" points, relative to <see cref="size"/>.
+            /// All other points outside of the inner circle are "miss" points.
+            /// </summary>
+            private const float inner_portion = 0.8f;
+
+            private const float rotation = 45;
+            private const float point_size = 4;
+
+            private Container<HitPoint> allPoints;
+
+            public Heatmap()
+            {
+                Size = new Vector2(size);
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                InternalChildren = new Drawable[]
+                {
+                    new CircularContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Size = new Vector2(inner_portion),
+                        Masking = true,
+                        BorderThickness = 2f,
+                        BorderColour = Color4.White,
+                        Child = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4Extensions.FromHex("#202624")
+                        }
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                RelativeSizeAxes = Axes.Y,
+                                Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
+                                Width = 1f,
+                                Rotation = -rotation,
+                                Alpha = 0.3f,
+                            },
+                            new Box
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                RelativeSizeAxes = Axes.Y,
+                                Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
+                                Width = 1f,
+                                Rotation = rotation
+                            },
+                            new Box
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Width = 10,
+                                Height = 2f,
+                            },
+                            new Box
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Y = -1,
+                                Width = 2f,
+                                Height = 10,
+                            }
+                        }
+                    },
+                    allPoints = new Container<HitPoint> { RelativeSizeAxes = Axes.Both }
+                };
+
+                Vector2 centre = new Vector2(size / 2);
+                int rows = (int)Math.Ceiling(size / point_size);
+                int cols = (int)Math.Ceiling(size / point_size);
+
+                for (int r = 0; r < rows; r++)
+                {
+                    for (int c = 0; c < cols; c++)
+                    {
+                        Vector2 pos = new Vector2(c * point_size, r * point_size);
+                        HitType type = HitType.Hit;
+
+                        if (Vector2.Distance(pos, centre) > size * inner_portion / 2)
+                            type = HitType.Miss;
+
+                        allPoints.Add(new HitPoint(pos, type)
+                        {
+                            Size = new Vector2(point_size),
+                            Colour = type == HitType.Hit ? new Color4(102, 255, 204, 255) : new Color4(255, 102, 102, 255)
+                        });
+                    }
+                }
+            }
+
+            public void AddPoint(Vector2 start, Vector2 end, Vector2 hitPoint, float radius)
+            {
+                double angle1 = Math.Atan2(end.Y - hitPoint.Y, hitPoint.X - end.X); // Angle between the end point and the hit point.
+                double angle2 = Math.Atan2(end.Y - start.Y, start.X - end.X); // Angle between the end point and the start point.
+                double finalAngle = angle2 - angle1; // Angle between start, end, and hit points.
+
+                float normalisedDistance = Vector2.Distance(hitPoint, end) / radius;
+
+                // Find the most relevant hit point.
+                double minDist = double.PositiveInfinity;
+                HitPoint point = null;
+
+                foreach (var p in allPoints)
+                {
+                    Vector2 localCentre = new Vector2(size / 2);
+                    float localRadius = localCentre.X * inner_portion * normalisedDistance;
+                    double localAngle = finalAngle + 3 * Math.PI / 4;
+                    Vector2 localPoint = localCentre + localRadius * new Vector2((float)Math.Cos(localAngle), (float)Math.Sin(localAngle));
+
+                    float dist = Vector2.Distance(p.DrawPosition + p.DrawSize / 2, localPoint);
+
+                    if (dist < minDist)
+                    {
+                        minDist = dist;
+                        point = p;
+                    }
+                }
+
+                Debug.Assert(point != null);
+                point.Increment();
+            }
+        }
+
+        private class HitPoint : Circle
+        {
+            private readonly HitType type;
+
+            public HitPoint(Vector2 position, HitType type)
+            {
+                this.type = type;
+
+                Position = position;
+                Alpha = 0;
+            }
+
+            public void Increment()
+            {
+                if (Alpha < 1)
+                    Alpha += 0.1f;
+                else if (type == HitType.Hit)
+                    Colour = ((Color4)Colour).Lighten(0.1f);
+            }
+        }
+
+        private enum HitType
+        {
+            Hit,
+            Miss
+        }
+
+        private class BorderCircle : CircularContainer
+        {
+            public BorderCircle()
+            {
+                Origin = Anchor.Centre;
+                Size = new Vector2(100);
+
+                Masking = true;
+                BorderThickness = 2;
+                BorderColour = Color4.White;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        AlwaysPresent = true
+                    },
+                    new Circle
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(4),
+                    }
+                };
+            }
+        }
+    }
+}

From 81c392b841999e9f237a7b3f2e24d467957c876f Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Fri, 12 Jun 2020 15:57:23 +0200
Subject: [PATCH 03217/10326] Change hash to be lowercase and change sample
 directories

---
 osu.Game/Screens/Menu/IntroCircles.cs   | 2 +-
 osu.Game/Screens/Menu/IntroScreen.cs    | 2 +-
 osu.Game/Screens/Menu/IntroTriangles.cs | 2 +-
 osu.Game/Screens/Menu/IntroWelcome.cs   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index 113d496855..d4cd073b7a 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio)
         {
             if (MenuVoice.Value)
-                welcome = audio.Samples.Get(@"Intro/lazer/welcome");
+                welcome = audio.Samples.Get(@"Intro/welcome");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index abc7a3c7ee..2f9d43bed6 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Menu
             MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
 
-            Seeya = audio.Samples.Get(@"Intro/lazer/seeya");
+            Seeya = audio.Samples.Get(@"Intro/seeya");
 
             BeatmapSetInfo setInfo = null;
 
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index fb84ccffd0..9be74a0fd9 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Menu
         private void load()
         {
             if (MenuVoice.Value && !UsingThemedIntro)
-                welcome = audio.Samples.Get(@"Intro/lazer/welcome");
+                welcome = audio.Samples.Get(@"Intro/welcome");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 38405fab6a..dec3af5ac9 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Menu
 {
     public class IntroWelcome : IntroScreen
     {
-        protected override string BeatmapHash => "64E00D7022195959BFA3109D09C2E2276C8F12F486B91FCF6175583E973B48F2";
+        protected override string BeatmapHash => "64e00d7022195959bfa3109d09c2e2276c8f12f486b91fcf6175583e973b48f2";
         protected override string BeatmapFile => "welcome.osz";
         private const double delay_step_two = 2142;
         private SampleChannel welcome;

From 6000e0f86a48e89d6e64f14cb4f9b5046f04c486 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Jun 2020 23:01:22 +0900
Subject: [PATCH 03218/10326] Increase size to match timing distribution graph

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

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
index 8386ee5992..b605ddcc35 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Tests.Visual.Ranking
             /// <summary>
             /// Full size of the heatmap.
             /// </summary>
-            private const float size = 100;
+            private const float size = 130;
 
             /// <summary>
             /// Size of the inner circle containing the "hit" points, relative to <see cref="size"/>.

From 8a9d01119753923a0230e0c5bea40f93b4586cdf Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Fri, 12 Jun 2020 22:09:58 +0800
Subject: [PATCH 03219/10326] add test files

---
 .../Resources/special-skin/mania/hit0@2x.png    | Bin 0 -> 56621 bytes
 .../Resources/special-skin/mania/hit100@2x.png  | Bin 0 -> 66535 bytes
 .../Resources/special-skin/mania/hit200@2x.png  | Bin 0 -> 82190 bytes
 .../Resources/special-skin/mania/hit300@2x.png  | Bin 0 -> 92906 bytes
 .../special-skin/mania/hit300g-0@2x.png         | Bin 0 -> 56026 bytes
 .../special-skin/mania/hit300g-1@2x.png         | Bin 0 -> 57038 bytes
 .../Resources/special-skin/mania/hit50@2x.png   | Bin 0 -> 57215 bytes
 .../special-skin/mania/stage-bottom@2x.png      | Bin 0 -> 1965 bytes
 .../Resources/special-skin/skin.ini             |  11 +++++++++--
 9 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit0@2x.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit100@2x.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit200@2x.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit300@2x.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit300g-0@2x.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit300g-1@2x.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit50@2x.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-bottom@2x.png

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit0@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit0@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e7b9bc34f3ea66e5d4e687adb312f36d7c5a4bd
GIT binary patch
literal 56621
zcmV)PK()V#P)<h;3K|Lk000e1NJLTq00C+M0071a1^@s6`*F&`000U^X+uL$Nkc;*
zP;zf(X>4Tx07wm;mUmPX*B8g%%xo{TU6vwc>AklFq%OTkl_m<y?gC3$)@2v4H$(*@
ziiikSBq(CQXebgZqF4wB7VH5DB1#NK5fzop#vJwcJ16=5PTn7PKJ$I|o_FWo`_35v
zC;=e?VGgVSK(<gKj`a6t#>FQv@x1^BM1TV}0C2duqR=S6Xn?LjUp6xrb&~O43j*Nv
zEr418u3H3zGns$s|L;SQD-ufpfWpxLJ03rmi*g~#S@{x?OrJ!Vo{}kJ7$ajbnjp%m
zGEV!%=70KpVow?KvV}a<N0zgQm(7!L7s?y+q<oZ-5R{AZ1pIuIZ=kH7CCwI~{03!u
zHlLFV0EQydC46o=%GM}T#L<y#l;;9Kprn1pDPOUKUx4Nb06RytL@Y>4moSaFCQKV=
zXBIPnpP$8-NG!rR+)R#`$7JVZi#Wn10DSspSrkx`)s~4C+0n+?(b2-z5-tDd^^cpM
zz5W?wz5V3zGUCskL5!X++LzcbT23thtSPiMTfS&1I{|204}j|3FPi>70OSh+Xzlyz
zdl<5LNtZ}OE>>3g`T3RtKG#xK(9i3CI(+v0d-&=+OWAp!Ysd8Ar*foO5~i%E+?=c&
zshF87;&Ay)i~k<te;xQ$T3_X19?4JTi}^zIs2Ft01j015-9nx~BFGUk1;W4U@V^ZE
zDhC;Unrjqjbsqse$r32^(E;*n55UmK07=|~?m(aW7D9{xvYQvHJ@#qtQAYRwwEtn?
zGV~SB6{Im`GCMMw$(4%pWQ^VknZW`QkOy?22DE@4Fa{RD7B~S{;0b&|5C{X&ARa6N
zT#yd3ff(e2<zNjc0wrJz*bb_}UQh=bKod9y+Q3P04qOCR!8LFb+yg^k6g&fy;5C?m
zAP5gpAsVCxX+s8(8DtBwAa}?Y3V|Y_cqkc4gM^S2S`Mv)N}zJ68rlyvK;J_rpmWe=
zs2{om4MXG5@6bCKfhjN@)`SgVE0_g)!NG7eybw-<7sE^8LU=P=1=qqy;8yq?d=<V4
z55dpiDFh&7gn{TF76=PrBVkAal8T6tl}IsCiPR!ZNC(o5Tt|kG3FIvXhoNDZ7z>Om
zCIB-Z!^JGdti+UJsxgN!t(Y#%b<8kk67vyD#cE*9urAm@Y#cTXn~yERR$}Y1E!Yd#
zo7hq8Ya9;8z!~A3Z~?e@Tn26#t`xT$*Ni)h>&K1Yrto;Y8r}@=h7ZGY@Dh9xekcA2
z{tSKqKZ<`tAQQ9+wgf*y0zpVvOQ<9qCY&Y=5XJ~IL<OP&(S;aB<Pnz;%ZPQv4q_j1
zlsH3DBpH$1NYSJW(i&0~sfl!fbf5H+OeX7+oyieo0eLmKihPuOi9AexOHrbjQrMJ4
zij=aMa*%SCa)<JgN~Ic7J*f#)33W5IfqI_$korcBCTA%ZD94jqC08TYDmNhaT%IUz
zAnzr=NPek&rTlUEKKTg+qJp6UTY;mnQlUoSgu<Z0lp;;hMlnn=Td`E}u;OLKCrWrF
zLnU7&o>HOG0j2XwBQ%7jM`P2tv~{#P+6CGu9Y;5!2hua>CG_v;z4S?CC1rc%807-x
z8s$^ULkxsr$OvR)G0GUn7`GVjR5Vq*RQM{JRGL%<RHjwusCugMRf|=dRd1@kQ)8<6
zs%5HeRcljwppH>DRgX~5SKp(4L49HleU9rK?wsN|$L8GCfHh1tA~lw29MI^|n9|hJ
z^w$(=?$kW5IibbS^3=-Es?a*EHLgw5cGnhYS7@Kne#%s4dNH$@Rm?8tq>hG8fR0pW
zzfP~tjINRHeBHIW&AJctNO~;2RJ{tlPQ6KeZT(RF<@$~KcMXUJEQ54|9R}S7(}qTd
zv4$HA+YFx=sTu_uEj4O1x^GN1_Ap*-Tx)#81ZToB$u!w*a?KPrbudjgtugI0gUuYx
z1ZKO<`pvQC&gMe%TJu2*iiMX&o<*a@uqDGX#B!}=o8@yWeX9hktybMuAFUm%v#jf^
z@7XBX1lg>$>9G0T*3_13TVs2}j%w#;x5}>F?uEUXJ>Pzh{cQ)DL#V?BhfaqNj!uqZ
z$0o;dCw-@6r(I5iEIKQkRm!^LjCJ;QUgdn!`K^nii^S!a%Wtk0u9>cfU7yS~n#-SC
zH+RHM*Nx-0-)+d9>7MMq&wa>4$AjZh>+#4_&y(j_?>XjW;+5fb#Ot}YwYS*2#e16V
z!d}5X>x20C`xN{1`YQR(_pSDQ=%?$K=GW*q>F?mb%>QfvHXt})YrtTjW*|4PA#gIt
zDQHDdS1=_wD!4lMQHW`XIHV&K4h;(37J7f4!93x-wlEMD7`83!LAX));_x3Ma1r4V
zH4%>^Z6cRPc1O{olA;bry^i*dE{nc5-*~=serJq)Okzw!%yg_zY<cWZoK@V4xU2E%
z@q+mF1bjkFLVd#20^bGO7mOx4Bo-y!T4=PeVBzIO>Wi`#ol25V;v^kU#wN!mA5MPH
z3FFjqrcwe^cBM>m+1wr6XFN|{1#g`1#xLiOrMjh-r#?w@OWT$<p6-!enLZ(43#tV#
zG6FL8W=v;>Wgg6&&5F%x&L(6hXP*!%2{VOVIa)adIsGCtQITk9vCHD^izmgw;`&@D
zcVTY3gpU49^+=7S>!rha?s+wNZ}MaEj~6Hw2n%|am@e70WNfM5(r=exmT{MLF4tMU
zX8G_6uNC`OLMu~NcCOM}Rk&(&wg2ivYe;J{*Zj2BdTsgISL<TebrfnAt}Yx|@4vpW
zNUlg+G`PWa!`_XUje?E6o9s62-1M=SSA3<!x}>t?eJQu}$~QLORDCnMIdyYynPb_W
zEx0YhEw{FMY&}%2SiZD;WLxOA)(U1tamB0cN!u@1+E?z~LE0hRF;o>&)xJ}I=a!xC
ztJAA*)_B)6@6y<{Y1i~_-tK`to_m`1YVIxB`);3L-|hYW`&(-bYby`n4&)tpTo+T<
z{VnU;hI;k-lKKw^g$IWYMIP#EaB65ctZ}%k5pI+=jvq-pa_u{x@7kLzn)Wv{noEv?
zqtc^Kzfb=D*0JDYoyS?nn|?6(VOI;SrMMMpUD7()mfkkh9^c-7BIrbChiga6kCs0k
zJgIZC=9KcOveTr~g{NoFEIl)IR&;jaT-v#j&ZN$J=i|=b=!)p-y%2oi(nY_E=exbS
z&s=i5bn>#x<r7y}SK6*RUTy7h=xO=M;ir~f$KKXHr@r=U&euBn=k}i-@EACE-RJtn
z8-X{j-kf){|JM9lw+9mkhi>z3Ke>~2=f&N;yEFGz-^boBexUH6@}b7V+Mi8+ZXR+R
zIyLMw-18{v(Y+Dw$g^K^e|bMz_?Y^*a!h-y;fd{&ljDBl*PbqTI{HlXY-Xb9SH)j<
zJvV;-!*8Cy^-RW1j=m7TnEk!<rP|Abuk2rSPK8fBe4YJzX1e%|+M7dfS#P`F#l9Px
z$$yW3U-iM{L&wM9kN0P@XJ`Ka1DNyt5f0H{002M$Nkl<ZcmeFad8{Q@e&1JBcY9m!
z-E215Bp=D<42LsPtc)bYifyzaYe^8pv66`p*hvsau_GYPA6fng45x29P=d%=9NBRY
z7>=#{6+{rAB!IHnK}WKLAjXWMk;EZ6T$;lso4xnzx8AL8KHp!}se7t!-Fxf4ci-!7
zPM_}k>eSiKso(E=e&=_#a5x+W&&;zHn70K&jN%+7^;ibV;~A08`+1&)|AMtZ_>2d>
zU|;kQs&f>eT(#KGz`JToJq!0mYJq1!{YCnk3#yBN`7kBr1r;+(M&SKS>du<u3uSRa
zf+|&oCS6Bv;lDsq=rf@HLXq|UD)Y1f^R!w%1MO+8^W^#+1r0h7e;PaWXF&br((a*_
z>?j!HP%BU&@n@i2p^+X#kSB@uo)++a2Goy%P#<TOPZE<HWjj0r?W1h%QC^}qy;V_L
zjAA`r+mlEu&w%>z(!`PF{{0Hj#Rh&7nXp*Kr~UnlMr%(3%{&9@r=2Til>dvyG&8DO
z+51UgzRHDt3Icw=(Andnn`c1%6fnWQiwO7ZJMQ;E#K*;SUzDc(egWsQ@8uZls3s<#
z0d?6|c*@<rpBZRhpY98^jB8)@pEJ@k`pP%hQFQpvfI8piPyO37CfeU8JPKypU&)@F
zSkGu{`nNbt8hQrQ)7$>3@_iB+>1q&&eoM`jCu}jmVKQ2213V>;Pa<7C$xU|{bo30U
zpX4t-N7<efW^%v`2v;(M&&-nm+=szrSp}am%acM=Pg%2BaTiTT&w%=Aq=G`3A2&nI
z3(ke&=UyFfKTgnIG?V2j__Vx0RFAu;j;>UWr?unP*#?Vf$7evjh*o@@X*?!|a!gdt
zK<$0B$aoy`F!MM-TPSr@Gx}*YpNPlf?DVJ8l$xhKqm9b_A158Dz>A=zXFxsU(?6-+
zkAtBmGg5oO%`~2#nC%&0FSwb#<Q@k-DSOe>;yQb;LYcLl*<=wN$s9E;h2(jVj{g}@
z+h=>q{v5FsUCvDH$&EI}Yht9Saq^yGwxedWMGavm*8g#NJQ1{{%D2l~V1jdbV9#}8
zyu8Oz($Yb|`WaAr-}Z^O9wAfB1<rZeUraMjOf&BxMw2-z;64bmB_(}A{vHu6iH_3m
z<5j%v*$dVwUWJg=UnizH@;E9w+AsY)1M2FZ`|*W50;VcwC{?*#UhfIc<$(|AIx(-j
z$5AnxYO`O4Q{2a8AfrP+XS|$_+T~TA;9MSffv%<bjvPfthuZP)V}kJ+P%rTNFEpvg
z2F@db&DCdub1uwLy-X}i-s8|2F0JpA4BCec&PN5zzxs!NsAisMzVX$s4kvm}@@SWN
zj2sV@e&z)0XFy%{tsaBhVKbDgk{AnVp<vpD_w;pwb9vyz)n}-0ObeL${i+vcU(BZX
zZ7-3Wb>tzYlQ~pLDapeA3RMm=dE_Nk+4}fss9j#h3C`t#N3M>Bs?g6U*2v~)YA$+e
zkK!k`k;7pC_Pq4*45*9W=aAmTL@w$1yM7mQ{wG9sB*461rYft^z8K9<sO`V__K}B}
zPv)qAJIU?o{5wuV?eU6~IE@DycR461kEfV-nVXi{`S`vRAevbyz04t1KLhIGcj4WE
z>QMq}Nip{2B&JeC2+A{U&+b_#IC~++tcT55V;SP$m`#3jNl7lTwzCwUBM&j5%t9G4
zN%E=tD;k<fKkfOe^*Ct9FQucSN;EW9zmbDzWnpwu5v;%OfcmJ0hdzNErhS~Llv{f|
z%Mz#YK;tfto4LkIl(;yi(_1CRD<;$~I_Q1m`27Ujq9N6O1kR&&kh__7`mFePQt8GO
zU-VOnZrUz}dnOK|k41pB8or8(><bIjUo=2=WFn>-F_c`}&MW_%;G7SXe|yrID_`32
zHwWI87_b<<U3Ad<$We?bvk2x)QhL09^K{f6FHDKkc%a1PFzM#nojby^ndb7jbHkZ|
zN&-}-nYJH!^dh=AFiljDs=p9G{Y3?3kw%`O<kHrkylLlOtGpcsa}}BDa+QJ*=9(97
zzYOOkk+W82#9XZOr9ItoAxv79#UZ%Oq@&Whju+%G=tjBhmv)LJyp}r5OGlOIr0wUJ
zyd0PgzKB5mMF(Y(!BmMkp$!GAYz~9De8#$5xg_%iyygX;m+`!)W7f({S&Z2(I_N#`
zD5jM;u#}Y~GuK~%v5PR3h7_pnLQa1!ns$zYZd{G7rIvYUN3=0>MAl9dwny@E*kJus
zNYqa&IQxv_f7(0~`98@<_g$(ol;Sw1l6{e@F!sY--`w2HKttvEy8fi*o6eFxzkcl4
zu;4WD^_u514+DD9O05pO<vEj4{S?~%OVK{nvlw^*?-TNy;9Shm(a$1iXFoJkEYBj}
zuaVe1^fD8$+kWYimji+I45|8w1nMUZn0>&V46@@N&UdL~Pri4hpo?TGKf`$$On_`4
z>?3iS;M))Oa$xP}<LqypS{eswkX&H?Bmwwb;O#2cc9tV}?jx^7(U7B=%L}e%v9q6)
z{JeB>IDnmefc=8C7-ia|;u8hbj}xFB7?%Ta@)0Hx%9#6{!N=kk92Uh;ezK0a<aXKj
zm|-siW(UY`d2!$0>ZBn3hUZ#l{cdn+t(AfG+i8#-fbRpiT~61Wh37mB>O~u~&Xl&s
zVmuiR2c@I^(#*8lmw|CfpFb@L^Yce(Re<{%v8vL;%<tW{BBX!Xc0wOGlF_v9JJmi#
zs($Q1{W!o`pga!9?Wt`zj|yUXLeqT@%1p)77r|T^I4kj#iv-RNm=jP=0J(mCHwEY*
zxVfEx^-G09ed4`eSRH|M|JHIw+?UqY%>H)pc94N~%8m0%+g^5Nz2-SoWmYdrsnw}Y
z_9c0jrnrAcM?*^CAZiRpJD2xg6pL8|<7z<ch4QSWMfs)=)A<myXyqEgtI)vA@7s3y
zCKfPe{&|Wg5vY$6pvQqZYgN~}$#a5pKG6Q(d<Jr<9E6cv8hSdWlKry&9MCxC%6J4z
z0?r9MzrVF*fLz}NnAa0f79ii+>zez$PA`1^d=T8<8`yiXIH#9t2E?D=3W77OhS|?A
zHHZBaxYq&g_tQut&<+6Y4~M1~N&Os)R*|BLWhlO1^Bk%$uNQnFRtE-3Y*BPkwP22Z
zE?13E63)?#^U7$)Ipm(HZ~A!q!2_cc*ZJpy&iOJLl|d`cKq%8_<r?9teDkT&b=zf@
zSg!JVWe&+&4KPXl@pvR^P})`LFrGA!rB5SyrtR6W7GCq7)8C4Kdz4J&7)m9)JiVBe
zeSHQSV=f%te(;(nJ*NPjO3rnpW`VO0%#BVzeAG(-y3vcn;M90g9y|zwwMH~N-betu
z*QyT%-o1wf(7ql7{pCc`&I9%-0Nb(NDE*?#K>_^QDCtU!>;-?Kt&WZ^@3WLsX=W@<
zkE)EGCWEpQ04{lHTu+4o&uQFxJqXrQIw^MW3Y;66@h;LSqm66$%>wLsz?$Snodqv5
z%>=3XNP+q=rRZ^RZjZM~iPLzXk&6T5qXgnn?u(U@ea2EA9_#p7ruM}5?bjaU09wrB
zn8pEg<76+C)a<~yu@;A0fU^L4ryqy){xA%Vk7v=}Nlx5csYk;efGyDOZ6&~MpuGWT
zBWY(+_Vt7j#e_M){t&=6Q-tWm)%`8{mNBUdJL`EZ4KRzLXQgwL{s#eOpLV9xjcQaL
z!lxy_-U8+vD5nCzI)QGasxyUmBQ@D48PSUTq*`+-wc^N3fGy+HX=Q+Y4gXo+_Rzrk
zaRT*W1N2C8Zqvk`X?yk=)-MVu`%I-Om$QxE7~>&|Oy!vAI!u%SG^&mJClY|(-RVVJ
z0JOll+Z;rDfO8#?-W%{-8ipN#wP#xO1f=_W;c%%I4*P)h>24J3*;=W`K45=&Zz&$6
z3@EjTV>}1eN>;4*RtDH!MrJKSbl%_hT?BZ$)Mqie3%BT}17w%(WoN1Q^yz1uGW<j)
z`@X%GNX!-*T}Dxz;poYwCc2Vcw56v&`30VLps^rTpFJlJ%mYSiiEZ@v6r-`*>8q*K
zP^YPrms8f!V|Q~Pm)5>FG@9{N92Eik8sTSs!>V9?m9)SpD-YJGMwKg5e;m3*eOMq(
z<-G~PcE0k3*Su%)CSX1+Nx8@@#r!W99rp2FouORf)fnq7kE<L*Ns3-yPb8cgOmqh+
zdUK-_)lqNUZ1p1t(EYtZ)NjPmpc6;+I0(C~VORsKyMsg(<w~Mwvla{o0_jdTj2dBl
zq7P8>USF!k&2BArfc?r^EAFQ%k&NlCk4x7|^X)`flGV&xOHSH$F8<SpXy1LL%arRu
zz&oGn^tWpz-j_?<T(~m7lHfC)s?kw7?c@NNoHEkMEcxsmJ;~LL%+|3x$=PTt1?M`W
zG=Z{cEI1tmn_X0Bn7UMH1@n-1jmYGDj8WNro>Hm#>NL@gle81SPF5TFfW1(#ZmTrT
z%()VzM5;bqpkA;pIuFijgtlvmoOR?lvMo|#E&}o8Q8tHStHw;qx}2e0q2^&M$5c*=
zRvKcY2TOaA7-+ZEi#j{~ND{OU&|wtU;@(nJYYwIQh-v_K)W}QJaW9dm!+IDGB7nLd
z#<eEs-V5W^VQtW8)#3&cc5AsFFR#|){$_1>>_jU*hyGg9^+hD>>(|S{+SS#baA5(v
zgQp3+b9GtZi=(H>)H3c<N;?w(xmZ+3OL8v)v}j81>im6h-eiO(P~PUJ(b>*QLPL$h
z=uB}p`7OCo8Y;C+od#$xuQcK!VB3WC^<?g&C|wu9TIpZoH%+>pC|S3OXr`S$t4Y-o
zsa*v3JUpOYAV?n+p!X{|`+$7ewb&s)9TO>=advT;PxdJ?lwue^?T4vSRfp2Jzp)+F
zQFYV+=}%IS24QQx&LG+j2O#TG6z;{fPBf??%tXWf5D|G838edgb!|8T>j5`H)uUh-
z4MIfkFzyW^xG{`}2;<8Db*-@%2Rwc0db!hxF9FtZ30SLqzV2G@Q_WleUM_hTU5`rg
zo?5RG&;8PqPe=36k1K+}+1Z^A+8>$8&q>gtD<?fWfbQ(}qdMTs{6|!0RJMl-&E`9Z
z*Wulzt!Imo*tVX4wNs~wb~F#tptE1|0K3cFhgKPN>F}k;mUJyOS~l6J4_mTR_8QIy
z1#57unhNA7fO^rYjyy=WscLH4&NBYouUf+a^X2g*7vkbGji2CT*j1=<U!Rc_D#PK-
zBG=ibjG-(RAgv+kMP9z`f%Fz2efLqf)@#PmW(bSy_G`NUwIt~f!8q*3wQe{xu<rGT
zwWvM}2a>9XBlQP^*J0cb(2Im|2v|27;XtrG<QF%i!IJE8eXu&L500<y4fax1$V-6r
z$rP+FNN?>))~=>*#$WHg9^3g(d{zeUB1Gp?oaB3$Kwd^y<y7O!I_~S!(>%cJ(~nEt
z0keD8(+6qM)J-Jm2r2p=Dh}8AOM-R)-Q8P`9ySK48Vxe3$59u6UM6l2dQzIsH0bnq
zd1(UJwSFh=^ImI3alOYcRi$ady47KXhAPdiE}8_^Wm2{By2fvAux=B{Ognwfma0{`
zqMmx867?cM`X~T;QNTPuqquKYe2z1aLX0ty91j4<iY_yeq42wLE&*vVl++z!CV}+s
z&T8~9>eS+}SK9%k13<bL3=n!^1fIBVs*mBYjsqHvVQm;UqNoN~r$Ai;q-&@<;(pJ7
z8bKR?=2thg@5^2bYyAelWxzUI0jz_@pw(@}%PZUQS_xPO*C}wiGz(kK_`ofXgMjyB
zwaFxS&K2b`zKqk=7)@26ry?kq(NAe5nd1o7M{^tsBan^&=?}M<>p;yRy6QB0(fz$X
z^BjYyg(hqupzg+?Ej>4CG>y!X5n5iNu8W>fr)iWXRa%Ytj)+m2MrZ=;V|4htsL~`|
zUjVH84Edx=(^60a>pMu+(2vnZx=vqTw5)TzhWj+I4$AIsY!k`M9J=a)RJ|~uUKB_l
zHb5T)oP9tZCw=!ZCOxag7-JwMSAmIKuKQ*t5-_QUrw`I%sE14(Znf3`>Fx-m1JoWn
zgL)s3t_=a|0CuX!jkwF-pk7D2frKrf9>O{Svi3*{ijkkgD2S1#V?qt0AnZrsK&apE
z2N83JQLheABWvZr`pj@?u(sNYPjt89m<dLyL7ZeQu;zcZmKN(ob2Q-XvOh`?pH5?r
zwyH|ZJ}p%SWmj#Uj-KRHq^Sg?*8pkeJD@9pbQh4`3j651Ac?&}ZI4k}6E#|wQCiG1
zipSMxN?XK63~-tG4n}CEM#Cn+9xinTF@UYP4<}t~qFSmn2i9lK9E-J@C@>WW?B+IA
zm8d|J-!*=dz`CNodQ1ncbaUn~fckNP^gJpK0rcfuOH6;650s}fh@X>V7T-<ws?6i!
z`Aj6Yc^OGe<kE7_b!S1EzPWdnp=k%HryFiGccZQCPINEas||u)?f#%!7bES)gGQ}6
zs1FBmV;ILQ{-`w=vo&Hsn?)Un!$IxR+oxYWwsP!`HG{@WKyzyl_V0J%&L4hnaPzk}
zUmxzkRE$(jjSWUe2<L-dD`Z;H1M5>^1L3?rIJwpuEcY65r_+jGTU(Cfjpi_JwU}VM
zJG_Wgq~c$9bx5CX6GXwe^wkIO%93|wl}TxqhvHbIv8<oZEalnyG&K)BO{FEWN<jJ|
z>W;k;O>ON)8y-kMg05Pc?_l0T-TKz<0Q^<=9@h|-YYj$dF~31QuSQc%q)Mv+)CSV1
z(^x1HYh<R*K2fEi)dsAGfc4sHeV|oEXXEDJm{t^_vp#)dHP!^9(^m(llFd|;q-y1P
zjo(~g-6n#Wic<Aq0JSa|bj3KpGfksCO2V^_9FyZbt4t8iBRy9G=E;CuWDZx}9B<@a
zT!`sUpLrB=9tKkQSxlrbIdkqDAPqxx0O=EeGz_)X>O{MZUi2{N)OH{B>fK?lE_KIn
zFlb1M9s<w<w9Cv1HU-rBeeHu6fBIPW%%AT*s-MiIpT5*U^6<>|w{Py={Og~*`RE2T
z)Pn_kwOZ7z^9%a}1M8?(N4;3<x1vV>_^>fJ6SoH4l_n~XCG^#+@%e`U^wQGsMsOo=
zU|r1bdcmP8c>BPuB<2Bcg)go+k=tRKjJz_-^xS;fszO(D(-PU=fQ~L+%!72u61<OF
zdp1IoB(2VWYlpcGKw9A3V}zzB%RCvWp%k;xnFel1)d2MX$=c0%^vFZ%G>y)L%Y7T#
zp+0Ly{SIK=s*xNJE>+qv2C!4GJ_Rl9raJ3mtku`@y^C8X<4mglFxh^7SYS=Dr%KfV
zLtjsQaMi~FLHg>X_0VlfT4Jh5(N(2q2hNk>x7^1E<%}mXOG%+CI{A#FC{>upCA}Xe
za&g5>L2!|O82tgL1ElG9nMB-zp_&X$@1d6-pqIWM_v(Xwzp-Z^J!tg%utW;dQ5-i{
zzZ)L^YVFJaN$<|en=bunPXYGcncIKo+ppgE)hG(PNIu<WJ?a4dU9=#8b*;BjuOnsG
zP>D4AC(&0oGZhF@H4GL5))xfUH<S~Ajg&ntPx)Oh1lSLFR|f7vUXSzDr?FY|Rivr)
zISQW96!heG{PzKA(UennH0%9nbGu*Lqx0WOK^mo2y`#|@Qynb-siSOW1_L!(6hx*<
zlbr2OPCHdvlt|LUVc*ngO^wj_4MOz*$-GB1>@tmA8yu$(s2y((oC@UhUb$4QDo+FJ
zVA>U6MSXSKHK18$(x{Ny#W)yH9|lNgm2pK(o>c)_p)V&<O8-s==W$>j1LXq%vd<)b
z;bt+6AGXLm@>}-<OtCxW@q-vRJBJjcZxy8JCerkc{vPW$`n5;BUSkKKM(AlU!_!0!
z$nuK;`iHpH{484eq0P7cyY9p0IhSO7?lVqZLgaA{JVX9P?>wKm=zZ|~o&WK7U-{nO
z3E9Yq+N0A9YMo(?1tc}V8g=+8lJycQkn@0b^H^)J%CeK=NYz7@TAkZF7T+Yb3wM*V
ztqrfU)MYt5@P0p+&m2;BA>LuU7U^vko%yu2Ua>$oI_D((jTuK*H_z^c7x2ARP@`#t
z*5B&XHu<<r6V@KZgSsSXfwV?wT~uj-ek}ZCnWq6Z>WydsU`Oc698gD)Rt%blfOLq?
zO{z5B*kZ*94K<pn(^6I1GBng@bQU97pRJ)z1FW42<P=i%1$5PcudBA*uE`w3B(T0l
z-R4(;%&-2~H&7o`FFlf^+f+3*ZD+|ptAh09e6-x#WPr|t^L~N3$P_N~S<K<Wl|6mN
zk^g#Gpb2he4CI(+LX<#EC6&i{w(Z_Untp`jv+YUKyGYYpfHXWMHfx3h)O~<7YQa{&
zA20pr^)LUm{_V9NaOn@;yqN=N=kA{HTL#!tp6#6d?3ccC>GS`y7DRi|Fk;|a>ox|p
zZnIJEvY0j}RX>MR-A7k_0$uevbkzY;v=7!U5BFRIc<)E*cKILmvkKk$^tE20fOFGS
zq2rgz!)S`#O!qdE5!yDB(j5T02T{cur2*2K?~oepjqg17_2cyuzkn7R;Syr0V4x#p
z0%oeC-pAis|L7M{pmepePk^n_8Pn7~sX<zjtkG9X1=2vBrisNdsX9BBVE<q}whE-}
zDq$91esLb7=Rzdv14z?VL3&XDorhwzL*69^&J`r)A}Cj3ic#y2+kA#`zU$61<2g6;
zr0L!4rnj%?Pz8*n9y0*-om4j+G1;>h?A7j}o8B2PG#%9I+x=dn+v_u`>^GUUX(7h2
zQ9N#a`Mu|VeEIH+f7z+t`hav5*3uru+B-?^jitEz?X!RQjlGxpj|9{qDv+h1-a&EQ
zJI-FkdcEIUMpu0j=4!%RtLUnoRIQ1{^C?&d2=Ou(nkBc#BwqG+Kj3}ci(eJEy(o{>
zTBNh}DWxgW)vQk5C6&>Y9H1@xvPjbblhXH@lzzmd^lc`kJE%MonqtlakY?_XQ5vc=
zI)9dT7)T%6eEygFy`bjOp7+^2zx~bMdG-Cj)Er9N&Adm%yd<NufM<izSu5)FSE6R$
zN!7bZ)&2^QAOmXUyg#rmT?NusdKIK<52)*kGPijOKw1*C;5ZM-qc;c6!e#$_i?X)x
zfmxueUsY3Nj$*uZ9Q2!Iij1T1VxCzHRAd~NPX^4+fv2fFy4_Hc&uPwAc(jdnj~yws
zU?pVd0SoB5QDYECLk6pCX5ksIAPR+Fzg9odKl^WVQ~6nvbQO?R)>;u8zxlaI);-kW
zU+%r|bN^rP>EC5=+h@GX>>^9E`e?y*h6sydr4rw%_2OklxjH>{*z1R<(*t;vp4BVu
zd{DNBlCsT|fcJRYU1ahrU-FBsJ2|OmJx$IYtem;-zo+&m0l>@XZoQ<e&Z$UW<89+Y
zCeNyLWi$myn=~Et!|fI5X_Ldd27?GGnhy(H4tli^m2qFIg;0IONYuxhYk#hH0FYKG
zySG-q9;~w(3C#&$9S?hPEENfJAOlD$qH72l5k_djW9^K5jW`247%DkdR~S)TJ1+z=
zY$+_=yNr98(V_<vIE(sffO_V+7hZyM1NA{v9*dHs-DKfquOiM`uHq;G=qZx(et>xr
zW30P^&G9T_npupa<TK{UfXb7UC*&_ia$aaWf&lIE-3~b0?S~OewY|B@213-vnrY|P
zV@gL`!#U_K>h+l5LF|3`-Q^d08?EO|nugsB*>dpaawvZ?uw}5CnB~3WKUIrw{0j3(
z5sb?!>tVFaxgpBi$}nVde@Mp>EQK4xZg~83eRy}11zcS#dceVHfh22}Q`RA+ZE_Rv
zc7A1&_gFilgT0YONGv{huNVC6HC_66z0B_j+}6oMziGy&G1Ymj-d^PW(3PT#wv48*
z-#-RD(ec;lV56m&MLkRCn<G}#u{twm86Imp@v~JPnm`<C(Oqi7H*W>Z7fJ!*oJyaH
zAaxpZjY0fQnlmeqNSDpAb$$aazaMm1myL)K_v7Vgxz>$0p()Xc&Ko(s*BpwM*I837
z0q*U$9atMgTfQSS$rr<LY1-ssKDf4%Pc??MsZ>2TP)~2F$@yM|_mhIPM}a)6bDX8_
za3Jl%`%foDkK9I0YP};KlceV&IFHg8w-rHoogn(nW6CD>6n_@eD9j|r$v{bgN{kQ6
z&f77P-tU++eVnNmj+bmL2V1@E@Yq^6*x(=>L>~Yfpk_m%mPo~#rm1P>W)PiPK5==t
zkx<6qjXN&sxt_!2?I7G;4SJi6v(ckk9sLILL~L|yz|`s_kbat!V+D$>Q5Fq|quyE=
zc9+7l!OAc=_b3Q90BPk4KnSpX<G?%DMp=h8pXBX>obvF2+s|{|e|gOIu`*96&m`KK
z5Zs*0=t>^?770zU3$e)%Ex5@-p4D)d1$D^?EsmJ*V{wNzMX{lf<rrFj&mJk3c!IX6
zF_2Eq@p4X1!!~-yCJIzo85f!5)ix2y-bEcTGw5ltKWj)LrX&X(GNVqv9(Tisc&`&r
z%l*X6@89B_>?vS9NvbXb>#?Q8ZSv4>hDmCY1ey=1_o?!@ddMK{0D1(=Bil59t_sdR
zFt5{Y`b{&FK-k5p0>%nEiD`0R;}Z3r(-_AKma~eXv{d7+T;Zv3yB{8Jz-V@^w1%pH
zv`MuA)9GlX0cq_Wq{EL|LF=`CF17hzhOcY};XA7cS3&UN&DEDbIkEMwz*&+s(l$?i
zNY*;rnytbxJlknbkPn=7pN=Kwc7kE|QE;xw#3IJ;fb?G0CJwyipS5WP@E(&sOQde4
zIWpB&os7cIZ<|JQ)99^8V_7?t6rrpQU9e(%JNI)Us?M3<L3f7{+FBTG?%EMAHag;a
z_PUJD7@_TH^u*aPaZsxdnOt=7^^A)kEk}pMvipd}t0Zry*k<8$1Ay*xq(Oh!V6%D5
z0b&{vB6QT4UD*?j)sG?R@7lQ|r%==AbVeoXj0WE$HHfg~o2F7N18Wzj_$*g{1iA=U
z0&Fh7VqCrF8l)`1LERPs(oTxLTv8YZ(j%_~q^kh*rBS3YTM?Yc0;CRQ3^K;ZlOlWW
zMTU{rG^UaNei%pb1j>5)<{UbYyT?07ryS1SMWV)RX%lzAaT~mek|b>mTSzTkPQ$~k
zhtwki0<}vwwcxcc!v+`hEv&HuoQFY!UmUU!&&m`v89L)9%GC<l5FIsPhAOv|A9pAl
zHO%EJ@Gb?C63JT;9e`);KS6EcPgYL<=J*zL-?;)V;AMLLqYR34mep|-#B61>RoaGy
zctzR@JIM&`5huUYp`~rq9!R-izstIgUToXKJL>iad`^~SptKOia@e8=#SX@d0ty-G
z)w!qPTyS|IPH-*_vnfdH))6#Vjg4@z3s^S+YmNf3a-E!pgdp`>+JRcoS&zg)<&>Dq
zJSs`m7QD@0{brkK#mmRuhctaP=`Bd7Jxa^7I>%}14hPaMtpCh|^a!98rcA{l3HlO#
z`V~zPnAeK|()X%ENI!bU9L_P5+7bsb%Or+Th%%;;`+gWl@dV06bGMg(w4~DzFn$C8
z9%}}{y)<AKpp-<ND3cq(V2DI3>gmG*VZ2*RZ{ByuYl??1aodmIY*3IPGmARjGF4`C
zLQfVYT;sNxE#lFWoNGuL%Gd8s_f8hpr8`OTmVa4$3%qmR$iAVcGEu~I!ctZr#PxpE
zCP#A~z2)kV7OJ$qQwm%J<6_V}eRXVv7V$+tPdk2XBD9f`Xi9S)NY%)<pfu~~IQ@kk
zi0G)3jyadMkHF5u|FX{Rg(IChEB4r|#p-;H0tp5jqsPf08lCA<3+}C8m!sxAj)!Y;
za;!pfY9yB{3olTASXL%hyG#?QT5tQ7s@p{7cZEk4BUU>Ub2S5LFZs4-Pp$g_X$R1w
z9&H5DYR}>!MpXcMJuOe!!w2VSl1s)M9%CrIGUh1DM{e^njZ0?|^W>Svg+|2zFpu6w
zHfa(c0@5c?D{KM3tGs`nf+8x8U<YKDXhLK*i6!xRVeb>(e?)KU&o%#1ns^et^l$iX
z((UNXhU;J1_!vn@iHL*KT<AT5MzD+)Qe~3SRg5a@u?BpNIeUhB-OJbOEWlmX24#}B
z(wHQD7r)Dx)UC+5?_L0L`5%!Hy-lOJvARqs*Cd)M@9M`B5shiSBV>fO>2>^j(34bY
zQf<W@Z3}ONL6=kWq@&h;Z<Bz>(<^mJsUt^l9`Oy3&e@fSSdBiM^oK~)On#sYp@YEQ
zq#SF=+ipl0vEoUWQ<&gZIFYfc3gj{cEt9HC%U{v48c^>;n!b`1pq<##N9K&>ARs+T
z#{+3Y>5-4qL0=j<naxSh>%8e#G(}*Z1kMJ`9&=7(4nL0~qxgQ)q~ytrGo5uNfpVfQ
zNOK3|Oqxz5YPp&o7z$ajAj>+6W4MzBx1&l~kH?8+@n(1Xw~q&>e^y?CRgX{7&=nr3
z098NUz0Jux$T)CpN}W2!k{j@bI&U~B%^+AK$xS4*6O59js+Ljt&!PrN-jctQ>Ru*!
zE5;=0d+fW+P@5>Ns`Q|+hh@rWZLBV2UQSzOUEHXoliJpWP{*0f&Ou9jq+6R>?uj&w
zZaAU`9w15Uyz*gBo5R^2PQT0?1$}i*_iD{YM((Q@VzGr0y*FwP(icEOLCh<1^lp<8
zA*RkwfL+}p!(?J7J{g`ozZ+cKOO6;2ZcLV{6?;DOjroG-LZ_^db35?MRT}w<rP5B)
zN*~Ef^7r5%JpyQ@=&L%W0rWay_4ADbW(UZeA(I)MQ;@x2@tM!Jiy?|D4g7erI|gyj
zqQBnD7$zCWk28(WD0fkUnh|qgd=U2S@)MxhQ-7R6Z6Ik{Mt9JKx~ncTD?t;G=H3-F
z#?U!ZZ%-R_;X0g#AHTWr&ey;F!d7>ywiaq@xYkk6VYG$Zncd}$-$>Hs{4>VLb_}0Z
z{JGg73#hJRi61JF6HCFvoo$$%@;4g8`^S^Ix%5&^iM`6-xuY~5Ws0LsqVlvW)1AJD
zcS+=d>AhXdJDCRDPur<dwBp2ttn!>iGgZ=XVan*rcXPDmH26M6B{b%Zw2Y2AS-TWz
zNO}5hj;35$^t{hEky=Xg2<RMaS)TOMT0tZ=7Pn*Sd|Olx&>Ejx6VpsGvcft4wf!__
z+VzFKF90~(23VaDLJpFu0c^^k$!W^cLH)upF-Y{Bbl@0(B-Yc6ieO!~WKT#`RDoPh
z<IjF*<4aq3>CxsW7BaHhWjGV4E#N5LOxsnOiA*tV`|BRbOY(P-AZ<dlCrLXshs#gW
z^LqNCr%nC=#OV=4=2I(xaX^piBoW7qKEbES<v`VibADw{#~?*N2gGvE7>0?xe7F>d
zadb=(EssKEGzN1N&4Uz}oqHi+=WNf1>_!ZGt6|VU)v(qH*7mwVx850UF@|hF;dSQj
zw9YB!$9>Su3UR6_n+bN;?)?w7t>=DTiD;*xZF<S2Jn3b$jl8)!*!kAUJHIZVZZJg&
zhYhtq9c_o@?NSg-ZzD~w@Dm6GJ(MA9+vsX?JnDjH&tf|`k5d4+4?3n(!Bdx{-VgG?
z&kY6W!F|9_Kpvo<*sNz;k4l+P`A3t8LY{LNqZ>y&X}r5k<oQW}NCj{mU6<v;iKdK}
z3UoB7?OeQEMycZ|b|gtP#fJ(vcllO;HK*c*{a%Y5Crlpd^jhhs^^c|Wh`yZok2IaA
zDO}R?KmFF$5`8)VroZh13%*ha#h8v<dT`hO*H)4_58XHuv-0CYkYD-X7ea7ToLKbz
zoxM!`Vc6$3zqARdUj<X26~?dgtgu&)8l+1A`chg*2hi)hyF<$b&j!i>F}v3E#{fA3
zg$2ZS_(0~!p9q0Xbbl9}mE4@fCA%{rVMYv|in6I^S$G$(_*B@lP9nxGAm-dJGh&(t
zNF~Wz>Lzt9Mof^{5-Hf(i%(4smK&#;8~L(O+8B!?{KGY<<L)4xG)#l&+9Lrq$C1Ht
z8pqoCID@xex%EGPy?gv;y7!lCJW>^`Yw6)kaBy&c<@5h6JgvJrn2P6EYjl`#3@;}t
z59DV$3iVC9NMvf4l{NnC(FQ{9oz-BYB`Il|VWD-2*?<;Kpy$>|!Z#DsVz1i+FQ8*~
z&ndH>Y9i$a%gJ{V@_R-S{y8byG4s$%5+nKR=+8QDI;zajKxdo1Yz2>V_sh*O02%!_
ze?5!sAS#&@){mFiog#{5?dZv(l^P(8mbkthb%GXT4aEfP=0>WuRUhn5=>yi1bQ84%
zS(zGSa>qBG=VTX2(TLD2CSj0BN1%MQG_M6ya1wz{C~`qTcnn(KV3XI&aD6{GMuMAJ
zqQaEPDiD*W3p=2*sAHCIjJZsoP;~f9@g|#jrRgh^lQN%$O421DtxPh2UI(D<&c76#
z@w?U82#cUx3jsm+SB$a&@M-I`%tJn!eJVf>!NAN$P92cAZKcx?CmK7hP0hn+UNNgV
z!l*v4rdgSn55@vklN9k0)39(kc~5!ZMp_Q7bM}pNw*LFbF2du^&U!NGHgew`S+PCh
z7m}txT1)fTK4$6J3JYukOg7;Ty9gb+_Nd8PInHJPHti~{{s;9B{)5-ozWlekTXoA&
zVBLM=Q)Y9<A<v!fp#s20LHGQvzxTmw_rJ*^05a8v1h)Ft8m!eC3?<30@pA(R!(}=U
zPO}VG`@~loO%Oe;-zMcx@lVNnro6{`1XFHl>^sFAV{^0fzTtJM&doiKaX6>5t6SK7
zm<R;NHR0)HZ{HQbcVR^@2I@Y6IM2dUH0qX6I^fmvHvy_Mj~?<3^#aW}=-e#QFW=g=
z(`4FV^rCdoGP$sNg_@Gb*x#hS&Us6BA}$TW-A)sr?ovu_t=E++>^Rl#R;_7np{LeT
zPc|q5q!1T=F20^dgq}mzXr9|7D?6j?>{Hqo6$>g4o(#~K4j)O=jK_i<XsKC1L&K87
zgrdvGgCFN~0QE<f#6(M>X!&sSG{{vdf5oD=lSI--^0J7DL-kzgkRxp+r{++P=K#9S
z?Iacu>Z)-|i34Xz%aW4Ajb3P=tSzm8v6$x(1S}%o1tUI%gS6s-1^5|#e3y@STx6OJ
zlq`qz&rYxg6K@xoR}5?N8-F%;_5#PKJ_U+dohgFxCc{KAM#exeO2lN0!q<=_x3v)k
zJ62Nz$UQM~DVkjl3ac>@m<J=dDdZL$tvZ;Ux+;Yb<`PhcOtuuNW@?B&=P~KTNXC?4
zH$V*sK71qIc>jZU{?eu9>;F;r{_;yould~<^_Xbttn}MF_1S;@-Ya*nHJH96J=j#*
zY4{7>be)-}MyL)3_QD9HwQ8WHNuW+Q3Muz6Ejw^;VQNsdz(wkjvevLb-k&<_41HlV
z@yfgG(INO|l&9}X+0v2FDkx--m40w!N^4(*R$MWjXvXLS8WDYHgv9Ql%$!VDv-l$?
zc|N3aT16o`l@S2bj#dZPx$ddIlOb32=b{&T_x>pCWX;Q{<z(BTW4!CdO>)aQ1S_oB
z$h*)U059Tf_%PsrQLfn9h&e4!N1Jk9Ow1&rPMOv&S0*7)c??ViBFS2X9ZM`t+*M?f
zzh4Fss4f}Mle^+blU4Tw;GkXzSNd}F(>SQxIpsyvC_G4S4U)4krYKdHZ7=tdFl(9m
zqZp>jyXa*h=8C1#PSQ#r$xHJ08~%%DpR`WeEx}8IrXc+q`|i`Y4y5f>dg%2;g4PxE
zH(4iT*GMgOI53k_y8!1}DlJ1Ws1@kp9}dDT^irbrF2r<CgbY*d=p2IHv0xV>PP1am
zau{x~Fs;liLtpnjCSFNFV+R^E&LK?!;&uumzGUXoD+6N=@-iTnUQgjP++Ph>gIxh9
z`R#Jzu0ZR7JdqOwUb5noJiNb4fJQgLIdfH+Wzh(88>Uy8UG22eLU#6s1DRAD#8f`Q
zA3>MY58Qt><QTFcS(@rYLXa-rph*4ASL27@j6e8yzx46xpE|bn+|N1bny5Kbud@m9
z%*MAq8h-C@Z@kXE1Q9uM*)%uX!o#GiCn^@L_(&oy!EN<$j~=1f;*6h8KRVs2$J<2W
z{@bA;GosN>+74<jZPXE1j@rg60+re$j5Sv(sxNhtc1c3jCVcTU4QtPxKyB;V&P$!I
zousvmaInl+yGuK}b_bNKP6G2=4BJ+@7*O;f+R&)R84h@}a9b%2$lZ0`H9Bssq7cA{
zR^%tCP|~65E-_TAD?}@z5pz=@jK1eye~A$OxX--okNh1S?a>WyseLLSMb~RTwTn{e
z@_i)qNRr;w0Z0HeV<BWDK{X&vx6Blxt!+jQVgf{DDNdYitkMKa38XXvr7+zbfgmV2
z1tMipQAqPqr501tgFw4ok9kd@MFKbYt@E2ERpXsALaE}UVlF`XlG9U{1t@Ww*!=UT
zJ+8vjS4t9hPSaE#mt7$5Srw$M5!X`{2aF()j!vFoE9ho;4i43cT@R6*8v<uZ%V<}1
zD9jefQbR8#WO&F&(%BK4gO!kT=);vkEx6m?F&fY|S63{q$PAfB(*Mk~ps#IkQP9{*
z0R`={(ao|zP)y2-dV!>4(i%+a%W9HV_B=+6LiCw%8-$FUDuzoyI0Bp=5pqxKPvwre
zpO%j~BI7wLqdZch^2usILVKu;Dys=FJXy@3IUFmW7;8oKQ3Q+_en&V=IjnO)SY6_u
z)=?`30VsDH#+*aVN$<Lumg|oO04-xzRD%8YUc3K)3<vlAujk)yzI?iV>W3R)^93N6
zxyZqT-FWxiPfk4iR`1NP1OM2iwh?zCB9Q5>4n7X&rt;GrOj5Ck6D4SNsrRsfmYgda
zRo(~4Yiid{TIk&rq$MRuAp-^mn$@=jBG_HKVO8Z5BaY?!s9m-vazh%{dziEgo^Ua{
zwXx@AR?Z(XccT%~k6U}gO)^=c-DuUJ%FT($P@onKM?-byw`o^_w-fIfh?y}Afl%Bi
z%5~mdzRv@JF-AbF`rTH2m!UpMisUPr5Y2L#cSg&5&`XE56WNp*wS{lGobNIztP3aF
z+M)dvS9RV>>8*o`L1n-@+(Vj1j)hG*WPHGtTj)AiIUVUj77-$lOCbpXQMh!gJYC?@
z4?zNIKNn`K!%^d;qafv_8)(k)Ocop5kyB<aVe_Tx{0fjPSk7`e_crNe`pOT*nn;?H
zDqYO#Y6jBn#4CNcaMM7#Oq!kr(u~tXHJA_50%+wYkd_4fTnf-zy-rj^a@LIQ?Lm)I
zXc5!^W)U@u6(UYMw&gjtZK=6u2M*nVz(tf@b}lVJIz17*j9Q8hD&}{i(@lL~d>iO)
z#rKjnStMX!C`N77R)>QY1gxm3v_V&rYuchj9JThsJuZ6_{fNM|BQWG(A~B0GpVCU*
zoItcicvmL8Gb137QMvY@)+RimcMhH7e0B*hl(EH#llLA>EdZCh!WfPbN2k<r3pD3!
zP=>u;*uqU=bgKr;Wveneh~4yqoJPtD4FDHs!K)TSg}2`5etavu^@)~VDP5dkT?1dj
z0`34jZ8%_EHYsQ^33EJ32V)@3Q&_5YXz)!?jIe#7A9Yoiy?Qd`lcGq6lt{xiQz$3x
zKBJRlRfyt`F7wr{IHm8*Xg!T{nf=s_*9w)N=1t;Br>-=)4p7S&kt3N9MSN_sXL$!V
zmhcWYX={a+&R^~RFa>Xc_6Svy^xR)br=ne*9jH-)I`3`TLjWxx?yywG>egc<iM#D2
zrERwH*LSmbC6-oLA0%^gnM`=v$D80MXYqyVZ9%A$XmdBEH<fP_Eg5jk{SVydqO&}-
z2_-@f=yNC&pDNiyMfpWH!s~q)MM?@VimY31Ax2ZBj9klYQh|!^wBqYLYxWdsonJMn
z+T>|P88b!o$2a^CZC>=7VI~6gjCh&%mCS~v?Y|`UT%kPg{erZTa3CEpS(r%Cz3|T7
z>G0vkc34A#b^zT>0lG_%jew?}osCkhNWd)m?ha6TFaU#|bU2I=Ip=nTn_^^;$`Ns&
z8Dr(!OwrIl3}SCEwiL}X;<S&7f_2z~SjEJlBrUdGZ2%IQgkvKs=Yug!PNgIRb>a$u
zl(wW|1LhQvw{RCgi{PPbV>*>h9fvjx=oCA})5&s8kW7+{E2rEY$jQ!SR+O)ao)Hj4
zf)luqGFQt*@h(i&q-+9f#vNd<IvC1s5)slWlXMz|bW|<@A5Td=4ooCjQzR`;<t#}K
zD&sI=;XNUw!VpXvqU+>pF}oqKsZ8((sNo~=5;#s7+5MnqQkj*m>eI3@1p(1-wrES3
zJ=~@aP0HycW$Vl+gr0WfF#1Qe6E`s0$$LV2*0R`e*V@QqTeY9^%NzT`)>(~IFZmEf
zL{N;n)_Y_0i4|{`pWY=k_i5iP=tE#uXZ+ttJ4*-N#{f@2u)nx-iWLzC>`N(#E3V95
zs_t^5DUGE3&RcY<_Z`q$>x26m+Ec5(=wvS$<{M2X$<fTo*Rxud)ZS<+4J*2lNm?Xx
z%voF;ZBkp&o#@RvGCKdnfW#D$PaBENpfQvX3|%1srhs)ft>&BQTdd;1x1%l>zxq?v
zu|_Y6B1zqK0ipv03WTy{R6zq%nKdcV8RBKdE=l7OZaJyC5XRtIXW<vlt1bka`}IIT
zeYGe}7qXuuO_zbRqN<XKNo?+5CAm4Bv_RS>3>og;G*t)620+?w%VrI54N+G2v2hqV
zdN5{~8H_g=jd!(n6C&wz_&vA9M+1nur^UJ)48!_ODMncp1d)r9QbJZwth@&yTU;@_
zKDFY~)v-j0v312_NN#B}A{Dcee6rqH5-W*`cqM%+N-ET3YC=iHPSSILJfLiL#3$v^
zEHziY0z42KjEMFUl@2p;R^|~%YobI(!am4oc}dqR7orW>zGG{l(E>>kAr>D}xL62@
zf|zT>k@|3JE&(p8gnpQQD$VNH(N4;3d3LHZzb@P*JxNq#ufBjX=q5WB$kN6*New9v
zp*?}@N4qCuUMpvf!3&(KDM~_ePZC>;Rc6|s{!bl^I+I;P{G>Bgugg`_)-Jme#{|$+
zR^N~5;-ua1SDW<HZ>u`#Hfue{&B&SdPK+YcxZ06vow&7dKBfjR0xAWi6S4y<w7gJm
zj5=sy+LUnvcLUN{f>11P?2sNh>X=nVwxUKII9HF@cXO$`k(CAxyOg<K<IsINZ_$gS
zQ~@$~nAi>7c6J4R+a8^$TxtuYXB|~W$50SBJb<p`r}`zvRNJXtwHcW#$jB+!p^elo
z>Zlaj>Pr2Yz%yF2Z^3uy^PT9O5tgJahT}91O!>6}1YNb73>+1dV&fxwS<GeiBZ9p!
zf&TJs_=(V4$<llq89PBq{@JRT^Sq>VFZZeDEfzRrXI4)QIo0#ZRNtiRV?nCwr<26n
zN&NKT5}OyK^D2+>)g2C`FOrD^>4zJ~qS~=tZZ_^jP1Z&3_PNauSz-sRsU|R3iW_bA
zn>B7_L!k=kL=XtG%>rgS3<g4hBm^RGhkyiF*J4k|#)L=mf_40F@2Us^B%srUP}zYB
z_65UTF(kAh9V;4`j7bsV!7pyy2BDn<k|l&iOo!^#m{0fIQy`?s1`psJWwHi~){#&g
zEk;EiK@{b9Pe;&{P{8BZ$^a#0cLAY50>2^G#agE!z+^z7;RGrRD&M6^0PYTlnlZHI
zlqEV92|uY(FV<&PzAwod5TxxO6K%<5T`DZVu-pX|t0|sTBNU2X+ImuZWP#*Pnh7I`
zf#`UY7GWiFg>_0yN_Mz>gGD6(w@%lgS%zwF$$63_1w2xB?CE=QZUj^NVTbClk&?;*
z0{E+w6Tl#`0cay|RvTvJF_g{TsH|sq))e3*0y-x>{h$;j0cz@x9AV-jx2)<&xFMiz
z-4Dma(UKIBwwKCii(v?)OISWP_1hRVrDY@9P+e7*o;n}^57mbOvuN5T<w&ltNe8WO
zB&@mxE}w!<lKM)bRbuK&^-LtRUeJXe)h==y6PruKI5mL})}pr>BQ<?asdz-=km``z
zS&Rov-<>v)Xj*D9Rh@5=fVGg5QmYPH`2i)cQBi}h(WfElgBcp%R(Oy~u}V^PXhP;#
z0hqNTdC)m$XN|8D<RI#g%fv4l!$-IArRZ7mUM#l-$x&fRBspEBC9h2Ilk+5%M_H6S
zNPj)q^+Qi3<4e-(>o|ClbOO?-I=F|;r0C6F)MSV(kY;s2tvPH(Tg*`f-CnK3#07j{
zXVDsAKrA8}2%7a>5HG_nRA~&&qyPW}0U_nDak&~PBW5{b#H`GO0VN4Df;i}TvBQvz
z_v4Pv!N8Ag*V?cVbFyeMF-BZ4E^Xq3<PAh<Palw(gkczq+(qYsv?#5ul}lS;yOc>F
zDR4{5HUb|j9Dkf7C}~;%E!iK7>3=2h>e>s*ttPtyAO;!$NRzw8A5vCUD#RV6e{CK!
zbqPagp(C0NR^<U0wK_sFtjWeRG#%tZnXJo`E`x-nFQy#kM%mGam>S210JN$yX6*xC
zB<X-iK=J{9=|uHoRe;(>OYP9_(>bVLrR{_W7)h3Hm=CU5In)hzQTXa<hwV`YttkN4
zOxD*LLbX@cxd}k{VD@c+2CuKNP6QV-88D}L6Fz5BXVp;Z8huF{DL_*+x%AU~f56Q2
zZvZo0uK=5&LfY;;dn|QSN3>1np6PniTm;mTN@INbw7u#_W7}EII>n+RCAaDfo$x83
zX_a7LqYT+qUwsP)(t1~!)fPEJTgYUzUg$6qU;Legr`m>2M<XU^44}3S38JNr+kD8Z
z?G%SX*wMAnuz;B!R7yedA7sjG1yn)V4y5|<iZ;=z`bjn9OlPpn>X}ikBv9XUo+Zyq
zxXn_36r&aO)J6YU?_=L;Rs`pN#VqaQHGL#6lh;g_sXU4xtu*{|JJcw?PC741k3d>i
z&kwk}_%0xg?7@htS$o)(j0!*_EJC^5M;vPhG)LZRFv|VJ8~_6w+xY@XPcJYO5kc4j
z7e1(HSHtRztkq&-a3LrUL6q#gz$Jn!VHw~kfQDFwkIcm};^Qe4BAgaosX$H^Q)i&O
z6kBIKN0Ri!bWna*Oi5Oz`NiJ=h#HzIfjA;B#pfY$g{N*Af=%ThLu5TvzB(O-_K5(V
zbR;wcx(cK&v9>m_Z~$aD*y#naZot?<vIZNt!45$cF-qVeeP^HH0LcRu05&6&E(}Nh
z*6G=K3aK5gLs&$3(yD0H2c$;Dq}~AswCn(v*pySv1ZtA|Vn)t90db1U8Si5GKq?-+
zGYLh?$~dX3Bt`liwNb=8t+e7+28CiMEda2#N;+fO)!J7QrtmmPgLFA>LQPa|TpQ{m
zn#lqtJ}RNyowFKU?X32fWT^>PwQa{Tq@5`}-^iYI4rzlb(Z8`>o;&>LLt?26IMJRy
z4kOVuQ4i~TqHY4-ZT~(kpSHVzS=+8fD>RP)&p?_cwaEs0LeUMW(y^vA;%Hh~By9nd
zIzwAHlVY}eo%oahpmtE_ue#fhdg-6sCA=_o?^@702gav%4mB)jXGK#z_|;TgRtGX8
zs&7U`Oq<;IoM~5LehSkfXwCZBk^t+tO_Zuj)E|ax3)EAO0X2;#1et2CQtvAhLd>J`
zC<AF<FRc|G%4U6iv_?AOUNc{kzQ>@qiK=5$i|ASY17Fl0aa(qud*LNPN8CR=;4U_5
z1x?p<#t#6Erc%r-5Y*{f#^eYEng-K`Q;0iZY=+I`Z@}q#ToJR85egAmVL}KGX<3pI
zgbDzOIW@jRLI<<OyR3*1Vh|SL4sPNpiX#Cx{FW3CP~j<QFaa4cnnY1(n68F0nY1L3
zCJ{}%kea@gkb#FXlB`Ph34o}`3G<LF`Kt^#2nk6TykfGC$<Jg`58&w4bX2^XPyhfx
z07*naRBj!sFM82H-~p&pZsMYW>7~Pdqj=>juplZqrauj3!G4+q1ZKWg?vj*Dbq#AW
zVo@P6l%4!32aT-JE&xVh)Glfk%4ko4w4`-f1K8zk2qCQXmx2TXD}6WpV|SZCo}mgI
zFaO95?Yq7&2`Au{x(oG{deUCj=A=2dvFMH>tS40xTJdfjG3_g`h6d=gk>^Dlv^I?)
z>cCe=XVcEI^JFf<mL!Vuq?&>T__`!WomF0a6eTH@7v7K~wUH#s(*PP80Vh$U;I1Oj
zKI|OOic}GXjV35VQfJ=Plzbd(Pa&+VMWZlPjc80fkVq6jv{I(Xq(Q$)fz{+GO`58N
zLPFx=NNP+c4g1g#fVDbzt9b#a{gSxiid1GBHL%sSET|R-kW8{}JlQxTRfsmnxwAfW
zVB4gt*2<Es>NbzYL6|%S)K#i~#V<|Uf0?ZExSS7G`eq<qP<aGQ9%?JNTiv0FL(@s4
z?l6!Bk~g;jY3`@)BAfKMb%!l&TreEhJMlpCdA!&7nb62n@2Jt(69okWC|V{2p$`BQ
zV{E}K9~V0mCq$HFCU9{Sf@7kSOJo&=MtXt;d6&Eg8^WO26Nw5T(qt&PiI@{<OL0V!
zl6ce@CSHo+93TsB5J^o+QUbOS0Gb!$W#A(wBz~cMyqa<4<eM6!NXj8k18P8F01ygI
zwNXXM^cgy^#f>>1H14SS0c#{~5LZK5q;VRIdK1_tHc62x6FshV)DhB_s>I4?(Xr<`
zC;qsVQxYD%0hwlPmljP`r-HPBG4XKwqgOY6n^8TlYIv5LX>3pVq&6^MQOBnirqFtd
z{{>X0>*NDV>qKjDi8V>fj?`}7l(2kJ06`x|=#aKIIk~c!l!>C%nUM{b+)ENdNNJr$
z8o^22NxLVYBw&`LK$hw|`G9H&K$)jLF}0`tStr9&pv}-vGmNOQDLfVP%7Rj!cBIoL
zu9^+mL#rg{_jMmE9ii%uw@&Uzz?#a7+E8_vge{~*NXTfI&&W5)8?`~s#X~pGnhT;A
zqb+JDx))fd^|a0isY#zocGX8+0)<XSdukXuG6@>0lYupMdKY*=g%hPuHLkcydb$zs
zy3k2TDb)(`*4R4qs2gZ|KBL;1Mk9S+{V|GQ>pn)W3$l#?b@g=HV?hrhO_zbRQ+ZrO
zFMW%dxomX@6Nl1Cn<NcL?+ttGb8FUi20b=zquv0ZdniI6W-fxSHMoG4%Q88T4S?qJ
z*kzZ{Iag{1wU^#mdUdU_cB!Qe8A0s?w8Py`wN<`j{@c3Rj=75Zk{d}F;yvmG{X5&e
zoeyuE-F`PXB^4z@dPvonmS-Y)m^5ybA|`+?Nd!a`;R=u?QyGFGJ>8F*FW+DLO0&N7
zQZr~hkI2ZC6O0w($O!@>xv^4t#kG7u2`+=O&4lcR?%nGQJD)rlZhYs#>(K-HBMCpk
zh(68C_AxD%V1a^WV+C;x%e4tbD^&#60z1G$vMVJ<P()!ZTsnR;IJW-qwZGAM*s#%K
zqJeiMng0B0u<}QLfBoiv4x0u&Ml}GK!7IInja&rQ%2y}{lWPEizCaQ@7!>hM>1b(%
zT5}^@dhTxP)#cjqYt5i>jtFc}OxlWl%iMxHxvi#`u$nI)!rHqSnl?_|lTT&g_{y8X
zqyOcD*B|_*`X6;n8fj?nymb&L=uJ>iTTo$>o~aDsxUN#5#_A7lLs_~Pww`~u`Wkm?
zzsAJwb2Quvq;2zL)PL1s-s7lyQtv!@KB_(VjSpUZ@c(N3Bte8PBFcvqG}_fIZ~8Z(
zA&U)LH6&YM2XtOeWRS4YL`c&9Oc`zLN^IkQb>iklZunWpYm)jSl`pf%qZMq4)8)*k
z#L~vCZGTEU6Q{X>`YMEe#U-b-JyRymSJg{<$pq@HWY*V5Dvt*zkbOas221dEVdaPD
zq_t2<lC%S9#JxtZK42{!pgf3ya&5HboeM6Zhz1PaIQ4#X@`c6=|MY72#E%U(ThB8&
z<LKD(6gTO&AEPfVwW5A!AAsM-J9l<k4}a@}mD_)R_qhRcb6^ZWC)I<V%7Y0q8=5g8
zqn%_ndOUGGI&m?4{wJ4rPyQ4A&BkeyFccW$Bq0IUevLl5eyhRD!K>T-ox$4nAKZ;^
z{o1Er>U|Ft4ys>{Wn$n>0S9%~HzG|BnASv9L3d}Fa%KXmaKKS|Xf|82%Z!fjrOt(a
z%YpQ~WgFZ)@nf$CJO9szuW$Sg(jbC6;|WQll7TUjz;L50Nf;ZnQirAm2enflgl8{=
z=l|K}&f1UkH=DWkQe5{v57K5z=P=AlwDOhL04ad$A5tSN6E}UY@}k$4RICOt9Xw*E
zv}ZPQIrV;c=7su&KefDj?1y`s%`-lYD6Xrso{nbZ{v?>SXywgUhr?g~=+y`R2w~gm
z2RkrkGZ~vvWTBJ}LW}NMFa?<CnS~O~t33tIZlI)_W?HF4;m%IUB4D}5kE@CKo8P7A
zhcP=yeb8lkR}*Y4t%%A#m$_o0+hcJiNz<3dLQYsOT~K+b=c;Eak27J7%`983y{Ng<
zW%3AVnu)_*bkf~;P-i1YLm<tJQ=>oNG;+3P0DFzvV4zK4O_;p-!aFM$Uu<3Y*Mp5?
zKd2)tq$@j2quK4j!`5?+;QT-T)yDaMZg1z-|Ni#5JHHXISy3RJF%LweVJBi#c=F@m
z*lWY}pNsCE_#vqnDvZDmSOqpxZr4_V?c+asCOrP5=ZCx3Z$_W|&AV^(Z?N`72PA35
z*8mM_BJD||XokvBUQ^2eB9f-n5h4$!djxTO^ELn>HiU)7I4?;>YEyCP@Ey&wV}_hD
z6~|5G%X$*iSGn&*IGbcuo&sm|F}1TFgy&v}Ui$O#ont>BpgR2aN{YG2zoL^9{Zro<
z2KWAvkpcrNm%eC#R!-CxsFslVqBHLW=U%F<|7*kh$9_<C&er3*NKe62bw1TQ`)57~
z9{w)4nX03xp9XAv=Tf9ny=Wjar2*tQ?x6*La#cs4lgN^k4)piZjM&8q#r>}QQ2BE}
zEv5B%RY#?{njn7S&>p$Vwm)e)T`%n=<to3vjw31$87cR5s1kEs;V%1fy9ge8tnSe5
z#Vo^QeI2W$J&*?VIEgoA+W;HbHp8VKy8H6a*SAjn<Y1$qsv_;`2i#jx(m#%3e7C&a
zowF=gl#sQ?t@HoP5AU7+qt~N%e)-OqhIf6Uq0PffAD;aBsg0NZEIZhk{2ZBhl{5BU
zE-dmKc^}BuXODUF14#=IGll5gU0y#Qed({AithaSd+WD<4H*X^6rg5cNSR`m>e+}u
zdUliaOa)<5UL7&8k-&0NBvZ=T*fx1D`wR1!vug_kX!Mh8AY_~*jV?PVGjgQGd6UY+
zR715(AD{V?%MUL6OT`gUyv#`|ulT2_l;w=u>`yo$;$ob|Xm%S8$<b?T@X%rmLG=Y)
z*0&`922i7Ak{T$w^x>JGSlgIT=k*G8UQE&Vor+&)!6!|CZbuD3cTNo<Dvc}0nAC#!
zxsEybp406To~1bVm*;6azV1zQ<{TDnBai9%XI)ZUuBUb>O@Gd_mO2O28COhAzdhz#
zRhlka<zb1<kfyaYd<&HaI{|Go%kU9P@RnFF!D`?h`spDfbk;&O*yhwgA>3rXriHSr
zb>`jZxmUxl{9^B6^En^<_6N=?=?w1nya!+TJPRFt=XtAUZ=-SQmFCy}a^wB?{)?NJ
zIycObKR@vC3qM=CbM7)L7o1ZN6Mx}ml)NQfZ=l+LGs!1P5Ac_?Q~UhfpZUST@>l-w
zg-?HJu-xymEQG$0Wn-FtMVys7LK2FW-DxQtFvGWCKc#0J2zyR5ts2$?R82ry=Rh#0
znKX!W_l!CKZyo#|L~nic!oL!He(I0Wi)6;tBXgK#DYQi{xc41%?hAa;NMn?ZhE$9K
zHAM-2sc8Hdpa9QE)oR}#`0&L)7v4IZuk&Hh$O7wFOe$YzDoDLF)kuXkVV|s@p732<
zTV>vI$X;AdC61adSNATHP6#D0QcxBX&{>*p43~t`Ux_kq^~XB)NqTC$QnUC8MJLR-
z9Hu_6IN!FjB+p6GbUxJhn?Hdl-%OguuEx2b<4Pq>bACsS1)0pCgk84I^`!RbGy!Q&
zfMD_v_SRh>4NgqcB7r9AkJj0D>gQkWfAzl-NGoj_0rdVrS_I%o#gfYZDR>uN6VOe^
zDw3FAc=Y9ek5lC?D3L#M{iT07`uyx=lP`D|KralWMTh=R8BQ<)Iv?zMch=tg+9$94
z)yAXRDypI-23t)I^WYAZ7<CezVZ?p2v^n#M=>OROibU<N9B^$=<>`t9!!pe08^*&X
z%j>ucDfuB%az<Rtu^+?MS3kJ;3j%2ur&w<1exRq{X1@JEiB678J?V%<yF)hWtF9bO
zXmzK(gW=LY_TkHaQ6TM7SSXFSME$2<=l$CK^d{H^&XT3=r%6Ry)iNP)>MVN7Ozy?G
z792r1;j<?&CjmXNV#P(}sS880*B3HdB}*!ARtj4d=t`Mm>Q))3uTDTJNz-NNUoJS7
zNz;DCG=xwT^;W@pvPJyX$xf(a2X(-|?L1^D9*ggyT~r?0x-i&do=f^s00UvH!K`kR
z;ZtkvliKlD2XFnCz3qDT4Hgd2Dy{o@R;vW>MH9byE9jp}q}M(>$u91G>EHQ*>o5Kb
z!&|3*#D(2AKu=;Om+%}<AFOq))|<Cq{`UnOtTp6_1i*S2HT86M6dwlC$VEJ-^=4HH
zK~B<j16WdD(Gj%tLkHdxSigDw{Lc<=AO9hjl3!NmcBs#?c3x11&<*M%fSMnTfVjtS
zkv-LKUBB?Bhqq6R>byuPx~x8OTZAb~+e=rS6P=NiJT`%j0(lbac(D>|E@19uEa<p{
zr$b23Sj)m}Aq-|O`>_CM5<Xqj;>r)_zMp4hpiUBRSIR?5^T`2|;#-A$q)sEO^VGWO
z0BQPOs+-pFgHD>>-er{s^MputT6a*BM9mp54N28va7iX#?Y+_NZnMNLHS>eCia((W
z1+T)Z%d+$tp#h0klB3~!J5ejTb>>gFfMXzCM(C5=Tp|m4`T*F!yK?EP*Dw58Nw@6k
zOeAXBSb%DJX`TXU`z<Jc($?w*TSjS5)(yY-(aM+Vx6b~A%VNj~z_oqx>B1bzbJ90)
z?iCB6PL4sB{Y({r{o)5}UuxVw_a|KvV>IGCW<6b5iqBc`7VWS6Jp)qf)1mj6#B5&R
zg4H5Ax7>>yM-EI-N^O=pfYN=uJ!#s`a(C(QJjFlVld9=$4S8>NImT>?aaw>WK{Bt)
znQeYc2Gp8JoEH6x^K3gy@+?z(T+RncZawhaOy%Ldn?l}um)avjnJ=aOhL+>$G`v)r
z9@G)8bhr{gEsz!?qr7AtEm8=8@z(X{e}+l1*Ijb+fwY=nN;7y~GeWxT$Dgn4jHxyZ
z7#}wir8Rf;5)e8QeSYdsy!65HTat36mVmQRbJ#(99G3)0>z(i5!XNCZL2CZjx?gXe
z+gSg30L+YEwz9lj9o(}l%#pbjzpMW~u@F(vykBcPx3&HkT%Aj4#7}FQePTY3*Fzv`
zU=0chtOZ8yr_O3t>1GBfOTeR2cZ{)uNf0ax?%ae)T2HO_b^Y;-(*}4>m8@mhIVoZW
z)cVfznliOV6=~Y?DUqf}YLBy_t_7FcBd440avB~-e+r~`*&1#j&8|ZMGzzYI^Yi-3
zv5gD=s;ftJkXHLo`A!AzDIs0f<xh{9#CYyk9{BKGUA5e^n4<$kfyKG4^`DP+>NYHA
zqR=`;rq4~1X74=Yul*)|BkHZ<&&ycLsqBZFgX=do&;O|&D>D_$mC1`T)9UKyo--pn
zjsPs|V5&6z1;Lj#pa0XY&IZztqfCdKC$%;Ghq96WL*QHmp#5U$o0`ci&SCs1$yzHu
z<f9EQqbop?u=&e-)A%_(wct82hE?um%2O)eDc+U6Xsg-gYK{R%;mdl2%Oh{I<#p5J
z%kg|^dYu@F+Jg`0mgJ%K&^>s%nMH^EclgVVBc}RboXFZs0Gl0$G<@SrI~V@NUdK+f
zoMX~(N;}HS^Dewv{VM%&09`5Y;Rl+h9u640JJHgmyQhC#yVuziud{$S?9DEcX2(kc
zuDOzX?Ur+&@<J3lb&s_V5J2)<zRi_`cTWG4Su`K~{g0Ccm~C<O_n)(49d3xUx>oJg
z&w}N~-7|meaC3b8sq-nBf&i`2tJ$iov=Qb7>#8*ooyvHckL==(#OKNVTM4MISozyC
zYjF^1+9j^L%4|6V4pMvQ0@@mP89w6p(t!^DXJ;A<r?r%qcIWghQ++V(X63>1_Q{`g
z>CApQHk}Ys-kvGEdOlOEPccA`YBj3)%7e2%l}WrlvdAuQU4-GQ+L%e8&F_`Hb3d+)
zA4+=om0S57<hlUhR-%?v$y0tuVIUQ)3$ouUo%8>ctMeCCnpT@~_=gT<VHKjbnIc^S
z*w)sSP-*m4G78NsBR>buBbUTx!?U8}Lf;oTm6*sa)r;321uav1jC>PYQJR*kukrAu
zX@4l;R(t6Bb~lO0tiMUrI`E&fYwVOXj&{=#z6RE>y?^3sZk5Mul}E`JO^Q6?*!0~o
zu=B3;e5wJO8vEeKs{=?4#b5ex^=oV$H_6wYgchI*Tr0KBoPm}$&-_^BDE6_u@-LuB
zmLvu6pOwqA&wwl2-Uwo!X)H3DUw7H}Yl?B%YRcIrteV#fd96^?f@cV6VV%A!s5<`&
zI&T*|xsWS)t1_WDikHVX-`&}#3$rfN_;b#_Ym`70wZ|xQVw<$m!w;vM74&|FpH_Q}
z)E>zsB3mzXZBN9VN_576G+@mKuAge0{0Tpu$@U_-cp(d3g;y`&6l)?AObM`9ui<BG
z?)vC>_8Z<D$q*`kwK@<g1Lx`GI~AY(<C*e!l-2Y|bNGrN-S6!6;mPh+vU;cc`i(hK
zNrPGgq;;#<5>+y>WC`e=RpL|)bNVCIxo#_#_EqPq8F}GcJtjT9pk|#EPVQw!?&`<=
zzFbF=BR_M_6cRQ1OD)u6W)Y2=Qt(5Tr8w@E<(*l)FgkcUHQrpJbIOi6%^aRUOIf*d
z#k>kVUdg$Xzo@6UT<(Qy`7q#;7k(Z4jdMEA^qA?Vb%3|FjB{9YxU<Z0VVt!osTzee
zJD8HA9yMZOxWukGwrKCJzQvBu{hRay*V0{t`%j48+gmYlkaYaGZs(xyR%WktR?r!h
z`5+mOm5WN35q5cWa}76_*2}z&zvfJ<EFItNOmLR<!%5HAX!@E(Kh$h{_?`4Dk=a4_
z72=@P=Hx58j9!_a4bT4LuFl#yx?fY3UiO>*q<GWX!k1yV*7m**mel%b=Jk-Rlk;D*
z`3XM*MVywfAGU&By@OPE&g}8NI>PcmM?c=-N~Uw1nCHUiIhsoJT?=+p1_wQysgR<*
zCj2#HX&z_r<>Kx~?NPQQFPCWg;`Gx2=fX-q%`rW81Yw`m9#VLi(u01N53AE|lkLmf
zVPmk>(EiVCopM>)6Tdb@5Pq^0ECQsJuQADurSc-o>8iA*F`d>lan`5K`?TM*PpPvd
zVkB@gCP7y(%t-xFYaahR;22HGJ)>Xsl%|B_J23UHO)vIq#mlcu2|d$G0DagXJ+lxq
z0yIwVef9@uKl$%nTQ0{dS)GMV^ZsVh%Z%b2iFfn#-ly-M{p_!EHJKg!CCQp)A84$R
zsI`s0%;X@mEWrG3#SJeLQ}9-PXe+tGt$TrefzxwdsC8zSeZ^(hc9!zz<#Ok|tFNH;
ze59XV=Uo$t?)qQtMilZsWVJ^pUJiSWPS``L29I=LGUF!hUe*>=E^)c|*~+@ks33SS
ze0f`s5@X)u?l}7ZEugEP+PSga*!aCigGcXf*7oi`S`Wrfyb)v7AB2sQcf(VwwbgU0
zwPSBAch|nsd$4>#>x`l;?lgYqVA8b@&>W{5$EP;G^Dw;kJD;D}{%-Hguyg>SGdSuy
zQFQXw@YHIs`rKM{{L8JqwYT~kt#cGBs69enV9$*M-th*R?Q(K=`K7I3_ubhc=L=E%
zLiJwjd}$>sB<lloqZRk|PTl{l`|-VRJvbBJ?w;hp=k)Lwy96Lj4;s>W+cpeOoHVy5
zqa&#joBIoyWYFQfG%2Pbyq20NdF|S9;iV&`Gt~i18uN?HIDkqM;;Bh>sI~6W^DaH-
zRrTo(c~bba&cAuTfA3p&&-QQkPuTqnV@YXNo<b(&=2@(#i{RJSxv88s5lDS)kD)Zp
zs4w6Rj+NGqG!FElJ#pnK7cK7K2OL{_5?42MaK25XZ-6?J)&s6>a#3@OB}T1TBoZ%}
zycDEp)b1k>LEb3TQXqk9)Z!bA<TW=Yql1~w7o_UMr~2P=T|)KvE~EkVsMyYV`m;<w
zJvl~sQ7836YMh5$B-Eh0+hP&=u1*r?SW+$lu(OCenjqFGYMOb_!S(RNN^^OAa{g0%
z3Lm|>*5CT1`TpPd{EhC-DX|hY8UcDR{GHRoJ9pwu4y)aM8;}3#`R~?VcyaGb|2D^m
z+QIG9(kc4+#c@mrg9O2I8{c|w`IBGWeLmPN#^Kv#Yf)(vg%0~GaeVjH;NIO}>mIH6
z9a!SmpZ}=#;)^@4|ANzh7SoyMeK}lV;IsR#B;R@B%?e9h^63p~m4zNZ?Hov--TvU6
z)8G5syTy*pL8L(w$G8G0x>FJ!rWjx~z~UHMx;9<lni&W37A6^07%+Q4t>9XV1o&8;
z^i1sFxNcyv1rLT0?w&wP9`fE_ozp|Llt}ID)(77?_3?kZdzu@+N{nvzfmXQSjVCpx
zK$_IU$_Jp#B~cu<+InZ_uYjtEfv|v>pMW+6W{&Ryta)d7xLr}FP9bSWfwGj-Y;u8*
zl`pCYUEagABE`s4fy*v=D${BH3N_0=Nonk_@MfNIunCyU%hq1DFk+26Jr2ptl&GuZ
zThvb%S9_GHJthIQHoBZa$9hBi?rCtXpYC#0O^=&lIr;}$$CZz)dj&Z)o{Jd*c0x4H
zO)qE3mrI?TG~HMo?Eb;Y@BG!>7l*ksMImV2a>9AckWk9GVnPT`r!(uSEZPuKOd0w1
z8-vewzxSR0`1S7B+MMZ8lT<uQXI(6v18G%t_xaC$?SohD{gz)pm4n9N+#=1Go3vsg
zf!YR~Ne;OYOqj%$Akv*z2cK@;e(x8*H2m^kQ70lW+pkp3O##Oj4brZD+)U!E5_G(m
zk#kjB{oM9<fA7-A|Bb>soOQAj00Fl0U3C|B(vHbR1>74WK%r%6PJMv{y2U6iu7-8;
za|U$M4F(2c0xR+|e}qJ<0P%F^9f&3&18l;^iW$v@BUD4ooSm+bkfn!Q;?mvEQ+58`
z*FO4NWpPEv<j;?*I<Y(Y0VJ8uqfkVmEpl~p>6F$PPmLN>X9{h%$yv*#m)jC2p-)<t
z0G4izW>+@|{c?t`+CzhwWaSWXbu+WBnRMBH|2*4NRlf;F^f#B0etJHMI!%6t+C!nV
z;v-7CG!zHHJzbB({5N-P*+e3Q#J7afw4g^lv7{A<AK)<kbehxbM-dr`aeMiDe=i5p
zNLY0FToPl9%sKYj)RYo2y}uX_ir1*B&S`SYbVclrOw6N~gU!9coqtfjb?&F86{e&Z
zx!{e{J2!s+<-7loT(h7sH}}!9LXpi?x<%Y>K}pLc^p3dq241i`=zs*~UITU$s-2L5
zk;w1veD7CIY`^+%<}#Y|g^2=YEUTHU;MIa3IFys70iWTA$3Om+VuJRK04ksYY17(I
zHzJ#a33hNCAY^4yX1WQ31Pr)&`Uom;a%l^!Bq=JK+_4(iYx+|FOdAOLC0rOtYk){r
z3aT`e5>eP;yHDdfcGdZVm5={!KAE)CbPZXZ>EsbDAX|wV_E&|pe#q6;rI8LE2<FvS
zc0A+<_-Az%E$YfPCp_q>b8FFoXuY(ZVJ=cto2au=$R3MpF=`ITn(`pnOa0{XFMTGh
zR_Y~s%RWqLh;m0Qv(fNFxbq~Msl;)W2D}oqXO{c&#1Q3bkFwy}M_)U3OagWAK6;{E
zR(yzjJA-A~z7zB~QDT5p%@-6`fkFDz_OUgNoHAV0rz<y^G`%+1{@&}Gs0b1xsDq=r
zP-l-WzQ>1`<fWma5s)#TNSt$;#iNjFOnJ1dxJ8l8d{(>lo3DiDeoCx3xZeqCr$<Gc
zT%t5``q*gP`@ek`D7i~Hxc4=rOg0gtOU&)Y7=<%1KrIAQNe^m=`KzIH7(eBb6c>K-
z+U|R2w+6chk*bk;v;6`|eG@S7>*d@1I_%e8mfkdmj85*|-aI$lg=;M;ZDzp*NT3AQ
zj3v@E?o4)IHz^Q5ggZ%px`b7A6F@nzQrU5{bPS}@G}%CJgdqO}Y=GU=PqZq5f@HWM
zn0p>c9XuU!<2wb@jR9l`E%CwZb`zyBGV|5Cc5?65BU6u!x)j-@Cx%Y6Yg)t9K47d#
zJkuYuxYO1$gVZq7IK}}GWA#<}6c#{D+7!M}eQ7Ak%DT)s0c+fayj;0t;UqevYY7<`
z+imK!18V|^VLYwQi+LEy`z7TVwaI)owS7XPQ{qWU*&q4e?@10CwMDkTVHD($Y;Drj
zZ`@1;>MVFWvyEAbY7Ye{!m}?-`<q<yiH#-_o%;?u64^5z+P!A9b{`R?+tn3_Tr~ov
zi9G0lY1I6o^)7ztQ=gz<`m0-`i7|*pAkF=%{OmI99*nJ(m|E475FGJqT#d{9ecEsX
zX+d9DMDheNMBaEg*lIkC_q6r8ar>1ZKK;4nT9SRPG`*dk-MI)u1vigxeA{_K&fNKG
zoky2$p~q#pJ@hTCVWhk%lZhxLwE@$$KIf968KRJ|ij;&L7m7$|*~cr}A94Mb|5;o%
zm7h5kMdett18T%HJ5&<F4`?68i^z?ccfD7jF-cdrhy<-R6KF9G=RF;n*ihXrsRyVv
zUc*T2HP}nhS`;UqcHkqx(mQ&LL=Q^^1bW0t!AV~-pl406UqCO(4aGFQKB6_!H2%q?
z8<+FqH8Oq$GuKi_^W~nSyWszrQAdPup*zcwq7j4zhzPcJIRnKYj_}gT>ra3xA=O_`
z6%6t*I~>OeJJ_kX{E?y5SV&JiMT_e6NEca4_u{GLEuPY8aMX6U-i>rnkIup55@Tx{
zT8TS3O>xiGh$J6{pJ<fg<fh0)6JL}xOD>FFxQBeA(J6YfZhM&+c>x|%f%-~G2D8*2
zrTXa!kl<E(xNOvO>DnzV&9hINPK9XwbO$<sE<|xcO;jP+`2d7dk36CTmzX^#e@WkG
zJJ@>9MH3(zUkMcBVHfrS5Rpb8Ld4RTjW$p?R0tq)U@!{>xUG>t&?cU^L#~u2S@gTq
zeHiR4CD*%<fuE<#ulQ_!?<I5M;MREOv@Qb@&Z?@YJ184$fK<(h5qlG$Mh@c$6bKu_
zwVP4F80Z{tiel_2iAtTBmCHJjUcK`vg`DtJiX|F<uTqckScmH}UZx@6jb6+K=t<tR
z37=8jDPLA3Bao4u4~PEDz(wv2zBLWYjbKT;O5EZbm}HHAKpZ{z+Umj?y6`R#Gf7;k
z0Nfm?DIBjM2dDEn5^w^XDFTs6)_PJY2<TY(TvPc`X-zW_f%=S`(Mpy?`bBuPp&(_Z
zej;H=R^ojEuGj^r{Ib!2OGxo$cVOP2LJCU<XHUU01Sb&z(lZ$fVTa4%>)6E@DIY71
z0U~^ZQ*w2oUbD|__5gHUwU>s3vOwr6g5{_1hiRDP87G^=%<uqdABZpxkndR3i=K;c
z`cr-^p$`0+J%KbI9|}(<cGSyjOvj^|nGmu&=&(A%fV2<0qL+q>VrWScHJ~U!gubN5
zWPqySD&ho`$ob4Qt+4_IVRtxBbjd0##+dLf5o&`?k~N^7koClJL(Lg^!`BEObReko
z>Hu~PX}=-$9v9GBxio0Ta6mLAO3KB-RVpQ7qbWogjUv2JF3MW#1^q`OMa;w^<UHmr
ze=hQ4d~uS$57@3adGR%I)#yYvfF}csC}i_%YOK%1u5boc0G7~EU`8)sAT6MGsu5wM
zNE86l>W2W3lPEvX{w;usPCgm(8wHgW$YosdDfLzsG)XTjJEg>nS1Vjn2N%|<F&r2>
z_aaE^X5pmXN&VG<A;<{w5|F0uK(qn0R3I(QE=l^vNDaiKN!Zccd!MP38ter^L!-cY
zo&HS|xfGB*T>gjkG~HdMz+?V~53#g>_CKuh>dPI-T%H)ar~sK5u+*d0i^E-8Lk$Tq
z!6>QP1r+gXIHR8%(mKB?&n%%daA(+MWwC%dM3rFryS^k=fwTY-HHb~%HKST@xmN2U
zNq4!RvCG7hg-O&9#3ep>ZBL~Ku4iDY_jwGoYlCe`(~{@`hQ9LA&y}f3{x!<f;<r+(
zcboi}=<795jmWQ_{!B$e8UlQkVKD6PR4t3zs@Pt|xDtZgujn_=yNFR>=6>_UEeY$f
zA!#BZCrBz$RuXMOKW3L2O>R7)C)R!7XOmmNmc}Q-5f?^dr}U>d3M*+xw5T#T$;Sb{
zo&p~Mzd%iZrgy$$vbI?Lr%AK;A5fB{JX{P+A>0qE>SXo8s;7nq&^4t=>ZNv&oen$_
zp@ExLO1ULJ*G|d11S9o40$tT#b@q+wNe5*0rH&Sg+nR^^$xo@XLT1=hGtvP@C_!p!
z0|7LK!>GJ5ke_mO`&gl>N6kXcSVoqGt74Is!G*i*Ea|h#=0OE@bXAC6{<`lKA8B%v
z_0#$M{Cmq*@VckzGK};I4*5ijJ;raSKqi>1Z4&>&>sTaYVuVkCOn?>xjDWNHeSsm8
zYXdqKX-e|ox@{?obpfjpm&lRMBcfl?DlG}I2-O4&2c5BesyeWA*McTOv2_6G0+FmE
zIuXhvfJS&{%*Z`eNh@gN8F672_cGc#0*We?5xA!ggdIW>2Q@CJXr?upfVpBak0lsg
z?AS^m>j?NxfU1OCErdfr#4Z}b6E%jwOsWwE;z-K0)CfFPV>wIOPNYhkLWTwaITB^O
z$D{xk0CT$n;Fb!70;l9dCe2`AMR=B`@gW%gn7Cotp_w?CBpD6H>#SVW`3RoLP!uaQ
zG&QH|qTnoN0?a9d3QT?V-+FW63C>-8<yJ#6AwabsDJhofOu2>stV5>_@dfQ|A%OBW
z1LO8!T&Yadc<=|iwPdAjlp#-rOS%sg!G0EX>K}!ig9_D|3OAl4^Np{5)#^U0Omuo_
zE6oa7(chP&i|ePSCUFs8U(aEIwP<F~_72HQ(u<J_b{kSc4{Cf1dVoJ-V5miGYSJru
zi$3Gh0auwADAoZ)0kw3IbqG|tEtdEiJTF17d#Kl#d4wOiZMV<;GYsA+D>Q!KqN!x!
z^FaeiUr-{D)^AB=;s>##+e?62<>J1qXoqYi3DRJLf%NEz&=emwq4^kYE74hITFDO&
zr0q-0Dq1D~u-iK6$|>A+k!T3*Yf*2dWjb`X_)uA?3}`b1N<J+_=D-8LEH3E*tO@X{
z!&4fNpFtD&hZhjlXUM}Wnuh%b%J`~QmZC<5yz4{M=^sQQ$_LpNpjTR>yj*$bd8*E3
z;i;a~Ug8u3UJ2I9N(8E^BUVUpXB~>E9`Myu*eyfTSoy$Y6;f?L8^H(EQyrVAPumgu
zw5KFL)Ni_{O~7Kc(<<8rS4?D5mZh5iqx^cVhsb*!%9|vgWFqNMlFudj^<&2}8oGwh
z<(zM|mjiJ|@yI@3#Lu$d_mowZf?3qCvWO5w0Oq)lKV=a`urvfBk!HjBFF-SXLPi1M
z&`}S#c6-nW>rzV(SUxdW<w7vILAHZh1MrkQMjQwhA=hLIl0BFa<4X$GPXL1a#cjUf
zpurPq-+s-AJIW}NekvC;oP(8S4K+#4fL&$M?7qs!B$lN8ndK^Lql49?T5Q3VNw+HD
z%u<%8=}w%}se2dLjj2!$uw@s)vl@;*S3gGNhABhtwbv!R$vu!XXnG%H+~{)s7&z9@
zPyY7KWy%a?aMKlJy0{|dN-}#g!jJhyq#M;c;4$|YGbf<)JT?B(%x|JPk<g*?IJ3{{
zT6Dk8&wp6Is5<&TUSSy~Dk-n(jIPCQ=26{MFUsCjz2xqGx+q%p(+`$N>dTXFRPQMc
z^+Y?#g-e{XqdNCcGBabuNI{|jb>^x(%_zbV>WYwDj7elCO{=?@Ociiau6xSuuuQSt
z4=bNVr#nOS(az;JYsE({@QfFK#fR2VOQ6>Fakt@RM)ZYyn=~XqL$HutlXQ)Gm;kgu
z5dd5=*+I($;Xoi8=`7?<D%Qqo*cT4^y#%b0TH)Q<fH<oXaF+&=Cglle>y$@;-KbL@
zsXS`6K^*}e9gOigR~OR5gu@ODz^Q|AgHgetZ{t<cLG7wxy%wiTF*)>@67JBvgfIs%
z&FqxDVQ_x?^}n$D`Fp?g@cCfdfwiP-b@aT`-=VFIg&{Nz-<}>CnKzYiQ|XrWH&uX?
zxAes7N(3)NW%z`fBuuFe)UHU-_I>omfX3P!Z&R14O6oaHc9lrWhvGv>w$GZ}Nwf1-
ze{{0oFu1V&+F#uL^xgk-^Tn`uK21_*bnmJwqc2I()E>ct@=I2hKr7Kh`9m)zQLFwM
zf~jnB&=NXbQfmC7D&Q)W9|6E!O9p}4YNDt#hy)7s_@wL9meO%k@l@hY+CbmL5IY<1
zWzC}E9FEbNs&s?h;bgG5R7ca<g*30yxL4%XE_fWut6(}YQsQf=gp6ilyZk0;(krVy
zW`A>$NdjUbT7(`A?`-(W5+hU%n#Ydo^#l;b&e}&Nf6c$3%@zjQz}5)ZR_aX$#H5DP
z{~9O=ro|Zi#QZ9o7IU@eIO?dLRkj8$mJ+>(mJjNXK~y)kjuoafpr;8W?r^T8@ZkwD
z*?@3Dd045Q`M9vNzhy8uc{`{*d@hhw{c`uszjD5F_aA(^cJH^g&J6bqYDv`8A?U9_
z8fH2GT-pb>1gimQt&3OQ>U#AAnd~WG#)A6GQ~*L*t^c*}11d>=)c3KG6|PAKNm|eo
zWRrk0Y7=BlmgZ^ECs~M&)jwHf8L271d5x=ckF%^_?Y{LNc6xXI{*9HpzqS2bay|?_
zifg$#J(5(OP$@kWWz$kUt1lp#)mwcThO#B~79>+|bxK_|qPPW`<QyIwvC%-p)_@`E
z??I|8287h8HIB)iEAdg1CixScy7QD&Eh$%RKo-eU-1vQI+7oL%L!zD-Z-$4jsh$yZ
zpWX)26F=ufkJ8-K^_%!$gES}y5*8t|Dck^$)f4fO=1f?{%xv|r$twLFc1a>w4>^(q
z)P}wwUZij%Vwg@;Y6M=IVMRxi{$Peg%7f9x@N^hj?nDL@6d4+<f#kLJSJaPwG(`W&
z+7G}({&XaaIg_%10AjmCVFRtysBEUR4DFbGJoc^alBPS%EJ@yvn}y8hT)RM^hlv{#
ztM%H=b3e^4(VuR7HrNYV{f#*4ZvvB&X_fxIj4K9B3<(UjyHWR(-Qm`Iw_X{1Dh&sS
zX8<NZvkun>Ys#%jIDs`*O+9DCQd;K<C5*=E{M^s12haUX{qw;t6BmyL)S0r<f$YD|
zDu(fj`l)cRMV)VK54PUB{aSp3?~h0o^%<V9=tDIkC&;zMz?0?DCM-08X4eZb&eM7t
z?Vx3cuO+Ll!%i4X)+SY`^g)B<)&=Dg<CL{0${Z3<kJqv4ijTY8JRZ!k$kzaSJiAht
z34Co~#Y~#b7syKbk=<tZ0b;Gj2NeyZ1&X#Ki)XCsWq2Y=Ao>wTl*tdd)+n&F5OX-H
zOq%**-zC|qJe12@`lRJgtOU^v*AOPKb5HfI$shU>NlL>m5~0#TYO&#~BqZU)9K~2{
z&^dA*G&;ArDf)$p1#oGVeOPzDVtQ$S#KG=%Z7I+%Xz8Sag&Og^erNB+z2V8-?`}r-
z|F;{j?*6`whEj<;mE6_-COz_P0c*Y<$R??hIfS6!?A&5JKDo|QO6?BWa_60>dF&KN
zJIV3z>ipaT)p>_HKlop7yuSN;R0urQF$ZytRYzQGsvWclF=?lzDoFgckwwBPteCRZ
zBkHh#_)%v)rMll&UIzl|%ZJ=l+VFCpUr#d01ha?<2!XRpUSOzRzpS%0kWK?if<*uj
z?4c7Tfpmxr0h;`fCFl~~$5Y^}q}2h~S;;8Gt!&DR=^9PLNX@oNSvU?QS-;4s5k1>(
z!Nh9{>Z+4O7j+=}D8^%pvRB*wuo)cxBQp!2T1}#m6tH{u_5y9?KWx+M(5>EDeQP;b
z{r}s0_gKrWJiqI_&wbRbm#b`-UEN)6yL;T89)^j7kYGkCr2G?JLQDps0m2_aD2Wg#
z5)wia@bMo(pb<m?6eWm1AR);}6A=W6VR$4rlaMfCIwSQ=yKQ&1ecN5O+b-AR)~&ja
z^W^jWt^M0)?S1w>uY2yTD$iZ_?z7fjkKcOiwZ7}Oe(UwdPw)31?4JAVuYYvo(LW-2
zCbCke>1mLx1zELV$vA7-A6EB2Xjd+9v(56#0lWX;sM7rOtIHFbGi1o~Ir4n&jc@Pw
z@9%DW_SZi8`u=ajNHE&ahC_Co(-&zesWt<t4Ae29X~Lk+h1FV>LOD=PZG2ezHRnvx
zY;S5Cvwe+yocQ+f&N!|j)3Ja$PcSd=IL?9(oeev=%)80>3b;7|B`#VONI;k`6oIl>
zfFk7+Bzd<I?|E-?zbk#QXHDNLU4XdGtTLRog6RU?tY;`w;_AxWPTYRMnD4e9e)pxy
zwSQT`2HZ?je@S1bM9EWmwkyr&V5FaeSv^5zNr<lf>h3l!uJ2y|)89UN{K1d6ZvVyI
z7l()+0#J!Lu;c<y8i?66CTY9Ve(>F|RIdG^XbnF`i1qT6JkQ8W<6^rqx_GjARuY_p
zm-%S7acOP$`oHt-{{A2R@#aT={^9l7eX>{wrR|hLc4XQ?P4Y|C4P3Rx6$wCVbb(l8
z%9m8g<&{Rsi-!J`06N}cntH9|Eb8wND36QN=#;sYN*3QL3-OfLHzwe8`Gn<X*NQ%-
zWYe=^5STikiW`m?^;tpZaxZGK0_%xgHD$fWT(O*>rv;negBOR7n-}^fZLU9jZg#?E
zexcbUj^o3!Ck~!xu%)q}6w8Od*m&hDpT72=yzpW3ReDxi<_9=8n10rynx*d3g73aq
z<x;r?@*E<0qQBzc^~8DZ-dTV3`cJ;`UtGIYf1QO#Z5EfbwB%1q`?R!?NgenhI}(LK
zF%msQAHX#;GK?;gvN+95tt$l!svF6r0Sg9O%6lnLFGVd1WH*jS@6U!Y%Lm7zj%n%F
zO3~Q8=v;}|eQq<!ap3nbK65UShn}gb46rk)ol4<}J3ijL`&&;u5lbYXex1S>XeX+7
zSZiIm`|7{{(ueIg7zeT1DgYIL9ftjh3{UcaM;l-KT@QDfx_S!hEtZV5MxI^lA`;5;
z#k;Tk%JmP|ewNwCw$^G3tPyiGSzpZodRlXi=!4D*5eQs$A_9V|UNQ+&g9YX(c(JyV
zYe0KR=*vy^9?wuak^8O4TzQAn&ekr?3?B!X$2>Ps&$}mmo=BgRpG8Wq45ZmoZWDJ;
zDi0yvG6W8;nq*Y^V_$i|Uv>I5o}EiA*aSbm{O}*@{y(Gr?#kx?=SuRiJc-j}xu6s`
z{?snredSMI{-FA@F8;)de%DriX#C|RGy3u6-89b<E6BkeMQ4@DX~*=7>=udBxa%m-
z7ryxFpLzaP^=rteTiRr!(S$bA^ahM5^Z?cxS+I=HR)R3$JvS~blCHd8Ed<EhC5wgf
z*3tXz$h^4m=GChcan3{KR0?FCge>Z(A6A_%8f-EDz=J?ffnxDOY+j7ug1#4+DQ!{B
zweq7V28m3vV}&AL!LE=%x%cH<VpNzx;b5!Z-+%7&|26gY41%>S7fiTof%VIezVYui
z_A2YFrqmS$#z|^fqAkaS)jr%B_4c0oY@Fvr?!7><rNuSPFb}<X{1nBZ<$}&#E6*=J
zdgVV@e^A+Ajzl{lVOh09GJrG-P}#OghouLu`qV*bfkm3vXIyp*L!Br|r&p&=y-bdm
zbX`KY_+-HG;w%pxxbEEe$-U>0aTx&2kw_>PNvb_k*GtlL{5?1x!SQt=z?>*>>udM_
zLG$v_CmtzxY`O87(nrnE#j{Ls;~QUG`&aoKHslYBK5TLgv}Sc0Ymz_w>h9lfUOpV>
z`G+CTa~9dma#<CfSrNr~{`&oEe*)PwqK}%%sKr?`ooFB}@dqtii<6F>v}M}b<ARK&
zH;^Y^;ds1sK?Dm}J+(l6uAx<>PnVL|!&Br?7!RL{fz?ASKDEflN#he0HnG^dbNNnL
z+_cPs0b8MxILO~Tu%38NwE$#5o4-t?sqG0Fa?R4#Y!%GRe{|u4|E9GuG^DF`*DIAG
z&N@fygi^dT+3IWKf%WL~3;+0)o$56>X^n#{<;pv29$2-HAPKPEIsf5b%H%m(QL=O*
zl7Of7jiWqQKD+R9FZ{6fRdLj0)j(RJ52`g=Uc^yL^l>_3kD~HB3CxKPWGaetUc09j
zsFeXftiZr$flV+ue4BWkw{YZ7!chlhp+w+`07P~v%H0&6VnDP8S0c6;2lBvE^hEBf
zC3T?_2m+rVuw|_`9fzkarsD2y=c`!a$rN`h)2F3VL-ew6tFm{%wz7n%&g=N({Cj_)
z(T@5a2W!FHQx4K;xg;VGhW(Xm{jdCzKw4)5n7e=)HWTR9PVWBRwc3M^x8DErnLM8&
zSnDIN;zPR#M0tK;aQ&AB(qx;P0<@JKIejv+kk~`HPs?gWhDGZAg=RQa<7%swX8okr
zQ2+V@`CECRED-l%UL7Gll%`@(v$)vcYy6v*{@5yvIsJVW!8jc$N+Oa;WZ6z;nqHWO
zk^r8Z!pfG$p9Cgtc`FBL`4BD9nRniAS~^b!tXXr*NLV+(YiE4#i?3Hd{q(u_{?pbb
zTftp9So`}^s;eyh@gxrJZhr03N2809Ps>iZ<pT+~`BVbyVgK%{quZZee)rFj=Twp!
zuUmFn%j%w{B7Iq!)52MvcScuC?4d!TR=vPUOAN%;uEpfjb9Byy?Iud#;pExMmH4tv
zt)VVb@zT6$YpCO}+wseS=BEy*ue4_`jae{{v%Tk*1I66&tiX9-bYPv;gLuQ3MStu*
z$Z+kFk1K9pM;-Sc7DgwvuRtlCWy&VM;I3B%+I)s_bm6QXcII;vJoiL0>DFcY$I*Sj
z`opjM@Xt1$fBb`#jTV>bPg!D5+1|ge>v8lM4s&$%7rYT_<U|S3kA`#6In+oOEBBP=
z53c|4SK>U|Y7p|gO3;qexN38p=WC-Ee?eTd$)~l_!<OZl&?AE0aaA}@TA*S(d!ZhV
zgrJOd;H+qRn^`NFgfEMCCvvzInNMnIo}%zN5=XZZ^GU2FEK1m{9y1LSefP*{&aG<u
zTnexfS)?y%=wR?Ko3nOcS6asDDI<~%thD%(bvfQ!Pq%91Nz9j|e5kq7=b$|icp;0x
z>jO^OU9C$IxO%Ln;YyDV$!>*bPegbBO7-D8uYLTVAHMYCzuY`G$X+YvfQ_zg<EN?o
zJLc=xv^2E#FaBIO11uaDpvgqU0lG<%Ex264)~H#&A72?g{Qj#y{#Ek)m-2azLA!s-
zd7hTHGPm|Y*dovQs&La_5F9nb2i+87cr@>buZ(_d@1ip;PqlW+5)`!y&EGT;v}mPN
zwgM@%U7;G2G4u8Iokc$FMEF@2Z%^@%2oR?DI29+&r(U<1;!~@%Tc|sMHX%VeH<#9I
zYN+$Mf{~*w$Md&tmpDymeiW_38#?PKeo4u4r6R7C+g@~WsVU+0WDn<X9sGzp8gi+M
zr=j<FoUY)b_}4}83OiOZ2cfr#GE`kuE+VeP;G_ztI?qX_obkb-Oq{Ogf{-|69P7qG
z3uD^7N16%nRAQW>{QMIRxi0h-+sEIb&~s$zblC(EY&G=P+0Fs1bv~himmJBzDP{K4
zR}O#slhFtN-^)K-|M|_w&;4_Qz4go@RXf`wEMX3TR{Y!j$_GnR9If51v=6Uy&2arf
z;{jJ0U#fJ~$&)>uGp1={olRtieCZfOrX%c@;ve7G|LtM**6-Z7wfRqP?mzd>Kb?6l
z#<S5{&+^=RSie}`WfJiMhv{)}D!!F(tA!5InL1j~c32%US@w~YPZ7bb+tI8HRVYi!
zQ)Nu7T^Jd=;YEEp?R}$c@q$)-P(jBCH5skjXlY(JHe<e}dGlVwCHgr?@+eoMj}u<0
zNRCr>f?l#Vv8v@TcPiZoH6B+u96y>pDo)pcJA6DNM-O~vJs}fOi;PCdf!dCUk&V8t
zKDKZSBo-FBAK{?@#nvi==KBDmi#;@y;(X#%ISdYa-2`62)7{<FeVW06T8BeQk&LMN
zVS#mzbh7RtRla_@h~algjj&ljozgtowR?S2TGI?Epq7YLhS+-tRzw%>rcgOu0lhB6
zf{2a?wF`X();s_;mop&0bpkruSt}-(psM}kwWGg1sDAu+&;Q`)`SZOCKfiXg`Hxi(
zHeVbLTJ1EW9&m+v>&LGcwY~GdyEs)cEuhu`Ggm*WfBn-7gWtE&82Lmd5ROQNvsQ<%
z&Pi314BMrdoEB31=o|Zgr!w6Ct@F2zu3qk6{P|Y*+|SkyHpuggg}#fYG!tU!JnP$2
zxjoO%f8KcI_J!{I`i^kBlJ{iT1up)K>e9IFq~FsF>02g^dhvEk@e%`PuX5cCl5iEb
zW-yJBX>tauy2Z6dST&`Vpv(VGN-ewDMMdZMwvx0hasY{h@$oG$D@nj{iGZ-WjzWcE
z!=oHM0irr!2P1K=&hQHm9iVf;R`P0n2Ng~6Y!I(%wm5x`F%6tS5{qQly#&r|=^zzR
z2@?p6;raMU@@?{=ES!Id>8cTBkr`mks3PE2n-x&`gc>)l>o{W$q}L6Qx-EsgCyKEF
zEiP=55SHzIv-R=baQ|-(Du;h-H2R{}{-VFOakuh9tJ1tuAJsQJ90W26Go~x)5A$vw
zMgi)h#%8@z-)i;S*K3b2yh=x4Oxf1MpQ|hd)(P?TO6yv!a`1ZsWjhvC)7zj6mxXco
z9OV(^nf>NAbYj571>U3D<8Q8g{IGKHH;2Q6zs0AoH9jA%am>gItx@v|2R(04Q6L#q
zK5tYLD+hN^yrr7_BWl`gR+?K)@?2jw&q--RFIDZ)+BHUe@4JQ4kW^c@n$XkmsbRv)
zghd#Ys5=j0N$tbn{ME`Dx(!B?Gkmmt{JADeg1tfWu8G81D?Z955|xluEzJ|Hl>)U0
zo~9D`%=)<2{-TPK7_-SNAtIpDIUYKYZXFINm3Z=nxop;s9@PQ<V`8g?YEc89_yZm=
z>)nt6U5#25ZA0QA^fJX6_6BaMoR+%PCNXJTWkjQ*$zr1=HxJyhG%*L9v(^#=P$Ep<
zX^f=qj<h2(jq}6-K1dJ-3#thz?ni+6)G7i#jaZ~w|7yLvceS#|AwVB+Ba}FBeSX(r
zrgVpt0feMRIM74Tq~W@dGz48+oAFYhKCis`{?;E^zxUNYs$3oitn0(p749>#&J<dF
zTAd9_-T`ZkCg3<N-%5lUtkTK0K8lKNnLI1M>caq|+TeL6TwfUNF@yF2Wk_BjM*#|y
zB~!8dVkcVsP|%d2j4Cr*9>;cW%24i;iaftZp6@S^XNxJJ6jg`js6n2^K!o;F(gY`y
z5Yd=)3^o}r;+X+u)f6BBGDZLZKmbWZK~%LFP9tGdjOYWe=V;q>|BQ|+l@}7Odemx;
zu2lM?&(g-8jb(>dU-5AZ^K0&m_#mE_TZCz?bOMpL@}p;`jXpO}n>^)v-;0YqBC`VH
zZD`o1o1|4zW|JN>Hu_wX$t|`G0repjLULe}1v|Z#^}TZ8ap8nJ2JTz_1%^^{bs)j(
z)Zb8vwPGutq%00%YpQjjQli8dM9hKNiVnBjJ|UG9P8xff)YL`>4NVd5gP=$h0VrMl
z#Dt;%Yfy*7)SZ3GhjW<#lpU2Rum)kcK$T;kX_`QdVBG+`4U29-W!)QQ-W8Xcu5@*N
z!Ci;<2Y?n2Mo|Iy;qauO%lBCQ@SA)8*Eiq$c&&N=<$q>uySNFi)kf;{6(&bjo+VpV
zvO!^8J78e#yK)iblWx^kI9~6h7&0i$f@=Y;SaML=@*N<Gyb(%aq|04GaCk_gqo^qj
zb!Qy(Z(wZ)NAV3ZAMS(KAN`--cz4b`6OXG55iC8=?mnUC0_0xtK4~*SL%yu-XcrLy
z==yZA#;{c#wUw`<qe_eQ(rd|vv5F)t7j^1kELaRwk2{gL4VjyPRLO6r#GX9p!<M=p
z%V9oY`aDsnw~Lj_Tw}YL=G-^Uy;^Y9Y^O7hLr_QGn_*dxQqDSKodoWeFqbKDk7Q0g
zPfh@p2jFzaq&NhWMgk`G&<mN-HW{ZA=TpuFeVJLG{Ew3A&p0-0jPsE$z|znk1VQHy
z9ZAQ4lc~8GvX(scevOO1?O}yTqh9Yed5{Wpxk9bms@IQTG>^FGmj|<Sz1veqmpl3h
zyISq2fjePMCk3K$#BH!l^wqj~&{C>DdhY&j>Rwlw&prGZX$vblp|tx9z(UMPC#8Ei
zb*VAw1!fQdA^mD`H$;<1I;=ly%tz!~`BlE_<T>P(zKS_B(oeoa{$&nNvo_AN?7-+F
zdcZErFuDj;5D<qvlNrlfoT;5lbL2S>(m5)`$Dkq9*IC?j8g$YSC(F#Km&8ToD3Dg^
zv5>~D-_@{7BV|1)6R0`$M5PNFJ_#1$A!jMg#|5=I>~o6Jj|J4*F{Lu|I0xoK!-XO>
zt1#jl8B!p1^eG}}cF|{xjB<)!HR3a7Ii|y8o&h3g+@wNr0D}c-GtO+)x|uVeH8~-_
zT&#kSuv`)>0&%=?bW_b_*e3%OkM`WkzhvfJTlR6pueg5btJRt*{G??S*-aRuMm6D9
zVj<9qpAv6NSnG0Zan<mF>O6_Zzzfg@Fm+ovi@Ioh0&g*ZaM}Vf0XG-@h6gji3Yf7D
znFmnP^}{{n-S!B;wMMy)-sa)^nOS~ir^np!L;OAR8Fa3f@(g+2kFEl0Yx{R)UwR9(
z2b!XbyA@Y2FJ7%Ra$qpQ<%3|2bn+bXEs;oVVEIk*ZQxxUl2#sW_Y{ybnx})oJRF)?
zc?$U*=Tl&={A(Fxi_S=$63jqPkL4Y)Q$E>8FDTECi}S1;B=yPa`;1Co1kwbbl!`6Y
za3I9!O!Y|P4~A%|t~}XlF52_@QFSC4_4($bG!`vvm?fVUjb+s$yAl=0v4DD3A|<nl
zaXK$}w+Y1pA{V(mc0A8p;K8j@KEy4G^t9}!qolWvgoM{lam@yS{Lm$jdthvBGS8#*
z00|v|i#wSfy~*fL#?QnHm+D1yRMFfE5?MNnu7S0u&r%xjI!uN}{+;Vn@=_u)^J4E&
z1M@f*(FI(K_@Cz28gK5~YT2Z&J5#wz2XMeF#31O1Ni_L5Y&JA<7kC5Qm<42Q0hwgn
z4S~2;k{F2h1>$lC2{G5rEFg#bw$&z*i^K8trPCSkb%VTI=6qgZV((AO&mwM;BM1Nb
zQlT=bYI$cx=WHDo9J0ym8Oqa1NuC|@-6lWvW|C*}!m?7W#kPD?eRYj4<-lz#_F!iB
zBSjnXn&j8>to)N#mf~=+5^3;9=^NF1lX*^3Ztm%i3{t8d*(y>7(&oMNCrhK$n>(=Q
zF?4vElvNWBiO>-cNmHq4;p`^M^K8AC-}m6*BYg*RMm}9~tBZo<ClZ%k@gZ7Lr9l05
za9`**pSXnr<5{z;QrWT!!VfQ04dlJBgYN}@=laeG+D;)Imc$*Im?34e693NqQg5@d
z=`CwxuWp@lN@Gt`<DEfX`b^;{J)jmO=voq)467EctORHxmeNTnCk9;8xYgLA2AB7G
z8t<f*y95D-1hkZGjw!NKX(^<Oe@w&!=Pg};Edb{x9+PWJWS|?{X`RM_OLSsj#snP~
z{|-!~keK0S*(Zk#JOMrEnVDX4VB#08L}AGw05$-)Ch(<S?}tiyjKWc#m0z76CtVYr
zdQy_f$FnNHj}CFxcMY8tdBnS=RX|Q&jq@h&R8TsvkZ0vv4^h~In1gw00leN>#m)q7
zl_FEV<%iHDfu|tPgL;3wF(9flsz+9r(h8*<WL}aiP1-@mEGG&$^_m(I8d)uMO$`D#
z3Cyfatb=D7$HX54M#WkXFzkkrvQwhBk3t9Aneu74(fmZB(_58Z3e?L+u)Kt3Quq;x
zjS7=9a72t<$5lJB&6R!bRURG0Voq2cg1Bb6k2{KB)_a17a;BXJfA%u#M-=l<E=<b3
zkT7usHW{K|$l2nKLFovcMj)VfE`4ULXsGnou(9*}1z+)RQW$8SBy)`#U+mk>p1xRj
zw`FxDfn*1e0(k^Onk*EENf&^DCT7-qAG4;zO-~}#@^gJR12A-*IA~@-3rwPM3d5MJ
zM3kUMW{DQ+tS#62a-*)vOko{hD6mpfH&G1f1GumrbC)tZz$}|@g;P{YsUZstE_5xw
zT<okB9k!<&p<1ZjmS@cVag&I(TqB`kotce5fLwr^PMlm&1}b2Qk5pexj3h`lE*&@{
z)5>d2;sPsW-t<k#^Q^q3btg4=h?zmnqvG*$^^jS8K04VjMpUJ0k4B`b8xmE<{_@vw
zU0oX=$TW#camZjEOAU(AZ+kLGWs%J;3eG2AUKu-o=T4|R6J(U=H-oKm61MD2Y<x-A
zQzH|CqfTj^L&&!06;bFzmm;uYL~QGU%Yi3EIr*z^lahzZq>o@D$}EQ?E&-x1oEI26
zC~AX-C(Yox7ut+M>VZMCN{2C0afDGi+(+!3*x`$|HvUMO6m0X!1j6bhS`6P>?b_%_
zo={a1sJk5xsPS<p5?qxo7EQ?CMDCNaNz$O!DP>w>4mKzMD==owG{_<u1XEg)MF3XZ
zhZ2}%ct_O*e(kPxu+>s1XfZ%HfETbMo_1jCGj@ljr#>~f1-iaxmDWITzOzM9sWteH
zwv%Z(KT{jlCzlCCwC6GsrIy#RWE`EL5qSnRYgL5D;H2Kg30e=KzDH~FL^sX1@(=r%
z;lh)M_04mVB+%CYSV)|F{KT_prbcc$q}YfSemhv2C{E=c<=GOF)SWbFc>^1JNlbhX
z15zKWXo7;j$DZa3dw*ym%sduqhsvMYGW(}6)=f^`W*sL7t-?*S`lAubafs;S0`3Df
z@)G4@4>{+>xFtd6wtgF*Z%y$%y$0q2E-C<5@VuNlM{?pd?#<lMxmtgZ^>L+&Y>Qf=
zIjc5J)F|xKmyau`It1fd`4Qmpr7cj*xr)VZ^1<bAR0|99REe!3i`Z1<>4^1$03lh4
zLpG<1I}V{Usl_#o?N~8Ndh|Z-R0P)e0SzaW>=OIL7}-pES90QK(#PU9$}hMekS2`=
zRseCGZSnQK^ga*Fpv>fsr<*=Q4%oA2*dv@CmVE$udJOR3CB;wD%j-;uEVr6~yzJE}
zIN-@llJJWZ06&z6fNipNjq2W?EB*67Q3*kuuSK5qDDM)q!vM-`d8Z7_j1I3~>kWo=
zJu)kQq|U<GyWDw1Q}#f;$wIjL3hrE;7<s~7AP+|oICd)o4IL;aa-gs(51Ca4tX0%{
z#n6K(i=*0jooZ5T#@U&$7(3-m&^M-rAAKOA<R4V}{)>11$LhxYWZgwB&>XL-K=;r8
z@W13+>dRa1=;$nAYSTLB!^wn^d$dFMv#}V~#U4BE8U0pd&L6~N?CI84N;~#?9CIm0
z{g$=bPPNkMR4V+Jscjr?mN_nHe{F4T^jU?KLWx?Zw?k4kDiVQcX%C;&!~*Vre!aLH
zsUO7-F=5v89Klj+7040%sfJN`?$scbiWdi)Z7%Rmf&{E~J_kI}8ckV4d!19@EF4Qg
zD@{fpVgyuh(yfWA2hlu`nk$wJMJ$3W+~a3Lc{<dDf}`8GSG`-Kb&J*N+BnTj8B2VF
zIGT0T%y@xf>QE(=sIg%myach;hmt>(4c6hB)g<XQtqu)fqEx|QsM9*-Yp5;BiLJsC
zhY-U6OyFi939u1TD;l+wOdw}qnDpyLLO=Chb8B|FrrswEmH|~h(TDBhlS_)xAnoAx
zaKvg1eL?_s$e|!4k@UqxC>#|^$aAO$B#~U;2~If8yTZ8mM8uVEMl4l2!vOTeue@qD
z7L=xoBOds8ijVhkjLIu(M9ydPY`GYFnq|U!C~|ZO=G8?gzgY4<tX`~+zB~NrSFe5k
zlUIvKdD#57FkB!&ci6r2`5VI>24Wfw=qd&iA2eEO3SFXV*yvM}3s>x%k3mJVqq;{2
zoHliv-|LCFOpAmCWnL=zi9|8HzvR9<ZkVpC9<NksLh(C$d(}kfF{T~mD1YvU4Ji%|
z#uZAliK>ch`VEKhYPDmgZW>)0t3GZ<>D>tFC-0c?IeyVc51g=7!PG%mx0&?30zf|n
zc`_vsU}%+%Ps7HdRHx);8dSNM#Invv=@Vz%PPk-s4ia;;XpeC=#q~?{A%G5iewcjK
z`fd~HGfxDx&y0Iqc;n9!2lDfie0VCiI2~DdNJ3^j#MH)Sm6-sVVrP1f1=Ggkv5y13
zQQ~68#B`Aw8B0hYR0+{aw4n({0kt?mQ4|pA8@f_u=QxpZhLXg~zsgf#DPt2gh?6HJ
z;Rzc+=;{R6RK%pybGoB$`(kQ#gX?qT*}U2}lh_z=)YK+?h^!>D=mF4`es#ctX%mjn
zb7!aueDQDj^1O>?kNhNA^wg+Mn!hd?)yRQMW(DX$yaG25NV5mVZU=9G+S)|J{+B!%
z5)kD%_vO>LrWuq0eQT*?h(}7Owp34vc&OCX%H`_d<IBDGgRk&Q;*A3z+o^ZW+bM5V
z*2mLkpvO0}Hl!X<-&stK7@Q3lE<fjEOt089TkKITpT1d4GP3PR?2-AVk)s(G0_w$g
zCk8pSi9ZhSR}(RHJ`K^k`mn9&{g_5o$*I{dryoFZ%q?F46eXvVh=BzLw(dgftM@?y
zTQ)~L+E${<Cr}l)e_W+XDQ+6BASET>ktm4Sdy7F`n8u(2XdPp7gnv~=DaqzI+a?u#
zh}#fMdjl~~Gk+#CqI3ay7Bc+Gn1uxEJyiaQGGp}a_C-40H0@Ofp4cfZAGAb31Ox$E
zY~_Nj@KAo#ftn&A2GVGhjKyRUN+l~v<T$M%h=4tqh(TZnRA6CXjoG%NlU0G0rUh6b
z&s=1#IIg@mxIWZ@nW%?4oGIt-^k?aoHanx4zM06R1TY#6m{C)K#_(&o8Q(F<4Dx)H
zj&)Ls!}IR(sUBN7xJ9CyKj<spqEE8v_Qa`^U-F8f9<Iz1BbqI_7v8VEJkIk!%28hM
zmC7i-U4N3(B-J|oE-^JMM=yTA@#^{N`ENHz&8zrl<kj1KTsgRP``q4ldoNjk3nBd{
zO5Z<M;nhA`G@3&)J(k}D|2hv}+s8G!7aB?J@Z8{$y2bOFnfMX&nN#zud|PxPQBi2b
zw`|?ABu<}DG%tled9FJ4bde=8Kgre&1E(VjTnD#l%nNG~2g#V#R?-hOM+W6z(NQC9
z!jhq6WsPm7yqdCWx7uts)fqRaLq4SB)?LyQi#`O5`bz_b;4Ay}VZM-9;typ_Ck+kR
zRCdU;r%FV-6dCP~dP(^Oj#AT*!M{KN;|VAmV`phcZ>cf;Fwr-PQ$xBbR`^!kQf-}{
zctu(;J66QmfgUXSWo3fecbIHdaL8iG1Mpbe6n`d_t4C(%KSV?v=1*m(cmWC(AS?U8
zNq`e@mI$T+qKWJTxfl8`|6-aqr#n@j^bO21a1040IZR<%zJ=D3a|odINo^D%5E6Oi
zT{;|Nl;@Ba*_*Ny%i|cgluuLSS`|g*raY5Zt*C+NH1UTzChMRkQ_Hy+y=#B0$lgiM
zqm!8fTXRW7N{W&}`R6h)ro<T|zi@u<+P^Rytc~Xba8`a8&iwr4-NC5;@b2$_SiSu>
zc3-dU>RT#r^Z{tha%h0o9G8R12(>D}l(xGB$WC`9V&n4Z;AisJgaqsrahJfB`rB%C
zVbjW0R{Swe{yXICjS{wchg951QgS!Z?Wp8rl%8@<ylb46cq!H7fiD!48>WUD@;Pgj
z28d>7Dxmi$owiP7LSlFbj5m_a<6;0@d=P*Tzd}MO;tEY}4D`WaxnF9Vi9DJJO<4sI
zmg1>KQ`1^Zi-ln$k<xn{vZ_d%qLn-oeULbH9%|*tbq$lI;npH46jvAfpXAzNXa4|%
zh^!-HAO##pvTt#CO(mL#Nj5<Vu!a0XLRy*}=V1kE#vMYzWwm5GGgkLJTLHw0#_Yf)
z&ea;XCLAT+KyFLfOD3Jbol^+}8uu!VZ{E4`uZ$jDzA+{_k)yHG6ceMSeRmdjOC1vT
zj*N#@&HBK?F#d2L3n9;*8qd3?j?J8;*60-^$HS>Cly~E(HSs9o6bJnudtk&>XO+Hp
z?e3`g+C-kS{^orfR9SmY0!WAbDL&P86}~O&N<Pf`kNRsrwfpsdZ**|!Wvlij5lC88
z+k5_JzEQpW)A!!n`KurP)Z>33a#WgXLoyE$Mv+0~yDD7nGKX=94DDQ8W(D+Pu}6V3
zR>HVqm6uN!`<iXLFi>X%;R*e1^qYyfOmp!^?4IYUZ{yhf>?g3ZTd}vq3{<mkEN$os
zAhHw|_o!Og7Y{)qW3X_%h`cAnO;ar$qq`uOR>E15>Lf0(l!u9^N*fVF=rj(2%J7Bd
z(*RL)H6~SGo>Ly>q)X0Y@`^ueof<i4THn$|XV7o;Y{r_s>Xr_1)SUKUvP^)RT~^w!
z7;3q=eGTut53xq7<f*GWmZDse@F6A|Kn}RG<cp#!E{Rz7jgRWpAB<jYS6a`hJoJc?
z80;*49L(8liwWlg6ud)JQQ#7j@EEI{2~|JOSsGi--rDu*{>874SkvWX9-d!b1aMeA
z`XnyD=ijY<tzBEY0&UA@lBikvmghL(p0rtdc^F18%@KL#XjhIoeYv`S>6KOGxm)Re
ztV$Hb9-wH_>8f6-v(~7h@!6pH`n_-d%CLLxf@flP>pP)P+`>u-uKH1!6&oV8xwQM*
zzuA0u=iK|R-~XS<oUL+^7>T-t=vso0Munq*Go87U%j-K>+(;~Mp{L98<`8>q<Nqd4
ztcvh6cF&vjag;@dm+D&!kR=~tMek)?wR)}FtoV2V8IiVfo<kbAm$1<~JVnvlf_2i(
z<cUU2iCt*CWyv#7I4Z-b%DiAp?TESn^Cs|Z2icj4T?BYrNjl_#-4mlG>kGuIs>4=N
z#SG{X;0GY{*cBqENt;~S+#|XwujJyIP?Q>K!ZMNtvkiLU<{8PVheOUH!Oc1lr5PFm
zX_I|gg9xb;O;1n0NaQw;8dH*Qr#4T>GQUb`NbgtQ-+1%l{a60=sP~+Q@TvHTQ-2(g
zR$?EG9`5)E?JMuCzj@)oEC0rqEzfazDbKs3y&d`i+7GRdIw@Ua3DrY&)~c&-+`ay9
z%>&Y^cMs0}j>rPof7oi_xraA?@vHB2Kl;%d2mdd74Ye3uq&1aJRFa{Ml~$E$uE%96
zI_G2TT5MXS*yC-Yc&j*?)YciI)FL*BfT>QRmuN-oy@@|k|6ynlZ?kkK<EoRF>zlUe
zg|~1I@H(f;^pDE9KbN=i1+oR3eKYE^DzG*;h4;xB4Iqc~!IB62HDF19VJlDs(Bi87
z2t7E13KzL(1}G(O%jpadq3kMkb&Ij?Y0G;N;0vrn2Oy9JtXV%TE=0O!uC0S0ZizZt
zaMpUa^dhp+)@mCUKtmjxcAE(XGw~#mCz_&of+{L6QgP|Q*M9kF1S~Hg0ravUeg0wC
z#K9Rzy?d`W@2bPobMe8~{<SYtp5uCTA(Q9&UD~gt<SxHs8p0WzO68?@+pkymp8uAY
zbr~m}tIa83E8eRIU;9(lyBvH=f$DKuS$)59puI39Di(XB+;qn8Vq%ZXL}DjHsPM%Y
zX<QZ-eUz>I*oN3mo^quOy%{#Zyu%8R5?Qr}w*ylA1--#8JT1o(4-1kq41ljTJ&QYO
z5Pd1B+$V7B;F$cfX4kn*n-IiW;sTvnD*)6g3*DK>K{y7`2Z({i<qr`IGWcb%)f;t%
zrUr(ZnE_k{viVw66nQRvak@lO41m%UfL7;PjPon*S>OzCn-W)`C3_r5q4WUK+zYEU
zq_7Zdu!HwU&TYvY(+Ei%r!=mzWl59#VI0CJlzEM_GnY9Q0a!OhsNU#)<>11HbA^A_
zJPkK?cQR>K*Nl4B^PH*bnHSm)c~<=aJGIbIU>z6|ESSM$C1R!aeD{SvMwPXqd4RYh
zqf&aQVeAay2V1{Wxw!X-Swr4ld;N>6|KfXB?)`OnklY^)@dxc2$$yt;9I#^RsJBuJ
z31Y`<LQL%8Zm`pNrZd0VV;jFW-Tzd5_R>5BpUP3cWo@uC5sl<5^QbIWoeL4kc=A2f
zpv_<f<r`gec#0%T;$8!23An-oaAil|F$Rf9!MBukte7TTrzG^*_>@e#QGFDTNwcU#
z;!p*GTJ0f#ZVRwc0&vYWN+ct(gwDLxqcamkOMb>muQ@9@y0z=$062*YCQU5rHEsj5
zIAr6hqja&lS1Wvt({~PAWRwTxN9nW9gV-9}OT!FHE+J9m1;)rKO`UUq(y8sL@e-mP
zOT{#gMd%p{{Ghq}_nx8T&P-~iu4G=uK_Ao~{1)>Jb}FB?($Jb%*UA*J)}7D{H+BYV
zql1etj6+1Gw2q~Qv10<evCHP+#XmAR(LD}QW)e*AlsHDvWj=D<NJ*$lWnSDYA}|%G
zivpC{N&K;0=9t=tEZM|jYFBL7YCarE^ubw`qeB)iiIddim<{CtLjy2@!vyGvUi_(&
z*PK-xtAPxwDzu40+`1}{PT5kN0&8)t#=Qc}3TJ>#x&(^GS>sQ;pOhvGOPZiSr7Kdh
zo%Tdw=se($4fM6G-MC}QK%BceFLBQxutn2mue89r#iXZ1BHAviYr^E$Iv>-uf`s?d
z{@K%2ki;liW{gl(J2UipTxFBF36WLMJ8pVTD!hw5IM4s+$1flJ-buxCT6DeESVdH%
zZjmNnRPpmVl;<D4bnv@;Ux|y^U&C6RIw$vu;Zmyssb4<2@N-Tp<)$+<-8GHCxP|DA
z5s7xqk(8rzS887rSNImoTEm9A5b^@YE6en0cujvZlZdIU4CN4ABo595UGQZopw7ry
zW<)rRtJcJ#D;37hjux7aPp)z|?aOCNF>+abO0CfnsD=;AFdq!dBeOzgzHA`nR+HZu
zfQ6oxkf4hb6)-BE0br-NwX#AVRWfP^ZGp6HKEaPpBGYMX3MX2sc*W@oNtx#t2qp=l
z8y<nOHt0$A%<=FXD$|9#@1m>1g(_#0oJ=GNq`ec-^;J-?hF~<o@agdv6x2irK`9UD
zYLCp3ate{v9L9-A<_PobdU<sIv+e3Rz6_PspQkxD{!R0`r8%}tGvSu0Mdk6<XMekL
zzS?EpkfY43MQaQi9>81my)|mTG!B7DWKxxRNp0QWu8+=tU{+#EuK#4?Wr;Gyu&8az
zL84Uiz>kiq&>?XCE?x6w@w=OCF+_gtbna}AZTFnh7s1V3(BhsZ@5$afg|->X`FfEt
zS8ahKu-3bV98%hM-)}s!)2+l+3lJrHRY4mNVrJ40jx&c47CQbZEbq+6S0hnRF7Owq
zi5ul67dzKiorKAKYlqk!a=#kx5;cg+<`J07zd%tU6WCwqh!W2+6->Ft3r0`01=zN?
zn6q?;dPvIw;uzierbmFyEmFp1J4j1R5`dmggwBHwMLUj53Z*E)^6JmnU6Y*lXbPQY
z;wvOEc*s~EQ<*e5U`d~JefDjfo37OlyB|Dv|Nl@WiJw_HjLY$~&6%|2BTpS;hhTYO
zFD#u?o^L&O?|%_U(@cb#Or1#9D9)M-4y<lgI5WGRF2@_!0;iisG&WFKq~ya@T*F({
z=H(zN6=nnmO#UR!OjUAI$sM!!#C|oAxC}R)(wt`K1jo0h`H9?Sa@2uPLNy9lCU4n}
z{J3$Fs~&^3<Fw?|KEv8ytB<xG(Zg||)j%99fHYv@Zmj_~t^H{U6q0z|auL>Zd1QsU
zf8_X6jy*~|z_##kNW3^<{seG}%K#DZlWzg^{s9}R0Bmuv;<Uwa8;7qeNC8qE%E_ds
zHUnqVrOK34sBz5GOrRfm18|L=fh}il>ZCrUO<cWJpXd=_hX*;e02?lQgOeKS9FMPS
ztJH1S)GH%Q>yY4Dro}wVjcg!s$^wkUJ`>^MVs|s1+~|57E~XpXpM=@tKP}xsT6wv*
zb^F%_myy$&+=yJe9%ZyBU6J$HSmbe<-8f{iX<Ar!%Y<}G=~?9<E!*95pZwLqmD&N#
z4GE@h*x|@S-72G7WF!g^XDzS}x6em}Ch4Y*Nt?>}$h<HyTj||ZE3mmI+KWV*+RZER
zp;nb?W1ZnN(vs)a?v08@^@=agP0Oxu5)m=5++tOXmz~(lRP#)rek<EirNqkE_%d1b
zBv=PhCa-q1PN@gOCNk=^!ytMv(Fb77sWIAAYqv8C#Ax+8>}#T6a-^bHdG#l;)^rAy
zB!HQKQE~K4#2~OUF@wO6yVb<0O3EOh9M+FU?1Bh4YVh$n)6M=kk5X4diA$JFmjiZ@
z9;H%7)_M-uB9;g)kW~|>L?3ldC{m~4k4+|0;f&kY#vDC8aoxec%1b~G2c!LV^dn<X
zolIaZ5evKuz{lRbj9pJ${594Sr_g&iXpJe!6nmGsNag*^dM~0ex7{q_Id@;0X7tb9
z`N2ou+%Fe!dLnW(CJMpb-T%D0hbz-d=`0o?2I<k(-S<EI)}y}%W5wmUTpA2W!x|Y!
zEv{M|H6uOK0oK6MS~?VGf%5i)Q^rT~va$EF1wy=1`Q-e;k2TqE+%)1-wF_IxMVnQd
z(Oj7JZ4BbuU3Nm8`GpR_Hhj9-A29gVZy8>`l}r9OMAl?LtvoNIihGIal*XAGo8l0X
z4PAZE9Q7$U^>UB+Q?F-0O#vI|4EV+ZEI^Dgcb0RFiOp#S5Ve*QPz1;TGe%_wzUmb8
zQ4N%ttkX$bdhA2DI0_g*YyybfNf-PBh%B|>%(uWD#K5Kclc`WeY0G^GtGr5+R(W$1
zb)WQbcXQzO6F?@tqsl(w57Nah7X$CDCVmX0d*(l^^9a{4u|HUoH~|xrG|ZK@qVz6g
z=dtAV9Fa6-sUdjqV2O8sjrEjLY<W`VG_u)-&AnGsPqpU${yWco@|S&mJfkda_^?NI
zsYf%MRN|MVn@!!cx6QrRQs-LpVE+e~ZvQIG5Uq%<fgBu8d*&iuZjI+MUOfy#0qTJU
zqy0z2z2El0xh4^;Bg;&IMK7)DHS=3-KfXKsYW0X3Z%mZh#lV*OqSJ=tX+YZvgxSBr
z8K*@nK32+2cS3Blexqy#8MQB}o)xe%X9Ux@>TDbVtbI+QO(;elHWBcvx6{qvo1Aya
zp~1tRU=%=<Tr0@7wCplp!6PCi#tg4ZLlHm=WE)f#@x_Y6KB_oro(lqI=VArcaMw&g
z47oHFj+<4>`1d>M;0&0R<Uq|xd3>r7WlugAi~#{vK-xMFE^mddxOQ>z4S})JBXAZ-
z%WS&R%ZWzZIVH}!HWXNgv?*Q2wL}u-xH81)ijqEI6oleeGm`1E%r^*x6>CtUVXJun
ztU^(Wyv2zuGbi-MTA9a_x7TWiMkR<`+1%3K*?8|i8(gb$60O~C&TfBzOAj0-smaut
zar&PvlQ?P5bDa%6x7XkQvxhI$_c*-d2pOZ@@=g^c&$=}o&RU$bfi}0sBL?~S+ud9B
z=Kh{?eSw{ZsZwQ)Dy+U<s-hQ%UAY~sKllxA+iIg?zG{u`P@+`Lef5(YUIs9Rmsu7(
zWM{O(xqMpYtO}S_%w}eN&U$-$hKCrJXNo>VD-i5VkQF<>C|5lx0ts1;r5_siT%ypp
z9-2GvRhau$sG*PnEC8(0=+pZqlM$i$TKcpIArE-@gbOs|kIC0(G^QJ;0at+|+$-lN
zBI5<%B>I342%rcE0??P(>?BZh*|0e3mQKD!Fe5PJbPjHQM(!4INQy5TXEs%nX;PgW
z*bUNtA*ldY;M*9m*@}rw4cm;9rq&~P8|m&h1MY;|mMmKwc+)s?Tj6b!HgO55ysYl4
zdRi3?>GD_Cv#FI=ICB~rvelk+^(Z+WI3MJg@1Bxn^kYW7Wbk<CuN{aVZ+-vI?Y`dl
zl!**($AHTlad{dKj6v79&1y}nL7!=r&-15S@Bc@4zg@qr{Bm6H5ogr`)_^ozHFcRz
z3UKCOo+nH!(xy3HsrP8}j%`v=VQ5=;sHCB2yauENC5uF<9bI@Fz`a&KI{g0m&wouL
zQZZj@M*?e!GR0tNen)d)eY-f|e&tR=!&iK`*dxzP3$YfFO&5zjI!SEvX>$SfTbU+2
zAK@~tTA|Cp+6rceV-#7U=M#$keSjJ{b)EY@Rk$3KZ=AGo)Nq;t>o`RMLmmC452hzp
z28N)Cfo9}DAwY-wKoZ(b02iQTOh%k=u1#^%G%Eq2KCD1nt1OxTwt!rKPPYLU4s#H;
zyl9yb=^A(czKV^5_$+=;pQQymr8x`aRBcsY^2gC;ecdK4+9snWP2!jZ$|EK=+x?^A
z@bJJy9|G<c=@rK<&RZO~rOAesbReV)?j^-kD=(#q@?hv4%1q^!E4!$;lq;<yA@*ul
zT#|I6)zv&xLd6t{&9fE_7KeJeY-<nOtQmgO9#2`V^=S7;=fC$Ke*SuWhYx+oX4XRh
z>yR_*j@XK4kIIh;h-VV0i}GA=J$mr*<~x7p^Eaxum_ssvW*KL<&h2OoJ+*pQTr@4%
zL?Bdl18j{f#AW~BTf4te+q}QyWvHEos$CNmEV59Wx|o2pTHb?=kAHRevMvx16GnT4
z0b{w=pw*%sF+y+9e#LZc?gQ2=UU-g03=<QHaF9OYpSEt=(>YV`jD5USke#t>*3`(p
z&hgg4kDf#sSN*;3Rnx0w+yULdn#*r*Ms{vAu#RqmdE*1lb$#W2RYMLP&Lmlp!1^jT
zj6Pzq!olEhc+hVmY2xHZSj2jt3EL{LX}iD2ki2#9Pk0n_>(wgoNk!3;4Y*czNd-{U
zM51mfV(G<bz$LN+dfqFvsK=mRoB8^~25bSfZ>`Q9)@)2<3K20(pOcJ97Vki9T8+*f
zL_@fFQ$~dqu)=O2lA%hg<KV4{s74Dw+Uw0>n~KIhc8h1oEazGq%zoUgHp$aEXWdgX
zYX|f^?3qPW%^DSul}ek+^*8s!(y4iqB!33ftOI13q}KnM4Z}3@J8nlYXJuaI`(bq>
z+$AdJAez-n8Q`0b)D!X*3dAC3@xrKk{wKfr{cCrBt$L}^V>^Ww>QmPkerx(#BQCxi
zwS={uR$tO=Kht@>@RR@j_nyD^S1OmAhg4Ng3r^Y=?TZ;bM#I!)7zn$8NI6!CsMT;3
z4aJAB8U^$4VdH~e`FiW8{-PhuB+h!bg7}(qNz;Z!a20thBGLQ7g^&LG4`1K=`vQI{
z6%r2OhS6!kUTb7t=cq}z7Gu0BqrK79VSDr$nA1Z_)!*S+4;KVzq#sVZ7>hiP&rL&g
zL6ugFS>fI`51m=wCfw)etV2QEf<m7O#U8SvRQv%~-GHNBA9V+9dP8x(bv`;Xw+y@c
zy}jYV|G;8~6nrKUF~veX{};V4{tjXS>vb7+^_e|1(Z@P_0mV(X+I0Z2Ib7!%9<rw6
zFo1ST95s))X@m?^f*NBiU7pR&h5-NG@bO<;CS9s%-HivoW?aUg&N8MN6-{CprW4!s
zK@V<OT(h`*f%GQn(Id0c)^2x){T2`Ys^q23P9D)vnF*}#_3v(z?_}lZl)@=+q6Zr6
zRv!LO8p>)252Vr<gD!iy7X+JWrSyEU_UJoc|Dhf*|M2kQr~miNfKQnReLHc`y^A0J
z#s^n_|KI-px9<OU_2+7j85JGyJrDT~hYa}--E3ut9jAI(IrcAo_M1;xmS!eLc~(0j
z&;Q#8SHAlv-u>2t|F&|q^0?6$k*E3*3<eyvmPo-#*X!Npu+gp6xM{LJ>gw6354-C;
z4D{fpnOKDLZZ?KTyKk)B-C2L{Pu4c??RX+CRQ^c=Wr4OoF-TMYhL5*){;T(1zyH_a
z>AH-SX)d9oVA*z`<yyvw(W-_`p8kH_M65ct;%X$HcCp8pn+_?+gS2dgah|^U^iCp9
zp3k>@sV6tz3^&H?UwL@GNhi1_ntT2A60X|aw@Wx{x%(Z9@4WI#we{#xweiA1wek3<
zdT;G<?c*=@>#SvF#MG~UG3Yg#qgLZ!&}Sjdu+i%eT9wAI$%eqzYrlWx&8_O@pAv)O
zamHrZ1qUF;I6t|L4nH1z{2zb*hiZ2f30E!m;EtKEtb=j={zY`I5*S?EYz_th;JJiz
z6)moYt{ybjYrEWpJv`{u4`Cc01EH`C4dfxsK565;(dH|^f8ot@m90N17GRtnOcRQ9
zB{J=!+Wz*t-+uTvG%Rd1hTXQw@ap}IdZV|_F-z;!X8%H^Iaq6};{c?ibR9H$wZo%c
z?FgC7<3Sgmzgd6O?>2jk2M!0^aWN!q^eLBrw|C{G+V!`PlP0G-in&V|<Z%&Br1C-S
z{$Kg=Pal3?v*_`JpK*l<=fCp3wQpS<Ui#w`0kIh8KkLfE_@j?nxBu(i*IJLXF+r}Z
z_f~OKzwz#cf2lQGW7$M1ttqGDpEyhYMBYLj3Zwyqhl5K0{?X{@gU>hi-#z$RoqQl`
zMV`ilFrp_Ii)2Dro3$iigRiy=Aw)q#oG=NZgFZ*~Z+w62mz#suH{$YQPQa>fY^SjK
zciEkUit{V_gX&<H=fUBq`@y}nz3)GIrTIwW1%Q@^k)T8k)Z4%uRQqc%3MRU%hZR-Y
zd!QY*qNM|pG<5C3=t_KC>(Yj}x3O1e6<r@QEXYs2d-<Q;IJo@B;jYgsOkN3~2j}j6
z=ac?tf8q0=?R_pzT5URX4z%q)Ydz|<UX3=?tkwJNTC=}dXFNJO99$c=2Ny52hrPqi
zp~<H|TOU=}*J0eWM*7KC@ng%TJDzGYSl-<xuj^xLVBz*DP@4rM><%S*;@(N|I`%gW
ztOeBadovCYn-PO>xE@;)U#V6A>wkFeL2YmMacy($sCLlq)$Tv+B8_EgkviW4tXZAG
z`9g!{5kQR~AUv#f;QQ-%Xk-yu2f^p!O^sdvAYjp%9BMRbJmSm=fb>H0vB0@9{<06b
zZt~#9U~986X!je#7ZEe;Mm%VJV^}>n41l;-g}trx>PP$iMvtip14O`DKuvo@SfYwo
zr*A<Ftv^;oD{acY)^^$zThvUg-&VR*$zg^~W~Yh{H_|&tr_ru4u0WizwcZ?Ds<Z|I
z>5aA47{Q=Ng`@)sV7*J44k$BLps)p|ZXKLD5`neSCZ>XMCS?kb$B;nj(k<Oen+nI}
zV%iX7X{FQ{#e{A0v@Hi}`BS15-tq<w0k@Xsn9jSx$98(J=)ylKcyRgDH_{`PJotqU
z0&t~=Dy#c!cvn1jT(RuvXM)-M<0f79Mt6lj>NQl*(gm{0yG5@RG@ujlhPCR5H?&Ge
zOFealg*r5{&$=_j9SryNy;<%#)Qv#eWvkieCI!e&B&!>JEfA$jFb@nB>M&w7)n(#k
zxP%|_YqdyqN#YWf2Q-xL6=v7+=@m=0Qu)=l0U|gLhyDRwo2QtoCJSL{t0vGnF_f%o
zRB4lf=mDVD8ObrM8@3qTLCDVS(PTXN<@<68vA~)V==PZMvGxMHgU;wmlI1$Hj|~c@
z_VRbvUpe1g|EH+BUm?R>%09SvIP8D#N9%X~pQBfrjK&ZO61U=4yVe7n)zwJXnJ{)L
z_SfsJ{>9<p;Bccce5tZNxOBM2Enm!y-D!{dh+mDPUJ|73JFw7V;(K&t6S(QOtdE`W
zF}8?6T9)1x#~!Ab-o}jxg6g2@nNzvEdK>>Y3&L1$mDo%CaSicD>##f8YY#@fM}tvw
z9Yz(A5?7d1jz(S9GPP_+39{mf?ozCC4g9c+7`D>jMnzCb-8X_=RbVQZDPTb-g0kh=
zFvM1O(7H?{z}kC>D*!?`)*MK$1JXl=NShl$7F>hp-rMJlfDLe%LHdC%^kJ1?x7`|4
z4q#D<=#X?#VRWyNRcKl)TosLs#)dPkm}}`!d;kFelY$_oDmfE?Udfd<Wbl3D&1$!7
zq5=Ks6C{^Lz-AylWb7EWRY45-nq*n)$j@~`;{jQ%9gGH#iHRmrWq8S9HSiGl5l6$(
zt%ye?^cm_RSv7g0SK3C^7BH<24zC6%WT!$mC|D9O(bK5$@~(W62{ks#Sxa(seH7tn
z+C-~I<u8zRGij7r1r(Irfg2%|EUZ!nADZ^0A3?|nFcBs2KpfT)AVeS@qbso1fJ7-G
z7YgcW4-qW>D^SXWqW3U6Y{`(^lp_Wq)H%MY09m@eA%a#g2yPmY7=g%|F$Byduu2D?
z3RmZ-Ty@au5QQvAU4@6WCXYTgUKvFiHo{kg4xYRM+)z{)^g1PGU`=Akb11Q-@5`h;
zeo-$tk0OVm4A?A4;wWlM43$~OXYjGfD|wdOmrX3>iE0Cj-EIKPRG|RSgF&k~9KZ=^
zDZsGNst+{ruFWQPD-mg-nsWaq<31G<^Exm}$SY_pT_*dWd8E}vWVAs8rQz0Y|IE?5
z)%xLk@%Pn=4j3(^MvS>JI#h=~b4&d;tEOX+UI+izYYaEn_J@6D4Zd>J93EY$k3OMM
zyb0!19!1=AQcjC-(h8!La1(QO9k~Sc7InwX^XmH0W52UGYWWQnLMY9DUQOew<##G)
z4OjinD~H@xj`%*}s#_QMO7{=yN9}&?p>S25^#Q{qIBSVt)$^Ljfx3efpw<VCYJfDO
zeJVcPeF8Yfy;4c2QnpT-Z8fR9yRjyGuMN&KEYbqF26E|(h!+IX13>ybfOs)EUF$(t
zOSdbP$NSxybJh<SX+5qmk`gm@)T%#%vsRiw7TP1w!pR24GpQz#Hl@pzj;7I?ZB_oJ
zI1Z%{fleKOUc)=hn$Dv>I0q+vVT8y7bQLG9&SMzwrh;It*RR$#2G#w;ZtW1xS|X4=
zL^JHnq9zaOdlX9F9<YFN66`5m;^=6Q#z_ktz08zG2T+}9B5<)$iNWHy!dZu?ghK=L
z0gLqk1f<;73i2vbqUGGW%&{`MIdF8p8Wp+Obii00gVLDV<0r%y;)xq_9M3%F36M?#
z(Hj`IFL$d;+B3>Gvm*o&j#^wZg`}OSfQLbdtz&OvFMr}DRnvUfFVcO`U1fd*vM>zf
z6M|~!Do25~anc~4bmFs-i}G#X4PDr59afUgRcUd4)lsV^Do^TYSRxyC@LC5I@~Kr7
zbX*K|@kteGu~JDKG+7vE1(GJWZAmL-z#usV9<Y-9kE)M*`&4>1cX!nla}WXnVYN*h
z(m>GNqYc$KO^F#<5|Pv=m8sGNx9;s)9DS&YeVat&3N^-=^}ay5y3rV%uN=}yY1<6P
zx6ZYPDK`yJ_Yr#-H+>0_$9KZKStWPqlFE0Rr${z!Af4x?J9swLN%V2Maf=B(1I!8Y
zGT~{8#oM^iBLvk!(-Wy_t3c$<Ggl<Dww~+K+Ng5>o$9U1S5vOKi4=8D+$-I0;~|g(
zK967<n+ILE#+FSLQ-L*{g3}z;m=mZSQORjTScgiihN0yIRF4te_i&A#om($qVuVe#
z0dgxoH@$HINNX|t@DUP&1QgF#8lwkW{pu#91=ixM_aD)8LEp!!e((e=&;V<jti6JR
zKq!nPn>GkfkZ_zzSE^v6V8};p>K`?W3Ri_|rn19<w5s*N1{J&qC#}lW1Ed>khk!I&
z#7WnM<`s_B59$({NoU~pH#QK7h;^1?276D3>j9N59vw7AV;Caer!mmAQC18=4E)48
z8N-A>2W!$A8WqVGXt!YZ1lF>p%yn(9<y~My*Jqrsg3wDEi0GhJR;mPg=(vTB3IMk&
zs6YW7Ukl(^M<81PJMmW4)5=URHA#gQJAtmY8Gzq-djL$}96DwTD>5rnq`+7jMjTca
zf+Wd{46qX}Sz-ZFXFan79r~WN7Vp$5B(5x@WHE!P0PG{>VRU-rNr!6=0BNc<=*NDH
zCW0??jZUbYtOMl{NYgKH<Q&U(Ai@DK9M9uBUl2x8{h`Vs0M{xqEKpX*X>>(fz^wej
zz$?Eh3+=saG8RytHG<%quo_7nRD+4`nr+N#1JG-jweG(`gJ`02Dwyp*SnKO@yPy~v
z@U3arfH7PWl0K$hXv!_b&g?Zu_Cx*&)gu4eF=O>YH6c-acM62Erd{i=iIhbHZU!KT
zVE}2`bqvynG{!3z0qJIY*x#l4UqIvmNZ*KM(+Nn&BYlr=8-wGR+qqu6X4+jVHi`Jw
z_;qd*Un4CqwE+9*bA(QcsS~^=S{!Z`XDz=)U|snpT=ji%)s@PvM_;YpK~{|jq`J3u
zSZf~jt1hqZw}!Q~BPPt?;pmR*hb)KS!(!s2Y6wM(=mQkeJzXhS1B4QOv5$4ARU}$d
zxv^Fs9Km#+LnhrqCjC6)F#+_s&Gzu(USo6@BA1g{VbQA|^{NlVy`Jk=^PDxoYmX25
zb+HzeBWfpWfi$e+rqC+a{?s(w(*%m>NGV;6*TUHxq)p54*2IO-UN>0jqV?Kg<q1pf
z*2Ll0M%Mvi5HozdaP%$-4D_mS{CjjDwT*Mt&)}?&;H;Z)*4?8%<<+n6lO~p7v&;a_
zEh#fAuVJgoow=4S1K&W-eg()fH0V&oS;riqdovmWe3g9y90G5-`@1?bxASnW+xg!@
zY*Y(>5(&sG5K7IGEda;^1}nmO19ZL9*n{5?M&?y3fs|<asDczC77#G=?I;(S#X0lU
zF^6LXG|UgXS53Ze-&izSnn6LCv<_WmraHoC9N7u=Sfd<t<y&TzfiWMHuXx%pnm`Ar
zRR-#yR;jGxOuo7D7i8+zRfY~q<4?;w`6kaYOSg?A0ApWENd?f<VF9&7c56qh`EMgI
zL21R3r}v-@P$NM)1owN?Q&ynX9#KEFsg|IuqazAEm{lHerzGY}byG|3sNs^`vCt02
zi1!LBq-;b=3eLgowAK!W0_iq#>2=unElnVDT*aHuZ4E1c^et$`+_Zsoj+@@bPZ>zB
zikntN2A9+F;WdZ@WsovQz&gB@|GtgWTjkE?GK;g8CuKMf*6PUKd~<Ciux?d;09So|
z^eKL~4l6@}^*TbU3iG~9+>N@MR2*d1Of!!*dz}B#;5ynK^+&s603dkqw6QBb7D^j8
z3AB&eszB@uL+D3CgR`coT&*+hfb6#oNOu839V9*gr13lw1`d<6vR}Y_hsVTyk1CbT
zbCuykBw<}R|2kYO%RxtLq^S>sp{?jF91%xQV?b5~fb0q&$+2D0?Q;qqgGQ#jby8rx
z!R~O@jyGW~SeQ4gZ)zDJm5X)d8$IOZ$jSxML(*n6yp^))_6ipFwkR)>yW2acuCJ|E
zHj&62P%zZ-uxSUG2YplxvcrAS)uiFW`~$FI2r8N_9`8&VHAXo}wQ0irOH3m_0wL*A
znhfF<ak79FPMUWS5yz;GNss&(9cq|>N#Uft1C`q*Y?JKdcLN`uh86<#)C>cqNDRD5
zcSvghXc)bff>zRRC`pV)LfV)e9&w;DomOK+XJO?^9~b1$aLXKfp#7T0Ic{iU5@UE9
zh3Gpc0PUllb?OWv58IjuUr=RArurC0(14qco-b{{%&O4ZI-ImRJaLp7QAoU}YNR|{
z0$2E>GF68pk}3m6VqpSMoiz5twwBD2N6cE2ybegiQUizZC1NlPq+u|$8H)jMn<<ZV
zB*r7#+QoO?tc`4sIJDOQX!ag6`^RchD*uCizjmIs(oaD9G0i|S?ETQDtEx<17uIPr
zL-=fsQkdW|z^)O$23YG|i7*2vUpt4mgSI11y1&QioC!#4bKMSU&?rJ6Z7V$zZaTjd
zZyP@gfi(VO^)@eW#TF&zJV?u1hNHG{a{zThKdBs@@S13eTdFO^S;JKu0l@m!qa&8<
zU9W!1a=i>^z2B=nI!6zD(65QR?!#RV;AEL9t~T211{7V)qT{+iQ11fj7CpMy$~MDz
zEq`dO@d1$nyuim4C*4QXaS>6+0FZu80L@}}zn%EABR1rK)-^bN(Gz$5qc)q(w6G8P
z@WDZ^cK49Q8f#QG(xnP_1n?kCuPQC;h$6ZPx7ecMTbk6ENtZy72^m{AZb!VrO+PO#
zn(g#kCX)_g7^UqBX;X(0tE;?xL3(P4W+Y43#HY!uNz>!C&FT>=Rj9wU9^AFS6u#d;
zLFww!!D+2tFDbW}uFN_XQo0VQ63|HAsCR~@p_~aneqRf~jD=`QA#JfnCbNK8;O)x6
z-`}OD;Evh-YpbR;RN^#%2Ds!`?g6mFyX;n}d;}p5&O0arEI4V2l9Ya*B$KYP*-AiK
z;4I0LZTV*(Cz7dDZD2Zt4VMM1adl6}6(O_LeSRv}9%b6cPWkhZh(<jEY}q-XxZ`uX
zWp(3H^^Ftd`4uR08=iHn8dX_7Z96vYhx|&kA*Q3r8vZrfm$+wf&Jy}vr4H|jsiBSe
z1}&#A{Si`REqQ&+Y^x;7_h>hD%)4E5b!3!->T77rht#EzchyBn_*6HUa%aXKo%Sq%
z){@#Lb4|_e{;<tr1j(dz*jo(J6C#gGA0V3!3-a<nT`5^FUC2o*Qyu+CbzJ0;mT9mr
z`OR_D^0hQjzfIV;(s(+-lxV4SVptTcZCy1>^~NHQELb-$_Nw;|0mMf~wI*N<cg@1J
zVf7w>EnQ%J2uLb=X3o$zEhPeF81Qh=zK%}?5OwHN2B2HJql@&oS^%#tr2=R_sD-<c
zjgJ4+BEY@}IMxBjUBFR*ebDUH_H7D-N(L|<QrVP>Bhqt7`kaPzHDKvVpTJo+PN<S`
zrt~PD%pAf+OAI5w;_|O19KO<Miq7Ls)OomQ##X6VCj!Sznza7=KxtD0P}(Rn0fssg
z(K%`jtMnxk%D6!gN1$UjvFCgkSP)PgqMRJS-J3VAEbZ)@`*mFtO)?AYJ-m0k)~O_E
z*2)1769c^4x$dCj@3VAv^kkGSi*O5pk^suVLK9>*I^rAZn`(={pT(ju>%2=>9ds3H
zCS?j(A5d=ElEe%|b%SD2J&{O2`SuAn&%2FSAQI=>X|7WD{2CZ0`IT9DZugFo{01-<
zC@a5Om89bqd;^w)Gac7ROI*+ACcu^6hlmliYUz;}3+m=$p4!@O0BqXKQPQ4|D4%@(
z#MnHhPzBN#0Omo`wwrVg?cQT;{Ib;@YSY^7EOCb&QxVCfjb<`|2u{y^mWPGQPaev$
zV=l2FtvBvcs?P(|3&^R}OC(_38OIqJ$CfNvnXw_p{3dIl2^`!201|*nL_t)oWu67r
zcL7GN29exaVg~_sgT2;|c?8xHk02dMKdM&Aa}R;34S-NDI`3K^kz+w^um43VQV~G=
z{{P!a`0I)OX#$EhIu2RY4lh%&vVg6Mr<EZN+DTBZs2^82br!N0Fl#ut0oQR3IkY%?
ztu}FhzKfgW<O1l=6o4P+^6ga}2kM0cu#32BI5ta9Xbb=YT(&@4;RM{$T_I0T-_?1z
zy>vCi_+22QcL9%Nj<K7-CVrP$okMJ=1|Gk=A9WyR79b~>Zd|C*46fcWBwks*oQ>b@
zm(kTJ*$5&EoQf|vU)Iij0ifipgSxz21X^x(4pQ|ky|Fo>S2+iGC*@)5;K^GpDMJTu
zc|XKXc}<Fe4skM{-kHVZ=P~E=7>Cj6m3p@hnghyY)(Ar1OnFqtvz~Cys=K}kOZkq$
zc@zQks1;7B6Rii`9)|>kDe+zEr|Reh1MOi|oHl!8B=)GPoZ>pEu&S3j_+M=Z&2)(_
z`^~+yU5kr;4N=DsfYw@Rg^M|9y;qh5>0c-4!~|kT1YIr0O{-DNC;AZm`NbdRTR&+R
z(y^DqpM}915eSTRhO@3zzERQ6MHht#uwMk2#9=#VOP;(3aC;&I;4%x4rK?J8wJ<XY
zCvfHzT05;z9JKcP`&Lr_sJ2^40V8!AQH)*%+GT((j`lec<6O4<3%I4{l@2a<I{~y^
zv`PAOn7L14rZVye;Xb!dJwT*~Q+UB}K-&RZ&hg}@-eWFX?`jb0%;0wbjp8)QHQoiO
z_gEnpABUw;NjU(?EmrEd;&++V$YVSAlX9Ig;A82H*4-7>JB*mlam^06PRD>r9hVF!
z2P;p%w)3mQ^|ErHmR|vvbXNi;Hw&a?R{3v5;H`2{9^<@uXBg*QVPijfpH~&-F%Byr
z_IGtoGAqB9Px7n0%B<bHzP4YSvxBn%Gxhm$vuW+EQW4vcRa#o=6XFuvi2=Ka7b_!x
zTk28Lmcv{4)#SQNCf1;Q`^l)-+qG79s7>337Oj=u!LM&>QNUG#wCHv8BefVvTaW^7
zTK1Eo53`*;p=d<;c{}B*Wz*45s)d*A?<}yMm|WDsO+sr_EDCuIz}`s!`zyGyx&feu
zvrRx-{-4*+6lK6H_X2R1wFC6dj^48BhF<N5gT?{v3}7eexJ&0DuJ+#1#k4URcq^=w
zdK4)tuvC1*#4K>Ww#EcsiTd=ABNk8s?IL-)+$6)6t_ESt`Xa!Py#q+nK4fJ|9R34;
zN%e~rH7Fatx?L1dom1!p+;M(g9Y`MJ6*|+IB%OlnLuWDWq-B>^0+cf4af$ma^e470
zQ4Yj<&4aP;V$BcpHMij5rK>)~?<zxalT!W-@?}t#_Yi7@zXf@9F!oqtP?nto^CdWD
ztJeGs0cQcT=2Yb8j($p%+Kc8`+}X+}X(wWM+}?G+Is7j1Tx>qD5wYCVw#7lqEPz&9
z-odOTc(>5giNg~FX`+$JeD7d2<@cn3T2a1z%3!THwJGKnn_^^c92`_DH{fgmOo6s5
zfw#<A$+EkK4>*2{fLWG1d{lbf*uBWSL)<syz)umEEvH%n+%nHrFIvYTkw(lh2Vf4u
zm+%WE4A=4JG;b%OkL%Z6I3sTVFuCg@fOgDfE1WoO53fdHZNfVccUVZj4ETQz_zV80
ztKA$(<$VkM%T%UQkf*3)C<}9Jdt0O)sN?}ywhmGrkHAXidxltUTdZGB%KScJfY?X1
zpo}K+9tSu9bDUT2q%TArP7KO1$D9FX(D`aBh#izfc%wq4`svE&Tl~F9zXR;sT#_6i
z>hnqQXm|&w7@+0VR(DL9INZk1!Ye#F1TxjJ-?#aFYXP9vhc6O)h*%*<y@;GzM5IVm
zl|&_~6ZAw&EHj!oYgznK#y0m7$*kq#a%=Y$IP5p<)j|8U#8CiRx#2!%=sU%rte&?_
zc|5VZ#fim@8^P9rTW@3N3~nwi32$(}J~8MP=qVs$Htv2Wa-73>`>Htoam*8(wrJ2W
zylu?WFp8oT7Zj_QBZ}?ae8mjU`D>wmua^a^jHg^j62InwE)$Ly2hY6yJns{Do3ju|
zIUNnVi`12*WBnrOR15timW5>yXSOKtN!XR-GvqOdFfyP_8m{h6f^s~ca-3ua2Ii9t
z3AG<@FU~zXv!!-y>!UqH!bR)#J3RT-9oyI~57Gp#EFtnxuo7-sPK7`%hXv)-7NiiY
z<<c?d!k<M&AtK_Z?b#ttM)gg^BKK{ROg<6^@VtHgJ@X;+j#J)a`mYuEbMThajo3Z&
zg2PViI5rnqmvQ=~aY3$#+g2<wc<Vi{OmvdBobv9VU*_dbH;i&p_dLp{4#6<PIph0_
zqx02_g}nqIk<r0q($8va?o1ie$J}Hb+eCRpj#n4Sd=zfg#))ht7Wq8ITyha8XGVx$
zM54PfFEJ(Q0fxix*qe(d)qeQTjDn{Dv?x4PAgu(Q7Emj$lK^Yc&C9N3CzXPBcujua
zq??pX`+nMR1K*wTbfPZ~;6>nlq7mnaJ9yv7+3PiccW5P<wvu@n2Xs&$+Z3C8LbKR4
zYr9BCFsl>DQa-)67@$rs)+ZNJ5eUbri2=C+<9n?YfpX+A3%a*6V!X&(#<&x`<rx+M
zvsBD<1rdkN?U0N86autdw|SljCr!Kpsxq+$PURf+GU5*rlsav&4zZSjwp>B&W2$!!
z$DkjRvJPO0UciAorgdENJe|Tc;P&`q0CzjrOEBD>r|O?}!z8D9DwsG}1mLGebmqA7
z63BpWOg)l7lmW7PkAeAm`%Wq*a(CBv+<=}3<H)H}1kCQ9z2`6hwA_lgXxVS`92cZT
z2UVJ{;9T-Mg_~B0a?yvm&cFI2AN?|5EgG{#A@WnkUCT`zw)EN1Jllup%%k!kzASjp
z6W1(1`3_(jcspo|=8ai|Bll@Q?%q}g=ptAE>K@M@NIe3_lg$4t;GGtC49fDi3SbtU
zY2d6GLgS#<blAVtY=D-pZJs9z(n`c}fciLGwc;)XYdLoGQ>=~))=qVP(Do3E=;c6P
z2;3sQ1n0d-ii-Tkz&$T$JDnSDSW=$_=*I!`C6ja(Y(*uI2jVf=*&>XcvFE8Av%EPl
z%N&a|^q#5-fR@W_klw~u89<A|uk%c7W|2cjKdw4%SdNn>v^dLYVh=?youf7%%X8HV
zo&{^!bo3Kc#|@MEykM=6Hz$Kn*f?lUI83o9hvF%LrttE40G~!>9=8ncXI{!fJ8(|}
z?KpJIb;tIx`9}P*pm`RUJGn0_s22fVKCeZ7yj)IKpAEuA>Dh@ar-?G;Z7yI==t;aG
zmA%(+Hb5)PHqX-l(n`xLZdzVW9H<qER2Hy1W|#itUQ>Gv^8)tGIM4~0%Yc41n9ugH
zisa@yfqBF)4%&);Uf`aV)-q7PF)h#%ZUNjCFb`>E#IjHquRYI)7}Iu_qByej<Z~KL
zr}SmlcM3ANN?<nf3HL1XG=P?Se%YPuq_%mU7LcBYn^u}<1GV`&9#<_AQdzK;O-DaL
zb=)wi&jZ#9HBELsNp*ELc@SR?nu|h>xr30}B0uH%h{1bN;C8C30C1;O2ITI3!wqNp
zQ&R#vbEISz7{??Q;g~I41k8HRg0pPKZNyE>0<@@|mbgQ4nVKP+c5kN&)E;RTusd!Y
z^xSLgxCme?+|4-fDVy`)t>_nn+2ba7GPXs5J5E8&eaH50K21RPIM4LemcSx_J5S6p
zD9eATj5#JY6PV@MAvpx}w=#g1uWg>CxM&6L=*Lw@4Cg{S4n1UEpO>3fxcPwEe6EJ8
z_QYnvTDBc`${5F%!89*edpL2~ZocV;C#)BN_;Hgo3CnqklRl0E+<EH$J`K=U3FaQ(
znf~NUAP>k&(OjS`k4pfvg3SZY^0&=14WQ+xl#7;QM?X>>`&|`C8?iaLY5AQSsE@k>
z#1dBUlLhQf)<^C&c3c#&<FGM!$M*A>Z_eZC3Hr%*0+aCUiJNqZfm^=P`N`DaVUMRz
z19MS61N7sS?{PvGfo>VSxxqLl5CQX~7{fg}4EuY~W7}!mvwUy!%mQfndlo=i>6{y=
z<$0NH<rZ#^pHjf?lm`}A%k`Jay_~2^9`J9TXl%<9kHLEqo}F&Fi+tok+(WsZVtHzC
zm*w?YfWAECFMr6TKy=l`5`nTvpCmAQ(zh|J4xmM~qo0+DJ48#MHETJZ{KaZ9pjJp&
z>zKeQ%~`M(<<6LVWE@)t({Z@#Jgrr{KkWcMA8>m~Ob2lH<$4*Qr}&*3Jj9v)OqT#)
zER|^Ch2KR%SpgT}nA3<7!#4V{0a~;=`f=59!_sS{oj^ukK;+@!76$5*5`lPvq-O!U
z6FcP!GVAoDIqYm|ir?}eUhHcz+nbAdpYR<6w;UIPW+yjas4^fIl?;YwUObL7{lrQj
zkF-QoV3mo!9E@XcG5p5%V_=>o#>j>mzilVRc>r2o=M!_tXGcFP<)V$CewF}f1zQ-X
zEf8qE+Ac;^Csiq6cP9PjZ5*^^|D;4C`81uzd%h#Md5lQ&0PdvbgJk#Z`eLD`0lHJn
z>(j7(7U+o9wD9@3^ga*GqHs@}-F$#ME!E{<?4e>G%L21#Z6^fh1!sAm3efV<(T}T+
z8Ni;Etn6^ArY{N73cD0gTfkESYsGaOz*cxyF?hS(Jo=Xb=pDds&XeH<{j3hq7X$MJ
zlX>QS;Sz}9b^gF{sN;aLV%$!mT?CkuAWsiKlb|ZkqH<}^hxDa^+5$f@uvY9H{ft#-
zY&;E99`v6zFn8cqS=~H^0xJUZlY!-vp*p>YVrZJ~^UL5`l-uJ1vdU#UDx772*@Hhd
z9CVVP<ASuv91EzuU`}#^F^wZJWVvfub`qCF%e`hDPv`Af1@Y4c@AzvJ0lB+B3F!5>
zpH;mGOqa>aDgd}B-tEZpIH2rg1kO^0hbRT738-)jFlF^(4v+H~;tnSveKkNWLZ`@G
zE8zlc>2K-BR437MT8VYe*Asco1Nw0jagtnp4B~M*Z^kcA$UF_?pHPx4+LHpgCz+>Z
z<K9jJt^$-j4Re9BJa;^V>%rnA0b1a698rg-)b*7CwG%u|?%LxNXpaF~wjFm`jlN=X
zt4Y*sDse|}k{}+ZqzKS&#vabhU)mDb&gE>Cpe)jJ1GA^2;|AA*#YqCRVp=sw8_gAQ
z=AxCV)8?){Vga_yS<rUZjvG!^Kc#4v&4h#ZX#sapI?uqos8pVAyX}(Xts0Cy8V6;)
zPZei)fLQMoznnBcTdXGms1RN~M;(>XlLBl{f&;hSi^1D{9!Kvi9(ai$i$^kl2nTP4
zc#;5~PjL~T$9`_cFVC=fo3!7YBmMGsQtG4tcb@b*C@&1iG4W3PBJ<edGyqy0;wnWQ
z%0aA76sSES0k+H|w|EBi81&=h&+Y&^vG>z8uOR9e#69s(6PSCN&h%%a1Xcpd%4(-5
zzhleO0B5D(qygG<c`88dky*w7?PnRV<GhraV^E(B<YiQrweL(1IKz2*;OVY;P(K6o
z>E-ohb#*ZI{2hx^7LkrqD$>V}0%s}O+^Im!X@Ruzbm~B@NL@W?(TJzxS=HkXA<jd2
z=g^70WzAEZvL283mIrfDI|KCNmFa1Q&V#Uhzn}i;)c|8>R!$~82%Jv~m_2o;3D9Yr
zCnWoJ`g7}Npgng{E$lG{^kNY2%tv!hZ}SnG&sPz!=R-aVKwkuK`Fx!A`>{FQWfR<)
z6|mTYKw0XvfjPv=?-K;eC(2Q$1&}kGfp)GyPUv+ufP2IpH_Wdu5oCViXFi|$5}5h@
zi#<GXFwPZhmG_gJB+Nxu`ubD?b)4EW(2h&v^vyAtEB0cJJfE&k-eUIq5<zAYJ@c`W
z5?Jcn6bEu3R=S=TXROGlsHX*-<0L-yK%Ge}s6C1;&dg6;37i_RKXp0(GAF1rSLR|6
zR)D7!h>J4wG=g)S&Swg!<Alq6#%<?I<k@`BgS&DuALssT=J#nybskuY()BEXZBhEC
z**)#x9H;%62I@E?GM@o=zC_O6&r0B|1iS>EC1Cb6yZ)sDYR^=eE+8*+n`VC|Zkbj(
zXKrUD@N|~Ivkc7n68!@O)cMSx^m|dqa0dD(UFv7_|Dct?mkE%|zTFv6mzB(y$Ug2c
z&N_-O(TDw#XC)r~J`GFco@8;K0ritC{iihUGhly8Kg=_pEC=2{=%BmIXFLPyWlHTV
z%)%uQgTDfwarO%r;i(32P|Zhr2D14QIi2@2pgx^)K8xk71kOs}tOS-Wf&U+h8+H|?
S9jHbC0000<MNUMnLSTa3_~?=V

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit100@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit100@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..27ca7f8b42323c180afdde976c771b045dd02aba
GIT binary patch
literal 66535
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
FV1mC)D$D=?

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit200@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit200@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..24ad926375e8c88df664bdd9555ddddc1a748be9
GIT binary patch
literal 82190
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
IM6N<$f=61fdH?_b

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit300@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit300@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..098561f980ddc8a17308c29a62a249fd2812e370
GIT binary patch
literal 92906
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
RcJTlJ002ovPDHLkV1lc8<eLBh

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit300g-0@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit300g-0@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e6501d1be7144a6bd5485e41362e9a5153ef81a
GIT binary patch
literal 56026
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit300g-1@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit300g-1@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f17b2b1e737a4d9b1c88247a738dadec3d9dfd1a
GIT binary patch
literal 57038
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
TRQtmr00000NkvXXu0mjf)2M9F

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit50@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/hit50@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1afec2f4a9f2de71763f24c53bf344b0f157d90d
GIT binary patch
literal 57215
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-bottom@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-bottom@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca590eaf08e65dc1ae40bce9f9f74e69c3a0f8a4
GIT binary patch
literal 1965
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
index 56564776b3..eaa50d1a61 100644
--- a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
@@ -1,6 +1,13 @@
 [General]
-Version: 2.4
+Version: 2.5
 
 [Mania]
 Keys: 4
-ColumnLineWidth: 3,1,3,1,1
\ No newline at end of file
+ColumnLineWidth: 3,1,3,1,1
+Hit0: mania/hit0
+Hit50: mania/hit50
+Hit100: mania/hit100
+Hit200: mania/hit200
+Hit300: mania/hit300
+Hit300g: mania/hit300g
+BottomStageImage: mania/stage-bottom
\ No newline at end of file

From b663c940aea1da0d66b8cea0c86637edaacf81d3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Jun 2020 23:46:46 +0900
Subject: [PATCH 03220/10326] Rename enum

---
 .../Visual/Ranking/TestSceneAccuracyHeatmap.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
index b605ddcc35..9f82287640 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
@@ -167,15 +167,15 @@ namespace osu.Game.Tests.Visual.Ranking
                     for (int c = 0; c < cols; c++)
                     {
                         Vector2 pos = new Vector2(c * point_size, r * point_size);
-                        HitType type = HitType.Hit;
+                        HitPointType pointType = HitPointType.Hit;
 
                         if (Vector2.Distance(pos, centre) > size * inner_portion / 2)
-                            type = HitType.Miss;
+                            pointType = HitPointType.Miss;
 
-                        allPoints.Add(new HitPoint(pos, type)
+                        allPoints.Add(new HitPoint(pos, pointType)
                         {
                             Size = new Vector2(point_size),
-                            Colour = type == HitType.Hit ? new Color4(102, 255, 204, 255) : new Color4(255, 102, 102, 255)
+                            Colour = pointType == HitPointType.Hit ? new Color4(102, 255, 204, 255) : new Color4(255, 102, 102, 255)
                         });
                     }
                 }
@@ -216,11 +216,11 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private class HitPoint : Circle
         {
-            private readonly HitType type;
+            private readonly HitPointType pointType;
 
-            public HitPoint(Vector2 position, HitType type)
+            public HitPoint(Vector2 position, HitPointType pointType)
             {
-                this.type = type;
+                this.pointType = pointType;
 
                 Position = position;
                 Alpha = 0;
@@ -230,12 +230,12 @@ namespace osu.Game.Tests.Visual.Ranking
             {
                 if (Alpha < 1)
                     Alpha += 0.1f;
-                else if (type == HitType.Hit)
+                else if (pointType == HitPointType.Hit)
                     Colour = ((Color4)Colour).Lighten(0.1f);
             }
         }
 
-        private enum HitType
+        private enum HitPointType
         {
             Hit,
             Miss

From 586e3d405c8d7863137b542b914b044ffbe4fde2 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Fri, 12 Jun 2020 22:48:18 +0800
Subject: [PATCH 03221/10326] add proper decoding support?

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

diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index a988bd589f..cbd6aa17dc 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -111,11 +111,11 @@ namespace osu.Game.Skinning
                         HandleColours(currentConfig, line);
                         break;
 
+                    // Custom sprite paths
                     case string _ when pair.Key.StartsWith("NoteImage"):
-                        currentConfig.ImageLookups[pair.Key] = pair.Value;
-                        break;
-
                     case string _ when pair.Key.StartsWith("KeyImage"):
+                    case string _ when pair.Key.StartsWith("Hit"):
+                    case "BottomStageImage":
                         currentConfig.ImageLookups[pair.Key] = pair.Value;
                         break;
                 }

From 7def6a91812670529b671b5e89abf243d8a8c30b Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Fri, 12 Jun 2020 23:06:19 +0800
Subject: [PATCH 03222/10326] fix tests incorrectly showing judgements not
 present in mania

---
 .../Skinning/TestSceneDrawableJudgement.cs       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
index 497b80950a..540bf82e1f 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -16,14 +17,17 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
     {
         public TestSceneDrawableJudgement()
         {
+            var HitWindows = new ManiaHitWindows();
+
             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)
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    }));
+                if (HitWindows.IsHitResultAllowed(result))
+                    AddStep("Show " + result.GetDescription(), () => SetContents(() =>
+                        new DrawableManiaJudgement(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        }));
             }
         }
     }

From c6e087b9947aa46a8bed3abe3928ebd1d2a0ba04 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Fri, 12 Jun 2020 23:11:50 +0800
Subject: [PATCH 03223/10326] remove incorrectly added key

---
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index cbd6aa17dc..0806676fde 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -115,7 +115,6 @@ namespace osu.Game.Skinning
                     case string _ when pair.Key.StartsWith("NoteImage"):
                     case string _ when pair.Key.StartsWith("KeyImage"):
                     case string _ when pair.Key.StartsWith("Hit"):
-                    case "BottomStageImage":
                         currentConfig.ImageLookups[pair.Key] = pair.Value;
                         break;
                 }

From da46288ef09489d5d98a163f5ada7e292aed091b Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Fri, 12 Jun 2020 23:20:04 +0800
Subject: [PATCH 03224/10326] remove stage bottom image

---
 .../special-skin/mania/stage-bottom@2x.png       | Bin 1965 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-bottom@2x.png

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-bottom@2x.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-bottom@2x.png
deleted file mode 100644
index ca590eaf08e65dc1ae40bce9f9f74e69c3a0f8a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1965
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


From a42bfcb5aba1910cc975fed0d420864917d9069f Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Fri, 12 Jun 2020 23:23:57 +0800
Subject: [PATCH 03225/10326] remove reference to stage bottom from skin ini

---
 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
index eaa50d1a61..941abac1da 100644
--- a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
@@ -9,5 +9,4 @@ Hit50: mania/hit50
 Hit100: mania/hit100
 Hit200: mania/hit200
 Hit300: mania/hit300
-Hit300g: mania/hit300g
-BottomStageImage: mania/stage-bottom
\ No newline at end of file
+Hit300g: mania/hit300g
\ No newline at end of file

From 2feaf2c74a9e6ccdff263a597157abf483180229 Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Fri, 12 Jun 2020 19:17:52 +0200
Subject: [PATCH 03226/10326] added music during pause

---
 osu.Game/Screens/Play/Player.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 83991ad027..e37cf9a348 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -78,6 +78,8 @@ namespace osu.Game.Screens.Play
         private IAPIProvider api { get; set; }
 
         private SampleChannel sampleRestart;
+        
+        private SampleChannel samplePause;
 
         public BreakOverlay BreakOverlay;
 
@@ -161,6 +163,9 @@ namespace osu.Game.Screens.Play
                 return;
 
             sampleRestart = audio.Samples.Get(@"Gameplay/restart");
+            
+            samplePause = audio.Samples.Get(@"Gameplay/pause-loop");
+            samplePause.Looping = true;
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
@@ -407,7 +412,11 @@ namespace osu.Game.Screens.Play
             if (canPause)
                 Pause();
             else
+            {
+                samplePause?.Stop();
+                Logger.LogPrint(@"_______sample stopped in performUserRequestedExit");
                 this.Exit();
+            }
         }
 
         /// <summary>
@@ -416,6 +425,8 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public void Restart()
         {
+            Logger.LogPrint(@"_______sample stopped in Restart");
+            samplePause?.Stop();
             sampleRestart?.Play();
             RestartRequested?.Invoke();
 
@@ -564,6 +575,8 @@ namespace osu.Game.Screens.Play
             GameplayClockContainer.Stop();
             PauseOverlay.Show();
             lastPauseActionTime = GameplayClockContainer.GameplayClock.CurrentTime;
+
+            samplePause?.Play();
         }
 
         public void Resume()
@@ -583,6 +596,8 @@ namespace osu.Game.Screens.Play
             {
                 GameplayClockContainer.Start();
                 IsResuming = false;
+                Logger.LogPrint(@"_______sample stopped in Resume");
+                samplePause?.Stop();
             }
         }
 

From aa476835e7b657b414093fb3dcf6b19c3d935d9d Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 13 Jun 2020 11:31:34 +0800
Subject: [PATCH 03227/10326] tidy up code

---
 .../Skinning/TestSceneDrawableJudgement.cs    |  6 ++-
 .../Skinning/ManiaLegacySkinTransformer.cs    | 40 +++++++++----------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
index 540bf82e1f..a4d4ec50f8 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
@@ -17,17 +17,19 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
     {
         public TestSceneDrawableJudgement()
         {
-            var HitWindows = new ManiaHitWindows();
+            var hitWindows = new ManiaHitWindows();
 
             foreach (HitResult result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
             {
-                if (HitWindows.IsHitResultAllowed(result))
+                if (hitWindows.IsHitResultAllowed(result))
+                {
                     AddStep("Show " + result.GetDescription(), () => SetContents(() =>
                         new DrawableManiaJudgement(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         }));
+                }
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 9ba544ed59..3304330233 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -24,31 +24,31 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// Mapping of <see cref="HitResult"/> to ther corresponding
         /// <see cref="LegacyManiaSkinConfigurationLookups"/> value.
         /// </summary>
-        private static readonly IReadOnlyDictionary<HitResult, LegacyManiaSkinConfigurationLookups> componentMapping
+        private static readonly IReadOnlyDictionary<HitResult, LegacyManiaSkinConfigurationLookups> hitresult_mapping
             = new Dictionary<HitResult, LegacyManiaSkinConfigurationLookups>
-        {
-            { HitResult.Perfect, LegacyManiaSkinConfigurationLookups.Hit300g },
-            { HitResult.Great, LegacyManiaSkinConfigurationLookups.Hit300 },
-            { HitResult.Good, LegacyManiaSkinConfigurationLookups.Hit200 },
-            { HitResult.Ok, LegacyManiaSkinConfigurationLookups.Hit100 },
-            { HitResult.Meh, LegacyManiaSkinConfigurationLookups.Hit50 },
-            { HitResult.Miss, LegacyManiaSkinConfigurationLookups.Hit0 }
-        };
+            {
+                { HitResult.Perfect, LegacyManiaSkinConfigurationLookups.Hit300g },
+                { HitResult.Great, LegacyManiaSkinConfigurationLookups.Hit300 },
+                { HitResult.Good, LegacyManiaSkinConfigurationLookups.Hit200 },
+                { HitResult.Ok, LegacyManiaSkinConfigurationLookups.Hit100 },
+                { HitResult.Meh, LegacyManiaSkinConfigurationLookups.Hit50 },
+                { HitResult.Miss, LegacyManiaSkinConfigurationLookups.Hit0 }
+            };
 
         /// <summary>
         /// Mapping of <see cref="HitResult"/> to their corresponding
         /// default filenames.
         /// </summary>
-        private static readonly IReadOnlyDictionary<HitResult, string> defaultName
+        private static readonly IReadOnlyDictionary<HitResult, string> default_hitresult_skin_filenames
             = new Dictionary<HitResult, string>
-        {
-            { HitResult.Perfect, "mania-hit300g" },
-            { HitResult.Great, "mania-hit300" },
-            { HitResult.Good, "mania-hit200" },
-            { HitResult.Ok, "mania-hit100" },
-            { HitResult.Meh, "mania-hit50" },
-            { HitResult.Miss, "mania-hit0" }
-        };
+            {
+                { HitResult.Perfect, "mania-hit300g" },
+                { HitResult.Great, "mania-hit300" },
+                { HitResult.Good, "mania-hit200" },
+                { HitResult.Ok, "mania-hit100" },
+                { HitResult.Meh, "mania-hit50" },
+                { HitResult.Miss, "mania-hit0" }
+            };
 
         private Lazy<bool> isLegacySkin;
 
@@ -129,8 +129,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private Drawable getResult(HitResult result)
         {
             string image = GetConfig<ManiaSkinConfigurationLookup, string>(
-                new ManiaSkinConfigurationLookup(componentMapping[result])
-            )?.Value ?? defaultName[result];
+                new ManiaSkinConfigurationLookup(hitresult_mapping[result])
+            )?.Value ?? default_hitresult_skin_filenames[result];
 
             return this.GetAnimation(image, true, true);
         }

From 7212ab3a1afe56a5ae0654811d8ce535cf1e24c6 Mon Sep 17 00:00:00 2001
From: clayton <me@clayton.cc>
Date: Fri, 12 Jun 2020 23:48:30 -0700
Subject: [PATCH 03228/10326] Add new beatmap genres and languages

---
 osu.Game/Overlays/BeatmapListing/SearchGenre.cs    |  6 +++++-
 osu.Game/Overlays/BeatmapListing/SearchLanguage.cs | 12 +++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/SearchGenre.cs b/osu.Game/Overlays/BeatmapListing/SearchGenre.cs
index b12bba6249..de437fac3e 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchGenre.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchGenre.cs
@@ -20,6 +20,10 @@ namespace osu.Game.Overlays.BeatmapListing
 
         [Description("Hip Hop")]
         HipHop = 9,
-        Electronic = 10
+        Electronic = 10,
+        Metal = 11,
+        Classical = 12,
+        Folk = 13,
+        Jazz = 14
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
index dac7e4f1a2..ef7576344a 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.BeatmapListing
         [Order(0)]
         Any,
 
-        [Order(11)]
+        [Order(13)]
         Other,
 
         [Order(1)]
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.BeatmapListing
         [Order(2)]
         Chinese,
 
-        [Order(10)]
+        [Order(12)]
         Instrumental,
 
         [Order(7)]
@@ -42,6 +42,12 @@ namespace osu.Game.Overlays.BeatmapListing
         Spanish,
 
         [Order(5)]
-        Italian
+        Italian,
+
+        [Order(10)]
+        Russian,
+
+        [Order(11)]
+        Polish
     }
 }

From 9d98adee1e0b0b806f4d678e3310a5fb3cc3edc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Jun 2020 16:10:41 +0900
Subject: [PATCH 03229/10326] Update fastlane to fix upload failure for iOS
 releases

---
 Gemfile.lock | 72 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 27 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e3954c2681..bf971d2c22 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,6 +5,22 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.329.0)
+    aws-sdk-core (3.99.2)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.34.1)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.68.1)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.4)
+      aws-eventstream (~> 1.0, >= 1.0.2)
     babosa (1.0.3)
     claide (1.0.3)
     colored (1.2)
@@ -13,23 +29,24 @@ GEM
       highline (~> 1.7.2)
     declarative (0.0.10)
     declarative-option (0.1.0)
-    digest-crc (0.4.1)
+    digest-crc (0.5.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.5)
     emoji_regex (1.0.1)
-    excon (0.71.1)
-    faraday (0.17.3)
+    excon (0.74.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
     fastimage (2.1.7)
-    fastlane (2.140.0)
+    fastlane (2.149.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
+      aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.2, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
       colored
@@ -37,12 +54,12 @@ GEM
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 2.0)
       excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 0.17)
+      faraday (>= 0.17, < 2.0)
       faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 0.13.1)
+      faraday_middleware (>= 0.13.1, < 2.0)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.29.2, < 0.37.0)
+      google-api-client (>= 0.37.0, < 0.39.0)
       google-cloud-storage (>= 1.15.0, < 2.0.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
@@ -69,7 +86,7 @@ GEM
       souyuz (= 0.9.1)
     fastlane-plugin-xamarin (0.6.3)
     gh_inspector (1.1.3)
-    google-api-client (0.36.4)
+    google-api-client (0.38.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
@@ -80,27 +97,28 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.0)
-      faraday (~> 0.11)
-    google-cloud-errors (1.0.0)
-    google-cloud-storage (1.25.1)
+    google-cloud-env (1.3.2)
+      faraday (>= 0.17.3, < 2.0)
+    google-cloud-errors (1.0.1)
+    google-cloud-storage (1.26.2)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.10.0)
-      faraday (~> 0.12)
+    googleauth (0.12.0)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.12)
+      signet (~> 0.14)
     highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
+    jmespath (1.4.0)
     json (2.3.0)
     jwt (2.1.0)
     memoist (0.16.2)
@@ -114,7 +132,7 @@ GEM
     naturally (2.2.0)
     nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
-    os (1.0.1)
+    os (1.1.0)
     plist (3.5.0)
     public_suffix (2.0.5)
     representable (3.0.4)
@@ -125,12 +143,12 @@ GEM
     rouge (2.0.7)
     rubyzip (1.3.0)
     security (0.1.3)
-    signet (0.12.0)
+    signet (0.14.0)
       addressable (~> 2.3)
-      faraday (~> 0.9)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.7)
+    simctl (1.6.8)
       CFPropertyList
       naturally
     slack-notifier (2.3.2)
@@ -141,17 +159,17 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tty-cursor (0.7.0)
-    tty-screen (0.7.0)
-    tty-spinner (0.9.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.0)
+    tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.6.1)
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.14.0)
+    xcodeproj (1.16.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

From 7bc70e644a56a76b9d2be063262e6de378853bc3 Mon Sep 17 00:00:00 2001
From: clayton <me@clayton.cc>
Date: Sat, 13 Jun 2020 00:20:34 -0700
Subject: [PATCH 03230/10326] Add Unspecified language

---
 osu.Game/Overlays/BeatmapListing/SearchLanguage.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
index ef7576344a..43f16059e9 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
@@ -48,6 +48,9 @@ namespace osu.Game.Overlays.BeatmapListing
         Russian,
 
         [Order(11)]
-        Polish
+        Polish,
+
+        [Order(14)]
+        Unspecified
     }
 }

From 6fd8548f79a772d90b08cefd4e508d32d92d3c5f Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Sat, 13 Jun 2020 10:13:41 +0200
Subject: [PATCH 03231/10326] no longer crash if the restart sample isn't found

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e37cf9a348..4025bbd442 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.Play
             sampleRestart = audio.Samples.Get(@"Gameplay/restart");
             
             samplePause = audio.Samples.Get(@"Gameplay/pause-loop");
-            samplePause.Looping = true;
+            if(samplePause != null) { samplePause.Looping = true; } 
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 

From 8b8f2dfda2ebfad979ce7fa148d824a80db7b418 Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Sat, 13 Jun 2020 10:31:54 +0200
Subject: [PATCH 03232/10326] Removed duplicate samplepause.stop() calls,
 removed test lines Since restart() always call perform immediate exit when
 the function lead to a restart, there is no need to stop the pause sample in
 restart

---
 osu.Game/Screens/Play/Player.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4025bbd442..f9e18db581 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -414,7 +414,6 @@ namespace osu.Game.Screens.Play
             else
             {
                 samplePause?.Stop();
-                Logger.LogPrint(@"_______sample stopped in performUserRequestedExit");
                 this.Exit();
             }
         }
@@ -425,8 +424,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public void Restart()
         {
-            Logger.LogPrint(@"_______sample stopped in Restart");
-            samplePause?.Stop();
             sampleRestart?.Play();
             RestartRequested?.Invoke();
 
@@ -596,7 +593,7 @@ namespace osu.Game.Screens.Play
             {
                 GameplayClockContainer.Start();
                 IsResuming = false;
-                Logger.LogPrint(@"_______sample stopped in Resume");
+
                 samplePause?.Stop();
             }
         }

From 794b8673e21b7ccc60e7bac938426c48e3a6abc9 Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Sat, 13 Jun 2020 10:56:02 +0200
Subject: [PATCH 03233/10326] formated using dotnet format

---
 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 f9e18db581..ce7bb60048 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Play
         private IAPIProvider api { get; set; }
 
         private SampleChannel sampleRestart;
-        
+
         private SampleChannel samplePause;
 
         public BreakOverlay BreakOverlay;
@@ -163,9 +163,9 @@ namespace osu.Game.Screens.Play
                 return;
 
             sampleRestart = audio.Samples.Get(@"Gameplay/restart");
-            
+
             samplePause = audio.Samples.Get(@"Gameplay/pause-loop");
-            if(samplePause != null) { samplePause.Looping = true; } 
+            if (samplePause != null) { samplePause.Looping = true; }
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 

From c490dba7b3e0e22202ab861e0132a5779d818f0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Jun 2020 18:18:46 +0900
Subject: [PATCH 03234/10326] Fix crash on local score display

---
 osu.Game/Scoring/ScoreStore.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Scoring/ScoreStore.cs b/osu.Game/Scoring/ScoreStore.cs
index 9627481f4d..f5c5cd5dad 100644
--- a/osu.Game/Scoring/ScoreStore.cs
+++ b/osu.Game/Scoring/ScoreStore.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Scoring
         protected override IQueryable<ScoreInfo> AddIncludesForConsumption(IQueryable<ScoreInfo> query)
             => base.AddIncludesForConsumption(query)
                    .Include(s => s.Beatmap)
+                   .Include(s => s.Beatmap).ThenInclude(b => b.Metadata)
+                   .Include(s => s.Beatmap).ThenInclude(b => b.BeatmapSet).ThenInclude(s => s.Metadata)
                    .Include(s => s.Ruleset);
     }
 }

From 9230c148c7f68ea6908568d72052ca7e165678e2 Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Sat, 13 Jun 2020 12:18:50 +0200
Subject: [PATCH 03235/10326] Add cursor rotation on middle mouse button

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

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 8305f33e25..ff28dddd40 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Graphics.Cursor
             activeCursor.ScaleTo(0.6f, 250, Easing.In);
         }
 
-        private bool shouldKeepRotating(MouseEvent e) => cursorRotate.Value && (e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Right));
+        private bool shouldKeepRotating(MouseEvent e) => cursorRotate.Value && (anyMainButtonPressed(e));
 
         private static bool anyMainButtonPressed(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Middle) || e.IsPressed(MouseButton.Right);
 

From 619c541cf559f546c5718673c4acf279f98ce320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 12:41:00 +0200
Subject: [PATCH 03236/10326] Rewrite test to use dummy API

---
 .../Online/TestSceneCommentsContainer.cs      | 117 +++++++++++++-----
 1 file changed, 89 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 42e6b9087c..26ad0b0d3f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -1,52 +1,113 @@
 // Copyright (c) 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.Online.API.Requests;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics;
-using osu.Game.Overlays.Comments;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Game.Users;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays.Comments;
 
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
     public class TestSceneCommentsContainer : OsuTestScene
     {
-        protected override bool UseOnlineAPI => true;
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        public TestSceneCommentsContainer()
-        {
-            BasicScrollContainer scroll;
-            TestCommentsContainer comments;
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
 
-            Add(scroll = new BasicScrollContainer
+        private CommentsContainer commentsContainer;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+            Child = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = comments = new TestCommentsContainer()
+                Child = commentsContainer = new CommentsContainer()
             });
 
-            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", comments.User.TriggerChange);
-            AddStep("Idle state", () =>
-            {
-                scroll.Clear();
-                scroll.Add(comments = new TestCommentsContainer());
-            });
-        }
-
-        private class TestCommentsContainer : CommentsContainer
+        [Test]
+        public void TestIdleState()
         {
-            public new Bindable<User> User => base.User;
+            AddUntilStep("loading spinner shown",
+                () => commentsContainer.ChildrenOfType<CommentsShowMoreButton>().Single().IsLoading);
         }
+
+        [Test]
+        public void TestSingleCommentsPage()
+        {
+            setUpCommentsResponse(exampleComments);
+            AddStep("show comments", () => commentsContainer.ShowComments(CommentableType.Beatmapset, 123));
+            AddUntilStep("show more button hidden",
+                () => commentsContainer.ChildrenOfType<CommentsShowMoreButton>().Single().Alpha == 0);
+        }
+
+        [Test]
+        public void TestMultipleCommentPages()
+        {
+            var comments = exampleComments;
+            comments.HasMore = true;
+            comments.TopLevelCount = 10;
+
+            setUpCommentsResponse(comments);
+            AddStep("show comments", () => commentsContainer.ShowComments(CommentableType.Beatmapset, 123));
+            AddUntilStep("show more button visible",
+                () => commentsContainer.ChildrenOfType<CommentsShowMoreButton>().Single().Alpha == 1);
+        }
+
+        private void setUpCommentsResponse(CommentBundle commentBundle)
+            => AddStep("set up response", () =>
+            {
+                dummyAPI.HandleRequest = request =>
+                {
+                    if (!(request is GetCommentsRequest getCommentsRequest))
+                        return;
+
+                    getCommentsRequest.TriggerSuccess(commentBundle);
+                };
+            });
+
+        private CommentBundle exampleComments => new CommentBundle
+        {
+            Comments = new List<Comment>
+            {
+                new Comment
+                {
+                    Id = 1,
+                    Message = "This is a comment",
+                    LegacyName = "FirstUser",
+                    CreatedAt = DateTimeOffset.Now,
+                    VotesCount = 19,
+                    RepliesCount = 1
+                },
+                new Comment
+                {
+                    Id = 5,
+                    ParentId = 1,
+                    Message = "This is a child comment",
+                    LegacyName = "SecondUser",
+                    CreatedAt = DateTimeOffset.Now,
+                    VotesCount = 4,
+                },
+                new Comment
+                {
+                    Id = 10,
+                    Message = "This is another comment",
+                    LegacyName = "ThirdUser",
+                    CreatedAt = DateTimeOffset.Now,
+                    VotesCount = 0
+                },
+            },
+            IncludedComments = new List<Comment>(),
+        };
     }
 }

From 5655e090d1e1102aea9c82b461ffec7402538c65 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 13 Jun 2020 18:45:06 +0800
Subject: [PATCH 03237/10326] revert movement of is mania skin check statements

---
 .../Skinning/ManiaLegacySkinTransformer.cs                   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 3304330233..f386712222 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -78,8 +78,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         public Drawable GetDrawableComponent(ISkinComponent component)
         {
-            if (!isLegacySkin.Value || !hasKeyTexture.Value)
-                return null;
 
             switch (component)
             {
@@ -87,6 +85,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     return getResult(resultComponent.Component);
 
                 case ManiaSkinComponent maniaComponent:
+                    if (!isLegacySkin.Value || !hasKeyTexture.Value)
+                        return null;
+
                     switch (maniaComponent.Component)
                     {
                         case ManiaSkinComponents.ColumnBackground:

From 4eeb22ca18e4598ab693c7beb0fd5309188f8ee8 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 13 Jun 2020 18:47:40 +0800
Subject: [PATCH 03238/10326] rename a few variables and fix typo

---
 .../Skinning/ManiaLegacySkinTransformer.cs                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index f386712222..07d0ce66e2 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private readonly ManiaBeatmap beatmap;
 
         /// <summary>
-        /// Mapping of <see cref="HitResult"/> to ther corresponding
+        /// Mapping of <see cref="HitResult"/> to their corresponding
         /// <see cref="LegacyManiaSkinConfigurationLookups"/> value.
         /// </summary>
         private static readonly IReadOnlyDictionary<HitResult, LegacyManiaSkinConfigurationLookups> hitresult_mapping
@@ -129,11 +129,11 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         private Drawable getResult(HitResult result)
         {
-            string image = GetConfig<ManiaSkinConfigurationLookup, string>(
+            string filename = GetConfig<ManiaSkinConfigurationLookup, string>(
                 new ManiaSkinConfigurationLookup(hitresult_mapping[result])
             )?.Value ?? default_hitresult_skin_filenames[result];
 
-            return this.GetAnimation(image, true, true);
+            return this.GetAnimation(filename, true, true);
         }
 
         public Texture GetTexture(string componentName) => source.GetTexture(componentName);

From e8046654c8da91496a72c341e8f2f68bd4be66da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 12:48:16 +0200
Subject: [PATCH 03239/10326] Add failing test case

---
 .../Visual/Online/TestSceneCommentsContainer.cs   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 26ad0b0d3f..08130e60db 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -64,6 +64,21 @@ namespace osu.Game.Tests.Visual.Online
                 () => commentsContainer.ChildrenOfType<CommentsShowMoreButton>().Single().Alpha == 1);
         }
 
+        [Test]
+        public void TestMultipleLoads()
+        {
+            var comments = exampleComments;
+            int topLevelCommentCount = exampleComments.Comments.Count(comment => comment.IsTopLevel);
+
+            AddStep("hide container", () => commentsContainer.Hide());
+            setUpCommentsResponse(comments);
+            AddRepeatStep("show comments multiple times",
+                () => commentsContainer.ShowComments(CommentableType.Beatmapset, 456), 2);
+            AddStep("show container", () => commentsContainer.Show());
+            AddUntilStep("comment count is correct",
+                () => commentsContainer.ChildrenOfType<DrawableComment>().Count() == topLevelCommentCount);
+        }
+
         private void setUpCommentsResponse(CommentBundle commentBundle)
             => AddStep("set up response", () =>
             {

From aab606b237953d1d9844fd36245fe8b7e42fca08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 13:00:05 +0200
Subject: [PATCH 03240/10326] Cancel scheduled asynchronous load of comments

---
 osu.Game/Overlays/Comments/CommentsContainer.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index e7bfeaf968..f71808ba89 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.Framework.Threading;
 using osu.Game.Users;
 
 namespace osu.Game.Overlays.Comments
@@ -30,6 +31,7 @@ namespace osu.Game.Overlays.Comments
         private IAPIProvider api { get; set; }
 
         private GetCommentsRequest request;
+        private ScheduledDelegate scheduledCommentsLoad;
         private CancellationTokenSource loadCancellation;
         private int currentPage;
 
@@ -152,8 +154,9 @@ namespace osu.Game.Overlays.Comments
 
             request?.Cancel();
             loadCancellation?.Cancel();
+            scheduledCommentsLoad?.Cancel();
             request = new GetCommentsRequest(id.Value, type.Value, Sort.Value, currentPage++, 0);
-            request.Success += res => Schedule(() => onSuccess(res));
+            request.Success += res => scheduledCommentsLoad = Schedule(() => onSuccess(res));
             api.PerformAsync(request);
         }
 

From 8402d4a5f3c2e2cac8e9b5c4948a961f0e5d1b50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Jun 2020 21:18:56 +0900
Subject: [PATCH 03241/10326] Remove newline

---
 osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 07d0ce66e2..74a983fac8 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -78,7 +78,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         public Drawable GetDrawableComponent(ISkinComponent component)
         {
-
             switch (component)
             {
                 case GameplaySkinComponent<HitResult> resultComponent:

From b9e247da8f3d4eeccf3448bda6d0c4554666cd55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Jun 2020 21:19:06 +0900
Subject: [PATCH 03242/10326] Simplify lookup code

---
 osu.Game/Skinning/LegacySkin.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 390dc871e4..0b2b723440 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -259,22 +259,12 @@ namespace osu.Game.Skinning
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnLineWidth[maniaLookup.TargetColumn.Value + 1]));
 
                 case LegacyManiaSkinConfigurationLookups.Hit0:
-                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit0"));
-
                 case LegacyManiaSkinConfigurationLookups.Hit50:
-                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit50"));
-
                 case LegacyManiaSkinConfigurationLookups.Hit100:
-                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit100"));
-
                 case LegacyManiaSkinConfigurationLookups.Hit200:
-                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit200"));
-
                 case LegacyManiaSkinConfigurationLookups.Hit300:
-                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit300"));
-
                 case LegacyManiaSkinConfigurationLookups.Hit300g:
-                    return SkinUtils.As<TValue>(getManiaImage(existing, "Hit300g"));
+                    return SkinUtils.As<TValue>(getManiaImage(existing, maniaLookup.Lookup.ToString()));
             }
 
             return null;

From 04c1efe298681c82da4b2342b9d0bb78e432d2ff Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Sat, 13 Jun 2020 14:33:55 +0200
Subject: [PATCH 03243/10326] resolved issues with inspect code script

---
 osu.Game/Screens/Play/Player.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ce7bb60048..d5e9c54e04 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -165,7 +165,8 @@ namespace osu.Game.Screens.Play
             sampleRestart = audio.Samples.Get(@"Gameplay/restart");
 
             samplePause = audio.Samples.Get(@"Gameplay/pause-loop");
-            if (samplePause != null) { samplePause.Looping = true; }
+            if (samplePause != null)
+                samplePause.Looping = true;
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 

From 1cd96b80021c39e82e091808a89ac15c2426fc36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 15:05:52 +0200
Subject: [PATCH 03244/10326] Rework StableInfo into a DI'd data structure

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs       | 48 ++++---------------
 osu.Game.Tournament/Models/StableInfo.cs      | 43 ++++++++++++++++-
 osu.Game.Tournament/Screens/SetupScreen.cs    | 14 ++----
 .../Screens/StablePathSelectScreen.cs         | 20 ++++----
 osu.Game.Tournament/TournamentGameBase.cs     |  2 +
 5 files changed, 67 insertions(+), 60 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 16f2b0b1fd..a9b39c7ba2 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -5,7 +5,6 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;
-using Newtonsoft.Json;
 using Microsoft.Win32;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
@@ -34,14 +33,13 @@ namespace osu.Game.Tournament.IPC
         [Resolved]
         private LadderInfo ladder { get; set; }
 
+        [Resolved]
+        private StableInfo stableInfo { get; set; }
+
         private int lastBeatmapId;
         private ScheduledDelegate scheduled;
         private GetBeatmapRequest beatmapLookupRequest;
 
-        public StableInfo StableInfo { get; private set; }
-
-        public const string STABLE_CONFIG = "tournament/stable.json";
-
         public Storage IPCStorage { get; private set; }
 
         [Resolved]
@@ -165,8 +163,8 @@ namespace osu.Game.Tournament.IPC
 
         private string findStablePath()
         {
-            if (!string.IsNullOrEmpty(readStableConfig()))
-                return StableInfo.StablePath.Value;
+            if (!string.IsNullOrEmpty(stableInfo.StablePath))
+                return stableInfo.StablePath;
 
             string stableInstallPath = string.Empty;
 
@@ -204,43 +202,13 @@ namespace osu.Game.Tournament.IPC
             if (!ipcFileExistsInDirectory(path))
                 return false;
 
-            StableInfo.StablePath.Value = path;
-
-            using (var stream = tournamentStorage.GetStream(STABLE_CONFIG, FileAccess.Write, FileMode.Create))
-            using (var sw = new StreamWriter(stream))
-            {
-                sw.Write(JsonConvert.SerializeObject(StableInfo,
-                    new JsonSerializerSettings
-                    {
-                        Formatting = Formatting.Indented,
-                        NullValueHandling = NullValueHandling.Ignore,
-                        DefaultValueHandling = DefaultValueHandling.Ignore,
-                    }));
-            }
-
+            stableInfo.StablePath = path;
             LocateStableStorage();
+            stableInfo.SaveChanges();
+
             return true;
         }
 
-        private string readStableConfig()
-        {
-            if (StableInfo == null)
-                StableInfo = new StableInfo();
-
-            if (tournamentStorage.Exists(FileBasedIPC.STABLE_CONFIG))
-            {
-                using (Stream stream = tournamentStorage.GetStream(FileBasedIPC.STABLE_CONFIG, FileAccess.Read, FileMode.Open))
-                using (var sr = new StreamReader(stream))
-                {
-                    StableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());
-                }
-
-                return StableInfo.StablePath.Value;
-            }
-
-            return null;
-        }
-
         private string findFromEnvVar()
         {
             try
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 4818842151..1faf6beaff 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -2,7 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Bindables;
+using System.IO;
+using Newtonsoft.Json;
+using osu.Framework.Platform;
 
 namespace osu.Game.Tournament.Models
 {
@@ -12,6 +14,43 @@ namespace osu.Game.Tournament.Models
     [Serializable]
     public class StableInfo
     {
-        public Bindable<string> StablePath = new Bindable<string>(string.Empty);
+        public string StablePath { get; set; }
+
+        public event Action OnStableInfoSaved;
+
+        private const string config_path = "tournament/stable.json";
+
+        private readonly Storage storage;
+
+        public StableInfo(Storage storage)
+        {
+            this.storage = storage;
+
+            if (!storage.Exists(config_path))
+                return;
+
+            using (Stream stream = storage.GetStream(config_path, FileAccess.Read, FileMode.Open))
+            using (var sr = new StreamReader(stream))
+            {
+                JsonConvert.PopulateObject(sr.ReadToEnd(), this);
+            }
+        }
+
+        public void SaveChanges()
+        {
+            using (var stream = storage.GetStream(config_path, FileAccess.Write, FileMode.Create))
+            using (var sw = new StreamWriter(stream))
+            {
+                sw.Write(JsonConvert.SerializeObject(this,
+                    new JsonSerializerSettings
+                    {
+                        Formatting = Formatting.Indented,
+                        NullValueHandling = NullValueHandling.Ignore,
+                        DefaultValueHandling = DefaultValueHandling.Ignore,
+                    }));
+            }
+
+            OnStableInfoSaved?.Invoke();
+        }
     }
 }
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 503a2487da..98bc292901 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -31,6 +31,9 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private MatchIPCInfo ipc { get; set; }
 
+        [Resolved]
+        private StableInfo stableInfo { get; set; }
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -57,6 +60,7 @@ namespace osu.Game.Tournament.Screens
             };
 
             api.LocalUser.BindValueChanged(_ => Schedule(reload));
+            stableInfo.OnStableInfoSaved += () => Schedule(reload);
             reload();
         }
 
@@ -66,21 +70,13 @@ namespace osu.Game.Tournament.Screens
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
-            StableInfo stableInfo = fileBasedIpc?.StableInfo;
             fillFlow.Children = new Drawable[]
             {
                 new ActionableInfo
                 {
                     Label = "Current IPC source",
                     ButtonText = "Change source",
-                    Action = () =>
-                    {
-                        stableInfo?.StablePath.BindValueChanged(_ =>
-                        {
-                            Schedule(reload);
-                        });
-                        sceneManager?.SetScreen(new StablePathSelectScreen());
-                    },
+                    Action = () => sceneManager?.SetScreen(new StablePathSelectScreen()),
                     Value = fileBasedIpc?.IPCStorage?.GetFullPath(string.Empty) ?? "Not found",
                     Failing = fileBasedIpc?.IPCStorage == null,
                     Description = "The osu!stable installation which is currently being used as a data source. If a source is not found, make sure you have created an empty ipc.txt in your stable cutting-edge installation."
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index ad0c06e4f9..816f0ed4b8 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -15,34 +15,36 @@ using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 using osuTK;
 
 namespace osu.Game.Tournament.Screens
 {
     public class StablePathSelectScreen : TournamentScreen
     {
-        private DirectorySelector directorySelector;
-
         [Resolved]
-        private MatchIPCInfo ipc { get; set; }
-
-        private DialogOverlay overlay;
+        private GameHost host { get; set; }
 
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
         [Resolved]
-        private GameHost host { get; set; }
+        private MatchIPCInfo ipc { get; set; }
+
+        [Resolved]
+        private StableInfo stableInfo { get; set; }
+
+        private DirectorySelector directorySelector;
+        private DialogOverlay overlay;
 
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuColour colours)
         {
-            var fileBasedIpc = ipc as FileBasedIPC;
             var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
 
-            if (!string.IsNullOrEmpty(fileBasedIpc?.StableInfo.StablePath.Value))
+            if (!string.IsNullOrEmpty(stableInfo.StablePath))
             {
-                initialPath = new DirectoryInfo(host.GetStorage(fileBasedIpc.StableInfo.StablePath.Value).GetFullPath(string.Empty)).Parent?.FullName;
+                initialPath = new DirectoryInfo(host.GetStorage(stableInfo.StablePath).GetFullPath(string.Empty)).Parent?.FullName;
             }
 
             AddRangeInternal(new Drawable[]
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 718c8ee644..5fc1d03f6d 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -53,6 +53,8 @@ namespace osu.Game.Tournament
 
             ladder.CurrentMatch.Value = ladder.Matches.FirstOrDefault(p => p.Current.Value);
 
+            dependencies.CacheAs(new StableInfo(storage));
+
             dependencies.CacheAs<MatchIPCInfo>(ipc = new FileBasedIPC());
             Add(ipc);
         }

From 586d5791e029d2de9a779fdbf9d9c12af3cfab28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 15:07:21 +0200
Subject: [PATCH 03245/10326] Remove unused argument

---
 .../Screens/TestSceneStablePathSelectScreen.cs                | 3 +--
 osu.Game.Tournament/Screens/StablePathSelectScreen.cs         | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
index ce0626dd0f..6e63b2d799 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Tournament.Screens;
-using osu.Framework.Platform;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
@@ -15,7 +14,7 @@ namespace osu.Game.Tournament.Tests.Screens
 
         private class StablePathSelectTestScreen : StablePathSelectScreen
         {
-            protected override void ChangePath(Storage storage)
+            protected override void ChangePath()
             {
                 Expire();
             }
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 816f0ed4b8..a830cbe4b9 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Tournament.Screens
                                                 Origin = Anchor.Centre,
                                                 Width = 300,
                                                 Text = "Select stable path",
-                                                Action = () => ChangePath(storage)
+                                                Action = ChangePath
                                             },
                                             new TriangleButton
                                             {
@@ -135,7 +135,7 @@ namespace osu.Game.Tournament.Screens
             });
         }
 
-        protected virtual void ChangePath(Storage storage)
+        protected virtual void ChangePath()
         {
             var target = directorySelector.CurrentDirectory.Value.FullName;
             var fileBasedIpc = ipc as FileBasedIPC;

From 992aa0041e3933dcf8ded8b9778cb76bc5c02ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 15:27:46 +0200
Subject: [PATCH 03246/10326] Allow auto-detect to work after choosing manually

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs       | 64 +++++++++++--------
 .../Screens/StablePathSelectScreen.cs         |  3 +-
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index a9b39c7ba2..01466231a6 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using Microsoft.Win32;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
@@ -21,6 +22,8 @@ namespace osu.Game.Tournament.IPC
 {
     public class FileBasedIPC : MatchIPCInfo
     {
+        public Storage IPCStorage { get; private set; }
+
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
@@ -36,22 +39,22 @@ namespace osu.Game.Tournament.IPC
         [Resolved]
         private StableInfo stableInfo { get; set; }
 
+        [Resolved]
+        private Storage tournamentStorage { get; set; }
+
         private int lastBeatmapId;
         private ScheduledDelegate scheduled;
         private GetBeatmapRequest beatmapLookupRequest;
 
-        public Storage IPCStorage { get; private set; }
-
-        [Resolved]
-        private Storage tournamentStorage { get; set; }
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            LocateStableStorage();
+            var stablePath = stableInfo.StablePath ?? findStablePath();
+            initialiseIPCStorage(stablePath);
         }
 
-        public Storage LocateStableStorage()
+        [CanBeNull]
+        private Storage initialiseIPCStorage(string path)
         {
             scheduled?.Cancel();
 
@@ -59,8 +62,6 @@ namespace osu.Game.Tournament.IPC
 
             try
             {
-                var path = findStablePath();
-
                 if (string.IsNullOrEmpty(path))
                     return null;
 
@@ -159,13 +160,37 @@ namespace osu.Game.Tournament.IPC
             return IPCStorage;
         }
 
+        public bool SetIPCLocation(string path)
+        {
+            if (!ipcFileExistsInDirectory(path))
+                return false;
+
+            var newStorage = initialiseIPCStorage(stableInfo.StablePath = path);
+            if (newStorage == null)
+                return false;
+
+            stableInfo.SaveChanges();
+            return true;
+        }
+
+        public bool AutoDetectIPCLocation()
+        {
+            var autoDetectedPath = findStablePath();
+            if (string.IsNullOrEmpty(autoDetectedPath))
+                return false;
+
+            var newStorage = initialiseIPCStorage(stableInfo.StablePath = autoDetectedPath);
+            if (newStorage == null)
+                return false;
+
+            stableInfo.SaveChanges();
+            return true;
+        }
+
         private static bool ipcFileExistsInDirectory(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
 
         private string findStablePath()
         {
-            if (!string.IsNullOrEmpty(stableInfo.StablePath))
-                return stableInfo.StablePath;
-
             string stableInstallPath = string.Empty;
 
             try
@@ -183,10 +208,7 @@ namespace osu.Game.Tournament.IPC
                     stableInstallPath = r.Invoke();
 
                     if (stableInstallPath != null)
-                    {
-                        SetIPCLocation(stableInstallPath);
                         return stableInstallPath;
-                    }
                 }
 
                 return null;
@@ -197,18 +219,6 @@ namespace osu.Game.Tournament.IPC
             }
         }
 
-        public bool SetIPCLocation(string path)
-        {
-            if (!ipcFileExistsInDirectory(path))
-                return false;
-
-            stableInfo.StablePath = path;
-            LocateStableStorage();
-            stableInfo.SaveChanges();
-
-            return true;
-        }
-
         private string findFromEnvVar()
         {
             try
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index a830cbe4b9..2a54dffc7c 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -156,9 +156,8 @@ namespace osu.Game.Tournament.Screens
         protected virtual void AutoDetect()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
-            fileBasedIpc?.LocateStableStorage();
 
-            if (fileBasedIpc?.IPCStorage == null)
+            if (!fileBasedIpc?.AutoDetectIPCLocation() ?? true)
             {
                 overlay = new DialogOverlay();
                 overlay.Push(new IPCErrorDialog("Failed to auto detect", "An osu! stable cutting-edge installation could not be auto detected.\nPlease try and manually point to the directory."));

From 34cd9f7a699d62dd339c9a18bb95fefeddab0de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 15:32:30 +0200
Subject: [PATCH 03247/10326] Streamline autodetect & manual set path

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 01466231a6..de9df3ca35 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Tournament.IPC
 
         public bool SetIPCLocation(string path)
         {
-            if (!ipcFileExistsInDirectory(path))
+            if (path == null || !ipcFileExistsInDirectory(path))
                 return false;
 
             var newStorage = initialiseIPCStorage(stableInfo.StablePath = path);
@@ -173,22 +173,11 @@ namespace osu.Game.Tournament.IPC
             return true;
         }
 
-        public bool AutoDetectIPCLocation()
-        {
-            var autoDetectedPath = findStablePath();
-            if (string.IsNullOrEmpty(autoDetectedPath))
-                return false;
-
-            var newStorage = initialiseIPCStorage(stableInfo.StablePath = autoDetectedPath);
-            if (newStorage == null)
-                return false;
-
-            stableInfo.SaveChanges();
-            return true;
-        }
+        public bool AutoDetectIPCLocation() => SetIPCLocation(findStablePath());
 
         private static bool ipcFileExistsInDirectory(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
 
+        [CanBeNull]
         private string findStablePath()
         {
             string stableInstallPath = string.Empty;

From e0518fd451ac9aebd3b4506ada28eb202e55cf25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 15:38:29 +0200
Subject: [PATCH 03248/10326] Fix silent failure

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

diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 2a54dffc7c..0b9900c0d4 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Tournament.Screens
             var fileBasedIpc = ipc as FileBasedIPC;
             Logger.Log($"Changing Stable CE location to {target}");
 
-            if (!fileBasedIpc?.SetIPCLocation(target) ?? false)
+            if (!fileBasedIpc?.SetIPCLocation(target) ?? true)
             {
                 overlay = new DialogOverlay();
                 overlay.Push(new IPCErrorDialog("This is an invalid IPC Directory", "Select a directory that contains an osu! stable cutting edge installation and make sure it has an empty ipc.txt file in it."));

From 5dd47bf393b5116b9077ef4aeea3942ca5a0d766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 16:01:00 +0200
Subject: [PATCH 03249/10326] Remove unnecessary members

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs               | 3 ---
 osu.Game.Tournament/Screens/StablePathSelectScreen.cs | 9 ---------
 2 files changed, 12 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index de9df3ca35..d52a2b6445 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -39,9 +39,6 @@ namespace osu.Game.Tournament.IPC
         [Resolved]
         private StableInfo stableInfo { get; set; }
 
-        [Resolved]
-        private Storage tournamentStorage { get; set; }
-
         private int lastBeatmapId;
         private ScheduledDelegate scheduled;
         private GetBeatmapRequest beatmapLookupRequest;
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 0b9900c0d4..958c3ef822 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -15,7 +15,6 @@ using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Components;
-using osu.Game.Tournament.Models;
 using osuTK;
 
 namespace osu.Game.Tournament.Screens
@@ -31,9 +30,6 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private MatchIPCInfo ipc { get; set; }
 
-        [Resolved]
-        private StableInfo stableInfo { get; set; }
-
         private DirectorySelector directorySelector;
         private DialogOverlay overlay;
 
@@ -42,11 +38,6 @@ namespace osu.Game.Tournament.Screens
         {
             var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
 
-            if (!string.IsNullOrEmpty(stableInfo.StablePath))
-            {
-                initialPath = new DirectoryInfo(host.GetStorage(stableInfo.StablePath).GetFullPath(string.Empty)).Parent?.FullName;
-            }
-
             AddRangeInternal(new Drawable[]
             {
                 new Container

From 201bfda3382931077cc8acc26082ce740004f123 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Sat, 13 Jun 2020 15:16:27 +0100
Subject: [PATCH 03250/10326] Give ModTimeRamp an adjust pitch setting.
 Implement in ModWindDown and ModWindUp

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 16 +++++++++++++++-
 osu.Game/Rulesets/Mods/ModWindDown.cs |  7 +++++++
 osu.Game/Rulesets/Mods/ModWindUp.cs   |  7 +++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index c1f3e357a1..a38aa2bac6 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The final speed to ramp to")]
         public abstract BindableNumber<double> FinalRate { get; }
 
+        [SettingSource("Adjust Pitch", "Should pitch be adjusted with speed")]
+        public abstract BindableBool AdjustPitch { get; }
+
         public override string SettingDescription => $"{InitialRate.Value:N2}x to {FinalRate.Value:N2}x";
 
         private double finalRateTime;
@@ -44,12 +47,15 @@ namespace osu.Game.Rulesets.Mods
         {
             // for preview purpose at song select. eventually we'll want to be able to update every frame.
             FinalRate.BindValueChanged(val => applyAdjustment(1), true);
+
+            AdjustPitch.BindValueChanged(updatePitchAdjustment, false);
         }
 
         public void ApplyToTrack(Track track)
         {
             this.track = track;
-            track.AddAdjustment(AdjustableProperty.Frequency, SpeedChange);
+
+            track.AddAdjustment(AdjustPitch.Value ? AdjustableProperty.Frequency : AdjustableProperty.Tempo, SpeedChange);
 
             FinalRate.TriggerChange();
         }
@@ -75,5 +81,13 @@ namespace osu.Game.Rulesets.Mods
         /// <param name="amount">The amount of adjustment to apply (from 0..1).</param>
         private void applyAdjustment(double amount) =>
             SpeedChange.Value = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
+
+        private void updatePitchAdjustment(ValueChangedEvent<bool> value)
+        {
+            // remove existing old adjustment
+            track.RemoveAdjustment(value.OldValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo, SpeedChange);
+
+            track.AddAdjustment(value.NewValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo, SpeedChange);
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index 5e634ac434..e46b4eff2e 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -37,6 +37,13 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
+        [SettingSource("Adjust Pitch", "Should pitch be adjusted with speed")]
+        public override BindableBool AdjustPitch { get; } = new BindableBool
+        {
+            Default = true,
+            Value = true
+        };
+
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindUp)).ToArray();
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 74c6fc22d3..02203a474d 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -37,6 +37,13 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
+        [SettingSource("Adjust Pitch", "Should pitch be adjusted with speed")]
+        public override BindableBool AdjustPitch { get; } = new BindableBool
+        {
+            Default = true,
+            Value = true
+        };
+
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindDown)).ToArray();
     }
 }

From 2cadab8d29a3e5f30fbc9676f1a23d3fdd6df682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 16:20:59 +0200
Subject: [PATCH 03251/10326] Add xmldoc

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs  | 10 ++++++++++
 osu.Game.Tournament/Models/StableInfo.cs |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index d52a2b6445..681839ebc4 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -157,6 +157,11 @@ namespace osu.Game.Tournament.IPC
             return IPCStorage;
         }
 
+        /// <summary>
+        /// Manually sets the path to the directory used for inter-process communication with a cutting-edge install.
+        /// </summary>
+        /// <param name="path">Path to the IPC directory</param>
+        /// <returns>Whether the supplied path was a valid IPC directory.</returns>
         public bool SetIPCLocation(string path)
         {
             if (path == null || !ipcFileExistsInDirectory(path))
@@ -170,6 +175,11 @@ namespace osu.Game.Tournament.IPC
             return true;
         }
 
+        /// <summary>
+        /// Tries to automatically detect the path to the directory used for inter-process communication
+        /// with a cutting-edge install.
+        /// </summary>
+        /// <returns>Whether an IPC directory was successfully auto-detected.</returns>
         public bool AutoDetectIPCLocation() => SetIPCLocation(findStablePath());
 
         private static bool ipcFileExistsInDirectory(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 1faf6beaff..0b0050a245 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -14,8 +14,14 @@ namespace osu.Game.Tournament.Models
     [Serializable]
     public class StableInfo
     {
+        /// <summary>
+        /// Path to the IPC directory used by the stable (cutting-edge) install.
+        /// </summary>
         public string StablePath { get; set; }
 
+        /// <summary>
+        /// Fired whenever stable info is successfully saved to file.
+        /// </summary>
         public event Action OnStableInfoSaved;
 
         private const string config_path = "tournament/stable.json";

From 308ec6a491a051e029e9fd3d2ee30fa03cd080bf Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 13 Jun 2020 23:05:57 +0800
Subject: [PATCH 03252/10326] add extension method for mania skin config
 retrieval

---
 .../Skinning/ManiaSkinConfigExtensions.cs     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs
new file mode 100644
index 0000000000..2e17a6bef1
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public static class ManiaSkinConfigExtensions
+    {
+        /// <summary>
+        /// Retrieve a per-column-count skin configuration.
+        /// </summary>
+        /// <param name="skin">The skin from which configuration is retrieved.</param>
+        /// <param name="lookup">The value to retrieve.</param>
+        /// <param name="index">If not null, denotes the index of the column to which the entry applies.</param>
+        public static IBindable<T> GetManiaSkinConfig<T>(this ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
+            => skin.GetConfig<ManiaSkinConfigurationLookup, T>(
+                new ManiaSkinConfigurationLookup(lookup, index));
+    }
+}

From bd7b7b50176c37cd799a560a060adf5a9f74daab Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 13 Jun 2020 23:06:25 +0800
Subject: [PATCH 03253/10326] make all former LegacyManiaElement subclasses use
 extension method

Remove LegacyManiaElement
---
 .../Skinning/LegacyHitTarget.cs               |  8 +++---
 .../Skinning/LegacyManiaColumnElement.cs      |  6 ++---
 .../Skinning/LegacyManiaElement.cs            | 25 -------------------
 .../Skinning/LegacyStageBackground.cs         |  7 +++---
 .../Skinning/LegacyStageForeground.cs         |  5 ++--
 5 files changed, 14 insertions(+), 37 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index 40752d3f4b..d055ef3480 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -14,7 +14,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyHitTarget : LegacyManiaElement
+    public class LegacyHitTarget : CompositeDrawable
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
@@ -28,13 +28,13 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string targetImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HitTargetImage)?.Value
+            string targetImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.HitTargetImage)?.Value
                                  ?? "mania-stage-hint";
 
-            bool showJudgementLine = GetManiaSkinConfig<bool>(skin, LegacyManiaSkinConfigurationLookups.ShowJudgementLine)?.Value
+            bool showJudgementLine = skin.GetManiaSkinConfig<bool>(LegacyManiaSkinConfigurationLookups.ShowJudgementLine)?.Value
                                      ?? true;
 
-            Color4 lineColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.JudgementLineColour)?.Value
+            Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.JudgementLineColour)?.Value
                                 ?? Color4.White;
 
             InternalChild = directionContainer = new Container
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
index 05b731ec5d..0c46a00bed 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
     /// <summary>
     /// A <see cref="CompositeDrawable"/> which is placed somewhere within a <see cref="Column"/>.
     /// </summary>
-    public class LegacyManiaColumnElement : LegacyManiaElement
+    public class LegacyManiaColumnElement : CompositeDrawable
     {
         [Resolved]
         protected Column Column { get; private set; }
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             }
         }
 
-        protected override IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
-            => base.GetManiaSkinConfig<T>(skin, lookup, index ?? Column.Index);
+        protected IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
+            => skin.GetManiaSkinConfig<T>(lookup, index ?? Column.Index);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.cs
deleted file mode 100644
index 11fdd663a1..0000000000
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaElement.cs
+++ /dev/null
@@ -1,25 +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.Game.Skinning;
-
-namespace osu.Game.Rulesets.Mania.Skinning
-{
-    /// <summary>
-    /// A mania legacy skin element.
-    /// </summary>
-    public class LegacyManiaElement : CompositeDrawable
-    {
-        /// <summary>
-        /// Retrieve a per-column-count skin configuration.
-        /// </summary>
-        /// <param name="skin">The skin from which configuration is retrieved.</param>
-        /// <param name="lookup">The value to retrieve.</param>
-        /// <param name="index">If not null, denotes the index of the column to which the entry applies.</param>
-        protected virtual IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
-            => skin.GetConfig<ManiaSkinConfigurationLookup, T>(
-                new ManiaSkinConfigurationLookup(lookup, index));
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
index f177284399..7f5de601ca 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
@@ -3,13 +3,14 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyStageBackground : LegacyManiaElement
+    public class LegacyStageBackground : CompositeDrawable
     {
         private Drawable leftSprite;
         private Drawable rightSprite;
@@ -22,10 +23,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
-            string leftImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.LeftStageImage)?.Value
+            string leftImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LeftStageImage)?.Value
                                ?? "mania-stage-left";
 
-            string rightImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.RightStageImage)?.Value
+            string rightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.RightStageImage)?.Value
                                 ?? "mania-stage-right";
 
             InternalChildren = new[]
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs
index 9719005d54..4609fcc849 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs
@@ -4,13 +4,14 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyStageForeground : LegacyManiaElement
+    public class LegacyStageForeground : CompositeDrawable
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
@@ -24,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string bottomImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.BottomStageImage)?.Value
+            string bottomImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.BottomStageImage)?.Value
                                  ?? "mania-stage-bottom";
 
             sprite = skin.GetAnimation(bottomImage, true, true)?.With(d =>

From ffae73a966c8afcc131c9de8b082e44950211487 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 13 Jun 2020 23:07:04 +0800
Subject: [PATCH 03254/10326] let retrievals outside mania skin components use
 extension

https://github.com/ppy/osu/pull/9264#discussion_r439730321
---
 .../Skinning/ManiaLegacySkinTransformer.cs                | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 74a983fac8..19a107eb0d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -71,8 +71,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         {
             isLegacySkin = new Lazy<bool>(() => source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
             hasKeyTexture = new Lazy<bool>(() => source.GetAnimation(
-                GetConfig<ManiaSkinConfigurationLookup, string>(
-                    new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value
+                this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage)?.Value
                 ?? "mania-key1", true, true) != null);
         }
 
@@ -128,9 +127,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         private Drawable getResult(HitResult result)
         {
-            string filename = GetConfig<ManiaSkinConfigurationLookup, string>(
-                new ManiaSkinConfigurationLookup(hitresult_mapping[result])
-            )?.Value ?? default_hitresult_skin_filenames[result];
+            string filename = this.GetManiaSkinConfig<string>(hitresult_mapping[result])?.Value
+                ?? default_hitresult_skin_filenames[result];
 
             return this.GetAnimation(filename, true, true);
         }

From 9a0a1ba0df10b87baa552e9d5869892d4cbfe3d9 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 13 Jun 2020 23:12:15 +0800
Subject: [PATCH 03255/10326] correct logic of hasKeyTexture determination

---
 osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 19a107eb0d..7a2fa711e3 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         {
             isLegacySkin = new Lazy<bool>(() => source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
             hasKeyTexture = new Lazy<bool>(() => source.GetAnimation(
-                this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage)?.Value
+                this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, 0)?.Value
                 ?? "mania-key1", true, true) != null);
         }
 

From eb92c3390d6b4299a2c23f0ade181ae8e4b575b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 17:17:58 +0200
Subject: [PATCH 03256/10326] Check for nulls when looking for ipc.txt

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

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 681839ebc4..a17491bf2d 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Tournament.IPC
         /// <returns>Whether an IPC directory was successfully auto-detected.</returns>
         public bool AutoDetectIPCLocation() => SetIPCLocation(findStablePath());
 
-        private static bool ipcFileExistsInDirectory(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
+        private static bool ipcFileExistsInDirectory(string p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
 
         [CanBeNull]
         private string findStablePath()

From 77eb428184473b09e0cb370adaf11e45e0b9ed9e Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Sat, 13 Jun 2020 16:30:21 +0100
Subject: [PATCH 03257/10326] Use consistent setting casing

---
 osu.Game/Rulesets/Mods/ModWindDown.cs | 2 +-
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index e46b4eff2e..679b50057b 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        [SettingSource("Adjust Pitch", "Should pitch be adjusted with speed")]
+        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
         public override BindableBool AdjustPitch { get; } = new BindableBool
         {
             Default = true,
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 02203a474d..b733bf423e 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        [SettingSource("Adjust Pitch", "Should pitch be adjusted with speed")]
+        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
         public override BindableBool AdjustPitch { get; } = new BindableBool
         {
             Default = true,

From dc5bb12fa8e9f6f47c14c57b8242b24f24aa37c3 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Sat, 13 Jun 2020 16:32:43 +0100
Subject: [PATCH 03258/10326] Use local helper for selecting adjusted property

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index a38aa2bac6..9f30f340fd 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The final speed to ramp to")]
         public abstract BindableNumber<double> FinalRate { get; }
 
-        [SettingSource("Adjust Pitch", "Should pitch be adjusted with speed")]
+        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
         public abstract BindableBool AdjustPitch { get; }
 
         public override string SettingDescription => $"{InitialRate.Value:N2}x to {FinalRate.Value:N2}x";
@@ -55,9 +55,8 @@ namespace osu.Game.Rulesets.Mods
         {
             this.track = track;
 
-            track.AddAdjustment(AdjustPitch.Value ? AdjustableProperty.Frequency : AdjustableProperty.Tempo, SpeedChange);
-
             FinalRate.TriggerChange();
+            AdjustPitch.TriggerChange();
         }
 
         public virtual void ApplyToBeatmap(IBeatmap beatmap)
@@ -85,9 +84,12 @@ namespace osu.Game.Rulesets.Mods
         private void updatePitchAdjustment(ValueChangedEvent<bool> value)
         {
             // remove existing old adjustment
-            track.RemoveAdjustment(value.OldValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo, SpeedChange);
+            track.RemoveAdjustment(adjustmentForPitchSetting(value.OldValue), SpeedChange);
 
-            track.AddAdjustment(value.NewValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo, SpeedChange);
+            track.AddAdjustment(adjustmentForPitchSetting(value.NewValue), SpeedChange);
         }
+
+        private AdjustableProperty adjustmentForPitchSetting(bool value)
+            => value ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
     }
 }

From 4bfc16b4ce73ad2a5ee48282ee5636896e48ae95 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 13 Jun 2020 17:48:15 +0200
Subject: [PATCH 03259/10326] Implement changes from review

Moves seeya back to the introscreen and uses a virtual string to change whenever it's needed and removed remainingTime()
---
 osu.Game/Screens/Menu/IntroScreen.cs  |  8 +++++---
 osu.Game/Screens/Menu/IntroWelcome.cs | 18 +++++++-----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 2f9d43bed6..88d18d0073 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -49,7 +49,9 @@ namespace osu.Game.Screens.Menu
 
         private const int exit_delay = 3000;
 
-        protected SampleChannel Seeya { get; set; }
+        private SampleChannel seeya;
+
+        protected virtual string SeeyaSampleName => "Intro/seeya";
 
         private LeasedBindable<WorkingBeatmap> beatmap;
 
@@ -72,7 +74,7 @@ namespace osu.Game.Screens.Menu
             MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
 
-            Seeya = audio.Samples.Get(@"Intro/seeya");
+            seeya = audio.Samples.Get(SeeyaSampleName);
 
             BeatmapSetInfo setInfo = null;
 
@@ -124,7 +126,7 @@ namespace osu.Game.Screens.Menu
             double fadeOutTime = exit_delay;
             // we also handle the exit transition.
             if (MenuVoice.Value)
-                Seeya.Play();
+                seeya.Play();
             else
                 fadeOutTime = 500;
 
diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index dec3af5ac9..a431752369 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -22,17 +22,15 @@ namespace osu.Game.Screens.Menu
         private const double delay_step_two = 2142;
         private SampleChannel welcome;
         private SampleChannel pianoReverb;
+        protected override string SeeyaSampleName => "Intro/Welcome/seeya";
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            Seeya = audio.Samples.Get(@"Intro/welcome/seeya");
-
             if (MenuVoice.Value)
-            {
-                welcome = audio.Samples.Get(@"Intro/welcome/welcome");
-                pianoReverb = audio.Samples.Get(@"Intro/welcome/welcome_piano");
-            }
+                welcome = audio.Samples.Get(@"Intro/Welcome/welcome");
+
+            pianoReverb = audio.Samples.Get(@"Intro/Welcome/welcome_piano");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -126,7 +124,7 @@ namespace osu.Game.Screens.Menu
                         Width = 750,
                         Height = 78,
                         Alpha = 0,
-                        Texture = textures.Get(@"Welcome/welcome_text@2x")
+                        Texture = textures.Get(@"Welcome/welcome_text")
                     },
                 };
             }
@@ -135,13 +133,11 @@ namespace osu.Game.Screens.Menu
             {
                 base.LoadComplete();
 
-                double remainingTime() => delay_step_two - TransformDelay;
-
                 using (BeginDelayedSequence(0, true))
                 {
                     welcomeText.ResizeHeightTo(welcomeText.Height * 2, 500, Easing.In);
-                    welcomeText.FadeIn(remainingTime());
-                    welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.1f), remainingTime(), Easing.Out).OnComplete(_ => Expire());
+                    welcomeText.FadeIn(delay_step_two);
+                    welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.1f), delay_step_two, Easing.Out).OnComplete(_ => Expire());
                 }
             }
         }

From 51bbd91373a54b7cfbd24151d97345e4d193cfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 13 Jun 2020 19:28:21 +0200
Subject: [PATCH 03260/10326] Bring back initial directory behaviour

---
 osu.Game.Tournament/Screens/StablePathSelectScreen.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 958c3ef822..b4d56f60c7 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -36,7 +36,8 @@ namespace osu.Game.Tournament.Screens
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuColour colours)
         {
-            var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
+            var initialStorage = (ipc as FileBasedIPC)?.IPCStorage ?? storage;
+            var initialPath = new DirectoryInfo(initialStorage.GetFullPath(string.Empty)).Parent?.FullName;
 
             AddRangeInternal(new Drawable[]
             {

From 7b95c55afb17429a8eb1b253c62767c11f3792c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 14 Jun 2020 11:33:59 +0900
Subject: [PATCH 03261/10326] Fix HardwareCorrectionOffsetClock breaking
 ElapsedTime readings

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 2f85d6ad1e..fe1d22e987 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -251,8 +251,9 @@ namespace osu.Game.Screens.Play
 
         private class HardwareCorrectionOffsetClock : FramedOffsetClock
         {
-            // we always want to apply the same real-time offset, so it should be adjusted by the playback rate to achieve this.
-            public override double CurrentTime => SourceTime + Offset * Rate;
+            // we always want to apply the same real-time offset, so it should be adjusted by the difference in playback rate (from realtime) to achieve this.
+            // base implementation already adds offset at 1.0 rate, so we only add the difference from that here.
+            public override double CurrentTime => base.CurrentTime + Offset * (1 - Rate);
 
             public HardwareCorrectionOffsetClock(IClock source, bool processSource = true)
                 : base(source, processSource)

From 1164a1048330211410a9f050176bf868c56a023d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 14 Jun 2020 11:34:07 +0900
Subject: [PATCH 03262/10326] Add test coverage

---
 .../TestSceneGameplayClockContainer.cs        | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs

diff --git a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
new file mode 100644
index 0000000000..a97566ba7b
--- /dev/null
+++ b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.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 System;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Gameplay
+{
+    public class TestSceneGameplayClockContainer : OsuTestScene
+    {
+        [Test]
+        public void TestStartThenElapsedTime()
+        {
+            GameplayClockContainer gcc = null;
+
+            AddStep("create container", () => Add(gcc = new GameplayClockContainer(CreateWorkingBeatmap(new OsuRuleset().RulesetInfo), Array.Empty<Mod>(), 0)));
+            AddStep("start track", () => gcc.Start());
+            AddUntilStep("elapsed greater than zero", () => gcc.GameplayClock.ElapsedFrameTime > 0);
+        }
+    }
+}

From abe07b742ebb16190fe0a4601f1fbbc8094748c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 14 Jun 2020 13:20:58 +0900
Subject: [PATCH 03263/10326] Fix drag scroll in editor timeline no longer
 working correctly

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 2 --
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs       | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index d07cffff0c..cc417bbb10 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -44,8 +44,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
-
         [Resolved(canBeNull: true)]
         private IPositionSnapProvider snapProvider { get; set; }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 0b5d8262fd..e1f311f1b8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
@@ -26,6 +27,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private readonly Container<PlacementBlueprint> placementBlueprintContainer;
 
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
         private InputManager inputManager;
 
         private readonly IEnumerable<DrawableHitObject> drawableHitObjects;

From 0d53d0ffc8f361576a60ebda3ae1e5dece2c6144 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 00:46:20 +0900
Subject: [PATCH 03264/10326] Fix back-to-front math

---
 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 fe1d22e987..0653373c91 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -253,7 +253,7 @@ namespace osu.Game.Screens.Play
         {
             // we always want to apply the same real-time offset, so it should be adjusted by the difference in playback rate (from realtime) to achieve this.
             // base implementation already adds offset at 1.0 rate, so we only add the difference from that here.
-            public override double CurrentTime => base.CurrentTime + Offset * (1 - Rate);
+            public override double CurrentTime => base.CurrentTime + Offset * (Rate - 1);
 
             public HardwareCorrectionOffsetClock(IClock source, bool processSource = true)
                 : base(source, processSource)

From 9907b4763bb76963eee9d652640559f07e5fce1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 14 Jun 2020 18:39:41 +0200
Subject: [PATCH 03265/10326] Remove redundant default argument value

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

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 9f30f340fd..09c50ce115 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Mods
             // for preview purpose at song select. eventually we'll want to be able to update every frame.
             FinalRate.BindValueChanged(val => applyAdjustment(1), true);
 
-            AdjustPitch.BindValueChanged(updatePitchAdjustment, false);
+            AdjustPitch.BindValueChanged(updatePitchAdjustment);
         }
 
         public void ApplyToTrack(Track track)

From 5f0a345eebd0410364a79b69aa0465490b48712a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 14 Jun 2020 18:48:49 +0200
Subject: [PATCH 03266/10326] Unify method naming

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 09c50ce115..edca3edf46 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -46,9 +46,8 @@ namespace osu.Game.Rulesets.Mods
         protected ModTimeRamp()
         {
             // for preview purpose at song select. eventually we'll want to be able to update every frame.
-            FinalRate.BindValueChanged(val => applyAdjustment(1), true);
-
-            AdjustPitch.BindValueChanged(updatePitchAdjustment);
+            FinalRate.BindValueChanged(val => applyRateAdjustment(1), true);
+            AdjustPitch.BindValueChanged(applyPitchAdjustment);
         }
 
         public void ApplyToTrack(Track track)
@@ -71,17 +70,17 @@ namespace osu.Game.Rulesets.Mods
 
         public virtual void Update(Playfield playfield)
         {
-            applyAdjustment((track.CurrentTime - beginRampTime) / finalRateTime);
+            applyRateAdjustment((track.CurrentTime - beginRampTime) / finalRateTime);
         }
 
         /// <summary>
         /// Adjust the rate along the specified ramp
         /// </summary>
         /// <param name="amount">The amount of adjustment to apply (from 0..1).</param>
-        private void applyAdjustment(double amount) =>
+        private void applyRateAdjustment(double amount) =>
             SpeedChange.Value = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
 
-        private void updatePitchAdjustment(ValueChangedEvent<bool> value)
+        private void applyPitchAdjustment(ValueChangedEvent<bool> value)
         {
             // remove existing old adjustment
             track.RemoveAdjustment(adjustmentForPitchSetting(value.OldValue), SpeedChange);

From e6ddd0380e2ee3b12aacd5a2fdf009ede4605672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 14 Jun 2020 18:50:07 +0200
Subject: [PATCH 03267/10326] Rename bool arguments for readability

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index edca3edf46..df059eef7d 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -80,15 +80,15 @@ namespace osu.Game.Rulesets.Mods
         private void applyRateAdjustment(double amount) =>
             SpeedChange.Value = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
 
-        private void applyPitchAdjustment(ValueChangedEvent<bool> value)
+        private void applyPitchAdjustment(ValueChangedEvent<bool> adjustPitchSetting)
         {
             // remove existing old adjustment
-            track.RemoveAdjustment(adjustmentForPitchSetting(value.OldValue), SpeedChange);
+            track.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
 
-            track.AddAdjustment(adjustmentForPitchSetting(value.NewValue), SpeedChange);
+            track.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
         }
 
-        private AdjustableProperty adjustmentForPitchSetting(bool value)
-            => value ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
+        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
+            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
     }
 }

From b8fa1a2c41445264c0835d0600ddf378bd42948a Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 14 Jun 2020 11:22:38 -0700
Subject: [PATCH 03268/10326] Add shortcut to go home

---
 .../Input/Bindings/GlobalActionContainer.cs   |  5 +++++
 .../Overlays/Toolbar/ToolbarHomeButton.cs     | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 71771abede..618798a6d8 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
 
+            new KeyBinding(new[] { InputKey.Alt, InputKey.Home }, GlobalAction.Home),
+
             new KeyBinding(InputKey.Up, GlobalAction.SelectPrevious),
             new KeyBinding(InputKey.Down, GlobalAction.SelectNext),
 
@@ -152,5 +154,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Next Selection")]
         SelectNext,
+
+        [Description("Home")]
+        Home,
     }
 }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
index 6f5e703a66..e642f0c453 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarHomeButton : ToolbarButton
+    public class ToolbarHomeButton : ToolbarButton, IKeyBindingHandler<GlobalAction>
     {
         public ToolbarHomeButton()
         {
@@ -13,5 +15,20 @@ namespace osu.Game.Overlays.Toolbar
             TooltipMain = "Home";
             TooltipSub = "Return to the main menu";
         }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            if (action == GlobalAction.Home)
+            {
+                Click();
+                return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
     }
 }

From 1f7679e829bb39c4bbc88a6599faa527e93a805d Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 14 Jun 2020 11:24:23 -0700
Subject: [PATCH 03269/10326] Fix home button not flashing when pressing
 shortcut

---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 3d66d3c28e..e0ea88fcf3 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -78,9 +78,8 @@ namespace osu.Game.Overlays.Toolbar
                 HoverBackground = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.Gray(80).Opacity(180),
+                    Colour = OsuColour.Gray(80).Opacity(0),
                     Blending = BlendingParameters.Additive,
-                    Alpha = 0,
                 },
                 Flow = new FillFlowContainer
                 {
@@ -146,14 +145,14 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override bool OnHover(HoverEvent e)
         {
-            HoverBackground.FadeIn(200);
+            HoverBackground.FadeColour(OsuColour.Gray(80).Opacity(180), 200);
             tooltipContainer.FadeIn(100);
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            HoverBackground.FadeOut(200);
+            HoverBackground.FadeColour(OsuColour.Gray(80).Opacity(0), 200);
             tooltipContainer.FadeOut(100);
         }
     }

From 978636b90c5f1f1ff943cbe4027543c595e52201 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 09:38:33 +0900
Subject: [PATCH 03270/10326] Fix storyboard sample playback failing when
 expected to play at 0ms

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

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index f3f8308964..8292b02068 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Storyboards.Drawables
                 LifetimeStart = sampleInfo.StartTime;
                 LifetimeEnd = double.MaxValue;
             }
-            else if (Time.Current - Time.Elapsed < sampleInfo.StartTime)
+            else if (Time.Current - Time.Elapsed <= sampleInfo.StartTime)
             {
                 // We've passed the start time of the sample. We only play the sample if we're within an allowable range
                 // from the sample's start, to reduce layering if we've been fast-forwarded far into the future

From fdf7c56ba28db7165d1651dcdfb2e69520866e35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 11:18:12 +0900
Subject: [PATCH 03271/10326] Add test coverage

---
 .../Gameplay/TestSceneStoryboardSamples.cs    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 84506739ab..2c85c4809b 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.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.Threading.Tasks;
@@ -10,7 +11,12 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Audio;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
+using osu.Game.Storyboards;
+using osu.Game.Storyboards.Drawables;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
 
@@ -43,6 +49,27 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("sample is non-null", () => channel != null);
         }
 
+        [Test]
+        public void TestSamplePlaybackAtZero()
+        {
+            GameplayClockContainer gameplayContainer = null;
+            DrawableStoryboardSample sample = null;
+
+            AddStep("create container", () =>
+            {
+                Add(gameplayContainer = new GameplayClockContainer(CreateWorkingBeatmap(new OsuRuleset().RulesetInfo), Array.Empty<Mod>(), 0));
+
+                gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                {
+                    Clock = gameplayContainer.GameplayClock
+                });
+            });
+
+            AddStep("start time", () => gameplayContainer.Start());
+
+            AddUntilStep("sample playback succeeded", () => sample.LifetimeEnd < double.MaxValue);
+        }
+
         private class TestSkin : LegacySkin
         {
             public TestSkin(string resourceName, AudioManager audioManager)

From 080bf1e85a034e4a3fa58a91b66683fd482ca8b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 13:46:16 +0900
Subject: [PATCH 03272/10326] Fix missing default inclusion

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index bdfad68a13..4429bf27cf 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -21,7 +21,10 @@ namespace osu.Game.Input.Bindings
                 handler = game;
         }
 
-        public override IEnumerable<KeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings);
+        public override IEnumerable<KeyBinding> DefaultKeyBindings => GlobalKeyBindings
+                                                                      .Concat(InGameKeyBindings)
+                                                                      .Concat(AudioControlKeyBindings)
+                                                                      .Concat(SongSelectKeyBindings);
 
         public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {

From b41567c66c48f2fc679cb91518e70e7ee7799b88 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 14 Jun 2020 22:02:21 -0700
Subject: [PATCH 03273/10326] Split hover and flash to separate boxes

---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index e0ea88fcf3..cbcb4060a3 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -62,6 +62,7 @@ namespace osu.Game.Overlays.Toolbar
         protected ConstrainedIconContainer IconContainer;
         protected SpriteText DrawableText;
         protected Box HoverBackground;
+        private readonly Box FlashBackground;
         private readonly FillFlowContainer tooltipContainer;
         private readonly SpriteText tooltip1;
         private readonly SpriteText tooltip2;
@@ -78,7 +79,14 @@ namespace osu.Game.Overlays.Toolbar
                 HoverBackground = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.Gray(80).Opacity(0),
+                    Colour = OsuColour.Gray(80).Opacity(180),
+                    Blending = BlendingParameters.Additive,
+                    Alpha = 0,
+                },
+                FlashBackground = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Transparent,
                     Blending = BlendingParameters.Additive,
                 },
                 Flow = new FillFlowContainer
@@ -138,21 +146,21 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override bool OnClick(ClickEvent e)
         {
-            HoverBackground.FlashColour(Color4.White.Opacity(100), 500, Easing.OutQuint);
+            FlashBackground.FlashColour(Color4.White.Opacity(100), 500, Easing.OutQuint);
             tooltipContainer.FadeOut(100);
             return base.OnClick(e);
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            HoverBackground.FadeColour(OsuColour.Gray(80).Opacity(180), 200);
+            HoverBackground.FadeIn(200);
             tooltipContainer.FadeIn(100);
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            HoverBackground.FadeColour(OsuColour.Gray(80).Opacity(0), 200);
+            HoverBackground.FadeOut(200);
             tooltipContainer.FadeOut(100);
         }
     }

From 941fdf5e76a40d6d3400ab3b75a4869414c55aa6 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 14 Jun 2020 22:16:17 -0700
Subject: [PATCH 03274/10326] Fix flash background naming

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

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index cbcb4060a3..e752516baf 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Overlays.Toolbar
         protected ConstrainedIconContainer IconContainer;
         protected SpriteText DrawableText;
         protected Box HoverBackground;
-        private readonly Box FlashBackground;
+        private readonly Box flashBackground;
         private readonly FillFlowContainer tooltipContainer;
         private readonly SpriteText tooltip1;
         private readonly SpriteText tooltip2;
@@ -83,7 +83,7 @@ namespace osu.Game.Overlays.Toolbar
                     Blending = BlendingParameters.Additive,
                     Alpha = 0,
                 },
-                FlashBackground = new Box
+                flashBackground = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4.Transparent,
@@ -146,7 +146,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override bool OnClick(ClickEvent e)
         {
-            FlashBackground.FlashColour(Color4.White.Opacity(100), 500, Easing.OutQuint);
+            flashBackground.FlashColour(Color4.White.Opacity(100), 500, Easing.OutQuint);
             tooltipContainer.FadeOut(100);
             return base.OnClick(e);
         }

From 1770b70b8164442d21f79ea4b0e9116a91552403 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 16:14:35 +0900
Subject: [PATCH 03275/10326] Change implementation to ensure flashBackground
 is not present by default

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

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index e752516baf..86a3f5d8aa 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -86,7 +86,8 @@ namespace osu.Game.Overlays.Toolbar
                 flashBackground = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Transparent,
+                    Alpha = 0,
+                    Colour = Color4.White.Opacity(100),
                     Blending = BlendingParameters.Additive,
                 },
                 Flow = new FillFlowContainer
@@ -146,7 +147,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override bool OnClick(ClickEvent e)
         {
-            flashBackground.FlashColour(Color4.White.Opacity(100), 500, Easing.OutQuint);
+            flashBackground.FadeOutFromOne(800, Easing.OutQuint);
             tooltipContainer.FadeOut(100);
             return base.OnClick(e);
         }

From 60381d581718dad2d92dfef6b0da3ff8026fa9fe Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 17 Apr 2020 03:38:12 +0300
Subject: [PATCH 03276/10326] Remove IRulesetTestScene and use
 OsuTestScene.CreateRuleset() instead

---
 .../Rulesets/Testing/IRulesetTestScene.cs     | 20 -------------------
 osu.Game/Tests/Visual/OsuTestScene.cs         |  6 +++---
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Testing/IRulesetTestScene.cs

diff --git a/osu.Game/Rulesets/Testing/IRulesetTestScene.cs b/osu.Game/Rulesets/Testing/IRulesetTestScene.cs
deleted file mode 100644
index e8b8a79eb5..0000000000
--- a/osu.Game/Rulesets/Testing/IRulesetTestScene.cs
+++ /dev/null
@@ -1,20 +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.Rulesets.Testing
-{
-    /// <summary>
-    /// An interface that can be assigned to test scenes to indicate
-    /// that the test scene is testing ruleset-specific components.
-    /// This is to cache required ruleset dependencies for the components.
-    /// </summary>
-    public interface IRulesetTestScene
-    {
-        /// <summary>
-        /// Retrieves the ruleset that is going
-        /// to be tested by this test scene.
-        /// </summary>
-        /// <returns>The <see cref="Ruleset"/>.</returns>
-        Ruleset CreateRuleset();
-    }
-}
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index eb1905cbe1..82ba989306 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -20,7 +20,6 @@ using osu.Game.Database;
 using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Testing;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens;
 using osu.Game.Storyboards;
@@ -70,8 +69,9 @@ namespace osu.Game.Tests.Visual
         {
             var baseDependencies = base.CreateChildDependencies(parent);
 
-            if (this is IRulesetTestScene rts)
-                baseDependencies = rulesetDependencies = new DrawableRulesetDependencies(rts.CreateRuleset(), baseDependencies);
+            var providedRuleset = CreateRuleset();
+            if (providedRuleset != null)
+                baseDependencies = rulesetDependencies = new DrawableRulesetDependencies(providedRuleset, baseDependencies);
 
             Dependencies = new OsuScreenDependencies(false, baseDependencies);
 

From f14774e795ab68f593008346a43c1c70401681e7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 15 Jun 2020 11:47:31 +0300
Subject: [PATCH 03277/10326] Rename to TestSceneRulesetDependencies, mark as
 headless and avoid throwing

Avoid throw not implemented exceptions from TestRuleset since it's now set as the global ruleset bindable automatically by base, throwing to innocent components is probably not needed.
---
 ...ene.cs => TestSceneRulesetDependencies.cs} | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)
 rename osu.Game.Tests/Testing/{TestSceneRulesetTestScene.cs => TestSceneRulesetDependencies.cs} (73%)

diff --git a/osu.Game.Tests/Testing/TestSceneRulesetTestScene.cs b/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
similarity index 73%
rename from osu.Game.Tests/Testing/TestSceneRulesetTestScene.cs
rename to osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
index 6d8502e651..80f1b02794 100644
--- a/osu.Game.Tests/Testing/TestSceneRulesetTestScene.cs
+++ b/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
@@ -9,21 +9,28 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Testing;
 using osu.Game.Rulesets.UI;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.Testing
 {
-    public class TestSceneRulesetTestScene : OsuTestScene, IRulesetTestScene
+    /// <summary>
+    /// A test scene ensuring the dependencies for the
+    /// provided ruleset below are cached at the base implementation.
+    /// </summary>
+    [HeadlessTest]
+    public class TestSceneRulesetDependencies : OsuTestScene
     {
+        protected override Ruleset CreateRuleset() => new TestRuleset();
+
         [Test]
         public void TestRetrieveTexture()
         {
@@ -45,8 +52,6 @@ namespace osu.Game.Tests.Testing
                 Dependencies.Get<TestRulesetConfigManager>() != null);
         }
 
-        public Ruleset CreateRuleset() => new TestRuleset();
-
         private class TestRuleset : Ruleset
         {
             public override string Description => string.Empty;
@@ -62,19 +67,29 @@ namespace osu.Game.Tests.Testing
             public override IResourceStore<byte[]> CreateResourceStore() => new NamespacedResourceStore<byte[]>(TestResources.GetStore(), @"Resources");
             public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new TestRulesetConfigManager();
 
-            public override IEnumerable<Mod> GetModsFor(ModType type) => throw new NotImplementedException();
-            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new NotImplementedException();
-            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => throw new NotImplementedException();
-            public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => throw new NotImplementedException();
+            public override IEnumerable<Mod> GetModsFor(ModType type) => Array.Empty<Mod>();
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => null;
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => null;
+            public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => null;
         }
 
         private class TestRulesetConfigManager : IRulesetConfigManager
         {
-            public void Load() => throw new NotImplementedException();
-            public bool Save() => throw new NotImplementedException();
-            public TrackedSettings CreateTrackedSettings() => throw new NotImplementedException();
-            public void LoadInto(TrackedSettings settings) => throw new NotImplementedException();
-            public void Dispose() => throw new NotImplementedException();
+            public void Load()
+            {
+            }
+
+            public bool Save() => true;
+
+            public TrackedSettings CreateTrackedSettings() => new TrackedSettings();
+
+            public void LoadInto(TrackedSettings settings)
+            {
+            }
+
+            public void Dispose()
+            {
+            }
         }
     }
 }

From f4b57933c347b99eb4f6238f6dbb9729fae51176 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Jun 2020 08:54:34 +0000
Subject: [PATCH 03278/10326] Bump Microsoft.Build.Traversal from 2.0.48 to
 2.0.50

Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.48 to 2.0.50.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.0.48...Microsoft.Build.Traversal.2.0.50)

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

diff --git a/global.json b/global.json
index bdb90eb0e9..9aa5b6192b 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,6 @@
     "version": "3.1.100"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "2.0.48"
+    "Microsoft.Build.Traversal": "2.0.50"
   }
 }
\ No newline at end of file

From e15324ca900cde9e37d3d52b79f27be690bd66eb Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Mon, 15 Jun 2020 21:44:38 +1200
Subject: [PATCH 03279/10326] Shorten new binding descriptions

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 4429bf27cf..851a848b8f 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -165,16 +165,16 @@ namespace osu.Game.Input.Bindings
         SelectNext,
 
         // Song select keybindings
-        [Description("Toggle mod selection overlay")]
+        [Description("Toggle Mod Select")]
         ToggleModSelection,
 
-        [Description("Select a random beatmap")]
+        [Description("Random")]
         SelectNextRandom,
 
-        [Description("Select the last random beatmap")]
+        [Description("Rewind")]
         SelectPreviousRandom,
 
-        [Description("Toggle beatmap options overlay")]
+        [Description("Beatmap Options")]
         ToggleBeatmapOptions,
     }
 }

From ad5bd1f0c00ae10c0c857759e38b1f588d2f4b45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 18:45:50 +0900
Subject: [PATCH 03280/10326] Update in line with other/unspecified switch

See https://github.com/ppy/osu-web/commit/289f0f0a209f1f840270db07794a7bfd52439db1.
---
 osu.Game/Overlays/BeatmapListing/SearchLanguage.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
index 43f16059e9..eee5d8f7e1 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
@@ -11,8 +11,8 @@ namespace osu.Game.Overlays.BeatmapListing
         [Order(0)]
         Any,
 
-        [Order(13)]
-        Other,
+        [Order(14)]
+        Unspecified,
 
         [Order(1)]
         English,
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.BeatmapListing
         [Order(11)]
         Polish,
 
-        [Order(14)]
-        Unspecified
+        [Order(13)]
+        Other
     }
 }

From d57b58a7dd6a8429cd684cf8d6e2fbd0f2f643ad Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 15 Jun 2020 18:42:16 +0900
Subject: [PATCH 03281/10326] Add temporary fix for tournament song bar
 disappearance

---
 osu.Game.Tournament/Components/SongBar.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index e86fd890c1..fc7fcef892 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -77,6 +77,8 @@ namespace osu.Game.Tournament.Components
                 flow = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.X,
+                    // Todo: This is a hack for https://github.com/ppy/osu-framework/issues/3617 since this container is at the very edge of the screen and potentially initially masked away.
+                    Height = 1,
                     AutoSizeAxes = Axes.Y,
                     LayoutDuration = 500,
                     LayoutEasing = Easing.OutQuint,

From c3c5a99a2288819f7c95bbf64069cd21838d54c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 20:23:35 +0900
Subject: [PATCH 03282/10326] Load imported scores to results screen rather
 than gameplay

---
 osu.Game/OsuGame.cs                           | 23 ++++++++++++++++---
 .../Screens/Ranking/ReplayDownloadButton.cs   |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 7ecd7851d7..7c5e4b8d94 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -35,7 +35,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
 using osu.Game.Overlays.Notifications;
-using osu.Game.Screens.Play;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.Chat;
 using osu.Game.Skinning;
@@ -43,6 +42,8 @@ using osuTK.Graphics;
 using osu.Game.Overlays.Volume;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
 using osu.Game.Updater;
 using osu.Game.Utils;
@@ -360,7 +361,7 @@ namespace osu.Game
         /// Present a score's replay immediately.
         /// The user should have already requested this interactively.
         /// </summary>
-        public void PresentScore(ScoreInfo score)
+        public void PresentScore(ScoreInfo score, ScorePresentType presentType = ScorePresentType.Results)
         {
             // The given ScoreInfo may have missing properties if it was retrieved from online data. Re-retrieve it from the database
             // to ensure all the required data for presenting a replay are present.
@@ -392,9 +393,19 @@ namespace osu.Game
 
             PerformFromScreen(screen =>
             {
+                Ruleset.Value = databasedScore.ScoreInfo.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);
 
-                screen.Push(new ReplayPlayerLoader(databasedScore));
+                switch (presentType)
+                {
+                    case ScorePresentType.Gameplay:
+                        screen.Push(new ReplayPlayerLoader(databasedScore));
+                        break;
+
+                    case ScorePresentType.Results:
+                        screen.Push(new SoloResultsScreen(databasedScore.ScoreInfo));
+                        break;
+                }
             }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
@@ -1000,4 +1011,10 @@ namespace osu.Game
                 Exit();
         }
     }
+
+    public enum ScorePresentType
+    {
+        Results,
+        Gameplay
+    }
 }
diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index 9d4e3af230..d0142e57fe 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Ranking
                 switch (State.Value)
                 {
                     case DownloadState.LocallyAvailable:
-                        game?.PresentScore(Model.Value);
+                        game?.PresentScore(Model.Value, ScorePresentType.Gameplay);
                         break;
 
                     case DownloadState.NotDownloaded:

From 90d69c121625ddc69e88b5a232e7c4f6afa51076 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 20:31:47 +0900
Subject: [PATCH 03283/10326] Allow legacy score to be constructed even if
 replay file is missing

---
 osu.Game/Scoring/LegacyDatabasedScore.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/LegacyDatabasedScore.cs b/osu.Game/Scoring/LegacyDatabasedScore.cs
index bd673eaa29..8908775472 100644
--- a/osu.Game/Scoring/LegacyDatabasedScore.cs
+++ b/osu.Game/Scoring/LegacyDatabasedScore.cs
@@ -16,7 +16,10 @@ namespace osu.Game.Scoring
         {
             ScoreInfo = score;
 
-            var replayFilename = score.Files.First(f => f.Filename.EndsWith(".osr", StringComparison.InvariantCultureIgnoreCase)).FileInfo.StoragePath;
+            var replayFilename = score.Files.FirstOrDefault(f => f.Filename.EndsWith(".osr", StringComparison.InvariantCultureIgnoreCase))?.FileInfo.StoragePath;
+
+            if (replayFilename == null)
+                return;
 
             using (var stream = store.GetStream(replayFilename))
                 Replay = new DatabasedLegacyScoreDecoder(rulesets, beatmaps).Parse(stream).Replay;

From 17a70bf6ee241a0e26b064de1bc51cb04b0140a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 20:32:27 +0900
Subject: [PATCH 03284/10326] Add test coverage

---
 .../Visual/Navigation/OsuGameTestScene.cs     |   3 +
 .../Navigation/TestScenePresentScore.cs       | 155 ++++++++++++++++++
 osu.Game/Screens/Play/ReplayPlayerLoader.cs   |   8 +-
 3 files changed, 162 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 31afce86ae..c4acf4f7da 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -17,6 +17,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
+using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osuTK.Graphics;
@@ -100,6 +101,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             public new BeatmapManager BeatmapManager => base.BeatmapManager;
 
+            public new ScoreManager ScoreManager => base.ScoreManager;
+
             public new SettingsPanel Settings => base.Settings;
 
             public new MusicController MusicController => base.MusicController;
diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
new file mode 100644
index 0000000000..b2e18849c9
--- /dev/null
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Scoring;
+using osu.Game.Screens.Menu;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking;
+
+namespace osu.Game.Tests.Visual.Navigation
+{
+    public class TestScenePresentScore : OsuGameTestScene
+    {
+        private BeatmapSetInfo beatmap;
+
+        [SetUpSteps]
+        public new void SetUpSteps()
+        {
+            AddStep("import beatmap", () =>
+            {
+                var difficulty = new BeatmapDifficulty();
+                var metadata = new BeatmapMetadata
+                {
+                    Artist = "SomeArtist",
+                    AuthorString = "SomeAuthor",
+                    Title = "import"
+                };
+
+                beatmap = Game.BeatmapManager.Import(new BeatmapSetInfo
+                {
+                    Hash = Guid.NewGuid().ToString(),
+                    OnlineBeatmapSetID = 1,
+                    Metadata = metadata,
+                    Beatmaps = new List<BeatmapInfo>
+                    {
+                        new BeatmapInfo
+                        {
+                            OnlineBeatmapID = 1 * 1024,
+                            Metadata = metadata,
+                            BaseDifficulty = difficulty,
+                            Ruleset = new OsuRuleset().RulesetInfo
+                        },
+                        new BeatmapInfo
+                        {
+                            OnlineBeatmapID = 1 * 2048,
+                            Metadata = metadata,
+                            BaseDifficulty = difficulty,
+                            Ruleset = new OsuRuleset().RulesetInfo
+                        },
+                    }
+                }).Result;
+            });
+        }
+
+        [Test]
+        public void TestFromMainMenu([Values] ScorePresentType type)
+        {
+            var firstImport = importScore(1);
+            var secondimport = importScore(3);
+
+            presentAndConfirm(firstImport, type);
+            returnToMenu();
+            presentAndConfirm(secondimport, type);
+            returnToMenu();
+            returnToMenu();
+        }
+
+        [Test]
+        public void TestFromMainMenuDifferentRuleset([Values] ScorePresentType type)
+        {
+            var firstImport = importScore(1);
+            var secondimport = importScore(3, new ManiaRuleset().RulesetInfo);
+
+            presentAndConfirm(firstImport, type);
+            returnToMenu();
+            presentAndConfirm(secondimport, type);
+            returnToMenu();
+            returnToMenu();
+        }
+
+        [Test]
+        public void TestFromSongSelect([Values] ScorePresentType type)
+        {
+            var firstImport = importScore(1);
+            presentAndConfirm(firstImport, type);
+
+            var secondimport = importScore(3);
+            presentAndConfirm(secondimport, type);
+        }
+
+        [Test]
+        public void TestFromSongSelectDifferentRuleset([Values] ScorePresentType type)
+        {
+            var firstImport = importScore(1);
+            presentAndConfirm(firstImport, type);
+
+            var secondimport = importScore(3, new ManiaRuleset().RulesetInfo);
+            presentAndConfirm(secondimport, type);
+        }
+
+        private void returnToMenu()
+        {
+            AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
+            AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
+        }
+
+        private Func<ScoreInfo> importScore(int i, RulesetInfo ruleset = null)
+        {
+            ScoreInfo imported = null;
+            AddStep($"import score {i}", () =>
+            {
+                imported = Game.ScoreManager.Import(new ScoreInfo
+                {
+                    Hash = Guid.NewGuid().ToString(),
+                    OnlineScoreID = i,
+                    Beatmap = beatmap.Beatmaps.First(),
+                    Ruleset = ruleset ?? new OsuRuleset().RulesetInfo
+                }).Result;
+            });
+
+            AddAssert($"import {i} succeeded", () => imported != null);
+
+            return () => imported;
+        }
+
+        private void presentAndConfirm(Func<ScoreInfo> getImport, ScorePresentType type)
+        {
+            AddStep("present score", () => Game.PresentScore(getImport(), type));
+
+            switch (type)
+            {
+                case ScorePresentType.Results:
+                    AddUntilStep("wait for results", () => Game.ScreenStack.CurrentScreen is ResultsScreen);
+                    AddUntilStep("correct score displayed", () => ((ResultsScreen)Game.ScreenStack.CurrentScreen).Score.ID == getImport().ID);
+                    AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Ruleset.ID);
+                    break;
+
+                case ScorePresentType.Gameplay:
+                    AddUntilStep("wait for player loader", () => Game.ScreenStack.CurrentScreen is ReplayPlayerLoader);
+                    AddUntilStep("correct score displayed", () => ((ReplayPlayerLoader)Game.ScreenStack.CurrentScreen).Score.ID == getImport().ID);
+                    AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Ruleset.ID);
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/ReplayPlayerLoader.cs b/osu.Game/Screens/Play/ReplayPlayerLoader.cs
index 4572570437..9eff4cb8fc 100644
--- a/osu.Game/Screens/Play/ReplayPlayerLoader.cs
+++ b/osu.Game/Screens/Play/ReplayPlayerLoader.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Screens.Play
 {
     public class ReplayPlayerLoader : PlayerLoader
     {
-        private readonly ScoreInfo scoreInfo;
+        public readonly ScoreInfo Score;
 
         public ReplayPlayerLoader(Score score)
             : base(() => new ReplayPlayer(score))
@@ -17,14 +17,14 @@ namespace osu.Game.Screens.Play
             if (score.Replay == null)
                 throw new ArgumentException($"{nameof(score)} must have a non-null {nameof(score.Replay)}.", nameof(score));
 
-            scoreInfo = score.ScoreInfo;
+            Score = score.ScoreInfo;
         }
 
         public override void OnEntering(IScreen last)
         {
             // these will be reverted thanks to PlayerLoader's lease.
-            Mods.Value = scoreInfo.Mods;
-            Ruleset.Value = scoreInfo.Ruleset;
+            Mods.Value = Score.Mods;
+            Ruleset.Value = Score.Ruleset;
 
             base.OnEntering(last);
         }

From 1ce374ae2f640c7adcfb16146769e4ad7d030ba3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 20:34:46 +0900
Subject: [PATCH 03285/10326] 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 596e5bfa8b..6387356686 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.609.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.615.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1d3bafbfd6..8c098b79c6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.609.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.615.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
     <PackageReference Include="Sentry" Version="2.1.3" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ad7850599b..373ad09597 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.Framework.iOS" Version="2020.609.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.615.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.609.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.615.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From f9db37a1de9c425661df474f2d56fbf2d9ddfa27 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 15 Jun 2020 21:48:59 +0900
Subject: [PATCH 03286/10326] Split out types

---
 .../Scoring/OsuScoreProcessor.cs              |  18 --
 .../Scoring/TimingDistribution.cs             |  17 ++
 osu.Game.Rulesets.Osu/Statistics/Heatmap.cs   | 186 ++++++++++++++++++
 .../Statistics/TimingDistributionGraph.cs     | 139 +++++++++++++
 .../Ranking/TestSceneAccuracyHeatmap.cs       | 175 +---------------
 .../TestSceneTimingDistributionGraph.cs       | 130 +-----------
 6 files changed, 344 insertions(+), 321 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Scoring/TimingDistribution.cs
 create mode 100644 osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
 create mode 100644 osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 83339bd061..a9d48df52d 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -7,7 +7,6 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
@@ -62,11 +61,6 @@ namespace osu.Game.Rulesets.Osu.Scoring
             }
         }
 
-        public override void PopulateScore(ScoreInfo score)
-        {
-            base.PopulateScore(score);
-        }
-
         protected override void Reset(bool storeResults)
         {
             base.Reset(storeResults);
@@ -78,16 +72,4 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
         public override HitWindows CreateHitWindows() => new OsuHitWindows();
     }
-
-    public class TimingDistribution
-    {
-        public readonly int[] Bins;
-        public readonly double BinSize;
-
-        public TimingDistribution(int binCount, double binSize)
-        {
-            Bins = new int[binCount];
-            BinSize = binSize;
-        }
-    }
 }
diff --git a/osu.Game.Rulesets.Osu/Scoring/TimingDistribution.cs b/osu.Game.Rulesets.Osu/Scoring/TimingDistribution.cs
new file mode 100644
index 0000000000..46f259f3d8
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Scoring/TimingDistribution.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Rulesets.Osu.Scoring
+{
+    public class TimingDistribution
+    {
+        public readonly int[] Bins;
+        public readonly double BinSize;
+
+        public TimingDistribution(int binCount, double binSize)
+        {
+            Bins = new int[binCount];
+            BinSize = binSize;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
new file mode 100644
index 0000000000..8105d12991
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
@@ -0,0 +1,186 @@
+// Copyright (c) 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.Diagnostics;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Statistics
+{
+    public class Heatmap : CompositeDrawable
+    {
+        /// <summary>
+        /// Full size of the heatmap.
+        /// </summary>
+        private const float size = 130;
+
+        /// <summary>
+        /// Size of the inner circle containing the "hit" points, relative to <see cref="size"/>.
+        /// All other points outside of the inner circle are "miss" points.
+        /// </summary>
+        private const float inner_portion = 0.8f;
+
+        private const float rotation = 45;
+        private const float point_size = 4;
+
+        private Container<HitPoint> allPoints;
+
+        public Heatmap()
+        {
+            Size = new Vector2(size);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Size = new Vector2(inner_portion),
+                    Masking = true,
+                    BorderThickness = 2f,
+                    BorderColour = Color4.White,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4Extensions.FromHex("#202624")
+                    }
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Y,
+                            Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
+                            Width = 1f,
+                            Rotation = -rotation,
+                            Alpha = 0.3f,
+                        },
+                        new Box
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Y,
+                            Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
+                            Width = 1f,
+                            Rotation = rotation
+                        },
+                        new Box
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            Width = 10,
+                            Height = 2f,
+                        },
+                        new Box
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            Y = -1,
+                            Width = 2f,
+                            Height = 10,
+                        }
+                    }
+                },
+                allPoints = new Container<HitPoint> { RelativeSizeAxes = Axes.Both }
+            };
+
+            Vector2 centre = new Vector2(size / 2);
+            int rows = (int)Math.Ceiling(size / point_size);
+            int cols = (int)Math.Ceiling(size / point_size);
+
+            for (int r = 0; r < rows; r++)
+            {
+                for (int c = 0; c < cols; c++)
+                {
+                    Vector2 pos = new Vector2(c * point_size, r * point_size);
+                    HitPointType pointType = HitPointType.Hit;
+
+                    if (Vector2.Distance(pos, centre) > size * inner_portion / 2)
+                        pointType = HitPointType.Miss;
+
+                    allPoints.Add(new HitPoint(pos, pointType)
+                    {
+                        Size = new Vector2(point_size),
+                        Colour = pointType == HitPointType.Hit ? new Color4(102, 255, 204, 255) : new Color4(255, 102, 102, 255)
+                    });
+                }
+            }
+        }
+
+        public void AddPoint(Vector2 start, Vector2 end, Vector2 hitPoint, float radius)
+        {
+            double angle1 = Math.Atan2(end.Y - hitPoint.Y, hitPoint.X - end.X); // Angle between the end point and the hit point.
+            double angle2 = Math.Atan2(end.Y - start.Y, start.X - end.X); // Angle between the end point and the start point.
+            double finalAngle = angle2 - angle1; // Angle between start, end, and hit points.
+
+            float normalisedDistance = Vector2.Distance(hitPoint, end) / radius;
+
+            // Find the most relevant hit point.
+            double minDist = double.PositiveInfinity;
+            HitPoint point = null;
+
+            foreach (var p in allPoints)
+            {
+                Vector2 localCentre = new Vector2(size / 2);
+                float localRadius = localCentre.X * inner_portion * normalisedDistance;
+                double localAngle = finalAngle + 3 * Math.PI / 4;
+                Vector2 localPoint = localCentre + localRadius * new Vector2((float)Math.Cos(localAngle), (float)Math.Sin(localAngle));
+
+                float dist = Vector2.Distance(p.DrawPosition + p.DrawSize / 2, localPoint);
+
+                if (dist < minDist)
+                {
+                    minDist = dist;
+                    point = p;
+                }
+            }
+
+            Debug.Assert(point != null);
+            point.Increment();
+        }
+
+        private class HitPoint : Circle
+        {
+            private readonly HitPointType pointType;
+
+            public HitPoint(Vector2 position, HitPointType pointType)
+            {
+                this.pointType = pointType;
+
+                Position = position;
+                Alpha = 0;
+            }
+
+            public void Increment()
+            {
+                if (Alpha < 1)
+                    Alpha += 0.1f;
+                else if (pointType == HitPointType.Hit)
+                    Colour = ((Color4)Colour).Lighten(0.1f);
+            }
+        }
+
+        private enum HitPointType
+        {
+            Hit,
+            Miss
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
new file mode 100644
index 0000000000..a47d726988
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
@@ -0,0 +1,139 @@
+// Copyright (c) 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.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Osu.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Statistics
+{
+    public class TimingDistributionGraph : CompositeDrawable
+    {
+        /// <summary>
+        /// The number of data points shown on the axis below the graph.
+        /// </summary>
+        private const float axis_points = 5;
+
+        /// <summary>
+        /// An amount to adjust the value of the axis points by, effectively insetting the axis in the graph.
+        /// Without an inset, the final data point will be placed halfway outside the graph.
+        /// </summary>
+        private const float axis_value_inset = 0.2f;
+
+        private readonly TimingDistribution distribution;
+
+        public TimingDistributionGraph(TimingDistribution distribution)
+        {
+            this.distribution = distribution;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            int maxCount = distribution.Bins.Max();
+
+            var bars = new Drawable[distribution.Bins.Length];
+            for (int i = 0; i < bars.Length; i++)
+                bars[i] = new Bar { Height = (float)distribution.Bins[i] / maxCount };
+
+            Container axisFlow;
+
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Content = new[] { bars }
+                        }
+                    },
+                    new Drawable[]
+                    {
+                        axisFlow = new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y
+                        }
+                    },
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(),
+                    new Dimension(GridSizeMode.AutoSize),
+                }
+            };
+
+            // We know the total number of bins on each side of the centre ((n - 1) / 2), and the size of each bin.
+            // So our axis will contain one centre element + 5 points on each side, each with a value depending on the number of bins * bin size.
+            int sideBins = (distribution.Bins.Length - 1) / 2;
+            double maxValue = sideBins * distribution.BinSize;
+            double axisValueStep = maxValue / axis_points * (1 - axis_value_inset);
+
+            axisFlow.Add(new OsuSpriteText
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Text = "0",
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
+            });
+
+            for (int i = 1; i <= axis_points; i++)
+            {
+                double axisValue = i * axisValueStep;
+                float position = (float)(axisValue / maxValue);
+                float alpha = 1f - position * 0.8f;
+
+                axisFlow.Add(new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativePositionAxes = Axes.X,
+                    X = -position / 2,
+                    Alpha = alpha,
+                    Text = axisValue.ToString("-0"),
+                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
+                });
+
+                axisFlow.Add(new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativePositionAxes = Axes.X,
+                    X = position / 2,
+                    Alpha = alpha,
+                    Text = axisValue.ToString("+0"),
+                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
+                });
+            }
+        }
+
+        private class Bar : CompositeDrawable
+        {
+            public Bar()
+            {
+                Anchor = Anchor.BottomCentre;
+                Origin = Anchor.BottomCentre;
+
+                RelativeSizeAxes = Axes.Both;
+
+                Padding = new MarginPadding { Horizontal = 1 };
+
+                InternalChild = new Circle
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4Extensions.FromHex("#66FFCC")
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
index 9f82287640..9e5fda0ae6 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
@@ -1,15 +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.Diagnostics;
-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.Input.Events;
 using osu.Framework.Utils;
+using osu.Game.Rulesets.Osu.Statistics;
 using osuTK;
 using osuTK.Graphics;
 
@@ -70,177 +68,6 @@ namespace osu.Game.Tests.Visual.Ranking
             return true;
         }
 
-        private class Heatmap : CompositeDrawable
-        {
-            /// <summary>
-            /// Full size of the heatmap.
-            /// </summary>
-            private const float size = 130;
-
-            /// <summary>
-            /// Size of the inner circle containing the "hit" points, relative to <see cref="size"/>.
-            /// All other points outside of the inner circle are "miss" points.
-            /// </summary>
-            private const float inner_portion = 0.8f;
-
-            private const float rotation = 45;
-            private const float point_size = 4;
-
-            private Container<HitPoint> allPoints;
-
-            public Heatmap()
-            {
-                Size = new Vector2(size);
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                InternalChildren = new Drawable[]
-                {
-                    new CircularContainer
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Size = new Vector2(inner_portion),
-                        Masking = true,
-                        BorderThickness = 2f,
-                        BorderColour = Color4.White,
-                        Child = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4Extensions.FromHex("#202624")
-                        }
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Y,
-                                Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
-                                Width = 1f,
-                                Rotation = -rotation,
-                                Alpha = 0.3f,
-                            },
-                            new Box
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Y,
-                                Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
-                                Width = 1f,
-                                Rotation = rotation
-                            },
-                            new Box
-                            {
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Width = 10,
-                                Height = 2f,
-                            },
-                            new Box
-                            {
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Y = -1,
-                                Width = 2f,
-                                Height = 10,
-                            }
-                        }
-                    },
-                    allPoints = new Container<HitPoint> { RelativeSizeAxes = Axes.Both }
-                };
-
-                Vector2 centre = new Vector2(size / 2);
-                int rows = (int)Math.Ceiling(size / point_size);
-                int cols = (int)Math.Ceiling(size / point_size);
-
-                for (int r = 0; r < rows; r++)
-                {
-                    for (int c = 0; c < cols; c++)
-                    {
-                        Vector2 pos = new Vector2(c * point_size, r * point_size);
-                        HitPointType pointType = HitPointType.Hit;
-
-                        if (Vector2.Distance(pos, centre) > size * inner_portion / 2)
-                            pointType = HitPointType.Miss;
-
-                        allPoints.Add(new HitPoint(pos, pointType)
-                        {
-                            Size = new Vector2(point_size),
-                            Colour = pointType == HitPointType.Hit ? new Color4(102, 255, 204, 255) : new Color4(255, 102, 102, 255)
-                        });
-                    }
-                }
-            }
-
-            public void AddPoint(Vector2 start, Vector2 end, Vector2 hitPoint, float radius)
-            {
-                double angle1 = Math.Atan2(end.Y - hitPoint.Y, hitPoint.X - end.X); // Angle between the end point and the hit point.
-                double angle2 = Math.Atan2(end.Y - start.Y, start.X - end.X); // Angle between the end point and the start point.
-                double finalAngle = angle2 - angle1; // Angle between start, end, and hit points.
-
-                float normalisedDistance = Vector2.Distance(hitPoint, end) / radius;
-
-                // Find the most relevant hit point.
-                double minDist = double.PositiveInfinity;
-                HitPoint point = null;
-
-                foreach (var p in allPoints)
-                {
-                    Vector2 localCentre = new Vector2(size / 2);
-                    float localRadius = localCentre.X * inner_portion * normalisedDistance;
-                    double localAngle = finalAngle + 3 * Math.PI / 4;
-                    Vector2 localPoint = localCentre + localRadius * new Vector2((float)Math.Cos(localAngle), (float)Math.Sin(localAngle));
-
-                    float dist = Vector2.Distance(p.DrawPosition + p.DrawSize / 2, localPoint);
-
-                    if (dist < minDist)
-                    {
-                        minDist = dist;
-                        point = p;
-                    }
-                }
-
-                Debug.Assert(point != null);
-                point.Increment();
-            }
-        }
-
-        private class HitPoint : Circle
-        {
-            private readonly HitPointType pointType;
-
-            public HitPoint(Vector2 position, HitPointType pointType)
-            {
-                this.pointType = pointType;
-
-                Position = position;
-                Alpha = 0;
-            }
-
-            public void Increment()
-            {
-                if (Alpha < 1)
-                    Alpha += 0.1f;
-                else if (pointType == HitPointType.Hit)
-                    Colour = ((Color4)Colour).Lighten(0.1f);
-            }
-        }
-
-        private enum HitPointType
-        {
-            Hit,
-            Miss
-        }
-
         private class BorderCircle : CircularContainer
         {
             public BorderCircle()
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
index 73225ff599..7530fc42b8 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
@@ -2,15 +2,11 @@
 // 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.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Rulesets.Osu.Statistics;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
@@ -65,128 +61,4 @@ namespace osu.Game.Tests.Visual.Ranking
             return distribution;
         }
     }
-
-    public class TimingDistributionGraph : CompositeDrawable
-    {
-        /// <summary>
-        /// The number of data points shown on the axis below the graph.
-        /// </summary>
-        private const float axis_points = 5;
-
-        /// <summary>
-        /// An amount to adjust the value of the axis points by, effectively insetting the axis in the graph.
-        /// Without an inset, the final data point will be placed halfway outside the graph.
-        /// </summary>
-        private const float axis_value_inset = 0.2f;
-
-        private readonly TimingDistribution distribution;
-
-        public TimingDistributionGraph(TimingDistribution distribution)
-        {
-            this.distribution = distribution;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            int maxCount = distribution.Bins.Max();
-
-            var bars = new Drawable[distribution.Bins.Length];
-            for (int i = 0; i < bars.Length; i++)
-                bars[i] = new Bar { Height = (float)distribution.Bins[i] / maxCount };
-
-            Container axisFlow;
-
-            InternalChild = new GridContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Content = new[]
-                {
-                    new Drawable[]
-                    {
-                        new GridContainer
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Content = new[] { bars }
-                        }
-                    },
-                    new Drawable[]
-                    {
-                        axisFlow = new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y
-                        }
-                    },
-                },
-                RowDimensions = new[]
-                {
-                    new Dimension(),
-                    new Dimension(GridSizeMode.AutoSize),
-                }
-            };
-
-            // We know the total number of bins on each side of the centre ((n - 1) / 2), and the size of each bin.
-            // So our axis will contain one centre element + 5 points on each side, each with a value depending on the number of bins * bin size.
-            int sideBins = (distribution.Bins.Length - 1) / 2;
-            double maxValue = sideBins * distribution.BinSize;
-            double axisValueStep = maxValue / axis_points * (1 - axis_value_inset);
-
-            axisFlow.Add(new OsuSpriteText
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Text = "0",
-                Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
-            });
-
-            for (int i = 1; i <= axis_points; i++)
-            {
-                double axisValue = i * axisValueStep;
-                float position = (float)(axisValue / maxValue);
-                float alpha = 1f - position * 0.8f;
-
-                axisFlow.Add(new OsuSpriteText
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativePositionAxes = Axes.X,
-                    X = -position / 2,
-                    Alpha = alpha,
-                    Text = axisValue.ToString("-0"),
-                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
-                });
-
-                axisFlow.Add(new OsuSpriteText
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativePositionAxes = Axes.X,
-                    X = position / 2,
-                    Alpha = alpha,
-                    Text = axisValue.ToString("+0"),
-                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
-                });
-            }
-        }
-
-        private class Bar : CompositeDrawable
-        {
-            public Bar()
-            {
-                Anchor = Anchor.BottomCentre;
-                Origin = Anchor.BottomCentre;
-
-                RelativeSizeAxes = Axes.Both;
-
-                Padding = new MarginPadding { Horizontal = 1 };
-
-                InternalChild = new Circle
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4Extensions.FromHex("#66FFCC")
-                };
-            }
-        }
-    }
 }

From d2155c3da3c01e54636a5ce4876618f68acb855f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 22:19:02 +0900
Subject: [PATCH 03287/10326] Fix thread safety

---
 osu.Game/Updater/UpdateManager.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 5da366bde9..61775a26b7 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -64,10 +64,12 @@ namespace osu.Game.Updater
             if (!CanCheckForUpdate)
                 return;
 
-            lock (updateTaskLock)
-                updateCheckTask ??= PerformUpdateCheck();
+            Task waitTask;
 
-            await updateCheckTask;
+            lock (updateTaskLock)
+                waitTask = (updateCheckTask ??= PerformUpdateCheck());
+
+            await waitTask;
 
             lock (updateTaskLock)
                 updateCheckTask = null;

From 53b7057ee05a3551c07ac7e0d2a00f15f13b4c29 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 22:19:11 +0900
Subject: [PATCH 03288/10326] Don't show update button when updates are not
 feasible

---
 .../Sections/General/UpdateSettings.cs         | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 869e6c9c51..9fca820cac 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -30,16 +30,18 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
-            // We should only display the button for UpdateManagers that do check for updates
-            Add(checkForUpdatesButton = new SettingsButton
+            if (updateManager.CanCheckForUpdate)
             {
-                Text = "Check for updates",
-                Action = () =>
+                Add(checkForUpdatesButton = new SettingsButton
                 {
-                    checkForUpdatesButton.Enabled.Value = false;
-                    Task.Run(updateManager.CheckForUpdateAsync).ContinueWith(t => Schedule(() => checkForUpdatesButton.Enabled.Value = true));
-                }
-            });
+                    Text = "Check for updates",
+                    Action = () =>
+                    {
+                        checkForUpdatesButton.Enabled.Value = false;
+                        Task.Run(updateManager.CheckForUpdateAsync).ContinueWith(t => Schedule(() => checkForUpdatesButton.Enabled.Value = true));
+                    }
+                });
+            }
 
             if (RuntimeInfo.IsDesktop)
             {

From 97067976f75a416dd8adc290aed8841ab51740ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 22:23:06 +0900
Subject: [PATCH 03289/10326] Add null check

---
 osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 9fca820cac..9c7d0b0be4 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
-            if (updateManager.CanCheckForUpdate)
+            if (updateManager?.CanCheckForUpdate == true)
             {
                 Add(checkForUpdatesButton = new SettingsButton
                 {

From 900da8849866bc13ddc2e71c4065d24c4ed4a74c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 15 Jun 2020 22:44:55 +0900
Subject: [PATCH 03290/10326] Populate hit offsets from score processor

---
 .../Judgements/OsuHitCircleJudgementResult.cs | 23 +++++++
 .../Objects/Drawables/DrawableHitCircle.cs    | 28 ++++++++-
 osu.Game.Rulesets.Osu/Scoring/HitOffset.cs    | 23 +++++++
 .../Scoring/OsuScoreProcessor.cs              | 61 ++++++++++++++++++-
 osu.Game/Scoring/ScoreInfo.cs                 |  2 +
 5 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs
 create mode 100644 osu.Game.Rulesets.Osu/Scoring/HitOffset.cs

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs
new file mode 100644
index 0000000000..103d02958d
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs
@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Judgements
+{
+    public class OsuHitCircleJudgementResult : OsuJudgementResult
+    {
+        public HitCircle HitCircle => (HitCircle)HitObject;
+
+        public Vector2? HitPosition;
+        public float? Radius;
+
+        public OsuHitCircleJudgementResult(HitObject hitObject, Judgement judgement)
+            : base(hitObject, judgement)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index d73ad888f4..2f86400b25 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -7,8 +7,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
@@ -32,6 +35,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected virtual OsuSkinComponents CirclePieceComponent => OsuSkinComponents.HitCircle;
 
+        private InputManager inputManager;
+
         public DrawableHitCircle(HitCircle h)
             : base(h)
         {
@@ -86,6 +91,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             AccentColour.BindValueChanged(accent => ApproachCircle.Colour = accent.NewValue, true);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            inputManager = GetContainingInputManager();
+        }
+
         public override double LifetimeStart
         {
             get => base.LifetimeStart;
@@ -126,7 +138,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 return;
             }
 
-            ApplyResult(r => r.Type = result);
+            ApplyResult(r =>
+            {
+                var circleResult = (OsuHitCircleJudgementResult)r;
+
+                if (result != HitResult.Miss)
+                {
+                    var localMousePosition = ToLocalSpace(inputManager.CurrentState.Mouse.Position);
+                    circleResult.HitPosition = HitObject.StackedPosition + (localMousePosition - DrawSize / 2);
+                    circleResult.Radius = (float)HitObject.Radius;
+                }
+
+                circleResult.Type = result;
+            });
         }
 
         protected override void UpdateInitialTransforms()
@@ -172,6 +196,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public Drawable ProxiedLayer => ApproachCircle;
 
+        protected override JudgementResult CreateResult(Judgement judgement) => new OsuHitCircleJudgementResult(HitObject, judgement);
+
         public class HitReceptor : CompositeDrawable, IKeyBindingHandler<OsuAction>
         {
             // IsHovered is used
diff --git a/osu.Game.Rulesets.Osu/Scoring/HitOffset.cs b/osu.Game.Rulesets.Osu/Scoring/HitOffset.cs
new file mode 100644
index 0000000000..e6a5a01b48
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Scoring/HitOffset.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 osuTK;
+
+namespace osu.Game.Rulesets.Osu.Scoring
+{
+    public class HitOffset
+    {
+        public readonly Vector2 Position1;
+        public readonly Vector2 Position2;
+        public readonly Vector2 HitPosition;
+        public readonly float Radius;
+
+        public HitOffset(Vector2 position1, Vector2 position2, Vector2 hitPosition, float radius)
+        {
+            Position1 = position1;
+            Position2 = position2;
+            HitPosition = hitPosition;
+            Radius = radius;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index a9d48df52d..97be372e37 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -2,11 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
@@ -28,6 +32,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
         private const int timing_distribution_centre_bin_index = timing_distribution_bins;
 
         private TimingDistribution timingDistribution;
+        private readonly List<HitOffset> hitOffsets = new List<HitOffset>();
 
         public override void ApplyBeatmap(IBeatmap beatmap)
         {
@@ -39,6 +44,8 @@ namespace osu.Game.Rulesets.Osu.Scoring
             base.ApplyBeatmap(beatmap);
         }
 
+        private OsuHitCircleJudgementResult lastCircleResult;
+
         protected override void OnResultApplied(JudgementResult result)
         {
             base.OnResultApplied(result);
@@ -47,6 +54,8 @@ namespace osu.Game.Rulesets.Osu.Scoring
             {
                 int binOffset = (int)(result.TimeOffset / timingDistribution.BinSize);
                 timingDistribution.Bins[timing_distribution_centre_bin_index + binOffset]++;
+
+                addHitOffset(result);
             }
         }
 
@@ -58,17 +67,67 @@ namespace osu.Game.Rulesets.Osu.Scoring
             {
                 int binOffset = (int)(result.TimeOffset / timingDistribution.BinSize);
                 timingDistribution.Bins[timing_distribution_centre_bin_index + binOffset]--;
+
+                removeHitOffset(result);
             }
         }
 
+        private void addHitOffset(JudgementResult result)
+        {
+            if (!(result is OsuHitCircleJudgementResult circleResult))
+                return;
+
+            if (lastCircleResult == null)
+            {
+                lastCircleResult = circleResult;
+                return;
+            }
+
+            if (circleResult.HitPosition != null)
+            {
+                Debug.Assert(circleResult.Radius != null);
+                hitOffsets.Add(new HitOffset(lastCircleResult.HitCircle.StackedEndPosition, circleResult.HitCircle.StackedEndPosition, circleResult.HitPosition.Value, circleResult.Radius.Value));
+            }
+
+            lastCircleResult = circleResult;
+        }
+
+        private void removeHitOffset(JudgementResult result)
+        {
+            if (!(result is OsuHitCircleJudgementResult circleResult))
+                return;
+
+            if (hitOffsets.Count > 0 && circleResult.HitPosition != null)
+                hitOffsets.RemoveAt(hitOffsets.Count - 1);
+        }
+
         protected override void Reset(bool storeResults)
         {
             base.Reset(storeResults);
 
             timingDistribution.Bins.AsSpan().Clear();
+            hitOffsets.Clear();
         }
 
-        protected override JudgementResult CreateResult(HitObject hitObject, Judgement judgement) => new OsuJudgementResult(hitObject, judgement);
+        public override void PopulateScore(ScoreInfo score)
+        {
+            base.PopulateScore(score);
+
+            score.ExtraStatistics["timing_distribution"] = timingDistribution;
+            score.ExtraStatistics["hit_offsets"] = hitOffsets;
+        }
+
+        protected override JudgementResult CreateResult(HitObject hitObject, Judgement judgement)
+        {
+            switch (hitObject)
+            {
+                case HitCircle _:
+                    return new OsuHitCircleJudgementResult(hitObject, judgement);
+
+                default:
+                    return new OsuJudgementResult(hitObject, judgement);
+            }
+        }
 
         public override HitWindows CreateHitWindows() => new OsuHitWindows();
     }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 7b37c267bc..38b37afc55 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -166,6 +166,8 @@ namespace osu.Game.Scoring
             }
         }
 
+        public Dictionary<string, object> ExtraStatistics = new Dictionary<string, object>();
+
         [JsonIgnore]
         public List<ScoreFileInfo> Files { get; set; }
 

From 89b54be67395cfdaa6ef6b37862e899545e54c72 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 15 Jun 2020 22:45:18 +0900
Subject: [PATCH 03291/10326] Add initial implementation of the statistics
 panel

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 14 ++++
 osu.Game.Rulesets.Osu/Statistics/Heatmap.cs   | 10 ++-
 .../Ranking/TestSceneAccuracyHeatmap.cs       |  4 +-
 .../Ranking/TestScreenStatisticsPanel.cs      | 24 +++++++
 osu.Game/Rulesets/Ruleset.cs                  |  3 +
 .../Ranking/Statistics/StatisticContainer.cs  | 70 +++++++++++++++++++
 .../Ranking/Statistics/StatisticsPanel.cs     | 56 +++++++++++++++
 7 files changed, 179 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestScreenStatisticsPanel.cs
 create mode 100644 osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
 create mode 100644 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 689a7b35ea..a76413480d 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -29,6 +29,8 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
+using osu.Game.Rulesets.Osu.Statistics;
+using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets.Osu
 {
@@ -186,5 +188,17 @@ namespace osu.Game.Rulesets.Osu
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
+
+        public override IEnumerable<StatisticContainer> CreateStatistics(ScoreInfo score) => new[]
+        {
+            new StatisticContainer("Timing Distribution")
+            {
+                Child = new TimingDistributionGraph((TimingDistribution)score.ExtraStatistics.GetValueOrDefault("timing_distribution"))
+            },
+            new StatisticContainer("Accuracy Heatmap")
+            {
+                Child = new Heatmap((List<HitOffset>)score.ExtraStatistics.GetValueOrDefault("hit_offsets"))
+            },
+        };
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
index 8105d12991..89d861a6d1 100644
--- a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
@@ -2,12 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 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.Rulesets.Osu.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -29,10 +31,13 @@ namespace osu.Game.Rulesets.Osu.Statistics
         private const float rotation = 45;
         private const float point_size = 4;
 
+        private readonly IReadOnlyList<HitOffset> offsets;
         private Container<HitPoint> allPoints;
 
-        public Heatmap()
+        public Heatmap(IReadOnlyList<HitOffset> offsets)
         {
+            this.offsets = offsets;
+
             Size = new Vector2(size);
         }
 
@@ -122,6 +127,9 @@ namespace osu.Game.Rulesets.Osu.Statistics
                     });
                 }
             }
+
+            foreach (var o in offsets)
+                AddPoint(o.Position1, o.Position2, o.HitPosition, o.Radius);
         }
 
         public void AddPoint(Vector2 start, Vector2 end, Vector2 hitPoint, float radius)
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
index 9e5fda0ae6..a1b2dccea3 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
@@ -1,12 +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.Collections.Generic;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.Statistics;
 using osuTK;
 using osuTK.Graphics;
@@ -38,7 +40,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 {
                     Position = new Vector2(500, 300),
                 },
-                heatmap = new Heatmap
+                heatmap = new Heatmap(new List<HitOffset>())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Ranking/TestScreenStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestScreenStatisticsPanel.cs
new file mode 100644
index 0000000000..e61cf9568d
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestScreenStatisticsPanel.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 NUnit.Framework;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking.Statistics;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestScreenStatisticsPanel : OsuTestScene
+    {
+        [Test]
+        public void TestScore()
+        {
+            loadPanel(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+        }
+
+        private void loadPanel(ScoreInfo score) => AddStep("load panel", () =>
+        {
+            Child = new StatisticsPanel(score);
+        });
+    }
+}
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 4f28607733..5c349ca557 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -23,6 +23,7 @@ using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Users;
 using JetBrains.Annotations;
+using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets
 {
@@ -208,5 +209,7 @@ namespace osu.Game.Rulesets
         /// </summary>
         /// <returns>An empty frame for the current ruleset, or null if unsupported.</returns>
         public virtual IConvertibleReplayFrame CreateConvertibleReplayFrame() => null;
+
+        public virtual IEnumerable<StatisticContainer> CreateStatistics(ScoreInfo score) => Enumerable.Empty<StatisticContainer>();
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
new file mode 100644
index 0000000000..8d10529496
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.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 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 osuTK;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    public class StatisticContainer : Container
+    {
+        protected override Container<Drawable> Content => content;
+
+        private readonly Container content;
+
+        public StatisticContainer(string name)
+        {
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(5, 0),
+                            Children = new Drawable[]
+                            {
+                                new Circle
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    Height = 9,
+                                    Width = 4,
+                                    Colour = Color4Extensions.FromHex("#00FFAA")
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    Text = name,
+                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
+                                }
+                            }
+                        }
+                    },
+                    new Drawable[]
+                    {
+                        content = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    },
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize),
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
new file mode 100644
index 0000000000..8ab85527db
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Scoring;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    public class StatisticsPanel : CompositeDrawable
+    {
+        public StatisticsPanel(ScoreInfo score)
+        {
+            // Todo: Not correct.
+            RelativeSizeAxes = Axes.Both;
+
+            Container<StatisticContainer> statistics;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4Extensions.FromHex("#333")
+                },
+                new ScorePanel(score) // Todo: Temporary
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    State = PanelState.Expanded,
+                    X = 30
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding
+                    {
+                        Left = ScorePanel.EXPANDED_WIDTH + 30 + 50,
+                        Right = 50
+                    },
+                    Child = statistics = new FillFlowContainer<StatisticContainer>
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Spacing = new Vector2(30, 15),
+                    }
+                }
+            };
+
+            foreach (var s in score.Ruleset.CreateInstance().CreateStatistics(score))
+                statistics.Add(s);
+        }
+    }
+}

From c79d8a425178de9326d3bdb19d96e93bf002ca44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Jun 2020 00:12:32 +0900
Subject: [PATCH 03292/10326] Update ChannelTabControl in line with TabControl
 changes

---
 osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
index cb6abb7cc6..19c6f437b6 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
@@ -78,19 +78,10 @@ namespace osu.Game.Overlays.Chat.Tabs
         /// <param name="channel">The channel that is going to be removed.</param>
         public void RemoveChannel(Channel channel)
         {
-            if (Current.Value == channel)
-            {
-                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);
+
+            if (SelectedTab == null)
+                SelectTab(selectorTab);
         }
 
         protected override void SelectTab(TabItem<Channel> tab)

From a65c1a9abdb358f69065e72b1ebe00ab2e1ee95a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Jun 2020 16:08:41 +0900
Subject: [PATCH 03293/10326] Fix test name

---
 ...TestScreenStatisticsPanel.cs => TestSceneStatisticsPanel.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Ranking/{TestScreenStatisticsPanel.cs => TestSceneStatisticsPanel.cs} (91%)

diff --git a/osu.Game.Tests/Visual/Ranking/TestScreenStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
similarity index 91%
rename from osu.Game.Tests/Visual/Ranking/TestScreenStatisticsPanel.cs
rename to osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index e61cf9568d..22ee6077cb 100644
--- a/osu.Game.Tests/Visual/Ranking/TestScreenStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -8,7 +8,7 @@ using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
-    public class TestScreenStatisticsPanel : OsuTestScene
+    public class TestSceneStatisticsPanel : OsuTestScene
     {
         [Test]
         public void TestScore()

From 9ea7c3dc90474e56bdf07c30988f1cd5007ef919 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Jun 2020 16:31:02 +0900
Subject: [PATCH 03294/10326] Make heatmap support dynamic sizing

---
 osu.Game.Rulesets.Osu/Statistics/Heatmap.cs   | 155 +++++++++++-------
 .../Ranking/TestSceneAccuracyHeatmap.cs       |  16 +-
 2 files changed, 108 insertions(+), 63 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
index 89d861a6d1..7e140e6fd2 100644
--- a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
@@ -9,6 +9,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Layout;
 using osu.Game.Rulesets.Osu.Scoring;
 using osuTK;
 using osuTK.Graphics;
@@ -18,12 +19,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
     public class Heatmap : CompositeDrawable
     {
         /// <summary>
-        /// Full size of the heatmap.
-        /// </summary>
-        private const float size = 130;
-
-        /// <summary>
-        /// Size of the inner circle containing the "hit" points, relative to <see cref="size"/>.
+        /// Size of the inner circle containing the "hit" points, relative to the size of this <see cref="Heatmap"/>.
         /// All other points outside of the inner circle are "miss" points.
         /// </summary>
         private const float inner_portion = 0.8f;
@@ -34,77 +30,106 @@ namespace osu.Game.Rulesets.Osu.Statistics
         private readonly IReadOnlyList<HitOffset> offsets;
         private Container<HitPoint> allPoints;
 
+        private readonly LayoutValue sizeLayout = new LayoutValue(Invalidation.DrawSize);
+
         public Heatmap(IReadOnlyList<HitOffset> offsets)
         {
             this.offsets = offsets;
 
-            Size = new Vector2(size);
+            AddLayout(sizeLayout);
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            InternalChild = new Container
             {
-                new CircularContainer
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                FillMode = FillMode.Fit,
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(inner_portion),
-                    Masking = true,
-                    BorderThickness = 2f,
-                    BorderColour = Color4.White,
-                    Child = new Box
+                    new CircularContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Size = new Vector2(inner_portion),
+                        Masking = true,
+                        BorderThickness = 2f,
+                        BorderColour = Color4.White,
+                        Child = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4Extensions.FromHex("#202624")
+                        }
+                    },
+                    new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4Extensions.FromHex("#202624")
-                    }
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Children = new Drawable[]
-                    {
-                        new Box
+                        Masking = true,
+                        Children = new Drawable[]
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            RelativeSizeAxes = Axes.Y,
-                            Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
-                            Width = 1f,
-                            Rotation = -rotation,
-                            Alpha = 0.3f,
-                        },
-                        new Box
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            RelativeSizeAxes = Axes.Y,
-                            Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
-                            Width = 1f,
-                            Rotation = rotation
-                        },
-                        new Box
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            Width = 10,
-                            Height = 2f,
-                        },
-                        new Box
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            Y = -1,
-                            Width = 2f,
-                            Height = 10,
+                            new Box
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                RelativeSizeAxes = Axes.Y,
+                                Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
+                                Width = 1f,
+                                Rotation = -rotation,
+                                Alpha = 0.3f,
+                            },
+                            new Box
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                RelativeSizeAxes = Axes.Y,
+                                Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
+                                Width = 1f,
+                                Rotation = rotation
+                            },
+                            new Box
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Width = 10,
+                                Height = 2f,
+                            },
+                            new Box
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Y = -1,
+                                Width = 2f,
+                                Height = 10,
+                            }
                         }
+                    },
+                    allPoints = new Container<HitPoint>
+                    {
+                        RelativeSizeAxes = Axes.Both
                     }
-                },
-                allPoints = new Container<HitPoint> { RelativeSizeAxes = Axes.Both }
+                }
             };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            validateHitPoints();
+        }
+
+        private void validateHitPoints()
+        {
+            if (sizeLayout.IsValid)
+                return;
+
+            allPoints.Clear();
+
+            // Since the content is fit, both dimensions should have the same size.
+            float size = allPoints.DrawSize.X;
 
             Vector2 centre = new Vector2(size / 2);
             int rows = (int)Math.Ceiling(size / point_size);
@@ -130,16 +155,24 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
             foreach (var o in offsets)
                 AddPoint(o.Position1, o.Position2, o.HitPosition, o.Radius);
+
+            sizeLayout.Validate();
         }
 
-        public void AddPoint(Vector2 start, Vector2 end, Vector2 hitPoint, float radius)
+        protected void AddPoint(Vector2 start, Vector2 end, Vector2 hitPoint, float radius)
         {
+            if (allPoints.Count == 0)
+                return;
+
             double angle1 = Math.Atan2(end.Y - hitPoint.Y, hitPoint.X - end.X); // Angle between the end point and the hit point.
             double angle2 = Math.Atan2(end.Y - start.Y, start.X - end.X); // Angle between the end point and the start point.
             double finalAngle = angle2 - angle1; // Angle between start, end, and hit points.
 
             float normalisedDistance = Vector2.Distance(hitPoint, end) / radius;
 
+            // Since the content is fit, both dimensions should have the same size.
+            float size = allPoints.DrawSize.X;
+
             // Find the most relevant hit point.
             double minDist = double.PositiveInfinity;
             HitPoint point = null;
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
index a1b2dccea3..53c8e56f53 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Ranking
         private readonly Box background;
         private readonly Drawable object1;
         private readonly Drawable object2;
-        private readonly Heatmap heatmap;
+        private readonly TestHeatmap heatmap;
 
         public TestSceneAccuracyHeatmap()
         {
@@ -40,10 +40,11 @@ namespace osu.Game.Tests.Visual.Ranking
                 {
                     Position = new Vector2(500, 300),
                 },
-                heatmap = new Heatmap(new List<HitOffset>())
+                heatmap = new TestHeatmap(new List<HitOffset>())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    Size = new Vector2(130)
                 }
             };
         }
@@ -70,6 +71,17 @@ namespace osu.Game.Tests.Visual.Ranking
             return true;
         }
 
+        private class TestHeatmap : Heatmap
+        {
+            public TestHeatmap(IReadOnlyList<HitOffset> offsets)
+                : base(offsets)
+            {
+            }
+
+            public new void AddPoint(Vector2 start, Vector2 end, Vector2 hitPoint, float radius)
+                => base.AddPoint(start, end, hitPoint, radius);
+        }
+
         private class BorderCircle : CircularContainer
         {
             public BorderCircle()

From c3d4ffed00655912d207ba0606bbeec4f7106cb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Jun 2020 16:46:33 +0900
Subject: [PATCH 03295/10326] 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 6387356686..b95b794004 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.615.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.616.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8c098b79c6..6ec57e5100 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.615.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.616.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
     <PackageReference Include="Sentry" Version="2.1.3" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 373ad09597..0bfff24805 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.Framework.iOS" Version="2020.615.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.616.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.615.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.616.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3dbe164b2c4da72b25c26d25156bc5a8de3ce28b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Jun 2020 17:20:38 +0900
Subject: [PATCH 03296/10326] Add some very basic safety checks around
 non-existent data

---
 osu.Game.Rulesets.Osu/Statistics/Heatmap.cs                | 7 +++++--
 .../Statistics/TimingDistributionGraph.cs                  | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
index 7e140e6fd2..51508a5e8b 100644
--- a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
@@ -153,8 +153,11 @@ namespace osu.Game.Rulesets.Osu.Statistics
                 }
             }
 
-            foreach (var o in offsets)
-                AddPoint(o.Position1, o.Position2, o.HitPosition, o.Radius);
+            if (offsets?.Count > 0)
+            {
+                foreach (var o in offsets)
+                    AddPoint(o.Position1, o.Position2, o.HitPosition, o.Radius);
+            }
 
             sizeLayout.Validate();
         }
diff --git a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
index a47d726988..0ba94b7101 100644
--- a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Rulesets.Osu.Statistics
         [BackgroundDependencyLoader]
         private void load()
         {
+            if (distribution?.Bins == null || distribution.Bins.Length == 0)
+                return;
+
             int maxCount = distribution.Bins.Max();
 
             var bars = new Drawable[distribution.Bins.Length];

From 076eac2362480a80749a0b42d1caaf7295f25ae3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Jun 2020 17:46:34 +0900
Subject: [PATCH 03297/10326] Inset entire graph rather than just the axis

---
 .../Statistics/TimingDistributionGraph.cs                | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
index 0ba94b7101..1f9f38bf3b 100644
--- a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
@@ -20,12 +20,6 @@ namespace osu.Game.Rulesets.Osu.Statistics
         /// </summary>
         private const float axis_points = 5;
 
-        /// <summary>
-        /// An amount to adjust the value of the axis points by, effectively insetting the axis in the graph.
-        /// Without an inset, the final data point will be placed halfway outside the graph.
-        /// </summary>
-        private const float axis_value_inset = 0.2f;
-
         private readonly TimingDistribution distribution;
 
         public TimingDistributionGraph(TimingDistribution distribution)
@@ -50,6 +44,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
             InternalChild = new GridContainer
             {
                 RelativeSizeAxes = Axes.Both,
+                Width = 0.8f,
                 Content = new[]
                 {
                     new Drawable[]
@@ -80,7 +75,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
             // So our axis will contain one centre element + 5 points on each side, each with a value depending on the number of bins * bin size.
             int sideBins = (distribution.Bins.Length - 1) / 2;
             double maxValue = sideBins * distribution.BinSize;
-            double axisValueStep = maxValue / axis_points * (1 - axis_value_inset);
+            double axisValueStep = maxValue / axis_points;
 
             axisFlow.Add(new OsuSpriteText
             {

From 9442fc00ac408c314ca078bbfa5d3c426adf6aa2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Jun 2020 17:48:59 +0900
Subject: [PATCH 03298/10326] Temporary hack to make replay player populate
 scores

---
 osu.Game/Screens/Play/ReplayPlayer.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index b443603128..d7580ea271 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -27,11 +27,14 @@ namespace osu.Game.Screens.Play
 
         protected override void GotoRanking()
         {
-            this.Push(CreateResults(DrawableRuleset.ReplayScore.ScoreInfo));
+            this.Push(CreateResults(CreateScore()));
         }
 
         protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
 
-        protected override ScoreInfo CreateScore() => score.ScoreInfo;
+        // protected override ScoreInfo CreateScore()
+        // {
+        //     return score.ScoreInfo;
+        // }
     }
 }

From a2ddb4edb456ed7b0c78ff4af1f67e4e3a312289 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Jun 2020 17:49:28 +0900
Subject: [PATCH 03299/10326] Change interface for creating statistic rows

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 37 +++++++++++++++----
 osu.Game/Rulesets/Ruleset.cs                  |  2 +-
 .../Ranking/Statistics/StatisticContainer.cs  |  2 +-
 .../Ranking/Statistics/StatisticRow.cs        | 15 ++++++++
 .../Ranking/Statistics/StatisticsPanel.cs     | 16 ++++++--
 5 files changed, 59 insertions(+), 13 deletions(-)
 create mode 100644 osu.Game/Screens/Ranking/Statistics/StatisticRow.cs

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index a76413480d..67a9bda1a9 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -29,6 +29,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Screens.Ranking.Statistics;
 
@@ -189,16 +190,36 @@ namespace osu.Game.Rulesets.Osu
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
-        public override IEnumerable<StatisticContainer> CreateStatistics(ScoreInfo score) => new[]
+        public override StatisticRow[] CreateStatistics(ScoreInfo score) => new[]
         {
-            new StatisticContainer("Timing Distribution")
+            new StatisticRow
             {
-                Child = new TimingDistributionGraph((TimingDistribution)score.ExtraStatistics.GetValueOrDefault("timing_distribution"))
-            },
-            new StatisticContainer("Accuracy Heatmap")
-            {
-                Child = new Heatmap((List<HitOffset>)score.ExtraStatistics.GetValueOrDefault("hit_offsets"))
-            },
+                Content = new Drawable[]
+                {
+                    new StatisticContainer("Timing Distribution")
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 130,
+                        Child = new TimingDistributionGraph((TimingDistribution)score.ExtraStatistics.GetValueOrDefault("timing_distribution"))
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    },
+                    new StatisticContainer("Accuracy Heatmap")
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Child = new Heatmap((List<HitOffset>)score.ExtraStatistics.GetValueOrDefault("hit_offsets"))
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    },
+                },
+                ColumnDimensions = new[]
+                {
+                    new Dimension(),
+                    new Dimension(GridSizeMode.Absolute, 130),
+                }
+            }
         };
     }
 }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 5c349ca557..f05685b6e9 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -210,6 +210,6 @@ namespace osu.Game.Rulesets
         /// <returns>An empty frame for the current ruleset, or null if unsupported.</returns>
         public virtual IConvertibleReplayFrame CreateConvertibleReplayFrame() => null;
 
-        public virtual IEnumerable<StatisticContainer> CreateStatistics(ScoreInfo score) => Enumerable.Empty<StatisticContainer>();
+        public virtual StatisticRow[] CreateStatistics(ScoreInfo score) => Array.Empty<StatisticRow>();
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
index 8d10529496..d7b42c1c2f 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         {
             InternalChild = new GridContainer
             {
-                RelativeSizeAxes = Axes.X,
+                RelativeSizeAxes = Axes.Both,
                 Content = new[]
                 {
                     new Drawable[]
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
new file mode 100644
index 0000000000..5d39ef57b2
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticRow.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 System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    public class StatisticRow
+    {
+        public Drawable[] Content = Array.Empty<Drawable>();
+        public Dimension[] ColumnDimensions = Array.Empty<Dimension>();
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 8ab85527db..6c5fa1837a 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Ranking.Statistics
             // Todo: Not correct.
             RelativeSizeAxes = Axes.Both;
 
-            Container<StatisticContainer> statistics;
+            FillFlowContainer statisticRows;
 
             InternalChildren = new Drawable[]
             {
@@ -41,16 +41,26 @@ namespace osu.Game.Screens.Ranking.Statistics
                         Left = ScorePanel.EXPANDED_WIDTH + 30 + 50,
                         Right = 50
                     },
-                    Child = statistics = new FillFlowContainer<StatisticContainer>
+                    Child = statisticRows = new FillFlowContainer
                     {
                         RelativeSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
                         Spacing = new Vector2(30, 15),
                     }
                 }
             };
 
             foreach (var s in score.Ruleset.CreateInstance().CreateStatistics(score))
-                statistics.Add(s);
+            {
+                statisticRows.Add(new GridContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Content = new[] { s.Content },
+                    ColumnDimensions = s.ColumnDimensions,
+                    RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
+                });
+            }
         }
     }
 }

From 808e216059e00b52cf7c02a62ea1ca94bd5aaccd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Jun 2020 17:49:37 +0900
Subject: [PATCH 03300/10326] Improve test scene

---
 .../Visual/Ranking/TestSceneStatisticsPanel.cs      | 13 ++++++++++++-
 .../Ranking/TestSceneTimingDistributionGraph.cs     |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index 22ee6077cb..c02be9ab5d 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.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.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking.Statistics;
 
@@ -13,7 +15,16 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestScore()
         {
-            loadPanel(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo)
+            {
+                ExtraStatistics =
+                {
+                    ["timing_distribution"] = TestSceneTimingDistributionGraph.CreateNormalDistribution(),
+                    ["hit_offsets"] = new List<HitOffset>()
+                }
+            };
+
+            loadPanel(score);
         }
 
         private void loadPanel(ScoreInfo score) => AddStep("load panel", () =>
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
index 7530fc42b8..2249655093 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Ranking
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4Extensions.FromHex("#333")
                 },
-                new TimingDistributionGraph(createNormalDistribution())
+                new TimingDistributionGraph(CreateNormalDistribution())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Ranking
             };
         }
 
-        private TimingDistribution createNormalDistribution()
+        public static TimingDistribution CreateNormalDistribution()
         {
             var distribution = new TimingDistribution(51, 5);
 

From e7687a09271d12f5cadf93b00b7ff798733d9340 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Jun 2020 17:49:43 +0900
Subject: [PATCH 03301/10326] Temporary placement inside results screen

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index fbb9b95478..4d589b4527 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -16,6 +16,7 @@ using osu.Game.Online.API;
 using osu.Game.Scoring;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking.Statistics;
 using osuTK;
 
 namespace osu.Game.Screens.Ranking
@@ -134,6 +135,11 @@ namespace osu.Game.Screens.Ranking
                     },
                 });
             }
+
+            AddInternal(new StatisticsPanel(Score)
+            {
+                RelativeSizeAxes = Axes.Both
+            });
         }
 
         protected override void LoadComplete()

From 3f1b9edabe20478578e05f85476d8acaf06eb62d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Jun 2020 20:16:04 +0900
Subject: [PATCH 03302/10326] Fix regression in android build parsing behaviour

---
 osu.Android/OsuGameAndroid.cs | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 19ed7ffcf5..5f936ffce4 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Android.App;
+using Android.OS;
 using osu.Game;
 using osu.Game.Updater;
 
@@ -18,9 +19,32 @@ namespace osu.Android
 
                 try
                 {
-                    // todo: needs checking before play store redeploy.
-                    string versionName = packageInfo.VersionName;
-                    // undo play store version garbling
+                    // We store the osu! build number in the "VersionCode" field to better support google play releases.
+                    // If we were to use the main build number, it would require a new submission each time (similar to TestFlight).
+                    // In order to do this, we should split it up and pad the numbers to still ensure sequential increase over time.
+                    //
+                    // We also need to be aware that older SDK versions store this as a 32bit int.
+                    //
+                    // Basic conversion format (as done in Fastfile): 2020.606.0 -> 202006060
+
+                    // https://stackoverflow.com/questions/52977079/android-sdk-28-versioncode-in-packageinfo-has-been-deprecated
+                    string versionName = string.Empty;
+
+                    if (Build.VERSION.SdkInt >= BuildVersionCodes.P)
+                    {
+                        versionName = packageInfo.LongVersionCode.ToString();
+                        versionName = versionName.Substring(versionName.Length - 9);
+                    }
+                    else
+                    {
+
+#pragma warning disable CS0618 // Type or member is obsolete
+                        // this is required else older SDKs will report missing method exception.
+                        versionName = packageInfo.VersionCode.ToString();
+#pragma warning restore CS0618 // Type or member is obsolete
+                    }
+
+                    // undo play store version garbling (as mentioned above).
                     return new Version(int.Parse(versionName.Substring(0, 4)), int.Parse(versionName.Substring(4, 4)), int.Parse(versionName.Substring(8, 1)));
                 }
                 catch

From 115ea244beb9953c4e189e1cfa426c0f705e1c79 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Jun 2020 20:20:46 +0900
Subject: [PATCH 03303/10326] Add note about substring usage

---
 osu.Android/OsuGameAndroid.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 5f936ffce4..136b85699a 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -33,6 +33,7 @@ namespace osu.Android
                     if (Build.VERSION.SdkInt >= BuildVersionCodes.P)
                     {
                         versionName = packageInfo.LongVersionCode.ToString();
+                        // ensure we only read the trailing portion of long (the part we are interested in).
                         versionName = versionName.Substring(versionName.Length - 9);
                     }
                     else

From c5358cbb6b22d3167efe2a21868d23fc91b523b0 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 16 Jun 2020 21:01:10 +0900
Subject: [PATCH 03304/10326] Remove blank line

---
 osu.Android/OsuGameAndroid.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 136b85699a..7542a2b997 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -38,7 +38,6 @@ namespace osu.Android
                     }
                     else
                     {
-
 #pragma warning disable CS0618 // Type or member is obsolete
                         // this is required else older SDKs will report missing method exception.
                         versionName = packageInfo.VersionCode.ToString();
@@ -58,4 +57,4 @@ namespace osu.Android
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
     }
-}
\ No newline at end of file
+}

From 693a760a193e8521d7db350318bd9a1e93d4f9db Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 16 Jun 2020 15:44:59 +0200
Subject: [PATCH 03305/10326] Use RelativeSizeAxes for width

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

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index a431752369..711c7b64e4 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -120,9 +120,9 @@ namespace osu.Game.Screens.Menu
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Scale = new Vector2(0.3f),
-                        Width = 750,
-                        Height = 78,
+                        RelativeSizeAxes = Axes.X,
+                        Scale = new Vector2(0.1f),
+                        Height = 156,
                         Alpha = 0,
                         Texture = textures.Get(@"Welcome/welcome_text")
                     },

From 1cf16038a708f1c586b6405b58bb3d70082cf2c5 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 16 Jun 2020 14:54:05 +0100
Subject: [PATCH 03306/10326] Create IApplicableToSample

---
 osu.Game/Rulesets/Mods/IApplicableToSample.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 osu.Game/Rulesets/Mods/IApplicableToSample.cs

diff --git a/osu.Game/Rulesets/Mods/IApplicableToSample.cs b/osu.Game/Rulesets/Mods/IApplicableToSample.cs
new file mode 100644
index 0000000000..559d127cfc
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/IApplicableToSample.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.Audio.Sample;
+
+namespace osu.Game.Rulesets.Mods
+{
+    /// <summary>
+    /// An interface for mods that make adjustments to a sample.
+    /// </summary>
+    public interface IApplicableToSample : IApplicableMod
+    {
+        void ApplyToSample(SampleChannel sample);
+    }
+}

From 9f4f3ce2cc055867cbfe58f723c334f7b08b1448 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 16 Jun 2020 14:54:50 +0100
Subject: [PATCH 03307/10326] Handle IApplicableToSample mods

---
 .../Storyboards/Drawables/DrawableStoryboardSample.cs  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 8292b02068..2b9c66d2e6 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -1,11 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -28,12 +31,17 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap)
+        private void load(IBindable<WorkingBeatmap> beatmap, IBindable<IReadOnlyList<Mod>> mods)
         {
             channel = beatmap.Value.Skin.GetSample(sampleInfo);
 
             if (channel != null)
+            {
                 channel.Volume.Value = sampleInfo.Volume / 100.0;
+
+                foreach (var mod in mods.Value.OfType<IApplicableToSample>())
+                    mod.ApplyToSample(channel);
+            }
         }
 
         protected override void Update()

From 4138f6119f24ce50991a64c89cd91e4c5fa28a23 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 16 Jun 2020 14:58:23 +0100
Subject: [PATCH 03308/10326] Update rate adjust mods to also use
 IApplicableToSample

---
 osu.Game/Rulesets/Mods/ModRateAdjust.cs | 8 +++++++-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs   | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index cb2ff149f1..ecd625c3b4 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -2,12 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModRateAdjust : Mod, IApplicableToTrack
+    public abstract class ModRateAdjust : Mod, IApplicableToTrack, IApplicableToSample
     {
         public abstract BindableNumber<double> SpeedChange { get; }
 
@@ -16,6 +17,11 @@ namespace osu.Game.Rulesets.Mods
             track.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
         }
 
+        public virtual void ApplyToSample(SampleChannel sample)
+        {
+            sample.AddAdjustment(AdjustableProperty.Frequency, SpeedChange);
+        }
+
         public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N2}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index df059eef7d..352e3ae915 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -10,10 +10,11 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Objects;
+using osu.Framework.Audio.Sample;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModTimeRamp : Mod, IUpdatableByPlayfield, IApplicableToBeatmap, IApplicableToTrack
+    public abstract class ModTimeRamp : Mod, IUpdatableByPlayfield, IApplicableToBeatmap, IApplicableToTrack, IApplicableToSample
     {
         /// <summary>
         /// The point in the beatmap at which the final ramping rate should be reached.
@@ -58,6 +59,11 @@ namespace osu.Game.Rulesets.Mods
             AdjustPitch.TriggerChange();
         }
 
+        public void ApplyToSample(SampleChannel sample)
+        {
+            sample.AddAdjustment(AdjustableProperty.Frequency, SpeedChange);
+        }
+
         public virtual void ApplyToBeatmap(IBeatmap beatmap)
         {
             HitObject lastObject = beatmap.HitObjects.LastOrDefault();

From 29ae1c460aa9564c6fc04ffa0d001d1139c42c43 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 16 Jun 2020 17:00:20 +0200
Subject: [PATCH 03309/10326] TournamentStorage now takes in a parent storage

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 28 ++++++++++-----------
 osu.Game.Tournament/TournamentGameBase.cs   |  8 +++---
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 05ee7a3618..d6e95bc4b6 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -13,18 +13,18 @@ namespace osu.Game.Tournament.IO
 {
     public class TournamentStorage : WrappedStorage
     {
-        private readonly GameHost host;
+        private readonly Storage storage;
         internal readonly TournamentVideoResourceStore VideoStore;
         internal readonly Storage ConfigurationStorage;
         private const string default_tournament = "default";
         private const string config_directory = "config";
 
-        public TournamentStorage(GameHost host)
-            : base(host.Storage.GetStorageForDirectory("tournaments"), string.Empty)
+        public TournamentStorage(Storage storage)
+            : base(storage.GetStorageForDirectory("tournaments"), string.Empty)
         {
-            this.host = host;
+            this.storage = storage;
 
-            TournamentStorageManager storageConfig = new TournamentStorageManager(host.Storage);
+            TournamentStorageManager storageConfig = new TournamentStorageManager(storage);
 
             var currentTournament = storageConfig.Get<string>(StorageConfig.CurrentTournament);
 
@@ -48,7 +48,7 @@ namespace osu.Game.Tournament.IO
 
         internal void Migrate()
         {
-            var source = new DirectoryInfo(host.Storage.GetFullPath("tournament"));
+            var source = new DirectoryInfo(storage.GetFullPath("tournament"));
             var destination = new DirectoryInfo(GetFullPath(default_tournament));
             var cfgDestination = new DirectoryInfo(GetFullPath(default_tournament + Path.DirectorySeparatorChar + config_directory));
 
@@ -58,31 +58,31 @@ namespace osu.Game.Tournament.IO
             if (!cfgDestination.Exists)
                 destination.CreateSubdirectory(config_directory);
 
-            if (host.Storage.Exists("bracket.json"))
+            if (storage.Exists("bracket.json"))
             {
                 Logger.Log("Migrating bracket to default tournament storage.");
-                var bracketFile = new System.IO.FileInfo(host.Storage.GetFullPath("bracket.json"));
+                var bracketFile = new System.IO.FileInfo(storage.GetFullPath("bracket.json"));
                 moveFile(bracketFile, destination);
             }
 
-            if (host.Storage.Exists("drawings.txt"))
+            if (storage.Exists("drawings.txt"))
             {
                 Logger.Log("Migrating drawings to default tournament storage.");
-                var drawingsFile = new System.IO.FileInfo(host.Storage.GetFullPath("drawings.txt"));
+                var drawingsFile = new System.IO.FileInfo(storage.GetFullPath("drawings.txt"));
                 moveFile(drawingsFile, destination);
             }
 
-            if (host.Storage.Exists("drawings.ini"))
+            if (storage.Exists("drawings.ini"))
             {
                 Logger.Log("Migrating drawing configuration to default tournament storage.");
-                var drawingsConfigFile = new System.IO.FileInfo(host.Storage.GetFullPath("drawings.ini"));
+                var drawingsConfigFile = new System.IO.FileInfo(storage.GetFullPath("drawings.ini"));
                 moveFile(drawingsConfigFile, cfgDestination);
             }
 
-            if (host.Storage.Exists("drawings_results.txt"))
+            if (storage.Exists("drawings_results.txt"))
             {
                 Logger.Log("Migrating drawings results to default tournament storage.");
-                var drawingsResultsFile = new System.IO.FileInfo(host.Storage.GetFullPath("drawings_results.txt"));
+                var drawingsResultsFile = new System.IO.FileInfo(storage.GetFullPath("drawings_results.txt"));
                 moveFile(drawingsResultsFile, destination);
             }
 
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index a779135345..7ec8d0f18a 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -8,6 +8,7 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
+using osu.Framework.Platform;
 using osu.Framework.IO.Stores;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests;
@@ -23,11 +24,8 @@ namespace osu.Game.Tournament
     public class TournamentGameBase : OsuGameBase
     {
         private const string bracket_filename = "bracket.json";
-
         private LadderInfo ladder;
-
         private TournamentStorage storage;
-
         private DependencyContainer dependencies;
         private FileBasedIPC ipc;
 
@@ -37,11 +35,11 @@ namespace osu.Game.Tournament
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(Storage baseStorage)
         {
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
-            dependencies.CacheAs(storage = new TournamentStorage(Host));
+            dependencies.CacheAs(storage = new TournamentStorage(baseStorage));
 
             Textures.AddStore(new TextureLoaderStore(storage.VideoStore));
 

From b75fd7bfa8756addf028665492b456334d55b620 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 16 Jun 2020 17:14:54 +0200
Subject: [PATCH 03310/10326] Refactor moving logic (1/2)

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 43 +++++++--------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index d6e95bc4b6..1962cc46d8 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -57,34 +57,11 @@ namespace osu.Game.Tournament.IO
 
             if (!cfgDestination.Exists)
                 destination.CreateSubdirectory(config_directory);
-
-            if (storage.Exists("bracket.json"))
-            {
-                Logger.Log("Migrating bracket to default tournament storage.");
-                var bracketFile = new System.IO.FileInfo(storage.GetFullPath("bracket.json"));
-                moveFile(bracketFile, destination);
-            }
-
-            if (storage.Exists("drawings.txt"))
-            {
-                Logger.Log("Migrating drawings to default tournament storage.");
-                var drawingsFile = new System.IO.FileInfo(storage.GetFullPath("drawings.txt"));
-                moveFile(drawingsFile, destination);
-            }
-
-            if (storage.Exists("drawings.ini"))
-            {
-                Logger.Log("Migrating drawing configuration to default tournament storage.");
-                var drawingsConfigFile = new System.IO.FileInfo(storage.GetFullPath("drawings.ini"));
-                moveFile(drawingsConfigFile, cfgDestination);
-            }
-
-            if (storage.Exists("drawings_results.txt"))
-            {
-                Logger.Log("Migrating drawings results to default tournament storage.");
-                var drawingsResultsFile = new System.IO.FileInfo(storage.GetFullPath("drawings_results.txt"));
-                moveFile(drawingsResultsFile, destination);
-            }
+            
+            moveFileIfExists("bracket.json", destination);
+            moveFileIfExists("drawings.txt", destination);
+            moveFileIfExists("drawings_results.txt", destination);
+            moveFileIfExists("drawings.ini", cfgDestination);
 
             if (source.Exists)
             {
@@ -94,6 +71,16 @@ namespace osu.Game.Tournament.IO
             }
         }
 
+        private void moveFileIfExists(string file, DirectoryInfo destination)
+        {
+            if (storage.Exists(file))
+            {
+                Logger.Log($"Migrating {file} to default tournament storage.");
+                var fileInfo = new System.IO.FileInfo(storage.GetFullPath(file));
+                moveFile(fileInfo, destination);
+            }
+        }
+
         private void copyRecursive(DirectoryInfo source, DirectoryInfo destination)
         {
             // based off example code https://docs.microsoft.com/en-us/dotnet/api/system.io.directoryinfo

From 02d66c4856626e60226e1a4ebcac6dffdcef13a7 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 16 Jun 2020 17:15:43 +0200
Subject: [PATCH 03311/10326] Refactor moving (2/2)

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 1962cc46d8..611592e0e3 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Tournament.IO
 
             if (!cfgDestination.Exists)
                 destination.CreateSubdirectory(config_directory);
-            
+
             moveFileIfExists("bracket.json", destination);
             moveFileIfExists("drawings.txt", destination);
             moveFileIfExists("drawings_results.txt", destination);
@@ -77,7 +77,8 @@ namespace osu.Game.Tournament.IO
             {
                 Logger.Log($"Migrating {file} to default tournament storage.");
                 var fileInfo = new System.IO.FileInfo(storage.GetFullPath(file));
-                moveFile(fileInfo, destination);
+                attemptOperation(() => fileInfo.CopyTo(Path.Combine(destination.FullName, fileInfo.Name), true));
+                fileInfo.Delete();
             }
         }
 
@@ -112,12 +113,6 @@ namespace osu.Game.Tournament.IO
                 attemptOperation(target.Delete);
         }
 
-        private void moveFile(System.IO.FileInfo file, DirectoryInfo destination)
-        {
-            attemptOperation(() => file.CopyTo(Path.Combine(destination.FullName, file.Name), true));
-            file.Delete();
-        }
-
         private void attemptOperation(Action action, int attempts = 10)
         {
             while (true)

From dd9697032c0071931eecf6b563c1774647ae33dd Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 16 Jun 2020 17:39:20 +0200
Subject: [PATCH 03312/10326] Introduce new class MigratableStorage

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 70 +++------------
 osu.Game/IO/MigratableStorage.cs            | 95 +++++++++++++++++++++
 2 files changed, 105 insertions(+), 60 deletions(-)
 create mode 100644 osu.Game/IO/MigratableStorage.cs

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 611592e0e3..1731b96095 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -11,7 +11,7 @@ using osu.Game.Tournament.Configuration;
 
 namespace osu.Game.Tournament.IO
 {
-    public class TournamentStorage : WrappedStorage
+    public class TournamentStorage : MigratableStorage
     {
         private readonly Storage storage;
         internal readonly TournamentVideoResourceStore VideoStore;
@@ -52,8 +52,15 @@ namespace osu.Game.Tournament.IO
             var destination = new DirectoryInfo(GetFullPath(default_tournament));
             var cfgDestination = new DirectoryInfo(GetFullPath(default_tournament + Path.DirectorySeparatorChar + config_directory));
 
-            if (!destination.Exists)
-                destination.Create();
+            // if (!destination.Exists)
+            //     destination.Create();
+
+            if (source.Exists)
+            {
+                Logger.Log("Migrating tournament assets to default tournament storage.");
+                copyRecursive(source, destination);
+                deleteRecursive(source);
+            }
 
             if (!cfgDestination.Exists)
                 destination.CreateSubdirectory(config_directory);
@@ -62,13 +69,6 @@ namespace osu.Game.Tournament.IO
             moveFileIfExists("drawings.txt", destination);
             moveFileIfExists("drawings_results.txt", destination);
             moveFileIfExists("drawings.ini", cfgDestination);
-
-            if (source.Exists)
-            {
-                Logger.Log("Migrating tournament assets to default tournament storage.");
-                copyRecursive(source, destination);
-                deleteRecursive(source);
-            }
         }
 
         private void moveFileIfExists(string file, DirectoryInfo destination)
@@ -81,55 +81,5 @@ namespace osu.Game.Tournament.IO
                 fileInfo.Delete();
             }
         }
-
-        private void copyRecursive(DirectoryInfo source, DirectoryInfo destination)
-        {
-            // based off example code https://docs.microsoft.com/en-us/dotnet/api/system.io.directoryinfo
-
-            foreach (System.IO.FileInfo fi in source.GetFiles())
-            {
-                attemptOperation(() => fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true));
-            }
-
-            foreach (DirectoryInfo dir in source.GetDirectories())
-            {
-                copyRecursive(dir, destination.CreateSubdirectory(dir.Name));
-            }
-        }
-
-        private void deleteRecursive(DirectoryInfo target)
-        {
-            foreach (System.IO.FileInfo fi in target.GetFiles())
-            {
-                attemptOperation(() => fi.Delete());
-            }
-
-            foreach (DirectoryInfo dir in target.GetDirectories())
-            {
-                attemptOperation(() => dir.Delete(true));
-            }
-
-            if (target.GetFiles().Length == 0 && target.GetDirectories().Length == 0)
-                attemptOperation(target.Delete);
-        }
-
-        private void attemptOperation(Action action, int attempts = 10)
-        {
-            while (true)
-            {
-                try
-                {
-                    action();
-                    return;
-                }
-                catch (Exception)
-                {
-                    if (attempts-- == 0)
-                        throw;
-                }
-
-                Thread.Sleep(250);
-            }
-        }
     }
 }
diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
new file mode 100644
index 0000000000..0ab0ea9934
--- /dev/null
+++ b/osu.Game/IO/MigratableStorage.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;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using osu.Framework.Logging;
+using osu.Framework.Platform;
+using osu.Game.Configuration;
+
+namespace osu.Game.IO
+{
+    public abstract class MigratableStorage : WrappedStorage
+    {
+
+        virtual protected string[] IGNORE_DIRECTORIES { get; set; } = Array.Empty<string>();
+
+        virtual protected string[] IGNORE_FILES { get; set; } = Array.Empty<string>();
+
+        public MigratableStorage(Storage storage, string subPath = null)
+            : base(storage, subPath)
+        {
+        }
+
+        protected void deleteRecursive(DirectoryInfo target, bool topLevelExcludes = true)
+        {
+            foreach (System.IO.FileInfo fi in target.GetFiles())
+            {
+                if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
+                    continue;
+
+                attemptOperation(() => fi.Delete());
+            }
+
+            foreach (DirectoryInfo dir in target.GetDirectories())
+            {
+                if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
+                    continue;
+
+                attemptOperation(() => dir.Delete(true));
+            }
+
+            if (target.GetFiles().Length == 0 && target.GetDirectories().Length == 0)
+                attemptOperation(target.Delete);
+        }
+
+        protected void copyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true)
+        {
+            // based off example code https://docs.microsoft.com/en-us/dotnet/api/system.io.directoryinfo
+            if (!destination.Exists)
+            Directory.CreateDirectory(destination.FullName);
+
+            foreach (System.IO.FileInfo fi in source.GetFiles())
+            {
+                if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
+                    continue;
+
+                attemptOperation(() => fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true));
+            }
+
+            foreach (DirectoryInfo dir in source.GetDirectories())
+            {
+                if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
+                    continue;
+
+                copyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);
+            }
+        }
+
+        /// <summary>
+        /// Attempt an IO operation multiple times and only throw if none of the attempts succeed.
+        /// </summary>
+        /// <param name="action">The action to perform.</param>
+        /// <param name="attempts">The number of attempts (250ms wait between each).</param>
+        protected static void attemptOperation(Action action, int attempts = 10)
+        {
+            while (true)
+            {
+                try
+                {
+                    action();
+                    return;
+                }
+                catch (Exception)
+                {
+                    if (attempts-- == 0)
+                        throw;
+                }
+
+                Thread.Sleep(250);
+            }
+        }
+    }
+}

From 5e74985edafa034306c4559d32e99aa495697d80 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Jun 2020 19:28:40 +0900
Subject: [PATCH 03313/10326] Add scrolling capability to results screen

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 61 +++++++++++++++--------
 1 file changed, 41 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 4d589b4527..11ed9fb5b7 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Screens.Ranking
     public abstract class ResultsScreen : OsuScreen
     {
         protected const float BACKGROUND_BLUR = 20;
+        private static readonly float screen_height = 768 - TwoLayerButton.SIZE_EXTENDED.Y;
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
@@ -68,10 +69,24 @@ namespace osu.Game.Screens.Ranking
                     {
                         new ResultsScrollContainer
                         {
-                            Child = panels = new ScorePanelList
+                            Child = new FillFlowContainer
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                SelectedScore = { BindTarget = SelectedScore }
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Children = new Drawable[]
+                                {
+                                    panels = new ScorePanelList
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        Height = screen_height,
+                                        SelectedScore = { BindTarget = SelectedScore }
+                                    },
+                                    new StatisticsPanel(Score)
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        Height = screen_height,
+                                    }
+                                }
                             }
                         }
                     },
@@ -135,11 +150,6 @@ namespace osu.Game.Screens.Ranking
                     },
                 });
             }
-
-            AddInternal(new StatisticsPanel(Score)
-            {
-                RelativeSizeAxes = Axes.Both
-            });
         }
 
         protected override void LoadComplete()
@@ -180,27 +190,38 @@ namespace osu.Game.Screens.Ranking
             return base.OnExiting(next);
         }
 
+        [Cached]
         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()
+            protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
             {
-                base.Update();
-                content.Height = Math.Max(768 - TwoLayerButton.SIZE_EXTENDED.Y, DrawHeight);
+                if (!animated)
+                {
+                    // If the user is scrolling via mouse drag, follow the mouse 1:1.
+                    base.OnUserScroll(value, false, distanceDecay);
+                }
+                else
+                {
+                    float direction = Math.Sign(value - Target);
+                    float target = Target + direction * screen_height;
+
+                    if (target <= -screen_height / 2 || target >= ScrollableExtent + screen_height / 2)
+                    {
+                        // If the user is already at either extent and scrolling in the clamped direction, we want to follow the default scroll exactly so that the bounces aren't too harsh.
+                        base.OnUserScroll(value, true, distanceDecay);
+                    }
+                    else
+                    {
+                        // Otherwise, scroll one screen in the target direction.
+                        base.OnUserScroll(target, true, distanceDecay);
+                    }
+                }
             }
         }
     }

From c3e268616fdd1b44cc146f0a07b7e05cd788866f Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Wed, 17 Jun 2020 11:43:32 +0100
Subject: [PATCH 03314/10326] Implement grouping interface IApplicableToAudio

---
 osu.Game/Rulesets/Mods/IApplicableToAudio.cs | 10 ++++++++++
 osu.Game/Rulesets/Mods/ModRateAdjust.cs      |  2 +-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs        |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/IApplicableToAudio.cs

diff --git a/osu.Game/Rulesets/Mods/IApplicableToAudio.cs b/osu.Game/Rulesets/Mods/IApplicableToAudio.cs
new file mode 100644
index 0000000000..40e13764c6
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/IApplicableToAudio.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public interface IApplicableToAudio : IApplicableToTrack, IApplicableToSample
+    {
+    }
+}
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index ecd625c3b4..874384686f 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -8,7 +8,7 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModRateAdjust : Mod, IApplicableToTrack, IApplicableToSample
+    public abstract class ModRateAdjust : Mod, IApplicableToAudio
     {
         public abstract BindableNumber<double> SpeedChange { get; }
 
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 352e3ae915..cbd07efa97 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -14,7 +14,7 @@ using osu.Framework.Audio.Sample;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModTimeRamp : Mod, IUpdatableByPlayfield, IApplicableToBeatmap, IApplicableToTrack, IApplicableToSample
+    public abstract class ModTimeRamp : Mod, IUpdatableByPlayfield, IApplicableToBeatmap, IApplicableToAudio
     {
         /// <summary>
         /// The point in the beatmap at which the final ramping rate should be reached.

From 725b2e540bdfd86d836c6345f6e6ea1daead0865 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Jun 2020 22:29:00 +0900
Subject: [PATCH 03315/10326] wip

---
 .../Visual/Ranking/TestSceneScorePanel.cs     | 38 ++++++++
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 89 +++++++++++++------
 osu.Game/Screens/Ranking/ScorePanel.cs        | 60 +++++++++++++
 osu.Game/Screens/Ranking/ScorePanelList.cs    | 59 +++++++++---
 .../Ranking/Statistics/StatisticsPanel.cs     |  7 --
 5 files changed, 205 insertions(+), 48 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
index 250fdc5ebd..1c5087ee94 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -101,6 +102,39 @@ namespace osu.Game.Tests.Visual.Ranking
             AddWaitStep("wait for transition", 10);
         }
 
+        [Test]
+        public void TestSceneTrackingScorePanel()
+        {
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Accuracy = 0.925, Rank = ScoreRank.A };
+
+            addPanelStep(score, PanelState.Contracted);
+
+            AddStep("enable tracking", () =>
+            {
+                panel.Anchor = Anchor.CentreLeft;
+                panel.Origin = Anchor.CentreLeft;
+                panel.Tracking = true;
+
+                Add(panel.CreateTrackingComponent().With(d =>
+                {
+                    d.Anchor = Anchor.Centre;
+                    d.Origin = Anchor.Centre;
+                }));
+            });
+
+            assertTracking(true);
+
+            AddStep("expand panel", () => panel.State = PanelState.Expanded);
+            AddWaitStep("wait for transition", 2);
+            assertTracking(true);
+
+            AddStep("stop tracking", () => panel.Tracking = false);
+            assertTracking(false);
+
+            AddStep("start tracking", () => panel.Tracking = true);
+            assertTracking(true);
+        }
+
         private void addPanelStep(ScoreInfo score, PanelState state = PanelState.Expanded) => AddStep("add panel", () =>
         {
             Child = panel = new ScorePanel(score)
@@ -110,5 +144,9 @@ namespace osu.Game.Tests.Visual.Ranking
                 State = state
             };
         });
+
+        private void assertTracking(bool tracking) => AddAssert($"{(tracking ? "is" : "is not")} tracking", () =>
+            Precision.AlmostEquals(panel.ScreenSpaceDrawQuad.TopLeft, panel.CreateTrackingComponent().ScreenSpaceDrawQuad.TopLeft) == tracking
+            && Precision.AlmostEquals(panel.ScreenSpaceDrawQuad.BottomRight, panel.CreateTrackingComponent().ScreenSpaceDrawQuad.BottomRight) == tracking);
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 11ed9fb5b7..4ef012f6f2 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -10,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
@@ -44,6 +46,9 @@ namespace osu.Game.Screens.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        private Container<ScorePanel> scorePanelContainer;
+        private ResultsScrollContainer scrollContainer;
+        private Container expandedPanelProxyContainer;
         private Drawable bottomPanel;
         private ScorePanelList panels;
 
@@ -58,6 +63,13 @@ namespace osu.Game.Screens.Ranking
         [BackgroundDependencyLoader]
         private void load()
         {
+            scorePanelContainer = new Container<ScorePanel>
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+            };
+
             FillFlowContainer buttons;
 
             InternalChild = new GridContainer
@@ -67,26 +79,35 @@ namespace osu.Game.Screens.Ranking
                 {
                     new Drawable[]
                     {
-                        new ResultsScrollContainer
+                        new Container
                         {
-                            Child = new FillFlowContainer
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Children = new Drawable[]
+                                scorePanelContainer,
+                                scrollContainer = new ResultsScrollContainer
                                 {
-                                    panels = new ScorePanelList
+                                    Child = new FillFlowContainer
                                     {
                                         RelativeSizeAxes = Axes.X,
-                                        Height = screen_height,
-                                        SelectedScore = { BindTarget = SelectedScore }
-                                    },
-                                    new StatisticsPanel(Score)
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        Height = screen_height,
+                                        AutoSizeAxes = Axes.Y,
+                                        Children = new Drawable[]
+                                        {
+                                            panels = new ScorePanelList(scorePanelContainer)
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                Height = screen_height,
+                                                SelectedScore = { BindTarget = SelectedScore }
+                                            },
+                                            new StatisticsPanel(Score)
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                Height = screen_height,
+                                            }
+                                        }
                                     }
-                                }
+                                },
+                                expandedPanelProxyContainer = new Container { RelativeSizeAxes = Axes.Both }
                             }
                         }
                     },
@@ -173,6 +194,21 @@ namespace osu.Game.Screens.Ranking
         /// <returns>An <see cref="APIRequest"/> responsible for the fetch operation. This will be queued and performed automatically.</returns>
         protected virtual APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            ScorePanel expandedPanel = scorePanelContainer.Single(p => p.State == PanelState.Expanded);
+            expandedPanel.Tracking = false;
+            expandedPanel.Anchor = Anchor.Centre;
+            expandedPanel.Origin = Anchor.Centre;
+
+            scorePanelContainer.X = (float)Interpolation.Lerp(0, -DrawWidth / 2 + ScorePanel.EXPANDED_WIDTH / 2f, Math.Clamp(scrollContainer.Current / (screen_height * 0.8f), 0, 1));
+
+            if (expandedPanelProxyContainer.Count == 0)
+                expandedPanelProxyContainer.Add(expandedPanel.CreateProxy());
+        }
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
@@ -205,22 +241,21 @@ namespace osu.Game.Screens.Ranking
                 {
                     // If the user is scrolling via mouse drag, follow the mouse 1:1.
                     base.OnUserScroll(value, false, distanceDecay);
+                    return;
+                }
+
+                float direction = Math.Sign(value - Target);
+                float target = Target + direction * screen_height;
+
+                if (target <= -screen_height / 2 || target >= ScrollableExtent + screen_height / 2)
+                {
+                    // If the user is already at either extent and scrolling in the clamped direction, we want to follow the default scroll exactly so that the bounces aren't too harsh.
+                    base.OnUserScroll(value, true, distanceDecay);
                 }
                 else
                 {
-                    float direction = Math.Sign(value - Target);
-                    float target = Target + direction * screen_height;
-
-                    if (target <= -screen_height / 2 || target >= ScrollableExtent + screen_height / 2)
-                    {
-                        // If the user is already at either extent and scrolling in the clamped direction, we want to follow the default scroll exactly so that the bounces aren't too harsh.
-                        base.OnUserScroll(value, true, distanceDecay);
-                    }
-                    else
-                    {
-                        // Otherwise, scroll one screen in the target direction.
-                        base.OnUserScroll(target, true, distanceDecay);
-                    }
+                    // Otherwise, scroll one screen in the target direction.
+                    base.OnUserScroll(target, true, distanceDecay);
                 }
             }
         }
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 65fb901c89..7ca96a9a58 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -182,6 +182,40 @@ namespace osu.Game.Screens.Ranking
             }
         }
 
+        private bool tracking;
+        private Vector2 lastNonTrackingPosition;
+
+        /// <summary>
+        /// Whether this <see cref="ScorePanel"/> should track the position of the tracking component created via <see cref="CreateTrackingComponent"/>.
+        /// </summary>
+        public bool Tracking
+        {
+            get => tracking;
+            set
+            {
+                if (tracking == value)
+                    return;
+
+                tracking = value;
+
+                if (tracking)
+                    lastNonTrackingPosition = Position;
+                else
+                    Position = lastNonTrackingPosition;
+            }
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (Tracking && trackingComponent != null)
+            {
+                Vector2 topLeftPos = Parent.ToLocalSpace(trackingComponent.ScreenSpaceDrawQuad.TopLeft);
+                Position = topLeftPos - AnchorPosition + OriginPosition;
+            }
+        }
+
         private void updateState()
         {
             topLayerContent?.FadeOut(content_fade_duration).Expire();
@@ -248,5 +282,31 @@ namespace osu.Game.Screens.Ranking
             => base.ReceivePositionalInputAt(screenSpacePos)
                || topLayerContainer.ReceivePositionalInputAt(screenSpacePos)
                || middleLayerContainer.ReceivePositionalInputAt(screenSpacePos);
+
+        private TrackingComponent trackingComponent;
+
+        public TrackingComponent CreateTrackingComponent() => trackingComponent ??= new TrackingComponent(this);
+
+        public class TrackingComponent : Drawable
+        {
+            public readonly ScorePanel Panel;
+
+            public TrackingComponent(ScorePanel panel)
+            {
+                Panel = panel;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                Size = Panel.DrawSize;
+            }
+
+            // In ScorePanelList, score panels are added _before_ the flow, but this means that input will be blocked by the scroll container.
+            // So by forwarding input events, we remove the need to consider the order in which input is handled.
+            protected override bool OnClick(ClickEvent e) => Panel.TriggerEvent(e);
+
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Panel.ReceivePositionalInputAt(screenSpacePos);
+        }
     }
 }
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 1142297274..d49085bc96 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -27,11 +28,20 @@ namespace osu.Game.Screens.Ranking
 
         public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
 
+        private readonly Container<ScorePanel> panels;
         private readonly Flow flow;
         private readonly Scroll scroll;
         private ScorePanel expandedPanel;
 
-        public ScorePanelList()
+        /// <summary>
+        /// Creates a new <see cref="ScorePanelList"/>.
+        /// </summary>
+        /// <param name="panelTarget">The target container in which <see cref="ScorePanel"/>s should reside.
+        /// <see cref="ScorePanel"/>s are set to track by default, but this allows
+        /// This should be placed _before_ the <see cref="ScorePanelList"/> in the hierarchy.
+        /// <remarks></remarks>
+        /// </param>
+        public ScorePanelList(Container<ScorePanel> panelTarget = null)
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -47,6 +57,18 @@ namespace osu.Game.Screens.Ranking
                     AutoSizeAxes = Axes.Both,
                 }
             };
+
+            if (panelTarget == null)
+            {
+                // To prevent 1-frame sizing issues, the panel container is added _before_ the scroll + flow containers
+                AddInternal(panels = new Container<ScorePanel>
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = 1
+                });
+            }
+            else
+                panels = panelTarget;
         }
 
         protected override void LoadComplete()
@@ -62,10 +84,9 @@ namespace osu.Game.Screens.Ranking
         /// <param name="score">The <see cref="ScoreInfo"/> to add.</param>
         public void AddScore(ScoreInfo score)
         {
-            flow.Add(new ScorePanel(score)
+            var panel = new ScorePanel(score)
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
+                Tracking = true
             }.With(p =>
             {
                 p.StateChanged += s =>
@@ -73,6 +94,13 @@ namespace osu.Game.Screens.Ranking
                     if (s == PanelState.Expanded)
                         SelectedScore.Value = p.Score;
                 };
+            });
+
+            panels.Add(panel);
+            flow.Add(panel.CreateTrackingComponent().With(d =>
+            {
+                d.Anchor = Anchor.Centre;
+                d.Origin = Anchor.Centre;
             }));
 
             if (SelectedScore.Value == score)
@@ -99,14 +127,15 @@ namespace osu.Game.Screens.Ranking
         private void selectedScoreChanged(ValueChangedEvent<ScoreInfo> score)
         {
             // Contract the old panel.
-            foreach (var p in flow.Where(p => p.Score == score.OldValue))
+            foreach (var t in flow.Where(t => t.Panel.Score == score.OldValue))
             {
-                p.State = PanelState.Contracted;
-                p.Margin = new MarginPadding();
+                t.Panel.State = PanelState.Contracted;
+                t.Margin = new MarginPadding();
             }
 
             // Find the panel corresponding to the new score.
-            expandedPanel = flow.SingleOrDefault(p => p.Score == score.NewValue);
+            var expandedTrackingComponent = flow.SingleOrDefault(t => t.Panel.Score == score.NewValue);
+            expandedPanel = expandedTrackingComponent?.Panel;
 
             // handle horizontal scroll only when not hovering the expanded panel.
             scroll.HandleScroll = () => expandedPanel?.IsHovered != true;
@@ -114,9 +143,11 @@ namespace osu.Game.Screens.Ranking
             if (expandedPanel == null)
                 return;
 
+            Debug.Assert(expandedTrackingComponent != null);
+
             // Expand the new panel.
+            expandedTrackingComponent.Margin = new MarginPadding { Horizontal = expanded_panel_spacing };
             expandedPanel.State = PanelState.Expanded;
-            expandedPanel.Margin = new MarginPadding { Horizontal = expanded_panel_spacing };
 
             // Scroll to the new panel. This is done manually since we need:
             // 1) To scroll after the scroll container's visible range is updated.
@@ -145,15 +176,15 @@ namespace osu.Game.Screens.Ranking
             flow.Padding = new MarginPadding { Horizontal = offset };
         }
 
-        private class Flow : FillFlowContainer<ScorePanel>
+        private class Flow : FillFlowContainer<ScorePanel.TrackingComponent>
         {
             public override IEnumerable<Drawable> FlowingChildren => applySorting(AliveInternalChildren);
 
-            public int GetPanelIndex(ScoreInfo score) => applySorting(Children).TakeWhile(s => s.Score != score).Count();
+            public int GetPanelIndex(ScoreInfo score) => applySorting(Children).TakeWhile(s => s.Panel.Score != score).Count();
 
-            private IEnumerable<ScorePanel> applySorting(IEnumerable<Drawable> drawables) => drawables.OfType<ScorePanel>()
-                                                                                                      .OrderByDescending(s => s.Score.TotalScore)
-                                                                                                      .ThenBy(s => s.Score.OnlineScoreID);
+            private IEnumerable<ScorePanel.TrackingComponent> applySorting(IEnumerable<Drawable> drawables) => drawables.OfType<ScorePanel.TrackingComponent>()
+                                                                                                                        .OrderByDescending(s => s.Panel.Score.TotalScore)
+                                                                                                                        .ThenBy(s => s.Panel.Score.OnlineScoreID);
         }
 
         private class Scroll : OsuScrollContainer
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 6c5fa1837a..bae6d0ffbb 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -26,13 +26,6 @@ namespace osu.Game.Screens.Ranking.Statistics
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4Extensions.FromHex("#333")
                 },
-                new ScorePanel(score) // Todo: Temporary
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    State = PanelState.Expanded,
-                    X = 30
-                },
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,

From bed5e857df7d2af44ae5f4bbfa304f04be741da1 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Wed, 17 Jun 2020 14:49:55 +0100
Subject: [PATCH 03316/10326] Add missing license header and remove unused
 usings

---
 osu.Game/Rulesets/Mods/IApplicableToAudio.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/IApplicableToAudio.cs b/osu.Game/Rulesets/Mods/IApplicableToAudio.cs
index 40e13764c6..901da7af55 100644
--- a/osu.Game/Rulesets/Mods/IApplicableToAudio.cs
+++ b/osu.Game/Rulesets/Mods/IApplicableToAudio.cs
@@ -1,6 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+// Copyright (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.Mods
 {

From 69d85ca3aeab18758ad644e1592d99a83fe35506 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Jun 2020 13:20:16 +0900
Subject: [PATCH 03317/10326] Add more cards to results screen test

---
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 125aa0a1e7..ea33aa62e3 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.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;
@@ -8,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
 using osu.Game.Screens;
@@ -113,6 +116,22 @@ namespace osu.Game.Tests.Visual.Ranking
 
                 RetryOverlay = InternalChildren.OfType<HotkeyRetryOverlay>().SingleOrDefault();
             }
+
+            protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
+            {
+                var scores = new List<ScoreInfo>();
+
+                for (int i = 0; i < 20; i++)
+                {
+                    var score = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+                    score.TotalScore += 10 - i;
+                    scores.Add(score);
+                }
+
+                scoresCallback?.Invoke(scores);
+
+                return null;
+            }
         }
 
         private class UnrankedSoloResultsScreen : SoloResultsScreen

From c31a05977d7b62a81e146de50ab374c8e2cca0d1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Jun 2020 16:50:45 +0900
Subject: [PATCH 03318/10326] Re-implement statistics as a click-in panel

---
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 109 +++++++-----------
 osu.Game/Screens/Ranking/ScorePanel.cs        |  74 ++++++------
 osu.Game/Screens/Ranking/ScorePanelList.cs    |  67 ++++++-----
 .../Ranking/Statistics/StatisticsPanel.cs     |  34 +++---
 4 files changed, 135 insertions(+), 149 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 4ef012f6f2..927628a811 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -11,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
-using osu.Framework.Utils;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
@@ -46,11 +44,9 @@ namespace osu.Game.Screens.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private Container<ScorePanel> scorePanelContainer;
-        private ResultsScrollContainer scrollContainer;
-        private Container expandedPanelProxyContainer;
+        private StatisticsPanel statisticsPanel;
         private Drawable bottomPanel;
-        private ScorePanelList panels;
+        private ScorePanelList scorePanelList;
 
         protected ResultsScreen(ScoreInfo score, bool allowRetry = true)
         {
@@ -63,13 +59,6 @@ namespace osu.Game.Screens.Ranking
         [BackgroundDependencyLoader]
         private void load()
         {
-            scorePanelContainer = new Container<ScorePanel>
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-            };
-
             FillFlowContainer buttons;
 
             InternalChild = new GridContainer
@@ -84,30 +73,26 @@ namespace osu.Game.Screens.Ranking
                             RelativeSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
-                                scorePanelContainer,
-                                scrollContainer = new ResultsScrollContainer
+                                new OsuScrollContainer
                                 {
-                                    Child = new FillFlowContainer
+                                    RelativeSizeAxes = Axes.Both,
+                                    ScrollbarVisible = false,
+                                    Child = new Container
                                     {
                                         RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
+                                        Height = screen_height,
                                         Children = new Drawable[]
                                         {
-                                            panels = new ScorePanelList(scorePanelContainer)
+                                            scorePanelList = new ScorePanelList
                                             {
-                                                RelativeSizeAxes = Axes.X,
-                                                Height = screen_height,
-                                                SelectedScore = { BindTarget = SelectedScore }
+                                                RelativeSizeAxes = Axes.Both,
+                                                SelectedScore = { BindTarget = SelectedScore },
+                                                PostExpandAction = onExpandedPanelClicked
                                             },
-                                            new StatisticsPanel(Score)
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                Height = screen_height,
-                                            }
+                                            statisticsPanel = new StatisticsPanel(Score) { RelativeSizeAxes = Axes.Both }
                                         }
                                     }
                                 },
-                                expandedPanelProxyContainer = new Container { RelativeSizeAxes = Axes.Both }
                             }
                         }
                     },
@@ -155,7 +140,7 @@ namespace osu.Game.Screens.Ranking
             };
 
             if (Score != null)
-                panels.AddScore(Score);
+                scorePanelList.AddScore(Score);
 
             if (player != null && allowRetry)
             {
@@ -180,7 +165,7 @@ namespace osu.Game.Screens.Ranking
             var req = FetchScores(scores => Schedule(() =>
             {
                 foreach (var s in scores)
-                    panels.AddScore(s);
+                    scorePanelList.AddScore(s);
             }));
 
             if (req != null)
@@ -194,21 +179,6 @@ namespace osu.Game.Screens.Ranking
         /// <returns>An <see cref="APIRequest"/> responsible for the fetch operation. This will be queued and performed automatically.</returns>
         protected virtual APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            ScorePanel expandedPanel = scorePanelContainer.Single(p => p.State == PanelState.Expanded);
-            expandedPanel.Tracking = false;
-            expandedPanel.Anchor = Anchor.Centre;
-            expandedPanel.Origin = Anchor.Centre;
-
-            scorePanelContainer.X = (float)Interpolation.Lerp(0, -DrawWidth / 2 + ScorePanel.EXPANDED_WIDTH / 2f, Math.Clamp(scrollContainer.Current / (screen_height * 0.8f), 0, 1));
-
-            if (expandedPanelProxyContainer.Count == 0)
-                expandedPanelProxyContainer.Add(expandedPanel.CreateProxy());
-        }
-
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
@@ -226,36 +196,39 @@ namespace osu.Game.Screens.Ranking
             return base.OnExiting(next);
         }
 
-        [Cached]
-        private class ResultsScrollContainer : OsuScrollContainer
+        private void onExpandedPanelClicked()
         {
-            public ResultsScrollContainer()
+            statisticsPanel.ToggleVisibility();
+
+            if (statisticsPanel.State.Value == Visibility.Hidden)
             {
-                RelativeSizeAxes = Axes.Both;
-                ScrollbarVisible = false;
+                foreach (var panel in scorePanelList.Panels)
+                {
+                    if (panel.State == PanelState.Contracted)
+                        panel.FadeIn(150);
+                    else
+                    {
+                        panel.MoveTo(panel.GetTrackingPosition(), 150, Easing.OutQuint).OnComplete(p =>
+                        {
+                            scorePanelList.HandleScroll = true;
+                            p.Tracking = true;
+                        });
+                    }
+                }
             }
-
-            protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
+            else
             {
-                if (!animated)
+                foreach (var panel in scorePanelList.Panels)
                 {
-                    // If the user is scrolling via mouse drag, follow the mouse 1:1.
-                    base.OnUserScroll(value, false, distanceDecay);
-                    return;
-                }
+                    if (panel.State == PanelState.Contracted)
+                        panel.FadeOut(150, Easing.OutQuint);
+                    else
+                    {
+                        scorePanelList.HandleScroll = false;
 
-                float direction = Math.Sign(value - Target);
-                float target = Target + direction * screen_height;
-
-                if (target <= -screen_height / 2 || target >= ScrollableExtent + screen_height / 2)
-                {
-                    // If the user is already at either extent and scrolling in the clamped direction, we want to follow the default scroll exactly so that the bounces aren't too harsh.
-                    base.OnUserScroll(value, true, distanceDecay);
-                }
-                else
-                {
-                    // Otherwise, scroll one screen in the target direction.
-                    base.OnUserScroll(target, true, distanceDecay);
+                        panel.Tracking = false;
+                        panel.MoveTo(new Vector2(scorePanelList.CurrentScrollPosition, panel.GetTrackingPosition().Y), 150, Easing.OutQuint);
+                    }
                 }
             }
         }
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 7ca96a9a58..31b2796c13 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -76,6 +76,18 @@ namespace osu.Game.Screens.Ranking
         private static readonly Color4 contracted_middle_layer_colour = Color4Extensions.FromHex("#353535");
 
         public event Action<PanelState> StateChanged;
+        public Action PostExpandAction;
+
+        /// <summary>
+        /// Whether this <see cref="ScorePanel"/> should track the position of the tracking component created via <see cref="CreateTrackingComponent"/>.
+        /// </summary>
+        public bool Tracking;
+
+        /// <summary>
+        /// Whether this <see cref="ScorePanel"/> can enter into an <see cref="PanelState.Expanded"/> state.
+        /// </summary>
+        public bool CanExpand = true;
+
         public readonly ScoreInfo Score;
 
         private Container content;
@@ -182,38 +194,18 @@ namespace osu.Game.Screens.Ranking
             }
         }
 
-        private bool tracking;
-        private Vector2 lastNonTrackingPosition;
-
-        /// <summary>
-        /// Whether this <see cref="ScorePanel"/> should track the position of the tracking component created via <see cref="CreateTrackingComponent"/>.
-        /// </summary>
-        public bool Tracking
-        {
-            get => tracking;
-            set
-            {
-                if (tracking == value)
-                    return;
-
-                tracking = value;
-
-                if (tracking)
-                    lastNonTrackingPosition = Position;
-                else
-                    Position = lastNonTrackingPosition;
-            }
-        }
-
         protected override void Update()
         {
             base.Update();
 
             if (Tracking && trackingComponent != null)
-            {
-                Vector2 topLeftPos = Parent.ToLocalSpace(trackingComponent.ScreenSpaceDrawQuad.TopLeft);
-                Position = topLeftPos - AnchorPosition + OriginPosition;
-            }
+                Position = GetTrackingPosition();
+        }
+
+        public Vector2 GetTrackingPosition()
+        {
+            Vector2 topLeftPos = Parent.ToLocalSpace(trackingComponent.ScreenSpaceDrawQuad.TopLeft);
+            return topLeftPos - AnchorPosition + OriginPosition;
         }
 
         private void updateState()
@@ -270,10 +262,28 @@ namespace osu.Game.Screens.Ranking
             }
         }
 
+        public override Vector2 Size
+        {
+            get => base.Size;
+            set
+            {
+                base.Size = value;
+
+                if (trackingComponent != null)
+                    trackingComponent.Size = value;
+            }
+        }
+
         protected override bool OnClick(ClickEvent e)
         {
             if (State == PanelState.Contracted)
-                State = PanelState.Expanded;
+            {
+                if (CanExpand)
+                    State = PanelState.Expanded;
+                return true;
+            }
+
+            PostExpandAction?.Invoke();
 
             return true;
         }
@@ -296,17 +306,13 @@ namespace osu.Game.Screens.Ranking
                 Panel = panel;
             }
 
-            protected override void Update()
-            {
-                base.Update();
-                Size = Panel.DrawSize;
-            }
-
             // In ScorePanelList, score panels are added _before_ the flow, but this means that input will be blocked by the scroll container.
             // So by forwarding input events, we remove the need to consider the order in which input is handled.
             protected override bool OnClick(ClickEvent e) => Panel.TriggerEvent(e);
 
             public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Panel.ReceivePositionalInputAt(screenSpacePos);
+
+            public override bool IsPresent => Panel.IsPresent;
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index d49085bc96..e332f462bb 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -26,9 +26,15 @@ namespace osu.Game.Screens.Ranking
         /// </summary>
         private const float expanded_panel_spacing = 15;
 
+        public Action PostExpandAction;
+
         public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
 
+        public float CurrentScrollPosition => scroll.Current;
+
+        public IReadOnlyList<ScorePanel> Panels => panels;
         private readonly Container<ScorePanel> panels;
+
         private readonly Flow flow;
         private readonly Scroll scroll;
         private ScorePanel expandedPanel;
@@ -36,39 +42,27 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Creates a new <see cref="ScorePanelList"/>.
         /// </summary>
-        /// <param name="panelTarget">The target container in which <see cref="ScorePanel"/>s should reside.
-        /// <see cref="ScorePanel"/>s are set to track by default, but this allows
-        /// This should be placed _before_ the <see cref="ScorePanelList"/> in the hierarchy.
-        /// <remarks></remarks>
-        /// </param>
-        public ScorePanelList(Container<ScorePanel> panelTarget = null)
+        public ScorePanelList()
         {
             RelativeSizeAxes = Axes.Both;
 
             InternalChild = scroll = new Scroll
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = flow = new Flow
+                HandleScroll = () => HandleScroll && expandedPanel?.IsHovered != true, // handle horizontal scroll only when not hovering the expanded panel.
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(panel_spacing, 0),
-                    AutoSizeAxes = Axes.Both,
+                    panels = new Container<ScorePanel> { RelativeSizeAxes = Axes.Both },
+                    flow = new Flow
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Direction = FillDirection.Horizontal,
+                        Spacing = new Vector2(panel_spacing, 0),
+                        AutoSizeAxes = Axes.Both,
+                    },
                 }
             };
-
-            if (panelTarget == null)
-            {
-                // To prevent 1-frame sizing issues, the panel container is added _before_ the scroll + flow containers
-                AddInternal(panels = new Container<ScorePanel>
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Depth = 1
-                });
-            }
-            else
-                panels = panelTarget;
         }
 
         protected override void LoadComplete()
@@ -78,6 +72,25 @@ namespace osu.Game.Screens.Ranking
             SelectedScore.BindValueChanged(selectedScoreChanged, true);
         }
 
+        private bool handleScroll = true;
+
+        public bool HandleScroll
+        {
+            get => handleScroll;
+            set
+            {
+                handleScroll = value;
+
+                foreach (var p in panels)
+                    p.CanExpand = value;
+
+                scroll.ScrollbarVisible = value;
+
+                if (!value)
+                    scroll.ScrollTo(CurrentScrollPosition, false);
+            }
+        }
+
         /// <summary>
         /// Adds a <see cref="ScoreInfo"/> to this list.
         /// </summary>
@@ -86,7 +99,8 @@ namespace osu.Game.Screens.Ranking
         {
             var panel = new ScorePanel(score)
             {
-                Tracking = true
+                Tracking = true,
+                PostExpandAction = () => PostExpandAction?.Invoke()
             }.With(p =>
             {
                 p.StateChanged += s =>
@@ -137,9 +151,6 @@ namespace osu.Game.Screens.Ranking
             var expandedTrackingComponent = flow.SingleOrDefault(t => t.Panel.Score == score.NewValue);
             expandedPanel = expandedTrackingComponent?.Panel;
 
-            // handle horizontal scroll only when not hovering the expanded panel.
-            scroll.HandleScroll = () => expandedPanel?.IsHovered != true;
-
             if (expandedPanel == null)
                 return;
 
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index bae6d0ffbb..cc9007f527 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Game.Scoring;
 using osuTK;
 
 namespace osu.Game.Screens.Ranking.Statistics
 {
-    public class StatisticsPanel : CompositeDrawable
+    public class StatisticsPanel : VisibilityContainer
     {
+        protected override bool StartHidden => true;
+
         public StatisticsPanel(ScoreInfo score)
         {
             // Todo: Not correct.
@@ -19,27 +19,19 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             FillFlowContainer statisticRows;
 
-            InternalChildren = new Drawable[]
+            InternalChild = new Container
             {
-                new Box
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4Extensions.FromHex("#333")
+                    Left = ScorePanel.EXPANDED_WIDTH + 30 + 50,
+                    Right = 50
                 },
-                new Container
+                Child = statisticRows = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding
-                    {
-                        Left = ScorePanel.EXPANDED_WIDTH + 30 + 50,
-                        Right = 50
-                    },
-                    Child = statisticRows = new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(30, 15),
-                    }
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(30, 15),
                 }
             };
 
@@ -55,5 +47,9 @@ namespace osu.Game.Screens.Ranking.Statistics
                 });
             }
         }
+
+        protected override void PopIn() => this.FadeIn();
+
+        protected override void PopOut() => this.FadeOut();
     }
 }

From 6c8a24260bd4edd511b9284db59fe70e12f97347 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Jun 2020 17:06:05 +0900
Subject: [PATCH 03319/10326] Add padding

---
 osu.Game/Screens/Ranking/ResultsScreen.cs              | 2 +-
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 927628a811..4a7cb6679a 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -227,7 +227,7 @@ namespace osu.Game.Screens.Ranking
                         scorePanelList.HandleScroll = false;
 
                         panel.Tracking = false;
-                        panel.MoveTo(new Vector2(scorePanelList.CurrentScrollPosition, panel.GetTrackingPosition().Y), 150, Easing.OutQuint);
+                        panel.MoveTo(new Vector2(scorePanelList.CurrentScrollPosition + StatisticsPanel.SIDE_PADDING, panel.GetTrackingPosition().Y), 150, Easing.OutQuint);
                     }
                 }
             }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index cc9007f527..733c855426 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -10,6 +10,8 @@ namespace osu.Game.Screens.Ranking.Statistics
 {
     public class StatisticsPanel : VisibilityContainer
     {
+        public const float SIDE_PADDING = 30;
+
         protected override bool StartHidden => true;
 
         public StatisticsPanel(ScoreInfo score)
@@ -24,8 +26,10 @@ namespace osu.Game.Screens.Ranking.Statistics
                 RelativeSizeAxes = Axes.Both,
                 Padding = new MarginPadding
                 {
-                    Left = ScorePanel.EXPANDED_WIDTH + 30 + 50,
-                    Right = 50
+                    Left = ScorePanel.EXPANDED_WIDTH + SIDE_PADDING * 3,
+                    Right = SIDE_PADDING,
+                    Top = SIDE_PADDING,
+                    Bottom = 50 // Approximate padding to the bottom of the score panel.
                 },
                 Child = statisticRows = new FillFlowContainer
                 {

From 20db5b33abc952390f58a9110266f55f5377fc51 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Jun 2020 22:11:03 +0900
Subject: [PATCH 03320/10326] Rework score processor to provide more generic
 events

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |   5 +-
 .../Scoring/OsuScoreProcessor.cs              | 128 +++++++-----------
 osu.Game.Rulesets.Osu/Statistics/Heatmap.cs   |  24 +++-
 .../Statistics/TimingDistributionGraph.cs     |  45 ++++--
 .../Ranking/TestSceneAccuracyHeatmap.cs       |   9 +-
 .../Ranking/TestSceneStatisticsPanel.cs       |   9 +-
 .../TestSceneTimingDistributionGraph.cs       |  34 ++---
 osu.Game/Scoring/ScoreInfo.cs                 |   4 +-
 8 files changed, 126 insertions(+), 132 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 67a9bda1a9..c7003deed2 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -29,6 +29,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
+using System.Linq;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Screens.Ranking.Statistics;
@@ -200,7 +201,7 @@ namespace osu.Game.Rulesets.Osu
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 130,
-                        Child = new TimingDistributionGraph((TimingDistribution)score.ExtraStatistics.GetValueOrDefault("timing_distribution"))
+                        Child = new TimingDistributionGraph(score.HitEvents.Cast<HitEvent>().ToList())
                         {
                             RelativeSizeAxes = Axes.Both
                         }
@@ -208,7 +209,7 @@ namespace osu.Game.Rulesets.Osu
                     new StatisticContainer("Accuracy Heatmap")
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Child = new Heatmap((List<HitOffset>)score.ExtraStatistics.GetValueOrDefault("hit_offsets"))
+                        Child = new Heatmap(score.Beatmap, score.HitEvents.Cast<HitEvent>().ToList())
                         {
                             RelativeSizeAxes = Axes.Both
                         }
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 97be372e37..9694367210 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -1,120 +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 System.Diagnostics;
-using osu.Game.Beatmaps;
+using System.Linq;
+using JetBrains.Annotations;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
     public class OsuScoreProcessor : ScoreProcessor
     {
-        /// <summary>
-        /// The number of bins on each side of the timing distribution.
-        /// </summary>
-        private const int timing_distribution_bins = 25;
-
-        /// <summary>
-        /// The total number of bins in the timing distribution, including bins on both sides and the centre bin at 0.
-        /// </summary>
-        private const int total_timing_distribution_bins = timing_distribution_bins * 2 + 1;
-
-        /// <summary>
-        /// The centre bin, with a timing distribution very close to/at 0.
-        /// </summary>
-        private const int timing_distribution_centre_bin_index = timing_distribution_bins;
-
-        private TimingDistribution timingDistribution;
-        private readonly List<HitOffset> hitOffsets = new List<HitOffset>();
-
-        public override void ApplyBeatmap(IBeatmap beatmap)
-        {
-            var hitWindows = CreateHitWindows();
-            hitWindows.SetDifficulty(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty);
-
-            timingDistribution = new TimingDistribution(total_timing_distribution_bins, hitWindows.WindowFor(hitWindows.LowestSuccessfulHitResult()) / timing_distribution_bins);
-
-            base.ApplyBeatmap(beatmap);
-        }
-
-        private OsuHitCircleJudgementResult lastCircleResult;
+        private readonly List<HitEvent> hitEvents = new List<HitEvent>();
+        private HitObject lastHitObject;
 
         protected override void OnResultApplied(JudgementResult result)
         {
             base.OnResultApplied(result);
 
-            if (result.IsHit)
-            {
-                int binOffset = (int)(result.TimeOffset / timingDistribution.BinSize);
-                timingDistribution.Bins[timing_distribution_centre_bin_index + binOffset]++;
-
-                addHitOffset(result);
-            }
+            hitEvents.Add(new HitEvent(result.TimeOffset, result.Type, result.HitObject, lastHitObject, (result as OsuHitCircleJudgementResult)?.HitPosition));
+            lastHitObject = result.HitObject;
         }
 
         protected override void OnResultReverted(JudgementResult result)
         {
             base.OnResultReverted(result);
 
-            if (result.IsHit)
-            {
-                int binOffset = (int)(result.TimeOffset / timingDistribution.BinSize);
-                timingDistribution.Bins[timing_distribution_centre_bin_index + binOffset]--;
-
-                removeHitOffset(result);
-            }
-        }
-
-        private void addHitOffset(JudgementResult result)
-        {
-            if (!(result is OsuHitCircleJudgementResult circleResult))
-                return;
-
-            if (lastCircleResult == null)
-            {
-                lastCircleResult = circleResult;
-                return;
-            }
-
-            if (circleResult.HitPosition != null)
-            {
-                Debug.Assert(circleResult.Radius != null);
-                hitOffsets.Add(new HitOffset(lastCircleResult.HitCircle.StackedEndPosition, circleResult.HitCircle.StackedEndPosition, circleResult.HitPosition.Value, circleResult.Radius.Value));
-            }
-
-            lastCircleResult = circleResult;
-        }
-
-        private void removeHitOffset(JudgementResult result)
-        {
-            if (!(result is OsuHitCircleJudgementResult circleResult))
-                return;
-
-            if (hitOffsets.Count > 0 && circleResult.HitPosition != null)
-                hitOffsets.RemoveAt(hitOffsets.Count - 1);
+            hitEvents.RemoveAt(hitEvents.Count - 1);
         }
 
         protected override void Reset(bool storeResults)
         {
             base.Reset(storeResults);
 
-            timingDistribution.Bins.AsSpan().Clear();
-            hitOffsets.Clear();
+            hitEvents.Clear();
+            lastHitObject = null;
         }
 
         public override void PopulateScore(ScoreInfo score)
         {
             base.PopulateScore(score);
 
-            score.ExtraStatistics["timing_distribution"] = timingDistribution;
-            score.ExtraStatistics["hit_offsets"] = hitOffsets;
+            score.HitEvents.AddRange(hitEvents.Select(e => e).Cast<object>());
         }
 
         protected override JudgementResult CreateResult(HitObject hitObject, Judgement judgement)
@@ -131,4 +63,42 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
         public override HitWindows CreateHitWindows() => new OsuHitWindows();
     }
+
+    public readonly struct HitEvent
+    {
+        /// <summary>
+        /// The time offset from the end of <see cref="HitObject"/> at which the event occurred.
+        /// </summary>
+        public readonly double TimeOffset;
+
+        /// <summary>
+        /// The hit result.
+        /// </summary>
+        public readonly HitResult Result;
+
+        /// <summary>
+        /// The <see cref="HitObject"/> on which the result occurred.
+        /// </summary>
+        public readonly HitObject HitObject;
+
+        /// <summary>
+        /// The <see cref="HitObject"/> occurring prior to <see cref="HitObject"/>.
+        /// </summary>
+        [CanBeNull]
+        public readonly HitObject LastHitObject;
+
+        /// <summary>
+        /// The player's cursor position, if available, at the time of the event.
+        /// </summary>
+        public readonly Vector2? CursorPosition;
+
+        public HitEvent(double timeOffset, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, Vector2? cursorPosition)
+        {
+            TimeOffset = timeOffset;
+            Result = result;
+            HitObject = hitObject;
+            LastHitObject = lastHitObject;
+            CursorPosition = cursorPosition;
+        }
+    }
 }
diff --git a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
index 51508a5e8b..95cfc5b768 100644
--- a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
@@ -10,6 +10,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Layout;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Scoring;
 using osuTK;
 using osuTK.Graphics;
@@ -27,14 +29,16 @@ namespace osu.Game.Rulesets.Osu.Statistics
         private const float rotation = 45;
         private const float point_size = 4;
 
-        private readonly IReadOnlyList<HitOffset> offsets;
         private Container<HitPoint> allPoints;
 
+        private readonly BeatmapInfo beatmap;
+        private readonly IReadOnlyList<HitEvent> hitEvents;
         private readonly LayoutValue sizeLayout = new LayoutValue(Invalidation.DrawSize);
 
-        public Heatmap(IReadOnlyList<HitOffset> offsets)
+        public Heatmap(BeatmapInfo beatmap, IReadOnlyList<HitEvent> hitEvents)
         {
-            this.offsets = offsets;
+            this.beatmap = beatmap;
+            this.hitEvents = hitEvents;
 
             AddLayout(sizeLayout);
         }
@@ -153,10 +157,18 @@ namespace osu.Game.Rulesets.Osu.Statistics
                 }
             }
 
-            if (offsets?.Count > 0)
+            if (hitEvents.Count > 0)
             {
-                foreach (var o in offsets)
-                    AddPoint(o.Position1, o.Position2, o.HitPosition, o.Radius);
+                // Todo: This should probably not be done like this.
+                float radius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (beatmap.BaseDifficulty.CircleSize - 5) / 5) / 2;
+
+                foreach (var e in hitEvents)
+                {
+                    if (e.LastHitObject == null || e.CursorPosition == null)
+                        continue;
+
+                    AddPoint(((OsuHitObject)e.LastHitObject).StackedEndPosition, ((OsuHitObject)e.HitObject).StackedEndPosition, e.CursorPosition.Value, radius);
+                }
             }
 
             sizeLayout.Validate();
diff --git a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
index 1f9f38bf3b..b319cc5aa9 100644
--- a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.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 osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -15,29 +17,52 @@ namespace osu.Game.Rulesets.Osu.Statistics
 {
     public class TimingDistributionGraph : CompositeDrawable
     {
+        /// <summary>
+        /// The number of bins on each side of the timing distribution.
+        /// </summary>
+        private const int timing_distribution_bins = 25;
+
+        /// <summary>
+        /// The total number of bins in the timing distribution, including bins on both sides and the centre bin at 0.
+        /// </summary>
+        private const int total_timing_distribution_bins = timing_distribution_bins * 2 + 1;
+
+        /// <summary>
+        /// The centre bin, with a timing distribution very close to/at 0.
+        /// </summary>
+        private const int timing_distribution_centre_bin_index = timing_distribution_bins;
+
         /// <summary>
         /// The number of data points shown on the axis below the graph.
         /// </summary>
         private const float axis_points = 5;
 
-        private readonly TimingDistribution distribution;
+        private readonly List<HitEvent> hitEvents;
 
-        public TimingDistributionGraph(TimingDistribution distribution)
+        public TimingDistributionGraph(List<HitEvent> hitEvents)
         {
-            this.distribution = distribution;
+            this.hitEvents = hitEvents;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (distribution?.Bins == null || distribution.Bins.Length == 0)
+            if (hitEvents.Count == 0)
                 return;
 
-            int maxCount = distribution.Bins.Max();
+            int[] bins = new int[total_timing_distribution_bins];
+            double binSize = hitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins;
 
-            var bars = new Drawable[distribution.Bins.Length];
+            foreach (var e in hitEvents)
+            {
+                int binOffset = (int)(e.TimeOffset / binSize);
+                bins[timing_distribution_centre_bin_index + binOffset]++;
+            }
+
+            int maxCount = bins.Max();
+            var bars = new Drawable[total_timing_distribution_bins];
             for (int i = 0; i < bars.Length; i++)
-                bars[i] = new Bar { Height = (float)distribution.Bins[i] / maxCount };
+                bars[i] = new Bar { Height = (float)bins[i] / maxCount };
 
             Container axisFlow;
 
@@ -71,10 +96,8 @@ namespace osu.Game.Rulesets.Osu.Statistics
                 }
             };
 
-            // We know the total number of bins on each side of the centre ((n - 1) / 2), and the size of each bin.
-            // So our axis will contain one centre element + 5 points on each side, each with a value depending on the number of bins * bin size.
-            int sideBins = (distribution.Bins.Length - 1) / 2;
-            double maxValue = sideBins * distribution.BinSize;
+            // Our axis will contain one centre element + 5 points on each side, each with a value depending on the number of bins * bin size.
+            double maxValue = timing_distribution_bins * binSize;
             double axisValueStep = maxValue / axis_points;
 
             axisFlow.Add(new OsuSpriteText
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
index 53c8e56f53..ba6a0e42c2 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
@@ -8,8 +8,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.Statistics;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
 using osuTK.Graphics;
 
@@ -40,7 +43,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 {
                     Position = new Vector2(500, 300),
                 },
-                heatmap = new TestHeatmap(new List<HitOffset>())
+                heatmap = new TestHeatmap(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo, new List<HitEvent>())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -73,8 +76,8 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private class TestHeatmap : Heatmap
         {
-            public TestHeatmap(IReadOnlyList<HitOffset> offsets)
-                : base(offsets)
+            public TestHeatmap(BeatmapInfo beatmap, List<HitEvent> events)
+                : base(beatmap, events)
             {
             }
 
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index c02be9ab5d..faabdf2cb6 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -1,10 +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 NUnit.Framework;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking.Statistics;
 
@@ -17,11 +16,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             var score = new TestScoreInfo(new OsuRuleset().RulesetInfo)
             {
-                ExtraStatistics =
-                {
-                    ["timing_distribution"] = TestSceneTimingDistributionGraph.CreateNormalDistribution(),
-                    ["hit_offsets"] = new List<HitOffset>()
-                }
+                HitEvents = TestSceneTimingDistributionGraph.CreateDistributedHitEvents().Cast<object>().ToList(),
             };
 
             loadPanel(score);
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
index 2249655093..178d6d95b5 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.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;
 using System.Collections.Generic;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.Statistics;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
@@ -22,7 +25,7 @@ namespace osu.Game.Tests.Visual.Ranking
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4Extensions.FromHex("#333")
                 },
-                new TimingDistributionGraph(CreateNormalDistribution())
+                new TimingDistributionGraph(CreateDistributedHitEvents())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -31,34 +34,19 @@ namespace osu.Game.Tests.Visual.Ranking
             };
         }
 
-        public static TimingDistribution CreateNormalDistribution()
+        public static List<HitEvent> CreateDistributedHitEvents()
         {
-            var distribution = new TimingDistribution(51, 5);
+            var hitEvents = new List<HitEvent>();
 
-            // We create an approximately-normal distribution of 51 elements by using the 13th binomial row (14 initial elements) and subdividing the inner values twice.
-            var row = new List<int> { 1 };
-            for (int i = 0; i < 13; i++)
-                row.Add(row[i] * (13 - i) / (i + 1));
-
-            // Each subdivision yields 2n-1 total elements, so first subdivision will contain 27 elements, and the second will contain 53 elements.
-            for (int div = 0; div < 2; div++)
+            for (int i = 0; i < 50; i++)
             {
-                var newRow = new List<int> { 1 };
+                int count = (int)(Math.Pow(25 - Math.Abs(i - 25), 2));
 
-                for (int i = 0; i < row.Count - 1; i++)
-                {
-                    newRow.Add((row[i] + row[i + 1]) / 2);
-                    newRow.Add(row[i + 1]);
-                }
-
-                row = newRow;
+                for (int j = 0; j < count; j++)
+                    hitEvents.Add(new HitEvent(i - 25, HitResult.Perfect, new HitCircle(), new HitCircle(), null));
             }
 
-            // After the subdivisions take place, we're left with 53 values which we use the inner 51 of.
-            for (int i = 1; i < row.Count - 1; i++)
-                distribution.Bins[i - 1] = row[i];
-
-            return distribution;
+            return hitEvents;
         }
     }
 }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 38b37afc55..6fc5892b3c 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -166,7 +166,9 @@ namespace osu.Game.Scoring
             }
         }
 
-        public Dictionary<string, object> ExtraStatistics = new Dictionary<string, object>();
+        [NotMapped]
+        [JsonIgnore]
+        public List<object> HitEvents = new List<object>();
 
         [JsonIgnore]
         public List<ScoreFileInfo> Files { get; set; }

From ecdfcb1955f4929bc11fe1e3d1e8e1ddadfbd119 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Jun 2020 22:21:30 +0900
Subject: [PATCH 03321/10326] Display placeholder if no statistics available

---
 .../Ranking/TestSceneStatisticsPanel.cs       | 17 +++++-
 osu.Game/Screens/Ranking/ResultsScreen.cs     |  6 +-
 .../Ranking/Statistics/StatisticsPanel.cs     | 61 +++++++++++++------
 3 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index faabdf2cb6..cc3415a530 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -3,6 +3,8 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking.Statistics;
@@ -12,7 +14,7 @@ namespace osu.Game.Tests.Visual.Ranking
     public class TestSceneStatisticsPanel : OsuTestScene
     {
         [Test]
-        public void TestScore()
+        public void TestScoreWithStatistics()
         {
             var score = new TestScoreInfo(new OsuRuleset().RulesetInfo)
             {
@@ -22,9 +24,20 @@ namespace osu.Game.Tests.Visual.Ranking
             loadPanel(score);
         }
 
+        [Test]
+        public void TestScoreWithoutStatistics()
+        {
+            loadPanel(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+        }
+
         private void loadPanel(ScoreInfo score) => AddStep("load panel", () =>
         {
-            Child = new StatisticsPanel(score);
+            Child = new StatisticsPanel
+            {
+                RelativeSizeAxes = Axes.Both,
+                State = { Value = Visibility.Visible },
+                Score = { Value = score }
+            };
         });
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 4a7cb6679a..c02a120a73 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -89,7 +89,11 @@ namespace osu.Game.Screens.Ranking
                                                 SelectedScore = { BindTarget = SelectedScore },
                                                 PostExpandAction = onExpandedPanelClicked
                                             },
-                                            statisticsPanel = new StatisticsPanel(Score) { RelativeSizeAxes = Axes.Both }
+                                            statisticsPanel = new StatisticsPanel
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Score = { BindTarget = SelectedScore }
+                                            }
                                         }
                                     }
                                 },
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 733c855426..28a8bc460e 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -1,8 +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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Online.Placeholders;
 using osu.Game.Scoring;
 using osuTK;
 
@@ -12,15 +15,14 @@ namespace osu.Game.Screens.Ranking.Statistics
     {
         public const float SIDE_PADDING = 30;
 
+        public readonly Bindable<ScoreInfo> Score = new Bindable<ScoreInfo>();
+
         protected override bool StartHidden => true;
 
-        public StatisticsPanel(ScoreInfo score)
+        private readonly Container content;
+
+        public StatisticsPanel()
         {
-            // Todo: Not correct.
-            RelativeSizeAxes = Axes.Both;
-
-            FillFlowContainer statisticRows;
-
             InternalChild = new Container
             {
                 RelativeSizeAxes = Axes.Both,
@@ -31,24 +33,47 @@ namespace osu.Game.Screens.Ranking.Statistics
                     Top = SIDE_PADDING,
                     Bottom = 50 // Approximate padding to the bottom of the score panel.
                 },
-                Child = statisticRows = new FillFlowContainer
+                Child = content = new Container { RelativeSizeAxes = Axes.Both },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Score.BindValueChanged(populateStatistics, true);
+        }
+
+        private void populateStatistics(ValueChangedEvent<ScoreInfo> score)
+        {
+            foreach (var child in content)
+                child.FadeOut(150).Expire();
+
+            var newScore = score.NewValue;
+
+            if (newScore.HitEvents == null || newScore.HitEvents.Count == 0)
+                content.Add(new MessagePlaceholder("Score has no statistics :("));
+            else
+            {
+                var rows = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
                     Spacing = new Vector2(30, 15),
-                }
-            };
+                };
 
-            foreach (var s in score.Ruleset.CreateInstance().CreateStatistics(score))
-            {
-                statisticRows.Add(new GridContainer
+                foreach (var row in newScore.Ruleset.CreateInstance().CreateStatistics(newScore))
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Content = new[] { s.Content },
-                    ColumnDimensions = s.ColumnDimensions,
-                    RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
-                });
+                    rows.Add(new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Content = new[] { row.Content },
+                        ColumnDimensions = row.ColumnDimensions,
+                        RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
+                    });
+                }
+
+                content.Add(rows);
             }
         }
 

From 53f507f51af7adc2e48200281fc8ff1598489142 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Jun 2020 22:27:10 +0900
Subject: [PATCH 03322/10326] Fade background

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index c02a120a73..5073adcc50 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -219,6 +219,8 @@ namespace osu.Game.Screens.Ranking
                         });
                     }
                 }
+
+                Background.FadeTo(0.5f, 150);
             }
             else
             {
@@ -234,6 +236,8 @@ namespace osu.Game.Screens.Ranking
                         panel.MoveTo(new Vector2(scorePanelList.CurrentScrollPosition + StatisticsPanel.SIDE_PADDING, panel.GetTrackingPosition().Y), 150, Easing.OutQuint);
                     }
                 }
+
+                Background.FadeTo(0.1f, 150);
             }
         }
     }

From 85a0f78600e97866c1726eefeed64113fef5d76c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Jun 2020 22:27:27 +0900
Subject: [PATCH 03323/10326] Hide statistics panel on first exit

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 24 ++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 5073adcc50..de1939352f 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Screens.Ranking
                                             {
                                                 RelativeSizeAxes = Axes.Both,
                                                 SelectedScore = { BindTarget = SelectedScore },
-                                                PostExpandAction = onExpandedPanelClicked
+                                                PostExpandAction = () => statisticsPanel.ToggleVisibility()
                                             },
                                             statisticsPanel = new StatisticsPanel
                                             {
@@ -174,6 +174,8 @@ namespace osu.Game.Screens.Ranking
 
             if (req != null)
                 api.Queue(req);
+
+            statisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
         }
 
         /// <summary>
@@ -195,17 +197,23 @@ namespace osu.Game.Screens.Ranking
 
         public override bool OnExiting(IScreen next)
         {
+            if (statisticsPanel.State.Value == Visibility.Visible)
+            {
+                statisticsPanel.Hide();
+                return true;
+            }
+
             Background.FadeTo(1, 250);
 
             return base.OnExiting(next);
         }
 
-        private void onExpandedPanelClicked()
+        private void onStatisticsStateChanged(ValueChangedEvent<Visibility> state)
         {
-            statisticsPanel.ToggleVisibility();
-
-            if (statisticsPanel.State.Value == Visibility.Hidden)
+            if (state.NewValue == Visibility.Hidden)
             {
+                Background.FadeTo(0.5f, 150);
+
                 foreach (var panel in scorePanelList.Panels)
                 {
                     if (panel.State == PanelState.Contracted)
@@ -219,11 +227,11 @@ namespace osu.Game.Screens.Ranking
                         });
                     }
                 }
-
-                Background.FadeTo(0.5f, 150);
             }
             else
             {
+                Background.FadeTo(0.1f, 150);
+
                 foreach (var panel in scorePanelList.Panels)
                 {
                     if (panel.State == PanelState.Contracted)
@@ -236,8 +244,6 @@ namespace osu.Game.Screens.Ranking
                         panel.MoveTo(new Vector2(scorePanelList.CurrentScrollPosition + StatisticsPanel.SIDE_PADDING, panel.GetTrackingPosition().Y), 150, Easing.OutQuint);
                     }
                 }
-
-                Background.FadeTo(0.1f, 150);
             }
         }
     }

From add1265d5354b8ead7644b3a6389fc287fc3d7b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Jun 2020 23:35:03 +0900
Subject: [PATCH 03324/10326] Block screen suspend while gameplay is active

---
 osu.Game/Screens/Play/Player.cs               |  7 ++++
 .../Screens/Play/ScreenSuspensionHandler.cs   | 42 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 osu.Game/Screens/Play/ScreenSuspensionHandler.cs

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 83991ad027..d3b88e56ae 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -125,6 +125,8 @@ namespace osu.Game.Screens.Play
 
         private GameplayBeatmap gameplayBeatmap;
 
+        private ScreenSuspensionHandler screenSuspension;
+
         private DependencyContainer dependencies;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -179,6 +181,7 @@ namespace osu.Game.Screens.Play
             InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
 
             AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap));
+            AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer));
 
             dependencies.CacheAs(gameplayBeatmap);
 
@@ -628,12 +631,16 @@ namespace osu.Game.Screens.Play
 
         public override void OnSuspending(IScreen next)
         {
+            screenSuspension?.Expire();
+
             fadeOut();
             base.OnSuspending(next);
         }
 
         public override bool OnExiting(IScreen next)
         {
+            screenSuspension?.Expire();
+
             if (completionProgressDelegate != null && !completionProgressDelegate.Cancelled && !completionProgressDelegate.Completed)
             {
                 // proceed to result screen if beatmap already finished playing
diff --git a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
new file mode 100644
index 0000000000..948276f03f
--- /dev/null
+++ b/osu.Game/Screens/Play/ScreenSuspensionHandler.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+
+namespace osu.Game.Screens.Play
+{
+    internal class ScreenSuspensionHandler : Component
+    {
+        private readonly GameplayClockContainer gameplayClockContainer;
+        private Bindable<bool> isPaused;
+
+        [Resolved]
+        private GameHost host { get; set; }
+
+        public ScreenSuspensionHandler(GameplayClockContainer gameplayClockContainer)
+        {
+            this.gameplayClockContainer = gameplayClockContainer;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            isPaused = gameplayClockContainer.IsPaused.GetBoundCopy();
+            isPaused.BindValueChanged(paused => host.AllowScreenSuspension.Value = paused.NewValue, true);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            isPaused?.UnbindAll();
+
+            if (host != null)
+                host.AllowScreenSuspension.Value = true;
+        }
+    }
+}

From 7da56ec7fd27ebddc7253b6151b50f93ad289dd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Jun 2020 23:52:35 +0900
Subject: [PATCH 03325/10326] Add null check and xmldoc

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

diff --git a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
index 948276f03f..59ad74d81a 100644
--- a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
+++ b/osu.Game/Screens/Play/ScreenSuspensionHandler.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -8,7 +10,10 @@ using osu.Framework.Platform;
 
 namespace osu.Game.Screens.Play
 {
-    internal class ScreenSuspensionHandler : Component
+    /// <summary>
+    /// Ensures screen is not suspended / dimmed while gameplay is active.
+    /// </summary>
+    public class ScreenSuspensionHandler : Component
     {
         private readonly GameplayClockContainer gameplayClockContainer;
         private Bindable<bool> isPaused;
@@ -16,9 +21,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private GameHost host { get; set; }
 
-        public ScreenSuspensionHandler(GameplayClockContainer gameplayClockContainer)
+        public ScreenSuspensionHandler([NotNull] GameplayClockContainer gameplayClockContainer)
         {
-            this.gameplayClockContainer = gameplayClockContainer;
+            this.gameplayClockContainer = gameplayClockContainer ?? throw new ArgumentNullException(nameof(gameplayClockContainer));
         }
 
         protected override void LoadComplete()

From 290ae373469bd43d66c6c965edb7e0c016ff797a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Jun 2020 23:54:20 +0900
Subject: [PATCH 03326/10326] Add assertion of only usage game-wide

---
 osu.Game/Screens/Play/ScreenSuspensionHandler.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
index 59ad74d81a..8585a5c309 100644
--- a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
+++ b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -30,6 +31,10 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
+            // This is the only usage game-wide of suspension changes.
+            // Assert to ensure we don't accidentally forget this in the future.
+            Debug.Assert(host.AllowScreenSuspension.Value);
+
             isPaused = gameplayClockContainer.IsPaused.GetBoundCopy();
             isPaused.BindValueChanged(paused => host.AllowScreenSuspension.Value = paused.NewValue, true);
         }

From f04f2d21755103041272a66484730a5ae8687cfc Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Thu, 18 Jun 2020 21:46:32 +0100
Subject: [PATCH 03327/10326] Add test scene

---
 .../Gameplay/TestSceneStoryboardSamples.cs    | 57 +++++++++++++++++++
 .../Drawables/DrawableStoryboardSample.cs     | 17 +++---
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 552d163b2f..60911d6792 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -10,9 +10,12 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
@@ -70,6 +73,37 @@ namespace osu.Game.Tests.Gameplay
             AddUntilStep("sample playback succeeded", () => sample.LifetimeEnd < double.MaxValue);
         }
 
+        [Test]
+        public void TestSamplePlaybackWithRateMods()
+        {
+            GameplayClockContainer gameplayContainer = null;
+            TestDrawableStoryboardSample sample = null;
+
+            OsuModDoubleTime doubleTimeMod = null;
+
+            AddStep("create container", () =>
+            {
+                var beatmap = Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+
+                Add(gameplayContainer = new GameplayClockContainer(beatmap, new[] { doubleTimeMod = new OsuModDoubleTime() }, 0));
+
+                SelectedMods.Value = new[] { doubleTimeMod };
+                Beatmap.Value = new TestCustomSkinWorkingBeatmap(beatmap.Beatmap, gameplayContainer.GameplayClock, Audio);
+            });
+
+            AddStep("create storyboard sample", () =>
+            {
+                gameplayContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
+                {
+                    Clock = gameplayContainer.GameplayClock
+                });
+            });
+
+            AddStep("start", () => gameplayContainer.Start());
+
+            AddAssert("sample playback rate matches mod rates", () => sample.TestChannel.AggregateFrequency.Value == doubleTimeMod.SpeedChange.Value);
+        }
+
         private class TestSkin : LegacySkin
         {
             public TestSkin(string resourceName, AudioManager audioManager)
@@ -99,5 +133,28 @@ namespace osu.Game.Tests.Gameplay
             {
             }
         }
+
+        private class TestCustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
+        {
+            private readonly AudioManager audio;
+
+            public TestCustomSkinWorkingBeatmap(IBeatmap beatmap, IFrameBasedClock referenceClock, AudioManager audio)
+                : base(beatmap, null, referenceClock, audio)
+            {
+                this.audio = audio;
+            }
+
+            protected override ISkin GetSkin() => new TestSkin("test-sample", audio);
+        }
+
+        private class TestDrawableStoryboardSample : DrawableStoryboardSample
+        {
+            public TestDrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
+                : base(sampleInfo)
+            {
+            }
+
+            public SampleChannel TestChannel => Channel;
+        }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 2b9c66d2e6..04df46410e 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -20,7 +20,8 @@ namespace osu.Game.Storyboards.Drawables
         private const double allowable_late_start = 100;
 
         private readonly StoryboardSampleInfo sampleInfo;
-        private SampleChannel channel;
+
+        protected SampleChannel Channel;
 
         public override bool RemoveWhenNotAlive => false;
 
@@ -33,14 +34,14 @@ namespace osu.Game.Storyboards.Drawables
         [BackgroundDependencyLoader]
         private void load(IBindable<WorkingBeatmap> beatmap, IBindable<IReadOnlyList<Mod>> mods)
         {
-            channel = beatmap.Value.Skin.GetSample(sampleInfo);
+            Channel = beatmap.Value.Skin.GetSample(sampleInfo);
 
-            if (channel != null)
+            if (Channel != null)
             {
-                channel.Volume.Value = sampleInfo.Volume / 100.0;
+                Channel.Volume.Value = sampleInfo.Volume / 100.0;
 
                 foreach (var mod in mods.Value.OfType<IApplicableToSample>())
-                    mod.ApplyToSample(channel);
+                    mod.ApplyToSample(Channel);
             }
         }
 
@@ -52,7 +53,7 @@ namespace osu.Game.Storyboards.Drawables
             if (Time.Current < sampleInfo.StartTime)
             {
                 // We've rewound before the start time of the sample
-                channel?.Stop();
+                Channel?.Stop();
 
                 // In the case that the user fast-forwards to a point far beyond the start time of the sample,
                 // we want to be able to fall into the if-conditional below (therefore we must not have a life time end)
@@ -64,7 +65,7 @@ namespace osu.Game.Storyboards.Drawables
                 // We've passed the start time of the sample. We only play the sample if we're within an allowable range
                 // from the sample's start, to reduce layering if we've been fast-forwarded far into the future
                 if (Time.Current - sampleInfo.StartTime < allowable_late_start)
-                    channel?.Play();
+                    Channel?.Play();
 
                 // In the case that the user rewinds to a point far behind the start time of the sample,
                 // we want to be able to fall into the if-conditional above (therefore we must not have a life time start)
@@ -75,7 +76,7 @@ namespace osu.Game.Storyboards.Drawables
 
         protected override void Dispose(bool isDisposing)
         {
-            channel?.Stop();
+            Channel?.Stop();
             base.Dispose(isDisposing);
         }
     }

From 5530e2a1dbaa413a4383348ca7b2cf042d3c1c60 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 15:35:39 +0900
Subject: [PATCH 03328/10326] Add test for delayed score fetch

---
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 63 ++++++++++++++++++-
 1 file changed, 60 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index ea33aa62e3..9d3c22d87c 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -4,11 +4,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Rulesets.Osu;
@@ -16,6 +18,7 @@ using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
@@ -44,7 +47,7 @@ namespace osu.Game.Tests.Visual.Ranking
         private UnrankedSoloResultsScreen createUnrankedSoloResultsScreen() => new UnrankedSoloResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo));
 
         [Test]
-        public void ResultsWithoutPlayer()
+        public void TestResultsWithoutPlayer()
         {
             TestResultsScreen screen = null;
             OsuScreenStack stack;
@@ -63,7 +66,7 @@ namespace osu.Game.Tests.Visual.Ranking
         }
 
         [Test]
-        public void ResultsWithPlayer()
+        public void TestResultsWithPlayer()
         {
             TestResultsScreen screen = null;
 
@@ -73,7 +76,7 @@ namespace osu.Game.Tests.Visual.Ranking
         }
 
         [Test]
-        public void ResultsForUnranked()
+        public void TestResultsForUnranked()
         {
             UnrankedSoloResultsScreen screen = null;
 
@@ -82,6 +85,24 @@ namespace osu.Game.Tests.Visual.Ranking
             AddAssert("retry overlay present", () => screen.RetryOverlay != null);
         }
 
+        [Test]
+        public void TestFetchScoresAfterShowingStatistics()
+        {
+            DelayedFetchResultsScreen screen = null;
+
+            AddStep("load results", () => Child = new TestResultsContainer(screen = new DelayedFetchResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo), 3000)));
+            AddUntilStep("wait for loaded", () => screen.IsLoaded);
+            AddStep("click expanded panel", () =>
+            {
+                var expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+                InputManager.MoveMouseTo(expandedPanel);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("wait for fetch", () => screen.FetchCompleted);
+            AddAssert("expanded panel still on screen", () => this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded).ScreenSpaceDrawQuad.TopLeft.X > 0);
+        }
+
         private class TestResultsContainer : Container
         {
             [Cached(typeof(Player))]
@@ -134,6 +155,42 @@ namespace osu.Game.Tests.Visual.Ranking
             }
         }
 
+        private class DelayedFetchResultsScreen : TestResultsScreen
+        {
+            public bool FetchCompleted { get; private set; }
+
+            private readonly double delay;
+
+            public DelayedFetchResultsScreen(ScoreInfo score, double delay)
+                : base(score)
+            {
+                this.delay = delay;
+            }
+
+            protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
+            {
+                Task.Run(async () =>
+                {
+                    await Task.Delay(TimeSpan.FromMilliseconds(delay));
+
+                    var scores = new List<ScoreInfo>();
+
+                    for (int i = 0; i < 20; i++)
+                    {
+                        var score = new TestScoreInfo(new OsuRuleset().RulesetInfo);
+                        score.TotalScore += 10 - i;
+                        scores.Add(score);
+                    }
+
+                    scoresCallback?.Invoke(scores);
+
+                    Schedule(() => FetchCompleted = true);
+                });
+
+                return null;
+            }
+        }
+
         private class UnrankedSoloResultsScreen : SoloResultsScreen
         {
             public HotkeyRetryOverlay RetryOverlay;

From ec16b0fc5a3888c65b198da0640b563accba5803 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 17:28:35 +0900
Subject: [PATCH 03329/10326] Rework score panel tracking to fix visual edge
 cases

---
 .../Visual/Ranking/TestSceneScorePanel.cs     | 38 --------
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 97 +++++++++++++------
 osu.Game/Screens/Ranking/ScorePanel.cs        | 45 ++-------
 osu.Game/Screens/Ranking/ScorePanelList.cs    | 79 +++++++++------
 .../Ranking/ScorePanelTrackingContainer.cs    | 35 +++++++
 5 files changed, 155 insertions(+), 139 deletions(-)
 create mode 100644 osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
index 1c5087ee94..250fdc5ebd 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -102,39 +101,6 @@ namespace osu.Game.Tests.Visual.Ranking
             AddWaitStep("wait for transition", 10);
         }
 
-        [Test]
-        public void TestSceneTrackingScorePanel()
-        {
-            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo) { Accuracy = 0.925, Rank = ScoreRank.A };
-
-            addPanelStep(score, PanelState.Contracted);
-
-            AddStep("enable tracking", () =>
-            {
-                panel.Anchor = Anchor.CentreLeft;
-                panel.Origin = Anchor.CentreLeft;
-                panel.Tracking = true;
-
-                Add(panel.CreateTrackingComponent().With(d =>
-                {
-                    d.Anchor = Anchor.Centre;
-                    d.Origin = Anchor.Centre;
-                }));
-            });
-
-            assertTracking(true);
-
-            AddStep("expand panel", () => panel.State = PanelState.Expanded);
-            AddWaitStep("wait for transition", 2);
-            assertTracking(true);
-
-            AddStep("stop tracking", () => panel.Tracking = false);
-            assertTracking(false);
-
-            AddStep("start tracking", () => panel.Tracking = true);
-            assertTracking(true);
-        }
-
         private void addPanelStep(ScoreInfo score, PanelState state = PanelState.Expanded) => AddStep("add panel", () =>
         {
             Child = panel = new ScorePanel(score)
@@ -144,9 +110,5 @@ namespace osu.Game.Tests.Visual.Ranking
                 State = state
             };
         });
-
-        private void assertTracking(bool tracking) => AddAssert($"{(tracking ? "is" : "is not")} tracking", () =>
-            Precision.AlmostEquals(panel.ScreenSpaceDrawQuad.TopLeft, panel.CreateTrackingComponent().ScreenSpaceDrawQuad.TopLeft) == tracking
-            && Precision.AlmostEquals(panel.ScreenSpaceDrawQuad.BottomRight, panel.CreateTrackingComponent().ScreenSpaceDrawQuad.BottomRight) == tracking);
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index de1939352f..133efd6e7b 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -47,6 +48,7 @@ namespace osu.Game.Screens.Ranking
         private StatisticsPanel statisticsPanel;
         private Drawable bottomPanel;
         private ScorePanelList scorePanelList;
+        private Container<ScorePanel> detachedPanelContainer;
 
         protected ResultsScreen(ScoreInfo score, bool allowRetry = true)
         {
@@ -89,11 +91,15 @@ namespace osu.Game.Screens.Ranking
                                                 SelectedScore = { BindTarget = SelectedScore },
                                                 PostExpandAction = () => statisticsPanel.ToggleVisibility()
                                             },
+                                            detachedPanelContainer = new Container<ScorePanel>
+                                            {
+                                                RelativeSizeAxes = Axes.Both
+                                            },
                                             statisticsPanel = new StatisticsPanel
                                             {
                                                 RelativeSizeAxes = Axes.Both,
                                                 Score = { BindTarget = SelectedScore }
-                                            }
+                                            },
                                         }
                                     }
                                 },
@@ -169,7 +175,7 @@ namespace osu.Game.Screens.Ranking
             var req = FetchScores(scores => Schedule(() =>
             {
                 foreach (var s in scores)
-                    scorePanelList.AddScore(s);
+                    addScore(s);
             }));
 
             if (req != null)
@@ -208,42 +214,71 @@ namespace osu.Game.Screens.Ranking
             return base.OnExiting(next);
         }
 
+        private void addScore(ScoreInfo score)
+        {
+            var panel = scorePanelList.AddScore(score);
+
+            if (detachedPanel != null)
+                panel.Alpha = 0;
+        }
+
+        private ScorePanel detachedPanel;
+
         private void onStatisticsStateChanged(ValueChangedEvent<Visibility> state)
         {
-            if (state.NewValue == Visibility.Hidden)
+            if (state.NewValue == Visibility.Visible)
             {
-                Background.FadeTo(0.5f, 150);
+                // Detach the panel in its original location, and move into the desired location in the local container.
+                var expandedPanel = scorePanelList.GetPanelForScore(SelectedScore.Value);
+                var screenSpacePos = expandedPanel.ScreenSpaceDrawQuad.TopLeft;
 
-                foreach (var panel in scorePanelList.Panels)
-                {
-                    if (panel.State == PanelState.Contracted)
-                        panel.FadeIn(150);
-                    else
-                    {
-                        panel.MoveTo(panel.GetTrackingPosition(), 150, Easing.OutQuint).OnComplete(p =>
-                        {
-                            scorePanelList.HandleScroll = true;
-                            p.Tracking = true;
-                        });
-                    }
-                }
-            }
-            else
-            {
+                // Detach and move into the local container.
+                scorePanelList.Detach(expandedPanel);
+                detachedPanelContainer.Add(expandedPanel);
+
+                // Move into its original location in the local container.
+                var origLocation = detachedPanelContainer.ToLocalSpace(screenSpacePos);
+                expandedPanel.MoveTo(origLocation);
+                expandedPanel.MoveToX(origLocation.X);
+
+                // Move into the final location.
+                expandedPanel.MoveToX(StatisticsPanel.SIDE_PADDING, 150, Easing.OutQuint);
+
+                // Hide contracted panels.
+                foreach (var contracted in scorePanelList.GetScorePanels().Where(p => p.State == PanelState.Contracted))
+                    contracted.FadeOut(150, Easing.OutQuint);
+                scorePanelList.HandleInput = false;
+
+                // Dim background.
                 Background.FadeTo(0.1f, 150);
 
-                foreach (var panel in scorePanelList.Panels)
-                {
-                    if (panel.State == PanelState.Contracted)
-                        panel.FadeOut(150, Easing.OutQuint);
-                    else
-                    {
-                        scorePanelList.HandleScroll = false;
+                detachedPanel = expandedPanel;
+            }
+            else if (detachedPanel != null)
+            {
+                var screenSpacePos = detachedPanel.ScreenSpaceDrawQuad.TopLeft;
 
-                        panel.Tracking = false;
-                        panel.MoveTo(new Vector2(scorePanelList.CurrentScrollPosition + StatisticsPanel.SIDE_PADDING, panel.GetTrackingPosition().Y), 150, Easing.OutQuint);
-                    }
-                }
+                // Remove from the local container and re-attach.
+                detachedPanelContainer.Remove(detachedPanel);
+                scorePanelList.Attach(detachedPanel);
+
+                // Move into its original location in the attached container.
+                var origLocation = detachedPanel.Parent.ToLocalSpace(screenSpacePos);
+                detachedPanel.MoveTo(origLocation);
+                detachedPanel.MoveToX(origLocation.X);
+
+                // Move into the final location.
+                detachedPanel.MoveToX(0, 150, Easing.OutQuint);
+
+                // Show contracted panels.
+                foreach (var contracted in scorePanelList.GetScorePanels().Where(p => p.State == PanelState.Contracted))
+                    contracted.FadeIn(150, Easing.OutQuint);
+                scorePanelList.HandleInput = true;
+
+                // Un-dim background.
+                Background.FadeTo(0.5f, 150);
+
+                detachedPanel = null;
             }
         }
     }
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 31b2796c13..257279bdc9 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -78,11 +78,6 @@ namespace osu.Game.Screens.Ranking
         public event Action<PanelState> StateChanged;
         public Action PostExpandAction;
 
-        /// <summary>
-        /// Whether this <see cref="ScorePanel"/> should track the position of the tracking component created via <see cref="CreateTrackingComponent"/>.
-        /// </summary>
-        public bool Tracking;
-
         /// <summary>
         /// Whether this <see cref="ScorePanel"/> can enter into an <see cref="PanelState.Expanded"/> state.
         /// </summary>
@@ -194,20 +189,6 @@ namespace osu.Game.Screens.Ranking
             }
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            if (Tracking && trackingComponent != null)
-                Position = GetTrackingPosition();
-        }
-
-        public Vector2 GetTrackingPosition()
-        {
-            Vector2 topLeftPos = Parent.ToLocalSpace(trackingComponent.ScreenSpaceDrawQuad.TopLeft);
-            return topLeftPos - AnchorPosition + OriginPosition;
-        }
-
         private void updateState()
         {
             topLayerContent?.FadeOut(content_fade_duration).Expire();
@@ -269,8 +250,8 @@ namespace osu.Game.Screens.Ranking
             {
                 base.Size = value;
 
-                if (trackingComponent != null)
-                    trackingComponent.Size = value;
+                if (trackingContainer != null)
+                    trackingContainer.Size = value;
             }
         }
 
@@ -293,26 +274,14 @@ namespace osu.Game.Screens.Ranking
                || topLayerContainer.ReceivePositionalInputAt(screenSpacePos)
                || middleLayerContainer.ReceivePositionalInputAt(screenSpacePos);
 
-        private TrackingComponent trackingComponent;
+        private ScorePanelTrackingContainer trackingContainer;
 
-        public TrackingComponent CreateTrackingComponent() => trackingComponent ??= new TrackingComponent(this);
-
-        public class TrackingComponent : Drawable
+        public ScorePanelTrackingContainer CreateTrackingContainer()
         {
-            public readonly ScorePanel Panel;
+            if (trackingContainer != null)
+                throw new InvalidOperationException("A score panel container has already been created.");
 
-            public TrackingComponent(ScorePanel panel)
-            {
-                Panel = panel;
-            }
-
-            // In ScorePanelList, score panels are added _before_ the flow, but this means that input will be blocked by the scroll container.
-            // So by forwarding input events, we remove the need to consider the order in which input is handled.
-            protected override bool OnClick(ClickEvent e) => Panel.TriggerEvent(e);
-
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Panel.ReceivePositionalInputAt(screenSpacePos);
-
-            public override bool IsPresent => Panel.IsPresent;
+            return trackingContainer = new ScorePanelTrackingContainer(this);
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index e332f462bb..32903860ec 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -32,9 +32,6 @@ namespace osu.Game.Screens.Ranking
 
         public float CurrentScrollPosition => scroll.Current;
 
-        public IReadOnlyList<ScorePanel> Panels => panels;
-        private readonly Container<ScorePanel> panels;
-
         private readonly Flow flow;
         private readonly Scroll scroll;
         private ScorePanel expandedPanel;
@@ -49,10 +46,9 @@ namespace osu.Game.Screens.Ranking
             InternalChild = scroll = new Scroll
             {
                 RelativeSizeAxes = Axes.Both,
-                HandleScroll = () => HandleScroll && expandedPanel?.IsHovered != true, // handle horizontal scroll only when not hovering the expanded panel.
+                HandleScroll = () => expandedPanel?.IsHovered != true, // handle horizontal scroll only when not hovering the expanded panel.
                 Children = new Drawable[]
                 {
-                    panels = new Container<ScorePanel> { RelativeSizeAxes = Axes.Both },
                     flow = new Flow
                     {
                         Anchor = Anchor.Centre,
@@ -72,34 +68,14 @@ namespace osu.Game.Screens.Ranking
             SelectedScore.BindValueChanged(selectedScoreChanged, true);
         }
 
-        private bool handleScroll = true;
-
-        public bool HandleScroll
-        {
-            get => handleScroll;
-            set
-            {
-                handleScroll = value;
-
-                foreach (var p in panels)
-                    p.CanExpand = value;
-
-                scroll.ScrollbarVisible = value;
-
-                if (!value)
-                    scroll.ScrollTo(CurrentScrollPosition, false);
-            }
-        }
-
         /// <summary>
         /// Adds a <see cref="ScoreInfo"/> to this list.
         /// </summary>
         /// <param name="score">The <see cref="ScoreInfo"/> to add.</param>
-        public void AddScore(ScoreInfo score)
+        public ScorePanel AddScore(ScoreInfo score)
         {
             var panel = new ScorePanel(score)
             {
-                Tracking = true,
                 PostExpandAction = () => PostExpandAction?.Invoke()
             }.With(p =>
             {
@@ -110,8 +86,7 @@ namespace osu.Game.Screens.Ranking
                 };
             });
 
-            panels.Add(panel);
-            flow.Add(panel.CreateTrackingComponent().With(d =>
+            flow.Add(panel.CreateTrackingContainer().With(d =>
             {
                 d.Anchor = Anchor.Centre;
                 d.Origin = Anchor.Centre;
@@ -132,6 +107,8 @@ namespace osu.Game.Screens.Ranking
                     scroll.InstantScrollTarget = (scroll.InstantScrollTarget ?? scroll.Target) + ScorePanel.CONTRACTED_WIDTH + panel_spacing;
                 }
             }
+
+            return panel;
         }
 
         /// <summary>
@@ -187,15 +164,53 @@ namespace osu.Game.Screens.Ranking
             flow.Padding = new MarginPadding { Horizontal = offset };
         }
 
-        private class Flow : FillFlowContainer<ScorePanel.TrackingComponent>
+        private bool handleInput = true;
+
+        public bool HandleInput
+        {
+            get => handleInput;
+            set
+            {
+                handleInput = value;
+                scroll.ScrollbarVisible = value;
+            }
+        }
+
+        public override bool PropagatePositionalInputSubTree => HandleInput && base.PropagatePositionalInputSubTree;
+
+        public override bool PropagateNonPositionalInputSubTree => HandleInput && base.PropagateNonPositionalInputSubTree;
+
+        public IEnumerable<ScorePanel> GetScorePanels() => flow.Select(t => t.Panel);
+
+        public ScorePanel GetPanelForScore(ScoreInfo score) => flow.Single(t => t.Panel.Score == score).Panel;
+
+        public void Detach(ScorePanel panel)
+        {
+            var container = flow.FirstOrDefault(t => t.Panel == panel);
+            if (container == null)
+                throw new InvalidOperationException("Panel is not contained by the score panel list.");
+
+            container.Detach();
+        }
+
+        public void Attach(ScorePanel panel)
+        {
+            var container = flow.FirstOrDefault(t => t.Panel == panel);
+            if (container == null)
+                throw new InvalidOperationException("Panel is not contained by the score panel list.");
+
+            container.Attach();
+        }
+
+        private class Flow : FillFlowContainer<ScorePanelTrackingContainer>
         {
             public override IEnumerable<Drawable> FlowingChildren => applySorting(AliveInternalChildren);
 
             public int GetPanelIndex(ScoreInfo score) => applySorting(Children).TakeWhile(s => s.Panel.Score != score).Count();
 
-            private IEnumerable<ScorePanel.TrackingComponent> applySorting(IEnumerable<Drawable> drawables) => drawables.OfType<ScorePanel.TrackingComponent>()
-                                                                                                                        .OrderByDescending(s => s.Panel.Score.TotalScore)
-                                                                                                                        .ThenBy(s => s.Panel.Score.OnlineScoreID);
+            private IEnumerable<ScorePanelTrackingContainer> applySorting(IEnumerable<Drawable> drawables) => drawables.OfType<ScorePanelTrackingContainer>()
+                                                                                                                       .OrderByDescending(s => s.Panel.Score.TotalScore)
+                                                                                                                       .ThenBy(s => s.Panel.Score.OnlineScoreID);
         }
 
         private class Scroll : OsuScrollContainer
diff --git a/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs b/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
new file mode 100644
index 0000000000..f6f26d0f8a
--- /dev/null
+++ b/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
@@ -0,0 +1,35 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Ranking
+{
+    public class ScorePanelTrackingContainer : CompositeDrawable
+    {
+        public readonly ScorePanel Panel;
+
+        public ScorePanelTrackingContainer(ScorePanel panel)
+        {
+            Panel = panel;
+            Attach();
+        }
+
+        public void Detach()
+        {
+            if (InternalChildren.Count == 0)
+                throw new InvalidOperationException("Score panel container is not attached.");
+
+            RemoveInternal(Panel);
+        }
+
+        public void Attach()
+        {
+            if (InternalChildren.Count > 0)
+                throw new InvalidOperationException("Score panel container is already attached.");
+
+            AddInternal(Panel);
+        }
+    }
+}

From 55196efe6e4ae03efe09e7dbc2b79d7d90f8e4c5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 18:02:54 +0900
Subject: [PATCH 03330/10326] Fix panel depth ordering

---
 osu.Game/Screens/Ranking/ScorePanelList.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 32903860ec..8f9064c2d1 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -211,6 +211,22 @@ namespace osu.Game.Screens.Ranking
             private IEnumerable<ScorePanelTrackingContainer> applySorting(IEnumerable<Drawable> drawables) => drawables.OfType<ScorePanelTrackingContainer>()
                                                                                                                        .OrderByDescending(s => s.Panel.Score.TotalScore)
                                                                                                                        .ThenBy(s => s.Panel.Score.OnlineScoreID);
+
+            protected override int Compare(Drawable x, Drawable y)
+            {
+                var tX = (ScorePanelTrackingContainer)x;
+                var tY = (ScorePanelTrackingContainer)y;
+
+                int result = tY.Panel.Score.TotalScore.CompareTo(tX.Panel.Score.TotalScore);
+
+                if (result != 0)
+                    return result;
+
+                if (tX.Panel.Score.OnlineScoreID == null || tY.Panel.Score.OnlineScoreID == null)
+                    return base.Compare(x, y);
+
+                return tX.Panel.Score.OnlineScoreID.Value.CompareTo(tY.Panel.Score.OnlineScoreID.Value);
+            }
         }
 
         private class Scroll : OsuScrollContainer

From c9ad3192b02ae4a9a2cc4d6b19adb9b84d54d4ef Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 18:02:57 +0900
Subject: [PATCH 03331/10326] Add more tests

---
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 9d3c22d87c..ac364b5233 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Rulesets.Osu;
@@ -18,6 +19,7 @@ using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
+using osu.Game.Screens.Ranking.Statistics;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Ranking
@@ -85,6 +87,73 @@ namespace osu.Game.Tests.Visual.Ranking
             AddAssert("retry overlay present", () => screen.RetryOverlay != null);
         }
 
+        [Test]
+        public void TestShowHideStatistics()
+        {
+            TestResultsScreen screen = null;
+
+            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
+            AddUntilStep("wait for loaded", () => screen.IsLoaded);
+
+            AddStep("click expanded panel", () =>
+            {
+                var expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+                InputManager.MoveMouseTo(expandedPanel);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("statistics shown", () => this.ChildrenOfType<StatisticsPanel>().Single().State.Value == Visibility.Visible);
+
+            AddUntilStep("expanded panel at the left of the screen", () =>
+            {
+                var expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+                return expandedPanel.ScreenSpaceDrawQuad.TopLeft.X - screen.ScreenSpaceDrawQuad.TopLeft.X < 150;
+            });
+
+            AddStep("click expanded panel", () =>
+            {
+                var expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+                InputManager.MoveMouseTo(expandedPanel);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("statistics hidden", () => this.ChildrenOfType<StatisticsPanel>().Single().State.Value == Visibility.Hidden);
+
+            AddUntilStep("expanded panel in centre of screen", () =>
+            {
+                var expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+                return Precision.AlmostEquals(expandedPanel.ScreenSpaceDrawQuad.Centre.X, screen.ScreenSpaceDrawQuad.Centre.X, 1);
+            });
+        }
+
+        [Test]
+        public void TestShowStatisticsAndClickOtherPanel()
+        {
+            TestResultsScreen screen = null;
+
+            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
+            AddUntilStep("wait for loaded", () => screen.IsLoaded);
+
+            ScorePanel expandedPanel = null;
+            ScorePanel contractedPanel = null;
+
+            AddStep("click expanded panel then contracted panel", () =>
+            {
+                expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+                InputManager.MoveMouseTo(expandedPanel);
+                InputManager.Click(MouseButton.Left);
+
+                contractedPanel = this.ChildrenOfType<ScorePanel>().First(p => p.State == PanelState.Contracted && p.ScreenSpaceDrawQuad.TopLeft.X > screen.ScreenSpaceDrawQuad.TopLeft.X);
+                InputManager.MoveMouseTo(contractedPanel);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("statistics shown", () => this.ChildrenOfType<StatisticsPanel>().Single().State.Value == Visibility.Visible);
+
+            AddAssert("contracted panel still contracted", () => contractedPanel.State == PanelState.Contracted);
+            AddAssert("expanded panel still expanded", () => expandedPanel.State == PanelState.Expanded);
+        }
+
         [Test]
         public void TestFetchScoresAfterShowingStatistics()
         {

From cae3a5f447e166b57bfed30a52e4a51964e4e2a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 19:08:36 +0900
Subject: [PATCH 03332/10326] Rework heatmap for more consistent performance

---
 osu.Game.Rulesets.Osu/Statistics/Heatmap.cs   | 94 +++++++++----------
 .../Ranking/TestSceneAccuracyHeatmap.cs       | 55 +++++++----
 2 files changed, 78 insertions(+), 71 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
index 95cfc5b768..8ebc8e9001 100644
--- a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
@@ -26,10 +26,15 @@ namespace osu.Game.Rulesets.Osu.Statistics
         /// </summary>
         private const float inner_portion = 0.8f;
 
-        private const float rotation = 45;
-        private const float point_size = 4;
+        /// <summary>
+        /// Number of rows/columns of points.
+        /// 4px per point @ 128x128 size (the contents of the <see cref="Heatmap"/> are always square). 1024 total points.
+        /// </summary>
+        private const int points_per_dimension = 32;
 
-        private Container<HitPoint> allPoints;
+        private const float rotation = 45;
+
+        private GridContainer pointGrid;
 
         private readonly BeatmapInfo beatmap;
         private readonly IReadOnlyList<HitEvent> hitEvents;
@@ -111,52 +116,39 @@ namespace osu.Game.Rulesets.Osu.Statistics
                             }
                         }
                     },
-                    allPoints = new Container<HitPoint>
+                    pointGrid = new GridContainer
                     {
                         RelativeSizeAxes = Axes.Both
                     }
                 }
             };
-        }
 
-        protected override void Update()
-        {
-            base.Update();
-            validateHitPoints();
-        }
+            Vector2 centre = new Vector2(points_per_dimension) / 2;
+            float innerRadius = centre.X * inner_portion;
 
-        private void validateHitPoints()
-        {
-            if (sizeLayout.IsValid)
-                return;
+            Drawable[][] points = new Drawable[points_per_dimension][];
 
-            allPoints.Clear();
-
-            // Since the content is fit, both dimensions should have the same size.
-            float size = allPoints.DrawSize.X;
-
-            Vector2 centre = new Vector2(size / 2);
-            int rows = (int)Math.Ceiling(size / point_size);
-            int cols = (int)Math.Ceiling(size / point_size);
-
-            for (int r = 0; r < rows; r++)
+            for (int r = 0; r < points_per_dimension; r++)
             {
-                for (int c = 0; c < cols; c++)
+                points[r] = new Drawable[points_per_dimension];
+
+                for (int c = 0; c < points_per_dimension; c++)
                 {
-                    Vector2 pos = new Vector2(c * point_size, r * point_size);
-                    HitPointType pointType = HitPointType.Hit;
+                    HitPointType pointType = Vector2.Distance(new Vector2(c, r), centre) <= innerRadius
+                        ? HitPointType.Hit
+                        : HitPointType.Miss;
 
-                    if (Vector2.Distance(pos, centre) > size * inner_portion / 2)
-                        pointType = HitPointType.Miss;
-
-                    allPoints.Add(new HitPoint(pos, pointType)
+                    var point = new HitPoint(pointType)
                     {
-                        Size = new Vector2(point_size),
                         Colour = pointType == HitPointType.Hit ? new Color4(102, 255, 204, 255) : new Color4(255, 102, 102, 255)
-                    });
+                    };
+
+                    points[r][c] = point;
                 }
             }
 
+            pointGrid.Content = points;
+
             if (hitEvents.Count > 0)
             {
                 // Todo: This should probably not be done like this.
@@ -170,41 +162,39 @@ namespace osu.Game.Rulesets.Osu.Statistics
                     AddPoint(((OsuHitObject)e.LastHitObject).StackedEndPosition, ((OsuHitObject)e.HitObject).StackedEndPosition, e.CursorPosition.Value, radius);
                 }
             }
-
-            sizeLayout.Validate();
         }
 
         protected void AddPoint(Vector2 start, Vector2 end, Vector2 hitPoint, float radius)
         {
-            if (allPoints.Count == 0)
+            if (pointGrid.Content.Length == 0)
                 return;
 
             double angle1 = Math.Atan2(end.Y - hitPoint.Y, hitPoint.X - end.X); // Angle between the end point and the hit point.
             double angle2 = Math.Atan2(end.Y - start.Y, start.X - end.X); // Angle between the end point and the start point.
             double finalAngle = angle2 - angle1; // Angle between start, end, and hit points.
-
             float normalisedDistance = Vector2.Distance(hitPoint, end) / radius;
 
-            // Since the content is fit, both dimensions should have the same size.
-            float size = allPoints.DrawSize.X;
+            // Convert the above into the local search space.
+            Vector2 localCentre = new Vector2(points_per_dimension) / 2;
+            float localRadius = localCentre.X * inner_portion * normalisedDistance; // The radius inside the inner portion which of the heatmap which the closest point lies.
+            double localAngle = finalAngle + 3 * Math.PI / 4; // The angle inside the heatmap on which the closest point lies.
+            Vector2 localPoint = localCentre + localRadius * new Vector2((float)Math.Cos(localAngle), (float)Math.Sin(localAngle));
 
             // Find the most relevant hit point.
             double minDist = double.PositiveInfinity;
             HitPoint point = null;
 
-            foreach (var p in allPoints)
+            for (int r = 0; r < points_per_dimension; r++)
             {
-                Vector2 localCentre = new Vector2(size / 2);
-                float localRadius = localCentre.X * inner_portion * normalisedDistance;
-                double localAngle = finalAngle + 3 * Math.PI / 4;
-                Vector2 localPoint = localCentre + localRadius * new Vector2((float)Math.Cos(localAngle), (float)Math.Sin(localAngle));
-
-                float dist = Vector2.Distance(p.DrawPosition + p.DrawSize / 2, localPoint);
-
-                if (dist < minDist)
+                for (int c = 0; c < points_per_dimension; c++)
                 {
-                    minDist = dist;
-                    point = p;
+                    float dist = Vector2.Distance(new Vector2(c, r), localPoint);
+
+                    if (dist < minDist)
+                    {
+                        minDist = dist;
+                        point = (HitPoint)pointGrid.Content[r][c];
+                    }
                 }
             }
 
@@ -216,11 +206,11 @@ namespace osu.Game.Rulesets.Osu.Statistics
         {
             private readonly HitPointType pointType;
 
-            public HitPoint(Vector2 position, HitPointType pointType)
+            public HitPoint(HitPointType pointType)
             {
                 this.pointType = pointType;
 
-                Position = position;
+                RelativeSizeAxes = Axes.Both;
                 Alpha = 0;
             }
 
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
index ba6a0e42c2..52cc41fbd8 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
@@ -2,11 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using NUnit.Framework;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu;
@@ -20,13 +22,18 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneAccuracyHeatmap : OsuManualInputManagerTestScene
     {
-        private readonly Box background;
-        private readonly Drawable object1;
-        private readonly Drawable object2;
-        private readonly TestHeatmap heatmap;
+        private Box background;
+        private Drawable object1;
+        private Drawable object2;
+        private TestHeatmap heatmap;
+        private ScheduledDelegate automaticAdditionDelegate;
 
-        public TestSceneAccuracyHeatmap()
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
+            automaticAdditionDelegate?.Cancel();
+            automaticAdditionDelegate = null;
+
             Children = new[]
             {
                 background = new Box
@@ -41,7 +48,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 },
                 object2 = new BorderCircle
                 {
-                    Position = new Vector2(500, 300),
+                    Position = new Vector2(100, 300),
                 },
                 heatmap = new TestHeatmap(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo, new List<HitEvent>())
                 {
@@ -50,22 +57,32 @@ namespace osu.Game.Tests.Visual.Ranking
                     Size = new Vector2(130)
                 }
             };
+        });
+
+        [Test]
+        public void TestManyHitPointsAutomatic()
+        {
+            AddStep("add scheduled delegate", () =>
+            {
+                automaticAdditionDelegate = Scheduler.AddDelayed(() =>
+                {
+                    var randomPos = new Vector2(
+                        RNG.NextSingle(object1.DrawPosition.X - object1.DrawSize.X / 2, object1.DrawPosition.X + object1.DrawSize.X / 2),
+                        RNG.NextSingle(object1.DrawPosition.Y - object1.DrawSize.Y / 2, object1.DrawPosition.Y + object1.DrawSize.Y / 2));
+
+                    // The background is used for ToLocalSpace() since we need to go _inside_ the DrawSizePreservingContainer (Content of TestScene).
+                    heatmap.AddPoint(object2.Position, object1.Position, randomPos, RNG.NextSingle(10, 500));
+                    InputManager.MoveMouseTo(background.ToScreenSpace(randomPos));
+                }, 1, true);
+            });
+
+            AddWaitStep("wait for some hit points", 10);
         }
 
-        protected override void LoadComplete()
+        [Test]
+        public void TestManualPlacement()
         {
-            base.LoadComplete();
-
-            Scheduler.AddDelayed(() =>
-            {
-                var randomPos = new Vector2(
-                    RNG.NextSingle(object1.DrawPosition.X - object1.DrawSize.X / 2, object1.DrawPosition.X + object1.DrawSize.X / 2),
-                    RNG.NextSingle(object1.DrawPosition.Y - object1.DrawSize.Y / 2, object1.DrawPosition.Y + object1.DrawSize.Y / 2));
-
-                // The background is used for ToLocalSpace() since we need to go _inside_ the DrawSizePreservingContainer (Content of TestScene).
-                heatmap.AddPoint(object2.Position, object1.Position, randomPos, RNG.NextSingle(10, 500));
-                InputManager.MoveMouseTo(background.ToScreenSpace(randomPos));
-            }, 1, true);
+            AddStep("return user input", () => InputManager.UseParentInput = true);
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)

From d3e4e6325884a2ac753d3c0c2c2601accb7a4d2f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 19:12:48 +0900
Subject: [PATCH 03333/10326] Remove unnecessary class

---
 .../Scoring/TimingDistribution.cs               | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Scoring/TimingDistribution.cs

diff --git a/osu.Game.Rulesets.Osu/Scoring/TimingDistribution.cs b/osu.Game.Rulesets.Osu/Scoring/TimingDistribution.cs
deleted file mode 100644
index 46f259f3d8..0000000000
--- a/osu.Game.Rulesets.Osu/Scoring/TimingDistribution.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.
-
-namespace osu.Game.Rulesets.Osu.Scoring
-{
-    public class TimingDistribution
-    {
-        public readonly int[] Bins;
-        public readonly double BinSize;
-
-        public TimingDistribution(int binCount, double binSize)
-        {
-            Bins = new int[binCount];
-            BinSize = binSize;
-        }
-    }
-}

From a3ff25177ad782e562732315a74be1557ca19ffc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 19:12:55 +0900
Subject: [PATCH 03334/10326] Asyncify statistics load

---
 .../Ranking/Statistics/StatisticsPanel.cs     | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 28a8bc460e..acaf91246d 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -1,10 +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.Threading;
 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.Placeholders;
 using osu.Game.Scoring;
 using osuTK;
@@ -20,6 +22,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         protected override bool StartHidden => true;
 
         private readonly Container content;
+        private readonly LoadingSpinner spinner;
 
         public StatisticsPanel()
         {
@@ -33,7 +36,11 @@ namespace osu.Game.Screens.Ranking.Statistics
                     Top = SIDE_PADDING,
                     Bottom = 50 // Approximate padding to the bottom of the score panel.
                 },
-                Child = content = new Container { RelativeSizeAxes = Axes.Both },
+                Children = new Drawable[]
+                {
+                    content = new Container { RelativeSizeAxes = Axes.Both },
+                    spinner = new LoadingSpinner()
+                }
             };
         }
 
@@ -43,8 +50,12 @@ namespace osu.Game.Screens.Ranking.Statistics
             Score.BindValueChanged(populateStatistics, true);
         }
 
+        private CancellationTokenSource loadCancellation;
+
         private void populateStatistics(ValueChangedEvent<ScoreInfo> score)
         {
+            loadCancellation?.Cancel();
+
             foreach (var child in content)
                 child.FadeOut(150).Expire();
 
@@ -54,6 +65,8 @@ namespace osu.Game.Screens.Ranking.Statistics
                 content.Add(new MessagePlaceholder("Score has no statistics :("));
             else
             {
+                spinner.Show();
+
                 var rows = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -73,7 +86,14 @@ namespace osu.Game.Screens.Ranking.Statistics
                     });
                 }
 
-                content.Add(rows);
+                LoadComponentAsync(rows, d =>
+                {
+                    if (Score.Value != newScore)
+                        return;
+
+                    spinner.Hide();
+                    content.Add(d);
+                }, (loadCancellation = new CancellationTokenSource()).Token);
             }
         }
 

From 8c9506197d30b1635bb51541959978221d7f0d94 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 19:41:36 +0900
Subject: [PATCH 03335/10326] Increase the number of bins in the timing
 distribution

---
 osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
index b319cc5aa9..30d25f581f 100644
--- a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
         /// <summary>
         /// The number of bins on each side of the timing distribution.
         /// </summary>
-        private const int timing_distribution_bins = 25;
+        private const int timing_distribution_bins = 50;
 
         /// <summary>
         /// The total number of bins in the timing distribution, including bins on both sides and the centre bin at 0.

From ef56225d9adfda9bd45038746cd03edfb244a7b0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 19:43:46 +0900
Subject: [PATCH 03336/10326] Rename CursorPosition -< PositionOffset

---
 osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs | 8 ++++----
 osu.Game.Rulesets.Osu/Statistics/Heatmap.cs        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 9694367210..0a9ce83912 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -88,17 +88,17 @@ namespace osu.Game.Rulesets.Osu.Scoring
         public readonly HitObject LastHitObject;
 
         /// <summary>
-        /// The player's cursor position, if available, at the time of the event.
+        /// The player's position offset, if available, at the time of the event.
         /// </summary>
-        public readonly Vector2? CursorPosition;
+        public readonly Vector2? PositionOffset;
 
-        public HitEvent(double timeOffset, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, Vector2? cursorPosition)
+        public HitEvent(double timeOffset, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, Vector2? positionOffset)
         {
             TimeOffset = timeOffset;
             Result = result;
             HitObject = hitObject;
             LastHitObject = lastHitObject;
-            CursorPosition = cursorPosition;
+            PositionOffset = positionOffset;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
index 8ebc8e9001..b648dd5e47 100644
--- a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
@@ -156,10 +156,10 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
                 foreach (var e in hitEvents)
                 {
-                    if (e.LastHitObject == null || e.CursorPosition == null)
+                    if (e.LastHitObject == null || e.PositionOffset == null)
                         continue;
 
-                    AddPoint(((OsuHitObject)e.LastHitObject).StackedEndPosition, ((OsuHitObject)e.HitObject).StackedEndPosition, e.CursorPosition.Value, radius);
+                    AddPoint(((OsuHitObject)e.LastHitObject).StackedEndPosition, ((OsuHitObject)e.HitObject).StackedEndPosition, e.PositionOffset.Value, radius);
                 }
             }
         }

From eab00ec9d9644f32e72268c819fad8cf5801e17c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 19:58:35 +0900
Subject: [PATCH 03337/10326] Move hit events to the ScoreProcessor

---
 .../Judgements/OsuHitCircleJudgementResult.cs |  9 ++-
 .../Objects/Drawables/DrawableHitCircle.cs    |  4 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  5 +-
 .../Scoring/OsuScoreProcessor.cs              | 76 -------------------
 osu.Game.Rulesets.Osu/Statistics/Heatmap.cs   | 36 ++++-----
 .../Statistics/TimingDistributionGraph.cs     | 15 ++--
 .../Ranking/TestSceneAccuracyHeatmap.cs       | 10 +--
 .../Ranking/TestSceneStatisticsPanel.cs       |  3 +-
 .../TestSceneTimingDistributionGraph.cs       |  4 +-
 osu.Game/Rulesets/Scoring/HitEvent.cs         | 48 ++++++++++++
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 18 +++++
 osu.Game/Scoring/ScoreInfo.cs                 |  2 +-
 12 files changed, 106 insertions(+), 124 deletions(-)
 create mode 100644 osu.Game/Rulesets/Scoring/HitEvent.cs

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs
index 103d02958d..9b33e746b3 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs
@@ -10,10 +10,15 @@ namespace osu.Game.Rulesets.Osu.Judgements
 {
     public class OsuHitCircleJudgementResult : OsuJudgementResult
     {
+        /// <summary>
+        /// The <see cref="HitCircle"/>.
+        /// </summary>
         public HitCircle HitCircle => (HitCircle)HitObject;
 
-        public Vector2? HitPosition;
-        public float? Radius;
+        /// <summary>
+        /// The position of the player's cursor when <see cref="HitCircle"/> was hit.
+        /// </summary>
+        public Vector2? CursorPositionAtHit;
 
         public OsuHitCircleJudgementResult(HitObject hitObject, Judgement judgement)
             : base(hitObject, judgement)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 2f86400b25..854fc4c91c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -142,11 +142,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 var circleResult = (OsuHitCircleJudgementResult)r;
 
+                // Todo: This should also consider misses, but they're a little more interesting to handle, since we don't necessarily know the position at the time of a miss.
                 if (result != HitResult.Miss)
                 {
                     var localMousePosition = ToLocalSpace(inputManager.CurrentState.Mouse.Position);
-                    circleResult.HitPosition = HitObject.StackedPosition + (localMousePosition - DrawSize / 2);
-                    circleResult.Radius = (float)HitObject.Radius;
+                    circleResult.CursorPositionAtHit = HitObject.StackedPosition + (localMousePosition - DrawSize / 2);
                 }
 
                 circleResult.Type = result;
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index c7003deed2..45980cb3d5 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -29,7 +29,6 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
-using System.Linq;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Screens.Ranking.Statistics;
@@ -201,7 +200,7 @@ namespace osu.Game.Rulesets.Osu
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 130,
-                        Child = new TimingDistributionGraph(score.HitEvents.Cast<HitEvent>().ToList())
+                        Child = new TimingDistributionGraph(score)
                         {
                             RelativeSizeAxes = Axes.Both
                         }
@@ -209,7 +208,7 @@ namespace osu.Game.Rulesets.Osu
                     new StatisticContainer("Accuracy Heatmap")
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Child = new Heatmap(score.Beatmap, score.HitEvents.Cast<HitEvent>().ToList())
+                        Child = new Heatmap(score)
                         {
                             RelativeSizeAxes = Axes.Both
                         }
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 0a9ce83912..231a24cac5 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -1,54 +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 JetBrains.Annotations;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
     public class OsuScoreProcessor : ScoreProcessor
     {
-        private readonly List<HitEvent> hitEvents = new List<HitEvent>();
-        private HitObject lastHitObject;
-
-        protected override void OnResultApplied(JudgementResult result)
-        {
-            base.OnResultApplied(result);
-
-            hitEvents.Add(new HitEvent(result.TimeOffset, result.Type, result.HitObject, lastHitObject, (result as OsuHitCircleJudgementResult)?.HitPosition));
-            lastHitObject = result.HitObject;
-        }
-
-        protected override void OnResultReverted(JudgementResult result)
-        {
-            base.OnResultReverted(result);
-
-            hitEvents.RemoveAt(hitEvents.Count - 1);
-        }
-
-        protected override void Reset(bool storeResults)
-        {
-            base.Reset(storeResults);
-
-            hitEvents.Clear();
-            lastHitObject = null;
-        }
-
-        public override void PopulateScore(ScoreInfo score)
-        {
-            base.PopulateScore(score);
-
-            score.HitEvents.AddRange(hitEvents.Select(e => e).Cast<object>());
-        }
-
         protected override JudgementResult CreateResult(HitObject hitObject, Judgement judgement)
         {
             switch (hitObject)
@@ -63,42 +25,4 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
         public override HitWindows CreateHitWindows() => new OsuHitWindows();
     }
-
-    public readonly struct HitEvent
-    {
-        /// <summary>
-        /// The time offset from the end of <see cref="HitObject"/> at which the event occurred.
-        /// </summary>
-        public readonly double TimeOffset;
-
-        /// <summary>
-        /// The hit result.
-        /// </summary>
-        public readonly HitResult Result;
-
-        /// <summary>
-        /// The <see cref="HitObject"/> on which the result occurred.
-        /// </summary>
-        public readonly HitObject HitObject;
-
-        /// <summary>
-        /// The <see cref="HitObject"/> occurring prior to <see cref="HitObject"/>.
-        /// </summary>
-        [CanBeNull]
-        public readonly HitObject LastHitObject;
-
-        /// <summary>
-        /// The player's position offset, if available, at the time of the event.
-        /// </summary>
-        public readonly Vector2? PositionOffset;
-
-        public HitEvent(double timeOffset, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, Vector2? positionOffset)
-        {
-            TimeOffset = timeOffset;
-            Result = result;
-            HitObject = hitObject;
-            LastHitObject = lastHitObject;
-            PositionOffset = positionOffset;
-        }
-    }
 }
diff --git a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
index b648dd5e47..49d7f67b7f 100644
--- a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
@@ -2,17 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 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.Layout;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -36,16 +33,11 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
         private GridContainer pointGrid;
 
-        private readonly BeatmapInfo beatmap;
-        private readonly IReadOnlyList<HitEvent> hitEvents;
-        private readonly LayoutValue sizeLayout = new LayoutValue(Invalidation.DrawSize);
+        private readonly ScoreInfo score;
 
-        public Heatmap(BeatmapInfo beatmap, IReadOnlyList<HitEvent> hitEvents)
+        public Heatmap(ScoreInfo score)
         {
-            this.beatmap = beatmap;
-            this.hitEvents = hitEvents;
-
-            AddLayout(sizeLayout);
+            this.score = score;
         }
 
         [BackgroundDependencyLoader]
@@ -149,18 +141,18 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
             pointGrid.Content = points;
 
-            if (hitEvents.Count > 0)
+            if (score.HitEvents == null || score.HitEvents.Count == 0)
+                return;
+
+            // Todo: This should probably not be done like this.
+            float radius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (score.Beatmap.BaseDifficulty.CircleSize - 5) / 5) / 2;
+
+            foreach (var e in score.HitEvents)
             {
-                // Todo: This should probably not be done like this.
-                float radius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (beatmap.BaseDifficulty.CircleSize - 5) / 5) / 2;
+                if (e.LastHitObject == null || e.PositionOffset == null)
+                    continue;
 
-                foreach (var e in hitEvents)
-                {
-                    if (e.LastHitObject == null || e.PositionOffset == null)
-                        continue;
-
-                    AddPoint(((OsuHitObject)e.LastHitObject).StackedEndPosition, ((OsuHitObject)e.HitObject).StackedEndPosition, e.PositionOffset.Value, radius);
-                }
+                AddPoint(((OsuHitObject)e.LastHitObject).StackedEndPosition, ((OsuHitObject)e.HitObject).StackedEndPosition, e.PositionOffset.Value, radius);
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
index 30d25f581f..f3ccb0630e 100644
--- a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.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 osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -11,7 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Statistics
 {
@@ -37,23 +36,23 @@ namespace osu.Game.Rulesets.Osu.Statistics
         /// </summary>
         private const float axis_points = 5;
 
-        private readonly List<HitEvent> hitEvents;
+        private readonly ScoreInfo score;
 
-        public TimingDistributionGraph(List<HitEvent> hitEvents)
+        public TimingDistributionGraph(ScoreInfo score)
         {
-            this.hitEvents = hitEvents;
+            this.score = score;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (hitEvents.Count == 0)
+            if (score.HitEvents == null || score.HitEvents.Count == 0)
                 return;
 
             int[] bins = new int[total_timing_distribution_bins];
-            double binSize = hitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins;
+            double binSize = score.HitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins;
 
-            foreach (var e in hitEvents)
+            foreach (var e in score.HitEvents)
             {
                 int binOffset = (int)(e.TimeOffset / binSize);
                 bins[timing_distribution_centre_bin_index + binOffset]++;
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
index 52cc41fbd8..d8b0594803 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.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 NUnit.Framework;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -10,10 +9,9 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.Statistics;
+using osu.Game.Scoring;
 using osu.Game.Tests.Beatmaps;
 using osuTK;
 using osuTK.Graphics;
@@ -50,7 +48,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 {
                     Position = new Vector2(100, 300),
                 },
-                heatmap = new TestHeatmap(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo, new List<HitEvent>())
+                heatmap = new TestHeatmap(new ScoreInfo { Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -93,8 +91,8 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private class TestHeatmap : Heatmap
         {
-            public TestHeatmap(BeatmapInfo beatmap, List<HitEvent> events)
-                : base(beatmap, events)
+            public TestHeatmap(ScoreInfo score)
+                : base(score)
             {
             }
 
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index cc3415a530..bcf8a19c61 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,7 +17,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             var score = new TestScoreInfo(new OsuRuleset().RulesetInfo)
             {
-                HitEvents = TestSceneTimingDistributionGraph.CreateDistributedHitEvents().Cast<object>().ToList(),
+                HitEvents = TestSceneTimingDistributionGraph.CreateDistributedHitEvents()
             };
 
             loadPanel(score);
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
index 178d6d95b5..d5ee50e636 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
@@ -7,9 +7,9 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Ranking
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4Extensions.FromHex("#333")
                 },
-                new TimingDistributionGraph(CreateDistributedHitEvents())
+                new TimingDistributionGraph(new ScoreInfo { HitEvents = CreateDistributedHitEvents() })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Rulesets/Scoring/HitEvent.cs b/osu.Game/Rulesets/Scoring/HitEvent.cs
new file mode 100644
index 0000000000..908ac0c171
--- /dev/null
+++ b/osu.Game/Rulesets/Scoring/HitEvent.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 JetBrains.Annotations;
+using osu.Game.Rulesets.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Scoring
+{
+    public readonly struct HitEvent
+    {
+        /// <summary>
+        /// The time offset from the end of <see cref="HitObject"/> at which the event occurred.
+        /// </summary>
+        public readonly double TimeOffset;
+
+        /// <summary>
+        /// The hit result.
+        /// </summary>
+        public readonly HitResult Result;
+
+        /// <summary>
+        /// The <see cref="HitObject"/> on which the result occurred.
+        /// </summary>
+        public readonly HitObject HitObject;
+
+        /// <summary>
+        /// The <see cref="HitObject"/> occurring prior to <see cref="HitObject"/>.
+        /// </summary>
+        [CanBeNull]
+        public readonly HitObject LastHitObject;
+
+        /// <summary>
+        /// The player's position offset, if available, at the time of the event.
+        /// </summary>
+        [CanBeNull]
+        public readonly Vector2? PositionOffset;
+
+        public HitEvent(double timeOffset, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, [CanBeNull] Vector2? positionOffset)
+        {
+            TimeOffset = timeOffset;
+            Result = result;
+            HitObject = hitObject;
+            LastHitObject = lastHitObject;
+            PositionOffset = positionOffset;
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 619547aef4..b9f51dfad3 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Scoring
@@ -61,6 +62,9 @@ namespace osu.Game.Rulesets.Scoring
         private double baseScore;
         private double bonusScore;
 
+        private readonly List<HitEvent> hitEvents = new List<HitEvent>();
+        private HitObject lastHitObject;
+
         private double scoreMultiplier = 1;
 
         public ScoreProcessor()
@@ -128,6 +132,9 @@ namespace osu.Game.Rulesets.Scoring
                 rollingMaxBaseScore += result.Judgement.MaxNumericResult;
             }
 
+            hitEvents.Add(CreateHitEvent(result));
+            lastHitObject = result.HitObject;
+
             updateScore();
 
             OnResultApplied(result);
@@ -137,6 +144,9 @@ namespace osu.Game.Rulesets.Scoring
         {
         }
 
+        protected virtual HitEvent CreateHitEvent(JudgementResult result)
+            => new HitEvent(result.TimeOffset, result.Type, result.HitObject, lastHitObject, null);
+
         protected sealed override void RevertResultInternal(JudgementResult result)
         {
             Combo.Value = result.ComboAtJudgement;
@@ -159,6 +169,10 @@ namespace osu.Game.Rulesets.Scoring
                 rollingMaxBaseScore -= result.Judgement.MaxNumericResult;
             }
 
+            Debug.Assert(hitEvents.Count > 0);
+            lastHitObject = hitEvents[^1].LastHitObject;
+            hitEvents.RemoveAt(hitEvents.Count - 1);
+
             updateScore();
 
             OnResultReverted(result);
@@ -219,6 +233,8 @@ namespace osu.Game.Rulesets.Scoring
             base.Reset(storeResults);
 
             scoreResultCounts.Clear();
+            hitEvents.Clear();
+            lastHitObject = null;
 
             if (storeResults)
             {
@@ -259,6 +275,8 @@ namespace osu.Game.Rulesets.Scoring
 
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
                 score.Statistics[result] = GetStatistic(result);
+
+            score.HitEvents = new List<HitEvent>(hitEvents);
         }
 
         /// <summary>
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 6fc5892b3c..84c0d5b54e 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Scoring
 
         [NotMapped]
         [JsonIgnore]
-        public List<object> HitEvents = new List<object>();
+        public List<HitEvent> HitEvents { get; set; }
 
         [JsonIgnore]
         public List<ScoreFileInfo> Files { get; set; }

From 1cbbd6b4427130159832eade1e91ae557c4181e5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 20:03:18 +0900
Subject: [PATCH 03338/10326] Move timing distribution graph to osu.Game

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs                       | 2 +-
 osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs | 2 +-
 .../Visual/Ranking/TestSceneTimingDistributionGraph.cs    | 8 ++++----
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs => osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs (96%)

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 45980cb3d5..d99fee3b15 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -200,7 +200,7 @@ namespace osu.Game.Rulesets.Osu
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 130,
-                        Child = new TimingDistributionGraph(score)
+                        Child = new HitEventTimingDistributionGraph(score)
                         {
                             RelativeSizeAxes = Axes.Both
                         }
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index bcf8a19c61..210abaef4e 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             var score = new TestScoreInfo(new OsuRuleset().RulesetInfo)
             {
-                HitEvents = TestSceneTimingDistributionGraph.CreateDistributedHitEvents()
+                HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents()
             };
 
             loadPanel(score);
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
index d5ee50e636..bfdc216aa1 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
@@ -7,16 +7,16 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Screens.Ranking.Statistics;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
-    public class TestSceneTimingDistributionGraph : OsuTestScene
+    public class TestSceneHitEventTimingDistributionGraph : OsuTestScene
     {
-        public TestSceneTimingDistributionGraph()
+        public TestSceneHitEventTimingDistributionGraph()
         {
             Children = new Drawable[]
             {
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Ranking
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4Extensions.FromHex("#333")
                 },
-                new TimingDistributionGraph(new ScoreInfo { HitEvents = CreateDistributedHitEvents() })
+                new HitEventTimingDistributionGraph(new ScoreInfo { HitEvents = CreateDistributedHitEvents() })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
similarity index 96%
rename from osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
rename to osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index f3ccb0630e..b258e92aeb 100644
--- a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -12,9 +12,9 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Scoring;
 
-namespace osu.Game.Rulesets.Osu.Statistics
+namespace osu.Game.Screens.Ranking.Statistics
 {
-    public class TimingDistributionGraph : CompositeDrawable
+    public class HitEventTimingDistributionGraph : CompositeDrawable
     {
         /// <summary>
         /// The number of bins on each side of the timing distribution.
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
         private readonly ScoreInfo score;
 
-        public TimingDistributionGraph(ScoreInfo score)
+        public HitEventTimingDistributionGraph(ScoreInfo score)
         {
             this.score = score;
         }

From 83e6c3efdb32c23f2af26fb2c4661ae49f62275c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 20:31:52 +0900
Subject: [PATCH 03339/10326] Adjust API for returning statistics

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 43 ++++++++-----------
 osu.Game.Rulesets.Osu/Statistics/Heatmap.cs   |  3 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       | 18 ++++++++
 .../TestSceneTimingDistributionGraph.cs       |  3 +-
 osu.Game/Rulesets/Ruleset.cs                  |  1 +
 .../HitEventTimingDistributionGraph.cs        | 26 +++++++----
 .../Ranking/Statistics/StatisticContainer.cs  |  2 +-
 .../Ranking/Statistics/StatisticItem.cs       | 23 ++++++++++
 .../Ranking/Statistics/StatisticRow.cs        | 11 ++---
 .../Ranking/Statistics/StatisticsPanel.cs     |  5 ++-
 10 files changed, 92 insertions(+), 43 deletions(-)
 create mode 100644 osu.Game/Screens/Ranking/Statistics/StatisticItem.cs

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index d99fee3b15..aa313c92b3 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -29,7 +29,9 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
+using System.Linq;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Screens.Ranking.Statistics;
 
@@ -190,36 +192,29 @@ namespace osu.Game.Rulesets.Osu
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
-        public override StatisticRow[] CreateStatistics(ScoreInfo score) => new[]
+        public override StatisticRow[] CreateStatistics(ScoreInfo score)
         {
-            new StatisticRow
+            var hitCircleEvents = score.HitEvents.Where(e => e.HitObject is HitCircle).ToList();
+
+            return new[]
             {
-                Content = new Drawable[]
+                new StatisticRow
                 {
-                    new StatisticContainer("Timing Distribution")
+                    Columns = new[]
                     {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 130,
-                        Child = new HitEventTimingDistributionGraph(score)
+                        new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(hitCircleEvents)
                         {
-                            RelativeSizeAxes = Axes.Both
-                        }
-                    },
-                    new StatisticContainer("Accuracy Heatmap")
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Child = new Heatmap(score)
+                            RelativeSizeAxes = Axes.X,
+                            Height = 130
+                        }),
+                        new StatisticItem("Accuracy Heatmap", new Heatmap(score)
                         {
-                            RelativeSizeAxes = Axes.Both
-                        }
-                    },
-                },
-                ColumnDimensions = new[]
-                {
-                    new Dimension(),
-                    new Dimension(GridSizeMode.Absolute, 130),
+                            RelativeSizeAxes = Axes.X,
+                            Height = 130
+                        }, new Dimension(GridSizeMode.Absolute, 130)),
+                    }
                 }
-            }
-        };
+            };
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
index 49d7f67b7f..86cb8e682f 100644
--- a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -147,7 +148,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
             // Todo: This should probably not be done like this.
             float radius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (score.Beatmap.BaseDifficulty.CircleSize - 5) / 5) / 2;
 
-            foreach (var e in score.HitEvents)
+            foreach (var e in score.HitEvents.Where(e => e.HitObject is HitCircle))
             {
                 if (e.LastHitObject == null || e.PositionOffset == null)
                     continue;
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 4cdd1fbc24..cd4e699262 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -21,9 +21,12 @@ using osu.Game.Rulesets.Taiko.Difficulty;
 using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Scoring;
 using System;
+using System.Linq;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Taiko.Edit;
+using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Skinning;
+using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko
@@ -155,5 +158,20 @@ namespace osu.Game.Rulesets.Taiko
         public int LegacyID => 1;
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
+
+        public override StatisticRow[] CreateStatistics(ScoreInfo score) => new[]
+        {
+            new StatisticRow
+            {
+                Columns = new[]
+                {
+                    new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents.Where(e => e.HitObject is Hit).ToList())
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 130
+                    }),
+                }
+            }
+        };
     }
 }
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
index bfdc216aa1..b34529cca7 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
 using osu.Game.Screens.Ranking.Statistics;
 using osuTK;
 
@@ -25,7 +24,7 @@ namespace osu.Game.Tests.Visual.Ranking
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4Extensions.FromHex("#333")
                 },
-                new HitEventTimingDistributionGraph(new ScoreInfo { HitEvents = CreateDistributedHitEvents() })
+                new HitEventTimingDistributionGraph(CreateDistributedHitEvents())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index f05685b6e9..52784e354f 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -210,6 +210,7 @@ namespace osu.Game.Rulesets
         /// <returns>An empty frame for the current ruleset, or null if unsupported.</returns>
         public virtual IConvertibleReplayFrame CreateConvertibleReplayFrame() => null;
 
+        [NotNull]
         public virtual StatisticRow[] CreateStatistics(ScoreInfo score) => Array.Empty<StatisticRow>();
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index b258e92aeb..4acbc7da3c 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -10,10 +11,13 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Scoring;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Ranking.Statistics
 {
+    /// <summary>
+    /// A graph which displays the distribution of hit timing in a series of <see cref="HitEvent"/>s.
+    /// </summary>
     public class HitEventTimingDistributionGraph : CompositeDrawable
     {
         /// <summary>
@@ -32,27 +36,31 @@ namespace osu.Game.Screens.Ranking.Statistics
         private const int timing_distribution_centre_bin_index = timing_distribution_bins;
 
         /// <summary>
-        /// The number of data points shown on the axis below the graph.
+        /// The number of data points shown on each side of the axis below the graph.
         /// </summary>
         private const float axis_points = 5;
 
-        private readonly ScoreInfo score;
+        private readonly IReadOnlyList<HitEvent> hitEvents;
 
-        public HitEventTimingDistributionGraph(ScoreInfo score)
+        /// <summary>
+        /// Creates a new <see cref="HitEventTimingDistributionGraph"/>.
+        /// </summary>
+        /// <param name="hitEvents">The <see cref="HitEvent"/>s to display the timing distribution of.</param>
+        public HitEventTimingDistributionGraph(IReadOnlyList<HitEvent> hitEvents)
         {
-            this.score = score;
+            this.hitEvents = hitEvents;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (score.HitEvents == null || score.HitEvents.Count == 0)
+            if (hitEvents == null || hitEvents.Count == 0)
                 return;
 
             int[] bins = new int[total_timing_distribution_bins];
-            double binSize = score.HitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins;
+            double binSize = hitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins;
 
-            foreach (var e in score.HitEvents)
+            foreach (var e in hitEvents)
             {
                 int binOffset = (int)(e.TimeOffset / binSize);
                 bins[timing_distribution_centre_bin_index + binOffset]++;
@@ -67,6 +75,8 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             InternalChild = new GridContainer
             {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
                 Width = 0.8f,
                 Content = new[]
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
index d7b42c1c2f..b8dde8f85e 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking.Statistics
 {
-    public class StatisticContainer : Container
+    internal class StatisticContainer : Container
     {
         protected override Container<Drawable> Content => content;
 
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
new file mode 100644
index 0000000000..2605ae9f1b
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticItem.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 JetBrains.Annotations;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    public class StatisticItem
+    {
+        public readonly string Name;
+        public readonly Drawable Content;
+        public readonly Dimension Dimension;
+
+        public StatisticItem([NotNull] string name, [NotNull] Drawable content, [CanBeNull] Dimension dimension = null)
+        {
+            Name = name;
+            Content = content;
+            Dimension = dimension;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
index 5d39ef57b2..ebab148fc2 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
@@ -1,15 +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;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using JetBrains.Annotations;
 
 namespace osu.Game.Screens.Ranking.Statistics
 {
     public class StatisticRow
     {
-        public Drawable[] Content = Array.Empty<Drawable>();
-        public Dimension[] ColumnDimensions = Array.Empty<Dimension>();
+        /// <summary>
+        /// The columns of this <see cref="StatisticRow"/>.
+        /// </summary>
+        [ItemCanBeNull]
+        public StatisticItem[] Columns;
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index acaf91246d..3d81229ac3 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.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 System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -80,8 +81,8 @@ namespace osu.Game.Screens.Ranking.Statistics
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        Content = new[] { row.Content },
-                        ColumnDimensions = row.ColumnDimensions,
+                        Content = new[] { row.Columns?.Select(c => c?.Content).ToArray() },
+                        ColumnDimensions = Enumerable.Range(0, row.Columns?.Length ?? 0).Select(i => row.Columns[i]?.Dimension ?? new Dimension()).ToArray(),
                         RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
                     });
                 }

From ad3bc99e7c9bf6d39acb5f7595d97e1369ad4c56 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 20:48:53 +0900
Subject: [PATCH 03340/10326] Fix hit event position offset not being set

---
 osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs | 3 +++
 osu.Game/Rulesets/Scoring/HitEvent.cs              | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 231a24cac5..86ec76e373 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -11,6 +11,9 @@ namespace osu.Game.Rulesets.Osu.Scoring
 {
     public class OsuScoreProcessor : ScoreProcessor
     {
+        protected override HitEvent CreateHitEvent(JudgementResult result)
+            => base.CreateHitEvent(result).With((result as OsuHitCircleJudgementResult)?.CursorPositionAtHit);
+
         protected override JudgementResult CreateResult(HitObject hitObject, Judgement judgement)
         {
             switch (hitObject)
diff --git a/osu.Game/Rulesets/Scoring/HitEvent.cs b/osu.Game/Rulesets/Scoring/HitEvent.cs
index 908ac0c171..a2770ec580 100644
--- a/osu.Game/Rulesets/Scoring/HitEvent.cs
+++ b/osu.Game/Rulesets/Scoring/HitEvent.cs
@@ -44,5 +44,7 @@ namespace osu.Game.Rulesets.Scoring
             LastHitObject = lastHitObject;
             PositionOffset = positionOffset;
         }
+
+        public HitEvent With(Vector2? positionOffset) => new HitEvent(TimeOffset, Result, HitObject, LastHitObject, positionOffset);
     }
 }

From 34a8fcfd2f6a3cd1d380400801c95e02930016c2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 20:53:24 +0900
Subject: [PATCH 03341/10326] Fix potential off-by-one

---
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 4acbc7da3c..43de862007 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 return;
 
             int[] bins = new int[total_timing_distribution_bins];
-            double binSize = hitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins;
+            double binSize = Math.Ceiling(hitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins);
 
             foreach (var e in hitEvents)
             {

From 5ce2c712d343e46e939f62d36f9ad39e047e414d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 20:53:43 +0900
Subject: [PATCH 03342/10326] Fix statistics not being wrapped by containers

---
 osu.Game/Rulesets/Ruleset.cs                  |  5 +++++
 .../Ranking/Statistics/StatisticContainer.cs  | 10 ++++++++--
 .../Ranking/Statistics/StatisticItem.cs       | 20 +++++++++++++++++++
 .../Ranking/Statistics/StatisticRow.cs        |  5 ++++-
 .../Ranking/Statistics/StatisticsPanel.cs     | 11 ++++++++--
 5 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 52784e354f..a325e641a4 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -210,6 +210,11 @@ namespace osu.Game.Rulesets
         /// <returns>An empty frame for the current ruleset, or null if unsupported.</returns>
         public virtual IConvertibleReplayFrame CreateConvertibleReplayFrame() => null;
 
+        /// <summary>
+        /// Creates the statistics for a <see cref="ScoreInfo"/> to be displayed in the results screen.
+        /// </summary>
+        /// <param name="score">The <see cref="ScoreInfo"/> to create the statistics for. The score is guaranteed to have <see cref="ScoreInfo.HitEvents"/> populated.</param>
+        /// <returns>The <see cref="StatisticRow"/>s to display. Each <see cref="StatisticRow"/> may contain 0 or more <see cref="StatisticItem"/>.</returns>
         [NotNull]
         public virtual StatisticRow[] CreateStatistics(ScoreInfo score) => Array.Empty<StatisticRow>();
     }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
index b8dde8f85e..b063893633 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
@@ -19,9 +19,13 @@ namespace osu.Game.Screens.Ranking.Statistics
 
         public StatisticContainer(string name)
         {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
             InternalChild = new GridContainer
             {
-                RelativeSizeAxes = Axes.Both,
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
                 Content = new[]
                 {
                     new Drawable[]
@@ -56,13 +60,15 @@ namespace osu.Game.Screens.Ranking.Statistics
                     {
                         content = new Container
                         {
-                            RelativeSizeAxes = Axes.Both
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
                         }
                     },
                 },
                 RowDimensions = new[]
                 {
                     new Dimension(GridSizeMode.AutoSize),
+                    new Dimension(GridSizeMode.AutoSize),
                 }
             };
         }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
index 2605ae9f1b..a3ef5bf99e 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
@@ -7,12 +7,32 @@ using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Screens.Ranking.Statistics
 {
+    /// <summary>
+    /// An item to be displayed in a row of statistics inside the results screen.
+    /// </summary>
     public class StatisticItem
     {
+        /// <summary>
+        /// The name of this item.
+        /// </summary>
         public readonly string Name;
+
+        /// <summary>
+        /// The <see cref="Drawable"/> content to be displayed.
+        /// </summary>
         public readonly Drawable Content;
+
+        /// <summary>
+        /// The <see cref="Dimension"/> of this row. This can be thought of as the column dimension of an encompassing <see cref="GridContainer"/>.
+        /// </summary>
         public readonly Dimension Dimension;
 
+        /// <summary>
+        /// Creates a new <see cref="StatisticItem"/>, to be displayed inside a <see cref="StatisticRow"/> in the results screen.
+        /// </summary>
+        /// <param name="name">The name of this item.</param>
+        /// <param name="content">The <see cref="Drawable"/> content to be displayed.</param>
+        /// <param name="dimension">The <see cref="Dimension"/> of this row. This can be thought of as the column dimension of an encompassing <see cref="GridContainer"/>.</param>
         public StatisticItem([NotNull] string name, [NotNull] Drawable content, [CanBeNull] Dimension dimension = null)
         {
             Name = name;
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
index ebab148fc2..e1ca9799a3 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
@@ -5,12 +5,15 @@ using JetBrains.Annotations;
 
 namespace osu.Game.Screens.Ranking.Statistics
 {
+    /// <summary>
+    /// A row of statistics to be displayed in the results screen.
+    /// </summary>
     public class StatisticRow
     {
         /// <summary>
         /// The columns of this <see cref="StatisticRow"/>.
         /// </summary>
-        [ItemCanBeNull]
+        [ItemNotNull]
         public StatisticItem[] Columns;
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 3d81229ac3..328b6933a0 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -81,8 +81,15 @@ namespace osu.Game.Screens.Ranking.Statistics
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        Content = new[] { row.Columns?.Select(c => c?.Content).ToArray() },
-                        ColumnDimensions = Enumerable.Range(0, row.Columns?.Length ?? 0).Select(i => row.Columns[i]?.Dimension ?? new Dimension()).ToArray(),
+                        Content = new[]
+                        {
+                            row.Columns?.Select(c => new StatisticContainer(c.Name)
+                            {
+                                Child = c.Content
+                            }).Cast<Drawable>().ToArray()
+                        },
+                        ColumnDimensions = Enumerable.Range(0, row.Columns?.Length ?? 0)
+                                                     .Select(i => row.Columns[i].Dimension ?? new Dimension()).ToArray(),
                         RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
                     });
                 }

From 8aea8267fb989172c535a331aacddcfbe048e3b7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 20:58:05 +0900
Subject: [PATCH 03343/10326] Add some padding

---
 osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
index b063893633..d9e5e1294a 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
@@ -62,6 +62,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
+                            Margin = new MarginPadding { Top = 15 }
                         }
                     },
                 },

From 89a863a3379262c600f9774728e63117c8037567 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 21:02:20 +0900
Subject: [PATCH 03344/10326] Refactor OsuRuleset

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs | 33 ++++++++++++-----------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index aa313c92b3..3fb8f574b3 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -192,29 +192,24 @@ namespace osu.Game.Rulesets.Osu
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
-        public override StatisticRow[] CreateStatistics(ScoreInfo score)
+        public override StatisticRow[] CreateStatistics(ScoreInfo score) => new[]
         {
-            var hitCircleEvents = score.HitEvents.Where(e => e.HitObject is HitCircle).ToList();
-
-            return new[]
+            new StatisticRow
             {
-                new StatisticRow
+                Columns = new[]
                 {
-                    Columns = new[]
+                    new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents.Where(e => e.HitObject is HitCircle).ToList())
                     {
-                        new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(hitCircleEvents)
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 130
-                        }),
-                        new StatisticItem("Accuracy Heatmap", new Heatmap(score)
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 130
-                        }, new Dimension(GridSizeMode.Absolute, 130)),
-                    }
+                        RelativeSizeAxes = Axes.X,
+                        Height = 130
+                    }),
+                    new StatisticItem("Accuracy Heatmap", new Heatmap(score)
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 130
+                    }, new Dimension(GridSizeMode.Absolute, 130)),
                 }
-            };
-        }
+            }
+        };
     }
 }

From 49997c54d01be791bcc1bdfe4d2ee52abf063edb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 21:14:17 +0900
Subject: [PATCH 03345/10326] Remove unused class

---
 osu.Game.Rulesets.Osu/Scoring/HitOffset.cs | 23 ----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Scoring/HitOffset.cs

diff --git a/osu.Game.Rulesets.Osu/Scoring/HitOffset.cs b/osu.Game.Rulesets.Osu/Scoring/HitOffset.cs
deleted file mode 100644
index e6a5a01b48..0000000000
--- a/osu.Game.Rulesets.Osu/Scoring/HitOffset.cs
+++ /dev/null
@@ -1,23 +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;
-
-namespace osu.Game.Rulesets.Osu.Scoring
-{
-    public class HitOffset
-    {
-        public readonly Vector2 Position1;
-        public readonly Vector2 Position2;
-        public readonly Vector2 HitPosition;
-        public readonly float Radius;
-
-        public HitOffset(Vector2 position1, Vector2 position2, Vector2 hitPosition, float radius)
-        {
-            Position1 = position1;
-            Position2 = position2;
-            HitPosition = hitPosition;
-            Radius = radius;
-        }
-    }
-}

From 863666f7c483d83dda88a3acf9b1bb1b33f70bce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 21:14:31 +0900
Subject: [PATCH 03346/10326] Move accuracy heatmap to osu! ruleset, rename,
 remove magic number

---
 .../TestSceneAccuracyHeatmap.cs                  | 16 ++++++++--------
 osu.Game.Rulesets.Osu/OsuRuleset.cs              |  2 +-
 .../{Heatmap.cs => AccuracyHeatmap.cs}           | 11 ++++++-----
 3 files changed, 15 insertions(+), 14 deletions(-)
 rename {osu.Game.Tests/Visual/Ranking => osu.Game.Rulesets.Osu.Tests}/TestSceneAccuracyHeatmap.cs (86%)
 rename osu.Game.Rulesets.Osu/Statistics/{Heatmap.cs => AccuracyHeatmap.cs} (95%)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneAccuracyHeatmap.cs
similarity index 86%
rename from osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
rename to osu.Game.Rulesets.Osu.Tests/TestSceneAccuracyHeatmap.cs
index d8b0594803..f2a36ea017 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneAccuracyHeatmap.cs
@@ -9,21 +9,21 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Scoring;
 using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Visual;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Ranking
+namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneAccuracyHeatmap : OsuManualInputManagerTestScene
     {
         private Box background;
         private Drawable object1;
         private Drawable object2;
-        private TestHeatmap heatmap;
+        private TestAccuracyHeatmap accuracyHeatmap;
         private ScheduledDelegate automaticAdditionDelegate;
 
         [SetUp]
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 {
                     Position = new Vector2(100, 300),
                 },
-                heatmap = new TestHeatmap(new ScoreInfo { Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo })
+                accuracyHeatmap = new TestAccuracyHeatmap(new ScoreInfo { Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.Ranking
                         RNG.NextSingle(object1.DrawPosition.Y - object1.DrawSize.Y / 2, object1.DrawPosition.Y + object1.DrawSize.Y / 2));
 
                     // The background is used for ToLocalSpace() since we need to go _inside_ the DrawSizePreservingContainer (Content of TestScene).
-                    heatmap.AddPoint(object2.Position, object1.Position, randomPos, RNG.NextSingle(10, 500));
+                    accuracyHeatmap.AddPoint(object2.Position, object1.Position, randomPos, RNG.NextSingle(10, 500));
                     InputManager.MoveMouseTo(background.ToScreenSpace(randomPos));
                 }, 1, true);
             });
@@ -85,13 +85,13 @@ namespace osu.Game.Tests.Visual.Ranking
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            heatmap.AddPoint(object2.Position, object1.Position, background.ToLocalSpace(e.ScreenSpaceMouseDownPosition), 50);
+            accuracyHeatmap.AddPoint(object2.Position, object1.Position, background.ToLocalSpace(e.ScreenSpaceMouseDownPosition), 50);
             return true;
         }
 
-        private class TestHeatmap : Heatmap
+        private class TestAccuracyHeatmap : AccuracyHeatmap
         {
-            public TestHeatmap(ScoreInfo score)
+            public TestAccuracyHeatmap(ScoreInfo score)
                 : base(score)
             {
             }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 3fb8f574b3..65f26c0647 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Rulesets.Osu
                         RelativeSizeAxes = Axes.X,
                         Height = 130
                     }),
-                    new StatisticItem("Accuracy Heatmap", new Heatmap(score)
+                    new StatisticItem("Accuracy Heatmap", new AccuracyHeatmap(score)
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 130
diff --git a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
similarity index 95%
rename from osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
rename to osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 86cb8e682f..10ca3eb9be 100644
--- a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -9,6 +9,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
 using osuTK;
@@ -16,17 +17,17 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Statistics
 {
-    public class Heatmap : CompositeDrawable
+    public class AccuracyHeatmap : CompositeDrawable
     {
         /// <summary>
-        /// Size of the inner circle containing the "hit" points, relative to the size of this <see cref="Heatmap"/>.
+        /// Size of the inner circle containing the "hit" points, relative to the size of this <see cref="AccuracyHeatmap"/>.
         /// All other points outside of the inner circle are "miss" points.
         /// </summary>
         private const float inner_portion = 0.8f;
 
         /// <summary>
         /// Number of rows/columns of points.
-        /// 4px per point @ 128x128 size (the contents of the <see cref="Heatmap"/> are always square). 1024 total points.
+        /// 4px per point @ 128x128 size (the contents of the <see cref="AccuracyHeatmap"/> are always square). 1024 total points.
         /// </summary>
         private const int points_per_dimension = 32;
 
@@ -36,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
         private readonly ScoreInfo score;
 
-        public Heatmap(ScoreInfo score)
+        public AccuracyHeatmap(ScoreInfo score)
         {
             this.score = score;
         }
@@ -170,7 +171,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
             // Convert the above into the local search space.
             Vector2 localCentre = new Vector2(points_per_dimension) / 2;
             float localRadius = localCentre.X * inner_portion * normalisedDistance; // The radius inside the inner portion which of the heatmap which the closest point lies.
-            double localAngle = finalAngle + 3 * Math.PI / 4; // The angle inside the heatmap on which the closest point lies.
+            double localAngle = finalAngle + Math.PI - MathUtils.DegreesToRadians(rotation); // The angle inside the heatmap on which the closest point lies.
             Vector2 localPoint = localCentre + localRadius * new Vector2((float)Math.Cos(localAngle), (float)Math.Sin(localAngle));
 
             // Find the most relevant hit point.

From 81ad257a17ae2bab2df18ab9ceddb1e77202c149 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 21:18:58 +0900
Subject: [PATCH 03347/10326] Add timing distribution to mania ruleset

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index a37aaa8cc4..b8725af856 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -30,6 +30,7 @@ using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Scoring;
+using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets.Mania
 {
@@ -307,6 +308,21 @@ namespace osu.Game.Rulesets.Mania
         {
             return (PlayfieldType)Enum.GetValues(typeof(PlayfieldType)).Cast<int>().OrderByDescending(i => i).First(v => variant >= v);
         }
+
+        public override StatisticRow[] CreateStatistics(ScoreInfo score) => new[]
+        {
+            new StatisticRow
+            {
+                Columns = new[]
+                {
+                    new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents)
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 130
+                    }),
+                }
+            }
+        };
     }
 
     public enum PlayfieldType

From 25abdc290331e6d2ffea212259771d25cbf5b3b7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 21:41:48 +0900
Subject: [PATCH 03348/10326] General cleanups

---
 osu.Game/Rulesets/Scoring/HitEvent.cs         | 18 +++++++-
 osu.Game/Rulesets/Scoring/HitWindows.cs       |  2 +-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 12 ------
 osu.Game/Screens/Ranking/ScorePanel.cs        | 18 +++++---
 osu.Game/Screens/Ranking/ScorePanelList.cs    | 43 ++++++++++++++-----
 .../Ranking/ScorePanelTrackingContainer.cs    | 17 +++++++-
 .../Ranking/Statistics/StatisticContainer.cs  | 23 ++++++----
 .../Ranking/Statistics/StatisticItem.cs       |  4 +-
 .../Ranking/Statistics/StatisticsPanel.cs     |  9 ++--
 9 files changed, 98 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitEvent.cs b/osu.Game/Rulesets/Scoring/HitEvent.cs
index a2770ec580..ea2975a6c4 100644
--- a/osu.Game/Rulesets/Scoring/HitEvent.cs
+++ b/osu.Game/Rulesets/Scoring/HitEvent.cs
@@ -7,6 +7,9 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Scoring
 {
+    /// <summary>
+    /// A <see cref="HitEvent"/> generated by the <see cref="ScoreProcessor"/> containing extra statistics around a <see cref="HitResult"/>.
+    /// </summary>
     public readonly struct HitEvent
     {
         /// <summary>
@@ -31,11 +34,19 @@ namespace osu.Game.Rulesets.Scoring
         public readonly HitObject LastHitObject;
 
         /// <summary>
-        /// The player's position offset, if available, at the time of the event.
+        /// A position offset, if available, at the time of the event.
         /// </summary>
         [CanBeNull]
         public readonly Vector2? PositionOffset;
 
+        /// <summary>
+        /// Creates a new <see cref="HitEvent"/>.
+        /// </summary>
+        /// <param name="timeOffset">The time offset from the end of <paramref name="hitObject"/> at which the event occurs.</param>
+        /// <param name="result">The <see cref="HitResult"/>.</param>
+        /// <param name="hitObject">The <see cref="HitObject"/> that triggered the event.</param>
+        /// <param name="lastHitObject">The previous <see cref="HitObject"/>.</param>
+        /// <param name="positionOffset">A positional offset.</param>
         public HitEvent(double timeOffset, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, [CanBeNull] Vector2? positionOffset)
         {
             TimeOffset = timeOffset;
@@ -45,6 +56,11 @@ namespace osu.Game.Rulesets.Scoring
             PositionOffset = positionOffset;
         }
 
+        /// <summary>
+        /// Creates a new <see cref="HitEvent"/> with an optional positional offset.
+        /// </summary>
+        /// <param name="positionOffset">The positional offset.</param>
+        /// <returns>The new <see cref="HitEvent"/>.</returns>
         public HitEvent With(Vector2? positionOffset) => new HitEvent(TimeOffset, Result, HitObject, LastHitObject, positionOffset);
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/HitWindows.cs b/osu.Game/Rulesets/Scoring/HitWindows.cs
index 77acbd4137..018b50bd3d 100644
--- a/osu.Game/Rulesets/Scoring/HitWindows.cs
+++ b/osu.Game/Rulesets/Scoring/HitWindows.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Scoring
         /// Retrieves the <see cref="HitResult"/> with the largest hit window that produces a successful hit.
         /// </summary>
         /// <returns>The lowest allowed successful <see cref="HitResult"/>.</returns>
-        public HitResult LowestSuccessfulHitResult()
+        protected HitResult LowestSuccessfulHitResult()
         {
             for (var result = HitResult.Meh; result <= HitResult.Perfect; ++result)
             {
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index b9f51dfad3..22ec023f58 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -136,12 +136,6 @@ namespace osu.Game.Rulesets.Scoring
             lastHitObject = result.HitObject;
 
             updateScore();
-
-            OnResultApplied(result);
-        }
-
-        protected virtual void OnResultApplied(JudgementResult result)
-        {
         }
 
         protected virtual HitEvent CreateHitEvent(JudgementResult result)
@@ -174,12 +168,6 @@ namespace osu.Game.Rulesets.Scoring
             hitEvents.RemoveAt(hitEvents.Count - 1);
 
             updateScore();
-
-            OnResultReverted(result);
-        }
-
-        protected virtual void OnResultReverted(JudgementResult result)
-        {
         }
 
         private void updateScore()
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 257279bdc9..9633f5c533 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -76,12 +76,11 @@ namespace osu.Game.Screens.Ranking
         private static readonly Color4 contracted_middle_layer_colour = Color4Extensions.FromHex("#353535");
 
         public event Action<PanelState> StateChanged;
-        public Action PostExpandAction;
 
         /// <summary>
-        /// Whether this <see cref="ScorePanel"/> can enter into an <see cref="PanelState.Expanded"/> state.
+        /// An action to be invoked if this <see cref="ScorePanel"/> is clicked while in an expanded state.
         /// </summary>
-        public bool CanExpand = true;
+        public Action PostExpandAction;
 
         public readonly ScoreInfo Score;
 
@@ -250,6 +249,7 @@ namespace osu.Game.Screens.Ranking
             {
                 base.Size = value;
 
+                // Auto-size isn't used to avoid 1-frame issues and because the score panel is removed/re-added to the container.
                 if (trackingContainer != null)
                     trackingContainer.Size = value;
             }
@@ -259,8 +259,7 @@ namespace osu.Game.Screens.Ranking
         {
             if (State == PanelState.Contracted)
             {
-                if (CanExpand)
-                    State = PanelState.Expanded;
+                State = PanelState.Expanded;
                 return true;
             }
 
@@ -276,6 +275,15 @@ namespace osu.Game.Screens.Ranking
 
         private ScorePanelTrackingContainer trackingContainer;
 
+        /// <summary>
+        /// Creates a <see cref="ScorePanelTrackingContainer"/> which this <see cref="ScorePanel"/> can reside inside.
+        /// The <see cref="ScorePanelTrackingContainer"/> will track the size of this <see cref="ScorePanel"/>.
+        /// </summary>
+        /// <remarks>
+        /// This <see cref="ScorePanel"/> is immediately added as a child of the <see cref="ScorePanelTrackingContainer"/>.
+        /// </remarks>
+        /// <returns>The <see cref="ScorePanelTrackingContainer"/>.</returns>
+        /// <exception cref="InvalidOperationException">If a <see cref="ScorePanelTrackingContainer"/> already exists.</exception>
         public ScorePanelTrackingContainer CreateTrackingContainer()
         {
             if (trackingContainer != null)
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 8f9064c2d1..9ebd7822c0 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -26,12 +26,13 @@ namespace osu.Game.Screens.Ranking
         /// </summary>
         private const float expanded_panel_spacing = 15;
 
+        /// <summary>
+        /// An action to be invoked if a <see cref="ScorePanel"/> is clicked while in an expanded state.
+        /// </summary>
         public Action PostExpandAction;
 
         public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
 
-        public float CurrentScrollPosition => scroll.Current;
-
         private readonly Flow flow;
         private readonly Scroll scroll;
         private ScorePanel expandedPanel;
@@ -47,16 +48,13 @@ namespace osu.Game.Screens.Ranking
             {
                 RelativeSizeAxes = Axes.Both,
                 HandleScroll = () => expandedPanel?.IsHovered != true, // handle horizontal scroll only when not hovering the expanded panel.
-                Children = new Drawable[]
+                Child = flow = new Flow
                 {
-                    flow = new Flow
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Direction = FillDirection.Horizontal,
-                        Spacing = new Vector2(panel_spacing, 0),
-                        AutoSizeAxes = Axes.Both,
-                    },
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(panel_spacing, 0),
+                    AutoSizeAxes = Axes.Both,
                 }
             };
         }
@@ -166,6 +164,10 @@ namespace osu.Game.Screens.Ranking
 
         private bool handleInput = true;
 
+        /// <summary>
+        /// Whether this <see cref="ScorePanelList"/> or any of the <see cref="ScorePanel"/>s contained should handle scroll or click input.
+        /// Setting to <c>false</c> will also hide the scrollbar.
+        /// </summary>
         public bool HandleInput
         {
             get => handleInput;
@@ -180,10 +182,24 @@ namespace osu.Game.Screens.Ranking
 
         public override bool PropagateNonPositionalInputSubTree => HandleInput && base.PropagateNonPositionalInputSubTree;
 
+        /// <summary>
+        /// Enumerates all <see cref="ScorePanel"/>s contained in this <see cref="ScorePanelList"/>.
+        /// </summary>
+        /// <returns></returns>
         public IEnumerable<ScorePanel> GetScorePanels() => flow.Select(t => t.Panel);
 
+        /// <summary>
+        /// Finds the <see cref="ScorePanel"/> corresponding to a <see cref="ScoreInfo"/>.
+        /// </summary>
+        /// <param name="score">The <see cref="ScoreInfo"/> to find the corresponding <see cref="ScorePanel"/> for.</param>
+        /// <returns>The <see cref="ScorePanel"/>.</returns>
         public ScorePanel GetPanelForScore(ScoreInfo score) => flow.Single(t => t.Panel.Score == score).Panel;
 
+        /// <summary>
+        /// Detaches a <see cref="ScorePanel"/> from its <see cref="ScorePanelTrackingContainer"/>, allowing the panel to be moved elsewhere in the hierarchy.
+        /// </summary>
+        /// <param name="panel">The <see cref="ScorePanel"/> to detach.</param>
+        /// <exception cref="InvalidOperationException">If <paramref name="panel"/> is not a part of this <see cref="ScorePanelList"/>.</exception>
         public void Detach(ScorePanel panel)
         {
             var container = flow.FirstOrDefault(t => t.Panel == panel);
@@ -193,6 +209,11 @@ namespace osu.Game.Screens.Ranking
             container.Detach();
         }
 
+        /// <summary>
+        /// Attaches a <see cref="ScorePanel"/> to its <see cref="ScorePanelTrackingContainer"/> in this <see cref="ScorePanelList"/>.
+        /// </summary>
+        /// <param name="panel">The <see cref="ScorePanel"/> to attach.</param>
+        /// <exception cref="InvalidOperationException">If <paramref name="panel"/> is not a part of this <see cref="ScorePanelList"/>.</exception>
         public void Attach(ScorePanel panel)
         {
             var container = flow.FirstOrDefault(t => t.Panel == panel);
diff --git a/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs b/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
index f6f26d0f8a..c8010d1c32 100644
--- a/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
@@ -6,16 +6,27 @@ using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Screens.Ranking
 {
+    /// <summary>
+    /// A <see cref="CompositeDrawable"/> which tracks the size of a <see cref="ScorePanel"/>, to which the <see cref="ScorePanel"/> can be added or removed.
+    /// </summary>
     public class ScorePanelTrackingContainer : CompositeDrawable
     {
+        /// <summary>
+        /// The <see cref="ScorePanel"/> that created this <see cref="ScorePanelTrackingContainer"/>.
+        /// </summary>
         public readonly ScorePanel Panel;
 
-        public ScorePanelTrackingContainer(ScorePanel panel)
+        internal ScorePanelTrackingContainer(ScorePanel panel)
         {
             Panel = panel;
             Attach();
         }
 
+        /// <summary>
+        /// Detaches the <see cref="ScorePanel"/> from this <see cref="ScorePanelTrackingContainer"/>, removing it as a child.
+        /// This <see cref="ScorePanelTrackingContainer"/> will continue tracking any size changes.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">If the <see cref="ScorePanel"/> is already detached.</exception>
         public void Detach()
         {
             if (InternalChildren.Count == 0)
@@ -24,6 +35,10 @@ namespace osu.Game.Screens.Ranking
             RemoveInternal(Panel);
         }
 
+        /// <summary>
+        /// Attaches the <see cref="ScorePanel"/> to this <see cref="ScorePanelTrackingContainer"/>, adding it as a child.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">If the <see cref="ScorePanel"/> is already attached.</exception>
         public void Attach()
         {
             if (InternalChildren.Count > 0)
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
index d9e5e1294a..ed98698411 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.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.CodeAnalysis;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -11,13 +12,16 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking.Statistics
 {
-    internal class StatisticContainer : Container
+    /// <summary>
+    /// Wraps a <see cref="StatisticItem"/> to add a header and suitable layout for use in <see cref="ResultsScreen"/>.
+    /// </summary>
+    internal class StatisticContainer : CompositeDrawable
     {
-        protected override Container<Drawable> Content => content;
-
-        private readonly Container content;
-
-        public StatisticContainer(string name)
+        /// <summary>
+        /// Creates a new <see cref="StatisticContainer"/>.
+        /// </summary>
+        /// <param name="item">The <see cref="StatisticItem"/> to display.</param>
+        public StatisticContainer([NotNull] StatisticItem item)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -50,7 +54,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
-                                    Text = name,
+                                    Text = item.Name,
                                     Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
                                 }
                             }
@@ -58,11 +62,12 @@ namespace osu.Game.Screens.Ranking.Statistics
                     },
                     new Drawable[]
                     {
-                        content = new Container
+                        new Container
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
-                            Margin = new MarginPadding { Top = 15 }
+                            Margin = new MarginPadding { Top = 15 },
+                            Child = item.Content
                         }
                     },
                 },
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
index a3ef5bf99e..e959ed24fc 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
@@ -30,9 +30,9 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// <summary>
         /// Creates a new <see cref="StatisticItem"/>, to be displayed inside a <see cref="StatisticRow"/> in the results screen.
         /// </summary>
-        /// <param name="name">The name of this item.</param>
+        /// <param name="name">The name of the item.</param>
         /// <param name="content">The <see cref="Drawable"/> content to be displayed.</param>
-        /// <param name="dimension">The <see cref="Dimension"/> of this row. This can be thought of as the column dimension of an encompassing <see cref="GridContainer"/>.</param>
+        /// <param name="dimension">The <see cref="Dimension"/> of this item. This can be thought of as the column dimension of an encompassing <see cref="GridContainer"/>.</param>
         public StatisticItem([NotNull] string name, [NotNull] Drawable content, [CanBeNull] Dimension dimension = null)
         {
             Name = name;
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 328b6933a0..c560cc9852 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -83,10 +83,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                         AutoSizeAxes = Axes.Y,
                         Content = new[]
                         {
-                            row.Columns?.Select(c => new StatisticContainer(c.Name)
-                            {
-                                Child = c.Content
-                            }).Cast<Drawable>().ToArray()
+                            row.Columns?.Select(c => new StatisticContainer(c)).Cast<Drawable>().ToArray()
                         },
                         ColumnDimensions = Enumerable.Range(0, row.Columns?.Length ?? 0)
                                                      .Select(i => row.Columns[i].Dimension ?? new Dimension()).ToArray(),
@@ -105,8 +102,8 @@ namespace osu.Game.Screens.Ranking.Statistics
             }
         }
 
-        protected override void PopIn() => this.FadeIn();
+        protected override void PopIn() => this.FadeIn(150, Easing.OutQuint);
 
-        protected override void PopOut() => this.FadeOut();
+        protected override void PopOut() => this.FadeOut(150, Easing.OutQuint);
     }
 }

From 49bdd897758bf918224e8fafa8a0e02e9d0af70a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 21:54:09 +0900
Subject: [PATCH 03349/10326] Cleanup ReplayPlayer adjustments

---
 osu.Game/Screens/Play/Player.cs       |  2 +-
 osu.Game/Screens/Play/ReplayPlayer.cs | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 83991ad027..cfcef5155d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -460,7 +460,7 @@ namespace osu.Game.Screens.Play
         {
             var score = new ScoreInfo
             {
-                Beatmap = Beatmap.Value.BeatmapInfo,
+                Beatmap = gameplayBeatmap.BeatmapInfo,
                 Ruleset = rulesetInfo,
                 Mods = Mods.Value.ToArray(),
             };
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index d7580ea271..8a925958fd 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.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.Screens;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 
@@ -25,16 +24,18 @@ namespace osu.Game.Screens.Play
             DrawableRuleset?.SetReplayScore(score);
         }
 
-        protected override void GotoRanking()
-        {
-            this.Push(CreateResults(CreateScore()));
-        }
-
         protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
 
-        // protected override ScoreInfo CreateScore()
-        // {
-        //     return score.ScoreInfo;
-        // }
+        protected override ScoreInfo CreateScore()
+        {
+            var baseScore = base.CreateScore();
+
+            // Since the replay score doesn't contain statistics, we'll pass them through here.
+            // We also have to pass in the beatmap to get the post-mod-application version.
+            score.ScoreInfo.Beatmap = baseScore.Beatmap;
+            score.ScoreInfo.HitEvents = baseScore.HitEvents;
+
+            return score.ScoreInfo;
+        }
     }
 }

From 740b01c049592483adb0dbc6f8e0b2d4cbf9e9d5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 22:05:58 +0900
Subject: [PATCH 03350/10326] Add xmldoc

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 22ec023f58..9c1bc35169 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -138,6 +138,11 @@ namespace osu.Game.Rulesets.Scoring
             updateScore();
         }
 
+        /// <summary>
+        /// Creates the <see cref="HitEvent"/> that describes a <see cref="JudgementResult"/>.
+        /// </summary>
+        /// <param name="result">The <see cref="JudgementResult"/> to describe.</param>
+        /// <returns>The <see cref="HitEvent"/>.</returns>
         protected virtual HitEvent CreateHitEvent(JudgementResult result)
             => new HitEvent(result.TimeOffset, result.Type, result.HitObject, lastHitObject, null);
 

From 486b899e8f31c262b5ab911792bb5269c0edc880 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 22:11:29 +0900
Subject: [PATCH 03351/10326] Rename method

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs                | 2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs                    | 2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs                | 2 +-
 osu.Game/Rulesets/Ruleset.cs                           | 2 +-
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index b8725af856..44e8f343d5 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -309,7 +309,7 @@ namespace osu.Game.Rulesets.Mania
             return (PlayfieldType)Enum.GetValues(typeof(PlayfieldType)).Cast<int>().OrderByDescending(i => i).First(v => variant >= v);
         }
 
-        public override StatisticRow[] CreateStatistics(ScoreInfo score) => new[]
+        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score) => new[]
         {
             new StatisticRow
             {
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 65f26c0647..8222eba339 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
-        public override StatisticRow[] CreateStatistics(ScoreInfo score) => new[]
+        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score) => new[]
         {
             new StatisticRow
             {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index cd4e699262..92b04e8397 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
 
-        public override StatisticRow[] CreateStatistics(ScoreInfo score) => new[]
+        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score) => new[]
         {
             new StatisticRow
             {
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index a325e641a4..f9c2b09be9 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -216,6 +216,6 @@ namespace osu.Game.Rulesets
         /// <param name="score">The <see cref="ScoreInfo"/> to create the statistics for. The score is guaranteed to have <see cref="ScoreInfo.HitEvents"/> populated.</param>
         /// <returns>The <see cref="StatisticRow"/>s to display. Each <see cref="StatisticRow"/> may contain 0 or more <see cref="StatisticItem"/>.</returns>
         [NotNull]
-        public virtual StatisticRow[] CreateStatistics(ScoreInfo score) => Array.Empty<StatisticRow>();
+        public virtual StatisticRow[] CreateStatisticsForScore(ScoreInfo score) => Array.Empty<StatisticRow>();
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index c560cc9852..efb9397a23 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                     Spacing = new Vector2(30, 15),
                 };
 
-                foreach (var row in newScore.Ruleset.CreateInstance().CreateStatistics(newScore))
+                foreach (var row in newScore.Ruleset.CreateInstance().CreateStatisticsForScore(newScore))
                 {
                     rows.Add(new GridContainer
                     {

From 4cb49cd606a57ec3aa4770ad8ab1caf5b11eeaee Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 22:21:34 +0900
Subject: [PATCH 03352/10326] Add minimum height to the timing distribution
 graph

---
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 43de862007..9b46bea2cb 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Ranking.Statistics
             int maxCount = bins.Max();
             var bars = new Drawable[total_timing_distribution_bins];
             for (int i = 0; i < bars.Length; i++)
-                bars[i] = new Bar { Height = (float)bins[i] / maxCount };
+                bars[i] = new Bar { Height = Math.Max(0.05f, (float)bins[i] / maxCount) };
 
             Container axisFlow;
 

From 2814433d7cf572a78218db8da6c055e7139e1962 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 22:22:07 +0900
Subject: [PATCH 03353/10326] Rename test file

---
 ...butionGraph.cs => TestSceneHitEventTimingDistributionGraph.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Tests/Visual/Ranking/{TestSceneTimingDistributionGraph.cs => TestSceneHitEventTimingDistributionGraph.cs} (100%)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
similarity index 100%
rename from osu.Game.Tests/Visual/Ranking/TestSceneTimingDistributionGraph.cs
rename to osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs

From 22f3fd487b9cb7f346f068200b02f4fdf611e677 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 22:43:25 +0900
Subject: [PATCH 03354/10326] Mark test as headless

---
 osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
index a97566ba7b..cd3669f160 100644
--- a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using NUnit.Framework;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
@@ -10,6 +11,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.Gameplay
 {
+    [HeadlessTest]
     public class TestSceneGameplayClockContainer : OsuTestScene
     {
         [Test]

From 037bd3b46330bc2f2942bf761f0e883455b02d5c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Jun 2020 22:47:55 +0900
Subject: [PATCH 03355/10326] Fix possible nullref

---
 osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs | 6 ++++++
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs    | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index 210abaef4e..8700fbeb42 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -29,6 +29,12 @@ namespace osu.Game.Tests.Visual.Ranking
             loadPanel(new TestScoreInfo(new OsuRuleset().RulesetInfo));
         }
 
+        [Test]
+        public void TestNullScore()
+        {
+            loadPanel(null);
+        }
+
         private void loadPanel(ScoreInfo score) => AddStep("load panel", () =>
         {
             Child = new StatisticsPanel
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index efb9397a23..cac2bf866b 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -62,6 +62,9 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             var newScore = score.NewValue;
 
+            if (newScore == null)
+                return;
+
             if (newScore.HitEvents == null || newScore.HitEvents.Count == 0)
                 content.Add(new MessagePlaceholder("Score has no statistics :("));
             else

From 3021bdf3059fc5d9ce2165d3594828a65b5ca4fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 20 Jun 2020 00:34:01 +0900
Subject: [PATCH 03356/10326] 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 b95b794004..119c309675 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.616.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.619.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6ec57e5100..bec3bc9d39 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.616.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.619.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
     <PackageReference Include="Sentry" Version="2.1.3" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 0bfff24805..de5130b66a 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.Framework.iOS" Version="2020.616.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.619.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.616.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.619.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 0046cc08e913572866146cebdb512aed9f2ec725 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Fri, 19 Jun 2020 18:40:36 +0100
Subject: [PATCH 03357/10326] Add test cases for different mods and rates.
 Cleanup test scene.

---
 .../Gameplay/TestSceneStoryboardSamples.cs    | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 60911d6792..0803da6678 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -10,9 +10,8 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
 using osu.Game.Audio;
-using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -73,26 +72,39 @@ namespace osu.Game.Tests.Gameplay
             AddUntilStep("sample playback succeeded", () => sample.LifetimeEnd < double.MaxValue);
         }
 
-        [Test]
-        public void TestSamplePlaybackWithRateMods()
+        [TestCase(typeof(OsuModDoubleTime), 1.5)]
+        [TestCase(typeof(OsuModHalfTime), 0.75)]
+        [TestCase(typeof(ModWindUp), 1.5)]
+        [TestCase(typeof(ModWindDown), 0.75)]
+        [TestCase(typeof(OsuModDoubleTime), 2)]
+        [TestCase(typeof(OsuModHalfTime), 0.5)]
+        [TestCase(typeof(ModWindUp), 2)]
+        [TestCase(typeof(ModWindDown), 0.5)]
+        public void TestSamplePlaybackWithRateMods(Type expectedMod, double expectedRate)
         {
             GameplayClockContainer gameplayContainer = null;
             TestDrawableStoryboardSample sample = null;
 
-            OsuModDoubleTime doubleTimeMod = null;
+            Mod testedMod = Activator.CreateInstance(expectedMod) as Mod;
 
-            AddStep("create container", () =>
+            switch (testedMod)
             {
-                var beatmap = Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+                case ModRateAdjust m:
+                    m.SpeedChange.Value = expectedRate;
+                    break;
 
-                Add(gameplayContainer = new GameplayClockContainer(beatmap, new[] { doubleTimeMod = new OsuModDoubleTime() }, 0));
+                case ModTimeRamp m:
+                    m.SpeedChange.Value = expectedRate;
+                    break;
+            }
 
-                SelectedMods.Value = new[] { doubleTimeMod };
-                Beatmap.Value = new TestCustomSkinWorkingBeatmap(beatmap.Beatmap, gameplayContainer.GameplayClock, Audio);
-            });
-
-            AddStep("create storyboard sample", () =>
+            AddStep("setup storyboard sample", () =>
             {
+                Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, Audio);
+                SelectedMods.Value = new[] { testedMod };
+
+                Add(gameplayContainer = new GameplayClockContainer(Beatmap.Value, SelectedMods.Value, 0));
+
                 gameplayContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
                 {
                     Clock = gameplayContainer.GameplayClock
@@ -101,7 +113,7 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("start", () => gameplayContainer.Start());
 
-            AddAssert("sample playback rate matches mod rates", () => sample.TestChannel.AggregateFrequency.Value == doubleTimeMod.SpeedChange.Value);
+            AddAssert("sample playback rate matches mod rates", () => sample.TestChannel.AggregateFrequency.Value == expectedRate);
         }
 
         private class TestSkin : LegacySkin
@@ -138,8 +150,8 @@ namespace osu.Game.Tests.Gameplay
         {
             private readonly AudioManager audio;
 
-            public TestCustomSkinWorkingBeatmap(IBeatmap beatmap, IFrameBasedClock referenceClock, AudioManager audio)
-                : base(beatmap, null, referenceClock, audio)
+            public TestCustomSkinWorkingBeatmap(RulesetInfo ruleset, AudioManager audio)
+                : base(ruleset, null, audio)
             {
                 this.audio = audio;
             }

From 1d5084c35554939390b33db0c8d8191e0382724a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Jun 2020 20:11:12 +0200
Subject: [PATCH 03358/10326] Use {Initial,Final}Rate instead of SpeedChange

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

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 0803da6678..295fcc5b58 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Gameplay
                     break;
 
                 case ModTimeRamp m:
-                    m.SpeedChange.Value = expectedRate;
+                    m.InitialRate.Value = m.FinalRate.Value = expectedRate;
                     break;
             }
 

From 34476f6c2fa0d1e3ad922e46980fa9133302ee29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Jun 2020 20:12:17 +0200
Subject: [PATCH 03359/10326] Delegate to base in a more consistent manner

---
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 295fcc5b58..b30870d057 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("start", () => gameplayContainer.Start());
 
-            AddAssert("sample playback rate matches mod rates", () => sample.TestChannel.AggregateFrequency.Value == expectedRate);
+            AddAssert("sample playback rate matches mod rates", () => sample.Channel.AggregateFrequency.Value == expectedRate);
         }
 
         private class TestSkin : LegacySkin
@@ -166,7 +166,7 @@ namespace osu.Game.Tests.Gameplay
             {
             }
 
-            public SampleChannel TestChannel => Channel;
+            public new SampleChannel Channel => base.Channel;
         }
     }
 }

From 53861cdde81dec2aba2edfad6c92d89208a477ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Jun 2020 20:13:43 +0200
Subject: [PATCH 03360/10326] Privatise setter

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

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 04df46410e..60cb9b94a6 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Storyboards.Drawables
 
         private readonly StoryboardSampleInfo sampleInfo;
 
-        protected SampleChannel Channel;
+        protected SampleChannel Channel { get; private set; }
 
         public override bool RemoveWhenNotAlive => false;
 

From 470d5bfce3497c2c2a7048ee5db8a4a65249b153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Jun 2020 20:15:14 +0200
Subject: [PATCH 03361/10326] Invert if to reduce nesting

---
 .../Storyboards/Drawables/DrawableStoryboardSample.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 60cb9b94a6..8eaf9ac652 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -35,14 +35,13 @@ namespace osu.Game.Storyboards.Drawables
         private void load(IBindable<WorkingBeatmap> beatmap, IBindable<IReadOnlyList<Mod>> mods)
         {
             Channel = beatmap.Value.Skin.GetSample(sampleInfo);
+            if (Channel == null)
+                return;
 
-            if (Channel != null)
-            {
-                Channel.Volume.Value = sampleInfo.Volume / 100.0;
+            Channel.Volume.Value = sampleInfo.Volume / 100.0;
 
-                foreach (var mod in mods.Value.OfType<IApplicableToSample>())
-                    mod.ApplyToSample(Channel);
-            }
+            foreach (var mod in mods.Value.OfType<IApplicableToSample>())
+                mod.ApplyToSample(Channel);
         }
 
         protected override void Update()

From 8298a2c8a936561714233e53e2111881dff91ba4 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 20 Jun 2020 14:53:25 +0800
Subject: [PATCH 03362/10326] inline stage light lookup and clarify behavior

---
 osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs     | 2 +-
 osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 1a097405ac..b69827e2d9 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string lightImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.LightImage, 0)?.Value
+            string lightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LightImage)?.Value
                                 ?? "mania-stage-light";
 
             float leftLineWidth = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LeftLineWidth)
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 7a2fa711e3..4114bf5628 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private Drawable getResult(HitResult result)
         {
             string filename = this.GetManiaSkinConfig<string>(hitresult_mapping[result])?.Value
-                ?? default_hitresult_skin_filenames[result];
+                              ?? default_hitresult_skin_filenames[result];
 
             return this.GetAnimation(filename, true, true);
         }

From ca555a6a5271124ff0ff55d83185ba4f6e3a034b Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 20 Jun 2020 14:56:39 +0800
Subject: [PATCH 03363/10326] rename per-column skin config retrieval to
 GetColumnSkinConfig

Removed parameter "index"; all these cases should use extension instead
---
 osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs  |  2 +-
 .../Skinning/LegacyColumnBackground.cs               | 12 ++++++------
 .../Skinning/LegacyHitExplosion.cs                   |  4 ++--
 osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs    |  4 ++--
 .../Skinning/LegacyManiaColumnElement.cs             |  4 ++--
 osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs  |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index 0c9bc97ba9..a749f80855 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo, DrawableHitObject drawableObject)
         {
-            string imageName = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage)?.Value
+            string imageName = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage)?.Value
                                ?? $"mania-note{FallbackColumnIndex}L";
 
             sprite = skin.GetAnimation(imageName, true, true).With(d =>
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index b69827e2d9..64a7641421 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -35,25 +35,25 @@ namespace osu.Game.Rulesets.Mania.Skinning
             string lightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LightImage)?.Value
                                 ?? "mania-stage-light";
 
-            float leftLineWidth = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LeftLineWidth)
+            float leftLineWidth = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LeftLineWidth)
                 ?.Value ?? 1;
-            float rightLineWidth = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.RightLineWidth)
+            float rightLineWidth = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.RightLineWidth)
                 ?.Value ?? 1;
 
             bool hasLeftLine = leftLineWidth > 0;
             bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
                                 || isLastColumn;
 
-            float lightPosition = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LightPosition)?.Value
+            float lightPosition = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LightPosition)?.Value
                                   ?? 0;
 
-            Color4 lineColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLineColour)?.Value
+            Color4 lineColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLineColour)?.Value
                                 ?? Color4.White;
 
-            Color4 backgroundColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour)?.Value
+            Color4 backgroundColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour)?.Value
                                       ?? Color4.Black;
 
-            Color4 lightColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
+            Color4 lightColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
                                  ?? Color4.White;
 
             InternalChildren = new Drawable[]
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index ce0b9fe4b6..bc93bb2615 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -26,10 +26,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string imageName = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.ExplosionImage)?.Value
+            string imageName = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.ExplosionImage)?.Value
                                ?? "lightingN";
 
-            float explosionScale = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.ExplosionScale)?.Value
+            float explosionScale = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.ExplosionScale)?.Value
                                    ?? 1;
 
             // Create a temporary animation to retrieve the number of frames, in an effort to calculate the intended frame length.
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
index 7c8d1cd303..44f3e7d7b3 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
@@ -33,10 +33,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string upImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.KeyImage)?.Value
+            string upImage = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.KeyImage)?.Value
                              ?? $"mania-key{FallbackColumnIndex}";
 
-            string downImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.KeyImageDown)?.Value
+            string downImage = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.KeyImageDown)?.Value
                                ?? $"mania-key{FallbackColumnIndex}D";
 
             InternalChild = directionContainer = new Container
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
index 0c46a00bed..3c0c632c14 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             }
         }
 
-        protected IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
-            => skin.GetManiaSkinConfig<T>(lookup, index ?? Column.Index);
+        protected IBindable<T> GetColumnSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup)
+            => skin.GetManiaSkinConfig<T>(lookup, Column.Index);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
index 85523ae3c0..515c941d65 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     break;
             }
 
-            string noteImage = GetManiaSkinConfig<string>(skin, lookup)?.Value
+            string noteImage = GetColumnSkinConfig<string>(skin, lookup)?.Value
                                ?? $"mania-note{FallbackColumnIndex}{suffix}";
 
             return skin.GetTexture(noteImage);

From 19eb6fad7fca29af8f163ace52ba95e70383f542 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 21 Jun 2020 17:42:17 +0900
Subject: [PATCH 03364/10326] Make hold note ticks affect combo score rather
 than bonus

---
 osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
index 00b839f8ec..294aab1e4e 100644
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
@@ -7,8 +7,6 @@ namespace osu.Game.Rulesets.Mania.Judgements
 {
     public class HoldNoteTickJudgement : ManiaJudgement
     {
-        public override bool AffectsCombo => false;
-
         protected override int NumericResultFor(HitResult result) => 20;
 
         protected override double HealthIncreaseFor(HitResult result)

From 44925b3951655b7a2659ac4b641da911f16461e0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 21 Jun 2020 18:05:26 +0900
Subject: [PATCH 03365/10326] Reduce mania's HP drain by 20%

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs              |  2 ++
 osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index a37aaa8cc4..6ddb052585 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Rulesets.Mania
 
         public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
 
+        public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new DrainingHealthProcessor(drainStartTime, 0.2);
+
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new ManiaBeatmapConverter(beatmap, this);
 
         public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new ManiaPerformanceCalculator(this, beatmap, score);
diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index 982f527517..2d3754841b 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -44,6 +44,7 @@ namespace osu.Game.Rulesets.Scoring
         private double gameplayEndTime;
 
         private readonly double drainStartTime;
+        private readonly double drainLenience;
 
         private readonly List<(double time, double health)> healthIncreases = new List<(double, double)>();
         private double targetMinimumHealth;
@@ -55,9 +56,14 @@ namespace osu.Game.Rulesets.Scoring
         /// Creates a new <see cref="DrainingHealthProcessor"/>.
         /// </summary>
         /// <param name="drainStartTime">The time after which draining should begin.</param>
-        public DrainingHealthProcessor(double drainStartTime)
+        /// <param name="drainLenience">A lenience to apply to the default drain rate.<br />
+        /// A value of 0 uses the default drain rate.<br />
+        /// A value of 0.5 halves the drain rate.<br />
+        /// A value of 1 completely removes drain.</param>
+        public DrainingHealthProcessor(double drainStartTime, double drainLenience = 0)
         {
             this.drainStartTime = drainStartTime;
+            this.drainLenience = drainLenience;
         }
 
         protected override void Update()
@@ -95,6 +101,8 @@ namespace osu.Game.Rulesets.Scoring
             )));
 
             targetMinimumHealth = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, min_health_target, mid_health_target, max_health_target);
+            targetMinimumHealth += drainLenience * (1 - targetMinimumHealth);
+            targetMinimumHealth = Math.Min(1, targetMinimumHealth);
 
             base.ApplyBeatmap(beatmap);
         }

From 9fbe2fa80a140eef3a8babf39c02bd003db56bb9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 21 Jun 2020 19:31:00 +0900
Subject: [PATCH 03366/10326] Add comments, change to clamp

---
 osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index 2d3754841b..ef341575fa 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -101,8 +101,12 @@ namespace osu.Game.Rulesets.Scoring
             )));
 
             targetMinimumHealth = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, min_health_target, mid_health_target, max_health_target);
+
+            // Add back a portion of the amount of HP to be drained, depending on the lenience requested.
             targetMinimumHealth += drainLenience * (1 - targetMinimumHealth);
-            targetMinimumHealth = Math.Min(1, targetMinimumHealth);
+
+            // Ensure the target HP is within an acceptable range.
+            targetMinimumHealth = Math.Clamp(targetMinimumHealth, 0, 1);
 
             base.ApplyBeatmap(beatmap);
         }

From 599543acb6cf7fa44ff518d7f43eba47ec2e53b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Jun 2020 18:02:09 +0200
Subject: [PATCH 03367/10326] Extract abstract hitobject sample test class

---
 .../Gameplay/HitObjectSampleTest.cs           | 183 ++++++++++++++
 .../Gameplay/TestSceneHitObjectSamples.cs     | 239 +++---------------
 2 files changed, 216 insertions(+), 206 deletions(-)
 create mode 100644 osu.Game.Tests/Gameplay/HitObjectSampleTest.cs

diff --git a/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs b/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs
new file mode 100644
index 0000000000..6621344b6e
--- /dev/null
+++ b/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs
@@ -0,0 +1,183 @@
+// Copyright (c) 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;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.IO.Stores;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
+using osu.Game.Rulesets;
+using osu.Game.Skinning;
+using osu.Game.Storyboards;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Gameplay
+{
+    public abstract class HitObjectSampleTest : PlayerTestScene
+    {
+        private readonly SkinInfo userSkinInfo = new SkinInfo();
+
+        private readonly BeatmapInfo beatmapInfo = new BeatmapInfo
+        {
+            BeatmapSet = new BeatmapSetInfo(),
+            Metadata = new BeatmapMetadata
+            {
+                Author = User.SYSTEM_USER
+            }
+        };
+
+        private readonly TestResourceStore userSkinResourceStore = new TestResourceStore();
+        private readonly TestResourceStore beatmapSkinResourceStore = new TestResourceStore();
+        private SkinSourceDependencyContainer dependencies;
+        private IBeatmap currentTestBeatmap;
+        protected override bool HasCustomSteps => true;
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            => new DependencyContainer(dependencies = new SkinSourceDependencyContainer(base.CreateChildDependencies(parent)));
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestBeatmap;
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+            => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, Audio);
+
+        protected void CreateTestWithBeatmap(string filename)
+        {
+            CreateTest(() =>
+            {
+                AddStep("clear performed lookups", () =>
+                {
+                    userSkinResourceStore.PerformedLookups.Clear();
+                    beatmapSkinResourceStore.PerformedLookups.Clear();
+                });
+
+                AddStep($"load {filename}", () =>
+                {
+                    using (var reader = new LineBufferedReader(TestResources.OpenResource($"SampleLookups/{filename}")))
+                        currentTestBeatmap = Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
+                });
+            });
+        }
+
+        protected void SetupSkins(string beatmapFile, string userFile)
+        {
+            AddStep("setup skins", () =>
+            {
+                userSkinInfo.Files = new List<SkinFileInfo>
+                {
+                    new SkinFileInfo
+                    {
+                        Filename = userFile,
+                        FileInfo = new IO.FileInfo { Hash = userFile }
+                    }
+                };
+
+                beatmapInfo.BeatmapSet.Files = new List<BeatmapSetFileInfo>
+                {
+                    new BeatmapSetFileInfo
+                    {
+                        Filename = beatmapFile,
+                        FileInfo = new IO.FileInfo { Hash = beatmapFile }
+                    }
+                };
+
+                // Need to refresh the cached skin source to refresh the skin resource store.
+                dependencies.SkinSource = new SkinProvidingContainer(new LegacySkin(userSkinInfo, userSkinResourceStore, Audio));
+            });
+        }
+
+        protected void AssertBeatmapLookup(string name) => AddAssert($"\"{name}\" looked up from beatmap skin",
+            () => !userSkinResourceStore.PerformedLookups.Contains(name) && beatmapSkinResourceStore.PerformedLookups.Contains(name));
+
+        protected void AssertUserLookup(string name) => AddAssert($"\"{name}\" looked up from user skin",
+            () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && userSkinResourceStore.PerformedLookups.Contains(name));
+
+        protected class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
+        {
+            public ISkinSource SkinSource;
+
+            private readonly IReadOnlyDependencyContainer fallback;
+
+            public SkinSourceDependencyContainer(IReadOnlyDependencyContainer fallback)
+            {
+                this.fallback = fallback;
+            }
+
+            public object Get(Type type)
+            {
+                if (type == typeof(ISkinSource))
+                    return SkinSource;
+
+                return fallback.Get(type);
+            }
+
+            public object Get(Type type, CacheInfo info)
+            {
+                if (type == typeof(ISkinSource))
+                    return SkinSource;
+
+                return fallback.Get(type, info);
+            }
+
+            public void Inject<T>(T instance) where T : class
+            {
+                // Never used directly
+            }
+        }
+
+        protected class TestResourceStore : IResourceStore<byte[]>
+        {
+            public readonly List<string> PerformedLookups = new List<string>();
+
+            public byte[] Get(string name)
+            {
+                markLookup(name);
+                return Array.Empty<byte>();
+            }
+
+            public Task<byte[]> GetAsync(string name)
+            {
+                markLookup(name);
+                return Task.FromResult(Array.Empty<byte>());
+            }
+
+            public Stream GetStream(string name)
+            {
+                markLookup(name);
+                return new MemoryStream();
+            }
+
+            private void markLookup(string name) => PerformedLookups.Add(name.Substring(name.LastIndexOf(Path.DirectorySeparatorChar) + 1));
+
+            public IEnumerable<string> GetAvailableResources() => Enumerable.Empty<string>();
+
+            public void Dispose()
+            {
+            }
+        }
+
+        private class TestWorkingBeatmap : ClockBackedTestWorkingBeatmap
+        {
+            private readonly BeatmapInfo skinBeatmapInfo;
+            private readonly IResourceStore<byte[]> resourceStore;
+
+            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio,
+                                      double length = 60000)
+                : base(beatmap, storyboard, referenceClock, audio, length)
+            {
+                this.skinBeatmapInfo = skinBeatmapInfo;
+                this.resourceStore = resourceStore;
+            }
+
+            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, AudioManager);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index acefaa006a..6144179d31 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -1,52 +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 System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Formats;
-using osu.Game.IO;
 using osu.Game.Rulesets;
-using osu.Game.Skinning;
-using osu.Game.Storyboards;
-using osu.Game.Tests.Resources;
-using osu.Game.Tests.Visual.Gameplay;
-using osu.Game.Users;
+using osu.Game.Rulesets.Osu;
 
 namespace osu.Game.Tests.Gameplay
 {
     [HeadlessTest]
-    public class TestSceneHitObjectSamples : OsuPlayerTestScene
+    public class TestSceneHitObjectSamples : HitObjectSampleTest
     {
-        private readonly SkinInfo userSkinInfo = new SkinInfo();
-
-        private readonly BeatmapInfo beatmapInfo = new BeatmapInfo
-        {
-            BeatmapSet = new BeatmapSetInfo(),
-            Metadata = new BeatmapMetadata
-            {
-                Author = User.SYSTEM_USER
-            }
-        };
-
-        private readonly TestResourceStore userSkinResourceStore = new TestResourceStore();
-        private readonly TestResourceStore beatmapSkinResourceStore = new TestResourceStore();
-
-        protected override bool HasCustomSteps => true;
-
-        private SkinSourceDependencyContainer dependencies;
-
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-            => new DependencyContainer(dependencies = new SkinSourceDependencyContainer(base.CreateChildDependencies(parent)));
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
 
         /// <summary>
         /// Tests that a hitobject which provides no custom sample set retrieves samples from the user skin.
@@ -56,11 +21,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("hitobject-skin-sample.osu");
+            CreateTestWithBeatmap("hitobject-skin-sample.osu");
 
-            assertUserLookup(expected_sample);
+            AssertUserLookup(expected_sample);
         }
 
         /// <summary>
@@ -71,11 +36,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("hitobject-beatmap-sample.osu");
+            CreateTestWithBeatmap("hitobject-beatmap-sample.osu");
 
-            assertBeatmapLookup(expected_sample);
+            AssertBeatmapLookup(expected_sample);
         }
 
         /// <summary>
@@ -86,11 +51,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal";
 
-            setupSkins(null, expected_sample);
+            SetupSkins(null, expected_sample);
 
-            createTestWithBeatmap("hitobject-beatmap-sample.osu");
+            CreateTestWithBeatmap("hitobject-beatmap-sample.osu");
 
-            assertUserLookup(expected_sample);
+            AssertUserLookup(expected_sample);
         }
 
         /// <summary>
@@ -102,11 +67,11 @@ namespace osu.Game.Tests.Gameplay
         [TestCase("normal-hitnormal")]
         public void TestDefaultCustomSampleFromBeatmap(string expectedSample)
         {
-            setupSkins(expectedSample, expectedSample);
+            SetupSkins(expectedSample, expectedSample);
 
-            createTestWithBeatmap("hitobject-beatmap-custom-sample.osu");
+            CreateTestWithBeatmap("hitobject-beatmap-custom-sample.osu");
 
-            assertBeatmapLookup(expectedSample);
+            AssertBeatmapLookup(expectedSample);
         }
 
         /// <summary>
@@ -118,11 +83,11 @@ namespace osu.Game.Tests.Gameplay
         [TestCase("normal-hitnormal")]
         public void TestDefaultCustomSampleFromUserSkinFallback(string expectedSample)
         {
-            setupSkins(string.Empty, expectedSample);
+            SetupSkins(string.Empty, expectedSample);
 
-            createTestWithBeatmap("hitobject-beatmap-custom-sample.osu");
+            CreateTestWithBeatmap("hitobject-beatmap-custom-sample.osu");
 
-            assertUserLookup(expectedSample);
+            AssertUserLookup(expectedSample);
         }
 
         /// <summary>
@@ -133,11 +98,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "hit_1.wav";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("file-beatmap-sample.osu");
+            CreateTestWithBeatmap("file-beatmap-sample.osu");
 
-            assertBeatmapLookup(expected_sample);
+            AssertBeatmapLookup(expected_sample);
         }
 
         /// <summary>
@@ -148,11 +113,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("controlpoint-skin-sample.osu");
+            CreateTestWithBeatmap("controlpoint-skin-sample.osu");
 
-            assertUserLookup(expected_sample);
+            AssertUserLookup(expected_sample);
         }
 
         /// <summary>
@@ -163,11 +128,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("controlpoint-beatmap-sample.osu");
+            CreateTestWithBeatmap("controlpoint-beatmap-sample.osu");
 
-            assertBeatmapLookup(expected_sample);
+            AssertBeatmapLookup(expected_sample);
         }
 
         /// <summary>
@@ -177,11 +142,11 @@ namespace osu.Game.Tests.Gameplay
         [TestCase("normal-hitnormal")]
         public void TestControlPointCustomSampleFromBeatmap(string sampleName)
         {
-            setupSkins(sampleName, sampleName);
+            SetupSkins(sampleName, sampleName);
 
-            createTestWithBeatmap("controlpoint-beatmap-custom-sample.osu");
+            CreateTestWithBeatmap("controlpoint-beatmap-custom-sample.osu");
 
-            assertBeatmapLookup(sampleName);
+            AssertBeatmapLookup(sampleName);
         }
 
         /// <summary>
@@ -192,149 +157,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal3";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("hitobject-beatmap-custom-sample-override.osu");
+            CreateTestWithBeatmap("hitobject-beatmap-custom-sample-override.osu");
 
-            assertBeatmapLookup(expected_sample);
-        }
-
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestBeatmap;
-
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-            => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, Audio);
-
-        private IBeatmap currentTestBeatmap;
-
-        private void createTestWithBeatmap(string filename)
-        {
-            CreateTest(() =>
-            {
-                AddStep("clear performed lookups", () =>
-                {
-                    userSkinResourceStore.PerformedLookups.Clear();
-                    beatmapSkinResourceStore.PerformedLookups.Clear();
-                });
-
-                AddStep($"load {filename}", () =>
-                {
-                    using (var reader = new LineBufferedReader(TestResources.OpenResource($"SampleLookups/{filename}")))
-                        currentTestBeatmap = Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
-                });
-            });
-        }
-
-        private void setupSkins(string beatmapFile, string userFile)
-        {
-            AddStep("setup skins", () =>
-            {
-                userSkinInfo.Files = new List<SkinFileInfo>
-                {
-                    new SkinFileInfo
-                    {
-                        Filename = userFile,
-                        FileInfo = new IO.FileInfo { Hash = userFile }
-                    }
-                };
-
-                beatmapInfo.BeatmapSet.Files = new List<BeatmapSetFileInfo>
-                {
-                    new BeatmapSetFileInfo
-                    {
-                        Filename = beatmapFile,
-                        FileInfo = new IO.FileInfo { Hash = beatmapFile }
-                    }
-                };
-
-                // Need to refresh the cached skin source to refresh the skin resource store.
-                dependencies.SkinSource = new SkinProvidingContainer(new LegacySkin(userSkinInfo, userSkinResourceStore, Audio));
-            });
-        }
-
-        private void assertBeatmapLookup(string name) => AddAssert($"\"{name}\" looked up from beatmap skin",
-            () => !userSkinResourceStore.PerformedLookups.Contains(name) && beatmapSkinResourceStore.PerformedLookups.Contains(name));
-
-        private void assertUserLookup(string name) => AddAssert($"\"{name}\" looked up from user skin",
-            () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && userSkinResourceStore.PerformedLookups.Contains(name));
-
-        private class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
-        {
-            public ISkinSource SkinSource;
-
-            private readonly IReadOnlyDependencyContainer fallback;
-
-            public SkinSourceDependencyContainer(IReadOnlyDependencyContainer fallback)
-            {
-                this.fallback = fallback;
-            }
-
-            public object Get(Type type)
-            {
-                if (type == typeof(ISkinSource))
-                    return SkinSource;
-
-                return fallback.Get(type);
-            }
-
-            public object Get(Type type, CacheInfo info)
-            {
-                if (type == typeof(ISkinSource))
-                    return SkinSource;
-
-                return fallback.Get(type, info);
-            }
-
-            public void Inject<T>(T instance) where T : class
-            {
-                // Never used directly
-            }
-        }
-
-        private class TestResourceStore : IResourceStore<byte[]>
-        {
-            public readonly List<string> PerformedLookups = new List<string>();
-
-            public byte[] Get(string name)
-            {
-                markLookup(name);
-                return Array.Empty<byte>();
-            }
-
-            public Task<byte[]> GetAsync(string name)
-            {
-                markLookup(name);
-                return Task.FromResult(Array.Empty<byte>());
-            }
-
-            public Stream GetStream(string name)
-            {
-                markLookup(name);
-                return new MemoryStream();
-            }
-
-            private void markLookup(string name) => PerformedLookups.Add(name.Substring(name.LastIndexOf(Path.DirectorySeparatorChar) + 1));
-
-            public IEnumerable<string> GetAvailableResources() => Enumerable.Empty<string>();
-
-            public void Dispose()
-            {
-            }
-        }
-
-        private class TestWorkingBeatmap : ClockBackedTestWorkingBeatmap
-        {
-            private readonly BeatmapInfo skinBeatmapInfo;
-            private readonly IResourceStore<byte[]> resourceStore;
-
-            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio,
-                                      double length = 60000)
-                : base(beatmap, storyboard, referenceClock, audio, length)
-            {
-                this.skinBeatmapInfo = skinBeatmapInfo;
-                this.resourceStore = resourceStore;
-            }
-
-            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, AudioManager);
+            AssertBeatmapLookup(expected_sample);
         }
     }
 }

From 4a8a673d41a276a540cab16806bd80beb29308e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Jun 2020 18:19:33 +0200
Subject: [PATCH 03368/10326] Decouple abstract sample test from TestResources

---
 osu.Game.Tests/Gameplay/HitObjectSampleTest.cs       | 5 +++--
 osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs b/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs
index 6621344b6e..9c43690a95 100644
--- a/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs
+++ b/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs
@@ -16,7 +16,6 @@ using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
-using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
 using osu.Game.Users;
 
@@ -24,6 +23,8 @@ namespace osu.Game.Tests.Gameplay
 {
     public abstract class HitObjectSampleTest : PlayerTestScene
     {
+        protected abstract IResourceStore<byte[]> Resources { get; }
+
         private readonly SkinInfo userSkinInfo = new SkinInfo();
 
         private readonly BeatmapInfo beatmapInfo = new BeatmapInfo
@@ -61,7 +62,7 @@ namespace osu.Game.Tests.Gameplay
 
                 AddStep($"load {filename}", () =>
                 {
-                    using (var reader = new LineBufferedReader(TestResources.OpenResource($"SampleLookups/{filename}")))
+                    using (var reader = new LineBufferedReader(Resources.GetStream($"Resources/SampleLookups/{filename}")))
                         currentTestBeatmap = Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
                 });
             });
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index 6144179d31..78bdfeb80e 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -2,9 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Gameplay
 {
@@ -12,6 +14,7 @@ namespace osu.Game.Tests.Gameplay
     public class TestSceneHitObjectSamples : HitObjectSampleTest
     {
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+        protected override IResourceStore<byte[]> Resources => TestResources.GetStore();
 
         /// <summary>
         /// Tests that a hitobject which provides no custom sample set retrieves samples from the user skin.

From 4bba0c7359c857bc19d794c5b7b269e001d4d45e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Jun 2020 18:20:36 +0200
Subject: [PATCH 03369/10326] Move abstract sample test to main game project

---
 osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs            | 1 +
 .../Gameplay => osu.Game/Tests/Beatmaps}/HitObjectSampleTest.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename {osu.Game.Tests/Gameplay => osu.Game/Tests/Beatmaps}/HitObjectSampleTest.cs (99%)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index 78bdfeb80e..ef6efb7fec 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -6,6 +6,7 @@ using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Gameplay
diff --git a/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
similarity index 99%
rename from osu.Game.Tests/Gameplay/HitObjectSampleTest.cs
rename to osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index 9c43690a95..91fca2c1bf 100644
--- a/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -19,7 +19,7 @@ using osu.Game.Storyboards;
 using osu.Game.Tests.Visual;
 using osu.Game.Users;
 
-namespace osu.Game.Tests.Gameplay
+namespace osu.Game.Tests.Beatmaps
 {
     public abstract class HitObjectSampleTest : PlayerTestScene
     {

From 07cbc3e68343b83b17b4e43f8302f84833417f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Jun 2020 23:04:59 +0200
Subject: [PATCH 03370/10326] Privatise and seal whatever possible

---
 osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index 91fca2c1bf..b4ce322165 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -40,14 +40,14 @@ namespace osu.Game.Tests.Beatmaps
         private readonly TestResourceStore beatmapSkinResourceStore = new TestResourceStore();
         private SkinSourceDependencyContainer dependencies;
         private IBeatmap currentTestBeatmap;
-        protected override bool HasCustomSteps => true;
+        protected sealed override bool HasCustomSteps => true;
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        protected sealed override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             => new DependencyContainer(dependencies = new SkinSourceDependencyContainer(base.CreateChildDependencies(parent)));
 
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestBeatmap;
+        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestBeatmap;
 
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+        protected sealed override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
             => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, Audio);
 
         protected void CreateTestWithBeatmap(string filename)
@@ -101,7 +101,7 @@ namespace osu.Game.Tests.Beatmaps
         protected void AssertUserLookup(string name) => AddAssert($"\"{name}\" looked up from user skin",
             () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && userSkinResourceStore.PerformedLookups.Contains(name));
 
-        protected class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
+        private class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
         {
             public ISkinSource SkinSource;
 
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Beatmaps
             }
         }
 
-        protected class TestResourceStore : IResourceStore<byte[]>
+        private class TestResourceStore : IResourceStore<byte[]>
         {
             public readonly List<string> PerformedLookups = new List<string>();
 

From ad85c5f538a162ca9973301331db8baa8110b17d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Jun 2020 22:04:10 +0200
Subject: [PATCH 03371/10326] Add base legacy skin transformer

---
 .../Skinning/CatchLegacySkinTransformer.cs    | 23 ++++-------
 .../Skinning/ManiaLegacySkinTransformer.cs    | 26 +++++--------
 .../Skinning/OsuLegacySkinTransformer.cs      | 38 +++++++------------
 .../Skinning/TaikoLegacySkinTransformer.cs    | 17 +++------
 osu.Game/Skinning/LegacySkinTransformer.cs    | 35 +++++++++++++++++
 5 files changed, 71 insertions(+), 68 deletions(-)
 create mode 100644 osu.Game/Skinning/LegacySkinTransformer.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 954f2dfc5f..d929da1a29 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -2,26 +2,21 @@
 // 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;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
-    public class CatchLegacySkinTransformer : ISkin
+    public class CatchLegacySkinTransformer : LegacySkinTransformer
     {
-        private readonly ISkin source;
-
-        public CatchLegacySkinTransformer(ISkin source)
+        public CatchLegacySkinTransformer(ISkinSource source)
+            : base(source)
         {
-            this.source = source;
         }
 
-        public Drawable GetDrawableComponent(ISkinComponent component)
+        public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             if (!(component is CatchSkinComponent catchSkinComponent))
                 return null;
@@ -61,19 +56,15 @@ namespace osu.Game.Rulesets.Catch.Skinning
             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)
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             switch (lookup)
             {
                 case CatchSkinColour colour:
-                    return source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+                    return Source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
             }
 
-            return source.GetConfig<TLookup, TValue>(lookup);
+            return Source.GetConfig<TLookup, TValue>(lookup);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 4114bf5628..84e88a10be 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -3,11 +3,8 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
@@ -15,9 +12,8 @@ using System.Collections.Generic;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class ManiaLegacySkinTransformer : ISkin
+    public class ManiaLegacySkinTransformer : LegacySkinTransformer
     {
-        private readonly ISkin source;
         private readonly ManiaBeatmap beatmap;
 
         /// <summary>
@@ -59,23 +55,23 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private Lazy<bool> hasKeyTexture;
 
         public ManiaLegacySkinTransformer(ISkinSource source, IBeatmap beatmap)
+            : base(source)
         {
-            this.source = source;
             this.beatmap = (ManiaBeatmap)beatmap;
 
-            source.SourceChanged += sourceChanged;
+            Source.SourceChanged += sourceChanged;
             sourceChanged();
         }
 
         private void sourceChanged()
         {
-            isLegacySkin = new Lazy<bool>(() => source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
-            hasKeyTexture = new Lazy<bool>(() => source.GetAnimation(
+            isLegacySkin = new Lazy<bool>(() => Source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
+            hasKeyTexture = new Lazy<bool>(() => Source.GetAnimation(
                 this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, 0)?.Value
                 ?? "mania-key1", true, true) != null);
         }
 
-        public Drawable GetDrawableComponent(ISkinComponent component)
+        public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             switch (component)
             {
@@ -133,16 +129,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
             return this.GetAnimation(filename, true, true);
         }
 
-        public Texture GetTexture(string componentName) => source.GetTexture(componentName);
-
-        public SampleChannel GetSample(ISampleInfo sample) => source.GetSample(sample);
-
-        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             if (lookup is ManiaSkinConfigurationLookup maniaLookup)
-                return source.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.TargetColumn));
+                return Source.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.TargetColumn));
 
-            return source.GetConfig<TLookup, TValue>(lookup);
+            return Source.GetConfig<TLookup, TValue>(lookup);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index ba0003b5cd..3e5758ca01 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -2,20 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-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;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
-    public class OsuLegacySkinTransformer : ISkin
+    public class OsuLegacySkinTransformer : LegacySkinTransformer
     {
-        private readonly ISkin source;
-
         private Lazy<bool> hasHitCircle;
 
         /// <summary>
@@ -26,19 +21,18 @@ namespace osu.Game.Rulesets.Osu.Skinning
         public const float LEGACY_CIRCLE_RADIUS = 64 - 5;
 
         public OsuLegacySkinTransformer(ISkinSource source)
+            : base(source)
         {
-            this.source = source;
-
-            source.SourceChanged += sourceChanged;
+            Source.SourceChanged += sourceChanged;
             sourceChanged();
         }
 
         private void sourceChanged()
         {
-            hasHitCircle = new Lazy<bool>(() => source.GetTexture("hitcircle") != null);
+            hasHitCircle = new Lazy<bool>(() => Source.GetTexture("hitcircle") != null);
         }
 
-        public Drawable GetDrawableComponent(ISkinComponent component)
+        public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             if (!(component is OsuSkinComponent osuComponent))
                 return null;
@@ -85,13 +79,13 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     return null;
 
                 case OsuSkinComponents.Cursor:
-                    if (source.GetTexture("cursor") != null)
+                    if (Source.GetTexture("cursor") != null)
                         return new LegacyCursor();
 
                     return null;
 
                 case OsuSkinComponents.CursorTrail:
-                    if (source.GetTexture("cursortrail") != null)
+                    if (Source.GetTexture("cursortrail") != null)
                         return new LegacyCursorTrail();
 
                     return null;
@@ -102,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                     return !hasFont(font)
                         ? null
-                        : new LegacySpriteText(source, font)
+                        : new LegacySpriteText(Source, font)
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
                             Scale = new Vector2(0.8f),
@@ -113,16 +107,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
             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)
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             switch (lookup)
             {
                 case OsuSkinColour colour:
-                    return source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+                    return Source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
 
                 case OsuSkinConfiguration osuLookup:
                     switch (osuLookup)
@@ -136,16 +126,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         case OsuSkinConfiguration.HitCircleOverlayAboveNumber:
                             // See https://osu.ppy.sh/help/wiki/Skinning/skin.ini#%5Bgeneral%5D
                             // HitCircleOverlayAboveNumer (with typo) should still be supported for now.
-                            return source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber) ??
-                                   source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
+                            return Source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber) ??
+                                   Source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
                     }
 
                     break;
             }
 
-            return source.GetConfig<TLookup, TValue>(lookup);
+            return Source.GetConfig<TLookup, TValue>(lookup);
         }
 
-        private bool hasFont(string fontName) => source.GetTexture($"{fontName}-0") != null;
+        private bool hasFont(string fontName) => Source.GetTexture($"{fontName}-0") != null;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 6e9a37eb93..23d675cfb0 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -6,23 +6,20 @@ using System.Collections.Generic;
 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.Rulesets.Taiko.UI;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
 {
-    public class TaikoLegacySkinTransformer : ISkin
+    public class TaikoLegacySkinTransformer : LegacySkinTransformer
     {
-        private readonly ISkinSource source;
-
         public TaikoLegacySkinTransformer(ISkinSource source)
+            : base(source)
         {
-            this.source = source;
         }
 
-        public Drawable GetDrawableComponent(ISkinComponent component)
+        public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             if (!(component is TaikoSkinComponent taikoComponent))
                 return null;
@@ -100,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     return null;
             }
 
-            return source.GetDrawableComponent(component);
+            return Source.GetDrawableComponent(component);
         }
 
         private string getHitName(TaikoSkinComponents component)
@@ -120,11 +117,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             throw new ArgumentOutOfRangeException(nameof(component), "Invalid result type");
         }
 
-        public Texture GetTexture(string componentName) => source.GetTexture(componentName);
+        public override SampleChannel GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
 
-        public SampleChannel GetSample(ISampleInfo sampleInfo) => source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
-
-        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => source.GetConfig<TLookup, TValue>(lookup);
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => Source.GetConfig<TLookup, TValue>(lookup);
 
         private class LegacyTaikoSampleInfo : ISampleInfo
         {
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
new file mode 100644
index 0000000000..1131c93288
--- /dev/null
+++ b/osu.Game/Skinning/LegacySkinTransformer.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.Audio.Sample;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Audio;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// Transformer used to handle support of legacy features for individual rulesets.
+    /// </summary>
+    public abstract class LegacySkinTransformer : ISkin
+    {
+        /// <summary>
+        /// Source of the <see cref="ISkin"/> which is being transformed.
+        /// </summary>
+        protected ISkinSource Source { get; }
+
+        protected LegacySkinTransformer(ISkinSource source)
+        {
+            Source = source;
+        }
+
+        public abstract Drawable GetDrawableComponent(ISkinComponent component);
+
+        public Texture GetTexture(string componentName) => Source.GetTexture(componentName);
+
+        public virtual SampleChannel GetSample(ISampleInfo sampleInfo) => Source.GetSample(sampleInfo);
+
+        public abstract IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
+    }
+}

From 1bc5f3618417a15fe1fd0f44e705e4911d5adacd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Jun 2020 22:05:10 +0200
Subject: [PATCH 03372/10326] Adjust test usage

---
 osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
index 7deeec527f..b570f090ca 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
@@ -17,7 +17,8 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             var store = new NamespacedResourceStore<byte[]>(new DllResourceStore(GetType().Assembly), "Resources/special-skin");
             var rawSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, store);
-            var skin = new CatchLegacySkinTransformer(rawSkin);
+            var skinSource = new SkinProvidingContainer(rawSkin);
+            var skin = new CatchLegacySkinTransformer(skinSource);
 
             Assert.AreEqual(new Color4(232, 185, 35, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value);
             Assert.AreEqual(new Color4(232, 74, 35, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage)?.Value);

From 3ede095b9c88e3d2f99a483c8b6171eb7f889f03 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 15:42:55 +0900
Subject: [PATCH 03373/10326] Apply refactorings from review

---
 osu.Game/Screens/Ranking/ResultsScreen.cs  | 20 ++++++++------------
 osu.Game/Screens/Ranking/ScorePanelList.cs |  4 ++--
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 133efd6e7b..193d975e42 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -236,13 +236,11 @@ namespace osu.Game.Screens.Ranking
                 scorePanelList.Detach(expandedPanel);
                 detachedPanelContainer.Add(expandedPanel);
 
-                // Move into its original location in the local container.
+                // Move into its original location in the local container first, then to the final location.
                 var origLocation = detachedPanelContainer.ToLocalSpace(screenSpacePos);
-                expandedPanel.MoveTo(origLocation);
-                expandedPanel.MoveToX(origLocation.X);
-
-                // Move into the final location.
-                expandedPanel.MoveToX(StatisticsPanel.SIDE_PADDING, 150, Easing.OutQuint);
+                expandedPanel.MoveTo(origLocation)
+                             .Then()
+                             .MoveTo(new Vector2(StatisticsPanel.SIDE_PADDING, origLocation.Y), 150, Easing.OutQuint);
 
                 // Hide contracted panels.
                 foreach (var contracted in scorePanelList.GetScorePanels().Where(p => p.State == PanelState.Contracted))
@@ -262,13 +260,11 @@ namespace osu.Game.Screens.Ranking
                 detachedPanelContainer.Remove(detachedPanel);
                 scorePanelList.Attach(detachedPanel);
 
-                // Move into its original location in the attached container.
+                // Move into its original location in the attached container first, then to the final location.
                 var origLocation = detachedPanel.Parent.ToLocalSpace(screenSpacePos);
-                detachedPanel.MoveTo(origLocation);
-                detachedPanel.MoveToX(origLocation.X);
-
-                // Move into the final location.
-                detachedPanel.MoveToX(0, 150, Easing.OutQuint);
+                detachedPanel.MoveTo(origLocation)
+                             .Then()
+                             .MoveTo(new Vector2(0, origLocation.Y), 150, Easing.OutQuint);
 
                 // Show contracted panels.
                 foreach (var contracted in scorePanelList.GetScorePanels().Where(p => p.State == PanelState.Contracted))
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 9ebd7822c0..0f8bc82ac0 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Screens.Ranking
         /// <exception cref="InvalidOperationException">If <paramref name="panel"/> is not a part of this <see cref="ScorePanelList"/>.</exception>
         public void Detach(ScorePanel panel)
         {
-            var container = flow.FirstOrDefault(t => t.Panel == panel);
+            var container = flow.SingleOrDefault(t => t.Panel == panel);
             if (container == null)
                 throw new InvalidOperationException("Panel is not contained by the score panel list.");
 
@@ -216,7 +216,7 @@ namespace osu.Game.Screens.Ranking
         /// <exception cref="InvalidOperationException">If <paramref name="panel"/> is not a part of this <see cref="ScorePanelList"/>.</exception>
         public void Attach(ScorePanel panel)
         {
-            var container = flow.FirstOrDefault(t => t.Panel == panel);
+            var container = flow.SingleOrDefault(t => t.Panel == panel);
             if (container == null)
                 throw new InvalidOperationException("Panel is not contained by the score panel list.");
 

From 21f776e51feafd8a06e397e90ef88bace4900d0c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 15:48:42 +0900
Subject: [PATCH 03374/10326] Simplify/optimise heatmap point additoin

---
 .../Statistics/AccuracyHeatmap.cs             | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 10ca3eb9be..f05bfce8d7 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -175,25 +174,10 @@ namespace osu.Game.Rulesets.Osu.Statistics
             Vector2 localPoint = localCentre + localRadius * new Vector2((float)Math.Cos(localAngle), (float)Math.Sin(localAngle));
 
             // Find the most relevant hit point.
-            double minDist = double.PositiveInfinity;
-            HitPoint point = null;
+            int r = Math.Clamp((int)Math.Round(localPoint.Y), 0, points_per_dimension - 1);
+            int c = Math.Clamp((int)Math.Round(localPoint.X), 0, points_per_dimension - 1);
 
-            for (int r = 0; r < points_per_dimension; r++)
-            {
-                for (int c = 0; c < points_per_dimension; c++)
-                {
-                    float dist = Vector2.Distance(new Vector2(c, r), localPoint);
-
-                    if (dist < minDist)
-                    {
-                        minDist = dist;
-                        point = (HitPoint)pointGrid.Content[r][c];
-                    }
-                }
-            }
-
-            Debug.Assert(point != null);
-            point.Increment();
+            ((HitPoint)pointGrid.Content[r][c]).Increment();
         }
 
         private class HitPoint : Circle

From e91c2ee5e275bcdc398bcc117055a468ea2f8348 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Jun 2020 16:19:38 +0900
Subject: [PATCH 03375/10326] Simplify logic by considering all buttons equally

---
 osu.Game/Graphics/Cursor/MenuCursor.cs | 36 +++++++++-----------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index ff28dddd40..fd8f016860 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -13,7 +13,6 @@ using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
-using osuTK.Input;
 using osu.Framework.Utils;
 
 namespace osu.Game.Graphics.Cursor
@@ -74,23 +73,17 @@ namespace osu.Game.Graphics.Cursor
         protected override bool OnMouseDown(MouseDownEvent e)
         {
             // only trigger animation for main mouse buttons
-            if (e.Button <= MouseButton.Right)
-            {
-                activeCursor.Scale = new Vector2(1);
-                activeCursor.ScaleTo(0.90f, 800, Easing.OutQuint);
+            activeCursor.Scale = new Vector2(1);
+            activeCursor.ScaleTo(0.90f, 800, Easing.OutQuint);
 
-                activeCursor.AdditiveLayer.Alpha = 0;
-                activeCursor.AdditiveLayer.FadeInFromZero(800, Easing.OutQuint);
-            }
+            activeCursor.AdditiveLayer.Alpha = 0;
+            activeCursor.AdditiveLayer.FadeInFromZero(800, Easing.OutQuint);
 
-            if (shouldKeepRotating(e))
+            if (cursorRotate.Value && dragRotationState != DragRotationState.Rotating)
             {
                 // if cursor is already rotating don't reset its rotate origin
-                if (dragRotationState != DragRotationState.Rotating)
-                {
-                    dragRotationState = DragRotationState.DragStarted;
-                    positionMouseDown = e.MousePosition;
-                }
+                dragRotationState = DragRotationState.DragStarted;
+                positionMouseDown = e.MousePosition;
             }
 
             return base.OnMouseDown(e);
@@ -98,17 +91,16 @@ namespace osu.Game.Graphics.Cursor
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            if (!anyMainButtonPressed(e))
+            if (!e.HasAnyButtonPressed)
             {
                 activeCursor.AdditiveLayer.FadeOutFromOne(500, Easing.OutQuint);
                 activeCursor.ScaleTo(1, 500, Easing.OutElastic);
-            }
 
-            if (!shouldKeepRotating(e))
-            {
-                if (dragRotationState == DragRotationState.Rotating)
+                if (dragRotationState != DragRotationState.NotDragging)
+                {
                     activeCursor.RotateTo(0, 600 * (1 + Math.Abs(activeCursor.Rotation / 720)), Easing.OutElasticHalf);
-                dragRotationState = DragRotationState.NotDragging;
+                    dragRotationState = DragRotationState.NotDragging;
+                }
             }
 
             base.OnMouseUp(e);
@@ -126,10 +118,6 @@ namespace osu.Game.Graphics.Cursor
             activeCursor.ScaleTo(0.6f, 250, Easing.In);
         }
 
-        private bool shouldKeepRotating(MouseEvent e) => cursorRotate.Value && (anyMainButtonPressed(e));
-
-        private static bool anyMainButtonPressed(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Middle) || e.IsPressed(MouseButton.Right);
-
         public class Cursor : Container
         {
             private Container cursorContainer;

From 2d121b4e3dd8f10bf70d2f6051167d848fdc4fef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Jun 2020 16:32:27 +0900
Subject: [PATCH 03376/10326] Simplify lookup fallback code

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 32 +++++--------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index a17491bf2d..42be6ea119 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -4,7 +4,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using Microsoft.Win32;
 using osu.Framework.Allocation;
@@ -187,32 +186,13 @@ namespace osu.Game.Tournament.IPC
         [CanBeNull]
         private string findStablePath()
         {
-            string stableInstallPath = string.Empty;
+            var stableInstallPath = findFromEnvVar() ??
+                                    findFromRegistry() ??
+                                    findFromLocalAppData() ??
+                                    findFromDotFolder();
 
-            try
-            {
-                List<Func<string>> stableFindMethods = new List<Func<string>>
-                {
-                    findFromEnvVar,
-                    findFromRegistry,
-                    findFromLocalAppData,
-                    findFromDotFolder
-                };
-
-                foreach (var r in stableFindMethods)
-                {
-                    stableInstallPath = r.Invoke();
-
-                    if (stableInstallPath != null)
-                        return stableInstallPath;
-                }
-
-                return null;
-            }
-            finally
-            {
-                Logger.Log($"Stable path for tourney usage: {stableInstallPath}");
-            }
+            Logger.Log($"Stable path for tourney usage: {stableInstallPath}");
+            return stableInstallPath;
         }
 
         private string findFromEnvVar()

From fc31d4962938dc29c22e43c63e403be0530c909d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Jun 2020 16:34:04 +0900
Subject: [PATCH 03377/10326] try-catch registry lookup to avoid crashes on
 non-windows platforms

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 42be6ea119..999ce61ac8 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -238,13 +238,19 @@ namespace osu.Game.Tournament.IPC
         {
             Logger.Log("Trying to find stable in registry");
 
-            string stableInstallPath;
+            try
+            {
+                string stableInstallPath;
 
-            using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+                using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
 
-            if (ipcFileExistsInDirectory(stableInstallPath))
-                return stableInstallPath;
+                if (ipcFileExistsInDirectory(stableInstallPath))
+                    return stableInstallPath;
+            }
+            catch
+            {
+            }
 
             return null;
         }

From 628e05f655efc53043448f5cc6f33e0bac117347 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Jun 2020 17:09:22 +0900
Subject: [PATCH 03378/10326] 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 119c309675..192be999eb 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.602.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.619.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index bec3bc9d39..911292c6ae 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.619.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
     <PackageReference Include="Sentry" Version="2.1.3" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index de5130b66a..18249b40ca 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.619.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 8d3ed0584878edf8914df04f7265028492cbf740 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Jun 2020 17:42:54 +0900
Subject: [PATCH 03379/10326] Update welcome text sprite location

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

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 711c7b64e4..92c844db8b 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Screens.Menu
                         Scale = new Vector2(0.1f),
                         Height = 156,
                         Alpha = 0,
-                        Texture = textures.Get(@"Welcome/welcome_text")
+                        Texture = textures.Get(@"Intro/Welcome/welcome_text")
                     },
                 };
             }

From 533d6e72eb5dc403408b0917af2ca431e2890e86 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 18:05:21 +0900
Subject: [PATCH 03380/10326] Refactor + comment angle math

---
 .../Statistics/AccuracyHeatmap.cs             | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index f05bfce8d7..f8ab03aad0 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -167,11 +167,28 @@ namespace osu.Game.Rulesets.Osu.Statistics
             double finalAngle = angle2 - angle1; // Angle between start, end, and hit points.
             float normalisedDistance = Vector2.Distance(hitPoint, end) / radius;
 
-            // Convert the above into the local search space.
+            // Consider two objects placed horizontally, with the start on the left and the end on the right.
+            // The above calculated the angle between {end, start}, and the angle between {end, hitPoint}, in the form:
+            //             +pi | 0
+            //     O --------- O ----->      Note: Math.Atan2 has a range (-pi <= theta <= +pi)
+            //             -pi | 0
+            // E.g. If the hit point was directly above end, it would have an angle pi/2.
+            //
+            // It also calculated the angle separating hitPoint from the line joining {start, end}, that is anti-clockwise in the form:
+            //               0 | pi
+            //     O --------- O ----->
+            //             2pi | pi
+            //
+            // However keep in mind that cos(0)=1 and cos(2pi)=1, whereas we actually want these values to appear on the left, so the x-coordinate needs to be inverted.
+            // Likewise sin(pi/2)=1 and sin(3pi/2)=-1, whereas we actually want these values to appear on the bottom/top respectively, so the y-coordinate also needs to be inverted.
+            //
+            // We also need to apply the anti-clockwise rotation.
+            var rotatedAngle = finalAngle - MathUtils.DegreesToRadians(rotation);
+            var rotatedCoordinate = -1 * new Vector2((float)Math.Cos(rotatedAngle), (float)Math.Sin(rotatedAngle));
+
             Vector2 localCentre = new Vector2(points_per_dimension) / 2;
             float localRadius = localCentre.X * inner_portion * normalisedDistance; // The radius inside the inner portion which of the heatmap which the closest point lies.
-            double localAngle = finalAngle + Math.PI - MathUtils.DegreesToRadians(rotation); // The angle inside the heatmap on which the closest point lies.
-            Vector2 localPoint = localCentre + localRadius * new Vector2((float)Math.Cos(localAngle), (float)Math.Sin(localAngle));
+            Vector2 localPoint = localCentre + localRadius * rotatedCoordinate;
 
             // Find the most relevant hit point.
             int r = Math.Clamp((int)Math.Round(localPoint.Y), 0, points_per_dimension - 1);

From 9dbd230ad30f9f4e8564ae986c0f66f99415b131 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 18:06:52 +0900
Subject: [PATCH 03381/10326] Don't consider slider tails in timing
 distribution

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

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 8222eba339..a164265290 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -198,7 +198,7 @@ namespace osu.Game.Rulesets.Osu
             {
                 Columns = new[]
                 {
-                    new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents.Where(e => e.HitObject is HitCircle).ToList())
+                    new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)).ToList())
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 130

From 261adfc4e682973738960c6ace4c284f502811fd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 18:38:41 +0900
Subject: [PATCH 03382/10326] Create a local playable beatmap instead

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  2 +-
 .../TestSceneAccuracyHeatmap.cs               |  6 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  4 +-
 .../Statistics/AccuracyHeatmap.cs             |  7 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  2 +-
 osu.Game/Rulesets/Ruleset.cs                  |  3 +-
 osu.Game/Screens/Play/Player.cs               |  2 +-
 osu.Game/Screens/Play/ReplayPlayer.cs         |  2 -
 .../Ranking/Statistics/StatisticsPanel.cs     | 67 ++++++++++++-------
 9 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index f8fa5d4c40..411956e120 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -311,7 +311,7 @@ namespace osu.Game.Rulesets.Mania
             return (PlayfieldType)Enum.GetValues(typeof(PlayfieldType)).Cast<int>().OrderByDescending(i => i).First(v => variant >= v);
         }
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score) => new[]
+        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
         {
             new StatisticRow
             {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneAccuracyHeatmap.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneAccuracyHeatmap.cs
index f2a36ea017..49b469ba24 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneAccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneAccuracyHeatmap.cs
@@ -39,12 +39,12 @@ namespace osu.Game.Rulesets.Osu.Tests
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4Extensions.FromHex("#333"),
                 },
-                object1 = new BorderCircle
+                object2 = new BorderCircle
                 {
                     Position = new Vector2(256, 192),
                     Colour = Color4.Yellow,
                 },
-                object2 = new BorderCircle
+                object1 = new BorderCircle
                 {
                     Position = new Vector2(100, 300),
                 },
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private class TestAccuracyHeatmap : AccuracyHeatmap
         {
             public TestAccuracyHeatmap(ScoreInfo score)
-                : base(score)
+                : base(score, new TestBeatmap(new OsuRuleset().RulesetInfo))
             {
             }
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index a164265290..2ba2f4b097 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score) => new[]
+        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
         {
             new StatisticRow
             {
@@ -203,7 +203,7 @@ namespace osu.Game.Rulesets.Osu
                         RelativeSizeAxes = Axes.X,
                         Height = 130
                     }),
-                    new StatisticItem("Accuracy Heatmap", new AccuracyHeatmap(score)
+                    new StatisticItem("Accuracy Heatmap", new AccuracyHeatmap(score, playableBeatmap)
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 130
diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index f8ab03aad0..58089553a4 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -9,6 +9,7 @@ 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.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
 using osuTK;
@@ -35,10 +36,12 @@ namespace osu.Game.Rulesets.Osu.Statistics
         private GridContainer pointGrid;
 
         private readonly ScoreInfo score;
+        private readonly IBeatmap playableBeatmap;
 
-        public AccuracyHeatmap(ScoreInfo score)
+        public AccuracyHeatmap(ScoreInfo score, IBeatmap playableBeatmap)
         {
             this.score = score;
+            this.playableBeatmap = playableBeatmap;
         }
 
         [BackgroundDependencyLoader]
@@ -146,7 +149,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
                 return;
 
             // Todo: This should probably not be done like this.
-            float radius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (score.Beatmap.BaseDifficulty.CircleSize - 5) / 5) / 2;
+            float radius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (playableBeatmap.BeatmapInfo.BaseDifficulty.CircleSize - 5) / 5) / 2;
 
             foreach (var e in score.HitEvents.Where(e => e.HitObject is HitCircle))
             {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 92b04e8397..17d0800228 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score) => new[]
+        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
         {
             new StatisticRow
             {
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index f9c2b09be9..3a7f433a37 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -214,8 +214,9 @@ namespace osu.Game.Rulesets
         /// Creates the statistics for a <see cref="ScoreInfo"/> to be displayed in the results screen.
         /// </summary>
         /// <param name="score">The <see cref="ScoreInfo"/> to create the statistics for. The score is guaranteed to have <see cref="ScoreInfo.HitEvents"/> populated.</param>
+        /// <param name="playableBeatmap">The <see cref="IBeatmap"/>, converted for this <see cref="Ruleset"/> with all relevant <see cref="Mod"/>s applied.</param>
         /// <returns>The <see cref="StatisticRow"/>s to display. Each <see cref="StatisticRow"/> may contain 0 or more <see cref="StatisticItem"/>.</returns>
         [NotNull]
-        public virtual StatisticRow[] CreateStatisticsForScore(ScoreInfo score) => Array.Empty<StatisticRow>();
+        public virtual StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => Array.Empty<StatisticRow>();
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c2bb75b8f3..d3b88e56ae 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -463,7 +463,7 @@ namespace osu.Game.Screens.Play
         {
             var score = new ScoreInfo
             {
-                Beatmap = gameplayBeatmap.BeatmapInfo,
+                Beatmap = Beatmap.Value.BeatmapInfo,
                 Ruleset = rulesetInfo,
                 Mods = Mods.Value.ToArray(),
             };
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 8a925958fd..7f5c17a265 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Screens.Play
             var baseScore = base.CreateScore();
 
             // Since the replay score doesn't contain statistics, we'll pass them through here.
-            // We also have to pass in the beatmap to get the post-mod-application version.
-            score.ScoreInfo.Beatmap = baseScore.Beatmap;
             score.ScoreInfo.HitEvents = baseScore.HitEvents;
 
             return score.ScoreInfo;
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index cac2bf866b..8aceaa335c 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -1,14 +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 System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Placeholders;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osuTK;
 
@@ -22,6 +26,9 @@ namespace osu.Game.Screens.Ranking.Statistics
 
         protected override bool StartHidden => true;
 
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
         private readonly Container content;
         private readonly LoadingSpinner spinner;
 
@@ -71,37 +78,47 @@ namespace osu.Game.Screens.Ranking.Statistics
             {
                 spinner.Show();
 
-                var rows = new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(30, 15),
-                };
+                var localCancellationSource = loadCancellation = new CancellationTokenSource();
+                IBeatmap playableBeatmap = null;
 
-                foreach (var row in newScore.Ruleset.CreateInstance().CreateStatisticsForScore(newScore))
+                // Todo: The placement of this is temporary. Eventually we'll both generate the playable beatmap _and_ run through it in a background task to generate the hit events.
+                Task.Run(() =>
                 {
-                    rows.Add(new GridContainer
+                    playableBeatmap = beatmapManager.GetWorkingBeatmap(newScore.Beatmap).GetPlayableBeatmap(newScore.Ruleset, newScore.Mods ?? Array.Empty<Mod>());
+                }, loadCancellation.Token).ContinueWith(t =>
+                {
+                    var rows = new FillFlowContainer
                     {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Content = new[]
+                        RelativeSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(30, 15),
+                    };
+
+                    foreach (var row in newScore.Ruleset.CreateInstance().CreateStatisticsForScore(newScore, playableBeatmap))
+                    {
+                        rows.Add(new GridContainer
                         {
-                            row.Columns?.Select(c => new StatisticContainer(c)).Cast<Drawable>().ToArray()
-                        },
-                        ColumnDimensions = Enumerable.Range(0, row.Columns?.Length ?? 0)
-                                                     .Select(i => row.Columns[i].Dimension ?? new Dimension()).ToArray(),
-                        RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
-                    });
-                }
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Content = new[]
+                            {
+                                row.Columns?.Select(c => new StatisticContainer(c)).Cast<Drawable>().ToArray()
+                            },
+                            ColumnDimensions = Enumerable.Range(0, row.Columns?.Length ?? 0)
+                                                         .Select(i => row.Columns[i].Dimension ?? new Dimension()).ToArray(),
+                            RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
+                        });
+                    }
 
-                LoadComponentAsync(rows, d =>
-                {
-                    if (Score.Value != newScore)
-                        return;
+                    LoadComponentAsync(rows, d =>
+                    {
+                        if (Score.Value != newScore)
+                            return;
 
-                    spinner.Hide();
-                    content.Add(d);
-                }, (loadCancellation = new CancellationTokenSource()).Token);
+                        spinner.Hide();
+                        content.Add(d);
+                    }, localCancellationSource.Token);
+                }, localCancellationSource.Token);
             }
         }
 

From 21774b8967ffd8dfd99c1f29b9179394197599f5 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 22 Jun 2020 11:38:50 +0200
Subject: [PATCH 03383/10326] Move static properties to parent class and
 inherit OsuStorage from it

---
 .../NonVisual/CustomDataDirectoryTest.cs      |  4 +-
 osu.Game/IO/MigratableStorage.cs              |  8 +-
 osu.Game/IO/OsuStorage.cs                     | 78 +------------------
 3 files changed, 9 insertions(+), 81 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index f3d54d876a..5abefe3198 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -151,13 +151,13 @@ namespace osu.Game.Tests.NonVisual
                     Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
                     Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
 
-                    foreach (var file in OsuStorage.IGNORE_FILES)
+                    foreach (var file in MigratableStorage.IGNORE_FILES)
                     {
                         Assert.That(host.Storage.Exists(file), Is.True);
                         Assert.That(storage.Exists(file), Is.False);
                     }
 
-                    foreach (var dir in OsuStorage.IGNORE_DIRECTORIES)
+                    foreach (var dir in MigratableStorage.IGNORE_DIRECTORIES)
                     {
                         Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
                         Assert.That(storage.ExistsDirectory(dir), Is.False);
diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index 0ab0ea9934..004aa4e09a 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -14,9 +14,13 @@ namespace osu.Game.IO
     public abstract class MigratableStorage : WrappedStorage
     {
 
-        virtual protected string[] IGNORE_DIRECTORIES { get; set; } = Array.Empty<string>();
+        internal static readonly string[] IGNORE_DIRECTORIES = { "cache" };
 
-        virtual protected string[] IGNORE_FILES { get; set; } = Array.Empty<string>();
+        internal static readonly string[] IGNORE_FILES =
+        {
+            "framework.ini",
+            "storage.ini"
+        };
 
         public MigratableStorage(Storage storage, string subPath = null)
             : base(storage, subPath)
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 499bcb4063..416d2082c3 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -11,19 +11,11 @@ using osu.Game.Configuration;
 
 namespace osu.Game.IO
 {
-    public class OsuStorage : WrappedStorage
+    public class OsuStorage : MigratableStorage
     {
         private readonly GameHost host;
         private readonly StorageConfigManager storageConfig;
 
-        internal static readonly string[] IGNORE_DIRECTORIES = { "cache" };
-
-        internal static readonly string[] IGNORE_FILES =
-        {
-            "framework.ini",
-            "storage.ini"
-        };
-
         public OsuStorage(GameHost host)
             : base(host.Storage, string.Empty)
         {
@@ -76,73 +68,5 @@ namespace osu.Game.IO
 
             deleteRecursive(source);
         }
-
-        private static void deleteRecursive(DirectoryInfo target, bool topLevelExcludes = true)
-        {
-            foreach (System.IO.FileInfo fi in target.GetFiles())
-            {
-                if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
-                    continue;
-
-                attemptOperation(() => fi.Delete());
-            }
-
-            foreach (DirectoryInfo dir in target.GetDirectories())
-            {
-                if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
-                    continue;
-
-                attemptOperation(() => dir.Delete(true));
-            }
-
-            if (target.GetFiles().Length == 0 && target.GetDirectories().Length == 0)
-                attemptOperation(target.Delete);
-        }
-
-        private static void copyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true)
-        {
-            // based off example code https://docs.microsoft.com/en-us/dotnet/api/system.io.directoryinfo
-            Directory.CreateDirectory(destination.FullName);
-
-            foreach (System.IO.FileInfo fi in source.GetFiles())
-            {
-                if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
-                    continue;
-
-                attemptOperation(() => fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true));
-            }
-
-            foreach (DirectoryInfo dir in source.GetDirectories())
-            {
-                if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
-                    continue;
-
-                copyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);
-            }
-        }
-
-        /// <summary>
-        /// Attempt an IO operation multiple times and only throw if none of the attempts succeed.
-        /// </summary>
-        /// <param name="action">The action to perform.</param>
-        /// <param name="attempts">The number of attempts (250ms wait between each).</param>
-        private static void attemptOperation(Action action, int attempts = 10)
-        {
-            while (true)
-            {
-                try
-                {
-                    action();
-                    return;
-                }
-                catch (Exception)
-                {
-                    if (attempts-- == 0)
-                        throw;
-                }
-
-                Thread.Sleep(250);
-            }
-        }
     }
 }

From f878388d578a798698fb7de98935f3fe27239274 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 22 Jun 2020 11:56:14 +0200
Subject: [PATCH 03384/10326] Fix TestMigrationToSeeminglyNestedTarget failing

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 3 ---
 osu.Game/IO/MigratableStorage.cs            | 2 +-
 osu.Game/IO/OsuStorage.cs                   | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 1731b96095..c1629f270f 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -52,9 +52,6 @@ namespace osu.Game.Tournament.IO
             var destination = new DirectoryInfo(GetFullPath(default_tournament));
             var cfgDestination = new DirectoryInfo(GetFullPath(default_tournament + Path.DirectorySeparatorChar + config_directory));
 
-            // if (!destination.Exists)
-            //     destination.Create();
-
             if (source.Exists)
             {
                 Logger.Log("Migrating tournament assets to default tournament storage.");
diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index 004aa4e09a..95721a736e 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -53,7 +53,7 @@ namespace osu.Game.IO
         {
             // based off example code https://docs.microsoft.com/en-us/dotnet/api/system.io.directoryinfo
             if (!destination.Exists)
-            Directory.CreateDirectory(destination.FullName);
+                Directory.CreateDirectory(destination.FullName);
 
             foreach (System.IO.FileInfo fi in source.GetFiles())
             {
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 416d2082c3..d37336234a 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -55,8 +55,6 @@ namespace osu.Game.IO
             {
                 if (destination.GetFiles().Length > 0 || destination.GetDirectories().Length > 0)
                     throw new ArgumentException("Destination provided already has files or directories present", nameof(newLocation));
-
-                deleteRecursive(destination);
             }
 
             copyRecursive(source, destination);

From 2b7fb2b71d352a97031b7477315c50f0a9f8ba70 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 19:04:51 +0900
Subject: [PATCH 03385/10326] Rename to Position

---
 osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs |  4 ++--
 osu.Game/Rulesets/Scoring/HitEvent.cs               | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 58089553a4..40bdeeaa88 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -153,10 +153,10 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
             foreach (var e in score.HitEvents.Where(e => e.HitObject is HitCircle))
             {
-                if (e.LastHitObject == null || e.PositionOffset == null)
+                if (e.LastHitObject == null || e.Position == null)
                     continue;
 
-                AddPoint(((OsuHitObject)e.LastHitObject).StackedEndPosition, ((OsuHitObject)e.HitObject).StackedEndPosition, e.PositionOffset.Value, radius);
+                AddPoint(((OsuHitObject)e.LastHitObject).StackedEndPosition, ((OsuHitObject)e.HitObject).StackedEndPosition, e.Position.Value, radius);
             }
         }
 
diff --git a/osu.Game/Rulesets/Scoring/HitEvent.cs b/osu.Game/Rulesets/Scoring/HitEvent.cs
index ea2975a6c4..0ebbec62ba 100644
--- a/osu.Game/Rulesets/Scoring/HitEvent.cs
+++ b/osu.Game/Rulesets/Scoring/HitEvent.cs
@@ -34,10 +34,10 @@ namespace osu.Game.Rulesets.Scoring
         public readonly HitObject LastHitObject;
 
         /// <summary>
-        /// A position offset, if available, at the time of the event.
+        /// A position, if available, at the time of the event.
         /// </summary>
         [CanBeNull]
-        public readonly Vector2? PositionOffset;
+        public readonly Vector2? Position;
 
         /// <summary>
         /// Creates a new <see cref="HitEvent"/>.
@@ -46,14 +46,14 @@ namespace osu.Game.Rulesets.Scoring
         /// <param name="result">The <see cref="HitResult"/>.</param>
         /// <param name="hitObject">The <see cref="HitObject"/> that triggered the event.</param>
         /// <param name="lastHitObject">The previous <see cref="HitObject"/>.</param>
-        /// <param name="positionOffset">A positional offset.</param>
-        public HitEvent(double timeOffset, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, [CanBeNull] Vector2? positionOffset)
+        /// <param name="position">A position corresponding to the event.</param>
+        public HitEvent(double timeOffset, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, [CanBeNull] Vector2? position)
         {
             TimeOffset = timeOffset;
             Result = result;
             HitObject = hitObject;
             LastHitObject = lastHitObject;
-            PositionOffset = positionOffset;
+            Position = position;
         }
 
         /// <summary>

From 30aa6ec2d3ff6dc63c0bf9b3d33cb5aef820c35c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 19:05:41 +0900
Subject: [PATCH 03386/10326] Don't consider slider tails in accuracy heatmap

---
 osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 40bdeeaa88..cba753e003 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
             // Todo: This should probably not be done like this.
             float radius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (playableBeatmap.BeatmapInfo.BaseDifficulty.CircleSize - 5) / 5) / 2;
 
-            foreach (var e in score.HitEvents.Where(e => e.HitObject is HitCircle))
+            foreach (var e in score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)))
             {
                 if (e.LastHitObject == null || e.Position == null)
                     continue;

From 988baad16f296bb4f3df9f2c5e3478651057ceff Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 19:20:43 +0900
Subject: [PATCH 03387/10326] Expand statistics to fill more of the screen

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs             |  2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs                 | 13 +++++++++----
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs             |  2 +-
 .../Screens/Ranking/Statistics/StatisticsPanel.cs   |  8 +++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 411956e120..a27485dd06 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -320,7 +320,7 @@ namespace osu.Game.Rulesets.Mania
                     new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents)
                     {
                         RelativeSizeAxes = Axes.X,
-                        Height = 130
+                        Height = 250
                     }),
                 }
             }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 2ba2f4b097..e488ba65c8 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -30,7 +30,6 @@ using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
 using System.Linq;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Screens.Ranking.Statistics;
@@ -201,13 +200,19 @@ namespace osu.Game.Rulesets.Osu
                     new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)).ToList())
                     {
                         RelativeSizeAxes = Axes.X,
-                        Height = 130
+                        Height = 250
                     }),
+                }
+            },
+            new StatisticRow
+            {
+                Columns = new[]
+                {
                     new StatisticItem("Accuracy Heatmap", new AccuracyHeatmap(score, playableBeatmap)
                     {
                         RelativeSizeAxes = Axes.X,
-                        Height = 130
-                    }, new Dimension(GridSizeMode.Absolute, 130)),
+                        Height = 250
+                    }),
                 }
             }
         };
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 17d0800228..156905fa9c 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Rulesets.Taiko
                     new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents.Where(e => e.HitObject is Hit).ToList())
                     {
                         RelativeSizeAxes = Axes.X,
-                        Height = 130
+                        Height = 250
                     }),
                 }
             }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 8aceaa335c..d2d2adb2f4 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -98,11 +98,17 @@ namespace osu.Game.Screens.Ranking.Statistics
                     {
                         rows.Add(new GridContainer
                         {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Content = new[]
                             {
-                                row.Columns?.Select(c => new StatisticContainer(c)).Cast<Drawable>().ToArray()
+                                row.Columns?.Select(c => new StatisticContainer(c)
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                }).Cast<Drawable>().ToArray()
                             },
                             ColumnDimensions = Enumerable.Range(0, row.Columns?.Length ?? 0)
                                                          .Select(i => row.Columns[i].Dimension ?? new Dimension()).ToArray(),

From eec1e9ef4d660acf88de42ec6a814c96e2cf97cf Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 22 Jun 2020 12:22:59 +0200
Subject: [PATCH 03388/10326] Remove unnecessary comments and added file check
 for tournament.ini on test start

---
 .../NonVisual/CustomTourneyDirectoryTest.cs               | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 37f456ae96..92ff39c67c 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -78,10 +78,13 @@ namespace osu.Game.Tournament.Tests.NonVisual
         {
             using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestMigration)))
             {
-                // Recreate the old setup that uses "tournament" as the base path.
                 string osuRoot = basePath(nameof(TestMigration));
+                string configFile = Path.Combine(osuRoot, "tournament.ini");
 
-                // Define all the paths for the old scenario
+                if (File.Exists(configFile))
+                    File.Delete(configFile);
+
+                // Recreate the old setup that uses "tournament" as the base path.
                 string oldPath = Path.Combine(osuRoot, "tournament");
                 string videosPath = Path.Combine(oldPath, "videos");
                 string modsPath = Path.Combine(oldPath, "mods");
@@ -141,7 +144,6 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 }
                 finally
                 {
-                    // Cleaning up after ourselves.
                     host.Storage.Delete("tournament.ini");
                     host.Storage.DeleteDirectory("tournaments");
                     host.Exit();

From 08759da3a7642647d08317231da389b7f78daa44 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 22 Jun 2020 12:41:43 +0200
Subject: [PATCH 03389/10326] Move drawings.ini out of config subfolder

---
 .../NonVisual/CustomTourneyDirectoryTest.cs              | 2 +-
 osu.Game.Tournament/IO/TournamentStorage.cs              | 9 +--------
 osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs   | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 92ff39c67c..9e6675e09f 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
                     Assert.True(storage.Exists("drawings.txt"));
                     Assert.True(storage.Exists("drawings_results.txt"));
 
-                    Assert.True(storage.ConfigurationStorage.Exists("drawings.ini"));
+                    Assert.True(storage.Exists("drawings.ini"));
 
                     Assert.True(storage.Exists(videoFile));
                     Assert.True(storage.Exists(modFile));
diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index c1629f270f..c9d7ef3126 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -15,9 +15,7 @@ namespace osu.Game.Tournament.IO
     {
         private readonly Storage storage;
         internal readonly TournamentVideoResourceStore VideoStore;
-        internal readonly Storage ConfigurationStorage;
         private const string default_tournament = "default";
-        private const string config_directory = "config";
 
         public TournamentStorage(Storage storage)
             : base(storage.GetStorageForDirectory("tournaments"), string.Empty)
@@ -40,8 +38,6 @@ namespace osu.Game.Tournament.IO
                 ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_tournament));
             }
 
-            ConfigurationStorage = UnderlyingStorage.GetStorageForDirectory(config_directory);
-
             VideoStore = new TournamentVideoResourceStore(this);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }
@@ -50,7 +46,6 @@ namespace osu.Game.Tournament.IO
         {
             var source = new DirectoryInfo(storage.GetFullPath("tournament"));
             var destination = new DirectoryInfo(GetFullPath(default_tournament));
-            var cfgDestination = new DirectoryInfo(GetFullPath(default_tournament + Path.DirectorySeparatorChar + config_directory));
 
             if (source.Exists)
             {
@@ -59,13 +54,11 @@ namespace osu.Game.Tournament.IO
                 deleteRecursive(source);
             }
 
-            if (!cfgDestination.Exists)
-                destination.CreateSubdirectory(config_directory);
 
             moveFileIfExists("bracket.json", destination);
             moveFileIfExists("drawings.txt", destination);
             moveFileIfExists("drawings_results.txt", destination);
-            moveFileIfExists("drawings.ini", cfgDestination);
+            moveFileIfExists("drawings.ini", destination);
         }
 
         private void moveFileIfExists(string file, DirectoryInfo destination)
diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index de909af152..8b6bd21ee6 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Tournament.Screens.Drawings
                 return;
             }
 
-            drawingsConfig = new DrawingsConfigManager(storage.ConfigurationStorage);
+            drawingsConfig = new DrawingsConfigManager(storage);
 
             InternalChildren = new Drawable[]
             {

From 6b14079c0a80bc256f49376d939a861c7cd59ba7 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 22 Jun 2020 12:43:01 +0200
Subject: [PATCH 03390/10326] InspectCode changes

---
 osu.Game.Tournament/IO/TournamentStorage.cs |  9 +++------
 osu.Game/IO/MigratableStorage.cs            | 21 +++++++++------------
 osu.Game/IO/OsuStorage.cs                   |  6 ++----
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index c9d7ef3126..12dcc2195c 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.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.Threading;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.IO;
@@ -50,11 +48,10 @@ namespace osu.Game.Tournament.IO
             if (source.Exists)
             {
                 Logger.Log("Migrating tournament assets to default tournament storage.");
-                copyRecursive(source, destination);
-                deleteRecursive(source);
+                CopyRecursive(source, destination);
+                DeleteRecursive(source);
             }
 
-
             moveFileIfExists("bracket.json", destination);
             moveFileIfExists("drawings.txt", destination);
             moveFileIfExists("drawings_results.txt", destination);
@@ -67,7 +64,7 @@ namespace osu.Game.Tournament.IO
             {
                 Logger.Log($"Migrating {file} to default tournament storage.");
                 var fileInfo = new System.IO.FileInfo(storage.GetFullPath(file));
-                attemptOperation(() => fileInfo.CopyTo(Path.Combine(destination.FullName, fileInfo.Name), true));
+                AttemptOperation(() => fileInfo.CopyTo(Path.Combine(destination.FullName, fileInfo.Name), true));
                 fileInfo.Delete();
             }
         }
diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index 95721a736e..7efc37990f 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -5,15 +5,12 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
-using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Game.Configuration;
 
 namespace osu.Game.IO
 {
     public abstract class MigratableStorage : WrappedStorage
     {
-
         internal static readonly string[] IGNORE_DIRECTORIES = { "cache" };
 
         internal static readonly string[] IGNORE_FILES =
@@ -22,19 +19,19 @@ namespace osu.Game.IO
             "storage.ini"
         };
 
-        public MigratableStorage(Storage storage, string subPath = null)
+        protected MigratableStorage(Storage storage, string subPath = null)
             : base(storage, subPath)
         {
         }
 
-        protected void deleteRecursive(DirectoryInfo target, bool topLevelExcludes = true)
+        protected void DeleteRecursive(DirectoryInfo target, bool topLevelExcludes = true)
         {
             foreach (System.IO.FileInfo fi in target.GetFiles())
             {
                 if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
                     continue;
 
-                attemptOperation(() => fi.Delete());
+                AttemptOperation(() => fi.Delete());
             }
 
             foreach (DirectoryInfo dir in target.GetDirectories())
@@ -42,14 +39,14 @@ namespace osu.Game.IO
                 if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
                     continue;
 
-                attemptOperation(() => dir.Delete(true));
+                AttemptOperation(() => dir.Delete(true));
             }
 
             if (target.GetFiles().Length == 0 && target.GetDirectories().Length == 0)
-                attemptOperation(target.Delete);
+                AttemptOperation(target.Delete);
         }
 
-        protected void copyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true)
+        protected void CopyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true)
         {
             // based off example code https://docs.microsoft.com/en-us/dotnet/api/system.io.directoryinfo
             if (!destination.Exists)
@@ -60,7 +57,7 @@ namespace osu.Game.IO
                 if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
                     continue;
 
-                attemptOperation(() => fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true));
+                AttemptOperation(() => fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true));
             }
 
             foreach (DirectoryInfo dir in source.GetDirectories())
@@ -68,7 +65,7 @@ namespace osu.Game.IO
                 if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
                     continue;
 
-                copyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);
+                CopyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);
             }
         }
 
@@ -77,7 +74,7 @@ namespace osu.Game.IO
         /// </summary>
         /// <param name="action">The action to perform.</param>
         /// <param name="attempts">The number of attempts (250ms wait between each).</param>
-        protected static void attemptOperation(Action action, int attempts = 10)
+        protected static void AttemptOperation(Action action, int attempts = 10)
         {
             while (true)
             {
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index d37336234a..3d224841f3 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -3,8 +3,6 @@
 
 using System;
 using System.IO;
-using System.Linq;
-using System.Threading;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
@@ -57,14 +55,14 @@ namespace osu.Game.IO
                     throw new ArgumentException("Destination provided already has files or directories present", nameof(newLocation));
             }
 
-            copyRecursive(source, destination);
+            CopyRecursive(source, destination);
 
             ChangeTargetStorage(host.GetStorage(newLocation));
 
             storageConfig.Set(StorageConfig.FullPath, newLocation);
             storageConfig.Save();
 
-            deleteRecursive(source);
+            DeleteRecursive(source);
         }
     }
 }

From 4d30761ce3131eccaab114285018f5ab0cc54a79 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 19:49:38 +0900
Subject: [PATCH 03391/10326] Fix 1M score being possible with only GREATs in
 mania

---
 osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
index c2f8fb8678..53db676a54 100644
--- a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
@@ -25,8 +25,10 @@ namespace osu.Game.Rulesets.Mania.Judgements
                     return 200;
 
                 case HitResult.Great:
-                case HitResult.Perfect:
                     return 300;
+
+                case HitResult.Perfect:
+                    return 320;
             }
         }
     }

From a94dcc4923023d1322af32ed35ccb05f4ccfec57 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 22 Jun 2020 12:59:38 +0200
Subject: [PATCH 03392/10326] Add xmldoc to MigratableStorage

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

diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index 7efc37990f..45aba41315 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -9,6 +9,9 @@ using osu.Framework.Platform;
 
 namespace osu.Game.IO
 {
+    /// <summary>
+    /// A <see cref="WrappedStorage"/> that is migratable to different locations. 
+    /// </summary>
     public abstract class MigratableStorage : WrappedStorage
     {
         internal static readonly string[] IGNORE_DIRECTORIES = { "cache" };

From e0d5a9182e76eb44d9cf18ac6b2ba259316fbb9b Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 22 Jun 2020 12:59:56 +0200
Subject: [PATCH 03393/10326] make tournament migration private

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 12dcc2195c..ebd8d2b63f 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tournament.IO
             }
             else
             {
-                Migrate();
+                migrate();
                 storageConfig.Set(StorageConfig.CurrentTournament, default_tournament);
                 storageConfig.Save();
                 ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_tournament));
@@ -40,7 +40,7 @@ namespace osu.Game.Tournament.IO
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }
 
-        internal void Migrate()
+        private void migrate()
         {
             var source = new DirectoryInfo(storage.GetFullPath("tournament"));
             var destination = new DirectoryInfo(GetFullPath(default_tournament));

From a899c754f11942c8967ff78139ef7bb5433e1b8c Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 22 Jun 2020 13:03:24 +0200
Subject: [PATCH 03394/10326] Remove whitespace at the end of xmldoc line

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

diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index 45aba41315..c4dc4bcfb2 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -10,7 +10,7 @@ using osu.Framework.Platform;
 namespace osu.Game.IO
 {
     /// <summary>
-    /// A <see cref="WrappedStorage"/> that is migratable to different locations. 
+    /// A <see cref="WrappedStorage"/> that is migratable to different locations.
     /// </summary>
     public abstract class MigratableStorage : WrappedStorage
     {

From 5c4df2e32c0a1cd8f79f8d5e1e99e9fef6bfd228 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 20:20:42 +0900
Subject: [PATCH 03395/10326] Cancel load on dispose

---
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index d2d2adb2f4..651cdc4b0f 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -63,6 +63,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         private void populateStatistics(ValueChangedEvent<ScoreInfo> score)
         {
             loadCancellation?.Cancel();
+            loadCancellation = null;
 
             foreach (var child in content)
                 child.FadeOut(150).Expire();
@@ -131,5 +132,12 @@ namespace osu.Game.Screens.Ranking.Statistics
         protected override void PopIn() => this.FadeIn(150, Easing.OutQuint);
 
         protected override void PopOut() => this.FadeOut(150, Easing.OutQuint);
+
+        protected override void Dispose(bool isDisposing)
+        {
+            loadCancellation?.Cancel();
+
+            base.Dispose(isDisposing);
+        }
     }
 }

From ff2f3a8484022a209b09d5c72343561e26e4128a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 20:32:04 +0900
Subject: [PATCH 03396/10326] Fix div-by-zero errors with autoplay

---
 ...estSceneHitEventTimingDistributionGraph.cs | 28 ++++++++++++++++---
 .../HitEventTimingDistributionGraph.cs        |  4 +++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index b34529cca7..7ca1fc842f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -3,6 +3,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -15,7 +17,25 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneHitEventTimingDistributionGraph : OsuTestScene
     {
-        public TestSceneHitEventTimingDistributionGraph()
+        [Test]
+        public void TestManyDistributedEvents()
+        {
+            createTest(CreateDistributedHitEvents());
+        }
+
+        [Test]
+        public void TestZeroTimeOffset()
+        {
+            createTest(Enumerable.Range(0, 100).Select(_ => new HitEvent(0, HitResult.Perfect, new HitCircle(), new HitCircle(), null)).ToList());
+        }
+
+        [Test]
+        public void TestNoEvents()
+        {
+            createTest(new List<HitEvent>());
+        }
+
+        private void createTest(List<HitEvent> events) => AddStep("create test", () =>
         {
             Children = new Drawable[]
             {
@@ -24,14 +44,14 @@ namespace osu.Game.Tests.Visual.Ranking
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4Extensions.FromHex("#333")
                 },
-                new HitEventTimingDistributionGraph(CreateDistributedHitEvents())
+                new HitEventTimingDistributionGraph(events)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(400, 130)
+                    Size = new Vector2(600, 130)
                 }
             };
-        }
+        });
 
         public static List<HitEvent> CreateDistributedHitEvents()
         {
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 9b46bea2cb..8ec7e863b1 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -58,8 +58,12 @@ namespace osu.Game.Screens.Ranking.Statistics
                 return;
 
             int[] bins = new int[total_timing_distribution_bins];
+
             double binSize = Math.Ceiling(hitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins);
 
+            // Prevent div-by-0 by enforcing a minimum bin size
+            binSize = Math.Max(1, binSize);
+
             foreach (var e in hitEvents)
             {
                 int binOffset = (int)(e.TimeOffset / binSize);

From 6afd6efdeba5fe08b9598c9de1c089a162bcc467 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 20:33:08 +0900
Subject: [PATCH 03397/10326] Return default beatmap if local beatmap can't be
 retrieved

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

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 2cf3a21975..637833fb5d 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -240,6 +240,9 @@ namespace osu.Game.Beatmaps
                 beatmapInfo = QueryBeatmap(b => b.ID == info.ID);
             }
 
+            if (beatmapInfo == null)
+                return DefaultBeatmap;
+
             lock (workingCache)
             {
                 var working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == beatmapInfo.ID);

From a4eb6c81c5a90b15d298fe705cc0699c98da1772 Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Mon, 22 Jun 2020 13:40:31 +0200
Subject: [PATCH 03398/10326] undid changes to the file

---
 osu.Game/Screens/Play/Player.cs | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index d5e9c54e04..b6d87e658b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -5,11 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+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.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
@@ -78,9 +80,7 @@ namespace osu.Game.Screens.Play
         private IAPIProvider api { get; set; }
 
         private SampleChannel sampleRestart;
-
-        private SampleChannel samplePause;
-
+        
         public BreakOverlay BreakOverlay;
 
         private BreakTracker breakTracker;
@@ -164,10 +164,6 @@ namespace osu.Game.Screens.Play
 
             sampleRestart = audio.Samples.Get(@"Gameplay/restart");
 
-            samplePause = audio.Samples.Get(@"Gameplay/pause-loop");
-            if (samplePause != null)
-                samplePause.Looping = true;
-
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
@@ -414,7 +410,6 @@ namespace osu.Game.Screens.Play
                 Pause();
             else
             {
-                samplePause?.Stop();
                 this.Exit();
             }
         }
@@ -569,21 +564,20 @@ namespace osu.Game.Screens.Play
                 DrawableRuleset.CancelResume();
                 IsResuming = false;
             }
-
             GameplayClockContainer.Stop();
             PauseOverlay.Show();
             lastPauseActionTime = GameplayClockContainer.GameplayClock.CurrentTime;
-
-            samplePause?.Play();
+          
         }
 
         public void Resume()
         {
             if (!canResume) return;
 
+
             IsResuming = true;
             PauseOverlay.Hide();
-
+            
             // breaks and time-based conditions may allow instant resume.
             if (breakTracker.IsBreakTime.Value)
                 completeResume();
@@ -594,8 +588,6 @@ namespace osu.Game.Screens.Play
             {
                 GameplayClockContainer.Start();
                 IsResuming = false;
-
-                samplePause?.Stop();
             }
         }
 
@@ -672,7 +664,9 @@ namespace osu.Game.Screens.Play
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             GameplayClockContainer?.StopUsingBeatmapClock();
 
+
             fadeOut();
+
             return base.OnExiting(next);
         }
 
@@ -717,7 +711,12 @@ namespace osu.Game.Screens.Play
             Background.EnableUserDim.Value = false;
             storyboardReplacesBackground.Value = false;
         }
+        
 
         #endregion
+
     }
+
+
+
 }

From 983f0ada2da68527f5892ffd6ff0202c05d1d439 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 20:44:39 +0900
Subject: [PATCH 03399/10326] Increase number of points to ensure there's a
 centre

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

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index cba753e003..23539f3a12 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
         /// <summary>
         /// Number of rows/columns of points.
-        /// 4px per point @ 128x128 size (the contents of the <see cref="AccuracyHeatmap"/> are always square). 1024 total points.
+        /// ~4px per point @ 128x128 size (the contents of the <see cref="AccuracyHeatmap"/> are always square). 1089 total points.
         /// </summary>
-        private const int points_per_dimension = 32;
+        private const int points_per_dimension = 33;
 
         private const float rotation = 45;
 

From 1aec1ea53fc9566e384f03fd96e5e5af72f3a2be Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 20:45:44 +0900
Subject: [PATCH 03400/10326] Fix off-by-one causing auto to not be centred

---
 osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 23539f3a12..0d6d05292a 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
             var rotatedAngle = finalAngle - MathUtils.DegreesToRadians(rotation);
             var rotatedCoordinate = -1 * new Vector2((float)Math.Cos(rotatedAngle), (float)Math.Sin(rotatedAngle));
 
-            Vector2 localCentre = new Vector2(points_per_dimension) / 2;
+            Vector2 localCentre = new Vector2(points_per_dimension - 1) / 2;
             float localRadius = localCentre.X * inner_portion * normalisedDistance; // The radius inside the inner portion which of the heatmap which the closest point lies.
             Vector2 localPoint = localCentre + localRadius * rotatedCoordinate;
 

From beb6e6ea88af3dbf213808accea49d247e358ce8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 21:00:13 +0900
Subject: [PATCH 03401/10326] Buffer the accuracy heatmap for performance

---
 .../Statistics/AccuracyHeatmap.cs                 | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 0d6d05292a..6e1b6ef9b5 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
         private const float rotation = 45;
 
+        private BufferedContainer bufferedGrid;
         private GridContainer pointGrid;
 
         private readonly ScoreInfo score;
@@ -112,10 +113,16 @@ namespace osu.Game.Rulesets.Osu.Statistics
                             }
                         }
                     },
-                    pointGrid = new GridContainer
+                    bufferedGrid = new BufferedContainer
                     {
-                        RelativeSizeAxes = Axes.Both
-                    }
+                        RelativeSizeAxes = Axes.Both,
+                        CacheDrawnFrameBuffer = true,
+                        BackgroundColour = Color4Extensions.FromHex("#202624").Opacity(0),
+                        Child = pointGrid = new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    },
                 }
             };
 
@@ -198,6 +205,8 @@ namespace osu.Game.Rulesets.Osu.Statistics
             int c = Math.Clamp((int)Math.Round(localPoint.X), 0, points_per_dimension - 1);
 
             ((HitPoint)pointGrid.Content[r][c]).Increment();
+
+            bufferedGrid.ForceRedraw();
         }
 
         private class HitPoint : Circle

From b3e200ee7face7f246ef82ee56faba604a216740 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 21:00:35 +0900
Subject: [PATCH 03402/10326] Re-invert test

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneAccuracyHeatmap.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneAccuracyHeatmap.cs
index 49b469ba24..10d9d7ffde 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneAccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneAccuracyHeatmap.cs
@@ -39,12 +39,12 @@ namespace osu.Game.Rulesets.Osu.Tests
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4Extensions.FromHex("#333"),
                 },
-                object2 = new BorderCircle
+                object1 = new BorderCircle
                 {
                     Position = new Vector2(256, 192),
                     Colour = Color4.Yellow,
                 },
-                object1 = new BorderCircle
+                object2 = new BorderCircle
                 {
                     Position = new Vector2(100, 300),
                 },

From 9dea96e5fdff2a741af29b10948be6a65d63d634 Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Mon, 22 Jun 2020 14:02:21 +0200
Subject: [PATCH 03403/10326] added pause sound with fading

---
 osu.Game/Screens/Play/PauseOverlay.cs | 39 ++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 6cc6027a03..6cca0c47fd 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -3,9 +3,18 @@
 
 using System;
 using System.Linq;
+using System.Runtime.CompilerServices;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using NUnit.Framework.Internal;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Audio;
 using osu.Game.Graphics;
 using osuTK.Graphics;
+using osu.Framework.Logging;
+
 
 namespace osu.Game.Screens.Play
 {
@@ -16,14 +25,42 @@ namespace osu.Game.Screens.Play
         public override string Header => "paused";
         public override string Description => "you're not going to do what i think you're going to do, are ya?";
 
+        private DrawableSample pauseLoop;
+
         protected override Action BackAction => () => InternalButtons.Children.First().Click();
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, AudioManager audio)
         {
             AddButton("Continue", colours.Green, () => OnResume?.Invoke());
             AddButton("Retry", colours.YellowDark, () => OnRetry?.Invoke());
             AddButton("Quit", new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
+
+            var sampleChannel = audio.Samples.Get(@"Gameplay/pause-loop");
+            if (sampleChannel != null)
+            {
+                AddInternal(pauseLoop = new DrawableSample(sampleChannel)
+                {
+                    Looping = true,
+                });
+                pauseLoop?.VolumeTo(0.0f);
+                pauseLoop?.Play();
+            }
         }
+
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+            pauseLoop?.VolumeTo(1.0f, 400, Easing.InQuint);
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+            pauseLoop?.VolumeTo(0.0f);
+        }
+
+
     }
 }

From cb03e6faa9cf975719a8d3753ca063bb986ed8bb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 21:09:47 +0900
Subject: [PATCH 03404/10326] Improve visual display of arrow

---
 .../Statistics/AccuracyHeatmap.cs             | 53 +++++++++++--------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 6e1b6ef9b5..94d47ecb32 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -74,41 +74,52 @@ namespace osu.Game.Rulesets.Osu.Statistics
                     new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Masking = true,
                         Children = new Drawable[]
                         {
-                            new Box
+                            new Container
                             {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Y,
-                                Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
-                                Width = 1f,
-                                Rotation = -rotation,
-                                Alpha = 0.3f,
-                            },
-                            new Box
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Y,
-                                Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
-                                Width = 1f,
-                                Rotation = rotation
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding(1),
+                                Child = new Container
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Masking = true,
+                                    Children = new Drawable[]
+                                    {
+                                        new Box
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            RelativeSizeAxes = Axes.Y,
+                                            Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
+                                            Width = 1f,
+                                            Rotation = -rotation,
+                                            Alpha = 0.3f,
+                                        },
+                                        new Box
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            RelativeSizeAxes = Axes.Y,
+                                            Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
+                                            Width = 1f,
+                                            Rotation = rotation
+                                        },
+                                    }
+                                },
                             },
                             new Box
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
                                 Width = 10,
-                                Height = 2f,
+                                Height = 2,
                             },
                             new Box
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
-                                Y = -1,
-                                Width = 2f,
+                                Width = 2,
                                 Height = 10,
                             }
                         }

From f60a80b2635f4beb8d45f5a8432abbb2bf36e278 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Jun 2020 18:01:08 +0900
Subject: [PATCH 03405/10326] Fix animations and general code quality

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 73 +++++++++++----------------
 1 file changed, 29 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 92c844db8b..7714ec6ee1 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -69,63 +69,47 @@ namespace osu.Game.Screens.Menu
         private class WelcomeIntroSequence : Container
         {
             private Sprite welcomeText;
+            private Container scaleContainer;
 
             [BackgroundDependencyLoader]
             private void load(TextureStore textures)
             {
                 Origin = Anchor.Centre;
                 Anchor = Anchor.Centre;
+
                 Children = new Drawable[]
                 {
-                    new Container
+                    scaleContainer = new Container
                     {
+                        AutoSizeAxes = Axes.Both,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
-                            new Container
+                            new LogoVisualisation
                             {
-                                AutoSizeAxes = Axes.Both,
-                                Children = new Drawable[]
-                                {
-                                    new LogoVisualisation
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Anchor = Anchor.Centre,
-                                        Origin = Anchor.Centre,
-                                        Alpha = 0.5f,
-                                        AccentColour = Color4.DarkBlue,
-                                        Size = new Vector2(0.96f)
-                                    },
-                                    new Container
-                                    {
-                                        AutoSizeAxes = Axes.Both,
-                                        Children = new Drawable[]
-                                        {
-                                            new Circle
-                                            {
-                                                Anchor = Anchor.Centre,
-                                                Origin = Anchor.Centre,
-                                                Size = new Vector2(480),
-                                                Colour = Color4.Black
-                                            }
-                                        }
-                                    }
-                                }
-                            }
+                                RelativeSizeAxes = Axes.Both,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Alpha = 0.5f,
+                                AccentColour = Color4.DarkBlue,
+                                Size = new Vector2(0.96f)
+                            },
+                            new Circle
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Size = new Vector2(480),
+                                Colour = Color4.Black
+                            },
+                            welcomeText = new Sprite
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Texture = textures.Get(@"Intro/Welcome/welcome_text")
+                            },
                         }
                     },
-                    welcomeText = new Sprite
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.X,
-                        Scale = new Vector2(0.1f),
-                        Height = 156,
-                        Alpha = 0,
-                        Texture = textures.Get(@"Intro/Welcome/welcome_text")
-                    },
                 };
             }
 
@@ -135,9 +119,10 @@ namespace osu.Game.Screens.Menu
 
                 using (BeginDelayedSequence(0, true))
                 {
-                    welcomeText.ResizeHeightTo(welcomeText.Height * 2, 500, Easing.In);
-                    welcomeText.FadeIn(delay_step_two);
-                    welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.1f), delay_step_two, Easing.Out).OnComplete(_ => Expire());
+                    scaleContainer.ScaleTo(0.9f).ScaleTo(1, delay_step_two).OnComplete(_ => Expire());
+                    scaleContainer.FadeInFromZero(1800);
+
+                    welcomeText.ScaleTo(new Vector2(1, 0)).ScaleTo(Vector2.One, 400, Easing.Out);
                 }
             }
         }

From 836386d03ba0da92f7b625d3cc361110512d15a8 Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Mon, 22 Jun 2020 15:22:13 +0200
Subject: [PATCH 03406/10326] removed duplicate lines

---
 osu.Game/Screens/Play/PauseOverlay.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 6cca0c47fd..fc4e509c2c 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -14,7 +14,7 @@ using osu.Framework.Graphics.Audio;
 using osu.Game.Graphics;
 using osuTK.Graphics;
 using osu.Framework.Logging;
-
+using SharpCompress.Common;
 
 namespace osu.Game.Screens.Play
 {
@@ -43,7 +43,6 @@ namespace osu.Game.Screens.Play
                 {
                     Looping = true,
                 });
-                pauseLoop?.VolumeTo(0.0f);
                 pauseLoop?.Play();
             }
         }
@@ -58,7 +57,7 @@ namespace osu.Game.Screens.Play
         protected override void PopOut()
         {
             base.PopOut();
-            pauseLoop?.VolumeTo(0.0f);
+            pauseLoop.VolumeTo(0.0f);
         }
 
 

From 1bf00e0c820c8c391a0b7574b8cfc28ea0374c43 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Jun 2020 23:22:49 +0900
Subject: [PATCH 03407/10326] Schedule continuation

---
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 651cdc4b0f..77f3bd7b5c 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 Task.Run(() =>
                 {
                     playableBeatmap = beatmapManager.GetWorkingBeatmap(newScore.Beatmap).GetPlayableBeatmap(newScore.Ruleset, newScore.Mods ?? Array.Empty<Mod>());
-                }, loadCancellation.Token).ContinueWith(t =>
+                }, loadCancellation.Token).ContinueWith(t => Schedule(() =>
                 {
                     var rows = new FillFlowContainer
                     {
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                         spinner.Hide();
                         content.Add(d);
                     }, localCancellationSource.Token);
-                }, localCancellationSource.Token);
+                }), localCancellationSource.Token);
             }
         }
 

From 7a48ab1774cfaca8697f47806651ec6e3cd6c8ff Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Jun 2020 17:19:46 +0000
Subject: [PATCH 03408/10326] Bump ppy.osu.Game.Resources from 2020.602.0 to
 2020.622.1

Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2020.602.0 to 2020.622.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2020.602.0...2020.622.1)

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 119c309675..192be999eb 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.602.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.619.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index bec3bc9d39..911292c6ae 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.619.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
     <PackageReference Include="Sentry" Version="2.1.3" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index de5130b66a..18249b40ca 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.619.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From e827b14abf5212aa0809256b4830456acda994e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Jun 2020 16:40:05 +0200
Subject: [PATCH 03409/10326] Add LayeredHitSamples skin config lookup

---
 osu.Game/Skinning/GlobalSkinConfiguration.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/GlobalSkinConfiguration.cs b/osu.Game/Skinning/GlobalSkinConfiguration.cs
index 8774fe5a97..d405702ea5 100644
--- a/osu.Game/Skinning/GlobalSkinConfiguration.cs
+++ b/osu.Game/Skinning/GlobalSkinConfiguration.cs
@@ -5,6 +5,7 @@ namespace osu.Game.Skinning
 {
     public enum GlobalSkinConfiguration
     {
-        AnimationFramerate
+        AnimationFramerate,
+        LayeredHitSounds,
     }
 }

From c5049b51c5835ab6950d1f9244d0d355157439a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Jun 2020 16:43:21 +0200
Subject: [PATCH 03410/10326] Mark normal-hitnormal sample as layered

---
 .../Objects/Legacy/ConvertHitObjectParser.cs    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 9e936c7717..77075b2abe 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -12,6 +12,7 @@ using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps.Legacy;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {
@@ -356,7 +357,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
                     Bank = bankInfo.Normal,
                     Name = HitSampleInfo.HIT_NORMAL,
                     Volume = bankInfo.Volume,
-                    CustomSampleBank = bankInfo.CustomSampleBank
+                    CustomSampleBank = bankInfo.CustomSampleBank,
+                    // if the sound type doesn't have the Normal flag set, attach it anyway as a layered sample.
+                    // None also counts as a normal non-layered sample: https://osu.ppy.sh/help/wiki/osu!_File_Formats/Osu_(file_format)#hitsounds
+                    IsLayered = type != LegacyHitSoundType.None && !type.HasFlag(LegacyHitSoundType.Normal)
                 }
             };
 
@@ -409,7 +413,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             public SampleBankInfo Clone() => (SampleBankInfo)MemberwiseClone();
         }
 
-        internal class LegacyHitSampleInfo : HitSampleInfo
+        public class LegacyHitSampleInfo : HitSampleInfo
         {
             private int customSampleBank;
 
@@ -424,6 +428,15 @@ namespace osu.Game.Rulesets.Objects.Legacy
                         Suffix = value.ToString();
                 }
             }
+
+            /// <summary>
+            /// Whether this hit sample is layered.
+            /// </summary>
+            /// <remarks>
+            /// Layered hit samples are automatically added in all modes (except osu!mania), but can be disabled
+            /// using the <see cref="GlobalSkinConfiguration.LayeredHitSounds"/> skin config option.
+            /// </remarks>
+            public bool IsLayered { get; set; }
         }
 
         private class FileHitSampleInfo : LegacyHitSampleInfo

From c7d2ce12eb1cbf0cd6a8f5d1c72ac482d6ed62a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Jun 2020 18:52:15 +0200
Subject: [PATCH 03411/10326] Add failing test cases

---
 ...a-hitobject-beatmap-custom-sample-bank.osu | 10 ++++
 ...a-hitobject-beatmap-normal-sample-bank.osu | 10 ++++
 .../TestSceneManiaHitObjectSamples.cs         | 49 +++++++++++++++
 .../Gameplay/TestSceneHitObjectSamples.cs     | 60 +++++++++++++++++++
 .../hitobject-beatmap-custom-sample-bank.osu  |  7 +++
 .../Tests/Beatmaps/HitObjectSampleTest.cs     | 12 +++-
 6 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/SampleLookups/mania-hitobject-beatmap-custom-sample-bank.osu
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/SampleLookups/mania-hitobject-beatmap-normal-sample-bank.osu
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectSamples.cs
 create mode 100644 osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample-bank.osu

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/SampleLookups/mania-hitobject-beatmap-custom-sample-bank.osu b/osu.Game.Rulesets.Mania.Tests/Resources/SampleLookups/mania-hitobject-beatmap-custom-sample-bank.osu
new file mode 100644
index 0000000000..4f8e1b68dd
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/SampleLookups/mania-hitobject-beatmap-custom-sample-bank.osu
@@ -0,0 +1,10 @@
+osu file format v14
+
+[General]
+Mode: 3
+
+[TimingPoints]
+0,300,4,0,2,100,1,0
+
+[HitObjects]
+444,320,1000,5,2,0:0:0:0:
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/SampleLookups/mania-hitobject-beatmap-normal-sample-bank.osu b/osu.Game.Rulesets.Mania.Tests/Resources/SampleLookups/mania-hitobject-beatmap-normal-sample-bank.osu
new file mode 100644
index 0000000000..f22901e304
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/SampleLookups/mania-hitobject-beatmap-normal-sample-bank.osu
@@ -0,0 +1,10 @@
+osu file format v14
+
+[General]
+Mode: 3
+
+[TimingPoints]
+0,300,4,0,2,100,1,0
+
+[HitObjects]
+444,320,1000,5,1,0:0:0:0:
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectSamples.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectSamples.cs
new file mode 100644
index 0000000000..0d726e1a50
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectSamples.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 System.Reflection;
+using NUnit.Framework;
+using osu.Framework.IO.Stores;
+using osu.Game.Tests.Beatmaps;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public class TestSceneManiaHitObjectSamples : HitObjectSampleTest
+    {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+        protected override IResourceStore<byte[]> Resources => new DllResourceStore(Assembly.GetAssembly(typeof(TestSceneManiaHitObjectSamples)));
+
+        /// <summary>
+        /// Tests that when a normal sample bank is used, the normal hitsound will be looked up.
+        /// </summary>
+        [Test]
+        public void TestManiaHitObjectNormalSampleBank()
+        {
+            const string expected_sample = "normal-hitnormal2";
+
+            SetupSkins(expected_sample, expected_sample);
+
+            CreateTestWithBeatmap("mania-hitobject-beatmap-normal-sample-bank.osu");
+
+            AssertBeatmapLookup(expected_sample);
+        }
+
+        /// <summary>
+        /// Tests that when a custom sample bank is used, layered hitsounds are not played
+        /// (only the sample from the custom bank is looked up).
+        /// </summary>
+        [Test]
+        public void TestManiaHitObjectCustomSampleBank()
+        {
+            const string expected_sample = "normal-hitwhistle2";
+            const string unwanted_sample = "normal-hitnormal2";
+
+            SetupSkins(expected_sample, unwanted_sample);
+
+            CreateTestWithBeatmap("mania-hitobject-beatmap-custom-sample-bank.osu");
+
+            AssertBeatmapLookup(expected_sample);
+            AssertNoLookup(unwanted_sample);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index ef6efb7fec..737946e1e0 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -6,6 +6,7 @@ using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
 
@@ -167,5 +168,64 @@ namespace osu.Game.Tests.Gameplay
 
             AssertBeatmapLookup(expected_sample);
         }
+
+        /// <summary>
+        /// Tests that when a custom sample bank is used, both the normal and additional sounds will be looked up.
+        /// </summary>
+        [Test]
+        public void TestHitObjectCustomSampleBank()
+        {
+            string[] expectedSamples =
+            {
+                "normal-hitnormal2",
+                "normal-hitwhistle2"
+            };
+
+            SetupSkins(expectedSamples[0], expectedSamples[1]);
+
+            CreateTestWithBeatmap("hitobject-beatmap-custom-sample-bank.osu");
+
+            AssertBeatmapLookup(expectedSamples[0]);
+            AssertUserLookup(expectedSamples[1]);
+        }
+
+        /// <summary>
+        /// Tests that when a custom sample bank is used, but <see cref="GlobalSkinConfiguration.LayeredHitSounds"/> is disabled,
+        /// only the additional sound will be looked up.
+        /// </summary>
+        [Test]
+        public void TestHitObjectCustomSampleBankWithoutLayered()
+        {
+            const string expected_sample = "normal-hitwhistle2";
+            const string unwanted_sample = "normal-hitnormal2";
+
+            SetupSkins(expected_sample, unwanted_sample);
+            disableLayeredHitSounds();
+
+            CreateTestWithBeatmap("hitobject-beatmap-custom-sample-bank.osu");
+
+            AssertBeatmapLookup(expected_sample);
+            AssertNoLookup(unwanted_sample);
+        }
+
+        /// <summary>
+        /// Tests that when a normal sample bank is used and <see cref="GlobalSkinConfiguration.LayeredHitSounds"/> is disabled,
+        /// the normal sound will be looked up anyway.
+        /// </summary>
+        [Test]
+        public void TestHitObjectNormalSampleBankWithoutLayered()
+        {
+            const string expected_sample = "normal-hitnormal";
+
+            SetupSkins(expected_sample, expected_sample);
+            disableLayeredHitSounds();
+
+            CreateTestWithBeatmap("hitobject-beatmap-sample.osu");
+
+            AssertBeatmapLookup(expected_sample);
+        }
+
+        private void disableLayeredHitSounds()
+            => AddStep("set LayeredHitSounds to false", () => Skin.Configuration.ConfigDictionary[GlobalSkinConfiguration.LayeredHitSounds.ToString()] = "0");
     }
 }
diff --git a/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample-bank.osu b/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample-bank.osu
new file mode 100644
index 0000000000..c50c921839
--- /dev/null
+++ b/osu.Game.Tests/Resources/SampleLookups/hitobject-beatmap-custom-sample-bank.osu
@@ -0,0 +1,7 @@
+osu file format v14
+
+[TimingPoints]
+0,300,4,0,2,100,1,0
+
+[HitObjects]
+444,320,1000,5,2,0:0:0:0:
diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index b4ce322165..ab4fb38657 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -24,6 +24,10 @@ namespace osu.Game.Tests.Beatmaps
     public abstract class HitObjectSampleTest : PlayerTestScene
     {
         protected abstract IResourceStore<byte[]> Resources { get; }
+        protected LegacySkin Skin { get; private set; }
+
+        [Resolved]
+        private RulesetStore rulesetStore { get; set; }
 
         private readonly SkinInfo userSkinInfo = new SkinInfo();
 
@@ -64,6 +68,9 @@ namespace osu.Game.Tests.Beatmaps
                 {
                     using (var reader = new LineBufferedReader(Resources.GetStream($"Resources/SampleLookups/{filename}")))
                         currentTestBeatmap = Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
+
+                    // populate ruleset for beatmap converters that require it to be present.
+                    currentTestBeatmap.BeatmapInfo.Ruleset = rulesetStore.GetRuleset(currentTestBeatmap.BeatmapInfo.RulesetID);
                 });
             });
         }
@@ -91,7 +98,7 @@ namespace osu.Game.Tests.Beatmaps
                 };
 
                 // Need to refresh the cached skin source to refresh the skin resource store.
-                dependencies.SkinSource = new SkinProvidingContainer(new LegacySkin(userSkinInfo, userSkinResourceStore, Audio));
+                dependencies.SkinSource = new SkinProvidingContainer(Skin = new LegacySkin(userSkinInfo, userSkinResourceStore, Audio));
             });
         }
 
@@ -101,6 +108,9 @@ namespace osu.Game.Tests.Beatmaps
         protected void AssertUserLookup(string name) => AddAssert($"\"{name}\" looked up from user skin",
             () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && userSkinResourceStore.PerformedLookups.Contains(name));
 
+        protected void AssertNoLookup(string name) => AddAssert($"\"{name}\" not looked up",
+            () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && !userSkinResourceStore.PerformedLookups.Contains(name));
+
         private class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
         {
             public ISkinSource SkinSource;

From 8233f5fbc4e532cedc6a02b54d453ab106f5bf64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Jun 2020 22:44:35 +0200
Subject: [PATCH 03412/10326] Check skin option in skin transformers

---
 .../Skinning/ManiaLegacySkinTransformer.cs          | 12 ++++++++++++
 osu.Game/Skinning/LegacySkinTransformer.cs          | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 84e88a10be..e167135556 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -9,6 +9,9 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
 using System.Collections.Generic;
+using osu.Framework.Audio.Sample;
+using osu.Game.Audio;
+using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
@@ -129,6 +132,15 @@ namespace osu.Game.Rulesets.Mania.Skinning
             return this.GetAnimation(filename, true, true);
         }
 
+        public override SampleChannel GetSample(ISampleInfo sampleInfo)
+        {
+            // layered hit sounds never play in mania
+            if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample && legacySample.IsLayered)
+                return new SampleChannelVirtual();
+
+            return Source.GetSample(sampleInfo);
+        }
+
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             if (lookup is ManiaSkinConfigurationLookup maniaLookup)
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index 1131c93288..94a7a32f05 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Skinning
 {
@@ -28,7 +29,17 @@ namespace osu.Game.Skinning
 
         public Texture GetTexture(string componentName) => Source.GetTexture(componentName);
 
-        public virtual SampleChannel GetSample(ISampleInfo sampleInfo) => Source.GetSample(sampleInfo);
+        public virtual SampleChannel GetSample(ISampleInfo sampleInfo)
+        {
+            if (!(sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample))
+                return Source.GetSample(sampleInfo);
+
+            var playLayeredHitSounds = GetConfig<GlobalSkinConfiguration, bool>(GlobalSkinConfiguration.LayeredHitSounds);
+            if (legacySample.IsLayered && playLayeredHitSounds?.Value == false)
+                return new SampleChannelVirtual();
+
+            return Source.GetSample(sampleInfo);
+        }
 
         public abstract IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
     }

From a2a2bf4f787fbecb798074e90aed86ae5a8197bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 10:05:28 +0900
Subject: [PATCH 03413/10326] Don't activate run tool window on rider run

---
 .../.idea/runConfigurations/CatchRuleset__Tests_.xml      | 6 +++---
 .../.idea/runConfigurations/ManiaRuleset__Tests_.xml      | 6 +++---
 .../.idea/runConfigurations/OsuRuleset__Tests_.xml        | 6 +++---
 .../.idea/runConfigurations/TaikoRuleset__Tests_.xml      | 6 +++---
 .../.idea/runConfigurations/Tournament.xml                | 6 +++---
 .../.idea/runConfigurations/Tournament__Tests_.xml        | 6 +++---
 .idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml  | 6 +++---
 .../.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml | 8 ++++----
 .../.idea/runConfigurations/osu___Tests_.xml              | 6 +++---
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
index a4154623b6..512ac4393a 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="CatchRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset">
+  <configuration default="false" name="CatchRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Catch.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -15,7 +15,7 @@
     <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
     <browser url="http://localhost:5000" />
     <method v="2">
-      <option name="Build" enabled="true" />
+      <option name="Build" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
index 080dc04001..dec1ef717f 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ManiaRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset">
+  <configuration default="false" name="ManiaRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Mania.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -15,7 +15,7 @@
     <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
     <browser url="http://localhost:5000" />
     <method v="2">
-      <option name="Build" enabled="true" />
+      <option name="Build" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
index 3de6a7e609..d9370d5440 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OsuRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset">
+  <configuration default="false" name="OsuRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Osu.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -15,7 +15,7 @@
     <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
     <browser url="http://localhost:5000" />
     <method v="2">
-      <option name="Build" enabled="true" />
+      <option name="Build" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
index da14c2a29e..def4940bb1 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TaikoRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset">
+  <configuration default="false" name="TaikoRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Taiko.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -15,7 +15,7 @@
     <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
     <browser url="http://localhost:5000" />
     <method v="2">
-      <option name="Build" enabled="true" />
+      <option name="Build" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
index 45d1ce25e9..1ffa73c257 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Tournament" type="DotNetProject" factoryName=".NET Project" folderName="Tournament">
+  <configuration default="false" name="Tournament" type="DotNetProject" factoryName=".NET Project" folderName="Tournament" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="--tournament" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -14,7 +14,7 @@
     <option name="PROJECT_KIND" value="DotNetCore" />
     <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
     <method v="2">
-      <option name="Build" enabled="true" />
+      <option name="Build" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
index ba80f7c100..e64da796b7 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Tournament (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Tournament">
+  <configuration default="false" name="Tournament (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Tournament" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tournament.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tournament.Tests" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -15,7 +15,7 @@
     <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
     <browser url="http://localhost:5000" />
     <method v="2">
-      <option name="Build" enabled="true" />
+      <option name="Build" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
index 911c3ed9b7..22105e1de2 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu!" type="DotNetProject" factoryName=".NET Project" folderName="osu!">
+  <configuration default="false" name="osu!" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -14,7 +14,7 @@
     <option name="PROJECT_KIND" value="DotNetCore" />
     <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
     <method v="2">
-      <option name="Build" enabled="true" />
+      <option name="Build" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml
index d85a0ae44c..31f1fda09d 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu! SDL" type="DotNetProject" factoryName=".NET Project" folderName="osu!">
+  <configuration default="false" name="osu! SDL" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="--sdl" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.0" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
     <method v="2">
-      <option name="Build" enabled="true" />
+      <option name="Build" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
index ec3c81f4cd..cc243f6901 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu! (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="osu!">
+  <configuration default="false" name="osu! (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -14,7 +14,7 @@
     <option name="PROJECT_KIND" value="DotNetCore" />
     <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
     <method v="2">
-      <option name="Build" enabled="true" />
+      <option name="Build" />
     </method>
   </configuration>
 </component>
\ No newline at end of file

From b289beca53e68647d1fd38f57d0a15e94edbaa41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 13:33:33 +0900
Subject: [PATCH 03414/10326] Fix samples being played too early

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 33 +++++++++++++++------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 7714ec6ee1..7ab74cbf22 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -39,24 +39,27 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
-                welcome?.Play();
-                pianoReverb?.Play();
-
-                Scheduler.AddDelayed(() =>
-                {
-                    StartTrack();
-                    PrepareMenuLoad();
-
-                    logo.ScaleTo(1);
-                    logo.FadeIn();
-
-                    Scheduler.Add(LoadMenu);
-                }, delay_step_two);
-
                 LoadComponentAsync(new WelcomeIntroSequence
                 {
                     RelativeSizeAxes = Axes.Both
-                }, AddInternal);
+                }, intro =>
+                {
+                    AddInternal(intro);
+
+                    welcome?.Play();
+                    pianoReverb?.Play();
+
+                    Scheduler.AddDelayed(() =>
+                    {
+                        StartTrack();
+                        PrepareMenuLoad();
+
+                        logo.ScaleTo(1);
+                        logo.FadeIn();
+
+                        Scheduler.Add(LoadMenu);
+                    }, delay_step_two);
+                });
             }
         }
 

From 4554a7db3362d3e477cbbaee424c7b490578efb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 13:49:18 +0900
Subject: [PATCH 03415/10326] Update naming

---
 .../Objects/Drawables/Pieces/ReverseArrowPiece.cs         | 2 +-
 .../Objects/Drawables/Pieces/CirclePiece.cs               | 4 ++--
 .../Skinning/TaikoLegacyPlayfieldBackgroundRight.cs       | 2 +-
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs         | 2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs        | 2 +-
 .../Visual/UserInterface/TestSceneBeatSyncedContainer.cs  | 2 +-
 osu.Game/Graphics/Containers/BeatSyncedContainer.cs       | 8 ++++----
 osu.Game/Graphics/UserInterface/OsuTextBox.cs             | 2 +-
 osu.Game/Graphics/UserInterface/TwoLayerButton.cs         | 2 +-
 osu.Game/Rulesets/Mods/ModNightcore.cs                    | 2 +-
 osu.Game/Screens/Menu/Button.cs                           | 4 ++--
 osu.Game/Screens/Menu/MenuSideFlashes.cs                  | 6 +++---
 osu.Game/Screens/Menu/OsuLogo.cs                          | 2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
index 1a5195acf8..ae43006e76 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             };
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             if (!drawableRepeat.IsHit)
                 Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
index b5471e6976..f515a35c18 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.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.Audio.Track;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -8,7 +9,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Backgrounds;
 using osuTK.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Effects;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -148,7 +148,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
             };
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             if (!effectPoint.KiaiMode)
                 return;
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs
index 7508c75231..4bbb6be6b1 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             };
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index 407ab30e12..b937beae3c 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             lastObjectHit = result.IsHit;
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             kiaiMode = effectPoint.KiaiMode;
         }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
index cce2be7758..6f25a5f662 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             textureAnimation.Seek(0);
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             // assume that if the animation is playing on its own, it's independent from the beat and doesn't need to be touched.
             if (textureAnimation.FrameCount == 0 || textureAnimation.IsPlaying)
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
index 4c32e995e8..dd5ceec739 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 timeSinceLastBeat.Value = TimeSinceLastBeat;
             }
 
-            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
             {
                 base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index 5a613d1a54..c37fcc043d 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Graphics.Containers
         private TimingControlPoint lastTimingPoint;
 
         /// <summary>
-        /// The amount of time before a beat we should fire <see cref="OnNewBeat(int, TimingControlPoint, EffectControlPoint, TrackAmplitudes)"/>.
+        /// The amount of time before a beat we should fire <see cref="OnNewBeat(int, TimingControlPoint, EffectControlPoint, ChannelAmplitudes)"/>.
         /// This allows for adding easing to animations that may be synchronised to the beat.
         /// </summary>
         protected double EarlyActivationMilliseconds;
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers
 
         private TimingControlPoint defaultTiming;
         private EffectControlPoint defaultEffect;
-        private TrackAmplitudes defaultAmplitudes;
+        private ChannelAmplitudes defaultAmplitudes;
 
         protected bool IsBeatSyncedWithTrack { get; private set; }
 
@@ -129,7 +129,7 @@ namespace osu.Game.Graphics.Containers
                 OmitFirstBarLine = false
             };
 
-            defaultAmplitudes = new TrackAmplitudes
+            defaultAmplitudes = new ChannelAmplitudes
             {
                 FrequencyAmplitudes = new float[256],
                 LeftChannel = 0,
@@ -137,7 +137,7 @@ namespace osu.Game.Graphics.Containers
             };
         }
 
-        protected virtual void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected virtual void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
         }
     }
diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 6f440d8138..06c46fbb91 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Graphics.UserInterface
                     };
                 }
 
-                protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+                protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
                 {
                     if (!hasSelection)
                         this.FadeTo(0.7f).FadeTo(0.4f, timingPoint.BeatLength, Easing.InOutSine);
diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
index aa96796cf1..120149d8c1 100644
--- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
+++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
@@ -230,7 +230,7 @@ namespace osu.Game.Graphics.UserInterface
                 };
             }
 
-            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
             {
                 base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 1df2aeb348..ed8eb2fb66 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Mods
 
             private const int bars_per_segment = 4;
 
-            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
             {
                 base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs
index 6708ce0ba0..be6ed9700c 100644
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@@ -6,6 +6,7 @@ using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -15,7 +16,6 @@ using osuTK.Graphics;
 using osuTK.Input;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Graphics.Containers;
-using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
@@ -132,7 +132,7 @@ namespace osu.Game.Screens.Menu
 
         private bool rightward;
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
diff --git a/osu.Game/Screens/Menu/MenuSideFlashes.cs b/osu.Game/Screens/Menu/MenuSideFlashes.cs
index 321381ac8d..2ff8132d47 100644
--- a/osu.Game/Screens/Menu/MenuSideFlashes.cs
+++ b/osu.Game/Screens/Menu/MenuSideFlashes.cs
@@ -3,7 +3,6 @@
 
 using osuTK.Graphics;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -16,6 +15,7 @@ using osu.Game.Skinning;
 using osu.Game.Online.API;
 using osu.Game.Users;
 using System;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 
 namespace osu.Game.Screens.Menu
@@ -89,7 +89,7 @@ namespace osu.Game.Screens.Menu
             skin.BindValueChanged(_ => updateColour(), true);
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             if (beatIndex < 0)
                 return;
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Menu
                 flash(rightBox, timingPoint.BeatLength, effectPoint.KiaiMode, amplitudes);
         }
 
-        private void flash(Drawable d, double beatLength, bool kiai, TrackAmplitudes amplitudes)
+        private void flash(Drawable d, double beatLength, bool kiai, ChannelAmplitudes amplitudes)
         {
             d.FadeTo(Math.Max(0, ((ReferenceEquals(d, leftBox) ? amplitudes.LeftChannel : amplitudes.RightChannel) - amplitude_dead_zone) / (kiai ? kiai_multiplier : alpha_multiplier)), box_fade_in_time)
              .Then()
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 9cadfd7df6..089906c342 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -264,7 +264,7 @@ namespace osu.Game.Screens.Menu
 
         private int lastBeatIndex;
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 

From 49d3511063a14ad024ff8bb9da2932b08ca8fdd1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 13:55:44 +0900
Subject: [PATCH 03416/10326] Read amplitudes from piano reverb source

---
 osu.Game/Screens/Menu/IntroWelcome.cs      |  6 ++-
 osu.Game/Screens/Menu/LogoVisualisation.cs | 59 ++++++++++++++++------
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 7ab74cbf22..81e473dc04 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Screens.Menu
                     RelativeSizeAxes = Axes.Both
                 }, intro =>
                 {
+                    intro.LogoVisualisation.AddAmplitudeSource(pianoReverb);
+
                     AddInternal(intro);
 
                     welcome?.Play();
@@ -74,6 +76,8 @@ namespace osu.Game.Screens.Menu
             private Sprite welcomeText;
             private Container scaleContainer;
 
+            public LogoVisualisation LogoVisualisation { get; private set; }
+
             [BackgroundDependencyLoader]
             private void load(TextureStore textures)
             {
@@ -89,7 +93,7 @@ namespace osu.Game.Screens.Menu
                         Origin = Anchor.Centre,
                         Children = new Drawable[]
                         {
-                            new LogoVisualisation
+                            LogoVisualisation = new LogoVisualisation
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Anchor = Anchor.Centre,
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 6a28740d4e..dcbfe15210 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -13,7 +13,10 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Utils;
 
@@ -65,6 +68,11 @@ namespace osu.Game.Screens.Menu
 
         public Color4 AccentColour { get; set; }
 
+        /// <summary>
+        /// The relative movement of bars based on input amplification. Defaults to 1.
+        /// </summary>
+        public float Magnitude { get; set; } = 1;
+
         private readonly float[] frequencyAmplitudes = new float[256];
 
         private IShader shader;
@@ -76,6 +84,13 @@ namespace osu.Game.Screens.Menu
             Blending = BlendingParameters.Additive;
         }
 
+        private readonly List<IHasAmplitudes> amplitudeSources = new List<IHasAmplitudes>();
+
+        public void AddAmplitudeSource(IHasAmplitudes amplitudeSource)
+        {
+            amplitudeSources.Add(amplitudeSource);
+        }
+
         [BackgroundDependencyLoader]
         private void load(ShaderManager shaders, IBindable<WorkingBeatmap> beatmap)
         {
@@ -83,27 +98,28 @@ namespace osu.Game.Screens.Menu
             shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
         }
 
+        private readonly float[] temporalAmplitudes = new float[256];
+
         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.TrackLoaded
+                ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(beatmap.Value.Track.CurrentTime)
+                : null;
 
-            float[] temporalAmplitudes = track?.CurrentAmplitudes.FrequencyAmplitudes;
+            for (int i = 0; i < temporalAmplitudes.Length; i++)
+                temporalAmplitudes[i] = 0;
+
+            if (beatmap.Value.TrackLoaded)
+                addAmplitudesFromSource(beatmap.Value.Track);
+
+            foreach (var source in amplitudeSources)
+                addAmplitudesFromSource(source);
 
             for (int i = 0; i < bars_per_visualiser; i++)
             {
-                if (track?.IsRunning ?? false)
-                {
-                    float targetAmplitude = (temporalAmplitudes?[(i + indexOffset) % bars_per_visualiser] ?? 0) * (effect?.KiaiMode == true ? 1 : 0.5f);
-                    if (targetAmplitude > frequencyAmplitudes[i])
-                        frequencyAmplitudes[i] = targetAmplitude;
-                }
-                else
-                {
-                    int index = (i + index_change) % bars_per_visualiser;
-                    if (frequencyAmplitudes[index] > frequencyAmplitudes[i])
-                        frequencyAmplitudes[i] = frequencyAmplitudes[index];
-                }
+                float targetAmplitude = Magnitude * (temporalAmplitudes[(i + indexOffset) % bars_per_visualiser]) * (effect?.KiaiMode == true ? 1 : 0.5f);
+                if (targetAmplitude > frequencyAmplitudes[i])
+                    frequencyAmplitudes[i] = targetAmplitude;
             }
 
             indexOffset = (indexOffset + index_change) % bars_per_visualiser;
@@ -136,6 +152,19 @@ namespace osu.Game.Screens.Menu
 
         protected override DrawNode CreateDrawNode() => new VisualisationDrawNode(this);
 
+        private void addAmplitudesFromSource([NotNull] IHasAmplitudes source)
+        {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+
+            var amplitudes = source.CurrentAmplitudes.FrequencyAmplitudes;
+
+            for (int i = 0; i < amplitudes.Length; i++)
+            {
+                if (i < temporalAmplitudes.Length)
+                    temporalAmplitudes[i] += amplitudes[i];
+            }
+        }
+
         private class VisualisationDrawNode : DrawNode
         {
             protected new LogoVisualisation Source => (LogoVisualisation)base.Source;

From 6d19fd936ef5e05fd0e95fc4aa12417e29d3f36c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 15:13:30 +0900
Subject: [PATCH 03417/10326] Change test scene to not inherit unused
 ScreenTestScene

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

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index ac364b5233..f5c5a4d75c 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -25,7 +25,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.Ranking
 {
     [TestFixture]
-    public class TestSceneResultsScreen : ScreenTestScene
+    public class TestSceneResultsScreen : OsuManualInputManagerTestScene
     {
         private BeatmapManager beatmaps;
 

From 6bcc693c2f8fc80649e5af944bf87c1e8c946145 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 15:21:23 +0900
Subject: [PATCH 03418/10326] Add ability to close statistics by clicking
 anywhere

---
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 40 +++++++++++++++++++
 .../Ranking/Statistics/StatisticsPanel.cs     |  7 ++++
 2 files changed, 47 insertions(+)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index f5c5a4d75c..74808bc2f5 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -20,6 +20,7 @@ using osu.Game.Screens;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Ranking.Statistics;
+using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Ranking
@@ -87,6 +88,45 @@ namespace osu.Game.Tests.Visual.Ranking
             AddAssert("retry overlay present", () => screen.RetryOverlay != null);
         }
 
+        [Test]
+        public void TestShowHideStatisticsViaOutsideClick()
+        {
+            TestResultsScreen screen = null;
+
+            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
+            AddUntilStep("wait for loaded", () => screen.IsLoaded);
+
+            AddStep("click expanded panel", () =>
+            {
+                var expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+                InputManager.MoveMouseTo(expandedPanel);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("statistics shown", () => this.ChildrenOfType<StatisticsPanel>().Single().State.Value == Visibility.Visible);
+
+            AddUntilStep("expanded panel at the left of the screen", () =>
+            {
+                var expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+                return expandedPanel.ScreenSpaceDrawQuad.TopLeft.X - screen.ScreenSpaceDrawQuad.TopLeft.X < 150;
+            });
+
+            AddStep("click to right of panel", () =>
+            {
+                var expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+                InputManager.MoveMouseTo(expandedPanel.ScreenSpaceDrawQuad.TopRight + new Vector2(100, 0));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("statistics hidden", () => this.ChildrenOfType<StatisticsPanel>().Single().State.Value == Visibility.Hidden);
+
+            AddUntilStep("expanded panel in centre of screen", () =>
+            {
+                var expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+                return Precision.AlmostEquals(expandedPanel.ScreenSpaceDrawQuad.Centre.X, screen.ScreenSpaceDrawQuad.Centre.X, 1);
+            });
+        }
+
         [Test]
         public void TestShowHideStatistics()
         {
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 77f3bd7b5c..7f406331cd 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -9,6 +9,7 @@ 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.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Placeholders;
@@ -129,6 +130,12 @@ namespace osu.Game.Screens.Ranking.Statistics
             }
         }
 
+        protected override bool OnClick(ClickEvent e)
+        {
+            ToggleVisibility();
+            return true;
+        }
+
         protected override void PopIn() => this.FadeIn(150, Easing.OutQuint);
 
         protected override void PopOut() => this.FadeOut(150, Easing.OutQuint);

From a6c6e391caaa93f2c024fb5832b4db90ff4c95e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 17:38:30 +0900
Subject: [PATCH 03419/10326] Fix player not exiting immediately on Alt-F4

---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 4 +---
 osu.Game/Screens/Play/Player.cs                  | 6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 387ac42f67..1961a224c1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -174,9 +174,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestExitFromGameplay()
         {
-            AddStep("exit", () => Player.Exit());
-            confirmPaused();
-
+            // an externally triggered exit should immediately exit, skipping all pause logic.
             AddStep("exit", () => Player.Exit());
             confirmExited();
         }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index d3b88e56ae..541275cf55 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -656,12 +656,6 @@ namespace osu.Game.Screens.Play
                     return true;
             }
 
-            if (canPause)
-            {
-                Pause();
-                return true;
-            }
-
             // GameplayClockContainer performs seeks / start / stop operations on the beatmap's track.
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             GameplayClockContainer?.StopUsingBeatmapClock();

From 53d542546e1ae25edbf4afe3e777eee2b5038a92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 18:04:50 +0900
Subject: [PATCH 03420/10326] Fix editor drag selection not continuing to
 select unless the mouse is moved

---
 .../Edit/Compose/Components/DragBox.cs        | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
index c5f1bd1575..0615ebfc20 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
@@ -53,6 +53,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         };
 
+        private RectangleF? dragRectangle;
+
         /// <summary>
         /// Handle a forwarded mouse event.
         /// </summary>
@@ -66,15 +68,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             var dragQuad = new Quad(dragStartPosition.X, dragStartPosition.Y, dragPosition.X - dragStartPosition.X, dragPosition.Y - dragStartPosition.Y);
 
             // We use AABBFloat instead of RectangleF since it handles negative sizes for us
-            var dragRectangle = dragQuad.AABBFloat;
+            var rec = dragQuad.AABBFloat;
+            dragRectangle = rec;
 
-            var topLeft = ToLocalSpace(dragRectangle.TopLeft);
-            var bottomRight = ToLocalSpace(dragRectangle.BottomRight);
+            var topLeft = ToLocalSpace(rec.TopLeft);
+            var bottomRight = ToLocalSpace(rec.BottomRight);
 
             Box.Position = topLeft;
             Box.Size = bottomRight - topLeft;
-
-            PerformSelection?.Invoke(dragRectangle);
             return true;
         }
 
@@ -93,7 +94,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        public override void Hide() => State = Visibility.Hidden;
+        protected override void Update()
+        {
+            base.Update();
+
+            if (dragRectangle != null)
+                PerformSelection?.Invoke(dragRectangle.Value);
+        }
+
+        public override void Hide()
+        {
+            State = Visibility.Hidden;
+            dragRectangle = null;
+        }
 
         public override void Show() => State = Visibility.Visible;
 

From a5eac716ec8bc3ae84da15aaca17457a78fcbf1b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 18:42:56 +0900
Subject: [PATCH 03421/10326] Make work for all editors based on track running
 state

---
 .../Compose/Components/BlueprintContainer.cs  | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index cc417bbb10..4aa235ba50 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 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.Drawables;
@@ -320,10 +321,22 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             foreach (var blueprint in SelectionBlueprints)
             {
-                if (blueprint.IsAlive && blueprint.IsPresent && rect.Contains(blueprint.ScreenSpaceSelectionPoint))
-                    blueprint.Select();
-                else
-                    blueprint.Deselect();
+                // only run when utmost necessary to avoid unnecessary rect computations.
+                bool isValidForSelection() => blueprint.IsAlive && blueprint.IsPresent && rect.Contains(blueprint.ScreenSpaceSelectionPoint);
+
+                switch (blueprint.State)
+                {
+                    case SelectionState.NotSelected:
+                        if (isValidForSelection())
+                            blueprint.Select();
+                        break;
+
+                    case SelectionState.Selected:
+                        // if the editor is playing, we generally don't want to deselect objects even if outside the selection area.
+                        if (!editorClock.IsRunning && !isValidForSelection())
+                            blueprint.Deselect();
+                        break;
+                }
             }
         }
 

From 624ad65806da84f82078cc188bc80c2feb4d0d54 Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Tue, 23 Jun 2020 13:09:24 +0200
Subject: [PATCH 03422/10326] formating

---
 osu.Game/Screens/Play/PauseOverlay.cs | 17 +++++------------
 osu.Game/Screens/Play/Player.cs       | 18 +++---------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index fc4e509c2c..191bf0d901 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -3,18 +3,12 @@
 
 using System;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using NUnit.Framework.Internal;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
 using osu.Game.Graphics;
 using osuTK.Graphics;
-using osu.Framework.Logging;
-using SharpCompress.Common;
 
 namespace osu.Game.Screens.Play
 {
@@ -37,17 +31,18 @@ namespace osu.Game.Screens.Play
             AddButton("Quit", new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
 
             var sampleChannel = audio.Samples.Get(@"Gameplay/pause-loop");
+
             if (sampleChannel != null)
             {
-                AddInternal(pauseLoop = new DrawableSample(sampleChannel)
+                pauseLoop = new DrawableSample(sampleChannel)
                 {
                     Looping = true,
-                });
+                };
+                AddInternal(pauseLoop);
                 pauseLoop?.Play();
             }
         }
 
-
         protected override void PopIn()
         {
             base.PopIn();
@@ -57,9 +52,7 @@ namespace osu.Game.Screens.Play
         protected override void PopOut()
         {
             base.PopOut();
-            pauseLoop.VolumeTo(0.0f);
+            pauseLoop?.VolumeTo(0.0f);
         }
-
-
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ce790e1315..d3b88e56ae 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -5,13 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-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.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
@@ -80,7 +78,7 @@ namespace osu.Game.Screens.Play
         private IAPIProvider api { get; set; }
 
         private SampleChannel sampleRestart;
-        
+
         public BreakOverlay BreakOverlay;
 
         private BreakTracker breakTracker;
@@ -412,9 +410,7 @@ namespace osu.Game.Screens.Play
             if (canPause)
                 Pause();
             else
-            {
                 this.Exit();
-            }
         }
 
         /// <summary>
@@ -567,20 +563,19 @@ namespace osu.Game.Screens.Play
                 DrawableRuleset.CancelResume();
                 IsResuming = false;
             }
+
             GameplayClockContainer.Stop();
             PauseOverlay.Show();
             lastPauseActionTime = GameplayClockContainer.GameplayClock.CurrentTime;
-          
         }
 
         public void Resume()
         {
             if (!canResume) return;
 
-
             IsResuming = true;
             PauseOverlay.Hide();
-            
+
             // breaks and time-based conditions may allow instant resume.
             if (breakTracker.IsBreakTime.Value)
                 completeResume();
@@ -671,9 +666,7 @@ namespace osu.Game.Screens.Play
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             GameplayClockContainer?.StopUsingBeatmapClock();
 
-
             fadeOut();
-
             return base.OnExiting(next);
         }
 
@@ -718,12 +711,7 @@ namespace osu.Game.Screens.Play
             Background.EnableUserDim.Value = false;
             storyboardReplacesBackground.Value = false;
         }
-        
 
         #endregion
-
     }
-
-
-
 }

From e7238e25f96de3c9de8c622d3026a04d34039cc8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 23 Jun 2020 20:36:09 +0900
Subject: [PATCH 03423/10326] Fix exception when dragging after deleting object

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index cc417bbb10..767f60cf71 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -82,6 +82,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     case NotifyCollectionChangedAction.Remove:
                         foreach (var o in args.OldItems)
                             SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
+
                         break;
                 }
             };
@@ -250,6 +251,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             blueprint.Deselected -= onBlueprintDeselected;
 
             SelectionBlueprints.Remove(blueprint);
+
+            if (movementBlueprint == blueprint)
+                finishSelectionMovement();
         }
 
         protected virtual void AddBlueprintFor(HitObject hitObject)

From 61c4ed327c6c7f54be05430644ba8bc9ba479fb9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 21:26:41 +0900
Subject: [PATCH 03424/10326] 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 192be999eb..493b1f5529 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.619.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.623.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 911292c6ae..26d81a1004 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.619.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.623.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
     <PackageReference Include="Sentry" Version="2.1.3" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 18249b40ca..72f09ee287 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.Framework.iOS" Version="2020.619.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.623.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.619.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.623.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 14ad3835ff01e51c0992f3f2d09072fe1bc5b8fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 13:49:18 +0900
Subject: [PATCH 03425/10326] Update naming

---
 .../Objects/Drawables/Pieces/ReverseArrowPiece.cs         | 2 +-
 .../Objects/Drawables/Pieces/CirclePiece.cs               | 4 ++--
 .../Skinning/TaikoLegacyPlayfieldBackgroundRight.cs       | 2 +-
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs         | 2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs        | 2 +-
 .../Visual/UserInterface/TestSceneBeatSyncedContainer.cs  | 2 +-
 osu.Game/Graphics/Containers/BeatSyncedContainer.cs       | 8 ++++----
 osu.Game/Graphics/UserInterface/OsuTextBox.cs             | 2 +-
 osu.Game/Graphics/UserInterface/TwoLayerButton.cs         | 2 +-
 osu.Game/Rulesets/Mods/ModNightcore.cs                    | 2 +-
 osu.Game/Screens/Menu/Button.cs                           | 4 ++--
 osu.Game/Screens/Menu/MenuSideFlashes.cs                  | 6 +++---
 osu.Game/Screens/Menu/OsuLogo.cs                          | 2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
index 1a5195acf8..ae43006e76 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             };
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             if (!drawableRepeat.IsHit)
                 Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
index b5471e6976..f515a35c18 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.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.Audio.Track;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -8,7 +9,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Backgrounds;
 using osuTK.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Effects;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -148,7 +148,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
             };
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             if (!effectPoint.KiaiMode)
                 return;
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs
index 7508c75231..4bbb6be6b1 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             };
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index 407ab30e12..b937beae3c 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             lastObjectHit = result.IsHit;
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             kiaiMode = effectPoint.KiaiMode;
         }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
index cce2be7758..6f25a5f662 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             textureAnimation.Seek(0);
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             // assume that if the animation is playing on its own, it's independent from the beat and doesn't need to be touched.
             if (textureAnimation.FrameCount == 0 || textureAnimation.IsPlaying)
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
index 4c32e995e8..dd5ceec739 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 timeSinceLastBeat.Value = TimeSinceLastBeat;
             }
 
-            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
             {
                 base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index 5a613d1a54..c37fcc043d 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Graphics.Containers
         private TimingControlPoint lastTimingPoint;
 
         /// <summary>
-        /// The amount of time before a beat we should fire <see cref="OnNewBeat(int, TimingControlPoint, EffectControlPoint, TrackAmplitudes)"/>.
+        /// The amount of time before a beat we should fire <see cref="OnNewBeat(int, TimingControlPoint, EffectControlPoint, ChannelAmplitudes)"/>.
         /// This allows for adding easing to animations that may be synchronised to the beat.
         /// </summary>
         protected double EarlyActivationMilliseconds;
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers
 
         private TimingControlPoint defaultTiming;
         private EffectControlPoint defaultEffect;
-        private TrackAmplitudes defaultAmplitudes;
+        private ChannelAmplitudes defaultAmplitudes;
 
         protected bool IsBeatSyncedWithTrack { get; private set; }
 
@@ -129,7 +129,7 @@ namespace osu.Game.Graphics.Containers
                 OmitFirstBarLine = false
             };
 
-            defaultAmplitudes = new TrackAmplitudes
+            defaultAmplitudes = new ChannelAmplitudes
             {
                 FrequencyAmplitudes = new float[256],
                 LeftChannel = 0,
@@ -137,7 +137,7 @@ namespace osu.Game.Graphics.Containers
             };
         }
 
-        protected virtual void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected virtual void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
         }
     }
diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 6f440d8138..06c46fbb91 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Graphics.UserInterface
                     };
                 }
 
-                protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+                protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
                 {
                     if (!hasSelection)
                         this.FadeTo(0.7f).FadeTo(0.4f, timingPoint.BeatLength, Easing.InOutSine);
diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
index aa96796cf1..120149d8c1 100644
--- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
+++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
@@ -230,7 +230,7 @@ namespace osu.Game.Graphics.UserInterface
                 };
             }
 
-            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
             {
                 base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 1df2aeb348..ed8eb2fb66 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Mods
 
             private const int bars_per_segment = 4;
 
-            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
             {
                 base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs
index 6708ce0ba0..be6ed9700c 100644
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@@ -6,6 +6,7 @@ using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -15,7 +16,6 @@ using osuTK.Graphics;
 using osuTK.Input;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Graphics.Containers;
-using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
@@ -132,7 +132,7 @@ namespace osu.Game.Screens.Menu
 
         private bool rightward;
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
diff --git a/osu.Game/Screens/Menu/MenuSideFlashes.cs b/osu.Game/Screens/Menu/MenuSideFlashes.cs
index 321381ac8d..2ff8132d47 100644
--- a/osu.Game/Screens/Menu/MenuSideFlashes.cs
+++ b/osu.Game/Screens/Menu/MenuSideFlashes.cs
@@ -3,7 +3,6 @@
 
 using osuTK.Graphics;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -16,6 +15,7 @@ using osu.Game.Skinning;
 using osu.Game.Online.API;
 using osu.Game.Users;
 using System;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 
 namespace osu.Game.Screens.Menu
@@ -89,7 +89,7 @@ namespace osu.Game.Screens.Menu
             skin.BindValueChanged(_ => updateColour(), true);
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             if (beatIndex < 0)
                 return;
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Menu
                 flash(rightBox, timingPoint.BeatLength, effectPoint.KiaiMode, amplitudes);
         }
 
-        private void flash(Drawable d, double beatLength, bool kiai, TrackAmplitudes amplitudes)
+        private void flash(Drawable d, double beatLength, bool kiai, ChannelAmplitudes amplitudes)
         {
             d.FadeTo(Math.Max(0, ((ReferenceEquals(d, leftBox) ? amplitudes.LeftChannel : amplitudes.RightChannel) - amplitude_dead_zone) / (kiai ? kiai_multiplier : alpha_multiplier)), box_fade_in_time)
              .Then()
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 9cadfd7df6..089906c342 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -264,7 +264,7 @@ namespace osu.Game.Screens.Menu
 
         private int lastBeatIndex;
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 

From f2735a77975db231e525117a1092ce5756ba8353 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 21:30:37 +0900
Subject: [PATCH 03426/10326] Use new empty ChannelAmplitudes spec

---
 osu.Game/Graphics/Containers/BeatSyncedContainer.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index c37fcc043d..dd5c41285a 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -50,7 +50,6 @@ namespace osu.Game.Graphics.Containers
 
         private TimingControlPoint defaultTiming;
         private EffectControlPoint defaultEffect;
-        private ChannelAmplitudes defaultAmplitudes;
 
         protected bool IsBeatSyncedWithTrack { get; private set; }
 
@@ -107,7 +106,7 @@ namespace osu.Game.Graphics.Containers
                 return;
 
             using (BeginDelayedSequence(-TimeSinceLastBeat, true))
-                OnNewBeat(beatIndex, timingPoint, effectPoint, track?.CurrentAmplitudes ?? defaultAmplitudes);
+                OnNewBeat(beatIndex, timingPoint, effectPoint, track?.CurrentAmplitudes ?? ChannelAmplitudes.Empty);
 
             lastBeat = beatIndex;
             lastTimingPoint = timingPoint;
@@ -128,13 +127,6 @@ namespace osu.Game.Graphics.Containers
                 KiaiMode = false,
                 OmitFirstBarLine = false
             };
-
-            defaultAmplitudes = new ChannelAmplitudes
-            {
-                FrequencyAmplitudes = new float[256],
-                LeftChannel = 0,
-                RightChannel = 0
-            };
         }
 
         protected virtual void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)

From 5cdabbc8bb7f888ae3f8e0d9f270ea9e2b4dc365 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 21:33:03 +0900
Subject: [PATCH 03427/10326] Update access to FrequencyAmplitudes via span

---
 osu.Game/Screens/Menu/LogoVisualisation.cs | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 6a28740d4e..cbed1d2e0e 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -14,6 +14,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Utils;
 
@@ -88,22 +89,13 @@ namespace osu.Game.Screens.Menu
             var track = beatmap.Value.TrackLoaded ? beatmap.Value.Track : null;
             var effect = beatmap.Value.BeatmapLoaded ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(track?.CurrentTime ?? Time.Current) : null;
 
-            float[] temporalAmplitudes = track?.CurrentAmplitudes.FrequencyAmplitudes;
+            ReadOnlySpan<float> temporalAmplitudes = (track?.CurrentAmplitudes ?? ChannelAmplitudes.Empty).FrequencyAmplitudes.Span;
 
             for (int i = 0; i < bars_per_visualiser; i++)
             {
-                if (track?.IsRunning ?? false)
-                {
-                    float targetAmplitude = (temporalAmplitudes?[(i + indexOffset) % bars_per_visualiser] ?? 0) * (effect?.KiaiMode == true ? 1 : 0.5f);
-                    if (targetAmplitude > frequencyAmplitudes[i])
-                        frequencyAmplitudes[i] = targetAmplitude;
-                }
-                else
-                {
-                    int index = (i + index_change) % bars_per_visualiser;
-                    if (frequencyAmplitudes[index] > frequencyAmplitudes[i])
-                        frequencyAmplitudes[i] = frequencyAmplitudes[index];
-                }
+                float targetAmplitude = (temporalAmplitudes[(i + indexOffset) % bars_per_visualiser]) * (effect?.KiaiMode == true ? 1 : 0.5f);
+                if (targetAmplitude > frequencyAmplitudes[i])
+                    frequencyAmplitudes[i] = targetAmplitude;
             }
 
             indexOffset = (indexOffset + index_change) % bars_per_visualiser;

From 9d753a4fc2966e048ebdbeb3eaa2127e1569694e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Jun 2020 21:34:57 +0900
Subject: [PATCH 03428/10326] Update intro resource locations

---
 osu.Game/Screens/Menu/IntroCircles.cs | 2 +-
 osu.Game/Screens/Menu/IntroScreen.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index aa9cee969c..d4cd073b7a 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio)
         {
             if (MenuVoice.Value)
-                welcome = audio.Samples.Get(@"welcome");
+                welcome = audio.Samples.Get(@"Intro/welcome");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index b99d8ae9d1..20964549f5 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Menu
             MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
 
-            seeya = audio.Samples.Get(@"seeya");
+            seeya = audio.Samples.Get(@"Intro/seeya");
 
             BeatmapSetInfo setInfo = null;
 

From a47d34f1db3ef3f69be44b0194630b06ebefda84 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 23 Jun 2020 23:34:26 +0200
Subject: [PATCH 03429/10326] make ignore properties protected virtual get-only
 in base

---
 .../NonVisual/CustomDataDirectoryTest.cs      |  5 +++--
 osu.Game/IO/MigratableStorage.cs              | 11 +++-------
 osu.Game/IO/OsuStorage.cs                     | 20 +++++++++++++++++++
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 5abefe3198..5278837073 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -126,6 +126,7 @@ namespace osu.Game.Tests.NonVisual
                 {
                     var osu = loadOsu(host);
                     var storage = osu.Dependencies.Get<Storage>();
+                    var osuStorage = storage as OsuStorage;
 
                     // ensure we perform a save
                     host.Dependencies.Get<FrameworkConfigManager>().Save();
@@ -151,13 +152,13 @@ namespace osu.Game.Tests.NonVisual
                     Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
                     Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
 
-                    foreach (var file in MigratableStorage.IGNORE_FILES)
+                    foreach (var file in osuStorage.IGNORE_FILES)
                     {
                         Assert.That(host.Storage.Exists(file), Is.True);
                         Assert.That(storage.Exists(file), Is.False);
                     }
 
-                    foreach (var dir in MigratableStorage.IGNORE_DIRECTORIES)
+                    foreach (var dir in osuStorage.IGNORE_DIRECTORIES)
                     {
                         Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
                         Assert.That(storage.ExistsDirectory(dir), Is.False);
diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index c4dc4bcfb2..0656e61f10 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -14,14 +14,9 @@ namespace osu.Game.IO
     /// </summary>
     public abstract class MigratableStorage : WrappedStorage
     {
-        internal static readonly string[] IGNORE_DIRECTORIES = { "cache" };
-
-        internal static readonly string[] IGNORE_FILES =
-        {
-            "framework.ini",
-            "storage.ini"
-        };
-
+        internal virtual string[] IGNORE_DIRECTORIES { get; }
+        internal virtual string[] IGNORE_FILES { get; }
+        
         protected MigratableStorage(Storage storage, string subPath = null)
             : base(storage, subPath)
         {
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 3d224841f3..bbec6eb575 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -14,6 +14,26 @@ namespace osu.Game.IO
         private readonly GameHost host;
         private readonly StorageConfigManager storageConfig;
 
+        internal override string[] IGNORE_DIRECTORIES
+        {
+            get
+            {
+                return new string[] { "cache" };
+            }
+        }
+
+        internal override string[] IGNORE_FILES
+        {
+            get
+            {
+                return new string[]
+                {
+                    "framework.ini",
+                    "storage.ini"
+                };
+            }
+        }
+
         public OsuStorage(GameHost host)
             : base(host.Storage, string.Empty)
         {

From 8b9cf6fc52e84ba1cd0f3ceac2c9561f3e6d0c3c Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 23 Jun 2020 23:57:58 +0200
Subject: [PATCH 03430/10326] Remove default value in Storagemgr

---
 .../Configuration/TournamentStorageManager.cs               | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game.Tournament/Configuration/TournamentStorageManager.cs b/osu.Game.Tournament/Configuration/TournamentStorageManager.cs
index 653ea14352..e3d0a9e75c 100644
--- a/osu.Game.Tournament/Configuration/TournamentStorageManager.cs
+++ b/osu.Game.Tournament/Configuration/TournamentStorageManager.cs
@@ -14,12 +14,6 @@ namespace osu.Game.Tournament.Configuration
             : base(storage)
         {
         }
-
-        protected override void InitialiseDefaults()
-        {
-            base.InitialiseDefaults();
-            Set(StorageConfig.CurrentTournament, string.Empty);
-        }
     }
 
     public enum StorageConfig

From 8e8458ab8fa082a7956265098a6a539f4be09244 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 23 Jun 2020 23:58:28 +0200
Subject: [PATCH 03431/10326] make migrate public abstract in base and override

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 8 ++++----
 osu.Game/IO/MigratableStorage.cs            | 4 +++-
 osu.Game/IO/OsuStorage.cs                   | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index ebd8d2b63f..5c1d9a39c5 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tournament.IO
         private readonly Storage storage;
         internal readonly TournamentVideoResourceStore VideoStore;
         private const string default_tournament = "default";
-
+        
         public TournamentStorage(Storage storage)
             : base(storage.GetStorageForDirectory("tournaments"), string.Empty)
         {
@@ -30,7 +30,7 @@ namespace osu.Game.Tournament.IO
             }
             else
             {
-                migrate();
+                Migrate(GetFullPath(default_tournament));
                 storageConfig.Set(StorageConfig.CurrentTournament, default_tournament);
                 storageConfig.Save();
                 ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_tournament));
@@ -40,10 +40,10 @@ namespace osu.Game.Tournament.IO
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }
 
-        private void migrate()
+        override public void Migrate(string newLocation)
         {
             var source = new DirectoryInfo(storage.GetFullPath("tournament"));
-            var destination = new DirectoryInfo(GetFullPath(default_tournament));
+            var destination = new DirectoryInfo(newLocation);
 
             if (source.Exists)
             {
diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index 0656e61f10..0f064dfe2d 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -16,12 +16,14 @@ namespace osu.Game.IO
     {
         internal virtual string[] IGNORE_DIRECTORIES { get; }
         internal virtual string[] IGNORE_FILES { get; }
-        
+
         protected MigratableStorage(Storage storage, string subPath = null)
             : base(storage, subPath)
         {
         }
 
+        abstract public void Migrate(string newLocation);
+
         protected void DeleteRecursive(DirectoryInfo target, bool topLevelExcludes = true)
         {
             foreach (System.IO.FileInfo fi in target.GetFiles())
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index bbec6eb575..8890ecf843 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -53,7 +53,7 @@ namespace osu.Game.IO
             Logger.Storage = UnderlyingStorage.GetStorageForDirectory("logs");
         }
 
-        public void Migrate(string newLocation)
+        override public void Migrate(string newLocation)
         {
             var source = new DirectoryInfo(GetFullPath("."));
             var destination = new DirectoryInfo(newLocation);

From 7a3315dcf82b5aea1ce12343ca81d9da95b6176f Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 24 Jun 2020 00:00:21 +0200
Subject: [PATCH 03432/10326] invert and early return

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 5c1d9a39c5..5f90598890 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tournament.IO
         private readonly Storage storage;
         internal readonly TournamentVideoResourceStore VideoStore;
         private const string default_tournament = "default";
-        
+
         public TournamentStorage(Storage storage)
             : base(storage.GetStorageForDirectory("tournaments"), string.Empty)
         {
@@ -60,13 +60,13 @@ namespace osu.Game.Tournament.IO
 
         private void moveFileIfExists(string file, DirectoryInfo destination)
         {
-            if (storage.Exists(file))
-            {
-                Logger.Log($"Migrating {file} to default tournament storage.");
-                var fileInfo = new System.IO.FileInfo(storage.GetFullPath(file));
-                AttemptOperation(() => fileInfo.CopyTo(Path.Combine(destination.FullName, fileInfo.Name), true));
-                fileInfo.Delete();
-            }
+            if (!storage.Exists(file))
+                return;
+
+            Logger.Log($"Migrating {file} to default tournament storage.");
+            var fileInfo = new System.IO.FileInfo(storage.GetFullPath(file));
+            AttemptOperation(() => fileInfo.CopyTo(Path.Combine(destination.FullName, fileInfo.Name), true));
+            fileInfo.Delete();
         }
     }
 }

From 0ca8c961c8148813726a1172cc680b6d10a0fffb Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 24 Jun 2020 00:04:57 +0200
Subject: [PATCH 03433/10326] Remove string interpolation & unnecessary test
 setup

---
 .../NonVisual/CustomTourneyDirectoryTest.cs                  | 5 -----
 osu.Game.Tournament/Components/TourneyVideo.cs               | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 9e6675e09f..29e1725c6d 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -18,11 +18,6 @@ namespace osu.Game.Tournament.Tests.NonVisual
     [TestFixture]
     public class CustomTourneyDirectoryTest
     {
-        [SetUp]
-        public void SetUp()
-        {
-        }
-
         [Test]
         public void TestDefaultDirectory()
         {
diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 5a595f4f44..0052b9a431 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tournament.Components
         [BackgroundDependencyLoader]
         private void load(TournamentStorage storage)
         {
-            var stream = storage.VideoStore.GetStream($@"{filename}");
+            var stream = storage.VideoStore.GetStream(filename);
 
             if (stream != null)
             {

From e5851be9ad222094f0d710c79ac8d5d8567d439d Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 24 Jun 2020 00:06:27 +0200
Subject: [PATCH 03434/10326] change accessor from internal readonly to public
 get-only

Also changes the class accessor from internal to public
---
 osu.Game.Tournament/IO/TournamentStorage.cs            | 2 +-
 osu.Game.Tournament/IO/TournamentVideoResourceStore.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 5f90598890..14ff8d59e5 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Tournament.IO
     public class TournamentStorage : MigratableStorage
     {
         private readonly Storage storage;
-        internal readonly TournamentVideoResourceStore VideoStore;
+        public TournamentVideoResourceStore VideoStore { get; }
         private const string default_tournament = "default";
 
         public TournamentStorage(Storage storage)
diff --git a/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs b/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs
index 1ccd20fe21..4b26840b79 100644
--- a/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs
+++ b/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs
@@ -6,7 +6,7 @@ using osu.Framework.Platform;
 
 namespace osu.Game.Tournament.IO
 {
-    internal class TournamentVideoResourceStore : NamespacedResourceStore<byte[]>
+    public class TournamentVideoResourceStore : NamespacedResourceStore<byte[]>
     {
         public TournamentVideoResourceStore(Storage storage)
             : base(new StorageBackedResourceStore(storage), "videos")

From 9d2392b6b1c8fccd9e15625a72cabf21419c6028 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 24 Jun 2020 00:14:44 +0200
Subject: [PATCH 03435/10326] Cache TournamentStorage as Storage and only cast
 when necessary

---
 osu.Game.Tournament/Components/TourneyVideo.cs             | 7 ++++---
 .../Screens/Drawings/Components/StorageBackedTeamList.cs   | 6 +++---
 osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs     | 6 +++---
 osu.Game.Tournament/TournamentGameBase.cs                  | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 0052b9a431..17d4eb7a28 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -7,6 +7,7 @@ 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;
 using osu.Game.Tournament.IO;
@@ -18,7 +19,6 @@ namespace osu.Game.Tournament.Components
         private readonly string filename;
         private readonly bool drawFallbackGradient;
         private Video video;
-
         private ManualClock manualClock;
 
         public TourneyVideo(string filename, bool drawFallbackGradient = false)
@@ -28,9 +28,10 @@ namespace osu.Game.Tournament.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(TournamentStorage storage)
+        private void load(Storage storage)
         {
-            var stream = storage.VideoStore.GetStream(filename);
+            var tournamentStorage = storage as TournamentStorage;
+            var stream = tournamentStorage.VideoStore.GetStream(filename);
 
             if (stream != null)
             {
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs b/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
index ecc23181be..f96ec01cbb 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using osu.Framework.Logging;
-using osu.Game.Tournament.IO;
+using osu.Framework.Platform;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Drawings.Components
@@ -14,9 +14,9 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
     {
         private const string teams_filename = "drawings.txt";
 
-        private readonly TournamentStorage storage;
+        private readonly Storage storage;
 
-        public StorageBackedTeamList(TournamentStorage storage)
+        public StorageBackedTeamList(Storage storage)
         {
             this.storage = storage;
         }
diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index 8b6bd21ee6..e10154b722 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -12,9 +12,9 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
+using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Tournament.Components;
-using osu.Game.Tournament.IO;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Drawings.Components;
 using osuTK;
@@ -36,12 +36,12 @@ namespace osu.Game.Tournament.Screens.Drawings
 
         private Task writeOp;
 
-        private TournamentStorage storage;
+        private Storage storage;
 
         public ITeamList TeamList;
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures, TournamentStorage storage)
+        private void load(TextureStore textures, Storage storage)
         {
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 0702b435a5..6a533f96d8 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tournament
         {
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
-            dependencies.CacheAs(storage = new TournamentStorage(baseStorage));
+            dependencies.CacheAs<Storage>(storage = new TournamentStorage(baseStorage));
 
             Textures.AddStore(new TextureLoaderStore(storage.VideoStore));
 

From c32ef5e718c4a7df5908ea8dcbce9d998f3a1926 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 24 Jun 2020 00:37:29 +0200
Subject: [PATCH 03436/10326] Address formatting issues

---
 .../NonVisual/CustomDataDirectoryTest.cs      |  4 ++--
 osu.Game.Tournament/IO/TournamentStorage.cs   |  2 +-
 osu.Game/IO/MigratableStorage.cs              | 14 +++++------
 osu.Game/IO/OsuStorage.cs                     | 24 +++++--------------
 4 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 5278837073..125d2b3ef7 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -152,13 +152,13 @@ namespace osu.Game.Tests.NonVisual
                     Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
                     Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
 
-                    foreach (var file in osuStorage.IGNORE_FILES)
+                    foreach (var file in osuStorage.IgnoreFiles)
                     {
                         Assert.That(host.Storage.Exists(file), Is.True);
                         Assert.That(storage.Exists(file), Is.False);
                     }
 
-                    foreach (var dir in osuStorage.IGNORE_DIRECTORIES)
+                    foreach (var dir in osuStorage.IgnoreDirectories)
                     {
                         Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
                         Assert.That(storage.ExistsDirectory(dir), Is.False);
diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 14ff8d59e5..b906ea6c50 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Tournament.IO
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }
 
-        override public void Migrate(string newLocation)
+        public override void Migrate(string newLocation)
         {
             var source = new DirectoryInfo(storage.GetFullPath("tournament"));
             var destination = new DirectoryInfo(newLocation);
diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index 0f064dfe2d..41a057d016 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -14,21 +14,21 @@ namespace osu.Game.IO
     /// </summary>
     public abstract class MigratableStorage : WrappedStorage
     {
-        internal virtual string[] IGNORE_DIRECTORIES { get; }
-        internal virtual string[] IGNORE_FILES { get; }
+        internal virtual string[] IgnoreDirectories => new string[] { };
+        internal virtual string[] IgnoreFiles => new string[] { };
 
         protected MigratableStorage(Storage storage, string subPath = null)
             : base(storage, subPath)
         {
         }
 
-        abstract public void Migrate(string newLocation);
+        public abstract void Migrate(string newLocation);
 
         protected void DeleteRecursive(DirectoryInfo target, bool topLevelExcludes = true)
         {
             foreach (System.IO.FileInfo fi in target.GetFiles())
             {
-                if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
+                if (topLevelExcludes && IgnoreFiles.Contains(fi.Name))
                     continue;
 
                 AttemptOperation(() => fi.Delete());
@@ -36,7 +36,7 @@ namespace osu.Game.IO
 
             foreach (DirectoryInfo dir in target.GetDirectories())
             {
-                if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
+                if (topLevelExcludes && IgnoreDirectories.Contains(dir.Name))
                     continue;
 
                 AttemptOperation(() => dir.Delete(true));
@@ -54,7 +54,7 @@ namespace osu.Game.IO
 
             foreach (System.IO.FileInfo fi in source.GetFiles())
             {
-                if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
+                if (topLevelExcludes && IgnoreFiles.Contains(fi.Name))
                     continue;
 
                 AttemptOperation(() => fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true));
@@ -62,7 +62,7 @@ namespace osu.Game.IO
 
             foreach (DirectoryInfo dir in source.GetDirectories())
             {
-                if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
+                if (topLevelExcludes && IgnoreDirectories.Contains(dir.Name))
                     continue;
 
                 CopyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 8890ecf843..514f172f74 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -14,25 +14,13 @@ namespace osu.Game.IO
         private readonly GameHost host;
         private readonly StorageConfigManager storageConfig;
 
-        internal override string[] IGNORE_DIRECTORIES
-        {
-            get
-            {
-                return new string[] { "cache" };
-            }
-        }
+        internal override string[] IgnoreDirectories => new[] { "cache" };
 
-        internal override string[] IGNORE_FILES
+        internal override string[] IgnoreFiles => new[]
         {
-            get
-            {
-                return new string[]
-                {
-                    "framework.ini",
-                    "storage.ini"
-                };
-            }
-        }
+            "framework.ini",
+            "storage.ini"
+        };
 
         public OsuStorage(GameHost host)
             : base(host.Storage, string.Empty)
@@ -53,7 +41,7 @@ namespace osu.Game.IO
             Logger.Storage = UnderlyingStorage.GetStorageForDirectory("logs");
         }
 
-        override public void Migrate(string newLocation)
+        public override void Migrate(string newLocation)
         {
             var source = new DirectoryInfo(GetFullPath("."));
             var destination = new DirectoryInfo(newLocation);

From af1134084948db534072997b41ee7a7e5758c2b0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 24 Jun 2020 02:13:28 +0200
Subject: [PATCH 03437/10326] Fix nullref exceptions and redundant explicit
 type

---
 osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs | 4 ++--
 osu.Game.Tournament/Components/TourneyVideo.cs      | 3 +--
 osu.Game/IO/MigratableStorage.cs                    | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 125d2b3ef7..c8a5988104 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -152,13 +152,13 @@ namespace osu.Game.Tests.NonVisual
                     Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
                     Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
 
-                    foreach (var file in osuStorage.IgnoreFiles)
+                    foreach (var file in osuStorage?.IgnoreFiles ?? Array.Empty<string>())
                     {
                         Assert.That(host.Storage.Exists(file), Is.True);
                         Assert.That(storage.Exists(file), Is.False);
                     }
 
-                    foreach (var dir in osuStorage.IgnoreDirectories)
+                    foreach (var dir in osuStorage?.IgnoreDirectories ?? Array.Empty<string>())
                     {
                         Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
                         Assert.That(storage.ExistsDirectory(dir), Is.False);
diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 17d4eb7a28..794b72b3a9 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -30,8 +30,7 @@ namespace osu.Game.Tournament.Components
         [BackgroundDependencyLoader]
         private void load(Storage storage)
         {
-            var tournamentStorage = storage as TournamentStorage;
-            var stream = tournamentStorage.VideoStore.GetStream(filename);
+            var stream = (storage as TournamentStorage)?.VideoStore.GetStream(filename);
 
             if (stream != null)
             {
diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index 41a057d016..ec85e0bac9 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -14,8 +14,8 @@ namespace osu.Game.IO
     /// </summary>
     public abstract class MigratableStorage : WrappedStorage
     {
-        internal virtual string[] IgnoreDirectories => new string[] { };
-        internal virtual string[] IgnoreFiles => new string[] { };
+        internal virtual string[] IgnoreDirectories => Array.Empty<string>();
+        internal virtual string[] IgnoreFiles => Array.Empty<string>();
 
         protected MigratableStorage(Storage storage, string subPath = null)
             : base(storage, subPath)

From 839f197111c55d00474da01aced1a07e46a7fe69 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 24 Jun 2020 02:37:59 +0200
Subject: [PATCH 03438/10326] Change type from TournamentStorage to Storage in
 tests

---
 .../NonVisual/CustomTourneyDirectoryTest.cs                | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 29e1725c6d..4cede15d7a 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -10,7 +10,6 @@ using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Platform;
 using osu.Game.Tournament.Configuration;
-using osu.Game.Tournament.IO;
 using osu.Game.Tests;
 
 namespace osu.Game.Tournament.Tests.NonVisual
@@ -26,7 +25,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 try
                 {
                     var osu = loadOsu(host);
-                    var storage = osu.Dependencies.Get<TournamentStorage>();
+                    var storage = osu.Dependencies.Get<Storage>();
                     var defaultStorage = Path.Combine(tournamentBasePath(nameof(TestDefaultDirectory)), "default");
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorage));
                 }
@@ -57,7 +56,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 {
                     var osu = loadOsu(host);
 
-                    storage = osu.Dependencies.Get<TournamentStorage>();
+                    storage = osu.Dependencies.Get<Storage>();
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(tournamentBasePath(nameof(TestCustomDirectory)), "custom")));
                 }
@@ -113,7 +112,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 {
                     var osu = loadOsu(host);
 
-                    var storage = osu.Dependencies.Get<TournamentStorage>();
+                    var storage = osu.Dependencies.Get<Storage>();
 
                     var migratedPath = Path.Combine(tournamentBasePath(nameof(TestMigration)), "default");
 

From c94f95cc0d6bf3ba92098d6fe5f3190d8ddf4153 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 24 Jun 2020 02:40:22 +0200
Subject: [PATCH 03439/10326] Check if the file exists before reading

This is (also) to address the review from bdach about StorageManager initialising a default value that gets overwritten upon migration anyway.
---
 osu.Game.Tournament/IO/TournamentStorage.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index b906ea6c50..ed1bfb7449 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -22,11 +22,9 @@ namespace osu.Game.Tournament.IO
 
             TournamentStorageManager storageConfig = new TournamentStorageManager(storage);
 
-            var currentTournament = storageConfig.Get<string>(StorageConfig.CurrentTournament);
-
-            if (!string.IsNullOrEmpty(currentTournament))
+            if (storage.Exists("tournament.ini"))
             {
-                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(currentTournament));
+                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
             }
             else
             {

From ccb27082d52c2bda1bfd01e4a5ca3583e49c3035 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Jun 2020 11:08:32 +0900
Subject: [PATCH 03440/10326] Fix background appearing too late

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 81e473dc04..abd4a68d4f 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Screens.Backgrounds;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Menu
@@ -24,6 +25,13 @@ namespace osu.Game.Screens.Menu
         private SampleChannel pianoReverb;
         protected override string SeeyaSampleName => "Intro/Welcome/seeya";
 
+        protected override BackgroundScreen CreateBackground() => background = new BackgroundScreenDefault(false)
+        {
+            Alpha = 0,
+        };
+
+        private BackgroundScreenDefault background;
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
@@ -44,6 +52,8 @@ namespace osu.Game.Screens.Menu
                     RelativeSizeAxes = Axes.Both
                 }, intro =>
                 {
+                    PrepareMenuLoad();
+
                     intro.LogoVisualisation.AddAmplitudeSource(pianoReverb);
 
                     AddInternal(intro);
@@ -54,21 +64,24 @@ namespace osu.Game.Screens.Menu
                     Scheduler.AddDelayed(() =>
                     {
                         StartTrack();
-                        PrepareMenuLoad();
+
+                        const float fade_in_time = 200;
 
                         logo.ScaleTo(1);
-                        logo.FadeIn();
+                        logo.FadeIn(fade_in_time);
 
-                        Scheduler.Add(LoadMenu);
+                        background.FadeIn(fade_in_time);
+
+                        LoadMenu();
                     }, delay_step_two);
                 });
             }
         }
 
-        public override void OnSuspending(IScreen next)
+        public override void OnResuming(IScreen last)
         {
-            this.FadeOut(300);
-            base.OnSuspending(next);
+            base.OnResuming(last);
+            background.FadeOut(100);
         }
 
         private class WelcomeIntroSequence : Container

From 1387a9e2c63a0d46200a4ea7ef71e28cdb68c893 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Jun 2020 16:57:17 +0900
Subject: [PATCH 03441/10326] Move all tournament tests to using placeholder
 data rather than reading from bracket

---
 .../Components/TestSceneMatchScoreDisplay.cs  |   2 +-
 osu.Game.Tournament.Tests/LadderTestScene.cs  | 146 ------------------
 .../Screens/TestSceneLadderEditorScreen.cs    |   2 +-
 .../Screens/TestSceneLadderScreen.cs          |   2 +-
 .../Screens/TestSceneMapPoolScreen.cs         |   2 +-
 .../Screens/TestSceneRoundEditorScreen.cs     |   2 +-
 .../Screens/TestSceneSeedingEditorScreen.cs   |   2 +-
 .../Screens/TestSceneSeedingScreen.cs         |   2 +-
 .../Screens/TestSceneTeamEditorScreen.cs      |   2 +-
 .../Screens/TestSceneTeamIntroScreen.cs       |   2 +-
 .../Screens/TestSceneTeamWinScreen.cs         |   2 +-
 .../TournamentTestScene.cs                    | 141 +++++++++++++++++
 12 files changed, 151 insertions(+), 156 deletions(-)
 delete mode 100644 osu.Game.Tournament.Tests/LadderTestScene.cs

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs
index 77119f7a60..acd5d53310 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Tournament.Screens.Gameplay.Components;
 
 namespace osu.Game.Tournament.Tests.Components
 {
-    public class TestSceneMatchScoreDisplay : LadderTestScene
+    public class TestSceneMatchScoreDisplay : TournamentTestScene
     {
         [Cached(Type = typeof(MatchIPCInfo))]
         private MatchIPCInfo matchInfo = new MatchIPCInfo();
diff --git a/osu.Game.Tournament.Tests/LadderTestScene.cs b/osu.Game.Tournament.Tests/LadderTestScene.cs
deleted file mode 100644
index 2f4373679c..0000000000
--- a/osu.Game.Tournament.Tests/LadderTestScene.cs
+++ /dev/null
@@ -1,146 +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 NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Utils;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets;
-using osu.Game.Tournament.Models;
-using osu.Game.Users;
-
-namespace osu.Game.Tournament.Tests
-{
-    [TestFixture]
-    public abstract class LadderTestScene : TournamentTestScene
-    {
-        [Cached]
-        protected LadderInfo Ladder { get; private set; } = new LadderInfo();
-
-        [Resolved]
-        private RulesetStore rulesetStore { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Ladder.Ruleset.Value ??= rulesetStore.AvailableRulesets.First();
-
-            Ruleset.BindTo(Ladder.Ruleset);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            TournamentMatch match = CreateSampleMatch();
-
-            Ladder.Rounds.Add(match.Round.Value);
-            Ladder.Matches.Add(match);
-            Ladder.Teams.Add(match.Team1.Value);
-            Ladder.Teams.Add(match.Team2.Value);
-
-            Ladder.CurrentMatch.Value = match;
-        }
-
-        public static TournamentMatch CreateSampleMatch() => 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 = CreateSampleBeatmapInfo(),
-                                    Score = 12345672,
-                                    Seed = { Value = 24 },
-                                },
-                                new SeedingBeatmap
-                                {
-                                    BeatmapInfo = CreateSampleBeatmapInfo(),
-                                    Score = 1234567,
-                                    Seed = { Value = 12 },
-                                },
-                                new SeedingBeatmap
-                                {
-                                    BeatmapInfo = CreateSampleBeatmapInfo(),
-                                    Score = 1234567,
-                                    Seed = { Value = 16 },
-                                }
-                            }
-                        },
-                        new SeedingResult
-                        {
-                            Mod = { Value = "DT" },
-                            Seed = { Value = 5 },
-                            Beatmaps =
-                            {
-                                new SeedingBeatmap
-                                {
-                                    BeatmapInfo = CreateSampleBeatmapInfo(),
-                                    Score = 234567,
-                                    Seed = { Value = 3 },
-                                },
-                                new SeedingBeatmap
-                                {
-                                    BeatmapInfo = CreateSampleBeatmapInfo(),
-                                    Score = 234567,
-                                    Seed = { Value = 6 },
-                                },
-                                new SeedingBeatmap
-                                {
-                                    BeatmapInfo = CreateSampleBeatmapInfo(),
-                                    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" } }
-            }
-        };
-
-        public static BeatmapInfo CreateSampleBeatmapInfo() =>
-            new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist", ID = RNG.Next(0, 1000000) } };
-    }
-}
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
index a45c5de2bd..bceb3e6b74 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
@@ -8,7 +8,7 @@ using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneLadderEditorScreen : LadderTestScene
+    public class TestSceneLadderEditorScreen : TournamentTestScene
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
index 2be0564c82..c4c100d506 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
@@ -8,7 +8,7 @@ using osu.Game.Tournament.Screens.Ladder;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneLadderScreen : LadderTestScene
+    public class TestSceneLadderScreen : TournamentTestScene
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index a4538be384..f4032fdd54 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -12,7 +12,7 @@ using osu.Game.Tournament.Screens.MapPool;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneMapPoolScreen : LadderTestScene
+    public class TestSceneMapPoolScreen : TournamentTestScene
     {
         private MapPoolScreen screen;
 
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
index e15ac416b0..5c2b59df3a 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
@@ -5,7 +5,7 @@ using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneRoundEditorScreen : LadderTestScene
+    public class TestSceneRoundEditorScreen : TournamentTestScene
     {
         public TestSceneRoundEditorScreen()
         {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
index 8d12d5393d..2722021216 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
@@ -7,7 +7,7 @@ using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneSeedingEditorScreen : LadderTestScene
+    public class TestSceneSeedingEditorScreen : TournamentTestScene
     {
         [Cached]
         private readonly LadderInfo ladder = new LadderInfo();
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
index 4269f8f56a..d414d8e36e 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
@@ -8,7 +8,7 @@ using osu.Game.Tournament.Screens.TeamIntro;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneSeedingScreen : LadderTestScene
+    public class TestSceneSeedingScreen : TournamentTestScene
     {
         [Cached]
         private readonly LadderInfo ladder = new LadderInfo();
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
index 097bad4a02..fc6574ec8a 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
@@ -5,7 +5,7 @@ using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneTeamEditorScreen : LadderTestScene
+    public class TestSceneTeamEditorScreen : TournamentTestScene
     {
         public TestSceneTeamEditorScreen()
         {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
index e36b594ff2..b3f78c92d9 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
@@ -9,7 +9,7 @@ using osu.Game.Tournament.Screens.TeamIntro;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneTeamIntroScreen : LadderTestScene
+    public class TestSceneTeamIntroScreen : TournamentTestScene
     {
         [Cached]
         private readonly LadderInfo ladder = new LadderInfo();
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
index 1a2faa76c1..6873fb0f4b 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
@@ -9,7 +9,7 @@ using osu.Game.Tournament.Screens.TeamWin;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneTeamWinScreen : LadderTestScene
+    public class TestSceneTeamWinScreen : TournamentTestScene
     {
         [Cached]
         private readonly LadderInfo ladder = new LadderInfo();
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 18ac3230da..a7b141cf43 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -1,13 +1,154 @@
 // Copyright (c) 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.Platform;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 using osu.Game.Tests.Visual;
+using osu.Game.Tournament.IPC;
+using osu.Game.Tournament.Models;
+using osu.Game.Users;
 
 namespace osu.Game.Tournament.Tests
 {
     public abstract class TournamentTestScene : OsuTestScene
     {
+        [Cached]
+        protected LadderInfo Ladder { get; private set; } = new LadderInfo();
+
+        [Resolved]
+        private RulesetStore rulesetStore { get; set; }
+
+        [Cached]
+        protected MatchIPCInfo IPCInfo { get; private set; } = new MatchIPCInfo();
+
+        [BackgroundDependencyLoader]
+        private void load(Storage storage)
+        {
+            Ladder.Ruleset.Value ??= rulesetStore.AvailableRulesets.First();
+
+            Ruleset.BindTo(Ladder.Ruleset);
+            Dependencies.CacheAs(new StableInfo(storage));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            TournamentMatch match = CreateSampleMatch();
+
+            Ladder.Rounds.Add(match.Round.Value);
+            Ladder.Matches.Add(match);
+            Ladder.Teams.Add(match.Team1.Value);
+            Ladder.Teams.Add(match.Team2.Value);
+
+            Ladder.CurrentMatch.Value = match;
+        }
+
+        public static TournamentMatch CreateSampleMatch() => 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 = CreateSampleBeatmapInfo(),
+                                    Score = 12345672,
+                                    Seed = { Value = 24 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = CreateSampleBeatmapInfo(),
+                                    Score = 1234567,
+                                    Seed = { Value = 12 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = CreateSampleBeatmapInfo(),
+                                    Score = 1234567,
+                                    Seed = { Value = 16 },
+                                }
+                            }
+                        },
+                        new SeedingResult
+                        {
+                            Mod = { Value = "DT" },
+                            Seed = { Value = 5 },
+                            Beatmaps =
+                            {
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = CreateSampleBeatmapInfo(),
+                                    Score = 234567,
+                                    Seed = { Value = 3 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = CreateSampleBeatmapInfo(),
+                                    Score = 234567,
+                                    Seed = { Value = 6 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = CreateSampleBeatmapInfo(),
+                                    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" } }
+            }
+        };
+
+        public static BeatmapInfo CreateSampleBeatmapInfo() =>
+            new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist", ID = RNG.Next(0, 1000000) } };
+
         protected override ITestSceneTestRunner CreateRunner() => new TournamentTestSceneTestRunner();
 
         public class TournamentTestSceneTestRunner : TournamentGameBase, ITestSceneTestRunner

From 92e272ebb6f301a5b896ea2a3166d2cbf761be99 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Jun 2020 16:57:40 +0900
Subject: [PATCH 03442/10326] Remove unnecessary prefixes

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

diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index 23fcb01db7..2c539cdd43 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tournament
 
         public const float STREAM_AREA_WIDTH = 1366;
 
-        public const double REQUIRED_WIDTH = TournamentSceneManager.CONTROL_AREA_WIDTH * 2 + TournamentSceneManager.STREAM_AREA_WIDTH;
+        public const double REQUIRED_WIDTH = CONTROL_AREA_WIDTH * 2 + STREAM_AREA_WIDTH;
 
         [Cached]
         private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay();

From eb3e1b2b2698ab5bc843bd5a90c945ca01cd7d5f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Jun 2020 17:03:22 +0900
Subject: [PATCH 03443/10326] Fix incorrect inheritance on remaining test scene

---
 .../Components/TestSceneTournamentBeatmapPanel.cs              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs
index 77fa411058..bc32a12ab7 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs
@@ -8,12 +8,11 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
-using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
 
 namespace osu.Game.Tournament.Tests.Components
 {
-    public class TestSceneTournamentBeatmapPanel : OsuTestScene
+    public class TestSceneTournamentBeatmapPanel : TournamentTestScene
     {
         [Resolved]
         private IAPIProvider api { get; set; }

From 68f078c9e67d4239eaf02575e58c81b120e44197 Mon Sep 17 00:00:00 2001
From: Sebastian Krajewski <mail@wieku.me>
Date: Sun, 5 Jan 2020 22:11:37 +0100
Subject: [PATCH 03444/10326] Replace logo-triangles.mp4 with shadered
 logo-triangles.png

---
 osu.Game/Screens/Menu/IntroTriangles.cs |   9 +-
 osu.Game/Screens/Menu/LazerLogo.cs      | 109 ++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Screens/Menu/LazerLogo.cs

diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 9be74a0fd9..36f00a13ef 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -12,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Video;
 using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Graphics;
@@ -88,7 +86,7 @@ namespace osu.Game.Screens.Menu
             private RulesetFlow rulesets;
             private Container rulesetsScale;
             private Container logoContainerSecondary;
-            private Drawable lazerLogo;
+            private LazerLogo lazerLogo;
 
             private GlitchingTriangles triangles;
 
@@ -139,10 +137,10 @@ namespace osu.Game.Screens.Menu
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Child = lazerLogo = new LazerLogo(textures.GetStream("Menu/logo-triangles.mp4"))
+                        Child = lazerLogo = new LazerLogo()
                         {
                             Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
+                            Origin = Anchor.Centre
                         }
                     },
                 };
@@ -218,6 +216,7 @@ namespace osu.Game.Screens.Menu
 
                         // matching flyte curve y = 0.25x^2 + (max(0, x - 0.7) / 0.3) ^ 5
                         lazerLogo.FadeIn().ScaleTo(scale_start).Then().Delay(logo_scale_duration * 0.7f).ScaleTo(scale_start - scale_adjust, logo_scale_duration * 0.3f, Easing.InQuint);
+                        lazerLogo.Start(logo_1, logo_scale_duration);
                         logoContainerSecondary.ScaleTo(scale_start).Then().ScaleTo(scale_start - scale_adjust * 0.25f, logo_scale_duration, Easing.InQuad);
                     }
 
diff --git a/osu.Game/Screens/Menu/LazerLogo.cs b/osu.Game/Screens/Menu/LazerLogo.cs
new file mode 100644
index 0000000000..ab9c82bc58
--- /dev/null
+++ b/osu.Game/Screens/Menu/LazerLogo.cs
@@ -0,0 +1,109 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.OpenGL.Vertices;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Shaders;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.MathUtils;
+using osuTK;
+
+namespace osu.Game.Screens.Menu
+{
+    public class LazerLogo : Drawable
+    {
+        private IShader shader;
+        private Texture texture;
+
+        private double startTime = -1000;
+        private double animationTime = -1000;
+
+        private float animation;
+        private float highlight;
+
+        public LazerLogo()
+        {
+            Size = new Vector2(960);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ShaderManager shaders, TextureStore textures)
+        {
+            shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"LazerLogo");
+            texture = textures.Get("Menu/logo-triangles.png");
+        }
+
+        public void Start(double delay, double duration)
+        {
+            startTime = Clock.CurrentTime + delay;
+            animationTime = duration;
+        }
+
+        public override bool IsPresent => true;
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (animationTime < 0) return;
+
+            highlight = Clock.CurrentTime < startTime + 0.4 * animationTime
+                ? Interpolation.ValueAt(Clock.CurrentTime, 0f, 1f, startTime, startTime + animationTime * 1.07, Easing.OutCirc)
+                : Interpolation.ValueAt(Clock.CurrentTime, 0.6f, 1f, startTime, startTime + animationTime * 0.9);
+
+            animation = Clock.CurrentTime < startTime + 0.5 * animationTime
+                ? Interpolation.ValueAt(Clock.CurrentTime, 0f, 0.8f, startTime, startTime + animationTime * 1.23, Easing.OutQuart)
+                : Interpolation.ValueAt(Clock.CurrentTime, 0.4f, 1f, startTime, startTime + animationTime);
+        }
+
+        protected override DrawNode CreateDrawNode() => new LazerLogoDrawNode(this);
+
+        private class LazerLogoDrawNode : DrawNode
+        {
+            protected new LazerLogo Source => (LazerLogo)base.Source;
+
+            private IShader shader;
+            private Texture texture;
+            private Quad screenSpaceDrawQuad;
+            private float animation;
+            private float highlight;
+
+            public LazerLogoDrawNode(LazerLogo source)
+                : base(source)
+            {
+            }
+
+            public override void ApplyState()
+            {
+                base.ApplyState();
+
+                shader = Source.shader;
+                texture = Source.texture;
+                screenSpaceDrawQuad = Source.ScreenSpaceDrawQuad;
+                animation = Source.animation;
+                highlight = Source.highlight;
+            }
+
+            protected virtual void Blit(Action<TexturedVertex2D> vertexAction)
+            {
+                DrawQuad(texture, screenSpaceDrawQuad, DrawColourInfo.Colour, null, vertexAction);
+            }
+
+            public override void Draw(Action<TexturedVertex2D> vertexAction)
+            {
+                base.Draw(vertexAction);
+
+                shader.Bind();
+                shader.GetUniform<float>("highlight").Value = highlight;
+                shader.GetUniform<float>("animation").Value = animation;
+
+                Blit(vertexAction);
+
+                shader.Unbind();
+            }
+        }
+    }
+}

From 5fd6246d1b5e3b0d650cf4117d10df84b6d9f5de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Jun 2020 17:57:07 +0900
Subject: [PATCH 03445/10326] Fix remaining test scenes

---
 .../Screens/TestSceneTeamWinScreen.cs               | 10 ++--------
 osu.Game.Tournament.Tests/TournamentTestScene.cs    | 13 +++++--------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
index 6873fb0f4b..3ca58dcaf4 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
@@ -4,25 +4,19 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.TeamWin;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
     public class TestSceneTeamWinScreen : TournamentTestScene
     {
-        [Cached]
-        private readonly LadderInfo ladder = new LadderInfo();
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            var match = new TournamentMatch();
-            match.Team1.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA");
-            match.Team2.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN");
+            var match = Ladder.CurrentMatch.Value;
+
             match.Round.Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals");
             match.Completed.Value = true;
-            ladder.CurrentMatch.Value = match;
 
             Add(new TeamWinScreen
             {
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index a7b141cf43..d22da25f9d 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -31,14 +31,6 @@ namespace osu.Game.Tournament.Tests
         {
             Ladder.Ruleset.Value ??= rulesetStore.AvailableRulesets.First();
 
-            Ruleset.BindTo(Ladder.Ruleset);
-            Dependencies.CacheAs(new StableInfo(storage));
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
             TournamentMatch match = CreateSampleMatch();
 
             Ladder.Rounds.Add(match.Round.Value);
@@ -47,6 +39,9 @@ namespace osu.Game.Tournament.Tests
             Ladder.Teams.Add(match.Team2.Value);
 
             Ladder.CurrentMatch.Value = match;
+
+            Ruleset.BindTo(Ladder.Ruleset);
+            Dependencies.CacheAs(new StableInfo(storage));
         }
 
         public static TournamentMatch CreateSampleMatch() => new TournamentMatch
@@ -55,6 +50,7 @@ namespace osu.Game.Tournament.Tests
             {
                 Value = new TournamentTeam
                 {
+                    Acronym = { Value = "JPN" },
                     FlagName = { Value = "JP" },
                     FullName = { Value = "Japan" },
                     LastYearPlacing = { Value = 10 },
@@ -128,6 +124,7 @@ namespace osu.Game.Tournament.Tests
             {
                 Value = new TournamentTeam
                 {
+                    Acronym = { Value = "USA" },
                     FlagName = { Value = "US" },
                     FullName = { Value = "United States" },
                     Players =

From 9e1bf71233b66a88b2419339db6cf181a7705534 Mon Sep 17 00:00:00 2001
From: Viktor Rosvall <virosen@yahoo.se>
Date: Wed, 24 Jun 2020 11:29:38 +0200
Subject: [PATCH 03446/10326] Added text explaining a second copy will be made

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

diff --git a/osu.Game/Screens/Select/ImportFromStablePopup.cs b/osu.Game/Screens/Select/ImportFromStablePopup.cs
index 20494829ae..272f9566d5 100644
--- a/osu.Game/Screens/Select/ImportFromStablePopup.cs
+++ b/osu.Game/Screens/Select/ImportFromStablePopup.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Select
         public ImportFromStablePopup(Action importFromStable)
         {
             HeaderText = @"You have no beatmaps!";
-            BodyText = "An existing copy of osu! was found, though.\nWould you like to import your beatmaps, skins and scores?";
+            BodyText = "An existing copy of osu! was found, though.\nWould you like to import your beatmaps, skins and scores?\nThis will create a second copy of all files on disk.";
 
             Icon = FontAwesome.Solid.Plane;
 

From 6bc507d49ed2bc76cbbaffc5dc9ddac087a5bd8f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 24 Jun 2020 18:53:52 +0900
Subject: [PATCH 03447/10326] Increase coordinate parsing limits

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

diff --git a/osu.Game/Beatmaps/Formats/Parsing.cs b/osu.Game/Beatmaps/Formats/Parsing.cs
index c3efb8c760..c4795a6931 100644
--- a/osu.Game/Beatmaps/Formats/Parsing.cs
+++ b/osu.Game/Beatmaps/Formats/Parsing.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Beatmaps.Formats
     /// </summary>
     public static class Parsing
     {
-        public const int MAX_COORDINATE_VALUE = 65536;
+        public const int MAX_COORDINATE_VALUE = 131072;
 
         public const double MAX_PARSE_VALUE = int.MaxValue;
 

From 53107973a33a82bf5b1b70bb158d293b183536eb Mon Sep 17 00:00:00 2001
From: BananeVolante <42553638+BananeVolante@users.noreply.github.com>
Date: Wed, 24 Jun 2020 14:01:13 +0200
Subject: [PATCH 03448/10326] merged 2 lines

Co-authored-by: Salman Ahmed <email@iisalman.me>
---
 osu.Game/Screens/Play/PauseOverlay.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 191bf0d901..2656ef1ebd 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -34,11 +34,10 @@ namespace osu.Game.Screens.Play
 
             if (sampleChannel != null)
             {
-                pauseLoop = new DrawableSample(sampleChannel)
+                AddInternal(pauseLoop = new DrawableSample(sampleChannel)
                 {
                     Looping = true,
-                };
-                AddInternal(pauseLoop);
+                });
                 pauseLoop?.Play();
             }
         }

From 768e28faba318a3c2ef46fbce030ffb52d98b060 Mon Sep 17 00:00:00 2001
From: jorolf <jorolf@gmx.de>
Date: Wed, 24 Jun 2020 14:11:38 +0200
Subject: [PATCH 03449/10326] generalize and simplify animation

---
 .../UserInterface/TestSceneHueAnimation.cs    |  29 +++++
 osu.Game/Graphics/Sprites/HueAnimation.cs     |  75 ++++++++++++
 osu.Game/Screens/Menu/IntroTriangles.cs       |  45 ++++++--
 osu.Game/Screens/Menu/LazerLogo.cs            | 109 ------------------
 4 files changed, 141 insertions(+), 117 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
 create mode 100644 osu.Game/Graphics/Sprites/HueAnimation.cs
 delete mode 100644 osu.Game/Screens/Menu/LazerLogo.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
new file mode 100644
index 0000000000..582849a053
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    [TestFixture]
+    public class TestSceneHueAnimation : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            HueAnimation anim;
+
+            Add(anim = new HueAnimation
+            {
+                Texture = textures.Get("Intro/Triangles/logo-triangles.png"),
+                Colour = Colour4.White,
+            });
+
+            AddSliderStep("Progress", 0f, 1f, 0f, newValue => anim.AnimationProgress = newValue);
+        }
+    }
+}
diff --git a/osu.Game/Graphics/Sprites/HueAnimation.cs b/osu.Game/Graphics/Sprites/HueAnimation.cs
new file mode 100644
index 0000000000..55a167cf59
--- /dev/null
+++ b/osu.Game/Graphics/Sprites/HueAnimation.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;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.OpenGL.Vertices;
+using osu.Framework.Graphics.Shaders;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osuTK;
+
+namespace osu.Game.Graphics.Sprites
+{
+    public class HueAnimation : Sprite
+    {
+        public HueAnimation()
+        {
+            Size = new Vector2(960);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ShaderManager shaders, TextureStore textures)
+        {
+            TextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"HueAnimation");
+            RoundedTextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"HueAnimation"); // Masking isn't supported for now
+        }
+
+        private float animationProgress;
+
+        public float AnimationProgress
+        {
+            get => animationProgress;
+            set
+            {
+                if (animationProgress == value) return;
+
+                animationProgress = value;
+                Invalidate(Invalidation.DrawInfo);
+            }
+        }
+
+        public override bool IsPresent => true;
+
+        protected override DrawNode CreateDrawNode() => new HueAnimationDrawNode(this);
+
+        private class HueAnimationDrawNode : SpriteDrawNode
+        {
+            protected new HueAnimation Source => (HueAnimation)base.Source;
+
+            private float progress;
+
+            public HueAnimationDrawNode(HueAnimation source)
+                : base(source)
+            {
+            }
+
+            public override void ApplyState()
+            {
+                base.ApplyState();
+
+                progress = Source.animationProgress;
+            }
+
+            protected override void Blit(Action<TexturedVertex2D> vertexAction)
+            {
+                Shader.GetUniform<float>("progress").UpdateValue(ref progress);
+
+                base.Blit(vertexAction);
+            }
+
+            protected override bool CanDrawOpaqueInterior => false;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 36f00a13ef..53eb0eb270 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -137,7 +138,7 @@ namespace osu.Game.Screens.Menu
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Child = lazerLogo = new LazerLogo()
+                        Child = lazerLogo = new LazerLogo
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre
@@ -216,7 +217,13 @@ namespace osu.Game.Screens.Menu
 
                         // matching flyte curve y = 0.25x^2 + (max(0, x - 0.7) / 0.3) ^ 5
                         lazerLogo.FadeIn().ScaleTo(scale_start).Then().Delay(logo_scale_duration * 0.7f).ScaleTo(scale_start - scale_adjust, logo_scale_duration * 0.3f, Easing.InQuint);
-                        lazerLogo.Start(logo_1, logo_scale_duration);
+
+                        lazerLogo.TransformTo(nameof(LazerLogo.Highlight), 0.6f, logo_scale_duration * 0.4f, Easing.OutCirc).Then()
+                                 .TransformTo(nameof(LazerLogo.Highlight), 1f, logo_scale_duration * 0.4f);
+
+                        lazerLogo.TransformTo(nameof(LazerLogo.Animation), 0.4f, logo_scale_duration * 0.5f, Easing.OutQuart).Then()
+                                 .TransformTo(nameof(LazerLogo.Animation), 1f, logo_scale_duration * 0.4f);
+
                         logoContainerSecondary.ScaleTo(scale_start).Then().ScaleTo(scale_start - scale_adjust * 0.25f, logo_scale_duration, Easing.InQuad);
                     }
 
@@ -258,20 +265,42 @@ namespace osu.Game.Screens.Menu
 
             private class LazerLogo : CompositeDrawable
             {
-                private readonly Stream videoStream;
+                private HueAnimation highlight, animation;
 
-                public LazerLogo(Stream videoStream)
+                public float Highlight
+                {
+                    get => highlight.AnimationProgress;
+                    set => highlight.AnimationProgress = value;
+                }
+
+                public float Animation
+                {
+                    get => animation.AnimationProgress;
+                    set => animation.AnimationProgress = value;
+                }
+
+                public LazerLogo()
                 {
-                    this.videoStream = videoStream;
                     Size = new Vector2(960);
                 }
 
                 [BackgroundDependencyLoader]
-                private void load()
+                private void load(TextureStore textures)
                 {
-                    InternalChild = new Video(videoStream)
+                    const string lazer_logo_texture = @"Intro/Triangles/logo-triangles";
+
+                    InternalChildren = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both,
+                        highlight = new HueAnimation
+                        {
+                            Texture = textures.Get(lazer_logo_texture),
+                            Colour = OsuColour.Gray(0.6f).Opacity(0.8f),
+                        },
+                        animation = new HueAnimation
+                        {
+                            Texture = textures.Get(lazer_logo_texture),
+                            Colour = Color4.White.Opacity(0.8f),
+                        },
                     };
                 }
             }
diff --git a/osu.Game/Screens/Menu/LazerLogo.cs b/osu.Game/Screens/Menu/LazerLogo.cs
deleted file mode 100644
index ab9c82bc58..0000000000
--- a/osu.Game/Screens/Menu/LazerLogo.cs
+++ /dev/null
@@ -1,109 +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.Graphics;
-using osu.Framework.Graphics.OpenGL.Vertices;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Shaders;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.MathUtils;
-using osuTK;
-
-namespace osu.Game.Screens.Menu
-{
-    public class LazerLogo : Drawable
-    {
-        private IShader shader;
-        private Texture texture;
-
-        private double startTime = -1000;
-        private double animationTime = -1000;
-
-        private float animation;
-        private float highlight;
-
-        public LazerLogo()
-        {
-            Size = new Vector2(960);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(ShaderManager shaders, TextureStore textures)
-        {
-            shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"LazerLogo");
-            texture = textures.Get("Menu/logo-triangles.png");
-        }
-
-        public void Start(double delay, double duration)
-        {
-            startTime = Clock.CurrentTime + delay;
-            animationTime = duration;
-        }
-
-        public override bool IsPresent => true;
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (animationTime < 0) return;
-
-            highlight = Clock.CurrentTime < startTime + 0.4 * animationTime
-                ? Interpolation.ValueAt(Clock.CurrentTime, 0f, 1f, startTime, startTime + animationTime * 1.07, Easing.OutCirc)
-                : Interpolation.ValueAt(Clock.CurrentTime, 0.6f, 1f, startTime, startTime + animationTime * 0.9);
-
-            animation = Clock.CurrentTime < startTime + 0.5 * animationTime
-                ? Interpolation.ValueAt(Clock.CurrentTime, 0f, 0.8f, startTime, startTime + animationTime * 1.23, Easing.OutQuart)
-                : Interpolation.ValueAt(Clock.CurrentTime, 0.4f, 1f, startTime, startTime + animationTime);
-        }
-
-        protected override DrawNode CreateDrawNode() => new LazerLogoDrawNode(this);
-
-        private class LazerLogoDrawNode : DrawNode
-        {
-            protected new LazerLogo Source => (LazerLogo)base.Source;
-
-            private IShader shader;
-            private Texture texture;
-            private Quad screenSpaceDrawQuad;
-            private float animation;
-            private float highlight;
-
-            public LazerLogoDrawNode(LazerLogo source)
-                : base(source)
-            {
-            }
-
-            public override void ApplyState()
-            {
-                base.ApplyState();
-
-                shader = Source.shader;
-                texture = Source.texture;
-                screenSpaceDrawQuad = Source.ScreenSpaceDrawQuad;
-                animation = Source.animation;
-                highlight = Source.highlight;
-            }
-
-            protected virtual void Blit(Action<TexturedVertex2D> vertexAction)
-            {
-                DrawQuad(texture, screenSpaceDrawQuad, DrawColourInfo.Colour, null, vertexAction);
-            }
-
-            public override void Draw(Action<TexturedVertex2D> vertexAction)
-            {
-                base.Draw(vertexAction);
-
-                shader.Bind();
-                shader.GetUniform<float>("highlight").Value = highlight;
-                shader.GetUniform<float>("animation").Value = animation;
-
-                Blit(vertexAction);
-
-                shader.Unbind();
-            }
-        }
-    }
-}

From 2e8f30461f63db8c651b20a463f8e4f34ae23c8a Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Wed, 24 Jun 2020 14:22:12 +0200
Subject: [PATCH 03450/10326] play/stops music when entering the pause overlay,
 instead of letting it play silently in the background

---
 osu.Game/Screens/Play/PauseOverlay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 2656ef1ebd..8b35c69aa7 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -38,13 +38,13 @@ namespace osu.Game.Screens.Play
                 {
                     Looping = true,
                 });
-                pauseLoop?.Play();
             }
         }
 
         protected override void PopIn()
         {
             base.PopIn();
+            pauseLoop?.Play();
             pauseLoop?.VolumeTo(1.0f, 400, Easing.InQuint);
         }
 
@@ -52,6 +52,7 @@ namespace osu.Game.Screens.Play
         {
             base.PopOut();
             pauseLoop?.VolumeTo(0.0f);
+            pauseLoop?.Stop();
         }
     }
 }

From 0d3bc1ac29685628e57cceddd94d525b6ef48ea2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Jun 2020 22:29:30 +0900
Subject: [PATCH 03451/10326] Add basic heatmap colour scaling based on peak
 value

---
 .../Statistics/AccuracyHeatmap.cs             | 59 ++++++++++++++++---
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 94d47ecb32..eeb8b519ca 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -39,6 +40,11 @@ namespace osu.Game.Rulesets.Osu.Statistics
         private readonly ScoreInfo score;
         private readonly IBeatmap playableBeatmap;
 
+        /// <summary>
+        /// The highest count of any point currently being displayed.
+        /// </summary>
+        protected float PeakValue { get; private set; }
+
         public AccuracyHeatmap(ScoreInfo score, IBeatmap playableBeatmap)
         {
             this.score = score;
@@ -152,7 +158,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
                         ? HitPointType.Hit
                         : HitPointType.Miss;
 
-                    var point = new HitPoint(pointType)
+                    var point = new HitPoint(pointType, this)
                     {
                         Colour = pointType == HitPointType.Hit ? new Color4(102, 255, 204, 255) : new Color4(255, 102, 102, 255)
                     };
@@ -215,7 +221,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
             int r = Math.Clamp((int)Math.Round(localPoint.Y), 0, points_per_dimension - 1);
             int c = Math.Clamp((int)Math.Round(localPoint.X), 0, points_per_dimension - 1);
 
-            ((HitPoint)pointGrid.Content[r][c]).Increment();
+            PeakValue = Math.Max(PeakValue, ((HitPoint)pointGrid.Content[r][c]).Increment());
 
             bufferedGrid.ForceRedraw();
         }
@@ -223,21 +229,56 @@ namespace osu.Game.Rulesets.Osu.Statistics
         private class HitPoint : Circle
         {
             private readonly HitPointType pointType;
+            private readonly AccuracyHeatmap heatmap;
 
-            public HitPoint(HitPointType pointType)
+            public override bool IsPresent => count > 0;
+
+            public HitPoint(HitPointType pointType, AccuracyHeatmap heatmap)
             {
                 this.pointType = pointType;
+                this.heatmap = heatmap;
 
                 RelativeSizeAxes = Axes.Both;
-                Alpha = 0;
+                Alpha = 1;
             }
 
-            public void Increment()
+            private int count;
+
+            /// <summary>
+            /// Increment the value of this point by one.
+            /// </summary>
+            /// <returns>The value after incrementing.</returns>
+            public int Increment()
             {
-                if (Alpha < 1)
-                    Alpha += 0.1f;
-                else if (pointType == HitPointType.Hit)
-                    Colour = ((Color4)Colour).Lighten(0.1f);
+                return ++count;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                // the point at which alpha is saturated and we begin to adjust colour lightness.
+                const float lighten_cutoff = 0.95f;
+
+                // the amount of lightness to attribute regardless of relative value to peak point.
+                const float non_relative_portion = 0.2f;
+
+                float amount = 0;
+
+                // give some amount of alpha regardless of relative count
+                amount += non_relative_portion * Math.Min(1, count / 10f);
+
+                // add relative portion
+                amount += (1 - non_relative_portion) * (count / heatmap.PeakValue);
+
+                // apply easing
+                amount = (float)Interpolation.ApplyEasing(Easing.OutQuint, Math.Min(1, amount));
+
+                Debug.Assert(amount <= 1);
+
+                Alpha = Math.Min(amount / lighten_cutoff, 1);
+                if (pointType == HitPointType.Hit)
+                    Colour = ((Color4)Colour).Lighten(Math.Max(0, amount - lighten_cutoff));
             }
         }
 

From 6f0ec36407510e54c49b4cef6710bf620c35a564 Mon Sep 17 00:00:00 2001
From: jorolf <jorolf@gmx.de>
Date: Wed, 24 Jun 2020 16:27:00 +0200
Subject: [PATCH 03452/10326] remove size from hue animation

---
 .../Visual/UserInterface/TestSceneHueAnimation.cs           | 6 ++++--
 osu.Game/Graphics/Sprites/HueAnimation.cs                   | 6 ------
 osu.Game/Screens/Menu/IntroTriangles.cs                     | 2 ++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
index 582849a053..85ddfb08f9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
@@ -13,13 +13,15 @@ namespace osu.Game.Tests.Visual.UserInterface
     public class TestSceneHueAnimation : OsuTestScene
     {
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        private void load(LargeTextureStore textures)
         {
             HueAnimation anim;
 
             Add(anim = new HueAnimation
             {
-                Texture = textures.Get("Intro/Triangles/logo-triangles.png"),
+                RelativeSizeAxes = Axes.Both,
+                FillMode = FillMode.Fit,
+                Texture = textures.Get("Intro/Triangles/logo-triangles"),
                 Colour = Colour4.White,
             });
 
diff --git a/osu.Game/Graphics/Sprites/HueAnimation.cs b/osu.Game/Graphics/Sprites/HueAnimation.cs
index 55a167cf59..4f2bafe27f 100644
--- a/osu.Game/Graphics/Sprites/HueAnimation.cs
+++ b/osu.Game/Graphics/Sprites/HueAnimation.cs
@@ -8,17 +8,11 @@ using osu.Framework.Graphics.OpenGL.Vertices;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osuTK;
 
 namespace osu.Game.Graphics.Sprites
 {
     public class HueAnimation : Sprite
     {
-        public HueAnimation()
-        {
-            Size = new Vector2(960);
-        }
-
         [BackgroundDependencyLoader]
         private void load(ShaderManager shaders, TextureStore textures)
         {
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 53eb0eb270..95fc101094 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -293,11 +293,13 @@ namespace osu.Game.Screens.Menu
                     {
                         highlight = new HueAnimation
                         {
+                            RelativeSizeAxes = Axes.Both,
                             Texture = textures.Get(lazer_logo_texture),
                             Colour = OsuColour.Gray(0.6f).Opacity(0.8f),
                         },
                         animation = new HueAnimation
                         {
+                            RelativeSizeAxes = Axes.Both,
                             Texture = textures.Get(lazer_logo_texture),
                             Colour = Color4.White.Opacity(0.8f),
                         },

From 4c283476866d7cf9d276a8e3219fa3a069f7604f Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Wed, 24 Jun 2020 15:34:20 +0100
Subject: [PATCH 03453/10326] Adjust sample rate by UserPlaybackRate

---
 osu.Game/Screens/Play/Player.cs                            | 2 +-
 osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 83991ad027..71a97da5c2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Screens.Play
 
         public bool LoadedBeatmapSuccessfully => DrawableRuleset?.Objects.Any() == true;
 
-        protected GameplayClockContainer GameplayClockContainer { get; private set; }
+        public GameplayClockContainer GameplayClockContainer { get; private set; }
 
         public DimmableStoryboard DimmableStoryboard { get; private set; }
 
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 8eaf9ac652..3dc7eab968 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -4,11 +4,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -32,7 +34,7 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, IBindable<IReadOnlyList<Mod>> mods)
+        private void load(IBindable<WorkingBeatmap> beatmap, IBindable<IReadOnlyList<Mod>> mods, Player player)
         {
             Channel = beatmap.Value.Skin.GetSample(sampleInfo);
             if (Channel == null)
@@ -42,6 +44,8 @@ namespace osu.Game.Storyboards.Drawables
 
             foreach (var mod in mods.Value.OfType<IApplicableToSample>())
                 mod.ApplyToSample(Channel);
+
+            Channel.AddAdjustment(AdjustableProperty.Frequency, player.GameplayClockContainer.UserPlaybackRate);
         }
 
         protected override void Update()

From 992ada46700d6f6420a6f22b0904376bb7ec7c58 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Wed, 24 Jun 2020 16:17:18 +0100
Subject: [PATCH 03454/10326] Revert UserPlaybackRate changes

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 3dc7eab968..5aeadb2e1f 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, IBindable<IReadOnlyList<Mod>> mods, Player player)
+        private void load(IBindable<WorkingBeatmap> beatmap, IBindable<IReadOnlyList<Mod>> mods)
         {
             Channel = beatmap.Value.Skin.GetSample(sampleInfo);
             if (Channel == null)
@@ -44,8 +44,6 @@ namespace osu.Game.Storyboards.Drawables
 
             foreach (var mod in mods.Value.OfType<IApplicableToSample>())
                 mod.ApplyToSample(Channel);
-
-            Channel.AddAdjustment(AdjustableProperty.Frequency, player.GameplayClockContainer.UserPlaybackRate);
         }
 
         protected override void Update()

From f2a48a339ea7e643ab5156764f99450d53f30bf2 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Wed, 24 Jun 2020 16:33:19 +0100
Subject: [PATCH 03455/10326] Remove unused usings

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 5aeadb2e1f..8eaf9ac652 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -4,13 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Storyboards.Drawables
 {

From 063503f4db9ec775ffaa1204fc2e69a55d25329c Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 24 Jun 2020 20:43:56 +0200
Subject: [PATCH 03456/10326] Move null check outside of the loop

---
 .../NonVisual/CustomDataDirectoryTest.cs      | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index c8a5988104..4149e3d3ef 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -152,16 +152,19 @@ namespace osu.Game.Tests.NonVisual
                     Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
                     Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
 
-                    foreach (var file in osuStorage?.IgnoreFiles ?? Array.Empty<string>())
+                    if (osuStorage != null)
                     {
-                        Assert.That(host.Storage.Exists(file), Is.True);
-                        Assert.That(storage.Exists(file), Is.False);
-                    }
+                        foreach (var file in osuStorage.IgnoreFiles)
+                        {
+                            Assert.That(host.Storage.Exists(file), Is.True);
+                            Assert.That(storage.Exists(file), Is.False);
+                        }
 
-                    foreach (var dir in osuStorage?.IgnoreDirectories ?? Array.Empty<string>())
-                    {
-                        Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
-                        Assert.That(storage.ExistsDirectory(dir), Is.False);
+                        foreach (var dir in osuStorage.IgnoreDirectories)
+                        {
+                            Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
+                            Assert.That(storage.ExistsDirectory(dir), Is.False);
+                        }
                     }
 
                     Assert.That(new StreamReader(host.Storage.GetStream("storage.ini")).ReadToEnd().Contains($"FullPath = {customPath}"));

From 47a732ef604ac2f675ef71683d69eb10930d4785 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 24 Jun 2020 23:01:56 +0200
Subject: [PATCH 03457/10326] Address review comments

Now asserting instead of an if-statement, change cast from OsuStorage to MigratableStorage and make internal virtual properties protected.
---
 .../NonVisual/CustomDataDirectoryTest.cs      | 25 +++++++++----------
 osu.Game/IO/MigratableStorage.cs              |  4 +--
 osu.Game/IO/OsuStorage.cs                     |  4 +--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 4149e3d3ef..43c1c77786 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Tests.NonVisual
                 {
                     var osu = loadOsu(host);
                     var storage = osu.Dependencies.Get<Storage>();
-                    var osuStorage = storage as OsuStorage;
+                    var osuStorage = storage as MigratableStorage;
 
                     // ensure we perform a save
                     host.Dependencies.Get<FrameworkConfigManager>().Save();
@@ -152,19 +152,18 @@ namespace osu.Game.Tests.NonVisual
                     Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
                     Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
 
-                    if (osuStorage != null)
-                    {
-                        foreach (var file in osuStorage.IgnoreFiles)
-                        {
-                            Assert.That(host.Storage.Exists(file), Is.True);
-                            Assert.That(storage.Exists(file), Is.False);
-                        }
+                    Assert.That(osuStorage, Is.Not.Null);
 
-                        foreach (var dir in osuStorage.IgnoreDirectories)
-                        {
-                            Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
-                            Assert.That(storage.ExistsDirectory(dir), Is.False);
-                        }
+                    foreach (var file in osuStorage.IgnoreFiles)
+                    {
+                        Assert.That(host.Storage.Exists(file), Is.True);
+                        Assert.That(storage.Exists(file), Is.False);
+                    }
+
+                    foreach (var dir in osuStorage.IgnoreDirectories)
+                    {
+                        Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
+                        Assert.That(storage.ExistsDirectory(dir), Is.False);
                     }
 
                     Assert.That(new StreamReader(host.Storage.GetStream("storage.ini")).ReadToEnd().Contains($"FullPath = {customPath}"));
diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index ec85e0bac9..faa39d2ef8 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -14,8 +14,8 @@ namespace osu.Game.IO
     /// </summary>
     public abstract class MigratableStorage : WrappedStorage
     {
-        internal virtual string[] IgnoreDirectories => Array.Empty<string>();
-        internal virtual string[] IgnoreFiles => Array.Empty<string>();
+        public virtual string[] IgnoreDirectories => Array.Empty<string>();
+        public virtual string[] IgnoreFiles => Array.Empty<string>();
 
         protected MigratableStorage(Storage storage, string subPath = null)
             : base(storage, subPath)
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 514f172f74..31ee802141 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -14,9 +14,9 @@ namespace osu.Game.IO
         private readonly GameHost host;
         private readonly StorageConfigManager storageConfig;
 
-        internal override string[] IgnoreDirectories => new[] { "cache" };
+        public override string[] IgnoreDirectories => new[] { "cache" };
 
-        internal override string[] IgnoreFiles => new[]
+        public override string[] IgnoreFiles => new[]
         {
             "framework.ini",
             "storage.ini"

From 1409ace282035eb5c5b01e5d2e099049c0dad829 Mon Sep 17 00:00:00 2001
From: jorolf <jorolf@gmx.de>
Date: Thu, 25 Jun 2020 00:59:12 +0200
Subject: [PATCH 03458/10326] apply suggestions

---
 osu.Game/Graphics/Sprites/HueAnimation.cs |  4 ++--
 osu.Game/Screens/Menu/IntroTriangles.cs   | 26 +++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Graphics/Sprites/HueAnimation.cs b/osu.Game/Graphics/Sprites/HueAnimation.cs
index 4f2bafe27f..82ac1aad36 100644
--- a/osu.Game/Graphics/Sprites/HueAnimation.cs
+++ b/osu.Game/Graphics/Sprites/HueAnimation.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.Sprites
 
         private class HueAnimationDrawNode : SpriteDrawNode
         {
-            protected new HueAnimation Source => (HueAnimation)base.Source;
+            private HueAnimation source => (HueAnimation)base.Source;
 
             private float progress;
 
@@ -53,7 +53,7 @@ namespace osu.Game.Graphics.Sprites
             {
                 base.ApplyState();
 
-                progress = Source.animationProgress;
+                progress = source.animationProgress;
             }
 
             protected override void Blit(Action<TexturedVertex2D> vertexAction)
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 95fc101094..2074fc7081 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -218,11 +218,11 @@ namespace osu.Game.Screens.Menu
                         // matching flyte curve y = 0.25x^2 + (max(0, x - 0.7) / 0.3) ^ 5
                         lazerLogo.FadeIn().ScaleTo(scale_start).Then().Delay(logo_scale_duration * 0.7f).ScaleTo(scale_start - scale_adjust, logo_scale_duration * 0.3f, Easing.InQuint);
 
-                        lazerLogo.TransformTo(nameof(LazerLogo.Highlight), 0.6f, logo_scale_duration * 0.4f, Easing.OutCirc).Then()
-                                 .TransformTo(nameof(LazerLogo.Highlight), 1f, logo_scale_duration * 0.4f);
+                        lazerLogo.TransformTo(nameof(LazerLogo.OutlineHighlight), 0.6f, logo_scale_duration * 0.4f, Easing.OutCirc).Then()
+                                 .TransformTo(nameof(LazerLogo.OutlineHighlight), 1f, logo_scale_duration * 0.4f);
 
-                        lazerLogo.TransformTo(nameof(LazerLogo.Animation), 0.4f, logo_scale_duration * 0.5f, Easing.OutQuart).Then()
-                                 .TransformTo(nameof(LazerLogo.Animation), 1f, logo_scale_duration * 0.4f);
+                        lazerLogo.TransformTo(nameof(LazerLogo.Outline), 0.4f, logo_scale_duration * 0.5f, Easing.OutQuart).Then()
+                                 .TransformTo(nameof(LazerLogo.Outline), 1f, logo_scale_duration * 0.4f);
 
                         logoContainerSecondary.ScaleTo(scale_start).Then().ScaleTo(scale_start - scale_adjust * 0.25f, logo_scale_duration, Easing.InQuad);
                     }
@@ -265,18 +265,18 @@ namespace osu.Game.Screens.Menu
 
             private class LazerLogo : CompositeDrawable
             {
-                private HueAnimation highlight, animation;
+                private HueAnimation outlineHighlight, outline;
 
-                public float Highlight
+                public float OutlineHighlight
                 {
-                    get => highlight.AnimationProgress;
-                    set => highlight.AnimationProgress = value;
+                    get => outlineHighlight.AnimationProgress;
+                    set => outlineHighlight.AnimationProgress = value;
                 }
 
-                public float Animation
+                public float Outline
                 {
-                    get => animation.AnimationProgress;
-                    set => animation.AnimationProgress = value;
+                    get => outline.AnimationProgress;
+                    set => outline.AnimationProgress = value;
                 }
 
                 public LazerLogo()
@@ -291,13 +291,13 @@ namespace osu.Game.Screens.Menu
 
                     InternalChildren = new Drawable[]
                     {
-                        highlight = new HueAnimation
+                        outlineHighlight = new HueAnimation
                         {
                             RelativeSizeAxes = Axes.Both,
                             Texture = textures.Get(lazer_logo_texture),
                             Colour = OsuColour.Gray(0.6f).Opacity(0.8f),
                         },
-                        animation = new HueAnimation
+                        outline = new HueAnimation
                         {
                             RelativeSizeAxes = Axes.Both,
                             Texture = textures.Get(lazer_logo_texture),

From ac5cd8f25a3a1f08c3adc3fe562e0fbdc5b0585c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 13:40:26 +0900
Subject: [PATCH 03459/10326] Fix colours with 0 alpha being invisible in
 legacy skins

---
 osu.Game/Skinning/LegacySkin.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 0b2b723440..bbc64a24e7 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -271,7 +271,15 @@ namespace osu.Game.Skinning
         }
 
         private IBindable<Color4> getCustomColour(IHasCustomColours source, string lookup)
-            => source.CustomColours.TryGetValue(lookup, out var col) ? new Bindable<Color4>(col) : null;
+        {
+            if (!source.CustomColours.TryGetValue(lookup, out var col))
+                return null;
+
+            if (col.A == 0)
+                col.A = 1;
+
+            return new Bindable<Color4>(col);
+        }
 
         private IBindable<string> getManiaImage(LegacyManiaSkinConfiguration source, string lookup)
             => source.ImageLookups.TryGetValue(lookup, out var image) ? new Bindable<string>(image) : null;

From 4c601af207c3374eb37fd588e989e2ee9f129acb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 13:43:14 +0900
Subject: [PATCH 03460/10326] Match condition

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

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index bbc64a24e7..be6d694efe 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -275,7 +275,7 @@ namespace osu.Game.Skinning
             if (!source.CustomColours.TryGetValue(lookup, out var col))
                 return null;
 
-            if (col.A == 0)
+            if (col.A <= 0 || col.A >= 255)
                 col.A = 1;
 
             return new Bindable<Color4>(col);

From 8b84aa454d61cd61390fcce8f8f79be4e8ab1ebb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 13:43:56 +0900
Subject: [PATCH 03461/10326] Fix incorrect upper bound

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

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index be6d694efe..ea630b9b8d 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -275,7 +275,7 @@ namespace osu.Game.Skinning
             if (!source.CustomColours.TryGetValue(lookup, out var col))
                 return null;
 
-            if (col.A <= 0 || col.A >= 255)
+            if (col.A <= 0 || col.A >= 1)
                 col.A = 1;
 
             return new Bindable<Color4>(col);

From 4ff9a910121d85957cdb94011a8ed5dba653c3ad Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 14:15:26 +0900
Subject: [PATCH 03462/10326] Adjust at parse time instead

---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs |  7 ++++++-
 osu.Game/Skinning/LegacySkin.cs            | 10 +---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 6406bd88a5..a0e83554a3 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -103,7 +103,12 @@ namespace osu.Game.Beatmaps.Formats
 
             try
             {
-                colour = new Color4(byte.Parse(split[0]), byte.Parse(split[1]), byte.Parse(split[2]), split.Length == 4 ? byte.Parse(split[3]) : (byte)255);
+                byte alpha = split.Length == 4 ? byte.Parse(split[3]) : (byte)255;
+
+                if (alpha == 0)
+                    alpha = 255;
+
+                colour = new Color4(byte.Parse(split[0]), byte.Parse(split[1]), byte.Parse(split[2]), alpha);
             }
             catch
             {
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index ea630b9b8d..0b2b723440 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -271,15 +271,7 @@ namespace osu.Game.Skinning
         }
 
         private IBindable<Color4> getCustomColour(IHasCustomColours source, string lookup)
-        {
-            if (!source.CustomColours.TryGetValue(lookup, out var col))
-                return null;
-
-            if (col.A <= 0 || col.A >= 1)
-                col.A = 1;
-
-            return new Bindable<Color4>(col);
-        }
+            => source.CustomColours.TryGetValue(lookup, out var col) ? new Bindable<Color4>(col) : null;
 
         private IBindable<string> getManiaImage(LegacyManiaSkinConfiguration source, string lookup)
             => source.ImageLookups.TryGetValue(lookup, out var image) ? new Bindable<string>(image) : null;

From 531a69650f390ef3825f449daf46f0a32149895a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 14:22:40 +0900
Subject: [PATCH 03463/10326] Add test

---
 osu.Game.Tests/Resources/skin-zero-alpha-colour.ini |  5 +++++
 osu.Game.Tests/Skins/LegacySkinDecoderTest.cs       | 10 ++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/skin-zero-alpha-colour.ini

diff --git a/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini b/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini
new file mode 100644
index 0000000000..3c0dae6b13
--- /dev/null
+++ b/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini
@@ -0,0 +1,5 @@
+[General]
+Version: latest
+
+[Colours]
+Combo1: 255,255,255,0
\ No newline at end of file
diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
index aedf26ee75..c408d2f182 100644
--- a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
@@ -108,5 +108,15 @@ namespace osu.Game.Tests.Skins
             using (var stream = new LineBufferedReader(resStream))
                 Assert.That(decoder.Decode(stream).LegacyVersion, Is.EqualTo(1.0m));
         }
+
+        [Test]
+        public void TestDecodeColourWithZeroAlpha()
+        {
+            var decoder = new LegacySkinDecoder();
+
+            using (var resStream = TestResources.OpenResource("skin-zero-alpha-colour.ini"))
+            using (var stream = new LineBufferedReader(resStream))
+                Assert.That(decoder.Decode(stream).ComboColours[0].A, Is.EqualTo(1.0f));
+        }
     }
 }

From fd13c0a6ddb5c8ea3260e64f956af86ab63bee5e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Jun 2020 18:44:04 +0900
Subject: [PATCH 03464/10326] Standardise line thickness

---
 osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index eeb8b519ca..89707b3ebb 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Rulesets.Osu.Statistics
         private readonly ScoreInfo score;
         private readonly IBeatmap playableBeatmap;
 
+        private const float line_thickness = 2;
+
         /// <summary>
         /// The highest count of any point currently being displayed.
         /// </summary>
@@ -69,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
                         RelativeSizeAxes = Axes.Both,
                         Size = new Vector2(inner_portion),
                         Masking = true,
-                        BorderThickness = 2f,
+                        BorderThickness = line_thickness,
                         BorderColour = Color4.White,
                         Child = new Box
                         {
@@ -98,7 +100,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
                                             Origin = Anchor.Centre,
                                             RelativeSizeAxes = Axes.Y,
                                             Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
-                                            Width = 1f,
+                                            Width = line_thickness,
                                             Rotation = -rotation,
                                             Alpha = 0.3f,
                                         },
@@ -108,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
                                             Origin = Anchor.Centre,
                                             RelativeSizeAxes = Axes.Y,
                                             Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
-                                            Width = 1f,
+                                            Width = line_thickness,
                                             Rotation = rotation
                                         },
                                     }

From c095753f2444ce052b8fa7588c9cfb1eb0956cef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Jun 2020 19:02:04 +0900
Subject: [PATCH 03465/10326] Add better line smoothing

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

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 89707b3ebb..20adbc1c02 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -98,9 +98,10 @@ namespace osu.Game.Rulesets.Osu.Statistics
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
+                                            EdgeSmoothness = new Vector2(1),
                                             RelativeSizeAxes = Axes.Y,
                                             Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
-                                            Width = line_thickness,
+                                            Width = line_thickness / 2,
                                             Rotation = -rotation,
                                             Alpha = 0.3f,
                                         },
@@ -108,9 +109,10 @@ namespace osu.Game.Rulesets.Osu.Statistics
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
+                                            EdgeSmoothness = new Vector2(1),
                                             RelativeSizeAxes = Axes.Y,
                                             Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
-                                            Width = line_thickness,
+                                            Width = line_thickness / 2, // adjust for edgesmoothness
                                             Rotation = rotation
                                         },
                                     }
@@ -121,13 +123,15 @@ namespace osu.Game.Rulesets.Osu.Statistics
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
                                 Width = 10,
-                                Height = 2,
+                                EdgeSmoothness = new Vector2(1),
+                                Height = line_thickness / 2, // adjust for edgesmoothness
                             },
                             new Box
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
-                                Width = 2,
+                                EdgeSmoothness = new Vector2(1),
+                                Width = line_thickness / 2, // adjust for edgesmoothness
                                 Height = 10,
                             }
                         }

From d7742766d054ca1d036985b6ca6c62ab946851c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Jun 2020 19:47:23 +0900
Subject: [PATCH 03466/10326] Add key/press repeat support to carousel

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 63 ++++++++++++++++++++--
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index e174c46610..6611955cce 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -452,32 +452,49 @@ namespace osu.Game.Screens.Select
         /// </summary>
         public void ScrollToSelected() => scrollPositionCache.Invalidate();
 
+        #region Key / button selection logic
+
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             switch (e.Key)
             {
                 case Key.Left:
-                    SelectNext(-1, true);
+                    if (!e.Repeat)
+                        beginRepeatSelection(() => SelectNext(-1, true), e.Key);
                     return true;
 
                 case Key.Right:
-                    SelectNext(1, true);
+                    if (!e.Repeat)
+                        beginRepeatSelection(() => SelectNext(1, true), e.Key);
                     return true;
             }
 
             return false;
         }
 
+        protected override void OnKeyUp(KeyUpEvent e)
+        {
+            switch (e.Key)
+            {
+                case Key.Left:
+                case Key.Right:
+                    endRepeatSelection(e.Key);
+                    break;
+            }
+
+            base.OnKeyUp(e);
+        }
+
         public bool OnPressed(GlobalAction action)
         {
             switch (action)
             {
                 case GlobalAction.SelectNext:
-                    SelectNext(1, false);
+                    beginRepeatSelection(() => SelectNext(1, false), action);
                     return true;
 
                 case GlobalAction.SelectPrevious:
-                    SelectNext(-1, false);
+                    beginRepeatSelection(() => SelectNext(-1, false), action);
                     return true;
             }
 
@@ -486,8 +503,46 @@ namespace osu.Game.Screens.Select
 
         public void OnReleased(GlobalAction action)
         {
+            switch (action)
+            {
+                case GlobalAction.SelectNext:
+                case GlobalAction.SelectPrevious:
+                    endRepeatSelection(action);
+                    break;
+            }
         }
 
+        private const double repeat_interval = 120;
+
+        private ScheduledDelegate repeatDelegate;
+        private object lastRepeatSource;
+
+        /// <summary>
+        /// Begin repeating the specified selection action.
+        /// </summary>
+        /// <param name="action">The action to perform.</param>
+        /// <param name="source">The source of the action. Used in conjunction with <see cref="endRepeatSelection"/> to only cancel the correct action (most recently pressed key).</param>
+        private void beginRepeatSelection(Action action, object source)
+        {
+            endRepeatSelection();
+
+            lastRepeatSource = source;
+            Scheduler.Add(repeatDelegate = new ScheduledDelegate(action, Time.Current, repeat_interval));
+        }
+
+        private void endRepeatSelection(object source = null)
+        {
+            // only the most recent source should be able to cancel the current action.
+            if (source != null && !EqualityComparer<object>.Default.Equals(lastRepeatSource, source))
+                return;
+
+            repeatDelegate?.Cancel();
+            repeatDelegate = null;
+            lastRepeatSource = null;
+        }
+
+        #endregion
+
         protected override void Update()
         {
             base.Update();

From c36d9d4fc3fa87aef05600dae76ada50bf5c076d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Jun 2020 20:01:29 +0900
Subject: [PATCH 03467/10326] Add test coverage

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 2f12194ede..073d75692e 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -17,11 +17,12 @@ using osu.Game.Rulesets;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Carousel;
 using osu.Game.Screens.Select.Filter;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
-    public class TestSceneBeatmapCarousel : OsuTestScene
+    public class TestSceneBeatmapCarousel : OsuManualInputManagerTestScene
     {
         private TestBeatmapCarousel carousel;
         private RulesetStore rulesets;
@@ -39,6 +40,43 @@ namespace osu.Game.Tests.Visual.SongSelect
             this.rulesets = rulesets;
         }
 
+        [Test]
+        public void TestKeyRepeat()
+        {
+            loadBeatmaps();
+            advanceSelection(false);
+
+            AddStep("press down arrow", () => InputManager.PressKey(Key.Down));
+
+            BeatmapInfo selection = null;
+
+            checkSelectionIterating(true);
+
+            AddStep("press up arrow", () => InputManager.PressKey(Key.Up));
+
+            checkSelectionIterating(true);
+
+            AddStep("release down arrow", () => InputManager.ReleaseKey(Key.Down));
+
+            checkSelectionIterating(true);
+
+            AddStep("release up arrow", () => InputManager.ReleaseKey(Key.Up));
+
+            checkSelectionIterating(false);
+
+            void checkSelectionIterating(bool isIterating)
+            {
+                for (int i = 0; i < 3; i++)
+                {
+                    AddStep("store selection", () => selection = carousel.SelectedBeatmap);
+                    if (isIterating)
+                        AddUntilStep("selection changed", () => carousel.SelectedBeatmap != selection);
+                    else
+                        AddUntilStep("selection not changed", () => carousel.SelectedBeatmap == selection);
+                }
+            }
+        }
+
         [Test]
         public void TestRecommendedSelection()
         {

From 9e5cc1b7a2d19bc7974065d9ed515425acf559dc Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Thu, 25 Jun 2020 13:26:42 +0200
Subject: [PATCH 03468/10326] added skin support for the pause loop

---
 osu.Game/Screens/Play/PauseOverlay.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 8b35c69aa7..fc13743fe5 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -7,7 +7,9 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
+using osu.Game.Audio;
 using osu.Game.Graphics;
+using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play
@@ -24,13 +26,13 @@ namespace osu.Game.Screens.Play
         protected override Action BackAction => () => InternalButtons.Children.First().Click();
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, AudioManager audio)
+        private void load(OsuColour colours, AudioManager audio, SkinManager skins)
         {
             AddButton("Continue", colours.Green, () => OnResume?.Invoke());
             AddButton("Retry", colours.YellowDark, () => OnRetry?.Invoke());
             AddButton("Quit", new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
 
-            var sampleChannel = audio.Samples.Get(@"Gameplay/pause-loop");
+            var sampleChannel = skins.GetSample(new SampleInfo("pause-loop")) ?? audio.Samples.Get(@"Gameplay/pause-loop");
 
             if (sampleChannel != null)
             {

From 54f087b933ef1c6df225508271c3d5c634454d69 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 18:59:14 +0900
Subject: [PATCH 03469/10326] Re-layout match subscreen columns

---
 .../TestSceneMatchLeaderboardChatDisplay.cs   |  32 ------
 .../Multiplayer/TestSceneMatchSubScreen.cs    |  16 +++
 .../Components/LeaderboardChatDisplay.cs      | 100 ------------------
 .../Match/Components/OverlinedChatDisplay.cs  |  20 ++++
 .../Match/Components/OverlinedLeaderboard.cs  |  24 +++++
 .../Screens/Multi/Match/MatchSubScreen.cs     |  60 +++--------
 osu.Game/Tests/Visual/ModTestScene.cs         |  13 ---
 osu.Game/Tests/Visual/ScreenTestScene.cs      |   4 +-
 8 files changed, 77 insertions(+), 192 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs
 delete mode 100644 osu.Game/Screens/Multi/Match/Components/LeaderboardChatDisplay.cs
 create mode 100644 osu.Game/Screens/Multi/Match/Components/OverlinedChatDisplay.cs
 create mode 100644 osu.Game/Screens/Multi/Match/Components/OverlinedLeaderboard.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs
deleted file mode 100644
index 72bbc11cd0..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs
+++ /dev/null
@@ -1,32 +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.Containers;
-using osu.Game.Screens.Multi.Match.Components;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    public class TestSceneMatchLeaderboardChatDisplay : MultiplayerTestScene
-    {
-        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.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index b687724105..8c54f49b8f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -58,6 +58,22 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("wait for load", () => match.IsCurrentScreen());
         }
 
+        [Test]
+        public void TestLoadSimpleMatch()
+        {
+            AddStep("set room properties", () =>
+            {
+                Room.RoomID.Value = 1;
+                Room.Name.Value = "my awesome room";
+                Room.Host.Value = new User { Id = 2, Username = "peppy" };
+                Room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
+                });
+            });
+        }
+
         [Test]
         public void TestPlaylistItemSelectedOnCreate()
         {
diff --git a/osu.Game/Screens/Multi/Match/Components/LeaderboardChatDisplay.cs b/osu.Game/Screens/Multi/Match/Components/LeaderboardChatDisplay.cs
deleted file mode 100644
index de02b7f605..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/LeaderboardChatDisplay.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.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,
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedChatDisplay.cs b/osu.Game/Screens/Multi/Match/Components/OverlinedChatDisplay.cs
new file mode 100644
index 0000000000..a8d898385a
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/OverlinedChatDisplay.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.Screens.Multi.Match.Components
+{
+    public class OverlinedChatDisplay : OverlinedDisplay
+    {
+        public OverlinedChatDisplay()
+            : base("Chat")
+        {
+            Content.Add(new MatchChatDisplay
+            {
+                RelativeSizeAxes = Axes.Both
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/OverlinedLeaderboard.cs
new file mode 100644
index 0000000000..bda2cd70d7
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/OverlinedLeaderboard.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.Screens.Multi.Components;
+
+namespace osu.Game.Screens.Multi.Match.Components
+{
+    public class OverlinedLeaderboard : OverlinedDisplay
+    {
+        private readonly MatchLeaderboard leaderboard;
+
+        public OverlinedLeaderboard()
+            : base("Leaderboard")
+        {
+            Content.Add(leaderboard = new MatchLeaderboard
+            {
+                RelativeSizeAxes = Axes.Both
+            });
+        }
+
+        public void RefreshScores() => leaderboard.RefreshScores();
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index f837a407a5..a2a8816b13 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.GameTypes;
@@ -52,8 +51,8 @@ namespace osu.Game.Screens.Multi.Match
 
         protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
-        private LeaderboardChatDisplay leaderboardChatDisplay;
         private MatchSettingsOverlay settingsOverlay;
+        private OverlinedLeaderboard leaderboard;
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
@@ -87,7 +86,10 @@ namespace osu.Game.Screens.Multi.Match
                                     RelativeSizeAxes = Axes.Both,
                                     Content = new[]
                                     {
-                                        new Drawable[] { new Components.Header() },
+                                        new Drawable[]
+                                        {
+                                            new Components.Header()
+                                        },
                                         new Drawable[]
                                         {
                                             new Container
@@ -96,12 +98,6 @@ 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[]
                                                     {
@@ -111,49 +107,23 @@ namespace osu.Game.Screens.Multi.Match
                                                             {
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 Padding = new MarginPadding { Right = 5 },
-                                                                Child = new OverlinedParticipants(Direction.Vertical) { RelativeSizeAxes = Axes.Both }
-                                                            },
-                                                            new Container
-                                                            {
-                                                                RelativeSizeAxes = Axes.Both,
-                                                                Padding = new MarginPadding { Horizontal = 5 },
-                                                                Child = new GridContainer
+                                                                Child = new OverlinedPlaylist(true) // Temporarily always allow selection
                                                                 {
                                                                     RelativeSizeAxes = Axes.Both,
-                                                                    Content = new[]
-                                                                    {
-                                                                        new Drawable[]
-                                                                        {
-                                                                            new OverlinedPlaylist(true) // Temporarily always allow selection
-                                                                            {
-                                                                                RelativeSizeAxes = Axes.Both,
-                                                                                SelectedItem = { BindTarget = SelectedItem }
-                                                                            }
-                                                                        },
-                                                                        null,
-                                                                        new Drawable[]
-                                                                        {
-                                                                            new TriangleButton
-                                                                            {
-                                                                                RelativeSizeAxes = Axes.X,
-                                                                                Text = "Show beatmap results",
-                                                                                Action = showBeatmapResults
-                                                                            }
-                                                                        }
-                                                                    },
-                                                                    RowDimensions = new[]
-                                                                    {
-                                                                        new Dimension(),
-                                                                        new Dimension(GridSizeMode.Absolute, 5),
-                                                                        new Dimension(GridSizeMode.AutoSize)
-                                                                    }
+                                                                    SelectedItem = { BindTarget = SelectedItem }
                                                                 }
                                                             },
                                                             new Container
+                                                            {
+                                                                RelativeSizeAxes = Axes.Both,
+                                                                Padding = new MarginPadding { Horizontal = 5 },
+                                                                Child = leaderboard = new OverlinedLeaderboard { RelativeSizeAxes = Axes.Both },
+                                                            },
+                                                            new Container
                                                             {
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 Padding = new MarginPadding { Left = 5 },
-                                                                Child = leaderboardChatDisplay = new LeaderboardChatDisplay()
+                                                                Child = new OverlinedChatDisplay { RelativeSizeAxes = Axes.Both }
                                                             }
                                                         },
                                                     }
@@ -261,7 +231,7 @@ namespace osu.Game.Screens.Multi.Match
                 case GameTypeTimeshift _:
                     multiplayer?.Push(new PlayerLoader(() => new TimeshiftPlayer(SelectedItem.Value)
                     {
-                        Exited = () => leaderboardChatDisplay.RefreshScores()
+                        Exited = () => leaderboard.RefreshScores()
                     }));
                     break;
             }
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 23b5ad0bd8..add851ebf3 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -21,19 +21,6 @@ namespace osu.Game.Tests.Visual
             AddStep("set test data", () => currentTestData = testData);
         });
 
-        public override void TearDownSteps()
-        {
-            AddUntilStep("test passed", () =>
-            {
-                if (currentTestData == null)
-                    return true;
-
-                return currentTestData.PassCondition?.Invoke() ?? false;
-            });
-
-            base.TearDownSteps();
-        }
-
         protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestData?.Beatmap ?? base.CreateBeatmap(ruleset);
 
         protected sealed override TestPlayer CreatePlayer(Ruleset ruleset)
diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index 33cc00e748..067d8faf54 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -33,8 +33,8 @@ namespace osu.Game.Tests.Visual
         [SetUpSteps]
         public virtual void SetUpSteps() => addExitAllScreensStep();
 
-        [TearDownSteps]
-        public virtual void TearDownSteps() => addExitAllScreensStep();
+        // [TearDownSteps]
+        // public virtual void TearDownSteps() => addExitAllScreensStep();
 
         private void addExitAllScreensStep()
         {

From 01fa664b7dc57587357a29a7ac6c812da294de67 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 20:53:48 +0900
Subject: [PATCH 03470/10326] Add recent participants

---
 .../Multiplayer/TestSceneMatchSubScreen.cs    |  1 +
 .../Multi/Components/OverlinedDisplay.cs      | 12 ++++
 .../Screens/Multi/Match/MatchSubScreen.cs     | 63 +++++++++++--------
 3 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index 8c54f49b8f..66091f5679 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -66,6 +66,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Room.RoomID.Value = 1;
                 Room.Name.Value = "my awesome room";
                 Room.Host.Value = new User { Id = 2, Username = "peppy" };
+                Room.RecentParticipants.Add(Room.Host.Value);
                 Room.Playlist.Add(new PlaylistItem
                 {
                     Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
diff --git a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
index 8d8d4cc404..6aeb6c94df 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
@@ -35,6 +35,18 @@ namespace osu.Game.Screens.Multi.Components
             }
         }
 
+        private bool showLine = true;
+
+        public bool ShowLine
+        {
+            get => showLine;
+            set
+            {
+                showLine = value;
+                line.Alpha = value ? 1 : 0;
+            }
+        }
+
         protected string Details
         {
             set => details.Text = value;
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index a2a8816b13..8216f64872 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -94,45 +94,56 @@ namespace osu.Game.Screens.Multi.Match
                                         {
                                             new Container
                                             {
-                                                RelativeSizeAxes = Axes.Both,
-                                                Padding = new MarginPadding { Top = 65 },
-                                                Child = new GridContainer
+                                                RelativeSizeAxes = Axes.X,
+                                                AutoSizeAxes = Axes.Y,
+                                                Margin = new MarginPadding { Top = 10 },
+                                                Child = new OverlinedParticipants(Direction.Horizontal)
                                                 {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Content = new[]
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    ShowLine = false
+                                                }
+                                            }
+                                        },
+                                        new Drawable[]
+                                        {
+                                            new GridContainer
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Content = new[]
+                                                {
+                                                    new Drawable[]
                                                     {
-                                                        new Drawable[]
+                                                        new Container
                                                         {
-                                                            new Container
+                                                            RelativeSizeAxes = Axes.Both,
+                                                            Padding = new MarginPadding { Right = 5 },
+                                                            Child = new OverlinedPlaylist(true) // Temporarily always allow selection
                                                             {
                                                                 RelativeSizeAxes = Axes.Both,
-                                                                Padding = new MarginPadding { Right = 5 },
-                                                                Child = new OverlinedPlaylist(true) // Temporarily always allow selection
-                                                                {
-                                                                    RelativeSizeAxes = Axes.Both,
-                                                                    SelectedItem = { BindTarget = SelectedItem }
-                                                                }
-                                                            },
-                                                            new Container
-                                                            {
-                                                                RelativeSizeAxes = Axes.Both,
-                                                                Padding = new MarginPadding { Horizontal = 5 },
-                                                                Child = leaderboard = new OverlinedLeaderboard { RelativeSizeAxes = Axes.Both },
-                                                            },
-                                                            new Container
-                                                            {
-                                                                RelativeSizeAxes = Axes.Both,
-                                                                Padding = new MarginPadding { Left = 5 },
-                                                                Child = new OverlinedChatDisplay { RelativeSizeAxes = Axes.Both }
+                                                                SelectedItem = { BindTarget = SelectedItem }
                                                             }
                                                         },
-                                                    }
+                                                        new Container
+                                                        {
+                                                            RelativeSizeAxes = Axes.Both,
+                                                            Padding = new MarginPadding { Horizontal = 5 },
+                                                            Child = leaderboard = new OverlinedLeaderboard { RelativeSizeAxes = Axes.Both },
+                                                        },
+                                                        new Container
+                                                        {
+                                                            RelativeSizeAxes = Axes.Both,
+                                                            Padding = new MarginPadding { Left = 5 },
+                                                            Child = new OverlinedChatDisplay { RelativeSizeAxes = Axes.Both }
+                                                        }
+                                                    },
                                                 }
                                             }
                                         }
                                     },
                                     RowDimensions = new[]
                                     {
+                                        new Dimension(GridSizeMode.AutoSize),
                                         new Dimension(GridSizeMode.AutoSize),
                                         new Dimension(),
                                     }

From d704a4597dc60d882d4b8f54d6245cbca81ab67f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Jun 2020 21:33:02 +0900
Subject: [PATCH 03471/10326] Use existing helper function for key repeat

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 6611955cce..ad19c9661f 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -19,6 +19,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
+using osu.Game.Extensions;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
@@ -527,7 +528,7 @@ namespace osu.Game.Screens.Select
             endRepeatSelection();
 
             lastRepeatSource = source;
-            Scheduler.Add(repeatDelegate = new ScheduledDelegate(action, Time.Current, repeat_interval));
+            Scheduler.Add(repeatDelegate = this.BeginKeyRepeat(Scheduler, action));
         }
 
         private void endRepeatSelection(object source = null)

From 7c1dd43899d1369106890723eda0c8c671991274 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 21:58:40 +0900
Subject: [PATCH 03472/10326] Re-style multiplayer header

---
 osu.Game/Screens/Multi/Header.cs | 101 +++++++++++++++----------------
 1 file changed, 50 insertions(+), 51 deletions(-)

diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index 5b8e8a7fd9..2cdd082068 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -1,12 +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 Humanizer;
 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.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
@@ -19,41 +21,41 @@ namespace osu.Game.Screens.Multi
 {
     public class Header : Container
     {
-        public const float HEIGHT = 121;
-
-        private readonly HeaderBreadcrumbControl breadcrumbs;
+        public const float HEIGHT = 100;
 
         public Header(ScreenStack stack)
         {
-            MultiHeaderTitle title;
             RelativeSizeAxes = Axes.X;
             Height = HEIGHT;
 
+            HeaderBreadcrumbControl breadcrumbs;
+            MultiHeaderTitle title;
+
             Children = new Drawable[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = Color4Extensions.FromHex(@"2f2043"),
+                    Colour = Color4Extensions.FromHex(@"#1f1921"),
                 },
                 new Container
                 {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
+                    Padding = new MarginPadding { Left = SearchableListOverlay.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
                     Children = new Drawable[]
                     {
                         title = new MultiHeaderTitle
                         {
                             Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.BottomLeft,
-                            X = -MultiHeaderTitle.ICON_WIDTH,
+                            Origin = Anchor.CentreLeft,
                         },
                         breadcrumbs = new HeaderBreadcrumbControl(stack)
                         {
                             Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            RelativeSizeAxes = Axes.X,
-                        },
+                            Origin = Anchor.BottomLeft
+                        }
                     },
                 },
             };
@@ -62,37 +64,26 @@ namespace osu.Game.Screens.Multi
             {
                 if (screen.NewValue is IMultiplayerSubScreen multiScreen)
                     title.Screen = multiScreen;
+
+                if (breadcrumbs.Items.Any() && screen.NewValue == breadcrumbs.Items.First())
+                    breadcrumbs.FadeOut(500, Easing.OutQuint);
+                else
+                    breadcrumbs.FadeIn(500, Easing.OutQuint);
             };
 
             breadcrumbs.Current.TriggerChange();
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private class MultiHeaderTitle : CompositeDrawable
         {
-            breadcrumbs.StripColour = colours.Green;
-        }
-
-        private class MultiHeaderTitle : CompositeDrawable, IHasAccentColour
-        {
-            public const float ICON_WIDTH = icon_size + spacing;
-
-            private const float icon_size = 25;
             private const float spacing = 6;
-            private const int text_offset = 2;
 
-            private readonly SpriteIcon iconSprite;
-            private readonly OsuSpriteText title, pageText;
+            private readonly OsuSpriteText dot;
+            private readonly OsuSpriteText pageTitle;
 
             public IMultiplayerSubScreen Screen
             {
-                set => pageText.Text = value.ShortTitle.ToLowerInvariant();
-            }
-
-            public Color4 AccentColour
-            {
-                get => pageText.Colour;
-                set => pageText.Colour = value;
+                set => pageTitle.Text = value.ShortTitle.Titleize();
             }
 
             public MultiHeaderTitle()
@@ -108,32 +99,26 @@ namespace osu.Game.Screens.Multi
                         Direction = FillDirection.Horizontal,
                         Children = new Drawable[]
                         {
-                            iconSprite = new SpriteIcon
-                            {
-                                Size = new Vector2(icon_size),
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre
-                            },
-                            title = new OsuSpriteText
+                            new OsuSpriteText
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold),
-                                Margin = new MarginPadding { Bottom = text_offset }
+                                Font = OsuFont.GetFont(size: 24),
+                                Text = "Multiplayer"
                             },
-                            new Circle
+                            dot = new OsuSpriteText
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Size = new Vector2(4),
-                                Colour = Color4.Gray,
+                                Font = OsuFont.GetFont(size: 24),
+                                Text = "·"
                             },
-                            pageText = new OsuSpriteText
+                            pageTitle = new OsuSpriteText
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Font = OsuFont.GetFont(size: 20),
-                                Margin = new MarginPadding { Bottom = text_offset }
+                                Font = OsuFont.GetFont(size: 24),
+                                Text = "Lounge"
                             }
                         }
                     },
@@ -143,9 +128,7 @@ namespace osu.Game.Screens.Multi
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
-                title.Text = "multi";
-                iconSprite.Icon = OsuIcon.Multi;
-                AccentColour = colours.Yellow;
+                pageTitle.Colour = dot.Colour = colours.Yellow;
             }
         }
 
@@ -154,12 +137,28 @@ namespace osu.Game.Screens.Multi
             public HeaderBreadcrumbControl(ScreenStack stack)
                 : base(stack)
             {
+                RelativeSizeAxes = Axes.X;
+                StripColour = Color4.Transparent;
             }
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                AccentColour = Color4.White;
+                AccentColour = Color4Extensions.FromHex("#e35c99");
+            }
+
+            protected override TabItem<IScreen> CreateTabItem(IScreen value) => new HeaderBreadcrumbTabItem(value)
+            {
+                AccentColour = AccentColour
+            };
+
+            private class HeaderBreadcrumbTabItem : BreadcrumbTabItem
+            {
+                public HeaderBreadcrumbTabItem(IScreen value)
+                    : base(value)
+                {
+                    Bar.Colour = Color4.Transparent;
+                }
             }
         }
     }

From 20092c58ff6cac5194016236ff6a72cd8574fa92 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 21:59:36 +0900
Subject: [PATCH 03473/10326] Reduce spacing between recent participants tiles

---
 osu.Game/Screens/Multi/Components/ParticipantsList.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
index 79d130adf5..7978b4eaab 100644
--- a/osu.Game/Screens/Multi/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Screens.Multi.Components
                     Direction = Direction,
                     AutoSizeAxes = AutoSizeAxes,
                     RelativeSizeAxes = RelativeSizeAxes,
-                    Spacing = new Vector2(10)
+                    Spacing = Vector2.One
                 };
 
                 for (int i = 0; i < RecentParticipants.Count; i++)

From 668105dd6ee9857824066dd236106bd2b88cea02 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 22:06:28 +0900
Subject: [PATCH 03474/10326] Adjust boldening

---
 osu.Game/Screens/Multi/Components/OverlinedDisplay.cs | 4 ++--
 osu.Game/Screens/Multi/Match/Components/Header.cs     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
index 6aeb6c94df..d2bb3c4876 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
@@ -84,9 +84,9 @@ namespace osu.Game.Screens.Multi.Components
                                 new OsuSpriteText
                                 {
                                     Text = title,
-                                    Font = OsuFont.GetFont(size: 14)
+                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
                                 },
-                                details = new OsuSpriteText { Font = OsuFont.GetFont(size: 14) },
+                                details = new OsuSpriteText { Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold) },
                             }
                         },
                     },
diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/Multi/Match/Components/Header.cs
index ddbaab1706..134a0b3f2e 100644
--- a/osu.Game/Screens/Multi/Match/Components/Header.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Header.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                                 Font = OsuFont.GetFont(size: 30),
                                 Current = { BindTarget = RoomName }
                             },
-                            hostText = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 20, weight: FontWeight.SemiBold))
+                            hostText = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 20))
                             {
                                 AutoSizeAxes = Axes.Both,
                                 Direction = FillDirection.Horizontal,
@@ -71,7 +71,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                 if (host.NewValue != null)
                 {
                     hostText.AddText("hosted by ");
-                    hostText.AddUserLink(host.NewValue);
+                    hostText.AddUserLink(host.NewValue, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
                 }
             }, true);
         }

From b7f5a89f82b9216231ae079112922bbe41e78984 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 22:13:39 +0900
Subject: [PATCH 03475/10326] Reduce background fade opacity

---
 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 e724152e08..3178e35581 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Screens.Multi
                                         Child = new Box
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Colour = ColourInfo.GradientVertical(backgroundColour.Opacity(0.7f), backgroundColour)
+                                            Colour = ColourInfo.GradientVertical(backgroundColour.Opacity(0.5f), backgroundColour)
                                         },
                                     }
                                 }

From 23f569351a11aaf945d53202438fb6dbb02009ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 22:22:19 +0900
Subject: [PATCH 03476/10326] Add back missing beatmap results button

---
 .../Screens/Multi/Match/MatchSubScreen.cs     | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 8216f64872..1b2fdffa5e 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.GameTypes;
@@ -118,10 +119,36 @@ namespace osu.Game.Screens.Multi.Match
                                                         {
                                                             RelativeSizeAxes = Axes.Both,
                                                             Padding = new MarginPadding { Right = 5 },
-                                                            Child = new OverlinedPlaylist(true) // Temporarily always allow selection
+                                                            Child = new GridContainer
                                                             {
                                                                 RelativeSizeAxes = Axes.Both,
-                                                                SelectedItem = { BindTarget = SelectedItem }
+                                                                Content = new[]
+                                                                {
+                                                                    new Drawable[]
+                                                                    {
+                                                                        new OverlinedPlaylist(true) // Temporarily always allow selection
+                                                                        {
+                                                                            RelativeSizeAxes = Axes.Both,
+                                                                            SelectedItem = { BindTarget = SelectedItem }
+                                                                        }
+                                                                    },
+                                                                    null,
+                                                                    new Drawable[]
+                                                                    {
+                                                                        new TriangleButton
+                                                                        {
+                                                                            RelativeSizeAxes = Axes.X,
+                                                                            Text = "Show beatmap results",
+                                                                            Action = showBeatmapResults
+                                                                        }
+                                                                    }
+                                                                },
+                                                                RowDimensions = new[]
+                                                                {
+                                                                    new Dimension(),
+                                                                    new Dimension(GridSizeMode.Absolute, 5),
+                                                                    new Dimension(GridSizeMode.AutoSize)
+                                                                }
                                                             }
                                                         },
                                                         new Container

From 44a8039e924b9a614bea16a2dbcaf8a52dfe03b1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 22:22:24 +0900
Subject: [PATCH 03477/10326] Reduce header further

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

diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index 2cdd082068..f5f429a37d 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Multi
 {
     public class Header : Container
     {
-        public const float HEIGHT = 100;
+        public const float HEIGHT = 80;
 
         public Header(ScreenStack stack)
         {
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Multi
                         title = new MultiHeaderTitle
                         {
                             Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
+                            Origin = Anchor.BottomLeft,
                         },
                         breadcrumbs = new HeaderBreadcrumbControl(stack)
                         {

From 8d47c908ad2909211383b2e0e5d39110c13a24b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Jun 2020 22:28:31 +0900
Subject: [PATCH 03478/10326] Remove breadcrumb fade

---
 osu.Game/Screens/Multi/Header.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index f5f429a37d..e27fa154af 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.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 Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -64,11 +63,6 @@ namespace osu.Game.Screens.Multi
             {
                 if (screen.NewValue is IMultiplayerSubScreen multiScreen)
                     title.Screen = multiScreen;
-
-                if (breadcrumbs.Items.Any() && screen.NewValue == breadcrumbs.Items.First())
-                    breadcrumbs.FadeOut(500, Easing.OutQuint);
-                else
-                    breadcrumbs.FadeIn(500, Easing.OutQuint);
             };
 
             breadcrumbs.Current.TriggerChange();

From 65a2fc3bfc052a150d67d0b14a19fece40cf47cb Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Thu, 25 Jun 2020 17:53:14 +0100
Subject: [PATCH 03479/10326] Revert access modifier

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 71a97da5c2..83991ad027 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Screens.Play
 
         public bool LoadedBeatmapSuccessfully => DrawableRuleset?.Objects.Any() == true;
 
-        public GameplayClockContainer GameplayClockContainer { get; private set; }
+        protected GameplayClockContainer GameplayClockContainer { get; private set; }
 
         public DimmableStoryboard DimmableStoryboard { get; private set; }
 

From 7d2d6a52c92a6871d9443f1700721eb837716d0e Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Thu, 25 Jun 2020 18:58:04 +0200
Subject: [PATCH 03480/10326] now uses SkinnableSample instead of Drawable
 sample

Still does not support switching skins after Pause overlay loading,
there will be no sound for the first pause (works fine the the nexts)

Also, the pause loop seems to play for approximately 1 second when exiting the
screens via restart or quit

finally, since SkinnableSound does not play a sound if its aggregate
volume is at 0, i had turn up the volume a bit before playing the loop
---
 osu.Game/Screens/Play/PauseOverlay.cs | 29 +++++++++++++++------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index fc13743fe5..990d85b1cf 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Linq;
+using Humanizer;
+using NUnit.Framework.Internal;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
 using osu.Game.Audio;
@@ -21,40 +24,40 @@ namespace osu.Game.Screens.Play
         public override string Header => "paused";
         public override string Description => "you're not going to do what i think you're going to do, are ya?";
 
-        private DrawableSample pauseLoop;
+        private SkinnableSound pauseLoop;
 
         protected override Action BackAction => () => InternalButtons.Children.First().Click();
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, AudioManager audio, SkinManager skins)
+        private void load(OsuColour colours)
         {
             AddButton("Continue", colours.Green, () => OnResume?.Invoke());
             AddButton("Retry", colours.YellowDark, () => OnRetry?.Invoke());
             AddButton("Quit", new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
 
-            var sampleChannel = skins.GetSample(new SampleInfo("pause-loop")) ?? audio.Samples.Get(@"Gameplay/pause-loop");
-
-            if (sampleChannel != null)
+            AddInternal(pauseLoop = new SkinnableSound(new SampleInfo("pause-loop"))
             {
-                AddInternal(pauseLoop = new DrawableSample(sampleChannel)
-                {
-                    Looping = true,
-                });
-            }
+                Looping = true,
+            });
+
         }
 
         protected override void PopIn()
         {
             base.PopIn();
+
+            //SkinnableSound only plays a sound if its aggregate volume is > 0, so the volume must be turned up before playing it
+            pauseLoop?.TransformBindableTo(pauseLoop.Volume, 0.00001);
+            pauseLoop?.TransformBindableTo(pauseLoop.Volume, 1.0f, 400, Easing.InQuint);
             pauseLoop?.Play();
-            pauseLoop?.VolumeTo(1.0f, 400, Easing.InQuint);
         }
 
         protected override void PopOut()
         {
             base.PopOut();
-            pauseLoop?.VolumeTo(0.0f);
-            pauseLoop?.Stop();
+            pauseLoop?.Stop(); 
+            pauseLoop?.TransformBindableTo(pauseLoop.Volume, 0.0f);
         }
+
     }
 }

From d82d901542ddb0d4018caf6b89ddc64d307abd8d Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 25 Jun 2020 20:36:55 +0200
Subject: [PATCH 03481/10326] Reuse custom_tournament where it was still used
 as a literal

---
 .../NonVisual/CustomTourneyDirectoryTest.cs                    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 4cede15d7a..ce0ceae2e1 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
 
                     storage = osu.Dependencies.Get<Storage>();
 
-                    Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(tournamentBasePath(nameof(TestCustomDirectory)), "custom")));
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(tournamentBasePath(nameof(TestCustomDirectory)), custom_tournament)));
                 }
                 finally
                 {
@@ -80,6 +80,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
 
                 // Recreate the old setup that uses "tournament" as the base path.
                 string oldPath = Path.Combine(osuRoot, "tournament");
+                
                 string videosPath = Path.Combine(oldPath, "videos");
                 string modsPath = Path.Combine(oldPath, "mods");
                 string flagsPath = Path.Combine(oldPath, "flags");

From e3d654d33f2f5d1daeed1f72e263e1e943104ed3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 26 Jun 2020 20:14:02 +0900
Subject: [PATCH 03482/10326] Cleanup

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

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index ad19c9661f..c58b34f9f2 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -513,8 +513,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private const double repeat_interval = 120;
-
         private ScheduledDelegate repeatDelegate;
         private object lastRepeatSource;
 

From 1b4c31a84f3e2e4654ea065f0dee3095bcae47c0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 26 Jun 2020 20:14:08 +0900
Subject: [PATCH 03483/10326] Remove double schedule

---
 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 c58b34f9f2..5fbe917943 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -526,7 +526,7 @@ namespace osu.Game.Screens.Select
             endRepeatSelection();
 
             lastRepeatSource = source;
-            Scheduler.Add(repeatDelegate = this.BeginKeyRepeat(Scheduler, action));
+            repeatDelegate = this.BeginKeyRepeat(Scheduler, action);
         }
 
         private void endRepeatSelection(object source = null)

From 8f6d52550f6ddfb46a7f9f8384fa1bd7fbc5c34b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 26 Jun 2020 20:32:13 +0900
Subject: [PATCH 03484/10326] Fix potential exception if button is pressed
 before selection

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 5fbe917943..71ccd6fada 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -279,6 +279,9 @@ namespace osu.Game.Screens.Select
         /// <param name="skipDifficulties">Whether to skip individual difficulties and only increment over full groups.</param>
         public void SelectNext(int direction = 1, bool skipDifficulties = true)
         {
+            if (selectedBeatmap == null)
+                return;
+
             if (beatmapSets.All(s => s.Filtered.Value))
                 return;
 

From 099416b4c3d981d7e844ca4b57833597f8e7715a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 26 Jun 2020 21:03:34 +0900
Subject: [PATCH 03485/10326] Move check inside next difficulty selection

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

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 71ccd6fada..6f913a3177 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -279,9 +279,6 @@ namespace osu.Game.Screens.Select
         /// <param name="skipDifficulties">Whether to skip individual difficulties and only increment over full groups.</param>
         public void SelectNext(int direction = 1, bool skipDifficulties = true)
         {
-            if (selectedBeatmap == null)
-                return;
-
             if (beatmapSets.All(s => s.Filtered.Value))
                 return;
 
@@ -305,6 +302,9 @@ namespace osu.Game.Screens.Select
 
         private void selectNextDifficulty(int direction)
         {
+            if (selectedBeatmap == null)
+                return;
+
             var unfilteredDifficulties = selectedBeatmapSet.Children.Where(s => !s.Filtered.Value).ToList();
 
             int index = unfilteredDifficulties.IndexOf(selectedBeatmap);

From a4bb238c4534c4bce43404c79b2e2402fb78b3d1 Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Fri, 26 Jun 2020 14:07:27 +0200
Subject: [PATCH 03486/10326] fixed bug preventing the pause loop from playing
 during the first pause after changing a skin

---
 osu.Game/Screens/Play/PauseOverlay.cs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 990d85b1cf..81c288f928 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -3,13 +3,8 @@
 
 using System;
 using System.Linq;
-using Humanizer;
-using NUnit.Framework.Internal;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Audio;
 using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
@@ -39,7 +34,9 @@ namespace osu.Game.Screens.Play
             {
                 Looping = true,
             });
-
+            // PopIn is called before updating the skin, and when a sample is updated, its "playing" value is reset
+            // the sample must be played again(and if it plays when it shouldn't, the volume will be at 0)
+            pauseLoop.OnSkinChanged += () => pauseLoop.Play();
         }
 
         protected override void PopIn()
@@ -55,9 +52,9 @@ namespace osu.Game.Screens.Play
         protected override void PopOut()
         {
             base.PopOut();
-            pauseLoop?.Stop(); 
+
+            pauseLoop?.Stop();
             pauseLoop?.TransformBindableTo(pauseLoop.Volume, 0.0f);
         }
-
     }
 }

From 97a212a7f6a35a17a098e9ae11ff2a9b27833666 Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Fri, 26 Jun 2020 14:32:01 +0200
Subject: [PATCH 03487/10326] Hide red tint based on "Show health display even
 when you can't fail" setting

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 25 ++++++++++++++++++++++-
 osu.Game/Screens/Play/HUDOverlay.cs       |  5 +++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index a49aa89a7c..6fda5a1214 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         public double LowHealthThreshold = 0.20f;
 
+        public readonly Bindable<bool> HUDEnabled = new Bindable<bool>();
         private readonly Bindable<bool> enabled = new Bindable<bool>();
         private readonly Container boxes;
 
@@ -74,7 +75,7 @@ namespace osu.Game.Screens.Play.HUD
             boxes.Colour = color.Red;
 
             configEnabled = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
-            enabled.BindValueChanged(e => this.FadeTo(e.NewValue ? 1 : 0, fade_time, Easing.OutQuint), true);
+            enabled.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue ? true : false), true);
         }
 
         protected override void LoadComplete()
@@ -105,6 +106,28 @@ namespace osu.Game.Screens.Play.HUD
                 enabled.Value = false;
         }
 
+        /// <summary>
+        /// Tries to fade based on "Fade playfield when health is low" setting
+        /// </summary>
+        /// <param name="fadeDuration">Duration of the fade</param>
+        /// <param name="easing">Type of easing</param>
+        /// <param name="fadeIn">True when you want to fade in, false when you want to fade out</param>
+        public void TryToFade(float fadeDuration, Easing easing, bool fadeIn)
+        {
+            if (HUDEnabled.Value)
+            {
+                if (fadeIn)
+                {
+                    if (enabled.Value)
+                        this.FadeIn(fadeDuration, easing);
+                }
+                else
+                    this.FadeOut(fadeDuration, easing);
+            }
+            else
+                this.FadeOut(fadeDuration, easing);
+        }
+
         protected override void Update()
         {
             double target = Math.Clamp(max_alpha * (1 - Current.Value / LowHealthThreshold), 0, max_alpha);
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 5114efd9a9..73b93582ef 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.Diagnostics.Runtime.Interop;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -153,6 +154,8 @@ namespace osu.Game.Screens.Play
 
             // start all elements hidden
             hideTargets.ForEach(d => d.Hide());
+
+            FailingLayer.HUDEnabled.BindTo(ShowHealthbar);
         }
 
         public override void Hide() => throw new InvalidOperationException($"{nameof(HUDOverlay)} should not be hidden as it will remove the ability of a user to quit. Use {nameof(ShowHud)} instead.");
@@ -168,11 +171,13 @@ namespace osu.Game.Screens.Play
                 if (healthBar.NewValue)
                 {
                     HealthDisplay.FadeIn(fade_duration, fade_easing);
+                    FailingLayer.TryToFade(fade_duration, fade_easing, true);
                     topScoreContainer.MoveToY(30, fade_duration, fade_easing);
                 }
                 else
                 {
                     HealthDisplay.FadeOut(fade_duration, fade_easing);
+                    FailingLayer.TryToFade(fade_duration, fade_easing, false);
                     topScoreContainer.MoveToY(0, fade_duration, fade_easing);
                 }
             }, true);

From efeaa1cc10ddd6d0b80ebd16651908a4be7c818a Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Fri, 26 Jun 2020 14:58:42 +0200
Subject: [PATCH 03488/10326] Make some changes, fix and add tests

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs  | 27 +++++++++++++++++++
 osu.Game/Screens/Play/HUD/FailingLayer.cs     |  3 ++-
 osu.Game/Screens/Play/HUDOverlay.cs           |  2 --
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index a95e806862..83d9e888f1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
@@ -14,6 +15,8 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private FailingLayer layer;
 
+        private Bindable<bool> enabledHUD = new Bindable<bool>();
+
         [Resolved]
         private OsuConfigManager config { get; set; }
 
@@ -24,8 +27,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 Child = layer = new FailingLayer();
                 layer.BindHealthProcessor(new DrainingHealthProcessor(1));
+                layer.HUDEnabled.BindTo(enabledHUD);
             });
 
+            AddStep("enable HUDOverlay", () => enabledHUD.Value = true);
             AddStep("enable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer is visible", () => layer.IsPresent);
         }
@@ -69,5 +74,27 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddWaitStep("wait for potential fade", 10);
             AddAssert("layer is still visible", () => layer.IsPresent);
         }
+
+        [Test]
+        public void TestLayerVisibilityWithDifferentOptions()
+        {
+            AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
+
+            AddStep("disable HUDOverlay", () => enabledHUD.Value = false);
+            AddStep("disable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
+
+            AddStep("disable HUDOverlay", () => enabledHUD.Value = false);
+            AddStep("enable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
+
+            AddStep("enable HUDOverlay", () => enabledHUD.Value = true);
+            AddStep("disable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
+
+            AddStep("enable HUDOverlay", () => enabledHUD.Value = true);
+            AddStep("enable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddUntilStep("layer fade is visible", () => layer.IsPresent);
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 6fda5a1214..d982764c30 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -75,7 +75,8 @@ namespace osu.Game.Screens.Play.HUD
             boxes.Colour = color.Red;
 
             configEnabled = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
-            enabled.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue ? true : false), true);
+            enabled.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue), true);
+            HUDEnabled.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue), true);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 73b93582ef..d4c548dce7 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -171,13 +171,11 @@ namespace osu.Game.Screens.Play
                 if (healthBar.NewValue)
                 {
                     HealthDisplay.FadeIn(fade_duration, fade_easing);
-                    FailingLayer.TryToFade(fade_duration, fade_easing, true);
                     topScoreContainer.MoveToY(30, fade_duration, fade_easing);
                 }
                 else
                 {
                     HealthDisplay.FadeOut(fade_duration, fade_easing);
-                    FailingLayer.TryToFade(fade_duration, fade_easing, false);
                     topScoreContainer.MoveToY(0, fade_duration, fade_easing);
                 }
             }, true);

From 798e8e7a8deea5d1ac665bc9491604c0f082e5ed Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Fri, 26 Jun 2020 15:12:01 +0200
Subject: [PATCH 03489/10326] Fix CI fail

---
 osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs | 2 +-
 osu.Game/Screens/Play/HUDOverlay.cs                     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 83d9e888f1..3eda47627b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private FailingLayer layer;
 
-        private Bindable<bool> enabledHUD = new Bindable<bool>();
+        private readonly Bindable<bool> enabledHUD = new Bindable<bool>();
 
         [Resolved]
         private OsuConfigManager config { get; set; }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index d4c548dce7..b55a93db1f 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Diagnostics.Runtime.Interop;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;

From bd1f38cc3ef41c0ca8bbd586c81b1cbf8b6a6d9f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 26 Jun 2020 23:21:44 +0900
Subject: [PATCH 03490/10326] Fix crash due to unsafe mod deserialisation

---
 .../Online/TestAPIModSerialization.cs         | 59 ++++++++++++++++++-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  4 +-
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Online/TestAPIModSerialization.cs b/osu.Game.Tests/Online/TestAPIModSerialization.cs
index d9318aa822..5948582d77 100644
--- a/osu.Game.Tests/Online/TestAPIModSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModSerialization.cs
@@ -49,9 +49,32 @@ namespace osu.Game.Tests.Online
             Assert.That(converted.TestSetting.Value, Is.EqualTo(2));
         }
 
+        [Test]
+        public void TestDeserialiseTimeRampMod()
+        {
+            // Create the mod with values different from default.
+            var apiMod = new APIMod(new TestModTimeRamp
+            {
+                AdjustPitch = { Value = false },
+                InitialRate = { Value = 1.25 },
+                FinalRate = { Value = 0.25 }
+            });
+
+            var deserialised = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
+            var converted = (TestModTimeRamp)deserialised.ToMod(new TestRuleset());
+
+            Assert.That(converted.AdjustPitch.Value, Is.EqualTo(false));
+            Assert.That(converted.InitialRate.Value, Is.EqualTo(1.25));
+            Assert.That(converted.FinalRate.Value, Is.EqualTo(0.25));
+        }
+
         private class TestRuleset : Ruleset
         {
-            public override IEnumerable<Mod> GetModsFor(ModType type) => new[] { new TestMod() };
+            public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[]
+            {
+                new TestMod(),
+                new TestModTimeRamp(),
+            };
 
             public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new System.NotImplementedException();
 
@@ -78,5 +101,39 @@ namespace osu.Game.Tests.Online
                 Precision = 0.01,
             };
         }
+
+        private class TestModTimeRamp : ModTimeRamp
+        {
+            public override string Name => "Test Mod";
+            public override string Acronym => "TMTR";
+            public override double ScoreMultiplier => 1;
+
+            [SettingSource("Initial rate", "The starting speed of the track")]
+            public override BindableNumber<double> InitialRate { get; } = new BindableDouble
+            {
+                MinValue = 1,
+                MaxValue = 2,
+                Default = 1.5,
+                Value = 1.5,
+                Precision = 0.01,
+            };
+
+            [SettingSource("Final rate", "The speed increase to ramp towards")]
+            public override BindableNumber<double> FinalRate { get; } = new BindableDouble
+            {
+                MinValue = 0,
+                MaxValue = 1,
+                Default = 0.5,
+                Value = 0.5,
+                Precision = 0.01,
+            };
+
+            [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
+            public override BindableBool AdjustPitch { get; } = new BindableBool
+            {
+                Default = true,
+                Value = true
+            };
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index cbd07efa97..839d97f04e 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -89,9 +89,9 @@ namespace osu.Game.Rulesets.Mods
         private void applyPitchAdjustment(ValueChangedEvent<bool> adjustPitchSetting)
         {
             // remove existing old adjustment
-            track.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
+            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
 
-            track.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
+            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
         }
 
         private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)

From c233dc476800e7df39ee242a7515cc6bc8beb5e9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 27 Jun 2020 00:16:16 +0900
Subject: [PATCH 03491/10326] Add some global error handling

---
 osu.Game/Screens/Multi/RoomManager.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index 4d6ac46c84..b8c969a845 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -166,8 +166,16 @@ namespace osu.Game.Screens.Multi
                 var r = listing[i];
                 r.Position.Value = i;
 
-                update(r, r);
-                addRoom(r);
+                try
+                {
+                    update(r, r);
+                    addRoom(r);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, $"Failed to update room: {r.Name.Value}.");
+                    rooms.Remove(r);
+                }
             }
 
             RoomsUpdated?.Invoke();

From e8d36bc3cbb5c6aa2c0f0fd6dde7d18d34799590 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 27 Jun 2020 00:19:22 +0900
Subject: [PATCH 03492/10326] Don't trigger the same exception multiple times

---
 osu.Game/Screens/Multi/RoomManager.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index b8c969a845..5083fb2ee3 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
@@ -142,6 +143,8 @@ namespace osu.Game.Screens.Multi
             joinedRoom = null;
         }
 
+        private readonly List<int> roomsFailedUpdate = new List<int>();
+
         /// <summary>
         /// Invoked when the listing of all <see cref="Room"/>s is received from the server.
         /// </summary>
@@ -173,7 +176,14 @@ namespace osu.Game.Screens.Multi
                 }
                 catch (Exception ex)
                 {
-                    Logger.Error(ex, $"Failed to update room: {r.Name.Value}.");
+                    Debug.Assert(r.RoomID.Value != null);
+
+                    if (!roomsFailedUpdate.Contains(r.RoomID.Value.Value))
+                    {
+                        Logger.Error(ex, $"Failed to update room: {r.Name.Value}.");
+                        roomsFailedUpdate.Add(r.RoomID.Value.Value);
+                    }
+
                     rooms.Remove(r);
                 }
             }

From 3783fe8d6a2797925e4ad77525c676226fcf9bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 26 Jun 2020 19:03:41 +0200
Subject: [PATCH 03493/10326] Rename fields for clarity

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs  | 14 +++++------
 osu.Game/Screens/Play/HUD/FailingLayer.cs     | 23 ++++++++++---------
 osu.Game/Screens/Play/HUDOverlay.cs           |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 3eda47627b..1c55595c97 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private FailingLayer layer;
 
-        private readonly Bindable<bool> enabledHUD = new Bindable<bool>();
+        private readonly Bindable<bool> showHealth = new Bindable<bool>();
 
         [Resolved]
         private OsuConfigManager config { get; set; }
@@ -27,10 +27,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 Child = layer = new FailingLayer();
                 layer.BindHealthProcessor(new DrainingHealthProcessor(1));
-                layer.HUDEnabled.BindTo(enabledHUD);
+                layer.ShowHealth.BindTo(showHealth);
             });
 
-            AddStep("enable HUDOverlay", () => enabledHUD.Value = true);
+            AddStep("show health", () => showHealth.Value = true);
             AddStep("enable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer is visible", () => layer.IsPresent);
         }
@@ -80,19 +80,19 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
 
-            AddStep("disable HUDOverlay", () => enabledHUD.Value = false);
+            AddStep("don't show health", () => showHealth.Value = false);
             AddStep("disable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
 
-            AddStep("disable HUDOverlay", () => enabledHUD.Value = false);
+            AddStep("don't show health", () => showHealth.Value = false);
             AddStep("enable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
 
-            AddStep("enable HUDOverlay", () => enabledHUD.Value = true);
+            AddStep("show health", () => showHealth.Value = true);
             AddStep("disable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
 
-            AddStep("enable HUDOverlay", () => enabledHUD.Value = true);
+            AddStep("show health", () => showHealth.Value = true);
             AddStep("enable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer fade is visible", () => layer.IsPresent);
         }
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index d982764c30..e8c99c2ed8 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -31,11 +31,12 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         public double LowHealthThreshold = 0.20f;
 
-        public readonly Bindable<bool> HUDEnabled = new Bindable<bool>();
-        private readonly Bindable<bool> enabled = new Bindable<bool>();
+        public readonly Bindable<bool> ShowHealth = new Bindable<bool>();
+
+        private readonly Bindable<bool> fadePlayfieldWhenHealthLow = new Bindable<bool>();
         private readonly Container boxes;
 
-        private Bindable<bool> configEnabled;
+        private Bindable<bool> fadePlayfieldWhenHealthLowSetting;
         private HealthProcessor healthProcessor;
 
         public FailingLayer()
@@ -74,9 +75,9 @@ namespace osu.Game.Screens.Play.HUD
         {
             boxes.Colour = color.Red;
 
-            configEnabled = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
-            enabled.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue), true);
-            HUDEnabled.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue), true);
+            fadePlayfieldWhenHealthLowSetting = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
+            fadePlayfieldWhenHealthLow.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue), true);
+            ShowHealth.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue), true);
         }
 
         protected override void LoadComplete()
@@ -98,13 +99,13 @@ namespace osu.Game.Screens.Play.HUD
             if (LoadState < LoadState.Ready)
                 return;
 
-            enabled.UnbindBindings();
+            fadePlayfieldWhenHealthLow.UnbindBindings();
 
             // Don't display ever if the ruleset is not using a draining health display.
             if (healthProcessor is DrainingHealthProcessor)
-                enabled.BindTo(configEnabled);
+                fadePlayfieldWhenHealthLow.BindTo(fadePlayfieldWhenHealthLowSetting);
             else
-                enabled.Value = false;
+                fadePlayfieldWhenHealthLow.Value = false;
         }
 
         /// <summary>
@@ -115,11 +116,11 @@ namespace osu.Game.Screens.Play.HUD
         /// <param name="fadeIn">True when you want to fade in, false when you want to fade out</param>
         public void TryToFade(float fadeDuration, Easing easing, bool fadeIn)
         {
-            if (HUDEnabled.Value)
+            if (ShowHealth.Value)
             {
                 if (fadeIn)
                 {
-                    if (enabled.Value)
+                    if (fadePlayfieldWhenHealthLow.Value)
                         this.FadeIn(fadeDuration, easing);
                 }
                 else
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index b55a93db1f..96e9625f76 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Screens.Play
             // start all elements hidden
             hideTargets.ForEach(d => d.Hide());
 
-            FailingLayer.HUDEnabled.BindTo(ShowHealthbar);
+            FailingLayer.ShowHealth.BindTo(ShowHealthbar);
         }
 
         public override void Hide() => throw new InvalidOperationException($"{nameof(HUDOverlay)} should not be hidden as it will remove the ability of a user to quit. Use {nameof(ShowHud)} instead.");

From 415e1c05ff7c83f9a2ef0f7981a80ecf24f60d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 26 Jun 2020 19:06:41 +0200
Subject: [PATCH 03494/10326] Simplify implementation

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 26 +++++------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index e8c99c2ed8..22b7950d31 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -76,8 +76,8 @@ namespace osu.Game.Screens.Play.HUD
             boxes.Colour = color.Red;
 
             fadePlayfieldWhenHealthLowSetting = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
-            fadePlayfieldWhenHealthLow.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue), true);
-            ShowHealth.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue), true);
+            fadePlayfieldWhenHealthLow.BindValueChanged(_ => updateState(), true);
+            ShowHealth.BindValueChanged(_ => updateState(), true);
         }
 
         protected override void LoadComplete()
@@ -108,26 +108,10 @@ namespace osu.Game.Screens.Play.HUD
                 fadePlayfieldWhenHealthLow.Value = false;
         }
 
-        /// <summary>
-        /// Tries to fade based on "Fade playfield when health is low" setting
-        /// </summary>
-        /// <param name="fadeDuration">Duration of the fade</param>
-        /// <param name="easing">Type of easing</param>
-        /// <param name="fadeIn">True when you want to fade in, false when you want to fade out</param>
-        public void TryToFade(float fadeDuration, Easing easing, bool fadeIn)
+        private void updateState()
         {
-            if (ShowHealth.Value)
-            {
-                if (fadeIn)
-                {
-                    if (fadePlayfieldWhenHealthLow.Value)
-                        this.FadeIn(fadeDuration, easing);
-                }
-                else
-                    this.FadeOut(fadeDuration, easing);
-            }
-            else
-                this.FadeOut(fadeDuration, easing);
+            var showLayer = fadePlayfieldWhenHealthLow.Value && ShowHealth.Value;
+            this.FadeTo(showLayer ? 1 : 0, fade_time, Easing.OutQuint);
         }
 
         protected override void Update()

From a63b6a3ddf571bb941b858347fe903a4b82a1c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 26 Jun 2020 19:22:30 +0200
Subject: [PATCH 03495/10326] Simplify binding

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

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 96e9625f76..f09745cf71 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -153,8 +153,6 @@ namespace osu.Game.Screens.Play
 
             // start all elements hidden
             hideTargets.ForEach(d => d.Hide());
-
-            FailingLayer.ShowHealth.BindTo(ShowHealthbar);
         }
 
         public override void Hide() => throw new InvalidOperationException($"{nameof(HUDOverlay)} should not be hidden as it will remove the ability of a user to quit. Use {nameof(ShowHud)} instead.");
@@ -264,7 +262,10 @@ namespace osu.Game.Screens.Play
             Margin = new MarginPadding { Top = 20 }
         };
 
-        protected virtual FailingLayer CreateFailingLayer() => new FailingLayer();
+        protected virtual FailingLayer CreateFailingLayer() => new FailingLayer
+        {
+            ShowHealth = { BindTarget = ShowHealthbar }
+        };
 
         protected virtual KeyCounterDisplay CreateKeyCounter() => new KeyCounterDisplay
         {

From 02f590309d9b67c40e582a1c4f4302ee216204f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 26 Jun 2020 19:22:45 +0200
Subject: [PATCH 03496/10326] Add xmldoc for public property

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 22b7950d31..d4faa4bbb7 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -31,6 +31,9 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         public double LowHealthThreshold = 0.20f;
 
+        /// <summary>
+        /// Whether the current player health should be shown on screen.
+        /// </summary>
         public readonly Bindable<bool> ShowHealth = new Bindable<bool>();
 
         private readonly Bindable<bool> fadePlayfieldWhenHealthLow = new Bindable<bool>();

From 3637bf2f9bc4929cd58cffb4aeb8830e1ceee690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 26 Jun 2020 19:23:42 +0200
Subject: [PATCH 03497/10326] Clean up member order & access modifiers

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index d4faa4bbb7..b96cfd170e 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -18,10 +18,15 @@ using osuTK.Graphics;
 namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
-    /// An overlay layer on top of the playfield which fades to red when the current player health falls below a certain threshold defined by <see cref="LowHealthThreshold"/>.
+    /// An overlay layer on top of the playfield which fades to red when the current player health falls below a certain threshold defined by <see cref="low_health_threshold"/>.
     /// </summary>
     public class FailingLayer : HealthDisplay
     {
+        /// <summary>
+        /// Whether the current player health should be shown on screen.
+        /// </summary>
+        public readonly Bindable<bool> ShowHealth = new Bindable<bool>();
+
         private const float max_alpha = 0.4f;
         private const int fade_time = 400;
         private const float gradient_size = 0.3f;
@@ -29,12 +34,7 @@ namespace osu.Game.Screens.Play.HUD
         /// <summary>
         /// The threshold under which the current player life should be considered low and the layer should start fading in.
         /// </summary>
-        public double LowHealthThreshold = 0.20f;
-
-        /// <summary>
-        /// Whether the current player health should be shown on screen.
-        /// </summary>
-        public readonly Bindable<bool> ShowHealth = new Bindable<bool>();
+        private const double low_health_threshold = 0.20f;
 
         private readonly Bindable<bool> fadePlayfieldWhenHealthLow = new Bindable<bool>();
         private readonly Container boxes;
@@ -119,7 +119,7 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override void Update()
         {
-            double target = Math.Clamp(max_alpha * (1 - Current.Value / LowHealthThreshold), 0, max_alpha);
+            double target = Math.Clamp(max_alpha * (1 - Current.Value / low_health_threshold), 0, max_alpha);
 
             boxes.Alpha = (float)Interpolation.Lerp(boxes.Alpha, target, Clock.ElapsedFrameTime * 0.01f);
 

From c47f762f24c007fe504144694d93945565fbeafc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Jun 2020 15:59:26 +0200
Subject: [PATCH 03498/10326] Update test scene to allow checking samples

---
 .../ManiaBeatmapSampleConversionTest.cs       | 20 +++++++++++++------
 .../convert-samples-expected-conversion.json  |  9 ++++++---
 .../Testing/Beatmaps/convert-samples.osu      |  2 +-
 .../mania-samples-expected-conversion.json    |  6 ++++--
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
index d8f87195d1..dd1b2e1745 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
@@ -29,13 +29,16 @@ namespace osu.Game.Rulesets.Mania.Tests
                 StartTime = hitObject.StartTime,
                 EndTime = hitObject.GetEndTime(),
                 Column = ((ManiaHitObject)hitObject).Column,
-                NodeSamples = getSampleNames((hitObject as HoldNote)?.NodeSamples)
+                Samples = getSampleNames(hitObject.Samples),
+                NodeSamples = getNodeSampleNames((hitObject as HoldNote)?.NodeSamples)
             };
         }
 
-        private IList<IList<string>> getSampleNames(List<IList<HitSampleInfo>> hitSampleInfo)
-            => hitSampleInfo?.Select(samples =>
-                                (IList<string>)samples.Select(sample => sample.LookupNames.First()).ToList())
+        private IList<string> getSampleNames(IList<HitSampleInfo> hitSampleInfo)
+            => hitSampleInfo.Select(sample => sample.LookupNames.First()).ToList();
+
+        private IList<IList<string>> getNodeSampleNames(List<IList<HitSampleInfo>> hitSampleInfo)
+            => hitSampleInfo?.Select(getSampleNames)
                             .ToList();
 
         protected override Ruleset CreateRuleset() => new ManiaRuleset();
@@ -51,14 +54,19 @@ namespace osu.Game.Rulesets.Mania.Tests
         public double StartTime;
         public double EndTime;
         public int Column;
+        public IList<string> Samples;
         public IList<IList<string>> NodeSamples;
 
         public bool Equals(SampleConvertValue other)
             => Precision.AlmostEquals(StartTime, other.StartTime, conversion_lenience)
                && Precision.AlmostEquals(EndTime, other.EndTime, conversion_lenience)
-               && samplesEqual(NodeSamples, other.NodeSamples);
+               && samplesEqual(Samples, other.Samples)
+               && nodeSamplesEqual(NodeSamples, other.NodeSamples);
 
-        private static bool samplesEqual(ICollection<IList<string>> firstSampleList, ICollection<IList<string>> secondSampleList)
+        private static bool samplesEqual(ICollection<string> firstSampleList, ICollection<string> secondSampleList)
+            => firstSampleList.SequenceEqual(secondSampleList);
+
+        private static bool nodeSamplesEqual(ICollection<IList<string>> firstSampleList, ICollection<IList<string>> secondSampleList)
         {
             if (firstSampleList == null && secondSampleList == null)
                 return true;
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
index b8ce85eef5..fec1360b26 100644
--- a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
@@ -9,7 +9,8 @@
         ["normal-hitnormal"],
         ["soft-hitnormal"],
         ["drum-hitnormal"]
-      ]
+      ],
+      "Samples": ["drum-hitnormal"]
     }, {
       "StartTime": 1875.0,
       "EndTime": 2750.0,
@@ -17,14 +18,16 @@
       "NodeSamples": [
         ["soft-hitnormal"],
         ["drum-hitnormal"]
-      ]
+      ],
+      "Samples": ["drum-hitnormal"]
     }]
   }, {
     "StartTime": 3750.0,
     "Objects": [{
       "StartTime": 3750.0,
       "EndTime": 3750.0,
-      "Column": 3
+      "Column": 3,
+      "Samples": ["normal-hitnormal"]
     }]
   }]
 }
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples.osu b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples.osu
index 16b73992d2..fea1de6614 100644
--- a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples.osu
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples.osu
@@ -13,4 +13,4 @@ SliderTickRate:1
 
 [HitObjects]
 88,99,1000,6,0,L|306:259,2,245,0|0|0,1:0|2:0|3:0,0:0:0:0:
-259,118,3750,1,0,0:0:0:0:
+259,118,3750,1,0,1:0:0:0:
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
index e22540614d..1aca75a796 100644
--- a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
@@ -8,7 +8,8 @@
       "NodeSamples": [
         ["normal-hitnormal"],
         []
-      ]
+      ],
+      "Samples": ["normal-hitnormal"]
     }]
   }, {
     "StartTime": 2000.0,
@@ -19,7 +20,8 @@
       "NodeSamples": [
         ["drum-hitnormal"],
         []
-      ]
+      ],
+      "Samples": ["drum-hitnormal"]
     }]
   }]
 }
\ No newline at end of file

From 5e92809401122afcd4504ebf99ad17e234c6dbd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Jun 2020 16:46:43 +0200
Subject: [PATCH 03499/10326] Add failing test case

---
 .../ManiaBeatmapSampleConversionTest.cs       |  1 +
 ...r-convert-samples-expected-conversion.json | 21 +++++++++++++++++++
 .../Beatmaps/slider-convert-samples.osu       | 15 +++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples.osu

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
index dd1b2e1745..c8feb4ae24 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         [TestCase("convert-samples")]
         [TestCase("mania-samples")]
+        [TestCase("slider-convert-samples")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<SampleConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json
new file mode 100644
index 0000000000..e3768a90d7
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json
@@ -0,0 +1,21 @@
+{
+  "Mappings": [{
+    "StartTime": 8470.0,
+    "Objects": [{
+      "StartTime": 8470.0,
+      "EndTime": 8470.0,
+      "Column": 0,
+      "Samples": ["normal-hitnormal", "normal-hitclap"]
+    }, {
+      "StartTime": 8626.470587768974,
+      "EndTime": 8626.470587768974,
+      "Column": 1,
+      "Samples": ["normal-hitnormal"]
+    }, {
+      "StartTime": 8782.941175537948,
+      "EndTime": 8782.941175537948,
+      "Column": 2,
+      "Samples": ["normal-hitnormal", "normal-hitclap"]
+    }]
+  }]
+}
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples.osu b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples.osu
new file mode 100644
index 0000000000..08e90ce807
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples.osu
@@ -0,0 +1,15 @@
+osu file format v14
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4
+OverallDifficulty:8
+ApproachRate:9.5
+SliderMultiplier:2.00000000596047
+SliderTickRate:1
+
+[TimingPoints]
+0,312.941176470588,4,1,0,100,1,0
+
+[HitObjects]
+82,216,8470,6,0,P|52:161|99:113,2,100,8|0|8,1:0|1:0|1:0,0:0:0:0:

From 1551c42c122119172a67c9a0900ef8d8376284fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Jun 2020 16:49:14 +0200
Subject: [PATCH 03500/10326] Avoid division when slicing node sample list

---
 .../Patterns/Legacy/DistanceObjectPatternGenerator.cs    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 9fbdf58e21..a09ef6d5b6 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -483,9 +483,12 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             if (!(HitObject is IHasPathWithRepeats curveData))
                 return null;
 
-            double segmentTime = (EndTime - HitObject.StartTime) / spanCount;
-
-            int index = (int)(segmentTime == 0 ? 0 : (time - HitObject.StartTime) / segmentTime);
+            // mathematically speaking this could be done by calculating (time - HitObject.StartTime) / SegmentDuration
+            // however, floating-point operations can introduce inaccuracies - therefore resort to iterated addition
+            // (all callers use this method to calculate repeat point times, so this way is consistent and deterministic)
+            int index = 0;
+            for (double nodeTime = HitObject.StartTime; nodeTime < time; nodeTime += SegmentDuration)
+                index += 1;
 
             // avoid slicing the list & creating copies, if at all possible.
             return index == 0 ? curveData.NodeSamples : curveData.NodeSamples.Skip(index).ToList();

From 082c94f98dfd7b00515846a06045e7b3949205b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 28 Jun 2020 13:14:46 +0200
Subject: [PATCH 03501/10326] Temporarily disable masking of tournament song
 bar

---
 osu.Game.Tournament/Components/SongBar.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index fc7fcef892..cafec0a88b 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -6,6 +6,7 @@ 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.Graphics.Sprites;
 using osu.Game.Beatmaps;
@@ -66,6 +67,9 @@ namespace osu.Game.Tournament.Components
             }
         }
 
+        // Todo: This is a hack for https://github.com/ppy/osu-framework/issues/3617 since this container is at the very edge of the screen and potentially initially masked away.
+        protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -77,8 +81,6 @@ namespace osu.Game.Tournament.Components
                 flow = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.X,
-                    // Todo: This is a hack for https://github.com/ppy/osu-framework/issues/3617 since this container is at the very edge of the screen and potentially initially masked away.
-                    Height = 1,
                     AutoSizeAxes = Axes.Y,
                     LayoutDuration = 500,
                     LayoutEasing = Easing.OutQuint,

From 0cddb85f1b83eb1c2b7a4dab43ec17b2f4e35cee Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 28 Jun 2020 15:27:50 +0200
Subject: [PATCH 03502/10326] Move storageconfig set and saving to migrate
 method

---
 .../NonVisual/CustomTourneyDirectoryTest.cs           |  2 +-
 osu.Game.Tournament/IO/TournamentStorage.cs           | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index ce0ceae2e1..b75a9a6929 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
 
                 // Recreate the old setup that uses "tournament" as the base path.
                 string oldPath = Path.Combine(osuRoot, "tournament");
-                
+
                 string videosPath = Path.Combine(oldPath, "videos");
                 string modsPath = Path.Combine(oldPath, "mods");
                 string flagsPath = Path.Combine(oldPath, "flags");
diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index ed1bfb7449..ddc298a7ea 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -11,16 +11,17 @@ namespace osu.Game.Tournament.IO
 {
     public class TournamentStorage : MigratableStorage
     {
-        private readonly Storage storage;
-        public TournamentVideoResourceStore VideoStore { get; }
         private const string default_tournament = "default";
+        private readonly Storage storage;
+        private readonly TournamentStorageManager storageConfig;
+        public TournamentVideoResourceStore VideoStore { get; }
 
         public TournamentStorage(Storage storage)
             : base(storage.GetStorageForDirectory("tournaments"), string.Empty)
         {
             this.storage = storage;
 
-            TournamentStorageManager storageConfig = new TournamentStorageManager(storage);
+            storageConfig = new TournamentStorageManager(storage);
 
             if (storage.Exists("tournament.ini"))
             {
@@ -29,8 +30,6 @@ namespace osu.Game.Tournament.IO
             else
             {
                 Migrate(GetFullPath(default_tournament));
-                storageConfig.Set(StorageConfig.CurrentTournament, default_tournament);
-                storageConfig.Save();
                 ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_tournament));
             }
 
@@ -54,6 +53,8 @@ namespace osu.Game.Tournament.IO
             moveFileIfExists("drawings.txt", destination);
             moveFileIfExists("drawings_results.txt", destination);
             moveFileIfExists("drawings.ini", destination);
+            storageConfig.Set(StorageConfig.CurrentTournament, default_tournament);
+            storageConfig.Save();
         }
 
         private void moveFileIfExists(string file, DirectoryInfo destination)

From 006adf0fb50a903c67c7317b3c721ff653615506 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 28 Jun 2020 22:45:13 +0900
Subject: [PATCH 03503/10326] Change logic to ignore rooms completely after
 first error

---
 osu.Game/Screens/Multi/RoomManager.cs | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index 5083fb2ee3..642378d8d5 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Multi
             joinedRoom = null;
         }
 
-        private readonly List<int> roomsFailedUpdate = new List<int>();
+        private readonly HashSet<int> ignoredRooms = new HashSet<int>();
 
         /// <summary>
         /// Invoked when the listing of all <see cref="Room"/>s is received from the server.
@@ -166,25 +166,26 @@ namespace osu.Game.Screens.Multi
                     continue;
                 }
 
-                var r = listing[i];
-                r.Position.Value = i;
+                var room = listing[i];
+
+                Debug.Assert(room.RoomID.Value != null);
+
+                if (ignoredRooms.Contains(room.RoomID.Value.Value))
+                    continue;
+
+                room.Position.Value = i;
 
                 try
                 {
-                    update(r, r);
-                    addRoom(r);
+                    update(room, room);
+                    addRoom(room);
                 }
                 catch (Exception ex)
                 {
-                    Debug.Assert(r.RoomID.Value != null);
+                    Logger.Error(ex, $"Failed to update room: {room.Name.Value}.");
 
-                    if (!roomsFailedUpdate.Contains(r.RoomID.Value.Value))
-                    {
-                        Logger.Error(ex, $"Failed to update room: {r.Name.Value}.");
-                        roomsFailedUpdate.Add(r.RoomID.Value.Value);
-                    }
-
-                    rooms.Remove(r);
+                    ignoredRooms.Add(room.RoomID.Value.Value);
+                    rooms.Remove(room);
                 }
             }
 

From 820056cc4e2e1497a53a3d9af7db3594940e5fcd Mon Sep 17 00:00:00 2001
From: jorolf <jorolf@gmx.de>
Date: Sun, 28 Jun 2020 17:53:53 +0200
Subject: [PATCH 03504/10326] update colours/transformations

---
 osu.Game/Screens/Menu/IntroTriangles.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 2074fc7081..8118491c36 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -218,11 +217,14 @@ namespace osu.Game.Screens.Menu
                         // matching flyte curve y = 0.25x^2 + (max(0, x - 0.7) / 0.3) ^ 5
                         lazerLogo.FadeIn().ScaleTo(scale_start).Then().Delay(logo_scale_duration * 0.7f).ScaleTo(scale_start - scale_adjust, logo_scale_duration * 0.3f, Easing.InQuint);
 
-                        lazerLogo.TransformTo(nameof(LazerLogo.OutlineHighlight), 0.6f, logo_scale_duration * 0.4f, Easing.OutCirc).Then()
-                                 .TransformTo(nameof(LazerLogo.OutlineHighlight), 1f, logo_scale_duration * 0.4f);
+                        const double highlight_duration = logo_scale_duration / 1.4;
 
-                        lazerLogo.TransformTo(nameof(LazerLogo.Outline), 0.4f, logo_scale_duration * 0.5f, Easing.OutQuart).Then()
-                                 .TransformTo(nameof(LazerLogo.Outline), 1f, logo_scale_duration * 0.4f);
+                        //Since we only have one texture, roughly align it by changing the timing
+                        lazerLogo.Outline = -0.4f;
+                        lazerLogo.TransformTo(nameof(LazerLogo.Outline), 1f, highlight_duration * 1.4);
+
+                        lazerLogo.OutlineHighlight = 0f;
+                        lazerLogo.TransformTo(nameof(LazerLogo.OutlineHighlight), 1f, highlight_duration);
 
                         logoContainerSecondary.ScaleTo(scale_start).Then().ScaleTo(scale_start - scale_adjust * 0.25f, logo_scale_duration, Easing.InQuad);
                     }
@@ -295,13 +297,13 @@ namespace osu.Game.Screens.Menu
                         {
                             RelativeSizeAxes = Axes.Both,
                             Texture = textures.Get(lazer_logo_texture),
-                            Colour = OsuColour.Gray(0.6f).Opacity(0.8f),
+                            Colour = OsuColour.Gray(0.8f),
                         },
                         outline = new HueAnimation
                         {
                             RelativeSizeAxes = Axes.Both,
                             Texture = textures.Get(lazer_logo_texture),
-                            Colour = Color4.White.Opacity(0.8f),
+                            Colour = OsuColour.Gray(0.6f * 0.8f),
                         },
                     };
                 }

From 79eca8e1bffed2138d9b89cb1216d013205e5a74 Mon Sep 17 00:00:00 2001
From: jorolf <jorolf@gmx.de>
Date: Sun, 28 Jun 2020 17:55:01 +0200
Subject: [PATCH 03505/10326] remove unneeded "base."

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

diff --git a/osu.Game/Graphics/Sprites/HueAnimation.cs b/osu.Game/Graphics/Sprites/HueAnimation.cs
index 82ac1aad36..8ad68ace05 100644
--- a/osu.Game/Graphics/Sprites/HueAnimation.cs
+++ b/osu.Game/Graphics/Sprites/HueAnimation.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.Sprites
 
         private class HueAnimationDrawNode : SpriteDrawNode
         {
-            private HueAnimation source => (HueAnimation)base.Source;
+            private HueAnimation source => (HueAnimation)Source;
 
             private float progress;
 

From 678767918e29dee961730f5f8f18a2a0e6e98c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 28 Jun 2020 23:32:04 +0200
Subject: [PATCH 03506/10326] Centralise logic further

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 30 ++++++-----------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index b96cfd170e..84dbb35f68 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -36,10 +36,9 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         private const double low_health_threshold = 0.20f;
 
-        private readonly Bindable<bool> fadePlayfieldWhenHealthLow = new Bindable<bool>();
         private readonly Container boxes;
 
-        private Bindable<bool> fadePlayfieldWhenHealthLowSetting;
+        private Bindable<bool> fadePlayfieldWhenHealthLow;
         private HealthProcessor healthProcessor;
 
         public FailingLayer()
@@ -78,15 +77,15 @@ namespace osu.Game.Screens.Play.HUD
         {
             boxes.Colour = color.Red;
 
-            fadePlayfieldWhenHealthLowSetting = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
-            fadePlayfieldWhenHealthLow.BindValueChanged(_ => updateState(), true);
-            ShowHealth.BindValueChanged(_ => updateState(), true);
+            fadePlayfieldWhenHealthLow = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
+            fadePlayfieldWhenHealthLow.BindValueChanged(_ => updateState());
+            ShowHealth.BindValueChanged(_ => updateState());
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            updateBindings();
+            updateState();
         }
 
         public override void BindHealthProcessor(HealthProcessor processor)
@@ -94,26 +93,13 @@ namespace osu.Game.Screens.Play.HUD
             base.BindHealthProcessor(processor);
 
             healthProcessor = processor;
-            updateBindings();
-        }
-
-        private void updateBindings()
-        {
-            if (LoadState < LoadState.Ready)
-                return;
-
-            fadePlayfieldWhenHealthLow.UnbindBindings();
-
-            // Don't display ever if the ruleset is not using a draining health display.
-            if (healthProcessor is DrainingHealthProcessor)
-                fadePlayfieldWhenHealthLow.BindTo(fadePlayfieldWhenHealthLowSetting);
-            else
-                fadePlayfieldWhenHealthLow.Value = false;
+            updateState();
         }
 
         private void updateState()
         {
-            var showLayer = fadePlayfieldWhenHealthLow.Value && ShowHealth.Value;
+            // Don't display ever if the ruleset is not using a draining health display.
+            var showLayer = healthProcessor is DrainingHealthProcessor && fadePlayfieldWhenHealthLow.Value && ShowHealth.Value;
             this.FadeTo(showLayer ? 1 : 0, fade_time, Easing.OutQuint);
         }
 

From ffbce61ca884320098351a331bcd658041fe79b2 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Jun 2020 00:39:49 +0200
Subject: [PATCH 03507/10326] Add the option to loop the intro in the main menu

---
 osu.Game/Configuration/OsuConfigManager.cs                   | 2 ++
 .../Overlays/Settings/Sections/Audio/MainMenuSettings.cs     | 5 +++++
 osu.Game/Screens/Menu/IntroScreen.cs                         | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 9d31bc9bba..aa9b5340f6 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -55,6 +55,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
 
             Set(OsuSetting.MenuVoice, true);
+            Set(OsuSetting.MenuMusicLoop, true);
             Set(OsuSetting.MenuMusic, true);
 
             Set(OsuSetting.AudioOffset, 0, -500.0, 500.0, 1);
@@ -191,6 +192,7 @@ namespace osu.Game.Configuration
         AudioOffset,
         VolumeInactive,
         MenuMusic,
+        MenuMusicLoop,
         MenuVoice,
         CursorRotation,
         MenuParallax,
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
index a303f93b34..7ec123c04c 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
@@ -28,6 +28,11 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                     LabelText = "osu! music theme",
                     Bindable = config.GetBindable<bool>(OsuSetting.MenuMusic)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "loop the music theme",
+                    Bindable = config.GetBindable<bool>(OsuSetting.MenuMusicLoop)
+                },
                 new SettingsDropdown<IntroSequence>
                 {
                     LabelText = "Intro sequence",
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 88d18d0073..57f93690a8 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Screens.Menu
         protected IBindable<bool> MenuVoice { get; private set; }
 
         protected IBindable<bool> MenuMusic { get; private set; }
+        private IBindable<bool> menuMusicLoop { get; set; }
 
         private WorkingBeatmap initialBeatmap;
 
@@ -73,6 +74,7 @@ namespace osu.Game.Screens.Menu
 
             MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
+            menuMusicLoop = config.GetBindable<bool>(OsuSetting.MenuMusicLoop);
 
             seeya = audio.Samples.Get(SeeyaSampleName);
 
@@ -152,6 +154,8 @@ namespace osu.Game.Screens.Menu
             // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
             if (UsingThemedIntro)
                 Track.Restart();
+            if (menuMusicLoop.Value)
+                Track.Looping = true;
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)

From 5689f279871de69937a37342e10efcb98e5232e1 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Jun 2020 00:54:06 +0200
Subject: [PATCH 03508/10326] Make sure it only loops for themed intros if true

---
 osu.Game/Screens/Menu/IntroScreen.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 57f93690a8..fa8a641203 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -152,8 +152,10 @@ namespace osu.Game.Screens.Menu
         protected void StartTrack()
         {
             // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
-            if (UsingThemedIntro)
-                Track.Restart();
+            if (!UsingThemedIntro)
+                return;
+
+            Track.Restart();
             if (menuMusicLoop.Value)
                 Track.Looping = true;
         }

From 270384e71e1fe41226eaf4864b6955fe5abcc4b1 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Jun 2020 00:59:44 +0200
Subject: [PATCH 03509/10326] Remove redundant get set

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

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index fa8a641203..8ef7ebe5e6 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Screens.Menu
         protected IBindable<bool> MenuVoice { get; private set; }
 
         protected IBindable<bool> MenuMusic { get; private set; }
-        private IBindable<bool> menuMusicLoop { get; set; }
+        private IBindable<bool> menuMusicLoop;
 
         private WorkingBeatmap initialBeatmap;
 

From 24dceb9f84e49bf778ad575076f917065e6d5f67 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Jun 2020 01:41:47 +0200
Subject: [PATCH 03510/10326] Make only "Welcome" loop

---
 osu.Game/Configuration/OsuConfigManager.cs            |  2 --
 .../Settings/Sections/Audio/MainMenuSettings.cs       |  5 -----
 osu.Game/Screens/Menu/IntroScreen.cs                  | 11 ++---------
 osu.Game/Screens/Menu/IntroWelcome.cs                 |  2 ++
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index aa9b5340f6..9d31bc9bba 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -55,7 +55,6 @@ namespace osu.Game.Configuration
             Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
 
             Set(OsuSetting.MenuVoice, true);
-            Set(OsuSetting.MenuMusicLoop, true);
             Set(OsuSetting.MenuMusic, true);
 
             Set(OsuSetting.AudioOffset, 0, -500.0, 500.0, 1);
@@ -192,7 +191,6 @@ namespace osu.Game.Configuration
         AudioOffset,
         VolumeInactive,
         MenuMusic,
-        MenuMusicLoop,
         MenuVoice,
         CursorRotation,
         MenuParallax,
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
index 7ec123c04c..a303f93b34 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
@@ -28,11 +28,6 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                     LabelText = "osu! music theme",
                     Bindable = config.GetBindable<bool>(OsuSetting.MenuMusic)
                 },
-                new SettingsCheckbox
-                {
-                    LabelText = "loop the music theme",
-                    Bindable = config.GetBindable<bool>(OsuSetting.MenuMusicLoop)
-                },
                 new SettingsDropdown<IntroSequence>
                 {
                     LabelText = "Intro sequence",
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 8ef7ebe5e6..5f91aaad15 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Screens.Menu
         protected IBindable<bool> MenuVoice { get; private set; }
 
         protected IBindable<bool> MenuMusic { get; private set; }
-        private IBindable<bool> menuMusicLoop;
 
         private WorkingBeatmap initialBeatmap;
 
@@ -74,8 +73,6 @@ namespace osu.Game.Screens.Menu
 
             MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
-            menuMusicLoop = config.GetBindable<bool>(OsuSetting.MenuMusicLoop);
-
             seeya = audio.Samples.Get(SeeyaSampleName);
 
             BeatmapSetInfo setInfo = null;
@@ -152,12 +149,8 @@ namespace osu.Game.Screens.Menu
         protected void StartTrack()
         {
             // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
-            if (!UsingThemedIntro)
-                return;
-
-            Track.Restart();
-            if (menuMusicLoop.Value)
-                Track.Looping = true;
+            if (UsingThemedIntro)
+                Track.Restart();
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index abd4a68d4f..bf42e36e8c 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Screens.Menu
                 welcome = audio.Samples.Get(@"Intro/Welcome/welcome");
 
             pianoReverb = audio.Samples.Get(@"Intro/Welcome/welcome_piano");
+
+            Track.Looping = true;
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)

From 444504f2b9c7765d6219b643e1b10464b8810240 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Jun 2020 02:10:40 +0200
Subject: [PATCH 03511/10326] Expose MainMenu Track as internal get private set

---
 osu.Game/Screens/Menu/MainMenu.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index f0da2482d6..9245df2a7d 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
@@ -63,6 +64,8 @@ namespace osu.Game.Screens.Menu
 
         protected override BackgroundScreen CreateBackground() => background;
 
+        internal Track Track { get; private set; }
+
         private Bindable<float> holdDelay;
         private Bindable<bool> loginDisplayed;
 
@@ -173,15 +176,15 @@ namespace osu.Game.Screens.Menu
             base.OnEntering(last);
             buttons.FadeInFromZero(500);
 
-            var track = Beatmap.Value.Track;
+            Track = Beatmap.Value.Track;
             var metadata = Beatmap.Value.Metadata;
 
-            if (last is IntroScreen && track != null)
+            if (last is IntroScreen && Track != null)
             {
-                if (!track.IsRunning)
+                if (!Track.IsRunning)
                 {
-                    track.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * track.Length);
-                    track.Start();
+                    Track.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * Track.Length);
+                    Track.Start();
                 }
             }
         }

From 0c4b06b48562fc15ef0ccdec53932ffaefb9d109 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Jun 2020 02:16:19 +0200
Subject: [PATCH 03512/10326] Add visualtest to check if Track loops in Welcome

---
 osu.Game.Tests/Visual/Menus/IntroTestScene.cs       | 12 ++++++------
 .../Visual/Menus/TestSceneIntroWelcome.cs           | 13 +++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/IntroTestScene.cs b/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
index 2d2f1a1618..f71d13ed35 100644
--- a/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
+++ b/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
@@ -19,10 +19,10 @@ namespace osu.Game.Tests.Visual.Menus
         [Cached]
         private OsuLogo logo;
 
+        protected OsuScreenStack IntroStack;
+
         protected IntroTestScene()
         {
-            OsuScreenStack introStack = null;
-
             Children = new Drawable[]
             {
                 new Box
@@ -45,17 +45,17 @@ namespace osu.Game.Tests.Visual.Menus
                 logo.FinishTransforms();
                 logo.IsTracking = false;
 
-                introStack?.Expire();
+                IntroStack?.Expire();
 
-                Add(introStack = new OsuScreenStack
+                Add(IntroStack = new OsuScreenStack
                 {
                     RelativeSizeAxes = Axes.Both,
                 });
 
-                introStack.Push(CreateScreen());
+                IntroStack.Push(CreateScreen());
             });
 
-            AddUntilStep("wait for menu", () => introStack.CurrentScreen is MainMenu);
+            AddUntilStep("wait for menu", () => IntroStack.CurrentScreen is MainMenu);
         }
 
         protected abstract IScreen CreateScreen();
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
index 905f17ef0b..1347bae2ad 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
@@ -11,5 +11,18 @@ namespace osu.Game.Tests.Visual.Menus
     public class TestSceneIntroWelcome : IntroTestScene
     {
         protected override IScreen CreateScreen() => new IntroWelcome();
+
+        public TestSceneIntroWelcome()
+        {
+            AddAssert("check if menu music loops", () =>
+            {
+                var menu = IntroStack?.CurrentScreen as MainMenu;
+
+                if (menu == null)
+                    return false;
+
+                return menu.Track.Looping;
+            });
+        }
     }
 }

From af7494b2325e31a4a3fef36fc263b19a9b3e9dfb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 29 Jun 2020 13:58:35 +0900
Subject: [PATCH 03513/10326] Improve quality of song select beatmap wedge

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 7a8a1593b9..27ce9e82dd 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -155,7 +155,6 @@ namespace osu.Game.Screens.Select
                 var metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
                 CacheDrawnFrameBuffer = true;
-                RedrawOnScale = false;
 
                 RelativeSizeAxes = Axes.Both;
 

From 5db103dc613d238413b56ea3b2d31312b68e67cc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 29 Jun 2020 14:38:50 +0900
Subject: [PATCH 03514/10326] Improve quality of taiko hit target

---
 osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
index 7de1593ab6..caddc8b122 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Scale = new Vector2(TaikoHitObject.DEFAULT_STRONG_SIZE),
+                    Size = new Vector2(TaikoHitObject.DEFAULT_STRONG_SIZE),
                     Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = border_thickness,
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Scale = new Vector2(TaikoHitObject.DEFAULT_SIZE),
+                    Size = new Vector2(TaikoHitObject.DEFAULT_SIZE),
                     Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = border_thickness,

From bb81f908fb163f0d77d2d2fb74c54be563cbb859 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Mon, 29 Jun 2020 15:44:10 +0800
Subject: [PATCH 03515/10326] Exclude EmptyHitWindow from being considered in
 TimingDistributionGraph

---
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 8ec7e863b1..527da429ed 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// <param name="hitEvents">The <see cref="HitEvent"/>s to display the timing distribution of.</param>
         public HitEventTimingDistributionGraph(IReadOnlyList<HitEvent> hitEvents)
         {
-            this.hitEvents = hitEvents;
+            this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows)).ToList();
         }
 
         [BackgroundDependencyLoader]

From 51f5083c2d71a87eb8fcda3f6aa1b1a748f86b47 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 29 Jun 2020 17:17:52 +0000
Subject: [PATCH 03516/10326] Bump Sentry from 2.1.3 to 2.1.4

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

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 26d81a1004..5f326a361d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.623.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
-    <PackageReference Include="Sentry" Version="2.1.3" />
+    <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From 1701c844a6a34f035e09c20b3c7a62950290be9e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 30 Jun 2020 16:36:53 +0900
Subject: [PATCH 03517/10326] Fix scroll container height on smaller ui scales

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 68 +++++++++++++----------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 193d975e42..968b446df9 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -70,41 +70,33 @@ namespace osu.Game.Screens.Ranking
                 {
                     new Drawable[]
                     {
-                        new Container
+                        new VerticalScrollContainer
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
+                            ScrollbarVisible = false,
+                            Child = new Container
                             {
-                                new OsuScrollContainer
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.Both,
-                                    ScrollbarVisible = false,
-                                    Child = new Container
+                                    scorePanelList = new ScorePanelList
                                     {
-                                        RelativeSizeAxes = Axes.X,
-                                        Height = screen_height,
-                                        Children = new Drawable[]
-                                        {
-                                            scorePanelList = new ScorePanelList
-                                            {
-                                                RelativeSizeAxes = Axes.Both,
-                                                SelectedScore = { BindTarget = SelectedScore },
-                                                PostExpandAction = () => statisticsPanel.ToggleVisibility()
-                                            },
-                                            detachedPanelContainer = new Container<ScorePanel>
-                                            {
-                                                RelativeSizeAxes = Axes.Both
-                                            },
-                                            statisticsPanel = new StatisticsPanel
-                                            {
-                                                RelativeSizeAxes = Axes.Both,
-                                                Score = { BindTarget = SelectedScore }
-                                            },
-                                        }
-                                    }
-                                },
+                                        RelativeSizeAxes = Axes.Both,
+                                        SelectedScore = { BindTarget = SelectedScore },
+                                        PostExpandAction = () => statisticsPanel.ToggleVisibility()
+                                    },
+                                    detachedPanelContainer = new Container<ScorePanel>
+                                    {
+                                        RelativeSizeAxes = Axes.Both
+                                    },
+                                    statisticsPanel = new StatisticsPanel
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Score = { BindTarget = SelectedScore }
+                                    },
+                                }
                             }
-                        }
+                        },
                     },
                     new[]
                     {
@@ -277,5 +269,23 @@ namespace osu.Game.Screens.Ranking
                 detachedPanel = null;
             }
         }
+
+        private class VerticalScrollContainer : OsuScrollContainer
+        {
+            protected override Container<Drawable> Content => content;
+
+            private readonly Container content;
+
+            public VerticalScrollContainer()
+            {
+                base.Content.Add(content = new Container { RelativeSizeAxes = Axes.X });
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                content.Height = Math.Max(screen_height, DrawHeight);
+            }
+        }
     }
 }

From 641ea5b950f6087d79b24b8339e2f5fa9b4bc10a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 30 Jun 2020 13:12:33 +0200
Subject: [PATCH 03518/10326] Make the disabling of the win key during gameplay
 a toggleable setting.

---
 osu.Game/Configuration/OsuConfigManager.cs                   | 4 +++-
 .../Overlays/Settings/Sections/Gameplay/GeneralSettings.cs   | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 9d31bc9bba..e7a86e080d 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -98,6 +98,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised);
 
             Set(OsuSetting.IncreaseFirstObjectVisibility, true);
+            Set(OsuSetting.GameplayDisableWinKey, true);
 
             // Update
             Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
@@ -227,6 +228,7 @@ namespace osu.Game.Configuration
         IntroSequence,
         UIHoldActivationDelay,
         HitLighting,
-        MenuBackgroundSource
+        MenuBackgroundSource,
+        GameplayDisableWinKey
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 93a02ea0e4..60197c62b5 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -76,6 +76,11 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Score display mode",
                     Bindable = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode)
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Disable Win key during gameplay",
+                    Bindable = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey)
                 }
             };
         }

From 85c42456f25c9a27cd4871fb2cc71e1e3caf1b17 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 30 Jun 2020 21:38:51 +0900
Subject: [PATCH 03519/10326] Improve performance of sequential scrolling
 algorithm

---
 .../Algorithms/SequentialScrollAlgorithm.cs   | 164 +++++++++++-------
 1 file changed, 104 insertions(+), 60 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs b/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs
index 0052c877f6..a1f68d7201 100644
--- a/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs
@@ -3,21 +3,26 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using JetBrains.Annotations;
 using osu.Game.Rulesets.Timing;
 
 namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
 {
     public class SequentialScrollAlgorithm : IScrollAlgorithm
     {
-        private readonly Dictionary<double, double> positionCache;
+        private static readonly IComparer<PositionMapping> by_position_comparer = Comparer<PositionMapping>.Create((c1, c2) => c1.Position.CompareTo(c2.Position));
 
         private readonly IReadOnlyList<MultiplierControlPoint> controlPoints;
 
+        /// <summary>
+        /// Stores a mapping of time -> position for each control point.
+        /// </summary>
+        private readonly List<PositionMapping> positionMappings = new List<PositionMapping>();
+
         public SequentialScrollAlgorithm(IReadOnlyList<MultiplierControlPoint> controlPoints)
         {
             this.controlPoints = controlPoints;
-
-            positionCache = new Dictionary<double, double>();
         }
 
         public double GetDisplayStartTime(double originTime, float offset, double timeRange, float scrollLength)
@@ -27,55 +32,31 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
 
         public float GetLength(double startTime, double endTime, double timeRange, float scrollLength)
         {
-            var objectLength = relativePositionAtCached(endTime, timeRange) - relativePositionAtCached(startTime, timeRange);
+            var objectLength = relativePositionAt(endTime, timeRange) - relativePositionAt(startTime, timeRange);
             return (float)(objectLength * scrollLength);
         }
 
         public float PositionAt(double time, double currentTime, double timeRange, float scrollLength)
         {
-            // Caching is not used here as currentTime is unlikely to have been previously cached
-            double timelinePosition = relativePositionAt(currentTime, timeRange);
-            return (float)((relativePositionAtCached(time, timeRange) - timelinePosition) * scrollLength);
+            double timelineLength = relativePositionAt(time, timeRange) - relativePositionAt(currentTime, timeRange);
+            return (float)(timelineLength * scrollLength);
         }
 
         public double TimeAt(float position, double currentTime, double timeRange, float scrollLength)
         {
-            // Convert the position to a length relative to time = 0
-            double length = position / scrollLength + relativePositionAt(currentTime, timeRange);
+            if (controlPoints.Count == 0)
+                return position * timeRange;
 
-            // We need to consider all timing points until the specified time and not just the currently-active one,
-            // since each timing point individually affects the positions of _all_ hitobjects after its start time
-            for (int i = 0; i < controlPoints.Count; i++)
-            {
-                var current = controlPoints[i];
-                var next = i < controlPoints.Count - 1 ? controlPoints[i + 1] : null;
+            // Find the position at the current time, and the given length.
+            double relativePosition = relativePositionAt(currentTime, timeRange) + position / scrollLength;
 
-                // Duration of the current control point
-                var currentDuration = (next?.StartTime ?? double.PositiveInfinity) - current.StartTime;
+            var positionMapping = findControlPointMapping(timeRange, new PositionMapping(0, null, relativePosition), by_position_comparer);
 
-                // Figure out the length of control point
-                var currentLength = currentDuration / timeRange * current.Multiplier;
-
-                if (currentLength > length)
-                {
-                    // The point is within this control point
-                    return current.StartTime + length * timeRange / current.Multiplier;
-                }
-
-                length -= currentLength;
-            }
-
-            return 0; // Should never occur
+            // Begin at the control point's time and add the remaining time to reach the given position.
+            return positionMapping.Time + (relativePosition - positionMapping.Position) * timeRange / positionMapping.ControlPoint.Multiplier;
         }
 
-        private double relativePositionAtCached(double time, double timeRange)
-        {
-            if (!positionCache.TryGetValue(time, out double existing))
-                positionCache[time] = existing = relativePositionAt(time, timeRange);
-            return existing;
-        }
-
-        public void Reset() => positionCache.Clear();
+        public void Reset() => positionMappings.Clear();
 
         /// <summary>
         /// Finds the position which corresponds to a point in time.
@@ -84,37 +65,100 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
         /// <param name="time">The time to find the position at.</param>
         /// <param name="timeRange">The amount of time visualised by the scrolling area.</param>
         /// <returns>A positive value indicating the position at <paramref name="time"/>.</returns>
-        private double relativePositionAt(double time, double timeRange)
+        private double relativePositionAt(in double time, in double timeRange)
         {
             if (controlPoints.Count == 0)
                 return time / timeRange;
 
-            double length = 0;
+            var mapping = findControlPointMapping(timeRange, new PositionMapping(time));
 
-            // We need to consider all timing points until the specified time and not just the currently-active one,
-            // since each timing point individually affects the positions of _all_ hitobjects after its start time
-            for (int i = 0; i < controlPoints.Count; i++)
+            // Begin at the control point's position and add the remaining distance to reach the given time.
+            return mapping.Position + (time - mapping.Time) / timeRange * mapping.ControlPoint.Multiplier;
+        }
+
+        /// <summary>
+        /// Finds a <see cref="MultiplierControlPoint"/>'s <see cref="PositionMapping"/> that is relevant to a given <see cref="PositionMapping"/>.
+        /// </summary>
+        /// <remarks>
+        /// This is used to find the last <see cref="MultiplierControlPoint"/> occuring prior to a time value, or prior to a position value (if <see cref="by_position_comparer"/> is used).
+        /// </remarks>
+        /// <param name="timeRange">The time range.</param>
+        /// <param name="search">The <see cref="PositionMapping"/> to find the closest <see cref="PositionMapping"/> to.</param>
+        /// <param name="comparer">The comparison. If null, the default comparer is used (by time).</param>
+        /// <returns>The <see cref="MultiplierControlPoint"/>'s <see cref="PositionMapping"/> that is relevant for <paramref name="search"/>.</returns>
+        private PositionMapping findControlPointMapping(in double timeRange, in PositionMapping search, IComparer<PositionMapping> comparer = null)
+        {
+            generatePositionMappings(timeRange);
+
+            var mappingIndex = positionMappings.BinarySearch(search, comparer ?? Comparer<PositionMapping>.Default);
+
+            if (mappingIndex < 0)
             {
-                var current = controlPoints[i];
-                var next = i < controlPoints.Count - 1 ? controlPoints[i + 1] : null;
+                // If the search value isn't found, the _next_ control point is returned, but we actually want the _previous_ control point.
+                // In doing so, we must make sure to not underflow the position mapping list (i.e. always use the 0th control point for time < first_control_point_time).
+                mappingIndex = Math.Max(0, ~mappingIndex - 1);
 
-                // We don't need to consider any control points beyond the current time, since it will not yet
-                // affect any hitobjects
-                if (i > 0 && current.StartTime > time)
-                    continue;
-
-                // Duration of the current control point
-                var currentDuration = (next?.StartTime ?? double.PositiveInfinity) - current.StartTime;
-
-                // We want to consider the minimal amount of time that this control point has affected,
-                // which may be either its duration, or the amount of time that has passed within it
-                var durationInCurrent = Math.Min(currentDuration, time - current.StartTime);
-
-                // Figure out how much of the time range the duration represents, and adjust it by the speed multiplier
-                length += durationInCurrent / timeRange * current.Multiplier;
+                Debug.Assert(mappingIndex < positionMappings.Count);
             }
 
-            return length;
+            var mapping = positionMappings[mappingIndex];
+            Debug.Assert(mapping.ControlPoint != null);
+
+            return mapping;
+        }
+
+        /// <summary>
+        /// Generates the mapping of <see cref="MultiplierControlPoint"/> (and their respective start times) to their relative position from 0.
+        /// </summary>
+        /// <param name="timeRange">The time range.</param>
+        private void generatePositionMappings(in double timeRange)
+        {
+            if (positionMappings.Count > 0)
+                return;
+
+            if (controlPoints.Count == 0)
+                return;
+
+            positionMappings.Add(new PositionMapping(controlPoints[0].StartTime, controlPoints[0]));
+
+            for (int i = 0; i < controlPoints.Count - 1; i++)
+            {
+                var current = controlPoints[i];
+                var next = controlPoints[i + 1];
+
+                // Figure out how much of the time range the duration represents, and adjust it by the speed multiplier
+                float length = (float)((next.StartTime - current.StartTime) / timeRange * current.Multiplier);
+
+                positionMappings.Add(new PositionMapping(next.StartTime, next, positionMappings[^1].Position + length));
+            }
+        }
+
+        private readonly struct PositionMapping : IComparable<PositionMapping>
+        {
+            /// <summary>
+            /// The time corresponding to this position.
+            /// </summary>
+            public readonly double Time;
+
+            /// <summary>
+            /// The <see cref="MultiplierControlPoint"/> at <see cref="Time"/>.
+            /// </summary>
+            [CanBeNull]
+            public readonly MultiplierControlPoint ControlPoint;
+
+            /// <summary>
+            /// The relative position from 0 of <see cref="ControlPoint"/>.
+            /// </summary>
+            public readonly double Position;
+
+            public PositionMapping(double time, MultiplierControlPoint controlPoint = null, double position = default)
+            {
+                Time = time;
+                ControlPoint = controlPoint;
+                Position = position;
+            }
+
+            public int CompareTo(PositionMapping other) => Time.CompareTo(other.Time);
         }
     }
 }

From 508d34fd3ac6d48dae4e5aa578e0c112f609cb3a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 30 Jun 2020 19:51:10 +0200
Subject: [PATCH 03520/10326] Fix notification redirecting to the old log
 folder when game installation has been migrated to another location.

---
 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 b0d7b14d34..92233f143d 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -767,7 +767,7 @@ namespace osu.Game
                         Text = "Subsequent messages have been logged. Click to view log files.",
                         Activated = () =>
                         {
-                            Host.Storage.GetStorageForDirectory("logs").OpenInNativeExplorer();
+                            Storage.GetStorageForDirectory("logs").OpenInNativeExplorer();
                             return true;
                         }
                     }));

From 39cfbb67ad7962f1b75beb72fd793e445de66512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 30 Jun 2020 20:16:19 +0200
Subject: [PATCH 03521/10326] Replace iterated addition with rounding

---
 .../Patterns/Legacy/DistanceObjectPatternGenerator.cs     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index a09ef6d5b6..d03eb0b3c9 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -483,12 +483,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             if (!(HitObject is IHasPathWithRepeats curveData))
                 return null;
 
-            // mathematically speaking this could be done by calculating (time - HitObject.StartTime) / SegmentDuration
-            // however, floating-point operations can introduce inaccuracies - therefore resort to iterated addition
-            // (all callers use this method to calculate repeat point times, so this way is consistent and deterministic)
-            int index = 0;
-            for (double nodeTime = HitObject.StartTime; nodeTime < time; nodeTime += SegmentDuration)
-                index += 1;
+            // mathematically speaking this should be a whole number always, but floating-point arithmetic is not so kind
+            var index = (int)Math.Round(SegmentDuration == 0 ? 0 : (time - HitObject.StartTime) / SegmentDuration, MidpointRounding.AwayFromZero);
 
             // avoid slicing the list & creating copies, if at all possible.
             return index == 0 ? curveData.NodeSamples : curveData.NodeSamples.Skip(index).ToList();

From ab15b6031d662fb660149f0c9085be99f5c33b59 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Jul 2020 17:12:07 +0900
Subject: [PATCH 03522/10326] Update with framework-side storage changes

---
 osu.Game/IO/OsuStorage.cs | 6 +++---
 osu.Game/OsuGameBase.cs   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 499bcb4063..f5ce1c0105 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -24,12 +24,12 @@ namespace osu.Game.IO
             "storage.ini"
         };
 
-        public OsuStorage(GameHost host)
-            : base(host.Storage, string.Empty)
+        public OsuStorage(GameHost host, Storage defaultStorage)
+            : base(defaultStorage, string.Empty)
         {
             this.host = host;
 
-            storageConfig = new StorageConfigManager(host.Storage);
+            storageConfig = new StorageConfigManager(defaultStorage);
 
             var customStoragePath = storageConfig.Get<string>(StorageConfig.FullPath);
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 3e7311092e..c79f710151 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -312,11 +312,13 @@ namespace osu.Game
             base.SetHost(host);
 
             // may be non-null for certain tests
-            Storage ??= new OsuStorage(host);
+            Storage ??= host.Storage;
 
             LocalConfig ??= new OsuConfigManager(Storage);
         }
 
+        protected override Storage CreateStorage(GameHost host, Storage defaultStorage) => new OsuStorage(host, defaultStorage);
+
         private readonly List<ICanAcceptFiles> fileImporters = new List<ICanAcceptFiles>();
 
         public async Task Import(params string[] paths)

From cdcad94e9f0a8ce75c6be8572408795aaa6bde16 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Jul 2020 17:47:29 +0900
Subject: [PATCH 03523/10326] Handle exception thrown due to custom stoage on
 startup

---
 osu.Game/IO/OsuStorage.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index f5ce1c0105..8bcc0941c1 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -34,7 +34,17 @@ namespace osu.Game.IO
             var customStoragePath = storageConfig.Get<string>(StorageConfig.FullPath);
 
             if (!string.IsNullOrEmpty(customStoragePath))
-                ChangeTargetStorage(host.GetStorage(customStoragePath));
+            {
+                try
+                {
+                    ChangeTargetStorage(host.GetStorage(customStoragePath));
+                }
+                catch (Exception ex)
+                {
+                    Logger.Log($"Couldn't use custom storage path ({customStoragePath}): {ex}. Using default path.", LoggingTarget.Runtime, LogLevel.Error);
+                    ChangeTargetStorage(defaultStorage);
+                }
+            }
         }
 
         protected override void ChangeTargetStorage(Storage newStorage)

From 5f577797a7dd491d8ccecd49b28967ca826eb038 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 1 Jul 2020 18:41:00 +0900
Subject: [PATCH 03524/10326] Expose transform helpers in SkinnableSound

---
 osu.Game/Skinning/SkinnableSound.cs | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 30320c89a6..24d6648273 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -7,8 +7,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Transforms;
 using osu.Game.Audio;
 
 namespace osu.Game.Skinning
@@ -43,6 +45,34 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => samplesContainer.Tempo;
 
+        /// <summary>
+        /// Smoothly adjusts <see cref="Volume"/> over time.
+        /// </summary>
+        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
+        public TransformSequence<DrawableAudioWrapper> VolumeTo(double newVolume, double duration = 0, Easing easing = Easing.None) =>
+            samplesContainer.VolumeTo(newVolume, duration, easing);
+
+        /// <summary>
+        /// Smoothly adjusts <see cref="Balance"/> over time.
+        /// </summary>
+        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
+        public TransformSequence<DrawableAudioWrapper> BalanceTo(double newBalance, double duration = 0, Easing easing = Easing.None) =>
+            samplesContainer.BalanceTo(newBalance, duration, easing);
+
+        /// <summary>
+        /// Smoothly adjusts <see cref="Frequency"/> over time.
+        /// </summary>
+        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
+        public TransformSequence<DrawableAudioWrapper> FrequencyTo(double newFrequency, double duration = 0, Easing easing = Easing.None) =>
+            samplesContainer.FrequencyTo(newFrequency, duration, easing);
+
+        /// <summary>
+        /// Smoothly adjusts <see cref="Tempo"/> over time.
+        /// </summary>
+        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
+        public TransformSequence<DrawableAudioWrapper> TempoTo(double newTempo, double duration = 0, Easing easing = Easing.None) =>
+            samplesContainer.TempoTo(newTempo, duration, easing);
+
         public bool Looping
         {
             get => looping;

From 6f6376d53c56e5f592a6ae253349b4cc1923f5e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 1 Jul 2020 18:52:05 +0900
Subject: [PATCH 03525/10326] Update framework

---
 .idea/.idea.osu.Desktop/.idea/modules.xml | 1 -
 osu.Android.props                         | 2 +-
 osu.Game/osu.Game.csproj                  | 2 +-
 osu.iOS.props                             | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/modules.xml b/.idea/.idea.osu.Desktop/.idea/modules.xml
index 366f172c30..fe63f5faf3 100644
--- a/.idea/.idea.osu.Desktop/.idea/modules.xml
+++ b/.idea/.idea.osu.Desktop/.idea/modules.xml
@@ -2,7 +2,6 @@
 <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>
diff --git a/osu.Android.props b/osu.Android.props
index 493b1f5529..a2c97ead2f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.623.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.701.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5f326a361d..3ef53a2a53 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.623.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.701.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 72f09ee287..492bf89fab 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.Framework.iOS" Version="2020.623.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.701.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.623.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.701.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 49aa839872b5291e2df9011c410f8d72edf3823b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 1 Jul 2020 18:54:11 +0900
Subject: [PATCH 03526/10326] Update RulesetInputManager to use new method

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index ba30fe28d5..f2ac61eaf4 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -18,9 +18,6 @@ using osu.Game.Input.Handlers;
 using osu.Game.Screens.Play;
 using osuTK.Input;
 using static osu.Game.Input.Handlers.ReplayInputHandler;
-using JoystickState = osu.Framework.Input.States.JoystickState;
-using KeyboardState = osu.Framework.Input.States.KeyboardState;
-using MouseState = osu.Framework.Input.States.MouseState;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -42,11 +39,7 @@ namespace osu.Game.Rulesets.UI
             }
         }
 
-        protected override InputState CreateInitialState()
-        {
-            var state = base.CreateInitialState();
-            return new RulesetInputManagerInputState<T>(state.Mouse, state.Keyboard, state.Joystick);
-        }
+        protected override InputState CreateInitialState() => new RulesetInputManagerInputState<T>(base.CreateInitialState());
 
         protected readonly KeyBindingContainer<T> KeyBindingContainer;
 
@@ -203,8 +196,8 @@ namespace osu.Game.Rulesets.UI
     {
         public ReplayState<T> LastReplayState;
 
-        public RulesetInputManagerInputState(MouseState mouse = null, KeyboardState keyboard = null, JoystickState joystick = null)
-            : base(mouse, keyboard, joystick)
+        public RulesetInputManagerInputState(InputState state = null)
+            : base(state)
         {
         }
     }

From 4e839e4f1fb595740caa29f901f7072fc2858f23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 1 Jul 2020 19:02:05 +0900
Subject: [PATCH 03527/10326] Fix "welcome" intro test failure due to no wait
 logic

---
 .../Visual/Menus/TestSceneIntroWelcome.cs           | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
index 1347bae2ad..8f20e38494 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Audio.Track;
 using osu.Framework.Screens;
 using osu.Game.Screens.Menu;
 
@@ -14,15 +15,11 @@ namespace osu.Game.Tests.Visual.Menus
 
         public TestSceneIntroWelcome()
         {
-            AddAssert("check if menu music loops", () =>
-            {
-                var menu = IntroStack?.CurrentScreen as MainMenu;
+            AddUntilStep("wait for load", () => getTrack() != null);
 
-                if (menu == null)
-                    return false;
-
-                return menu.Track.Looping;
-            });
+            AddAssert("check if menu music loops", () => getTrack().Looping);
         }
+
+        private Track getTrack() => (IntroStack?.CurrentScreen as MainMenu)?.Track;
     }
 }

From ab134c0ed7f92a2c83a503c679a18d1af1e8a1bc Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Wed, 1 Jul 2020 13:27:33 +0200
Subject: [PATCH 03528/10326] removed unneeded information in a comment

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

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 81c288f928..56d0e2d958 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Play
                 Looping = true,
             });
             // PopIn is called before updating the skin, and when a sample is updated, its "playing" value is reset
-            // the sample must be played again(and if it plays when it shouldn't, the volume will be at 0)
+            // the sample must be played again
             pauseLoop.OnSkinChanged += () => pauseLoop.Play();
         }
 

From ab1eb469af357ecde23288cd14294e91c54dbe7e Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Wed, 1 Jul 2020 13:30:23 +0200
Subject: [PATCH 03529/10326] removed unneeded null checks

---
 osu.Game/Screens/Play/PauseOverlay.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 56d0e2d958..022183d82b 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -44,17 +44,17 @@ namespace osu.Game.Screens.Play
             base.PopIn();
 
             //SkinnableSound only plays a sound if its aggregate volume is > 0, so the volume must be turned up before playing it
-            pauseLoop?.TransformBindableTo(pauseLoop.Volume, 0.00001);
-            pauseLoop?.TransformBindableTo(pauseLoop.Volume, 1.0f, 400, Easing.InQuint);
-            pauseLoop?.Play();
+            pauseLoop.TransformBindableTo(pauseLoop.Volume, 0.00001);
+            pauseLoop.TransformBindableTo(pauseLoop.Volume, 1.0f, 400, Easing.InQuint);
+            pauseLoop.Play();
         }
 
         protected override void PopOut()
         {
             base.PopOut();
 
-            pauseLoop?.Stop();
-            pauseLoop?.TransformBindableTo(pauseLoop.Volume, 0.0f);
+            pauseLoop.Stop();
+            pauseLoop.TransformBindableTo(pauseLoop.Volume, 0.0f);
         }
     }
 }

From 1edfac4923623a1d78b1379c4f2c7e8e4177a01b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Jul 2020 23:21:08 +0900
Subject: [PATCH 03530/10326] Fix test failing

---
 osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index f3d54d876a..8ea0e34214 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -127,6 +127,9 @@ namespace osu.Game.Tests.NonVisual
                     var osu = loadOsu(host);
                     var storage = osu.Dependencies.Get<Storage>();
 
+                    // Store the current storage's path. We'll need to refer to this for assertions in the original directory after the migration completes.
+                    string originalDirectory = storage.GetFullPath(".");
+
                     // ensure we perform a save
                     host.Dependencies.Get<FrameworkConfigManager>().Save();
 
@@ -145,25 +148,25 @@ namespace osu.Game.Tests.NonVisual
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(customPath));
 
                     // ensure cache was not moved
-                    Assert.That(host.Storage.ExistsDirectory("cache"));
+                    Assert.That(Directory.Exists(Path.Combine(originalDirectory, "cache")));
 
                     // ensure nested cache was moved
-                    Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
+                    Assert.That(!Directory.Exists(Path.Combine(originalDirectory, "test-nested", "cache")));
                     Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
 
                     foreach (var file in OsuStorage.IGNORE_FILES)
                     {
-                        Assert.That(host.Storage.Exists(file), Is.True);
+                        Assert.That(File.Exists(Path.Combine(originalDirectory, file)));
                         Assert.That(storage.Exists(file), Is.False);
                     }
 
                     foreach (var dir in OsuStorage.IGNORE_DIRECTORIES)
                     {
-                        Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
+                        Assert.That(Directory.Exists(Path.Combine(originalDirectory, dir)));
                         Assert.That(storage.ExistsDirectory(dir), Is.False);
                     }
 
-                    Assert.That(new StreamReader(host.Storage.GetStream("storage.ini")).ReadToEnd().Contains($"FullPath = {customPath}"));
+                    Assert.That(new StreamReader(Path.Combine(originalDirectory, "storage.ini")).ReadToEnd().Contains($"FullPath = {customPath}"));
                 }
                 finally
                 {

From fc1eb42a650fef5497bec37e20b5e2a29f773c07 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 1 Jul 2020 17:15:41 +0200
Subject: [PATCH 03531/10326] Disable windows key while in gameplay.

---
 osu.Desktop/OsuGameDesktop.cs                |  4 +
 osu.Desktop/Windows/GameplayWinKeyHandler.cs | 39 ++++++++++
 osu.Desktop/Windows/WindowsKey.cs            | 82 ++++++++++++++++++++
 3 files changed, 125 insertions(+)
 create mode 100644 osu.Desktop/Windows/GameplayWinKeyHandler.cs
 create mode 100644 osu.Desktop/Windows/WindowsKey.cs

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index cd31df316a..d05a4af126 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -16,6 +16,7 @@ using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Updater;
+using osu.Desktop.Windows;
 
 namespace osu.Desktop
 {
@@ -98,6 +99,9 @@ namespace osu.Desktop
                 LoadComponentAsync(versionManager = new VersionManager { Depth = int.MinValue }, Add);
 
             LoadComponentAsync(new DiscordRichPresence(), Add);
+
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
+                LoadComponentAsync(new GameplayWinKeyHandler(), Add);
         }
 
         protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)
diff --git a/osu.Desktop/Windows/GameplayWinKeyHandler.cs b/osu.Desktop/Windows/GameplayWinKeyHandler.cs
new file mode 100644
index 0000000000..cc0150497b
--- /dev/null
+++ b/osu.Desktop/Windows/GameplayWinKeyHandler.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+using osu.Game.Configuration;
+
+namespace osu.Desktop.Windows
+{
+    public class GameplayWinKeyHandler : Component
+    {
+        private Bindable<bool> winKeyEnabled;
+        private Bindable<bool> disableWinKey;
+
+        private GameHost host;
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, OsuConfigManager config)
+        {
+            this.host = host;
+
+            winKeyEnabled = host.AllowScreenSuspension.GetBoundCopy();
+            winKeyEnabled.ValueChanged += toggleWinKey;
+
+            disableWinKey = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey);
+            disableWinKey.BindValueChanged(t => winKeyEnabled.TriggerChange());
+        }
+
+        private void toggleWinKey(ValueChangedEvent<bool> e)
+        {
+            if (!e.NewValue && disableWinKey.Value)
+                host.InputThread.Scheduler.Add(WindowsKey.Disable);
+            else
+                host.InputThread.Scheduler.Add(WindowsKey.Enable);
+        }
+    }
+}
diff --git a/osu.Desktop/Windows/WindowsKey.cs b/osu.Desktop/Windows/WindowsKey.cs
new file mode 100644
index 0000000000..748d9c55d6
--- /dev/null
+++ b/osu.Desktop/Windows/WindowsKey.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 System;
+using System.Runtime.InteropServices;
+
+namespace osu.Desktop.Windows
+{
+    internal class WindowsKey
+    {
+        private delegate int LowLevelKeyboardProcDelegate(int nCode, int wParam, ref KdDllHookStruct lParam);
+
+        private static bool isBlocked;
+
+        private const int wh_keyboard_ll = 13;
+        private const int wm_keydown = 256;
+        private const int wm_syskeyup = 261;
+
+        //Resharper disable once NotAccessedField.Local
+        private static LowLevelKeyboardProcDelegate keyboardHookDelegate; // keeping a reference alive for the GC
+        private static IntPtr keyHook;
+
+        [StructLayout(LayoutKind.Explicit)]
+        private struct KdDllHookStruct
+        {
+            [FieldOffset(0)]
+            public readonly int VkCode;
+
+            [FieldOffset(8)]
+            public readonly int Flags;
+        }
+
+        private static int lowLevelKeyboardProc(int nCode, int wParam, ref KdDllHookStruct lParam)
+        {
+            if (wParam >= wm_keydown && wParam <= wm_syskeyup)
+            {
+                switch (lParam.VkCode)
+                {
+                    case 0x09 when lParam.Flags == 32: // alt + tab
+                    case 0x1b when lParam.Flags == 32: // alt + esc
+                    case 0x5B: // left windows key
+                    case 0x5C: // right windows key
+                        return 1;
+                }
+            }
+
+            return callNextHookEx(0, nCode, wParam, ref lParam);
+        }
+
+        internal static void Disable()
+        {
+            if (keyHook != IntPtr.Zero || isBlocked)
+                return;
+
+            keyHook = setWindowsHookEx(wh_keyboard_ll, (keyboardHookDelegate = lowLevelKeyboardProc), Marshal.GetHINSTANCE(System.Reflection.Assembly.GetExecutingAssembly().GetModules()[0]), 0);
+
+            isBlocked = true;
+        }
+
+        internal static void Enable()
+        {
+            if (keyHook == IntPtr.Zero || !isBlocked)
+                return;
+
+            keyHook = unhookWindowsHookEx(keyHook);
+            keyboardHookDelegate = null;
+
+            keyHook = IntPtr.Zero;
+
+            isBlocked = false;
+        }
+
+        [DllImport(@"user32.dll", EntryPoint = @"SetWindowsHookExA")]
+        private static extern IntPtr setWindowsHookEx(int idHook, LowLevelKeyboardProcDelegate lpfn, IntPtr hMod, int dwThreadId);
+
+        [DllImport(@"user32.dll", EntryPoint = @"UnhookWindowsHookEx")]
+        private static extern IntPtr unhookWindowsHookEx(IntPtr hHook);
+
+        [DllImport(@"user32.dll", EntryPoint = @"CallNextHookEx")]
+        private static extern int callNextHookEx(int hHook, int nCode, int wParam, ref KdDllHookStruct lParam);
+    }
+}

From 3278a1d7d821e4fd5cfe9d4bde6125ef9a77a09c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 2 Jul 2020 00:21:45 +0900
Subject: [PATCH 03532/10326] Standardize osu!catch coordinate system

There were two coordinate systems used:
- 0..512 (used in osu!stable)
- 0..1 (relative coordinate)

This commit replaces the usage of
the relative coordinate system to
the coordinate system of 0..512.
---
 .../CatchBeatmapConversionTest.cs                  |  3 +--
 .../TestSceneAutoJuiceStream.cs                    |  6 +++---
 .../TestSceneCatchStacker.cs                       | 10 +++++++++-
 .../TestSceneCatcherArea.cs                        |  4 ++--
 .../TestSceneDrawableHitObjects.cs                 |  4 ++--
 .../TestSceneHyperDash.cs                          |  8 ++++----
 .../TestSceneJuiceStream.cs                        |  5 +++--
 .../Beatmaps/CatchBeatmapConverter.cs              |  5 ++---
 .../Beatmaps/CatchBeatmapProcessor.cs              | 14 +++++++-------
 .../Preprocessing/CatchDifficultyHitObject.cs      |  5 ++---
 .../Difficulty/Skills/Movement.cs                  |  5 ++---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs  |  4 ++++
 .../Objects/Drawables/DrawableCatchHitObject.cs    |  4 ++--
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs     |  9 ++++-----
 .../Replays/CatchAutoGenerator.cs                  |  4 ++--
 .../Replays/CatchReplayFrame.cs                    |  5 ++---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs       | 11 ++++++++++-
 .../UI/CatchPlayfieldAdjustmentContainer.cs        |  2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs              | 13 +++++--------
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs          | 10 ++--------
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs  |  2 +-
 21 files changed, 70 insertions(+), 63 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index f4749be370..df54df7b01 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -8,7 +8,6 @@ using NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Mods;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Tests.Beatmaps;
 
@@ -83,7 +82,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         public float Position
         {
-            get => HitObject?.X * CatchPlayfield.BASE_WIDTH ?? position;
+            get => HitObject?.X ?? position;
             set => position = value;
         }
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 7c2304694f..d6bba3d55e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -27,15 +27,15 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             for (int i = 0; i < 100; i++)
             {
-                float width = (i % 10 + 1) / 20f;
+                float width = (i % 10 + 1) / 20f * CatchPlayfield.WIDTH;
 
                 beatmap.HitObjects.Add(new JuiceStream
                 {
-                    X = 0.5f - width / 2,
+                    X = CatchPlayfield.CENTER_X - width / 2,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
-                        new Vector2(width * CatchPlayfield.BASE_WIDTH, 0)
+                        new Vector2(width, 0)
                     }),
                     StartTime = i * 2000,
                     NewCombo = i % 8 == 0
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
index 44672b6526..1ff31697b8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.UI;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -22,7 +23,14 @@ namespace osu.Game.Rulesets.Catch.Tests
             };
 
             for (int i = 0; i < 512; i++)
-                beatmap.HitObjects.Add(new Fruit { X = 0.5f + i / 2048f * (i % 10 - 5), StartTime = i * 100, NewCombo = i % 8 == 0 });
+            {
+                beatmap.HitObjects.Add(new Fruit
+                {
+                    X = (0.5f + i / 2048f * (i % 10 - 5)) * CatchPlayfield.WIDTH,
+                    StartTime = i * 100,
+                    NewCombo = i % 8 == 0
+                });
+            }
 
             return beatmap;
         }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 2b30edb70b..fbb22a8498 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -76,8 +76,8 @@ namespace osu.Game.Rulesets.Catch.Tests
                 RelativeSizeAxes = Axes.Both,
                 Child = new TestCatcherArea(new BeatmapDifficulty { CircleSize = size })
                 {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.TopLeft,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.TopCentre,
                     CreateDrawableRepresentation = ((DrawableRuleset<CatchHitObject>)catchRuleset.CreateInstance().CreateDrawableRulesetWith(new CatchBeatmap())).CreateDrawableRepresentation
                 },
             });
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
index a7094c00be..d35f828e28 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
@@ -158,8 +158,8 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private float getXCoords(bool hit)
         {
-            const float x_offset = 0.2f;
-            float xCoords = drawableRuleset.Playfield.Width / 2;
+            const float x_offset = 0.2f * CatchPlayfield.WIDTH;
+            float xCoords = CatchPlayfield.CENTER_X;
 
             if (drawableRuleset.Playfield is CatchPlayfield catchPlayfield)
                 catchPlayfield.CatcherArea.MovableCatcher.X = xCoords - x_offset;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index a0dcb86d57..ad24adf352 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -47,13 +47,13 @@ namespace osu.Game.Rulesets.Catch.Tests
             };
 
             // Should produce a hyper-dash (edge case test)
-            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56 / 512f, NewCombo = true });
-            beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308 / 512f, NewCombo = true });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56, NewCombo = true });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308, NewCombo = true });
 
             double startTime = 3000;
 
-            const float left_x = 0.02f;
-            const float right_x = 0.98f;
+            const float left_x = 0.02f * CatchPlayfield.WIDTH;
+            const float right_x = 0.98f * CatchPlayfield.WIDTH;
 
             createObjects(() => new Fruit { X = left_x });
             createObjects(() => new TestJuiceStream(right_x), 1);
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
index ffcf61a4bf..269e783899 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -30,7 +31,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 new JuiceStream
                 {
-                    X = 0.5f,
+                    X = CatchPlayfield.CENTER_X,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
@@ -40,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 },
                 new Banana
                 {
-                    X = 0.5f,
+                    X = CatchPlayfield.CENTER_X,
                     StartTime = 1000,
                     NewCombo = true
                 }
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 0de2060e2d..145a40f5f5 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -5,7 +5,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Objects;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -36,7 +35,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         Path = curveData.Path,
                         NodeSamples = curveData.NodeSamples,
                         RepeatCount = curveData.RepeatCount,
-                        X = (positionData?.X ?? 0) / CatchPlayfield.BASE_WIDTH,
+                        X = positionData?.X ?? 0,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
                         LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0
@@ -59,7 +58,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         Samples = obj.Samples,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
-                        X = (positionData?.X ?? 0) / CatchPlayfield.BASE_WIDTH
+                        X = positionData?.X ?? 0
                     }.Yield();
             }
         }
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 7c81bcdf0c..bb14988414 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                     case BananaShower bananaShower:
                         foreach (var banana in bananaShower.NestedHitObjects.OfType<Banana>())
                         {
-                            banana.XOffset = (float)rng.NextDouble();
+                            banana.XOffset = (float)(rng.NextDouble() * CatchPlayfield.WIDTH);
                             rng.Next(); // osu!stable retrieved a random banana type
                             rng.Next(); // osu!stable retrieved a random banana rotation
                             rng.Next(); // osu!stable retrieved a random banana colour
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
                     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;
+                        lastPosition = juiceStream.X + juiceStream.Path.ControlPoints[^1].Position.Value.X;
 
                         // 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;
@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                             catchObject.XOffset = 0;
 
                             if (catchObject is TinyDroplet)
-                                catchObject.XOffset = Math.Clamp(rng.Next(-20, 20) / CatchPlayfield.BASE_WIDTH, -catchObject.X, 1 - catchObject.X);
+                                catchObject.XOffset = Math.Clamp(rng.Next(-20, 20), -catchObject.X, CatchPlayfield.WIDTH - catchObject.X);
                             else if (catchObject is Droplet)
                                 rng.Next(); // osu!stable retrieved a random droplet rotation
                         }
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             }
 
             // ReSharper disable once PossibleLossOfFraction
-            if (Math.Abs(positionDiff * CatchPlayfield.BASE_WIDTH) < timeDiff / 3)
+            if (Math.Abs(positionDiff) < timeDiff / 3)
                 applyOffset(ref offsetPosition, positionDiff);
 
             hitObject.XOffset = offsetPosition - hitObject.X;
@@ -149,12 +149,12 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
         private static void applyRandomOffset(ref float position, double maxOffset, FastRandom rng)
         {
             bool right = rng.NextBool();
-            float rand = Math.Min(20, (float)rng.Next(0, Math.Max(0, maxOffset))) / CatchPlayfield.BASE_WIDTH;
+            float rand = Math.Min(20, (float)rng.Next(0, Math.Max(0, maxOffset)));
 
             if (right)
             {
                 // Clamp to the right bound
-                if (position + rand <= 1)
+                if (position + rand <= CatchPlayfield.WIDTH)
                     position += rand;
                 else
                     position -= rand;
@@ -211,7 +211,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 = Catcher.CalculateCatchWidth(beatmap.BeatmapInfo.BaseDifficulty) / 2;
             int lastDirection = 0;
             double lastExcess = halfCatcherWidth;
 
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
index 360af1a8c9..3e21b8fbaf 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Objects;
 
@@ -33,8 +32,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
             // We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
             var scalingFactor = normalized_hitobject_radius / halfCatcherWidth;
 
-            NormalizedPosition = BaseObject.X * CatchPlayfield.BASE_WIDTH * scalingFactor;
-            LastNormalizedPosition = LastObject.X * CatchPlayfield.BASE_WIDTH * scalingFactor;
+            NormalizedPosition = BaseObject.X * scalingFactor;
+            LastNormalizedPosition = LastObject.X * scalingFactor;
 
             // Every strain interval is hard capped at the equivalent of 375 BPM streaming speed as a safety measure
             StrainTime = Math.Max(40, DeltaTime);
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 918ed77683..e679231638 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 
@@ -68,7 +67,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
             }
 
             // Bonus for edge dashes.
-            if (catchCurrent.LastObject.DistanceToHyperDash <= 20.0f / CatchPlayfield.BASE_WIDTH)
+            if (catchCurrent.LastObject.DistanceToHyperDash <= 20.0f)
             {
                 if (!catchCurrent.LastObject.HyperDash)
                     edgeDashBonus += 5.7;
@@ -78,7 +77,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
                     playerPosition = catchCurrent.NormalizedPosition;
                 }
 
-                distanceAddition *= 1.0 + edgeDashBonus * ((20 - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 20) * Math.Pow((Math.Min(catchCurrent.StrainTime * catchCurrent.ClockRate, 265) / 265), 1.5); // Edge Dashes are easier at lower ms values
+                distanceAddition *= 1.0 + edgeDashBonus * ((20 - catchCurrent.LastObject.DistanceToHyperDash) / 20) * Math.Pow((Math.Min(catchCurrent.StrainTime * catchCurrent.ClockRate, 265) / 265), 1.5); // Edge Dashes are easier at lower ms values
             }
 
             lastPlayerPosition = playerPosition;
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index f3b566f340..04932ecdbb 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -5,6 +5,7 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.Beatmaps;
+using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
@@ -17,6 +18,9 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         private float x;
 
+        /// <summary>
+        /// The horizontal position of the fruit between 0 and <see cref="CatchPlayfield.WIDTH"/>.
+        /// </summary>
         public float X
         {
             get => x + XOffset;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index b12cdd4ccb..c6345a9df7 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Catch.UI;
 using osuTK;
 using osuTK.Graphics;
 
@@ -70,12 +71,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         public float DisplayRadius => DrawSize.X / 2 * Scale.X * HitObject.Scale;
 
-        protected override float SamplePlaybackPosition => HitObject.X;
+        protected override float SamplePlaybackPosition => HitObject.X / CatchPlayfield.WIDTH;
 
         protected DrawableCatchHitObject(CatchHitObject hitObject)
             : base(hitObject)
         {
-            RelativePositionAxes = Axes.X;
             X = hitObject.X;
         }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 2c96ee2b19..6b8b70ed54 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -7,7 +7,6 @@ using System.Threading;
 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;
@@ -80,7 +79,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                             {
                                 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,
                             });
                         }
                     }
@@ -97,7 +96,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            X = X + Path.PositionAt(e.PathProgress).X / CatchPlayfield.BASE_WIDTH,
+                            X = X + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
 
@@ -108,14 +107,14 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = Samples,
                             StartTime = e.Time,
-                            X = X + Path.PositionAt(e.PathProgress).X / CatchPlayfield.BASE_WIDTH,
+                            X = X + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
                 }
             }
         }
 
-        public float EndX => X + this.CurvePositionAt(1).X / CatchPlayfield.BASE_WIDTH;
+        public float EndX => X + this.CurvePositionAt(1).X;
 
         public double Duration
         {
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index 7a33cb0577..5d11c574b1 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Catch.Replays
             // todo: add support for HT DT
             const double dash_speed = Catcher.BASE_SPEED;
             const double movement_speed = dash_speed / 2;
-            float lastPosition = 0.5f;
+            float lastPosition = CatchPlayfield.CENTER_X;
             double lastTime = 0;
 
             void moveToNext(CatchHitObject h)
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.Replays
                 bool impossibleJump = speedRequired > movement_speed * 2;
 
                 // todo: get correct catcher size, based on difficulty CS.
-                const float catcher_width_half = CatcherArea.CATCHER_SIZE / CatchPlayfield.BASE_WIDTH * 0.3f * 0.5f;
+                const float catcher_width_half = CatcherArea.CATCHER_SIZE * 0.3f * 0.5f;
 
                 if (lastPosition - catcher_width_half < h.X && lastPosition + catcher_width_half > h.X)
                 {
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs b/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
index 9dab3ed630..7efd832f62 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using osu.Game.Beatmaps;
 using osu.Game.Replays.Legacy;
-using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
 
@@ -41,7 +40,7 @@ namespace osu.Game.Rulesets.Catch.Replays
 
         public void FromLegacy(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null)
         {
-            Position = currentFrame.Position.X / CatchPlayfield.BASE_WIDTH;
+            Position = currentFrame.Position.X;
             Dashing = currentFrame.ButtonState == ReplayButtonState.Left1;
 
             if (Dashing)
@@ -63,7 +62,7 @@ namespace osu.Game.Rulesets.Catch.Replays
 
             if (Actions.Contains(CatchAction.Dash)) state |= ReplayButtonState.Left1;
 
-            return new LegacyReplayFrame(Time, Position * CatchPlayfield.BASE_WIDTH, null, state);
+            return new LegacyReplayFrame(Time, Position, null, state);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 2319c5ac1f..d034f3c7d4 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -16,7 +16,16 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public class CatchPlayfield : ScrollingPlayfield
     {
-        public const float BASE_WIDTH = 512;
+        /// <summary>
+        /// The width of the playfield.
+        /// The horizontal movement of the catcher is confined in the area of this width.
+        /// </summary>
+        public const float WIDTH = 512;
+
+        /// <summary>
+        /// The center position of the playfield.
+        /// </summary>
+        public const float CENTER_X = WIDTH / 2;
 
         internal readonly CatcherArea CatcherArea;
 
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
index b8d3dc9017..8ee23461ba 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 base.Update();
 
-                Scale = new Vector2(Parent.ChildSize.X / CatchPlayfield.BASE_WIDTH);
+                Scale = new Vector2(Parent.ChildSize.X / CatchPlayfield.WIDTH);
                 Size = Vector2.Divide(Vector2.One, Scale);
             }
         }
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 9cce46d730..82cbbefcca 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <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 const double BASE_SPEED = 1.0;
 
         public Container ExplodingFruitTarget;
 
@@ -104,9 +104,6 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             this.trailsTarget = trailsTarget;
 
-            RelativePositionAxes = Axes.X;
-            X = 0.5f;
-
             Origin = Anchor.TopCentre;
 
             Size = new Vector2(CatcherArea.CATCHER_SIZE);
@@ -209,8 +206,8 @@ namespace osu.Game.Rulesets.Catch.UI
             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 catchObjectPosition = fruit.X;
+            var catcherPosition = Position.X;
 
             var validCatch =
                 catchObjectPosition >= catcherPosition - halfCatchWidth &&
@@ -224,7 +221,7 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 var target = fruit.HyperDashTarget;
                 var timeDifference = target.StartTime - fruit.StartTime;
-                double positionDifference = target.X * CatchPlayfield.BASE_WIDTH - catcherPosition;
+                double positionDifference = target.X - catcherPosition;
                 var velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
 
                 SetHyperDashState(Math.Abs(velocity), target.X);
@@ -331,7 +328,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void UpdatePosition(float position)
         {
-            position = Math.Clamp(position, 0, 1);
+            position = Math.Clamp(position, 0, CatchPlayfield.WIDTH);
 
             if (position == X)
                 return;
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 37d177b936..bf1ac5bc0e 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -31,14 +31,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatcherArea(BeatmapDifficulty difficulty = null)
         {
-            RelativeSizeAxes = Axes.X;
-            Height = CATCHER_SIZE;
-            Child = MovableCatcher = new Catcher(this, difficulty);
-        }
-
-        public static float GetCatcherSize(BeatmapDifficulty difficulty)
-        {
-            return CATCHER_SIZE / CatchPlayfield.BASE_WIDTH * (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
+            Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
+            Child = MovableCatcher = new Catcher(this, difficulty) { X = CatchPlayfield.CENTER_X };
         }
 
         public void OnResult(DrawableCatchHitObject fruit, JudgementResult result)
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index cefb47893c..57555cce90 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Beatmaps.Formats
                     break;
 
                 case 2:
-                    position.X = ((IHasXPosition)hitObject).X * 512;
+                    position.X = ((IHasXPosition)hitObject).X;
                     break;
 
                 case 3:

From c3cd2a74f5f0ee89e531d564db3d7a5cb9e3ed04 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 1 Jul 2020 22:57:16 +0200
Subject: [PATCH 03533/10326] Move general purpose migration to
 MigratableStorage

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 10 +++---
 osu.Game/IO/MigratableStorage.cs            | 31 +++++++++++++++++-
 osu.Game/IO/OsuStorage.cs                   | 36 ++-------------------
 osu.Game/OsuGameBase.cs                     |  2 +-
 4 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index ddc298a7ea..6505135b42 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -28,19 +28,16 @@ namespace osu.Game.Tournament.IO
                 ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
             }
             else
-            {
-                Migrate(GetFullPath(default_tournament));
-                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_tournament));
-            }
+                Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
 
             VideoStore = new TournamentVideoResourceStore(this);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }
 
-        public override void Migrate(string newLocation)
+        public override void Migrate(Storage newStorage)
         {
             var source = new DirectoryInfo(storage.GetFullPath("tournament"));
-            var destination = new DirectoryInfo(newLocation);
+            var destination = new DirectoryInfo(newStorage.GetFullPath("."));
 
             if (source.Exists)
             {
@@ -53,6 +50,7 @@ namespace osu.Game.Tournament.IO
             moveFileIfExists("drawings.txt", destination);
             moveFileIfExists("drawings_results.txt", destination);
             moveFileIfExists("drawings.ini", destination);
+            ChangeTargetStorage(newStorage);
             storageConfig.Set(StorageConfig.CurrentTournament, default_tournament);
             storageConfig.Save();
         }
diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index faa39d2ef8..13aae92dfd 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -22,7 +22,36 @@ namespace osu.Game.IO
         {
         }
 
-        public abstract void Migrate(string newLocation);
+        /// <summary>
+        /// A general purpose migration method to move the storage to a different location.
+        /// <param name="newStorage">The target storage of the migration.</param>
+        /// </summary>
+        public virtual void Migrate(Storage newStorage)
+        {
+            var source = new DirectoryInfo(GetFullPath("."));
+            var destination = new DirectoryInfo(newStorage.GetFullPath("."));
+
+            // using Uri is the easiest way to check equality and contains (https://stackoverflow.com/a/7710620)
+            var sourceUri = new Uri(source.FullName + Path.DirectorySeparatorChar);
+            var destinationUri = new Uri(destination.FullName + Path.DirectorySeparatorChar);
+
+            if (sourceUri == destinationUri)
+                throw new ArgumentException("Destination provided is already the current location", nameof(newStorage));
+
+            if (sourceUri.IsBaseOf(destinationUri))
+                throw new ArgumentException("Destination provided is inside the source", nameof(newStorage));
+
+            // ensure the new location has no files present, else hard abort
+            if (destination.Exists)
+            {
+                if (destination.GetFiles().Length > 0 || destination.GetDirectories().Length > 0)
+                    throw new ArgumentException("Destination provided already has files or directories present", nameof(newStorage));
+            }
+
+            CopyRecursive(source, destination);
+            ChangeTargetStorage(newStorage);
+            DeleteRecursive(source);
+        }
 
         protected void DeleteRecursive(DirectoryInfo target, bool topLevelExcludes = true)
         {
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 31ee802141..7104031b56 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.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.IO;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
@@ -11,7 +9,6 @@ namespace osu.Game.IO
 {
     public class OsuStorage : MigratableStorage
     {
-        private readonly GameHost host;
         private readonly StorageConfigManager storageConfig;
 
         public override string[] IgnoreDirectories => new[] { "cache" };
@@ -25,8 +22,6 @@ namespace osu.Game.IO
         public OsuStorage(GameHost host)
             : base(host.Storage, string.Empty)
         {
-            this.host = host;
-
             storageConfig = new StorageConfigManager(host.Storage);
 
             var customStoragePath = storageConfig.Get<string>(StorageConfig.FullPath);
@@ -41,36 +36,11 @@ namespace osu.Game.IO
             Logger.Storage = UnderlyingStorage.GetStorageForDirectory("logs");
         }
 
-        public override void Migrate(string newLocation)
+        public override void Migrate(Storage newStorage)
         {
-            var source = new DirectoryInfo(GetFullPath("."));
-            var destination = new DirectoryInfo(newLocation);
-
-            // using Uri is the easiest way to check equality and contains (https://stackoverflow.com/a/7710620)
-            var sourceUri = new Uri(source.FullName + Path.DirectorySeparatorChar);
-            var destinationUri = new Uri(destination.FullName + Path.DirectorySeparatorChar);
-
-            if (sourceUri == destinationUri)
-                throw new ArgumentException("Destination provided is already the current location", nameof(newLocation));
-
-            if (sourceUri.IsBaseOf(destinationUri))
-                throw new ArgumentException("Destination provided is inside the source", nameof(newLocation));
-
-            // ensure the new location has no files present, else hard abort
-            if (destination.Exists)
-            {
-                if (destination.GetFiles().Length > 0 || destination.GetDirectories().Length > 0)
-                    throw new ArgumentException("Destination provided already has files or directories present", nameof(newLocation));
-            }
-
-            CopyRecursive(source, destination);
-
-            ChangeTargetStorage(host.GetStorage(newLocation));
-
-            storageConfig.Set(StorageConfig.FullPath, newLocation);
+            base.Migrate(newStorage);
+            storageConfig.Set(StorageConfig.FullPath, newStorage.GetFullPath("."));
             storageConfig.Save();
-
-            DeleteRecursive(source);
         }
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 3e7311092e..97a4e212e8 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -370,7 +370,7 @@ namespace osu.Game
         public void Migrate(string path)
         {
             contextFactory.FlushConnections();
-            (Storage as OsuStorage)?.Migrate(path);
+            (Storage as OsuStorage)?.Migrate(Host.GetStorage(path));
         }
     }
 }

From 5c1f1ab622c8a4e862a7652564b557c76b9514ab Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 1 Jul 2020 14:31:06 -0700
Subject: [PATCH 03534/10326] Fix avatar in score panel being unclickable when
 statistics panel is visible

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 968b446df9..49ce07b708 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -79,6 +79,11 @@ namespace osu.Game.Screens.Ranking
                                 RelativeSizeAxes = Axes.Both,
                                 Children = new Drawable[]
                                 {
+                                    statisticsPanel = new StatisticsPanel
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Score = { BindTarget = SelectedScore }
+                                    },
                                     scorePanelList = new ScorePanelList
                                     {
                                         RelativeSizeAxes = Axes.Both,
@@ -89,11 +94,6 @@ namespace osu.Game.Screens.Ranking
                                     {
                                         RelativeSizeAxes = Axes.Both
                                     },
-                                    statisticsPanel = new StatisticsPanel
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Score = { BindTarget = SelectedScore }
-                                    },
                                 }
                             }
                         },

From 66e61aacff983d7354e6bb267cd472ee090d49fe Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 2 Jul 2020 00:32:09 +0200
Subject: [PATCH 03535/10326] Logger now shows the actual path of the
 destination

Forgot to change this while changing the param from string to Storage
---
 osu.Game/IO/MigratableStorage.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index 13aae92dfd..21087d7dc6 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -36,16 +36,16 @@ namespace osu.Game.IO
             var destinationUri = new Uri(destination.FullName + Path.DirectorySeparatorChar);
 
             if (sourceUri == destinationUri)
-                throw new ArgumentException("Destination provided is already the current location", nameof(newStorage));
+                throw new ArgumentException("Destination provided is already the current location", destination.FullName);
 
             if (sourceUri.IsBaseOf(destinationUri))
-                throw new ArgumentException("Destination provided is inside the source", nameof(newStorage));
+                throw new ArgumentException("Destination provided is inside the source", destination.FullName);
 
             // ensure the new location has no files present, else hard abort
             if (destination.Exists)
             {
                 if (destination.GetFiles().Length > 0 || destination.GetDirectories().Length > 0)
-                    throw new ArgumentException("Destination provided already has files or directories present", nameof(newStorage));
+                    throw new ArgumentException("Destination provided already has files or directories present", destination.FullName);
             }
 
             CopyRecursive(source, destination);

From fa252d5e950d685699632b9cfb78ea7d25a95c58 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 1 Jul 2020 17:37:38 -0700
Subject: [PATCH 03536/10326] Fix score panel not showing silver s/ss badges on
 hd/fl plays

---
 .../Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index ee53ee9879..213c1692ee 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -9,6 +10,7 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osuTK;
 
@@ -191,8 +193,8 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                     Padding = new MarginPadding { Vertical = -15, Horizontal = -20 },
                     Children = new[]
                     {
-                        new RankBadge(1f, ScoreRank.X),
-                        new RankBadge(0.95f, ScoreRank.S),
+                        new RankBadge(1f, score.Mods.Any(m => m is ModHidden || m is ModFlashlight) ? ScoreRank.XH : ScoreRank.X),
+                        new RankBadge(0.95f, score.Mods.Any(m => m is ModHidden || m is ModFlashlight) ? ScoreRank.SH : ScoreRank.S),
                         new RankBadge(0.9f, ScoreRank.A),
                         new RankBadge(0.8f, ScoreRank.B),
                         new RankBadge(0.7f, ScoreRank.C),

From 18e30a7fc4123a297f271bfb8ddc4fbe06fa9f23 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 2 Jul 2020 19:12:45 +0200
Subject: [PATCH 03537/10326] Implement background switching based on the intro

Only the Welcome intro has its own unique background right now
---
 .../Backgrounds/BackgroundScreenDefault.cs       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 980a127cf4..ae3ad63ac8 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -22,11 +22,12 @@ namespace osu.Game.Screens.Backgrounds
         private int currentDisplay;
         private const int background_count = 7;
 
-        private string backgroundName => $@"Menu/menu-background-{currentDisplay % background_count + 1}";
+        private string backgroundName;
 
         private Bindable<User> user;
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
+        private Bindable<IntroSequence> introSequence;
 
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
@@ -42,11 +43,13 @@ namespace osu.Game.Screens.Backgrounds
             user = api.LocalUser.GetBoundCopy();
             skin = skinManager.CurrentSkin.GetBoundCopy();
             mode = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource);
+            introSequence = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence);
 
             user.ValueChanged += _ => Next();
             skin.ValueChanged += _ => Next();
             mode.ValueChanged += _ => Next();
             beatmap.ValueChanged += _ => Next();
+            introSequence.ValueChanged += _ => Next();
 
             currentDisplay = RNG.Next(0, background_count);
 
@@ -74,6 +77,17 @@ namespace osu.Game.Screens.Backgrounds
         {
             Background newBackground;
 
+            switch (introSequence.Value)
+            {
+                case IntroSequence.Welcome:
+                    backgroundName = "Menu/menu-background-welcome";
+                    break;
+
+                default:
+                    backgroundName = $@"Menu/menu-background-{currentDisplay % background_count + 1}";
+                    break;
+            }
+
             if (user.Value?.IsSupporter ?? false)
             {
                 switch (mode.Value)

From e80a5a085afe07c55c9c112450df8f173af153e2 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Thu, 2 Jul 2020 19:45:18 +0200
Subject: [PATCH 03538/10326] Make backgroundName local

---
 osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index ae3ad63ac8..2c22e60195 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -21,9 +21,6 @@ namespace osu.Game.Screens.Backgrounds
 
         private int currentDisplay;
         private const int background_count = 7;
-
-        private string backgroundName;
-
         private Bindable<User> user;
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
@@ -76,6 +73,7 @@ namespace osu.Game.Screens.Backgrounds
         private Background createBackground()
         {
             Background newBackground;
+            string backgroundName;
 
             switch (introSequence.Value)
             {

From 718f06c69075b9199ac07de2db66e6b8124182e5 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 2 Jul 2020 12:35:32 -0700
Subject: [PATCH 03539/10326] Use Mod.AdjustRank() instead

---
 .../Expanded/Accuracy/AccuracyCircle.cs       | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 213c1692ee..45da23f1f9 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -193,18 +193,26 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                     Padding = new MarginPadding { Vertical = -15, Horizontal = -20 },
                     Children = new[]
                     {
-                        new RankBadge(1f, score.Mods.Any(m => m is ModHidden || m is ModFlashlight) ? ScoreRank.XH : ScoreRank.X),
-                        new RankBadge(0.95f, score.Mods.Any(m => m is ModHidden || m is ModFlashlight) ? ScoreRank.SH : ScoreRank.S),
-                        new RankBadge(0.9f, ScoreRank.A),
-                        new RankBadge(0.8f, ScoreRank.B),
-                        new RankBadge(0.7f, ScoreRank.C),
-                        new RankBadge(0.35f, ScoreRank.D),
+                        new RankBadge(1f, getRank(ScoreRank.X)),
+                        new RankBadge(0.95f, getRank(ScoreRank.S)),
+                        new RankBadge(0.9f, getRank(ScoreRank.A)),
+                        new RankBadge(0.8f, getRank(ScoreRank.B)),
+                        new RankBadge(0.7f, getRank(ScoreRank.C)),
+                        new RankBadge(0.35f, getRank(ScoreRank.D)),
                     }
                 },
                 rankText = new RankText(score.Rank)
             };
         }
 
+        private ScoreRank getRank(ScoreRank rank)
+        {
+            foreach (var mod in score.Mods.OfType<IApplicableToScoreProcessor>())
+                rank = mod.AdjustRank(rank, score.Accuracy);
+
+            return rank;
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From d66b97868c4db2e057bf7340200d49eace3dd16f Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 2 Jul 2020 12:39:37 -0700
Subject: [PATCH 03540/10326] Adjust rank when flashlight is enabled

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 35a8334237..6e94a84e7d 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -47,9 +47,25 @@ namespace osu.Game.Rulesets.Mods
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
         {
             Combo.BindTo(scoreProcessor.Combo);
+
+            // Default value of ScoreProcessor's Rank in Flashlight Mod should be SS+
+            scoreProcessor.Rank.Value = ScoreRank.XH;
         }
 
-        public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
+        public ScoreRank AdjustRank(ScoreRank rank, double accuracy)
+        {
+            switch (rank)
+            {
+                case ScoreRank.X:
+                    return ScoreRank.XH;
+
+                case ScoreRank.S:
+                    return ScoreRank.SH;
+
+                default:
+                    return rank;
+            }
+        }
 
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
         {

From cb69d1a86537fe5904229e8c0b7291952dc7aece Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Jul 2020 16:47:14 +0900
Subject: [PATCH 03541/10326] Fix crash when changing tabs in changelog

---
 osu.Game/Graphics/UserInterface/BreadcrumbControl.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs b/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
index 84429bf5bd..fb5ff4aad3 100644
--- a/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
+++ b/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Graphics.UserInterface
         {
             Height = 32;
             TabContainer.Spacing = new Vector2(padding, 0f);
+            SwitchTabOnRemove = false;
+
             Current.ValueChanged += index =>
             {
                 foreach (var t in TabContainer.Children.OfType<BreadcrumbTabItem>())

From 4ded6d1913c6db7811cb3f4ac4a5037e3f843cb0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Fri, 3 Jul 2020 11:36:03 +0200
Subject: [PATCH 03542/10326] Change background path with resource change

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

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 2c22e60195..ef41c5be3d 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Backgrounds
             switch (introSequence.Value)
             {
                 case IntroSequence.Welcome:
-                    backgroundName = "Menu/menu-background-welcome";
+                    backgroundName = "Intro/Welcome/menu-background";
                     break;
 
                 default:

From e8f23e35a572d658536a19e083e451d29dc610fa Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Fri, 3 Jul 2020 14:33:42 +0200
Subject: [PATCH 03543/10326] WIP : replaced TransformBindableTo by VolumeTo
 Currently, the VolumeTO calls taht use a fading does not do anything. calling
 VolumeTo calls pauseLoop.samplesContainer.TransformBindableTo(....), while i
 used to call pauseLoop.TransformBindableTo(....)

---
 osu.Game/Screens/Play/PauseOverlay.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 022183d82b..a8d291d6c3 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -3,8 +3,10 @@
 
 using System;
 using System.Linq;
+using NUnit.Framework.Internal;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Audio;
 using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
@@ -44,8 +46,8 @@ namespace osu.Game.Screens.Play
             base.PopIn();
 
             //SkinnableSound only plays a sound if its aggregate volume is > 0, so the volume must be turned up before playing it
-            pauseLoop.TransformBindableTo(pauseLoop.Volume, 0.00001);
-            pauseLoop.TransformBindableTo(pauseLoop.Volume, 1.0f, 400, Easing.InQuint);
+            pauseLoop.VolumeTo(0.00001f);
+            pauseLoop.VolumeTo(1.0f, 400, Easing.InQuint);
             pauseLoop.Play();
         }
 
@@ -53,8 +55,9 @@ namespace osu.Game.Screens.Play
         {
             base.PopOut();
 
-            pauseLoop.Stop();
-            pauseLoop.TransformBindableTo(pauseLoop.Volume, 0.0f);
+            var transformSeq = pauseLoop.VolumeTo(0.0f, 190, Easing.OutQuad );
+            transformSeq.Finally(_ => pauseLoop.Stop());
+
         }
     }
 }

From ffec4298a7b9c535db5b5dca6c8c2c4074cbf1e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 4 Jul 2020 16:45:46 +0900
Subject: [PATCH 03544/10326] Use DrawablePool for DrawableJudgements

---
 .../Objects/Drawables/DrawableOsuJudgement.cs | 35 +++++---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      | 20 +++--
 .../Rulesets/Judgements/DrawableJudgement.cs  | 83 ++++++++++++++-----
 3 files changed, 99 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 022e9ea12b..9d0c406295 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -24,10 +24,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
         }
 
+        public DrawableOsuJudgement()
+        {
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            if (config.Get<bool>(OsuSetting.HitLighting) && Result.Type != HitResult.Miss)
+            if (config.Get<bool>(OsuSetting.HitLighting))
             {
                 AddInternal(lighting = new SkinnableSprite("lighting")
                 {
@@ -36,16 +40,23 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Blending = BlendingParameters.Additive,
                     Depth = float.MaxValue
                 });
+            }
+        }
 
-                if (JudgedObject != null)
-                {
-                    lightingColour = JudgedObject.AccentColour.GetBoundCopy();
-                    lightingColour.BindValueChanged(colour => lighting.Colour = colour.NewValue, true);
-                }
-                else
-                {
-                    lighting.Colour = Color4.White;
-                }
+        protected override void PrepareForUse()
+        {
+            base.PrepareForUse();
+
+            lightingColour?.UnbindAll();
+
+            if (JudgedObject != null)
+            {
+                lightingColour = JudgedObject.AccentColour.GetBoundCopy();
+                lightingColour.BindValueChanged(colour => lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
+            }
+            else
+            {
+                lighting.Colour = Color4.White;
             }
         }
 
@@ -55,13 +66,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (lighting != null)
             {
-                JudgementBody.Delay(FadeInDuration).FadeOut(400);
+                JudgementBody.FadeIn().Delay(FadeInDuration).FadeOut(400);
 
                 lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
                 lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
             }
 
-            JudgementText?.TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint);
+            JudgementText?.TransformSpacingTo(Vector2.Zero).Then().TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint);
             base.ApplyHitAnimations();
         }
     }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 4b1a2ce43c..f9002a29ca 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -4,6 +4,8 @@
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
+using osu.Framework.Logging;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -26,10 +28,13 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
 
+        private readonly DrawablePool<DrawableOsuJudgement> judgementPool;
+
         public OsuPlayfield()
         {
             InternalChildren = new Drawable[]
             {
+                judgementPool = new DrawablePool<DrawableOsuJudgement>(20),
                 followPoints = new FollowPointRenderer
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -91,12 +96,17 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            DrawableOsuJudgement explosion = new DrawableOsuJudgement(result, judgedObject)
+            DrawableOsuJudgement explosion = judgementPool.Get(doj =>
             {
-                Origin = Anchor.Centre,
-                Position = ((OsuHitObject)judgedObject.HitObject).StackedEndPosition,
-                Scale = new Vector2(((OsuHitObject)judgedObject.HitObject).Scale)
-            };
+                if (doj.Result != null)
+                    Logger.Log("reused!");
+                doj.Result = result;
+                doj.JudgedObject = judgedObject;
+
+                doj.Origin = Anchor.Centre;
+                doj.Position = ((OsuHitObject)judgedObject.HitObject).StackedEndPosition;
+                doj.Scale = new Vector2(((OsuHitObject)judgedObject.HitObject).Scale);
+            });
 
             judgementLayer.Add(explosion);
         }
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 7113acbbfb..86dd02f2bb 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -1,11 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Diagnostics;
 using osuTK;
 using osu.Framework.Allocation;
+using osu.Framework.Caching;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -18,16 +21,31 @@ namespace osu.Game.Rulesets.Judgements
     /// <summary>
     /// A drawable object which visualises the hit result of a <see cref="Judgements.Judgement"/>.
     /// </summary>
-    public class DrawableJudgement : CompositeDrawable
+    public class DrawableJudgement : PoolableDrawable
     {
         private const float judgement_size = 128;
 
         [Resolved]
         private OsuColour colours { get; set; }
 
-        protected readonly JudgementResult Result;
+        private readonly Cached drawableCache = new Cached();
 
-        public readonly DrawableHitObject JudgedObject;
+        private JudgementResult result;
+
+        public JudgementResult Result
+        {
+            get => result;
+            set
+            {
+                if (result?.Type == value.Type)
+                    return;
+
+                result = value;
+                drawableCache.Invalidate();
+            }
+        }
+
+        public DrawableHitObject JudgedObject;
 
         protected Container JudgementBody;
         protected SpriteText JudgementText;
@@ -48,29 +66,15 @@ namespace osu.Game.Rulesets.Judgements
         /// <param name="result">The judgement to visualise.</param>
         /// <param name="judgedObject">The object which was judged.</param>
         public DrawableJudgement(JudgementResult result, DrawableHitObject judgedObject)
+            : this()
         {
             Result = result;
             JudgedObject = judgedObject;
-
-            Size = new Vector2(judgement_size);
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        public DrawableJudgement()
         {
-            InternalChild = JudgementBody = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                Child = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(Result.Type), _ => JudgementText = new OsuSpriteText
-                {
-                    Text = Result.Type.GetDescription().ToUpperInvariant(),
-                    Font = OsuFont.Numeric.With(size: 20),
-                    Colour = colours.ForHitResult(Result.Type),
-                    Scale = new Vector2(0.85f, 1),
-                }, confineMode: ConfineMode.NoScaling)
-            };
+            Size = new Vector2(judgement_size);
         }
 
         protected virtual void ApplyHitAnimations()
@@ -81,11 +85,25 @@ namespace osu.Game.Rulesets.Judgements
             this.Delay(FadeOutDelay).FadeOut(400);
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            base.LoadComplete();
+            prepareDrawables();
+        }
+
+        protected override void PrepareForUse()
+        {
+            base.PrepareForUse();
+
+            Debug.Assert(Result != null);
+
+            if (!drawableCache.IsValid)
+                prepareDrawables();
 
             this.FadeInFromZero(FadeInDuration, Easing.OutQuint);
+            JudgementBody.ScaleTo(1);
+            JudgementBody.RotateTo(0);
+            JudgementBody.MoveTo(Vector2.Zero);
 
             switch (Result.Type)
             {
@@ -109,5 +127,26 @@ namespace osu.Game.Rulesets.Judgements
 
             Expire(true);
         }
+
+        private void prepareDrawables()
+        {
+            var type = Result?.Type ?? HitResult.Perfect; //TODO: better default type from ruleset
+
+            InternalChild = JudgementBody = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Child = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ => JudgementText = new OsuSpriteText
+                {
+                    Text = type.GetDescription().ToUpperInvariant(),
+                    Font = OsuFont.Numeric.With(size: 20),
+                    Colour = colours.ForHitResult(type),
+                    Scale = new Vector2(0.85f, 1),
+                }, confineMode: ConfineMode.NoScaling)
+            };
+
+            drawableCache.Validate();
+        }
     }
 }

From 8869979599b2b79371b0ef2278a5f32f7200e883 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 4 Jul 2020 12:30:09 +0200
Subject: [PATCH 03545/10326] Trigger hook activation on bind.

---
 osu.Desktop/Windows/GameplayWinKeyHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Desktop/Windows/GameplayWinKeyHandler.cs b/osu.Desktop/Windows/GameplayWinKeyHandler.cs
index cc0150497b..394df9dd0c 100644
--- a/osu.Desktop/Windows/GameplayWinKeyHandler.cs
+++ b/osu.Desktop/Windows/GameplayWinKeyHandler.cs
@@ -25,7 +25,7 @@ namespace osu.Desktop.Windows
             winKeyEnabled.ValueChanged += toggleWinKey;
 
             disableWinKey = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey);
-            disableWinKey.BindValueChanged(t => winKeyEnabled.TriggerChange());
+            disableWinKey.BindValueChanged(t => winKeyEnabled.TriggerChange(), true);
         }
 
         private void toggleWinKey(ValueChangedEvent<bool> e)

From 02871c960ba37153075a2781f94de943e49b5ac0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 4 Jul 2020 23:25:06 +0900
Subject: [PATCH 03546/10326] 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 a2c97ead2f..ff86ac6574 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.701.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.704.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3ef53a2a53..afe2348c6e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.701.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.704.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 492bf89fab..80c37ab8f9 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.Framework.iOS" Version="2020.701.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.704.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.701.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.704.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 52b313f2909eca32da32c66ab9bf0aad9ff09abd Mon Sep 17 00:00:00 2001
From: jorolf <jorolf@gmx.de>
Date: Sat, 4 Jul 2020 19:06:26 +0200
Subject: [PATCH 03547/10326] change textures

---
 .../UserInterface/TestSceneHueAnimation.cs    |  2 +-
 osu.Game/Screens/Menu/IntroTriangles.cs       | 39 ++++++++-----------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
index 85ddfb08f9..b341291c58 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             {
                 RelativeSizeAxes = Axes.Both,
                 FillMode = FillMode.Fit,
-                Texture = textures.Get("Intro/Triangles/logo-triangles"),
+                Texture = textures.Get("Intro/Triangles/logo-background"),
                 Colour = Colour4.White,
             });
 
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 8118491c36..38da98220d 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -217,14 +217,8 @@ namespace osu.Game.Screens.Menu
                         // matching flyte curve y = 0.25x^2 + (max(0, x - 0.7) / 0.3) ^ 5
                         lazerLogo.FadeIn().ScaleTo(scale_start).Then().Delay(logo_scale_duration * 0.7f).ScaleTo(scale_start - scale_adjust, logo_scale_duration * 0.3f, Easing.InQuint);
 
-                        const double highlight_duration = logo_scale_duration / 1.4;
-
-                        //Since we only have one texture, roughly align it by changing the timing
-                        lazerLogo.Outline = -0.4f;
-                        lazerLogo.TransformTo(nameof(LazerLogo.Outline), 1f, highlight_duration * 1.4);
-
-                        lazerLogo.OutlineHighlight = 0f;
-                        lazerLogo.TransformTo(nameof(LazerLogo.OutlineHighlight), 1f, highlight_duration);
+                        lazerLogo.TransformTo(nameof(LazerLogo.Background), 1f, logo_scale_duration);
+                        lazerLogo.TransformTo(nameof(LazerLogo.Highlight), 1f, logo_scale_duration);
 
                         logoContainerSecondary.ScaleTo(scale_start).Then().ScaleTo(scale_start - scale_adjust * 0.25f, logo_scale_duration, Easing.InQuad);
                     }
@@ -267,18 +261,18 @@ namespace osu.Game.Screens.Menu
 
             private class LazerLogo : CompositeDrawable
             {
-                private HueAnimation outlineHighlight, outline;
+                private HueAnimation highlight, background;
 
-                public float OutlineHighlight
+                public float Highlight
                 {
-                    get => outlineHighlight.AnimationProgress;
-                    set => outlineHighlight.AnimationProgress = value;
+                    get => highlight.AnimationProgress;
+                    set => highlight.AnimationProgress = value;
                 }
 
-                public float Outline
+                public float Background
                 {
-                    get => outline.AnimationProgress;
-                    set => outline.AnimationProgress = value;
+                    get => background.AnimationProgress;
+                    set => background.AnimationProgress = value;
                 }
 
                 public LazerLogo()
@@ -289,21 +283,22 @@ namespace osu.Game.Screens.Menu
                 [BackgroundDependencyLoader]
                 private void load(TextureStore textures)
                 {
-                    const string lazer_logo_texture = @"Intro/Triangles/logo-triangles";
+                    const string lazer_logo_background = @"Intro/Triangles/logo-background";
+                    const string lazer_logo_highlight = @"Intro/Triangles/logo-highlight";
 
                     InternalChildren = new Drawable[]
                     {
-                        outlineHighlight = new HueAnimation
+                        highlight = new HueAnimation
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Texture = textures.Get(lazer_logo_texture),
-                            Colour = OsuColour.Gray(0.8f),
+                            Texture = textures.Get(lazer_logo_highlight),
+                            Colour = OsuColour.Gray(1f),
                         },
-                        outline = new HueAnimation
+                        background = new HueAnimation
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Texture = textures.Get(lazer_logo_texture),
-                            Colour = OsuColour.Gray(0.6f * 0.8f),
+                            Texture = textures.Get(lazer_logo_background),
+                            Colour = OsuColour.Gray(0.6f),
                         },
                     };
                 }

From cd6bdcdb88035e5d0715d90520f5e083c47ea6ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 5 Jul 2020 00:25:01 +0200
Subject: [PATCH 03548/10326] Replace further spinner transforms with manual
 lerp

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 3c8ab0f5ab..bb1b6fdd26 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -14,6 +14,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;
 
@@ -193,9 +194,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             SpmCounter.SetRotation(Disc.RotationAbsolute);
 
             float relativeCircleScale = Spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight;
-            Disc.ScaleTo(relativeCircleScale + (1 - relativeCircleScale) * Progress, 200, Easing.OutQuint);
+            float targetScale = relativeCircleScale + (1 - relativeCircleScale) * Progress;
+            Disc.Scale = new Vector2((float)Interpolation.Lerp(Disc.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
 
-            symbol.RotateTo(Disc.Rotation / 2, 500, Easing.OutQuint);
+            symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, Disc.Rotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
         }
 
         protected override void UpdateInitialTransforms()

From d229993e5c727ff9c10328a1360ad776606053b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 5 Jul 2020 02:12:26 +0200
Subject: [PATCH 03549/10326] Use RotationAbsolute instead

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index bb1b6fdd26..4d37622be5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             float targetScale = relativeCircleScale + (1 - relativeCircleScale) * Progress;
             Disc.Scale = new Vector2((float)Interpolation.Lerp(Disc.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
 
-            symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, Disc.Rotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
+            symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, Disc.RotationAbsolute / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
         }
 
         protected override void UpdateInitialTransforms()

From ec689ce824c0ff9930b6d8f4a38322f40e5a61af Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sun, 5 Jul 2020 12:31:16 +0800
Subject: [PATCH 03550/10326] add support for custom mania skin paths for stage
 decorations

---
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 0806676fde..aebc229f7c 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -115,6 +115,7 @@ namespace osu.Game.Skinning
                     case string _ when pair.Key.StartsWith("NoteImage"):
                     case string _ when pair.Key.StartsWith("KeyImage"):
                     case string _ when pair.Key.StartsWith("Hit"):
+                    case string _ when pair.Key.StartsWith("Stage"):
                         currentConfig.ImageLookups[pair.Key] = pair.Value;
                         break;
                 }

From 5c2959eeb6844552a82ef8f2085448a1dc9a6b1d Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sun, 5 Jul 2020 13:02:50 +0800
Subject: [PATCH 03551/10326] allow lookup of stage decoration paths and add
 test images

---
 .../{mania-stage-left.png => mania/stage-left.png}  | Bin
 .../stage-right.png}                                | Bin
 .../Resources/special-skin/skin.ini                 |   4 +++-
 osu.Game/Skinning/LegacySkin.cs                     |   9 +++++++++
 4 files changed, 12 insertions(+), 1 deletion(-)
 rename osu.Game.Rulesets.Mania.Tests/Resources/special-skin/{mania-stage-left.png => mania/stage-left.png} (100%)
 rename osu.Game.Rulesets.Mania.Tests/Resources/special-skin/{mania-stage-right.png => mania/stage-right.png} (100%)

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-stage-left.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-left.png
similarity index 100%
rename from osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-stage-left.png
rename to osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-left.png
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-stage-right.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-right.png
similarity index 100%
rename from osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania-stage-right.png
rename to osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-right.png
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
index 941abac1da..36765d61bf 100644
--- a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
@@ -9,4 +9,6 @@ Hit50: mania/hit50
 Hit100: mania/hit100
 Hit200: mania/hit200
 Hit300: mania/hit300
-Hit300g: mania/hit300g
\ No newline at end of file
+Hit300g: mania/hit300g
+StageLeft: mania/stage-left
+StageRight: mania/stage-right
\ No newline at end of file
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 0b2b723440..4b70ccc6ad 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -250,6 +250,15 @@ namespace osu.Game.Skinning
                 case LegacyManiaSkinConfigurationLookups.RightStageImage:
                     return SkinUtils.As<TValue>(getManiaImage(existing, "StageRight"));
 
+                case LegacyManiaSkinConfigurationLookups.BottomStageImage:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "StageBottom"));
+
+                case LegacyManiaSkinConfigurationLookups.LightImage:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "StageLight"));
+
+                case LegacyManiaSkinConfigurationLookups.HitTargetImage:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "StageHint"));
+
                 case LegacyManiaSkinConfigurationLookups.LeftLineWidth:
                     Debug.Assert(maniaLookup.TargetColumn != null);
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnLineWidth[maniaLookup.TargetColumn.Value]));

From ce5da5c51b98136503052eb11df547497019e6fb Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 5 Jul 2020 18:52:27 +0200
Subject: [PATCH 03552/10326] Block CTRL + ESC

---
 osu.Desktop/Windows/GameplayWinKeyHandler.cs | 8 ++++----
 osu.Desktop/Windows/WindowsKey.cs            | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Desktop/Windows/GameplayWinKeyHandler.cs b/osu.Desktop/Windows/GameplayWinKeyHandler.cs
index 394df9dd0c..4f74a4f492 100644
--- a/osu.Desktop/Windows/GameplayWinKeyHandler.cs
+++ b/osu.Desktop/Windows/GameplayWinKeyHandler.cs
@@ -11,7 +11,7 @@ namespace osu.Desktop.Windows
 {
     public class GameplayWinKeyHandler : Component
     {
-        private Bindable<bool> winKeyEnabled;
+        private Bindable<bool> allowScreenSuspension;
         private Bindable<bool> disableWinKey;
 
         private GameHost host;
@@ -21,11 +21,11 @@ namespace osu.Desktop.Windows
         {
             this.host = host;
 
-            winKeyEnabled = host.AllowScreenSuspension.GetBoundCopy();
-            winKeyEnabled.ValueChanged += toggleWinKey;
+            allowScreenSuspension = host.AllowScreenSuspension.GetBoundCopy();
+            allowScreenSuspension.ValueChanged += toggleWinKey;
 
             disableWinKey = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey);
-            disableWinKey.BindValueChanged(t => winKeyEnabled.TriggerChange(), true);
+            disableWinKey.BindValueChanged(t => allowScreenSuspension.TriggerChange(), true);
         }
 
         private void toggleWinKey(ValueChangedEvent<bool> e)
diff --git a/osu.Desktop/Windows/WindowsKey.cs b/osu.Desktop/Windows/WindowsKey.cs
index 748d9c55d6..175401aaed 100644
--- a/osu.Desktop/Windows/WindowsKey.cs
+++ b/osu.Desktop/Windows/WindowsKey.cs
@@ -38,6 +38,7 @@ namespace osu.Desktop.Windows
                 {
                     case 0x09 when lParam.Flags == 32: // alt + tab
                     case 0x1b when lParam.Flags == 32: // alt + esc
+                    case 0x1b when (getKeyState(0x11) & 0x8000) != 0: //ctrl + esc
                     case 0x5B: // left windows key
                     case 0x5C: // right windows key
                         return 1;
@@ -78,5 +79,8 @@ namespace osu.Desktop.Windows
 
         [DllImport(@"user32.dll", EntryPoint = @"CallNextHookEx")]
         private static extern int callNextHookEx(int hHook, int nCode, int wParam, ref KdDllHookStruct lParam);
+
+        [DllImport(@"user32.dll", EntryPoint = @"GetKeyState")]
+        private static extern int getKeyState(int vkey);
     }
 }

From c18ca19c9d60c1e5715d7b2ea05e00566f827fbd Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 6 Jul 2020 05:31:34 +0300
Subject: [PATCH 03553/10326] Add NewsPost api response

---
 .../Online/API/Requests/Responses/NewsPost.cs | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 osu.Game/Online/API/Requests/Responses/NewsPost.cs

diff --git a/osu.Game/Online/API/Requests/Responses/NewsPost.cs b/osu.Game/Online/API/Requests/Responses/NewsPost.cs
new file mode 100644
index 0000000000..f3ee0f9c35
--- /dev/null
+++ b/osu.Game/Online/API/Requests/Responses/NewsPost.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 Newtonsoft.Json;
+using System;
+
+namespace osu.Game.Online.API.Requests.Responses
+{
+    public class NewsPost
+    {
+        [JsonProperty(@"id")]
+        public long Id { get; set; }
+
+        [JsonProperty(@"author")]
+        public string Author { get; set; }
+
+        [JsonProperty(@"edit_url")]
+        public string EditUrl { get; set; }
+
+        [JsonProperty(@"first_image")]
+        public string FirstImage { get; set; }
+
+        [JsonProperty(@"published_at")]
+        public DateTimeOffset PublishedAt { get; set; }
+
+        [JsonProperty(@"updated_at")]
+        public DateTimeOffset UpdatedAt { get; set; }
+
+        [JsonProperty(@"slug")]
+        public string Slug { get; set; }
+
+        [JsonProperty(@"title")]
+        public string Title { get; set; }
+
+        [JsonProperty(@"preview")]
+        public string Preview { get; set; }
+    }
+}

From 51050ec4eff4a6d5dc81c0f95757f2194cbb9ee4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Jul 2020 12:54:39 +0900
Subject: [PATCH 03554/10326] Add per-result type pooling

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      | 51 +++++++++++++++----
 .../Rulesets/Judgements/DrawableJudgement.cs  |  1 +
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index f9002a29ca..2eff99bd3e 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -1,18 +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.Collections.Generic;
+using System.Linq;
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
-using osu.Framework.Logging;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.UI.Cursor;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -28,13 +33,12 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
 
-        private readonly DrawablePool<DrawableOsuJudgement> judgementPool;
+        private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>();
 
         public OsuPlayfield()
         {
             InternalChildren = new Drawable[]
             {
-                judgementPool = new DrawablePool<DrawableOsuJudgement>(20),
                 followPoints = new FollowPointRenderer
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -59,6 +63,13 @@ namespace osu.Game.Rulesets.Osu.UI
             };
 
             hitPolicy = new OrderedHitPolicy(HitObjectContainer);
+
+            var hitWindows = new OsuHitWindows();
+
+            foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
+                poolDictionary.Add(result, new DrawableJudgementPool(result));
+
+            AddRangeInternal(poolDictionary.Values);
         }
 
         public override void Add(DrawableHitObject h)
@@ -96,16 +107,15 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            DrawableOsuJudgement explosion = judgementPool.Get(doj =>
+            var osuObject = (OsuHitObject)judgedObject.HitObject;
+
+            DrawableOsuJudgement explosion = poolDictionary[result.Type].Get(doj =>
             {
-                if (doj.Result != null)
-                    Logger.Log("reused!");
-                doj.Result = result;
                 doj.JudgedObject = judgedObject;
 
-                doj.Origin = Anchor.Centre;
-                doj.Position = ((OsuHitObject)judgedObject.HitObject).StackedEndPosition;
-                doj.Scale = new Vector2(((OsuHitObject)judgedObject.HitObject).Scale);
+                // todo: move to JudgedObject property?
+                doj.Position = osuObject.StackedEndPosition;
+                doj.Scale = new Vector2(osuObject.Scale);
             });
 
             judgementLayer.Add(explosion);
@@ -117,5 +127,26 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             public void Add(Drawable approachCircleProxy) => AddInternal(approachCircleProxy);
         }
+
+        private class DrawableJudgementPool : DrawablePool<DrawableOsuJudgement>
+        {
+            private readonly HitResult result;
+
+            public DrawableJudgementPool(HitResult result)
+                : base(10)
+            {
+                this.result = result;
+            }
+
+            protected override DrawableOsuJudgement CreateNewDrawable()
+            {
+                var judgement = base.CreateNewDrawable();
+
+                // just a placeholder to initialise the correct drawable hierarchy for this pool.
+                judgement.Result = new JudgementResult(new HitObject(), new Judgement()) { Type = result };
+
+                return judgement;
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 86dd02f2bb..3ec5326299 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -75,6 +75,7 @@ namespace osu.Game.Rulesets.Judgements
         public DrawableJudgement()
         {
             Size = new Vector2(judgement_size);
+            Origin = Anchor.Centre;
         }
 
         protected virtual void ApplyHitAnimations()

From 7550097eb66f149c71338d2e12da3216300a9b9e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 6 Jul 2020 07:27:53 +0300
Subject: [PATCH 03555/10326] Implement NewsCard

---
 .../Visual/Online/TestSceneNewsCard.cs        |  52 +++++
 .../Online/API/Requests/Responses/NewsPost.cs |   4 +-
 osu.Game/Overlays/News/NewsCard.cs            | 196 ++++++++++++++++++
 3 files changed, 250 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
 create mode 100644 osu.Game/Overlays/News/NewsCard.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
new file mode 100644
index 0000000000..17e3d3eb7f
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Overlays.News;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Framework.Allocation;
+using osu.Game.Overlays;
+using osuTK;
+using System;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsCard : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        public TestSceneNewsCard()
+        {
+            Add(new FillFlowContainer<NewsCard>
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Direction = FillDirection.Vertical,
+                Width = 500,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(0, 20),
+                Children = new[]
+                {
+                    new NewsCard(new NewsPost
+                    {
+                        Title = "This post has an image which starts with \"/\" and has many authors!",
+                        Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+                        Author = "someone, someone1, someone2, someone3, someone4",
+                        FirstImage = "/help/wiki/shared/news/banners/monthly-beatmapping-contest.png",
+                        PublishedAt = DateTime.Now
+                    }),
+                    new NewsCard(new NewsPost
+                    {
+                        Title = "This post has a full-url image!",
+                        Preview = "boom",
+                        Author = "user",
+                        FirstImage = "https://assets.ppy.sh/artists/88/header.jpg",
+                        PublishedAt = DateTime.Now
+                    })
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/NewsPost.cs b/osu.Game/Online/API/Requests/Responses/NewsPost.cs
index f3ee0f9c35..fa10d7aa5c 100644
--- a/osu.Game/Online/API/Requests/Responses/NewsPost.cs
+++ b/osu.Game/Online/API/Requests/Responses/NewsPost.cs
@@ -21,10 +21,10 @@ namespace osu.Game.Online.API.Requests.Responses
         public string FirstImage { get; set; }
 
         [JsonProperty(@"published_at")]
-        public DateTimeOffset PublishedAt { get; set; }
+        public DateTime PublishedAt { get; set; }
 
         [JsonProperty(@"updated_at")]
-        public DateTimeOffset UpdatedAt { get; set; }
+        public DateTime UpdatedAt { get; set; }
 
         [JsonProperty(@"slug")]
         public string Slug { get; set; }
diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
new file mode 100644
index 0000000000..052f8edf52
--- /dev/null
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -0,0 +1,196 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Overlays.News
+{
+    public class NewsCard : CompositeDrawable
+    {
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
+        private readonly NewsPost post;
+
+        private Box background;
+        private TextFlowContainer main;
+
+        public NewsCard(NewsPost post)
+        {
+            this.post = post;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Masking = true;
+            CornerRadius = 6;
+
+            NewsBackground bg;
+
+            InternalChildren = new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background4
+                },
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 160,
+                            Masking = true,
+                            CornerRadius = 6,
+                            Children = new Drawable[]
+                            {
+                                new DelayedLoadWrapper(bg = new NewsBackground(post.FirstImage)
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    FillMode = FillMode.Fill,
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Alpha = 0
+                                })
+                                {
+                                    RelativeSizeAxes = Axes.Both
+                                },
+                                new DateContainer(post.PublishedAt)
+                                {
+                                    Anchor = Anchor.TopRight,
+                                    Origin = Anchor.TopRight,
+                                    Margin = new MarginPadding
+                                    {
+                                        Top = 10,
+                                        Right = 15
+                                    }
+                                }
+                            }
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Padding = new MarginPadding
+                            {
+                                Horizontal = 15,
+                                Vertical = 10
+                            },
+                            Child = main = new TextFlowContainer
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y
+                            }
+                        }
+                    }
+                },
+                new HoverClickSounds()
+            };
+
+            bg.OnLoadComplete += d => d.FadeIn(250, Easing.In);
+
+            main.AddParagraph(post.Title, t => t.Font = OsuFont.GetFont(size: 20, weight: FontWeight.SemiBold));
+            main.AddParagraph(post.Preview, t => t.Font = OsuFont.GetFont(size: 12)); // Should use sans-serif font
+            main.AddParagraph("by ", t => t.Font = OsuFont.GetFont(size: 12));
+            main.AddText(post.Author, t => t.Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold));
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            background.FadeColour(colourProvider.Background3, 200, Easing.OutQuint);
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            background.FadeColour(colourProvider.Background4, 200, Easing.OutQuint);
+            base.OnHoverLost(e);
+        }
+
+        [LongRunningLoad]
+        private class NewsBackground : Sprite
+        {
+            private readonly string sourceUrl;
+
+            public NewsBackground(string sourceUrl)
+            {
+                this.sourceUrl = sourceUrl;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(LargeTextureStore store)
+            {
+                Texture = store.Get(createUrl(sourceUrl));
+            }
+
+            private string createUrl(string source)
+            {
+                if (string.IsNullOrEmpty(source))
+                    return "Headers/news";
+
+                if (source.StartsWith('/'))
+                    return "https://osu.ppy.sh" + source;
+
+                return source;
+            }
+        }
+
+        private class DateContainer : CircularContainer, IHasTooltip
+        {
+            public string TooltipText => date.ToString("d MMMM yyyy hh:mm:ss UTCz");
+
+            private readonly DateTime date;
+
+            public DateContainer(DateTime date)
+            {
+                this.date = date;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                AutoSizeAxes = Axes.Both;
+                Masking = true;
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background6.Opacity(0.5f)
+                    },
+                    new OsuSpriteText
+                    {
+                        Text = date.ToString("d MMM yyyy").ToUpper(),
+                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                        Margin = new MarginPadding
+                        {
+                            Horizontal = 20,
+                            Vertical = 5
+                        }
+                    }
+                };
+            }
+        }
+    }
+}

From fdb7727e956a1de4f94b261b78abd5b6974d67bc Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 6 Jul 2020 07:28:44 +0300
Subject: [PATCH 03556/10326] Rename NewsPost to APINewsPost

---
 osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs             | 4 ++--
 .../API/Requests/Responses/{NewsPost.cs => APINewsPost.cs}    | 2 +-
 osu.Game/Overlays/News/NewsCard.cs                            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game/Online/API/Requests/Responses/{NewsPost.cs => APINewsPost.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
index 17e3d3eb7f..73218794a9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual.Online
                 Spacing = new Vector2(0, 20),
                 Children = new[]
                 {
-                    new NewsCard(new NewsPost
+                    new NewsCard(new APINewsPost
                     {
                         Title = "This post has an image which starts with \"/\" and has many authors!",
                         Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Online
                         FirstImage = "/help/wiki/shared/news/banners/monthly-beatmapping-contest.png",
                         PublishedAt = DateTime.Now
                     }),
-                    new NewsCard(new NewsPost
+                    new NewsCard(new APINewsPost
                     {
                         Title = "This post has a full-url image!",
                         Preview = "boom",
diff --git a/osu.Game/Online/API/Requests/Responses/NewsPost.cs b/osu.Game/Online/API/Requests/Responses/APINewsPost.cs
similarity index 97%
rename from osu.Game/Online/API/Requests/Responses/NewsPost.cs
rename to osu.Game/Online/API/Requests/Responses/APINewsPost.cs
index fa10d7aa5c..e25ad32594 100644
--- a/osu.Game/Online/API/Requests/Responses/NewsPost.cs
+++ b/osu.Game/Online/API/Requests/Responses/APINewsPost.cs
@@ -6,7 +6,7 @@ using System;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
-    public class NewsPost
+    public class APINewsPost
     {
         [JsonProperty(@"id")]
         public long Id { get; set; }
diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index 052f8edf52..994b3c8fd1 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -23,12 +23,12 @@ namespace osu.Game.Overlays.News
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        private readonly NewsPost post;
+        private readonly APINewsPost post;
 
         private Box background;
         private TextFlowContainer main;
 
-        public NewsCard(NewsPost post)
+        public NewsCard(APINewsPost post)
         {
             this.post = post;
         }

From 022e4b6335c0ebdfbc48ec4f1764ba04257a01b4 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 6 Jul 2020 11:15:56 +0200
Subject: [PATCH 03557/10326] Apply review suggestions.

---
 osu.Desktop/Windows/WindowsKey.cs                 |  6 ------
 .../Settings/Sections/Gameplay/GeneralSettings.cs | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Desktop/Windows/WindowsKey.cs b/osu.Desktop/Windows/WindowsKey.cs
index 175401aaed..4a815b135e 100644
--- a/osu.Desktop/Windows/WindowsKey.cs
+++ b/osu.Desktop/Windows/WindowsKey.cs
@@ -36,9 +36,6 @@ namespace osu.Desktop.Windows
             {
                 switch (lParam.VkCode)
                 {
-                    case 0x09 when lParam.Flags == 32: // alt + tab
-                    case 0x1b when lParam.Flags == 32: // alt + esc
-                    case 0x1b when (getKeyState(0x11) & 0x8000) != 0: //ctrl + esc
                     case 0x5B: // left windows key
                     case 0x5C: // right windows key
                         return 1;
@@ -79,8 +76,5 @@ namespace osu.Desktop.Windows
 
         [DllImport(@"user32.dll", EntryPoint = @"CallNextHookEx")]
         private static extern int callNextHookEx(int hHook, int nCode, int wParam, ref KdDllHookStruct lParam);
-
-        [DllImport(@"user32.dll", EntryPoint = @"GetKeyState")]
-        private static extern int getKeyState(int vkey);
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 60197c62b5..0149e6c3a6 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.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;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
@@ -76,13 +77,17 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Score display mode",
                     Bindable = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode)
-                },
-                new SettingsCheckbox
-                {
-                    LabelText = "Disable Win key during gameplay",
-                    Bindable = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey)
                 }
             };
+
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
+            {
+                Add(new SettingsCheckbox
+                {
+                    LabelText = "Disable Windows key during gameplay",
+                    Bindable = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey)
+                });
+            }
         }
     }
 }

From dbbee481f60b21911b5c67fa1d575272ac7a3a25 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Jul 2020 22:01:45 +0900
Subject: [PATCH 03558/10326] Expose dialog body text getter

---
 osu.Game/Overlays/Dialog/PopupDialog.cs | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 02ef900dc5..1bcbe4dd2f 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -42,25 +42,34 @@ namespace osu.Game.Overlays.Dialog
             set => icon.Icon = value;
         }
 
-        private string text;
+        private string headerText;
 
         public string HeaderText
         {
-            get => text;
+            get => headerText;
             set
             {
-                if (text == value)
+                if (headerText == value)
                     return;
 
-                text = value;
-
+                headerText = value;
                 header.Text = value;
             }
         }
 
+        private string bodyText;
+
         public string BodyText
         {
-            set => body.Text = value;
+            get => bodyText;
+            set
+            {
+                if (bodyText == value)
+                    return;
+
+                bodyText = value;
+                body.Text = value;
+            }
         }
 
         public IEnumerable<PopupDialogButton> Buttons

From 1effe71ec2279ea53aafe07e230160312612b5e4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Jul 2020 22:03:09 +0900
Subject: [PATCH 03559/10326] Add dialog for storage options

---
 osu.Game/IO/OsuStorage.cs         | 95 ++++++++++++++++++++++++++-----
 osu.Game/Screens/Menu/MainMenu.cs | 79 +++++++++++++++++++++++++
 2 files changed, 161 insertions(+), 13 deletions(-)

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 8bcc0941c1..3d6903c56f 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -2,9 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using JetBrains.Annotations;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
@@ -13,12 +15,30 @@ namespace osu.Game.IO
 {
     public class OsuStorage : WrappedStorage
     {
+        /// <summary>
+        /// Indicates the error (if any) that occurred when initialising the custom storage during initial startup.
+        /// </summary>
+        public readonly OsuStorageError Error;
+
+        /// <summary>
+        /// The custom storage path as selected by the user.
+        /// </summary>
+        [CanBeNull]
+        public string CustomStoragePath => storageConfig.Get<string>(StorageConfig.FullPath);
+
+        /// <summary>
+        /// The default storage path to be used if a custom storage path hasn't been selected or is not accessible.
+        /// </summary>
+        [NotNull]
+        public string DefaultStoragePath => defaultStorage.GetFullPath(".");
+
         private readonly GameHost host;
         private readonly StorageConfigManager storageConfig;
+        private readonly Storage defaultStorage;
 
-        internal static readonly string[] IGNORE_DIRECTORIES = { "cache" };
+        public static readonly string[] IGNORE_DIRECTORIES = { "cache" };
 
-        internal static readonly string[] IGNORE_FILES =
+        public static readonly string[] IGNORE_FILES =
         {
             "framework.ini",
             "storage.ini"
@@ -28,23 +48,53 @@ namespace osu.Game.IO
             : base(defaultStorage, string.Empty)
         {
             this.host = host;
+            this.defaultStorage = defaultStorage;
 
             storageConfig = new StorageConfigManager(defaultStorage);
 
-            var customStoragePath = storageConfig.Get<string>(StorageConfig.FullPath);
+            if (!string.IsNullOrEmpty(CustomStoragePath))
+                TryChangeToCustomStorage(out Error);
+        }
 
-            if (!string.IsNullOrEmpty(customStoragePath))
+        /// <summary>
+        /// Resets the custom storage path, changing the target storage to the default location.
+        /// </summary>
+        public void ResetCustomStoragePath()
+        {
+            storageConfig.Set(StorageConfig.FullPath, string.Empty);
+            storageConfig.Save();
+
+            ChangeTargetStorage(defaultStorage);
+        }
+
+        /// <summary>
+        /// Attempts to change to the user's custom storage path.
+        /// </summary>
+        /// <param name="error">The error that occurred.</param>
+        /// <returns>Whether the custom storage path was used successfully. If not, <paramref name="error"/> will be populated with the reason.</returns>
+        public bool TryChangeToCustomStorage(out OsuStorageError error)
+        {
+            Debug.Assert(!string.IsNullOrEmpty(CustomStoragePath));
+
+            error = OsuStorageError.None;
+            Storage lastStorage = UnderlyingStorage;
+
+            try
             {
-                try
-                {
-                    ChangeTargetStorage(host.GetStorage(customStoragePath));
-                }
-                catch (Exception ex)
-                {
-                    Logger.Log($"Couldn't use custom storage path ({customStoragePath}): {ex}. Using default path.", LoggingTarget.Runtime, LogLevel.Error);
-                    ChangeTargetStorage(defaultStorage);
-                }
+                Storage userStorage = host.GetStorage(CustomStoragePath);
+
+                if (!userStorage.GetFiles(".").Any())
+                    error = OsuStorageError.AccessibleButEmpty;
+
+                ChangeTargetStorage(userStorage);
             }
+            catch
+            {
+                error = OsuStorageError.NotAccessible;
+                ChangeTargetStorage(lastStorage);
+            }
+
+            return error == OsuStorageError.None;
         }
 
         protected override void ChangeTargetStorage(Storage newStorage)
@@ -155,4 +205,23 @@ namespace osu.Game.IO
             }
         }
     }
+
+    public enum OsuStorageError
+    {
+        /// <summary>
+        /// No error.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Occurs when the target storage directory is accessible but does not already contain game files.
+        /// Only happens when the user changes the storage directory and then moves the files manually or mounts a different device to the same path.
+        /// </summary>
+        AccessibleButEmpty,
+
+        /// <summary>
+        /// Occurs when the target storage directory cannot be accessed at all.
+        /// </summary>
+        NotAccessible,
+    }
 }
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 9245df2a7d..c391742c45 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.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 osuTK;
 using osuTK.Graphics;
@@ -15,6 +16,7 @@ using osu.Framework.Screens;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.IO;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
@@ -171,6 +173,9 @@ namespace osu.Game.Screens.Menu
             return s;
         }
 
+        [Resolved]
+        private Storage storage { get; set; }
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
@@ -187,6 +192,9 @@ namespace osu.Game.Screens.Menu
                     Track.Start();
                 }
             }
+
+            if (storage is OsuStorage osuStorage && osuStorage.Error != OsuStorageError.None)
+                dialogOverlay?.Push(new StorageErrorDialog(osuStorage, osuStorage.Error));
         }
 
         private bool exitConfirmed;
@@ -308,5 +316,76 @@ namespace osu.Game.Screens.Menu
                 };
             }
         }
+
+        private class StorageErrorDialog : PopupDialog
+        {
+            [Resolved]
+            private DialogOverlay dialogOverlay { get; set; }
+
+            [Resolved]
+            private OsuGameBase osuGame { get; set; }
+
+            public StorageErrorDialog(OsuStorage storage, OsuStorageError error)
+            {
+                HeaderText = "osu! storage error";
+                Icon = FontAwesome.Solid.ExclamationTriangle;
+
+                var buttons = new List<PopupDialogButton>();
+
+                BodyText = $"osu! encountered an error when trying to use the custom storage path ('{storage.CustomStoragePath}').\n\n";
+
+                switch (error)
+                {
+                    case OsuStorageError.NotAccessible:
+                        BodyText += $"The default storage path ('{storage.DefaultStoragePath}') is currently being used because the custom storage path is not accessible.\n\n"
+                                    + "Is it on a removable device that is not currently connected?";
+
+                        buttons.AddRange(new PopupDialogButton[]
+                        {
+                            new PopupDialogOkButton
+                            {
+                                Text = "Try again",
+                                Action = () =>
+                                {
+                                    if (!storage.TryChangeToCustomStorage(out var nextError))
+                                        dialogOverlay.Push(new StorageErrorDialog(storage, nextError));
+                                }
+                            },
+                            new PopupDialogOkButton
+                            {
+                                Text = "Use the default path from now on",
+                                Action = storage.ResetCustomStoragePath
+                            },
+                            new PopupDialogCancelButton
+                            {
+                                Text = "Only use the default path for this session",
+                            },
+                        });
+                        break;
+
+                    case OsuStorageError.AccessibleButEmpty:
+                        BodyText += "The custom storage path is currently being used but is empty.\n\n"
+                                    + "Have you moved the files elsewhere?";
+
+                        // Todo: Provide the option to search for the files similar to migration.
+                        buttons.AddRange(new PopupDialogButton[]
+                        {
+                            new PopupDialogOkButton
+                            {
+                                Text = "Reset to default",
+                                Action = storage.ResetCustomStoragePath
+                            },
+                            new PopupDialogCancelButton
+                            {
+                                Text = "Keep using the custom path"
+                            }
+                        });
+
+                        break;
+                }
+
+                Buttons = buttons;
+            }
+        }
     }
 }

From 8f792603ee6b03d19bba1ffc7d74203904205a35 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 6 Jul 2020 22:40:45 +0900
Subject: [PATCH 03560/10326] Apply suggestions from code review

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Screens/Menu/MainMenu.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index c391742c45..d64d9b69fe 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -332,13 +332,11 @@ namespace osu.Game.Screens.Menu
 
                 var buttons = new List<PopupDialogButton>();
 
-                BodyText = $"osu! encountered an error when trying to use the custom storage path ('{storage.CustomStoragePath}').\n\n";
 
                 switch (error)
                 {
                     case OsuStorageError.NotAccessible:
-                        BodyText += $"The default storage path ('{storage.DefaultStoragePath}') is currently being used because the custom storage path is not accessible.\n\n"
-                                    + "Is it on a removable device that is not currently connected?";
+                        BodyText = $"The specified osu! data location (\"{storage.CustomStoragePath}\") is not accessible. If it is on external storage, please reconnect the device and try again.";
 
                         buttons.AddRange(new PopupDialogButton[]
                         {
@@ -353,31 +351,30 @@ namespace osu.Game.Screens.Menu
                             },
                             new PopupDialogOkButton
                             {
-                                Text = "Use the default path from now on",
+                                Text = "Reset to default location",
                                 Action = storage.ResetCustomStoragePath
                             },
                             new PopupDialogCancelButton
                             {
-                                Text = "Only use the default path for this session",
+                                Text = "Use default location for this session",
                             },
                         });
                         break;
 
                     case OsuStorageError.AccessibleButEmpty:
-                        BodyText += "The custom storage path is currently being used but is empty.\n\n"
-                                    + "Have you moved the files elsewhere?";
+                        BodyText = $"The specified osu! data location (\"{storage.CustomStoragePath}\") is empty. If you have moved the files, please close osu! and move them back.";
 
                         // Todo: Provide the option to search for the files similar to migration.
                         buttons.AddRange(new PopupDialogButton[]
                         {
                             new PopupDialogOkButton
                             {
-                                Text = "Reset to default",
+                                Text = "Reset to default location",
                                 Action = storage.ResetCustomStoragePath
                             },
                             new PopupDialogCancelButton
                             {
-                                Text = "Keep using the custom path"
+                                Text = "Start fresh at specified location"
                             }
                         });
 

From ddac511c8c5c3b4ef641c1a80e4e9dbbe6359ce4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Jul 2020 22:41:51 +0900
Subject: [PATCH 03561/10326] Move start fresh button above

---
 osu.Game/Screens/Menu/MainMenu.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index d64d9b69fe..dcb141cce5 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -332,7 +332,6 @@ namespace osu.Game.Screens.Menu
 
                 var buttons = new List<PopupDialogButton>();
 
-
                 switch (error)
                 {
                     case OsuStorageError.NotAccessible:
@@ -367,15 +366,15 @@ namespace osu.Game.Screens.Menu
                         // Todo: Provide the option to search for the files similar to migration.
                         buttons.AddRange(new PopupDialogButton[]
                         {
+                            new PopupDialogCancelButton
+                            {
+                                Text = "Start fresh at specified location"
+                            },
                             new PopupDialogOkButton
                             {
                                 Text = "Reset to default location",
                                 Action = storage.ResetCustomStoragePath
                             },
-                            new PopupDialogCancelButton
-                            {
-                                Text = "Start fresh at specified location"
-                            }
                         });
 
                         break;

From 00a2fbce06ac67d5bc077f10e43c302c98af629e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Jul 2020 22:41:58 +0900
Subject: [PATCH 03562/10326] Fix test failures

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

diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 3d6903c56f..1d15294666 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -83,7 +83,7 @@ namespace osu.Game.IO
             {
                 Storage userStorage = host.GetStorage(CustomStoragePath);
 
-                if (!userStorage.GetFiles(".").Any())
+                if (!userStorage.ExistsDirectory(".") || !userStorage.GetFiles(".").Any())
                     error = OsuStorageError.AccessibleButEmpty;
 
                 ChangeTargetStorage(userStorage);

From a650a5ec83ca93d17709c9c34fb5922857e23d90 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Jul 2020 23:44:26 +0900
Subject: [PATCH 03563/10326] Move dialog classes to own file

---
 osu.Game/Screens/Menu/ConfirmExitDialog.cs  | 34 ++++++++
 osu.Game/Screens/Menu/MainMenu.cs           | 96 ---------------------
 osu.Game/Screens/Menu/StorageErrorDialog.cs | 79 +++++++++++++++++
 3 files changed, 113 insertions(+), 96 deletions(-)
 create mode 100644 osu.Game/Screens/Menu/ConfirmExitDialog.cs
 create mode 100644 osu.Game/Screens/Menu/StorageErrorDialog.cs

diff --git a/osu.Game/Screens/Menu/ConfirmExitDialog.cs b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
new file mode 100644
index 0000000000..d120eb21a8
--- /dev/null
+++ b/osu.Game/Screens/Menu/ConfirmExitDialog.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 osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Game.Screens.Menu
+{
+    public class ConfirmExitDialog : PopupDialog
+    {
+        public ConfirmExitDialog(Action confirm, Action cancel)
+        {
+            HeaderText = "Are you sure you want to exit?";
+            BodyText = "Last chance to back out.";
+
+            Icon = FontAwesome.Solid.ExclamationTriangle;
+
+            Buttons = new PopupDialogButton[]
+            {
+                new PopupDialogOkButton
+                {
+                    Text = @"Goodbye",
+                    Action = confirm
+                },
+                new PopupDialogCancelButton
+                {
+                    Text = @"Just a little more",
+                    Action = cancel
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index dcb141cce5..76950982e6 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.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 osuTK;
 using osuTK.Graphics;
@@ -10,7 +8,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.Configuration;
@@ -19,7 +16,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.IO;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Dialog;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Multi;
@@ -291,97 +287,5 @@ namespace osu.Game.Screens.Menu
             this.FadeOut(3000);
             return base.OnExiting(next);
         }
-
-        private class ConfirmExitDialog : PopupDialog
-        {
-            public ConfirmExitDialog(Action confirm, Action cancel)
-            {
-                HeaderText = "Are you sure you want to exit?";
-                BodyText = "Last chance to back out.";
-
-                Icon = FontAwesome.Solid.ExclamationTriangle;
-
-                Buttons = new PopupDialogButton[]
-                {
-                    new PopupDialogOkButton
-                    {
-                        Text = @"Goodbye",
-                        Action = confirm
-                    },
-                    new PopupDialogCancelButton
-                    {
-                        Text = @"Just a little more",
-                        Action = cancel
-                    },
-                };
-            }
-        }
-
-        private class StorageErrorDialog : PopupDialog
-        {
-            [Resolved]
-            private DialogOverlay dialogOverlay { get; set; }
-
-            [Resolved]
-            private OsuGameBase osuGame { get; set; }
-
-            public StorageErrorDialog(OsuStorage storage, OsuStorageError error)
-            {
-                HeaderText = "osu! storage error";
-                Icon = FontAwesome.Solid.ExclamationTriangle;
-
-                var buttons = new List<PopupDialogButton>();
-
-                switch (error)
-                {
-                    case OsuStorageError.NotAccessible:
-                        BodyText = $"The specified osu! data location (\"{storage.CustomStoragePath}\") is not accessible. If it is on external storage, please reconnect the device and try again.";
-
-                        buttons.AddRange(new PopupDialogButton[]
-                        {
-                            new PopupDialogOkButton
-                            {
-                                Text = "Try again",
-                                Action = () =>
-                                {
-                                    if (!storage.TryChangeToCustomStorage(out var nextError))
-                                        dialogOverlay.Push(new StorageErrorDialog(storage, nextError));
-                                }
-                            },
-                            new PopupDialogOkButton
-                            {
-                                Text = "Reset to default location",
-                                Action = storage.ResetCustomStoragePath
-                            },
-                            new PopupDialogCancelButton
-                            {
-                                Text = "Use default location for this session",
-                            },
-                        });
-                        break;
-
-                    case OsuStorageError.AccessibleButEmpty:
-                        BodyText = $"The specified osu! data location (\"{storage.CustomStoragePath}\") is empty. If you have moved the files, please close osu! and move them back.";
-
-                        // Todo: Provide the option to search for the files similar to migration.
-                        buttons.AddRange(new PopupDialogButton[]
-                        {
-                            new PopupDialogCancelButton
-                            {
-                                Text = "Start fresh at specified location"
-                            },
-                            new PopupDialogOkButton
-                            {
-                                Text = "Reset to default location",
-                                Action = storage.ResetCustomStoragePath
-                            },
-                        });
-
-                        break;
-                }
-
-                Buttons = buttons;
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Menu/StorageErrorDialog.cs b/osu.Game/Screens/Menu/StorageErrorDialog.cs
new file mode 100644
index 0000000000..38a6c07ce7
--- /dev/null
+++ b/osu.Game/Screens/Menu/StorageErrorDialog.cs
@@ -0,0 +1,79 @@
+// Copyright (c) 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.Sprites;
+using osu.Game.IO;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Game.Screens.Menu
+{
+    public class StorageErrorDialog : PopupDialog
+    {
+        [Resolved]
+        private DialogOverlay dialogOverlay { get; set; }
+
+        [Resolved]
+        private OsuGameBase osuGame { get; set; }
+
+        public StorageErrorDialog(OsuStorage storage, OsuStorageError error)
+        {
+            HeaderText = "osu! storage error";
+            Icon = FontAwesome.Solid.ExclamationTriangle;
+
+            var buttons = new List<PopupDialogButton>();
+
+            switch (error)
+            {
+                case OsuStorageError.NotAccessible:
+                    BodyText = $"The specified osu! data location (\"{storage.CustomStoragePath}\") is not accessible. If it is on external storage, please reconnect the device and try again.";
+
+                    buttons.AddRange(new PopupDialogButton[]
+                    {
+                        new PopupDialogOkButton
+                        {
+                            Text = "Try again",
+                            Action = () =>
+                            {
+                                if (!storage.TryChangeToCustomStorage(out var nextError))
+                                    dialogOverlay.Push(new StorageErrorDialog(storage, nextError));
+                            }
+                        },
+                        new PopupDialogOkButton
+                        {
+                            Text = "Reset to default location",
+                            Action = storage.ResetCustomStoragePath
+                        },
+                        new PopupDialogCancelButton
+                        {
+                            Text = "Use default location for this session",
+                        },
+                    });
+                    break;
+
+                case OsuStorageError.AccessibleButEmpty:
+                    BodyText = $"The specified osu! data location (\"{storage.CustomStoragePath}\") is empty. If you have moved the files, please close osu! and move them back.";
+
+                    // Todo: Provide the option to search for the files similar to migration.
+                    buttons.AddRange(new PopupDialogButton[]
+                    {
+                        new PopupDialogCancelButton
+                        {
+                            Text = "Start fresh at specified location"
+                        },
+                        new PopupDialogOkButton
+                        {
+                            Text = "Reset to default location",
+                            Action = storage.ResetCustomStoragePath
+                        },
+                    });
+
+                    break;
+            }
+
+            Buttons = buttons;
+        }
+    }
+}

From 3f3bfb1ffbe001ed4016b6750ff830c5f983279b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Jul 2020 23:51:16 +0900
Subject: [PATCH 03564/10326] Minor reshuffling / recolouring

---
 osu.Game/Screens/Menu/StorageErrorDialog.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/StorageErrorDialog.cs b/osu.Game/Screens/Menu/StorageErrorDialog.cs
index 38a6c07ce7..dcaad4013a 100644
--- a/osu.Game/Screens/Menu/StorageErrorDialog.cs
+++ b/osu.Game/Screens/Menu/StorageErrorDialog.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Menu
 
                     buttons.AddRange(new PopupDialogButton[]
                     {
-                        new PopupDialogOkButton
+                        new PopupDialogCancelButton
                         {
                             Text = "Try again",
                             Action = () =>
@@ -41,15 +41,15 @@ namespace osu.Game.Screens.Menu
                                     dialogOverlay.Push(new StorageErrorDialog(storage, nextError));
                             }
                         },
+                        new PopupDialogCancelButton
+                        {
+                            Text = "Use default location until restart",
+                        },
                         new PopupDialogOkButton
                         {
                             Text = "Reset to default location",
                             Action = storage.ResetCustomStoragePath
                         },
-                        new PopupDialogCancelButton
-                        {
-                            Text = "Use default location for this session",
-                        },
                     });
                     break;
 

From ebbc8298917db15105130ea2b12e1dab67173a88 Mon Sep 17 00:00:00 2001
From: Rsplwe <i@rsplwe.com>
Date: Tue, 7 Jul 2020 00:15:27 +0800
Subject: [PATCH 03565/10326] disable HardwareAccelerated

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 2e5fa59d20..9839d16030 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -9,7 +9,7 @@ using osu.Framework.Android;
 
 namespace osu.Android
 {
-    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullSensor, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = true)]
+    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullSensor, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
     public class OsuGameActivity : AndroidGameActivity
     {
         protected override Framework.Game CreateGame() => new OsuGameAndroid();

From 9dde101f12201e66b92005a31773125e44629bd1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 6 Jul 2020 23:53:27 +0300
Subject: [PATCH 03566/10326] Remove string prefixes

---
 .../API/Requests/Responses/APINewsPost.cs      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APINewsPost.cs b/osu.Game/Online/API/Requests/Responses/APINewsPost.cs
index e25ad32594..5cd94efdd2 100644
--- a/osu.Game/Online/API/Requests/Responses/APINewsPost.cs
+++ b/osu.Game/Online/API/Requests/Responses/APINewsPost.cs
@@ -8,31 +8,31 @@ namespace osu.Game.Online.API.Requests.Responses
 {
     public class APINewsPost
     {
-        [JsonProperty(@"id")]
+        [JsonProperty("id")]
         public long Id { get; set; }
 
-        [JsonProperty(@"author")]
+        [JsonProperty("author")]
         public string Author { get; set; }
 
-        [JsonProperty(@"edit_url")]
+        [JsonProperty("edit_url")]
         public string EditUrl { get; set; }
 
-        [JsonProperty(@"first_image")]
+        [JsonProperty("first_image")]
         public string FirstImage { get; set; }
 
-        [JsonProperty(@"published_at")]
+        [JsonProperty("published_at")]
         public DateTime PublishedAt { get; set; }
 
-        [JsonProperty(@"updated_at")]
+        [JsonProperty("updated_at")]
         public DateTime UpdatedAt { get; set; }
 
-        [JsonProperty(@"slug")]
+        [JsonProperty("slug")]
         public string Slug { get; set; }
 
-        [JsonProperty(@"title")]
+        [JsonProperty("title")]
         public string Title { get; set; }
 
-        [JsonProperty(@"preview")]
+        [JsonProperty("preview")]
         public string Preview { get; set; }
     }
 }

From 68d9f9de4629da8b41bc4389b878cf826bb76bb8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 6 Jul 2020 23:55:20 +0300
Subject: [PATCH 03567/10326] Use DateTimeOffset

---
 osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs     | 4 ++--
 osu.Game/Online/API/Requests/Responses/APINewsPost.cs | 4 ++--
 osu.Game/Overlays/News/NewsCard.cs                    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
index 73218794a9..82f603df6a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Online
                         Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                         Author = "someone, someone1, someone2, someone3, someone4",
                         FirstImage = "/help/wiki/shared/news/banners/monthly-beatmapping-contest.png",
-                        PublishedAt = DateTime.Now
+                        PublishedAt = DateTimeOffset.Now
                     }),
                     new NewsCard(new APINewsPost
                     {
@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual.Online
                         Preview = "boom",
                         Author = "user",
                         FirstImage = "https://assets.ppy.sh/artists/88/header.jpg",
-                        PublishedAt = DateTime.Now
+                        PublishedAt = DateTimeOffset.Now
                     })
                 }
             });
diff --git a/osu.Game/Online/API/Requests/Responses/APINewsPost.cs b/osu.Game/Online/API/Requests/Responses/APINewsPost.cs
index 5cd94efdd2..7cc6907949 100644
--- a/osu.Game/Online/API/Requests/Responses/APINewsPost.cs
+++ b/osu.Game/Online/API/Requests/Responses/APINewsPost.cs
@@ -21,10 +21,10 @@ namespace osu.Game.Online.API.Requests.Responses
         public string FirstImage { get; set; }
 
         [JsonProperty("published_at")]
-        public DateTime PublishedAt { get; set; }
+        public DateTimeOffset PublishedAt { get; set; }
 
         [JsonProperty("updated_at")]
-        public DateTime UpdatedAt { get; set; }
+        public DateTimeOffset UpdatedAt { get; set; }
 
         [JsonProperty("slug")]
         public string Slug { get; set; }
diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index 994b3c8fd1..08a9fccc4e 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -160,9 +160,9 @@ namespace osu.Game.Overlays.News
         {
             public string TooltipText => date.ToString("d MMMM yyyy hh:mm:ss UTCz");
 
-            private readonly DateTime date;
+            private readonly DateTimeOffset date;
 
-            public DateContainer(DateTime date)
+            public DateContainer(DateTimeOffset date)
             {
                 this.date = date;
             }

From c86bb2e755d9c43bfb7130d22883b19f40c8e3d2 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 7 Jul 2020 00:01:06 +0300
Subject: [PATCH 03568/10326] Use DrawableDate tooltip for DateContainer

---
 osu.Game/Graphics/DrawableDate.cs  | 2 +-
 osu.Game/Overlays/News/NewsCard.cs | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs
index 8b6df4a834..953b7541e1 100644
--- a/osu.Game/Graphics/DrawableDate.cs
+++ b/osu.Game/Graphics/DrawableDate.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Graphics
 
         public object TooltipContent => Date;
 
-        private class DateTooltip : VisibilityContainer, ITooltip
+        public class DateTooltip : VisibilityContainer, ITooltip
         {
             private readonly OsuSpriteText dateText, timeText;
             private readonly Box background;
diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index 08a9fccc4e..c22a3268bf 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -156,9 +156,11 @@ namespace osu.Game.Overlays.News
             }
         }
 
-        private class DateContainer : CircularContainer, IHasTooltip
+        private class DateContainer : CircularContainer, IHasCustomTooltip
         {
-            public string TooltipText => date.ToString("d MMMM yyyy hh:mm:ss UTCz");
+            public ITooltip GetCustomTooltip() => new DrawableDate.DateTooltip();
+
+            public object TooltipContent => date;
 
             private readonly DateTimeOffset date;
 

From 857a027a7366952209e7548c0fe40ea371bf75f8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 7 Jul 2020 00:11:35 +0300
Subject: [PATCH 03569/10326] Parse HTML entities during APINewsPost
 deserialisation

---
 .../Visual/Online/TestSceneNewsCard.cs        |  6 ++---
 .../API/Requests/Responses/APINewsPost.cs     | 25 ++++++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
index 82f603df6a..0446cadac9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
@@ -39,9 +39,9 @@ namespace osu.Game.Tests.Visual.Online
                     }),
                     new NewsCard(new APINewsPost
                     {
-                        Title = "This post has a full-url image!",
-                        Preview = "boom",
-                        Author = "user",
+                        Title = "This post has a full-url image! (HTML entity: &amp;)",
+                        Preview = "boom (HTML entity: &amp;)",
+                        Author = "user (HTML entity: &amp;)",
                         FirstImage = "https://assets.ppy.sh/artists/88/header.jpg",
                         PublishedAt = DateTimeOffset.Now
                     })
diff --git a/osu.Game/Online/API/Requests/Responses/APINewsPost.cs b/osu.Game/Online/API/Requests/Responses/APINewsPost.cs
index 7cc6907949..ced08f0bf2 100644
--- a/osu.Game/Online/API/Requests/Responses/APINewsPost.cs
+++ b/osu.Game/Online/API/Requests/Responses/APINewsPost.cs
@@ -3,6 +3,7 @@
 
 using Newtonsoft.Json;
 using System;
+using System.Net;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
@@ -11,8 +12,14 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty("id")]
         public long Id { get; set; }
 
+        private string author;
+
         [JsonProperty("author")]
-        public string Author { get; set; }
+        public string Author
+        {
+            get => author;
+            set => author = WebUtility.HtmlDecode(value);
+        }
 
         [JsonProperty("edit_url")]
         public string EditUrl { get; set; }
@@ -29,10 +36,22 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty("slug")]
         public string Slug { get; set; }
 
+        private string title;
+
         [JsonProperty("title")]
-        public string Title { get; set; }
+        public string Title
+        {
+            get => title;
+            set => title = WebUtility.HtmlDecode(value);
+        }
+
+        private string preview;
 
         [JsonProperty("preview")]
-        public string Preview { get; set; }
+        public string Preview
+        {
+            get => preview;
+            set => preview = WebUtility.HtmlDecode(value);
+        }
     }
 }

From 88b2a12c0942e6296f453456a42e8a7958a92488 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Jul 2020 17:38:42 +0900
Subject: [PATCH 03570/10326] Reduce footer height to match back button

---
 osu.Game/Screens/Multi/Match/Components/Footer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index 94d7df6194..be4ee873fa 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Multi.Match.Components
 {
     public class Footer : CompositeDrawable
     {
-        public const float HEIGHT = 100;
+        public const float HEIGHT = 50;
 
         public Action OnStart;
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();

From c74bfd5c88e2a55c35a996b9902e127f1da35df7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Jul 2020 17:42:20 +0900
Subject: [PATCH 03571/10326] Revert unintentional changes

---
 osu.Game/Tests/Visual/ModTestScene.cs    | 13 +++++++++++++
 osu.Game/Tests/Visual/ScreenTestScene.cs |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index add851ebf3..23b5ad0bd8 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -21,6 +21,19 @@ namespace osu.Game.Tests.Visual
             AddStep("set test data", () => currentTestData = testData);
         });
 
+        public override void TearDownSteps()
+        {
+            AddUntilStep("test passed", () =>
+            {
+                if (currentTestData == null)
+                    return true;
+
+                return currentTestData.PassCondition?.Invoke() ?? false;
+            });
+
+            base.TearDownSteps();
+        }
+
         protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestData?.Beatmap ?? base.CreateBeatmap(ruleset);
 
         protected sealed override TestPlayer CreatePlayer(Ruleset ruleset)
diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index 067d8faf54..33cc00e748 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -33,8 +33,8 @@ namespace osu.Game.Tests.Visual
         [SetUpSteps]
         public virtual void SetUpSteps() => addExitAllScreensStep();
 
-        // [TearDownSteps]
-        // public virtual void TearDownSteps() => addExitAllScreensStep();
+        [TearDownSteps]
+        public virtual void TearDownSteps() => addExitAllScreensStep();
 
         private void addExitAllScreensStep()
         {

From 4a1bea48745e925ef46c300213e9da762afd2992 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Jul 2020 18:28:43 +0900
Subject: [PATCH 03572/10326] Adjust layout to be two columns (and more
 friendly to vertical screens)

---
 .../Multi/Components/OverlinedDisplay.cs      |  5 ++-
 .../Screens/Multi/Match/MatchSubScreen.cs     | 37 ++++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
index d2bb3c4876..2b589256fa 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
@@ -86,7 +86,10 @@ namespace osu.Game.Screens.Multi.Components
                                     Text = title,
                                     Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
                                 },
-                                details = new OsuSpriteText { Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold) },
+                                details = new OsuSpriteText
+                                {
+                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
+                                },
                             }
                         },
                     },
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 1b2fdffa5e..a93caed09c 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -115,6 +115,7 @@ namespace osu.Game.Screens.Multi.Match
                                                 {
                                                     new Drawable[]
                                                     {
+                                                        null,
                                                         new Container
                                                         {
                                                             RelativeSizeAxes = Axes.Both,
@@ -151,19 +152,37 @@ namespace osu.Game.Screens.Multi.Match
                                                                 }
                                                             }
                                                         },
-                                                        new Container
+                                                        null,
+                                                        new GridContainer
                                                         {
                                                             RelativeSizeAxes = Axes.Both,
-                                                            Padding = new MarginPadding { Horizontal = 5 },
-                                                            Child = leaderboard = new OverlinedLeaderboard { RelativeSizeAxes = Axes.Both },
+                                                            Content = new[]
+                                                            {
+                                                                new Drawable[]
+                                                                {
+                                                                    leaderboard = new OverlinedLeaderboard { RelativeSizeAxes = Axes.Both },
+                                                                },
+                                                                new Drawable[]
+                                                                {
+                                                                    new OverlinedChatDisplay { RelativeSizeAxes = Axes.Both }
+                                                                }
+                                                            },
+                                                            RowDimensions = new[]
+                                                            {
+                                                                new Dimension(),
+                                                                new Dimension(GridSizeMode.Relative, size: 0.4f, minSize: 300),
+                                                            }
                                                         },
-                                                        new Container
-                                                        {
-                                                            RelativeSizeAxes = Axes.Both,
-                                                            Padding = new MarginPadding { Left = 5 },
-                                                            Child = new OverlinedChatDisplay { RelativeSizeAxes = Axes.Both }
-                                                        }
+                                                        null
                                                     },
+                                                },
+                                                ColumnDimensions = new[]
+                                                {
+                                                    new Dimension(),
+                                                    new Dimension(GridSizeMode.Relative, size: 0.5f, maxSize: 400),
+                                                    new Dimension(),
+                                                    new Dimension(GridSizeMode.Relative, size: 0.5f, maxSize: 600),
+                                                    new Dimension(),
                                                 }
                                             }
                                         }

From 4b4fcd39e396a95b82d4d1676ade91a693fbf8f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Jul 2020 18:40:21 +0900
Subject: [PATCH 03573/10326] Further layout adjustments based on fedback

---
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index a93caed09c..694315a3b3 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -115,7 +115,6 @@ namespace osu.Game.Screens.Multi.Match
                                                 {
                                                     new Drawable[]
                                                     {
-                                                        null,
                                                         new Container
                                                         {
                                                             RelativeSizeAxes = Axes.Both,
@@ -170,7 +169,7 @@ namespace osu.Game.Screens.Multi.Match
                                                             RowDimensions = new[]
                                                             {
                                                                 new Dimension(),
-                                                                new Dimension(GridSizeMode.Relative, size: 0.4f, minSize: 300),
+                                                                new Dimension(GridSizeMode.Relative, size: 0.4f, minSize: 240),
                                                             }
                                                         },
                                                         null
@@ -178,7 +177,6 @@ namespace osu.Game.Screens.Multi.Match
                                                 },
                                                 ColumnDimensions = new[]
                                                 {
-                                                    new Dimension(),
                                                     new Dimension(GridSizeMode.Relative, size: 0.5f, maxSize: 400),
                                                     new Dimension(),
                                                     new Dimension(GridSizeMode.Relative, size: 0.5f, maxSize: 600),

From 8909bf628ca6d19843be0506b484d4ca7b609d55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Jul 2020 21:08:13 +0900
Subject: [PATCH 03574/10326] 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 a2c97ead2f..0563e5319d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.701.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.707.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3ef53a2a53..4e6de77e86 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.701.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.707.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 492bf89fab..c31e28638f 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.Framework.iOS" Version="2020.701.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.707.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.701.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.707.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 8152e0791dee15945908a565668e783d789a9514 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Jul 2020 21:47:44 +0900
Subject: [PATCH 03575/10326] Fix potential nullref

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

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index 64b3afcae1..45ef793deb 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -91,7 +91,8 @@ namespace osu.Game.Overlays.BeatmapListing
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colourProvider)
             {
-                ((FilterDropdown)Dropdown).AccentColour = colourProvider.Light2;
+                if (Dropdown is FilterDropdown fd)
+                    fd.AccentColour = colourProvider.Light2;
             }
 
             protected override Dropdown<T> CreateDropdown() => new FilterDropdown();

From bdec13d4a48001b2b21c43b0e7c750ee4494bb88 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 7 Jul 2020 16:46:17 +0300
Subject: [PATCH 03576/10326] Move DateTooltip to it's on file

---
 osu.Game/Graphics/DateTooltip.cs   | 78 ++++++++++++++++++++++++++++++
 osu.Game/Graphics/DrawableDate.cs  | 67 -------------------------
 osu.Game/Overlays/News/NewsCard.cs |  2 +-
 3 files changed, 79 insertions(+), 68 deletions(-)
 create mode 100644 osu.Game/Graphics/DateTooltip.cs

diff --git a/osu.Game/Graphics/DateTooltip.cs b/osu.Game/Graphics/DateTooltip.cs
new file mode 100644
index 0000000000..67fcab43f7
--- /dev/null
+++ b/osu.Game/Graphics/DateTooltip.cs
@@ -0,0 +1,78 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Graphics
+{
+    public class DateTooltip : VisibilityContainer, ITooltip
+    {
+        private readonly OsuSpriteText dateText, timeText;
+        private readonly Box background;
+
+        public DateTooltip()
+        {
+            AutoSizeAxes = Axes.Both;
+            Masking = true;
+            CornerRadius = 5;
+
+            Children = new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Padding = new MarginPadding(10),
+                    Children = new Drawable[]
+                    {
+                        dateText = new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                        },
+                        timeText = new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                        }
+                    }
+                },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = colours.GreySeafoamDarker;
+            timeText.Colour = colours.BlueLighter;
+        }
+
+        protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
+        protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
+
+        public bool SetContent(object content)
+        {
+            if (!(content is DateTimeOffset date))
+                return false;
+
+            dateText.Text = $"{date:d MMMM yyyy} ";
+            timeText.Text = $"{date:HH:mm:ss \"UTC\"z}";
+            return true;
+        }
+
+        public void Move(Vector2 pos) => Position = pos;
+    }
+}
diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs
index 953b7541e1..259d9c8d6e 100644
--- a/osu.Game/Graphics/DrawableDate.cs
+++ b/osu.Game/Graphics/DrawableDate.cs
@@ -4,12 +4,9 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Utils;
-using osuTK;
 
 namespace osu.Game.Graphics
 {
@@ -81,69 +78,5 @@ namespace osu.Game.Graphics
         public ITooltip GetCustomTooltip() => new DateTooltip();
 
         public object TooltipContent => Date;
-
-        public class DateTooltip : VisibilityContainer, ITooltip
-        {
-            private readonly OsuSpriteText dateText, timeText;
-            private readonly Box background;
-
-            public DateTooltip()
-            {
-                AutoSizeAxes = Axes.Both;
-                Masking = true;
-                CornerRadius = 5;
-
-                Children = new Drawable[]
-                {
-                    background = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Padding = new MarginPadding(10),
-                        Children = new Drawable[]
-                        {
-                            dateText = new OsuSpriteText
-                            {
-                                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
-                                Anchor = Anchor.BottomLeft,
-                                Origin = Anchor.BottomLeft,
-                            },
-                            timeText = new OsuSpriteText
-                            {
-                                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
-                                Anchor = Anchor.BottomLeft,
-                                Origin = Anchor.BottomLeft,
-                            }
-                        }
-                    },
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                background.Colour = colours.GreySeafoamDarker;
-                timeText.Colour = colours.BlueLighter;
-            }
-
-            protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
-            protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
-
-            public bool SetContent(object content)
-            {
-                if (!(content is DateTimeOffset date))
-                    return false;
-
-                dateText.Text = $"{date:d MMMM yyyy} ";
-                timeText.Text = $"{date:HH:mm:ss \"UTC\"z}";
-                return true;
-            }
-
-            public void Move(Vector2 pos) => Position = pos;
-        }
     }
 }
diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index c22a3268bf..f9d7378279 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Overlays.News
 
         private class DateContainer : CircularContainer, IHasCustomTooltip
         {
-            public ITooltip GetCustomTooltip() => new DrawableDate.DateTooltip();
+            public ITooltip GetCustomTooltip() => new DateTooltip();
 
             public object TooltipContent => date;
 

From c88a802b05b1ad2f13ad2c559e79af377444f50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 7 Jul 2020 23:04:39 +0200
Subject: [PATCH 03577/10326] Adjust font size to match web design

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

diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index f9d7378279..9c478a7c1d 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Overlays.News
                     new OsuSpriteText
                     {
                         Text = date.ToString("d MMM yyyy").ToUpper(),
-                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
                         Margin = new MarginPadding
                         {
                             Horizontal = 20,

From d98a64dfbc67b0689a9ca8a044b3d9954d232dcb Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 8 Jul 2020 03:26:36 +0200
Subject: [PATCH 03578/10326] Make seeding # bg black and white text color

Makes it consistent with TournamentSpriteTextWithBackground
---
 osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index d48e396b89..eed3cac9f0 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -203,13 +203,14 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                                         new Box
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Colour = TournamentGame.TEXT_COLOUR,
+                                            Colour = TournamentGame.ELEMENT_BACKGROUND_COLOUR,
                                         },
                                         new TournamentSpriteText
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
                                             Text = seeding.ToString("#,0"),
+                                            Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR
                                         },
                                     }
                                 },

From 0684ac90c6180f5debbf5b5aeb6dc9383aaf0166 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Jul 2020 13:36:32 +0900
Subject: [PATCH 03579/10326] Make toolbar opaque

This is the general direction we're going with future designs. Just
applying this now because it makes a lot of screens feel much better
(multiplayer lobby / match, song select etc. where there are elements
adjacent to the bar which cause the transparency to feel a bit awkward).
---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 1b748cb672..ba6e52ec1d 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -28,9 +28,6 @@ namespace osu.Game.Overlays.Toolbar
 
         private const double transition_time = 500;
 
-        private const float alpha_hovering = 0.8f;
-        private const float alpha_normal = 0.6f;
-
         private readonly Bindable<OverlayActivation> overlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
         // Toolbar components like RulesetSelector should receive keyboard input events even when the toolbar is hidden.
@@ -103,7 +100,6 @@ namespace osu.Game.Overlays.Toolbar
 
         public class ToolbarBackground : Container
         {
-            private readonly Box solidBackground;
             private readonly Box gradientBackground;
 
             public ToolbarBackground()
@@ -111,11 +107,10 @@ namespace osu.Game.Overlays.Toolbar
                 RelativeSizeAxes = Axes.Both;
                 Children = new Drawable[]
                 {
-                    solidBackground = new Box
+                    new Box
                     {
                         RelativeSizeAxes = Axes.Both,
                         Colour = OsuColour.Gray(0.1f),
-                        Alpha = alpha_normal,
                     },
                     gradientBackground = new Box
                     {
@@ -131,14 +126,12 @@ namespace osu.Game.Overlays.Toolbar
 
             protected override bool OnHover(HoverEvent e)
             {
-                solidBackground.FadeTo(alpha_hovering, transition_time, Easing.OutQuint);
                 gradientBackground.FadeIn(transition_time, Easing.OutQuint);
                 return true;
             }
 
             protected override void OnHoverLost(HoverLostEvent e)
             {
-                solidBackground.FadeTo(alpha_normal, transition_time, Easing.OutQuint);
                 gradientBackground.FadeOut(transition_time, Easing.OutQuint);
             }
         }

From 35d329220028ed8e1c80760b29e4dfd325dbab4b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Jul 2020 19:23:11 +0900
Subject: [PATCH 03580/10326] Remove nesting of components inside overlined
 component

I think this makes things a bit more readable. The only weird case is
the transfer of details from the component to the `OverlinedHeader`, but
bindables make it not too bad.
---
 .../TestSceneOverlinedParticipants.cs         |   5 +-
 .../Multiplayer/TestSceneOverlinedPlaylist.cs |   4 +-
 .../Multi/Components/OverlinedDisplay.cs      | 131 ------------------
 .../Multi/Components/OverlinedHeader.cs       |  89 ++++++++++++
 .../Multi/Components/OverlinedPlaylist.cs     |  33 -----
 ...Participants.cs => ParticipantsDisplay.cs} |  31 +++--
 .../Screens/Multi/DrawableRoomPlaylist.cs     |   2 -
 .../Multi/Lounge/Components/RoomInspector.cs  |  19 ++-
 .../Match/Components/OverlinedChatDisplay.cs  |  20 ---
 .../Match/Components/OverlinedLeaderboard.cs  |  24 ----
 .../Screens/Multi/Match/MatchSubScreen.cs     |  48 ++++---
 11 files changed, 151 insertions(+), 255 deletions(-)
 delete mode 100644 osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
 create mode 100644 osu.Game/Screens/Multi/Components/OverlinedHeader.cs
 delete mode 100644 osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs
 rename osu.Game/Screens/Multi/Components/{OverlinedParticipants.cs => ParticipantsDisplay.cs} (63%)
 delete mode 100644 osu.Game/Screens/Multi/Match/Components/OverlinedChatDisplay.cs
 delete mode 100644 osu.Game/Screens/Multi/Match/Components/OverlinedLeaderboard.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
index 7ea3bba23f..a13fcdaef8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
@@ -22,12 +22,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("create component", () =>
             {
-                Child = new OverlinedParticipants(Direction.Horizontal)
+                Child = new ParticipantsDisplay(Direction.Horizontal)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Width = 500,
-                    AutoSizeAxes = Axes.Y,
                 };
             });
         }
@@ -37,7 +36,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("create component", () =>
             {
-                Child = new OverlinedParticipants(Direction.Vertical)
+                Child = new ParticipantsDisplay(Direction.Vertical)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
index 14b7934dc7..d3ffb9649e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Multi;
 using osu.Game.Tests.Beatmaps;
 using osuTK;
 
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             }
 
-            Add(new OverlinedPlaylist(false)
+            Add(new DrawableRoomPlaylist(false, false)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
deleted file mode 100644
index 2b589256fa..0000000000
--- a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osuTK;
-
-namespace osu.Game.Screens.Multi.Components
-{
-    public abstract class OverlinedDisplay : MultiplayerComposite
-    {
-        protected readonly Container Content;
-
-        public override Axes RelativeSizeAxes
-        {
-            get => base.RelativeSizeAxes;
-            set
-            {
-                base.RelativeSizeAxes = value;
-                updateDimensions();
-            }
-        }
-
-        public override Axes AutoSizeAxes
-        {
-            get => base.AutoSizeAxes;
-            protected set
-            {
-                base.AutoSizeAxes = value;
-                updateDimensions();
-            }
-        }
-
-        private bool showLine = true;
-
-        public bool ShowLine
-        {
-            get => showLine;
-            set
-            {
-                showLine = value;
-                line.Alpha = value ? 1 : 0;
-            }
-        }
-
-        protected string Details
-        {
-            set => details.Text = value;
-        }
-
-        private readonly Circle line;
-        private readonly OsuSpriteText details;
-        private readonly GridContainer grid;
-
-        protected OverlinedDisplay(string title)
-        {
-            InternalChild = grid = new GridContainer
-            {
-                Content = new[]
-                {
-                    new Drawable[]
-                    {
-                        line = new Circle
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 2,
-                            Margin = new MarginPadding { Bottom = 2 }
-                        },
-                    },
-                    new Drawable[]
-                    {
-                        new FillFlowContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            Margin = new MarginPadding { Top = 5 },
-                            Spacing = new Vector2(10, 0),
-                            Children = new Drawable[]
-                            {
-                                new OsuSpriteText
-                                {
-                                    Text = title,
-                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
-                                },
-                                details = new OsuSpriteText
-                                {
-                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
-                                },
-                            }
-                        },
-                    },
-                    new Drawable[]
-                    {
-                        Content = new Container { Padding = new MarginPadding { Top = 5 } }
-                    }
-                }
-            };
-
-            updateDimensions();
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            line.Colour = colours.Yellow;
-            details.Colour = colours.Yellow;
-        }
-
-        private void updateDimensions()
-        {
-            grid.RowDimensions = new[]
-            {
-                new Dimension(GridSizeMode.AutoSize),
-                new Dimension(GridSizeMode.AutoSize),
-                new Dimension(AutoSizeAxes.HasFlag(Axes.Y) ? GridSizeMode.AutoSize : GridSizeMode.Distributed),
-            };
-
-            // Assigning to none is done so that setting auto and relative size modes doesn't cause exceptions to be thrown
-            grid.AutoSizeAxes = Content.AutoSizeAxes = Axes.None;
-            grid.RelativeSizeAxes = Content.RelativeSizeAxes = Axes.None;
-
-            // Auto-size when required, otherwise eagerly relative-size
-            grid.AutoSizeAxes = Content.AutoSizeAxes = AutoSizeAxes;
-            grid.RelativeSizeAxes = Content.RelativeSizeAxes = ~AutoSizeAxes;
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Components/OverlinedHeader.cs b/osu.Game/Screens/Multi/Components/OverlinedHeader.cs
new file mode 100644
index 0000000000..7ec20c8cae
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/OverlinedHeader.cs
@@ -0,0 +1,89 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    /// <summary>
+    /// A header used in the multiplayer interface which shows text / details beneath a line.
+    /// </summary>
+    public class OverlinedHeader : MultiplayerComposite
+    {
+        private bool showLine = true;
+
+        public bool ShowLine
+        {
+            get => showLine;
+            set
+            {
+                showLine = value;
+                line.Alpha = value ? 1 : 0;
+            }
+        }
+
+        public Bindable<string> Details = new Bindable<string>();
+
+        private readonly Circle line;
+        private readonly OsuSpriteText details;
+
+        public OverlinedHeader(string title)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Margin = new MarginPadding { Bottom = 5 };
+
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    line = new Circle
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 2,
+                        Margin = new MarginPadding { Bottom = 2 }
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Margin = new MarginPadding { Top = 5 },
+                        Spacing = new Vector2(10, 0),
+                        Children = new Drawable[]
+                        {
+                            new OsuSpriteText
+                            {
+                                Text = title,
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
+                            },
+                            details = new OsuSpriteText
+                            {
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
+                            },
+                        }
+                    },
+                }
+            };
+
+            Details.BindValueChanged(val => details.Text = val.NewValue);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            line.Colour = colours.Yellow;
+            details.Colour = colours.Yellow;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs b/osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs
deleted file mode 100644
index 4fe79b40a0..0000000000
--- a/osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer;
-
-namespace osu.Game.Screens.Multi.Components
-{
-    public class OverlinedPlaylist : OverlinedDisplay
-    {
-        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
-
-        private readonly DrawableRoomPlaylist playlist;
-
-        public OverlinedPlaylist(bool allowSelection)
-            : base("Playlist")
-        {
-            Content.Add(playlist = new DrawableRoomPlaylist(false, allowSelection)
-            {
-                RelativeSizeAxes = Axes.Both,
-                SelectedItem = { BindTarget = SelectedItem }
-            });
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            playlist.Items.BindTo(Playlist);
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs b/osu.Game/Screens/Multi/Components/ParticipantsDisplay.cs
similarity index 63%
rename from osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
rename to osu.Game/Screens/Multi/Components/ParticipantsDisplay.cs
index eb1782d147..6ea4283379 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
+++ b/osu.Game/Screens/Multi/Components/ParticipantsDisplay.cs
@@ -2,26 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Multi.Components
 {
-    public class OverlinedParticipants : OverlinedDisplay
+    public class ParticipantsDisplay : MultiplayerComposite
     {
-        public new Axes AutoSizeAxes
-        {
-            get => base.AutoSizeAxes;
-            set => base.AutoSizeAxes = value;
-        }
+        public Bindable<string> Details = new Bindable<string>();
 
-        public OverlinedParticipants(Direction direction)
-            : base("Recent participants")
+        public ParticipantsDisplay(Direction direction)
         {
             OsuScrollContainer scroll;
             ParticipantsList list;
 
-            Content.Add(scroll = new OsuScrollContainer(direction)
+            AddInternal(scroll = new OsuScrollContainer(direction)
             {
                 Child = list = new ParticipantsList()
             });
@@ -29,13 +25,21 @@ namespace osu.Game.Screens.Multi.Components
             switch (direction)
             {
                 case Direction.Horizontal:
+                    AutoSizeAxes = Axes.Y;
+                    RelativeSizeAxes = Axes.X;
+
                     scroll.RelativeSizeAxes = Axes.X;
                     scroll.Height = ParticipantsList.TILE_SIZE + OsuScrollContainer.SCROLL_BAR_HEIGHT + OsuScrollContainer.SCROLL_BAR_PADDING * 2;
-                    list.AutoSizeAxes = Axes.Both;
+
+                    list.RelativeSizeAxes = Axes.Y;
+                    list.AutoSizeAxes = Axes.X;
                     break;
 
                 case Direction.Vertical:
+                    RelativeSizeAxes = Axes.Both;
+
                     scroll.RelativeSizeAxes = Axes.Both;
+
                     list.RelativeSizeAxes = Axes.X;
                     list.AutoSizeAxes = Axes.Y;
                     break;
@@ -46,11 +50,10 @@ namespace osu.Game.Screens.Multi.Components
         private void load()
         {
             ParticipantCount.BindValueChanged(_ => setParticipantCount());
-            MaxParticipants.BindValueChanged(_ => setParticipantCount());
-
-            setParticipantCount();
+            MaxParticipants.BindValueChanged(_ => setParticipantCount(), true);
         }
 
-        private void setParticipantCount() => Details = MaxParticipants.Value != null ? $"{ParticipantCount.Value}/{MaxParticipants.Value}" : ParticipantCount.Value.ToString();
+        private void setParticipantCount() =>
+            Details.Value = MaxParticipants.Value != null ? $"{ParticipantCount.Value}/{MaxParticipants.Value}" : ParticipantCount.Value.ToString();
     }
 }
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
index 9a3fcb1cdc..89c335183b 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
@@ -60,8 +60,6 @@ namespace osu.Game.Screens.Multi
             RequestDeletion = requestDeletion
         };
 
-        private void requestSelection(PlaylistItem item) => SelectedItem.Value = item;
-
         private void requestDeletion(PlaylistItem item)
         {
             if (SelectedItem.Value == item)
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
index 891853dee5..77fbd606f4 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
+            OverlinedHeader participantsHeader;
+
             InternalChildren = new Drawable[]
             {
                 new Box
@@ -55,22 +57,31 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                                             RelativeSizeAxes = Axes.X,
                                             Margin = new MarginPadding { Vertical = 60 },
                                         },
-                                        new OverlinedParticipants(Direction.Horizontal)
+                                        participantsHeader = new OverlinedHeader("Recent Participants"),
+                                        new ParticipantsDisplay(Direction.Vertical)
                                         {
                                             RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y
-                                        },
+                                            Height = ParticipantsList.TILE_SIZE * 3,
+                                            Details = { BindTarget = participantsHeader.Details }
+                                        }
                                     }
                                 }
                             },
+                            new Drawable[] { new OverlinedHeader("Playlist"), },
                             new Drawable[]
                             {
-                                new OverlinedPlaylist(false) { RelativeSizeAxes = Axes.Both },
+                                new DrawableRoomPlaylist(false, false)
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Items = { BindTarget = Playlist }
+                                },
                             },
                         },
                         RowDimensions = new[]
                         {
                             new Dimension(GridSizeMode.AutoSize),
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension(),
                         }
                     }
                 }
diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedChatDisplay.cs b/osu.Game/Screens/Multi/Match/Components/OverlinedChatDisplay.cs
deleted file mode 100644
index a8d898385a..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/OverlinedChatDisplay.cs
+++ /dev/null
@@ -1,20 +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.Screens.Multi.Components;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
-    public class OverlinedChatDisplay : OverlinedDisplay
-    {
-        public OverlinedChatDisplay()
-            : base("Chat")
-        {
-            Content.Add(new MatchChatDisplay
-            {
-                RelativeSizeAxes = Axes.Both
-            });
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/OverlinedLeaderboard.cs
deleted file mode 100644
index bda2cd70d7..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/OverlinedLeaderboard.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.Framework.Graphics;
-using osu.Game.Screens.Multi.Components;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
-    public class OverlinedLeaderboard : OverlinedDisplay
-    {
-        private readonly MatchLeaderboard leaderboard;
-
-        public OverlinedLeaderboard()
-            : base("Leaderboard")
-        {
-            Content.Add(leaderboard = new MatchLeaderboard
-            {
-                RelativeSizeAxes = Axes.Both
-            });
-        }
-
-        public void RefreshScores() => leaderboard.RefreshScores();
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 694315a3b3..dffd6a0331 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -53,9 +53,10 @@ namespace osu.Game.Screens.Multi.Match
         protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
         private MatchSettingsOverlay settingsOverlay;
-        private OverlinedLeaderboard leaderboard;
+        private MatchLeaderboard leaderboard;
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
+        private OverlinedHeader participantsHeader;
 
         public MatchSubScreen(Room room)
         {
@@ -85,11 +86,22 @@ namespace osu.Game.Screens.Multi.Match
                                 Child = new GridContainer
                                 {
                                     RelativeSizeAxes = Axes.Both,
+                                    RowDimensions = new[]
+                                    {
+                                        new Dimension(GridSizeMode.AutoSize),
+                                        new Dimension(GridSizeMode.AutoSize),
+                                        new Dimension(GridSizeMode.AutoSize),
+                                        new Dimension(),
+                                    },
                                     Content = new[]
                                     {
+                                        new Drawable[] { new Components.Header() },
                                         new Drawable[]
                                         {
-                                            new Components.Header()
+                                            participantsHeader = new OverlinedHeader("Participants")
+                                            {
+                                                ShowLine = false
+                                            }
                                         },
                                         new Drawable[]
                                         {
@@ -97,12 +109,10 @@ namespace osu.Game.Screens.Multi.Match
                                             {
                                                 RelativeSizeAxes = Axes.X,
                                                 AutoSizeAxes = Axes.Y,
-                                                Margin = new MarginPadding { Top = 10 },
-                                                Child = new OverlinedParticipants(Direction.Horizontal)
+                                                Margin = new MarginPadding { Top = 5 },
+                                                Child = new ParticipantsDisplay(Direction.Horizontal)
                                                 {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    ShowLine = false
+                                                    Details = { BindTarget = participantsHeader.Details }
                                                 }
                                             }
                                         },
@@ -126,9 +136,10 @@ namespace osu.Game.Screens.Multi.Match
                                                                 {
                                                                     new Drawable[]
                                                                     {
-                                                                        new OverlinedPlaylist(true) // Temporarily always allow selection
+                                                                        new DrawableRoomPlaylist(false, true) // Temporarily always allow selection
                                                                         {
                                                                             RelativeSizeAxes = Axes.Both,
+                                                                            Items = { BindTarget = playlist },
                                                                             SelectedItem = { BindTarget = SelectedItem }
                                                                         }
                                                                     },
@@ -157,18 +168,16 @@ namespace osu.Game.Screens.Multi.Match
                                                             RelativeSizeAxes = Axes.Both,
                                                             Content = new[]
                                                             {
-                                                                new Drawable[]
-                                                                {
-                                                                    leaderboard = new OverlinedLeaderboard { RelativeSizeAxes = Axes.Both },
-                                                                },
-                                                                new Drawable[]
-                                                                {
-                                                                    new OverlinedChatDisplay { RelativeSizeAxes = Axes.Both }
-                                                                }
+                                                                new Drawable[] { new OverlinedHeader("Leaderboard"), },
+                                                                new Drawable[] { leaderboard = new MatchLeaderboard { RelativeSizeAxes = Axes.Both }, },
+                                                                new Drawable[] { new OverlinedHeader("Chat"), },
+                                                                new Drawable[] { new MatchChatDisplay { RelativeSizeAxes = Axes.Both } }
                                                             },
                                                             RowDimensions = new[]
                                                             {
+                                                                new Dimension(GridSizeMode.AutoSize),
                                                                 new Dimension(),
+                                                                new Dimension(GridSizeMode.AutoSize),
                                                                 new Dimension(GridSizeMode.Relative, size: 0.4f, minSize: 240),
                                                             }
                                                         },
@@ -185,12 +194,6 @@ namespace osu.Game.Screens.Multi.Match
                                             }
                                         }
                                     },
-                                    RowDimensions = new[]
-                                    {
-                                        new Dimension(GridSizeMode.AutoSize),
-                                        new Dimension(GridSizeMode.AutoSize),
-                                        new Dimension(),
-                                    }
                                 }
                             }
                         },
@@ -219,6 +222,7 @@ namespace osu.Game.Screens.Multi.Match
         }
 
         [Resolved]
+
         private IAPIProvider api { get; set; }
 
         protected override void LoadComplete()

From 12e3a3c38a70095ab0a4ee50bf669374f9941186 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Jul 2020 15:06:40 +0900
Subject: [PATCH 03581/10326] Adjust toolbar fade in/out on toggle

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index ba6e52ec1d..de08b79f57 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Overlays.Toolbar
         protected override void PopIn()
         {
             this.MoveToY(0, transition_time, Easing.OutQuint);
-            this.FadeIn(transition_time / 2, Easing.OutQuint);
+            this.FadeIn(transition_time / 4, Easing.OutQuint);
         }
 
         protected override void PopOut()
@@ -147,7 +147,7 @@ namespace osu.Game.Overlays.Toolbar
             userButton.StateContainer?.Hide();
 
             this.MoveToY(-DrawSize.Y, transition_time, Easing.OutQuint);
-            this.FadeOut(transition_time);
+            this.FadeOut(transition_time, Easing.InQuint);
         }
     }
 }

From 6c8b6f05f838ffd7a6139b2eeb93d91aabaa2ad8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Jul 2020 15:24:26 +0900
Subject: [PATCH 03582/10326] Fix key bindings switching order at random on
 consecutive "reset to defaults"

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

diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index 74b3134964..198ab6883d 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -55,6 +55,9 @@ namespace osu.Game.Input
                             RulesetID = rulesetId,
                             Variant = variant
                         });
+
+                        // required to ensure stable insert order (https://github.com/dotnet/efcore/issues/11686)
+                        usage.Context.SaveChanges();
                     }
                 }
             }

From e6ec883084899f368847d3367f7000f409844b68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Jul 2020 20:20:50 +0900
Subject: [PATCH 03583/10326] Remove slider tail circle judgement requirements

---
 osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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

From f03303573ef1bd2fe972b670d0f7ea4a9eedfb83 Mon Sep 17 00:00:00 2001
From: BananeVolante <bananevolante67@gmail.com>
Date: Wed, 8 Jul 2020 13:54:22 +0200
Subject: [PATCH 03584/10326] formating

---
 osu.Game/Screens/Play/PauseOverlay.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index a8d291d6c3..7b3fba7ddf 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -3,10 +3,8 @@
 
 using System;
 using System.Linq;
-using NUnit.Framework.Internal;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Audio;
 using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
@@ -55,9 +53,8 @@ namespace osu.Game.Screens.Play
         {
             base.PopOut();
 
-            var transformSeq = pauseLoop.VolumeTo(0.0f, 190, Easing.OutQuad );
+            var transformSeq = pauseLoop.VolumeTo(0.0f, 190, Easing.OutQuad);
             transformSeq.Finally(_ => pauseLoop.Stop());
-
         }
     }
 }

From de4c22c70923b2a9434eadc993eda361bd1c6bd6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 8 Jul 2020 17:58:09 +0300
Subject: [PATCH 03585/10326] Implement news api request

---
 .../Online/API/Requests/GetNewsRequest.cs     | 27 +++++++++++++++++++
 .../Online/API/Requests/GetNewsResponse.cs    | 15 +++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 osu.Game/Online/API/Requests/GetNewsRequest.cs
 create mode 100644 osu.Game/Online/API/Requests/GetNewsResponse.cs

diff --git a/osu.Game/Online/API/Requests/GetNewsRequest.cs b/osu.Game/Online/API/Requests/GetNewsRequest.cs
new file mode 100644
index 0000000000..36d9dc0652
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetNewsRequest.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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.Extensions;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetNewsRequest : APIRequest<GetNewsResponse>
+    {
+        private readonly Cursor cursor;
+
+        public GetNewsRequest(Cursor cursor = null)
+        {
+            this.cursor = cursor;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.AddCursor(cursor);
+            return req;
+        }
+
+        protected override string Target => "news";
+    }
+}
diff --git a/osu.Game/Online/API/Requests/GetNewsResponse.cs b/osu.Game/Online/API/Requests/GetNewsResponse.cs
new file mode 100644
index 0000000000..835289a51d
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetNewsResponse.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 System.Collections.Generic;
+using Newtonsoft.Json;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetNewsResponse : ResponseWithCursor
+    {
+        [JsonProperty("news_posts")]
+        public IEnumerable<APINewsPost> NewsPosts;
+    }
+}

From 49d998c8db2f7a6be17d3fd25898015e5a3920b8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 8 Jul 2020 18:24:13 +0300
Subject: [PATCH 03586/10326] Refactor NewsOverlay to use displays logic

---
 .../Visual/Online/TestSceneNewsOverlay.cs     |  4 +-
 osu.Game/Overlays/DashboardOverlay.cs         |  8 +--
 osu.Game/Overlays/NewsOverlay.cs              | 70 +++++++++++++------
 3 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index d47c972564..0b3ede5d13 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -22,12 +22,12 @@ namespace osu.Game.Tests.Visual.Online
             AddStep(@"Show front page", () => news.ShowFrontPage());
             AddStep(@"Custom article", () => news.Current.Value = "Test Article 101");
 
-            AddStep(@"Article covers", () => news.LoadAndShowContent(new NewsCoverTest()));
+            AddStep(@"Article covers", () => news.LoadDisplay(new NewsCoverTest()));
         }
 
         private class TestNewsOverlay : NewsOverlay
         {
-            public new void LoadAndShowContent(NewsContent content) => base.LoadAndShowContent(content);
+            public void LoadDisplay(NewsContent content) => base.LoadDisplay(content);
         }
 
         private class NewsCoverTest : NewsContent
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index a72c3f4fa5..e3a4b0e152 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Overlays
     {
         private CancellationTokenSource cancellationToken;
 
-        private Box background;
         private Container content;
         private DashboardOverlayHeader header;
         private LoadingLayer loading;
@@ -35,9 +34,10 @@ namespace osu.Game.Overlays
         {
             Children = new Drawable[]
             {
-                background = new Box
+                new Box
                 {
-                    RelativeSizeAxes = Axes.Both
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = ColourProvider.Background5
                 },
                 scrollFlow = new OverlayScrollContainer
                 {
@@ -66,8 +66,6 @@ namespace osu.Game.Overlays
                 },
                 loading = new LoadingLayer(content),
             };
-
-            background.Colour = ColourProvider.Background5;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 46d692d44d..ec25827b5a 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -7,37 +7,40 @@ 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.Overlays.News;
 
 namespace osu.Game.Overlays
 {
     public class NewsOverlay : FullscreenOverlay
     {
-        private NewsHeader header;
-
-        private Container<NewsContent> content;
-
         public readonly Bindable<string> Current = new Bindable<string>(null);
 
+        private Container content;
+        private LoadingLayer loading;
+        private OverlayScrollContainer scrollFlow;
+
         public NewsOverlay()
             : base(OverlayColourScheme.Purple)
         {
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
+            NewsHeader header;
+
             Children = new Drawable[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colours.PurpleDarkAlternative
+                    Colour = ColourProvider.Background5,
                 },
-                new OverlayScrollContainer
+                scrollFlow = new OverlayScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
+                    ScrollbarVisible = false,
                     Child = new FillFlowContainer
                     {
                         RelativeSizeAxes = Axes.X,
@@ -49,7 +52,7 @@ namespace osu.Game.Overlays
                             {
                                 ShowFrontPage = ShowFrontPage
                             },
-                            content = new Container<NewsContent>
+                            content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
@@ -57,25 +60,16 @@ namespace osu.Game.Overlays
                         },
                     },
                 },
+                loading = new LoadingLayer(content),
             };
 
             header.Post.BindTo(Current);
-            Current.TriggerChange();
         }
 
-        private CancellationTokenSource loadContentCancellation;
-
-        protected void LoadAndShowContent(NewsContent newContent)
+        protected override void LoadComplete()
         {
-            content.FadeTo(0.2f, 300, Easing.OutQuint);
-
-            loadContentCancellation?.Cancel();
-
-            LoadComponentAsync(newContent, c =>
-            {
-                content.Child = c;
-                content.FadeIn(300, Easing.OutQuint);
-            }, (loadContentCancellation = new CancellationTokenSource()).Token);
+            base.LoadComplete();
+            Current.BindValueChanged(onCurrentChanged, true);
         }
 
         public void ShowFrontPage()
@@ -83,5 +77,37 @@ namespace osu.Game.Overlays
             Current.Value = null;
             Show();
         }
+
+        private CancellationTokenSource cancellationToken;
+
+        private void onCurrentChanged(ValueChangedEvent<string> current)
+        {
+            cancellationToken?.Cancel();
+            loading.Show();
+
+            if (current.NewValue == null)
+            {
+                LoadDisplay(Empty());
+                return;
+            }
+
+            LoadDisplay(Empty());
+        }
+
+        protected void LoadDisplay(Drawable display)
+        {
+            scrollFlow.ScrollToStart();
+            LoadComponentAsync(display, loaded =>
+            {
+                content.Child = loaded;
+                loading.Hide();
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            cancellationToken?.Cancel();
+            base.Dispose(isDisposing);
+        }
     }
 }

From 0b4213f3307c5c0145c9d2185e575d56833ea8a5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 8 Jul 2020 20:07:29 +0300
Subject: [PATCH 03587/10326] Implement FrontPageDisplay

---
 .../Visual/Online/TestSceneNewsOverlay.cs     |   2 +
 .../News/Displays/FrontpageDisplay.cs         | 133 ++++++++++++++++++
 osu.Game/Overlays/NewsOverlay.cs              |   3 +-
 3 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Overlays/News/Displays/FrontpageDisplay.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index 0b3ede5d13..151b3df68f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Tests.Visual.Online
     {
         private TestNewsOverlay news;
 
+        protected override bool UseOnlineAPI => true;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
new file mode 100644
index 0000000000..611a072047
--- /dev/null
+++ b/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
@@ -0,0 +1,133 @@
+// Copyright (c) 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.Threading;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osuTK;
+
+namespace osu.Game.Overlays.News.Displays
+{
+    public class FrontpageDisplay : CompositeDrawable
+    {
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private readonly FillFlowContainer content;
+        private readonly FrontpageShowMoreButton showMore;
+
+        private GetNewsRequest request;
+        private Cursor lastCursor;
+
+        public FrontpageDisplay()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Padding = new MarginPadding
+            {
+                Top = 20,
+                Bottom = 10,
+                Left = 35,
+                Right = 55
+            };
+
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new Drawable[]
+                {
+                    content = new FillFlowContainer
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 10)
+                    },
+                    showMore = new FrontpageShowMoreButton
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Margin = new MarginPadding
+                        {
+                            Vertical = 15
+                        },
+                        Action = fetchPage,
+                        Alpha = 0
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            fetchPage();
+        }
+
+        private void fetchPage()
+        {
+            request = new GetNewsRequest(lastCursor);
+            request.Success += response => Schedule(() => createContent(response));
+            api.PerformAsync(request);
+        }
+
+        private CancellationTokenSource cancellationToken;
+
+        private void createContent(GetNewsResponse response)
+        {
+            lastCursor = response.Cursor;
+
+            FillFlowContainer<NewsCard> flow;
+
+            flow = new FillFlowContainer<NewsCard>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10)
+            };
+
+            response.NewsPosts.ForEach(p =>
+            {
+                flow.Add(new NewsCard(p));
+            });
+
+            LoadComponentAsync(flow, loaded =>
+            {
+                content.Add(loaded);
+                showMore.IsLoading = false;
+                showMore.Show();
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            request?.Cancel();
+            cancellationToken?.Cancel();
+            base.Dispose(isDisposing);
+        }
+
+        private class FrontpageShowMoreButton : ShowMoreButton
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Height = 20;
+
+                IdleColour = colourProvider.Background3;
+                HoverColour = colourProvider.Background2;
+                ChevronIconColour = colourProvider.Foreground1;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index ec25827b5a..c6c5d132c1 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.News;
+using osu.Game.Overlays.News.Displays;
 
 namespace osu.Game.Overlays
 {
@@ -87,7 +88,7 @@ namespace osu.Game.Overlays
 
             if (current.NewValue == null)
             {
-                LoadDisplay(Empty());
+                LoadDisplay(new FrontpageDisplay());
                 return;
             }
 

From 57b935ec50b42a8c1eb2ebff1b04fd42f65e6a63 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 8 Jul 2020 20:17:15 +0300
Subject: [PATCH 03588/10326] Remove outdated elements

---
 .../Visual/Online/TestSceneNewsOverlay.cs     |  47 +----
 .../News/Displays/FrontpageDisplay.cs         |   4 +-
 osu.Game/Overlays/News/NewsArticleCover.cs    | 174 ------------------
 osu.Game/Overlays/News/NewsContent.cs         |  19 --
 4 files changed, 3 insertions(+), 241 deletions(-)
 delete mode 100644 osu.Game/Overlays/News/NewsArticleCover.cs
 delete mode 100644 osu.Game/Overlays/News/NewsContent.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index 151b3df68f..f0dc309d01 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -1,68 +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;
-using osu.Framework.Graphics;
 using osu.Game.Overlays;
-using osu.Game.Overlays.News;
 
 namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneNewsOverlay : OsuTestScene
     {
-        private TestNewsOverlay news;
+        private NewsOverlay news;
 
         protected override bool UseOnlineAPI => true;
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Add(news = new TestNewsOverlay());
+            Add(news = new NewsOverlay());
             AddStep(@"Show", news.Show);
             AddStep(@"Hide", news.Hide);
 
             AddStep(@"Show front page", () => news.ShowFrontPage());
             AddStep(@"Custom article", () => news.Current.Value = "Test Article 101");
-
-            AddStep(@"Article covers", () => news.LoadDisplay(new NewsCoverTest()));
-        }
-
-        private class TestNewsOverlay : NewsOverlay
-        {
-            public void LoadDisplay(NewsContent content) => base.LoadDisplay(content);
-        }
-
-        private class NewsCoverTest : NewsContent
-        {
-            public NewsCoverTest()
-            {
-                Spacing = new osuTK.Vector2(0, 10);
-
-                var article = new NewsArticleCover.ArticleInfo
-                {
-                    Author = "Ephemeral",
-                    CoverUrl = "https://assets.ppy.sh/artists/58/header.jpg",
-                    Time = new DateTime(2019, 12, 4),
-                    Title = "New Featured Artist: Kurokotei"
-                };
-
-                Children = new Drawable[]
-                {
-                    new NewsArticleCover(article)
-                    {
-                        Height = 200
-                    },
-                    new NewsArticleCover(article)
-                    {
-                        Height = 120
-                    },
-                    new NewsArticleCover(article)
-                    {
-                        RelativeSizeAxes = Axes.None,
-                        Size = new osuTK.Vector2(400, 200),
-                    }
-                };
-            }
         }
     }
 }
diff --git a/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
index 611a072047..270c62d42f 100644
--- a/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
@@ -87,9 +87,7 @@ namespace osu.Game.Overlays.News.Displays
         {
             lastCursor = response.Cursor;
 
-            FillFlowContainer<NewsCard> flow;
-
-            flow = new FillFlowContainer<NewsCard>
+            var flow = new FillFlowContainer<NewsCard>
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
diff --git a/osu.Game/Overlays/News/NewsArticleCover.cs b/osu.Game/Overlays/News/NewsArticleCover.cs
deleted file mode 100644
index e3f5a8cea3..0000000000
--- a/osu.Game/Overlays/News/NewsArticleCover.cs
+++ /dev/null
@@ -1,174 +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.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.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.News
-{
-    public class NewsArticleCover : Container
-    {
-        private const int hover_duration = 300;
-
-        private readonly Box gradient;
-
-        public NewsArticleCover(ArticleInfo info)
-        {
-            RelativeSizeAxes = Axes.X;
-            Masking = true;
-            CornerRadius = 4;
-
-            NewsBackground bg;
-
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = ColourInfo.GradientVertical(OsuColour.Gray(0.2f), OsuColour.Gray(0.1f))
-                },
-                new DelayedLoadWrapper(bg = new NewsBackground(info.CoverUrl)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    FillMode = FillMode.Fill,
-                    Alpha = 0
-                })
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                },
-                gradient = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.1f), Color4.Black.Opacity(0.7f)),
-                    Alpha = 0
-                },
-                new DateContainer(info.Time)
-                {
-                    Margin = new MarginPadding
-                    {
-                        Right = 20,
-                        Top = 20,
-                    }
-                },
-                new OsuSpriteText
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    Margin = new MarginPadding
-                    {
-                        Left = 25,
-                        Bottom = 50,
-                    },
-                    Font = OsuFont.GetFont(Typeface.Torus, 24, FontWeight.Bold),
-                    Text = info.Title,
-                },
-                new OsuSpriteText
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    Margin = new MarginPadding
-                    {
-                        Left = 25,
-                        Bottom = 30,
-                    },
-                    Font = OsuFont.GetFont(Typeface.Torus, 16, FontWeight.Bold),
-                    Text = "by " + info.Author
-                }
-            };
-
-            bg.OnLoadComplete += d => d.FadeIn(250, Easing.In);
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            gradient.FadeIn(hover_duration, Easing.OutQuint);
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            base.OnHoverLost(e);
-            gradient.FadeOut(hover_duration, Easing.OutQuint);
-        }
-
-        [LongRunningLoad]
-        private class NewsBackground : Sprite
-        {
-            private readonly string url;
-
-            public NewsBackground(string coverUrl)
-            {
-                url = coverUrl ?? "Headers/news";
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(LargeTextureStore store)
-            {
-                Texture = store.Get(url);
-            }
-        }
-
-        private class DateContainer : Container, IHasTooltip
-        {
-            private readonly DateTime date;
-
-            public DateContainer(DateTime date)
-            {
-                this.date = date;
-
-                Anchor = Anchor.TopRight;
-                Origin = Anchor.TopRight;
-                Masking = true;
-                CornerRadius = 4;
-                AutoSizeAxes = Axes.Both;
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black.Opacity(0.5f),
-                    },
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Font = OsuFont.GetFont(Typeface.Torus, 12, FontWeight.Bold, false, false),
-                        Text = date.ToString("d MMM yyy").ToUpper(),
-                        Margin = new MarginPadding
-                        {
-                            Vertical = 4,
-                            Horizontal = 8,
-                        }
-                    }
-                };
-            }
-
-            public string TooltipText => date.ToString("dddd dd MMMM yyyy hh:mm:ss UTCz").ToUpper();
-        }
-
-        // fake API data struct to use for now as a skeleton for data, as there is no API struct for news article info for now
-        public class ArticleInfo
-        {
-            public string Title { get; set; }
-            public string CoverUrl { get; set; }
-            public DateTime Time { get; set; }
-            public string Author { get; set; }
-        }
-    }
-}
diff --git a/osu.Game/Overlays/News/NewsContent.cs b/osu.Game/Overlays/News/NewsContent.cs
deleted file mode 100644
index 5ff210f9f5..0000000000
--- a/osu.Game/Overlays/News/NewsContent.cs
+++ /dev/null
@@ -1,19 +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.Containers;
-
-namespace osu.Game.Overlays.News
-{
-    public abstract class NewsContent : FillFlowContainer
-    {
-        protected NewsContent()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            Direction = FillDirection.Vertical;
-            Padding = new MarginPadding { Bottom = 100, Top = 20, Horizontal = 50 };
-        }
-    }
-}

From 37ecab3f2f3cbea1a818941bf4153c58ec087158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 8 Jul 2020 20:44:27 +0200
Subject: [PATCH 03589/10326] Add assertions to make spinner tests fail

---
 .../TestSceneSpinnerRotation.cs               | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index ea006ec607..579c47f585 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Storyboards;
 using static osu.Game.Tests.Visual.OsuTestScene.ClockBackedTestWorkingBeatmap;
 
@@ -36,6 +37,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         private DrawableSpinner drawableSpinner;
+        private SpriteIcon spinnerSymbol => drawableSpinner.ChildrenOfType<SpriteIcon>().Single();
 
         [SetUpSteps]
         public override void SetUpSteps()
@@ -50,23 +52,38 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestSpinnerRewindingRotation()
         {
             addSeekStep(5000);
-            AddAssert("is rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, 0, 100));
+            AddAssert("is disc rotation not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Disc.Rotation, 0, 100));
+            AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, 0, 100));
 
             addSeekStep(0);
-            AddAssert("is rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, 0, 100));
+            AddAssert("is disc rotation almost 0", () => Precision.AlmostEquals(drawableSpinner.Disc.Rotation, 0, 100));
+            AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, 0, 100));
         }
 
         [Test]
         public void TestSpinnerMiddleRewindingRotation()
         {
-            double estimatedRotation = 0;
+            double finalAbsoluteDiscRotation = 0, finalRelativeDiscRotation = 0, finalSpinnerSymbolRotation = 0;
 
             addSeekStep(5000);
-            AddStep("retrieve rotation", () => estimatedRotation = drawableSpinner.Disc.RotationAbsolute);
+            AddStep("retrieve disc relative rotation", () => finalRelativeDiscRotation = drawableSpinner.Disc.Rotation);
+            AddStep("retrieve disc absolute rotation", () => finalAbsoluteDiscRotation = drawableSpinner.Disc.RotationAbsolute);
+            AddStep("retrieve spinner symbol rotation", () => finalSpinnerSymbolRotation = spinnerSymbol.Rotation);
 
             addSeekStep(2500);
+            AddUntilStep("disc rotation rewound",
+                // we want to make sure that the rotation at time 2500 is in the same direction as at time 5000, but about half-way in.
+                () => Precision.AlmostEquals(drawableSpinner.Disc.Rotation, finalRelativeDiscRotation / 2, 100));
+            AddUntilStep("symbol rotation rewound",
+                () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation / 2, 100));
+
             addSeekStep(5000);
-            AddAssert("is rotation absolute almost same", () => Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, estimatedRotation, 100));
+            AddAssert("is disc rotation almost same",
+                () => Precision.AlmostEquals(drawableSpinner.Disc.Rotation, finalRelativeDiscRotation, 100));
+            AddAssert("is symbol rotation almost same",
+                () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation, 100));
+            AddAssert("is disc rotation absolute almost same",
+                () => Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, finalAbsoluteDiscRotation, 100));
         }
 
         [Test]

From 31a1f8b9a75b944c6e52e8089f26feb671c061cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 8 Jul 2020 22:37:45 +0200
Subject: [PATCH 03590/10326] Add coverage for spinning in both directions

---
 .../TestSceneSpinnerRotation.cs               | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 579c47f585..de06570d3c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -15,6 +15,11 @@ using osuTK;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Scoring;
 using osu.Game.Storyboards;
 using static osu.Game.Tests.Visual.OsuTestScene.ClockBackedTestWorkingBeatmap;
 
@@ -86,6 +91,44 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, finalAbsoluteDiscRotation, 100));
         }
 
+        [Test]
+        public void TestRotationDirection([Values(true, false)] bool clockwise)
+        {
+            if (clockwise)
+            {
+                AddStep("flip replay", () =>
+                {
+                    var drawableRuleset = this.ChildrenOfType<DrawableOsuRuleset>().Single();
+                    var score = drawableRuleset.ReplayScore;
+                    var scoreWithFlippedReplay = new Score
+                    {
+                        ScoreInfo = score.ScoreInfo,
+                        Replay = flipReplay(score.Replay)
+                    };
+                    drawableRuleset.SetReplayScore(scoreWithFlippedReplay);
+                });
+            }
+
+            addSeekStep(5000);
+
+            AddAssert("disc spin direction correct", () => clockwise ? drawableSpinner.Disc.Rotation > 0 : drawableSpinner.Disc.Rotation < 0);
+            AddAssert("spinner symbol direction correct", () => clockwise ? spinnerSymbol.Rotation > 0 : spinnerSymbol.Rotation < 0);
+        }
+
+        private Replay flipReplay(Replay scoreReplay) => new Replay
+        {
+            Frames = scoreReplay
+                     .Frames
+                     .Cast<OsuReplayFrame>()
+                     .Select(replayFrame =>
+                     {
+                         var flippedPosition = new Vector2(OsuPlayfield.BASE_SIZE.X - replayFrame.Position.X, replayFrame.Position.Y);
+                         return new OsuReplayFrame(replayFrame.Time, flippedPosition, replayFrame.Actions.ToArray());
+                     })
+                     .Cast<ReplayFrame>()
+                     .ToList()
+        };
+
         [Test]
         public void TestSpinPerMinuteOnRewind()
         {

From 213dfac344f67f776874217bca80f7eaa2479bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 8 Jul 2020 20:56:47 +0200
Subject: [PATCH 03591/10326] Fix broken spinner rotation logic

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 4d37622be5..12034ad333 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             float targetScale = relativeCircleScale + (1 - relativeCircleScale) * Progress;
             Disc.Scale = new Vector2((float)Interpolation.Lerp(Disc.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
 
-            symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, Disc.RotationAbsolute / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
+            symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, Disc.Rotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
         }
 
         protected override void UpdateInitialTransforms()
@@ -207,9 +207,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             circleContainer.ScaleTo(Spinner.Scale * 0.3f);
             circleContainer.ScaleTo(Spinner.Scale, HitObject.TimePreempt / 1.4f, Easing.OutQuint);
 
-            Disc.RotateTo(-720);
-            symbol.RotateTo(-720);
-
             mainContainer
                 .ScaleTo(0)
                 .ScaleTo(Spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, HitObject.TimePreempt - 150, Easing.OutQuint)

From 4cd874280cd853722d5cae76c5a2af16c99b58f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 8 Jul 2020 21:05:41 +0200
Subject: [PATCH 03592/10326] Add clarifying xmldoc for RotationAbsolute

---
 .../Objects/Drawables/Pieces/SpinnerDisc.cs        | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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

From 900f2d309b84f43d151685488b6824bb8c5c40c5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 9 Jul 2020 01:26:56 +0300
Subject: [PATCH 03593/10326] Classes naming adjustments

---
 osu.Game/Overlays/News/Displays/FrontpageDisplay.cs | 10 +++++-----
 osu.Game/Overlays/NewsOverlay.cs                    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
index 270c62d42f..f0b25c8143 100644
--- a/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
@@ -13,18 +13,18 @@ using osuTK;
 
 namespace osu.Game.Overlays.News.Displays
 {
-    public class FrontpageDisplay : CompositeDrawable
+    public class FrontPageDisplay : CompositeDrawable
     {
         [Resolved]
         private IAPIProvider api { get; set; }
 
         private readonly FillFlowContainer content;
-        private readonly FrontpageShowMoreButton showMore;
+        private readonly FrontPageShowMoreButton showMore;
 
         private GetNewsRequest request;
         private Cursor lastCursor;
 
-        public FrontpageDisplay()
+        public FrontPageDisplay()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.News.Displays
                         Direction = FillDirection.Vertical,
                         Spacing = new Vector2(0, 10)
                     },
-                    showMore = new FrontpageShowMoreButton
+                    showMore = new FrontPageShowMoreButton
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
@@ -115,7 +115,7 @@ namespace osu.Game.Overlays.News.Displays
             base.Dispose(isDisposing);
         }
 
-        private class FrontpageShowMoreButton : ShowMoreButton
+        private class FrontPageShowMoreButton : ShowMoreButton
         {
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colourProvider)
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index c6c5d132c1..4cd83f83af 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Overlays
 
             if (current.NewValue == null)
             {
-                LoadDisplay(new FrontpageDisplay());
+                LoadDisplay(new FrontPageDisplay());
                 return;
             }
 

From 62e2bc11983cc46feffb35badfa82deee9740e6d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 9 Jul 2020 01:29:27 +0300
Subject: [PATCH 03594/10326] Fix potential double-request situation

---
 osu.Game/Overlays/News/Displays/FrontpageDisplay.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
index f0b25c8143..73af51c342 100644
--- a/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
@@ -76,6 +76,8 @@ namespace osu.Game.Overlays.News.Displays
 
         private void fetchPage()
         {
+            request?.Cancel();
+
             request = new GetNewsRequest(lastCursor);
             request.Success += response => Schedule(() => createContent(response));
             api.PerformAsync(request);

From dfa22b1e4c48fa297508ed57cc84565899c34cd2 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 9 Jul 2020 02:37:42 +0300
Subject: [PATCH 03595/10326] Styles improvements

---
 .../Visual/Online/TestSceneShowMoreButton.cs  | 20 +++-----
 .../Graphics/UserInterface/ShowMoreButton.cs  | 47 +++++++++++--------
 .../Comments/CommentsShowMoreButton.cs        | 11 -----
 .../News/Displays/FrontpageDisplay.cs         | 26 +++-------
 .../Profile/Sections/PaginatedContainer.cs    |  5 +-
 .../Profile/Sections/ProfileShowMoreButton.cs | 19 --------
 6 files changed, 42 insertions(+), 86 deletions(-)
 delete mode 100644 osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.cs b/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.cs
index 273f593c32..f1c69f0ac3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.cs
@@ -4,19 +4,22 @@
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Allocation;
-using osu.Game.Graphics;
+using osu.Game.Overlays;
 
 namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneShowMoreButton : OsuTestScene
     {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
+
         public TestSceneShowMoreButton()
         {
-            TestButton button = null;
+            ShowMoreButton button = null;
 
             int fireCount = 0;
 
-            Add(button = new TestButton
+            Add(button = new ShowMoreButton
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -46,16 +49,5 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("action fired twice", () => fireCount == 2);
             AddAssert("is in loading state", () => button.IsLoading);
         }
-
-        private class TestButton : ShowMoreButton
-        {
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colors)
-            {
-                IdleColour = colors.YellowDark;
-                HoverColour = colors.Yellow;
-                ChevronIconColour = colors.Red;
-            }
-        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
index c9cd9f1158..db563b346c 100644
--- a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShowMoreButton.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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
 using osuTK;
-using osuTK.Graphics;
 using System.Collections.Generic;
 
 namespace osu.Game.Graphics.UserInterface
@@ -16,14 +17,6 @@ namespace osu.Game.Graphics.UserInterface
     {
         private const int duration = 200;
 
-        private Color4 chevronIconColour;
-
-        protected Color4 ChevronIconColour
-        {
-            get => chevronIconColour;
-            set => chevronIconColour = leftChevron.Colour = rightChevron.Colour = value;
-        }
-
         public string Text
         {
             get => text.Text;
@@ -32,22 +25,26 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override IEnumerable<Drawable> EffectTargets => new[] { background };
 
-        private ChevronIcon leftChevron;
-        private ChevronIcon rightChevron;
         private SpriteText text;
         private Box background;
         private FillFlowContainer textContainer;
 
         public ShowMoreButton()
         {
-            Height = 30;
-            Width = 140;
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            IdleColour = colourProvider.Background2;
+            HoverColour = colourProvider.Background1;
         }
 
         protected override Drawable CreateContent() => new CircularContainer
         {
             Masking = true,
-            RelativeSizeAxes = Axes.Both,
+            AutoSizeAxes = Axes.Both,
             Children = new Drawable[]
             {
                 background = new Box
@@ -56,22 +53,28 @@ namespace osu.Game.Graphics.UserInterface
                 },
                 textContainer = new FillFlowContainer
                 {
+                    AlwaysPresent = true,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(7),
+                    Margin = new MarginPadding
+                    {
+                        Horizontal = 20,
+                        Vertical = 5,
+                    },
                     Children = new Drawable[]
                     {
-                        leftChevron = new ChevronIcon(),
+                        new ChevronIcon(),
                         text = new OsuSpriteText
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                             Text = "show more".ToUpper(),
                         },
-                        rightChevron = new ChevronIcon(),
+                        new ChevronIcon()
                     }
                 }
             }
@@ -83,15 +86,19 @@ namespace osu.Game.Graphics.UserInterface
 
         private class ChevronIcon : SpriteIcon
         {
-            private const int icon_size = 8;
-
             public ChevronIcon()
             {
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
-                Size = new Vector2(icon_size);
+                Size = new Vector2(8);
                 Icon = FontAwesome.Solid.ChevronDown;
             }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Foreground1;
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs b/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
index d2ff7ecb1f..adf64eabb1 100644
--- a/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
+++ b/osu.Game/Overlays/Comments/CommentsShowMoreButton.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.Game.Graphics.UserInterface;
 
@@ -11,16 +10,6 @@ namespace osu.Game.Overlays.Comments
     {
         public readonly BindableInt Current = new BindableInt();
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            Height = 20;
-
-            IdleColour = colourProvider.Background2;
-            HoverColour = colourProvider.Background1;
-            ChevronIconColour = colourProvider.Foreground1;
-        }
-
         protected override void LoadComplete()
         {
             Current.BindValueChanged(onCurrentChanged, true);
diff --git a/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
index 73af51c342..386e0b0dca 100644
--- a/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.News.Displays
         private IAPIProvider api { get; set; }
 
         private readonly FillFlowContainer content;
-        private readonly FrontPageShowMoreButton showMore;
+        private readonly ShowMoreButton showMore;
 
         private GetNewsRequest request;
         private Cursor lastCursor;
@@ -30,10 +30,9 @@ namespace osu.Game.Overlays.News.Displays
             AutoSizeAxes = Axes.Y;
             Padding = new MarginPadding
             {
-                Top = 20,
-                Bottom = 10,
-                Left = 35,
-                Right = 55
+                Vertical = 20,
+                Left = 30,
+                Right = 50
             };
 
             InternalChild = new FillFlowContainer
@@ -53,13 +52,13 @@ namespace osu.Game.Overlays.News.Displays
                         Direction = FillDirection.Vertical,
                         Spacing = new Vector2(0, 10)
                     },
-                    showMore = new FrontPageShowMoreButton
+                    showMore = new ShowMoreButton
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Margin = new MarginPadding
                         {
-                            Vertical = 15
+                            Top = 15
                         },
                         Action = fetchPage,
                         Alpha = 0
@@ -116,18 +115,5 @@ namespace osu.Game.Overlays.News.Displays
             cancellationToken?.Cancel();
             base.Dispose(isDisposing);
         }
-
-        private class FrontPageShowMoreButton : ShowMoreButton
-        {
-            [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider)
-            {
-                Height = 20;
-
-                IdleColour = colourProvider.Background3;
-                HoverColour = colourProvider.Background2;
-                ChevronIconColour = colourProvider.Foreground1;
-            }
-        }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index a30ff786fb..9720469548 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -14,12 +14,13 @@ using osu.Game.Users;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Profile.Sections
 {
     public abstract class PaginatedContainer<TModel> : FillFlowContainer
     {
-        private readonly ProfileShowMoreButton moreButton;
+        private readonly ShowMoreButton moreButton;
         private readonly OsuSpriteText missingText;
         private APIRequest<List<TModel>> retrievalRequest;
         private CancellationTokenSource loadCancellation;
@@ -74,7 +75,7 @@ namespace osu.Game.Overlays.Profile.Sections
                     RelativeSizeAxes = Axes.X,
                     Spacing = new Vector2(0, 2),
                 },
-                moreButton = new ProfileShowMoreButton
+                moreButton = new ShowMoreButton
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs b/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs
deleted file mode 100644
index 426ebeebe6..0000000000
--- a/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs
+++ /dev/null
@@ -1,19 +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.Graphics.UserInterface;
-
-namespace osu.Game.Overlays.Profile.Sections
-{
-    public class ProfileShowMoreButton : ShowMoreButton
-    {
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            IdleColour = colourProvider.Background2;
-            HoverColour = colourProvider.Background1;
-            ChevronIconColour = colourProvider.Foreground1;
-        }
-    }
-}

From 3ba8ec0fd75f73dda2db4d8bb855e7544a7f7aba Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 9 Jul 2020 03:40:14 +0300
Subject: [PATCH 03596/10326] Don't set null value to show front page

---
 .../Visual/Online/TestSceneNewsOverlay.cs     | 16 ++++---
 osu.Game/Overlays/News/NewsHeader.cs          | 46 ++++++++++---------
 osu.Game/Overlays/NewsOverlay.cs              | 26 +++++------
 3 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index f0dc309d01..e35ef4916b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -7,19 +7,21 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneNewsOverlay : OsuTestScene
     {
-        private NewsOverlay news;
-
         protected override bool UseOnlineAPI => true;
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Add(news = new NewsOverlay());
-            AddStep(@"Show", news.Show);
-            AddStep(@"Hide", news.Hide);
 
-            AddStep(@"Show front page", () => news.ShowFrontPage());
-            AddStep(@"Custom article", () => news.Current.Value = "Test Article 101");
+            NewsOverlay news;
+            Add(news = new NewsOverlay());
+
+            AddStep("Show", news.Show);
+            AddStep("Hide", news.Hide);
+
+            AddStep("Show front page", () => news.ShowFrontPage());
+            AddStep("Custom article", () => news.ShowArticle("Test Article 101"));
+            AddStep("Custom article", () => news.ShowArticle("Test Article 102"));
         }
     }
 }
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index 8214c71b3a..ee7991c0c6 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -3,44 +3,46 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using System;
 
 namespace osu.Game.Overlays.News
 {
     public class NewsHeader : BreadcrumbControlOverlayHeader
     {
-        private const string front_page_string = "frontpage";
+        public const string FRONT_PAGE_STRING = "frontpage";
 
-        public readonly Bindable<string> Post = new Bindable<string>(null);
-
-        public Action ShowFrontPage;
+        public readonly Bindable<string> Post = new Bindable<string>(FRONT_PAGE_STRING);
 
         public NewsHeader()
         {
-            TabControl.AddItem(front_page_string);
-
-            Current.ValueChanged += e =>
-            {
-                if (e.NewValue == front_page_string)
-                    ShowFrontPage?.Invoke();
-            };
-
-            Post.ValueChanged += showPost;
+            TabControl.AddItem(FRONT_PAGE_STRING);
+            Current.Value = FRONT_PAGE_STRING;
+            Current.BindValueChanged(onCurrentChanged);
+            Post.BindValueChanged(onPostChanged, true);
         }
 
-        private void showPost(ValueChangedEvent<string> e)
-        {
-            if (e.OldValue != null)
-                TabControl.RemoveItem(e.OldValue);
+        public void SetFrontPage() => Post.Value = FRONT_PAGE_STRING;
 
-            if (e.NewValue != null)
+        public void SetArticle(string slug) => Post.Value = slug;
+
+        private void onCurrentChanged(ValueChangedEvent<string> current)
+        {
+            if (current.NewValue == FRONT_PAGE_STRING)
+                Post.Value = FRONT_PAGE_STRING;
+        }
+
+        private void onPostChanged(ValueChangedEvent<string> post)
+        {
+            if (post.OldValue != FRONT_PAGE_STRING)
+                TabControl.RemoveItem(post.OldValue);
+
+            if (post.NewValue != FRONT_PAGE_STRING)
             {
-                TabControl.AddItem(e.NewValue);
-                Current.Value = e.NewValue;
+                TabControl.AddItem(post.NewValue);
+                Current.Value = post.NewValue;
             }
             else
             {
-                Current.Value = front_page_string;
+                Current.Value = FRONT_PAGE_STRING;
             }
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 4cd83f83af..db989e71bf 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -15,10 +15,9 @@ namespace osu.Game.Overlays
 {
     public class NewsOverlay : FullscreenOverlay
     {
-        public readonly Bindable<string> Current = new Bindable<string>(null);
-
         private Container content;
         private LoadingLayer loading;
+        private NewsHeader header;
         private OverlayScrollContainer scrollFlow;
 
         public NewsOverlay()
@@ -29,8 +28,6 @@ namespace osu.Game.Overlays
         [BackgroundDependencyLoader]
         private void load()
         {
-            NewsHeader header;
-
             Children = new Drawable[]
             {
                 new Box
@@ -49,10 +46,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            header = new NewsHeader
-                            {
-                                ShowFrontPage = ShowFrontPage
-                            },
+                            header = new NewsHeader(),
                             content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,
@@ -63,30 +57,34 @@ namespace osu.Game.Overlays
                 },
                 loading = new LoadingLayer(content),
             };
-
-            header.Post.BindTo(Current);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Current.BindValueChanged(onCurrentChanged, true);
+            header.Post.BindValueChanged(onPostChanged, true);
         }
 
         public void ShowFrontPage()
         {
-            Current.Value = null;
+            header.SetFrontPage();
+            Show();
+        }
+
+        public void ShowArticle(string slug)
+        {
+            header.SetArticle(slug);
             Show();
         }
 
         private CancellationTokenSource cancellationToken;
 
-        private void onCurrentChanged(ValueChangedEvent<string> current)
+        private void onPostChanged(ValueChangedEvent<string> post)
         {
             cancellationToken?.Cancel();
             loading.Show();
 
-            if (current.NewValue == null)
+            if (post.NewValue == NewsHeader.FRONT_PAGE_STRING)
             {
                 LoadDisplay(new FrontPageDisplay());
                 return;

From aeb664aca759e7061a6140b7c51dabc31fa26132 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 9 Jul 2020 04:00:53 +0300
Subject: [PATCH 03597/10326] Delete broken file

---
 .../News/Displays/FrontpageDisplay.cs         | 119 ------------------
 1 file changed, 119 deletions(-)
 delete mode 100644 osu.Game/Overlays/News/Displays/FrontpageDisplay.cs

diff --git a/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
deleted file mode 100644
index 386e0b0dca..0000000000
--- a/osu.Game/Overlays/News/Displays/FrontpageDisplay.cs
+++ /dev/null
@@ -1,119 +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.Threading;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osuTK;
-
-namespace osu.Game.Overlays.News.Displays
-{
-    public class FrontPageDisplay : CompositeDrawable
-    {
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        private readonly FillFlowContainer content;
-        private readonly ShowMoreButton showMore;
-
-        private GetNewsRequest request;
-        private Cursor lastCursor;
-
-        public FrontPageDisplay()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            Padding = new MarginPadding
-            {
-                Vertical = 20,
-                Left = 30,
-                Right = 50
-            };
-
-            InternalChild = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 10),
-                Children = new Drawable[]
-                {
-                    content = new FillFlowContainer
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 10)
-                    },
-                    showMore = new ShowMoreButton
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Margin = new MarginPadding
-                        {
-                            Top = 15
-                        },
-                        Action = fetchPage,
-                        Alpha = 0
-                    }
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            fetchPage();
-        }
-
-        private void fetchPage()
-        {
-            request?.Cancel();
-
-            request = new GetNewsRequest(lastCursor);
-            request.Success += response => Schedule(() => createContent(response));
-            api.PerformAsync(request);
-        }
-
-        private CancellationTokenSource cancellationToken;
-
-        private void createContent(GetNewsResponse response)
-        {
-            lastCursor = response.Cursor;
-
-            var flow = new FillFlowContainer<NewsCard>
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 10)
-            };
-
-            response.NewsPosts.ForEach(p =>
-            {
-                flow.Add(new NewsCard(p));
-            });
-
-            LoadComponentAsync(flow, loaded =>
-            {
-                content.Add(loaded);
-                showMore.IsLoading = false;
-                showMore.Show();
-            }, (cancellationToken = new CancellationTokenSource()).Token);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            request?.Cancel();
-            cancellationToken?.Cancel();
-            base.Dispose(isDisposing);
-        }
-    }
-}

From f663dd18033e9cfc83dbbaa652f862a4e7fb8099 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 9 Jul 2020 04:02:14 +0300
Subject: [PATCH 03598/10326] Fix incorrect file name

---
 .../News/Displays/FrontPageDisplay.cs         | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 osu.Game/Overlays/News/Displays/FrontPageDisplay.cs

diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
new file mode 100644
index 0000000000..67b5edfafd
--- /dev/null
+++ b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
@@ -0,0 +1,115 @@
+// Copyright (c) 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.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osuTK;
+
+namespace osu.Game.Overlays.News.Displays
+{
+    public class FrontPageDisplay : CompositeDrawable
+    {
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private readonly FillFlowContainer content;
+        private readonly ShowMoreButton showMore;
+
+        private GetNewsRequest request;
+        private Cursor lastCursor;
+
+        public FrontPageDisplay()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Padding = new MarginPadding
+            {
+                Vertical = 20,
+                Left = 30,
+                Right = 50
+            };
+
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new Drawable[]
+                {
+                    content = new FillFlowContainer
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 10)
+                    },
+                    showMore = new ShowMoreButton
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Margin = new MarginPadding
+                        {
+                            Top = 15
+                        },
+                        Action = fetchPage,
+                        Alpha = 0
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            fetchPage();
+        }
+
+        private void fetchPage()
+        {
+            request?.Cancel();
+
+            request = new GetNewsRequest(lastCursor);
+            request.Success += response => Schedule(() => createContent(response));
+            api.PerformAsync(request);
+        }
+
+        private CancellationTokenSource cancellationToken;
+
+        private void createContent(GetNewsResponse response)
+        {
+            lastCursor = response.Cursor;
+
+            var flow = new FillFlowContainer<NewsCard>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = response.NewsPosts.Select(p => new NewsCard(p)).ToList()
+            };
+
+            LoadComponentAsync(flow, loaded =>
+            {
+                content.Add(loaded);
+                showMore.IsLoading = false;
+                showMore.Show();
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            request?.Cancel();
+            cancellationToken?.Cancel();
+            base.Dispose(isDisposing);
+        }
+    }
+}

From c10cf2ef496544f9dfcd9c3a0533ae29c81176fa Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 8 Jul 2020 19:01:12 -0700
Subject: [PATCH 03599/10326] Fix multi header title not aligning correctly
 when changing screens

---
 osu.Game/Screens/Multi/Header.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index e27fa154af..653cb3791a 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -95,22 +95,22 @@ namespace osu.Game.Screens.Multi
                         {
                             new OsuSpriteText
                             {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
                                 Font = OsuFont.GetFont(size: 24),
                                 Text = "Multiplayer"
                             },
                             dot = new OsuSpriteText
                             {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
                                 Font = OsuFont.GetFont(size: 24),
                                 Text = "·"
                             },
                             pageTitle = new OsuSpriteText
                             {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
                                 Font = OsuFont.GetFont(size: 24),
                                 Text = "Lounge"
                             }

From efb2c2f4aee0df8952d1efeac6817a49a6d1b391 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 12:01:00 +0900
Subject: [PATCH 03600/10326] Rename variable to be more clear on purpose

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs           | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs   | 8 ++++----
 .../Objects/Drawables/DrawableSpinner.cs                  | 4 ++--
 .../Objects/Drawables/Pieces/SpinnerDisc.cs               | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 65bed071cd..8cb7f3f4b6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 if (auto && !userTriggered && Time.Current > Spinner.StartTime + Spinner.Duration / 2 && Progress < 1)
                 {
                     // force completion only once to not break human interaction
-                    Disc.RotationAbsolute = Spinner.SpinsRequired * 360;
+                    Disc.CumulativeRotation = Spinner.SpinsRequired * 360;
                     auto = false;
                 }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index de06570d3c..6b1394d799 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -58,11 +58,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             addSeekStep(5000);
             AddAssert("is disc rotation not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Disc.Rotation, 0, 100));
-            AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, 0, 100));
+            AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Disc.CumulativeRotation, 0, 100));
 
             addSeekStep(0);
             AddAssert("is disc rotation almost 0", () => Precision.AlmostEquals(drawableSpinner.Disc.Rotation, 0, 100));
-            AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, 0, 100));
+            AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.Disc.CumulativeRotation, 0, 100));
         }
 
         [Test]
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addSeekStep(5000);
             AddStep("retrieve disc relative rotation", () => finalRelativeDiscRotation = drawableSpinner.Disc.Rotation);
-            AddStep("retrieve disc absolute rotation", () => finalAbsoluteDiscRotation = drawableSpinner.Disc.RotationAbsolute);
+            AddStep("retrieve disc absolute rotation", () => finalAbsoluteDiscRotation = drawableSpinner.Disc.CumulativeRotation);
             AddStep("retrieve spinner symbol rotation", () => finalSpinnerSymbolRotation = spinnerSymbol.Rotation);
 
             addSeekStep(2500);
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("is symbol rotation almost same",
                 () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation, 100));
             AddAssert("is disc rotation absolute almost same",
-                () => Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, finalAbsoluteDiscRotation, 100));
+                () => Precision.AlmostEquals(drawableSpinner.Disc.CumulativeRotation, finalAbsoluteDiscRotation, 100));
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 12034ad333..be6766509c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             positionBindable.BindTo(HitObject.PositionBindable);
         }
 
-        public float Progress => Math.Clamp(Disc.RotationAbsolute / 360 / Spinner.SpinsRequired, 0, 1);
+        public float Progress => Math.Clamp(Disc.CumulativeRotation / 360 / Spinner.SpinsRequired, 0, 1);
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
@@ -191,7 +191,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             circle.Rotation = Disc.Rotation;
             Ticks.Rotation = Disc.Rotation;
-            SpmCounter.SetRotation(Disc.RotationAbsolute);
+            SpmCounter.SetRotation(Disc.CumulativeRotation);
 
             float relativeCircleScale = Spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight;
             float targetScale = relativeCircleScale + (1 - relativeCircleScale) * Progress;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 408aba54d7..35819cd05e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         /// If the spinner is spun 360 degrees clockwise and then 360 degrees counter-clockwise,
         /// this property will return the value of 720 (as opposed to 0 for <see cref="Drawable.Rotation"/>).
         /// </example>
-        public float RotationAbsolute;
+        public float CumulativeRotation;
 
         /// <summary>
         /// Whether currently in the correct time range to allow spinning.
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         private float currentRotation;
         private int completeTick;
 
-        private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 360));
+        private bool updateCompleteTick() => completeTick != (completeTick = (int)(CumulativeRotation / 360));
 
         private bool rotationTransferred;
 
@@ -161,7 +161,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
 
             currentRotation += angle;
-            RotationAbsolute += Math.Abs(angle) * Math.Sign(Clock.ElapsedFrameTime);
+            CumulativeRotation += Math.Abs(angle) * Math.Sign(Clock.ElapsedFrameTime);
         }
     }
 }

From efdf179906dc810e04d444cbc028ce1d58591d17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 12:31:20 +0900
Subject: [PATCH 03601/10326] Replace poo icon at disclaimer screen

---
 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 35091028ae..986de1edf0 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Menu
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Icon = FontAwesome.Solid.Poo,
+                    Icon = FontAwesome.Solid.Flask,
                     Size = new Vector2(icon_size),
                     Y = icon_y,
                 },

From bbbe8d6f685215fcce28912f65f81077c128ce70 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 13:47:11 +0900
Subject: [PATCH 03602/10326] Remove group selector for now, tidy up code
 somewhat

---
 .../Graphics/UserInterface/OsuTabControl.cs   |   4 +-
 osu.Game/Screens/Select/FilterControl.cs      | 116 ++++++++----------
 osu.Game/Screens/Select/SongSelect.cs         |   1 -
 3 files changed, 51 insertions(+), 70 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index c2feca171b..61501b0cd8 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Graphics.UserInterface
     {
         private Color4 accentColour;
 
+        public const float HORIZONTAL_SPACING = 10;
+
         public virtual Color4 AccentColour
         {
             get => accentColour;
@@ -54,7 +56,7 @@ namespace osu.Game.Graphics.UserInterface
 
         public OsuTabControl()
         {
-            TabContainer.Spacing = new Vector2(10f, 0f);
+            TabContainer.Spacing = new Vector2(HORIZONTAL_SPACING, 0f);
 
             AddInternal(strip = new Box
             {
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index d613ce649a..a26664325e 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -2,21 +2,20 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
-using osuTK.Graphics;
 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;
-using osu.Game.Screens.Select.Filter;
-using Container = osu.Framework.Graphics.Containers.Container;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Configuration;
-using osu.Game.Rulesets;
 using osu.Framework.Input.Events;
+using osu.Game.Configuration;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Select.Filter;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Select
 {
@@ -26,9 +25,7 @@ namespace osu.Game.Screens.Select
 
         public Action<FilterCriteria> FilterChanged;
 
-        private readonly OsuTabControl<SortMode> sortTabs;
-
-        private readonly TabControl<GroupMode> groupTabs;
+        private OsuTabControl<SortMode> sortTabs;
 
         private Bindable<SortMode> sortMode;
 
@@ -56,19 +53,39 @@ namespace osu.Game.Screens.Select
             return criteria;
         }
 
-        private readonly SeekLimitedSearchTextBox searchTextBox;
+        private SeekLimitedSearchTextBox searchTextBox;
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            base.ReceivePositionalInputAt(screenSpacePos) || groupTabs.ReceivePositionalInputAt(screenSpacePos) || sortTabs.ReceivePositionalInputAt(screenSpacePos);
+            base.ReceivePositionalInputAt(screenSpacePos) || sortTabs.ReceivePositionalInputAt(screenSpacePos);
 
-        public FilterControl()
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load(OsuColour colours, IBindable<RulesetInfo> parentRuleset, OsuConfigManager config)
         {
+            config.BindWith(OsuSetting.ShowConvertedBeatmaps, showConverted);
+            showConverted.ValueChanged += _ => updateCriteria();
+
+            config.BindWith(OsuSetting.DisplayStarsMinimum, minimumStars);
+            minimumStars.ValueChanged += _ => updateCriteria();
+
+            config.BindWith(OsuSetting.DisplayStarsMaximum, maximumStars);
+            maximumStars.ValueChanged += _ => updateCriteria();
+
+            ruleset.BindTo(parentRuleset);
+            ruleset.BindValueChanged(_ => updateCriteria());
+
+            sortMode = config.GetBindable<SortMode>(OsuSetting.SongSelectSortingMode);
+            groupMode = config.GetBindable<GroupMode>(OsuSetting.SongSelectGroupingMode);
+
+            groupMode.BindValueChanged(_ => updateCriteria());
+            sortMode.BindValueChanged(_ => updateCriteria());
+
             Children = new Drawable[]
             {
-                Background = new Box
+                new Box
                 {
                     Colour = Color4.Black,
                     Alpha = 0.8f,
+                    Width = 2,
                     RelativeSizeAxes = Axes.Both,
                 },
                 new Container
@@ -96,33 +113,28 @@ namespace osu.Game.Screens.Select
                             Direction = FillDirection.Horizontal,
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
+                            Spacing = new Vector2(OsuTabControl<SortMode>.HORIZONTAL_SPACING, 0),
                             Children = new Drawable[]
                             {
-                                groupTabs = new OsuTabControl<GroupMode>
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    Height = 24,
-                                    Width = 0.5f,
-                                    AutoSort = true,
-                                },
-                                //spriteText = new OsuSpriteText
-                                //{
-                                //    Font = @"Exo2.0-Bold",
-                                //    Text = "Sort results by",
-                                //    Size = 14,
-                                //    Margin = new MarginPadding
-                                //    {
-                                //        Top = 5,
-                                //        Bottom = 5
-                                //    },
-                                //},
                                 sortTabs = new OsuTabControl<SortMode>
                                 {
                                     RelativeSizeAxes = Axes.X,
                                     Width = 0.5f,
                                     Height = 24,
                                     AutoSort = true,
-                                }
+                                    Anchor = Anchor.BottomRight,
+                                    Origin = Anchor.BottomRight,
+                                    AccentColour = colours.GreenLight,
+                                    Current = { BindTarget = sortMode }
+                                },
+                                new OsuSpriteText
+                                {
+                                    Text = "Sort by",
+                                    Font = OsuFont.GetFont(size: 14),
+                                    Margin = new MarginPadding(5),
+                                    Anchor = Anchor.BottomRight,
+                                    Origin = Anchor.BottomRight,
+                                },
                             }
                         },
                     }
@@ -131,8 +143,7 @@ namespace osu.Game.Screens.Select
 
             searchTextBox.Current.ValueChanged += _ => FilterChanged?.Invoke(CreateCriteria());
 
-            groupTabs.PinItem(GroupMode.All);
-            groupTabs.PinItem(GroupMode.RecentlyPlayed);
+            updateCriteria();
         }
 
         public void Deactivate()
@@ -156,37 +167,6 @@ namespace osu.Game.Screens.Select
         private readonly Bindable<double> minimumStars = new BindableDouble();
         private readonly Bindable<double> maximumStars = new BindableDouble();
 
-        public readonly Box Background;
-
-        [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuColour colours, IBindable<RulesetInfo> parentRuleset, OsuConfigManager config)
-        {
-            sortTabs.AccentColour = colours.GreenLight;
-
-            config.BindWith(OsuSetting.ShowConvertedBeatmaps, showConverted);
-            showConverted.ValueChanged += _ => updateCriteria();
-
-            config.BindWith(OsuSetting.DisplayStarsMinimum, minimumStars);
-            minimumStars.ValueChanged += _ => updateCriteria();
-
-            config.BindWith(OsuSetting.DisplayStarsMaximum, maximumStars);
-            maximumStars.ValueChanged += _ => updateCriteria();
-
-            ruleset.BindTo(parentRuleset);
-            ruleset.BindValueChanged(_ => updateCriteria());
-
-            sortMode = config.GetBindable<SortMode>(OsuSetting.SongSelectSortingMode);
-            groupMode = config.GetBindable<GroupMode>(OsuSetting.SongSelectGroupingMode);
-
-            sortTabs.Current.BindTo(sortMode);
-            groupTabs.Current.BindTo(groupMode);
-
-            groupMode.BindValueChanged(_ => updateCriteria());
-            sortMode.BindValueChanged(_ => updateCriteria());
-
-            updateCriteria();
-        }
-
         private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());
 
         protected override bool OnClick(ClickEvent e) => true;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d613b0ae8d..e3705b15fa 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -173,7 +173,6 @@ namespace osu.Game.Screens.Select
                             RelativeSizeAxes = Axes.X,
                             Height = FilterControl.HEIGHT,
                             FilterChanged = ApplyFilterToCarousel,
-                            Background = { Width = 2 },
                         },
                         new GridContainer // used for max width implementation
                         {

From f231b5925f142d305c62482912502a93668401cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 13:47:23 +0900
Subject: [PATCH 03603/10326] Add "show converted" checkbox to song select for
 convenience

---
 osu.Game/Screens/Select/FilterControl.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index a26664325e..e111ec4b15 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -116,6 +116,13 @@ namespace osu.Game.Screens.Select
                             Spacing = new Vector2(OsuTabControl<SortMode>.HORIZONTAL_SPACING, 0),
                             Children = new Drawable[]
                             {
+                                new OsuTabControlCheckbox
+                                {
+                                    Text = "Show converted",
+                                    Current = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
+                                    Anchor = Anchor.BottomRight,
+                                    Origin = Anchor.BottomRight,
+                                },
                                 sortTabs = new OsuTabControl<SortMode>
                                 {
                                     RelativeSizeAxes = Axes.X,

From 04ce436f6aad199ba7f07a440aaa740b85b64a17 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Jul 2020 14:46:58 +0900
Subject: [PATCH 03604/10326] Dispose beatmap lookup task scheduler

---
 osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index d47d37806e..3106d1143e 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -183,6 +183,7 @@ namespace osu.Game.Beatmaps
             public void Dispose()
             {
                 cacheDownloadRequest?.Dispose();
+                updateScheduler?.Dispose();
             }
 
             [Serializable]

From 3a5784c4102a221440686bc30badcefb4eb3a2d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 15:08:03 +0900
Subject: [PATCH 03605/10326] Ensure directories are deleted before migration
 tests run

---
 .../NonVisual/CustomDataDirectoryTest.cs      | 106 +++++++++++-------
 1 file changed, 66 insertions(+), 40 deletions(-)

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

From 7d59825851258e972bf26a53a70551371b812483 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Jul 2020 15:16:40 +0900
Subject: [PATCH 03606/10326] 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 0563e5319d..ff04c7f120 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.707.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.709.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4e6de77e86..e4753e7ee9 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.707.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.709.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index c31e28638f..91fa003604 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.Framework.iOS" Version="2020.707.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.709.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.707.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.709.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 69062a3ed1100844be3c69cca4091475465700c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 17:43:26 +0900
Subject: [PATCH 03607/10326] Remove unused search container in lounge

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

diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index d4b6a3b79f..9c2ed26b52 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
         public LoungeSubScreen()
         {
-            SearchContainer searchContainer;
+            RoomsContainer roomsContainer;
 
             InternalChildren = new Drawable[]
             {
@@ -55,14 +55,9 @@ namespace osu.Game.Screens.Multi.Lounge
                                     RelativeSizeAxes = Axes.Both,
                                     ScrollbarOverlapsContent = false,
                                     Padding = new MarginPadding(10),
-                                    Child = searchContainer = new SearchContainer
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Child = new RoomsContainer { JoinRequested = joinRequested }
-                                    },
+                                    Child = roomsContainer = new RoomsContainer { JoinRequested = joinRequested }
                                 },
-                                loadingLayer = new LoadingLayer(searchContainer),
+                                loadingLayer = new LoadingLayer(roomsContainer),
                             }
                         },
                         new RoomInspector

From 80f6f87e0169b678ab22ff6ac16e4609820cd5f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 17:28:22 +0900
Subject: [PATCH 03608/10326] Scroll selected room into view on selection

---
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 9c2ed26b52..f512b864a6 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.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.Bindables;
 using osu.Framework.Graphics;
@@ -20,21 +21,23 @@ namespace osu.Game.Screens.Multi.Lounge
     {
         public override string Title => "Lounge";
 
-        protected readonly FilterControl Filter;
+        protected FilterControl Filter;
 
         private readonly Bindable<bool> initialRoomsReceived = new Bindable<bool>();
 
-        private readonly Container content;
-        private readonly LoadingLayer loadingLayer;
+        private Container content;
+        private LoadingLayer loadingLayer;
 
         [Resolved]
         private Bindable<Room> selectedRoom { get; set; }
 
         private bool joiningRoom;
 
-        public LoungeSubScreen()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             RoomsContainer roomsContainer;
+            OsuScrollContainer scrollContainer;
 
             InternalChildren = new Drawable[]
             {
@@ -50,7 +53,7 @@ namespace osu.Game.Screens.Multi.Lounge
                             Width = 0.55f,
                             Children = new Drawable[]
                             {
-                                new OsuScrollContainer
+                                scrollContainer = new OsuScrollContainer
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     ScrollbarOverlapsContent = false,
@@ -70,6 +73,14 @@ namespace osu.Game.Screens.Multi.Lounge
                     },
                 },
             };
+
+            // scroll selected room into view on selection.
+            selectedRoom.BindValueChanged(val =>
+            {
+                var drawable = roomsContainer.Rooms.FirstOrDefault(r => r.Room == val.NewValue);
+                if (drawable != null)
+                    scrollContainer.ScrollIntoView(drawable);
+            });
         }
 
         protected override void LoadComplete()

From 1ded94e5be049a9bd5eaba13bc02dc75131b83d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 18:07:34 +0900
Subject: [PATCH 03609/10326] Add test coverage

---
 .../Multiplayer/RoomManagerTestScene.cs       | 60 ++++++++++++
 .../Visual/Multiplayer/TestRoomManager.cs     | 35 +++++++
 .../TestSceneLoungeRoomsContainer.cs          | 91 ++-----------------
 .../Multiplayer/TestSceneLoungeSubScreen.cs   | 57 ++++++++++++
 4 files changed, 160 insertions(+), 83 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
new file mode 100644
index 0000000000..ef9bdd5f27
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.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 System;
+using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Multi;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class RoomManagerTestScene : MultiplayerTestScene
+    {
+        [Cached(Type = typeof(IRoomManager))]
+        protected TestRoomManager RoomManager { get; } = new TestRoomManager();
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("clear rooms", () => RoomManager.Rooms.Clear());
+        }
+
+        protected void AddRooms(int count, RulesetInfo ruleset = null)
+        {
+            AddStep("add rooms", () =>
+            {
+                for (int i = 0; i < count; i++)
+                {
+                    var room = new Room
+                    {
+                        RoomID = { Value = i },
+                        Name = { Value = $"Room {i}" },
+                        Host = { Value = new User { Username = "Host" } },
+                        EndDate = { Value = DateTimeOffset.Now + TimeSpan.FromSeconds(10) }
+                    };
+
+                    if (ruleset != null)
+                    {
+                        room.Playlist.Add(new PlaylistItem
+                        {
+                            Ruleset = { Value = ruleset },
+                            Beatmap =
+                            {
+                                Value = new BeatmapInfo
+                                {
+                                    Metadata = new BeatmapMetadata()
+                                }
+                            }
+                        });
+                    }
+
+                    RoomManager.Rooms.Add(room);
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
new file mode 100644
index 0000000000..67a53307fc
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
@@ -0,0 +1,35 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Bindables;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestRoomManager : IRoomManager
+    {
+        public event Action RoomsUpdated
+        {
+            add { }
+            remove { }
+        }
+
+        public readonly BindableList<Room> Rooms = new BindableList<Room>();
+
+        public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
+
+        IBindableList<Room> IRoomManager.Rooms => Rooms;
+
+        public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room);
+
+        public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+        {
+        }
+
+        public void PartRoom()
+        {
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index 83f2297bd2..5cf3a9d320 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -1,30 +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;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Users;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneLoungeRoomsContainer : MultiplayerTestScene
+    public class TestSceneLoungeRoomsContainer : RoomManagerTestScene
     {
-        [Cached(Type = typeof(IRoomManager))]
-        private TestRoomManager roomManager = new TestRoomManager();
-
         private RoomsContainer container;
 
         [BackgroundDependencyLoader]
@@ -39,34 +30,27 @@ namespace osu.Game.Tests.Visual.Multiplayer
             };
         }
 
-        public override void SetUpSteps()
-        {
-            base.SetUpSteps();
-
-            AddStep("clear rooms", () => roomManager.Rooms.Clear());
-        }
-
         [Test]
         public void TestBasicListChanges()
         {
-            addRooms(3);
+            AddRooms(3);
 
             AddAssert("has 3 rooms", () => container.Rooms.Count == 3);
-            AddStep("remove first room", () => roomManager.Rooms.Remove(roomManager.Rooms.FirstOrDefault()));
+            AddStep("remove first room", () => RoomManager.Rooms.Remove(RoomManager.Rooms.FirstOrDefault()));
             AddAssert("has 2 rooms", () => container.Rooms.Count == 2);
             AddAssert("first room removed", () => container.Rooms.All(r => r.Room.RoomID.Value != 0));
 
             AddStep("select first room", () => container.Rooms.First().Action?.Invoke());
-            AddAssert("first room selected", () => Room == roomManager.Rooms.First());
+            AddAssert("first room selected", () => Room == RoomManager.Rooms.First());
 
             AddStep("join first room", () => container.Rooms.First().Action?.Invoke());
-            AddAssert("first room joined", () => roomManager.Rooms.First().Status.Value is JoinedRoomStatus);
+            AddAssert("first room joined", () => RoomManager.Rooms.First().Status.Value is JoinedRoomStatus);
         }
 
         [Test]
         public void TestStringFiltering()
         {
-            addRooms(4);
+            AddRooms(4);
 
             AddUntilStep("4 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 4);
 
@@ -82,8 +66,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestRulesetFiltering()
         {
-            addRooms(2, new OsuRuleset().RulesetInfo);
-            addRooms(3, new CatchRuleset().RulesetInfo);
+            AddRooms(2, new OsuRuleset().RulesetInfo);
+            AddRooms(3, new CatchRuleset().RulesetInfo);
 
             AddUntilStep("5 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 5);
 
@@ -96,67 +80,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("3 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 3);
         }
 
-        private void addRooms(int count, RulesetInfo ruleset = null)
-        {
-            AddStep("add rooms", () =>
-            {
-                for (int i = 0; i < count; i++)
-                {
-                    var room = new Room
-                    {
-                        RoomID = { Value = i },
-                        Name = { Value = $"Room {i}" },
-                        Host = { Value = new User { Username = "Host" } },
-                        EndDate = { Value = DateTimeOffset.Now + TimeSpan.FromSeconds(10) }
-                    };
-
-                    if (ruleset != null)
-                    {
-                        room.Playlist.Add(new PlaylistItem
-                        {
-                            Ruleset = { Value = ruleset },
-                            Beatmap =
-                            {
-                                Value = new BeatmapInfo
-                                {
-                                    Metadata = new BeatmapMetadata()
-                                }
-                            }
-                        });
-                    }
-
-                    roomManager.Rooms.Add(room);
-                }
-            });
-        }
-
         private void joinRequested(Room room) => room.Status.Value = new JoinedRoomStatus();
 
-        private class TestRoomManager : IRoomManager
-        {
-            public event Action RoomsUpdated
-            {
-                add { }
-                remove { }
-            }
-
-            public readonly BindableList<Room> Rooms = new BindableList<Room>();
-
-            public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
-
-            IBindableList<Room> IRoomManager.Rooms => Rooms;
-
-            public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room);
-
-            public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-            {
-            }
-
-            public void PartRoom()
-            {
-            }
-        }
-
         private class JoinedRoomStatus : RoomStatus
         {
             public override string Message => "Joined";
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs
new file mode 100644
index 0000000000..475c39c9dc
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Graphics.Containers;
+using osu.Game.Screens.Multi.Lounge;
+using osu.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneLoungeSubScreen : RoomManagerTestScene
+    {
+        private LoungeSubScreen loungeScreen;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new ScreenStack(loungeScreen = new LoungeSubScreen
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Width = 0.5f,
+            });
+        }
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("clear rooms", () => RoomManager.Rooms.Clear());
+        }
+
+        private RoomsContainer roomsContainer => loungeScreen.ChildrenOfType<RoomsContainer>().First();
+
+        [Test]
+        public void TestScrollSelectedIntoView()
+        {
+            AddRooms(30);
+
+            AddUntilStep("first room is not masked", () => checkRoomVisible(roomsContainer.Rooms.First()));
+
+            AddStep("select last room", () => roomsContainer.Rooms.Last().Action?.Invoke());
+
+            AddUntilStep("first room is masked", () => !checkRoomVisible(roomsContainer.Rooms.First()));
+            AddUntilStep("last room is not masked", () => checkRoomVisible(roomsContainer.Rooms.Last()));
+        }
+
+        private bool checkRoomVisible(DrawableRoom room) =>
+            loungeScreen.ChildrenOfType<OsuScrollContainer>().First().ScreenSpaceDrawQuad
+                        .Contains(room.ScreenSpaceDrawQuad.Centre);
+    }
+}

From 95096cbf5ea87d5f8c70a4b8d247abafd803037a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 18:25:07 +0900
Subject: [PATCH 03610/10326] Use better screen load logic

---
 .../Visual/Multiplayer/TestSceneLoungeSubScreen.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs
index 475c39c9dc..c4ec74859b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs
@@ -20,12 +20,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new ScreenStack(loungeScreen = new LoungeSubScreen
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Width = 0.5f,
-            });
         }
 
         public override void SetUpSteps()
@@ -33,6 +27,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             base.SetUpSteps();
 
             AddStep("clear rooms", () => RoomManager.Rooms.Clear());
+            AddStep("push screen", () => LoadScreen(loungeScreen = new LoungeSubScreen
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Width = 0.5f,
+            }));
+
+            AddUntilStep("wait for present", () => loungeScreen.IsCurrentScreen());
         }
 
         private RoomsContainer roomsContainer => loungeScreen.ChildrenOfType<RoomsContainer>().First();

From 601101147eed5802151d7fd9c23aac3b040feec8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 17:15:16 +0900
Subject: [PATCH 03611/10326] Allow keyboard selection of rooms at the
 multiplayer lounge

---
 .../Multi/Lounge/Components/RoomsContainer.cs | 111 ++++++++++++++++--
 1 file changed, 101 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index f14aa5fd8c..e440c2225c 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -9,13 +9,17 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Threading;
+using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
 using osu.Game.Online.Multiplayer;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
-    public class RoomsContainer : CompositeDrawable
+    public class RoomsContainer : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
         public Action<Room> JoinRequested;
 
@@ -88,8 +92,22 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         private void addRooms(IEnumerable<Room> rooms)
         {
-            foreach (var r in rooms)
-                roomFlow.Add(new DrawableRoom(r) { Action = () => selectRoom(r) });
+            foreach (var room in rooms)
+            {
+                roomFlow.Add(new DrawableRoom(room)
+                {
+                    Action = () =>
+                    {
+                        if (room == selectedRoom.Value)
+                        {
+                            JoinRequested?.Invoke(room);
+                            return;
+                        }
+
+                        selectRoom(room);
+                    }
+                });
+            }
 
             Filter(filter?.Value);
         }
@@ -115,16 +133,89 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         private void selectRoom(Room room)
         {
-            var drawable = roomFlow.FirstOrDefault(r => r.Room == room);
-
-            if (drawable != null && drawable.State == SelectionState.Selected)
-                JoinRequested?.Invoke(room);
-            else
-                roomFlow.Children.ForEach(r => r.State = r.Room == room ? SelectionState.Selected : SelectionState.NotSelected);
-
+            roomFlow.Children.ForEach(r => r.State = r.Room == room ? SelectionState.Selected : SelectionState.NotSelected);
             selectedRoom.Value = room;
         }
 
+        #region Key selection logic
+
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.SelectNext:
+                    beginRepeatSelection(() => selectNext(1), action);
+                    return true;
+
+                case GlobalAction.SelectPrevious:
+                    beginRepeatSelection(() => selectNext(-1), action);
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.SelectNext:
+                case GlobalAction.SelectPrevious:
+                    endRepeatSelection(action);
+                    break;
+            }
+        }
+
+        private ScheduledDelegate repeatDelegate;
+        private object lastRepeatSource;
+
+        /// <summary>
+        /// Begin repeating the specified selection action.
+        /// </summary>
+        /// <param name="action">The action to perform.</param>
+        /// <param name="source">The source of the action. Used in conjunction with <see cref="endRepeatSelection"/> to only cancel the correct action (most recently pressed key).</param>
+        private void beginRepeatSelection(Action action, object source)
+        {
+            endRepeatSelection();
+
+            lastRepeatSource = source;
+            repeatDelegate = this.BeginKeyRepeat(Scheduler, action);
+        }
+
+        private void endRepeatSelection(object source = null)
+        {
+            // only the most recent source should be able to cancel the current action.
+            if (source != null && !EqualityComparer<object>.Default.Equals(lastRepeatSource, source))
+                return;
+
+            repeatDelegate?.Cancel();
+            repeatDelegate = null;
+            lastRepeatSource = null;
+        }
+
+        private void selectNext(int direction)
+        {
+            var visibleRooms = Rooms.AsEnumerable().Where(r => r.IsPresent);
+
+            Room room;
+
+            if (selectedRoom.Value == null)
+                room = visibleRooms.FirstOrDefault()?.Room;
+            else
+            {
+                if (direction < 0)
+                    visibleRooms = visibleRooms.Reverse();
+
+                room = visibleRooms.SkipWhile(r => r.Room != selectedRoom.Value).Skip(1).FirstOrDefault()?.Room;
+            }
+
+            // we already have a valid selection only change selection if we still have a room to switch to.
+            if (room != null)
+                selectRoom(room);
+        }
+
+        #endregion
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 115bb408166587431ea98a936298ea1f6e9df5ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 17:33:02 +0900
Subject: [PATCH 03612/10326] Select via select action

---
 .../SearchableList/SearchableListFilterControl.cs |  2 --
 .../Multi/Lounge/Components/RoomsContainer.cs     | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
index d31470e685..de5e558943 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
@@ -136,8 +136,6 @@ namespace osu.Game.Overlays.SearchableList
 
         private class FilterSearchTextBox : SearchTextBox
         {
-            protected override bool AllowCommit => true;
-
             [BackgroundDependencyLoader]
             private void load()
             {
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index e440c2225c..bf153b77df 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                     {
                         if (room == selectedRoom.Value)
                         {
-                            JoinRequested?.Invoke(room);
+                            joinSelected();
                             return;
                         }
 
@@ -137,12 +137,23 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             selectedRoom.Value = room;
         }
 
-        #region Key selection logic
+        private void joinSelected()
+        {
+            if (selectedRoom.Value == null) return;
+
+            JoinRequested?.Invoke(selectedRoom.Value);
+        }
+
+        #region Key selection logic (shared with BeatmapCarousel)
 
         public bool OnPressed(GlobalAction action)
         {
             switch (action)
             {
+                case GlobalAction.Select:
+                    joinSelected();
+                    return true;
+
                 case GlobalAction.SelectNext:
                     beginRepeatSelection(() => selectNext(1), action);
                     return true;

From 25ddc5784ddd79df9ac9abe2379006b64aa07424 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 18:55:10 +0900
Subject: [PATCH 03613/10326] Change multiplayer tests to have null room by
 default

---
 .../Visual/Multiplayer/TestSceneLoungeRoomInfo.cs      |  2 +-
 .../Multiplayer/TestSceneMatchBeatmapDetailArea.cs     |  2 +-
 .../Visual/Multiplayer/TestSceneMatchHeader.cs         |  1 +
 .../Visual/Multiplayer/TestSceneMatchLeaderboard.cs    |  3 ++-
 .../Visual/Multiplayer/TestSceneMatchSongSelect.cs     |  3 ++-
 .../Visual/Multiplayer/TestSceneMatchSubScreen.cs      |  2 +-
 .../Multiplayer/TestSceneOverlinedParticipants.cs      |  8 +++++---
 .../Visual/Multiplayer/TestSceneOverlinedPlaylist.cs   |  2 ++
 .../Visual/Multiplayer/TestSceneParticipantsList.cs    | 10 ++++++++--
 osu.Game/Tests/Visual/MultiplayerTestScene.cs          |  2 +-
 10 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
index 8b74eb5f27..cdad37a9ad 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.CopyFrom(new Room());
+            Room = new Room();
 
             Child = new RoomInfo
             {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 24d9f5ab12..01cd26fbe5 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.Playlist.Clear();
+            Room = new Room();
 
             Child = new MatchBeatmapDetailArea
             {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index 38eb3181bf..e5943105b7 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         public TestSceneMatchHeader()
         {
+            Room = new Room();
             Room.Playlist.Add(new PlaylistItem
             {
                 Beatmap =
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
index 7ba1782a28..c24c6c4ba3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
@@ -6,6 +6,7 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Users;
 using osuTK;
@@ -18,7 +19,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneMatchLeaderboard()
         {
-            Room.RoomID.Value = 3;
+            Room = new Room { RoomID = { Value = 3 } };
 
             Add(new MatchLeaderboard
             {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 5cff2d7d05..c62479faa0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -14,6 +14,7 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi.Components;
@@ -95,7 +96,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.Playlist.Clear();
+            Room = new Room();
         });
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index 66091f5679..2e22317539 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.CopyFrom(new Room());
+            Room = new Room();
         });
 
         [SetUpSteps]
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
index 7ea3bba23f..2b4cac06bd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
@@ -12,10 +13,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
-        public TestSceneOverlinedParticipants()
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
-            Room.RoomID.Value = 7;
-        }
+            Room = new Room { RoomID = { Value = 7 } };
+        });
 
         [Test]
         public void TestHorizontalLayout()
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
index 14b7934dc7..88b2a6a4bc 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneOverlinedPlaylist()
         {
+            Room = new Room { RoomID = { Value = 7 } };
+
             for (int i = 0; i < 10; i++)
             {
                 Room.Playlist.Add(new PlaylistItem
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
index 9c4c45f94a..f71c5fc5d2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -10,10 +12,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Room = new Room { RoomID = { Value = 7 } };
+        });
+
         public TestSceneParticipantsList()
         {
-            Room.RoomID.Value = 7;
-
             Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
         }
     }
diff --git a/osu.Game/Tests/Visual/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/MultiplayerTestScene.cs
index ffb431b4d3..4d073f16f4 100644
--- a/osu.Game/Tests/Visual/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/MultiplayerTestScene.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Tests.Visual
     public abstract class MultiplayerTestScene : ScreenTestScene
     {
         [Cached]
-        private readonly Bindable<Room> currentRoom = new Bindable<Room>(new Room());
+        private readonly Bindable<Room> currentRoom = new Bindable<Room>();
 
         protected Room Room
         {

From 0bc54528018961421a0dc4611791bc9629199ee3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 18:55:18 +0900
Subject: [PATCH 03614/10326] Add test coverage

---
 .../TestSceneLoungeRoomsContainer.cs          | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index 5cf3a9d320..b1f6ee3e3a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -41,12 +42,42 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("first room removed", () => container.Rooms.All(r => r.Room.RoomID.Value != 0));
 
             AddStep("select first room", () => container.Rooms.First().Action?.Invoke());
-            AddAssert("first room selected", () => Room == RoomManager.Rooms.First());
+            AddAssert("first room selected", () => checkRoomSelected(RoomManager.Rooms.First()));
 
             AddStep("join first room", () => container.Rooms.First().Action?.Invoke());
             AddAssert("first room joined", () => RoomManager.Rooms.First().Status.Value is JoinedRoomStatus);
         }
 
+        [Test]
+        public void TestKeyboardNavigation()
+        {
+            AddRooms(3);
+
+            AddAssert("no selection", () => checkRoomSelected(null));
+
+            press(Key.Down);
+            AddAssert("first room selected", () => checkRoomSelected(RoomManager.Rooms.First()));
+
+            press(Key.Up);
+            AddAssert("first room selected", () => checkRoomSelected(RoomManager.Rooms.First()));
+
+            press(Key.Down);
+            press(Key.Down);
+            AddAssert("last room selected", () => checkRoomSelected(RoomManager.Rooms.Last()));
+
+            press(Key.Enter);
+            AddAssert("last room joined", () => RoomManager.Rooms.Last().Status.Value is JoinedRoomStatus);
+        }
+
+        private void press(Key down)
+        {
+            AddStep($"press {down}", () =>
+            {
+                InputManager.PressKey(down);
+                InputManager.ReleaseKey(down);
+            });
+        }
+
         [Test]
         public void TestStringFiltering()
         {
@@ -80,6 +111,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("3 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 3);
         }
 
+        private bool checkRoomSelected(Room room) => Room == room;
+
         private void joinRequested(Room room) => room.Status.Value = new JoinedRoomStatus();
 
         private class JoinedRoomStatus : RoomStatus

From 43624381bf59cb1afcd96149ee626939b9b594d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Jul 2020 18:55:10 +0900
Subject: [PATCH 03615/10326] Change multiplayer tests to have null room by
 default

---
 .../Visual/Multiplayer/TestSceneLoungeRoomInfo.cs      |  2 +-
 .../Multiplayer/TestSceneMatchBeatmapDetailArea.cs     |  2 +-
 .../Visual/Multiplayer/TestSceneMatchHeader.cs         |  1 +
 .../Visual/Multiplayer/TestSceneMatchLeaderboard.cs    |  3 ++-
 .../Visual/Multiplayer/TestSceneMatchSongSelect.cs     |  3 ++-
 .../Visual/Multiplayer/TestSceneMatchSubScreen.cs      |  2 +-
 .../Multiplayer/TestSceneOverlinedParticipants.cs      |  8 +++++---
 .../Visual/Multiplayer/TestSceneOverlinedPlaylist.cs   |  2 ++
 .../Visual/Multiplayer/TestSceneParticipantsList.cs    | 10 ++++++++--
 osu.Game/Tests/Visual/MultiplayerTestScene.cs          |  2 +-
 10 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
index 8b74eb5f27..cdad37a9ad 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.CopyFrom(new Room());
+            Room = new Room();
 
             Child = new RoomInfo
             {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 24d9f5ab12..01cd26fbe5 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.Playlist.Clear();
+            Room = new Room();
 
             Child = new MatchBeatmapDetailArea
             {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index 38eb3181bf..e5943105b7 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         public TestSceneMatchHeader()
         {
+            Room = new Room();
             Room.Playlist.Add(new PlaylistItem
             {
                 Beatmap =
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
index 7ba1782a28..c24c6c4ba3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
@@ -6,6 +6,7 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Users;
 using osuTK;
@@ -18,7 +19,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneMatchLeaderboard()
         {
-            Room.RoomID.Value = 3;
+            Room = new Room { RoomID = { Value = 3 } };
 
             Add(new MatchLeaderboard
             {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 5cff2d7d05..c62479faa0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -14,6 +14,7 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi.Components;
@@ -95,7 +96,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.Playlist.Clear();
+            Room = new Room();
         });
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index 66091f5679..2e22317539 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.CopyFrom(new Room());
+            Room = new Room();
         });
 
         [SetUpSteps]
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
index 7ea3bba23f..2b4cac06bd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
@@ -12,10 +13,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
-        public TestSceneOverlinedParticipants()
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
-            Room.RoomID.Value = 7;
-        }
+            Room = new Room { RoomID = { Value = 7 } };
+        });
 
         [Test]
         public void TestHorizontalLayout()
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
index 14b7934dc7..88b2a6a4bc 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneOverlinedPlaylist()
         {
+            Room = new Room { RoomID = { Value = 7 } };
+
             for (int i = 0; i < 10; i++)
             {
                 Room.Playlist.Add(new PlaylistItem
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
index 9c4c45f94a..f71c5fc5d2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -10,10 +12,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Room = new Room { RoomID = { Value = 7 } };
+        });
+
         public TestSceneParticipantsList()
         {
-            Room.RoomID.Value = 7;
-
             Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
         }
     }
diff --git a/osu.Game/Tests/Visual/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/MultiplayerTestScene.cs
index ffb431b4d3..4d073f16f4 100644
--- a/osu.Game/Tests/Visual/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/MultiplayerTestScene.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Tests.Visual
     public abstract class MultiplayerTestScene : ScreenTestScene
     {
         [Cached]
-        private readonly Bindable<Room> currentRoom = new Bindable<Room>(new Room());
+        private readonly Bindable<Room> currentRoom = new Bindable<Room>();
 
         protected Room Room
         {

From 321815f535b53fce4f4db3749800422d55ef8ba7 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Thu, 9 Jul 2020 14:01:28 -0500
Subject: [PATCH 03616/10326] Add playfield bounds box with toggle and dim
 slider

---
 osu.Game/Configuration/OsuConfigManager.cs    |  7 +++-
 .../Sections/Gameplay/GeneralSettings.cs      | 14 ++++++-
 osu.Game/Rulesets/UI/Playfield.cs             | 41 ++++++++++++++++++-
 .../Play/PlayerSettings/VisualSettings.cs     | 15 ++++++-
 4 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 9d31bc9bba..40a132a8e8 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -99,6 +99,9 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.IncreaseFirstObjectVisibility, true);
 
+            Set(OsuSetting.ShowPlayfieldArea, false);
+            Set(OsuSetting.PlayfieldAreaDimLevel, 0.1, 0, 1, 0.01);
+
             // Update
             Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
 
@@ -227,6 +230,8 @@ namespace osu.Game.Configuration
         IntroSequence,
         UIHoldActivationDelay,
         HitLighting,
-        MenuBackgroundSource
+        MenuBackgroundSource,
+        ShowPlayfieldArea,
+        PlayfieldAreaDimLevel
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 93a02ea0e4..ad02b54dd8 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -76,7 +76,19 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Score display mode",
                     Bindable = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode)
-                }
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Show playfield area",
+                    Bindable = config.GetBindable<bool>(OsuSetting.ShowPlayfieldArea)
+                },
+                new SettingsSlider<double>
+                {
+                    LabelText = "Playfield area dim",
+                    Bindable = config.GetBindable<double>(OsuSetting.PlayfieldAreaDimLevel),
+                    KeyboardStep = 0.01f,
+                    DisplayAsPercentage = true
+                },
             };
         }
     }
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index c52183f3f2..2ec84cca8c 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -12,6 +12,9 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mods;
 using osuTK;
+using osu.Framework.Graphics.Shapes;
+using osuTK.Graphics;
+using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -51,6 +54,10 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public readonly BindableBool DisplayJudgements = new BindableBool(true);
 
+        private Bindable<bool> showPlayfieldArea;
+        private Bindable<double> playfieldAreaDimLevel;
+        private Box playfieldArea;
+
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
         /// </summary>
@@ -65,7 +72,7 @@ namespace osu.Game.Rulesets.UI
         private IReadOnlyList<Mod> mods { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuConfigManager config)
         {
             Cursor = CreateCursor();
 
@@ -76,6 +83,38 @@ namespace osu.Game.Rulesets.UI
 
                 AddInternal(Cursor);
             }
+
+            showPlayfieldArea = config.GetBindable<bool>(OsuSetting.ShowPlayfieldArea);
+            playfieldAreaDimLevel = config.GetBindable<double>(OsuSetting.PlayfieldAreaDimLevel);
+            showPlayfieldArea.ValueChanged += _ => UpdateVisuals();
+            playfieldAreaDimLevel.ValueChanged += _ => UpdateVisuals();
+            UpdateVisuals();
+        }
+        protected virtual void UpdateVisuals()
+        {
+            if(playfieldArea == null)
+            {
+                if (showPlayfieldArea.Value)
+                {
+                    AddInternal(playfieldArea = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.White,
+                        Alpha = (float)playfieldAreaDimLevel.Value,
+                    });
+                }
+            }
+            else
+            {
+                if (showPlayfieldArea.Value)
+                {
+                    playfieldArea.Alpha = (float)playfieldAreaDimLevel.Value;
+                }
+                else
+                {
+                    playfieldArea.Alpha = 0;
+                }
+            }
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
index d6c66d0751..36e7c53132 100644
--- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
@@ -14,9 +14,11 @@ namespace osu.Game.Screens.Play.PlayerSettings
 
         private readonly PlayerSliderBar<double> dimSliderBar;
         private readonly PlayerSliderBar<double> blurSliderBar;
+        private readonly PlayerSliderBar<double> playfieldAreaDimSliderBar;
         private readonly PlayerCheckbox showStoryboardToggle;
         private readonly PlayerCheckbox beatmapSkinsToggle;
         private readonly PlayerCheckbox beatmapHitsoundsToggle;
+        private readonly PlayerCheckbox showPlayfieldAreaToggle;
 
         public VisualSettings()
         {
@@ -39,12 +41,21 @@ namespace osu.Game.Screens.Play.PlayerSettings
                     DisplayAsPercentage = true
                 },
                 new OsuSpriteText
+                {
+                    Text = "Playfieldd area dim:"
+                },
+                playfieldAreaDimSliderBar = new PlayerSliderBar<double>
+                {
+                    DisplayAsPercentage = true
+                },
+                new OsuSpriteText
                 {
                     Text = "Toggles:"
                 },
                 showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboard / Video" },
                 beatmapSkinsToggle = new PlayerCheckbox { LabelText = "Beatmap skins" },
-                beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hitsounds" }
+                beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hitsounds" },
+                showPlayfieldAreaToggle = new PlayerCheckbox { LabelText = "Show playfield area" }
             };
         }
 
@@ -53,9 +64,11 @@ namespace osu.Game.Screens.Play.PlayerSettings
         {
             dimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.DimLevel);
             blurSliderBar.Bindable = config.GetBindable<double>(OsuSetting.BlurLevel);
+            playfieldAreaDimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.PlayfieldAreaDimLevel);
             showStoryboardToggle.Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
             beatmapSkinsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
             beatmapHitsoundsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
+            showPlayfieldAreaToggle.Current = config.GetBindable<bool>(OsuSetting.ShowPlayfieldArea);
         }
     }
 }

From 8121ccaad077e5a93088185ea0f92036af7ca6a1 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Thu, 9 Jul 2020 15:00:26 -0500
Subject: [PATCH 03617/10326] Change Box to EditorPlayfieldBorder

---
 osu.Game/Rulesets/UI/Playfield.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 2ec84cca8c..f6eb74a030 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -12,9 +12,8 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mods;
 using osuTK;
-using osu.Framework.Graphics.Shapes;
-using osuTK.Graphics;
 using osu.Game.Configuration;
+using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -56,7 +55,7 @@ namespace osu.Game.Rulesets.UI
 
         private Bindable<bool> showPlayfieldArea;
         private Bindable<double> playfieldAreaDimLevel;
-        private Box playfieldArea;
+        private EditorPlayfieldBorder playfieldArea;
 
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
@@ -90,16 +89,16 @@ namespace osu.Game.Rulesets.UI
             playfieldAreaDimLevel.ValueChanged += _ => UpdateVisuals();
             UpdateVisuals();
         }
+
         protected virtual void UpdateVisuals()
         {
-            if(playfieldArea == null)
+            if (playfieldArea == null)
             {
                 if (showPlayfieldArea.Value)
                 {
-                    AddInternal(playfieldArea = new Box
+                    AddInternal(playfieldArea = new EditorPlayfieldBorder
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.White,
                         Alpha = (float)playfieldAreaDimLevel.Value,
                     });
                 }

From 4c24388fc0a6ad7d14ffb50142ea5124c76fad4f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Jul 2020 10:16:44 +0900
Subject: [PATCH 03618/10326] Apply review fixes

---
 osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs     | 2 +-
 osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
index ef9bdd5f27..46bc279d5c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
@@ -11,7 +11,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class RoomManagerTestScene : MultiplayerTestScene
+    public abstract class RoomManagerTestScene : MultiplayerTestScene
     {
         [Cached(Type = typeof(IRoomManager))]
         protected TestRoomManager RoomManager { get; } = new TestRoomManager();
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs
index c4ec74859b..68987127d2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs
@@ -26,7 +26,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.SetUpSteps();
 
-            AddStep("clear rooms", () => RoomManager.Rooms.Clear());
             AddStep("push screen", () => LoadScreen(loungeScreen = new LoungeSubScreen
             {
                 Anchor = Anchor.Centre,

From 1bcd673a55437e0c4945ad663b13c5ee1a6dd3d4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Jul 2020 12:07:17 +0900
Subject: [PATCH 03619/10326] Fix crash when switching rooms quickly

---
 osu.Game/Online/Multiplayer/Room.cs | 32 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

From e211ba5e7dc3c4c5c332ca9ec4105d77391dcd7b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 14:43:30 +0900
Subject: [PATCH 03620/10326] Fix cursor scale potentially not being updated if
 set too early

---
 osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs | 10 ++++++----
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs          |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index 28600ef55b..5812e8cf75 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -30,7 +30,9 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         private readonly Drawable cursorTrail;
 
-        public Bindable<float> CursorScale = new BindableFloat(1);
+        public IBindable<float> CursorScale => cursorScale;
+
+        private readonly Bindable<float> cursorScale = new BindableFloat(1);
 
         private Bindable<float> userCursorScale;
         private Bindable<bool> autoCursorScale;
@@ -68,13 +70,13 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
             autoCursorScale.ValueChanged += _ => calculateScale();
 
-            CursorScale.ValueChanged += e =>
+            CursorScale.BindValueChanged(e =>
             {
                 var newScale = new Vector2(e.NewValue);
 
                 ActiveCursor.Scale = newScale;
                 cursorTrail.Scale = newScale;
-            };
+            }, true);
 
             calculateScale();
         }
@@ -95,7 +97,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 scale *= GetScaleForCircleSize(beatmap.BeatmapInfo.BaseDifficulty.CircleSize);
             }
 
-            CursorScale.Value = scale;
+            cursorScale.Value = scale;
 
             var newScale = new Vector2(scale);
 
diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index abba444c73..ec7751d2b4 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.UI
         private OsuClickToResumeCursor clickToResumeCursor;
 
         private OsuCursorContainer localCursorContainer;
-        private Bindable<float> localCursorScale;
+        private IBindable<float> localCursorScale;
 
         public override CursorContainer LocalCursor => State.Value == Visibility.Visible ? localCursorContainer : null;
 

From a21c2422c5ec70285ec8f2235a275de1449109f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 14:44:20 +0900
Subject: [PATCH 03621/10326] Make cursor centre portion non-expanding and more
 visible with outline

---
 osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs | 34 +++++++++-----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
index 4f3d07f208..ef05514146 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
@@ -115,24 +115,22 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                                     },
                                 },
                             },
-                            new CircularContainer
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Both,
-                                Scale = new Vector2(0.1f),
-                                Masking = true,
-                                Children = new Drawable[]
-                                {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = Color4.White,
-                                    },
-                                },
-                            },
-                        }
-                    }
+                        },
+                    },
+                    new Circle
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Scale = new Vector2(0.14f),
+                        Colour = new Color4(34, 93, 204, 255),
+                        EdgeEffect = new EdgeEffectParameters
+                        {
+                            Type = EdgeEffectType.Glow,
+                            Radius = 8,
+                            Colour = Color4.White,
+                        },
+                    },
                 };
             }
         }

From c562435267a6fcd2a650380b1a54f92356fe9015 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 14:44:30 +0900
Subject: [PATCH 03622/10326] Adjust cursor transforms for better feel

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

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
index ef05514146..eea45c6c80 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
@@ -59,10 +59,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         {
             if (!cursorExpand) return;
 
-            expandTarget.ScaleTo(released_scale).ScaleTo(pressed_scale, 100, Easing.OutQuad);
+            expandTarget.ScaleTo(released_scale).ScaleTo(pressed_scale, 400, Easing.OutElasticHalf);
         }
 
-        public void Contract() => expandTarget.ScaleTo(released_scale, 100, Easing.OutQuad);
+        public void Contract() => expandTarget.ScaleTo(released_scale, 400, Easing.OutQuad);
 
         private class DefaultCursor : OsuCursorSprite
         {

From 13618915b7ff9ab4eb52bc3f0efd203a2450722f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 14:46:49 +0900
Subject: [PATCH 03623/10326] Don't show cursor guide in gameplay cursor test

---
 osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index 38c2bb9b95..16eedad465 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -87,6 +87,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             public MovingCursorInputManager()
             {
                 UseParentInput = false;
+                ShowVisualCursorGuide = false;
             }
 
             protected override void Update()

From fee19753e12c27e5ea429c276f015159d5f1fe6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 14:47:11 +0900
Subject: [PATCH 03624/10326] Fix animations not playing correctly in test
 scene due to too many calls to OnPressed

---
 .../TestSceneGameplayCursor.cs                | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index 16eedad465..dcac3367db 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -69,16 +69,27 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private class ClickingCursorContainer : OsuCursorContainer
         {
+            private bool pressed;
+
+            public bool Pressed
+            {
+                set
+                {
+                    if (value == pressed)
+                        return;
+
+                    pressed = value;
+                    if (value)
+                        OnPressed(OsuAction.LeftButton);
+                    else
+                        OnReleased(OsuAction.LeftButton);
+                }
+            }
+
             protected override void Update()
             {
                 base.Update();
-
-                double currentTime = Time.Current;
-
-                if (((int)(currentTime / 1000)) % 2 == 0)
-                    OnPressed(OsuAction.LeftButton);
-                else
-                    OnReleased(OsuAction.LeftButton);
+                Pressed = ((int)(Time.Current / 1000)) % 2 == 0;
             }
         }
 

From b68a2d885c4a5ad5b7f21c886b8b146c0cceecae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 14:47:26 +0900
Subject: [PATCH 03625/10326] Add testability against different background
 colours / with user input

---
 .../TestSceneGameplayCursor.cs                | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index dcac3367db..461779b185 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -5,7 +5,9 @@ using System;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing.Input;
+using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Screens.Play;
@@ -24,9 +26,34 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Resolved]
         private OsuConfigManager config { get; set; }
 
+        private Drawable background;
+
         public TestSceneGameplayCursor()
         {
             gameplayBeatmap = new GameplayBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
+
+            AddStep("change background colour", () =>
+            {
+                background?.Expire();
+
+                Add(background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = float.MaxValue,
+                    Colour = new Colour4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1)
+                });
+            });
+
+            AddSliderStep("circle size", 0f, 10f, 0f, val =>
+            {
+                config.Set(OsuSetting.AutoCursorSize, true);
+                gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = val;
+                Scheduler.AddOnce(recreate);
+            });
+
+            AddStep("test cursor container", recreate);
+
+            void recreate() => SetContents(() => new OsuInputManager(new OsuRuleset().RulesetInfo) { Child = new OsuCursorContainer() });
         }
 
         [TestCase(1, 1)]

From bd5957bc0a9eabd0843b2e1d201c126ca44e1d3f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 14:49:44 +0900
Subject: [PATCH 03626/10326] Add dynamic compilation exclusion rules for
 ruleset types

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 2 ++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 2 ++
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 2 ++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index ca75a816f1..9437023c70 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -21,11 +21,13 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using System;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Catch.Skinning;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch
 {
+    [ExcludeFromDynamicCompile]
     public class CatchRuleset : Ruleset, ILegacyRuleset
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableCatchRuleset(this, beatmap, mods);
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index a27485dd06..68dce8b139 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -12,6 +12,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Replays.Types;
@@ -34,6 +35,7 @@ using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets.Mania
 {
+    [ExcludeFromDynamicCompile]
     public class ManiaRuleset : Ruleset, ILegacyRuleset
     {
         /// <summary>
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index e488ba65c8..eaa5d8937a 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -30,12 +30,14 @@ using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
 using System.Linq;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets.Osu
 {
+    [ExcludeFromDynamicCompile]
     public class OsuRuleset : Ruleset, ILegacyRuleset
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableOsuRuleset(this, beatmap, mods);
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 156905fa9c..2011842591 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Scoring;
 using System;
 using System.Linq;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Taiko.Edit;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -31,6 +32,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko
 {
+    [ExcludeFromDynamicCompile]
     public class TaikoRuleset : Ruleset, ILegacyRuleset
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableTaikoRuleset(this, beatmap, mods);

From a9faa11dcbfcd885abedf03a33ec621d7dc435b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Jul 2020 15:37:08 +0900
Subject: [PATCH 03627/10326] Add back playlist header

---
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index dffd6a0331..1233581575 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -134,6 +134,7 @@ namespace osu.Game.Screens.Multi.Match
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 Content = new[]
                                                                 {
+                                                                    new Drawable[] { new OverlinedHeader("Playlist"), },
                                                                     new Drawable[]
                                                                     {
                                                                         new DrawableRoomPlaylist(false, true) // Temporarily always allow selection
@@ -156,6 +157,7 @@ namespace osu.Game.Screens.Multi.Match
                                                                 },
                                                                 RowDimensions = new[]
                                                                 {
+                                                                    new Dimension(GridSizeMode.AutoSize),
                                                                     new Dimension(),
                                                                     new Dimension(GridSizeMode.Absolute, 5),
                                                                     new Dimension(GridSizeMode.AutoSize)

From 2ed8d42d222b45f53f029ac0c4d93d06a0a71916 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Jul 2020 15:37:13 +0900
Subject: [PATCH 03628/10326] Remove whitespace

---
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 1233581575..40a8427701 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -224,7 +224,6 @@ namespace osu.Game.Screens.Multi.Match
         }
 
         [Resolved]
-
         private IAPIProvider api { get; set; }
 
         protected override void LoadComplete()

From bc6f2199f3deb2c50fd0732aadd59e7111617e09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 16:49:11 +0900
Subject: [PATCH 03629/10326] 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 ff04c7f120..0881861bdc 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.709.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.710.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e4753e7ee9..cba2d62bf5 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.709.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.710.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 91fa003604..45e0da36c1 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.Framework.iOS" Version="2020.709.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.710.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.709.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.710.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 632f333ce2361af1e9b9cdb3c41ebfbe381b2656 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 16:33:20 +0900
Subject: [PATCH 03630/10326] Add ability to return protected beatmaps in
 GetAllUsable call

---
 osu.Game/Beatmaps/BeatmapManager.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

From 49b88971d1ef7e05887296003566a86216b0a901 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 16:33:31 +0900
Subject: [PATCH 03631/10326] Display all usable beatmaps in playlist,
 including protected

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

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 92cf490be2..63e828a782 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
@@ -71,7 +72,7 @@ namespace osu.Game.Overlays
             managerRemoved = beatmaps.ItemRemoved.GetBoundCopy();
             managerRemoved.BindValueChanged(beatmapRemoved);
 
-            beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets(IncludedDetails.Minimal).OrderBy(_ => RNG.Next()));
+            beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets(IncludedDetails.Minimal, true).OrderBy(_ => RNG.Next()));
         }
 
         protected override void LoadComplete()
@@ -135,6 +136,7 @@ namespace osu.Game.Overlays
 
         /// <summary>
         /// Start playing the current track (if not already playing).
+        /// Will select the next valid track if the current track is null or <see cref="TrackVirtual"/>.
         /// </summary>
         /// <returns>Whether the operation was successful.</returns>
         public bool Play(bool restart = false)
@@ -143,12 +145,12 @@ namespace osu.Game.Overlays
 
             IsUserPaused = false;
 
-            if (track == null)
+            if (track == null || track is TrackVirtual)
             {
                 if (beatmap.Disabled)
                     return false;
 
-                next(true);
+                next();
                 return true;
             }
 
@@ -228,10 +230,9 @@ namespace osu.Game.Overlays
         /// </summary>
         public void NextTrack() => Schedule(() => next());
 
-        private bool next(bool instant = false)
+        private bool next()
         {
-            if (!instant)
-                queuedDirection = TrackChangeDirection.Next;
+            queuedDirection = TrackChangeDirection.Next;
 
             var playable = BeatmapSets.SkipWhile(i => i.ID != current.BeatmapSetInfo.ID).ElementAtOrDefault(1) ?? BeatmapSets.FirstOrDefault();
 

From 44fdb5b82e040e1a129257f177f51e35ee8ff1a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 16:33:45 +0900
Subject: [PATCH 03632/10326] Ensure music starts when returning to lounge or
 main menu

---
 osu.Game/Screens/Menu/MainMenu.cs                | 4 ++--
 osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 76950982e6..41e2564141 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -260,8 +260,8 @@ namespace osu.Game.Screens.Menu
             // we may have consumed our preloaded instance, so let's make another.
             preloadSongSelect();
 
-            if (Beatmap.Value.Track != null && music?.IsUserPaused != true)
-                Beatmap.Value.Track.Start();
+            if (music?.IsUserPaused == false)
+                music.Play();
         }
 
         public override bool OnExiting(IScreen next)
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index f512b864a6..e2ffb21153 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -11,6 +11,7 @@ using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Overlays;
 using osu.Game.Overlays.SearchableList;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
@@ -31,6 +32,9 @@ namespace osu.Game.Screens.Multi.Lounge
         [Resolved]
         private Bindable<Room> selectedRoom { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private MusicController music { get; set; }
+
         private bool joiningRoom;
 
         [BackgroundDependencyLoader]
@@ -122,6 +126,9 @@ namespace osu.Game.Screens.Multi.Lounge
             if (selectedRoom.Value?.RoomID.Value == null)
                 selectedRoom.Value = new Room();
 
+            if (music?.IsUserPaused == false)
+                music.Play();
+
             onReturning();
         }
 

From d0c2a1b9d30a1f3b37b59d59f7a02d9caf1e3693 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Jul 2020 17:25:07 +0900
Subject: [PATCH 03633/10326] Move dropdown out of display style selector

---
 .../SearchableList/DisplayStyleControl.cs     | 38 ++++---------------
 .../SearchableListFilterControl.cs            | 32 ++++++++++++----
 osu.Game/Overlays/SocialOverlay.cs            |  4 +-
 3 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs b/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
index 5ecb477a2f..ffbc1c9586 100644
--- a/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
+++ b/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Bindables;
 using osuTK;
 using osu.Framework.Graphics;
@@ -11,44 +10,23 @@ using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.SearchableList
 {
-    public class DisplayStyleControl<T> : Container
-        where T : struct, Enum
+    public class DisplayStyleControl : CompositeDrawable
     {
-        public readonly SlimEnumDropdown<T> Dropdown;
         public readonly Bindable<PanelDisplayStyle> DisplayStyle = new Bindable<PanelDisplayStyle>();
 
         public DisplayStyleControl()
         {
             AutoSizeAxes = Axes.Both;
 
-            Children = new[]
+            InternalChild = new FillFlowContainer
             {
-                new FillFlowContainer
+                AutoSizeAxes = Axes.Both,
+                Spacing = new Vector2(5f, 0f),
+                Direction = FillDirection.Horizontal,
+                Children = new[]
                 {
-                    AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    Spacing = new Vector2(10f, 0f),
-                    Direction = FillDirection.Horizontal,
-                    Children = new Drawable[]
-                    {
-                        new FillFlowContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Spacing = new Vector2(5f, 0f),
-                            Direction = FillDirection.Horizontal,
-                            Children = new[]
-                            {
-                                new DisplayStyleToggleButton(FontAwesome.Solid.ThLarge, PanelDisplayStyle.Grid, DisplayStyle),
-                                new DisplayStyleToggleButton(FontAwesome.Solid.ListUl, PanelDisplayStyle.List, DisplayStyle),
-                            },
-                        },
-                        Dropdown = new SlimEnumDropdown<T>
-                        {
-                            RelativeSizeAxes = Axes.None,
-                            Width = 160f,
-                        },
-                    },
+                    new DisplayStyleToggleButton(FontAwesome.Solid.ThLarge, PanelDisplayStyle.Grid, DisplayStyle),
+                    new DisplayStyleToggleButton(FontAwesome.Solid.ListUl, PanelDisplayStyle.List, DisplayStyle),
                 },
             };
 
diff --git a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
index de5e558943..3d0ff373b7 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
@@ -19,12 +19,14 @@ namespace osu.Game.Overlays.SearchableList
     {
         private const float padding = 10;
 
-        private readonly Container filterContainer;
+        private readonly Drawable filterContainer;
+        private readonly Drawable rightFilterContainer;
         private readonly Box tabStrip;
 
         public readonly SearchTextBox Search;
         public readonly PageTabControl<TTab> Tabs;
-        public readonly DisplayStyleControl<TCategory> DisplayStyleControl;
+        public readonly SlimEnumDropdown<TCategory> Dropdown;
+        public readonly DisplayStyleControl DisplayStyleControl;
 
         protected abstract Color4 BackgroundColour { get; }
         protected abstract TTab DefaultTab { get; }
@@ -42,7 +44,7 @@ namespace osu.Game.Overlays.SearchableList
 
             var controls = CreateSupplementaryControls();
             Container controlsContainer;
-            Children = new Drawable[]
+            Children = new[]
             {
                 filterContainer = new Container
                 {
@@ -104,11 +106,27 @@ namespace osu.Game.Overlays.SearchableList
                         },
                     },
                 },
-                DisplayStyleControl = new DisplayStyleControl<TCategory>
+                rightFilterContainer = new FillFlowContainer
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                },
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        Dropdown = new SlimEnumDropdown<TCategory>
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            RelativeSizeAxes = Axes.None,
+                            Width = 160f,
+                        },
+                        DisplayStyleControl = new DisplayStyleControl
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                        },
+                    }
+                }
             };
 
             if (controls != null) controlsContainer.Children = new[] { controls };
@@ -116,8 +134,8 @@ namespace osu.Game.Overlays.SearchableList
             Tabs.Current.Value = DefaultTab;
             Tabs.Current.TriggerChange();
 
-            DisplayStyleControl.Dropdown.Current.Value = DefaultCategory;
-            DisplayStyleControl.Dropdown.Current.TriggerChange();
+            Dropdown.Current.Value = DefaultCategory;
+            Dropdown.Current.TriggerChange();
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index 9548573b4f..1b05142192 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Overlays
             Filter.Tabs.Current.ValueChanged += _ => onFilterUpdate();
 
             Filter.DisplayStyleControl.DisplayStyle.ValueChanged += _ => recreatePanels();
-            Filter.DisplayStyleControl.Dropdown.Current.ValueChanged += _ => recreatePanels();
+            Filter.Dropdown.Current.ValueChanged += _ => recreatePanels();
 
             currentQuery.BindTo(Filter.Search.Current);
             currentQuery.ValueChanged += query =>
@@ -155,7 +155,7 @@ namespace osu.Game.Overlays
                     break;
             }
 
-            if (Filter.DisplayStyleControl.Dropdown.Current.Value == SortDirection.Descending)
+            if (Filter.Dropdown.Current.Value == SortDirection.Descending)
                 sortedUsers = sortedUsers.Reverse();
 
             var newPanels = new FillFlowContainer<UserPanel>

From ed926de77ffe739c2ea3fa07edd39ab1daba5ad3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Jul 2020 17:25:28 +0900
Subject: [PATCH 03634/10326] Fix up/improve dropdown styling/positioning

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

diff --git a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
index 3d0ff373b7..e0163b5b0c 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Overlays.SearchableList
             base.Update();
 
             Height = filterContainer.Height;
-            DisplayStyleControl.Margin = new MarginPadding { Top = filterContainer.Height - 35, Right = SearchableListOverlay.WIDTH_PADDING };
+            rightFilterContainer.Margin = new MarginPadding { Top = filterContainer.Height - 30, Right = ContentHorizontalPadding };
         }
 
         private class FilterSearchTextBox : SearchTextBox

From 926279e39be2d81a6906d13fbeca6f45dfabdb6b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Jul 2020 17:26:42 +0900
Subject: [PATCH 03635/10326] Implement category dropdown for multiplayer

---
 .../TestSceneLoungeFilterControl.cs           | 20 +++++++
 .../Online/API/Requests/GetRoomsRequest.cs    | 54 ++++++++++---------
 .../Multi/Lounge/Components/FilterControl.cs  | 19 +++----
 .../Multi/Lounge/Components/FilterCriteria.cs |  4 +-
 .../Multi/Lounge/Components/RoomsContainer.cs |  8 ---
 osu.Game/Screens/Multi/RoomManager.cs         |  2 +-
 6 files changed, 63 insertions(+), 44 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeFilterControl.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeFilterControl.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeFilterControl.cs
new file mode 100644
index 0000000000..7c0c2797f5
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeFilterControl.cs
@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneLoungeFilterControl : OsuTestScene
+    {
+        public TestSceneLoungeFilterControl()
+        {
+            Child = new FilterControl
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            };
+        }
+    }
+}
diff --git a/osu.Game/Online/API/Requests/GetRoomsRequest.cs b/osu.Game/Online/API/Requests/GetRoomsRequest.cs
index 8f1497ef33..4b90b04b51 100644
--- a/osu.Game/Online/API/Requests/GetRoomsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetRoomsRequest.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.IO.Network;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Lounge.Components;
 
@@ -9,39 +10,44 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetRoomsRequest : APIRequest<List<Room>>
     {
-        private readonly PrimaryFilter primaryFilter;
+        private readonly RoomStatusFilter statusFilter;
+        private readonly RoomCategoryFilter categoryFilter;
 
-        public GetRoomsRequest(PrimaryFilter primaryFilter)
+        public GetRoomsRequest(RoomStatusFilter statusFilter, RoomCategoryFilter categoryFilter)
         {
-            this.primaryFilter = primaryFilter;
+            this.statusFilter = statusFilter;
+            this.categoryFilter = categoryFilter;
         }
 
-        protected override string Target
+        protected override WebRequest CreateWebRequest()
         {
-            get
+            var req = base.CreateWebRequest();
+
+            switch (statusFilter)
             {
-                string target = "rooms";
+                case RoomStatusFilter.Owned:
+                    req.AddParameter("mode", "owned");
+                    break;
 
-                switch (primaryFilter)
-                {
-                    case PrimaryFilter.Open:
-                        break;
+                case RoomStatusFilter.Participated:
+                    req.AddParameter("mode", "participated");
+                    break;
 
-                    case PrimaryFilter.Owned:
-                        target += "/owned";
-                        break;
-
-                    case PrimaryFilter.Participated:
-                        target += "/participated";
-                        break;
-
-                    case PrimaryFilter.RecentlyEnded:
-                        target += "/ended";
-                        break;
-                }
-
-                return target;
+                case RoomStatusFilter.RecentlyEnded:
+                    req.AddParameter("mode", "ended");
+                    break;
             }
+
+            switch (categoryFilter)
+            {
+                case RoomCategoryFilter.Spotlight:
+                    req.AddParameter("category", "spotlight");
+                    break;
+            }
+
+            return req;
         }
+
+        protected override string Target => "rooms";
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 2742ef3404..3a4ead44b7 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -12,11 +12,11 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
-    public class FilterControl : SearchableListFilterControl<PrimaryFilter, SecondaryFilter>
+    public class FilterControl : SearchableListFilterControl<RoomStatusFilter, RoomCategoryFilter>
     {
         protected override Color4 BackgroundColour => Color4.Black.Opacity(0.5f);
-        protected override PrimaryFilter DefaultTab => PrimaryFilter.Open;
-        protected override SecondaryFilter DefaultCategory => SecondaryFilter.Public;
+        protected override RoomStatusFilter DefaultTab => RoomStatusFilter.Open;
+        protected override RoomCategoryFilter DefaultCategory => RoomCategoryFilter.Normal;
 
         protected override float ContentHorizontalPadding => base.ContentHorizontalPadding + OsuScreen.HORIZONTAL_OVERFLOW_PADDING;
 
@@ -43,6 +43,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
             ruleset.BindValueChanged(_ => updateFilter());
             Search.Current.BindValueChanged(_ => scheduleUpdateFilter());
+            Dropdown.Current.BindValueChanged(_ => updateFilter());
             Tabs.Current.BindValueChanged(_ => updateFilter(), true);
         }
 
@@ -61,14 +62,14 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             filter.Value = new FilterCriteria
             {
                 SearchString = Search.Current.Value ?? string.Empty,
-                PrimaryFilter = Tabs.Current.Value,
-                SecondaryFilter = DisplayStyleControl.Dropdown.Current.Value,
+                StatusFilter = Tabs.Current.Value,
+                RoomCategoryFilter = Dropdown.Current.Value,
                 Ruleset = ruleset.Value
             };
         }
     }
 
-    public enum PrimaryFilter
+    public enum RoomStatusFilter
     {
         Open,
 
@@ -78,9 +79,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         Owned,
     }
 
-    public enum SecondaryFilter
+    public enum RoomCategoryFilter
     {
-        Public,
-        //Private,
+        Normal,
+        Spotlight
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
index 26d445e151..6d70225eec 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
@@ -8,8 +8,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components
     public class FilterCriteria
     {
         public string SearchString;
-        public PrimaryFilter PrimaryFilter;
-        public SecondaryFilter SecondaryFilter;
+        public RoomStatusFilter StatusFilter;
+        public RoomCategoryFilter RoomCategoryFilter;
         public RulesetInfo Ruleset;
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index bf153b77df..447c99039a 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -77,14 +77,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                     if (!string.IsNullOrEmpty(criteria.SearchString))
                         matchingFilter &= r.FilterTerms.Any(term => term.IndexOf(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase) >= 0);
 
-                    switch (criteria.SecondaryFilter)
-                    {
-                        default:
-                        case SecondaryFilter.Public:
-                            matchingFilter &= r.Room.Availability.Value == RoomAvailability.Public;
-                            break;
-                    }
-
                     r.MatchingFilter = matchingFilter;
                 }
             });
diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index 642378d8d5..ac1f74b6a6 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -318,7 +318,7 @@ namespace osu.Game.Screens.Multi
                 var tcs = new TaskCompletionSource<bool>();
 
                 pollReq?.Cancel();
-                pollReq = new GetRoomsRequest(currentFilter.Value.PrimaryFilter);
+                pollReq = new GetRoomsRequest(currentFilter.Value.StatusFilter, currentFilter.Value.RoomCategoryFilter);
 
                 pollReq.Success += result =>
                 {

From 1760cc242730fb1998135a79bd74586f63fc79f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 18:03:56 +0900
Subject: [PATCH 03636/10326] Fix behavioural regression by splitting methods
 out

---
 osu.Game/Overlays/MusicController.cs          | 34 ++++++++++++++-----
 osu.Game/Screens/Menu/MainMenu.cs             |  3 +-
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |  3 +-
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 63e828a782..09f2a66b47 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -134,9 +134,31 @@ namespace osu.Game.Overlays
             });
         }
 
+        /// <summary>
+        /// Ensures music is playing, no matter what, unless the user has explicitly paused.
+        /// This means that if the current beatmap has a virtual track (see <see cref="TrackVirtual"/>) a new beatmap will be selected.
+        /// </summary>
+        public void EnsurePlayingSomething()
+        {
+            if (IsUserPaused) return;
+
+            var track = current?.Track;
+
+            if (track == null || track is TrackVirtual)
+            {
+                if (beatmap.Disabled)
+                    return;
+
+                next();
+            }
+            else if (!IsPlaying)
+            {
+                Play();
+            }
+        }
+
         /// <summary>
         /// Start playing the current track (if not already playing).
-        /// Will select the next valid track if the current track is null or <see cref="TrackVirtual"/>.
         /// </summary>
         /// <returns>Whether the operation was successful.</returns>
         public bool Play(bool restart = false)
@@ -145,14 +167,8 @@ namespace osu.Game.Overlays
 
             IsUserPaused = false;
 
-            if (track == null || track is TrackVirtual)
-            {
-                if (beatmap.Disabled)
-                    return false;
-
-                next();
-                return true;
-            }
+            if (track == null)
+                return false;
 
             if (restart)
                 track.Restart();
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 41e2564141..57252d557e 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -260,8 +260,7 @@ namespace osu.Game.Screens.Menu
             // we may have consumed our preloaded instance, so let's make another.
             preloadSongSelect();
 
-            if (music?.IsUserPaused == false)
-                music.Play();
+            music.EnsurePlayingSomething();
         }
 
         public override bool OnExiting(IScreen next)
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index e2ffb21153..ff7d56a95b 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -126,8 +126,7 @@ namespace osu.Game.Screens.Multi.Lounge
             if (selectedRoom.Value?.RoomID.Value == null)
                 selectedRoom.Value = new Room();
 
-            if (music?.IsUserPaused == false)
-                music.Play();
+            music.EnsurePlayingSomething();
 
             onReturning();
         }

From cb56b8e031a6bbb431963d46d28349ca318fbf59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 18:13:58 +0900
Subject: [PATCH 03637/10326] Add test for menu playing music on return

---
 .../Navigation/TestSceneScreenNavigation.cs    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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

From f699a34c77298ec0324903659d63cd9d4ab48808 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 18:19:18 +0900
Subject: [PATCH 03638/10326] Rename variable for potential future expansion

---
 osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs | 2 +-
 osu.Game/Graphics/UserInterface/OsuTextBox.cs         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index 11867cf103..ac6f5ceb1b 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface
             Child = new PasswordMaskChar(CalculatedTextSize),
         };
 
-        protected override bool AllowUpperCaseSamples => false;
+        protected override bool AllowUniqueCharacterSamples => false;
 
         protected override bool AllowClipboardExport => false;
 
diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 753efcd16d..0d173e2d3e 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -30,10 +30,10 @@ namespace osu.Game.Graphics.UserInterface
         private SampleChannel caretMovedSample;
 
         /// <summary>
-        /// Whether to allow playing a different sample when inserting upper case text.
-        /// If set to false, same sample will be played for both letter cases.
+        /// Whether to allow playing a different samples based on the type of character.
+        /// If set to false, the same sample will be used for all characters.
         /// </summary>
-        protected virtual bool AllowUpperCaseSamples => true;
+        protected virtual bool AllowUniqueCharacterSamples => true;
 
         protected override float LeftRightPadding => 10;
 
@@ -78,7 +78,7 @@ namespace osu.Game.Graphics.UserInterface
         {
             base.OnTextAdded(added);
 
-            if (added.Any(char.IsUpper) && AllowUpperCaseSamples)
+            if (added.Any(char.IsUpper) && AllowUniqueCharacterSamples)
                 capsTextAddedSample?.Play();
             else
                 textAddedSamples[RNG.Next(0, 3)]?.Play();

From 8aff828dfe51a56be3c6eb9f7c5001830f351612 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 18:34:31 +0900
Subject: [PATCH 03639/10326] Move application of judgements to Apply method

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  4 +-
 .../Rulesets/Judgements/DrawableJudgement.cs  | 47 ++++++++-----------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 2eff99bd3e..291a572fdf 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
             DrawableOsuJudgement explosion = poolDictionary[result.Type].Get(doj =>
             {
-                doj.JudgedObject = judgedObject;
+                doj.Apply(result, judgedObject);
 
                 // todo: move to JudgedObject property?
                 doj.Position = osuObject.StackedEndPosition;
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 var judgement = base.CreateNewDrawable();
 
                 // just a placeholder to initialise the correct drawable hierarchy for this pool.
-                judgement.Result = new JudgementResult(new HitObject(), new Judgement()) { Type = result };
+                judgement.Apply(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null);
 
                 return judgement;
             }
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 3ec5326299..1671e97db1 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
+using JetBrains.Annotations;
 using osuTK;
 using osu.Framework.Allocation;
-using osu.Framework.Caching;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -28,24 +28,8 @@ namespace osu.Game.Rulesets.Judgements
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private readonly Cached drawableCache = new Cached();
-
-        private JudgementResult result;
-
-        public JudgementResult Result
-        {
-            get => result;
-            set
-            {
-                if (result?.Type == value.Type)
-                    return;
-
-                result = value;
-                drawableCache.Invalidate();
-            }
-        }
-
-        public DrawableHitObject JudgedObject;
+        public JudgementResult Result { get; private set; }
+        public DrawableHitObject JudgedObject { get; private set; }
 
         protected Container JudgementBody;
         protected SpriteText JudgementText;
@@ -68,8 +52,7 @@ namespace osu.Game.Rulesets.Judgements
         public DrawableJudgement(JudgementResult result, DrawableHitObject judgedObject)
             : this()
         {
-            Result = result;
-            JudgedObject = judgedObject;
+            Apply(result, judgedObject);
         }
 
         public DrawableJudgement()
@@ -78,6 +61,12 @@ namespace osu.Game.Rulesets.Judgements
             Origin = Anchor.Centre;
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            prepareDrawables();
+        }
+
         protected virtual void ApplyHitAnimations()
         {
             JudgementBody.ScaleTo(0.9f);
@@ -86,10 +75,10 @@ namespace osu.Game.Rulesets.Judgements
             this.Delay(FadeOutDelay).FadeOut(400);
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        public void Apply([NotNull] JudgementResult result, [CanBeNull] DrawableHitObject judgedObject)
         {
-            prepareDrawables();
+            Result = result;
+            JudgedObject = judgedObject;
         }
 
         protected override void PrepareForUse()
@@ -98,8 +87,7 @@ namespace osu.Game.Rulesets.Judgements
 
             Debug.Assert(Result != null);
 
-            if (!drawableCache.IsValid)
-                prepareDrawables();
+            prepareDrawables();
 
             this.FadeInFromZero(FadeInDuration, Easing.OutQuint);
             JudgementBody.ScaleTo(1);
@@ -129,10 +117,15 @@ namespace osu.Game.Rulesets.Judgements
             Expire(true);
         }
 
+        private HitResult? currentDrawableType;
+
         private void prepareDrawables()
         {
             var type = Result?.Type ?? HitResult.Perfect; //TODO: better default type from ruleset
 
+            if (type == currentDrawableType)
+                return;
+
             InternalChild = JudgementBody = new Container
             {
                 Anchor = Anchor.Centre,
@@ -147,7 +140,7 @@ namespace osu.Game.Rulesets.Judgements
                 }, confineMode: ConfineMode.NoScaling)
             };
 
-            drawableCache.Validate();
+            currentDrawableType = type;
         }
     }
 }

From f872343babd8ecc5285212d430abdef00be5664e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 18:35:20 +0900
Subject: [PATCH 03640/10326] Make Apply virtual to further simplify
 application process

---
 .../Objects/Drawables/DrawableOsuJudgement.cs         | 11 +++++++++++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs              | 11 +----------
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs     |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 9d0c406295..fa980c7581 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -43,6 +43,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        public override void Apply(JudgementResult result, DrawableHitObject judgedObject)
+        {
+            base.Apply(result, judgedObject);
+
+            if (judgedObject?.HitObject is OsuHitObject osuObject)
+            {
+                Position = osuObject.StackedPosition;
+                Scale = new Vector2(osuObject.Scale);
+            }
+        }
+
         protected override void PrepareForUse()
         {
             base.PrepareForUse();
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 291a572fdf..474e7c0f93 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -107,16 +107,7 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            var osuObject = (OsuHitObject)judgedObject.HitObject;
-
-            DrawableOsuJudgement explosion = poolDictionary[result.Type].Get(doj =>
-            {
-                doj.Apply(result, judgedObject);
-
-                // todo: move to JudgedObject property?
-                doj.Position = osuObject.StackedEndPosition;
-                doj.Scale = new Vector2(osuObject.Scale);
-            });
+            DrawableOsuJudgement explosion = poolDictionary[result.Type].Get(doj => doj.Apply(result, judgedObject));
 
             judgementLayer.Add(explosion);
         }
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 1671e97db1..4e7f0018ef 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Judgements
             this.Delay(FadeOutDelay).FadeOut(400);
         }
 
-        public void Apply([NotNull] JudgementResult result, [CanBeNull] DrawableHitObject judgedObject)
+        public virtual void Apply([NotNull] JudgementResult result, [CanBeNull] DrawableHitObject judgedObject)
         {
             Result = result;
             JudgedObject = judgedObject;

From 024fb52726d1d2b694caa6cc9fc5886dc76ae02e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 19:05:31 +0900
Subject: [PATCH 03641/10326] Fix unnecessary using

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 474e7c0f93..600efefca3 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -4,21 +4,20 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
-using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
 {

From cf3251a950a2f3318ce33b92f9b5b9a5c2655493 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 19:36:54 +0900
Subject: [PATCH 03642/10326] Default to showing all rooms

---
 osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 3a4ead44b7..f43763486c 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
     {
         protected override Color4 BackgroundColour => Color4.Black.Opacity(0.5f);
         protected override RoomStatusFilter DefaultTab => RoomStatusFilter.Open;
-        protected override RoomCategoryFilter DefaultCategory => RoomCategoryFilter.Normal;
+        protected override RoomCategoryFilter DefaultCategory => RoomCategoryFilter.Any;
 
         protected override float ContentHorizontalPadding => base.ContentHorizontalPadding + OsuScreen.HORIZONTAL_OVERFLOW_PADDING;
 
@@ -81,6 +81,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
     public enum RoomCategoryFilter
     {
+        Any,
         Normal,
         Spotlight
     }

From 64e8dce1ada23b4101ca49336cb382be1a76aff4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 19:37:27 +0900
Subject: [PATCH 03643/10326] Highlight spotlight rooms with a different colour

---
 .../Visual/Multiplayer/RoomManagerTestScene.cs        |  3 ++-
 osu.Game/Online/Multiplayer/Room.cs                   |  4 ++++
 osu.Game/Online/Multiplayer/RoomCategory.cs           | 11 +++++++++++
 .../Multi/Components/StatusColouredContainer.cs       |  9 ++++++++-
 .../Screens/Multi/Lounge/Components/DrawableRoom.cs   |  8 +++++---
 5 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/RoomCategory.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
index 46bc279d5c..8b7e0fd9da 100644
--- a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
@@ -34,7 +34,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         RoomID = { Value = i },
                         Name = { Value = $"Room {i}" },
                         Host = { Value = new User { Username = "Host" } },
-                        EndDate = { Value = DateTimeOffset.Now + TimeSpan.FromSeconds(10) }
+                        EndDate = { Value = DateTimeOffset.Now + TimeSpan.FromSeconds(10) },
+                        Category = { Value = i % 2 == 0 ? RoomCategory.Spotlight : RoomCategory.Normal }
                     };
 
                     if (ruleset != null)
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 66d5d8b3e0..34cf158442 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -34,6 +34,10 @@ namespace osu.Game.Online.Multiplayer
         [JsonProperty("channel_id")]
         public readonly Bindable<int> ChannelId = new Bindable<int>();
 
+        [Cached]
+        [JsonProperty("category")]
+        public readonly Bindable<RoomCategory> Category = new Bindable<RoomCategory>();
+
         [Cached]
         [JsonIgnore]
         public readonly Bindable<TimeSpan> Duration = new Bindable<TimeSpan>(TimeSpan.FromMinutes(30));
diff --git a/osu.Game/Online/Multiplayer/RoomCategory.cs b/osu.Game/Online/Multiplayer/RoomCategory.cs
new file mode 100644
index 0000000000..636a73a3e9
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/RoomCategory.cs
@@ -0,0 +1,11 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Online.Multiplayer
+{
+    public enum RoomCategory
+    {
+        Normal,
+        Spotlight
+    }
+}
diff --git a/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs b/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
index 97af6674bf..a115f06e7b 100644
--- a/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
+++ b/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
@@ -17,6 +17,9 @@ namespace osu.Game.Screens.Multi.Components
         [Resolved(typeof(Room), nameof(Room.Status))]
         private Bindable<RoomStatus> status { get; set; }
 
+        [Resolved(typeof(Room), nameof(Room.Category))]
+        private Bindable<RoomCategory> category { get; set; }
+
         public StatusColouredContainer(double transitionDuration = 100)
         {
             this.transitionDuration = transitionDuration;
@@ -25,7 +28,11 @@ namespace osu.Game.Screens.Multi.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            status.BindValueChanged(s => this.FadeColour(s.NewValue.GetAppropriateColour(colours), transitionDuration), true);
+            status.BindValueChanged(s =>
+            {
+                this.FadeColour(category.Value == RoomCategory.Spotlight ? colours.Pink : s.NewValue.GetAppropriateColour(colours)
+                    , transitionDuration);
+            }, true);
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index de02d779e1..3f5a2eb1d3 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -107,6 +107,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
+            float stripWidth = side_strip_width * (Room.Category.Value == RoomCategory.Spotlight ? 2 : 1);
+
             Children = new Drawable[]
             {
                 new StatusColouredContainer(transition_duration)
@@ -139,7 +141,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                             new StatusColouredContainer(transition_duration)
                             {
                                 RelativeSizeAxes = Axes.Y,
-                                Width = side_strip_width,
+                                Width = stripWidth,
                                 Child = new Box { RelativeSizeAxes = Axes.Both }
                             },
                             new Container
@@ -147,7 +149,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                                 RelativeSizeAxes = Axes.Y,
                                 Width = cover_width,
                                 Masking = true,
-                                Margin = new MarginPadding { Left = side_strip_width },
+                                Margin = new MarginPadding { Left = stripWidth },
                                 Child = new MultiplayerBackgroundSprite(BeatmapSetCoverType.List) { RelativeSizeAxes = Axes.Both }
                             },
                             new Container
@@ -156,7 +158,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                                 Padding = new MarginPadding
                                 {
                                     Vertical = content_padding,
-                                    Left = side_strip_width + cover_width + content_padding,
+                                    Left = stripWidth + cover_width + content_padding,
                                     Right = content_padding,
                                 },
                                 Children = new Drawable[]

From fe585611e7169ebc615c2ad03932bcfef2504a7b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 10 Jul 2020 19:54:09 +0900
Subject: [PATCH 03644/10326] Fix + simplify web request

---
 .../Online/API/Requests/GetRoomsRequest.cs    | 25 ++++---------------
 .../Multi/Lounge/Components/FilterControl.cs  |  2 +-
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Online/API/Requests/GetRoomsRequest.cs b/osu.Game/Online/API/Requests/GetRoomsRequest.cs
index 4b90b04b51..c47ed20909 100644
--- a/osu.Game/Online/API/Requests/GetRoomsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetRoomsRequest.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using Humanizer;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Lounge.Components;
@@ -23,27 +24,11 @@ namespace osu.Game.Online.API.Requests
         {
             var req = base.CreateWebRequest();
 
-            switch (statusFilter)
-            {
-                case RoomStatusFilter.Owned:
-                    req.AddParameter("mode", "owned");
-                    break;
+            if (statusFilter != RoomStatusFilter.Open)
+                req.AddParameter("mode", statusFilter.ToString().Underscore().ToLowerInvariant());
 
-                case RoomStatusFilter.Participated:
-                    req.AddParameter("mode", "participated");
-                    break;
-
-                case RoomStatusFilter.RecentlyEnded:
-                    req.AddParameter("mode", "ended");
-                    break;
-            }
-
-            switch (categoryFilter)
-            {
-                case RoomCategoryFilter.Spotlight:
-                    req.AddParameter("category", "spotlight");
-                    break;
-            }
+            if (categoryFilter != RoomCategoryFilter.Any)
+                req.AddParameter("category", categoryFilter.ToString().Underscore().ToLowerInvariant());
 
             return req;
         }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index f43763486c..be1083ce8d 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         Open,
 
         [Description("Recently Ended")]
-        RecentlyEnded,
+        Ended,
         Participated,
         Owned,
     }

From 9556166c1b963e60a82690e60e6cd0ef568d7c46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 19:37:27 +0900
Subject: [PATCH 03645/10326] Replace large "show results" button with embedded
 button each playlist item

---
 .../Screens/Multi/DrawableRoomPlaylistItem.cs | 49 ++++++++------
 .../Multi/DrawableRoomPlaylistWithResults.cs  | 66 +++++++++++++++++++
 .../Screens/Multi/Match/MatchSubScreen.cs     | 28 ++------
 3 files changed, 103 insertions(+), 40 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs

diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index 414c1f5748..8086449401 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -48,7 +49,8 @@ namespace osu.Game.Screens.Multi
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
         private readonly BindableList<Mod> requiredMods = new BindableList<Mod>();
 
-        private readonly PlaylistItem item;
+        public readonly PlaylistItem Item;
+
         private readonly bool allowEdit;
         private readonly bool allowSelection;
 
@@ -57,8 +59,11 @@ namespace osu.Game.Screens.Multi
         public DrawableRoomPlaylistItem(PlaylistItem item, bool allowEdit, bool allowSelection)
             : base(item)
         {
-            this.item = item;
+            Item = item;
+
+            // TODO: edit support should be moved out into a derived class
             this.allowEdit = allowEdit;
+
             this.allowSelection = allowSelection;
 
             beatmap.BindTo(item.Beatmap);
@@ -91,6 +96,8 @@ namespace osu.Game.Screens.Multi
 
         private ScheduledDelegate scheduledRefresh;
 
+        public FillFlowContainer ButtonsContainer { get; private set; }
+
         private void scheduleRefresh()
         {
             scheduledRefresh?.Cancel();
@@ -102,14 +109,14 @@ namespace osu.Game.Screens.Multi
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(item.Beatmap.ToString(), LinkAction.OpenBeatmap, item.Beatmap.Value.OnlineBeatmapID.ToString());
+            beatmapText.AddLink(Item.Beatmap.ToString(), LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 
-            if (item.Beatmap?.Value?.Metadata?.Author != null)
+            if (Item.Beatmap?.Value?.Metadata?.Author != null)
             {
                 authorText.AddText("mapped by ");
-                authorText.AddUserLink(item.Beatmap.Value?.Metadata.Author);
+                authorText.AddUserLink(Item.Beatmap.Value?.Metadata.Author);
             }
 
             modDisplay.Current.Value = requiredMods.ToArray();
@@ -180,29 +187,33 @@ namespace osu.Game.Screens.Multi
                         }
                     }
                 },
-                new Container
+                ButtonsContainer = new FillFlowContainer
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
+                    Direction = FillDirection.Horizontal,
                     AutoSizeAxes = Axes.Both,
                     X = -18,
-                    Children = new Drawable[]
-                    {
-                        new PlaylistDownloadButton(item)
-                        {
-                            Size = new Vector2(50, 30)
-                        },
-                        new IconButton
-                        {
-                            Icon = FontAwesome.Solid.MinusSquare,
-                            Alpha = allowEdit ? 1 : 0,
-                            Action = () => RequestDeletion?.Invoke(Model),
-                        },
-                    }
+                    ChildrenEnumerable = CreateButtons()
                 }
             }
         };
 
+        protected virtual IEnumerable<Drawable> CreateButtons() =>
+            new Drawable[]
+            {
+                new PlaylistDownloadButton(Item)
+                {
+                    Size = new Vector2(50, 30)
+                },
+                new IconButton
+                {
+                    Icon = FontAwesome.Solid.MinusSquare,
+                    Alpha = allowEdit ? 1 : 0,
+                    Action = () => RequestDeletion?.Invoke(Model),
+                },
+            };
+
         protected override bool OnClick(ClickEvent e)
         {
             if (allowSelection)
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs
new file mode 100644
index 0000000000..439aaaa275
--- /dev/null
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs
@@ -0,0 +1,66 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+
+namespace osu.Game.Screens.Multi
+{
+    public class DrawableRoomPlaylistWithResults : DrawableRoomPlaylist
+    {
+        public Action<PlaylistItem> RequestShowResults;
+
+        public DrawableRoomPlaylistWithResults()
+            : base(false, true)
+        {
+        }
+
+        protected override OsuRearrangeableListItem<PlaylistItem> CreateOsuDrawable(PlaylistItem item) =>
+            new DrawableRoomPlaylistItemWithResults(item, false, true)
+            {
+                RequestShowResults = () => RequestShowResults(item),
+                SelectedItem = { BindTarget = SelectedItem },
+            };
+
+        private class DrawableRoomPlaylistItemWithResults : DrawableRoomPlaylistItem
+        {
+            public Action RequestShowResults;
+
+            public DrawableRoomPlaylistItemWithResults(PlaylistItem item, bool allowEdit, bool allowSelection)
+                : base(item, allowEdit, allowSelection)
+            {
+            }
+
+            protected override IEnumerable<Drawable> CreateButtons() =>
+                base.CreateButtons().Prepend(new FilledIconButton
+                {
+                    Icon = FontAwesome.Solid.ChartPie,
+                    Action = () => RequestShowResults?.Invoke(),
+                    TooltipText = "View results"
+                });
+
+            private class FilledIconButton : IconButton
+            {
+                [BackgroundDependencyLoader]
+                private void load(OsuColour colours)
+                {
+                    Add(new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Depth = float.MaxValue,
+                        Colour = colours.Gray4,
+                    });
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 40a8427701..7c2d5cf85d 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.GameTypes;
@@ -137,30 +136,23 @@ namespace osu.Game.Screens.Multi.Match
                                                                     new Drawable[] { new OverlinedHeader("Playlist"), },
                                                                     new Drawable[]
                                                                     {
-                                                                        new DrawableRoomPlaylist(false, true) // Temporarily always allow selection
+                                                                        new DrawableRoomPlaylistWithResults
                                                                         {
                                                                             RelativeSizeAxes = Axes.Both,
                                                                             Items = { BindTarget = playlist },
-                                                                            SelectedItem = { BindTarget = SelectedItem }
+                                                                            SelectedItem = { BindTarget = SelectedItem },
+                                                                            RequestShowResults = item =>
+                                                                            {
+                                                                                Debug.Assert(roomId.Value != null);
+                                                                                multiplayer?.Push(new TimeshiftResultsScreen(null, roomId.Value.Value, item, false));
+                                                                            }
                                                                         }
                                                                     },
-                                                                    null,
-                                                                    new Drawable[]
-                                                                    {
-                                                                        new TriangleButton
-                                                                        {
-                                                                            RelativeSizeAxes = Axes.X,
-                                                                            Text = "Show beatmap results",
-                                                                            Action = showBeatmapResults
-                                                                        }
-                                                                    }
                                                                 },
                                                                 RowDimensions = new[]
                                                                 {
                                                                     new Dimension(GridSizeMode.AutoSize),
                                                                     new Dimension(),
-                                                                    new Dimension(GridSizeMode.Absolute, 5),
-                                                                    new Dimension(GridSizeMode.AutoSize)
                                                                 }
                                                             }
                                                         },
@@ -296,11 +288,5 @@ namespace osu.Game.Screens.Multi.Match
                     break;
             }
         }
-
-        private void showBeatmapResults()
-        {
-            Debug.Assert(roomId.Value != null);
-            multiplayer?.Push(new TimeshiftResultsScreen(null, roomId.Value.Value, SelectedItem.Value, false));
-        }
     }
 }

From c7b5c5aef42689f2d0dfe6ab817189dc15a4448d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 20:22:51 +0900
Subject: [PATCH 03646/10326] Add tooltips to beatmap download button

---
 osu.Game/Graphics/UserInterface/DownloadButton.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/DownloadButton.cs b/osu.Game/Graphics/UserInterface/DownloadButton.cs
index 86a5cb9aa6..bec5a45556 100644
--- a/osu.Game/Graphics/UserInterface/DownloadButton.cs
+++ b/osu.Game/Graphics/UserInterface/DownloadButton.cs
@@ -63,22 +63,26 @@ namespace osu.Game.Graphics.UserInterface
                     background.FadeColour(colours.Gray4, 500, Easing.InOutExpo);
                     icon.MoveToX(0, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
+                    TooltipText = "Download";
                     break;
 
                 case DownloadState.Downloading:
                     background.FadeColour(colours.Blue, 500, Easing.InOutExpo);
                     icon.MoveToX(0, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
+                    TooltipText = "Downloading...";
                     break;
 
                 case DownloadState.Downloaded:
                     background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
+                    TooltipText = "Importing";
                     break;
 
                 case DownloadState.LocallyAvailable:
                     background.FadeColour(colours.Green, 500, Easing.InOutExpo);
                     icon.MoveToX(-8, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(new Vector2(13), 500, Easing.InOutExpo);
+                    TooltipText = "Go to beatmap";
                     break;
             }
         }

From 840380e0de4d068b5fe16af44a01b22ef948f7a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 20:25:52 +0900
Subject: [PATCH 03647/10326] Fix LocallyAvailable state case getting cleared

---
 osu.Game/Graphics/UserInterface/DownloadButton.cs               | 1 -
 .../BeatmapListing/Panels/BeatmapPanelDownloadButton.cs         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/DownloadButton.cs b/osu.Game/Graphics/UserInterface/DownloadButton.cs
index bec5a45556..da6c95299e 100644
--- a/osu.Game/Graphics/UserInterface/DownloadButton.cs
+++ b/osu.Game/Graphics/UserInterface/DownloadButton.cs
@@ -82,7 +82,6 @@ namespace osu.Game.Graphics.UserInterface
                     background.FadeColour(colours.Green, 500, Easing.InOutExpo);
                     icon.MoveToX(-8, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(new Vector2(13), 500, Easing.InOutExpo);
-                    TooltipText = "Go to beatmap";
                     break;
             }
         }
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
index 67782dfe3f..001ca801d9 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 {
                     case DownloadState.LocallyAvailable:
                         button.Enabled.Value = true;
-                        button.TooltipText = string.Empty;
+                        button.TooltipText = "Go to beatmap";
                         break;
 
                     default:

From d3367bb0f14597f959c7032beaecfd07383c6498 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 20:32:47 +0900
Subject: [PATCH 03648/10326] Remove unused public property

---
 osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index 8086449401..c0892235f2 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -96,8 +96,6 @@ namespace osu.Game.Screens.Multi
 
         private ScheduledDelegate scheduledRefresh;
 
-        public FillFlowContainer ButtonsContainer { get; private set; }
-
         private void scheduleRefresh()
         {
             scheduledRefresh?.Cancel();
@@ -187,7 +185,7 @@ namespace osu.Game.Screens.Multi
                         }
                     }
                 },
-                ButtonsContainer = new FillFlowContainer
+                new FillFlowContainer
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,

From 0d95b768aa2e04f8543731afa71a31282c4c42c3 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Fri, 10 Jul 2020 07:34:48 -0500
Subject: [PATCH 03649/10326] Rename and Move EditorPlayfieldBorder to
 PlayfieldBorder for general purpose

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  3 +-
 osu.Game/Rulesets/UI/Playfield.cs             | 40 +------------------
 ...rPlayfieldBorder.cs => PlayfieldBorder.cs} |  6 +--
 3 files changed, 6 insertions(+), 43 deletions(-)
 rename osu.Game/Screens/{Edit/Compose/Components/EditorPlayfieldBorder.cs => PlayfieldBorder.cs} (82%)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index c25fb03fd0..6028ab77e1 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components.RadioButtons;
 using osu.Game.Screens.Edit.Compose;
@@ -108,7 +109,7 @@ namespace osu.Game.Rulesets.Edit
                                 drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
                                 {
                                     LayerBelowRuleset,
-                                    new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
+                                    new PlayfieldBorder { RelativeSizeAxes = Axes.Both }
                                 }),
                                 drawableRulesetWrapper,
                                 // layers above playfield
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index f6eb74a030..c52183f3f2 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -12,8 +12,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mods;
 using osuTK;
-using osu.Game.Configuration;
-using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -53,10 +51,6 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public readonly BindableBool DisplayJudgements = new BindableBool(true);
 
-        private Bindable<bool> showPlayfieldArea;
-        private Bindable<double> playfieldAreaDimLevel;
-        private EditorPlayfieldBorder playfieldArea;
-
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
         /// </summary>
@@ -71,7 +65,7 @@ namespace osu.Game.Rulesets.UI
         private IReadOnlyList<Mod> mods { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load()
         {
             Cursor = CreateCursor();
 
@@ -82,38 +76,6 @@ namespace osu.Game.Rulesets.UI
 
                 AddInternal(Cursor);
             }
-
-            showPlayfieldArea = config.GetBindable<bool>(OsuSetting.ShowPlayfieldArea);
-            playfieldAreaDimLevel = config.GetBindable<double>(OsuSetting.PlayfieldAreaDimLevel);
-            showPlayfieldArea.ValueChanged += _ => UpdateVisuals();
-            playfieldAreaDimLevel.ValueChanged += _ => UpdateVisuals();
-            UpdateVisuals();
-        }
-
-        protected virtual void UpdateVisuals()
-        {
-            if (playfieldArea == null)
-            {
-                if (showPlayfieldArea.Value)
-                {
-                    AddInternal(playfieldArea = new EditorPlayfieldBorder
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = (float)playfieldAreaDimLevel.Value,
-                    });
-                }
-            }
-            else
-            {
-                if (showPlayfieldArea.Value)
-                {
-                    playfieldArea.Alpha = (float)playfieldAreaDimLevel.Value;
-                }
-                else
-                {
-                    playfieldArea.Alpha = 0;
-                }
-            }
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorPlayfieldBorder.cs b/osu.Game/Screens/PlayfieldBorder.cs
similarity index 82%
rename from osu.Game/Screens/Edit/Compose/Components/EditorPlayfieldBorder.cs
rename to osu.Game/Screens/PlayfieldBorder.cs
index 4d956336b7..a3be38f0a2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorPlayfieldBorder.cs
+++ b/osu.Game/Screens/PlayfieldBorder.cs
@@ -6,14 +6,14 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Compose.Components
+namespace osu.Game.Screens
 {
     /// <summary>
     /// Provides a border around the playfield.
     /// </summary>
-    public class EditorPlayfieldBorder : CompositeDrawable
+    public class PlayfieldBorder : CompositeDrawable
     {
-        public EditorPlayfieldBorder()
+        public PlayfieldBorder()
         {
             RelativeSizeAxes = Axes.Both;
 

From d40f209f4bbb15406b5512ad77585311ead25af4 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Fri, 10 Jul 2020 07:36:21 -0500
Subject: [PATCH 03650/10326] Move Playfield Border to OsuPlayfield Ruleset

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      | 19 +++++++++++++++++++
 osu.Game/Configuration/OsuConfigManager.cs    |  6 ++----
 .../Sections/Gameplay/GeneralSettings.cs      | 13 +++----------
 .../Play/PlayerSettings/VisualSettings.cs     | 15 +--------------
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 4b1a2ce43c..3189db69a5 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -12,6 +12,10 @@ using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Skinning;
+using osu.Framework.Allocation;
+using osu.Game.Configuration;
+using osu.Framework.Bindables;
+using osu.Game.Screens;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
@@ -26,6 +30,8 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
 
+        private Bindable<bool> showPlayfieldBorder;
+
         public OsuPlayfield()
         {
             InternalChildren = new Drawable[]
@@ -56,6 +62,19 @@ namespace osu.Game.Rulesets.Osu.UI
             hitPolicy = new OrderedHitPolicy(HitObjectContainer);
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            showPlayfieldBorder = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder);
+            if (showPlayfieldBorder.Value)
+            {
+                AddInternal(new PlayfieldBorder
+                {
+                    RelativeSizeAxes = Axes.Both
+                });
+            }
+        }
+
         public override void Add(DrawableHitObject h)
         {
             h.OnNewResult += onNewResult;
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 40a132a8e8..9ed73b7bd6 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -99,8 +99,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.IncreaseFirstObjectVisibility, true);
 
-            Set(OsuSetting.ShowPlayfieldArea, false);
-            Set(OsuSetting.PlayfieldAreaDimLevel, 0.1, 0, 1, 0.01);
+            Set(OsuSetting.ShowPlayfieldBorder, false);
 
             // Update
             Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
@@ -231,7 +230,6 @@ namespace osu.Game.Configuration
         UIHoldActivationDelay,
         HitLighting,
         MenuBackgroundSource,
-        ShowPlayfieldArea,
-        PlayfieldAreaDimLevel
+        ShowPlayfieldBorder
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index ad02b54dd8..85eb61edff 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -79,16 +79,9 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = "Show playfield area",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowPlayfieldArea)
-                },
-                new SettingsSlider<double>
-                {
-                    LabelText = "Playfield area dim",
-                    Bindable = config.GetBindable<double>(OsuSetting.PlayfieldAreaDimLevel),
-                    KeyboardStep = 0.01f,
-                    DisplayAsPercentage = true
-                },
+                    LabelText = "Show playfield border",
+                    Bindable = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder)
+                }
             };
         }
     }
diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
index 36e7c53132..d6c66d0751 100644
--- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
@@ -14,11 +14,9 @@ namespace osu.Game.Screens.Play.PlayerSettings
 
         private readonly PlayerSliderBar<double> dimSliderBar;
         private readonly PlayerSliderBar<double> blurSliderBar;
-        private readonly PlayerSliderBar<double> playfieldAreaDimSliderBar;
         private readonly PlayerCheckbox showStoryboardToggle;
         private readonly PlayerCheckbox beatmapSkinsToggle;
         private readonly PlayerCheckbox beatmapHitsoundsToggle;
-        private readonly PlayerCheckbox showPlayfieldAreaToggle;
 
         public VisualSettings()
         {
@@ -41,21 +39,12 @@ namespace osu.Game.Screens.Play.PlayerSettings
                     DisplayAsPercentage = true
                 },
                 new OsuSpriteText
-                {
-                    Text = "Playfieldd area dim:"
-                },
-                playfieldAreaDimSliderBar = new PlayerSliderBar<double>
-                {
-                    DisplayAsPercentage = true
-                },
-                new OsuSpriteText
                 {
                     Text = "Toggles:"
                 },
                 showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboard / Video" },
                 beatmapSkinsToggle = new PlayerCheckbox { LabelText = "Beatmap skins" },
-                beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hitsounds" },
-                showPlayfieldAreaToggle = new PlayerCheckbox { LabelText = "Show playfield area" }
+                beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hitsounds" }
             };
         }
 
@@ -64,11 +53,9 @@ namespace osu.Game.Screens.Play.PlayerSettings
         {
             dimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.DimLevel);
             blurSliderBar.Bindable = config.GetBindable<double>(OsuSetting.BlurLevel);
-            playfieldAreaDimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.PlayfieldAreaDimLevel);
             showStoryboardToggle.Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
             beatmapSkinsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
             beatmapHitsoundsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
-            showPlayfieldAreaToggle.Current = config.GetBindable<bool>(OsuSetting.ShowPlayfieldArea);
         }
     }
 }

From 13205319f3c910a12e8854da1607244d27da65f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 22:37:29 +0900
Subject: [PATCH 03651/10326] Fix null reference if hit lighting is disabled

---
 .../Objects/Drawables/DrawableOsuJudgement.cs                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index fa980c7581..f32ce2c4cd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -60,10 +60,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             lightingColour?.UnbindAll();
 
-            if (JudgedObject != null)
+            if (JudgedObject != null && lighting != null)
             {
                 lightingColour = JudgedObject.AccentColour.GetBoundCopy();
-                lightingColour.BindValueChanged(colour => lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
+                lightingColour.BindValueChanged(colour => lighting.Colour = Result?.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
             }
             else
             {

From 0a61f80c8b1ab7cf1d3b1060c28831c2547027d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 22:39:35 +0900
Subject: [PATCH 03652/10326] Remove result nullable check

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index f32ce2c4cd..33ad674679 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (JudgedObject != null && lighting != null)
             {
                 lightingColour = JudgedObject.AccentColour.GetBoundCopy();
-                lightingColour.BindValueChanged(colour => lighting.Colour = Result?.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
+                lightingColour.BindValueChanged(colour => lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
             }
             else
             {

From dd025262d07a7e6e94fc448c094ae7dc5179bd78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Jul 2020 22:48:34 +0900
Subject: [PATCH 03653/10326] Fix one more nullref

---
 .../Objects/Drawables/DrawableOsuJudgement.cs   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 33ad674679..cfe969d1cc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -60,14 +60,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             lightingColour?.UnbindAll();
 
-            if (JudgedObject != null && lighting != null)
+            if (lighting != null)
             {
-                lightingColour = JudgedObject.AccentColour.GetBoundCopy();
-                lightingColour.BindValueChanged(colour => lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
-            }
-            else
-            {
-                lighting.Colour = Color4.White;
+                if (JudgedObject != null)
+                {
+                    lightingColour = JudgedObject.AccentColour.GetBoundCopy();
+                    lightingColour.BindValueChanged(colour => lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
+                }
+                else
+                {
+                    lighting.Colour = Color4.White;
+                }
             }
         }
 

From fa0c2d7f84985060a047be059fc0721e8c2fce0a Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 10 Jul 2020 10:42:41 -0700
Subject: [PATCH 03654/10326] Fix room name overflowing on multiplayer lounge

---
 .../Multi/Lounge/Components/RoomInfo.cs        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs
index 02f2667802..e6f6ce5ed2 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs
@@ -4,9 +4,8 @@
 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.Graphics.Containers;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
@@ -15,7 +14,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
     public class RoomInfo : MultiplayerComposite
     {
         private readonly List<Drawable> statusElements = new List<Drawable>();
-        private readonly SpriteText roomName;
+        private readonly OsuTextFlowContainer roomName;
 
         public RoomInfo()
         {
@@ -43,18 +42,23 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
-                                AutoSizeAxes = Axes.Both,
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Vertical,
                                 Children = new Drawable[]
                                 {
-                                    roomName = new OsuSpriteText { Font = OsuFont.GetFont(size: 30) },
+                                    roomName = new OsuTextFlowContainer(t => t.Font = OsuFont.GetFont(size: 30))
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                    },
                                     statusInfo = new RoomStatusInfo(),
                                 }
                             },
                             typeInfo = new ModeTypeInfo
                             {
-                                Anchor = Anchor.CentreRight,
-                                Origin = Anchor.CentreRight
+                                Anchor = Anchor.BottomRight,
+                                Origin = Anchor.BottomRight
                             }
                         }
                     },

From 789c921af1869435142f77c82fbdf5227c3a7af5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jul 2020 06:47:52 +0300
Subject: [PATCH 03655/10326] Move replies button to a new line

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 46f600615a..2a63060385 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -163,20 +163,28 @@ namespace osu.Game.Overlays.Comments
                                                     AutoSizeAxes = Axes.Y,
                                                     Padding = new MarginPadding { Right = 40 }
                                                 },
-                                                info = new FillFlowContainer
+                                                new FillFlowContainer
                                                 {
                                                     AutoSizeAxes = Axes.Both,
-                                                    Direction = FillDirection.Horizontal,
-                                                    Spacing = new Vector2(10, 0),
+                                                    Direction = FillDirection.Vertical,
                                                     Children = new Drawable[]
                                                     {
-                                                        new OsuSpriteText
+                                                        info = new FillFlowContainer
                                                         {
-                                                            Anchor = Anchor.CentreLeft,
-                                                            Origin = Anchor.CentreLeft,
-                                                            Font = OsuFont.GetFont(size: 12),
-                                                            Colour = OsuColour.Gray(0.7f),
-                                                            Text = HumanizerUtils.Humanize(Comment.CreatedAt)
+                                                            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),
+                                                                    Colour = OsuColour.Gray(0.7f),
+                                                                    Text = HumanizerUtils.Humanize(Comment.CreatedAt)
+                                                                },
+                                                            }
                                                         },
                                                         repliesButton = new RepliesButton(Comment.RepliesCount)
                                                         {

From da249abd19382e9c3c6c0deeab0529f510314bd9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jul 2020 07:47:17 +0300
Subject: [PATCH 03656/10326] Implement CommentRepliesButton

---
 .../TestSceneCommentRepliesButton.cs          |  54 ++++++++++
 .../Comments/Buttons/CommentRepliesButton.cs  | 100 ++++++++++++++++++
 .../Comments/Buttons/LoadRepliesButton.cs     |  10 ++
 .../Comments/Buttons/ShowRepliesButton.cs     |  19 ++++
 4 files changed, 183 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
 create mode 100644 osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
 create mode 100644 osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.cs
 create mode 100644 osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
new file mode 100644
index 0000000000..b4f518a5d0
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.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 osu.Game.Overlays.Comments.Buttons;
+using osu.Framework.Graphics;
+using osu.Framework.Allocation;
+using osu.Game.Overlays;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneCommentRepliesButton : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+        public TestSceneCommentRepliesButton()
+        {
+            Child = new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new Drawable[]
+                {
+                    new TestButton
+                    {
+                        Action = () => { }
+                    },
+                    new LoadRepliesButton
+                    {
+                        Action = () => { }
+                    },
+                    new ShowRepliesButton(1)
+                    {
+                        Action = () => { }
+                    },
+                    new ShowRepliesButton(2)
+                    {
+                        Action = () => { }
+                    }
+                }
+            };
+        }
+
+        private class TestButton : CommentRepliesButton
+        {
+            protected override string GetText() => "sample text";
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
new file mode 100644
index 0000000000..13924200c2
--- /dev/null
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.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 System.Collections.Generic;
+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.Containers;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Overlays.Comments.Buttons
+{
+    public abstract class CommentRepliesButton : OsuHoverContainer
+    {
+        protected override IEnumerable<Drawable> EffectTargets => new[] { background };
+
+        protected ChevronIcon Icon;
+        private Box background;
+
+        public CommentRepliesButton()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            Add(new CircularContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Margin = new MarginPadding
+                        {
+                            Vertical = 5,
+                            Horizontal = 10,
+                        },
+                        Child = new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(15, 0),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Children = new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                                    Text = GetText()
+                                },
+                                Icon = new ChevronIcon
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+
+            IdleColour = colourProvider.Background2;
+            HoverColour = colourProvider.Background1;
+        }
+
+        protected abstract string GetText();
+
+        protected class ChevronIcon : SpriteIcon
+        {
+            public ChevronIcon()
+            {
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                Size = new Vector2(7.5f);
+                Icon = FontAwesome.Solid.ChevronDown;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Foreground1;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.cs
new file mode 100644
index 0000000000..41cce72272
--- /dev/null
+++ b/osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.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.Comments.Buttons
+{
+    public class LoadRepliesButton : CommentRepliesButton
+    {
+        protected override string GetText() => "load replies";
+    }
+}
diff --git a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
new file mode 100644
index 0000000000..1e8c732453
--- /dev/null
+++ b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.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 Humanizer;
+
+namespace osu.Game.Overlays.Comments.Buttons
+{
+    public class ShowRepliesButton : CommentRepliesButton
+    {
+        private readonly int count;
+
+        public ShowRepliesButton(int count)
+        {
+            this.count = count;
+        }
+
+        protected override string GetText() => "reply".ToQuantity(count);
+    }
+}

From 0861ee0c8e985bb413681037ab54ea00f1910d82 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jul 2020 07:54:37 +0300
Subject: [PATCH 03657/10326] Make Icon rotate when clicking ShowRepliesButton

---
 .../Comments/Buttons/ShowRepliesButton.cs     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
index 1e8c732453..2381727431 100644
--- a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
@@ -2,11 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Humanizer;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
+using osuTK;
 
 namespace osu.Game.Overlays.Comments.Buttons
 {
     public class ShowRepliesButton : CommentRepliesButton
     {
+        public readonly BindableBool Expanded = new BindableBool(true);
+
         private readonly int count;
 
         public ShowRepliesButton(int count)
@@ -14,6 +20,23 @@ namespace osu.Game.Overlays.Comments.Buttons
             this.count = count;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Expanded.BindValueChanged(onExpandedChanged, true);
+        }
+
+        private void onExpandedChanged(ValueChangedEvent<bool> expanded)
+        {
+            Icon.ScaleTo(new Vector2(1, expanded.NewValue ? -1 : 1));
+        }
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            Expanded.Toggle();
+            return base.OnClick(e);
+        }
+
         protected override string GetText() => "reply".ToQuantity(count);
     }
 }

From 42d3288f176d312833cad45f23cb69e73718e48c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jul 2020 08:01:11 +0300
Subject: [PATCH 03658/10326] Update old buttons usage

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 50 ++++---------------
 1 file changed, 10 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 2a63060385..7bd5e22038 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -16,12 +16,12 @@ 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;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using System.Collections.Specialized;
+using osu.Game.Overlays.Comments.Buttons;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -46,9 +46,9 @@ namespace osu.Game.Overlays.Comments
 
         private FillFlowContainer childCommentsVisibilityContainer;
         private FillFlowContainer childCommentsContainer;
-        private LoadMoreCommentsButton loadMoreCommentsButton;
+        private LoadRepliesButton loadRepliesButton;
         private ShowMoreButton showMoreButton;
-        private RepliesButton repliesButton;
+        private ShowRepliesButton showRepliesButton;
         private ChevronButton chevronButton;
         private DeletedCommentsCounter deletedCommentsCounter;
 
@@ -186,11 +186,11 @@ namespace osu.Game.Overlays.Comments
                                                                 },
                                                             }
                                                         },
-                                                        repliesButton = new RepliesButton(Comment.RepliesCount)
+                                                        showRepliesButton = new ShowRepliesButton(Comment.RepliesCount)
                                                         {
                                                             Expanded = { BindTarget = childrenExpanded }
                                                         },
-                                                        loadMoreCommentsButton = new LoadMoreCommentsButton
+                                                        loadRepliesButton = new LoadRepliesButton
                                                         {
                                                             Action = () => RepliesRequested(this, ++currentPage)
                                                         }
@@ -347,14 +347,16 @@ namespace osu.Game.Overlays.Comments
             var loadedReplesCount = loadedReplies.Count;
             var hasUnloadedReplies = loadedReplesCount != Comment.RepliesCount;
 
-            loadMoreCommentsButton.FadeTo(hasUnloadedReplies && loadedReplesCount == 0 ? 1 : 0);
+            loadRepliesButton.FadeTo(hasUnloadedReplies && loadedReplesCount == 0 ? 1 : 0);
             showMoreButton.FadeTo(hasUnloadedReplies && loadedReplesCount > 0 ? 1 : 0);
-            repliesButton.FadeTo(loadedReplesCount != 0 ? 1 : 0);
+            showRepliesButton.FadeTo(loadedReplesCount != 0 ? 1 : 0);
 
             if (Comment.IsTopLevel)
                 chevronButton.FadeTo(loadedReplesCount != 0 ? 1 : 0);
 
-            showMoreButton.IsLoading = loadMoreCommentsButton.IsLoading = false;
+            showMoreButton.IsLoading = false;
+
+            //loadRepliesButton.IsLoading = false;
         }
 
         private class ChevronButton : ShowChildrenButton
@@ -375,38 +377,6 @@ namespace osu.Game.Overlays.Comments
             }
         }
 
-        private class RepliesButton : ShowChildrenButton
-        {
-            private readonly SpriteText text;
-            private readonly int count;
-
-            public RepliesButton(int count)
-            {
-                this.count = count;
-
-                Child = text = new OsuSpriteText
-                {
-                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
-                };
-            }
-
-            protected override void OnExpandedChanged(ValueChangedEvent<bool> expanded)
-            {
-                text.Text = $@"{(expanded.NewValue ? "[-]" : "[+]")} replies ({count})";
-            }
-        }
-
-        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]

From b1b2e961bc0027b6305751ad469bf60e69186ee2 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jul 2020 08:13:11 +0300
Subject: [PATCH 03659/10326] Update arrow colour on hover

---
 .../TestSceneCommentRepliesButton.cs          |  18 +--
 .../Comments/Buttons/CommentRepliesButton.cs  | 125 ++++++++++--------
 2 files changed, 70 insertions(+), 73 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
index b4f518a5d0..e62092a180 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
@@ -26,22 +26,10 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Spacing = new Vector2(0, 10),
                 Children = new Drawable[]
                 {
-                    new TestButton
-                    {
-                        Action = () => { }
-                    },
-                    new LoadRepliesButton
-                    {
-                        Action = () => { }
-                    },
-                    new ShowRepliesButton(1)
-                    {
-                        Action = () => { }
-                    },
+                    new TestButton(),
+                    new LoadRepliesButton(),
+                    new ShowRepliesButton(1),
                     new ShowRepliesButton(2)
-                    {
-                        Action = () => { }
-                    }
                 }
             };
         }
diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index 13924200c2..7ea256d113 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -1,100 +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 System.Collections.Generic;
+using System;
 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.Framework.Input.Events;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osuTK;
 
 namespace osu.Game.Overlays.Comments.Buttons
 {
-    public abstract class CommentRepliesButton : OsuHoverContainer
+    public abstract class CommentRepliesButton : CompositeDrawable
     {
-        protected override IEnumerable<Drawable> EffectTargets => new[] { background };
+        public Action Action { get; set; }
 
-        protected ChevronIcon Icon;
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
+        protected SpriteIcon Icon;
         private Box background;
 
-        public CommentRepliesButton()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             AutoSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            Add(new CircularContainer
+            InternalChildren = new Drawable[]
             {
-                AutoSizeAxes = Axes.Both,
-                Masking = true,
-                Children = new Drawable[]
+                new CircularContainer
                 {
-                    background = new Box
+                    AutoSizeAxes = Axes.Both,
+                    Masking = true,
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both
-                    },
-                    new Container
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Margin = new MarginPadding
+                        background = new Box
                         {
-                            Vertical = 5,
-                            Horizontal = 10,
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = colourProvider.Background2
                         },
-                        Child = new FillFlowContainer
+                        new Container
                         {
                             AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(15, 0),
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Children = new Drawable[]
+                            Margin = new MarginPadding
                             {
-                                new OsuSpriteText
+                                Vertical = 5,
+                                Horizontal = 10,
+                            },
+                            Child = new FillFlowContainer
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
+                                Spacing = new Vector2(15, 0),
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Children = new Drawable[]
                                 {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
-                                    Text = GetText()
-                                },
-                                Icon = new ChevronIcon
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
+                                    new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                                        Text = GetText()
+                                    },
+                                    Icon = new SpriteIcon
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Size = new Vector2(7.5f),
+                                        Icon = FontAwesome.Solid.ChevronDown,
+                                        Colour = colourProvider.Foreground1
+                                    }
                                 }
                             }
                         }
                     }
-                }
-            });
-
-            IdleColour = colourProvider.Background2;
-            HoverColour = colourProvider.Background1;
+                },
+                new HoverClickSounds(),
+            };
         }
 
         protected abstract string GetText();
 
-        protected class ChevronIcon : SpriteIcon
+        protected override bool OnHover(HoverEvent e)
         {
-            public ChevronIcon()
-            {
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-                Size = new Vector2(7.5f);
-                Icon = FontAwesome.Solid.ChevronDown;
-            }
+            base.OnHover(e);
+            background.FadeColour(colourProvider.Background1, 200, Easing.OutQuint);
+            Icon.FadeColour(colourProvider.Light1, 200, Easing.OutQuint);
+            return true;
+        }
 
-            [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider)
-            {
-                Colour = colourProvider.Foreground1;
-            }
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint);
+            Icon.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
+        }
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            Action?.Invoke();
+            return base.OnClick(e);
         }
     }
 }

From 84392d0d130242616ded329ac711355bbc7c8c0c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jul 2020 08:50:35 +0300
Subject: [PATCH 03660/10326] Add loading spinner

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 7bd5e22038..fef8194712 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -22,6 +22,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using System.Collections.Specialized;
 using osu.Game.Overlays.Comments.Buttons;
+using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -51,6 +52,7 @@ namespace osu.Game.Overlays.Comments
         private ShowRepliesButton showRepliesButton;
         private ChevronButton chevronButton;
         private DeletedCommentsCounter deletedCommentsCounter;
+        private Loading loading;
 
         public DrawableComment(Comment comment)
         {
@@ -192,7 +194,12 @@ namespace osu.Game.Overlays.Comments
                                                         },
                                                         loadRepliesButton = new LoadRepliesButton
                                                         {
-                                                            Action = () => RepliesRequested(this, ++currentPage)
+                                                            Action = () =>
+                                                            {
+                                                                RepliesRequested(this, ++currentPage);
+                                                                loadRepliesButton.Hide();
+                                                                loading.Show();
+                                                            }
                                                         }
                                                     }
                                                 }
@@ -202,6 +209,11 @@ namespace osu.Game.Overlays.Comments
                                 }
                             }
                         },
+                        loading = new Loading
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y
+                        },
                         childCommentsVisibilityContainer = new FillFlowContainer
                         {
                             RelativeSizeAxes = Axes.X,
@@ -355,8 +367,7 @@ namespace osu.Game.Overlays.Comments
                 chevronButton.FadeTo(loadedReplesCount != 0 ? 1 : 0);
 
             showMoreButton.IsLoading = false;
-
-            //loadRepliesButton.IsLoading = false;
+            loading.Hide();
         }
 
         private class ChevronButton : ShowChildrenButton
@@ -427,5 +438,31 @@ namespace osu.Game.Overlays.Comments
                 return parentComment.HasMessage ? parentComment.Message : parentComment.IsDeleted ? @"deleted" : string.Empty;
             }
         }
+
+        private class Loading : Container
+        {
+            private readonly LoadingSpinner loading;
+
+            public Loading()
+            {
+                Child = loading = new LoadingSpinner
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Size = new Vector2(15),
+                    Margin = new MarginPadding
+                    {
+                        Vertical = 5,
+                        Left = 80
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                loading.Show();
+            }
+        }
     }
 }

From 024ccc75eefcec4e62b5a6a79d658df8a421657b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 11 Jul 2020 09:03:03 +0300
Subject: [PATCH 03661/10326] Adjust margins/paddings

---
 osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs | 4 ++++
 osu.Game/Overlays/Comments/DrawableComment.cs              | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index 7ea256d113..f4bab3d9d7 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -29,6 +29,10 @@ namespace osu.Game.Overlays.Comments.Buttons
         private void load()
         {
             AutoSizeAxes = Axes.Both;
+            Margin = new MarginPadding
+            {
+                Vertical = 2
+            };
             InternalChildren = new Drawable[]
             {
                 new CircularContainer
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index fef8194712..813540b28d 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Overlays.Comments
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
-                            Padding = new MarginPadding(margin) { Left = margin + 5 },
+                            Padding = new MarginPadding(margin) { Left = margin + 5, Top = Comment.IsTopLevel ? 10 : 0 },
                             Child = content = new GridContainer
                             {
                                 RelativeSizeAxes = Axes.X,

From acfb6eecc65b5a3b66af8f44d155178f7b0cbcf7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 11 Jul 2020 20:17:40 +0900
Subject: [PATCH 03662/10326] Fix bonus judgements being required toward HP

---
 .../TestSceneDrainingHealthProcessor.cs       | 37 ++++++++++++++++++-
 .../Scoring/DrainingHealthProcessor.cs        |  4 +-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
index e50b2231bf..460ad1b898 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
@@ -157,6 +157,24 @@ namespace osu.Game.Tests.Gameplay
             assertHealthNotEqualTo(1);
         }
 
+        [Test]
+        public void TestBonusObjectsExcludedFromDrain()
+        {
+            var beatmap = new Beatmap
+            {
+                BeatmapInfo = { BaseDifficulty = { DrainRate = 10 } },
+            };
+
+            beatmap.HitObjects.Add(new JudgeableHitObject { StartTime = 0 });
+            for (double time = 0; time < 5000; time += 100)
+                beatmap.HitObjects.Add(new JudgeableHitObject(false) { StartTime = time });
+            beatmap.HitObjects.Add(new JudgeableHitObject { StartTime = 5000 });
+
+            createProcessor(beatmap);
+            setTime(4900); // Get close to the second combo-affecting object
+            assertHealthNotEqualTo(0);
+        }
+
         private Beatmap createBeatmap(double startTime, double endTime, params BreakPeriod[] breaks)
         {
             var beatmap = new Beatmap
@@ -197,8 +215,25 @@ namespace osu.Game.Tests.Gameplay
 
         private class JudgeableHitObject : HitObject
         {
-            public override Judgement CreateJudgement() => new Judgement();
+            private readonly bool affectsCombo;
+
+            public JudgeableHitObject(bool affectsCombo = true)
+            {
+                this.affectsCombo = affectsCombo;
+            }
+
+            public override Judgement CreateJudgement() => new TestJudgement(affectsCombo);
             protected override HitWindows CreateHitWindows() => new HitWindows();
+
+            private class TestJudgement : Judgement
+            {
+                public override bool AffectsCombo { get; }
+
+                public TestJudgement(bool affectsCombo)
+                {
+                    AffectsCombo = affectsCombo;
+                }
+            }
         }
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index ef341575fa..130907b242 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -114,7 +114,9 @@ namespace osu.Game.Rulesets.Scoring
         protected override void ApplyResultInternal(JudgementResult result)
         {
             base.ApplyResultInternal(result);
-            healthIncreases.Add((result.HitObject.GetEndTime() + result.TimeOffset, GetHealthIncreaseFor(result)));
+
+            if (!result.Judgement.IsBonus)
+                healthIncreases.Add((result.HitObject.GetEndTime() + result.TimeOffset, GetHealthIncreaseFor(result)));
         }
 
         protected override void Reset(bool storeResults)

From ede4235884d852989275ba305411991dc7a3806e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 11 Jul 2020 20:33:42 +0900
Subject: [PATCH 03663/10326] Increase HP gain of bananas

---
 osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs
index fc030877f1..a7449ba4e1 100644
--- a/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs
+++ b/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
                     return 0;
 
                 case HitResult.Perfect:
-                    return 0.01;
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.75;
             }
         }
 

From 2bb0283a6855c10599e58f97eea8ca6484553a8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Jul 2020 00:52:55 +0900
Subject: [PATCH 03664/10326] Clean up HitEvents after use to avoid
 near-permanent memory retention

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

From 9b4bed2ab223e8e81aafc49d9ee0d9012aa0e740 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 11 Jul 2020 16:02:47 -0700
Subject: [PATCH 03665/10326] Add ability to select mods from a specific score

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 13 +++++++++++++
 osu.Game/Overlays/Mods/ModSection.cs             |  2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs       |  6 +++---
 osu.Game/Screens/Select/SongSelect.cs            |  2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 1469f29874..c1771fbf3d 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -58,6 +58,9 @@ namespace osu.Game.Online.Leaderboards
         [Resolved(CanBeNull = true)]
         private DialogOverlay dialogOverlay { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private SongSelect songSelect { get; set; }
+
         public LeaderboardScore(ScoreInfo score, int? rank, bool allowHighlight = true)
         {
             this.score = score;
@@ -373,11 +376,21 @@ namespace osu.Game.Online.Leaderboards
             {
                 List<MenuItem> items = new List<MenuItem>();
 
+                if (score.Mods.Length > 0 && modsContainer.Any(s => s.IsHovered))
+                    items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, () => getMods()));
+
                 if (score.ID != 0)
                     items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(score))));
 
                 return items.ToArray();
             }
         }
+
+        private void getMods()
+        {
+            songSelect.ModSelect.DeselectAll(true);
+
+            songSelect.Mods.Value = score.Mods;
+        }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 7235a18a23..45fae90a1e 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
-        public void DeselectAll() => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
+        public void DeselectAll(bool immediate = false) => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null), immediate);
 
         /// <summary>
         /// Deselect one or more mods in this section.
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 3d0ad1a594..d83dd77401 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Overlays.Mods
                                             {
                                                 Width = 180,
                                                 Text = "Deselect All",
-                                                Action = DeselectAll,
+                                                Action = () => DeselectAll(),
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
@@ -328,10 +328,10 @@ namespace osu.Game.Overlays.Mods
             sampleOff = audio.Samples.Get(@"UI/check-off");
         }
 
-        public void DeselectAll()
+        public void DeselectAll(bool immediate = false)
         {
             foreach (var section in ModSectionsContainer.Children)
-                section.DeselectAll();
+                section.DeselectAll(immediate);
 
             refreshSelectedMods();
         }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index e3705b15fa..23fa3cd724 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        protected ModSelectOverlay ModSelect { get; private set; }
+        public ModSelectOverlay ModSelect { get; private set; }
 
         protected SampleChannel SampleConfirm { get; private set; }
 

From 0d26ad9ddb11c46e64377eadec5fded63de37a9a Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 11 Jul 2020 16:22:01 -0700
Subject: [PATCH 03666/10326] Fix user top score not having a context menu

---
 osu.Game/Online/Leaderboards/Leaderboard.cs | 38 ++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index e2a817aaff..d51bf963fc 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -170,36 +170,36 @@ namespace osu.Game.Online.Leaderboards
         {
             InternalChildren = new Drawable[]
             {
-                new GridContainer
+                new OsuContextMenuContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    RowDimensions = new[]
+                    Child = new GridContainer
                     {
-                        new Dimension(),
-                        new Dimension(GridSizeMode.AutoSize),
-                    },
-                    Content = new[]
-                    {
-                        new Drawable[]
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
                         {
-                            new OsuContextMenuContainer
+                            new Dimension(),
+                            new Dimension(GridSizeMode.AutoSize),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Child = scrollContainer = new OsuScrollContainer
+                                scrollContainer = new OsuScrollContainer
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     ScrollbarVisible = false,
                                 }
+                            },
+                            new Drawable[]
+                            {
+                                content = new Container
+                                {
+                                    AutoSizeAxes = Axes.Y,
+                                    RelativeSizeAxes = Axes.X,
+                                },
                             }
                         },
-                        new Drawable[]
-                        {
-                            content = new Container
-                            {
-                                AutoSizeAxes = Axes.Y,
-                                RelativeSizeAxes = Axes.X,
-                            },
-                        }
                     },
                 },
                 loading = new LoadingSpinner(),

From 25d2d9ba5c19252574371d41f3699edd7ec27a33 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 11 Jul 2020 16:24:57 -0700
Subject: [PATCH 03667/10326] Convert getMods reference to method group

---
 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 c1771fbf3d..7203683711 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -377,7 +377,7 @@ namespace osu.Game.Online.Leaderboards
                 List<MenuItem> items = new List<MenuItem>();
 
                 if (score.Mods.Length > 0 && modsContainer.Any(s => s.IsHovered))
-                    items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, () => getMods()));
+                    items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, getMods));
 
                 if (score.ID != 0)
                     items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(score))));

From 4d7dc9f5eb9e0cd2e34b4ecc7296b59c081d1beb Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 11 Jul 2020 18:27:47 -0700
Subject: [PATCH 03668/10326] Fix color and underline of tab control checkboxes
 when initially checked

---
 .../Graphics/UserInterface/OsuTabControlCheckbox.cs  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
index 544acc7eb2..b9afc2fa1f 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
@@ -32,12 +32,6 @@ namespace osu.Game.Graphics.UserInterface
             {
                 accentColour = value;
 
-                if (Current.Value)
-                {
-                    text.Colour = AccentColour;
-                    icon.Colour = AccentColour;
-                }
-
                 updateFade();
             }
         }
@@ -89,6 +83,8 @@ namespace osu.Game.Graphics.UserInterface
             {
                 icon.Icon = selected.NewValue ? FontAwesome.Regular.CheckCircle : FontAwesome.Regular.Circle;
                 text.Font = text.Font.With(weight: selected.NewValue ? FontWeight.Bold : FontWeight.Medium);
+
+                updateFade();
             };
         }
 
@@ -115,8 +111,8 @@ namespace osu.Game.Graphics.UserInterface
 
         private void updateFade()
         {
-            box.FadeTo(IsHovered ? 1 : 0, transition_length, Easing.OutQuint);
-            text.FadeColour(IsHovered ? Color4.White : AccentColour, transition_length, Easing.OutQuint);
+            box.FadeTo(Current.Value || IsHovered ? 1 : 0, transition_length, Easing.OutQuint);
+            text.FadeColour(Current.Value || IsHovered ? Color4.White : AccentColour, transition_length, Easing.OutQuint);
         }
     }
 }

From 681f0015255c0b269a305d6aff3308e3da9c6ab0 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 11 Jul 2020 19:19:34 -0700
Subject: [PATCH 03669/10326] Convert icon to local variable

---
 osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
index b9afc2fa1f..bdc95ee048 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
@@ -21,7 +21,6 @@ namespace osu.Game.Graphics.UserInterface
     {
         private readonly Box box;
         private readonly SpriteText text;
-        private readonly SpriteIcon icon;
 
         private Color4? accentColour;
 
@@ -46,6 +45,8 @@ namespace osu.Game.Graphics.UserInterface
 
         public OsuTabControlCheckbox()
         {
+            SpriteIcon icon;
+
             AutoSizeAxes = Axes.Both;
 
             Children = new Drawable[]

From da40f29b4405990a3db8150fbd0fafa4f34f9f83 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 12 Jul 2020 12:27:26 +0300
Subject: [PATCH 03670/10326] Make button text a property

---
 .../TestSceneCommentRepliesButton.cs          |  5 ++-
 .../Comments/Buttons/CommentRepliesButton.cs  | 32 ++++++++++++-------
 .../Comments/Buttons/LoadRepliesButton.cs     |  5 ++-
 .../Comments/Buttons/ShowRepliesButton.cs     |  6 +---
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
index e62092a180..baeb1ae822 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
@@ -36,7 +36,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestButton : CommentRepliesButton
         {
-            protected override string GetText() => "sample text";
+            public TestButton()
+            {
+                Text = "sample text";
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index f4bab3d9d7..1121ac5327 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -19,14 +19,20 @@ namespace osu.Game.Overlays.Comments.Buttons
     {
         public Action Action { get; set; }
 
+        protected string Text
+        {
+            get => text.Text;
+            set => text.Text = value;
+        }
+
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        protected SpriteIcon Icon;
-        private Box background;
+        protected readonly SpriteIcon Icon;
+        private readonly Box background;
+        private readonly OsuSpriteText text;
 
-        [BackgroundDependencyLoader]
-        private void load()
+        public CommentRepliesButton()
         {
             AutoSizeAxes = Axes.Both;
             Margin = new MarginPadding
@@ -43,8 +49,7 @@ namespace osu.Game.Overlays.Comments.Buttons
                     {
                         background = new Box
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = colourProvider.Background2
+                            RelativeSizeAxes = Axes.Both
                         },
                         new Container
                         {
@@ -63,20 +68,18 @@ namespace osu.Game.Overlays.Comments.Buttons
                                 Origin = Anchor.Centre,
                                 Children = new Drawable[]
                                 {
-                                    new OsuSpriteText
+                                    text = new OsuSpriteText
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
-                                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
-                                        Text = GetText()
+                                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
                                     },
                                     Icon = new SpriteIcon
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
                                         Size = new Vector2(7.5f),
-                                        Icon = FontAwesome.Solid.ChevronDown,
-                                        Colour = colourProvider.Foreground1
+                                        Icon = FontAwesome.Solid.ChevronDown
                                     }
                                 }
                             }
@@ -87,7 +90,12 @@ namespace osu.Game.Overlays.Comments.Buttons
             };
         }
 
-        protected abstract string GetText();
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            background.Colour = colourProvider.Background2;
+            Icon.Colour = colourProvider.Foreground1;
+        }
 
         protected override bool OnHover(HoverEvent e)
         {
diff --git a/osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.cs
index 41cce72272..9387c95758 100644
--- a/osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.cs
@@ -5,6 +5,9 @@ namespace osu.Game.Overlays.Comments.Buttons
 {
     public class LoadRepliesButton : CommentRepliesButton
     {
-        protected override string GetText() => "load replies";
+        public LoadRepliesButton()
+        {
+            Text = "load replies";
+        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
index 2381727431..01c2e8a7a7 100644
--- a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
@@ -13,11 +13,9 @@ namespace osu.Game.Overlays.Comments.Buttons
     {
         public readonly BindableBool Expanded = new BindableBool(true);
 
-        private readonly int count;
-
         public ShowRepliesButton(int count)
         {
-            this.count = count;
+            Text = "reply".ToQuantity(count);
         }
 
         protected override void LoadComplete()
@@ -36,7 +34,5 @@ namespace osu.Game.Overlays.Comments.Buttons
             Expanded.Toggle();
             return base.OnClick(e);
         }
-
-        protected override string GetText() => "reply".ToQuantity(count);
     }
 }

From c3524cbe57f60e826df8b12fdcdf5bb178497b80 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 12 Jul 2020 12:32:26 +0300
Subject: [PATCH 03671/10326] Make icon private but expose a protected method

---
 .../Comments/Buttons/CommentRepliesButton.cs         | 12 +++++++-----
 .../Overlays/Comments/Buttons/ShowRepliesButton.cs   |  9 +--------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index 1121ac5327..dd02a35a06 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        protected readonly SpriteIcon Icon;
+        private readonly SpriteIcon icon;
         private readonly Box background;
         private readonly OsuSpriteText text;
 
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays.Comments.Buttons
                                         Origin = Anchor.CentreLeft,
                                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
                                     },
-                                    Icon = new SpriteIcon
+                                    icon = new SpriteIcon
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
@@ -94,14 +94,16 @@ namespace osu.Game.Overlays.Comments.Buttons
         private void load()
         {
             background.Colour = colourProvider.Background2;
-            Icon.Colour = colourProvider.Foreground1;
+            icon.Colour = colourProvider.Foreground1;
         }
 
+        protected void ToggleIcon(bool upwards) => icon.ScaleTo(new Vector2(1, upwards ? -1 : 1));
+
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
             background.FadeColour(colourProvider.Background1, 200, Easing.OutQuint);
-            Icon.FadeColour(colourProvider.Light1, 200, Easing.OutQuint);
+            icon.FadeColour(colourProvider.Light1, 200, Easing.OutQuint);
             return true;
         }
 
@@ -109,7 +111,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         {
             base.OnHoverLost(e);
             background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint);
-            Icon.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
+            icon.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
         }
 
         protected override bool OnClick(ClickEvent e)
diff --git a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
index 01c2e8a7a7..118cac5b4c 100644
--- a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
@@ -3,9 +3,7 @@
 
 using Humanizer;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
-using osuTK;
 
 namespace osu.Game.Overlays.Comments.Buttons
 {
@@ -21,12 +19,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Expanded.BindValueChanged(onExpandedChanged, true);
-        }
-
-        private void onExpandedChanged(ValueChangedEvent<bool> expanded)
-        {
-            Icon.ScaleTo(new Vector2(1, expanded.NewValue ? -1 : 1));
+            Expanded.BindValueChanged(expanded => ToggleIcon(expanded.NewValue), true);
         }
 
         protected override bool OnClick(ClickEvent e)

From be36a4b7686a120641a7ec29f727a2898dd54053 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 12 Jul 2020 12:39:48 +0300
Subject: [PATCH 03672/10326] Make ctor protected

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

diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index dd02a35a06..65648f6751 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         private readonly Box background;
         private readonly OsuSpriteText text;
 
-        public CommentRepliesButton()
+        protected CommentRepliesButton()
         {
             AutoSizeAxes = Axes.Both;
             Margin = new MarginPadding

From c9d21894e5aeba8e2ddbf7c97779584bbc95ac93 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 12 Jul 2020 13:19:28 +0300
Subject: [PATCH 03673/10326] Add test for icon toggle

---
 .../TestSceneCommentRepliesButton.cs          | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
index baeb1ae822..73fe66d6eb 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
@@ -7,6 +7,9 @@ using osu.Framework.Allocation;
 using osu.Game.Overlays;
 using osu.Framework.Graphics.Containers;
 using osuTK;
+using NUnit.Framework;
+using System.Linq;
+using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -15,6 +18,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
+        private readonly TestButton button;
+
         public TestSceneCommentRepliesButton()
         {
             Child = new FillFlowContainer
@@ -26,7 +31,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Spacing = new Vector2(0, 10),
                 Children = new Drawable[]
                 {
-                    new TestButton(),
+                    button = new TestButton(),
                     new LoadRepliesButton(),
                     new ShowRepliesButton(1),
                     new ShowRepliesButton(2)
@@ -34,12 +39,25 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
         }
 
+        [Test]
+        public void TestArrowRotation()
+        {
+            AddStep("Toggle icon up", () => button.ToggleIcon(true));
+            AddAssert("Icon facing upwards", () => button.Icon.Scale.Y == -1);
+            AddStep("Toggle icon down", () => button.ToggleIcon(false));
+            AddAssert("Icon facing downwards", () => button.Icon.Scale.Y == 1);
+        }
+
         private class TestButton : CommentRepliesButton
         {
+            public SpriteIcon Icon => InternalChildren.OfType<CircularContainer>().First().Children.OfType<Container>().First().Children.OfType<FillFlowContainer>().First().Children.OfType<SpriteIcon>().First();
+
             public TestButton()
             {
                 Text = "sample text";
             }
+
+            public new void ToggleIcon(bool upwards) => base.ToggleIcon(upwards);
         }
     }
 }

From 0d6dbb652315f7f8e341ddf2478617308e3ac59f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 12 Jul 2020 13:36:42 +0300
Subject: [PATCH 03674/10326] Clean up exposed icon for tests

---
 .../Visual/UserInterface/TestSceneCommentRepliesButton.cs      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
index 73fe66d6eb..7f5806705e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
@@ -10,6 +10,7 @@ using osuTK;
 using NUnit.Framework;
 using System.Linq;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Testing;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -50,7 +51,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestButton : CommentRepliesButton
         {
-            public SpriteIcon Icon => InternalChildren.OfType<CircularContainer>().First().Children.OfType<Container>().First().Children.OfType<FillFlowContainer>().First().Children.OfType<SpriteIcon>().First();
+            public SpriteIcon Icon => this.ChildrenOfType<SpriteIcon>().First();
 
             public TestButton()
             {

From d18609e9003548a2f21af720d3c3357708bdc6f7 Mon Sep 17 00:00:00 2001
From: vntxx <38376434+vntxx@users.noreply.github.com>
Date: Fri, 10 Jul 2020 21:05:23 +0200
Subject: [PATCH 03675/10326] Added notifications keybinding

Implementation of #9502
---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 4 ++++
 osu.Game/OsuGame.cs                              | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 618798a6d8..8a5acbadbc 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.T }, GlobalAction.ToggleToolbar),
             new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleDirect),
+            new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
@@ -157,5 +158,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Home")]
         Home,
+
+        [Description("Toggle notifications")]
+        ToggleNotifications
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 92233f143d..47a7c2ae11 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -890,6 +890,10 @@ namespace osu.Game
                     beatmapListing.ToggleVisibility();
                     return true;
 
+                case GlobalAction.ToggleNotifications:
+                    notifications.ToggleVisibility();
+                    return true;
+
                 case GlobalAction.ToggleGameplayMouseButtons:
                     LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
                     return true;

From 0e49bf127ba527d1cccf1a6d536d56e966661a1d Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Sun, 12 Jul 2020 13:57:06 +0200
Subject: [PATCH 03676/10326] wrap HitObjectContainer in BufferedContainer

---
 osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
index ba5281a1a2..5eccb891cc 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -17,9 +18,10 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 
         public HitObjectArea(HitObjectContainer hitObjectContainer)
         {
-            InternalChildren = new[]
+            InternalChild = new BufferedContainer
             {
-                hitObjectContainer,
+                RelativeSizeAxes = Axes.Both,
+                Child = hitObjectContainer
             };
         }
 

From 06ed5316c4a723cf98815d4fcc49bae0b40a2c9e Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Sun, 12 Jul 2020 13:57:36 +0200
Subject: [PATCH 03677/10326] expose hitObectArea in Column

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 511d6c8623..d69858c41c 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public readonly Bindable<ManiaAction> Action = new Bindable<ManiaAction>();
 
-        private readonly ColumnHitObjectArea hitObjectArea;
+        public readonly ColumnHitObjectArea hitObjectArea;
 
         internal readonly Container TopLevelContainer;
 

From 1cf8b599a1f6e52d6453a43e727f13c9d40e63ca Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Sun, 12 Jul 2020 13:57:44 +0200
Subject: [PATCH 03678/10326] implement fadein

---
 .../Mods/ManiaModFadeIn.cs                    | 93 ++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index 4c125ad6ef..d2b1307585 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -2,14 +2,24 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
+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.Testing;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModFadeIn : Mod
+    public class ManiaModFadeIn : Mod, IApplicableToDrawableRuleset<ManiaHitObject>
     {
         public override string Name => "Fade In";
         public override string Acronym => "FI";
@@ -19,5 +29,86 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
+
+        private const float lanecover_size_filled = 0.5f;
+        private const float lanecover_size_gradient = 0.25f;
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
+        {
+            ManiaPlayfield maniaPlayfield = (ManiaPlayfield)drawableRuleset.Playfield;
+
+            foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
+            {
+                column.hitObjectArea.ChildrenOfType<BufferedContainer>().First().Add(new LaneCover(false)
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    SizeFilled = lanecover_size_filled,
+                    SizeGradient = lanecover_size_gradient
+                });
+            }
+        }
+
+        private class LaneCover : CompositeDrawable
+        {
+            private readonly Box gradient;
+            private readonly Box filled;
+            private readonly bool reversed;
+
+            public LaneCover(bool reversed)
+            {
+                Blending = new BlendingParameters
+                {
+                    RGBEquation = BlendingEquation.Add,
+                    Source = BlendingType.Zero,
+                    Destination = BlendingType.One,
+                    AlphaEquation = BlendingEquation.Add,
+                    SourceAlpha = BlendingType.Zero,
+                    DestinationAlpha = BlendingType.OneMinusSrcAlpha
+                };
+
+                InternalChildren = new Drawable[]
+                {
+                    gradient = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        RelativePositionAxes = Axes.Both,
+                        Colour = ColourInfo.GradientVertical(Color4.White.Opacity(1f), Color4.White.Opacity(0f))
+                    },
+                    filled = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    }
+                };
+
+                if (reversed)
+                {
+                    gradient.Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0f), Color4.White.Opacity(1f));
+                    filled.Anchor = Anchor.BottomLeft;
+                    filled.Origin = Anchor.BottomLeft;
+                }
+
+                this.reversed = reversed;
+            }
+
+            public float SizeFilled
+            {
+                set
+                {
+                    filled.Height = value;
+                    if (!reversed)
+                        gradient.Y = value;
+                }
+            }
+
+            public float SizeGradient
+            {
+                set
+                {
+                    gradient.Height = value;
+                    if (reversed)
+                        gradient.Y = 1 - value - filled.Height;
+                }
+            }
+        }
     }
 }

From 3606febe3184eb5b1ae8ee04041e89f9024da973 Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Sun, 12 Jul 2020 14:23:55 +0200
Subject: [PATCH 03679/10326] fix case convention violation

---
 osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs |  2 +-
 osu.Game.Rulesets.Mania/UI/Column.cs           | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index d2b1307585..f083d731c8 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Mania.Mods
 
             foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
             {
-                column.hitObjectArea.ChildrenOfType<BufferedContainer>().First().Add(new LaneCover(false)
+                column.HitObjectArea.ChildrenOfType<BufferedContainer>().First().Add(new LaneCover(false)
                 {
                     RelativeSizeAxes = Axes.Both,
                     SizeFilled = lanecover_size_filled,
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index d69858c41c..642353bd0b 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -33,11 +33,11 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public readonly Bindable<ManiaAction> Action = new Bindable<ManiaAction>();
 
-        public readonly ColumnHitObjectArea hitObjectArea;
+        public readonly ColumnHitObjectArea HitObjectArea;
 
         internal readonly Container TopLevelContainer;
 
-        public Container UnderlayElements => hitObjectArea.UnderlayElements;
+        public Container UnderlayElements => HitObjectArea.UnderlayElements;
 
         public Column(int index)
         {
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.UI
             {
                 // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
                 background.CreateProxy(),
-                hitObjectArea = new ColumnHitObjectArea(Index, HitObjectContainer) { RelativeSizeAxes = Axes.Both },
+                HitObjectArea = new ColumnHitObjectArea(Index, HitObjectContainer) { RelativeSizeAxes = Axes.Both },
                 new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea, Index), _ => new DefaultKeyArea())
                 {
                     RelativeSizeAxes = Axes.Both
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
             };
 
-            TopLevelContainer.Add(hitObjectArea.Explosions.CreateProxy());
+            TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
         }
 
         public override Axes RelativeSizeAxes => Axes.Y;
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 RelativeSizeAxes = Axes.Both
             };
 
-            hitObjectArea.Explosions.Add(explosion);
+            HitObjectArea.Explosions.Add(explosion);
 
             explosion.Delay(200).Expire(true);
         }

From 598e48678e2e143b6671a9cd2c9f55dad36f3bff Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 12 Jul 2020 15:45:48 +0300
Subject: [PATCH 03680/10326] Refactor NewsHeader

---
 osu.Game/Overlays/News/NewsHeader.cs | 54 ++++++++++++++--------------
 osu.Game/Overlays/NewsOverlay.cs     | 19 ++++++----
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index ee7991c0c6..ddada2bdaf 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.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.Bindables;
 using osu.Framework.Graphics;
 
@@ -8,41 +9,42 @@ namespace osu.Game.Overlays.News
 {
     public class NewsHeader : BreadcrumbControlOverlayHeader
     {
-        public const string FRONT_PAGE_STRING = "frontpage";
+        private const string front_page_string = "frontpage";
 
-        public readonly Bindable<string> Post = new Bindable<string>(FRONT_PAGE_STRING);
+        public Action ShowFrontPage;
+
+        private readonly Bindable<string> article = new Bindable<string>(null);
 
         public NewsHeader()
         {
-            TabControl.AddItem(FRONT_PAGE_STRING);
-            Current.Value = FRONT_PAGE_STRING;
-            Current.BindValueChanged(onCurrentChanged);
-            Post.BindValueChanged(onPostChanged, true);
-        }
+            TabControl.AddItem(front_page_string);
 
-        public void SetFrontPage() => Post.Value = FRONT_PAGE_STRING;
-
-        public void SetArticle(string slug) => Post.Value = slug;
-
-        private void onCurrentChanged(ValueChangedEvent<string> current)
-        {
-            if (current.NewValue == FRONT_PAGE_STRING)
-                Post.Value = FRONT_PAGE_STRING;
-        }
-
-        private void onPostChanged(ValueChangedEvent<string> post)
-        {
-            if (post.OldValue != FRONT_PAGE_STRING)
-                TabControl.RemoveItem(post.OldValue);
-
-            if (post.NewValue != FRONT_PAGE_STRING)
+            Current.BindValueChanged(e =>
             {
-                TabControl.AddItem(post.NewValue);
-                Current.Value = post.NewValue;
+                if (e.NewValue == front_page_string)
+                    ShowFrontPage?.Invoke();
+            });
+
+            article.BindValueChanged(onArticleChanged, true);
+        }
+
+        public void SetFrontPage() => article.Value = null;
+
+        public void SetArticle(string slug) => article.Value = slug;
+
+        private void onArticleChanged(ValueChangedEvent<string> e)
+        {
+            if (e.OldValue != null)
+                TabControl.RemoveItem(e.OldValue);
+
+            if (e.NewValue != null)
+            {
+                TabControl.AddItem(e.NewValue);
+                Current.Value = e.NewValue;
             }
             else
             {
-                Current.Value = FRONT_PAGE_STRING;
+                Current.Value = front_page_string;
             }
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index db989e71bf..a5687b77e2 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Overlays
 {
     public class NewsOverlay : FullscreenOverlay
     {
+        private readonly Bindable<string> article = new Bindable<string>(null);
+
         private Container content;
         private LoadingLayer loading;
         private NewsHeader header;
@@ -46,7 +48,10 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            header = new NewsHeader(),
+                            header = new NewsHeader
+                            {
+                                ShowFrontPage = ShowFrontPage
+                            },
                             content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,
@@ -62,34 +67,36 @@ namespace osu.Game.Overlays
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            header.Post.BindValueChanged(onPostChanged, true);
+            article.BindValueChanged(onArticleChanged, true);
         }
 
         public void ShowFrontPage()
         {
-            header.SetFrontPage();
+            article.Value = null;
             Show();
         }
 
         public void ShowArticle(string slug)
         {
-            header.SetArticle(slug);
+            article.Value = slug;
             Show();
         }
 
         private CancellationTokenSource cancellationToken;
 
-        private void onPostChanged(ValueChangedEvent<string> post)
+        private void onArticleChanged(ValueChangedEvent<string> e)
         {
             cancellationToken?.Cancel();
             loading.Show();
 
-            if (post.NewValue == NewsHeader.FRONT_PAGE_STRING)
+            if (e.NewValue == null)
             {
+                header.SetFrontPage();
                 LoadDisplay(new FrontPageDisplay());
                 return;
             }
 
+            header.SetArticle(e.NewValue);
             LoadDisplay(Empty());
         }
 

From bdf680aecbc2c81297fbd2fc5f9fcda993829799 Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Sun, 12 Jul 2020 14:53:40 +0200
Subject: [PATCH 03681/10326] inline single-use constants

---
 osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index f083d731c8..3777193f49 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -30,9 +30,6 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
 
-        private const float lanecover_size_filled = 0.5f;
-        private const float lanecover_size_gradient = 0.25f;
-
         public void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
         {
             ManiaPlayfield maniaPlayfield = (ManiaPlayfield)drawableRuleset.Playfield;
@@ -42,8 +39,8 @@ namespace osu.Game.Rulesets.Mania.Mods
                 column.HitObjectArea.ChildrenOfType<BufferedContainer>().First().Add(new LaneCover(false)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    SizeFilled = lanecover_size_filled,
-                    SizeGradient = lanecover_size_gradient
+                    SizeFilled = 0.5f,
+                    SizeGradient = 0.25f
                 });
             }
         }

From a72bb932661faa2442ceb9160d61b0d21e803790 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 12 Jul 2020 15:57:18 +0300
Subject: [PATCH 03682/10326] Add test scene for NewsHeader

---
 .../Visual/Online/TestSceneNewsHeader.cs      | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsHeader.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsHeader.cs
new file mode 100644
index 0000000000..65e86e925d
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsHeader.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 NUnit.Framework;
+using osu.Game.Overlays.News;
+using osu.Framework.Graphics;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsHeader : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private TestHeader header;
+
+        [SetUp]
+        public void Setup()
+        {
+            Child = header = new TestHeader
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            };
+        }
+
+        [Test]
+        public void TestControl()
+        {
+            AddAssert("Front page selected", () => header.Current.Value == "frontpage");
+            AddAssert("1 tab total", () => header.TabCount == 1);
+
+            AddStep("Set article 1", () => header.SetArticle("1"));
+            AddAssert("Article 1 selected", () => header.Current.Value == "1");
+            AddAssert("2 tabs total", () => header.TabCount == 2);
+
+            AddStep("Set article 2", () => header.SetArticle("2"));
+            AddAssert("Article 2 selected", () => header.Current.Value == "2");
+            AddAssert("2 tabs total", () => header.TabCount == 2);
+
+            AddStep("Set front page", () => header.SetFrontPage());
+            AddAssert("Front page selected", () => header.Current.Value == "frontpage");
+            AddAssert("1 tab total", () => header.TabCount == 1);
+        }
+
+        private class TestHeader : NewsHeader
+        {
+            public int TabCount => TabControl.Items.Count;
+        }
+    }
+}

From 444701fdd0c0903346177900acef014755da297f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 12 Jul 2020 16:13:48 +0300
Subject: [PATCH 03683/10326] Use dummy api for tests

---
 .../Visual/Online/TestSceneNewsHeader.cs      |  4 +-
 .../Visual/Online/TestSceneNewsOverlay.cs     | 64 +++++++++++++++----
 2 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsHeader.cs
index 65e86e925d..78288bf6e4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsHeader.cs
@@ -17,14 +17,14 @@ namespace osu.Game.Tests.Visual.Online
         private TestHeader header;
 
         [SetUp]
-        public void Setup()
+        public void Setup() => Schedule(() =>
         {
             Child = header = new TestHeader
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre
             };
-        }
+        });
 
         [Test]
         public void TestControl()
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index e35ef4916b..37d51c16d2 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -1,27 +1,65 @@
 // Copyright (c) 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.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 
 namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneNewsOverlay : OsuTestScene
     {
-        protected override bool UseOnlineAPI => true;
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
 
-        protected override void LoadComplete()
+        private NewsOverlay news;
+
+        [SetUp]
+        public void SetUp() => Schedule(() => Child = news = new NewsOverlay());
+
+        [Test]
+        public void TestRequest()
         {
-            base.LoadComplete();
-
-            NewsOverlay news;
-            Add(news = new NewsOverlay());
-
-            AddStep("Show", news.Show);
-            AddStep("Hide", news.Hide);
-
-            AddStep("Show front page", () => news.ShowFrontPage());
-            AddStep("Custom article", () => news.ShowArticle("Test Article 101"));
-            AddStep("Custom article", () => news.ShowArticle("Test Article 102"));
+            setUpNewsResponse(responseExample);
+            AddStep("Show", () => news.Show());
+            AddStep("Show article", () => news.ShowArticle("article"));
         }
+
+        private void setUpNewsResponse(GetNewsResponse r)
+            => AddStep("set up response", () =>
+            {
+                dummyAPI.HandleRequest = request =>
+                {
+                    if (!(request is GetNewsRequest getNewsRequest))
+                        return;
+
+                    getNewsRequest.TriggerSuccess(r);
+                };
+            });
+
+        private GetNewsResponse responseExample => new GetNewsResponse
+        {
+            NewsPosts = new[]
+            {
+                new APINewsPost
+                {
+                    Title = "This post has an image which starts with \"/\" and has many authors!",
+                    Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+                    Author = "someone, someone1, someone2, someone3, someone4",
+                    FirstImage = "/help/wiki/shared/news/banners/monthly-beatmapping-contest.png",
+                    PublishedAt = DateTimeOffset.Now
+                },
+                new APINewsPost
+                {
+                    Title = "This post has a full-url image! (HTML entity: &amp;)",
+                    Preview = "boom (HTML entity: &amp;)",
+                    Author = "user (HTML entity: &amp;)",
+                    FirstImage = "https://assets.ppy.sh/artists/88/header.jpg",
+                    PublishedAt = DateTimeOffset.Now
+                }
+            }
+        };
     }
 }

From ab11a112b7078c538e5b23d57603294a02c04749 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Jul 2020 22:21:16 +0900
Subject: [PATCH 03684/10326] Fix correct filter criteria not being applied to
 beatmap carousel if beatmaps take too long to load

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 29 ++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 6f913a3177..5a4160960a 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -95,7 +95,6 @@ namespace osu.Game.Screens.Select
             CarouselRoot newRoot = new CarouselRoot(this);
 
             beatmapSets.Select(createCarouselSet).Where(g => g != null).ForEach(newRoot.AddChild);
-            newRoot.Filter(activeCriteria);
 
             // preload drawables as the ctor overhead is quite high currently.
             _ = newRoot.Drawables;
@@ -108,6 +107,9 @@ namespace osu.Game.Screens.Select
             itemsCache.Invalidate();
             scrollPositionCache.Invalidate();
 
+            // the filter criteria may have changed since the above filter operation.
+            FlushPendingFilterOperations();
+
             // Run on late scheduler want to ensure this runs after all pending UpdateBeatmapSet / RemoveBeatmapSet operations are run.
             SchedulerAfterChildren.Add(() =>
             {
@@ -321,6 +323,9 @@ namespace osu.Game.Screens.Select
         /// <returns>True if a selection could be made, else False.</returns>
         public bool SelectNextRandom()
         {
+            if (!AllowSelection)
+                return false;
+
             var visibleSets = beatmapSets.Where(s => !s.Filtered.Value).ToList();
             if (!visibleSets.Any())
                 return false;
@@ -427,7 +432,19 @@ namespace osu.Game.Screens.Select
 
         private void applyActiveCriteria(bool debounce, bool alwaysResetScrollPosition = true)
         {
-            if (root.Children.Any() != true) return;
+            PendingFilter?.Cancel();
+            PendingFilter = null;
+
+            if (debounce)
+                PendingFilter = Scheduler.AddDelayed(perform, 250);
+            else
+            {
+                // if initial load is not yet finished, this will be run inline in loadBeatmapSets to ensure correct order of operation.
+                if (!BeatmapSetsLoaded)
+                    PendingFilter = Schedule(perform);
+                else
+                    perform();
+            }
 
             void perform()
             {
@@ -439,14 +456,6 @@ namespace osu.Game.Screens.Select
                 if (alwaysResetScrollPosition || !scroll.UserScrolling)
                     ScrollToSelected();
             }
-
-            PendingFilter?.Cancel();
-            PendingFilter = null;
-
-            if (debounce)
-                PendingFilter = Scheduler.AddDelayed(perform, 250);
-            else
-                perform();
         }
 
         private float? scrollTarget;

From 08696b9bca23ce188b3e6bb90fc1d11bc36cbdef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Jul 2020 23:03:03 +0900
Subject: [PATCH 03685/10326] Allow pausing gameplay via middle mouse button

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 4 ++++
 osu.Game/Screens/Play/HUD/HoldForMenuButton.cs   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 618798a6d8..567c81c018 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.Tilde }, GlobalAction.QuickExit),
             new KeyBinding(new[] { InputKey.Control, InputKey.Plus }, GlobalAction.IncreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.Control, InputKey.Minus }, GlobalAction.DecreaseScrollSpeed),
+            new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
         };
 
         public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
@@ -157,5 +158,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Home")]
         Home,
+
+        [Description("Pause")]
+        PauseGameplay,
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
index 684834123b..81ad29107f 100644
--- a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
+++ b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
@@ -251,6 +251,7 @@ namespace osu.Game.Screens.Play.HUD
                 switch (action)
                 {
                     case GlobalAction.Back:
+                    case GlobalAction.PauseGameplay:
                         if (!pendingAnimation)
                             BeginConfirm();
                         return true;

From c1aafe83fa042ac01e28631bf9bda2695a71a100 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Jul 2020 23:05:47 +0900
Subject: [PATCH 03686/10326] Add note about future behaviour

---
 osu.Game/Screens/Play/HUD/HoldForMenuButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
index 81ad29107f..74064c507f 100644
--- a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
+++ b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
@@ -251,7 +251,7 @@ namespace osu.Game.Screens.Play.HUD
                 switch (action)
                 {
                     case GlobalAction.Back:
-                    case GlobalAction.PauseGameplay:
+                    case GlobalAction.PauseGameplay: // in the future this behaviour will differ for replays etc.
                         if (!pendingAnimation)
                             BeginConfirm();
                         return true;

From 9c039848bc0fe48bae87214d6871c43c4b9a0a9c Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 12 Jul 2020 12:04:53 -0700
Subject: [PATCH 03687/10326] Simplify and add null check

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 5 ++---
 osu.Game/Overlays/Mods/ModSection.cs             | 2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs       | 6 +++---
 osu.Game/Screens/Select/SongSelect.cs            | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 7203683711..40323c325e 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -388,9 +388,8 @@ namespace osu.Game.Online.Leaderboards
 
         private void getMods()
         {
-            songSelect.ModSelect.DeselectAll(true);
-
-            songSelect.Mods.Value = score.Mods;
+            if (songSelect != null)
+                songSelect.Mods.Value = score.Mods;
         }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 45fae90a1e..7235a18a23 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
-        public void DeselectAll(bool immediate = false) => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null), immediate);
+        public void DeselectAll() => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
 
         /// <summary>
         /// Deselect one or more mods in this section.
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index d83dd77401..3d0ad1a594 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Overlays.Mods
                                             {
                                                 Width = 180,
                                                 Text = "Deselect All",
-                                                Action = () => DeselectAll(),
+                                                Action = DeselectAll,
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
@@ -328,10 +328,10 @@ namespace osu.Game.Overlays.Mods
             sampleOff = audio.Samples.Get(@"UI/check-off");
         }
 
-        public void DeselectAll(bool immediate = false)
+        public void DeselectAll()
         {
             foreach (var section in ModSectionsContainer.Children)
-                section.DeselectAll(immediate);
+                section.DeselectAll();
 
             refreshSelectedMods();
         }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 23fa3cd724..e3705b15fa 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        public ModSelectOverlay ModSelect { get; private set; }
+        protected ModSelectOverlay ModSelect { get; private set; }
 
         protected SampleChannel SampleConfirm { get; private set; }
 

From 6eec2f9429bd3548d20a1c3bb1b0d21119b77db0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 13 Jul 2020 01:22:05 +0300
Subject: [PATCH 03688/10326] Implement RankingsSortTabControl component

---
 .../TestSceneRankingsSortTabControl.cs        | 25 +++++++++++++++++++
 osu.Game/Overlays/Comments/CommentsHeader.cs  |  2 +-
 osu.Game/Overlays/OverlaySortTabControl.cs    | 16 +++++++++---
 .../Rankings/RankingsSortTabControl.cs        | 19 ++++++++++++++
 4 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneRankingsSortTabControl.cs
 create mode 100644 osu.Game/Overlays/Rankings/RankingsSortTabControl.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRankingsSortTabControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRankingsSortTabControl.cs
new file mode 100644
index 0000000000..24bc0dbc97
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRankingsSortTabControl.cs
@@ -0,0 +1,25 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Rankings;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneRankingsSortTabControl : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
+        public TestSceneRankingsSortTabControl()
+        {
+            Child = new RankingsSortTabControl
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Comments/CommentsHeader.cs b/osu.Game/Overlays/Comments/CommentsHeader.cs
index 83f44ccd80..0dd68bbd41 100644
--- a/osu.Game/Overlays/Comments/CommentsHeader.cs
+++ b/osu.Game/Overlays/Comments/CommentsHeader.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Comments
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Font = OsuFont.GetFont(size: 12),
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                             Text = @"Show deleted"
                         }
                     },
diff --git a/osu.Game/Overlays/OverlaySortTabControl.cs b/osu.Game/Overlays/OverlaySortTabControl.cs
index 395f3aec4c..b2212336ef 100644
--- a/osu.Game/Overlays/OverlaySortTabControl.cs
+++ b/osu.Game/Overlays/OverlaySortTabControl.cs
@@ -30,6 +30,14 @@ namespace osu.Game.Overlays
             set => current.Current = value;
         }
 
+        public string Title
+        {
+            get => text.Text;
+            set => text.Text = value;
+        }
+
+        private readonly OsuSpriteText text;
+
         public OverlaySortTabControl()
         {
             AutoSizeAxes = Axes.Both;
@@ -40,11 +48,11 @@ namespace osu.Game.Overlays
                 Spacing = new Vector2(10, 0),
                 Children = new Drawable[]
                 {
-                    new OsuSpriteText
+                    text = new OsuSpriteText
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Font = OsuFont.GetFont(size: 12),
+                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                         Text = @"Sort by"
                     },
                     CreateControl().With(c =>
@@ -133,7 +141,7 @@ namespace osu.Game.Overlays
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Font = OsuFont.GetFont(size: 12),
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                             Text = (value as Enum)?.GetDescription() ?? value.ToString()
                         }
                     }
@@ -163,7 +171,7 @@ namespace osu.Game.Overlays
 
                 ContentColour = Active.Value && !IsHovered ? colourProvider.Light1 : Color4.White;
 
-                text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
+                text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.SemiBold);
             }
         }
     }
diff --git a/osu.Game/Overlays/Rankings/RankingsSortTabControl.cs b/osu.Game/Overlays/Rankings/RankingsSortTabControl.cs
new file mode 100644
index 0000000000..c0bbf46e30
--- /dev/null
+++ b/osu.Game/Overlays/Rankings/RankingsSortTabControl.cs
@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Overlays.Rankings
+{
+    public class RankingsSortTabControl : OverlaySortTabControl<RankingsSortCriteria>
+    {
+        public RankingsSortTabControl()
+        {
+            Title = "Show";
+        }
+    }
+
+    public enum RankingsSortCriteria
+    {
+        All,
+        Friends
+    }
+}

From f442df75a9bf16d463a898bc67f15acb539960dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Jul 2020 09:00:10 +0900
Subject: [PATCH 03689/10326] Add missing released conditional

---
 osu.Game/Screens/Play/HUD/HoldForMenuButton.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
index 74064c507f..387c0e587b 100644
--- a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
+++ b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
@@ -265,6 +265,7 @@ namespace osu.Game.Screens.Play.HUD
                 switch (action)
                 {
                     case GlobalAction.Back:
+                    case GlobalAction.PauseGameplay:
                         AbortConfirm();
                         break;
                 }

From 0718e9e4b64fceae400129de0a3a6a6ae5627f37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Jul 2020 13:08:41 +0900
Subject: [PATCH 03690/10326] Update outdated comment

---
 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 5a4160960a..5f6f859d66 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Select
             itemsCache.Invalidate();
             scrollPositionCache.Invalidate();
 
-            // the filter criteria may have changed since the above filter operation.
+            // apply any pending filter operation that may have been delayed (see applyActiveCriteria's scheduling behaviour when BeatmapSetsLoaded is false).
             FlushPendingFilterOperations();
 
             // Run on late scheduler want to ensure this runs after all pending UpdateBeatmapSet / RemoveBeatmapSet operations are run.

From ac7252e152ce53b7d0f77654c4159193e4872d87 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 12 Jul 2020 22:04:00 -0700
Subject: [PATCH 03691/10326] Fix context menu not masking outside of
 leaderboard area

---
 osu.Game/Online/Leaderboards/Leaderboard.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index d51bf963fc..800029ceb9 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -173,6 +173,7 @@ namespace osu.Game.Online.Leaderboards
                 new OsuContextMenuContainer
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Masking = true,
                     Child = new GridContainer
                     {
                         RelativeSizeAxes = Axes.Both,

From db6a9c97172ec8418633f62fe2e8ebcc901b6605 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 12 Jul 2020 22:06:17 -0700
Subject: [PATCH 03692/10326] Move null check to menu item addition

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 40323c325e..b60d71cfe7 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -376,8 +376,8 @@ namespace osu.Game.Online.Leaderboards
             {
                 List<MenuItem> items = new List<MenuItem>();
 
-                if (score.Mods.Length > 0 && modsContainer.Any(s => s.IsHovered))
-                    items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, getMods));
+                if (score.Mods.Length > 0 && modsContainer.Any(s => s.IsHovered) && songSelect != null)
+                    items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, () => songSelect.Mods.Value = score.Mods));
 
                 if (score.ID != 0)
                     items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(score))));
@@ -385,11 +385,5 @@ namespace osu.Game.Online.Leaderboards
                 return items.ToArray();
             }
         }
-
-        private void getMods()
-        {
-            if (songSelect != null)
-                songSelect.Mods.Value = score.Mods;
-        }
     }
 }

From 79ea6dbd5cad12e26310d4c9f1fce87b767daa71 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 12 Jul 2020 22:24:11 -0700
Subject: [PATCH 03693/10326] Only allow link clicking and tooltips of multi
 room drawables when selected

---
 osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index 3f5a2eb1d3..8dd1b239e8 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -219,6 +219,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                 Alpha = 0;
         }
 
+        protected override bool ShouldBeConsideredForInput(Drawable child) => state == SelectionState.Selected;
+
         private class RoomName : OsuSpriteText
         {
             [Resolved(typeof(Room), nameof(Online.Multiplayer.Room.Name))]

From 352f59942e5aff3523582893ebad5bd78349f5e9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Jul 2020 16:50:54 +0900
Subject: [PATCH 03694/10326] Fix incorrect time delta in taiko strain

---
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs
index c6fe273b50..99975d9174 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             double addition = 1;
 
             // We get an extra addition if we are not a slider or spinner
-            if (current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000)
+            if (current.LastObject is Hit && current.BaseObject is Hit && (current.BaseObject.StartTime - current.LastObject.StartTime) < 1000)
             {
                 if (hasColourChange(current))
                     addition += 0.75;

From 1116703e92c1a6ac82d4b63298780d5ea584ace8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Jul 2020 16:52:05 +0900
Subject: [PATCH 03695/10326] Fix potential out-of-order objects after
 conversion

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

diff --git a/osu.Game/Beatmaps/BeatmapConverter.cs b/osu.Game/Beatmaps/BeatmapConverter.cs
index 99e0bf4e33..11fee030f8 100644
--- a/osu.Game/Beatmaps/BeatmapConverter.cs
+++ b/osu.Game/Beatmaps/BeatmapConverter.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Beatmaps
 
             beatmap.BeatmapInfo = original.BeatmapInfo;
             beatmap.ControlPointInfo = original.ControlPointInfo;
-            beatmap.HitObjects = convertHitObjects(original.HitObjects, original);
+            beatmap.HitObjects = convertHitObjects(original.HitObjects, original).OrderBy(s => s.StartTime).ToList();
             beatmap.Breaks = original.Breaks;
 
             return beatmap;

From cd3500510e71ef1d7de641e648d1cb7b7e64eff5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Jul 2020 17:05:29 +0900
Subject: [PATCH 03696/10326] Fix carousel tests relying on initial selection
 being null

---
 .../SongSelect/TestSceneBeatmapCarousel.cs     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

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

From 0ea13dea55caca5ba2d52d330c889880c924c150 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Jul 2020 17:06:00 +0900
Subject: [PATCH 03697/10326] Introduce legacy timing point fp errors

---
 .../Beatmaps/TaikoBeatmapConverter.cs         | 79 +++++++++++--------
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  |  4 +-
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    | 13 ++-
 3 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 78550ed270..2a1aa5d1df 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Formats;
 
 namespace osu.Game.Rulesets.Taiko.Beatmaps
 {
@@ -82,37 +83,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             {
                 case IHasDistance distanceData:
                 {
-                    // Number of spans of the object - one for the initial length and for each repeat
-                    int spans = (obj as IHasRepeats)?.SpanCount() ?? 1;
-
-                    TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime);
-                    DifficultyControlPoint difficultyPoint = beatmap.ControlPointInfo.DifficultyPointAt(obj.StartTime);
-
-                    double speedAdjustment = difficultyPoint.SpeedMultiplier;
-                    double speedAdjustedBeatLength = timingPoint.BeatLength / speedAdjustment;
-
-                    // The true distance, accounting for any repeats. This ends up being the drum roll distance later
-                    double distance = distanceData.Distance * spans * LEGACY_VELOCITY_MULTIPLIER;
-
-                    // The velocity of the taiko hit object - calculated as the velocity of a drum roll
-                    double taikoVelocity = taiko_base_distance * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier / speedAdjustedBeatLength;
-                    // The duration of the taiko hit object
-                    double taikoDuration = distance / taikoVelocity;
-
-                    // The velocity of the osu! hit object - calculated as the velocity of a slider
-                    double osuVelocity = osu_base_scoring_distance * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier / speedAdjustedBeatLength;
-                    // The duration of the osu! hit object
-                    double osuDuration = distance / osuVelocity;
-
-                    // osu-stable always uses the speed-adjusted beatlength to determine the velocities, but
-                    // only uses it for tick rate if beatmap version < 8
-                    if (beatmap.BeatmapInfo.BeatmapVersion >= 8)
-                        speedAdjustedBeatLength *= speedAdjustment;
-
-                    // If the drum roll is to be split into hit circles, assume the ticks are 1/8 spaced within the duration of one beat
-                    double tickSpacing = Math.Min(speedAdjustedBeatLength / beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate, taikoDuration / spans);
-
-                    if (!isForCurrentRuleset && tickSpacing > 0 && osuDuration < 2 * speedAdjustedBeatLength)
+                    if (shouldConvertSliderToHits(obj, beatmap, distanceData, out var taikoDuration, out var tickSpacing))
                     {
                         List<IList<HitSampleInfo>> allSamples = obj is IHasPathWithRepeats curveData ? curveData.NodeSamples : new List<IList<HitSampleInfo>>(new[] { samples });
 
@@ -184,6 +155,52 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             }
         }
 
+        private bool shouldConvertSliderToHits(HitObject obj, IBeatmap beatmap, IHasDistance distanceData, out double taikoDuration, out double tickSpacing)
+        {
+            // DO NOT CHANGE OR REFACTOR ANYTHING IN HERE WITHOUT TESTING AGAINST _ALL_ BEATMAPS.
+            // Some of these calculations look redundant, but they are not - extremely small floating point errors are introduced to maintain 1:1 compatibility with stable.
+            // Rounding cannot be used as an alternative since the error deltas have been observed to be between 1e-2 and 1e-6.
+
+            // The true distance, accounting for any repeats. This ends up being the drum roll distance later
+            int spans = (obj as IHasRepeats)?.SpanCount() ?? 1;
+            double distance = distanceData.Distance * spans * LEGACY_VELOCITY_MULTIPLIER;
+
+            TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime);
+            DifficultyControlPoint difficultyPoint = beatmap.ControlPointInfo.DifficultyPointAt(obj.StartTime);
+
+            double beatLength;
+#pragma warning disable 618
+            if (difficultyPoint is LegacyBeatmapDecoder.LegacyDifficultyControlPoint legacyDifficultyPoint)
+#pragma warning restore 618
+                beatLength = timingPoint.BeatLength * legacyDifficultyPoint.BpmMultiplier;
+            else
+                beatLength = timingPoint.BeatLength / difficultyPoint.SpeedMultiplier;
+
+            double sliderScoringPointDistance = osu_base_scoring_distance * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier / beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate;
+
+            // The velocity and duration of the taiko hit object - calculated as the velocity of a drum roll.
+            double taikoVelocity = sliderScoringPointDistance * beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate;
+            taikoDuration = distance / taikoVelocity * beatLength;
+
+            if (isForCurrentRuleset)
+            {
+                tickSpacing = 0;
+                return false;
+            }
+
+            double osuVelocity = taikoVelocity * (1000f / beatLength);
+
+            // osu-stable always uses the speed-adjusted beatlength to determine the osu! velocity, but only uses it for conversion if beatmap version < 8
+            if (beatmap.BeatmapInfo.BeatmapVersion >= 8)
+                beatLength = timingPoint.BeatLength;
+
+            // If the drum roll is to be split into hit circles, assume the ticks are 1/8 spaced within the duration of one beat
+            tickSpacing = Math.Min(beatLength / beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate, taikoDuration / spans);
+
+            return tickSpacing > 0
+                   && distance / osuVelocity * 1000 < 2 * beatLength;
+        }
+
         protected override Beatmap<TaikoHitObject> CreateBeatmap() => new TaikoBeatmap();
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index be5cd78dc8..b30ec0ca2c 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -369,7 +369,9 @@ namespace osu.Game.Beatmaps.Formats
                 addControlPoint(time, controlPoint, true);
             }
 
-            addControlPoint(time, new LegacyDifficultyControlPoint
+#pragma warning disable 618
+            addControlPoint(time, new LegacyDifficultyControlPoint(beatLength)
+#pragma warning restore 618
             {
                 SpeedMultiplier = speedMultiplier,
             }, timingChange);
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index a0e83554a3..44ef9bcacc 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -159,11 +159,20 @@ namespace osu.Game.Beatmaps.Formats
             Mania,
         }
 
-        internal class LegacyDifficultyControlPoint : DifficultyControlPoint
+        [Obsolete("Do not use unless you're a legacy ruleset and 100% sure.")]
+        public class LegacyDifficultyControlPoint : DifficultyControlPoint
         {
-            public LegacyDifficultyControlPoint()
+            /// <summary>
+            /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
+            /// DO NOT USE THIS UNLESS 100% SURE.
+            /// </summary>
+            public readonly float BpmMultiplier;
+
+            public LegacyDifficultyControlPoint(double beatLength)
             {
                 SpeedMultiplierBindable.Precision = double.Epsilon;
+
+                BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100f : 1;
             }
         }
 

From 7b7b92aa10ab0f65f21e338d34d015ed4fe45f6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Jul 2020 17:28:16 +0900
Subject: [PATCH 03698/10326] Fix potential crash when trying to ensure music
 is playing

---
 osu.Game/Overlays/MusicController.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 09f2a66b47..546f7a1ec4 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Overlays
                 if (beatmap.Disabled)
                     return;
 
-                next();
+                NextTrack();
             }
             else if (!IsPlaying)
             {
@@ -217,6 +217,9 @@ namespace osu.Game.Overlays
         /// <returns>The <see cref="PreviousTrackResult"/> that indicate the decided action.</returns>
         private PreviousTrackResult prev()
         {
+            if (beatmap.Disabled)
+                return PreviousTrackResult.None;
+
             var currentTrackPosition = current?.Track.CurrentTime;
 
             if (currentTrackPosition >= restart_cutoff_point)
@@ -248,6 +251,9 @@ namespace osu.Game.Overlays
 
         private bool next()
         {
+            if (beatmap.Disabled)
+                return false;
+
             queuedDirection = TrackChangeDirection.Next;
 
             var playable = BeatmapSets.SkipWhile(i => i.ID != current.BeatmapSetInfo.ID).ElementAtOrDefault(1) ?? BeatmapSets.FirstOrDefault();

From 4b3cffb246c3df3f22d14f14e2d336cd6575f890 Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Mon, 13 Jul 2020 11:55:13 +0200
Subject: [PATCH 03699/10326] expose hitObjectContainer in HitObjectArea

---
 osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs         | 2 +-
 osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index 3777193f49..ce00f0ccda 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Mania.Mods
 
             foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
             {
-                column.HitObjectArea.ChildrenOfType<BufferedContainer>().First().Add(new LaneCover(false)
+                ((BufferedContainer)column.HitObjectArea.HitObjectContainer.Parent).Add(new LaneCover(false)
                 {
                     RelativeSizeAxes = Axes.Both,
                     SizeFilled = 0.5f,
diff --git a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
index 5eccb891cc..d21a156437 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
@@ -15,13 +15,14 @@ namespace osu.Game.Rulesets.Mania.UI.Components
     public class HitObjectArea : SkinReloadableDrawable
     {
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
+        public readonly HitObjectContainer HitObjectContainer;
 
         public HitObjectArea(HitObjectContainer hitObjectContainer)
         {
             InternalChild = new BufferedContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = hitObjectContainer
+                Child = HitObjectContainer = hitObjectContainer
             };
         }
 

From 69548447a7e3bf9ac63c2e1e05ceff17123ed6ed Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 13 Jul 2020 20:03:07 +0900
Subject: [PATCH 03700/10326] Adjust step name

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 70eafcb2a7..a3ea4619cc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             loadBeatmaps();
 
-            AddStep("select last", () => carousel.SelectBeatmap(carousel.BeatmapSets.First().Beatmaps.First()));
+            AddStep("select first", () => carousel.SelectBeatmap(carousel.BeatmapSets.First().Beatmaps.First()));
             waitForSelection(1, 1);
 
             advanceSelection(direction: 1, diff: true);

From 31782172165372dec692b8d875efd0ac58e06b24 Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Mon, 13 Jul 2020 13:14:47 +0200
Subject: [PATCH 03701/10326] remove unnecessary import

---
 osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index ce00f0ccda..06a6655da6 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;

From ca39f2aa24c7340dea8667e556d024c61a703628 Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Mon, 13 Jul 2020 13:43:32 +0200
Subject: [PATCH 03702/10326] only insert BufferedContainer when using FI

---
 osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs | 18 +++++++++++++++---
 .../UI/Components/HitObjectArea.cs             |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index 06a6655da6..ed990f8d5f 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -35,11 +35,23 @@ namespace osu.Game.Rulesets.Mania.Mods
 
             foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
             {
-                ((BufferedContainer)column.HitObjectArea.HitObjectContainer.Parent).Add(new LaneCover(false)
+                HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
+                Container hocParent = (Container)hoc.Parent;
+
+                hocParent.Remove(hoc);
+                hocParent.Add(new BufferedContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    SizeFilled = 0.5f,
-                    SizeGradient = 0.25f
+                    Children = new Drawable[]
+                    {
+                        hoc,
+                        new LaneCover(false)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            SizeFilled = 0.5f,
+                            SizeGradient = 0.25f
+                        }
+                    }
                 });
             }
         }
diff --git a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
index d21a156437..8f7880dafa 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 
         public HitObjectArea(HitObjectContainer hitObjectContainer)
         {
-            InternalChild = new BufferedContainer
+            InternalChild = new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = HitObjectContainer = hitObjectContainer

From 8a3cadc111cfadb6744a5e22b4f5d2bd4abe3550 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Jul 2020 20:12:50 +0900
Subject: [PATCH 03703/10326] Fix judgement animations not resetting on use

---
 .../Objects/Drawables/DrawableOsuJudgement.cs          |  2 ++
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs      | 10 +++++++---
 osu.Game/Skinning/SkinnableDrawable.cs                 |  6 ++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index cfe969d1cc..1493ddfcf3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -62,6 +62,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (lighting != null)
             {
+                lighting.ResetAnimation();
+
                 if (JudgedObject != null)
                 {
                     lightingColour = JudgedObject.AccentColour.GetBoundCopy();
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 4e7f0018ef..052aaa3c65 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -31,8 +31,10 @@ namespace osu.Game.Rulesets.Judgements
         public JudgementResult Result { get; private set; }
         public DrawableHitObject JudgedObject { get; private set; }
 
-        protected Container JudgementBody;
-        protected SpriteText JudgementText;
+        protected Container JudgementBody { get; private set; }
+        protected SpriteText JudgementText { get; private set; }
+
+        private SkinnableDrawable bodyDrawable;
 
         /// <summary>
         /// Duration of initial fade in.
@@ -89,6 +91,8 @@ namespace osu.Game.Rulesets.Judgements
 
             prepareDrawables();
 
+            bodyDrawable.ResetAnimation();
+
             this.FadeInFromZero(FadeInDuration, Easing.OutQuint);
             JudgementBody.ScaleTo(1);
             JudgementBody.RotateTo(0);
@@ -131,7 +135,7 @@ namespace osu.Game.Rulesets.Judgements
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
-                Child = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ => JudgementText = new OsuSpriteText
+                Child = bodyDrawable = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ => JudgementText = new OsuSpriteText
                 {
                     Text = type.GetDescription().ToUpperInvariant(),
                     Font = OsuFont.Numeric.With(size: 20),
diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index 0f0d3da5aa..d9a5036649 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
 using osuTK;
 
 namespace osu.Game.Skinning
@@ -50,6 +51,11 @@ namespace osu.Game.Skinning
             RelativeSizeAxes = Axes.Both;
         }
 
+        /// <summary>
+        /// Seeks to the 0-th frame if the content of this <see cref="SkinnableDrawable"/> is an <see cref="IFramedAnimation"/>.
+        /// </summary>
+        public void ResetAnimation() => (Drawable as IFramedAnimation)?.GotoFrame(0);
+
         private readonly Func<ISkinComponent, Drawable> createDefault;
 
         private readonly Cached scaling = new Cached();

From 53520ec7c45b65961b9653c3c7f1b0927ca23889 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Jul 2020 20:55:55 +0900
Subject: [PATCH 03704/10326] Add test

---
 .../TestSceneDrawableJudgement.cs             | 45 ++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

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

From 8087a75c3506e1906af24c3fc9f0639048e8b9d8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Jul 2020 17:22:39 +0000
Subject: [PATCH 03705/10326] Bump NUnit3TestAdapter from 3.15.1 to 3.17.0

Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.1 to 3.17.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15.1...V3.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game.Benchmarks/osu.Game.Benchmarks.csproj                  | 2 +-
 .../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 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index 41e726e05c..ff26f4afaa 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
     <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
 
   <ItemGroup>
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 cbd3dc5518..7c0b73e8c3 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
@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
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 77c871718b..972cbec4a2 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
@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
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 2fcfa1deb7..d6a68abaf2 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.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
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 28b8476a22..ada7ac5d74 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
@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 5ee887cb64..4b0506d818 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -5,7 +5,7 @@
     <PackageReference Include="DeepEqual" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index aa37326a49..f256b8e4e9 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -7,7 +7,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

From 38e9b882b813f68fc350ae4538ab1e6c5abf806f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Jul 2020 07:04:30 +0900
Subject: [PATCH 03706/10326] 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 0881861bdc..1d1583c55a 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.710.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.714.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cba2d62bf5..4295e02d24 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.710.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.714.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 45e0da36c1..3627cc032e 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.Framework.iOS" Version="2020.710.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.714.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.710.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.714.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From b59e4f8a7ef40ece6455b20a612ff942e18917c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Jul 2020 08:15:14 +0900
Subject: [PATCH 03707/10326] Change difficulty adjust mod to match stable
 range of 0-10

---
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs | 4 ++--
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 8228161008..ff995e38ce 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public BindableNumber<float> CircleSize { get; } = new BindableFloat
         {
             Precision = 0.1f,
-            MinValue = 1,
+            MinValue = 0,
             MaxValue = 10,
             Default = 5,
             Value = 5,
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
-            MinValue = 1,
+            MinValue = 0,
             MaxValue = 10,
             Default = 5,
             Value = 5,
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index c3a8efdd66..165644edbe 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mods
         public BindableNumber<float> DrainRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
-            MinValue = 1,
+            MinValue = 0,
             MaxValue = 10,
             Default = 5,
             Value = 5,
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mods
         public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
         {
             Precision = 0.1f,
-            MinValue = 1,
+            MinValue = 0,
             MaxValue = 10,
             Default = 5,
             Value = 5,

From 56349e65f3929032561d3059622a201f87afc604 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 14 Jul 2020 03:01:14 +0300
Subject: [PATCH 03708/10326] Rename arrow direction method

---
 .../Visual/UserInterface/TestSceneCommentRepliesButton.cs | 8 ++++----
 .../Overlays/Comments/Buttons/CommentRepliesButton.cs     | 2 +-
 osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
index 7f5806705e..c2dc804385 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
@@ -41,11 +41,11 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [Test]
-        public void TestArrowRotation()
+        public void TestArrowDirection()
         {
-            AddStep("Toggle icon up", () => button.ToggleIcon(true));
+            AddStep("Set upwards", () => button.SetIconDirection(true));
             AddAssert("Icon facing upwards", () => button.Icon.Scale.Y == -1);
-            AddStep("Toggle icon down", () => button.ToggleIcon(false));
+            AddStep("Set downwards", () => button.SetIconDirection(false));
             AddAssert("Icon facing downwards", () => button.Icon.Scale.Y == 1);
         }
 
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Text = "sample text";
             }
 
-            public new void ToggleIcon(bool upwards) => base.ToggleIcon(upwards);
+            public new void SetIconDirection(bool upwards) => base.SetIconDirection(upwards);
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index 65648f6751..abe80722e2 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Overlays.Comments.Buttons
             icon.Colour = colourProvider.Foreground1;
         }
 
-        protected void ToggleIcon(bool upwards) => icon.ScaleTo(new Vector2(1, upwards ? -1 : 1));
+        protected void SetIconDirection(bool upwards) => icon.ScaleTo(new Vector2(1, upwards ? -1 : 1));
 
         protected override bool OnHover(HoverEvent e)
         {
diff --git a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
index 118cac5b4c..e2023c2f58 100644
--- a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Expanded.BindValueChanged(expanded => ToggleIcon(expanded.NewValue), true);
+            Expanded.BindValueChanged(expanded => SetIconDirection(expanded.NewValue), true);
         }
 
         protected override bool OnClick(ClickEvent e)

From 7c71cc6b6174a6a62a0f78cd9029bb12943ff82b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 14 Jul 2020 03:06:51 +0300
Subject: [PATCH 03709/10326] Remove unneeded class from DrawableComment

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 41 +++++--------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 813540b28d..731ebe7104 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Overlays.Comments
         private ShowRepliesButton showRepliesButton;
         private ChevronButton chevronButton;
         private DeletedCommentsCounter deletedCommentsCounter;
-        private Loading loading;
+        private LoadingSpinner loading;
 
         public DrawableComment(Comment comment)
         {
@@ -209,10 +209,16 @@ namespace osu.Game.Overlays.Comments
                                 }
                             }
                         },
-                        loading = new Loading
+                        loading = new LoadingSpinner
                         {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                            Size = new Vector2(15),
+                            Margin = new MarginPadding
+                            {
+                                Vertical = 5,
+                                Left = 80
+                            }
                         },
                         childCommentsVisibilityContainer = new FillFlowContainer
                         {
@@ -368,6 +374,7 @@ namespace osu.Game.Overlays.Comments
 
             showMoreButton.IsLoading = false;
             loading.Hide();
+            loading.FinishTransforms();
         }
 
         private class ChevronButton : ShowChildrenButton
@@ -438,31 +445,5 @@ namespace osu.Game.Overlays.Comments
                 return parentComment.HasMessage ? parentComment.Message : parentComment.IsDeleted ? @"deleted" : string.Empty;
             }
         }
-
-        private class Loading : Container
-        {
-            private readonly LoadingSpinner loading;
-
-            public Loading()
-            {
-                Child = loading = new LoadingSpinner
-                {
-                    Anchor = Anchor.TopLeft,
-                    Origin = Anchor.TopLeft,
-                    Size = new Vector2(15),
-                    Margin = new MarginPadding
-                    {
-                        Vertical = 5,
-                        Left = 80
-                    }
-                };
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                loading.Show();
-            }
-        }
     }
 }

From 8a77a3621e71961bbcccb0a3b38eb2e1d9e96561 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Jul 2020 11:03:55 +0900
Subject: [PATCH 03710/10326] 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 1d1583c55a..8510632d45 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.622.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.714.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.714.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4295e02d24..05d6f27d40 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.714.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.714.0" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 3627cc032e..af779b32fd 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.714.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.714.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From e35e9df4e1a6acdeaae0a2022363d8240f9cb390 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Jul 2020 12:02:03 +0900
Subject: [PATCH 03711/10326] Fix local online cache database not being used
 when offline / logged out

---
 osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index 3106d1143e..4de4e21b15 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -48,9 +48,6 @@ namespace osu.Game.Beatmaps
 
             public Task UpdateAsync(BeatmapSetInfo beatmapSet, CancellationToken cancellationToken)
             {
-                if (api?.State != APIState.Online)
-                    return Task.CompletedTask;
-
                 LogForModel(beatmapSet, "Performing online lookups...");
                 return Task.WhenAll(beatmapSet.Beatmaps.Select(b => UpdateAsync(beatmapSet, b, cancellationToken)).ToArray());
             }

From a25f4880d6074b80cda388d5ba7baa7711c430e1 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Tue, 14 Jul 2020 10:35:01 +0700
Subject: [PATCH 03712/10326] disable hit explotion when hit lighting off

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 82cbbefcca..793db361da 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Skinning;
@@ -99,6 +100,7 @@ namespace osu.Game.Rulesets.Catch.UI
         private double hyperDashModifier = 1;
         private int hyperDashDirection;
         private float hyperDashTargetPosition;
+        private bool hitLighting;
 
         public Catcher([NotNull] Container trailsTarget, BeatmapDifficulty difficulty = null)
         {
@@ -114,8 +116,10 @@ namespace osu.Game.Rulesets.Catch.UI
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuConfigManager config)
         {
+            hitLighting = config.Get<bool>(OsuSetting.HitLighting);
+
             InternalChildren = new Drawable[]
             {
                 caughtFruit = new Container<DrawableHitObject>
@@ -189,11 +193,14 @@ namespace osu.Game.Rulesets.Catch.UI
 
             caughtFruit.Add(fruit);
 
-            AddInternal(new HitExplosion(fruit)
+            if (hitLighting)
             {
-                X = fruit.X,
-                Scale = new Vector2(fruit.HitObject.Scale)
-            });
+                AddInternal(new HitExplosion(fruit)
+                {
+                    X = fruit.X,
+                    Scale = new Vector2(fruit.HitObject.Scale)
+                });
+            }
         }
 
         /// <summary>

From 3e2d184a911ff88e445618064451e186e5e7c592 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Tue, 14 Jul 2020 10:52:34 +0700
Subject: [PATCH 03713/10326] change hitlighting bool to bindable

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

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 793db361da..a0a5f7279c 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
@@ -100,7 +101,7 @@ namespace osu.Game.Rulesets.Catch.UI
         private double hyperDashModifier = 1;
         private int hyperDashDirection;
         private float hyperDashTargetPosition;
-        private bool hitLighting;
+        private Bindable<bool> hitLighting;
 
         public Catcher([NotNull] Container trailsTarget, BeatmapDifficulty difficulty = null)
         {
@@ -118,7 +119,7 @@ namespace osu.Game.Rulesets.Catch.UI
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            hitLighting = config.Get<bool>(OsuSetting.HitLighting);
+            hitLighting = config.GetBindable<bool>(OsuSetting.HitLighting);
 
             InternalChildren = new Drawable[]
             {
@@ -193,7 +194,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             caughtFruit.Add(fruit);
 
-            if (hitLighting)
+            if (hitLighting.Value)
             {
                 AddInternal(new HitExplosion(fruit)
                 {

From 7fe69bb1996e83fd70417670a709a67d3cb2a1c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Jul 2020 13:07:17 +0900
Subject: [PATCH 03714/10326] Fix some web requests retrieving the user too
 early

---
 osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs | 7 +++----
 osu.Game/Online/API/APIRequest.cs                    | 7 +++++++
 osu.Game/Online/API/Requests/JoinChannelRequest.cs   | 7 ++-----
 osu.Game/Online/API/Requests/JoinRoomRequest.cs      | 7 ++-----
 osu.Game/Online/API/Requests/LeaveChannelRequest.cs  | 7 ++-----
 osu.Game/Online/API/Requests/PartRoomRequest.cs      | 7 ++-----
 osu.Game/Online/Chat/ChannelManager.cs               | 4 ++--
 osu.Game/Screens/Multi/RoomManager.cs                | 4 ++--
 8 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
index 1e77d50115..42948c3731 100644
--- a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
+++ b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
@@ -8,7 +8,6 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Tests.Visual;
-using osu.Game.Users;
 
 namespace osu.Game.Tests.Online
 {
@@ -55,7 +54,7 @@ namespace osu.Game.Tests.Online
             AddStep("fire request", () =>
             {
                 gotResponse = false;
-                request = new LeaveChannelRequest(new Channel(), new User());
+                request = new LeaveChannelRequest(new Channel());
                 request.Success += () => gotResponse = true;
                 API.Queue(request);
             });
@@ -74,7 +73,7 @@ namespace osu.Game.Tests.Online
             AddStep("fire request", () =>
             {
                 gotResponse = false;
-                request = new LeaveChannelRequest(new Channel(), new User());
+                request = new LeaveChannelRequest(new Channel());
                 request.Success += () => gotResponse = true;
                 API.Perform(request);
             });
@@ -93,7 +92,7 @@ namespace osu.Game.Tests.Online
             AddStep("fire request", () =>
             {
                 gotResponse = false;
-                request = new LeaveChannelRequest(new Channel(), new User());
+                request = new LeaveChannelRequest(new Channel());
                 request.Success += () => gotResponse = true;
                 API.PerformAsync(request);
             });
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 0f8acbb7af..2115326cc2 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -5,6 +5,7 @@ using System;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using osu.Framework.Logging;
+using osu.Game.Users;
 
 namespace osu.Game.Online.API
 {
@@ -61,6 +62,11 @@ namespace osu.Game.Online.API
         protected APIAccess API;
         protected WebRequest WebRequest;
 
+        /// <summary>
+        /// The currently logged in user. Note that this will only be populated during <see cref="Perform"/>.
+        /// </summary>
+        protected User User { get; private set; }
+
         /// <summary>
         /// Invoked on successful completion of an API request.
         /// This will be scheduled to the API's internal scheduler (run on update thread automatically).
@@ -86,6 +92,7 @@ namespace osu.Game.Online.API
             }
 
             API = apiAccess;
+            User = apiAccess.LocalUser.Value;
 
             if (checkAndScheduleFailure())
                 return;
diff --git a/osu.Game/Online/API/Requests/JoinChannelRequest.cs b/osu.Game/Online/API/Requests/JoinChannelRequest.cs
index f6ed5f22c9..33eab7e355 100644
--- a/osu.Game/Online/API/Requests/JoinChannelRequest.cs
+++ b/osu.Game/Online/API/Requests/JoinChannelRequest.cs
@@ -4,19 +4,16 @@
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Chat;
-using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests
 {
     public class JoinChannelRequest : APIRequest
     {
         private readonly Channel channel;
-        private readonly User user;
 
-        public JoinChannelRequest(Channel channel, User user)
+        public JoinChannelRequest(Channel channel)
         {
             this.channel = channel;
-            this.user = user;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -26,6 +23,6 @@ namespace osu.Game.Online.API.Requests
             return req;
         }
 
-        protected override string Target => $@"chat/channels/{channel.Id}/users/{user.Id}";
+        protected override string Target => $@"chat/channels/{channel.Id}/users/{User.Id}";
     }
 }
diff --git a/osu.Game/Online/API/Requests/JoinRoomRequest.cs b/osu.Game/Online/API/Requests/JoinRoomRequest.cs
index 36b275236c..b0808afa45 100644
--- a/osu.Game/Online/API/Requests/JoinRoomRequest.cs
+++ b/osu.Game/Online/API/Requests/JoinRoomRequest.cs
@@ -4,19 +4,16 @@
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests
 {
     public class JoinRoomRequest : APIRequest
     {
         private readonly Room room;
-        private readonly User user;
 
-        public JoinRoomRequest(Room room, User user)
+        public JoinRoomRequest(Room room)
         {
             this.room = room;
-            this.user = user;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -26,6 +23,6 @@ namespace osu.Game.Online.API.Requests
             return req;
         }
 
-        protected override string Target => $"rooms/{room.RoomID.Value}/users/{user.Id}";
+        protected override string Target => $"rooms/{room.RoomID.Value}/users/{User.Id}";
     }
 }
diff --git a/osu.Game/Online/API/Requests/LeaveChannelRequest.cs b/osu.Game/Online/API/Requests/LeaveChannelRequest.cs
index f2ae3926bd..7dfc9a0aed 100644
--- a/osu.Game/Online/API/Requests/LeaveChannelRequest.cs
+++ b/osu.Game/Online/API/Requests/LeaveChannelRequest.cs
@@ -4,19 +4,16 @@
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Chat;
-using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests
 {
     public class LeaveChannelRequest : APIRequest
     {
         private readonly Channel channel;
-        private readonly User user;
 
-        public LeaveChannelRequest(Channel channel, User user)
+        public LeaveChannelRequest(Channel channel)
         {
             this.channel = channel;
-            this.user = user;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -26,6 +23,6 @@ namespace osu.Game.Online.API.Requests
             return req;
         }
 
-        protected override string Target => $@"chat/channels/{channel.Id}/users/{user.Id}";
+        protected override string Target => $@"chat/channels/{channel.Id}/users/{User.Id}";
     }
 }
diff --git a/osu.Game/Online/API/Requests/PartRoomRequest.cs b/osu.Game/Online/API/Requests/PartRoomRequest.cs
index e1550cb2e0..c988cd5c9e 100644
--- a/osu.Game/Online/API/Requests/PartRoomRequest.cs
+++ b/osu.Game/Online/API/Requests/PartRoomRequest.cs
@@ -4,19 +4,16 @@
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests
 {
     public class PartRoomRequest : APIRequest
     {
         private readonly Room room;
-        private readonly User user;
 
-        public PartRoomRequest(Room room, User user)
+        public PartRoomRequest(Room room)
         {
             this.room = room;
-            this.user = user;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -26,6 +23,6 @@ namespace osu.Game.Online.API.Requests
             return req;
         }
 
-        protected override string Target => $"rooms/{room.RoomID.Value}/users/{user.Id}";
+        protected override string Target => $"rooms/{room.RoomID.Value}/users/{User.Id}";
     }
 }
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 3b336fef4f..f7ed57f207 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -381,7 +381,7 @@ namespace osu.Game.Online.Chat
                         break;
 
                     default:
-                        var req = new JoinChannelRequest(channel, api.LocalUser.Value);
+                        var req = new JoinChannelRequest(channel);
                         req.Success += () => joinChannel(channel, fetchInitialMessages);
                         req.Failure += ex => LeaveChannel(channel);
                         api.Queue(req);
@@ -410,7 +410,7 @@ namespace osu.Game.Online.Chat
 
             if (channel.Joined.Value)
             {
-                api.Queue(new LeaveChannelRequest(channel, api.LocalUser.Value));
+                api.Queue(new LeaveChannelRequest(channel));
                 channel.Joined.Value = false;
             }
         }
diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index ac1f74b6a6..491be2e946 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Multi
         public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
         {
             currentJoinRoomRequest?.Cancel();
-            currentJoinRoomRequest = new JoinRoomRequest(room, api.LocalUser.Value);
+            currentJoinRoomRequest = new JoinRoomRequest(room);
 
             currentJoinRoomRequest.Success += () =>
             {
@@ -139,7 +139,7 @@ namespace osu.Game.Screens.Multi
             if (joinedRoom == null)
                 return;
 
-            api.Queue(new PartRoomRequest(joinedRoom, api.LocalUser.Value));
+            api.Queue(new PartRoomRequest(joinedRoom));
             joinedRoom = null;
         }
 

From 1a2f5cb477a2c13d095fd63b998a4ea3f53b8829 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 13 Jul 2020 23:59:20 -0700
Subject: [PATCH 03715/10326] Add OnBackButton bool to OsuScreen

---
 osu.Game/OsuGame.cs            | 4 +++-
 osu.Game/Screens/IOsuScreen.cs | 2 ++
 osu.Game/Screens/OsuScreen.cs  | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 47a7c2ae11..618049e72c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -573,7 +573,9 @@ namespace osu.Game
                             Origin = Anchor.BottomLeft,
                             Action = () =>
                             {
-                                if ((ScreenStack.CurrentScreen as IOsuScreen)?.AllowBackButton == true)
+                                var currentScreen = ScreenStack.CurrentScreen as IOsuScreen;
+
+                                if (currentScreen?.AllowBackButton == true && !currentScreen.OnBackButton())
                                     ScreenStack.Exit();
                             }
                         },
diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index 22fe0ad816..6ed04291ce 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -56,5 +56,7 @@ namespace osu.Game.Screens
         /// Whether mod rate adjustments are allowed to be applied.
         /// </summary>
         bool AllowRateAdjustments { get; }
+
+        bool OnBackButton();
     }
 }
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 35bb4fa34f..872a1cd39a 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -258,5 +258,7 @@ namespace osu.Game.Screens
         /// Note that the instance created may not be the used instance if it matches the BackgroundMode equality clause.
         /// </summary>
         protected virtual BackgroundScreen CreateBackground() => null;
+
+        public virtual bool OnBackButton() => false;
     }
 }

From 4caf4d31d4a9fb0b56ce528c3b5fac6194718ca3 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 14 Jul 2020 00:00:10 -0700
Subject: [PATCH 03716/10326] Fix mod select blocking home and alt f4 in song
 select

---
 osu.Game/Screens/Select/SongSelect.cs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index e3705b15fa..74a5ee8309 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -599,12 +599,6 @@ namespace osu.Game.Screens.Select
 
         public override bool OnExiting(IScreen next)
         {
-            if (ModSelect.State.Value == Visibility.Visible)
-            {
-                ModSelect.Hide();
-                return true;
-            }
-
             if (base.OnExiting(next))
                 return true;
 
@@ -620,6 +614,17 @@ namespace osu.Game.Screens.Select
             return false;
         }
 
+        public override bool OnBackButton()
+        {
+            if (ModSelect.State.Value == Visibility.Visible)
+            {
+                ModSelect.Hide();
+                return true;
+            }
+
+            return false;
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From daa7430fd8d07befdcf2544143ccfe7ef1cd6316 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 14 Jul 2020 00:00:43 -0700
Subject: [PATCH 03717/10326] Fix statistics screen blocking retry, home, and
 alt f4

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

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 49ce07b708..44458d8c8e 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -194,6 +194,13 @@ namespace osu.Game.Screens.Ranking
         }
 
         public override bool OnExiting(IScreen next)
+        {
+            Background.FadeTo(1, 250);
+
+            return base.OnExiting(next);
+        }
+
+        public override bool OnBackButton()
         {
             if (statisticsPanel.State.Value == Visibility.Visible)
             {
@@ -201,9 +208,7 @@ namespace osu.Game.Screens.Ranking
                 return true;
             }
 
-            Background.FadeTo(1, 250);
-
-            return base.OnExiting(next);
+            return false;
         }
 
         private void addScore(ScoreInfo score)

From 3573460d9c05aebe54995c72ea16e231f0e91dc8 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 14 Jul 2020 00:02:01 -0700
Subject: [PATCH 03718/10326] Fix multiplayer screens blocking home and alt f4

---
 osu.Game/Screens/Multi/Multiplayer.cs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 3178e35581..067a42d57d 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -250,12 +250,6 @@ namespace osu.Game.Screens.Multi
         {
             roomManager.PartRoom();
 
-            if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
-            {
-                screenStack.Exit();
-                return true;
-            }
-
             waves.Hide();
 
             this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();
@@ -269,6 +263,17 @@ namespace osu.Game.Screens.Multi
             return false;
         }
 
+        public override bool OnBackButton()
+        {
+            if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
+            {
+                screenStack.Exit();
+                return true;
+            }
+
+            return false;
+        }
+
         protected override void LogoExiting(OsuLogo logo)
         {
             base.LogoExiting(logo);

From 8ace06fcc5c47b1c5f67c659cd8e205a1954f2a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Jul 2020 16:03:40 +0900
Subject: [PATCH 03719/10326] Fix continuations attaching to the
 BeatmapOnlineLookupQueue scheduler

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

diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index 4de4e21b15..16207c7d2a 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Beatmaps
 
             // todo: expose this when we need to do individual difficulty lookups.
             protected Task UpdateAsync(BeatmapSetInfo beatmapSet, BeatmapInfo beatmap, CancellationToken cancellationToken)
-                => Task.Factory.StartNew(() => lookup(beatmapSet, beatmap), cancellationToken, TaskCreationOptions.HideScheduler, updateScheduler);
+                => Task.Factory.StartNew(() => lookup(beatmapSet, beatmap), cancellationToken, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
 
             private void lookup(BeatmapSetInfo set, BeatmapInfo beatmap)
             {

From 36041fc2453832976cad0b6c89a0ec0979dae68b Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 14 Jul 2020 00:29:57 -0700
Subject: [PATCH 03720/10326] Fix back button not working correctly with multi
 song select's mod select

---
 osu.Game/Screens/Multi/Multiplayer.cs | 12 ++++++++++--
 osu.Game/Screens/Select/SongSelect.cs |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 067a42d57d..2a73b53199 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -20,9 +20,9 @@ using osu.Game.Online.Multiplayer;
 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;
 using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.Select;
 using osuTK;
 
 namespace osu.Game.Screens.Multi
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Multi
         private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
 
         [Cached]
-        private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
+        private readonly Bindable<Lounge.Components.FilterCriteria> currentFilter = new Bindable<Lounge.Components.FilterCriteria>(new Lounge.Components.FilterCriteria());
 
         [Cached(Type = typeof(IRoomManager))]
         private RoomManager roomManager;
@@ -265,6 +265,14 @@ namespace osu.Game.Screens.Multi
 
         public override bool OnBackButton()
         {
+            var songSelect = screenStack.CurrentScreen as MatchSongSelect;
+
+            if (songSelect?.ModSelect.State.Value == Visibility.Visible)
+            {
+                songSelect.ModSelect.Hide();
+                return true;
+            }
+
             if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
             {
                 screenStack.Exit();
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 74a5ee8309..87fad66b66 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        protected ModSelectOverlay ModSelect { get; private set; }
+        public ModSelectOverlay ModSelect { get; private set; }
 
         protected SampleChannel SampleConfirm { get; private set; }
 

From 304e518f7ba48d32dc426a0bf959d5481cb30f12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Jul 2020 17:30:20 +0900
Subject: [PATCH 03721/10326] 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 8510632d45..85d154f2e2 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.714.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.714.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.714.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 05d6f27d40..b8e73262c4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.714.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.714.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.714.0" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index af779b32fd..1faf60b1d9 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.Framework.iOS" Version="2020.714.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.714.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.714.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.714.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.714.1" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From fec2594ac67f42ef52f2aa0fd63afbc4b65ca88b Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Tue, 14 Jul 2020 11:56:31 +0200
Subject: [PATCH 03722/10326] reverse LaneCover when playing up-scroll

---
 .../Mods/ManiaModFadeIn.cs                    | 58 +++++++++++--------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index ed990f8d5f..21c855dedd 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -10,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -45,11 +47,9 @@ namespace osu.Game.Rulesets.Mania.Mods
                     Children = new Drawable[]
                     {
                         hoc,
-                        new LaneCover(false)
+                        new LaneCover(0.5f, false)
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            SizeFilled = 0.5f,
-                            SizeGradient = 0.25f
+                            RelativeSizeAxes = Axes.Both
                         }
                     }
                 });
@@ -60,9 +60,8 @@ namespace osu.Game.Rulesets.Mania.Mods
         {
             private readonly Box gradient;
             private readonly Box filled;
-            private readonly bool reversed;
 
-            public LaneCover(bool reversed)
+            public LaneCover(float initialCoverage, bool reversed)
             {
                 Blending = new BlendingParameters
                 {
@@ -73,50 +72,61 @@ namespace osu.Game.Rulesets.Mania.Mods
                     SourceAlpha = BlendingType.Zero,
                     DestinationAlpha = BlendingType.OneMinusSrcAlpha
                 };
-
                 InternalChildren = new Drawable[]
                 {
                     gradient = new Box
                     {
                         RelativeSizeAxes = Axes.Both,
                         RelativePositionAxes = Axes.Both,
-                        Colour = ColourInfo.GradientVertical(Color4.White.Opacity(1f), Color4.White.Opacity(0f))
+                        Height = 0.25f
                     },
                     filled = new Box
                     {
                         RelativeSizeAxes = Axes.Both
                     }
                 };
-
-                if (reversed)
-                {
-                    gradient.Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0f), Color4.White.Opacity(1f));
-                    filled.Anchor = Anchor.BottomLeft;
-                    filled.Origin = Anchor.BottomLeft;
-                }
-
-                this.reversed = reversed;
+                Coverage = initialCoverage;
+                Reversed = reversed;
             }
 
-            public float SizeFilled
+            private float coverage;
+
+            public float Coverage
             {
                 set
                 {
                     filled.Height = value;
-                    if (!reversed)
-                        gradient.Y = value;
+                    gradient.Y = reversed ? 1 - value - gradient.Height : value;
+                    coverage = value;
                 }
             }
 
-            public float SizeGradient
+            private bool reversed;
+
+            public bool Reversed
             {
                 set
                 {
-                    gradient.Height = value;
-                    if (reversed)
-                        gradient.Y = 1 - value - filled.Height;
+                    filled.Anchor = value ? Anchor.BottomLeft : Anchor.TopLeft;
+                    filled.Origin = value ? Anchor.BottomLeft : Anchor.TopLeft;
+                    gradient.Colour = ColourInfo.GradientVertical(
+                        Color4.White.Opacity(value ? 0f : 1f),
+                        Color4.White.Opacity(value ? 1f : 0f)
+                    );
+
+                    reversed = value;
+                    Coverage = coverage; //re-apply coverage to update visuals
                 }
             }
+
+            [BackgroundDependencyLoader]
+            private void load(ManiaRulesetConfigManager configManager)
+            {
+                var scrollDirection = configManager.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection);
+
+                if (scrollDirection.Value == ManiaScrollingDirection.Up)
+                    Reversed = !reversed;
+            }
         }
     }
 }

From c7d3b025ada6692d159182bc42fbd9d1e844931f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Jul 2020 20:11:54 +0900
Subject: [PATCH 03723/10326] Rename variable and change default to true

---
 osu.Game/Configuration/OsuConfigManager.cs                    | 4 ++--
 .../Overlays/Settings/Sections/Gameplay/GeneralSettings.cs    | 2 +-
 osu.Game/Screens/Play/ComboEffects.cs                         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 10d11f967e..268328272c 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.FadePlayfieldWhenHealthLow, true);
             Set(OsuSetting.KeyOverlay, false);
             Set(OsuSetting.PositionalHitSounds, true);
-            Set(OsuSetting.AlwaysPlayComboBreak, false);
+            Set(OsuSetting.AlwaysPlayFirstComboBreak, true);
             Set(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
             Set(OsuSetting.FloatingComments, false);
@@ -181,7 +181,7 @@ namespace osu.Game.Configuration
         ShowStoryboard,
         KeyOverlay,
         PositionalHitSounds,
-        AlwaysPlayComboBreak,
+        AlwaysPlayFirstComboBreak,
         ScoreMeter,
         FloatingComments,
         ShowInterface,
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index f3534e4625..d79f1ba583 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Always play first combo break sound",
                     Keywords = new[] { "regardless", "combobreak.wav" },
-                    Bindable = config.GetBindable<bool>(OsuSetting.AlwaysPlayComboBreak)
+                    Bindable = config.GetBindable<bool>(OsuSetting.AlwaysPlayFirstComboBreak)
                 },
                 new SettingsEnumDropdown<ScoreMeterType>
                 {
diff --git a/osu.Game/Screens/Play/ComboEffects.cs b/osu.Game/Screens/Play/ComboEffects.cs
index c56ee35cec..a836b6137e 100644
--- a/osu.Game/Screens/Play/ComboEffects.cs
+++ b/osu.Game/Screens/Play/ComboEffects.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Play
         private void load(OsuConfigManager config)
         {
             InternalChild = comboBreakSample = new SkinnableSound(new SampleInfo("combobreak"));
-            alwaysPlay = config.GetBindable<bool>(OsuSetting.AlwaysPlayComboBreak);
+            alwaysPlay = config.GetBindable<bool>(OsuSetting.AlwaysPlayFirstComboBreak);
         }
 
         protected override void LoadComplete()

From 956980ee9055738a73dd9791ca52ff1a3de2ab18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Jul 2020 20:12:58 +0900
Subject: [PATCH 03724/10326] Remove setting from gameplay settings screen

---
 .../Overlays/Settings/Sections/Gameplay/GeneralSettings.cs  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index d79f1ba583..93a02ea0e4 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -67,12 +67,6 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Positional hitsounds",
                     Bindable = config.GetBindable<bool>(OsuSetting.PositionalHitSounds)
                 },
-                new SettingsCheckbox
-                {
-                    LabelText = "Always play first combo break sound",
-                    Keywords = new[] { "regardless", "combobreak.wav" },
-                    Bindable = config.GetBindable<bool>(OsuSetting.AlwaysPlayFirstComboBreak)
-                },
                 new SettingsEnumDropdown<ScoreMeterType>
                 {
                     LabelText = "Score meter type",

From 2626ab41c3e38b775896c652c59f7b4b0ee335d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Jul 2020 20:15:29 +0900
Subject: [PATCH 03725/10326] Add implicit braces for clarity

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

diff --git a/osu.Game/Screens/Play/ComboEffects.cs b/osu.Game/Screens/Play/ComboEffects.cs
index a836b6137e..5bcda50399 100644
--- a/osu.Game/Screens/Play/ComboEffects.cs
+++ b/osu.Game/Screens/Play/ComboEffects.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Screens.Play
 
         private void onComboChange(ValueChangedEvent<int> combo)
         {
-            if (combo.NewValue == 0 && (combo.OldValue > 20 || alwaysPlay.Value && firstTime))
+            if (combo.NewValue == 0 && (combo.OldValue > 20 || (alwaysPlay.Value && firstTime)))
             {
                 comboBreakSample?.Play();
                 firstTime = false;

From b64ddf061ea5ba2aa1aa479ccbbba148df5018d9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 14 Jul 2020 20:37:21 +0900
Subject: [PATCH 03726/10326] Remove whitespace

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

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 08b2acc2ef..6ae420b162 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Input.Bindings
 
         [Description("Toggle notifications")]
         ToggleNotifications,
-        
+
         [Description("Pause")]
         PauseGameplay,
     }

From 4c2294f0cd65ebce410d979af5f3b7b395da64ef Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 14 Jul 2020 15:02:29 +0300
Subject: [PATCH 03727/10326] Refactor LoadRepliesButton to inherit
 LoadingButton

---
 .../TestSceneCommentRepliesButton.cs          |  5 +++-
 .../Comments/Buttons/CommentRepliesButton.cs  | 12 +++-------
 .../Comments/Buttons/LoadRepliesButton.cs     | 23 ++++++++++++++++--
 .../Comments/Buttons/ShowRepliesButton.cs     |  4 ++++
 osu.Game/Overlays/Comments/DrawableComment.cs | 24 ++-----------------
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
index c2dc804385..c2ac5179c9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
@@ -33,7 +33,10 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Children = new Drawable[]
                 {
                     button = new TestButton(),
-                    new LoadRepliesButton(),
+                    new LoadRepliesButton
+                    {
+                        Action = () => { }
+                    },
                     new ShowRepliesButton(1),
                     new ShowRepliesButton(2)
                 }
diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index abe80722e2..f7e0cb0a6c 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.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;
@@ -17,8 +16,6 @@ namespace osu.Game.Overlays.Comments.Buttons
 {
     public abstract class CommentRepliesButton : CompositeDrawable
     {
-        public Action Action { get; set; }
-
         protected string Text
         {
             get => text.Text;
@@ -72,6 +69,7 @@ namespace osu.Game.Overlays.Comments.Buttons
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
+                                        AlwaysPresent = true,
                                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
                                     },
                                     icon = new SpriteIcon
@@ -99,6 +97,8 @@ namespace osu.Game.Overlays.Comments.Buttons
 
         protected void SetIconDirection(bool upwards) => icon.ScaleTo(new Vector2(1, upwards ? -1 : 1));
 
+        public void ToggleTextVisibility(bool visible) => text.FadeTo(visible ? 1 : 0, 200, Easing.OutQuint);
+
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
@@ -113,11 +113,5 @@ namespace osu.Game.Overlays.Comments.Buttons
             background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint);
             icon.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
         }
-
-        protected override bool OnClick(ClickEvent e)
-        {
-            Action?.Invoke();
-            return base.OnClick(e);
-        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.cs
index 9387c95758..4998e5391e 100644
--- a/osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/LoadRepliesButton.cs
@@ -1,13 +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.Game.Graphics.UserInterface;
+
 namespace osu.Game.Overlays.Comments.Buttons
 {
-    public class LoadRepliesButton : CommentRepliesButton
+    public class LoadRepliesButton : LoadingButton
     {
+        private ButtonContent content;
+
         public LoadRepliesButton()
         {
-            Text = "load replies";
+            AutoSizeAxes = Axes.Both;
+        }
+
+        protected override Drawable CreateContent() => content = new ButtonContent();
+
+        protected override void OnLoadStarted() => content.ToggleTextVisibility(false);
+
+        protected override void OnLoadFinished() => content.ToggleTextVisibility(true);
+
+        private class ButtonContent : CommentRepliesButton
+        {
+            public ButtonContent()
+            {
+                Text = "load replies";
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
index e2023c2f58..aeb33e6756 100644
--- a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.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 Humanizer;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
@@ -9,6 +10,8 @@ namespace osu.Game.Overlays.Comments.Buttons
 {
     public class ShowRepliesButton : CommentRepliesButton
     {
+        public Action Action;
+
         public readonly BindableBool Expanded = new BindableBool(true);
 
         public ShowRepliesButton(int count)
@@ -25,6 +28,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         protected override bool OnClick(ClickEvent e)
         {
             Expanded.Toggle();
+            Action?.Invoke();
             return base.OnClick(e);
         }
     }
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 731ebe7104..3cdc0a0cbd 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -22,7 +22,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using System.Collections.Specialized;
 using osu.Game.Overlays.Comments.Buttons;
-using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -52,7 +51,6 @@ namespace osu.Game.Overlays.Comments
         private ShowRepliesButton showRepliesButton;
         private ChevronButton chevronButton;
         private DeletedCommentsCounter deletedCommentsCounter;
-        private LoadingSpinner loading;
 
         public DrawableComment(Comment comment)
         {
@@ -194,12 +192,7 @@ namespace osu.Game.Overlays.Comments
                                                         },
                                                         loadRepliesButton = new LoadRepliesButton
                                                         {
-                                                            Action = () =>
-                                                            {
-                                                                RepliesRequested(this, ++currentPage);
-                                                                loadRepliesButton.Hide();
-                                                                loading.Show();
-                                                            }
+                                                            Action = () => RepliesRequested(this, ++currentPage)
                                                         }
                                                     }
                                                 }
@@ -209,17 +202,6 @@ namespace osu.Game.Overlays.Comments
                                 }
                             }
                         },
-                        loading = new LoadingSpinner
-                        {
-                            Anchor = Anchor.TopLeft,
-                            Origin = Anchor.TopLeft,
-                            Size = new Vector2(15),
-                            Margin = new MarginPadding
-                            {
-                                Vertical = 5,
-                                Left = 80
-                            }
-                        },
                         childCommentsVisibilityContainer = new FillFlowContainer
                         {
                             RelativeSizeAxes = Axes.X,
@@ -372,9 +354,7 @@ namespace osu.Game.Overlays.Comments
             if (Comment.IsTopLevel)
                 chevronButton.FadeTo(loadedReplesCount != 0 ? 1 : 0);
 
-            showMoreButton.IsLoading = false;
-            loading.Hide();
-            loading.FinishTransforms();
+            showMoreButton.IsLoading = loadRepliesButton.IsLoading = false;
         }
 
         private class ChevronButton : ShowChildrenButton

From 28006ac33f7f71fefd1dafdf490a760d260f661a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 14 Jul 2020 15:12:18 +0300
Subject: [PATCH 03728/10326] Remove unnecessary action from ShowRepliesButton

---
 osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
index aeb33e6756..e2023c2f58 100644
--- a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.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 Humanizer;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
@@ -10,8 +9,6 @@ namespace osu.Game.Overlays.Comments.Buttons
 {
     public class ShowRepliesButton : CommentRepliesButton
     {
-        public Action Action;
-
         public readonly BindableBool Expanded = new BindableBool(true);
 
         public ShowRepliesButton(int count)
@@ -28,7 +25,6 @@ namespace osu.Game.Overlays.Comments.Buttons
         protected override bool OnClick(ClickEvent e)
         {
             Expanded.Toggle();
-            Action?.Invoke();
             return base.OnClick(e);
         }
     }

From fcda4d9f15240906e1eb4f3ccbe3648a7a45e226 Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Tue, 14 Jul 2020 15:06:15 +0200
Subject: [PATCH 03729/10326] move lanecover implementation to ManiaModHidden

---
 .../Mods/ManiaModFadeIn.cs                    | 118 +-----------------
 .../Mods/ManiaModHidden.cs                    | 111 +++++++++++++++-
 2 files changed, 111 insertions(+), 118 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index 21c855dedd..bdc8cb31e5 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -1,132 +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;
-using System.Linq;
-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;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Mania.Configuration;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.UI;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModFadeIn : Mod, IApplicableToDrawableRuleset<ManiaHitObject>
+    public class ManiaModFadeIn : ManiaModHidden
     {
         public override string Name => "Fade In";
         public override string Acronym => "FI";
         public override IconUsage? Icon => OsuIcon.ModHidden;
-        public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => @"Keys appear out of nowhere!";
-        public override double ScoreMultiplier => 1;
-        public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
-
-        public void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
-        {
-            ManiaPlayfield maniaPlayfield = (ManiaPlayfield)drawableRuleset.Playfield;
-
-            foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
-            {
-                HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
-                Container hocParent = (Container)hoc.Parent;
-
-                hocParent.Remove(hoc);
-                hocParent.Add(new BufferedContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        hoc,
-                        new LaneCover(0.5f, false)
-                        {
-                            RelativeSizeAxes = Axes.Both
-                        }
-                    }
-                });
-            }
-        }
-
-        private class LaneCover : CompositeDrawable
-        {
-            private readonly Box gradient;
-            private readonly Box filled;
-
-            public LaneCover(float initialCoverage, bool reversed)
-            {
-                Blending = new BlendingParameters
-                {
-                    RGBEquation = BlendingEquation.Add,
-                    Source = BlendingType.Zero,
-                    Destination = BlendingType.One,
-                    AlphaEquation = BlendingEquation.Add,
-                    SourceAlpha = BlendingType.Zero,
-                    DestinationAlpha = BlendingType.OneMinusSrcAlpha
-                };
-                InternalChildren = new Drawable[]
-                {
-                    gradient = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        RelativePositionAxes = Axes.Both,
-                        Height = 0.25f
-                    },
-                    filled = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both
-                    }
-                };
-                Coverage = initialCoverage;
-                Reversed = reversed;
-            }
-
-            private float coverage;
-
-            public float Coverage
-            {
-                set
-                {
-                    filled.Height = value;
-                    gradient.Y = reversed ? 1 - value - gradient.Height : value;
-                    coverage = value;
-                }
-            }
-
-            private bool reversed;
-
-            public bool Reversed
-            {
-                set
-                {
-                    filled.Anchor = value ? Anchor.BottomLeft : Anchor.TopLeft;
-                    filled.Origin = value ? Anchor.BottomLeft : Anchor.TopLeft;
-                    gradient.Colour = ColourInfo.GradientVertical(
-                        Color4.White.Opacity(value ? 0f : 1f),
-                        Color4.White.Opacity(value ? 1f : 0f)
-                    );
-
-                    reversed = value;
-                    Coverage = coverage; //re-apply coverage to update visuals
-                }
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(ManiaRulesetConfigManager configManager)
-            {
-                var scrollDirection = configManager.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection);
-
-                if (scrollDirection.Value == ManiaScrollingDirection.Up)
-                    Reversed = !reversed;
-            }
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 66b90984b4..3eafbdb671 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -2,15 +2,124 @@
 // 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.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModHidden : ModHidden
+    public class ManiaModHidden : ModHidden, IApplicableToDrawableRuleset<ManiaHitObject>
     {
         public override string Description => @"Keys fade out before you hit them!";
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
+        {
+            ManiaPlayfield maniaPlayfield = (ManiaPlayfield)drawableRuleset.Playfield;
+
+            foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
+            {
+                HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
+                Container hocParent = (Container)hoc.Parent;
+
+                hocParent.Remove(hoc);
+                hocParent.Add(new BufferedContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        hoc,
+                        new LaneCover(0.5f, false)
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    }
+                });
+            }
+        }
+
+        private class LaneCover : CompositeDrawable
+        {
+            private readonly Box gradient;
+            private readonly Box filled;
+
+            public LaneCover(float initialCoverage, bool reversed)
+            {
+                Blending = new BlendingParameters
+                {
+                    RGBEquation = BlendingEquation.Add,
+                    Source = BlendingType.Zero,
+                    Destination = BlendingType.One,
+                    AlphaEquation = BlendingEquation.Add,
+                    SourceAlpha = BlendingType.Zero,
+                    DestinationAlpha = BlendingType.OneMinusSrcAlpha
+                };
+                InternalChildren = new Drawable[]
+                {
+                    gradient = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        RelativePositionAxes = Axes.Both,
+                        Height = 0.25f
+                    },
+                    filled = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    }
+                };
+                Coverage = initialCoverage;
+                Reversed = reversed;
+            }
+
+            private float coverage;
+
+            public float Coverage
+            {
+                set
+                {
+                    filled.Height = value;
+                    gradient.Y = reversed ? 1 - value - gradient.Height : value;
+                    coverage = value;
+                }
+            }
+
+            private bool reversed;
+
+            public bool Reversed
+            {
+                set
+                {
+                    filled.Anchor = value ? Anchor.BottomLeft : Anchor.TopLeft;
+                    filled.Origin = value ? Anchor.BottomLeft : Anchor.TopLeft;
+                    gradient.Colour = ColourInfo.GradientVertical(
+                        Color4.White.Opacity(value ? 0f : 1f),
+                        Color4.White.Opacity(value ? 1f : 0f)
+                    );
+
+                    reversed = value;
+                    Coverage = coverage; //re-apply coverage to update visuals
+                }
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(ManiaRulesetConfigManager configManager)
+            {
+                var scrollDirection = configManager.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection);
+
+                if (scrollDirection.Value == ManiaScrollingDirection.Up)
+                    Reversed = !reversed;
+            }
+        }
     }
 }

From 921939f97a26a5edf965ac2c6c56f81661a4c5c2 Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Tue, 14 Jul 2020 15:12:00 +0200
Subject: [PATCH 03730/10326] extract coverage updating logic to separate
 method

---
 .../Mods/ManiaModHidden.cs                    | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 3eafbdb671..41f9948c2a 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -40,8 +40,9 @@ namespace osu.Game.Rulesets.Mania.Mods
                     Children = new Drawable[]
                     {
                         hoc,
-                        new LaneCover(0.5f, false)
+                        new LaneCover(false)
                         {
+                            Coverage = 0.5f,
                             RelativeSizeAxes = Axes.Both
                         }
                     }
@@ -54,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Mods
             private readonly Box gradient;
             private readonly Box filled;
 
-            public LaneCover(float initialCoverage, bool reversed)
+            public LaneCover(bool reversed)
             {
                 Blending = new BlendingParameters
                 {
@@ -65,6 +66,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                     SourceAlpha = BlendingType.Zero,
                     DestinationAlpha = BlendingType.OneMinusSrcAlpha
                 };
+
                 InternalChildren = new Drawable[]
                 {
                     gradient = new Box
@@ -78,19 +80,35 @@ namespace osu.Game.Rulesets.Mania.Mods
                         RelativeSizeAxes = Axes.Both
                     }
                 };
-                Coverage = initialCoverage;
+
                 Reversed = reversed;
             }
 
+            private void updateCoverage()
+            {
+                filled.Anchor = reversed ? Anchor.BottomLeft : Anchor.TopLeft;
+                filled.Origin = reversed ? Anchor.BottomLeft : Anchor.TopLeft;
+                filled.Height = coverage;
+
+                gradient.Y = reversed ? 1 - filled.Height - gradient.Height : coverage;
+                gradient.Colour = ColourInfo.GradientVertical(
+                    Color4.White.Opacity(reversed ? 0f : 1f),
+                    Color4.White.Opacity(reversed ? 1f : 0f)
+                );
+            }
+
             private float coverage;
 
             public float Coverage
             {
                 set
                 {
-                    filled.Height = value;
-                    gradient.Y = reversed ? 1 - value - gradient.Height : value;
+                    if (coverage == value)
+                        return;
+
                     coverage = value;
+
+                    updateCoverage();
                 }
             }
 
@@ -100,15 +118,12 @@ namespace osu.Game.Rulesets.Mania.Mods
             {
                 set
                 {
-                    filled.Anchor = value ? Anchor.BottomLeft : Anchor.TopLeft;
-                    filled.Origin = value ? Anchor.BottomLeft : Anchor.TopLeft;
-                    gradient.Colour = ColourInfo.GradientVertical(
-                        Color4.White.Opacity(value ? 0f : 1f),
-                        Color4.White.Opacity(value ? 1f : 0f)
-                    );
+                    if (reversed == value)
+                        return;
 
                     reversed = value;
-                    Coverage = coverage; //re-apply coverage to update visuals
+
+                    updateCoverage();
                 }
             }
 

From c2c80d2a9891acd9959f3598249ca5cfabaf1b9c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 14 Jul 2020 17:34:01 +0300
Subject: [PATCH 03731/10326] Refactor SpotlightSelector layout

---
 .../Overlays/Rankings/SpotlightSelector.cs    | 75 ++++++++++++-------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index f019b50ae8..4d07d6c118 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -50,10 +50,11 @@ namespace osu.Game.Overlays.Rankings
         public SpotlightSelector()
         {
             RelativeSizeAxes = Axes.X;
-            Height = 100;
+            AutoSizeAxes = Axes.Y;
             Add(content = new Container
             {
-                RelativeSizeAxes = Axes.Both,
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
                 Children = new Drawable[]
                 {
                     background = new Box
@@ -62,31 +63,52 @@ namespace osu.Game.Overlays.Rankings
                     },
                     new Container
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
-                        Children = new Drawable[]
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN },
+                        Child = new FillFlowContainer
                         {
-                            dropdown = new SpotlightsDropdown
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Vertical,
+                            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[]
+                                new Container
                                 {
-                                    startDateColumn = new InfoColumn(@"Start Date"),
-                                    endDateColumn = new InfoColumn(@"End Date"),
-                                    mapCountColumn = new InfoColumn(@"Map Count"),
-                                    participantsColumn = new InfoColumn(@"Participants")
+                                    Margin = new MarginPadding { Vertical = 20 },
+                                    RelativeSizeAxes = Axes.X,
+                                    Height = 40,
+                                    Depth = -float.MaxValue,
+                                    Child = dropdown = new SpotlightsDropdown
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        Current = Current
+                                    }
+                                },
+                                new FillFlowContainer
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                    Spacing = new Vector2(10, 0),
+                                    Margin = new MarginPadding { Vertical = 5 },
+                                    Children = new Drawable[]
+                                    {
+                                        startDateColumn = new InfoColumn(@"Start Date"),
+                                        endDateColumn = new InfoColumn(@"End Date"),
+                                        mapCountColumn = new InfoColumn(@"Map Count"),
+                                        participantsColumn = new InfoColumn(@"Participants")
+                                    }
+                                },
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Padding = new MarginPadding { Vertical = 20 },
+                                    Child = new RankingsSortTabControl
+                                    {
+                                        Anchor = Anchor.CentreRight,
+                                        Origin = Anchor.CentreRight
+                                    }
                                 }
                             }
                         }
@@ -128,12 +150,13 @@ namespace osu.Game.Overlays.Rankings
             {
                 AutoSizeAxes = Axes.Both;
                 Direction = FillDirection.Vertical;
+                Margin = new MarginPadding { Vertical = 10 };
                 Children = new Drawable[]
                 {
                     new OsuSpriteText
                     {
                         Text = name,
-                        Font = OsuFont.GetFont(size: 10),
+                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.Regular),
                     },
                     new Container
                     {
@@ -143,7 +166,7 @@ namespace osu.Game.Overlays.Rankings
                         {
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft,
-                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Light),
+                            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Light),
                         }
                     }
                 };

From 25fb49d59fe5e9fb122eec309e4c034a0a1100cb Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Tue, 14 Jul 2020 16:43:15 +0200
Subject: [PATCH 03732/10326] bind laneCover direction to scroll direction

---
 .../Mods/ManiaModHidden.cs                    | 36 +++++++------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 41f9948c2a..fd65edd482 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -4,6 +4,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;
@@ -40,7 +41,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                     Children = new Drawable[]
                     {
                         hoc,
-                        new LaneCover(false)
+                        new LaneCover
                         {
                             Coverage = 0.5f,
                             RelativeSizeAxes = Axes.Both
@@ -54,8 +55,10 @@ namespace osu.Game.Rulesets.Mania.Mods
         {
             private readonly Box gradient;
             private readonly Box filled;
+            private bool reversed;
+            private readonly Bindable<ManiaScrollingDirection> scrollDirection = new Bindable<ManiaScrollingDirection>();
 
-            public LaneCover(bool reversed)
+            public LaneCover()
             {
                 Blending = new BlendingParameters
                 {
@@ -80,8 +83,6 @@ namespace osu.Game.Rulesets.Mania.Mods
                         RelativeSizeAxes = Axes.Both
                     }
                 };
-
-                Reversed = reversed;
             }
 
             private void updateCoverage()
@@ -97,6 +98,12 @@ namespace osu.Game.Rulesets.Mania.Mods
                 );
             }
 
+            private void onScrollDirectionChanged(ValueChangedEvent<ManiaScrollingDirection> valueChangedEvent)
+            {
+                reversed = valueChangedEvent.NewValue == ManiaScrollingDirection.Up;
+                updateCoverage();
+            }
+
             private float coverage;
 
             public float Coverage
@@ -112,28 +119,11 @@ namespace osu.Game.Rulesets.Mania.Mods
                 }
             }
 
-            private bool reversed;
-
-            public bool Reversed
-            {
-                set
-                {
-                    if (reversed == value)
-                        return;
-
-                    reversed = value;
-
-                    updateCoverage();
-                }
-            }
-
             [BackgroundDependencyLoader]
             private void load(ManiaRulesetConfigManager configManager)
             {
-                var scrollDirection = configManager.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection);
-
-                if (scrollDirection.Value == ManiaScrollingDirection.Up)
-                    Reversed = !reversed;
+                scrollDirection.BindTo(configManager.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection));
+                scrollDirection.BindValueChanged(onScrollDirectionChanged, true);
             }
         }
     }

From 3b7d52da099035167da942935730429160a33447 Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Tue, 14 Jul 2020 16:48:14 +0200
Subject: [PATCH 03733/10326] rearrange LaneCover members

---
 osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index fd65edd482..ae927e5cd4 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -85,6 +85,13 @@ namespace osu.Game.Rulesets.Mania.Mods
                 };
             }
 
+            [BackgroundDependencyLoader]
+            private void load(ManiaRulesetConfigManager configManager)
+            {
+                scrollDirection.BindTo(configManager.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection));
+                scrollDirection.BindValueChanged(onScrollDirectionChanged, true);
+            }
+
             private void updateCoverage()
             {
                 filled.Anchor = reversed ? Anchor.BottomLeft : Anchor.TopLeft;
@@ -118,13 +125,6 @@ namespace osu.Game.Rulesets.Mania.Mods
                     updateCoverage();
                 }
             }
-
-            [BackgroundDependencyLoader]
-            private void load(ManiaRulesetConfigManager configManager)
-            {
-                scrollDirection.BindTo(configManager.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection));
-                scrollDirection.BindValueChanged(onScrollDirectionChanged, true);
-            }
         }
     }
 }

From f73fd7ffe9ce7dbeab4e0bb120083f1ffd8bd5ce Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Tue, 14 Jul 2020 17:04:09 +0200
Subject: [PATCH 03734/10326] read scroll direction from IScrollingInfo instead
 of config

---
 osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index ae927e5cd4..af6fc24983 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -10,11 +10,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Mods
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Mods
             private readonly Box gradient;
             private readonly Box filled;
             private bool reversed;
-            private readonly Bindable<ManiaScrollingDirection> scrollDirection = new Bindable<ManiaScrollingDirection>();
+            private readonly IBindable<ScrollingDirection> scrollDirection = new Bindable<ScrollingDirection>();
 
             public LaneCover()
             {
@@ -86,9 +86,9 @@ namespace osu.Game.Rulesets.Mania.Mods
             }
 
             [BackgroundDependencyLoader]
-            private void load(ManiaRulesetConfigManager configManager)
+            private void load(IScrollingInfo configManager)
             {
-                scrollDirection.BindTo(configManager.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection));
+                scrollDirection.BindTo(configManager.Direction);
                 scrollDirection.BindValueChanged(onScrollDirectionChanged, true);
             }
 
@@ -105,9 +105,9 @@ namespace osu.Game.Rulesets.Mania.Mods
                 );
             }
 
-            private void onScrollDirectionChanged(ValueChangedEvent<ManiaScrollingDirection> valueChangedEvent)
+            private void onScrollDirectionChanged(ValueChangedEvent<ScrollingDirection> valueChangedEvent)
             {
-                reversed = valueChangedEvent.NewValue == ManiaScrollingDirection.Up;
+                reversed = valueChangedEvent.NewValue == ScrollingDirection.Up;
                 updateCoverage();
             }
 

From 3d9e174ae8369f6a655e7781ea4af73470a585bb Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 14 Jul 2020 18:09:09 +0300
Subject: [PATCH 03735/10326] Make sort changes affect request result

---
 .../Visual/Online/TestSceneRankingsTables.cs          |  3 ++-
 .../API/Requests/GetSpotlightRankingsRequest.cs       |  6 +++++-
 osu.Game/Overlays/Rankings/SpotlightSelector.cs       | 11 ++++++-----
 osu.Game/Overlays/Rankings/SpotlightsLayout.cs        | 10 +++++++---
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
index a3b102dc76..ee109189c7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Catch;
 using osu.Framework.Allocation;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Rankings;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -105,7 +106,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             onLoadStarted();
 
-            request = new GetSpotlightRankingsRequest(ruleset, spotlight);
+            request = new GetSpotlightRankingsRequest(ruleset, spotlight, RankingsSortCriteria.All);
             ((GetSpotlightRankingsRequest)request).Success += rankings => Schedule(() =>
             {
                 var table = new ScoresTable(1, rankings.Users);
diff --git a/osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs b/osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs
index a279db134f..25e6b3f1af 100644
--- a/osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.IO.Network;
+using osu.Game.Overlays.Rankings;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Online.API.Requests
@@ -9,11 +10,13 @@ namespace osu.Game.Online.API.Requests
     public class GetSpotlightRankingsRequest : GetRankingsRequest<GetSpotlightRankingsResponse>
     {
         private readonly int spotlight;
+        private readonly RankingsSortCriteria sort;
 
-        public GetSpotlightRankingsRequest(RulesetInfo ruleset, int spotlight)
+        public GetSpotlightRankingsRequest(RulesetInfo ruleset, int spotlight, RankingsSortCriteria sort)
             : base(ruleset, 1)
         {
             this.spotlight = spotlight;
+            this.sort = sort;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -21,6 +24,7 @@ namespace osu.Game.Online.API.Requests
             var req = base.CreateWebRequest();
 
             req.AddParameter("spotlight", spotlight.ToString());
+            req.AddParameter("filter", sort.ToString().ToLower());
 
             return req;
         }
diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index 4d07d6c118..fbea53782b 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -22,10 +22,8 @@ namespace osu.Game.Overlays.Rankings
     {
         private const int duration = 300;
 
-        private readonly Box background;
-        private readonly SpotlightsDropdown dropdown;
-
         private readonly BindableWithCurrent<APISpotlight> current = new BindableWithCurrent<APISpotlight>();
+        public readonly Bindable<RankingsSortCriteria> Sort = new Bindable<RankingsSortCriteria>();
 
         public Bindable<APISpotlight> Current
         {
@@ -41,11 +39,13 @@ namespace osu.Game.Overlays.Rankings
 
         protected override bool StartHidden => true;
 
+        private readonly Box background;
+        private readonly Container content;
+        private readonly SpotlightsDropdown dropdown;
         private readonly InfoColumn startDateColumn;
         private readonly InfoColumn endDateColumn;
         private readonly InfoColumn mapCountColumn;
         private readonly InfoColumn participantsColumn;
-        private readonly Container content;
 
         public SpotlightSelector()
         {
@@ -107,7 +107,8 @@ namespace osu.Game.Overlays.Rankings
                                     Child = new RankingsSortTabControl
                                     {
                                         Anchor = Anchor.CentreRight,
-                                        Origin = Anchor.CentreRight
+                                        Origin = Anchor.CentreRight,
+                                        Current = Sort
                                     }
                                 }
                             }
diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
index 917509e842..0f9b07bf89 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Overlays.Rankings
         public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
 
         private readonly Bindable<APISpotlight> selectedSpotlight = new Bindable<APISpotlight>();
+        private readonly Bindable<RankingsSortCriteria> sort = new Bindable<RankingsSortCriteria>();
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -72,6 +73,8 @@ namespace osu.Game.Overlays.Rankings
                     }
                 }
             };
+
+            sort.BindTo(selector.Sort);
         }
 
         protected override void LoadComplete()
@@ -80,7 +83,8 @@ namespace osu.Game.Overlays.Rankings
 
             selector.Show();
 
-            selectedSpotlight.BindValueChanged(onSpotlightChanged);
+            selectedSpotlight.BindValueChanged(_ => onSpotlightChanged());
+            sort.BindValueChanged(_ => onSpotlightChanged());
             Ruleset.BindValueChanged(onRulesetChanged);
 
             getSpotlights();
@@ -101,14 +105,14 @@ namespace osu.Game.Overlays.Rankings
             selectedSpotlight.TriggerChange();
         }
 
-        private void onSpotlightChanged(ValueChangedEvent<APISpotlight> spotlight)
+        private void onSpotlightChanged()
         {
             loading.Show();
 
             cancellationToken?.Cancel();
             getRankingsRequest?.Cancel();
 
-            getRankingsRequest = new GetSpotlightRankingsRequest(Ruleset.Value, spotlight.NewValue.Id);
+            getRankingsRequest = new GetSpotlightRankingsRequest(Ruleset.Value, selectedSpotlight.Value.Id, sort.Value);
             getRankingsRequest.Success += onSuccess;
             api.Queue(getRankingsRequest);
         }

From 85c875757219da92b49e4d3582def1653ae2c8f6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 14 Jul 2020 21:18:46 +0300
Subject: [PATCH 03736/10326] Return true on click

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

diff --git a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
index e2023c2f58..04e7e25cc5 100644
--- a/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         protected override bool OnClick(ClickEvent e)
         {
             Expanded.Toggle();
-            return base.OnClick(e);
+            return true;
         }
     }
 }

From 21ed9df1ea49fe4c97b9156f737ab62adea4711d Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 14 Jul 2020 13:14:59 -0700
Subject: [PATCH 03737/10326] Add xmldoc for OnBackButton

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

diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index 6ed04291ce..5f9f611a24 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -57,6 +57,9 @@ namespace osu.Game.Screens
         /// </summary>
         bool AllowRateAdjustments { get; }
 
+        /// <summary>
+        /// Whether there are sub overlays/screens that need closing with the back button before this <see cref="IOsuScreen"/> can be exited.
+        /// </summary>
         bool OnBackButton();
     }
 }

From 73e1bf0d89ec605011cb6e7270cc4c2b3ca31307 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 14 Jul 2020 13:19:48 -0700
Subject: [PATCH 03738/10326] Check sub screen's OnBackButton instead

---
 osu.Game/Screens/Multi/Multiplayer.cs | 11 +++--------
 osu.Game/Screens/Select/SongSelect.cs |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 2a73b53199..951f21dc2d 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -20,9 +20,9 @@ using osu.Game.Online.Multiplayer;
 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;
 using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Select;
 using osuTK;
 
 namespace osu.Game.Screens.Multi
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Multi
         private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
 
         [Cached]
-        private readonly Bindable<Lounge.Components.FilterCriteria> currentFilter = new Bindable<Lounge.Components.FilterCriteria>(new Lounge.Components.FilterCriteria());
+        private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
         [Cached(Type = typeof(IRoomManager))]
         private RoomManager roomManager;
@@ -265,13 +265,8 @@ namespace osu.Game.Screens.Multi
 
         public override bool OnBackButton()
         {
-            var songSelect = screenStack.CurrentScreen as MatchSongSelect;
-
-            if (songSelect?.ModSelect.State.Value == Visibility.Visible)
-            {
-                songSelect.ModSelect.Hide();
+            if ((screenStack.CurrentScreen as IMultiplayerSubScreen).OnBackButton())
                 return true;
-            }
 
             if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
             {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 87fad66b66..74a5ee8309 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        public ModSelectOverlay ModSelect { get; private set; }
+        protected ModSelectOverlay ModSelect { get; private set; }
 
         protected SampleChannel SampleConfirm { get; private set; }
 

From 79f6092344f01b3bb263c769af4d281edb6dd213 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 14 Jul 2020 13:31:15 -0700
Subject: [PATCH 03739/10326] Fix back button not glowing when closing mod
 select with escape

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 3d0ad1a594..c4a59b57cb 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
 using osu.Game.Overlays.Mods.Sections;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
@@ -489,5 +490,7 @@ namespace osu.Game.Overlays.Mods
         }
 
         #endregion
+
+        public override bool OnPressed(GlobalAction action) => false; // handled by back button
     }
 }

From ecbd8067e9f513682a5ae9cb1fcf9cf1d3dc7a57 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 14 Jul 2020 20:18:47 -0700
Subject: [PATCH 03740/10326] Add ability to seek replays/auto with arrow keys

---
 osu.Game/Screens/Play/SongProgressBar.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Play/SongProgressBar.cs b/osu.Game/Screens/Play/SongProgressBar.cs
index 5052b32335..939b5fad1f 100644
--- a/osu.Game/Screens/Play/SongProgressBar.cs
+++ b/osu.Game/Screens/Play/SongProgressBar.cs
@@ -57,6 +57,8 @@ namespace osu.Game.Screens.Play
             set => CurrentNumber.Value = value;
         }
 
+        protected override bool AllowKeyboardInputWhenNotHovered => true;
+
         public SongProgressBar(float barHeight, float handleBarHeight, Vector2 handleSize)
         {
             CurrentNumber.MinValue = 0;

From 350a4a153bc88948bf47763ee42d635b19d642fd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Jul 2020 12:59:31 +0900
Subject: [PATCH 03741/10326] Fix possible nullref

---
 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 951f21dc2d..269eab5772 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -265,7 +265,7 @@ namespace osu.Game.Screens.Multi
 
         public override bool OnBackButton()
         {
-            if ((screenStack.CurrentScreen as IMultiplayerSubScreen).OnBackButton())
+            if ((screenStack.CurrentScreen as IMultiplayerSubScreen)?.OnBackButton() == true)
                 return true;
 
             if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))

From e2c043737dbe4c95f8273488cfdac437474072fd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Jul 2020 13:08:57 +0900
Subject: [PATCH 03742/10326] Reword xmldoc to specify intended usage

---
 osu.Game/Screens/IOsuScreen.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index 5f9f611a24..761f842c22 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -58,8 +58,12 @@ namespace osu.Game.Screens
         bool AllowRateAdjustments { get; }
 
         /// <summary>
-        /// Whether there are sub overlays/screens that need closing with the back button before this <see cref="IOsuScreen"/> can be exited.
+        /// Invoked when the back button has been pressed to close any overlays before exiting this <see cref="IOsuScreen"/>.
         /// </summary>
+        /// <remarks>
+        /// Return <c>true</c> to block this <see cref="IOsuScreen"/> from being exited after closing an overlay.
+        /// Return <c>false</c> if this <see cref="IOsuScreen"/> should continue exiting.
+        /// </remarks>
         bool OnBackButton();
     }
 }

From d8ebb8e3eb0385fb6046e78b41268ebf56c261c1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Jul 2020 13:17:22 +0900
Subject: [PATCH 03743/10326] Move override to a bit better location

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index c4a59b57cb..8a5e4d2683 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -404,6 +404,8 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
+        public override bool OnPressed(GlobalAction action) => false; // handled by back button
+
         private void availableModsChanged(ValueChangedEvent<Dictionary<ModType, IReadOnlyList<Mod>>> mods)
         {
             if (mods.NewValue == null) return;
@@ -490,7 +492,5 @@ namespace osu.Game.Overlays.Mods
         }
 
         #endregion
-
-        public override bool OnPressed(GlobalAction action) => false; // handled by back button
     }
 }

From d1aedd15c4817bce96567768e33ae9e3606357bb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Jul 2020 13:35:40 +0900
Subject: [PATCH 03744/10326] Add noto-thai font

---
 osu.Game/OsuGameBase.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index c79f710151..dd120937af 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -152,6 +152,7 @@ namespace osu.Game
             AddFont(Resources, @"Fonts/Noto-Hangul");
             AddFont(Resources, @"Fonts/Noto-CJK-Basic");
             AddFont(Resources, @"Fonts/Noto-CJK-Compatibility");
+            AddFont(Resources, @"Fonts/Noto-Thai");
 
             AddFont(Resources, @"Fonts/Venera-Light");
             AddFont(Resources, @"Fonts/Venera-Bold");

From ec3fe8d34660ea5bc4d8cb3187f925c7423dfcb0 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 14 Jul 2020 21:59:26 -0700
Subject: [PATCH 03745/10326] Add test for arrow key seeking

---
 osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 0be949650e..067fa5ae96 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.Break;
 using osu.Game.Screens.Ranking;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -34,6 +35,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("overlay displays 100% accuracy", () => Player.BreakOverlay.ChildrenOfType<BreakInfo>().Single().AccuracyDisplay.Current.Value == 1);
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-80000));
             AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
+            AddStep("seek with right arrow key", () => press(Key.Right));
+            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 2));
 
             seekToBreak(0);
             seekToBreak(1);
@@ -54,5 +57,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             BreakPeriod destBreak() => Beatmap.Value.Beatmap.Breaks.ElementAt(breakIndex);
         }
+
+        private void press(Key key)
+        {
+            InputManager.PressKey(key);
+            InputManager.ReleaseKey(key);
+        }
     }
 }

From 0043bd74bac5e8b0e68b7cb68b7d6ecd8be3e492 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 15 Jul 2020 08:27:46 +0300
Subject: [PATCH 03746/10326] Rework SpotlightSelector header layout

---
 .../Overlays/Rankings/SpotlightSelector.cs    | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index fbea53782b..f112c1ec43 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -85,30 +85,32 @@ namespace osu.Game.Overlays.Rankings
                                         Current = Current
                                     }
                                 },
-                                new FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Direction = FillDirection.Horizontal,
-                                    Spacing = new Vector2(10, 0),
-                                    Margin = new MarginPadding { Vertical = 5 },
-                                    Children = new Drawable[]
-                                    {
-                                        startDateColumn = new InfoColumn(@"Start Date"),
-                                        endDateColumn = new InfoColumn(@"End Date"),
-                                        mapCountColumn = new InfoColumn(@"Map Count"),
-                                        participantsColumn = new InfoColumn(@"Participants")
-                                    }
-                                },
                                 new Container
                                 {
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
-                                    Padding = new MarginPadding { Vertical = 20 },
-                                    Child = new RankingsSortTabControl
+                                    Children = new Drawable[]
                                     {
-                                        Anchor = Anchor.CentreRight,
-                                        Origin = Anchor.CentreRight,
-                                        Current = Sort
+                                        new FillFlowContainer
+                                        {
+                                            AutoSizeAxes = Axes.Both,
+                                            Direction = FillDirection.Horizontal,
+                                            Spacing = new Vector2(10, 0),
+                                            Margin = new MarginPadding { Bottom = 5 },
+                                            Children = new Drawable[]
+                                            {
+                                                startDateColumn = new InfoColumn(@"Start Date"),
+                                                endDateColumn = new InfoColumn(@"End Date"),
+                                                mapCountColumn = new InfoColumn(@"Map Count"),
+                                                participantsColumn = new InfoColumn(@"Participants")
+                                            }
+                                        },
+                                        new RankingsSortTabControl
+                                        {
+                                            Anchor = Anchor.CentreRight,
+                                            Origin = Anchor.CentreRight,
+                                            Current = Sort
+                                        }
                                     }
                                 }
                             }

From 0125a7ef3b5dc15c3b49de6990b1b04bc5809bbe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Jul 2020 15:36:17 +0900
Subject: [PATCH 03747/10326] Fix single-frame glitch in SS grade display
 animation

---
 .../Screens/Ranking/Expanded/Accuracy/RankText.cs    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
index 8343716e7e..cc732382f4 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
@@ -77,11 +77,10 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                     Origin = Anchor.Centre,
                     BlurSigma = new Vector2(35),
                     BypassAutoSizeAxes = Axes.Both,
-                    RelativeSizeAxes = Axes.Both,
+                    Size = new Vector2(200),
                     CacheDrawnFrameBuffer = true,
                     Blending = BlendingParameters.Additive,
                     Alpha = 0,
-                    Size = new Vector2(2f), // increase buffer size to allow for scale
                     Scale = new Vector2(1.8f),
                     Children = new[]
                     {
@@ -122,15 +121,18 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
             }
 
             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);
+                flash.FadeOutFromOne(3000);
+                superFlash.FadeOutFromOne(800, Easing.OutQuint);
+            }
+            else
+            {
+                flash.FadeOutFromOne(1200, Easing.OutQuint);
             }
         }
     }

From fa407d2c7b5312d274334be3567a4f52feb95708 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Jul 2020 16:42:37 +0900
Subject: [PATCH 03748/10326] Make tests better

---
 osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 067fa5ae96..4743317fdd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -35,8 +35,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("overlay displays 100% accuracy", () => Player.BreakOverlay.ChildrenOfType<BreakInfo>().Single().AccuracyDisplay.Current.Value == 1);
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-80000));
             AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
+
+            double? time = null;
+
+            AddStep("store time", () => time = Player.GameplayClockContainer.GameplayClock.CurrentTime);
+
+            // test seek via keyboard
             AddStep("seek with right arrow key", () => press(Key.Right));
-            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 2));
+            AddAssert("time seeked forward", () => Player.GameplayClockContainer.GameplayClock.CurrentTime > time + 2000);
+
+            AddStep("store time", () => time = Player.GameplayClockContainer.GameplayClock.CurrentTime);
+            AddStep("seek with left arrow key", () => press(Key.Left));
+            AddAssert("time seeked backward", () => Player.GameplayClockContainer.GameplayClock.CurrentTime < time);
 
             seekToBreak(0);
             seekToBreak(1);

From e95a1beaef5cda4fab4977612546f4211d04accd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Jul 2020 16:53:27 +0900
Subject: [PATCH 03749/10326] Update state after applying hitobject

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 44afb7a227..b633cb0860 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -147,8 +147,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
             samplesBindable = HitObject.SamplesBindable.GetBoundCopy();
             samplesBindable.CollectionChanged += (_, __) => loadSamples();
 
-            updateState(ArmedState.Idle, true);
             apply(HitObject);
+
+            updateState(ArmedState.Idle, true);
         }
 
         private void loadSamples()

From f13bde68e665088021ee1db2c43565557b30b6e8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Jul 2020 16:53:36 +0900
Subject: [PATCH 03750/10326] Add test for catch hidden mod

---
 .../TestSceneCatchModHidden.cs                | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
new file mode 100644
index 0000000000..f15da29993
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Catch.Mods;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Catch.UI;
+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 TestSceneCatchModHidden : ModTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            LocalConfig.Set(OsuSetting.IncreaseFirstObjectVisibility, false);
+        }
+
+        [Test]
+        public void TestJuiceStream()
+        {
+            CreateModTest(new ModTestData
+            {
+                Beatmap = new Beatmap
+                {
+                    HitObjects = new List<HitObject>
+                    {
+                        new JuiceStream
+                        {
+                            StartTime = 1000,
+                            Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(0, -192) }),
+                            X = CatchPlayfield.WIDTH / 2
+                        }
+                    }
+                },
+                Mod = new CatchModHidden(),
+                PassCondition = () => Player.Results.Count > 0
+                                      && Player.ChildrenOfType<DrawableJuiceStream>().Single().Alpha > 0
+                                      && Player.ChildrenOfType<DrawableFruit>().Last().Alpha > 0
+            });
+        }
+
+        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
+    }
+}

From b43b1673ccd2311aa2d75f89efb3dcaa5df872cc Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Wed, 15 Jul 2020 10:41:34 +0200
Subject: [PATCH 03751/10326] fix leftover parameter name

---
 osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index af6fc24983..1c97638697 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -86,9 +86,9 @@ namespace osu.Game.Rulesets.Mania.Mods
             }
 
             [BackgroundDependencyLoader]
-            private void load(IScrollingInfo configManager)
+            private void load(IScrollingInfo scrollingInfo)
             {
-                scrollDirection.BindTo(configManager.Direction);
+                scrollDirection.BindTo(scrollingInfo.Direction);
                 scrollDirection.BindValueChanged(onScrollDirectionChanged, true);
             }
 

From e12f02a634a386bfe657659605ba47335d33ac51 Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Wed, 15 Jul 2020 11:07:30 +0200
Subject: [PATCH 03752/10326] simplify reversing using rotation

---
 .../Mods/ManiaModHidden.cs                    | 42 +++++++------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 1c97638697..180341014d 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -44,7 +44,9 @@ namespace osu.Game.Rulesets.Mania.Mods
                         new LaneCover
                         {
                             Coverage = 0.5f,
-                            RelativeSizeAxes = Axes.Both
+                            RelativeSizeAxes = Axes.Both,
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre
                         }
                     }
                 });
@@ -55,7 +57,6 @@ namespace osu.Game.Rulesets.Mania.Mods
         {
             private readonly Box gradient;
             private readonly Box filled;
-            private bool reversed;
             private readonly IBindable<ScrollingDirection> scrollDirection = new Bindable<ScrollingDirection>();
 
             public LaneCover()
@@ -76,11 +77,17 @@ namespace osu.Game.Rulesets.Mania.Mods
                     {
                         RelativeSizeAxes = Axes.Both,
                         RelativePositionAxes = Axes.Both,
-                        Height = 0.25f
+                        Height = 0.25f,
+                        Colour = ColourInfo.GradientVertical(
+                            Color4.White.Opacity(0f),
+                            Color4.White.Opacity(1f)
+                        )
                     },
                     filled = new Box
                     {
-                        RelativeSizeAxes = Axes.Both
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.BottomLeft,
+                        Origin = Anchor.BottomLeft
                     }
                 };
             }
@@ -92,37 +99,18 @@ namespace osu.Game.Rulesets.Mania.Mods
                 scrollDirection.BindValueChanged(onScrollDirectionChanged, true);
             }
 
-            private void updateCoverage()
-            {
-                filled.Anchor = reversed ? Anchor.BottomLeft : Anchor.TopLeft;
-                filled.Origin = reversed ? Anchor.BottomLeft : Anchor.TopLeft;
-                filled.Height = coverage;
-
-                gradient.Y = reversed ? 1 - filled.Height - gradient.Height : coverage;
-                gradient.Colour = ColourInfo.GradientVertical(
-                    Color4.White.Opacity(reversed ? 0f : 1f),
-                    Color4.White.Opacity(reversed ? 1f : 0f)
-                );
-            }
-
             private void onScrollDirectionChanged(ValueChangedEvent<ScrollingDirection> valueChangedEvent)
             {
-                reversed = valueChangedEvent.NewValue == ScrollingDirection.Up;
-                updateCoverage();
+                bool isUpscroll = valueChangedEvent.NewValue == ScrollingDirection.Up;
+                Rotation = isUpscroll ? 180f : 0f;
             }
 
-            private float coverage;
-
             public float Coverage
             {
                 set
                 {
-                    if (coverage == value)
-                        return;
-
-                    coverage = value;
-
-                    updateCoverage();
+                    filled.Height = value;
+                    gradient.Y = 1 - filled.Height - gradient.Height;
                 }
             }
         }

From 4a2890c0540166c61e87fd456fa6951c8a45ac0b Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Wed, 15 Jul 2020 11:15:47 +0200
Subject: [PATCH 03753/10326] implement FI by flipping HD upside down

---
 osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs |  9 +++++++++
 osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs | 12 +++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index bdc8cb31e5..f6a218b268 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -3,6 +3,9 @@
 
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.UI;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
@@ -12,5 +15,11 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Acronym => "FI";
         public override IconUsage? Icon => OsuIcon.ModHidden;
         public override string Description => @"Keys appear out of nowhere!";
+
+        public override void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
+        {
+            base.ApplyToDrawableRuleset(drawableRuleset);
+            laneCovers.ForEach(laneCover => laneCover.Scale = new Vector2(1f, -1f));
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 180341014d..8748e49ab1 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -24,8 +25,9 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Description => @"Keys fade out before you hit them!";
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
+        protected List<LaneCover> laneCovers = new List<LaneCover>();
 
-        public void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
+        public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
         {
             ManiaPlayfield maniaPlayfield = (ManiaPlayfield)drawableRuleset.Playfield;
 
@@ -34,6 +36,8 @@ namespace osu.Game.Rulesets.Mania.Mods
                 HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
                 Container hocParent = (Container)hoc.Parent;
 
+                LaneCover laneCover;
+
                 hocParent.Remove(hoc);
                 hocParent.Add(new BufferedContainer
                 {
@@ -41,7 +45,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                     Children = new Drawable[]
                     {
                         hoc,
-                        new LaneCover
+                        laneCover = new LaneCover
                         {
                             Coverage = 0.5f,
                             RelativeSizeAxes = Axes.Both,
@@ -50,10 +54,12 @@ namespace osu.Game.Rulesets.Mania.Mods
                         }
                     }
                 });
+
+                laneCovers.Add(laneCover);
             }
         }
 
-        private class LaneCover : CompositeDrawable
+        protected class LaneCover : CompositeDrawable
         {
             private readonly Box gradient;
             private readonly Box filled;

From d2e78d080c87025403db5c6fbcdcf8c1d7752f50 Mon Sep 17 00:00:00 2001
From: LastExceed <chris20194@googlemail.com>
Date: Wed, 15 Jul 2020 11:29:13 +0200
Subject: [PATCH 03754/10326] fix naming convention violation

---
 osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs | 2 +-
 osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index f6a218b268..e29f2e2a00 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
         {
             base.ApplyToDrawableRuleset(drawableRuleset);
-            laneCovers.ForEach(laneCover => laneCover.Scale = new Vector2(1f, -1f));
+            LaneCovers.ForEach(laneCover => laneCover.Scale = new Vector2(1f, -1f));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 8748e49ab1..3af6ff009f 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Description => @"Keys fade out before you hit them!";
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
-        protected List<LaneCover> laneCovers = new List<LaneCover>();
+        protected List<LaneCover> LaneCovers = new List<LaneCover>();
 
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
         {
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                     }
                 });
 
-                laneCovers.Add(laneCover);
+                LaneCovers.Add(laneCover);
             }
         }
 

From 8e4f85414573d6a788cdbb050bb1bc6f80fe18eb Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Wed, 15 Jul 2020 16:34:13 +0700
Subject: [PATCH 03755/10326] initial test hit lighting catch

---
 .../TestSceneHitLighting.cs                   | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneHitLighting.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHitLighting.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHitLighting.cs
new file mode 100644
index 0000000000..c5fa957130
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHitLighting.cs
@@ -0,0 +1,96 @@
+// Copyright (c) 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.IEnumerableExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Configuration;
+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;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class TestSceneHitLighting : CatchSkinnableTestScene
+    {
+        private RulesetInfo catchRuleset;
+        private OsuConfigManager config;
+
+        public TestSceneHitLighting()
+        {
+            AddToggleStep("toggle hit lighting", enabled => createCatcher(enabled));
+            AddStep("catch fruit", () => catchFruit(new TestFruit()
+            {
+                X = this.ChildrenOfType<CatcherArea>().First().MovableCatcher.X
+            }));
+        }
+
+        private void catchFruit(Fruit fruit)
+        {
+            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 = HitResult.Great });
+
+                    drawable.Expire();
+                });
+            });
+        }
+
+        private void createCatcher(bool hitLighting)
+        {
+            config.Set(OsuSetting.HitLighting, hitLighting);
+            SetContents(() => new CatchInputManager(catchRuleset)
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new TestCatcherArea()
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.TopCentre,
+                    CreateDrawableRepresentation = ((DrawableRuleset<CatchHitObject>)catchRuleset.CreateInstance().CreateDrawableRulesetWith(new CatchBeatmap())).CreateDrawableRepresentation
+                },
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets, OsuConfigManager configManager)
+        {
+            catchRuleset = rulesets.GetRuleset(2);
+            config = configManager;
+        }
+
+        public class TestFruit : Fruit
+        {
+            public TestFruit()
+            {
+                ApplyDefaultsToSelf(new ControlPointInfo(), new BeatmapDifficulty());
+            }
+        }
+
+        private class TestCatcherArea : CatcherArea
+        {
+            public TestCatcherArea()
+                : base(new BeatmapDifficulty())
+            {
+            }
+
+            public new Catcher MovableCatcher => base.MovableCatcher;
+        }
+    }
+}

From 19ab973bb99bdcfc0cb0ff25bc64fcf0875d417d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Jul 2020 18:48:20 +0900
Subject: [PATCH 03756/10326] Add second layer to test scene

---
 .../UserInterface/TestSceneHueAnimation.cs    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
index b341291c58..9c5888d072 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Tests.Visual.UserInterface
@@ -15,6 +16,16 @@ namespace osu.Game.Tests.Visual.UserInterface
         [BackgroundDependencyLoader]
         private void load(LargeTextureStore textures)
         {
+            HueAnimation anim2;
+
+            Add(anim2 = new HueAnimation
+            {
+                RelativeSizeAxes = Axes.Both,
+                FillMode = FillMode.Fit,
+                Texture = textures.Get("Intro/Triangles/logo-highlight"),
+                Colour = Colour4.White,
+            });
+
             HueAnimation anim;
 
             Add(anim = new HueAnimation
@@ -22,10 +33,14 @@ namespace osu.Game.Tests.Visual.UserInterface
                 RelativeSizeAxes = Axes.Both,
                 FillMode = FillMode.Fit,
                 Texture = textures.Get("Intro/Triangles/logo-background"),
-                Colour = Colour4.White,
+                Colour = OsuColour.Gray(0.6f),
             });
 
-            AddSliderStep("Progress", 0f, 1f, 0f, newValue => anim.AnimationProgress = newValue);
+            AddSliderStep("Progress", 0f, 1f, 0f, newValue =>
+            {
+                anim2.AnimationProgress = newValue;
+                anim.AnimationProgress = newValue;
+            });
         }
     }
 }

From 675544ec2f63d06994659eb259fc39dac4e108d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Jul 2020 19:03:59 +0900
Subject: [PATCH 03757/10326] Tidy up colour and variable usage

---
 osu.Game/Screens/Menu/IntroTriangles.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 38da98220d..5c8e7049f0 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -283,21 +283,18 @@ namespace osu.Game.Screens.Menu
                 [BackgroundDependencyLoader]
                 private void load(TextureStore textures)
                 {
-                    const string lazer_logo_background = @"Intro/Triangles/logo-background";
-                    const string lazer_logo_highlight = @"Intro/Triangles/logo-highlight";
-
                     InternalChildren = new Drawable[]
                     {
                         highlight = new HueAnimation
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Texture = textures.Get(lazer_logo_highlight),
-                            Colour = OsuColour.Gray(1f),
+                            Texture = textures.Get(@"Intro/Triangles/logo-highlight"),
+                            Colour = Color4.White,
                         },
                         background = new HueAnimation
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Texture = textures.Get(lazer_logo_background),
+                            Texture = textures.Get(@"Intro/Triangles/logo-background"),
                             Colour = OsuColour.Gray(0.6f),
                         },
                     };

From 53a46400f50a47b3d5399ffb0444ffc84ffbbe52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Jul 2020 19:06:40 +0900
Subject: [PATCH 03758/10326] 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 85d154f2e2..71d4e5aacf 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.714.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.714.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b8e73262c4..2f3d08c528 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.714.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.714.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 1faf60b1d9..2bb3914c25 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.714.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.714.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 94834e4920200417848944b318f58e5e46c1f043 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Jul 2020 19:35:52 +0900
Subject: [PATCH 03759/10326] Select mods via exact types

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

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 7235a18a23..3701f9ecab 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Overlays.Mods
         {
             foreach (var button in buttons)
             {
-                int i = Array.FindIndex(button.Mods, m => modTypes.Any(t => t.IsInstanceOfType(m)));
+                int i = Array.FindIndex(button.Mods, m => modTypes.Any(t => t == m.GetType()));
 
                 if (i >= 0)
                     button.SelectAt(i);

From 87f7d8744de0bd3219e728f013942616c2138aa1 Mon Sep 17 00:00:00 2001
From: jorolf <jorolf@gmx.de>
Date: Wed, 15 Jul 2020 12:40:46 +0200
Subject: [PATCH 03760/10326] simplify transform

---
 osu.Game/Screens/Menu/IntroTriangles.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 5c8e7049f0..b56ba6c8a4 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -217,8 +217,7 @@ namespace osu.Game.Screens.Menu
                         // matching flyte curve y = 0.25x^2 + (max(0, x - 0.7) / 0.3) ^ 5
                         lazerLogo.FadeIn().ScaleTo(scale_start).Then().Delay(logo_scale_duration * 0.7f).ScaleTo(scale_start - scale_adjust, logo_scale_duration * 0.3f, Easing.InQuint);
 
-                        lazerLogo.TransformTo(nameof(LazerLogo.Background), 1f, logo_scale_duration);
-                        lazerLogo.TransformTo(nameof(LazerLogo.Highlight), 1f, logo_scale_duration);
+                        lazerLogo.TransformTo(nameof(LazerLogo.Progress), 1f, logo_scale_duration);
 
                         logoContainerSecondary.ScaleTo(scale_start).Then().ScaleTo(scale_start - scale_adjust * 0.25f, logo_scale_duration, Easing.InQuad);
                     }
@@ -263,16 +262,14 @@ namespace osu.Game.Screens.Menu
             {
                 private HueAnimation highlight, background;
 
-                public float Highlight
-                {
-                    get => highlight.AnimationProgress;
-                    set => highlight.AnimationProgress = value;
-                }
-
-                public float Background
+                public float Progress
                 {
                     get => background.AnimationProgress;
-                    set => background.AnimationProgress = value;
+                    set
+                    {
+                        background.AnimationProgress = value;
+                        highlight.AnimationProgress = value;
+                    }
                 }
 
                 public LazerLogo()

From 1a6ae3194e795bf011b903ff41f4e994744ad691 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 15 Jul 2020 19:45:48 +0900
Subject: [PATCH 03761/10326] Add test

---
 .../Mods/ManiaModFadeIn.cs                    |  9 +--------
 .../TestSceneModSelectOverlay.cs              | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index 4c125ad6ef..bdc8cb31e5 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.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;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModFadeIn : Mod
+    public class ManiaModFadeIn : ManiaModHidden
     {
         public override string Name => "Fade In";
         public override string Acronym => "FI";
         public override IconUsage? Icon => OsuIcon.ModHidden;
-        public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => @"Keys appear out of nowhere!";
-        public override double ScoreMultiplier => 1;
-        public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index ce691bff70..6f083f4ab6 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -13,6 +13,8 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -99,6 +101,12 @@ namespace osu.Game.Tests.Visual.UserInterface
         public void TestManiaMods()
         {
             changeRuleset(3);
+
+            var mania = new ManiaRuleset();
+
+            testModsWithSameBaseType(
+                mania.GetAllMods().Single(m => m.GetType() == typeof(ManiaModFadeIn)),
+                mania.GetAllMods().Single(m => m.GetType() == typeof(ManiaModHidden)));
         }
 
         [Test]
@@ -197,6 +205,18 @@ namespace osu.Game.Tests.Visual.UserInterface
             checkLabelColor(() => Color4.White);
         }
 
+        private void testModsWithSameBaseType(Mod modA, Mod modB)
+        {
+            selectNext(modA);
+            checkSelected(modA);
+            selectNext(modB);
+            checkSelected(modB);
+
+            // Backwards
+            selectPrevious(modA);
+            checkSelected(modA);
+        }
+
         private void selectNext(Mod mod) => AddStep($"left click {mod.Name}", () => modSelect.GetModButton(mod)?.SelectNext(1));
 
         private void selectPrevious(Mod mod) => AddStep($"right click {mod.Name}", () => modSelect.GetModButton(mod)?.SelectNext(-1));

From 2624862e32c6310e16a400bd9ad97a96a72bf0ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Jul 2020 20:58:09 +0900
Subject: [PATCH 03762/10326] Fix osu!catch dropping fruit appearing above the
 plate instead of behind

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs | 29 +++++++++++---------
 osu.Game.Rulesets.Catch/UI/Catcher.cs        | 26 +++++++++---------
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs    |  4 +--
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index d034f3c7d4..63751ecb0d 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -35,22 +35,25 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatchPlayfield(BeatmapDifficulty difficulty, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation)
         {
-            Container explodingFruitContainer;
+            var explodingFruitContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+            };
+
+            CatcherArea = new CatcherArea(difficulty)
+            {
+                CreateDrawableRepresentation = createDrawableRepresentation,
+                ExplodingFruitTarget = explodingFruitContainer,
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.TopLeft,
+            };
 
             InternalChildren = new Drawable[]
             {
-                explodingFruitContainer = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                },
-                CatcherArea = new CatcherArea(difficulty)
-                {
-                    CreateDrawableRepresentation = createDrawableRepresentation,
-                    ExplodingFruitTarget = explodingFruitContainer,
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.TopLeft,
-                },
-                HitObjectContainer
+                explodingFruitContainer,
+                CatcherArea.MovableCatcher.CaughtFruitContainer.CreateProxy(),
+                HitObjectContainer,
+                CatcherArea
             };
         }
 
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 82cbbefcca..fd7a1fd3c3 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -46,6 +46,12 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public Container ExplodingFruitTarget;
 
+        public Container<DrawableHitObject> CaughtFruitContainer { get; } = new Container<DrawableHitObject>
+        {
+            Anchor = Anchor.TopCentre,
+            Origin = Anchor.BottomCentre,
+        };
+
         [NotNull]
         private readonly Container trailsTarget;
 
@@ -83,8 +89,6 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         private readonly float catchWidth;
 
-        private Container<DrawableHitObject> caughtFruit;
-
         private CatcherSprite catcherIdle;
         private CatcherSprite catcherKiai;
         private CatcherSprite catcherFail;
@@ -118,11 +122,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             InternalChildren = new Drawable[]
             {
-                caughtFruit = new Container<DrawableHitObject>
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.BottomCentre,
-                },
+                CaughtFruitContainer,
                 catcherIdle = new CatcherSprite(CatcherAnimationState.Idle)
                 {
                     Anchor = Anchor.TopCentre,
@@ -176,7 +176,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             const float allowance = 10;
 
-            while (caughtFruit.Any(f =>
+            while (CaughtFruitContainer.Any(f =>
                 f.LifetimeEnd == double.MaxValue &&
                 Vector2Extensions.Distance(f.Position, fruit.Position) < (ourRadius + (theirRadius = f.DrawSize.X / 2 * f.Scale.X)) / (allowance / 2)))
             {
@@ -187,7 +187,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             fruit.X = Math.Clamp(fruit.X, -CatcherArea.CATCHER_SIZE / 2, CatcherArea.CATCHER_SIZE / 2);
 
-            caughtFruit.Add(fruit);
+            CaughtFruitContainer.Add(fruit);
 
             AddInternal(new HitExplosion(fruit)
             {
@@ -342,7 +342,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public void Drop()
         {
-            foreach (var f in caughtFruit.ToArray())
+            foreach (var f in CaughtFruitContainer.ToArray())
                 Drop(f);
         }
 
@@ -351,7 +351,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public void Explode()
         {
-            foreach (var f in caughtFruit.ToArray())
+            foreach (var f in CaughtFruitContainer.ToArray())
                 Explode(f);
         }
 
@@ -450,9 +450,9 @@ namespace osu.Game.Rulesets.Catch.UI
             if (ExplodingFruitTarget != null)
             {
                 fruit.Anchor = Anchor.TopLeft;
-                fruit.Position = caughtFruit.ToSpaceOfOtherDrawable(fruit.DrawPosition, ExplodingFruitTarget);
+                fruit.Position = CaughtFruitContainer.ToSpaceOfOtherDrawable(fruit.DrawPosition, ExplodingFruitTarget);
 
-                if (!caughtFruit.Remove(fruit))
+                if (!CaughtFruitContainer.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;
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index bf1ac5bc0e..4255c3b1af 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public Func<CatchHitObject, DrawableHitObject<CatchHitObject>> CreateDrawableRepresentation;
 
+        public readonly Catcher MovableCatcher;
+
         public Container ExplodingFruitTarget
         {
             set => MovableCatcher.ExplodingFruitTarget = value;
@@ -104,7 +106,5 @@ namespace osu.Game.Rulesets.Catch.UI
             if (state?.CatcherX != null)
                 MovableCatcher.X = state.CatcherX.Value;
         }
-
-        protected internal readonly Catcher MovableCatcher;
     }
 }

From 72789dc0aa56b5e47dbb081698349b07f77dca4f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Jul 2020 21:52:37 +0900
Subject: [PATCH 03763/10326] Remove redundant array spec

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 63751ecb0d..a29d167c5b 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 Origin = Anchor.TopLeft,
             };
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new []
             {
                 explodingFruitContainer,
                 CatcherArea.MovableCatcher.CaughtFruitContainer.CreateProxy(),

From 3666599053aa3a2f7dbf7544326adcf89b6f2ec8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Jul 2020 22:00:48 +0900
Subject: [PATCH 03764/10326] Remove space

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index a29d167c5b..18dc3adf76 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 Origin = Anchor.TopLeft,
             };
 
-            InternalChildren = new []
+            InternalChildren = new[]
             {
                 explodingFruitContainer,
                 CatcherArea.MovableCatcher.CaughtFruitContainer.CreateProxy(),

From dcd345eed95228cfa729483e657290b4a059f7bc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 01:20:32 +0900
Subject: [PATCH 03765/10326] Add a few tests

---
 .../TaikoBeatmapConversionTest.cs             |   2 +
 ...er-conversion-v14-expected-conversion.json | 379 ++++++++++++++++++
 .../Beatmaps/slider-conversion-v14.osu        |  32 ++
 ...der-conversion-v6-expected-conversion.json | 137 +++++++
 .../Testing/Beatmaps/slider-conversion-v6.osu |  20 +
 5 files changed, 570 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14.osu
 create mode 100644 osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v6-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v6.osu

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index f7729138ff..d0c57b20c0 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [TestCase("basic")]
         [TestCase("slider-generating-drumroll")]
         [TestCase("sample-to-type-conversions")]
+        [TestCase("slider-conversion-v6")]
+        [TestCase("slider-conversion-v14")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json
new file mode 100644
index 0000000000..6a6063cb74
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json
@@ -0,0 +1,379 @@
+{
+    "Mappings": [{
+            "StartTime": 2000,
+            "Objects": [{
+                    "StartTime": 2000,
+                    "EndTime": 2000,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": true
+                },
+                {
+                    "StartTime": 2173,
+                    "EndTime": 2173,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                }
+            ]
+        },
+        {
+            "StartTime": 4000,
+            "Objects": [{
+                    "StartTime": 4000,
+                    "EndTime": 4000,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 4173,
+                    "EndTime": 4173,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                }
+            ]
+        },
+        {
+            "StartTime": 6000,
+            "Objects": [{
+                    "StartTime": 6000,
+                    "EndTime": 6000,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 6271,
+                    "EndTime": 6271,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 6542,
+                    "EndTime": 6542,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                }
+            ]
+        },
+        {
+            "StartTime": 8000,
+            "Objects": [{
+                    "StartTime": 8000,
+                    "EndTime": 8000,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8026,
+                    "EndTime": 8026,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8053,
+                    "EndTime": 8053,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8080,
+                    "EndTime": 8080,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8107,
+                    "EndTime": 8107,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8133,
+                    "EndTime": 8133,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8160,
+                    "EndTime": 8160,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8187,
+                    "EndTime": 8187,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8214,
+                    "EndTime": 8214,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8241,
+                    "EndTime": 8241,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8267,
+                    "EndTime": 8267,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8294,
+                    "EndTime": 8294,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8321,
+                    "EndTime": 8321,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8348,
+                    "EndTime": 8348,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8374,
+                    "EndTime": 8374,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8401,
+                    "EndTime": 8401,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8428,
+                    "EndTime": 8428,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8455,
+                    "EndTime": 8455,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8482,
+                    "EndTime": 8482,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8508,
+                    "EndTime": 8508,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8535,
+                    "EndTime": 8535,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8562,
+                    "EndTime": 8562,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8589,
+                    "EndTime": 8589,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8615,
+                    "EndTime": 8615,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8642,
+                    "EndTime": 8642,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8669,
+                    "EndTime": 8669,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8696,
+                    "EndTime": 8696,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8723,
+                    "EndTime": 8723,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8749,
+                    "EndTime": 8749,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8776,
+                    "EndTime": 8776,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8803,
+                    "EndTime": 8803,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8830,
+                    "EndTime": 8830,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 8857,
+                    "EndTime": 8857,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14.osu b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14.osu
new file mode 100644
index 0000000000..4c8fb1fde6
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14.osu
@@ -0,0 +1,32 @@
+osu file format v14
+
+[General]
+Mode: 0
+
+[Difficulty]
+HPDrainRate:7
+CircleSize:4
+OverallDifficulty:8
+ApproachRate:9.2
+SliderMultiplier:2.3
+SliderTickRate:1
+
+[TimingPoints]
+0,333.333333333333,4,1,0,50,1,0
+2000,-100,4,2,0,80,0,0
+
+6000,389.61038961039,4,2,1,60,1,0
+
+8000,428.571428571429,4,3,1,65,1,0
+8000,-133.333333333333,4,1,1,45,0,0
+
+[HitObjects]
+// Should convert.
+48,32,2000,6,0,B|168:32,1,120,4|2
+312,68,4000,2,0,B|288:52|256:44|216:52|200:68,1,120,0|8
+
+// Should convert.
+184,224,6000,2,0,L|336:308,2,160,2|2|0,0:0|0:0|0:0,0:0:0:0:
+
+// Should convert.
+328,36,8000,6,0,L|332:16,32,10.7812504112721,0|0,0:0,0:0:0:0:
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v6-expected-conversion.json b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v6-expected-conversion.json
new file mode 100644
index 0000000000..c3d3c52ebd
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v6-expected-conversion.json
@@ -0,0 +1,137 @@
+{
+    "Mappings": [{
+            "StartTime": 0,
+            "Objects": [{
+                    "StartTime": 0,
+                    "EndTime": 0,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": true
+                },
+                {
+                    "StartTime": 162,
+                    "EndTime": 162,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 325,
+                    "EndTime": 325,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": true
+                },
+                {
+                    "StartTime": 487,
+                    "EndTime": 487,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 650,
+                    "EndTime": 650,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": true
+                },
+                {
+                    "StartTime": 813,
+                    "EndTime": 813,
+                    "IsRim": false,
+                    "IsCentre": true,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 975,
+                    "EndTime": 975,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": true
+                }
+            ]
+        },
+        {
+            "StartTime": 2000,
+            "Objects": [{
+                    "StartTime": 2000,
+                    "EndTime": 2000,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 2162,
+                    "EndTime": 2162,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 2325,
+                    "EndTime": 2325,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": true
+                },
+                {
+                    "StartTime": 2487,
+                    "EndTime": 2487,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 2650,
+                    "EndTime": 2650,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                },
+                {
+                    "StartTime": 2813,
+                    "EndTime": 2813,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": true
+                },
+                {
+                    "StartTime": 2975,
+                    "EndTime": 2975,
+                    "IsRim": true,
+                    "IsCentre": false,
+                    "IsDrumRoll": false,
+                    "IsSwell": false,
+                    "IsStrong": false
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v6.osu b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v6.osu
new file mode 100644
index 0000000000..c1e4c3bbd7
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v6.osu
@@ -0,0 +1,20 @@
+osu file format v6
+
+[General]
+Mode: 0
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:4
+OverallDifficulty:1
+SliderMultiplier:1.2
+SliderTickRate:3
+
+[TimingPoints]
+0,487.884208814441,4,1,0,60,1,0
+2000,-100,4,1,0,65,0,1
+
+[HitObjects]
+// Should convert.
+376,64,0,6,0,B|256:32|136:64,1,240,6|0
+256,120,2000,6,8,C|264:192|336:192,2,120,8|8|6
\ No newline at end of file

From 6b2b3f4d4d12276ac0b7ebcc62e92a586502e301 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 14:10:44 +0900
Subject: [PATCH 03766/10326] Expose accuracy/combo portion adjustments

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 28 +++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index eb49638d59..f1cdfd93c8 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -16,8 +17,6 @@ namespace osu.Game.Rulesets.Scoring
 {
     public class ScoreProcessor : JudgementProcessor
     {
-        private const double base_portion = 0.3;
-        private const double combo_portion = 0.7;
         private const double max_score = 1000000;
 
         /// <summary>
@@ -55,8 +54,20 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public readonly Bindable<ScoringMode> Mode = new Bindable<ScoringMode>();
 
-        private double maxHighestCombo;
+        /// <summary>
+        /// The default portion of <see cref="max_score"/> awarded for hitting <see cref="HitObject"/>s accurately. Defaults to 30%.
+        /// </summary>
+        protected virtual double DefaultAccuracyPortion => 0.3;
 
+        /// <summary>
+        /// The default portion of <see cref="max_score"/> awarded for achieving a high combo. Default to 70%.
+        /// </summary>
+        protected virtual double DefaultComboPortion => 0.7;
+
+        private readonly double accuracyPortion;
+        private readonly double comboPortion;
+
+        private double maxHighestCombo;
         private double maxBaseScore;
         private double rollingMaxBaseScore;
         private double baseScore;
@@ -69,7 +80,11 @@ namespace osu.Game.Rulesets.Scoring
 
         public ScoreProcessor()
         {
-            Debug.Assert(base_portion + combo_portion == 1.0);
+            accuracyPortion = DefaultAccuracyPortion;
+            comboPortion = DefaultComboPortion;
+
+            if (!Precision.AlmostEquals(1.0, accuracyPortion + comboPortion))
+                throw new InvalidOperationException($"{nameof(DefaultAccuracyPortion)} + {nameof(DefaultComboPortion)} must equal 1.");
 
             Combo.ValueChanged += combo => HighestCombo.Value = Math.Max(HighestCombo.Value, combo.NewValue);
             Accuracy.ValueChanged += accuracy =>
@@ -189,7 +204,10 @@ namespace osu.Game.Rulesets.Scoring
             {
                 default:
                 case ScoringMode.Standardised:
-                    return (max_score * (base_portion * baseScore / maxBaseScore + combo_portion * HighestCombo.Value / maxHighestCombo) + bonusScore) * scoreMultiplier;
+                    double accuracyScore = accuracyPortion * baseScore / maxBaseScore;
+                    double comboScore = comboPortion * HighestCombo.Value / maxHighestCombo;
+
+                    return (max_score * (accuracyScore + comboScore) + bonusScore) * scoreMultiplier;
 
                 case ScoringMode.Classic:
                     // should emulate osu-stable's scoring as closely as we can (https://osu.ppy.sh/help/wiki/Score/ScoreV1)

From 2b39857b8cec4b4a1d7777a7987bac9813f50d26 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 14:10:52 +0900
Subject: [PATCH 03767/10326] Make mania 80% acc 20% combo

---
 osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 9b54b48de3..ba84c21845 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -7,6 +7,10 @@ namespace osu.Game.Rulesets.Mania.Scoring
 {
     internal class ManiaScoreProcessor : ScoreProcessor
     {
+        protected override double DefaultAccuracyPortion => 0.8;
+
+        protected override double DefaultComboPortion => 0.2;
+
         public override HitWindows CreateHitWindows() => new ManiaHitWindows();
     }
 }

From 35d6501478411b35002af85a22a0ed85ee4720af Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 14:13:46 +0900
Subject: [PATCH 03768/10326] Also adjust taiko

---
 osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index 003d40af56..e29ea87d25 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -7,6 +7,10 @@ namespace osu.Game.Rulesets.Taiko.Scoring
 {
     internal class TaikoScoreProcessor : ScoreProcessor
     {
+        protected override double DefaultAccuracyPortion => 0.75;
+
+        protected override double DefaultComboPortion => 0.25;
+
         public override HitWindows CreateHitWindows() => new TaikoHitWindows();
     }
 }

From 0a1e6a82739101f3c2db1b6b8a859cfe3dcddec7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Jul 2020 14:25:45 +0900
Subject: [PATCH 03769/10326] Fix storyboard video playback when not starting
 at beginning of beatmap

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index a85936edf7..4ea582ca4a 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -55,10 +55,11 @@ namespace osu.Game.Storyboards.Drawables
 
             if (video == null) return;
 
-            video.PlaybackPosition = Clock.CurrentTime - Video.StartTime;
-
-            using (video.BeginAbsoluteSequence(0))
+            using (video.BeginAbsoluteSequence(Video.StartTime))
+            {
+                Schedule(() => video.PlaybackPosition = Time.Current - Video.StartTime);
                 video.FadeIn(500);
+            }
         }
     }
 }

From 87713215dcae650a2209bcb5f9e5dd85eadc7c6f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 14:30:17 +0900
Subject: [PATCH 03770/10326] Remove redundant parens

---
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs
index 99975d9174..2c1885ae1a 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             double addition = 1;
 
             // We get an extra addition if we are not a slider or spinner
-            if (current.LastObject is Hit && current.BaseObject is Hit && (current.BaseObject.StartTime - current.LastObject.StartTime) < 1000)
+            if (current.LastObject is Hit && current.BaseObject is Hit && current.BaseObject.StartTime - current.LastObject.StartTime < 1000)
             {
                 if (hasColourChange(current))
                     addition += 0.75;

From 96724bde32d07c286fdbd81717afccd7bc531194 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 15:05:01 +0900
Subject: [PATCH 03771/10326] Fix chat name backgrounds not dimming

---
 osu.Game/Overlays/Chat/ChatLine.cs | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 496986dc56..4eb348ae33 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -114,21 +115,26 @@ namespace osu.Game.Overlays.Chat
                         Colour = Color4.Black.Opacity(0.3f),
                         Type = EdgeEffectType.Shadow,
                     },
-                    // Drop shadow effect
                     Child = new Container
                     {
                         AutoSizeAxes = Axes.Both,
+                        Y = 3,
                         Masking = true,
                         CornerRadius = 4,
-                        EdgeEffect = new EdgeEffectParameters
+                        Children = new Drawable[]
                         {
-                            Radius = 1,
-                            Colour = Color4Extensions.FromHex(message.Sender.Colour),
-                            Type = EdgeEffectType.Shadow,
-                        },
-                        Padding = new MarginPadding { Left = 3, Right = 3, Bottom = 1, Top = -3 },
-                        Y = 3,
-                        Child = username,
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4Extensions.FromHex(message.Sender.Colour),
+                            },
+                            new Container
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Left = 4, Right = 4, Bottom = 1, Top = -2 },
+                                Child = username
+                            }
+                        }
                     }
                 };
             }

From c42b315abb65e1162dd97eb6f53d69b2182fbb09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Jul 2020 15:35:19 +0900
Subject: [PATCH 03772/10326] Expose via CreateProxiedContent method

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs |  2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs        | 22 +++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 18dc3adf76..154e1576db 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.UI
             InternalChildren = new[]
             {
                 explodingFruitContainer,
-                CatcherArea.MovableCatcher.CaughtFruitContainer.CreateProxy(),
+                CatcherArea.MovableCatcher.CreateProxiedContent(),
                 HitObjectContainer,
                 CatcherArea
             };
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index fd7a1fd3c3..8629a19470 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public Container ExplodingFruitTarget;
 
-        public Container<DrawableHitObject> CaughtFruitContainer { get; } = new Container<DrawableHitObject>
+        private Container<DrawableHitObject> caughtFruitContainer { get; } = new Container<DrawableHitObject>
         {
             Anchor = Anchor.TopCentre,
             Origin = Anchor.BottomCentre,
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             InternalChildren = new Drawable[]
             {
-                CaughtFruitContainer,
+                caughtFruitContainer,
                 catcherIdle = new CatcherSprite(CatcherAnimationState.Idle)
                 {
                     Anchor = Anchor.TopCentre,
@@ -145,6 +145,12 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
+        /// <summary>
+        /// Creates proxied content to be displayed beneath hitobjects.
+        /// </summary>
+        /// <returns></returns>
+        public Drawable CreateProxiedContent() => caughtFruitContainer.CreateProxy();
+
         /// <summary>
         /// Calculates the scale of the catcher based off the provided beatmap difficulty.
         /// </summary>
@@ -176,7 +182,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             const float allowance = 10;
 
-            while (CaughtFruitContainer.Any(f =>
+            while (caughtFruitContainer.Any(f =>
                 f.LifetimeEnd == double.MaxValue &&
                 Vector2Extensions.Distance(f.Position, fruit.Position) < (ourRadius + (theirRadius = f.DrawSize.X / 2 * f.Scale.X)) / (allowance / 2)))
             {
@@ -187,7 +193,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             fruit.X = Math.Clamp(fruit.X, -CatcherArea.CATCHER_SIZE / 2, CatcherArea.CATCHER_SIZE / 2);
 
-            CaughtFruitContainer.Add(fruit);
+            caughtFruitContainer.Add(fruit);
 
             AddInternal(new HitExplosion(fruit)
             {
@@ -342,7 +348,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public void Drop()
         {
-            foreach (var f in CaughtFruitContainer.ToArray())
+            foreach (var f in caughtFruitContainer.ToArray())
                 Drop(f);
         }
 
@@ -351,7 +357,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public void Explode()
         {
-            foreach (var f in CaughtFruitContainer.ToArray())
+            foreach (var f in caughtFruitContainer.ToArray())
                 Explode(f);
         }
 
@@ -450,9 +456,9 @@ namespace osu.Game.Rulesets.Catch.UI
             if (ExplodingFruitTarget != null)
             {
                 fruit.Anchor = Anchor.TopLeft;
-                fruit.Position = CaughtFruitContainer.ToSpaceOfOtherDrawable(fruit.DrawPosition, ExplodingFruitTarget);
+                fruit.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(fruit.DrawPosition, ExplodingFruitTarget);
 
-                if (!CaughtFruitContainer.Remove(fruit))
+                if (!caughtFruitContainer.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;

From ab477c3be4289ae460824caaad1912651411562f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 15:55:35 +0900
Subject: [PATCH 03773/10326] Remove returns xmldoc

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 8629a19470..b41fd24a9c 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -148,7 +148,6 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// Creates proxied content to be displayed beneath hitobjects.
         /// </summary>
-        /// <returns></returns>
         public Drawable CreateProxiedContent() => caughtFruitContainer.CreateProxy();
 
         /// <summary>

From 16d429d2b6b5d62ddba792786376cd03ca5fef55 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Thu, 16 Jul 2020 15:24:03 +0700
Subject: [PATCH 03774/10326] Delete test hitlighting

---
 .../TestSceneHitLighting.cs                   | 96 -------------------
 1 file changed, 96 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneHitLighting.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHitLighting.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHitLighting.cs
deleted file mode 100644
index c5fa957130..0000000000
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHitLighting.cs
+++ /dev/null
@@ -1,96 +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 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.Beatmaps.ControlPoints;
-using osu.Game.Configuration;
-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;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    [TestFixture]
-    public class TestSceneHitLighting : CatchSkinnableTestScene
-    {
-        private RulesetInfo catchRuleset;
-        private OsuConfigManager config;
-
-        public TestSceneHitLighting()
-        {
-            AddToggleStep("toggle hit lighting", enabled => createCatcher(enabled));
-            AddStep("catch fruit", () => catchFruit(new TestFruit()
-            {
-                X = this.ChildrenOfType<CatcherArea>().First().MovableCatcher.X
-            }));
-        }
-
-        private void catchFruit(Fruit fruit)
-        {
-            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 = HitResult.Great });
-
-                    drawable.Expire();
-                });
-            });
-        }
-
-        private void createCatcher(bool hitLighting)
-        {
-            config.Set(OsuSetting.HitLighting, hitLighting);
-            SetContents(() => new CatchInputManager(catchRuleset)
-            {
-                RelativeSizeAxes = Axes.Both,
-                Child = new TestCatcherArea()
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.TopCentre,
-                    CreateDrawableRepresentation = ((DrawableRuleset<CatchHitObject>)catchRuleset.CreateInstance().CreateDrawableRulesetWith(new CatchBeatmap())).CreateDrawableRepresentation
-                },
-            });
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(RulesetStore rulesets, OsuConfigManager configManager)
-        {
-            catchRuleset = rulesets.GetRuleset(2);
-            config = configManager;
-        }
-
-        public class TestFruit : Fruit
-        {
-            public TestFruit()
-            {
-                ApplyDefaultsToSelf(new ControlPointInfo(), new BeatmapDifficulty());
-            }
-        }
-
-        private class TestCatcherArea : CatcherArea
-        {
-            public TestCatcherArea()
-                : base(new BeatmapDifficulty())
-            {
-            }
-
-            public new Catcher MovableCatcher => base.MovableCatcher;
-        }
-    }
-}

From 7021459c752fe32a07fe3053474d56464877072a Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Thu, 16 Jul 2020 15:25:07 +0700
Subject: [PATCH 03775/10326] add hit lighting test in test scene catcher area

---
 .../TestSceneCatcherArea.cs                   | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index fbb22a8498..6d6f0357c2 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Catch.Objects;
@@ -24,6 +25,7 @@ namespace osu.Game.Rulesets.Catch.Tests
     public class TestSceneCatcherArea : CatchSkinnableTestScene
     {
         private RulesetInfo catchRuleset;
+        private OsuConfigManager config;
 
         public TestSceneCatcherArea()
         {
@@ -52,6 +54,24 @@ namespace osu.Game.Rulesets.Catch.Tests
             }, true), 20);
         }
 
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestHitLighting(bool enable) {
+            Catcher catcher = this.ChildrenOfType<CatcherArea>().First().MovableCatcher;
+
+            AddStep("Toggle hit lighting", () => config.Set(OsuSetting.HitLighting, enable));
+            AddStep("Catch fruit", () => catchFruit(new TestFruit(false)
+            {
+                X = catcher.X
+            }));
+            AddStep("Catch fruit last combo", () => catchFruit(new TestFruit(false)
+            {
+                X = catcher.X,
+                LastInCombo = true
+            }));
+            AddAssert("Check hit explotion", () => catcher.ChildrenOfType<HitExplosion>().Any() == enable);
+        }
+
         private void catchFruit(Fruit fruit, bool miss = false)
         {
             this.ChildrenOfType<CatcherArea>().ForEach(area =>
@@ -84,9 +104,10 @@ namespace osu.Game.Rulesets.Catch.Tests
         }
 
         [BackgroundDependencyLoader]
-        private void load(RulesetStore rulesets)
+        private void load(RulesetStore rulesets, OsuConfigManager configManager)
         {
             catchRuleset = rulesets.GetRuleset(2);
+            config = configManager;
         }
 
         public class TestFruit : Fruit

From 1384e61747065dd777dc6fd8a721c1082b6e92db Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 16:34:16 +0900
Subject: [PATCH 03776/10326] Move cover to a separate file, rename

---
 .../Mods/ManiaModHidden.cs                    | 77 +------------------
 osu.Game.Rulesets.Mania/UI/PlayfieldCover.cs  | 77 +++++++++++++++++++
 2 files changed, 81 insertions(+), 73 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/UI/PlayfieldCover.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 3af6ff009f..83d252b2f6 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -4,19 +4,12 @@
 using System;
 using System.Collections.Generic;
 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.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
-using osu.Game.Rulesets.UI.Scrolling;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
@@ -25,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Description => @"Keys fade out before you hit them!";
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
-        protected List<LaneCover> LaneCovers = new List<LaneCover>();
+        protected List<PlayfieldCover> PlayfieldCovers = new List<PlayfieldCover>();
 
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
         {
@@ -36,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                 HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
                 Container hocParent = (Container)hoc.Parent;
 
-                LaneCover laneCover;
+                PlayfieldCover laneCover;
 
                 hocParent.Remove(hoc);
                 hocParent.Add(new BufferedContainer
@@ -45,7 +38,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                     Children = new Drawable[]
                     {
                         hoc,
-                        laneCover = new LaneCover
+                        laneCover = new PlayfieldCover
                         {
                             Coverage = 0.5f,
                             RelativeSizeAxes = Axes.Both,
@@ -55,69 +48,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                     }
                 });
 
-                LaneCovers.Add(laneCover);
-            }
-        }
-
-        protected class LaneCover : CompositeDrawable
-        {
-            private readonly Box gradient;
-            private readonly Box filled;
-            private readonly IBindable<ScrollingDirection> scrollDirection = new Bindable<ScrollingDirection>();
-
-            public LaneCover()
-            {
-                Blending = new BlendingParameters
-                {
-                    RGBEquation = BlendingEquation.Add,
-                    Source = BlendingType.Zero,
-                    Destination = BlendingType.One,
-                    AlphaEquation = BlendingEquation.Add,
-                    SourceAlpha = BlendingType.Zero,
-                    DestinationAlpha = BlendingType.OneMinusSrcAlpha
-                };
-
-                InternalChildren = new Drawable[]
-                {
-                    gradient = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        RelativePositionAxes = Axes.Both,
-                        Height = 0.25f,
-                        Colour = ColourInfo.GradientVertical(
-                            Color4.White.Opacity(0f),
-                            Color4.White.Opacity(1f)
-                        )
-                    },
-                    filled = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.BottomLeft
-                    }
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(IScrollingInfo scrollingInfo)
-            {
-                scrollDirection.BindTo(scrollingInfo.Direction);
-                scrollDirection.BindValueChanged(onScrollDirectionChanged, true);
-            }
-
-            private void onScrollDirectionChanged(ValueChangedEvent<ScrollingDirection> valueChangedEvent)
-            {
-                bool isUpscroll = valueChangedEvent.NewValue == ScrollingDirection.Up;
-                Rotation = isUpscroll ? 180f : 0f;
-            }
-
-            public float Coverage
-            {
-                set
-                {
-                    filled.Height = value;
-                    gradient.Y = 1 - filled.Height - gradient.Height;
-                }
+                PlayfieldCovers.Add(laneCover);
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania/UI/PlayfieldCover.cs b/osu.Game.Rulesets.Mania/UI/PlayfieldCover.cs
new file mode 100644
index 0000000000..27fb23e3f2
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/PlayfieldCover.cs
@@ -0,0 +1,77 @@
+// Copyright (c) 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.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public class PlayfieldCover : CompositeDrawable
+    {
+        private readonly Box gradient;
+        private readonly Box filled;
+        private readonly IBindable<ScrollingDirection> scrollDirection = new Bindable<ScrollingDirection>();
+
+        public PlayfieldCover()
+        {
+            Blending = new BlendingParameters
+            {
+                RGBEquation = BlendingEquation.Add,
+                Source = BlendingType.Zero,
+                Destination = BlendingType.One,
+                AlphaEquation = BlendingEquation.Add,
+                SourceAlpha = BlendingType.Zero,
+                DestinationAlpha = BlendingType.OneMinusSrcAlpha
+            };
+
+            InternalChildren = new Drawable[]
+            {
+                gradient = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    RelativePositionAxes = Axes.Both,
+                    Height = 0.25f,
+                    Colour = ColourInfo.GradientVertical(
+                        Color4.White.Opacity(0f),
+                        Color4.White.Opacity(1f)
+                    )
+                },
+                filled = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            scrollDirection.BindTo(scrollingInfo.Direction);
+            scrollDirection.BindValueChanged(onScrollDirectionChanged, true);
+        }
+
+        private void onScrollDirectionChanged(ValueChangedEvent<ScrollingDirection> valueChangedEvent)
+        {
+            bool isUpscroll = valueChangedEvent.NewValue == ScrollingDirection.Up;
+            Rotation = isUpscroll ? 180f : 0f;
+        }
+
+        public float Coverage
+        {
+            set
+            {
+                filled.Height = value;
+                gradient.Y = 1 - filled.Height - gradient.Height;
+            }
+        }
+    }
+}

From b7f6ae5db9b6f1081df886110605469b9f06749c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 17:26:18 +0900
Subject: [PATCH 03777/10326] Make the cover into a container

---
 .../Mods/ManiaModFadeIn.cs                    |  10 +-
 .../Mods/ManiaModHidden.cs                    |  34 +++--
 osu.Game.Rulesets.Mania/UI/PlayfieldCover.cs  |  77 ------------
 .../UI/PlayfieldCoveringContainer.cs          | 116 ++++++++++++++++++
 4 files changed, 133 insertions(+), 104 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/UI/PlayfieldCover.cs
 create mode 100644 osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index e29f2e2a00..5c643a7d37 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -3,9 +3,7 @@
 
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.UI;
-using osuTK;
+using osu.Game.Rulesets.Mania.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
@@ -16,10 +14,6 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override IconUsage? Icon => OsuIcon.ModHidden;
         public override string Description => @"Keys appear out of nowhere!";
 
-        public override void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
-        {
-            base.ApplyToDrawableRuleset(drawableRuleset);
-            LaneCovers.ForEach(laneCover => laneCover.Scale = new Vector2(1f, -1f));
-        }
+        protected override PlayfieldCoveringContainer CreateCover() => new PlayfieldCoveringContainer();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 83d252b2f6..023de8fe25 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -10,6 +9,7 @@ using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
@@ -18,7 +18,6 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Description => @"Keys fade out before you hit them!";
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
-        protected List<PlayfieldCover> PlayfieldCovers = new List<PlayfieldCover>();
 
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
         {
@@ -29,26 +28,23 @@ namespace osu.Game.Rulesets.Mania.Mods
                 HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
                 Container hocParent = (Container)hoc.Parent;
 
-                PlayfieldCover laneCover;
-
                 hocParent.Remove(hoc);
-                hocParent.Add(new BufferedContainer
+                hocParent.Add(CreateCover().With(c =>
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        hoc,
-                        laneCover = new PlayfieldCover
-                        {
-                            Coverage = 0.5f,
-                            RelativeSizeAxes = Axes.Both,
-                            Origin = Anchor.Centre,
-                            Anchor = Anchor.Centre
-                        }
-                    }
-                });
+                    c.RelativeSizeAxes = Axes.Both;
+                    c.Coverage = 0.5f;
+                    c.Child = hoc;
+                }));
+            }
+        }
 
-                PlayfieldCovers.Add(laneCover);
+        protected virtual PlayfieldCoveringContainer CreateCover() => new ModHiddenCoveringContainer();
+
+        private class ModHiddenCoveringContainer : PlayfieldCoveringContainer
+        {
+            public ModHiddenCoveringContainer()
+            {
+                Cover.Scale = new Vector2(1, -1);
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania/UI/PlayfieldCover.cs b/osu.Game.Rulesets.Mania/UI/PlayfieldCover.cs
deleted file mode 100644
index 27fb23e3f2..0000000000
--- a/osu.Game.Rulesets.Mania/UI/PlayfieldCover.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 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.Rulesets.UI.Scrolling;
-using osuTK.Graphics;
-
-namespace osu.Game.Rulesets.Mania.UI
-{
-    public class PlayfieldCover : CompositeDrawable
-    {
-        private readonly Box gradient;
-        private readonly Box filled;
-        private readonly IBindable<ScrollingDirection> scrollDirection = new Bindable<ScrollingDirection>();
-
-        public PlayfieldCover()
-        {
-            Blending = new BlendingParameters
-            {
-                RGBEquation = BlendingEquation.Add,
-                Source = BlendingType.Zero,
-                Destination = BlendingType.One,
-                AlphaEquation = BlendingEquation.Add,
-                SourceAlpha = BlendingType.Zero,
-                DestinationAlpha = BlendingType.OneMinusSrcAlpha
-            };
-
-            InternalChildren = new Drawable[]
-            {
-                gradient = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    RelativePositionAxes = Axes.Both,
-                    Height = 0.25f,
-                    Colour = ColourInfo.GradientVertical(
-                        Color4.White.Opacity(0f),
-                        Color4.White.Opacity(1f)
-                    )
-                },
-                filled = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
-        {
-            scrollDirection.BindTo(scrollingInfo.Direction);
-            scrollDirection.BindValueChanged(onScrollDirectionChanged, true);
-        }
-
-        private void onScrollDirectionChanged(ValueChangedEvent<ScrollingDirection> valueChangedEvent)
-        {
-            bool isUpscroll = valueChangedEvent.NewValue == ScrollingDirection.Up;
-            Rotation = isUpscroll ? 180f : 0f;
-        }
-
-        public float Coverage
-        {
-            set
-            {
-                filled.Height = value;
-                gradient.Y = 1 - filled.Height - gradient.Height;
-            }
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
new file mode 100644
index 0000000000..5eb628947d
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
@@ -0,0 +1,116 @@
+// Copyright (c) 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.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    /// <summary>
+    /// A <see cref="Container"/> that has its contents partially hidden by an adjustable "cover".
+    /// </summary>
+    /// <remarks>
+    /// The covered area extends in the scrolling direction, with its size depending on <see cref="Coverage"/>.
+    /// </remarks>
+    public class PlayfieldCoveringContainer : Container
+    {
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        /// <summary>
+        /// The complete cover, including gradient and fill.
+        /// </summary>
+        protected readonly Drawable Cover;
+
+        /// <summary>
+        /// The gradient portion of the cover.
+        /// </summary>
+        private readonly Box gradient;
+
+        /// <summary>
+        /// The fully-opaque portion of the cover.
+        /// </summary>
+        private readonly Box filled;
+
+        private readonly IBindable<ScrollingDirection> scrollDirection = new Bindable<ScrollingDirection>();
+
+        public PlayfieldCoveringContainer()
+        {
+            InternalChild = new BufferedContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new[]
+                {
+                    content = new Container { RelativeSizeAxes = Axes.Both },
+                    Cover = new Container
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Blending = new BlendingParameters
+                        {
+                            // Don't change the destination colour.
+                            RGBEquation = BlendingEquation.Add,
+                            Source = BlendingType.Zero,
+                            Destination = BlendingType.One,
+                            // Subtract the cover's alpha from the destination (points with alpha 1 should make the destination completely transparent).
+                            AlphaEquation = BlendingEquation.Add,
+                            SourceAlpha = BlendingType.Zero,
+                            DestinationAlpha = BlendingType.OneMinusSrcAlpha
+                        },
+                        Children = new Drawable[]
+                        {
+                            gradient = new Box
+                            {
+                                Anchor = Anchor.BottomLeft,
+                                Origin = Anchor.BottomLeft,
+                                RelativeSizeAxes = Axes.Both,
+                                RelativePositionAxes = Axes.Both,
+                                Height = 0.25f,
+                                Colour = ColourInfo.GradientVertical(
+                                    Color4.White.Opacity(0f),
+                                    Color4.White.Opacity(1f)
+                                )
+                            },
+                            filled = new Box
+                            {
+                                Anchor = Anchor.BottomLeft,
+                                Origin = Anchor.BottomLeft,
+                                RelativeSizeAxes = Axes.Both
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            scrollDirection.BindTo(scrollingInfo.Direction);
+            scrollDirection.BindValueChanged(onScrollDirectionChanged, true);
+        }
+
+        private void onScrollDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+            => Cover.Rotation = direction.NewValue == ScrollingDirection.Up ? 0 : 180f;
+
+        /// <summary>
+        /// The relative area that should be completely covered. This does not include the fade.
+        /// </summary>
+        public float Coverage
+        {
+            set
+            {
+                filled.Height = value;
+                gradient.Y = -value;
+            }
+        }
+    }
+}

From 545e4a1f66ad25a1969d7669dc79fee47ce6a7c3 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Thu, 16 Jul 2020 15:32:07 +0700
Subject: [PATCH 03778/10326] fix formatting

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 6d6f0357c2..5f9dedcbed 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -56,7 +56,8 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         [TestCase(true)]
         [TestCase(false)]
-        public void TestHitLighting(bool enable) {
+        public void TestHitLighting(bool enable)
+        {
             Catcher catcher = this.ChildrenOfType<CatcherArea>().First().MovableCatcher;
 
             AddStep("Toggle hit lighting", () => config.Set(OsuSetting.HitLighting, enable));

From d546db0ec93296aea0c60e751c88b5d8a15a7237 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 17:35:00 +0900
Subject: [PATCH 03779/10326] Fix default coverage

---
 osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
index 5eb628947d..752ac653a3 100644
--- a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
+++ b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
@@ -83,7 +83,8 @@ namespace osu.Game.Rulesets.Mania.UI
                             {
                                 Anchor = Anchor.BottomLeft,
                                 Origin = Anchor.BottomLeft,
-                                RelativeSizeAxes = Axes.Both
+                                RelativeSizeAxes = Axes.Both,
+                                Height = 0
                             }
                         }
                     }

From b09c584d910ffe2271b097524dd86261ef5b1fd5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 17:35:02 +0900
Subject: [PATCH 03780/10326] Add test

---
 .../TestScenePlayfieldCoveringContainer.cs    | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs b/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
new file mode 100644
index 0000000000..01fee47420
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.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.Shapes;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public class TestScenePlayfieldCoveringContainer : OsuTestScene
+    {
+        private readonly ScrollingTestContainer scrollingContainer;
+        private readonly PlayfieldCoveringContainer cover;
+
+        public TestScenePlayfieldCoveringContainer()
+        {
+            Child = scrollingContainer = new ScrollingTestContainer(ScrollingDirection.Down)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(300, 500),
+                Child = cover = new PlayfieldCoveringContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Orange
+                    }
+                }
+            };
+        }
+
+        [Test]
+        public void TestScrollingDownwards()
+        {
+            AddStep("set down scroll", () => scrollingContainer.Direction = ScrollingDirection.Down);
+            AddStep("set coverage = 0.5", () => cover.Coverage = 0.5f);
+            AddStep("set coverage = 0.8f", () => cover.Coverage = 0.8f);
+            AddStep("set coverage = 0.2f", () => cover.Coverage = 0.2f);
+        }
+
+        [Test]
+        public void TestScrollingUpwards()
+        {
+            AddStep("set up scroll", () => scrollingContainer.Direction = ScrollingDirection.Up);
+            AddStep("set coverage = 0.5", () => cover.Coverage = 0.5f);
+            AddStep("set coverage = 0.8f", () => cover.Coverage = 0.8f);
+            AddStep("set coverage = 0.2f", () => cover.Coverage = 0.2f);
+        }
+    }
+}

From 84e2e5677a3ccbfc6fb38c56e1d94a606852a6b0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 17:35:51 +0900
Subject: [PATCH 03781/10326] Add more info to xmldoc

---
 osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
index 752ac653a3..8579799af3 100644
--- a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
+++ b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
@@ -14,7 +14,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Mania.UI
 {
     /// <summary>
-    /// A <see cref="Container"/> that has its contents partially hidden by an adjustable "cover".
+    /// A <see cref="Container"/> that has its contents partially hidden by an adjustable "cover". This is intended to be used in a playfield.
     /// </summary>
     /// <remarks>
     /// The covered area extends in the scrolling direction, with its size depending on <see cref="Coverage"/>.

From 02031cea01b918da2f3e7cb3048113f32e461b1e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 17:37:30 +0900
Subject: [PATCH 03782/10326] Add newline

---
 osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
index 8579799af3..fe4ca38d0c 100644
--- a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
+++ b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Rulesets.Mania.UI
     public class PlayfieldCoveringContainer : Container
     {
         protected override Container<Drawable> Content => content;
+
         private readonly Container content;
 
         /// <summary>

From 74c7d9e67d6f09eb182d0765e808f8c01821e2b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 17:38:52 +0900
Subject: [PATCH 03783/10326] Use WithChild

---
 osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 023de8fe25..64bd7246ae 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -29,11 +29,10 @@ namespace osu.Game.Rulesets.Mania.Mods
                 Container hocParent = (Container)hoc.Parent;
 
                 hocParent.Remove(hoc);
-                hocParent.Add(CreateCover().With(c =>
+                hocParent.Add(CreateCover().WithChild(hoc).With(c =>
                 {
                     c.RelativeSizeAxes = Axes.Both;
                     c.Coverage = 0.5f;
-                    c.Child = hoc;
                 }));
             }
         }

From 967238e2694127b2bdd50e1f4f3a1efd59d2fb0b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 17:47:00 +0900
Subject: [PATCH 03784/10326] Add comment explaining scale

---
 osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 64bd7246ae..17e0637e04 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -43,6 +43,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         {
             public ModHiddenCoveringContainer()
             {
+                // This cover extends outwards from the hit position.
                 Cover.Scale = new Vector2(1, -1);
             }
         }

From 6df1b1d9ea19bfd65be8bba837c5c8b2feff38ad Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 20:38:33 +0900
Subject: [PATCH 03785/10326] Add a background beatmap difficulty manager

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 99 +++++++++++++++++++
 osu.Game/OsuGameBase.cs                       |  1 +
 2 files changed, 100 insertions(+)
 create mode 100644 osu.Game/Beatmaps/BeatmapDifficultyManager.cs

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
new file mode 100644
index 0000000000..f09118a24a
--- /dev/null
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.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 System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Threading;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Beatmaps
+{
+    public class BeatmapDifficultyManager : CompositeDrawable
+    {
+        // Too many simultaneous updates can lead to stutters. One thread seems to work fine for song select display purposes.
+        private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(1, nameof(BeatmapDifficultyManager));
+
+        private readonly TimedExpiryCache<DifficultyCacheLookup, double> difficultyCache = new TimedExpiryCache<DifficultyCacheLookup, double> { ExpiryTime = 60000 };
+        private readonly BeatmapManager beatmapManager;
+
+        public BeatmapDifficultyManager(BeatmapManager beatmapManager)
+        {
+            this.beatmapManager = beatmapManager;
+        }
+
+        public Task<double> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null,
+                                               CancellationToken cancellationToken = default)
+            => Task.Factory.StartNew(() => GetDifficulty(beatmapInfo, rulesetInfo, mods), cancellationToken,
+                TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously,
+                updateScheduler);
+
+        public double GetDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null)
+        {
+            // Difficulty can only be computed if the beatmap is locally available.
+            if (beatmapInfo.ID == 0)
+                return 0;
+
+            // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
+            rulesetInfo ??= beatmapInfo.Ruleset;
+
+            var key = new DifficultyCacheLookup(beatmapInfo, rulesetInfo, mods);
+            if (difficultyCache.TryGetValue(key, out var existing))
+                return existing;
+
+            try
+            {
+                var ruleset = rulesetInfo.CreateInstance();
+                Debug.Assert(ruleset != null);
+
+                var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(beatmapInfo));
+                var attributes = calculator.Calculate(mods?.ToArray() ?? Array.Empty<Mod>());
+
+                difficultyCache.Add(key, attributes.StarRating);
+                return attributes.StarRating;
+            }
+            catch
+            {
+                difficultyCache.Add(key, 0);
+                return 0;
+            }
+        }
+
+        private readonly struct DifficultyCacheLookup : IEquatable<DifficultyCacheLookup>
+        {
+            private readonly BeatmapInfo beatmapInfo;
+            private readonly RulesetInfo rulesetInfo;
+            private readonly IReadOnlyList<Mod> mods;
+
+            public DifficultyCacheLookup(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo, IEnumerable<Mod> mods)
+            {
+                this.beatmapInfo = beatmapInfo;
+                this.rulesetInfo = rulesetInfo;
+                this.mods = mods?.OrderBy(m => m.Acronym).ToArray() ?? Array.Empty<Mod>();
+            }
+
+            public bool Equals(DifficultyCacheLookup other)
+                => beatmapInfo.Equals(other.beatmapInfo)
+                   && mods.SequenceEqual(other.mods);
+
+            public override int GetHashCode()
+            {
+                var hashCode = new HashCode();
+
+                hashCode.Add(beatmapInfo.Hash);
+                hashCode.Add(rulesetInfo.GetHashCode());
+                foreach (var mod in mods)
+                    hashCode.Add(mod.Acronym);
+
+                return hashCode.ToHashCode();
+            }
+        }
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index dd120937af..1e6631ffa0 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -199,6 +199,7 @@ namespace osu.Game
                     ScoreManager.Undelete(getBeatmapScores(item), true);
             });
 
+            dependencies.Cache(new BeatmapDifficultyManager(BeatmapManager));
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
             dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore));

From 68d2888a8c16cd5e16c1f50f12e5d22279dfd2c4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 16 Jul 2020 14:48:40 +0300
Subject: [PATCH 03786/10326] Add NewsOverlay to the game

---
 osu.Game.Tests/Visual/TestSceneOsuGame.cs     |  1 +
 osu.Game/OsuGame.cs                           |  5 ++++-
 osu.Game/Overlays/Toolbar/Toolbar.cs          |  1 +
 .../Overlays/Toolbar/ToolbarNewsButton.cs     | 22 +++++++++++++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs

diff --git a/osu.Game.Tests/Visual/TestSceneOsuGame.cs b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
index 22ae5257e7..b347c39c1e 100644
--- a/osu.Game.Tests/Visual/TestSceneOsuGame.cs
+++ b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
@@ -44,6 +44,7 @@ namespace osu.Game.Tests.Visual
             typeof(NotificationOverlay),
             typeof(BeatmapListingOverlay),
             typeof(DashboardOverlay),
+            typeof(NewsOverlay),
             typeof(ChannelManager),
             typeof(ChatOverlay),
             typeof(SettingsOverlay),
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 618049e72c..84b32673d5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -71,6 +71,8 @@ namespace osu.Game
 
         private DashboardOverlay dashboard;
 
+        private NewsOverlay news;
+
         private UserProfileOverlay userProfile;
 
         private BeatmapSetOverlay beatmapSetOverlay;
@@ -630,6 +632,7 @@ namespace osu.Game
             // overlay elements
             loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(dashboard = new DashboardOverlay(), overlayContent.Add, true);
+            loadComponentSingleFile(news = new NewsOverlay(), overlayContent.Add, true);
             var rankingsOverlay = loadComponentSingleFile(new RankingsOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(channelManager = new ChannelManager(), AddInternal, true);
             loadComponentSingleFile(chatOverlay = new ChatOverlay(), overlayContent.Add, true);
@@ -687,7 +690,7 @@ namespace osu.Game
             }
 
             // ensure only one of these overlays are open at once.
-            var singleDisplayOverlays = new OverlayContainer[] { chatOverlay, dashboard, beatmapListing, changelogOverlay, rankingsOverlay };
+            var singleDisplayOverlays = new OverlayContainer[] { chatOverlay, news, dashboard, beatmapListing, changelogOverlay, rankingsOverlay };
 
             foreach (var overlay in singleDisplayOverlays)
             {
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index de08b79f57..5bdd86c671 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -69,6 +69,7 @@ namespace osu.Game.Overlays.Toolbar
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
+                        new ToolbarNewsButton(),
                         new ToolbarChangelogButton(),
                         new ToolbarRankingsButton(),
                         new ToolbarBeatmapListingButton(),
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
new file mode 100644
index 0000000000..e813a3f4cb
--- /dev/null
+++ b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.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 ToolbarNewsButton : ToolbarOverlayToggleButton
+    {
+        public ToolbarNewsButton()
+        {
+            Icon = FontAwesome.Solid.Newspaper;
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(NewsOverlay news)
+        {
+            StateContainer = news;
+        }
+    }
+}

From dac98c8914c7c7f873fa26945bf2195fd72f271b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 16 Jul 2020 14:55:02 +0300
Subject: [PATCH 03787/10326] Add shortcut for news overlay

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 4 ++++
 osu.Game/OsuGame.cs                              | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 6ae420b162..9f59551b94 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -36,6 +36,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleDirect),
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
+            new KeyBinding(new[] { InputKey.Control, InputKey.A }, GlobalAction.ToggleNews),
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
@@ -165,5 +166,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Pause")]
         PauseGameplay,
+
+        [Description("Toggle news overlay")]
+        ToggleNews
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 84b32673d5..fc904cb09c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -872,6 +872,10 @@ namespace osu.Game
                     dashboard.ToggleVisibility();
                     return true;
 
+                case GlobalAction.ToggleNews:
+                    news.ToggleVisibility();
+                    return true;
+
                 case GlobalAction.ResetInputSettings:
                     var sensitivity = frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity);
 

From 3191bb506fe41950ec8f3b25be5632782499479a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 21:07:14 +0900
Subject: [PATCH 03788/10326] Improve asynchronous process

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 83 ++++++++++++-------
 1 file changed, 55 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index f09118a24a..02342e9595 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -29,32 +29,32 @@ namespace osu.Game.Beatmaps
             this.beatmapManager = beatmapManager;
         }
 
-        public Task<double> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null,
-                                               CancellationToken cancellationToken = default)
-            => Task.Factory.StartNew(() => GetDifficulty(beatmapInfo, rulesetInfo, mods), cancellationToken,
-                TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously,
-                updateScheduler);
+        public async Task<double> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null,
+                                                     CancellationToken cancellationToken = default)
+        {
+            if (tryGetGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
+                return existing;
+
+            return await Task.Factory.StartNew(() => getDifficulty(key), cancellationToken, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
+        }
 
         public double GetDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null)
         {
-            // Difficulty can only be computed if the beatmap is locally available.
-            if (beatmapInfo.ID == 0)
-                return 0;
-
-            // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
-            rulesetInfo ??= beatmapInfo.Ruleset;
-
-            var key = new DifficultyCacheLookup(beatmapInfo, rulesetInfo, mods);
-            if (difficultyCache.TryGetValue(key, out var existing))
+            if (tryGetGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
                 return existing;
 
+            return getDifficulty(key);
+        }
+
+        private double getDifficulty(in DifficultyCacheLookup key)
+        {
             try
             {
-                var ruleset = rulesetInfo.CreateInstance();
+                var ruleset = key.RulesetInfo.CreateInstance();
                 Debug.Assert(ruleset != null);
 
-                var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(beatmapInfo));
-                var attributes = calculator.Calculate(mods?.ToArray() ?? Array.Empty<Mod>());
+                var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(key.BeatmapInfo));
+                var attributes = calculator.Calculate(key.Mods);
 
                 difficultyCache.Add(key, attributes.StarRating);
                 return attributes.StarRating;
@@ -66,30 +66,57 @@ namespace osu.Game.Beatmaps
             }
         }
 
+        /// <summary>
+        /// Attempts to retrieve an existing difficulty for the combination.
+        /// </summary>
+        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/>.</param>
+        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/>.</param>
+        /// <param name="mods">The <see cref="Mod"/>s.</param>
+        /// <param name="existingDifficulty">The existing difficulty value, if present.</param>
+        /// <param name="key">The <see cref="DifficultyCacheLookup"/> key that was used to perform this lookup. This can be further used to query <see cref="getDifficulty"/>.</param>
+        /// <returns>Whether an existing difficulty was found.</returns>
+        private bool tryGetGetExisting(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo, IReadOnlyList<Mod> mods, out double existingDifficulty, out DifficultyCacheLookup key)
+        {
+            // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
+            rulesetInfo ??= beatmapInfo.Ruleset;
+
+            // Difficulty can only be computed if the beatmap is locally available.
+            if (beatmapInfo.ID == 0)
+            {
+                existingDifficulty = 0;
+                key = default;
+
+                return true;
+            }
+
+            key = new DifficultyCacheLookup(beatmapInfo, rulesetInfo, mods);
+            return difficultyCache.TryGetValue(key, out existingDifficulty);
+        }
+
         private readonly struct DifficultyCacheLookup : IEquatable<DifficultyCacheLookup>
         {
-            private readonly BeatmapInfo beatmapInfo;
-            private readonly RulesetInfo rulesetInfo;
-            private readonly IReadOnlyList<Mod> mods;
+            public readonly BeatmapInfo BeatmapInfo;
+            public readonly RulesetInfo RulesetInfo;
+            public readonly Mod[] Mods;
 
             public DifficultyCacheLookup(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo, IEnumerable<Mod> mods)
             {
-                this.beatmapInfo = beatmapInfo;
-                this.rulesetInfo = rulesetInfo;
-                this.mods = mods?.OrderBy(m => m.Acronym).ToArray() ?? Array.Empty<Mod>();
+                BeatmapInfo = beatmapInfo;
+                RulesetInfo = rulesetInfo;
+                Mods = mods?.OrderBy(m => m.Acronym).ToArray() ?? Array.Empty<Mod>();
             }
 
             public bool Equals(DifficultyCacheLookup other)
-                => beatmapInfo.Equals(other.beatmapInfo)
-                   && mods.SequenceEqual(other.mods);
+                => BeatmapInfo.Equals(other.BeatmapInfo)
+                   && Mods.SequenceEqual(other.Mods);
 
             public override int GetHashCode()
             {
                 var hashCode = new HashCode();
 
-                hashCode.Add(beatmapInfo.Hash);
-                hashCode.Add(rulesetInfo.GetHashCode());
-                foreach (var mod in mods)
+                hashCode.Add(BeatmapInfo.Hash);
+                hashCode.Add(RulesetInfo.GetHashCode());
+                foreach (var mod in Mods)
                     hashCode.Add(mod.Acronym);
 
                 return hashCode.ToHashCode();

From 24f14751ce77a98c3a520e3b66c25df05666c0c6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 21:08:08 +0900
Subject: [PATCH 03789/10326] Update beatmap details SR on ruleset/mod changes

---
 .../Screens/Select/Details/AdvancedStats.cs   | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 02822ea608..c5fc3701f8 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -14,10 +14,13 @@ using osu.Framework.Bindables;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Mods;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.Select.Details
 {
@@ -26,6 +29,12 @@ namespace osu.Game.Screens.Select.Details
         [Resolved]
         private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
+        [Resolved]
+        private BeatmapDifficultyManager difficultyManager { get; set; }
+
         protected readonly StatisticRow FirstValue, HpDrain, Accuracy, ApproachRate;
         private readonly StatisticRow starDifficulty;
 
@@ -71,6 +80,7 @@ namespace osu.Game.Screens.Select.Details
         {
             base.LoadComplete();
 
+            ruleset.BindValueChanged(_ => updateStatistics());
             mods.BindValueChanged(modsChanged, true);
         }
 
@@ -132,11 +142,33 @@ namespace osu.Game.Screens.Select.Details
                     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);
+
+            updateStarDifficulty();
+        }
+
+        private CancellationTokenSource starDifficultyCancellationSource;
+
+        private void updateStarDifficulty()
+        {
+            starDifficultyCancellationSource?.Cancel();
+
+            if (Beatmap == null)
+                return;
+
+            var ourSource = starDifficultyCancellationSource = new CancellationTokenSource();
+
+            Task.WhenAll(difficultyManager.GetDifficultyAsync(Beatmap, ruleset.Value, cancellationToken: ourSource.Token),
+                difficultyManager.GetDifficultyAsync(Beatmap, ruleset.Value, mods.Value, ourSource.Token)).ContinueWith(t =>
+            {
+                Schedule(() =>
+                {
+                    if (!ourSource.IsCancellationRequested)
+                        starDifficulty.Value = ((float)t.Result[0], (float)t.Result[1]);
+                });
+            }, ourSource.Token);
         }
 
         public class StatisticRow : Container, IHasAccentColour

From 9a52058a7aa5a8aa153a8793c83d77b0b1d37b3f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 21:08:24 +0900
Subject: [PATCH 03790/10326] Update carousel beatmap SR on mod/ruleset changes

---
 .../Carousel/DrawableCarouselBeatmap.cs       | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 3e4798a812..d4205a4b93 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -13,6 +15,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
@@ -20,6 +23,8 @@ using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
 
@@ -41,6 +46,15 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved(CanBeNull = true)]
         private BeatmapSetOverlay beatmapOverlay { get; set; }
 
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
+        [Resolved]
+        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+
+        [Resolved]
+        private BeatmapDifficultyManager difficultyManager { get; set; }
+
         public DrawableCarouselBeatmap(CarouselBeatmap panel)
             : base(panel)
         {
@@ -137,7 +151,6 @@ namespace osu.Game.Screens.Select.Carousel
                                         },
                                         starCounter = new StarCounter
                                         {
-                                            Current = (float)beatmap.StarDifficulty,
                                             Scale = new Vector2(0.8f),
                                         }
                                     }
@@ -147,6 +160,36 @@ namespace osu.Game.Screens.Select.Carousel
                     }
                 }
             };
+
+            ruleset.BindValueChanged(_ => refreshStarCounter());
+            mods.BindValueChanged(_ => refreshStarCounter(), true);
+        }
+
+        private ScheduledDelegate scheduledRefresh;
+        private CancellationTokenSource cancellationSource;
+
+        private void refreshStarCounter()
+        {
+            scheduledRefresh?.Cancel();
+            scheduledRefresh = null;
+
+            cancellationSource?.Cancel();
+            cancellationSource = null;
+
+            // Only want to run the calculation when we become visible.
+            scheduledRefresh = Schedule(() =>
+            {
+                var ourSource = cancellationSource = new CancellationTokenSource();
+                difficultyManager.GetDifficultyAsync(beatmap, ruleset.Value, mods.Value, ourSource.Token).ContinueWith(t =>
+                {
+                    // We're currently on a random threadpool thread which we must exit.
+                    Schedule(() =>
+                    {
+                        if (!ourSource.IsCancellationRequested)
+                            starCounter.Current = (float)t.Result;
+                    });
+                }, ourSource.Token);
+            });
         }
 
         protected override void Selected()

From 18d36850233e2bd7d464c4409fb89dc84b50b43f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 21:17:51 +0900
Subject: [PATCH 03791/10326] Pass in content

---
 .../TestScenePlayfieldCoveringContainer.cs            | 11 +++++------
 osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs        |  3 ++-
 osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs        |  7 ++++---
 .../UI/PlayfieldCoveringContainer.cs                  | 10 +++-------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs b/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
index 01fee47420..cbd33ca9a8 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
@@ -24,14 +24,13 @@ namespace osu.Game.Rulesets.Mania.Tests
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(300, 500),
-                Child = cover = new PlayfieldCoveringContainer
+                Child = cover = new PlayfieldCoveringContainer(new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Orange
+                })
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Orange
-                    }
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index 5c643a7d37..9761599e8e 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.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.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.UI;
@@ -14,6 +15,6 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override IconUsage? Icon => OsuIcon.ModHidden;
         public override string Description => @"Keys appear out of nowhere!";
 
-        protected override PlayfieldCoveringContainer CreateCover() => new PlayfieldCoveringContainer();
+        protected override PlayfieldCoveringContainer CreateCover(Drawable content) => new PlayfieldCoveringContainer(content);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 17e0637e04..3f7c09674e 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                 Container hocParent = (Container)hoc.Parent;
 
                 hocParent.Remove(hoc);
-                hocParent.Add(CreateCover().WithChild(hoc).With(c =>
+                hocParent.Add(CreateCover(hoc).With(c =>
                 {
                     c.RelativeSizeAxes = Axes.Both;
                     c.Coverage = 0.5f;
@@ -37,11 +37,12 @@ namespace osu.Game.Rulesets.Mania.Mods
             }
         }
 
-        protected virtual PlayfieldCoveringContainer CreateCover() => new ModHiddenCoveringContainer();
+        protected virtual PlayfieldCoveringContainer CreateCover(Drawable content) => new ModHiddenCoveringContainer(content);
 
         private class ModHiddenCoveringContainer : PlayfieldCoveringContainer
         {
-            public ModHiddenCoveringContainer()
+            public ModHiddenCoveringContainer(Drawable content)
+                : base(content)
             {
                 // This cover extends outwards from the hit position.
                 Cover.Scale = new Vector2(1, -1);
diff --git a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
index fe4ca38d0c..faac663169 100644
--- a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
+++ b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
@@ -19,12 +19,8 @@ namespace osu.Game.Rulesets.Mania.UI
     /// <remarks>
     /// The covered area extends in the scrolling direction, with its size depending on <see cref="Coverage"/>.
     /// </remarks>
-    public class PlayfieldCoveringContainer : Container
+    public class PlayfieldCoveringContainer : CompositeDrawable
     {
-        protected override Container<Drawable> Content => content;
-
-        private readonly Container content;
-
         /// <summary>
         /// The complete cover, including gradient and fill.
         /// </summary>
@@ -42,14 +38,14 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly IBindable<ScrollingDirection> scrollDirection = new Bindable<ScrollingDirection>();
 
-        public PlayfieldCoveringContainer()
+        public PlayfieldCoveringContainer(Drawable content)
         {
             InternalChild = new BufferedContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new[]
                 {
-                    content = new Container { RelativeSizeAxes = Axes.Both },
+                    content,
                     Cover = new Container
                     {
                         Anchor = Anchor.Centre,

From 2d9909cdd89b658411b450ad6e6ee86a8ba67193 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 16 Jul 2020 15:18:01 +0300
Subject: [PATCH 03792/10326] Make news cards clickable

---
 .../Visual/Online/TestSceneNewsCard.cs        |  7 +--
 osu.Game/Overlays/News/NewsCard.cs            | 50 ++++++++-----------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
index 0446cadac9..17675bfbc0 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
@@ -31,15 +31,16 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     new NewsCard(new APINewsPost
                     {
-                        Title = "This post has an image which starts with \"/\" and has many authors!",
+                        Title = "This post has an image which starts with \"/\" and has many authors! (clickable)",
                         Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                         Author = "someone, someone1, someone2, someone3, someone4",
                         FirstImage = "/help/wiki/shared/news/banners/monthly-beatmapping-contest.png",
-                        PublishedAt = DateTimeOffset.Now
+                        PublishedAt = DateTimeOffset.Now,
+                        Slug = "2020-07-16-summer-theme-park-2020-voting-open"
                     }),
                     new NewsCard(new APINewsPost
                     {
-                        Title = "This post has a full-url image! (HTML entity: &amp;)",
+                        Title = "This post has a full-url image! (HTML entity: &amp;) (non-clickable)",
                         Preview = "boom (HTML entity: &amp;)",
                         Author = "user (HTML entity: &amp;)",
                         FirstImage = "https://assets.ppy.sh/artists/88/header.jpg",
diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index 9c478a7c1d..38362038ae 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -2,6 +2,7 @@
 // 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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -10,18 +11,17 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Input.Events;
+using osu.Framework.Platform;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.News
 {
-    public class NewsCard : CompositeDrawable
+    public class NewsCard : OsuHoverContainer
     {
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
+        protected override IEnumerable<Drawable> EffectTargets => new[] { background };
 
         private readonly APINewsPost post;
 
@@ -31,24 +31,28 @@ namespace osu.Game.Overlays.News
         public NewsCard(APINewsPost post)
         {
             this.post = post;
-        }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Masking = true;
             CornerRadius = 6;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider, GameHost host)
+        {
+            if (post.Slug != null)
+            {
+                TooltipText = "view in browser";
+                Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
+            }
 
             NewsBackground bg;
-
-            InternalChildren = new Drawable[]
+            AddRange(new Drawable[]
             {
                 background = new Box
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background4
+                    RelativeSizeAxes = Axes.Both
                 },
                 new FillFlowContainer
                 {
@@ -104,9 +108,11 @@ namespace osu.Game.Overlays.News
                             }
                         }
                     }
-                },
-                new HoverClickSounds()
-            };
+                }
+            });
+
+            IdleColour = colourProvider.Background4;
+            HoverColour = colourProvider.Background3;
 
             bg.OnLoadComplete += d => d.FadeIn(250, Easing.In);
 
@@ -116,18 +122,6 @@ namespace osu.Game.Overlays.News
             main.AddText(post.Author, t => t.Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold));
         }
 
-        protected override bool OnHover(HoverEvent e)
-        {
-            background.FadeColour(colourProvider.Background3, 200, Easing.OutQuint);
-            return true;
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            background.FadeColour(colourProvider.Background4, 200, Easing.OutQuint);
-            base.OnHoverLost(e);
-        }
-
         [LongRunningLoad]
         private class NewsBackground : Sprite
         {

From 03a7b8a6ef2268b1a9772a766a5617f5b8982885 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 21:18:24 +0900
Subject: [PATCH 03793/10326] Rename

---
 .../TestScenePlayfieldCoveringContainer.cs                  | 4 ++--
 osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs              | 2 +-
 osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs              | 6 +++---
 ...ieldCoveringContainer.cs => PlayfieldCoveringWrapper.cs} | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game.Rulesets.Mania/UI/{PlayfieldCoveringContainer.cs => PlayfieldCoveringWrapper.cs} (97%)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs b/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
index cbd33ca9a8..8698ba3abd 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mania.Tests
     public class TestScenePlayfieldCoveringContainer : OsuTestScene
     {
         private readonly ScrollingTestContainer scrollingContainer;
-        private readonly PlayfieldCoveringContainer cover;
+        private readonly PlayfieldCoveringWrapper cover;
 
         public TestScenePlayfieldCoveringContainer()
         {
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(300, 500),
-                Child = cover = new PlayfieldCoveringContainer(new Box
+                Child = cover = new PlayfieldCoveringWrapper(new Box
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4.Orange
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index 9761599e8e..3893b83db9 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -15,6 +15,6 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override IconUsage? Icon => OsuIcon.ModHidden;
         public override string Description => @"Keys appear out of nowhere!";
 
-        protected override PlayfieldCoveringContainer CreateCover(Drawable content) => new PlayfieldCoveringContainer(content);
+        protected override PlayfieldCoveringWrapper CreateCover(Drawable content) => new PlayfieldCoveringWrapper(content);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 3f7c09674e..e460ccee9c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -37,11 +37,11 @@ namespace osu.Game.Rulesets.Mania.Mods
             }
         }
 
-        protected virtual PlayfieldCoveringContainer CreateCover(Drawable content) => new ModHiddenCoveringContainer(content);
+        protected virtual PlayfieldCoveringWrapper CreateCover(Drawable content) => new ModHiddenCoveringWrapper(content);
 
-        private class ModHiddenCoveringContainer : PlayfieldCoveringContainer
+        private class ModHiddenCoveringWrapper : PlayfieldCoveringWrapper
         {
-            public ModHiddenCoveringContainer(Drawable content)
+            public ModHiddenCoveringWrapper(Drawable content)
                 : base(content)
             {
                 // This cover extends outwards from the hit position.
diff --git a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs
similarity index 97%
rename from osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
rename to osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs
index faac663169..207239dd38 100644
--- a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringContainer.cs
+++ b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.UI
     /// <remarks>
     /// The covered area extends in the scrolling direction, with its size depending on <see cref="Coverage"/>.
     /// </remarks>
-    public class PlayfieldCoveringContainer : CompositeDrawable
+    public class PlayfieldCoveringWrapper : CompositeDrawable
     {
         /// <summary>
         /// The complete cover, including gradient and fill.
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly IBindable<ScrollingDirection> scrollDirection = new Bindable<ScrollingDirection>();
 
-        public PlayfieldCoveringContainer(Drawable content)
+        public PlayfieldCoveringWrapper(Drawable content)
         {
             InternalChild = new BufferedContainer
             {

From 8d9e5db641a5f2b54ff88e988dd4a353cff2906b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 16 Jul 2020 21:29:39 +0900
Subject: [PATCH 03794/10326] Use enum values instead of class override

---
 .../Mods/ManiaModFadeIn.cs                    |  3 +-
 .../Mods/ManiaModHidden.cs                    | 21 +++++--------
 .../UI/PlayfieldCoveringWrapper.cs            | 31 +++++++++++++++----
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index 3893b83db9..cbdcd49c5b 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.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.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.UI;
@@ -15,6 +14,6 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override IconUsage? Icon => OsuIcon.ModHidden;
         public override string Description => @"Keys appear out of nowhere!";
 
-        protected override PlayfieldCoveringWrapper CreateCover(Drawable content) => new PlayfieldCoveringWrapper(content);
+        protected override CoverExpandDirection ExpandDirection => CoverExpandDirection.AlongScroll;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index e460ccee9c..4bdb15526f 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -9,7 +9,6 @@ using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
@@ -19,6 +18,11 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
 
+        /// <summary>
+        /// The direction in which the cover should expand.
+        /// </summary>
+        protected virtual CoverExpandDirection ExpandDirection => CoverExpandDirection.AgainstScroll;
+
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
         {
             ManiaPlayfield maniaPlayfield = (ManiaPlayfield)drawableRuleset.Playfield;
@@ -29,24 +33,13 @@ namespace osu.Game.Rulesets.Mania.Mods
                 Container hocParent = (Container)hoc.Parent;
 
                 hocParent.Remove(hoc);
-                hocParent.Add(CreateCover(hoc).With(c =>
+                hocParent.Add(new PlayfieldCoveringWrapper(hoc).With(c =>
                 {
                     c.RelativeSizeAxes = Axes.Both;
+                    c.Direction = ExpandDirection;
                     c.Coverage = 0.5f;
                 }));
             }
         }
-
-        protected virtual PlayfieldCoveringWrapper CreateCover(Drawable content) => new ModHiddenCoveringWrapper(content);
-
-        private class ModHiddenCoveringWrapper : PlayfieldCoveringWrapper
-        {
-            public ModHiddenCoveringWrapper(Drawable content)
-                : base(content)
-            {
-                // This cover extends outwards from the hit position.
-                Cover.Scale = new Vector2(1, -1);
-            }
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs
index 207239dd38..15d216e8c5 100644
--- a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs
+++ b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.UI.Scrolling;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.UI
@@ -16,15 +17,12 @@ namespace osu.Game.Rulesets.Mania.UI
     /// <summary>
     /// A <see cref="Container"/> that has its contents partially hidden by an adjustable "cover". This is intended to be used in a playfield.
     /// </summary>
-    /// <remarks>
-    /// The covered area extends in the scrolling direction, with its size depending on <see cref="Coverage"/>.
-    /// </remarks>
     public class PlayfieldCoveringWrapper : CompositeDrawable
     {
         /// <summary>
         /// The complete cover, including gradient and fill.
         /// </summary>
-        protected readonly Drawable Cover;
+        private readonly Drawable cover;
 
         /// <summary>
         /// The gradient portion of the cover.
@@ -46,7 +44,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 Children = new[]
                 {
                     content,
-                    Cover = new Container
+                    cover = new Container
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -97,7 +95,7 @@ namespace osu.Game.Rulesets.Mania.UI
         }
 
         private void onScrollDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
-            => Cover.Rotation = direction.NewValue == ScrollingDirection.Up ? 0 : 180f;
+            => cover.Rotation = direction.NewValue == ScrollingDirection.Up ? 0 : 180f;
 
         /// <summary>
         /// The relative area that should be completely covered. This does not include the fade.
@@ -110,5 +108,26 @@ namespace osu.Game.Rulesets.Mania.UI
                 gradient.Y = -value;
             }
         }
+
+        /// <summary>
+        /// The direction in which the cover expands.
+        /// </summary>
+        public CoverExpandDirection Direction
+        {
+            set => cover.Scale = value == CoverExpandDirection.AlongScroll ? Vector2.One : new Vector2(1, -1);
+        }
+    }
+
+    public enum CoverExpandDirection
+    {
+        /// <summary>
+        /// The cover expands along the scrolling direction.
+        /// </summary>
+        AlongScroll,
+
+        /// <summary>
+        /// The cover expands against the scrolling direction.
+        /// </summary>
+        AgainstScroll
     }
 }

From 939441ae408d5f4eb7ee61dba8da54e5e056d481 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 16 Jul 2020 14:50:11 +0200
Subject: [PATCH 03795/10326] Disable the windows key only when in gameplay.

---
 osu.Desktop/Windows/GameplayWinKeyHandler.cs     | 14 +++++++-------
 osu.Game/Configuration/SessionStatics.cs         |  4 +++-
 osu.Game/Screens/Play/ScreenSuspensionHandler.cs | 13 ++++++++++++-
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/osu.Desktop/Windows/GameplayWinKeyHandler.cs b/osu.Desktop/Windows/GameplayWinKeyHandler.cs
index 4f74a4f492..d5ef89c680 100644
--- a/osu.Desktop/Windows/GameplayWinKeyHandler.cs
+++ b/osu.Desktop/Windows/GameplayWinKeyHandler.cs
@@ -11,26 +11,26 @@ namespace osu.Desktop.Windows
 {
     public class GameplayWinKeyHandler : Component
     {
-        private Bindable<bool> allowScreenSuspension;
         private Bindable<bool> disableWinKey;
+        private Bindable<bool> disableWinKeySetting;
 
         private GameHost host;
 
         [BackgroundDependencyLoader]
-        private void load(GameHost host, OsuConfigManager config)
+        private void load(GameHost host, OsuConfigManager config, SessionStatics statics)
         {
             this.host = host;
 
-            allowScreenSuspension = host.AllowScreenSuspension.GetBoundCopy();
-            allowScreenSuspension.ValueChanged += toggleWinKey;
+            disableWinKey = statics.GetBindable<bool>(Static.DisableWindowsKey);
+            disableWinKey.ValueChanged += toggleWinKey;
 
-            disableWinKey = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey);
-            disableWinKey.BindValueChanged(t => allowScreenSuspension.TriggerChange(), true);
+            disableWinKeySetting = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey);
+            disableWinKeySetting.BindValueChanged(t => disableWinKey.TriggerChange(), true);
         }
 
         private void toggleWinKey(ValueChangedEvent<bool> e)
         {
-            if (!e.NewValue && disableWinKey.Value)
+            if (e.NewValue && disableWinKeySetting.Value)
                 host.InputThread.Scheduler.Add(WindowsKey.Disable);
             else
                 host.InputThread.Scheduler.Add(WindowsKey.Enable);
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 40b2adb867..7aad79b5ad 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -12,12 +12,14 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
+            Set(Static.DisableWindowsKey, false);
         }
     }
 
     public enum Static
     {
         LoginOverlayDisplayed,
-        MutedAudioNotificationShownOnce
+        MutedAudioNotificationShownOnce,
+        DisableWindowsKey
     }
 }
diff --git a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
index 8585a5c309..c2c7f1ac41 100644
--- a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
+++ b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
+using osu.Game.Configuration;
 
 namespace osu.Game.Screens.Play
 {
@@ -22,6 +23,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private GameHost host { get; set; }
 
+        [Resolved]
+        private SessionStatics statics { get; set; }
+
         public ScreenSuspensionHandler([NotNull] GameplayClockContainer gameplayClockContainer)
         {
             this.gameplayClockContainer = gameplayClockContainer ?? throw new ArgumentNullException(nameof(gameplayClockContainer));
@@ -36,7 +40,11 @@ namespace osu.Game.Screens.Play
             Debug.Assert(host.AllowScreenSuspension.Value);
 
             isPaused = gameplayClockContainer.IsPaused.GetBoundCopy();
-            isPaused.BindValueChanged(paused => host.AllowScreenSuspension.Value = paused.NewValue, true);
+            isPaused.BindValueChanged(paused =>
+            {
+                host.AllowScreenSuspension.Value = paused.NewValue;
+                statics.Set(Static.DisableWindowsKey, !paused.NewValue);
+            }, true);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -46,7 +54,10 @@ namespace osu.Game.Screens.Play
             isPaused?.UnbindAll();
 
             if (host != null)
+            {
                 host.AllowScreenSuspension.Value = true;
+                statics.Set(Static.DisableWindowsKey, false);
+            }
         }
     }
 }

From 396ada7f39fb52a3301398c1cf8d17767da86bf6 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 16 Jul 2020 15:03:25 +0200
Subject: [PATCH 03796/10326] Enable windows key when a replay is loaded.

---
 osu.Game/Screens/Play/Player.cs                  | 2 +-
 osu.Game/Screens/Play/ScreenSuspensionHandler.cs | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 541275cf55..e0721d55f7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Screens.Play
             InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
 
             AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap));
-            AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer));
+            AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer, DrawableRuleset.HasReplayLoaded));
 
             dependencies.CacheAs(gameplayBeatmap);
 
diff --git a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
index c2c7f1ac41..6865db5a5e 100644
--- a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
+++ b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Screens.Play
     {
         private readonly GameplayClockContainer gameplayClockContainer;
         private Bindable<bool> isPaused;
+        private readonly Bindable<bool> hasReplayLoaded;
 
         [Resolved]
         private GameHost host { get; set; }
@@ -26,9 +27,10 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private SessionStatics statics { get; set; }
 
-        public ScreenSuspensionHandler([NotNull] GameplayClockContainer gameplayClockContainer)
+        public ScreenSuspensionHandler([NotNull] GameplayClockContainer gameplayClockContainer, Bindable<bool> hasReplayLoaded)
         {
             this.gameplayClockContainer = gameplayClockContainer ?? throw new ArgumentNullException(nameof(gameplayClockContainer));
+            this.hasReplayLoaded = hasReplayLoaded.GetBoundCopy();
         }
 
         protected override void LoadComplete()
@@ -43,8 +45,9 @@ namespace osu.Game.Screens.Play
             isPaused.BindValueChanged(paused =>
             {
                 host.AllowScreenSuspension.Value = paused.NewValue;
-                statics.Set(Static.DisableWindowsKey, !paused.NewValue);
+                statics.Set(Static.DisableWindowsKey, !paused.NewValue && !hasReplayLoaded.Value);
             }, true);
+            hasReplayLoaded.BindValueChanged(_ => isPaused.TriggerChange(), true);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -52,6 +55,7 @@ namespace osu.Game.Screens.Play
             base.Dispose(isDisposing);
 
             isPaused?.UnbindAll();
+            hasReplayLoaded.UnbindAll();
 
             if (host != null)
             {

From f72a6b8c9d55642706b80e419fb567e620de1a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 16 Jul 2020 20:08:48 +0200
Subject: [PATCH 03797/10326] Use [Resolved] instead

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

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 5f9dedcbed..6bacb0383f 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -25,7 +25,9 @@ namespace osu.Game.Rulesets.Catch.Tests
     public class TestSceneCatcherArea : CatchSkinnableTestScene
     {
         private RulesetInfo catchRuleset;
-        private OsuConfigManager config;
+
+        [Resolved]
+        private OsuConfigManager config { get; set; }
 
         public TestSceneCatcherArea()
         {
@@ -105,10 +107,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         }
 
         [BackgroundDependencyLoader]
-        private void load(RulesetStore rulesets, OsuConfigManager configManager)
+        private void load(RulesetStore rulesets)
         {
             catchRuleset = rulesets.GetRuleset(2);
-            config = configManager;
         }
 
         public class TestFruit : Fruit

From 54b0321581cfd75da817323b93eeb4be88395f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 16 Jul 2020 20:12:32 +0200
Subject: [PATCH 03798/10326] Factor out catcher as property

---
 .../TestSceneCatcherArea.cs                          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 6bacb0383f..0588c4ba57 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Resolved]
         private OsuConfigManager config { get; set; }
 
+        private Catcher catcher => this.ChildrenOfType<CatcherArea>().First().MovableCatcher;
+
         public TestSceneCatcherArea()
         {
             AddSliderStep<float>("CircleSize", 0, 8, 5, createCatcher);
@@ -38,20 +40,20 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             AddRepeatStep("catch fruit", () => catchFruit(new TestFruit(false)
             {
-                X = this.ChildrenOfType<CatcherArea>().First().MovableCatcher.X
+                X = catcher.X
             }), 20);
             AddRepeatStep("catch fruit last in combo", () => catchFruit(new TestFruit(false)
             {
-                X = this.ChildrenOfType<CatcherArea>().First().MovableCatcher.X,
+                X = catcher.X,
                 LastInCombo = true,
             }), 20);
             AddRepeatStep("catch kiai fruit", () => catchFruit(new TestFruit(true)
             {
-                X = this.ChildrenOfType<CatcherArea>().First().MovableCatcher.X,
+                X = catcher.X
             }), 20);
             AddRepeatStep("miss fruit", () => catchFruit(new Fruit
             {
-                X = this.ChildrenOfType<CatcherArea>().First().MovableCatcher.X + 100,
+                X = catcher.X + 100,
                 LastInCombo = true,
             }, true), 20);
         }
@@ -60,8 +62,6 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase(false)]
         public void TestHitLighting(bool enable)
         {
-            Catcher catcher = this.ChildrenOfType<CatcherArea>().First().MovableCatcher;
-
             AddStep("Toggle hit lighting", () => config.Set(OsuSetting.HitLighting, enable));
             AddStep("Catch fruit", () => catchFruit(new TestFruit(false)
             {

From fbf3a098351d7a7dec872bd2953d2e3f563862ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 16 Jul 2020 20:14:57 +0200
Subject: [PATCH 03799/10326] Create catcher explicitly to make tests
 independent of ctor

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

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 0588c4ba57..d23c691023 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -62,6 +62,8 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase(false)]
         public void TestHitLighting(bool enable)
         {
+            AddStep("create catcher", () => createCatcher(5));
+
             AddStep("Toggle hit lighting", () => config.Set(OsuSetting.HitLighting, enable));
             AddStep("Catch fruit", () => catchFruit(new TestFruit(false)
             {

From a8e96b399457bfafa4caa0a3b4dc84939a964086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 16 Jul 2020 20:17:37 +0200
Subject: [PATCH 03800/10326] Reword test steps for consistency & fix typo

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

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index d23c691023..b4f123598b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -64,17 +64,17 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("create catcher", () => createCatcher(5));
 
-            AddStep("Toggle hit lighting", () => config.Set(OsuSetting.HitLighting, enable));
-            AddStep("Catch fruit", () => catchFruit(new TestFruit(false)
+            AddStep("toggle hit lighting", () => config.Set(OsuSetting.HitLighting, enable));
+            AddStep("catch fruit", () => catchFruit(new TestFruit(false)
             {
                 X = catcher.X
             }));
-            AddStep("Catch fruit last combo", () => catchFruit(new TestFruit(false)
+            AddStep("catch fruit last in combo", () => catchFruit(new TestFruit(false)
             {
                 X = catcher.X,
                 LastInCombo = true
             }));
-            AddAssert("Check hit explotion", () => catcher.ChildrenOfType<HitExplosion>().Any() == enable);
+            AddAssert("check hit explosion", () => catcher.ChildrenOfType<HitExplosion>().Any() == enable);
         }
 
         private void catchFruit(Fruit fruit, bool miss = false)

From f67b93936ffeb85bb86b0d27e4cd5af94148ea3b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 16 Jul 2020 23:11:55 +0300
Subject: [PATCH 03801/10326] Remove shortcut

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 4 ----
 osu.Game/OsuGame.cs                              | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 9f59551b94..6ae420b162 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleDirect),
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
-            new KeyBinding(new[] { InputKey.Control, InputKey.A }, GlobalAction.ToggleNews),
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
@@ -166,8 +165,5 @@ namespace osu.Game.Input.Bindings
 
         [Description("Pause")]
         PauseGameplay,
-
-        [Description("Toggle news overlay")]
-        ToggleNews
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index fc904cb09c..84b32673d5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -872,10 +872,6 @@ namespace osu.Game
                     dashboard.ToggleVisibility();
                     return true;
 
-                case GlobalAction.ToggleNews:
-                    news.ToggleVisibility();
-                    return true;
-
                 case GlobalAction.ResetInputSettings:
                     var sensitivity = frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity);
 

From ab23e7dfd4faad3040a8e24eb114a16b6956c183 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 16 Jul 2020 23:14:51 +0300
Subject: [PATCH 03802/10326] Protect the NewsCard from clicks while hovering
 DateContainer

---
 osu.Game/Overlays/News/NewsCard.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index 38362038ae..201c3ce826 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Input.Events;
 using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -187,6 +188,8 @@ namespace osu.Game.Overlays.News
                     }
                 };
             }
+
+            protected override bool OnClick(ClickEvent e) => true; // Protects the NewsCard from clicks while hovering DateContainer
         }
     }
 }

From 6a3b2ca7cfb5b42c9a15d15d84c24c39a3e1b53f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Jul 2020 11:39:51 +0900
Subject: [PATCH 03803/10326] Ensure nUnit runs with correct CurrentDirectory

---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 85d5fce29a..29ca385275 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -783,6 +783,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/UnitTesting/NUnitProvider/SetCurrentDirectoryTo/@EntryValue">TestFolder</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>

From c44ac9104f77d72d3917c47005a3c7f7b849c72e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Jul 2020 14:19:43 +0900
Subject: [PATCH 03804/10326] Fix post-merge error

---
 .../Difficulty/Skills/Strain.cs               | 95 -------------------
 1 file changed, 95 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs
deleted file mode 100644
index 2c1885ae1a..0000000000
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.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 osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Skills;
-using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Taiko.Objects;
-
-namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
-{
-    public class Strain : Skill
-    {
-        private const double rhythm_change_base_threshold = 0.2;
-        private const double rhythm_change_base = 2.0;
-
-        protected override double SkillMultiplier => 1;
-        protected override double StrainDecayBase => 0.3;
-
-        private ColourSwitch lastColourSwitch = ColourSwitch.None;
-
-        private int sameColourCount = 1;
-
-        protected override double StrainValueOf(DifficultyHitObject current)
-        {
-            double addition = 1;
-
-            // We get an extra addition if we are not a slider or spinner
-            if (current.LastObject is Hit && current.BaseObject is Hit && current.BaseObject.StartTime - current.LastObject.StartTime < 1000)
-            {
-                if (hasColourChange(current))
-                    addition += 0.75;
-
-                if (hasRhythmChange(current))
-                    addition += 1;
-            }
-            else
-            {
-                lastColourSwitch = ColourSwitch.None;
-                sameColourCount = 1;
-            }
-
-            double additionFactor = 1;
-
-            // Scale the addition factor linearly from 0.4 to 1 for DeltaTime from 0 to 50
-            if (current.DeltaTime < 50)
-                additionFactor = 0.4 + 0.6 * current.DeltaTime / 50;
-
-            return additionFactor * addition;
-        }
-
-        private bool hasRhythmChange(DifficultyHitObject current)
-        {
-            // We don't want a division by zero if some random mapper decides to put two HitObjects at the same time.
-            if (current.DeltaTime == 0 || Previous.Count == 0 || Previous[0].DeltaTime == 0)
-                return false;
-
-            double timeElapsedRatio = Math.Max(Previous[0].DeltaTime / current.DeltaTime, current.DeltaTime / Previous[0].DeltaTime);
-
-            if (timeElapsedRatio >= 8)
-                return false;
-
-            double difference = Math.Log(timeElapsedRatio, rhythm_change_base) % 1.0;
-
-            return difference > rhythm_change_base_threshold && difference < 1 - rhythm_change_base_threshold;
-        }
-
-        private bool hasColourChange(DifficultyHitObject current)
-        {
-            var taikoCurrent = (TaikoDifficultyHitObject)current;
-
-            if (!taikoCurrent.HasTypeChange)
-            {
-                sameColourCount++;
-                return false;
-            }
-
-            var oldColourSwitch = lastColourSwitch;
-            var newColourSwitch = sameColourCount % 2 == 0 ? ColourSwitch.Even : ColourSwitch.Odd;
-
-            lastColourSwitch = newColourSwitch;
-            sameColourCount = 1;
-
-            // We only want a bonus if the parity of the color switch changes
-            return oldColourSwitch != ColourSwitch.None && oldColourSwitch != newColourSwitch;
-        }
-
-        private enum ColourSwitch
-        {
-            None,
-            Even,
-            Odd
-        }
-    }
-}

From f4d0bef897f7305799bd8b8573e13962970ee2c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Jul 2020 14:38:28 +0900
Subject: [PATCH 03805/10326] Fix timing screen test crashing due to missing
 dependency

---
 osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
index 2a7f9389d1..09f5ac2224 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Timing;
@@ -13,6 +14,7 @@ namespace osu.Game.Tests.Visual.Editing
     public class TestSceneTimingScreen : EditorClockTestScene
     {
         [Cached(typeof(EditorBeatmap))]
+        [Cached(typeof(IBeatSnapProvider))]
         private readonly EditorBeatmap editorBeatmap;
 
         public TestSceneTimingScreen()

From e96e5587288ed80fbe21977344ada99d43f24854 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Jul 2020 16:03:13 +0900
Subject: [PATCH 03806/10326] Fix reversing scroll direction not always
 behaving as expected

---
 osu.Game/Screens/Edit/Editor.cs      | 17 ++++++++++++++---
 osu.Game/Screens/Edit/EditorClock.cs |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 9f61589c36..d92f3922c3 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -275,11 +275,22 @@ namespace osu.Game.Screens.Edit
 
         protected override bool OnScroll(ScrollEvent e)
         {
-            scrollAccumulation += (e.ScrollDelta.X + e.ScrollDelta.Y) * (e.IsPrecise ? 0.1 : 1);
+            const double precision = 1;
 
-            const int precision = 1;
+            double scrollComponent = e.ScrollDelta.X + e.ScrollDelta.Y;
 
-            while (Math.Abs(scrollAccumulation) > precision)
+            double scrollDirection = Math.Sign(scrollComponent);
+
+            // this is a special case to handle the "pivot" scenario.
+            // if we are precise scrolling in one direction then change our mind and scroll backwards,
+            // the existing accumulation should be applied in the inverse direction to maintain responsiveness.
+            if (Math.Sign(scrollAccumulation) != scrollDirection)
+                scrollAccumulation = scrollDirection * (precision - Math.Abs(scrollAccumulation));
+
+            scrollAccumulation += scrollComponent * (e.IsPrecise ? 0.1 : 1);
+
+            // because we are doing snapped seeking, we need to add up precise scrolls until they accumulate to an arbitrary cut-off.
+            while (Math.Abs(scrollAccumulation) >= precision)
             {
                 if (scrollAccumulation > 0)
                     seek(e, -1);
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index dd934c10cd..36f3efec58 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Screens.Edit
 
             // Due to the rounding above, we may end up on the current beat. This will effectively cause 0 seeking to happen, but we don't want this.
             // Instead, we'll go to the next beat in the direction when this is the case
-            if (Precision.AlmostEquals(current, seekTime))
+            if (Precision.AlmostEquals(current, seekTime, 1))
             {
                 closestBeat += direction > 0 ? 1 : -1;
                 seekTime = timingPoint.Time + closestBeat * seekAmount;

From 039790ce4f02700d69b56837f86a3b210ee214f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Jul 2020 16:40:02 +0900
Subject: [PATCH 03807/10326] Perform next timing point check before ensuring
 movement

---
 osu.Game/Screens/Edit/EditorClock.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 36f3efec58..d4d0feb813 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -118,9 +118,14 @@ namespace osu.Game.Screens.Edit
 
             seekTime = timingPoint.Time + closestBeat * seekAmount;
 
+            // limit forward seeking to only up to the next timing point's start time.
+            var nextTimingPoint = ControlPointInfo.TimingPoints.FirstOrDefault(t => t.Time > timingPoint.Time);
+            if (seekTime > nextTimingPoint?.Time)
+                seekTime = nextTimingPoint.Time;
+
             // Due to the rounding above, we may end up on the current beat. This will effectively cause 0 seeking to happen, but we don't want this.
             // Instead, we'll go to the next beat in the direction when this is the case
-            if (Precision.AlmostEquals(current, seekTime, 1))
+            if (Precision.AlmostEquals(current, seekTime, 0.5f))
             {
                 closestBeat += direction > 0 ? 1 : -1;
                 seekTime = timingPoint.Time + closestBeat * seekAmount;
@@ -129,10 +134,6 @@ namespace osu.Game.Screens.Edit
             if (seekTime < timingPoint.Time && timingPoint != ControlPointInfo.TimingPoints.First())
                 seekTime = timingPoint.Time;
 
-            var nextTimingPoint = ControlPointInfo.TimingPoints.FirstOrDefault(t => t.Time > timingPoint.Time);
-            if (seekTime > nextTimingPoint?.Time)
-                seekTime = nextTimingPoint.Time;
-
             // Ensure the sought point is within the boundaries
             seekTime = Math.Clamp(seekTime, 0, TrackLength);
             SeekTo(seekTime);

From 9f7750e615194fea2c8eea04194836b71d9d39c9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Jul 2020 16:54:30 +0900
Subject: [PATCH 03808/10326] Add texture wrapping support to skins

---
 osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs |  3 ++-
 .../TestSceneSkinFallbacks.cs                       |  3 ++-
 .../Gameplay/TestSceneHitObjectAccentColour.cs      |  3 ++-
 .../Skins/TestSceneSkinConfigurationLookup.cs       |  3 ++-
 .../Visual/Gameplay/TestSceneSkinnableDrawable.cs   |  7 ++++---
 osu.Game/Skinning/DefaultSkin.cs                    |  3 ++-
 osu.Game/Skinning/ISkin.cs                          | 13 ++++++++++++-
 osu.Game/Skinning/LegacySkin.cs                     |  7 ++++---
 osu.Game/Skinning/LegacySkinTransformer.cs          |  6 +++++-
 osu.Game/Skinning/Skin.cs                           |  5 ++++-
 osu.Game/Skinning/SkinManager.cs                    |  3 ++-
 osu.Game/Skinning/SkinProvidingContainer.cs         |  7 ++++---
 osu.Game/Tests/Visual/SkinnableTestScene.cs         |  7 ++++---
 13 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index 46769f65fe..dde02e873b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -8,6 +8,7 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing.Input;
 using osu.Game.Audio;
@@ -79,7 +80,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             public Drawable GetDrawableComponent(ISkinComponent component) => throw new NotImplementedException();
 
-            public Texture GetTexture(string componentName)
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
                 switch (componentName)
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index b357e20ee8..075bf314bc 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -9,6 +9,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Timing;
@@ -131,7 +132,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 };
             }
 
-            public Texture GetTexture(string componentName) => null;
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
             public SampleChannel GetSample(ISampleInfo sampleInfo) => null;
 
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index 7a89642e11..2d5e4b911e 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -8,6 +8,7 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
 using osu.Game.Audio;
@@ -118,7 +119,7 @@ namespace osu.Game.Tests.Gameplay
 
             public Drawable GetDrawableComponent(ISkinComponent component) => throw new NotImplementedException();
 
-            public Texture GetTexture(string componentName) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index 8deed75a56..ad5b3ec0f6 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -10,6 +10,7 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
 using osu.Game.Audio;
@@ -216,7 +217,7 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponent component) => skin.GetDrawableComponent(component);
 
-            public Texture GetTexture(string componentName) => skin.GetTexture(componentName);
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
             public SampleChannel GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index 3b91243fee..bed48f3d86 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -10,6 +10,7 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
@@ -295,7 +296,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                     : null;
 
-            public Texture GetTexture(string componentName) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
@@ -306,7 +307,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public Drawable GetDrawableComponent(ISkinComponent componentName) => new SecondarySourceBox();
 
-            public Texture GetTexture(string componentName) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
@@ -318,7 +319,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public Drawable GetDrawableComponent(ISkinComponent componentName) => new BaseSourceBox();
 
-            public Texture GetTexture(string componentName) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 6b4af21b37..61d0112c89 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osuTK.Graphics;
@@ -21,7 +22,7 @@ namespace osu.Game.Skinning
 
         public override Drawable GetDrawableComponent(ISkinComponent component) => null;
 
-        public override Texture GetTexture(string componentName) => null;
+        public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
         public override SampleChannel GetSample(ISampleInfo sampleInfo) => null;
 
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index cb2a379b8e..5abd963773 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -5,6 +5,7 @@ using JetBrains.Annotations;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 
@@ -29,7 +30,17 @@ namespace osu.Game.Skinning
         /// <param name="componentName">The requested texture.</param>
         /// <returns>A matching texture, or null if unavailable.</returns>
         [CanBeNull]
-        Texture GetTexture(string componentName);
+        Texture GetTexture(string componentName) => GetTexture(componentName, default, default);
+
+        /// <summary>
+        /// Retrieve a <see cref="Texture"/>.
+        /// </summary>
+        /// <param name="componentName">The requested texture.</param>
+        /// <param name="wrapModeS">The texture wrap mode in horizontal direction.</param>
+        /// <param name="wrapModeT">The texture wrap mode in vertical direction.</param>
+        /// <returns>A matching texture, or null if unavailable.</returns>
+        [CanBeNull]
+        Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT);
 
         /// <summary>
         /// Retrieve a <see cref="SampleChannel"/>.
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 4b70ccc6ad..3bbeff9918 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -11,6 +11,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Audio;
@@ -311,17 +312,17 @@ namespace osu.Game.Skinning
             return this.GetAnimation(component.LookupName, false, false);
         }
 
-        public override Texture GetTexture(string componentName)
+        public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
         {
             foreach (var name in getFallbackNames(componentName))
             {
                 float ratio = 2;
-                var texture = Textures?.Get($"{name}@2x");
+                var texture = Textures?.Get($"{name}@2x", wrapModeS, wrapModeT);
 
                 if (texture == null)
                 {
                     ratio = 1;
-                    texture = Textures?.Get(name);
+                    texture = Textures?.Get(name, wrapModeS, wrapModeT);
                 }
 
                 if (texture == null)
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index 94a7a32f05..786056b932 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Legacy;
@@ -27,7 +28,10 @@ namespace osu.Game.Skinning
 
         public abstract Drawable GetDrawableComponent(ISkinComponent component);
 
-        public Texture GetTexture(string componentName) => Source.GetTexture(componentName);
+        public Texture GetTexture(string componentName) => GetTexture(componentName, default, default);
+
+        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            => Source.GetTexture(componentName, wrapModeS, wrapModeT);
 
         public virtual SampleChannel GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index fa4aebd8a5..4b0cf02c0a 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 
@@ -20,7 +21,9 @@ namespace osu.Game.Skinning
 
         public abstract SampleChannel GetSample(ISampleInfo sampleInfo);
 
-        public abstract Texture GetTexture(string componentName);
+        public Texture GetTexture(string componentName) => GetTexture(componentName, default, default);
+
+        public abstract Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT);
 
         public abstract IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index d65c74ef62..e1f713882a 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -13,6 +13,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
@@ -130,7 +131,7 @@ namespace osu.Game.Skinning
 
         public Drawable GetDrawableComponent(ISkinComponent component) => CurrentSkin.Value.GetDrawableComponent(component);
 
-        public Texture GetTexture(string componentName) => CurrentSkin.Value.GetTexture(componentName);
+        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => CurrentSkin.Value.GetTexture(componentName, wrapModeS, wrapModeT);
 
         public SampleChannel GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 1c01bbf1ab..adf62ed452 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 
@@ -47,13 +48,13 @@ namespace osu.Game.Skinning
             return fallbackSource?.GetDrawableComponent(component);
         }
 
-        public Texture GetTexture(string componentName)
+        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
         {
             Texture sourceTexture;
-            if (AllowTextureLookup(componentName) && (sourceTexture = skin?.GetTexture(componentName)) != null)
+            if (AllowTextureLookup(componentName) && (sourceTexture = skin?.GetTexture(componentName, wrapModeS, wrapModeT)) != null)
                 return sourceTexture;
 
-            return fallbackSource?.GetTexture(componentName);
+            return fallbackSource?.GetTexture(componentName, wrapModeS, wrapModeT);
         }
 
         public SampleChannel GetSample(ISampleInfo sampleInfo)
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index ea7cdaaac6..81c13112d0 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
@@ -157,7 +158,7 @@ namespace osu.Game.Tests.Visual
                 this.extrapolateAnimations = extrapolateAnimations;
             }
 
-            public override Texture GetTexture(string componentName)
+            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
                 // extrapolate frames to test longer animations
                 if (extrapolateAnimations)
@@ -165,10 +166,10 @@ namespace osu.Game.Tests.Visual
                     var match = Regex.Match(componentName, "-([0-9]*)");
 
                     if (match.Length > 0 && int.TryParse(match.Groups[1].Value, out var number) && number < 60)
-                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"));
+                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), wrapModeS, wrapModeT);
                 }
 
-                return base.GetTexture(componentName);
+                return base.GetTexture(componentName, wrapModeS, wrapModeT);
             }
         }
     }

From fc0f3f917184f86ae99239926edad41dd4fa1288 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Jul 2020 16:55:01 +0900
Subject: [PATCH 03809/10326] Fix taiko drumroll bodies behaving badly with
 edge alphas

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
index 8531f3cefd..8223e3bc01 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
@@ -34,13 +35,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-end"),
+                    Texture = skin.GetTexture("taiko-roll-end", WrapMode.ClampToEdge, WrapMode.ClampToEdge),
                     FillMode = FillMode.Fit,
                 },
                 body = new Sprite
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-middle"),
+                    Texture = skin.GetTexture("taiko-roll-middle", WrapMode.ClampToEdge, WrapMode.ClampToEdge),
                 },
                 headCircle = new LegacyCirclePiece
                 {

From 222a22182e849c36cb092f10d73da75a10219f97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Jul 2020 17:03:57 +0900
Subject: [PATCH 03810/10326] Fix double-click incorrectly firing across
 disparate targets

---
 .../Edit/Compose/Components/BlueprintContainer.cs    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index c6e228262f..1b189fcf48 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -121,14 +121,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return e.Button == MouseButton.Left;
         }
 
+        private SelectionBlueprint clickedBlueprint;
+
         protected override bool OnClick(ClickEvent e)
         {
             if (e.Button == MouseButton.Right)
                 return false;
 
+            // store for double-click handling
+            clickedBlueprint = selectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered);
+
             // Deselection should only occur if no selected blueprints are hovered
             // A special case for when a blueprint was selected via this click is added since OnClick() may occur outside the hitobject and should not trigger deselection
-            if (endClickSelection() || selectionHandler.SelectedBlueprints.Any(b => b.IsHovered))
+            if (endClickSelection() || clickedBlueprint != null)
                 return true;
 
             deselectAll();
@@ -140,9 +145,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (e.Button == MouseButton.Right)
                 return false;
 
-            SelectionBlueprint clickedBlueprint = selectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered);
-
-            if (clickedBlueprint == null)
+            // ensure the blueprint which was hovered for the first click is still the hovered blueprint.
+            if (clickedBlueprint == null || selectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != clickedBlueprint)
                 return false;
 
             editorClock?.SeekTo(clickedBlueprint.HitObject.StartTime);

From afca535abe5951a4eed0543dfc1da679d525242d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Jul 2020 16:57:33 +0900
Subject: [PATCH 03811/10326] Add texture wrapping support to GetAnimation()

---
 osu.Game/Skinning/IAnimationTimeReference.cs |  3 ++-
 osu.Game/Skinning/LegacySkinExtensions.cs    | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/IAnimationTimeReference.cs b/osu.Game/Skinning/IAnimationTimeReference.cs
index 4ed5ef64c3..7e52bb8176 100644
--- a/osu.Game/Skinning/IAnimationTimeReference.cs
+++ b/osu.Game/Skinning/IAnimationTimeReference.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Timing;
 
 namespace osu.Game.Skinning
@@ -11,7 +12,7 @@ namespace osu.Game.Skinning
     /// </summary>
     /// <remarks>
     /// This should not be used to start an animation immediately at the current time.
-    /// To do so, use <see cref="LegacySkinExtensions.GetAnimation"/> with <code>startAtCurrentTime = true</code> instead.
+    /// To do so, use <see cref="LegacySkinExtensions.GetAnimation(ISkin, string, WrapMode, WrapMode, bool, bool, bool, string, bool, double?)"/> with <code>startAtCurrentTime = true</code> instead.
     /// </remarks>
     [Cached]
     public interface IAnimationTimeReference
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 549571dec4..7cf41ef3c1 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 
@@ -15,6 +16,11 @@ namespace osu.Game.Skinning
     {
         public static Drawable GetAnimation(this ISkin source, string componentName, bool animatable, bool looping, bool applyConfigFrameRate = false, string animationSeparator = "-",
                                             bool startAtCurrentTime = true, double? frameLength = null)
+            => source.GetAnimation(componentName, default, default, animatable, looping, applyConfigFrameRate, animationSeparator, startAtCurrentTime, frameLength);
+
+        public static Drawable GetAnimation(this ISkin source, string componentName, WrapMode wrapModeS, WrapMode wrapModeT, bool animatable, bool looping, bool applyConfigFrameRate = false,
+                                            string animationSeparator = "-",
+                                            bool startAtCurrentTime = true, double? frameLength = null)
         {
             Texture texture;
 
@@ -38,7 +44,7 @@ namespace osu.Game.Skinning
             }
 
             // if an animation was not allowed or not found, fall back to a sprite retrieval.
-            if ((texture = source.GetTexture(componentName)) != null)
+            if ((texture = source.GetTexture(componentName, wrapModeS, wrapModeT)) != null)
                 return new Sprite { Texture = texture };
 
             return null;
@@ -47,7 +53,7 @@ namespace osu.Game.Skinning
             {
                 for (int i = 0; true; i++)
                 {
-                    if ((texture = source.GetTexture($"{componentName}{animationSeparator}{i}")) == null)
+                    if ((texture = source.GetTexture($"{componentName}{animationSeparator}{i}", wrapModeS, wrapModeT)) == null)
                         break;
 
                     yield return texture;

From b3769112fb5b774dbfc64efdbb2b932bd754760f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Jul 2020 17:08:26 +0900
Subject: [PATCH 03812/10326] Fix mania hold note bodies behaving badly with
 edge alphas

---
 osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs | 3 ++-
 osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index a749f80855..9f716428c0 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -31,7 +32,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             string imageName = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage)?.Value
                                ?? $"mania-note{FallbackColumnIndex}L";
 
-            sprite = skin.GetAnimation(imageName, true, true).With(d =>
+            sprite = skin.GetAnimation(imageName, WrapMode.ClampToEdge, WrapMode.ClampToEdge, true, true).With(d =>
             {
                 if (d == null)
                     return;
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
index 515c941d65..283b04373b 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -92,7 +93,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             string noteImage = GetColumnSkinConfig<string>(skin, lookup)?.Value
                                ?? $"mania-note{FallbackColumnIndex}{suffix}";
 
-            return skin.GetTexture(noteImage);
+            return skin.GetTexture(noteImage, WrapMode.ClampToEdge, WrapMode.ClampToEdge);
         }
     }
 }

From 94b3a6462bf2956b719161f6397c829f42159846 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Jul 2020 17:16:37 +0900
Subject: [PATCH 03813/10326] Update actually incorrect test steps

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

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
index 41d1459103..3a19eabe81 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
@@ -175,13 +175,13 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("Time = 50", () => Clock.CurrentTime == 50);
             AddStep("Seek(49.999)", () => Clock.Seek(49.999));
             AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
-            AddAssert("Time = 50", () => Clock.CurrentTime == 50);
+            AddAssert("Time = 100", () => Clock.CurrentTime == 100);
             AddStep("Seek(99)", () => Clock.Seek(99));
             AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
             AddAssert("Time = 100", () => Clock.CurrentTime == 100);
             AddStep("Seek(99.999)", () => Clock.Seek(99.999));
             AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
-            AddAssert("Time = 100", () => Clock.CurrentTime == 100);
+            AddAssert("Time = 100", () => Clock.CurrentTime == 150);
             AddStep("Seek(174)", () => Clock.Seek(174));
             AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
             AddAssert("Time = 175", () => Clock.CurrentTime == 175);

From ea6f257dc213d4ae1430d3a70e6c8edde3a0f4ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Jul 2020 17:48:27 +0900
Subject: [PATCH 03814/10326] Add a display of count of selected objects in
 editor

---
 .../Compose/Components/BlueprintContainer.cs  |  1 +
 .../Compose/Components/SelectionHandler.cs    | 60 ++++++++++++++-----
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index c6e228262f..33c33267a3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -64,6 +64,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DragBox = CreateDragBox(select),
                 selectionHandler,
                 SelectionBlueprints = CreateSelectionBlueprintContainer(),
+                selectionHandler.CreateProxy(),
                 DragBox.CreateProxy().With(p => p.Depth = float.MinValue)
             });
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 38893f90a8..8e7afdaf02 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -15,6 +15,7 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.States;
 using osu.Game.Audio;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -35,7 +36,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public IEnumerable<HitObject> SelectedHitObjects => selectedBlueprints.Select(b => b.HitObject);
 
-        private Drawable outline;
+        private Drawable content;
+
+        private OsuSpriteText selectionDetailsText;
 
         [Resolved(CanBeNull = true)]
         protected EditorBeatmap EditorBeatmap { get; private set; }
@@ -55,16 +58,41 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            InternalChild = outline = new Container
+            InternalChild = content = new Container
             {
-                Masking = true,
-                BorderThickness = BORDER_RADIUS,
-                BorderColour = colours.Yellow,
-                Child = new Box
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    AlwaysPresent = true,
-                    Alpha = 0
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        BorderThickness = BORDER_RADIUS,
+                        BorderColour = colours.Yellow,
+                        Child = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            AlwaysPresent = true,
+                            Alpha = 0
+                        }
+                    },
+                    new Container
+                    {
+                        Name = "info text",
+                        AutoSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                Colour = colours.Yellow,
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            selectionDetailsText = new OsuSpriteText
+                            {
+                                Padding = new MarginPadding(2),
+                                Colour = colours.Gray0,
+                            }
+                        }
+                    }
                 }
             };
         }
@@ -131,9 +159,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectedBlueprints.Remove(blueprint);
             EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
 
-            // We don't want to update visibility if > 0, since we may be deselecting blueprints during drag-selection
-            if (selectedBlueprints.Count == 0)
-                UpdateVisibility();
+            UpdateVisibility();
         }
 
         /// <summary>
@@ -179,7 +205,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         internal void UpdateVisibility()
         {
-            if (selectedBlueprints.Count > 0)
+            int count = selectedBlueprints.Count;
+
+            selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
+
+            if (count > 0)
                 Show();
             else
                 Hide();
@@ -205,8 +235,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             topLeft -= new Vector2(5);
             bottomRight += new Vector2(5);
 
-            outline.Size = bottomRight - topLeft;
-            outline.Position = topLeft;
+            content.Size = bottomRight - topLeft;
+            content.Position = topLeft;
         }
 
         #endregion

From b4b230288bc8592bf4bf3cfd38811b45859fb850 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Jul 2020 17:51:39 +0900
Subject: [PATCH 03815/10326] Shift hue of selection handler box to not collide
 with blueprints

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 8e7afdaf02..9700cb8c8e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         RelativeSizeAxes = Axes.Both,
                         Masking = true,
                         BorderThickness = BORDER_RADIUS,
-                        BorderColour = colours.Yellow,
+                        BorderColour = colours.YellowDark,
                         Child = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
@@ -83,13 +83,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         {
                             new Box
                             {
-                                Colour = colours.Yellow,
+                                Colour = colours.YellowDark,
                                 RelativeSizeAxes = Axes.Both,
                             },
                             selectionDetailsText = new OsuSpriteText
                             {
                                 Padding = new MarginPadding(2),
                                 Colour = colours.Gray0,
+                                Font = OsuFont.Default.With(size: 11)
                             }
                         }
                     }

From a39c4236c7d8bdaaa7e86f50de4eb8282c4e0999 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Jul 2020 19:08:50 +0900
Subject: [PATCH 03816/10326] Fix multiple issues and standardise transforms

---
 osu.Game/Screens/Play/GameplayMenuOverlay.cs |  7 ++++---
 osu.Game/Screens/Play/PauseOverlay.cs        | 15 ++++++++++-----
 osu.Game/Skinning/SkinnableSound.cs          |  6 ++++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index 6b37135c86..57403a0987 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Screens.Play
 {
     public abstract class GameplayMenuOverlay : OverlayContainer, IKeyBindingHandler<GlobalAction>
     {
-        private const int transition_duration = 200;
+        protected const int TRANSITION_DURATION = 200;
+
         private const int button_height = 70;
         private const float background_alpha = 0.75f;
 
@@ -156,8 +157,8 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        protected override void PopIn() => this.FadeIn(transition_duration, Easing.In);
-        protected override void PopOut() => this.FadeOut(transition_duration, Easing.In);
+        protected override void PopIn() => this.FadeIn(TRANSITION_DURATION, Easing.In);
+        protected override void PopOut() => this.FadeOut(TRANSITION_DURATION, Easing.In);
 
         // Don't let mouse down events through the overlay or people can click circles while paused.
         protected override bool OnMouseDown(MouseDownEvent e) => true;
diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 7b3fba7ddf..e74585990a 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Screens.Play
     {
         public Action OnResume;
 
+        public override bool IsPresent => base.IsPresent || pauseLoop.IsPlaying;
+
         public override string Header => "paused";
         public override string Description => "you're not going to do what i think you're going to do, are ya?";
 
@@ -23,6 +25,8 @@ namespace osu.Game.Screens.Play
 
         protected override Action BackAction => () => InternalButtons.Children.First().Click();
 
+        private const float minimum_volume = 0.0001f;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -34,18 +38,20 @@ namespace osu.Game.Screens.Play
             {
                 Looping = true,
             });
+
             // PopIn is called before updating the skin, and when a sample is updated, its "playing" value is reset
             // the sample must be played again
             pauseLoop.OnSkinChanged += () => pauseLoop.Play();
+
+            // SkinnableSound only plays a sound if its aggregate volume is > 0, so the volume must be turned up before playing it
+            pauseLoop.VolumeTo(minimum_volume);
         }
 
         protected override void PopIn()
         {
             base.PopIn();
 
-            //SkinnableSound only plays a sound if its aggregate volume is > 0, so the volume must be turned up before playing it
-            pauseLoop.VolumeTo(0.00001f);
-            pauseLoop.VolumeTo(1.0f, 400, Easing.InQuint);
+            pauseLoop.VolumeTo(1.0f, TRANSITION_DURATION, Easing.InQuint);
             pauseLoop.Play();
         }
 
@@ -53,8 +59,7 @@ namespace osu.Game.Screens.Play
         {
             base.PopOut();
 
-            var transformSeq = pauseLoop.VolumeTo(0.0f, 190, Easing.OutQuad);
-            transformSeq.Finally(_ => pauseLoop.Stop());
+            pauseLoop.VolumeTo(minimum_volume, TRANSITION_DURATION, Easing.OutQuad).Finally(_ => pauseLoop.Stop());
         }
     }
 }
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 24d6648273..fb27ba0550 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -45,6 +45,10 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => samplesContainer.Tempo;
 
+        public override bool IsPresent => Scheduler.HasPendingTasks || IsPlaying;
+
+        public bool IsPlaying => samplesContainer.Any(s => s.Playing);
+
         /// <summary>
         /// Smoothly adjusts <see cref="Volume"/> over time.
         /// </summary>
@@ -94,8 +98,6 @@ namespace osu.Game.Skinning
 
         public void Stop() => samplesContainer.ForEach(c => c.Stop());
 
-        public override bool IsPresent => Scheduler.HasPendingTasks;
-
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             var channels = hitSamples.Select(s =>

From 77143952a91da519665c0a13a19abe01fb97275a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Jul 2020 19:17:48 +0900
Subject: [PATCH 03817/10326] Add test coverage

---
 .../Visual/Gameplay/TestScenePause.cs         | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 1961a224c1..420bf29429 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
+using osu.Game.Skinning;
 using osuTK;
 using osuTK.Input;
 
@@ -221,6 +222,31 @@ namespace osu.Game.Tests.Visual.Gameplay
             confirmExited();
         }
 
+        [Test]
+        public void TestPauseSoundLoop()
+        {
+            AddStep("seek before gameplay", () => Player.GameplayClockContainer.Seek(-5000));
+
+            SkinnableSound getLoop() => Player.ChildrenOfType<PauseOverlay>().FirstOrDefault()?.ChildrenOfType<SkinnableSound>().FirstOrDefault();
+
+            pauseAndConfirm();
+            AddAssert("loop is playing", () => getLoop().IsPlaying);
+
+            resumeAndConfirm();
+            AddUntilStep("loop is stopped", () => !getLoop().IsPlaying);
+
+            AddUntilStep("pause again", () =>
+            {
+                Player.Pause();
+                return !Player.GameplayClockContainer.GameplayClock.IsRunning;
+            });
+
+            AddAssert("loop is playing", () => getLoop().IsPlaying);
+
+            resumeAndConfirm();
+            AddUntilStep("loop is stopped", () => !getLoop().IsPlaying);
+        }
+
         private void pauseAndConfirm()
         {
             pause();

From 9857779d424a8caa066a25a6ee5c603150083dfb Mon Sep 17 00:00:00 2001
From: Fabian <lindgrenfabian@gmail.com>
Date: Fri, 17 Jul 2020 16:12:01 +0200
Subject: [PATCH 03818/10326] Added slider for the grow/deflate mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs          | 12 +++++++++++-
 osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs             | 12 +++++++++++-
 osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs |  4 ++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
index 73cb483ef0..60dbe16453 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -15,6 +17,14 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Description => "Hit them at the right size!";
 
-        protected override float StartScale => 2f;
+        [SettingSource("Starting size", "The object starting size")]
+        public override BindableNumber<float> StartScale { get; } = new BindableFloat
+        {
+            MinValue = 1f,
+            MaxValue = 15f,
+            Default = 2f,
+            Value = 2f,
+            Precision = 0.1f,
+        };
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
index f08d4e8f5e..8e8268f8cf 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -15,6 +17,14 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Description => "Hit them at the right size!";
 
-        protected override float StartScale => 0.5f;
+        [SettingSource("Starting size", "The object starting size")]
+        public override BindableNumber<float> StartScale { get; } = new BindableFloat
+        {
+            MinValue = 0f,
+            MaxValue = 0.99f,
+            Default = 0.5f,
+            Value = 0.5f,
+            Precision = 0.01f,
+        };
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs b/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
index 42ddddc4dd..06ba4cde4a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override double ScoreMultiplier => 1;
 
-        protected virtual float StartScale => 1;
+        public abstract BindableNumber<float> StartScale { get; }
 
         protected virtual float EndScale => 1;
 
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 case DrawableHitCircle _:
                 {
                     using (drawable.BeginAbsoluteSequence(h.StartTime - h.TimePreempt))
-                        drawable.ScaleTo(StartScale).Then().ScaleTo(EndScale, h.TimePreempt, Easing.OutSine);
+                        drawable.ScaleTo(StartScale.Value).Then().ScaleTo(EndScale, h.TimePreempt, Easing.OutSine);
                     break;
                 }
             }

From a6cf77beae9236f2893068ad2c42b379c166749a Mon Sep 17 00:00:00 2001
From: Fabian <lindgrenfabian@gmail.com>
Date: Fri, 17 Jul 2020 17:53:20 +0200
Subject: [PATCH 03819/10326] Clarified what the slider value is

---
 osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
index 60dbe16453..076fde08f8 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Description => "Hit them at the right size!";
 
-        [SettingSource("Starting size", "The object starting size")]
+        [SettingSource("Starting size modifier", "The object starting size modifier")]
         public override BindableNumber<float> StartScale { get; } = new BindableFloat
         {
             MinValue = 1f,
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
index 8e8268f8cf..5288bdd62c 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Description => "Hit them at the right size!";
 
-        [SettingSource("Starting size", "The object starting size")]
+        [SettingSource("Starting size modifier", "The object starting size modifier")]
         public override BindableNumber<float> StartScale { get; } = new BindableFloat
         {
             MinValue = 0f,

From 0975610bf77ac5fd574e71fbe4f4301f6f95c952 Mon Sep 17 00:00:00 2001
From: Fabian <lindgrenfabian@gmail.com>
Date: Sat, 18 Jul 2020 02:21:55 +0200
Subject: [PATCH 03820/10326] Increased maximum start modifier higher (15x ->
 25x)

Tried playing around with higher values and personally had quite fun when the circles covered the whole screen so I raised the max modifier to 25. Works best with an AR of <6.
---
 osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
index 076fde08f8..6302d47843 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override BindableNumber<float> StartScale { get; } = new BindableFloat
         {
             MinValue = 1f,
-            MaxValue = 15f,
+            MaxValue = 25f,
             Default = 2f,
             Value = 2f,
             Precision = 0.1f,

From 20096f9aea4fedd471f80c3c12d1d53647c2d70b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Jul 2020 11:44:18 +0900
Subject: [PATCH 03821/10326] Remove remaining per-Update transform in OsuLogo
 to reduce allocations

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

diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 089906c342..34d49685d2 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -330,7 +330,7 @@ namespace osu.Game.Screens.Menu
             if (Beatmap.Value.Track.IsRunning)
             {
                 var maxAmplitude = lastBeatIndex >= 0 ? Beatmap.Value.Track.CurrentAmplitudes.Maximum : 0;
-                logoAmplitudeContainer.ScaleTo(1 - Math.Max(0, maxAmplitude - scale_adjust_cutoff) * 0.04f, 75, Easing.OutQuint);
+                logoAmplitudeContainer.Scale = new Vector2((float)Interpolation.Damp(logoAmplitudeContainer.Scale.X, 1 - Math.Max(0, maxAmplitude - scale_adjust_cutoff) * 0.04f, 0.5f, Time.Elapsed));
 
                 if (maxAmplitude > velocity_adjust_cutoff)
                     triangles.Velocity = 1 + Math.Max(0, maxAmplitude - velocity_adjust_cutoff) * 50;

From 8147e67f5337b9bfe6d29cbfc7a6c8bcb0015f7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Jul 2020 11:53:04 +0900
Subject: [PATCH 03822/10326] Use static instances in all fallback ControlPoint
 lookups to reduce allocations

---
 .../ControlPoints/ControlPointInfo.cs         | 16 ++++++-------
 .../ControlPoints/DifficultyControlPoint.cs   |  5 ++++
 .../ControlPoints/EffectControlPoint.cs       |  6 +++++
 .../ControlPoints/TimingControlPoint.cs       | 12 ++++++++++
 .../Containers/BeatSyncedContainer.cs         | 23 ++-----------------
 5 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index af6ca24165..49f1052248 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -64,14 +64,14 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         /// <param name="time">The time to find the difficulty control point at.</param>
         /// <returns>The difficulty control point.</returns>
-        public DifficultyControlPoint DifficultyPointAt(double time) => binarySearchWithFallback(DifficultyPoints, time);
+        public DifficultyControlPoint DifficultyPointAt(double time) => binarySearchWithFallback(DifficultyPoints, time, DifficultyControlPoint.DEFAULT);
 
         /// <summary>
         /// Finds the effect control point that is active at <paramref name="time"/>.
         /// </summary>
         /// <param name="time">The time to find the effect control point at.</param>
         /// <returns>The effect control point.</returns>
-        public EffectControlPoint EffectPointAt(double time) => binarySearchWithFallback(EffectPoints, time);
+        public EffectControlPoint EffectPointAt(double time) => binarySearchWithFallback(EffectPoints, time, EffectControlPoint.DEFAULT);
 
         /// <summary>
         /// Finds the sound control point that is active at <paramref name="time"/>.
@@ -92,21 +92,21 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         [JsonIgnore]
         public double BPMMaximum =>
-            60000 / (TimingPoints.OrderBy(c => c.BeatLength).FirstOrDefault() ?? new TimingControlPoint()).BeatLength;
+            60000 / (TimingPoints.OrderBy(c => c.BeatLength).FirstOrDefault() ?? TimingControlPoint.DEFAULT).BeatLength;
 
         /// <summary>
         /// Finds the minimum BPM represented by any timing control point.
         /// </summary>
         [JsonIgnore]
         public double BPMMinimum =>
-            60000 / (TimingPoints.OrderByDescending(c => c.BeatLength).FirstOrDefault() ?? new TimingControlPoint()).BeatLength;
+            60000 / (TimingPoints.OrderByDescending(c => c.BeatLength).FirstOrDefault() ?? TimingControlPoint.DEFAULT).BeatLength;
 
         /// <summary>
         /// Finds the mode BPM (most common BPM) represented by the control points.
         /// </summary>
         [JsonIgnore]
         public double BPMMode =>
-            60000 / (TimingPoints.GroupBy(c => c.BeatLength).OrderByDescending(grp => grp.Count()).FirstOrDefault()?.FirstOrDefault() ?? new TimingControlPoint()).BeatLength;
+            60000 / (TimingPoints.GroupBy(c => c.BeatLength).OrderByDescending(grp => grp.Count()).FirstOrDefault()?.FirstOrDefault() ?? TimingControlPoint.DEFAULT).BeatLength;
 
         /// <summary>
         /// Remove all <see cref="ControlPointGroup"/>s and return to a pristine state.
@@ -170,12 +170,12 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         /// <param name="list">The list to search.</param>
         /// <param name="time">The time to find the control point at.</param>
-        /// <param name="prePoint">The control point to use when <paramref name="time"/> is before any control points. If null, a new control point will be constructed.</param>
+        /// <param name="fallback">The control point to use when <paramref name="time"/> is before any control points.</param>
         /// <returns>The active control point at <paramref name="time"/>, or a fallback <see cref="ControlPoint"/> if none found.</returns>
-        private T binarySearchWithFallback<T>(IReadOnlyList<T> list, double time, T prePoint = null)
+        private T binarySearchWithFallback<T>(IReadOnlyList<T> list, double time, T fallback)
             where T : ControlPoint, new()
         {
-            return binarySearch(list, time) ?? prePoint ?? new T();
+            return binarySearch(list, time) ?? fallback;
         }
 
         /// <summary>
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 2448b2b25c..1d38790f87 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -7,6 +7,11 @@ namespace osu.Game.Beatmaps.ControlPoints
 {
     public class DifficultyControlPoint : ControlPoint
     {
+        public static readonly DifficultyControlPoint DEFAULT = new DifficultyControlPoint
+        {
+            SpeedMultiplierBindable = { Disabled = true },
+        };
+
         /// <summary>
         /// The speed multiplier at this control point.
         /// </summary>
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index 9b69147468..9e8e3978be 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -7,6 +7,12 @@ namespace osu.Game.Beatmaps.ControlPoints
 {
     public class EffectControlPoint : ControlPoint
     {
+        public static readonly EffectControlPoint DEFAULT = new EffectControlPoint
+        {
+            KiaiModeBindable = { Disabled = true },
+            OmitFirstBarLineBindable = { Disabled = true }
+        };
+
         /// <summary>
         /// Whether the first bar line of this control point is ignored.
         /// </summary>
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 1927dd6575..c3a32c4410 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -13,6 +13,18 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         public readonly Bindable<TimeSignatures> TimeSignatureBindable = new Bindable<TimeSignatures>(TimeSignatures.SimpleQuadruple) { Default = TimeSignatures.SimpleQuadruple };
 
+        /// <summary>
+        /// Default length of a beat in milliseconds. Used whenever there is no beatmap or track playing.
+        /// </summary>
+        private const double default_beat_length = 60000.0 / 60.0;
+
+        public static readonly TimingControlPoint DEFAULT = new TimingControlPoint
+        {
+            BeatLength = default_beat_length,
+            BeatLengthBindable = { Disabled = true },
+            TimeSignatureBindable = { Disabled = true }
+        };
+
         /// <summary>
         /// The time signature at this control point.
         /// </summary>
diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index dd5c41285a..df063f57d5 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -43,14 +43,6 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public double MinimumBeatLength { get; set; }
 
-        /// <summary>
-        /// Default length of a beat in milliseconds. Used whenever there is no beatmap or track playing.
-        /// </summary>
-        private const double default_beat_length = 60000.0 / 60.0;
-
-        private TimingControlPoint defaultTiming;
-        private EffectControlPoint defaultEffect;
-
         protected bool IsBeatSyncedWithTrack { get; private set; }
 
         protected override void Update()
@@ -81,8 +73,8 @@ namespace osu.Game.Graphics.Containers
             if (timingPoint == null || !IsBeatSyncedWithTrack)
             {
                 currentTrackTime = Clock.CurrentTime;
-                timingPoint = defaultTiming;
-                effectPoint = defaultEffect;
+                timingPoint = TimingControlPoint.DEFAULT;
+                effectPoint = EffectControlPoint.DEFAULT;
             }
 
             double beatLength = timingPoint.BeatLength / Divisor;
@@ -116,17 +108,6 @@ namespace osu.Game.Graphics.Containers
         private void load(IBindable<WorkingBeatmap> beatmap)
         {
             Beatmap.BindTo(beatmap);
-
-            defaultTiming = new TimingControlPoint
-            {
-                BeatLength = default_beat_length,
-            };
-
-            defaultEffect = new EffectControlPoint
-            {
-                KiaiMode = false,
-                OmitFirstBarLine = false
-            };
         }
 
         protected virtual void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)

From 2f16b448ea8619ea6ea8d34231ff94f040702e53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Jul 2020 12:03:49 +0900
Subject: [PATCH 03823/10326] Set beatLength inline

---
 osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index c3a32c4410..9345299c3a 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -20,8 +20,11 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public static readonly TimingControlPoint DEFAULT = new TimingControlPoint
         {
-            BeatLength = default_beat_length,
-            BeatLengthBindable = { Disabled = true },
+            BeatLengthBindable =
+            {
+                Value = default_beat_length,
+                Disabled = true
+            },
             TimeSignatureBindable = { Disabled = true }
         };
 

From 7250bc351d3068ed767d73cf67a663135119da65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Jul 2020 12:06:41 +0900
Subject: [PATCH 03824/10326] Remove unnecessary new() specification

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

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 49f1052248..55a04e5ee8 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="fallback">The control point to use when <paramref name="time"/> is before any control points.</param>
         /// <returns>The active control point at <paramref name="time"/>, or a fallback <see cref="ControlPoint"/> if none found.</returns>
         private T binarySearchWithFallback<T>(IReadOnlyList<T> list, double time, T fallback)
-            where T : ControlPoint, new()
+            where T : ControlPoint
         {
             return binarySearch(list, time) ?? fallback;
         }

From 81d95f8584b21f8b656ab522107a130acbe29941 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jul 2020 20:24:38 +0300
Subject: [PATCH 03825/10326] Implement UserBrickPanel component

---
 .../Visual/Online/TestSceneSocialOverlay.cs   |  84 ------
 .../Visual/Online/TestSceneUserPanel.cs       |  13 +
 .../Dashboard/Friends/FriendDisplay.cs        |   3 +
 .../OverlayPanelDisplayStyleControl.cs        |   7 +-
 .../Sections/General/LoginSettings.cs         |   2 +-
 osu.Game/Overlays/SocialOverlay.cs            | 242 ------------------
 osu.Game/Users/ExtendedUserPanel.cs           | 148 +++++++++++
 osu.Game/Users/UserBrickPanel.cs              |  65 +++++
 osu.Game/Users/UserGridPanel.cs               |   2 +-
 osu.Game/Users/UserListPanel.cs               |   2 +-
 osu.Game/Users/UserPanel.cs                   | 130 +---------
 11 files changed, 241 insertions(+), 457 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs
 delete mode 100644 osu.Game/Overlays/SocialOverlay.cs
 create mode 100644 osu.Game/Users/ExtendedUserPanel.cs
 create mode 100644 osu.Game/Users/UserBrickPanel.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs
deleted file mode 100644
index 77e77d90c1..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.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 NUnit.Framework;
-using osu.Game.Overlays;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    [TestFixture]
-    public class TestSceneSocialOverlay : OsuTestScene
-    {
-        protected override bool UseOnlineAPI => true;
-
-        public TestSceneSocialOverlay()
-        {
-            SocialOverlay s = new SocialOverlay
-            {
-                Users = new[]
-                {
-                    new User
-                    {
-                        Username = @"flyte",
-                        Id = 3103765,
-                        Country = new Country { FlagName = @"JP" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
-                    },
-                    new User
-                    {
-                        Username = @"Cookiezi",
-                        Id = 124493,
-                        Country = new Country { FlagName = @"KR" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c2.jpg",
-                    },
-                    new User
-                    {
-                        Username = @"Angelsim",
-                        Id = 1777162,
-                        Country = new Country { FlagName = @"KR" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
-                    },
-                    new User
-                    {
-                        Username = @"Rafis",
-                        Id = 2558286,
-                        Country = new Country { FlagName = @"PL" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c4.jpg",
-                    },
-                    new User
-                    {
-                        Username = @"hvick225",
-                        Id = 50265,
-                        Country = new Country { FlagName = @"TW" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c5.jpg",
-                    },
-                    new User
-                    {
-                        Username = @"peppy",
-                        Id = 2,
-                        Country = new Country { FlagName = @"AU" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
-                    },
-                    new User
-                    {
-                        Username = @"filsdelama",
-                        Id = 2831793,
-                        Country = new Country { FlagName = @"FR" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c7.jpg"
-                    },
-                    new User
-                    {
-                        Username = @"_index",
-                        Id = 652457,
-                        Country = new Country { FlagName = @"RU" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c8.jpg"
-                    },
-                },
-            };
-            Add(s);
-
-            AddStep(@"toggle", s.ToggleVisibility);
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index f763e50067..c2e9945c99 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -42,6 +42,19 @@ namespace osu.Game.Tests.Visual.Online
                 Spacing = new Vector2(10f),
                 Children = new Drawable[]
                 {
+                    new UserBrickPanel(new User
+                    {
+                        Username = @"flyte",
+                        Id = 3103765,
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
+                    }),
+                    new UserBrickPanel(new User
+                    {
+                        Username = @"peppy",
+                        Id = 2,
+                        Colour = "99EB47",
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                    }),
                     flyte = new UserGridPanel(new User
                     {
                         Username = @"flyte",
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index 79fda99c73..41b25ee1a5 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -225,6 +225,9 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
                 case OverlayPanelDisplayStyle.List:
                     return new UserListPanel(user);
+
+                case OverlayPanelDisplayStyle.Brick:
+                    return new UserBrickPanel(user);
             }
         }
 
diff --git a/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs b/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs
index 7269007b41..87b9d89d4d 100644
--- a/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs
+++ b/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs
@@ -34,6 +34,10 @@ namespace osu.Game.Overlays
             {
                 Icon = FontAwesome.Solid.Bars
             });
+            AddTabItem(new PanelDisplayTabItem(OverlayPanelDisplayStyle.Brick)
+            {
+                Icon = FontAwesome.Solid.Th
+            });
         }
 
         protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
@@ -96,6 +100,7 @@ namespace osu.Game.Overlays
     public enum OverlayPanelDisplayStyle
     {
         Card,
-        List
+        List,
+        Brick
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index 52b712a40e..34e5da4ef4 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private UserPanel panel;
+        private UserGridPanel panel;
         private UserDropdown dropdown;
 
         /// <summary>
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
deleted file mode 100644
index 1b05142192..0000000000
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ /dev/null
@@ -1,242 +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.Bindables;
-using osuTK;
-using osuTK.Graphics;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Overlays.SearchableList;
-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
-{
-    public class SocialOverlay : SearchableListOverlay<SocialTab, SocialSortCriteria, SortDirection>
-    {
-        private readonly LoadingSpinner loading;
-        private FillFlowContainer<UserPanel> panels;
-
-        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();
-
-        private User[] users = Array.Empty<User>();
-
-        public User[] Users
-        {
-            get => users;
-            set
-            {
-                if (users == value)
-                    return;
-
-                users = value ?? Array.Empty<User>();
-
-                if (LoadState >= LoadState.Ready)
-                    recreatePanels();
-            }
-        }
-
-        public SocialOverlay()
-            : base(OverlayColourScheme.Pink)
-        {
-            Add(loading = new LoadingSpinner());
-
-            Filter.Search.Current.ValueChanged += text =>
-            {
-                if (!string.IsNullOrEmpty(text.NewValue))
-                {
-                    // force searching in players until searching for friends is supported
-                    Header.Tabs.Current.Value = SocialTab.AllPlayers;
-
-                    if (Filter.Tabs.Current.Value != SocialSortCriteria.Rank)
-                        Filter.Tabs.Current.Value = SocialSortCriteria.Rank;
-                }
-            };
-
-            Header.Tabs.Current.ValueChanged += _ => queueUpdate();
-            Filter.Tabs.Current.ValueChanged += _ => onFilterUpdate();
-
-            Filter.DisplayStyleControl.DisplayStyle.ValueChanged += _ => recreatePanels();
-            Filter.Dropdown.Current.ValueChanged += _ => recreatePanels();
-
-            currentQuery.BindTo(Filter.Search.Current);
-            currentQuery.ValueChanged += query =>
-            {
-                queryChangedDebounce?.Cancel();
-
-                if (string.IsNullOrEmpty(query.NewValue))
-                    queueUpdate();
-                else
-                    queryChangedDebounce = Scheduler.AddDelayed(updateSearch, 500);
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            recreatePanels();
-        }
-
-        private APIRequest getUsersRequest;
-
-        private readonly Bindable<string> currentQuery = new Bindable<string>();
-
-        private ScheduledDelegate queryChangedDebounce;
-
-        private void queueUpdate() => Scheduler.AddOnce(updateSearch);
-
-        private CancellationTokenSource loadCancellation;
-
-        private void updateSearch()
-        {
-            queryChangedDebounce?.Cancel();
-
-            if (!IsLoaded)
-                return;
-
-            Users = null;
-            clearPanels();
-            getUsersRequest?.Cancel();
-
-            if (API?.IsLoggedIn != true)
-                return;
-
-            switch (Header.Tabs.Current.Value)
-            {
-                case SocialTab.Friends:
-                    var friendRequest = new GetFriendsRequest(); // TODO filter arguments?
-                    friendRequest.Success += users => Users = users.ToArray();
-                    API.Queue(getUsersRequest = friendRequest);
-                    break;
-
-                default:
-                    var userRequest = new GetUsersRequest(); // TODO filter arguments!
-                    userRequest.Success += res => Users = res.Users.Select(r => r.User).ToArray();
-                    API.Queue(getUsersRequest = userRequest);
-                    break;
-            }
-        }
-
-        private void recreatePanels()
-        {
-            clearPanels();
-
-            if (Users == null)
-            {
-                loading.Hide();
-                return;
-            }
-
-            IEnumerable<User> sortedUsers = Users;
-
-            switch (Filter.Tabs.Current.Value)
-            {
-                case SocialSortCriteria.Location:
-                    sortedUsers = sortedUsers.OrderBy(u => u.Country.FullName);
-                    break;
-
-                case SocialSortCriteria.Name:
-                    sortedUsers = sortedUsers.OrderBy(u => u.Username);
-                    break;
-            }
-
-            if (Filter.Dropdown.Current.Value == SortDirection.Descending)
-                sortedUsers = sortedUsers.Reverse();
-
-            var newPanels = new FillFlowContainer<UserPanel>
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Spacing = new Vector2(10f),
-                Margin = new MarginPadding { Top = 10 },
-                ChildrenEnumerable = sortedUsers.Select(u =>
-                {
-                    UserPanel panel;
-
-                    switch (Filter.DisplayStyleControl.DisplayStyle.Value)
-                    {
-                        case PanelDisplayStyle.Grid:
-                            panel = new UserGridPanel(u)
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Width = 290,
-                            };
-                            break;
-
-                        default:
-                            panel = new UserListPanel(u);
-                            break;
-                    }
-
-                    panel.Status.BindTo(u.Status);
-                    panel.Activity.BindTo(u.Activity);
-                    return panel;
-                })
-            };
-
-            LoadComponentAsync(newPanels, f =>
-            {
-                if (panels != null)
-                    ScrollFlow.Remove(panels);
-
-                loading.Hide();
-                ScrollFlow.Add(panels = newPanels);
-            }, (loadCancellation = new CancellationTokenSource()).Token);
-        }
-
-        private void onFilterUpdate()
-        {
-            if (Filter.Tabs.Current.Value == SocialSortCriteria.Rank)
-            {
-                queueUpdate();
-                return;
-            }
-
-            recreatePanels();
-        }
-
-        private void clearPanels()
-        {
-            loading.Show();
-
-            loadCancellation?.Cancel();
-
-            if (panels != null)
-            {
-                panels.Expire();
-                panels = null;
-            }
-        }
-
-        public override void APIStateChanged(IAPIProvider api, APIState state)
-        {
-            switch (state)
-            {
-                case APIState.Online:
-                    queueUpdate();
-                    break;
-
-                default:
-                    Users = null;
-                    clearPanels();
-                    break;
-            }
-        }
-    }
-}
diff --git a/osu.Game/Users/ExtendedUserPanel.cs b/osu.Game/Users/ExtendedUserPanel.cs
new file mode 100644
index 0000000000..5bd98b3fb7
--- /dev/null
+++ b/osu.Game/Users/ExtendedUserPanel.cs
@@ -0,0 +1,148 @@
+// Copyright (c) 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;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Users.Drawables;
+using osu.Framework.Input.Events;
+
+namespace osu.Game.Users
+{
+    public abstract class ExtendedUserPanel : UserPanel
+    {
+        public readonly Bindable<UserStatus> Status = new Bindable<UserStatus>();
+
+        public readonly IBindable<UserActivity> Activity = new Bindable<UserActivity>();
+
+        protected TextFlowContainer LastVisitMessage { get; private set; }
+
+        private SpriteIcon statusIcon;
+        private OsuSpriteText statusMessage;
+
+        public ExtendedUserPanel(User user)
+            : base(user)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            BorderColour = ColourProvider?.Light1 ?? Colours.GreyVioletLighter;
+
+            Status.ValueChanged += status => displayStatus(status.NewValue, Activity.Value);
+            Activity.ValueChanged += activity => displayStatus(Status.Value, activity.NewValue);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Status.TriggerChange();
+
+            // Colour should be applied immediately on first load.
+            statusIcon.FinishTransforms();
+        }
+
+        protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar
+        {
+            User = User,
+            OpenOnClick = { Value = false }
+        };
+
+        protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.Country)
+        {
+            Size = new Vector2(39, 26)
+        };
+
+        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.CentreRight : Anchor.CentreLeft;
+
+            statusContainer.Add(LastVisitMessage = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)).With(text =>
+            {
+                text.Anchor = alignment;
+                text.Origin = 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)
+                    {
+                        Shadow = false
+                    });
+                }
+            }));
+
+            statusContainer.Add(statusMessage = new OsuSpriteText
+            {
+                Anchor = alignment,
+                Origin = alignment,
+                Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
+            });
+
+            return statusContainer;
+        }
+
+        private void displayStatus(UserStatus status, UserActivity activity = null)
+        {
+            if (status != null)
+            {
+                LastVisitMessage.FadeTo(status is UserStatusOffline && User.LastVisit.HasValue ? 1 : 0);
+
+                // 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;
+                }
+
+                // Otherwise use only status
+                statusMessage.Text = status.Message;
+                statusIcon.FadeColour(status.GetAppropriateColour(Colours), 500, Easing.OutQuint);
+
+                return;
+            }
+
+            // Fallback to web status if local one is null
+            if (User.IsOnline)
+            {
+                Status.Value = new UserStatusOnline();
+                return;
+            }
+
+            Status.Value = new UserStatusOffline();
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            BorderThickness = 2;
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            BorderThickness = 0;
+            base.OnHoverLost(e);
+        }
+    }
+}
diff --git a/osu.Game/Users/UserBrickPanel.cs b/osu.Game/Users/UserBrickPanel.cs
new file mode 100644
index 0000000000..f6eabc3b75
--- /dev/null
+++ b/osu.Game/Users/UserBrickPanel.cs
@@ -0,0 +1,65 @@
+// Copyright (c) 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 osuTK;
+
+namespace osu.Game.Users
+{
+    public class UserBrickPanel : UserPanel
+    {
+        public UserBrickPanel(User user)
+            : base(user)
+        {
+            AutoSizeAxes = Axes.X;
+            Height = 23;
+            CornerRadius = 6;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Background.FadeTo(0.3f);
+        }
+
+        protected override Drawable CreateLayout() => new FillFlowContainer
+        {
+            AutoSizeAxes = Axes.Both,
+            Direction = FillDirection.Horizontal,
+            Spacing = new Vector2(5, 0),
+            Margin = new MarginPadding
+            {
+                Horizontal = 5
+            },
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre,
+            Children = new Drawable[]
+            {
+                new CircularContainer
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Masking = true,
+                    Width = 4,
+                    Height = 13,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = string.IsNullOrEmpty(User.Colour) ? Color4Extensions.FromHex("0087ca") : Color4Extensions.FromHex(User.Colour)
+                    }
+                },
+                CreateUsername().With(u =>
+                {
+                    u.Anchor = Anchor.CentreLeft;
+                    u.Origin = Anchor.CentreLeft;
+                    u.Font = OsuFont.GetFont(size: 13, weight: FontWeight.Bold);
+                })
+            }
+        };
+    }
+}
diff --git a/osu.Game/Users/UserGridPanel.cs b/osu.Game/Users/UserGridPanel.cs
index e62a834d6d..44dcbc305d 100644
--- a/osu.Game/Users/UserGridPanel.cs
+++ b/osu.Game/Users/UserGridPanel.cs
@@ -9,7 +9,7 @@ using osuTK;
 
 namespace osu.Game.Users
 {
-    public class UserGridPanel : UserPanel
+    public class UserGridPanel : ExtendedUserPanel
     {
         private const int margin = 10;
 
diff --git a/osu.Game/Users/UserListPanel.cs b/osu.Game/Users/UserListPanel.cs
index 1c3ae20577..9c95eff739 100644
--- a/osu.Game/Users/UserListPanel.cs
+++ b/osu.Game/Users/UserListPanel.cs
@@ -12,7 +12,7 @@ using osu.Game.Overlays.Profile.Header.Components;
 
 namespace osu.Game.Users
 {
-    public class UserListPanel : UserPanel
+    public class UserListPanel : ExtendedUserPanel
     {
         public UserListPanel(User user)
             : base(user)
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 6f59f9e443..94c0c31cfc 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -2,9 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -14,11 +12,8 @@ using osu.Game.Overlays;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Containers;
-using osu.Game.Users.Drawables;
 using JetBrains.Annotations;
-using osu.Framework.Input.Events;
 
 namespace osu.Game.Users
 {
@@ -26,21 +21,12 @@ namespace osu.Game.Users
     {
         public readonly User User;
 
-        public readonly Bindable<UserStatus> Status = new Bindable<UserStatus>();
-
-        public readonly IBindable<UserActivity> Activity = new Bindable<UserActivity>();
-
         public new Action Action;
 
         protected Action ViewProfile { get; private set; }
 
         protected DelayedLoadUnloadWrapper Background { get; private set; }
 
-        protected TextFlowContainer LastVisitMessage { get; private set; }
-
-        private SpriteIcon statusIcon;
-        private OsuSpriteText statusMessage;
-
         protected UserPanel(User user)
         {
             if (user == null)
@@ -53,23 +39,22 @@ namespace osu.Game.Users
         private UserProfileOverlay profileOverlay { get; set; }
 
         [Resolved(canBeNull: true)]
-        private OverlayColourProvider colourProvider { get; set; }
+        protected OverlayColourProvider ColourProvider { get; private set; }
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        protected OsuColour Colours { get; private set; }
 
         [BackgroundDependencyLoader]
         private void load()
         {
             Masking = true;
-            BorderColour = colourProvider?.Light1 ?? colours.GreyVioletLighter;
 
             AddRange(new[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider?.Background5 ?? colours.Gray1
+                    Colour = ColourProvider?.Background5 ?? Colours.Gray1
                 },
                 Background = new DelayedLoadUnloadWrapper(() => new UserCoverBackground
                 {
@@ -86,9 +71,6 @@ namespace osu.Game.Users
                 CreateLayout()
             });
 
-            Status.ValueChanged += status => displayStatus(status.NewValue, Activity.Value);
-            Activity.ValueChanged += activity => displayStatus(Status.Value, activity.NewValue);
-
             base.Action = ViewProfile = () =>
             {
                 Action?.Invoke();
@@ -96,41 +78,9 @@ namespace osu.Game.Users
             };
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            Status.TriggerChange();
-
-            // Colour should be applied immediately on first load.
-            statusIcon.FinishTransforms();
-        }
-
-        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: 16, weight: FontWeight.Bold),
@@ -138,80 +88,6 @@ namespace osu.Game.Users
             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.CentreRight : Anchor.CentreLeft;
-
-            statusContainer.Add(LastVisitMessage = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)).With(text =>
-            {
-                text.Anchor = alignment;
-                text.Origin = 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)
-                    {
-                        Shadow = false
-                    });
-                }
-            }));
-
-            statusContainer.Add(statusMessage = new OsuSpriteText
-            {
-                Anchor = alignment,
-                Origin = alignment,
-                Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
-            });
-
-            return statusContainer;
-        }
-
-        private void displayStatus(UserStatus status, UserActivity activity = null)
-        {
-            if (status != null)
-            {
-                LastVisitMessage.FadeTo(status is UserStatusOffline && User.LastVisit.HasValue ? 1 : 0);
-
-                // 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;
-                }
-
-                // Otherwise use only status
-                statusMessage.Text = status.Message;
-                statusIcon.FadeColour(status.GetAppropriateColour(colours), 500, Easing.OutQuint);
-
-                return;
-            }
-
-            // Fallback to web status if local one is null
-            if (User.IsOnline)
-            {
-                Status.Value = new UserStatusOnline();
-                return;
-            }
-
-            Status.Value = new UserStatusOffline();
-        }
-
         public MenuItem[] ContextMenuItems => new MenuItem[]
         {
             new OsuMenuItem("View Profile", MenuItemType.Highlighted, ViewProfile),

From 753b1f3401757cb6cd71b1cece3b2499a59f1328 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jul 2020 20:26:15 +0300
Subject: [PATCH 03826/10326] Make ctor protected

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

diff --git a/osu.Game/Users/ExtendedUserPanel.cs b/osu.Game/Users/ExtendedUserPanel.cs
index 5bd98b3fb7..2604815751 100644
--- a/osu.Game/Users/ExtendedUserPanel.cs
+++ b/osu.Game/Users/ExtendedUserPanel.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Users
         private SpriteIcon statusIcon;
         private OsuSpriteText statusMessage;
 
-        public ExtendedUserPanel(User user)
+        protected ExtendedUserPanel(User user)
             : base(user)
         {
         }

From 3e773fde27d165bd43558ba48d5685c3568d5a26 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jul 2020 23:15:22 +0300
Subject: [PATCH 03827/10326] Remove SocialOverlay component as never being
 used

---
 .../Visual/Online/TestSceneSocialOverlay.cs   |  84 ------
 osu.Game/Overlays/SocialOverlay.cs            | 242 ------------------
 2 files changed, 326 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs
 delete mode 100644 osu.Game/Overlays/SocialOverlay.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs
deleted file mode 100644
index 77e77d90c1..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.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 NUnit.Framework;
-using osu.Game.Overlays;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    [TestFixture]
-    public class TestSceneSocialOverlay : OsuTestScene
-    {
-        protected override bool UseOnlineAPI => true;
-
-        public TestSceneSocialOverlay()
-        {
-            SocialOverlay s = new SocialOverlay
-            {
-                Users = new[]
-                {
-                    new User
-                    {
-                        Username = @"flyte",
-                        Id = 3103765,
-                        Country = new Country { FlagName = @"JP" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
-                    },
-                    new User
-                    {
-                        Username = @"Cookiezi",
-                        Id = 124493,
-                        Country = new Country { FlagName = @"KR" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c2.jpg",
-                    },
-                    new User
-                    {
-                        Username = @"Angelsim",
-                        Id = 1777162,
-                        Country = new Country { FlagName = @"KR" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
-                    },
-                    new User
-                    {
-                        Username = @"Rafis",
-                        Id = 2558286,
-                        Country = new Country { FlagName = @"PL" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c4.jpg",
-                    },
-                    new User
-                    {
-                        Username = @"hvick225",
-                        Id = 50265,
-                        Country = new Country { FlagName = @"TW" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c5.jpg",
-                    },
-                    new User
-                    {
-                        Username = @"peppy",
-                        Id = 2,
-                        Country = new Country { FlagName = @"AU" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
-                    },
-                    new User
-                    {
-                        Username = @"filsdelama",
-                        Id = 2831793,
-                        Country = new Country { FlagName = @"FR" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c7.jpg"
-                    },
-                    new User
-                    {
-                        Username = @"_index",
-                        Id = 652457,
-                        Country = new Country { FlagName = @"RU" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c8.jpg"
-                    },
-                },
-            };
-            Add(s);
-
-            AddStep(@"toggle", s.ToggleVisibility);
-        }
-    }
-}
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
deleted file mode 100644
index 1b05142192..0000000000
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ /dev/null
@@ -1,242 +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.Bindables;
-using osuTK;
-using osuTK.Graphics;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Overlays.SearchableList;
-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
-{
-    public class SocialOverlay : SearchableListOverlay<SocialTab, SocialSortCriteria, SortDirection>
-    {
-        private readonly LoadingSpinner loading;
-        private FillFlowContainer<UserPanel> panels;
-
-        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();
-
-        private User[] users = Array.Empty<User>();
-
-        public User[] Users
-        {
-            get => users;
-            set
-            {
-                if (users == value)
-                    return;
-
-                users = value ?? Array.Empty<User>();
-
-                if (LoadState >= LoadState.Ready)
-                    recreatePanels();
-            }
-        }
-
-        public SocialOverlay()
-            : base(OverlayColourScheme.Pink)
-        {
-            Add(loading = new LoadingSpinner());
-
-            Filter.Search.Current.ValueChanged += text =>
-            {
-                if (!string.IsNullOrEmpty(text.NewValue))
-                {
-                    // force searching in players until searching for friends is supported
-                    Header.Tabs.Current.Value = SocialTab.AllPlayers;
-
-                    if (Filter.Tabs.Current.Value != SocialSortCriteria.Rank)
-                        Filter.Tabs.Current.Value = SocialSortCriteria.Rank;
-                }
-            };
-
-            Header.Tabs.Current.ValueChanged += _ => queueUpdate();
-            Filter.Tabs.Current.ValueChanged += _ => onFilterUpdate();
-
-            Filter.DisplayStyleControl.DisplayStyle.ValueChanged += _ => recreatePanels();
-            Filter.Dropdown.Current.ValueChanged += _ => recreatePanels();
-
-            currentQuery.BindTo(Filter.Search.Current);
-            currentQuery.ValueChanged += query =>
-            {
-                queryChangedDebounce?.Cancel();
-
-                if (string.IsNullOrEmpty(query.NewValue))
-                    queueUpdate();
-                else
-                    queryChangedDebounce = Scheduler.AddDelayed(updateSearch, 500);
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            recreatePanels();
-        }
-
-        private APIRequest getUsersRequest;
-
-        private readonly Bindable<string> currentQuery = new Bindable<string>();
-
-        private ScheduledDelegate queryChangedDebounce;
-
-        private void queueUpdate() => Scheduler.AddOnce(updateSearch);
-
-        private CancellationTokenSource loadCancellation;
-
-        private void updateSearch()
-        {
-            queryChangedDebounce?.Cancel();
-
-            if (!IsLoaded)
-                return;
-
-            Users = null;
-            clearPanels();
-            getUsersRequest?.Cancel();
-
-            if (API?.IsLoggedIn != true)
-                return;
-
-            switch (Header.Tabs.Current.Value)
-            {
-                case SocialTab.Friends:
-                    var friendRequest = new GetFriendsRequest(); // TODO filter arguments?
-                    friendRequest.Success += users => Users = users.ToArray();
-                    API.Queue(getUsersRequest = friendRequest);
-                    break;
-
-                default:
-                    var userRequest = new GetUsersRequest(); // TODO filter arguments!
-                    userRequest.Success += res => Users = res.Users.Select(r => r.User).ToArray();
-                    API.Queue(getUsersRequest = userRequest);
-                    break;
-            }
-        }
-
-        private void recreatePanels()
-        {
-            clearPanels();
-
-            if (Users == null)
-            {
-                loading.Hide();
-                return;
-            }
-
-            IEnumerable<User> sortedUsers = Users;
-
-            switch (Filter.Tabs.Current.Value)
-            {
-                case SocialSortCriteria.Location:
-                    sortedUsers = sortedUsers.OrderBy(u => u.Country.FullName);
-                    break;
-
-                case SocialSortCriteria.Name:
-                    sortedUsers = sortedUsers.OrderBy(u => u.Username);
-                    break;
-            }
-
-            if (Filter.Dropdown.Current.Value == SortDirection.Descending)
-                sortedUsers = sortedUsers.Reverse();
-
-            var newPanels = new FillFlowContainer<UserPanel>
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Spacing = new Vector2(10f),
-                Margin = new MarginPadding { Top = 10 },
-                ChildrenEnumerable = sortedUsers.Select(u =>
-                {
-                    UserPanel panel;
-
-                    switch (Filter.DisplayStyleControl.DisplayStyle.Value)
-                    {
-                        case PanelDisplayStyle.Grid:
-                            panel = new UserGridPanel(u)
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Width = 290,
-                            };
-                            break;
-
-                        default:
-                            panel = new UserListPanel(u);
-                            break;
-                    }
-
-                    panel.Status.BindTo(u.Status);
-                    panel.Activity.BindTo(u.Activity);
-                    return panel;
-                })
-            };
-
-            LoadComponentAsync(newPanels, f =>
-            {
-                if (panels != null)
-                    ScrollFlow.Remove(panels);
-
-                loading.Hide();
-                ScrollFlow.Add(panels = newPanels);
-            }, (loadCancellation = new CancellationTokenSource()).Token);
-        }
-
-        private void onFilterUpdate()
-        {
-            if (Filter.Tabs.Current.Value == SocialSortCriteria.Rank)
-            {
-                queueUpdate();
-                return;
-            }
-
-            recreatePanels();
-        }
-
-        private void clearPanels()
-        {
-            loading.Show();
-
-            loadCancellation?.Cancel();
-
-            if (panels != null)
-            {
-                panels.Expire();
-                panels = null;
-            }
-        }
-
-        public override void APIStateChanged(IAPIProvider api, APIState state)
-        {
-            switch (state)
-            {
-                case APIState.Online:
-                    queueUpdate();
-                    break;
-
-                default:
-                    Users = null;
-                    clearPanels();
-                    break;
-            }
-        }
-    }
-}

From a6562be3eb33d35ac6b47a2d19cdaee3f6cc52dd Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 18 Jul 2020 23:27:33 +0300
Subject: [PATCH 03828/10326] Remove unused classes from social namespace

---
 osu.Game/Overlays/Social/FilterControl.cs | 33 -----------
 osu.Game/Overlays/Social/Header.cs        | 67 -----------------------
 2 files changed, 100 deletions(-)
 delete mode 100644 osu.Game/Overlays/Social/FilterControl.cs
 delete mode 100644 osu.Game/Overlays/Social/Header.cs

diff --git a/osu.Game/Overlays/Social/FilterControl.cs b/osu.Game/Overlays/Social/FilterControl.cs
deleted file mode 100644
index 93fcc3c401..0000000000
--- a/osu.Game/Overlays/Social/FilterControl.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Extensions.Color4Extensions;
-using osuTK.Graphics;
-using osu.Framework.Graphics;
-using osu.Game.Overlays.SearchableList;
-
-namespace osu.Game.Overlays.Social
-{
-    public class FilterControl : SearchableListFilterControl<SocialSortCriteria, SortDirection>
-    {
-        protected override Color4 BackgroundColour => Color4Extensions.FromHex(@"47253a");
-        protected override SocialSortCriteria DefaultTab => SocialSortCriteria.Rank;
-        protected override SortDirection DefaultCategory => SortDirection.Ascending;
-
-        public FilterControl()
-        {
-            Tabs.Margin = new MarginPadding { Top = 10 };
-        }
-    }
-
-    public enum SocialSortCriteria
-    {
-        Rank,
-        Name,
-        Location,
-        //[Description("Time Zone")]
-        //TimeZone,
-        //[Description("World Map")]
-        //WorldMap,
-    }
-}
diff --git a/osu.Game/Overlays/Social/Header.cs b/osu.Game/Overlays/Social/Header.cs
deleted file mode 100644
index 22e0fdcd56..0000000000
--- a/osu.Game/Overlays/Social/Header.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 osu.Game.Overlays.SearchableList;
-using osuTK.Graphics;
-using osu.Framework.Graphics;
-using osu.Game.Graphics.Sprites;
-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
-{
-    public class Header : SearchableListHeader<SocialTab>
-    {
-        private OsuSpriteText browser;
-
-        protected override Color4 BackgroundColour => Color4Extensions.FromHex(@"38202e");
-
-        protected override SocialTab DefaultTab => SocialTab.AllPlayers;
-        protected override IconUsage Icon => FontAwesome.Solid.Users;
-
-        protected override Drawable CreateHeaderText()
-        {
-            return new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Children = new[]
-                {
-                    new OsuSpriteText
-                    {
-                        Text = "social ",
-                        Font = OsuFont.GetFont(size: 25),
-                    },
-                    browser = new OsuSpriteText
-                    {
-                        Text = "browser",
-                        Font = OsuFont.GetFont(size: 25, weight: FontWeight.Light),
-                    },
-                },
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            browser.Colour = colours.Pink;
-        }
-    }
-
-    public enum SocialTab
-    {
-        [Description("All Players")]
-        AllPlayers,
-
-        [Description("Friends")]
-        Friends,
-        //[Description("Team Members")]
-        //TeamMembers,
-        //[Description("Chat Channels")]
-        //ChatChannels,
-    }
-}

From 56b0094d4373a48c6e135fdbf23b6e95aec07d5b Mon Sep 17 00:00:00 2001
From: Fabian <lindgrenfabian@gmail.com>
Date: Sat, 18 Jul 2020 23:10:05 +0200
Subject: [PATCH 03829/10326] Update slider labels & descriptions

---
 osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
index 6302d47843..ee6a7815e2 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Description => "Hit them at the right size!";
 
-        [SettingSource("Starting size modifier", "The object starting size modifier")]
+        [SettingSource("Starting Size", "The initial size multiplier applied to all objects.")]
         public override BindableNumber<float> StartScale { get; } = new BindableFloat
         {
             MinValue = 1f,
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
index 5288bdd62c..182d6eeb4b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Description => "Hit them at the right size!";
 
-        [SettingSource("Starting size modifier", "The object starting size modifier")]
+        [SettingSource("Starting Size", "The initial size multiplier applied to all objects.")]
         public override BindableNumber<float> StartScale { get; } = new BindableFloat
         {
             MinValue = 0f,

From 2025e5418c841a386ba5599164c3c9d017c7814c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 19 Jul 2020 04:10:35 +0300
Subject: [PATCH 03830/10326] Minor visual adjustments

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

diff --git a/osu.Game/Users/UserBrickPanel.cs b/osu.Game/Users/UserBrickPanel.cs
index f6eabc3b75..9ca7768187 100644
--- a/osu.Game/Users/UserBrickPanel.cs
+++ b/osu.Game/Users/UserBrickPanel.cs
@@ -16,15 +16,14 @@ namespace osu.Game.Users
         public UserBrickPanel(User user)
             : base(user)
         {
-            AutoSizeAxes = Axes.X;
-            Height = 23;
+            AutoSizeAxes = Axes.Both;
             CornerRadius = 6;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Background.FadeTo(0.3f);
+            Background.FadeTo(0.2f);
         }
 
         protected override Drawable CreateLayout() => new FillFlowContainer
@@ -34,7 +33,8 @@ namespace osu.Game.Users
             Spacing = new Vector2(5, 0),
             Margin = new MarginPadding
             {
-                Horizontal = 5
+                Horizontal = 10,
+                Vertical = 3,
             },
             Anchor = Anchor.Centre,
             Origin = Anchor.Centre,

From 648e414c14ac0ade2821b91b7101f225a3b8a65f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Jul 2020 11:04:33 +0900
Subject: [PATCH 03831/10326] Update InputHandlers in line with framework
 changes

---
 .../Replays/CatchFramedReplayInputHandler.cs      | 15 ++++++---------
 .../Replays/ManiaFramedReplayInputHandler.cs      |  5 ++++-
 .../Replays/OsuFramedReplayInputHandler.cs        | 12 ++++++------
 .../Replays/TaikoFramedReplayInputHandler.cs      |  5 ++++-
 .../Visual/Gameplay/TestSceneReplayRecorder.cs    | 15 +++------------
 .../Visual/Gameplay/TestSceneReplayRecording.cs   | 15 +++------------
 .../Rulesets/Replays/FramedReplayInputHandler.cs  |  3 ---
 7 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
index f122588a2b..24c21fbc84 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
@@ -35,18 +35,15 @@ namespace osu.Game.Rulesets.Catch.Replays
             }
         }
 
-        public override List<IInput> GetPendingInputs()
+        public override void GetPendingInputs(List<IInput> input)
         {
-            if (!Position.HasValue) return new List<IInput>();
+            if (!Position.HasValue) return;
 
-            return new List<IInput>
+            input.Add(new CatchReplayState
             {
-                new CatchReplayState
-                {
-                    PressedActions = CurrentFrame?.Actions ?? new List<CatchAction>(),
-                    CatcherX = Position.Value
-                },
-            };
+                PressedActions = CurrentFrame?.Actions ?? new List<CatchAction>(),
+                CatcherX = Position.Value
+            });
         }
 
         public class CatchReplayState : ReplayState<CatchAction>
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaFramedReplayInputHandler.cs b/osu.Game.Rulesets.Mania/Replays/ManiaFramedReplayInputHandler.cs
index 899718b77e..26c4ccf289 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaFramedReplayInputHandler.cs
@@ -18,6 +18,9 @@ namespace osu.Game.Rulesets.Mania.Replays
 
         protected override bool IsImportant(ManiaReplayFrame frame) => frame.Actions.Any();
 
-        public override List<IInput> GetPendingInputs() => new List<IInput> { new ReplayState<ManiaAction> { PressedActions = CurrentFrame?.Actions ?? new List<ManiaAction>() } };
+        public override void GetPendingInputs(List<IInput> input)
+        {
+            input.Add(new ReplayState<ManiaAction> { PressedActions = CurrentFrame?.Actions ?? new List<ManiaAction>() });
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
index b42e9ac187..5c803539c2 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
@@ -36,19 +36,19 @@ namespace osu.Game.Rulesets.Osu.Replays
             }
         }
 
-        public override List<IInput> GetPendingInputs()
+        public override void GetPendingInputs(List<IInput> input)
         {
-            return new List<IInput>
-            {
+            input.Add(
                 new MousePositionAbsoluteInput
                 {
                     Position = GamefieldToScreenSpace(Position ?? Vector2.Zero)
-                },
+                });
+            input.Add(
                 new ReplayState<OsuAction>
                 {
                     PressedActions = CurrentFrame?.Actions ?? new List<OsuAction>()
-                }
-            };
+                });
+            ;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs
index 97337acc45..7361d4efa8 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs
@@ -18,6 +18,9 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
         protected override bool IsImportant(TaikoReplayFrame frame) => frame.Actions.Any();
 
-        public override List<IInput> GetPendingInputs() => new List<IInput> { new ReplayState<TaikoAction> { PressedActions = CurrentFrame?.Actions ?? new List<TaikoAction>() } };
+        public override void GetPendingInputs(List<IInput> input)
+        {
+            input.Add(new ReplayState<TaikoAction> { PressedActions = CurrentFrame?.Actions ?? new List<TaikoAction>() });
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index c7455583e4..e473f49826 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -173,19 +173,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            public override List<IInput> GetPendingInputs()
+            public override void GetPendingInputs(List<IInput> inputs)
             {
-                return new List<IInput>
-                {
-                    new MousePositionAbsoluteInput
-                    {
-                        Position = GamefieldToScreenSpace(CurrentFrame?.Position ?? Vector2.Zero)
-                    },
-                    new ReplayState<TestAction>
-                    {
-                        PressedActions = CurrentFrame?.Actions ?? new List<TestAction>()
-                    }
-                };
+                inputs.Add(new MousePositionAbsoluteInput { Position = GamefieldToScreenSpace(CurrentFrame?.Position ?? Vector2.Zero) });
+                inputs.Add(new ReplayState<TestAction> { PressedActions = CurrentFrame?.Actions ?? new List<TestAction>() });
             }
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
index 7822f07957..e891ed617a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
@@ -113,19 +113,10 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
         }
 
-        public override List<IInput> GetPendingInputs()
+        public override void GetPendingInputs(List<IInput> inputs)
         {
-            return new List<IInput>
-            {
-                new MousePositionAbsoluteInput
-                {
-                    Position = GamefieldToScreenSpace(CurrentFrame?.Position ?? Vector2.Zero)
-                },
-                new ReplayState<TestAction>
-                {
-                    PressedActions = CurrentFrame?.Actions ?? new List<TestAction>()
-                }
-            };
+            inputs.Add(new MousePositionAbsoluteInput { Position = GamefieldToScreenSpace(CurrentFrame?.Position ?? Vector2.Zero) });
+            inputs.Add(new ReplayState<TestAction> { PressedActions = CurrentFrame?.Actions ?? new List<TestAction>() });
         }
     }
 
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 55d82c4083..cf5c88b8fd 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
-using osu.Framework.Input.StateChanges;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
 
@@ -69,8 +68,6 @@ namespace osu.Game.Rulesets.Replays
             return true;
         }
 
-        public override List<IInput> GetPendingInputs() => new List<IInput>();
-
         private const double sixty_frame_time = 1000.0 / 60;
 
         protected virtual double AllowedImportantTimeSpan => sixty_frame_time * 1.2;

From 72ace508b605dace2f6f3e684aa83fac3bae3c4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Jul 2020 11:37:10 +0900
Subject: [PATCH 03832/10326] Reduce memory allocations in MenuCursorContainer

---
 osu.Game/Graphics/Cursor/MenuCursorContainer.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs b/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
index b7ea1ba56a..02bfb3fad6 100644
--- a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursorContainer.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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -55,7 +54,15 @@ namespace osu.Game.Graphics.Cursor
                 return;
             }
 
-            var newTarget = inputManager.HoveredDrawables.OfType<IProvideCursor>().FirstOrDefault(t => t.ProvidingUserCursor) ?? this;
+            IProvideCursor newTarget = this;
+
+            foreach (var d in inputManager.HoveredDrawables)
+            {
+                if (!(d is IProvideCursor p) || !p.ProvidingUserCursor) continue;
+
+                newTarget = p;
+                break;
+            }
 
             if (currentTarget == newTarget)
                 return;

From a7fcce0bf719a68fda8d5cb4abad429d72828699 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Jul 2020 11:37:38 +0900
Subject: [PATCH 03833/10326] Fix hard crash on notifications firing before
 NotificationOverlay is ready

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 618049e72c..f4bb10340e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -63,7 +63,8 @@ namespace osu.Game
 
         private ChannelManager channelManager;
 
-        private NotificationOverlay notifications;
+        [NotNull]
+        private readonly NotificationOverlay notifications = new NotificationOverlay();
 
         private NowPlayingOverlay nowPlaying;
 
@@ -82,7 +83,7 @@ namespace osu.Game
 
         public virtual Storage GetStorageForStableInstall() => null;
 
-        public float ToolbarOffset => Toolbar.Position.Y + Toolbar.DrawHeight;
+        public float ToolbarOffset => (Toolbar?.Position.Y ?? 0) + (Toolbar?.DrawHeight ?? 0);
 
         private IdleTracker idleTracker;
 
@@ -250,7 +251,7 @@ namespace osu.Game
                 case LinkAction.OpenEditorTimestamp:
                 case LinkAction.JoinMultiplayerMatch:
                 case LinkAction.Spectate:
-                    waitForReady(() => notifications, _ => notifications?.Post(new SimpleNotification
+                    waitForReady(() => notifications, _ => notifications.Post(new SimpleNotification
                     {
                         Text = @"This link type is not yet supported!",
                         Icon = FontAwesome.Solid.LifeRing,
@@ -536,14 +537,14 @@ namespace osu.Game
             MenuCursorContainer.CanShowCursor = menuScreen?.CursorVisible ?? false;
 
             // todo: all archive managers should be able to be looped here.
-            SkinManager.PostNotification = n => notifications?.Post(n);
+            SkinManager.PostNotification = n => notifications.Post(n);
             SkinManager.GetStableStorage = GetStorageForStableInstall;
 
-            BeatmapManager.PostNotification = n => notifications?.Post(n);
+            BeatmapManager.PostNotification = n => notifications.Post(n);
             BeatmapManager.GetStableStorage = GetStorageForStableInstall;
             BeatmapManager.PresentImport = items => PresentBeatmap(items.First());
 
-            ScoreManager.PostNotification = n => notifications?.Post(n);
+            ScoreManager.PostNotification = n => notifications.Post(n);
             ScoreManager.GetStableStorage = GetStorageForStableInstall;
             ScoreManager.PresentImport = items => PresentScore(items.First());
 
@@ -615,12 +616,12 @@ namespace osu.Game
 
             loadComponentSingleFile(MusicController = new MusicController(), Add, true);
 
-            loadComponentSingleFile(notifications = new NotificationOverlay
+            loadComponentSingleFile(notifications.With(d =>
             {
-                GetToolbarHeight = () => ToolbarOffset,
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-            }, rightFloatingOverlayContent.Add, true);
+                d.GetToolbarHeight = () => ToolbarOffset;
+                d.Anchor = Anchor.TopRight;
+                d.Origin = Anchor.TopRight;
+            }), rightFloatingOverlayContent.Add, true);
 
             loadComponentSingleFile(screenshotManager, Add);
 

From 3823bd8343d7ae3a8e8281ce154cdd6a05031e09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Jul 2020 14:11:21 +0900
Subject: [PATCH 03834/10326] Add back missing default implementations for
 lookup functions

---
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs   | 4 ++--
 osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 55a04e5ee8..e7788b75f3 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -78,14 +78,14 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         /// <param name="time">The time to find the sound control point at.</param>
         /// <returns>The sound control point.</returns>
-        public SampleControlPoint SamplePointAt(double time) => binarySearchWithFallback(SamplePoints, time, SamplePoints.Count > 0 ? SamplePoints[0] : null);
+        public SampleControlPoint SamplePointAt(double time) => binarySearchWithFallback(SamplePoints, time, SamplePoints.Count > 0 ? SamplePoints[0] : SampleControlPoint.DEFAULT);
 
         /// <summary>
         /// Finds the timing control point that is active at <paramref name="time"/>.
         /// </summary>
         /// <param name="time">The time to find the timing control point at.</param>
         /// <returns>The timing control point.</returns>
-        public TimingControlPoint TimingPointAt(double time) => binarySearchWithFallback(TimingPoints, time, TimingPoints.Count > 0 ? TimingPoints[0] : null);
+        public TimingControlPoint TimingPointAt(double time) => binarySearchWithFallback(TimingPoints, time, TimingPoints.Count > 0 ? TimingPoints[0] : TimingControlPoint.DEFAULT);
 
         /// <summary>
         /// Finds the maximum BPM represented by any timing control point.
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index 61851a00d7..c052c04ea0 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -10,6 +10,12 @@ namespace osu.Game.Beatmaps.ControlPoints
     {
         public const string DEFAULT_BANK = "normal";
 
+        public static readonly SampleControlPoint DEFAULT = new SampleControlPoint
+        {
+            SampleBankBindable = { Disabled = true },
+            SampleVolumeBindable = { Disabled = true }
+        };
+
         /// <summary>
         /// The default sample bank at this control point.
         /// </summary>

From 55d921ef85629cd0b04687497793336abfda88aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Jul 2020 15:19:17 +0900
Subject: [PATCH 03835/10326] Improve feel of animation

---
 .../TestSceneSpinner.cs                       |  2 +-
 .../Objects/Drawables/DrawableSpinner.cs      | 32 ++++++++++++-------
 .../Drawables/Pieces/SpinnerBackground.cs     | 10 +++---
 .../Objects/Drawables/Pieces/SpinnerTicks.cs  |  8 ++---
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 8cb7f3f4b6..67afc45e32 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private void testSingle(float circleSize, bool auto = false)
         {
-            var spinner = new Spinner { StartTime = Time.Current + 1000, EndTime = Time.Current + 4000 };
+            var spinner = new Spinner { StartTime = Time.Current + 2000, EndTime = Time.Current + 5000 };
 
             spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = circleSize });
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index be6766509c..3dd98be6fb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     {
                         Background = new SpinnerBackground
                         {
-                            Alpha = 0.6f,
+                            Alpha = 1f,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         },
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Background.AccentColour = normalColour;
 
-            completeColour = colours.YellowLight.Opacity(0.75f);
+            completeColour = colours.YellowLight;
 
             Disc.AccentColour = fillColour;
             circle.Colour = colours.BlueDark;
@@ -152,8 +152,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
                 Disc.FadeAccent(completeColour, duration);
 
-                Background.FadeAccent(completeColour, duration);
-                Background.FadeOut(duration);
+                Background.FadeAccent(completeColour.Darken(1), duration);
 
                 circle.FadeColour(completeColour, duration);
                 glow.FadeColour(completeColour, duration);
@@ -204,14 +203,25 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateInitialTransforms();
 
-            circleContainer.ScaleTo(Spinner.Scale * 0.3f);
-            circleContainer.ScaleTo(Spinner.Scale, HitObject.TimePreempt / 1.4f, Easing.OutQuint);
+            circleContainer.ScaleTo(0);
+            mainContainer.ScaleTo(0);
 
-            mainContainer
-                .ScaleTo(0)
-                .ScaleTo(Spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, HitObject.TimePreempt - 150, Easing.OutQuint)
-                .Then()
-                .ScaleTo(1, 500, Easing.OutQuint);
+            using (BeginDelayedSequence(HitObject.TimePreempt / 2, true))
+            {
+                float phaseOneScale = Spinner.Scale * 0.8f;
+
+                circleContainer.ScaleTo(phaseOneScale, HitObject.TimePreempt / 2f, Easing.OutQuint);
+
+                mainContainer
+                    .ScaleTo(phaseOneScale * circle.DrawHeight / DrawHeight * 1.4f, HitObject.TimePreempt / 2, Easing.OutElasticHalf)
+                    .RotateTo(25, HitObject.TimePreempt + Spinner.Duration);
+
+                using (BeginDelayedSequence(HitObject.TimePreempt / 2, true))
+                {
+                    circleContainer.ScaleTo(Spinner.Scale * 1.4f, 400, Easing.OutQuint);
+                    mainContainer.ScaleTo(Spinner.Scale, 400, Easing.OutQuint);
+                }
+            }
         }
 
         protected override void UpdateStateTransforms(ArmedState state)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs
index 77228e28af..bfb9a9e763 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs
@@ -1,25 +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 osuTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     public class SpinnerBackground : CircularContainer, IHasAccentColour
     {
-        protected Box Disc;
+        private readonly Box disc;
 
         public Color4 AccentColour
         {
-            get => Disc.Colour;
+            get => disc.Colour;
             set
             {
-                Disc.Colour = value;
+                disc.Colour = value;
 
                 EdgeEffect = new EdgeEffectParameters
                 {
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             Children = new Drawable[]
             {
-                Disc = new Box
+                disc = new Box
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs
index 676cefb236..0e7dafdbea 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs
@@ -20,24 +20,24 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             Anchor = Anchor.Centre;
             RelativeSizeAxes = Axes.Both;
 
-            const float count = 18;
+            const float count = 8;
 
             for (float i = 0; i < count; i++)
             {
                 Add(new Container
                 {
                     Colour = Color4.Black,
-                    Alpha = 0.4f,
+                    Alpha = 0.2f,
                     EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
-                        Radius = 10,
+                        Radius = 20,
                         Colour = Color4.Gray.Opacity(0.2f),
                     },
                     RelativePositionAxes = Axes.Both,
                     Masking = true,
                     CornerRadius = 5,
-                    Size = new Vector2(60, 10),
+                    Size = new Vector2(65, 10),
                     Origin = Anchor.Centre,
                     Position = new Vector2(
                         0.5f + MathF.Sin(i / count * 2 * MathF.PI) / 2 * 0.86f,

From 33e58bb7db992e24562ecf38774b09297b6b55cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Jul 2020 17:22:17 +0900
Subject: [PATCH 03836/10326] Fix sizing and colour not correct on hit

---
 .../Objects/Drawables/DrawableSpinner.cs      | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 3dd98be6fb..b8a290a978 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -147,15 +147,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (Progress >= 1 && !Disc.Complete)
             {
                 Disc.Complete = true;
-
-                const float duration = 200;
-
-                Disc.FadeAccent(completeColour, duration);
-
-                Background.FadeAccent(completeColour.Darken(1), duration);
-
-                circle.FadeColour(completeColour, duration);
-                glow.FadeColour(completeColour, duration);
+                transformFillColour(completeColour, 200);
             }
 
             if (userTriggered || Time.Current < Spinner.EndTime)
@@ -208,18 +200,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             using (BeginDelayedSequence(HitObject.TimePreempt / 2, true))
             {
-                float phaseOneScale = Spinner.Scale * 0.8f;
+                float phaseOneScale = Spinner.Scale * 0.7f;
 
-                circleContainer.ScaleTo(phaseOneScale, HitObject.TimePreempt / 2f, Easing.OutQuint);
+                circleContainer.ScaleTo(phaseOneScale, HitObject.TimePreempt / 4, Easing.OutQuint);
 
                 mainContainer
-                    .ScaleTo(phaseOneScale * circle.DrawHeight / DrawHeight * 1.4f, HitObject.TimePreempt / 2, Easing.OutElasticHalf)
-                    .RotateTo(25, HitObject.TimePreempt + Spinner.Duration);
+                    .ScaleTo(phaseOneScale * circle.DrawHeight / DrawHeight * 1.5f, HitObject.TimePreempt / 4, Easing.OutQuint)
+                    .RotateTo((float)(25 * Spinner.Duration / 2000), HitObject.TimePreempt + Spinner.Duration);
 
                 using (BeginDelayedSequence(HitObject.TimePreempt / 2, true))
                 {
-                    circleContainer.ScaleTo(Spinner.Scale * 1.4f, 400, Easing.OutQuint);
-                    mainContainer.ScaleTo(Spinner.Scale, 400, Easing.OutQuint);
+                    circleContainer.ScaleTo(Spinner.Scale, 400, Easing.OutQuint);
+                    mainContainer.ScaleTo(1, 400, Easing.OutQuint);
                 }
             }
         }
@@ -228,18 +220,33 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateStateTransforms(state);
 
-            var sequence = this.Delay(Spinner.Duration).FadeOut(160);
-
-            switch (state)
+            using (BeginDelayedSequence(Spinner.Duration, true))
             {
-                case ArmedState.Hit:
-                    sequence.ScaleTo(Scale * 1.2f, 320, Easing.Out);
-                    break;
+                this.FadeOut(160);
 
-                case ArmedState.Miss:
-                    sequence.ScaleTo(Scale * 0.8f, 320, Easing.In);
-                    break;
+                switch (state)
+                {
+                    case ArmedState.Hit:
+                        transformFillColour(completeColour, 0);
+                        this.ScaleTo(Scale * 1.2f, 320, Easing.Out);
+                        mainContainer.RotateTo(mainContainer.Rotation + 180, 320);
+                        break;
+
+                    case ArmedState.Miss:
+                        this.ScaleTo(Scale * 0.8f, 320, Easing.In);
+                        break;
+                }
             }
         }
+
+        private void transformFillColour(Colour4 colour, double duration)
+        {
+            Disc.FadeAccent(colour, duration);
+
+            Background.FadeAccent(colour.Darken(1), duration);
+
+            circle.FadeColour(colour, duration);
+            glow.FadeColour(colour, duration);
+        }
     }
 }

From 4cbc176cb66c3c9616ccc613252c7eee20d9a97f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Jul 2020 17:48:35 +0900
Subject: [PATCH 03837/10326] Add less fill and more transparency

---
 .../Objects/Drawables/DrawableSpinner.cs      | 10 ++++--
 .../Drawables/Pieces/SpinnerBackground.cs     |  8 ++---
 .../Objects/Drawables/Pieces/SpinnerTicks.cs  | 34 ++++++++++++++-----
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index b8a290a978..fafb3ab69d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -93,7 +93,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     {
                         Background = new SpinnerBackground
                         {
-                            Alpha = 1f,
+                            Disc =
+                            {
+                                Alpha = 0f,
+                            },
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         },
@@ -125,10 +128,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private void load(OsuColour colours)
         {
             normalColour = baseColour;
+            completeColour = colours.YellowLight;
 
             Background.AccentColour = normalColour;
-
-            completeColour = colours.YellowLight;
+            Ticks.AccentColour = normalColour;
 
             Disc.AccentColour = fillColour;
             circle.Colour = colours.BlueDark;
@@ -244,6 +247,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Disc.FadeAccent(colour, duration);
 
             Background.FadeAccent(colour.Darken(1), duration);
+            Ticks.FadeAccent(colour, duration);
 
             circle.FadeColour(colour, duration);
             glow.FadeColour(colour, duration);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs
index bfb9a9e763..944354abca 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     public class SpinnerBackground : CircularContainer, IHasAccentColour
     {
-        private readonly Box disc;
+        public readonly Box Disc;
 
         public Color4 AccentColour
         {
-            get => disc.Colour;
+            get => Disc.Colour;
             set
             {
-                disc.Colour = value;
+                Disc.Colour = value;
 
                 EdgeEffect = new EdgeEffectParameters
                 {
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             Children = new Drawable[]
             {
-                disc = new Box
+                Disc = new Box
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs
index 0e7dafdbea..95bccbf2fc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -9,10 +10,11 @@ using osu.Framework.Graphics.Effects;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
-    public class SpinnerTicks : Container
+    public class SpinnerTicks : Container, IHasAccentColour
     {
         public SpinnerTicks()
         {
@@ -26,14 +28,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             {
                 Add(new Container
                 {
-                    Colour = Color4.Black,
-                    Alpha = 0.2f,
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Radius = 20,
-                        Colour = Color4.Gray.Opacity(0.2f),
-                    },
+                    Alpha = 0.4f,
+                    Blending = BlendingParameters.Additive,
                     RelativePositionAxes = Axes.Both,
                     Masking = true,
                     CornerRadius = 5,
@@ -54,5 +50,25 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 });
             }
         }
+
+        public Color4 AccentColour
+        {
+            get => Colour;
+            set
+            {
+                Colour = value;
+
+                foreach (var c in Children.OfType<Container>())
+                {
+                    c.EdgeEffect =
+                        new EdgeEffectParameters
+                        {
+                            Type = EdgeEffectType.Glow,
+                            Radius = 20,
+                            Colour = value.Opacity(0.8f),
+                        };
+                }
+            }
+        }
     }
 }

From e06d3c5812e87037b94a756b1bba98cdcaf09d87 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Jul 2020 17:52:59 +0900
Subject: [PATCH 03838/10326] Minor adjustments to tick clearance

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs  | 2 +-
 .../Objects/Drawables/Pieces/SpinnerTicks.cs                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index fafb3ab69d..9c4608cbb1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 circleContainer.ScaleTo(phaseOneScale, HitObject.TimePreempt / 4, Easing.OutQuint);
 
                 mainContainer
-                    .ScaleTo(phaseOneScale * circle.DrawHeight / DrawHeight * 1.5f, HitObject.TimePreempt / 4, Easing.OutQuint)
+                    .ScaleTo(phaseOneScale * circle.DrawHeight / DrawHeight * 1.6f, HitObject.TimePreempt / 4, Easing.OutQuint)
                     .RotateTo((float)(25 * Spinner.Duration / 2000), HitObject.TimePreempt + Spinner.Duration);
 
                 using (BeginDelayedSequence(HitObject.TimePreempt / 2, true))
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs
index 95bccbf2fc..ba7e8eae6f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs
@@ -33,11 +33,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     RelativePositionAxes = Axes.Both,
                     Masking = true,
                     CornerRadius = 5,
-                    Size = new Vector2(65, 10),
+                    Size = new Vector2(60, 10),
                     Origin = Anchor.Centre,
                     Position = new Vector2(
-                        0.5f + MathF.Sin(i / count * 2 * MathF.PI) / 2 * 0.86f,
-                        0.5f + MathF.Cos(i / count * 2 * MathF.PI) / 2 * 0.86f
+                        0.5f + MathF.Sin(i / count * 2 * MathF.PI) / 2 * 0.83f,
+                        0.5f + MathF.Cos(i / count * 2 * MathF.PI) / 2 * 0.83f
                     ),
                     Rotation = -i / count * 360 + 90,
                     Children = new[]

From 6a144fba80a4ec8b8c10367010d5c02f8129d7f6 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Mon, 20 Jul 2020 17:24:17 +0700
Subject: [PATCH 03839/10326] add epilepsy warning in metadata display

---
 .../Screens/Play/BeatmapMetadataDisplay.cs    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index a84a85ea47..069ac69622 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -49,6 +49,37 @@ namespace osu.Game.Screens.Play
             }
         }
 
+        private class EpilepsyWarning : FillFlowContainer
+        {
+            public EpilepsyWarning()
+            {
+                AutoSizeAxes = Axes.Both;
+                Direction = FillDirection.Vertical;
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Icon = FontAwesome.Solid.ExclamationTriangle,
+                        Size = new Vector2(40)
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Text = "This beatmap contains scenes with rapidly flashing colours."
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Text = "Please take caution if you are affected by epilepsy."
+                    }
+                };
+            }
+        }
+
         private readonly WorkingBeatmap beatmap;
         private readonly Bindable<IReadOnlyList<Mod>> mods;
         private readonly Drawable facade;
@@ -162,6 +193,12 @@ namespace osu.Game.Screens.Play
                             AutoSizeAxes = Axes.Both,
                             Margin = new MarginPadding { Top = 20 },
                             Current = mods
+                        },
+                        new EpilepsyWarning
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Margin = new MarginPadding { Top = 20 },
                         }
                     },
                 }

From acbf13ddc4050e3462f34ab4c3bf5075aff1f8a5 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Mon, 20 Jul 2020 17:36:42 +0700
Subject: [PATCH 03840/10326] add epilepsy warning field

---
 osu.Game/Beatmaps/BeatmapInfo.cs                  | 2 ++
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 3860f12baa..da4c4ca36b 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -91,6 +91,8 @@ namespace osu.Game.Beatmaps
         public bool LetterboxInBreaks { get; set; }
         public bool WidescreenStoryboard { get; set; }
 
+        public bool EpilepsyWarning { get; set; }
+
         // Editor
         // This bookmarks stuff is necessary because DB doesn't know how to store int[]
         [JsonIgnore]
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index b30ec0ca2c..fd17e38a4f 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -175,6 +175,9 @@ namespace osu.Game.Beatmaps.Formats
                 case @"WidescreenStoryboard":
                     beatmap.BeatmapInfo.WidescreenStoryboard = Parsing.ParseInt(pair.Value) == 1;
                     break;
+                case @"EpilepsyWarning":
+                    beatmap.BeatmapInfo.EpilepsyWarning = Parsing.ParseInt(pair.Value) == 1;
+                    break;
             }
         }
 

From 055e31ddd54b7867589261ae632bc14c5103bf08 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Mon, 20 Jul 2020 18:37:02 +0700
Subject: [PATCH 03841/10326] update minor

---
 osu.Game/Beatmaps/BeatmapInfo.cs                |  1 +
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index da4c4ca36b..b7946d53ca 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -91,6 +91,7 @@ namespace osu.Game.Beatmaps
         public bool LetterboxInBreaks { get; set; }
         public bool WidescreenStoryboard { get; set; }
 
+        [NotMapped]
         public bool EpilepsyWarning { get; set; }
 
         // Editor
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 069ac69622..f672a4db6c 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -51,8 +51,13 @@ namespace osu.Game.Screens.Play
 
         private class EpilepsyWarning : FillFlowContainer
         {
-            public EpilepsyWarning()
+            public EpilepsyWarning(bool warning)
             {
+                if (warning)
+                    this.Show();
+                else
+                    this.Hide();
+
                 AutoSizeAxes = Axes.Both;
                 Direction = FillDirection.Vertical;
                 Children = new Drawable[]
@@ -62,7 +67,7 @@ namespace osu.Game.Screens.Play
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Icon = FontAwesome.Solid.ExclamationTriangle,
-                        Size = new Vector2(40)
+                        Size = new Vector2(40),
                     },
                     new OsuSpriteText
                     {
@@ -194,7 +199,7 @@ namespace osu.Game.Screens.Play
                             Margin = new MarginPadding { Top = 20 },
                             Current = mods
                         },
-                        new EpilepsyWarning
+                        new EpilepsyWarning(beatmap.BeatmapInfo.EpilepsyWarning)
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,

From f044c06d089319841abc78a59c68096fd0a5a330 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 20 Jul 2020 22:26:58 +0900
Subject: [PATCH 03842/10326] Fix hold notes accepting presses during release
 lenience

---
 .../TestSceneHoldNoteInput.cs                 | 65 +++++++++++++++++--
 .../Objects/Drawables/DrawableHoldNote.cs     |  6 ++
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 0d13b85901..95072cf4f8 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -2,6 +2,7 @@
 // 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.Screens;
 using osu.Game.Beatmaps;
@@ -10,6 +11,8 @@ using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Mania.Scoring;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -236,6 +239,53 @@ namespace osu.Game.Rulesets.Mania.Tests
             assertTailJudgement(HitResult.Meh);
         }
 
+        [Test]
+        public void TestMissReleaseAndHitSecondRelease()
+        {
+            var windows = new ManiaHitWindows();
+            windows.SetDifficulty(10);
+
+            var beatmap = new Beatmap<ManiaHitObject>
+            {
+                HitObjects =
+                {
+                    new HoldNote
+                    {
+                        StartTime = 1000,
+                        Duration = 500,
+                        Column = 0,
+                    },
+                    new HoldNote
+                    {
+                        StartTime = 1000 + 500 + windows.WindowFor(HitResult.Miss) + 10,
+                        Duration = 500,
+                        Column = 0,
+                    },
+                },
+                BeatmapInfo =
+                {
+                    BaseDifficulty = new BeatmapDifficulty
+                    {
+                        SliderTickRate = 4,
+                        OverallDifficulty = 10,
+                    },
+                    Ruleset = new ManiaRuleset().RulesetInfo
+                },
+            };
+
+            performTest(new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(beatmap.HitObjects[1].StartTime, ManiaAction.Key1),
+                new ManiaReplayFrame(beatmap.HitObjects[1].GetEndTime()),
+            }, beatmap);
+
+            AddAssert("first hold note missed", () => judgementResults.Where(j => beatmap.HitObjects[0].NestedHitObjects.Contains(j.HitObject))
+                                                                      .All(j => j.Type == HitResult.Miss));
+
+            AddAssert("second hold note missed", () => judgementResults.Where(j => beatmap.HitObjects[1].NestedHitObjects.Contains(j.HitObject))
+                                                                       .All(j => j.Type == HitResult.Perfect));
+        }
+
         private void assertHeadJudgement(HitResult result)
             => AddAssert($"head judged as {result}", () => judgementResults[0].Type == result);
 
@@ -250,11 +300,11 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private ScoreAccessibleReplayPlayer currentPlayer;
 
-        private void performTest(List<ReplayFrame> frames)
+        private void performTest(List<ReplayFrame> frames, Beatmap<ManiaHitObject> beatmap = null)
         {
-            AddStep("load player", () =>
+            if (beatmap == null)
             {
-                Beatmap.Value = CreateWorkingBeatmap(new Beatmap<ManiaHitObject>
+                beatmap = new Beatmap<ManiaHitObject>
                 {
                     HitObjects =
                     {
@@ -270,9 +320,14 @@ namespace osu.Game.Rulesets.Mania.Tests
                         BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 4 },
                         Ruleset = new ManiaRuleset().RulesetInfo
                     },
-                });
+                };
 
-                Beatmap.Value.Beatmap.ControlPointInfo.Add(0, new DifficultyControlPoint { SpeedMultiplier = 0.1f });
+                beatmap.ControlPointInfo.Add(0, new DifficultyControlPoint { SpeedMultiplier = 0.1f });
+            }
+
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(beatmap);
 
                 var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
 
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 2262bd2b7d..0c5289efe1 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -167,6 +167,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (action != Action.Value)
                 return false;
 
+            // The tail has a lenience applied to it which is factored into the miss window (i.e. the miss judgement will be delayed).
+            // But the hold cannot ever be started within the late-lenience window, so we should skip trying to begin the hold during that time.
+            // Note: Unlike below, we use the tail's start time to determine the time offset.
+            if (Time.Current > Tail.HitObject.StartTime && !Tail.HitObject.HitWindows.CanBeHit(Time.Current - Tail.HitObject.StartTime))
+                return false;
+
             beginHoldAt(Time.Current - Head.HitObject.StartTime);
             Head.UpdateResult();
 

From 72722d4c721c304a8119e56a496a0d05173cfa20 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 20 Jul 2020 17:18:26 +0000
Subject: [PATCH 03843/10326] Bump Microsoft.Build.Traversal from 2.0.50 to
 2.0.52

Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.50 to 2.0.52.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.0.50...Microsoft.Build.Traversal.2.0.52)

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

diff --git a/global.json b/global.json
index 9aa5b6192b..233a040d18 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,6 @@
     "version": "3.1.100"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "2.0.50"
+    "Microsoft.Build.Traversal": "2.0.52"
   }
 }
\ No newline at end of file

From f71ed47e6693f59c0bba83433d83d0f43c876833 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 20 Jul 2020 11:52:02 -0700
Subject: [PATCH 03844/10326] Fix focused textbox absorbing input when
 unfocused

---
 osu.Game/Graphics/UserInterface/FocusedTextBox.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
index 8977f014b6..f77a3109c9 100644
--- a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
@@ -67,6 +67,8 @@ namespace osu.Game.Graphics.UserInterface
 
         public bool OnPressed(GlobalAction action)
         {
+            if (!HasFocus) return false;
+
             if (action == GlobalAction.Back)
             {
                 if (Text.Length > 0)

From f48984920d5b489adba4afd4a8c3c9fedaceebe1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jul 2020 11:21:32 +0900
Subject: [PATCH 03845/10326] Change bonus volume logic to work

---
 .../Objects/Drawables/DrawableSpinnerTick.cs       | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 6512a9526e..436994e480 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.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.Framework.Audio;
-using osu.Framework.Bindables;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
@@ -10,8 +8,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSpinnerTick : DrawableOsuHitObject
     {
-        private readonly BindableDouble bonusSampleVolume = new BindableDouble();
-
         private bool hasBonusPoints;
 
         /// <summary>
@@ -25,8 +21,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 hasBonusPoints = value;
 
-                bonusSampleVolume.Value = value ? 1 : 0;
-                ((OsuSpinnerTickJudgement)Result.Judgement).HasBonusPoints = value;
+                Samples.Volume.Value = ((OsuSpinnerTickJudgement)Result.Judgement).HasBonusPoints ? 1 : 0;
             }
         }
 
@@ -37,13 +32,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Samples.AddAdjustment(AdjustableProperty.Volume, bonusSampleVolume);
-        }
-
         /// <summary>
         /// Apply a judgement result.
         /// </summary>

From 4dd40542d519ad2f5db5a529ec864b990a0ec697 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jul 2020 11:21:58 +0900
Subject: [PATCH 03846/10326] Rename rotation set method to match others

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs      | 2 +-
 .../Objects/Drawables/Pieces/SpinnerBonusComponent.cs           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index b82b44f35b..2707453ab9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Ticks.Rotation = Disc.Rotation;
 
             SpmCounter.SetRotation(Disc.CumulativeRotation);
-            bonusComponent.UpdateRotation(Disc.CumulativeRotation);
+            bonusComponent.SetRotation(Disc.CumulativeRotation);
 
             float relativeCircleScale = Spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight;
             float targetScale = relativeCircleScale + (1 - relativeCircleScale) * Progress;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs
index 5c96751b3a..c49c10b45c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private int currentSpins;
 
-        public void UpdateRotation(double rotation)
+        public void SetRotation(double rotation)
         {
             if (ticks.Count == 0)
                 return;

From a8991bb8bfa69a62d9e9a753a7d8d8ba435d48bd Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 20 Jul 2020 20:13:09 -0700
Subject: [PATCH 03847/10326] Fix keybind clear button always clearing first
 keybind regardless of target

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

diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index eafb4572ca..d58acc1ac4 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -187,7 +187,7 @@ namespace osu.Game.Overlays.KeyBinding
 
             if (bindTarget.IsHovered)
                 finalise();
-            else
+            else if (buttons.Any(b => b.IsHovered))
                 updateBindTarget();
         }
 

From 35ad409da6fd60f48f66b58003058ac9d2c5b360 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Tue, 21 Jul 2020 06:59:24 +0300
Subject: [PATCH 03848/10326] Fix spinner bonus ticks samples not actually
 playing

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 436994e480..d49766adda 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -21,7 +21,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 hasBonusPoints = value;
 
-                Samples.Volume.Value = ((OsuSpinnerTickJudgement)Result.Judgement).HasBonusPoints ? 1 : 0;
+                ((OsuSpinnerTickJudgement)Result.Judgement).HasBonusPoints = value;
+                Samples.Volume.Value = value ? 1 : 0;
             }
         }
 

From c1442568b95548316e748e470c00c70a45bd5f9a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jul 2020 17:04:29 +0900
Subject: [PATCH 03849/10326] Make perfect mod ignore all non-combo-affecting
 hitobjects

---
 .../Mods/TestSceneCatchModPerfect.cs                        | 2 +-
 osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs             | 6 ------
 .../Skinning/TestSceneDrawableTaikoMascot.cs                | 2 +-
 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs  | 4 ++--
 .../Judgements/TaikoDrumRollJudgement.cs                    | 2 --
 osu.Game.Rulesets.Taiko/Judgements/TaikoSwellJudgement.cs   | 2 --
 osu.Game/Rulesets/Mods/ModPerfect.cs                        | 1 +
 7 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
index 3e06e78dba..c1b7214d72 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
         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)]
+        [TestCase(false)]
         public void TestTinyDroplet(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new TinyDroplet { StartTime = 1000 }), shouldMiss);
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs b/osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs
index e3391c47f1..fb92399102 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs
@@ -1,17 +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 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.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index d200c44a02..cb6a0decde 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss }, TaikoMascotAnimationState.Fail);
-            assertStateAfterResult(new JudgementResult(new DrumRoll(), new TaikoDrumRollJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Fail);
+            assertStateAfterResult(new JudgementResult(new DrumRoll(), new TaikoDrumRollJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Good }, TaikoMascotAnimationState.Idle);
         }
 
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
index aaa634648a..0be005e1c4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             };
 
         [Test]
-        public void TestSpinnerDoesNotFail()
+        public void TestSpinnerDoesFail()
         {
             bool judged = false;
             AddStep("Setup judgements", () =>
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Player.ScoreProcessor.NewJudgement += b => judged = true;
             });
             AddUntilStep("swell judged", () => judged);
-            AddAssert("not failed", () => !Player.HasFailed);
+            AddAssert("failed", () => Player.HasFailed);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollJudgement.cs
index 604daa929f..0d91002f4b 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollJudgement.cs
@@ -7,8 +7,6 @@ namespace osu.Game.Rulesets.Taiko.Judgements
 {
     public class TaikoDrumRollJudgement : TaikoJudgement
     {
-        public override bool AffectsCombo => false;
-
         protected override double HealthIncreaseFor(HitResult result)
         {
             // Drum rolls can be ignored with no health penalty
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoSwellJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoSwellJudgement.cs
index 29be5e0eac..4d61efd3ee 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoSwellJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoSwellJudgement.cs
@@ -7,8 +7,6 @@ namespace osu.Game.Rulesets.Taiko.Judgements
 {
     public class TaikoSwellJudgement : TaikoJudgement
     {
-        public override bool AffectsCombo => false;
-
         protected override double HealthIncreaseFor(HitResult result)
         {
             switch (result)
diff --git a/osu.Game/Rulesets/Mods/ModPerfect.cs b/osu.Game/Rulesets/Mods/ModPerfect.cs
index 7fe606d584..65f1a972ed 100644
--- a/osu.Game/Rulesets/Mods/ModPerfect.cs
+++ b/osu.Game/Rulesets/Mods/ModPerfect.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Mods
 
         protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
             => !(result.Judgement is IgnoreJudgement)
+               && result.Judgement.AffectsCombo
                && result.Type != result.Judgement.MaxResult;
     }
 }

From d9fedb293a1e712fa4a4ac5902c9edf1592ba84b Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Tue, 21 Jul 2020 15:48:11 +0700
Subject: [PATCH 03850/10326] add initial test

---
 .../Visual/Gameplay/TestScenePlayerLoader.cs         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 4c73065087..341924ae6d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -35,6 +35,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         private TestPlayerLoaderContainer container;
         private TestPlayer player;
 
+        private bool EpilepsyWarning = false;
+
         [Resolved]
         private AudioManager audioManager { get; set; }
 
@@ -55,6 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             beforeLoadAction?.Invoke();
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+            Beatmap.Value.BeatmapInfo.EpilepsyWarning = EpilepsyWarning;
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToTrack>())
                 mod.ApplyToTrack(Beatmap.Value.Track);
@@ -240,6 +243,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for player load", () => player.IsLoaded);
         }
 
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestEpilepsyWarning(bool warning)
+        {
+            AddStep("change epilepsy warning", () => EpilepsyWarning = warning);
+            AddStep("load dummy beatmap", () => ResetPlayer(false));
+            AddUntilStep("wait for current", () => loader.IsCurrentScreen());
+        }
+
         private class TestPlayerLoaderContainer : Container
         {
             [Cached]

From 95f52573f7ca180bfb366aaf5dc9f7fdddddc419 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Tue, 21 Jul 2020 15:58:25 +0700
Subject: [PATCH 03851/10326] change font size

---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index f672a4db6c..bab141a75e 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -73,13 +73,15 @@ namespace osu.Game.Screens.Play
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
-                        Text = "This beatmap contains scenes with rapidly flashing colours."
+                        Text = "This beatmap contains scenes with rapidly flashing colours.",
+                        Font = OsuFont.GetFont(size: 20),
                     },
                     new OsuSpriteText
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
-                        Text = "Please take caution if you are affected by epilepsy."
+                        Text = "Please take caution if you are affected by epilepsy.",
+                        Font = OsuFont.GetFont(size: 20),
                     }
                 };
             }

From 05102bc1baf00b4508bf57dfe0e749569944b8ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jul 2020 18:22:37 +0900
Subject: [PATCH 03852/10326] Split ticks up into bonus and non-bonus

---
 .../Judgements/OsuSpinnerTickJudgement.cs     | 18 --------------
 .../Objects/Drawables/DrawableSpinner.cs      |  3 +++
 .../Drawables/DrawableSpinnerBonusTick.cs     | 13 ++++++++++
 .../Objects/Drawables/DrawableSpinnerTick.cs  | 19 ---------------
 .../Drawables/Pieces/SpinnerBonusComponent.cs |  5 +---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs      | 19 ++++++++++-----
 .../Objects/SpinnerBonusTick.cs               | 24 +++++++++++++++++++
 osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs  | 15 +++++++-----
 8 files changed, 63 insertions(+), 53 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Judgements/OsuSpinnerTickJudgement.cs
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.cs
 create mode 100644 osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerTickJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerTickJudgement.cs
deleted file mode 100644
index f9cac7a2c1..0000000000
--- a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerTickJudgement.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 osu.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Osu.Judgements
-{
-    public class OsuSpinnerTickJudgement : OsuJudgement
-    {
-        internal bool HasBonusPoints;
-
-        public override bool AffectsCombo => false;
-
-        protected override int NumericResultFor(HitResult result) => 100 + (HasBonusPoints ? 1000 : 0);
-
-        protected override double HealthIncreaseFor(HitResult result) => 0;
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 2707453ab9..531d16d1d1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -157,6 +157,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             switch (hitObject)
             {
+                case SpinnerBonusTick bonusTick:
+                    return new DrawableSpinnerBonusTick(bonusTick);
+
                 case SpinnerTick tick:
                     return new DrawableSpinnerTick(tick);
             }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.cs
new file mode 100644
index 0000000000..2e1c07c4c6
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.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.
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
+{
+    public class DrawableSpinnerBonusTick : DrawableSpinnerTick
+    {
+        public DrawableSpinnerBonusTick(SpinnerBonusTick spinnerTick)
+            : base(spinnerTick)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index d49766adda..5fb7653f5a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -1,31 +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.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSpinnerTick : DrawableOsuHitObject
     {
-        private bool hasBonusPoints;
-
-        /// <summary>
-        /// Whether this judgement has a bonus of 1,000 points additional to the numeric result.
-        /// Set when a spin occured after the spinner has completed.
-        /// </summary>
-        public bool HasBonusPoints
-        {
-            get => hasBonusPoints;
-            internal set
-            {
-                hasBonusPoints = value;
-
-                ((OsuSpinnerTickJudgement)Result.Judgement).HasBonusPoints = value;
-                Samples.Volume.Value = value ? 1 : 0;
-            }
-        }
-
         public override bool DisplayResult => false;
 
         public DrawableSpinnerTick(SpinnerTick spinnerTick)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs
index c49c10b45c..9a65247453 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs
@@ -55,12 +55,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 var tick = ticks[currentSpins];
 
                 if (direction >= 0)
-                {
-                    tick.HasBonusPoints = currentSpins > spinsRequired;
                     tick.TriggerResult(true);
-                }
 
-                if (tick.HasBonusPoints)
+                if (tick is DrawableSpinnerBonusTick)
                 {
                     bonusCounter.Text = $"{1000 * (currentSpins - spinsRequired)}";
                     bonusCounter.FadeOutFromOne(1500);
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 4c21d9cfde..1c30058d5d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -3,13 +3,11 @@
 
 using System;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.Scoring;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
@@ -28,6 +26,8 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public int SpinsRequired { get; protected set; } = 1;
 
+        public int MaximumBonusSpins => SpinsRequired;
+
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
@@ -42,9 +42,16 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.CreateNestedHitObjects();
 
-            var maximumSpins = OsuAutoGeneratorBase.SPIN_RADIUS * (Duration / 1000) / MathHelper.TwoPi;
-            for (int i = 0; i < maximumSpins; i++)
-                AddNested(new SpinnerTick());
+            int totalSpins = MaximumBonusSpins + SpinsRequired;
+
+            for (int i = 0; i < totalSpins; i++)
+            {
+                double startTime = StartTime + (float)(i + 1) / totalSpins * Duration;
+
+                AddNested(i < SpinsRequired
+                    ? new SpinnerTick { StartTime = startTime }
+                    : new SpinnerBonusTick { StartTime = startTime });
+            }
         }
 
         public override Judgement CreateJudgement() => new OsuJudgement();
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
new file mode 100644
index 0000000000..84eb58c70b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.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.Audio;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Objects
+{
+    public class SpinnerBonusTick : SpinnerTick
+    {
+        public SpinnerBonusTick()
+        {
+            Samples.Add(new HitSampleInfo { Name = "spinnerbonus" });
+        }
+
+        public override Judgement CreateJudgement() => new OsuSpinnerBonusTickJudgement();
+
+        public class OsuSpinnerBonusTickJudgement : OsuSpinnerTickJudgement
+        {
+            protected override int NumericResultFor(HitResult result) => 1100;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
index 318e8e71a2..89ad45b267 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.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.Audio;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
@@ -10,13 +9,17 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SpinnerTick : OsuHitObject
     {
-        public SpinnerTick()
-        {
-            Samples.Add(new HitSampleInfo { Name = "spinnerbonus" });
-        }
-
         public override Judgement CreateJudgement() => new OsuSpinnerTickJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        public class OsuSpinnerTickJudgement : OsuJudgement
+        {
+            public override bool AffectsCombo => false;
+
+            protected override int NumericResultFor(HitResult result) => 100;
+
+            protected override double HealthIncreaseFor(HitResult result) => 0;
+        }
     }
 }

From 947f4e0d4c5aac6609ef6cfdf5488256402c6376 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jul 2020 19:03:17 +0900
Subject: [PATCH 03853/10326] Move tick handling to DrawableSpinner itself

---
 .../Objects/Drawables/DrawableSpinner.cs      | 42 ++++++++-
 .../Objects/Drawables/DrawableSpinnerTick.cs  |  7 +-
 .../Drawables/Pieces/SpinnerBonusComponent.cs | 87 -------------------
 .../Drawables/Pieces/SpinnerBonusDisplay.cs   | 44 ++++++++++
 4 files changed, 86 insertions(+), 94 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 531d16d1d1..df6eb206da 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public readonly SpinnerDisc Disc;
         public readonly SpinnerTicks Ticks;
         public readonly SpinnerSpmCounter SpmCounter;
-        private readonly SpinnerBonusComponent bonusComponent;
+        private readonly SpinnerBonusDisplay bonusDisplay;
 
         private readonly Container mainContainer;
 
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Y = 120,
                     Alpha = 0
                 },
-                bonusComponent = new SpinnerBonusComponent(this, ticks)
+                bonusDisplay = new SpinnerBonusDisplay
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -199,6 +199,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || Time.Current < Spinner.EndTime)
                 return;
 
+            // Trigger a miss result for remaining ticks to avoid infinite gameplay.
+            foreach (var tick in ticks.Where(t => !t.IsHit))
+                tick.TriggerResult(HitResult.Miss);
+
             ApplyResult(r =>
             {
                 if (Progress >= 1)
@@ -230,7 +234,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Ticks.Rotation = Disc.Rotation;
 
             SpmCounter.SetRotation(Disc.CumulativeRotation);
-            bonusComponent.SetRotation(Disc.CumulativeRotation);
+
+            updateBonusScore();
 
             float relativeCircleScale = Spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight;
             float targetScale = relativeCircleScale + (1 - relativeCircleScale) * Progress;
@@ -239,6 +244,37 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, Disc.Rotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
         }
 
+        private int wholeSpins;
+
+        private void updateBonusScore()
+        {
+            if (ticks.Count == 0)
+                return;
+
+            int spins = (int)(Disc.CumulativeRotation / 360);
+
+            while (wholeSpins != spins)
+            {
+                if (wholeSpins < spins)
+                {
+                    var tick = ticks.FirstOrDefault(t => !t.IsHit);
+
+                    if (tick != null)
+                    {
+                        tick.TriggerResult(HitResult.Great);
+                        if (tick is DrawableSpinnerBonusTick)
+                            bonusDisplay.SetBonusCount(spins - Spinner.SpinsRequired);
+                    }
+
+                    wholeSpins++;
+                }
+                else
+                {
+                    wholeSpins--;
+                }
+            }
+        }
+
         protected override void UpdateInitialTransforms()
         {
             base.UpdateInitialTransforms();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 5fb7653f5a..6c9570c381 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -17,11 +17,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// Apply a judgement result.
         /// </summary>
-        /// <param name="hit">Whether to apply a <see cref="HitResult.Great"/> result, <see cref="HitResult.Miss"/> otherwise.</param>
-        internal void TriggerResult(bool hit)
+        /// <param name="result">Whether to apply a <see cref="HitResult.Great"/> result, <see cref="HitResult.Miss"/> otherwise.</param>
+        internal void TriggerResult(HitResult result)
         {
-            HitObject.StartTime = Time.Current;
-            ApplyResult(r => r.Type = hit ? HitResult.Great : HitResult.Miss);
+            ApplyResult(r => r.Type = result);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs
deleted file mode 100644
index 9a65247453..0000000000
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusComponent.cs
+++ /dev/null
@@ -1,87 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects.Drawables;
-
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
-{
-    /// <summary>
-    /// A component that tracks spinner spins and add bonus score for it.
-    /// </summary>
-    public class SpinnerBonusComponent : CompositeDrawable
-    {
-        private readonly DrawableSpinner drawableSpinner;
-        private readonly Container<DrawableSpinnerTick> ticks;
-        private readonly OsuSpriteText bonusCounter;
-
-        public SpinnerBonusComponent(DrawableSpinner drawableSpinner, Container<DrawableSpinnerTick> ticks)
-        {
-            this.drawableSpinner = drawableSpinner;
-            this.ticks = ticks;
-
-            drawableSpinner.OnNewResult += onNewResult;
-
-            AutoSizeAxes = Axes.Both;
-            InternalChild = bonusCounter = new OsuSpriteText
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Font = OsuFont.Numeric.With(size: 24),
-                Alpha = 0,
-            };
-        }
-
-        private int currentSpins;
-
-        public void SetRotation(double rotation)
-        {
-            if (ticks.Count == 0)
-                return;
-
-            int spinsRequired = ((Spinner)drawableSpinner.HitObject).SpinsRequired;
-
-            int newSpins = Math.Clamp((int)(rotation / 360), 0, ticks.Count - 1);
-            int direction = Math.Sign(newSpins - currentSpins);
-
-            while (currentSpins != newSpins)
-            {
-                var tick = ticks[currentSpins];
-
-                if (direction >= 0)
-                    tick.TriggerResult(true);
-
-                if (tick is DrawableSpinnerBonusTick)
-                {
-                    bonusCounter.Text = $"{1000 * (currentSpins - spinsRequired)}";
-                    bonusCounter.FadeOutFromOne(1500);
-                    bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
-                }
-
-                currentSpins += direction;
-            }
-        }
-
-        private void onNewResult(DrawableHitObject hitObject, JudgementResult result)
-        {
-            if (!result.HasResult || hitObject != drawableSpinner)
-                return;
-
-            // Trigger a miss result for remaining ticks to avoid infinite gameplay.
-            foreach (var tick in ticks.Where(t => !t.IsHit))
-                tick.TriggerResult(false);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            drawableSpinner.OnNewResult -= onNewResult;
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
new file mode 100644
index 0000000000..76d7f1843e
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.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.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+{
+    /// <summary>
+    /// A component that tracks spinner spins and add bonus score for it.
+    /// </summary>
+    public class SpinnerBonusDisplay : CompositeDrawable
+    {
+        private readonly OsuSpriteText bonusCounter;
+
+        public SpinnerBonusDisplay()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = bonusCounter = new OsuSpriteText
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Font = OsuFont.Numeric.With(size: 24),
+                Alpha = 0,
+            };
+        }
+
+        private int displayedCount;
+
+        public void SetBonusCount(int count)
+        {
+            if (displayedCount == count)
+                return;
+
+            displayedCount = count;
+            bonusCounter.Text = $"{1000 * count}";
+            bonusCounter.FadeOutFromOne(1500);
+            bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+        }
+    }
+}

From 7f2ae694cc96e41175932d16353fa3e1c0a3e9ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jul 2020 19:21:30 +0900
Subject: [PATCH 03854/10326] Simplify rewind handling

---
 .../Objects/Drawables/DrawableSpinner.cs      | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index df6eb206da..a8ecb60038 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -253,25 +253,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             int spins = (int)(Disc.CumulativeRotation / 360);
 
+            if (spins < wholeSpins)
+            {
+                // rewinding, silently handle
+                wholeSpins = spins;
+                return;
+            }
+
             while (wholeSpins != spins)
             {
-                if (wholeSpins < spins)
-                {
-                    var tick = ticks.FirstOrDefault(t => !t.IsHit);
+                var tick = ticks.FirstOrDefault(t => !t.IsHit);
 
-                    if (tick != null)
-                    {
-                        tick.TriggerResult(HitResult.Great);
-                        if (tick is DrawableSpinnerBonusTick)
-                            bonusDisplay.SetBonusCount(spins - Spinner.SpinsRequired);
-                    }
-
-                    wholeSpins++;
-                }
-                else
+                // tick may be null if we've hit the spin limit.
+                if (tick != null)
                 {
-                    wholeSpins--;
+                    tick.TriggerResult(HitResult.Great);
+                    if (tick is DrawableSpinnerBonusTick)
+                        bonusDisplay.SetBonusCount(spins - Spinner.SpinsRequired);
                 }
+
+                wholeSpins++;
             }
         }
 

From a4680d7a8945ded3804b0a0b84500a0a47241e44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jul 2020 19:22:42 +0900
Subject: [PATCH 03855/10326] Reduce test range as to not hit spin cat

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 0f1cbcd44c..6e277ff37e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -164,13 +164,13 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             double estimatedSpm = 0;
 
-            addSeekStep(2500);
+            addSeekStep(1000);
             AddStep("retrieve spm", () => estimatedSpm = drawableSpinner.SpmCounter.SpinsPerMinute);
 
-            addSeekStep(5000);
+            addSeekStep(2000);
             AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpmCounter.SpinsPerMinute, estimatedSpm, 1.0));
 
-            addSeekStep(2500);
+            addSeekStep(1000);
             AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpmCounter.SpinsPerMinute, estimatedSpm, 1.0));
         }
 

From 1560e1786a09475d4537bfc02b881d8bb2f422f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jul 2020 19:48:44 +0900
Subject: [PATCH 03856/10326] Revert back to bool for application

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 4 ++--
 .../Objects/Drawables/DrawableSpinnerTick.cs               | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index a8ecb60038..ecf78efdd9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -201,7 +201,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             // Trigger a miss result for remaining ticks to avoid infinite gameplay.
             foreach (var tick in ticks.Where(t => !t.IsHit))
-                tick.TriggerResult(HitResult.Miss);
+                tick.TriggerResult(false);
 
             ApplyResult(r =>
             {
@@ -267,7 +267,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 // tick may be null if we've hit the spin limit.
                 if (tick != null)
                 {
-                    tick.TriggerResult(HitResult.Great);
+                    tick.TriggerResult(true);
                     if (tick is DrawableSpinnerBonusTick)
                         bonusDisplay.SetBonusCount(spins - Spinner.SpinsRequired);
                 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 6c9570c381..c390b673be 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -17,10 +17,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// Apply a judgement result.
         /// </summary>
-        /// <param name="result">Whether to apply a <see cref="HitResult.Great"/> result, <see cref="HitResult.Miss"/> otherwise.</param>
-        internal void TriggerResult(HitResult result)
-        {
-            ApplyResult(r => r.Type = result);
-        }
+        /// <param name="hit">Whether this tick was reached.</param>
+        internal void TriggerResult(bool hit) => ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : HitResult.Miss);
     }
 }

From bc079fccf52d5d338609ca87249208a899343958 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jul 2020 19:52:16 +0900
Subject: [PATCH 03857/10326] Add health drain for spinner ticks

---
 osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs | 2 ++
 osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
index 84eb58c70b..6ca2d4d72d 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Rulesets.Osu.Objects
         public class OsuSpinnerBonusTickJudgement : OsuSpinnerTickJudgement
         {
             protected override int NumericResultFor(HitResult result) => 1100;
+
+            protected override double HealthIncreaseFor(HitResult result) => base.HealthIncreaseFor(result) * 2;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
index 89ad45b267..c81348fbbf 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             protected override int NumericResultFor(HitResult result) => 100;
 
-            protected override double HealthIncreaseFor(HitResult result) => 0;
+            protected override double HealthIncreaseFor(HitResult result) => result == MaxResult ? 0.6 * base.HealthIncreaseFor(result) : 0;
         }
     }
 }

From 107b5ca4f2ab5ca29356aad95a852cb28aa4e856 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Jul 2020 23:13:04 +0900
Subject: [PATCH 03858/10326] Add support for bindable retrieval

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 186 ++++++++++++++++--
 osu.Game/OsuGameBase.cs                       |   5 +-
 .../Carousel/DrawableCarouselBeatmap.cs       |  59 ++----
 .../Screens/Select/Details/AdvancedStats.cs   |  25 ++-
 4 files changed, 208 insertions(+), 67 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 02342e9595..379cb6aa63 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -9,7 +9,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Lists;
 using osu.Framework.Threading;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -21,32 +23,154 @@ namespace osu.Game.Beatmaps
         // Too many simultaneous updates can lead to stutters. One thread seems to work fine for song select display purposes.
         private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(1, nameof(BeatmapDifficultyManager));
 
-        private readonly TimedExpiryCache<DifficultyCacheLookup, double> difficultyCache = new TimedExpiryCache<DifficultyCacheLookup, double> { ExpiryTime = 60000 };
-        private readonly BeatmapManager beatmapManager;
+        // A cache that keeps references to BeatmapInfos for 60sec.
+        private readonly TimedExpiryCache<DifficultyCacheLookup, StarDifficulty> difficultyCache = new TimedExpiryCache<DifficultyCacheLookup, StarDifficulty> { ExpiryTime = 60000 };
 
-        public BeatmapDifficultyManager(BeatmapManager beatmapManager)
+        // All bindables that should be updated along with the current ruleset + mods.
+        private readonly LockedWeakList<BindableStarDifficulty> trackedBindables = new LockedWeakList<BindableStarDifficulty>();
+
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
+        [Resolved]
+        private Bindable<RulesetInfo> currentRuleset { get; set; }
+
+        [Resolved]
+        private Bindable<IReadOnlyList<Mod>> currentMods { get; set; }
+
+        protected override void LoadComplete()
         {
-            this.beatmapManager = beatmapManager;
+            base.LoadComplete();
+
+            currentRuleset.BindValueChanged(_ => updateTrackedBindables());
+            currentMods.BindValueChanged(_ => updateTrackedBindables(), true);
         }
 
-        public async Task<double> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null,
-                                                     CancellationToken cancellationToken = default)
+        /// <summary>
+        /// Retrieves an <see cref="IBindable{StarDifficulty}"/> containing the star difficulty of a <see cref="BeatmapInfo"/> with a given <see cref="RulesetInfo"/> and <see cref="Mod"/> combination.
+        /// </summary>
+        /// <remarks>
+        /// This <see cref="Bindable{StarDifficulty}"/> will not update to follow the currently-selected ruleset and mods.
+        /// </remarks>
+        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
+        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with.</param>
+        /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
+        /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
+        /// <returns>An <see cref="IBindable{StarDifficulty}"/> that is updated to contain the star difficulty when it becomes available.</returns>
+        public IBindable<StarDifficulty> GetUntrackedBindable([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null,
+                                                              CancellationToken cancellationToken = default)
+            => createBindable(beatmapInfo, rulesetInfo, mods, cancellationToken);
+
+        /// <summary>
+        /// Retrieves a <see cref="IBindable{StarDifficulty}"/> containing the star difficulty of a <see cref="BeatmapInfo"/> that follows the user's currently-selected ruleset and mods.
+        /// </summary>
+        /// <remarks>
+        /// Ensure to hold a local reference of the returned <see cref="Bindable{StarDifficulty}"/> in order to receive value-changed events.
+        /// </remarks>
+        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
+        /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
+        /// <returns>An <see cref="IBindable{StarDifficulty}"/> that is updated to contain the star difficulty when it becomes available, or when the currently-selected ruleset and mods change.</returns>
+        public IBindable<StarDifficulty> GetTrackedBindable([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
+        {
+            var bindable = createBindable(beatmapInfo, currentRuleset.Value, currentMods.Value, cancellationToken);
+            trackedBindables.Add(bindable);
+            return bindable;
+        }
+
+        /// <summary>
+        /// Retrieves the difficulty of a <see cref="BeatmapInfo"/>.
+        /// </summary>
+        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
+        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with.</param>
+        /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
+        /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops computing the star difficulty.</param>
+        /// <returns>The <see cref="StarDifficulty"/>.</returns>
+        public async Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null,
+                                                             CancellationToken cancellationToken = default)
         {
             if (tryGetGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
                 return existing;
 
-            return await Task.Factory.StartNew(() => getDifficulty(key), cancellationToken, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
+            return await Task.Factory.StartNew(() => computeDifficulty(key), cancellationToken, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
         }
 
-        public double GetDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null)
+        /// <summary>
+        /// Retrieves the difficulty of a <see cref="BeatmapInfo"/>.
+        /// </summary>
+        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
+        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with.</param>
+        /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
+        /// <returns>The <see cref="StarDifficulty"/>.</returns>
+        public StarDifficulty GetDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null)
         {
             if (tryGetGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
                 return existing;
 
-            return getDifficulty(key);
+            return computeDifficulty(key);
         }
 
-        private double getDifficulty(in DifficultyCacheLookup key)
+        private CancellationTokenSource trackedUpdateCancellationSource;
+
+        /// <summary>
+        /// Updates all tracked <see cref="BindableStarDifficulty"/> using the current ruleset and mods.
+        /// </summary>
+        private void updateTrackedBindables()
+        {
+            trackedUpdateCancellationSource?.Cancel();
+            trackedUpdateCancellationSource = new CancellationTokenSource();
+
+            foreach (var b in trackedBindables)
+            {
+                if (trackedUpdateCancellationSource.IsCancellationRequested)
+                    break;
+
+                using (var linkedSource = CancellationTokenSource.CreateLinkedTokenSource(trackedUpdateCancellationSource.Token, b.CancellationToken))
+                    updateBindable(b, currentRuleset.Value, currentMods.Value, linkedSource.Token);
+            }
+        }
+
+        /// <summary>
+        /// Updates the value of a <see cref="BindableStarDifficulty"/> with a given ruleset + mods.
+        /// </summary>
+        /// <param name="bindable">The <see cref="BindableStarDifficulty"/> to update.</param>
+        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to update with.</param>
+        /// <param name="mods">The <see cref="Mod"/>s to update with.</param>
+        /// <param name="cancellationToken">A token that may be used to cancel this update.</param>
+        private void updateBindable([NotNull] BindableStarDifficulty bindable, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IReadOnlyList<Mod> mods, CancellationToken cancellationToken = default)
+        {
+            GetDifficultyAsync(bindable.Beatmap, rulesetInfo, mods, cancellationToken).ContinueWith(t =>
+            {
+                // We're on a threadpool thread, but we should exit back to the update thread so consumers can safely handle value-changed events.
+                Schedule(() =>
+                {
+                    if (!cancellationToken.IsCancellationRequested)
+                        bindable.Value = t.Result;
+                });
+            }, cancellationToken);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="BindableStarDifficulty"/> and triggers an initial value update.
+        /// </summary>
+        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> that star difficulty should correspond to.</param>
+        /// <param name="initialRulesetInfo">The initial <see cref="RulesetInfo"/> to get the difficulty with.</param>
+        /// <param name="initialMods">The initial <see cref="Mod"/>s to get the difficulty with.</param>
+        /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
+        /// <returns>The <see cref="BindableStarDifficulty"/>.</returns>
+        private BindableStarDifficulty createBindable([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo initialRulesetInfo, [CanBeNull] IReadOnlyList<Mod> initialMods,
+                                                      CancellationToken cancellationToken)
+        {
+            var bindable = new BindableStarDifficulty(beatmapInfo, cancellationToken);
+            updateBindable(bindable, initialRulesetInfo, initialMods, cancellationToken);
+            return bindable;
+        }
+
+        /// <summary>
+        /// Computes the difficulty defined by a <see cref="DifficultyCacheLookup"/> key, and stores it to the timed cache.
+        /// </summary>
+        /// <param name="key">The <see cref="DifficultyCacheLookup"/> that defines the computation parameters.</param>
+        /// <returns>The <see cref="StarDifficulty"/>.</returns>
+        private StarDifficulty computeDifficulty(in DifficultyCacheLookup key)
         {
             try
             {
@@ -56,13 +180,17 @@ namespace osu.Game.Beatmaps
                 var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(key.BeatmapInfo));
                 var attributes = calculator.Calculate(key.Mods);
 
-                difficultyCache.Add(key, attributes.StarRating);
-                return attributes.StarRating;
+                var difficulty = new StarDifficulty(attributes.StarRating);
+                difficultyCache.Add(key, difficulty);
+
+                return difficulty;
             }
             catch
             {
-                difficultyCache.Add(key, 0);
-                return 0;
+                var difficulty = new StarDifficulty(0);
+                difficultyCache.Add(key, difficulty);
+
+                return difficulty;
             }
         }
 
@@ -73,9 +201,9 @@ namespace osu.Game.Beatmaps
         /// <param name="rulesetInfo">The <see cref="RulesetInfo"/>.</param>
         /// <param name="mods">The <see cref="Mod"/>s.</param>
         /// <param name="existingDifficulty">The existing difficulty value, if present.</param>
-        /// <param name="key">The <see cref="DifficultyCacheLookup"/> key that was used to perform this lookup. This can be further used to query <see cref="getDifficulty"/>.</param>
+        /// <param name="key">The <see cref="DifficultyCacheLookup"/> key that was used to perform this lookup. This can be further used to query <see cref="computeDifficulty"/>.</param>
         /// <returns>Whether an existing difficulty was found.</returns>
-        private bool tryGetGetExisting(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo, IReadOnlyList<Mod> mods, out double existingDifficulty, out DifficultyCacheLookup key)
+        private bool tryGetGetExisting(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo, IReadOnlyList<Mod> mods, out StarDifficulty existingDifficulty, out DifficultyCacheLookup key)
         {
             // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
             rulesetInfo ??= beatmapInfo.Ruleset;
@@ -83,7 +211,7 @@ namespace osu.Game.Beatmaps
             // Difficulty can only be computed if the beatmap is locally available.
             if (beatmapInfo.ID == 0)
             {
-                existingDifficulty = 0;
+                existingDifficulty = new StarDifficulty(0);
                 key = default;
 
                 return true;
@@ -122,5 +250,29 @@ namespace osu.Game.Beatmaps
                 return hashCode.ToHashCode();
             }
         }
+
+        private class BindableStarDifficulty : Bindable<StarDifficulty>
+        {
+            public readonly BeatmapInfo Beatmap;
+            public readonly CancellationToken CancellationToken;
+
+            public BindableStarDifficulty(BeatmapInfo beatmap, CancellationToken cancellationToken)
+            {
+                Beatmap = beatmap;
+                CancellationToken = cancellationToken;
+            }
+        }
+    }
+
+    public readonly struct StarDifficulty
+    {
+        public readonly double Stars;
+
+        public StarDifficulty(double stars)
+        {
+            Stars = stars;
+
+            // Todo: Add more members (BeatmapInfo.DifficultyRating? Attributes? Etc...)
+        }
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 1e6631ffa0..fe5c0704b7 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -199,7 +199,10 @@ namespace osu.Game
                     ScoreManager.Undelete(getBeatmapScores(item), true);
             });
 
-            dependencies.Cache(new BeatmapDifficultyManager(BeatmapManager));
+            var difficultyManager = new BeatmapDifficultyManager();
+            dependencies.Cache(difficultyManager);
+            AddInternal(difficultyManager);
+
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
             dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore));
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index d4205a4b93..d5aeecae04 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -15,7 +15,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
-using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
@@ -23,8 +22,6 @@ using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
 
@@ -46,15 +43,12 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved(CanBeNull = true)]
         private BeatmapSetOverlay beatmapOverlay { get; set; }
 
-        [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
-
-        [Resolved]
-        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
-
         [Resolved]
         private BeatmapDifficultyManager difficultyManager { get; set; }
 
+        private IBindable<StarDifficulty> starDifficultyBindable;
+        private CancellationTokenSource starDifficultyCancellationSource;
+
         public DrawableCarouselBeatmap(CarouselBeatmap panel)
             : base(panel)
         {
@@ -160,36 +154,6 @@ namespace osu.Game.Screens.Select.Carousel
                     }
                 }
             };
-
-            ruleset.BindValueChanged(_ => refreshStarCounter());
-            mods.BindValueChanged(_ => refreshStarCounter(), true);
-        }
-
-        private ScheduledDelegate scheduledRefresh;
-        private CancellationTokenSource cancellationSource;
-
-        private void refreshStarCounter()
-        {
-            scheduledRefresh?.Cancel();
-            scheduledRefresh = null;
-
-            cancellationSource?.Cancel();
-            cancellationSource = null;
-
-            // Only want to run the calculation when we become visible.
-            scheduledRefresh = Schedule(() =>
-            {
-                var ourSource = cancellationSource = new CancellationTokenSource();
-                difficultyManager.GetDifficultyAsync(beatmap, ruleset.Value, mods.Value, ourSource.Token).ContinueWith(t =>
-                {
-                    // We're currently on a random threadpool thread which we must exit.
-                    Schedule(() =>
-                    {
-                        if (!ourSource.IsCancellationRequested)
-                            starCounter.Current = (float)t.Result;
-                    });
-                }, ourSource.Token);
-            });
         }
 
         protected override void Selected()
@@ -224,6 +188,17 @@ namespace osu.Game.Screens.Select.Carousel
             if (Item.State.Value != CarouselItemState.Collapsed && Alpha == 0)
                 starCounter.ReplayAnimation();
 
+            if (Item.State.Value == CarouselItemState.Collapsed)
+                starDifficultyCancellationSource?.Cancel();
+            else
+            {
+                starDifficultyCancellationSource?.Cancel();
+
+                // We've potentially cancelled the computation above so a new bindable is required.
+                starDifficultyBindable = difficultyManager.GetTrackedBindable(beatmap, (starDifficultyCancellationSource = new CancellationTokenSource()).Token);
+                starDifficultyBindable.BindValueChanged(d => starCounter.Current = (float)d.NewValue.Stars, true);
+            }
+
             base.ApplyState();
         }
 
@@ -248,5 +223,11 @@ namespace osu.Game.Screens.Select.Carousel
                 return items.ToArray();
             }
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            starDifficultyCancellationSource?.Cancel();
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index c5fc3701f8..aefba397b9 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -15,7 +15,6 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Mods;
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
@@ -149,6 +148,8 @@ namespace osu.Game.Screens.Select.Details
             updateStarDifficulty();
         }
 
+        private IBindable<StarDifficulty> normalStarDifficulty;
+        private IBindable<StarDifficulty> moddedStarDifficulty;
         private CancellationTokenSource starDifficultyCancellationSource;
 
         private void updateStarDifficulty()
@@ -160,15 +161,19 @@ namespace osu.Game.Screens.Select.Details
 
             var ourSource = starDifficultyCancellationSource = new CancellationTokenSource();
 
-            Task.WhenAll(difficultyManager.GetDifficultyAsync(Beatmap, ruleset.Value, cancellationToken: ourSource.Token),
-                difficultyManager.GetDifficultyAsync(Beatmap, ruleset.Value, mods.Value, ourSource.Token)).ContinueWith(t =>
-            {
-                Schedule(() =>
-                {
-                    if (!ourSource.IsCancellationRequested)
-                        starDifficulty.Value = ((float)t.Result[0], (float)t.Result[1]);
-                });
-            }, ourSource.Token);
+            normalStarDifficulty = difficultyManager.GetUntrackedBindable(Beatmap, ruleset.Value, cancellationToken: ourSource.Token);
+            moddedStarDifficulty = difficultyManager.GetUntrackedBindable(Beatmap, ruleset.Value, mods.Value, ourSource.Token);
+
+            normalStarDifficulty.BindValueChanged(_ => updateDisplay());
+            moddedStarDifficulty.BindValueChanged(_ => updateDisplay(), true);
+
+            void updateDisplay() => starDifficulty.Value = ((float)normalStarDifficulty.Value.Stars, (float)moddedStarDifficulty.Value.Stars);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            starDifficultyCancellationSource?.Cancel();
         }
 
         public class StatisticRow : Container, IHasAccentColour

From 00e6217f60c9d1981e1eb16e1b21b39a70b844a9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Jul 2020 23:50:54 +0900
Subject: [PATCH 03859/10326] Don't store BeatmapInfo/RulesetInfo references,
 remove TimedExpiryCache

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 379cb6aa63..b469ca78fb 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -24,7 +25,7 @@ namespace osu.Game.Beatmaps
         private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(1, nameof(BeatmapDifficultyManager));
 
         // A cache that keeps references to BeatmapInfos for 60sec.
-        private readonly TimedExpiryCache<DifficultyCacheLookup, StarDifficulty> difficultyCache = new TimedExpiryCache<DifficultyCacheLookup, StarDifficulty> { ExpiryTime = 60000 };
+        private readonly ConcurrentDictionary<DifficultyCacheLookup, StarDifficulty> difficultyCache = new ConcurrentDictionary<DifficultyCacheLookup, StarDifficulty>();
 
         // All bindables that should be updated along with the current ruleset + mods.
         private readonly LockedWeakList<BindableStarDifficulty> trackedBindables = new LockedWeakList<BindableStarDifficulty>();
@@ -91,7 +92,8 @@ namespace osu.Game.Beatmaps
             if (tryGetGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
                 return existing;
 
-            return await Task.Factory.StartNew(() => computeDifficulty(key), cancellationToken, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
+            return await Task.Factory.StartNew(() => computeDifficulty(key, beatmapInfo, rulesetInfo), cancellationToken,
+                TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
         }
 
         /// <summary>
@@ -106,7 +108,7 @@ namespace osu.Game.Beatmaps
             if (tryGetGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
                 return existing;
 
-            return computeDifficulty(key);
+            return computeDifficulty(key, beatmapInfo, rulesetInfo);
         }
 
         private CancellationTokenSource trackedUpdateCancellationSource;
@@ -169,28 +171,24 @@ namespace osu.Game.Beatmaps
         /// Computes the difficulty defined by a <see cref="DifficultyCacheLookup"/> key, and stores it to the timed cache.
         /// </summary>
         /// <param name="key">The <see cref="DifficultyCacheLookup"/> that defines the computation parameters.</param>
+        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to compute the difficulty of.</param>
+        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to compute the difficulty with.</param>
         /// <returns>The <see cref="StarDifficulty"/>.</returns>
-        private StarDifficulty computeDifficulty(in DifficultyCacheLookup key)
+        private StarDifficulty computeDifficulty(in DifficultyCacheLookup key, BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo)
         {
             try
             {
-                var ruleset = key.RulesetInfo.CreateInstance();
+                var ruleset = rulesetInfo.CreateInstance();
                 Debug.Assert(ruleset != null);
 
-                var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(key.BeatmapInfo));
+                var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(beatmapInfo));
                 var attributes = calculator.Calculate(key.Mods);
 
-                var difficulty = new StarDifficulty(attributes.StarRating);
-                difficultyCache.Add(key, difficulty);
-
-                return difficulty;
+                return difficultyCache[key] = new StarDifficulty(attributes.StarRating);
             }
             catch
             {
-                var difficulty = new StarDifficulty(0);
-                difficultyCache.Add(key, difficulty);
-
-                return difficulty;
+                return difficultyCache[key] = new StarDifficulty(0);
             }
         }
 
@@ -208,8 +206,8 @@ namespace osu.Game.Beatmaps
             // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
             rulesetInfo ??= beatmapInfo.Ruleset;
 
-            // Difficulty can only be computed if the beatmap is locally available.
-            if (beatmapInfo.ID == 0)
+            // Difficulty can only be computed if the beatmap and ruleset are locally available.
+            if (beatmapInfo.ID == 0 || rulesetInfo.ID == null)
             {
                 existingDifficulty = new StarDifficulty(0);
                 key = default;
@@ -217,33 +215,34 @@ namespace osu.Game.Beatmaps
                 return true;
             }
 
-            key = new DifficultyCacheLookup(beatmapInfo, rulesetInfo, mods);
+            key = new DifficultyCacheLookup(beatmapInfo.ID, rulesetInfo.ID.Value, mods);
             return difficultyCache.TryGetValue(key, out existingDifficulty);
         }
 
         private readonly struct DifficultyCacheLookup : IEquatable<DifficultyCacheLookup>
         {
-            public readonly BeatmapInfo BeatmapInfo;
-            public readonly RulesetInfo RulesetInfo;
+            public readonly int BeatmapId;
+            public readonly int RulesetId;
             public readonly Mod[] Mods;
 
-            public DifficultyCacheLookup(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo, IEnumerable<Mod> mods)
+            public DifficultyCacheLookup(int beatmapId, int rulesetId, IEnumerable<Mod> mods)
             {
-                BeatmapInfo = beatmapInfo;
-                RulesetInfo = rulesetInfo;
+                BeatmapId = beatmapId;
+                RulesetId = rulesetId;
                 Mods = mods?.OrderBy(m => m.Acronym).ToArray() ?? Array.Empty<Mod>();
             }
 
             public bool Equals(DifficultyCacheLookup other)
-                => BeatmapInfo.Equals(other.BeatmapInfo)
+                => BeatmapId == other.BeatmapId
+                   && RulesetId == other.RulesetId
                    && Mods.SequenceEqual(other.Mods);
 
             public override int GetHashCode()
             {
                 var hashCode = new HashCode();
 
-                hashCode.Add(BeatmapInfo.Hash);
-                hashCode.Add(RulesetInfo.GetHashCode());
+                hashCode.Add(BeatmapId);
+                hashCode.Add(RulesetId);
                 foreach (var mod in Mods)
                     hashCode.Add(mod.Acronym);
 

From e96f8f1cb652e4d312758b20414f74c01d144ca0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 21 Jul 2020 20:02:22 +0300
Subject: [PATCH 03860/10326] Make content side padding adjustable for
 OverlayHeader

---
 .../UserInterface/TestSceneOverlayHeader.cs   | 20 +++++++++++---
 osu.Game/Overlays/OverlayHeader.cs            | 27 ++++++++++++++-----
 osu.Game/Overlays/TabControlOverlayHeader.cs  | 24 ++++++++++++++---
 3 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index 60af5b37ef..01c13dbc97 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -36,11 +36,11 @@ namespace osu.Game.Tests.Visual.UserInterface
                 }
             });
 
-            addHeader("Orange OverlayHeader (no background)", new TestNoBackgroundHeader(), OverlayColourScheme.Orange);
-            addHeader("Blue OverlayHeader", new TestNoControlHeader(), OverlayColourScheme.Blue);
+            addHeader("Orange OverlayHeader (no background, 100 padding)", new TestNoBackgroundHeader(), OverlayColourScheme.Orange);
+            addHeader("Blue OverlayHeader (default 70 padding)", new TestNoControlHeader(), OverlayColourScheme.Blue);
             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);
+            addHeader("Pink TabControlOverlayHeader (enum, 30 padding)", new TestEnumTabControlHeader(), OverlayColourScheme.Pink);
+            addHeader("Red BreadcrumbControlOverlayHeader (no background, 10 padding)", new TestBreadcrumbControlHeader(), OverlayColourScheme.Red);
         }
 
         private void addHeader(string name, OverlayHeader header, OverlayColourScheme colourScheme)
@@ -86,6 +86,11 @@ namespace osu.Game.Tests.Visual.UserInterface
         private class TestNoBackgroundHeader : OverlayHeader
         {
             protected override OverlayTitle CreateTitle() => new TestTitle();
+
+            public TestNoBackgroundHeader()
+            {
+                ContentSidePadding = 100;
+            }
         }
 
         private class TestNoControlHeader : OverlayHeader
@@ -112,6 +117,11 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestEnumTabControlHeader : TabControlOverlayHeader<TestEnum>
         {
+            public TestEnumTabControlHeader()
+            {
+                ContentSidePadding = 30;
+            }
+
             protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/rankings");
 
             protected override OverlayTitle CreateTitle() => new TestTitle();
@@ -130,6 +140,8 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             public TestBreadcrumbControlHeader()
             {
+                ContentSidePadding = 10;
+
                 TabControl.AddItem("tab1");
                 TabControl.AddItem("tab2");
                 TabControl.Current.Value = "tab2";
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index dbc934bde9..c9b9e3b836 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -12,9 +12,26 @@ namespace osu.Game.Overlays
 {
     public abstract class OverlayHeader : Container
     {
-        public const int CONTENT_X_MARGIN = 50;
+        private float contentSidePadding;
+
+        /// <summary>
+        /// Horizontal padding of the header content.
+        /// </summary>
+        protected float ContentSidePadding
+        {
+            get => contentSidePadding;
+            set
+            {
+                contentSidePadding = value;
+                content.Padding = new MarginPadding
+                {
+                    Horizontal = value
+                };
+            }
+        }
 
         private readonly Box titleBackground;
+        private readonly Container content;
 
         protected readonly FillFlowContainer HeaderInfo;
 
@@ -50,14 +67,10 @@ namespace osu.Game.Overlays
                                         RelativeSizeAxes = Axes.Both,
                                         Colour = Color4.Gray,
                                     },
-                                    new Container
+                                    content = new Container
                                     {
                                         RelativeSizeAxes = Axes.X,
                                         AutoSizeAxes = Axes.Y,
-                                        Padding = new MarginPadding
-                                        {
-                                            Horizontal = CONTENT_X_MARGIN,
-                                        },
                                         Children = new[]
                                         {
                                             CreateTitle().With(title =>
@@ -79,6 +92,8 @@ namespace osu.Game.Overlays
                     CreateContent()
                 }
             });
+
+            ContentSidePadding = 70;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index e8e000f441..61605d9e9e 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Overlays
         protected OsuTabControl<T> TabControl;
 
         private readonly Box controlBackground;
+        private readonly Container tabControlContainer;
         private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();
 
         public Bindable<T> Current
@@ -30,6 +31,16 @@ namespace osu.Game.Overlays
             set => current.Current = value;
         }
 
+        protected new float ContentSidePadding
+        {
+            get => base.ContentSidePadding;
+            set
+            {
+                base.ContentSidePadding = value;
+                tabControlContainer.Padding = new MarginPadding { Horizontal = value };
+            }
+        }
+
         protected TabControlOverlayHeader()
         {
             HeaderInfo.Add(new Container
@@ -42,11 +53,16 @@ namespace osu.Game.Overlays
                     {
                         RelativeSizeAxes = Axes.Both,
                     },
-                    TabControl = CreateTabControl().With(control =>
+                    tabControlContainer = new Container
                     {
-                        control.Margin = new MarginPadding { Left = CONTENT_X_MARGIN };
-                        control.Current = Current;
-                    })
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding { Horizontal = ContentSidePadding },
+                        Child = TabControl = CreateTabControl().With(control =>
+                        {
+                            control.Current = Current;
+                        })
+                    }
                 }
             });
         }

From 0145ca09e5d8ebd98a85857c6fab121d7c112143 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 21 Jul 2020 20:11:10 +0300
Subject: [PATCH 03861/10326] Apply changes to overlays

---
 osu.Game/Overlays/OverlayHeader.cs         | 2 +-
 osu.Game/Overlays/Profile/ProfileHeader.cs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index c9b9e3b836..cc7f798c4a 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Overlays
                 }
             });
 
-            ContentSidePadding = 70;
+            ContentSidePadding = 50;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 0161d91daa..2895fa0726 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Overlays.Profile
 
         public ProfileHeader()
         {
+            ContentSidePadding = 70;
+
             User.ValueChanged += e => updateDisplay(e.NewValue);
 
             TabControl.AddItem("info");

From 0a71194ea69e07e516be8db5c9180d612459aec8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 21 Jul 2020 22:46:08 +0300
Subject: [PATCH 03862/10326] Fix SpotlightSelector is a VisibilityContainer
 without a reason

---
 .../TestSceneRankingsSpotlightSelector.cs     |   6 -
 .../Overlays/Rankings/SpotlightSelector.cs    | 104 ++++++++----------
 .../Overlays/Rankings/SpotlightsLayout.cs     |   2 -
 3 files changed, 45 insertions(+), 67 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
index 997db827f3..d60222fa0b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -30,12 +30,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/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index f112c1ec43..422373d099 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -18,10 +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 duration = 300;
-
         private readonly BindableWithCurrent<APISpotlight> current = new BindableWithCurrent<APISpotlight>();
         public readonly Bindable<RankingsSortCriteria> Sort = new Bindable<RankingsSortCriteria>();
 
@@ -37,10 +35,7 @@ namespace osu.Game.Overlays.Rankings
             set => dropdown.Items = value;
         }
 
-        protected override bool StartHidden => true;
-
         private readonly Box background;
-        private readonly Container content;
         private readonly SpotlightsDropdown dropdown;
         private readonly InfoColumn startDateColumn;
         private readonly InfoColumn endDateColumn;
@@ -51,73 +46,68 @@ namespace osu.Game.Overlays.Rankings
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            Add(content = new Container
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Children = new Drawable[]
+                background = new Box
                 {
-                    background = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new Container
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN },
+                    Child = new FillFlowContainer
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN },
-                        Child = new FillFlowContainer
+                        Direction = FillDirection.Vertical,
+                        Children = new Drawable[]
                         {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Vertical,
-                            Children = new Drawable[]
+                            new Container
                             {
-                                new Container
-                                {
-                                    Margin = new MarginPadding { Vertical = 20 },
-                                    RelativeSizeAxes = Axes.X,
-                                    Height = 40,
-                                    Depth = -float.MaxValue,
-                                    Child = dropdown = new SpotlightsDropdown
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        Current = Current
-                                    }
-                                },
-                                new Container
+                                Margin = new MarginPadding { Vertical = 20 },
+                                RelativeSizeAxes = Axes.X,
+                                Height = 40,
+                                Depth = -float.MaxValue,
+                                Child = dropdown = new SpotlightsDropdown
                                 {
                                     RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Children = new Drawable[]
+                                    Current = Current
+                                }
+                            },
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Children = new Drawable[]
+                                {
+                                    new FillFlowContainer
                                     {
-                                        new FillFlowContainer
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Horizontal,
+                                        Spacing = new Vector2(10, 0),
+                                        Margin = new MarginPadding { Bottom = 5 },
+                                        Children = new Drawable[]
                                         {
-                                            AutoSizeAxes = Axes.Both,
-                                            Direction = FillDirection.Horizontal,
-                                            Spacing = new Vector2(10, 0),
-                                            Margin = new MarginPadding { Bottom = 5 },
-                                            Children = new Drawable[]
-                                            {
-                                                startDateColumn = new InfoColumn(@"Start Date"),
-                                                endDateColumn = new InfoColumn(@"End Date"),
-                                                mapCountColumn = new InfoColumn(@"Map Count"),
-                                                participantsColumn = new InfoColumn(@"Participants")
-                                            }
-                                        },
-                                        new RankingsSortTabControl
-                                        {
-                                            Anchor = Anchor.CentreRight,
-                                            Origin = Anchor.CentreRight,
-                                            Current = Sort
+                                            startDateColumn = new InfoColumn(@"Start Date"),
+                                            endDateColumn = new InfoColumn(@"End Date"),
+                                            mapCountColumn = new InfoColumn(@"Map Count"),
+                                            participantsColumn = new InfoColumn(@"Participants")
                                         }
+                                    },
+                                    new RankingsSortTabControl
+                                    {
+                                        Anchor = Anchor.CentreRight,
+                                        Origin = Anchor.CentreRight,
+                                        Current = Sort
                                     }
                                 }
                             }
                         }
                     }
                 }
-            });
+            };
         }
 
         [BackgroundDependencyLoader]
@@ -134,10 +124,6 @@ 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 0f9b07bf89..61339df76f 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -81,8 +81,6 @@ namespace osu.Game.Overlays.Rankings
         {
             base.LoadComplete();
 
-            selector.Show();
-
             selectedSpotlight.BindValueChanged(_ => onSpotlightChanged());
             sort.BindValueChanged(_ => onSpotlightChanged());
             Ruleset.BindValueChanged(onRulesetChanged);

From ad9492804a645ea851f815b23878e4ab98211f6c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 21 Jul 2020 22:56:44 +0300
Subject: [PATCH 03863/10326] Apply suggestions

---
 osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs | 2 +-
 osu.Game/Overlays/Profile/ProfileHeader.cs                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index 01c13dbc97..2a76b8e265 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             addHeader("Orange OverlayHeader (no background, 100 padding)", new TestNoBackgroundHeader(), OverlayColourScheme.Orange);
-            addHeader("Blue OverlayHeader (default 70 padding)", new TestNoControlHeader(), OverlayColourScheme.Blue);
+            addHeader("Blue OverlayHeader (default 50 padding)", new TestNoControlHeader(), OverlayColourScheme.Blue);
             addHeader("Green TabControlOverlayHeader (string) with ruleset selector", new TestStringTabControlHeader(), OverlayColourScheme.Green);
             addHeader("Pink TabControlOverlayHeader (enum, 30 padding)", new TestEnumTabControlHeader(), OverlayColourScheme.Pink);
             addHeader("Red BreadcrumbControlOverlayHeader (no background, 10 padding)", new TestBreadcrumbControlHeader(), OverlayColourScheme.Red);
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 2895fa0726..2e5f1071f2 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Profile
 
         public ProfileHeader()
         {
-            ContentSidePadding = 70;
+            ContentSidePadding = UserProfileOverlay.CONTENT_X_MARGIN;
 
             User.ValueChanged += e => updateDisplay(e.NewValue);
 

From cccb47e6e04e956dc4cfe73dfdff8c2bdc993526 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jul 2020 11:29:23 +0900
Subject: [PATCH 03864/10326] Add user cover background to expanded version of
 score panel

---
 osu.Game/Screens/Ranking/ScorePanel.cs | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 9633f5c533..5da432d5b2 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -13,6 +13,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking.Contracted;
 using osu.Game.Screens.Ranking.Expanded;
+using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
 
@@ -142,7 +143,16 @@ namespace osu.Game.Screens.Ranking
                                 CornerRadius = 20,
                                 CornerExponent = 2.5f,
                                 Masking = true,
-                                Child = middleLayerBackground = new Box { RelativeSizeAxes = Axes.Both }
+                                Children = new[]
+                                {
+                                    middleLayerBackground = new Box { RelativeSizeAxes = Axes.Both },
+                                    new UserCoverBackground
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        User = Score.User,
+                                        Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0.5f), Color4Extensions.FromHex("#444").Opacity(0))
+                                    },
+                                }
                             },
                             middleLayerContentContainer = new Container { RelativeSizeAxes = Axes.Both }
                         }
@@ -155,18 +165,10 @@ namespace osu.Game.Screens.Ranking
         {
             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();
+
+            topLayerBackground.FinishTransforms(false, nameof(Colour));
+            middleLayerBackground.FinishTransforms(false, nameof(Colour));
         }
 
         private PanelState state = PanelState.Contracted;

From fea6389f693947dd22d8f4bda9ecc30c33278cdc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jul 2020 12:41:06 +0900
Subject: [PATCH 03865/10326] Hide HUD elements during break time by default

---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    |  8 ++--
 osu.Game/Configuration/HUDVisibilityMode.cs   | 17 ++++++++
 osu.Game/Configuration/OsuConfigManager.cs    |  4 +-
 .../Sections/Gameplay/GeneralSettings.cs      |  6 +--
 osu.Game/Screens/Play/HUDOverlay.cs           | 42 +++++++++++++++----
 osu.Game/Screens/Play/Player.cs               |  1 +
 6 files changed, 60 insertions(+), 18 deletions(-)
 create mode 100644 osu.Game/Configuration/HUDVisibilityMode.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index c192a7b0e0..e84e3cc930 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -65,17 +65,17 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestExternalHideDoesntAffectConfig()
         {
-            bool originalConfigValue = false;
+            HUDVisibilityMode originalConfigValue = HUDVisibilityMode.DuringGameplay;
 
             createNew();
 
-            AddStep("get original config value", () => originalConfigValue = config.Get<bool>(OsuSetting.ShowInterface));
+            AddStep("get original config value", () => originalConfigValue = config.Get<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode));
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
-            AddAssert("config unchanged", () => originalConfigValue == config.Get<bool>(OsuSetting.ShowInterface));
+            AddAssert("config unchanged", () => originalConfigValue == config.Get<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode));
 
             AddStep("set showhud true", () => hudOverlay.ShowHud.Value = true);
-            AddAssert("config unchanged", () => originalConfigValue == config.Get<bool>(OsuSetting.ShowInterface));
+            AddAssert("config unchanged", () => originalConfigValue == config.Get<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode));
         }
 
         [Test]
diff --git a/osu.Game/Configuration/HUDVisibilityMode.cs b/osu.Game/Configuration/HUDVisibilityMode.cs
new file mode 100644
index 0000000000..2b133b1bcf
--- /dev/null
+++ b/osu.Game/Configuration/HUDVisibilityMode.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.ComponentModel;
+
+namespace osu.Game.Configuration
+{
+    public enum HUDVisibilityMode
+    {
+        Never,
+
+        [Description("Hide during breaks")]
+        DuringGameplay,
+
+        Always
+    }
+}
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 268328272c..3ce71e8549 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.HitLighting, true);
 
-            Set(OsuSetting.ShowInterface, true);
+            Set(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.DuringGameplay);
             Set(OsuSetting.ShowProgressGraph, true);
             Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
             Set(OsuSetting.FadePlayfieldWhenHealthLow, true);
@@ -184,7 +184,7 @@ namespace osu.Game.Configuration
         AlwaysPlayFirstComboBreak,
         ScoreMeter,
         FloatingComments,
-        ShowInterface,
+        HUDVisibilityMode,
         ShowProgressGraph,
         ShowHealthDisplayWhenCantFail,
         FadePlayfieldWhenHealthLow,
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 93a02ea0e4..af71c4f4e8 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -36,10 +36,10 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Lighten playfield during breaks",
                     Bindable = config.GetBindable<bool>(OsuSetting.LightenDuringBreaks)
                 },
-                new SettingsCheckbox
+                new SettingsEnumDropdown<HUDVisibilityMode>
                 {
-                    LabelText = "Show score overlay",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowInterface)
+                    LabelText = "Score overlay (HUD) mode",
+                    Bindable = config.GetBindable<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode)
                 },
                 new SettingsCheckbox
                 {
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index f09745cf71..ef1f80e0d5 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public Bindable<bool> ShowHud { get; } = new BindableBool();
 
-        private Bindable<bool> configShowHud;
+        private Bindable<HUDVisibilityMode> configVisibilityMode;
 
         private readonly Container visibilityContainer;
 
@@ -63,6 +63,8 @@ namespace osu.Game.Screens.Play
 
         private readonly Container topScoreContainer;
 
+        internal readonly IBindable<bool> IsBreakTime = new Bindable<bool>();
+
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
 
         public HUDOverlay(ScoreProcessor scoreProcessor, HealthProcessor healthProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
@@ -139,9 +141,9 @@ namespace osu.Game.Screens.Play
 
             ModDisplay.Current.Value = mods;
 
-            configShowHud = config.GetBindable<bool>(OsuSetting.ShowInterface);
+            configVisibilityMode = config.GetBindable<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode);
 
-            if (!configShowHud.Value && !hasShownNotificationOnce)
+            if (configVisibilityMode.Value == HUDVisibilityMode.Never && !hasShownNotificationOnce)
             {
                 hasShownNotificationOnce = true;
 
@@ -177,15 +179,33 @@ namespace osu.Game.Screens.Play
                 }
             }, true);
 
-            configShowHud.BindValueChanged(visible =>
-            {
-                if (!ShowHud.Disabled)
-                    ShowHud.Value = visible.NewValue;
-            }, true);
+            IsBreakTime.BindValueChanged(_ => updateVisibility());
+            configVisibilityMode.BindValueChanged(_ => updateVisibility(), true);
 
             replayLoaded.BindValueChanged(replayLoadedValueChanged, true);
         }
 
+        private void updateVisibility()
+        {
+            if (ShowHud.Disabled)
+                return;
+
+            switch (configVisibilityMode.Value)
+            {
+                case HUDVisibilityMode.Never:
+                    ShowHud.Value = false;
+                    break;
+
+                case HUDVisibilityMode.DuringGameplay:
+                    ShowHud.Value = replayLoaded.Value || !IsBreakTime.Value;
+                    break;
+
+                case HUDVisibilityMode.Always:
+                    ShowHud.Value = true;
+                    break;
+            }
+        }
+
         private void replayLoadedValueChanged(ValueChangedEvent<bool> e)
         {
             PlayerSettingsOverlay.ReplayLoaded = e.NewValue;
@@ -202,6 +222,8 @@ namespace osu.Game.Screens.Play
                 ModDisplay.Delay(2000).FadeOut(200);
                 KeyCounter.Margin = new MarginPadding(10);
             }
+
+            updateVisibility();
         }
 
         protected virtual void BindDrawableRuleset(DrawableRuleset drawableRuleset)
@@ -222,7 +244,9 @@ namespace osu.Game.Screens.Play
                 switch (e.Key)
                 {
                     case Key.Tab:
-                        configShowHud.Value = !configShowHud.Value;
+                        configVisibilityMode.Value = configVisibilityMode.Value != HUDVisibilityMode.Never
+                            ? HUDVisibilityMode.Never
+                            : HUDVisibilityMode.DuringGameplay;
                         return true;
                 }
             }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 541275cf55..50b2d5a021 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -612,6 +612,7 @@ namespace osu.Game.Screens.Play
 
             // bind component bindables.
             Background.IsBreakTime.BindTo(breakTracker.IsBreakTime);
+            HUDOverlay.IsBreakTime.BindTo(breakTracker.IsBreakTime);
             DimmableStoryboard.IsBreakTime.BindTo(breakTracker.IsBreakTime);
 
             Background.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);

From aca4110e36d03568e1ca2ceadeaf3df42a41093e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 12:47:53 +0900
Subject: [PATCH 03866/10326] Use existing star difficulty if non-local
 beatmap/ruleset

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index b469ca78fb..d94e04a79b 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -209,7 +209,8 @@ namespace osu.Game.Beatmaps
             // Difficulty can only be computed if the beatmap and ruleset are locally available.
             if (beatmapInfo.ID == 0 || rulesetInfo.ID == null)
             {
-                existingDifficulty = new StarDifficulty(0);
+                // If not, fall back to the existing star difficulty (e.g. from an online source).
+                existingDifficulty = new StarDifficulty(beatmapInfo.StarDifficulty);
                 key = default;
 
                 return true;

From 6b7f05740e51c77790295a0ba882c8b45d379bb2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 12:48:12 +0900
Subject: [PATCH 03867/10326] Fix potential missing ruleset

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

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index d94e04a79b..a9f34acd14 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -176,6 +176,9 @@ namespace osu.Game.Beatmaps
         /// <returns>The <see cref="StarDifficulty"/>.</returns>
         private StarDifficulty computeDifficulty(in DifficultyCacheLookup key, BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo)
         {
+            // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
+            rulesetInfo ??= beatmapInfo.Ruleset;
+
             try
             {
                 var ruleset = rulesetInfo.CreateInstance();

From ac602846df9d6a6be5b70672b537fe126cd0274e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jul 2020 16:37:24 +0900
Subject: [PATCH 03868/10326] Expose balance and sample loading methods in
 DrawableHitObject

---
 .../Objects/Drawables/DrawableHitObject.cs    | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index b633cb0860..f275153ce3 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (Result == null)
                 throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
-            loadSamples();
+            LoadSamples();
         }
 
         protected override void LoadComplete()
@@ -145,14 +145,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             samplesBindable = HitObject.SamplesBindable.GetBoundCopy();
-            samplesBindable.CollectionChanged += (_, __) => loadSamples();
+            samplesBindable.CollectionChanged += (_, __) => LoadSamples();
 
             apply(HitObject);
 
             updateState(ArmedState.Idle, true);
         }
 
-        private void loadSamples()
+        protected virtual void LoadSamples()
         {
             if (Samples != null)
             {
@@ -353,17 +353,32 @@ namespace osu.Game.Rulesets.Objects.Drawables
         [Resolved(canBeNull: true)]
         private GameplayClock gameplayClock { get; set; }
 
+        /// <summary>
+        /// Calculate the position to be used for sample playback at a specified X position (0..1).
+        /// </summary>
+        /// <param name="position">The lookup X position. Generally should be <see cref="SamplePlaybackPosition"/>.</param>
+        /// <returns></returns>
+        protected double CalculateSamplePlaybackBalance(double position)
+        {
+            const float balance_adjust_amount = 0.4f;
+
+            return balance_adjust_amount * (userPositionalHitSounds.Value ? position - 0.5f : 0);
+        }
+
+        /// <summary>
+        /// Whether samples should currently be playing. Will be false during seek operations.
+        /// </summary>
+        protected bool ShouldPlaySamples => gameplayClock?.IsSeeking != true;
+
         /// <summary>
         /// Plays all the hit sounds for this <see cref="DrawableHitObject"/>.
         /// This is invoked automatically when this <see cref="DrawableHitObject"/> is hit.
         /// </summary>
         public virtual void PlaySamples()
         {
-            const float balance_adjust_amount = 0.4f;
-
-            if (Samples != null && gameplayClock?.IsSeeking != true)
+            if (Samples != null && ShouldPlaySamples)
             {
-                Samples.Balance.Value = balance_adjust_amount * (userPositionalHitSounds.Value ? SamplePlaybackPosition - 0.5f : 0);
+                Samples.Balance.Value = CalculateSamplePlaybackBalance(SamplePlaybackPosition);
                 Samples.Play();
             }
         }

From 3ed40d3a6b1fd14413920fc70208a71e4beebf99 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jul 2020 16:37:53 +0900
Subject: [PATCH 03869/10326] Fix SkinnableSounds not continuing playback on
 skin change

---
 osu.Game/Skinning/SkinnableSound.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 24d6648273..49f9f01cff 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -98,6 +98,8 @@ namespace osu.Game.Skinning
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
+            bool wasPlaying = samplesContainer.Any(s => s.Playing);
+
             var channels = hitSamples.Select(s =>
             {
                 var ch = skin.GetSample(s);
@@ -121,6 +123,9 @@ namespace osu.Game.Skinning
             }).Where(c => c != null);
 
             samplesContainer.ChildrenEnumerable = channels.Select(c => new DrawableSample(c));
+
+            if (wasPlaying)
+                Play();
         }
     }
 }

From 2126f6bffc9d613706e12c4ef153c1fb7cb567ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jul 2020 16:37:38 +0900
Subject: [PATCH 03870/10326] Add slider "sliding" sample support

---
 .../Objects/Drawables/DrawableSlider.cs       | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 72502c02cd..5059ec1231 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -11,6 +12,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Skinning;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
 using osuTK.Graphics;
 using osu.Game.Skinning;
@@ -81,6 +83,41 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 foreach (var drawableHitObject in NestedHitObjects)
                     drawableHitObject.AccentColour.Value = colour.NewValue;
             }, true);
+
+            Tracking.BindValueChanged(updateSlidingSample);
+        }
+
+        private SkinnableSound slidingSample;
+
+        protected override void LoadSamples()
+        {
+            base.LoadSamples();
+
+            slidingSample?.Expire();
+
+            var firstSample = HitObject.Samples.FirstOrDefault();
+
+            if (firstSample != null)
+            {
+                var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
+                clone.Name = "sliderslide";
+
+                AddInternal(slidingSample = new SkinnableSound(clone)
+                {
+                    Looping = true
+                });
+            }
+        }
+
+        private void updateSlidingSample(ValueChangedEvent<bool> tracking)
+        {
+            // note that samples will not start playing if exiting a seek operation in the middle of a slider.
+            // may be something we want to address at a later point, but not so easy to make happen right now
+            // (SkinnableSound would need to expose whether the sample is already playing and this logic would need to run in Update).
+            if (tracking.NewValue && ShouldPlaySamples)
+                slidingSample?.Play();
+            else
+                slidingSample?.Stop();
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
@@ -156,6 +193,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Tracking.Value = Ball.Tracking;
 
+            if (Tracking.Value && slidingSample != null)
+                // keep the sliding sample playing at the current tracking position
+                slidingSample.Balance.Value = CalculateSamplePlaybackBalance(Ball.X / OsuPlayfield.BASE_SIZE.X);
+
             double completionProgress = Math.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
 
             Ball.UpdateProgress(completionProgress);

From 0957c5f74ce0bdf1e3fc6524d18d0021780abb86 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 18:29:50 +0900
Subject: [PATCH 03871/10326] Re-namespace multiplayer requests/responses

---
 .../Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs    | 1 -
 .../Requests/Responses => Multiplayer}/APICreatedRoom.cs     | 3 +--
 osu.Game/Online/{API => Multiplayer}/APIPlaylistBeatmap.cs   | 2 +-
 .../{API/Requests/Responses => Multiplayer}/APIScoreToken.cs | 2 +-
 .../{API/Requests => Multiplayer}/CreateRoomRequest.cs       | 5 ++---
 .../{API/Requests => Multiplayer}/CreateRoomScoreRequest.cs  | 4 ++--
 .../Requests => Multiplayer}/GetRoomPlaylistScoresRequest.cs | 3 ++-
 .../Online/{API/Requests => Multiplayer}/GetRoomRequest.cs   | 4 ++--
 .../{API/Requests => Multiplayer}/GetRoomScoresRequest.cs    | 3 ++-
 .../Online/{API/Requests => Multiplayer}/GetRoomsRequest.cs  | 4 ++--
 .../Online/{API/Requests => Multiplayer}/JoinRoomRequest.cs  | 4 ++--
 .../Online/{API/Requests => Multiplayer}/PartRoomRequest.cs  | 4 ++--
 osu.Game/Online/{API => Multiplayer}/RoomScore.cs            | 4 ++--
 .../{API/Requests => Multiplayer}/SubmitRoomScoreRequest.cs  | 3 ++-
 osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs  | 1 -
 osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs               | 1 -
 osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs     | 1 -
 osu.Game/Screens/Multi/RoomManager.cs                        | 1 -
 18 files changed, 23 insertions(+), 27 deletions(-)
 rename osu.Game/Online/{API/Requests/Responses => Multiplayer}/APICreatedRoom.cs (78%)
 rename osu.Game/Online/{API => Multiplayer}/APIPlaylistBeatmap.cs (94%)
 rename osu.Game/Online/{API/Requests/Responses => Multiplayer}/APIScoreToken.cs (85%)
 rename osu.Game/Online/{API/Requests => Multiplayer}/CreateRoomRequest.cs (86%)
 rename osu.Game/Online/{API/Requests => Multiplayer}/CreateRoomScoreRequest.cs (90%)
 rename osu.Game/Online/{API/Requests => Multiplayer}/GetRoomPlaylistScoresRequest.cs (92%)
 rename osu.Game/Online/{API/Requests => Multiplayer}/GetRoomRequest.cs (84%)
 rename osu.Game/Online/{API/Requests => Multiplayer}/GetRoomScoresRequest.cs (89%)
 rename osu.Game/Online/{API/Requests => Multiplayer}/GetRoomsRequest.cs (94%)
 rename osu.Game/Online/{API/Requests => Multiplayer}/JoinRoomRequest.cs (90%)
 rename osu.Game/Online/{API/Requests => Multiplayer}/PartRoomRequest.cs (90%)
 rename osu.Game/Online/{API => Multiplayer}/RoomScore.cs (97%)
 rename osu.Game/Online/{API/Requests => Multiplayer}/SubmitRoomScoreRequest.cs (95%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index 9fc7c336cb..0da1e11fee 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game/Online/API/Requests/Responses/APICreatedRoom.cs b/osu.Game/Online/Multiplayer/APICreatedRoom.cs
similarity index 78%
rename from osu.Game/Online/API/Requests/Responses/APICreatedRoom.cs
rename to osu.Game/Online/Multiplayer/APICreatedRoom.cs
index a554101bc7..2a3bb39647 100644
--- a/osu.Game/Online/API/Requests/Responses/APICreatedRoom.cs
+++ b/osu.Game/Online/Multiplayer/APICreatedRoom.cs
@@ -2,9 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Newtonsoft.Json;
-using osu.Game.Online.Multiplayer;
 
-namespace osu.Game.Online.API.Requests.Responses
+namespace osu.Game.Online.Multiplayer
 {
     public class APICreatedRoom : Room
     {
diff --git a/osu.Game/Online/API/APIPlaylistBeatmap.cs b/osu.Game/Online/Multiplayer/APIPlaylistBeatmap.cs
similarity index 94%
rename from osu.Game/Online/API/APIPlaylistBeatmap.cs
rename to osu.Game/Online/Multiplayer/APIPlaylistBeatmap.cs
index 4f7786e880..98972ef36d 100644
--- a/osu.Game/Online/API/APIPlaylistBeatmap.cs
+++ b/osu.Game/Online/Multiplayer/APIPlaylistBeatmap.cs
@@ -6,7 +6,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 
-namespace osu.Game.Online.API
+namespace osu.Game.Online.Multiplayer
 {
     public class APIPlaylistBeatmap : APIBeatmap
     {
diff --git a/osu.Game/Online/API/Requests/Responses/APIScoreToken.cs b/osu.Game/Online/Multiplayer/APIScoreToken.cs
similarity index 85%
rename from osu.Game/Online/API/Requests/Responses/APIScoreToken.cs
rename to osu.Game/Online/Multiplayer/APIScoreToken.cs
index 1d2465bedf..1f0063d94e 100644
--- a/osu.Game/Online/API/Requests/Responses/APIScoreToken.cs
+++ b/osu.Game/Online/Multiplayer/APIScoreToken.cs
@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace osu.Game.Online.API.Requests.Responses
+namespace osu.Game.Online.Multiplayer
 {
     public class APIScoreToken
     {
diff --git a/osu.Game/Online/API/Requests/CreateRoomRequest.cs b/osu.Game/Online/Multiplayer/CreateRoomRequest.cs
similarity index 86%
rename from osu.Game/Online/API/Requests/CreateRoomRequest.cs
rename to osu.Game/Online/Multiplayer/CreateRoomRequest.cs
index c848c55cc6..dcb4ed51ea 100644
--- a/osu.Game/Online/API/Requests/CreateRoomRequest.cs
+++ b/osu.Game/Online/Multiplayer/CreateRoomRequest.cs
@@ -4,10 +4,9 @@
 using System.Net.Http;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.API;
 
-namespace osu.Game.Online.API.Requests
+namespace osu.Game.Online.Multiplayer
 {
     public class CreateRoomRequest : APIRequest<APICreatedRoom>
     {
diff --git a/osu.Game/Online/API/Requests/CreateRoomScoreRequest.cs b/osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs
similarity index 90%
rename from osu.Game/Online/API/Requests/CreateRoomScoreRequest.cs
rename to osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs
index e6246b4f1f..f973f96b37 100644
--- a/osu.Game/Online/API/Requests/CreateRoomScoreRequest.cs
+++ b/osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs
@@ -3,9 +3,9 @@
 
 using System.Net.Http;
 using osu.Framework.IO.Network;
-using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.API;
 
-namespace osu.Game.Online.API.Requests
+namespace osu.Game.Online.Multiplayer
 {
     public class CreateRoomScoreRequest : APIRequest<APIScoreToken>
     {
diff --git a/osu.Game/Online/API/Requests/GetRoomPlaylistScoresRequest.cs b/osu.Game/Online/Multiplayer/GetRoomPlaylistScoresRequest.cs
similarity index 92%
rename from osu.Game/Online/API/Requests/GetRoomPlaylistScoresRequest.cs
rename to osu.Game/Online/Multiplayer/GetRoomPlaylistScoresRequest.cs
index 38f852870b..833a761f42 100644
--- a/osu.Game/Online/API/Requests/GetRoomPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Multiplayer/GetRoomPlaylistScoresRequest.cs
@@ -3,8 +3,9 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Game.Online.API;
 
-namespace osu.Game.Online.API.Requests
+namespace osu.Game.Online.Multiplayer
 {
     public class GetRoomPlaylistScoresRequest : APIRequest<RoomPlaylistScores>
     {
diff --git a/osu.Game/Online/API/Requests/GetRoomRequest.cs b/osu.Game/Online/Multiplayer/GetRoomRequest.cs
similarity index 84%
rename from osu.Game/Online/API/Requests/GetRoomRequest.cs
rename to osu.Game/Online/Multiplayer/GetRoomRequest.cs
index 531e1857de..2907b49f1d 100644
--- a/osu.Game/Online/API/Requests/GetRoomRequest.cs
+++ b/osu.Game/Online/Multiplayer/GetRoomRequest.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.Game.Online.Multiplayer;
+using osu.Game.Online.API;
 
-namespace osu.Game.Online.API.Requests
+namespace osu.Game.Online.Multiplayer
 {
     public class GetRoomRequest : APIRequest<Room>
     {
diff --git a/osu.Game/Online/API/Requests/GetRoomScoresRequest.cs b/osu.Game/Online/Multiplayer/GetRoomScoresRequest.cs
similarity index 89%
rename from osu.Game/Online/API/Requests/GetRoomScoresRequest.cs
rename to osu.Game/Online/Multiplayer/GetRoomScoresRequest.cs
index eb53369d18..bc913030dd 100644
--- a/osu.Game/Online/API/Requests/GetRoomScoresRequest.cs
+++ b/osu.Game/Online/Multiplayer/GetRoomScoresRequest.cs
@@ -2,9 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 
-namespace osu.Game.Online.API.Requests
+namespace osu.Game.Online.Multiplayer
 {
     public class GetRoomScoresRequest : APIRequest<List<APIUserScoreAggregate>>
     {
diff --git a/osu.Game/Online/API/Requests/GetRoomsRequest.cs b/osu.Game/Online/Multiplayer/GetRoomsRequest.cs
similarity index 94%
rename from osu.Game/Online/API/Requests/GetRoomsRequest.cs
rename to osu.Game/Online/Multiplayer/GetRoomsRequest.cs
index c47ed20909..64e0386f77 100644
--- a/osu.Game/Online/API/Requests/GetRoomsRequest.cs
+++ b/osu.Game/Online/Multiplayer/GetRoomsRequest.cs
@@ -4,10 +4,10 @@
 using System.Collections.Generic;
 using Humanizer;
 using osu.Framework.IO.Network;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.API;
 using osu.Game.Screens.Multi.Lounge.Components;
 
-namespace osu.Game.Online.API.Requests
+namespace osu.Game.Online.Multiplayer
 {
     public class GetRoomsRequest : APIRequest<List<Room>>
     {
diff --git a/osu.Game/Online/API/Requests/JoinRoomRequest.cs b/osu.Game/Online/Multiplayer/JoinRoomRequest.cs
similarity index 90%
rename from osu.Game/Online/API/Requests/JoinRoomRequest.cs
rename to osu.Game/Online/Multiplayer/JoinRoomRequest.cs
index b0808afa45..74375af856 100644
--- a/osu.Game/Online/API/Requests/JoinRoomRequest.cs
+++ b/osu.Game/Online/Multiplayer/JoinRoomRequest.cs
@@ -3,9 +3,9 @@
 
 using System.Net.Http;
 using osu.Framework.IO.Network;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.API;
 
-namespace osu.Game.Online.API.Requests
+namespace osu.Game.Online.Multiplayer
 {
     public class JoinRoomRequest : APIRequest
     {
diff --git a/osu.Game/Online/API/Requests/PartRoomRequest.cs b/osu.Game/Online/Multiplayer/PartRoomRequest.cs
similarity index 90%
rename from osu.Game/Online/API/Requests/PartRoomRequest.cs
rename to osu.Game/Online/Multiplayer/PartRoomRequest.cs
index c988cd5c9e..54bb005d96 100644
--- a/osu.Game/Online/API/Requests/PartRoomRequest.cs
+++ b/osu.Game/Online/Multiplayer/PartRoomRequest.cs
@@ -3,9 +3,9 @@
 
 using System.Net.Http;
 using osu.Framework.IO.Network;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.API;
 
-namespace osu.Game.Online.API.Requests
+namespace osu.Game.Online.Multiplayer
 {
     public class PartRoomRequest : APIRequest
     {
diff --git a/osu.Game/Online/API/RoomScore.cs b/osu.Game/Online/Multiplayer/RoomScore.cs
similarity index 97%
rename from osu.Game/Online/API/RoomScore.cs
rename to osu.Game/Online/Multiplayer/RoomScore.cs
index 3c7f8c9833..97f378856f 100644
--- a/osu.Game/Online/API/RoomScore.cs
+++ b/osu.Game/Online/Multiplayer/RoomScore.cs
@@ -6,13 +6,13 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.API;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Users;
 
-namespace osu.Game.Online.API
+namespace osu.Game.Online.Multiplayer
 {
     public class RoomScore
     {
diff --git a/osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs b/osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs
similarity index 95%
rename from osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs
rename to osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs
index 8eb2952159..f725ea5dc9 100644
--- a/osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs
+++ b/osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs
@@ -4,9 +4,10 @@
 using System.Net.Http;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
+using osu.Game.Online.API;
 using osu.Game.Scoring;
 
-namespace osu.Game.Online.API.Requests
+namespace osu.Game.Online.Multiplayer
 {
     public class SubmitRoomScoreRequest : APIRequest<RoomScore>
     {
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index 571bbde716..1afbf5c32a 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Online.Multiplayer;
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index cf0197d26b..c2381fe219 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -10,7 +10,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 5cafc974f1..f367d44347 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index 491be2e946..2a96fa536d 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -14,7 +14,6 @@ using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Online;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Multi.Lounge.Components;

From e423630b7cbec15c0457089513ff0af85822591b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 18:37:00 +0900
Subject: [PATCH 03872/10326] Rename RoomScore -> MultiplayerScore

---
 .../Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs     | 4 ++--
 osu.Game/Online/Multiplayer/GetRoomPlaylistScoresRequest.cs   | 2 +-
 .../Online/Multiplayer/{RoomScore.cs => MultiplayerScore.cs}  | 2 +-
 osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game/Online/Multiplayer/{RoomScore.cs => MultiplayerScore.cs} (98%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index 0da1e11fee..0023866124 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -64,11 +64,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void bindHandler(double delay = 0)
         {
-            var roomScores = new List<RoomScore>();
+            var roomScores = new List<MultiplayerScore>();
 
             for (int i = 0; i < 10; i++)
             {
-                roomScores.Add(new RoomScore
+                roomScores.Add(new MultiplayerScore
                 {
                     ID = i,
                     Accuracy = 0.9 - 0.01 * i,
diff --git a/osu.Game/Online/Multiplayer/GetRoomPlaylistScoresRequest.cs b/osu.Game/Online/Multiplayer/GetRoomPlaylistScoresRequest.cs
index 833a761f42..3d3bd20ff3 100644
--- a/osu.Game/Online/Multiplayer/GetRoomPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Multiplayer/GetRoomPlaylistScoresRequest.cs
@@ -24,6 +24,6 @@ namespace osu.Game.Online.Multiplayer
     public class RoomPlaylistScores
     {
         [JsonProperty("scores")]
-        public List<RoomScore> Scores { get; set; }
+        public List<MultiplayerScore> Scores { get; set; }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/RoomScore.cs b/osu.Game/Online/Multiplayer/MultiplayerScore.cs
similarity index 98%
rename from osu.Game/Online/Multiplayer/RoomScore.cs
rename to osu.Game/Online/Multiplayer/MultiplayerScore.cs
index 97f378856f..3bbf19b11f 100644
--- a/osu.Game/Online/Multiplayer/RoomScore.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerScore.cs
@@ -14,7 +14,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public class RoomScore
+    public class MultiplayerScore
     {
         [JsonProperty("id")]
         public int ID { get; set; }
diff --git a/osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs b/osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs
index f725ea5dc9..d31aef2ea5 100644
--- a/osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs
+++ b/osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs
@@ -9,7 +9,7 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public class SubmitRoomScoreRequest : APIRequest<RoomScore>
+    public class SubmitRoomScoreRequest : APIRequest<MultiplayerScore>
     {
         private readonly int scoreId;
         private readonly int roomId;

From d9633fee64a270364f618fc415d5d48d93a808e5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 18:47:09 +0900
Subject: [PATCH 03873/10326] Rename request

---
 .../Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs     | 2 +-
 ...PlaylistScoresRequest.cs => IndexPlaylistScoresRequest.cs} | 4 ++--
 osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Online/Multiplayer/{GetRoomPlaylistScoresRequest.cs => IndexPlaylistScoresRequest.cs} (82%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index 0023866124..37d31264b6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 switch (request)
                 {
-                    case GetRoomPlaylistScoresRequest r:
+                    case IndexPlaylistScoresRequest r:
                         if (delay == 0)
                             success();
                         else
diff --git a/osu.Game/Online/Multiplayer/GetRoomPlaylistScoresRequest.cs b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
similarity index 82%
rename from osu.Game/Online/Multiplayer/GetRoomPlaylistScoresRequest.cs
rename to osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
index 3d3bd20ff3..c435dc6030 100644
--- a/osu.Game/Online/Multiplayer/GetRoomPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
@@ -7,12 +7,12 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public class GetRoomPlaylistScoresRequest : APIRequest<RoomPlaylistScores>
+    public class IndexPlaylistScoresRequest : APIRequest<RoomPlaylistScores>
     {
         private readonly int roomId;
         private readonly int playlistItemId;
 
-        public GetRoomPlaylistScoresRequest(int roomId, int playlistItemId)
+        public IndexPlaylistScoresRequest(int roomId, int playlistItemId)
         {
             this.roomId = roomId;
             this.playlistItemId = playlistItemId;
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index f367d44347..b90c7252c4 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Multi.Ranking
 
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
-            var req = new GetRoomPlaylistScoresRequest(roomId, playlistItem.ID);
+            var req = new IndexPlaylistScoresRequest(roomId, playlistItem.ID);
 
             req.Success += r =>
             {

From ec33a6ea8791b6878912b26dd9209063a45f5719 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 18:47:40 +0900
Subject: [PATCH 03874/10326] Add additional responses

---
 .../Online/Multiplayer/MultiplayerScores.cs   | 39 +++++++++++++++++++
 .../Multiplayer/MultiplayerScoresAround.cs    | 25 ++++++++++++
 .../Multiplayer/MultiplayerScoresSort.cs      | 14 +++++++
 3 files changed, 78 insertions(+)
 create mode 100644 osu.Game/Online/Multiplayer/MultiplayerScores.cs
 create mode 100644 osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs
 create mode 100644 osu.Game/Online/Multiplayer/MultiplayerScoresSort.cs

diff --git a/osu.Game/Online/Multiplayer/MultiplayerScores.cs b/osu.Game/Online/Multiplayer/MultiplayerScores.cs
new file mode 100644
index 0000000000..f944a8999c
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/MultiplayerScores.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.Collections.Generic;
+using Newtonsoft.Json;
+using osu.Game.Online.API.Requests;
+
+namespace osu.Game.Online.Multiplayer
+{
+    /// <summary>
+    /// An object which contains scores and related data for fetching next pages.
+    /// </summary>
+    public class MultiplayerScores
+    {
+        /// <summary>
+        /// To be used for fetching the next page.
+        /// </summary>
+        [JsonProperty("cursor")]
+        public Cursor Cursor { get; set; }
+
+        /// <summary>
+        /// The scores.
+        /// </summary>
+        [JsonProperty("scores")]
+        public List<MultiplayerScore> Scores { get; set; }
+
+        /// <summary>
+        /// The total scores in the playlist item. Only provided via <see cref="IndexPlaylistScoresRequest"/>.
+        /// </summary>
+        [JsonProperty("total")]
+        public int? TotalScores { get; set; }
+
+        /// <summary>
+        /// The user's score, if any. Only provided via <see cref="IndexPlaylistScoresRequest"/>.
+        /// </summary>
+        [JsonProperty("user_score")]
+        public MultiplayerScore UserScore { get; set; }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs b/osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs
new file mode 100644
index 0000000000..e83cc1b753
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/MultiplayerScoresAround.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 Newtonsoft.Json;
+
+namespace osu.Game.Online.Multiplayer
+{
+    /// <summary>
+    /// An object which stores scores higher and lower than the user's score.
+    /// </summary>
+    public class MultiplayerScoresAround
+    {
+        /// <summary>
+        /// Scores sorted "higher" than the user's score, depending on the sorting order.
+        /// </summary>
+        [JsonProperty("higher")]
+        public MultiplayerScores Higher { get; set; }
+
+        /// <summary>
+        /// Scores sorted "lower" than the user's score, depending on the sorting order.
+        /// </summary>
+        [JsonProperty("lower")]
+        public MultiplayerScores Lower { get; set; }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/MultiplayerScoresSort.cs b/osu.Game/Online/Multiplayer/MultiplayerScoresSort.cs
new file mode 100644
index 0000000000..decb1c4dfe
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/MultiplayerScoresSort.cs
@@ -0,0 +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.
+
+namespace osu.Game.Online.Multiplayer
+{
+    /// <summary>
+    /// Sorting option for indexing multiplayer scores.
+    /// </summary>
+    public enum MultiplayerScoresSort
+    {
+        Ascending,
+        Descending
+    }
+}

From 634efe31f843f53a8a86ae01319705b748398449 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 18:51:54 +0900
Subject: [PATCH 03875/10326] Inherit ResponseWithCursor

---
 osu.Game/Online/Multiplayer/MultiplayerScores.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerScores.cs b/osu.Game/Online/Multiplayer/MultiplayerScores.cs
index f944a8999c..6f74fc8984 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScores.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerScores.cs
@@ -10,14 +10,8 @@ namespace osu.Game.Online.Multiplayer
     /// <summary>
     /// An object which contains scores and related data for fetching next pages.
     /// </summary>
-    public class MultiplayerScores
+    public class MultiplayerScores : ResponseWithCursor
     {
-        /// <summary>
-        /// To be used for fetching the next page.
-        /// </summary>
-        [JsonProperty("cursor")]
-        public Cursor Cursor { get; set; }
-
         /// <summary>
         /// The scores.
         /// </summary>

From c75955e3819f5b7c8ec3a77af1bce267f2008633 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 18:52:25 +0900
Subject: [PATCH 03876/10326] Add responses to MultiplayerScore

---
 osu.Game/Online/Multiplayer/MultiplayerScore.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerScore.cs b/osu.Game/Online/Multiplayer/MultiplayerScore.cs
index 3bbf19b11f..1793ba72ef 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScore.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerScore.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using osu.Game.Online.API;
@@ -47,6 +48,19 @@ namespace osu.Game.Online.Multiplayer
         [JsonProperty("ended_at")]
         public DateTimeOffset EndedAt { get; set; }
 
+        /// <summary>
+        /// The position of this score, starting at 1.
+        /// </summary>
+        [JsonProperty("position")]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// Any scores in the room around this score.
+        /// </summary>
+        [JsonProperty("scores_around")]
+        [CanBeNull]
+        public MultiplayerScoresAround ScoresAround { get; set; }
+
         public ScoreInfo CreateScoreInfo(PlaylistItem playlistItem)
         {
             var rulesetInstance = playlistItem.Ruleset.Value.CreateInstance();

From 334fb7d4753386c6d534efe27e80e421a3b8a94f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 18:54:41 +0900
Subject: [PATCH 03877/10326] Add additional params to index request

---
 .../Multiplayer/IndexPlaylistScoresRequest.cs | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
index c435dc6030..b43614bf6c 100644
--- a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
@@ -3,19 +3,49 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Framework.IO.Network;
+using osu.Game.Extensions;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Online.Multiplayer
 {
+    /// <summary>
+    /// Returns a list of scores for the specified playlist item.
+    /// </summary>
     public class IndexPlaylistScoresRequest : APIRequest<RoomPlaylistScores>
     {
         private readonly int roomId;
         private readonly int playlistItemId;
+        private readonly Cursor cursor;
+        private readonly MultiplayerScoresSort? sort;
 
-        public IndexPlaylistScoresRequest(int roomId, int playlistItemId)
+        public IndexPlaylistScoresRequest(int roomId, int playlistItemId, Cursor cursor = null, MultiplayerScoresSort? sort = null)
         {
             this.roomId = roomId;
             this.playlistItemId = playlistItemId;
+            this.cursor = cursor;
+            this.sort = sort;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+
+            req.AddCursor(cursor);
+
+            switch (sort)
+            {
+                case MultiplayerScoresSort.Ascending:
+                    req.AddParameter("sort", "scores_asc");
+                    break;
+
+                case MultiplayerScoresSort.Descending:
+                    req.AddParameter("sort", "scores_desc");
+                    break;
+            }
+
+            return req;
         }
 
         protected override string Target => $@"rooms/{roomId}/playlist/{playlistItemId}/scores";

From 53a9ac3c1aa160bd1ccd8a23aa3833bd5f014e9b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jul 2020 19:06:39 +0900
Subject: [PATCH 03878/10326] Fix slider ball rotation being applied to follow
 circle and specular layer

---
 .../Objects/Drawables/Pieces/SliderBall.cs    | 18 ++++--------
 .../Skinning/LegacySliderBall.cs              | 28 +++++++++++++++++--
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index 395c76a233..b87e112d10 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         private readonly Slider slider;
         private readonly Drawable followCircle;
         private readonly DrawableSlider drawableSlider;
-        private readonly CircularContainer ball;
+        private readonly Drawable ball;
 
         public SliderBall(Slider slider, DrawableSlider drawableSlider = null)
         {
@@ -54,19 +54,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     Alpha = 0,
                     Child = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderFollowCircle), _ => new DefaultFollowCircle()),
                 },
-                ball = new CircularContainer
+                ball = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderBall), _ => new DefaultSliderBall())
                 {
-                    Masking = true,
-                    RelativeSizeAxes = Axes.Both,
-                    Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
-                    Alpha = 1,
-                    Child = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Child = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderBall), _ => new DefaultSliderBall()),
-                    }
-                }
+                    Origin = Anchor.Centre,
+                },
             };
         }
 
@@ -187,7 +179,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 return;
 
             Position = newPos;
-            Rotation = -90 + (float)(-Math.Atan2(diff.X, diff.Y) * 180 / Math.PI);
+            ball.Rotation = -90 + (float)(-Math.Atan2(diff.X, diff.Y) * 180 / Math.PI);
 
             lastPosition = newPos;
         }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
index b4ed75d97c..0f586034d5 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
@@ -15,6 +15,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
     {
         private readonly Drawable animationContent;
 
+        private Sprite layerNd;
+        private Sprite layerSpec;
+
         public LegacySliderBall(Drawable animationContent)
         {
             this.animationContent = animationContent;
@@ -29,18 +32,37 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             InternalChildren = new[]
             {
-                new Sprite
+                layerNd = new Sprite
                 {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Texture = skin.GetTexture("sliderb-nd"),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                animationContent,
-                new Sprite
+                animationContent.With(d =>
                 {
+                    d.Anchor = Anchor.Centre;
+                    d.Origin = Anchor.Centre;
+                }),
+                layerSpec = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Texture = skin.GetTexture("sliderb-spec"),
                     Blending = BlendingParameters.Additive,
                 },
             };
         }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            //undo rotation on layers which should not be rotated.
+            float appliedRotation = Parent.Rotation;
+
+            layerNd.Rotation = -appliedRotation;
+            layerSpec.Rotation = -appliedRotation;
+        }
     }
 }

From bd6a51f545a5121d98e57f3e8894094d3cb1e738 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jul 2020 19:30:10 +0900
Subject: [PATCH 03879/10326] Hide slider repeat judgements temporarily

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 720ffcd51c..d79ecb7b4e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private readonly Drawable scaleContainer;
 
+        public override bool DisplayResult => false;
+
         public DrawableSliderRepeat(SliderRepeat sliderRepeat, DrawableSlider drawableSlider)
             : base(sliderRepeat)
         {

From f8401a76a25a59706226eee625dc479d13116c10 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 19:40:00 +0900
Subject: [PATCH 03880/10326] Use show/index requests in results screen

---
 .../ShowPlaylistUserScoreRequest.cs           | 23 +++++++
 .../Multi/Ranking/TimeshiftResultsScreen.cs   | 63 +++++++++++++++++--
 2 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/ShowPlaylistUserScoreRequest.cs

diff --git a/osu.Game/Online/Multiplayer/ShowPlaylistUserScoreRequest.cs b/osu.Game/Online/Multiplayer/ShowPlaylistUserScoreRequest.cs
new file mode 100644
index 0000000000..936b8bbe89
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/ShowPlaylistUserScoreRequest.cs
@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Online.API;
+
+namespace osu.Game.Online.Multiplayer
+{
+    public class ShowPlaylistUserScoreRequest : APIRequest<MultiplayerScore>
+    {
+        private readonly int roomId;
+        private readonly int playlistItemId;
+        private readonly long userId;
+
+        public ShowPlaylistUserScoreRequest(int roomId, int playlistItemId, long userId)
+        {
+            this.roomId = roomId;
+            this.playlistItemId = playlistItemId;
+            this.userId = userId;
+        }
+
+        protected override string Target => $"rooms/{roomId}/playlist/{playlistItemId}/scores/users/{userId}";
+    }
+}
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index b90c7252c4..47aab02b1a 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
@@ -21,6 +22,11 @@ namespace osu.Game.Screens.Multi.Ranking
         private readonly PlaylistItem playlistItem;
 
         private LoadingSpinner loadingLayer;
+        private Cursor higherScoresCursor;
+        private Cursor lowerScoresCursor;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
 
         public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry = true)
             : base(score, allowRetry)
@@ -44,17 +50,62 @@ namespace osu.Game.Screens.Multi.Ranking
 
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
-            var req = new IndexPlaylistScoresRequest(roomId, playlistItem.ID);
+            // This performs two requests:
+            // 1. A request to show the user's score.
+            // 2. If (1) fails, a request to index the room.
 
-            req.Success += r =>
+            var userScoreReq = new ShowPlaylistUserScoreRequest(roomId, playlistItem.ID, api.LocalUser.Value.Id);
+
+            userScoreReq.Success += userScore =>
             {
-                scoresCallback?.Invoke(r.Scores.Where(s => s.ID != Score?.OnlineScoreID).Select(s => s.CreateScoreInfo(playlistItem)));
-                loadingLayer.Hide();
+                var allScores = new List<MultiplayerScore> { userScore };
+
+                if (userScore.ScoresAround?.Higher != null)
+                {
+                    allScores.AddRange(userScore.ScoresAround.Higher.Scores);
+                    higherScoresCursor = userScore.ScoresAround.Higher.Cursor;
+                }
+
+                if (userScore.ScoresAround?.Lower != null)
+                {
+                    allScores.AddRange(userScore.ScoresAround.Lower.Scores);
+                    lowerScoresCursor = userScore.ScoresAround.Lower.Cursor;
+                }
+
+                success(allScores);
             };
 
-            req.Failure += _ => loadingLayer.Hide();
+            userScoreReq.Failure += _ =>
+            {
+                // Fallback to a normal index.
+                var indexReq = new IndexPlaylistScoresRequest(roomId, playlistItem.ID);
+                indexReq.Success += r => success(r.Scores);
+                indexReq.Failure += __ => loadingLayer.Hide();
+                api.Queue(indexReq);
+            };
 
-            return req;
+            return userScoreReq;
+
+            void success(List<MultiplayerScore> scores)
+            {
+                var scoreInfos = new List<ScoreInfo>(scores.Select(s => s.CreateScoreInfo(playlistItem)));
+
+                // Select a score if we don't already have one selected.
+                // Note: This is done before the callback so that the panel list centres on the selected score before panels are added (eliminating initial scroll).
+                if (SelectedScore.Value == null)
+                {
+                    Schedule(() =>
+                    {
+                        // Prefer selecting the local user's score, or otherwise default to the first visible score.
+                        SelectedScore.Value = scoreInfos.FirstOrDefault(s => s.User.Id == api.LocalUser.Value.Id) ?? scoreInfos.FirstOrDefault();
+                    });
+                }
+
+                // Invoke callback to add the scores. Exclude the user's current score which was added previously.
+                scoresCallback?.Invoke(scoreInfos.Where(s => s.ID != Score?.OnlineScoreID));
+
+                loadingLayer.Hide();
+            }
         }
     }
 }

From 798bf0503818856b48f150b4598c2e01f340fdaf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jul 2020 19:43:48 +0900
Subject: [PATCH 03881/10326] 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 71d4e5aacf..c0c75b8d71 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.714.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.722.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 2f3d08c528..e8c333b6b1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.714.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.722.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 2bb3914c25..8d1b837995 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.Framework.iOS" Version="2020.714.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.722.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.714.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.722.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 2c62b23d859d46b1e4f3c21ea18e8c52a910b9c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jul 2020 19:53:45 +0900
Subject: [PATCH 03882/10326] Update naming

---
 .../Replays/CatchFramedReplayInputHandler.cs      |  4 ++--
 .../Replays/ManiaFramedReplayInputHandler.cs      |  4 ++--
 .../Replays/OsuFramedReplayInputHandler.cs        | 15 +++------------
 .../Replays/TaikoFramedReplayInputHandler.cs      |  4 ++--
 .../Visual/Gameplay/TestSceneReplayRecorder.cs    |  2 +-
 .../Visual/Gameplay/TestSceneReplayRecording.cs   |  2 +-
 6 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
index 24c21fbc84..99d899db80 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
@@ -35,11 +35,11 @@ namespace osu.Game.Rulesets.Catch.Replays
             }
         }
 
-        public override void GetPendingInputs(List<IInput> input)
+        public override void CollectPendingInputs(List<IInput> inputs)
         {
             if (!Position.HasValue) return;
 
-            input.Add(new CatchReplayState
+            inputs.Add(new CatchReplayState
             {
                 PressedActions = CurrentFrame?.Actions ?? new List<CatchAction>(),
                 CatcherX = Position.Value
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaFramedReplayInputHandler.cs b/osu.Game.Rulesets.Mania/Replays/ManiaFramedReplayInputHandler.cs
index 26c4ccf289..aa0c148caf 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaFramedReplayInputHandler.cs
@@ -18,9 +18,9 @@ namespace osu.Game.Rulesets.Mania.Replays
 
         protected override bool IsImportant(ManiaReplayFrame frame) => frame.Actions.Any();
 
-        public override void GetPendingInputs(List<IInput> input)
+        public override void CollectPendingInputs(List<IInput> inputs)
         {
-            input.Add(new ReplayState<ManiaAction> { PressedActions = CurrentFrame?.Actions ?? new List<ManiaAction>() });
+            inputs.Add(new ReplayState<ManiaAction> { PressedActions = CurrentFrame?.Actions ?? new List<ManiaAction>() });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
index 5c803539c2..cf48dc053f 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
@@ -36,19 +36,10 @@ namespace osu.Game.Rulesets.Osu.Replays
             }
         }
 
-        public override void GetPendingInputs(List<IInput> input)
+        public override void CollectPendingInputs(List<IInput> inputs)
         {
-            input.Add(
-                new MousePositionAbsoluteInput
-                {
-                    Position = GamefieldToScreenSpace(Position ?? Vector2.Zero)
-                });
-            input.Add(
-                new ReplayState<OsuAction>
-                {
-                    PressedActions = CurrentFrame?.Actions ?? new List<OsuAction>()
-                });
-            ;
+            inputs.Add(new MousePositionAbsoluteInput { Position = GamefieldToScreenSpace(Position ?? Vector2.Zero) });
+            inputs.Add(new ReplayState<OsuAction> { PressedActions = CurrentFrame?.Actions ?? new List<OsuAction>() });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs
index 7361d4efa8..138e8f9785 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs
@@ -18,9 +18,9 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
         protected override bool IsImportant(TaikoReplayFrame frame) => frame.Actions.Any();
 
-        public override void GetPendingInputs(List<IInput> input)
+        public override void CollectPendingInputs(List<IInput> inputs)
         {
-            input.Add(new ReplayState<TaikoAction> { PressedActions = CurrentFrame?.Actions ?? new List<TaikoAction>() });
+            inputs.Add(new ReplayState<TaikoAction> { PressedActions = CurrentFrame?.Actions ?? new List<TaikoAction>() });
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index e473f49826..bc1c10e59d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            public override void GetPendingInputs(List<IInput> inputs)
+            public override void CollectPendingInputs(List<IInput> inputs)
             {
                 inputs.Add(new MousePositionAbsoluteInput { Position = GamefieldToScreenSpace(CurrentFrame?.Position ?? Vector2.Zero) });
                 inputs.Add(new ReplayState<TestAction> { PressedActions = CurrentFrame?.Actions ?? new List<TestAction>() });
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
index e891ed617a..c0f99db85d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
         }
 
-        public override void GetPendingInputs(List<IInput> inputs)
+        public override void CollectPendingInputs(List<IInput> inputs)
         {
             inputs.Add(new MousePositionAbsoluteInput { Position = GamefieldToScreenSpace(CurrentFrame?.Position ?? Vector2.Zero) });
             inputs.Add(new ReplayState<TestAction> { PressedActions = CurrentFrame?.Actions ?? new List<TestAction>() });

From 568fb51ce239c8f2fbe26ab63d83ea1a508bb65e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 20:24:42 +0900
Subject: [PATCH 03883/10326] Remove RoomPlaylistScores intermediate class

---
 .../Multiplayer/TestSceneTimeshiftResultsScreen.cs     |  2 +-
 .../Online/Multiplayer/IndexPlaylistScoresRequest.cs   | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index 37d31264b6..44ca676c4f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                         void success()
                         {
-                            r.TriggerSuccess(new RoomPlaylistScores { Scores = roomScores });
+                            r.TriggerSuccess(new MultiplayerScores { Scores = roomScores });
                             roomsReceived = true;
                         }
 
diff --git a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
index b43614bf6c..d23208d338 100644
--- a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.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.Collections.Generic;
-using Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using osu.Game.Extensions;
 using osu.Game.Online.API;
@@ -13,7 +11,7 @@ namespace osu.Game.Online.Multiplayer
     /// <summary>
     /// Returns a list of scores for the specified playlist item.
     /// </summary>
-    public class IndexPlaylistScoresRequest : APIRequest<RoomPlaylistScores>
+    public class IndexPlaylistScoresRequest : APIRequest<MultiplayerScores>
     {
         private readonly int roomId;
         private readonly int playlistItemId;
@@ -50,10 +48,4 @@ namespace osu.Game.Online.Multiplayer
 
         protected override string Target => $@"rooms/{roomId}/playlist/{playlistItemId}/scores";
     }
-
-    public class RoomPlaylistScores
-    {
-        [JsonProperty("scores")]
-        public List<MultiplayerScore> Scores { get; set; }
-    }
 }

From b7790de66fbc2d11126fb0c0dadf17090c647aa0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 20:24:48 +0900
Subject: [PATCH 03884/10326] Fix incorrect sort param

---
 osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
index d23208d338..7273c0eea6 100644
--- a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
@@ -35,11 +35,11 @@ namespace osu.Game.Online.Multiplayer
             switch (sort)
             {
                 case MultiplayerScoresSort.Ascending:
-                    req.AddParameter("sort", "scores_asc");
+                    req.AddParameter("sort", "score_asc");
                     break;
 
                 case MultiplayerScoresSort.Descending:
-                    req.AddParameter("sort", "scores_desc");
+                    req.AddParameter("sort", "score_desc");
                     break;
             }
 

From 46ea775cfb36d15a3dc7a13098bd62c18cbb7987 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Jul 2020 20:24:55 +0900
Subject: [PATCH 03885/10326] Implement paging

---
 .../Multi/Ranking/TimeshiftResultsScreen.cs   | 84 +++++++++++++++----
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 41 +++++++--
 osu.Game/Screens/Ranking/ScorePanelList.cs    |  4 +
 3 files changed, 109 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 47aab02b1a..75a61b92ee 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -72,40 +73,93 @@ namespace osu.Game.Screens.Multi.Ranking
                     lowerScoresCursor = userScore.ScoresAround.Lower.Cursor;
                 }
 
-                success(allScores);
+                performSuccessCallback(scoresCallback, allScores);
             };
 
             userScoreReq.Failure += _ =>
             {
                 // Fallback to a normal index.
                 var indexReq = new IndexPlaylistScoresRequest(roomId, playlistItem.ID);
-                indexReq.Success += r => success(r.Scores);
+
+                indexReq.Success += r =>
+                {
+                    performSuccessCallback(scoresCallback, r.Scores);
+                    lowerScoresCursor = r.Cursor;
+                };
+
                 indexReq.Failure += __ => loadingLayer.Hide();
+
                 api.Queue(indexReq);
             };
 
             return userScoreReq;
+        }
 
-            void success(List<MultiplayerScore> scores)
+        protected override APIRequest FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback)
+        {
+            Debug.Assert(direction == 1 || direction == -1);
+
+            Cursor cursor;
+            MultiplayerScoresSort sort;
+
+            switch (direction)
             {
-                var scoreInfos = new List<ScoreInfo>(scores.Select(s => s.CreateScoreInfo(playlistItem)));
+                case -1:
+                    cursor = higherScoresCursor;
+                    sort = MultiplayerScoresSort.Ascending;
+                    break;
 
-                // Select a score if we don't already have one selected.
-                // Note: This is done before the callback so that the panel list centres on the selected score before panels are added (eliminating initial scroll).
-                if (SelectedScore.Value == null)
+                default:
+                    cursor = lowerScoresCursor;
+                    sort = MultiplayerScoresSort.Descending;
+                    break;
+            }
+
+            if (cursor == null)
+                return null;
+
+            var indexReq = new IndexPlaylistScoresRequest(roomId, playlistItem.ID, cursor, sort);
+
+            indexReq.Success += r =>
+            {
+                switch (direction)
                 {
-                    Schedule(() =>
-                    {
-                        // Prefer selecting the local user's score, or otherwise default to the first visible score.
-                        SelectedScore.Value = scoreInfos.FirstOrDefault(s => s.User.Id == api.LocalUser.Value.Id) ?? scoreInfos.FirstOrDefault();
-                    });
+                    case -1:
+                        higherScoresCursor = r.Cursor;
+                        break;
+
+                    default:
+                        lowerScoresCursor = r.Cursor;
+                        break;
                 }
 
-                // Invoke callback to add the scores. Exclude the user's current score which was added previously.
-                scoresCallback?.Invoke(scoreInfos.Where(s => s.ID != Score?.OnlineScoreID));
+                performSuccessCallback(scoresCallback, r.Scores);
+            };
 
-                loadingLayer.Hide();
+            indexReq.Failure += _ => loadingLayer.Hide();
+
+            return indexReq;
+        }
+
+        private void performSuccessCallback(Action<IEnumerable<ScoreInfo>> callback, List<MultiplayerScore> scores)
+        {
+            var scoreInfos = new List<ScoreInfo>(scores.Select(s => s.CreateScoreInfo(playlistItem)));
+
+            // Select a score if we don't already have one selected.
+            // Note: This is done before the callback so that the panel list centres on the selected score before panels are added (eliminating initial scroll).
+            if (SelectedScore.Value == null)
+            {
+                Schedule(() =>
+                {
+                    // Prefer selecting the local user's score, or otherwise default to the first visible score.
+                    SelectedScore.Value = scoreInfos.FirstOrDefault(s => s.User.Id == api.LocalUser.Value.Id) ?? scoreInfos.FirstOrDefault();
+                });
             }
+
+            // Invoke callback to add the scores. Exclude the user's current score which was added previously.
+            callback?.Invoke(scoreInfos.Where(s => s.ID != Score?.OnlineScoreID));
+
+            loadingLayer.Hide();
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 44458d8c8e..c5512822b2 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -164,11 +164,7 @@ namespace osu.Game.Screens.Ranking
         {
             base.LoadComplete();
 
-            var req = FetchScores(scores => Schedule(() =>
-            {
-                foreach (var s in scores)
-                    addScore(s);
-            }));
+            var req = FetchScores(fetchScoresCallback);
 
             if (req != null)
                 api.Queue(req);
@@ -176,6 +172,29 @@ namespace osu.Game.Screens.Ranking
             statisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
         }
 
+        private APIRequest nextPageRequest;
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (hasAnyScores && nextPageRequest == null)
+            {
+                if (scorePanelList.IsScrolledToStart)
+                    nextPageRequest = FetchNextPage(-1, fetchScoresCallback);
+                else if (scorePanelList.IsScrolledToEnd)
+                    nextPageRequest = FetchNextPage(1, fetchScoresCallback);
+
+                if (nextPageRequest != null)
+                {
+                    nextPageRequest.Success += () => nextPageRequest = null;
+                    nextPageRequest.Failure += _ => nextPageRequest = null;
+
+                    api.Queue(nextPageRequest);
+                }
+            }
+        }
+
         /// <summary>
         /// Performs a fetch/refresh of scores to be displayed.
         /// </summary>
@@ -183,6 +202,18 @@ namespace osu.Game.Screens.Ranking
         /// <returns>An <see cref="APIRequest"/> responsible for the fetch operation. This will be queued and performed automatically.</returns>
         protected virtual APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
+        protected virtual APIRequest FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
+
+        private bool hasAnyScores;
+
+        private void fetchScoresCallback(IEnumerable<ScoreInfo> scores) => Schedule(() =>
+        {
+            foreach (var s in scores)
+                addScore(s);
+
+            hasAnyScores = true;
+        });
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 0f8bc82ac0..aba8314732 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -26,6 +26,10 @@ namespace osu.Game.Screens.Ranking
         /// </summary>
         private const float expanded_panel_spacing = 15;
 
+        public bool IsScrolledToStart => flow.Count > 0 && scroll.ScrollableExtent > 0 && scroll.Current <= 100;
+
+        public bool IsScrolledToEnd => flow.Count > 0 && scroll.ScrollableExtent > 0 && scroll.IsScrolledToEnd(100);
+
         /// <summary>
         /// An action to be invoked if a <see cref="ScorePanel"/> is clicked while in an expanded state.
         /// </summary>

From 113fac84ddf195b10d1ae3a9b1cd1e437c94d0ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Jul 2020 21:14:04 +0900
Subject: [PATCH 03886/10326] Fix circle container type

---
 osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs | 2 +-
 1 file changed, 1 insertion(+), 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 b87e112d10..07dc6021c9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             lastPosition = newPos;
         }
 
-        private class FollowCircleContainer : Container
+        private class FollowCircleContainer : CircularContainer
         {
             public override bool HandlePositionalInput => true;
         }

From 50f72ac9cb90074f647d76085b515d4ce8d9b45d Mon Sep 17 00:00:00 2001
From: jorolf <jorolf@gmx.de>
Date: Wed, 22 Jul 2020 22:10:59 +0200
Subject: [PATCH 03887/10326] rename classes

---
 ...neHueAnimation.cs => TestSceneLogoAnimation.cs} | 10 +++++-----
 .../Sprites/{HueAnimation.cs => LogoAnimation.cs}  | 14 +++++++-------
 osu.Game/Screens/Menu/IntroTriangles.cs            |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename osu.Game.Tests/Visual/UserInterface/{TestSceneHueAnimation.cs => TestSceneLogoAnimation.cs} (85%)
 rename osu.Game/Graphics/Sprites/{HueAnimation.cs => LogoAnimation.cs} (79%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoAnimation.cs
similarity index 85%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneLogoAnimation.cs
index 9c5888d072..155d043bf9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoAnimation.cs
@@ -11,14 +11,14 @@ using osu.Game.Graphics.Sprites;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestSceneHueAnimation : OsuTestScene
+    public class TestSceneLogoAnimation : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load(LargeTextureStore textures)
         {
-            HueAnimation anim2;
+            LogoAnimation anim2;
 
-            Add(anim2 = new HueAnimation
+            Add(anim2 = new LogoAnimation
             {
                 RelativeSizeAxes = Axes.Both,
                 FillMode = FillMode.Fit,
@@ -26,9 +26,9 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Colour = Colour4.White,
             });
 
-            HueAnimation anim;
+            LogoAnimation anim;
 
-            Add(anim = new HueAnimation
+            Add(anim = new LogoAnimation
             {
                 RelativeSizeAxes = Axes.Both,
                 FillMode = FillMode.Fit,
diff --git a/osu.Game/Graphics/Sprites/HueAnimation.cs b/osu.Game/Graphics/Sprites/LogoAnimation.cs
similarity index 79%
rename from osu.Game/Graphics/Sprites/HueAnimation.cs
rename to osu.Game/Graphics/Sprites/LogoAnimation.cs
index 8ad68ace05..b1383065fe 100644
--- a/osu.Game/Graphics/Sprites/HueAnimation.cs
+++ b/osu.Game/Graphics/Sprites/LogoAnimation.cs
@@ -11,13 +11,13 @@ using osu.Framework.Graphics.Textures;
 
 namespace osu.Game.Graphics.Sprites
 {
-    public class HueAnimation : Sprite
+    public class LogoAnimation : Sprite
     {
         [BackgroundDependencyLoader]
         private void load(ShaderManager shaders, TextureStore textures)
         {
-            TextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"HueAnimation");
-            RoundedTextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"HueAnimation"); // Masking isn't supported for now
+            TextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"LogoAnimation");
+            RoundedTextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"LogoAnimation"); // Masking isn't supported for now
         }
 
         private float animationProgress;
@@ -36,15 +36,15 @@ namespace osu.Game.Graphics.Sprites
 
         public override bool IsPresent => true;
 
-        protected override DrawNode CreateDrawNode() => new HueAnimationDrawNode(this);
+        protected override DrawNode CreateDrawNode() => new LogoAnimationDrawNode(this);
 
-        private class HueAnimationDrawNode : SpriteDrawNode
+        private class LogoAnimationDrawNode : SpriteDrawNode
         {
-            private HueAnimation source => (HueAnimation)Source;
+            private LogoAnimation source => (LogoAnimation)Source;
 
             private float progress;
 
-            public HueAnimationDrawNode(HueAnimation source)
+            public LogoAnimationDrawNode(LogoAnimation source)
                 : base(source)
             {
             }
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index b56ba6c8a4..a9ef20436f 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -260,7 +260,7 @@ namespace osu.Game.Screens.Menu
 
             private class LazerLogo : CompositeDrawable
             {
-                private HueAnimation highlight, background;
+                private LogoAnimation highlight, background;
 
                 public float Progress
                 {
@@ -282,13 +282,13 @@ namespace osu.Game.Screens.Menu
                 {
                     InternalChildren = new Drawable[]
                     {
-                        highlight = new HueAnimation
+                        highlight = new LogoAnimation
                         {
                             RelativeSizeAxes = Axes.Both,
                             Texture = textures.Get(@"Intro/Triangles/logo-highlight"),
                             Colour = Color4.White,
                         },
-                        background = new HueAnimation
+                        background = new LogoAnimation
                         {
                             RelativeSizeAxes = Axes.Both,
                             Texture = textures.Get(@"Intro/Triangles/logo-background"),

From ee05d5cb14b7d946a0335f9f7208b6213da6ed57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jul 2020 09:06:15 +0900
Subject: [PATCH 03888/10326] Remove no-longer-necessary play trigger on skin
 change

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

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index e74585990a..fa917cda32 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -39,10 +39,6 @@ namespace osu.Game.Screens.Play
                 Looping = true,
             });
 
-            // PopIn is called before updating the skin, and when a sample is updated, its "playing" value is reset
-            // the sample must be played again
-            pauseLoop.OnSkinChanged += () => pauseLoop.Play();
-
             // SkinnableSound only plays a sound if its aggregate volume is > 0, so the volume must be turned up before playing it
             pauseLoop.VolumeTo(minimum_volume);
         }

From 4102dae999cb7f63294b033898885d50afbc799b Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 22 Jul 2020 21:45:27 +0200
Subject: [PATCH 03889/10326] Revert commit 939441ae

---
 osu.Desktop/Windows/GameplayWinKeyHandler.cs  | 14 +++++++-------
 osu.Game/Configuration/SessionStatics.cs      |  4 +---
 osu.Game/Screens/Play/Player.cs               |  2 +-
 .../Screens/Play/ScreenSuspensionHandler.cs   | 19 ++-----------------
 4 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/osu.Desktop/Windows/GameplayWinKeyHandler.cs b/osu.Desktop/Windows/GameplayWinKeyHandler.cs
index d5ef89c680..4f74a4f492 100644
--- a/osu.Desktop/Windows/GameplayWinKeyHandler.cs
+++ b/osu.Desktop/Windows/GameplayWinKeyHandler.cs
@@ -11,26 +11,26 @@ namespace osu.Desktop.Windows
 {
     public class GameplayWinKeyHandler : Component
     {
+        private Bindable<bool> allowScreenSuspension;
         private Bindable<bool> disableWinKey;
-        private Bindable<bool> disableWinKeySetting;
 
         private GameHost host;
 
         [BackgroundDependencyLoader]
-        private void load(GameHost host, OsuConfigManager config, SessionStatics statics)
+        private void load(GameHost host, OsuConfigManager config)
         {
             this.host = host;
 
-            disableWinKey = statics.GetBindable<bool>(Static.DisableWindowsKey);
-            disableWinKey.ValueChanged += toggleWinKey;
+            allowScreenSuspension = host.AllowScreenSuspension.GetBoundCopy();
+            allowScreenSuspension.ValueChanged += toggleWinKey;
 
-            disableWinKeySetting = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey);
-            disableWinKeySetting.BindValueChanged(t => disableWinKey.TriggerChange(), true);
+            disableWinKey = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey);
+            disableWinKey.BindValueChanged(t => allowScreenSuspension.TriggerChange(), true);
         }
 
         private void toggleWinKey(ValueChangedEvent<bool> e)
         {
-            if (e.NewValue && disableWinKeySetting.Value)
+            if (!e.NewValue && disableWinKey.Value)
                 host.InputThread.Scheduler.Add(WindowsKey.Disable);
             else
                 host.InputThread.Scheduler.Add(WindowsKey.Enable);
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 7aad79b5ad..40b2adb867 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -12,14 +12,12 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
-            Set(Static.DisableWindowsKey, false);
         }
     }
 
     public enum Static
     {
         LoginOverlayDisplayed,
-        MutedAudioNotificationShownOnce,
-        DisableWindowsKey
+        MutedAudioNotificationShownOnce
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e0721d55f7..541275cf55 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Screens.Play
             InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
 
             AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap));
-            AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer, DrawableRuleset.HasReplayLoaded));
+            AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer));
 
             dependencies.CacheAs(gameplayBeatmap);
 
diff --git a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
index 6865db5a5e..8585a5c309 100644
--- a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
+++ b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
@@ -8,7 +8,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
-using osu.Game.Configuration;
 
 namespace osu.Game.Screens.Play
 {
@@ -19,18 +18,13 @@ namespace osu.Game.Screens.Play
     {
         private readonly GameplayClockContainer gameplayClockContainer;
         private Bindable<bool> isPaused;
-        private readonly Bindable<bool> hasReplayLoaded;
 
         [Resolved]
         private GameHost host { get; set; }
 
-        [Resolved]
-        private SessionStatics statics { get; set; }
-
-        public ScreenSuspensionHandler([NotNull] GameplayClockContainer gameplayClockContainer, Bindable<bool> hasReplayLoaded)
+        public ScreenSuspensionHandler([NotNull] GameplayClockContainer gameplayClockContainer)
         {
             this.gameplayClockContainer = gameplayClockContainer ?? throw new ArgumentNullException(nameof(gameplayClockContainer));
-            this.hasReplayLoaded = hasReplayLoaded.GetBoundCopy();
         }
 
         protected override void LoadComplete()
@@ -42,12 +36,7 @@ namespace osu.Game.Screens.Play
             Debug.Assert(host.AllowScreenSuspension.Value);
 
             isPaused = gameplayClockContainer.IsPaused.GetBoundCopy();
-            isPaused.BindValueChanged(paused =>
-            {
-                host.AllowScreenSuspension.Value = paused.NewValue;
-                statics.Set(Static.DisableWindowsKey, !paused.NewValue && !hasReplayLoaded.Value);
-            }, true);
-            hasReplayLoaded.BindValueChanged(_ => isPaused.TriggerChange(), true);
+            isPaused.BindValueChanged(paused => host.AllowScreenSuspension.Value = paused.NewValue, true);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -55,13 +44,9 @@ namespace osu.Game.Screens.Play
             base.Dispose(isDisposing);
 
             isPaused?.UnbindAll();
-            hasReplayLoaded.UnbindAll();
 
             if (host != null)
-            {
                 host.AllowScreenSuspension.Value = true;
-                statics.Set(Static.DisableWindowsKey, false);
-            }
         }
     }
 }

From acff270e969cde58d12893fc891351d3d06afdbd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jul 2020 19:14:18 +0900
Subject: [PATCH 03890/10326] Fix failing test by moving slider closer

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index c3b4d2625e..854626d362 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             const double time_slider = 1500;
             const double time_circle = 1510;
             Vector2 positionCircle = Vector2.Zero;
-            Vector2 positionSlider = new Vector2(80);
+            Vector2 positionSlider = new Vector2(30);
 
             var hitObjects = new List<OsuHitObject>
             {

From 5e6adfff99b1b348897ab4606aef7f910016560c Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 23 Jul 2020 12:45:14 +0200
Subject: [PATCH 03891/10326] Disable windows key only while in gameplay.

---
 osu.Desktop/OsuGameDesktop.cs                |  2 +-
 osu.Desktop/Windows/GameplayWinKeyHandler.cs | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index d05a4af126..6eefee3b50 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -101,7 +101,7 @@ namespace osu.Desktop
             LoadComponentAsync(new DiscordRichPresence(), Add);
 
             if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
-                LoadComponentAsync(new GameplayWinKeyHandler(), Add);
+                LoadComponentAsync(new GameplayWinKeyHandler(ScreenStack), Add);
         }
 
         protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)
diff --git a/osu.Desktop/Windows/GameplayWinKeyHandler.cs b/osu.Desktop/Windows/GameplayWinKeyHandler.cs
index 4f74a4f492..96154356d0 100644
--- a/osu.Desktop/Windows/GameplayWinKeyHandler.cs
+++ b/osu.Desktop/Windows/GameplayWinKeyHandler.cs
@@ -1,11 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
+using osu.Game.Screens;
+using osu.Game.Screens.Play;
 
 namespace osu.Desktop.Windows
 {
@@ -14,8 +17,16 @@ namespace osu.Desktop.Windows
         private Bindable<bool> allowScreenSuspension;
         private Bindable<bool> disableWinKey;
 
+        private readonly OsuScreenStack screenStack;
         private GameHost host;
 
+        private Type currentScreenType => screenStack.CurrentScreen?.GetType();
+
+        public GameplayWinKeyHandler(OsuScreenStack stack)
+        {
+            screenStack = stack;
+        }
+
         [BackgroundDependencyLoader]
         private void load(GameHost host, OsuConfigManager config)
         {
@@ -30,7 +41,9 @@ namespace osu.Desktop.Windows
 
         private void toggleWinKey(ValueChangedEvent<bool> e)
         {
-            if (!e.NewValue && disableWinKey.Value)
+            var isPlayer = typeof(Player).IsAssignableFrom(currentScreenType) && currentScreenType != typeof(ReplayPlayer);
+
+            if (!e.NewValue && disableWinKey.Value && isPlayer)
                 host.InputThread.Scheduler.Add(WindowsKey.Disable);
             else
                 host.InputThread.Scheduler.Add(WindowsKey.Enable);

From f883cb85d72ff2f98ec87a1f207e239b805e2c8b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Jul 2020 21:24:31 +0900
Subject: [PATCH 03892/10326] Null out the sample too

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 5059ec1231..07f40f763b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -94,6 +94,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.LoadSamples();
 
             slidingSample?.Expire();
+            slidingSample = null;
 
             var firstSample = HitObject.Samples.FirstOrDefault();
 

From d0b35d7b32895ff3f988c0f6e85fa86eaacaad0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jul 2020 22:13:37 +0900
Subject: [PATCH 03893/10326] 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 c0c75b8d71..e5b0245dd0 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.722.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.723.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e8c333b6b1..5af28ae11a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.722.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.723.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 8d1b837995..4a94ec33d8 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.Framework.iOS" Version="2020.722.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.723.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.722.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.723.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 76284a0f018f2c8c3a502db24360081e0c1f5996 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Jul 2020 23:18:43 +0900
Subject: [PATCH 03894/10326] Move cancellation out of condition

---
 .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index d5aeecae04..1b5b448e1f 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -188,12 +188,11 @@ namespace osu.Game.Screens.Select.Carousel
             if (Item.State.Value != CarouselItemState.Collapsed && Alpha == 0)
                 starCounter.ReplayAnimation();
 
-            if (Item.State.Value == CarouselItemState.Collapsed)
-                starDifficultyCancellationSource?.Cancel();
-            else
-            {
-                starDifficultyCancellationSource?.Cancel();
+            starDifficultyCancellationSource?.Cancel();
 
+            // Only compute difficulty when the item is visible.
+            if (Item.State.Value != CarouselItemState.Collapsed)
+            {
                 // We've potentially cancelled the computation above so a new bindable is required.
                 starDifficultyBindable = difficultyManager.GetTrackedBindable(beatmap, (starDifficultyCancellationSource = new CancellationTokenSource()).Token);
                 starDifficultyBindable.BindValueChanged(d => starCounter.Current = (float)d.NewValue.Stars, true);

From f75f1231b7f2300b260e25e7dc8f2d4d273b2bc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jul 2020 10:41:09 +0900
Subject: [PATCH 03895/10326] Invert conditional for readability

---
 osu.Game/Graphics/Cursor/MenuCursorContainer.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs b/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
index 02bfb3fad6..3015c44613 100644
--- a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
@@ -58,10 +58,11 @@ namespace osu.Game.Graphics.Cursor
 
             foreach (var d in inputManager.HoveredDrawables)
             {
-                if (!(d is IProvideCursor p) || !p.ProvidingUserCursor) continue;
-
-                newTarget = p;
-                break;
+                if (d is IProvideCursor p && p.ProvidingUserCursor)
+                {
+                    newTarget = p;
+                    break;
+                }
             }
 
             if (currentTarget == newTarget)

From 264bd7ced1c8a8caab663eebba2114bfefa766a9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jul 2020 13:38:53 +0900
Subject: [PATCH 03896/10326] Apply general refactoring from review

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index a9f34acd14..12d472e8c6 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Beatmaps
         // Too many simultaneous updates can lead to stutters. One thread seems to work fine for song select display purposes.
         private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(1, nameof(BeatmapDifficultyManager));
 
-        // A cache that keeps references to BeatmapInfos for 60sec.
+        // A permanent cache to prevent re-computations.
         private readonly ConcurrentDictionary<DifficultyCacheLookup, StarDifficulty> difficultyCache = new ConcurrentDictionary<DifficultyCacheLookup, StarDifficulty>();
 
         // All bindables that should be updated along with the current ruleset + mods.
@@ -48,29 +48,29 @@ namespace osu.Game.Beatmaps
         }
 
         /// <summary>
-        /// Retrieves an <see cref="IBindable{StarDifficulty}"/> containing the star difficulty of a <see cref="BeatmapInfo"/> with a given <see cref="RulesetInfo"/> and <see cref="Mod"/> combination.
+        /// Retrieves a bindable containing the star difficulty of a <see cref="BeatmapInfo"/> with a given <see cref="RulesetInfo"/> and <see cref="Mod"/> combination.
         /// </summary>
         /// <remarks>
-        /// This <see cref="Bindable{StarDifficulty}"/> will not update to follow the currently-selected ruleset and mods.
+        /// The bindable will not update to follow the currently-selected ruleset and mods.
         /// </remarks>
         /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
         /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with.</param>
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
-        /// <returns>An <see cref="IBindable{StarDifficulty}"/> that is updated to contain the star difficulty when it becomes available.</returns>
+        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
         public IBindable<StarDifficulty> GetUntrackedBindable([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null,
                                                               CancellationToken cancellationToken = default)
             => createBindable(beatmapInfo, rulesetInfo, mods, cancellationToken);
 
         /// <summary>
-        /// Retrieves a <see cref="IBindable{StarDifficulty}"/> containing the star difficulty of a <see cref="BeatmapInfo"/> that follows the user's currently-selected ruleset and mods.
+        /// Retrieves a bindable containing the star difficulty of a <see cref="BeatmapInfo"/> that follows the user's currently-selected ruleset and mods.
         /// </summary>
         /// <remarks>
-        /// Ensure to hold a local reference of the returned <see cref="Bindable{StarDifficulty}"/> in order to receive value-changed events.
+        /// Ensure to hold a local reference of the returned bindable in order to receive value-changed events.
         /// </remarks>
         /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
-        /// <returns>An <see cref="IBindable{StarDifficulty}"/> that is updated to contain the star difficulty when it becomes available, or when the currently-selected ruleset and mods change.</returns>
+        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available, or when the currently-selected ruleset and mods change.</returns>
         public IBindable<StarDifficulty> GetTrackedBindable([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
         {
             var bindable = createBindable(beatmapInfo, currentRuleset.Value, currentMods.Value, cancellationToken);
@@ -89,7 +89,7 @@ namespace osu.Game.Beatmaps
         public async Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null,
                                                              CancellationToken cancellationToken = default)
         {
-            if (tryGetGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
+            if (tryGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
                 return existing;
 
             return await Task.Factory.StartNew(() => computeDifficulty(key, beatmapInfo, rulesetInfo), cancellationToken,
@@ -105,7 +105,7 @@ namespace osu.Game.Beatmaps
         /// <returns>The <see cref="StarDifficulty"/>.</returns>
         public StarDifficulty GetDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null)
         {
-            if (tryGetGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
+            if (tryGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
                 return existing;
 
             return computeDifficulty(key, beatmapInfo, rulesetInfo);
@@ -204,7 +204,7 @@ namespace osu.Game.Beatmaps
         /// <param name="existingDifficulty">The existing difficulty value, if present.</param>
         /// <param name="key">The <see cref="DifficultyCacheLookup"/> key that was used to perform this lookup. This can be further used to query <see cref="computeDifficulty"/>.</param>
         /// <returns>Whether an existing difficulty was found.</returns>
-        private bool tryGetGetExisting(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo, IReadOnlyList<Mod> mods, out StarDifficulty existingDifficulty, out DifficultyCacheLookup key)
+        private bool tryGetExisting(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo, IReadOnlyList<Mod> mods, out StarDifficulty existingDifficulty, out DifficultyCacheLookup key)
         {
             // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
             rulesetInfo ??= beatmapInfo.Ruleset;

From de007cc1c63da3bd88ee52881a31f8cce91c2ec0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jul 2020 13:40:01 +0900
Subject: [PATCH 03897/10326] Use IEnumerable mods instead of IReadOnlyList

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 12d472e8c6..914874e210 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Beatmaps
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
         /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
-        public IBindable<StarDifficulty> GetUntrackedBindable([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null,
+        public IBindable<StarDifficulty> GetUntrackedBindable([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null,
                                                               CancellationToken cancellationToken = default)
             => createBindable(beatmapInfo, rulesetInfo, mods, cancellationToken);
 
@@ -86,7 +86,7 @@ namespace osu.Game.Beatmaps
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops computing the star difficulty.</param>
         /// <returns>The <see cref="StarDifficulty"/>.</returns>
-        public async Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null,
+        public async Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null,
                                                              CancellationToken cancellationToken = default)
         {
             if (tryGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
@@ -103,7 +103,7 @@ namespace osu.Game.Beatmaps
         /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with.</param>
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
         /// <returns>The <see cref="StarDifficulty"/>.</returns>
-        public StarDifficulty GetDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IReadOnlyList<Mod> mods = null)
+        public StarDifficulty GetDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null)
         {
             if (tryGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
                 return existing;
@@ -138,7 +138,7 @@ namespace osu.Game.Beatmaps
         /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to update with.</param>
         /// <param name="mods">The <see cref="Mod"/>s to update with.</param>
         /// <param name="cancellationToken">A token that may be used to cancel this update.</param>
-        private void updateBindable([NotNull] BindableStarDifficulty bindable, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IReadOnlyList<Mod> mods, CancellationToken cancellationToken = default)
+        private void updateBindable([NotNull] BindableStarDifficulty bindable, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods, CancellationToken cancellationToken = default)
         {
             GetDifficultyAsync(bindable.Beatmap, rulesetInfo, mods, cancellationToken).ContinueWith(t =>
             {
@@ -159,7 +159,7 @@ namespace osu.Game.Beatmaps
         /// <param name="initialMods">The initial <see cref="Mod"/>s to get the difficulty with.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
         /// <returns>The <see cref="BindableStarDifficulty"/>.</returns>
-        private BindableStarDifficulty createBindable([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo initialRulesetInfo, [CanBeNull] IReadOnlyList<Mod> initialMods,
+        private BindableStarDifficulty createBindable([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo initialRulesetInfo, [CanBeNull] IEnumerable<Mod> initialMods,
                                                       CancellationToken cancellationToken)
         {
             var bindable = new BindableStarDifficulty(beatmapInfo, cancellationToken);
@@ -204,7 +204,7 @@ namespace osu.Game.Beatmaps
         /// <param name="existingDifficulty">The existing difficulty value, if present.</param>
         /// <param name="key">The <see cref="DifficultyCacheLookup"/> key that was used to perform this lookup. This can be further used to query <see cref="computeDifficulty"/>.</param>
         /// <returns>Whether an existing difficulty was found.</returns>
-        private bool tryGetExisting(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo, IReadOnlyList<Mod> mods, out StarDifficulty existingDifficulty, out DifficultyCacheLookup key)
+        private bool tryGetExisting(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo, IEnumerable<Mod> mods, out StarDifficulty existingDifficulty, out DifficultyCacheLookup key)
         {
             // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
             rulesetInfo ??= beatmapInfo.Ruleset;

From b10b99a6703c9a68d2f1da1b013a46460548a988 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jul 2020 13:52:43 +0900
Subject: [PATCH 03898/10326] Change method signatures to remove
 tracked/untracked

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 37 +++++++++----------
 .../Carousel/DrawableCarouselBeatmap.cs       |  2 +-
 .../Screens/Select/Details/AdvancedStats.cs   |  4 +-
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 914874e210..d86c0dd945 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -47,6 +47,19 @@ namespace osu.Game.Beatmaps
             currentMods.BindValueChanged(_ => updateTrackedBindables(), true);
         }
 
+        /// <summary>
+        /// Retrieves a bindable containing the star difficulty of a <see cref="BeatmapInfo"/> that follows the currently-selected ruleset and mods.
+        /// </summary>
+        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
+        /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
+        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
+        public IBindable<StarDifficulty> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
+        {
+            var bindable = createBindable(beatmapInfo, currentRuleset.Value, currentMods.Value, cancellationToken);
+            trackedBindables.Add(bindable);
+            return bindable;
+        }
+
         /// <summary>
         /// Retrieves a bindable containing the star difficulty of a <see cref="BeatmapInfo"/> with a given <see cref="RulesetInfo"/> and <see cref="Mod"/> combination.
         /// </summary>
@@ -54,30 +67,14 @@ namespace osu.Game.Beatmaps
         /// The bindable will not update to follow the currently-selected ruleset and mods.
         /// </remarks>
         /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
-        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with.</param>
-        /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
+        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with. If <c>null</c>, the difficulty will change along with the game-wide ruleset and mods.</param>
+        /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with. If <c>null</c>, the difficulty will change along with the game-wide mods.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
         /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
-        public IBindable<StarDifficulty> GetUntrackedBindable([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null,
-                                                              CancellationToken cancellationToken = default)
+        public IBindable<StarDifficulty> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, [NotNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods,
+                                                               CancellationToken cancellationToken = default)
             => createBindable(beatmapInfo, rulesetInfo, mods, cancellationToken);
 
-        /// <summary>
-        /// Retrieves a bindable containing the star difficulty of a <see cref="BeatmapInfo"/> that follows the user's currently-selected ruleset and mods.
-        /// </summary>
-        /// <remarks>
-        /// Ensure to hold a local reference of the returned bindable in order to receive value-changed events.
-        /// </remarks>
-        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
-        /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
-        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available, or when the currently-selected ruleset and mods change.</returns>
-        public IBindable<StarDifficulty> GetTrackedBindable([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
-        {
-            var bindable = createBindable(beatmapInfo, currentRuleset.Value, currentMods.Value, cancellationToken);
-            trackedBindables.Add(bindable);
-            return bindable;
-        }
-
         /// <summary>
         /// Retrieves the difficulty of a <see cref="BeatmapInfo"/>.
         /// </summary>
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 1b5b448e1f..c559b4f8f5 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -194,7 +194,7 @@ namespace osu.Game.Screens.Select.Carousel
             if (Item.State.Value != CarouselItemState.Collapsed)
             {
                 // We've potentially cancelled the computation above so a new bindable is required.
-                starDifficultyBindable = difficultyManager.GetTrackedBindable(beatmap, (starDifficultyCancellationSource = new CancellationTokenSource()).Token);
+                starDifficultyBindable = difficultyManager.GetBindableDifficulty(beatmap, (starDifficultyCancellationSource = new CancellationTokenSource()).Token);
                 starDifficultyBindable.BindValueChanged(d => starCounter.Current = (float)d.NewValue.Stars, true);
             }
 
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index aefba397b9..1557a025ef 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -161,8 +161,8 @@ namespace osu.Game.Screens.Select.Details
 
             var ourSource = starDifficultyCancellationSource = new CancellationTokenSource();
 
-            normalStarDifficulty = difficultyManager.GetUntrackedBindable(Beatmap, ruleset.Value, cancellationToken: ourSource.Token);
-            moddedStarDifficulty = difficultyManager.GetUntrackedBindable(Beatmap, ruleset.Value, mods.Value, ourSource.Token);
+            normalStarDifficulty = difficultyManager.GetBindableDifficulty(Beatmap, ruleset.Value, null, cancellationToken: ourSource.Token);
+            moddedStarDifficulty = difficultyManager.GetBindableDifficulty(Beatmap, ruleset.Value, mods.Value, ourSource.Token);
 
             normalStarDifficulty.BindValueChanged(_ => updateDisplay());
             moddedStarDifficulty.BindValueChanged(_ => updateDisplay(), true);

From 44b0aae20d753f707065d21cf9d25da7b52936c3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jul 2020 13:54:47 +0900
Subject: [PATCH 03899/10326] Allow nullable ruleset, reword xmldoc

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

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index d86c0dd945..5e644fbf1c 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -67,11 +67,11 @@ namespace osu.Game.Beatmaps
         /// The bindable will not update to follow the currently-selected ruleset and mods.
         /// </remarks>
         /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
-        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with. If <c>null</c>, the difficulty will change along with the game-wide ruleset and mods.</param>
-        /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with. If <c>null</c>, the difficulty will change along with the game-wide mods.</param>
+        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with. If <c>null</c>, the <paramref name="beatmapInfo"/>'s ruleset is used.</param>
+        /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with. If <c>null</c>, no mods will be assumed.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
         /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
-        public IBindable<StarDifficulty> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, [NotNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods,
+        public IBindable<StarDifficulty> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods,
                                                                CancellationToken cancellationToken = default)
             => createBindable(beatmapInfo, rulesetInfo, mods, cancellationToken);
 

From d093dc09f94a194eb8e1d936c7ccf36b3a1ff712 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jul 2020 14:10:05 +0900
Subject: [PATCH 03900/10326] Limit notification text length to avoid large
 error messages degrading performance

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index f4bb10340e..d6a07651e2 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -18,6 +18,7 @@ using osu.Game.Screens.Menu;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Humanizer;
 using JetBrains.Annotations;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
@@ -759,7 +760,7 @@ namespace osu.Game
                     Schedule(() => notifications.Post(new SimpleNotification
                     {
                         Icon = entry.Level == LogLevel.Important ? FontAwesome.Solid.ExclamationCircle : FontAwesome.Solid.Bomb,
-                        Text = entry.Message + (entry.Exception != null && IsDeployedBuild ? "\n\nThis error has been automatically reported to the devs." : string.Empty),
+                        Text = entry.Message.Truncate(256) + (entry.Exception != null && IsDeployedBuild ? "\n\nThis error has been automatically reported to the devs." : string.Empty),
                     }));
                 }
                 else if (recentLogCount == short_term_display_limit)

From 4e0f16a45059996dd0ac01ef70cf6bace62b70a7 Mon Sep 17 00:00:00 2001
From: Poliwrath <Poliwrath@users.noreply.github.com>
Date: Fri, 24 Jul 2020 02:00:18 -0400
Subject: [PATCH 03901/10326] Add JPEG screenshot quality setting

---
 osu.Game/Configuration/OsuConfigManager.cs                   | 2 ++
 osu.Game/Graphics/ScreenshotManager.cs                       | 5 ++++-
 .../Overlays/Settings/Sections/Graphics/DetailSettings.cs    | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 268328272c..a45f5994b7 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -106,6 +106,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.Version, string.Empty);
 
             Set(OsuSetting.ScreenshotFormat, ScreenshotFormat.Jpg);
+            Set(OsuSetting.ScreenshotJpegQuality, 75, 0, 100);
             Set(OsuSetting.ScreenshotCaptureMenuCursor, false);
 
             Set(OsuSetting.SongSelectRightMouseScroll, false);
@@ -212,6 +213,7 @@ namespace osu.Game.Configuration
         ShowConvertedBeatmaps,
         Skin,
         ScreenshotFormat,
+        ScreenshotJpegQuality,
         ScreenshotCaptureMenuCursor,
         SongSelectRightMouseScroll,
         BeatmapSkins,
diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index 9804aefce8..091e206a80 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -19,6 +19,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Jpeg;
 
 namespace osu.Game.Graphics
 {
@@ -33,6 +34,7 @@ namespace osu.Game.Graphics
         public IBindable<bool> CursorVisibility => cursorVisibility;
 
         private Bindable<ScreenshotFormat> screenshotFormat;
+        private Bindable<int> screenshotJpegQuality;
         private Bindable<bool> captureMenuCursor;
 
         [Resolved]
@@ -51,6 +53,7 @@ namespace osu.Game.Graphics
             this.storage = storage.GetStorageForDirectory(@"screenshots");
 
             screenshotFormat = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat);
+            screenshotJpegQuality = config.GetBindable<int>(OsuSetting.ScreenshotJpegQuality);
             captureMenuCursor = config.GetBindable<bool>(OsuSetting.ScreenshotCaptureMenuCursor);
 
             shutter = audio.Samples.Get("UI/shutter");
@@ -119,7 +122,7 @@ namespace osu.Game.Graphics
                         break;
 
                     case ScreenshotFormat.Jpg:
-                        image.SaveAsJpeg(stream);
+                        image.SaveAsJpeg(stream, new JpegEncoder { Quality = screenshotJpegQuality.Value });
                         break;
 
                     default:
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
index 3089040f96..8b783fb104 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
@@ -31,6 +31,11 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     LabelText = "Screenshot format",
                     Bindable = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat)
                 },
+                new SettingsSlider<int>
+                {
+                    LabelText = "JPEG Screenshot quality",
+                    Bindable = config.GetBindable<int>(OsuSetting.ScreenshotJpegQuality)
+                },
                 new SettingsCheckbox
                 {
                     LabelText = "Show menu cursor in screenshots",

From 05235c70c53186c5b3bceca9d8ad3963463ee9ec Mon Sep 17 00:00:00 2001
From: Poliwrath <Poliwrath@users.noreply.github.com>
Date: Fri, 24 Jul 2020 02:26:45 -0400
Subject: [PATCH 03902/10326] remove jpeg quality setting, use 92 for quality

---
 osu.Game/Configuration/OsuConfigManager.cs                  | 2 --
 osu.Game/Graphics/ScreenshotManager.cs                      | 6 +++---
 .../Overlays/Settings/Sections/Graphics/DetailSettings.cs   | 5 -----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index a45f5994b7..268328272c 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -106,7 +106,6 @@ namespace osu.Game.Configuration
             Set(OsuSetting.Version, string.Empty);
 
             Set(OsuSetting.ScreenshotFormat, ScreenshotFormat.Jpg);
-            Set(OsuSetting.ScreenshotJpegQuality, 75, 0, 100);
             Set(OsuSetting.ScreenshotCaptureMenuCursor, false);
 
             Set(OsuSetting.SongSelectRightMouseScroll, false);
@@ -213,7 +212,6 @@ namespace osu.Game.Configuration
         ShowConvertedBeatmaps,
         Skin,
         ScreenshotFormat,
-        ScreenshotJpegQuality,
         ScreenshotCaptureMenuCursor,
         SongSelectRightMouseScroll,
         BeatmapSkins,
diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index 091e206a80..d1f6fd445e 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -34,7 +34,6 @@ namespace osu.Game.Graphics
         public IBindable<bool> CursorVisibility => cursorVisibility;
 
         private Bindable<ScreenshotFormat> screenshotFormat;
-        private Bindable<int> screenshotJpegQuality;
         private Bindable<bool> captureMenuCursor;
 
         [Resolved]
@@ -53,7 +52,6 @@ namespace osu.Game.Graphics
             this.storage = storage.GetStorageForDirectory(@"screenshots");
 
             screenshotFormat = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat);
-            screenshotJpegQuality = config.GetBindable<int>(OsuSetting.ScreenshotJpegQuality);
             captureMenuCursor = config.GetBindable<bool>(OsuSetting.ScreenshotCaptureMenuCursor);
 
             shutter = audio.Samples.Get("UI/shutter");
@@ -122,7 +120,9 @@ namespace osu.Game.Graphics
                         break;
 
                     case ScreenshotFormat.Jpg:
-                        image.SaveAsJpeg(stream, new JpegEncoder { Quality = screenshotJpegQuality.Value });
+                        const int jpeg_quality = 92;
+
+                        image.SaveAsJpeg(stream, new JpegEncoder { Quality = jpeg_quality });
                         break;
 
                     default:
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
index 8b783fb104..3089040f96 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
@@ -31,11 +31,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     LabelText = "Screenshot format",
                     Bindable = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat)
                 },
-                new SettingsSlider<int>
-                {
-                    LabelText = "JPEG Screenshot quality",
-                    Bindable = config.GetBindable<int>(OsuSetting.ScreenshotJpegQuality)
-                },
                 new SettingsCheckbox
                 {
                     LabelText = "Show menu cursor in screenshots",

From 877b985e900a1c4669e04dcb16f47f760232aafd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jul 2020 16:11:28 +0900
Subject: [PATCH 03903/10326] Remove local cancellation token

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 1557a025ef..44c328187f 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -159,10 +159,10 @@ namespace osu.Game.Screens.Select.Details
             if (Beatmap == null)
                 return;
 
-            var ourSource = starDifficultyCancellationSource = new CancellationTokenSource();
+            starDifficultyCancellationSource = new CancellationTokenSource();
 
-            normalStarDifficulty = difficultyManager.GetBindableDifficulty(Beatmap, ruleset.Value, null, cancellationToken: ourSource.Token);
-            moddedStarDifficulty = difficultyManager.GetBindableDifficulty(Beatmap, ruleset.Value, mods.Value, ourSource.Token);
+            normalStarDifficulty = difficultyManager.GetBindableDifficulty(Beatmap, ruleset.Value, null, starDifficultyCancellationSource.Token);
+            moddedStarDifficulty = difficultyManager.GetBindableDifficulty(Beatmap, ruleset.Value, mods.Value, starDifficultyCancellationSource.Token);
 
             normalStarDifficulty.BindValueChanged(_ => updateDisplay());
             moddedStarDifficulty.BindValueChanged(_ => updateDisplay(), true);

From dbe9180c55c4e4d6a8991b76aa48a9a4b5f46674 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jul 2020 16:38:48 +0900
Subject: [PATCH 03904/10326] Rename class and remove screen conditionals

---
 osu.Desktop/OsuGameDesktop.cs                 |  2 +-
 ...KeyHandler.cs => GameplayWinKeyBlocker.cs} | 23 +++++--------------
 osu.Desktop/Windows/WindowsKey.cs             |  2 +-
 3 files changed, 8 insertions(+), 19 deletions(-)
 rename osu.Desktop/Windows/{GameplayWinKeyHandler.cs => GameplayWinKeyBlocker.cs} (55%)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 6eefee3b50..2079f136d2 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -101,7 +101,7 @@ namespace osu.Desktop
             LoadComponentAsync(new DiscordRichPresence(), Add);
 
             if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
-                LoadComponentAsync(new GameplayWinKeyHandler(ScreenStack), Add);
+                LoadComponentAsync(new GameplayWinKeyBlocker(), Add);
         }
 
         protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)
diff --git a/osu.Desktop/Windows/GameplayWinKeyHandler.cs b/osu.Desktop/Windows/GameplayWinKeyBlocker.cs
similarity index 55%
rename from osu.Desktop/Windows/GameplayWinKeyHandler.cs
rename to osu.Desktop/Windows/GameplayWinKeyBlocker.cs
index 96154356d0..86174ceb90 100644
--- a/osu.Desktop/Windows/GameplayWinKeyHandler.cs
+++ b/osu.Desktop/Windows/GameplayWinKeyBlocker.cs
@@ -1,49 +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 System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
-using osu.Game.Screens;
-using osu.Game.Screens.Play;
 
 namespace osu.Desktop.Windows
 {
-    public class GameplayWinKeyHandler : Component
+    public class GameplayWinKeyBlocker : Component
     {
         private Bindable<bool> allowScreenSuspension;
         private Bindable<bool> disableWinKey;
 
-        private readonly OsuScreenStack screenStack;
         private GameHost host;
 
-        private Type currentScreenType => screenStack.CurrentScreen?.GetType();
-
-        public GameplayWinKeyHandler(OsuScreenStack stack)
-        {
-            screenStack = stack;
-        }
-
         [BackgroundDependencyLoader]
         private void load(GameHost host, OsuConfigManager config)
         {
             this.host = host;
 
             allowScreenSuspension = host.AllowScreenSuspension.GetBoundCopy();
-            allowScreenSuspension.ValueChanged += toggleWinKey;
+            allowScreenSuspension.BindValueChanged(_ => updateBlocking());
 
             disableWinKey = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey);
-            disableWinKey.BindValueChanged(t => allowScreenSuspension.TriggerChange(), true);
+            disableWinKey.BindValueChanged(_ => updateBlocking(), true);
         }
 
-        private void toggleWinKey(ValueChangedEvent<bool> e)
+        private void updateBlocking()
         {
-            var isPlayer = typeof(Player).IsAssignableFrom(currentScreenType) && currentScreenType != typeof(ReplayPlayer);
+            bool shouldDisable = disableWinKey.Value && !allowScreenSuspension.Value;
 
-            if (!e.NewValue && disableWinKey.Value && isPlayer)
+            if (shouldDisable)
                 host.InputThread.Scheduler.Add(WindowsKey.Disable);
             else
                 host.InputThread.Scheduler.Add(WindowsKey.Enable);
diff --git a/osu.Desktop/Windows/WindowsKey.cs b/osu.Desktop/Windows/WindowsKey.cs
index 4a815b135e..f19d741107 100644
--- a/osu.Desktop/Windows/WindowsKey.cs
+++ b/osu.Desktop/Windows/WindowsKey.cs
@@ -21,7 +21,7 @@ namespace osu.Desktop.Windows
         private static IntPtr keyHook;
 
         [StructLayout(LayoutKind.Explicit)]
-        private struct KdDllHookStruct
+        private readonly struct KdDllHookStruct
         {
             [FieldOffset(0)]
             public readonly int VkCode;

From 5f98195144d1068063bfd015d2501255afcd0a34 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jul 2020 18:16:36 +0900
Subject: [PATCH 03905/10326] Load nested hitobjects during map load

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index f275153ce3..581617b567 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -129,9 +129,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
             LoadSamples();
         }
 
-        protected override void LoadComplete()
+        protected override void LoadAsyncComplete()
         {
-            base.LoadComplete();
+            base.LoadAsyncComplete();
 
             HitObject.DefaultsApplied += onDefaultsApplied;
 
@@ -148,6 +148,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
             samplesBindable.CollectionChanged += (_, __) => LoadSamples();
 
             apply(HitObject);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             updateState(ArmedState.Idle, true);
         }

From 2b068298cc339f3134662331037569cf08b18cd3 Mon Sep 17 00:00:00 2001
From: bastoo0 <37190278+bastoo0@users.noreply.github.com>
Date: Fri, 24 Jul 2020 12:01:23 +0200
Subject: [PATCH 03906/10326] Fix inconsistency between this and
 osu-performance

The bonus value for HD is given twice here (probably a merge issue). The correct bonus is currently used on stable: https://github.com/ppy/osu-performance/blob/736515a0347ba909d5ac303df7051b600f6655be/src/performance/catch/CatchScore.cpp#L68
---
 osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
index 2ee7cea645..d700f79e5b 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
@@ -78,7 +78,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             if (mods.Any(m => m is ModHidden))
             {
-                value *= 1.05 + 0.075 * (10.0 - Math.Min(10.0, Attributes.ApproachRate)); // 7.5% for each AR below 10
                 // Hiddens gives almost nothing on max approach rate, and more the lower it is
                 if (approachRate <= 10.0)
                     value *= 1.05 + 0.075 * (10.0 - approachRate); // 7.5% for each AR below 10

From 8f841b47e68ea251a6bd7ec832007d8e50220d11 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Jul 2020 19:24:20 +0900
Subject: [PATCH 03907/10326] Cancel previous initial state computations

---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 43 +++++++++++++------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 0dc3324559..bf64175468 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -2,11 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Layout;
+using osu.Framework.Threading;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -17,7 +19,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
     {
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-        private readonly Dictionary<DrawableHitObject, Cached> hitObjectInitialStateCache = new Dictionary<DrawableHitObject, Cached>();
+        private readonly Dictionary<DrawableHitObject, InitialState> hitObjectInitialStateCache = new Dictionary<DrawableHitObject, InitialState>();
 
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
@@ -175,10 +177,10 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             // The cache may not exist if the hitobject state hasn't been computed yet (e.g. if the hitobject was added + defaults applied in the same frame).
             // In such a case, combinedObjCache will take care of updating the hitobject.
-            if (hitObjectInitialStateCache.TryGetValue(drawableObject, out var objCache))
+            if (hitObjectInitialStateCache.TryGetValue(drawableObject, out var state))
             {
                 combinedObjCache.Invalidate();
-                objCache.Invalidate();
+                state.Cache.Invalidate();
             }
         }
 
@@ -190,8 +192,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (!layoutCache.IsValid)
             {
-                foreach (var cached in hitObjectInitialStateCache.Values)
-                    cached.Invalidate();
+                foreach (var state in hitObjectInitialStateCache.Values)
+                    state.Cache.Invalidate();
                 combinedObjCache.Invalidate();
 
                 scrollingInfo.Algorithm.Reset();
@@ -215,16 +217,18 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
                 foreach (var obj in Objects)
                 {
-                    if (!hitObjectInitialStateCache.TryGetValue(obj, out var objCache))
-                        objCache = hitObjectInitialStateCache[obj] = new Cached();
+                    if (!hitObjectInitialStateCache.TryGetValue(obj, out var state))
+                        state = hitObjectInitialStateCache[obj] = new InitialState(new Cached());
 
-                    if (objCache.IsValid)
+                    if (state.Cache.IsValid)
                         continue;
 
-                    computeLifetimeStartRecursive(obj);
-                    computeInitialStateRecursive(obj);
+                    state.ScheduledComputation?.Cancel();
+                    state.ScheduledComputation = computeInitialStateRecursive(obj);
 
-                    objCache.Validate();
+                    computeLifetimeStartRecursive(obj);
+
+                    state.Cache.Validate();
                 }
 
                 combinedObjCache.Validate();
@@ -267,8 +271,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
             return scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
         }
 
-        // Cant use AddOnce() since the delegate is re-constructed every invocation
-        private void computeInitialStateRecursive(DrawableHitObject hitObject) => hitObject.Schedule(() =>
+        private ScheduledDelegate computeInitialStateRecursive(DrawableHitObject hitObject) => hitObject.Schedule(() =>
         {
             if (hitObject.HitObject is IHasDuration e)
             {
@@ -325,5 +328,19 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
         }
+
+        private class InitialState
+        {
+            [NotNull]
+            public readonly Cached Cache;
+
+            [CanBeNull]
+            public ScheduledDelegate ScheduledComputation;
+
+            public InitialState(Cached cache)
+            {
+                Cache = cache;
+            }
+        }
     }
 }

From eb84f2503657fe5c8332e18c20ac9b0281d45d87 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jul 2020 19:34:13 +0900
Subject: [PATCH 03908/10326] Adjust maximum spins to roughly match stable

---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 1c30058d5d..9699ab9502 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -26,7 +26,10 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public int SpinsRequired { get; protected set; } = 1;
 
-        public int MaximumBonusSpins => SpinsRequired;
+        /// <summary>
+        /// Number of spins available to give bonus, beyond <see cref="SpinsRequired"/>.
+        /// </summary>
+        public int MaximumBonusSpins => (int)(SpinsRequired * 1.8f); // roughly matches stable
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {

From 82e4050fddb27908c282a5f307f62b22ef62940c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jul 2020 19:41:34 +0900
Subject: [PATCH 03909/10326] Fix xmldoc

---
 .../Objects/Drawables/Pieces/SpinnerBonusDisplay.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
index 76d7f1843e..a8f5580735 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics.Sprites;
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     /// <summary>
-    /// A component that tracks spinner spins and add bonus score for it.
+    /// Shows incremental bonus score achieved for a spinner.
     /// </summary>
     public class SpinnerBonusDisplay : CompositeDrawable
     {

From dd45f0bd40d7aad6def77ce95ed2d2013cd03082 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jul 2020 21:03:55 +0900
Subject: [PATCH 03910/10326] Adjust max spins to "match" stable

---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 9699ab9502..2c03e6eeac 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -29,16 +29,21 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// <summary>
         /// Number of spins available to give bonus, beyond <see cref="SpinsRequired"/>.
         /// </summary>
-        public int MaximumBonusSpins => (int)(SpinsRequired * 1.8f); // roughly matches stable
+        public int MaximumBonusSpins { get; protected set; } = 1;
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
-            SpinsRequired = (int)(Duration / 1000 * BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 3, 5, 7.5));
+            double secondsDuration = Duration / 1000;
 
             // spinning doesn't match 1:1 with stable, so let's fudge them easier for the time being.
-            SpinsRequired = (int)Math.Max(1, SpinsRequired * 0.6);
+            double minimumRotationsPerSecond = 0.6 * BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 3, 5, 7.5);
+
+            const double maximum_rotations_per_second = 8; // close to 477rpm.
+
+            SpinsRequired = (int)Math.Max(1, (secondsDuration * minimumRotationsPerSecond));
+            MaximumBonusSpins = (int)(maximum_rotations_per_second / minimumRotationsPerSecond * secondsDuration);
         }
 
         protected override void CreateNestedHitObjects()

From a6a7961af9c2788202055efff6a9e42cfd3a7344 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Jul 2020 22:09:25 +0900
Subject: [PATCH 03911/10326] Change div to subtraction to fix calculation

---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 2c03e6eeac..619b49926e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -35,15 +35,18 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
+            // spinning doesn't match 1:1 with stable, so let's fudge them easier for the time being.
+            const double stable_matching_fudge = 0.6;
+
+            // close to 477rpm
+            const double maximum_rotations_per_second = 8;
+
             double secondsDuration = Duration / 1000;
 
-            // spinning doesn't match 1:1 with stable, so let's fudge them easier for the time being.
-            double minimumRotationsPerSecond = 0.6 * BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 3, 5, 7.5);
-
-            const double maximum_rotations_per_second = 8; // close to 477rpm.
+            double minimumRotationsPerSecond = stable_matching_fudge * BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 3, 5, 7.5);
 
             SpinsRequired = (int)Math.Max(1, (secondsDuration * minimumRotationsPerSecond));
-            MaximumBonusSpins = (int)(maximum_rotations_per_second / minimumRotationsPerSecond * secondsDuration);
+            MaximumBonusSpins = (int)((maximum_rotations_per_second - minimumRotationsPerSecond) * secondsDuration);
         }
 
         protected override void CreateNestedHitObjects()

From 7e5147761fad18ea1bd904c0d718af15d8c2cc42 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 25 Jul 2020 09:26:29 +0300
Subject: [PATCH 03912/10326] Use OverlayView for FrontPageDisplay

---
 .../News/Displays/FrontPageDisplay.cs         | 46 +++++++++----------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
index 67b5edfafd..2c228e2f78 100644
--- a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
@@ -13,18 +13,18 @@ using osuTK;
 
 namespace osu.Game.Overlays.News.Displays
 {
-    public class FrontPageDisplay : CompositeDrawable
+    public class FrontPageDisplay : OverlayView<GetNewsResponse>
     {
-        [Resolved]
-        private IAPIProvider api { get; set; }
+        protected override APIRequest<GetNewsResponse> CreateRequest() => new GetNewsRequest();
 
-        private readonly FillFlowContainer content;
-        private readonly ShowMoreButton showMore;
+        private FillFlowContainer content;
+        private ShowMoreButton showMore;
 
-        private GetNewsRequest request;
+        private GetNewsRequest olderPostsRequest;
         private Cursor lastCursor;
 
-        public FrontPageDisplay()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -60,32 +60,19 @@ namespace osu.Game.Overlays.News.Displays
                         {
                             Top = 15
                         },
-                        Action = fetchPage,
+                        Action = fetchOlderPosts,
                         Alpha = 0
                     }
                 }
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            fetchPage();
-        }
-
-        private void fetchPage()
-        {
-            request?.Cancel();
-
-            request = new GetNewsRequest(lastCursor);
-            request.Success += response => Schedule(() => createContent(response));
-            api.PerformAsync(request);
-        }
-
         private CancellationTokenSource cancellationToken;
 
-        private void createContent(GetNewsResponse response)
+        protected override void OnSuccess(GetNewsResponse response)
         {
+            cancellationToken?.Cancel();
+
             lastCursor = response.Cursor;
 
             var flow = new FillFlowContainer<NewsCard>
@@ -105,9 +92,18 @@ namespace osu.Game.Overlays.News.Displays
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
+        private void fetchOlderPosts()
+        {
+            olderPostsRequest?.Cancel();
+
+            olderPostsRequest = new GetNewsRequest(lastCursor);
+            olderPostsRequest.Success += response => Schedule(() => OnSuccess(response));
+            API.PerformAsync(olderPostsRequest);
+        }
+
         protected override void Dispose(bool isDisposing)
         {
-            request?.Cancel();
+            olderPostsRequest?.Cancel();
             cancellationToken?.Cancel();
             base.Dispose(isDisposing);
         }

From c6ae2f520e8a7c1ea2446acf401e8a352f57028b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 25 Jul 2020 10:39:10 +0300
Subject: [PATCH 03913/10326] Fix FrontPageDisplay is adding more news posts on
 api state change

---
 osu.Game/Overlays/News/Displays/FrontPageDisplay.cs |  2 ++
 osu.Game/Overlays/OverlayView.cs                    | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
index 2c228e2f78..fbacf53bf6 100644
--- a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Overlays.News.Displays
 {
     public class FrontPageDisplay : OverlayView<GetNewsResponse>
     {
+        protected override bool PerformFetchOnApiStateChange => false;
+
         protected override APIRequest<GetNewsResponse> CreateRequest() => new GetNewsRequest();
 
         private FillFlowContainer content;
diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
index 3e2c54c726..f73ca3aa6e 100644
--- a/osu.Game/Overlays/OverlayView.cs
+++ b/osu.Game/Overlays/OverlayView.cs
@@ -18,6 +18,11 @@ namespace osu.Game.Overlays
     public abstract class OverlayView<T> : CompositeDrawable, IOnlineComponent
         where T : class
     {
+        /// <summary>
+        /// Whether we should perform fetch on api state change to online (true by default).
+        /// </summary>
+        protected virtual bool PerformFetchOnApiStateChange => true;
+
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
@@ -33,6 +38,10 @@ namespace osu.Game.Overlays
         {
             base.LoadComplete();
             API.Register(this);
+
+            // If property is true - fetch will be triggered automatically by APIStateChanged and if not - we need to manually call it.
+            if (!PerformFetchOnApiStateChange)
+                PerformFetch();
         }
 
         /// <summary>
@@ -64,7 +73,8 @@ namespace osu.Game.Overlays
             switch (state)
             {
                 case APIState.Online:
-                    PerformFetch();
+                    if (PerformFetchOnApiStateChange)
+                        PerformFetch();
                     break;
             }
         }

From 897ab4a9bb2de4b5ffd2cbb9510cd74c758cfc20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 25 Jul 2020 11:53:38 +0200
Subject: [PATCH 03914/10326] Add example test resources to demonstrate fail
 case

---
 .../Resources/special-skin/pippidonclear.png    | Bin 0 -> 8462 bytes
 .../Resources/special-skin/pippidonfail.png     | Bin 0 -> 10643 bytes
 .../Resources/special-skin/pippidonidle.png     | Bin 0 -> 10090 bytes
 .../Resources/special-skin/pippidonkiai.png     | Bin 0 -> 12368 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonclear.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonfail.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonidle.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonkiai.png

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonclear.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonclear.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5bcdbd3fc13b3ca847cfba5402c2db38cd962c7
GIT binary patch
literal 8462
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonfail.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonfail.png
new file mode 100644
index 0000000000000000000000000000000000000000..39cf7372851ff962b02d9184fd9169faf06c702b
GIT binary patch
literal 10643
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
b?-&p%=c-}*c9uXxB}hd<Q@&Ep^3DGMcxxQE

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonidle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonidle.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c3b2bfec9d33b65dd97f5c5b33926e0a70150ef
GIT binary patch
literal 10090
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonkiai.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/pippidonkiai.png
new file mode 100644
index 0000000000000000000000000000000000000000..7de00b5390494b7406e7595de865a8d6a659adcb
GIT binary patch
literal 12368
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

literal 0
HcmV?d00001


From ea3ef37f9ae8a0949cadd440d3abf746b6af1fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 25 Jul 2020 12:03:54 +0200
Subject: [PATCH 03915/10326] Add support for indexless mascot texture lookups

---
 .../Skinning/TaikoLegacySkinTransformer.cs               | 5 +----
 osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs       | 9 ++++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 23d675cfb0..f032c5f485 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -91,10 +91,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     return null;
 
                 case TaikoSkinComponents.Mascot:
-                    if (GetTexture("pippidonclear0") != null)
-                        return new DrawableTaikoMascot();
-
-                    return null;
+                    return new DrawableTaikoMascot();
             }
 
             return Source.GetDrawableComponent(component);
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
index 6f25a5f662..9c76aea54c 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs
@@ -128,6 +128,13 @@ namespace osu.Game.Rulesets.Taiko.UI
         }
 
         private static Texture getAnimationFrame(ISkin skin, TaikoMascotAnimationState state, int frameIndex)
-            => skin.GetTexture($"pippidon{state.ToString().ToLower()}{frameIndex}");
+        {
+            var texture = skin.GetTexture($"pippidon{state.ToString().ToLower()}{frameIndex}");
+
+            if (frameIndex == 0 && texture == null)
+                texture = skin.GetTexture($"pippidon{state.ToString().ToLower()}");
+
+            return texture;
+        }
     }
 }

From f7a330becd68780ddbb91543350eee87b15d15a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 25 Jul 2020 12:13:19 +0200
Subject: [PATCH 03916/10326] Fix tests failing due to not checking state early
 enough

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs  | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index cb6a0decde..47d8a5c012 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -36,6 +37,10 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         private TaikoScoreProcessor scoreProcessor;
 
         private IEnumerable<DrawableTaikoMascot> mascots => this.ChildrenOfType<DrawableTaikoMascot>();
+
+        private IEnumerable<DrawableTaikoMascot> animatedMascots =>
+            mascots.Where(mascot => mascot.ChildrenOfType<TextureAnimation>().All(animation => animation.FrameCount > 0));
+
         private IEnumerable<TaikoPlayfield> playfields => this.ChildrenOfType<TaikoPlayfield>();
 
         [SetUp]
@@ -72,11 +77,11 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
             AddStep("set clear state", () => mascots.ForEach(mascot => mascot.State.Value = TaikoMascotAnimationState.Clear));
             AddStep("miss", () => mascots.ForEach(mascot => mascot.LastResult.Value = new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss }));
-            AddAssert("skins with animations remain in clear state", () => someMascotsIn(TaikoMascotAnimationState.Clear));
+            AddAssert("skins with animations remain in clear state", () => animatedMascotsIn(TaikoMascotAnimationState.Clear));
             AddUntilStep("state reverts to fail", () => allMascotsIn(TaikoMascotAnimationState.Fail));
 
             AddStep("set clear state again", () => mascots.ForEach(mascot => mascot.State.Value = TaikoMascotAnimationState.Clear));
-            AddAssert("skins with animations change to clear", () => someMascotsIn(TaikoMascotAnimationState.Clear));
+            AddAssert("skins with animations change to clear", () => animatedMascotsIn(TaikoMascotAnimationState.Clear));
         }
 
         [Test]
@@ -186,10 +191,18 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         private void assertStateAfterResult(JudgementResult judgementResult, TaikoMascotAnimationState expectedState)
         {
-            AddStep($"{judgementResult.Type.ToString().ToLower()} result for {judgementResult.Judgement.GetType().Name.Humanize(LetterCasing.LowerCase)}",
-                () => applyNewResult(judgementResult));
+            TaikoMascotAnimationState[] mascotStates = null;
 
-            AddAssert($"state is {expectedState.ToString().ToLower()}", () => allMascotsIn(expectedState));
+            AddStep($"{judgementResult.Type.ToString().ToLower()} result for {judgementResult.Judgement.GetType().Name.Humanize(LetterCasing.LowerCase)}",
+                () =>
+                {
+                    applyNewResult(judgementResult);
+                    // store the states as soon as possible, so that the delay between steps doesn't incorrectly fail the test
+                    // due to not checking if the state changed quickly enough.
+                    Schedule(() => mascotStates = animatedMascots.Select(mascot => mascot.State.Value).ToArray());
+                });
+
+            AddAssert($"state is {expectedState.ToString().ToLower()}", () => mascotStates.All(state => state == expectedState));
         }
 
         private void applyNewResult(JudgementResult judgementResult)
@@ -211,6 +224,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         }
 
         private bool allMascotsIn(TaikoMascotAnimationState state) => mascots.All(d => d.State.Value == state);
-        private bool someMascotsIn(TaikoMascotAnimationState state) => mascots.Any(d => d.State.Value == state);
+        private bool animatedMascotsIn(TaikoMascotAnimationState state) => animatedMascots.Any(d => d.State.Value == state);
     }
 }

From 788395f8bf24f1702697298c31a7435897c7e7f3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 25 Jul 2020 15:08:06 +0300
Subject: [PATCH 03917/10326] Revert changes regarding FrontPageDisplay and
 OverlayView

---
 .../News/Displays/FrontPageDisplay.cs         | 35 ++++++++++---------
 osu.Game/Overlays/OverlayView.cs              | 12 +------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
index fbacf53bf6..0f177f151a 100644
--- a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
@@ -13,16 +13,15 @@ using osuTK;
 
 namespace osu.Game.Overlays.News.Displays
 {
-    public class FrontPageDisplay : OverlayView<GetNewsResponse>
+    public class FrontPageDisplay : CompositeDrawable
     {
-        protected override bool PerformFetchOnApiStateChange => false;
-
-        protected override APIRequest<GetNewsResponse> CreateRequest() => new GetNewsRequest();
+        [Resolved]
+        private IAPIProvider api { get; set; }
 
         private FillFlowContainer content;
         private ShowMoreButton showMore;
 
-        private GetNewsRequest olderPostsRequest;
+        private GetNewsRequest request;
         private Cursor lastCursor;
 
         [BackgroundDependencyLoader]
@@ -62,16 +61,27 @@ namespace osu.Game.Overlays.News.Displays
                         {
                             Top = 15
                         },
-                        Action = fetchOlderPosts,
+                        Action = performFetch,
                         Alpha = 0
                     }
                 }
             };
+
+            performFetch();
+        }
+
+        private void performFetch()
+        {
+            request?.Cancel();
+
+            request = new GetNewsRequest(lastCursor);
+            request.Success += response => Schedule(() => onSuccess(response));
+            api.PerformAsync(request);
         }
 
         private CancellationTokenSource cancellationToken;
 
-        protected override void OnSuccess(GetNewsResponse response)
+        private void onSuccess(GetNewsResponse response)
         {
             cancellationToken?.Cancel();
 
@@ -94,18 +104,9 @@ namespace osu.Game.Overlays.News.Displays
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
-        private void fetchOlderPosts()
-        {
-            olderPostsRequest?.Cancel();
-
-            olderPostsRequest = new GetNewsRequest(lastCursor);
-            olderPostsRequest.Success += response => Schedule(() => OnSuccess(response));
-            API.PerformAsync(olderPostsRequest);
-        }
-
         protected override void Dispose(bool isDisposing)
         {
-            olderPostsRequest?.Cancel();
+            request?.Cancel();
             cancellationToken?.Cancel();
             base.Dispose(isDisposing);
         }
diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
index f73ca3aa6e..3e2c54c726 100644
--- a/osu.Game/Overlays/OverlayView.cs
+++ b/osu.Game/Overlays/OverlayView.cs
@@ -18,11 +18,6 @@ namespace osu.Game.Overlays
     public abstract class OverlayView<T> : CompositeDrawable, IOnlineComponent
         where T : class
     {
-        /// <summary>
-        /// Whether we should perform fetch on api state change to online (true by default).
-        /// </summary>
-        protected virtual bool PerformFetchOnApiStateChange => true;
-
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
@@ -38,10 +33,6 @@ namespace osu.Game.Overlays
         {
             base.LoadComplete();
             API.Register(this);
-
-            // If property is true - fetch will be triggered automatically by APIStateChanged and if not - we need to manually call it.
-            if (!PerformFetchOnApiStateChange)
-                PerformFetch();
         }
 
         /// <summary>
@@ -73,8 +64,7 @@ namespace osu.Game.Overlays
             switch (state)
             {
                 case APIState.Online:
-                    if (PerformFetchOnApiStateChange)
-                        PerformFetch();
+                    PerformFetch();
                     break;
             }
         }

From 648f9204f5c59a992080f7bd9d9777a4852ce7ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 26 Jul 2020 15:09:12 +0200
Subject: [PATCH 03918/10326] Add sample lifetime constraints for taiko

---
 .../Audio/DrumSampleContainer.cs              | 64 +++++++++++++++++++
 .../Audio/DrumSampleMapping.cs                | 52 ---------------
 .../Skinning/LegacyInputDrum.cs               |  4 +-
 osu.Game.Rulesets.Taiko/UI/InputDrum.cs       | 10 +--
 osu.Game/Skinning/SkinnableSound.cs           |  3 +
 5 files changed, 74 insertions(+), 59 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
 delete mode 100644 osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.cs

diff --git a/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs b/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
new file mode 100644
index 0000000000..7c39c040b1
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
@@ -0,0 +1,64 @@
+// Copyright (c) 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.Containers;
+using osu.Game.Audio;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Taiko.Audio
+{
+    /// <summary>
+    /// Stores samples for the input drum.
+    /// The lifetime of the samples is adjusted so that they are only alive during the appropriate sample control point.
+    /// </summary>
+    public class DrumSampleContainer : LifetimeManagementContainer
+    {
+        private readonly ControlPointInfo controlPoints;
+        private readonly Dictionary<double, DrumSample> mappings = new Dictionary<double, DrumSample>();
+
+        public DrumSampleContainer(ControlPointInfo controlPoints)
+        {
+            this.controlPoints = controlPoints;
+
+            IReadOnlyList<SampleControlPoint> samplePoints = controlPoints.SamplePoints.Count == 0 ? new[] { controlPoints.SamplePointAt(double.MinValue) } : controlPoints.SamplePoints;
+
+            for (int i = 0; i < samplePoints.Count; i++)
+            {
+                var samplePoint = samplePoints[i];
+
+                var centre = samplePoint.GetSampleInfo();
+                var rim = samplePoint.GetSampleInfo(HitSampleInfo.HIT_CLAP);
+
+                var lifetimeStart = i > 0 ? samplePoint.Time : double.MinValue;
+                var lifetimeEnd = i + 1 < samplePoints.Count ? samplePoints[i + 1].Time : double.MaxValue;
+
+                mappings[samplePoint.Time] = new DrumSample
+                {
+                    Centre = addSound(centre, lifetimeStart, lifetimeEnd),
+                    Rim = addSound(rim, lifetimeStart, lifetimeEnd)
+                };
+            }
+        }
+
+        private SkinnableSound addSound(HitSampleInfo hitSampleInfo, double lifetimeStart, double lifetimeEnd)
+        {
+            var drawable = new SkinnableSound(hitSampleInfo)
+            {
+                LifetimeStart = lifetimeStart,
+                LifetimeEnd = lifetimeEnd
+            };
+            AddInternal(drawable);
+            return drawable;
+        }
+
+        public DrumSample SampleAt(double time) => mappings[controlPoints.SamplePointAt(time).Time];
+
+        public class DrumSample
+        {
+            public SkinnableSound Centre;
+            public SkinnableSound Rim;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.cs b/osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.cs
deleted file mode 100644
index c31b07344d..0000000000
--- a/osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.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 System.Collections.Generic;
-using osu.Game.Audio;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Skinning;
-
-namespace osu.Game.Rulesets.Taiko.Audio
-{
-    public class DrumSampleMapping
-    {
-        private readonly ControlPointInfo controlPoints;
-        private readonly Dictionary<double, DrumSample> mappings = new Dictionary<double, DrumSample>();
-
-        public readonly List<SkinnableSound> Sounds = new List<SkinnableSound>();
-
-        public DrumSampleMapping(ControlPointInfo controlPoints)
-        {
-            this.controlPoints = controlPoints;
-
-            IEnumerable<SampleControlPoint> samplePoints = controlPoints.SamplePoints.Count == 0 ? new[] { controlPoints.SamplePointAt(double.MinValue) } : controlPoints.SamplePoints;
-
-            foreach (var s in samplePoints)
-            {
-                var centre = s.GetSampleInfo();
-                var rim = s.GetSampleInfo(HitSampleInfo.HIT_CLAP);
-
-                mappings[s.Time] = new DrumSample
-                {
-                    Centre = addSound(centre),
-                    Rim = addSound(rim)
-                };
-            }
-        }
-
-        private SkinnableSound addSound(HitSampleInfo hitSampleInfo)
-        {
-            var drawable = new SkinnableSound(hitSampleInfo);
-            Sounds.Add(drawable);
-            return drawable;
-        }
-
-        public DrumSample SampleAt(double time) => mappings[controlPoints.SamplePointAt(time).Time];
-
-        public class DrumSample
-        {
-            public SkinnableSound Centre;
-            public SkinnableSound Rim;
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
index 81d645e294..b7b55b9ae0 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             public readonly Sprite Centre;
 
             [Resolved]
-            private DrumSampleMapping sampleMappings { get; set; }
+            private DrumSampleContainer sampleContainer { get; set; }
 
             public LegacyHalfDrum(bool flipped)
             {
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             public bool OnPressed(TaikoAction action)
             {
                 Drawable target = null;
-                var drumSample = sampleMappings.SampleAt(Time.Current);
+                var drumSample = sampleContainer.SampleAt(Time.Current);
 
                 if (action == CentreAction)
                 {
diff --git a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
index 06ccd45cb8..f76f3d851a 100644
--- a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
@@ -25,11 +25,11 @@ namespace osu.Game.Rulesets.Taiko.UI
         private const float middle_split = 0.025f;
 
         [Cached]
-        private DrumSampleMapping sampleMapping;
+        private DrumSampleContainer sampleContainer;
 
         public InputDrum(ControlPointInfo controlPoints)
         {
-            sampleMapping = new DrumSampleMapping(controlPoints);
+            sampleContainer = new DrumSampleContainer(controlPoints);
 
             RelativeSizeAxes = Axes.Both;
         }
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                 }
             });
 
-            AddRangeInternal(sampleMapping.Sounds);
+            AddRangeInternal(sampleContainer.Sounds);
         }
 
         /// <summary>
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             private readonly Sprite centreHit;
 
             [Resolved]
-            private DrumSampleMapping sampleMappings { get; set; }
+            private DrumSampleContainer sampleContainer { get; set; }
 
             public TaikoHalfDrum(bool flipped)
             {
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                 Drawable target = null;
                 Drawable back = null;
 
-                var drumSample = sampleMappings.SampleAt(Time.Current);
+                var drumSample = sampleContainer.SampleAt(Time.Current);
 
                 if (action == CentreAction)
                 {
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 49f9f01cff..fb9cab74c8 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -22,6 +22,9 @@ namespace osu.Game.Skinning
         [Resolved]
         private ISampleStore samples { get; set; }
 
+        public override bool RemoveWhenNotAlive => false;
+        public override bool RemoveCompletedTransforms => false;
+
         public SkinnableSound(ISampleInfo hitSamples)
             : this(new[] { hitSamples })
         {

From 8e6a0493b4f972f2d577c91b0f8cecfd6a74ba8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 26 Jul 2020 15:15:01 +0200
Subject: [PATCH 03919/10326] Adjust InputDrum usage

---
 osu.Game.Rulesets.Taiko/UI/InputDrum.cs | 60 +++++++++++++------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
index f76f3d851a..5966b24b34 100644
--- a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
@@ -37,39 +37,41 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.InputDrum), _ => new Container
+            Children = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                FillMode = FillMode.Fit,
-                Scale = new Vector2(0.9f),
-                Children = new Drawable[]
+                new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.InputDrum), _ => new Container
                 {
-                    new TaikoHalfDrum(false)
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode = FillMode.Fit,
+                    Scale = new Vector2(0.9f),
+                    Children = new Drawable[]
                     {
-                        Name = "Left Half",
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.CentreRight,
-                        RelativeSizeAxes = Axes.Both,
-                        RelativePositionAxes = Axes.X,
-                        X = -middle_split / 2,
-                        RimAction = TaikoAction.LeftRim,
-                        CentreAction = TaikoAction.LeftCentre
-                    },
-                    new TaikoHalfDrum(true)
-                    {
-                        Name = "Right Half",
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.CentreLeft,
-                        RelativeSizeAxes = Axes.Both,
-                        RelativePositionAxes = Axes.X,
-                        X = middle_split / 2,
-                        RimAction = TaikoAction.RightRim,
-                        CentreAction = TaikoAction.RightCentre
+                        new TaikoHalfDrum(false)
+                        {
+                            Name = "Left Half",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.CentreRight,
+                            RelativeSizeAxes = Axes.Both,
+                            RelativePositionAxes = Axes.X,
+                            X = -middle_split / 2,
+                            RimAction = TaikoAction.LeftRim,
+                            CentreAction = TaikoAction.LeftCentre
+                        },
+                        new TaikoHalfDrum(true)
+                        {
+                            Name = "Right Half",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.CentreLeft,
+                            RelativeSizeAxes = Axes.Both,
+                            RelativePositionAxes = Axes.X,
+                            X = middle_split / 2,
+                            RimAction = TaikoAction.RightRim,
+                            CentreAction = TaikoAction.RightCentre
+                        }
                     }
-                }
-            });
-
-            AddRangeInternal(sampleContainer.Sounds);
+                }),
+                sampleContainer
+            };
         }
 
         /// <summary>

From c78c346b627e7fa89ea99c44a521216812ed5012 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jul 2020 14:11:01 +0900
Subject: [PATCH 03920/10326] 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 e5b0245dd0..7e6f1469f5 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.715.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.723.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5af28ae11a..ab434def38 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.723.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
     <PackageReference Include="Sentry" Version="2.1.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 4a94ec33d8..618de5d19f 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.723.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 5b724d96597a8fabf89b8813fafc1ce0fd0a869e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jul 2020 15:10:32 +0900
Subject: [PATCH 03921/10326] Adjust damp base component to provide ample
 tweening

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

diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 34d49685d2..f5e4b078da 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -330,7 +330,7 @@ namespace osu.Game.Screens.Menu
             if (Beatmap.Value.Track.IsRunning)
             {
                 var maxAmplitude = lastBeatIndex >= 0 ? Beatmap.Value.Track.CurrentAmplitudes.Maximum : 0;
-                logoAmplitudeContainer.Scale = new Vector2((float)Interpolation.Damp(logoAmplitudeContainer.Scale.X, 1 - Math.Max(0, maxAmplitude - scale_adjust_cutoff) * 0.04f, 0.5f, Time.Elapsed));
+                logoAmplitudeContainer.Scale = new Vector2((float)Interpolation.Damp(logoAmplitudeContainer.Scale.X, 1 - Math.Max(0, maxAmplitude - scale_adjust_cutoff) * 0.04f, 0.9f, Time.Elapsed));
 
                 if (maxAmplitude > velocity_adjust_cutoff)
                     triangles.Velocity = 1 + Math.Max(0, maxAmplitude - velocity_adjust_cutoff) * 50;

From 3257c1e9f21bed20047f47c98a6aed7dc4c2107c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jul 2020 16:02:52 +0900
Subject: [PATCH 03922/10326] Move interface exposing into region

---
 osu.Game/Skinning/SkinnableSound.cs | 76 +++++++++++++++--------------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index fb9cab74c8..11d1011ed8 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -40,42 +40,6 @@ namespace osu.Game.Skinning
 
         private readonly AudioContainer<DrawableSample> samplesContainer;
 
-        public BindableNumber<double> Volume => samplesContainer.Volume;
-
-        public BindableNumber<double> Balance => samplesContainer.Balance;
-
-        public BindableNumber<double> Frequency => samplesContainer.Frequency;
-
-        public BindableNumber<double> Tempo => samplesContainer.Tempo;
-
-        /// <summary>
-        /// Smoothly adjusts <see cref="Volume"/> over time.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> VolumeTo(double newVolume, double duration = 0, Easing easing = Easing.None) =>
-            samplesContainer.VolumeTo(newVolume, duration, easing);
-
-        /// <summary>
-        /// Smoothly adjusts <see cref="Balance"/> over time.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> BalanceTo(double newBalance, double duration = 0, Easing easing = Easing.None) =>
-            samplesContainer.BalanceTo(newBalance, duration, easing);
-
-        /// <summary>
-        /// Smoothly adjusts <see cref="Frequency"/> over time.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> FrequencyTo(double newFrequency, double duration = 0, Easing easing = Easing.None) =>
-            samplesContainer.FrequencyTo(newFrequency, duration, easing);
-
-        /// <summary>
-        /// Smoothly adjusts <see cref="Tempo"/> over time.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> TempoTo(double newTempo, double duration = 0, Easing easing = Easing.None) =>
-            samplesContainer.TempoTo(newTempo, duration, easing);
-
         public bool Looping
         {
             get => looping;
@@ -130,5 +94,45 @@ namespace osu.Game.Skinning
             if (wasPlaying)
                 Play();
         }
+
+        #region Re-expose AudioContainer
+
+        public BindableNumber<double> Volume => samplesContainer.Volume;
+
+        public BindableNumber<double> Balance => samplesContainer.Balance;
+
+        public BindableNumber<double> Frequency => samplesContainer.Frequency;
+
+        public BindableNumber<double> Tempo => samplesContainer.Tempo;
+
+        /// <summary>
+        /// Smoothly adjusts <see cref="Volume"/> over time.
+        /// </summary>
+        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
+        public TransformSequence<DrawableAudioWrapper> VolumeTo(double newVolume, double duration = 0, Easing easing = Easing.None) =>
+            samplesContainer.VolumeTo(newVolume, duration, easing);
+
+        /// <summary>
+        /// Smoothly adjusts <see cref="Balance"/> over time.
+        /// </summary>
+        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
+        public TransformSequence<DrawableAudioWrapper> BalanceTo(double newBalance, double duration = 0, Easing easing = Easing.None) =>
+            samplesContainer.BalanceTo(newBalance, duration, easing);
+
+        /// <summary>
+        /// Smoothly adjusts <see cref="Frequency"/> over time.
+        /// </summary>
+        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
+        public TransformSequence<DrawableAudioWrapper> FrequencyTo(double newFrequency, double duration = 0, Easing easing = Easing.None) =>
+            samplesContainer.FrequencyTo(newFrequency, duration, easing);
+
+        /// <summary>
+        /// Smoothly adjusts <see cref="Tempo"/> over time.
+        /// </summary>
+        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
+        public TransformSequence<DrawableAudioWrapper> TempoTo(double newTempo, double duration = 0, Easing easing = Easing.None) =>
+            samplesContainer.TempoTo(newTempo, duration, easing);
+
+        #endregion
     }
 }

From 9889bfa0f3b8a50765ec611b2a54bae898e54dcb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jul 2020 16:15:49 +0900
Subject: [PATCH 03923/10326] Stop playing samples on pause, resume looping on
 unpause

---
 osu.Game/Skinning/SkinnableSound.cs | 60 ++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 11d1011ed8..f54eff51c2 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Transforms;
 using osu.Game.Audio;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Skinning
 {
@@ -22,9 +23,13 @@ namespace osu.Game.Skinning
         [Resolved]
         private ISampleStore samples { get; set; }
 
+        private bool requestedPlaying;
+
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
 
+        private readonly AudioContainer<DrawableSample> samplesContainer;
+
         public SkinnableSound(ISampleInfo hitSamples)
             : this(new[] { hitSamples })
         {
@@ -36,9 +41,28 @@ namespace osu.Game.Skinning
             InternalChild = samplesContainer = new AudioContainer<DrawableSample>();
         }
 
-        private bool looping;
+        private Bindable<bool> gameplayClockPaused;
 
-        private readonly AudioContainer<DrawableSample> samplesContainer;
+        [BackgroundDependencyLoader(true)]
+        private void load(GameplayClock gameplayClock)
+        {
+            // if in a gameplay context, pause sample playback when gameplay is paused.
+            gameplayClockPaused = gameplayClock?.IsPaused.GetBoundCopy();
+            gameplayClockPaused?.BindValueChanged(paused =>
+            {
+                if (requestedPlaying)
+                {
+                    if (paused.NewValue)
+                        stop();
+                    // it's not easy to know if a sample has finished playing (to end).
+                    // to keep things simple only resume playing looping samples.
+                    else if (Looping)
+                        play();
+                }
+            });
+        }
+
+        private bool looping;
 
         public bool Looping
         {
@@ -53,20 +77,36 @@ namespace osu.Game.Skinning
             }
         }
 
-        public void Play() => samplesContainer.ForEach(c =>
+        public void Play()
         {
-            if (c.AggregateVolume.Value > 0)
-                c.Play();
-        });
+            requestedPlaying = true;
+            play();
+        }
 
-        public void Stop() => samplesContainer.ForEach(c => c.Stop());
+        private void play()
+        {
+            samplesContainer.ForEach(c =>
+            {
+                if (c.AggregateVolume.Value > 0)
+                    c.Play();
+            });
+        }
+
+        public void Stop()
+        {
+            requestedPlaying = false;
+            stop();
+        }
+
+        private void stop()
+        {
+            samplesContainer.ForEach(c => c.Stop());
+        }
 
         public override bool IsPresent => Scheduler.HasPendingTasks;
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
-            bool wasPlaying = samplesContainer.Any(s => s.Playing);
-
             var channels = hitSamples.Select(s =>
             {
                 var ch = skin.GetSample(s);
@@ -91,7 +131,7 @@ namespace osu.Game.Skinning
 
             samplesContainer.ChildrenEnumerable = channels.Select(c => new DrawableSample(c));
 
-            if (wasPlaying)
+            if (requestedPlaying)
                 Play();
         }
 

From 5e7237bf567cb5cf1539acb1d6ef05427a490b5a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 27 Jul 2020 10:29:16 +0300
Subject: [PATCH 03924/10326] Fix incorrect default hitcircle font overlapping
 applied to legacy skins

---
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 3e5758ca01..95ef2d58b1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                 case OsuSkinComponents.HitCircleText:
                     var font = GetConfig<OsuSkinConfiguration, string>(OsuSkinConfiguration.HitCirclePrefix)?.Value ?? "default";
-                    var overlap = GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.HitCircleOverlap)?.Value ?? 0;
+                    var overlap = GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.HitCircleOverlap)?.Value ?? -2;
 
                     return !hasFont(font)
                         ? null

From d8f4e044de943c0e26603ee1536f631b7db95036 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jul 2020 17:46:10 +0900
Subject: [PATCH 03925/10326] Add test coverage

---
 .../Gameplay/TestSceneSkinnableSound.cs       | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
new file mode 100644
index 0000000000..1128b17303
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Audio;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Audio;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSkinnableSound : OsuTestScene
+    {
+        [Cached]
+        private GameplayClock gameplayClock = new GameplayClock(new FramedClock());
+
+        private SkinnableSound skinnableSounds;
+
+        [SetUp]
+        public void SetUp()
+        {
+            Children = new Drawable[]
+            {
+                new Container
+                {
+                    Clock = gameplayClock,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        skinnableSounds = new SkinnableSound(new SampleInfo("normal-sliderslide"))
+                        {
+                            Looping = true
+                        }
+                    }
+                },
+            };
+        }
+
+        [Test]
+        public void TestStoppedSoundDoesntResumeAfterPause()
+        {
+            DrawableSample sample = null;
+            AddStep("start sample", () =>
+            {
+                skinnableSounds.Play();
+                sample = skinnableSounds.ChildrenOfType<DrawableSample>().First();
+            });
+
+            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+
+            AddStep("stop sample", () => skinnableSounds.Stop());
+
+            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+
+            AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
+            AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
+
+            AddWaitStep("wait a bit", 5);
+            AddAssert("sample not playing", () => !sample.Playing);
+        }
+
+        [Test]
+        public void TestLoopingSoundResumesAfterPause()
+        {
+            DrawableSample sample = null;
+            AddStep("start sample", () =>
+            {
+                skinnableSounds.Play();
+                sample = skinnableSounds.ChildrenOfType<DrawableSample>().First();
+            });
+
+            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+
+            AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
+            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+
+            AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
+            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+        }
+    }
+}

From 12368ace3b421382420ed1ef41684f6f02a4dfcd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jul 2020 17:46:44 +0900
Subject: [PATCH 03926/10326] Rename variable

---
 .../Visual/Gameplay/TestSceneSkinnableSound.cs     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 1128b17303..73704faa1f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private GameplayClock gameplayClock = new GameplayClock(new FramedClock());
 
-        private SkinnableSound skinnableSounds;
+        private SkinnableSound skinnableSound;
 
         [SetUp]
         public void SetUp()
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
-                        skinnableSounds = new SkinnableSound(new SampleInfo("normal-sliderslide"))
+                        skinnableSound = new SkinnableSound(new SampleInfo("normal-sliderslide"))
                         {
                             Looping = true
                         }
@@ -48,13 +48,13 @@ namespace osu.Game.Tests.Visual.Gameplay
             DrawableSample sample = null;
             AddStep("start sample", () =>
             {
-                skinnableSounds.Play();
-                sample = skinnableSounds.ChildrenOfType<DrawableSample>().First();
+                skinnableSound.Play();
+                sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
             });
 
             AddUntilStep("wait for sample to start playing", () => sample.Playing);
 
-            AddStep("stop sample", () => skinnableSounds.Stop());
+            AddStep("stop sample", () => skinnableSound.Stop());
 
             AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
 
@@ -71,8 +71,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             DrawableSample sample = null;
             AddStep("start sample", () =>
             {
-                skinnableSounds.Play();
-                sample = skinnableSounds.ChildrenOfType<DrawableSample>().First();
+                skinnableSound.Play();
+                sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
             });
 
             AddUntilStep("wait for sample to start playing", () => sample.Playing);

From 5fd73795f629bcf4c48379410f8c7d538c4494ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jul 2020 18:02:14 +0900
Subject: [PATCH 03927/10326] Remove wait steps and add coverage of non-looping
 sounds

---
 .../Gameplay/TestSceneSkinnableSound.cs       | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 73704faa1f..5b7704122b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -31,13 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 {
                     Clock = gameplayClock,
                     RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        skinnableSound = new SkinnableSound(new SampleInfo("normal-sliderslide"))
-                        {
-                            Looping = true
-                        }
-                    }
+                    Child = skinnableSound = new SkinnableSound(new SampleInfo("normal-sliderslide"))
                 },
             };
         }
@@ -46,27 +40,47 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestStoppedSoundDoesntResumeAfterPause()
         {
             DrawableSample sample = null;
-            AddStep("start sample", () =>
+            AddStep("start sample with looping", () =>
             {
+                skinnableSound.Looping = true;
                 skinnableSound.Play();
                 sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
             });
 
-            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+            AddAssert("sample playing", () => sample.Playing);
 
             AddStep("stop sample", () => skinnableSound.Stop());
 
-            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+            AddAssert("sample not playing", () => !sample.Playing);
 
             AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
             AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
 
-            AddWaitStep("wait a bit", 5);
             AddAssert("sample not playing", () => !sample.Playing);
         }
 
         [Test]
         public void TestLoopingSoundResumesAfterPause()
+        {
+            DrawableSample sample = null;
+            AddStep("start sample with looping", () =>
+            {
+                skinnableSound.Looping = true;
+                skinnableSound.Play();
+                sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
+            });
+
+            AddAssert("sample playing", () => sample.Playing);
+
+            AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
+            AddAssert("sample not playing", () => !sample.Playing);
+
+            AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
+            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+        }
+
+        [Test]
+        public void TestNonLoopingStopsWithPause()
         {
             DrawableSample sample = null;
             AddStep("start sample", () =>
@@ -75,13 +89,13 @@ namespace osu.Game.Tests.Visual.Gameplay
                 sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
             });
 
-            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+            AddAssert("sample playing", () => sample.Playing);
 
             AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
-            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+            AddAssert("sample not playing", () => !sample.Playing);
 
             AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
-            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+            AddAssert("sample not playing", () => !sample.Playing);
         }
     }
 }

From 10101d5b31da4499d99f4564fc83dbc709ec7f4b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jul 2020 18:06:14 +0900
Subject: [PATCH 03928/10326] Reduce spinner tick and bonus score

---
 osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs | 2 +-
 osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
index 6ca2d4d72d..b59428e701 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public class OsuSpinnerBonusTickJudgement : OsuSpinnerTickJudgement
         {
-            protected override int NumericResultFor(HitResult result) => 1100;
+            protected override int NumericResultFor(HitResult result) => 50;
 
             protected override double HealthIncreaseFor(HitResult result) => base.HealthIncreaseFor(result) * 2;
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
index c81348fbbf..346f949a4f 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             public override bool AffectsCombo => false;
 
-            protected override int NumericResultFor(HitResult result) => 100;
+            protected override int NumericResultFor(HitResult result) => 10;
 
             protected override double HealthIncreaseFor(HitResult result) => result == MaxResult ? 0.6 * base.HealthIncreaseFor(result) : 0;
         }

From 06c4fb717146b999ed2496c2dadfb48fe6e0b404 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jul 2020 18:40:53 +0900
Subject: [PATCH 03929/10326] Update bonus score spec in test

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 6e277ff37e..23b440ced2 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
                 var totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value * 2;
-                return totalScore == (int)(drawableSpinner.Disc.CumulativeRotation / 360) * 100;
+                return totalScore == (int)(drawableSpinner.Disc.CumulativeRotation / 360) * 10;
             });
 
             addSeekStep(0);

From 1f8abf2cf6a085fe99838dda46835e2c1eaaf107 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jul 2020 19:03:21 +0900
Subject: [PATCH 03930/10326] Fix headless tests

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 5b7704122b..9cfea8ec85 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private SkinnableSound skinnableSound;
 
         [SetUp]
-        public void SetUp()
+        public void SetUp() => Schedule(() =>
         {
             Children = new Drawable[]
             {
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     Child = skinnableSound = new SkinnableSound(new SampleInfo("normal-sliderslide"))
                 },
             };
-        }
+        });
 
         [Test]
         public void TestStoppedSoundDoesntResumeAfterPause()

From 33e8e0aa187ccbc8cdbdf1f5da8e6da5e4271c13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Jul 2020 19:05:31 +0900
Subject: [PATCH 03931/10326] Add back until steps so headless tests can better
 handle thread delays

---
 .../Visual/Gameplay/TestSceneSkinnableSound.cs  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 9cfea8ec85..81e5f32ee8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -47,15 +47,16 @@ namespace osu.Game.Tests.Visual.Gameplay
                 sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
             });
 
-            AddAssert("sample playing", () => sample.Playing);
+            AddUntilStep("wait for sample to start playing", () => sample.Playing);
 
             AddStep("stop sample", () => skinnableSound.Stop());
 
-            AddAssert("sample not playing", () => !sample.Playing);
+            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
 
             AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
             AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
 
+            AddWaitStep("wait a bit", 5);
             AddAssert("sample not playing", () => !sample.Playing);
         }
 
@@ -70,13 +71,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                 sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
             });
 
-            AddAssert("sample playing", () => sample.Playing);
+            AddUntilStep("wait for sample to start playing", () => sample.Playing);
 
             AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
-            AddAssert("sample not playing", () => !sample.Playing);
-
-            AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
-            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
         }
 
         [Test]
@@ -92,9 +90,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("sample playing", () => sample.Playing);
 
             AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
-            AddAssert("sample not playing", () => !sample.Playing);
+            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
 
             AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
+
+            AddAssert("sample not playing", () => !sample.Playing);
+            AddAssert("sample not playing", () => !sample.Playing);
             AddAssert("sample not playing", () => !sample.Playing);
         }
     }

From bbc7d69524931143073058d6a20bcdb799482435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 14 Jul 2020 22:51:30 +0200
Subject: [PATCH 03932/10326] Add failing test cases

---
 .../TestSceneDrawableJudgement.cs             | 102 ++++++++++++------
 .../Objects/Drawables/DrawableOsuJudgement.cs |  21 ++--
 2 files changed, 83 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index f08f994b07..4bb4619a1b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -4,62 +4,104 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
+using osu.Framework.Testing;
+using osu.Game.Configuration;
 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.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneDrawableJudgement : OsuSkinnableTestScene
     {
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
+        private readonly List<DrawablePool<TestDrawableOsuJudgement>> pools;
+
         public TestSceneDrawableJudgement()
         {
-            var pools = new List<DrawablePool<DrawableOsuJudgement>>();
+            pools = new List<DrawablePool<TestDrawableOsuJudgement>>();
 
             foreach (HitResult result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
+                showResult(result);
+        }
+
+        [Test]
+        public void TestHitLightingDisabled()
+        {
+            AddStep("hit lighting disabled", () => config.Set(OsuSetting.HitLighting, false));
+
+            showResult(HitResult.Great);
+
+            AddUntilStep("judgements shown", () => this.ChildrenOfType<TestDrawableOsuJudgement>().Any());
+            AddAssert("hit lighting hidden",
+                () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => judgement.Lighting.Alpha == 0));
+        }
+
+        [Test]
+        public void TestHitLightingEnabled()
+        {
+            AddStep("hit lighting enabled", () => config.Set(OsuSetting.HitLighting, true));
+
+            showResult(HitResult.Great);
+
+            AddUntilStep("judgements shown", () => this.ChildrenOfType<TestDrawableOsuJudgement>().Any());
+            AddAssert("hit lighting shown",
+                () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => judgement.Lighting.Alpha > 0));
+        }
+
+        private void showResult(HitResult result)
+        {
+            AddStep("Show " + result.GetDescription(), () =>
             {
-                AddStep("Show " + result.GetDescription(), () =>
+                int poolIndex = 0;
+
+                SetContents(() =>
                 {
-                    int poolIndex = 0;
+                    DrawablePool<TestDrawableOsuJudgement> pool;
 
-                    SetContents(() =>
+                    if (poolIndex >= pools.Count)
+                        pools.Add(pool = new DrawablePool<TestDrawableOsuJudgement>(1));
+                    else
                     {
-                        DrawablePool<DrawableOsuJudgement> pool;
+                        pool = pools[poolIndex];
 
-                        if (poolIndex >= pools.Count)
-                            pools.Add(pool = new DrawablePool<DrawableOsuJudgement>(1));
-                        else
+                        // We need to make sure neither the pool nor the judgement get disposed when new content is set, and they both share the same parent.
+                        ((Container)pool.Parent).Clear(false);
+                    }
+
+                    var container = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
                         {
-                            pool = pools[poolIndex];
-
-                            // We need to make sure neither the pool nor the judgement get disposed when new content is set, and they both share the same parent.
-                            ((Container)pool.Parent).Clear(false);
-                        }
-
-                        var container = new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
+                            pool,
+                            pool.Get(j => j.Apply(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)).With(j =>
                             {
-                                pool,
-                                pool.Get(j => j.Apply(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)).With(j =>
-                                {
-                                    j.Anchor = Anchor.Centre;
-                                    j.Origin = Anchor.Centre;
-                                })
-                            }
-                        };
+                                j.Anchor = Anchor.Centre;
+                                j.Origin = Anchor.Centre;
+                            })
+                        }
+                    };
 
-                        poolIndex++;
-                        return container;
-                    });
+                    poolIndex++;
+                    return container;
                 });
-            }
+            });
+        }
+
+        private class TestDrawableOsuJudgement : DrawableOsuJudgement
+        {
+            public new SkinnableSprite Lighting => base.Lighting;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 1493ddfcf3..3e45d3509d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -16,7 +16,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableOsuJudgement : DrawableJudgement
     {
-        private SkinnableSprite lighting;
+        protected SkinnableSprite Lighting;
+
         private Bindable<Color4> lightingColour;
 
         public DrawableOsuJudgement(JudgementResult result, DrawableHitObject judgedObject)
@@ -33,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (config.Get<bool>(OsuSetting.HitLighting))
             {
-                AddInternal(lighting = new SkinnableSprite("lighting")
+                AddInternal(Lighting = new SkinnableSprite("lighting")
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -60,32 +61,32 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             lightingColour?.UnbindAll();
 
-            if (lighting != null)
+            if (Lighting != null)
             {
-                lighting.ResetAnimation();
+                Lighting.ResetAnimation();
 
                 if (JudgedObject != null)
                 {
                     lightingColour = JudgedObject.AccentColour.GetBoundCopy();
-                    lightingColour.BindValueChanged(colour => lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
+                    lightingColour.BindValueChanged(colour => Lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
                 }
                 else
                 {
-                    lighting.Colour = Color4.White;
+                    Lighting.Colour = Color4.White;
                 }
             }
         }
 
-        protected override double FadeOutDelay => lighting == null ? base.FadeOutDelay : 1400;
+        protected override double FadeOutDelay => Lighting == null ? base.FadeOutDelay : 1400;
 
         protected override void ApplyHitAnimations()
         {
-            if (lighting != null)
+            if (Lighting != null)
             {
                 JudgementBody.FadeIn().Delay(FadeInDuration).FadeOut(400);
 
-                lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
-                lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
+                Lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
+                Lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
             }
 
             JudgementText?.TransformSpacingTo(Vector2.Zero).Then().TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint);

From 21ae33e28487a4939ed01ac03159c9e321a8f6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 26 Jul 2020 23:20:38 +0200
Subject: [PATCH 03933/10326] Determine whether to show lighting at prepare
 time

---
 .../Objects/Drawables/DrawableOsuJudgement.cs | 44 +++++++++----------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 3e45d3509d..8079ce4a3f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -20,6 +20,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private Bindable<Color4> lightingColour;
 
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
         public DrawableOsuJudgement(JudgementResult result, DrawableHitObject judgedObject)
             : base(result, judgedObject)
         {
@@ -30,18 +33,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load()
         {
-            if (config.Get<bool>(OsuSetting.HitLighting))
+            AddInternal(Lighting = new SkinnableSprite("lighting")
             {
-                AddInternal(Lighting = new SkinnableSprite("lighting")
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Blending = BlendingParameters.Additive,
-                    Depth = float.MaxValue
-                });
-            }
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Blending = BlendingParameters.Additive,
+                Depth = float.MaxValue,
+                Alpha = 0
+            });
         }
 
         public override void Apply(JudgementResult result, DrawableHitObject judgedObject)
@@ -61,19 +62,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             lightingColour?.UnbindAll();
 
-            if (Lighting != null)
-            {
-                Lighting.ResetAnimation();
+            Lighting.ResetAnimation();
 
-                if (JudgedObject != null)
-                {
-                    lightingColour = JudgedObject.AccentColour.GetBoundCopy();
-                    lightingColour.BindValueChanged(colour => Lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
-                }
-                else
-                {
-                    Lighting.Colour = Color4.White;
-                }
+            if (JudgedObject != null)
+            {
+                lightingColour = JudgedObject.AccentColour.GetBoundCopy();
+                lightingColour.BindValueChanged(colour => Lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
+            }
+            else
+            {
+                Lighting.Colour = Color4.White;
             }
         }
 
@@ -81,7 +79,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void ApplyHitAnimations()
         {
-            if (Lighting != null)
+            if (config.Get<bool>(OsuSetting.HitLighting))
             {
                 JudgementBody.FadeIn().Delay(FadeInDuration).FadeOut(400);
 

From 5fc7039bf2c6b4a9878611beb72427aa18c40b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 26 Jul 2020 23:22:31 +0200
Subject: [PATCH 03934/10326] Prevent DrawableJudgement from removing other
 children

---
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 052aaa3c65..e085334649 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -130,11 +130,16 @@ namespace osu.Game.Rulesets.Judgements
             if (type == currentDrawableType)
                 return;
 
-            InternalChild = JudgementBody = new Container
+            // sub-classes might have added their own children that would be removed here if .InternalChild was used.
+            if (JudgementBody != null)
+                RemoveInternal(JudgementBody);
+
+            AddInternal(JudgementBody = new Container
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
+                Depth = -float.MaxValue,
                 Child = bodyDrawable = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ => JudgementText = new OsuSpriteText
                 {
                     Text = type.GetDescription().ToUpperInvariant(),
@@ -142,7 +147,7 @@ namespace osu.Game.Rulesets.Judgements
                     Colour = colours.ForHitResult(type),
                     Scale = new Vector2(0.85f, 1),
                 }, confineMode: ConfineMode.NoScaling)
-            };
+            });
 
             currentDrawableType = type;
         }

From 7ad3101d082975980eb3990c9db1a2981211bc0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 26 Jul 2020 23:26:21 +0200
Subject: [PATCH 03935/10326] Bring back custom fade-out delay if hit lighting
 is on

---
 .../TestSceneDrawableJudgement.cs                   |  5 +++++
 .../Objects/Drawables/DrawableOsuJudgement.cs       | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index 4bb4619a1b..646f12f710 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -43,6 +43,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             showResult(HitResult.Great);
 
             AddUntilStep("judgements shown", () => this.ChildrenOfType<TestDrawableOsuJudgement>().Any());
+            AddAssert("judgement body immediately visible",
+                () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => judgement.JudgementBody.Alpha == 1));
             AddAssert("hit lighting hidden",
                 () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => judgement.Lighting.Alpha == 0));
         }
@@ -55,6 +57,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             showResult(HitResult.Great);
 
             AddUntilStep("judgements shown", () => this.ChildrenOfType<TestDrawableOsuJudgement>().Any());
+            AddAssert("judgement body not immediately visible",
+                () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => judgement.JudgementBody.Alpha > 0 && judgement.JudgementBody.Alpha < 1));
             AddAssert("hit lighting shown",
                 () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => judgement.Lighting.Alpha > 0));
         }
@@ -102,6 +106,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private class TestDrawableOsuJudgement : DrawableOsuJudgement
         {
             public new SkinnableSprite Lighting => base.Lighting;
+            public new Container JudgementBody => base.JudgementBody;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 8079ce4a3f..012d9f8878 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -75,17 +75,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        protected override double FadeOutDelay => Lighting == null ? base.FadeOutDelay : 1400;
+        private double fadeOutDelay;
+        protected override double FadeOutDelay => fadeOutDelay;
 
         protected override void ApplyHitAnimations()
         {
-            if (config.Get<bool>(OsuSetting.HitLighting))
+            bool hitLightingEnabled = config.Get<bool>(OsuSetting.HitLighting);
+
+            if (hitLightingEnabled)
             {
                 JudgementBody.FadeIn().Delay(FadeInDuration).FadeOut(400);
 
                 Lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
                 Lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
             }
+            else
+            {
+                JudgementBody.Alpha = 1;
+            }
+
+            fadeOutDelay = hitLightingEnabled ? 1400 : base.FadeOutDelay;
 
             JudgementText?.TransformSpacingTo(Vector2.Zero).Then().TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint);
             base.ApplyHitAnimations();

From abdbeafc8ad4f52274ae1b65f29034f2fe676f2d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Jul 2020 17:21:15 +0000
Subject: [PATCH 03936/10326] Bump Sentry from 2.1.4 to 2.1.5

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

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 ab434def38..7ebffc6d10 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.723.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
-    <PackageReference Include="Sentry" Version="2.1.4" />
+    <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From 1b5a23311ef36d80566fb8e555d250f9eec072d4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 28 Jul 2020 00:29:17 +0300
Subject: [PATCH 03937/10326] Update ChevronButton position/colour

---
 .../Comments/Buttons/ChevronButton.cs         | 48 +++++++++++++++++++
 osu.Game/Overlays/Comments/DrawableComment.cs | 32 ++++---------
 .../Overlays/Comments/ShowChildrenButton.cs   | 33 -------------
 3 files changed, 58 insertions(+), 55 deletions(-)
 create mode 100644 osu.Game/Overlays/Comments/Buttons/ChevronButton.cs
 delete mode 100644 osu.Game/Overlays/Comments/ShowChildrenButton.cs

diff --git a/osu.Game/Overlays/Comments/Buttons/ChevronButton.cs b/osu.Game/Overlays/Comments/Buttons/ChevronButton.cs
new file mode 100644
index 0000000000..48f34e8f59
--- /dev/null
+++ b/osu.Game/Overlays/Comments/Buttons/ChevronButton.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.Containers;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
+using osuTK;
+using osu.Framework.Allocation;
+
+namespace osu.Game.Overlays.Comments.Buttons
+{
+    public class ChevronButton : OsuHoverContainer
+    {
+        public readonly BindableBool Expanded = new BindableBool(true);
+
+        private readonly SpriteIcon icon;
+
+        public ChevronButton()
+        {
+            Size = new Vector2(40, 22);
+            Child = icon = new SpriteIcon
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(12),
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            IdleColour = HoverColour = colourProvider.Foreground1;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Action = Expanded.Toggle;
+            Expanded.BindValueChanged(onExpandedChanged, true);
+        }
+
+        private void onExpandedChanged(ValueChangedEvent<bool> expanded)
+        {
+            icon.Icon = expanded.NewValue ? FontAwesome.Solid.ChevronUp : FontAwesome.Solid.ChevronDown;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 3cdc0a0cbd..39ad60b61c 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -228,13 +228,19 @@ namespace osu.Game.Overlays.Comments
                         },
                     }
                 },
-                chevronButton = new ChevronButton
+                new Container
                 {
+                    Size = new Vector2(70, 40),
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    Margin = new MarginPadding { Right = 30, Top = margin },
-                    Expanded = { BindTarget = childrenExpanded },
-                    Alpha = 0
+                    Margin = new MarginPadding { Horizontal = 5 },
+                    Child = chevronButton = new ChevronButton
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Expanded = { BindTarget = childrenExpanded },
+                        Alpha = 0
+                    }
                 }
             };
 
@@ -357,24 +363,6 @@ namespace osu.Game.Overlays.Comments
             showMoreButton.IsLoading = loadRepliesButton.IsLoading = false;
         }
 
-        private class ChevronButton : ShowChildrenButton
-        {
-            private readonly SpriteIcon icon;
-
-            public ChevronButton()
-            {
-                Child = icon = new SpriteIcon
-                {
-                    Size = new Vector2(12),
-                };
-            }
-
-            protected override void OnExpandedChanged(ValueChangedEvent<bool> expanded)
-            {
-                icon.Icon = expanded.NewValue ? FontAwesome.Solid.ChevronUp : FontAwesome.Solid.ChevronDown;
-            }
-        }
-
         private class ShowMoreButton : GetCommentRepliesButton
         {
             [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/Comments/ShowChildrenButton.cs b/osu.Game/Overlays/Comments/ShowChildrenButton.cs
deleted file mode 100644
index 5ec7c1d471..0000000000
--- a/osu.Game/Overlays/Comments/ShowChildrenButton.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Framework.Bindables;
-using osuTK.Graphics;
-using osu.Game.Graphics;
-
-namespace osu.Game.Overlays.Comments
-{
-    public abstract class ShowChildrenButton : OsuHoverContainer
-    {
-        public readonly BindableBool Expanded = new BindableBool(true);
-
-        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);
-    }
-}

From 46d1de7fa7efdd2597c02b5431313c172d4d6169 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 28 Jul 2020 00:43:06 +0300
Subject: [PATCH 03938/10326] ShowMoreButton rework

---
 .../ShowMoreButton.cs}                        | 27 +++++++++++--------
 osu.Game/Overlays/Comments/DrawableComment.cs | 13 ---------
 2 files changed, 16 insertions(+), 24 deletions(-)
 rename osu.Game/Overlays/Comments/{GetCommentRepliesButton.cs => Buttons/ShowMoreButton.cs} (66%)

diff --git a/osu.Game/Overlays/Comments/GetCommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/ShowMoreButton.cs
similarity index 66%
rename from osu.Game/Overlays/Comments/GetCommentRepliesButton.cs
rename to osu.Game/Overlays/Comments/Buttons/ShowMoreButton.cs
index a3817ba416..0f07a7141c 100644
--- a/osu.Game/Overlays/Comments/GetCommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/ShowMoreButton.cs
@@ -8,38 +8,43 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using System.Collections.Generic;
 using osuTK;
+using osu.Framework.Allocation;
 
-namespace osu.Game.Overlays.Comments
+namespace osu.Game.Overlays.Comments.Buttons
 {
-    public abstract class GetCommentRepliesButton : LoadingButton
+    public class ShowMoreButton : LoadingButton
     {
-        private const int duration = 200;
-
         protected override IEnumerable<Drawable> EffectTargets => new[] { text };
 
         private OsuSpriteText text;
 
-        protected GetCommentRepliesButton()
+        public ShowMoreButton()
         {
             AutoSizeAxes = Axes.Both;
+            Margin = new MarginPadding { Vertical = 10, Left = 80 };
             LoadingAnimationSize = new Vector2(8);
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            IdleColour = colourProvider.Light2;
+            HoverColour = colourProvider.Light1;
+        }
+
         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()
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                Text = "show more"
             }
         };
 
-        protected abstract string GetText();
+        protected override void OnLoadStarted() => text.FadeOut(200, Easing.OutQuint);
 
-        protected override void OnLoadStarted() => text.FadeOut(duration, Easing.OutQuint);
-
-        protected override void OnLoadFinished() => text.FadeIn(duration, Easing.OutQuint);
+        protected override void OnLoadFinished() => text.FadeIn(200, Easing.OutQuint);
     }
 }
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 39ad60b61c..05959dbfd9 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -363,19 +363,6 @@ namespace osu.Game.Overlays.Comments
             showMoreButton.IsLoading = loadRepliesButton.IsLoading = false;
         }
 
-        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();

From 69691b373971f03eb00a589768cc1c67b39fcb7f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 28 Jul 2020 00:53:51 +0300
Subject: [PATCH 03939/10326] Use DrawableDate to represent creation date

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

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 05959dbfd9..07c3ba970f 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Comments
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OverlayColourProvider colourProvider)
         {
             LinkFlowContainer username;
             FillFlowContainer info;
@@ -176,14 +176,12 @@ namespace osu.Game.Overlays.Comments
                                                             Spacing = new Vector2(10, 0),
                                                             Children = new Drawable[]
                                                             {
-                                                                new OsuSpriteText
+                                                                new DrawableDate(Comment.CreatedAt, 12, false)
                                                                 {
                                                                     Anchor = Anchor.CentreLeft,
                                                                     Origin = Anchor.CentreLeft,
-                                                                    Font = OsuFont.GetFont(size: 12),
-                                                                    Colour = OsuColour.Gray(0.7f),
-                                                                    Text = HumanizerUtils.Humanize(Comment.CreatedAt)
-                                                                },
+                                                                    Colour = colourProvider.Foreground1
+                                                                }
                                                             }
                                                         },
                                                         showRepliesButton = new ShowRepliesButton(Comment.RepliesCount)

From 6737c57e334377dbbc170f1a8ae3748118503dbd Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 28 Jul 2020 01:10:13 +0300
Subject: [PATCH 03940/10326] Adjust colour of edit info

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

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 07c3ba970f..e2ab72d62f 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -253,8 +253,9 @@ namespace osu.Game.Overlays.Comments
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    Font = OsuFont.GetFont(size: 12),
-                    Text = $@"edited {HumanizerUtils.Humanize(Comment.EditedAt.Value)} by {Comment.EditedUser.Username}"
+                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
+                    Text = $@"edited {HumanizerUtils.Humanize(Comment.EditedAt.Value)} by {Comment.EditedUser.Username}",
+                    Colour = colourProvider.Foreground1
                 });
             }
 

From 2d502cebdab2fb489568ad3296565e8204a21c45 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 28 Jul 2020 02:36:25 +0300
Subject: [PATCH 03941/10326] Update DrawableComment layout

---
 .../Comments/Buttons/CommentRepliesButton.cs  |   4 -
 .../Comments/Buttons/ShowMoreButton.cs        |   1 -
 .../Comments/DeletedCommentsCounter.cs        |   2 -
 osu.Game/Overlays/Comments/DrawableComment.cs | 167 ++++++++++--------
 4 files changed, 89 insertions(+), 85 deletions(-)

diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index f7e0cb0a6c..53438ca421 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -32,10 +32,6 @@ namespace osu.Game.Overlays.Comments.Buttons
         protected CommentRepliesButton()
         {
             AutoSizeAxes = Axes.Both;
-            Margin = new MarginPadding
-            {
-                Vertical = 2
-            };
             InternalChildren = new Drawable[]
             {
                 new CircularContainer
diff --git a/osu.Game/Overlays/Comments/Buttons/ShowMoreButton.cs b/osu.Game/Overlays/Comments/Buttons/ShowMoreButton.cs
index 0f07a7141c..2c363564d2 100644
--- a/osu.Game/Overlays/Comments/Buttons/ShowMoreButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/ShowMoreButton.cs
@@ -21,7 +21,6 @@ namespace osu.Game.Overlays.Comments.Buttons
         public ShowMoreButton()
         {
             AutoSizeAxes = Axes.Both;
-            Margin = new MarginPadding { Vertical = 10, Left = 80 };
             LoadingAnimationSize = new Vector2(8);
         }
 
diff --git a/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs b/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
index f22086bf23..56588ef0a8 100644
--- a/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
+++ b/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
@@ -23,8 +23,6 @@ namespace osu.Game.Overlays.Comments
         public DeletedCommentsCounter()
         {
             AutoSizeAxes = Axes.Both;
-            Margin = new MarginPadding { Vertical = 10, Left = 80 };
-
             InternalChild = new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index e2ab72d62f..9c0a48ec29 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Overlays.Comments
     public class DrawableComment : CompositeDrawable
     {
         private const int avatar_size = 40;
-        private const int margin = 10;
 
         public Action<DrawableComment, int> RepliesRequested;
 
@@ -70,25 +69,25 @@ namespace osu.Game.Overlays.Comments
             AutoSizeAxes = Axes.Y;
             InternalChildren = new Drawable[]
             {
-                new FillFlowContainer
+                new Container
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
-                    Children = new Drawable[]
+                    Padding = getPadding(Comment.IsTopLevel),
+                    Child = 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, Top = Comment.IsTopLevel ? 10 : 0 },
-                            Child = content = new GridContainer
+                            content = new GridContainer
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 ColumnDimensions = new[]
                                 {
-                                    new Dimension(GridSizeMode.AutoSize),
+                                    new Dimension(GridSizeMode.Absolute, size: avatar_size + 10),
                                     new Dimension(),
                                 },
                                 RowDimensions = new[]
@@ -99,91 +98,84 @@ namespace osu.Game.Overlays.Comments
                                 {
                                     new Drawable[]
                                     {
-                                        new FillFlowContainer
+                                        new Container
                                         {
-                                            AutoSizeAxes = Axes.Both,
-                                            Margin = new MarginPadding { Horizontal = margin },
-                                            Direction = FillDirection.Horizontal,
-                                            Spacing = new Vector2(5, 0),
+                                            Size = new Vector2(avatar_size),
                                             Children = new Drawable[]
                                             {
-                                                new Container
-                                                {
-                                                    Anchor = Anchor.Centre,
-                                                    Origin = Anchor.Centre,
-                                                    Width = 40,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Child = votePill = new VotePill(Comment)
-                                                    {
-                                                        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,
                                                 },
+                                                votePill = new VotePill(Comment)
+                                                {
+                                                    Anchor = Anchor.CentreLeft,
+                                                    Origin = Anchor.CentreRight,
+                                                    Margin = new MarginPadding
+                                                    {
+                                                        Right = 5
+                                                    }
+                                                }
                                             }
                                         },
                                         new FillFlowContainer
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
-                                            Spacing = new Vector2(0, 3),
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 4),
+                                            Margin = new MarginPadding
+                                            {
+                                                Vertical = 2
+                                            },
                                             Children = new Drawable[]
                                             {
                                                 new FillFlowContainer
                                                 {
                                                     AutoSizeAxes = Axes.Both,
                                                     Direction = FillDirection.Horizontal,
-                                                    Spacing = new Vector2(7, 0),
+                                                    Spacing = new Vector2(10, 0),
                                                     Children = new Drawable[]
                                                     {
-                                                        username = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true))
+                                                        username = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold))
                                                         {
-                                                            AutoSizeAxes = Axes.Both,
+                                                            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",
+                                                            Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
+                                                            Text = "deleted"
                                                         }
                                                     }
                                                 },
                                                 message = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14))
                                                 {
                                                     RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Padding = new MarginPadding { Right = 40 }
+                                                    AutoSizeAxes = Axes.Y
                                                 },
-                                                new FillFlowContainer
+                                                info = new FillFlowContainer
                                                 {
                                                     AutoSizeAxes = Axes.Both,
-                                                    Direction = FillDirection.Vertical,
+                                                    Direction = FillDirection.Horizontal,
+                                                    Spacing = new Vector2(10, 0),
                                                     Children = new Drawable[]
                                                     {
-                                                        info = new FillFlowContainer
+                                                        new DrawableDate(Comment.CreatedAt, 12, false)
                                                         {
-                                                            AutoSizeAxes = Axes.Both,
-                                                            Direction = FillDirection.Horizontal,
-                                                            Spacing = new Vector2(10, 0),
-                                                            Children = new Drawable[]
-                                                            {
-                                                                new DrawableDate(Comment.CreatedAt, 12, false)
-                                                                {
-                                                                    Anchor = Anchor.CentreLeft,
-                                                                    Origin = Anchor.CentreLeft,
-                                                                    Colour = colourProvider.Foreground1
-                                                                }
-                                                            }
-                                                        },
+                                                            Colour = colourProvider.Foreground1
+                                                        }
+                                                    }
+                                                },
+                                                new Container
+                                                {
+                                                    AutoSizeAxes = Axes.Both,
+                                                    Children = new Drawable[]
+                                                    {
                                                         showRepliesButton = new ShowRepliesButton(Comment.RepliesCount)
                                                         {
                                                             Expanded = { BindTarget = childrenExpanded }
@@ -198,32 +190,36 @@ namespace osu.Game.Overlays.Comments
                                         }
                                     }
                                 }
-                            }
-                        },
-                        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,
+                                Padding = new MarginPadding { Left = 20 },
+                                Children = new Drawable[]
                                 {
-                                    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)
+                                    childCommentsContainer = new FillFlowContainer
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Direction = FillDirection.Vertical
+                                    },
+                                    deletedCommentsCounter = new DeletedCommentsCounter
+                                    {
+                                        ShowDeleted = { BindTarget = ShowDeleted },
+                                        Margin = new MarginPadding
+                                        {
+                                            Top = 10
+                                        }
+                                    },
+                                    showMoreButton = new ShowMoreButton
+                                    {
+                                        Action = () => RepliesRequested(this, ++currentPage)
+                                    }
                                 }
-                            }
-                        },
+                            },
+                        }
                     }
                 },
                 new Container
@@ -251,8 +247,6 @@ namespace osu.Game.Overlays.Comments
             {
                 info.Add(new OsuSpriteText
                 {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
                     Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
                     Text = $@"edited {HumanizerUtils.Humanize(Comment.EditedAt.Value)} by {Comment.EditedUser.Username}",
                     Colour = colourProvider.Foreground1
@@ -362,6 +356,23 @@ namespace osu.Game.Overlays.Comments
             showMoreButton.IsLoading = loadRepliesButton.IsLoading = false;
         }
 
+        private MarginPadding getPadding(bool isTopLevel)
+        {
+            if (isTopLevel)
+            {
+                return new MarginPadding
+                {
+                    Horizontal = 70,
+                    Vertical = 15
+                };
+            }
+
+            return new MarginPadding
+            {
+                Top = 10
+            };
+        }
+
         private class ParentUsername : FillFlowContainer, IHasTooltip
         {
             public string TooltipText => getParentMessage();

From dc577aa6fa2bc0df944d84bfbb27085217929737 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jul 2020 11:22:58 +0900
Subject: [PATCH 03942/10326] Fix display of bonus score

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs       | 2 +-
 .../Objects/Drawables/Pieces/SpinnerBonusDisplay.cs           | 2 +-
 osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs             | 4 +++-
 osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs                  | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 23b440ced2..c36bec391f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
                 var totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value * 2;
-                return totalScore == (int)(drawableSpinner.Disc.CumulativeRotation / 360) * 10;
+                return totalScore == (int)(drawableSpinner.Disc.CumulativeRotation / 360) * SpinnerTick.SCORE_PER_TICK;
             });
 
             addSeekStep(0);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
index a8f5580735..b499d7a92b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 return;
 
             displayedCount = count;
-            bonusCounter.Text = $"{1000 * count}";
+            bonusCounter.Text = $"{SpinnerBonusTick.SCORE_PER_TICK * count}";
             bonusCounter.FadeOutFromOne(1500);
             bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
index b59428e701..9c4b6f774f 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SpinnerBonusTick : SpinnerTick
     {
+        public new const int SCORE_PER_TICK = 50;
+
         public SpinnerBonusTick()
         {
             Samples.Add(new HitSampleInfo { Name = "spinnerbonus" });
@@ -18,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public class OsuSpinnerBonusTickJudgement : OsuSpinnerTickJudgement
         {
-            protected override int NumericResultFor(HitResult result) => 50;
+            protected override int NumericResultFor(HitResult result) => SCORE_PER_TICK;
 
             protected override double HealthIncreaseFor(HitResult result) => base.HealthIncreaseFor(result) * 2;
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
index 346f949a4f..de3ae27e55 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SpinnerTick : OsuHitObject
     {
+        public const int SCORE_PER_TICK = 10;
+
         public override Judgement CreateJudgement() => new OsuSpinnerTickJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
@@ -17,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             public override bool AffectsCombo => false;
 
-            protected override int NumericResultFor(HitResult result) => 10;
+            protected override int NumericResultFor(HitResult result) => SCORE_PER_TICK;
 
             protected override double HealthIncreaseFor(HitResult result) => result == MaxResult ? 0.6 * base.HealthIncreaseFor(result) : 0;
         }

From df3e2cc640ca60f5118927f43f67e71b1e0f69b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jul 2020 12:08:15 +0900
Subject: [PATCH 03943/10326] Fix potential crash due to cross-thread
 TrackVirtualManual.Stop

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

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index cb9ed40b00..866fc215d6 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -305,8 +305,10 @@ namespace osu.Game.Tests.Visual
                     {
                         double refTime = referenceClock.CurrentTime;
 
-                        if (lastReferenceTime.HasValue)
-                            accumulated += (refTime - lastReferenceTime.Value) * Rate;
+                        double? lastRefTime = lastReferenceTime;
+
+                        if (lastRefTime != null)
+                            accumulated += (refTime - lastRefTime.Value) * Rate;
 
                         lastReferenceTime = refTime;
                     }

From a210deee9a3caa6cd20c841d808858f3e10331cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jul 2020 12:16:01 +0900
Subject: [PATCH 03944/10326] Remove unnecessary depth setter

---
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index e085334649..d24c81536e 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -139,7 +139,6 @@ namespace osu.Game.Rulesets.Judgements
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
-                Depth = -float.MaxValue,
                 Child = bodyDrawable = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ => JudgementText = new OsuSpriteText
                 {
                     Text = type.GetDescription().ToUpperInvariant(),

From a99c6698b7350b2f4362761cbaf64e932e2232fc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2020 04:25:01 +0000
Subject: [PATCH 03945/10326] Bump SharpCompress from 0.25.1 to 0.26.0

Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.25.1 to 0.26.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.25.1...0.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 7ebffc6d10..5ac54a853f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="ppy.osu.Framework" Version="2020.723.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
     <PackageReference Include="Sentry" Version="2.1.5" />
-    <PackageReference Include="SharpCompress" Version="0.25.1" />
+    <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index 618de5d19f..8b2d1346be 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -81,7 +81,7 @@
     <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.723.0" />
-    <PackageReference Include="SharpCompress" Version="0.25.1" />
+    <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From 72c8f0737ef5d125879c044677183f04f259cf02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jul 2020 14:18:14 +0900
Subject: [PATCH 03946/10326] Fix Autopilot mod incompatibility with
 WindUp/WindDown

---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index d75f4c70d7..2263e2b2f4 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -30,6 +31,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private OsuInputManager inputManager;
 
+        private GameplayClock gameplayClock;
+
         private List<OsuReplayFrame> replayFrames;
 
         private int currentFrame;
@@ -38,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             if (currentFrame == replayFrames.Count - 1) return;
 
-            double time = playfield.Time.Current;
+            double time = gameplayClock.CurrentTime;
 
             // Very naive implementation of autopilot based on proximity to replay frames.
             // TODO: this needs to be based on user interactions to better match stable (pausing until judgement is registered).
@@ -53,6 +56,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
         {
+            gameplayClock = drawableRuleset.FrameStableClock;
+
             // Grab the input manager to disable the user's cursor, and for future use
             inputManager = (OsuInputManager)drawableRuleset.KeyBindingInputManager;
             inputManager.AllowUserCursorMovement = false;

From e795b1ea318a97ff6693526b78003c85fd231cd2 Mon Sep 17 00:00:00 2001
From: Joe Yuan <yuan.joe12@gmail.com>
Date: Tue, 28 Jul 2020 00:38:31 -0700
Subject: [PATCH 03947/10326] Failing effect displays vertically

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 84dbb35f68..847b8a53cf 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private const float max_alpha = 0.4f;
         private const int fade_time = 400;
-        private const float gradient_size = 0.3f;
+        private const float gradient_size = 0.2f;
 
         /// <summary>
         /// The threshold under which the current player life should be considered low and the layer should start fading in.
@@ -56,16 +56,16 @@ namespace osu.Game.Screens.Play.HUD
                         new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0)),
-                            Height = gradient_size,
+                            Colour = ColourInfo.GradientHorizontal(Color4.White, Color4.White.Opacity(0)),
+                            Width = gradient_size,
                         },
                         new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Height = gradient_size,
-                            Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0), Color4.White),
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
+                            Width = gradient_size,
+                            Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0), Color4.White),
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
                         },
                     }
                 },

From ff3cb6487d2d474ff8d9ec9c6f164ee47d6efe62 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jul 2020 16:52:07 +0900
Subject: [PATCH 03948/10326] Store all linked cancellation tokens

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 5e644fbf1c..e625f6f96e 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -109,25 +109,42 @@ namespace osu.Game.Beatmaps
         }
 
         private CancellationTokenSource trackedUpdateCancellationSource;
+        private readonly List<CancellationTokenSource> linkedCancellationSources = new List<CancellationTokenSource>();
 
         /// <summary>
         /// Updates all tracked <see cref="BindableStarDifficulty"/> using the current ruleset and mods.
         /// </summary>
         private void updateTrackedBindables()
         {
-            trackedUpdateCancellationSource?.Cancel();
+            cancelTrackedBindableUpdate();
             trackedUpdateCancellationSource = new CancellationTokenSource();
 
             foreach (var b in trackedBindables)
             {
-                if (trackedUpdateCancellationSource.IsCancellationRequested)
-                    break;
+                var linkedSource = CancellationTokenSource.CreateLinkedTokenSource(trackedUpdateCancellationSource.Token, b.CancellationToken);
+                linkedCancellationSources.Add(linkedSource);
 
-                using (var linkedSource = CancellationTokenSource.CreateLinkedTokenSource(trackedUpdateCancellationSource.Token, b.CancellationToken))
-                    updateBindable(b, currentRuleset.Value, currentMods.Value, linkedSource.Token);
+                updateBindable(b, currentRuleset.Value, currentMods.Value, linkedSource.Token);
             }
         }
 
+        /// <summary>
+        /// Cancels the existing update of all tracked <see cref="BindableStarDifficulty"/> via <see cref="updateTrackedBindables"/>.
+        /// </summary>
+        private void cancelTrackedBindableUpdate()
+        {
+            trackedUpdateCancellationSource?.Cancel();
+            trackedUpdateCancellationSource = null;
+
+            foreach (var c in linkedCancellationSources)
+            {
+                c.Cancel();
+                c.Dispose();
+            }
+
+            linkedCancellationSources.Clear();
+        }
+
         /// <summary>
         /// Updates the value of a <see cref="BindableStarDifficulty"/> with a given ruleset + mods.
         /// </summary>
@@ -220,6 +237,12 @@ namespace osu.Game.Beatmaps
             return difficultyCache.TryGetValue(key, out existingDifficulty);
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            cancelTrackedBindableUpdate();
+        }
+
         private readonly struct DifficultyCacheLookup : IEquatable<DifficultyCacheLookup>
         {
             public readonly int BeatmapId;

From 96f68a32518422f90abbdce672089bd5b5ee50f3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jul 2020 16:52:19 +0900
Subject: [PATCH 03949/10326] Reorder method

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index e625f6f96e..98a1462d99 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -145,6 +145,22 @@ namespace osu.Game.Beatmaps
             linkedCancellationSources.Clear();
         }
 
+        /// <summary>
+        /// Creates a new <see cref="BindableStarDifficulty"/> and triggers an initial value update.
+        /// </summary>
+        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> that star difficulty should correspond to.</param>
+        /// <param name="initialRulesetInfo">The initial <see cref="RulesetInfo"/> to get the difficulty with.</param>
+        /// <param name="initialMods">The initial <see cref="Mod"/>s to get the difficulty with.</param>
+        /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
+        /// <returns>The <see cref="BindableStarDifficulty"/>.</returns>
+        private BindableStarDifficulty createBindable([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo initialRulesetInfo, [CanBeNull] IEnumerable<Mod> initialMods,
+                                                      CancellationToken cancellationToken)
+        {
+            var bindable = new BindableStarDifficulty(beatmapInfo, cancellationToken);
+            updateBindable(bindable, initialRulesetInfo, initialMods, cancellationToken);
+            return bindable;
+        }
+
         /// <summary>
         /// Updates the value of a <see cref="BindableStarDifficulty"/> with a given ruleset + mods.
         /// </summary>
@@ -165,22 +181,6 @@ namespace osu.Game.Beatmaps
             }, cancellationToken);
         }
 
-        /// <summary>
-        /// Creates a new <see cref="BindableStarDifficulty"/> and triggers an initial value update.
-        /// </summary>
-        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> that star difficulty should correspond to.</param>
-        /// <param name="initialRulesetInfo">The initial <see cref="RulesetInfo"/> to get the difficulty with.</param>
-        /// <param name="initialMods">The initial <see cref="Mod"/>s to get the difficulty with.</param>
-        /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
-        /// <returns>The <see cref="BindableStarDifficulty"/>.</returns>
-        private BindableStarDifficulty createBindable([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo initialRulesetInfo, [CanBeNull] IEnumerable<Mod> initialMods,
-                                                      CancellationToken cancellationToken)
-        {
-            var bindable = new BindableStarDifficulty(beatmapInfo, cancellationToken);
-            updateBindable(bindable, initialRulesetInfo, initialMods, cancellationToken);
-            return bindable;
-        }
-
         /// <summary>
         /// Computes the difficulty defined by a <see cref="DifficultyCacheLookup"/> key, and stores it to the timed cache.
         /// </summary>

From ca434e82d961dac772296c6d335ff699efdcc1ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jul 2020 17:09:38 +0900
Subject: [PATCH 03950/10326] Fix test failures due to gameplay clock not being
 unpaused

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 81e5f32ee8..e0a1f947ec 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            gameplayClock.IsPaused.Value = false;
+
             Children = new Drawable[]
             {
                 new Container
@@ -42,9 +44,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             DrawableSample sample = null;
             AddStep("start sample with looping", () =>
             {
+                sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
+
                 skinnableSound.Looping = true;
                 skinnableSound.Play();
-                sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
             });
 
             AddUntilStep("wait for sample to start playing", () => sample.Playing);

From fa25f8aef9993c53f2ac72a9ed1ecd4446848b3b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jul 2020 17:23:35 +0900
Subject: [PATCH 03951/10326] Dispose update scheduler

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 98a1462d99..b3afd1d4fd 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -240,7 +240,9 @@ namespace osu.Game.Beatmaps
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
+
             cancelTrackedBindableUpdate();
+            updateScheduler.Dispose();
         }
 
         private readonly struct DifficultyCacheLookup : IEquatable<DifficultyCacheLookup>

From f7cd6e83aa81bc24ccce152e37028851e1af8ee0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jul 2020 17:58:58 +0900
Subject: [PATCH 03952/10326] Adjust mania scoring to be 95% based on accuracy

---
 osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index ba84c21845..4b2f643333 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -7,9 +7,9 @@ namespace osu.Game.Rulesets.Mania.Scoring
 {
     internal class ManiaScoreProcessor : ScoreProcessor
     {
-        protected override double DefaultAccuracyPortion => 0.8;
+        protected override double DefaultAccuracyPortion => 0.95;
 
-        protected override double DefaultComboPortion => 0.2;
+        protected override double DefaultComboPortion => 0.05;
 
         public override HitWindows CreateHitWindows() => new ManiaHitWindows();
     }

From 375dad087837ba6156be5ec629b0a370c19c7891 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jul 2020 17:59:52 +0900
Subject: [PATCH 03953/10326] Increase PERFECT from 320 to 350 score

---
 osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
index 53db676a54..53967ffa05 100644
--- a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Judgements
                     return 300;
 
                 case HitResult.Perfect:
-                    return 320;
+                    return 350;
             }
         }
     }

From 54d2f2c8cd2e837d7b0e046f4bf8df91317eb802 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jul 2020 20:34:09 +0900
Subject: [PATCH 03954/10326] Delay loading of cover backgrounds in score
 panels

---
 .../Ranking/Contracted/ContractedPanelMiddleContent.cs       | 5 ++++-
 osu.Game/Screens/Ranking/ScorePanel.cs                       | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index 8cd0e7025e..3ffb205d09 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -70,11 +70,14 @@ namespace osu.Game.Screens.Ranking.Contracted
                                     RelativeSizeAxes = Axes.Both,
                                     Colour = Color4Extensions.FromHex("444")
                                 },
-                                new UserCoverBackground
+                                new DelayedLoadUnloadWrapper(() => new UserCoverBackground
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     User = score.User,
                                     Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0.5f), Color4Extensions.FromHex("#444").Opacity(0))
+                                }, 300, 5000)
+                                {
+                                    RelativeSizeAxes = Axes.Both
                                 },
                                 new FillFlowContainer
                                 {
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 5da432d5b2..7ac98604f4 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -146,11 +146,14 @@ namespace osu.Game.Screens.Ranking
                                 Children = new[]
                                 {
                                     middleLayerBackground = new Box { RelativeSizeAxes = Axes.Both },
-                                    new UserCoverBackground
+                                    new DelayedLoadUnloadWrapper(() => new UserCoverBackground
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         User = Score.User,
                                         Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0.5f), Color4Extensions.FromHex("#444").Opacity(0))
+                                    }, 300, 5000)
+                                    {
+                                        RelativeSizeAxes = Axes.Both
                                     },
                                 }
                             },

From 42e88c53d75a03f37fe8699ca2512c0477fb8c75 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jul 2020 20:50:55 +0900
Subject: [PATCH 03955/10326] Embed behaviour into UserCoverBackground

---
 osu.Game/Overlays/Profile/ProfileHeader.cs            |  7 ++++++-
 .../Contracted/ContractedPanelMiddleContent.cs        |  5 +----
 osu.Game/Screens/Ranking/ScorePanel.cs                |  7 ++-----
 osu.Game/Users/UserCoverBackground.cs                 | 11 +++++++++++
 osu.Game/Users/UserPanel.cs                           | 10 ++--------
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 2e5f1071f2..55474c9d3e 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Profile
                 Masking = true,
                 Children = new Drawable[]
                 {
-                    coverContainer = new UserCoverBackground
+                    coverContainer = new ProfileCoverBackground
                     {
                         RelativeSizeAxes = Axes.Both,
                     },
@@ -100,5 +100,10 @@ namespace osu.Game.Overlays.Profile
                 IconTexture = "Icons/profile";
             }
         }
+
+        private class ProfileCoverBackground : UserCoverBackground
+        {
+            protected override double LoadDelay => 0;
+        }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index 3ffb205d09..8cd0e7025e 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -70,14 +70,11 @@ namespace osu.Game.Screens.Ranking.Contracted
                                     RelativeSizeAxes = Axes.Both,
                                     Colour = Color4Extensions.FromHex("444")
                                 },
-                                new DelayedLoadUnloadWrapper(() => new UserCoverBackground
+                                new UserCoverBackground
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     User = score.User,
                                     Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0.5f), Color4Extensions.FromHex("#444").Opacity(0))
-                                }, 300, 5000)
-                                {
-                                    RelativeSizeAxes = Axes.Both
                                 },
                                 new FillFlowContainer
                                 {
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 7ac98604f4..24d193e9a7 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -146,15 +146,12 @@ namespace osu.Game.Screens.Ranking
                                 Children = new[]
                                 {
                                     middleLayerBackground = new Box { RelativeSizeAxes = Axes.Both },
-                                    new DelayedLoadUnloadWrapper(() => new UserCoverBackground
+                                    new UserCoverBackground
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         User = Score.User,
                                         Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0.5f), Color4Extensions.FromHex("#444").Opacity(0))
-                                    }, 300, 5000)
-                                    {
-                                        RelativeSizeAxes = Axes.Both
-                                    },
+                                    }
                                 }
                             },
                             middleLayerContentContainer = new Container { RelativeSizeAxes = Axes.Both }
diff --git a/osu.Game/Users/UserCoverBackground.cs b/osu.Game/Users/UserCoverBackground.cs
index 748d9bd939..34bbf6892e 100644
--- a/osu.Game/Users/UserCoverBackground.cs
+++ b/osu.Game/Users/UserCoverBackground.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -23,6 +24,16 @@ namespace osu.Game.Users
 
         protected override Drawable CreateDrawable(User user) => new Cover(user);
 
+        protected override double LoadDelay => 300;
+
+        /// <summary>
+        /// Delay before the background is unloaded while off-screen.
+        /// </summary>
+        protected virtual double UnloadDelay => 5000;
+
+        protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
+            => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad, UnloadDelay);
+
         [LongRunningLoad]
         private class Cover : CompositeDrawable
         {
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 94c0c31cfc..57a87a713d 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -4,7 +4,6 @@
 using System;
 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;
@@ -25,7 +24,7 @@ namespace osu.Game.Users
 
         protected Action ViewProfile { get; private set; }
 
-        protected DelayedLoadUnloadWrapper Background { get; private set; }
+        protected Drawable Background { get; private set; }
 
         protected UserPanel(User user)
         {
@@ -56,17 +55,12 @@ namespace osu.Game.Users
                     RelativeSizeAxes = Axes.Both,
                     Colour = ColourProvider?.Background5 ?? Colours.Gray1
                 },
-                Background = new DelayedLoadUnloadWrapper(() => new UserCoverBackground
+                Background = 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()
             });

From 9f6446d83685fb4d6052930129ae7b68f7781f50 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jul 2020 20:58:13 +0900
Subject: [PATCH 03956/10326] Add xmldocs + refactoring

---
 osu.Game/Screens/Ranking/ResultsScreen.cs  | 17 +++++++++++------
 osu.Game/Screens/Ranking/ScorePanelList.cs | 15 +++++++++++++--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index c5512822b2..254ab76f5b 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -50,6 +50,9 @@ namespace osu.Game.Screens.Ranking
         private ScorePanelList scorePanelList;
         private Container<ScorePanel> detachedPanelContainer;
 
+        private bool fetchedInitialScores;
+        private APIRequest nextPageRequest;
+
         protected ResultsScreen(ScoreInfo score, bool allowRetry = true)
         {
             Score = score;
@@ -172,13 +175,11 @@ namespace osu.Game.Screens.Ranking
             statisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
         }
 
-        private APIRequest nextPageRequest;
-
         protected override void Update()
         {
             base.Update();
 
-            if (hasAnyScores && nextPageRequest == null)
+            if (fetchedInitialScores && nextPageRequest == null)
             {
                 if (scorePanelList.IsScrolledToStart)
                     nextPageRequest = FetchNextPage(-1, fetchScoresCallback);
@@ -202,16 +203,20 @@ namespace osu.Game.Screens.Ranking
         /// <returns>An <see cref="APIRequest"/> responsible for the fetch operation. This will be queued and performed automatically.</returns>
         protected virtual APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
+        /// <summary>
+        /// Performs a fetch of the next page of scores. This is invoked every frame until a non-null <see cref="APIRequest"/> is returned.
+        /// </summary>
+        /// <param name="direction">The fetch direction. -1 to fetch scores greater than the current start of the list, and 1 to fetch scores lower than the current end of the list.</param>
+        /// <param name="scoresCallback">A callback which should be called when fetching is completed. Scheduling is not required.</param>
+        /// <returns>An <see cref="APIRequest"/> responsible for the fetch operation. This will be queued and performed automatically.</returns>
         protected virtual APIRequest FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
-        private bool hasAnyScores;
-
         private void fetchScoresCallback(IEnumerable<ScoreInfo> scores) => Schedule(() =>
         {
             foreach (var s in scores)
                 addScore(s);
 
-            hasAnyScores = true;
+            fetchedInitialScores = true;
         });
 
         public override void OnEntering(IScreen last)
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index aba8314732..b2e1e91831 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -26,9 +26,20 @@ namespace osu.Game.Screens.Ranking
         /// </summary>
         private const float expanded_panel_spacing = 15;
 
-        public bool IsScrolledToStart => flow.Count > 0 && scroll.ScrollableExtent > 0 && scroll.Current <= 100;
+        /// <summary>
+        /// Minimum distance from either end point of the list that the list can be considered scrolled to the end point.
+        /// </summary>
+        private const float scroll_endpoint_distance = 100;
 
-        public bool IsScrolledToEnd => flow.Count > 0 && scroll.ScrollableExtent > 0 && scroll.IsScrolledToEnd(100);
+        /// <summary>
+        /// Whether this <see cref="ScorePanelList"/> can be scrolled and is currently scrolled to the start.
+        /// </summary>
+        public bool IsScrolledToStart => flow.Count > 0 && scroll.ScrollableExtent > 0 && scroll.Current <= scroll_endpoint_distance;
+
+        /// <summary>
+        /// Whether this <see cref="ScorePanelList"/> can be scrolled and is currently scrolled to the end.
+        /// </summary>
+        public bool IsScrolledToEnd => flow.Count > 0 && scroll.ScrollableExtent > 0 && scroll.IsScrolledToEnd(scroll_endpoint_distance);
 
         /// <summary>
         /// An action to be invoked if a <see cref="ScorePanel"/> is clicked while in an expanded state.

From db91d1de50e9ab92f7df1ec45abbea93696766af Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jul 2020 21:40:11 +0900
Subject: [PATCH 03957/10326] Use response params in next page request

---
 .../Multiplayer/IndexPlaylistScoresRequest.cs | 25 +++++-----
 .../Online/Multiplayer/IndexScoresParams.cs   | 20 ++++++++
 .../Online/Multiplayer/MultiplayerScores.cs   |  6 +++
 .../Multi/Ranking/TimeshiftResultsScreen.cs   | 49 ++++++-------------
 4 files changed, 53 insertions(+), 47 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/IndexScoresParams.cs

diff --git a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
index 7273c0eea6..67793df344 100644
--- a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.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 JetBrains.Annotations;
 using osu.Framework.IO.Network;
 using osu.Game.Extensions;
 using osu.Game.Online.API;
@@ -16,31 +17,31 @@ namespace osu.Game.Online.Multiplayer
         private readonly int roomId;
         private readonly int playlistItemId;
         private readonly Cursor cursor;
-        private readonly MultiplayerScoresSort? sort;
+        private readonly IndexScoresParams indexParams;
 
-        public IndexPlaylistScoresRequest(int roomId, int playlistItemId, Cursor cursor = null, MultiplayerScoresSort? sort = null)
+        public IndexPlaylistScoresRequest(int roomId, int playlistItemId)
         {
             this.roomId = roomId;
             this.playlistItemId = playlistItemId;
+        }
+
+        public IndexPlaylistScoresRequest(int roomId, int playlistItemId, [NotNull] Cursor cursor, [NotNull] IndexScoresParams indexParams)
+            : this(roomId, playlistItemId)
+        {
             this.cursor = cursor;
-            this.sort = sort;
+            this.indexParams = indexParams;
         }
 
         protected override WebRequest CreateWebRequest()
         {
             var req = base.CreateWebRequest();
 
-            req.AddCursor(cursor);
-
-            switch (sort)
+            if (cursor != null)
             {
-                case MultiplayerScoresSort.Ascending:
-                    req.AddParameter("sort", "score_asc");
-                    break;
+                req.AddCursor(cursor);
 
-                case MultiplayerScoresSort.Descending:
-                    req.AddParameter("sort", "score_desc");
-                    break;
+                foreach (var (key, value) in indexParams.Properties)
+                    req.AddParameter(key, value.ToString());
             }
 
             return req;
diff --git a/osu.Game/Online/Multiplayer/IndexScoresParams.cs b/osu.Game/Online/Multiplayer/IndexScoresParams.cs
new file mode 100644
index 0000000000..8160dfefaf
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/IndexScoresParams.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.Collections.Generic;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace osu.Game.Online.Multiplayer
+{
+    /// <summary>
+    /// A collection of parameters which should be passed to the index endpoint to fetch the next page.
+    /// </summary>
+    public class IndexScoresParams
+    {
+        [UsedImplicitly]
+        [JsonExtensionData]
+        public IDictionary<string, JToken> Properties;
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/MultiplayerScores.cs b/osu.Game/Online/Multiplayer/MultiplayerScores.cs
index 6f74fc8984..2d0f98e032 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScores.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerScores.cs
@@ -29,5 +29,11 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         [JsonProperty("user_score")]
         public MultiplayerScore UserScore { get; set; }
+
+        /// <summary>
+        /// The parameters to be used to fetch the next page.
+        /// </summary>
+        [JsonProperty("params")]
+        public IndexScoresParams Params { get; set; }
     }
 }
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 75a61b92ee..648bee385c 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
@@ -23,8 +22,8 @@ namespace osu.Game.Screens.Multi.Ranking
         private readonly PlaylistItem playlistItem;
 
         private LoadingSpinner loadingLayer;
-        private Cursor higherScoresCursor;
-        private Cursor lowerScoresCursor;
+        private MultiplayerScores higherScores;
+        private MultiplayerScores lowerScores;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -52,8 +51,8 @@ namespace osu.Game.Screens.Multi.Ranking
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
             // This performs two requests:
-            // 1. A request to show the user's score.
-            // 2. If (1) fails, a request to index the room.
+            // 1. A request to show the user's score (and scores around).
+            // 2. If that fails, a request to index the room starting from the highest score.
 
             var userScoreReq = new ShowPlaylistUserScoreRequest(roomId, playlistItem.ID, api.LocalUser.Value.Id);
 
@@ -64,13 +63,13 @@ namespace osu.Game.Screens.Multi.Ranking
                 if (userScore.ScoresAround?.Higher != null)
                 {
                     allScores.AddRange(userScore.ScoresAround.Higher.Scores);
-                    higherScoresCursor = userScore.ScoresAround.Higher.Cursor;
+                    higherScores = userScore.ScoresAround.Higher;
                 }
 
                 if (userScore.ScoresAround?.Lower != null)
                 {
                     allScores.AddRange(userScore.ScoresAround.Lower.Scores);
-                    lowerScoresCursor = userScore.ScoresAround.Lower.Cursor;
+                    lowerScores = userScore.ScoresAround.Lower;
                 }
 
                 performSuccessCallback(scoresCallback, allScores);
@@ -84,7 +83,7 @@ namespace osu.Game.Screens.Multi.Ranking
                 indexReq.Success += r =>
                 {
                     performSuccessCallback(scoresCallback, r.Scores);
-                    lowerScoresCursor = r.Cursor;
+                    lowerScores = r;
                 };
 
                 indexReq.Failure += __ => loadingLayer.Hide();
@@ -99,39 +98,19 @@ namespace osu.Game.Screens.Multi.Ranking
         {
             Debug.Assert(direction == 1 || direction == -1);
 
-            Cursor cursor;
-            MultiplayerScoresSort sort;
+            MultiplayerScores pivot = direction == -1 ? higherScores : lowerScores;
 
-            switch (direction)
-            {
-                case -1:
-                    cursor = higherScoresCursor;
-                    sort = MultiplayerScoresSort.Ascending;
-                    break;
-
-                default:
-                    cursor = lowerScoresCursor;
-                    sort = MultiplayerScoresSort.Descending;
-                    break;
-            }
-
-            if (cursor == null)
+            if (pivot?.Cursor == null)
                 return null;
 
-            var indexReq = new IndexPlaylistScoresRequest(roomId, playlistItem.ID, cursor, sort);
+            var indexReq = new IndexPlaylistScoresRequest(roomId, playlistItem.ID, pivot.Cursor, pivot.Params);
 
             indexReq.Success += r =>
             {
-                switch (direction)
-                {
-                    case -1:
-                        higherScoresCursor = r.Cursor;
-                        break;
-
-                    default:
-                        lowerScoresCursor = r.Cursor;
-                        break;
-                }
+                if (direction == -1)
+                    higherScores = r;
+                else
+                    lowerScores = r;
 
                 performSuccessCallback(scoresCallback, r.Scores);
             };

From ccc377ae6af607215edc8756a1cd24881be427d1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jul 2020 21:42:04 +0900
Subject: [PATCH 03958/10326] Remove unused enum

---
 .../Online/Multiplayer/MultiplayerScoresSort.cs    | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 osu.Game/Online/Multiplayer/MultiplayerScoresSort.cs

diff --git a/osu.Game/Online/Multiplayer/MultiplayerScoresSort.cs b/osu.Game/Online/Multiplayer/MultiplayerScoresSort.cs
deleted file mode 100644
index decb1c4dfe..0000000000
--- a/osu.Game/Online/Multiplayer/MultiplayerScoresSort.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.
-
-namespace osu.Game.Online.Multiplayer
-{
-    /// <summary>
-    /// Sorting option for indexing multiplayer scores.
-    /// </summary>
-    public enum MultiplayerScoresSort
-    {
-        Ascending,
-        Descending
-    }
-}

From a57b6bdc1817bec9274c92a3d879878707c355c1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jul 2020 11:29:38 +0900
Subject: [PATCH 03959/10326] Remove cancellation of linked tokens

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index b3afd1d4fd..58b96b08b0 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -137,10 +137,7 @@ namespace osu.Game.Beatmaps
             trackedUpdateCancellationSource = null;
 
             foreach (var c in linkedCancellationSources)
-            {
-                c.Cancel();
                 c.Dispose();
-            }
 
             linkedCancellationSources.Clear();
         }

From 46483622149904c9240f6f6e53ba4ef283edb07d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jul 2020 11:30:25 +0900
Subject: [PATCH 03960/10326] Safeguard against potential
 finalise-before-initialised

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 58b96b08b0..b80b4e45ed 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -136,10 +136,13 @@ namespace osu.Game.Beatmaps
             trackedUpdateCancellationSource?.Cancel();
             trackedUpdateCancellationSource = null;
 
-            foreach (var c in linkedCancellationSources)
-                c.Dispose();
+            if (linkedCancellationSources != null)
+            {
+                foreach (var c in linkedCancellationSources)
+                    c.Dispose();
 
-            linkedCancellationSources.Clear();
+                linkedCancellationSources.Clear();
+            }
         }
 
         /// <summary>
@@ -239,7 +242,7 @@ namespace osu.Game.Beatmaps
             base.Dispose(isDisposing);
 
             cancelTrackedBindableUpdate();
-            updateScheduler.Dispose();
+            updateScheduler?.Dispose();
         }
 
         private readonly struct DifficultyCacheLookup : IEquatable<DifficultyCacheLookup>

From 6c7e806eacecd71ad073d160ac95dbcadaad8199 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jul 2020 12:39:18 +0900
Subject: [PATCH 03961/10326] Include executable hash when submitting
 multiplayer scores

---
 osu.Game/OsuGameBase.cs         | 14 ++++++++++++++
 osu.Game/Scoring/ScoreInfo.cs   |  3 +++
 osu.Game/Screens/Play/Player.cs |  1 +
 3 files changed, 18 insertions(+)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index fe5c0704b7..964a7fdd35 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Development;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.IO.Stores;
@@ -97,6 +98,11 @@ namespace osu.Game
 
         public virtual Version AssemblyVersion => Assembly.GetEntryAssembly()?.GetName().Version ?? new Version();
 
+        /// <summary>
+        /// MD5 representation of the game executable.
+        /// </summary>
+        public string VersionHash { get; private set; }
+
         public bool IsDeployedBuild => AssemblyVersion.Major > 0;
 
         public virtual string Version
@@ -128,6 +134,14 @@ namespace osu.Game
         [BackgroundDependencyLoader]
         private void load()
         {
+            var assembly = Assembly.GetEntryAssembly();
+
+            if (assembly != null)
+            {
+                using (var str = File.OpenRead(assembly.Location))
+                    VersionHash = str.ComputeMD5Hash();
+            }
+
             Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly));
 
             dependencies.Cache(contextFactory = new DatabaseContextFactory(Storage));
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 84c0d5b54e..2cc065b5ad 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -51,6 +51,9 @@ namespace osu.Game.Scoring
         [NotMapped]
         public bool Passed { get; set; } = true;
 
+        [JsonProperty("version_hash")]
+        public string VersionHash { get; set; }
+
         [JsonIgnore]
         public virtual RulesetInfo Ruleset { get; set; }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 541275cf55..5df6cf42cb 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -465,6 +465,7 @@ namespace osu.Game.Screens.Play
             {
                 Beatmap = Beatmap.Value.BeatmapInfo,
                 Ruleset = rulesetInfo,
+                VersionHash = Game.VersionHash,
                 Mods = Mods.Value.ToArray(),
             };
 

From d7fab98af0352c39d07a9bd8d3325aa373376e78 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 29 Jul 2020 06:39:23 +0300
Subject: [PATCH 03962/10326] Update comments container footer in line with web

---
 .../Overlays/Comments/CommentsContainer.cs     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index f71808ba89..2a78748be6 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -78,21 +78,22 @@ namespace osu.Game.Overlays.Comments
                             AutoSizeAxes = Axes.Y,
                             Children = new Drawable[]
                             {
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = colourProvider.Background4
-                                },
                                 new FillFlowContainer
                                 {
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
                                     Direction = FillDirection.Vertical,
+                                    Margin = new MarginPadding { Bottom = 20 },
                                     Children = new Drawable[]
                                     {
                                         deletedCommentsCounter = new DeletedCommentsCounter
                                         {
-                                            ShowDeleted = { BindTarget = ShowDeleted }
+                                            ShowDeleted = { BindTarget = ShowDeleted },
+                                            Margin = new MarginPadding
+                                            {
+                                                Horizontal = 70,
+                                                Vertical = 10
+                                            }
                                         },
                                         new Container
                                         {
@@ -102,7 +103,10 @@ namespace osu.Game.Overlays.Comments
                                             {
                                                 Anchor = Anchor.Centre,
                                                 Origin = Anchor.Centre,
-                                                Margin = new MarginPadding(5),
+                                                Margin = new MarginPadding
+                                                {
+                                                    Vertical = 10
+                                                },
                                                 Action = getComments,
                                                 IsLoading = true,
                                             }

From 9e6d562872effe4ab8c763dd0a6db0b7f0be1ffe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jul 2020 13:18:40 +0900
Subject: [PATCH 03963/10326] Send in initial score request instead

---
 osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs | 5 ++++-
 osu.Game/Scoring/ScoreInfo.cs                         | 3 ---
 osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs        | 2 +-
 osu.Game/Screens/Play/Player.cs                       | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs b/osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs
index f973f96b37..2d99b12519 100644
--- a/osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs
+++ b/osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs
@@ -11,17 +11,20 @@ namespace osu.Game.Online.Multiplayer
     {
         private readonly int roomId;
         private readonly int playlistItemId;
+        private readonly string versionHash;
 
-        public CreateRoomScoreRequest(int roomId, int playlistItemId)
+        public CreateRoomScoreRequest(int roomId, int playlistItemId, string versionHash)
         {
             this.roomId = roomId;
             this.playlistItemId = playlistItemId;
+            this.versionHash = versionHash;
         }
 
         protected override WebRequest CreateWebRequest()
         {
             var req = base.CreateWebRequest();
             req.Method = HttpMethod.Post;
+            req.AddParameter("version_hash", versionHash);
             return req;
         }
 
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 2cc065b5ad..84c0d5b54e 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -51,9 +51,6 @@ namespace osu.Game.Scoring
         [NotMapped]
         public bool Passed { get; set; } = true;
 
-        [JsonProperty("version_hash")]
-        public string VersionHash { get; set; }
-
         [JsonIgnore]
         public virtual RulesetInfo Ruleset { get; set; }
 
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index c2381fe219..da082692d7 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Multi.Play
             if (!playlistItem.RequiredMods.All(m => Mods.Value.Any(m.Equals)))
                 throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods");
 
-            var req = new CreateRoomScoreRequest(roomId.Value ?? 0, playlistItem.ID);
+            var req = new CreateRoomScoreRequest(roomId.Value ?? 0, playlistItem.ID, Game.VersionHash);
             req.Success += r => token = r.ID;
             req.Failure += e =>
             {
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 5df6cf42cb..541275cf55 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -465,7 +465,6 @@ namespace osu.Game.Screens.Play
             {
                 Beatmap = Beatmap.Value.BeatmapInfo,
                 Ruleset = rulesetInfo,
-                VersionHash = Game.VersionHash,
                 Mods = Mods.Value.ToArray(),
             };
 

From c3c60334ec7b1806cd9cb7e99b39a0d9951c50a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jul 2020 15:24:14 +0900
Subject: [PATCH 03964/10326] Add skinning support to spinner test scene

---
 .../TestSceneSpinner.cs                       | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 67afc45e32..8e3a22bfdc 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -4,37 +4,32 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestSceneSpinner : OsuTestScene
+    public class TestSceneSpinner : OsuSkinnableTestScene
     {
-        private readonly Container content;
-        protected override Container<Drawable> Content => content;
-
         private int depthIndex;
 
         public TestSceneSpinner()
         {
-            base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
+            //            base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
 
-            AddStep("Miss Big", () => testSingle(2));
-            AddStep("Miss Medium", () => testSingle(5));
-            AddStep("Miss Small", () => testSingle(7));
-            AddStep("Hit Big", () => testSingle(2, true));
-            AddStep("Hit Medium", () => testSingle(5, true));
-            AddStep("Hit Small", () => testSingle(7, true));
+            AddStep("Miss Big", () => SetContents(() => testSingle(2)));
+            AddStep("Miss Medium", () => SetContents(() => testSingle(5)));
+            AddStep("Miss Small", () => SetContents(() => testSingle(7)));
+            AddStep("Hit Big", () => SetContents(() => testSingle(2, true)));
+            AddStep("Hit Medium", () => SetContents(() => testSingle(5, true)));
+            AddStep("Hit Small", () => SetContents(() => testSingle(7, true)));
         }
 
-        private void testSingle(float circleSize, bool auto = false)
+        private Drawable testSingle(float circleSize, bool auto = false)
         {
             var spinner = new Spinner { StartTime = Time.Current + 2000, EndTime = Time.Current + 5000 };
 
@@ -49,12 +44,12 @@ namespace osu.Game.Rulesets.Osu.Tests
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObjects>())
                 mod.ApplyToDrawableHitObjects(new[] { drawable });
 
-            Add(drawable);
+            return drawable;
         }
 
         private class TestDrawableSpinner : DrawableSpinner
         {
-            private bool auto;
+            private readonly bool auto;
 
             public TestDrawableSpinner(Spinner s, bool auto)
                 : base(s)
@@ -62,16 +57,11 @@ namespace osu.Game.Rulesets.Osu.Tests
                 this.auto = auto;
             }
 
-            protected override void CheckForResult(bool userTriggered, double timeOffset)
+            protected override void Update()
             {
-                if (auto && !userTriggered && Time.Current > Spinner.StartTime + Spinner.Duration / 2 && Progress < 1)
-                {
-                    // force completion only once to not break human interaction
-                    Disc.CumulativeRotation = Spinner.SpinsRequired * 360;
-                    auto = false;
-                }
-
-                base.CheckForResult(userTriggered, timeOffset);
+                base.Update();
+                if (auto)
+                    Disc.Rotate((float)(Clock.ElapsedFrameTime * 3));
             }
         }
     }

From 0f1f4b2b5c97656e80650b4560bfe4d1adb3b740 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jul 2020 15:36:42 +0900
Subject: [PATCH 03965/10326] Add pooling for mania hit explosions

---
 .../Skinning/LegacyHitExplosion.cs            |  7 ++-
 osu.Game.Rulesets.Mania/UI/Column.cs          | 15 ++-----
 .../UI/DefaultHitExplosion.cs                 | 28 +++++-------
 osu.Game.Rulesets.Mania/UI/IHitExplosion.cs   | 16 +++++++
 .../UI/PoolableHitExplosion.cs                | 44 +++++++++++++++++++
 5 files changed, 79 insertions(+), 31 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/UI/IHitExplosion.cs
 create mode 100644 osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index bc93bb2615..c2b39945c2 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -6,13 +6,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyHitExplosion : LegacyManiaColumnElement
+    public class LegacyHitExplosion : LegacyManiaColumnElement, IHitExplosion
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
@@ -62,10 +63,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 explosion.Anchor = direction.NewValue == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
         }
 
-        protected override void LoadComplete()
+        public void Animate()
         {
-            base.LoadComplete();
-
             explosion?.FadeInFromZero(80)
                      .Then().FadeOut(120);
         }
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 642353bd0b..7ddac759db 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -9,9 +9,9 @@ using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
@@ -34,8 +34,8 @@ namespace osu.Game.Rulesets.Mania.UI
         public readonly Bindable<ManiaAction> Action = new Bindable<ManiaAction>();
 
         public readonly ColumnHitObjectArea HitObjectArea;
-
         internal readonly Container TopLevelContainer;
+        private readonly DrawablePool<PoolableHitExplosion> hitExplosionPool;
 
         public Container UnderlayElements => HitObjectArea.UnderlayElements;
 
@@ -53,6 +53,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             InternalChildren = new[]
             {
+                hitExplosionPool = new DrawablePool<PoolableHitExplosion>(5),
                 // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
                 background.CreateProxy(),
                 HitObjectArea = new ColumnHitObjectArea(Index, HitObjectContainer) { RelativeSizeAxes = Axes.Both },
@@ -108,15 +109,7 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!result.IsHit || !judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            var explosion = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion, Index), _ =>
-                new DefaultHitExplosion(judgedObject.AccentColour.Value, judgedObject is DrawableHoldNoteTick))
-            {
-                RelativeSizeAxes = Axes.Both
-            };
-
-            HitObjectArea.Explosions.Add(explosion);
-
-            explosion.Delay(200).Expire(true);
+            HitObjectArea.Explosions.Add(hitExplosionPool.Get());
         }
 
         public bool OnPressed(ManiaAction action)
diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index 7a047ed121..bac77b134c 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -15,7 +15,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
-    public class DefaultHitExplosion : CompositeDrawable
+    public class DefaultHitExplosion : CompositeDrawable, IHitExplosion
     {
         public override bool RemoveWhenNotAlive => true;
 
@@ -123,21 +123,6 @@ namespace osu.Game.Rulesets.Mania.UI
             direction.BindValueChanged(onDirectionChanged, true);
         }
 
-        protected override void LoadComplete()
-        {
-            const double duration = 200;
-
-            base.LoadComplete();
-
-            largeFaint
-                .ResizeTo(largeFaint.Size * new Vector2(5, 1), duration, Easing.OutQuint)
-                .FadeOut(duration * 2);
-
-            mainGlow1.ScaleTo(1.4f, duration, Easing.OutQuint);
-
-            this.FadeOut(duration, Easing.Out);
-        }
-
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
         {
             if (direction.NewValue == ScrollingDirection.Up)
@@ -151,5 +136,16 @@ namespace osu.Game.Rulesets.Mania.UI
                 Y = -DefaultNotePiece.NOTE_HEIGHT / 2;
             }
         }
+
+        public void Animate()
+        {
+            largeFaint
+                .ResizeTo(largeFaint.Size * new Vector2(5, 1), PoolableHitExplosion.DURATION, Easing.OutQuint)
+                .FadeOut(PoolableHitExplosion.DURATION * 2);
+
+            mainGlow1.ScaleTo(1.4f, PoolableHitExplosion.DURATION, Easing.OutQuint);
+
+            this.FadeOut(PoolableHitExplosion.DURATION, Easing.Out);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/IHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/IHitExplosion.cs
new file mode 100644
index 0000000000..da1742e48b
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/IHitExplosion.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.
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    /// <summary>
+    /// Common interface for all hit explosion bodies.
+    /// </summary>
+    public interface IHitExplosion
+    {
+        /// <summary>
+        /// Begins animating this <see cref="IHitExplosion"/>.
+        /// </summary>
+        void Animate();
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
new file mode 100644
index 0000000000..43808f99a8
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Pooling;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public class PoolableHitExplosion : PoolableDrawable
+    {
+        public const double DURATION = 200;
+
+        [Resolved]
+        private Column column { get; set; }
+
+        private SkinnableDrawable skinnableExplosion;
+
+        public PoolableHitExplosion()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = skinnableExplosion = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion, column.Index),
+                _ => new DefaultHitExplosion(column.AccentColour, false /*todo */))
+            {
+                RelativeSizeAxes = Axes.Both
+            };
+        }
+
+        protected override void PrepareForUse()
+        {
+            base.PrepareForUse();
+
+            (skinnableExplosion?.Drawable as IHitExplosion)?.Animate();
+
+            this.Delay(DURATION).Then().Expire();
+        }
+    }
+}

From 7f2e554ad47a6e2ac9f3d691d1d128838a49546f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jul 2020 15:52:25 +0900
Subject: [PATCH 03966/10326] Fix animations not being reset

---
 .../Skinning/LegacyHitExplosion.cs                |  2 ++
 osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs | 15 +++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index c2b39945c2..c4fcffbc22 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -65,6 +65,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         public void Animate()
         {
+            (explosion as IFramedAnimation)?.GotoFrame(0);
+
             explosion?.FadeInFromZero(80)
                      .Then().FadeOut(120);
         }
diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index bac77b134c..3007668117 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Mania.UI
 {
     public class DefaultHitExplosion : CompositeDrawable, IHitExplosion
     {
+        private const float default_large_faint_size = 0.8f;
+
         public override bool RemoveWhenNotAlive => true;
 
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
@@ -54,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.UI
                     RelativeSizeAxes = Axes.Both,
                     Masking = true,
                     // we want our size to be very small so the glow dominates it.
-                    Size = new Vector2(0.8f),
+                    Size = new Vector2(default_large_faint_size),
                     Blending = BlendingParameters.Additive,
                     EdgeEffect = new EdgeEffectParameters
                     {
@@ -140,12 +142,17 @@ namespace osu.Game.Rulesets.Mania.UI
         public void Animate()
         {
             largeFaint
-                .ResizeTo(largeFaint.Size * new Vector2(5, 1), PoolableHitExplosion.DURATION, Easing.OutQuint)
+                .ResizeTo(default_large_faint_size)
+                .Then()
+                .ResizeTo(default_large_faint_size * new Vector2(5, 1), PoolableHitExplosion.DURATION, Easing.OutQuint)
                 .FadeOut(PoolableHitExplosion.DURATION * 2);
 
-            mainGlow1.ScaleTo(1.4f, PoolableHitExplosion.DURATION, Easing.OutQuint);
+            mainGlow1
+                .ScaleTo(1)
+                .Then()
+                .ScaleTo(1.4f, PoolableHitExplosion.DURATION, Easing.OutQuint);
 
-            this.FadeOut(PoolableHitExplosion.DURATION, Easing.Out);
+            this.FadeOutFromOne(PoolableHitExplosion.DURATION, Easing.Out);
         }
     }
 }

From 00821e7b653b58f55de16c9e9cfdb87b2846f85c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jul 2020 16:14:19 +0900
Subject: [PATCH 03967/10326] Re-implement support for small ticks

---
 .../Skinning/LegacyHitExplosion.cs            |  3 +-
 osu.Game.Rulesets.Mania/UI/Column.cs          |  2 +-
 .../UI/DefaultHitExplosion.cs                 | 43 +++++++++++--------
 osu.Game.Rulesets.Mania/UI/IHitExplosion.cs   |  5 ++-
 .../UI/PoolableHitExplosion.cs                | 13 ++++--
 5 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index c4fcffbc22..12747924de 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
@@ -63,7 +64,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 explosion.Anchor = direction.NewValue == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
         }
 
-        public void Animate()
+        public void Animate(JudgementResult result)
         {
             (explosion as IFramedAnimation)?.GotoFrame(0);
 
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 7ddac759db..255ce4c064 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!result.IsHit || !judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            HitObjectArea.Explosions.Add(hitExplosionPool.Get());
+            HitObjectArea.Explosions.Add(hitExplosionPool.Get(e => e.Apply(result)));
         }
 
         public bool OnPressed(ManiaAction action)
diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index 3007668117..225269cf48 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -8,6 +8,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Utils;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
@@ -21,31 +23,30 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public override bool RemoveWhenNotAlive => true;
 
+        [Resolved]
+        private Column column { get; set; }
+
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-        private readonly CircularContainer largeFaint;
-        private readonly CircularContainer mainGlow1;
+        private CircularContainer largeFaint;
+        private CircularContainer mainGlow1;
 
-        public DefaultHitExplosion(Color4 objectColour, bool isSmall = false)
+        public DefaultHitExplosion()
         {
             Origin = Anchor.Centre;
 
             RelativeSizeAxes = Axes.X;
             Height = DefaultNotePiece.NOTE_HEIGHT;
+        }
 
-            // scale roughly in-line with visual appearance of notes
-            Scale = new Vector2(1f, 0.6f);
-
-            if (isSmall)
-                Scale *= 0.5f;
-
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
             const float angle_variangle = 15; // should be less than 45
-
             const float roundness = 80;
-
             const float initial_height = 10;
 
-            var colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1);
+            var colour = Interpolation.ValueAt(0.4f, column.AccentColour, Color4.White, 0, 1);
 
             InternalChildren = new Drawable[]
             {
@@ -61,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.UI
                     EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
-                        Colour = Interpolation.ValueAt(0.1f, objectColour, Color4.White, 0, 1).Opacity(0.3f),
+                        Colour = Interpolation.ValueAt(0.1f, column.AccentColour, Color4.White, 0, 1).Opacity(0.3f),
                         Roundness = 160,
                         Radius = 200,
                     },
@@ -76,7 +77,7 @@ namespace osu.Game.Rulesets.Mania.UI
                     EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
-                        Colour = Interpolation.ValueAt(0.6f, objectColour, Color4.White, 0, 1),
+                        Colour = Interpolation.ValueAt(0.6f, column.AccentColour, Color4.White, 0, 1),
                         Roundness = 20,
                         Radius = 50,
                     },
@@ -116,11 +117,7 @@ namespace osu.Game.Rulesets.Mania.UI
                     },
                 }
             };
-        }
 
-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
-        {
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
         }
@@ -139,8 +136,16 @@ namespace osu.Game.Rulesets.Mania.UI
             }
         }
 
-        public void Animate()
+        public void Animate(JudgementResult result)
         {
+            // scale roughly in-line with visual appearance of notes
+            Vector2 scale = new Vector2(1, 0.6f);
+
+            if (result.Judgement is HoldNoteTickJudgement)
+                scale *= 0.5f;
+
+            this.ScaleTo(scale);
+
             largeFaint
                 .ResizeTo(default_large_faint_size)
                 .Then()
diff --git a/osu.Game.Rulesets.Mania/UI/IHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/IHitExplosion.cs
index da1742e48b..3252dcc276 100644
--- a/osu.Game.Rulesets.Mania/UI/IHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/IHitExplosion.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.Judgements;
+
 namespace osu.Game.Rulesets.Mania.UI
 {
     /// <summary>
@@ -11,6 +13,7 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <summary>
         /// Begins animating this <see cref="IHitExplosion"/>.
         /// </summary>
-        void Animate();
+        /// <param name="result">The type of <see cref="JudgementResult"/> that caused this explosion.</param>
+        void Animate(JudgementResult result);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
index 43808f99a8..64b7d7d550 100644
--- a/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Pooling;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.UI
@@ -12,6 +13,8 @@ namespace osu.Game.Rulesets.Mania.UI
     {
         public const double DURATION = 200;
 
+        public JudgementResult Result { get; private set; }
+
         [Resolved]
         private Column column { get; set; }
 
@@ -25,18 +28,22 @@ namespace osu.Game.Rulesets.Mania.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = skinnableExplosion = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion, column.Index),
-                _ => new DefaultHitExplosion(column.AccentColour, false /*todo */))
+            InternalChild = skinnableExplosion = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion, column.Index), _ => new DefaultHitExplosion())
             {
                 RelativeSizeAxes = Axes.Both
             };
         }
 
+        public void Apply(JudgementResult result)
+        {
+            Result = result;
+        }
+
         protected override void PrepareForUse()
         {
             base.PrepareForUse();
 
-            (skinnableExplosion?.Drawable as IHitExplosion)?.Animate();
+            (skinnableExplosion?.Drawable as IHitExplosion)?.Animate(Result);
 
             this.Delay(DURATION).Then().Expire();
         }

From d01d1ce3f1f6bd1b239eab98cf0ffb1a6abdb9bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jul 2020 16:25:10 +0900
Subject: [PATCH 03968/10326] Add initial support for spinner disc skinning

---
 .../old-skin/spinner-approachcircle.png       | Bin 0 -> 26350 bytes
 .../Resources/old-skin/spinner-background.png | Bin 0 -> 46103 bytes
 .../Resources/old-skin/spinner-circle.png     | Bin 0 -> 166439 bytes
 .../Resources/old-skin/spinner-clear.png      | Bin 0 -> 39074 bytes
 .../Resources/old-skin/spinner-metre.png      | Bin 0 -> 14518 bytes
 .../Resources/old-skin/spinner-osu.png        | Bin 0 -> 18585 bytes
 .../Resources/old-skin/spinner-spin.png       | Bin 0 -> 21353 bytes
 .../Resources/old-skin/spinnerbonus.wav       | Bin 0 -> 309536 bytes
 .../Resources/old-skin/spinnerspin.wav        | Bin 0 -> 36868 bytes
 .../Objects/Drawables/DrawableSpinner.cs      |   2 +-
 .../Objects/Drawables/Pieces/SpinnerDisc.cs   |  30 ++++++++++++------
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs    |   1 +
 .../Skinning/OsuLegacySkinTransformer.cs      |   9 ++++++
 13 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-approachcircle.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-background.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-circle.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-clear.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-metre.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-osu.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-spin.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinnerbonus.wav
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinnerspin.wav

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-approachcircle.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-approachcircle.png
new file mode 100644
index 0000000000000000000000000000000000000000..3811e5050f4cc0404a5713b1b875ab33ac32243a
GIT binary patch
literal 26350
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
S&tJL__^tB%W98pWj^KYrw90@0

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-background.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-background.png
new file mode 100644
index 0000000000000000000000000000000000000000..d84eab2f15eb844ef0c37f3a0fbda07f7f4b4d16
GIT binary patch
literal 46103
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-circle.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dd4a6d31923f69de6482c8882e04ecb4366ddb2
GIT binary patch
literal 166439
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%0Adh;ycK}XpES)0?nv?hw6qc!^
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
LNVHN!-~ayrzhB6!

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-clear.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-clear.png
new file mode 100644
index 0000000000000000000000000000000000000000..c66f1c9309cce5f54b6345d84a5bb4efbec30a82
GIT binary patch
literal 39074
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%0Dwjh0N}037W8g|D4}N
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-metre.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-metre.png
new file mode 100644
index 0000000000000000000000000000000000000000..33902186d9c76f1496de1ea6c67a672059e3d20c
GIT binary patch
literal 14518
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-osu.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-osu.png
new file mode 100644
index 0000000000000000000000000000000000000000..6882a232e0e42754aa3b5cc4cdc5599cfa80b894
GIT binary patch
literal 18585
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-spin.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-spin.png
new file mode 100644
index 0000000000000000000000000000000000000000..98a9991c2f103308706ea3c52baf0b3e90ef5a11
GIT binary patch
literal 21353
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinnerbonus.wav b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinnerbonus.wav
new file mode 100644
index 0000000000000000000000000000000000000000..5e583e77aa7441b968e4ebc8de47da1033206c29
GIT binary patch
literal 309536
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinnerspin.wav b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinnerspin.wav
new file mode 100644
index 0000000000000000000000000000000000000000..bba19381f1e02239684b517fd0e5d15ec1fd33ac
GIT binary patch
literal 36868
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
b#sgml9R42vE>NJY_ZRvH(Ep;1=nM3JEC{<x

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index ecf78efdd9..ac0df0aef6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -175,8 +175,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Background.AccentColour = normalColour;
             Ticks.AccentColour = normalColour;
-
             Disc.AccentColour = fillColour;
+
             circle.Colour = colours.BlueDark;
             glow.Colour = colours.BlueDark;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 35819cd05e..86588a8a9f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -9,6 +9,7 @@ using osu.Game.Graphics;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
@@ -16,13 +17,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
     {
         private readonly Spinner spinner;
 
+        private Color4 accentColour;
+
         public Color4 AccentColour
         {
-            get => background.AccentColour;
-            set => background.AccentColour = value;
+            get => accentColour;
+            set
+            {
+                accentColour = value;
+                if (background.Drawable is IHasAccentColour accent)
+                    accent.AccentColour = value;
+            }
         }
 
-        private readonly SpinnerBackground background;
+        private readonly SkinnableDrawable background;
 
         private const float idle_alpha = 0.2f;
         private const float tracking_alpha = 0.4f;
@@ -37,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             Children = new Drawable[]
             {
-                background = new SpinnerBackground { Alpha = idle_alpha },
+                background = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerDisc), _ => new SpinnerBackground { Alpha = idle_alpha }),
             };
         }
 
@@ -54,7 +62,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
                 tracking = value;
 
-                background.FadeTo(tracking ? tracking_alpha : idle_alpha, 100);
+                // todo: new default only
+                background.Drawable.FadeTo(tracking ? tracking_alpha : idle_alpha, 100);
             }
         }
 
@@ -121,11 +130,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             if (Complete && updateCompleteTick())
             {
-                background.FinishTransforms(false, nameof(Alpha));
-                background
-                    .FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
-                    .Then()
-                    .FadeTo(tracking_alpha, 250, Easing.OutQuint);
+                // todo: new default only
+                background.Drawable.FinishTransforms(false, nameof(Alpha));
+                background.Drawable
+                          .FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
+                          .Then()
+                          .FadeTo(tracking_alpha, 250, Easing.OutQuint);
             }
 
             Rotation = (float)Interpolation.Lerp(Rotation, currentRotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index b2cdc8ccbf..e25b4a5efc 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -17,5 +17,6 @@ namespace osu.Game.Rulesets.Osu
         SliderFollowCircle,
         SliderBall,
         SliderBody,
+        SpinnerDisc
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 95ef2d58b1..c5b5598be7 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -102,6 +103,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
                             Scale = new Vector2(0.8f),
                             Spacing = new Vector2(-overlap, 0)
                         };
+
+                case OsuSkinComponents.SpinnerDisc:
+                    if (Source.GetTexture("spinner-background") != null)
+                        return new Sprite { Texture = Source.GetTexture("spinner-circle") };
+                    else if (Source.GetTexture("spinner-top") != null)
+                        return new Sprite { Texture = Source.GetTexture("spinner-top") };
+
+                    return null;
             }
 
             return null;

From e5ebd211569f8f0fe050142272c6e52ca64fb4b1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jul 2020 16:25:17 +0900
Subject: [PATCH 03969/10326] Fix test scene and add pooling support

---
 .../Skinning/TestSceneHitExplosion.cs         | 50 ++++++++++++-------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
index a692c0b697..0c56f7bcf4 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
@@ -1,23 +1,27 @@
 // Copyright (c) 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.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Skinning;
+using osu.Game.Rulesets.Objects;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
     [TestFixture]
     public class TestSceneHitExplosion : ManiaSkinnableTestScene
     {
+        private readonly List<DrawablePool<PoolableHitExplosion>> hitExplosionPools = new List<DrawablePool<PoolableHitExplosion>>();
+
         public TestSceneHitExplosion()
         {
             int runcount = 0;
@@ -29,28 +33,40 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                 if (runcount % 15 > 12)
                     return;
 
-                CreatedDrawables.OfType<Container>().ForEach(c =>
+                int poolIndex = 0;
+
+                foreach (var c in CreatedDrawables.OfType<Container>())
                 {
-                    c.Add(new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion, 0),
-                        _ => new DefaultHitExplosion((runcount / 15) % 2 == 0 ? new Color4(94, 0, 57, 255) : new Color4(6, 84, 0, 255), runcount % 6 != 0)
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        }));
-                });
+                    c.Add(hitExplosionPools[poolIndex].Get(e =>
+                    {
+                        e.Apply(new JudgementResult(new HitObject(), runcount % 6 == 0 ? new HoldNoteTickJudgement() : new ManiaJudgement()));
+
+                        e.Anchor = Anchor.Centre;
+                        e.Origin = Anchor.Centre;
+                    }));
+
+                    poolIndex++;
+                }
             }, 100);
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new ColumnTestContainer(0, ManiaAction.Key1)
+            SetContents(() =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativePositionAxes = Axes.Y,
-                Y = -0.25f,
-                Size = new Vector2(Column.COLUMN_WIDTH, DefaultNotePiece.NOTE_HEIGHT),
+                var pool = new DrawablePool<PoolableHitExplosion>(5);
+                hitExplosionPools.Add(pool);
+
+                return new ColumnTestContainer(0, ManiaAction.Key1)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativePositionAxes = Axes.Y,
+                    Y = -0.25f,
+                    Size = new Vector2(Column.COLUMN_WIDTH, DefaultNotePiece.NOTE_HEIGHT),
+                    Child = pool
+                };
             });
         }
     }

From 5439099b7cb23253179c270b9f4ddc2002163ded Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 29 Jul 2020 10:34:09 +0300
Subject: [PATCH 03970/10326] Merge GlobalSkinConfiguration settings into the
 LegacySetting enum

---
 .../Gameplay/TestSceneHitObjectSamples.cs          |  8 ++++----
 .../Objects/Legacy/ConvertHitObjectParser.cs       |  2 +-
 osu.Game/Skinning/GlobalSkinConfiguration.cs       | 11 -----------
 osu.Game/Skinning/LegacySkin.cs                    | 14 ++++----------
 osu.Game/Skinning/LegacySkinConfiguration.cs       |  2 ++
 osu.Game/Skinning/LegacySkinExtensions.cs          |  3 ++-
 osu.Game/Skinning/LegacySkinTransformer.cs         |  3 ++-
 7 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 osu.Game/Skinning/GlobalSkinConfiguration.cs

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index 737946e1e0..583400f579 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -6,9 +6,9 @@ using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Tests.Gameplay
 {
@@ -190,7 +190,7 @@ namespace osu.Game.Tests.Gameplay
         }
 
         /// <summary>
-        /// Tests that when a custom sample bank is used, but <see cref="GlobalSkinConfiguration.LayeredHitSounds"/> is disabled,
+        /// Tests that when a custom sample bank is used, but <see cref="LegacySetting.LayeredHitSounds"/> is disabled,
         /// only the additional sound will be looked up.
         /// </summary>
         [Test]
@@ -209,7 +209,7 @@ namespace osu.Game.Tests.Gameplay
         }
 
         /// <summary>
-        /// Tests that when a normal sample bank is used and <see cref="GlobalSkinConfiguration.LayeredHitSounds"/> is disabled,
+        /// Tests that when a normal sample bank is used and <see cref="LegacySetting.LayeredHitSounds"/> is disabled,
         /// the normal sound will be looked up anyway.
         /// </summary>
         [Test]
@@ -226,6 +226,6 @@ namespace osu.Game.Tests.Gameplay
         }
 
         private void disableLayeredHitSounds()
-            => AddStep("set LayeredHitSounds to false", () => Skin.Configuration.ConfigDictionary[GlobalSkinConfiguration.LayeredHitSounds.ToString()] = "0");
+            => AddStep("set LayeredHitSounds to false", () => Skin.Configuration.ConfigDictionary[LegacySetting.LayeredHitSounds.ToString()] = "0");
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 77075b2abe..9afc0ecaf4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -434,7 +434,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             /// </summary>
             /// <remarks>
             /// Layered hit samples are automatically added in all modes (except osu!mania), but can be disabled
-            /// using the <see cref="GlobalSkinConfiguration.LayeredHitSounds"/> skin config option.
+            /// using the <see cref="LegacySkinConfiguration.LegacySetting.LayeredHitSounds"/> skin config option.
             /// </remarks>
             public bool IsLayered { get; set; }
         }
diff --git a/osu.Game/Skinning/GlobalSkinConfiguration.cs b/osu.Game/Skinning/GlobalSkinConfiguration.cs
deleted file mode 100644
index d405702ea5..0000000000
--- a/osu.Game/Skinning/GlobalSkinConfiguration.cs
+++ /dev/null
@@ -1,11 +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.Skinning
-{
-    public enum GlobalSkinConfiguration
-    {
-        AnimationFramerate,
-        LayeredHitSounds,
-    }
-}
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 3bbeff9918..5843cde94d 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -120,15 +120,6 @@ namespace osu.Game.Skinning
 
                     break;
 
-                case LegacySkinConfiguration.LegacySetting legacy:
-                    switch (legacy)
-                    {
-                        case LegacySkinConfiguration.LegacySetting.Version:
-                            return SkinUtils.As<TValue>(new Bindable<decimal>(Configuration.LegacyVersion ?? LegacySkinConfiguration.LATEST_VERSION));
-                    }
-
-                    break;
-
                 case SkinCustomColourLookup customColour:
                     return SkinUtils.As<TValue>(getCustomColour(Configuration, customColour.Lookup.ToString()));
 
@@ -142,8 +133,11 @@ namespace osu.Game.Skinning
 
                     break;
 
+                case LegacySkinConfiguration.LegacySetting s when s == LegacySkinConfiguration.LegacySetting.Version:
+                    return SkinUtils.As<TValue>(new Bindable<decimal>(Configuration.LegacyVersion ?? LegacySkinConfiguration.LATEST_VERSION));
+
                 default:
-                    // handles lookups like GlobalSkinConfiguration
+                    // handles lookups like some in LegacySkinConfiguration.LegacySetting
 
                     try
                     {
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
index 027f5b8883..41b7aea34b 100644
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacySkinConfiguration.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Skinning
         public enum LegacySetting
         {
             Version,
+            AnimationFramerate,
+            LayeredHitSounds,
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 7cf41ef3c1..bb46dc8b9f 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Skinning
 {
@@ -89,7 +90,7 @@ namespace osu.Game.Skinning
         {
             if (applyConfigFrameRate)
             {
-                var iniRate = source.GetConfig<GlobalSkinConfiguration, int>(GlobalSkinConfiguration.AnimationFramerate);
+                var iniRate = source.GetConfig<LegacySetting, int>(LegacySetting.AnimationFramerate);
 
                 if (iniRate?.Value > 0)
                     return 1000f / iniRate.Value;
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index 786056b932..ebc4757e75 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Legacy;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Skinning
 {
@@ -38,7 +39,7 @@ namespace osu.Game.Skinning
             if (!(sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample))
                 return Source.GetSample(sampleInfo);
 
-            var playLayeredHitSounds = GetConfig<GlobalSkinConfiguration, bool>(GlobalSkinConfiguration.LayeredHitSounds);
+            var playLayeredHitSounds = GetConfig<LegacySetting, bool>(LegacySetting.LayeredHitSounds);
             if (legacySample.IsLayered && playLayeredHitSounds?.Value == false)
                 return new SampleChannelVirtual();
 

From e98154b43277b726e286216b139ab9923e7806da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jul 2020 16:37:23 +0900
Subject: [PATCH 03971/10326] Add initial support for spinner background layer

---
 .../Objects/Drawables/DrawableSpinner.cs              | 11 ++++++-----
 .../Objects/Drawables/Pieces/SpinnerDisc.cs           |  2 +-
 .../Pieces/{SpinnerBackground.cs => SpinnerFill.cs}   |  4 ++--
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs            |  3 ++-
 .../Skinning/OsuLegacySkinTransformer.cs              |  6 ++++++
 5 files changed, 17 insertions(+), 9 deletions(-)
 rename osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/{SpinnerBackground.cs => SpinnerFill.cs} (92%)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index ac0df0aef6..37601d9680 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -18,6 +18,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -34,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private readonly Container mainContainer;
 
-        public readonly SpinnerBackground Background;
+        public readonly SkinnableDrawable Background;
         private readonly Container circleContainer;
         private readonly CirclePiece circle;
         private readonly GlowPiece glow;
@@ -96,7 +97,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     RelativeSizeAxes = Axes.Y,
                     Children = new[]
                     {
-                        Background = new SpinnerBackground
+                        Background = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBackground), _ => new SpinnerFill
                         {
                             Disc =
                             {
@@ -104,7 +105,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                             },
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                        },
+                        }),
                         Disc = new SpinnerDisc(Spinner)
                         {
                             Scale = Vector2.Zero,
@@ -173,7 +174,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             normalColour = baseColour;
             completeColour = colours.YellowLight;
 
-            Background.AccentColour = normalColour;
+            if (Background.Drawable is IHasAccentColour accent) accent.AccentColour = normalColour;
             Ticks.AccentColour = normalColour;
             Disc.AccentColour = fillColour;
 
@@ -328,7 +329,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             Disc.FadeAccent(colour, duration);
 
-            Background.FadeAccent(colour.Darken(1), duration);
+            (Background.Drawable as IHasAccentColour)?.FadeAccent(colour.Darken(1), duration);
             Ticks.FadeAccent(colour, duration);
 
             circle.FadeColour(colour, duration);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 86588a8a9f..22a6fc391a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             Children = new Drawable[]
             {
-                background = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerDisc), _ => new SpinnerBackground { Alpha = idle_alpha }),
+                background = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerDisc), _ => new SpinnerFill { Alpha = idle_alpha }),
             };
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerFill.cs
similarity index 92%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs
rename to osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerFill.cs
index 944354abca..dbba1044ca 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerFill.cs
@@ -10,7 +10,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
-    public class SpinnerBackground : CircularContainer, IHasAccentColour
+    public class SpinnerFill : CircularContainer, IHasAccentColour
     {
         public readonly Box Disc;
 
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
         }
 
-        public SpinnerBackground()
+        public SpinnerFill()
         {
             RelativeSizeAxes = Axes.Both;
             Masking = true;
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index e25b4a5efc..d72673f9ee 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Osu
         SliderFollowCircle,
         SliderBall,
         SliderBody,
-        SpinnerDisc
+        SpinnerDisc,
+        SpinnerBackground
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index c5b5598be7..28eef603f4 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -111,6 +111,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         return new Sprite { Texture = Source.GetTexture("spinner-top") };
 
                     return null;
+
+                case OsuSkinComponents.SpinnerBackground:
+                    if (Source.GetTexture("spinner-background") != null)
+                        return new Sprite { Texture = Source.GetTexture("spinner-background") };
+
+                    return null;
             }
 
             return null;

From 5df406a0352285c871ed8606e54fae1c03e07a11 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jul 2020 16:41:10 +0900
Subject: [PATCH 03972/10326] Add pooling for mania judgements

---
 .../UI/DrawableManiaJudgement.cs                 |  4 ++++
 osu.Game.Rulesets.Mania/UI/Stage.cs              | 16 ++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
index 8797f014df..d99f6cb8d3 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
@@ -15,6 +15,10 @@ namespace osu.Game.Rulesets.Mania.UI
         {
         }
 
+        public DrawableManiaJudgement()
+        {
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index faa04dea97..36780b0f80 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
@@ -33,8 +34,8 @@ namespace osu.Game.Rulesets.Mania.UI
         public IReadOnlyList<Column> Columns => columnFlow.Children;
         private readonly FillFlowContainer<Column> columnFlow;
 
-        public Container<DrawableManiaJudgement> Judgements => judgements;
         private readonly JudgementContainer<DrawableManiaJudgement> judgements;
+        private readonly DrawablePool<DrawableManiaJudgement> judgementPool;
 
         private readonly Drawable barLineContainer;
         private readonly Container topLevelContainer;
@@ -63,6 +64,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             InternalChildren = new Drawable[]
             {
+                judgementPool = new DrawablePool<DrawableManiaJudgement>(2),
                 new Container
                 {
                     Anchor = Anchor.TopCentre,
@@ -208,12 +210,14 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            judgements.Clear();
-            judgements.Add(new DrawableManiaJudgement(result, judgedObject)
+            judgements.Clear(false);
+            judgements.Add(judgementPool.Get(j =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            });
+                j.Apply(result, judgedObject);
+
+                j.Anchor = Anchor.Centre;
+                j.Origin = Anchor.Centre;
+            }));
         }
 
         protected override void Update()

From 1c00cf95d5f7cb838bd72f2dbf09fd4a845c1422 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jul 2020 16:55:42 +0900
Subject: [PATCH 03973/10326] Add initial support for spinner middle skinning

---
 .../Objects/Drawables/DrawableSpinner.cs      | 35 ++++++++++++-------
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs    |  3 +-
 .../Skinning/OsuLegacySkinTransformer.cs      |  8 +++++
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 37601d9680..d6914c7a69 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects;
 using osu.Framework.Utils;
@@ -36,11 +37,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private readonly Container mainContainer;
 
         public readonly SkinnableDrawable Background;
-        private readonly Container circleContainer;
-        private readonly CirclePiece circle;
-        private readonly GlowPiece glow;
+        private readonly SkinnableDrawable circleContainer;
+        private CirclePiece circle;
+        private GlowPiece glow;
 
-        private readonly SpriteIcon symbol;
+        private SpriteIcon symbol;
 
         private readonly Color4 baseColour = Color4Extensions.FromHex(@"002c3c");
         private readonly Color4 fillColour = Color4Extensions.FromHex(@"005b7c");
@@ -66,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             InternalChildren = new Drawable[]
             {
                 ticks = new Container<DrawableSpinnerTick>(),
-                circleContainer = new Container
+                circleContainer = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerCentre), _ => new Container
                 {
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
@@ -89,6 +90,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                             Shadow = false,
                         },
                     }
+                })
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                 },
                 mainContainer = new AspectContainer
                 {
@@ -175,11 +180,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             completeColour = colours.YellowLight;
 
             if (Background.Drawable is IHasAccentColour accent) accent.AccentColour = normalColour;
+
             Ticks.AccentColour = normalColour;
             Disc.AccentColour = fillColour;
 
-            circle.Colour = colours.BlueDark;
-            glow.Colour = colours.BlueDark;
+            if (circle != null) circle.Colour = colours.BlueDark;
+            if (glow != null) glow.Colour = colours.BlueDark;
 
             positionBindable.BindValueChanged(pos => Position = pos.NewValue);
             positionBindable.BindTo(HitObject.PositionBindable);
@@ -224,6 +230,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 Disc.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
         }
 
+        private float relativeHeight => ToScreenSpace(new RectangleF(0, 0, OsuHitObject.OBJECT_RADIUS, OsuHitObject.OBJECT_RADIUS)).Height / mainContainer.DrawHeight;
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
@@ -231,18 +239,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (!SpmCounter.IsPresent && Disc.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
-            circle.Rotation = Disc.Rotation;
+            if (circle != null) circle.Rotation = Disc.Rotation;
             Ticks.Rotation = Disc.Rotation;
 
             SpmCounter.SetRotation(Disc.CumulativeRotation);
 
             updateBonusScore();
 
-            float relativeCircleScale = Spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight;
+            float relativeCircleScale = Spinner.Scale * relativeHeight;
             float targetScale = relativeCircleScale + (1 - relativeCircleScale) * Progress;
             Disc.Scale = new Vector2((float)Interpolation.Lerp(Disc.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
 
-            symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, Disc.Rotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
+            if (symbol != null)
+                symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, Disc.Rotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
         }
 
         private int wholeSpins;
@@ -291,7 +300,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 circleContainer.ScaleTo(phaseOneScale, HitObject.TimePreempt / 4, Easing.OutQuint);
 
                 mainContainer
-                    .ScaleTo(phaseOneScale * circle.DrawHeight / DrawHeight * 1.6f, HitObject.TimePreempt / 4, Easing.OutQuint)
+                    .ScaleTo(phaseOneScale * relativeHeight * 1.6f, HitObject.TimePreempt / 4, Easing.OutQuint)
                     .RotateTo((float)(25 * Spinner.Duration / 2000), HitObject.TimePreempt + Spinner.Duration);
 
                 using (BeginDelayedSequence(HitObject.TimePreempt / 2, true))
@@ -332,8 +341,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             (Background.Drawable as IHasAccentColour)?.FadeAccent(colour.Darken(1), duration);
             Ticks.FadeAccent(colour, duration);
 
-            circle.FadeColour(colour, duration);
-            glow.FadeColour(colour, duration);
+            circle?.FadeColour(colour, duration);
+            glow?.FadeColour(colour, duration);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index d72673f9ee..c05dbf6b16 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Rulesets.Osu
         SliderBall,
         SliderBody,
         SpinnerDisc,
-        SpinnerBackground
+        SpinnerBackground,
+        SpinnerCentre
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 28eef603f4..a5198d3448 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -117,6 +117,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         return new Sprite { Texture = Source.GetTexture("spinner-background") };
 
                     return null;
+
+                case OsuSkinComponents.SpinnerCentre:
+                    if (Source.GetTexture("spinner-background") != null)
+                        return Drawable.Empty();
+                    else if (Source.GetTexture("spinner-top") != null)
+                        return new Sprite { Texture = Source.GetTexture("spinner-middle2") };
+
+                    return null;
             }
 
             return null;

From 2cd6e89cb05ba3cea8854dad77c614c4fd95cb63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jul 2020 18:02:12 +0900
Subject: [PATCH 03974/10326] Move default centre implementation out of
 DrawableSpinner

---
 .../Objects/Drawables/DefaultSpinnerCentre.cs | 83 +++++++++++++++++++
 .../Objects/Drawables/DrawableSpinner.cs      | 40 +--------
 2 files changed, 84 insertions(+), 39 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerCentre.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerCentre.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerCentre.cs
new file mode 100644
index 0000000000..d07829fbac
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerCentre.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 System;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Utils;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
+{
+    public class DefaultSpinnerCentre : CompositeDrawable
+    {
+        private DrawableSpinner spinner;
+
+        private CirclePiece circle;
+        private GlowPiece glow;
+        private SpriteIcon symbol;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, DrawableHitObject drawableHitObject)
+        {
+            spinner = (DrawableSpinner)drawableHitObject;
+
+            AutoSizeAxes = Axes.Both;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+            InternalChildren = new Drawable[]
+            {
+                glow = new GlowPiece(),
+                circle = new CirclePiece
+                {
+                    Position = Vector2.Zero,
+                    Anchor = Anchor.Centre,
+                },
+                new RingPiece(),
+                symbol = new SpriteIcon
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(48),
+                    Icon = FontAwesome.Solid.Asterisk,
+                    Shadow = false,
+                },
+            };
+
+            drawableHitObject.State.BindValueChanged(val =>
+            {
+                Color4 colour;
+
+                switch (val.NewValue)
+                {
+                    default:
+                        colour = colours.BlueDark;
+                        break;
+
+                    case ArmedState.Hit:
+                        colour = colours.YellowLight;
+                        break;
+                }
+
+                circle.FadeColour(colour, 200);
+                glow.FadeColour(colour, 200);
+            }, true);
+
+            FinishTransforms(true);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            circle.Rotation = spinner.Disc.Rotation;
+            symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, spinner.Disc.Rotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index d6914c7a69..b2844c79a2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -14,7 +14,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Scoring;
@@ -38,10 +37,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public readonly SkinnableDrawable Background;
         private readonly SkinnableDrawable circleContainer;
-        private CirclePiece circle;
-        private GlowPiece glow;
-
-        private SpriteIcon symbol;
 
         private readonly Color4 baseColour = Color4Extensions.FromHex(@"002c3c");
         private readonly Color4 fillColour = Color4Extensions.FromHex(@"005b7c");
@@ -67,30 +62,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             InternalChildren = new Drawable[]
             {
                 ticks = new Container<DrawableSpinnerTick>(),
-                circleContainer = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerCentre), _ => new Container
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Children = new Drawable[]
-                    {
-                        glow = new GlowPiece(),
-                        circle = new CirclePiece
-                        {
-                            Position = Vector2.Zero,
-                            Anchor = Anchor.Centre,
-                        },
-                        new RingPiece(),
-                        symbol = new SpriteIcon
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(48),
-                            Icon = FontAwesome.Solid.Asterisk,
-                            Shadow = false,
-                        },
-                    }
-                })
+                circleContainer = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerCentre), _ => new DefaultSpinnerCentre())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -184,9 +156,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Ticks.AccentColour = normalColour;
             Disc.AccentColour = fillColour;
 
-            if (circle != null) circle.Colour = colours.BlueDark;
-            if (glow != null) glow.Colour = colours.BlueDark;
-
             positionBindable.BindValueChanged(pos => Position = pos.NewValue);
             positionBindable.BindTo(HitObject.PositionBindable);
         }
@@ -239,7 +208,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (!SpmCounter.IsPresent && Disc.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
-            if (circle != null) circle.Rotation = Disc.Rotation;
             Ticks.Rotation = Disc.Rotation;
 
             SpmCounter.SetRotation(Disc.CumulativeRotation);
@@ -249,9 +217,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             float relativeCircleScale = Spinner.Scale * relativeHeight;
             float targetScale = relativeCircleScale + (1 - relativeCircleScale) * Progress;
             Disc.Scale = new Vector2((float)Interpolation.Lerp(Disc.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
-
-            if (symbol != null)
-                symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, Disc.Rotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
         }
 
         private int wholeSpins;
@@ -340,9 +305,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             (Background.Drawable as IHasAccentColour)?.FadeAccent(colour.Darken(1), duration);
             Ticks.FadeAccent(colour, duration);
-
-            circle?.FadeColour(colour, duration);
-            glow?.FadeColour(colour, duration);
         }
     }
 }

From 2a5e9fed4d3f8d3a1cb3ea44f34e30a739459df2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jul 2020 18:15:19 +0900
Subject: [PATCH 03975/10326] Move default background implementation out of
 DrawableSpinner

---
 .../Drawables/DefaultSpinnerBackground.cs     | 44 +++++++++++++++++++
 .../Objects/Drawables/DrawableSpinner.cs      | 14 +-----
 2 files changed, 45 insertions(+), 13 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerBackground.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerBackground.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerBackground.cs
new file mode 100644
index 0000000000..be864b8c16
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerBackground.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.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
+{
+    public class DefaultSpinnerBackground : SpinnerFill
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, DrawableHitObject drawableHitObject)
+        {
+            Disc.Alpha = 0;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            drawableHitObject.State.BindValueChanged(val =>
+            {
+                Color4 colour;
+
+                switch (val.NewValue)
+                {
+                    default:
+                        colour = colours.BlueDark;
+                        break;
+
+                    case ArmedState.Hit:
+                        colour = colours.YellowLight;
+                        break;
+                }
+
+                this.FadeAccent(colour.Darken(1), 200);
+            }, true);
+
+            FinishTransforms(true);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index b2844c79a2..a0c2a06ff8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -74,15 +74,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     RelativeSizeAxes = Axes.Y,
                     Children = new[]
                     {
-                        Background = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBackground), _ => new SpinnerFill
-                        {
-                            Disc =
-                            {
-                                Alpha = 0f,
-                            },
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        }),
+                        Background = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBackground), _ => new DefaultSpinnerBackground()),
                         Disc = new SpinnerDisc(Spinner)
                         {
                             Scale = Vector2.Zero,
@@ -151,8 +143,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             normalColour = baseColour;
             completeColour = colours.YellowLight;
 
-            if (Background.Drawable is IHasAccentColour accent) accent.AccentColour = normalColour;
-
             Ticks.AccentColour = normalColour;
             Disc.AccentColour = fillColour;
 
@@ -302,8 +292,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private void transformFillColour(Colour4 colour, double duration)
         {
             Disc.FadeAccent(colour, duration);
-
-            (Background.Drawable as IHasAccentColour)?.FadeAccent(colour.Darken(1), duration);
             Ticks.FadeAccent(colour, duration);
         }
     }

From 4c00c11541c18a07d32e2332bfce515bce4d5c8c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jul 2020 20:53:14 +0900
Subject: [PATCH 03976/10326] Remove unnecessary change

---
 .../Difficulty/TaikoPerformanceCalculator.cs                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
index e6dd9f5084..b9d95a6ba6 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             double strainValue = Math.Pow(5.0 * Math.Max(1.0, Attributes.StarRating / 0.0075) - 4.0, 2.0) / 100000.0;
 
             // Longer maps are worth more
-            double lengthBonus = 1 + 0.1f * Math.Min(1.0, totalHits / 1500.0);
+            double lengthBonus = 1 + 0.1 * Math.Min(1.0, totalHits / 1500.0);
             strainValue *= lengthBonus;
 
             // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available

From c1a4f2e6afd823b9e36c73f76f16ea4445da0a88 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jul 2020 20:53:50 +0900
Subject: [PATCH 03977/10326] Update expected SR in test

---
 .../TaikoDifficultyCalculatorTest.cs                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
index e7b6d8615b..2d51e82bc4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
@@ -13,8 +13,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Taiko";
 
-        [TestCase(2.9811338051242915d, "diffcalc-test")]
-        [TestCase(2.9811338051242915d, "diffcalc-test-strong")]
+        [TestCase(2.2905937546434592d, "diffcalc-test")]
+        [TestCase(2.2905937546434592d, "diffcalc-test-strong")]
         public void Test(double expected, string name)
             => base.Test(expected, name);
 

From 023feaf438ca028ca0ee44d27d38d86408ed4c29 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jul 2020 20:01:01 +0900
Subject: [PATCH 03978/10326] Refactor to centralise implementation into a
 single component

Turns out this is a better way forward.
---
 .../TestSceneSpinner.cs                       |   2 +-
 .../TestSceneSpinnerRotation.cs               |  22 +--
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs    |   4 +-
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs   |   4 +-
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs |   3 +-
 .../Drawables/DefaultSpinnerBackground.cs     |  44 -----
 .../Objects/Drawables/DrawableSpinner.cs      | 144 +++------------
 .../Drawables/Pieces/DefaultSpinnerDisc.cs    | 170 ++++++++++++++++++
 .../Objects/Drawables/Pieces/SpinnerFill.cs   |   3 +
 ...innerDisc.cs => SpinnerRotationTracker.cs} |  85 ++-------
 .../Drawables/SpinnerBackgroundLayer.cs       |  22 +++
 ...SpinnerCentre.cs => SpinnerCentreLayer.cs} |  41 ++---
 12 files changed, 265 insertions(+), 279 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerBackground.cs
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
 rename osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/{SpinnerDisc.cs => SpinnerRotationTracker.cs} (59%)
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerBackgroundLayer.cs
 rename osu.Game.Rulesets.Osu/Objects/Drawables/{DefaultSpinnerCentre.cs => SpinnerCentreLayer.cs} (67%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 8e3a22bfdc..65b338882e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 base.Update();
                 if (auto)
-                    Disc.Rotate((float)(Clock.ElapsedFrameTime * 3));
+                    RotationTracker.AddRotation((float)(Clock.ElapsedFrameTime * 3));
             }
         }
     }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index c36bec391f..319d326a01 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -61,12 +61,12 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestSpinnerRewindingRotation()
         {
             addSeekStep(5000);
-            AddAssert("is disc rotation not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Disc.Rotation, 0, 100));
-            AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Disc.CumulativeRotation, 0, 100));
+            AddAssert("is disc rotation not almost 0", () => !Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, 0, 100));
+            AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, 0, 100));
 
             addSeekStep(0);
-            AddAssert("is disc rotation almost 0", () => Precision.AlmostEquals(drawableSpinner.Disc.Rotation, 0, 100));
-            AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.Disc.CumulativeRotation, 0, 100));
+            AddAssert("is disc rotation almost 0", () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, 0, 100));
+            AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, 0, 100));
         }
 
         [Test]
@@ -75,24 +75,24 @@ namespace osu.Game.Rulesets.Osu.Tests
             double finalAbsoluteDiscRotation = 0, finalRelativeDiscRotation = 0, finalSpinnerSymbolRotation = 0;
 
             addSeekStep(5000);
-            AddStep("retrieve disc relative rotation", () => finalRelativeDiscRotation = drawableSpinner.Disc.Rotation);
-            AddStep("retrieve disc absolute rotation", () => finalAbsoluteDiscRotation = drawableSpinner.Disc.CumulativeRotation);
+            AddStep("retrieve disc relative rotation", () => finalRelativeDiscRotation = drawableSpinner.RotationTracker.Rotation);
+            AddStep("retrieve disc absolute rotation", () => finalAbsoluteDiscRotation = drawableSpinner.RotationTracker.CumulativeRotation);
             AddStep("retrieve spinner symbol rotation", () => finalSpinnerSymbolRotation = spinnerSymbol.Rotation);
 
             addSeekStep(2500);
             AddUntilStep("disc rotation rewound",
                 // we want to make sure that the rotation at time 2500 is in the same direction as at time 5000, but about half-way in.
-                () => Precision.AlmostEquals(drawableSpinner.Disc.Rotation, finalRelativeDiscRotation / 2, 100));
+                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, finalRelativeDiscRotation / 2, 100));
             AddUntilStep("symbol rotation rewound",
                 () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation / 2, 100));
 
             addSeekStep(5000);
             AddAssert("is disc rotation almost same",
-                () => Precision.AlmostEquals(drawableSpinner.Disc.Rotation, finalRelativeDiscRotation, 100));
+                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, finalRelativeDiscRotation, 100));
             AddAssert("is symbol rotation almost same",
                 () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation, 100));
             AddAssert("is disc rotation absolute almost same",
-                () => Precision.AlmostEquals(drawableSpinner.Disc.CumulativeRotation, finalAbsoluteDiscRotation, 100));
+                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, finalAbsoluteDiscRotation, 100));
         }
 
         [Test]
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addSeekStep(5000);
 
-            AddAssert("disc spin direction correct", () => clockwise ? drawableSpinner.Disc.Rotation > 0 : drawableSpinner.Disc.Rotation < 0);
+            AddAssert("disc spin direction correct", () => clockwise ? drawableSpinner.RotationTracker.Rotation > 0 : drawableSpinner.RotationTracker.Rotation < 0);
             AddAssert("spinner symbol direction correct", () => clockwise ? spinnerSymbol.Rotation > 0 : spinnerSymbol.Rotation < 0);
         }
 
@@ -142,7 +142,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
                 var totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value * 2;
-                return totalScore == (int)(drawableSpinner.Disc.CumulativeRotation / 360) * SpinnerTick.SCORE_PER_TICK;
+                return totalScore == (int)(drawableSpinner.RotationTracker.CumulativeRotation / 360) * SpinnerTick.SCORE_PER_TICK;
             });
 
             addSeekStep(0);
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index fdba03f260..08fd13915d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -82,9 +82,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
                 case DrawableSpinner spinner:
                     // hide elements we don't care about.
-                    spinner.Disc.Hide();
-                    spinner.Ticks.Hide();
-                    spinner.Background.Hide();
+                    // todo: hide background
 
                     using (spinner.BeginAbsoluteSequence(fadeOutStartTime + longFadeDuration, true))
                         spinner.FadeOut(fadeOutDuration);
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 7b54baa99b..47d765fecd 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -40,8 +40,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             var spinner = (DrawableSpinner)drawable;
 
-            spinner.Disc.Tracking = true;
-            spinner.Disc.Rotate(MathUtils.RadiansToDegrees((float)spinner.Clock.ElapsedFrameTime * 0.03f));
+            spinner.RotationTracker.Tracking = true;
+            spinner.RotationTracker.AddRotation(MathUtils.RadiansToDegrees((float)spinner.Clock.ElapsedFrameTime * 0.03f));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index 774f9cf58b..f209b315af 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -58,8 +58,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     break;
 
                 case DrawableSpinner spinner:
-                    spinner.Disc.Hide();
-                    spinner.Background.Hide();
+                    //todo: hide background
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerBackground.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerBackground.cs
deleted file mode 100644
index be864b8c16..0000000000
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerBackground.cs
+++ /dev/null
@@ -1,44 +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.Game.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
-using osuTK.Graphics;
-
-namespace osu.Game.Rulesets.Osu.Objects.Drawables
-{
-    public class DefaultSpinnerBackground : SpinnerFill
-    {
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours, DrawableHitObject drawableHitObject)
-        {
-            Disc.Alpha = 0;
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
-
-            drawableHitObject.State.BindValueChanged(val =>
-            {
-                Color4 colour;
-
-                switch (val.NewValue)
-                {
-                    default:
-                        colour = colours.BlueDark;
-                        break;
-
-                    case ArmedState.Hit:
-                        colour = colours.YellowLight;
-                        break;
-                }
-
-                this.FadeAccent(colour.Darken(1), 200);
-            }, true);
-
-            FinishTransforms(true);
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index a0c2a06ff8..11f1afafba 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -3,22 +3,19 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
-using osuTK;
-using osuTK.Graphics;
-using osu.Game.Graphics;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;
-using osu.Framework.Utils;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -28,24 +25,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private readonly Container<DrawableSpinnerTick> ticks;
 
-        public readonly SpinnerDisc Disc;
-        public readonly SpinnerTicks Ticks;
+        public readonly SpinnerRotationTracker RotationTracker;
         public readonly SpinnerSpmCounter SpmCounter;
         private readonly SpinnerBonusDisplay bonusDisplay;
 
-        private readonly Container mainContainer;
-
-        public readonly SkinnableDrawable Background;
-        private readonly SkinnableDrawable circleContainer;
-
-        private readonly Color4 baseColour = Color4Extensions.FromHex(@"002c3c");
-        private readonly Color4 fillColour = Color4Extensions.FromHex(@"005b7c");
-
         private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
 
-        private Color4 normalColour;
-        private Color4 completeColour;
-
         public DrawableSpinner(Spinner s)
             : base(s)
         {
@@ -62,27 +47,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             InternalChildren = new Drawable[]
             {
                 ticks = new Container<DrawableSpinnerTick>(),
-                circleContainer = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerCentre), _ => new DefaultSpinnerCentre())
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
-                mainContainer = new AspectContainer
+                RotationTracker = new SpinnerRotationTracker(Spinner),
+                new AspectContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Y,
-                    Children = new[]
+                    Scale = new Vector2(Spinner.Scale),
+                    Children = new Drawable[]
                     {
-                        Background = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBackground), _ => new DefaultSpinnerBackground()),
-                        Disc = new SpinnerDisc(Spinner)
-                        {
-                            Scale = Vector2.Zero,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        },
-                        circleContainer.CreateProxy(),
-                        Ticks = new SpinnerTicks
+                        new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerDisc), _ => new DefaultSpinnerDisc()),
+                        RotationTracker = new SpinnerRotationTracker(Spinner)
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
@@ -117,6 +92,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        protected override void UpdateStateTransforms(ArmedState state)
+        {
+            base.UpdateStateTransforms(state);
+
+            using (BeginDelayedSequence(Spinner.Duration, true))
+                this.FadeOut(160);
+        }
+
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
@@ -140,27 +123,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            normalColour = baseColour;
-            completeColour = colours.YellowLight;
-
-            Ticks.AccentColour = normalColour;
-            Disc.AccentColour = fillColour;
-
             positionBindable.BindValueChanged(pos => Position = pos.NewValue);
             positionBindable.BindTo(HitObject.PositionBindable);
         }
 
-        public float Progress => Math.Clamp(Disc.CumulativeRotation / 360 / Spinner.SpinsRequired, 0, 1);
+        public float Progress => Math.Clamp(RotationTracker.CumulativeRotation / 360 / Spinner.SpinsRequired, 0, 1);
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (Time.Current < HitObject.StartTime) return;
 
-            if (Progress >= 1 && !Disc.Complete)
-            {
-                Disc.Complete = true;
-                transformFillColour(completeColour, 200);
-            }
+            RotationTracker.Complete.Value = Progress >= 1;
 
             if (userTriggered || Time.Current < Spinner.EndTime)
                 return;
@@ -186,27 +159,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
             if (HandleUserInput)
-                Disc.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
+                RotationTracker.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
         }
 
-        private float relativeHeight => ToScreenSpace(new RectangleF(0, 0, OsuHitObject.OBJECT_RADIUS, OsuHitObject.OBJECT_RADIUS)).Height / mainContainer.DrawHeight;
+        public float RelativeHeight => ToScreenSpace(new RectangleF(0, 0, 0, OsuHitObject.OBJECT_RADIUS * 2)).Height / DrawHeight;
 
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
 
-            if (!SpmCounter.IsPresent && Disc.Tracking)
+            if (!SpmCounter.IsPresent && RotationTracker.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
-
-            Ticks.Rotation = Disc.Rotation;
-
-            SpmCounter.SetRotation(Disc.CumulativeRotation);
+            SpmCounter.SetRotation(RotationTracker.CumulativeRotation);
 
             updateBonusScore();
-
-            float relativeCircleScale = Spinner.Scale * relativeHeight;
-            float targetScale = relativeCircleScale + (1 - relativeCircleScale) * Progress;
-            Disc.Scale = new Vector2((float)Interpolation.Lerp(Disc.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
         }
 
         private int wholeSpins;
@@ -216,7 +182,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (ticks.Count == 0)
                 return;
 
-            int spins = (int)(Disc.CumulativeRotation / 360);
+            int spins = (int)(RotationTracker.CumulativeRotation / 360);
 
             if (spins < wholeSpins)
             {
@@ -240,59 +206,5 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 wholeSpins++;
             }
         }
-
-        protected override void UpdateInitialTransforms()
-        {
-            base.UpdateInitialTransforms();
-
-            circleContainer.ScaleTo(0);
-            mainContainer.ScaleTo(0);
-
-            using (BeginDelayedSequence(HitObject.TimePreempt / 2, true))
-            {
-                float phaseOneScale = Spinner.Scale * 0.7f;
-
-                circleContainer.ScaleTo(phaseOneScale, HitObject.TimePreempt / 4, Easing.OutQuint);
-
-                mainContainer
-                    .ScaleTo(phaseOneScale * relativeHeight * 1.6f, HitObject.TimePreempt / 4, Easing.OutQuint)
-                    .RotateTo((float)(25 * Spinner.Duration / 2000), HitObject.TimePreempt + Spinner.Duration);
-
-                using (BeginDelayedSequence(HitObject.TimePreempt / 2, true))
-                {
-                    circleContainer.ScaleTo(Spinner.Scale, 400, Easing.OutQuint);
-                    mainContainer.ScaleTo(1, 400, Easing.OutQuint);
-                }
-            }
-        }
-
-        protected override void UpdateStateTransforms(ArmedState state)
-        {
-            base.UpdateStateTransforms(state);
-
-            using (BeginDelayedSequence(Spinner.Duration, true))
-            {
-                this.FadeOut(160);
-
-                switch (state)
-                {
-                    case ArmedState.Hit:
-                        transformFillColour(completeColour, 0);
-                        this.ScaleTo(Scale * 1.2f, 320, Easing.Out);
-                        mainContainer.RotateTo(mainContainer.Rotation + 180, 320);
-                        break;
-
-                    case ArmedState.Miss:
-                        this.ScaleTo(Scale * 0.8f, 320, Easing.In);
-                        break;
-                }
-            }
-        }
-
-        private void transformFillColour(Colour4 colour, double duration)
-        {
-            Disc.FadeAccent(colour, duration);
-            Ticks.FadeAccent(colour, duration);
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
new file mode 100644
index 0000000000..11cd73b995
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -0,0 +1,170 @@
+// Copyright (c) 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.Containers;
+using osu.Framework.Utils;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+{
+    public class DefaultSpinnerDisc : CompositeDrawable
+    {
+        private DrawableSpinner drawableSpinner;
+
+        private Spinner spinner;
+
+        private const float idle_alpha = 0.2f;
+        private const float tracking_alpha = 0.4f;
+
+        private Color4 normalColour;
+        private Color4 completeColour;
+
+        private SpinnerTicks ticks;
+
+        private int completeTick;
+        private SpinnerFill fill;
+        private Container mainContainer;
+        private SpinnerCentreLayer centre;
+        private SpinnerBackgroundLayer background;
+
+        public DefaultSpinnerDisc()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, DrawableHitObject drawableHitObject)
+        {
+            drawableSpinner = (DrawableSpinner)drawableHitObject;
+            spinner = (Spinner)drawableSpinner.HitObject;
+
+            normalColour = colours.BlueDark;
+            completeColour = colours.YellowLight;
+
+            InternalChildren = new Drawable[]
+            {
+                mainContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        background = new SpinnerBackgroundLayer(),
+                        fill = new SpinnerFill
+                        {
+                            Alpha = idle_alpha,
+                            AccentColour = normalColour
+                        },
+                        ticks = new SpinnerTicks
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            AccentColour = normalColour
+                        },
+                    }
+                },
+                centre = new SpinnerCentreLayer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            centre.ScaleTo(0);
+            mainContainer.ScaleTo(0);
+            this.ScaleTo(1);
+
+            drawableSpinner.RotationTracker.Complete.BindValueChanged(complete => updateComplete(complete.NewValue, 200));
+            drawableSpinner.State.BindValueChanged(updateStateTransforms, true);
+        }
+
+        private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
+        {
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt / 2, true))
+            {
+                float phaseOneScale = spinner.Scale * 0.7f;
+
+                centre.ScaleTo(phaseOneScale, spinner.TimePreempt / 4, Easing.OutQuint);
+
+                mainContainer
+                    .ScaleTo(phaseOneScale * drawableSpinner.RelativeHeight * 1.6f, spinner.TimePreempt / 4, Easing.OutQuint);
+
+                this.RotateTo((float)(25 * spinner.Duration / 2000), spinner.TimePreempt + spinner.Duration);
+
+                using (BeginDelayedSequence(spinner.TimePreempt / 2, true))
+                {
+                    centre.ScaleTo(spinner.Scale, spinner.TimePreempt / 2, Easing.OutQuint);
+                    mainContainer.ScaleTo(1, spinner.TimePreempt / 2, Easing.OutQuint);
+                }
+            }
+
+            // transforms we have from completing the spinner will be rolled back, so reapply immediately.
+            updateComplete(state.NewValue == ArmedState.Hit, 0);
+
+            using (BeginDelayedSequence(spinner.Duration, true))
+            {
+                switch (state.NewValue)
+                {
+                    case ArmedState.Hit:
+                        this.ScaleTo(Scale * 1.2f, 320, Easing.Out);
+                        this.RotateTo(mainContainer.Rotation + 180, 320);
+                        break;
+
+                    case ArmedState.Miss:
+                        this.ScaleTo(Scale * 0.8f, 320, Easing.In);
+                        break;
+                }
+            }
+        }
+
+        private void updateComplete(bool complete, double duration)
+        {
+            var colour = complete ? completeColour : normalColour;
+
+            ticks.FadeAccent(colour.Darken(1), duration);
+            fill.FadeAccent(colour.Darken(1), duration);
+
+            background.FadeAccent(colour, duration);
+            centre.FadeAccent(colour, duration);
+        }
+
+        private bool updateCompleteTick() => completeTick != (completeTick = (int)(drawableSpinner.RotationTracker.CumulativeRotation / 360));
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (drawableSpinner.RotationTracker.Complete.Value && updateCompleteTick())
+            {
+                fill.FinishTransforms(false, nameof(Alpha));
+                fill
+                    .FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
+                    .Then()
+                    .FadeTo(tracking_alpha, 250, Easing.OutQuint);
+            }
+
+            float relativeCircleScale = spinner.Scale * drawableSpinner.RelativeHeight;
+            float targetScale = relativeCircleScale + (1 - relativeCircleScale) * drawableSpinner.Progress;
+
+            fill.Scale = new Vector2((float)Interpolation.Lerp(fill.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
+            mainContainer.Rotation = drawableSpinner.RotationTracker.Rotation;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerFill.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerFill.cs
index dbba1044ca..043bc5618c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerFill.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerFill.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             RelativeSizeAxes = Axes.Both;
             Masking = true;
 
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
             Children = new Drawable[]
             {
                 Disc = new Box
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
similarity index 59%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
rename to osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
index 22a6fc391a..968c2a6df5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
@@ -2,85 +2,33 @@
 // 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.Framework.Input.Events;
-using osu.Game.Graphics;
-using osuTK;
-using osuTK.Graphics;
 using osu.Framework.Utils;
-using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
-    public class SpinnerDisc : CircularContainer, IHasAccentColour
+    public class SpinnerRotationTracker : CircularContainer
     {
         private readonly Spinner spinner;
 
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => accentColour;
-            set
-            {
-                accentColour = value;
-                if (background.Drawable is IHasAccentColour accent)
-                    accent.AccentColour = value;
-            }
-        }
-
-        private readonly SkinnableDrawable background;
-
-        private const float idle_alpha = 0.2f;
-        private const float tracking_alpha = 0.4f;
-
         public override bool IsPresent => true; // handle input when hidden
 
-        public SpinnerDisc(Spinner s)
+        public SpinnerRotationTracker(Spinner s)
         {
             spinner = s;
 
             RelativeSizeAxes = Axes.Both;
-
-            Children = new Drawable[]
-            {
-                background = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerDisc), _ => new SpinnerFill { Alpha = idle_alpha }),
-            };
         }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
-        private bool tracking;
+        public bool Tracking { get; set; }
 
-        public bool Tracking
-        {
-            get => tracking;
-            set
-            {
-                if (value == tracking) return;
-
-                tracking = value;
-
-                // todo: new default only
-                background.Drawable.FadeTo(tracking ? tracking_alpha : idle_alpha, 100);
-            }
-        }
-
-        private bool complete;
-
-        public bool Complete
-        {
-            get => complete;
-            set
-            {
-                if (value == complete) return;
-
-                complete = value;
-
-                updateCompleteTick();
-            }
-        }
+        public readonly BindableBool Complete = new BindableBool();
 
         /// <summary>
         /// The total rotation performed on the spinner disc, disregarding the spin direction.
@@ -93,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         /// If the spinner is spun 360 degrees clockwise and then 360 degrees counter-clockwise,
         /// this property will return the value of 720 (as opposed to 0 for <see cref="Drawable.Rotation"/>).
         /// </example>
-        public float CumulativeRotation;
+        public float CumulativeRotation { get; private set; }
 
         /// <summary>
         /// Whether currently in the correct time range to allow spinning.
@@ -110,9 +58,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private float lastAngle;
         private float currentRotation;
-        private int completeTick;
-
-        private bool updateCompleteTick() => completeTick != (completeTick = (int)(CumulativeRotation / 360));
 
         private bool rotationTransferred;
 
@@ -123,21 +68,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             var delta = thisAngle - lastAngle;
 
-            if (tracking)
-                Rotate(delta);
+            if (Tracking)
+                AddRotation(delta);
 
             lastAngle = thisAngle;
 
-            if (Complete && updateCompleteTick())
-            {
-                // todo: new default only
-                background.Drawable.FinishTransforms(false, nameof(Alpha));
-                background.Drawable
-                          .FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
-                          .Then()
-                          .FadeTo(tracking_alpha, 250, Easing.OutQuint);
-            }
-
             Rotation = (float)Interpolation.Lerp(Rotation, currentRotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
         }
 
@@ -148,7 +83,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         /// Will be a no-op if not a valid time to spin.
         /// </remarks>
         /// <param name="angle">The delta angle.</param>
-        public void Rotate(float angle)
+        public void AddRotation(float angle)
         {
             if (!isSpinnableTime)
                 return;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerBackgroundLayer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerBackgroundLayer.cs
new file mode 100644
index 0000000000..3cd2454706
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerBackgroundLayer.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;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
+{
+    public class SpinnerBackgroundLayer : SpinnerFill
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, DrawableHitObject drawableHitObject)
+        {
+            Disc.Alpha = 0;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerCentre.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs
similarity index 67%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerCentre.cs
rename to osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs
index d07829fbac..8803b92815 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DefaultSpinnerCentre.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs
@@ -15,7 +15,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DefaultSpinnerCentre : CompositeDrawable
+    public class SpinnerCentreLayer : CompositeDrawable, IHasAccentColour
     {
         private DrawableSpinner spinner;
 
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private SpriteIcon symbol;
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, DrawableHitObject drawableHitObject)
+        private void load(DrawableHitObject drawableHitObject)
         {
             spinner = (DrawableSpinner)drawableHitObject;
 
@@ -49,35 +49,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Shadow = false,
                 },
             };
-
-            drawableHitObject.State.BindValueChanged(val =>
-            {
-                Color4 colour;
-
-                switch (val.NewValue)
-                {
-                    default:
-                        colour = colours.BlueDark;
-                        break;
-
-                    case ArmedState.Hit:
-                        colour = colours.YellowLight;
-                        break;
-                }
-
-                circle.FadeColour(colour, 200);
-                glow.FadeColour(colour, 200);
-            }, true);
-
-            FinishTransforms(true);
         }
 
         protected override void Update()
         {
             base.Update();
+            symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, spinner.RotationTracker.Rotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
+        }
 
-            circle.Rotation = spinner.Disc.Rotation;
-            symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, spinner.Disc.Rotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
+        private Color4 accentColour;
+
+        public Color4 AccentColour
+        {
+            get => accentColour;
+            set
+            {
+                accentColour = value;
+
+                circle.Colour = accentColour;
+                glow.Colour = accentColour;
+            }
         }
     }
 }

From 2b71ffa2ed9a45ec87b38fcd63cb053f244f800e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jul 2020 22:31:18 +0900
Subject: [PATCH 03979/10326] Add back legacy implementations

---
 .../Objects/Drawables/DrawableSpinner.cs      |  2 +-
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs    |  4 +-
 .../Skinning/LegacyNewStyleSpinner.cs         | 80 +++++++++++++++++++
 .../Skinning/LegacyOldStyleSpinner.cs         | 64 +++++++++++++++
 .../Skinning/OsuLegacySkinTransformer.cs      | 25 ++----
 5 files changed, 151 insertions(+), 24 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 11f1afafba..f36ecd9dc4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Scale = new Vector2(Spinner.Scale),
                     Children = new Drawable[]
                     {
-                        new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerDisc), _ => new DefaultSpinnerDisc()),
+                        new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBody), _ => new DefaultSpinnerDisc()),
                         RotationTracker = new SpinnerRotationTracker(Spinner)
                         {
                             Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index c05dbf6b16..5468764692 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Rulesets.Osu
         SliderFollowCircle,
         SliderBall,
         SliderBody,
-        SpinnerDisc,
-        SpinnerBackground,
-        SpinnerCentre
+        SpinnerBody
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
new file mode 100644
index 0000000000..65b8b979fc
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -0,0 +1,80 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Osu.Skinning
+{
+    public class LegacyNewStyleSpinner : CompositeDrawable
+    {
+        private Sprite discBottom;
+        private Sprite discTop;
+        private Sprite spinningMiddle;
+
+        private DrawableSpinner drawableSpinner;
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource source, DrawableHitObject drawableObject)
+        {
+            drawableSpinner = (DrawableSpinner)drawableObject;
+
+            InternalChildren = new Drawable[]
+            {
+                discBottom = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = source.GetTexture("spinner-bottom")
+                },
+                discTop = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = source.GetTexture("spinner-top")
+                },
+                new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = source.GetTexture("spinner-middle")
+                },
+                spinningMiddle = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = source.GetTexture("spinner-middle2")
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            this.FadeOut();
+            drawableSpinner.State.BindValueChanged(updateStateTransforms, true);
+        }
+
+        private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
+        {
+            var spinner = drawableSpinner.HitObject;
+
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt / 2, true))
+                this.FadeInFromZero(spinner.TimePreempt / 2);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            spinningMiddle.Rotation = discTop.Rotation = drawableSpinner.RotationTracker.Rotation;
+            discBottom.Rotation = discTop.Rotation / 3;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
new file mode 100644
index 0000000000..16d8664e66
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -0,0 +1,64 @@
+// Copyright (c) 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.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Osu.Skinning
+{
+    public class LegacyOldStyleSpinner : CompositeDrawable
+    {
+        private DrawableSpinner drawableSpinner;
+        private Sprite disc;
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource source, DrawableHitObject drawableObject)
+        {
+            drawableSpinner = (DrawableSpinner)drawableObject;
+
+            InternalChildren = new Drawable[]
+            {
+                new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = source.GetTexture("spinner-background")
+                },
+                disc = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = source.GetTexture("spinner-circle")
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            this.FadeOut();
+            drawableSpinner.State.BindValueChanged(updateStateTransforms, true);
+        }
+
+        private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
+        {
+            var spinner = drawableSpinner.HitObject;
+
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt / 2, true))
+                this.FadeInFromZero(spinner.TimePreempt / 2);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            disc.Rotation = drawableSpinner.RotationTracker.Rotation;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index a5198d3448..44f431d6f7 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -4,7 +4,6 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -104,25 +103,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                             Spacing = new Vector2(-overlap, 0)
                         };
 
-                case OsuSkinComponents.SpinnerDisc:
-                    if (Source.GetTexture("spinner-background") != null)
-                        return new Sprite { Texture = Source.GetTexture("spinner-circle") };
-                    else if (Source.GetTexture("spinner-top") != null)
-                        return new Sprite { Texture = Source.GetTexture("spinner-top") };
-
-                    return null;
-
-                case OsuSkinComponents.SpinnerBackground:
-                    if (Source.GetTexture("spinner-background") != null)
-                        return new Sprite { Texture = Source.GetTexture("spinner-background") };
-
-                    return null;
-
-                case OsuSkinComponents.SpinnerCentre:
-                    if (Source.GetTexture("spinner-background") != null)
-                        return Drawable.Empty();
-                    else if (Source.GetTexture("spinner-top") != null)
-                        return new Sprite { Texture = Source.GetTexture("spinner-middle2") };
+                case OsuSkinComponents.SpinnerBody:
+                    if (Source.GetTexture("spinner-top") != null)
+                        return new LegacyNewStyleSpinner();
+                    else if (Source.GetTexture("spinner-background") != null)
+                        return new LegacyOldStyleSpinner();
 
                     return null;
             }

From ca21f038e0c8bf8f2f2a619562d88af7feac50cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 10:35:48 +0900
Subject: [PATCH 03980/10326] Add xmldoc for legacy classes

---
 osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs | 4 ++++
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 65b8b979fc..2521bb1d76 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -12,6 +12,10 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
+    /// <summary>
+    /// Legacy skinned spinner with two main spinning layers, one fixed overlay and one final spinning overlay.
+    /// No background layer.
+    /// </summary>
     public class LegacyNewStyleSpinner : CompositeDrawable
     {
         private Sprite discBottom;
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 16d8664e66..e6a4064129 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -12,6 +12,9 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
+    /// <summary>
+    /// Legacy skinned spinner with one main spinning layer and a background layer.
+    /// </summary>
     public class LegacyOldStyleSpinner : CompositeDrawable
     {
         private DrawableSpinner drawableSpinner;

From d4496eb9824ad8bbc14da66d00b14c037fc54c69 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 30 Jul 2020 04:51:09 +0300
Subject: [PATCH 03981/10326] Update ShowMoreButton in line with web

---
 .../Visual/Online/TestSceneShowMoreButton.cs  | 20 ++---
 .../Graphics/UserInterface/ShowMoreButton.cs  | 84 ++++++++++++++-----
 .../Comments/Buttons/CommentRepliesButton.cs  | 15 ++--
 .../Comments/CommentsShowMoreButton.cs        | 11 ---
 .../Profile/Sections/PaginatedContainer.cs    |  5 +-
 .../Profile/Sections/ProfileShowMoreButton.cs | 19 -----
 6 files changed, 76 insertions(+), 78 deletions(-)
 delete mode 100644 osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.cs b/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.cs
index 273f593c32..18ac415126 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneShowMoreButton.cs
@@ -4,19 +4,22 @@
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Allocation;
-using osu.Game.Graphics;
+using osu.Game.Overlays;
 
 namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneShowMoreButton : OsuTestScene
     {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
         public TestSceneShowMoreButton()
         {
-            TestButton button = null;
+            ShowMoreButton button = null;
 
             int fireCount = 0;
 
-            Add(button = new TestButton
+            Add(button = new ShowMoreButton
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -46,16 +49,5 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("action fired twice", () => fireCount == 2);
             AddAssert("is in loading state", () => button.IsLoading);
         }
-
-        private class TestButton : ShowMoreButton
-        {
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colors)
-            {
-                IdleColour = colors.YellowDark;
-                HoverColour = colors.Yellow;
-                ChevronIconColour = colors.Red;
-            }
-        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
index c9cd9f1158..f4ab53d305 100644
--- a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
@@ -1,13 +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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
 using osuTK;
-using osuTK.Graphics;
 using System.Collections.Generic;
 
 namespace osu.Game.Graphics.UserInterface
@@ -16,14 +18,6 @@ namespace osu.Game.Graphics.UserInterface
     {
         private const int duration = 200;
 
-        private Color4 chevronIconColour;
-
-        protected Color4 ChevronIconColour
-        {
-            get => chevronIconColour;
-            set => chevronIconColour = leftChevron.Colour = rightChevron.Colour = value;
-        }
-
         public string Text
         {
             get => text.Text;
@@ -32,22 +26,28 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override IEnumerable<Drawable> EffectTargets => new[] { background };
 
-        private ChevronIcon leftChevron;
-        private ChevronIcon rightChevron;
+        private ChevronIcon leftIcon;
+        private ChevronIcon rightIcon;
         private SpriteText text;
         private Box background;
         private FillFlowContainer textContainer;
 
         public ShowMoreButton()
         {
-            Height = 30;
-            Width = 140;
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            IdleColour = colourProvider.Background2;
+            HoverColour = colourProvider.Background1;
         }
 
         protected override Drawable CreateContent() => new CircularContainer
         {
             Masking = true,
-            RelativeSizeAxes = Axes.Both,
+            AutoSizeAxes = Axes.Both,
             Children = new Drawable[]
             {
                 background = new Box
@@ -56,22 +56,36 @@ namespace osu.Game.Graphics.UserInterface
                 },
                 textContainer = new FillFlowContainer
                 {
+                    AlwaysPresent = true,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(7),
+                    Spacing = new Vector2(10),
+                    Margin = new MarginPadding
+                    {
+                        Horizontal = 20,
+                        Vertical = 5
+                    },
                     Children = new Drawable[]
                     {
-                        leftChevron = new ChevronIcon(),
+                        leftIcon = new ChevronIcon
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
                         text = new OsuSpriteText
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                             Text = "show more".ToUpper(),
                         },
-                        rightChevron = new ChevronIcon(),
+                        rightIcon = new ChevronIcon
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        }
                     }
                 }
             }
@@ -81,17 +95,41 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override void OnLoadFinished() => textContainer.FadeIn(duration, Easing.OutQuint);
 
-        private class ChevronIcon : SpriteIcon
+        protected override bool OnHover(HoverEvent e)
         {
-            private const int icon_size = 8;
+            base.OnHover(e);
+            leftIcon.FadeHoverColour();
+            rightIcon.FadeHoverColour();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            leftIcon.FadeIdleColour();
+            rightIcon.FadeIdleColour();
+        }
+
+        public class ChevronIcon : SpriteIcon
+        {
+            [Resolved]
+            private OverlayColourProvider colourProvider { get; set; }
 
             public ChevronIcon()
             {
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-                Size = new Vector2(icon_size);
+                Size = new Vector2(7.5f);
                 Icon = FontAwesome.Solid.ChevronDown;
             }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Colour = colourProvider.Foreground1;
+            }
+
+            public void FadeHoverColour() => this.FadeColour(colourProvider.Light1, 200, Easing.OutQuint);
+
+            public void FadeIdleColour() => this.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index 53438ca421..202f3ddd7b 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -5,12 +5,12 @@ 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.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
+using static osu.Game.Graphics.UserInterface.ShowMoreButton;
 
 namespace osu.Game.Overlays.Comments.Buttons
 {
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        private readonly SpriteIcon icon;
+        private readonly ChevronIcon icon;
         private readonly Box background;
         private readonly OsuSpriteText text;
 
@@ -68,12 +68,10 @@ namespace osu.Game.Overlays.Comments.Buttons
                                         AlwaysPresent = true,
                                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
                                     },
-                                    icon = new SpriteIcon
+                                    icon = new ChevronIcon
                                     {
                                         Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
-                                        Size = new Vector2(7.5f),
-                                        Icon = FontAwesome.Solid.ChevronDown
+                                        Origin = Anchor.CentreLeft
                                     }
                                 }
                             }
@@ -88,7 +86,6 @@ namespace osu.Game.Overlays.Comments.Buttons
         private void load()
         {
             background.Colour = colourProvider.Background2;
-            icon.Colour = colourProvider.Foreground1;
         }
 
         protected void SetIconDirection(bool upwards) => icon.ScaleTo(new Vector2(1, upwards ? -1 : 1));
@@ -99,7 +96,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         {
             base.OnHover(e);
             background.FadeColour(colourProvider.Background1, 200, Easing.OutQuint);
-            icon.FadeColour(colourProvider.Light1, 200, Easing.OutQuint);
+            icon.FadeHoverColour();
             return true;
         }
 
@@ -107,7 +104,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         {
             base.OnHoverLost(e);
             background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint);
-            icon.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
+            icon.FadeIdleColour();
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs b/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
index d2ff7ecb1f..adf64eabb1 100644
--- a/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
+++ b/osu.Game/Overlays/Comments/CommentsShowMoreButton.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.Game.Graphics.UserInterface;
 
@@ -11,16 +10,6 @@ namespace osu.Game.Overlays.Comments
     {
         public readonly BindableInt Current = new BindableInt();
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            Height = 20;
-
-            IdleColour = colourProvider.Background2;
-            HoverColour = colourProvider.Background1;
-            ChevronIconColour = colourProvider.Foreground1;
-        }
-
         protected override void LoadComplete()
         {
             Current.BindValueChanged(onCurrentChanged, true);
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index a30ff786fb..9720469548 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -14,12 +14,13 @@ using osu.Game.Users;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Profile.Sections
 {
     public abstract class PaginatedContainer<TModel> : FillFlowContainer
     {
-        private readonly ProfileShowMoreButton moreButton;
+        private readonly ShowMoreButton moreButton;
         private readonly OsuSpriteText missingText;
         private APIRequest<List<TModel>> retrievalRequest;
         private CancellationTokenSource loadCancellation;
@@ -74,7 +75,7 @@ namespace osu.Game.Overlays.Profile.Sections
                     RelativeSizeAxes = Axes.X,
                     Spacing = new Vector2(0, 2),
                 },
-                moreButton = new ProfileShowMoreButton
+                moreButton = new ShowMoreButton
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs b/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs
deleted file mode 100644
index 426ebeebe6..0000000000
--- a/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs
+++ /dev/null
@@ -1,19 +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.Graphics.UserInterface;
-
-namespace osu.Game.Overlays.Profile.Sections
-{
-    public class ProfileShowMoreButton : ShowMoreButton
-    {
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            IdleColour = colourProvider.Background2;
-            HoverColour = colourProvider.Background1;
-            ChevronIconColour = colourProvider.Foreground1;
-        }
-    }
-}

From 45ddc7a2e9f9d1b05404831c172ff479920031a5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 30 Jul 2020 05:02:01 +0300
Subject: [PATCH 03982/10326] Rename ShowMoreButton in comments namespace to
 ShowMoreRepliesButton

---
 .../Buttons/{ShowMoreButton.cs => ShowMoreRepliesButton.cs}   | 4 ++--
 osu.Game/Overlays/Comments/DrawableComment.cs                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Overlays/Comments/Buttons/{ShowMoreButton.cs => ShowMoreRepliesButton.cs} (93%)

diff --git a/osu.Game/Overlays/Comments/Buttons/ShowMoreButton.cs b/osu.Game/Overlays/Comments/Buttons/ShowMoreRepliesButton.cs
similarity index 93%
rename from osu.Game/Overlays/Comments/Buttons/ShowMoreButton.cs
rename to osu.Game/Overlays/Comments/Buttons/ShowMoreRepliesButton.cs
index 2c363564d2..c115a8bb8f 100644
--- a/osu.Game/Overlays/Comments/Buttons/ShowMoreButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/ShowMoreRepliesButton.cs
@@ -12,13 +12,13 @@ using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Comments.Buttons
 {
-    public class ShowMoreButton : LoadingButton
+    public class ShowMoreRepliesButton : LoadingButton
     {
         protected override IEnumerable<Drawable> EffectTargets => new[] { text };
 
         private OsuSpriteText text;
 
-        public ShowMoreButton()
+        public ShowMoreRepliesButton()
         {
             AutoSizeAxes = Axes.Both;
             LoadingAnimationSize = new Vector2(8);
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 9c0a48ec29..31aa41e967 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Comments
         private FillFlowContainer childCommentsVisibilityContainer;
         private FillFlowContainer childCommentsContainer;
         private LoadRepliesButton loadRepliesButton;
-        private ShowMoreButton showMoreButton;
+        private ShowMoreRepliesButton showMoreButton;
         private ShowRepliesButton showRepliesButton;
         private ChevronButton chevronButton;
         private DeletedCommentsCounter deletedCommentsCounter;
@@ -213,7 +213,7 @@ namespace osu.Game.Overlays.Comments
                                             Top = 10
                                         }
                                     },
-                                    showMoreButton = new ShowMoreButton
+                                    showMoreButton = new ShowMoreRepliesButton
                                     {
                                         Action = () => RepliesRequested(this, ++currentPage)
                                     }

From 64c7ae768641e22a51fffb0e2a828ebcba00eab9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 11:25:49 +0900
Subject: [PATCH 03983/10326] Fix hit transforms not playing out correctly

---
 .../Objects/Drawables/Pieces/DefaultSpinnerDisc.cs        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 11cd73b995..6a40069c5d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -87,16 +87,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             base.LoadComplete();
 
-            centre.ScaleTo(0);
-            mainContainer.ScaleTo(0);
-            this.ScaleTo(1);
-
             drawableSpinner.RotationTracker.Complete.BindValueChanged(complete => updateComplete(complete.NewValue, 200));
             drawableSpinner.State.BindValueChanged(updateStateTransforms, true);
         }
 
         private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
         {
+            centre.ScaleTo(0);
+            mainContainer.ScaleTo(0);
+            this.ScaleTo(1);
+
             using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt / 2, true))
             {
                 float phaseOneScale = spinner.Scale * 0.7f;

From 54fee7e7160ec6931937f37c31898a5e554bc247 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 11:50:13 +0900
Subject: [PATCH 03984/10326] Simplify and standardise scale for default
 display

---
 .../Objects/Drawables/DrawableSpinner.cs      | 12 ----------
 .../Drawables/Pieces/DefaultSpinnerDisc.cs    | 22 +++++++++----------
 .../Objects/Drawables/SpinnerCentreLayer.cs   |  3 ---
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index f36ecd9dc4..52a1b4679b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -39,29 +38,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             RelativeSizeAxes = Axes.Both;
 
-            // we are slightly bigger than our parent, to clip the top and bottom of the circle
-            Height = 1.3f;
-
             Spinner = s;
 
             InternalChildren = new Drawable[]
             {
                 ticks = new Container<DrawableSpinnerTick>(),
-                RotationTracker = new SpinnerRotationTracker(Spinner),
                 new AspectContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Y,
-                    Scale = new Vector2(Spinner.Scale),
                     Children = new Drawable[]
                     {
                         new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBody), _ => new DefaultSpinnerDisc()),
                         RotationTracker = new SpinnerRotationTracker(Spinner)
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        },
                     }
                 },
                 SpmCounter = new SpinnerSpmCounter
@@ -162,8 +152,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 RotationTracker.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
         }
 
-        public float RelativeHeight => ToScreenSpace(new RectangleF(0, 0, 0, OsuHitObject.OBJECT_RADIUS * 2)).Height / DrawHeight;
-
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 6a40069c5d..2644f425a0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -39,6 +39,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             RelativeSizeAxes = Axes.Both;
 
+            // we are slightly bigger than our parent, to clip the top and bottom of the circle
+            // this should probably be revisited when scaled spinners are a thing.
+            Scale = new Vector2(1.3f);
+
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
         }
@@ -95,22 +99,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             centre.ScaleTo(0);
             mainContainer.ScaleTo(0);
-            this.ScaleTo(1);
 
             using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt / 2, true))
             {
-                float phaseOneScale = spinner.Scale * 0.7f;
-
-                centre.ScaleTo(phaseOneScale, spinner.TimePreempt / 4, Easing.OutQuint);
-
-                mainContainer
-                    .ScaleTo(phaseOneScale * drawableSpinner.RelativeHeight * 1.6f, spinner.TimePreempt / 4, Easing.OutQuint);
-
+                // constant ambient rotation to give the spinner "spinning" character.
                 this.RotateTo((float)(25 * spinner.Duration / 2000), spinner.TimePreempt + spinner.Duration);
 
+                centre.ScaleTo(0.3f, spinner.TimePreempt / 4, Easing.OutQuint);
+                mainContainer.ScaleTo(0.2f, spinner.TimePreempt / 4, Easing.OutQuint);
+
                 using (BeginDelayedSequence(spinner.TimePreempt / 2, true))
                 {
-                    centre.ScaleTo(spinner.Scale, spinner.TimePreempt / 2, Easing.OutQuint);
+                    centre.ScaleTo(0.5f, spinner.TimePreempt / 2, Easing.OutQuint);
                     mainContainer.ScaleTo(1, spinner.TimePreempt / 2, Easing.OutQuint);
                 }
             }
@@ -160,8 +160,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     .FadeTo(tracking_alpha, 250, Easing.OutQuint);
             }
 
-            float relativeCircleScale = spinner.Scale * drawableSpinner.RelativeHeight;
-            float targetScale = relativeCircleScale + (1 - relativeCircleScale) * drawableSpinner.Progress;
+            const float initial_scale = 0.2f;
+            float targetScale = initial_scale + (1 - initial_scale) * drawableSpinner.Progress;
 
             fill.Scale = new Vector2((float)Interpolation.Lerp(fill.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
             mainContainer.Rotation = drawableSpinner.RotationTracker.Rotation;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs
index 8803b92815..b62ce822f0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs
@@ -28,9 +28,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             spinner = (DrawableSpinner)drawableHitObject;
 
-            AutoSizeAxes = Axes.Both;
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
             InternalChildren = new Drawable[]
             {
                 glow = new GlowPiece(),

From 4d822742e83a8892838b7ddf105f5f4c6c472858 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 12:05:19 +0900
Subject: [PATCH 03985/10326] Add scale and tint to new legacy style spinner

---
 .../Skinning/LegacyNewStyleSpinner.cs         | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 2521bb1d76..618cb0e9ad 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -6,9 +6,13 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -21,14 +25,19 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private Sprite discBottom;
         private Sprite discTop;
         private Sprite spinningMiddle;
+        private Sprite fixedMiddle;
 
         private DrawableSpinner drawableSpinner;
 
+        private const float final_scale = 0.625f;
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
         {
             drawableSpinner = (DrawableSpinner)drawableObject;
 
+            Scale = new Vector2(final_scale);
+
             InternalChildren = new Drawable[]
             {
                 discBottom = new Sprite
@@ -43,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Origin = Anchor.Centre,
                     Texture = source.GetTexture("spinner-top")
                 },
-                new Sprite
+                fixedMiddle = new Sprite
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -68,10 +77,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
         {
-            var spinner = drawableSpinner.HitObject;
+            var spinner = (Spinner)drawableSpinner.HitObject;
 
             using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt / 2, true))
                 this.FadeInFromZero(spinner.TimePreempt / 2);
+
+            fixedMiddle.FadeColour(Color4.White);
+            using (BeginAbsoluteSequence(spinner.StartTime, true))
+                fixedMiddle.FadeColour(Color4.Red, spinner.Duration);
         }
 
         protected override void Update()
@@ -79,6 +92,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
             base.Update();
             spinningMiddle.Rotation = discTop.Rotation = drawableSpinner.RotationTracker.Rotation;
             discBottom.Rotation = discTop.Rotation / 3;
+
+            Scale = new Vector2(final_scale * 0.8f
+                                + (float)Interpolation.ApplyEasing(Easing.Out, drawableSpinner.Progress) * (final_scale * 0.2f));
         }
     }
 }

From d2b3fe1e7b3412dd82082c3ffe818972a52f47e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 12:08:04 +0900
Subject: [PATCH 03986/10326] Add scale to old legacy spinner

---
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index e6a4064129..02b8c7eef1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -25,6 +26,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             drawableSpinner = (DrawableSpinner)drawableObject;
 
+            Scale = new Vector2(0.625f);
+
             InternalChildren = new Drawable[]
             {
                 new Sprite

From 743d165319cba9784ee2700524999c59298e1880 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 12:32:19 +0900
Subject: [PATCH 03987/10326] Add old style spin metre

---
 .../Skinning/LegacyOldStyleSpinner.cs         | 50 +++++++++++++++++--
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 02b8c7eef1..9b1f2b31e3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.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;
 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.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
@@ -20,37 +22,59 @@ namespace osu.Game.Rulesets.Osu.Skinning
     {
         private DrawableSpinner drawableSpinner;
         private Sprite disc;
+        private Container metre;
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
         {
             drawableSpinner = (DrawableSpinner)drawableObject;
 
-            Scale = new Vector2(0.625f);
+            RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
             {
                 new Sprite
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Texture = source.GetTexture("spinner-background")
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Texture = source.GetTexture("spinner-background"),
+                    Y = 20,
+                    Scale = new Vector2(0.625f)
                 },
                 disc = new Sprite
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = source.GetTexture("spinner-circle")
+                    Texture = source.GetTexture("spinner-circle"),
+                    Scale = new Vector2(0.625f)
+                },
+                metre = new Container
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Y = 20,
+                    Masking = true,
+                    Child = new Sprite
+                    {
+                        Texture = source.GetTexture("spinner-metre"),
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                    },
+                    Scale = new Vector2(0.625f)
                 }
             };
         }
 
+        private Vector2 metreFinalSize;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
             this.FadeOut();
             drawableSpinner.State.BindValueChanged(updateStateTransforms, true);
+
+            metreFinalSize = metre.Size = metre.Child.Size;
         }
 
         private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
@@ -65,6 +89,22 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             base.Update();
             disc.Rotation = drawableSpinner.RotationTracker.Rotation;
+            metre.Height = getMetreHeight(drawableSpinner.Progress);
+        }
+
+        private const int total_bars = 10;
+
+        private float getMetreHeight(float progress)
+        {
+            progress = Math.Min(99, progress * 100);
+
+            int barCount = (int)progress / 10;
+
+            // todo: add SpinnerNoBlink support
+            if (RNG.NextBool(((int)progress % 10) / 10f))
+                barCount++;
+
+            return (float)barCount / total_bars * metreFinalSize.Y;
         }
     }
 }

From 19fb350cd81d1ed3567f967a4a3d1f1d00943454 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 12:50:27 +0900
Subject: [PATCH 03988/10326] Move offset and scale to constant

---
 .../Skinning/LegacyOldStyleSpinner.cs                | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 9b1f2b31e3..0ae1d8f683 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -24,6 +24,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private Sprite disc;
         private Container metre;
 
+        private const float background_y_offset = 20;
+
+        private const float sprite_scale = 1 / 1.6f;
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
         {
@@ -38,21 +42,21 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     Texture = source.GetTexture("spinner-background"),
-                    Y = 20,
-                    Scale = new Vector2(0.625f)
+                    Y = background_y_offset,
+                    Scale = new Vector2(sprite_scale)
                 },
                 disc = new Sprite
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Texture = source.GetTexture("spinner-circle"),
-                    Scale = new Vector2(0.625f)
+                    Scale = new Vector2(sprite_scale)
                 },
                 metre = new Container
                 {
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
-                    Y = 20,
+                    Y = background_y_offset,
                     Masking = true,
                     Child = new Sprite
                     {

From c1085d49d3c41b88233cf530e41774065161f527 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 12:55:34 +0900
Subject: [PATCH 03989/10326] Add more xmldoc

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 52a1b4679b..f65570a3d5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -117,6 +117,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             positionBindable.BindTo(HitObject.PositionBindable);
         }
 
+        /// <summary>
+        /// The completion progress of this spinner from 0..1 (clamped).
+        /// </summary>
         public float Progress => Math.Clamp(RotationTracker.CumulativeRotation / 360 / Spinner.SpinsRequired, 0, 1);
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)

From 41c0f7557ac2a3bcc46174d811ead37d432a17fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 12:56:30 +0900
Subject: [PATCH 03990/10326] Remove traceable spinner reference for now

---
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index f209b315af..977485ba66 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -57,9 +57,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     applySliderState(slider);
                     break;
 
-                case DrawableSpinner spinner:
-                    //todo: hide background
-                    break;
+                //todo: hide spinner background somehow
             }
         }
 

From ec0d7760afeca015e7ed8ce488a27bedcb6cc20f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 13:06:53 +0900
Subject: [PATCH 03991/10326] Move todo?

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index 977485ba66..d7582f3196 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -43,6 +43,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             var h = drawableOsu.HitObject;
 
+            //todo: expose and hide spinner background somehow
+
             switch (drawable)
             {
                 case DrawableHitCircle circle:
@@ -56,8 +58,6 @@ namespace osu.Game.Rulesets.Osu.Mods
                     slider.Body.OnSkinChanged += () => applySliderState(slider);
                     applySliderState(slider);
                     break;
-
-                //todo: hide spinner background somehow
             }
         }
 

From 6473bf503b91bdc6d8b8acb474530e7125862152 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 30 Jul 2020 07:09:40 +0300
Subject: [PATCH 03992/10326] Remove use of `case when`

---
 osu.Game/Skinning/LegacySkin.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 5843cde94d..d98f8aba83 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -133,8 +133,14 @@ namespace osu.Game.Skinning
 
                     break;
 
-                case LegacySkinConfiguration.LegacySetting s when s == LegacySkinConfiguration.LegacySetting.Version:
-                    return SkinUtils.As<TValue>(new Bindable<decimal>(Configuration.LegacyVersion ?? LegacySkinConfiguration.LATEST_VERSION));
+                case LegacySkinConfiguration.LegacySetting legacy:
+                    switch (legacy)
+                    {
+                        case LegacySkinConfiguration.LegacySetting.Version:
+                            return SkinUtils.As<TValue>(new Bindable<decimal>(Configuration.LegacyVersion ?? LegacySkinConfiguration.LATEST_VERSION));
+                    }
+
+                    goto default;
 
                 default:
                     // handles lookups like some in LegacySkinConfiguration.LegacySetting

From e5991d6e1487cd3f9a3596494fc732a0f36a5155 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 13:49:04 +0900
Subject: [PATCH 03993/10326] Change method structure for hover/unhover state
 setting (shouldn't be called "Fade")

---
 osu.Game/Graphics/UserInterface/ShowMoreButton.cs   | 13 ++++++-------
 .../Comments/Buttons/CommentRepliesButton.cs        |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
index f4ab53d305..924c7913f3 100644
--- a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
@@ -98,16 +98,16 @@ namespace osu.Game.Graphics.UserInterface
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
-            leftIcon.FadeHoverColour();
-            rightIcon.FadeHoverColour();
+            leftIcon.SetHoveredState(true);
+            rightIcon.SetHoveredState(true);
             return true;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
-            leftIcon.FadeIdleColour();
-            rightIcon.FadeIdleColour();
+            leftIcon.SetHoveredState(false);
+            rightIcon.SetHoveredState(false);
         }
 
         public class ChevronIcon : SpriteIcon
@@ -127,9 +127,8 @@ namespace osu.Game.Graphics.UserInterface
                 Colour = colourProvider.Foreground1;
             }
 
-            public void FadeHoverColour() => this.FadeColour(colourProvider.Light1, 200, Easing.OutQuint);
-
-            public void FadeIdleColour() => this.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
+            public void SetHoveredState(bool hovered) =>
+                this.FadeColour(hovered ? colourProvider.Light1 : colourProvider.Foreground1, 200, Easing.OutQuint);
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index 202f3ddd7b..57bf2af4d2 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         {
             base.OnHover(e);
             background.FadeColour(colourProvider.Background1, 200, Easing.OutQuint);
-            icon.FadeHoverColour();
+            icon.SetHoveredState(true);
             return true;
         }
 
@@ -104,7 +104,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         {
             base.OnHoverLost(e);
             background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint);
-            icon.FadeIdleColour();
+            icon.SetHoveredState(false);
         }
     }
 }

From 7071f9a3af6fd281cf76c5aacef45959df5c3e87 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 14:24:21 +0900
Subject: [PATCH 03994/10326] 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 7e6f1469f5..61314bdc10 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.723.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.729.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5ac54a853f..d6aeca1f53 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.723.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.729.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 8b2d1346be..9b8d70ab6d 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.Framework.iOS" Version="2020.723.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.729.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.723.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.729.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From d8bb52800fe5e351dd730cd2d37f707b1a447c3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 14:31:05 +0900
Subject: [PATCH 03995/10326] Update framework again (github deploy failed)

---
 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 61314bdc10..0d951f58e6 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.729.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.730.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d6aeca1f53..92e7080fed 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.729.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.730.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 9b8d70ab6d..973c1d5b89 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.Framework.iOS" Version="2020.729.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.730.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.729.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.730.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1dfd2112c60d2f468a74675f383b4125334d11cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 15:32:08 +0900
Subject: [PATCH 03996/10326] Source hash from osu.Game.dll rather than
 executable

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 964a7fdd35..278f2d849f 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -134,13 +134,8 @@ namespace osu.Game
         [BackgroundDependencyLoader]
         private void load()
         {
-            var assembly = Assembly.GetEntryAssembly();
-
-            if (assembly != null)
-            {
-                using (var str = File.OpenRead(assembly.Location))
-                    VersionHash = str.ComputeMD5Hash();
-            }
+            using (var str = File.OpenRead(typeof(OsuGameBase).Assembly.Location))
+                VersionHash = str.ComputeMD5Hash();
 
             Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly));
 

From cf697cc276e7aa466d068566b4250009291efdd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 15:32:40 +0900
Subject: [PATCH 03997/10326] Update framework again (fix audio component
 disposal issue)

---
 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 0d951f58e6..0ac766926c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.730.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.730.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 92e7080fed..1ececa448c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.730.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.730.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 973c1d5b89..ef5ba10d17 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.Framework.iOS" Version="2020.730.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.730.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.730.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.730.1" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 6b9102b2a43665b82c92bcb3a3a643e8d23acce9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 17:58:49 +0900
Subject: [PATCH 03998/10326] Add osu!catch banana catching sounds

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs     | 21 +++++++++++++++++++
 .../Objects/BananaShower.cs                   | 12 ++++++++---
 .../Objects/Drawables/DrawableBanana.cs       |  7 +++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index 0b3d1d23e0..4ecfb7b16d 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.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 osu.Game.Audio;
 using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Judgements;
 
@@ -8,8 +10,27 @@ namespace osu.Game.Rulesets.Catch.Objects
 {
     public class Banana : Fruit
     {
+        /// <summary>
+        /// Index of banana in current shower.
+        /// </summary>
+        public int BananaIndex;
+
         public override FruitVisualRepresentation VisualRepresentation => FruitVisualRepresentation.Banana;
 
         public override Judgement CreateJudgement() => new CatchBananaJudgement();
+
+        private static readonly List<HitSampleInfo> samples = new List<HitSampleInfo> { new BananaHitSampleInfo() };
+
+        public Banana()
+        {
+            Samples = samples;
+        }
+
+        private class BananaHitSampleInfo : HitSampleInfo
+        {
+            private static string[] lookupNames { get; } = { "metronomelow", "catch-banana" };
+
+            public override IEnumerable<string> LookupNames => lookupNames;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index 04a995c77e..89c51459a6 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -30,15 +30,21 @@ namespace osu.Game.Rulesets.Catch.Objects
             if (spacing <= 0)
                 return;
 
-            for (double i = StartTime; i <= EndTime; i += spacing)
+            double time = StartTime;
+            int i = 0;
+
+            while (time <= EndTime)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
                 AddNested(new Banana
                 {
-                    Samples = Samples,
-                    StartTime = i
+                    StartTime = time,
+                    BananaIndex = i,
                 });
+
+                time += spacing;
+                i++;
             }
         }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index 01b76ceed9..a865984d45 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -40,6 +40,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             float getRandomAngle() => 180 * (RNG.NextSingle() * 2 - 1);
         }
 
+        public override void PlaySamples()
+        {
+            base.PlaySamples();
+            if (Samples != null)
+                Samples.Frequency.Value = 0.77f + ((Banana)HitObject).BananaIndex * 0.006f;
+        }
+
         private Color4 getBananaColour()
         {
             switch (RNG.Next(0, 3))

From 38a4bdf068c7b727e046a5b6d6119d6b3339f51b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 19:34:59 +0900
Subject: [PATCH 03999/10326] Add spinner spin sample support

---
 .../Objects/Drawables/DrawableSpinner.cs      | 62 ++++++++++++++++++-
 .../Pieces/SpinnerRotationTracker.cs          |  9 ++-
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index f65570a3d5..68516bedf8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -70,6 +70,58 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             };
         }
 
+        private Bindable<bool> isSpinning;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            isSpinning = RotationTracker.IsSpinning.GetBoundCopy();
+            isSpinning.BindValueChanged(updateSpinningSample);
+        }
+
+        private SkinnableSound spinningSample;
+
+        private const float minimum_volume = 0.0001f;
+
+        protected override void LoadSamples()
+        {
+            base.LoadSamples();
+
+            spinningSample?.Expire();
+            spinningSample = null;
+
+            var firstSample = HitObject.Samples.FirstOrDefault();
+
+            if (firstSample != null)
+            {
+                var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
+                clone.Name = "spinnerspin";
+
+                AddInternal(spinningSample = new SkinnableSound(clone)
+                {
+                    Volume = { Value = minimum_volume },
+                    Looping = true,
+                });
+            }
+        }
+
+        private void updateSpinningSample(ValueChangedEvent<bool> tracking)
+        {
+            // note that samples will not start playing if exiting a seek operation in the middle of a spinner.
+            // may be something we want to address at a later point, but not so easy to make happen right now
+            // (SkinnableSound would need to expose whether the sample is already playing and this logic would need to run in Update).
+            if (tracking.NewValue && ShouldPlaySamples)
+            {
+                spinningSample?.Play();
+                spinningSample?.VolumeTo(1, 200);
+            }
+            else
+            {
+                spinningSample?.VolumeTo(minimum_volume, 200).Finally(_ => spinningSample.Stop());
+            }
+        }
+
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
         {
             base.AddNestedHitObject(hitObject);
@@ -88,6 +140,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             using (BeginDelayedSequence(Spinner.Duration, true))
                 this.FadeOut(160);
+
+            // skin change does a rewind of transforms, which will stop the spinning sound from playing if it's currently in playback.
+            isSpinning?.TriggerChange();
         }
 
         protected override void ClearNestedHitObjects()
@@ -151,8 +206,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void Update()
         {
             base.Update();
+
             if (HandleUserInput)
-                RotationTracker.Tracking = OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false;
+                RotationTracker.Tracking = !Result.HasResult && (OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
+
+            if (spinningSample != null)
+                // todo: implement SpinnerFrequencyModulate
+                spinningSample.Frequency.Value = 0.5f + Progress;
         }
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
index 968c2a6df5..0cc6c842f4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
@@ -43,6 +43,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         /// </example>
         public float CumulativeRotation { get; private set; }
 
+        /// <summary>
+        /// Whether the spinning is spinning at a reasonable speed to be considered visually spinning.
+        /// </summary>
+        public readonly BindableBool IsSpinning = new BindableBool();
+
         /// <summary>
         /// Whether currently in the correct time range to allow spinning.
         /// </summary>
@@ -73,7 +78,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             lastAngle = thisAngle;
 
-            Rotation = (float)Interpolation.Lerp(Rotation, currentRotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
+            IsSpinning.Value = isSpinnableTime && Math.Abs(currentRotation / 2 - Rotation) > 5f;
+
+            Rotation = (float)Interpolation.Damp(Rotation, currentRotation / 2, 0.99, Math.Abs(Time.Elapsed));
         }
 
         /// <summary>

From 23ab6f8f946739bb788cc480f894b57611e78647 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Jul 2020 21:10:13 +0900
Subject: [PATCH 04000/10326] Fix dynamic compilation loading wrong ruleset
 versions

---
 osu.Game/Rulesets/RulesetStore.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 58a2ba056e..837796287a 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -65,11 +65,15 @@ namespace osu.Game.Rulesets
             // the requesting assembly may be located out of the executable's base directory, thus requiring manual resolving of its dependencies.
             // this attempts resolving the ruleset dependencies on game core and framework assemblies by returning assemblies with the same assembly name
             // already loaded in the AppDomain.
-            foreach (var curAsm in AppDomain.CurrentDomain.GetAssemblies())
-            {
-                if (asm.Name.Equals(curAsm.GetName().Name, StringComparison.Ordinal))
-                    return curAsm;
-            }
+            var domainAssembly = AppDomain.CurrentDomain.GetAssemblies()
+                                          // Given name is always going to be equally-or-more qualified than the assembly name.
+                                          .Where(a => args.Name.Contains(a.GetName().Name, StringComparison.Ordinal))
+                                          // Pick the greatest assembly version.
+                                          .OrderBy(a => a.GetName().Version)
+                                          .LastOrDefault();
+
+            if (domainAssembly != null)
+                return domainAssembly;
 
             return loadedAssemblies.Keys.FirstOrDefault(a => a.FullName == asm.FullName);
         }

From 5af45bcdcc008b8bc61d3919037b6cd150532893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Jul 2020 20:10:41 +0200
Subject: [PATCH 04001/10326] Expand tests to cover non-bank sample lookups

---
 osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index 737946e1e0..a70b08a0d3 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -67,9 +67,11 @@ namespace osu.Game.Tests.Gameplay
         /// Tests that a hitobject which provides a custom sample set of 2 retrieves the following samples from the beatmap skin:
         /// normal-hitnormal2
         /// normal-hitnormal
+        /// hitnormal
         /// </summary>
         [TestCase("normal-hitnormal2")]
         [TestCase("normal-hitnormal")]
+        [TestCase("hitnormal")]
         public void TestDefaultCustomSampleFromBeatmap(string expectedSample)
         {
             SetupSkins(expectedSample, expectedSample);
@@ -83,9 +85,11 @@ namespace osu.Game.Tests.Gameplay
         /// Tests that a hitobject which provides a custom sample set of 2 retrieves the following samples from the user skin when the beatmap does not contain the sample:
         /// normal-hitnormal2
         /// normal-hitnormal
+        /// hitnormal
         /// </summary>
         [TestCase("normal-hitnormal2")]
         [TestCase("normal-hitnormal")]
+        [TestCase("hitnormal")]
         public void TestDefaultCustomSampleFromUserSkinFallback(string expectedSample)
         {
             SetupSkins(string.Empty, expectedSample);
@@ -145,6 +149,7 @@ namespace osu.Game.Tests.Gameplay
         /// </summary>
         [TestCase("normal-hitnormal2")]
         [TestCase("normal-hitnormal")]
+        [TestCase("hitnormal")]
         public void TestControlPointCustomSampleFromBeatmap(string sampleName)
         {
             SetupSkins(sampleName, sampleName);

From 566c5310bf954c1b7b5b71dceb63d4a904d81162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Jul 2020 21:34:57 +0200
Subject: [PATCH 04002/10326] Add test coverage for taiko sample lookups

---
 ...o-hitobject-beatmap-custom-sample-bank.osu | 10 ++++
 .../TestSceneTaikoHitObjectSamples.cs         | 52 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/SampleLookups/taiko-hitobject-beatmap-custom-sample-bank.osu
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectSamples.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/SampleLookups/taiko-hitobject-beatmap-custom-sample-bank.osu b/osu.Game.Rulesets.Taiko.Tests/Resources/SampleLookups/taiko-hitobject-beatmap-custom-sample-bank.osu
new file mode 100644
index 0000000000..f9755782c2
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/Resources/SampleLookups/taiko-hitobject-beatmap-custom-sample-bank.osu
@@ -0,0 +1,10 @@
+osu file format v14
+
+[General]
+Mode: 1
+
+[TimingPoints]
+0,300,4,1,2,100,1,0
+
+[HitObjects]
+444,320,1000,5,0,0:0:0:0:
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectSamples.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectSamples.cs
new file mode 100644
index 0000000000..7089ea6619
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectSamples.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.Reflection;
+using NUnit.Framework;
+using osu.Framework.IO.Stores;
+using osu.Game.Tests.Beatmaps;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneTaikoHitObjectSamples : HitObjectSampleTest
+    {
+        protected override Ruleset CreatePlayerRuleset() => new TaikoRuleset();
+
+        protected override IResourceStore<byte[]> Resources => new DllResourceStore(Assembly.GetAssembly(typeof(TestSceneTaikoHitObjectSamples)));
+
+        [TestCase("taiko-normal-hitnormal")]
+        [TestCase("normal-hitnormal")]
+        [TestCase("hitnormal")]
+        public void TestDefaultCustomSampleFromBeatmap(string expectedSample)
+        {
+            SetupSkins(expectedSample, expectedSample);
+
+            CreateTestWithBeatmap("taiko-hitobject-beatmap-custom-sample-bank.osu");
+
+            AssertBeatmapLookup(expectedSample);
+        }
+
+        [TestCase("taiko-normal-hitnormal")]
+        [TestCase("normal-hitnormal")]
+        [TestCase("hitnormal")]
+        public void TestDefaultCustomSampleFromUserSkinFallback(string expectedSample)
+        {
+            SetupSkins(string.Empty, expectedSample);
+
+            CreateTestWithBeatmap("taiko-hitobject-beatmap-custom-sample-bank.osu");
+
+            AssertUserLookup(expectedSample);
+        }
+
+        [TestCase("taiko-normal-hitnormal2")]
+        [TestCase("normal-hitnormal2")]
+        public void TestUserSkinLookupIgnoresSampleBank(string unwantedSample)
+        {
+            SetupSkins(string.Empty, unwantedSample);
+
+            CreateTestWithBeatmap("taiko-hitobject-beatmap-custom-sample-bank.osu");
+
+            AssertNoLookup(unwantedSample);
+        }
+    }
+}

From 2df5fafea0ed7a537eb51e2a830f851702f90dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Jul 2020 21:39:45 +0200
Subject: [PATCH 04003/10326] Add failing test case

---
 .../Gameplay/TestSceneHitObjectSamples.cs     | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index a70b08a0d3..c3acc2ebe7 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -82,12 +82,11 @@ namespace osu.Game.Tests.Gameplay
         }
 
         /// <summary>
-        /// Tests that a hitobject which provides a custom sample set of 2 retrieves the following samples from the user skin when the beatmap does not contain the sample:
-        /// normal-hitnormal2
+        /// Tests that a hitobject which provides a custom sample set of 2 retrieves the following samples from the user skin
+        /// (ignoring the custom sample set index) when the beatmap skin does not contain the sample:
         /// normal-hitnormal
         /// hitnormal
         /// </summary>
-        [TestCase("normal-hitnormal2")]
         [TestCase("normal-hitnormal")]
         [TestCase("hitnormal")]
         public void TestDefaultCustomSampleFromUserSkinFallback(string expectedSample)
@@ -99,6 +98,23 @@ namespace osu.Game.Tests.Gameplay
             AssertUserLookup(expectedSample);
         }
 
+        /// <summary>
+        /// Tests that a hitobject which provides a custom sample set of 2 does not retrieve a normal-hitnormal2 sample from the user skin
+        /// if the beatmap skin does not contain the sample.
+        /// User skins in stable ignore the custom sample set index when performing lookups.
+        /// </summary>
+        [Test]
+        public void TestUserSkinLookupIgnoresSampleBank()
+        {
+            const string unwanted_sample = "normal-hitnormal2";
+
+            SetupSkins(string.Empty, unwanted_sample);
+
+            CreateTestWithBeatmap("hitobject-beatmap-custom-sample.osu");
+
+            AssertNoLookup(unwanted_sample);
+        }
+
         /// <summary>
         /// Tests that a hitobject which provides a sample file retrieves the sample file from the beatmap skin.
         /// </summary>
@@ -183,7 +199,7 @@ namespace osu.Game.Tests.Gameplay
             string[] expectedSamples =
             {
                 "normal-hitnormal2",
-                "normal-hitwhistle2"
+                "normal-hitwhistle" // user skin lookups ignore custom sample set index
             };
 
             SetupSkins(expectedSamples[0], expectedSamples[1]);

From 2bb436fd3c6dd6a6d172c462ed264ae8bc963faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 28 Jul 2020 23:52:09 +0200
Subject: [PATCH 04004/10326] Do not use custom sample banks outside of beatmap
 skin

---
 osu.Game/Skinning/LegacyBeatmapSkin.cs |  1 +
 osu.Game/Skinning/LegacySkin.cs        | 26 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 87bca856a3..d647bc4a2d 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Skinning
     public class LegacyBeatmapSkin : LegacySkin
     {
         protected override bool AllowManiaSkin => false;
+        protected override bool UseCustomSampleBanks => true;
 
         public LegacyBeatmapSkin(BeatmapInfo beatmap, IResourceStore<byte[]> storage, AudioManager audioManager)
             : base(createSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), audioManager, beatmap.Path)
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 3bbeff9918..187d601812 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -38,6 +38,12 @@ namespace osu.Game.Skinning
 
         protected virtual bool AllowManiaSkin => hasKeyTexture.Value;
 
+        /// <summary>
+        /// Whether this skin can use samples with a custom bank (custom sample set in stable terminology).
+        /// Added in order to match sample lookup logic from stable (in stable, only the beatmap skin could use samples with a custom sample bank).
+        /// </summary>
+        protected virtual bool UseCustomSampleBanks => false;
+
         public new LegacySkinConfiguration Configuration
         {
             get => base.Configuration as LegacySkinConfiguration;
@@ -337,7 +343,12 @@ namespace osu.Game.Skinning
 
         public override SampleChannel GetSample(ISampleInfo sampleInfo)
         {
-            foreach (var lookup in sampleInfo.LookupNames)
+            var lookupNames = sampleInfo.LookupNames;
+
+            if (sampleInfo is HitSampleInfo hitSample)
+                lookupNames = getLegacyLookupNames(hitSample);
+
+            foreach (var lookup in lookupNames)
             {
                 var sample = Samples?.Get(lookup);
 
@@ -361,5 +372,18 @@ namespace osu.Game.Skinning
             string lastPiece = componentName.Split('/').Last();
             yield return componentName.StartsWith("Gameplay/taiko/") ? "taiko-" + lastPiece : lastPiece;
         }
+
+        private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
+        {
+            var lookupNames = hitSample.LookupNames;
+
+            if (!UseCustomSampleBanks && !string.IsNullOrEmpty(hitSample.Suffix))
+                // for compatibility with stable, exclude the lookup names with the custom sample bank suffix, if they are not valid for use in this skin.
+                // using .EndsWith() is intentional as it ensures parity in all edge cases
+                // (see LegacyTaikoSampleInfo for an example of one - prioritising the taiko prefix should still apply, but the sample bank should not).
+                lookupNames = hitSample.LookupNames.Where(name => !name.EndsWith(hitSample.Suffix));
+
+            return lookupNames;
+        }
     }
 }

From 971eafde2b05e51231208eff01f326664f6a7a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Jul 2020 22:07:07 +0200
Subject: [PATCH 04005/10326] Move fallback to non-bank samples to centralise
 hackery

---
 osu.Game/Skinning/LegacySkin.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 187d601812..fc04383a64 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -356,10 +356,6 @@ namespace osu.Game.Skinning
                     return sample;
             }
 
-            if (sampleInfo is HitSampleInfo hsi)
-                // Try fallback to non-bank samples.
-                return Samples?.Get(hsi.Name);
-
             return null;
         }
 
@@ -383,6 +379,11 @@ namespace osu.Game.Skinning
                 // (see LegacyTaikoSampleInfo for an example of one - prioritising the taiko prefix should still apply, but the sample bank should not).
                 lookupNames = hitSample.LookupNames.Where(name => !name.EndsWith(hitSample.Suffix));
 
+            // also for compatibility, try falling back to non-bank samples (so-called "universal" samples) as the last resort.
+            // going forward specifying banks shall always be required, even for elements that wouldn't require it on stable,
+            // which is why this is done locally here.
+            lookupNames = lookupNames.Append(hitSample.Name);
+
             return lookupNames;
         }
     }

From 8e49256a5c28bac5d93d765c2efc4833e62bc165 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jul 2020 09:03:29 +0900
Subject: [PATCH 04006/10326] Rename and split up statement to make more
 legible

---
 .../Drawables/Pieces/DefaultSpinnerDisc.cs     | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 2644f425a0..7f65a8c022 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -29,7 +29,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private SpinnerTicks ticks;
 
-        private int completeTick;
+        private int wholeRotationCount;
+
         private SpinnerFill fill;
         private Container mainContainer;
         private SpinnerCentreLayer centre;
@@ -145,13 +146,24 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             centre.FadeAccent(colour, duration);
         }
 
-        private bool updateCompleteTick() => completeTick != (completeTick = (int)(drawableSpinner.RotationTracker.CumulativeRotation / 360));
+        private bool checkNewRotationCount
+        {
+            get
+            {
+                int rotations = (int)(drawableSpinner.RotationTracker.CumulativeRotation / 360);
+
+                if (wholeRotationCount == rotations) return false;
+
+                wholeRotationCount = rotations;
+                return true;
+            }
+        }
 
         protected override void Update()
         {
             base.Update();
 
-            if (drawableSpinner.RotationTracker.Complete.Value && updateCompleteTick())
+            if (drawableSpinner.RotationTracker.Complete.Value && checkNewRotationCount)
             {
                 fill.FinishTransforms(false, nameof(Alpha));
                 fill

From cd570433f4aa1779d7bed92aac36e5fd368b6546 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jul 2020 09:04:20 +0900
Subject: [PATCH 04007/10326] Move private methods to bottom of class

---
 .../Drawables/Pieces/DefaultSpinnerDisc.cs    | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 7f65a8c022..81dea8d1c1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -96,6 +96,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             drawableSpinner.State.BindValueChanged(updateStateTransforms, true);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (drawableSpinner.RotationTracker.Complete.Value && checkNewRotationCount)
+            {
+                fill.FinishTransforms(false, nameof(Alpha));
+                fill
+                    .FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
+                    .Then()
+                    .FadeTo(tracking_alpha, 250, Easing.OutQuint);
+            }
+
+            const float initial_scale = 0.2f;
+            float targetScale = initial_scale + (1 - initial_scale) * drawableSpinner.Progress;
+
+            fill.Scale = new Vector2((float)Interpolation.Lerp(fill.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
+            mainContainer.Rotation = drawableSpinner.RotationTracker.Rotation;
+        }
+
         private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
         {
             centre.ScaleTo(0);
@@ -159,24 +179,5 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            if (drawableSpinner.RotationTracker.Complete.Value && checkNewRotationCount)
-            {
-                fill.FinishTransforms(false, nameof(Alpha));
-                fill
-                    .FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
-                    .Then()
-                    .FadeTo(tracking_alpha, 250, Easing.OutQuint);
-            }
-
-            const float initial_scale = 0.2f;
-            float targetScale = initial_scale + (1 - initial_scale) * drawableSpinner.Progress;
-
-            fill.Scale = new Vector2((float)Interpolation.Lerp(fill.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
-            mainContainer.Rotation = drawableSpinner.RotationTracker.Rotation;
-        }
     }
 }

From 86784e30ad4cea26f205370fc5c2781ce9802e6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jul 2020 09:54:30 +0900
Subject: [PATCH 04008/10326] Fix spacing

---
 .../Objects/Drawables/Pieces/DefaultSpinnerDisc.cs               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 81dea8d1c1..79bfeedd07 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -178,6 +178,5 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 return true;
             }
         }
-
     }
 }

From fb74195d83be6b7361740e3584732a52c8795622 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jul 2020 10:43:54 +0900
Subject: [PATCH 04009/10326] Move InputManager implementation to base
 skinnable test scene class

---
 .../OsuSkinnableTestScene.cs                      | 15 +++++++++++++++
 osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs    | 14 --------------
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs   |  2 --
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
index a0a38fc47b..cad98185ce 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
@@ -1,12 +1,27 @@
 // Copyright (c) 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.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     public abstract class OsuSkinnableTestScene : SkinnableTestScene
     {
+        private Container content;
+
+        protected override Container<Drawable> Content
+        {
+            get
+            {
+                if (content == null)
+                    base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
+
+                return content;
+            }
+        }
+
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index a9404f665a..6a689a1f80 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -26,19 +25,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneSlider : OsuSkinnableTestScene
     {
-        private Container content;
-
-        protected override Container<Drawable> Content
-        {
-            get
-            {
-                if (content == null)
-                    base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
-
-                return content;
-            }
-        }
-
         private int depthIndex;
 
         public TestSceneSlider()
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 65b338882e..b57561f3e1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -19,8 +19,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         public TestSceneSpinner()
         {
-            //            base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
-
             AddStep("Miss Big", () => SetContents(() => testSingle(2)));
             AddStep("Miss Medium", () => SetContents(() => testSingle(5)));
             AddStep("Miss Small", () => SetContents(() => testSingle(7)));

From 6452d62249f1252034fd7c8d85c3929e692c1336 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jul 2020 12:52:03 +0900
Subject: [PATCH 04010/10326] 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 0ac766926c..13b4b6ebbb 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.727.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.730.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1ececa448c..745555e0e2 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.730.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ef5ba10d17..f1080f0c8b 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.730.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 186b452331437ba41ef07d2559b1b28314d89933 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jul 2020 14:48:56 +0900
Subject: [PATCH 04011/10326] Apply common multiplication refactor

---
 osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 618cb0e9ad..72bc3ddc9a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -93,8 +93,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             spinningMiddle.Rotation = discTop.Rotation = drawableSpinner.RotationTracker.Rotation;
             discBottom.Rotation = discTop.Rotation / 3;
 
-            Scale = new Vector2(final_scale * 0.8f
-                                + (float)Interpolation.ApplyEasing(Easing.Out, drawableSpinner.Progress) * (final_scale * 0.2f));
+            Scale = new Vector2(final_scale * (0.8f + (float)Interpolation.ApplyEasing(Easing.Out, drawableSpinner.Progress) * 0.2f));
         }
     }
 }

From 62ba214dad3d9cd99b760a1bed13e04ea78bd97a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jul 2020 16:21:47 +0900
Subject: [PATCH 04012/10326] Use OrderByDescending

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

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 837796287a..dd43092c0d 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -69,8 +69,8 @@ namespace osu.Game.Rulesets
                                           // Given name is always going to be equally-or-more qualified than the assembly name.
                                           .Where(a => args.Name.Contains(a.GetName().Name, StringComparison.Ordinal))
                                           // Pick the greatest assembly version.
-                                          .OrderBy(a => a.GetName().Version)
-                                          .LastOrDefault();
+                                          .OrderByDescending(a => a.GetName().Version)
+                                          .FirstOrDefault();
 
             if (domainAssembly != null)
                 return domainAssembly;

From 88e179d8aa684a1ef8b9971f74cad059f20e6ce3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 17:40:58 +0900
Subject: [PATCH 04013/10326] Split out index-only response

---
 .../TestSceneTimeshiftResultsScreen.cs        |  2 +-
 .../Multiplayer/IndexPlaylistScoresRequest.cs |  2 +-
 .../Multiplayer/IndexedMultiplayerScores.cs   | 27 +++++++++++++++++++
 .../Online/Multiplayer/MultiplayerScores.cs   | 12 ---------
 4 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/IndexedMultiplayerScores.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index 44ca676c4f..8b6d6694c3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                         void success()
                         {
-                            r.TriggerSuccess(new MultiplayerScores { Scores = roomScores });
+                            r.TriggerSuccess(new IndexedMultiplayerScores { Scores = roomScores });
                             roomsReceived = true;
                         }
 
diff --git a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
index 67793df344..91f24933e1 100644
--- a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Online.Multiplayer
     /// <summary>
     /// Returns a list of scores for the specified playlist item.
     /// </summary>
-    public class IndexPlaylistScoresRequest : APIRequest<MultiplayerScores>
+    public class IndexPlaylistScoresRequest : APIRequest<IndexedMultiplayerScores>
     {
         private readonly int roomId;
         private readonly int playlistItemId;
diff --git a/osu.Game/Online/Multiplayer/IndexedMultiplayerScores.cs b/osu.Game/Online/Multiplayer/IndexedMultiplayerScores.cs
new file mode 100644
index 0000000000..e237b7e3fb
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/IndexedMultiplayerScores.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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 Newtonsoft.Json;
+
+namespace osu.Game.Online.Multiplayer
+{
+    /// <summary>
+    /// A <see cref="MultiplayerScores"/> object returned via a <see cref="IndexPlaylistScoresRequest"/>.
+    /// </summary>
+    public class IndexedMultiplayerScores : MultiplayerScores
+    {
+        /// <summary>
+        /// The total scores in the playlist item.
+        /// </summary>
+        [JsonProperty("total")]
+        public int? TotalScores { get; set; }
+
+        /// <summary>
+        /// The user's score, if any.
+        /// </summary>
+        [JsonProperty("user_score")]
+        [CanBeNull]
+        public MultiplayerScore UserScore { get; set; }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/MultiplayerScores.cs b/osu.Game/Online/Multiplayer/MultiplayerScores.cs
index 2d0f98e032..8b8dd9e48d 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScores.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerScores.cs
@@ -18,18 +18,6 @@ namespace osu.Game.Online.Multiplayer
         [JsonProperty("scores")]
         public List<MultiplayerScore> Scores { get; set; }
 
-        /// <summary>
-        /// The total scores in the playlist item. Only provided via <see cref="IndexPlaylistScoresRequest"/>.
-        /// </summary>
-        [JsonProperty("total")]
-        public int? TotalScores { get; set; }
-
-        /// <summary>
-        /// The user's score, if any. Only provided via <see cref="IndexPlaylistScoresRequest"/>.
-        /// </summary>
-        [JsonProperty("user_score")]
-        public MultiplayerScore UserScore { get; set; }
-
         /// <summary>
         /// The parameters to be used to fetch the next page.
         /// </summary>

From eadef53e68cd1612f8bb0b0a6d7260f5631ad07f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 17:43:40 +0900
Subject: [PATCH 04014/10326] Add more annotations

---
 osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs b/osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs
index e83cc1b753..2ac62d0300 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerScoresAround.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 JetBrains.Annotations;
 using Newtonsoft.Json;
 
 namespace osu.Game.Online.Multiplayer
@@ -14,12 +15,14 @@ namespace osu.Game.Online.Multiplayer
         /// Scores sorted "higher" than the user's score, depending on the sorting order.
         /// </summary>
         [JsonProperty("higher")]
+        [CanBeNull]
         public MultiplayerScores Higher { get; set; }
 
         /// <summary>
         /// Scores sorted "lower" than the user's score, depending on the sorting order.
         /// </summary>
         [JsonProperty("lower")]
+        [CanBeNull]
         public MultiplayerScores Lower { get; set; }
     }
 }

From 6d728d27fc7d150c313ec442b810772f174995cf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 17:58:48 +0900
Subject: [PATCH 04015/10326] Cleanup/consolidate indexing request

---
 .../Multi/Ranking/TimeshiftResultsScreen.cs   | 52 +++++++++++--------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 648bee385c..0ef4953e83 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -75,21 +76,8 @@ namespace osu.Game.Screens.Multi.Ranking
                 performSuccessCallback(scoresCallback, allScores);
             };
 
-            userScoreReq.Failure += _ =>
-            {
-                // Fallback to a normal index.
-                var indexReq = new IndexPlaylistScoresRequest(roomId, playlistItem.ID);
-
-                indexReq.Success += r =>
-                {
-                    performSuccessCallback(scoresCallback, r.Scores);
-                    lowerScores = r;
-                };
-
-                indexReq.Failure += __ => loadingLayer.Hide();
-
-                api.Queue(indexReq);
-            };
+            // On failure, fallback to a normal index.
+            userScoreReq.Failure += _ => api.Queue(createIndexRequest(scoresCallback));
 
             return userScoreReq;
         }
@@ -103,16 +91,30 @@ namespace osu.Game.Screens.Multi.Ranking
             if (pivot?.Cursor == null)
                 return null;
 
-            var indexReq = new IndexPlaylistScoresRequest(roomId, playlistItem.ID, pivot.Cursor, pivot.Params);
+            return createIndexRequest(scoresCallback, pivot);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="IndexPlaylistScoresRequest"/> with an optional score pivot.
+        /// </summary>
+        /// <remarks>Does not queue the request.</remarks>
+        /// <param name="scoresCallback">The callback to perform with the resulting scores.</param>
+        /// <param name="pivot">An optional score pivot to retrieve scores around. Can be null to retrieve scores from the highest score.</param>
+        /// <returns>The indexing <see cref="APIRequest"/>.</returns>
+        private APIRequest createIndexRequest(Action<IEnumerable<ScoreInfo>> scoresCallback, [CanBeNull] MultiplayerScores pivot = null)
+        {
+            var indexReq = pivot != null
+                ? new IndexPlaylistScoresRequest(roomId, playlistItem.ID, pivot.Cursor, pivot.Params)
+                : new IndexPlaylistScoresRequest(roomId, playlistItem.ID);
 
             indexReq.Success += r =>
             {
-                if (direction == -1)
-                    higherScores = r;
-                else
+                if (pivot == lowerScores)
                     lowerScores = r;
+                else
+                    higherScores = r;
 
-                performSuccessCallback(scoresCallback, r.Scores);
+                performSuccessCallback(scoresCallback, r.Scores, pivot);
             };
 
             indexReq.Failure += _ => loadingLayer.Hide();
@@ -120,7 +122,13 @@ namespace osu.Game.Screens.Multi.Ranking
             return indexReq;
         }
 
-        private void performSuccessCallback(Action<IEnumerable<ScoreInfo>> callback, List<MultiplayerScore> scores)
+        /// <summary>
+        /// Transforms returned <see cref="MultiplayerScores"/> into <see cref="ScoreInfo"/>s, ensure the <see cref="ScorePanelList"/> is put into a sane state, and invokes a given success callback.
+        /// </summary>
+        /// <param name="callback">The callback to invoke with the final <see cref="ScoreInfo"/>s.</param>
+        /// <param name="scores">The <see cref="MultiplayerScore"/>s that were retrieved from <see cref="APIRequest"/>s.</param>
+        /// <param name="pivot">An optional pivot around which the scores were retrieved.</param>
+        private void performSuccessCallback([NotNull] Action<IEnumerable<ScoreInfo>> callback, [NotNull] List<MultiplayerScore> scores, [CanBeNull] MultiplayerScores pivot = null)
         {
             var scoreInfos = new List<ScoreInfo>(scores.Select(s => s.CreateScoreInfo(playlistItem)));
 
@@ -136,7 +144,7 @@ namespace osu.Game.Screens.Multi.Ranking
             }
 
             // Invoke callback to add the scores. Exclude the user's current score which was added previously.
-            callback?.Invoke(scoreInfos.Where(s => s.ID != Score?.OnlineScoreID));
+            callback.Invoke(scoreInfos.Where(s => s.ID != Score?.OnlineScoreID));
 
             loadingLayer.Hide();
         }

From 9966d4f3b3b5da3c364157ab38dbadd0343152ae Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 19:57:05 +0900
Subject: [PATCH 04016/10326] Add more loading spinners

---
 .../Multi/Ranking/TimeshiftResultsScreen.cs   | 81 ++++++++++++++++---
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 30 +++----
 osu.Game/Screens/Ranking/ScorePanelList.cs    | 10 +++
 3 files changed, 97 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 0ef4953e83..87de9fd72a 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -22,7 +22,9 @@ namespace osu.Game.Screens.Multi.Ranking
         private readonly int roomId;
         private readonly PlaylistItem playlistItem;
 
-        private LoadingSpinner loadingLayer;
+        private LoadingSpinner leftLoadingLayer;
+        private LoadingSpinner centreLoadingLayer;
+        private LoadingSpinner rightLoadingLayer;
         private MultiplayerScores higherScores;
         private MultiplayerScores lowerScores;
 
@@ -39,13 +41,29 @@ namespace osu.Game.Screens.Multi.Ranking
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(loadingLayer = new LoadingLayer
+            AddInternal(new Container
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                X = -10,
-                State = { Value = Score == null ? Visibility.Visible : Visibility.Hidden },
-                Padding = new MarginPadding { Bottom = TwoLayerButton.SIZE_EXTENDED.Y }
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding { Bottom = TwoLayerButton.SIZE_EXTENDED.Y },
+                Children = new Drawable[]
+                {
+                    leftLoadingLayer = new PanelListLoadingSpinner(ScorePanelList)
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.Centre,
+                    },
+                    centreLoadingLayer = new PanelListLoadingSpinner(ScorePanelList)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        State = { Value = Score == null ? Visibility.Visible : Visibility.Hidden },
+                    },
+                    rightLoadingLayer = new PanelListLoadingSpinner(ScorePanelList)
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.Centre,
+                    },
+                }
             });
         }
 
@@ -91,6 +109,11 @@ namespace osu.Game.Screens.Multi.Ranking
             if (pivot?.Cursor == null)
                 return null;
 
+            if (pivot == higherScores)
+                leftLoadingLayer.Show();
+            else
+                rightLoadingLayer.Show();
+
             return createIndexRequest(scoresCallback, pivot);
         }
 
@@ -114,10 +137,10 @@ namespace osu.Game.Screens.Multi.Ranking
                 else
                     higherScores = r;
 
-                performSuccessCallback(scoresCallback, r.Scores, pivot);
+                performSuccessCallback(scoresCallback, r.Scores, r);
             };
 
-            indexReq.Failure += _ => loadingLayer.Hide();
+            indexReq.Failure += _ => hideLoadingSpinners(pivot);
 
             return indexReq;
         }
@@ -146,7 +169,45 @@ namespace osu.Game.Screens.Multi.Ranking
             // Invoke callback to add the scores. Exclude the user's current score which was added previously.
             callback.Invoke(scoreInfos.Where(s => s.ID != Score?.OnlineScoreID));
 
-            loadingLayer.Hide();
+            hideLoadingSpinners(pivot);
+        }
+
+        private void hideLoadingSpinners([CanBeNull] MultiplayerScores pivot = null)
+        {
+            centreLoadingLayer.Hide();
+
+            if (pivot == lowerScores)
+                rightLoadingLayer.Hide();
+            else if (pivot == higherScores)
+                leftLoadingLayer.Hide();
+        }
+
+        private class PanelListLoadingSpinner : LoadingSpinner
+        {
+            private readonly ScorePanelList list;
+
+            /// <summary>
+            /// Creates a new <see cref="PanelListLoadingSpinner"/>.
+            /// </summary>
+            /// <param name="list">The list to track.</param>
+            /// <param name="withBox">Whether the spinner should have a surrounding black box for visibility.</param>
+            public PanelListLoadingSpinner(ScorePanelList list, bool withBox = true)
+                : base(withBox)
+            {
+                this.list = list;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                float panelOffset = list.DrawWidth / 2 - ScorePanel.EXPANDED_WIDTH;
+
+                if ((Anchor & Anchor.x0) > 0)
+                    X = (float)(panelOffset - list.Current);
+                else if ((Anchor & Anchor.x2) > 0)
+                    X = (float)(list.ScrollableExtent - list.Current - panelOffset);
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 254ab76f5b..2506a63cc0 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -37,7 +37,8 @@ namespace osu.Game.Screens.Ranking
         public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
 
         public readonly ScoreInfo Score;
-        private readonly bool allowRetry;
+
+        protected ScorePanelList ScorePanelList { get; private set; }
 
         [Resolved(CanBeNull = true)]
         private Player player { get; set; }
@@ -47,12 +48,13 @@ namespace osu.Game.Screens.Ranking
 
         private StatisticsPanel statisticsPanel;
         private Drawable bottomPanel;
-        private ScorePanelList scorePanelList;
         private Container<ScorePanel> detachedPanelContainer;
 
         private bool fetchedInitialScores;
         private APIRequest nextPageRequest;
 
+        private readonly bool allowRetry;
+
         protected ResultsScreen(ScoreInfo score, bool allowRetry = true)
         {
             Score = score;
@@ -87,7 +89,7 @@ namespace osu.Game.Screens.Ranking
                                         RelativeSizeAxes = Axes.Both,
                                         Score = { BindTarget = SelectedScore }
                                     },
-                                    scorePanelList = new ScorePanelList
+                                    ScorePanelList = new ScorePanelList
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         SelectedScore = { BindTarget = SelectedScore },
@@ -145,7 +147,7 @@ namespace osu.Game.Screens.Ranking
             };
 
             if (Score != null)
-                scorePanelList.AddScore(Score);
+                ScorePanelList.AddScore(Score);
 
             if (player != null && allowRetry)
             {
@@ -181,9 +183,9 @@ namespace osu.Game.Screens.Ranking
 
             if (fetchedInitialScores && nextPageRequest == null)
             {
-                if (scorePanelList.IsScrolledToStart)
+                if (ScorePanelList.IsScrolledToStart)
                     nextPageRequest = FetchNextPage(-1, fetchScoresCallback);
-                else if (scorePanelList.IsScrolledToEnd)
+                else if (ScorePanelList.IsScrolledToEnd)
                     nextPageRequest = FetchNextPage(1, fetchScoresCallback);
 
                 if (nextPageRequest != null)
@@ -249,7 +251,7 @@ namespace osu.Game.Screens.Ranking
 
         private void addScore(ScoreInfo score)
         {
-            var panel = scorePanelList.AddScore(score);
+            var panel = ScorePanelList.AddScore(score);
 
             if (detachedPanel != null)
                 panel.Alpha = 0;
@@ -262,11 +264,11 @@ namespace osu.Game.Screens.Ranking
             if (state.NewValue == Visibility.Visible)
             {
                 // Detach the panel in its original location, and move into the desired location in the local container.
-                var expandedPanel = scorePanelList.GetPanelForScore(SelectedScore.Value);
+                var expandedPanel = ScorePanelList.GetPanelForScore(SelectedScore.Value);
                 var screenSpacePos = expandedPanel.ScreenSpaceDrawQuad.TopLeft;
 
                 // Detach and move into the local container.
-                scorePanelList.Detach(expandedPanel);
+                ScorePanelList.Detach(expandedPanel);
                 detachedPanelContainer.Add(expandedPanel);
 
                 // Move into its original location in the local container first, then to the final location.
@@ -276,9 +278,9 @@ namespace osu.Game.Screens.Ranking
                              .MoveTo(new Vector2(StatisticsPanel.SIDE_PADDING, origLocation.Y), 150, Easing.OutQuint);
 
                 // Hide contracted panels.
-                foreach (var contracted in scorePanelList.GetScorePanels().Where(p => p.State == PanelState.Contracted))
+                foreach (var contracted in ScorePanelList.GetScorePanels().Where(p => p.State == PanelState.Contracted))
                     contracted.FadeOut(150, Easing.OutQuint);
-                scorePanelList.HandleInput = false;
+                ScorePanelList.HandleInput = false;
 
                 // Dim background.
                 Background.FadeTo(0.1f, 150);
@@ -291,7 +293,7 @@ namespace osu.Game.Screens.Ranking
 
                 // Remove from the local container and re-attach.
                 detachedPanelContainer.Remove(detachedPanel);
-                scorePanelList.Attach(detachedPanel);
+                ScorePanelList.Attach(detachedPanel);
 
                 // Move into its original location in the attached container first, then to the final location.
                 var origLocation = detachedPanel.Parent.ToLocalSpace(screenSpacePos);
@@ -300,9 +302,9 @@ namespace osu.Game.Screens.Ranking
                              .MoveTo(new Vector2(0, origLocation.Y), 150, Easing.OutQuint);
 
                 // Show contracted panels.
-                foreach (var contracted in scorePanelList.GetScorePanels().Where(p => p.State == PanelState.Contracted))
+                foreach (var contracted in ScorePanelList.GetScorePanels().Where(p => p.State == PanelState.Contracted))
                     contracted.FadeIn(150, Easing.OutQuint);
-                scorePanelList.HandleInput = true;
+                ScorePanelList.HandleInput = true;
 
                 // Un-dim background.
                 Background.FadeTo(0.5f, 150);
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index b2e1e91831..10bd99c8ce 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -41,6 +41,16 @@ namespace osu.Game.Screens.Ranking
         /// </summary>
         public bool IsScrolledToEnd => flow.Count > 0 && scroll.ScrollableExtent > 0 && scroll.IsScrolledToEnd(scroll_endpoint_distance);
 
+        /// <summary>
+        /// The current scroll position.
+        /// </summary>
+        public double Current => scroll.Current;
+
+        /// <summary>
+        /// The scrollable extent.
+        /// </summary>
+        public double ScrollableExtent => scroll.ScrollableExtent;
+
         /// <summary>
         /// An action to be invoked if a <see cref="ScorePanel"/> is clicked while in an expanded state.
         /// </summary>

From 4d2a677080beaed2a64c6ece28c663cf4d9f3aff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jul 2020 20:33:18 +0900
Subject: [PATCH 04017/10326] Fix next track starting before previous one is
 paused

Closes #9651.
---
 osu.Game/Overlays/MusicController.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 546f7a1ec4..212d4d4850 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -262,7 +262,11 @@ namespace osu.Game.Overlays
             {
                 if (beatmap is Bindable<WorkingBeatmap> working)
                     working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
-                beatmap.Value.Track.Restart();
+
+                // if not scheduled, the previously track will be stopped one frame later (see ScheduleAfterChildren logic in GameBase).
+                // we probably want to move this to a central method for switching to a new working beatmap in the future.
+                Schedule(() => beatmap.Value.Track.Restart());
+
                 return true;
             }
 

From 8e8a11bb72f558c0fb8144390bdab7e5d928ea73 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 20:55:26 +0900
Subject: [PATCH 04018/10326] Add APIRequest.TriggerFailure() for testing

---
 osu.Game/Online/API/APIRequest.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 2115326cc2..6912d9b629 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -136,6 +136,11 @@ namespace osu.Game.Online.API
             Success?.Invoke();
         }
 
+        internal void TriggerFailure(Exception e)
+        {
+            Failure?.Invoke(e);
+        }
+
         public void Cancel() => Fail(new OperationCanceledException(@"Request cancelled"));
 
         public void Fail(Exception e)
@@ -166,7 +171,7 @@ namespace osu.Game.Online.API
             }
 
             Logger.Log($@"Failing request {this} ({e})", LoggingTarget.Network);
-            pendingFailure = () => Failure?.Invoke(e);
+            pendingFailure = () => TriggerFailure(e);
             checkAndScheduleFailure();
         }
 

From 2b77f99f56af81771980d77e8e5e57f02ff60f59 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 20:55:44 +0900
Subject: [PATCH 04019/10326] Initialise some response parameters

---
 osu.Game/Online/API/Requests/Cursor.cs           | 2 +-
 osu.Game/Online/Multiplayer/IndexScoresParams.cs | 2 +-
 osu.Game/Online/Multiplayer/MultiplayerScores.cs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Cursor.cs b/osu.Game/Online/API/Requests/Cursor.cs
index f21445ca32..3de8db770c 100644
--- a/osu.Game/Online/API/Requests/Cursor.cs
+++ b/osu.Game/Online/API/Requests/Cursor.cs
@@ -15,6 +15,6 @@ namespace osu.Game.Online.API.Requests
     {
         [UsedImplicitly]
         [JsonExtensionData]
-        public IDictionary<string, JToken> Properties;
+        public IDictionary<string, JToken> Properties { get; set; } = new Dictionary<string, JToken>();
     }
 }
diff --git a/osu.Game/Online/Multiplayer/IndexScoresParams.cs b/osu.Game/Online/Multiplayer/IndexScoresParams.cs
index 8160dfefaf..a511e9a780 100644
--- a/osu.Game/Online/Multiplayer/IndexScoresParams.cs
+++ b/osu.Game/Online/Multiplayer/IndexScoresParams.cs
@@ -15,6 +15,6 @@ namespace osu.Game.Online.Multiplayer
     {
         [UsedImplicitly]
         [JsonExtensionData]
-        public IDictionary<string, JToken> Properties;
+        public IDictionary<string, JToken> Properties { get; set; } = new Dictionary<string, JToken>();
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerScores.cs b/osu.Game/Online/Multiplayer/MultiplayerScores.cs
index 8b8dd9e48d..7b9dcff828 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScores.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerScores.cs
@@ -16,12 +16,12 @@ namespace osu.Game.Online.Multiplayer
         /// The scores.
         /// </summary>
         [JsonProperty("scores")]
-        public List<MultiplayerScore> Scores { get; set; }
+        public List<MultiplayerScore> Scores { get; set; } = new List<MultiplayerScore>();
 
         /// <summary>
         /// The parameters to be used to fetch the next page.
         /// </summary>
         [JsonProperty("params")]
-        public IndexScoresParams Params { get; set; }
+        public IndexScoresParams Params { get; set; } = new IndexScoresParams();
     }
 }

From a4a4c8761241eabdf82a35fe02686aa5453c1d6e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 21:21:48 +0900
Subject: [PATCH 04020/10326] Fix incorrect score id being used

---
 osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 87de9fd72a..b0cf63a7a9 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -167,7 +167,7 @@ namespace osu.Game.Screens.Multi.Ranking
             }
 
             // Invoke callback to add the scores. Exclude the user's current score which was added previously.
-            callback.Invoke(scoreInfos.Where(s => s.ID != Score?.OnlineScoreID));
+            callback.Invoke(scoreInfos.Where(s => s.OnlineScoreID != Score?.OnlineScoreID));
 
             hideLoadingSpinners(pivot);
         }

From 17018ffa8b616fe8da85c7acce17ad3744c9c018 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 21:33:04 +0900
Subject: [PATCH 04021/10326] Fix potentially triggering new requests too early

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 2506a63cc0..c95cf1066e 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -190,8 +190,9 @@ namespace osu.Game.Screens.Ranking
 
                 if (nextPageRequest != null)
                 {
-                    nextPageRequest.Success += () => nextPageRequest = null;
-                    nextPageRequest.Failure += _ => nextPageRequest = null;
+                    // Scheduled after children to give the list a chance to update its scroll position and not potentially trigger a second request too early.
+                    nextPageRequest.Success += () => ScheduleAfterChildren(() => nextPageRequest = null);
+                    nextPageRequest.Failure += _ => ScheduleAfterChildren(() => nextPageRequest = null);
 
                     api.Queue(nextPageRequest);
                 }

From f1e721e396988d5410b32fa3402b612f59dca23d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 21:39:50 +0900
Subject: [PATCH 04022/10326] Rewrite test scene and add more tests

---
 .../TestSceneTimeshiftResultsScreen.cs        | 344 +++++++++++++++---
 .../Multiplayer/IndexPlaylistScoresRequest.cs |  31 +-
 .../Multi/Ranking/TimeshiftResultsScreen.cs   |  23 +-
 3 files changed, 329 insertions(+), 69 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index 8b6d6694c3..628d08a314 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -3,14 +3,24 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Net;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Newtonsoft.Json.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Ranking;
+using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 
@@ -18,43 +28,134 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneTimeshiftResultsScreen : ScreenTestScene
     {
-        private bool roomsReceived;
+        private const int scores_per_result = 10;
+
+        private TestResultsScreen resultsScreen;
+        private int currentScoreId;
+        private bool requestComplete;
 
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            roomsReceived = false;
+            currentScoreId = 0;
+            requestComplete = false;
             bindHandler();
         });
 
         [Test]
-        public void TestShowResultsWithScore()
+        public void TestShowWithUserScore()
         {
-            createResults(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-            AddWaitStep("wait for display", 5);
+            ScoreInfo userScore = null;
+
+            AddStep("bind user score info handler", () =>
+            {
+                userScore = new TestScoreInfo(new OsuRuleset().RulesetInfo) { OnlineScoreID = currentScoreId++ };
+                bindHandler(userScore: userScore);
+            });
+
+            createResults(() => userScore);
+            waitForDisplay();
+
+            AddAssert("user score selected", () => this.ChildrenOfType<ScorePanel>().Single(p => p.Score.OnlineScoreID == userScore.OnlineScoreID).State == PanelState.Expanded);
         }
 
         [Test]
-        public void TestShowResultsNullScore()
+        public void TestShowNullUserScore()
         {
-            createResults(null);
-            AddWaitStep("wait for display", 5);
+            createResults();
+            waitForDisplay();
+
+            AddAssert("top score selected", () => this.ChildrenOfType<ScorePanel>().OrderByDescending(p => p.Score.TotalScore).First().State == PanelState.Expanded);
         }
 
         [Test]
-        public void TestShowResultsNullScoreWithDelay()
+        public void TestShowUserScoreWithDelay()
+        {
+            ScoreInfo userScore = null;
+
+            AddStep("bind user score info handler", () =>
+            {
+                userScore = new TestScoreInfo(new OsuRuleset().RulesetInfo) { OnlineScoreID = currentScoreId++ };
+                bindHandler(3000, userScore);
+            });
+
+            createResults(() => userScore);
+            waitForDisplay();
+
+            AddAssert("more than 1 panel displayed", () => this.ChildrenOfType<ScorePanel>().Count() > 1);
+            AddAssert("user score selected", () => this.ChildrenOfType<ScorePanel>().Single(p => p.Score.OnlineScoreID == userScore.OnlineScoreID).State == PanelState.Expanded);
+        }
+
+        [Test]
+        public void TestShowNullUserScoreWithDelay()
         {
             AddStep("bind delayed handler", () => bindHandler(3000));
-            createResults(null);
-            AddUntilStep("wait for rooms to be received", () => roomsReceived);
-            AddWaitStep("wait for display", 5);
+
+            createResults();
+            waitForDisplay();
+
+            AddAssert("top score selected", () => this.ChildrenOfType<ScorePanel>().OrderByDescending(p => p.Score.TotalScore).First().State == PanelState.Expanded);
         }
 
-        private void createResults(ScoreInfo score)
+        [Test]
+        public void TestFetchWhenScrolledToTheRight()
+        {
+            createResults();
+            waitForDisplay();
+
+            AddStep("bind delayed handler", () => bindHandler(3000));
+
+            for (int i = 0; i < 2; i++)
+            {
+                int beforePanelCount = 0;
+
+                AddStep("get panel count", () => beforePanelCount = this.ChildrenOfType<ScorePanel>().Count());
+                AddStep("scroll to right", () => resultsScreen.ScorePanelList.ChildrenOfType<OsuScrollContainer>().Single().ScrollToEnd(false));
+
+                AddAssert("right loading spinner shown", () => resultsScreen.RightSpinner.State.Value == Visibility.Visible);
+                waitForDisplay();
+
+                AddAssert($"count increased by {scores_per_result}", () => this.ChildrenOfType<ScorePanel>().Count() == beforePanelCount + scores_per_result);
+                AddAssert("right loading spinner hidden", () => resultsScreen.RightSpinner.State.Value == Visibility.Hidden);
+            }
+        }
+
+        [Test]
+        public void TestFetchWhenScrolledToTheLeft()
+        {
+            ScoreInfo userScore = null;
+
+            AddStep("bind user score info handler", () =>
+            {
+                userScore = new TestScoreInfo(new OsuRuleset().RulesetInfo) { OnlineScoreID = currentScoreId++ };
+                bindHandler(userScore: userScore);
+            });
+
+            createResults(() => userScore);
+            waitForDisplay();
+
+            AddStep("bind delayed handler", () => bindHandler(3000));
+
+            for (int i = 0; i < 2; i++)
+            {
+                int beforePanelCount = 0;
+
+                AddStep("get panel count", () => beforePanelCount = this.ChildrenOfType<ScorePanel>().Count());
+                AddStep("scroll to left", () => resultsScreen.ScorePanelList.ChildrenOfType<OsuScrollContainer>().Single().ScrollToStart(false));
+
+                AddAssert("left loading spinner shown", () => resultsScreen.LeftSpinner.State.Value == Visibility.Visible);
+                waitForDisplay();
+
+                AddAssert($"count increased by {scores_per_result}", () => this.ChildrenOfType<ScorePanel>().Count() == beforePanelCount + scores_per_result);
+                AddAssert("left loading spinner hidden", () => resultsScreen.LeftSpinner.State.Value == Visibility.Hidden);
+            }
+        }
+
+        private void createResults(Func<ScoreInfo> getScore = null)
         {
             AddStep("load results", () =>
             {
-                LoadScreen(new TimeshiftResultsScreen(score, 1, new PlaylistItem
+                LoadScreen(resultsScreen = new TestResultsScreen(getScore?.Invoke(), 1, new PlaylistItem
                 {
                     Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
                     Ruleset = { Value = new OsuRuleset().RulesetInfo }
@@ -62,62 +163,213 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
         }
 
-        private void bindHandler(double delay = 0)
+        private void waitForDisplay()
         {
-            var roomScores = new List<MultiplayerScore>();
+            AddUntilStep("wait for request to complete", () => requestComplete);
+            AddWaitStep("wait for display", 5);
+        }
 
-            for (int i = 0; i < 10; i++)
+        private void bindHandler(double delay = 0, ScoreInfo userScore = null, bool failRequests = false) => ((DummyAPIAccess)API).HandleRequest = request =>
+        {
+            requestComplete = false;
+
+            if (failRequests)
             {
-                roomScores.Add(new MultiplayerScore
+                triggerFail(request, delay);
+                return;
+            }
+
+            switch (request)
+            {
+                case ShowPlaylistUserScoreRequest s:
+                    if (userScore == null)
+                        triggerFail(s, delay);
+                    else
+                        triggerSuccess(s, createUserResponse(userScore), delay);
+                    break;
+
+                case IndexPlaylistScoresRequest i:
+                    triggerSuccess(i, createIndexResponse(i), delay);
+                    break;
+            }
+        };
+
+        private void triggerSuccess<T>(APIRequest<T> req, T result, double delay)
+            where T : class
+        {
+            if (delay == 0)
+                success();
+            else
+            {
+                Task.Run(async () =>
                 {
-                    ID = i,
-                    Accuracy = 0.9 - 0.01 * i,
-                    EndedAt = DateTimeOffset.Now.Subtract(TimeSpan.FromHours(i)),
+                    await Task.Delay(TimeSpan.FromMilliseconds(delay));
+                    Schedule(success);
+                });
+            }
+
+            void success()
+            {
+                requestComplete = true;
+                req.TriggerSuccess(result);
+            }
+        }
+
+        private void triggerFail(APIRequest req, double delay)
+        {
+            if (delay == 0)
+                fail();
+            else
+            {
+                Task.Run(async () =>
+                {
+                    await Task.Delay(TimeSpan.FromMilliseconds(delay));
+                    Schedule(fail);
+                });
+            }
+
+            void fail()
+            {
+                requestComplete = true;
+                req.TriggerFailure(new WebException("Failed."));
+            }
+        }
+
+        private MultiplayerScore createUserResponse([NotNull] ScoreInfo userScore)
+        {
+            var multiplayerUserScore = new MultiplayerScore
+            {
+                ID = (int)(userScore.OnlineScoreID ?? currentScoreId++),
+                Accuracy = userScore.Accuracy,
+                EndedAt = userScore.Date,
+                Passed = userScore.Passed,
+                Rank = userScore.Rank,
+                MaxCombo = userScore.MaxCombo,
+                TotalScore = userScore.TotalScore,
+                User = userScore.User,
+                Statistics = userScore.Statistics,
+                ScoresAround = new MultiplayerScoresAround
+                {
+                    Higher = new MultiplayerScores(),
+                    Lower = new MultiplayerScores()
+                }
+            };
+
+            for (int i = 1; i <= scores_per_result; i++)
+            {
+                multiplayerUserScore.ScoresAround.Lower.Scores.Add(new MultiplayerScore
+                {
+                    ID = currentScoreId++,
+                    Accuracy = userScore.Accuracy,
+                    EndedAt = userScore.Date,
                     Passed = true,
-                    Rank = ScoreRank.B,
-                    MaxCombo = 999,
-                    TotalScore = 999999 - i * 1000,
+                    Rank = userScore.Rank,
+                    MaxCombo = userScore.MaxCombo,
+                    TotalScore = userScore.TotalScore - i,
                     User = new User
                     {
                         Id = 2,
                         Username = $"peppy{i}",
                         CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     },
-                    Statistics =
+                    Statistics = userScore.Statistics
+                });
+
+                multiplayerUserScore.ScoresAround.Higher.Scores.Add(new MultiplayerScore
+                {
+                    ID = currentScoreId++,
+                    Accuracy = userScore.Accuracy,
+                    EndedAt = userScore.Date,
+                    Passed = true,
+                    Rank = userScore.Rank,
+                    MaxCombo = userScore.MaxCombo,
+                    TotalScore = userScore.TotalScore + i,
+                    User = new User
+                    {
+                        Id = 2,
+                        Username = $"peppy{i}",
+                        CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                    },
+                    Statistics = userScore.Statistics
+                });
+            }
+
+            addCursor(multiplayerUserScore.ScoresAround.Lower);
+            addCursor(multiplayerUserScore.ScoresAround.Higher);
+
+            return multiplayerUserScore;
+        }
+
+        private IndexedMultiplayerScores createIndexResponse(IndexPlaylistScoresRequest req)
+        {
+            var result = new IndexedMultiplayerScores();
+
+            long startTotalScore = req.Cursor?.Properties["total_score"].ToObject<long>() ?? 1000000;
+            string sort = req.IndexParams?.Properties["sort"].ToObject<string>() ?? "score_desc";
+
+            for (int i = 1; i <= scores_per_result; i++)
+            {
+                result.Scores.Add(new MultiplayerScore
+                {
+                    ID = currentScoreId++,
+                    Accuracy = 1,
+                    EndedAt = DateTimeOffset.Now,
+                    Passed = true,
+                    Rank = ScoreRank.X,
+                    MaxCombo = 1000,
+                    TotalScore = startTotalScore + (sort == "score_asc" ? i : -i),
+                    User = new User
+                    {
+                        Id = 2,
+                        Username = $"peppy{i}",
+                        CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                    },
+                    Statistics = new Dictionary<HitResult, int>
                     {
                         { HitResult.Miss, 1 },
                         { HitResult.Meh, 50 },
                         { HitResult.Good, 100 },
-                        { HitResult.Great, 300 },
+                        { HitResult.Great, 300 }
                     }
                 });
             }
 
-            ((DummyAPIAccess)API).HandleRequest = request =>
+            addCursor(result);
+
+            return result;
+        }
+
+        private void addCursor(MultiplayerScores scores)
+        {
+            scores.Cursor = new Cursor
             {
-                switch (request)
+                Properties = new Dictionary<string, JToken>
                 {
-                    case IndexPlaylistScoresRequest r:
-                        if (delay == 0)
-                            success();
-                        else
-                        {
-                            Task.Run(async () =>
-                            {
-                                await Task.Delay(TimeSpan.FromMilliseconds(delay));
-                                Schedule(success);
-                            });
-                        }
+                    { "total_score", JToken.FromObject(scores.Scores[^1].TotalScore) },
+                    { "score_id", JToken.FromObject(scores.Scores[^1].ID) },
+                }
+            };
 
-                        void success()
-                        {
-                            r.TriggerSuccess(new IndexedMultiplayerScores { Scores = roomScores });
-                            roomsReceived = true;
-                        }
-
-                        break;
+            scores.Params = new IndexScoresParams
+            {
+                Properties = new Dictionary<string, JToken>
+                {
+                    { "sort", JToken.FromObject(scores.Scores[^1].TotalScore > scores.Scores[^2].TotalScore ? "score_asc" : "score_desc") }
                 }
             };
         }
+
+        private class TestResultsScreen : TimeshiftResultsScreen
+        {
+            public new LoadingSpinner LeftSpinner => base.LeftSpinner;
+            public new LoadingSpinner CentreSpinner => base.CentreSpinner;
+            public new LoadingSpinner RightSpinner => base.RightSpinner;
+            public new ScorePanelList ScorePanelList => base.ScorePanelList;
+
+            public TestResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry = true)
+                : base(score, roomId, playlistItem, allowRetry)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
index 91f24933e1..684d0aecd8 100644
--- a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.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 JetBrains.Annotations;
 using osu.Framework.IO.Network;
 using osu.Game.Extensions;
@@ -14,39 +15,45 @@ namespace osu.Game.Online.Multiplayer
     /// </summary>
     public class IndexPlaylistScoresRequest : APIRequest<IndexedMultiplayerScores>
     {
-        private readonly int roomId;
-        private readonly int playlistItemId;
-        private readonly Cursor cursor;
-        private readonly IndexScoresParams indexParams;
+        public readonly int RoomId;
+        public readonly int PlaylistItemId;
+
+        [CanBeNull]
+        public readonly Cursor Cursor;
+
+        [CanBeNull]
+        public readonly IndexScoresParams IndexParams;
 
         public IndexPlaylistScoresRequest(int roomId, int playlistItemId)
         {
-            this.roomId = roomId;
-            this.playlistItemId = playlistItemId;
+            RoomId = roomId;
+            PlaylistItemId = playlistItemId;
         }
 
         public IndexPlaylistScoresRequest(int roomId, int playlistItemId, [NotNull] Cursor cursor, [NotNull] IndexScoresParams indexParams)
             : this(roomId, playlistItemId)
         {
-            this.cursor = cursor;
-            this.indexParams = indexParams;
+            Cursor = cursor;
+            IndexParams = indexParams;
         }
 
         protected override WebRequest CreateWebRequest()
         {
             var req = base.CreateWebRequest();
 
-            if (cursor != null)
+            if (Cursor != null)
             {
-                req.AddCursor(cursor);
+                Debug.Assert(IndexParams != null);
 
-                foreach (var (key, value) in indexParams.Properties)
+                req.AddCursor(Cursor);
+
+                foreach (var (key, value) in IndexParams.Properties)
                     req.AddParameter(key, value.ToString());
             }
 
             return req;
         }
 
-        protected override string Target => $@"rooms/{roomId}/playlist/{playlistItemId}/scores";
+        protected override string Target => $@"rooms/{RoomId}/playlist/{PlaylistItemId}/scores";
     }
 }
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index b0cf63a7a9..e212bd4a82 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -22,9 +22,10 @@ namespace osu.Game.Screens.Multi.Ranking
         private readonly int roomId;
         private readonly PlaylistItem playlistItem;
 
-        private LoadingSpinner leftLoadingLayer;
-        private LoadingSpinner centreLoadingLayer;
-        private LoadingSpinner rightLoadingLayer;
+        protected LoadingSpinner LeftSpinner { get; private set; }
+        protected LoadingSpinner CentreSpinner { get; private set; }
+        protected LoadingSpinner RightSpinner { get; private set; }
+
         private MultiplayerScores higherScores;
         private MultiplayerScores lowerScores;
 
@@ -47,18 +48,18 @@ namespace osu.Game.Screens.Multi.Ranking
                 Padding = new MarginPadding { Bottom = TwoLayerButton.SIZE_EXTENDED.Y },
                 Children = new Drawable[]
                 {
-                    leftLoadingLayer = new PanelListLoadingSpinner(ScorePanelList)
+                    LeftSpinner = new PanelListLoadingSpinner(ScorePanelList)
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.Centre,
                     },
-                    centreLoadingLayer = new PanelListLoadingSpinner(ScorePanelList)
+                    CentreSpinner = new PanelListLoadingSpinner(ScorePanelList)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         State = { Value = Score == null ? Visibility.Visible : Visibility.Hidden },
                     },
-                    rightLoadingLayer = new PanelListLoadingSpinner(ScorePanelList)
+                    RightSpinner = new PanelListLoadingSpinner(ScorePanelList)
                     {
                         Anchor = Anchor.CentreRight,
                         Origin = Anchor.Centre,
@@ -110,9 +111,9 @@ namespace osu.Game.Screens.Multi.Ranking
                 return null;
 
             if (pivot == higherScores)
-                leftLoadingLayer.Show();
+                LeftSpinner.Show();
             else
-                rightLoadingLayer.Show();
+                RightSpinner.Show();
 
             return createIndexRequest(scoresCallback, pivot);
         }
@@ -174,12 +175,12 @@ namespace osu.Game.Screens.Multi.Ranking
 
         private void hideLoadingSpinners([CanBeNull] MultiplayerScores pivot = null)
         {
-            centreLoadingLayer.Hide();
+            CentreSpinner.Hide();
 
             if (pivot == lowerScores)
-                rightLoadingLayer.Hide();
+                RightSpinner.Hide();
             else if (pivot == higherScores)
-                leftLoadingLayer.Hide();
+                LeftSpinner.Hide();
         }
 
         private class PanelListLoadingSpinner : LoadingSpinner

From e8f75a78e8ce4d820d72d05efacc6cec70f51264 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jul 2020 22:02:12 +0900
Subject: [PATCH 04023/10326] Also fix second instance of same execution

---
 osu.Game/Overlays/MusicController.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 212d4d4850..a990f9a6ab 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -236,8 +236,8 @@ namespace osu.Game.Overlays
             {
                 if (beatmap is Bindable<WorkingBeatmap> working)
                     working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
-                beatmap.Value.Track.Restart();
 
+                restartTrack();
                 return PreviousTrackResult.Previous;
             }
 
@@ -263,16 +263,20 @@ namespace osu.Game.Overlays
                 if (beatmap is Bindable<WorkingBeatmap> working)
                     working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
 
-                // if not scheduled, the previously track will be stopped one frame later (see ScheduleAfterChildren logic in GameBase).
-                // we probably want to move this to a central method for switching to a new working beatmap in the future.
-                Schedule(() => beatmap.Value.Track.Restart());
-
+                restartTrack();
                 return true;
             }
 
             return false;
         }
 
+        private void restartTrack()
+        {
+            // if not scheduled, the previously track will be stopped one frame later (see ScheduleAfterChildren logic in GameBase).
+            // we probably want to move this to a central method for switching to a new working beatmap in the future.
+            Schedule(() => beatmap.Value.Track.Restart());
+        }
+
         private WorkingBeatmap current;
 
         private TrackChangeDirection? queuedDirection;

From b361761d869950fd802df2ae551e6819037233da Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jul 2020 22:08:10 +0900
Subject: [PATCH 04024/10326] Add position display in contracted score panels

---
 .../Online/Multiplayer/MultiplayerScore.cs    |  3 +-
 osu.Game/Scoring/ScoreInfo.cs                 |  7 ++++
 .../Contracted/ContractedPanelTopContent.cs   | 37 +++++++++++++++++++
 osu.Game/Screens/Ranking/ScorePanel.cs        |  1 +
 osu.Game/Tests/TestScoreInfo.cs               |  2 +
 5 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Ranking/Contracted/ContractedPanelTopContent.cs

diff --git a/osu.Game/Online/Multiplayer/MultiplayerScore.cs b/osu.Game/Online/Multiplayer/MultiplayerScore.cs
index 1793ba72ef..8191003aad 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScore.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerScore.cs
@@ -80,7 +80,8 @@ namespace osu.Game.Online.Multiplayer
                 Date = EndedAt,
                 Hash = string.Empty, // todo: temporary?
                 Rank = Rank,
-                Mods = Mods?.Select(m => m.ToMod(rulesetInstance)).ToArray() ?? Array.Empty<Mod>()
+                Mods = Mods?.Select(m => m.ToMod(rulesetInstance)).ToArray() ?? Array.Empty<Mod>(),
+                Position = Position,
             };
 
             return scoreInfo;
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 84c0d5b54e..efcf1737c9 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -179,6 +179,13 @@ namespace osu.Game.Scoring
         [JsonIgnore]
         public bool DeletePending { get; set; }
 
+        /// <summary>
+        /// The position of this score, starting at 1.
+        /// </summary>
+        [NotMapped]
+        [JsonProperty("position")]
+        public int? Position { get; set; }
+
         [Serializable]
         protected class DeserializedMod : IMod
         {
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelTopContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelTopContent.cs
new file mode 100644
index 0000000000..0935ee7fb2
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelTopContent.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Ranking.Contracted
+{
+    public class ContractedPanelTopContent : CompositeDrawable
+    {
+        private readonly ScoreInfo score;
+
+        public ContractedPanelTopContent(ScoreInfo score)
+        {
+            this.score = score;
+
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new OsuSpriteText
+            {
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                Y = 6,
+                Text = score.Position != null ? $"#{score.Position}" : string.Empty,
+                Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold)
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 5da432d5b2..b32da805e4 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -213,6 +213,7 @@ namespace osu.Game.Screens.Ranking
                     topLayerBackground.FadeColour(contracted_top_layer_colour, resize_duration, Easing.OutQuint);
                     middleLayerBackground.FadeColour(contracted_middle_layer_colour, resize_duration, Easing.OutQuint);
 
+                    topLayerContentContainer.Add(middleLayerContent = new ContractedPanelTopContent(Score).With(d => d.Alpha = 0));
                     middleLayerContentContainer.Add(topLayerContent = new ContractedPanelMiddleContent(Score).With(d => d.Alpha = 0));
                     break;
             }
diff --git a/osu.Game/Tests/TestScoreInfo.cs b/osu.Game/Tests/TestScoreInfo.cs
index 1193a29d70..31cced6ce4 100644
--- a/osu.Game/Tests/TestScoreInfo.cs
+++ b/osu.Game/Tests/TestScoreInfo.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Tests
             Statistics[HitResult.Meh] = 50;
             Statistics[HitResult.Good] = 100;
             Statistics[HitResult.Great] = 300;
+
+            Position = 1;
         }
 
         private class TestModHardRock : ModHardRock

From 4f3795486d34f0db6e97a04b53ba23d5e1be8048 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 22:36:37 +0900
Subject: [PATCH 04025/10326] Post-process responses to populate positions

---
 .../TestSceneTimeshiftResultsScreen.cs        |  1 +
 .../Multi/Ranking/TimeshiftResultsScreen.cs   | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index 628d08a314..03fd2b968c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -244,6 +244,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 EndedAt = userScore.Date,
                 Passed = userScore.Passed,
                 Rank = userScore.Rank,
+                Position = 200,
                 MaxCombo = userScore.MaxCombo,
                 TotalScore = userScore.TotalScore,
                 User = userScore.User,
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index e212bd4a82..232f368fb3 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -84,12 +84,18 @@ namespace osu.Game.Screens.Multi.Ranking
                 {
                     allScores.AddRange(userScore.ScoresAround.Higher.Scores);
                     higherScores = userScore.ScoresAround.Higher;
+
+                    Debug.Assert(userScore.Position != null);
+                    setPositions(higherScores, userScore.Position.Value, -1);
                 }
 
                 if (userScore.ScoresAround?.Lower != null)
                 {
                     allScores.AddRange(userScore.ScoresAround.Lower.Scores);
                     lowerScores = userScore.ScoresAround.Lower;
+
+                    Debug.Assert(userScore.Position != null);
+                    setPositions(lowerScores, userScore.Position.Value, 1);
                 }
 
                 performSuccessCallback(scoresCallback, allScores);
@@ -134,9 +140,15 @@ namespace osu.Game.Screens.Multi.Ranking
             indexReq.Success += r =>
             {
                 if (pivot == lowerScores)
+                {
                     lowerScores = r;
+                    setPositions(r, pivot, 1);
+                }
                 else
+                {
                     higherScores = r;
+                    setPositions(r, pivot, -1);
+                }
 
                 performSuccessCallback(scoresCallback, r.Scores, r);
             };
@@ -183,6 +195,30 @@ namespace osu.Game.Screens.Multi.Ranking
                 LeftSpinner.Hide();
         }
 
+        /// <summary>
+        /// Applies positions to all <see cref="MultiplayerScore"/>s from a given pivot.
+        /// </summary>
+        /// <param name="scores">The <see cref="MultiplayerScores"/> to set positions on.</param>
+        /// <param name="pivot">The pivot.</param>
+        /// <param name="increment">The amount to increment the pivot position by for each <see cref="MultiplayerScore"/> in <paramref name="scores"/>.</param>
+        private void setPositions([NotNull] MultiplayerScores scores, [CanBeNull] MultiplayerScores pivot, int increment)
+            => setPositions(scores, pivot?.Scores[^1].Position ?? 0, increment);
+
+        /// <summary>
+        /// Applies positions to all <see cref="MultiplayerScore"/>s from a given pivot.
+        /// </summary>
+        /// <param name="scores">The <see cref="MultiplayerScores"/> to set positions on.</param>
+        /// <param name="pivotPosition">The pivot position.</param>
+        /// <param name="increment">The amount to increment the pivot position by for each <see cref="MultiplayerScore"/> in <paramref name="scores"/>.</param>
+        private void setPositions([NotNull] MultiplayerScores scores, int pivotPosition, int increment)
+        {
+            foreach (var s in scores.Scores)
+            {
+                pivotPosition += increment;
+                s.Position = pivotPosition;
+            }
+        }
+
         private class PanelListLoadingSpinner : LoadingSpinner
         {
             private readonly ScorePanelList list;

From 308f8bf9bf1b5eb7a929d8f1a19c0746d908bbed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 23:11:42 +0900
Subject: [PATCH 04026/10326] Fix inverted naming

---
 osu.Game/Screens/Ranking/ScorePanel.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index ae55f6e0ae..1904da7094 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -203,8 +203,8 @@ namespace osu.Game.Screens.Ranking
                     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));
+                    topLayerContentContainer.Add(topLayerContent = new ExpandedPanelTopContent(Score.User).With(d => d.Alpha = 0));
+                    middleLayerContentContainer.Add(middleLayerContent = new ExpandedPanelMiddleContent(Score).With(d => d.Alpha = 0));
                     break;
 
                 case PanelState.Contracted:
@@ -213,8 +213,8 @@ namespace osu.Game.Screens.Ranking
                     topLayerBackground.FadeColour(contracted_top_layer_colour, resize_duration, Easing.OutQuint);
                     middleLayerBackground.FadeColour(contracted_middle_layer_colour, resize_duration, Easing.OutQuint);
 
-                    topLayerContentContainer.Add(middleLayerContent = new ContractedPanelTopContent(Score).With(d => d.Alpha = 0));
-                    middleLayerContentContainer.Add(topLayerContent = new ContractedPanelMiddleContent(Score).With(d => d.Alpha = 0));
+                    topLayerContentContainer.Add(topLayerContent = new ContractedPanelTopContent(Score).With(d => d.Alpha = 0));
+                    middleLayerContentContainer.Add(middleLayerContent = new ContractedPanelMiddleContent(Score).With(d => d.Alpha = 0));
                     break;
             }
 

From 04b71a0c7c3fb0420dccfb645944d4687dd4588d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 31 Jul 2020 23:16:55 +0900
Subject: [PATCH 04027/10326] Adjust xmldoc

---
 osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 232f368fb3..8da6a530a8 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Screens.Multi.Ranking
         }
 
         /// <summary>
-        /// Applies positions to all <see cref="MultiplayerScore"/>s from a given pivot.
+        /// Applies positions to all <see cref="MultiplayerScore"/>s referenced to a given pivot.
         /// </summary>
         /// <param name="scores">The <see cref="MultiplayerScores"/> to set positions on.</param>
         /// <param name="pivot">The pivot.</param>
@@ -205,7 +205,7 @@ namespace osu.Game.Screens.Multi.Ranking
             => setPositions(scores, pivot?.Scores[^1].Position ?? 0, increment);
 
         /// <summary>
-        /// Applies positions to all <see cref="MultiplayerScore"/>s from a given pivot.
+        /// Applies positions to all <see cref="MultiplayerScore"/>s referenced to a given pivot.
         /// </summary>
         /// <param name="scores">The <see cref="MultiplayerScores"/> to set positions on.</param>
         /// <param name="pivotPosition">The pivot position.</param>

From 9e244be4890aacc1ff0c1534fcd860817e507eae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 Aug 2020 00:05:04 +0900
Subject: [PATCH 04028/10326] Use better conditional for choosing which spinner
 type to use

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 44f431d6f7..81d1d05b66 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -104,9 +104,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         };
 
                 case OsuSkinComponents.SpinnerBody:
-                    if (Source.GetTexture("spinner-top") != null)
+                    bool hasBackground = Source.GetTexture("spinner-background") != null;
+
+                    if (Source.GetTexture("spinner-top") != null && !hasBackground)
                         return new LegacyNewStyleSpinner();
-                    else if (Source.GetTexture("spinner-background") != null)
+                    else if (hasBackground)
                         return new LegacyOldStyleSpinner();
 
                     return null;

From bb01ee5be953d6a241830f8a08e3a029298f9e25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 Aug 2020 00:27:00 +0900
Subject: [PATCH 04029/10326] Fix trackign alpha not being applied

---
 .../Drawables/Pieces/DefaultSpinnerDisc.cs    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 79bfeedd07..eba5d869c0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -100,13 +100,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             base.Update();
 
-            if (drawableSpinner.RotationTracker.Complete.Value && checkNewRotationCount)
+            if (drawableSpinner.RotationTracker.Complete.Value)
             {
-                fill.FinishTransforms(false, nameof(Alpha));
-                fill
-                    .FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
-                    .Then()
-                    .FadeTo(tracking_alpha, 250, Easing.OutQuint);
+                if (checkNewRotationCount)
+                {
+                    fill.FinishTransforms(false, nameof(Alpha));
+                    fill
+                        .FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
+                        .Then()
+                        .FadeTo(tracking_alpha, 250, Easing.OutQuint);
+                }
+            }
+            else
+            {
+                fill.Alpha = (float)Interpolation.Damp(fill.Alpha, drawableSpinner.RotationTracker.Tracking ? tracking_alpha : idle_alpha, 0.98f, (float)Clock.ElapsedFrameTime);
             }
 
             const float initial_scale = 0.2f;

From 180afff80515bc09a0833d1acb45a3bac243a958 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 Aug 2020 00:39:04 +0900
Subject: [PATCH 04030/10326] Ensure damp is always positive exponent

---
 .../Objects/Drawables/Pieces/DefaultSpinnerDisc.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index eba5d869c0..dfb692eba9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
             else
             {
-                fill.Alpha = (float)Interpolation.Damp(fill.Alpha, drawableSpinner.RotationTracker.Tracking ? tracking_alpha : idle_alpha, 0.98f, (float)Clock.ElapsedFrameTime);
+                fill.Alpha = (float)Interpolation.Damp(fill.Alpha, drawableSpinner.RotationTracker.Tracking ? tracking_alpha : idle_alpha, 0.98f, (float)Math.Abs(Clock.ElapsedFrameTime));
             }
 
             const float initial_scale = 0.2f;

From 74f70136fdf80faa47d53772c7c4f386d5e6c3e1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 1 Aug 2020 06:00:24 +0300
Subject: [PATCH 04031/10326] Implement DashboardBeatmapPanel component

---
 .../TestSceneDashboardBeatmapPanel.cs         |  52 ++++++
 .../Dashboard/DashboardBeatmapPanel.cs        | 159 ++++++++++++++++++
 2 files changed, 211 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
 create mode 100644 osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
new file mode 100644
index 0000000000..a61cd37513
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Overlays.Dashboard.Dashboard;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneDashboardBeatmapPanel : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        public TestSceneDashboardBeatmapPanel()
+        {
+            Add(new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.Y,
+                Width = 300,
+                Child = new DashboardBeatmapPanel(beatmap_set)
+            });
+        }
+
+        private static readonly BeatmapSetInfo beatmap_set = new BeatmapSetInfo
+        {
+            Metadata = new BeatmapMetadata
+            {
+                Title = "Very Long Title (TV size) [TATOE]",
+                Artist = "This artist has a really long name how is it possible",
+                Author = new User
+                {
+                    Username = "author",
+                    Id = 100
+                }
+            },
+            OnlineInfo = new BeatmapSetOnlineInfo
+            {
+                Covers = new BeatmapSetOnlineCovers
+                {
+                    Cover = "https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg?1595456608",
+                }
+            }
+        };
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
new file mode 100644
index 0000000000..84cb5ae46a
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
@@ -0,0 +1,159 @@
+// Copyright (c) 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.Framework.Input.Events;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Overlays.Dashboard.Dashboard
+{
+    public class DashboardBeatmapPanel : OsuClickableContainer
+    {
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
+        [Resolved(canBeNull: true)]
+        private BeatmapSetOverlay beatmapOverlay { get; set; }
+
+        private readonly BeatmapSetInfo setInfo;
+
+        private Box background;
+        private SpriteIcon chevron;
+
+        public DashboardBeatmapPanel(BeatmapSetInfo setInfo)
+        {
+            this.setInfo = setInfo;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = 60;
+            Children = new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background3,
+                    Alpha = 0
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Horizontal = 10 },
+                    Child = new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        ColumnDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.Absolute, 70),
+                            new Dimension(),
+                            new Dimension(GridSizeMode.AutoSize)
+                        },
+                        RowDimensions = new[]
+                        {
+                            new Dimension()
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Masking = true,
+                                    CornerRadius = 6,
+                                    Child = new UpdateableBeatmapSetCover
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        BeatmapSet = setInfo
+                                    }
+                                },
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Padding = new MarginPadding { Horizontal = 10 },
+                                    Child = new FillFlowContainer
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        AutoSizeAxes = Axes.Y,
+                                        RelativeSizeAxes = Axes.X,
+                                        Direction = FillDirection.Vertical,
+                                        Children = new Drawable[]
+                                        {
+                                            new OsuSpriteText
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                Truncate = true,
+                                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold),
+                                                Text = setInfo.Metadata.Title
+                                            },
+                                            new OsuSpriteText
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                Truncate = true,
+                                                Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                                                Text = setInfo.Metadata.Artist
+                                            },
+                                            new LinkFlowContainer(f => f.Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold))
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                AutoSizeAxes = Axes.Y
+                                            }.With(c =>
+                                            {
+                                                c.AddText("by ");
+                                                c.AddUserLink(setInfo.Metadata.Author);
+                                            })
+                                        }
+                                    }
+                                },
+                                chevron = new SpriteIcon
+                                {
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
+                                    Size = new Vector2(16),
+                                    Icon = FontAwesome.Solid.ChevronRight,
+                                    Colour = colourProvider.Foreground1
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            Action = () =>
+            {
+                if (setInfo.OnlineBeatmapSetID.HasValue)
+                    beatmapOverlay?.FetchAndShowBeatmapSet(setInfo.OnlineBeatmapSetID.Value);
+            };
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            base.OnHover(e);
+            background.FadeIn(200, Easing.OutQuint);
+            chevron.FadeColour(colourProvider.Light1, 200, Easing.OutQuint);
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            background.FadeOut(200, Easing.OutQuint);
+            chevron.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
+        }
+    }
+}

From ce47a34991ce574265aeaf37134c3d9f6de02cee Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 1 Aug 2020 06:14:24 +0300
Subject: [PATCH 04032/10326] Implement DashboardNewBeatmapPanel component

---
 .../TestSceneDashboardBeatmapPanel.cs         |  8 ++-
 .../Dashboard/DashboardBeatmapPanel.cs        | 56 +++++++++++--------
 .../Dashboard/DashboardNewBeatmapPanel.cs     | 22 ++++++++
 3 files changed, 61 insertions(+), 25 deletions(-)
 create mode 100644 osu.Game/Overlays/Dashboard/Dashboard/DashboardNewBeatmapPanel.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
index a61cd37513..5f1af012db 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
@@ -8,6 +8,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
 using osu.Game.Users;
+using System;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -24,7 +25,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Origin = Anchor.Centre,
                 AutoSizeAxes = Axes.Y,
                 Width = 300,
-                Child = new DashboardBeatmapPanel(beatmap_set)
+                Child = new DashboardNewBeatmapPanel(beatmap_set)
             });
         }
 
@@ -33,7 +34,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             Metadata = new BeatmapMetadata
             {
                 Title = "Very Long Title (TV size) [TATOE]",
-                Artist = "This artist has a really long name how is it possible",
+                Artist = "This artist has a really long name how is this possible",
                 Author = new User
                 {
                     Username = "author",
@@ -45,7 +46,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Covers = new BeatmapSetOnlineCovers
                 {
                     Cover = "https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg?1595456608",
-                }
+                },
+                Ranked = DateTimeOffset.Now
             }
         };
     }
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
index 84cb5ae46a..30b0086b8a 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
@@ -16,22 +16,22 @@ using osuTK;
 
 namespace osu.Game.Overlays.Dashboard.Dashboard
 {
-    public class DashboardBeatmapPanel : OsuClickableContainer
+    public abstract class DashboardBeatmapPanel : OsuClickableContainer
     {
         [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
+        protected OverlayColourProvider ColourProvider { get; private set; }
 
         [Resolved(canBeNull: true)]
         private BeatmapSetOverlay beatmapOverlay { get; set; }
 
-        private readonly BeatmapSetInfo setInfo;
+        protected readonly BeatmapSetInfo SetInfo;
 
         private Box background;
         private SpriteIcon chevron;
 
-        public DashboardBeatmapPanel(BeatmapSetInfo setInfo)
+        protected DashboardBeatmapPanel(BeatmapSetInfo setInfo)
         {
-            this.setInfo = setInfo;
+            SetInfo = setInfo;
         }
 
         [BackgroundDependencyLoader]
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
                 background = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background3,
+                    Colour = ColourProvider.Background3,
                     Alpha = 0
                 },
                 new Container
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
                                         RelativeSizeAxes = Axes.Both,
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
-                                        BeatmapSet = setInfo
+                                        BeatmapSet = SetInfo
                                     }
                                 },
                                 new Container
@@ -99,24 +99,34 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
                                                 RelativeSizeAxes = Axes.X,
                                                 Truncate = true,
                                                 Font = OsuFont.GetFont(weight: FontWeight.SemiBold),
-                                                Text = setInfo.Metadata.Title
+                                                Text = SetInfo.Metadata.Title
                                             },
                                             new OsuSpriteText
                                             {
                                                 RelativeSizeAxes = Axes.X,
                                                 Truncate = true,
                                                 Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
-                                                Text = setInfo.Metadata.Artist
+                                                Text = SetInfo.Metadata.Artist
                                             },
-                                            new LinkFlowContainer(f => f.Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold))
+                                            new FillFlowContainer
                                             {
-                                                RelativeSizeAxes = Axes.X,
-                                                AutoSizeAxes = Axes.Y
-                                            }.With(c =>
-                                            {
-                                                c.AddText("by ");
-                                                c.AddUserLink(setInfo.Metadata.Author);
-                                            })
+                                                AutoSizeAxes = Axes.Both,
+                                                Direction = FillDirection.Horizontal,
+                                                Spacing = new Vector2(5, 0),
+                                                Margin = new MarginPadding { Top = 2 },
+                                                Children = new Drawable[]
+                                                {
+                                                    new LinkFlowContainer(f => f.Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold))
+                                                    {
+                                                        AutoSizeAxes = Axes.Both
+                                                    }.With(c =>
+                                                    {
+                                                        c.AddText("by ");
+                                                        c.AddUserLink(SetInfo.Metadata.Author);
+                                                    }),
+                                                    CreateInfo()
+                                                }
+                                            }
                                         }
                                     }
                                 },
@@ -126,7 +136,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
                                     Origin = Anchor.CentreRight,
                                     Size = new Vector2(16),
                                     Icon = FontAwesome.Solid.ChevronRight,
-                                    Colour = colourProvider.Foreground1
+                                    Colour = ColourProvider.Foreground1
                                 }
                             }
                         }
@@ -136,16 +146,18 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
 
             Action = () =>
             {
-                if (setInfo.OnlineBeatmapSetID.HasValue)
-                    beatmapOverlay?.FetchAndShowBeatmapSet(setInfo.OnlineBeatmapSetID.Value);
+                if (SetInfo.OnlineBeatmapSetID.HasValue)
+                    beatmapOverlay?.FetchAndShowBeatmapSet(SetInfo.OnlineBeatmapSetID.Value);
             };
         }
 
+        protected abstract Drawable CreateInfo();
+
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
             background.FadeIn(200, Easing.OutQuint);
-            chevron.FadeColour(colourProvider.Light1, 200, Easing.OutQuint);
+            chevron.FadeColour(ColourProvider.Light1, 200, Easing.OutQuint);
             return true;
         }
 
@@ -153,7 +165,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
         {
             base.OnHoverLost(e);
             background.FadeOut(200, Easing.OutQuint);
-            chevron.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
+            chevron.FadeColour(ColourProvider.Foreground1, 200, Easing.OutQuint);
         }
     }
 }
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardNewBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardNewBeatmapPanel.cs
new file mode 100644
index 0000000000..6d2ec7ae37
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardNewBeatmapPanel.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;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+
+namespace osu.Game.Overlays.Dashboard.Dashboard
+{
+    public class DashboardNewBeatmapPanel : DashboardBeatmapPanel
+    {
+        public DashboardNewBeatmapPanel(BeatmapSetInfo setInfo)
+            : base(setInfo)
+        {
+        }
+
+        protected override Drawable CreateInfo() => new DrawableDate(SetInfo.OnlineInfo.Ranked.Value, 10, false)
+        {
+            Colour = ColourProvider.Foreground1
+        };
+    }
+}

From 7624804edfacb185dc456c18eb32648287613665 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 1 Aug 2020 06:23:06 +0300
Subject: [PATCH 04033/10326] Implement DashboardPopularBeatmapPanel component

---
 .../TestSceneDashboardBeatmapPanel.cs         | 35 ++++++++++++++--
 .../Dashboard/DashboardBeatmapPanel.cs        |  2 +-
 .../Dashboard/DashboardPopularBeatmapPanel.cs | 42 +++++++++++++++++++
 3 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Overlays/Dashboard/Dashboard/DashboardPopularBeatmapPanel.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
index 5f1af012db..10682490ae 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
@@ -9,6 +9,7 @@ using osu.Game.Overlays;
 using osu.Framework.Allocation;
 using osu.Game.Users;
 using System;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -19,17 +20,23 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         public TestSceneDashboardBeatmapPanel()
         {
-            Add(new Container
+            Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 AutoSizeAxes = Axes.Y,
                 Width = 300,
-                Child = new DashboardNewBeatmapPanel(beatmap_set)
+                Spacing = new Vector2(0, 10),
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    new DashboardNewBeatmapPanel(new_beatmap_set),
+                    new DashboardPopularBeatmapPanel(popular_beatmap_set)
+                }
             });
         }
 
-        private static readonly BeatmapSetInfo beatmap_set = new BeatmapSetInfo
+        private static readonly BeatmapSetInfo new_beatmap_set = new BeatmapSetInfo
         {
             Metadata = new BeatmapMetadata
             {
@@ -50,5 +57,27 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Ranked = DateTimeOffset.Now
             }
         };
+
+        private static readonly BeatmapSetInfo popular_beatmap_set = new BeatmapSetInfo
+        {
+            Metadata = new BeatmapMetadata
+            {
+                Title = "Title",
+                Artist = "Artist",
+                Author = new User
+                {
+                    Username = "author",
+                    Id = 100
+                }
+            },
+            OnlineInfo = new BeatmapSetOnlineInfo
+            {
+                Covers = new BeatmapSetOnlineCovers
+                {
+                    Cover = "https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg?1595456608",
+                },
+                FavouriteCount = 100
+            }
+        };
     }
 }
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
index 30b0086b8a..fc70d9d40a 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
                                             {
                                                 AutoSizeAxes = Axes.Both,
                                                 Direction = FillDirection.Horizontal,
-                                                Spacing = new Vector2(5, 0),
+                                                Spacing = new Vector2(3, 0),
                                                 Margin = new MarginPadding { Top = 2 },
                                                 Children = new Drawable[]
                                                 {
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardPopularBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardPopularBeatmapPanel.cs
new file mode 100644
index 0000000000..04bb261dce
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardPopularBeatmapPanel.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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Overlays.Dashboard.Dashboard
+{
+    public class DashboardPopularBeatmapPanel : DashboardBeatmapPanel
+    {
+        public DashboardPopularBeatmapPanel(BeatmapSetInfo setInfo)
+            : base(setInfo)
+        {
+        }
+
+        protected override Drawable CreateInfo() => new FillFlowContainer
+        {
+            AutoSizeAxes = Axes.Both,
+            Direction = FillDirection.Horizontal,
+            Spacing = new Vector2(3, 0),
+            Colour = ColourProvider.Foreground1,
+            Children = new Drawable[]
+            {
+                new SpriteIcon
+                {
+                    Size = new Vector2(10),
+                    Icon = FontAwesome.Solid.Heart
+                },
+                new OsuSpriteText
+                {
+                    Font = OsuFont.GetFont(size: 10),
+                    Text = SetInfo.OnlineInfo.FavouriteCount.ToString()
+                }
+            }
+        };
+    }
+}

From b5f688e63aeb9168cb4d73c651889dab270871a3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 1 Aug 2020 07:04:39 +0300
Subject: [PATCH 04034/10326] Implement DashboardBeatmapListing component

---
 .../TestSceneDashboardBeatmapListing.cs       | 144 ++++++++++++++++++
 .../TestSceneDashboardBeatmapPanel.cs         |  83 ----------
 .../Dashboard/DashboardBeatmapListing.cs      |  43 ++++++
 .../Dashboard/DashboardBeatmapPanel.cs        |   2 +-
 .../Dashboard/DashboardNewBeatmapPanel.cs     |   3 +-
 .../Dashboard/DrawableBeatmapsList.cs         |  57 +++++++
 .../Dashboard/DrawableNewBeatmapsList.cs      |  20 +++
 .../Dashboard/DrawablePopularBeatmapsList.cs  |  20 +++
 8 files changed, 287 insertions(+), 85 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
 delete mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
 create mode 100644 osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapListing.cs
 create mode 100644 osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapsList.cs
 create mode 100644 osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapsList.cs
 create mode 100644 osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapsList.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
new file mode 100644
index 0000000000..be0cc5187e
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
@@ -0,0 +1,144 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Overlays.Dashboard.Dashboard;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
+using osu.Game.Users;
+using System;
+using osu.Framework.Graphics.Shapes;
+using System.Collections.Generic;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneDashboardBeatmapListing : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private readonly Container content;
+
+        public TestSceneDashboardBeatmapListing()
+        {
+            Add(content = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.Y,
+                Width = 300,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background4
+                    },
+                    new DashboardBeatmapListing(new_beatmaps, popular_beatmaps)
+                }
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            AddStep("Set width to 500", () => content.ResizeWidthTo(500, 500));
+            AddStep("Set width to 300", () => content.ResizeWidthTo(300, 500));
+        }
+
+        private static readonly List<BeatmapSetInfo> new_beatmaps = new List<BeatmapSetInfo>
+        {
+            new BeatmapSetInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Title = "Very Long Title (TV size) [TATOE]",
+                    Artist = "This artist has a really long name how is this possible",
+                    Author = new User
+                    {
+                        Username = "author",
+                        Id = 100
+                    }
+                },
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Covers = new BeatmapSetOnlineCovers
+                    {
+                        Cover = "https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg?1595456608",
+                    },
+                    Ranked = DateTimeOffset.Now
+                }
+            },
+            new BeatmapSetInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Title = "Very Long Title (TV size) [TATOE]",
+                    Artist = "This artist has a really long name how is this possible",
+                    Author = new User
+                    {
+                        Username = "author",
+                        Id = 100
+                    }
+                },
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Covers = new BeatmapSetOnlineCovers
+                    {
+                        Cover = "https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg?1595456608",
+                    },
+                    Ranked = DateTimeOffset.MinValue
+                }
+            }
+        };
+
+        private static readonly List<BeatmapSetInfo> popular_beatmaps = new List<BeatmapSetInfo>
+        {
+            new BeatmapSetInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Title = "Title",
+                    Artist = "Artist",
+                    Author = new User
+                    {
+                        Username = "author",
+                        Id = 100
+                    }
+                },
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Covers = new BeatmapSetOnlineCovers
+                    {
+                        Cover = "https://assets.ppy.sh/beatmaps/1079428/covers/cover.jpg?1595295586",
+                    },
+                    FavouriteCount = 100
+                }
+            },
+            new BeatmapSetInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Title = "Title 2",
+                    Artist = "Artist 2",
+                    Author = new User
+                    {
+                        Username = "someone",
+                        Id = 100
+                    }
+                },
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Covers = new BeatmapSetOnlineCovers
+                    {
+                        Cover = "https://assets.ppy.sh/beatmaps/1079428/covers/cover.jpg?1595295586",
+                    },
+                    FavouriteCount = 10
+                }
+            }
+        };
+    }
+}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
deleted file mode 100644
index 10682490ae..0000000000
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapPanel.cs
+++ /dev/null
@@ -1,83 +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.Game.Overlays.Dashboard.Dashboard;
-using osu.Game.Beatmaps;
-using osu.Game.Overlays;
-using osu.Framework.Allocation;
-using osu.Game.Users;
-using System;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    public class TestSceneDashboardBeatmapPanel : OsuTestScene
-    {
-        [Cached]
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        public TestSceneDashboardBeatmapPanel()
-        {
-            Add(new FillFlowContainer
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                AutoSizeAxes = Axes.Y,
-                Width = 300,
-                Spacing = new Vector2(0, 10),
-                Direction = FillDirection.Vertical,
-                Children = new Drawable[]
-                {
-                    new DashboardNewBeatmapPanel(new_beatmap_set),
-                    new DashboardPopularBeatmapPanel(popular_beatmap_set)
-                }
-            });
-        }
-
-        private static readonly BeatmapSetInfo new_beatmap_set = new BeatmapSetInfo
-        {
-            Metadata = new BeatmapMetadata
-            {
-                Title = "Very Long Title (TV size) [TATOE]",
-                Artist = "This artist has a really long name how is this possible",
-                Author = new User
-                {
-                    Username = "author",
-                    Id = 100
-                }
-            },
-            OnlineInfo = new BeatmapSetOnlineInfo
-            {
-                Covers = new BeatmapSetOnlineCovers
-                {
-                    Cover = "https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg?1595456608",
-                },
-                Ranked = DateTimeOffset.Now
-            }
-        };
-
-        private static readonly BeatmapSetInfo popular_beatmap_set = new BeatmapSetInfo
-        {
-            Metadata = new BeatmapMetadata
-            {
-                Title = "Title",
-                Artist = "Artist",
-                Author = new User
-                {
-                    Username = "author",
-                    Id = 100
-                }
-            },
-            OnlineInfo = new BeatmapSetOnlineInfo
-            {
-                Covers = new BeatmapSetOnlineCovers
-                {
-                    Cover = "https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg?1595456608",
-                },
-                FavouriteCount = 100
-            }
-        };
-    }
-}
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapListing.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapListing.cs
new file mode 100644
index 0000000000..26c892174d
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapListing.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.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osuTK;
+
+namespace osu.Game.Overlays.Dashboard.Dashboard
+{
+    public class DashboardBeatmapListing : CompositeDrawable
+    {
+        private readonly List<BeatmapSetInfo> newBeatmaps;
+        private readonly List<BeatmapSetInfo> popularBeatmaps;
+
+        public DashboardBeatmapListing(List<BeatmapSetInfo> newBeatmaps, List<BeatmapSetInfo> popularBeatmaps)
+        {
+            this.newBeatmaps = newBeatmaps;
+            this.popularBeatmaps = popularBeatmaps;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            InternalChild = new FillFlowContainer<DrawableBeatmapsList>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new DrawableBeatmapsList[]
+                {
+                    new DrawableNewBeatmapsList(newBeatmaps),
+                    new DrawablePopularBeatmapsList(popularBeatmaps)
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
index fc70d9d40a..bb35ddd07c 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
                                                 Direction = FillDirection.Horizontal,
                                                 Spacing = new Vector2(3, 0),
                                                 Margin = new MarginPadding { Top = 2 },
-                                                Children = new Drawable[]
+                                                Children = new[]
                                                 {
                                                     new LinkFlowContainer(f => f.Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold))
                                                     {
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardNewBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardNewBeatmapPanel.cs
index 6d2ec7ae37..c4782b733d 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardNewBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardNewBeatmapPanel.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -14,7 +15,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
         {
         }
 
-        protected override Drawable CreateInfo() => new DrawableDate(SetInfo.OnlineInfo.Ranked.Value, 10, false)
+        protected override Drawable CreateInfo() => new DrawableDate(SetInfo.OnlineInfo.Ranked ?? DateTimeOffset.Now, 10, false)
         {
             Colour = ColourProvider.Foreground1
         };
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapsList.cs b/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapsList.cs
new file mode 100644
index 0000000000..dfe483a962
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapsList.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.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Overlays.Dashboard.Dashboard
+{
+    public abstract class DrawableBeatmapsList : CompositeDrawable
+    {
+        private readonly List<BeatmapSetInfo> beatmaps;
+
+        protected DrawableBeatmapsList(List<BeatmapSetInfo> beatmaps)
+        {
+            this.beatmaps = beatmaps;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            FillFlowContainer flow;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            InternalChild = flow = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(size: 16, weight: FontWeight.Bold),
+                        Colour = colourProvider.Light1,
+                        Text = CreateTitle(),
+                        Padding = new MarginPadding { Left = 10 }
+                    }
+                }
+            };
+
+            flow.AddRange(beatmaps.Select(CreateBeatmapPanel));
+        }
+
+        protected abstract string CreateTitle();
+
+        protected abstract DashboardBeatmapPanel CreateBeatmapPanel(BeatmapSetInfo setInfo);
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapsList.cs b/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapsList.cs
new file mode 100644
index 0000000000..e89495dc99
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapsList.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.Collections.Generic;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Overlays.Dashboard.Dashboard
+{
+    public class DrawableNewBeatmapsList : DrawableBeatmapsList
+    {
+        public DrawableNewBeatmapsList(List<BeatmapSetInfo> beatmaps)
+            : base(beatmaps)
+        {
+        }
+
+        protected override DashboardBeatmapPanel CreateBeatmapPanel(BeatmapSetInfo setInfo) => new DashboardNewBeatmapPanel(setInfo);
+
+        protected override string CreateTitle() => "New Ranked Beatmaps";
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapsList.cs b/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapsList.cs
new file mode 100644
index 0000000000..8076e86ed0
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapsList.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.Collections.Generic;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Overlays.Dashboard.Dashboard
+{
+    public class DrawablePopularBeatmapsList : DrawableBeatmapsList
+    {
+        public DrawablePopularBeatmapsList(List<BeatmapSetInfo> beatmaps)
+            : base(beatmaps)
+        {
+        }
+
+        protected override DashboardBeatmapPanel CreateBeatmapPanel(BeatmapSetInfo setInfo) => new DashboardPopularBeatmapPanel(setInfo);
+
+        protected override string CreateTitle() => "Popular Beatmaps";
+    }
+}

From 5b1e3e86220e7ba3b8024fa9ff6cfc035e34a82c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 1 Aug 2020 09:11:53 +0300
Subject: [PATCH 04035/10326] Remove redundant FillFlowContainer from
 DashboardBeatmapPanel

---
 .../Dashboard/DashboardBeatmapPanel.cs        | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
index bb35ddd07c..61324fdc7f 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
@@ -108,25 +108,18 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
                                                 Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                                                 Text = SetInfo.Metadata.Artist
                                             },
-                                            new FillFlowContainer
+                                            new LinkFlowContainer(f => f.Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold))
                                             {
-                                                AutoSizeAxes = Axes.Both,
-                                                Direction = FillDirection.Horizontal,
-                                                Spacing = new Vector2(3, 0),
-                                                Margin = new MarginPadding { Top = 2 },
-                                                Children = new[]
-                                                {
-                                                    new LinkFlowContainer(f => f.Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold))
-                                                    {
-                                                        AutoSizeAxes = Axes.Both
-                                                    }.With(c =>
-                                                    {
-                                                        c.AddText("by ");
-                                                        c.AddUserLink(SetInfo.Metadata.Author);
-                                                    }),
-                                                    CreateInfo()
-                                                }
-                                            }
+                                                AutoSizeAxes = Axes.Y,
+                                                RelativeSizeAxes = Axes.X,
+                                                Spacing = new Vector2(3),
+                                                Margin = new MarginPadding { Top = 2 }
+                                            }.With(c =>
+                                            {
+                                                c.AddText("by");
+                                                c.AddUserLink(SetInfo.Metadata.Author);
+                                                c.AddArbitraryDrawable(CreateInfo());
+                                            })
                                         }
                                     }
                                 },

From 2190e6443a0265ba4d4db20a44b207b3a63a4760 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 1 Aug 2020 10:02:46 +0300
Subject: [PATCH 04036/10326] Apply height constraints to all settings dropdown

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 2 --
 osu.Game/Overlays/Settings/SettingsDropdown.cs     | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 04390a1193..596d3a9801 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -116,8 +116,6 @@ namespace osu.Game.Overlays.Settings.Sections
             private class SkinDropdownControl : DropdownControl
             {
                 protected override string GenerateItemText(SkinInfo item) => item.ToString();
-
-                protected override DropdownMenu CreateMenu() => base.CreateMenu().With(m => m.MaxHeight = 200);
             }
         }
 
diff --git a/osu.Game/Overlays/Settings/SettingsDropdown.cs b/osu.Game/Overlays/Settings/SettingsDropdown.cs
index 167061f485..1175ddaab8 100644
--- a/osu.Game/Overlays/Settings/SettingsDropdown.cs
+++ b/osu.Game/Overlays/Settings/SettingsDropdown.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Overlays.Settings
                 Margin = new MarginPadding { Top = 5 };
                 RelativeSizeAxes = Axes.X;
             }
+
+            protected override DropdownMenu CreateMenu() => base.CreateMenu().With(m => m.MaxHeight = 200);
         }
     }
 }

From 5f52701273a8b41205bcd7a1c24fd02bb658560c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 1 Aug 2020 10:11:34 +0300
Subject: [PATCH 04037/10326] Remove no longer necessary custom dropdown

---
 .../Ladder/Components/LadderEditorSettings.cs |  2 +-
 .../Components/LadderSettingsDropdown.cs      | 26 -------------------
 .../Ladder/Components/SettingsTeamDropdown.cs |  3 ++-
 3 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index 4aea7ff4c0..fa530ea2c4 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         {
         }
 
-        private class SettingsRoundDropdown : LadderSettingsDropdown<TournamentRound>
+        private class SettingsRoundDropdown : SettingsDropdown<TournamentRound>
         {
             public SettingsRoundDropdown(BindableList<TournamentRound> rounds)
             {
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs
deleted file mode 100644
index 347e4d91e0..0000000000
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.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.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
index a630e51e44..6604e3a313 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
@@ -6,11 +6,12 @@ using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Ladder.Components
 {
-    public class SettingsTeamDropdown : LadderSettingsDropdown<TournamentTeam>
+    public class SettingsTeamDropdown : SettingsDropdown<TournamentTeam>
     {
         public SettingsTeamDropdown(BindableList<TournamentTeam> teams)
         {

From 45225646684d9f28b19650b3fffaa3d9791695d6 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 1 Aug 2020 19:44:30 +0200
Subject: [PATCH 04038/10326] Add GameplayDisableOverlays setting.

---
 osu.Game/Configuration/OsuConfigManager.cs                   | 4 +++-
 .../Overlays/Settings/Sections/Gameplay/GeneralSettings.cs   | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index a8a8794320..44c0fbde82 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -100,6 +100,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.IncreaseFirstObjectVisibility, true);
             Set(OsuSetting.GameplayDisableWinKey, true);
+            Set(OsuSetting.GameplayDisableOverlayActivation, true);
 
             // Update
             Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
@@ -231,6 +232,7 @@ namespace osu.Game.Configuration
         UIHoldActivationDelay,
         HitLighting,
         MenuBackgroundSource,
-        GameplayDisableWinKey
+        GameplayDisableWinKey,
+        GameplayDisableOverlayActivation
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 0149e6c3a6..c2e668fe68 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -77,6 +77,11 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Score display mode",
                     Bindable = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode)
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Disable overlays during gameplay",
+                    Bindable = config.GetBindable<bool>(OsuSetting.GameplayDisableOverlayActivation)
                 }
             };
 

From f4128083312843d9594c1b96d212914a43fee60b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 2 Aug 2020 12:57:15 +0200
Subject: [PATCH 04039/10326] Check rotation with bigger tolerance to account
 for damp

---
 .../TestSceneSpinnerRotation.cs               | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 319d326a01..e4d89fb402 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -60,39 +61,60 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestSpinnerRewindingRotation()
         {
+            double trackerRotationTolerance = 0;
+
             addSeekStep(5000);
+            AddStep("calculate rotation tolerance", () =>
+            {
+                trackerRotationTolerance = Math.Abs(drawableSpinner.RotationTracker.Rotation * 0.1f);
+            });
             AddAssert("is disc rotation not almost 0", () => !Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, 0, 100));
             AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, 0, 100));
 
             addSeekStep(0);
-            AddAssert("is disc rotation almost 0", () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, 0, 100));
+            AddAssert("is disc rotation almost 0", () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, 0, trackerRotationTolerance));
             AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, 0, 100));
         }
 
         [Test]
         public void TestSpinnerMiddleRewindingRotation()
         {
-            double finalAbsoluteDiscRotation = 0, finalRelativeDiscRotation = 0, finalSpinnerSymbolRotation = 0;
+            double finalCumulativeTrackerRotation = 0;
+            double finalTrackerRotation = 0, trackerRotationTolerance = 0;
+            double finalSpinnerSymbolRotation = 0, spinnerSymbolRotationTolerance = 0;
 
             addSeekStep(5000);
-            AddStep("retrieve disc relative rotation", () => finalRelativeDiscRotation = drawableSpinner.RotationTracker.Rotation);
-            AddStep("retrieve disc absolute rotation", () => finalAbsoluteDiscRotation = drawableSpinner.RotationTracker.CumulativeRotation);
-            AddStep("retrieve spinner symbol rotation", () => finalSpinnerSymbolRotation = spinnerSymbol.Rotation);
+            AddStep("retrieve disc rotation", () =>
+            {
+                finalTrackerRotation = drawableSpinner.RotationTracker.Rotation;
+                trackerRotationTolerance = Math.Abs(finalTrackerRotation * 0.05f);
+            });
+            AddStep("retrieve spinner symbol rotation", () =>
+            {
+                finalSpinnerSymbolRotation = spinnerSymbol.Rotation;
+                spinnerSymbolRotationTolerance = Math.Abs(finalSpinnerSymbolRotation * 0.05f);
+            });
+            AddStep("retrieve cumulative disc rotation", () => finalCumulativeTrackerRotation = drawableSpinner.RotationTracker.CumulativeRotation);
 
             addSeekStep(2500);
             AddUntilStep("disc rotation rewound",
                 // we want to make sure that the rotation at time 2500 is in the same direction as at time 5000, but about half-way in.
-                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, finalRelativeDiscRotation / 2, 100));
+                // due to the exponential damping applied we're allowing a larger margin of error of about 10%
+                // (5% relative to the final rotation value, but we're half-way through the spin).
+                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, finalTrackerRotation / 2, trackerRotationTolerance));
             AddUntilStep("symbol rotation rewound",
-                () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation / 2, 100));
+                () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation / 2, spinnerSymbolRotationTolerance));
+            AddAssert("is cumulative rotation rewound",
+                // cumulative rotation is not damped, so we're treating it as the "ground truth" and allowing a comparatively smaller margin of error.
+                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, finalCumulativeTrackerRotation / 2, 100));
 
             addSeekStep(5000);
             AddAssert("is disc rotation almost same",
-                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, finalRelativeDiscRotation, 100));
+                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, finalTrackerRotation, trackerRotationTolerance));
             AddAssert("is symbol rotation almost same",
-                () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation, 100));
-            AddAssert("is disc rotation absolute almost same",
-                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, finalAbsoluteDiscRotation, 100));
+                () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation, spinnerSymbolRotationTolerance));
+            AddAssert("is cumulative rotation almost same",
+                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, finalCumulativeTrackerRotation, 100));
         }
 
         [Test]

From efb08aeed32b1787e79b7ebd0e7501a874cf559c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 2 Aug 2020 14:54:41 +0200
Subject: [PATCH 04040/10326] Switch unnecessary wait steps to asserts

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index e4d89fb402..b46964e8b7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -97,12 +97,12 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("retrieve cumulative disc rotation", () => finalCumulativeTrackerRotation = drawableSpinner.RotationTracker.CumulativeRotation);
 
             addSeekStep(2500);
-            AddUntilStep("disc rotation rewound",
+            AddAssert("disc rotation rewound",
                 // we want to make sure that the rotation at time 2500 is in the same direction as at time 5000, but about half-way in.
                 // due to the exponential damping applied we're allowing a larger margin of error of about 10%
                 // (5% relative to the final rotation value, but we're half-way through the spin).
                 () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, finalTrackerRotation / 2, trackerRotationTolerance));
-            AddUntilStep("symbol rotation rewound",
+            AddAssert("symbol rotation rewound",
                 () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation / 2, spinnerSymbolRotationTolerance));
             AddAssert("is cumulative rotation rewound",
                 // cumulative rotation is not damped, so we're treating it as the "ground truth" and allowing a comparatively smaller margin of error.

From 3e5c3e256d3f0747afd8f89f05e622eba1d035ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 2 Aug 2020 19:46:29 +0200
Subject: [PATCH 04041/10326] Extract method for performing generic config
 lookup

---
 osu.Game/Skinning/LegacySkin.cs | 46 ++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index d98f8aba83..d1acc51bed 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -143,27 +143,7 @@ namespace osu.Game.Skinning
                     goto default;
 
                 default:
-                    // handles lookups like some in LegacySkinConfiguration.LegacySetting
-
-                    try
-                    {
-                        if (Configuration.ConfigDictionary.TryGetValue(lookup.ToString(), out var val))
-                        {
-                            // special case for handling skins which use 1 or 0 to signify a boolean state.
-                            if (typeof(TValue) == typeof(bool))
-                                val = val == "1" ? "true" : "false";
-
-                            var bindable = new Bindable<TValue>();
-                            if (val != null)
-                                bindable.Parse(val);
-                            return bindable;
-                        }
-                    }
-                    catch
-                    {
-                    }
-
-                    break;
+                    return genericLookup<TLookup, TValue>(lookup);
             }
 
             return null;
@@ -286,6 +266,30 @@ namespace osu.Game.Skinning
         private IBindable<string> getManiaImage(LegacyManiaSkinConfiguration source, string lookup)
             => source.ImageLookups.TryGetValue(lookup, out var image) ? new Bindable<string>(image) : null;
 
+        [CanBeNull]
+        private IBindable<TValue> genericLookup<TLookup, TValue>(TLookup lookup)
+        {
+            try
+            {
+                if (Configuration.ConfigDictionary.TryGetValue(lookup.ToString(), out var val))
+                {
+                    // special case for handling skins which use 1 or 0 to signify a boolean state.
+                    if (typeof(TValue) == typeof(bool))
+                        val = val == "1" ? "true" : "false";
+
+                    var bindable = new Bindable<TValue>();
+                    if (val != null)
+                        bindable.Parse(val);
+                    return bindable;
+                }
+            }
+            catch
+            {
+            }
+
+            return null;
+        }
+
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             switch (component)

From ca7545917c85d5b5cf58ab54ec49aaab4c17d52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 2 Aug 2020 19:50:17 +0200
Subject: [PATCH 04042/10326] Extract method for performing legacy lookups

---
 osu.Game/Skinning/LegacySkin.cs | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index d1acc51bed..4e470e13b5 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -134,13 +134,7 @@ namespace osu.Game.Skinning
                     break;
 
                 case LegacySkinConfiguration.LegacySetting legacy:
-                    switch (legacy)
-                    {
-                        case LegacySkinConfiguration.LegacySetting.Version:
-                            return SkinUtils.As<TValue>(new Bindable<decimal>(Configuration.LegacyVersion ?? LegacySkinConfiguration.LATEST_VERSION));
-                    }
-
-                    goto default;
+                    return legacySettingLookup<TValue>(legacy);
 
                 default:
                     return genericLookup<TLookup, TValue>(lookup);
@@ -266,6 +260,19 @@ namespace osu.Game.Skinning
         private IBindable<string> getManiaImage(LegacyManiaSkinConfiguration source, string lookup)
             => source.ImageLookups.TryGetValue(lookup, out var image) ? new Bindable<string>(image) : null;
 
+        [CanBeNull]
+        private IBindable<TValue> legacySettingLookup<TValue>(LegacySkinConfiguration.LegacySetting legacySetting)
+        {
+            switch (legacySetting)
+            {
+                case LegacySkinConfiguration.LegacySetting.Version:
+                    return SkinUtils.As<TValue>(new Bindable<decimal>(Configuration.LegacyVersion ?? LegacySkinConfiguration.LATEST_VERSION));
+
+                default:
+                    return genericLookup<LegacySkinConfiguration.LegacySetting, TValue>(legacySetting);
+            }
+        }
+
         [CanBeNull]
         private IBindable<TValue> genericLookup<TLookup, TValue>(TLookup lookup)
         {

From ca57c70961e51cceed04404706c59a8601fa29b9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 2 Aug 2020 21:33:14 +0300
Subject: [PATCH 04043/10326] Naming adjustments

---
 .../Dashboard/Dashboard/DashboardBeatmapListing.cs        | 8 ++++----
 .../Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs | 8 ++++----
 .../{DrawableBeatmapsList.cs => DrawableBeatmapList.cs}   | 4 ++--
 ...awableNewBeatmapsList.cs => DrawableNewBeatmapList.cs} | 4 ++--
 ...pularBeatmapsList.cs => DrawablePopularBeatmapList.cs} | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename osu.Game/Overlays/Dashboard/Dashboard/{DrawableBeatmapsList.cs => DrawableBeatmapList.cs} (92%)
 rename osu.Game/Overlays/Dashboard/Dashboard/{DrawableNewBeatmapsList.cs => DrawableNewBeatmapList.cs} (80%)
 rename osu.Game/Overlays/Dashboard/Dashboard/{DrawablePopularBeatmapsList.cs => DrawablePopularBeatmapList.cs} (79%)

diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapListing.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapListing.cs
index 26c892174d..a8c6ab7ba2 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapListing.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapListing.cs
@@ -26,16 +26,16 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            InternalChild = new FillFlowContainer<DrawableBeatmapsList>
+            InternalChild = new FillFlowContainer<DrawableBeatmapList>
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Direction = FillDirection.Vertical,
                 Spacing = new Vector2(0, 10),
-                Children = new DrawableBeatmapsList[]
+                Children = new DrawableBeatmapList[]
                 {
-                    new DrawableNewBeatmapsList(newBeatmaps),
-                    new DrawablePopularBeatmapsList(popularBeatmaps)
+                    new DrawableNewBeatmapList(newBeatmaps),
+                    new DrawablePopularBeatmapList(popularBeatmaps)
                 }
             };
         }
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
index 61324fdc7f..45fa56a177 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
 
         protected readonly BeatmapSetInfo SetInfo;
 
-        private Box background;
+        private Box hoverBackground;
         private SpriteIcon chevron;
 
         protected DashboardBeatmapPanel(BeatmapSetInfo setInfo)
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
             Height = 60;
             Children = new Drawable[]
             {
-                background = new Box
+                hoverBackground = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = ColourProvider.Background3,
@@ -149,7 +149,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
-            background.FadeIn(200, Easing.OutQuint);
+            hoverBackground.FadeIn(200, Easing.OutQuint);
             chevron.FadeColour(ColourProvider.Light1, 200, Easing.OutQuint);
             return true;
         }
@@ -157,7 +157,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
         protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
-            background.FadeOut(200, Easing.OutQuint);
+            hoverBackground.FadeOut(200, Easing.OutQuint);
             chevron.FadeColour(ColourProvider.Foreground1, 200, Easing.OutQuint);
         }
     }
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapsList.cs b/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs
similarity index 92%
rename from osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapsList.cs
rename to osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs
index dfe483a962..7dd969863a 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapsList.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs
@@ -13,11 +13,11 @@ using osuTK;
 
 namespace osu.Game.Overlays.Dashboard.Dashboard
 {
-    public abstract class DrawableBeatmapsList : CompositeDrawable
+    public abstract class DrawableBeatmapList : CompositeDrawable
     {
         private readonly List<BeatmapSetInfo> beatmaps;
 
-        protected DrawableBeatmapsList(List<BeatmapSetInfo> beatmaps)
+        protected DrawableBeatmapList(List<BeatmapSetInfo> beatmaps)
         {
             this.beatmaps = beatmaps;
         }
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapsList.cs b/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapList.cs
similarity index 80%
rename from osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapsList.cs
rename to osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapList.cs
index e89495dc99..3ed42cc4bb 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapsList.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapList.cs
@@ -6,9 +6,9 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Overlays.Dashboard.Dashboard
 {
-    public class DrawableNewBeatmapsList : DrawableBeatmapsList
+    public class DrawableNewBeatmapList : DrawableBeatmapList
     {
-        public DrawableNewBeatmapsList(List<BeatmapSetInfo> beatmaps)
+        public DrawableNewBeatmapList(List<BeatmapSetInfo> beatmaps)
             : base(beatmaps)
         {
         }
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapsList.cs b/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapList.cs
similarity index 79%
rename from osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapsList.cs
rename to osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapList.cs
index 8076e86ed0..ee6c3e6d77 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapsList.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapList.cs
@@ -6,9 +6,9 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Overlays.Dashboard.Dashboard
 {
-    public class DrawablePopularBeatmapsList : DrawableBeatmapsList
+    public class DrawablePopularBeatmapList : DrawableBeatmapList
     {
-        public DrawablePopularBeatmapsList(List<BeatmapSetInfo> beatmaps)
+        public DrawablePopularBeatmapList(List<BeatmapSetInfo> beatmaps)
             : base(beatmaps)
         {
         }

From 7d83cdbf1c18fdaa9d25d866ac62a3d292a5e795 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 2 Aug 2020 21:35:24 +0300
Subject: [PATCH 04044/10326] Make title in DrawableBeatmapList a property

---
 osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs  | 4 ++--
 .../Overlays/Dashboard/Dashboard/DrawableNewBeatmapList.cs    | 2 +-
 .../Dashboard/Dashboard/DrawablePopularBeatmapList.cs         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs b/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs
index 7dd969863a..4837d587fd 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
                     {
                         Font = OsuFont.GetFont(size: 16, weight: FontWeight.Bold),
                         Colour = colourProvider.Light1,
-                        Text = CreateTitle(),
+                        Text = Title,
                         Padding = new MarginPadding { Left = 10 }
                     }
                 }
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
             flow.AddRange(beatmaps.Select(CreateBeatmapPanel));
         }
 
-        protected abstract string CreateTitle();
+        protected abstract string Title { get; }
 
         protected abstract DashboardBeatmapPanel CreateBeatmapPanel(BeatmapSetInfo setInfo);
     }
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapList.cs b/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapList.cs
index 3ed42cc4bb..9856f6ae3e 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapList.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapList.cs
@@ -15,6 +15,6 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
 
         protected override DashboardBeatmapPanel CreateBeatmapPanel(BeatmapSetInfo setInfo) => new DashboardNewBeatmapPanel(setInfo);
 
-        protected override string CreateTitle() => "New Ranked Beatmaps";
+        protected override string Title => "New Ranked Beatmaps";
     }
 }
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapList.cs b/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapList.cs
index ee6c3e6d77..294a75c48a 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapList.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapList.cs
@@ -15,6 +15,6 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
 
         protected override DashboardBeatmapPanel CreateBeatmapPanel(BeatmapSetInfo setInfo) => new DashboardPopularBeatmapPanel(setInfo);
 
-        protected override string CreateTitle() => "Popular Beatmaps";
+        protected override string Title => "Popular Beatmaps";
     }
 }

From bddc61756a3a40f5885b449cd72178b4fd8c2c7b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 2 Aug 2020 21:44:34 +0300
Subject: [PATCH 04045/10326] Rework padding

---
 .../TestSceneDashboardBeatmapListing.cs              |  8 +++++++-
 .../Dashboard/Dashboard/DashboardBeatmapPanel.cs     | 12 ++++++++----
 .../Dashboard/Dashboard/DrawableBeatmapList.cs       |  3 +--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
index be0cc5187e..c5714dae46 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
@@ -36,7 +36,13 @@ namespace osu.Game.Tests.Visual.UserInterface
                         RelativeSizeAxes = Axes.Both,
                         Colour = colourProvider.Background4
                     },
-                    new DashboardBeatmapListing(new_beatmaps, popular_beatmaps)
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding { Horizontal = 10 },
+                        Child = new DashboardBeatmapListing(new_beatmaps, popular_beatmaps)
+                    }
                 }
             });
         }
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
index 45fa56a177..d74cdf4414 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
@@ -41,16 +41,20 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
             Height = 60;
             Children = new Drawable[]
             {
-                hoverBackground = new Box
+                new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = ColourProvider.Background3,
-                    Alpha = 0
+                    Padding = new MarginPadding { Horizontal = -10 },
+                    Child = hoverBackground = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = ColourProvider.Background3,
+                        Alpha = 0
+                    }
                 },
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Horizontal = 10 },
                     Child = new GridContainer
                     {
                         RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs b/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs
index 4837d587fd..6e42881de7 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs
+++ b/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs
@@ -41,8 +41,7 @@ namespace osu.Game.Overlays.Dashboard.Dashboard
                     {
                         Font = OsuFont.GetFont(size: 16, weight: FontWeight.Bold),
                         Colour = colourProvider.Light1,
-                        Text = Title,
-                        Padding = new MarginPadding { Left = 10 }
+                        Text = Title
                     }
                 }
             };

From dc559093cdc519e600d7304e6f14bdcc06ea91aa Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 2 Aug 2020 21:47:09 +0300
Subject: [PATCH 04046/10326] Rename namespace from Dashboard to Home

---
 .../Visual/UserInterface/TestSceneDashboardBeatmapListing.cs    | 2 +-
 .../Dashboard/{Dashboard => Home}/DashboardBeatmapListing.cs    | 2 +-
 .../Dashboard/{Dashboard => Home}/DashboardBeatmapPanel.cs      | 2 +-
 .../Dashboard/{Dashboard => Home}/DashboardNewBeatmapPanel.cs   | 2 +-
 .../{Dashboard => Home}/DashboardPopularBeatmapPanel.cs         | 2 +-
 .../Dashboard/{Dashboard => Home}/DrawableBeatmapList.cs        | 2 +-
 .../Dashboard/{Dashboard => Home}/DrawableNewBeatmapList.cs     | 2 +-
 .../Dashboard/{Dashboard => Home}/DrawablePopularBeatmapList.cs | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game/Overlays/Dashboard/{Dashboard => Home}/DashboardBeatmapListing.cs (96%)
 rename osu.Game/Overlays/Dashboard/{Dashboard => Home}/DashboardBeatmapPanel.cs (99%)
 rename osu.Game/Overlays/Dashboard/{Dashboard => Home}/DashboardNewBeatmapPanel.cs (93%)
 rename osu.Game/Overlays/Dashboard/{Dashboard => Home}/DashboardPopularBeatmapPanel.cs (96%)
 rename osu.Game/Overlays/Dashboard/{Dashboard => Home}/DrawableBeatmapList.cs (97%)
 rename osu.Game/Overlays/Dashboard/{Dashboard => Home}/DrawableNewBeatmapList.cs (92%)
 rename osu.Game/Overlays/Dashboard/{Dashboard => Home}/DrawablePopularBeatmapList.cs (92%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
index c5714dae46..c51204eaba 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
-using osu.Game.Overlays.Dashboard.Dashboard;
+using osu.Game.Overlays.Dashboard.Home;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapListing.cs b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapListing.cs
similarity index 96%
rename from osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapListing.cs
rename to osu.Game/Overlays/Dashboard/Home/DashboardBeatmapListing.cs
index a8c6ab7ba2..4d96825353 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapListing.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapListing.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osuTK;
 
-namespace osu.Game.Overlays.Dashboard.Dashboard
+namespace osu.Game.Overlays.Dashboard.Home
 {
     public class DashboardBeatmapListing : CompositeDrawable
     {
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
similarity index 99%
rename from osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
rename to osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
index d74cdf4414..0b660c16af 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 
-namespace osu.Game.Overlays.Dashboard.Dashboard
+namespace osu.Game.Overlays.Dashboard.Home
 {
     public abstract class DashboardBeatmapPanel : OsuClickableContainer
     {
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardNewBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Home/DashboardNewBeatmapPanel.cs
similarity index 93%
rename from osu.Game/Overlays/Dashboard/Dashboard/DashboardNewBeatmapPanel.cs
rename to osu.Game/Overlays/Dashboard/Home/DashboardNewBeatmapPanel.cs
index c4782b733d..b212eaf20a 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardNewBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DashboardNewBeatmapPanel.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 
-namespace osu.Game.Overlays.Dashboard.Dashboard
+namespace osu.Game.Overlays.Dashboard.Home
 {
     public class DashboardNewBeatmapPanel : DashboardBeatmapPanel
     {
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DashboardPopularBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs
similarity index 96%
rename from osu.Game/Overlays/Dashboard/Dashboard/DashboardPopularBeatmapPanel.cs
rename to osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs
index 04bb261dce..2fb5617796 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DashboardPopularBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 
-namespace osu.Game.Overlays.Dashboard.Dashboard
+namespace osu.Game.Overlays.Dashboard.Home
 {
     public class DashboardPopularBeatmapPanel : DashboardBeatmapPanel
     {
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs b/osu.Game/Overlays/Dashboard/Home/DrawableBeatmapList.cs
similarity index 97%
rename from osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs
rename to osu.Game/Overlays/Dashboard/Home/DrawableBeatmapList.cs
index 6e42881de7..f6535b7db3 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DrawableBeatmapList.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DrawableBeatmapList.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 
-namespace osu.Game.Overlays.Dashboard.Dashboard
+namespace osu.Game.Overlays.Dashboard.Home
 {
     public abstract class DrawableBeatmapList : CompositeDrawable
     {
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapList.cs b/osu.Game/Overlays/Dashboard/Home/DrawableNewBeatmapList.cs
similarity index 92%
rename from osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapList.cs
rename to osu.Game/Overlays/Dashboard/Home/DrawableNewBeatmapList.cs
index 9856f6ae3e..75e8ca336d 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DrawableNewBeatmapList.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DrawableNewBeatmapList.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using osu.Game.Beatmaps;
 
-namespace osu.Game.Overlays.Dashboard.Dashboard
+namespace osu.Game.Overlays.Dashboard.Home
 {
     public class DrawableNewBeatmapList : DrawableBeatmapList
     {
diff --git a/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapList.cs b/osu.Game/Overlays/Dashboard/Home/DrawablePopularBeatmapList.cs
similarity index 92%
rename from osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapList.cs
rename to osu.Game/Overlays/Dashboard/Home/DrawablePopularBeatmapList.cs
index 294a75c48a..90bd00008c 100644
--- a/osu.Game/Overlays/Dashboard/Dashboard/DrawablePopularBeatmapList.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DrawablePopularBeatmapList.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using osu.Game.Beatmaps;
 
-namespace osu.Game.Overlays.Dashboard.Dashboard
+namespace osu.Game.Overlays.Dashboard.Home
 {
     public class DrawablePopularBeatmapList : DrawableBeatmapList
     {

From b96e32b0bbd741373689ad7755b54d576d87dd56 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 2 Aug 2020 12:26:09 -0700
Subject: [PATCH 04047/10326] Add xmldoc for updateBindTarget

---
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index d58acc1ac4..e5b246807c 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -320,6 +320,9 @@ namespace osu.Game.Overlays.KeyBinding
             base.OnFocusLost(e);
         }
 
+        /// <summary>
+        /// Updates the bind target to the currently hovered key button or the first if clicked anywhere else.
+        /// </summary>
         private void updateBindTarget()
         {
             if (bindTarget != null) bindTarget.IsBinding = false;

From f1ba576438eb84e9303619fb6bec9f54ad3c5a1c Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 2 Aug 2020 21:34:35 +0200
Subject: [PATCH 04048/10326] Disable overlay activation when in gameplay.

---
 osu.Game/Screens/Play/Player.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 541275cf55..24c27fde8d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -63,6 +63,8 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> mouseWheelDisabled;
 
+        private Bindable<bool> gameplayOverlaysDisabled;
+
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
         public int RestartCount;
@@ -77,6 +79,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private OsuGame game { get; set; }
+
         private SampleChannel sampleRestart;
 
         public BreakOverlay BreakOverlay;
@@ -165,6 +170,7 @@ namespace osu.Game.Screens.Play
             sampleRestart = audio.Samples.Get(@"Gameplay/restart");
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
+            gameplayOverlaysDisabled = config.GetBindable<bool>(OsuSetting.GameplayDisableOverlayActivation);
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
 
@@ -197,6 +203,13 @@ namespace osu.Game.Screens.Play
                 skipOverlay.Hide();
             }
 
+            gameplayOverlaysDisabled.ValueChanged += disabled =>
+            {
+                game.OverlayActivationMode.Value = disabled.NewValue && !DrawableRuleset.IsPaused.Value ? OverlayActivation.Disabled : OverlayActivation.All;
+            };
+            DrawableRuleset.IsPaused.BindValueChanged(_ => gameplayOverlaysDisabled.TriggerChange());
+            
+
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
             // bind clock into components that require it
@@ -627,6 +640,8 @@ namespace osu.Game.Screens.Play
 
             foreach (var mod in Mods.Value.OfType<IApplicableToHUD>())
                 mod.ApplyToHUD(HUDOverlay);
+
+            gameplayOverlaysDisabled.TriggerChange();
         }
 
         public override void OnSuspending(IScreen next)

From ba77fa2945475ab3d6eb8092f384c4500f1a6f51 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 2 Aug 2020 12:41:35 -0700
Subject: [PATCH 04049/10326] Add test for clear button

---
 .../Settings/TestSceneKeyBindingPanel.cs      | 40 +++++++++++++++++++
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 14 +++----
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 3d335995ac..e7a1cab8eb 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -64,5 +64,45 @@ namespace osu.Game.Tests.Visual.Settings
                 }, 0, true);
             });
         }
+
+        [Test]
+        public void TestClearButtonOnBindings()
+        {
+            KeyBindingRow backBindingRow = null;
+
+            AddStep("click back binding row", () =>
+            {
+                backBindingRow = panel.ChildrenOfType<KeyBindingRow>().ElementAt(10);
+                InputManager.MoveMouseTo(backBindingRow);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            clickClearButton();
+
+            AddAssert("first binding cleared", () => string.IsNullOrEmpty(backBindingRow.Buttons.First().Text.Text));
+
+            AddStep("click second binding", () =>
+            {
+                var target = backBindingRow.Buttons.ElementAt(1);
+
+                InputManager.MoveMouseTo(target);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            clickClearButton();
+
+            AddAssert("second binding cleared", () => string.IsNullOrEmpty(backBindingRow.Buttons.ElementAt(1).Text.Text));
+
+            void clickClearButton()
+            {
+                AddStep("click clear button", () =>
+                {
+                    var clearButton = backBindingRow.ChildrenOfType<KeyBindingRow.ClearButton>().Single();
+
+                    InputManager.MoveMouseTo(clearButton);
+                    InputManager.Click(MouseButton.Left);
+                });
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index e5b246807c..44b5fe09f4 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.KeyBinding
         private OsuSpriteText text;
         private Drawable pressAKey;
 
-        private FillFlowContainer<KeyButton> buttons;
+        public FillFlowContainer<KeyButton> Buttons;
 
         public IEnumerable<string> FilterTerms => bindings.Select(b => b.KeyCombination.ReadableString()).Prepend((string)text.Text);
 
@@ -93,7 +93,7 @@ namespace osu.Game.Overlays.KeyBinding
                     Text = action.GetDescription(),
                     Margin = new MarginPadding(padding),
                 },
-                buttons = new FillFlowContainer<KeyButton>
+                Buttons = new FillFlowContainer<KeyButton>
                 {
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.TopRight,
@@ -116,7 +116,7 @@ namespace osu.Game.Overlays.KeyBinding
             };
 
             foreach (var b in bindings)
-                buttons.Add(new KeyButton(b));
+                Buttons.Add(new KeyButton(b));
         }
 
         public void RestoreDefaults()
@@ -125,7 +125,7 @@ namespace osu.Game.Overlays.KeyBinding
 
             foreach (var d in Defaults)
             {
-                var button = buttons[i++];
+                var button = Buttons[i++];
                 button.UpdateKeyCombination(d);
                 store.Update(button.KeyBinding);
             }
@@ -187,7 +187,7 @@ namespace osu.Game.Overlays.KeyBinding
 
             if (bindTarget.IsHovered)
                 finalise();
-            else if (buttons.Any(b => b.IsHovered))
+            else if (Buttons.Any(b => b.IsHovered))
                 updateBindTarget();
         }
 
@@ -326,7 +326,7 @@ namespace osu.Game.Overlays.KeyBinding
         private void updateBindTarget()
         {
             if (bindTarget != null) bindTarget.IsBinding = false;
-            bindTarget = buttons.FirstOrDefault(b => b.IsHovered) ?? buttons.FirstOrDefault();
+            bindTarget = Buttons.FirstOrDefault(b => b.IsHovered) ?? Buttons.FirstOrDefault();
             if (bindTarget != null) bindTarget.IsBinding = true;
         }
 
@@ -357,7 +357,7 @@ namespace osu.Game.Overlays.KeyBinding
             }
         }
 
-        private class KeyButton : Container
+        public class KeyButton : Container
         {
             public readonly Framework.Input.Bindings.KeyBinding KeyBinding;
 

From d49e54deb60b3cfee754697c446b9b4ea21cfb2a Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 2 Aug 2020 12:47:23 -0700
Subject: [PATCH 04050/10326] Add failing test for another regressing behavior

---
 .../Settings/TestSceneKeyBindingPanel.cs      | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index e7a1cab8eb..96075d56d1 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -104,5 +104,37 @@ namespace osu.Game.Tests.Visual.Settings
                 });
             }
         }
+
+        [Test]
+        public void TestClickRowSelectsFirstBinding()
+        {
+            KeyBindingRow backBindingRow = null;
+
+            AddStep("click back binding row", () =>
+            {
+                backBindingRow = panel.ChildrenOfType<KeyBindingRow>().ElementAt(10);
+                InputManager.MoveMouseTo(backBindingRow);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("first binding selected", () => backBindingRow.Buttons.First().IsBinding);
+
+            AddStep("click second binding", () =>
+            {
+                var target = backBindingRow.Buttons.ElementAt(1);
+
+                InputManager.MoveMouseTo(target);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("click back binding row", () =>
+            {
+                backBindingRow = panel.ChildrenOfType<KeyBindingRow>().ElementAt(10);
+                InputManager.MoveMouseTo(backBindingRow);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("first binding selected", () => backBindingRow.Buttons.First().IsBinding);
+        }
     }
 }

From 7aafc018ad384f5e1d10437519df539a93f4a91b Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 2 Aug 2020 12:52:12 -0700
Subject: [PATCH 04051/10326] Prevent updating bind target when hovering cancel
 and clear buttons instead

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

diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 44b5fe09f4..a7394579bd 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.KeyBinding
         public bool FilteringActive { get; set; }
 
         private OsuSpriteText text;
-        private Drawable pressAKey;
+        private FillFlowContainer cancelAndClearButtons;
 
         public FillFlowContainer<KeyButton> Buttons;
 
@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.KeyBinding
                 Hollow = true,
             };
 
-            Children = new[]
+            Children = new Drawable[]
             {
                 new Box
                 {
@@ -99,7 +99,7 @@ namespace osu.Game.Overlays.KeyBinding
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight
                 },
-                pressAKey = new FillFlowContainer
+                cancelAndClearButtons = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Padding = new MarginPadding(padding) { Top = height + padding * 2 },
@@ -187,7 +187,8 @@ namespace osu.Game.Overlays.KeyBinding
 
             if (bindTarget.IsHovered)
                 finalise();
-            else if (Buttons.Any(b => b.IsHovered))
+            // prevent updating bind target before clear button's action
+            else if (!cancelAndClearButtons.Any(b => b.IsHovered))
                 updateBindTarget();
         }
 
@@ -298,8 +299,8 @@ namespace osu.Game.Overlays.KeyBinding
             if (HasFocus)
                 GetContainingInputManager().ChangeFocus(null);
 
-            pressAKey.FadeOut(300, Easing.OutQuint);
-            pressAKey.BypassAutoSizeAxes |= Axes.Y;
+            cancelAndClearButtons.FadeOut(300, Easing.OutQuint);
+            cancelAndClearButtons.BypassAutoSizeAxes |= Axes.Y;
         }
 
         protected override void OnFocus(FocusEvent e)
@@ -307,8 +308,8 @@ namespace osu.Game.Overlays.KeyBinding
             AutoSizeDuration = 500;
             AutoSizeEasing = Easing.OutQuint;
 
-            pressAKey.FadeIn(300, Easing.OutQuint);
-            pressAKey.BypassAutoSizeAxes &= ~Axes.Y;
+            cancelAndClearButtons.FadeIn(300, Easing.OutQuint);
+            cancelAndClearButtons.BypassAutoSizeAxes &= ~Axes.Y;
 
             updateBindTarget();
             base.OnFocus(e);

From fe97d472dfafa30cdd7686074191d6b04815446f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 2 Aug 2020 21:53:13 +0200
Subject: [PATCH 04052/10326] Enable back overlays when a replay is loaded.

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 24c27fde8d..9d4a4741d5 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -205,10 +205,13 @@ namespace osu.Game.Screens.Play
 
             gameplayOverlaysDisabled.ValueChanged += disabled =>
             {
-                game.OverlayActivationMode.Value = disabled.NewValue && !DrawableRuleset.IsPaused.Value ? OverlayActivation.Disabled : OverlayActivation.All;
+                if (DrawableRuleset.HasReplayLoaded.Value)
+                    game.OverlayActivationMode.Value = OverlayActivation.UserTriggered;
+                else
+                    game.OverlayActivationMode.Value = disabled.NewValue && !DrawableRuleset.IsPaused.Value ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
             };
             DrawableRuleset.IsPaused.BindValueChanged(_ => gameplayOverlaysDisabled.TriggerChange());
-            
+            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => gameplayOverlaysDisabled.TriggerChange());
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 

From 435c9de8b9d500890fb649809f38d6263fca2a89 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 3 Aug 2020 15:25:23 +0900
Subject: [PATCH 04053/10326] Re-privatise buttons

---
 .../Visual/Settings/TestSceneKeyBindingPanel.cs      | 12 ++++++------
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs        | 11 +++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 96075d56d1..e06b3a8a7e 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -79,11 +79,11 @@ namespace osu.Game.Tests.Visual.Settings
 
             clickClearButton();
 
-            AddAssert("first binding cleared", () => string.IsNullOrEmpty(backBindingRow.Buttons.First().Text.Text));
+            AddAssert("first binding cleared", () => string.IsNullOrEmpty(backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().Text.Text));
 
             AddStep("click second binding", () =>
             {
-                var target = backBindingRow.Buttons.ElementAt(1);
+                var target = backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1);
 
                 InputManager.MoveMouseTo(target);
                 InputManager.Click(MouseButton.Left);
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Visual.Settings
 
             clickClearButton();
 
-            AddAssert("second binding cleared", () => string.IsNullOrEmpty(backBindingRow.Buttons.ElementAt(1).Text.Text));
+            AddAssert("second binding cleared", () => string.IsNullOrEmpty(backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).Text.Text));
 
             void clickClearButton()
             {
@@ -117,11 +117,11 @@ namespace osu.Game.Tests.Visual.Settings
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("first binding selected", () => backBindingRow.Buttons.First().IsBinding);
+            AddAssert("first binding selected", () => backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().IsBinding);
 
             AddStep("click second binding", () =>
             {
-                var target = backBindingRow.Buttons.ElementAt(1);
+                var target = backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1);
 
                 InputManager.MoveMouseTo(target);
                 InputManager.Click(MouseButton.Left);
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Visual.Settings
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("first binding selected", () => backBindingRow.Buttons.First().IsBinding);
+            AddAssert("first binding selected", () => backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().IsBinding);
         }
     }
 }
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index a7394579bd..b808d49fa2 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -49,8 +49,7 @@ namespace osu.Game.Overlays.KeyBinding
 
         private OsuSpriteText text;
         private FillFlowContainer cancelAndClearButtons;
-
-        public FillFlowContainer<KeyButton> Buttons;
+        private FillFlowContainer<KeyButton> buttons;
 
         public IEnumerable<string> FilterTerms => bindings.Select(b => b.KeyCombination.ReadableString()).Prepend((string)text.Text);
 
@@ -93,7 +92,7 @@ namespace osu.Game.Overlays.KeyBinding
                     Text = action.GetDescription(),
                     Margin = new MarginPadding(padding),
                 },
-                Buttons = new FillFlowContainer<KeyButton>
+                buttons = new FillFlowContainer<KeyButton>
                 {
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.TopRight,
@@ -116,7 +115,7 @@ namespace osu.Game.Overlays.KeyBinding
             };
 
             foreach (var b in bindings)
-                Buttons.Add(new KeyButton(b));
+                buttons.Add(new KeyButton(b));
         }
 
         public void RestoreDefaults()
@@ -125,7 +124,7 @@ namespace osu.Game.Overlays.KeyBinding
 
             foreach (var d in Defaults)
             {
-                var button = Buttons[i++];
+                var button = buttons[i++];
                 button.UpdateKeyCombination(d);
                 store.Update(button.KeyBinding);
             }
@@ -327,7 +326,7 @@ namespace osu.Game.Overlays.KeyBinding
         private void updateBindTarget()
         {
             if (bindTarget != null) bindTarget.IsBinding = false;
-            bindTarget = Buttons.FirstOrDefault(b => b.IsHovered) ?? Buttons.FirstOrDefault();
+            bindTarget = buttons.FirstOrDefault(b => b.IsHovered) ?? buttons.FirstOrDefault();
             if (bindTarget != null) bindTarget.IsBinding = true;
         }
 

From 630322ff85a5c08a1b71e2a35404386fabd483e7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Aug 2020 09:55:06 +0300
Subject: [PATCH 04054/10326] Adjust font weights in line with web

---
 osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs   | 6 +++---
 .../Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
index 0b660c16af..3badea155d 100644
--- a/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
@@ -102,17 +102,17 @@ namespace osu.Game.Overlays.Dashboard.Home
                                             {
                                                 RelativeSizeAxes = Axes.X,
                                                 Truncate = true,
-                                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold),
+                                                Font = OsuFont.GetFont(weight: FontWeight.Regular),
                                                 Text = SetInfo.Metadata.Title
                                             },
                                             new OsuSpriteText
                                             {
                                                 RelativeSizeAxes = Axes.X,
                                                 Truncate = true,
-                                                Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                                                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
                                                 Text = SetInfo.Metadata.Artist
                                             },
-                                            new LinkFlowContainer(f => f.Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold))
+                                            new LinkFlowContainer(f => f.Font = OsuFont.GetFont(size: 10, weight: FontWeight.Regular))
                                             {
                                                 AutoSizeAxes = Axes.Y,
                                                 RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs
index 2fb5617796..e9066c0657 100644
--- a/osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Dashboard.Home
                 },
                 new OsuSpriteText
                 {
-                    Font = OsuFont.GetFont(size: 10),
+                    Font = OsuFont.GetFont(size: 10, weight: FontWeight.Regular),
                     Text = SetInfo.OnlineInfo.FavouriteCount.ToString()
                 }
             }

From af320e4a619784cd979c1eba9af93a9e29ee97d8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Aug 2020 10:03:42 +0300
Subject: [PATCH 04055/10326] Fix NewsOverlay running request on startup

---
 osu.Game/Overlays/NewsOverlay.cs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index a5687b77e2..f8666e22c5 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -67,7 +67,26 @@ namespace osu.Game.Overlays
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            article.BindValueChanged(onArticleChanged, true);
+            article.BindValueChanged(onArticleChanged);
+        }
+
+        private bool displayUpdateRequired = true;
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+
+            if (displayUpdateRequired)
+            {
+                article.TriggerChange();
+                displayUpdateRequired = false;
+            }
+        }
+
+        protected override void PopOutComplete()
+        {
+            base.PopOutComplete();
+            displayUpdateRequired = true;
         }
 
         public void ShowFrontPage()

From f812767c95428a679d6e5646fc9c6cc5b608ed17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Aug 2020 18:48:10 +0900
Subject: [PATCH 04056/10326] Add fallback hash generation to fix android
 startup crash

---
 osu.Game/OsuGameBase.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 278f2d849f..98f60d52d3 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -36,6 +36,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osuTK.Input;
+using RuntimeInfo = osu.Framework.RuntimeInfo;
 
 namespace osu.Game
 {
@@ -134,8 +135,17 @@ namespace osu.Game
         [BackgroundDependencyLoader]
         private void load()
         {
-            using (var str = File.OpenRead(typeof(OsuGameBase).Assembly.Location))
-                VersionHash = str.ComputeMD5Hash();
+            try
+            {
+                using (var str = File.OpenRead(typeof(OsuGameBase).Assembly.Location))
+                    VersionHash = str.ComputeMD5Hash();
+            }
+            catch
+            {
+                // special case for android builds, which can't read DLLs from a packed apk.
+                // should eventually be handled in a better way.
+                VersionHash = $"{Version}-{RuntimeInfo.OS}".ComputeMD5Hash();
+            }
 
             Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly));
 

From c48648ea2ac014f40281f7b0f313949b7d454fda Mon Sep 17 00:00:00 2001
From: Sebastian Krajewski <mail@wieku.me>
Date: Mon, 3 Aug 2020 12:59:15 +0200
Subject: [PATCH 04057/10326] Add playfield shift like in osu-stable

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
index 9c8be868b0..93d88f3690 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
@@ -55,6 +55,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 // Scale = 819.2 / 512
                 // Scale = 1.6
                 Scale = new Vector2(Parent.ChildSize.X / OsuPlayfield.BASE_SIZE.X);
+                Position = new Vector2(0, 8 * Parent.ChildSize.Y / OsuPlayfield.BASE_SIZE.Y);
                 // Size = 0.625
                 Size = Vector2.Divide(Vector2.One, Scale);
             }

From 675f618b288cc1e75fed0a152c7908e61e77e9d4 Mon Sep 17 00:00:00 2001
From: Sebastian Krajewski <mail@wieku.me>
Date: Mon, 3 Aug 2020 14:18:45 +0200
Subject: [PATCH 04058/10326] Apply playfield's offset only in play mode

---
 osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs       |  2 +-
 .../UI/OsuPlayfieldAdjustmentContainer.cs            | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index b4d51d11c9..e6e37fd58e 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override PassThroughInputManager CreateInputManager() => new OsuInputManager(Ruleset.RulesetInfo);
 
-        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer();
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer { PlayfieldShift = true };
 
         protected override ResumeOverlay CreateResumeOverlay() => new OsuResumeOverlay();
 
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
index 93d88f3690..700601dbfd 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
@@ -15,6 +15,14 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private const float playfield_size_adjust = 0.8f;
 
+        /// <summary>
+        /// Whether an osu-stable playfield offset should be applied (8 osu!pixels)
+        /// </summary>
+        public bool PlayfieldShift
+        {
+            set => ((ScalingContainer)content).PlayfieldShift = value;
+        }
+
         public OsuPlayfieldAdjustmentContainer()
         {
             Anchor = Anchor.Centre;
@@ -39,6 +47,8 @@ namespace osu.Game.Rulesets.Osu.UI
         /// </summary>
         private class ScalingContainer : Container
         {
+            internal bool PlayfieldShift { get; set; }
+
             protected override void Update()
             {
                 base.Update();
@@ -55,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 // Scale = 819.2 / 512
                 // Scale = 1.6
                 Scale = new Vector2(Parent.ChildSize.X / OsuPlayfield.BASE_SIZE.X);
-                Position = new Vector2(0, 8 * Parent.ChildSize.Y / OsuPlayfield.BASE_SIZE.Y);
+                Position = new Vector2(0, (PlayfieldShift ? 8f : 0f) * Parent.ChildSize.Y / OsuPlayfield.BASE_SIZE.Y);
                 // Size = 0.625
                 Size = Vector2.Divide(Vector2.One, Scale);
             }

From 4d6f60edaf8b49a95ede7b5a97fdcca16dfd13ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Aug 2020 22:41:22 +0900
Subject: [PATCH 04059/10326] Fix multiplayer match select forcing playback
 even when user paused

---
 osu.Game/Screens/Multi/Multiplayer.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 269eab5772..4912df17b1 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -17,6 +17,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Overlays;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
@@ -50,6 +51,9 @@ namespace osu.Game.Screens.Multi
         [Cached]
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
+        [Resolved]
+        private MusicController music { get; set; }
+
         [Cached(Type = typeof(IRoomManager))]
         private RoomManager roomManager;
 
@@ -346,8 +350,7 @@ namespace osu.Game.Screens.Multi
                     track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
                     track.Looping = true;
 
-                    if (!track.IsRunning)
-                        track.Restart();
+                    music.EnsurePlayingSomething();
                 }
             }
             else

From 25ebb8619d2cbaa6fc232ed742d33da91b80d703 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 3 Aug 2020 16:00:10 +0200
Subject: [PATCH 04060/10326] Add tests.

---
 .../Gameplay/TestSceneOverlayActivation.cs    | 54 +++++++++++++++++++
 osu.Game/Screens/Play/Player.cs               | 11 ++--
 2 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
new file mode 100644
index 0000000000..107a3a2a4b
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.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.Framework.Allocation;
+using osu.Game.Configuration;
+using osu.Game.Overlays;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneOverlayActivation : OsuPlayerTestScene
+    {
+        private OverlayTestPlayer testPlayer;
+
+        [Resolved]
+        private OsuConfigManager mng { get; set; }
+
+        public override void SetUpSteps()
+        {
+            AddStep("disable overlay activation during gameplay", () => mng.Set(OsuSetting.GameplayDisableOverlayActivation, true));
+            base.SetUpSteps();
+        }
+
+        [Test]
+        public void TestGameplayOverlayActivationSetting()
+        {
+            AddAssert("activation mode is disabled", () => testPlayer.OverlayActivationMode == OverlayActivation.Disabled);
+        }
+
+        [Test]
+        public void TestGameplayOverlayActivationPaused()
+        {
+            AddUntilStep("activation mode is disabled", () => testPlayer.OverlayActivationMode == OverlayActivation.Disabled);
+            AddStep("pause gameplay", () => testPlayer.Pause());
+            AddUntilStep("activation mode is user triggered", () => testPlayer.OverlayActivationMode == OverlayActivation.UserTriggered);
+        }
+
+        [Test]
+        public void TestGameplayOverlayActivationReplayLoaded()
+        {
+            AddAssert("activation mode is disabled", () => testPlayer.OverlayActivationMode == OverlayActivation.Disabled);
+            AddStep("load a replay", () => testPlayer.DrawableRuleset.HasReplayLoaded.Value = true);
+            AddAssert("activation mode is user triggered", () => testPlayer.OverlayActivationMode == OverlayActivation.UserTriggered);
+        }
+
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => testPlayer = new OverlayTestPlayer();
+
+        private class OverlayTestPlayer : TestPlayer
+        {
+            public new OverlayActivation OverlayActivationMode => base.OverlayActivationMode.Value;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 9d4a4741d5..45a9b442be 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private OsuGame game { get; set; }
 
         private SampleChannel sampleRestart;
@@ -90,6 +90,8 @@ namespace osu.Game.Screens.Play
 
         private SkipOverlay skipOverlay;
 
+        protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.Disabled);
+
         protected ScoreProcessor ScoreProcessor { get; private set; }
 
         protected HealthProcessor HealthProcessor { get; private set; }
@@ -203,12 +205,15 @@ namespace osu.Game.Screens.Play
                 skipOverlay.Hide();
             }
 
+            if (game != null)
+                OverlayActivationMode.BindTo(game.OverlayActivationMode);
+
             gameplayOverlaysDisabled.ValueChanged += disabled =>
             {
                 if (DrawableRuleset.HasReplayLoaded.Value)
-                    game.OverlayActivationMode.Value = OverlayActivation.UserTriggered;
+                    OverlayActivationMode.Value = OverlayActivation.UserTriggered;
                 else
-                    game.OverlayActivationMode.Value = disabled.NewValue && !DrawableRuleset.IsPaused.Value ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
+                    OverlayActivationMode.Value = disabled.NewValue && !DrawableRuleset.IsPaused.Value ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
             };
             DrawableRuleset.IsPaused.BindValueChanged(_ => gameplayOverlaysDisabled.TriggerChange());
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => gameplayOverlaysDisabled.TriggerChange());

From 9d10658e3c8cd5d5f0b7d24018401c30fdbec246 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Aug 2020 20:14:17 +0300
Subject: [PATCH 04061/10326] Allow providing custom sprite text for
 RollingCounter<T>

---
 .../Gameplay/Components/MatchScoreDisplay.cs  | 18 ++++--
 .../UserInterface/PercentageCounter.cs        |  9 ++-
 .../Graphics/UserInterface/RollingCounter.cs  | 61 +++++++++++++------
 .../Graphics/UserInterface/ScoreCounter.cs    |  9 ++-
 .../Expanded/Statistics/AccuracyStatistic.cs  | 15 +++--
 .../Expanded/Statistics/CounterStatistic.cs   |  9 ++-
 .../Ranking/Expanded/TotalScoreCounter.cs     | 17 ++++--
 7 files changed, 97 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
index 2e7484542a..25417921bc 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
@@ -8,6 +8,7 @@ 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.Tournament.IPC;
 using osu.Game.Tournament.Models;
@@ -127,21 +128,28 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private class MatchScoreCounter : ScoreCounter
         {
+            private OsuSpriteText displayedSpriteText;
+
             public MatchScoreCounter()
             {
                 Margin = new MarginPadding { Top = bar_height, Horizontal = 10 };
-
-                Winning = false;
-
-                DisplayedCountSpriteText.Spacing = new Vector2(-6);
             }
 
             public bool Winning
             {
-                set => DisplayedCountSpriteText.Font = value
+                set => displayedSpriteText.Font = value
                     ? OsuFont.Torus.With(weight: FontWeight.Bold, size: 50, fixedWidth: true)
                     : OsuFont.Torus.With(weight: FontWeight.Regular, size: 40, fixedWidth: true);
             }
+
+            protected override OsuSpriteText CreateSpriteText()
+            {
+                displayedSpriteText = base.CreateSpriteText();
+                displayedSpriteText.Spacing = new Vector2(-6);
+                Winning = false;
+
+                return displayedSpriteText;
+            }
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/PercentageCounter.cs b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
index 940c9808ce..9b31935eee 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.Graphics.Sprites;
 using osu.Game.Utils;
 
 namespace osu.Game.Graphics.UserInterface
@@ -23,7 +24,6 @@ namespace osu.Game.Graphics.UserInterface
 
         public PercentageCounter()
         {
-            DisplayedCountSpriteText.Font = DisplayedCountSpriteText.Font.With(fixedWidth: true);
             Current.Value = DisplayedCount = 1.0f;
         }
 
@@ -37,6 +37,13 @@ namespace osu.Game.Graphics.UserInterface
             return Math.Abs(currentValue - newValue) * RollingDuration * 100.0f;
         }
 
+        protected override OsuSpriteText CreateSpriteText()
+        {
+            var spriteText = base.CreateSpriteText();
+            spriteText.Font = spriteText.Font.With(fixedWidth: true);
+            return spriteText;
+        }
+
         public override void Increment(double amount)
         {
             Current.Value += amount;
diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index cd244ed7e6..76bb4bf69d 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Sprites;
 using System;
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osuTK.Graphics;
 
@@ -20,7 +21,7 @@ namespace osu.Game.Graphics.UserInterface
         /// </summary>
         public Bindable<T> Current = new Bindable<T>();
 
-        protected SpriteText DisplayedCountSpriteText;
+        private SpriteText displayedCountSpriteText;
 
         /// <summary>
         /// If true, the roll-up duration will be proportional to change in value.
@@ -46,29 +47,49 @@ namespace osu.Game.Graphics.UserInterface
         public virtual T DisplayedCount
         {
             get => displayedCount;
-
             set
             {
                 if (EqualityComparer<T>.Default.Equals(displayedCount, value))
                     return;
 
                 displayedCount = value;
-                DisplayedCountSpriteText.Text = FormatCount(value);
+                if (displayedCountSpriteText != null)
+                    displayedCountSpriteText.Text = FormatCount(value);
             }
         }
 
         public abstract void Increment(T amount);
 
+        private float textSize = 40f;
+
         public float TextSize
         {
-            get => DisplayedCountSpriteText.Font.Size;
-            set => DisplayedCountSpriteText.Font = DisplayedCountSpriteText.Font.With(size: value);
+            get => displayedCountSpriteText?.Font.Size ?? textSize;
+            set
+            {
+                if (TextSize == value)
+                    return;
+
+                textSize = value;
+                if (displayedCountSpriteText != null)
+                    displayedCountSpriteText.Font = displayedCountSpriteText.Font.With(size: value);
+            }
         }
 
+        private Color4 accentColour;
+
         public Color4 AccentColour
         {
-            get => DisplayedCountSpriteText.Colour;
-            set => DisplayedCountSpriteText.Colour = value;
+            get => displayedCountSpriteText?.Colour ?? accentColour;
+            set
+            {
+                if (AccentColour == value)
+                    return;
+
+                accentColour = value;
+                if (displayedCountSpriteText != null)
+                    displayedCountSpriteText.Colour = value;
+            }
         }
 
         /// <summary>
@@ -76,27 +97,21 @@ namespace osu.Game.Graphics.UserInterface
         /// </summary>
         protected RollingCounter()
         {
-            Children = new Drawable[]
-            {
-                DisplayedCountSpriteText = new OsuSpriteText { Font = OsuFont.Numeric }
-            };
-
-            TextSize = 40;
             AutoSizeAxes = Axes.Both;
 
-            DisplayedCount = Current.Value;
-
             Current.ValueChanged += val =>
             {
-                if (IsLoaded) TransformCount(displayedCount, val.NewValue);
+                if (IsLoaded)
+                    TransformCount(DisplayedCount, val.NewValue);
             };
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            base.LoadComplete();
-
-            DisplayedCountSpriteText.Text = FormatCount(Current.Value);
+            displayedCountSpriteText = CreateSpriteText();
+            displayedCountSpriteText.Text = FormatCount(displayedCount);
+            Child = displayedCountSpriteText;
         }
 
         /// <summary>
@@ -167,5 +182,11 @@ namespace osu.Game.Graphics.UserInterface
 
             this.TransformTo(nameof(DisplayedCount), newValue, rollingTotalDuration, RollingEasing);
         }
+
+        protected virtual OsuSpriteText CreateSpriteText() => new OsuSpriteText
+        {
+            Font = OsuFont.Numeric.With(size: textSize),
+            Colour = accentColour,
+        };
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index 01d8edaecf..438fe6c13b 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -24,7 +25,6 @@ namespace osu.Game.Graphics.UserInterface
         /// <param name="leading">How many leading zeroes the counter will have.</param>
         public ScoreCounter(uint leading = 0)
         {
-            DisplayedCountSpriteText.Font = DisplayedCountSpriteText.Font.With(fixedWidth: true);
             LeadingZeroes = leading;
         }
 
@@ -49,6 +49,13 @@ namespace osu.Game.Graphics.UserInterface
             return ((long)count).ToString(format);
         }
 
+        protected override OsuSpriteText CreateSpriteText()
+        {
+            var spriteText = base.CreateSpriteText();
+            spriteText.Font = spriteText.Font.With(fixedWidth: true);
+            return spriteText;
+        }
+
         public override void Increment(double amount)
         {
             Current.Value += amount;
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
index 2a0e33aab7..921ad80976 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Ranking.Expanded.Accuracy;
 using osu.Game.Utils;
@@ -43,16 +44,18 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
 
             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;
+
+            protected override OsuSpriteText CreateSpriteText()
+            {
+                var spriteText = base.CreateSpriteText();
+                spriteText.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
+                spriteText.Spacing = new Vector2(-2, 0);
+                return spriteText;
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index 817cc9b8c2..cc0f49c968 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Ranking.Expanded.Accuracy;
 using osuTK;
@@ -43,10 +44,12 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
 
             protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING;
 
-            public Counter()
+            protected override OsuSpriteText CreateSpriteText()
             {
-                DisplayedCountSpriteText.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
-                DisplayedCountSpriteText.Spacing = new Vector2(-2, 0);
+                var spriteText = base.CreateSpriteText();
+                spriteText.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
+                spriteText.Spacing = new Vector2(-2, 0);
+                return spriteText;
             }
 
             public override void Increment(int amount)
diff --git a/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
index cab04edb8b..b0060d19ac 100644
--- a/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
+++ b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Ranking.Expanded.Accuracy;
 using osuTK;
@@ -23,15 +24,21 @@ namespace osu.Game.Screens.Ranking.Expanded
             // 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");
 
+        protected override OsuSpriteText CreateSpriteText()
+        {
+            var spriteText = base.CreateSpriteText();
+            spriteText.Anchor = Anchor.TopCentre;
+            spriteText.Origin = Anchor.TopCentre;
+
+            spriteText.Font = OsuFont.Torus.With(size: 60, weight: FontWeight.Light, fixedWidth: true);
+            spriteText.Spacing = new Vector2(-5, 0);
+            return spriteText;
+        }
+
         public override void Increment(long amount)
             => Current.Value += amount;
     }

From 29053048ff8ec0e33aef5f2d9ef8966e59b29c75 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Aug 2020 21:40:13 +0300
Subject: [PATCH 04062/10326] Add support to use legacy combo fonts for the
 counter on legacy skins

---
 osu.Game.Rulesets.Catch/CatchSkinComponents.cs        |  3 ++-
 .../Skinning/CatchLegacySkinTransformer.cs            | 11 +++++++++++
 .../Skinning/OsuLegacySkinTransformer.cs              |  4 +---
 osu.Game/Skinning/LegacySkinConfiguration.cs          |  2 ++
 osu.Game/Skinning/LegacySkinTransformer.cs            |  2 ++
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
index 80390705fe..23d8428fec 100644
--- a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
+++ b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
@@ -13,6 +13,7 @@ namespace osu.Game.Rulesets.Catch
         Droplet,
         CatcherIdle,
         CatcherFail,
-        CatcherKiai
+        CatcherKiai,
+        CatchComboCounter
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index d929da1a29..c2432e1dbb 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
@@ -51,6 +52,16 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 case CatchSkinComponents.CatcherKiai:
                     return this.GetAnimation("fruit-catcher-kiai", true, true, true) ??
                            this.GetAnimation("fruit-ryuuta", true, true, true);
+
+                case CatchSkinComponents.CatchComboCounter:
+                    var comboFont = GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
+                    var fontOverlap = GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
+
+                    // For simplicity, let's use legacy combo font texture existence as a way to identify legacy skins from default.
+                    if (HasFont(comboFont))
+                        return new LegacyComboCounter(Source, comboFont, fontOverlap);
+
+                    break;
             }
 
             return null;
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 81d1d05b66..b955150c90 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     var font = GetConfig<OsuSkinConfiguration, string>(OsuSkinConfiguration.HitCirclePrefix)?.Value ?? "default";
                     var overlap = GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.HitCircleOverlap)?.Value ?? -2;
 
-                    return !hasFont(font)
+                    return !HasFont(font)
                         ? null
                         : new LegacySpriteText(Source, font)
                         {
@@ -145,7 +145,5 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             return Source.GetConfig<TLookup, TValue>(lookup);
         }
-
-        private bool hasFont(string fontName) => Source.GetTexture($"{fontName}-0") != null;
     }
 }
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
index 41b7aea34b..1d5412d93f 100644
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacySkinConfiguration.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Skinning
         public enum LegacySetting
         {
             Version,
+            ComboPrefix,
+            ComboOverlap,
             AnimationFramerate,
             LayeredHitSounds,
         }
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index ebc4757e75..acca53835c 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -47,5 +47,7 @@ namespace osu.Game.Skinning
         }
 
         public abstract IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
+
+        protected bool HasFont(string fontPrefix) => GetTexture($"{fontPrefix}-0") != null;
     }
 }

From f5af81d775874f928c8bf8cdeb12fffee23d9cce Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Aug 2020 21:41:22 +0300
Subject: [PATCH 04063/10326] Add legacy combo font glyphs to legacy skins of
 test purposes

---
 .../Resources/old-skin/score-0.png               | Bin 0 -> 3092 bytes
 .../Resources/old-skin/score-1.png               | Bin 0 -> 1237 bytes
 .../Resources/old-skin/score-2.png               | Bin 0 -> 3134 bytes
 .../Resources/old-skin/score-3.png               | Bin 0 -> 3712 bytes
 .../Resources/old-skin/score-4.png               | Bin 0 -> 2395 bytes
 .../Resources/old-skin/score-5.png               | Bin 0 -> 3067 bytes
 .../Resources/old-skin/score-6.png               | Bin 0 -> 3337 bytes
 .../Resources/old-skin/score-7.png               | Bin 0 -> 1910 bytes
 .../Resources/old-skin/score-8.png               | Bin 0 -> 3652 bytes
 .../Resources/old-skin/score-9.png               | Bin 0 -> 3561 bytes
 .../Resources/special-skin/score-0@2x.png        | Bin 0 -> 2184 bytes
 .../Resources/special-skin/score-1@2x.png        | Bin 0 -> 923 bytes
 .../Resources/special-skin/score-2@2x.png        | Bin 0 -> 2196 bytes
 .../Resources/special-skin/score-3@2x.png        | Bin 0 -> 2510 bytes
 .../Resources/special-skin/score-4@2x.png        | Bin 0 -> 1551 bytes
 .../Resources/special-skin/score-5@2x.png        | Bin 0 -> 2265 bytes
 .../Resources/special-skin/score-6@2x.png        | Bin 0 -> 2438 bytes
 .../Resources/special-skin/score-7@2x.png        | Bin 0 -> 1700 bytes
 .../Resources/special-skin/score-8@2x.png        | Bin 0 -> 2498 bytes
 .../Resources/special-skin/score-9@2x.png        | Bin 0 -> 2494 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-0.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-1.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-2.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-3.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-4.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-5.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-6.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-7.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-8.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-9.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-0@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-1@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-2@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-3@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-4@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-5@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-6@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-7@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-8@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-9@2x.png

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-0.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..8304617d8c94a8400b50a90f364941bb02983065
GIT binary patch
literal 3092
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-1.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3b85eb873a9f46dcc300d92afda6155353bab39
GIT binary patch
literal 1237
zcmV;`1S<Q9P)<h;3K|Lk000e1NJLTq001HY002A)1^@s61Dj|m0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$cS%G+RCwC#Sx-wFK@^|eO?GXqjnxSK
zM@tc;77>wp5aXdYkHvliKZD@OPa^24A3!|xAgxEeM50JaMX=Hu|InJ&7&j)_-M*K+
zDPx*sXOc}TGy^|Y;_STN{N}wkGjBD|^Vm&jI=dk)RQZFZX^l)q6P~=G)UNPk_0<1^
z$ol$v&CcWF<DyZ6-VYN(g2E0UFQ5qHI!cNNMm51`hzz4aQ$U9Ri~8d1bASxsC*T5b
z3FCnvo~uNJX3h<xf!hK)g(t@yz%3$jMFfrkhcp?7;HoNO5CJq00rV1j0Qcy(yYws}
z7K=R`92~q2uykFwmzS5{t*x!ShyN7-HmM}PG^9qDW*P-N20R5k0XzcSpO~0<*5BXX
zJ1{WNH8eD2j*gBp%d(hhnk*Cwv0N_4Iy*aG1CdYA{|u0(rBd<{oz@>``VcTUGc)t%
zdAW6ujEorEXgD1HZCs2t{QWL8__GhtMdRtJL^OI42YN6yHT7zKetx2_udk}nY7N6Q
zpU?9#ELv)<5k<n}eBIO2(__(S6s49<EX87x?d<HhL?Yxz!Y{LyA}11wn1*2}WjNP$
z+4=doCnPrUDNV!^64GTNkw{%!TrkIRR5PwCgsj^rkpg-7>Ehzz>eABEX)2Y%S(ap%
zY2Zg_yeN=SCgKW7>G0&_WOHtA?(O8{WPEmZmhJ8Bp(FY(O%)<c)mdFy7F6Vf6FxXN
z&=(dKym&nRa&>i;_4M@A92A#vcX#))BBQD)0-F=}5t|Ybrs+MvM?i9ObMx4?ZC^#Q
z*=(K^;UtuohS5%mesW2f5%-O+fG>a)8j|o4M@5mEyDyL_c{`+hhjvi(nI8n1<}@2M
z)d+Eg`1!&&vyvjsElrJ(_QcbcpO0iRnVih_-{_gucV;|lwzjr@HWf8K1YB7~DoM~1
z2cifk;h-UjYltK3AB`&FY;SMN>^)uu0wcns$2mJYQy~)Q1xqPvT7A>=WRuh1x^jB|
zT9N<b65b}#CekL->ddONf3$*#cy09H7$`$V6YjiPD->}RCaKAgXyh1BItqB@CNs9d
z2~kZhuwy{!Jd#W%i}minx~?;!%BWW<eFmclT*jSxmn<yi#A30iP>l?X$hA`%U9kNW
z(Pc?AdP0*5VelbCAQGq|s^?InLXkk1hAAkb3uLrb_=s;p!>S_@(PVRpYSduN=D-;X
zbxRBoHDhCA9kTacRU$ZOsn~CtX0~2J!>9o=IjXM|g1m%#RF233zNgda6xPvdk-=nV
zSyqN>DK;tDSfQpyUF{rjw7<Wf*x1;3F+4mRp`3B89UUDNR#sL%Pz^3as?_(Z%2|Pd
zKRVHe0{k@64Y<$B9|@kZ@<#&9pk34z75heYw|&58Dtloq&IVgfvx@NAE0(ZM$zM>N
z16KZ&(n0;Mh)kLYeW!PP{X~igRvJN-A~~yAheZOWFb=O+=ZKI^eT!7BY}!Xkl}7v=
zM#iparj>iiwW<M!Uy-J&kF*cZZ6X!zmjD9*_`52{RF+Q&00000NkvXXu0mjf@8UPi

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-2.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f65eb7ca7e52a69d645d3550d932ec55c44acd7
GIT binary patch
literal 3134
zcmV-E48ik>P)<h;3K|Lk000e1NJLTq001cf002A)1^@s6`+Jk#0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU-;7LS5RCwCdT4`uh>lyxLa<Z?+{a#}>
z)41z3VvUI@h=N)L5jF0jh#*yq8%UvU6a-PL6o0s0h%16hQ9)_lHC9dP5^G#)_U)QD
ziCHF@_4Ij%_X}Ufb0*f_YwtbqFv*#j^F8NXpYJ_m(RE$?+z-qD_<gI%HFO1Em86vs
z1ZWKTw@Q|Xc>piq=D$74If>6F`QX8WfFH=r%nV{O!9W-gt{@Z$QHbhHfC#w&C&K}B
z@T-I0qZ{yI{cZ_s0mxYuauGl@5DWAG;(!<+lF0`1XC+BVj)>WTHlRg8E1&PcIz-qL
zh^!WXpvIOXay@~*Kz~L*J{LE7^yt1(QBe`nk`{}_TU1nJYieq0Rmgn=8i5Z$1LFgq
zr}x_xvU;~96@uYxF(Q-*qymE`PMnxAZQ8Wd2@@tnrlh1;f`fyF)oK+W=lj0b>lGf4
zN4VW?QCeCm%FD~$j~+d0dG_pC?Y(>V-rytEKqXKG)Bx`R8(Y_b_1*qf?GlstfJGq~
z4}1%x0mEUjtPLABjF~cJN(d|`!otEtP*6}Oxlhs?rA?A`I-R1UqeIlz)`}}vuCyIF
za^!hgSy>T2_7*4sDwr%;ww>ZtC8`-@a45$fxiuXaGjHC!>3jC<N$%CFmk13F^;xdl
zj0Aa2(|n*CiiwF4@$vB@H8nMI>C&Z{Cr+FgdGzSfM<pdC4>{(8mFm#mr2>#8*_u|4
zL5jUGz#?G(+_`hhYHDh9m&>L9SO=`Dx3skAPoF;3r%#_=jCKADECt4~_lR_m<Yx7=
zVi?CEeQ@x|kt1{V?%kW%yLWG&MY=nrizzMx9TX-MGDC(85pezB+}zxm6jB`f@sea0
zOEN)<!vVlV;P-IN<(oHedJ#+ATBWtMRj;qF*DES2^h=j6=|~d2y1H6#Y;4pW4u=lX
zrr#$I(f1JZ_p$C4U^0-z<<08j$0Rkbe{?swz+cv^S@VGw3A6wasH>~fckbM&j~h3R
z%E}Xf7JG;od^cmp4ELQocYHSy=sI@0UC+zQqauG4SOSb<i)u2lE$n8p;%|V>adB}s
z$Qps-kSzTC`Ew#i<>T+bVc<`|AAqgE0pJqIR$jb#QEzK&Grbl<L`UZ9IXOB1r1hD{
zH`L8!Ov;Ro;hLDVaN)u+iHV7(aR>{F*RNlT`Sa&jq6S{YsT;s;;2x0AxJzhmZoao{
z*|HjBv9BB%iUL%N$jC^Mm6b(q?#*1nWL(O^9l_@Prbmw+>8n<)ilr|Z9k8x=_wJoo
zuwX&e%a<>&Goi=8Gk`MnHNU<9p3`{{eRkl$0ny&xZkkLXAt7Su(4o;Bc2O!xjq4Mg
z>_u5UY0{)&2?+^?R-~-Of@0UMU9BKURx1RGxEMEbee-Y#wXhMW<|f>~f4>eS`$b1b
z8<M2Xm7SffF&9-2ba6GAIbreQ#eL1JNN&D-`LZ~9@?<_+={2{w58S7nh#~40E*2L=
zw29s?E-tPkFPQ2;xSUE8lan&gqLv=2jeSuU2ag{=-a@7~vf{^&AH|_VhsyEqOKxe^
ziUr+%;y~(2Db*a^)lV~xYvp=GanKjSA(^ab)Q_q6o;!Dr^dDv5J0@t8E;dpxyr7hP
z)<Er43KK;rd!@2hN%n!ViK5<Y)Jf3B#M!fFE16&w%Pn%T%R~!GElL**hj{5jac6c=
z=0hcU`KFyx6ibp6s6CRBk`gmAGAu?HA{E1Zw1{Jn6iYL?5a&Dwa?ip9!}<Dg5Ek)9
zVWh4BS?6HMCW(4fl5u0ljvWvl9&YGrDjgRtTxeo~b$*#FOsp6x4M0hWq8~+SC=f{q
z4jaq0HjZPD>TXil@n#8wwkFV%-?B*kz*!r}in8|l5)vIOan`I^7BfpyIFTU=3k%CQ
z&RdwIS0x#P4ijp05h@$kuU{9~4p1$u=R37?%$V&e)w1^O%$YOOs6Lt{4q5T><Hueo
z`7$;_t3OF!+@O$JjS4trHApsd95(U=oJQMHB^D!j4@CVpX~l{au@MmwrmjX`7pG30
zs`K-dQzaP+cf^ntjqa2RIND$XyP=t_=rSoeL5i{`@tib!_U!LQj2I!zGMloxva*s4
z@sdf}l&aBLf;1HIIIi}e#0rtj&(AMatmrUG7~a6i7E5j(NE^4cYuENBSDWpH$chlY
zO^}6enB*r(Nf&nG0&XKKQgKC`(B1sNUv4vVHCr)^vze5ADy*2%ofT1b$kn7n%Xpn;
zH6A5NJ7TfLXmCYI10m6>+@am5c=MDaM3s98p<(ORtuwVEtw&Yk@ZrOaNXnNiQe=bZ
z(qf5ZBQ{zk)KMtQBw4yk>eVk^yeQ!gV>8NXWuG3YxH%nCE@RZFQKnX;wVphAA`Tur
zNNVceY=|ZnCSHFR^=W8m@E|s#d-m+v4{p~;jv<&mr%#_Q-MxGFSynqzOmwVVxzg)b
z6D7eElKuk+4$S%f`|k(fdcr8yDU7hDSiO4nTdZ@JwWpMO9sc!K<2VRDcI?<G;5Nrp
z5GP3u$4aHVfZtsP`Ry=ikT7D$jvd2^pixPaI$;0){cX^gB>Ci2!_bP7q>bOOGpPtx
zFAgr;4NS0wr(x2Hn%^K{5D{FmWJxxPx5calQr*3E>z0m;CW8NBBh<4|48@A3EZ!!q
z$|T)<XYGE<#Ejs`VZ(-HLAA%k#>N`fT)Fkwx^?Rdl$-+Aq&1w;W>v#SQqBwQQup}{
zLnY+oHb`lEk|4!lHcCkfjbe=4OmS$l*~Iqk+iQ!8ith40s8UTxlLq12*Lswpr|4#0
zDaV15AjRN!C^uQyXpKxuOA|(VRI2)Y`}Vb-KY#u@CrT-|+SUM?H1H7Bpbo0zz)lN-
zVD|Cj$A3L}@?=3$&#WH8$}Uujzv0wVe>WScDOC?>pJ6>K7wSm4?UgYIf|)2a8AQ-%
z+d%~FcDuN7<A%O%+qOG6MO%+o?B=F!H0fuJqt!WiG;etmWSJR0e0Ww~Uf!Ve^mJh+
zmZ|SUf{EqJm*=Ca{DZT(oRyB<e-8QCB$e0;m4cXC9d(jlahb{4vSkZx2@GRU5`6RK
zjex)?2EhWhV3o3YbARq5l+H=7GRP0%S}8><xi^_cfe^+S>({RzwP?{IE0r0umM6zB
zxw*MbuU@^n$rFxZCfTTv^nYy9<#CF%vbyDz8>bkKJ!w6fl@Fom?50hddZeVJ_}puz
zvL(SebLNP*Z{JeiFW`N8g`yRm3K=(77Kie*LOxFM?HDzstVAhK84|b;r(>HtcJt=V
z$vHVWf)q`lZ7J1460l5A@HPALg0YGobtwd$Y}w9fha#})yvxFtlS(>~GdCT@dCbO*
z8;8MV8o8EY&rG<g9R;F9Jbd_2$dO82U7fSOzP<^Tw*yXG!&OyP)mBzk*2-i%m{0@v
z@Nz~SleSxwXEVOC0(WLY<&1}WBT!-jy4I*@lLRAzRDRU)w3LAI96_F=_n})I6%`eY
zXU?4Y>+RdOud#fqW&PlL!th(*kEmtkG#aL%JB^vY)<IKX+?@XY{d*l%gSyf0fNWM)
zp_)|FQ>IMGh6M-q@89201OB9siV;Q>>(mgElau=^!+qjsk^AnR*o>vo6M?Ty(4Q=b
zhA6X1i#q8IMT`W0ZtVS32gPz>VWCZ_0KUnZRn8GX(Eb1X6#*p@2@&K(nL3muk{XwQ
zj|kjGBukRn!y`FAl$lD9=YEWv<N0S5OSu}(YKJW5R78J(q`wc<JOU=y<el-p+qXBS
z592O9)z#H5#Eu7+_u$T5=+AcgpB^E9!Ot1IxQ+uNxiust#CGl4wR~lQ+$2d_xb^kt
z{yb>v)T!gJlM5>-C~(M7;SW3cZ<q4q-)%6N{cniseBCxCRnJ?P207B9`Mb1a5HHel
z_3G6!&iG)3q(3R6-&W{fNYcYbXy>*me^t;q&e8ZyUD+MV#}hKuJ$}~mS1w+4zWpUG
z_Y)ejuX|J#6r?~?e)J)f-&7dA`djWxvPU;~{lpuVZXQqkEPmN!`6c|q$|`;V$A1JE
Y0OO;-v8NaCZ2$lO07*qoM6N<$f&jDokN^Mx

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-3.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..82bec3babebd59263dc486e5900a3a01ea4aaed7
GIT binary patch
literal 3712
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-4.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e38c75a9ddf9dc183531b5332ecede96a3f0053
GIT binary patch
literal 2395
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
N002ovPDHLkV1f?Fo=yM&

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-5.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..a562d9f2accc9592595b3b07669195d5b75406f8
GIT binary patch
literal 3067
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
JPDHLkV1kmK?iT<6

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-6.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4cf81f26e5cab5a068ce282ee22b15b92d0df12
GIT binary patch
literal 3337
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
TZ*tsI00000NkvXXu0mjfuoP_o

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-7.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..a23f5379b223d61079e055162fdd93f107f0ec02
GIT binary patch
literal 1910
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-8.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-8.png
new file mode 100644
index 0000000000000000000000000000000000000000..430b18509d3b38dba358be5c825d62b5e3e96134
GIT binary patch
literal 3652
zcmV-K4!iM*P)<h;3K|Lk000e1NJLTq001ih002A)1^@s6|BgfB0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU<=1D|BRCwCVS_y0v=NX+n>|I~@SmOii
z#9)VD4g&!vF(sT0U<eRG5~xxkg(PZIIjBe_w4zmss?r82Qc6OjCMF50s}iM@BY`w6
zM20{q4&}0`xdOq)*v2=$ubsX({eCnoJF_-Pq>l8oyEC&hZ@&LK-uM6G(C%(?n4mUY
zKK<Iav^fTNo>R_s0d62nK3%43kZix8&-A@tj`_cBvQ7cXd4LEYQs4!`g|KEK*$wo_
zXSeBhujwJ~ioE0K(W5~R<mKflE0R<+5DUZu2|yeWBgewzFN$av&;hgufcrY-c(;kX
z9~|_7kaY(ksfL?YixOf<Kq@dC7{=cT2?<H##*ItSb=|l|Yin!QsZ*!wgjg$Z6KDon
z1nT=uIo_to<DQ1aLE1kkvO?4&mKzGB0V9C>MvfervtYr3@sB?GXu_mPlU(89;hNLw
z)IeDC`~6x^Pmcz|T17=g@40j5+VQ>i$dMyg@ZWl%F5t5PXp#qL6Vg3mX@5vJz{zeQ
zIs`}tMgrNu_=19hIcwLhO^l6=)gmGyw6L%+&EdG+<w?4)ug?I96P=x%T5)l4|7V|l
z)^zgZ$;vZl&RoK&Rf6k4wLCzxSe$Os2VVV_WW`6rg(!zS3&@F&kI#Ge-FIism@&g0
z6BDDk-R?mJ1ufp&+iQ^S>gv*9asB=G->=`jdv{rLbMr-<@+EK;xCYb;X}VHRAYp^7
z_-U97JuP}4@W8~06X(A7-g^&?8a2v6YX(|!up2E;;vF3w+Rd9cwW6Y;j>5vilUJ@>
z`8N)q6XKQPBCU527R$PXD2M&Kz{{}c-|+PPxUfEu4J34)3v20hb#(?>T3U2iQ}6HZ
zzvFzkijJVvOG`_2xY!Ncvk3SJun-s{@xpB5Bu7G3p>Rn{_i*TeM=(??o_OMk@aX7h
zTZ__CZEbB@Wo4zdXU`t(+O=z4@J&9U6C)EnZQ3;Vym|99`nt#Cx#L>&Z(8}|k3a5S
zvu4ewjg5^*u=@;fS$w$-M0?HAA0tD*2>8uYPd)V&EfdTlYJ)H8?d|P40!Cl7Xc2?r
zIIs)Y3Ty%X0Bi>i=jP@%W0VX_@_&IF?*qd6&Ye4Zd_La}{HK5h1JWgZ8rD^bpGiMO
z2v6CvWlLUGR+hsqm>4ko_wU!9dFGkQ<HwH|V^;}q3Md!f`%0p{{`&Rn&HMK4i-M)&
zGcq#n2vS;`X)rZ4)djanIehqVwWPFG$;G|TKmWXu&gd8S0&{_1KK=C5mub~t7El{f
zl3~%bw6qHR=a0Y|8I^~CvB3SnXkaps5BwPTQ+9Ut4G=f{HQ2`ea3g*C^yv(^mw{Pg
zT`w)`6w5|PrAo$$!=j?1Z2gozx_<roZd~{a{5&B(RxW;4ArZ|~#DZ`E_zzH4US59c
zop;_bQdqFf<#K6padBFHe*P#aMm}+aFlH<>S>{(C0>Z-~vDz3A45p7h`lw9O%|*$R
zDn~LPls332)v8L)xw3cf-Uhmm)#mkjwG}H?L`$wuP-N-1iY%*EB+6;h(4j+(C$!pF
zl@KhNSdS!b2+1x+tr8{t1p1^R(f1ljyriV0s=K?}^7_1YWMrg<5zZ6?MhIDll7J)}
z4j+sSRiQ}s{Q2`8VzFka>)oQDf^AAV_DHaFvZ~n%7H~kY#R^f6@G~rXoAM7;rRWBi
zE?sI9$=4+$`a;M&b$!D)q3%I(l$@L#DQQ&+f5Wo6>FN7IJ#}COwL2(f+$}|iR*Ftf
zPfrLndgM@3Q`0E|-LLNB6rvo)jzfnIRdASD!|i-3B_$<NZmzloH;6ech(?HTPoxfp
zv`k?o3pIKm+ahk$BOHy3-4+BVPMqjVN=kBDU69fc1tVH&w@-*rc=Ui^uUNrMG(jSp
zxqKu_coapEomH9I%F4<r%|(INbqd)I5yCa7@3mA#RvRB;@#4jr2=Wo4CsKuYoJ4S(
z{7w~d!~!vH_Uze{Al@~*)JUR8i=EI2m6Ac)6<L?b3N&T()vH${mn>OwKiU>YuoOn;
zrzpXBNqG7Wxsb!u2E~dsQ{-W&peCbwO@}V_4Ie(-QWMjvAgR6b$}4Aaeab-!^%}8o
zzsnS@Mj#+zd(f7oKq>h+Tu!I+jylep<>cfzjvYIeit_0c-yI?(lcoA(nTS5Jef#!g
z=wi*vy%;B~j5x3Tt+(F#1iMP5kTi%Z=&m5C#f{XY!>XB+Cr|eB;(>%|@gYNoXpcYs
zco@`D#*G^{lJM!1hB5<Sxg3WPn6h%^%7<XlC}aU!qEK+!fddEnC=+3@FQiP@NEPfc
zcM2*P62-?J0A_61uwnj-FTUu45H|uVSk$s~Li%Y?UPiN6RaK>9s2vj~OwguGnWC{3
zVnwnWdRi1cnt#=*RR@}ynhuJ3yCl`I9UOa%>>{0l8p>oLx>EG$mkSpz)Y&(&6R^{^
zRASV()TR97Z#(72W9%YoYisq_UVBZ4fT8IAHLy$?fTX}q!74lZRiS|J&@wYKwN0Bg
zSz3pFOv?wezFmibjzU|vZk>kwepQD3s&u<elA-#{ZMoYtso@b3u7V_G^yty48#iv$
zX3m^xD{k&)qYKdhAgW28?=+WhF_u4YE=v)OHKm*EWy_Z3efZ&rG4tooH#FuzN+hjC
zMMba@qFu2(pSkw!x8K&bZr!TE$CISUB$$+zF^?w3yfq`^mi#zWh>m~q$tUM--n=;_
zF)`70Xi0`ioJEBA{PWLm5o88okfAhd6!X-n=F#E9BbRH-moL|lb>b1oxft>W(?mzF
zX%g?2qKlO_gl);MP+`g$(V+qgSwLrtf&{K3kFwWdr0xU$D&Y5{I9APbs;jGwfC{!@
zB#d^3jVk{0JK+1$5~YZhooX_MB{2{95uS86oZinr+ii??cB>#lP5Y^Iv%dgV13wh3
zmVLhm{sI4QJbn7KC1Dzegwd&#Nmf`QQ&*fK2vcOU#Hzo2>7|!yk>_lQG9~e*C<>L*
zYX1ya4$J`_7K==l@7(u2;OD?!@Nji!&z?1|VP#<mDIIxzpEQ}%r5e(@4wrO~ECdr?
zef8Cck)|A0k<Uug($b=>UcI`zw6v6Ad`z0fi_+rMiTG#=nBrs_>aVY_cfuGW=gyt$
zqz?y^pPW=d@TH)dsZy){Z%lMd<x`-i|0jLWE|GJn4jw#6hi9w25m+pxHCCecRsxqy
z6D|sjs%t5*2{_G>v5E<{;}9{l?k6(Y@vx-QFjcvt(ewD2PV8C^rX!FwH;c6@fwLr<
z6S#cu6^Yj<b)M~c1*e&q=B&g$OZ3vEOUFxwij~yrQcv%NppFZb_?gI&DY{LQ!0l>2
zHQ4#mm-WjzZQ>dYXytpX$STc@j>0Fw6)j|)su^=)1VT28%%P~|-BNATx<J2OvnUqs
zm&#;RDqh2`U@!;64Z?(|YMl(S#>J4-dk4`h>H}#Q?{*{EsZ*!AOiNf!Mb_x&FI>3L
z#9<yliySV)V!lwQ4p+^p8_QF;hR4q3m~}V}8o1jjL(`5-P#>zZ<rBmCz2fvSs)oxH
zzg;WtHLd(4j2$~RJk%5wQe$6$urbIoNSZHSzFcwf;zixgy1c<-k3FWz@=~%ig(U3>
zBrL7@ZIgb|Nu<x3HOp3WF!&IJT>&}P?>42D>K!|F)Fa;xrOL9h?3giQv<Dx2FuSCr
z<V#6i9TKFi(u(^{B1w(Hy)yTEKOS~WT3VWBS9mCnkc(@Cml8Hc!{}AH7M6`de#`Rt
ze0TI+N@R0C+LVZ0yLLHLi)^xBR6r|!OLDRU0m<*6AB!6{Y?vikS`{VNzjp1~zjK;Y
zCZ&z0(Pff}UObT(!;=XMMFpGxS4n%sh!G^5TwGl2324E6lE_nKJ|WZ8;ZA$~_19A&
z2en|OR%v3CW47X7K|>spDb*^;=|<BSAwEdu^#jgiZ`-!5o4u4(>19des?5%vJN4Y$
zTo#Cb$$G*zpitHo{!B%N4)@#(FTBuC0mIcCt7~#US9jig^UZeo|0*C?eBEOVtVw*U
z&UPZC;tVMGd2{B>aZ@-4a|!wuI|6pL<>lo@KZQ>vm>m!#VL3TD&e^kP8*TdlJKVnK
zo_lU@V`JkX>2TFjYKK}6a|&~x3>oF(dJx`A3pX@0gcRax4UD5f>kwR-v04KQl$>0{
zc;k&XI&sfExc5(i1tNYD#LfP<5^7qsi;(troDg2ep)4pUsIRD~Fa&p~8xLkvi*{T{
zdG^_7t7RcYE!vG0-;cO$(Jo-^R&}_EqH`(CvokU>rfk@-;Q{E-Fe)Mj$Y9rS1N%1k
zyoQnMEG#TMA<Lm^N$Q$JzcHh3UJeah6*s?U5HHSskN9#Hd@u(M9&=?RB&9)`g@VNG
z@}^oPr;pP&i;9XmKltE-bFk_u5$=~ocB(~`4$FmRi#IqTq&g*tdkm8ngBYHlpP!BH
zH5n->5}z)1s){sI9)pHfWZtCME-NcDUY^*$fB$);rz@r<sOv(qQN4E%atS|3sZ^>b
zQd~p5a*`-edNWRrN5NfU)6>(VrJ`{WxdFr7Dpjait=LHWQ)gO4X*JDq5A5X#3)1Rs
zBd-vT2|$$WR|Uc?WL2l2W?R}!ucN3}PufjlCFE--gLzfTX<E$i2)w56fv-;~(cNo$
z(WlGwLXYJ%(bpv#jJV4JYOYr|Pw<&O{ei16-}FmpU*|14{hR729Cl*+|84uP00RK#
WlYXW<G5A^l0000<MNUMnLSTZTCi=1f

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-9.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/score-9.png
new file mode 100644
index 0000000000000000000000000000000000000000..add1202c31255cdf492a9f8bcdfeb21d105e8ef9
GIT binary patch
literal 3561
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-0@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-0@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..508cc85e4ae2ad01c53c93c314502071de8a5e1f
GIT binary patch
literal 2184
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
KMNUMnLSTYH3*fx~

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-1@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-1@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..84f74e1ec9d45818d76353aa66ed1a728a2ad118
GIT binary patch
literal 923
zcmeAS@N?(olHy`uVBq!ia0vp^mOz}v!3HGRn10@2U|?*?baoE#baqxKD9TUE%t>Wn
z(3n^|(bnUzgUr$R;G;^S?A;v}E-U=RTwG<ga=ES$$Z8Ff_0jv=q{i#n)xG#ZRKbVj
zjjtX&TC=)&wE{<7gN3D)<}Q!U|K41>Nj4Vmj_<DS-(B7ipl^Kkl?1!VU9;fM9Wzd@
z>xx~^;pkw0NMhQ|)H9wzLi--SmSfy^?`Xxe|2ys7`)6&I5D@50pP6{;i1d-mv$q|r
zoNsZcYm--vpH12&)=v4I>ni>n+xcMA0b}JfD^q_NMKSK&HCqg|XGwh&DGa$<a!TAt
zZuOk)7THg=vhPjaZ!qU___UpV#T=YENt{A18Y>pH808$vxazra!lJ)B`s*)z^?nj`
zB9uw_IFr@|h23=@?0?){J9Yk?50efRF8F-3(9W%4UF?Fu;yLe=k7v$dIGFyxEB~i<
zX~MI~U!uIb<rw$gK5(?uJNR3}Y1xDaCnxycoZ4j4S|e9szc~LCQ|)$#@3XE)7t1f_
zcbK)y>mCDp`+<zcP1kGh$!5KOd*Ar%zd8o3lA^BTzq^-%q9w`O-33Sk!B6Mi^+1ZV
zz$3Dlfq`2Xgc%uT&5-~KvX^-Jy0SmvU=q_}H@fr994I7N;u=xnoS&PUnpeW$T$Gwv
zlA5AWo>`Ki;O^-g5Z=fq4vg+%PZ!6Kid%2*?DskxAmQ+__%h$F5U#QS8JRDvEEBsp
z9z96gT`K%h@y+TToPBvs&HLK&AG~<<Os$4*7l&8RvY)}{8}m57|2y&2dwIjmnKMl{
zb-ZvnQe2Z4^35vp?77$l_OD%Ex%sV%P+9$P1z*GFoo-CQ35E06&lxDiJ$`-5zCvjc
ze+=W?RoBjFv3+Z(PFQ@ZbTe0@_5s-qv0q=F)MAoj=0C8ZPjbRpiS6Qo+Yj(=h`GMt
z^|Zg{yf>Km8VxsGZpplN_U0GQbAsLngbaTCSj)V3+1^c`<~?C7xb^LO(J_0EC4Xxk
z`7Mr6p1;InqLOQuh-MJkjMS?$KYs0XSSPxtZfod?jtGW6u6t&B)$*F@lWn`|A8CI4
zm)Ya{K<38(qx;r1az7BPI2miOboqV-{mg^uhCyB@Uus=CbLP$MdkmNE&1rvga=AM&
Pju<>${an^LB{Ts5NqUv}

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-2@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-2@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..49625c6623c2d07188e263708d2649af82eefdd7
GIT binary patch
literal 2196
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
W2Bg8WSc5SD0000<MNUMnLSTZLLi5G|

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-3@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-3@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..623b24612fea8be62b3ec6f6036f5ebeaba704f8
GIT binary patch
literal 2510
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
Yzb9%FdtRo)7ytkO07*qoM6N<$g4HLVbpQYW

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-4@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-4@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a33286dc8fe349e3b527dcd47a4d3dae1030125c
GIT binary patch
literal 1551
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
BxF!Gq

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-5@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-5@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8250b0c63d96fe5e5ecfa92b639d8fc5f61ded7
GIT binary patch
literal 2265
zcmV;~2qyQ5P)<h;3K|Lk000e1NJLTq002h-003$T1^@s6?t)DB0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ^g_`2aAX}M5s;{L`5963Pq?8YK2xEOfLO`CJjl7
zi=*ILaPVWX>fqw6tAnc`2!4P#IXWr2NQwVT3N2zhIPS;0dyl(!fKV?p&FUBjG~G5+
ziMW`_u8Li+2thzU!WfpBWz0!Z629Z>9s$1I#dwzgxj#pbnzI-X5Q%4*VcNtS#M7I$
z!FiuJ!ius=d`>)O(glehxvqHp#<}3Kz%wIeIyFxmAr=d5th6yJni}yGaa7fG$`>*o
ztDLtuYvn3y-jlyDoYPm9xlVHk2`pj>5=1DdqJ%PR#Aww?v5=zuxQ~C(^-JVZ$W;O(
z#{w$QAiI9>Klt6Pm7kpOlEQJI^TlyKMu4tepiy(2?_<YloB+XR;7V`#D|KMzlk{3k
ziyi^J+rY(jOH=lM%N=0g$&gLim4Y;dd>(i|qi@OreYZgOn%7%%AEysMnz~Bf00)P_
zXo0fVecl~v@9p0+&HjD>Ds*y+$NP(?00006VoOIv00000008+zyMF)x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru<Ol*5G!~34=^6k402y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00yy1L_t(|+U=cbY!y`$$N#4mfwm|DvWc-GihwJEDA8zC
zM3D~=7ec^&P1FR97=p_e6B9pRB8ef8sEG=KalsFUXo6UciW^}O1rci^xI%@33Y7Ne
zhq;8;rmvm3Z{Ezb&Of;cDKm4<`@Q?_a?ZVXq+Gdj<;vCd1WX1t1NQ<I8TRus;4NTz
zB7Oo-11%iYR^U#cXGVbZ0`34d&{~s{FusrWwHtU27zbFwKx%-g!1KVLZTxBh9!ScO
zVsHwz6IcS=0-Oa@#_Yqfz<I!2U^Q^Ch#xJ$-KE;IC~zdzM11}MNt-0CleAINpOW?z
zl)bJTl2j$BPeD0O(kYTgNjlS&(<F5Uyjjv6X7+N{;e>vC6kj^fVM(*iY(*SSRVo{b
z1I)jYW|`UBaXFP0IHhWfq?^oaQ=AX2=mubxN*W(Gn63`zCrQ)IY_^&0FNcAy2<M=r
zrzDLwvz6sE<lE*Pc0Ejw1flGev{=$YGuxT9`AXp+@Mqv;U_r>iVJZ3scnIi|<w<8N
zI0b+2>*iQ1f&DSSI1GFOJOYg9661?DgTNhTc5*w{^pte5q%o34yV31nH{z{vrKw<K
z+$gERb;TRpD0;J*9q4M|igs&GcUFaR<#2L1Ih-6$4kw3`!^z>~aB}5vayU7h98Nk)
zJT>F;=_e`3UXGA7Ku2Rem6G<mvRBfNlD12#H?u?C5)RN$(qu{3NxD{2zle`$0=|~?
zk)$<}R-0K<W~x}!U>7g|m<N39LZ5MJH?SDEpi994s)5IWy_8=q!0W&nnT7-O0PY8V
zBY8Esnlv=d&m2pD9T+9)4Fy5<wrZ60MM3$&HMV;cEIk>dAP9e?oGWR%B%crZucUcq
zwlEVl2e`gSN@f)>4d~%v%Ycc%v%v2jHEB`Y3#X#M`OW=|ZUdUzIQAKEQH*v^0ABI{
z^geKW8gP#E7%gp*ar1#=%4Gj)pgtm?Z-G<OfK#Xg!1M%s7zk{O2<SVYCM`J4z?1}k
z-orh5#N}zhc`}7z#aNF83=bv^=gXwm9vArYa6~wV;_N8Gz_~odL1|Cmr-*=l^ch<C
zz^Ti?l;&oSF8=l;;M|r0I2CSjQxt6rJKQKG*!6DOaLlYl(yI|~8zE^%+}~1T0sUPW
z3Z;zn_-Snp(~(4}IfXznvv|qOwklW|7Dc07@GUktYYP7TLdL?qK1=$qiM#8Z2ArKS
zFajp|tWwqgLBKH2AlZ;|^;XJIyR$>mK95_k?DlY+ws_ogRSu`PCj4LE)O*}h+tGNZ
zJHheUR@6&DfIo**L?`8NimN(@Q(RR!oQ~U_ZV$&dT>DS4|M1ER0>dSZQ;@Q4mb61s
zotZVH2&XFH8rKR)1#l~{se>JMOMvQ>=2x>k=U3;HYPc3y7t+|4k`4O#c#kKXq26r{
zFjms%lFkq5=SWF!0LLcG$EU{rZDzlC!2wQ`^p2!~5sjWMX->j$j`O(Zhf?NNFG?Eb
z>FnHu;naHE^Su`wmmQp1g0lmF!3o0g*=D`gx8}@?!Qn9(hf^0Bj@uu8bqo$Ca@d($
zViL8MHcDFWQ*$nn)H?>hw`RE3yk}<3K5)jx;P5^L$G9XRpVbpfJG-D5oPjYoys)!x
zCPqz;c>Q0JR{6p?u|#M8ko0Uq?M<bmD<a;uEX-btiZ~~vP7RVKB{&JaDB=LHS<-?q
z7Z!u#dw5Tsq={y>F~Kf8>Q8F9nbnt4Rp)rDT9~1P1yn{{e%l0$F4gFbA&vdz!WgLp
z%{;;s3*s;uX3fhkpjIgg*cbuKFR>kM)y~nmZFPUjV5UR>(+o_F)A;;O3|^Qbm}7vo
z5#T%;w*#kjVsLzlaGs6;=9O|ev8)55GgAUHwatc<j<go&RW3&c1AB@XelrCywLn8i
zFgwZ~PjXumi)9-|B?x99us$T1UlR%PyOhkT4)!zEB;dmt!1j<}wkA5n0D1!-6mjOW
zxHp~_*fp1OX$%QwHPAnehOpZ05ieGaXT>>EcJFSei!d#CEY){W0DU^?!8QT+0fRiB
zKM1%B_%uRSy}n#qh0OCq+#qR@f^#U^Q;UK`;5r4T_it0MRk~5Z_U0-VX6UOR33#@G
zq~UmlU)<0j=?O`T6AY?F`j%fS!%+-jdZKwiUu9juDZn#sw{W@C41DNbmy+1)TP#LM
zy(P_b!KX_l4Jq-F`y_oT>3vBn(l|Za%2=a@J4h20<dphJ>hH>tBVztm>$7sUDac=c
nC24);+LBzka^=dED|7k}Cp+Yxt)OTj00000NkvXXu0mjfFn}8V

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-6@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-6@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..75d3cbd3bd5931289026636b1426e69e97eca4ca
GIT binary patch
literal 2438
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
Ef(UtvIRF3v

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-7@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-7@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfe2021df40680208e385ab41ee12ab157899712
GIT binary patch
literal 1700
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-8@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-8@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba9492c7f8435e51ffd49db2e56708602e58cba0
GIT binary patch
literal 2498
zcmV;z2|f0SP)<h;3K|Lk000e1NJLTq002h-003$T1^@s6?t)DB0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ^g_`2aAX}M5s;{L`5963Pq?8YK2xEOfLO`CJjl7
zi=*ILaPVWX>fqw6tAnc`2!4P#IXWr2NQwVT3N2zhIPS;0dyl(!fKV?p&FUBjG~G5+
ziMW`_u8Li+2thzU!WfpBWz0!Z629Z>9s$1I#dwzgxj#pbnzI-X5Q%4*VcNtS#M7I$
z!FiuJ!ius=d`>)O(glehxvqHp#<}3Kz%wIeIyFxmAr=d5th6yJni}yGaa7fG$`>*o
ztDLtuYvn3y-jlyDoYPm9xlVHk2`pj>5=1DdqJ%PR#Aww?v5=zuxQ~C(^-JVZ$W;O(
z#{w$QAiI9>Klt6Pm7kpOlEQJI^TlyKMu4tepiy(2?_<YloB+XR;7V`#D|KMzlk{3k
ziyi^J+rY(jOH=lM%N=0g$&gLim4Y;dd>(i|qi@OreYZgOn%7%%AEysMnz~Bf00)P_
zXo0fVecl~v@9p0+&HjD>Ds*y+$NP(?00006VoOIv00000008+zyMF)x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru<Ol*5HWW}5>a+j=02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00){$L_t(|+U=ctj8)YY#=kx2ARsb;C_Yfys5CW=)DaZH
zM^&n5D)j+rrP@-B)%uJYUo}zFnwU1J@ojA@QKPX%t+A9=6cw6OBBYI$ilR`N0t$?P
zFo?=9zy2}XWMb|;d)@Q8`;z-5C-cWSXRq&md!PMUYweMmXrhTGnur3fOk=>Fl8%uy
zQPOBh!~0x&OBy2SGf7?k>X5Wj(z}vgk+j4)*RxBA1MDv83`r+Snj~qgq<$HS+$8BG
zN%JJV=$u>CaLp0eAGi%zOR<;>9MdSGj0gS*?4Vq{08EVXvjPT5x<k?xl3EO}tdO)&
z(qc*LBy~#qNYba0Mo1bdX<tc)N;*x_;YKQRB+Ycrb;i<KP6AdMYWEG`Vqm`%Hb(h(
z-!$0yA8>5FMQH)<HISVH9G{a-2Yeq`9<aFsxTaph^aCCb5L^#TFUbCGzQgYcaCopD
z!aQLZMTVEa<s6_Zz~$yLg?TbS=1)LtiIp`L*cjk+ei=k=43K!%PyEVm%~OD#3A{cB
zCKXBG5MX-(fev7B9S4Y80u{Fu=vS2SmjlL6tMlmT3>+^n!tjLwqq8HKb4?8J+?eY?
z0ki@i28@0?q9x3{0M|S7G&Un(Y;9rRayq_~0({@k)7XN5vHK%j0Iv>kKH5@FOTfrb
zzcH1B_afXNcrkE)T4r%1O*U*!bwnu6yuke_d5AOKP{x`F#hD+tKROR_Ec+-!VpGOB
zw_egG36Bi)T}CEx4l{5$IMR*D^@01NvWnBT3yU)>t2lcZNF3Ur;;hRmjs>R!Ln0Js
zXV!rvB#vdHdXS_aL?}*Dm(b;$+mcnB4MrkAiBO!R1?G}GhVu1BBHsWmj%fMN8W?Gx
z$-~HfH8|Ej0S=EuoN);}dw>J;XgM#{z-fS_r+@(w=<}_FdkdU%tMjOVAwYMHuGxh^
zTb)}@lJjpuo`(LO!gu{|;D9;_b7YbOAa7&SQabln<yuR2zJIR5XB%)>-o{#hcTx(p
z6Zj>tM@hmQSGw;C_;JP%k+%x<8})J=1T3p!|Dhrcw*ar^5J&SI@b!W?K9&%>)4%8@
zdl0ZW2Z6eQM}W~ea=X5Yt-qG_NelR1j?q}%J|JOiMo!mMDgXJxTTBHq*A*1DHn~O~
z&WE8?ngRbDXi+@?{Gy=PzPEr&eMoMS{h`2LD!jiLm>R?S<rYKmP+DvT?g9>}V0Q}e
z-zuH`{?Y6S0O$J2RZ-~ifl#Ld2Ln%6cxH7`5oCD?^i5+RV;(|%IVj-z(ng~U0__g`
z4EVIf*yDCJ5`Zx&7piIS5pV-Au#p6Ez$L)PC5iMQaAoOpnv5b{RdR^`a^U3HML7wW
zU5EUKFYp*JA~sRZ@|#@Mwk~D^5BR<2GWw(M#vsZmz~Tg=PXJ^3JU;@s9q24!=)bcr
zQD;CKFe`!FGT_97_Xh%30Phzp()?0CGe2WplR)TRYZSZBWB8$8R~3b~(`4(U5$5KE
zHPv?DM;WF7X9qsfI0f=G{QH1Y?}VIeO$J^mNT88<3)2exEs$F<rGN^Vkl;;7iv_uM
z(t(Z_U`7dEh1YWw=+?Z5-4HPJc!|rB^Ku&9x-)kHz!`xJt<`0_et`kNuLCJW7QCDK
z^8)s$vg6hl=hkuZc|5Qpqd*s=HGY#p`4-g?-jO#egE-4;Zau(AU~8b@Xrj5Qcp<Eq
zQLC|E1q$30+xDc-JMT^*&U3XI3iUP5Dnj_ttX6C_=cNMeh5|2(ct7c$6arOTAXn;8
z&oOX#IpY1cYb7nJ@tsqx%7@%6TNF8b&_gYrkUv;k&Q}7q*TpW5bFM?uQ#HJ@Z%`bc
z7rtkppbcsa+?}g9k}SUF&PGtiIrlI1p3zgPIGfZsu+CxnTf`Y=D5$N0#93^7?qiEM
zU50{2Hjp?g^Au;xE+&q(3s_+h=Yw5LoZXDi{l_BCDoI-d1+@ah8blmxq}M-#;yCA!
zwA4`8#0C+^l7F#NRZcLdG((<mDDbQX5yz72u*f;L(JIayLxE?;bn;08zGHai(OMR5
zEr$IZlKkM2EItPt7N48xJsne~mgA4qz0Y8OX5_7AYPFefA3Wro+g7XUZG?}P>mkw;
zWqkl==oHG%)cNo}@*#vJ_4Yti;eMro`%kkPnQJg|No2z8V+f3T0dQFj9cYLO?V^CQ
zh*R<%04y>@pYE5JK}(k27V9}!1q$PQ++h+n<evL(2qyT#m(^Y;Vfq8VGXzl{Q51p8
z4OueVfUC>wq<zB3V#9o<y=WpA8lxNj0er25&uF@D5up_Bab?xiRKh1t;%BE1=Urod
z20uL^=D9Cs0ehAGjSmHWTSGG1>%c|8s0@OP_nA4%jQJ2}X8oNmqev%6`i-P9HN3V~
z(rfDVO0JT$(O;W9pAnMw>GSs}NheDhYAAb$q$ed^7sUzwex$glzz|srHUM`-mBv^>
zsCM7aY%NKYH+{tv5)R`E5^1n{|HsU+{yL(D{oEw1RIj6Mp`?Y*xfMlLwkxSc4U{xa
z(gaCgRj+@n?={?SFKk!u$&lN8-_+r+H@p~Y)I<|aG|@y8P4vP40oiCn!+=J%#sB~S
M07*qoM6N<$f_RIB<NyEw

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-9@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/score-9@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7b6b81570ed6936eabd6468f56d1d096079fb92
GIT binary patch
literal 2494
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
IM6N<$g4va<@Bjb+

literal 0
HcmV?d00001


From d6f36457a8736963b7710cab79ceca1f5512ac35 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Aug 2020 21:43:03 +0300
Subject: [PATCH 04064/10326] Fix legacy font glyphs being mistaken for
 animation and getting "extrapolated"

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 28 +++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 81c13112d0..49ba02fdea 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -152,25 +153,38 @@ namespace osu.Game.Tests.Visual
         {
             private readonly bool extrapolateAnimations;
 
+            private readonly HashSet<string> legacyFontPrefixes = new HashSet<string>();
+
             public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, bool extrapolateAnimations)
                 : base(skin, storage, audioManager, "skin.ini")
             {
                 this.extrapolateAnimations = extrapolateAnimations;
+
+                legacyFontPrefixes.Add(GetConfig<string, string>("HitCirclePrefix")?.Value ?? "default");
+                legacyFontPrefixes.Add(GetConfig<string, string>("ScorePrefix")?.Value ?? "score");
+                legacyFontPrefixes.Add(GetConfig<string, string>("ComboPrefix")?.Value ?? "score");
             }
 
             public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
                 // extrapolate frames to test longer animations
-                if (extrapolateAnimations)
-                {
-                    var match = Regex.Match(componentName, "-([0-9]*)");
-
-                    if (match.Length > 0 && int.TryParse(match.Groups[1].Value, out var number) && number < 60)
-                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), wrapModeS, wrapModeT);
-                }
+                if (extrapolateAnimations && isAnimationComponent(componentName, out var number) && number < 60)
+                    return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), wrapModeS, wrapModeT);
 
                 return base.GetTexture(componentName, wrapModeS, wrapModeT);
             }
+
+            private bool isAnimationComponent(string componentName, out int number)
+            {
+                number = 0;
+
+                // legacy font glyph textures have the pattern "{fontPrefix}-{character}", which could be mistaken for an animation frame.
+                if (legacyFontPrefixes.Any(p => componentName.StartsWith($"{p}-")))
+                    return false;
+
+                var match = Regex.Match(componentName, "-([0-9]*)");
+                return match.Length > 0 && int.TryParse(match.Groups[1].Value, out number);
+            }
         }
     }
 }

From f37ba49f7f624614b99ddfadc5e54785d0722b5b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Aug 2020 22:13:02 +0300
Subject: [PATCH 04065/10326] Add catch-specific combo counter with its legacy
 design

---
 .../Skinning/LegacyComboCounter.cs            | 139 ++++++++++++++++++
 .../UI/CatchComboDisplay.cs                   |  59 ++++++++
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs  |  32 +++-
 .../UI/ICatchComboCounter.cs                  |  34 +++++
 4 files changed, 262 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
 create mode 100644 osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
 create mode 100644 osu.Game.Rulesets.Catch/UI/ICatchComboCounter.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
new file mode 100644
index 0000000000..9700bd0e08
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -0,0 +1,139 @@
+// Copyright (c) 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.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Skinning
+{
+    internal class LegacyComboCounter : CompositeDrawable, ICatchComboCounter
+    {
+        private readonly ISkin skin;
+
+        private readonly string fontName;
+        private readonly float fontOverlap;
+
+        private readonly LegacyRollingCounter counter;
+        private LegacyRollingCounter lastExplosion;
+
+        public LegacyComboCounter(ISkin skin, string fontName, float fontOverlap)
+        {
+            this.skin = skin;
+
+            this.fontName = fontName;
+            this.fontOverlap = fontOverlap;
+
+            AutoSizeAxes = Axes.Both;
+
+            Alpha = 0f;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+            Scale = new Vector2(0.8f);
+
+            InternalChild = counter = new LegacyRollingCounter(skin, fontName, fontOverlap)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
+        }
+
+        public void DisplayInitialCombo(int combo) => updateCombo(combo, null, true);
+        public void UpdateCombo(int combo, Color4? hitObjectColour) => updateCombo(combo, hitObjectColour, false);
+
+        private void updateCombo(int combo, Color4? hitObjectColour, bool immediate)
+        {
+            // Combo fell to zero, roll down and fade out the counter.
+            if (combo == 0)
+            {
+                counter.Current.Value = 0;
+                if (lastExplosion != null)
+                    lastExplosion.Current.Value = 0;
+
+                this.FadeOut(immediate ? 0.0 : 400.0, Easing.Out);
+                return;
+            }
+
+            // There may still be previous transforms being applied, finish them and remove explosion.
+            FinishTransforms(true);
+            if (lastExplosion != null)
+                RemoveInternal(lastExplosion);
+
+            this.FadeIn().Delay(1000.0).FadeOut(300.0);
+
+            // For simplicity, in the case of rewinding we'll just set the counter to the current combo value.
+            immediate |= Time.Elapsed < 0;
+
+            if (immediate)
+            {
+                counter.SetCountWithoutRolling(combo);
+                return;
+            }
+
+            counter.ScaleTo(1.5f).ScaleTo(0.8f, 250.0, Easing.Out)
+                   .OnComplete(c => c.SetCountWithoutRolling(combo));
+
+            counter.Delay(250.0).ScaleTo(1f).ScaleTo(1.1f, 60.0).Then().ScaleTo(1f, 30.0);
+
+            var explosion = new LegacyRollingCounter(skin, fontName, fontOverlap)
+            {
+                Alpha = 0.65f,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(1.5f),
+                Colour = hitObjectColour ?? Color4.White,
+                Depth = 1f,
+            };
+
+            AddInternal(explosion);
+
+            explosion.SetCountWithoutRolling(combo);
+            explosion.ScaleTo(1.9f, 400.0, Easing.Out)
+                     .FadeOut(400.0)
+                     .Expire(true);
+
+            lastExplosion = explosion;
+        }
+
+        private class LegacyRollingCounter : RollingCounter<int>
+        {
+            private readonly ISkin skin;
+
+            private readonly string fontName;
+            private readonly float fontOverlap;
+
+            protected override bool IsRollingProportional => true;
+
+            public LegacyRollingCounter(ISkin skin, string fontName, float fontOverlap)
+            {
+                this.skin = skin;
+                this.fontName = fontName;
+                this.fontOverlap = fontOverlap;
+            }
+
+            public override void Increment(int amount) => Current.Value += amount;
+
+            protected override double GetProportionalDuration(int currentValue, int newValue)
+            {
+                return Math.Abs(newValue - currentValue) * 75.0;
+            }
+
+            protected override OsuSpriteText CreateSpriteText()
+            {
+                return new LegacySpriteText(skin, fontName)
+                {
+                    Spacing = new Vector2(-fontOverlap, 0f)
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
new file mode 100644
index 0000000000..10aee2ea31
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.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 JetBrains.Annotations;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.UI
+{
+    public class CatchComboDisplay : SkinnableDrawable
+    {
+        private int currentCombo;
+
+        [CanBeNull]
+        public ICatchComboCounter ComboCounter => Drawable as ICatchComboCounter;
+
+        public CatchComboDisplay()
+            : base(new CatchSkinComponent(CatchSkinComponents.CatchComboCounter), _ => Empty())
+        {
+        }
+
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+            ComboCounter?.DisplayInitialCombo(currentCombo);
+        }
+
+        public void OnNewResult(DrawableCatchHitObject judgedObject, JudgementResult result)
+        {
+            if (!result.Judgement.AffectsCombo || !result.HasResult)
+                return;
+
+            if (result.Type == HitResult.Miss)
+            {
+                updateCombo(0, null);
+                return;
+            }
+
+            updateCombo(result.ComboAtJudgement + 1, judgedObject.AccentColour.Value);
+        }
+
+        public void OnRevertResult(DrawableCatchHitObject judgedObject, JudgementResult result)
+        {
+            if (!result.Judgement.AffectsCombo || !result.HasResult)
+                return;
+
+            updateCombo(result.ComboAtJudgement, judgedObject.AccentColour.Value);
+        }
+
+        private void updateCombo(int newCombo, Color4? hitObjectColour)
+        {
+            currentCombo = newCombo;
+            ComboCounter?.UpdateCombo(newCombo, hitObjectColour);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 154e1576db..b5c040f80d 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Rulesets.Catch.UI
         public const float CENTER_X = WIDTH / 2;
 
         internal readonly CatcherArea CatcherArea;
+        private readonly CatchComboDisplay comboDisplay;
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             // only check the X position; handle all vertical space.
@@ -48,12 +49,22 @@ namespace osu.Game.Rulesets.Catch.UI
                 Origin = Anchor.TopLeft,
             };
 
+            comboDisplay = new CatchComboDisplay
+            {
+                AutoSizeAxes = Axes.Both,
+                RelativeSizeAxes = Axes.None,
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.Centre,
+                Y = 30f,
+            };
+
             InternalChildren = new[]
             {
                 explodingFruitContainer,
                 CatcherArea.MovableCatcher.CreateProxiedContent(),
                 HitObjectContainer,
-                CatcherArea
+                CatcherArea,
+                comboDisplay,
             };
         }
 
@@ -62,6 +73,7 @@ namespace osu.Game.Rulesets.Catch.UI
         public override void Add(DrawableHitObject h)
         {
             h.OnNewResult += onNewResult;
+            h.OnRevertResult += onRevertResult;
 
             base.Add(h);
 
@@ -69,7 +81,23 @@ namespace osu.Game.Rulesets.Catch.UI
             fruit.CheckPosition = CheckIfWeCanCatch;
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            comboDisplay.X = CatcherArea.MovableCatcher.X;
+        }
+
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
-            => CatcherArea.OnResult((DrawableCatchHitObject)judgedObject, result);
+        {
+            var catchObject = (DrawableCatchHitObject)judgedObject;
+            CatcherArea.OnResult(catchObject, result);
+
+            comboDisplay.OnNewResult(catchObject, result);
+        }
+
+        private void onRevertResult(DrawableHitObject judgedObject, JudgementResult result)
+        {
+            comboDisplay.OnRevertResult((DrawableCatchHitObject)judgedObject, result);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/ICatchComboCounter.cs b/osu.Game.Rulesets.Catch/UI/ICatchComboCounter.cs
new file mode 100644
index 0000000000..1363ed1352
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/UI/ICatchComboCounter.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.Graphics;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.UI
+{
+    /// <summary>
+    /// An interface providing a set of methods to update the combo counter.
+    /// </summary>
+    public interface ICatchComboCounter : IDrawable
+    {
+        /// <summary>
+        /// Updates the counter to display the provided <paramref name="combo"/> as initial value.
+        /// The value should be immediately displayed without any animation.
+        /// </summary>
+        /// <remarks>
+        /// This is required for when instantiating a combo counter in middle of accumulating combo (via skin change).
+        /// </remarks>
+        /// <param name="combo">The combo value to be displayed as initial.</param>
+        void DisplayInitialCombo(int combo);
+
+        /// <summary>
+        /// Updates the counter to animate a transition from the old combo value it had to the current provided one.
+        /// </summary>
+        /// <remarks>
+        /// This is called regardless of whether the clock is rewinding.
+        /// </remarks>
+        /// <param name="combo">The new combo value.</param>
+        /// <param name="hitObjectColour">The colour of the object if hit, null on miss.</param>
+        void UpdateCombo(int combo, Color4? hitObjectColour);
+    }
+}

From 21eaf0e99515fb708f5e00787295f94296f997ee Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Aug 2020 22:14:00 +0300
Subject: [PATCH 04066/10326] Expose "is break time" bindable within
 GameplayBeatmap

---
 osu.Game/Screens/Play/GameplayBeatmap.cs | 5 +++++
 osu.Game/Screens/Play/Player.cs          | 1 +
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 64894544f4..d7eed73275 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -16,6 +16,11 @@ namespace osu.Game.Screens.Play
     {
         public readonly IBeatmap PlayableBeatmap;
 
+        /// <summary>
+        /// Whether the gameplay is currently in a break.
+        /// </summary>
+        public IBindable<bool> IsBreakTime { get; } = new Bindable<bool>();
+
         public GameplayBeatmap(IBeatmap playableBeatmap)
         {
             PlayableBeatmap = playableBeatmap;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 541275cf55..ee32ded93d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -612,6 +612,7 @@ namespace osu.Game.Screens.Play
 
             // bind component bindables.
             Background.IsBreakTime.BindTo(breakTracker.IsBreakTime);
+            gameplayBeatmap.IsBreakTime.BindTo(breakTracker.IsBreakTime);
             DimmableStoryboard.IsBreakTime.BindTo(breakTracker.IsBreakTime);
 
             Background.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);

From 65c269e473d15abb7bebd072dbb01f96f9849869 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Aug 2020 22:17:11 +0300
Subject: [PATCH 04067/10326] Hide combo counter on gameplay break

Intentionally inside LegacyComboCounter and not in CatchComboDisplay, to avoid conflicting with how the legacy combo counter fades away after 1 second of no combo update, can move to parent once a DefaultComboCounter design is decided and code is shareable between.
---
 .../Skinning/LegacyComboCounter.cs              | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index 9700bd0e08..90dd1f4e9f 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -47,6 +47,23 @@ namespace osu.Game.Rulesets.Catch.Skinning
             };
         }
 
+        private IBindable<bool> isBreakTime;
+
+        [Resolved(canBeNull: true)]
+        private GameplayBeatmap beatmap { get; set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            isBreakTime = beatmap?.IsBreakTime.GetBoundCopy();
+            isBreakTime?.BindValueChanged(b =>
+            {
+                if (b.NewValue)
+                    this.FadeOut(400.0, Easing.OutQuint);
+            });
+        }
+
         public void DisplayInitialCombo(int combo) => updateCombo(combo, null, true);
         public void UpdateCombo(int combo, Color4? hitObjectColour) => updateCombo(combo, hitObjectColour, false);
 

From 5cd2841080caf8e41b135d740a246f5d6535abae Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Aug 2020 22:17:42 +0300
Subject: [PATCH 04068/10326] Add test scene showing off the skinnable
 catch-specific combo counter

---
 .../TestSceneComboCounter.cs                  | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
new file mode 100644
index 0000000000..2581e305dd
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
@@ -0,0 +1,79 @@
+// Copyright (c) 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.Bindables;
+using osu.Framework.Graphics;
+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.Screens.Play;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public class TestSceneComboCounter : CatchSkinnableTestScene
+    {
+        private ScoreProcessor scoreProcessor;
+        private GameplayBeatmap gameplayBeatmap;
+        private readonly Bindable<bool> isBreakTime = new BindableBool();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            gameplayBeatmap = new GameplayBeatmap(CreateBeatmapForSkinProvider());
+            gameplayBeatmap.IsBreakTime.BindTo(isBreakTime);
+            Dependencies.Cache(gameplayBeatmap);
+            Add(gameplayBeatmap);
+        }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            scoreProcessor = new ScoreProcessor();
+
+            SetContents(() => new CatchComboDisplay
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(2.5f),
+            });
+        });
+
+        [Test]
+        public void TestCatchComboCounter()
+        {
+            AddRepeatStep("perform hit", () => performJudgement(HitResult.Perfect), 20);
+            AddStep("perform miss", () => performJudgement(HitResult.Miss));
+            AddToggleStep("toggle gameplay break", v => isBreakTime.Value = v);
+        }
+
+        private void performJudgement(HitResult type, Judgement judgement = null)
+        {
+            var judgedObject = new TestDrawableCatchHitObject(new TestCatchHitObject());
+            var result = new JudgementResult(judgedObject.HitObject, judgement ?? new Judgement()) { Type = type };
+            scoreProcessor.ApplyResult(result);
+
+            foreach (var counter in CreatedDrawables.Cast<CatchComboDisplay>())
+                counter.OnNewResult(judgedObject, result);
+        }
+
+        private class TestDrawableCatchHitObject : DrawableCatchHitObject
+        {
+            public TestDrawableCatchHitObject(CatchHitObject hitObject)
+                : base(hitObject)
+            {
+                AccentColour.Value = Color4.White;
+            }
+        }
+
+        private class TestCatchHitObject : CatchHitObject
+        {
+        }
+    }
+}

From 242a035f7e693dcbd00c0f0d381cd6f16c211f9e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 3 Aug 2020 21:25:45 +0200
Subject: [PATCH 04069/10326] Apply review suggestions.

---
 .../Gameplay/TestSceneOverlayActivation.cs    |  4 +--
 osu.Game/Screens/Play/Player.cs               | 25 +++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
index 107a3a2a4b..9e93cf363d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
@@ -14,11 +14,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         private OverlayTestPlayer testPlayer;
 
         [Resolved]
-        private OsuConfigManager mng { get; set; }
+        private OsuConfigManager config { get; set; }
 
         public override void SetUpSteps()
         {
-            AddStep("disable overlay activation during gameplay", () => mng.Set(OsuSetting.GameplayDisableOverlayActivation, true));
+            AddStep("disable overlay activation during gameplay", () => config.Set(OsuSetting.GameplayDisableOverlayActivation, true));
             base.SetUpSteps();
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 45a9b442be..7906f5bfe1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -90,7 +90,10 @@ namespace osu.Game.Screens.Play
 
         private SkipOverlay skipOverlay;
 
-        protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.Disabled);
+        /// <summary>
+        /// The current activation mode for overlays.
+        /// </summary>
+        protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.UserTriggered);
 
         protected ScoreProcessor ScoreProcessor { get; private set; }
 
@@ -208,15 +211,9 @@ namespace osu.Game.Screens.Play
             if (game != null)
                 OverlayActivationMode.BindTo(game.OverlayActivationMode);
 
-            gameplayOverlaysDisabled.ValueChanged += disabled =>
-            {
-                if (DrawableRuleset.HasReplayLoaded.Value)
-                    OverlayActivationMode.Value = OverlayActivation.UserTriggered;
-                else
-                    OverlayActivationMode.Value = disabled.NewValue && !DrawableRuleset.IsPaused.Value ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
-            };
-            DrawableRuleset.IsPaused.BindValueChanged(_ => gameplayOverlaysDisabled.TriggerChange());
-            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => gameplayOverlaysDisabled.TriggerChange());
+            gameplayOverlaysDisabled.ValueChanged += disabled => updateOverlayActivationMode();
+            DrawableRuleset.IsPaused.BindValueChanged(_ => updateOverlayActivationMode());
+            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateOverlayActivationMode());
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
@@ -362,6 +359,14 @@ namespace osu.Game.Screens.Play
             HUDOverlay.KeyCounter.IsCounting = !isBreakTime.NewValue;
         }
 
+        private void updateOverlayActivationMode()
+        {
+            if (DrawableRuleset.HasReplayLoaded.Value)
+                OverlayActivationMode.Value = OverlayActivation.UserTriggered;
+            else
+                OverlayActivationMode.Value = gameplayOverlaysDisabled.Value && !DrawableRuleset.IsPaused.Value ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
+        }
+
         private void updatePauseOnFocusLostState() =>
             HUDOverlay.HoldToQuit.PauseOnFocusLost = PauseOnFocusLost
                                                      && !DrawableRuleset.HasReplayLoaded.Value

From 30c7a6f6a72d9c711c32e4dc351c6d74ed39a6b2 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 3 Aug 2020 21:33:18 +0200
Subject: [PATCH 04070/10326] Fix CI issue and use method instead of triggering
 change on bindable.

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7906f5bfe1..819942e6af 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Screens.Play
             if (game != null)
                 OverlayActivationMode.BindTo(game.OverlayActivationMode);
 
-            gameplayOverlaysDisabled.ValueChanged += disabled => updateOverlayActivationMode();
+            gameplayOverlaysDisabled.BindValueChanged(_ => updateOverlayActivationMode());
             DrawableRuleset.IsPaused.BindValueChanged(_ => updateOverlayActivationMode());
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateOverlayActivationMode());
 
@@ -654,7 +654,7 @@ namespace osu.Game.Screens.Play
             foreach (var mod in Mods.Value.OfType<IApplicableToHUD>())
                 mod.ApplyToHUD(HUDOverlay);
 
-            gameplayOverlaysDisabled.TriggerChange();
+            updateOverlayActivationMode();
         }
 
         public override void OnSuspending(IScreen next)

From 4dbf695bca47f62ef35bc8724ae64871a752720c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Tue, 4 Aug 2020 00:04:00 +0300
Subject: [PATCH 04071/10326] Fix wrong ordering

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index b5c040f80d..d4a1740c12 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -51,8 +51,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
             comboDisplay = new CatchComboDisplay
             {
-                AutoSizeAxes = Axes.Both,
                 RelativeSizeAxes = Axes.None,
+                AutoSizeAxes = Axes.Both,
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.Centre,
                 Y = 30f,

From 22b52d63c7767f4cc9d75c4ff249cf5d5e6828c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Aug 2020 20:51:59 +0900
Subject: [PATCH 04072/10326] 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 13b4b6ebbb..924e9c4a16 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.730.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.804.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 745555e0e2..627c2f3d33 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.730.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.804.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f1080f0c8b..f443937017 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.Framework.iOS" Version="2020.730.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.804.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.730.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.804.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From d7e82efb671016649e13a1afcaec640691567392 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Aug 2020 21:16:59 +0900
Subject: [PATCH 04073/10326] Fix tests

---
 .../Visual/UserInterface/TestSceneLogoTrackingContainer.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
index 010e4330d7..5582cc6826 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
@@ -2,6 +2,7 @@
 // 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;
@@ -263,7 +264,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void moveLogoFacade()
         {
-            if (logoFacade?.Transforms.Count == 0 && transferContainer?.Transforms.Count == 0)
+            if (!(logoFacade?.Transforms).Any() && !(transferContainer?.Transforms).Any())
             {
                 Random random = new Random();
                 trackingContainer.Delay(500).MoveTo(new Vector2(random.Next(0, (int)logo.Parent.DrawWidth), random.Next(0, (int)logo.Parent.DrawHeight)), 300);

From 9fb7b8f3d8b6e1c83c0de13c3d4eb1af8d4dc7dd Mon Sep 17 00:00:00 2001
From: Sebastian Krajewski <mail@wieku.me>
Date: Tue, 4 Aug 2020 15:43:33 +0200
Subject: [PATCH 04074/10326] Rename the property to "AlignWithStoryboard"

---
 osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs        |  2 +-
 .../UI/OsuPlayfieldAdjustmentContainer.cs             | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index e6e37fd58e..b2299398e1 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override PassThroughInputManager CreateInputManager() => new OsuInputManager(Ruleset.RulesetInfo);
 
-        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer { PlayfieldShift = true };
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer { AlignWithStoryboard = true };
 
         protected override ResumeOverlay CreateResumeOverlay() => new OsuResumeOverlay();
 
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
index 700601dbfd..0d1a5a8304 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
@@ -11,16 +11,17 @@ namespace osu.Game.Rulesets.Osu.UI
     public class OsuPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
     {
         protected override Container<Drawable> Content => content;
-        private readonly Container content;
+        private readonly ScalingContainer content;
 
         private const float playfield_size_adjust = 0.8f;
 
         /// <summary>
-        /// Whether an osu-stable playfield offset should be applied (8 osu!pixels)
+        /// When true, an offset is applied to allow alignment with historical storyboards displayed in the same parent space.
+        /// This will shift the playfield downwards slightly.
         /// </summary>
-        public bool PlayfieldShift
+        public bool AlignWithStoryboard
         {
-            set => ((ScalingContainer)content).PlayfieldShift = value;
+            set => content.PlayfieldShift = value;
         }
 
         public OsuPlayfieldAdjustmentContainer()
@@ -65,7 +66,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 // Scale = 819.2 / 512
                 // Scale = 1.6
                 Scale = new Vector2(Parent.ChildSize.X / OsuPlayfield.BASE_SIZE.X);
-                Position = new Vector2(0, (PlayfieldShift ? 8f : 0f) * Parent.ChildSize.Y / OsuPlayfield.BASE_SIZE.Y);
+                Position = new Vector2(0, (PlayfieldShift ? 8f : 0f) * Scale.X);
                 // Size = 0.625
                 Size = Vector2.Divide(Vector2.One, Scale);
             }

From 24bc9b33b1437cf845834743c7019a5429773b46 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 5 Aug 2020 15:40:45 +0900
Subject: [PATCH 04075/10326] Always place spinners behind hitcircles/sliders

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 600efefca3..4ef9bbe091 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -23,7 +23,8 @@ namespace osu.Game.Rulesets.Osu.UI
 {
     public class OsuPlayfield : Playfield
     {
-        private readonly ApproachCircleProxyContainer approachCircles;
+        private readonly ProxyContainer approachCircles;
+        private readonly ProxyContainer spinnerProxies;
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
         private readonly FollowPointRenderer followPoints;
         private readonly OrderedHitPolicy hitPolicy;
@@ -38,6 +39,10 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             InternalChildren = new Drawable[]
             {
+                spinnerProxies = new ProxyContainer
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
                 followPoints = new FollowPointRenderer
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -54,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 {
                     Child = HitObjectContainer,
                 },
-                approachCircles = new ApproachCircleProxyContainer
+                approachCircles = new ProxyContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Depth = -1,
@@ -76,6 +81,9 @@ namespace osu.Game.Rulesets.Osu.UI
             h.OnNewResult += onNewResult;
             h.OnLoadComplete += d =>
             {
+                if (d is DrawableSpinner)
+                    spinnerProxies.Add(d.CreateProxy());
+
                 if (d is IDrawableHitObjectWithProxiedApproach c)
                     approachCircles.Add(c.ProxiedLayer.CreateProxy());
             };
@@ -113,9 +121,9 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => HitObjectContainer.ReceivePositionalInputAt(screenSpacePos);
 
-        private class ApproachCircleProxyContainer : LifetimeManagementContainer
+        private class ProxyContainer : LifetimeManagementContainer
         {
-            public void Add(Drawable approachCircleProxy) => AddInternal(approachCircleProxy);
+            public void Add(Drawable proxy) => AddInternal(proxy);
         }
 
         private class DrawableJudgementPool : DrawablePool<DrawableOsuJudgement>

From 71895964f408c1fec6c8b6ca8155ca03aca0e044 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 5 Aug 2020 11:21:09 +0200
Subject: [PATCH 04076/10326] Refactor overlay activation logic and reword tip.

---
 osu.Game/Screens/Menu/Disclaimer.cs | 2 +-
 osu.Game/Screens/Play/Player.cs     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 986de1edf0..fcb9aacd76 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -190,7 +190,7 @@ namespace osu.Game.Screens.Menu
             {
                 "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!",
+                "All settings are dynamic and take effect in real-time. Try pausing and 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!",
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 819942e6af..8f8128abfc 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -361,10 +361,12 @@ namespace osu.Game.Screens.Play
 
         private void updateOverlayActivationMode()
         {
-            if (DrawableRuleset.HasReplayLoaded.Value)
+            bool canTriggerOverlays = DrawableRuleset.IsPaused.Value || !gameplayOverlaysDisabled.Value;
+
+            if (DrawableRuleset.HasReplayLoaded.Value || canTriggerOverlays)
                 OverlayActivationMode.Value = OverlayActivation.UserTriggered;
             else
-                OverlayActivationMode.Value = gameplayOverlaysDisabled.Value && !DrawableRuleset.IsPaused.Value ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
+                OverlayActivationMode.Value = OverlayActivation.Disabled;
         }
 
         private void updatePauseOnFocusLostState() =>

From bb73489ae5947c4be39ecaca7a3634f4b49c6db1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Aug 2020 18:44:34 +0900
Subject: [PATCH 04077/10326] Fix very short spinners being impossible to
 complete

---
 .../TestSceneSpinner.cs                       | 40 ++++++++++++++-----
 .../Objects/Drawables/DrawableSpinner.cs      | 13 +++++-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs      |  3 +-
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index b57561f3e1..be92a25dbe 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -17,32 +17,54 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         private int depthIndex;
 
-        public TestSceneSpinner()
+        private TestDrawableSpinner drawableSpinner;
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestVariousSpinners(bool autoplay)
         {
             AddStep("Miss Big", () => SetContents(() => testSingle(2)));
             AddStep("Miss Medium", () => SetContents(() => testSingle(5)));
             AddStep("Miss Small", () => SetContents(() => testSingle(7)));
-            AddStep("Hit Big", () => SetContents(() => testSingle(2, true)));
-            AddStep("Hit Medium", () => SetContents(() => testSingle(5, true)));
-            AddStep("Hit Small", () => SetContents(() => testSingle(7, true)));
+            AddStep("Hit Big", () => SetContents(() => testSingle(2, autoplay)));
+            AddStep("Hit Medium", () => SetContents(() => testSingle(5, autoplay)));
+            AddStep("Hit Small", () => SetContents(() => testSingle(7, autoplay)));
         }
 
-        private Drawable testSingle(float circleSize, bool auto = false)
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestLongSpinner(bool autoplay)
         {
-            var spinner = new Spinner { StartTime = Time.Current + 2000, EndTime = Time.Current + 5000 };
+            AddStep("Very short spinner", () => SetContents(() => testSingle(5, autoplay, 2000)));
+            AddUntilStep("Wait for completion", () => drawableSpinner.Result.HasResult);
+            AddUntilStep("Check correct progress", () => drawableSpinner.Progress == (autoplay ? 1 : 0));
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestSuperShortSpinner(bool autoplay)
+        {
+            AddStep("Very short spinner", () => SetContents(() => testSingle(5, autoplay, 200)));
+            AddUntilStep("Wait for completion", () => drawableSpinner.Result.HasResult);
+            AddUntilStep("Short spinner implicitly completes", () => drawableSpinner.Progress == 1);
+        }
+
+        private Drawable testSingle(float circleSize, bool auto = false, double length = 3000)
+        {
+            var spinner = new Spinner { StartTime = Time.Current + 2000, EndTime = Time.Current + +2000 + length };
 
             spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = circleSize });
 
-            var drawable = new TestDrawableSpinner(spinner, auto)
+            drawableSpinner = new TestDrawableSpinner(spinner, auto)
             {
                 Anchor = Anchor.Centre,
                 Depth = depthIndex++
             };
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObjects>())
-                mod.ApplyToDrawableHitObjects(new[] { drawable });
+                mod.ApplyToDrawableHitObjects(new[] { drawableSpinner });
 
-            return drawable;
+            return drawableSpinner;
         }
 
         private class TestDrawableSpinner : DrawableSpinner
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 68516bedf8..7363da0de8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -175,7 +175,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// The completion progress of this spinner from 0..1 (clamped).
         /// </summary>
-        public float Progress => Math.Clamp(RotationTracker.CumulativeRotation / 360 / Spinner.SpinsRequired, 0, 1);
+        public float Progress
+        {
+            get
+            {
+                if (Spinner.SpinsRequired == 0)
+                    // some spinners are so short they can't require an integer spin count.
+                    // these become implicitly hit.
+                    return 1;
+
+                return Math.Clamp(RotationTracker.CumulativeRotation / 360 / Spinner.SpinsRequired, 0, 1);
+            }
+        }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 619b49926e..1658a4e7c2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.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.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
@@ -45,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             double minimumRotationsPerSecond = stable_matching_fudge * BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 3, 5, 7.5);
 
-            SpinsRequired = (int)Math.Max(1, (secondsDuration * minimumRotationsPerSecond));
+            SpinsRequired = (int)(secondsDuration * minimumRotationsPerSecond);
             MaximumBonusSpins = (int)((maximum_rotations_per_second - minimumRotationsPerSecond) * secondsDuration);
         }
 

From 3916d98e5292db1546b4b9ced3bcea8c27ae887f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Aug 2020 18:50:37 +0900
Subject: [PATCH 04078/10326] Add comment for clarity

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

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index f8666e22c5..09fb445b1f 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -67,6 +67,8 @@ namespace osu.Game.Overlays
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
+            // should not be run until first pop-in to avoid requesting data before user views.
             article.BindValueChanged(onArticleChanged);
         }
 

From bf1bb3267420e64400d8991c34bb2b65f026c9c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Aug 2020 19:06:58 +0900
Subject: [PATCH 04079/10326] Add missing toolbar tooltips for right-hand icons

---
 osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs      | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarChatButton.cs           | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs          | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs           | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs       | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs         | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index eecb368ee9..3c38fdd207 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarBeatmapListingButton()
         {
             SetIcon(OsuIcon.ChevronDownCircle);
+            TooltipMain = "Beatmap Listing";
+            TooltipSub = "Browse for new beatmaps";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
index 84210e27a4..c88b418853 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarChangelogButton()
         {
             SetIcon(FontAwesome.Solid.Bullhorn);
+            TooltipMain = "Changelog";
+            TooltipSub = "Track recent dev updates in the osu! ecosystem";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
index ad0e5be551..ec7da54571 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarChatButton()
         {
             SetIcon(FontAwesome.Solid.Comments);
+            TooltipMain = "Chat";
+            TooltipSub = "Join the real-time discussion";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
index b29aec5842..712da12208 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarMusicButton()
         {
             Icon = FontAwesome.Solid.Music;
+            TooltipMain = "Now playing";
+            TooltipSub = "Manage the currently playing track";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
index e813a3f4cb..106c67a041 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarNewsButton()
         {
             Icon = FontAwesome.Solid.Newspaper;
+            TooltipMain = "News";
+            TooltipSub = "Get up-to-date on community happenings";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
index cbd097696d..c026ce99fe 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarRankingsButton()
         {
             SetIcon(FontAwesome.Regular.ChartBar);
+            TooltipMain = "Ranking";
+            TooltipSub = "Find out who's the best right now";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
index f6646eb81d..0dbb552c15 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarSocialButton()
         {
             Icon = FontAwesome.Solid.Users;
+            TooltipMain = "Friends";
+            TooltipSub = "Interact with those close to you";
         }
 
         [BackgroundDependencyLoader(true)]

From 84f6b7608cf83a76db915d148d6c7f2090290742 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 5 Aug 2020 20:05:53 +0300
Subject: [PATCH 04080/10326] Remove misleading ExpandNumberPiece lookup

---
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs | 5 -----
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs     | 1 -
 2 files changed, 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 80602dfa40..81d1d05b66 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK;
-using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -139,10 +138,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
                             // HitCircleOverlayAboveNumer (with typo) should still be supported for now.
                             return Source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber) ??
                                    Source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
-                        
-						case OsuSkinConfiguration.ExpandNumberPiece:
-                            bool expand = !(source.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value >= 2.0m);
-                            return SkinUtils.As<TValue>(new BindableBool(expand));
                     }
 
                     break;
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index c04312a2c3..154160fdb5 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -7,7 +7,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
     {
         HitCirclePrefix,
         HitCircleOverlap,
-        ExpandNumberPiece,
         SliderBorderSize,
         SliderPathRadius,
         AllowSliderBallTint,

From 1ab6110c05e7fc4e0bbc18ec3847636e847780b2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 5 Aug 2020 20:07:05 +0300
Subject: [PATCH 04081/10326] Apply fade out to the number piece with quarter
 the pieces duration

---
 .../Skinning/LegacyMainCirclePiece.cs         | 67 ++++++++++++-------
 1 file changed, 43 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index fe28e69ff2..41fe170ae0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -28,7 +29,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
         }
 
+        private Container<Sprite> circlePieces;
         private Sprite hitCircleSprite, hitCircleOverlay;
+
         private SkinnableSpriteText hitCircleText;
 
         private readonly IBindable<ArmedState> state = new Bindable<ArmedState>();
@@ -45,12 +48,27 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             InternalChildren = new Drawable[]
             {
-                hitCircleSprite = new Sprite
+                circlePieces = new Container<Sprite>
                 {
-                    Texture = getTextureWithFallback(string.Empty),
-                    Colour = drawableObject.AccentColour.Value,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new[]
+                    {
+                        hitCircleSprite = new Sprite
+                        {
+                            Texture = getTextureWithFallback(string.Empty),
+                            Colour = drawableObject.AccentColour.Value,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                        hitCircleOverlay = new Sprite
+                        {
+                            Texture = getTextureWithFallback("overlay"),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        }
+                    }
                 },
                 hitCircleText = new SkinnableSpriteText(new OsuSkinComponent(OsuSkinComponents.HitCircleText), _ => new OsuSpriteText
                 {
@@ -61,31 +79,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                 },
-                hitCircleOverlay = new Sprite
-                {
-                    Texture = getTextureWithFallback("overlay"),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                }
             };
 
             bool overlayAboveNumber = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value ?? true;
 
-            if (!overlayAboveNumber)
-                ChangeInternalChildDepth(hitCircleText, -float.MaxValue);
+            if (overlayAboveNumber)
+                AddInternal(hitCircleOverlay.CreateProxy());
 
             state.BindTo(drawableObject.State);
             accentColour.BindTo(drawableObject.AccentColour);
             indexInCurrentCombo.BindTo(osuObject.IndexInCurrentComboBindable);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            state.BindValueChanged(updateState, true);
-            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue, true);
-            indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
 
             Texture getTextureWithFallback(string name)
             {
@@ -98,6 +101,15 @@ namespace osu.Game.Rulesets.Osu.Skinning
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            state.BindValueChanged(updateState, true);
+            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue, true);
+            indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
+        }
+
         private void updateState(ValueChangedEvent<ArmedState> state)
         {
             const double legacy_fade_duration = 240;
@@ -105,13 +117,20 @@ namespace osu.Game.Rulesets.Osu.Skinning
             switch (state.NewValue)
             {
                 case ArmedState.Hit:
-                    this.FadeOut(legacy_fade_duration, Easing.Out);
+                    circlePieces.FadeOut(legacy_fade_duration, Easing.Out);
+                    circlePieces.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
 
-                    hitCircleSprite.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
-                    hitCircleOverlay.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+                    var legacyVersion = skin.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value;
 
-                    if (skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece)?.Value ?? true)
+                    if (legacyVersion >= 2.0m)
+                        // legacy skins of version 2.0 and newer apply immediate fade out to the number piece and only that.
+                        hitCircleText.FadeOut(legacy_fade_duration / 4, Easing.Out);
+                    else
+                    {
+                        // old skins scale and fade it normally along other pieces.
+                        hitCircleText.FadeOut(legacy_fade_duration, Easing.Out);
                         hitCircleText.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+                    }
 
                     break;
             }

From 43161697f88983bc271715e792c7a89eed9631d0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 5 Aug 2020 23:41:57 +0300
Subject: [PATCH 04082/10326] Fix wrong english

---
 osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 41fe170ae0..74a2cb7dc5 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     var legacyVersion = skin.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value;
 
                     if (legacyVersion >= 2.0m)
-                        // legacy skins of version 2.0 and newer apply immediate fade out to the number piece and only that.
+                        // legacy skins of version 2.0 and newer only apply very short fade out to the number piece.
                         hitCircleText.FadeOut(legacy_fade_duration / 4, Easing.Out);
                     else
                     {

From 9465e7abe10e22482d598f9529d43a9b7468706f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 5 Aug 2020 23:45:00 +0300
Subject: [PATCH 04083/10326] Rename sprites container to "circleSprites"

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

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 74a2cb7dc5..9fbd9f50b4 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
         }
 
-        private Container<Sprite> circlePieces;
+        private Container<Sprite> circleSprites;
         private Sprite hitCircleSprite, hitCircleOverlay;
 
         private SkinnableSpriteText hitCircleText;
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             InternalChildren = new Drawable[]
             {
-                circlePieces = new Container<Sprite>
+                circleSprites = new Container<Sprite>
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -117,8 +117,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
             switch (state.NewValue)
             {
                 case ArmedState.Hit:
-                    circlePieces.FadeOut(legacy_fade_duration, Easing.Out);
-                    circlePieces.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+                    circleSprites.FadeOut(legacy_fade_duration, Easing.Out);
+                    circleSprites.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
 
                     var legacyVersion = skin.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value;
 

From 19a0eaade9b48f65bbf51ebbac98ba32b98b9dba Mon Sep 17 00:00:00 2001
From: Sebastian Krajewski <mail@wieku.me>
Date: Thu, 6 Aug 2020 04:41:44 +0200
Subject: [PATCH 04084/10326] Allow storyboard sprites to load textures from
 skins

---
 .../Drawables/DrawableStoryboardSprite.cs     | 39 ++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index d8d3248659..d40af903a6 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Skinning;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -17,6 +18,12 @@ namespace osu.Game.Storyboards.Drawables
     {
         public StoryboardSprite Sprite { get; }
 
+        private ISkinSource currentSkin;
+
+        private TextureStore storyboardTextureStore;
+
+        private string texturePath;
+
         private bool flipH;
 
         public bool FlipH
@@ -114,14 +121,36 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
+        private void load(ISkinSource skin, IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
         {
-            var path = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Sprite.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
-            if (path == null)
-                return;
+            if (skin != null)
+            {
+                currentSkin = skin;
+                skin.SourceChanged += onChange;
+            }
+
+            storyboardTextureStore = textureStore;
+
+            texturePath = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Sprite.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+
+            skinChanged();
 
-            Texture = textureStore.Get(path);
             Sprite.ApplyTransforms(this);
         }
+
+        private void onChange() =>
+            // schedule required to avoid calls after disposed.
+            // note that this has the side-effect of components only performing a possible texture change when they are alive.
+            Scheduler.AddOnce(skinChanged);
+
+        private void skinChanged()
+        {
+            var newTexture = currentSkin?.GetTexture(Sprite.Path) ?? storyboardTextureStore?.Get(texturePath);
+
+            if (Texture == newTexture) return;
+
+            Size = Vector2.Zero; // Sprite size needs to be recalculated (e.g. aspect ratio of combo number textures may differ between skins)
+            Texture = newTexture;
+        }
     }
 }

From e3f314349abc74ebc3ef6e1774045325fd763a75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Aug 2020 12:27:30 +0900
Subject: [PATCH 04085/10326] Don't use title case

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index 3c38fdd207..64430c77ac 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarBeatmapListingButton()
         {
             SetIcon(OsuIcon.ChevronDownCircle);
-            TooltipMain = "Beatmap Listing";
+            TooltipMain = "Beatmap listing";
             TooltipSub = "Browse for new beatmaps";
         }
 

From d5324be07d00ff9276831f2263ac326efa020f35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Aug 2020 12:33:40 +0900
Subject: [PATCH 04086/10326] Fix malformed testcase

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index be92a25dbe..ed89a4c991 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -23,12 +23,10 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(true)]
         public void TestVariousSpinners(bool autoplay)
         {
-            AddStep("Miss Big", () => SetContents(() => testSingle(2)));
-            AddStep("Miss Medium", () => SetContents(() => testSingle(5)));
-            AddStep("Miss Small", () => SetContents(() => testSingle(7)));
-            AddStep("Hit Big", () => SetContents(() => testSingle(2, autoplay)));
-            AddStep("Hit Medium", () => SetContents(() => testSingle(5, autoplay)));
-            AddStep("Hit Small", () => SetContents(() => testSingle(7, autoplay)));
+            string term = autoplay ? "Hit" : "Miss";
+            AddStep($"{term} Big", () => SetContents(() => testSingle(2, autoplay)));
+            AddStep($"{term} Medium", () => SetContents(() => testSingle(5, autoplay)));
+            AddStep($"{term} Small", () => SetContents(() => testSingle(7, autoplay)));
         }
 
         [TestCase(false)]

From 3b15a50f0d343fbf985abc0167d86f04972958df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Aug 2020 12:34:42 +0900
Subject: [PATCH 04087/10326] Fix unnecessary + character

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index ed89a4c991..47b3926ceb 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -49,7 +49,13 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private Drawable testSingle(float circleSize, bool auto = false, double length = 3000)
         {
-            var spinner = new Spinner { StartTime = Time.Current + 2000, EndTime = Time.Current + +2000 + length };
+            const double delay = 2000;
+
+            var spinner = new Spinner
+            {
+                StartTime = Time.Current + delay,
+                EndTime = Time.Current + delay + length
+            };
 
             spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = circleSize });
 

From 9a00ad48c617a4d490ab5420698b2656c3679a45 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 14:43:39 +0900
Subject: [PATCH 04088/10326] Update components to use extension methods

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 1 +
 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs        | 2 ++
 osu.Game/Screens/Play/PauseOverlay.cs                      | 1 +
 3 files changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 7363da0de8..a2a49b5c42 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index 168e937256..3f7dc957fb 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -117,6 +117,8 @@ namespace osu.Game.Rulesets.UI
 
         public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
 
+        public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotImplementedException();
+
         public BindableNumber<double> Volume => throw new NotSupportedException();
 
         public BindableNumber<double> Balance => throw new NotSupportedException();
diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index fa917cda32..97f1d1c91d 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Game.Audio;
 using osu.Game.Graphics;

From 641279ec3e8397f23b2f21c200cf99af313d9253 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 14:43:48 +0900
Subject: [PATCH 04089/10326] Make SkinnableSound an IAdjustableAudioComponent

---
 osu.Game/Skinning/SkinnableSound.cs | 42 ++++++++---------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 27f6c37895..11856fa581 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -4,19 +4,18 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Audio;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Skinning
 {
-    public class SkinnableSound : SkinReloadableDrawable
+    public class SkinnableSound : SkinReloadableDrawable, IAdjustableAudioComponent
     {
         private readonly ISampleInfo[] hitSamples;
 
@@ -143,36 +142,17 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => samplesContainer.Tempo;
 
+        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+            => samplesContainer.AddAdjustment(type, adjustBindable);
+
+        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+            => samplesContainer.RemoveAdjustment(type, adjustBindable);
+
+        public void RemoveAllAdjustments(AdjustableProperty type)
+            => samplesContainer.RemoveAllAdjustments(type);
+
         public bool IsPlaying => samplesContainer.Any(s => s.Playing);
 
-        /// <summary>
-        /// Smoothly adjusts <see cref="Volume"/> over time.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> VolumeTo(double newVolume, double duration = 0, Easing easing = Easing.None) =>
-            samplesContainer.VolumeTo(newVolume, duration, easing);
-
-        /// <summary>
-        /// Smoothly adjusts <see cref="Balance"/> over time.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> BalanceTo(double newBalance, double duration = 0, Easing easing = Easing.None) =>
-            samplesContainer.BalanceTo(newBalance, duration, easing);
-
-        /// <summary>
-        /// Smoothly adjusts <see cref="Frequency"/> over time.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> FrequencyTo(double newFrequency, double duration = 0, Easing easing = Easing.None) =>
-            samplesContainer.FrequencyTo(newFrequency, duration, easing);
-
-        /// <summary>
-        /// Smoothly adjusts <see cref="Tempo"/> over time.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> TempoTo(double newTempo, double duration = 0, Easing easing = Easing.None) =>
-            samplesContainer.TempoTo(newTempo, duration, easing);
-
         #endregion
     }
 }

From 6e42b8219c4510b856923aa08712c50dbf37fa87 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 4 Aug 2020 21:53:00 +0900
Subject: [PATCH 04090/10326] Move track to MusicController, compiles

---
 .../TestSceneHoldNoteInput.cs                 |   2 +-
 .../TestSceneOutOfOrderHits.cs                |   2 +-
 .../TestSceneSliderInput.cs                   |   2 +-
 .../TestSceneSliderSnaking.cs                 |  15 +-
 .../TestSceneSpinnerRotation.cs               |  13 +-
 .../Skinning/TestSceneDrawableTaikoMascot.cs  |   4 +-
 .../Skinning/TestSceneTaikoPlayfield.cs       |   2 +-
 .../Skins/TestSceneBeatmapSkinResources.cs    |   3 +-
 .../Visual/Editing/TimelineTestScene.cs       |  11 +-
 .../TestSceneCompletionCancellation.cs        |  15 +-
 .../Gameplay/TestSceneGameplayRewinding.cs    |  15 +-
 .../TestSceneNightcoreBeatContainer.cs        |   4 +-
 .../Visual/Gameplay/TestScenePause.cs         |   2 +-
 .../Visual/Gameplay/TestScenePlayerLoader.cs  |   6 +-
 .../Visual/Gameplay/TestSceneStoryboard.cs    |  10 +-
 .../Visual/Menus/TestSceneIntroWelcome.cs     |   7 +-
 .../Navigation/TestSceneScreenNavigation.cs   |  23 +-
 .../TestSceneBeatSyncedContainer.cs           |   5 +-
 .../TestSceneNowPlayingOverlay.cs             |   4 +-
 osu.Game/Beatmaps/BeatmapManager.cs           |   2 +-
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs |  16 --
 osu.Game/Beatmaps/IWorkingBeatmap.cs          |   5 -
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  22 +-
 .../Containers/BeatSyncedContainer.cs         |  16 +-
 osu.Game/OsuGame.cs                           |  23 +-
 osu.Game/OsuGameBase.cs                       |  10 -
 osu.Game/Overlays/Music/PlaylistOverlay.cs    |  10 +-
 osu.Game/Overlays/MusicController.cs          | 221 ++++++++++++++++--
 osu.Game/Overlays/NowPlayingOverlay.cs        |  10 +-
 osu.Game/Rulesets/Mods/IApplicableToTrack.cs  |   2 +-
 osu.Game/Rulesets/Mods/ModDaycore.cs          |   6 +-
 osu.Game/Rulesets/Mods/ModNightcore.cs        |   6 +-
 osu.Game/Rulesets/Mods/ModRateAdjust.cs       |   4 +-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |   4 +-
 .../Edit/Components/BottomBarContainer.cs     |   2 -
 .../Edit/Components/PlaybackControl.cs        |   8 +-
 .../Timelines/Summary/Parts/MarkerPart.cs     |   5 +-
 .../Timelines/Summary/Parts/TimelinePart.cs   |   8 +-
 .../Compose/Components/Timeline/Timeline.cs   |  34 +--
 .../Timeline/TimelineTickDisplay.cs           |   7 +-
 osu.Game/Screens/Edit/Editor.cs               |   8 +-
 osu.Game/Screens/Edit/EditorClock.cs          |  22 +-
 osu.Game/Screens/Menu/IntroScreen.cs          |   8 +-
 osu.Game/Screens/Menu/IntroTriangles.cs       |   2 +-
 osu.Game/Screens/Menu/IntroWelcome.cs         |   6 +-
 osu.Game/Screens/Menu/LogoVisualisation.cs    |  12 +-
 osu.Game/Screens/Menu/MainMenu.cs             |  16 +-
 osu.Game/Screens/Menu/OsuLogo.cs              |   9 +-
 .../Multi/Match/Components/ReadyButton.cs     |   6 +-
 osu.Game/Screens/Multi/Multiplayer.cs         |  23 +-
 osu.Game/Screens/Play/FailAnimation.cs        |  12 +-
 .../Screens/Play/GameplayClockContainer.cs    |  46 +---
 osu.Game/Screens/Select/SongSelect.cs         |  34 ++-
 osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs |   2 -
 osu.Game/Tests/Visual/EditorClockTestScene.cs |   2 +-
 osu.Game/Tests/Visual/OsuTestScene.cs         |   8 +-
 .../Visual/RateAdjustedBeatmapTestScene.cs    |   2 +-
 57 files changed, 438 insertions(+), 346 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 95072cf4f8..c3e0c277a0 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -343,7 +343,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrackTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index 854626d362..dc7e59b40d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -385,7 +385,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrackTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index b543b6fa94..2dffcfeabb 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -366,7 +366,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrackTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index a69646507a..cd46e8c545 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -22,7 +22,6 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Game.Storyboards;
 using osuTK;
-using static osu.Game.Tests.Visual.OsuTestScene.ClockBackedTestWorkingBeatmap;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -32,8 +31,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Resolved]
         private AudioManager audioManager { get; set; }
 
-        private TrackVirtualManual track;
-
         protected override bool Autoplay => autoplay;
         private bool autoplay;
 
@@ -44,11 +41,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private const double fade_in_modifier = -1200;
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-        {
-            var working = new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
-            track = (TrackVirtualManual)working.Track;
-            return working;
-        }
+            => new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
 
         [BackgroundDependencyLoader]
         private void load(RulesetConfigCache configCache)
@@ -72,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("enable autoplay", () => autoplay = true);
             base.SetUpSteps();
-            AddUntilStep("wait for track to start running", () => track.IsRunning);
+            AddUntilStep("wait for track to start running", () => MusicController.IsPlaying);
 
             double startTime = hitObjects[sliderIndex].StartTime;
             retrieveDrawableSlider(sliderIndex);
@@ -97,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("have autoplay", () => autoplay = true);
             base.SetUpSteps();
-            AddUntilStep("wait for track to start running", () => track.IsRunning);
+            AddUntilStep("wait for track to start running", () => MusicController.IsPlaying);
 
             double startTime = hitObjects[sliderIndex].StartTime;
             retrieveDrawableSlider(sliderIndex);
@@ -201,7 +194,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private void addSeekStep(double time)
         {
-            AddStep($"seek to {time}", () => track.Seek(time));
+            AddStep($"seek to {time}", () => MusicController.SeekTo(time));
 
             AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time, Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index b46964e8b7..105e19a73c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -24,7 +24,6 @@ using osu.Game.Scoring;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Visual;
 using osuTK;
-using static osu.Game.Tests.Visual.OsuTestScene.ClockBackedTestWorkingBeatmap;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -33,18 +32,12 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Resolved]
         private AudioManager audioManager { get; set; }
 
-        private TrackVirtualManual track;
-
         protected override bool Autoplay => true;
 
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => new ScoreExposedPlayer();
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-        {
-            var working = new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
-            track = (TrackVirtualManual)working.Track;
-            return working;
-        }
+            => new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
 
         private DrawableSpinner drawableSpinner;
         private SpriteIcon spinnerSymbol => drawableSpinner.ChildrenOfType<SpriteIcon>().Single();
@@ -54,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             base.SetUpSteps();
 
-            AddUntilStep("wait for track to start running", () => track.IsRunning);
+            AddUntilStep("wait for track to start running", () => MusicController.IsPlaying);
             AddStep("retrieve spinner", () => drawableSpinner = (DrawableSpinner)Player.DrawableRuleset.Playfield.AllHitObjects.First());
         }
 
@@ -198,7 +191,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private void addSeekStep(double time)
         {
-            AddStep($"seek to {time}", () => track.Seek(time));
+            AddStep($"seek to {time}", () => MusicController.SeekTo(time));
 
             AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time, Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 47d8a5c012..ba5aef5968 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -175,11 +175,11 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         private void createDrawableRuleset()
         {
-            AddUntilStep("wait for beatmap to be loaded", () => Beatmap.Value.Track.IsLoaded);
+            AddUntilStep("wait for beatmap to be loaded", () => MusicController.TrackLoaded);
 
             AddStep("create drawable ruleset", () =>
             {
-                Beatmap.Value.Track.Start();
+                MusicController.Play(true);
 
                 SetContents(() =>
                 {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
index 7b7e2c43d1..5c54393fb8 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
                 beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 1000 });
 
-                Beatmap.Value.Track.Start();
+                MusicController.Play(true);
             });
 
             AddStep("Load playfield", () => SetContents(() => new TaikoPlayfield(new ControlPointInfo())
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
index 4d3b73fb32..1a19326ac4 100644
--- a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -32,6 +31,6 @@ namespace osu.Game.Tests.Skins
         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));
+        public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => !MusicController.IsDummyDevice);
     }
 }
diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index fdb8781563..5d6136d9fb 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -3,12 +3,11 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-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.UserInterface;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
@@ -65,10 +64,10 @@ namespace osu.Game.Tests.Visual.Editing
             private readonly Drawable marker;
 
             [Resolved]
-            private IBindable<WorkingBeatmap> beatmap { get; set; }
+            private EditorClock editorClock { get; set; }
 
             [Resolved]
-            private EditorClock editorClock { get; set; }
+            private MusicController musicController { get; set; }
 
             public AudioVisualiser()
             {
@@ -94,8 +93,8 @@ namespace osu.Game.Tests.Visual.Editing
             {
                 base.Update();
 
-                if (beatmap.Value.Track.IsLoaded)
-                    marker.X = (float)(editorClock.CurrentTime / beatmap.Value.Track.Length);
+                if (musicController.TrackLoaded)
+                    marker.X = (float)(editorClock.CurrentTime / musicController.TrackLength);
             }
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
index 79275d70a7..b39cfc3699 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
@@ -4,7 +4,6 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
@@ -18,8 +17,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneCompletionCancellation : OsuPlayerTestScene
     {
-        private Track track;
-
         [Resolved]
         private AudioManager audio { get; set; }
 
@@ -34,7 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             base.SetUpSteps();
 
             // Ensure track has actually running before attempting to seek
-            AddUntilStep("wait for track to start running", () => track.IsRunning);
+            AddUntilStep("wait for track to start running", () => MusicController.IsPlaying);
         }
 
         [Test]
@@ -73,13 +70,13 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void complete()
         {
-            AddStep("seek to completion", () => track.Seek(5000));
+            AddStep("seek to completion", () => MusicController.SeekTo(5000));
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
         }
 
         private void cancel()
         {
-            AddStep("rewind to cancel", () => track.Seek(4000));
+            AddStep("rewind to cancel", () => MusicController.SeekTo(4000));
             AddUntilStep("completion cleared by processor", () => !Player.ScoreProcessor.HasCompleted.Value);
         }
 
@@ -91,11 +88,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-        {
-            var working = new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audio);
-            track = working.Track;
-            return working;
-        }
+            => new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audio);
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
index 2a119f5199..6bdc65078a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
@@ -5,10 +5,10 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
 using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Storyboards;
@@ -21,19 +21,16 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private AudioManager audioManager { get; set; }
 
-        private Track track;
+        [Resolved]
+        private MusicController musicController { get; set; }
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-        {
-            var working = new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
-            track = working.Track;
-            return working;
-        }
+            => new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
 
         [Test]
         public void TestNoJudgementsOnRewind()
         {
-            AddUntilStep("wait for track to start running", () => track.IsRunning);
+            AddUntilStep("wait for track to start running", () => MusicController.IsPlaying);
             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));
@@ -46,7 +43,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void addSeekStep(double time)
         {
-            AddStep($"seek to {time}", () => track.Seek(time));
+            AddStep($"seek to {time}", () => MusicController.SeekTo(time));
 
             // Allow a few frames of lenience
             AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time, Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
index 951ee1489d..ce99d85e92 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
 
-            Beatmap.Value.Track.Start();
-            Beatmap.Value.Track.Seek(Beatmap.Value.Beatmap.HitObjects.First().StartTime - 1000);
+            MusicController.Play(true);
+            MusicController.SeekTo(Beatmap.Value.Beatmap.HitObjects.First().StartTime - 1000);
 
             Add(new ModNightcore<HitObject>.NightcoreBeatContainer());
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 420bf29429..8f14de1578 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -288,7 +288,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void confirmNoTrackAdjustments()
         {
-            AddAssert("track has no adjustments", () => Beatmap.Value.Track.AggregateFrequency.Value == 1);
+            AddAssert("track has no adjustments", () => MusicController.AggregateFrequency.Value == 1);
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 4c73065087..2f86db1b25 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToTrack>())
-                mod.ApplyToTrack(Beatmap.Value.Track);
+                mod.ApplyToTrack(MusicController);
 
             InputManager.Child = container = new TestPlayerLoaderContainer(
                 loader = new TestPlayerLoader(() =>
@@ -77,12 +77,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("load dummy beatmap", () => ResetPlayer(false, () => SelectedMods.Value = new[] { new OsuModNightcore() }));
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
-            AddAssert("mod rate applied", () => Beatmap.Value.Track.Rate != 1);
+            AddAssert("mod rate applied", () => MusicController.Rate != 1);
             AddStep("exit loader", () => loader.Exit());
             AddUntilStep("wait for not current", () => !loader.IsCurrentScreen());
             AddAssert("player did not load", () => !player.IsLoaded);
             AddUntilStep("player disposed", () => loader.DisposalTask?.IsCompleted == true);
-            AddAssert("mod rate still applied", () => Beatmap.Value.Track.Rate != 1);
+            AddAssert("mod rate still applied", () => MusicController.Rate != 1);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index 9f1492a25f..a4b558fce2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -87,11 +87,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void restart()
         {
-            var track = Beatmap.Value.Track;
-
-            track.Reset();
+            MusicController.Reset();
             loadStoryboard(Beatmap.Value);
-            track.Start();
+            MusicController.Play(true);
         }
 
         private void loadStoryboard(WorkingBeatmap working)
@@ -106,7 +104,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboard.Passing = false;
 
             storyboardContainer.Add(storyboard);
-            decoupledClock.ChangeSource(working.Track);
+            decoupledClock.ChangeSource(musicController.GetTrackClock());
         }
 
         private void loadStoryboardNoVideo()
@@ -129,7 +127,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboard = sb.CreateDrawable(Beatmap.Value);
 
             storyboardContainer.Add(storyboard);
-            decoupledClock.ChangeSource(Beatmap.Value.Track);
+            decoupledClock.ChangeSource(musicController.GetTrackClock());
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
index 8f20e38494..36f98b7a0c 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Audio.Track;
 using osu.Framework.Screens;
 using osu.Game.Screens.Menu;
 
@@ -15,11 +14,9 @@ namespace osu.Game.Tests.Visual.Menus
 
         public TestSceneIntroWelcome()
         {
-            AddUntilStep("wait for load", () => getTrack() != null);
+            AddUntilStep("wait for load", () => MusicController.TrackLoaded);
 
-            AddAssert("check if menu music loops", () => getTrack().Looping);
+            AddAssert("check if menu music loops", () => MusicController.Looping);
         }
-
-        private Track getTrack() => (IntroStack?.CurrentScreen as MainMenu)?.Track;
     }
 }
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 8ccaca8630..455b7e56e6 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -4,7 +4,6 @@
 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;
@@ -46,7 +45,6 @@ namespace osu.Game.Tests.Visual.Navigation
             Player player = null;
 
             WorkingBeatmap beatmap() => Game.Beatmap.Value;
-            Track track() => beatmap().Track;
 
             PushAndConfirm(() => new TestSongSelect());
 
@@ -62,30 +60,27 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("wait for player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
             AddUntilStep("wait for fail", () => player.HasFailed);
 
-            AddUntilStep("wait for track stop", () => !track().IsRunning);
-            AddAssert("Ensure time before preview point", () => track().CurrentTime < beatmap().Metadata.PreviewTime);
+            AddUntilStep("wait for track stop", () => !MusicController.IsPlaying);
+            AddAssert("Ensure time before preview point", () => MusicController.CurrentTrackTime < beatmap().Metadata.PreviewTime);
 
             pushEscape();
 
-            AddUntilStep("wait for track playing", () => track().IsRunning);
-            AddAssert("Ensure time wasn't reset to preview point", () => track().CurrentTime < beatmap().Metadata.PreviewTime);
+            AddUntilStep("wait for track playing", () => MusicController.IsPlaying);
+            AddAssert("Ensure time wasn't reset to preview point", () => MusicController.CurrentTrackTime < beatmap().Metadata.PreviewTime);
         }
 
         [Test]
         public void TestMenuMakesMusic()
         {
-            WorkingBeatmap beatmap() => Game.Beatmap.Value;
-            Track track() => beatmap().Track;
-
             TestSongSelect songSelect = null;
 
             PushAndConfirm(() => songSelect = new TestSongSelect());
 
-            AddUntilStep("wait for no track", () => track() is TrackVirtual);
+            AddUntilStep("wait for no track", () => MusicController.IsDummyDevice);
 
             AddStep("return to menu", () => songSelect.Exit());
 
-            AddUntilStep("wait for track", () => !(track() is TrackVirtual) && track().IsRunning);
+            AddUntilStep("wait for track", () => !MusicController.IsDummyDevice && MusicController.IsPlaying);
         }
 
         [Test]
@@ -140,12 +135,12 @@ namespace osu.Game.Tests.Visual.Navigation
             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;
+                Game.MusicController.SeekTo(MusicController.TrackLength - 1000);
+                // MusicController.Completed += () => trackCompleted = true;
             });
 
             AddUntilStep("Track was completed", () => trackCompleted);
-            AddUntilStep("Track was restarted", () => Game.Beatmap.Value.Track.IsRunning);
+            AddUntilStep("Track was restarted", () => MusicController.IsPlaying);
         }
 
         private void pushEscape() =>
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
index dd5ceec739..f3fef8c355 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
@@ -71,6 +71,9 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             private readonly Box flashLayer;
 
+            [Resolved]
+            private MusicController musicController { get; set; }
+
             public BeatContainer()
             {
                 RelativeSizeAxes = Axes.X;
@@ -165,7 +168,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 if (timingPoints.Count == 0) return 0;
 
                 if (timingPoints[^1] == current)
-                    return (int)Math.Ceiling((Beatmap.Value.Track.Length - current.Time) / current.BeatLength);
+                    return (int)Math.Ceiling((musicController.TrackLength - current.Time) / current.BeatLength);
 
                 return (int)Math.Ceiling((getNextTimingPoint(current).Time - current.Time) / current.BeatLength);
             }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index 532744a0fc..3ecd8ab550 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
@@ -80,12 +80,12 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Store track", () => currentBeatmap = Beatmap.Value);
 
             AddStep(@"Seek track to 6 second", () => musicController.SeekTo(6000));
-            AddUntilStep(@"Wait for current time to update", () => currentBeatmap.Track.CurrentTime > 5000);
+            AddUntilStep(@"Wait for current time to update", () => musicController.CurrentTrackTime > 5000);
 
             AddStep(@"Set previous", () => musicController.PreviousTrack());
 
             AddAssert(@"Check beatmap didn't change", () => currentBeatmap == Beatmap.Value);
-            AddUntilStep("Wait for current time to update", () => currentBeatmap.Track.CurrentTime < 5000);
+            AddUntilStep("Wait for current time to update", () => musicController.CurrentTrackTime < 5000);
 
             AddStep(@"Set previous", () => musicController.PreviousTrack());
             AddAssert(@"Check beatmap did change", () => currentBeatmap != Beatmap.Value);
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b4b341634c..b2329f58ad 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -255,7 +255,7 @@ namespace osu.Game.Beatmaps
                         new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store)), beatmapInfo, audioManager));
                 }
 
-                previous?.TransferTo(working);
+                // previous?.TransferTo(working);
                 return working;
             }
         }
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 39c5ccab27..33945a9eb1 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -79,22 +79,6 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            public override void RecycleTrack()
-            {
-                base.RecycleTrack();
-
-                trackStore?.Dispose();
-                trackStore = null;
-            }
-
-            public override void TransferTo(WorkingBeatmap other)
-            {
-                base.TransferTo(other);
-
-                if (other is BeatmapManagerWorkingBeatmap owb && textureStore != null && BeatmapInfo.BackgroundEquals(other.BeatmapInfo))
-                    owb.textureStore = textureStore;
-            }
-
             protected override Waveform GetWaveform()
             {
                 try
diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 31975157a0..086b7502a2 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -26,11 +26,6 @@ namespace osu.Game.Beatmaps
         /// </summary>
         Texture Background { get; }
 
-        /// <summary>
-        /// Retrieves the audio track for this <see cref="WorkingBeatmap"/>.
-        /// </summary>
-        Track Track { get; }
-
         /// <summary>
         /// Retrieves the <see cref="Waveform"/> for the <see cref="Track"/> of this <see cref="WorkingBeatmap"/>.
         /// </summary>
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index ac399e37c4..171201ca68 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Beatmaps
             BeatmapSetInfo = beatmapInfo.BeatmapSet;
             Metadata = beatmapInfo.Metadata ?? BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
-            track = new RecyclableLazy<Track>(() => GetTrack() ?? GetVirtualTrack(1000));
             background = new RecyclableLazy<Texture>(GetBackground, BackgroundStillValid);
             waveform = new RecyclableLazy<Waveform>(GetWaveform);
             storyboard = new RecyclableLazy<Storyboard>(GetStoryboard);
@@ -250,10 +249,9 @@ namespace osu.Game.Beatmaps
         protected abstract Texture GetBackground();
         private readonly RecyclableLazy<Texture> background;
 
-        public virtual bool TrackLoaded => track.IsResultAvailable;
-        public Track Track => track.Value;
+        public Track GetRealTrack() => GetTrack() ?? GetVirtualTrack(1000);
+
         protected abstract Track GetTrack();
-        private RecyclableLazy<Track> track;
 
         public bool WaveformLoaded => waveform.IsResultAvailable;
         public Waveform Waveform => waveform.Value;
@@ -271,22 +269,6 @@ namespace osu.Game.Beatmaps
         protected virtual ISkin GetSkin() => new DefaultSkin();
         private readonly RecyclableLazy<ISkin> skin;
 
-        /// <summary>
-        /// Transfer pieces of a beatmap to a new one, where possible, to save on loading.
-        /// </summary>
-        /// <param name="other">The new beatmap which is being switched to.</param>
-        public virtual void TransferTo(WorkingBeatmap other)
-        {
-            if (track.IsResultAvailable && Track != null && BeatmapInfo.AudioEquals(other.BeatmapInfo))
-                other.track = track;
-        }
-
-        /// <summary>
-        /// Eagerly dispose of the audio track associated with this <see cref="WorkingBeatmap"/> (if any).
-        /// Accessing track again will load a fresh instance.
-        /// </summary>
-        public virtual void RecycleTrack() => track.Recycle();
-
         ~WorkingBeatmap()
         {
             total_count.Value--;
diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index df063f57d5..2dd28a01dc 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -14,6 +15,9 @@ namespace osu.Game.Graphics.Containers
     {
         protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         private int lastBeat;
         private TimingControlPoint lastTimingPoint;
 
@@ -47,22 +51,18 @@ namespace osu.Game.Graphics.Containers
 
         protected override void Update()
         {
-            Track track = null;
             IBeatmap beatmap = null;
 
             double currentTrackTime = 0;
             TimingControlPoint timingPoint = null;
             EffectControlPoint effectPoint = null;
 
-            if (Beatmap.Value.TrackLoaded && Beatmap.Value.BeatmapLoaded)
-            {
-                track = Beatmap.Value.Track;
+            if (musicController.TrackLoaded && Beatmap.Value.BeatmapLoaded)
                 beatmap = Beatmap.Value.Beatmap;
-            }
 
-            if (track != null && beatmap != null && track.IsRunning && track.Length > 0)
+            if (beatmap != null && musicController.IsPlaying && musicController.TrackLength > 0)
             {
-                currentTrackTime = track.CurrentTime + EarlyActivationMilliseconds;
+                currentTrackTime = musicController.CurrentTrackTime + EarlyActivationMilliseconds;
 
                 timingPoint = beatmap.ControlPointInfo.TimingPointAt(currentTrackTime);
                 effectPoint = beatmap.ControlPointInfo.EffectPointAt(currentTrackTime);
@@ -98,7 +98,7 @@ namespace osu.Game.Graphics.Containers
                 return;
 
             using (BeginDelayedSequence(-TimeSinceLastBeat, true))
-                OnNewBeat(beatIndex, timingPoint, effectPoint, track?.CurrentAmplitudes ?? ChannelAmplitudes.Empty);
+                OnNewBeat(beatIndex, timingPoint, effectPoint, musicController.CurrentAmplitudes);
 
             lastBeat = beatIndex;
             lastTimingPoint = timingPoint;
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 26f7c3b93b..929254e8ad 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -431,19 +431,19 @@ namespace osu.Game
 
             if (newBeatmap != null)
             {
-                newBeatmap.Track.Completed += () => Scheduler.AddOnce(() => trackCompleted(newBeatmap));
+                // MusicController.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 firing.
-                if (Beatmap.Value != b)
-                    return;
-
-                if (!Beatmap.Value.Track.Looping && !Beatmap.Disabled)
-                    MusicController.NextTrack();
-            }
+            // void trackCompleted(WorkingBeatmap b)
+            // {
+            //     // the source of track completion is the audio thread, so the beatmap may have changed before firing.
+            //     if (Beatmap.Value != b)
+            //         return;
+            //
+            //     if (!MusicController.Looping && !Beatmap.Disabled)
+            //         MusicController.NextTrack();
+            // }
         }
 
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
@@ -555,6 +555,7 @@ namespace osu.Game
             BackButton.Receptor receptor;
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
+            dependencies.CacheAs(MusicController = new MusicController());
 
             AddRange(new Drawable[]
             {
@@ -617,7 +618,7 @@ namespace osu.Game
 
             loadComponentSingleFile(new OnScreenDisplay(), Add, true);
 
-            loadComponentSingleFile(MusicController = new MusicController(), Add, true);
+            loadComponentSingleFile(MusicController, Add);
 
             loadComponentSingleFile(notifications.With(d =>
             {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 98f60d52d3..24c1f7849c 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -238,16 +238,6 @@ namespace osu.Game
 
             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 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)
-                if (b.OldValue?.TrackLoaded == true && b.OldValue?.Track != b.NewValue?.Track)
-                    b.OldValue.RecycleTrack();
-            }));
-
             dependencies.CacheAs<IBindable<WorkingBeatmap>>(Beatmap);
             dependencies.CacheAs(Beatmap);
 
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index b878aba489..c089158c01 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -30,6 +30,9 @@ namespace osu.Game.Overlays.Music
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         private FilterControl filter;
         private Playlist list;
 
@@ -80,10 +83,7 @@ namespace osu.Game.Overlays.Music
                 BeatmapInfo toSelect = list.FirstVisibleSet?.Beatmaps?.FirstOrDefault();
 
                 if (toSelect != null)
-                {
                     beatmap.Value = beatmaps.GetWorkingBeatmap(toSelect);
-                    beatmap.Value.Track.Restart();
-                }
             };
         }
 
@@ -116,12 +116,12 @@ namespace osu.Game.Overlays.Music
         {
             if (set.ID == (beatmap.Value?.BeatmapSetInfo?.ID ?? -1))
             {
-                beatmap.Value?.Track?.Seek(0);
+                musicController.SeekTo(0);
                 return;
             }
 
             beatmap.Value = beatmaps.GetWorkingBeatmap(set.Beatmaps.First());
-            beatmap.Value.Track.Restart();
+            musicController.Play(true);
         }
     }
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index a990f9a6ab..f5ca5a3a49 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -4,13 +4,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Audio;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Utils;
 using osu.Framework.Threading;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays.OSD;
@@ -21,7 +26,7 @@ namespace osu.Game.Overlays
     /// <summary>
     /// Handles playback of the global music track.
     /// </summary>
-    public class MusicController : Component, IKeyBindingHandler<GlobalAction>
+    public class MusicController : CompositeDrawable, IKeyBindingHandler<GlobalAction>, ITrack
     {
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -61,9 +66,23 @@ namespace osu.Game.Overlays
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
+        [NotNull]
+        private readonly TrackContainer trackContainer;
+
+        [CanBeNull]
+        private DrawableTrack drawableTrack;
+
+        [CanBeNull]
+        private Track track;
+
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
 
+        public MusicController()
+        {
+            InternalChild = trackContainer = new TrackContainer { RelativeSizeAxes = Axes.Both };
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -95,9 +114,35 @@ namespace osu.Game.Overlays
         }
 
         /// <summary>
-        /// Returns whether the current beatmap track is playing.
+        /// Returns whether the beatmap track is playing.
         /// </summary>
-        public bool IsPlaying => current?.Track.IsRunning ?? false;
+        public bool IsPlaying => drawableTrack?.IsRunning ?? false;
+
+        /// <summary>
+        /// Returns whether the beatmap track is loaded.
+        /// </summary>
+        public bool TrackLoaded => drawableTrack?.IsLoaded == true;
+
+        /// <summary>
+        /// Returns the current time of the beatmap track.
+        /// </summary>
+        public double CurrentTrackTime => drawableTrack?.CurrentTime ?? 0;
+
+        /// <summary>
+        /// Returns the length of the beatmap track.
+        /// </summary>
+        public double TrackLength => drawableTrack?.Length ?? 0;
+
+        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+            => trackContainer.AddAdjustment(type, adjustBindable);
+
+        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+            => trackContainer.RemoveAdjustment(type, adjustBindable);
+
+        public void Reset() => drawableTrack?.Reset();
+
+        [CanBeNull]
+        public IAdjustableClock GetTrackClock() => track;
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
@@ -130,7 +175,7 @@ namespace osu.Game.Overlays
             seekDelegate = Schedule(() =>
             {
                 if (!beatmap.Disabled)
-                    current?.Track.Seek(position);
+                    drawableTrack?.Seek(position);
             });
         }
 
@@ -142,9 +187,7 @@ namespace osu.Game.Overlays
         {
             if (IsUserPaused) return;
 
-            var track = current?.Track;
-
-            if (track == null || track is TrackVirtual)
+            if (drawableTrack == null || drawableTrack.IsDummyDevice)
             {
                 if (beatmap.Disabled)
                     return;
@@ -163,17 +206,15 @@ namespace osu.Game.Overlays
         /// <returns>Whether the operation was successful.</returns>
         public bool Play(bool restart = false)
         {
-            var track = current?.Track;
-
             IsUserPaused = false;
 
-            if (track == null)
+            if (drawableTrack == null)
                 return false;
 
             if (restart)
-                track.Restart();
+                drawableTrack.Restart();
             else if (!IsPlaying)
-                track.Start();
+                drawableTrack.Start();
 
             return true;
         }
@@ -183,11 +224,9 @@ namespace osu.Game.Overlays
         /// </summary>
         public void Stop()
         {
-            var track = current?.Track;
-
             IsUserPaused = true;
-            if (track?.IsRunning == true)
-                track.Stop();
+            if (drawableTrack?.IsRunning == true)
+                drawableTrack.Stop();
         }
 
         /// <summary>
@@ -196,9 +235,7 @@ namespace osu.Game.Overlays
         /// <returns>Whether the operation was successful.</returns>
         public bool TogglePause()
         {
-            var track = current?.Track;
-
-            if (track?.IsRunning == true)
+            if (drawableTrack?.IsRunning == true)
                 Stop();
             else
                 Play();
@@ -220,7 +257,7 @@ namespace osu.Game.Overlays
             if (beatmap.Disabled)
                 return PreviousTrackResult.None;
 
-            var currentTrackPosition = current?.Track.CurrentTime;
+            var currentTrackPosition = drawableTrack?.CurrentTime;
 
             if (currentTrackPosition >= restart_cutoff_point)
             {
@@ -274,7 +311,7 @@ namespace osu.Game.Overlays
         {
             // if not scheduled, the previously track will be stopped one frame later (see ScheduleAfterChildren logic in GameBase).
             // we probably want to move this to a central method for switching to a new working beatmap in the future.
-            Schedule(() => beatmap.Value.Track.Restart());
+            Schedule(() => drawableTrack?.Restart());
         }
 
         private WorkingBeatmap current;
@@ -307,6 +344,14 @@ namespace osu.Game.Overlays
             }
 
             current = beatmap.NewValue;
+
+            drawableTrack?.Expire();
+            drawableTrack = null;
+            track = null;
+
+            if (current != null)
+                trackContainer.Add(drawableTrack = new DrawableTrack(track = current.GetRealTrack()));
+
             TrackChanged?.Invoke(current, direction);
 
             ResetTrackAdjustments();
@@ -334,16 +379,15 @@ namespace osu.Game.Overlays
 
         public void ResetTrackAdjustments()
         {
-            var track = current?.Track;
-            if (track == null)
+            if (drawableTrack == null)
                 return;
 
-            track.ResetSpeedAdjustments();
+            drawableTrack.ResetSpeedAdjustments();
 
             if (allowRateAdjustments)
             {
                 foreach (var mod in mods.Value.OfType<IApplicableToTrack>())
-                    mod.ApplyToTrack(track);
+                    mod.ApplyToTrack(drawableTrack);
             }
         }
 
@@ -394,6 +438,133 @@ namespace osu.Game.Overlays
             {
             }
         }
+
+        private class TrackContainer : AudioContainer<DrawableTrack>
+        {
+        }
+
+        #region ITrack
+
+        /// <summary>
+        /// The volume of this component.
+        /// </summary>
+        public BindableNumber<double> Volume => drawableTrack?.Volume; // Todo: Bad
+
+        /// <summary>
+        /// The playback balance of this sample (-1 .. 1 where 0 is centered)
+        /// </summary>
+        public BindableNumber<double> Balance => drawableTrack?.Balance; // Todo: Bad
+
+        /// <summary>
+        /// Rate at which the component is played back (affects pitch). 1 is 100% playback speed, or default frequency.
+        /// </summary>
+        public BindableNumber<double> Frequency => drawableTrack?.Frequency; // Todo: Bad
+
+        /// <summary>
+        /// Rate at which the component is played back (does not affect pitch). 1 is 100% playback speed.
+        /// </summary>
+        public BindableNumber<double> Tempo => drawableTrack?.Tempo; // Todo: Bad
+
+        public IBindable<double> AggregateVolume => drawableTrack?.AggregateVolume; // Todo: Bad
+
+        public IBindable<double> AggregateBalance => drawableTrack?.AggregateBalance; // Todo: Bad
+
+        public IBindable<double> AggregateFrequency => drawableTrack?.AggregateFrequency; // Todo: Bad
+
+        public IBindable<double> AggregateTempo => drawableTrack?.AggregateTempo; // Todo: Bad
+
+        /// <summary>
+        /// Overall playback rate (1 is 100%, -1 is reversed at 100%).
+        /// </summary>
+        public double Rate => AggregateFrequency.Value * AggregateTempo.Value;
+
+        event Action ITrack.Completed
+        {
+            add
+            {
+                if (drawableTrack != null)
+                    drawableTrack.Completed += value;
+            }
+            remove
+            {
+                if (drawableTrack != null)
+                    drawableTrack.Completed -= value;
+            }
+        }
+
+        event Action ITrack.Failed
+        {
+            add
+            {
+                if (drawableTrack != null)
+                    drawableTrack.Failed += value;
+            }
+            remove
+            {
+                if (drawableTrack != null)
+                    drawableTrack.Failed -= value;
+            }
+        }
+
+        public bool Looping
+        {
+            get => drawableTrack?.Looping ?? false;
+            set
+            {
+                if (drawableTrack != null)
+                    drawableTrack.Looping = value;
+            }
+        }
+
+        public bool IsDummyDevice => drawableTrack?.IsDummyDevice ?? true;
+
+        public double RestartPoint
+        {
+            get => drawableTrack?.RestartPoint ?? 0;
+            set
+            {
+                if (drawableTrack != null)
+                    drawableTrack.RestartPoint = value;
+            }
+        }
+
+        double ITrack.CurrentTime => CurrentTrackTime;
+
+        double ITrack.Length
+        {
+            get => TrackLength;
+            set
+            {
+                if (drawableTrack != null)
+                    drawableTrack.Length = value;
+            }
+        }
+
+        public int? Bitrate => drawableTrack?.Bitrate;
+
+        bool ITrack.IsRunning => IsPlaying;
+
+        public bool IsReversed => drawableTrack?.IsReversed ?? false;
+
+        public bool HasCompleted => drawableTrack?.HasCompleted ?? false;
+
+        void ITrack.Reset() => drawableTrack?.Reset();
+
+        void ITrack.Restart() => Play(true);
+
+        void ITrack.ResetSpeedAdjustments() => ResetTrackAdjustments();
+
+        bool ITrack.Seek(double seek)
+        {
+            SeekTo(seek);
+            return true;
+        }
+
+        void ITrack.Start() => Play();
+
+        public ChannelAmplitudes CurrentAmplitudes => drawableTrack?.CurrentAmplitudes ?? ChannelAmplitudes.Empty;
+
+        #endregion
     }
 
     public enum TrackChangeDirection
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index ebb4a96d14..fde6a52fee 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -234,14 +234,12 @@ namespace osu.Game.Overlays
                 pendingBeatmapSwitch = null;
             }
 
-            var track = beatmap.Value?.TrackLoaded ?? false ? beatmap.Value.Track : null;
-
-            if (track?.IsDummyDevice == false)
+            if (musicController.IsDummyDevice == false)
             {
-                progressBar.EndTime = track.Length;
-                progressBar.CurrentTime = track.CurrentTime;
+                progressBar.EndTime = musicController.TrackLength;
+                progressBar.CurrentTime = musicController.CurrentTrackTime;
 
-                playButton.Icon = track.IsRunning ? FontAwesome.Regular.PauseCircle : FontAwesome.Regular.PlayCircle;
+                playButton.Icon = musicController.IsPlaying ? FontAwesome.Regular.PauseCircle : FontAwesome.Regular.PlayCircle;
             }
             else
             {
diff --git a/osu.Game/Rulesets/Mods/IApplicableToTrack.cs b/osu.Game/Rulesets/Mods/IApplicableToTrack.cs
index 4d6d958e82..9b840cea08 100644
--- a/osu.Game/Rulesets/Mods/IApplicableToTrack.cs
+++ b/osu.Game/Rulesets/Mods/IApplicableToTrack.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Mods
     /// </summary>
     public interface IApplicableToTrack : IApplicableMod
     {
-        void ApplyToTrack(Track track);
+        void ApplyToTrack(ITrack track);
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index bd98e735e5..9cefeb3340 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -27,11 +27,11 @@ namespace osu.Game.Rulesets.Mods
             }, true);
         }
 
-        public override void ApplyToTrack(Track track)
+        public override void ApplyToTrack(ITrack track)
         {
             // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
-            track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
-            track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
+            (track as Track)?.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
+            (track as Track)?.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index ed8eb2fb66..b34affa77f 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -38,11 +38,11 @@ namespace osu.Game.Rulesets.Mods
             }, true);
         }
 
-        public override void ApplyToTrack(Track track)
+        public override void ApplyToTrack(ITrack track)
         {
             // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
-            track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
-            track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
+            (track as Track)?.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
+            (track as Track)?.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index 874384686f..ee1280da39 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -12,9 +12,9 @@ namespace osu.Game.Rulesets.Mods
     {
         public abstract BindableNumber<double> SpeedChange { get; }
 
-        public virtual void ApplyToTrack(Track track)
+        public virtual void ApplyToTrack(ITrack track)
         {
-            track.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
+            (track as Track)?.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
         }
 
         public virtual void ApplyToSample(SampleChannel sample)
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 839d97f04e..0257e241b8 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -51,9 +51,9 @@ namespace osu.Game.Rulesets.Mods
             AdjustPitch.BindValueChanged(applyPitchAdjustment);
         }
 
-        public void ApplyToTrack(Track track)
+        public void ApplyToTrack(ITrack track)
         {
-            this.track = track;
+            this.track = track as Track;
 
             FinalRate.TriggerChange();
             AdjustPitch.TriggerChange();
diff --git a/osu.Game/Screens/Edit/Components/BottomBarContainer.cs b/osu.Game/Screens/Edit/Components/BottomBarContainer.cs
index cb5078a479..8d8c59b2ee 100644
--- a/osu.Game/Screens/Edit/Components/BottomBarContainer.cs
+++ b/osu.Game/Screens/Edit/Components/BottomBarContainer.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,7 +17,6 @@ namespace osu.Game.Screens.Edit.Components
         private const float contents_padding = 15;
 
         protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
-        protected Track Track => Beatmap.Value.Track;
 
         private readonly Drawable background;
         private readonly Container content;
diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 59b3d1c565..0a9b4f06a7 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -16,6 +16,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
 using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Components
@@ -27,6 +28,9 @@ namespace osu.Game.Screens.Edit.Components
         [Resolved]
         private EditorClock editorClock { get; set; }
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         private readonly BindableNumber<double> tempo = new BindableDouble(1);
 
         [BackgroundDependencyLoader]
@@ -62,12 +66,12 @@ namespace osu.Game.Screens.Edit.Components
                 }
             };
 
-            Track?.AddAdjustment(AdjustableProperty.Tempo, tempo);
+            musicController.AddAdjustment(AdjustableProperty.Tempo, tempo);
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            Track?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
+            musicController?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
 
             base.Dispose(isDisposing);
         }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
index 9e9ac93d23..a353f79ef4 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -58,7 +59,9 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                     return;
 
                 float markerPos = Math.Clamp(ToLocalSpace(screenPosition).X, 0, DrawWidth);
-                editorClock.SeekTo(markerPos / DrawWidth * editorClock.TrackLength);
+
+                Debug.Assert(editorClock.TrackLength != null);
+                editorClock.SeekTo(markerPos / DrawWidth * editorClock.TrackLength.Value);
             });
         }
 
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index 4a7c3f26bc..446f7fdf88 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -8,6 +8,7 @@ using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
+using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 {
@@ -26,6 +27,9 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 
         protected override Container<T> Content => content;
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         public TimelinePart(Container<T> content = null)
         {
             AddInternal(this.content = content ?? new Container<T> { RelativeSizeAxes = Axes.Both });
@@ -46,14 +50,14 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         private void updateRelativeChildSize()
         {
             // the track may not be loaded completely (only has a length once it is).
-            if (!Beatmap.Value.Track.IsLoaded)
+            if (!musicController.TrackLoaded)
             {
                 content.RelativeChildSize = Vector2.One;
                 Schedule(updateRelativeChildSize);
                 return;
             }
 
-            content.RelativeChildSize = new Vector2((float)Math.Max(1, Beatmap.Value.Track.Length), 1);
+            content.RelativeChildSize = new Vector2((float)Math.Max(1, musicController.TrackLength), 1);
         }
 
         protected virtual void LoadBeatmap(WorkingBeatmap beatmap)
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 717d60b4f3..f35e5defd8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -11,6 +10,7 @@ using osu.Framework.Graphics.Audio;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
 using osuTK;
 
@@ -26,6 +26,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private EditorClock editorClock { get; set; }
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         public Timeline()
         {
             ZoomDuration = 200;
@@ -57,18 +60,21 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             Beatmap.BindValueChanged(b =>
             {
                 waveform.Waveform = b.NewValue.Waveform;
-                track = b.NewValue.Track;
 
-                if (track.Length > 0)
+                // Todo: Wrong.
+                Schedule(() =>
                 {
-                    MaxZoom = getZoomLevelForVisibleMilliseconds(500);
-                    MinZoom = getZoomLevelForVisibleMilliseconds(10000);
-                    Zoom = getZoomLevelForVisibleMilliseconds(2000);
-                }
+                    if (musicController.TrackLength > 0)
+                    {
+                        MaxZoom = getZoomLevelForVisibleMilliseconds(500);
+                        MinZoom = getZoomLevelForVisibleMilliseconds(10000);
+                        Zoom = getZoomLevelForVisibleMilliseconds(2000);
+                    }
+                });
             }, true);
         }
 
-        private float getZoomLevelForVisibleMilliseconds(double milliseconds) => (float)(track.Length / milliseconds);
+        private float getZoomLevelForVisibleMilliseconds(double milliseconds) => (float)(musicController.TrackLength / milliseconds);
 
         /// <summary>
         /// The timeline's scroll position in the last frame.
@@ -90,8 +96,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         /// </summary>
         private bool trackWasPlaying;
 
-        private Track track;
-
         protected override void Update()
         {
             base.Update();
@@ -129,18 +133,18 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void seekTrackToCurrent()
         {
-            if (!track.IsLoaded)
+            if (!musicController.TrackLoaded)
                 return;
 
-            editorClock.Seek(Current / Content.DrawWidth * track.Length);
+            editorClock.Seek(Current / Content.DrawWidth * musicController.TrackLength);
         }
 
         private void scrollToTrackTime()
         {
-            if (!track.IsLoaded || track.Length == 0)
+            if (!musicController.TrackLoaded || musicController.TrackLength == 0)
                 return;
 
-            ScrollTo((float)(editorClock.CurrentTime / track.Length) * Content.DrawWidth, false);
+            ScrollTo((float)(editorClock.CurrentTime / musicController.TrackLength) * Content.DrawWidth, false);
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)
@@ -184,7 +188,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             new SnapResult(screenSpacePosition, beatSnapProvider.SnapTime(getTimeFromPosition(Content.ToLocalSpace(screenSpacePosition))));
 
         private double getTimeFromPosition(Vector2 localPosition) =>
-            (localPosition.X / Content.DrawWidth) * track.Length;
+            (localPosition.X / Content.DrawWidth) * musicController.TrackLength;
 
         public float GetBeatSnapDistanceAt(double referenceTime) => throw new NotImplementedException();
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 36ee976bf7..a833b354ed 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -3,10 +3,9 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Overlays;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
 
@@ -18,7 +17,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private EditorBeatmap beatmap { get; set; }
 
         [Resolved]
-        private Bindable<WorkingBeatmap> working { get; set; }
+        private MusicController musicController { get; set; }
 
         [Resolved]
         private BindableBeatDivisor beatDivisor { get; set; }
@@ -44,7 +43,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 = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : working.Value.Track.Length;
+                var until = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : musicController.TrackLength;
 
                 int beat = 0;
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index d92f3922c3..756b03d049 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -28,6 +28,7 @@ using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Setup;
@@ -53,6 +54,9 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         private Box bottomBackground;
         private Container screenContainer;
 
@@ -79,7 +83,7 @@ namespace osu.Game.Screens.Edit
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
-            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
+            var sourceClock = musicController.GetTrackClock() ?? new StopwatchClock();
             clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
             clock.ChangeSource(sourceClock);
 
@@ -346,7 +350,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            Beatmap.Value.Track?.Stop();
+            musicController.Stop();
 
             if (seekToStart)
             {
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index d4d0feb813..4cb24f90a6 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -2,13 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit
 {
@@ -17,7 +20,7 @@ namespace osu.Game.Screens.Edit
     /// </summary>
     public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock
     {
-        public readonly double TrackLength;
+        public double? TrackLength { get; private set; }
 
         public ControlPointInfo ControlPointInfo;
 
@@ -25,12 +28,15 @@ namespace osu.Game.Screens.Edit
 
         private readonly DecoupleableInterpolatingFramedClock underlyingClock;
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
-            : this(beatmap.Beatmap.ControlPointInfo, beatmap.Track.Length, beatDivisor)
+            : this(beatmap.Beatmap.ControlPointInfo, null, beatDivisor)
         {
         }
 
-        public EditorClock(ControlPointInfo controlPointInfo, double trackLength, BindableBeatDivisor beatDivisor)
+        public EditorClock(ControlPointInfo controlPointInfo, double? trackLength, BindableBeatDivisor beatDivisor)
         {
             this.beatDivisor = beatDivisor;
 
@@ -45,6 +51,13 @@ namespace osu.Game.Screens.Edit
         {
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            // Todo: What.
+            TrackLength ??= musicController.TrackLength;
+        }
+
         /// <summary>
         /// Seek to the closest snappable beat from a time.
         /// </summary>
@@ -135,7 +148,8 @@ namespace osu.Game.Screens.Edit
                 seekTime = timingPoint.Time;
 
             // Ensure the sought point is within the boundaries
-            seekTime = Math.Clamp(seekTime, 0, TrackLength);
+            Debug.Assert(TrackLength != null);
+            seekTime = Math.Clamp(seekTime, 0, TrackLength.Value);
             SeekTo(seekTime);
         }
 
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 5f91aaad15..7da5df2723 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -12,6 +12,7 @@ using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.IO.Archives;
+using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Skinning;
 using osuTK;
@@ -43,7 +44,8 @@ namespace osu.Game.Screens.Menu
 
         private WorkingBeatmap initialBeatmap;
 
-        protected Track Track => initialBeatmap?.Track;
+        [Resolved]
+        protected MusicController MusicController { get; private set; }
 
         private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);
 
@@ -111,7 +113,7 @@ namespace osu.Game.Screens.Menu
                 if (setInfo != null)
                 {
                     initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-                    UsingThemedIntro = !(Track is TrackVirtual);
+                    UsingThemedIntro = !MusicController.IsDummyDevice;
                 }
 
                 return UsingThemedIntro;
@@ -150,7 +152,7 @@ namespace osu.Game.Screens.Menu
         {
             // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
             if (UsingThemedIntro)
-                Track.Restart();
+                MusicController.Play(true);
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index a9ef20436f..86a6fa3802 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Menu
                 LoadComponentAsync(new TrianglesIntroSequence(logo, background)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Clock = new FramedClock(UsingThemedIntro ? Track : null),
+                    Clock = new FramedClock(UsingThemedIntro ? MusicController.GetTrackClock() : null),
                     LoadMenu = LoadMenu
                 }, t =>
                 {
diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index bf42e36e8c..62cada577d 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osuTK.Graphics;
 
@@ -30,6 +31,9 @@ namespace osu.Game.Screens.Menu
             Alpha = 0,
         };
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         private BackgroundScreenDefault background;
 
         [BackgroundDependencyLoader]
@@ -40,7 +44,7 @@ namespace osu.Game.Screens.Menu
 
             pianoReverb = audio.Samples.Get(@"Intro/Welcome/welcome_piano");
 
-            Track.Looping = true;
+            musicController.Looping = true;
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index ebbb19636c..349654165f 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -20,6 +20,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Utils;
+using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Menu
 {
@@ -74,6 +75,9 @@ namespace osu.Game.Screens.Menu
         /// </summary>
         public float Magnitude { get; set; } = 1;
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         private readonly float[] frequencyAmplitudes = new float[256];
 
         private IShader shader;
@@ -103,15 +107,15 @@ namespace osu.Game.Screens.Menu
 
         private void updateAmplitudes()
         {
-            var effect = beatmap.Value.BeatmapLoaded && beatmap.Value.TrackLoaded
-                ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(beatmap.Value.Track.CurrentTime)
+            var effect = beatmap.Value.BeatmapLoaded && musicController.TrackLoaded
+                ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(musicController.CurrentTrackTime)
                 : null;
 
             for (int i = 0; i < temporalAmplitudes.Length; i++)
                 temporalAmplitudes[i] = 0;
 
-            if (beatmap.Value.TrackLoaded)
-                addAmplitudesFromSource(beatmap.Value.Track);
+            if (musicController.TrackLoaded)
+                addAmplitudesFromSource(musicController);
 
             foreach (var source in amplitudeSources)
                 addAmplitudesFromSource(source);
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 57252d557e..c422f57332 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
@@ -62,8 +61,6 @@ namespace osu.Game.Screens.Menu
 
         protected override BackgroundScreen CreateBackground() => background;
 
-        internal Track Track { get; private set; }
-
         private Bindable<float> holdDelay;
         private Bindable<bool> loginDisplayed;
 
@@ -172,20 +169,23 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private Storage storage { get; set; }
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
             buttons.FadeInFromZero(500);
 
-            Track = Beatmap.Value.Track;
             var metadata = Beatmap.Value.Metadata;
 
-            if (last is IntroScreen && Track != null)
+            if (last is IntroScreen && musicController.TrackLoaded)
             {
-                if (!Track.IsRunning)
+                // Todo: Wrong.
+                if (!musicController.IsPlaying)
                 {
-                    Track.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * Track.Length);
-                    Track.Start();
+                    musicController.SeekTo(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * musicController.TrackLength);
+                    musicController.Play();
                 }
             }
 
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index f5e4b078da..1feb2481c3 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -17,6 +17,7 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -46,7 +47,6 @@ namespace osu.Game.Screens.Menu
         private SampleChannel sampleBeat;
 
         private readonly Container colourAndTriangles;
-
         private readonly Triangles triangles;
 
         /// <summary>
@@ -319,6 +319,9 @@ namespace osu.Game.Screens.Menu
             intro.Delay(length + fade).FadeOut();
         }
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         protected override void Update()
         {
             base.Update();
@@ -327,9 +330,9 @@ namespace osu.Game.Screens.Menu
             const float velocity_adjust_cutoff = 0.98f;
             const float paused_velocity = 0.5f;
 
-            if (Beatmap.Value.Track.IsRunning)
+            if (musicController.IsPlaying)
             {
-                var maxAmplitude = lastBeatIndex >= 0 ? Beatmap.Value.Track.CurrentAmplitudes.Maximum : 0;
+                var maxAmplitude = lastBeatIndex >= 0 ? musicController.CurrentAmplitudes.Maximum : 0;
                 logoAmplitudeContainer.Scale = new Vector2((float)Interpolation.Damp(logoAmplitudeContainer.Scale.X, 1 - Math.Max(0, maxAmplitude - scale_adjust_cutoff) * 0.04f, 0.9f, Time.Elapsed));
 
                 if (maxAmplitude > velocity_adjust_cutoff)
diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index a64f24dd7e..032c8d5ca9 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -10,6 +10,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
@@ -26,6 +27,9 @@ namespace osu.Game.Screens.Multi.Match.Components
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         private bool hasBeatmap;
 
         public ReadyButton()
@@ -100,7 +104,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                 return;
             }
 
-            bool hasEnoughTime = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(gameBeatmap.Value.Track.Length) < endDate.Value;
+            bool hasEnoughTime = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(musicController.TrackLength) < endDate.Value;
 
             Enabled.Value = hasBeatmap && hasEnoughTime;
         }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 4912df17b1..2d74434c76 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Multi
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
         [Resolved]
-        private MusicController music { get; set; }
+        private MusicController musicController { get; set; }
 
         [Cached(Type = typeof(IRoomManager))]
         private RoomManager roomManager;
@@ -343,15 +343,9 @@ namespace osu.Game.Screens.Multi
         {
             if (screenStack.CurrentScreen is MatchSubScreen)
             {
-                var track = Beatmap.Value?.Track;
-
-                if (track != null)
-                {
-                    track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-                    track.Looping = true;
-
-                    music.EnsurePlayingSomething();
-                }
+                musicController.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
+                musicController.Looping = true;
+                musicController.EnsurePlayingSomething();
             }
             else
             {
@@ -361,13 +355,8 @@ namespace osu.Game.Screens.Multi
 
         private void cancelLooping()
         {
-            var track = Beatmap?.Value?.Track;
-
-            if (track != null)
-            {
-                track.Looping = false;
-                track.RestartPoint = 0;
-            }
+            musicController.Looping = false;
+            musicController.RestartPoint = 0;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index 54c644c999..0e0ef8c675 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -8,10 +8,10 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
@@ -30,12 +30,13 @@ namespace osu.Game.Screens.Play
 
         private readonly BindableDouble trackFreq = new BindableDouble(1);
 
-        private Track track;
-
         private const float duration = 2500;
 
         private SampleChannel failSample;
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         public FailAnimation(DrawableRuleset drawableRuleset)
         {
             this.drawableRuleset = drawableRuleset;
@@ -44,7 +45,6 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, IBindable<WorkingBeatmap> beatmap)
         {
-            track = beatmap.Value.Track;
             failSample = audio.Samples.Get(@"Gameplay/failsound");
         }
 
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
                 Expire();
             });
 
-            track.AddAdjustment(AdjustableProperty.Frequency, trackFreq);
+            musicController.AddAdjustment(AdjustableProperty.Frequency, trackFreq);
 
             applyToPlayfield(drawableRuleset.Playfield);
             drawableRuleset.Playfield.HitObjectContainer.FlashColour(Color4.Red, 500);
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Play
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            track?.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq);
+            musicController?.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 0653373c91..cf4678ab29 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -8,13 +8,13 @@ using System.Threading.Tasks;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.Play
@@ -27,10 +27,8 @@ namespace osu.Game.Screens.Play
         private readonly WorkingBeatmap beatmap;
         private readonly IReadOnlyList<Mod> mods;
 
-        /// <summary>
-        /// The <see cref="WorkingBeatmap"/>'s track.
-        /// </summary>
-        private Track track;
+        [Resolved]
+        private MusicController musicController { get; set; }
 
         public readonly BindableBool IsPaused = new BindableBool();
 
@@ -72,8 +70,6 @@ namespace osu.Game.Screens.Play
 
             RelativeSizeAxes = Axes.Both;
 
-            track = beatmap.Track;
-
             adjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
 
             // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.
@@ -125,15 +121,15 @@ namespace osu.Game.Screens.Play
         {
             // 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();
+            musicController.Reset();
 
             Task.Run(() =>
             {
-                track.Reset();
+                musicController.Reset();
 
                 Schedule(() =>
                 {
-                    adjustableClock.ChangeSource(track);
+                    adjustableClock.ChangeSource(musicController.GetTrackClock());
                     updateRate();
 
                     if (!IsPaused.Value)
@@ -194,20 +190,6 @@ namespace osu.Game.Screens.Play
             IsPaused.Value = true;
         }
 
-        /// <summary>
-        /// Changes the backing clock to avoid using the originally provided beatmap's track.
-        /// </summary>
-        public void StopUsingBeatmapClock()
-        {
-            if (track != beatmap.Track)
-                return;
-
-            removeSourceClockAdjustments();
-
-            track = new TrackVirtual(beatmap.Track.Length);
-            adjustableClock.ChangeSource(track);
-        }
-
         protected override void Update()
         {
             if (!IsPaused.Value)
@@ -220,31 +202,23 @@ namespace osu.Game.Screens.Play
 
         private void updateRate()
         {
-            if (track == null) return;
-
             speedAdjustmentsApplied = true;
-            track.ResetSpeedAdjustments();
-
-            track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
-
-            foreach (var mod in mods.OfType<IApplicableToTrack>())
-                mod.ApplyToTrack(track);
+            musicController.ResetTrackAdjustments();
+            musicController.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            musicController.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
         }
 
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-
             removeSourceClockAdjustments();
-            track = null;
         }
 
         private void removeSourceClockAdjustments()
         {
             if (speedAdjustmentsApplied)
             {
-                track.ResetSpeedAdjustments();
+                musicController.ResetTrackAdjustments();
                 speedAdjustmentsApplied = false;
             }
         }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 74a5ee8309..9ba2732920 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -561,8 +560,11 @@ namespace osu.Game.Screens.Select
 
             BeatmapDetails.Refresh();
 
-            Beatmap.Value.Track.Looping = true;
-            music?.ResetTrackAdjustments();
+            if (music != null)
+            {
+                music.Looping = true;
+                music.ResetTrackAdjustments();
+            }
 
             if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
             {
@@ -586,8 +588,8 @@ namespace osu.Game.Screens.Select
 
             BeatmapOptions.Hide();
 
-            if (Beatmap.Value.Track != null)
-                Beatmap.Value.Track.Looping = false;
+            if (music != null)
+                music.Looping = false;
 
             this.ScaleTo(1.1f, 250, Easing.InSine);
 
@@ -608,8 +610,8 @@ namespace osu.Game.Screens.Select
 
             FilterControl.Deactivate();
 
-            if (Beatmap.Value.Track != null)
-                Beatmap.Value.Track.Looping = false;
+            if (music != null)
+                music.Looping = false;
 
             return false;
         }
@@ -650,28 +652,18 @@ namespace osu.Game.Screens.Select
 
             BeatmapDetails.Beatmap = beatmap;
 
-            if (beatmap.Track != null)
-                beatmap.Track.Looping = true;
+            if (music != null)
+                music.Looping = false;
         }
 
-        private readonly WeakReference<Track> lastTrack = new WeakReference<Track>(null);
-
         /// <summary>
         /// Ensures some music is playing for the current track.
         /// Will resume playback from a manual user pause if the track has changed.
         /// </summary>
         private void ensurePlayingSelected()
         {
-            Track track = Beatmap.Value.Track;
-
-            bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;
-
-            track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-
-            if (!track.IsRunning && (music?.IsUserPaused != true || isNewTrack))
-                music?.Play(true);
-
-            lastTrack.SetTarget(track);
+            music.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
+            music.EnsurePlayingSomething();
         }
 
         private void carouselBeatmapsLoaded()
diff --git a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
index cdf9170701..ee04142035 100644
--- a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
@@ -27,8 +27,6 @@ namespace osu.Game.Tests.Beatmaps
             this.storyboard = storyboard;
         }
 
-        public override bool TrackLoaded => true;
-
         public override bool BeatmapLoaded => true;
 
         protected override IBeatmap GetBeatmap() => beatmap;
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index f0ec638fc9..5226a49def 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource((IAdjustableClock)e.NewValue.Track ?? new StopwatchClock());
+            Clock.ChangeSource(MusicController.GetTrackClock() ?? new StopwatchClock());
             Clock.ProcessFrame();
         }
 
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 866fc215d6..e968f7e675 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -20,6 +20,7 @@ using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Online.API;
+using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -135,6 +136,9 @@ namespace osu.Game.Tests.Visual
         [Resolved]
         protected AudioManager Audio { get; private set; }
 
+        [Resolved]
+        protected MusicController MusicController { get; private set; }
+
         /// <summary>
         /// Creates the ruleset to be used for this test scene.
         /// </summary>
@@ -164,8 +168,8 @@ namespace osu.Game.Tests.Visual
 
             rulesetDependencies?.Dispose();
 
-            if (Beatmap?.Value.TrackLoaded == true)
-                Beatmap.Value.Track.Stop();
+            if (MusicController?.TrackLoaded == true)
+                MusicController.Stop();
 
             if (contextFactory.IsValueCreated)
                 contextFactory.Value.ResetDatabase();
diff --git a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
index ad24ffc7b8..e7cb461d7b 100644
--- a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
+++ b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Tests.Visual
             base.Update();
 
             // note that this will override any mod rate application
-            Beatmap.Value.Track.Tempo.Value = Clock.Rate;
+            MusicController.Tempo.Value = Clock.Rate;
         }
     }
 }

From 5c05fe3988ad5ba9c92e908628f2d11def1c9376 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 5 Aug 2020 21:10:38 +0900
Subject: [PATCH 04091/10326] Expose track from MusicController

---
 .../TestSceneHoldNoteInput.cs                 |   2 +-
 .../TestSceneOutOfOrderHits.cs                |   2 +-
 .../TestSceneSliderInput.cs                   |   2 +-
 .../Skins/TestSceneBeatmapSkinResources.cs    |   2 +-
 .../Visual/Editing/TimelineTestScene.cs       |   6 +-
 .../Visual/Gameplay/TestScenePause.cs         |   2 +-
 .../Visual/Gameplay/TestScenePlayerLoader.cs  |   6 +-
 .../Visual/Gameplay/TestSceneStoryboard.cs    |   8 +-
 .../Visual/Menus/TestSceneIntroWelcome.cs     |   2 +-
 .../Navigation/TestSceneScreenNavigation.cs   |  13 +-
 .../TestSceneBeatSyncedContainer.cs           |   3 +-
 .../TestSceneNowPlayingOverlay.cs             |   4 +-
 .../Containers/BeatSyncedContainer.cs         |  14 +-
 osu.Game/Overlays/MusicController.cs          | 190 ++----------------
 osu.Game/Overlays/NowPlayingOverlay.cs        |  12 +-
 osu.Game/Rulesets/Mods/IApplicableToTrack.cs  |   3 +-
 osu.Game/Rulesets/Mods/ModDaycore.cs          |   7 +-
 osu.Game/Rulesets/Mods/ModNightcore.cs        |   6 +-
 osu.Game/Rulesets/Mods/ModRateAdjust.cs       |   4 +-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  10 +-
 .../Edit/Components/PlaybackControl.cs        |   4 +-
 .../Timelines/Summary/Parts/TimelinePart.cs   |   4 +-
 .../Compose/Components/Timeline/Timeline.cs   |  31 +--
 .../Timeline/TimelineTickDisplay.cs           |   3 +-
 osu.Game/Screens/Edit/Editor.cs               |   2 +-
 osu.Game/Screens/Edit/EditorClock.cs          |   2 +-
 osu.Game/Screens/Menu/IntroScreen.cs          |   4 +-
 osu.Game/Screens/Menu/IntroTriangles.cs       |   2 +-
 osu.Game/Screens/Menu/IntroWelcome.cs         |   3 +-
 osu.Game/Screens/Menu/LogoVisualisation.cs    |   5 +-
 osu.Game/Screens/Menu/MainMenu.cs             |  10 +-
 osu.Game/Screens/Menu/OsuLogo.cs              |   4 +-
 .../Multi/Match/Components/ReadyButton.cs     |   2 +-
 osu.Game/Screens/Multi/Multiplayer.cs         |  17 +-
 osu.Game/Screens/Play/FailAnimation.cs        |  13 +-
 .../Screens/Play/GameplayClockContainer.cs    |  44 +++-
 osu.Game/Screens/Select/SongSelect.cs         |  33 ++-
 osu.Game/Tests/Visual/EditorClockTestScene.cs |   2 +-
 .../Visual/RateAdjustedBeatmapTestScene.cs    |   4 +-
 39 files changed, 204 insertions(+), 283 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index c3e0c277a0..98669efb10 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -343,7 +343,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrackTime == 0);
+            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack?.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index dc7e59b40d..e5be778527 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -385,7 +385,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrackTime == 0);
+            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack?.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 2dffcfeabb..c9d13d3976 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -366,7 +366,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrackTime == 0);
+            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack?.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
index 1a19326ac4..08a4e27ff7 100644
--- a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Tests.Skins
         public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo("sample")) != null);
 
         [Test]
-        public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => !MusicController.IsDummyDevice);
+        public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => MusicController.CurrentTrack?.IsDummyDevice == false);
     }
 }
diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 5d6136d9fb..4113bdddf8 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.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.Audio;
 using osu.Framework.Graphics;
@@ -94,7 +95,10 @@ namespace osu.Game.Tests.Visual.Editing
                 base.Update();
 
                 if (musicController.TrackLoaded)
-                    marker.X = (float)(editorClock.CurrentTime / musicController.TrackLength);
+                {
+                    Debug.Assert(musicController.CurrentTrack != null);
+                    marker.X = (float)(editorClock.CurrentTime / musicController.CurrentTrack.Length);
+                }
             }
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 8f14de1578..e500b451f0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -288,7 +288,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void confirmNoTrackAdjustments()
         {
-            AddAssert("track has no adjustments", () => MusicController.AggregateFrequency.Value == 1);
+            AddAssert("track has no adjustments", () => MusicController.CurrentTrack?.AggregateFrequency.Value == 1);
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 2f86db1b25..c72ab7d3d1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToTrack>())
-                mod.ApplyToTrack(MusicController);
+                mod.ApplyToTrack(MusicController.CurrentTrack);
 
             InputManager.Child = container = new TestPlayerLoaderContainer(
                 loader = new TestPlayerLoader(() =>
@@ -77,12 +77,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("load dummy beatmap", () => ResetPlayer(false, () => SelectedMods.Value = new[] { new OsuModNightcore() }));
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
-            AddAssert("mod rate applied", () => MusicController.Rate != 1);
+            AddAssert("mod rate applied", () => MusicController.CurrentTrack?.Rate != 1);
             AddStep("exit loader", () => loader.Exit());
             AddUntilStep("wait for not current", () => !loader.IsCurrentScreen());
             AddAssert("player did not load", () => !player.IsLoaded);
             AddUntilStep("player disposed", () => loader.DisposalTask?.IsCompleted == true);
-            AddAssert("mod rate still applied", () => MusicController.Rate != 1);
+            AddAssert("mod rate still applied", () => MusicController.CurrentTrack?.Rate != 1);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index a4b558fce2..c7a012a03f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -87,9 +87,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void restart()
         {
-            MusicController.Reset();
+            MusicController.CurrentTrack?.Reset();
             loadStoryboard(Beatmap.Value);
-            MusicController.Play(true);
+            MusicController.CurrentTrack?.Start();
         }
 
         private void loadStoryboard(WorkingBeatmap working)
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboard.Passing = false;
 
             storyboardContainer.Add(storyboard);
-            decoupledClock.ChangeSource(musicController.GetTrackClock());
+            decoupledClock.ChangeSource(musicController.CurrentTrack);
         }
 
         private void loadStoryboardNoVideo()
@@ -127,7 +127,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboard = sb.CreateDrawable(Beatmap.Value);
 
             storyboardContainer.Add(storyboard);
-            decoupledClock.ChangeSource(musicController.GetTrackClock());
+            decoupledClock.ChangeSource(musicController.CurrentTrack);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
index 36f98b7a0c..a88704c831 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Menus
         {
             AddUntilStep("wait for load", () => MusicController.TrackLoaded);
 
-            AddAssert("check if menu music loops", () => MusicController.Looping);
+            AddAssert("check if menu music loops", () => MusicController.CurrentTrack?.Looping == true);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 455b7e56e6..946bc2a175 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
@@ -61,12 +62,12 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("wait for fail", () => player.HasFailed);
 
             AddUntilStep("wait for track stop", () => !MusicController.IsPlaying);
-            AddAssert("Ensure time before preview point", () => MusicController.CurrentTrackTime < beatmap().Metadata.PreviewTime);
+            AddAssert("Ensure time before preview point", () => MusicController.CurrentTrack?.CurrentTime < beatmap().Metadata.PreviewTime);
 
             pushEscape();
 
             AddUntilStep("wait for track playing", () => MusicController.IsPlaying);
-            AddAssert("Ensure time wasn't reset to preview point", () => MusicController.CurrentTrackTime < beatmap().Metadata.PreviewTime);
+            AddAssert("Ensure time wasn't reset to preview point", () => MusicController.CurrentTrack?.CurrentTime < beatmap().Metadata.PreviewTime);
         }
 
         [Test]
@@ -76,11 +77,11 @@ namespace osu.Game.Tests.Visual.Navigation
 
             PushAndConfirm(() => songSelect = new TestSongSelect());
 
-            AddUntilStep("wait for no track", () => MusicController.IsDummyDevice);
+            AddUntilStep("wait for no track", () => MusicController.CurrentTrack?.IsDummyDevice == true);
 
             AddStep("return to menu", () => songSelect.Exit());
 
-            AddUntilStep("wait for track", () => !MusicController.IsDummyDevice && MusicController.IsPlaying);
+            AddUntilStep("wait for track", () => MusicController.CurrentTrack?.IsDummyDevice == false && MusicController.IsPlaying);
         }
 
         [Test]
@@ -135,8 +136,8 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("Wait for music controller", () => Game.MusicController.IsLoaded);
             AddStep("Seek close to end", () =>
             {
-                Game.MusicController.SeekTo(MusicController.TrackLength - 1000);
-                // MusicController.Completed += () => trackCompleted = true;
+                Game.MusicController.SeekTo(MusicController.CurrentTrack.AsNonNull().Length - 1000);
+                MusicController.CurrentTrack.AsNonNull().Completed += () => trackCompleted = true;
             });
 
             AddUntilStep("Track was completed", () => trackCompleted);
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
index f3fef8c355..ac743d76df 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -168,7 +169,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 if (timingPoints.Count == 0) return 0;
 
                 if (timingPoints[^1] == current)
-                    return (int)Math.Ceiling((musicController.TrackLength - current.Time) / current.BeatLength);
+                    return (int)Math.Ceiling((musicController.CurrentTrack.AsNonNull().Length - current.Time) / current.BeatLength);
 
                 return (int)Math.Ceiling((getNextTimingPoint(current).Time - current.Time) / current.BeatLength);
             }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index 3ecd8ab550..0161ec0c56 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
@@ -80,12 +80,12 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Store track", () => currentBeatmap = Beatmap.Value);
 
             AddStep(@"Seek track to 6 second", () => musicController.SeekTo(6000));
-            AddUntilStep(@"Wait for current time to update", () => musicController.CurrentTrackTime > 5000);
+            AddUntilStep(@"Wait for current time to update", () => musicController.CurrentTrack?.CurrentTime > 5000);
 
             AddStep(@"Set previous", () => musicController.PreviousTrack());
 
             AddAssert(@"Check beatmap didn't change", () => currentBeatmap == Beatmap.Value);
-            AddUntilStep("Wait for current time to update", () => musicController.CurrentTrackTime < 5000);
+            AddUntilStep("Wait for current time to update", () => musicController.CurrentTrack?.CurrentTime < 5000);
 
             AddStep(@"Set previous", () => musicController.PreviousTrack());
             AddAssert(@"Check beatmap did change", () => currentBeatmap != Beatmap.Value);
diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index 2dd28a01dc..92a9ed0566 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -51,6 +51,7 @@ namespace osu.Game.Graphics.Containers
 
         protected override void Update()
         {
+            ITrack track = null;
             IBeatmap beatmap = null;
 
             double currentTrackTime = 0;
@@ -58,11 +59,14 @@ namespace osu.Game.Graphics.Containers
             EffectControlPoint effectPoint = null;
 
             if (musicController.TrackLoaded && Beatmap.Value.BeatmapLoaded)
-                beatmap = Beatmap.Value.Beatmap;
-
-            if (beatmap != null && musicController.IsPlaying && musicController.TrackLength > 0)
             {
-                currentTrackTime = musicController.CurrentTrackTime + EarlyActivationMilliseconds;
+                track = musicController.CurrentTrack;
+                beatmap = Beatmap.Value.Beatmap;
+            }
+
+            if (track != null && beatmap != null && musicController.IsPlaying && track.Length > 0)
+            {
+                currentTrackTime = track.CurrentTime + EarlyActivationMilliseconds;
 
                 timingPoint = beatmap.ControlPointInfo.TimingPointAt(currentTrackTime);
                 effectPoint = beatmap.ControlPointInfo.EffectPointAt(currentTrackTime);
@@ -98,7 +102,7 @@ namespace osu.Game.Graphics.Containers
                 return;
 
             using (BeginDelayedSequence(-TimeSinceLastBeat, true))
-                OnNewBeat(beatIndex, timingPoint, effectPoint, musicController.CurrentAmplitudes);
+                OnNewBeat(beatIndex, timingPoint, effectPoint, track?.CurrentAmplitudes ?? ChannelAmplitudes.Empty);
 
             lastBeat = beatIndex;
             lastTimingPoint = timingPoint;
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index f5ca5a3a49..c22849b7d6 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -15,7 +14,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Utils;
 using osu.Framework.Threading;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays.OSD;
@@ -26,7 +24,7 @@ namespace osu.Game.Overlays
     /// <summary>
     /// Handles playback of the global music track.
     /// </summary>
-    public class MusicController : CompositeDrawable, IKeyBindingHandler<GlobalAction>, ITrack
+    public class MusicController : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -70,10 +68,7 @@ namespace osu.Game.Overlays
         private readonly TrackContainer trackContainer;
 
         [CanBeNull]
-        private DrawableTrack drawableTrack;
-
-        [CanBeNull]
-        private Track track;
+        public DrawableTrack CurrentTrack { get; private set; }
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
@@ -116,33 +111,12 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Returns whether the beatmap track is playing.
         /// </summary>
-        public bool IsPlaying => drawableTrack?.IsRunning ?? false;
+        public bool IsPlaying => CurrentTrack?.IsRunning ?? false;
 
         /// <summary>
         /// Returns whether the beatmap track is loaded.
         /// </summary>
-        public bool TrackLoaded => drawableTrack?.IsLoaded == true;
-
-        /// <summary>
-        /// Returns the current time of the beatmap track.
-        /// </summary>
-        public double CurrentTrackTime => drawableTrack?.CurrentTime ?? 0;
-
-        /// <summary>
-        /// Returns the length of the beatmap track.
-        /// </summary>
-        public double TrackLength => drawableTrack?.Length ?? 0;
-
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => trackContainer.AddAdjustment(type, adjustBindable);
-
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => trackContainer.RemoveAdjustment(type, adjustBindable);
-
-        public void Reset() => drawableTrack?.Reset();
-
-        [CanBeNull]
-        public IAdjustableClock GetTrackClock() => track;
+        public bool TrackLoaded => CurrentTrack?.IsLoaded == true;
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
@@ -175,7 +149,7 @@ namespace osu.Game.Overlays
             seekDelegate = Schedule(() =>
             {
                 if (!beatmap.Disabled)
-                    drawableTrack?.Seek(position);
+                    CurrentTrack?.Seek(position);
             });
         }
 
@@ -187,7 +161,7 @@ namespace osu.Game.Overlays
         {
             if (IsUserPaused) return;
 
-            if (drawableTrack == null || drawableTrack.IsDummyDevice)
+            if (CurrentTrack == null || CurrentTrack.IsDummyDevice)
             {
                 if (beatmap.Disabled)
                     return;
@@ -208,13 +182,13 @@ namespace osu.Game.Overlays
         {
             IsUserPaused = false;
 
-            if (drawableTrack == null)
+            if (CurrentTrack == null)
                 return false;
 
             if (restart)
-                drawableTrack.Restart();
+                CurrentTrack.Restart();
             else if (!IsPlaying)
-                drawableTrack.Start();
+                CurrentTrack.Start();
 
             return true;
         }
@@ -225,8 +199,8 @@ namespace osu.Game.Overlays
         public void Stop()
         {
             IsUserPaused = true;
-            if (drawableTrack?.IsRunning == true)
-                drawableTrack.Stop();
+            if (CurrentTrack?.IsRunning == true)
+                CurrentTrack.Stop();
         }
 
         /// <summary>
@@ -235,7 +209,7 @@ namespace osu.Game.Overlays
         /// <returns>Whether the operation was successful.</returns>
         public bool TogglePause()
         {
-            if (drawableTrack?.IsRunning == true)
+            if (CurrentTrack?.IsRunning == true)
                 Stop();
             else
                 Play();
@@ -257,7 +231,7 @@ namespace osu.Game.Overlays
             if (beatmap.Disabled)
                 return PreviousTrackResult.None;
 
-            var currentTrackPosition = drawableTrack?.CurrentTime;
+            var currentTrackPosition = CurrentTrack?.CurrentTime;
 
             if (currentTrackPosition >= restart_cutoff_point)
             {
@@ -311,7 +285,7 @@ namespace osu.Game.Overlays
         {
             // if not scheduled, the previously track will be stopped one frame later (see ScheduleAfterChildren logic in GameBase).
             // we probably want to move this to a central method for switching to a new working beatmap in the future.
-            Schedule(() => drawableTrack?.Restart());
+            Schedule(() => CurrentTrack?.Restart());
         }
 
         private WorkingBeatmap current;
@@ -345,12 +319,11 @@ namespace osu.Game.Overlays
 
             current = beatmap.NewValue;
 
-            drawableTrack?.Expire();
-            drawableTrack = null;
-            track = null;
+            CurrentTrack?.Expire();
+            CurrentTrack = null;
 
             if (current != null)
-                trackContainer.Add(drawableTrack = new DrawableTrack(track = current.GetRealTrack()));
+                trackContainer.Add(CurrentTrack = new DrawableTrack(current.GetRealTrack()));
 
             TrackChanged?.Invoke(current, direction);
 
@@ -379,15 +352,15 @@ namespace osu.Game.Overlays
 
         public void ResetTrackAdjustments()
         {
-            if (drawableTrack == null)
+            if (CurrentTrack == null)
                 return;
 
-            drawableTrack.ResetSpeedAdjustments();
+            CurrentTrack.ResetSpeedAdjustments();
 
             if (allowRateAdjustments)
             {
                 foreach (var mod in mods.Value.OfType<IApplicableToTrack>())
-                    mod.ApplyToTrack(drawableTrack);
+                    mod.ApplyToTrack(CurrentTrack);
             }
         }
 
@@ -442,129 +415,6 @@ namespace osu.Game.Overlays
         private class TrackContainer : AudioContainer<DrawableTrack>
         {
         }
-
-        #region ITrack
-
-        /// <summary>
-        /// The volume of this component.
-        /// </summary>
-        public BindableNumber<double> Volume => drawableTrack?.Volume; // Todo: Bad
-
-        /// <summary>
-        /// The playback balance of this sample (-1 .. 1 where 0 is centered)
-        /// </summary>
-        public BindableNumber<double> Balance => drawableTrack?.Balance; // Todo: Bad
-
-        /// <summary>
-        /// Rate at which the component is played back (affects pitch). 1 is 100% playback speed, or default frequency.
-        /// </summary>
-        public BindableNumber<double> Frequency => drawableTrack?.Frequency; // Todo: Bad
-
-        /// <summary>
-        /// Rate at which the component is played back (does not affect pitch). 1 is 100% playback speed.
-        /// </summary>
-        public BindableNumber<double> Tempo => drawableTrack?.Tempo; // Todo: Bad
-
-        public IBindable<double> AggregateVolume => drawableTrack?.AggregateVolume; // Todo: Bad
-
-        public IBindable<double> AggregateBalance => drawableTrack?.AggregateBalance; // Todo: Bad
-
-        public IBindable<double> AggregateFrequency => drawableTrack?.AggregateFrequency; // Todo: Bad
-
-        public IBindable<double> AggregateTempo => drawableTrack?.AggregateTempo; // Todo: Bad
-
-        /// <summary>
-        /// Overall playback rate (1 is 100%, -1 is reversed at 100%).
-        /// </summary>
-        public double Rate => AggregateFrequency.Value * AggregateTempo.Value;
-
-        event Action ITrack.Completed
-        {
-            add
-            {
-                if (drawableTrack != null)
-                    drawableTrack.Completed += value;
-            }
-            remove
-            {
-                if (drawableTrack != null)
-                    drawableTrack.Completed -= value;
-            }
-        }
-
-        event Action ITrack.Failed
-        {
-            add
-            {
-                if (drawableTrack != null)
-                    drawableTrack.Failed += value;
-            }
-            remove
-            {
-                if (drawableTrack != null)
-                    drawableTrack.Failed -= value;
-            }
-        }
-
-        public bool Looping
-        {
-            get => drawableTrack?.Looping ?? false;
-            set
-            {
-                if (drawableTrack != null)
-                    drawableTrack.Looping = value;
-            }
-        }
-
-        public bool IsDummyDevice => drawableTrack?.IsDummyDevice ?? true;
-
-        public double RestartPoint
-        {
-            get => drawableTrack?.RestartPoint ?? 0;
-            set
-            {
-                if (drawableTrack != null)
-                    drawableTrack.RestartPoint = value;
-            }
-        }
-
-        double ITrack.CurrentTime => CurrentTrackTime;
-
-        double ITrack.Length
-        {
-            get => TrackLength;
-            set
-            {
-                if (drawableTrack != null)
-                    drawableTrack.Length = value;
-            }
-        }
-
-        public int? Bitrate => drawableTrack?.Bitrate;
-
-        bool ITrack.IsRunning => IsPlaying;
-
-        public bool IsReversed => drawableTrack?.IsReversed ?? false;
-
-        public bool HasCompleted => drawableTrack?.HasCompleted ?? false;
-
-        void ITrack.Reset() => drawableTrack?.Reset();
-
-        void ITrack.Restart() => Play(true);
-
-        void ITrack.ResetSpeedAdjustments() => ResetTrackAdjustments();
-
-        bool ITrack.Seek(double seek)
-        {
-            SeekTo(seek);
-            return true;
-        }
-
-        void ITrack.Start() => Play();
-
-        public ChannelAmplitudes CurrentAmplitudes => drawableTrack?.CurrentAmplitudes ?? ChannelAmplitudes.Empty;
-
-        #endregion
     }
 
     public enum TrackChangeDirection
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index fde6a52fee..15b189ead6 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -234,12 +234,14 @@ namespace osu.Game.Overlays
                 pendingBeatmapSwitch = null;
             }
 
-            if (musicController.IsDummyDevice == false)
-            {
-                progressBar.EndTime = musicController.TrackLength;
-                progressBar.CurrentTime = musicController.CurrentTrackTime;
+            var track = musicController.TrackLoaded ? musicController.CurrentTrack : null;
 
-                playButton.Icon = musicController.IsPlaying ? FontAwesome.Regular.PauseCircle : FontAwesome.Regular.PlayCircle;
+            if (track?.IsDummyDevice == false)
+            {
+                progressBar.EndTime = track.Length;
+                progressBar.CurrentTime = track.CurrentTime;
+
+                playButton.Icon = track.IsRunning ? FontAwesome.Regular.PauseCircle : FontAwesome.Regular.PlayCircle;
             }
             else
             {
diff --git a/osu.Game/Rulesets/Mods/IApplicableToTrack.cs b/osu.Game/Rulesets/Mods/IApplicableToTrack.cs
index 9b840cea08..5ae41fe09c 100644
--- a/osu.Game/Rulesets/Mods/IApplicableToTrack.cs
+++ b/osu.Game/Rulesets/Mods/IApplicableToTrack.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.Audio;
 using osu.Framework.Audio.Track;
 
 namespace osu.Game.Rulesets.Mods
@@ -10,6 +11,6 @@ namespace osu.Game.Rulesets.Mods
     /// </summary>
     public interface IApplicableToTrack : IApplicableMod
     {
-        void ApplyToTrack(ITrack track);
+        void ApplyToTrack<T>(T track) where T : ITrack, IAdjustableAudioComponent;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index 9cefeb3340..989978eb35 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 
@@ -27,11 +26,11 @@ namespace osu.Game.Rulesets.Mods
             }, true);
         }
 
-        public override void ApplyToTrack(ITrack track)
+        public override void ApplyToTrack<T>(T track)
         {
             // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
-            (track as Track)?.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
-            (track as Track)?.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
+            track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
+            track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index b34affa77f..70cdaa6345 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -38,11 +38,11 @@ namespace osu.Game.Rulesets.Mods
             }, true);
         }
 
-        public override void ApplyToTrack(ITrack track)
+        public override void ApplyToTrack<T>(T track)
         {
             // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
-            (track as Track)?.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
-            (track as Track)?.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
+            track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
+            track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index ee1280da39..e2c8ac64d9 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -12,9 +12,9 @@ namespace osu.Game.Rulesets.Mods
     {
         public abstract BindableNumber<double> SpeedChange { get; }
 
-        public virtual void ApplyToTrack(ITrack track)
+        public virtual void ApplyToTrack<T>(T track) where T : ITrack, IAdjustableAudioComponent
         {
-            (track as Track)?.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
+            track.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
         }
 
         public virtual void ApplyToSample(SampleChannel sample)
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 0257e241b8..b6cbe72971 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        private Track track;
+        private ITrack track;
 
         protected ModTimeRamp()
         {
@@ -51,9 +51,9 @@ namespace osu.Game.Rulesets.Mods
             AdjustPitch.BindValueChanged(applyPitchAdjustment);
         }
 
-        public void ApplyToTrack(ITrack track)
+        public void ApplyToTrack<T>(T track) where T : ITrack, IAdjustableAudioComponent
         {
-            this.track = track as Track;
+            this.track = track;
 
             FinalRate.TriggerChange();
             AdjustPitch.TriggerChange();
@@ -89,9 +89,9 @@ namespace osu.Game.Rulesets.Mods
         private void applyPitchAdjustment(ValueChangedEvent<bool> adjustPitchSetting)
         {
             // remove existing old adjustment
-            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
+            (track as IAdjustableAudioComponent)?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
 
-            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
+            (track as IAdjustableAudioComponent)?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
         }
 
         private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 0a9b4f06a7..412efe266c 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -66,12 +66,12 @@ namespace osu.Game.Screens.Edit.Components
                 }
             };
 
-            musicController.AddAdjustment(AdjustableProperty.Tempo, tempo);
+            musicController.CurrentTrack?.AddAdjustment(AdjustableProperty.Tempo, tempo);
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            musicController?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
+            musicController?.CurrentTrack?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
 
             base.Dispose(isDisposing);
         }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index 446f7fdf88..24fb855009 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osuTK;
@@ -57,7 +58,8 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                 return;
             }
 
-            content.RelativeChildSize = new Vector2((float)Math.Max(1, musicController.TrackLength), 1);
+            Debug.Assert(musicController.CurrentTrack != null);
+            content.RelativeChildSize = new Vector2((float)Math.Max(1, musicController.CurrentTrack.Length), 1);
         }
 
         protected virtual void LoadBeatmap(WorkingBeatmap beatmap)
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index f35e5defd8..d556d948f6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -2,7 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -60,21 +62,20 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             Beatmap.BindValueChanged(b =>
             {
                 waveform.Waveform = b.NewValue.Waveform;
+                track = musicController.CurrentTrack;
 
-                // Todo: Wrong.
-                Schedule(() =>
+                Debug.Assert(track != null);
+
+                if (track.Length > 0)
                 {
-                    if (musicController.TrackLength > 0)
-                    {
-                        MaxZoom = getZoomLevelForVisibleMilliseconds(500);
-                        MinZoom = getZoomLevelForVisibleMilliseconds(10000);
-                        Zoom = getZoomLevelForVisibleMilliseconds(2000);
-                    }
-                });
+                    MaxZoom = getZoomLevelForVisibleMilliseconds(500);
+                    MinZoom = getZoomLevelForVisibleMilliseconds(10000);
+                    Zoom = getZoomLevelForVisibleMilliseconds(2000);
+                }
             }, true);
         }
 
-        private float getZoomLevelForVisibleMilliseconds(double milliseconds) => (float)(musicController.TrackLength / milliseconds);
+        private float getZoomLevelForVisibleMilliseconds(double milliseconds) => (float)(track.Length / milliseconds);
 
         /// <summary>
         /// The timeline's scroll position in the last frame.
@@ -96,6 +97,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         /// </summary>
         private bool trackWasPlaying;
 
+        private ITrack track;
+
         protected override void Update()
         {
             base.Update();
@@ -136,15 +139,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (!musicController.TrackLoaded)
                 return;
 
-            editorClock.Seek(Current / Content.DrawWidth * musicController.TrackLength);
+            editorClock.Seek(Current / Content.DrawWidth * track.Length);
         }
 
         private void scrollToTrackTime()
         {
-            if (!musicController.TrackLoaded || musicController.TrackLength == 0)
+            if (!musicController.TrackLoaded || track.Length == 0)
                 return;
 
-            ScrollTo((float)(editorClock.CurrentTime / musicController.TrackLength) * Content.DrawWidth, false);
+            ScrollTo((float)(editorClock.CurrentTime / track.Length) * Content.DrawWidth, false);
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)
@@ -188,7 +191,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             new SnapResult(screenSpacePosition, beatSnapProvider.SnapTime(getTimeFromPosition(Content.ToLocalSpace(screenSpacePosition))));
 
         private double getTimeFromPosition(Vector2 localPosition) =>
-            (localPosition.X / Content.DrawWidth) * musicController.TrackLength;
+            (localPosition.X / Content.DrawWidth) * track.Length;
 
         public float GetBeatSnapDistanceAt(double referenceTime) => throw new NotImplementedException();
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index a833b354ed..ceb0275a13 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
@@ -43,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 = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : musicController.TrackLength;
+                var until = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : musicController.CurrentTrack.AsNonNull().Length;
 
                 int beat = 0;
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 756b03d049..b02aabc24d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.Edit
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
-            var sourceClock = musicController.GetTrackClock() ?? new StopwatchClock();
+            var sourceClock = (IAdjustableClock)musicController.CurrentTrack ?? new StopwatchClock();
             clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
             clock.ChangeSource(sourceClock);
 
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 4cb24f90a6..4e589aeeef 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Edit
         private void load()
         {
             // Todo: What.
-            TrackLength ??= musicController.TrackLength;
+            TrackLength ??= musicController.CurrentTrack?.Length ?? 0;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 7da5df2723..030923c228 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -113,7 +113,9 @@ namespace osu.Game.Screens.Menu
                 if (setInfo != null)
                 {
                     initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-                    UsingThemedIntro = !MusicController.IsDummyDevice;
+
+                    // Todo: Wrong.
+                    UsingThemedIntro = MusicController.CurrentTrack?.IsDummyDevice == false;
                 }
 
                 return UsingThemedIntro;
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 86a6fa3802..e29ea6e743 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Menu
                 LoadComponentAsync(new TrianglesIntroSequence(logo, background)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Clock = new FramedClock(UsingThemedIntro ? MusicController.GetTrackClock() : null),
+                    Clock = new FramedClock(UsingThemedIntro ? MusicController.CurrentTrack : null),
                     LoadMenu = LoadMenu
                 }, t =>
                 {
diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 62cada577d..85f11eb244 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -44,7 +44,8 @@ namespace osu.Game.Screens.Menu
 
             pianoReverb = audio.Samples.Get(@"Intro/Welcome/welcome_piano");
 
-            musicController.Looping = true;
+            if (musicController.CurrentTrack != null)
+                musicController.CurrentTrack.Looping = true;
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 349654165f..7a1ff4fa06 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -19,6 +19,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Utils;
 using osu.Game.Overlays;
 
@@ -108,14 +109,14 @@ namespace osu.Game.Screens.Menu
         private void updateAmplitudes()
         {
             var effect = beatmap.Value.BeatmapLoaded && musicController.TrackLoaded
-                ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(musicController.CurrentTrackTime)
+                ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(musicController.CurrentTrack.AsNonNull().CurrentTime)
                 : null;
 
             for (int i = 0; i < temporalAmplitudes.Length; i++)
                 temporalAmplitudes[i] = 0;
 
             if (musicController.TrackLoaded)
-                addAmplitudesFromSource(musicController);
+                addAmplitudesFromSource(musicController.CurrentTrack.AsNonNull());
 
             foreach (var source in amplitudeSources)
                 addAmplitudesFromSource(source);
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index c422f57332..ce48777ce1 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.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 System.Linq;
 using osuTK;
 using osuTK.Graphics;
@@ -181,11 +182,12 @@ namespace osu.Game.Screens.Menu
 
             if (last is IntroScreen && musicController.TrackLoaded)
             {
-                // Todo: Wrong.
-                if (!musicController.IsPlaying)
+                Debug.Assert(musicController.CurrentTrack != null);
+
+                if (!musicController.CurrentTrack.IsRunning)
                 {
-                    musicController.SeekTo(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * musicController.TrackLength);
-                    musicController.Play();
+                    musicController.CurrentTrack.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * musicController.CurrentTrack.Length);
+                    musicController.CurrentTrack.Start();
                 }
             }
 
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 1feb2481c3..f028f9b229 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -330,9 +330,9 @@ namespace osu.Game.Screens.Menu
             const float velocity_adjust_cutoff = 0.98f;
             const float paused_velocity = 0.5f;
 
-            if (musicController.IsPlaying)
+            if (musicController.CurrentTrack?.IsRunning == true)
             {
-                var maxAmplitude = lastBeatIndex >= 0 ? musicController.CurrentAmplitudes.Maximum : 0;
+                var maxAmplitude = lastBeatIndex >= 0 ? musicController.CurrentTrack.CurrentAmplitudes.Maximum : 0;
                 logoAmplitudeContainer.Scale = new Vector2((float)Interpolation.Damp(logoAmplitudeContainer.Scale.X, 1 - Math.Max(0, maxAmplitude - scale_adjust_cutoff) * 0.04f, 0.9f, Time.Elapsed));
 
                 if (maxAmplitude > velocity_adjust_cutoff)
diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index 032c8d5ca9..c7dc20ff23 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                 return;
             }
 
-            bool hasEnoughTime = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(musicController.TrackLength) < endDate.Value;
+            bool hasEnoughTime = musicController.CurrentTrack != null && DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(musicController.CurrentTrack.Length) < endDate.Value;
 
             Enabled.Value = hasBeatmap && hasEnoughTime;
         }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 2d74434c76..e068899c7b 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -343,9 +343,13 @@ namespace osu.Game.Screens.Multi
         {
             if (screenStack.CurrentScreen is MatchSubScreen)
             {
-                musicController.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-                musicController.Looping = true;
-                musicController.EnsurePlayingSomething();
+                if (musicController.CurrentTrack != null)
+                {
+                    musicController.CurrentTrack.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
+                    musicController.CurrentTrack.Looping = true;
+
+                    musicController.EnsurePlayingSomething();
+                }
             }
             else
             {
@@ -355,8 +359,11 @@ namespace osu.Game.Screens.Multi
 
         private void cancelLooping()
         {
-            musicController.Looping = false;
-            musicController.RestartPoint = 0;
+            if (musicController.CurrentTrack != null)
+            {
+                musicController.CurrentTrack.Looping = false;
+                musicController.CurrentTrack.RestartPoint = 0;
+            }
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index 0e0ef8c675..1171d8c3b0 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Audio;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
@@ -30,21 +31,21 @@ namespace osu.Game.Screens.Play
 
         private readonly BindableDouble trackFreq = new BindableDouble(1);
 
+        private DrawableTrack track;
+
         private const float duration = 2500;
 
         private SampleChannel failSample;
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         public FailAnimation(DrawableRuleset drawableRuleset)
         {
             this.drawableRuleset = drawableRuleset;
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, IBindable<WorkingBeatmap> beatmap)
+        private void load(AudioManager audio, IBindable<WorkingBeatmap> beatmap, MusicController musicController)
         {
+            track = musicController.CurrentTrack;
             failSample = audio.Samples.Get(@"Gameplay/failsound");
         }
 
@@ -68,7 +69,7 @@ namespace osu.Game.Screens.Play
                 Expire();
             });
 
-            musicController.AddAdjustment(AdjustableProperty.Frequency, trackFreq);
+            track.AddAdjustment(AdjustableProperty.Frequency, trackFreq);
 
             applyToPlayfield(drawableRuleset.Playfield);
             drawableRuleset.Playfield.HitObjectContainer.FlashColour(Color4.Red, 500);
@@ -107,7 +108,7 @@ namespace osu.Game.Screens.Play
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            musicController?.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq);
+            track?.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index cf4678ab29..61272f56ad 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -8,8 +8,10 @@ using System.Threading.Tasks;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
@@ -27,8 +29,7 @@ namespace osu.Game.Screens.Play
         private readonly WorkingBeatmap beatmap;
         private readonly IReadOnlyList<Mod> mods;
 
-        [Resolved]
-        private MusicController musicController { get; set; }
+        private DrawableTrack track;
 
         public readonly BindableBool IsPaused = new BindableBool();
 
@@ -95,8 +96,10 @@ namespace osu.Game.Screens.Play
         private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, MusicController musicController)
         {
+            track = musicController.CurrentTrack;
+
             userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
             userAudioOffset.BindValueChanged(offset => userOffsetClock.Offset = offset.NewValue, true);
 
@@ -121,15 +124,15 @@ namespace osu.Game.Screens.Play
         {
             // 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.
-            musicController.Reset();
+            track.ResetSpeedAdjustments();
 
             Task.Run(() =>
             {
-                musicController.Reset();
+                track.Reset();
 
                 Schedule(() =>
                 {
-                    adjustableClock.ChangeSource(musicController.GetTrackClock());
+                    adjustableClock.ChangeSource(track);
                     updateRate();
 
                     if (!IsPaused.Value)
@@ -190,6 +193,20 @@ namespace osu.Game.Screens.Play
             IsPaused.Value = true;
         }
 
+        /// <summary>
+        /// Changes the backing clock to avoid using the originally provided track.
+        /// </summary>
+        public void StopUsingBeatmapClock()
+        {
+            if (track == null)
+                return;
+
+            removeSourceClockAdjustments();
+
+            track = new DrawableTrack(new TrackVirtual(track.Length));
+            adjustableClock.ChangeSource(track);
+        }
+
         protected override void Update()
         {
             if (!IsPaused.Value)
@@ -202,23 +219,30 @@ namespace osu.Game.Screens.Play
 
         private void updateRate()
         {
+            if (track == null) return;
+
             speedAdjustmentsApplied = true;
-            musicController.ResetTrackAdjustments();
-            musicController.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            musicController.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+            track.ResetSpeedAdjustments();
+
+            track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+
+            foreach (var mod in mods.OfType<IApplicableToTrack>())
+                mod.ApplyToTrack(track);
         }
 
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
             removeSourceClockAdjustments();
+            track = null;
         }
 
         private void removeSourceClockAdjustments()
         {
             if (speedAdjustmentsApplied)
             {
-                musicController.ResetTrackAdjustments();
+                track.ResetSpeedAdjustments();
                 speedAdjustmentsApplied = false;
             }
         }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 9ba2732920..ea04d82e67 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -31,6 +31,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Game.Graphics.UserInterface;
@@ -560,9 +561,9 @@ namespace osu.Game.Screens.Select
 
             BeatmapDetails.Refresh();
 
-            if (music != null)
+            if (music?.CurrentTrack != null)
             {
-                music.Looping = true;
+                music.CurrentTrack.Looping = true;
                 music.ResetTrackAdjustments();
             }
 
@@ -588,8 +589,8 @@ namespace osu.Game.Screens.Select
 
             BeatmapOptions.Hide();
 
-            if (music != null)
-                music.Looping = false;
+            if (music?.CurrentTrack != null)
+                music.CurrentTrack.Looping = false;
 
             this.ScaleTo(1.1f, 250, Easing.InSine);
 
@@ -610,8 +611,8 @@ namespace osu.Game.Screens.Select
 
             FilterControl.Deactivate();
 
-            if (music != null)
-                music.Looping = false;
+            if (music?.CurrentTrack != null)
+                music.CurrentTrack.Looping = false;
 
             return false;
         }
@@ -652,18 +653,30 @@ namespace osu.Game.Screens.Select
 
             BeatmapDetails.Beatmap = beatmap;
 
-            if (music != null)
-                music.Looping = false;
+            if (music?.CurrentTrack != null)
+                music.CurrentTrack.Looping = false;
         }
 
+        private readonly WeakReference<ITrack> lastTrack = new WeakReference<ITrack>(null);
+
         /// <summary>
         /// Ensures some music is playing for the current track.
         /// Will resume playback from a manual user pause if the track has changed.
         /// </summary>
         private void ensurePlayingSelected()
         {
-            music.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-            music.EnsurePlayingSomething();
+            ITrack track = music?.CurrentTrack;
+            if (track == null)
+                return;
+
+            bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;
+
+            track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
+
+            if (!track.IsRunning && (music?.IsUserPaused != true || isNewTrack))
+                music?.Play(true);
+
+            lastTrack.SetTarget(track);
         }
 
         private void carouselBeatmapsLoaded()
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 5226a49def..780b4f1b3a 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource(MusicController.GetTrackClock() ?? new StopwatchClock());
+            Clock.ChangeSource((IAdjustableClock)MusicController.CurrentTrack ?? new StopwatchClock());
             Clock.ProcessFrame();
         }
 
diff --git a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
index e7cb461d7b..ae4b0ef84a 100644
--- a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
+++ b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.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.Extensions.ObjectExtensions;
+
 namespace osu.Game.Tests.Visual
 {
     /// <summary>
@@ -13,7 +15,7 @@ namespace osu.Game.Tests.Visual
             base.Update();
 
             // note that this will override any mod rate application
-            MusicController.Tempo.Value = Clock.Rate;
+            MusicController.CurrentTrack.AsNonNull().Tempo.Value = Clock.Rate;
         }
     }
 }

From 58660c70a3c9cad61e78ef854d238e8f569ee08e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 5 Aug 2020 21:20:41 +0900
Subject: [PATCH 04092/10326] Cache before idle tracker

---
 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 929254e8ad..3e41be2028 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -554,8 +554,8 @@ namespace osu.Game
             Container logoContainer;
             BackButton.Receptor receptor;
 
-            dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
             dependencies.CacheAs(MusicController = new MusicController());
+            dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
 
             AddRange(new Drawable[]
             {

From e9fc783b1d75f31ec8291fa8a11f254f28cb1860 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 5 Aug 2020 21:21:08 +0900
Subject: [PATCH 04093/10326] Add back loop-on-completion

---
 osu.Game/OsuGame.cs                  | 18 +-----------------
 osu.Game/Overlays/MusicController.cs | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 3e41be2028..a41c7b28a5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -427,23 +427,7 @@ namespace osu.Game
 
             updateModDefaults();
 
-            var newBeatmap = beatmap.NewValue;
-
-            if (newBeatmap != null)
-            {
-                // MusicController.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 firing.
-            //     if (Beatmap.Value != b)
-            //         return;
-            //
-            //     if (!MusicController.Looping && !Beatmap.Disabled)
-            //         MusicController.NextTrack();
-            // }
+            beatmap.NewValue?.BeginAsyncLoad();
         }
 
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index c22849b7d6..50ad97be7c 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -323,7 +324,10 @@ namespace osu.Game.Overlays
             CurrentTrack = null;
 
             if (current != null)
+            {
                 trackContainer.Add(CurrentTrack = new DrawableTrack(current.GetRealTrack()));
+                CurrentTrack.Completed += () => onTrackCompleted(current);
+            }
 
             TrackChanged?.Invoke(current, direction);
 
@@ -332,6 +336,18 @@ namespace osu.Game.Overlays
             queuedDirection = null;
         }
 
+        private void onTrackCompleted(WorkingBeatmap workingBeatmap)
+        {
+            // the source of track completion is the audio thread, so the beatmap may have changed before firing.
+            if (current != workingBeatmap)
+                return;
+
+            Debug.Assert(CurrentTrack != null);
+
+            if (!CurrentTrack.Looping && !beatmap.Disabled)
+                NextTrack();
+        }
+
         private bool allowRateAdjustments;
 
         /// <summary>

From 11a6c9bdccc65e89575a0e138512ccc379b1a15f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 5 Aug 2020 21:21:14 +0900
Subject: [PATCH 04094/10326] Revert unnecessary change

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

diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index 92a9ed0566..69021e1634 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Graphics.Containers
                 beatmap = Beatmap.Value.Beatmap;
             }
 
-            if (track != null && beatmap != null && musicController.IsPlaying && track.Length > 0)
+            if (track != null && beatmap != null && track.IsRunning && track.Length > 0)
             {
                 currentTrackTime = track.CurrentTime + EarlyActivationMilliseconds;
 

From f058f5e977bbfb532b2711e0101c76868022b808 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 5 Aug 2020 21:29:53 +0900
Subject: [PATCH 04095/10326] Fix incorrect value being set

---
 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 ea04d82e67..80ed894233 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -654,7 +654,7 @@ namespace osu.Game.Screens.Select
             BeatmapDetails.Beatmap = beatmap;
 
             if (music?.CurrentTrack != null)
-                music.CurrentTrack.Looping = false;
+                music.CurrentTrack.Looping = true;
         }
 
         private readonly WeakReference<ITrack> lastTrack = new WeakReference<ITrack>(null);

From 0edd50939783f86909c3e024d47100259417c42e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 5 Aug 2020 21:30:11 +0900
Subject: [PATCH 04096/10326] Only change track when audio doesn't equal

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

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 50ad97be7c..47d1bef177 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -320,6 +320,18 @@ namespace osu.Game.Overlays
 
             current = beatmap.NewValue;
 
+            if (!beatmap.OldValue.BeatmapInfo.AudioEquals(current?.BeatmapInfo))
+                changeTrack();
+
+            TrackChanged?.Invoke(current, direction);
+
+            ResetTrackAdjustments();
+
+            queuedDirection = null;
+        }
+
+        private void changeTrack()
+        {
             CurrentTrack?.Expire();
             CurrentTrack = null;
 
@@ -328,12 +340,6 @@ namespace osu.Game.Overlays
                 trackContainer.Add(CurrentTrack = new DrawableTrack(current.GetRealTrack()));
                 CurrentTrack.Completed += () => onTrackCompleted(current);
             }
-
-            TrackChanged?.Invoke(current, direction);
-
-            ResetTrackAdjustments();
-
-            queuedDirection = null;
         }
 
         private void onTrackCompleted(WorkingBeatmap workingBeatmap)

From 86ae61c6b79aec0febbe8220781cc7ad3aefb9de Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 5 Aug 2020 22:09:47 +0900
Subject: [PATCH 04097/10326] Re-implement store transferral in BeatmapManager

---
 osu.Game/Beatmaps/BeatmapManager.cs           | 19 +++++++++++--------
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs | 17 +++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b2329f58ad..6a7d0b053f 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Beatmaps
             removeWorkingCache(info);
         }
 
-        private readonly WeakList<WorkingBeatmap> workingCache = new WeakList<WorkingBeatmap>();
+        private readonly WeakList<BeatmapManagerWorkingBeatmap> workingCache = new WeakList<BeatmapManagerWorkingBeatmap>();
 
         /// <summary>
         /// Retrieve a <see cref="WorkingBeatmap"/> instance for the provided <see cref="BeatmapInfo"/>
@@ -246,16 +246,19 @@ namespace osu.Game.Beatmaps
             lock (workingCache)
             {
                 var working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == beatmapInfo.ID);
+                if (working != null)
+                    return working;
 
-                if (working == null)
-                {
-                    beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
+                beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 
-                    workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store,
-                        new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store)), beatmapInfo, audioManager));
-                }
+                ITrackStore trackStore = workingCache.FirstOrDefault(b => b.BeatmapInfo.AudioEquals(beatmapInfo))?.TrackStore;
+                TextureStore textureStore = workingCache.FirstOrDefault(b => b.BeatmapInfo.BackgroundEquals(beatmapInfo))?.TextureStore;
+
+                textureStore ??= new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store));
+                trackStore ??= audioManager.GetTrackStore(Files.Store);
+
+                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, textureStore, trackStore, beatmapInfo, audioManager));
 
-                // previous?.TransferTo(working);
                 return working;
             }
         }
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 33945a9eb1..ceefef5d7e 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -19,13 +19,18 @@ namespace osu.Game.Beatmaps
     {
         protected class BeatmapManagerWorkingBeatmap : WorkingBeatmap
         {
+            public readonly TextureStore TextureStore;
+            public readonly ITrackStore TrackStore;
+
             private readonly IResourceStore<byte[]> store;
 
-            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, BeatmapInfo beatmapInfo, AudioManager audioManager)
+            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, ITrackStore trackStore, BeatmapInfo beatmapInfo, AudioManager audioManager)
                 : base(beatmapInfo, audioManager)
             {
                 this.store = store;
-                this.textureStore = textureStore;
+
+                TextureStore = textureStore;
+                TrackStore = trackStore;
             }
 
             protected override IBeatmap GetBeatmap()
@@ -44,10 +49,6 @@ namespace osu.Game.Beatmaps
 
             private string getPathForFile(string filename) => BeatmapSetInfo.Files.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
 
-            private TextureStore textureStore;
-
-            private ITrackStore trackStore;
-
             protected override bool BackgroundStillValid(Texture b) => false; // bypass lazy logic. we want to return a new background each time for refcounting purposes.
 
             protected override Texture GetBackground()
@@ -57,7 +58,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return textureStore.Get(getPathForFile(Metadata.BackgroundFile));
+                    return TextureStore.Get(getPathForFile(Metadata.BackgroundFile));
                 }
                 catch (Exception e)
                 {
@@ -70,7 +71,7 @@ namespace osu.Game.Beatmaps
             {
                 try
                 {
-                    return (trackStore ??= AudioManager.GetTrackStore(store)).Get(getPathForFile(Metadata.AudioFile));
+                    return TrackStore.Get(getPathForFile(Metadata.AudioFile));
                 }
                 catch (Exception e)
                 {

From 0f7fde5d2cd5db7eb8e621bfe221ea28cc252da8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 5 Aug 2020 22:32:44 +0900
Subject: [PATCH 04098/10326] Revert unnecessary change

---
 osu.Game/Overlays/Music/PlaylistOverlay.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index c089158c01..b9a58c37cb 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -83,7 +83,10 @@ namespace osu.Game.Overlays.Music
                 BeatmapInfo toSelect = list.FirstVisibleSet?.Beatmaps?.FirstOrDefault();
 
                 if (toSelect != null)
+                {
                     beatmap.Value = beatmaps.GetWorkingBeatmap(toSelect);
+                    musicController.CurrentTrack?.Restart();
+                }
             };
         }
 
@@ -116,12 +119,12 @@ namespace osu.Game.Overlays.Music
         {
             if (set.ID == (beatmap.Value?.BeatmapSetInfo?.ID ?? -1))
             {
-                musicController.SeekTo(0);
+                musicController.CurrentTrack?.Seek(0);
                 return;
             }
 
             beatmap.Value = beatmaps.GetWorkingBeatmap(set.Beatmaps.First());
-            musicController.Play(true);
+            musicController.CurrentTrack?.Restart();
         }
     }
 

From fe8c462498ad18a842544202bc4e6a14d3e217ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 17:00:17 +0900
Subject: [PATCH 04099/10326] Remove intermediate container

---
 osu.Game/Overlays/MusicController.cs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 47d1bef177..6adfa1817e 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -65,20 +65,12 @@ namespace osu.Game.Overlays
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
-        [NotNull]
-        private readonly TrackContainer trackContainer;
-
         [CanBeNull]
         public DrawableTrack CurrentTrack { get; private set; }
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
 
-        public MusicController()
-        {
-            InternalChild = trackContainer = new TrackContainer { RelativeSizeAxes = Axes.Both };
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -337,8 +329,10 @@ namespace osu.Game.Overlays
 
             if (current != null)
             {
-                trackContainer.Add(CurrentTrack = new DrawableTrack(current.GetRealTrack()));
+                CurrentTrack = new DrawableTrack(current.GetRealTrack());
                 CurrentTrack.Completed += () => onTrackCompleted(current);
+
+                AddInternal(CurrentTrack);
             }
         }
 
@@ -433,10 +427,6 @@ namespace osu.Game.Overlays
             {
             }
         }
-
-        private class TrackContainer : AudioContainer<DrawableTrack>
-        {
-        }
     }
 
     public enum TrackChangeDirection

From e8ab3cff3c38c5dad046b0c69f0f34b7478a08ce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 17:02:42 +0900
Subject: [PATCH 04100/10326] Add class constraint

---
 osu.Game/Rulesets/Mods/IApplicableToTrack.cs | 2 +-
 osu.Game/Rulesets/Mods/ModRateAdjust.cs      | 3 ++-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs        | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/IApplicableToTrack.cs b/osu.Game/Rulesets/Mods/IApplicableToTrack.cs
index 5ae41fe09c..b29ba55942 100644
--- a/osu.Game/Rulesets/Mods/IApplicableToTrack.cs
+++ b/osu.Game/Rulesets/Mods/IApplicableToTrack.cs
@@ -11,6 +11,6 @@ namespace osu.Game.Rulesets.Mods
     /// </summary>
     public interface IApplicableToTrack : IApplicableMod
     {
-        void ApplyToTrack<T>(T track) where T : ITrack, IAdjustableAudioComponent;
+        void ApplyToTrack<T>(T track) where T : class, ITrack, IAdjustableAudioComponent;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index e2c8ac64d9..4aee5affe9 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -12,7 +12,8 @@ namespace osu.Game.Rulesets.Mods
     {
         public abstract BindableNumber<double> SpeedChange { get; }
 
-        public virtual void ApplyToTrack<T>(T track) where T : ITrack, IAdjustableAudioComponent
+        public virtual void ApplyToTrack<T>(T track)
+            where T : class, ITrack, IAdjustableAudioComponent
         {
             track.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
         }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index b6cbe72971..4b5241488f 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -51,7 +51,8 @@ namespace osu.Game.Rulesets.Mods
             AdjustPitch.BindValueChanged(applyPitchAdjustment);
         }
 
-        public void ApplyToTrack<T>(T track) where T : ITrack, IAdjustableAudioComponent
+        public void ApplyToTrack<T>(T track)
+            where T : class, ITrack, IAdjustableAudioComponent
         {
             this.track = track;
 

From ad959ce5238dbd8ca4465305d703efac065a3dab Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 6 Aug 2020 01:06:51 -0700
Subject: [PATCH 04101/10326] Make toolbar button abstract

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

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 86a3f5d8aa..a03ea64eb2 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -18,7 +18,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarButton : OsuClickableContainer
+    public abstract class ToolbarButton : OsuClickableContainer
     {
         public const float WIDTH = Toolbar.HEIGHT * 1.4f;
 
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays.Toolbar
         private readonly SpriteText tooltip2;
         protected FillFlowContainer Flow;
 
-        public ToolbarButton()
+        protected ToolbarButton()
             : base(HoverSampleSet.Loud)
         {
             Width = WIDTH;

From c72ab9047e3ea00dbc6eb176a797d20dfd5c95d3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 17:15:33 +0900
Subject: [PATCH 04102/10326] Cleanup test scene disposal

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index e968f7e675..f2b9388fdc 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -169,7 +170,10 @@ namespace osu.Game.Tests.Visual
             rulesetDependencies?.Dispose();
 
             if (MusicController?.TrackLoaded == true)
-                MusicController.Stop();
+            {
+                Debug.Assert(MusicController.CurrentTrack != null);
+                MusicController.CurrentTrack.Stop();
+            }
 
             if (contextFactory.IsValueCreated)
                 contextFactory.Value.ResetDatabase();

From 7bcb68ffacd76d2f7b5d743781598b733f2c2731 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 6 Aug 2020 01:17:24 -0700
Subject: [PATCH 04103/10326] Handle overlay toggling with toolbar buttons
 instead

---
 osu.Game/OsuGame.cs                           | 28 +-----------------
 .../Toolbar/ToolbarBeatmapListingButton.cs    |  3 ++
 osu.Game/Overlays/Toolbar/ToolbarButton.cs    | 29 +++++++++++++++----
 .../Overlays/Toolbar/ToolbarChatButton.cs     |  3 ++
 .../Overlays/Toolbar/ToolbarHomeButton.cs     | 18 ++----------
 .../Overlays/Toolbar/ToolbarMusicButton.cs    |  3 ++
 .../Toolbar/ToolbarNotificationButton.cs      |  3 ++
 .../Overlays/Toolbar/ToolbarSettingsButton.cs |  3 ++
 .../Overlays/Toolbar/ToolbarSocialButton.cs   |  3 ++
 9 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 26f7c3b93b..b5752214bd 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -67,8 +67,6 @@ namespace osu.Game
         [NotNull]
         private readonly NotificationOverlay notifications = new NotificationOverlay();
 
-        private NowPlayingOverlay nowPlaying;
-
         private BeatmapListingOverlay beatmapListing;
 
         private DashboardOverlay dashboard;
@@ -650,7 +648,7 @@ namespace osu.Game
                 Origin = Anchor.TopRight,
             }, rightFloatingOverlayContent.Add, true);
 
-            loadComponentSingleFile(nowPlaying = new NowPlayingOverlay
+            loadComponentSingleFile(new NowPlayingOverlay
             {
                 GetToolbarHeight = () => ToolbarOffset,
                 Anchor = Anchor.TopRight,
@@ -862,18 +860,6 @@ namespace osu.Game
 
             switch (action)
             {
-                case GlobalAction.ToggleNowPlaying:
-                    nowPlaying.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleChat:
-                    chatOverlay.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleSocial:
-                    dashboard.ToggleVisibility();
-                    return true;
-
                 case GlobalAction.ResetInputSettings:
                     var sensitivity = frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity);
 
@@ -889,18 +875,6 @@ namespace osu.Game
                     Toolbar.ToggleVisibility();
                     return true;
 
-                case GlobalAction.ToggleSettings:
-                    Settings.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleDirect:
-                    beatmapListing.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleNotifications:
-                    notifications.ToggleVisibility();
-                    return true;
-
                 case GlobalAction.ToggleGameplayMouseButtons:
                     LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
                     return true;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index 64430c77ac..cde305fffd 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
             SetIcon(OsuIcon.ChevronDownCircle);
             TooltipMain = "Beatmap listing";
             TooltipSub = "Browse for new beatmaps";
+
+            Hotkey = GlobalAction.ToggleDirect;
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index a03ea64eb2..3f1dccc45a 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -5,23 +5,27 @@ 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.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public abstract class ToolbarButton : OsuClickableContainer
+    public abstract class ToolbarButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
     {
         public const float WIDTH = Toolbar.HEIGHT * 1.4f;
 
+        protected GlobalAction? Hotkey { get; set; }
+
         public void SetIcon(Drawable icon)
         {
             IconContainer.Icon = icon;
@@ -164,6 +168,21 @@ namespace osu.Game.Overlays.Toolbar
             HoverBackground.FadeOut(200);
             tooltipContainer.FadeOut(100);
         }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            if (action == Hotkey)
+            {
+                Click();
+                return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
     }
 
     public class OpaqueBackground : Container
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
index ec7da54571..dee4be0c1f 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
             SetIcon(FontAwesome.Solid.Comments);
             TooltipMain = "Chat";
             TooltipSub = "Join the real-time discussion";
+
+            Hotkey = GlobalAction.ToggleChat;
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
index e642f0c453..4845c9a99f 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
@@ -2,33 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Bindings;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarHomeButton : ToolbarButton, IKeyBindingHandler<GlobalAction>
+    public class ToolbarHomeButton : ToolbarButton
     {
         public ToolbarHomeButton()
         {
             Icon = FontAwesome.Solid.Home;
             TooltipMain = "Home";
             TooltipSub = "Return to the main menu";
-        }
 
-        public bool OnPressed(GlobalAction action)
-        {
-            if (action == GlobalAction.Home)
-            {
-                Click();
-                return true;
-            }
-
-            return false;
-        }
-
-        public void OnReleased(GlobalAction action)
-        {
+            Hotkey = GlobalAction.Home;
         }
     }
 }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
index 712da12208..59276a5943 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
             Icon = FontAwesome.Solid.Music;
             TooltipMain = "Now playing";
             TooltipSub = "Manage the currently playing track";
+
+            Hotkey = GlobalAction.ToggleNowPlaying;
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
index dbd6c557d3..a699fd907f 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 using osuTK;
 using osuTK.Graphics;
 
@@ -28,6 +29,8 @@ namespace osu.Game.Overlays.Toolbar
             TooltipMain = "Notifications";
             TooltipSub = "Waiting for 'ya";
 
+            Hotkey = GlobalAction.ToggleNotifications;
+
             Add(countDisplay = new CountCircle
             {
                 Alpha = 0,
diff --git a/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
index 79942012f9..ed2a23ec2a 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
             Icon = FontAwesome.Solid.Cog;
             TooltipMain = "Settings";
             TooltipSub = "Change your settings";
+
+            Hotkey = GlobalAction.ToggleSettings;
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
index 0dbb552c15..6faa58c559 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
             Icon = FontAwesome.Solid.Users;
             TooltipMain = "Friends";
             TooltipSub = "Interact with those close to you";
+
+            Hotkey = GlobalAction.ToggleSocial;
         }
 
         [BackgroundDependencyLoader(true)]

From d574cac702612dc4c36748588cebf4991d3ab64f Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 6 Aug 2020 01:18:45 -0700
Subject: [PATCH 04104/10326] Add keybinding to toolbar button's tooltip

---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs | 35 ++++++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 3f1dccc45a..9fd47fd150 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -14,6 +15,7 @@ using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osuTK;
 using osuTK.Graphics;
@@ -70,8 +72,12 @@ namespace osu.Game.Overlays.Toolbar
         private readonly FillFlowContainer tooltipContainer;
         private readonly SpriteText tooltip1;
         private readonly SpriteText tooltip2;
+        private readonly SpriteText keyBindingTooltip;
         protected FillFlowContainer Flow;
 
+        [Resolved]
+        private KeyBindingStore store { get; set; }
+
         protected ToolbarButton()
             : base(HoverSampleSet.Loud)
         {
@@ -127,7 +133,7 @@ namespace osu.Game.Overlays.Toolbar
                     Origin = TooltipAnchor,
                     Position = new Vector2(TooltipAnchor.HasFlag(Anchor.x0) ? 5 : -5, 5),
                     Alpha = 0,
-                    Children = new[]
+                    Children = new Drawable[]
                     {
                         tooltip1 = new OsuSpriteText
                         {
@@ -136,17 +142,40 @@ namespace osu.Game.Overlays.Toolbar
                             Shadow = true,
                             Font = OsuFont.GetFont(size: 22, weight: FontWeight.Bold),
                         },
-                        tooltip2 = new OsuSpriteText
+                        new FillFlowContainer
                         {
+                            AutoSizeAxes = Axes.Both,
                             Anchor = TooltipAnchor,
                             Origin = TooltipAnchor,
-                            Shadow = true,
+                            Direction = FillDirection.Horizontal,
+                            Children = new[]
+                            {
+                                tooltip2 = new OsuSpriteText { Shadow = true },
+                                keyBindingTooltip = new OsuSpriteText { Shadow = true }
+                            }
                         }
                     }
                 }
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            updateTooltip();
+
+            store.KeyBindingChanged += updateTooltip;
+        }
+
+        private void updateTooltip()
+        {
+            var binding = store.Query().Find(b => (GlobalAction)b.Action == Hotkey);
+
+            var keyBindingString = binding?.KeyCombination.ReadableString();
+
+            keyBindingTooltip.Text = !string.IsNullOrEmpty(keyBindingString) ? $" ({keyBindingString})" : string.Empty;
+        }
+
         protected override bool OnMouseDown(MouseDownEvent e) => true;
 
         protected override bool OnClick(ClickEvent e)

From f9c369b23cff9b0bdc1b8b7907ed74d8919bf123 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 6 Aug 2020 01:20:03 -0700
Subject: [PATCH 04105/10326] Fix toolbar music button tooltip overflowing
 off-screen

---
 osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
index 59276a5943..f9aa2de497 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Input.Bindings;
 
@@ -9,6 +10,8 @@ namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarMusicButton : ToolbarOverlayToggleButton
     {
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         public ToolbarMusicButton()
         {
             Icon = FontAwesome.Solid.Music;

From f53672193eb6ccd1d14c7900603aa5269e7468c9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 17:48:07 +0900
Subject: [PATCH 04106/10326] Fix track stores being kept alive

---
 osu.Game/Beatmaps/BeatmapManager.cs              | 16 +++++++++++++++-
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs    | 10 +++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 6a7d0b053f..f22f41531a 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -219,6 +219,7 @@ namespace osu.Game.Beatmaps
         }
 
         private readonly WeakList<BeatmapManagerWorkingBeatmap> workingCache = new WeakList<BeatmapManagerWorkingBeatmap>();
+        private readonly Dictionary<ITrackStore, int> referencedTrackStores = new Dictionary<ITrackStore, int>();
 
         /// <summary>
         /// Retrieve a <see cref="WorkingBeatmap"/> instance for the provided <see cref="BeatmapInfo"/>
@@ -257,12 +258,25 @@ namespace osu.Game.Beatmaps
                 textureStore ??= new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store));
                 trackStore ??= audioManager.GetTrackStore(Files.Store);
 
-                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, textureStore, trackStore, beatmapInfo, audioManager));
+                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, textureStore, trackStore, beatmapInfo, audioManager, dereferenceTrackStore));
+                referencedTrackStores[trackStore] = referencedTrackStores.GetOrDefault(trackStore) + 1;
 
                 return working;
             }
         }
 
+        private void dereferenceTrackStore(ITrackStore trackStore)
+        {
+            lock (workingCache)
+            {
+                if (--referencedTrackStores[trackStore] == 0)
+                {
+                    referencedTrackStores.Remove(trackStore);
+                    trackStore.Dispose();
+                }
+            }
+        }
+
         /// <summary>
         /// Perform a lookup query on available <see cref="BeatmapSetInfo"/>s.
         /// </summary>
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index ceefef5d7e..a54d46c1b1 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -23,11 +23,14 @@ namespace osu.Game.Beatmaps
             public readonly ITrackStore TrackStore;
 
             private readonly IResourceStore<byte[]> store;
+            private readonly Action<ITrackStore> dereferenceAction;
 
-            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, ITrackStore trackStore, BeatmapInfo beatmapInfo, AudioManager audioManager)
+            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, ITrackStore trackStore, BeatmapInfo beatmapInfo, AudioManager audioManager,
+                                                Action<ITrackStore> dereferenceAction)
                 : base(beatmapInfo, audioManager)
             {
                 this.store = store;
+                this.dereferenceAction = dereferenceAction;
 
                 TextureStore = textureStore;
                 TrackStore = trackStore;
@@ -137,6 +140,11 @@ namespace osu.Game.Beatmaps
                     return null;
                 }
             }
+
+            ~BeatmapManagerWorkingBeatmap()
+            {
+                dereferenceAction?.Invoke(TrackStore);
+            }
         }
     }
 }

From c8ebbc8594b79423825614268feb88f2f20a32e6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 18:19:55 +0900
Subject: [PATCH 04107/10326] Remove MusicController from EditorClock

---
 .../Timelines/Summary/Parts/MarkerPart.cs     |  5 +--
 osu.Game/Screens/Edit/Editor.cs               |  2 +-
 osu.Game/Screens/Edit/EditorClock.cs          | 36 ++++++-------------
 3 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
index a353f79ef4..9e9ac93d23 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -59,9 +58,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                     return;
 
                 float markerPos = Math.Clamp(ToLocalSpace(screenPosition).X, 0, DrawWidth);
-
-                Debug.Assert(editorClock.TrackLength != null);
-                editorClock.SeekTo(markerPos / DrawWidth * editorClock.TrackLength.Value);
+                editorClock.SeekTo(markerPos / DrawWidth * editorClock.TrackLength);
             });
         }
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b02aabc24d..79b13a7eac 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Edit
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             var sourceClock = (IAdjustableClock)musicController.CurrentTrack ?? new StopwatchClock();
-            clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
+            clock = new EditorClock(Beatmap.Value, musicController.CurrentTrack?.Length ?? 0, beatDivisor) { IsCoupled = false };
             clock.ChangeSource(sourceClock);
 
             dependencies.CacheAs(clock);
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 4e589aeeef..fbfa397795 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -2,16 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit
 {
@@ -20,7 +17,7 @@ namespace osu.Game.Screens.Edit
     /// </summary>
     public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock
     {
-        public double? TrackLength { get; private set; }
+        public readonly double TrackLength;
 
         public ControlPointInfo ControlPointInfo;
 
@@ -28,34 +25,24 @@ namespace osu.Game.Screens.Edit
 
         private readonly DecoupleableInterpolatingFramedClock underlyingClock;
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
-        public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
-            : this(beatmap.Beatmap.ControlPointInfo, null, beatDivisor)
+        public EditorClock(WorkingBeatmap beatmap, double trackLength, BindableBeatDivisor beatDivisor)
+            : this(beatmap.Beatmap.ControlPointInfo, trackLength, beatDivisor)
         {
         }
 
-        public EditorClock(ControlPointInfo controlPointInfo, double? trackLength, BindableBeatDivisor beatDivisor)
-        {
-            this.beatDivisor = beatDivisor;
-
-            ControlPointInfo = controlPointInfo;
-            TrackLength = trackLength;
-
-            underlyingClock = new DecoupleableInterpolatingFramedClock();
-        }
-
         public EditorClock()
             : this(new ControlPointInfo(), 1000, new BindableBeatDivisor())
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        public EditorClock(ControlPointInfo controlPointInfo, double trackLength, BindableBeatDivisor beatDivisor)
         {
-            // Todo: What.
-            TrackLength ??= musicController.CurrentTrack?.Length ?? 0;
+            this.beatDivisor = beatDivisor;
+
+            ControlPointInfo = controlPointInfo;
+            TrackLength = trackLength;
+
+            underlyingClock = new DecoupleableInterpolatingFramedClock();
         }
 
         /// <summary>
@@ -148,8 +135,7 @@ namespace osu.Game.Screens.Edit
                 seekTime = timingPoint.Time;
 
             // Ensure the sought point is within the boundaries
-            Debug.Assert(TrackLength != null);
-            seekTime = Math.Clamp(seekTime, 0, TrackLength.Value);
+            seekTime = Math.Clamp(seekTime, 0, TrackLength);
             SeekTo(seekTime);
         }
 

From 9685df0ecac3c264b6379a240c073473c4d410ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Aug 2020 18:22:17 +0900
Subject: [PATCH 04108/10326] Only update key binding on next usage to avoid
 large blocking calls

---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 9fd47fd150..0afc6642b2 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Caching;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -76,7 +77,7 @@ namespace osu.Game.Overlays.Toolbar
         protected FillFlowContainer Flow;
 
         [Resolved]
-        private KeyBindingStore store { get; set; }
+        private KeyBindingStore keyBindings { get; set; }
 
         protected ToolbarButton()
             : base(HoverSampleSet.Loud)
@@ -159,21 +160,25 @@ namespace osu.Game.Overlays.Toolbar
             };
         }
 
+        private readonly Cached tooltipKeyBinding = new Cached();
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            updateTooltip();
-
-            store.KeyBindingChanged += updateTooltip;
+            keyBindings.KeyBindingChanged += () => tooltipKeyBinding.Invalidate();
+            updateKeyBindingTooltip();
         }
 
-        private void updateTooltip()
+        private void updateKeyBindingTooltip()
         {
-            var binding = store.Query().Find(b => (GlobalAction)b.Action == Hotkey);
+            if (tooltipKeyBinding.IsValid)
+                return;
 
+            var binding = keyBindings.Query().Find(b => (GlobalAction)b.Action == Hotkey);
             var keyBindingString = binding?.KeyCombination.ReadableString();
-
             keyBindingTooltip.Text = !string.IsNullOrEmpty(keyBindingString) ? $" ({keyBindingString})" : string.Empty;
+
+            tooltipKeyBinding.Validate();
         }
 
         protected override bool OnMouseDown(MouseDownEvent e) => true;
@@ -187,6 +192,8 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override bool OnHover(HoverEvent e)
         {
+            updateKeyBindingTooltip();
+
             HoverBackground.FadeIn(200);
             tooltipContainer.FadeIn(100);
             return base.OnHover(e);

From 7c3ae4ed4291eeb86f704344956dedfef75e8735 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 18:25:34 +0900
Subject: [PATCH 04109/10326] Remove generics from IApplicableToTrack

---
 osu.Game/Rulesets/Mods/IApplicableToTrack.cs | 3 +--
 osu.Game/Rulesets/Mods/ModDaycore.cs         | 7 ++++---
 osu.Game/Rulesets/Mods/ModNightcore.cs       | 6 +++---
 osu.Game/Rulesets/Mods/ModRateAdjust.cs      | 5 ++---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs        | 3 +--
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/IApplicableToTrack.cs b/osu.Game/Rulesets/Mods/IApplicableToTrack.cs
index b29ba55942..9b840cea08 100644
--- a/osu.Game/Rulesets/Mods/IApplicableToTrack.cs
+++ b/osu.Game/Rulesets/Mods/IApplicableToTrack.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.Audio;
 using osu.Framework.Audio.Track;
 
 namespace osu.Game.Rulesets.Mods
@@ -11,6 +10,6 @@ namespace osu.Game.Rulesets.Mods
     /// </summary>
     public interface IApplicableToTrack : IApplicableMod
     {
-        void ApplyToTrack<T>(T track) where T : class, ITrack, IAdjustableAudioComponent;
+        void ApplyToTrack(ITrack track);
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index 989978eb35..800312d047 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Audio;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 
@@ -26,11 +27,11 @@ namespace osu.Game.Rulesets.Mods
             }, true);
         }
 
-        public override void ApplyToTrack<T>(T track)
+        public override void ApplyToTrack(ITrack track)
         {
             // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
-            track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
-            track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
+            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
+            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 70cdaa6345..4932df08f1 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -38,11 +38,11 @@ namespace osu.Game.Rulesets.Mods
             }, true);
         }
 
-        public override void ApplyToTrack<T>(T track)
+        public override void ApplyToTrack(ITrack track)
         {
             // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
-            track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
-            track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
+            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
+            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index 4aee5affe9..ae7077c67b 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -12,10 +12,9 @@ namespace osu.Game.Rulesets.Mods
     {
         public abstract BindableNumber<double> SpeedChange { get; }
 
-        public virtual void ApplyToTrack<T>(T track)
-            where T : class, ITrack, IAdjustableAudioComponent
+        public virtual void ApplyToTrack(ITrack track)
         {
-            track.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
+            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
         }
 
         public virtual void ApplyToSample(SampleChannel sample)
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 4b5241488f..b904cf007b 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -51,8 +51,7 @@ namespace osu.Game.Rulesets.Mods
             AdjustPitch.BindValueChanged(applyPitchAdjustment);
         }
 
-        public void ApplyToTrack<T>(T track)
-            where T : class, ITrack, IAdjustableAudioComponent
+        public void ApplyToTrack(ITrack track)
         {
             this.track = track;
 

From 2e3ecf71c70c035db37621df04cc289a4b7d7489 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 18:31:08 +0900
Subject: [PATCH 04110/10326] Pass track from Player to components

---
 .../TestSceneGameplayClockContainer.cs        |  7 +++++-
 .../Gameplay/TestSceneStoryboardSamples.cs    |  6 +++--
 .../Visual/Gameplay/TestSceneSkipOverlay.cs   |  4 +++-
 osu.Game/Screens/Play/FailAnimation.cs        | 16 ++++++--------
 .../Screens/Play/GameplayClockContainer.cs    | 22 +++++++++----------
 osu.Game/Screens/Play/Player.cs               | 11 +++++-----
 6 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
index cd3669f160..40f6cecd9a 100644
--- a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
@@ -19,7 +19,12 @@ namespace osu.Game.Tests.Gameplay
         {
             GameplayClockContainer gcc = null;
 
-            AddStep("create container", () => Add(gcc = new GameplayClockContainer(CreateWorkingBeatmap(new OsuRuleset().RulesetInfo), Array.Empty<Mod>(), 0)));
+            AddStep("create container", () =>
+            {
+                var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+                Add(gcc = new GameplayClockContainer(working.GetRealTrack(), working, Array.Empty<Mod>(), 0));
+            });
+
             AddStep("start track", () => gcc.Start());
             AddUntilStep("elapsed greater than zero", () => gcc.GameplayClock.ElapsedFrameTime > 0);
         }
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index b30870d057..720436fae4 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -59,7 +59,9 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("create container", () =>
             {
-                Add(gameplayContainer = new GameplayClockContainer(CreateWorkingBeatmap(new OsuRuleset().RulesetInfo), Array.Empty<Mod>(), 0));
+                var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+
+                Add(gameplayContainer = new GameplayClockContainer(working.GetRealTrack(), working, Array.Empty<Mod>(), 0));
 
                 gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
                 {
@@ -103,7 +105,7 @@ namespace osu.Game.Tests.Gameplay
                 Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, Audio);
                 SelectedMods.Value = new[] { testedMod };
 
-                Add(gameplayContainer = new GameplayClockContainer(Beatmap.Value, SelectedMods.Value, 0));
+                Add(gameplayContainer = new GameplayClockContainer(MusicController.CurrentTrack, Beatmap.Value, SelectedMods.Value, 0));
 
                 gameplayContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
                 {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index 7ed7a116b4..68110d759c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -32,7 +32,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             requestCount = 0;
             increment = skip_time;
 
-            Child = gameplayClockContainer = new GameplayClockContainer(CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)), Array.Empty<Mod>(), 0)
+            var working = CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
+
+            Child = gameplayClockContainer = new GameplayClockContainer(working.GetRealTrack(), working, Array.Empty<Mod>(), 0)
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index 1171d8c3b0..a7bfca612e 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -8,11 +8,10 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Audio;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Overlays;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
@@ -28,24 +27,23 @@ namespace osu.Game.Screens.Play
         public Action OnComplete;
 
         private readonly DrawableRuleset drawableRuleset;
+        private readonly ITrack track;
 
         private readonly BindableDouble trackFreq = new BindableDouble(1);
 
-        private DrawableTrack track;
-
         private const float duration = 2500;
 
         private SampleChannel failSample;
 
-        public FailAnimation(DrawableRuleset drawableRuleset)
+        public FailAnimation(DrawableRuleset drawableRuleset, ITrack track)
         {
             this.drawableRuleset = drawableRuleset;
+            this.track = track;
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, IBindable<WorkingBeatmap> beatmap, MusicController musicController)
+        private void load(AudioManager audio, IBindable<WorkingBeatmap> beatmap)
         {
-            track = musicController.CurrentTrack;
             failSample = audio.Samples.Get(@"Gameplay/failsound");
         }
 
@@ -69,7 +67,7 @@ namespace osu.Game.Screens.Play
                 Expire();
             });
 
-            track.AddAdjustment(AdjustableProperty.Frequency, trackFreq);
+            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Frequency, trackFreq);
 
             applyToPlayfield(drawableRuleset.Playfield);
             drawableRuleset.Playfield.HitObjectContainer.FlashColour(Color4.Red, 500);
@@ -108,7 +106,7 @@ namespace osu.Game.Screens.Play
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            track?.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq);
+            (track as IAdjustableAudioComponent)?.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 61272f56ad..c4f368e1f5 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -11,12 +11,10 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.Play
@@ -29,7 +27,7 @@ namespace osu.Game.Screens.Play
         private readonly WorkingBeatmap beatmap;
         private readonly IReadOnlyList<Mod> mods;
 
-        private DrawableTrack track;
+        private ITrack track;
 
         public readonly BindableBool IsPaused = new BindableBool();
 
@@ -62,11 +60,13 @@ namespace osu.Game.Screens.Play
 
         private readonly FramedOffsetClock platformOffsetClock;
 
-        public GameplayClockContainer(WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
+        public GameplayClockContainer(ITrack track, WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
         {
             this.beatmap = beatmap;
             this.mods = mods;
             this.gameplayStartTime = gameplayStartTime;
+            this.track = track;
+
             firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
 
             RelativeSizeAxes = Axes.Both;
@@ -96,10 +96,8 @@ namespace osu.Game.Screens.Play
         private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, MusicController musicController)
+        private void load(OsuConfigManager config)
         {
-            track = musicController.CurrentTrack;
-
             userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
             userAudioOffset.BindValueChanged(offset => userOffsetClock.Offset = offset.NewValue, true);
 
@@ -132,7 +130,7 @@ namespace osu.Game.Screens.Play
 
                 Schedule(() =>
                 {
-                    adjustableClock.ChangeSource(track);
+                    adjustableClock.ChangeSource((IAdjustableClock)track);
                     updateRate();
 
                     if (!IsPaused.Value)
@@ -203,8 +201,8 @@ namespace osu.Game.Screens.Play
 
             removeSourceClockAdjustments();
 
-            track = new DrawableTrack(new TrackVirtual(track.Length));
-            adjustableClock.ChangeSource(track);
+            track = new TrackVirtual(track.Length);
+            adjustableClock.ChangeSource((IAdjustableClock)track);
         }
 
         protected override void Update()
@@ -224,8 +222,8 @@ namespace osu.Game.Screens.Play
             speedAdjustmentsApplied = true;
             track.ResetSpeedAdjustments();
 
-            track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
             foreach (var mod in mods.OfType<IApplicableToTrack>())
                 mod.ApplyToTrack(track);
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 541275cf55..e92164de7c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -150,7 +151,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuConfigManager config)
+        private void load(AudioManager audio, OsuConfigManager config, MusicController musicController)
         {
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 
@@ -178,7 +179,7 @@ namespace osu.Game.Screens.Play
             if (!ScoreProcessor.Mode.Disabled)
                 config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
 
-            InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
+            InternalChild = GameplayClockContainer = new GameplayClockContainer(musicController.CurrentTrack, Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
 
             AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap));
             AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer));
@@ -187,7 +188,7 @@ namespace osu.Game.Screens.Play
 
             addUnderlayComponents(GameplayClockContainer);
             addGameplayComponents(GameplayClockContainer, Beatmap.Value, playableBeatmap);
-            addOverlayComponents(GameplayClockContainer, Beatmap.Value);
+            addOverlayComponents(GameplayClockContainer, Beatmap.Value, musicController.CurrentTrack);
 
             if (!DrawableRuleset.AllowGameplayOverlays)
             {
@@ -264,7 +265,7 @@ namespace osu.Game.Screens.Play
             });
         }
 
-        private void addOverlayComponents(Container target, WorkingBeatmap working)
+        private void addOverlayComponents(Container target, WorkingBeatmap working, ITrack track)
         {
             target.AddRange(new[]
             {
@@ -331,7 +332,7 @@ namespace osu.Game.Screens.Play
                         performImmediateExit();
                     },
                 },
-                failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
+                failAnimation = new FailAnimation(DrawableRuleset, track) { OnComplete = onFailComplete, },
             });
         }
 

From ef689d943aafc413dac909da50d96532816abd6c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 18:54:08 +0900
Subject: [PATCH 04111/10326] Fix intros playing incorrectly

---
 osu.Game/OsuGame.cs                     |  4 ++--
 osu.Game/Screens/Menu/IntroScreen.cs    | 13 +++++++------
 osu.Game/Screens/Menu/IntroTriangles.cs |  2 +-
 osu.Game/Screens/Menu/IntroWelcome.cs   |  9 ++-------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a41c7b28a5..0049e5a520 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -581,6 +581,8 @@ namespace osu.Game
             ScreenStack.ScreenPushed += screenPushed;
             ScreenStack.ScreenExited += screenExited;
 
+            loadComponentSingleFile(MusicController, Add);
+
             loadComponentSingleFile(osuLogo, logo =>
             {
                 logoContainer.Add(logo);
@@ -602,8 +604,6 @@ namespace osu.Game
 
             loadComponentSingleFile(new OnScreenDisplay(), Add, true);
 
-            loadComponentSingleFile(MusicController, Add);
-
             loadComponentSingleFile(notifications.With(d =>
             {
                 d.GetToolbarHeight = () => ToolbarOffset;
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 030923c228..7e327261ab 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -44,8 +44,7 @@ namespace osu.Game.Screens.Menu
 
         private WorkingBeatmap initialBeatmap;
 
-        [Resolved]
-        protected MusicController MusicController { get; private set; }
+        protected ITrack Track { get; private set; }
 
         private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);
 
@@ -62,6 +61,9 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private AudioManager audio { get; set; }
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         /// <summary>
         /// Whether the <see cref="Track"/> is provided by osu! resources, rather than a user beatmap.
         /// </summary>
@@ -113,9 +115,7 @@ namespace osu.Game.Screens.Menu
                 if (setInfo != null)
                 {
                     initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-
-                    // Todo: Wrong.
-                    UsingThemedIntro = MusicController.CurrentTrack?.IsDummyDevice == false;
+                    UsingThemedIntro = initialBeatmap.GetRealTrack().IsDummyDevice == false;
                 }
 
                 return UsingThemedIntro;
@@ -154,7 +154,7 @@ namespace osu.Game.Screens.Menu
         {
             // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
             if (UsingThemedIntro)
-                MusicController.Play(true);
+                Track.Restart();
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -168,6 +168,7 @@ namespace osu.Game.Screens.Menu
             if (!resuming)
             {
                 beatmap.Value = initialBeatmap;
+                Track = musicController.CurrentTrack;
 
                 logo.MoveTo(new Vector2(0.5f));
                 logo.ScaleTo(Vector2.One);
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index e29ea6e743..86f7dbdd6f 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Menu
                 LoadComponentAsync(new TrianglesIntroSequence(logo, background)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Clock = new FramedClock(UsingThemedIntro ? MusicController.CurrentTrack : null),
+                    Clock = new FramedClock(UsingThemedIntro ? (IAdjustableClock)Track : null),
                     LoadMenu = LoadMenu
                 }, t =>
                 {
diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 85f11eb244..e81646456f 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osuTK.Graphics;
 
@@ -31,9 +30,6 @@ namespace osu.Game.Screens.Menu
             Alpha = 0,
         };
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         private BackgroundScreenDefault background;
 
         [BackgroundDependencyLoader]
@@ -43,9 +39,6 @@ namespace osu.Game.Screens.Menu
                 welcome = audio.Samples.Get(@"Intro/Welcome/welcome");
 
             pianoReverb = audio.Samples.Get(@"Intro/Welcome/welcome_piano");
-
-            if (musicController.CurrentTrack != null)
-                musicController.CurrentTrack.Looping = true;
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -54,6 +47,8 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
+                Track.Looping = true;
+
                 LoadComponentAsync(new WelcomeIntroSequence
                 {
                     RelativeSizeAxes = Axes.Both

From f8279dab328d758f2a590924de44a8a8921ca595 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 18:54:14 +0900
Subject: [PATCH 04112/10326] Refactor MainMenu

---
 osu.Game/Screens/Menu/MainMenu.cs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index ce48777ce1..ea4347a285 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -170,9 +170,6 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private Storage storage { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
@@ -180,14 +177,14 @@ namespace osu.Game.Screens.Menu
 
             var metadata = Beatmap.Value.Metadata;
 
-            if (last is IntroScreen && musicController.TrackLoaded)
+            if (last is IntroScreen && music.TrackLoaded)
             {
-                Debug.Assert(musicController.CurrentTrack != null);
+                Debug.Assert(music.CurrentTrack != null);
 
-                if (!musicController.CurrentTrack.IsRunning)
+                if (!music.CurrentTrack.IsRunning)
                 {
-                    musicController.CurrentTrack.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * musicController.CurrentTrack.Length);
-                    musicController.CurrentTrack.Start();
+                    music.CurrentTrack.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * music.CurrentTrack.Length);
+                    music.CurrentTrack.Start();
                 }
             }
 

From adf4f56dce1871816e29bde01e51fe78a77397ab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 19:01:23 +0900
Subject: [PATCH 04113/10326] Move MusicController to OsuGameBase

---
 osu.Game/OsuGame.cs     | 5 -----
 osu.Game/OsuGameBase.cs | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 0049e5a520..cf4610793c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -538,7 +538,6 @@ namespace osu.Game
             Container logoContainer;
             BackButton.Receptor receptor;
 
-            dependencies.CacheAs(MusicController = new MusicController());
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
 
             AddRange(new Drawable[]
@@ -581,8 +580,6 @@ namespace osu.Game
             ScreenStack.ScreenPushed += screenPushed;
             ScreenStack.ScreenExited += screenExited;
 
-            loadComponentSingleFile(MusicController, Add);
-
             loadComponentSingleFile(osuLogo, logo =>
             {
                 logoContainer.Add(logo);
@@ -925,8 +922,6 @@ namespace osu.Game
 
         private ScalingContainer screenContainer;
 
-        protected MusicController MusicController { get; private set; }
-
         protected override bool OnExiting()
         {
             if (ScreenStack.CurrentScreen is Loader)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 24c1f7849c..51b9b7278d 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -30,6 +30,7 @@ using osu.Game.Database;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
+using osu.Game.Overlays;
 using osu.Game.Resources;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -73,6 +74,8 @@ namespace osu.Game
 
         protected MenuCursorContainer MenuCursorContainer;
 
+        protected MusicController MusicController;
+
         private Container content;
 
         protected override Container<Drawable> Content => content;
@@ -265,6 +268,9 @@ namespace osu.Game
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());
             Add(previewTrackManager);
 
+            AddInternal(MusicController = new MusicController());
+            dependencies.CacheAs(MusicController);
+
             Ruleset.BindValueChanged(onRulesetChanged);
         }
 

From 4cfca71d080822734e7f29de27b5273f3304460a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 19:05:15 +0900
Subject: [PATCH 04114/10326] Fix a few test scenes

---
 osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
index ae4b0ef84a..a6266d210c 100644
--- a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
+++ b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.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.Extensions.ObjectExtensions;
 
 namespace osu.Game.Tests.Visual
@@ -15,7 +16,11 @@ namespace osu.Game.Tests.Visual
             base.Update();
 
             // note that this will override any mod rate application
-            MusicController.CurrentTrack.AsNonNull().Tempo.Value = Clock.Rate;
+            if (MusicController.TrackLoaded)
+            {
+                Debug.Assert(MusicController.CurrentTrack != null);
+                MusicController.CurrentTrack.Tempo.Value = Clock.Rate;
+            }
         }
     }
 }

From d1af1429b3dd8d79ba36bc5d41ac02a75ad86bac Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Aug 2020 19:08:45 +0900
Subject: [PATCH 04115/10326] Fix inspection

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

diff --git a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
index a6266d210c..54458716b1 100644
--- a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
+++ b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
-using osu.Framework.Extensions.ObjectExtensions;
 
 namespace osu.Game.Tests.Visual
 {

From e3105fd4c80caec86c086e66b5bad55d2f5d29c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Aug 2020 19:16:26 +0900
Subject: [PATCH 04116/10326] Add more resilient logic for whether to avoid
 playing SkinnableSound on no volume

---
 .../Objects/Drawables/DrawableSpinner.cs             |  6 ++----
 osu.Game/Screens/Play/PauseOverlay.cs                |  8 ++------
 osu.Game/Skinning/SkinnableSound.cs                  | 12 +++++++++++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 7363da0de8..b74a9c7197 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -82,8 +82,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private SkinnableSound spinningSample;
 
-        private const float minimum_volume = 0.0001f;
-
         protected override void LoadSamples()
         {
             base.LoadSamples();
@@ -100,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
                 AddInternal(spinningSample = new SkinnableSound(clone)
                 {
-                    Volume = { Value = minimum_volume },
+                    Volume = { Value = 0 },
                     Looping = true,
                 });
             }
@@ -118,7 +116,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
             else
             {
-                spinningSample?.VolumeTo(minimum_volume, 200).Finally(_ => spinningSample.Stop());
+                spinningSample?.VolumeTo(0, 200).Finally(_ => spinningSample.Stop());
             }
         }
 
diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index fa917cda32..3cdc558951 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -25,8 +25,6 @@ namespace osu.Game.Screens.Play
 
         protected override Action BackAction => () => InternalButtons.Children.First().Click();
 
-        private const float minimum_volume = 0.0001f;
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -37,10 +35,8 @@ namespace osu.Game.Screens.Play
             AddInternal(pauseLoop = new SkinnableSound(new SampleInfo("pause-loop"))
             {
                 Looping = true,
+                Volume = { Value = 0 }
             });
-
-            // SkinnableSound only plays a sound if its aggregate volume is > 0, so the volume must be turned up before playing it
-            pauseLoop.VolumeTo(minimum_volume);
         }
 
         protected override void PopIn()
@@ -55,7 +51,7 @@ namespace osu.Game.Screens.Play
         {
             base.PopOut();
 
-            pauseLoop.VolumeTo(minimum_volume, TRANSITION_DURATION, Easing.OutQuad).Finally(_ => pauseLoop.Stop());
+            pauseLoop.VolumeTo(0, TRANSITION_DURATION, Easing.OutQuad).Finally(_ => pauseLoop.Stop());
         }
     }
 }
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 27f6c37895..8c18e83e92 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -28,6 +28,16 @@ namespace osu.Game.Skinning
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
 
+        /// <summary>
+        /// Whether to play the underlying sample when aggregate volume is zero.
+        /// Note that this is checked at the point of calling <see cref="Play"/>; changing the volume post-play will not begin playback.
+        /// Defaults to false unless <see cref="Looping"/>.
+        /// </summary>
+        /// <remarks>
+        /// Can serve as an optimisation if it is known ahead-of-time that this behaviour will not negatively affect behaviour.
+        /// </remarks>
+        protected bool SkipPlayWhenZeroVolume => !Looping;
+
         private readonly AudioContainer<DrawableSample> samplesContainer;
 
         public SkinnableSound(ISampleInfo hitSamples)
@@ -87,7 +97,7 @@ namespace osu.Game.Skinning
         {
             samplesContainer.ForEach(c =>
             {
-                if (c.AggregateVolume.Value > 0)
+                if (!SkipPlayWhenZeroVolume || c.AggregateVolume.Value > 0)
                     c.Play();
             });
         }

From f994bf28884b66d7efc4654c50ebbb961640ecb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Aug 2020 21:34:48 +0900
Subject: [PATCH 04117/10326] 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 924e9c4a16..e5fed09c07 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.804.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.806.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 627c2f3d33..18c3052ca3 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.804.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.806.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f443937017..b034253d88 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.Framework.iOS" Version="2020.804.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.806.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.804.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.806.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From c84452cfbfdb8e72424702ee1e25cea82aa39606 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Aug 2020 21:53:20 +0900
Subject: [PATCH 04118/10326] Update usages

---
 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs | 2 ++
 osu.Game/Skinning/SkinnableSound.cs                 | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index 168e937256..83a1077d70 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -117,6 +117,8 @@ namespace osu.Game.Rulesets.UI
 
         public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
 
+        public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotSupportedException();
+
         public BindableNumber<double> Volume => throw new NotSupportedException();
 
         public BindableNumber<double> Balance => throw new NotSupportedException();
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 27f6c37895..f19aaee821 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -149,28 +150,28 @@ namespace osu.Game.Skinning
         /// Smoothly adjusts <see cref="Volume"/> over time.
         /// </summary>
         /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> VolumeTo(double newVolume, double duration = 0, Easing easing = Easing.None) =>
+        public TransformSequence<AudioContainer<DrawableSample>> VolumeTo(double newVolume, double duration = 0, Easing easing = Easing.None) =>
             samplesContainer.VolumeTo(newVolume, duration, easing);
 
         /// <summary>
         /// Smoothly adjusts <see cref="Balance"/> over time.
         /// </summary>
         /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> BalanceTo(double newBalance, double duration = 0, Easing easing = Easing.None) =>
+        public TransformSequence<AudioContainer<DrawableSample>> BalanceTo(double newBalance, double duration = 0, Easing easing = Easing.None) =>
             samplesContainer.BalanceTo(newBalance, duration, easing);
 
         /// <summary>
         /// Smoothly adjusts <see cref="Frequency"/> over time.
         /// </summary>
         /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> FrequencyTo(double newFrequency, double duration = 0, Easing easing = Easing.None) =>
+        public TransformSequence<AudioContainer<DrawableSample>> FrequencyTo(double newFrequency, double duration = 0, Easing easing = Easing.None) =>
             samplesContainer.FrequencyTo(newFrequency, duration, easing);
 
         /// <summary>
         /// Smoothly adjusts <see cref="Tempo"/> over time.
         /// </summary>
         /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public TransformSequence<DrawableAudioWrapper> TempoTo(double newTempo, double duration = 0, Easing easing = Easing.None) =>
+        public TransformSequence<AudioContainer<DrawableSample>> TempoTo(double newTempo, double duration = 0, Easing easing = Easing.None) =>
             samplesContainer.TempoTo(newTempo, duration, easing);
 
         #endregion

From e0ae2b3ebf20e1454af64b001e81365e301f221b Mon Sep 17 00:00:00 2001
From: Sebastian Krajewski <mail@wieku.me>
Date: Thu, 6 Aug 2020 17:07:36 +0200
Subject: [PATCH 04119/10326] Switch to SkinReloadableDrawable

---
 .../Drawables/DrawableStoryboardSprite.cs     | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index d40af903a6..d4f27bf4aa 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -14,11 +14,11 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    public class DrawableStoryboardSprite : Sprite, IFlippable, IVectorScalable
+    public class DrawableStoryboardSprite : SkinReloadableDrawable, IFlippable, IVectorScalable
     {
         public StoryboardSprite Sprite { get; }
 
-        private ISkinSource currentSkin;
+        private Sprite drawableSprite;
 
         private TextureStore storyboardTextureStore;
 
@@ -123,34 +123,28 @@ namespace osu.Game.Storyboards.Drawables
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
         {
-            if (skin != null)
+            InternalChild = drawableSprite = new Sprite
             {
-                currentSkin = skin;
-                skin.SourceChanged += onChange;
-            }
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            };
 
             storyboardTextureStore = textureStore;
 
             texturePath = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Sprite.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
 
-            skinChanged();
-
             Sprite.ApplyTransforms(this);
         }
 
-        private void onChange() =>
-            // schedule required to avoid calls after disposed.
-            // note that this has the side-effect of components only performing a possible texture change when they are alive.
-            Scheduler.AddOnce(skinChanged);
-
-        private void skinChanged()
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
-            var newTexture = currentSkin?.GetTexture(Sprite.Path) ?? storyboardTextureStore?.Get(texturePath);
+            base.SkinChanged(skin, allowFallback);
+            var newTexture = skin?.GetTexture(Sprite.Path) ?? storyboardTextureStore?.Get(texturePath);
 
-            if (Texture == newTexture) return;
+            if (drawableSprite.Texture == newTexture) return;
 
-            Size = Vector2.Zero; // Sprite size needs to be recalculated (e.g. aspect ratio of combo number textures may differ between skins)
-            Texture = newTexture;
+            drawableSprite.Size = Vector2.Zero; // Sprite size needs to be recalculated (e.g. aspect ratio of combo number textures may differ between skins)
+            drawableSprite.Texture = newTexture;
         }
     }
 }

From bce3f3952fbc1154b74d190b2947624b1558c574 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 16:36:40 +0900
Subject: [PATCH 04120/10326] Split out variable declaration

---
 osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 9fbd9f50b4..0ab3e8825b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
         }
 
         private Container<Sprite> circleSprites;
-        private Sprite hitCircleSprite, hitCircleOverlay;
+        private Sprite hitCircleSprite;
+        private Sprite hitCircleOverlay;
 
         private SkinnableSpriteText hitCircleText;
 

From f8ef53a62e0f4fecc26a614373749ccf08b14d43 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 7 Aug 2020 10:17:11 +0200
Subject: [PATCH 04121/10326] Fix tests.

---
 .../Visual/Gameplay/TestSceneOverlayActivation.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
index 9e93cf363d..03e1337125 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Game.Configuration;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
@@ -13,21 +12,25 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private OverlayTestPlayer testPlayer;
 
-        [Resolved]
-        private OsuConfigManager config { get; set; }
-
         public override void SetUpSteps()
         {
-            AddStep("disable overlay activation during gameplay", () => config.Set(OsuSetting.GameplayDisableOverlayActivation, true));
+            AddStep("disable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, true));
             base.SetUpSteps();
         }
 
         [Test]
-        public void TestGameplayOverlayActivationSetting()
+        public void TestGameplayOverlayActivation()
         {
             AddAssert("activation mode is disabled", () => testPlayer.OverlayActivationMode == OverlayActivation.Disabled);
         }
 
+        [Test]
+        public void TestGameplayOverlayActivationDisabled()
+        {
+            AddStep("enable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, false));
+            AddAssert("activation mode is user triggered", () => testPlayer.OverlayActivationMode == OverlayActivation.UserTriggered);
+        }
+
         [Test]
         public void TestGameplayOverlayActivationPaused()
         {

From 2e0f567d5def9ce469170c00f4d1c7caa4c0f43f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 7 Aug 2020 11:33:02 +0300
Subject: [PATCH 04122/10326] Implement HomeNewsPanel component

---
 .../Visual/Online/TestSceneHomeNewsPanel.cs   |  38 +++
 osu.Game/Overlays/Dashboard/Home/HomePanel.cs |  58 +++++
 .../Dashboard/Home/News/HomeNewsPanel.cs      | 240 ++++++++++++++++++
 osu.Game/Overlays/News/NewsCard.cs            |  34 +--
 osu.Game/Overlays/News/NewsPostBackground.cs  |  37 +++
 5 files changed, 375 insertions(+), 32 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
 create mode 100644 osu.Game/Overlays/Dashboard/Home/HomePanel.cs
 create mode 100644 osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
 create mode 100644 osu.Game/Overlays/News/NewsPostBackground.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
new file mode 100644
index 0000000000..262bc51cd8
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.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.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Framework.Allocation;
+using osu.Game.Overlays;
+using System;
+using osu.Game.Overlays.Dashboard.Home.News;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneHomeNewsPanel : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        public TestSceneHomeNewsPanel()
+        {
+            Add(new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.Y,
+                Width = 500,
+                Child = new HomeNewsPanel(new APINewsPost
+                {
+                    Title = "This post has an image which starts with \"/\" and has many authors!",
+                    Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+                    FirstImage = "/help/wiki/shared/news/banners/monthly-beatmapping-contest.png",
+                    PublishedAt = DateTimeOffset.Now,
+                    Slug = "2020-07-16-summer-theme-park-2020-voting-open"
+                })
+            });
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/Home/HomePanel.cs b/osu.Game/Overlays/Dashboard/Home/HomePanel.cs
new file mode 100644
index 0000000000..bbe7e411fd
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Home/HomePanel.cs
@@ -0,0 +1,58 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using 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 osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Dashboard.Home
+{
+    public class HomePanel : Container
+    {
+        protected override Container<Drawable> Content => content;
+
+        [Resolved]
+        protected OverlayColourProvider ColourProvider { get; private set; }
+
+        private readonly Container content;
+        private readonly Box background;
+
+        public HomePanel()
+        {
+            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(0, 1)
+            };
+
+            AddRangeInternal(new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y
+                }
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            background.Colour = ColourProvider.Background4;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
new file mode 100644
index 0000000000..85e31b3034
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
@@ -0,0 +1,240 @@
+// Copyright (c) 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.Framework.Platform;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays.News;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Dashboard.Home.News
+{
+    public class HomeNewsPanel : HomePanel
+    {
+        private readonly APINewsPost post;
+
+        public HomeNewsPanel(APINewsPost post)
+        {
+            this.post = post;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Children = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new ClickableNewsBackground(post),
+                        new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            ColumnDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.AutoSize),
+                                new Dimension()
+                            },
+                            RowDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.AutoSize)
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.Y,
+                                        Width = 80,
+                                        Padding = new MarginPadding(10),
+                                        Children = new Drawable[]
+                                        {
+                                            new Box
+                                            {
+                                                Anchor = Anchor.TopRight,
+                                                Origin = Anchor.TopRight,
+                                                RelativeSizeAxes = Axes.Y,
+                                                Width = 1,
+                                                Colour = ColourProvider.Light1
+                                            },
+                                            new Container
+                                            {
+                                                Anchor = Anchor.TopRight,
+                                                Origin = Anchor.TopRight,
+                                                AutoSizeAxes = Axes.Both,
+                                                Padding = new MarginPadding { Right = 11 },
+                                                Child = new DateContainer(post.PublishedAt)
+                                            }
+                                        }
+                                    },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Padding = new MarginPadding { Right = 10 },
+                                        Children = new Drawable[]
+                                        {
+                                            new FillFlowContainer
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                AutoSizeAxes = Axes.Y,
+                                                Margin = new MarginPadding { Top = 5, Bottom = 10 },
+                                                Spacing = new Vector2(0, 10),
+                                                Direction = FillDirection.Vertical,
+                                                Children = new Drawable[]
+                                                {
+                                                    new TitleLink(post),
+                                                    new TextFlowContainer(f =>
+                                                    {
+                                                        f.Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular);
+                                                    })
+                                                    {
+                                                        RelativeSizeAxes = Axes.X,
+                                                        AutoSizeAxes = Axes.Y,
+                                                        Text = post.Preview
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        private class ClickableNewsBackground : OsuHoverContainer
+        {
+            private readonly APINewsPost post;
+
+            public ClickableNewsBackground(APINewsPost post)
+            {
+                this.post = post;
+
+                RelativeSizeAxes = Axes.X;
+                Height = 130;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(GameHost host)
+            {
+                NewsPostBackground bg;
+
+                Child = new DelayedLoadWrapper(bg = new NewsPostBackground(post.FirstImage)
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode = FillMode.Fill,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Alpha = 0
+                })
+                {
+                    RelativeSizeAxes = Axes.Both
+                };
+
+                bg.OnLoadComplete += d => d.FadeIn(250, Easing.In);
+
+                TooltipText = "view in browser";
+                Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
+
+                HoverColour = Color4.White;
+            }
+        }
+
+        private class TitleLink : OsuHoverContainer
+        {
+            private readonly APINewsPost post;
+
+            public TitleLink(APINewsPost post)
+            {
+                this.post = post;
+
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(GameHost host)
+            {
+                Child = new TextFlowContainer(t =>
+                {
+                    t.Font = OsuFont.GetFont(weight: FontWeight.Bold);
+                })
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Text = post.Title
+                };
+
+                TooltipText = "view in browser";
+                Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
+            }
+        }
+
+        private class DateContainer : CompositeDrawable, IHasCustomTooltip
+        {
+            public ITooltip GetCustomTooltip() => new DateTooltip();
+
+            public object TooltipContent => date;
+
+            private readonly DateTimeOffset date;
+
+            public DateContainer(DateTimeOffset date)
+            {
+                this.date = date;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                AutoSizeAxes = Axes.Both;
+                InternalChild = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold), // using Bold since there is no 800 weight alternative
+                            Colour = colourProvider.Light1,
+                            Text = date.Day.ToString()
+                        },
+                        new TextFlowContainer(f =>
+                        {
+                            f.Font = OsuFont.GetFont(size: 11, weight: FontWeight.Regular);
+                            f.Colour = colourProvider.Light1;
+                        })
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            AutoSizeAxes = Axes.Both,
+                            Text = $"{date:MMM yyyy}"
+                        }
+                    }
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index 201c3ce826..599b45fa78 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -9,8 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
 using osu.Game.Graphics;
@@ -48,7 +46,7 @@ namespace osu.Game.Overlays.News
                 Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
             }
 
-            NewsBackground bg;
+            NewsPostBackground bg;
             AddRange(new Drawable[]
             {
                 background = new Box
@@ -70,7 +68,7 @@ namespace osu.Game.Overlays.News
                             CornerRadius = 6,
                             Children = new Drawable[]
                             {
-                                new DelayedLoadWrapper(bg = new NewsBackground(post.FirstImage)
+                                new DelayedLoadWrapper(bg = new NewsPostBackground(post.FirstImage)
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     FillMode = FillMode.Fill,
@@ -123,34 +121,6 @@ namespace osu.Game.Overlays.News
             main.AddText(post.Author, t => t.Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold));
         }
 
-        [LongRunningLoad]
-        private class NewsBackground : Sprite
-        {
-            private readonly string sourceUrl;
-
-            public NewsBackground(string sourceUrl)
-            {
-                this.sourceUrl = sourceUrl;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(LargeTextureStore store)
-            {
-                Texture = store.Get(createUrl(sourceUrl));
-            }
-
-            private string createUrl(string source)
-            {
-                if (string.IsNullOrEmpty(source))
-                    return "Headers/news";
-
-                if (source.StartsWith('/'))
-                    return "https://osu.ppy.sh" + source;
-
-                return source;
-            }
-        }
-
         private class DateContainer : CircularContainer, IHasCustomTooltip
         {
             public ITooltip GetCustomTooltip() => new DateTooltip();
diff --git a/osu.Game/Overlays/News/NewsPostBackground.cs b/osu.Game/Overlays/News/NewsPostBackground.cs
new file mode 100644
index 0000000000..386ef7f669
--- /dev/null
+++ b/osu.Game/Overlays/News/NewsPostBackground.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.Allocation;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Overlays.News
+{
+    [LongRunningLoad]
+    public class NewsPostBackground : Sprite
+    {
+        private readonly string sourceUrl;
+
+        public NewsPostBackground(string sourceUrl)
+        {
+            this.sourceUrl = sourceUrl;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(LargeTextureStore store)
+        {
+            Texture = store.Get(createUrl(sourceUrl));
+        }
+
+        private string createUrl(string source)
+        {
+            if (string.IsNullOrEmpty(source))
+                return "Headers/news";
+
+            if (source.StartsWith('/'))
+                return "https://osu.ppy.sh" + source;
+
+            return source;
+        }
+    }
+}

From 76d35a7667eb082d6917e1e032ab3d9f418b905d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 7 Aug 2020 12:59:45 +0300
Subject: [PATCH 04123/10326] Implement HomeNewsGroupPanel

---
 .../Visual/Online/TestSceneHomeNewsPanel.cs   |  38 ++++-
 osu.Game/Overlays/Dashboard/Home/HomePanel.cs |   7 +-
 .../Dashboard/Home/News/HomeNewsGroupPanel.cs |  85 ++++++++++
 .../Dashboard/Home/News/HomeNewsPanel.cs      | 152 ++++--------------
 .../Home/News/HomeNewsPanelFooter.cs          |  79 +++++++++
 .../Home/News/NewsPostDrawableDate.cs         |  37 +++++
 .../Dashboard/Home/News/NewsTitleLink.cs      |  43 +++++
 7 files changed, 311 insertions(+), 130 deletions(-)
 create mode 100644 osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs
 create mode 100644 osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs
 create mode 100644 osu.Game/Overlays/Dashboard/Home/News/NewsPostDrawableDate.cs
 create mode 100644 osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
index 262bc51cd8..78d77c9e97 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
@@ -8,6 +8,8 @@ using osu.Framework.Allocation;
 using osu.Game.Overlays;
 using System;
 using osu.Game.Overlays.Dashboard.Home.News;
+using osuTK;
+using System.Collections.Generic;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -18,20 +20,40 @@ namespace osu.Game.Tests.Visual.Online
 
         public TestSceneHomeNewsPanel()
         {
-            Add(new Container
+            Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 AutoSizeAxes = Axes.Y,
                 Width = 500,
-                Child = new HomeNewsPanel(new APINewsPost
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 5),
+                Children = new Drawable[]
                 {
-                    Title = "This post has an image which starts with \"/\" and has many authors!",
-                    Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
-                    FirstImage = "/help/wiki/shared/news/banners/monthly-beatmapping-contest.png",
-                    PublishedAt = DateTimeOffset.Now,
-                    Slug = "2020-07-16-summer-theme-park-2020-voting-open"
-                })
+                    new HomeNewsPanel(new APINewsPost
+                    {
+                        Title = "This post has an image which starts with \"/\" and has many authors!",
+                        Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+                        FirstImage = "/help/wiki/shared/news/banners/monthly-beatmapping-contest.png",
+                        PublishedAt = DateTimeOffset.Now,
+                        Slug = "2020-07-16-summer-theme-park-2020-voting-open"
+                    }),
+                    new HomeNewsGroupPanel(new List<APINewsPost>
+                    {
+                        new APINewsPost
+                        {
+                            Title = "Title 1",
+                            Slug = "2020-07-16-summer-theme-park-2020-voting-open",
+                            PublishedAt = DateTimeOffset.Now,
+                        },
+                        new APINewsPost
+                        {
+                            Title = "Title of this post is Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+                            Slug = "2020-07-16-summer-theme-park-2020-voting-open",
+                            PublishedAt = DateTimeOffset.Now,
+                        }
+                    })
+                }
             });
         }
     }
diff --git a/osu.Game/Overlays/Dashboard/Home/HomePanel.cs b/osu.Game/Overlays/Dashboard/Home/HomePanel.cs
index bbe7e411fd..ce053cd4ec 100644
--- a/osu.Game/Overlays/Dashboard/Home/HomePanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/HomePanel.cs
@@ -16,9 +16,6 @@ namespace osu.Game.Overlays.Dashboard.Home
     {
         protected override Container<Drawable> Content => content;
 
-        [Resolved]
-        protected OverlayColourProvider ColourProvider { get; private set; }
-
         private readonly Container content;
         private readonly Box background;
 
@@ -50,9 +47,9 @@ namespace osu.Game.Overlays.Dashboard.Home
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = ColourProvider.Background4;
+            background.Colour = colourProvider.Background4;
         }
     }
 }
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs
new file mode 100644
index 0000000000..cd1c5393c5
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs
@@ -0,0 +1,85 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Overlays.Dashboard.Home.News
+{
+    public class HomeNewsGroupPanel : HomePanel
+    {
+        private readonly List<APINewsPost> posts;
+
+        public HomeNewsGroupPanel(List<APINewsPost> posts)
+        {
+            this.posts = posts;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Content.Padding = new MarginPadding { Vertical = 5 };
+
+            Child = new FillFlowContainer<CollapsedNewsPanel>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = posts.Select(p => new CollapsedNewsPanel(p)).ToArray()
+            };
+        }
+
+        private class CollapsedNewsPanel : HomeNewsPanelFooter
+        {
+            public CollapsedNewsPanel(APINewsPost post)
+                : base(post)
+            {
+            }
+
+            protected override Drawable CreateContent(APINewsPost post) => new NewsTitleLink(post);
+
+            protected override NewsPostDrawableDate CreateDate(DateTimeOffset date) => new Date(date);
+
+            private class Date : NewsPostDrawableDate
+            {
+                public Date(DateTimeOffset date)
+                    : base(date)
+                {
+                }
+
+                protected override Drawable CreateDate(DateTimeOffset date, OverlayColourProvider colourProvider)
+                {
+                    var drawableDate = new TextFlowContainer(t =>
+                    {
+                        t.Colour = colourProvider.Light1;
+                    })
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Margin = new MarginPadding { Vertical = 5 }
+                    };
+
+                    drawableDate.AddText($"{date:dd} ", t =>
+                    {
+                        t.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold);
+                    });
+
+                    drawableDate.AddText($"{date:MMM}", t =>
+                    {
+                        t.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Regular);
+                    });
+
+                    return drawableDate;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
index 85e31b3034..3548b7c88d 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
@@ -5,8 +5,6 @@ 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.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -40,81 +38,7 @@ namespace osu.Game.Overlays.Dashboard.Home.News
                     Children = new Drawable[]
                     {
                         new ClickableNewsBackground(post),
-                        new GridContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            ColumnDimensions = new[]
-                            {
-                                new Dimension(GridSizeMode.AutoSize),
-                                new Dimension()
-                            },
-                            RowDimensions = new[]
-                            {
-                                new Dimension(GridSizeMode.AutoSize)
-                            },
-                            Content = new[]
-                            {
-                                new Drawable[]
-                                {
-                                    new Container
-                                    {
-                                        RelativeSizeAxes = Axes.Y,
-                                        Width = 80,
-                                        Padding = new MarginPadding(10),
-                                        Children = new Drawable[]
-                                        {
-                                            new Box
-                                            {
-                                                Anchor = Anchor.TopRight,
-                                                Origin = Anchor.TopRight,
-                                                RelativeSizeAxes = Axes.Y,
-                                                Width = 1,
-                                                Colour = ColourProvider.Light1
-                                            },
-                                            new Container
-                                            {
-                                                Anchor = Anchor.TopRight,
-                                                Origin = Anchor.TopRight,
-                                                AutoSizeAxes = Axes.Both,
-                                                Padding = new MarginPadding { Right = 11 },
-                                                Child = new DateContainer(post.PublishedAt)
-                                            }
-                                        }
-                                    },
-                                    new Container
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Padding = new MarginPadding { Right = 10 },
-                                        Children = new Drawable[]
-                                        {
-                                            new FillFlowContainer
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                AutoSizeAxes = Axes.Y,
-                                                Margin = new MarginPadding { Top = 5, Bottom = 10 },
-                                                Spacing = new Vector2(0, 10),
-                                                Direction = FillDirection.Vertical,
-                                                Children = new Drawable[]
-                                                {
-                                                    new TitleLink(post),
-                                                    new TextFlowContainer(f =>
-                                                    {
-                                                        f.Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular);
-                                                    })
-                                                    {
-                                                        RelativeSizeAxes = Axes.X,
-                                                        AutoSizeAxes = Axes.Y,
-                                                        Text = post.Preview
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
+                        new Footer(post)
                     }
                 }
             };
@@ -158,54 +82,48 @@ namespace osu.Game.Overlays.Dashboard.Home.News
             }
         }
 
-        private class TitleLink : OsuHoverContainer
+        private class Footer : HomeNewsPanelFooter
         {
-            private readonly APINewsPost post;
+            protected override float BarPading => 10;
 
-            public TitleLink(APINewsPost post)
+            public Footer(APINewsPost post)
+                : base(post)
             {
-                this.post = post;
-
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
             }
 
-            [BackgroundDependencyLoader]
-            private void load(GameHost host)
+            protected override NewsPostDrawableDate CreateDate(DateTimeOffset date) => new Date(date);
+
+            protected override Drawable CreateContent(APINewsPost post) => new FillFlowContainer
             {
-                Child = new TextFlowContainer(t =>
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Margin = new MarginPadding { Top = 5, Bottom = 10 },
+                Spacing = new Vector2(0, 10),
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
                 {
-                    t.Font = OsuFont.GetFont(weight: FontWeight.Bold);
-                })
+                    new NewsTitleLink(post),
+                    new TextFlowContainer(f =>
+                    {
+                        f.Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular);
+                    })
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Text = post.Preview
+                    }
+                }
+            };
+
+            private class Date : NewsPostDrawableDate
+            {
+                public Date(DateTimeOffset date)
+                    : base(date)
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Text = post.Title
-                };
+                    Margin = new MarginPadding { Top = 10 };
+                }
 
-                TooltipText = "view in browser";
-                Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
-            }
-        }
-
-        private class DateContainer : CompositeDrawable, IHasCustomTooltip
-        {
-            public ITooltip GetCustomTooltip() => new DateTooltip();
-
-            public object TooltipContent => date;
-
-            private readonly DateTimeOffset date;
-
-            public DateContainer(DateTimeOffset date)
-            {
-                this.date = date;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider)
-            {
-                AutoSizeAxes = Axes.Both;
-                InternalChild = new FillFlowContainer
+                protected override Drawable CreateDate(DateTimeOffset date, OverlayColourProvider colourProvider) => new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
@@ -219,7 +137,7 @@ namespace osu.Game.Overlays.Dashboard.Home.News
                             Origin = Anchor.TopRight,
                             Font = OsuFont.GetFont(weight: FontWeight.Bold), // using Bold since there is no 800 weight alternative
                             Colour = colourProvider.Light1,
-                            Text = date.Day.ToString()
+                            Text = $"{date: dd}"
                         },
                         new TextFlowContainer(f =>
                         {
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs
new file mode 100644
index 0000000000..591f53ac4a
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs
@@ -0,0 +1,79 @@
+// Copyright (c) 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.Shapes;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Overlays.Dashboard.Home.News
+{
+    public abstract class HomeNewsPanelFooter : CompositeDrawable
+    {
+        protected virtual float BarPading { get; } = 0;
+
+        private readonly APINewsPost post;
+
+        protected HomeNewsPanelFooter(APINewsPost post)
+        {
+            this.post = post;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                ColumnDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.Absolute, size: 60),
+                    new Dimension(GridSizeMode.Absolute, size: 20),
+                    new Dimension()
+                },
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        CreateDate(post.PublishedAt),
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Vertical = BarPading },
+                            Child = new Box
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopRight,
+                                Width = 1,
+                                RelativeSizeAxes = Axes.Y,
+                                Colour = colourProvider.Light1
+                            }
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Padding = new MarginPadding { Right = 10 },
+                            Child = CreateContent(post)
+                        }
+                    }
+                }
+            };
+        }
+
+        protected abstract NewsPostDrawableDate CreateDate(DateTimeOffset date);
+
+        protected abstract Drawable CreateContent(APINewsPost post);
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/Home/News/NewsPostDrawableDate.cs b/osu.Game/Overlays/Dashboard/Home/News/NewsPostDrawableDate.cs
new file mode 100644
index 0000000000..8ba58e27a7
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Home/News/NewsPostDrawableDate.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 osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Game.Graphics;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Overlays.Dashboard.Home.News
+{
+    public abstract class NewsPostDrawableDate : CompositeDrawable, IHasCustomTooltip
+    {
+        public ITooltip GetCustomTooltip() => new DateTooltip();
+
+        public object TooltipContent => date;
+
+        private readonly DateTimeOffset date;
+
+        protected NewsPostDrawableDate(DateTimeOffset date)
+        {
+            this.date = date;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            AutoSizeAxes = Axes.Both;
+            Anchor = Anchor.TopRight;
+            Origin = Anchor.TopRight;
+            InternalChild = CreateDate(date, colourProvider);
+        }
+
+        protected abstract Drawable CreateDate(DateTimeOffset date, OverlayColourProvider colourProvider);
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs b/osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs
new file mode 100644
index 0000000000..da98c92bbe
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Platform;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Overlays.Dashboard.Home.News
+{
+    public class NewsTitleLink : OsuHoverContainer
+    {
+        private readonly APINewsPost post;
+
+        public NewsTitleLink(APINewsPost post)
+        {
+            this.post = post;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
+        {
+            Child = new TextFlowContainer(t =>
+            {
+                t.Font = OsuFont.GetFont(weight: FontWeight.Bold);
+            })
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Text = post.Title
+            };
+
+            TooltipText = "view in browser";
+            Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
+        }
+    }
+}

From cddd4f0a97842eefd68ba1ddda18f81ec5ca09b3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 7 Aug 2020 13:18:31 +0300
Subject: [PATCH 04124/10326] Implement HomeShowMoreNewsPanel

---
 .../Visual/Online/TestSceneHomeNewsPanel.cs   |  3 +-
 .../Home/News/HomeShowMoreNewsPanel.cs        | 51 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Overlays/Dashboard/Home/News/HomeShowMoreNewsPanel.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
index 78d77c9e97..b1c0c5adcd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
@@ -52,7 +52,8 @@ namespace osu.Game.Tests.Visual.Online
                             Slug = "2020-07-16-summer-theme-park-2020-voting-open",
                             PublishedAt = DateTimeOffset.Now,
                         }
-                    })
+                    }),
+                    new HomeShowMoreNewsPanel()
                 }
             });
         }
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeShowMoreNewsPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/HomeShowMoreNewsPanel.cs
new file mode 100644
index 0000000000..abb4bd7969
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Home/News/HomeShowMoreNewsPanel.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 System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Dashboard.Home.News
+{
+    public class HomeShowMoreNewsPanel : OsuHoverContainer
+    {
+        protected override IEnumerable<Drawable> EffectTargets => new[] { text };
+
+        [Resolved(canBeNull: true)]
+        private NewsOverlay overlay { get; set; }
+
+        private OsuSpriteText text;
+
+        public HomeShowMoreNewsPanel()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            Child = new HomePanel
+            {
+                Child = text = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Margin = new MarginPadding { Vertical = 20 },
+                    Text = "see more"
+                }
+            };
+
+            IdleColour = colourProvider.Light1;
+            HoverColour = Color4.White;
+
+            Action = () =>
+            {
+                overlay?.ShowFrontPage();
+            };
+        }
+    }
+}

From 61b632516eb73c43918697a9e408b5d75d04ab4d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 19:43:16 +0900
Subject: [PATCH 04125/10326] Ensure CurrentTrack is never null

---
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs          | 3 ---
 .../Visual/Navigation/TestSceneScreenNavigation.cs          | 4 ++--
 .../Visual/UserInterface/TestSceneBeatSyncedContainer.cs    | 2 +-
 osu.Game/Overlays/MusicController.cs                        | 6 ++----
 .../Edit/Components/Timelines/Summary/Parts/TimelinePart.cs | 1 -
 .../Edit/Compose/Components/Timeline/TimelineTickDisplay.cs | 2 +-
 osu.Game/Screens/Menu/LogoVisualisation.cs                  | 4 ++--
 osu.Game/Screens/Menu/MainMenu.cs                           | 2 --
 osu.Game/Tests/Visual/OsuTestScene.cs                       | 3 ---
 osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs       | 3 ---
 10 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 4113bdddf8..347b5757c8 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -95,10 +95,7 @@ namespace osu.Game.Tests.Visual.Editing
                 base.Update();
 
                 if (musicController.TrackLoaded)
-                {
-                    Debug.Assert(musicController.CurrentTrack != null);
                     marker.X = (float)(editorClock.CurrentTime / musicController.CurrentTrack.Length);
-                }
             }
         }
 
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 946bc2a175..e5d862cfc7 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -136,8 +136,8 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("Wait for music controller", () => Game.MusicController.IsLoaded);
             AddStep("Seek close to end", () =>
             {
-                Game.MusicController.SeekTo(MusicController.CurrentTrack.AsNonNull().Length - 1000);
-                MusicController.CurrentTrack.AsNonNull().Completed += () => trackCompleted = true;
+                Game.MusicController.SeekTo(MusicController.CurrentTrack.Length - 1000);
+                MusicController.CurrentTrack.Completed += () => trackCompleted = true;
             });
 
             AddUntilStep("Track was completed", () => trackCompleted);
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
index ac743d76df..3cccfa992e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 if (timingPoints.Count == 0) return 0;
 
                 if (timingPoints[^1] == current)
-                    return (int)Math.Ceiling((musicController.CurrentTrack.AsNonNull().Length - current.Time) / current.BeatLength);
+                    return (int)Math.Ceiling((musicController.CurrentTrack.Length - current.Time) / current.BeatLength);
 
                 return (int)Math.Ceiling((getNextTimingPoint(current).Time - current.Time) / current.BeatLength);
             }
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 6adfa1817e..7e3bb1ce89 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
@@ -65,8 +64,7 @@ namespace osu.Game.Overlays
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
-        [CanBeNull]
-        public DrawableTrack CurrentTrack { get; private set; }
+        public DrawableTrack CurrentTrack { get; private set; } = new DrawableTrack(new TrackVirtual(1000));
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
@@ -312,7 +310,7 @@ namespace osu.Game.Overlays
 
             current = beatmap.NewValue;
 
-            if (!beatmap.OldValue.BeatmapInfo.AudioEquals(current?.BeatmapInfo))
+            if (CurrentTrack == null || !beatmap.OldValue.BeatmapInfo.AudioEquals(current?.BeatmapInfo))
                 changeTrack();
 
             TrackChanged?.Invoke(current, direction);
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index 24fb855009..7085c8b020 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -58,7 +58,6 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                 return;
             }
 
-            Debug.Assert(musicController.CurrentTrack != null);
             content.RelativeChildSize = new Vector2((float)Math.Max(1, musicController.CurrentTrack.Length), 1);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index ceb0275a13..1ce33f221a 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 = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : musicController.CurrentTrack.AsNonNull().Length;
+                var until = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : musicController.CurrentTrack.Length;
 
                 int beat = 0;
 
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 7a1ff4fa06..974b704200 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -109,14 +109,14 @@ namespace osu.Game.Screens.Menu
         private void updateAmplitudes()
         {
             var effect = beatmap.Value.BeatmapLoaded && musicController.TrackLoaded
-                ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(musicController.CurrentTrack.AsNonNull().CurrentTime)
+                ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(musicController.CurrentTrack.CurrentTime)
                 : null;
 
             for (int i = 0; i < temporalAmplitudes.Length; i++)
                 temporalAmplitudes[i] = 0;
 
             if (musicController.TrackLoaded)
-                addAmplitudesFromSource(musicController.CurrentTrack.AsNonNull());
+                addAmplitudesFromSource(musicController.CurrentTrack);
 
             foreach (var source in amplitudeSources)
                 addAmplitudesFromSource(source);
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index ea4347a285..518277bce3 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -179,8 +179,6 @@ namespace osu.Game.Screens.Menu
 
             if (last is IntroScreen && music.TrackLoaded)
             {
-                Debug.Assert(music.CurrentTrack != null);
-
                 if (!music.CurrentTrack.IsRunning)
                 {
                     music.CurrentTrack.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * music.CurrentTrack.Length);
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index f2b9388fdc..af7579aafb 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -170,10 +170,7 @@ namespace osu.Game.Tests.Visual
             rulesetDependencies?.Dispose();
 
             if (MusicController?.TrackLoaded == true)
-            {
-                Debug.Assert(MusicController.CurrentTrack != null);
                 MusicController.CurrentTrack.Stop();
-            }
 
             if (contextFactory.IsValueCreated)
                 contextFactory.Value.ResetDatabase();
diff --git a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
index 54458716b1..027259d4f0 100644
--- a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
+++ b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
@@ -16,10 +16,7 @@ namespace osu.Game.Tests.Visual
 
             // note that this will override any mod rate application
             if (MusicController.TrackLoaded)
-            {
-                Debug.Assert(MusicController.CurrentTrack != null);
                 MusicController.CurrentTrack.Tempo.Value = Clock.Rate;
-            }
         }
     }
 }

From 5002d69f6973ab9753997dd28255c90a90de270a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 20:51:56 +0900
Subject: [PATCH 04126/10326] Update inspections

---
 .../TestSceneHoldNoteInput.cs                 |  2 +-
 .../TestSceneOutOfOrderHits.cs                |  2 +-
 .../TestSceneSliderInput.cs                   |  2 +-
 .../Skins/TestSceneBeatmapSkinResources.cs    |  2 +-
 .../Visual/Editing/TimelineTestScene.cs       |  1 -
 .../Visual/Gameplay/TestScenePause.cs         |  2 +-
 .../Visual/Gameplay/TestScenePlayerLoader.cs  |  4 +--
 .../Visual/Gameplay/TestSceneStoryboard.cs    |  4 +--
 .../Visual/Menus/TestSceneIntroWelcome.cs     |  2 +-
 .../Navigation/TestSceneScreenNavigation.cs   |  9 +++---
 .../TestSceneBeatSyncedContainer.cs           |  1 -
 .../TestSceneNowPlayingOverlay.cs             |  4 +--
 osu.Game/Audio/PreviewTrackManager.cs         |  2 +-
 osu.Game/Overlays/Music/PlaylistOverlay.cs    |  6 ++--
 osu.Game/Overlays/MusicController.cs          | 31 +++++++------------
 .../Edit/Components/PlaybackControl.cs        |  4 +--
 .../Timelines/Summary/Parts/TimelinePart.cs   |  1 -
 .../Timeline/TimelineTickDisplay.cs           |  1 -
 osu.Game/Screens/Edit/Editor.cs               |  2 +-
 osu.Game/Screens/Menu/LogoVisualisation.cs    |  1 -
 osu.Game/Screens/Menu/MainMenu.cs             |  1 -
 osu.Game/Screens/Menu/OsuLogo.cs              |  2 +-
 .../Multi/Match/Components/ReadyButton.cs     |  2 +-
 osu.Game/Screens/Multi/Multiplayer.cs         | 16 +++-------
 osu.Game/Tests/Visual/OsuTestScene.cs         |  1 -
 .../Visual/RateAdjustedBeatmapTestScene.cs    |  2 --
 26 files changed, 42 insertions(+), 65 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 98669efb10..19b69bac6d 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -343,7 +343,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack?.CurrentTime == 0);
+            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index e5be778527..744ad46c28 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -385,7 +385,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack?.CurrentTime == 0);
+            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index c9d13d3976..1690f648f9 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -366,7 +366,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack?.CurrentTime == 0);
+            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
index 08a4e27ff7..2866692be4 100644
--- a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Tests.Skins
         public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo("sample")) != null);
 
         [Test]
-        public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => MusicController.CurrentTrack?.IsDummyDevice == false);
+        public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => MusicController.CurrentTrack.IsDummyDevice == false);
     }
 }
diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 347b5757c8..4988a09650 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.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.Audio;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index e500b451f0..e7dd586f4e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -288,7 +288,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void confirmNoTrackAdjustments()
         {
-            AddAssert("track has no adjustments", () => MusicController.CurrentTrack?.AggregateFrequency.Value == 1);
+            AddAssert("track has no adjustments", () => MusicController.CurrentTrack.AggregateFrequency.Value == 1);
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index c72ab7d3d1..c4882046de 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -77,12 +77,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("load dummy beatmap", () => ResetPlayer(false, () => SelectedMods.Value = new[] { new OsuModNightcore() }));
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
-            AddAssert("mod rate applied", () => MusicController.CurrentTrack?.Rate != 1);
+            AddAssert("mod rate applied", () => MusicController.CurrentTrack.Rate != 1);
             AddStep("exit loader", () => loader.Exit());
             AddUntilStep("wait for not current", () => !loader.IsCurrentScreen());
             AddAssert("player did not load", () => !player.IsLoaded);
             AddUntilStep("player disposed", () => loader.DisposalTask?.IsCompleted == true);
-            AddAssert("mod rate still applied", () => MusicController.CurrentTrack?.Rate != 1);
+            AddAssert("mod rate still applied", () => MusicController.CurrentTrack.Rate != 1);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index c7a012a03f..3d2dd8a0c5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -87,9 +87,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void restart()
         {
-            MusicController.CurrentTrack?.Reset();
+            MusicController.CurrentTrack.Reset();
             loadStoryboard(Beatmap.Value);
-            MusicController.CurrentTrack?.Start();
+            MusicController.CurrentTrack.Start();
         }
 
         private void loadStoryboard(WorkingBeatmap working)
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
index a88704c831..29be250b12 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Menus
         {
             AddUntilStep("wait for load", () => MusicController.TrackLoaded);
 
-            AddAssert("check if menu music loops", () => MusicController.CurrentTrack?.Looping == true);
+            AddAssert("check if menu music loops", () => MusicController.CurrentTrack.Looping);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index e5d862cfc7..d2c71c1d17 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
@@ -62,12 +61,12 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("wait for fail", () => player.HasFailed);
 
             AddUntilStep("wait for track stop", () => !MusicController.IsPlaying);
-            AddAssert("Ensure time before preview point", () => MusicController.CurrentTrack?.CurrentTime < beatmap().Metadata.PreviewTime);
+            AddAssert("Ensure time before preview point", () => MusicController.CurrentTrack.CurrentTime < beatmap().Metadata.PreviewTime);
 
             pushEscape();
 
             AddUntilStep("wait for track playing", () => MusicController.IsPlaying);
-            AddAssert("Ensure time wasn't reset to preview point", () => MusicController.CurrentTrack?.CurrentTime < beatmap().Metadata.PreviewTime);
+            AddAssert("Ensure time wasn't reset to preview point", () => MusicController.CurrentTrack.CurrentTime < beatmap().Metadata.PreviewTime);
         }
 
         [Test]
@@ -77,11 +76,11 @@ namespace osu.Game.Tests.Visual.Navigation
 
             PushAndConfirm(() => songSelect = new TestSongSelect());
 
-            AddUntilStep("wait for no track", () => MusicController.CurrentTrack?.IsDummyDevice == true);
+            AddUntilStep("wait for no track", () => MusicController.CurrentTrack.IsDummyDevice);
 
             AddStep("return to menu", () => songSelect.Exit());
 
-            AddUntilStep("wait for track", () => MusicController.CurrentTrack?.IsDummyDevice == false && MusicController.IsPlaying);
+            AddUntilStep("wait for track", () => MusicController.CurrentTrack.IsDummyDevice == false && MusicController.IsPlaying);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
index 3cccfa992e..127915c6c6 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
@@ -8,7 +8,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index 0161ec0c56..cadecbbef0 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
@@ -80,12 +80,12 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Store track", () => currentBeatmap = Beatmap.Value);
 
             AddStep(@"Seek track to 6 second", () => musicController.SeekTo(6000));
-            AddUntilStep(@"Wait for current time to update", () => musicController.CurrentTrack?.CurrentTime > 5000);
+            AddUntilStep(@"Wait for current time to update", () => musicController.CurrentTrack.CurrentTime > 5000);
 
             AddStep(@"Set previous", () => musicController.PreviousTrack());
 
             AddAssert(@"Check beatmap didn't change", () => currentBeatmap == Beatmap.Value);
-            AddUntilStep("Wait for current time to update", () => musicController.CurrentTrack?.CurrentTime < 5000);
+            AddUntilStep("Wait for current time to update", () => musicController.CurrentTrack.CurrentTime < 5000);
 
             AddStep(@"Set previous", () => musicController.PreviousTrack());
             AddAssert(@"Check beatmap did change", () => currentBeatmap != Beatmap.Value);
diff --git a/osu.Game/Audio/PreviewTrackManager.cs b/osu.Game/Audio/PreviewTrackManager.cs
index 862be41c1a..1c68ce71d4 100644
--- a/osu.Game/Audio/PreviewTrackManager.cs
+++ b/osu.Game/Audio/PreviewTrackManager.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Audio
 
             track.Started += () => Schedule(() =>
             {
-                CurrentTrack?.Stop();
+                CurrentTrack.Stop();
                 CurrentTrack = track;
                 audio.Tracks.AddAdjustment(AdjustableProperty.Volume, muteBindable);
             });
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index b9a58c37cb..7471e31923 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Overlays.Music
                 if (toSelect != null)
                 {
                     beatmap.Value = beatmaps.GetWorkingBeatmap(toSelect);
-                    musicController.CurrentTrack?.Restart();
+                    musicController.CurrentTrack.Restart();
                 }
             };
         }
@@ -119,12 +119,12 @@ namespace osu.Game.Overlays.Music
         {
             if (set.ID == (beatmap.Value?.BeatmapSetInfo?.ID ?? -1))
             {
-                musicController.CurrentTrack?.Seek(0);
+                musicController.CurrentTrack.Seek(0);
                 return;
             }
 
             beatmap.Value = beatmaps.GetWorkingBeatmap(set.Beatmaps.First());
-            musicController.CurrentTrack?.Restart();
+            musicController.CurrentTrack.Restart();
         }
     }
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 7e3bb1ce89..3e93ae2ccd 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -3,8 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
@@ -64,6 +64,7 @@ namespace osu.Game.Overlays
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
+        [NotNull]
         public DrawableTrack CurrentTrack { get; private set; } = new DrawableTrack(new TrackVirtual(1000));
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
@@ -102,12 +103,12 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Returns whether the beatmap track is playing.
         /// </summary>
-        public bool IsPlaying => CurrentTrack?.IsRunning ?? false;
+        public bool IsPlaying => CurrentTrack.IsRunning;
 
         /// <summary>
         /// Returns whether the beatmap track is loaded.
         /// </summary>
-        public bool TrackLoaded => CurrentTrack?.IsLoaded == true;
+        public bool TrackLoaded => CurrentTrack.IsLoaded;
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {
@@ -140,7 +141,7 @@ namespace osu.Game.Overlays
             seekDelegate = Schedule(() =>
             {
                 if (!beatmap.Disabled)
-                    CurrentTrack?.Seek(position);
+                    CurrentTrack.Seek(position);
             });
         }
 
@@ -152,7 +153,7 @@ namespace osu.Game.Overlays
         {
             if (IsUserPaused) return;
 
-            if (CurrentTrack == null || CurrentTrack.IsDummyDevice)
+            if (CurrentTrack.IsDummyDevice)
             {
                 if (beatmap.Disabled)
                     return;
@@ -173,9 +174,6 @@ namespace osu.Game.Overlays
         {
             IsUserPaused = false;
 
-            if (CurrentTrack == null)
-                return false;
-
             if (restart)
                 CurrentTrack.Restart();
             else if (!IsPlaying)
@@ -190,7 +188,7 @@ namespace osu.Game.Overlays
         public void Stop()
         {
             IsUserPaused = true;
-            if (CurrentTrack?.IsRunning == true)
+            if (CurrentTrack.IsRunning)
                 CurrentTrack.Stop();
         }
 
@@ -200,7 +198,7 @@ namespace osu.Game.Overlays
         /// <returns>Whether the operation was successful.</returns>
         public bool TogglePause()
         {
-            if (CurrentTrack?.IsRunning == true)
+            if (CurrentTrack.IsRunning)
                 Stop();
             else
                 Play();
@@ -222,7 +220,7 @@ namespace osu.Game.Overlays
             if (beatmap.Disabled)
                 return PreviousTrackResult.None;
 
-            var currentTrackPosition = CurrentTrack?.CurrentTime;
+            var currentTrackPosition = CurrentTrack.CurrentTime;
 
             if (currentTrackPosition >= restart_cutoff_point)
             {
@@ -276,7 +274,7 @@ namespace osu.Game.Overlays
         {
             // if not scheduled, the previously track will be stopped one frame later (see ScheduleAfterChildren logic in GameBase).
             // we probably want to move this to a central method for switching to a new working beatmap in the future.
-            Schedule(() => CurrentTrack?.Restart());
+            Schedule(() => CurrentTrack.Restart());
         }
 
         private WorkingBeatmap current;
@@ -310,7 +308,7 @@ namespace osu.Game.Overlays
 
             current = beatmap.NewValue;
 
-            if (CurrentTrack == null || !beatmap.OldValue.BeatmapInfo.AudioEquals(current?.BeatmapInfo))
+            if (CurrentTrack.IsDummyDevice || !beatmap.OldValue.BeatmapInfo.AudioEquals(current?.BeatmapInfo))
                 changeTrack();
 
             TrackChanged?.Invoke(current, direction);
@@ -322,7 +320,7 @@ namespace osu.Game.Overlays
 
         private void changeTrack()
         {
-            CurrentTrack?.Expire();
+            CurrentTrack.Expire();
             CurrentTrack = null;
 
             if (current != null)
@@ -340,8 +338,6 @@ namespace osu.Game.Overlays
             if (current != workingBeatmap)
                 return;
 
-            Debug.Assert(CurrentTrack != null);
-
             if (!CurrentTrack.Looping && !beatmap.Disabled)
                 NextTrack();
         }
@@ -366,9 +362,6 @@ namespace osu.Game.Overlays
 
         public void ResetTrackAdjustments()
         {
-            if (CurrentTrack == null)
-                return;
-
             CurrentTrack.ResetSpeedAdjustments();
 
             if (allowRateAdjustments)
diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 412efe266c..5bafc120af 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -66,12 +66,12 @@ namespace osu.Game.Screens.Edit.Components
                 }
             };
 
-            musicController.CurrentTrack?.AddAdjustment(AdjustableProperty.Tempo, tempo);
+            musicController.CurrentTrack.AddAdjustment(AdjustableProperty.Tempo, tempo);
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            musicController?.CurrentTrack?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
+            musicController?.CurrentTrack.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
 
             base.Dispose(isDisposing);
         }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index 7085c8b020..c8a470c58a 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osuTK;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 1ce33f221a..cb122c590e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -3,7 +3,6 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 79b13a7eac..9f2009b415 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Edit
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             var sourceClock = (IAdjustableClock)musicController.CurrentTrack ?? new StopwatchClock();
-            clock = new EditorClock(Beatmap.Value, musicController.CurrentTrack?.Length ?? 0, beatDivisor) { IsCoupled = false };
+            clock = new EditorClock(Beatmap.Value, musicController.CurrentTrack.Length, beatDivisor) { IsCoupled = false };
             clock.ChangeSource(sourceClock);
 
             dependencies.CacheAs(clock);
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 974b704200..4d95ee9b7b 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -19,7 +19,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Utils;
 using osu.Game.Overlays;
 
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 518277bce3..8837a49772 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.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 System.Linq;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index f028f9b229..4515ee8ed0 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -330,7 +330,7 @@ namespace osu.Game.Screens.Menu
             const float velocity_adjust_cutoff = 0.98f;
             const float paused_velocity = 0.5f;
 
-            if (musicController.CurrentTrack?.IsRunning == true)
+            if (musicController.CurrentTrack.IsRunning)
             {
                 var maxAmplitude = lastBeatIndex >= 0 ? musicController.CurrentTrack.CurrentAmplitudes.Maximum : 0;
                 logoAmplitudeContainer.Scale = new Vector2((float)Interpolation.Damp(logoAmplitudeContainer.Scale.X, 1 - Math.Max(0, maxAmplitude - scale_adjust_cutoff) * 0.04f, 0.9f, Time.Elapsed));
diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index c7dc20ff23..384d3bd5a5 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                 return;
             }
 
-            bool hasEnoughTime = musicController.CurrentTrack != null && DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(musicController.CurrentTrack.Length) < endDate.Value;
+            bool hasEnoughTime = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(musicController.CurrentTrack.Length) < endDate.Value;
 
             Enabled.Value = hasBeatmap && hasEnoughTime;
         }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index e068899c7b..1a39d80f8d 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -343,13 +343,10 @@ namespace osu.Game.Screens.Multi
         {
             if (screenStack.CurrentScreen is MatchSubScreen)
             {
-                if (musicController.CurrentTrack != null)
-                {
-                    musicController.CurrentTrack.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-                    musicController.CurrentTrack.Looping = true;
+                musicController.CurrentTrack.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
+                musicController.CurrentTrack.Looping = true;
 
-                    musicController.EnsurePlayingSomething();
-                }
+                musicController.EnsurePlayingSomething();
             }
             else
             {
@@ -359,11 +356,8 @@ namespace osu.Game.Screens.Multi
 
         private void cancelLooping()
         {
-            if (musicController.CurrentTrack != null)
-            {
-                musicController.CurrentTrack.Looping = false;
-                musicController.CurrentTrack.RestartPoint = 0;
-            }
+            musicController.CurrentTrack.Looping = false;
+            musicController.CurrentTrack.RestartPoint = 0;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index af7579aafb..b0d15bf442 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
index 027259d4f0..7651285970 100644
--- a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
+++ b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.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.Diagnostics;
-
 namespace osu.Game.Tests.Visual
 {
     /// <summary>

From 028040344a9c2bfcc1cd25d3efad2e8dcf651207 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 21:07:59 +0900
Subject: [PATCH 04127/10326] Fix test scene using local beatmap

---
 osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
index 2866692be4..03faee9ad2 100644
--- a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
@@ -18,17 +18,15 @@ namespace osu.Game.Tests.Skins
         [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]);
+            Beatmap.Value = beatmaps.GetWorkingBeatmap(imported.Beatmaps[0]);
         }
 
         [Test]
-        public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo("sample")) != null);
+        public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => Beatmap.Value.Skin.GetSample(new SampleInfo("sample")) != null);
 
         [Test]
         public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => MusicController.CurrentTrack.IsDummyDevice == false);

From 961c6dab541c379e30cd4afe837f5bbfb265096b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 21:08:03 +0900
Subject: [PATCH 04128/10326] Fix more inspections

---
 osu.Game/Screens/Edit/Editor.cs               | 2 +-
 osu.Game/Tests/Visual/EditorClockTestScene.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 9f2009b415..1a7d76ba8f 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.Edit
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
-            var sourceClock = (IAdjustableClock)musicController.CurrentTrack ?? new StopwatchClock();
+            var sourceClock = (IAdjustableClock)musicController.CurrentTrack;
             clock = new EditorClock(Beatmap.Value, musicController.CurrentTrack.Length, beatDivisor) { IsCoupled = false };
             clock.ChangeSource(sourceClock);
 
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 780b4f1b3a..1009151ac4 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource((IAdjustableClock)MusicController.CurrentTrack ?? new StopwatchClock());
+            Clock.ChangeSource((IAdjustableClock)MusicController.CurrentTrack);
             Clock.ProcessFrame();
         }
 

From b08ebe6f81f9d596920ba602e04a1df9cb90798a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 21:14:45 +0900
Subject: [PATCH 04129/10326] More inspections (rider is broken)

---
 osu.Game/Screens/Edit/Editor.cs               | 4 +---
 osu.Game/Tests/Visual/EditorClockTestScene.cs | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 1a7d76ba8f..78fa6c74b0 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -14,7 +14,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
-using osu.Framework.Timing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
@@ -83,9 +82,8 @@ namespace osu.Game.Screens.Edit
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
-            var sourceClock = (IAdjustableClock)musicController.CurrentTrack;
             clock = new EditorClock(Beatmap.Value, musicController.CurrentTrack.Length, beatDivisor) { IsCoupled = false };
-            clock.ChangeSource(sourceClock);
+            clock.ChangeSource(musicController.CurrentTrack);
 
             dependencies.CacheAs(clock);
             AddInternal(clock);
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 1009151ac4..59c9329d37 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit;
@@ -44,7 +43,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource((IAdjustableClock)MusicController.CurrentTrack);
+            Clock.ChangeSource(MusicController.CurrentTrack);
             Clock.ProcessFrame();
         }
 

From 08820c62ec6ab6121b60c59ad8e89f3dfbcef3f5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 21:36:02 +0900
Subject: [PATCH 04130/10326] Add back removed nullcheck

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

diff --git a/osu.Game/Audio/PreviewTrackManager.cs b/osu.Game/Audio/PreviewTrackManager.cs
index 1c68ce71d4..862be41c1a 100644
--- a/osu.Game/Audio/PreviewTrackManager.cs
+++ b/osu.Game/Audio/PreviewTrackManager.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Audio
 
             track.Started += () => Schedule(() =>
             {
-                CurrentTrack.Stop();
+                CurrentTrack?.Stop();
                 CurrentTrack = track;
                 audio.Tracks.AddAdjustment(AdjustableProperty.Volume, muteBindable);
             });

From b6fb7a0d39e6a5667be3fa45d90a3f2a5072d5ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 22:05:58 +0900
Subject: [PATCH 04131/10326] Fix possibly setting null track

---
 .../Visual/Online/TestSceneNowPlayingCommand.cs           | 2 +-
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs                  | 3 ++-
 osu.Game/Overlays/MusicController.cs                      | 8 +++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
index 103308d34d..9662bd65b4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("Set activity", () => API.Activity.Value = new UserActivity.InLobby());
 
-            AddStep("Set beatmap", () => Beatmap.Value = new DummyWorkingBeatmap(null, null)
+            AddStep("Set beatmap", () => Beatmap.Value = new DummyWorkingBeatmap(Audio, null)
             {
                 BeatmapInfo = { OnlineBeatmapID = hasOnlineId ? 1234 : (int?)null }
             });
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index 8080e94075..ca801cf745 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -19,7 +20,7 @@ namespace osu.Game.Beatmaps
     {
         private readonly TextureStore textures;
 
-        public DummyWorkingBeatmap(AudioManager audio, TextureStore textures)
+        public DummyWorkingBeatmap([NotNull] AudioManager audio, TextureStore textures)
             : base(new BeatmapInfo
             {
                 Metadata = new BeatmapMetadata
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 3e93ae2ccd..2aed46a1d0 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -321,15 +321,13 @@ namespace osu.Game.Overlays
         private void changeTrack()
         {
             CurrentTrack.Expire();
-            CurrentTrack = null;
+            CurrentTrack = new DrawableTrack(new TrackVirtual(1000));
 
             if (current != null)
-            {
                 CurrentTrack = new DrawableTrack(current.GetRealTrack());
-                CurrentTrack.Completed += () => onTrackCompleted(current);
 
-                AddInternal(CurrentTrack);
-            }
+            CurrentTrack.Completed += () => onTrackCompleted(current);
+            AddInternal(CurrentTrack);
         }
 
         private void onTrackCompleted(WorkingBeatmap workingBeatmap)

From d1765c8a45e3940974c35ec2c75366c14a96a4e1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 22:06:04 +0900
Subject: [PATCH 04132/10326] Fix using the wrong music controller instance

---
 .../Navigation/TestSceneScreenNavigation.cs    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index d2c71c1d17..0f06010a6a 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -60,13 +60,13 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("wait for player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
             AddUntilStep("wait for fail", () => player.HasFailed);
 
-            AddUntilStep("wait for track stop", () => !MusicController.IsPlaying);
-            AddAssert("Ensure time before preview point", () => MusicController.CurrentTrack.CurrentTime < beatmap().Metadata.PreviewTime);
+            AddUntilStep("wait for track stop", () => !Game.MusicController.IsPlaying);
+            AddAssert("Ensure time before preview point", () => Game.MusicController.CurrentTrack.CurrentTime < beatmap().Metadata.PreviewTime);
 
             pushEscape();
 
-            AddUntilStep("wait for track playing", () => MusicController.IsPlaying);
-            AddAssert("Ensure time wasn't reset to preview point", () => MusicController.CurrentTrack.CurrentTime < beatmap().Metadata.PreviewTime);
+            AddUntilStep("wait for track playing", () => Game.MusicController.IsPlaying);
+            AddAssert("Ensure time wasn't reset to preview point", () => Game.MusicController.CurrentTrack.CurrentTime < beatmap().Metadata.PreviewTime);
         }
 
         [Test]
@@ -76,11 +76,11 @@ namespace osu.Game.Tests.Visual.Navigation
 
             PushAndConfirm(() => songSelect = new TestSongSelect());
 
-            AddUntilStep("wait for no track", () => MusicController.CurrentTrack.IsDummyDevice);
+            AddUntilStep("wait for no track", () => Game.MusicController.CurrentTrack.IsDummyDevice);
 
             AddStep("return to menu", () => songSelect.Exit());
 
-            AddUntilStep("wait for track", () => MusicController.CurrentTrack.IsDummyDevice == false && MusicController.IsPlaying);
+            AddUntilStep("wait for track", () => Game.MusicController.CurrentTrack.IsDummyDevice == false && Game.MusicController.IsPlaying);
         }
 
         [Test]
@@ -135,12 +135,12 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("Wait for music controller", () => Game.MusicController.IsLoaded);
             AddStep("Seek close to end", () =>
             {
-                Game.MusicController.SeekTo(MusicController.CurrentTrack.Length - 1000);
-                MusicController.CurrentTrack.Completed += () => trackCompleted = true;
+                Game.MusicController.SeekTo(Game.MusicController.CurrentTrack.Length - 1000);
+                Game.MusicController.CurrentTrack.Completed += () => trackCompleted = true;
             });
 
             AddUntilStep("Track was completed", () => trackCompleted);
-            AddUntilStep("Track was restarted", () => MusicController.IsPlaying);
+            AddUntilStep("Track was restarted", () => Game.MusicController.IsPlaying);
         }
 
         private void pushEscape() =>

From e87f50f74f28ca8d5b5c6a0189b3ec2be21a1360 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 22:31:41 +0900
Subject: [PATCH 04133/10326] Rename method

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 2 +-
 osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs  | 2 +-
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs       | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs      | 2 +-
 osu.Game.Tests/WaveformTestBeatmap.cs                       | 2 +-
 osu.Game/Beatmaps/BeatmapManager.cs                         | 2 +-
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs          | 2 +-
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs                    | 2 +-
 osu.Game/Beatmaps/IWorkingBeatmap.cs                        | 5 +++++
 osu.Game/Beatmaps/WorkingBeatmap.cs                         | 4 ++--
 osu.Game/Overlays/MusicController.cs                        | 2 +-
 osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs         | 2 +-
 osu.Game/Screens/Menu/IntroScreen.cs                        | 2 +-
 osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs            | 2 +-
 osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs               | 2 +-
 osu.Game/Tests/Visual/OsuTestScene.cs                       | 2 +-
 16 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 30331e98d2..4a11e1785b 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
             protected override Texture GetBackground() => throw new NotImplementedException();
 
-            protected override Track GetTrack() => throw new NotImplementedException();
+            protected override Track GetBeatmapTrack() => throw new NotImplementedException();
         }
     }
 }
diff --git a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
index 40f6cecd9a..bb60ae73db 100644
--- a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Gameplay
             AddStep("create container", () =>
             {
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
-                Add(gcc = new GameplayClockContainer(working.GetRealTrack(), working, Array.Empty<Mod>(), 0));
+                Add(gcc = new GameplayClockContainer(working.GetTrack(), working, Array.Empty<Mod>(), 0));
             });
 
             AddStep("start track", () => gcc.Start());
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 720436fae4..360e7eccdc 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tests.Gameplay
             {
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
 
-                Add(gameplayContainer = new GameplayClockContainer(working.GetRealTrack(), working, Array.Empty<Mod>(), 0));
+                Add(gameplayContainer = new GameplayClockContainer(working.GetTrack(), working, Array.Empty<Mod>(), 0));
 
                 gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
                 {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index 68110d759c..58fd760fc3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             var working = CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
 
-            Child = gameplayClockContainer = new GameplayClockContainer(working.GetRealTrack(), working, Array.Empty<Mod>(), 0)
+            Child = gameplayClockContainer = new GameplayClockContainer(working.GetTrack(), working, Array.Empty<Mod>(), 0)
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index 90c91eb007..7dc5ce1d7f 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Tests
 
         protected override Waveform GetWaveform() => new Waveform(trackStore.GetStream(firstAudioFile));
 
-        protected override Track GetTrack() => trackStore.Get(firstAudioFile);
+        protected override Track GetBeatmapTrack() => trackStore.Get(firstAudioFile);
 
         private string firstAudioFile
         {
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index f22f41531a..e001185da9 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -476,7 +476,7 @@ namespace osu.Game.Beatmaps
 
             protected override IBeatmap GetBeatmap() => beatmap;
             protected override Texture GetBackground() => null;
-            protected override Track GetTrack() => null;
+            protected override Track GetBeatmapTrack() => null;
         }
     }
 
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index a54d46c1b1..f1289cd3aa 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            protected override Track GetTrack()
+            protected override Track GetBeatmapTrack()
             {
                 try
                 {
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index ca801cf745..af2a2ac250 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Beatmaps
 
         protected override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4");
 
-        protected override Track GetTrack() => GetVirtualTrack();
+        protected override Track GetBeatmapTrack() => GetVirtualTrack();
 
         private class DummyRulesetInfo : RulesetInfo
         {
diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 086b7502a2..e020625b99 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -54,5 +54,10 @@ namespace osu.Game.Beatmaps
         /// <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);
+
+        /// <summary>
+        /// Retrieves the <see cref="Track"/> which this <see cref="WorkingBeatmap"/> provides.
+        /// </summary>
+        Track GetTrack();
     }
 }
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 171201ca68..af6a67ad3f 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -249,9 +249,9 @@ namespace osu.Game.Beatmaps
         protected abstract Texture GetBackground();
         private readonly RecyclableLazy<Texture> background;
 
-        public Track GetRealTrack() => GetTrack() ?? GetVirtualTrack(1000);
+        public Track GetTrack() => GetBeatmapTrack() ?? GetVirtualTrack(1000);
 
-        protected abstract Track GetTrack();
+        protected abstract Track GetBeatmapTrack();
 
         public bool WaveformLoaded => waveform.IsResultAvailable;
         public Waveform Waveform => waveform.Value;
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 2aed46a1d0..cf420c3b91 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -324,7 +324,7 @@ namespace osu.Game.Overlays
             CurrentTrack = new DrawableTrack(new TrackVirtual(1000));
 
             if (current != null)
-                CurrentTrack = new DrawableTrack(current.GetRealTrack());
+                CurrentTrack = new DrawableTrack(current.GetTrack());
 
             CurrentTrack.Completed += () => onTrackCompleted(current);
             AddInternal(CurrentTrack);
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index fc3dd4c105..57b7ce6940 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Edit
 
             protected override Texture GetBackground() => throw new NotImplementedException();
 
-            protected override Track GetTrack() => throw new NotImplementedException();
+            protected override Track GetBeatmapTrack() => throw new NotImplementedException();
         }
     }
 }
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 7e327261ab..6e85abf7dc 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.Menu
                 if (setInfo != null)
                 {
                     initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-                    UsingThemedIntro = initialBeatmap.GetRealTrack().IsDummyDevice == false;
+                    UsingThemedIntro = initialBeatmap.GetTrack().IsDummyDevice == false;
                 }
 
                 return UsingThemedIntro;
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index 6ada632850..e492069c5e 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Tests.Beatmaps
 
             protected override Texture GetBackground() => throw new NotImplementedException();
 
-            protected override Track GetTrack() => throw new NotImplementedException();
+            protected override Track GetBeatmapTrack() => throw new NotImplementedException();
 
             protected override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
             {
diff --git a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
index ee04142035..d091da3206 100644
--- a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
@@ -35,6 +35,6 @@ namespace osu.Game.Tests.Beatmaps
 
         protected override Texture GetBackground() => null;
 
-        protected override Track GetTrack() => null;
+        protected override Track GetBeatmapTrack() => null;
     }
 }
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index b0d15bf442..756074c0b3 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -223,7 +223,7 @@ namespace osu.Game.Tests.Visual
                 store?.Dispose();
             }
 
-            protected override Track GetTrack() => track;
+            protected override Track GetBeatmapTrack() => track;
 
             public class TrackVirtualStore : AudioCollectionManager<Track>, ITrackStore
             {

From b8373e89b7e30e0370170f10bf16c1d7bb36b835 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 23:05:59 +0900
Subject: [PATCH 04134/10326] Move beatmap bind to BDL load()

---
 osu.Game/Overlays/MusicController.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index cf420c3b91..26df48171e 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -79,12 +79,9 @@ namespace osu.Game.Overlays
             managerRemoved.BindValueChanged(beatmapRemoved);
 
             beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets(IncludedDetails.Minimal, true).OrderBy(_ => RNG.Next()));
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
 
+            // Todo: These binds really shouldn't be here, but are unlikely to cause any issues for now.
+            // They are placed here for now since some tests rely on setting the beatmap _and_ their hierarchies inside their load(), which runs before the MusicController's load().
             beatmap.BindValueChanged(beatmapChanged, true);
             mods.BindValueChanged(_ => ResetTrackAdjustments(), true);
         }

From 2351701ade19e518b2d07f308af5237df2e7eedd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 23:08:51 +0900
Subject: [PATCH 04135/10326] Fix test not having a long enough track

---
 .../UserInterface/TestSceneNowPlayingOverlay.cs     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index cadecbbef0..c14a1ddbf2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
@@ -2,6 +2,7 @@
 // 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.Framework.Audio;
@@ -11,6 +12,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -20,8 +22,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private MusicController musicController = new MusicController();
 
-        private WorkingBeatmap currentBeatmap;
-
         private NowPlayingOverlay nowPlayingOverlay;
 
         private RulesetStore rulesets;
@@ -76,8 +76,13 @@ namespace osu.Game.Tests.Visual.UserInterface
                 }
             }).Wait(), 5);
 
-            AddStep(@"Next track", () => musicController.NextTrack());
-            AddStep("Store track", () => currentBeatmap = Beatmap.Value);
+            WorkingBeatmap currentBeatmap = null;
+
+            AddStep("import beatmap with track", () =>
+            {
+                var setWithTrack = manager.Import(TestResources.GetTestBeatmapForImport()).Result;
+                Beatmap.Value = currentBeatmap = manager.GetWorkingBeatmap(setWithTrack.Beatmaps.First());
+            });
 
             AddStep(@"Seek track to 6 second", () => musicController.SeekTo(6000));
             AddUntilStep(@"Wait for current time to update", () => musicController.CurrentTrack.CurrentTime > 5000);

From 87ce1e3558d598388c38cd078840d7148c95f0fd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 8 Aug 2020 00:58:04 +0900
Subject: [PATCH 04136/10326] Remove impossible null case (DummyWorkingBeatmap)

---
 osu.Game/Overlays/MusicController.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 26df48171e..c5ba82288c 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -318,12 +318,9 @@ namespace osu.Game.Overlays
         private void changeTrack()
         {
             CurrentTrack.Expire();
-            CurrentTrack = new DrawableTrack(new TrackVirtual(1000));
-
-            if (current != null)
-                CurrentTrack = new DrawableTrack(current.GetTrack());
-
+            CurrentTrack = new DrawableTrack(current.GetTrack());
             CurrentTrack.Completed += () => onTrackCompleted(current);
+
             AddInternal(CurrentTrack);
         }
 

From 7cf225520fdfb93bffc18fc84eed087aa29d7cea Mon Sep 17 00:00:00 2001
From: Sebastian Krajewski <mail@wieku.me>
Date: Sat, 8 Aug 2020 02:43:39 +0200
Subject: [PATCH 04137/10326] Change from BDL to Resolved

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index d4f27bf4aa..45c74da892 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -20,7 +20,8 @@ namespace osu.Game.Storyboards.Drawables
 
         private Sprite drawableSprite;
 
-        private TextureStore storyboardTextureStore;
+        [Resolved]
+        private TextureStore storyboardTextureStore { get; set; }
 
         private string texturePath;
 
@@ -121,7 +122,7 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
+        private void load(IBindable<WorkingBeatmap> beatmap)
         {
             InternalChild = drawableSprite = new Sprite
             {
@@ -129,8 +130,6 @@ namespace osu.Game.Storyboards.Drawables
                 Origin = Anchor.Centre
             };
 
-            storyboardTextureStore = textureStore;
-
             texturePath = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Sprite.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
 
             Sprite.ApplyTransforms(this);

From 1090137da3d46e76f2be85d26dc14a6696393a84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 Aug 2020 23:23:02 +0900
Subject: [PATCH 04138/10326] Adjust comment to read better
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/Skinning/SkinnableSound.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 8c18e83e92..7ee0b474de 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Skinning
         /// Defaults to false unless <see cref="Looping"/>.
         /// </summary>
         /// <remarks>
-        /// Can serve as an optimisation if it is known ahead-of-time that this behaviour will not negatively affect behaviour.
+        /// Can serve as an optimisation if it is known ahead-of-time that this behaviour is allowed in a given use case.
         /// </remarks>
         protected bool SkipPlayWhenZeroVolume => !Looping;
 

From ffb2e56a8d31e6b62c3715380967e5b63711b672 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 Aug 2020 23:25:52 +0900
Subject: [PATCH 04139/10326] Reverse direction of bool to make mental parsing
 easier

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

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 7739be693d..32f49367f0 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Skinning
         /// <remarks>
         /// Can serve as an optimisation if it is known ahead-of-time that this behaviour is allowed in a given use case.
         /// </remarks>
-        protected bool SkipPlayWhenZeroVolume => !Looping;
+        protected bool PlayWhenZeroVolume => Looping;
 
         private readonly AudioContainer<DrawableSample> samplesContainer;
 
@@ -98,7 +98,7 @@ namespace osu.Game.Skinning
         {
             samplesContainer.ForEach(c =>
             {
-                if (!SkipPlayWhenZeroVolume || c.AggregateVolume.Value > 0)
+                if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
                     c.Play();
             });
         }

From 9a09f97478f063384a03c0d35d23f359cc9d1353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 Aug 2020 21:21:30 +0200
Subject: [PATCH 04140/10326] Extract constant to avoid double initial value
 spec

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8f8128abfc..67283c843d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -50,7 +50,13 @@ namespace osu.Game.Screens.Play
 
         public override bool HideOverlaysOnEnter => true;
 
-        public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
+        private const OverlayActivation initial_overlay_activation_mode = OverlayActivation.UserTriggered;
+        public override OverlayActivation InitialOverlayActivationMode => initial_overlay_activation_mode;
+
+        /// <summary>
+        /// The current activation mode for overlays.
+        /// </summary>
+        protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(initial_overlay_activation_mode);
 
         /// <summary>
         /// Whether gameplay should pause when the game window focus is lost.
@@ -90,11 +96,6 @@ namespace osu.Game.Screens.Play
 
         private SkipOverlay skipOverlay;
 
-        /// <summary>
-        /// The current activation mode for overlays.
-        /// </summary>
-        protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.UserTriggered);
-
         protected ScoreProcessor ScoreProcessor { get; private set; }
 
         protected HealthProcessor HealthProcessor { get; private set; }

From a72a48624d82fb1f07264403e31f8744d0ae5ef8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 Aug 2020 05:16:08 +0300
Subject: [PATCH 04141/10326] Remove NewsPostDrawableDate

---
 .../Dashboard/Home/News/HomeNewsGroupPanel.cs | 69 +++++++++++--------
 .../Dashboard/Home/News/HomeNewsPanel.cs      | 34 ++++++---
 .../Home/News/HomeNewsPanelFooter.cs          |  6 +-
 .../Home/News/NewsPostDrawableDate.cs         | 37 ----------
 4 files changed, 67 insertions(+), 79 deletions(-)
 delete mode 100644 osu.Game/Overlays/Dashboard/Home/News/NewsPostDrawableDate.cs

diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs
index cd1c5393c5..48ecaf57dc 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Game.Graphics;
 using osu.Game.Online.API.Requests.Responses;
 
@@ -44,41 +45,51 @@ namespace osu.Game.Overlays.Dashboard.Home.News
 
             protected override Drawable CreateContent(APINewsPost post) => new NewsTitleLink(post);
 
-            protected override NewsPostDrawableDate CreateDate(DateTimeOffset date) => new Date(date);
+            protected override Drawable CreateDate(DateTimeOffset date) => new Date(date);
+        }
 
-            private class Date : NewsPostDrawableDate
+        private class Date : CompositeDrawable, IHasCustomTooltip
+        {
+            public ITooltip GetCustomTooltip() => new DateTooltip();
+
+            public object TooltipContent => date;
+
+            private readonly DateTimeOffset date;
+
+            public Date(DateTimeOffset date)
             {
-                public Date(DateTimeOffset date)
-                    : base(date)
+                this.date = date;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                TextFlowContainer textFlow;
+
+                AutoSizeAxes = Axes.Both;
+                Anchor = Anchor.TopRight;
+                Origin = Anchor.TopRight;
+                InternalChild = textFlow = new TextFlowContainer(t =>
                 {
-                }
-
-                protected override Drawable CreateDate(DateTimeOffset date, OverlayColourProvider colourProvider)
+                    t.Colour = colourProvider.Light1;
+                })
                 {
-                    var drawableDate = new TextFlowContainer(t =>
-                    {
-                        t.Colour = colourProvider.Light1;
-                    })
-                    {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Margin = new MarginPadding { Vertical = 5 }
-                    };
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Margin = new MarginPadding { Vertical = 5 }
+                };
 
-                    drawableDate.AddText($"{date:dd} ", t =>
-                    {
-                        t.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold);
-                    });
+                textFlow.AddText($"{date:dd}", t =>
+                {
+                    t.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold);
+                });
 
-                    drawableDate.AddText($"{date:MMM}", t =>
-                    {
-                        t.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Regular);
-                    });
-
-                    return drawableDate;
-                }
+                textFlow.AddText($"{date: MMM}", t =>
+                {
+                    t.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Regular);
+                });
             }
         }
     }
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
index 3548b7c88d..786c376fc9 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -84,14 +85,14 @@ namespace osu.Game.Overlays.Dashboard.Home.News
 
         private class Footer : HomeNewsPanelFooter
         {
-            protected override float BarPading => 10;
+            protected override float BarPadding => 10;
 
             public Footer(APINewsPost post)
                 : base(post)
             {
             }
 
-            protected override NewsPostDrawableDate CreateDate(DateTimeOffset date) => new Date(date);
+            protected override Drawable CreateDate(DateTimeOffset date) => new Date(date);
 
             protected override Drawable CreateContent(APINewsPost post) => new FillFlowContainer
             {
@@ -114,16 +115,29 @@ namespace osu.Game.Overlays.Dashboard.Home.News
                     }
                 }
             };
+        }
 
-            private class Date : NewsPostDrawableDate
+        private class Date : CompositeDrawable, IHasCustomTooltip
+        {
+            public ITooltip GetCustomTooltip() => new DateTooltip();
+
+            public object TooltipContent => date;
+
+            private readonly DateTimeOffset date;
+
+            public Date(DateTimeOffset date)
             {
-                public Date(DateTimeOffset date)
-                    : base(date)
-                {
-                    Margin = new MarginPadding { Top = 10 };
-                }
+                this.date = date;
+            }
 
-                protected override Drawable CreateDate(DateTimeOffset date, OverlayColourProvider colourProvider) => new FillFlowContainer
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                AutoSizeAxes = Axes.Both;
+                Anchor = Anchor.TopRight;
+                Origin = Anchor.TopRight;
+                Margin = new MarginPadding { Top = 10 };
+                InternalChild = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
@@ -137,7 +151,7 @@ namespace osu.Game.Overlays.Dashboard.Home.News
                             Origin = Anchor.TopRight,
                             Font = OsuFont.GetFont(weight: FontWeight.Bold), // using Bold since there is no 800 weight alternative
                             Colour = colourProvider.Light1,
-                            Text = $"{date: dd}"
+                            Text = $"{date:dd}"
                         },
                         new TextFlowContainer(f =>
                         {
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs
index 591f53ac4a..3e3301b603 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Dashboard.Home.News
 {
     public abstract class HomeNewsPanelFooter : CompositeDrawable
     {
-        protected virtual float BarPading { get; } = 0;
+        protected virtual float BarPadding { get; } = 0;
 
         private readonly APINewsPost post;
 
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Dashboard.Home.News
                         new Container
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Vertical = BarPading },
+                            Padding = new MarginPadding { Vertical = BarPadding },
                             Child = new Box
                             {
                                 Anchor = Anchor.TopCentre,
@@ -72,7 +72,7 @@ namespace osu.Game.Overlays.Dashboard.Home.News
             };
         }
 
-        protected abstract NewsPostDrawableDate CreateDate(DateTimeOffset date);
+        protected abstract Drawable CreateDate(DateTimeOffset date);
 
         protected abstract Drawable CreateContent(APINewsPost post);
     }
diff --git a/osu.Game/Overlays/Dashboard/Home/News/NewsPostDrawableDate.cs b/osu.Game/Overlays/Dashboard/Home/News/NewsPostDrawableDate.cs
deleted file mode 100644
index 8ba58e27a7..0000000000
--- a/osu.Game/Overlays/Dashboard/Home/News/NewsPostDrawableDate.cs
+++ /dev/null
@@ -1,37 +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.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
-using osu.Game.Graphics;
-using osu.Framework.Graphics;
-
-namespace osu.Game.Overlays.Dashboard.Home.News
-{
-    public abstract class NewsPostDrawableDate : CompositeDrawable, IHasCustomTooltip
-    {
-        public ITooltip GetCustomTooltip() => new DateTooltip();
-
-        public object TooltipContent => date;
-
-        private readonly DateTimeOffset date;
-
-        protected NewsPostDrawableDate(DateTimeOffset date)
-        {
-            this.date = date;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            AutoSizeAxes = Axes.Both;
-            Anchor = Anchor.TopRight;
-            Origin = Anchor.TopRight;
-            InternalChild = CreateDate(date, colourProvider);
-        }
-
-        protected abstract Drawable CreateDate(DateTimeOffset date, OverlayColourProvider colourProvider);
-    }
-}

From d8f89306917a66833db4d1587f03efb295aab3de Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 Aug 2020 05:28:43 +0300
Subject: [PATCH 04142/10326] Remove HomeNewsPanelFooter

---
 .../Dashboard/Home/News/CollapsedNewsPanel.cs | 115 ++++++++++++++++++
 .../Dashboard/Home/News/HomeNewsGroupPanel.cs |  60 ---------
 .../Dashboard/Home/News/HomeNewsPanel.cs      |  95 +++++++++------
 .../Home/News/HomeNewsPanelFooter.cs          |  79 ------------
 4 files changed, 174 insertions(+), 175 deletions(-)
 create mode 100644 osu.Game/Overlays/Dashboard/Home/News/CollapsedNewsPanel.cs
 delete mode 100644 osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs

diff --git a/osu.Game/Overlays/Dashboard/Home/News/CollapsedNewsPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/CollapsedNewsPanel.cs
new file mode 100644
index 0000000000..7dbc6a8f87
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/Home/News/CollapsedNewsPanel.cs
@@ -0,0 +1,115 @@
+// Copyright (c) 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.Online.API.Requests.Responses;
+
+namespace osu.Game.Overlays.Dashboard.Home.News
+{
+    public class CollapsedNewsPanel : CompositeDrawable
+    {
+        private readonly APINewsPost post;
+
+        public CollapsedNewsPanel(APINewsPost post)
+        {
+            this.post = post;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                ColumnDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.Absolute, size: 60),
+                    new Dimension(GridSizeMode.Absolute, size: 20),
+                    new Dimension()
+                },
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        new Date(post.PublishedAt),
+                        new Box
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopRight,
+                            Width = 1,
+                            RelativeSizeAxes = Axes.Y,
+                            Colour = colourProvider.Light1
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Padding = new MarginPadding { Right = 10 },
+                            Child = new NewsTitleLink(post)
+                        }
+                    }
+                }
+            };
+        }
+
+        private class Date : CompositeDrawable, IHasCustomTooltip
+        {
+            public ITooltip GetCustomTooltip() => new DateTooltip();
+
+            public object TooltipContent => date;
+
+            private readonly DateTimeOffset date;
+
+            public Date(DateTimeOffset date)
+            {
+                this.date = date;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                TextFlowContainer textFlow;
+
+                AutoSizeAxes = Axes.Both;
+                Anchor = Anchor.TopRight;
+                Origin = Anchor.TopRight;
+                InternalChild = textFlow = new TextFlowContainer(t =>
+                {
+                    t.Colour = colourProvider.Light1;
+                })
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Margin = new MarginPadding { Vertical = 5 }
+                };
+
+                textFlow.AddText($"{date:dd}", t =>
+                {
+                    t.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold);
+                });
+
+                textFlow.AddText($"{date: MMM}", t =>
+                {
+                    t.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Regular);
+                });
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs
index 48ecaf57dc..6007f1408b 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs
@@ -1,14 +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.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
-using osu.Game.Graphics;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Dashboard.Home.News
@@ -35,62 +32,5 @@ namespace osu.Game.Overlays.Dashboard.Home.News
                 Children = posts.Select(p => new CollapsedNewsPanel(p)).ToArray()
             };
         }
-
-        private class CollapsedNewsPanel : HomeNewsPanelFooter
-        {
-            public CollapsedNewsPanel(APINewsPost post)
-                : base(post)
-            {
-            }
-
-            protected override Drawable CreateContent(APINewsPost post) => new NewsTitleLink(post);
-
-            protected override Drawable CreateDate(DateTimeOffset date) => new Date(date);
-        }
-
-        private class Date : CompositeDrawable, IHasCustomTooltip
-        {
-            public ITooltip GetCustomTooltip() => new DateTooltip();
-
-            public object TooltipContent => date;
-
-            private readonly DateTimeOffset date;
-
-            public Date(DateTimeOffset date)
-            {
-                this.date = date;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider)
-            {
-                TextFlowContainer textFlow;
-
-                AutoSizeAxes = Axes.Both;
-                Anchor = Anchor.TopRight;
-                Origin = Anchor.TopRight;
-                InternalChild = textFlow = new TextFlowContainer(t =>
-                {
-                    t.Colour = colourProvider.Light1;
-                })
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
-                    Margin = new MarginPadding { Vertical = 5 }
-                };
-
-                textFlow.AddText($"{date:dd}", t =>
-                {
-                    t.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold);
-                });
-
-                textFlow.AddText($"{date: MMM}", t =>
-                {
-                    t.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Regular);
-                });
-            }
-        }
     }
 }
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
index 786c376fc9..ca56c33315 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
@@ -6,6 +6,7 @@ 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.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -27,7 +28,7 @@ namespace osu.Game.Overlays.Dashboard.Home.News
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OverlayColourProvider colourProvider)
         {
             Children = new Drawable[]
             {
@@ -39,7 +40,63 @@ namespace osu.Game.Overlays.Dashboard.Home.News
                     Children = new Drawable[]
                     {
                         new ClickableNewsBackground(post),
-                        new Footer(post)
+                        new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            RowDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.AutoSize)
+                            },
+                            ColumnDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.Absolute, size: 60),
+                                new Dimension(GridSizeMode.Absolute, size: 20),
+                                new Dimension()
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    new Date(post.PublishedAt),
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Padding = new MarginPadding { Vertical = 10 },
+                                        Child = new Box
+                                        {
+                                            Anchor = Anchor.TopCentre,
+                                            Origin = Anchor.TopRight,
+                                            Width = 1,
+                                            RelativeSizeAxes = Axes.Y,
+                                            Colour = colourProvider.Light1
+                                        }
+                                    },
+                                    new FillFlowContainer
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Margin = new MarginPadding { Top = 5, Bottom = 10 },
+                                        Padding = new MarginPadding { Right = 10 },
+                                        Spacing = new Vector2(0, 10),
+                                        Direction = FillDirection.Vertical,
+                                        Children = new Drawable[]
+                                        {
+                                            new NewsTitleLink(post),
+                                            new TextFlowContainer(f =>
+                                            {
+                                                f.Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular);
+                                            })
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                AutoSizeAxes = Axes.Y,
+                                                Text = post.Preview
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             };
@@ -83,40 +140,6 @@ namespace osu.Game.Overlays.Dashboard.Home.News
             }
         }
 
-        private class Footer : HomeNewsPanelFooter
-        {
-            protected override float BarPadding => 10;
-
-            public Footer(APINewsPost post)
-                : base(post)
-            {
-            }
-
-            protected override Drawable CreateDate(DateTimeOffset date) => new Date(date);
-
-            protected override Drawable CreateContent(APINewsPost post) => new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Margin = new MarginPadding { Top = 5, Bottom = 10 },
-                Spacing = new Vector2(0, 10),
-                Direction = FillDirection.Vertical,
-                Children = new Drawable[]
-                {
-                    new NewsTitleLink(post),
-                    new TextFlowContainer(f =>
-                    {
-                        f.Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular);
-                    })
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Text = post.Preview
-                    }
-                }
-            };
-        }
-
         private class Date : CompositeDrawable, IHasCustomTooltip
         {
             public ITooltip GetCustomTooltip() => new DateTooltip();
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs b/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs
deleted file mode 100644
index 3e3301b603..0000000000
--- a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanelFooter.cs
+++ /dev/null
@@ -1,79 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Online.API.Requests.Responses;
-
-namespace osu.Game.Overlays.Dashboard.Home.News
-{
-    public abstract class HomeNewsPanelFooter : CompositeDrawable
-    {
-        protected virtual float BarPadding { get; } = 0;
-
-        private readonly APINewsPost post;
-
-        protected HomeNewsPanelFooter(APINewsPost post)
-        {
-            this.post = post;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            InternalChild = new GridContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                RowDimensions = new[]
-                {
-                    new Dimension(GridSizeMode.AutoSize)
-                },
-                ColumnDimensions = new[]
-                {
-                    new Dimension(GridSizeMode.Absolute, size: 60),
-                    new Dimension(GridSizeMode.Absolute, size: 20),
-                    new Dimension()
-                },
-                Content = new[]
-                {
-                    new Drawable[]
-                    {
-                        CreateDate(post.PublishedAt),
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Vertical = BarPadding },
-                            Child = new Box
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopRight,
-                                Width = 1,
-                                RelativeSizeAxes = Axes.Y,
-                                Colour = colourProvider.Light1
-                            }
-                        },
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Padding = new MarginPadding { Right = 10 },
-                            Child = CreateContent(post)
-                        }
-                    }
-                }
-            };
-        }
-
-        protected abstract Drawable CreateDate(DateTimeOffset date);
-
-        protected abstract Drawable CreateContent(APINewsPost post);
-    }
-}

From 3a97ee4712557862fba5cecb1d625ae684d2fbee Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Sun, 9 Aug 2020 16:16:01 -0700
Subject: [PATCH 04143/10326] Context menu for duplicating multi rooms

---
 osu.Game/Online/Multiplayer/Room.cs           | 50 +++++++++++--------
 .../Multi/Lounge/Components/DrawableRoom.cs   | 11 +++-
 .../Multi/Lounge/Components/RoomsContainer.cs | 15 ++++--
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   | 15 +++++-
 osu.Game/Screens/Multi/Multiplayer.cs         |  4 +-
 5 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 34cf158442..01d9446bf6 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -103,38 +103,48 @@ namespace osu.Game.Online.Multiplayer
         [JsonIgnore]
         public readonly Bindable<int> Position = new Bindable<int>(-1);
 
-        public void CopyFrom(Room other)
+        /// <summary>
+        /// Copies the properties from another <see cref="Room"/> to this room.
+        /// </summary>
+        /// <param name="other">The room to copy</param>
+        /// <param name="duplicate">Whether the copy should exclude information unique to a specific room (i.e. when duplicating a room)</param>
+        public void CopyFrom(Room other, bool duplicate = false)
         {
-            RoomID.Value = other.RoomID.Value;
+            if (!duplicate)
+            {
+                RoomID.Value = other.RoomID.Value;
+
+                if (other.Host.Value != null && Host.Value?.Id != other.Host.Value.Id)
+                    Host.Value = other.Host.Value;
+
+                ChannelId.Value = other.ChannelId.Value;
+                Status.Value = other.Status.Value;
+                ParticipantCount.Value = other.ParticipantCount.Value;
+                EndDate.Value = other.EndDate.Value;
+
+                if (DateTimeOffset.Now >= EndDate.Value)
+                    Status.Value = new RoomStatusEnded();
+
+                if (!RecentParticipants.SequenceEqual(other.RecentParticipants))
+                {
+                    RecentParticipants.Clear();
+                    RecentParticipants.AddRange(other.RecentParticipants);
+                }
+
+                Position.Value = other.Position.Value;
+            }
+
             Name.Value = other.Name.Value;
 
-            if (other.Host.Value != null && Host.Value?.Id != other.Host.Value.Id)
-                Host.Value = other.Host.Value;
-
-            ChannelId.Value = other.ChannelId.Value;
-            Status.Value = other.Status.Value;
             Availability.Value = other.Availability.Value;
             Type.Value = other.Type.Value;
             MaxParticipants.Value = other.MaxParticipants.Value;
-            ParticipantCount.Value = other.ParticipantCount.Value;
-            EndDate.Value = other.EndDate.Value;
-
-            if (DateTimeOffset.Now >= EndDate.Value)
-                Status.Value = new RoomStatusEnded();
 
             if (!Playlist.SequenceEqual(other.Playlist))
             {
                 Playlist.Clear();
                 Playlist.AddRange(other.Playlist);
             }
-
-            if (!RecentParticipants.SequenceEqual(other.RecentParticipants))
-            {
-                RecentParticipants.Clear();
-                RecentParticipants.AddRange(other.RecentParticipants);
-            }
-
-            Position.Value = other.Position.Value;
         }
 
         public bool ShouldSerializeRoomID() => false;
diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index 8dd1b239e8..64fbae2503 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -21,10 +21,12 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 using osuTK.Graphics;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
-    public class DrawableRoom : OsuClickableContainer, IStateful<SelectionState>, IFilterable
+    public class DrawableRoom : OsuClickableContainer, IStateful<SelectionState>, IFilterable, IHasContextMenu
     {
         public const float SELECTION_BORDER_WIDTH = 4;
         private const float corner_radius = 5;
@@ -36,6 +38,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         public event Action<SelectionState> StateChanged;
 
+        public Action<Room> DuplicateRoom;
+
         private readonly Box selectionBox;
         private CachedModelDependencyContainer<Room> dependencies;
 
@@ -232,5 +236,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                 Current = name;
             }
         }
+
+        public MenuItem[] ContextMenuItems => new MenuItem[]
+        {
+            new OsuMenuItem("Duplicate", MenuItemType.Standard, () => DuplicateRoom?.Invoke(Room))
+        };
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index 447c99039a..f112dd80ee 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.Multiplayer;
 using osuTK;
+using osu.Game.Graphics.Cursor;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
@@ -37,17 +38,24 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         [Resolved]
         private IRoomManager roomManager { get; set; }
 
+        public Action<Room> DuplicateRoom;
+
         public RoomsContainer()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChild = roomFlow = new FillFlowContainer<DrawableRoom>
+            InternalChild = new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(2),
+                Child = roomFlow = new FillFlowContainer<DrawableRoom>
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(2),
+                }
             };
         }
 
@@ -88,6 +96,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             {
                 roomFlow.Add(new DrawableRoom(room)
                 {
+                    DuplicateRoom = DuplicateRoom,
                     Action = () =>
                     {
                         if (room == selectedRoom.Value)
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index ff7d56a95b..5d68386398 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -62,7 +62,18 @@ namespace osu.Game.Screens.Multi.Lounge
                                     RelativeSizeAxes = Axes.Both,
                                     ScrollbarOverlapsContent = false,
                                     Padding = new MarginPadding(10),
-                                    Child = roomsContainer = new RoomsContainer { JoinRequested = joinRequested }
+                                    Child = roomsContainer = new RoomsContainer
+                                    {
+                                        JoinRequested = joinRequested,
+                                        DuplicateRoom = room =>
+                                        {
+                                            Room newRoom = new Room();
+                                            newRoom.CopyFrom(room, true);
+                                            newRoom.Name.Value = $"Copy of {room.Name.Value}";
+
+                                            Open(newRoom);
+                                        }
+                                    }
                                 },
                                 loadingLayer = new LoadingLayer(roomsContainer),
                             }
@@ -126,7 +137,7 @@ namespace osu.Game.Screens.Multi.Lounge
             if (selectedRoom.Value?.RoomID.Value == null)
                 selectedRoom.Value = new Room();
 
-            music.EnsurePlayingSomething();
+            music?.EnsurePlayingSomething();
 
             onReturning();
         }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 4912df17b1..cdaeebefb7 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Multi
         [Cached]
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private MusicController music { get; set; }
 
         [Cached(Type = typeof(IRoomManager))]
@@ -350,7 +350,7 @@ namespace osu.Game.Screens.Multi
                     track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
                     track.Looping = true;
 
-                    music.EnsurePlayingSomething();
+                    music?.EnsurePlayingSomething();
                 }
             }
             else

From 78692dc684e4efa337cdbfc12b02caa2eff6a821 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 10 Aug 2020 05:21:10 +0200
Subject: [PATCH 04144/10326] Initial commit

---
 osu.Game/Beatmaps/BeatmapManager.cs           |  6 +++-
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 33 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b4b341634c..06acd4e9f2 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -26,6 +26,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Skinning;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
 namespace osu.Game.Beatmaps
@@ -201,7 +202,10 @@ namespace osu.Game.Beatmaps
             using (var stream = new MemoryStream())
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                    new LegacyBeatmapEncoder(beatmapContent).Encode(sw);
+                {
+                    var skin = new LegacyBeatmapSkin(info, Files.Store, audioManager);
+                    new LegacyBeatmapEncoder(beatmapContent, skin).Encode(sw);
+                }
 
                 stream.Seek(0, SeekOrigin.Begin);
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 57555cce90..8c96e59f30 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Beatmaps.Formats
@@ -22,10 +23,12 @@ namespace osu.Game.Beatmaps.Formats
         public const int LATEST_VERSION = 128;
 
         private readonly IBeatmap beatmap;
+        private readonly LegacyBeatmapSkin beatmapSkin;
 
-        public LegacyBeatmapEncoder(IBeatmap beatmap)
+        public LegacyBeatmapEncoder(IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin = null)
         {
             this.beatmap = beatmap;
+            this.beatmapSkin = beatmapSkin;
 
             if (beatmap.BeatmapInfo.RulesetID < 0 || beatmap.BeatmapInfo.RulesetID > 3)
                 throw new ArgumentException("Only beatmaps in the osu, taiko, catch, or mania rulesets can be encoded to the legacy beatmap format.", nameof(beatmap));
@@ -53,6 +56,9 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine();
             handleControlPoints(writer);
 
+            writer.WriteLine();
+            handleComboColours(writer);
+
             writer.WriteLine();
             handleHitObjects(writer);
         }
@@ -196,6 +202,31 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
+        private void handleComboColours(TextWriter writer)
+        {
+            if (beatmapSkin == null)
+                return;
+
+            var colours = beatmapSkin.Configuration.ComboColours;
+
+            if (colours.Count == 0)
+                return;
+
+            writer.WriteLine("[Colours]");
+
+            for (var i = 0; i < colours.Count; i++)
+            {
+                var comboColour = colours[i];
+
+                var r = (byte)(comboColour.R * byte.MaxValue);
+                var g = (byte)(comboColour.G * byte.MaxValue);
+                var b = (byte)(comboColour.B * byte.MaxValue);
+                var a = (byte)(comboColour.A * byte.MaxValue);
+
+                writer.WriteLine($"Combo{i}: {r},{g},{b},{a}");
+            }
+        }
+
         private void handleHitObjects(TextWriter writer)
         {
             if (beatmap.HitObjects.Count == 0)

From 1f84e541518a29d0b514f99b9ce8830b68daf68e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Aug 2020 20:16:16 +0900
Subject: [PATCH 04145/10326] Improve messaging when timeshift token retrieval
 fails

Obviously not a final solution, but should better help self-compiling
(or unofficial package) users better understand why this is happening.
---
 osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index da082692d7..79b4b04722 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Multi.Play
             {
                 failed = true;
 
-                Logger.Error(e, "Failed to retrieve a score submission token.");
+                Logger.Error(e, "Failed to retrieve a score submission token.\n\nThis may happen if you are not running an official release of osu! (ie. you are self-compiling).");
 
                 Schedule(() =>
                 {

From 730d13fda6f08a6976c30139ab32d908b78eadc8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Aug 2020 20:48:04 +0900
Subject: [PATCH 04146/10326] Always show newly presented overlay at front

This feels much better. Does not change order if the overlay to be shown
is not yet completely hidden.

- Closes #9815.
---
 osu.Game/OsuGame.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index b5752214bd..623c677991 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -702,6 +702,9 @@ namespace osu.Game
                     if (state.NewValue == Visibility.Hidden) return;
 
                     singleDisplayOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
+
+                    if (!overlay.IsPresent)
+                        overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime);
                 };
             }
 

From d7de8b2916af35ebd843b08c6f2a3c0d8ad788a6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Aug 2020 17:17:07 +0000
Subject: [PATCH 04147/10326] Bump Microsoft.NET.Test.Sdk from 16.6.1 to 16.7.0

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.6.1 to 16.7.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.6.1...v16.7.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 7c0b73e8c3..f9d56dfa78 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.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 972cbec4a2..ed00ed0b4c 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.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 d6a68abaf2..f3837ea6b1 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.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 ada7ac5d74..e896606ee8 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.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 4b0506d818..d767973528 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.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 f256b8e4e9..95f5deb2cc 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.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>

From 61f1c4fe62d5d4c52fa98ee2895af00229c9748d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 10 Aug 2020 19:51:00 +0200
Subject: [PATCH 04148/10326] Extract replay-transforming helper test method

---
 .../TestSceneSpinnerRotation.cs               | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index b46964e8b7..816c0c38d9 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -121,19 +121,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestRotationDirection([Values(true, false)] bool clockwise)
         {
             if (clockwise)
-            {
-                AddStep("flip replay", () =>
-                {
-                    var drawableRuleset = this.ChildrenOfType<DrawableOsuRuleset>().Single();
-                    var score = drawableRuleset.ReplayScore;
-                    var scoreWithFlippedReplay = new Score
-                    {
-                        ScoreInfo = score.ScoreInfo,
-                        Replay = flipReplay(score.Replay)
-                    };
-                    drawableRuleset.SetReplayScore(scoreWithFlippedReplay);
-                });
-            }
+                transformReplay(flip);
 
             addSeekStep(5000);
 
@@ -141,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("spinner symbol direction correct", () => clockwise ? spinnerSymbol.Rotation > 0 : spinnerSymbol.Rotation < 0);
         }
 
-        private Replay flipReplay(Replay scoreReplay) => new Replay
+        private Replay flip(Replay scoreReplay) => new Replay
         {
             Frames = scoreReplay
                      .Frames
@@ -203,6 +191,18 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time, Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
         }
 
+        private void transformReplay(Func<Replay, Replay> replayTransformation) => AddStep("set replay", () =>
+        {
+            var drawableRuleset = this.ChildrenOfType<DrawableOsuRuleset>().Single();
+            var score = drawableRuleset.ReplayScore;
+            var transformedScore = new Score
+            {
+                ScoreInfo = score.ScoreInfo,
+                Replay = replayTransformation.Invoke(score.Replay)
+            };
+            drawableRuleset.SetReplayScore(transformedScore);
+        });
+
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new Beatmap
         {
             HitObjects = new List<HitObject>

From 052bb06c910e3618b8cc83badeb41fa0b71c7f1f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 10 Aug 2020 20:13:50 +0200
Subject: [PATCH 04149/10326] Add ability to open overlays during gameplay
 breaks.

---
 .../Visual/Gameplay/TestSceneOverlayActivation.cs     | 11 +++++++++++
 osu.Game/Screens/Play/Player.cs                       |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
index 03e1337125..7fd5158515 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.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 NUnit.Framework;
 using osu.Game.Configuration;
 using osu.Game.Overlays;
@@ -47,6 +48,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("activation mode is user triggered", () => testPlayer.OverlayActivationMode == OverlayActivation.UserTriggered);
         }
 
+        [Test]
+        public void TestGameplayOverlayActivationBreaks()
+        {
+            AddAssert("activation mode is disabled", () => testPlayer.OverlayActivationMode == OverlayActivation.Disabled);
+            AddStep("seek to break", () => testPlayer.GameplayClockContainer.Seek(Beatmap.Value.Beatmap.Breaks.First().StartTime));
+            AddUntilStep("activation mode is user triggered", () => testPlayer.OverlayActivationMode == OverlayActivation.UserTriggered);
+            AddStep("seek to break end", () => testPlayer.GameplayClockContainer.Seek(Beatmap.Value.Beatmap.Breaks.First().EndTime));
+            AddUntilStep("activation mode is disabled", () => testPlayer.OverlayActivationMode == OverlayActivation.Disabled);
+        }
+
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => testPlayer = new OverlayTestPlayer();
 
         private class OverlayTestPlayer : TestPlayer
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 67283c843d..fba35af29e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -215,6 +215,7 @@ namespace osu.Game.Screens.Play
             gameplayOverlaysDisabled.BindValueChanged(_ => updateOverlayActivationMode());
             DrawableRuleset.IsPaused.BindValueChanged(_ => updateOverlayActivationMode());
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateOverlayActivationMode());
+            breakTracker.IsBreakTime.BindValueChanged(_ => updateOverlayActivationMode());
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
@@ -362,7 +363,7 @@ namespace osu.Game.Screens.Play
 
         private void updateOverlayActivationMode()
         {
-            bool canTriggerOverlays = DrawableRuleset.IsPaused.Value || !gameplayOverlaysDisabled.Value;
+            bool canTriggerOverlays = DrawableRuleset.IsPaused.Value || breakTracker.IsBreakTime.Value || !gameplayOverlaysDisabled.Value;
 
             if (DrawableRuleset.HasReplayLoaded.Value || canTriggerOverlays)
                 OverlayActivationMode.Value = OverlayActivation.UserTriggered;

From f74e162bbc90e5c32be17cc4231571a960fc482b Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 10 Aug 2020 20:27:42 +0200
Subject: [PATCH 04150/10326] Fix overlay activation mode being updated when
 player is not current screen.

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index fba35af29e..2ecddf0f23 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -363,6 +363,9 @@ namespace osu.Game.Screens.Play
 
         private void updateOverlayActivationMode()
         {
+            if (!this.IsCurrentScreen())
+                return;
+
             bool canTriggerOverlays = DrawableRuleset.IsPaused.Value || breakTracker.IsBreakTime.Value || !gameplayOverlaysDisabled.Value;
 
             if (DrawableRuleset.HasReplayLoaded.Value || canTriggerOverlays)

From 5d63b5f6a5be7657a75024448b44c6ed214bf7b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 10 Aug 2020 20:04:14 +0200
Subject: [PATCH 04151/10326] Add failing test cases

---
 .../TestSceneSpinnerRotation.cs               | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 816c0c38d9..b6f4efc24c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
@@ -184,6 +185,49 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpmCounter.SpinsPerMinute, estimatedSpm, 1.0));
         }
 
+        [TestCase(0.5)]
+        [TestCase(2.0)]
+        public void TestSpinUnaffectedByClockRate(double rate)
+        {
+            double expectedProgress = 0;
+            double expectedSpm = 0;
+
+            addSeekStep(1000);
+            AddStep("retrieve spinner state", () =>
+            {
+                expectedProgress = drawableSpinner.Progress;
+                expectedSpm = drawableSpinner.SpmCounter.SpinsPerMinute;
+            });
+
+            addSeekStep(0);
+
+            AddStep("adjust track rate", () => track.AddAdjustment(AdjustableProperty.Tempo, new BindableDouble(rate)));
+            // autoplay replay frames use track time;
+            // if a spin takes 1000ms in track time and we're playing with a 2x rate adjustment, the spin will take 500ms of *real* time.
+            // therefore we need to apply the rate adjustment to the replay itself to change from track time to real time,
+            // as real time is what we care about for spinners
+            // (so we're making the spin take 1000ms in real time *always*, regardless of the track clock's rate).
+            transformReplay(replay => applyRateAdjustment(replay, rate));
+
+            addSeekStep(1000);
+            AddAssert("progress almost same", () => Precision.AlmostEquals(expectedProgress, drawableSpinner.Progress, 0.05));
+            AddAssert("spm almost same", () => Precision.AlmostEquals(expectedSpm, drawableSpinner.SpmCounter.SpinsPerMinute, 2.0));
+        }
+
+        private Replay applyRateAdjustment(Replay scoreReplay, double rate) => new Replay
+        {
+            Frames = scoreReplay
+                     .Frames
+                     .Cast<OsuReplayFrame>()
+                     .Select(replayFrame =>
+                     {
+                         var adjustedTime = replayFrame.Time * rate;
+                         return new OsuReplayFrame(adjustedTime, replayFrame.Position, replayFrame.Actions.ToArray());
+                     })
+                     .Cast<ReplayFrame>()
+                     .ToList()
+        };
+
         private void addSeekStep(double time)
         {
             AddStep($"seek to {time}", () => track.Seek(time));

From cca78235d5e9c0028852563329802f1d026da6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 10 Aug 2020 22:17:47 +0200
Subject: [PATCH 04152/10326] Replace CumulativeRotation with
 RateAdjustedRotation

---
 .../TestSceneSpinnerRotation.cs               | 12 +++++------
 .../Objects/Drawables/DrawableSpinner.cs      |  6 +++---
 .../Drawables/Pieces/DefaultSpinnerDisc.cs    |  2 +-
 .../Pieces/SpinnerRotationTracker.cs          | 21 +++++++++++++++----
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index b6f4efc24c..69857f8ef9 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -70,11 +70,11 @@ namespace osu.Game.Rulesets.Osu.Tests
                 trackerRotationTolerance = Math.Abs(drawableSpinner.RotationTracker.Rotation * 0.1f);
             });
             AddAssert("is disc rotation not almost 0", () => !Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, 0, 100));
-            AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, 0, 100));
+            AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.RotationTracker.RateAdjustedRotation, 0, 100));
 
             addSeekStep(0);
             AddAssert("is disc rotation almost 0", () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, 0, trackerRotationTolerance));
-            AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, 0, 100));
+            AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.RotationTracker.RateAdjustedRotation, 0, 100));
         }
 
         [Test]
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 finalSpinnerSymbolRotation = spinnerSymbol.Rotation;
                 spinnerSymbolRotationTolerance = Math.Abs(finalSpinnerSymbolRotation * 0.05f);
             });
-            AddStep("retrieve cumulative disc rotation", () => finalCumulativeTrackerRotation = drawableSpinner.RotationTracker.CumulativeRotation);
+            AddStep("retrieve cumulative disc rotation", () => finalCumulativeTrackerRotation = drawableSpinner.RotationTracker.RateAdjustedRotation);
 
             addSeekStep(2500);
             AddAssert("disc rotation rewound",
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation / 2, spinnerSymbolRotationTolerance));
             AddAssert("is cumulative rotation rewound",
                 // cumulative rotation is not damped, so we're treating it as the "ground truth" and allowing a comparatively smaller margin of error.
-                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, finalCumulativeTrackerRotation / 2, 100));
+                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.RateAdjustedRotation, finalCumulativeTrackerRotation / 2, 100));
 
             addSeekStep(5000);
             AddAssert("is disc rotation almost same",
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("is symbol rotation almost same",
                 () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation, spinnerSymbolRotationTolerance));
             AddAssert("is cumulative rotation almost same",
-                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.CumulativeRotation, finalCumulativeTrackerRotation, 100));
+                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.RateAdjustedRotation, finalCumulativeTrackerRotation, 100));
         }
 
         [Test]
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
                 var totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value * 2;
-                return totalScore == (int)(drawableSpinner.RotationTracker.CumulativeRotation / 360) * SpinnerTick.SCORE_PER_TICK;
+                return totalScore == (int)(drawableSpinner.RotationTracker.RateAdjustedRotation / 360) * SpinnerTick.SCORE_PER_TICK;
             });
 
             addSeekStep(0);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index a2a49b5c42..f10d11827b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     // these become implicitly hit.
                     return 1;
 
-                return Math.Clamp(RotationTracker.CumulativeRotation / 360 / Spinner.SpinsRequired, 0, 1);
+                return Math.Clamp(RotationTracker.RateAdjustedRotation / 360 / Spinner.SpinsRequired, 0, 1);
             }
         }
 
@@ -233,7 +233,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (!SpmCounter.IsPresent && RotationTracker.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
-            SpmCounter.SetRotation(RotationTracker.CumulativeRotation);
+            SpmCounter.SetRotation(RotationTracker.RateAdjustedRotation);
 
             updateBonusScore();
         }
@@ -245,7 +245,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (ticks.Count == 0)
                 return;
 
-            int spins = (int)(RotationTracker.CumulativeRotation / 360);
+            int spins = (int)(RotationTracker.RateAdjustedRotation / 360);
 
             if (spins < wholeSpins)
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index dfb692eba9..1476fe6010 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             get
             {
-                int rotations = (int)(drawableSpinner.RotationTracker.CumulativeRotation / 360);
+                int rotations = (int)(drawableSpinner.RotationTracker.RateAdjustedRotation / 360);
 
                 if (wholeRotationCount == rotations) return false;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
index 0cc6c842f4..f1a782cbb5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
@@ -31,17 +31,28 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         public readonly BindableBool Complete = new BindableBool();
 
         /// <summary>
-        /// The total rotation performed on the spinner disc, disregarding the spin direction.
+        /// The total rotation performed on the spinner disc, disregarding the spin direction,
+        /// adjusted for the track's playback rate.
         /// </summary>
         /// <remarks>
+        /// <para>
         /// This value is always non-negative and is monotonically increasing with time
         /// (i.e. will only increase if time is passing forward, but can decrease during rewind).
+        /// </para>
+        /// <para>
+        /// The rotation from each frame is multiplied by the clock's current playback rate.
+        /// The reason this is done is to ensure that spinners give the same score and require the same number of spins
+        /// regardless of whether speed-modifying mods are applied.
+        /// </para>
         /// </remarks>
         /// <example>
-        /// If the spinner is spun 360 degrees clockwise and then 360 degrees counter-clockwise,
+        /// Assuming no speed-modifying mods are active,
+        /// if the spinner is spun 360 degrees clockwise and then 360 degrees counter-clockwise,
         /// this property will return the value of 720 (as opposed to 0 for <see cref="Drawable.Rotation"/>).
+        /// If Double Time is active instead (with a speed multiplier of 1.5x),
+        /// in the same scenario the property will return 720 * 1.5 = 1080.
         /// </example>
-        public float CumulativeRotation { get; private set; }
+        public float RateAdjustedRotation { get; private set; }
 
         /// <summary>
         /// Whether the spinning is spinning at a reasonable speed to be considered visually spinning.
@@ -113,7 +124,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
 
             currentRotation += angle;
-            CumulativeRotation += Math.Abs(angle) * Math.Sign(Clock.ElapsedFrameTime);
+            // rate has to be applied each frame, because it's not guaranteed to be constant throughout playback
+            // (see: ModTimeRamp)
+            RateAdjustedRotation += (float)(Math.Abs(angle) * Clock.Rate);
         }
     }
 }

From ecb4826e1974ce4752020732d78d6631863d9e9f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 Aug 2020 06:54:26 +0900
Subject: [PATCH 04153/10326] 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 e5fed09c07..a384ad4c34 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.806.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.810.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 18c3052ca3..b38ef38ec2 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.806.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.810.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index b034253d88..00ddd94d53 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.Framework.iOS" Version="2020.806.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.810.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.806.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.810.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From d1b106a3b557c0c8dd13746679a7e68193863eff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 Aug 2020 10:59:28 +0900
Subject: [PATCH 04154/10326] Include mention of old releases in error message

---
 osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 79b4b04722..04da943a10 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Multi.Play
             {
                 failed = true;
 
-                Logger.Error(e, "Failed to retrieve a score submission token.\n\nThis may happen if you are not running an official release of osu! (ie. you are self-compiling).");
+                Logger.Error(e, "Failed to retrieve a score submission token.\n\nThis may happen if you are running an old or non-official release of osu! (ie. you are self-compiling).");
 
                 Schedule(() =>
                 {

From 471ed968e3d7a81b566a137078b5e3bef9e35d10 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 Aug 2020 11:09:02 +0900
Subject: [PATCH 04155/10326] Fix crash when same ruleset loaded more than once

If the same ruleset assembly was present more than once in the current
AppDomain, the game would crash. We recently saw this in Rider EAP9.
While this behaviour may change going forward, this is a good safety
measure regardless.
---
 osu.Game/Rulesets/RulesetStore.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index dd43092c0d..5d93f5186b 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -191,6 +191,11 @@ namespace osu.Game.Rulesets
             if (loadedAssemblies.ContainsKey(assembly))
                 return;
 
+            // the same assembly may be loaded twice in the same AppDomain (currently a thing in certain Rider versions https://youtrack.jetbrains.com/issue/RIDER-48799).
+            // as a failsafe, also compare by FullName.
+            if (loadedAssemblies.Any(a => a.Key.FullName == assembly.FullName))
+                return;
+
             try
             {
                 loadedAssemblies[assembly] = assembly.GetTypes().First(t => t.IsPublic && t.IsSubclassOf(typeof(Ruleset)));

From 20197e276861128b96dec6fcf7f9fd148a763e8d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 Aug 2020 12:27:32 +0900
Subject: [PATCH 04156/10326] Remove locally-cached music controller

---
 osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index 3d2dd8a0c5..c11a47d62b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -25,16 +25,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         private readonly Container<DrawableStoryboard> storyboardContainer;
         private DrawableStoryboard storyboard;
 
-        [Cached]
-        private MusicController musicController = new MusicController();
-
         public TestSceneStoryboard()
         {
             Clock = new FramedClock();
 
             AddRange(new Drawable[]
             {
-                musicController,
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -104,7 +100,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboard.Passing = false;
 
             storyboardContainer.Add(storyboard);
-            decoupledClock.ChangeSource(musicController.CurrentTrack);
+            decoupledClock.ChangeSource(MusicController.CurrentTrack);
         }
 
         private void loadStoryboardNoVideo()
@@ -127,7 +123,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboard = sb.CreateDrawable(Beatmap.Value);
 
             storyboardContainer.Add(storyboard);
-            decoupledClock.ChangeSource(musicController.CurrentTrack);
+            decoupledClock.ChangeSource(MusicController.CurrentTrack);
         }
     }
 }

From b64142dff9d04deb9295eeb9c5b3e52623c63cdf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 Aug 2020 12:37:00 +0900
Subject: [PATCH 04157/10326] Fix incorrect load state being used

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

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index c5ba82288c..813ad26ae4 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Returns whether the beatmap track is loaded.
         /// </summary>
-        public bool TrackLoaded => CurrentTrack.IsLoaded;
+        public bool TrackLoaded => CurrentTrack.TrackLoaded;
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
         {

From c66a14e9c5d160def0fdcdabcf39772e72cdd0dc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 Aug 2020 12:37:48 +0900
Subject: [PATCH 04158/10326] Remove beatmap from FailAnimation

---
 osu.Game/Screens/Play/FailAnimation.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index a7bfca612e..122ae505ca 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -11,7 +11,6 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
@@ -42,7 +41,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, IBindable<WorkingBeatmap> beatmap)
+        private void load(AudioManager audio)
         {
             failSample = audio.Samples.Get(@"Gameplay/failsound");
         }

From 7d35893ecd2bf8b277c2e6ac9632592dbf313f6f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 Aug 2020 12:40:58 +0900
Subject: [PATCH 04159/10326] Make MusicController non-nullable

---
 osu.Game/Screens/Menu/MainMenu.cs             |  2 +-
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         | 28 +++++++------------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 8837a49772..470e8ca9a6 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private GameHost host { get; set; }
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private MusicController music { get; set; }
 
         [Resolved(canBeNull: true)]
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index ff7d56a95b..f9c5fd13a4 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Lounge
         [Resolved]
         private Bindable<Room> selectedRoom { get; set; }
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private MusicController music { get; set; }
 
         private bool joiningRoom;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 80ed894233..ddbb021054 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -99,7 +99,7 @@ namespace osu.Game.Screens.Select
 
         private readonly Bindable<RulesetInfo> decoupledRuleset = new Bindable<RulesetInfo>();
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader(true)]
@@ -561,18 +561,15 @@ namespace osu.Game.Screens.Select
 
             BeatmapDetails.Refresh();
 
-            if (music?.CurrentTrack != null)
-            {
-                music.CurrentTrack.Looping = true;
-                music.ResetTrackAdjustments();
-            }
+            music.CurrentTrack.Looping = true;
+            music.ResetTrackAdjustments();
 
             if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
             {
                 updateComponentFromBeatmap(Beatmap.Value);
 
                 // restart playback on returning to song select, regardless.
-                music?.Play();
+                music.Play();
             }
 
             this.FadeIn(250);
@@ -589,8 +586,7 @@ namespace osu.Game.Screens.Select
 
             BeatmapOptions.Hide();
 
-            if (music?.CurrentTrack != null)
-                music.CurrentTrack.Looping = false;
+            music.CurrentTrack.Looping = false;
 
             this.ScaleTo(1.1f, 250, Easing.InSine);
 
@@ -611,8 +607,7 @@ namespace osu.Game.Screens.Select
 
             FilterControl.Deactivate();
 
-            if (music?.CurrentTrack != null)
-                music.CurrentTrack.Looping = false;
+            music.CurrentTrack.Looping = false;
 
             return false;
         }
@@ -653,8 +648,7 @@ namespace osu.Game.Screens.Select
 
             BeatmapDetails.Beatmap = beatmap;
 
-            if (music?.CurrentTrack != null)
-                music.CurrentTrack.Looping = true;
+            music.CurrentTrack.Looping = true;
         }
 
         private readonly WeakReference<ITrack> lastTrack = new WeakReference<ITrack>(null);
@@ -665,16 +659,14 @@ namespace osu.Game.Screens.Select
         /// </summary>
         private void ensurePlayingSelected()
         {
-            ITrack track = music?.CurrentTrack;
-            if (track == null)
-                return;
+            ITrack track = music.CurrentTrack;
 
             bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;
 
             track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
 
-            if (!track.IsRunning && (music?.IsUserPaused != true || isNewTrack))
-                music?.Play(true);
+            if (!track.IsRunning && (music.IsUserPaused != true || isNewTrack))
+                music.Play(true);
 
             lastTrack.SetTarget(track);
         }

From 322d08af1bfe25f45f90fcd8bc395219ce85c108 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 Aug 2020 13:11:59 +0900
Subject: [PATCH 04160/10326] Remove more local music controller caches

---
 osu.Game.Tests/Visual/Menus/TestSceneSongTicker.cs           | 5 -----
 .../Visual/UserInterface/TestSceneBeatSyncedContainer.cs     | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneSongTicker.cs b/osu.Game.Tests/Visual/Menus/TestSceneSongTicker.cs
index d7f23f5cc0..4b22af38c5 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneSongTicker.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneSongTicker.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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
@@ -11,14 +10,10 @@ namespace osu.Game.Tests.Visual.Menus
 {
     public class TestSceneSongTicker : OsuTestScene
     {
-        [Cached]
-        private MusicController musicController = new MusicController();
-
         public TestSceneSongTicker()
         {
             AddRange(new Drawable[]
             {
-                musicController,
                 new SongTicker
                 {
                     Anchor = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
index 127915c6c6..82b7e65c4f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
@@ -26,9 +26,6 @@ namespace osu.Game.Tests.Visual.UserInterface
     {
         private readonly NowPlayingOverlay np;
 
-        [Cached]
-        private MusicController musicController = new MusicController();
-
         public TestSceneBeatSyncedContainer()
         {
             Clock = new FramedClock();
@@ -36,7 +33,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddRange(new Drawable[]
             {
-                musicController,
                 new BeatContainer
                 {
                     Anchor = Anchor.BottomCentre,

From 6aafb3d2710174fe4bf302300ecf2cd1edd52988 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 Aug 2020 13:14:20 +0900
Subject: [PATCH 04161/10326] Cleanup TestSceneScreenNavigation

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

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 0f06010a6a..73a833c15d 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             AddStep("return to menu", () => songSelect.Exit());
 
-            AddUntilStep("wait for track", () => Game.MusicController.CurrentTrack.IsDummyDevice == false && Game.MusicController.IsPlaying);
+            AddUntilStep("wait for track", () => !Game.MusicController.CurrentTrack.IsDummyDevice && Game.MusicController.IsPlaying);
         }
 
         [Test]

From 338c01fa43657beb3f1476aab90db227605deed2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 Aug 2020 13:16:06 +0900
Subject: [PATCH 04162/10326] Remove track store reference counting, use single
 instance stores

---
 osu.Game/Beatmaps/BeatmapManager.cs           | 29 ++++---------------
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs | 24 +++++----------
 2 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index e001185da9..6f01580998 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -63,8 +63,9 @@ namespace osu.Game.Beatmaps
         private readonly RulesetStore rulesets;
         private readonly BeatmapStore beatmaps;
         private readonly AudioManager audioManager;
-        private readonly GameHost host;
         private readonly BeatmapOnlineLookupQueue onlineLookupQueue;
+        private readonly TextureStore textureStore;
+        private readonly ITrackStore trackStore;
 
         public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, AudioManager audioManager, GameHost host = null,
                               WorkingBeatmap defaultBeatmap = null)
@@ -72,7 +73,6 @@ namespace osu.Game.Beatmaps
         {
             this.rulesets = rulesets;
             this.audioManager = audioManager;
-            this.host = host;
 
             DefaultBeatmap = defaultBeatmap;
 
@@ -83,6 +83,9 @@ namespace osu.Game.Beatmaps
             beatmaps.ItemUpdated += removeWorkingCache;
 
             onlineLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
+
+            textureStore = new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store));
+            trackStore = audioManager.GetTrackStore(Files.Store);
         }
 
         protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize) =>
@@ -219,7 +222,6 @@ namespace osu.Game.Beatmaps
         }
 
         private readonly WeakList<BeatmapManagerWorkingBeatmap> workingCache = new WeakList<BeatmapManagerWorkingBeatmap>();
-        private readonly Dictionary<ITrackStore, int> referencedTrackStores = new Dictionary<ITrackStore, int>();
 
         /// <summary>
         /// Retrieve a <see cref="WorkingBeatmap"/> instance for the provided <see cref="BeatmapInfo"/>
@@ -252,31 +254,12 @@ namespace osu.Game.Beatmaps
 
                 beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 
-                ITrackStore trackStore = workingCache.FirstOrDefault(b => b.BeatmapInfo.AudioEquals(beatmapInfo))?.TrackStore;
-                TextureStore textureStore = workingCache.FirstOrDefault(b => b.BeatmapInfo.BackgroundEquals(beatmapInfo))?.TextureStore;
-
-                textureStore ??= new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store));
-                trackStore ??= audioManager.GetTrackStore(Files.Store);
-
-                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, textureStore, trackStore, beatmapInfo, audioManager, dereferenceTrackStore));
-                referencedTrackStores[trackStore] = referencedTrackStores.GetOrDefault(trackStore) + 1;
+                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, textureStore, trackStore, beatmapInfo, audioManager));
 
                 return working;
             }
         }
 
-        private void dereferenceTrackStore(ITrackStore trackStore)
-        {
-            lock (workingCache)
-            {
-                if (--referencedTrackStores[trackStore] == 0)
-                {
-                    referencedTrackStores.Remove(trackStore);
-                    trackStore.Dispose();
-                }
-            }
-        }
-
         /// <summary>
         /// Perform a lookup query on available <see cref="BeatmapSetInfo"/>s.
         /// </summary>
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index f1289cd3aa..aa93833f33 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -19,21 +19,16 @@ namespace osu.Game.Beatmaps
     {
         protected class BeatmapManagerWorkingBeatmap : WorkingBeatmap
         {
-            public readonly TextureStore TextureStore;
-            public readonly ITrackStore TrackStore;
-
             private readonly IResourceStore<byte[]> store;
-            private readonly Action<ITrackStore> dereferenceAction;
+            private readonly TextureStore textureStore;
+            private readonly ITrackStore trackStore;
 
-            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, ITrackStore trackStore, BeatmapInfo beatmapInfo, AudioManager audioManager,
-                                                Action<ITrackStore> dereferenceAction)
+            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, ITrackStore trackStore, BeatmapInfo beatmapInfo, AudioManager audioManager)
                 : base(beatmapInfo, audioManager)
             {
                 this.store = store;
-                this.dereferenceAction = dereferenceAction;
-
-                TextureStore = textureStore;
-                TrackStore = trackStore;
+                this.textureStore = textureStore;
+                this.trackStore = trackStore;
             }
 
             protected override IBeatmap GetBeatmap()
@@ -61,7 +56,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return TextureStore.Get(getPathForFile(Metadata.BackgroundFile));
+                    return textureStore.Get(getPathForFile(Metadata.BackgroundFile));
                 }
                 catch (Exception e)
                 {
@@ -74,7 +69,7 @@ namespace osu.Game.Beatmaps
             {
                 try
                 {
-                    return TrackStore.Get(getPathForFile(Metadata.AudioFile));
+                    return trackStore.Get(getPathForFile(Metadata.AudioFile));
                 }
                 catch (Exception e)
                 {
@@ -140,11 +135,6 @@ namespace osu.Game.Beatmaps
                     return null;
                 }
             }
-
-            ~BeatmapManagerWorkingBeatmap()
-            {
-                dereferenceAction?.Invoke(TrackStore);
-            }
         }
     }
 }

From faff0a70c49734841f6c1dd36c8df2775d1b867e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 Aug 2020 13:48:57 +0900
Subject: [PATCH 04163/10326] Privatise BMWB

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

diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index aa93833f33..92199789ec 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Beatmaps
 {
     public partial class BeatmapManager
     {
-        protected class BeatmapManagerWorkingBeatmap : WorkingBeatmap
+        private class BeatmapManagerWorkingBeatmap : WorkingBeatmap
         {
             private readonly IResourceStore<byte[]> store;
             private readonly TextureStore textureStore;

From 031d29ac34bd6684340f51aab051b84db42c4644 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 Aug 2020 13:53:23 +0900
Subject: [PATCH 04164/10326] Inspect current track directly

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

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 15b189ead6..dc52300cdb 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -234,9 +234,9 @@ namespace osu.Game.Overlays
                 pendingBeatmapSwitch = null;
             }
 
-            var track = musicController.TrackLoaded ? musicController.CurrentTrack : null;
+            var track = musicController.CurrentTrack;
 
-            if (track?.IsDummyDevice == false)
+            if (track.IsDummyDevice == false)
             {
                 progressBar.EndTime = track.Length;
                 progressBar.CurrentTime = track.CurrentTime;

From 8bfe6ba27c275208f665e6c125b73fade6c6fdd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 Aug 2020 23:04:00 +0900
Subject: [PATCH 04165/10326] Fix informational overlays not hiding each other
 correctly

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 623c677991..053eb01dcd 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -683,9 +683,8 @@ namespace osu.Game
             {
                 overlay.State.ValueChanged += state =>
                 {
-                    if (state.NewValue == Visibility.Hidden) return;
-
-                    informationalOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
+                    if (state.NewValue != Visibility.Hidden)
+                        showOverlayAboveOthers(overlay, informationalOverlays);
                 };
             }
 
@@ -699,12 +698,8 @@ namespace osu.Game
                     // informational overlays should be dismissed on a show or hide of a full overlay.
                     informationalOverlays.ForEach(o => o.Hide());
 
-                    if (state.NewValue == Visibility.Hidden) return;
-
-                    singleDisplayOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
-
-                    if (!overlay.IsPresent)
-                        overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime);
+                    if (state.NewValue != Visibility.Hidden)
+                        showOverlayAboveOthers(overlay, singleDisplayOverlays);
                 };
             }
 
@@ -729,6 +724,15 @@ namespace osu.Game
             notifications.State.ValueChanged += _ => updateScreenOffset();
         }
 
+        private void showOverlayAboveOthers(OverlayContainer overlay, OverlayContainer[] otherOverlays)
+        {
+            otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
+
+            // show above others if not visible at all, else leave at current depth.
+            if (!overlay.IsPresent)
+                overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime);
+        }
+
         public class GameIdleTracker : IdleTracker
         {
             private InputManager inputManager;

From 070d71ec27fa74eec6d27fa551dd5162ab628d4e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 Aug 2020 00:48:38 +0900
Subject: [PATCH 04166/10326] More cleanups

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs                  | 4 ++--
 .../Skinning/TestSceneTaikoPlayfield.cs                       | 2 +-
 osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs         | 2 +-
 .../Visual/Gameplay/TestSceneNightcoreBeatContainer.cs        | 4 ++--
 osu.Game/Overlays/NowPlayingOverlay.cs                        | 2 +-
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 3 ---
 osu.Game/Screens/Edit/Editor.cs                               | 4 ++--
 osu.Game/Screens/Edit/EditorClock.cs                          | 4 ++--
 osu.Game/Screens/Menu/IntroScreen.cs                          | 2 +-
 9 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index ba5aef5968..6141bf062e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -175,11 +175,11 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         private void createDrawableRuleset()
         {
-            AddUntilStep("wait for beatmap to be loaded", () => MusicController.TrackLoaded);
+            AddUntilStep("wait for beatmap to be loaded", () => MusicController.CurrentTrack.TrackLoaded);
 
             AddStep("create drawable ruleset", () =>
             {
-                MusicController.Play(true);
+                MusicController.CurrentTrack.Start();
 
                 SetContents(() =>
                 {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
index 5c54393fb8..a3d3bc81c4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
                 beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 1000 });
 
-                MusicController.Play(true);
+                MusicController.CurrentTrack.Start();
             });
 
             AddStep("Load playfield", () => SetContents(() => new TaikoPlayfield(new ControlPointInfo())
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
index 03faee9ad2..49b40daf99 100644
--- a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
@@ -29,6 +29,6 @@ namespace osu.Game.Tests.Skins
         public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => Beatmap.Value.Skin.GetSample(new SampleInfo("sample")) != null);
 
         [Test]
-        public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => MusicController.CurrentTrack.IsDummyDevice == false);
+        public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => !MusicController.CurrentTrack.IsDummyDevice);
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
index ce99d85e92..53e06a632e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
 
-            MusicController.Play(true);
-            MusicController.SeekTo(Beatmap.Value.Beatmap.HitObjects.First().StartTime - 1000);
+            MusicController.CurrentTrack.Start();
+            MusicController.CurrentTrack.Seek(Beatmap.Value.Beatmap.HitObjects.First().StartTime - 1000);
 
             Add(new ModNightcore<HitObject>.NightcoreBeatContainer());
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index dc52300cdb..af692486b7 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -236,7 +236,7 @@ namespace osu.Game.Overlays
 
             var track = musicController.CurrentTrack;
 
-            if (track.IsDummyDevice == false)
+            if (!track.IsDummyDevice)
             {
                 progressBar.EndTime = track.Length;
                 progressBar.CurrentTime = track.CurrentTime;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index d556d948f6..e1702d3eff 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
@@ -64,8 +63,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 waveform.Waveform = b.NewValue.Waveform;
                 track = musicController.CurrentTrack;
 
-                Debug.Assert(track != null);
-
                 if (track.Length > 0)
                 {
                     MaxZoom = getZoomLevelForVisibleMilliseconds(500);
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 78fa6c74b0..6722d9179c 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Screens.Edit
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
-            clock = new EditorClock(Beatmap.Value, musicController.CurrentTrack.Length, beatDivisor) { IsCoupled = false };
+            clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
             clock.ChangeSource(musicController.CurrentTrack);
 
             dependencies.CacheAs(clock);
@@ -348,7 +348,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            musicController.Stop();
+            musicController.CurrentTrack.Stop();
 
             if (seekToStart)
             {
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index fbfa397795..d0e265adb0 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -25,8 +25,8 @@ namespace osu.Game.Screens.Edit
 
         private readonly DecoupleableInterpolatingFramedClock underlyingClock;
 
-        public EditorClock(WorkingBeatmap beatmap, double trackLength, BindableBeatDivisor beatDivisor)
-            : this(beatmap.Beatmap.ControlPointInfo, trackLength, beatDivisor)
+        public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
+            : this(beatmap.Beatmap.ControlPointInfo, beatmap.GetTrack().Length, beatDivisor)
         {
         }
 
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 6e85abf7dc..389629445c 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.Menu
                 if (setInfo != null)
                 {
                     initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-                    UsingThemedIntro = initialBeatmap.GetTrack().IsDummyDevice == false;
+                    UsingThemedIntro = !initialBeatmap.GetTrack().IsDummyDevice;
                 }
 
                 return UsingThemedIntro;

From b66f303e71cf9083c2f764964cf3424bb4433f64 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 Aug 2020 00:48:45 +0900
Subject: [PATCH 04167/10326] Add annotation

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index af6a67ad3f..bec2679103 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
@@ -249,6 +250,7 @@ namespace osu.Game.Beatmaps
         protected abstract Texture GetBackground();
         private readonly RecyclableLazy<Texture> background;
 
+        [NotNull]
         public Track GetTrack() => GetBeatmapTrack() ?? GetVirtualTrack(1000);
 
         protected abstract Track GetBeatmapTrack();

From eec94e1f535e1a5f9d3a17561bfd1ca6d2e5ccab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 Aug 2020 00:50:56 +0900
Subject: [PATCH 04168/10326] Make track not-null in
 GameplayClockContainer/FailAnimation

---
 osu.Game/Screens/Play/FailAnimation.cs          |  5 ++++-
 osu.Game/Screens/Play/GameplayClockContainer.cs | 10 +++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index 122ae505ca..6ebee209e2 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Game.Rulesets.UI;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
@@ -26,6 +27,8 @@ namespace osu.Game.Screens.Play
         public Action OnComplete;
 
         private readonly DrawableRuleset drawableRuleset;
+
+        [NotNull]
         private readonly ITrack track;
 
         private readonly BindableDouble trackFreq = new BindableDouble(1);
@@ -34,7 +37,7 @@ namespace osu.Game.Screens.Play
 
         private SampleChannel failSample;
 
-        public FailAnimation(DrawableRuleset drawableRuleset, ITrack track)
+        public FailAnimation(DrawableRuleset drawableRuleset, [NotNull] ITrack track)
         {
             this.drawableRuleset = drawableRuleset;
             this.track = track;
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index c4f368e1f5..f3466a562e 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework;
@@ -27,6 +28,7 @@ namespace osu.Game.Screens.Play
         private readonly WorkingBeatmap beatmap;
         private readonly IReadOnlyList<Mod> mods;
 
+        [NotNull]
         private ITrack track;
 
         public readonly BindableBool IsPaused = new BindableBool();
@@ -60,7 +62,7 @@ namespace osu.Game.Screens.Play
 
         private readonly FramedOffsetClock platformOffsetClock;
 
-        public GameplayClockContainer(ITrack track, WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
+        public GameplayClockContainer([NotNull] ITrack track, WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
         {
             this.beatmap = beatmap;
             this.mods = mods;
@@ -196,9 +198,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public void StopUsingBeatmapClock()
         {
-            if (track == null)
-                return;
-
             removeSourceClockAdjustments();
 
             track = new TrackVirtual(track.Length);
@@ -217,8 +216,6 @@ namespace osu.Game.Screens.Play
 
         private void updateRate()
         {
-            if (track == null) return;
-
             speedAdjustmentsApplied = true;
             track.ResetSpeedAdjustments();
 
@@ -233,7 +230,6 @@ namespace osu.Game.Screens.Play
         {
             base.Dispose(isDisposing);
             removeSourceClockAdjustments();
-            track = null;
         }
 
         private void removeSourceClockAdjustments()

From 688e4479506645bdacee7cdc7ae9ee9deaa5f1b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 Aug 2020 01:33:06 +0900
Subject: [PATCH 04169/10326] Fix potential hierarchy mutation from async
 context

---
 osu.Game/Overlays/MusicController.cs | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 813ad26ae4..c18b564b4f 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -317,11 +317,28 @@ namespace osu.Game.Overlays
 
         private void changeTrack()
         {
-            CurrentTrack.Expire();
-            CurrentTrack = new DrawableTrack(current.GetTrack());
-            CurrentTrack.Completed += () => onTrackCompleted(current);
+            var lastTrack = CurrentTrack;
 
-            AddInternal(CurrentTrack);
+            var newTrack = new DrawableTrack(current.GetTrack());
+            newTrack.Completed += () => onTrackCompleted(current);
+
+            CurrentTrack = newTrack;
+
+            // At this point we may potentially be in an async context from tests. This is extremely dangerous but we have to make do for now.
+            // CurrentTrack is immediately updated above for situations where a immediate knowledge about the new track is required,
+            // but the mutation of the hierarchy is scheduled to avoid exceptions.
+            Schedule(() =>
+            {
+                lastTrack.Expire();
+
+                if (newTrack == CurrentTrack)
+                    AddInternal(newTrack);
+                else
+                {
+                    // If the track has changed via changeTrack() being called multiple times in a single update, force disposal on the old track.
+                    newTrack.Dispose();
+                }
+            });
         }
 
         private void onTrackCompleted(WorkingBeatmap workingBeatmap)

From e47a1eb313f86d9c0f635e58545644139d5cbf34 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 Aug 2020 01:41:21 +0900
Subject: [PATCH 04170/10326] Use adjustable ITrack

---
 osu.Game/Rulesets/Mods/ModDaycore.cs            | 4 ++--
 osu.Game/Rulesets/Mods/ModNightcore.cs          | 4 ++--
 osu.Game/Rulesets/Mods/ModRateAdjust.cs         | 2 +-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs           | 4 ++--
 osu.Game/Screens/Play/FailAnimation.cs          | 4 ++--
 osu.Game/Screens/Play/GameplayClockContainer.cs | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index 800312d047..61ad7db706 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -30,8 +30,8 @@ namespace osu.Game.Rulesets.Mods
         public override void ApplyToTrack(ITrack track)
         {
             // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
-            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
-            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
+            track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
+            track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 4932df08f1..4004953cd1 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -41,8 +41,8 @@ namespace osu.Game.Rulesets.Mods
         public override void ApplyToTrack(ITrack track)
         {
             // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
-            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
-            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
+            track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
+            track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index ae7077c67b..fec21764b0 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
 
         public virtual void ApplyToTrack(ITrack track)
         {
-            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
+            track.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
         }
 
         public virtual void ApplyToSample(SampleChannel sample)
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index b904cf007b..20c8d0f3e7 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -89,9 +89,9 @@ namespace osu.Game.Rulesets.Mods
         private void applyPitchAdjustment(ValueChangedEvent<bool> adjustPitchSetting)
         {
             // remove existing old adjustment
-            (track as IAdjustableAudioComponent)?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
+            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
 
-            (track as IAdjustableAudioComponent)?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
+            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
         }
 
         private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index 6ebee209e2..dade904180 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Play
                 Expire();
             });
 
-            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Frequency, trackFreq);
+            track.AddAdjustment(AdjustableProperty.Frequency, trackFreq);
 
             applyToPlayfield(drawableRuleset.Playfield);
             drawableRuleset.Playfield.HitObjectContainer.FlashColour(Color4.Red, 500);
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.Play
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            (track as IAdjustableAudioComponent)?.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq);
+            track?.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index f3466a562e..59e26cdf55 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -219,8 +219,8 @@ namespace osu.Game.Screens.Play
             speedAdjustmentsApplied = true;
             track.ResetSpeedAdjustments();
 
-            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            (track as IAdjustableAudioComponent)?.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+            track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
             foreach (var mod in mods.OfType<IApplicableToTrack>())
                 mod.ApplyToTrack(track);

From c0031955c9ed6c0b74fd655366f988b33ba34ae6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 Aug 2020 01:50:18 +0900
Subject: [PATCH 04171/10326] Update with further framework changes

---
 osu.Game/Screens/Menu/IntroTriangles.cs         | 2 +-
 osu.Game/Screens/Play/GameplayClockContainer.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 86f7dbdd6f..a9ef20436f 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Menu
                 LoadComponentAsync(new TrianglesIntroSequence(logo, background)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Clock = new FramedClock(UsingThemedIntro ? (IAdjustableClock)Track : null),
+                    Clock = new FramedClock(UsingThemedIntro ? Track : null),
                     LoadMenu = LoadMenu
                 }, t =>
                 {
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 59e26cdf55..f0bbcf957a 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Screens.Play
 
                 Schedule(() =>
                 {
-                    adjustableClock.ChangeSource((IAdjustableClock)track);
+                    adjustableClock.ChangeSource(track);
                     updateRate();
 
                     if (!IsPaused.Value)
@@ -201,7 +201,7 @@ namespace osu.Game.Screens.Play
             removeSourceClockAdjustments();
 
             track = new TrackVirtual(track.Length);
-            adjustableClock.ChangeSource((IAdjustableClock)track);
+            adjustableClock.ChangeSource(track);
         }
 
         protected override void Update()

From 84655b0798d16f462ec24bb9727c91c2edcde55e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 Aug 2020 20:17:29 +0300
Subject: [PATCH 04172/10326] Change hover colour for news title

---
 osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs b/osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs
index da98c92bbe..d6a3a69fe0 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Dashboard.Home.News
         }
 
         [BackgroundDependencyLoader]
-        private void load(GameHost host)
+        private void load(GameHost host, OverlayColourProvider colourProvider)
         {
             Child = new TextFlowContainer(t =>
             {
@@ -36,6 +36,8 @@ namespace osu.Game.Overlays.Dashboard.Home.News
                 Text = post.Title
             };
 
+            HoverColour = colourProvider.Light1;
+
             TooltipText = "view in browser";
             Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
         }

From b78ccf8a347ca3995712c4424f8d72f580a929de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 11 Aug 2020 21:28:00 +0200
Subject: [PATCH 04173/10326] Rewrite Spun Out test scene

---
 .../Mods/TestSceneOsuModSpunOut.cs            | 39 ++++++++++++
 .../TestSceneSpinnerSpunOut.cs                | 59 -------------------
 2 files changed, 39 insertions(+), 59 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
 delete mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
new file mode 100644
index 0000000000..1b052600ca
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public class TestSceneOsuModSpunOut : OsuModTestScene
+    {
+        [Test]
+        public void TestSpinnerAutoCompleted() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModSpunOut(),
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Spinner
+                    {
+                        Position = new Vector2(256, 192),
+                        StartTime = 500,
+                        Duration = 2000
+                    }
+                }
+            },
+            PassCondition = () => Player.ChildrenOfType<DrawableSpinner>().Single().Progress >= 1
+        });
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs
deleted file mode 100644
index d1210db6b1..0000000000
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSpunOut.cs
+++ /dev/null
@@ -1,59 +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 NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Osu.Tests
-{
-    [TestFixture]
-    public class TestSceneSpinnerSpunOut : OsuTestScene
-    {
-        [SetUp]
-        public void SetUp() => Schedule(() =>
-        {
-            SelectedMods.Value = new[] { new OsuModSpunOut() };
-        });
-
-        [Test]
-        public void TestSpunOut()
-        {
-            DrawableSpinner spinner = null;
-
-            AddStep("create spinner", () => spinner = createSpinner());
-
-            AddUntilStep("wait for end", () => Time.Current > spinner.LifetimeEnd);
-
-            AddAssert("spinner is completed", () => spinner.Progress >= 1);
-        }
-
-        private DrawableSpinner createSpinner()
-        {
-            var spinner = new Spinner
-            {
-                StartTime = Time.Current + 500,
-                EndTime = Time.Current + 2500
-            };
-            spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-            var drawableSpinner = new DrawableSpinner(spinner)
-            {
-                Anchor = Anchor.Centre
-            };
-
-            foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObjects>())
-                mod.ApplyToDrawableHitObjects(new[] { drawableSpinner });
-
-            Add(drawableSpinner);
-            return drawableSpinner;
-        }
-    }
-}

From 8fe5775ecb82be2a6d52149a4f0393150316ec58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 11 Aug 2020 21:55:20 +0200
Subject: [PATCH 04174/10326] Allow testing mod combinations in ModTestScenes

---
 osu.Game/Tests/Visual/ModTestScene.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 23b5ad0bd8..a71d008eb9 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -40,8 +40,8 @@ namespace osu.Game.Tests.Visual
         {
             var mods = new List<Mod>(SelectedMods.Value);
 
-            if (currentTestData.Mod != null)
-                mods.Add(currentTestData.Mod);
+            if (currentTestData.Mods != null)
+                mods.AddRange(currentTestData.Mods);
             if (currentTestData.Autoplay)
                 mods.Add(ruleset.GetAutoplayMod());
 
@@ -85,9 +85,18 @@ namespace osu.Game.Tests.Visual
             public Func<bool> PassCondition;
 
             /// <summary>
-            /// The <see cref="Mod"/> this test case tests.
+            /// The <see cref="Mod"/>s this test case tests.
             /// </summary>
-            public Mod Mod;
+            public IReadOnlyList<Mod> Mods;
+
+            /// <summary>
+            /// Convenience property for setting <see cref="Mods"/> if only
+            /// a single mod is to be tested.
+            /// </summary>
+            public Mod Mod
+            {
+                set => Mods = new[] { value };
+            }
         }
     }
 }

From 25f59e0489a292b825f60af57d6a8ac9df7e1692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 11 Aug 2020 21:55:50 +0200
Subject: [PATCH 04175/10326] Add failing test cases

---
 .../Mods/TestSceneOsuModSpunOut.cs            | 50 ++++++++++++++-----
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
index 1b052600ca..d8064d36ea 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
@@ -1,39 +1,65 @@
 // Copyright (c) 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.Testing;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public class TestSceneOsuModSpunOut : OsuModTestScene
     {
+        protected override bool AllowFail => true;
+
         [Test]
         public void TestSpinnerAutoCompleted() => CreateModTest(new ModTestData
         {
             Mod = new OsuModSpunOut(),
             Autoplay = false,
-            Beatmap = new Beatmap
-            {
-                HitObjects = new List<HitObject>
-                {
-                    new Spinner
-                    {
-                        Position = new Vector2(256, 192),
-                        StartTime = 500,
-                        Duration = 2000
-                    }
-                }
-            },
+            Beatmap = singleSpinnerBeatmap,
             PassCondition = () => Player.ChildrenOfType<DrawableSpinner>().Single().Progress >= 1
         });
+
+        [TestCase(null)]
+        [TestCase(typeof(OsuModDoubleTime))]
+        [TestCase(typeof(OsuModHalfTime))]
+        public void TestSpinRateUnaffectedByMods(Type additionalModType)
+        {
+            var mods = new List<Mod> { new OsuModSpunOut() };
+            if (additionalModType != null)
+                mods.Add((Mod)Activator.CreateInstance(additionalModType));
+
+            CreateModTest(new ModTestData
+            {
+                Mods = mods,
+                Autoplay = false,
+                Beatmap = singleSpinnerBeatmap,
+                PassCondition = () => Precision.AlmostEquals(Player.ChildrenOfType<SpinnerSpmCounter>().Single().SpinsPerMinute, 286, 1)
+            });
+        }
+
+        private Beatmap singleSpinnerBeatmap => new Beatmap
+        {
+            HitObjects = new List<HitObject>
+            {
+                new Spinner
+                {
+                    Position = new Vector2(256, 192),
+                    StartTime = 500,
+                    Duration = 2000
+                }
+            }
+        };
     }
 }

From bcaaf2527892e3ac2a02fc64e8226f5664a4a5f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 11 Aug 2020 22:04:18 +0200
Subject: [PATCH 04176/10326] Fix Spun Out mod being affected by rate-changing
 mods

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 47d765fecd..2816073e8c 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -41,7 +41,12 @@ namespace osu.Game.Rulesets.Osu.Mods
             var spinner = (DrawableSpinner)drawable;
 
             spinner.RotationTracker.Tracking = true;
-            spinner.RotationTracker.AddRotation(MathUtils.RadiansToDegrees((float)spinner.Clock.ElapsedFrameTime * 0.03f));
+
+            // because the spinner is under the gameplay clock, it is affected by rate adjustments on the track;
+            // for that reason using ElapsedFrameTime directly leads to fewer SPM with Half Time and more SPM with Double Time.
+            // for spinners we want the real (wall clock) elapsed time; to achieve that, unapply the clock rate locally here.
+            var rateIndependentElapsedTime = spinner.Clock.ElapsedFrameTime / spinner.Clock.Rate;
+            spinner.RotationTracker.AddRotation(MathUtils.RadiansToDegrees((float)rateIndependentElapsedTime * 0.03f));
         }
     }
 }

From 4f3f95540be8836006ce2bffee47f51efa987617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 11 Aug 2020 22:34:46 +0200
Subject: [PATCH 04177/10326] Check for zero rate to prevent crashes on unpause

---
 osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
index 2816073e8c..f080e11933 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs
@@ -42,6 +42,10 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             spinner.RotationTracker.Tracking = true;
 
+            // early-return if we were paused to avoid division-by-zero in the subsequent calculations.
+            if (Precision.AlmostEquals(spinner.Clock.Rate, 0))
+                return;
+
             // because the spinner is under the gameplay clock, it is affected by rate adjustments on the track;
             // for that reason using ElapsedFrameTime directly leads to fewer SPM with Half Time and more SPM with Double Time.
             // for spinners we want the real (wall clock) elapsed time; to achieve that, unapply the clock rate locally here.

From 139c0c75f87e03ad4d86fd524e61c4dea79f0e81 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Wed, 12 Aug 2020 06:37:25 +0200
Subject: [PATCH 04178/10326] Add documentation for constructor

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 8c96e59f30..3e744056bb 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -7,6 +7,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
+using JetBrains.Annotations;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Legacy;
@@ -25,7 +26,9 @@ namespace osu.Game.Beatmaps.Formats
         private readonly IBeatmap beatmap;
         private readonly LegacyBeatmapSkin beatmapSkin;
 
-        public LegacyBeatmapEncoder(IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin = null)
+        /// <param name="beatmap">The beatmap to encode</param>
+        /// <param name="beatmapSkin">An optional beatmap skin, for encoding the beatmap's combo colours.</param>
+        public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] LegacyBeatmapSkin beatmapSkin)
         {
             this.beatmap = beatmap;
             this.beatmapSkin = beatmapSkin;

From 8ffaa49839bdf3902e57c57b0ff429b8c91a2fb1 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Wed, 12 Aug 2020 06:37:33 +0200
Subject: [PATCH 04179/10326] Handle additional null case

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 3e744056bb..eb148794de 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -207,12 +207,9 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleComboColours(TextWriter writer)
         {
-            if (beatmapSkin == null)
-                return;
+            var colours = beatmapSkin?.Configuration.ComboColours;
 
-            var colours = beatmapSkin.Configuration.ComboColours;
-
-            if (colours.Count == 0)
+            if (colours == null || colours.Count == 0)
                 return;
 
             writer.WriteLine("[Colours]");

From 69590113d62c54ec56c86c8bc529a49b0c2e337a Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Wed, 12 Aug 2020 06:38:05 +0200
Subject: [PATCH 04180/10326] Temporary changes

---
 .../Beatmaps/Formats/LegacyBeatmapEncoderTest.cs          | 8 +++++++-
 osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs  | 8 +++++++-
 osu.Game/Screens/Edit/EditorChangeHandler.cs              | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 30331e98d2..fba63f8539 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -10,6 +10,7 @@ using System.Text;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
@@ -19,6 +20,7 @@ using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Taiko;
+using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Beatmaps.Formats
@@ -61,7 +63,11 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var stream = new MemoryStream();
 
             using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                new LegacyBeatmapEncoder(beatmap).Encode(writer);
+            using (var rs = new ResourceStore<byte[]>())
+            {
+                var skin = new LegacyBeatmapSkin(beatmap.BeatmapInfo, rs, null);
+                new LegacyBeatmapEncoder(beatmap, skin).Encode(writer);
+            }
 
             stream.Position = 0;
 
diff --git a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
index ff17f23d50..74b6f66d85 100644
--- a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
+++ b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Text;
 using NUnit.Framework;
+using osu.Framework.IO.Stores;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
@@ -14,6 +15,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
+using osu.Game.Skinning;
 using osuTK;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
@@ -351,7 +353,11 @@ namespace osu.Game.Tests.Editing
             using (var encoded = new MemoryStream())
             {
                 using (var sw = new StreamWriter(encoded))
-                    new LegacyBeatmapEncoder(beatmap).Encode(sw);
+                using (var rs = new ResourceStore<byte[]>())
+                {
+                    var skin = new LegacyBeatmapSkin(beatmap.BeatmapInfo, rs, null);
+                    new LegacyBeatmapEncoder(beatmap, skin).Encode(sw);
+                }
 
                 return encoded.ToArray();
             }
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 1553c2d2ef..6393093c74 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -6,8 +6,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using osu.Framework.Bindables;
+using osu.Framework.IO.Stores;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Edit
 {
@@ -85,7 +87,11 @@ namespace osu.Game.Screens.Edit
             using (var stream = new MemoryStream())
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                    new LegacyBeatmapEncoder(editorBeatmap).Encode(sw);
+                using (var rs = new ResourceStore<byte[]>())
+                {
+                    var skin = new LegacyBeatmapSkin(editorBeatmap.BeatmapInfo, rs, null);
+                    new LegacyBeatmapEncoder(editorBeatmap, skin).Encode(sw);
+                }
 
                 savedStates.Add(stream.ToArray());
             }

From f3202fb123807ed3ef1b1a693e88f80f9ff42296 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 12 Aug 2020 11:24:26 +0300
Subject: [PATCH 04181/10326] Naming adjustments

---
 osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs    | 6 +++---
 .../News/{HomeNewsPanel.cs => FeaturedNewsItemPanel.cs}   | 4 ++--
 .../Home/News/{CollapsedNewsPanel.cs => NewsGroupItem.cs} | 4 ++--
 .../News/{HomeNewsGroupPanel.cs => NewsItemGroupPanel.cs} | 8 ++++----
 .../{HomeShowMoreNewsPanel.cs => ShowMoreNewsPanel.cs}    | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename osu.Game/Overlays/Dashboard/Home/News/{HomeNewsPanel.cs => FeaturedNewsItemPanel.cs} (98%)
 rename osu.Game/Overlays/Dashboard/Home/News/{CollapsedNewsPanel.cs => NewsGroupItem.cs} (97%)
 rename osu.Game/Overlays/Dashboard/Home/News/{HomeNewsGroupPanel.cs => NewsItemGroupPanel.cs} (76%)
 rename osu.Game/Overlays/Dashboard/Home/News/{HomeShowMoreNewsPanel.cs => ShowMoreNewsPanel.cs} (93%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
index b1c0c5adcd..a1251ca793 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual.Online
                 Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
-                    new HomeNewsPanel(new APINewsPost
+                    new FeaturedNewsItemPanel(new APINewsPost
                     {
                         Title = "This post has an image which starts with \"/\" and has many authors!",
                         Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Online
                         PublishedAt = DateTimeOffset.Now,
                         Slug = "2020-07-16-summer-theme-park-2020-voting-open"
                     }),
-                    new HomeNewsGroupPanel(new List<APINewsPost>
+                    new NewsItemGroupPanel(new List<APINewsPost>
                     {
                         new APINewsPost
                         {
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.Online
                             PublishedAt = DateTimeOffset.Now,
                         }
                     }),
-                    new HomeShowMoreNewsPanel()
+                    new ShowMoreNewsPanel()
                 }
             });
         }
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/FeaturedNewsItemPanel.cs
similarity index 98%
rename from osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
rename to osu.Game/Overlays/Dashboard/Home/News/FeaturedNewsItemPanel.cs
index ca56c33315..ee88469e2f 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/FeaturedNewsItemPanel.cs
@@ -18,11 +18,11 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Dashboard.Home.News
 {
-    public class HomeNewsPanel : HomePanel
+    public class FeaturedNewsItemPanel : HomePanel
     {
         private readonly APINewsPost post;
 
-        public HomeNewsPanel(APINewsPost post)
+        public FeaturedNewsItemPanel(APINewsPost post)
         {
             this.post = post;
         }
diff --git a/osu.Game/Overlays/Dashboard/Home/News/CollapsedNewsPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/NewsGroupItem.cs
similarity index 97%
rename from osu.Game/Overlays/Dashboard/Home/News/CollapsedNewsPanel.cs
rename to osu.Game/Overlays/Dashboard/Home/News/NewsGroupItem.cs
index 7dbc6a8f87..dc4f3f8c92 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/CollapsedNewsPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/NewsGroupItem.cs
@@ -12,11 +12,11 @@ using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Dashboard.Home.News
 {
-    public class CollapsedNewsPanel : CompositeDrawable
+    public class NewsGroupItem : CompositeDrawable
     {
         private readonly APINewsPost post;
 
-        public CollapsedNewsPanel(APINewsPost post)
+        public NewsGroupItem(APINewsPost post)
         {
             this.post = post;
         }
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/NewsItemGroupPanel.cs
similarity index 76%
rename from osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs
rename to osu.Game/Overlays/Dashboard/Home/News/NewsItemGroupPanel.cs
index 6007f1408b..c1d5a87ef5 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/HomeNewsGroupPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/NewsItemGroupPanel.cs
@@ -10,11 +10,11 @@ using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Dashboard.Home.News
 {
-    public class HomeNewsGroupPanel : HomePanel
+    public class NewsItemGroupPanel : HomePanel
     {
         private readonly List<APINewsPost> posts;
 
-        public HomeNewsGroupPanel(List<APINewsPost> posts)
+        public NewsItemGroupPanel(List<APINewsPost> posts)
         {
             this.posts = posts;
         }
@@ -24,12 +24,12 @@ namespace osu.Game.Overlays.Dashboard.Home.News
         {
             Content.Padding = new MarginPadding { Vertical = 5 };
 
-            Child = new FillFlowContainer<CollapsedNewsPanel>
+            Child = new FillFlowContainer<NewsGroupItem>
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Direction = FillDirection.Vertical,
-                Children = posts.Select(p => new CollapsedNewsPanel(p)).ToArray()
+                Children = posts.Select(p => new NewsGroupItem(p)).ToArray()
             };
         }
     }
diff --git a/osu.Game/Overlays/Dashboard/Home/News/HomeShowMoreNewsPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/ShowMoreNewsPanel.cs
similarity index 93%
rename from osu.Game/Overlays/Dashboard/Home/News/HomeShowMoreNewsPanel.cs
rename to osu.Game/Overlays/Dashboard/Home/News/ShowMoreNewsPanel.cs
index abb4bd7969..d25df6f189 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/HomeShowMoreNewsPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/ShowMoreNewsPanel.cs
@@ -10,7 +10,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Dashboard.Home.News
 {
-    public class HomeShowMoreNewsPanel : OsuHoverContainer
+    public class ShowMoreNewsPanel : OsuHoverContainer
     {
         protected override IEnumerable<Drawable> EffectTargets => new[] { text };
 
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Dashboard.Home.News
 
         private OsuSpriteText text;
 
-        public HomeShowMoreNewsPanel()
+        public ShowMoreNewsPanel()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;

From b10cddf625c9a51bfeac4e22a9871818486cd1f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Aug 2020 23:28:08 +0900
Subject: [PATCH 04182/10326] 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 a384ad4c34..7c0cb9271e 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.810.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.812.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b38ef38ec2..bb89492e8b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.810.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.812.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 00ddd94d53..8364caa42f 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.Framework.iOS" Version="2020.810.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.812.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.810.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.812.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 00f8bb7c3e36ccb09de2b1634a9f5161b3a8cd67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Aug 2020 23:28:45 +0900
Subject: [PATCH 04183/10326] 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 7c0cb9271e..241b836aac 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.731.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.812.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index bb89492e8b..63267e1494 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.812.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 8364caa42f..3500eb75dc 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.812.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.731.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 45876bc55aca3d28034c8ba7d6b3ea5322708c23 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 Aug 2020 23:50:33 +0900
Subject: [PATCH 04184/10326] Fix reference to non-existent variable

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index ab6cf60a79..3c559765d4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -194,7 +194,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addSeekStep(0);
 
-            AddStep("adjust track rate", () => track.AddAdjustment(AdjustableProperty.Tempo, new BindableDouble(rate)));
+            AddStep("adjust track rate", () => MusicController.CurrentTrack.AddAdjustment(AdjustableProperty.Tempo, new BindableDouble(rate)));
             // autoplay replay frames use track time;
             // if a spin takes 1000ms in track time and we're playing with a 2x rate adjustment, the spin will take 500ms of *real* time.
             // therefore we need to apply the rate adjustment to the replay itself to change from track time to real time,

From 91e28b849de0ed31402536b63069b8b2d5383f4b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 Aug 2020 00:29:23 +0900
Subject: [PATCH 04185/10326] Fix incorrect BeatmapManager construction

---
 .../Visual/UserInterface/TestSceneDeleteLocalScore.cs          | 3 ++-
 osu.Game/Beatmaps/BeatmapManager.cs                            | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index eb4750a597..e54292f7cc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
@@ -79,7 +80,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
             dependencies.Cache(rulesetStore = new RulesetStore(ContextFactory));
-            dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesetStore, null, Audio, dependencies.Get<GameHost>(), Beatmap.Default));
+            dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesetStore, null, dependencies.Get<AudioManager>(), dependencies.Get<GameHost>(), Beatmap.Default));
             dependencies.Cache(scoreManager = new ScoreManager(rulesetStore, () => beatmapManager, LocalStorage, null, ContextFactory));
 
             beatmap = beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Result.Beatmaps[0];
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 6f01580998..0cadcf5947 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -9,6 +9,7 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
@@ -67,7 +68,7 @@ namespace osu.Game.Beatmaps
         private readonly TextureStore textureStore;
         private readonly ITrackStore trackStore;
 
-        public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, AudioManager audioManager, GameHost host = null,
+        public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, GameHost host = null,
                               WorkingBeatmap defaultBeatmap = null)
             : base(storage, contextFactory, api, new BeatmapStore(contextFactory), host)
         {

From d2a03f1146dc8257c1ffec299272edeff3f05d03 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 Aug 2020 00:59:22 +0900
Subject: [PATCH 04186/10326] Refactor TaikoDifficultyHitObject

---
 .../Preprocessing/TaikoDifficultyHitObject.cs       | 13 ++++++-------
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs |  4 ++--
 .../Difficulty/Skills/Stamina.cs                    | 10 +++++-----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
index cd45db2119..d0f621f4ad 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
@@ -17,21 +17,20 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 
         public bool StaminaCheese = false;
 
-        public readonly double NoteLength;
+        public readonly int ObjectIndex;
 
-        public readonly int N;
-
-        public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate, int n, IEnumerable<TaikoDifficultyHitObjectRhythm> commonRhythms)
+        public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate, int objectIndex,
+                                        IEnumerable<TaikoDifficultyHitObjectRhythm> commonRhythms)
             : base(hitObject, lastObject, clockRate)
         {
             var currentHit = hitObject as Hit;
 
-            NoteLength = DeltaTime;
             double prevLength = (lastObject.StartTime - lastLastObject.StartTime) / clockRate;
-            Rhythm = getClosestRhythm(NoteLength / prevLength, commonRhythms);
+
+            Rhythm = getClosestRhythm(DeltaTime / prevLength, commonRhythms);
             IsKat = currentHit?.Type == HitType.Rim;
 
-            N = n;
+            ObjectIndex = objectIndex;
         }
 
         private TaikoDifficultyHitObjectRhythm getClosestRhythm(double ratio, IEnumerable<TaikoDifficultyHitObjectRhythm> commonRhythms)
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index c3e6ee4d12..31dc93a6b2 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
                     if (samePattern) // Repetition found!
                     {
-                        int notesSince = hitobject.N - rhythmHistory[start].N;
+                        int notesSince = hitobject.ObjectIndex - rhythmHistory[start].ObjectIndex;
                         penalty *= repetitionPenalty(notesSince);
                         break;
                     }
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
             objectStrain *= repetitionPenalties(hitobject);
             objectStrain *= patternLengthPenalty(notesSinceRhythmChange);
-            objectStrain *= speedPenalty(hitobject.NoteLength);
+            objectStrain *= speedPenalty(hitobject.DeltaTime);
 
             notesSinceRhythmChange = 0;
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index 29c1c3c322..c9a691a2aa 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -49,14 +49,14 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
             TaikoDifficultyHitObject hitObject = (TaikoDifficultyHitObject)current;
 
-            if (hitObject.N % 2 == hand)
+            if (hitObject.ObjectIndex % 2 == hand)
             {
                 double objectStrain = 1;
 
-                if (hitObject.N == 1)
+                if (hitObject.ObjectIndex == 1)
                     return 1;
 
-                notePairDurationHistory.Add(hitObject.NoteLength + offhandObjectDuration);
+                notePairDurationHistory.Add(hitObject.DeltaTime + offhandObjectDuration);
 
                 if (notePairDurationHistory.Count > max_history_length)
                     notePairDurationHistory.RemoveAt(0);
@@ -65,12 +65,12 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
                 objectStrain += speedBonus(shortestRecentNote);
 
                 if (hitObject.StaminaCheese)
-                    objectStrain *= cheesePenalty(hitObject.NoteLength + offhandObjectDuration);
+                    objectStrain *= cheesePenalty(hitObject.DeltaTime + offhandObjectDuration);
 
                 return objectStrain;
             }
 
-            offhandObjectDuration = hitObject.NoteLength;
+            offhandObjectDuration = hitObject.DeltaTime;
             return 0;
         }
 

From 5010d2044a8b53ed8475dbfde17286485bd64872 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 Aug 2020 01:35:56 +0900
Subject: [PATCH 04187/10326] Replace IsKat with HitType

---
 .../Preprocessing/StaminaCheeseDetector.cs    | 15 ++--
 .../Preprocessing/TaikoDifficultyHitObject.cs |  4 +-
 .../Difficulty/Skills/Colour.cs               | 87 +++++++++----------
 3 files changed, 49 insertions(+), 57 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
index b52dad5198..b53bc66f39 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 {
@@ -17,10 +18,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
             hitObjects = difficultyHitObjects;
             findRolls(3);
             findRolls(4);
-            findTlTap(0, true);
-            findTlTap(1, true);
-            findTlTap(0, false);
-            findTlTap(1, false);
+            findTlTap(0, HitType.Rim);
+            findTlTap(1, HitType.Rim);
+            findTlTap(0, HitType.Centre);
+            findTlTap(1, HitType.Centre);
         }
 
         private void findRolls(int patternLength)
@@ -40,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 
                 for (int j = 0; j < patternLength; j++)
                 {
-                    if (history[j].IsKat != history[j + patternLength].IsKat)
+                    if (history[j].HitType != history[j + patternLength].HitType)
                     {
                         isRepeat = false;
                     }
@@ -63,13 +64,13 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
             }
         }
 
-        private void findTlTap(int parity, bool kat)
+        private void findTlTap(int parity, HitType type)
         {
             int tlLength = -2;
 
             for (int i = parity; i < hitObjects.Count; i += 2)
             {
-                if (kat == hitObjects[i].IsKat)
+                if (hitObjects[i].HitType == type)
                 {
                     tlLength += 2;
                 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
index d0f621f4ad..817e974fe8 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
     public class TaikoDifficultyHitObject : DifficultyHitObject
     {
         public readonly TaikoDifficultyHitObjectRhythm Rhythm;
-        public readonly bool IsKat;
+        public readonly HitType? HitType;
 
         public bool StaminaCheese = false;
 
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
             double prevLength = (lastObject.StartTime - lastLastObject.StartTime) / clockRate;
 
             Rhythm = getClosestRhythm(DeltaTime / prevLength, commonRhythms);
-            IsKat = currentHit?.Type == HitType.Rim;
+            HitType = currentHit?.Type;
 
             ObjectIndex = objectIndex;
         }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index 7c1623c54e..a348c25331 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -12,26 +12,54 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 {
     public class Colour : Skill
     {
+        private const int mono_history_max_length = 5;
+
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0.4;
 
-        private NoteColour prevNoteColour = NoteColour.None;
+        private HitType? previousHitType;
 
         private int currentMonoLength = 1;
         private readonly List<int> monoHistory = new List<int>();
-        private const int mono_history_max_length = 5;
+
+        protected override double StrainValueOf(DifficultyHitObject current)
+        {
+            if (!(current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000))
+            {
+                previousHitType = null;
+                return 0.0;
+            }
+
+            var taikoCurrent = (TaikoDifficultyHitObject)current;
+
+            double objectStrain = 0.0;
+
+            if (taikoCurrent.HitType != null && previousHitType != null && taikoCurrent.HitType != previousHitType)
+            {
+                objectStrain = 1.0;
+
+                if (monoHistory.Count < 2)
+                    objectStrain = 0.0;
+                else if ((monoHistory[^1] + currentMonoLength) % 2 == 0)
+                    objectStrain *= sameParityPenalty();
+
+                objectStrain *= repetitionPenalties();
+                currentMonoLength = 1;
+            }
+            else
+            {
+                currentMonoLength += 1;
+            }
+
+            previousHitType = taikoCurrent.HitType;
+            return objectStrain;
+        }
 
         private double sameParityPenalty()
         {
             return 0.0;
         }
 
-        private double repetitionPenalty(int notesSince)
-        {
-            double n = notesSince;
-            return Math.Min(1.0, 0.032 * n);
-        }
-
         private double repetitionPenalties()
         {
             double penalty = 1.0;
@@ -68,47 +96,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return penalty;
         }
 
-        protected override double StrainValueOf(DifficultyHitObject current)
+        private double repetitionPenalty(int notesSince)
         {
-            if (!(current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000))
-            {
-                prevNoteColour = NoteColour.None;
-                return 0.0;
-            }
-
-            TaikoDifficultyHitObject hitObject = (TaikoDifficultyHitObject)current;
-
-            double objectStrain = 0.0;
-
-            NoteColour noteColour = hitObject.IsKat ? NoteColour.Ka : NoteColour.Don;
-
-            if (noteColour == NoteColour.Don && prevNoteColour == NoteColour.Ka ||
-                noteColour == NoteColour.Ka && prevNoteColour == NoteColour.Don)
-            {
-                objectStrain = 1.0;
-
-                if (monoHistory.Count < 2)
-                    objectStrain = 0.0;
-                else if ((monoHistory[^1] + currentMonoLength) % 2 == 0)
-                    objectStrain *= sameParityPenalty();
-
-                objectStrain *= repetitionPenalties();
-                currentMonoLength = 1;
-            }
-            else
-            {
-                currentMonoLength += 1;
-            }
-
-            prevNoteColour = noteColour;
-            return objectStrain;
-        }
-
-        private enum NoteColour
-        {
-            Don,
-            Ka,
-            None
+            double n = notesSince;
+            return Math.Min(1.0, 0.032 * n);
         }
     }
 }

From 27cd9e119aa27be6ce39ee7989f30c5ead5437db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Aug 2020 12:04:32 +0900
Subject: [PATCH 04188/10326] Delay beatmap load until after transition has
 finished

Previously the beatmap would begin loading at the same time the
`PlayerLoader` class was. This can cause a horribly visible series of
stutters, especially when a storyboard is involved.

Obviously we should be aiming to reduce the stutters via changes to the
beatmap load process (such as incremental storyboard loading,
`DrawableHitObject` pooling, etc.) but this improves user experience
tenfold in the mean time.
---
 osu.Game/Screens/Play/PlayerLoader.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 93a734589c..d32fae1b90 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -153,8 +153,6 @@ namespace osu.Game.Screens.Play
         {
             base.OnEntering(last);
 
-            prepareNewPlayer();
-
             content.ScaleTo(0.7f);
             Background?.FadeColour(Color4.White, 800, Easing.OutQuint);
 
@@ -172,11 +170,6 @@ namespace osu.Game.Screens.Play
 
             contentIn();
 
-            MetadataInfo.Loading = true;
-
-            // we will only be resumed if the player has requested a re-run (see restartRequested).
-            prepareNewPlayer();
-
             this.Delay(400).Schedule(pushWhenLoaded);
         }
 
@@ -257,6 +250,9 @@ namespace osu.Game.Screens.Play
 
         private void prepareNewPlayer()
         {
+            if (!this.IsCurrentScreen())
+                return;
+
             var restartCount = player?.RestartCount + 1 ?? 0;
 
             player = createPlayer();
@@ -274,8 +270,10 @@ namespace osu.Game.Screens.Play
 
         private void contentIn()
         {
-            content.ScaleTo(1, 650, Easing.OutQuint);
+            MetadataInfo.Loading = true;
+
             content.FadeInFromZero(400);
+            content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer);
         }
 
         private void contentOut()

From 99bea6b8e9e5d5a586179c385d7a14c246c522f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Aug 2020 12:52:35 +0900
Subject: [PATCH 04189/10326] Add missing null check (player construction is
 potentially delayed now)

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

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index d32fae1b90..dcf84a8821 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
 
         private bool readyForPush =>
             // don't push unless the player is completely loaded
-            player.LoadState == LoadState.Ready
+            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.

From 5b536aebe71a49f2c4eab4edd508985d00bdcdf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Aug 2020 12:53:37 +0900
Subject: [PATCH 04190/10326] Add missing null checks and avoid cross-test
 pollution

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 4c73065087..c34b523c97 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -49,6 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         /// <param name="afterLoadAction">An action to run after container load.</param>
         public void ResetPlayer(bool interactive, Action beforeLoadAction = null, Action afterLoadAction = null)
         {
+            player = null;
+
             audioManager.Volume.SetDefault();
 
             InputManager.Clear();
@@ -80,7 +82,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("mod rate applied", () => Beatmap.Value.Track.Rate != 1);
             AddStep("exit loader", () => loader.Exit());
             AddUntilStep("wait for not current", () => !loader.IsCurrentScreen());
-            AddAssert("player did not load", () => !player.IsLoaded);
+            AddAssert("player did not load", () => player?.IsLoaded != true);
             AddUntilStep("player disposed", () => loader.DisposalTask?.IsCompleted == true);
             AddAssert("mod rate still applied", () => Beatmap.Value.Track.Rate != 1);
         }
@@ -94,7 +96,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for load ready", () =>
             {
                 moveMouse();
-                return player.LoadState == LoadState.Ready;
+                return player?.LoadState == LoadState.Ready;
             });
             AddRepeatStep("move mouse", moveMouse, 20);
 
@@ -222,7 +224,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.LoadState == LoadState.Ready);
+            AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
 
             AddAssert("check for notification", () => container.NotificationOverlay.UnreadCount.Value == 1);
             AddStep("click notification", () =>

From fd7bf70b7d4302c1536a6b0e1489ac0c9ff5a1ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Aug 2020 12:59:00 +0900
Subject: [PATCH 04191/10326] Remove weird "after load" action

This was pretty pointless anyway and from its usages, doesn't look to
need to exist.
---
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index c34b523c97..d6742a27c2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -46,8 +46,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         /// </summary>
         /// <param name="interactive">If the test player should behave like the production one.</param>
         /// <param name="beforeLoadAction">An action to run before player load but after bindable leases are returned.</param>
-        /// <param name="afterLoadAction">An action to run after container load.</param>
-        public void ResetPlayer(bool interactive, Action beforeLoadAction = null, Action afterLoadAction = null)
+        public void ResetPlayer(bool interactive, Action beforeLoadAction = null)
         {
             player = null;
 
@@ -55,18 +54,16 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             InputManager.Clear();
 
+            container = new TestPlayerLoaderContainer(loader = new TestPlayerLoader(() => player = new TestPlayer(interactive, interactive)));
+
             beforeLoadAction?.Invoke();
+
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToTrack>())
                 mod.ApplyToTrack(Beatmap.Value.Track);
 
-            InputManager.Child = container = new TestPlayerLoaderContainer(
-                loader = new TestPlayerLoader(() =>
-                {
-                    afterLoadAction?.Invoke();
-                    return player = new TestPlayer(interactive, interactive);
-                }));
+            InputManager.Child = container;
         }
 
         /// <summary>
@@ -197,19 +194,19 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestMutedNotificationMasterVolume()
         {
-            addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, null, () => audioManager.Volume.IsDefault);
+            addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, () => audioManager.Volume.IsDefault);
         }
 
         [Test]
         public void TestMutedNotificationTrackVolume()
         {
-            addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, null, () => audioManager.VolumeTrack.IsDefault);
+            addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, () => audioManager.VolumeTrack.IsDefault);
         }
 
         [Test]
         public void TestMutedNotificationMuteButton()
         {
-            addVolumeSteps("mute button", null, () => container.VolumeOverlay.IsMuted.Value = true, () => !container.VolumeOverlay.IsMuted.Value);
+            addVolumeSteps("mute button", () => container.VolumeOverlay.IsMuted.Value = true, () => !container.VolumeOverlay.IsMuted.Value);
         }
 
         /// <remarks>
@@ -217,13 +214,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         /// </remarks>
         /// <param name="volumeName">What part of the volume system is checked</param>
         /// <param name="beforeLoad">The action to be invoked to set the volume before loading</param>
-        /// <param name="afterLoad">The action to be invoked to set the volume after loading</param>
         /// <param name="assert">The function to be invoked and checked</param>
-        private void addVolumeSteps(string volumeName, Action beforeLoad, Action afterLoad, Func<bool> assert)
+        private void addVolumeSteps(string volumeName, Action beforeLoad, Func<bool> assert)
         {
             AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce).Value = false);
 
-            AddStep("load player", () => ResetPlayer(false, beforeLoad, afterLoad));
+            AddStep("load player", () => ResetPlayer(false, beforeLoad));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
 
             AddAssert("check for notification", () => container.NotificationOverlay.UnreadCount.Value == 1);

From cf9bda6c199bddcbf957033191285814c531b04a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Aug 2020 13:05:00 +0900
Subject: [PATCH 04192/10326] Add coverage of early exit with null and non-null
 player

---
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index d6742a27c2..e698d31176 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -66,20 +66,34 @@ namespace osu.Game.Tests.Visual.Gameplay
             InputManager.Child = container;
         }
 
-        /// <summary>
-        /// When <see cref="PlayerLoader"/> exits early, it has to wait for the player load task
-        /// to complete before running disposal on player. This previously caused an issue where mod
-        /// speed adjustments were undone too late, causing cross-screen pollution.
-        /// </summary>
         [Test]
-        public void TestEarlyExit()
+        public void TestEarlyExitBeforePlayerConstruction()
         {
             AddStep("load dummy beatmap", () => ResetPlayer(false, () => SelectedMods.Value = new[] { new OsuModNightcore() }));
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
             AddAssert("mod rate applied", () => Beatmap.Value.Track.Rate != 1);
             AddStep("exit loader", () => loader.Exit());
             AddUntilStep("wait for not current", () => !loader.IsCurrentScreen());
-            AddAssert("player did not load", () => player?.IsLoaded != true);
+            AddAssert("player did not load", () => player == null);
+            AddUntilStep("player disposed", () => loader.DisposalTask == null);
+            AddAssert("mod rate still applied", () => Beatmap.Value.Track.Rate != 1);
+        }
+
+        /// <summary>
+        /// When <see cref="PlayerLoader"/> exits early, it has to wait for the player load task
+        /// to complete before running disposal on player. This previously caused an issue where mod
+        /// speed adjustments were undone too late, causing cross-screen pollution.
+        /// </summary>
+        [Test]
+        public void TestEarlyExitAfterPlayerConstruction()
+        {
+            AddStep("load dummy beatmap", () => ResetPlayer(false, () => SelectedMods.Value = new[] { new OsuModNightcore() }));
+            AddUntilStep("wait for current", () => loader.IsCurrentScreen());
+            AddAssert("mod rate applied", () => Beatmap.Value.Track.Rate != 1);
+            AddUntilStep("wait for non-null player", () => player != null);
+            AddStep("exit loader", () => loader.Exit());
+            AddUntilStep("wait for not current", () => !loader.IsCurrentScreen());
+            AddAssert("player did not load", () => !player.IsLoaded);
             AddUntilStep("player disposed", () => loader.DisposalTask?.IsCompleted == true);
             AddAssert("mod rate still applied", () => Beatmap.Value.Track.Rate != 1);
         }

From 8ded5925ff0fbf2dcdbf4e00146898009ab556e5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 Aug 2020 13:47:35 +0900
Subject: [PATCH 04193/10326] Xmldoc colour strain

---
 .../Difficulty/Skills/Colour.cs               | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index a348c25331..db445c7d27 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -19,7 +19,14 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
         private HitType? previousHitType;
 
+        /// <summary>
+        /// Length of the current mono pattern.
+        /// </summary>
         private int currentMonoLength = 1;
+
+        /// <summary>
+        /// List of the last <see cref="mono_history_max_length"/> most recent mono patterns, with the most recent at the end of the list.
+        /// </summary>
         private readonly List<int> monoHistory = new List<int>();
 
         protected override double StrainValueOf(DifficultyHitObject current)
@@ -36,12 +43,20 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
             if (taikoCurrent.HitType != null && previousHitType != null && taikoCurrent.HitType != previousHitType)
             {
+                // The colour has changed.
                 objectStrain = 1.0;
 
                 if (monoHistory.Count < 2)
+                {
+                    // There needs to be at least two streaks to determine a strain.
                     objectStrain = 0.0;
+                }
                 else if ((monoHistory[^1] + currentMonoLength) % 2 == 0)
+                {
+                    // The last streak in the history is guaranteed to be a different type to the current streak.
+                    // If the total number of notes in the two streaks is even, apply a penalty.
                     objectStrain *= sameParityPenalty();
+                }
 
                 objectStrain *= repetitionPenalties();
                 currentMonoLength = 1;
@@ -55,11 +70,14 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return objectStrain;
         }
 
-        private double sameParityPenalty()
-        {
-            return 0.0;
-        }
+        /// <summary>
+        /// The penalty to apply when the total number of notes in the two most recent colour streaks is even.
+        /// </summary>
+        private double sameParityPenalty() => 0.0;
 
+        /// <summary>
+        /// The penalty to apply due to the length of repetition in colour streaks.
+        /// </summary>
         private double repetitionPenalties()
         {
             double penalty = 1.0;
@@ -96,10 +114,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return penalty;
         }
 
-        private double repetitionPenalty(int notesSince)
-        {
-            double n = notesSince;
-            return Math.Min(1.0, 0.032 * n);
-        }
+        private double repetitionPenalty(int notesSince) => Math.Min(1.0, 0.032 * notesSince);
     }
 }

From c71ee0877ff0ad2d5b161a6923a51281c513b76a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Aug 2020 14:07:07 +0900
Subject: [PATCH 04194/10326] Update fastlane and plugins

---
 Gemfile.lock | 73 ++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bf971d2c22..a4b49af7e4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,35 +6,36 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
-    aws-partitions (1.329.0)
-    aws-sdk-core (3.99.2)
+    aws-partitions (1.354.0)
+    aws-sdk-core (3.104.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.34.1)
+    aws-sdk-kms (1.36.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.68.1)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-s3 (1.78.0)
+      aws-sdk-core (~> 3, >= 3.104.3)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.4)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sigv4 (1.2.1)
+      aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.3)
     claide (1.0.3)
     colored (1.2)
     colored2 (3.1.2)
     commander-fastlane (4.4.6)
       highline (~> 1.7.2)
-    declarative (0.0.10)
+    declarative (0.0.20)
     declarative-option (0.1.0)
-    digest-crc (0.5.1)
+    digest-crc (0.6.1)
+      rake (~> 13.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.5)
-    emoji_regex (1.0.1)
-    excon (0.74.0)
+    dotenv (2.7.6)
+    emoji_regex (3.0.0)
+    excon (0.76.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
@@ -42,34 +43,32 @@ GEM
       http-cookie (~> 1.0.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    fastimage (2.1.7)
-    fastlane (2.149.1)
+    fastimage (2.2.0)
+    fastlane (2.156.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       aws-sdk-s3 (~> 1.0)
-      babosa (>= 1.0.2, < 2.0.0)
+      babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
       colored
       commander-fastlane (>= 4.4.6, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 2.0)
+      emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
-      faraday (>= 0.17, < 2.0)
+      faraday (~> 1.0)
       faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (>= 0.13.1, < 2.0)
+      faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-api-client (>= 0.37.0, < 0.39.0)
       google-cloud-storage (>= 1.15.0, < 2.0.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
-      jwt (~> 2.1.0)
+      jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multi_xml (~> 0.5)
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
-      public_suffix (~> 2.0.0)
-      rubyzip (>= 1.3.0, < 2.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
       slack-notifier (>= 2.0.0, < 3.0.0)
@@ -97,17 +96,17 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.2)
+    google-cloud-env (1.3.3)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.1)
-    google-cloud-storage (1.26.2)
+    google-cloud-storage (1.27.0)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.12.0)
+    googleauth (0.13.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -119,29 +118,29 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.4.0)
-    json (2.3.0)
-    jwt (2.1.0)
+    json (2.3.1)
+    jwt (2.2.1)
     memoist (0.16.2)
     mini_magick (4.10.1)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    multi_json (1.14.1)
-    multi_xml (0.6.0)
+    multi_json (1.15.0)
     multipart-post (2.0.0)
-    nanaimo (0.2.6)
+    nanaimo (0.3.0)
     naturally (2.2.0)
-    nokogiri (1.10.7)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    os (1.1.0)
+    os (1.1.1)
     plist (3.5.0)
-    public_suffix (2.0.5)
+    public_suffix (4.0.5)
+    rake (13.0.1)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
-    rubyzip (1.3.0)
+    rubyzip (2.3.0)
     security (0.1.3)
     signet (0.14.0)
       addressable (~> 2.3)
@@ -160,7 +159,7 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     tty-cursor (0.7.1)
-    tty-screen (0.8.0)
+    tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
@@ -169,12 +168,12 @@ GEM
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.16.0)
+    xcodeproj (1.18.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
+      nanaimo (~> 0.3.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.0)

From 84cb36b6a8ee180552b41f48711b149d710cbaf6 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 Aug 2020 10:57:18 +0200
Subject: [PATCH 04195/10326] Defer subscriptions for
 updateOverlayActivationMode() to OnEntering()

---
 osu.Game/Screens/Play/Player.cs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 2ecddf0f23..6bb4be4096 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -212,11 +212,6 @@ namespace osu.Game.Screens.Play
             if (game != null)
                 OverlayActivationMode.BindTo(game.OverlayActivationMode);
 
-            gameplayOverlaysDisabled.BindValueChanged(_ => updateOverlayActivationMode());
-            DrawableRuleset.IsPaused.BindValueChanged(_ => updateOverlayActivationMode());
-            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateOverlayActivationMode());
-            breakTracker.IsBreakTime.BindValueChanged(_ => updateOverlayActivationMode());
-
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
             // bind clock into components that require it
@@ -363,9 +358,6 @@ namespace osu.Game.Screens.Play
 
         private void updateOverlayActivationMode()
         {
-            if (!this.IsCurrentScreen())
-                return;
-
             bool canTriggerOverlays = DrawableRuleset.IsPaused.Value || breakTracker.IsBreakTime.Value || !gameplayOverlaysDisabled.Value;
 
             if (DrawableRuleset.HasReplayLoaded.Value || canTriggerOverlays)
@@ -661,7 +653,10 @@ namespace osu.Game.Screens.Play
             foreach (var mod in Mods.Value.OfType<IApplicableToHUD>())
                 mod.ApplyToHUD(HUDOverlay);
 
-            updateOverlayActivationMode();
+            DrawableRuleset.IsPaused.BindValueChanged(_ => updateOverlayActivationMode());
+            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateOverlayActivationMode());
+            breakTracker.IsBreakTime.BindValueChanged(_ => updateOverlayActivationMode());
+            gameplayOverlaysDisabled.BindValueChanged(_ => updateOverlayActivationMode(), true);
         }
 
         public override void OnSuspending(IScreen next)

From 662281d727561b70572f76d40174a1bc75d67604 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Aug 2020 18:20:45 +0900
Subject: [PATCH 04196/10326] Adjust legacy spinners to fade in later

Matches stable 1:1 for legacy skins. I've left lazer default as it is
because changing to use the shorter apperance looks bad. This will
probably change as we proceed with the redesign of the default skin.
---
 osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs | 4 ++--
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 72bc3ddc9a..739c87e037 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -79,8 +79,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             var spinner = (Spinner)drawableSpinner.HitObject;
 
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt / 2, true))
-                this.FadeInFromZero(spinner.TimePreempt / 2);
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))
+                this.FadeInFromZero(spinner.TimeFadeIn / 2);
 
             fixedMiddle.FadeColour(Color4.White);
             using (BeginAbsoluteSequence(spinner.StartTime, true))
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 0ae1d8f683..81a0df5ea5 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -85,8 +85,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             var spinner = drawableSpinner.HitObject;
 
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt / 2, true))
-                this.FadeInFromZero(spinner.TimePreempt / 2);
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))
+                this.FadeInFromZero(spinner.TimeFadeIn / 2);
         }
 
         protected override void Update()

From 3cb22fad82d6d1f3b0bc07f8bb025acabb090cd5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 Aug 2020 19:48:31 +0900
Subject: [PATCH 04197/10326] Fix mods sharing bindable instances

---
 .../UserInterface/TestSceneModSettings.cs     | 20 ++++++++++++++++++
 osu.Game/Rulesets/Mods/Mod.cs                 | 21 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 7ff463361a..c5ce3751ef 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -8,6 +8,7 @@ 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.Configuration;
 using osu.Game.Graphics.UserInterface;
@@ -15,6 +16,7 @@ using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Tests.Visual.UserInterface
@@ -75,6 +77,24 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("Customisation closed", () => modSelect.ModSettingsContainer.Alpha == 0);
         }
 
+        [Test]
+        public void TestModSettingsUnboundWhenCopied()
+        {
+            OsuModDoubleTime original = null;
+            OsuModDoubleTime copy = null;
+
+            AddStep("create mods", () =>
+            {
+                original = new OsuModDoubleTime();
+                copy = (OsuModDoubleTime)original.CreateCopy();
+            });
+
+            AddStep("change property", () => original.SpeedChange.Value = 2);
+
+            AddAssert("original has new value", () => Precision.AlmostEquals(2.0, original.SpeedChange.Value));
+            AddAssert("copy has original value", () => Precision.AlmostEquals(1.5, copy.SpeedChange.Value));
+        }
+
         private void createModSelect()
         {
             AddStep("create mod select", () =>
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 0e5fe3fc9c..52ffa0ad2a 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using Newtonsoft.Json;
@@ -126,7 +127,25 @@ namespace osu.Game.Rulesets.Mods
         /// <summary>
         /// Creates a copy of this <see cref="Mod"/> initialised to a default state.
         /// </summary>
-        public virtual Mod CreateCopy() => (Mod)MemberwiseClone();
+        public virtual Mod CreateCopy()
+        {
+            var copy = (Mod)Activator.CreateInstance(GetType());
+
+            // Copy bindable values across
+            foreach (var (_, prop) in this.GetSettingsSourceProperties())
+            {
+                var origBindable = prop.GetValue(this);
+                var copyBindable = prop.GetValue(copy);
+
+                // The bindables themselves are readonly, so the value must be transferred through the Bindable<T>.Value property.
+                var valueProperty = origBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
+                Debug.Assert(valueProperty != null);
+
+                valueProperty.SetValue(copyBindable, valueProperty.GetValue(origBindable));
+            }
+
+            return copy;
+        }
 
         public bool Equals(IMod other) => GetType() == other?.GetType();
     }

From 0500d82b5bed73153b1bcee54374c557a4408ab4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 Aug 2020 19:48:41 +0900
Subject: [PATCH 04198/10326] Fix playlist items sharing mod instances

---
 .../Multiplayer/TestSceneMatchSongSelect.cs     | 17 +++++++++++++++++
 osu.Game/Screens/Select/MatchSongSelect.cs      |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index c62479faa0..3d225aa0a9 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -16,7 +16,9 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Select;
 
@@ -145,6 +147,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("new item has id 2", () => Room.Playlist.Last().ID == 2);
         }
 
+        /// <summary>
+        /// Tests that the same <see cref="Mod"/> instances are not shared between two playlist items.
+        /// </summary>
+        [Test]
+        public void TestNewItemHasNewModInstances()
+        {
+            AddStep("set dt mod", () => SelectedMods.Value = new[] { new OsuModDoubleTime() });
+            AddStep("create item", () => songSelect.BeatmapDetails.CreateNewItem());
+            AddStep("change mod rate", () => ((OsuModDoubleTime)SelectedMods.Value[0]).SpeedChange.Value = 2);
+            AddStep("create item", () => songSelect.BeatmapDetails.CreateNewItem());
+
+            AddAssert("item 1 has rate 1.5", () => Precision.AlmostEquals(1.5, ((OsuModDoubleTime)Room.Playlist.First().RequiredMods[0]).SpeedChange.Value));
+            AddAssert("item 2 has rate 2", () => Precision.AlmostEquals(2, ((OsuModDoubleTime)Room.Playlist.Last().RequiredMods[0]).SpeedChange.Value));
+        }
+
         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 2f3674642e..96a48fa3ac 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -77,6 +77,8 @@ namespace osu.Game.Screens.Select
 
             item.RequiredMods.Clear();
             item.RequiredMods.AddRange(Mods.Value);
+
+            Mods.Value = Mods.Value.Select(m => m.CreateCopy()).ToArray();
         }
     }
 }

From 74a8a4bca8dc7ee11a15e764e87c828bb9509668 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 Aug 2020 21:53:17 +0200
Subject: [PATCH 04199/10326] Make testing code clearer to understand.

---
 .../Gameplay/TestSceneOverlayActivation.cs    | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
index 7fd5158515..04c67433fa 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
@@ -11,56 +11,54 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneOverlayActivation : OsuPlayerTestScene
     {
-        private OverlayTestPlayer testPlayer;
-
-        public override void SetUpSteps()
-        {
-            AddStep("disable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, true));
-            base.SetUpSteps();
-        }
+        protected new OverlayTestPlayer Player => base.Player as OverlayTestPlayer;
 
         [Test]
         public void TestGameplayOverlayActivation()
         {
-            AddAssert("activation mode is disabled", () => testPlayer.OverlayActivationMode == OverlayActivation.Disabled);
+            AddStep("disable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, true));
+            AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
         }
 
         [Test]
         public void TestGameplayOverlayActivationDisabled()
         {
             AddStep("enable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, false));
-            AddAssert("activation mode is user triggered", () => testPlayer.OverlayActivationMode == OverlayActivation.UserTriggered);
+            AddAssert("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
         }
 
         [Test]
         public void TestGameplayOverlayActivationPaused()
         {
-            AddUntilStep("activation mode is disabled", () => testPlayer.OverlayActivationMode == OverlayActivation.Disabled);
-            AddStep("pause gameplay", () => testPlayer.Pause());
-            AddUntilStep("activation mode is user triggered", () => testPlayer.OverlayActivationMode == OverlayActivation.UserTriggered);
+            AddStep("disable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, true));
+            AddUntilStep("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
+            AddStep("pause gameplay", () => Player.Pause());
+            AddUntilStep("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
         }
 
         [Test]
         public void TestGameplayOverlayActivationReplayLoaded()
         {
-            AddAssert("activation mode is disabled", () => testPlayer.OverlayActivationMode == OverlayActivation.Disabled);
-            AddStep("load a replay", () => testPlayer.DrawableRuleset.HasReplayLoaded.Value = true);
-            AddAssert("activation mode is user triggered", () => testPlayer.OverlayActivationMode == OverlayActivation.UserTriggered);
+            AddStep("disable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, true));
+            AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
+            AddStep("load a replay", () => Player.DrawableRuleset.HasReplayLoaded.Value = true);
+            AddAssert("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
         }
 
         [Test]
         public void TestGameplayOverlayActivationBreaks()
         {
-            AddAssert("activation mode is disabled", () => testPlayer.OverlayActivationMode == OverlayActivation.Disabled);
-            AddStep("seek to break", () => testPlayer.GameplayClockContainer.Seek(Beatmap.Value.Beatmap.Breaks.First().StartTime));
-            AddUntilStep("activation mode is user triggered", () => testPlayer.OverlayActivationMode == OverlayActivation.UserTriggered);
-            AddStep("seek to break end", () => testPlayer.GameplayClockContainer.Seek(Beatmap.Value.Beatmap.Breaks.First().EndTime));
-            AddUntilStep("activation mode is disabled", () => testPlayer.OverlayActivationMode == OverlayActivation.Disabled);
+            AddStep("disable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, true));
+            AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
+            AddStep("seek to break", () => Player.GameplayClockContainer.Seek(Beatmap.Value.Beatmap.Breaks.First().StartTime));
+            AddUntilStep("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
+            AddStep("seek to break end", () => Player.GameplayClockContainer.Seek(Beatmap.Value.Beatmap.Breaks.First().EndTime));
+            AddUntilStep("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
         }
 
-        protected override TestPlayer CreatePlayer(Ruleset ruleset) => testPlayer = new OverlayTestPlayer();
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new OverlayTestPlayer();
 
-        private class OverlayTestPlayer : TestPlayer
+        protected class OverlayTestPlayer : TestPlayer
         {
             public new OverlayActivation OverlayActivationMode => base.OverlayActivationMode.Value;
         }

From 671141ec61e1eaf8b0daeea84c1bb03c498dc997 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Aug 2020 18:05:05 +0900
Subject: [PATCH 04200/10326] Load menu backgrounds via LargeTextureStore to
 reduce memory usage

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

diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
index 387e189dc4..058d2ed0f9 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Graphics.Backgrounds
         }
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        private void load(LargeTextureStore textures)
         {
             Sprite.Texture = Beatmap?.Background ?? textures.Get(fallbackTextureName);
         }

From c3757a4660f1b1f1633e9b16af75d2960b343006 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Aug 2020 19:22:23 +0900
Subject: [PATCH 04201/10326] Fix beatmap covers not being unloaded in most
 overlays

Eventually we'll probably want something smarter than this, but for the
time being this helps stop runaway memory usage.
---
 .../Drawables/UpdateableBeatmapSetCover.cs        | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index c60bd0286e..6c229755e7 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -67,19 +67,18 @@ namespace osu.Game.Beatmaps.Drawables
 
             if (beatmapSet != null)
             {
-                BeatmapSetCover cover;
-
-                Add(displayedCover = new DelayedLoadWrapper(
-                    cover = new BeatmapSetCover(beatmapSet, coverType)
+                Add(displayedCover = new DelayedLoadUnloadWrapper(() =>
+                {
+                    var cover = new BeatmapSetCover(beatmapSet, coverType)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.Both,
                         FillMode = FillMode.Fill,
-                    })
-                );
-
-                cover.OnLoadComplete += d => d.FadeInFromZero(400, Easing.Out);
+                    };
+                    cover.OnLoadComplete += d => d.FadeInFromZero(400, Easing.Out);
+                    return cover;
+                }));
             }
         }
     }

From e39b2e7218acf876cea7c7efcaa6ae9a4faf7818 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Aug 2020 21:53:18 +0900
Subject: [PATCH 04202/10326] 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 241b836aac..f3fb949f76 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.812.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.814.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 63267e1494..a12ce138bd 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.812.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.814.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 3500eb75dc..0170e94140 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.Framework.iOS" Version="2020.812.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.814.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.812.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.814.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From c1a9bf507af61e2737c6c81dc06efcda3dac91c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 15 Aug 2020 13:06:53 +0200
Subject: [PATCH 04203/10326] Add failing test case

---
 .../Gameplay/TestSceneGameplayMenuOverlay.cs       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
index e8b8c7c8e9..fc9cbb073e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
@@ -272,7 +272,21 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("Overlay is closed", () => pauseOverlay.State.Value == Visibility.Hidden);
         }
 
+        [Test]
+        public void TestSelectionResetOnVisibilityChange()
+        {
+            showOverlay();
+            AddStep("Select last button", () => InputManager.Key(Key.Up));
+
+            hideOverlay();
+            showOverlay();
+
+            AddAssert("No button selected",
+                () => pauseOverlay.Buttons.All(button => !button.Selected.Value));
+        }
+
         private void showOverlay() => AddStep("Show overlay", () => pauseOverlay.Show());
+        private void hideOverlay() => AddStep("Hide overlay", () => pauseOverlay.Hide());
 
         private DialogButton getButton(int index) => pauseOverlay.Buttons.Skip(index).First();
 

From a426ff1d5b26e158c868cb49ec51f21a6f265971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 15 Aug 2020 13:36:00 +0200
Subject: [PATCH 04204/10326] Refactor gameplay menu overlay to fix regression

---
 osu.Game/Screens/Play/GameplayMenuOverlay.cs | 78 ++++++++++++--------
 1 file changed, 47 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index 57403a0987..f938839be3 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play
 
         public abstract string Description { get; }
 
-        protected internal FillFlowContainer<DialogButton> InternalButtons;
+        protected ButtonContainer InternalButtons;
         public IReadOnlyList<DialogButton> Buttons => InternalButtons;
 
         private FillFlowContainer retryCounterContainer;
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Play
         {
             RelativeSizeAxes = Axes.Both;
 
-            State.ValueChanged += s => selectionIndex = -1;
+            State.ValueChanged += s => InternalButtons.Deselect();
         }
 
         [BackgroundDependencyLoader]
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Play
                                 }
                             }
                         },
-                        InternalButtons = new FillFlowContainer<DialogButton>
+                        InternalButtons = new ButtonContainer
                         {
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
@@ -186,40 +186,16 @@ namespace osu.Game.Screens.Play
             InternalButtons.Add(button);
         }
 
-        private int selectionIndex = -1;
-
-        private void setSelected(int value)
-        {
-            if (selectionIndex == value)
-                return;
-
-            // Deselect the previously-selected button
-            if (selectionIndex != -1)
-                InternalButtons[selectionIndex].Selected.Value = false;
-
-            selectionIndex = value;
-
-            // Select the newly-selected button
-            if (selectionIndex != -1)
-                InternalButtons[selectionIndex].Selected.Value = true;
-        }
-
         public bool OnPressed(GlobalAction action)
         {
             switch (action)
             {
                 case GlobalAction.SelectPrevious:
-                    if (selectionIndex == -1 || selectionIndex == 0)
-                        setSelected(InternalButtons.Count - 1);
-                    else
-                        setSelected(selectionIndex - 1);
+                    InternalButtons.SelectPrevious();
                     return true;
 
                 case GlobalAction.SelectNext:
-                    if (selectionIndex == -1 || selectionIndex == InternalButtons.Count - 1)
-                        setSelected(0);
-                    else
-                        setSelected(selectionIndex + 1);
+                    InternalButtons.SelectNext();
                     return true;
 
                 case GlobalAction.Back:
@@ -241,9 +217,9 @@ namespace osu.Game.Screens.Play
         private void buttonSelectionChanged(DialogButton button, bool isSelected)
         {
             if (!isSelected)
-                setSelected(-1);
+                InternalButtons.Deselect();
             else
-                setSelected(InternalButtons.IndexOf(button));
+                InternalButtons.Select(button);
         }
 
         private void updateRetryCount()
@@ -277,6 +253,46 @@ namespace osu.Game.Screens.Play
             };
         }
 
+        protected class ButtonContainer : FillFlowContainer<DialogButton>
+        {
+            private int selectedIndex = -1;
+
+            private void setSelected(int value)
+            {
+                if (selectedIndex == value)
+                    return;
+
+                // Deselect the previously-selected button
+                if (selectedIndex != -1)
+                    this[selectedIndex].Selected.Value = false;
+
+                selectedIndex = value;
+
+                // Select the newly-selected button
+                if (selectedIndex != -1)
+                    this[selectedIndex].Selected.Value = true;
+            }
+
+            public void SelectNext()
+            {
+                if (selectedIndex == -1 || selectedIndex == Count - 1)
+                    setSelected(0);
+                else
+                    setSelected(selectedIndex + 1);
+            }
+
+            public void SelectPrevious()
+            {
+                if (selectedIndex == -1 || selectedIndex == 0)
+                    setSelected(Count - 1);
+                else
+                    setSelected(selectedIndex - 1);
+            }
+
+            public void Deselect() => setSelected(-1);
+            public void Select(DialogButton button) => setSelected(IndexOf(button));
+        }
+
         private class Button : DialogButton
         {
             // required to ensure keyboard navigation always starts from an extremity (unless the cursor is moved)

From 5c11270b988f7e8f85eddafe329d048d14228ad6 Mon Sep 17 00:00:00 2001
From: Ron B <me@ronthecookie.me>
Date: Sat, 15 Aug 2020 20:12:06 +0300
Subject: [PATCH 04205/10326] Add SpinnerFrequencyModulate skin config option

---
 .../Objects/Drawables/DrawableSpinner.cs                 | 9 ++++++---
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs   | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index d1a6463d72..273a9fda84 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
@@ -31,6 +32,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
 
+        private bool spinnerFrequencyModulate;
+
         public DrawableSpinner(Spinner s)
             : base(s)
         {
@@ -165,10 +168,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, ISkinSource skin)
         {
             positionBindable.BindValueChanged(pos => Position = pos.NewValue);
             positionBindable.BindTo(HitObject.PositionBindable);
+            spinnerFrequencyModulate = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerFrequencyModulate)?.Value ?? true;
         }
 
         /// <summary>
@@ -221,8 +225,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 RotationTracker.Tracking = !Result.HasResult && (OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
 
             if (spinningSample != null)
-                // todo: implement SpinnerFrequencyModulate
-                spinningSample.Frequency.Value = 0.5f + Progress;
+                spinningSample.Frequency.Value = spinnerFrequencyModulate ? 0.5f + Progress : 0.5f;
         }
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index 154160fdb5..54755bd9d5 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -13,6 +13,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         CursorExpand,
         CursorRotate,
         HitCircleOverlayAboveNumber,
-        HitCircleOverlayAboveNumer // Some old skins will have this typo
+        HitCircleOverlayAboveNumer, // Some old skins will have this typo
+		SpinnerFrequencyModulate
     }
 }

From 896a87e62921bfef2281a822eb20c784e3612fd2 Mon Sep 17 00:00:00 2001
From: Ron B <me@ronthecookie.me>
Date: Sat, 15 Aug 2020 20:14:36 +0300
Subject: [PATCH 04206/10326] Replace accidental tab with spaces

---
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index 54755bd9d5..1d34727c04 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         CursorExpand,
         CursorRotate,
         HitCircleOverlayAboveNumber,
-        HitCircleOverlayAboveNumer, // Some old skins will have this typo
+		HitCircleOverlayAboveNumer, // Some old skins will have this typo
 		SpinnerFrequencyModulate
     }
 }

From 61de3c75402f55704c07da9128778f35b374a52f Mon Sep 17 00:00:00 2001
From: Ron B <me@ronthecookie.me>
Date: Sat, 15 Aug 2020 20:16:28 +0300
Subject: [PATCH 04207/10326] Replace accidental tab with spaces

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

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index 1d34727c04..e034e14eb0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         CursorExpand,
         CursorRotate,
         HitCircleOverlayAboveNumber,
-		HitCircleOverlayAboveNumer, // Some old skins will have this typo
-		SpinnerFrequencyModulate
+        HitCircleOverlayAboveNumer, // Some old skins will have this typo
+        SpinnerFrequencyModulate
     }
 }

From 07c25d5a78d2df33e3d54d3922da6723c3622f2f Mon Sep 17 00:00:00 2001
From: Ron B <me@ronthecookie.me>
Date: Sat, 15 Aug 2020 20:51:33 +0300
Subject: [PATCH 04208/10326] Move spinnerFrequencyModulate set to ApplySkin

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 273a9fda84..5bf87ba16b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -172,6 +172,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             positionBindable.BindValueChanged(pos => Position = pos.NewValue);
             positionBindable.BindTo(HitObject.PositionBindable);
+        }
+
+        protected override void ApplySkin(ISkinSource skin, bool allowFallback)
+        {
             spinnerFrequencyModulate = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerFrequencyModulate)?.Value ?? true;
         }
 

From 40445d0005fe33943baf6350e8e2b35869e08643 Mon Sep 17 00:00:00 2001
From: Ron B <me@ronthecookie.me>
Date: Sat, 15 Aug 2020 21:07:44 +0300
Subject: [PATCH 04209/10326] replicate osu-stable behaviour for spinningSample
 frequency

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 5bf87ba16b..dfe10eeaab 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -104,6 +104,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 {
                     Volume = { Value = 0 },
                     Looping = true,
+                    Frequency = { Value = 1.0f }
                 });
             }
         }
@@ -228,8 +229,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (HandleUserInput)
                 RotationTracker.Tracking = !Result.HasResult && (OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
 
-            if (spinningSample != null)
-                spinningSample.Frequency.Value = spinnerFrequencyModulate ? 0.5f + Progress : 0.5f;
+            if (spinningSample != null && spinnerFrequencyModulate)
+                spinningSample.Frequency.Value = 0.5f + Progress;
         }
 
         protected override void UpdateAfterChildren()

From a1079bac3234f53f39e894dbd888321e21561907 Mon Sep 17 00:00:00 2001
From: Ron B <me@ronthecookie.me>
Date: Sat, 15 Aug 2020 21:19:47 +0300
Subject: [PATCH 04210/10326] Move frequency values into consts

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index dfe10eeaab..c44553a1c5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -85,6 +85,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         }
 
         private SkinnableSound spinningSample;
+        private const float SPINNING_SAMPLE_INITAL_FREQUENCY = 1.0f;
+        private const float SPINNING_SAMPLE_MODULATED_BASE_FREQUENCY = 0.5f;
 
         protected override void LoadSamples()
         {
@@ -104,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 {
                     Volume = { Value = 0 },
                     Looping = true,
-                    Frequency = { Value = 1.0f }
+                    Frequency = { Value = SPINNING_SAMPLE_INITAL_FREQUENCY }
                 });
             }
         }
@@ -230,7 +232,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 RotationTracker.Tracking = !Result.HasResult && (OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
 
             if (spinningSample != null && spinnerFrequencyModulate)
-                spinningSample.Frequency.Value = 0.5f + Progress;
+                spinningSample.Frequency.Value = SPINNING_SAMPLE_MODULATED_BASE_FREQUENCY + Progress;
         }
 
         protected override void UpdateAfterChildren()

From 390e87273065aef35335d3d1e617dc62c9ea90eb Mon Sep 17 00:00:00 2001
From: Ron B <me@ronthecookie.me>
Date: Sat, 15 Aug 2020 21:34:17 +0300
Subject: [PATCH 04211/10326] Fix acoording to review

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index c44553a1c5..a4636050bb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         }
 
         private SkinnableSound spinningSample;
-        private const float SPINNING_SAMPLE_INITAL_FREQUENCY = 1.0f;
+        private const float SPINNING_SAMPLE_INITIAL_FREQUENCY = 1.0f;
         private const float SPINNING_SAMPLE_MODULATED_BASE_FREQUENCY = 0.5f;
 
         protected override void LoadSamples()
@@ -106,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 {
                     Volume = { Value = 0 },
                     Looping = true,
-                    Frequency = { Value = SPINNING_SAMPLE_INITAL_FREQUENCY }
+                    Frequency = { Value = SPINNING_SAMPLE_INITIAL_FREQUENCY }
                 });
             }
         }
@@ -171,7 +171,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, ISkinSource skin)
+        private void load(OsuColour colours)
         {
             positionBindable.BindValueChanged(pos => Position = pos.NewValue);
             positionBindable.BindTo(HitObject.PositionBindable);
@@ -179,6 +179,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void ApplySkin(ISkinSource skin, bool allowFallback)
         {
+            base.ApplySkin(skin, allowFallback);
             spinnerFrequencyModulate = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerFrequencyModulate)?.Value ?? true;
         }
 

From 5f35b3ebb98821e2f8870964302e9c60dab84d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 15 Aug 2020 20:44:02 +0200
Subject: [PATCH 04212/10326] Fix constant casing

---
 .../Objects/Drawables/DrawableSpinner.cs                  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index a4636050bb..a57bb466c7 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -85,8 +85,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         }
 
         private SkinnableSound spinningSample;
-        private const float SPINNING_SAMPLE_INITIAL_FREQUENCY = 1.0f;
-        private const float SPINNING_SAMPLE_MODULATED_BASE_FREQUENCY = 0.5f;
+        private const float spinning_sample_initial_frequency = 1.0f;
+        private const float spinning_sample_modulated_base_frequency = 0.5f;
 
         protected override void LoadSamples()
         {
@@ -106,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 {
                     Volume = { Value = 0 },
                     Looping = true,
-                    Frequency = { Value = SPINNING_SAMPLE_INITIAL_FREQUENCY }
+                    Frequency = { Value = spinning_sample_initial_frequency }
                 });
             }
         }
@@ -233,7 +233,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 RotationTracker.Tracking = !Result.HasResult && (OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
 
             if (spinningSample != null && spinnerFrequencyModulate)
-                spinningSample.Frequency.Value = SPINNING_SAMPLE_MODULATED_BASE_FREQUENCY + Progress;
+                spinningSample.Frequency.Value = spinning_sample_modulated_base_frequency + Progress;
         }
 
         protected override void UpdateAfterChildren()

From c4a7fac760efde4622956f1fa3c581e469c8e508 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 15 Aug 2020 22:03:24 +0200
Subject: [PATCH 04213/10326] Add required parameters and other various changes

---
 .../Formats/LegacyBeatmapEncoderTest.cs       | 30 ++++++++++++++-----
 .../Beatmaps/IO/ImportBeatmapTest.cs          |  5 ++--
 .../Editing/EditorChangeHandlerTest.cs        |  6 ++--
 .../Editing/LegacyEditorBeatmapPatcherTest.cs |  8 +----
 osu.Game/Beatmaps/BeatmapManager.cs           |  4 +--
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 13 ++++----
 osu.Game/Screens/Edit/Editor.cs               |  7 +++--
 osu.Game/Screens/Edit/EditorChangeHandler.cs  | 11 +++----
 8 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index fba63f8539..38f730995e 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -28,13 +28,25 @@ namespace osu.Game.Tests.Beatmaps.Formats
     [TestFixture]
     public class LegacyBeatmapEncoderTest
     {
-        private static IEnumerable<string> allBeatmaps => TestResources.GetStore().GetAvailableResources().Where(res => res.EndsWith(".osu"));
+        private static readonly DllResourceStore resource_store = TestResources.GetStore();
+
+        private static IEnumerable<string> allBeatmaps = resource_store.GetAvailableResources().Where(res => res.EndsWith(".osu"));
+
+        private static Stream beatmapSkinStream = resource_store.GetStream("skin.ini");
+
+        private ISkin skin;
+
+        [SetUp]
+        public void Init()
+        {
+            skin = decodeSkinFromLegacy(beatmapSkinStream);
+        }
 
         [TestCaseSource(nameof(allBeatmaps))]
         public void TestEncodeDecodeStability(string name)
         {
-            var decoded = decodeFromLegacy(TestResources.GetStore().GetStream(name));
-            var decodedAfterEncode = decodeFromLegacy(encodeToLegacy(decoded));
+            var decoded = decodeBeatmapFromLegacy(TestResources.GetStore().GetStream(name));
+            var decodedAfterEncode = decodeBeatmapFromLegacy(encodeToLegacy(decoded, skin));
 
             sort(decoded);
             sort(decodedAfterEncode);
@@ -52,20 +64,24 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private IBeatmap decodeFromLegacy(Stream stream)
+        private IBeatmap decodeBeatmapFromLegacy(Stream stream)
         {
             using (var reader = new LineBufferedReader(stream))
                 return convert(new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(reader));
         }
 
-        private Stream encodeToLegacy(IBeatmap beatmap)
+        private ISkin decodeSkinFromLegacy(Stream stream)
+        {
+            using (var reader = new LineBufferedReader(stream))
+                return new LegacySkin(SkinInfo.Default, resource_store, null);
+        }
+
+        private Stream encodeToLegacy(IBeatmap beatmap, ISkin skin)
         {
             var stream = new MemoryStream();
 
             using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-            using (var rs = new ResourceStore<byte[]>())
             {
-                var skin = new LegacyBeatmapSkin(beatmap.BeatmapInfo, rs, null);
                 new LegacyBeatmapEncoder(beatmap, skin).Encode(writer);
             }
 
diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 0151678db3..17271184c0 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -730,7 +730,8 @@ namespace osu.Game.Tests.Beatmaps.IO
                     BeatmapSetInfo setToUpdate = manager.GetAllUsableBeatmapSets()[0];
 
                     var beatmapInfo = setToUpdate.Beatmaps.First(b => b.RulesetID == 0);
-                    Beatmap beatmapToUpdate = (Beatmap)manager.GetWorkingBeatmap(setToUpdate.Beatmaps.First(b => b.RulesetID == 0)).Beatmap;
+                    var workingBeatmap = manager.GetWorkingBeatmap(setToUpdate.Beatmaps.First(b => b.RulesetID == 0));
+                    Beatmap beatmapToUpdate = (Beatmap)workingBeatmap.Beatmap;
                     BeatmapSetFileInfo fileToUpdate = setToUpdate.Files.First(f => beatmapToUpdate.BeatmapInfo.Path.Contains(f.Filename));
 
                     string oldMd5Hash = beatmapToUpdate.BeatmapInfo.MD5Hash;
@@ -738,7 +739,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     beatmapToUpdate.HitObjects.Clear();
                     beatmapToUpdate.HitObjects.Add(new HitCircle { StartTime = 5000 });
 
-                    manager.Save(beatmapInfo, beatmapToUpdate);
+                    manager.Save(beatmapInfo, beatmapToUpdate, workingBeatmap.Skin);
 
                     // Check that the old file reference has been removed
                     Assert.That(manager.QueryBeatmapSet(s => s.ID == setToUpdate.ID).Files.All(f => f.ID != fileToUpdate.ID));
diff --git a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
index feda1ae0e9..6d708ce838 100644
--- a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
+++ b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void TestSaveRestoreState()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()), null);
 
             Assert.That(handler.CanUndo.Value, Is.False);
             Assert.That(handler.CanRedo.Value, Is.False);
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void TestMaxStatesSaved()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()), null);
 
             Assert.That(handler.CanUndo.Value, Is.False);
 
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void TestMaxStatesExceeded()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()), null);
 
             Assert.That(handler.CanUndo.Value, Is.False);
 
diff --git a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
index 74b6f66d85..b491157627 100644
--- a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
+++ b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
@@ -4,7 +4,6 @@
 using System.IO;
 using System.Text;
 using NUnit.Framework;
-using osu.Framework.IO.Stores;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
@@ -15,7 +14,6 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
-using osu.Game.Skinning;
 using osuTK;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
@@ -353,11 +351,7 @@ namespace osu.Game.Tests.Editing
             using (var encoded = new MemoryStream())
             {
                 using (var sw = new StreamWriter(encoded))
-                using (var rs = new ResourceStore<byte[]>())
-                {
-                    var skin = new LegacyBeatmapSkin(beatmap.BeatmapInfo, rs, null);
-                    new LegacyBeatmapEncoder(beatmap, skin).Encode(sw);
-                }
+                    new LegacyBeatmapEncoder(beatmap, null).Encode(sw);
 
                 return encoded.ToArray();
             }
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 06acd4e9f2..bd757d30ca 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -195,7 +195,8 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="info">The <see cref="BeatmapInfo"/> to save the content against. The file referenced by <see cref="BeatmapInfo.Path"/> will be replaced.</param>
         /// <param name="beatmapContent">The <see cref="IBeatmap"/> content to write.</param>
-        public void Save(BeatmapInfo info, IBeatmap beatmapContent)
+        /// <param name="skin">Optional beatmap skin for inline skin configuration in beatmap files.</param>
+        public void Save(BeatmapInfo info, IBeatmap beatmapContent, ISkin skin)
         {
             var setInfo = QueryBeatmapSet(s => s.Beatmaps.Any(b => b.ID == info.ID));
 
@@ -203,7 +204,6 @@ namespace osu.Game.Beatmaps
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
                 {
-                    var skin = new LegacyBeatmapSkin(info, Files.Store, audioManager);
                     new LegacyBeatmapEncoder(beatmapContent, skin).Encode(sw);
                 }
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index eb148794de..716f1bc814 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -24,14 +24,14 @@ namespace osu.Game.Beatmaps.Formats
         public const int LATEST_VERSION = 128;
 
         private readonly IBeatmap beatmap;
-        private readonly LegacyBeatmapSkin beatmapSkin;
+        private readonly ISkin skin;
 
         /// <param name="beatmap">The beatmap to encode</param>
-        /// <param name="beatmapSkin">An optional beatmap skin, for encoding the beatmap's combo colours.</param>
-        public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] LegacyBeatmapSkin beatmapSkin)
+        /// <param name="skin">An optional skin, for encoding the beatmap's combo colours. This will only work if the parameter is a type of <see cref="LegacyBeatmapSkin"/>.</param>
+        public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] ISkin skin)
         {
             this.beatmap = beatmap;
-            this.beatmapSkin = beatmapSkin;
+            this.skin = skin;
 
             if (beatmap.BeatmapInfo.RulesetID < 0 || beatmap.BeatmapInfo.RulesetID > 3)
                 throw new ArgumentException("Only beatmaps in the osu, taiko, catch, or mania rulesets can be encoded to the legacy beatmap format.", nameof(beatmap));
@@ -207,7 +207,10 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleComboColours(TextWriter writer)
         {
-            var colours = beatmapSkin?.Configuration.ComboColours;
+            if (!(skin is LegacyBeatmapSkin legacySkin))
+                return;
+
+            var colours = legacySkin?.Configuration.ComboColours;
 
             if (colours == null || colours.Count == 0)
                 return;
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index d92f3922c3..d52d832bf3 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -33,6 +33,7 @@ using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Edit.Timing;
 using osu.Game.Screens.Play;
+using osu.Game.Skinning;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Edit
@@ -64,6 +65,7 @@ namespace osu.Game.Screens.Edit
         private IBeatmap playableBeatmap;
         private EditorBeatmap editorBeatmap;
         private EditorChangeHandler changeHandler;
+        private ISkin beatmapSkin;
 
         private DependencyContainer dependencies;
 
@@ -92,6 +94,7 @@ namespace osu.Game.Screens.Edit
             try
             {
                 playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
+                beatmapSkin = Beatmap.Value.Skin;
             }
             catch (Exception e)
             {
@@ -104,7 +107,7 @@ namespace osu.Game.Screens.Edit
             AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap));
             dependencies.CacheAs(editorBeatmap);
 
-            changeHandler = new EditorChangeHandler(editorBeatmap);
+            changeHandler = new EditorChangeHandler(editorBeatmap, beatmapSkin);
             dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
 
             EditorMenuBar menuBar;
@@ -399,7 +402,7 @@ namespace osu.Game.Screens.Edit
                 clock.SeekForward(!clock.IsRunning, amount);
         }
 
-        private void saveBeatmap() => beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap);
+        private void saveBeatmap() => beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap, Beatmap.Value.Skin);
 
         private void exportBeatmap()
         {
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 6393093c74..f305d2a15d 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using osu.Framework.Bindables;
-using osu.Framework.IO.Stores;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Skinning;
@@ -27,6 +26,7 @@ namespace osu.Game.Screens.Edit
         private int currentState = -1;
 
         private readonly EditorBeatmap editorBeatmap;
+        private readonly ISkin beatmapSkin;
         private int bulkChangesStarted;
         private bool isRestoring;
 
@@ -36,7 +36,8 @@ namespace osu.Game.Screens.Edit
         /// Creates a new <see cref="EditorChangeHandler"/>.
         /// </summary>
         /// <param name="editorBeatmap">The <see cref="EditorBeatmap"/> to track the <see cref="HitObject"/>s of.</param>
-        public EditorChangeHandler(EditorBeatmap editorBeatmap)
+        /// <param name="beatmapSkin">The skin to track the inline skin configuration of.</param>
+        public EditorChangeHandler(EditorBeatmap editorBeatmap, ISkin beatmapSkin)
         {
             this.editorBeatmap = editorBeatmap;
 
@@ -46,6 +47,8 @@ namespace osu.Game.Screens.Edit
 
             patcher = new LegacyEditorBeatmapPatcher(editorBeatmap);
 
+            this.beatmapSkin = beatmapSkin;
+
             // Initial state.
             SaveState();
         }
@@ -87,10 +90,8 @@ namespace osu.Game.Screens.Edit
             using (var stream = new MemoryStream())
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                using (var rs = new ResourceStore<byte[]>())
                 {
-                    var skin = new LegacyBeatmapSkin(editorBeatmap.BeatmapInfo, rs, null);
-                    new LegacyBeatmapEncoder(editorBeatmap, skin).Encode(sw);
+                    new LegacyBeatmapEncoder(editorBeatmap, beatmapSkin).Encode(sw);
                 }
 
                 savedStates.Add(stream.ToArray());

From 9e4b9188e1266f1b719e6ba1212aa00ccf1ebbd8 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Sat, 15 Aug 2020 13:06:16 -0700
Subject: [PATCH 04214/10326] Cache LoungeSubScreen, separate method, rename
 option

---
 osu.Game/Online/Multiplayer/Room.cs           | 56 +++++++++++--------
 .../Multi/Lounge/Components/DrawableRoom.cs   |  4 +-
 .../Multi/Lounge/Components/RoomsContainer.cs | 11 +++-
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   | 14 +----
 4 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 01d9446bf6..5feebe8da1 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -104,47 +104,55 @@ namespace osu.Game.Online.Multiplayer
         public readonly Bindable<int> Position = new Bindable<int>(-1);
 
         /// <summary>
-        /// Copies the properties from another <see cref="Room"/> to this room.
+        /// Create a copy of this room, without information specific to it, such as Room ID or host
         /// </summary>
-        /// <param name="other">The room to copy</param>
-        /// <param name="duplicate">Whether the copy should exclude information unique to a specific room (i.e. when duplicating a room)</param>
-        public void CopyFrom(Room other, bool duplicate = false)
+        public Room CreateCopy()
         {
-            if (!duplicate)
+            Room newRoom = new Room
             {
-                RoomID.Value = other.RoomID.Value;
+                Name = { Value = Name.Value },
+                Availability = { Value = Availability.Value },
+                Type = { Value = Type.Value },
+                MaxParticipants = { Value = MaxParticipants.Value }
+            };
 
-                if (other.Host.Value != null && Host.Value?.Id != other.Host.Value.Id)
-                    Host.Value = other.Host.Value;
+            newRoom.Playlist.AddRange(Playlist);
 
-                ChannelId.Value = other.ChannelId.Value;
-                Status.Value = other.Status.Value;
-                ParticipantCount.Value = other.ParticipantCount.Value;
-                EndDate.Value = other.EndDate.Value;
-
-                if (DateTimeOffset.Now >= EndDate.Value)
-                    Status.Value = new RoomStatusEnded();
-
-                if (!RecentParticipants.SequenceEqual(other.RecentParticipants))
-                {
-                    RecentParticipants.Clear();
-                    RecentParticipants.AddRange(other.RecentParticipants);
-                }
-
-                Position.Value = other.Position.Value;
-            }
+            return newRoom;
+        }
 
+        public void CopyFrom(Room other)
+        {
+            RoomID.Value = other.RoomID.Value;
             Name.Value = other.Name.Value;
 
+            if (other.Host.Value != null && Host.Value?.Id != other.Host.Value.Id)
+                Host.Value = other.Host.Value;
+
+            ChannelId.Value = other.ChannelId.Value;
+            Status.Value = other.Status.Value;
             Availability.Value = other.Availability.Value;
             Type.Value = other.Type.Value;
             MaxParticipants.Value = other.MaxParticipants.Value;
+            ParticipantCount.Value = other.ParticipantCount.Value;
+            EndDate.Value = other.EndDate.Value;
+
+            if (DateTimeOffset.Now >= EndDate.Value)
+                Status.Value = new RoomStatusEnded();
 
             if (!Playlist.SequenceEqual(other.Playlist))
             {
                 Playlist.Clear();
                 Playlist.AddRange(other.Playlist);
             }
+
+            if (!RecentParticipants.SequenceEqual(other.RecentParticipants))
+            {
+                RecentParticipants.Clear();
+                RecentParticipants.AddRange(other.RecentParticipants);
+            }
+
+            Position.Value = other.Position.Value;
         }
 
         public bool ShouldSerializeRoomID() => false;
diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index 64fbae2503..db75df6054 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         public event Action<SelectionState> StateChanged;
 
-        public Action<Room> DuplicateRoom;
+        public Action DuplicateRoom;
 
         private readonly Box selectionBox;
         private CachedModelDependencyContainer<Room> dependencies;
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         public MenuItem[] ContextMenuItems => new MenuItem[]
         {
-            new OsuMenuItem("Duplicate", MenuItemType.Standard, () => DuplicateRoom?.Invoke(Room))
+            new OsuMenuItem("Create copy", MenuItemType.Standard, DuplicateRoom)
         };
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index f112dd80ee..206ce8da0f 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -38,7 +38,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         [Resolved]
         private IRoomManager roomManager { get; set; }
 
-        public Action<Room> DuplicateRoom;
+        [Resolved]
+        private LoungeSubScreen loungeSubScreen { get; set; }
 
         public RoomsContainer()
         {
@@ -96,7 +97,13 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             {
                 roomFlow.Add(new DrawableRoom(room)
                 {
-                    DuplicateRoom = DuplicateRoom,
+                    DuplicateRoom = () =>
+                    {
+                        Room newRoom = room.CreateCopy();
+                        newRoom.Name.Value = $"Copy of {room.Name.Value}";
+
+                        loungeSubScreen.Open(newRoom);
+                    },
                     Action = () =>
                     {
                         if (room == selectedRoom.Value)
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 5d68386398..a5b2499c76 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -18,6 +18,7 @@ using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.Lounge
 {
+    [Cached]
     public class LoungeSubScreen : MultiplayerSubScreen
     {
         public override string Title => "Lounge";
@@ -62,18 +63,7 @@ namespace osu.Game.Screens.Multi.Lounge
                                     RelativeSizeAxes = Axes.Both,
                                     ScrollbarOverlapsContent = false,
                                     Padding = new MarginPadding(10),
-                                    Child = roomsContainer = new RoomsContainer
-                                    {
-                                        JoinRequested = joinRequested,
-                                        DuplicateRoom = room =>
-                                        {
-                                            Room newRoom = new Room();
-                                            newRoom.CopyFrom(room, true);
-                                            newRoom.Name.Value = $"Copy of {room.Name.Value}";
-
-                                            Open(newRoom);
-                                        }
-                                    }
+                                    Child = roomsContainer = new RoomsContainer { JoinRequested = joinRequested }
                                 },
                                 loadingLayer = new LoadingLayer(roomsContainer),
                             }

From 0e8411f76c156110fb7e693292d5649dd2d17265 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 15 Aug 2020 22:06:26 +0200
Subject: [PATCH 04215/10326] Rename fields and make readonly

---
 .../Beatmaps/Formats/LegacyBeatmapEncoderTest.cs      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 38f730995e..63fdf2a8ae 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -32,14 +32,13 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
         private static IEnumerable<string> allBeatmaps = resource_store.GetAvailableResources().Where(res => res.EndsWith(".osu"));
 
-        private static Stream beatmapSkinStream = resource_store.GetStream("skin.ini");
-
+        private static readonly Stream beatmap_skin_stream = resource_store.GetStream("skin.ini");
         private ISkin skin;
 
         [SetUp]
         public void Init()
         {
-            skin = decodeSkinFromLegacy(beatmapSkinStream);
+            skin = decodeSkinFromLegacy(beatmap_skin_stream);
         }
 
         [TestCaseSource(nameof(allBeatmaps))]
@@ -76,14 +75,12 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 return new LegacySkin(SkinInfo.Default, resource_store, null);
         }
 
-        private Stream encodeToLegacy(IBeatmap beatmap, ISkin skin)
+        private Stream encodeToLegacy(IBeatmap beatmap, ISkin beatmapSkin)
         {
             var stream = new MemoryStream();
 
             using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-            {
-                new LegacyBeatmapEncoder(beatmap, skin).Encode(writer);
-            }
+                new LegacyBeatmapEncoder(beatmap, beatmapSkin).Encode(writer);
 
             stream.Position = 0;
 

From f5877810588dd76cd30b2ccde309e8c25cccccb7 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Sat, 15 Aug 2020 14:27:49 -0700
Subject: [PATCH 04216/10326] Allow LoungeSubScreen to be null (fix test)

---
 osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index 206ce8da0f..1954d97a8f 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         [Resolved]
         private IRoomManager roomManager { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private LoungeSubScreen loungeSubScreen { get; set; }
 
         public RoomsContainer()
@@ -100,9 +100,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                     DuplicateRoom = () =>
                     {
                         Room newRoom = room.CreateCopy();
-                        newRoom.Name.Value = $"Copy of {room.Name.Value}";
+                        if (!newRoom.Name.Value.StartsWith("Copy of "))
+                            newRoom.Name.Value = $"Copy of {room.Name.Value}";
 
-                        loungeSubScreen.Open(newRoom);
+                        loungeSubScreen?.Open(newRoom);
                     },
                     Action = () =>
                     {

From 3a6e378a08ce5fde5b23ee302f48ba4afdf4f113 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 15 Aug 2020 23:41:53 +0200
Subject: [PATCH 04217/10326] Change skin testing

---
 .../Formats/LegacyBeatmapEncoderTest.cs       | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 63fdf2a8ae..6ede30d7d8 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -32,25 +32,28 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
         private static IEnumerable<string> allBeatmaps = resource_store.GetAvailableResources().Where(res => res.EndsWith(".osu"));
 
-        private static readonly Stream beatmap_skin_stream = resource_store.GetStream("skin.ini");
-        private ISkin skin;
-
-        [SetUp]
-        public void Init()
-        {
-            skin = decodeSkinFromLegacy(beatmap_skin_stream);
-        }
-
         [TestCaseSource(nameof(allBeatmaps))]
         public void TestEncodeDecodeStability(string name)
         {
-            var decoded = decodeBeatmapFromLegacy(TestResources.GetStore().GetStream(name));
-            var decodedAfterEncode = decodeBeatmapFromLegacy(encodeToLegacy(decoded, skin));
+            var decoded = decodeFromLegacy(TestResources.GetStore().GetStream(name));
+            var decodedAfterEncode = decodeFromLegacy(encodeToLegacy(decoded));
 
-            sort(decoded);
-            sort(decodedAfterEncode);
+            sort(decoded.beatmap);
+            sort(decodedAfterEncode.beatmap);
 
-            Assert.That(decodedAfterEncode.Serialize(), Is.EqualTo(decoded.Serialize()));
+            Assert.That(decodedAfterEncode.beatmap.Serialize(), Is.EqualTo(decoded.beatmap.Serialize()));
+
+            areSkinsEqual(decoded.beatmapSkin, decodedAfterEncode.beatmapSkin);
+        }
+
+        private void areSkinsEqual(LegacySkin expected, LegacySkin actual)
+        {
+            var expectedColours = expected.Configuration.ComboColours;
+            var actualColours = actual.Configuration.ComboColours;
+
+            Assert.AreEqual(expectedColours.Count, actualColours.Count);
+            for (int i = 0; i < expectedColours.Count; i++)
+                Assert.AreEqual(expectedColours[i], actualColours[i]);
         }
 
         private void sort(IBeatmap beatmap)
@@ -63,20 +66,19 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private IBeatmap decodeBeatmapFromLegacy(Stream stream)
+        private (IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) decodeFromLegacy(Stream stream)
         {
             using (var reader = new LineBufferedReader(stream))
-                return convert(new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(reader));
+            {
+                var beatmap = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(reader);
+                var beatmapSkin = new LegacyBeatmapSkin(beatmap.BeatmapInfo, resource_store, null);
+                return (convert(beatmap), beatmapSkin);
+            }
         }
 
-        private ISkin decodeSkinFromLegacy(Stream stream)
-        {
-            using (var reader = new LineBufferedReader(stream))
-                return new LegacySkin(SkinInfo.Default, resource_store, null);
-        }
-
-        private Stream encodeToLegacy(IBeatmap beatmap, ISkin beatmapSkin)
+        private Stream encodeToLegacy((IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) fullBeatmap)
         {
+            var (beatmap, beatmapSkin) = fullBeatmap;
             var stream = new MemoryStream();
 
             using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))

From 48bdbb0cfbd9f94b8d9b4182290a1dec66c7c256 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 15 Aug 2020 23:46:10 +0200
Subject: [PATCH 04218/10326] Use existing field in Editor

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index d52d832bf3..a585db1ee9 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -402,7 +402,7 @@ namespace osu.Game.Screens.Edit
                 clock.SeekForward(!clock.IsRunning, amount);
         }
 
-        private void saveBeatmap() => beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap, Beatmap.Value.Skin);
+        private void saveBeatmap() => beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap, beatmapSkin);
 
         private void exportBeatmap()
         {

From 434354c44c2ab3f0bde6d0d04ade551b0a4d00ac Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 16 Aug 2020 00:21:26 +0200
Subject: [PATCH 04219/10326] Properly implement SkinConfiguration equality

---
 .../Beatmaps/Formats/LegacyBeatmapEncoderTest.cs    | 13 +------------
 osu.Game/Skinning/SkinConfiguration.cs              | 12 +++++++++++-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 6ede30d7d8..66b39648e5 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -42,18 +42,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             sort(decodedAfterEncode.beatmap);
 
             Assert.That(decodedAfterEncode.beatmap.Serialize(), Is.EqualTo(decoded.beatmap.Serialize()));
-
-            areSkinsEqual(decoded.beatmapSkin, decodedAfterEncode.beatmapSkin);
-        }
-
-        private void areSkinsEqual(LegacySkin expected, LegacySkin actual)
-        {
-            var expectedColours = expected.Configuration.ComboColours;
-            var actualColours = actual.Configuration.ComboColours;
-
-            Assert.AreEqual(expectedColours.Count, actualColours.Count);
-            for (int i = 0; i < expectedColours.Count; i++)
-                Assert.AreEqual(expectedColours[i], actualColours[i]);
+            Assert.IsTrue(decoded.beatmapSkin.Configuration.Equals(decodedAfterEncode.beatmapSkin.Configuration));
         }
 
         private void sort(IBeatmap beatmap)
diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index a55870aa6d..4b29111504 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Beatmaps.Formats;
 using osuTK.Graphics;
 
@@ -10,7 +12,7 @@ namespace osu.Game.Skinning
     /// <summary>
     /// An empty skin configuration.
     /// </summary>
-    public class SkinConfiguration : IHasComboColours, IHasCustomColours
+    public class SkinConfiguration : IHasComboColours, IHasCustomColours, IEquatable<SkinConfiguration>
     {
         public readonly SkinInfo SkinInfo = new SkinInfo();
 
@@ -48,5 +50,13 @@ namespace osu.Game.Skinning
         public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
 
         public readonly Dictionary<string, string> ConfigDictionary = new Dictionary<string, string>();
+
+        public bool Equals(SkinConfiguration other)
+        {
+            return other != null &&
+                   ConfigDictionary.SequenceEqual(other.ConfigDictionary) &&
+                   ComboColours.SequenceEqual(other.ComboColours) &&
+                   CustomColours.SequenceEqual(other.CustomColours);
+        }
     }
 }

From cfd82104dbe5f23b9a92f2129441f8a328bc80a1 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 16 Aug 2020 01:00:28 +0200
Subject: [PATCH 04220/10326] Minor changes and improvements

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 4 ++--
 osu.Game/Screens/Edit/EditorChangeHandler.cs                | 2 --
 osu.Game/Skinning/SkinConfiguration.cs                      | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 66b39648e5..db18f9b444 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private (IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) decodeFromLegacy(Stream stream)
+        private (IBeatmap beatmap, LegacySkin beatmapSkin) decodeFromLegacy(Stream stream)
         {
             using (var reader = new LineBufferedReader(stream))
             {
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private Stream encodeToLegacy((IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) fullBeatmap)
+        private Stream encodeToLegacy((IBeatmap beatmap, LegacySkin beatmapSkin) fullBeatmap)
         {
             var (beatmap, beatmapSkin) = fullBeatmap;
             var stream = new MemoryStream();
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index f305d2a15d..0489236d45 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -90,9 +90,7 @@ namespace osu.Game.Screens.Edit
             using (var stream = new MemoryStream())
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                {
                     new LegacyBeatmapEncoder(editorBeatmap, beatmapSkin).Encode(sw);
-                }
 
                 savedStates.Add(stream.ToArray());
             }
diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index 4b29111504..a48d713771 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Skinning
             return other != null &&
                    ConfigDictionary.SequenceEqual(other.ConfigDictionary) &&
                    ComboColours.SequenceEqual(other.ComboColours) &&
-                   CustomColours.SequenceEqual(other.CustomColours);
+                   CustomColours?.SequenceEqual(other.CustomColours) == true;
         }
     }
 }

From f98e96e45b22b3b34e56543f2249d43e62585d5f Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Sun, 16 Aug 2020 10:52:23 +0930
Subject: [PATCH 04221/10326] Add osu!-specific enum for confine mouse mode

---
 osu.Game/Input/OsuConfineMouseMode.cs | 37 +++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 osu.Game/Input/OsuConfineMouseMode.cs

diff --git a/osu.Game/Input/OsuConfineMouseMode.cs b/osu.Game/Input/OsuConfineMouseMode.cs
new file mode 100644
index 0000000000..32b456395c
--- /dev/null
+++ b/osu.Game/Input/OsuConfineMouseMode.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.ComponentModel;
+using osu.Framework.Input;
+
+namespace osu.Game.Input
+{
+    /// <summary>
+    /// Determines the situations in which the mouse cursor should be confined to the window.
+    /// Expands upon <see cref="ConfineMouseMode"/> by providing the option to confine during gameplay.
+    /// </summary>
+    public enum OsuConfineMouseMode
+    {
+        /// <summary>
+        /// The mouse cursor will be free to move outside the game window.
+        /// </summary>
+        Never,
+
+        /// <summary>
+        /// The mouse cursor will be locked to the window bounds while in fullscreen mode.
+        /// </summary>
+        Fullscreen,
+
+        /// <summary>
+        /// The mouse cursor will be locked to the window bounds during gameplay,
+        /// but may otherwise move freely.
+        /// </summary>
+        [Description("During Gameplay")]
+        DuringGameplay,
+
+        /// <summary>
+        /// The mouse cursor will always be locked to the window bounds while the game has focus.
+        /// </summary>
+        Always
+    }
+}

From 322d179076a383cf7fd2e7506e27189fba025278 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Sun, 16 Aug 2020 11:04:28 +0930
Subject: [PATCH 04222/10326] Replace settings item with osu! confine cursor
 mode

---
 osu.Game/Configuration/OsuConfigManager.cs                 | 3 +++
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index a8a8794320..9ef846c974 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -6,6 +6,7 @@ using osu.Framework.Configuration;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Extensions;
 using osu.Framework.Platform;
+using osu.Game.Input;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Select;
@@ -66,6 +67,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.MouseDisableButtons, false);
             Set(OsuSetting.MouseDisableWheel, false);
+            Set(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay);
 
             // Graphics
             Set(OsuSetting.ShowFpsDisplay, false);
@@ -191,6 +193,7 @@ namespace osu.Game.Configuration
         FadePlayfieldWhenHealthLow,
         MouseDisableButtons,
         MouseDisableWheel,
+        ConfineMouseMode,
         AudioOffset,
         VolumeInactive,
         MenuMusic,
diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index d27ab63fb7..0d98508e3b 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -6,9 +6,9 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
-using osu.Framework.Input;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -47,10 +47,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     LabelText = "Map absolute input to window",
                     Bindable = config.GetBindable<bool>(FrameworkSetting.MapAbsoluteInputToWindow)
                 },
-                new SettingsEnumDropdown<ConfineMouseMode>
+                new SettingsEnumDropdown<OsuConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor to window",
-                    Bindable = config.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode),
+                    Bindable = osuConfig.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode)
                 },
                 new SettingsCheckbox
                 {

From 3d6d22f70fbdc37b960d3cbc1bd90f78ba0fcb6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 16 Aug 2020 12:39:41 +0200
Subject: [PATCH 04223/10326] Adjust README.md to read better

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dc3ee63844..d3e9ca5121 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,9 @@
 [![CodeFactor](https://www.codefactor.io/repository/github/ppy/osu/badge)](https://www.codefactor.io/repository/github/ppy/osu)
 [![dev chat](https://discordapp.com/api/guilds/188630481301012481/widget.png?style=shield)](https://discord.gg/ppy)
 
-Rhythm is just a *click* away. The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Commonly known by the codename *osu!lazer*. Pew pew.
+A free-to-win rhythm game. Rhythm is just a *click* away!
+
+The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Commonly known by the codename *osu!lazer*. Pew pew.
 
 ## Status
 

From 6c44513115ec085bcdc181b3dd04a369130b6e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 16 Aug 2020 12:53:31 +0200
Subject: [PATCH 04224/10326] Update .csproj descriptions to match

---
 osu.Desktop/osu.Desktop.csproj | 2 +-
 osu.Desktop/osu.nuspec         | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 7a99c70999..62e8f7c518 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Description>click the circles. to the beat.</Description>
+    <Description>A free-to-win rhythm game. Rhythm is just a *click* away!</Description>
     <AssemblyName>osu!</AssemblyName>
     <Title>osu!lazer</Title>
     <Product>osu!lazer</Product>
diff --git a/osu.Desktop/osu.nuspec b/osu.Desktop/osu.nuspec
index a919d54f38..2fc6009183 100644
--- a/osu.Desktop/osu.nuspec
+++ b/osu.Desktop/osu.nuspec
@@ -9,8 +9,7 @@
         <projectUrl>https://osu.ppy.sh/</projectUrl>
         <iconUrl>https://puu.sh/tYyXZ/9a01a5d1b0.ico</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>click the circles. to the beat.</description>
-        <summary>click the circles.</summary>
+        <description>A free-to-win rhythm game. Rhythm is just a *click* away!</description>
         <releaseNotes>testing</releaseNotes>
         <copyright>Copyright (c) 2020 ppy Pty Ltd</copyright>
         <language>en-AU</language>

From ef3c8fa21f8105ec181be6392bd65c929a597f40 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Sun, 16 Aug 2020 11:38:35 +0930
Subject: [PATCH 04225/10326] Add tracking component to handle
 OsuConfineMouseMode

---
 osu.Game/Input/ConfineMouseTracker.cs | 72 +++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 osu.Game/Input/ConfineMouseTracker.cs

diff --git a/osu.Game/Input/ConfineMouseTracker.cs b/osu.Game/Input/ConfineMouseTracker.cs
new file mode 100644
index 0000000000..b111488a5b
--- /dev/null
+++ b/osu.Game/Input/ConfineMouseTracker.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Input;
+using osu.Game.Configuration;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Input
+{
+    /// <summary>
+    /// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>
+    /// while providing a property for <see cref="Player"/> to indicate whether gameplay is currently active.
+    /// </summary>
+    public class ConfineMouseTracker : Component
+    {
+        private Bindable<ConfineMouseMode> frameworkConfineMode;
+        private Bindable<OsuConfineMouseMode> osuConfineMode;
+
+        private bool gameplayActive;
+
+        /// <summary>
+        /// Indicates whether osu! is currently considered "in gameplay" for the
+        /// purposes of <see cref="OsuConfineMouseMode.DuringGameplay"/>.
+        /// </summary>
+        public bool GameplayActive
+        {
+            get => gameplayActive;
+            set
+            {
+                if (gameplayActive == value)
+                    return;
+
+                gameplayActive = value;
+                updateConfineMode();
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(FrameworkConfigManager frameworkConfigManager, OsuConfigManager osuConfigManager)
+        {
+            frameworkConfineMode = frameworkConfigManager.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode);
+            osuConfineMode = osuConfigManager.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode);
+            osuConfineMode.BindValueChanged(_ => updateConfineMode(), true);
+        }
+
+        private void updateConfineMode()
+        {
+            switch (osuConfineMode.Value)
+            {
+                case OsuConfineMouseMode.Never:
+                    frameworkConfineMode.Value = ConfineMouseMode.Never;
+                    break;
+
+                case OsuConfineMouseMode.Fullscreen:
+                    frameworkConfineMode.Value = ConfineMouseMode.Fullscreen;
+                    break;
+
+                case OsuConfineMouseMode.DuringGameplay:
+                    frameworkConfineMode.Value = GameplayActive ? ConfineMouseMode.Always : ConfineMouseMode.Never;
+                    break;
+
+                case OsuConfineMouseMode.Always:
+                    frameworkConfineMode.Value = ConfineMouseMode.Always;
+                    break;
+            }
+        }
+    }
+}

From 00f15231bc78a6e7830694bf41cbc1db331e505f Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Sun, 16 Aug 2020 21:52:39 +0930
Subject: [PATCH 04226/10326] Cache ConfineMouseTracker

---
 osu.Game/OsuGame.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 053eb01dcd..7358918758 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -88,6 +88,8 @@ namespace osu.Game
 
         private IdleTracker idleTracker;
 
+        private ConfineMouseTracker confineMouseTracker;
+
         public readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>();
 
         protected OsuScreenStack ScreenStack;
@@ -553,6 +555,7 @@ namespace osu.Game
             BackButton.Receptor receptor;
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
+            dependencies.Cache(confineMouseTracker = new ConfineMouseTracker());
 
             AddRange(new Drawable[]
             {
@@ -588,7 +591,8 @@ namespace osu.Game
                 rightFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 leftFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 topMostOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
-                idleTracker
+                idleTracker,
+                confineMouseTracker
             });
 
             ScreenStack.ScreenPushed += screenPushed;

From 85b3fff9c8a695d89453b0dbd1b55eb0d27fe5e4 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Sun, 16 Aug 2020 23:11:09 +0930
Subject: [PATCH 04227/10326] Update mouse confine when gameplay state changes

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 541275cf55..3b8c4aea01 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -18,6 +18,7 @@ using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
+using osu.Game.Input;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
@@ -63,6 +64,9 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> mouseWheelDisabled;
 
+        [Resolved(CanBeNull = true)]
+        private ConfineMouseTracker confineMouseTracker { get; set; }
+
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
         public int RestartCount;
@@ -197,10 +201,15 @@ namespace osu.Game.Screens.Play
                 skipOverlay.Hide();
             }
 
-            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
+            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ =>
+            {
+                updatePauseOnFocusLostState();
+                updateConfineMouse();
+            }, true);
 
             // bind clock into components that require it
             DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);
+            DrawableRuleset.IsPaused.ValueChanged += _ => updateConfineMouse();
 
             DrawableRuleset.OnNewResult += r =>
             {
@@ -346,6 +355,12 @@ namespace osu.Game.Screens.Play
                                                      && !DrawableRuleset.HasReplayLoaded.Value
                                                      && !breakTracker.IsBreakTime.Value;
 
+        private void updateConfineMouse()
+        {
+            if (confineMouseTracker != null)
+                confineMouseTracker.GameplayActive = !GameplayClockContainer.IsPaused.Value && !DrawableRuleset.HasReplayLoaded.Value && !HasFailed;
+        }
+
         private IBeatmap loadPlayableBeatmap()
         {
             IBeatmap playable;
@@ -379,7 +394,7 @@ namespace osu.Game.Screens.Play
             }
             catch (Exception e)
             {
-                Logger.Error(e, "Could not load beatmap sucessfully!");
+                Logger.Error(e, "Could not load beatmap successfully!");
                 //couldn't load, hard abort!
                 return null;
             }

From a6708c4286d3973c8ed68be43176228da1137237 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 Aug 2020 23:04:49 +0900
Subject: [PATCH 04228/10326] Rename resolved variable in MainMenu

---
 osu.Game/Screens/Menu/MainMenu.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 470e8ca9a6..fac9e9eb49 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Menu
         private GameHost host { get; set; }
 
         [Resolved]
-        private MusicController music { get; set; }
+        private MusicController musicController { get; set; }
 
         [Resolved(canBeNull: true)]
         private LoginOverlay login { get; set; }
@@ -176,12 +176,12 @@ namespace osu.Game.Screens.Menu
 
             var metadata = Beatmap.Value.Metadata;
 
-            if (last is IntroScreen && music.TrackLoaded)
+            if (last is IntroScreen && musicController.TrackLoaded)
             {
-                if (!music.CurrentTrack.IsRunning)
+                if (!musicController.CurrentTrack.IsRunning)
                 {
-                    music.CurrentTrack.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * music.CurrentTrack.Length);
-                    music.CurrentTrack.Start();
+                    musicController.CurrentTrack.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * musicController.CurrentTrack.Length);
+                    musicController.CurrentTrack.Start();
                 }
             }
 
@@ -256,7 +256,7 @@ namespace osu.Game.Screens.Menu
             // we may have consumed our preloaded instance, so let's make another.
             preloadSongSelect();
 
-            music.EnsurePlayingSomething();
+            musicController.EnsurePlayingSomething();
         }
 
         public override bool OnExiting(IScreen next)

From 5d433c0b055d3c284b1737df65856f5e118a817f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 Aug 2020 23:11:29 +0900
Subject: [PATCH 04229/10326] Fix a couple of new Resharper inspections

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 30e5e9702e..5ba7a8ddc3 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -324,10 +324,9 @@ namespace osu.Game.Screens.Menu
 
                             bool impact = logo.Scale.X > 0.6f;
 
-                            if (lastState == ButtonSystemState.Initial)
-                                logo.ScaleTo(0.5f, 200, Easing.In);
+                            logo.ScaleTo(0.5f, 200, Easing.In);
 
-                            logoTrackingContainer.StartTracking(logo, lastState == ButtonSystemState.EnteringMode ? 0 : 200, Easing.In);
+                            logoTrackingContainer.StartTracking(logo, 200, Easing.In);
 
                             logoDelayedAction?.Cancel();
                             logoDelayedAction = Scheduler.AddDelayed(() =>

From 589d4eeb5297a046b7001cb7c55a2e9b5c3ea824 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 16 Aug 2020 17:18:40 +0200
Subject: [PATCH 04230/10326] Remove setting.

---
 .../Visual/Gameplay/TestSceneOverlayActivation.cs  | 12 ------------
 osu.Game/Configuration/OsuConfigManager.cs         |  2 --
 .../Settings/Sections/Gameplay/GeneralSettings.cs  |  5 -----
 osu.Game/Screens/Play/Player.cs                    | 14 ++++++--------
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
index 04c67433fa..3ee0f4e720 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
@@ -3,7 +3,6 @@
 
 using System.Linq;
 using NUnit.Framework;
-using osu.Game.Configuration;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 
@@ -16,21 +15,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestGameplayOverlayActivation()
         {
-            AddStep("disable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, true));
             AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
         }
 
-        [Test]
-        public void TestGameplayOverlayActivationDisabled()
-        {
-            AddStep("enable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, false));
-            AddAssert("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
-        }
-
         [Test]
         public void TestGameplayOverlayActivationPaused()
         {
-            AddStep("disable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, true));
             AddUntilStep("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
             AddStep("pause gameplay", () => Player.Pause());
             AddUntilStep("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
@@ -39,7 +29,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestGameplayOverlayActivationReplayLoaded()
         {
-            AddStep("disable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, true));
             AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
             AddStep("load a replay", () => Player.DrawableRuleset.HasReplayLoaded.Value = true);
             AddAssert("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
@@ -48,7 +37,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestGameplayOverlayActivationBreaks()
         {
-            AddStep("disable overlay activation during gameplay", () => LocalConfig.Set(OsuSetting.GameplayDisableOverlayActivation, true));
             AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
             AddStep("seek to break", () => Player.GameplayClockContainer.Seek(Beatmap.Value.Beatmap.Breaks.First().StartTime));
             AddUntilStep("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 44c0fbde82..d49c78183e 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -100,7 +100,6 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.IncreaseFirstObjectVisibility, true);
             Set(OsuSetting.GameplayDisableWinKey, true);
-            Set(OsuSetting.GameplayDisableOverlayActivation, true);
 
             // Update
             Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
@@ -233,6 +232,5 @@ namespace osu.Game.Configuration
         HitLighting,
         MenuBackgroundSource,
         GameplayDisableWinKey,
-        GameplayDisableOverlayActivation
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index c2e668fe68..0149e6c3a6 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -77,11 +77,6 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Score display mode",
                     Bindable = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode)
-                },
-                new SettingsCheckbox
-                {
-                    LabelText = "Disable overlays during gameplay",
-                    Bindable = config.GetBindable<bool>(OsuSetting.GameplayDisableOverlayActivation)
                 }
             };
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 6bb4be4096..17838e0502 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -69,8 +69,6 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> mouseWheelDisabled;
 
-        private Bindable<bool> gameplayOverlaysDisabled;
-
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
         public int RestartCount;
@@ -176,7 +174,6 @@ namespace osu.Game.Screens.Play
             sampleRestart = audio.Samples.Get(@"Gameplay/restart");
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
-            gameplayOverlaysDisabled = config.GetBindable<bool>(OsuSetting.GameplayDisableOverlayActivation);
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
 
@@ -212,6 +209,10 @@ namespace osu.Game.Screens.Play
             if (game != null)
                 OverlayActivationMode.BindTo(game.OverlayActivationMode);
 
+            DrawableRuleset.IsPaused.BindValueChanged(_ => updateOverlayActivationMode());
+            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateOverlayActivationMode());
+            breakTracker.IsBreakTime.BindValueChanged(_ => updateOverlayActivationMode());
+
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
             // bind clock into components that require it
@@ -358,7 +359,7 @@ namespace osu.Game.Screens.Play
 
         private void updateOverlayActivationMode()
         {
-            bool canTriggerOverlays = DrawableRuleset.IsPaused.Value || breakTracker.IsBreakTime.Value || !gameplayOverlaysDisabled.Value;
+            bool canTriggerOverlays = DrawableRuleset.IsPaused.Value || breakTracker.IsBreakTime.Value;
 
             if (DrawableRuleset.HasReplayLoaded.Value || canTriggerOverlays)
                 OverlayActivationMode.Value = OverlayActivation.UserTriggered;
@@ -653,10 +654,7 @@ namespace osu.Game.Screens.Play
             foreach (var mod in Mods.Value.OfType<IApplicableToHUD>())
                 mod.ApplyToHUD(HUDOverlay);
 
-            DrawableRuleset.IsPaused.BindValueChanged(_ => updateOverlayActivationMode());
-            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateOverlayActivationMode());
-            breakTracker.IsBreakTime.BindValueChanged(_ => updateOverlayActivationMode());
-            gameplayOverlaysDisabled.BindValueChanged(_ => updateOverlayActivationMode(), true);
+            updateOverlayActivationMode();
         }
 
         public override void OnSuspending(IScreen next)

From 948c3cfbf1fe65a5974b13f555e84f2fd3566db1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Aug 2020 14:56:05 +0900
Subject: [PATCH 04231/10326] Improve visibility of toolbar tooltips against
 bright backgrounds

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 5bdd86c671..beac6adc59 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -118,9 +118,9 @@ namespace osu.Game.Overlays.Toolbar
                         RelativeSizeAxes = Axes.X,
                         Anchor = Anchor.BottomLeft,
                         Alpha = 0,
-                        Height = 90,
+                        Height = 100,
                         Colour = ColourInfo.GradientVertical(
-                            OsuColour.Gray(0.1f).Opacity(0.5f), OsuColour.Gray(0.1f).Opacity(0)),
+                            OsuColour.Gray(0).Opacity(0.9f), OsuColour.Gray(0).Opacity(0)),
                     },
                 };
             }

From d9debef1568a393f0da721759d09206ffe5c3701 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Aug 2020 15:38:16 +0900
Subject: [PATCH 04232/10326] Add explicit LoadTrack method

---
 .../TestSceneGameplayClockContainer.cs        |  4 +++-
 .../Gameplay/TestSceneStoryboardSamples.cs    |  5 ++--
 .../Visual/Gameplay/TestSceneSkipOverlay.cs   |  3 ++-
 osu.Game/Beatmaps/IWorkingBeatmap.cs          |  2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs           | 23 ++++++++++++++++++-
 osu.Game/Overlays/MusicController.cs          |  2 +-
 osu.Game/Screens/Edit/EditorClock.cs          |  2 +-
 osu.Game/Screens/Menu/IntroScreen.cs          |  2 +-
 .../Screens/Play/GameplayClockContainer.cs    |  4 ++--
 osu.Game/Screens/Play/Player.cs               |  2 +-
 10 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
index bb60ae73db..dc9f540907 100644
--- a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
@@ -22,7 +22,9 @@ namespace osu.Game.Tests.Gameplay
             AddStep("create container", () =>
             {
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
-                Add(gcc = new GameplayClockContainer(working.GetTrack(), working, Array.Empty<Mod>(), 0));
+                working.LoadTrack();
+
+                Add(gcc = new GameplayClockContainer(working, Array.Empty<Mod>(), 0));
             });
 
             AddStep("start track", () => gcc.Start());
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 360e7eccdc..6f788a070e 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -60,8 +60,9 @@ namespace osu.Game.Tests.Gameplay
             AddStep("create container", () =>
             {
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+                working.LoadTrack();
 
-                Add(gameplayContainer = new GameplayClockContainer(working.GetTrack(), working, Array.Empty<Mod>(), 0));
+                Add(gameplayContainer = new GameplayClockContainer(working, Array.Empty<Mod>(), 0));
 
                 gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
                 {
@@ -105,7 +106,7 @@ namespace osu.Game.Tests.Gameplay
                 Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, Audio);
                 SelectedMods.Value = new[] { testedMod };
 
-                Add(gameplayContainer = new GameplayClockContainer(MusicController.CurrentTrack, Beatmap.Value, SelectedMods.Value, 0));
+                Add(gameplayContainer = new GameplayClockContainer(Beatmap.Value, SelectedMods.Value, 0));
 
                 gameplayContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
                 {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index 58fd760fc3..c7e5e2a7ec 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -33,8 +33,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             increment = skip_time;
 
             var working = CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
+            working.LoadTrack();
 
-            Child = gameplayClockContainer = new GameplayClockContainer(working.GetTrack(), working, Array.Empty<Mod>(), 0)
+            Child = gameplayClockContainer = new GameplayClockContainer(working, Array.Empty<Mod>(), 0)
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index e020625b99..88d73fd7c4 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -58,6 +58,6 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Retrieves the <see cref="Track"/> which this <see cref="WorkingBeatmap"/> provides.
         /// </summary>
-        Track GetTrack();
+        Track LoadTrack();
     }
 }
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index bec2679103..b4046a4e95 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -250,8 +250,29 @@ namespace osu.Game.Beatmaps
         protected abstract Texture GetBackground();
         private readonly RecyclableLazy<Texture> background;
 
+        private Track loadedTrack;
+
+        /// <summary>
+        /// Load a new audio track instance for this beatmap.
+        /// </summary>
+        /// <returns>A fresh track instance, which will also be available via <see cref="Track"/>.</returns>
         [NotNull]
-        public Track GetTrack() => GetBeatmapTrack() ?? GetVirtualTrack(1000);
+        public Track LoadTrack() => loadedTrack = GetBeatmapTrack() ?? GetVirtualTrack(1000);
+
+        /// <summary>
+        /// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called.
+        /// This generally happens via MusicController when changing the global beatmap.
+        /// </summary>
+        public Track Track
+        {
+            get
+            {
+                if (loadedTrack == null)
+                    throw new InvalidOperationException($"Cannot access {nameof(Track)} without first calling {nameof(LoadTrack)}.");
+
+                return loadedTrack;
+            }
+        }
 
         protected abstract Track GetBeatmapTrack();
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index c18b564b4f..8bbae33811 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -319,7 +319,7 @@ namespace osu.Game.Overlays
         {
             var lastTrack = CurrentTrack;
 
-            var newTrack = new DrawableTrack(current.GetTrack());
+            var newTrack = new DrawableTrack(current.LoadTrack());
             newTrack.Completed += () => onTrackCompleted(current);
 
             CurrentTrack = newTrack;
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index d0e265adb0..634a6f7e25 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Edit
         private readonly DecoupleableInterpolatingFramedClock underlyingClock;
 
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
-            : this(beatmap.Beatmap.ControlPointInfo, beatmap.GetTrack().Length, beatDivisor)
+            : this(beatmap.Beatmap.ControlPointInfo, beatmap.Track.Length, beatDivisor)
         {
         }
 
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 389629445c..3e4320ae44 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.Menu
                 if (setInfo != null)
                 {
                     initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-                    UsingThemedIntro = !initialBeatmap.GetTrack().IsDummyDevice;
+                    UsingThemedIntro = !initialBeatmap.LoadTrack().IsDummyDevice;
                 }
 
                 return UsingThemedIntro;
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index f0bbcf957a..50a7331e4f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -62,12 +62,12 @@ namespace osu.Game.Screens.Play
 
         private readonly FramedOffsetClock platformOffsetClock;
 
-        public GameplayClockContainer([NotNull] ITrack track, WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
+        public GameplayClockContainer(WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
         {
             this.beatmap = beatmap;
             this.mods = mods;
             this.gameplayStartTime = gameplayStartTime;
-            this.track = track;
+            track = beatmap.Track;
 
             firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e92164de7c..ccdd4ea8a4 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -179,7 +179,7 @@ namespace osu.Game.Screens.Play
             if (!ScoreProcessor.Mode.Disabled)
                 config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
 
-            InternalChild = GameplayClockContainer = new GameplayClockContainer(musicController.CurrentTrack, Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
+            InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
 
             AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap));
             AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer));

From 93a8bc3d5aa330cb6ef008ac8858ae4d005434aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Aug 2020 22:36:03 +0900
Subject: [PATCH 04233/10326] Remove local reset method in
 GameplayClockContainer

---
 .../TestSceneGameplayClockContainer.cs        |  4 +--
 .../Gameplay/TestSceneStoryboardSamples.cs    |  4 +--
 .../Visual/Gameplay/TestSceneSkipOverlay.cs   |  4 +--
 .../Screens/Play/GameplayClockContainer.cs    | 31 +++++++------------
 osu.Game/Screens/Play/Player.cs               |  2 +-
 osu.Game/Tests/Visual/PlayerTestScene.cs      |  2 ++
 6 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
index dc9f540907..891537c4ad 100644
--- a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
@@ -1,10 +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 NUnit.Framework;
 using osu.Framework.Testing;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual;
@@ -24,7 +22,7 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gcc = new GameplayClockContainer(working, Array.Empty<Mod>(), 0));
+                Add(gcc = new GameplayClockContainer(working, 0));
             });
 
             AddStep("start track", () => gcc.Start());
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 6f788a070e..a690eb3b59 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gameplayContainer = new GameplayClockContainer(working, Array.Empty<Mod>(), 0));
+                Add(gameplayContainer = new GameplayClockContainer(working, 0));
 
                 gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
                 {
@@ -106,7 +106,7 @@ namespace osu.Game.Tests.Gameplay
                 Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, Audio);
                 SelectedMods.Value = new[] { testedMod };
 
-                Add(gameplayContainer = new GameplayClockContainer(Beatmap.Value, SelectedMods.Value, 0));
+                Add(gameplayContainer = new GameplayClockContainer(Beatmap.Value, 0));
 
                 gameplayContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
                 {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index c7e5e2a7ec..841722a8f1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -1,11 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
 using osuTK;
@@ -35,7 +33,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             var working = CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
             working.LoadTrack();
 
-            Child = gameplayClockContainer = new GameplayClockContainer(working, Array.Empty<Mod>(), 0)
+            Child = gameplayClockContainer = new GameplayClockContainer(working, 0)
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 50a7331e4f..7a9cb3dddd 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.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.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
@@ -16,7 +15,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.Play
 {
@@ -26,7 +24,6 @@ namespace osu.Game.Screens.Play
     public class GameplayClockContainer : Container
     {
         private readonly WorkingBeatmap beatmap;
-        private readonly IReadOnlyList<Mod> mods;
 
         [NotNull]
         private ITrack track;
@@ -62,10 +59,9 @@ namespace osu.Game.Screens.Play
 
         private readonly FramedOffsetClock platformOffsetClock;
 
-        public GameplayClockContainer(WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
+        public GameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime)
         {
             this.beatmap = beatmap;
-            this.mods = mods;
             this.gameplayStartTime = gameplayStartTime;
             track = beatmap.Track;
 
@@ -122,13 +118,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();
+                track.Seek(0);
+                track.Stop();
 
                 Schedule(() =>
                 {
@@ -216,14 +209,13 @@ namespace osu.Game.Screens.Play
 
         private void updateRate()
         {
-            speedAdjustmentsApplied = true;
-            track.ResetSpeedAdjustments();
+            if (speedAdjustmentsApplied)
+                return;
 
             track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
-            foreach (var mod in mods.OfType<IApplicableToTrack>())
-                mod.ApplyToTrack(track);
+            speedAdjustmentsApplied = true;
         }
 
         protected override void Dispose(bool isDisposing)
@@ -234,11 +226,12 @@ namespace osu.Game.Screens.Play
 
         private void removeSourceClockAdjustments()
         {
-            if (speedAdjustmentsApplied)
-            {
-                track.ResetSpeedAdjustments();
-                speedAdjustmentsApplied = false;
-            }
+            if (!speedAdjustmentsApplied) return;
+
+            track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+
+            speedAdjustmentsApplied = false;
         }
 
         private class HardwareCorrectionOffsetClock : FramedOffsetClock
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ccdd4ea8a4..cc70995b26 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -179,7 +179,7 @@ namespace osu.Game.Screens.Play
             if (!ScoreProcessor.Mode.Disabled)
                 config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
 
-            InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
+            InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, DrawableRuleset.GameplayStartTime);
 
             AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap));
             AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer));
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 2c46e7f6d3..7d06c99133 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Tests.Visual
         {
             Dependencies.Cache(LocalConfig = new OsuConfigManager(LocalStorage));
             LocalConfig.GetBindable<double>(OsuSetting.DimLevel).Value = 1.0;
+
+            MusicController.AllowRateAdjustments = true;
         }
 
         [SetUpSteps]

From 548ccc1a50694b931924d7cc0b8d0e49803f3037 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 Aug 2020 00:29:00 +0900
Subject: [PATCH 04234/10326] Initial implementation of hold note freezing

---
 .../Objects/Drawables/DrawableHoldNote.cs     | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 0c5289efe1..39b1771643 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.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.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
@@ -11,6 +12,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -32,6 +34,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private readonly Container<DrawableHoldNoteTail> tailContainer;
         private readonly Container<DrawableHoldNoteTick> tickContainer;
 
+        private readonly Container bodyPieceContainer;
         private readonly Drawable bodyPiece;
 
         /// <summary>
@@ -44,19 +47,25 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// </summary>
         public bool HasBroken { get; private set; }
 
+        /// <summary>
+        /// Whether the hold note has been released potentially without having caused a break.
+        /// </summary>
+        private bool hasReleased;
+
         public DrawableHoldNote(HoldNote hitObject)
             : base(hitObject)
         {
             RelativeSizeAxes = Axes.X;
 
-            AddRangeInternal(new[]
+            AddRangeInternal(new Drawable[]
             {
-                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
+                bodyPieceContainer = new Container
                 {
-                    RelativeSizeAxes = Axes.Both
-                })
-                {
-                    RelativeSizeAxes = Axes.X
+                    RelativeSizeAxes = Axes.X,
+                    Child = bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    })
                 },
                 tickContainer = new Container<DrawableHoldNoteTick> { RelativeSizeAxes = Axes.Both },
                 headContainer = new Container<DrawableHoldNoteHead> { RelativeSizeAxes = Axes.Both },
@@ -127,7 +136,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.OnDirectionChanged(e);
 
-            bodyPiece.Anchor = bodyPiece.Origin = e.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+            bodyPieceContainer.Anchor = bodyPieceContainer.Origin = e.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+            bodyPieceContainer.Anchor = bodyPieceContainer.Origin = e.NewValue == ScrollingDirection.Up ? Anchor.BottomLeft : Anchor.TopLeft;
         }
 
         public override void PlaySamples()
@@ -140,8 +150,14 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             base.Update();
 
             // Make the body piece not lie under the head note
-            bodyPiece.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
-            bodyPiece.Height = DrawHeight - Head.Height / 2 + Tail.Height / 2;
+            bodyPieceContainer.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
+            bodyPieceContainer.Height = DrawHeight - Head.Height / 2 + Tail.Height / 2;
+
+            if (Head.IsHit && !hasReleased)
+            {
+                float heightDecrease = (float)(Math.Max(0, Time.Current - HitObject.StartTime) / HitObject.Duration);
+                bodyPiece.Height = MathHelper.Clamp(1 - heightDecrease, 0, 1);
+            }
         }
 
         protected override void UpdateStateTransforms(ArmedState state)
@@ -206,6 +222,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // If the key has been released too early, the user should not receive full score for the release
             if (!Tail.IsHit)
                 HasBroken = true;
+
+            hasReleased = true;
         }
 
         private void endHold()

From b969bc03e0d48b91c1c17eec744b948945dec70a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Aug 2020 00:47:32 +0900
Subject: [PATCH 04235/10326] Add loading spinner while editor screen loads

---
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index e9ff0b5598..67442aa55e 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -7,6 +7,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK.Graphics;
@@ -32,6 +33,8 @@ namespace osu.Game.Screens.Edit
 
             Container mainContent;
 
+            LoadingSpinner spinner;
+
             Children = new Drawable[]
             {
                 mainContent = new Container
@@ -44,6 +47,10 @@ namespace osu.Game.Screens.Edit
                         Top = vertical_margins + timeline_height,
                         Bottom = vertical_margins
                     },
+                    Child = spinner = new LoadingSpinner(true)
+                    {
+                        State = { Value = Visibility.Visible },
+                    },
                 },
                 new Container
                 {
@@ -87,9 +94,10 @@ namespace osu.Game.Screens.Edit
                     }
                 },
             };
-
             LoadComponentAsync(CreateMainContent(), content =>
             {
+                spinner.State.Value = Visibility.Hidden;
+
                 mainContent.Add(content);
                 content.FadeInFromZero(300, Easing.OutQuint);
 

From 583760100a633b037c5194cf8b2e0cae3820af40 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 Aug 2020 01:40:55 +0900
Subject: [PATCH 04236/10326] Implement mania invert mod

---
 .../Mods/TestSceneManiaModInvert.cs           | 21 ++++++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  1 +
 .../Mods/ManiaModInvert.cs                    | 68 +++++++++++++++++++
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   |  6 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  9 +++
 .../Mods/IApplicableAfterBeatmapConversion.cs | 19 ++++++
 6 files changed, 121 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModInvert.cs
 create mode 100644 osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
 create mode 100644 osu.Game/Rulesets/Mods/IApplicableAfterBeatmapConversion.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModInvert.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModInvert.cs
new file mode 100644
index 0000000000..f2cc254e38
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModInvert.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 NUnit.Framework;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests.Mods
+{
+    public class TestSceneManiaModInvert : ModTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
+        [Test]
+        public void TestInversion() => CreateModTest(new ModTestData
+        {
+            Mod = new ManiaModInvert(),
+            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
+        });
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 68dce8b139..2795868c97 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -220,6 +220,7 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModDualStages(),
                         new ManiaModMirror(),
                         new ManiaModDifficultyAdjust(),
+                        new ManiaModInvert(),
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
new file mode 100644
index 0000000000..2fb7a75141
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.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 System.Collections.Generic;
+using System.Linq;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModInvert : Mod, IApplicableAfterBeatmapConversion
+    {
+        public override string Name => "Invert";
+
+        public override string Acronym => "IN";
+        public override double ScoreMultiplier => 1;
+
+        public override string Description => "Hold the keys. To the beat.";
+
+        public override ModType Type => ModType.Conversion;
+
+        public void ApplyToBeatmap(IBeatmap beatmap)
+        {
+            var maniaBeatmap = (ManiaBeatmap)beatmap;
+
+            var newObjects = new List<ManiaHitObject>();
+
+            foreach (var column in maniaBeatmap.HitObjects.GroupBy(h => h.Column))
+            {
+                var newColumnObjects = new List<ManiaHitObject>();
+
+                var locations = column.OfType<Note>().Select(n => (startTime: n.StartTime, samples: n.Samples))
+                                      .Concat(column.OfType<HoldNote>().SelectMany(h => new[]
+                                      {
+                                          (startTime: h.StartTime, samples: h.GetNodeSamples(0)),
+                                          (startTime: h.EndTime, samples: h.GetNodeSamples(1))
+                                      }))
+                                      .OrderBy(h => h.startTime).ToList();
+
+                for (int i = 0; i < locations.Count - 1; i += 2)
+                {
+                    newColumnObjects.Add(new HoldNote
+                    {
+                        Column = column.Key,
+                        StartTime = locations[i].startTime,
+                        Duration = locations[i + 1].startTime - locations[i].startTime,
+                        Samples = locations[i].samples,
+                        NodeSamples = new List<IList<HitSampleInfo>>
+                        {
+                            locations[i].samples,
+                            locations[i + 1].samples
+                        }
+                    });
+                }
+
+                newObjects.AddRange(newColumnObjects);
+            }
+
+            maniaBeatmap.HitObjects = newObjects.OrderBy(h => h.StartTime).ToList();
+
+            // No breaks
+            maniaBeatmap.Breaks.Clear();
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index a100c9a58e..6cc7ff92d3 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -102,14 +102,14 @@ namespace osu.Game.Rulesets.Mania.Objects
             {
                 StartTime = StartTime,
                 Column = Column,
-                Samples = getNodeSamples(0),
+                Samples = GetNodeSamples(0),
             });
 
             AddNested(Tail = new TailNote
             {
                 StartTime = EndTime,
                 Column = Column,
-                Samples = getNodeSamples((NodeSamples?.Count - 1) ?? 1),
+                Samples = GetNodeSamples((NodeSamples?.Count - 1) ?? 1),
             });
         }
 
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Mania.Objects
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
-        private IList<HitSampleInfo> getNodeSamples(int nodeIndex) =>
+        public IList<HitSampleInfo> GetNodeSamples(int nodeIndex) =>
             nodeIndex < NodeSamples?.Count ? NodeSamples[nodeIndex] : Samples;
     }
 }
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index ac399e37c4..b4bcf285b9 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -109,6 +109,15 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert();
 
+                // Apply conversion mods to the result
+                foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())
+                {
+                    if (cancellationSource.IsCancellationRequested)
+                        throw new BeatmapLoadTimeoutException(BeatmapInfo);
+
+                    mod.ApplyToBeatmap(converted);
+                }
+
                 // Apply difficulty mods
                 if (mods.Any(m => m is IApplicableToDifficulty))
                 {
diff --git a/osu.Game/Rulesets/Mods/IApplicableAfterBeatmapConversion.cs b/osu.Game/Rulesets/Mods/IApplicableAfterBeatmapConversion.cs
new file mode 100644
index 0000000000..d45311675d
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/IApplicableAfterBeatmapConversion.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.Beatmaps;
+
+namespace osu.Game.Rulesets.Mods
+{
+    /// <summary>
+    /// Interface for a <see cref="Mod"/> that applies changes to the <see cref="IBeatmap"/> generated by the <see cref="BeatmapConverter{TObject}"/>.
+    /// </summary>
+    public interface IApplicableAfterBeatmapConversion : IApplicableMod
+    {
+        /// <summary>
+        /// Applies this <see cref="Mod"/> to the <see cref="IBeatmap"/> after conversion has taken place.
+        /// </summary>
+        /// <param name="beatmap">The converted <see cref="IBeatmap"/>.</param>
+        void ApplyToBeatmap(IBeatmap beatmap);
+    }
+}

From 9e8192e31d0237043743792ddb3cd75cddd86804 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 17 Aug 2020 17:14:51 +0000
Subject: [PATCH 04237/10326] Bump Microsoft.CodeAnalysis.BannedApiAnalyzers
 from 3.0.0 to 3.3.0

Bumps [Microsoft.CodeAnalysis.BannedApiAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.0.0 to 3.3.0.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.0.0...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 2cd40c8675..2d3478f256 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,7 +16,7 @@
     <EmbeddedResource Include="Resources\**\*.*" />
   </ItemGroup>
   <ItemGroup Label="Code Analysis">
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.0" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" PrivateAssets="All" />
   </ItemGroup>

From e4303d79436113148cbe505655e5e0f151a6cbc8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Aug 2020 12:35:23 +0900
Subject: [PATCH 04238/10326] Fix PlayerLoader test failures due to too many
 steps

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index e698d31176..4fac7bb45f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -71,7 +71,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("load dummy beatmap", () => ResetPlayer(false, () => SelectedMods.Value = new[] { new OsuModNightcore() }));
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
-            AddAssert("mod rate applied", () => Beatmap.Value.Track.Rate != 1);
             AddStep("exit loader", () => loader.Exit());
             AddUntilStep("wait for not current", () => !loader.IsCurrentScreen());
             AddAssert("player did not load", () => player == null);

From 083bcde3cf260147304b110d4a0956285690e4ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Aug 2020 13:01:35 +0900
Subject: [PATCH 04239/10326] Fix beatmap transfer not working

---
 osu.Game/Beatmaps/WorkingBeatmap.cs  |  7 +++++++
 osu.Game/Overlays/MusicController.cs | 13 ++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index b4046a4e95..c9a60d7948 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -259,6 +259,13 @@ namespace osu.Game.Beatmaps
         [NotNull]
         public Track LoadTrack() => loadedTrack = GetBeatmapTrack() ?? GetVirtualTrack(1000);
 
+        /// <summary>
+        /// Transfer a valid audio track into this working beatmap. Used as an optimisation to avoid reload / track swap
+        /// across difficulties in the same beatmap set.
+        /// </summary>
+        /// <param name="track">The track to transfer.</param>
+        public void TransferTrack([NotNull] Track track) => loadedTrack = track ?? throw new ArgumentNullException(nameof(track));
+
         /// <summary>
         /// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called.
         /// This generally happens via MusicController when changing the global beatmap.
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 8bbae33811..c1116ff651 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -282,10 +282,10 @@ namespace osu.Game.Overlays
         {
             TrackChangeDirection direction = TrackChangeDirection.None;
 
+            bool audioEquals = beatmap.NewValue?.BeatmapInfo?.AudioEquals(current?.BeatmapInfo) ?? false;
+
             if (current != null)
             {
-                bool audioEquals = beatmap.NewValue?.BeatmapInfo?.AudioEquals(current.BeatmapInfo) ?? false;
-
                 if (audioEquals)
                     direction = TrackChangeDirection.None;
                 else if (queuedDirection.HasValue)
@@ -305,8 +305,15 @@ namespace osu.Game.Overlays
 
             current = beatmap.NewValue;
 
-            if (CurrentTrack.IsDummyDevice || !beatmap.OldValue.BeatmapInfo.AudioEquals(current?.BeatmapInfo))
+            if (!audioEquals || CurrentTrack.IsDummyDevice)
+            {
                 changeTrack();
+            }
+            else
+            {
+                // transfer still valid track to new working beatmap
+                current.TransferTrack(beatmap.OldValue.Track);
+            }
 
             TrackChanged?.Invoke(current, direction);
 

From 848f3bbf51b0b44d48f7424d4a48fc0bc3e369a7 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 17 Aug 2020 21:09:55 -0700
Subject: [PATCH 04240/10326] Show tooltip of leaderboard score rank when 1000
 or higher

---
 .../Online/Leaderboards/LeaderboardScore.cs   | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index b60d71cfe7..662c02df0e 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -82,20 +82,10 @@ namespace osu.Game.Online.Leaderboards
 
             Children = new Drawable[]
             {
-                new Container
+                new RankLabel(rank)
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = rank_width,
-                    Children = new[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Font = OsuFont.GetFont(size: 20, italics: true),
-                            Text = rank == null ? "-" : rank.Value.ToMetric(decimals: rank < 100000 ? 1 : 0),
-                        },
-                    },
                 },
                 content = new Container
                 {
@@ -356,6 +346,24 @@ namespace osu.Game.Online.Leaderboards
             }
         }
 
+        private class RankLabel : Container, IHasTooltip
+        {
+            public RankLabel(int? rank)
+            {
+                TooltipText = rank == null || rank < 1000 ? null : $"{rank}";
+
+                Child = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Font = OsuFont.GetFont(size: 20, italics: true),
+                    Text = rank == null ? "-" : rank.Value.ToMetric(decimals: rank < 100000 ? 1 : 0),
+                };
+            }
+
+            public string TooltipText { get; }
+        }
+
         public class LeaderboardScoreStatistic
         {
             public IconUsage Icon;

From e0383f61008db34bbcc3317e9ad12ff94f56ec7b Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 17 Aug 2020 22:07:04 -0700
Subject: [PATCH 04241/10326] Change format of rank tooltip

---
 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 662c02df0e..a4c20d1b9e 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -350,7 +350,7 @@ namespace osu.Game.Online.Leaderboards
         {
             public RankLabel(int? rank)
             {
-                TooltipText = rank == null || rank < 1000 ? null : $"{rank}";
+                TooltipText = rank == null || rank < 1000 ? null : $"#{rank:N0}";
 
                 Child = new OsuSpriteText
                 {

From 4d6b52a0d6a9a9d8e3d847c8d610d978b80d7802 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 17 Aug 2020 23:08:51 -0700
Subject: [PATCH 04242/10326] Simply condition

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index a4c20d1b9e..87b283f6b5 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -350,7 +350,8 @@ namespace osu.Game.Online.Leaderboards
         {
             public RankLabel(int? rank)
             {
-                TooltipText = rank == null || rank < 1000 ? null : $"#{rank:N0}";
+                if (rank >= 1000)
+                    TooltipText = $"#{rank:N0}";
 
                 Child = new OsuSpriteText
                 {

From f4f642fbcf5b5109727ca17776cb91fd53b49630 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 17 Aug 2020 23:21:44 -0700
Subject: [PATCH 04243/10326] Add ability to skip cutscene with forward mouse
 button

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 6ae420b162..45b07581ec 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -53,6 +53,7 @@ namespace osu.Game.Input.Bindings
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]
         {
             new KeyBinding(InputKey.Space, GlobalAction.SkipCutscene),
+            new KeyBinding(InputKey.ExtraMouseButton2, GlobalAction.SkipCutscene),
             new KeyBinding(InputKey.Tilde, GlobalAction.QuickRetry),
             new KeyBinding(new[] { InputKey.Control, InputKey.Tilde }, GlobalAction.QuickExit),
             new KeyBinding(new[] { InputKey.Control, InputKey.Plus }, GlobalAction.IncreaseScrollSpeed),

From e1ed8554a1805dcbe055518962a0cfd3fb7674a5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 Aug 2020 17:23:11 +0900
Subject: [PATCH 04244/10326] Use yinyang icon

---
 osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 2fb7a75141..69f883cd3c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -20,6 +21,8 @@ namespace osu.Game.Rulesets.Mania.Mods
 
         public override string Description => "Hold the keys. To the beat.";
 
+        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
+
         public override ModType Type => ModType.Conversion;
 
         public void ApplyToBeatmap(IBeatmap beatmap)

From 628be66653e94ea692a717096a8b234f7f4b0a87 Mon Sep 17 00:00:00 2001
From: Jihoon Yang <lan@piyo.cafe>
Date: Tue, 18 Aug 2020 01:24:56 -0700
Subject: [PATCH 04245/10326] Updated calculation of mania scroll speed

---
 .../Configuration/ManiaRulesetConfigManager.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 7e84f17809..df453cf562 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
         {
             new TrackedSetting<double>(ManiaRulesetSetting.ScrollTime,
-                v => new SettingDescription(v, "Scroll Speed", $"{(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / v)} ({v}ms)"))
+                v => new SettingDescription(v, "Scroll Speed", $"{(int)Math.Round(13720.0 / v)} ({v}ms)"))
         };
     }
 

From d157c42340224d340fe632f3da416f7c2bf60a61 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 Aug 2020 17:40:44 +0900
Subject: [PATCH 04246/10326] Increase density by not skipping objects

---
 osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 69f883cd3c..56f6e389bf 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics.Sprites;
@@ -43,13 +44,22 @@ namespace osu.Game.Rulesets.Mania.Mods
                                       }))
                                       .OrderBy(h => h.startTime).ToList();
 
-                for (int i = 0; i < locations.Count - 1; i += 2)
+                for (int i = 0; i < locations.Count - 1; i++)
                 {
+                    // Full duration of the hold note.
+                    double duration = locations[i + 1].startTime - locations[i].startTime;
+
+                    // Beat length at the end of the hold note.
+                    double beatLength = beatmap.ControlPointInfo.TimingPointAt(locations[i + 1].startTime).BeatLength;
+
+                    // Decrease the duration by at most a 1/4 beat to ensure there's no instantaneous notes.
+                    duration = Math.Max(duration / 2, duration - beatLength / 4);
+
                     newColumnObjects.Add(new HoldNote
                     {
                         Column = column.Key,
                         StartTime = locations[i].startTime,
-                        Duration = locations[i + 1].startTime - locations[i].startTime,
+                        Duration = duration,
                         Samples = locations[i].samples,
                         NodeSamples = new List<IList<HitSampleInfo>>
                         {

From 4ddc04793f5a8c61c9467c25f77fbbf860e34262 Mon Sep 17 00:00:00 2001
From: Jihoon Yang <lan@piyo.cafe>
Date: Tue, 18 Aug 2020 01:44:30 -0700
Subject: [PATCH 04247/10326] Changed MAX_TIME_RANGE instead of the single
 instance

---
 .../Configuration/ManiaRulesetConfigManager.cs                  | 2 +-
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index df453cf562..7e84f17809 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
         {
             new TrackedSetting<double>(ManiaRulesetSetting.ScrollTime,
-                v => new SettingDescription(v, "Scroll Speed", $"{(int)Math.Round(13720.0 / v)} ({v}ms)"))
+                v => new SettingDescription(v, "Scroll Speed", $"{(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / v)} ({v}ms)"))
         };
     }
 
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 94b5ee9486..5b46550333 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <summary>
         /// The maximum time range. This occurs at a <see cref="relativeTimeRange"/> of 1.
         /// </summary>
-        public const double MAX_TIME_RANGE = 6000;
+        public const double MAX_TIME_RANGE = 13720;
 
         protected new ManiaPlayfield Playfield => (ManiaPlayfield)base.Playfield;
 

From 138dc5929e9b40e40fdba96097e831eea386098b Mon Sep 17 00:00:00 2001
From: Jihoon Yang <lan@piyo.cafe>
Date: Tue, 18 Aug 2020 01:46:07 -0700
Subject: [PATCH 04248/10326] Changed MIN_TIME_RANGE as well

---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 5b46550333..7f5b9a6ee0 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <summary>
         /// The minimum time range. This occurs at a <see cref="relativeTimeRange"/> of 40.
         /// </summary>
-        public const double MIN_TIME_RANGE = 150;
+        public const double MIN_TIME_RANGE = 340;
 
         /// <summary>
         /// The maximum time range. This occurs at a <see cref="relativeTimeRange"/> of 1.

From 385f7cf85d52c0d412f03b8706157ac686fea070 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 Aug 2020 17:56:48 +0900
Subject: [PATCH 04249/10326] Implement mania hold note body recycling

---
 .../Blueprints/Components/EditBodyPiece.cs    |   4 +-
 .../Objects/Drawables/DrawableHoldNote.cs     |  10 +-
 .../Drawables/Pieces/DefaultBodyPiece.cs      | 157 +++++++++++-------
 .../Objects/Drawables/Pieces/IHoldNoteBody.cs |  16 ++
 4 files changed, 121 insertions(+), 66 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/IHoldNoteBody.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
index efcfe11dad..5fa687298a 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 
@@ -15,7 +16,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints.Components
             AccentColour.Value = colours.Yellow;
 
             Background.Alpha = 0.5f;
-            Foreground.Alpha = 0;
         }
+
+        protected override Drawable CreateForeground() => base.CreateForeground().With(d => d.Alpha = 0);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 0c5289efe1..a44f8a8886 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private readonly Container<DrawableHoldNoteTail> tailContainer;
         private readonly Container<DrawableHoldNoteTick> tickContainer;
 
-        private readonly Drawable bodyPiece;
+        private readonly SkinnableDrawable bodyPiece;
 
         /// <summary>
         /// Time at which the user started holding this hold note. Null if the user is not holding this hold note.
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             RelativeSizeAxes = Axes.X;
 
-            AddRangeInternal(new[]
+            AddRangeInternal(new Drawable[]
             {
                 bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
                 {
@@ -135,6 +135,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // Samples are played by the head/tail notes.
         }
 
+        public override void OnKilled()
+        {
+            base.OnKilled();
+            (bodyPiece.Drawable as IHoldNoteBody)?.Recycle();
+        }
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
index bc4a095395..9999983af5 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
@@ -19,24 +19,17 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
     /// <summary>
     /// Represents length-wise portion of a hold note.
     /// </summary>
-    public class DefaultBodyPiece : CompositeDrawable
+    public class DefaultBodyPiece : CompositeDrawable, IHoldNoteBody
     {
         protected readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
-
-        private readonly LayoutValue subtractionCache = new LayoutValue(Invalidation.DrawSize);
-        private readonly IBindable<bool> isHitting = new Bindable<bool>();
+        protected readonly IBindable<bool> IsHitting = new Bindable<bool>();
 
         protected Drawable Background { get; private set; }
-        protected BufferedContainer Foreground { get; private set; }
-
-        private BufferedContainer subtractionContainer;
-        private Container subtractionLayer;
+        private Container foregroundContainer;
 
         public DefaultBodyPiece()
         {
             Blending = BlendingParameters.Additive;
-
-            AddLayout(subtractionCache);
         }
 
         [BackgroundDependencyLoader(true)]
@@ -45,7 +38,54 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
             InternalChildren = new[]
             {
                 Background = new Box { RelativeSizeAxes = Axes.Both },
-                Foreground = new BufferedContainer
+                foregroundContainer = new Container { RelativeSizeAxes = Axes.Both }
+            };
+
+            if (drawableObject != null)
+            {
+                var holdNote = (DrawableHoldNote)drawableObject;
+
+                AccentColour.BindTo(drawableObject.AccentColour);
+                IsHitting.BindTo(holdNote.IsHitting);
+            }
+
+            AccentColour.BindValueChanged(onAccentChanged, true);
+
+            Recycle();
+        }
+
+        public void Recycle() => foregroundContainer.Child = CreateForeground();
+
+        protected virtual Drawable CreateForeground() => new ForegroundPiece
+        {
+            AccentColour = { BindTarget = AccentColour },
+            IsHitting = { BindTarget = IsHitting }
+        };
+
+        private void onAccentChanged(ValueChangedEvent<Color4> accent) => Background.Colour = accent.NewValue.Opacity(0.7f);
+
+        private class ForegroundPiece : CompositeDrawable
+        {
+            public readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
+            public readonly IBindable<bool> IsHitting = new Bindable<bool>();
+
+            private readonly LayoutValue subtractionCache = new LayoutValue(Invalidation.DrawSize);
+
+            private BufferedContainer foregroundBuffer;
+            private BufferedContainer subtractionBuffer;
+            private Container subtractionLayer;
+
+            public ForegroundPiece()
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                AddLayout(subtractionCache);
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                InternalChild = foregroundBuffer = new BufferedContainer
                 {
                     Blending = BlendingParameters.Additive,
                     RelativeSizeAxes = Axes.Both,
@@ -53,7 +93,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
                     Children = new Drawable[]
                     {
                         new Box { RelativeSizeAxes = Axes.Both },
-                        subtractionContainer = new BufferedContainer
+                        subtractionBuffer = new BufferedContainer
                         {
                             RelativeSizeAxes = Axes.Both,
                             // This is needed because we're blending with another object
@@ -77,60 +117,51 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
                             }
                         }
                     }
-                }
-            };
-
-            if (drawableObject != null)
-            {
-                var holdNote = (DrawableHoldNote)drawableObject;
-
-                AccentColour.BindTo(drawableObject.AccentColour);
-                isHitting.BindTo(holdNote.IsHitting);
-            }
-
-            AccentColour.BindValueChanged(onAccentChanged, true);
-            isHitting.BindValueChanged(_ => onAccentChanged(new ValueChangedEvent<Color4>(AccentColour.Value, AccentColour.Value)), true);
-        }
-
-        private void onAccentChanged(ValueChangedEvent<Color4> accent)
-        {
-            Foreground.Colour = accent.NewValue.Opacity(0.5f);
-            Background.Colour = accent.NewValue.Opacity(0.7f);
-
-            const float animation_length = 50;
-
-            Foreground.ClearTransforms(false, nameof(Foreground.Colour));
-
-            if (isHitting.Value)
-            {
-                // wait for the next sync point
-                double synchronisedOffset = animation_length * 2 - Time.Current % (animation_length * 2);
-                using (Foreground.BeginDelayedSequence(synchronisedOffset))
-                    Foreground.FadeColour(accent.NewValue.Lighten(0.2f), animation_length).Then().FadeColour(Foreground.Colour, animation_length).Loop();
-            }
-
-            subtractionCache.Invalidate();
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (!subtractionCache.IsValid)
-            {
-                subtractionLayer.Width = 5;
-                subtractionLayer.Height = Math.Max(0, DrawHeight - DrawWidth);
-                subtractionLayer.EdgeEffect = new EdgeEffectParameters
-                {
-                    Colour = Color4.White,
-                    Type = EdgeEffectType.Glow,
-                    Radius = DrawWidth
                 };
 
-                Foreground.ForceRedraw();
-                subtractionContainer.ForceRedraw();
+                AccentColour.BindValueChanged(onAccentChanged, true);
+                IsHitting.BindValueChanged(_ => onAccentChanged(new ValueChangedEvent<Color4>(AccentColour.Value, AccentColour.Value)), true);
+            }
 
-                subtractionCache.Validate();
+            private void onAccentChanged(ValueChangedEvent<Color4> accent)
+            {
+                foregroundBuffer.Colour = accent.NewValue.Opacity(0.5f);
+
+                const float animation_length = 50;
+
+                foregroundBuffer.ClearTransforms(false, nameof(foregroundBuffer.Colour));
+
+                if (IsHitting.Value)
+                {
+                    // wait for the next sync point
+                    double synchronisedOffset = animation_length * 2 - Time.Current % (animation_length * 2);
+                    using (foregroundBuffer.BeginDelayedSequence(synchronisedOffset))
+                        foregroundBuffer.FadeColour(accent.NewValue.Lighten(0.2f), animation_length).Then().FadeColour(foregroundBuffer.Colour, animation_length).Loop();
+                }
+
+                subtractionCache.Invalidate();
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                if (!subtractionCache.IsValid)
+                {
+                    subtractionLayer.Width = 5;
+                    subtractionLayer.Height = Math.Max(0, DrawHeight - DrawWidth);
+                    subtractionLayer.EdgeEffect = new EdgeEffectParameters
+                    {
+                        Colour = Color4.White,
+                        Type = EdgeEffectType.Glow,
+                        Radius = DrawWidth
+                    };
+
+                    foregroundBuffer.ForceRedraw();
+                    subtractionBuffer.ForceRedraw();
+
+                    subtractionCache.Validate();
+                }
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/IHoldNoteBody.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/IHoldNoteBody.cs
new file mode 100644
index 0000000000..ac3792c01d
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/IHoldNoteBody.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.
+
+namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
+{
+    /// <summary>
+    /// Interface for mania hold note bodies.
+    /// </summary>
+    public interface IHoldNoteBody
+    {
+        /// <summary>
+        /// Recycles the contents of this <see cref="IHoldNoteBody"/> to free used resources.
+        /// </summary>
+        void Recycle();
+    }
+}

From da07354f050d15f94a6291d9296cd1286885143c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 Aug 2020 19:51:16 +0900
Subject: [PATCH 04250/10326] Fix some judgements potentially giving wrong
 score

---
 osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs | 2 +-
 osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs           | 2 +-
 osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
index 294aab1e4e..28e5d2cc1b 100644
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
@@ -7,7 +7,7 @@ namespace osu.Game.Rulesets.Mania.Judgements
 {
     public class HoldNoteTickJudgement : ManiaJudgement
     {
-        protected override int NumericResultFor(HitResult result) => 20;
+        protected override int NumericResultFor(HitResult result) => result == MaxResult ? 20 : 0;
 
         protected override double HealthIncreaseFor(HitResult result)
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
index 9c4b6f774f..0b1232b8db 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public class OsuSpinnerBonusTickJudgement : OsuSpinnerTickJudgement
         {
-            protected override int NumericResultFor(HitResult result) => SCORE_PER_TICK;
+            protected override int NumericResultFor(HitResult result) => result == MaxResult ? SCORE_PER_TICK : 0;
 
             protected override double HealthIncreaseFor(HitResult result) => base.HealthIncreaseFor(result) * 2;
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
index de3ae27e55..f54e7a9a15 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             public override bool AffectsCombo => false;
 
-            protected override int NumericResultFor(HitResult result) => SCORE_PER_TICK;
+            protected override int NumericResultFor(HitResult result) => result == MaxResult ? SCORE_PER_TICK : 0;
 
             protected override double HealthIncreaseFor(HitResult result) => result == MaxResult ? 0.6 * base.HealthIncreaseFor(result) : 0;
         }

From a4ad0bd1744a14207e0f39b5c363e24ace00005c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 Aug 2020 19:51:26 +0900
Subject: [PATCH 04251/10326] Ensure 0 score from miss judgements, add test

---
 .../Gameplay/TestSceneScoreProcessor.cs       | 41 +++++++++++++++++++
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 12 ++++--
 2 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs

diff --git a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
new file mode 100644
index 0000000000..b0baf0385e
--- /dev/null
+++ b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.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.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Gameplay
+{
+    [HeadlessTest]
+    public class TestSceneScoreProcessor : OsuTestScene
+    {
+        [Test]
+        public void TestNoScoreIncreaseFromMiss()
+        {
+            var beatmap = new Beatmap<TestHitObject> { HitObjects = { new TestHitObject() } };
+
+            var scoreProcessor = new ScoreProcessor();
+            scoreProcessor.ApplyBeatmap(beatmap);
+
+            // Apply a miss judgement
+            scoreProcessor.ApplyResult(new JudgementResult(new TestHitObject(), new TestJudgement()) { Type = HitResult.Miss });
+
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(0.0));
+        }
+
+        private class TestHitObject : HitObject
+        {
+            public override Judgement CreateJudgement() => new TestJudgement();
+        }
+
+        private class TestJudgement : Judgement
+        {
+            protected override int NumericResultFor(HitResult result) => 100;
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index f1cdfd93c8..eac47aa089 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -133,17 +133,19 @@ namespace osu.Game.Rulesets.Scoring
                 }
             }
 
+            double scoreIncrease = result.Type == HitResult.Miss ? 0 : result.Judgement.NumericResultFor(result);
+
             if (result.Judgement.IsBonus)
             {
                 if (result.IsHit)
-                    bonusScore += result.Judgement.NumericResultFor(result);
+                    bonusScore += scoreIncrease;
             }
             else
             {
                 if (result.HasResult)
                     scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) + 1;
 
-                baseScore += result.Judgement.NumericResultFor(result);
+                baseScore += scoreIncrease;
                 rollingMaxBaseScore += result.Judgement.MaxNumericResult;
             }
 
@@ -169,17 +171,19 @@ namespace osu.Game.Rulesets.Scoring
             if (result.FailedAtJudgement)
                 return;
 
+            double scoreIncrease = result.Type == HitResult.Miss ? 0 : result.Judgement.NumericResultFor(result);
+
             if (result.Judgement.IsBonus)
             {
                 if (result.IsHit)
-                    bonusScore -= result.Judgement.NumericResultFor(result);
+                    bonusScore -= scoreIncrease;
             }
             else
             {
                 if (result.HasResult)
                     scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) - 1;
 
-                baseScore -= result.Judgement.NumericResultFor(result);
+                baseScore -= scoreIncrease;
                 rollingMaxBaseScore -= result.Judgement.MaxNumericResult;
             }
 

From 6aa31dffdb2b194eb0c593c8094e3d37f96f614e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 18 Aug 2020 15:25:51 +0200
Subject: [PATCH 04252/10326] Fix toolbar not respecting current overlay
 activation mode.

---
 .../Visual/Menus/TestSceneToolbar.cs          | 27 +++++++++++++++++--
 osu.Game/Overlays/Toolbar/Toolbar.cs          | 21 +++++++++------
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index b4985cad9f..5170058700 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -4,8 +4,10 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Toolbar;
 using osu.Game.Rulesets;
 using osuTK.Input;
@@ -15,7 +17,7 @@ namespace osu.Game.Tests.Visual.Menus
     [TestFixture]
     public class TestSceneToolbar : OsuManualInputManagerTestScene
     {
-        private Toolbar toolbar;
+        private TestToolbar toolbar;
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
@@ -23,7 +25,7 @@ namespace osu.Game.Tests.Visual.Menus
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            Child = toolbar = new Toolbar { State = { Value = Visibility.Visible } };
+            Child = toolbar = new TestToolbar { State = { Value = Visibility.Visible } };
         });
 
         [Test]
@@ -72,5 +74,26 @@ namespace osu.Game.Tests.Visual.Menus
                 AddUntilStep("ruleset switched", () => rulesetSelector.Current.Value.Equals(expected));
             }
         }
+
+        [TestCase(OverlayActivation.All)]
+        [TestCase(OverlayActivation.Disabled)]
+        public void TestRespectsOverlayActivation(OverlayActivation mode)
+        {
+            AddStep($"set activation mode to {mode}", () => toolbar.OverlayActivationMode.Value = mode);
+            AddStep("hide toolbar", () => toolbar.Hide());
+            AddStep("try to show toolbar", () => toolbar.Show());
+
+            if (mode == OverlayActivation.Disabled)
+                AddUntilStep("toolbar still hidden", () => toolbar.Visibility == Visibility.Hidden);
+            else
+                AddAssert("toolbar is visible", () => toolbar.Visibility == Visibility.Visible);
+        }
+
+        public class TestToolbar : Toolbar
+        {
+            public new Bindable<OverlayActivation> OverlayActivationMode => base.OverlayActivationMode;
+
+            public Visibility Visibility => State.Value;
+        }
     }
 }
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index beac6adc59..3bf9e85428 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Toolbar
 
         private const double transition_time = 500;
 
-        private readonly Bindable<OverlayActivation> overlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
+        protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
         // Toolbar components like RulesetSelector should receive keyboard input events even when the toolbar is hidden.
         public override bool PropagateNonPositionalInputSubTree => true;
@@ -89,14 +89,8 @@ namespace osu.Game.Overlays.Toolbar
             // Bound after the selector is added to the hierarchy to give it a chance to load the available rulesets
             rulesetSelector.Current.BindTo(parentRuleset);
 
-            State.ValueChanged += visibility =>
-            {
-                if (overlayActivationMode.Value == OverlayActivation.Disabled)
-                    Hide();
-            };
-
             if (osuGame != null)
-                overlayActivationMode.BindTo(osuGame.OverlayActivationMode);
+                OverlayActivationMode.BindTo(osuGame.OverlayActivationMode);
         }
 
         public class ToolbarBackground : Container
@@ -137,6 +131,17 @@ namespace osu.Game.Overlays.Toolbar
             }
         }
 
+        protected override void UpdateState(ValueChangedEvent<Visibility> state)
+        {
+            if (state.NewValue == Visibility.Visible && OverlayActivationMode.Value == OverlayActivation.Disabled)
+            {
+                State.Value = Visibility.Hidden;
+                return;
+            }
+
+            base.UpdateState(state);
+        }
+
         protected override void PopIn()
         {
             this.MoveToY(0, transition_time, Easing.OutQuint);

From 988ad378a7c7ccfe0e20c11b334e47a1cc368082 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Aug 2020 00:05:05 +0900
Subject: [PATCH 04253/10326] Fix body size + freeze head piece

---
 .../Objects/Drawables/DrawableHoldNote.cs     | 48 ++++++++++++-------
 .../Objects/Drawables/DrawableHoldNoteHead.cs |  8 ++++
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 39b1771643..008cc3519e 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -34,8 +34,15 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private readonly Container<DrawableHoldNoteTail> tailContainer;
         private readonly Container<DrawableHoldNoteTick> tickContainer;
 
-        private readonly Container bodyPieceContainer;
-        private readonly Drawable bodyPiece;
+        /// <summary>
+        /// Contains the maximum size/position of the body prior to any offset or size adjustments.
+        /// </summary>
+        private readonly Container bodyContainer;
+
+        /// <summary>
+        /// Contains the offset size/position of the body such that the body extends half-way between the head and tail pieces.
+        /// </summary>
+        private readonly Container bodyOffsetContainer;
 
         /// <summary>
         /// Time at which the user started holding this hold note. Null if the user is not holding this hold note.
@@ -57,18 +64,27 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             RelativeSizeAxes = Axes.X;
 
-            AddRangeInternal(new Drawable[]
+            AddRangeInternal(new[]
             {
-                bodyPieceContainer = new Container
+                bodyContainer = new Container
                 {
-                    RelativeSizeAxes = Axes.X,
-                    Child = bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both
-                    })
+                        bodyOffsetContainer = new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
+                            {
+                                RelativeSizeAxes = Axes.Both
+                            })
+                        },
+                        // The head needs to move along with changes in the size of the body.
+                        headContainer = new Container<DrawableHoldNoteHead> { RelativeSizeAxes = Axes.Both }
+                    }
                 },
                 tickContainer = new Container<DrawableHoldNoteTick> { RelativeSizeAxes = Axes.Both },
-                headContainer = new Container<DrawableHoldNoteHead> { RelativeSizeAxes = Axes.Both },
+                headContainer.CreateProxy(),
                 tailContainer = new Container<DrawableHoldNoteTail> { RelativeSizeAxes = Axes.Both },
             });
         }
@@ -136,8 +152,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.OnDirectionChanged(e);
 
-            bodyPieceContainer.Anchor = bodyPieceContainer.Origin = e.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
-            bodyPieceContainer.Anchor = bodyPieceContainer.Origin = e.NewValue == ScrollingDirection.Up ? Anchor.BottomLeft : Anchor.TopLeft;
+            bodyOffsetContainer.Anchor = bodyOffsetContainer.Origin = e.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
         }
 
         public override void PlaySamples()
@@ -149,15 +164,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.Update();
 
-            // Make the body piece not lie under the head note
-            bodyPieceContainer.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
-            bodyPieceContainer.Height = DrawHeight - Head.Height / 2 + Tail.Height / 2;
-
+            // Decrease the size of the body while the hold note is held and the head has been hit.
             if (Head.IsHit && !hasReleased)
             {
                 float heightDecrease = (float)(Math.Max(0, Time.Current - HitObject.StartTime) / HitObject.Duration);
-                bodyPiece.Height = MathHelper.Clamp(1 - heightDecrease, 0, 1);
+                bodyContainer.Height = MathHelper.Clamp(1 - heightDecrease, 0, 1);
             }
+
+            // Offset the body to extend half-way under the head and tail.
+            bodyOffsetContainer.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
+            bodyOffsetContainer.Height = bodyContainer.DrawHeight - Head.Height / 2 + Tail.Height / 2;
         }
 
         protected override void UpdateStateTransforms(ArmedState state)
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
index a73fe259e4..cd56b81e10 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.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.Objects.Drawables;
+
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
     /// <summary>
@@ -17,6 +19,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public void UpdateResult() => base.UpdateResult(true);
 
+        protected override void UpdateStateTransforms(ArmedState state)
+        {
+            // This hitobject should never expire, so this is just a safe maximum.
+            LifetimeEnd = LifetimeStart + 30000;
+        }
+
         public override bool OnPressed(ManiaAction action) => false; // Handled by the hold note
 
         public override void OnReleased(ManiaAction action)

From 99315a4aa74c434bb4938357d75b65543150ff59 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Aug 2020 00:05:36 +0900
Subject: [PATCH 04254/10326] Fix incorrect anchors for up-scroll

---
 .../Objects/Drawables/DrawableHoldNote.cs           | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 008cc3519e..e120fab21b 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -152,7 +152,18 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.OnDirectionChanged(e);
 
-            bodyOffsetContainer.Anchor = bodyOffsetContainer.Origin = e.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+            // The body container is anchored from the position of the tail, since its height is changed when the hold note is being hit.
+            // The body offset container is anchored from the position of the head (inverse of the above).
+            if (e.NewValue == ScrollingDirection.Up)
+            {
+                bodyContainer.Anchor = bodyContainer.Origin = Anchor.BottomLeft;
+                bodyOffsetContainer.Anchor = bodyOffsetContainer.Origin = Anchor.TopLeft;
+            }
+            else
+            {
+                bodyContainer.Anchor = bodyContainer.Origin = Anchor.TopLeft;
+                bodyOffsetContainer.Anchor = bodyOffsetContainer.Origin = Anchor.BottomLeft;
+            }
         }
 
         public override void PlaySamples()

From af8f727721cc227082ffc78d20b3b39dbf73fb3e Mon Sep 17 00:00:00 2001
From: Jihoon Yang <lan@piyo.cafe>
Date: Tue, 18 Aug 2020 08:28:53 -0700
Subject: [PATCH 04255/10326] Disable LegacyHitExplosion for hold notes

---
 osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index 12747924de..e80d968f37 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
@@ -66,10 +67,13 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         public void Animate(JudgementResult result)
         {
-            (explosion as IFramedAnimation)?.GotoFrame(0);
+            if (!(result.Judgement is HoldNoteTickJudgement))
+            {
+                (explosion as IFramedAnimation)?.GotoFrame(0);
 
-            explosion?.FadeInFromZero(80)
-                     .Then().FadeOut(120);
+                explosion?.FadeInFromZero(80)
+                         .Then().FadeOut(120);
+            }
         }
     }
 }

From cd2280b5bf8947f29d379da16cb8826eff637fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 15:18:52 +0200
Subject: [PATCH 04256/10326] Fix cheese indexing bug

---
 .../Difficulty/Preprocessing/StaminaCheeseDetector.cs      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
index b53bc66f39..29e631e515 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.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.Game.Rulesets.Taiko.Objects;
 
@@ -58,7 +59,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
                 {
                     for (int j = repetitionStart; j < i; j++)
                     {
-                        hitObjects[i].StaminaCheese = true;
+                        hitObjects[j].StaminaCheese = true;
                     }
                 }
             }
@@ -81,9 +82,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 
                 if (tlLength >= tl_min_repetitions)
                 {
-                    for (int j = i - tlLength; j < i; j++)
+                    for (int j = Math.Max(0, i - tlLength); j < i; j++)
                     {
-                        hitObjects[i].StaminaCheese = true;
+                        hitObjects[j].StaminaCheese = true;
                     }
                 }
             }

From 9fb494d5d3067bb39081222cb3f39d5b2dc9ba74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 15:24:30 +0200
Subject: [PATCH 04257/10326] Eliminate unnecessary loop

---
 .../Difficulty/Skills/Colour.cs               | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index db445c7d27..e93893d894 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -80,6 +80,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         /// </summary>
         private double repetitionPenalties()
         {
+            const int l = 2;
             double penalty = 1.0;
 
             monoHistory.Add(currentMonoLength);
@@ -87,27 +88,24 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             if (monoHistory.Count > mono_history_max_length)
                 monoHistory.RemoveAt(0);
 
-            for (int l = 2; l <= mono_history_max_length / 2; l++)
+            for (int start = monoHistory.Count - l - 1; start >= 0; start--)
             {
-                for (int start = monoHistory.Count - l - 1; start >= 0; start--)
+                bool samePattern = true;
+
+                for (int i = 0; i < l; i++)
                 {
-                    bool samePattern = true;
-
-                    for (int i = 0; i < l; i++)
+                    if (monoHistory[start + i] != monoHistory[monoHistory.Count - l + i])
                     {
-                        if (monoHistory[start + i] != monoHistory[monoHistory.Count - l + i])
-                        {
-                            samePattern = false;
-                        }
+                        samePattern = false;
                     }
+                }
 
-                    if (samePattern) // Repetition found!
-                    {
-                        int notesSince = 0;
-                        for (int i = start; i < monoHistory.Count; i++) notesSince += monoHistory[i];
-                        penalty *= repetitionPenalty(notesSince);
-                        break;
-                    }
+                if (samePattern) // Repetition found!
+                {
+                    int notesSince = 0;
+                    for (int i = start; i < monoHistory.Count; i++) notesSince += monoHistory[i];
+                    penalty *= repetitionPenalty(notesSince);
+                    break;
                 }
             }
 

From 474f2452226cf79b271813824c5bad9add33a177 Mon Sep 17 00:00:00 2001
From: Jihoon Yang <lan@piyo.cafe>
Date: Tue, 18 Aug 2020 08:40:29 -0700
Subject: [PATCH 04258/10326] Replace nested loop with early return

---
 .../Skinning/LegacyHitExplosion.cs                   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index e80d968f37..41f3090afd 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -67,13 +67,13 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         public void Animate(JudgementResult result)
         {
-            if (!(result.Judgement is HoldNoteTickJudgement))
-            {
-                (explosion as IFramedAnimation)?.GotoFrame(0);
+            if (result.Judgement is HoldNoteTickJudgement)
+                return;
 
-                explosion?.FadeInFromZero(80)
-                         .Then().FadeOut(120);
-            }
+            (explosion as IFramedAnimation)?.GotoFrame(0);
+
+            explosion?.FadeInFromZero(80)
+                        .Then().FadeOut(120);
         }
     }
 }

From 4d4d9b7356e1963b6d397bee2951a4b67a5bea25 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Aug 2020 01:37:24 +0900
Subject: [PATCH 04259/10326] Add rewinding support

---
 .../Objects/Drawables/DrawableHoldNote.cs             | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index e120fab21b..0e1e700702 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// <summary>
         /// Whether the hold note has been released potentially without having caused a break.
         /// </summary>
-        private bool hasReleased;
+        private double? releaseTime;
 
         public DrawableHoldNote(HoldNote hitObject)
             : base(hitObject)
@@ -175,8 +175,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.Update();
 
-            // Decrease the size of the body while the hold note is held and the head has been hit.
-            if (Head.IsHit && !hasReleased)
+            if (Time.Current < releaseTime)
+                releaseTime = null;
+
+            // Decrease the size of the body while the hold note is held and the head has been hit. This stops at the very first release point.
+            if (Head.IsHit && releaseTime == null)
             {
                 float heightDecrease = (float)(Math.Max(0, Time.Current - HitObject.StartTime) / HitObject.Duration);
                 bodyContainer.Height = MathHelper.Clamp(1 - heightDecrease, 0, 1);
@@ -250,7 +253,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (!Tail.IsHit)
                 HasBroken = true;
 
-            hasReleased = true;
+            releaseTime = Time.Current;
         }
 
         private void endHold()

From 1d9d885d27fbd22f1118944a99fc2889d3617ca3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Aug 2020 01:40:26 +0900
Subject: [PATCH 04260/10326] Mask the tail as the body gets shorter

---
 .../Objects/Drawables/DrawableHoldNote.cs     | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 0e1e700702..d2412df7c3 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -44,6 +44,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// </summary>
         private readonly Container bodyOffsetContainer;
 
+        /// <summary>
+        /// Contains the masking area for the tail, which is resized along with <see cref="bodyContainer"/>.
+        /// </summary>
+        private readonly Container tailMaskingContainer;
+
         /// <summary>
         /// Time at which the user started holding this hold note. Null if the user is not holding this hold note.
         /// </summary>
@@ -84,8 +89,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                     }
                 },
                 tickContainer = new Container<DrawableHoldNoteTick> { RelativeSizeAxes = Axes.Both },
-                headContainer.CreateProxy(),
-                tailContainer = new Container<DrawableHoldNoteTail> { RelativeSizeAxes = Axes.Both },
+                tailMaskingContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Masking = true,
+                    Child = tailContainer = new Container<DrawableHoldNoteTail>
+                    {
+                        RelativeSizeAxes = Axes.X,
+                    }
+                },
+                headContainer.CreateProxy()
             });
         }
 
@@ -154,15 +167,22 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             // The body container is anchored from the position of the tail, since its height is changed when the hold note is being hit.
             // The body offset container is anchored from the position of the head (inverse of the above).
+            // The tail containers are both anchored from the position of the tail.
             if (e.NewValue == ScrollingDirection.Up)
             {
                 bodyContainer.Anchor = bodyContainer.Origin = Anchor.BottomLeft;
                 bodyOffsetContainer.Anchor = bodyOffsetContainer.Origin = Anchor.TopLeft;
+
+                tailMaskingContainer.Anchor = tailMaskingContainer.Origin = Anchor.BottomLeft;
+                tailContainer.Anchor = tailContainer.Origin = Anchor.BottomLeft;
             }
             else
             {
                 bodyContainer.Anchor = bodyContainer.Origin = Anchor.TopLeft;
                 bodyOffsetContainer.Anchor = bodyOffsetContainer.Origin = Anchor.BottomLeft;
+
+                tailMaskingContainer.Anchor = tailMaskingContainer.Origin = Anchor.TopLeft;
+                tailContainer.Anchor = tailContainer.Origin = Anchor.TopLeft;
             }
         }
 
@@ -185,9 +205,19 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 bodyContainer.Height = MathHelper.Clamp(1 - heightDecrease, 0, 1);
             }
 
-            // Offset the body to extend half-way under the head and tail.
+            // Re-position the body half-way up the head, and extend the height until it's half-way under the tail.
             bodyOffsetContainer.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
-            bodyOffsetContainer.Height = bodyContainer.DrawHeight - Head.Height / 2 + Tail.Height / 2;
+            bodyOffsetContainer.Height = bodyContainer.DrawHeight + Tail.Height / 2 - Head.Height / 2;
+
+            // The tail is positioned to be "outside" the hold note, so re-position its masking container to fully cover the tail and extend the height until it's half-way under the head.
+            // The masking height is determined by the size of the body so that the head and tail don't overlap as the body becomes shorter via hitting (above).
+            tailMaskingContainer.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Tail.Height;
+            tailMaskingContainer.Height = bodyContainer.DrawHeight + Tail.Height - Head.Height / 2;
+
+            // The tail container needs the reverse of the above offset applied to bring the tail to its original position.
+            // It also needs the full original height of the hold note to maintain positioning even as the height of the masking container changes.
+            tailContainer.Y = -tailMaskingContainer.Y;
+            tailContainer.Height = DrawHeight;
         }
 
         protected override void UpdateStateTransforms(ArmedState state)

From 6c759f31f175f784f447f1ef0d21e20460429ae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:13:18 +0200
Subject: [PATCH 04261/10326] Add and use limited capacity queue

---
 .../Preprocessing/StaminaCheeseDetector.cs    |  10 +-
 .../Difficulty/Skills/Colour.cs               |   9 +-
 .../Difficulty/Skills/Rhythm.cs               |   9 +-
 .../Difficulty/Skills/Stamina.cs              |   9 +-
 .../NonVisual/LimitedCapacityQueueTest.cs     |  98 +++++++++++++++
 .../Difficulty/Utils/LimitedCapacityQueue.cs  | 114 ++++++++++++++++++
 6 files changed, 226 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game.Tests/NonVisual/LimitedCapacityQueueTest.cs
 create mode 100644 osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityQueue.cs

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
index 29e631e515..c6317ff195 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
@@ -27,16 +28,15 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 
         private void findRolls(int patternLength)
         {
-            List<TaikoDifficultyHitObject> history = new List<TaikoDifficultyHitObject>();
+            var history = new LimitedCapacityQueue<TaikoDifficultyHitObject>(2 * patternLength);
 
             int repetitionStart = 0;
 
             for (int i = 0; i < hitObjects.Count; i++)
             {
-                history.Add(hitObjects[i]);
-                if (history.Count < 2 * patternLength) continue;
-
-                if (history.Count > 2 * patternLength) history.RemoveAt(0);
+                history.Enqueue(hitObjects[i]);
+                if (!history.Full)
+                    continue;
 
                 bool isRepeat = true;
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index e93893d894..e9e0930a9a 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Taiko.Objects;
 
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         /// <summary>
         /// List of the last <see cref="mono_history_max_length"/> most recent mono patterns, with the most recent at the end of the list.
         /// </summary>
-        private readonly List<int> monoHistory = new List<int>();
+        private readonly LimitedCapacityQueue<int> monoHistory = new LimitedCapacityQueue<int>(mono_history_max_length);
 
         protected override double StrainValueOf(DifficultyHitObject current)
         {
@@ -83,10 +83,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             const int l = 2;
             double penalty = 1.0;
 
-            monoHistory.Add(currentMonoLength);
-
-            if (monoHistory.Count > mono_history_max_length)
-                monoHistory.RemoveAt(0);
+            monoHistory.Enqueue(currentMonoLength);
 
             for (int start = monoHistory.Count - l - 1; start >= 0; start--)
             {
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index 31dc93a6b2..caf1acccf4 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Taiko.Objects;
 
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         private const double strain_decay = 0.96;
         private double currentStrain;
 
-        private readonly List<TaikoDifficultyHitObject> rhythmHistory = new List<TaikoDifficultyHitObject>();
+        private readonly LimitedCapacityQueue<TaikoDifficultyHitObject> rhythmHistory = new LimitedCapacityQueue<TaikoDifficultyHitObject>(rhythm_history_max_length);
         private const int rhythm_history_max_length = 8;
 
         private int notesSinceRhythmChange;
@@ -32,10 +32,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         {
             double penalty = 1;
 
-            rhythmHistory.Add(hitobject);
-
-            if (rhythmHistory.Count > rhythm_history_max_length)
-                rhythmHistory.RemoveAt(0);
+            rhythmHistory.Enqueue(hitobject);
 
             for (int l = 2; l <= rhythm_history_max_length / 2; l++)
             {
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index c9a691a2aa..430a553113 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.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.Collections.Generic;
 using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Taiko.Objects;
 
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         protected override double StrainDecayBase => 0.4;
 
         private const int max_history_length = 2;
-        private readonly List<double> notePairDurationHistory = new List<double>();
+        private readonly LimitedCapacityQueue<double> notePairDurationHistory = new LimitedCapacityQueue<double>(max_history_length);
 
         private double offhandObjectDuration = double.MaxValue;
 
@@ -56,10 +56,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
                 if (hitObject.ObjectIndex == 1)
                     return 1;
 
-                notePairDurationHistory.Add(hitObject.DeltaTime + offhandObjectDuration);
-
-                if (notePairDurationHistory.Count > max_history_length)
-                    notePairDurationHistory.RemoveAt(0);
+                notePairDurationHistory.Enqueue(hitObject.DeltaTime + offhandObjectDuration);
 
                 double shortestRecentNote = notePairDurationHistory.Min();
                 objectStrain += speedBonus(shortestRecentNote);
diff --git a/osu.Game.Tests/NonVisual/LimitedCapacityQueueTest.cs b/osu.Game.Tests/NonVisual/LimitedCapacityQueueTest.cs
new file mode 100644
index 0000000000..52463dd7eb
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/LimitedCapacityQueueTest.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 NUnit.Framework;
+using osu.Game.Rulesets.Difficulty.Utils;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class LimitedCapacityQueueTest
+    {
+        private const int capacity = 3;
+
+        private LimitedCapacityQueue<int> queue;
+
+        [SetUp]
+        public void SetUp()
+        {
+            queue = new LimitedCapacityQueue<int>(capacity);
+        }
+
+        [Test]
+        public void TestEmptyQueue()
+        {
+            Assert.AreEqual(0, queue.Count);
+
+            Assert.Throws<ArgumentOutOfRangeException>(() => _ = queue[0]);
+
+            Assert.Throws<InvalidOperationException>(() => _ = queue.Dequeue());
+
+            int count = 0;
+            foreach (var _ in queue)
+                count++;
+
+            Assert.AreEqual(0, count);
+        }
+
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(3)]
+        public void TestBelowCapacity(int count)
+        {
+            for (int i = 0; i < count; ++i)
+                queue.Enqueue(i);
+
+            Assert.AreEqual(count, queue.Count);
+
+            for (int i = 0; i < count; ++i)
+                Assert.AreEqual(i, queue[i]);
+
+            int j = 0;
+            foreach (var item in queue)
+                Assert.AreEqual(j++, item);
+
+            for (int i = queue.Count; i < queue.Count + capacity; i++)
+                Assert.Throws<ArgumentOutOfRangeException>(() => _ = queue[i]);
+        }
+
+        [TestCase(4)]
+        [TestCase(5)]
+        [TestCase(6)]
+        public void TestEnqueueAtFullCapacity(int count)
+        {
+            for (int i = 0; i < count; ++i)
+                queue.Enqueue(i);
+
+            Assert.AreEqual(capacity, queue.Count);
+
+            for (int i = 0; i < queue.Count; ++i)
+                Assert.AreEqual(count - capacity + i, queue[i]);
+
+            int j = count - capacity;
+            foreach (var item in queue)
+                Assert.AreEqual(j++, item);
+
+            for (int i = queue.Count; i < queue.Count + capacity; i++)
+                Assert.Throws<ArgumentOutOfRangeException>(() => _ = queue[i]);
+        }
+
+        [TestCase(4)]
+        [TestCase(5)]
+        [TestCase(6)]
+        public void TestDequeueAtFullCapacity(int count)
+        {
+            for (int i = 0; i < count; ++i)
+                queue.Enqueue(i);
+
+            for (int i = 0; i < capacity; ++i)
+            {
+                Assert.AreEqual(count - capacity + i, queue.Dequeue());
+                Assert.AreEqual(2 - i, queue.Count);
+            }
+
+            Assert.Throws<InvalidOperationException>(() => queue.Dequeue());
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityQueue.cs b/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityQueue.cs
new file mode 100644
index 0000000000..0f014e8a8c
--- /dev/null
+++ b/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityQueue.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 System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace osu.Game.Rulesets.Difficulty.Utils
+{
+    /// <summary>
+    /// An indexed queue with limited capacity.
+    /// Respects first-in-first-out insertion order.
+    /// </summary>
+    public class LimitedCapacityQueue<T> : IEnumerable<T>
+    {
+        /// <summary>
+        /// The number of elements in the queue.
+        /// </summary>
+        public int Count { get; private set; }
+
+        /// <summary>
+        /// Whether the queue is full (adding any new items will cause removing existing ones).
+        /// </summary>
+        public bool Full => Count == capacity;
+
+        private readonly T[] array;
+        private readonly int capacity;
+
+        // Markers tracking the queue's first and last element.
+        private int start, end;
+
+        /// <summary>
+        /// Constructs a new <see cref="LimitedCapacityQueue{T}"/>
+        /// </summary>
+        /// <param name="capacity">The number of items the queue can hold.</param>
+        public LimitedCapacityQueue(int capacity)
+        {
+            if (capacity < 0)
+                throw new ArgumentOutOfRangeException(nameof(capacity));
+
+            this.capacity = capacity;
+            array = new T[capacity];
+            start = 0;
+            end = -1;
+        }
+
+        /// <summary>
+        /// Removes an item from the front of the <see cref="LimitedCapacityQueue{T}"/>.
+        /// </summary>
+        /// <returns>The item removed from the front of the queue.</returns>
+        public T Dequeue()
+        {
+            if (Count == 0)
+                throw new InvalidOperationException("Queue is empty.");
+
+            var result = array[start];
+            start = (start + 1) % capacity;
+            Count--;
+            return result;
+        }
+
+        /// <summary>
+        /// Adds an item to the back of the <see cref="LimitedCapacityQueue{T}"/>.
+        /// If the queue is holding <see cref="Count"/> elements at the point of addition,
+        /// the item at the front of the queue will be removed.
+        /// </summary>
+        /// <param name="item">The item to be added to the back of the queue.</param>
+        public void Enqueue(T item)
+        {
+            end = (end + 1) % capacity;
+            if (Count == capacity)
+                start = (start + 1) % capacity;
+            else
+                Count++;
+            array[end] = item;
+        }
+
+        /// <summary>
+        /// Retrieves the item at the given index in the queue.
+        /// </summary>
+        /// <param name="index">
+        /// The index of the item to retrieve.
+        /// The item with index 0 is at the front of the queue
+        /// (it was added the earliest).
+        /// </param>
+        public T this[int index]
+        {
+            get
+            {
+                if (index < 0 || index >= Count)
+                    throw new ArgumentOutOfRangeException(nameof(index));
+
+                return array[(start + index) % capacity];
+            }
+        }
+
+        /// <summary>
+        /// Enumerates the queue from its start to its end.
+        /// </summary>
+        public IEnumerator<T> GetEnumerator()
+        {
+            if (Count == 0)
+                yield break;
+
+            for (int i = 0; i < Count; i++)
+                yield return array[(start + i) % capacity];
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}

From 292d38362c504196b7593042fc8dcba2104a20af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:18:36 +0200
Subject: [PATCH 04262/10326] De-nest cheese detection logic

---
 .../Preprocessing/StaminaCheeseDetector.cs    | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
index c6317ff195..e1dad70d90 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
@@ -38,33 +38,34 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
                 if (!history.Full)
                     continue;
 
-                bool isRepeat = true;
-
-                for (int j = 0; j < patternLength; j++)
-                {
-                    if (history[j].HitType != history[j + patternLength].HitType)
-                    {
-                        isRepeat = false;
-                    }
-                }
-
-                if (!isRepeat)
+                if (!containsPatternRepeat(history, patternLength))
                 {
                     repetitionStart = i - 2 * patternLength;
+                    continue;
                 }
 
                 int repeatedLength = i - repetitionStart;
+                if (repeatedLength < roll_min_repetitions)
+                    continue;
 
-                if (repeatedLength >= roll_min_repetitions)
+                for (int j = repetitionStart; j < i; j++)
                 {
-                    for (int j = repetitionStart; j < i; j++)
-                    {
-                        hitObjects[j].StaminaCheese = true;
-                    }
+                    hitObjects[j].StaminaCheese = true;
                 }
             }
         }
 
+        private static bool containsPatternRepeat(LimitedCapacityQueue<TaikoDifficultyHitObject> history, int patternLength)
+        {
+            for (int j = 0; j < patternLength; j++)
+            {
+                if (history[j].HitType != history[j + patternLength].HitType)
+                    return false;
+            }
+
+            return true;
+        }
+
         private void findTlTap(int parity, HitType type)
         {
             int tlLength = -2;
@@ -72,20 +73,16 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
             for (int i = parity; i < hitObjects.Count; i += 2)
             {
                 if (hitObjects[i].HitType == type)
-                {
                     tlLength += 2;
-                }
                 else
-                {
                     tlLength = -2;
-                }
 
-                if (tlLength >= tl_min_repetitions)
+                if (tlLength < tl_min_repetitions)
+                    continue;
+
+                for (int j = Math.Max(0, i - tlLength); j < i; j++)
                 {
-                    for (int j = Math.Max(0, i - tlLength); j < i; j++)
-                    {
-                        hitObjects[j].StaminaCheese = true;
-                    }
+                    hitObjects[j].StaminaCheese = true;
                 }
             }
         }

From ff44437706bc5eb34582329db869c2031772954e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:29:51 +0200
Subject: [PATCH 04263/10326] Extract method for marking cheese

---
 .../Preprocessing/StaminaCheeseDetector.cs       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
index e1dad70d90..3f952d8317 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
@@ -48,10 +48,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
                 if (repeatedLength < roll_min_repetitions)
                     continue;
 
-                for (int j = repetitionStart; j < i; j++)
-                {
-                    hitObjects[j].StaminaCheese = true;
-                }
+                markObjectsAsCheese(repetitionStart, i);
             }
         }
 
@@ -80,11 +77,14 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
                 if (tlLength < tl_min_repetitions)
                     continue;
 
-                for (int j = Math.Max(0, i - tlLength); j < i; j++)
-                {
-                    hitObjects[j].StaminaCheese = true;
-                }
+                markObjectsAsCheese(Math.Max(0, i - tlLength), i);
             }
         }
+
+        private void markObjectsAsCheese(int start, int end)
+        {
+            for (int i = start; i < end; ++i)
+                hitObjects[i].StaminaCheese = true;
+        }
     }
 }

From f22050c9759648521ea2bd05f51b3932e718eb00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:31:10 +0200
Subject: [PATCH 04264/10326] Remove unnecessary initialiser

---
 .../Difficulty/Preprocessing/TaikoDifficultyHitObject.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
index 817e974fe8..81b304af13 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
         public readonly TaikoDifficultyHitObjectRhythm Rhythm;
         public readonly HitType? HitType;
 
-        public bool StaminaCheese = false;
+        public bool StaminaCheese;
 
         public readonly int ObjectIndex;
 

From c6a640db55aa386b8acc05fb788c08cfee76aafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:34:44 +0200
Subject: [PATCH 04265/10326] Remove superfluous IsRepeat field

---
 .../TaikoDifficultyHitObjectRhythm.cs          |  4 +---
 .../Difficulty/Skills/Rhythm.cs                |  2 +-
 .../Difficulty/TaikoDifficultyCalculator.cs    | 18 +++++++++---------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
index 0ad885d9bd..9c22eff22a 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
@@ -7,13 +7,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
     {
         public readonly double Difficulty;
         public readonly double Ratio;
-        public readonly bool IsRepeat;
 
-        public TaikoDifficultyHitObjectRhythm(int numerator, int denominator, double difficulty, bool isRepeat)
+        public TaikoDifficultyHitObjectRhythm(int numerator, int denominator, double difficulty)
         {
             Ratio = numerator / (double)denominator;
             Difficulty = difficulty;
-            IsRepeat = isRepeat;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index caf1acccf4..483e94cd70 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             TaikoDifficultyHitObject hitobject = (TaikoDifficultyHitObject)current;
             notesSinceRhythmChange += 1;
 
-            if (hitobject.Rhythm.IsRepeat)
+            if (hitobject.Rhythm.Difficulty == 0.0)
             {
                 return 0.0;
             }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 789fd7c63b..7a9f1765ae 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -26,15 +26,15 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         private readonly TaikoDifficultyHitObjectRhythm[] commonRhythms =
         {
-            new TaikoDifficultyHitObjectRhythm(1, 1, 0.0, true),
-            new TaikoDifficultyHitObjectRhythm(2, 1, 0.3, false),
-            new TaikoDifficultyHitObjectRhythm(1, 2, 0.5, false),
-            new TaikoDifficultyHitObjectRhythm(3, 1, 0.3, false),
-            new TaikoDifficultyHitObjectRhythm(1, 3, 0.35, false),
-            new TaikoDifficultyHitObjectRhythm(3, 2, 0.6, false),
-            new TaikoDifficultyHitObjectRhythm(2, 3, 0.4, false),
-            new TaikoDifficultyHitObjectRhythm(5, 4, 0.5, false),
-            new TaikoDifficultyHitObjectRhythm(4, 5, 0.7, false)
+            new TaikoDifficultyHitObjectRhythm(1, 1, 0.0),
+            new TaikoDifficultyHitObjectRhythm(2, 1, 0.3),
+            new TaikoDifficultyHitObjectRhythm(1, 2, 0.5),
+            new TaikoDifficultyHitObjectRhythm(3, 1, 0.3),
+            new TaikoDifficultyHitObjectRhythm(1, 3, 0.35),
+            new TaikoDifficultyHitObjectRhythm(3, 2, 0.6),
+            new TaikoDifficultyHitObjectRhythm(2, 3, 0.4),
+            new TaikoDifficultyHitObjectRhythm(5, 4, 0.5),
+            new TaikoDifficultyHitObjectRhythm(4, 5, 0.7)
         };
 
         public TaikoDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)

From 00ae456f0879342fb3bc55e8be717585b7ef5e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:39:03 +0200
Subject: [PATCH 04266/10326] Remove unnecessary null check

---
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index e9e0930a9a..2a72f884d1 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
             double objectStrain = 0.0;
 
-            if (taikoCurrent.HitType != null && previousHitType != null && taikoCurrent.HitType != previousHitType)
+            if (previousHitType != null && taikoCurrent.HitType != previousHitType)
             {
                 // The colour has changed.
                 objectStrain = 1.0;

From d7ff3d77eb538b598e9878fa3cd814daf15fc499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:44:41 +0200
Subject: [PATCH 04267/10326] Slightly optimise and de-branch repetition
 pattern recognition

---
 .../Difficulty/Skills/Colour.cs               | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index 2a72f884d1..dd8b536afc 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -87,28 +87,29 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
             for (int start = monoHistory.Count - l - 1; start >= 0; start--)
             {
-                bool samePattern = true;
+                if (!isSamePattern(start, l))
+                    continue;
 
-                for (int i = 0; i < l; i++)
-                {
-                    if (monoHistory[start + i] != monoHistory[monoHistory.Count - l + i])
-                    {
-                        samePattern = false;
-                    }
-                }
-
-                if (samePattern) // Repetition found!
-                {
-                    int notesSince = 0;
-                    for (int i = start; i < monoHistory.Count; i++) notesSince += monoHistory[i];
-                    penalty *= repetitionPenalty(notesSince);
-                    break;
-                }
+                int notesSince = 0;
+                for (int i = start; i < monoHistory.Count; i++) notesSince += monoHistory[i];
+                penalty *= repetitionPenalty(notesSince);
+                break;
             }
 
             return penalty;
         }
 
+        private bool isSamePattern(int start, int l)
+        {
+            for (int i = 0; i < l; i++)
+            {
+                if (monoHistory[start + i] != monoHistory[monoHistory.Count - l + i])
+                    return false;
+            }
+
+            return true;
+        }
+
         private double repetitionPenalty(int notesSince) => Math.Min(1.0, 0.032 * notesSince);
     }
 }

From ce0e5cf9a168ce86b5ea176a4767d4929aa6f211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:47:36 +0200
Subject: [PATCH 04268/10326] Slightly optimise and de-branch rhythm pattern
 recognition

---
 .../Difficulty/Skills/Rhythm.cs               | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index 483e94cd70..4c06deb5c0 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -38,28 +38,29 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             {
                 for (int start = rhythmHistory.Count - l - 1; start >= 0; start--)
                 {
-                    bool samePattern = true;
+                    if (!samePattern(start, l))
+                        continue;
 
-                    for (int i = 0; i < l; i++)
-                    {
-                        if (rhythmHistory[start + i].Rhythm != rhythmHistory[rhythmHistory.Count - l + i].Rhythm)
-                        {
-                            samePattern = false;
-                        }
-                    }
-
-                    if (samePattern) // Repetition found!
-                    {
-                        int notesSince = hitobject.ObjectIndex - rhythmHistory[start].ObjectIndex;
-                        penalty *= repetitionPenalty(notesSince);
-                        break;
-                    }
+                    int notesSince = hitobject.ObjectIndex - rhythmHistory[start].ObjectIndex;
+                    penalty *= repetitionPenalty(notesSince);
+                    break;
                 }
             }
 
             return penalty;
         }
 
+        private bool samePattern(int start, int l)
+        {
+            for (int i = 0; i < l; i++)
+            {
+                if (rhythmHistory[start + i].Rhythm != rhythmHistory[rhythmHistory.Count - l + i].Rhythm)
+                    return false;
+            }
+
+            return true;
+        }
+
         private double patternLengthPenalty(int patternLength)
         {
             double shortPatternPenalty = Math.Min(0.15 * patternLength, 1.0);

From 80e4c157279d5a58b873d14fedf3ea3b26ad7bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:50:16 +0200
Subject: [PATCH 04269/10326] Use Math.Clamp

---
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index 4c06deb5c0..f6ef6470ed 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         private double patternLengthPenalty(int patternLength)
         {
             double shortPatternPenalty = Math.Min(0.15 * patternLength, 1.0);
-            double longPatternPenalty = Math.Max(Math.Min(2.5 - 0.15 * patternLength, 1.0), 0.0);
+            double longPatternPenalty = Math.Clamp(2.5 - 0.15 * patternLength, 0.0, 1.0);
             return Math.Min(shortPatternPenalty, longPatternPenalty);
         }
 

From c827e215069bde7be1747524f6fc9a9e755d61d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:51:19 +0200
Subject: [PATCH 04270/10326] Extract helper method to reset rhythm strain

---
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index f6ef6470ed..6bb2eaf06a 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -74,8 +74,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             if (noteLengthMs < 80) return 1;
             if (noteLengthMs < 210) return Math.Max(0, 1.4 - 0.005 * noteLengthMs);
 
-            currentStrain = 0.0;
-            notesSinceRhythmChange = 0;
+            resetRhythmStrain();
             return 0.0;
         }
 
@@ -83,8 +82,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         {
             if (!(current.BaseObject is Hit))
             {
-                currentStrain = 0.0;
-                notesSinceRhythmChange = 0;
+                resetRhythmStrain();
                 return 0.0;
             }
 
@@ -109,5 +107,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             currentStrain += objectStrain;
             return currentStrain;
         }
+
+        private void resetRhythmStrain()
+        {
+            currentStrain = 0.0;
+            notesSinceRhythmChange = 0;
+        }
     }
 }

From 51d41515ef857386cb89467b8777a8429ab9c072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:54:20 +0200
Subject: [PATCH 04271/10326] Simplify expression with ternary

---
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index 430a553113..13510290f7 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -73,12 +73,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
         public Stamina(bool rightHand)
         {
-            hand = 0;
-
-            if (rightHand)
-            {
-                hand = 1;
-            }
+            hand = rightHand ? 1 : 0;
         }
     }
 }

From cb5ea6aa9a54d26d454456837fc1b15dbb7f7819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 19:59:28 +0200
Subject: [PATCH 04272/10326] Generalise p-norm function

---
 .../Difficulty/TaikoDifficultyCalculator.cs               | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 7a9f1765ae..aa21df0228 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -49,13 +49,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             return 0.79 - Math.Atan(staminaDifficulty / colorDifficulty - 12) / Math.PI / 2;
         }
 
-        private double norm(double p, double v1, double v2, double v3)
+        private double norm(double p, params double[] values)
         {
-            return Math.Pow(
-                Math.Pow(v1, p) +
-                Math.Pow(v2, p) +
-                Math.Pow(v3, p)
-                , 1 / p);
+            return Math.Pow(values.Sum(x => Math.Pow(x, p)), 1 / p);
         }
 
         private double rescale(double sr)

From 27f97973ee188bf77c6a10248aa88ddad6057989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 18 Aug 2020 20:14:00 +0200
Subject: [PATCH 04273/10326] Add more proper typing to skills

---
 .../Difficulty/TaikoDifficultyCalculator.cs    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index aa21df0228..d3ff0b95ee 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -61,7 +61,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             return 10.43 * Math.Log(sr / 8 + 1);
         }
 
-        private double locallyCombinedDifficulty(double staminaPenalty, Skill colour, Skill rhythm, Skill stamina1, Skill stamina2)
+        private double locallyCombinedDifficulty(
+            double staminaPenalty, Colour colour, Rhythm rhythm, Stamina staminaRight, Stamina staminaLeft)
         {
             double difficulty = 0;
             double weight = 1;
@@ -71,7 +72,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             {
                 double colourPeak = colour.StrainPeaks[i] * colour_skill_multiplier;
                 double rhythmPeak = rhythm.StrainPeaks[i] * rhythm_skill_multiplier;
-                double staminaPeak = (stamina1.StrainPeaks[i] + stamina2.StrainPeaks[i]) * stamina_skill_multiplier * staminaPenalty;
+                double staminaPeak = (staminaRight.StrainPeaks[i] + staminaLeft.StrainPeaks[i]) * stamina_skill_multiplier * staminaPenalty;
                 peaks.Add(norm(2, colourPeak, rhythmPeak, staminaPeak));
             }
 
@@ -89,14 +90,19 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             if (beatmap.HitObjects.Count == 0)
                 return new TaikoDifficultyAttributes { Mods = mods, Skills = skills };
 
-            double colourRating = skills[0].DifficultyValue() * colour_skill_multiplier;
-            double rhythmRating = skills[1].DifficultyValue() * rhythm_skill_multiplier;
-            double staminaRating = (skills[2].DifficultyValue() + skills[3].DifficultyValue()) * stamina_skill_multiplier;
+            var colour = (Colour)skills[0];
+            var rhythm = (Rhythm)skills[1];
+            var staminaRight = (Stamina)skills[2];
+            var staminaLeft = (Stamina)skills[3];
+
+            double colourRating = colour.DifficultyValue() * colour_skill_multiplier;
+            double rhythmRating = rhythm.DifficultyValue() * rhythm_skill_multiplier;
+            double staminaRating = (staminaRight.DifficultyValue() + staminaLeft.DifficultyValue()) * stamina_skill_multiplier;
 
             double staminaPenalty = simpleColourPenalty(staminaRating, colourRating);
             staminaRating *= staminaPenalty;
 
-            double combinedRating = locallyCombinedDifficulty(staminaPenalty, skills[0], skills[1], skills[2], skills[3]);
+            double combinedRating = locallyCombinedDifficulty(staminaPenalty, colour, rhythm, staminaRight, staminaLeft);
             double separatedRating = norm(1.5, colourRating, rhythmRating, staminaRating);
             double starRating = 1.4 * separatedRating + 0.5 * combinedRating;
             starRating = rescale(starRating);

From 8f1a71c6b1c563b7238c81c997b60df1dadd8440 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 19 Aug 2020 07:44:45 +0300
Subject: [PATCH 04274/10326] Remove counter sprite attributes for not being of
 any reasonable use

---
 .../Visual/Gameplay/TestSceneScoreCounter.cs  |  2 -
 .../UserInterface/PercentageCounter.cs        |  9 ++---
 .../Graphics/UserInterface/RollingCounter.cs  | 38 +------------------
 .../Graphics/UserInterface/ScoreCounter.cs    |  8 +---
 .../UserInterface/SimpleComboCounter.cs       |  7 +++-
 osu.Game/Screens/Play/HUDOverlay.cs           |  3 --
 6 files changed, 13 insertions(+), 54 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
index 030d420ec0..09b4f9b761 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 Origin = Anchor.TopRight,
                 Anchor = Anchor.TopRight,
-                TextSize = 40,
                 Margin = new MarginPadding(20),
             };
             Add(score);
@@ -30,7 +29,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Margin = new MarginPadding(10),
-                TextSize = 40,
             };
             Add(comboCounter);
 
diff --git a/osu.Game/Graphics/UserInterface/PercentageCounter.cs b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
index 9b31935eee..3ea9c1053c 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.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Utils;
 
@@ -28,7 +29,7 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours) => AccentColour = colours.BlueLighter;
+        private void load(OsuColour colours) => Colour = colours.BlueLighter;
 
         protected override string FormatCount(double count) => count.FormatAccuracy();
 
@@ -38,11 +39,7 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         protected override OsuSpriteText CreateSpriteText()
-        {
-            var spriteText = base.CreateSpriteText();
-            spriteText.Font = spriteText.Font.With(fixedWidth: true);
-            return spriteText;
-        }
+            => base.CreateSpriteText().With(s => s.Font = s.Font.With(size: 20f, fixedWidth: true));
 
         public override void Increment(double amount)
         {
diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index 76bb4bf69d..7c53d4fa0d 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -9,11 +9,10 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public abstract class RollingCounter<T> : Container, IHasAccentColour
+    public abstract class RollingCounter<T> : Container
         where T : struct, IEquatable<T>
     {
         /// <summary>
@@ -60,38 +59,6 @@ namespace osu.Game.Graphics.UserInterface
 
         public abstract void Increment(T amount);
 
-        private float textSize = 40f;
-
-        public float TextSize
-        {
-            get => displayedCountSpriteText?.Font.Size ?? textSize;
-            set
-            {
-                if (TextSize == value)
-                    return;
-
-                textSize = value;
-                if (displayedCountSpriteText != null)
-                    displayedCountSpriteText.Font = displayedCountSpriteText.Font.With(size: value);
-            }
-        }
-
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => displayedCountSpriteText?.Colour ?? accentColour;
-            set
-            {
-                if (AccentColour == value)
-                    return;
-
-                accentColour = value;
-                if (displayedCountSpriteText != null)
-                    displayedCountSpriteText.Colour = value;
-            }
-        }
-
         /// <summary>
         /// Skeleton of a numeric counter which value rolls over time.
         /// </summary>
@@ -185,8 +152,7 @@ namespace osu.Game.Graphics.UserInterface
 
         protected virtual OsuSpriteText CreateSpriteText() => new OsuSpriteText
         {
-            Font = OsuFont.Numeric.With(size: textSize),
-            Colour = accentColour,
+            Font = OsuFont.Numeric.With(size: 40f),
         };
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index 438fe6c13b..faabe69f87 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours) => AccentColour = colours.BlueLighter;
+        private void load(OsuColour colours) => Colour = colours.BlueLighter;
 
         protected override double GetProportionalDuration(double currentValue, double newValue)
         {
@@ -50,11 +50,7 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         protected override OsuSpriteText CreateSpriteText()
-        {
-            var spriteText = base.CreateSpriteText();
-            spriteText.Font = spriteText.Font.With(fixedWidth: true);
-            return spriteText;
-        }
+            => base.CreateSpriteText().With(s => s.Font = s.Font.With(fixedWidth: true));
 
         public override void Increment(double amount)
         {
diff --git a/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs b/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
index af03cbb63e..aac0166774 100644
--- a/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
+++ b/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
@@ -3,6 +3,8 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -19,7 +21,7 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours) => AccentColour = colours.BlueLighter;
+        private void load(OsuColour colours) => Colour = colours.BlueLighter;
 
         protected override string FormatCount(int count)
         {
@@ -35,5 +37,8 @@ namespace osu.Game.Graphics.UserInterface
         {
             Current.Value += amount;
         }
+
+        protected override OsuSpriteText CreateSpriteText()
+            => base.CreateSpriteText().With(s => s.Font = s.Font.With(size: 20f));
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index f09745cf71..26aefa138b 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -232,7 +232,6 @@ namespace osu.Game.Screens.Play
 
         protected virtual RollingCounter<double> CreateAccuracyCounter() => new PercentageCounter
         {
-            TextSize = 20,
             BypassAutoSizeAxes = Axes.X,
             Anchor = Anchor.TopLeft,
             Origin = Anchor.TopRight,
@@ -241,14 +240,12 @@ namespace osu.Game.Screens.Play
 
         protected virtual ScoreCounter CreateScoreCounter() => new ScoreCounter(6)
         {
-            TextSize = 40,
             Anchor = Anchor.TopCentre,
             Origin = Anchor.TopCentre,
         };
 
         protected virtual RollingCounter<int> CreateComboCounter() => new SimpleComboCounter
         {
-            TextSize = 20,
             BypassAutoSizeAxes = Axes.X,
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopLeft,

From 5759ffff6fc8696dc7ca98ef507c5b39c6743334 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 19 Aug 2020 07:45:05 +0300
Subject: [PATCH 04275/10326] Use the property instead of the backing field

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

diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index 7c53d4fa0d..6763198213 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Graphics.UserInterface
         private void load()
         {
             displayedCountSpriteText = CreateSpriteText();
-            displayedCountSpriteText.Text = FormatCount(displayedCount);
+            displayedCountSpriteText.Text = FormatCount(DisplayedCount);
             Child = displayedCountSpriteText;
         }
 

From ee9fa11d142ed4fe14ca3dc06bfcc9edb56c02f5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 19 Aug 2020 07:47:02 +0300
Subject: [PATCH 04276/10326] Use `With(s => ...)` extension for better
 readability

---
 .../Gameplay/Components/MatchScoreDisplay.cs  | 23 ++++++++++---------
 .../Expanded/Statistics/AccuracyStatistic.cs  | 10 ++++----
 .../Expanded/Statistics/CounterStatistic.cs   | 10 ++++----
 .../Ranking/Expanded/TotalScoreCounter.cs     | 14 +++++------
 4 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
index 25417921bc..695c6d6f3e 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
@@ -137,19 +137,20 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
             public bool Winning
             {
-                set => displayedSpriteText.Font = value
+                set => updateFont(value);
+            }
+
+            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
+            {
+                displayedSpriteText = s;
+                displayedSpriteText.Spacing = new Vector2(-6);
+                updateFont(false);
+            });
+
+            private void updateFont(bool winning)
+                => displayedSpriteText.Font = winning
                     ? OsuFont.Torus.With(weight: FontWeight.Bold, size: 50, fixedWidth: true)
                     : OsuFont.Torus.With(weight: FontWeight.Regular, size: 40, fixedWidth: true);
-            }
-
-            protected override OsuSpriteText CreateSpriteText()
-            {
-                displayedSpriteText = base.CreateSpriteText();
-                displayedSpriteText.Spacing = new Vector2(-6);
-                Winning = false;
-
-                return displayedSpriteText;
-            }
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
index 921ad80976..6933456e7e 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
@@ -49,13 +49,11 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             public override void Increment(double amount)
                 => Current.Value += amount;
 
-            protected override OsuSpriteText CreateSpriteText()
+            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
             {
-                var spriteText = base.CreateSpriteText();
-                spriteText.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
-                spriteText.Spacing = new Vector2(-2, 0);
-                return spriteText;
-            }
+                s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
+                s.Spacing = new Vector2(-2, 0);
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index cc0f49c968..043a560d12 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -44,13 +44,11 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
 
             protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING;
 
-            protected override OsuSpriteText CreateSpriteText()
+            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
             {
-                var spriteText = base.CreateSpriteText();
-                spriteText.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
-                spriteText.Spacing = new Vector2(-2, 0);
-                return spriteText;
-            }
+                s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
+                s.Spacing = new Vector2(-2, 0);
+            });
 
             public override void Increment(int amount)
                 => Current.Value += amount;
diff --git a/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
index b0060d19ac..7f6fd1eabe 100644
--- a/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
+++ b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
@@ -28,16 +28,14 @@ namespace osu.Game.Screens.Ranking.Expanded
 
         protected override string FormatCount(long count) => count.ToString("N0");
 
-        protected override OsuSpriteText CreateSpriteText()
+        protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
         {
-            var spriteText = base.CreateSpriteText();
-            spriteText.Anchor = Anchor.TopCentre;
-            spriteText.Origin = Anchor.TopCentre;
+            s.Anchor = Anchor.TopCentre;
+            s.Origin = Anchor.TopCentre;
 
-            spriteText.Font = OsuFont.Torus.With(size: 60, weight: FontWeight.Light, fixedWidth: true);
-            spriteText.Spacing = new Vector2(-5, 0);
-            return spriteText;
-        }
+            s.Font = OsuFont.Torus.With(size: 60, weight: FontWeight.Light, fixedWidth: true);
+            s.Spacing = new Vector2(-5, 0);
+        });
 
         public override void Increment(long amount)
             => Current.Value += amount;

From 422100192c3a6c14628b03369be6dbfdb93cf18d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 19 Aug 2020 07:58:23 +0300
Subject: [PATCH 04277/10326] Move HasFont to legacy skin extensions class
 instead

---
 osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs | 2 +-
 osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs     | 2 +-
 osu.Game/Skinning/LegacySkinExtensions.cs                      | 3 +++
 osu.Game/Skinning/LegacySkinTransformer.cs                     | 2 --
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index c2432e1dbb..0e434291c1 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
                     var fontOverlap = GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
 
                     // For simplicity, let's use legacy combo font texture existence as a way to identify legacy skins from default.
-                    if (HasFont(comboFont))
+                    if (this.HasFont(comboFont))
                         return new LegacyComboCounter(Source, comboFont, fontOverlap);
 
                     break;
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index b955150c90..851a8d56c9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     var font = GetConfig<OsuSkinConfiguration, string>(OsuSkinConfiguration.HitCirclePrefix)?.Value ?? "default";
                     var overlap = GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.HitCircleOverlap)?.Value ?? -2;
 
-                    return !HasFont(font)
+                    return !this.HasFont(font)
                         ? null
                         : new LegacySpriteText(Source, font)
                         {
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index bb46dc8b9f..0ee02a2442 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -62,6 +62,9 @@ namespace osu.Game.Skinning
             }
         }
 
+        public static bool HasFont(this ISkin source, string fontPrefix)
+            => source.GetTexture($"{fontPrefix}-0") != null;
+
         public class SkinnableTextureAnimation : TextureAnimation
         {
             [Resolved(canBeNull: true)]
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index acca53835c..ebc4757e75 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -47,7 +47,5 @@ namespace osu.Game.Skinning
         }
 
         public abstract IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
-
-        protected bool HasFont(string fontPrefix) => GetTexture($"{fontPrefix}-0") != null;
     }
 }

From 885f8104f566cb350aef38bc8e99649f49a4a7ea Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 19 Aug 2020 08:00:57 +0300
Subject: [PATCH 04278/10326] Always use public accessors even on legacy
 classes

Because of https://github.com/ppy/osu-framework/issues/3727
---
 osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index 90dd1f4e9f..13c751ac5d 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
-    internal class LegacyComboCounter : CompositeDrawable, ICatchComboCounter
+    public class LegacyComboCounter : CompositeDrawable, ICatchComboCounter
     {
         private readonly ISkin skin;
 

From d4bde0afe57c04a01fe5ab880f7dc70686fc0f0e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 19 Aug 2020 08:18:30 +0300
Subject: [PATCH 04279/10326] Do not pass accent value on a reverted miss
 judgement

---
 osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
index 10aee2ea31..351610646d 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
@@ -47,6 +47,12 @@ namespace osu.Game.Rulesets.Catch.UI
             if (!result.Judgement.AffectsCombo || !result.HasResult)
                 return;
 
+            if (result.Type == HitResult.Miss)
+            {
+                updateCombo(result.ComboAtJudgement, null);
+                return;
+            }
+
             updateCombo(result.ComboAtJudgement, judgedObject.AccentColour.Value);
         }
 

From a59dabca7ed30c48e6c8cae98b8fe6c2558b9e5c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 19 Aug 2020 08:28:11 +0300
Subject: [PATCH 04280/10326] Use existing hit objects instead of defining own

---
 .../TestSceneComboCounter.cs                     | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
index 2581e305dd..079cdfc44b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
@@ -55,25 +55,13 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private void performJudgement(HitResult type, Judgement judgement = null)
         {
-            var judgedObject = new TestDrawableCatchHitObject(new TestCatchHitObject());
+            var judgedObject = new DrawableFruit(new Fruit()) { AccentColour = { Value = judgedObjectColour } };
+
             var result = new JudgementResult(judgedObject.HitObject, judgement ?? new Judgement()) { Type = type };
             scoreProcessor.ApplyResult(result);
 
             foreach (var counter in CreatedDrawables.Cast<CatchComboDisplay>())
                 counter.OnNewResult(judgedObject, result);
         }
-
-        private class TestDrawableCatchHitObject : DrawableCatchHitObject
-        {
-            public TestDrawableCatchHitObject(CatchHitObject hitObject)
-                : base(hitObject)
-            {
-                AccentColour.Value = Color4.White;
-            }
-        }
-
-        private class TestCatchHitObject : CatchHitObject
-        {
-        }
     }
 }

From dde0bc6070f41bf001e4d108bf8a0fe77f22191b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 19 Aug 2020 08:29:24 +0300
Subject: [PATCH 04281/10326] Add step to randomize judged object's combo
 colour

---
 .../TestSceneComboCounter.cs                        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
index 079cdfc44b..89521d616d 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.UI;
@@ -23,6 +24,8 @@ namespace osu.Game.Rulesets.Catch.Tests
         private GameplayBeatmap gameplayBeatmap;
         private readonly Bindable<bool> isBreakTime = new BindableBool();
 
+        private Color4 judgedObjectColour = Color4.White;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -50,7 +53,17 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddRepeatStep("perform hit", () => performJudgement(HitResult.Perfect), 20);
             AddStep("perform miss", () => performJudgement(HitResult.Miss));
+
             AddToggleStep("toggle gameplay break", v => isBreakTime.Value = v);
+            AddStep("randomize judged object colour", () =>
+            {
+                judgedObjectColour = new Color4(
+                    RNG.NextSingle(1f),
+                    RNG.NextSingle(1f),
+                    RNG.NextSingle(1f),
+                    1f
+                );
+            });
         }
 
         private void performJudgement(HitResult type, Judgement judgement = null)

From af52b73b06ed9b6482ebb7cba4c0765b19ebdc24 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 19 Aug 2020 08:39:40 +0300
Subject: [PATCH 04282/10326] Fill out missing documentation

---
 osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs | 3 +++
 osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs        | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index 13c751ac5d..8ea06688cb 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -16,6 +16,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
+    /// <summary>
+    /// A combo counter implementation that visually behaves almost similar to osu!stable's combo counter.
+    /// </summary>
     public class LegacyComboCounter : CompositeDrawable, ICatchComboCounter
     {
         private readonly ISkin skin;
diff --git a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
index 351610646d..b53711e4ed 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
@@ -10,6 +10,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
+    /// <summary>
+    /// Represents a component that displays a skinned <see cref="ICatchComboCounter"/> and handles combo judgement results for updating it accordingly.
+    /// </summary>
     public class CatchComboDisplay : SkinnableDrawable
     {
         private int currentCombo;

From 06503597e00f8b784c0c712f97c17ff589b086f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Aug 2020 19:09:35 +0900
Subject: [PATCH 04283/10326] Remove unnecessarily exposed visibility state

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

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index 5170058700..56c030df77 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -84,16 +84,14 @@ namespace osu.Game.Tests.Visual.Menus
             AddStep("try to show toolbar", () => toolbar.Show());
 
             if (mode == OverlayActivation.Disabled)
-                AddUntilStep("toolbar still hidden", () => toolbar.Visibility == Visibility.Hidden);
+                AddUntilStep("toolbar still hidden", () => toolbar.State.Value == Visibility.Hidden);
             else
-                AddAssert("toolbar is visible", () => toolbar.Visibility == Visibility.Visible);
+                AddAssert("toolbar is visible", () => toolbar.State.Value == Visibility.Visible);
         }
 
         public class TestToolbar : Toolbar
         {
             public new Bindable<OverlayActivation> OverlayActivationMode => base.OverlayActivationMode;
-
-            public Visibility Visibility => State.Value;
         }
     }
 }

From 3e4eae7fe4bcad660abf0bb6018e3f2f0d66bf3f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Aug 2020 19:10:45 +0900
Subject: [PATCH 04284/10326] Remove unnecessary until step

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

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index 56c030df77..f819ae4682 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Tests.Visual.Menus
             AddStep("try to show toolbar", () => toolbar.Show());
 
             if (mode == OverlayActivation.Disabled)
-                AddUntilStep("toolbar still hidden", () => toolbar.State.Value == Visibility.Hidden);
+                AddAssert("toolbar still hidden", () => toolbar.State.Value == Visibility.Hidden);
             else
                 AddAssert("toolbar is visible", () => toolbar.State.Value == Visibility.Visible);
         }

From f6ca31688e73757dbf12a37381f52e6c91917f46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Aug 2020 21:39:55 +0900
Subject: [PATCH 04285/10326] Fix incorrect spacing

---
 osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
index 41f3090afd..7c5d41efcf 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             (explosion as IFramedAnimation)?.GotoFrame(0);
 
             explosion?.FadeInFromZero(80)
-                        .Then().FadeOut(120);
+                     .Then().FadeOut(120);
         }
     }
 }

From 4397be60e2a3bd249662437d9f6e1272b470bc0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Aug 2020 21:58:02 +0900
Subject: [PATCH 04286/10326] 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 f3fb949f76..1a76a24496 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.814.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.819.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index a12ce138bd..d1e2033596 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.814.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.819.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 0170e94140..9b25eaab41 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.Framework.iOS" Version="2020.814.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.819.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.814.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.819.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1badc584f6cc7920558fce900d6a275f62f55188 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Aug 2020 22:10:58 +0900
Subject: [PATCH 04287/10326] Update textbox event names

---
 osu.Game/Graphics/UserInterface/OsuTextBox.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 0d173e2d3e..1ec4dfc91a 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -74,9 +74,9 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override Color4 SelectionColour => new Color4(249, 90, 255, 255);
 
-        protected override void OnTextAdded(string added)
+        protected override void OnUserTextAdded(string added)
         {
-            base.OnTextAdded(added);
+            base.OnUserTextAdded(added);
 
             if (added.Any(char.IsUpper) && AllowUniqueCharacterSamples)
                 capsTextAddedSample?.Play();
@@ -84,9 +84,9 @@ namespace osu.Game.Graphics.UserInterface
                 textAddedSamples[RNG.Next(0, 3)]?.Play();
         }
 
-        protected override void OnTextRemoved(string removed)
+        protected override void OnUserTextRemoved(string removed)
         {
-            base.OnTextRemoved(removed);
+            base.OnUserTextRemoved(removed);
 
             textRemovedSample?.Play();
         }

From ff0dec3dd928aa0ab0467cadb1027414bfe1606e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Aug 2020 12:23:39 +0900
Subject: [PATCH 04288/10326] Update plist path to work with newer fastlane
 version

It seems they have fixed the working/current directory and the
parent traversal is no longer required.
---
 fastlane/Fastfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 4fd0e5e8c7..8c278604aa 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -113,7 +113,7 @@ platform :ios do
 
     souyuz(
       platform: "ios",
-      plist_path: "../osu.iOS/Info.plist"
+      plist_path: "osu.iOS/Info.plist"
     )
   end
 
@@ -127,7 +127,7 @@ platform :ios do
   end
 
   lane :update_version do |options|
-    options[:plist_path] = '../osu.iOS/Info.plist'
+    options[:plist_path] = 'osu.iOS/Info.plist'
     app_version(options)
   end
 

From 6358f4a661f282719597d215a1129af97e63ae5b Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Thu, 20 Aug 2020 17:33:08 +0930
Subject: [PATCH 04289/10326] Disable CA2225 warning regarding operator
 overloads

---
 .editorconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 67f98f94eb..a5f7795882 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -191,4 +191,7 @@ dotnet_diagnostic.IDE0052.severity = silent
 #Rules for disposable
 dotnet_diagnostic.IDE0067.severity = none
 dotnet_diagnostic.IDE0068.severity = none
-dotnet_diagnostic.IDE0069.severity = none
\ No newline at end of file
+dotnet_diagnostic.IDE0069.severity = none
+
+#Disable operator overloads requiring alternate named methods
+dotnet_diagnostic.CA2225.severity = none
\ No newline at end of file

From 1f14d9b690d39122cd89ef799429c12c7511e34e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Aug 2020 18:15:06 +0900
Subject: [PATCH 04290/10326] Use correct width adjust for osu!catch playfield

---
 .../UI/CatchPlayfieldAdjustmentContainer.cs                   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
index 8ee23461ba..040247a264 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
@@ -10,6 +10,8 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public class CatchPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
     {
+        private const float playfield_size_adjust = 0.8f;
+
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
@@ -18,7 +20,7 @@ namespace osu.Game.Rulesets.Catch.UI
             Anchor = Anchor.TopCentre;
             Origin = Anchor.TopCentre;
 
-            Size = new Vector2(0.86f); // matches stable's vertical offset for catcher plate
+            Size = new Vector2(playfield_size_adjust);
 
             InternalChild = new Container
             {

From a94a86178bcbbde7a7b1a96cf871be29c3e96b40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Aug 2020 19:12:37 +0900
Subject: [PATCH 04291/10326] Align osu!catch playfield with stable 1:1

---
 .../UI/CatchPlayfieldAdjustmentContainer.cs    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
index 040247a264..efc1b24ed5 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
@@ -17,8 +17,12 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatchPlayfieldAdjustmentContainer()
         {
-            Anchor = Anchor.TopCentre;
-            Origin = Anchor.TopCentre;
+            // because we are using centre anchor/origin, we will need to limit visibility in the future
+            // to ensure tall windows do not get a readability advantage.
+            // it may be possible to bake the catch-specific offsets (-100..340 mentioned below) into new values
+            // which are compatible with TopCentre alignment.
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
 
             Size = new Vector2(playfield_size_adjust);
 
@@ -29,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 RelativeSizeAxes = Axes.Both,
                 FillMode = FillMode.Fit,
                 FillAspectRatio = 4f / 3,
-                Child = content = new ScalingContainer { RelativeSizeAxes = Axes.Both }
+                Child = content = new ScalingContainer { RelativeSizeAxes = Axes.Both, }
             };
         }
 
@@ -42,8 +46,14 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 base.Update();
 
+                // in stable, fruit fall vertically from -100 to 340.
+                // to emulate this, we want to make our playfield 440 gameplay pixels high.
+                // we then offset it -100 vertically in the position set below.
+                const float stable_v_offset_ratio = 440 / 384f;
+
                 Scale = new Vector2(Parent.ChildSize.X / CatchPlayfield.WIDTH);
-                Size = Vector2.Divide(Vector2.One, Scale);
+                Position = new Vector2(0, -100 * stable_v_offset_ratio + Scale.X);
+                Size = Vector2.Divide(new Vector2(1, stable_v_offset_ratio), Scale);
             }
         }
     }

From e6d13edafb8200de6122d685dd5cdffaf724d2c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Aug 2020 19:41:27 +0900
Subject: [PATCH 04292/10326] Force tournament client to run in windowed mode

We generally haven't tested in other modes, and it doesn't really make
sense as you wouldn't be able to use it in a meaningful way otherwise.

- [ ] Test on windows.
---
 osu.Game.Tournament/TournamentGame.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 7b1a174c1e..307ee1c773 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Tournament
         public static readonly Color4 TEXT_COLOUR = Color4Extensions.FromHex("#fff");
         private Drawable heightWarning;
         private Bindable<Size> windowSize;
+        private Bindable<WindowMode> windowMode;
 
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig)
@@ -43,6 +44,12 @@ namespace osu.Game.Tournament
                 heightWarning.Alpha = size.NewValue.Width < minWidth ? 1 : 0;
             }), true);
 
+            windowMode = frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            windowMode.BindValueChanged(mode => ScheduleAfterChildren(() =>
+            {
+                windowMode.Value = WindowMode.Windowed;
+            }), true);
+
             AddRange(new[]
             {
                 new Container

From c89509aca01da1f461382a3851f72c32131fc54e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Aug 2020 20:25:40 +0900
Subject: [PATCH 04293/10326] Fix right bound not being applied correctly

---
 .../CatchBeatmapConversionTest.cs             |  1 +
 .../Beatmaps/CatchBeatmapProcessor.cs         |  2 +-
 ...t-bound-hr-offset-expected-conversion.json | 17 ++++++++++++++++
 .../Beatmaps/right-bound-hr-offset.osu        | 20 +++++++++++++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset.osu

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index df54df7b01..8c48158acd 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase("hardrock-stream", new[] { typeof(CatchModHardRock) })]
         [TestCase("hardrock-repeat-slider", new[] { typeof(CatchModHardRock) })]
         [TestCase("hardrock-spinner", new[] { typeof(CatchModHardRock) })]
+        [TestCase("right-bound-hr-offset", new[] { typeof(CatchModHardRock) })]
         public new void Test(string name, params Type[] mods) => base.Test(name, mods);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index bb14988414..15e6e98f5a 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -179,7 +179,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             if (amount > 0)
             {
                 // Clamp to the right bound
-                if (position + amount < 1)
+                if (position + amount < CatchPlayfield.WIDTH)
                     position += amount;
             }
             else
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset-expected-conversion.json b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset-expected-conversion.json
new file mode 100644
index 0000000000..3bde97070c
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset-expected-conversion.json
@@ -0,0 +1,17 @@
+{
+    "Mappings": [{
+            "StartTime": 3368,
+            "Objects": [{
+                "StartTime": 3368,
+                "Position": 374
+            }]
+        },
+        {
+            "StartTime": 3501,
+            "Objects": [{
+                "StartTime": 3501,
+                "Position": 446
+            }]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset.osu b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset.osu
new file mode 100644
index 0000000000..6630f369d5
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset.osu
@@ -0,0 +1,20 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 2
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4
+OverallDifficulty:9.6
+ApproachRate:9.6
+SliderMultiplier:1.9
+SliderTickRate:1
+
+[TimingPoints]
+2169,266.666666666667,4,2,1,70,1,0
+
+[HitObjects]
+374,60,3368,1,0,0:0:0:0:
+410,146,3501,1,2,0:1:0:0:
\ No newline at end of file

From f1e09466036ae60f50296dd22c700cc6e14e9522 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Aug 2020 22:38:47 +0900
Subject: [PATCH 04294/10326] Remove release samples in invert mod

---
 osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 56f6e389bf..593b459e8a 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -60,12 +60,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                         Column = column.Key,
                         StartTime = locations[i].startTime,
                         Duration = duration,
-                        Samples = locations[i].samples,
-                        NodeSamples = new List<IList<HitSampleInfo>>
-                        {
-                            locations[i].samples,
-                            locations[i + 1].samples
-                        }
+                        NodeSamples = new List<IList<HitSampleInfo>> { locations[i].samples, new List<HitSampleInfo>() }
                     });
                 }
 

From 54a2322090a7c1555e7c170ce28443c46f1b20cc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Aug 2020 22:51:52 +0900
Subject: [PATCH 04295/10326] Use Array.Empty<>

---
 osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 593b459e8a..1ea45c295c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                         Column = column.Key,
                         StartTime = locations[i].startTime,
                         Duration = duration,
-                        NodeSamples = new List<IList<HitSampleInfo>> { locations[i].samples, new List<HitSampleInfo>() }
+                        NodeSamples = new List<IList<HitSampleInfo>> { locations[i].samples, Array.Empty<HitSampleInfo>() }
                     });
                 }
 

From a193fb79071a6cbfb8ddf09b1b27e2b38987bcb1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Aug 2020 23:15:30 +0900
Subject: [PATCH 04296/10326] Fix test not working for droplets/tinydroplets

---
 .../TestSceneFruitObjects.cs                  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index c07e4fdad3..6182faedd1 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -30,9 +30,8 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private Drawable createDrawableTinyDroplet()
         {
-            var droplet = new TinyDroplet
+            var droplet = new TestCatchTinyDroplet
             {
-                StartTime = Clock.CurrentTime,
                 Scale = 1.5f,
             };
 
@@ -49,9 +48,8 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private Drawable createDrawableDroplet()
         {
-            var droplet = new Droplet
+            var droplet = new TestCatchDroplet
             {
-                StartTime = Clock.CurrentTime,
                 Scale = 1.5f,
             };
 
@@ -95,5 +93,21 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             public override FruitVisualRepresentation VisualRepresentation { get; }
         }
+
+        public class TestCatchDroplet : Droplet
+        {
+            public TestCatchDroplet()
+            {
+                StartTime = 1000000000000;
+            }
+        }
+
+        public class TestCatchTinyDroplet : TinyDroplet
+        {
+            public TestCatchTinyDroplet()
+            {
+                StartTime = 1000000000000;
+            }
+        }
     }
 }

From 725caa9382128e5dedfec1a664e26dae89b7489e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Aug 2020 23:16:37 +0900
Subject: [PATCH 04297/10326] Add visual test for hyperdash droplets

---
 osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 6182faedd1..385d8ed7fa 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -20,12 +20,13 @@ 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 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)));
+
+            AddStep("show hyperdash droplet", () => SetContents(() => createDrawableDroplet(true)));
         }
 
         private Drawable createDrawableTinyDroplet()
@@ -46,11 +47,12 @@ namespace osu.Game.Rulesets.Catch.Tests
             };
         }
 
-        private Drawable createDrawableDroplet()
+        private Drawable createDrawableDroplet(bool hyperdash = false)
         {
             var droplet = new TestCatchDroplet
             {
                 Scale = 1.5f,
+                HyperDashTarget = hyperdash ? new Banana() : null
             };
 
             return new DrawableDroplet(droplet)

From 40a456170b73754fd172c2cb3bf4bc697f5c3bcd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Aug 2020 23:34:40 +0900
Subject: [PATCH 04298/10326] Add default skin display for hyperdash droplets

---
 .../Objects/Drawables/DrawableDroplet.cs      |  7 +-
 .../Objects/Drawables/DropletPiece.cs         | 70 +++++++++++++++++++
 .../Objects/Drawables/FruitPiece.cs           |  6 --
 3 files changed, 71 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index cad8892283..592b69d963 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
-using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
@@ -21,11 +20,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            ScaleContainer.Child = new SkinnableDrawable(new CatchSkinComponent(CatchSkinComponents.Droplet), _ => new Pulp
-            {
-                Size = Size / 4,
-                AccentColour = { BindTarget = AccentColour }
-            });
+            ScaleContainer.Child = new SkinnableDrawable(new CatchSkinComponent(CatchSkinComponents.Droplet), _ => new DropletPiece());
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
new file mode 100644
index 0000000000..d6c9f4398f
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.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 osu.Framework.Allocation;
+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.Catch.UI;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    public class DropletPiece : CompositeDrawable
+    {
+        public DropletPiece()
+        {
+            Size = new Vector2(CatchHitObject.OBJECT_RADIUS / 2);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableObject)
+        {
+            DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
+            var hitObject = drawableCatchObject.HitObject;
+
+            InternalChild = new Pulp
+            {
+                // RelativeSizeAxes is not used since the edge effect uses Size.
+                Size = Size,
+                AccentColour = { BindTarget = drawableObject.AccentColour }
+            };
+
+            if (hitObject.HyperDash)
+            {
+                AddInternal(new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Size = new Vector2(2f),
+                    Depth = 1,
+                    Children = new Drawable[]
+                    {
+                        new Circle
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            BorderColour = Catcher.DEFAULT_HYPER_DASH_COLOUR,
+                            BorderThickness = 6,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    AlwaysPresent = true,
+                                    Alpha = 0.3f,
+                                    Blending = BlendingParameters.Additive,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR,
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
index 7ac9f11ad6..4bffdab3d8 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -21,11 +20,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         public const float RADIUS_ADJUST = 1.1f;
 
         private Circle border;
-
         private CatchHitObject hitObject;
 
-        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
-
         public FruitPiece()
         {
             RelativeSizeAxes = Axes.Both;
@@ -37,8 +33,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
             hitObject = drawableCatchObject.HitObject;
 
-            accentColour.BindTo(drawableCatchObject.AccentColour);
-
             AddRangeInternal(new[]
             {
                 getFruitFor(drawableCatchObject.HitObject.VisualRepresentation),

From 35ff25940b11437e8823b0b904c78c99ee101428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 Aug 2020 18:16:32 +0200
Subject: [PATCH 04299/10326] Add sample playback to juice stream test scene

---
 osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index d6bba3d55e..3c636a5b97 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Linq;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
@@ -38,7 +40,11 @@ namespace osu.Game.Rulesets.Catch.Tests
                         new Vector2(width, 0)
                     }),
                     StartTime = i * 2000,
-                    NewCombo = i % 8 == 0
+                    NewCombo = i % 8 == 0,
+                    Samples = new List<HitSampleInfo>(new[]
+                    {
+                        new HitSampleInfo { Bank = "normal", Name = "hitnormal", Volume = 100 }
+                    })
                 });
             }
 

From 45e2ea71b4e28380fdcad4719271fa7438beab98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 Aug 2020 18:41:08 +0200
Subject: [PATCH 04300/10326] Rename Palpable{-> Drawable}CatchHitObject

---
 .../Objects/Drawables/DrawableCatchHitObject.cs               | 4 ++--
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs  | 2 +-
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index c6345a9df7..883d2048ed 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -15,14 +15,14 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public abstract class PalpableCatchHitObject<TObject> : DrawableCatchHitObject<TObject>
+    public abstract class PalpableDrawableCatchHitObject<TObject> : DrawableCatchHitObject<TObject>
         where TObject : CatchHitObject
     {
         public override bool CanBePlated => true;
 
         protected Container ScaleContainer { get; private set; }
 
-        protected PalpableCatchHitObject(TObject hitObject)
+        protected PalpableDrawableCatchHitObject(TObject hitObject)
             : base(hitObject)
         {
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index cad8892283..77ae7e9a54 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableDroplet : PalpableCatchHitObject<Droplet>
+    public class DrawableDroplet : PalpableDrawableCatchHitObject<Droplet>
     {
         public override bool StaysOnPlate => false;
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index fae5a10d04..c1c34e4157 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -8,7 +8,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableFruit : PalpableCatchHitObject<Fruit>
+    public class DrawableFruit : PalpableDrawableCatchHitObject<Fruit>
     {
         public DrawableFruit(Fruit h)
             : base(h)

From f956c9fe37925edb9780f778b181b24a6a44dade Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Aug 2020 02:01:29 +0900
Subject: [PATCH 04301/10326] Clobber in a gameplay test

---
 .../TestSceneHyperDash.cs                     | 19 +++++++++++++++++++
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |  5 ++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index ad24adf352..1aa333c401 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
@@ -31,6 +32,8 @@ namespace osu.Game.Rulesets.Catch.Tests
                 AddUntilStep("wait for right hyperdash", () => getCatcher().Scale.X > 0 && getCatcher().HyperDashing);
                 AddUntilStep("wait for left hyperdash", () => getCatcher().Scale.X < 0 && getCatcher().HyperDashing);
             }
+
+            AddUntilStep("wait for right hyperdash", () => getCatcher().Scale.X > 0 && getCatcher().HyperDashing);
         }
 
         private Catcher getCatcher() => Player.ChildrenOfType<CatcherArea>().First().MovableCatcher;
@@ -46,6 +49,8 @@ namespace osu.Game.Rulesets.Catch.Tests
                 }
             };
 
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint());
+
             // Should produce a hyper-dash (edge case test)
             beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56, NewCombo = true });
             beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308, NewCombo = true });
@@ -63,6 +68,20 @@ namespace osu.Game.Rulesets.Catch.Tests
             createObjects(() => new Fruit { X = right_x });
             createObjects(() => new TestJuiceStream(left_x), 1);
 
+            beatmap.ControlPointInfo.Add(7900, new TimingControlPoint
+            {
+                BeatLength = 50
+            });
+
+            createObjects(() => new TestJuiceStream(left_x)
+            {
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(Vector2.Zero),
+                    new PathControlPoint(new Vector2(512, 0))
+                })
+            }, 1);
+
             return beatmap;
 
             void createObjects(Func<CatchHitObject> createObject, int count = 3)
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 8820dff730..0897ccf2d5 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -226,9 +226,8 @@ 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;
+            // only update hyperdash state if we are catching a fruit or a droplet (and not a tiny droplet).
+            if (!(fruit is Fruit || fruit is Droplet) || fruit is TinyDroplet) return validCatch;
 
             if (validCatch && fruit.HyperDash)
             {

From 28534c1599ed85f8b1a6a1a99fc3c78d7f21b131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 Aug 2020 18:48:01 +0200
Subject: [PATCH 04302/10326] Reintroduce PalpableCatchHitObject at data level

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs   | 13 +++++++++++++
 .../Objects/Drawables/DrawableCatchHitObject.cs     |  8 ++------
 osu.Game.Rulesets.Catch/Objects/Droplet.cs          |  2 +-
 osu.Game.Rulesets.Catch/Objects/Fruit.cs            |  2 +-
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs           |  2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 04932ecdbb..5985ec9b68 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -27,6 +27,11 @@ namespace osu.Game.Rulesets.Catch.Objects
             set => x = value;
         }
 
+        /// <summary>
+        /// Whether this object can be placed on the catcher's plate.
+        /// </summary>
+        public virtual bool CanBePlated => false;
+
         /// <summary>
         /// A random offset applied to <see cref="X"/>, set by the <see cref="CatchBeatmapProcessor"/>.
         /// </summary>
@@ -100,6 +105,14 @@ namespace osu.Game.Rulesets.Catch.Objects
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 
+    /// <summary>
+    /// Represents a single object that can be caught by the catcher.
+    /// </summary>
+    public abstract class PalpableCatchHitObject : CatchHitObject
+    {
+        public override bool CanBePlated => true;
+    }
+
     public enum FruitVisualRepresentation
     {
         Pear,
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 883d2048ed..2fe017dc62 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -16,10 +16,8 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public abstract class PalpableDrawableCatchHitObject<TObject> : DrawableCatchHitObject<TObject>
-        where TObject : CatchHitObject
+        where TObject : PalpableCatchHitObject
     {
-        public override bool CanBePlated => true;
-
         protected Container ScaleContainer { get; private set; }
 
         protected PalpableDrawableCatchHitObject(TObject hitObject)
@@ -65,9 +63,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
     public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
     {
-        public virtual bool CanBePlated => false;
-
-        public virtual bool StaysOnPlate => CanBePlated;
+        public virtual bool StaysOnPlate => HitObject.CanBePlated;
 
         public float DisplayRadius => DrawSize.X / 2 * Scale.X * HitObject.Scale;
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Droplet.cs b/osu.Game.Rulesets.Catch/Objects/Droplet.cs
index 7b0bb3f0ae..9c1004a04b 100644
--- a/osu.Game.Rulesets.Catch/Objects/Droplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Droplet.cs
@@ -6,7 +6,7 @@ using osu.Game.Rulesets.Judgements;
 
 namespace osu.Game.Rulesets.Catch.Objects
 {
-    public class Droplet : CatchHitObject
+    public class Droplet : PalpableCatchHitObject
     {
         public override Judgement CreateJudgement() => new CatchDropletJudgement();
     }
diff --git a/osu.Game.Rulesets.Catch/Objects/Fruit.cs b/osu.Game.Rulesets.Catch/Objects/Fruit.cs
index 6f0423b420..43486796ad 100644
--- a/osu.Game.Rulesets.Catch/Objects/Fruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Fruit.cs
@@ -6,7 +6,7 @@ using osu.Game.Rulesets.Judgements;
 
 namespace osu.Game.Rulesets.Catch.Objects
 {
-    public class Fruit : CatchHitObject
+    public class Fruit : PalpableCatchHitObject
     {
         public override Judgement CreateJudgement() => new CatchJudgement();
     }
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 4255c3b1af..03ebf01b9b 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     lastPlateableFruit.OnLoadComplete += _ => action();
             }
 
-            if (result.IsHit && fruit.CanBePlated)
+            if (result.IsHit && fruit.HitObject.CanBePlated)
             {
                 // create a new (cloned) fruit to stay on the plate. the original is faded out immediately.
                 var caughtFruit = (DrawableCatchHitObject)CreateDrawableRepresentation?.Invoke(fruit.HitObject);

From 9546fbb64bf823392b92333238ed1cf560c6fcae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 Aug 2020 18:58:07 +0200
Subject: [PATCH 04303/10326] Prevent catcher from performing invalid catches

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

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 8820dff730..e4a3c01dbc 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -216,6 +216,9 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <returns>Whether the catch is possible.</returns>
         public bool AttemptCatch(CatchHitObject fruit)
         {
+            if (!fruit.CanBePlated)
+                return false;
+
             var halfCatchWidth = catchWidth * 0.5f;
 
             // this stuff wil disappear once we move fruit to non-relative coordinate space in the future.

From 738ff7ba217e1db02c5f9232076a61b8438a2229 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Aug 2020 02:21:16 +0900
Subject: [PATCH 04304/10326] Use full catcher width for hyperdash calculation

---
 osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs | 6 ++++++
 osu.Game.Rulesets.Catch/UI/Catcher.cs                     | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 15e6e98f5a..a08c5b6fb1 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -212,6 +212,12 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             objectWithDroplets.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime));
 
             double halfCatcherWidth = Catcher.CalculateCatchWidth(beatmap.BeatmapInfo.BaseDifficulty) / 2;
+
+            // Todo: This is wrong. osu!stable calculated hyperdashes using the full catcher size, excluding the margins.
+            // This should theoretically cause impossible scenarios, but practically, likely due to the size of the playfield, it doesn't seem possible.
+            // For now, to bring gameplay (and diffcalc!) completely in-line with stable, this code also uses the full catcher size.
+            halfCatcherWidth /= Catcher.ALLOWED_CATCH_RANGE;
+
             int lastDirection = 0;
             double lastExcess = halfCatcherWidth;
 
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 8820dff730..11e69678ca 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// The width of the catcher which can receive fruit. Equivalent to "catchMargin" in osu-stable.
         /// </summary>
-        private const float allowed_catch_range = 0.8f;
+        public const float ALLOWED_CATCH_RANGE = 0.8f;
 
         /// <summary>
         /// The drawable catcher for <see cref="CurrentState"/>.
@@ -166,7 +166,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         /// <param name="scale">The scale of the catcher.</param>
         internal static float CalculateCatchWidth(Vector2 scale)
-            => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * allowed_catch_range;
+            => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * ALLOWED_CATCH_RANGE;
 
         /// <summary>
         /// Calculates the width of the area used for attempting catches in gameplay.

From bd4acdce789776c1252c7f60604296b6ae63bd9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 Aug 2020 21:01:58 +0200
Subject: [PATCH 04305/10326] Add until step to ensure failure

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
index 61859c9da3..dbf5b98e52 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
@@ -14,7 +14,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             Screens.Multi.Multiplayer multi = new Screens.Multi.Multiplayer();
 
-            AddStep(@"show", () => LoadScreen(multi));
+            AddStep("show", () => LoadScreen(multi));
+            AddUntilStep("wait for loaded", () => multi.IsLoaded);
         }
     }
 }

From dcce7a213052cc16b49196c3c3441c38ee4f9809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 Aug 2020 21:03:27 +0200
Subject: [PATCH 04306/10326] Cache local music controller to resolve failure

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

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
index dbf5b98e52..3924b0333f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Game.Overlays;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -10,6 +12,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
+        [Cached]
+        private MusicController musicController { get; set; } = new MusicController();
+
         public TestSceneMultiScreen()
         {
             Screens.Multi.Multiplayer multi = new Screens.Multi.Multiplayer();

From f00bc67aaa0852e9ed77f83eced4bcaeb9ebd35a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Aug 2020 12:29:28 +0900
Subject: [PATCH 04307/10326] Fix pulp and use relative sizse

---
 osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs | 3 +--
 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
index d6c9f4398f..c2499446fa 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
@@ -27,8 +27,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
             InternalChild = new Pulp
             {
-                // RelativeSizeAxes is not used since the edge effect uses Size.
-                Size = Size,
+                RelativeSizeAxes = Axes.Both,
                 AccentColour = { BindTarget = drawableObject.AccentColour }
             };
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs
index 1e7506a257..d3e4945611 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
             EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
-                Radius = Size.X / 2,
+                Radius = DrawWidth / 2,
                 Colour = colour.NewValue.Darken(0.2f).Opacity(0.75f)
             };
         }

From dd1f2db1752be453e14964d6b47f87aa04e8a611 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Aug 2020 12:30:33 +0900
Subject: [PATCH 04308/10326] Use startTime in test

---
 osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 1aa333c401..6dab2a0b56 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             createObjects(() => new Fruit { X = right_x });
             createObjects(() => new TestJuiceStream(left_x), 1);
 
-            beatmap.ControlPointInfo.Add(7900, new TimingControlPoint
+            beatmap.ControlPointInfo.Add(startTime, new TimingControlPoint
             {
                 BeatLength = 50
             });

From 6ad7a3686b011c35cb17e6bfa8d0303e1cf9fc78 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Aug 2020 13:13:08 +0900
Subject: [PATCH 04309/10326] Simplify condition

---
 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 7fffa1fdc3..8e74437834 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -229,8 +229,8 @@ namespace osu.Game.Rulesets.Catch.UI
                 catchObjectPosition >= catcherPosition - halfCatchWidth &&
                 catchObjectPosition <= catcherPosition + halfCatchWidth;
 
-            // only update hyperdash state if we are catching a fruit or a droplet (and not a tiny droplet).
-            if (!(fruit is Fruit || fruit is Droplet) || fruit is TinyDroplet) return validCatch;
+            // only update hyperdash state if we are catching not catching a tiny droplet.
+            if (fruit is TinyDroplet) return validCatch;
 
             if (validCatch && fruit.HyperDash)
             {

From 62d833d63d93690d5a40162d09d2ee763858c4cd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Aug 2020 13:14:50 +0900
Subject: [PATCH 04310/10326] Fix comment

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 8e74437834..952ff6b0ce 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 catchObjectPosition >= catcherPosition - halfCatchWidth &&
                 catchObjectPosition <= catcherPosition + halfCatchWidth;
 
-            // only update hyperdash state if we are catching not catching a tiny droplet.
+            // only update hyperdash state if we are not catching a tiny droplet.
             if (fruit is TinyDroplet) return validCatch;
 
             if (validCatch && fruit.HyperDash)

From 526f06be4c714410061a732dfb041c84c3c45f0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 13:53:12 +0900
Subject: [PATCH 04311/10326] Add back track loaded bool in WorkingBeatmap

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 051d66af7b..8d5543cadb 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -275,6 +275,11 @@ namespace osu.Game.Beatmaps
         /// <param name="track">The track to transfer.</param>
         public void TransferTrack([NotNull] Track track) => loadedTrack = track ?? throw new ArgumentNullException(nameof(track));
 
+        /// <summary>
+        /// Whether this beatmap's track has been loaded via <see cref="LoadTrack"/>.
+        /// </summary>
+        public bool TrackLoaded => loadedTrack != null;
+
         /// <summary>
         /// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called.
         /// This generally happens via MusicController when changing the global beatmap.
@@ -283,7 +288,7 @@ namespace osu.Game.Beatmaps
         {
             get
             {
-                if (loadedTrack == null)
+                if (!TrackLoaded)
                     throw new InvalidOperationException($"Cannot access {nameof(Track)} without first calling {nameof(LoadTrack)}.");
 
                 return loadedTrack;

From 0b0ff626477a611a161ece951ffb9f0682dd8a44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 14:46:23 +0900
Subject: [PATCH 04312/10326] Switch timeline to use track directly from
 beatmap again

---
 .../Compose/Components/Timeline/Timeline.cs   | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index e1702d3eff..96c48c0ddc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -30,6 +30,28 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private MusicController musicController { get; set; }
 
+        /// <summary>
+        /// The timeline's scroll position in the last frame.
+        /// </summary>
+        private float lastScrollPosition;
+
+        /// <summary>
+        /// The track time in the last frame.
+        /// </summary>
+        private double lastTrackTime;
+
+        /// <summary>
+        /// Whether the user is currently dragging the timeline.
+        /// </summary>
+        private bool handlingDragInput;
+
+        /// <summary>
+        /// Whether the track was playing before a user drag event.
+        /// </summary>
+        private bool trackWasPlaying;
+
+        private ITrack track;
+
         public Timeline()
         {
             ZoomDuration = 200;
@@ -61,9 +83,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             Beatmap.BindValueChanged(b =>
             {
                 waveform.Waveform = b.NewValue.Waveform;
-                track = musicController.CurrentTrack;
+                track = b.NewValue.Track;
 
-                if (track.Length > 0)
+                // todo: i don't think this is safe, the track may not be loaded yet.
+                if (b.NewValue.Track.Length > 0)
                 {
                     MaxZoom = getZoomLevelForVisibleMilliseconds(500);
                     MinZoom = getZoomLevelForVisibleMilliseconds(10000);
@@ -74,28 +97,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private float getZoomLevelForVisibleMilliseconds(double milliseconds) => (float)(track.Length / milliseconds);
 
-        /// <summary>
-        /// The timeline's scroll position in the last frame.
-        /// </summary>
-        private float lastScrollPosition;
-
-        /// <summary>
-        /// The track time in the last frame.
-        /// </summary>
-        private double lastTrackTime;
-
-        /// <summary>
-        /// Whether the user is currently dragging the timeline.
-        /// </summary>
-        private bool handlingDragInput;
-
-        /// <summary>
-        /// Whether the track was playing before a user drag event.
-        /// </summary>
-        private bool trackWasPlaying;
-
-        private ITrack track;
-
         protected override void Update()
         {
             base.Update();

From d2c2e8bbe89536f5fed2a35ea35aa514029ac28d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 15:05:56 +0900
Subject: [PATCH 04313/10326] Revert some more usage of MusicController back to
 WorkingBeatmap

---
 .../TestSceneHoldNoteInput.cs                          |  2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs |  2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs    |  2 +-
 .../Skinning/TestSceneDrawableTaikoMascot.cs           |  4 ++--
 .../Skinning/TestSceneTaikoPlayfield.cs                |  2 +-
 osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs  | 10 +++++++---
 osu.Game/Beatmaps/WorkingBeatmap.cs                    |  2 +-
 osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs          |  2 ++
 osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs  |  3 +--
 9 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 19b69bac6d..95072cf4f8 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -343,7 +343,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack.CurrentTime == 0);
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index 744ad46c28..854626d362 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -385,7 +385,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack.CurrentTime == 0);
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 1690f648f9..b543b6fa94 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -366,7 +366,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => MusicController.CurrentTrack.CurrentTime == 0);
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 6141bf062e..47d8a5c012 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -175,11 +175,11 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         private void createDrawableRuleset()
         {
-            AddUntilStep("wait for beatmap to be loaded", () => MusicController.CurrentTrack.TrackLoaded);
+            AddUntilStep("wait for beatmap to be loaded", () => Beatmap.Value.Track.IsLoaded);
 
             AddStep("create drawable ruleset", () =>
             {
-                MusicController.CurrentTrack.Start();
+                Beatmap.Value.Track.Start();
 
                 SetContents(() =>
                 {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
index a3d3bc81c4..7b7e2c43d1 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
                 beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 1000 });
 
-                MusicController.CurrentTrack.Start();
+                Beatmap.Value.Track.Start();
             });
 
             AddStep("Load playfield", () => SetContents(() => new TaikoPlayfield(new ControlPointInfo())
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
index 49b40daf99..eff430ac25 100644
--- a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -18,17 +19,20 @@ namespace osu.Game.Tests.Skins
         [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.Value = beatmaps.GetWorkingBeatmap(imported.Beatmaps[0]);
+            beatmap = beatmaps.GetWorkingBeatmap(imported.Beatmaps[0]);
+            beatmap.LoadTrack();
         }
 
         [Test]
-        public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => Beatmap.Value.Skin.GetSample(new SampleInfo("sample")) != null);
+        public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo("sample")) != null);
 
         [Test]
-        public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => !MusicController.CurrentTrack.IsDummyDevice);
+        public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => !(beatmap.Track is TrackVirtual));
     }
 }
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 8d5543cadb..6a89739e6f 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -278,7 +278,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Whether this beatmap's track has been loaded via <see cref="LoadTrack"/>.
         /// </summary>
-        public bool TrackLoaded => loadedTrack != null;
+        public virtual bool TrackLoaded => loadedTrack != null;
 
         /// <summary>
         /// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called.
diff --git a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
index d091da3206..bfcb2403c1 100644
--- a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Tests.Beatmaps
             this.storyboard = storyboard;
         }
 
+        public override bool TrackLoaded => true;
+
         public override bool BeatmapLoaded => true;
 
         protected override IBeatmap GetBeatmap() => beatmap;
diff --git a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
index 7651285970..ad24ffc7b8 100644
--- a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
+++ b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
@@ -13,8 +13,7 @@ namespace osu.Game.Tests.Visual
             base.Update();
 
             // note that this will override any mod rate application
-            if (MusicController.TrackLoaded)
-                MusicController.CurrentTrack.Tempo.Value = Clock.Rate;
+            Beatmap.Value.Track.Tempo.Value = Clock.Rate;
         }
     }
 }

From f7e4feee3449630475a11a2291803997fb23e029 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 15:25:57 +0900
Subject: [PATCH 04314/10326] Update remaining Player components to use
 WorkingBeatmap again

---
 osu.Game/Screens/Play/FailAnimation.cs | 13 ++++++-------
 osu.Game/Screens/Play/Player.cs        |  8 ++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index dade904180..54c644c999 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -6,12 +6,12 @@ using osu.Framework.Bindables;
 using osu.Game.Rulesets.UI;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
@@ -28,24 +28,23 @@ namespace osu.Game.Screens.Play
 
         private readonly DrawableRuleset drawableRuleset;
 
-        [NotNull]
-        private readonly ITrack track;
-
         private readonly BindableDouble trackFreq = new BindableDouble(1);
 
+        private Track track;
+
         private const float duration = 2500;
 
         private SampleChannel failSample;
 
-        public FailAnimation(DrawableRuleset drawableRuleset, [NotNull] ITrack track)
+        public FailAnimation(DrawableRuleset drawableRuleset)
         {
             this.drawableRuleset = drawableRuleset;
-            this.track = track;
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
+        private void load(AudioManager audio, IBindable<WorkingBeatmap> beatmap)
         {
+            track = beatmap.Value.Track;
             failSample = audio.Samples.Get(@"Gameplay/failsound");
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index cc70995b26..a8fda10604 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuConfigManager config, MusicController musicController)
+        private void load(AudioManager audio, OsuConfigManager config)
         {
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 
@@ -188,7 +188,7 @@ namespace osu.Game.Screens.Play
 
             addUnderlayComponents(GameplayClockContainer);
             addGameplayComponents(GameplayClockContainer, Beatmap.Value, playableBeatmap);
-            addOverlayComponents(GameplayClockContainer, Beatmap.Value, musicController.CurrentTrack);
+            addOverlayComponents(GameplayClockContainer, Beatmap.Value);
 
             if (!DrawableRuleset.AllowGameplayOverlays)
             {
@@ -265,7 +265,7 @@ namespace osu.Game.Screens.Play
             });
         }
 
-        private void addOverlayComponents(Container target, WorkingBeatmap working, ITrack track)
+        private void addOverlayComponents(Container target, WorkingBeatmap working)
         {
             target.AddRange(new[]
             {
@@ -332,7 +332,7 @@ namespace osu.Game.Screens.Play
                         performImmediateExit();
                     },
                 },
-                failAnimation = new FailAnimation(DrawableRuleset, track) { OnComplete = onFailComplete, },
+                failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
             });
         }
 

From 0ae460fb8f4e7b9c235ce0cb27ae933157d162c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 15:50:14 +0900
Subject: [PATCH 04315/10326] Avoid beatmap load call in IntroScreen

---
 osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs | 3 ++-
 osu.Game/Screens/Menu/IntroScreen.cs                 | 3 ++-
 osu.Game/Screens/Menu/IntroTriangles.cs              | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
index 29be250b12..5f135febf4 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Screens;
+using osu.Framework.Utils;
 using osu.Game.Screens.Menu;
 
 namespace osu.Game.Tests.Visual.Menus
@@ -15,7 +16,7 @@ namespace osu.Game.Tests.Visual.Menus
         public TestSceneIntroWelcome()
         {
             AddUntilStep("wait for load", () => MusicController.TrackLoaded);
-
+            AddAssert("correct track", () => Precision.AlmostEquals(MusicController.CurrentTrack.Length, 48000, 1));
             AddAssert("check if menu music loops", () => MusicController.CurrentTrack.Looping);
         }
     }
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 3e4320ae44..363933694d 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -66,6 +66,7 @@ namespace osu.Game.Screens.Menu
 
         /// <summary>
         /// Whether the <see cref="Track"/> is provided by osu! resources, rather than a user beatmap.
+        /// Only valid during or after <see cref="LogoArriving"/>.
         /// </summary>
         protected bool UsingThemedIntro { get; private set; }
 
@@ -115,7 +116,6 @@ namespace osu.Game.Screens.Menu
                 if (setInfo != null)
                 {
                     initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-                    UsingThemedIntro = !initialBeatmap.LoadTrack().IsDummyDevice;
                 }
 
                 return UsingThemedIntro;
@@ -169,6 +169,7 @@ namespace osu.Game.Screens.Menu
             {
                 beatmap.Value = initialBeatmap;
                 Track = musicController.CurrentTrack;
+                UsingThemedIntro = !initialBeatmap.LoadTrack().IsDummyDevice;
 
                 logo.MoveTo(new Vector2(0.5f));
                 logo.ScaleTo(Vector2.One);
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index a9ef20436f..52281967ee 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (MenuVoice.Value && !UsingThemedIntro)
+            if (MenuVoice.Value)
                 welcome = audio.Samples.Get(@"Intro/welcome");
         }
 

From 3b03116179c3e0ec88b815dd2bcfc32961058510 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 16:45:59 +0900
Subject: [PATCH 04316/10326] Remove unnecessary using statement

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a8fda10604..9be4fd6a65 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -8,7 +8,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;

From 70697cf1a0e36e57b3533613a5795bdb8722a746 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 16:58:45 +0900
Subject: [PATCH 04317/10326] Restore remaining editor components to use
 Beatmap.Track

---
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs    | 11 ++++++-----
 .../Screens/Edit/Components/BottomBarContainer.cs     |  2 ++
 osu.Game/Screens/Edit/Components/PlaybackControl.cs   |  8 ++------
 .../Timelines/Summary/Parts/TimelinePart.cs           |  8 ++------
 .../Edit/Compose/Components/Timeline/Timeline.cs      |  6 +++---
 .../Components/Timeline/TimelineTickDisplay.cs        |  7 ++++---
 osu.Game/Screens/Edit/Editor.cs                       | 10 ++++------
 osu.Game/Screens/Edit/EditorClock.cs                  | 10 +++++-----
 osu.Game/Tests/Visual/EditorClockTestScene.cs         |  3 ++-
 9 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 4988a09650..fdb8781563 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -3,11 +3,12 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+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.UserInterface;
-using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
@@ -64,10 +65,10 @@ namespace osu.Game.Tests.Visual.Editing
             private readonly Drawable marker;
 
             [Resolved]
-            private EditorClock editorClock { get; set; }
+            private IBindable<WorkingBeatmap> beatmap { get; set; }
 
             [Resolved]
-            private MusicController musicController { get; set; }
+            private EditorClock editorClock { get; set; }
 
             public AudioVisualiser()
             {
@@ -93,8 +94,8 @@ namespace osu.Game.Tests.Visual.Editing
             {
                 base.Update();
 
-                if (musicController.TrackLoaded)
-                    marker.X = (float)(editorClock.CurrentTime / musicController.CurrentTrack.Length);
+                if (beatmap.Value.Track.IsLoaded)
+                    marker.X = (float)(editorClock.CurrentTime / beatmap.Value.Track.Length);
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Components/BottomBarContainer.cs b/osu.Game/Screens/Edit/Components/BottomBarContainer.cs
index 8d8c59b2ee..cb5078a479 100644
--- a/osu.Game/Screens/Edit/Components/BottomBarContainer.cs
+++ b/osu.Game/Screens/Edit/Components/BottomBarContainer.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.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -17,6 +18,7 @@ namespace osu.Game.Screens.Edit.Components
         private const float contents_padding = 15;
 
         protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        protected Track Track => Beatmap.Value.Track;
 
         private readonly Drawable background;
         private readonly Container content;
diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 5bafc120af..59b3d1c565 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -16,7 +16,6 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays;
 using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Components
@@ -28,9 +27,6 @@ namespace osu.Game.Screens.Edit.Components
         [Resolved]
         private EditorClock editorClock { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         private readonly BindableNumber<double> tempo = new BindableDouble(1);
 
         [BackgroundDependencyLoader]
@@ -66,12 +62,12 @@ namespace osu.Game.Screens.Edit.Components
                 }
             };
 
-            musicController.CurrentTrack.AddAdjustment(AdjustableProperty.Tempo, tempo);
+            Track?.AddAdjustment(AdjustableProperty.Tempo, tempo);
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            musicController?.CurrentTrack.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
+            Track?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
 
             base.Dispose(isDisposing);
         }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index c8a470c58a..4a7c3f26bc 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -8,7 +8,6 @@ using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 {
@@ -27,9 +26,6 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 
         protected override Container<T> Content => content;
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         public TimelinePart(Container<T> content = null)
         {
             AddInternal(this.content = content ?? new Container<T> { RelativeSizeAxes = Axes.Both });
@@ -50,14 +46,14 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         private void updateRelativeChildSize()
         {
             // the track may not be loaded completely (only has a length once it is).
-            if (!musicController.TrackLoaded)
+            if (!Beatmap.Value.Track.IsLoaded)
             {
                 content.RelativeChildSize = Vector2.One;
                 Schedule(updateRelativeChildSize);
                 return;
             }
 
-            content.RelativeChildSize = new Vector2((float)Math.Max(1, musicController.CurrentTrack.Length), 1);
+            content.RelativeChildSize = new Vector2((float)Math.Max(1, Beatmap.Value.Track.Length), 1);
         }
 
         protected virtual void LoadBeatmap(WorkingBeatmap beatmap)
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 96c48c0ddc..c6bfdda698 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         /// </summary>
         private bool trackWasPlaying;
 
-        private ITrack track;
+        private Track track;
 
         public Timeline()
         {
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void seekTrackToCurrent()
         {
-            if (!musicController.TrackLoaded)
+            if (!track.IsLoaded)
                 return;
 
             editorClock.Seek(Current / Content.DrawWidth * track.Length);
@@ -142,7 +142,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void scrollToTrackTime()
         {
-            if (!musicController.TrackLoaded || track.Length == 0)
+            if (!track.IsLoaded || track.Length == 0)
                 return;
 
             ScrollTo((float)(editorClock.CurrentTime / track.Length) * Content.DrawWidth, false);
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index cb122c590e..36ee976bf7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -3,9 +3,10 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Overlays;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
 
@@ -17,7 +18,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private EditorBeatmap beatmap { get; set; }
 
         [Resolved]
-        private MusicController musicController { get; set; }
+        private Bindable<WorkingBeatmap> working { get; set; }
 
         [Resolved]
         private BindableBeatDivisor beatDivisor { get; set; }
@@ -43,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 = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : musicController.CurrentTrack.Length;
+                var until = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : working.Value.Track.Length;
 
                 int beat = 0;
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 6722d9179c..d92f3922c3 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -14,6 +14,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
+using osu.Framework.Timing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
@@ -27,7 +28,6 @@ using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
-using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Setup;
@@ -53,9 +53,6 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         private Box bottomBackground;
         private Container screenContainer;
 
@@ -82,8 +79,9 @@ namespace osu.Game.Screens.Edit
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
+            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
             clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
-            clock.ChangeSource(musicController.CurrentTrack);
+            clock.ChangeSource(sourceClock);
 
             dependencies.CacheAs(clock);
             AddInternal(clock);
@@ -348,7 +346,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            musicController.CurrentTrack.Stop();
+            Beatmap.Value.Track?.Stop();
 
             if (seekToStart)
             {
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 634a6f7e25..d4d0feb813 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -30,11 +30,6 @@ namespace osu.Game.Screens.Edit
         {
         }
 
-        public EditorClock()
-            : this(new ControlPointInfo(), 1000, new BindableBeatDivisor())
-        {
-        }
-
         public EditorClock(ControlPointInfo controlPointInfo, double trackLength, BindableBeatDivisor beatDivisor)
         {
             this.beatDivisor = beatDivisor;
@@ -45,6 +40,11 @@ namespace osu.Game.Screens.Edit
             underlyingClock = new DecoupleableInterpolatingFramedClock();
         }
 
+        public EditorClock()
+            : this(new ControlPointInfo(), 1000, new BindableBeatDivisor())
+        {
+        }
+
         /// <summary>
         /// Seek to the closest snappable beat from a time.
         /// </summary>
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 59c9329d37..f0ec638fc9 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit;
@@ -43,7 +44,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource(MusicController.CurrentTrack);
+            Clock.ChangeSource((IAdjustableClock)e.NewValue.Track ?? new StopwatchClock());
             Clock.ProcessFrame();
         }
 

From a47b8222b53a00daab14556988952824e59ec1ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 16:59:11 +0900
Subject: [PATCH 04318/10326] Restore multiplayer to use beatmap track

---
 osu.Game/Screens/Multi/Multiplayer.cs | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 1a39d80f8d..4912df17b1 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Multi
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
         [Resolved]
-        private MusicController musicController { get; set; }
+        private MusicController music { get; set; }
 
         [Cached(Type = typeof(IRoomManager))]
         private RoomManager roomManager;
@@ -343,10 +343,15 @@ namespace osu.Game.Screens.Multi
         {
             if (screenStack.CurrentScreen is MatchSubScreen)
             {
-                musicController.CurrentTrack.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-                musicController.CurrentTrack.Looping = true;
+                var track = Beatmap.Value?.Track;
 
-                musicController.EnsurePlayingSomething();
+                if (track != null)
+                {
+                    track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
+                    track.Looping = true;
+
+                    music.EnsurePlayingSomething();
+                }
             }
             else
             {
@@ -356,8 +361,13 @@ namespace osu.Game.Screens.Multi
 
         private void cancelLooping()
         {
-            musicController.CurrentTrack.Looping = false;
-            musicController.CurrentTrack.RestartPoint = 0;
+            var track = Beatmap?.Value?.Track;
+
+            if (track != null)
+            {
+                track.Looping = false;
+                track.RestartPoint = 0;
+            }
         }
 
         protected override void Dispose(bool isDisposing)

From d5cbb589c2ff6fa2a8cfac96ef881d3406149ca9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 17:21:08 +0900
Subject: [PATCH 04319/10326] Revert some test scene changes to use
 Beatmap.Track where relevant

---
 .../Gameplay/TestSceneCompletionCancellation.cs    |  6 +++---
 .../Visual/Gameplay/TestSceneGameplayRewinding.cs  | 12 ++++--------
 .../Gameplay/TestSceneNightcoreBeatContainer.cs    |  4 ++--
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs   |  2 +-
 .../Visual/Gameplay/TestScenePlayerLoader.cs       |  8 ++++----
 .../Visual/Gameplay/TestSceneStoryboard.cs         | 14 ++++++++++----
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
index b39cfc3699..6fd5511e5a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             base.SetUpSteps();
 
             // Ensure track has actually running before attempting to seek
-            AddUntilStep("wait for track to start running", () => MusicController.IsPlaying);
+            AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
         }
 
         [Test]
@@ -70,13 +70,13 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void complete()
         {
-            AddStep("seek to completion", () => MusicController.SeekTo(5000));
+            AddStep("seek to completion", () => Beatmap.Value.Track.Seek(5000));
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
         }
 
         private void cancel()
         {
-            AddStep("rewind to cancel", () => MusicController.SeekTo(4000));
+            AddStep("rewind to cancel", () => Beatmap.Value.Track.Seek(4000));
             AddUntilStep("completion cleared by processor", () => !Player.ScoreProcessor.HasCompleted.Value);
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
index 6bdc65078a..73c6970482 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
@@ -8,7 +8,6 @@ using osu.Framework.Audio;
 using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Storyboards;
@@ -21,16 +20,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private AudioManager audioManager { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-            => new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) =>
+            new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
 
         [Test]
         public void TestNoJudgementsOnRewind()
         {
-            AddUntilStep("wait for track to start running", () => MusicController.IsPlaying);
+            AddUntilStep("wait for track to start running", () => Beatmap.Value.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));
@@ -43,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void addSeekStep(double time)
         {
-            AddStep($"seek to {time}", () => MusicController.SeekTo(time));
+            AddStep($"seek to {time}", () => Beatmap.Value.Track.Seek(time));
 
             // Allow a few frames of lenience
             AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time, Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
index 53e06a632e..951ee1489d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
 
-            MusicController.CurrentTrack.Start();
-            MusicController.CurrentTrack.Seek(Beatmap.Value.Beatmap.HitObjects.First().StartTime - 1000);
+            Beatmap.Value.Track.Start();
+            Beatmap.Value.Track.Seek(Beatmap.Value.Beatmap.HitObjects.First().StartTime - 1000);
 
             Add(new ModNightcore<HitObject>.NightcoreBeatContainer());
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index e7dd586f4e..420bf29429 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -288,7 +288,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void confirmNoTrackAdjustments()
         {
-            AddAssert("track has no adjustments", () => MusicController.CurrentTrack.AggregateFrequency.Value == 1);
+            AddAssert("track has no adjustments", () => Beatmap.Value.Track.AggregateFrequency.Value == 1);
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index c3be6aee2b..4fac7bb45f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToTrack>())
-                mod.ApplyToTrack(MusicController.CurrentTrack);
+                mod.ApplyToTrack(Beatmap.Value.Track);
 
             InputManager.Child = container;
         }
@@ -75,7 +75,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for not current", () => !loader.IsCurrentScreen());
             AddAssert("player did not load", () => player == null);
             AddUntilStep("player disposed", () => loader.DisposalTask == null);
-            AddAssert("mod rate still applied", () => MusicController.CurrentTrack.Rate != 1);
+            AddAssert("mod rate still applied", () => Beatmap.Value.Track.Rate != 1);
         }
 
         /// <summary>
@@ -88,13 +88,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("load dummy beatmap", () => ResetPlayer(false, () => SelectedMods.Value = new[] { new OsuModNightcore() }));
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
-            AddAssert("mod rate applied", () => MusicController.CurrentTrack.Rate != 1);
+            AddAssert("mod rate applied", () => Beatmap.Value.Track.Rate != 1);
             AddUntilStep("wait for non-null player", () => player != null);
             AddStep("exit loader", () => loader.Exit());
             AddUntilStep("wait for not current", () => !loader.IsCurrentScreen());
             AddAssert("player did not load", () => !player.IsLoaded);
             AddUntilStep("player disposed", () => loader.DisposalTask?.IsCompleted == true);
-            AddAssert("mod rate still applied", () => MusicController.CurrentTrack.Rate != 1);
+            AddAssert("mod rate still applied", () => Beatmap.Value.Track.Rate != 1);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index c11a47d62b..9f1492a25f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -25,12 +25,16 @@ namespace osu.Game.Tests.Visual.Gameplay
         private readonly Container<DrawableStoryboard> storyboardContainer;
         private DrawableStoryboard storyboard;
 
+        [Cached]
+        private MusicController musicController = new MusicController();
+
         public TestSceneStoryboard()
         {
             Clock = new FramedClock();
 
             AddRange(new Drawable[]
             {
+                musicController,
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -83,9 +87,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void restart()
         {
-            MusicController.CurrentTrack.Reset();
+            var track = Beatmap.Value.Track;
+
+            track.Reset();
             loadStoryboard(Beatmap.Value);
-            MusicController.CurrentTrack.Start();
+            track.Start();
         }
 
         private void loadStoryboard(WorkingBeatmap working)
@@ -100,7 +106,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboard.Passing = false;
 
             storyboardContainer.Add(storyboard);
-            decoupledClock.ChangeSource(MusicController.CurrentTrack);
+            decoupledClock.ChangeSource(working.Track);
         }
 
         private void loadStoryboardNoVideo()
@@ -123,7 +129,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboard = sb.CreateDrawable(Beatmap.Value);
 
             storyboardContainer.Add(storyboard);
-            decoupledClock.ChangeSource(MusicController.CurrentTrack);
+            decoupledClock.ChangeSource(Beatmap.Value.Track);
         }
     }
 }

From aead13628bbaa284b4dc1719c7c83e173f9e8565 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Aug 2020 17:52:42 +0900
Subject: [PATCH 04320/10326] Rework freezing to use masking

---
 .../Objects/Drawables/DrawableHoldNote.cs     | 112 +++++++++---------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 229ce355d7..e959509b96 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -12,7 +12,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -35,19 +34,14 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private readonly Container<DrawableHoldNoteTick> tickContainer;
 
         /// <summary>
-        /// Contains the maximum size/position of the body prior to any offset or size adjustments.
+        /// Contains the size of the hold note covering the whole head/tail bounds. The size of this container changes as the hold note is being pressed.
         /// </summary>
-        private readonly Container bodyContainer;
+        private readonly Container sizingContainer;
 
         /// <summary>
-        /// Contains the offset size/position of the body such that the body extends half-way between the head and tail pieces.
+        /// Contains the contents of the hold note that should be masked as the hold note is being pressed. Follows changes in the size of <see cref="sizingContainer"/>.
         /// </summary>
-        private readonly Container bodyOffsetContainer;
-
-        /// <summary>
-        /// Contains the masking area for the tail, which is resized along with <see cref="bodyContainer"/>.
-        /// </summary>
-        private readonly Container tailMaskingContainer;
+        private readonly Container maskingContainer;
 
         private readonly SkinnableDrawable bodyPiece;
 
@@ -71,36 +65,43 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             RelativeSizeAxes = Axes.X;
 
-            AddRangeInternal(new[]
+            Container maskedContents;
+
+            AddRangeInternal(new Drawable[]
             {
-                bodyContainer = new Container
+                sizingContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
-                        bodyOffsetContainer = new Container
+                        maskingContainer = new Container
                         {
-                            RelativeSizeAxes = Axes.X,
-                            Child = bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
+                            RelativeSizeAxes = Axes.Both,
+                            Child = maskedContents = new Container
                             {
-                                RelativeSizeAxes = Axes.Both
-                            })
+                                RelativeSizeAxes = Axes.Both,
+                                Masking = true,
+                            }
                         },
-                        // The head needs to move along with changes in the size of the body.
                         headContainer = new Container<DrawableHoldNoteHead> { RelativeSizeAxes = Axes.Both }
                     }
                 },
-                tickContainer = new Container<DrawableHoldNoteTick> { RelativeSizeAxes = Axes.Both },
-                tailMaskingContainer = new Container
+                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
                 {
-                    RelativeSizeAxes = Axes.X,
-                    Masking = true,
-                    Child = tailContainer = new Container<DrawableHoldNoteTail>
-                    {
-                        RelativeSizeAxes = Axes.X,
-                    }
+                    RelativeSizeAxes = Axes.Both,
+                })
+                {
+                    RelativeSizeAxes = Axes.X
                 },
-                headContainer.CreateProxy()
+                tickContainer = new Container<DrawableHoldNoteTick> { RelativeSizeAxes = Axes.Both },
+                tailContainer = new Container<DrawableHoldNoteTail> { RelativeSizeAxes = Axes.Both },
+            });
+
+            maskedContents.AddRange(new[]
+            {
+                bodyPiece.CreateProxy(),
+                tickContainer.CreateProxy(),
+                tailContainer.CreateProxy(),
             });
         }
 
@@ -167,24 +168,15 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.OnDirectionChanged(e);
 
-            // The body container is anchored from the position of the tail, since its height is changed when the hold note is being hit.
-            // The body offset container is anchored from the position of the head (inverse of the above).
-            // The tail containers are both anchored from the position of the tail.
             if (e.NewValue == ScrollingDirection.Up)
             {
-                bodyContainer.Anchor = bodyContainer.Origin = Anchor.BottomLeft;
-                bodyOffsetContainer.Anchor = bodyOffsetContainer.Origin = Anchor.TopLeft;
-
-                tailMaskingContainer.Anchor = tailMaskingContainer.Origin = Anchor.BottomLeft;
-                tailContainer.Anchor = tailContainer.Origin = Anchor.BottomLeft;
+                bodyPiece.Anchor = bodyPiece.Origin = Anchor.TopLeft;
+                sizingContainer.Anchor = sizingContainer.Origin = Anchor.BottomLeft;
             }
             else
             {
-                bodyContainer.Anchor = bodyContainer.Origin = Anchor.TopLeft;
-                bodyOffsetContainer.Anchor = bodyOffsetContainer.Origin = Anchor.BottomLeft;
-
-                tailMaskingContainer.Anchor = tailMaskingContainer.Origin = Anchor.TopLeft;
-                tailContainer.Anchor = tailContainer.Origin = Anchor.TopLeft;
+                bodyPiece.Anchor = bodyPiece.Origin = Anchor.BottomLeft;
+                sizingContainer.Anchor = sizingContainer.Origin = Anchor.TopLeft;
             }
         }
 
@@ -206,26 +198,34 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (Time.Current < releaseTime)
                 releaseTime = null;
 
-            // Decrease the size of the body while the hold note is held and the head has been hit. This stops at the very first release point.
+            // Pad the full size container so its contents (i.e. the masking container) reach under the tail.
+            // This is required for the tail to not be masked away, since it lies outside the bounds of the hold note.
+            sizingContainer.Padding = new MarginPadding
+            {
+                Top = Direction.Value == ScrollingDirection.Down ? -Tail.Height : 0,
+                Bottom = Direction.Value == ScrollingDirection.Up ? -Tail.Height : 0,
+            };
+
+            // Pad the masking container to the starting position of the body piece (half-way under the head).
+            // This is required ot make the body start getting masked immediately as soon as the note is held.
+            maskingContainer.Padding = new MarginPadding
+            {
+                Top = Direction.Value == ScrollingDirection.Up ? Head.Height / 2 : 0,
+                Bottom = Direction.Value == ScrollingDirection.Down ? Head.Height / 2 : 0,
+            };
+
+            // Position and resize the body to lie half-way under the head and the tail notes.
+            bodyPiece.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
+            bodyPiece.Height = DrawHeight - Head.Height / 2 + Tail.Height / 2;
+
+            // As the note is being held, adjust the size of the fullSizeContainer. This has two effects:
+            // 1. The contained masking container will mask the body and ticks.
+            // 2. The head note will move along with the new "head position" in the container.
             if (Head.IsHit && releaseTime == null)
             {
                 float heightDecrease = (float)(Math.Max(0, Time.Current - HitObject.StartTime) / HitObject.Duration);
-                bodyContainer.Height = MathHelper.Clamp(1 - heightDecrease, 0, 1);
+                sizingContainer.Height = Math.Clamp(1 - heightDecrease, 0, 1);
             }
-
-            // Re-position the body half-way up the head, and extend the height until it's half-way under the tail.
-            bodyOffsetContainer.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
-            bodyOffsetContainer.Height = bodyContainer.DrawHeight + Tail.Height / 2 - Head.Height / 2;
-
-            // The tail is positioned to be "outside" the hold note, so re-position its masking container to fully cover the tail and extend the height until it's half-way under the head.
-            // The masking height is determined by the size of the body so that the head and tail don't overlap as the body becomes shorter via hitting (above).
-            tailMaskingContainer.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Tail.Height;
-            tailMaskingContainer.Height = bodyContainer.DrawHeight + Tail.Height - Head.Height / 2;
-
-            // The tail container needs the reverse of the above offset applied to bring the tail to its original position.
-            // It also needs the full original height of the hold note to maintain positioning even as the height of the masking container changes.
-            tailContainer.Y = -tailMaskingContainer.Y;
-            tailContainer.Height = DrawHeight;
         }
 
         protected override void UpdateStateTransforms(ArmedState state)

From 69cb9f309123ec3719064ad3bfc9b155ddb4b796 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 18:19:47 +0900
Subject: [PATCH 04321/10326] Fix potential crash if disposing a
 DrawableStoryboardSample twice

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 8eaf9ac652..119c48836b 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -76,6 +76,8 @@ namespace osu.Game.Storyboards.Drawables
         protected override void Dispose(bool isDisposing)
         {
             Channel?.Stop();
+            Channel = null;
+
             base.Dispose(isDisposing);
         }
     }

From 1edafc39bac27e54ebb32dfb44124382ec3b55b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 18:33:24 +0900
Subject: [PATCH 04322/10326] Fix intro welcome playing double due to missing
 conditional

---
 osu.Game/Screens/Menu/IntroTriangles.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 52281967ee..a96fddb5ad 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -64,7 +64,8 @@ namespace osu.Game.Screens.Menu
                 }, t =>
                 {
                     AddInternal(t);
-                    welcome?.Play();
+                    if (!UsingThemedIntro)
+                        welcome?.Play();
 
                     StartTrack();
                 });

From 308d9f59679033e0585cd96b4d5e550c9d2b31d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 18:43:58 +0900
Subject: [PATCH 04323/10326] Ensure locally executed methods are always loaded
 before propagation

---
 osu.Game/Overlays/MusicController.cs | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index c1116ff651..112026d9e2 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -231,9 +231,7 @@ namespace osu.Game.Overlays
 
             if (playable != null)
             {
-                if (beatmap is Bindable<WorkingBeatmap> working)
-                    working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
-
+                changeBeatmap(beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value));
                 restartTrack();
                 return PreviousTrackResult.Previous;
             }
@@ -257,9 +255,7 @@ namespace osu.Game.Overlays
 
             if (playable != null)
             {
-                if (beatmap is Bindable<WorkingBeatmap> working)
-                    working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
-
+                changeBeatmap(beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value));
                 restartTrack();
                 return true;
             }
@@ -278,11 +274,15 @@ namespace osu.Game.Overlays
 
         private TrackChangeDirection? queuedDirection;
 
-        private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> beatmap)
+        private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> beatmap) => changeBeatmap(beatmap.NewValue);
+
+        private void changeBeatmap(WorkingBeatmap newWorking)
         {
+            var lastWorking = current;
+
             TrackChangeDirection direction = TrackChangeDirection.None;
 
-            bool audioEquals = beatmap.NewValue?.BeatmapInfo?.AudioEquals(current?.BeatmapInfo) ?? false;
+            bool audioEquals = newWorking?.BeatmapInfo?.AudioEquals(current?.BeatmapInfo) ?? false;
 
             if (current != null)
             {
@@ -297,13 +297,13 @@ namespace osu.Game.Overlays
                 {
                     // figure out the best direction based on order in playlist.
                     var last = BeatmapSets.TakeWhile(b => b.ID != current.BeatmapSetInfo?.ID).Count();
-                    var next = beatmap.NewValue == null ? -1 : BeatmapSets.TakeWhile(b => b.ID != beatmap.NewValue.BeatmapSetInfo?.ID).Count();
+                    var next = newWorking == null ? -1 : BeatmapSets.TakeWhile(b => b.ID != newWorking.BeatmapSetInfo?.ID).Count();
 
                     direction = last > next ? TrackChangeDirection.Prev : TrackChangeDirection.Next;
                 }
             }
 
-            current = beatmap.NewValue;
+            current = newWorking;
 
             if (!audioEquals || CurrentTrack.IsDummyDevice)
             {
@@ -312,7 +312,7 @@ namespace osu.Game.Overlays
             else
             {
                 // transfer still valid track to new working beatmap
-                current.TransferTrack(beatmap.OldValue.Track);
+                current.TransferTrack(lastWorking.Track);
             }
 
             TrackChanged?.Invoke(current, direction);
@@ -320,6 +320,11 @@ namespace osu.Game.Overlays
             ResetTrackAdjustments();
 
             queuedDirection = null;
+
+            // this will be a noop if coming from the beatmapChanged event.
+            // the exception is local operations like next/prev, where we want to complete loading the track before sending out a change.
+            if (beatmap.Value != current && beatmap is Bindable<WorkingBeatmap> working)
+                working.Value = current;
         }
 
         private void changeTrack()

From 4239e9f684e7e1594fc652be1640a940d9092cd0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 18:44:14 +0900
Subject: [PATCH 04324/10326] Fix storyboard test not actually working due to
 incorrect track referencing

---
 .../Visual/Gameplay/TestSceneStoryboard.cs    | 50 ++++++++-----------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index 9f1492a25f..5a2b8d22fd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -22,19 +22,32 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneStoryboard : OsuTestScene
     {
-        private readonly Container<DrawableStoryboard> storyboardContainer;
+        private Container<DrawableStoryboard> storyboardContainer;
         private DrawableStoryboard storyboard;
 
-        [Cached]
-        private MusicController musicController = new MusicController();
+        [Test]
+        public void TestStoryboard()
+        {
+            AddStep("Restart", restart);
+            AddToggleStep("Passing", passing =>
+            {
+                if (storyboard != null) storyboard.Passing = passing;
+            });
+        }
 
-        public TestSceneStoryboard()
+        [Test]
+        public void TestStoryboardMissingVideo()
+        {
+            AddStep("Load storyboard with missing video", loadStoryboardNoVideo);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
             Clock = new FramedClock();
 
             AddRange(new Drawable[]
             {
-                musicController,
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -58,32 +71,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                     State = { Value = Visibility.Visible },
                 }
             });
+
+            Beatmap.BindValueChanged(beatmapChanged, true);
         }
 
-        [Test]
-        public void TestStoryboard()
-        {
-            AddStep("Restart", restart);
-            AddToggleStep("Passing", passing =>
-            {
-                if (storyboard != null) storyboard.Passing = passing;
-            });
-        }
-
-        [Test]
-        public void TestStoryboardMissingVideo()
-        {
-            AddStep("Load storyboard with missing video", loadStoryboardNoVideo);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Beatmap.ValueChanged += beatmapChanged;
-        }
-
-        private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
-            => loadStoryboard(e.NewValue);
+        private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e) => loadStoryboard(e.NewValue);
 
         private void restart()
         {

From f63d1ba612df01640d3abe79a1db5217a947f54a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Aug 2020 18:52:53 +0900
Subject: [PATCH 04325/10326] Remove stray call to LoadTrack that was forgotten

---
 osu.Game/Screens/Menu/IntroScreen.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 363933694d..884cbfe107 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -12,7 +12,6 @@ using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.IO.Archives;
-using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Skinning;
 using osuTK;
@@ -61,9 +60,6 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private AudioManager audio { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         /// <summary>
         /// Whether the <see cref="Track"/> is provided by osu! resources, rather than a user beatmap.
         /// Only valid during or after <see cref="LogoArriving"/>.
@@ -168,8 +164,8 @@ namespace osu.Game.Screens.Menu
             if (!resuming)
             {
                 beatmap.Value = initialBeatmap;
-                Track = musicController.CurrentTrack;
-                UsingThemedIntro = !initialBeatmap.LoadTrack().IsDummyDevice;
+                Track = initialBeatmap.Track;
+                UsingThemedIntro = !initialBeatmap.Track.IsDummyDevice;
 
                 logo.MoveTo(new Vector2(0.5f));
                 logo.ScaleTo(Vector2.One);

From 42ee9b75df7a411fb2354ab2a47feafd288b815f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 21 Aug 2020 19:38:59 +0900
Subject: [PATCH 04326/10326] Apply suggestions 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>
---
 .../Objects/Drawables/DrawableHoldNote.cs                 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index e959509b96..40c5764a97 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -207,7 +207,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             };
 
             // Pad the masking container to the starting position of the body piece (half-way under the head).
-            // This is required ot make the body start getting masked immediately as soon as the note is held.
+            // This is required to make the body start getting masked immediately as soon as the note is held.
             maskingContainer.Padding = new MarginPadding
             {
                 Top = Direction.Value == ScrollingDirection.Up ? Head.Height / 2 : 0,
@@ -218,13 +218,13 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             bodyPiece.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
             bodyPiece.Height = DrawHeight - Head.Height / 2 + Tail.Height / 2;
 
-            // As the note is being held, adjust the size of the fullSizeContainer. This has two effects:
+            // As the note is being held, adjust the size of the sizing container. This has two effects:
             // 1. The contained masking container will mask the body and ticks.
             // 2. The head note will move along with the new "head position" in the container.
             if (Head.IsHit && releaseTime == null)
             {
-                float heightDecrease = (float)(Math.Max(0, Time.Current - HitObject.StartTime) / HitObject.Duration);
-                sizingContainer.Height = Math.Clamp(1 - heightDecrease, 0, 1);
+                float remainingHeight = (float)(Math.Max(0, HitObject.GetEndTime() - Time.Current) / HitObject.Duration);
+                sizingContainer.Height = Math.Clamp(remainingHeight, 0, 1);
             }
         }
 

From 8632c3adf0c1bc945aa26d14b7206db5ed37a69c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Aug 2020 23:11:15 +0900
Subject: [PATCH 04327/10326] Fix hold notes bouncing with SV changes

---
 .../Objects/Drawables/DrawableHoldNote.cs                    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 40c5764a97..0712026ca6 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -223,8 +223,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // 2. The head note will move along with the new "head position" in the container.
             if (Head.IsHit && releaseTime == null)
             {
-                float remainingHeight = (float)(Math.Max(0, HitObject.GetEndTime() - Time.Current) / HitObject.Duration);
-                sizingContainer.Height = Math.Clamp(remainingHeight, 0, 1);
+                // How far past the hit target this hold note is. Always a positive value.
+                float yOffset = Math.Max(0, Direction.Value == ScrollingDirection.Up ? -Y : Y);
+                sizingContainer.Height = Math.Clamp(1 - yOffset / DrawHeight, 0, 1);
             }
         }
 

From b3338347b7fd99375bc0926c4c29beda38f1171c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Aug 2020 23:56:27 +0900
Subject: [PATCH 04328/10326] Remove fade on successful hits

---
 .../Objects/Drawables/DrawableManiaHitObject.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index a44d8b09aa..ab76a5b8f8 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                     break;
 
                 case ArmedState.Hit:
-                    this.FadeOut(150, Easing.OutQuint);
+                    this.FadeOut();
                     break;
             }
         }

From 88d50b6c4751e7fc87580b8e5bed753052017fa3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:15:37 +0900
Subject: [PATCH 04329/10326] Remove alpha mangling from LegacyDecoder

---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 44ef9bcacc..c15240a4f6 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -104,10 +104,6 @@ namespace osu.Game.Beatmaps.Formats
             try
             {
                 byte alpha = split.Length == 4 ? byte.Parse(split[3]) : (byte)255;
-
-                if (alpha == 0)
-                    alpha = 255;
-
                 colour = new Color4(byte.Parse(split[0]), byte.Parse(split[1]), byte.Parse(split[2]), alpha);
             }
             catch

From 2424fa08027ebe105e1102997e8379ec31528c0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:15:58 +0900
Subject: [PATCH 04330/10326] Add helper methods

---
 osu.Game/Skinning/LegacySkinExtensions.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index bb46dc8b9f..088eae4bce 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osuTK.Graphics;
 using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Skinning
@@ -62,6 +63,21 @@ namespace osu.Game.Skinning
             }
         }
 
+        public static Color4 ToLegacyColour(this Color4 colour)
+        {
+            if (colour.A == 0)
+                colour.A = 1;
+            return colour;
+        }
+
+        public static T WithInitialColour<T>(this T drawable, Color4 colour)
+            where T : Drawable
+        {
+            drawable.Alpha = colour.A;
+            drawable.Colour = ToLegacyColour(colour);
+            return drawable;
+        }
+
         public class SkinnableTextureAnimation : TextureAnimation
         {
             [Resolved(canBeNull: true)]

From eaba32335327dc0a4f987f8b8f35bb89a01d51cb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:17:35 +0900
Subject: [PATCH 04331/10326] Update catch with legacy colour setters

---
 .../Skinning/CatchLegacySkinTransformer.cs                | 8 +++++++-
 osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs      | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index d929da1a29..5abd87d6f4 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
@@ -61,7 +62,12 @@ namespace osu.Game.Rulesets.Catch.Skinning
             switch (lookup)
             {
                 case CatchSkinColour colour:
-                    return Source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+                    var result = (Bindable<Color4>)Source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+                    if (result == null)
+                        return null;
+
+                    result.Value = result.Value.ToLegacyColour();
+                    return (IBindable<TValue>)result;
             }
 
             return Source.GetConfig<TLookup, TValue>(lookup);
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 5be54d3882..c9dd1d1f3e 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 colouredSprite = new Sprite
                 {
                     Texture = skin.GetTexture(lookupName),
-                    Colour = drawableObject.AccentColour.Value,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                 },
@@ -76,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
         {
             base.LoadComplete();
 
-            accentColour.BindValueChanged(colour => colouredSprite.Colour = colour.NewValue, true);
+            accentColour.BindValueChanged(colour => colouredSprite.Colour = colour.NewValue.ToLegacyColour(), true);
         }
     }
 }

From 454564b18928a17525e12596ca38446844cb0600 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:19:15 +0900
Subject: [PATCH 04332/10326] Update mania with legacy colour setters

---
 .../Skinning/LegacyColumnBackground.cs        | 20 ++++++++-----------
 .../Skinning/LegacyHitTarget.cs               |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 64a7641421..b97547bbc6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -58,28 +58,24 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             InternalChildren = new Drawable[]
             {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = backgroundColour
-                },
-                new Box
+                new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(backgroundColour),
+                new Container
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = leftLineWidth,
                     Scale = new Vector2(0.740f, 1),
-                    Colour = lineColour,
-                    Alpha = hasLeftLine ? 1 : 0
+                    Alpha = hasLeftLine ? 1 : 0,
+                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour)
                 },
-                new Box
+                new Container
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Y,
                     Width = rightLineWidth,
                     Scale = new Vector2(0.740f, 1),
-                    Colour = lineColour,
-                    Alpha = hasRightLine ? 1 : 0
+                    Alpha = hasRightLine ? 1 : 0,
+                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour)
                 },
                 lightContainer = new Container
                 {
@@ -90,7 +86,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     {
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
-                        Colour = lightColour,
+                        Colour = lightColour.ToLegacyColour(),
                         Texture = skin.GetTexture(lightImage),
                         RelativeSizeAxes = Axes.X,
                         Width = 1,
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index d055ef3480..2177eaa5e6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                         Anchor = Anchor.CentreLeft,
                         RelativeSizeAxes = Axes.X,
                         Height = 1,
-                        Colour = lineColour,
+                        Colour = lineColour.ToLegacyColour(),
                         Alpha = showJudgementLine ? 0.9f : 0
                     }
                 }

From 16a2ab9dea4fd58e56eb00c017e61fce002b7ed2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:20:33 +0900
Subject: [PATCH 04333/10326] Update osu with legacy colour setters

---
 osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs | 3 +--
 osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs      | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 0ab3e8825b..8a6beddb51 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -59,7 +59,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         hitCircleSprite = new Sprite
                         {
                             Texture = getTextureWithFallback(string.Empty),
-                            Colour = drawableObject.AccentColour.Value,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         },
@@ -107,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             base.LoadComplete();
 
             state.BindValueChanged(updateState, true);
-            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue, true);
+            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue.ToLegacyColour(), true);
             indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
index 0f586034d5..3b75fcc8a0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, DrawableHitObject drawableObject)
         {
-            animationContent.Colour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
+            var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
 
             InternalChildren = new[]
             {
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Texture = skin.GetTexture("sliderb-nd"),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                animationContent.With(d =>
+                animationContent.WithInitialColour(ballColour).With(d =>
                 {
                     d.Anchor = Anchor.Centre;
                     d.Origin = Anchor.Centre;

From 9fbc5f3aeb546fc27572a4c511793d6dd91088ea Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:23:08 +0900
Subject: [PATCH 04334/10326] Update taiko with legacy colour setters

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs | 2 +-
 osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs    | 6 +++---
 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs         | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
index bfcf268c3d..ed69b529ed 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            backgroundLayer.Colour = accentColour;
+            backgroundLayer.Colour = accentColour.ToLegacyColour();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
index 8223e3bc01..6bb8f9433e 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
@@ -76,9 +76,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            headCircle.AccentColour = accentColour;
-            body.Colour = accentColour;
-            end.Colour = accentColour;
+            headCircle.AccentColour = accentColour.ToLegacyColour();
+            body.Colour = accentColour.ToLegacyColour();
+            end.Colour = accentColour.ToLegacyColour();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
index 656728f6e4..f36aae205a 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
@@ -18,9 +19,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            AccentColour = component == TaikoSkinComponents.CentreHit
+            AccentColour = (component == TaikoSkinComponents.CentreHit
                 ? new Color4(235, 69, 44, 255)
-                : new Color4(67, 142, 172, 255);
+                : new Color4(67, 142, 172, 255)).ToLegacyColour();
         }
     }
 }

From f89b6f44653112a86cc5df93be0d6e11ad0ad8d3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:52:53 +0900
Subject: [PATCH 04335/10326] Add xmldocs

---
 osu.Game/Skinning/LegacySkinExtensions.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 088eae4bce..ee7d74d7ec 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -63,6 +63,11 @@ namespace osu.Game.Skinning
             }
         }
 
+        /// <summary>
+        /// The resultant colour after setting a post-constructor colour in osu!stable.
+        /// </summary>
+        /// <param name="colour">The <see cref="Color4"/> to convert.</param>
+        /// <returns>The converted <see cref="Color4"/>.</returns>
         public static Color4 ToLegacyColour(this Color4 colour)
         {
             if (colour.A == 0)
@@ -70,6 +75,16 @@ namespace osu.Game.Skinning
             return colour;
         }
 
+        /// <summary>
+        /// Equivalent of setting a colour in the constructor in osu!stable.
+        /// Doubles the alpha channel into <see cref="Drawable.Alpha"/> and uses <see cref="ToLegacyColour"/> to set <see cref="Drawable.Colour"/>.
+        /// </summary>
+        /// <remarks>
+        /// Beware: Any existing value in <see cref="Drawable.Alpha"/> is overwritten.
+        /// </remarks>
+        /// <param name="drawable">The <see cref="Drawable"/> to set the "InitialColour" of.</param>
+        /// <param name="colour">The <see cref="Color4"/> to set.</param>
+        /// <returns>The given <see cref="Drawable"/>.</returns>
         public static T WithInitialColour<T>(this T drawable, Color4 colour)
             where T : Drawable
         {

From 356c67f00d778e1f6d2535eb534a864d6b04caa4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:55:03 +0900
Subject: [PATCH 04336/10326] Remove outdated/wrong test

---
 osu.Game.Tests/Resources/skin-zero-alpha-colour.ini |  5 -----
 osu.Game.Tests/Skins/LegacySkinDecoderTest.cs       | 10 ----------
 2 files changed, 15 deletions(-)
 delete mode 100644 osu.Game.Tests/Resources/skin-zero-alpha-colour.ini

diff --git a/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini b/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini
deleted file mode 100644
index 3c0dae6b13..0000000000
--- a/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[General]
-Version: latest
-
-[Colours]
-Combo1: 255,255,255,0
\ No newline at end of file
diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
index c408d2f182..aedf26ee75 100644
--- a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
@@ -108,15 +108,5 @@ namespace osu.Game.Tests.Skins
             using (var stream = new LineBufferedReader(resStream))
                 Assert.That(decoder.Decode(stream).LegacyVersion, Is.EqualTo(1.0m));
         }
-
-        [Test]
-        public void TestDecodeColourWithZeroAlpha()
-        {
-            var decoder = new LegacySkinDecoder();
-
-            using (var resStream = TestResources.OpenResource("skin-zero-alpha-colour.ini"))
-            using (var stream = new LineBufferedReader(resStream))
-                Assert.That(decoder.Decode(stream).ComboColours[0].A, Is.EqualTo(1.0f));
-        }
     }
 }

From 08078b9513895806f9df2a08922fc7c4bf826fd9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:56:29 +0900
Subject: [PATCH 04337/10326] Rename method to remove "InitialColour" namings

---
 osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs | 6 +++---
 osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs         | 2 +-
 osu.Game/Skinning/LegacySkinExtensions.cs                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index b97547bbc6..54a16b840f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -58,14 +58,14 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             InternalChildren = new Drawable[]
             {
-                new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(backgroundColour),
+                new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(backgroundColour),
                 new Container
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = leftLineWidth,
                     Scale = new Vector2(0.740f, 1),
                     Alpha = hasLeftLine ? 1 : 0,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour)
+                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(lineColour)
                 },
                 new Container
                 {
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     Width = rightLineWidth,
                     Scale = new Vector2(0.740f, 1),
                     Alpha = hasRightLine ? 1 : 0,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour)
+                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(lineColour)
                 },
                 lightContainer = new Container
                 {
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
index 3b75fcc8a0..27dec1b691 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Texture = skin.GetTexture("sliderb-nd"),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                animationContent.WithInitialColour(ballColour).With(d =>
+                animationContent.WithLegacyColour(ballColour).With(d =>
                 {
                     d.Anchor = Anchor.Centre;
                     d.Origin = Anchor.Centre;
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index ee7d74d7ec..7420f82f04 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -82,10 +82,10 @@ namespace osu.Game.Skinning
         /// <remarks>
         /// Beware: Any existing value in <see cref="Drawable.Alpha"/> is overwritten.
         /// </remarks>
-        /// <param name="drawable">The <see cref="Drawable"/> to set the "InitialColour" of.</param>
+        /// <param name="drawable">The <see cref="Drawable"/> to set the colour of.</param>
         /// <param name="colour">The <see cref="Color4"/> to set.</param>
         /// <returns>The given <see cref="Drawable"/>.</returns>
-        public static T WithInitialColour<T>(this T drawable, Color4 colour)
+        public static T WithLegacyColour<T>(this T drawable, Color4 colour)
             where T : Drawable
         {
             drawable.Alpha = colour.A;

From 891f5cb130b50748cc517369cd33f1f6cf91aca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 21 Aug 2020 20:00:20 +0200
Subject: [PATCH 04338/10326] Add padding to mania column borders to match
 stable

---
 .../Skinning/LegacyColumnBackground.cs        | 50 +++++++++++++------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 64a7641421..f9286b5095 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
@@ -20,9 +21,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
         private readonly bool isLastColumn;
 
+        private Container borderLineContainer;
         private Container lightContainer;
         private Sprite light;
 
+        private float hitPosition;
+
         public LegacyColumnBackground(bool isLastColumn)
         {
             this.isLastColumn = isLastColumn;
@@ -44,6 +48,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
             bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
                                 || isLastColumn;
 
+            hitPosition = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.HitPosition)?.Value
+                          ?? Stage.HIT_TARGET_POSITION;
+
             float lightPosition = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LightPosition)?.Value
                                   ?? 0;
 
@@ -63,23 +70,30 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     RelativeSizeAxes = Axes.Both,
                     Colour = backgroundColour
                 },
-                new Box
+                borderLineContainer = new Container
                 {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = leftLineWidth,
-                    Scale = new Vector2(0.740f, 1),
-                    Colour = lineColour,
-                    Alpha = hasLeftLine ? 1 : 0
-                },
-                new Box
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    RelativeSizeAxes = Axes.Y,
-                    Width = rightLineWidth,
-                    Scale = new Vector2(0.740f, 1),
-                    Colour = lineColour,
-                    Alpha = hasRightLine ? 1 : 0
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Y,
+                            Width = leftLineWidth,
+                            Scale = new Vector2(0.740f, 1),
+                            Colour = lineColour,
+                            Alpha = hasLeftLine ? 1 : 0
+                        },
+                        new Box
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            RelativeSizeAxes = Axes.Y,
+                            Width = rightLineWidth,
+                            Scale = new Vector2(0.740f, 1),
+                            Colour = lineColour,
+                            Alpha = hasRightLine ? 1 : 0
+                        }
+                    }
                 },
                 lightContainer = new Container
                 {
@@ -109,11 +123,15 @@ namespace osu.Game.Rulesets.Mania.Skinning
             {
                 lightContainer.Anchor = Anchor.TopCentre;
                 lightContainer.Scale = new Vector2(1, -1);
+
+                borderLineContainer.Padding = new MarginPadding { Top = hitPosition };
             }
             else
             {
                 lightContainer.Anchor = Anchor.BottomCentre;
                 lightContainer.Scale = Vector2.One;
+
+                borderLineContainer.Padding = new MarginPadding { Bottom = hitPosition };
             }
         }
 

From 809a61afcbb07daa8683191fbafdd16cc6204d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 21 Aug 2020 23:05:19 +0200
Subject: [PATCH 04339/10326] Adjust key binding panel tests to not rely on row
 indices

---
 .../Settings/TestSceneKeyBindingPanel.cs      | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index e06b3a8a7e..987a4a67fe 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -68,22 +68,22 @@ namespace osu.Game.Tests.Visual.Settings
         [Test]
         public void TestClearButtonOnBindings()
         {
-            KeyBindingRow backBindingRow = null;
+            KeyBindingRow multiBindingRow = null;
 
-            AddStep("click back binding row", () =>
+            AddStep("click first row with two bindings", () =>
             {
-                backBindingRow = panel.ChildrenOfType<KeyBindingRow>().ElementAt(10);
-                InputManager.MoveMouseTo(backBindingRow);
+                multiBindingRow = panel.ChildrenOfType<KeyBindingRow>().First(row => row.Defaults.Count() > 1);
+                InputManager.MoveMouseTo(multiBindingRow);
                 InputManager.Click(MouseButton.Left);
             });
 
             clickClearButton();
 
-            AddAssert("first binding cleared", () => string.IsNullOrEmpty(backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().Text.Text));
+            AddAssert("first binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().Text.Text));
 
             AddStep("click second binding", () =>
             {
-                var target = backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1);
+                var target = multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1);
 
                 InputManager.MoveMouseTo(target);
                 InputManager.Click(MouseButton.Left);
@@ -91,13 +91,13 @@ namespace osu.Game.Tests.Visual.Settings
 
             clickClearButton();
 
-            AddAssert("second binding cleared", () => string.IsNullOrEmpty(backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).Text.Text));
+            AddAssert("second binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).Text.Text));
 
             void clickClearButton()
             {
                 AddStep("click clear button", () =>
                 {
-                    var clearButton = backBindingRow.ChildrenOfType<KeyBindingRow.ClearButton>().Single();
+                    var clearButton = multiBindingRow.ChildrenOfType<KeyBindingRow.ClearButton>().Single();
 
                     InputManager.MoveMouseTo(clearButton);
                     InputManager.Click(MouseButton.Left);
@@ -108,20 +108,20 @@ namespace osu.Game.Tests.Visual.Settings
         [Test]
         public void TestClickRowSelectsFirstBinding()
         {
-            KeyBindingRow backBindingRow = null;
+            KeyBindingRow multiBindingRow = null;
 
-            AddStep("click back binding row", () =>
+            AddStep("click first row with two bindings", () =>
             {
-                backBindingRow = panel.ChildrenOfType<KeyBindingRow>().ElementAt(10);
-                InputManager.MoveMouseTo(backBindingRow);
+                multiBindingRow = panel.ChildrenOfType<KeyBindingRow>().First(row => row.Defaults.Count() > 1);
+                InputManager.MoveMouseTo(multiBindingRow);
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("first binding selected", () => backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().IsBinding);
+            AddAssert("first binding selected", () => multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().IsBinding);
 
             AddStep("click second binding", () =>
             {
-                var target = backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1);
+                var target = multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1);
 
                 InputManager.MoveMouseTo(target);
                 InputManager.Click(MouseButton.Left);
@@ -129,12 +129,12 @@ namespace osu.Game.Tests.Visual.Settings
 
             AddStep("click back binding row", () =>
             {
-                backBindingRow = panel.ChildrenOfType<KeyBindingRow>().ElementAt(10);
-                InputManager.MoveMouseTo(backBindingRow);
+                multiBindingRow = panel.ChildrenOfType<KeyBindingRow>().ElementAt(10);
+                InputManager.MoveMouseTo(multiBindingRow);
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("first binding selected", () => backBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().IsBinding);
+            AddAssert("first binding selected", () => multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().IsBinding);
         }
     }
 }

From 0b6185cd14c18b32a031ef0b8d67b00ea6eef134 Mon Sep 17 00:00:00 2001
From: Keijia <antonyblack05@gmail.com>
Date: Sat, 22 Aug 2020 01:09:35 +0300
Subject: [PATCH 04340/10326] add "hp" filter keyword

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 89afc729fe..b7bcf99ce0 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.Select
     internal static class FilterQueryParser
     {
         private static readonly Regex query_syntax_regex = new Regex(
-            @"\b(?<key>stars|ar|dr|cs|divisor|length|objects|bpm|status|creator|artist)(?<op>[=:><]+)(?<value>("".*"")|(\S*))",
+            @"\b(?<key>stars|ar|dr|hp|cs|divisor|length|objects|bpm|status|creator|artist)(?<op>[=:><]+)(?<value>("".*"")|(\S*))",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         internal static void ApplyQueries(FilterCriteria criteria, string query)
@@ -46,6 +46,10 @@ namespace osu.Game.Screens.Select
                     updateCriteriaRange(ref criteria.DrainRate, op, dr, 0.1f / 2);
                     break;
 
+                case "hp" when parseFloatWithPoint(value, out var dr):
+                    updateCriteriaRange(ref criteria.DrainRate, op, dr, 0.1f / 2);
+                    break;
+
                 case "cs" when parseFloatWithPoint(value, out var cs):
                     updateCriteriaRange(ref criteria.CircleSize, op, cs, 0.1f / 2);
                     break;

From f9fe37a8a51aba8955bcf3a6e5d7169cd480adbb Mon Sep 17 00:00:00 2001
From: Keijia <antonyblack05@gmail.com>
Date: Sat, 22 Aug 2020 01:54:01 +0300
Subject: [PATCH 04341/10326] Added test for "hp" filter keyword

---
 .../NonVisual/Filtering/FilterQueryParserTest.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 7b2913b817..d15682b1eb 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
         }
 
         [Test]
-        public void TestApplyDrainRateQueries()
+        public void TestApplyDrainRateQueriesByDrKeyword()
         {
             const string query = "dr>2 quite specific dr<:6";
             var filterCriteria = new FilterCriteria();
@@ -73,6 +73,20 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.Less(filterCriteria.DrainRate.Min, 6.1f);
         }
 
+        [Test]
+        public void TestApplyDrainRateQueriesByHpKeyword()
+        {
+            const string query = "hp>2 quite specific hp<=6";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("quite specific", filterCriteria.SearchText.Trim());
+            Assert.AreEqual(2, filterCriteria.SearchTerms.Length);
+            Assert.Greater(filterCriteria.DrainRate.Min, 2.0f);
+            Assert.Less(filterCriteria.DrainRate.Min, 2.1f);
+            Assert.Greater(filterCriteria.DrainRate.Max, 6.0f);
+            Assert.Less(filterCriteria.DrainRate.Min, 6.1f);
+        }
+
         [Test]
         public void TestApplyBPMQueries()
         {

From b5b2e523ad3493f059fc33e15c810a98995d1a0d Mon Sep 17 00:00:00 2001
From: Keijia <antonyblack05@gmail.com>
Date: Sat, 22 Aug 2020 12:10:31 +0300
Subject: [PATCH 04342/10326] change switch cases

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index b7bcf99ce0..39fa4f777d 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -43,10 +43,7 @@ namespace osu.Game.Screens.Select
                     break;
 
                 case "dr" when parseFloatWithPoint(value, out var dr):
-                    updateCriteriaRange(ref criteria.DrainRate, op, dr, 0.1f / 2);
-                    break;
-
-                case "hp" when parseFloatWithPoint(value, out var dr):
+                case "hp" when parseFloatWithPoint(value, out dr):
                     updateCriteriaRange(ref criteria.DrainRate, op, dr, 0.1f / 2);
                     break;
 

From 7ae45b29dbc82c98012c4525bbf7a13d10bef161 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 22 Aug 2020 12:20:50 +0300
Subject: [PATCH 04343/10326] Finish internal counter transformation regardless
 of the combo

---
 osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index 8ea06688cb..0d9df4f9a0 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -27,7 +27,6 @@ namespace osu.Game.Rulesets.Catch.Skinning
         private readonly float fontOverlap;
 
         private readonly LegacyRollingCounter counter;
-        private LegacyRollingCounter lastExplosion;
 
         public LegacyComboCounter(ISkin skin, string fontName, float fontOverlap)
         {
@@ -70,8 +69,14 @@ namespace osu.Game.Rulesets.Catch.Skinning
         public void DisplayInitialCombo(int combo) => updateCombo(combo, null, true);
         public void UpdateCombo(int combo, Color4? hitObjectColour) => updateCombo(combo, hitObjectColour, false);
 
+        private LegacyRollingCounter lastExplosion;
+
         private void updateCombo(int combo, Color4? hitObjectColour, bool immediate)
         {
+            // There may still be existing transforms to the counter (including value change after 250ms),
+            // finish them immediately before new transforms.
+            counter.FinishTransforms();
+
             // Combo fell to zero, roll down and fade out the counter.
             if (combo == 0)
             {
@@ -83,8 +88,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 return;
             }
 
-            // There may still be previous transforms being applied, finish them and remove explosion.
-            FinishTransforms(true);
+            // Remove last explosion to not conflict with the upcoming one.
             if (lastExplosion != null)
                 RemoveInternal(lastExplosion);
 

From 7e838c80420d35a9c633cfc038fd3afd7ecf728a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 22 Aug 2020 13:07:15 +0300
Subject: [PATCH 04344/10326] Add comment explaining why direct string lookups
 are used

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 49ba02fdea..a9e3d36ca0 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -160,6 +160,7 @@ namespace osu.Game.Tests.Visual
             {
                 this.extrapolateAnimations = extrapolateAnimations;
 
+                // Use a direct string lookup for simplicity, as they're legacy settings and not worth creating enums for them.
                 legacyFontPrefixes.Add(GetConfig<string, string>("HitCirclePrefix")?.Value ?? "default");
                 legacyFontPrefixes.Add(GetConfig<string, string>("ScorePrefix")?.Value ?? "score");
                 legacyFontPrefixes.Add(GetConfig<string, string>("ComboPrefix")?.Value ?? "score");

From b72f06fef68a219b599671cefe3ce2e2b252d3e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 Aug 2020 19:42:34 +0900
Subject: [PATCH 04345/10326] Centralise and clarify LoadTrack documentation

---
 osu.Game/Beatmaps/IWorkingBeatmap.cs | 10 +++++++++-
 osu.Game/Beatmaps/WorkingBeatmap.cs  |  4 ----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 88d73fd7c4..bcd94d76fd 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -56,8 +56,16 @@ namespace osu.Game.Beatmaps
         IBeatmap GetPlayableBeatmap(RulesetInfo ruleset, IReadOnlyList<Mod> mods = null, TimeSpan? timeout = null);
 
         /// <summary>
-        /// Retrieves the <see cref="Track"/> which this <see cref="WorkingBeatmap"/> provides.
+        /// Load a new audio track instance for this beatmap. This should be called once before accessing <see cref="Track"/>.
+        /// The caller of this method is responsible for the lifetime of the track.
         /// </summary>
+        /// <remarks>
+        /// In a standard game context, the loading of the track is managed solely by MusicController, which will
+        /// automatically load the track of the current global IBindable WorkingBeatmap.
+        /// As such, this method should only be called in very special scenarios, such as external tests or apps which are
+        /// outside of the game context.
+        /// </remarks>
+        /// <returns>A fresh track instance, which will also be available via <see cref="Track"/>.</returns>
         Track LoadTrack();
     }
 }
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 6a89739e6f..6a161e6e04 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -261,10 +261,6 @@ namespace osu.Game.Beatmaps
 
         private Track loadedTrack;
 
-        /// <summary>
-        /// Load a new audio track instance for this beatmap.
-        /// </summary>
-        /// <returns>A fresh track instance, which will also be available via <see cref="Track"/>.</returns>
         [NotNull]
         public Track LoadTrack() => loadedTrack = GetBeatmapTrack() ?? GetVirtualTrack(1000);
 

From db5226042747b7e5078903cdb14d3a36f9e4af73 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 Aug 2020 19:44:54 +0900
Subject: [PATCH 04346/10326] Rename and clarify comment regarding "previous"
 track disposal

---
 osu.Game/Overlays/MusicController.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 112026d9e2..6d5b5d43cd 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -331,10 +331,10 @@ namespace osu.Game.Overlays
         {
             var lastTrack = CurrentTrack;
 
-            var newTrack = new DrawableTrack(current.LoadTrack());
-            newTrack.Completed += () => onTrackCompleted(current);
+            var queuedTrack = new DrawableTrack(current.LoadTrack());
+            queuedTrack.Completed += () => onTrackCompleted(current);
 
-            CurrentTrack = newTrack;
+            CurrentTrack = queuedTrack;
 
             // At this point we may potentially be in an async context from tests. This is extremely dangerous but we have to make do for now.
             // CurrentTrack is immediately updated above for situations where a immediate knowledge about the new track is required,
@@ -343,12 +343,13 @@ namespace osu.Game.Overlays
             {
                 lastTrack.Expire();
 
-                if (newTrack == CurrentTrack)
-                    AddInternal(newTrack);
+                if (queuedTrack == CurrentTrack)
+                    AddInternal(queuedTrack);
                 else
                 {
-                    // If the track has changed via changeTrack() being called multiple times in a single update, force disposal on the old track.
-                    newTrack.Dispose();
+                    // If the track has changed since the call to changeTrack, it is safe to dispose the
+                    // queued track rather than consume it.
+                    queuedTrack.Dispose();
                 }
             });
         }

From 122265ff0e233a72a48a329370e8f6f8c1fde6e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 Aug 2020 19:47:05 +0900
Subject: [PATCH 04347/10326] Revert non-track usage

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index c6bfdda698..c617950c64 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 track = b.NewValue.Track;
 
                 // todo: i don't think this is safe, the track may not be loaded yet.
-                if (b.NewValue.Track.Length > 0)
+                if (track.Length > 0)
                 {
                     MaxZoom = getZoomLevelForVisibleMilliseconds(500);
                     MinZoom = getZoomLevelForVisibleMilliseconds(10000);

From fafdbb0a81ae98b0070f24f48622494aa2da6f0e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <slmanarendo1950@gmail.com>
Date: Sat, 22 Aug 2020 17:26:54 +0300
Subject: [PATCH 04348/10326] Adjust recently added inline 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/Tests/Visual/SkinnableTestScene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index a9e3d36ca0..58e0b23fab 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Tests.Visual
             {
                 this.extrapolateAnimations = extrapolateAnimations;
 
-                // Use a direct string lookup for simplicity, as they're legacy settings and not worth creating enums for them.
+                // use a direct string lookup instead of enum to avoid having to reference ruleset assemblies.
                 legacyFontPrefixes.Add(GetConfig<string, string>("HitCirclePrefix")?.Value ?? "default");
                 legacyFontPrefixes.Add(GetConfig<string, string>("ScorePrefix")?.Value ?? "score");
                 legacyFontPrefixes.Add(GetConfig<string, string>("ComboPrefix")?.Value ?? "score");

From ec99fcd7ab2d7ee681677cb4cb082727448f3afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Aug 2020 17:10:31 +0200
Subject: [PATCH 04349/10326] Avoid passing down rhythm list every time

---
 .../Preprocessing/TaikoDifficultyHitObject.cs | 23 ++++++++++++++-----
 .../Difficulty/TaikoDifficultyCalculator.cs   | 15 +-----------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
index 81b304af13..e52f616371 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.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 osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Objects;
@@ -19,23 +18,35 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 
         public readonly int ObjectIndex;
 
-        public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate, int objectIndex,
-                                        IEnumerable<TaikoDifficultyHitObjectRhythm> commonRhythms)
+        public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate, int objectIndex)
             : base(hitObject, lastObject, clockRate)
         {
             var currentHit = hitObject as Hit;
 
             double prevLength = (lastObject.StartTime - lastLastObject.StartTime) / clockRate;
 
-            Rhythm = getClosestRhythm(DeltaTime / prevLength, commonRhythms);
+            Rhythm = getClosestRhythm(DeltaTime / prevLength);
             HitType = currentHit?.Type;
 
             ObjectIndex = objectIndex;
         }
 
-        private TaikoDifficultyHitObjectRhythm getClosestRhythm(double ratio, IEnumerable<TaikoDifficultyHitObjectRhythm> commonRhythms)
+        private static readonly TaikoDifficultyHitObjectRhythm[] common_rhythms =
         {
-            return commonRhythms.OrderBy(x => Math.Abs(x.Ratio - ratio)).First();
+            new TaikoDifficultyHitObjectRhythm(1, 1, 0.0),
+            new TaikoDifficultyHitObjectRhythm(2, 1, 0.3),
+            new TaikoDifficultyHitObjectRhythm(1, 2, 0.5),
+            new TaikoDifficultyHitObjectRhythm(3, 1, 0.3),
+            new TaikoDifficultyHitObjectRhythm(1, 3, 0.35),
+            new TaikoDifficultyHitObjectRhythm(3, 2, 0.6),
+            new TaikoDifficultyHitObjectRhythm(2, 3, 0.4),
+            new TaikoDifficultyHitObjectRhythm(5, 4, 0.5),
+            new TaikoDifficultyHitObjectRhythm(4, 5, 0.7)
+        };
+
+        private TaikoDifficultyHitObjectRhythm getClosestRhythm(double ratio)
+        {
+            return common_rhythms.OrderBy(x => Math.Abs(x.Ratio - ratio)).First();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index d3ff0b95ee..961a2dfcda 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -24,19 +24,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         private const double colour_skill_multiplier = 0.01;
         private const double stamina_skill_multiplier = 0.02;
 
-        private readonly TaikoDifficultyHitObjectRhythm[] commonRhythms =
-        {
-            new TaikoDifficultyHitObjectRhythm(1, 1, 0.0),
-            new TaikoDifficultyHitObjectRhythm(2, 1, 0.3),
-            new TaikoDifficultyHitObjectRhythm(1, 2, 0.5),
-            new TaikoDifficultyHitObjectRhythm(3, 1, 0.3),
-            new TaikoDifficultyHitObjectRhythm(1, 3, 0.35),
-            new TaikoDifficultyHitObjectRhythm(3, 2, 0.6),
-            new TaikoDifficultyHitObjectRhythm(2, 3, 0.4),
-            new TaikoDifficultyHitObjectRhythm(5, 4, 0.5),
-            new TaikoDifficultyHitObjectRhythm(4, 5, 0.7)
-        };
-
         public TaikoDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
@@ -135,7 +122,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 {
                     taikoDifficultyHitObjects.Add(
                         new TaikoDifficultyHitObject(
-                            beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate, i, commonRhythms
+                            beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate, i
                         )
                     );
                 }

From cb3fef76161d8cddc1bf73f99953cb3175e33fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Aug 2020 17:15:08 +0200
Subject: [PATCH 04350/10326] Inline same parity penalty

---
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index dd8b536afc..0453882f45 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -54,8 +54,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
                 else if ((monoHistory[^1] + currentMonoLength) % 2 == 0)
                 {
                     // The last streak in the history is guaranteed to be a different type to the current streak.
-                    // If the total number of notes in the two streaks is even, apply a penalty.
-                    objectStrain *= sameParityPenalty();
+                    // If the total number of notes in the two streaks is even, nullify this object's strain.
+                    objectStrain = 0.0;
                 }
 
                 objectStrain *= repetitionPenalties();
@@ -70,11 +70,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return objectStrain;
         }
 
-        /// <summary>
-        /// The penalty to apply when the total number of notes in the two most recent colour streaks is even.
-        /// </summary>
-        private double sameParityPenalty() => 0.0;
-
         /// <summary>
         /// The penalty to apply due to the length of repetition in colour streaks.
         /// </summary>

From bcf3cd56574338f9ac2005854e1803a704abc439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Aug 2020 17:24:51 +0200
Subject: [PATCH 04351/10326] Remove unnecessary yield iteration

---
 .../Difficulty/TaikoDifficultyCalculator.cs                    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 961a2dfcda..7a99abdac6 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -129,8 +129,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             }
 
             new StaminaCheeseDetector().FindCheese(taikoDifficultyHitObjects);
-            foreach (var hitobject in taikoDifficultyHitObjects)
-                yield return hitobject;
+            return taikoDifficultyHitObjects;
         }
 
         protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]

From 7e2bef3b9fce0fffb8feb2fa0a4293a1714343bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Aug 2020 17:34:08 +0200
Subject: [PATCH 04352/10326] Split conditional for readability

---
 .../Difficulty/TaikoDifficultyCalculator.cs                  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 7a99abdac6..cbbef6e957 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -118,7 +118,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             for (int i = 2; i < beatmap.HitObjects.Count; i++)
             {
                 // Check for negative durations
-                if (beatmap.HitObjects[i].StartTime > beatmap.HitObjects[i - 1].StartTime && beatmap.HitObjects[i - 1].StartTime > beatmap.HitObjects[i - 2].StartTime)
+                var currentAfterLast = beatmap.HitObjects[i].StartTime > beatmap.HitObjects[i - 1].StartTime;
+                var lastAfterSecondLast = beatmap.HitObjects[i - 1].StartTime > beatmap.HitObjects[i - 2].StartTime;
+
+                if (currentAfterLast && lastAfterSecondLast)
                 {
                     taikoDifficultyHitObjects.Add(
                         new TaikoDifficultyHitObject(

From 8ace7df0fde9c2480a0f68ba06165e04fd18529d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Aug 2020 17:51:35 +0200
Subject: [PATCH 04353/10326] Reorder members for better readability

---
 .../Preprocessing/StaminaCheeseDetector.cs    |  10 +-
 .../Preprocessing/TaikoDifficultyHitObject.cs |   7 +-
 .../Difficulty/Skills/Colour.cs               |  14 +-
 .../Difficulty/Skills/Rhythm.cs               |  68 ++++---
 .../Difficulty/Skills/Stamina.cs              |  38 ++--
 .../Difficulty/TaikoDifficultyCalculator.cs   | 181 +++++++++---------
 6 files changed, 158 insertions(+), 160 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
index 3f952d8317..ef5f4433bf 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
@@ -13,11 +13,15 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
         private const int roll_min_repetitions = 12;
         private const int tl_min_repetitions = 16;
 
-        private List<TaikoDifficultyHitObject> hitObjects;
+        private readonly List<TaikoDifficultyHitObject> hitObjects;
 
-        public void FindCheese(List<TaikoDifficultyHitObject> difficultyHitObjects)
+        public StaminaCheeseDetector(List<TaikoDifficultyHitObject> hitObjects)
+        {
+            this.hitObjects = hitObjects;
+        }
+
+        public void FindCheese()
         {
-            hitObjects = difficultyHitObjects;
             findRolls(3);
             findRolls(4);
             findTlTap(0, HitType.Rim);
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
index e52f616371..5f7f8040c7 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
@@ -13,11 +13,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
     {
         public readonly TaikoDifficultyHitObjectRhythm Rhythm;
         public readonly HitType? HitType;
+        public readonly int ObjectIndex;
 
         public bool StaminaCheese;
 
-        public readonly int ObjectIndex;
-
         public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate, int objectIndex)
             : base(hitObject, lastObject, clockRate)
         {
@@ -45,8 +44,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
         };
 
         private TaikoDifficultyHitObjectRhythm getClosestRhythm(double ratio)
-        {
-            return common_rhythms.OrderBy(x => Math.Abs(x.Ratio - ratio)).First();
-        }
+            => common_rhythms.OrderBy(x => Math.Abs(x.Ratio - ratio)).First();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index 0453882f45..1adbf272b3 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -12,11 +12,16 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 {
     public class Colour : Skill
     {
-        private const int mono_history_max_length = 5;
-
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0.4;
 
+        private const int mono_history_max_length = 5;
+
+        /// <summary>
+        /// List of the last <see cref="mono_history_max_length"/> most recent mono patterns, with the most recent at the end of the list.
+        /// </summary>
+        private readonly LimitedCapacityQueue<int> monoHistory = new LimitedCapacityQueue<int>(mono_history_max_length);
+
         private HitType? previousHitType;
 
         /// <summary>
@@ -24,11 +29,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         /// </summary>
         private int currentMonoLength = 1;
 
-        /// <summary>
-        /// List of the last <see cref="mono_history_max_length"/> most recent mono patterns, with the most recent at the end of the list.
-        /// </summary>
-        private readonly LimitedCapacityQueue<int> monoHistory = new LimitedCapacityQueue<int>(mono_history_max_length);
-
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             if (!(current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000))
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index 6bb2eaf06a..f37a4c3f65 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -14,17 +14,43 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
     {
         protected override double SkillMultiplier => 10;
         protected override double StrainDecayBase => 0;
-        private const double strain_decay = 0.96;
-        private double currentStrain;
 
-        private readonly LimitedCapacityQueue<TaikoDifficultyHitObject> rhythmHistory = new LimitedCapacityQueue<TaikoDifficultyHitObject>(rhythm_history_max_length);
+        private const double strain_decay = 0.96;
         private const int rhythm_history_max_length = 8;
 
+        private readonly LimitedCapacityQueue<TaikoDifficultyHitObject> rhythmHistory = new LimitedCapacityQueue<TaikoDifficultyHitObject>(rhythm_history_max_length);
+
+        private double currentStrain;
         private int notesSinceRhythmChange;
 
-        private double repetitionPenalty(int notesSince)
+        protected override double StrainValueOf(DifficultyHitObject current)
         {
-            return Math.Min(1.0, 0.032 * notesSince);
+            if (!(current.BaseObject is Hit))
+            {
+                resetRhythmStrain();
+                return 0.0;
+            }
+
+            currentStrain *= strain_decay;
+
+            TaikoDifficultyHitObject hitobject = (TaikoDifficultyHitObject)current;
+            notesSinceRhythmChange += 1;
+
+            if (hitobject.Rhythm.Difficulty == 0.0)
+            {
+                return 0.0;
+            }
+
+            double objectStrain = hitobject.Rhythm.Difficulty;
+
+            objectStrain *= repetitionPenalties(hitobject);
+            objectStrain *= patternLengthPenalty(notesSinceRhythmChange);
+            objectStrain *= speedPenalty(hitobject.DeltaTime);
+
+            notesSinceRhythmChange = 0;
+
+            currentStrain += objectStrain;
+            return currentStrain;
         }
 
         // Finds repetitions and applies penalties
@@ -61,6 +87,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return true;
         }
 
+        private double repetitionPenalty(int notesSince) => Math.Min(1.0, 0.032 * notesSince);
+
         private double patternLengthPenalty(int patternLength)
         {
             double shortPatternPenalty = Math.Min(0.15 * patternLength, 1.0);
@@ -78,36 +106,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return 0.0;
         }
 
-        protected override double StrainValueOf(DifficultyHitObject current)
-        {
-            if (!(current.BaseObject is Hit))
-            {
-                resetRhythmStrain();
-                return 0.0;
-            }
-
-            currentStrain *= strain_decay;
-
-            TaikoDifficultyHitObject hitobject = (TaikoDifficultyHitObject)current;
-            notesSinceRhythmChange += 1;
-
-            if (hitobject.Rhythm.Difficulty == 0.0)
-            {
-                return 0.0;
-            }
-
-            double objectStrain = hitobject.Rhythm.Difficulty;
-
-            objectStrain *= repetitionPenalties(hitobject);
-            objectStrain *= patternLengthPenalty(notesSinceRhythmChange);
-            objectStrain *= speedPenalty(hitobject.DeltaTime);
-
-            notesSinceRhythmChange = 0;
-
-            currentStrain += objectStrain;
-            return currentStrain;
-        }
-
         private void resetRhythmStrain()
         {
             currentStrain = 0.0;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index 13510290f7..3fd21b5e6d 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -12,32 +12,19 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 {
     public class Stamina : Skill
     {
-        private readonly int hand;
-
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0.4;
 
         private const int max_history_length = 2;
+
+        private readonly int hand;
         private readonly LimitedCapacityQueue<double> notePairDurationHistory = new LimitedCapacityQueue<double>(max_history_length);
 
         private double offhandObjectDuration = double.MaxValue;
 
-        // Penalty for tl tap or roll
-        private double cheesePenalty(double notePairDuration)
+        public Stamina(bool rightHand)
         {
-            if (notePairDuration > 125) return 1;
-            if (notePairDuration < 100) return 0.6;
-
-            return 0.6 + (notePairDuration - 100) * 0.016;
-        }
-
-        private double speedBonus(double notePairDuration)
-        {
-            if (notePairDuration >= 200) return 0;
-
-            double bonus = 200 - notePairDuration;
-            bonus *= bonus;
-            return bonus / 100000;
+            hand = rightHand ? 1 : 0;
         }
 
         protected override double StrainValueOf(DifficultyHitObject current)
@@ -71,9 +58,22 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return 0;
         }
 
-        public Stamina(bool rightHand)
+        // Penalty for tl tap or roll
+        private double cheesePenalty(double notePairDuration)
         {
-            hand = rightHand ? 1 : 0;
+            if (notePairDuration > 125) return 1;
+            if (notePairDuration < 100) return 0.6;
+
+            return 0.6 + (notePairDuration - 100) * 0.016;
+        }
+
+        private double speedBonus(double notePairDuration)
+        {
+            if (notePairDuration >= 200) return 0;
+
+            double bonus = 200 - notePairDuration;
+            bonus *= bonus;
+            return bonus / 100000;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index cbbef6e957..8e0cb2a094 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -29,87 +29,21 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         {
         }
 
-        private double simpleColourPenalty(double staminaDifficulty, double colorDifficulty)
+        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
         {
-            if (colorDifficulty <= 0) return 0.79 - 0.25;
+            new Colour(),
+            new Rhythm(),
+            new Stamina(true),
+            new Stamina(false),
+        };
 
-            return 0.79 - Math.Atan(staminaDifficulty / colorDifficulty - 12) / Math.PI / 2;
-        }
-
-        private double norm(double p, params double[] values)
+        protected override Mod[] DifficultyAdjustmentMods => new Mod[]
         {
-            return Math.Pow(values.Sum(x => Math.Pow(x, p)), 1 / p);
-        }
-
-        private double rescale(double sr)
-        {
-            if (sr < 0) return sr;
-
-            return 10.43 * Math.Log(sr / 8 + 1);
-        }
-
-        private double locallyCombinedDifficulty(
-            double staminaPenalty, Colour colour, Rhythm rhythm, Stamina staminaRight, Stamina staminaLeft)
-        {
-            double difficulty = 0;
-            double weight = 1;
-            List<double> peaks = new List<double>();
-
-            for (int i = 0; i < colour.StrainPeaks.Count; i++)
-            {
-                double colourPeak = colour.StrainPeaks[i] * colour_skill_multiplier;
-                double rhythmPeak = rhythm.StrainPeaks[i] * rhythm_skill_multiplier;
-                double staminaPeak = (staminaRight.StrainPeaks[i] + staminaLeft.StrainPeaks[i]) * stamina_skill_multiplier * staminaPenalty;
-                peaks.Add(norm(2, colourPeak, rhythmPeak, staminaPeak));
-            }
-
-            foreach (double strain in peaks.OrderByDescending(d => d))
-            {
-                difficulty += strain * weight;
-                weight *= 0.9;
-            }
-
-            return difficulty;
-        }
-
-        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
-        {
-            if (beatmap.HitObjects.Count == 0)
-                return new TaikoDifficultyAttributes { Mods = mods, Skills = skills };
-
-            var colour = (Colour)skills[0];
-            var rhythm = (Rhythm)skills[1];
-            var staminaRight = (Stamina)skills[2];
-            var staminaLeft = (Stamina)skills[3];
-
-            double colourRating = colour.DifficultyValue() * colour_skill_multiplier;
-            double rhythmRating = rhythm.DifficultyValue() * rhythm_skill_multiplier;
-            double staminaRating = (staminaRight.DifficultyValue() + staminaLeft.DifficultyValue()) * stamina_skill_multiplier;
-
-            double staminaPenalty = simpleColourPenalty(staminaRating, colourRating);
-            staminaRating *= staminaPenalty;
-
-            double combinedRating = locallyCombinedDifficulty(staminaPenalty, colour, rhythm, staminaRight, staminaLeft);
-            double separatedRating = norm(1.5, colourRating, rhythmRating, staminaRating);
-            double starRating = 1.4 * separatedRating + 0.5 * combinedRating;
-            starRating = rescale(starRating);
-
-            HitWindows hitWindows = new TaikoHitWindows();
-            hitWindows.SetDifficulty(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty);
-
-            return new TaikoDifficultyAttributes
-            {
-                StarRating = starRating,
-                Mods = mods,
-                StaminaStrain = staminaRating,
-                RhythmStrain = rhythmRating,
-                ColourStrain = colourRating,
-                // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be removed in the future
-                GreatHitWindow = (int)hitWindows.WindowFor(HitResult.Great) / clockRate,
-                MaxCombo = beatmap.HitObjects.Count(h => h is Hit),
-                Skills = skills
-            };
-        }
+            new TaikoModDoubleTime(),
+            new TaikoModHalfTime(),
+            new TaikoModEasy(),
+            new TaikoModHardRock(),
+        };
 
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
         {
@@ -131,24 +65,89 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 }
             }
 
-            new StaminaCheeseDetector().FindCheese(taikoDifficultyHitObjects);
+            new StaminaCheeseDetector(taikoDifficultyHitObjects).FindCheese();
             return taikoDifficultyHitObjects;
         }
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
         {
-            new Colour(),
-            new Rhythm(),
-            new Stamina(true),
-            new Stamina(false),
-        };
+            if (beatmap.HitObjects.Count == 0)
+                return new TaikoDifficultyAttributes { Mods = mods, Skills = skills };
 
-        protected override Mod[] DifficultyAdjustmentMods => new Mod[]
+            var colour = (Colour)skills[0];
+            var rhythm = (Rhythm)skills[1];
+            var staminaRight = (Stamina)skills[2];
+            var staminaLeft = (Stamina)skills[3];
+
+            double colourRating = colour.DifficultyValue() * colour_skill_multiplier;
+            double rhythmRating = rhythm.DifficultyValue() * rhythm_skill_multiplier;
+            double staminaRating = (staminaRight.DifficultyValue() + staminaLeft.DifficultyValue()) * stamina_skill_multiplier;
+
+            double staminaPenalty = simpleColourPenalty(staminaRating, colourRating);
+            staminaRating *= staminaPenalty;
+
+            double combinedRating = locallyCombinedDifficulty(colour, rhythm, staminaRight, staminaLeft, staminaPenalty);
+            double separatedRating = norm(1.5, colourRating, rhythmRating, staminaRating);
+            double starRating = 1.4 * separatedRating + 0.5 * combinedRating;
+            starRating = rescale(starRating);
+
+            HitWindows hitWindows = new TaikoHitWindows();
+            hitWindows.SetDifficulty(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty);
+
+            return new TaikoDifficultyAttributes
+            {
+                StarRating = starRating,
+                Mods = mods,
+                StaminaStrain = staminaRating,
+                RhythmStrain = rhythmRating,
+                ColourStrain = colourRating,
+                // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be removed in the future
+                GreatHitWindow = (int)hitWindows.WindowFor(HitResult.Great) / clockRate,
+                MaxCombo = beatmap.HitObjects.Count(h => h is Hit),
+                Skills = skills
+            };
+        }
+
+        private double simpleColourPenalty(double staminaDifficulty, double colorDifficulty)
         {
-            new TaikoModDoubleTime(),
-            new TaikoModHalfTime(),
-            new TaikoModEasy(),
-            new TaikoModHardRock(),
-        };
+            if (colorDifficulty <= 0) return 0.79 - 0.25;
+
+            return 0.79 - Math.Atan(staminaDifficulty / colorDifficulty - 12) / Math.PI / 2;
+        }
+
+        private double norm(double p, params double[] values)
+        {
+            return Math.Pow(values.Sum(x => Math.Pow(x, p)), 1 / p);
+        }
+
+        private double rescale(double sr)
+        {
+            if (sr < 0) return sr;
+
+            return 10.43 * Math.Log(sr / 8 + 1);
+        }
+
+        private double locallyCombinedDifficulty(Colour colour, Rhythm rhythm, Stamina staminaRight, Stamina staminaLeft, double staminaPenalty)
+        {
+            double difficulty = 0;
+            double weight = 1;
+            List<double> peaks = new List<double>();
+
+            for (int i = 0; i < colour.StrainPeaks.Count; i++)
+            {
+                double colourPeak = colour.StrainPeaks[i] * colour_skill_multiplier;
+                double rhythmPeak = rhythm.StrainPeaks[i] * rhythm_skill_multiplier;
+                double staminaPeak = (staminaRight.StrainPeaks[i] + staminaLeft.StrainPeaks[i]) * stamina_skill_multiplier * staminaPenalty;
+                peaks.Add(norm(2, colourPeak, rhythmPeak, staminaPeak));
+            }
+
+            foreach (double strain in peaks.OrderByDescending(d => d))
+            {
+                difficulty += strain * weight;
+                weight *= 0.9;
+            }
+
+            return difficulty;
+        }
     }
 }

From a0807747995823ed520f7beba6a39ddbb4580f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Aug 2020 19:34:16 +0200
Subject: [PATCH 04354/10326] Add xmldoc to taiko difficulty calculation code

---
 .../Preprocessing/StaminaCheeseDetector.cs    |  41 +++++++
 .../Preprocessing/TaikoDifficultyHitObject.cs |  57 ++++++++--
 .../TaikoDifficultyHitObjectRhythm.cs         |  17 +++
 .../Difficulty/Skills/Colour.cs               |  34 ++++--
 .../Difficulty/Skills/Rhythm.cs               | 100 +++++++++++++-----
 .../Difficulty/Skills/Stamina.cs              |  36 ++++++-
 .../Difficulty/TaikoDifficultyCalculator.cs   |  47 +++++---
 7 files changed, 281 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
index ef5f4433bf..5187d101ac 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
@@ -8,11 +8,32 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 {
+    /// <summary>
+    /// Detects special hit object patterns which are easier to hit using special techniques
+    /// than normally assumed in the fully-alternating play style.
+    /// </summary>
+    /// <remarks>
+    /// This component detects two basic types of patterns, leveraged by the following techniques:
+    /// <list>
+    /// <item>Rolling allows hitting patterns with quickly and regularly alternating notes with a single hand.</item>
+    /// <item>TL tapping makes hitting longer sequences of consecutive same-colour notes with little to no colour changes in-between.</item>
+    /// </list>
+    /// </remarks>
     public class StaminaCheeseDetector
     {
+        /// <summary>
+        /// The minimum number of consecutive objects with repeating patterns that can be classified as hittable using a roll.
+        /// </summary>
         private const int roll_min_repetitions = 12;
+
+        /// <summary>
+        /// The minimum number of consecutive objects with repeating patterns that can be classified as hittable using a TL tap.
+        /// </summary>
         private const int tl_min_repetitions = 16;
 
+        /// <summary>
+        /// The list of all <see cref="TaikoDifficultyHitObject"/>s in the map.
+        /// </summary>
         private readonly List<TaikoDifficultyHitObject> hitObjects;
 
         public StaminaCheeseDetector(List<TaikoDifficultyHitObject> hitObjects)
@@ -20,16 +41,25 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
             this.hitObjects = hitObjects;
         }
 
+        /// <summary>
+        /// Finds and marks all objects in <see cref="hitObjects"/> that special difficulty-reducing techiques apply to
+        /// with the <see cref="TaikoDifficultyHitObject.StaminaCheese"/> flag.
+        /// </summary>
         public void FindCheese()
         {
             findRolls(3);
             findRolls(4);
+
             findTlTap(0, HitType.Rim);
             findTlTap(1, HitType.Rim);
             findTlTap(0, HitType.Centre);
             findTlTap(1, HitType.Centre);
         }
 
+        /// <summary>
+        /// Finds and marks all sequences hittable using a roll.
+        /// </summary>
+        /// <param name="patternLength">The length of a single repeating pattern to consider (triplets/quadruplets).</param>
         private void findRolls(int patternLength)
         {
             var history = new LimitedCapacityQueue<TaikoDifficultyHitObject>(2 * patternLength);
@@ -56,6 +86,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
             }
         }
 
+        /// <summary>
+        /// Determines whether the objects stored in <paramref name="history"/> contain a repetition of a pattern of length <paramref name="patternLength"/>.
+        /// </summary>
         private static bool containsPatternRepeat(LimitedCapacityQueue<TaikoDifficultyHitObject> history, int patternLength)
         {
             for (int j = 0; j < patternLength; j++)
@@ -67,6 +100,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
             return true;
         }
 
+        /// <summary>
+        /// Finds and marks all sequences hittable using a TL tap.
+        /// </summary>
+        /// <param name="parity">Whether sequences starting with an odd- (1) or even-indexed (0) hit object should be checked.</param>
+        /// <param name="type">The type of hit to check for TL taps.</param>
         private void findTlTap(int parity, HitType type)
         {
             int tlLength = -2;
@@ -85,6 +123,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
             }
         }
 
+        /// <summary>
+        /// Marks all objects from index <paramref name="start"/> up until <paramref name="end"/> (exclusive) as <see cref="TaikoDifficultyHitObject.StaminaCheese"/>.
+        /// </summary>
         private void markObjectsAsCheese(int start, int end)
         {
             for (int i = start; i < end; ++i)
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
index 5f7f8040c7..ae33c184d0 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
@@ -9,27 +9,61 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 {
+    /// <summary>
+    /// Represents a single hit object in taiko difficulty calculation.
+    /// </summary>
     public class TaikoDifficultyHitObject : DifficultyHitObject
     {
+        /// <summary>
+        /// The rhythm required to hit this hit object.
+        /// </summary>
         public readonly TaikoDifficultyHitObjectRhythm Rhythm;
+
+        /// <summary>
+        /// The hit type of this hit object.
+        /// </summary>
         public readonly HitType? HitType;
+
+        /// <summary>
+        /// The index of the object in the beatmap.
+        /// </summary>
         public readonly int ObjectIndex;
 
+        /// <summary>
+        /// Whether the object should carry a penalty due to being hittable using special techniques
+        /// making it easier to do so.
+        /// </summary>
         public bool StaminaCheese;
 
+        /// <summary>
+        /// Creates a new difficulty hit object.
+        /// </summary>
+        /// <param name="hitObject">The gameplay <see cref="HitObject"/> associated with this difficulty object.</param>
+        /// <param name="lastObject">The gameplay <see cref="HitObject"/> preceding <paramref name="hitObject"/>.</param>
+        /// <param name="lastLastObject">The gameplay <see cref="HitObject"/> preceding <paramref name="lastObject"/>.</param>
+        /// <param name="clockRate">The rate of the gameplay clock. Modified by speed-changing mods.</param>
+        /// <param name="objectIndex">The index of the object in the beatmap.</param>
         public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate, int objectIndex)
             : base(hitObject, lastObject, clockRate)
         {
             var currentHit = hitObject as Hit;
 
-            double prevLength = (lastObject.StartTime - lastLastObject.StartTime) / clockRate;
-
-            Rhythm = getClosestRhythm(DeltaTime / prevLength);
+            Rhythm = getClosestRhythm(lastObject, lastLastObject, clockRate);
             HitType = currentHit?.Type;
 
             ObjectIndex = objectIndex;
         }
 
+        /// <summary>
+        /// List of most common rhythm changes in taiko maps.
+        /// </summary>
+        /// <remarks>
+        /// The general guidelines for the values are:
+        /// <list type="bullet">
+        /// <item>rhythm changes with ratio closer to 1 (that are <i>not</i> 1) are harder to play,</item>
+        /// <item>speeding up is <i>generally</i> harder than slowing down (with exceptions of rhythm changes requiring a hand switch).</item>
+        /// </list>
+        /// </remarks>
         private static readonly TaikoDifficultyHitObjectRhythm[] common_rhythms =
         {
             new TaikoDifficultyHitObjectRhythm(1, 1, 0.0),
@@ -37,13 +71,24 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
             new TaikoDifficultyHitObjectRhythm(1, 2, 0.5),
             new TaikoDifficultyHitObjectRhythm(3, 1, 0.3),
             new TaikoDifficultyHitObjectRhythm(1, 3, 0.35),
-            new TaikoDifficultyHitObjectRhythm(3, 2, 0.6),
+            new TaikoDifficultyHitObjectRhythm(3, 2, 0.6), // purposefully higher (requires hand switch in full alternating gameplay style)
             new TaikoDifficultyHitObjectRhythm(2, 3, 0.4),
             new TaikoDifficultyHitObjectRhythm(5, 4, 0.5),
             new TaikoDifficultyHitObjectRhythm(4, 5, 0.7)
         };
 
-        private TaikoDifficultyHitObjectRhythm getClosestRhythm(double ratio)
-            => common_rhythms.OrderBy(x => Math.Abs(x.Ratio - ratio)).First();
+        /// <summary>
+        /// Returns the closest rhythm change from <see cref="common_rhythms"/> required to hit this object.
+        /// </summary>
+        /// <param name="lastObject">The gameplay <see cref="HitObject"/> preceding this one.</param>
+        /// <param name="lastLastObject">The gameplay <see cref="HitObject"/> preceding <paramref name="lastObject"/>.</param>
+        /// <param name="clockRate">The rate of the gameplay clock.</param>
+        private TaikoDifficultyHitObjectRhythm getClosestRhythm(HitObject lastObject, HitObject lastLastObject, double clockRate)
+        {
+            double prevLength = (lastObject.StartTime - lastLastObject.StartTime) / clockRate;
+            double ratio = DeltaTime / prevLength;
+
+            return common_rhythms.OrderBy(x => Math.Abs(x.Ratio - ratio)).First();
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
index 9c22eff22a..b6dc69a380 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
@@ -3,11 +3,28 @@
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 {
+    /// <summary>
+    /// Represents a rhythm change in a taiko map.
+    /// </summary>
     public class TaikoDifficultyHitObjectRhythm
     {
+        /// <summary>
+        /// The difficulty multiplier associated with this rhythm change.
+        /// </summary>
         public readonly double Difficulty;
+
+        /// <summary>
+        /// The ratio of current <see cref="TaikoDifficultyHitObject.DeltaTime"/> to previous <see cref="TaikoDifficultyHitObject.DeltaTime"/> for the rhythm change.
+        /// A <see cref="Ratio"/> above 1 indicates a slow-down; a <see cref="Ratio"/> below 1 indicates a speed-up.
+        /// </summary>
         public readonly double Ratio;
 
+        /// <summary>
+        /// Creates an object representing a rhythm change.
+        /// </summary>
+        /// <param name="numerator">The numerator for <see cref="Ratio"/>.</param>
+        /// <param name="denominator">The denominator for <see cref="Ratio"/></param>
+        /// <param name="difficulty">The difficulty multiplier associated with this rhythm change.</param>
         public TaikoDifficultyHitObjectRhythm(int numerator, int denominator, double difficulty)
         {
             Ratio = numerator / (double)denominator;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index 1adbf272b3..9fad83c6a1 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -10,18 +10,28 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 {
+    /// <summary>
+    /// Calculates the colour coefficient of taiko difficulty.
+    /// </summary>
     public class Colour : Skill
     {
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0.4;
 
+        /// <summary>
+        /// Maximum number of entries to keep in <see cref="monoHistory"/>.
+        /// </summary>
         private const int mono_history_max_length = 5;
 
         /// <summary>
-        /// List of the last <see cref="mono_history_max_length"/> most recent mono patterns, with the most recent at the end of the list.
+        /// Queue with the lengths of the last <see cref="mono_history_max_length"/> most recent mono (single-colour) patterns,
+        /// with the most recent value at the end of the queue.
         /// </summary>
         private readonly LimitedCapacityQueue<int> monoHistory = new LimitedCapacityQueue<int>(mono_history_max_length);
 
+        /// <summary>
+        /// The <see cref="HitType"/> of the last object hit before the one being considered.
+        /// </summary>
         private HitType? previousHitType;
 
         /// <summary>
@@ -31,6 +41,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 
         protected override double StrainValueOf(DifficultyHitObject current)
         {
+            // changing from/to a drum roll or a swell does not constitute a colour change.
+            // hits spaced more than a second apart are also exempt from colour strain.
             if (!(current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000))
             {
                 previousHitType = null;
@@ -75,14 +87,14 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         /// </summary>
         private double repetitionPenalties()
         {
-            const int l = 2;
+            const int most_recent_patterns_to_compare = 2;
             double penalty = 1.0;
 
             monoHistory.Enqueue(currentMonoLength);
 
-            for (int start = monoHistory.Count - l - 1; start >= 0; start--)
+            for (int start = monoHistory.Count - most_recent_patterns_to_compare - 1; start >= 0; start--)
             {
-                if (!isSamePattern(start, l))
+                if (!isSamePattern(start, most_recent_patterns_to_compare))
                     continue;
 
                 int notesSince = 0;
@@ -94,17 +106,25 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return penalty;
         }
 
-        private bool isSamePattern(int start, int l)
+        /// <summary>
+        /// Determines whether the last <paramref name="mostRecentPatternsToCompare"/> patterns have repeated in the history
+        /// of single-colour note sequences, starting from <paramref name="start"/>.
+        /// </summary>
+        private bool isSamePattern(int start, int mostRecentPatternsToCompare)
         {
-            for (int i = 0; i < l; i++)
+            for (int i = 0; i < mostRecentPatternsToCompare; i++)
             {
-                if (monoHistory[start + i] != monoHistory[monoHistory.Count - l + i])
+                if (monoHistory[start + i] != monoHistory[monoHistory.Count - mostRecentPatternsToCompare + i])
                     return false;
             }
 
             return true;
         }
 
+        /// <summary>
+        /// Calculates the strain penalty for a colour pattern repetition.
+        /// </summary>
+        /// <param name="notesSince">The number of notes since the last repetition of the pattern.</param>
         private double repetitionPenalty(int notesSince) => Math.Min(1.0, 0.032 * notesSince);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index f37a4c3f65..5569b27ad5 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -10,64 +10,97 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 {
+    /// <summary>
+    /// Calculates the rhythm coefficient of taiko difficulty.
+    /// </summary>
     public class Rhythm : Skill
     {
         protected override double SkillMultiplier => 10;
         protected override double StrainDecayBase => 0;
 
+        /// <summary>
+        /// The note-based decay for rhythm strain.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="StrainDecayBase"/> is not used here, as it's time- and not note-based.
+        /// </remarks>
         private const double strain_decay = 0.96;
+
+        /// <summary>
+        /// Maximum number of entries in <see cref="rhythmHistory"/>.
+        /// </summary>
         private const int rhythm_history_max_length = 8;
 
+        /// <summary>
+        /// Contains the last <see cref="rhythm_history_max_length"/> changes in note sequence rhythms.
+        /// </summary>
         private readonly LimitedCapacityQueue<TaikoDifficultyHitObject> rhythmHistory = new LimitedCapacityQueue<TaikoDifficultyHitObject>(rhythm_history_max_length);
 
+        /// <summary>
+        /// Contains the rolling rhythm strain.
+        /// Used to apply per-note decay.
+        /// </summary>
         private double currentStrain;
+
+        /// <summary>
+        /// Number of notes since the last rhythm change has taken place.
+        /// </summary>
         private int notesSinceRhythmChange;
 
         protected override double StrainValueOf(DifficultyHitObject current)
         {
+            // drum rolls and swells are exempt.
             if (!(current.BaseObject is Hit))
             {
-                resetRhythmStrain();
+                resetRhythmAndStrain();
                 return 0.0;
             }
 
             currentStrain *= strain_decay;
 
-            TaikoDifficultyHitObject hitobject = (TaikoDifficultyHitObject)current;
+            TaikoDifficultyHitObject hitObject = (TaikoDifficultyHitObject)current;
             notesSinceRhythmChange += 1;
 
-            if (hitobject.Rhythm.Difficulty == 0.0)
+            // rhythm difficulty zero (due to rhythm not changing) => no rhythm strain.
+            if (hitObject.Rhythm.Difficulty == 0.0)
             {
                 return 0.0;
             }
 
-            double objectStrain = hitobject.Rhythm.Difficulty;
+            double objectStrain = hitObject.Rhythm.Difficulty;
 
-            objectStrain *= repetitionPenalties(hitobject);
+            objectStrain *= repetitionPenalties(hitObject);
             objectStrain *= patternLengthPenalty(notesSinceRhythmChange);
-            objectStrain *= speedPenalty(hitobject.DeltaTime);
+            objectStrain *= speedPenalty(hitObject.DeltaTime);
 
+            // careful - needs to be done here since calls above read this value
             notesSinceRhythmChange = 0;
 
             currentStrain += objectStrain;
             return currentStrain;
         }
 
-        // Finds repetitions and applies penalties
-        private double repetitionPenalties(TaikoDifficultyHitObject hitobject)
+        /// <summary>
+        /// Returns a penalty to apply to the current hit object caused by repeating rhythm changes.
+        /// </summary>
+        /// <remarks>
+        /// Repetitions of more recent patterns are associated with a higher penalty.
+        /// </remarks>
+        /// <param name="hitObject">The current hit object being considered.</param>
+        private double repetitionPenalties(TaikoDifficultyHitObject hitObject)
         {
             double penalty = 1;
 
-            rhythmHistory.Enqueue(hitobject);
+            rhythmHistory.Enqueue(hitObject);
 
-            for (int l = 2; l <= rhythm_history_max_length / 2; l++)
+            for (int mostRecentPatternsToCompare = 2; mostRecentPatternsToCompare <= rhythm_history_max_length / 2; mostRecentPatternsToCompare++)
             {
-                for (int start = rhythmHistory.Count - l - 1; start >= 0; start--)
+                for (int start = rhythmHistory.Count - mostRecentPatternsToCompare - 1; start >= 0; start--)
                 {
-                    if (!samePattern(start, l))
+                    if (!samePattern(start, mostRecentPatternsToCompare))
                         continue;
 
-                    int notesSince = hitobject.ObjectIndex - rhythmHistory[start].ObjectIndex;
+                    int notesSince = hitObject.ObjectIndex - rhythmHistory[start].ObjectIndex;
                     penalty *= repetitionPenalty(notesSince);
                     break;
                 }
@@ -76,37 +109,56 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return penalty;
         }
 
-        private bool samePattern(int start, int l)
+        /// <summary>
+        /// Determines whether the rhythm change pattern starting at <paramref name="start"/> is a repeat of any of the
+        /// <paramref name="mostRecentPatternsToCompare"/>.
+        /// </summary>
+        private bool samePattern(int start, int mostRecentPatternsToCompare)
         {
-            for (int i = 0; i < l; i++)
+            for (int i = 0; i < mostRecentPatternsToCompare; i++)
             {
-                if (rhythmHistory[start + i].Rhythm != rhythmHistory[rhythmHistory.Count - l + i].Rhythm)
+                if (rhythmHistory[start + i].Rhythm != rhythmHistory[rhythmHistory.Count - mostRecentPatternsToCompare + i].Rhythm)
                     return false;
             }
 
             return true;
         }
 
-        private double repetitionPenalty(int notesSince) => Math.Min(1.0, 0.032 * notesSince);
+        /// <summary>
+        /// Calculates a single rhythm repetition penalty.
+        /// </summary>
+        /// <param name="notesSince">Number of notes since the last repetition of a rhythm change.</param>
+        private static double repetitionPenalty(int notesSince) => Math.Min(1.0, 0.032 * notesSince);
 
-        private double patternLengthPenalty(int patternLength)
+        /// <summary>
+        /// Calculates a penalty based on the number of notes since the last rhythm change.
+        /// Both rare and frequent rhythm changes are penalised.
+        /// </summary>
+        /// <param name="patternLength">Number of notes since the last rhythm change.</param>
+        private static double patternLengthPenalty(int patternLength)
         {
             double shortPatternPenalty = Math.Min(0.15 * patternLength, 1.0);
             double longPatternPenalty = Math.Clamp(2.5 - 0.15 * patternLength, 0.0, 1.0);
             return Math.Min(shortPatternPenalty, longPatternPenalty);
         }
 
-        // Penalty for notes so slow that alternating is not necessary.
-        private double speedPenalty(double noteLengthMs)
+        /// <summary>
+        /// Calculates a penalty for objects that do not require alternating hands.
+        /// </summary>
+        /// <param name="deltaTime">Time (in milliseconds) since the last hit object.</param>
+        private double speedPenalty(double deltaTime)
         {
-            if (noteLengthMs < 80) return 1;
-            if (noteLengthMs < 210) return Math.Max(0, 1.4 - 0.005 * noteLengthMs);
+            if (deltaTime < 80) return 1;
+            if (deltaTime < 210) return Math.Max(0, 1.4 - 0.005 * deltaTime);
 
-            resetRhythmStrain();
+            resetRhythmAndStrain();
             return 0.0;
         }
 
-        private void resetRhythmStrain()
+        /// <summary>
+        /// Resets the rolling strain value and <see cref="notesSinceRhythmChange"/> counter.
+        /// </summary>
+        private void resetRhythmAndStrain()
         {
             currentStrain = 0.0;
             notesSinceRhythmChange = 0;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index 3fd21b5e6d..0b61eb9930 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -10,18 +10,45 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
 {
+    /// <summary>
+    /// Calculates the stamina coefficient of taiko difficulty.
+    /// </summary>
+    /// <remarks>
+    /// The reference play style chosen uses two hands, with full alternating (the hand changes after every hit).
+    /// </remarks>
     public class Stamina : Skill
     {
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0.4;
 
+        /// <summary>
+        /// Maximum number of entries to keep in <see cref="notePairDurationHistory"/>.
+        /// </summary>
         private const int max_history_length = 2;
 
+        /// <summary>
+        /// The index of the hand this <see cref="Stamina"/> instance is associated with.
+        /// </summary>
+        /// <remarks>
+        /// The value of 0 indicates the left hand (full alternating gameplay starting with left hand is assumed).
+        /// This naturally translates onto index offsets of the objects in the map.
+        /// </remarks>
         private readonly int hand;
+
+        /// <summary>
+        /// Stores the last <see cref="max_history_length"/> durations between notes hit with the hand indicated by <see cref="hand"/>.
+        /// </summary>
         private readonly LimitedCapacityQueue<double> notePairDurationHistory = new LimitedCapacityQueue<double>(max_history_length);
 
+        /// <summary>
+        /// Stores the <see cref="DifficultyHitObject.DeltaTime"/> of the last object that was hit by the <i>other</i> hand.
+        /// </summary>
         private double offhandObjectDuration = double.MaxValue;
 
+        /// <summary>
+        /// Creates a <see cref="Stamina"/> skill.
+        /// </summary>
+        /// <param name="rightHand">Whether this instance is performing calculations for the right hand.</param>
         public Stamina(bool rightHand)
         {
             hand = rightHand ? 1 : 0;
@@ -58,7 +85,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return 0;
         }
 
-        // Penalty for tl tap or roll
+        /// <summary>
+        /// Applies a penalty for hit objects marked with <see cref="TaikoDifficultyHitObject.StaminaCheese"/>.
+        /// </summary>
+        /// <param name="notePairDuration">The duration between the current and previous note hit using the hand indicated by <see cref="hand"/>.</param>
         private double cheesePenalty(double notePairDuration)
         {
             if (notePairDuration > 125) return 1;
@@ -67,6 +97,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             return 0.6 + (notePairDuration - 100) * 0.016;
         }
 
+        /// <summary>
+        /// Applies a speed bonus dependent on the time since the last hit performed using this hand.
+        /// </summary>
+        /// <param name="notePairDuration">The duration between the current and previous note hit using the hand indicated by <see cref="hand"/>.</param>
         private double speedBonus(double notePairDuration)
         {
             if (notePairDuration >= 200) return 0;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 8e0cb2a094..ef43fc6d1e 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -108,6 +108,13 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             };
         }
 
+        /// <summary>
+        /// Calculates the penalty for the stamina skill for maps with low colour difficulty.
+        /// </summary>
+        /// <remarks>
+        /// Some maps (especially converts) can be easy to read despite a high note density.
+        /// This penalty aims to reduce the star rating of such maps by factoring in colour difficulty to the stamina skill.
+        /// </remarks>
         private double simpleColourPenalty(double staminaDifficulty, double colorDifficulty)
         {
             if (colorDifficulty <= 0) return 0.79 - 0.25;
@@ -115,22 +122,22 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             return 0.79 - Math.Atan(staminaDifficulty / colorDifficulty - 12) / Math.PI / 2;
         }
 
-        private double norm(double p, params double[] values)
-        {
-            return Math.Pow(values.Sum(x => Math.Pow(x, p)), 1 / p);
-        }
-
-        private double rescale(double sr)
-        {
-            if (sr < 0) return sr;
-
-            return 10.43 * Math.Log(sr / 8 + 1);
-        }
+        /// <summary>
+        /// Returns the <i>p</i>-norm of an <i>n</i>-dimensional vector.
+        /// </summary>
+        /// <param name="p">The value of <i>p</i> to calculate the norm for.</param>
+        /// <param name="values">The coefficients of the vector.</param>
+        private double norm(double p, params double[] values) => Math.Pow(values.Sum(x => Math.Pow(x, p)), 1 / p);
 
+        /// <summary>
+        /// Returns the partial star rating of the beatmap, calculated using peak strains from all sections of the map.
+        /// </summary>
+        /// <remarks>
+        /// For each section, the peak strains of all separate skills are combined into a single peak strain for the section.
+        /// The resulting partial rating of the beatmap is a weighted sum of the combined peaks (higher peaks are weighted more).
+        /// </remarks>
         private double locallyCombinedDifficulty(Colour colour, Rhythm rhythm, Stamina staminaRight, Stamina staminaLeft, double staminaPenalty)
         {
-            double difficulty = 0;
-            double weight = 1;
             List<double> peaks = new List<double>();
 
             for (int i = 0; i < colour.StrainPeaks.Count; i++)
@@ -141,6 +148,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 peaks.Add(norm(2, colourPeak, rhythmPeak, staminaPeak));
             }
 
+            double difficulty = 0;
+            double weight = 1;
+
             foreach (double strain in peaks.OrderByDescending(d => d))
             {
                 difficulty += strain * weight;
@@ -149,5 +159,16 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             return difficulty;
         }
+
+        /// <summary>
+        /// Applies a final re-scaling of the star rating to bring maps with recorded full combos below 9.5 stars.
+        /// </summary>
+        /// <param name="sr">The raw star rating value before re-scaling.</param>
+        private double rescale(double sr)
+        {
+            if (sr < 0) return sr;
+
+            return 10.43 * Math.Log(sr / 8 + 1);
+        }
     }
 }

From 5afe9b73d2736c6563826916c1056fcdf285bf17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Aug 2020 21:27:08 +0200
Subject: [PATCH 04355/10326] Fix invalid cref

---
 .../Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
index b6dc69a380..ea6a224094 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
@@ -14,7 +14,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
         public readonly double Difficulty;
 
         /// <summary>
-        /// The ratio of current <see cref="TaikoDifficultyHitObject.DeltaTime"/> to previous <see cref="TaikoDifficultyHitObject.DeltaTime"/> for the rhythm change.
+        /// The ratio of current <see cref="osu.Game.Rulesets.Difficulty.Preprocessing.DifficultyHitObject.DeltaTime"/>
+        /// to previous <see cref="osu.Game.Rulesets.Difficulty.Preprocessing.DifficultyHitObject.DeltaTime"/> for the rhythm change.
         /// A <see cref="Ratio"/> above 1 indicates a slow-down; a <see cref="Ratio"/> below 1 indicates a speed-up.
         /// </summary>
         public readonly double Ratio;

From 7c9fae55ad8b5aa2706f29800f91aacca11eedca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Aug 2020 22:50:58 +0200
Subject: [PATCH 04356/10326] Hopefully fix off-by-one errors

---
 .../Preprocessing/StaminaCheeseDetector.cs    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
index 5187d101ac..d07bff4369 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.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 osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -64,7 +63,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
         {
             var history = new LimitedCapacityQueue<TaikoDifficultyHitObject>(2 * patternLength);
 
-            int repetitionStart = 0;
+            // for convenience, we're tracking the index of the item *before* our suspected repeat's start,
+            // as that index can be simply subtracted from the current index to get the number of elements in between
+            // without off-by-one errors
+            int indexBeforeLastRepeat = -1;
 
             for (int i = 0; i < hitObjects.Count; i++)
             {
@@ -74,15 +76,18 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
 
                 if (!containsPatternRepeat(history, patternLength))
                 {
-                    repetitionStart = i - 2 * patternLength;
+                    // we're setting this up for the next iteration, hence the +1.
+                    // right here this index will point at the queue's front (oldest item),
+                    // but that item is about to be popped next loop with an enqueue.
+                    indexBeforeLastRepeat = i - history.Count + 1;
                     continue;
                 }
 
-                int repeatedLength = i - repetitionStart;
+                int repeatedLength = i - indexBeforeLastRepeat;
                 if (repeatedLength < roll_min_repetitions)
                     continue;
 
-                markObjectsAsCheese(repetitionStart, i);
+                markObjectsAsCheese(i, repeatedLength);
             }
         }
 
@@ -119,17 +124,17 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
                 if (tlLength < tl_min_repetitions)
                     continue;
 
-                markObjectsAsCheese(Math.Max(0, i - tlLength), i);
+                markObjectsAsCheese(i, tlLength);
             }
         }
 
         /// <summary>
-        /// Marks all objects from index <paramref name="start"/> up until <paramref name="end"/> (exclusive) as <see cref="TaikoDifficultyHitObject.StaminaCheese"/>.
+        /// Marks <paramref name="count"/> elements counting backwards from <paramref name="end"/> as <see cref="TaikoDifficultyHitObject.StaminaCheese"/>.
         /// </summary>
-        private void markObjectsAsCheese(int start, int end)
+        private void markObjectsAsCheese(int end, int count)
         {
-            for (int i = start; i < end; ++i)
-                hitObjects[i].StaminaCheese = true;
+            for (int i = 0; i < count; ++i)
+                hitObjects[end - i].StaminaCheese = true;
         }
     }
 }

From 0e9242ee9a327e220d7716c812ffb4bb3468790d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 23 Aug 2020 10:28:05 +0300
Subject: [PATCH 04357/10326] Move combo font retrieval inside the legacy
 component

---
 .../Skinning/CatchLegacySkinTransformer.cs                 | 3 +--
 osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs     | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 0e434291c1..28cd0fb65b 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -55,11 +55,10 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
                 case CatchSkinComponents.CatchComboCounter:
                     var comboFont = GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
-                    var fontOverlap = GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
 
                     // For simplicity, let's use legacy combo font texture existence as a way to identify legacy skins from default.
                     if (this.HasFont(comboFont))
-                        return new LegacyComboCounter(Source, comboFont, fontOverlap);
+                        return new LegacyComboCounter(Source);
 
                     break;
             }
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index 0d9df4f9a0..c1c70c3a0e 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -13,6 +13,7 @@ using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
@@ -28,12 +29,12 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
         private readonly LegacyRollingCounter counter;
 
-        public LegacyComboCounter(ISkin skin, string fontName, float fontOverlap)
+        public LegacyComboCounter(ISkin skin)
         {
             this.skin = skin;
 
-            this.fontName = fontName;
-            this.fontOverlap = fontOverlap;
+            fontName = skin.GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
+            fontOverlap = skin.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
 
             AutoSizeAxes = Axes.Both;
 

From e6646b9877883560187415b1781e3a726da1ca43 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 23 Aug 2020 15:08:02 +0200
Subject: [PATCH 04358/10326] Resolve review comments

---
 .../Formats/LegacyBeatmapEncoderTest.cs       | 31 +++++++++++++------
 .../Beatmaps/IO/ImportBeatmapTest.cs          |  5 ++-
 osu.Game/Beatmaps/BeatmapManager.cs           | 12 +++++--
 .../Beatmaps/Formats/IHasCustomColours.cs     |  2 +-
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 25 ++++++++-------
 osu.Game/Screens/Edit/Editor.cs               |  4 +--
 osu.Game/Screens/Edit/EditorChangeHandler.cs  |  4 +--
 .../Skinning/LegacyManiaSkinConfiguration.cs  |  2 +-
 osu.Game/Skinning/SkinConfiguration.cs        | 16 +++++-----
 9 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index db18f9b444..4e9e6743c9 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -28,25 +28,27 @@ namespace osu.Game.Tests.Beatmaps.Formats
     [TestFixture]
     public class LegacyBeatmapEncoderTest
     {
-        private static readonly DllResourceStore resource_store = TestResources.GetStore();
+        private static readonly DllResourceStore beatmaps_resource_store = TestResources.GetStore();
 
-        private static IEnumerable<string> allBeatmaps = resource_store.GetAvailableResources().Where(res => res.EndsWith(".osu"));
+        private static IEnumerable<string> allBeatmaps = beatmaps_resource_store.GetAvailableResources().Where(res => res.EndsWith(".osu"));
 
         [TestCaseSource(nameof(allBeatmaps))]
         public void TestEncodeDecodeStability(string name)
         {
-            var decoded = decodeFromLegacy(TestResources.GetStore().GetStream(name));
-            var decodedAfterEncode = decodeFromLegacy(encodeToLegacy(decoded));
+            var decoded = decodeFromLegacy(TestResources.GetStore().GetStream(name), name);
+            var decodedAfterEncode = decodeFromLegacy(encodeToLegacy(decoded), name);
 
-            sort(decoded.beatmap);
-            sort(decodedAfterEncode.beatmap);
+            sort(decoded);
+            sort(decodedAfterEncode);
 
             Assert.That(decodedAfterEncode.beatmap.Serialize(), Is.EqualTo(decoded.beatmap.Serialize()));
             Assert.IsTrue(decoded.beatmapSkin.Configuration.Equals(decodedAfterEncode.beatmapSkin.Configuration));
         }
 
-        private void sort(IBeatmap beatmap)
+        private void sort((IBeatmap, LegacyBeatmapSkin) bs)
         {
+            var (beatmap, beatmapSkin) = bs;
+
             // Sort control points to ensure a sane ordering, as they may be parsed in different orders. This works because each group contains only uniquely-typed control points.
             foreach (var g in beatmap.ControlPointInfo.Groups)
             {
@@ -55,17 +57,26 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private (IBeatmap beatmap, LegacySkin beatmapSkin) decodeFromLegacy(Stream stream)
+        private (IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) decodeFromLegacy(Stream stream, string name)
         {
             using (var reader = new LineBufferedReader(stream))
             {
                 var beatmap = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(reader);
-                var beatmapSkin = new LegacyBeatmapSkin(beatmap.BeatmapInfo, resource_store, null);
+                beatmap.BeatmapInfo.BeatmapSet.Files = new List<BeatmapSetFileInfo>
+                {
+                    new BeatmapSetFileInfo
+                    {
+                        Filename = name,
+                        FileInfo = new osu.Game.IO.FileInfo() { Hash = name }
+                    }
+                };
+
+                var beatmapSkin = new LegacyBeatmapSkin(beatmap.BeatmapInfo, beatmaps_resource_store, null);
                 return (convert(beatmap), beatmapSkin);
             }
         }
 
-        private Stream encodeToLegacy((IBeatmap beatmap, LegacySkin beatmapSkin) fullBeatmap)
+        private Stream encodeToLegacy((IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) fullBeatmap)
         {
             var (beatmap, beatmapSkin) = fullBeatmap;
             var stream = new MemoryStream();
diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 17271184c0..0151678db3 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -730,8 +730,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     BeatmapSetInfo setToUpdate = manager.GetAllUsableBeatmapSets()[0];
 
                     var beatmapInfo = setToUpdate.Beatmaps.First(b => b.RulesetID == 0);
-                    var workingBeatmap = manager.GetWorkingBeatmap(setToUpdate.Beatmaps.First(b => b.RulesetID == 0));
-                    Beatmap beatmapToUpdate = (Beatmap)workingBeatmap.Beatmap;
+                    Beatmap beatmapToUpdate = (Beatmap)manager.GetWorkingBeatmap(setToUpdate.Beatmaps.First(b => b.RulesetID == 0)).Beatmap;
                     BeatmapSetFileInfo fileToUpdate = setToUpdate.Files.First(f => beatmapToUpdate.BeatmapInfo.Path.Contains(f.Filename));
 
                     string oldMd5Hash = beatmapToUpdate.BeatmapInfo.MD5Hash;
@@ -739,7 +738,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     beatmapToUpdate.HitObjects.Clear();
                     beatmapToUpdate.HitObjects.Add(new HitCircle { StartTime = 5000 });
 
-                    manager.Save(beatmapInfo, beatmapToUpdate, workingBeatmap.Skin);
+                    manager.Save(beatmapInfo, beatmapToUpdate);
 
                     // Check that the old file reference has been removed
                     Assert.That(manager.QueryBeatmapSet(s => s.ID == setToUpdate.ID).Files.All(f => f.ID != fileToUpdate.ID));
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index bd757d30ca..86d35749ac 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -195,8 +195,8 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="info">The <see cref="BeatmapInfo"/> to save the content against. The file referenced by <see cref="BeatmapInfo.Path"/> will be replaced.</param>
         /// <param name="beatmapContent">The <see cref="IBeatmap"/> content to write.</param>
-        /// <param name="skin">Optional beatmap skin for inline skin configuration in beatmap files.</param>
-        public void Save(BeatmapInfo info, IBeatmap beatmapContent, ISkin skin)
+        /// <param name="beatmapSkin">The beatmap <see cref="ISkin"/> content to write, or null if not to be changed.</param>
+        public void Save(BeatmapInfo info, IBeatmap beatmapContent, LegacyBeatmapSkin beatmapSkin = null)
         {
             var setInfo = QueryBeatmapSet(s => s.Beatmaps.Any(b => b.ID == info.ID));
 
@@ -204,7 +204,13 @@ namespace osu.Game.Beatmaps
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
                 {
-                    new LegacyBeatmapEncoder(beatmapContent, skin).Encode(sw);
+                    if (beatmapSkin == null)
+                    {
+                        var workingBeatmap = GetWorkingBeatmap(info);
+                        beatmapSkin = (workingBeatmap.Skin is LegacyBeatmapSkin legacy) ? legacy : null;
+                    }
+
+                    new LegacyBeatmapEncoder(beatmapContent, beatmapSkin).Encode(sw);
                 }
 
                 stream.Seek(0, SeekOrigin.Begin);
diff --git a/osu.Game/Beatmaps/Formats/IHasCustomColours.cs b/osu.Game/Beatmaps/Formats/IHasCustomColours.cs
index 8f6c7dc328..1ac5ca83cb 100644
--- a/osu.Game/Beatmaps/Formats/IHasCustomColours.cs
+++ b/osu.Game/Beatmaps/Formats/IHasCustomColours.cs
@@ -8,6 +8,6 @@ namespace osu.Game.Beatmaps.Formats
 {
     public interface IHasCustomColours
     {
-        Dictionary<string, Color4> CustomColours { get; set; }
+        IDictionary<string, Color4> CustomColours { get; }
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 716f1bc814..497c3c88d0 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.Formats
 {
@@ -24,11 +25,14 @@ namespace osu.Game.Beatmaps.Formats
         public const int LATEST_VERSION = 128;
 
         private readonly IBeatmap beatmap;
-        private readonly ISkin skin;
+        private readonly LegacyBeatmapSkin skin;
 
-        /// <param name="beatmap">The beatmap to encode</param>
-        /// <param name="skin">An optional skin, for encoding the beatmap's combo colours. This will only work if the parameter is a type of <see cref="LegacyBeatmapSkin"/>.</param>
-        public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] ISkin skin)
+        /// <summary>
+        /// Creates a new <see cref="LegacyBeatmapEncoder"/>.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to encode.</param>
+        /// <param name="skin">An optional skin, for encoding the beatmap's combo colours.</param>
+        public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] LegacyBeatmapSkin skin)
         {
             this.beatmap = beatmap;
             this.skin = skin;
@@ -210,7 +214,7 @@ namespace osu.Game.Beatmaps.Formats
             if (!(skin is LegacyBeatmapSkin legacySkin))
                 return;
 
-            var colours = legacySkin?.Configuration.ComboColours;
+            var colours = legacySkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
 
             if (colours == null || colours.Count == 0)
                 return;
@@ -221,12 +225,11 @@ namespace osu.Game.Beatmaps.Formats
             {
                 var comboColour = colours[i];
 
-                var r = (byte)(comboColour.R * byte.MaxValue);
-                var g = (byte)(comboColour.G * byte.MaxValue);
-                var b = (byte)(comboColour.B * byte.MaxValue);
-                var a = (byte)(comboColour.A * byte.MaxValue);
-
-                writer.WriteLine($"Combo{i}: {r},{g},{b},{a}");
+                writer.Write(FormattableString.Invariant($"Combo{i}: "));
+                writer.Write(FormattableString.Invariant($"{(byte)(comboColour.R * byte.MaxValue)},"));
+                writer.Write(FormattableString.Invariant($"{(byte)(comboColour.G * byte.MaxValue)},"));
+                writer.Write(FormattableString.Invariant($"{(byte)(comboColour.B * byte.MaxValue)},"));
+                writer.WriteLine(FormattableString.Invariant($"{(byte)(comboColour.A * byte.MaxValue)}"));
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index a585db1ee9..7bd6529897 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Edit
         private IBeatmap playableBeatmap;
         private EditorBeatmap editorBeatmap;
         private EditorChangeHandler changeHandler;
-        private ISkin beatmapSkin;
+        private LegacyBeatmapSkin beatmapSkin;
 
         private DependencyContainer dependencies;
 
@@ -94,7 +94,6 @@ namespace osu.Game.Screens.Edit
             try
             {
                 playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
-                beatmapSkin = Beatmap.Value.Skin;
             }
             catch (Exception e)
             {
@@ -107,6 +106,7 @@ namespace osu.Game.Screens.Edit
             AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap));
             dependencies.CacheAs(editorBeatmap);
 
+            beatmapSkin = (Beatmap.Value.Skin is LegacyBeatmapSkin legacy) ? legacy : null;
             changeHandler = new EditorChangeHandler(editorBeatmap, beatmapSkin);
             dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
 
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 0489236d45..1d10eaf5cb 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Edit
         private int currentState = -1;
 
         private readonly EditorBeatmap editorBeatmap;
-        private readonly ISkin beatmapSkin;
+        private readonly LegacyBeatmapSkin beatmapSkin;
         private int bulkChangesStarted;
         private bool isRestoring;
 
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         /// <param name="editorBeatmap">The <see cref="EditorBeatmap"/> to track the <see cref="HitObject"/>s of.</param>
         /// <param name="beatmapSkin">The skin to track the inline skin configuration of.</param>
-        public EditorChangeHandler(EditorBeatmap editorBeatmap, ISkin beatmapSkin)
+        public EditorChangeHandler(EditorBeatmap editorBeatmap, LegacyBeatmapSkin beatmapSkin)
         {
             this.editorBeatmap = editorBeatmap;
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index af7d6007f3..f92da0b446 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Skinning
 
         public readonly int Keys;
 
-        public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
+        public IDictionary<string, Color4> CustomColours { get; set; } = new SortedDictionary<string, Color4>();
 
         public Dictionary<string, string> ImageLookups = new Dictionary<string, string>();
 
diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index a48d713771..9565eee827 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Skinning
     /// <summary>
     /// An empty skin configuration.
     /// </summary>
-    public class SkinConfiguration : IHasComboColours, IHasCustomColours, IEquatable<SkinConfiguration>
+    public class SkinConfiguration : IEquatable<SkinConfiguration>, IHasComboColours, IHasCustomColours
     {
         public readonly SkinInfo SkinInfo = new SkinInfo();
 
@@ -47,16 +47,14 @@ namespace osu.Game.Skinning
 
         public void AddComboColours(params Color4[] colours) => comboColours.AddRange(colours);
 
-        public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
+        public IDictionary<string, Color4> CustomColours { get; set; } = new SortedDictionary<string, Color4>();
 
-        public readonly Dictionary<string, string> ConfigDictionary = new Dictionary<string, string>();
+        public readonly SortedDictionary<string, string> ConfigDictionary = new SortedDictionary<string, string>();
 
         public bool Equals(SkinConfiguration other)
-        {
-            return other != null &&
-                   ConfigDictionary.SequenceEqual(other.ConfigDictionary) &&
-                   ComboColours.SequenceEqual(other.ComboColours) &&
-                   CustomColours?.SequenceEqual(other.CustomColours) == true;
-        }
+            => other != null
+            && ConfigDictionary.SequenceEqual(other.ConfigDictionary)
+            && ComboColours.SequenceEqual(other.ComboColours)
+            && CustomColours?.SequenceEqual(other.CustomColours) == true;
     }
 }

From 492be0e0169248794305cda313b187b1ca0c3894 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 23 Aug 2020 15:23:10 +0200
Subject: [PATCH 04359/10326] Fix formatting

---
 .../Beatmaps/Formats/LegacyBeatmapEncoderTest.cs      |  8 +++-----
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs     |  2 +-
 osu.Game/Skinning/SkinConfiguration.cs                | 11 +++++------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 4e9e6743c9..f093180085 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -45,12 +45,10 @@ namespace osu.Game.Tests.Beatmaps.Formats
             Assert.IsTrue(decoded.beatmapSkin.Configuration.Equals(decodedAfterEncode.beatmapSkin.Configuration));
         }
 
-        private void sort((IBeatmap, LegacyBeatmapSkin) bs)
+        private void sort((IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) tuple)
         {
-            var (beatmap, beatmapSkin) = bs;
-
             // Sort control points to ensure a sane ordering, as they may be parsed in different orders. This works because each group contains only uniquely-typed control points.
-            foreach (var g in beatmap.ControlPointInfo.Groups)
+            foreach (var g in tuple.beatmap.ControlPointInfo.Groups)
             {
                 ArrayList.Adapter((IList)g.ControlPoints).Sort(
                     Comparer<ControlPoint>.Create((c1, c2) => string.Compare(c1.GetType().ToString(), c2.GetType().ToString(), StringComparison.Ordinal)));
@@ -67,7 +65,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                     new BeatmapSetFileInfo
                     {
                         Filename = name,
-                        FileInfo = new osu.Game.IO.FileInfo() { Hash = name }
+                        FileInfo = new osu.Game.IO.FileInfo { Hash = name }
                     }
                 };
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index f92da0b446..baa7fa817c 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Skinning
 
         public readonly int Keys;
 
-        public IDictionary<string, Color4> CustomColours { get; set; } = new SortedDictionary<string, Color4>();
+        public IDictionary<string, Color4> CustomColours { get; } = new SortedDictionary<string, Color4>();
 
         public Dictionary<string, string> ImageLookups = new Dictionary<string, string>();
 
diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index 9565eee827..27589577e6 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -47,14 +47,13 @@ namespace osu.Game.Skinning
 
         public void AddComboColours(params Color4[] colours) => comboColours.AddRange(colours);
 
-        public IDictionary<string, Color4> CustomColours { get; set; } = new SortedDictionary<string, Color4>();
+        public IDictionary<string, Color4> CustomColours { get; } = new SortedDictionary<string, Color4>();
 
         public readonly SortedDictionary<string, string> ConfigDictionary = new SortedDictionary<string, string>();
 
-        public bool Equals(SkinConfiguration other)
-            => other != null
-            && ConfigDictionary.SequenceEqual(other.ConfigDictionary)
-            && ComboColours.SequenceEqual(other.ComboColours)
-            && CustomColours?.SequenceEqual(other.CustomColours) == true;
+        public bool Equals(SkinConfiguration other) => other != null
+                                                    && ConfigDictionary.SequenceEqual(other.ConfigDictionary)
+                                                    && ComboColours.SequenceEqual(other.ComboColours)
+                                                    && CustomColours?.SequenceEqual(other.CustomColours) == true;
     }
 }

From 8f9e090f4c02549c8ed613e8c70785eed38d17be Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 23 Aug 2020 15:39:48 +0200
Subject: [PATCH 04360/10326] Remove Indent

---
 osu.Game/Skinning/SkinConfiguration.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index 27589577e6..2ac4dfa0c8 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -51,9 +51,6 @@ namespace osu.Game.Skinning
 
         public readonly SortedDictionary<string, string> ConfigDictionary = new SortedDictionary<string, string>();
 
-        public bool Equals(SkinConfiguration other) => other != null
-                                                    && ConfigDictionary.SequenceEqual(other.ConfigDictionary)
-                                                    && ComboColours.SequenceEqual(other.ComboColours)
-                                                    && CustomColours?.SequenceEqual(other.CustomColours) == true;
+        public bool Equals(SkinConfiguration other) => other != null && ConfigDictionary.SequenceEqual(other.ConfigDictionary) && ComboColours.SequenceEqual(other.ComboColours) && CustomColours?.SequenceEqual(other.CustomColours) == true;
     }
 }

From 2dce850f5b61b248285d8df4b10ead3e7167948d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Aug 2020 23:11:56 +0900
Subject: [PATCH 04361/10326] Rewrite hyperdash test to not rely on timing

---
 .../TestSceneHyperDash.cs                     | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 6dab2a0b56..514d2aae22 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -22,21 +22,38 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Test]
         public void TestHyperDash()
         {
-            AddAssert("First note is hyperdash", () => Beatmap.Value.Beatmap.HitObjects[0] is Fruit f && f.HyperDash);
-            AddUntilStep("wait for right movement", () => getCatcher().Scale.X > 0); // don't check hyperdashing as it happens too fast.
-
-            AddUntilStep("wait for left movement", () => getCatcher().Scale.X < 0);
-
-            for (int i = 0; i < 3; i++)
+            AddStep("reset count", () =>
             {
-                AddUntilStep("wait for right hyperdash", () => getCatcher().Scale.X > 0 && getCatcher().HyperDashing);
-                AddUntilStep("wait for left hyperdash", () => getCatcher().Scale.X < 0 && getCatcher().HyperDashing);
-            }
+                inHyperDash = false;
+                hyperDashCount = 0;
+            });
 
-            AddUntilStep("wait for right hyperdash", () => getCatcher().Scale.X > 0 && getCatcher().HyperDashing);
+            AddAssert("First note is hyperdash", () => Beatmap.Value.Beatmap.HitObjects[0] is Fruit f && f.HyperDash);
+
+            for (int i = 0; i < 9; i++)
+            {
+                int count = i + 1;
+                AddUntilStep("wait for next hyperdash", () => hyperDashCount == count);
+            }
         }
 
-        private Catcher getCatcher() => Player.ChildrenOfType<CatcherArea>().First().MovableCatcher;
+        private int hyperDashCount;
+        private bool inHyperDash;
+
+        protected override void Update()
+        {
+            var catcher = Player.ChildrenOfType<CatcherArea>().FirstOrDefault()?.MovableCatcher;
+
+            if (catcher == null)
+                return;
+
+            if (catcher.HyperDashing != inHyperDash)
+            {
+                inHyperDash = catcher.HyperDashing;
+                if (catcher.HyperDashing)
+                    hyperDashCount++;
+            }
+        }
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {

From d274652b3a30ace18ab23d92c7d4064c2421fd5f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Aug 2020 00:13:26 +0900
Subject: [PATCH 04362/10326] Fix failures if test ran too fast

---
 osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 514d2aae22..a12e4b69e3 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             for (int i = 0; i < 9; i++)
             {
                 int count = i + 1;
-                AddUntilStep("wait for next hyperdash", () => hyperDashCount == count);
+                AddUntilStep("wait for next hyperdash", () => hyperDashCount >= count);
             }
         }
 

From 12ca870b74e3883ccc3396e32e160d239f419193 Mon Sep 17 00:00:00 2001
From: "Orosfai I. Zsolt" <orosfai11@gmail.com>
Date: Sun, 23 Aug 2020 17:34:57 +0200
Subject: [PATCH 04363/10326] Fix osu!catch relax mod

---
 osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
index c1d24395e4..1e42c6a240 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 
             protected override bool OnMouseMove(MouseMoveEvent e)
             {
-                catcher.UpdatePosition(e.MousePosition.X / DrawSize.X);
+                catcher.UpdatePosition(e.MousePosition.X / DrawSize.X * CatchPlayfield.WIDTH);
                 return base.OnMouseMove(e);
             }
         }

From 68a043a0703202fc918e5879cc6eef296b14f7eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Aug 2020 18:00:06 +0200
Subject: [PATCH 04364/10326] Add test case covering regression

---
 .../Mods/TestSceneCatchModRelax.cs            | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
new file mode 100644
index 0000000000..80939d756e
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.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 System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Mods;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Catch.Tests.Mods
+{
+    public class TestSceneCatchModRelax : ModTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
+
+        [Test]
+        public void TestModRelax() => CreateModTest(new ModTestData
+        {
+            Mod = new CatchModRelax(),
+            Autoplay = false,
+            PassCondition = () =>
+            {
+                var playfield = this.ChildrenOfType<CatchPlayfield>().Single();
+                InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre);
+
+                return Player.ScoreProcessor.Combo.Value > 0;
+            },
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Fruit
+                    {
+                        X = CatchPlayfield.CENTER_X
+                    }
+                }
+            }
+        });
+    }
+}

From a8a7d9af297efdca7a6aecd414e1c8f16421cf16 Mon Sep 17 00:00:00 2001
From: "Orosfai I. Zsolt" <orosfai11@gmail.com>
Date: Sun, 23 Aug 2020 21:35:15 +0200
Subject: [PATCH 04365/10326] Add testcase to osu!catch relax mod

---
 .../Mods/TestSceneCatchModRelax.cs            | 52 ++++++++++++++++---
 1 file changed, 44 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
index 80939d756e..385de0cea7 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -10,7 +10,9 @@ using osu.Game.Rulesets.Catch.Mods;
 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.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests.Mods
 {
@@ -23,23 +25,57 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
         {
             Mod = new CatchModRelax(),
             Autoplay = false,
-            PassCondition = () =>
-            {
-                var playfield = this.ChildrenOfType<CatchPlayfield>().Single();
-                InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre);
-
-                return Player.ScoreProcessor.Combo.Value > 0;
-            },
+            PassCondition = passCondition,
             Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
                     new Fruit
                     {
-                        X = CatchPlayfield.CENTER_X
+                        X = CatchPlayfield.CENTER_X,
+                        StartTime = 0
+                    },
+                    new Fruit
+                    {
+                        X = 0,
+                        StartTime = 250
+                    },
+                    new Fruit
+                    {
+                        X = CatchPlayfield.WIDTH,
+                        StartTime = 500
+                    },
+                    new JuiceStream
+                    {
+                        X = CatchPlayfield.CENTER_X,
+                        StartTime = 750,
+                        Path = new SliderPath(PathType.Linear, new Vector2[] { Vector2.Zero, Vector2.UnitY * 200 })
                     }
                 }
             }
         });
+
+        private bool passCondition()
+        {
+            var playfield = this.ChildrenOfType<CatchPlayfield>().Single();
+
+            switch (Player.ScoreProcessor.Combo.Value)
+            {
+                case 0:
+                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre);
+                    break;
+                case 1:
+                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.BottomLeft);
+                    break;
+                case 2:
+                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.BottomRight);
+                    break;
+                case 3:
+                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre);
+                    break;
+            }
+
+            return Player.ScoreProcessor.Combo.Value >= 6;
+        }
     }
 }

From 3d68f30467c02390e50f5176f294d2a1053056d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Aug 2020 21:52:50 +0200
Subject: [PATCH 04366/10326] Fix code style issues

---
 osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
index 385de0cea7..1eb0975010 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                     {
                         X = CatchPlayfield.CENTER_X,
                         StartTime = 750,
-                        Path = new SliderPath(PathType.Linear, new Vector2[] { Vector2.Zero, Vector2.UnitY * 200 })
+                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 })
                     }
                 }
             }
@@ -64,12 +64,15 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 case 0:
                     InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre);
                     break;
+
                 case 1:
                     InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.BottomLeft);
                     break;
+
                 case 2:
                     InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.BottomRight);
                     break;
+
                 case 3:
                     InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre);
                     break;

From c03cc754e3764bda4ae8b9394eedb846bfd48eef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Aug 2020 11:38:03 +0900
Subject: [PATCH 04367/10326] Move event attaching to ensure reporting is done
 at a high enough rate

---
 .../TestSceneHyperDash.cs                     | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index a12e4b69e3..db09b2bc6b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -19,6 +19,9 @@ namespace osu.Game.Rulesets.Catch.Tests
     {
         protected override bool Autoplay => true;
 
+        private int hyperDashCount;
+        private bool inHyperDash;
+
         [Test]
         public void TestHyperDash()
         {
@@ -26,6 +29,22 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 inHyperDash = false;
                 hyperDashCount = 0;
+
+                // this needs to be done within the frame stable context due to how quickly hyperdash state changes occur.
+                Player.DrawableRuleset.FrameStableComponents.OnUpdate += d =>
+                {
+                    var catcher = Player.ChildrenOfType<CatcherArea>().FirstOrDefault()?.MovableCatcher;
+
+                    if (catcher == null)
+                        return;
+
+                    if (catcher.HyperDashing != inHyperDash)
+                    {
+                        inHyperDash = catcher.HyperDashing;
+                        if (catcher.HyperDashing)
+                            hyperDashCount++;
+                    }
+                };
             });
 
             AddAssert("First note is hyperdash", () => Beatmap.Value.Beatmap.HitObjects[0] is Fruit f && f.HyperDash);
@@ -33,25 +52,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             for (int i = 0; i < 9; i++)
             {
                 int count = i + 1;
-                AddUntilStep("wait for next hyperdash", () => hyperDashCount >= count);
-            }
-        }
-
-        private int hyperDashCount;
-        private bool inHyperDash;
-
-        protected override void Update()
-        {
-            var catcher = Player.ChildrenOfType<CatcherArea>().FirstOrDefault()?.MovableCatcher;
-
-            if (catcher == null)
-                return;
-
-            if (catcher.HyperDashing != inHyperDash)
-            {
-                inHyperDash = catcher.HyperDashing;
-                if (catcher.HyperDashing)
-                    hyperDashCount++;
+                AddUntilStep($"wait for hyperdash #{count}", () => hyperDashCount >= count);
             }
         }
 

From dca307e93379e258c15b5423130014afb9f8f03a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Aug 2020 13:02:39 +0900
Subject: [PATCH 04368/10326] Use beatmap directly in ReadyButton

---
 osu.Game/Screens/Multi/Match/Components/ReadyButton.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index 384d3bd5a5..a64f24dd7e 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -10,7 +10,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
@@ -27,9 +26,6 @@ namespace osu.Game.Screens.Multi.Match.Components
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         private bool hasBeatmap;
 
         public ReadyButton()
@@ -104,7 +100,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                 return;
             }
 
-            bool hasEnoughTime = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(musicController.CurrentTrack.Length) < endDate.Value;
+            bool hasEnoughTime = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(gameBeatmap.Value.Track.Length) < endDate.Value;
 
             Enabled.Value = hasBeatmap && hasEnoughTime;
         }

From d9ba677773fc3945c3e62d6f16a9bdf5ec2f9fa5 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 24 Aug 2020 15:08:50 +0200
Subject: [PATCH 04369/10326] Change TeamFlag from sprite to a container with a
 sprite

---
 .../Components/DrawableTeamFlag.cs            | 20 +++++++++++++++++--
 .../Components/DrawableTournamentTeam.cs      | 11 ++--------
 .../Ladder/Components/DrawableMatchTeam.cs    |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Components/DrawableTeamFlag.cs b/osu.Game.Tournament/Components/DrawableTeamFlag.cs
index 8c85c9a46f..a2e0bf83be 100644
--- a/osu.Game.Tournament/Components/DrawableTeamFlag.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamFlag.cs
@@ -4,19 +4,24 @@
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Tournament.Models;
+using osuTK;
 
 namespace osu.Game.Tournament.Components
 {
-    public class DrawableTeamFlag : Sprite
+    public class DrawableTeamFlag : Container
     {
         private readonly TournamentTeam team;
 
         [UsedImplicitly]
         private Bindable<string> flag;
 
+        private Sprite flagSprite;
+
         public DrawableTeamFlag(TournamentTeam team)
         {
             this.team = team;
@@ -27,7 +32,18 @@ namespace osu.Game.Tournament.Components
         {
             if (team == null) return;
 
-            (flag = team.FlagName.GetBoundCopy()).BindValueChanged(acronym => Texture = textures.Get($@"Flags/{team.FlagName}"), true);
+            Size = new Vector2(70, 47);
+            Masking = true;
+            CornerRadius = 5;
+            Child = flagSprite = new Sprite
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                FillMode = FillMode.Fill
+            };
+
+            (flag = team.FlagName.GetBoundCopy()).BindValueChanged(acronym => flagSprite.Texture = textures.Get($@"Flags/{team.FlagName}"), true);
         }
     }
 }
diff --git a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs b/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
index f8aed26ce1..b9442a67f5 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
@@ -4,9 +4,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.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Tournament.Models;
@@ -17,7 +15,7 @@ namespace osu.Game.Tournament.Components
     {
         public readonly TournamentTeam Team;
 
-        protected readonly Sprite Flag;
+        protected readonly Container Flag;
         protected readonly TournamentSpriteText AcronymText;
 
         [UsedImplicitly]
@@ -27,12 +25,7 @@ namespace osu.Game.Tournament.Components
         {
             Team = team;
 
-            Flag = new DrawableTeamFlag(team)
-            {
-                RelativeSizeAxes = Axes.Both,
-                FillMode = FillMode.Fit
-            };
-
+            Flag = new DrawableTeamFlag(team);
             AcronymText = new TournamentSpriteText
             {
                 Font = OsuFont.Torus.With(weight: FontWeight.Regular),
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index 15cb7e44cb..030ccb5cb3 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             this.losers = losers;
             Size = new Vector2(150, 40);
 
-            Flag.Scale = new Vector2(0.9f);
+            Flag.Scale = new Vector2(0.6f);
             Flag.Anchor = Flag.Origin = Anchor.CentreLeft;
 
             AcronymText.Anchor = AcronymText.Origin = Anchor.CentreLeft;

From db45d9aa8a1f395c57f6e276feb62364845dab54 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Aug 2020 22:11:04 +0900
Subject: [PATCH 04370/10326] Fix catch hyper dash colour defaults not being
 set correctly

As the defaults were not set, if a skin happened to specify 0,0,0,0 it
would be ignored due to the early returns in property setters.
---
 osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
index bab3cb748b..4dcc533dac 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.UI
         private readonly Container<CatcherTrailSprite> hyperDashTrails;
         private readonly Container<CatcherTrailSprite> endGlowSprites;
 
-        private Color4 hyperDashTrailsColour;
+        private Color4 hyperDashTrailsColour = Catcher.DEFAULT_HYPER_DASH_COLOUR;
 
         public Color4 HyperDashTrailsColour
         {
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Catch.UI
             }
         }
 
-        private Color4 endGlowSpritesColour;
+        private Color4 endGlowSpritesColour = Catcher.DEFAULT_HYPER_DASH_COLOUR;
 
         public Color4 EndGlowSpritesColour
         {

From 500cb0ccf5c5f6f09a3874fe98731c41382b6a3c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 24 Aug 2020 22:36:37 +0900
Subject: [PATCH 04371/10326] Fix legacy hit target being layered incorrectly

---
 .../Skinning/LegacyColumnBackground.cs        | 41 +++++++++++++++----
 .../Skinning/LegacyHitTarget.cs               |  5 ---
 .../Skinning/LegacyStageBackground.cs         |  6 ++-
 .../Skinning/ManiaLegacySkinTransformer.cs    |  9 ++--
 4 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index f9286b5095..543ea23db8 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -21,15 +22,20 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
         private readonly bool isLastColumn;
 
-        private Container borderLineContainer;
+        [CanBeNull]
+        private readonly LegacyStageBackground stageBackground;
+
+        private Container hitTargetContainer;
         private Container lightContainer;
         private Sprite light;
+        private Drawable hitTarget;
 
         private float hitPosition;
 
-        public LegacyColumnBackground(bool isLastColumn)
+        public LegacyColumnBackground(bool isLastColumn, [CanBeNull] LegacyStageBackground stageBackground)
         {
             this.isLastColumn = isLastColumn;
+            this.stageBackground = stageBackground;
             RelativeSizeAxes = Axes.Both;
         }
 
@@ -47,6 +53,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             bool hasLeftLine = leftLineWidth > 0;
             bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
                                 || isLastColumn;
+            bool hasHitTarget = Column.Index == 0 || stageBackground == null;
 
             hitPosition = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.HitPosition)?.Value
                           ?? Stage.HIT_TARGET_POSITION;
@@ -63,18 +70,29 @@ namespace osu.Game.Rulesets.Mania.Skinning
             Color4 lightColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
                                  ?? Color4.White;
 
-            InternalChildren = new Drawable[]
+            Drawable background;
+
+            InternalChildren = new[]
             {
-                new Box
+                background = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = backgroundColour
                 },
-                borderLineContainer = new Container
+                hitTargetContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Children = new[]
                     {
+                        // In legacy skins, the hit target takes on the full stage size and is sandwiched between the column background and the column light.
+                        // To simulate this effect in lazer's hierarchy, the hit target is added to the first column's background and manually extended to the full size of the stage.
+                        // Adding to the first columns allows depth issues to be resolved - if it were added to the last column, the previous column lights would appear below it.
+                        // This still means that the hit target will appear below the next column backgrounds, but that's a much easier problem to solve by proxying the backgrounds below.
+                        hitTarget = new LegacyHitTarget
+                        {
+                            RelativeSizeAxes = Axes.Y,
+                            Alpha = hasHitTarget ? 1 : 0
+                        },
                         new Box
                         {
                             RelativeSizeAxes = Axes.Y,
@@ -113,6 +131,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 }
             };
 
+            // Resolve depth issues with the hit target appearing under the next column backgrounds by proxying to the stage background (always below the columns).
+            stageBackground?.AddColumnBackground(background.CreateProxy());
+
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
         }
@@ -124,17 +145,23 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 lightContainer.Anchor = Anchor.TopCentre;
                 lightContainer.Scale = new Vector2(1, -1);
 
-                borderLineContainer.Padding = new MarginPadding { Top = hitPosition };
+                hitTargetContainer.Padding = new MarginPadding { Top = hitPosition };
             }
             else
             {
                 lightContainer.Anchor = Anchor.BottomCentre;
                 lightContainer.Scale = Vector2.One;
 
-                borderLineContainer.Padding = new MarginPadding { Bottom = hitPosition };
+                hitTargetContainer.Padding = new MarginPadding { Bottom = hitPosition };
             }
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            hitTarget.Width = stageBackground?.DrawWidth ?? DrawWidth;
+        }
+
         public bool OnPressed(ManiaAction action)
         {
             if (action == Column.Action.Value)
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index d055ef3480..1e1a9c2237 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -20,11 +20,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         private Container directionContainer;
 
-        public LegacyHitTarget()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
index 7f5de601ca..3998f21c96 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
     {
         private Drawable leftSprite;
         private Drawable rightSprite;
+        private Container columnBackgroundContainer;
 
         public LegacyStageBackground()
         {
@@ -44,7 +45,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     Origin = Anchor.TopLeft,
                     X = -0.05f,
                     Texture = skin.GetTexture(rightImage)
-                }
+                },
+                columnBackgroundContainer = new Container { RelativeSizeAxes = Axes.Both }
             };
         }
 
@@ -58,5 +60,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             if (rightSprite?.Height > 0)
                 rightSprite.Scale = new Vector2(1, DrawHeight / rightSprite.Height);
         }
+
+        public void AddColumnBackground(Drawable background) => columnBackgroundContainer.Add(background);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index e167135556..d928f1080f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -57,6 +57,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// </summary>
         private Lazy<bool> hasKeyTexture;
 
+        private LegacyStageBackground stageBackground;
+
         public ManiaLegacySkinTransformer(ISkinSource source, IBeatmap beatmap)
             : base(source)
         {
@@ -88,10 +90,11 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     switch (maniaComponent.Component)
                     {
                         case ManiaSkinComponents.ColumnBackground:
-                            return new LegacyColumnBackground(maniaComponent.TargetColumn == beatmap.TotalColumns - 1);
+                            return new LegacyColumnBackground(maniaComponent.TargetColumn == beatmap.TotalColumns - 1, stageBackground);
 
                         case ManiaSkinComponents.HitTarget:
-                            return new LegacyHitTarget();
+                            // Created within the column background, but should not fall back. See comments in LegacyColumnBackground.
+                            return Drawable.Empty();
 
                         case ManiaSkinComponents.KeyArea:
                             return new LegacyKeyArea();
@@ -112,7 +115,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                             return new LegacyHitExplosion();
 
                         case ManiaSkinComponents.StageBackground:
-                            return new LegacyStageBackground();
+                            return stageBackground = new LegacyStageBackground();
 
                         case ManiaSkinComponents.StageForeground:
                             return new LegacyStageForeground();

From 60695bee8c25ce8a40894382d338ee7a883e96f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 24 Aug 2020 15:57:41 +0200
Subject: [PATCH 04372/10326] Remove fades when changing trail colour across
 skins

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs             | 5 +++--
 osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index a30e1b7b47..9289a6162c 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -285,8 +285,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void runHyperDashStateTransition(bool hyperDashing)
         {
-            trails.HyperDashTrailsColour = hyperDashColour;
-            trails.EndGlowSpritesColour = hyperDashEndGlowColour;
             updateTrailVisibility();
 
             if (hyperDashing)
@@ -403,6 +401,9 @@ namespace osu.Game.Rulesets.Catch.UI
                 skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage)?.Value ??
                 hyperDashColour;
 
+            trails.HyperDashTrailsColour = hyperDashColour;
+            trails.EndGlowSpritesColour = hyperDashEndGlowColour;
+
             runHyperDashStateTransition(HyperDashing);
         }
 
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
index 4dcc533dac..f7e9fd19a7 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     return;
 
                 hyperDashTrailsColour = value;
-                hyperDashTrails.FadeColour(hyperDashTrailsColour, Catcher.HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+                hyperDashTrails.Colour = hyperDashTrailsColour;
             }
         }
 
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     return;
 
                 endGlowSpritesColour = value;
-                endGlowSprites.FadeColour(endGlowSpritesColour, Catcher.HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+                endGlowSprites.Colour = endGlowSpritesColour;
             }
         }
 

From 77bf646ea09823b123ea44993adf6da3f3e6b320 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 24 Aug 2020 23:01:06 +0900
Subject: [PATCH 04373/10326] Move column lines to background layer

---
 .../Skinning/LegacyColumnBackground.cs        | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 543ea23db8..f22903accf 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -70,30 +70,27 @@ namespace osu.Game.Rulesets.Mania.Skinning
             Color4 lightColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
                                  ?? Color4.White;
 
-            Drawable background;
+            Container backgroundLayer;
+            Drawable leftLine;
+            Drawable rightLine;
 
             InternalChildren = new[]
             {
-                background = new Box
+                backgroundLayer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = backgroundColour
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = backgroundColour
+                    },
                 },
                 hitTargetContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Children = new[]
                     {
-                        // In legacy skins, the hit target takes on the full stage size and is sandwiched between the column background and the column light.
-                        // To simulate this effect in lazer's hierarchy, the hit target is added to the first column's background and manually extended to the full size of the stage.
-                        // Adding to the first columns allows depth issues to be resolved - if it were added to the last column, the previous column lights would appear below it.
-                        // This still means that the hit target will appear below the next column backgrounds, but that's a much easier problem to solve by proxying the backgrounds below.
-                        hitTarget = new LegacyHitTarget
-                        {
-                            RelativeSizeAxes = Axes.Y,
-                            Alpha = hasHitTarget ? 1 : 0
-                        },
-                        new Box
+                        leftLine = new Box
                         {
                             RelativeSizeAxes = Axes.Y,
                             Width = leftLineWidth,
@@ -101,7 +98,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                             Colour = lineColour,
                             Alpha = hasLeftLine ? 1 : 0
                         },
-                        new Box
+                        rightLine = new Box
                         {
                             Anchor = Anchor.TopRight,
                             Origin = Anchor.TopRight,
@@ -110,7 +107,16 @@ namespace osu.Game.Rulesets.Mania.Skinning
                             Scale = new Vector2(0.740f, 1),
                             Colour = lineColour,
                             Alpha = hasRightLine ? 1 : 0
-                        }
+                        },
+                        // In legacy skins, the hit target takes on the full stage size and is sandwiched between the column background and the column light.
+                        // To simulate this effect in lazer's hierarchy, the hit target is added to the first column's background and manually extended to the full size of the stage.
+                        // Adding to the first columns allows depth issues to be resolved - if it were added to the last column, the previous column lights would appear below it.
+                        // This still means that the hit target will appear below the next column backgrounds, but that's a much easier problem to solve by proxying the background layer below.
+                        hitTarget = new LegacyHitTarget
+                        {
+                            RelativeSizeAxes = Axes.Y,
+                            Alpha = hasHitTarget ? 1 : 0
+                        },
                     }
                 },
                 lightContainer = new Container
@@ -132,7 +138,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
             };
 
             // Resolve depth issues with the hit target appearing under the next column backgrounds by proxying to the stage background (always below the columns).
-            stageBackground?.AddColumnBackground(background.CreateProxy());
+            backgroundLayer.Add(leftLine.CreateProxy());
+            backgroundLayer.Add(rightLine.CreateProxy());
+            stageBackground?.AddColumnBackground(backgroundLayer.CreateProxy());
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);

From 018523a43a8c11243b6806fc4c4adf3384e24e6f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Aug 2020 01:21:27 +0900
Subject: [PATCH 04374/10326] Rework to remove cross-class pollutions

---
 .../Beatmaps/StageDefinition.cs               |   4 +-
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |  11 +-
 .../Skinning/LegacyColumnBackground.cs        |  96 +-------------
 .../Skinning/LegacyStageBackground.cs         | 124 +++++++++++++++++-
 .../Skinning/ManiaLegacySkinTransformer.cs    |  11 +-
 osu.Game.Rulesets.Mania/UI/Column.cs          |   2 -
 osu.Game.Rulesets.Mania/UI/ColumnFlow.cs      | 105 +++++++++++++++
 osu.Game.Rulesets.Mania/UI/Stage.cs           |  55 ++------
 8 files changed, 252 insertions(+), 156 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/UI/ColumnFlow.cs

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
index 2557f2acdf..3052fc7d34 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
@@ -21,14 +21,14 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
         /// </summary>
         /// <param name="column">The 0-based column index.</param>
         /// <returns>Whether the column is a special column.</returns>
-        public bool IsSpecialColumn(int column) => Columns % 2 == 1 && column == Columns / 2;
+        public readonly bool IsSpecialColumn(int column) => Columns % 2 == 1 && column == Columns / 2;
 
         /// <summary>
         /// Get the type of column given a column index.
         /// </summary>
         /// <param name="column">The 0-based column index.</param>
         /// <returns>The type of the column.</returns>
-        public ColumnType GetTypeOfColumn(int column)
+        public readonly ColumnType GetTypeOfColumn(int column)
         {
             if (IsSpecialColumn(column))
                 return ColumnType.Special;
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index c0c8505f44..f078345fc1 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.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.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
 
@@ -14,15 +15,23 @@ namespace osu.Game.Rulesets.Mania
         /// </summary>
         public readonly int? TargetColumn;
 
+        /// <summary>
+        /// The intended <see cref="StageDefinition"/> for this component.
+        /// May be null if the component is not a direct member of a <see cref="Stage"/>.
+        /// </summary>
+        public readonly StageDefinition? StageDefinition;
+
         /// <summary>
         /// Creates a new <see cref="ManiaSkinComponent"/>.
         /// </summary>
         /// <param name="component">The component.</param>
         /// <param name="targetColumn">The intended <see cref="Column"/> index for this component. May be null if the component does not exist in a <see cref="Column"/>.</param>
-        public ManiaSkinComponent(ManiaSkinComponents component, int? targetColumn = null)
+        /// <param name="stageDefinition">The intended <see cref="StageDefinition"/> for this component. May be null if the component is not a direct member of a <see cref="Stage"/>.</param>
+        public ManiaSkinComponent(ManiaSkinComponents component, int? targetColumn = null, StageDefinition? stageDefinition = null)
             : base(component)
         {
             TargetColumn = targetColumn;
+            StageDefinition = stageDefinition;
         }
 
         protected override string RulesetPrefix => ManiaRuleset.SHORT_NAME;
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index f22903accf..acae4cd6fb 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.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 JetBrains.Annotations;
 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.Input.Bindings;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
@@ -20,22 +17,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
     public class LegacyColumnBackground : LegacyManiaColumnElement, IKeyBindingHandler<ManiaAction>
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-        private readonly bool isLastColumn;
 
-        [CanBeNull]
-        private readonly LegacyStageBackground stageBackground;
-
-        private Container hitTargetContainer;
         private Container lightContainer;
         private Sprite light;
-        private Drawable hitTarget;
 
-        private float hitPosition;
-
-        public LegacyColumnBackground(bool isLastColumn, [CanBeNull] LegacyStageBackground stageBackground)
+        public LegacyColumnBackground()
         {
-            this.isLastColumn = isLastColumn;
-            this.stageBackground = stageBackground;
             RelativeSizeAxes = Axes.Both;
         }
 
@@ -45,80 +32,14 @@ namespace osu.Game.Rulesets.Mania.Skinning
             string lightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LightImage)?.Value
                                 ?? "mania-stage-light";
 
-            float leftLineWidth = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LeftLineWidth)
-                ?.Value ?? 1;
-            float rightLineWidth = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.RightLineWidth)
-                ?.Value ?? 1;
-
-            bool hasLeftLine = leftLineWidth > 0;
-            bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
-                                || isLastColumn;
-            bool hasHitTarget = Column.Index == 0 || stageBackground == null;
-
-            hitPosition = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.HitPosition)?.Value
-                          ?? Stage.HIT_TARGET_POSITION;
-
             float lightPosition = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LightPosition)?.Value
                                   ?? 0;
 
-            Color4 lineColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLineColour)?.Value
-                                ?? Color4.White;
-
-            Color4 backgroundColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour)?.Value
-                                      ?? Color4.Black;
-
             Color4 lightColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
                                  ?? Color4.White;
 
-            Container backgroundLayer;
-            Drawable leftLine;
-            Drawable rightLine;
-
             InternalChildren = new[]
             {
-                backgroundLayer = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = backgroundColour
-                    },
-                },
-                hitTargetContainer = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new[]
-                    {
-                        leftLine = new Box
-                        {
-                            RelativeSizeAxes = Axes.Y,
-                            Width = leftLineWidth,
-                            Scale = new Vector2(0.740f, 1),
-                            Colour = lineColour,
-                            Alpha = hasLeftLine ? 1 : 0
-                        },
-                        rightLine = new Box
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            RelativeSizeAxes = Axes.Y,
-                            Width = rightLineWidth,
-                            Scale = new Vector2(0.740f, 1),
-                            Colour = lineColour,
-                            Alpha = hasRightLine ? 1 : 0
-                        },
-                        // In legacy skins, the hit target takes on the full stage size and is sandwiched between the column background and the column light.
-                        // To simulate this effect in lazer's hierarchy, the hit target is added to the first column's background and manually extended to the full size of the stage.
-                        // Adding to the first columns allows depth issues to be resolved - if it were added to the last column, the previous column lights would appear below it.
-                        // This still means that the hit target will appear below the next column backgrounds, but that's a much easier problem to solve by proxying the background layer below.
-                        hitTarget = new LegacyHitTarget
-                        {
-                            RelativeSizeAxes = Axes.Y,
-                            Alpha = hasHitTarget ? 1 : 0
-                        },
-                    }
-                },
                 lightContainer = new Container
                 {
                     Origin = Anchor.BottomCentre,
@@ -137,11 +58,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 }
             };
 
-            // Resolve depth issues with the hit target appearing under the next column backgrounds by proxying to the stage background (always below the columns).
-            backgroundLayer.Add(leftLine.CreateProxy());
-            backgroundLayer.Add(rightLine.CreateProxy());
-            stageBackground?.AddColumnBackground(backgroundLayer.CreateProxy());
-
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
         }
@@ -152,24 +68,14 @@ namespace osu.Game.Rulesets.Mania.Skinning
             {
                 lightContainer.Anchor = Anchor.TopCentre;
                 lightContainer.Scale = new Vector2(1, -1);
-
-                hitTargetContainer.Padding = new MarginPadding { Top = hitPosition };
             }
             else
             {
                 lightContainer.Anchor = Anchor.BottomCentre;
                 lightContainer.Scale = Vector2.One;
-
-                hitTargetContainer.Padding = new MarginPadding { Bottom = hitPosition };
             }
         }
 
-        protected override void Update()
-        {
-            base.Update();
-            hitTarget.Width = stageBackground?.DrawWidth ?? DrawWidth;
-        }
-
         public bool OnPressed(ManiaAction action)
         {
             if (action == Column.Action.Value)
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
index 3998f21c96..675c154b82 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
@@ -2,22 +2,31 @@
 // 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.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
     public class LegacyStageBackground : CompositeDrawable
     {
+        private readonly StageDefinition stageDefinition;
+
         private Drawable leftSprite;
         private Drawable rightSprite;
-        private Container columnBackgroundContainer;
+        private ColumnFlow<Drawable> columnBackgrounds;
 
-        public LegacyStageBackground()
+        public LegacyStageBackground(StageDefinition stageDefinition)
         {
+            this.stageDefinition = stageDefinition;
             RelativeSizeAxes = Axes.Both;
         }
 
@@ -46,8 +55,18 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     X = -0.05f,
                     Texture = skin.GetTexture(rightImage)
                 },
-                columnBackgroundContainer = new Container { RelativeSizeAxes = Axes.Both }
+                columnBackgrounds = new ColumnFlow<Drawable>(stageDefinition)
+                {
+                    RelativeSizeAxes = Axes.Y
+                },
+                new HitTargetInsetContainer
+                {
+                    Child = new LegacyHitTarget { RelativeSizeAxes = Axes.Both }
+                }
             };
+
+            for (int i = 0; i < stageDefinition.Columns; i++)
+                columnBackgrounds.SetColumn(i, new ColumnBackground(i, i == stageDefinition.Columns - 1));
         }
 
         protected override void Update()
@@ -61,6 +80,103 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 rightSprite.Scale = new Vector2(1, DrawHeight / rightSprite.Height);
         }
 
-        public void AddColumnBackground(Drawable background) => columnBackgroundContainer.Add(background);
+        private class ColumnBackground : CompositeDrawable
+        {
+            private readonly int columnIndex;
+            private readonly bool isLastColumn;
+
+            public ColumnBackground(int columnIndex, bool isLastColumn)
+            {
+                this.columnIndex = columnIndex;
+                this.isLastColumn = isLastColumn;
+
+                RelativeSizeAxes = Axes.Both;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(ISkinSource skin)
+            {
+                float leftLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.LeftLineWidth, columnIndex)?.Value ?? 1;
+                float rightLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.RightLineWidth, columnIndex)?.Value ?? 1;
+
+                bool hasLeftLine = leftLineWidth > 0;
+                bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
+                                    || isLastColumn;
+
+                Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnLineColour, columnIndex)?.Value ?? Color4.White;
+                Color4 backgroundColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, columnIndex)?.Value ?? Color4.Black;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Child = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = backgroundColour
+                        },
+                    },
+                    new HitTargetInsetContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Y,
+                                Width = leftLineWidth,
+                                Scale = new Vector2(0.740f, 1),
+                                Colour = lineColour,
+                                Alpha = hasLeftLine ? 1 : 0
+                            },
+                            new Box
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                RelativeSizeAxes = Axes.Y,
+                                Width = rightLineWidth,
+                                Scale = new Vector2(0.740f, 1),
+                                Colour = lineColour,
+                                Alpha = hasRightLine ? 1 : 0
+                            },
+                        }
+                    }
+                };
+            }
+        }
+
+        private class HitTargetInsetContainer : Container
+        {
+            private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+            protected override Container<Drawable> Content => content;
+            private readonly Container content;
+
+            private float hitPosition;
+
+            public HitTargetInsetContainer()
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                InternalChild = content = new Container { RelativeSizeAxes = Axes.Both };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+            {
+                hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition)?.Value ?? Stage.HIT_TARGET_POSITION;
+
+                direction.BindTo(scrollingInfo.Direction);
+                direction.BindValueChanged(onDirectionChanged, true);
+            }
+
+            private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+            {
+                content.Padding = direction.NewValue == ScrollingDirection.Up
+                    ? new MarginPadding { Top = hitPosition }
+                    : new MarginPadding { Bottom = hitPosition };
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index d928f1080f..439e6f7df2 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -9,6 +9,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
 using System.Collections.Generic;
+using System.Diagnostics;
 using osu.Framework.Audio.Sample;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Legacy;
@@ -57,8 +58,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// </summary>
         private Lazy<bool> hasKeyTexture;
 
-        private LegacyStageBackground stageBackground;
-
         public ManiaLegacySkinTransformer(ISkinSource source, IBeatmap beatmap)
             : base(source)
         {
@@ -90,10 +89,11 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     switch (maniaComponent.Component)
                     {
                         case ManiaSkinComponents.ColumnBackground:
-                            return new LegacyColumnBackground(maniaComponent.TargetColumn == beatmap.TotalColumns - 1, stageBackground);
+                            return new LegacyColumnBackground();
 
                         case ManiaSkinComponents.HitTarget:
-                            // Created within the column background, but should not fall back. See comments in LegacyColumnBackground.
+                            // Legacy skins sandwich the hit target between the column background and the column light.
+                            // To preserve this ordering, it's created manually inside LegacyStageBackground.
                             return Drawable.Empty();
 
                         case ManiaSkinComponents.KeyArea:
@@ -115,7 +115,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
                             return new LegacyHitExplosion();
 
                         case ManiaSkinComponents.StageBackground:
-                            return stageBackground = new LegacyStageBackground();
+                            Debug.Assert(maniaComponent.StageDefinition != null);
+                            return new LegacyStageBackground(maniaComponent.StageDefinition.Value);
 
                         case ManiaSkinComponents.StageForeground:
                             return new LegacyStageForeground();
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 255ce4c064..de4648e4fa 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -68,8 +68,6 @@ namespace osu.Game.Rulesets.Mania.UI
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
         }
 
-        public override Axes RelativeSizeAxes => Axes.Y;
-
         public ColumnType ColumnType { get; set; }
 
         public bool IsSpecial => ColumnType == ColumnType.Special;
diff --git a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
new file mode 100644
index 0000000000..37ad5c609b
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
@@ -0,0 +1,105 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Skinning;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    /// <summary>
+    /// A <see cref="Drawable"/> which flows its contents according to the <see cref="Column"/>s in a <see cref="Stage"/>.
+    /// Content can be added to individual columns via <see cref="SetColumn"/>.
+    /// </summary>
+    /// <typeparam name="TContent">The type of content in each column.</typeparam>
+    public class ColumnFlow<TContent> : CompositeDrawable
+        where TContent : Drawable
+    {
+        /// <summary>
+        /// All contents added to this <see cref="ColumnFlow{TContent}"/>.
+        /// </summary>
+        public IReadOnlyList<TContent> Content => columns.Children.Select(c => c.Count == 0 ? null : (TContent)c.Child).ToList();
+
+        private readonly FillFlowContainer<Container> columns;
+        private readonly StageDefinition stageDefinition;
+
+        public ColumnFlow(StageDefinition stageDefinition)
+        {
+            this.stageDefinition = stageDefinition;
+
+            AutoSizeAxes = Axes.X;
+
+            InternalChild = columns = new FillFlowContainer<Container>
+            {
+                RelativeSizeAxes = Axes.Y,
+                AutoSizeAxes = Axes.X,
+                Direction = FillDirection.Horizontal,
+            };
+
+            for (int i = 0; i < stageDefinition.Columns; i++)
+                columns.Add(new Container { RelativeSizeAxes = Axes.Y });
+        }
+
+        private ISkinSource currentSkin;
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            currentSkin = skin;
+
+            skin.SourceChanged += onSkinChanged;
+            onSkinChanged();
+        }
+
+        private void onSkinChanged()
+        {
+            for (int i = 0; i < stageDefinition.Columns; i++)
+            {
+                if (i > 0)
+                {
+                    float spacing = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnSpacing, i - 1))
+                                               ?.Value ?? Stage.COLUMN_SPACING;
+
+                    columns[i].Margin = new MarginPadding { Left = spacing };
+                }
+
+                float? width = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                              new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, i))
+                                          ?.Value;
+
+                if (width == null)
+                    // only used by default skin (legacy skins get defaults set in LegacyManiaSkinConfiguration)
+                    columns[i].Width = stageDefinition.IsSpecialColumn(i) ? Column.SPECIAL_COLUMN_WIDTH : Column.COLUMN_WIDTH;
+                else
+                    columns[i].Width = width.Value;
+            }
+        }
+
+        /// <summary>
+        /// Sets the content of one of the columns of this <see cref="ColumnFlow{TContent}"/>.
+        /// </summary>
+        /// <param name="column">The index of the column to set the content of.</param>
+        /// <param name="content">The content.</param>
+        public void SetColumn(int column, TContent content) => columns[column].Child = content;
+
+        public new MarginPadding Padding
+        {
+            get => base.Padding;
+            set => base.Padding = value;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (currentSkin != null)
+                currentSkin.SourceChanged -= onSkinChanged;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 36780b0f80..5944c8c218 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
@@ -11,7 +10,6 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -31,8 +29,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public const float HIT_TARGET_POSITION = 110;
 
-        public IReadOnlyList<Column> Columns => columnFlow.Children;
-        private readonly FillFlowContainer<Column> columnFlow;
+        public IReadOnlyList<Column> Columns => columnFlow.Content;
+        private readonly ColumnFlow<Column> columnFlow;
 
         private readonly JudgementContainer<DrawableManiaJudgement> judgements;
         private readonly DrawablePool<DrawableManiaJudgement> judgementPool;
@@ -73,16 +71,13 @@ namespace osu.Game.Rulesets.Mania.UI
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground), _ => new DefaultStageBackground())
+                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground, stageDefinition: definition), _ => new DefaultStageBackground())
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        columnFlow = new FillFlowContainer<Column>
+                        columnFlow = new ColumnFlow<Column>(definition)
                         {
-                            Name = "Columns",
                             RelativeSizeAxes = Axes.Y,
-                            AutoSizeAxes = Axes.X,
-                            Direction = FillDirection.Horizontal,
                             Padding = new MarginPadding { Left = COLUMN_SPACING, Right = COLUMN_SPACING },
                         },
                         new Container
@@ -102,7 +97,7 @@ namespace osu.Game.Rulesets.Mania.UI
                                 RelativeSizeAxes = Axes.Y,
                             }
                         },
-                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground), _ => null)
+                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground, stageDefinition: definition), _ => null)
                         {
                             RelativeSizeAxes = Axes.Both
                         },
@@ -123,6 +118,8 @@ namespace osu.Game.Rulesets.Mania.UI
                 var columnType = definition.GetTypeOfColumn(i);
                 var column = new Column(firstColumnIndex + i)
                 {
+                    RelativeSizeAxes = Axes.Both,
+                    Width = 1,
                     ColumnType = columnType,
                     AccentColour = columnColours[columnType],
                     Action = { Value = columnType == ColumnType.Special ? specialColumnStartAction++ : normalColumnStartAction++ }
@@ -132,46 +129,10 @@ namespace osu.Game.Rulesets.Mania.UI
             }
         }
 
-        private ISkin currentSkin;
-
-        [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
-        {
-            currentSkin = skin;
-            skin.SourceChanged += onSkinChanged;
-
-            onSkinChanged();
-        }
-
-        private void onSkinChanged()
-        {
-            foreach (var col in columnFlow)
-            {
-                if (col.Index > 0)
-                {
-                    float spacing = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnSpacing, col.Index - 1))
-                                               ?.Value ?? COLUMN_SPACING;
-
-                    col.Margin = new MarginPadding { Left = spacing };
-                }
-
-                float? width = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                              new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, col.Index))
-                                          ?.Value;
-
-                if (width == null)
-                    // only used by default skin (legacy skins get defaults set in LegacyManiaSkinConfiguration)
-                    col.Width = col.IsSpecial ? Column.SPECIAL_COLUMN_WIDTH : Column.COLUMN_WIDTH;
-                else
-                    col.Width = width.Value;
-            }
-        }
-
         public void AddColumn(Column c)
         {
             topLevelContainer.Add(c.TopLevelContainer.CreateProxy());
-            columnFlow.Add(c);
+            columnFlow.SetColumn(c.Index, c);
             AddNested(c);
         }
 

From 50d5b020b7c579a7bea931d58267e793a90ce412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 24 Aug 2020 20:19:33 +0200
Subject: [PATCH 04375/10326] Add failing test case

---
 .../TestSceneBeatmapSetOverlaySuccessRate.cs     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
index 4cb22bf1fe..954eb74ad9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
@@ -7,8 +7,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Screens.Select.Details;
@@ -72,6 +74,20 @@ namespace osu.Game.Tests.Visual.Online
             };
         }
 
+        [Test]
+        public void TestOnlyFailMetrics()
+        {
+            AddStep("set beatmap", () => successRate.Beatmap = new BeatmapInfo
+            {
+                Metrics = new BeatmapMetrics
+                {
+                    Fails = Enumerable.Range(1, 100).ToArray(),
+                }
+            });
+            AddAssert("graph max values correct",
+                () => successRate.ChildrenOfType<BarGraph>().All(graph => graph.MaxValue == 100));
+        }
+
         private class GraphExposingSuccessRate : SuccessRate
         {
             public new FailRetryGraph Graph => base.Graph;

From cc6ae8e3bd2a4ff21dee50dc7cd72f1663f32428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 24 Aug 2020 20:41:31 +0200
Subject: [PATCH 04376/10326] Fix crash if only one count list is received from
 API

---
 .../Screens/Select/Details/FailRetryGraph.cs  | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/FailRetryGraph.cs b/osu.Game/Screens/Select/Details/FailRetryGraph.cs
index 134fd0598a..7cc80acfd3 100644
--- a/osu.Game/Screens/Select/Details/FailRetryGraph.cs
+++ b/osu.Game/Screens/Select/Details/FailRetryGraph.cs
@@ -29,16 +29,30 @@ namespace osu.Game.Screens.Select.Details
 
                 var retries = Metrics?.Retries ?? Array.Empty<int>();
                 var fails = Metrics?.Fails ?? Array.Empty<int>();
+                var retriesAndFails = sumRetriesAndFails(retries, fails);
 
-                float maxValue = fails.Any() ? fails.Zip(retries, (fail, retry) => fail + retry).Max() : 0;
+                float maxValue = retriesAndFails.Any() ? retriesAndFails.Max() : 0;
                 failGraph.MaxValue = maxValue;
                 retryGraph.MaxValue = maxValue;
 
-                failGraph.Values = fails.Select(f => (float)f);
-                retryGraph.Values = retries.Zip(fails, (retry, fail) => retry + Math.Clamp(fail, 0, maxValue));
+                failGraph.Values = fails.Select(v => (float)v);
+                retryGraph.Values = retriesAndFails.Select(v => (float)v);
             }
         }
 
+        private int[] sumRetriesAndFails(int[] retries, int[] fails)
+        {
+            var result = new int[Math.Max(retries.Length, fails.Length)];
+
+            for (int i = 0; i < retries.Length; ++i)
+                result[i] = retries[i];
+
+            for (int i = 0; i < fails.Length; ++i)
+                result[i] += fails[i];
+
+            return result;
+        }
+
         public FailRetryGraph()
         {
             Children = new[]

From 29b4d98aaccdbd2b4440289a04cb8247492a2092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 24 Aug 2020 20:41:50 +0200
Subject: [PATCH 04377/10326] Show retry/fail graph when either list is present

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

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 9669a1391c..0ee52f3e48 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -236,7 +236,7 @@ namespace osu.Game.Screens.Select
         private void updateMetrics()
         {
             var hasRatings = beatmap?.BeatmapSet?.Metrics?.Ratings?.Any() ?? false;
-            var hasRetriesFails = (beatmap?.Metrics?.Retries?.Any() ?? false) && (beatmap?.Metrics.Fails?.Any() ?? false);
+            var hasRetriesFails = (beatmap?.Metrics?.Retries?.Any() ?? false) || (beatmap?.Metrics?.Fails?.Any() ?? false);
 
             if (hasRatings)
             {

From dbf90551d65dda6b3bb8e03ad67bd75a124cd07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 24 Aug 2020 20:47:29 +0200
Subject: [PATCH 04378/10326] Add coverage for empty metrics case

---
 .../Online/TestSceneBeatmapSetOverlaySuccessRate.cs  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
index 954eb74ad9..fd5c188b94 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
@@ -88,6 +88,18 @@ namespace osu.Game.Tests.Visual.Online
                 () => successRate.ChildrenOfType<BarGraph>().All(graph => graph.MaxValue == 100));
         }
 
+        [Test]
+        public void TestEmptyMetrics()
+        {
+            AddStep("set beatmap", () => successRate.Beatmap = new BeatmapInfo
+            {
+                Metrics = new BeatmapMetrics()
+            });
+
+            AddAssert("graph max values correct",
+                () => successRate.ChildrenOfType<BarGraph>().All(graph => graph.MaxValue == 0));
+        }
+
         private class GraphExposingSuccessRate : SuccessRate
         {
             public new FailRetryGraph Graph => base.Graph;

From 723e5cafb6d1610c1857e7036a10d514db1c47eb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Aug 2020 14:49:04 +0900
Subject: [PATCH 04379/10326] Fix column potentially added at wrong indices

---
 osu.Game.Rulesets.Mania/UI/Stage.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 5944c8c218..dfb1ee210d 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Rulesets.Mania.UI
         private readonly DrawablePool<DrawableManiaJudgement> judgementPool;
 
         private readonly Drawable barLineContainer;
-        private readonly Container topLevelContainer;
 
         private readonly Dictionary<ColumnType, Color4> columnColours = new Dictionary<ColumnType, Color4>
         {
@@ -60,6 +59,8 @@ namespace osu.Game.Rulesets.Mania.UI
             RelativeSizeAxes = Axes.Y;
             AutoSizeAxes = Axes.X;
 
+            Container topLevelContainer;
+
             InternalChildren = new Drawable[]
             {
                 judgementPool = new DrawablePool<DrawableManiaJudgement>(2),
@@ -116,6 +117,7 @@ namespace osu.Game.Rulesets.Mania.UI
             for (int i = 0; i < definition.Columns; i++)
             {
                 var columnType = definition.GetTypeOfColumn(i);
+
                 var column = new Column(firstColumnIndex + i)
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -125,17 +127,12 @@ namespace osu.Game.Rulesets.Mania.UI
                     Action = { Value = columnType == ColumnType.Special ? specialColumnStartAction++ : normalColumnStartAction++ }
                 };
 
-                AddColumn(column);
+                topLevelContainer.Add(column.TopLevelContainer.CreateProxy());
+                columnFlow.SetColumn(i, column);
+                AddNested(column);
             }
         }
 
-        public void AddColumn(Column c)
-        {
-            topLevelContainer.Add(c.TopLevelContainer.CreateProxy());
-            columnFlow.SetColumn(c.Index, c);
-            AddNested(c);
-        }
-
         public override void Add(DrawableHitObject h)
         {
             var maniaObject = (ManiaHitObject)h.HitObject;

From 7e9567dae978a1030807a33f97d8355c64719ba1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Aug 2020 14:49:29 +0900
Subject: [PATCH 04380/10326] Fix tests

---
 .../Skinning/TestSceneStageBackground.cs                      | 4 +++-
 .../Skinning/TestSceneStageForeground.cs                      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
index 87c84cf89c..a15fb392d6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Skinning;
 
@@ -13,7 +14,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground), _ => new DefaultStageBackground())
+            SetContents(() => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground, stageDefinition: new StageDefinition { Columns = 4 }),
+                _ => new DefaultStageBackground())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
index 4e99068ed5..bceee1c599 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Tests.Skinning
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground), _ => null)
+            SetContents(() => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground, stageDefinition: new StageDefinition { Columns = 4 }), _ => null)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

From ab8d9be095e4925d67cb1c06be49a2e92f24195f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Aug 2020 15:16:41 +0900
Subject: [PATCH 04381/10326] Move out into a separate method

---
 .../Skinning/CatchLegacySkinTransformer.cs    |  2 +-
 .../Skinning/LegacyFruitPiece.cs              |  2 +-
 .../Skinning/LegacyColumnBackground.cs        | 17 +++++--
 .../Skinning/LegacyHitTarget.cs               |  2 +-
 .../Skinning/LegacyMainCirclePiece.cs         |  2 +-
 .../Skinning/LegacySliderBall.cs              |  4 +-
 .../Skinning/LegacyCirclePiece.cs             |  2 +-
 .../Skinning/LegacyDrumRoll.cs                |  6 +--
 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs |  7 +--
 .../Skinning/LegacyColourCompatibility.cs     | 46 +++++++++++++++++++
 osu.Game/Skinning/LegacySkinExtensions.cs     | 31 -------------
 11 files changed, 73 insertions(+), 48 deletions(-)
 create mode 100644 osu.Game/Skinning/LegacyColourCompatibility.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 5abd87d6f4..ea2f031d65 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
                     if (result == null)
                         return null;
 
-                    result.Value = result.Value.ToLegacyColour();
+                    result.Value = LegacyColourCompatibility.DisallowZeroAlpha(result.Value);
                     return (IBindable<TValue>)result;
             }
 
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index c9dd1d1f3e..381d066750 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
         {
             base.LoadComplete();
 
-            accentColour.BindValueChanged(colour => colouredSprite.Colour = colour.NewValue.ToLegacyColour(), true);
+            accentColour.BindValueChanged(colour => colouredSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue), true);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 54a16b840f..da6075248a 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -58,14 +58,20 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             InternalChildren = new Drawable[]
             {
-                new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(backgroundColour),
+                LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                }, backgroundColour),
                 new Container
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = leftLineWidth,
                     Scale = new Vector2(0.740f, 1),
                     Alpha = hasLeftLine ? 1 : 0,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(lineColour)
+                    Child = LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    }, lineColour)
                 },
                 new Container
                 {
@@ -75,7 +81,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     Width = rightLineWidth,
                     Scale = new Vector2(0.740f, 1),
                     Alpha = hasRightLine ? 1 : 0,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(lineColour)
+                    Child = LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    }, lineColour)
                 },
                 lightContainer = new Container
                 {
@@ -86,7 +95,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     {
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
-                        Colour = lightColour.ToLegacyColour(),
+                        Colour = LegacyColourCompatibility.DisallowZeroAlpha(lightColour),
                         Texture = skin.GetTexture(lightImage),
                         RelativeSizeAxes = Axes.X,
                         Width = 1,
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index 2177eaa5e6..48504e6548 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                         Anchor = Anchor.CentreLeft,
                         RelativeSizeAxes = Axes.X,
                         Height = 1,
-                        Colour = lineColour.ToLegacyColour(),
+                        Colour = LegacyColourCompatibility.DisallowZeroAlpha(lineColour),
                         Alpha = showJudgementLine ? 0.9f : 0
                     }
                 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 8a6beddb51..d15a0a3203 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             base.LoadComplete();
 
             state.BindValueChanged(updateState, true);
-            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue.ToLegacyColour(), true);
+            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue), true);
             indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
index 27dec1b691..25ab96445a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
@@ -39,11 +39,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Texture = skin.GetTexture("sliderb-nd"),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                animationContent.WithLegacyColour(ballColour).With(d =>
+                LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
                 {
                     d.Anchor = Anchor.Centre;
                     d.Origin = Anchor.Centre;
-                }),
+                }), ballColour),
                 layerSpec = new Sprite
                 {
                     Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
index ed69b529ed..9b73ccd248 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            backgroundLayer.Colour = accentColour.ToLegacyColour();
+            backgroundLayer.Colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
index 6bb8f9433e..025eff53d5 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
@@ -76,9 +76,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            headCircle.AccentColour = accentColour.ToLegacyColour();
-            body.Colour = accentColour.ToLegacyColour();
-            end.Colour = accentColour.ToLegacyColour();
+            headCircle.AccentColour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
+            body.Colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
+            end.Colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
index f36aae205a..b11b64c22c 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
@@ -19,9 +19,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            AccentColour = (component == TaikoSkinComponents.CentreHit
-                ? new Color4(235, 69, 44, 255)
-                : new Color4(67, 142, 172, 255)).ToLegacyColour();
+            AccentColour = LegacyColourCompatibility.DisallowZeroAlpha(
+                component == TaikoSkinComponents.CentreHit
+                    ? new Color4(235, 69, 44, 255)
+                    : new Color4(67, 142, 172, 255));
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacyColourCompatibility.cs b/osu.Game/Skinning/LegacyColourCompatibility.cs
new file mode 100644
index 0000000000..b842b50426
--- /dev/null
+++ b/osu.Game/Skinning/LegacyColourCompatibility.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.Graphics;
+using osuTK.Graphics;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// Compatibility methods to convert osu!stable colours to osu!lazer-compatible ones. Should be used for legacy skins only.
+    /// </summary>
+    public static class LegacyColourCompatibility
+    {
+        /// <summary>
+        /// Forces an alpha of 1 if a given <see cref="Color4"/> is fully transparent.
+        /// </summary>
+        /// <remarks>
+        /// This is equivalent to setting colour post-constructor in osu!stable.
+        /// </remarks>
+        /// <param name="colour">The <see cref="Color4"/> to disallow zero alpha on.</param>
+        /// <returns>The resultant <see cref="Color4"/>.</returns>
+        public static Color4 DisallowZeroAlpha(Color4 colour)
+        {
+            if (colour.A == 0)
+                colour.A = 1;
+            return colour;
+        }
+
+        /// <summary>
+        /// Applies a <see cref="Color4"/> to a <see cref="Drawable"/>, doubling the alpha value into the <see cref="Drawable.Alpha"/> property.
+        /// </summary>
+        /// <remarks>
+        /// This is equivalent to setting colour in the constructor in osu!stable.
+        /// </remarks>
+        /// <param name="drawable">The <see cref="Drawable"/> to apply the colour to.</param>
+        /// <param name="colour">The <see cref="Color4"/> to apply.</param>
+        /// <returns>The given <paramref name="drawable"/>.</returns>
+        public static T ApplyWithDoubledAlpha<T>(T drawable, Color4 colour)
+            where T : Drawable
+        {
+            drawable.Alpha = colour.A;
+            drawable.Colour = DisallowZeroAlpha(colour);
+            return drawable;
+        }
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 7420f82f04..bb46dc8b9f 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osuTK.Graphics;
 using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Skinning
@@ -63,36 +62,6 @@ namespace osu.Game.Skinning
             }
         }
 
-        /// <summary>
-        /// The resultant colour after setting a post-constructor colour in osu!stable.
-        /// </summary>
-        /// <param name="colour">The <see cref="Color4"/> to convert.</param>
-        /// <returns>The converted <see cref="Color4"/>.</returns>
-        public static Color4 ToLegacyColour(this Color4 colour)
-        {
-            if (colour.A == 0)
-                colour.A = 1;
-            return colour;
-        }
-
-        /// <summary>
-        /// Equivalent of setting a colour in the constructor in osu!stable.
-        /// Doubles the alpha channel into <see cref="Drawable.Alpha"/> and uses <see cref="ToLegacyColour"/> to set <see cref="Drawable.Colour"/>.
-        /// </summary>
-        /// <remarks>
-        /// Beware: Any existing value in <see cref="Drawable.Alpha"/> is overwritten.
-        /// </remarks>
-        /// <param name="drawable">The <see cref="Drawable"/> to set the colour of.</param>
-        /// <param name="colour">The <see cref="Color4"/> to set.</param>
-        /// <returns>The given <see cref="Drawable"/>.</returns>
-        public static T WithLegacyColour<T>(this T drawable, Color4 colour)
-            where T : Drawable
-        {
-            drawable.Alpha = colour.A;
-            drawable.Colour = ToLegacyColour(colour);
-            return drawable;
-        }
-
         public class SkinnableTextureAnimation : TextureAnimation
         {
             [Resolved(canBeNull: true)]

From 7a70d063428890ee92e843001b31c08433ebe3fc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Aug 2020 15:35:37 +0900
Subject: [PATCH 04382/10326] Add support for custom LightingN paths

---
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs | 1 +
 osu.Game/Skinning/LegacySkin.cs             | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index aebc229f7c..1e6102eaa4 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -116,6 +116,7 @@ namespace osu.Game.Skinning
                     case string _ when pair.Key.StartsWith("KeyImage"):
                     case string _ when pair.Key.StartsWith("Hit"):
                     case string _ when pair.Key.StartsWith("Stage"):
+                    case string _ when pair.Key.StartsWith("Lighting"):
                         currentConfig.ImageLookups[pair.Key] = pair.Value;
                         break;
                 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 02d07eee45..10fb476728 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -173,6 +173,9 @@ namespace osu.Game.Skinning
                 case LegacyManiaSkinConfigurationLookups.ShowJudgementLine:
                     return SkinUtils.As<TValue>(new Bindable<bool>(existing.ShowJudgementLine));
 
+                case LegacyManiaSkinConfigurationLookups.ExplosionImage:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "LightingN"));
+
                 case LegacyManiaSkinConfigurationLookups.ExplosionScale:
                     Debug.Assert(maniaLookup.TargetColumn != null);
 

From ff72ccabd8c15a98e597eb7464d6f5833cc122fd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Aug 2020 18:44:32 +0900
Subject: [PATCH 04383/10326] Rename method

---
 osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs | 2 +-
 osu.Game.Rulesets.Mania/UI/ColumnFlow.cs                  | 4 ++--
 osu.Game.Rulesets.Mania/UI/Stage.cs                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
index 675c154b82..19ec86b1ed 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             };
 
             for (int i = 0; i < stageDefinition.Columns; i++)
-                columnBackgrounds.SetColumn(i, new ColumnBackground(i, i == stageDefinition.Columns - 1));
+                columnBackgrounds.SetContentForColumn(i, new ColumnBackground(i, i == stageDefinition.Columns - 1));
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
index 37ad5c609b..aef82d4c08 100644
--- a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
+++ b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.UI
 {
     /// <summary>
     /// A <see cref="Drawable"/> which flows its contents according to the <see cref="Column"/>s in a <see cref="Stage"/>.
-    /// Content can be added to individual columns via <see cref="SetColumn"/>.
+    /// Content can be added to individual columns via <see cref="SetContentForColumn"/>.
     /// </summary>
     /// <typeparam name="TContent">The type of content in each column.</typeparam>
     public class ColumnFlow<TContent> : CompositeDrawable
@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Mania.UI
         /// </summary>
         /// <param name="column">The index of the column to set the content of.</param>
         /// <param name="content">The content.</param>
-        public void SetColumn(int column, TContent content) => columns[column].Child = content;
+        public void SetContentForColumn(int column, TContent content) => columns[column].Child = content;
 
         public new MarginPadding Padding
         {
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index dfb1ee210d..f4b00ec476 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 };
 
                 topLevelContainer.Add(column.TopLevelContainer.CreateProxy());
-                columnFlow.SetColumn(i, column);
+                columnFlow.SetContentForColumn(i, column);
                 AddNested(column);
             }
         }

From 6c7475f085f1a06b238226d71f27e528b222fbf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Aug 2020 18:56:15 +0900
Subject: [PATCH 04384/10326] Fix snapped distances potentially exceeding the
 source distance

This results in slider placement including "excess" length, where the
curve is not applied to the placed path. This is generally not what we
want.

I considered adding a bool parameter (or enum) to change the
floor/rounding mode, but on further examination I think this is what we
always expect from this function.
---
 .../TestSceneHitObjectComposerDistanceSnapping.cs  | 14 +++++++-------
 osu.Game/Rulesets/Edit/HitObjectComposer.cs        |  8 +++++++-
 osu.Game/Rulesets/Edit/IPositionSnapProvider.cs    |  1 +
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index 168ec0f09d..bd34eaff63 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -169,17 +169,17 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void GetSnappedDistanceFromDistance()
         {
-            assertSnappedDistance(50, 100);
+            assertSnappedDistance(50, 0);
             assertSnappedDistance(100, 100);
-            assertSnappedDistance(150, 200);
+            assertSnappedDistance(150, 100);
             assertSnappedDistance(200, 200);
-            assertSnappedDistance(250, 300);
+            assertSnappedDistance(250, 200);
 
             AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier = 2);
 
             assertSnappedDistance(50, 0);
-            assertSnappedDistance(100, 200);
-            assertSnappedDistance(150, 200);
+            assertSnappedDistance(100, 0);
+            assertSnappedDistance(150, 0);
             assertSnappedDistance(200, 200);
             assertSnappedDistance(250, 200);
 
@@ -190,8 +190,8 @@ namespace osu.Game.Tests.Editing
             });
 
             assertSnappedDistance(50, 0);
-            assertSnappedDistance(100, 200);
-            assertSnappedDistance(150, 200);
+            assertSnappedDistance(100, 0);
+            assertSnappedDistance(150, 0);
             assertSnappedDistance(200, 200);
             assertSnappedDistance(250, 200);
             assertSnappedDistance(400, 400);
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index c25fb03fd0..d0b06ce0ad 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -293,7 +293,13 @@ namespace osu.Game.Rulesets.Edit
 
         public override float GetSnappedDistanceFromDistance(double referenceTime, float distance)
         {
-            var snappedEndTime = BeatSnapProvider.SnapTime(referenceTime + DistanceToDuration(referenceTime, distance), referenceTime);
+            double actualDuration = referenceTime + DistanceToDuration(referenceTime, distance);
+
+            double snappedEndTime = BeatSnapProvider.SnapTime(actualDuration, referenceTime);
+
+            // we don't want to exceed the actual duration and snap to a point in the future.
+            if (snappedEndTime > actualDuration)
+                snappedEndTime -= BeatSnapProvider.GetBeatLengthAtTime(referenceTime);
 
             return DurationToDistance(referenceTime, snappedEndTime - referenceTime);
         }
diff --git a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
index c854c06031..cce631464f 100644
--- a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
@@ -47,6 +47,7 @@ namespace osu.Game.Rulesets.Edit
 
         /// <summary>
         /// Converts an unsnapped distance to a snapped distance.
+        /// The returned distance will always be floored (as to never exceed the provided <paramref name="distance"/>.
         /// </summary>
         /// <param name="referenceTime">The time of the timing point which <paramref name="distance"/> resides in.</param>
         /// <param name="distance">The distance to convert.</param>

From c09cef4fca2d5264d96958cc388534012aa7ede0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Aug 2020 19:39:03 +0900
Subject: [PATCH 04385/10326] Apply post-merge fixes to LegacyStageBackground

---
 .../Skinning/LegacyStageBackground.cs         | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
index 19ec86b1ed..16a6123724 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
@@ -108,37 +108,38 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
                 InternalChildren = new Drawable[]
                 {
-                    new Container
+                    LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        Child = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = backgroundColour
-                        },
-                    },
+                        RelativeSizeAxes = Axes.Both
+                    }, backgroundColour),
                     new HitTargetInsetContainer
                     {
                         RelativeSizeAxes = Axes.Both,
                         Children = new[]
                         {
-                            new Box
+                            new Container
                             {
                                 RelativeSizeAxes = Axes.Y,
                                 Width = leftLineWidth,
                                 Scale = new Vector2(0.740f, 1),
-                                Colour = lineColour,
-                                Alpha = hasLeftLine ? 1 : 0
+                                Alpha = hasLeftLine ? 1 : 0,
+                                Child = LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both
+                                }, lineColour)
                             },
-                            new Box
+                            new Container
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Y,
                                 Width = rightLineWidth,
                                 Scale = new Vector2(0.740f, 1),
-                                Colour = lineColour,
-                                Alpha = hasRightLine ? 1 : 0
+                                Alpha = hasRightLine ? 1 : 0,
+                                Child = LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both
+                                }, lineColour)
                             },
                         }
                     }

From 0800e4379689e8ac301ea8906f4a0e9ce7e518ce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Aug 2020 19:57:49 +0900
Subject: [PATCH 04386/10326] Remove padding from columns

---
 osu.Game.Rulesets.Mania/UI/Stage.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index f4b00ec476..e7a2de266d 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -79,7 +79,6 @@ namespace osu.Game.Rulesets.Mania.UI
                         columnFlow = new ColumnFlow<Column>(definition)
                         {
                             RelativeSizeAxes = Axes.Y,
-                            Padding = new MarginPadding { Left = COLUMN_SPACING, Right = COLUMN_SPACING },
                         },
                         new Container
                         {

From 127330b8f9bb7ff7a9d03ad3db5044c002404f37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Aug 2020 20:57:31 +0900
Subject: [PATCH 04387/10326] Add 1ms lenience to avoid potential precision
 issues

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index d0b06ce0ad..f134db1ffe 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -25,7 +25,7 @@ using osu.Game.Screens.Edit.Components.RadioButtons;
 using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
-using Key = osuTK.Input.Key;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Edit
 {
@@ -297,9 +297,12 @@ namespace osu.Game.Rulesets.Edit
 
             double snappedEndTime = BeatSnapProvider.SnapTime(actualDuration, referenceTime);
 
+            double beatLength = BeatSnapProvider.GetBeatLengthAtTime(referenceTime);
+
             // we don't want to exceed the actual duration and snap to a point in the future.
-            if (snappedEndTime > actualDuration)
-                snappedEndTime -= BeatSnapProvider.GetBeatLengthAtTime(referenceTime);
+            // as we are snapping to beat length via SnapTime (which will round-to-nearest), check for snapping in the forward direction and reverse it.
+            if (snappedEndTime > actualDuration + 1)
+                snappedEndTime -= beatLength;
 
             return DurationToDistance(referenceTime, snappedEndTime - referenceTime);
         }

From f09f882cc77f9264ad1292bc7df4c55ca3b548b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 25 Aug 2020 22:43:23 +0200
Subject: [PATCH 04388/10326] Add component for displaying simple statistics on
 result screen

---
 .../Ranking/TestSceneSimpleStatisticRow.cs    |  68 ++++++++++
 .../Ranking/Statistics/SimpleStatisticItem.cs |  80 ++++++++++++
 .../Ranking/Statistics/SimpleStatisticRow.cs  | 122 ++++++++++++++++++
 3 files changed, 270 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticRow.cs
 create mode 100644 osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
 create mode 100644 osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticRow.cs b/osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticRow.cs
new file mode 100644
index 0000000000..aa569e47b1
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticRow.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 System.Linq;
+using Humanizer;
+using NUnit.Framework;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
+using osu.Game.Screens.Ranking.Statistics;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestSceneSimpleStatisticRow : OsuTestScene
+    {
+        private Container container;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = new Container
+            {
+                AutoSizeAxes = Axes.Y,
+                Width = 700,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4Extensions.FromHex("#333"),
+                    },
+                    container = new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding(20)
+                    }
+                }
+            };
+        });
+
+        [Test]
+        public void TestEmpty()
+        {
+            AddStep("create with no items",
+                () => container.Add(new SimpleStatisticRow(2, Enumerable.Empty<SimpleStatisticItem>())));
+        }
+
+        [Test]
+        public void TestManyItems(
+            [Values(1, 2, 3, 4, 12)] int itemCount,
+            [Values(1, 3, 5)] int columnCount)
+        {
+            AddStep($"create with {"item".ToQuantity(itemCount)}", () =>
+            {
+                var items = Enumerable.Range(1, itemCount)
+                                      .Select(i => new SimpleStatisticItem<int>($"Statistic #{i}")
+                                      {
+                                          Value = RNG.Next(100)
+                                      });
+
+                container.Add(new SimpleStatisticRow(columnCount, items));
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
new file mode 100644
index 0000000000..e6c4ab1c4e
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
@@ -0,0 +1,80 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    /// <summary>
+    /// Represents a simple statistic item (one that only needs textual display).
+    /// Richer visualisations should be done with <see cref="StatisticItem"/>s.
+    /// </summary>
+    public abstract class SimpleStatisticItem : Container
+    {
+        /// <summary>
+        /// The text to display as the statistic's value.
+        /// </summary>
+        protected string Value
+        {
+            set => this.value.Text = value;
+        }
+
+        private readonly OsuSpriteText value;
+
+        /// <summary>
+        /// Creates a new simple statistic item.
+        /// </summary>
+        /// <param name="name">The name of the statistic.</param>
+        protected SimpleStatisticItem(string name)
+        {
+            Name = name;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            AddRange(new[]
+            {
+                new OsuSpriteText
+                {
+                    Text = Name,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft
+                },
+                value = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Font = OsuFont.Torus.With(weight: FontWeight.Bold)
+                }
+            });
+        }
+    }
+
+    /// <summary>
+    /// Strongly-typed generic specialisation for <see cref="SimpleStatisticItem"/>.
+    /// </summary>
+    public class SimpleStatisticItem<TValue> : SimpleStatisticItem
+    {
+        /// <summary>
+        /// The statistic's value to be displayed.
+        /// </summary>
+        public new TValue Value
+        {
+            set => base.Value = DisplayValue(value);
+        }
+
+        /// <summary>
+        /// Used to convert <see cref="Value"/> to a text representation.
+        /// Defaults to using <see cref="object.ToString"/>.
+        /// </summary>
+        protected virtual string DisplayValue(TValue value) => value.ToString();
+
+        public SimpleStatisticItem(string name)
+            : base(name)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs
new file mode 100644
index 0000000000..16501aae54
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.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 System;
+using System.Collections.Generic;
+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.Shapes;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    /// <summary>
+    /// Represents a statistic row with simple statistics (ones that only need textual display).
+    /// Richer visualisations should be done with <see cref="StatisticRow"/>s and <see cref="StatisticItem"/>s.
+    /// </summary>
+    public class SimpleStatisticRow : CompositeDrawable
+    {
+        private readonly SimpleStatisticItem[] items;
+        private readonly int columnCount;
+
+        private FillFlowContainer[] columns;
+
+        /// <summary>
+        /// Creates a statistic row for the supplied <see cref="SimpleStatisticItem"/>s.
+        /// </summary>
+        /// <param name="columnCount">The number of columns to layout the <paramref name="items"/> into.</param>
+        /// <param name="items">The <see cref="SimpleStatisticItem"/>s to display in this row.</param>
+        public SimpleStatisticRow(int columnCount, IEnumerable<SimpleStatisticItem> items)
+        {
+            if (columnCount < 1)
+                throw new ArgumentOutOfRangeException(nameof(columnCount));
+
+            this.columnCount = columnCount;
+            this.items = items.ToArray();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            columns = new FillFlowContainer[columnCount];
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                ColumnDimensions = createColumnDimensions().ToArray(),
+                Content = new[] { createColumns().ToArray() }
+            };
+
+            for (int i = 0; i < items.Length; ++i)
+                columns[i % columnCount].Add(items[i]);
+        }
+
+        private IEnumerable<Dimension> createColumnDimensions()
+        {
+            for (int column = 0; column < columnCount; ++column)
+            {
+                if (column > 0)
+                    yield return new Dimension(GridSizeMode.Absolute, 30);
+
+                yield return new Dimension();
+            }
+        }
+
+        private IEnumerable<Drawable> createColumns()
+        {
+            for (int column = 0; column < columnCount; ++column)
+            {
+                if (column > 0)
+                {
+                    yield return new Spacer
+                    {
+                        Alpha = items.Length > column ? 1 : 0
+                    };
+                }
+
+                yield return columns[column] = createColumn();
+            }
+        }
+
+        private FillFlowContainer createColumn() => new FillFlowContainer
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Direction = FillDirection.Vertical
+        };
+
+        private class Spacer : CompositeDrawable
+        {
+            public Spacer()
+            {
+                RelativeSizeAxes = Axes.Both;
+                Padding = new MarginPadding { Vertical = 4 };
+
+                InternalChild = new CircularContainer
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 3,
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    CornerRadius = 2,
+                    Masking = true,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4Extensions.FromHex("#222")
+                    }
+                };
+            }
+        }
+    }
+}

From 2cf2ba8fc5cb0e1648756774d99e81b1f045c70b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 26 Aug 2020 14:24:04 +0900
Subject: [PATCH 04389/10326] Store computed accent colour to local

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
index 025eff53d5..5ab8e3a8c8 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
@@ -76,9 +76,11 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            headCircle.AccentColour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
-            body.Colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
-            end.Colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
+            var colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
+
+            headCircle.AccentColour = colour;
+            body.Colour = colour;
+            end.Colour = colour;
         }
     }
 }

From d057f5f4bce9297c9dc65d8eafc85cc585f604d6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 26 Aug 2020 15:37:16 +0900
Subject: [PATCH 04390/10326] Implement mania "KeysUnderNotes" skin config

---
 osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs       | 3 +++
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs       | 1 +
 osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs | 1 +
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs             | 4 ++++
 osu.Game/Skinning/LegacySkin.cs                         | 3 +++
 5 files changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
index 44f3e7d7b3..b269ea25d4 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
@@ -65,6 +65,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
+
+            if (GetColumnSkinConfig<bool>(skin, LegacyManiaSkinConfigurationLookups.KeysUnderNotes)?.Value ?? false)
+                Column.UnderlayElements.Add(CreateProxy());
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index af7d6007f3..a5cc899b53 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Skinning
         public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
         public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;
+        public bool KeysUnderNotes;
 
         public LegacyManiaSkinConfiguration(int keys)
         {
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 4990ca8e60..890a0cc4ff 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -50,5 +50,6 @@ namespace osu.Game.Skinning
         Hit100,
         Hit50,
         Hit0,
+        KeysUnderNotes,
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index aebc229f7c..1ea120e8a4 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -97,6 +97,10 @@ namespace osu.Game.Skinning
                         currentConfig.ShowJudgementLine = pair.Value == "1";
                         break;
 
+                    case "KeysUnderNotes":
+                        currentConfig.KeysUnderNotes = pair.Value == "1";
+                        break;
+
                     case "LightingNWidth":
                         parseArrayValue(pair.Value, currentConfig.ExplosionWidth);
                         break;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 02d07eee45..13a43c8aae 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -255,6 +255,9 @@ namespace osu.Game.Skinning
                 case LegacyManiaSkinConfigurationLookups.Hit300:
                 case LegacyManiaSkinConfigurationLookups.Hit300g:
                     return SkinUtils.As<TValue>(getManiaImage(existing, maniaLookup.Lookup.ToString()));
+
+                case LegacyManiaSkinConfigurationLookups.KeysUnderNotes:
+                    return SkinUtils.As<TValue>(new Bindable<bool>(existing.KeysUnderNotes));
             }
 
             return null;

From c50e495e035bad956cf1883f510a41c2eb3e867a Mon Sep 17 00:00:00 2001
From: Poliwrath <Poliwrath@users.noreply.github.com>
Date: Wed, 26 Aug 2020 02:49:55 -0400
Subject: [PATCH 04391/10326] fix lingering small ring in circles! intro

---
 osu.Game/Screens/Menu/IntroSequence.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Menu/IntroSequence.cs b/osu.Game/Screens/Menu/IntroSequence.cs
index 6731fef6f7..98da31b93e 100644
--- a/osu.Game/Screens/Menu/IntroSequence.cs
+++ b/osu.Game/Screens/Menu/IntroSequence.cs
@@ -205,6 +205,7 @@ namespace osu.Game.Screens.Menu
                 const int line_end_offset = 120;
 
                 smallRing.Foreground.ResizeTo(1, line_duration, Easing.OutQuint);
+                smallRing.Delay(400).FadeOut();
 
                 lineTopLeft.MoveTo(new Vector2(-line_end_offset, -line_end_offset), line_duration, Easing.OutQuint);
                 lineTopRight.MoveTo(new Vector2(line_end_offset, -line_end_offset), line_duration, Easing.OutQuint);

From 97637bc747aaba00507f28f1c582e181fa7a7694 Mon Sep 17 00:00:00 2001
From: Poliwrath <Poliwrath@users.noreply.github.com>
Date: Wed, 26 Aug 2020 01:59:53 -0400
Subject: [PATCH 04392/10326] remove new.ppy.sh from MessageFormatter

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

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 6af2561c89..648e4a762b 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Online.Chat
                 case "http":
                 case "https":
                     // length > 3 since all these links need another argument to work
-                    if (args.Length > 3 && (args[1] == "osu.ppy.sh" || args[1] == "new.ppy.sh"))
+                    if (args.Length > 3 && args[1] == "osu.ppy.sh")
                     {
                         switch (args[2])
                         {

From e6116890afbdcf93c7d032844b1670f9172a24ca Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 26 Aug 2020 20:00:38 +0900
Subject: [PATCH 04393/10326] Make hitobject tests display the column

---
 .../Skinning/ColumnTestContainer.cs           | 24 +++++++++++--------
 .../Skinning/ManiaHitObjectTestScene.cs       |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
index ff4865c71d..8ba58e3af3 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
@@ -22,18 +22,22 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached]
         private readonly Column column;
 
-        public ColumnTestContainer(int column, ManiaAction action)
+        public ColumnTestContainer(int column, ManiaAction action, bool showColumn = false)
         {
-            this.column = new Column(column)
+            InternalChildren = new[]
             {
-                Action = { Value = action },
-                AccentColour = Color4.Orange,
-                ColumnType = column % 2 == 0 ? ColumnType.Even : ColumnType.Odd
-            };
-
-            InternalChild = content = new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)
-            {
-                RelativeSizeAxes = Axes.Both
+                this.column = new Column(column)
+                {
+                    Action = { Value = action },
+                    AccentColour = Color4.Orange,
+                    ColumnType = column % 2 == 0 ? ColumnType.Even : ColumnType.Odd,
+                    Alpha = showColumn ? 1 : 0
+                },
+                content = new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                this.column.TopLevelContainer.CreateProxy()
             };
         }
     }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
index 18eebada00..d24c81dac6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                 Direction = FillDirection.Horizontal,
                 Children = new Drawable[]
                 {
-                    new ColumnTestContainer(0, ManiaAction.Key1)
+                    new ColumnTestContainer(0, ManiaAction.Key1, true)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                             }));
                         })
                     },
-                    new ColumnTestContainer(1, ManiaAction.Key2)
+                    new ColumnTestContainer(1, ManiaAction.Key2, true)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,

From c0c67c11b12d0df3b318c763f196f383f91f2f8c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 26 Aug 2020 20:21:41 +0900
Subject: [PATCH 04394/10326] Add parsing for hold note light/scale

---
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs  |  2 ++
 .../Skinning/LegacyManiaSkinConfigurationLookup.cs |  2 ++
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs        |  4 ++++
 osu.Game/Skinning/LegacySkin.cs                    | 14 ++++++++++++++
 4 files changed, 22 insertions(+)

diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index af7d6007f3..18ae6acb38 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Skinning
         public readonly float[] ColumnSpacing;
         public readonly float[] ColumnWidth;
         public readonly float[] ExplosionWidth;
+        public readonly float[] HoldNoteLightWidth;
 
         public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
         public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
@@ -44,6 +45,7 @@ namespace osu.Game.Skinning
             ColumnSpacing = new float[keys - 1];
             ColumnWidth = new float[keys];
             ExplosionWidth = new float[keys];
+            HoldNoteLightWidth = new float[keys];
 
             ColumnLineWidth.AsSpan().Fill(2);
             ColumnWidth.AsSpan().Fill(DEFAULT_COLUMN_SIZE);
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 4990ca8e60..131c3fde34 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Skinning
         HoldNoteHeadImage,
         HoldNoteTailImage,
         HoldNoteBodyImage,
+        HoldNoteLightImage,
+        HoldNoteLightScale,
         ExplosionImage,
         ExplosionScale,
         ColumnLineColour,
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 1e6102eaa4..ca492b5a21 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -101,6 +101,10 @@ namespace osu.Game.Skinning
                         parseArrayValue(pair.Value, currentConfig.ExplosionWidth);
                         break;
 
+                    case "LightingLWidth":
+                        parseArrayValue(pair.Value, currentConfig.HoldNoteLightWidth);
+                        break;
+
                     case "WidthForNoteHeightScale":
                         float minWidth = float.Parse(pair.Value, CultureInfo.InvariantCulture) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         if (minWidth > 0)
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 10fb476728..628169584a 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -220,6 +220,20 @@ namespace osu.Game.Skinning
                     Debug.Assert(maniaLookup.TargetColumn != null);
                     return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}L"));
 
+                case LegacyManiaSkinConfigurationLookups.HoldNoteLightImage:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "LightingL"));
+
+                case LegacyManiaSkinConfigurationLookups.HoldNoteLightScale:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+
+                    if (GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value < 2.5m)
+                        return SkinUtils.As<TValue>(new Bindable<float>(1));
+
+                    if (existing.HoldNoteLightWidth[maniaLookup.TargetColumn.Value] != 0)
+                        return SkinUtils.As<TValue>(new Bindable<float>(existing.HoldNoteLightWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+
                 case LegacyManiaSkinConfigurationLookups.KeyImage:
                     Debug.Assert(maniaLookup.TargetColumn != null);
                     return SkinUtils.As<TValue>(getManiaImage(existing, $"KeyImage{maniaLookup.TargetColumn}"));

From 9372c6eef6e90ff35d5bdd81d332dbded910416b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 26 Aug 2020 20:21:56 +0900
Subject: [PATCH 04395/10326] Implement hold note lighting

---
 .../Objects/Drawables/DrawableHoldNote.cs     |   3 +
 .../Skinning/LegacyBodyPiece.cs               | 124 +++++++++++++++---
 2 files changed, 112 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index a44f8a8886..4f29e0417e 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -159,7 +159,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (Tail.AllJudged)
+            {
                 ApplyResult(r => r.Type = HitResult.Perfect);
+                endHold();
+            }
 
             if (Tail.Result.Type == HitResult.Miss)
                 HasBroken = true;
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index 9f716428c0..d922934532 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.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;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
@@ -19,7 +22,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
         private readonly IBindable<bool> isHitting = new Bindable<bool>();
 
-        private Drawable sprite;
+        private Drawable bodySprite;
+        private Drawable lightContainer;
+        private Drawable light;
 
         public LegacyBodyPiece()
         {
@@ -32,7 +37,33 @@ namespace osu.Game.Rulesets.Mania.Skinning
             string imageName = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage)?.Value
                                ?? $"mania-note{FallbackColumnIndex}L";
 
-            sprite = skin.GetAnimation(imageName, WrapMode.ClampToEdge, WrapMode.ClampToEdge, true, true).With(d =>
+            string lightImage = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteLightImage)?.Value
+                                ?? "lightingL";
+
+            float lightScale = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteLightScale)?.Value
+                               ?? 1;
+
+            // Create a temporary animation to retrieve the number of frames, in an effort to calculate the intended frame length.
+            // This animation is discarded and re-queried with the appropriate frame length afterwards.
+            var tmp = skin.GetAnimation(lightImage, true, false);
+            double frameLength = 0;
+            if (tmp is IFramedAnimation tmpAnimation && tmpAnimation.FrameCount > 0)
+                frameLength = Math.Max(1000 / 60.0, 170.0 / tmpAnimation.FrameCount);
+
+            light = skin.GetAnimation(lightImage, true, true, frameLength: frameLength).With(d =>
+            {
+                if (d == null)
+                    return;
+
+                d.Origin = Anchor.Centre;
+                d.Blending = BlendingParameters.Additive;
+                d.Scale = new Vector2(lightScale);
+            });
+
+            if (light != null)
+                lightContainer = new HitTargetInsetContainer { Child = light };
+
+            bodySprite = skin.GetAnimation(imageName, WrapMode.ClampToEdge, WrapMode.ClampToEdge, true, true).With(d =>
             {
                 if (d == null)
                     return;
@@ -47,8 +78,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 // Todo: Wrap
             });
 
-            if (sprite != null)
-                InternalChild = sprite;
+            if (bodySprite != null)
+                InternalChild = bodySprite;
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
@@ -60,27 +91,90 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         private void onIsHittingChanged(ValueChangedEvent<bool> isHitting)
         {
-            if (!(sprite is TextureAnimation animation))
-                return;
+            if (bodySprite is TextureAnimation bodyAnimation)
+            {
+                bodyAnimation.GotoFrame(0);
+                bodyAnimation.IsPlaying = isHitting.NewValue;
+            }
 
-            animation.GotoFrame(0);
-            animation.IsPlaying = isHitting.NewValue;
+            if (lightContainer != null)
+            {
+                if (isHitting.NewValue)
+                {
+                    Column.TopLevelContainer.Add(lightContainer);
+
+                    // The light must be seeked only after being loaded, otherwise a nullref happens (https://github.com/ppy/osu-framework/issues/3847).
+                    if (light is TextureAnimation lightAnimation)
+                        lightAnimation.GotoFrame(0);
+                }
+                else
+                    Column.TopLevelContainer.Remove(lightContainer);
+            }
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
         {
-            if (sprite == null)
-                return;
-
             if (direction.NewValue == ScrollingDirection.Up)
             {
-                sprite.Origin = Anchor.BottomCentre;
-                sprite.Scale = new Vector2(1, -1);
+                if (bodySprite != null)
+                {
+                    bodySprite.Origin = Anchor.BottomCentre;
+                    bodySprite.Scale = new Vector2(1, -1);
+                }
+
+                if (light != null)
+                    light.Anchor = Anchor.TopCentre;
             }
             else
             {
-                sprite.Origin = Anchor.TopCentre;
-                sprite.Scale = Vector2.One;
+                if (bodySprite != null)
+                {
+                    bodySprite.Origin = Anchor.TopCentre;
+                    bodySprite.Scale = Vector2.One;
+                }
+
+                if (light != null)
+                    light.Anchor = Anchor.BottomCentre;
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            lightContainer?.Expire();
+        }
+
+        private class HitTargetInsetContainer : Container
+        {
+            private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+            protected override Container<Drawable> Content => content;
+            private readonly Container content;
+
+            private float hitPosition;
+
+            public HitTargetInsetContainer()
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                InternalChild = content = new Container { RelativeSizeAxes = Axes.Both };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+            {
+                hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition)?.Value ?? Stage.HIT_TARGET_POSITION;
+
+                direction.BindTo(scrollingInfo.Direction);
+                direction.BindValueChanged(onDirectionChanged, true);
+            }
+
+            private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+            {
+                content.Padding = direction.NewValue == ScrollingDirection.Up
+                    ? new MarginPadding { Top = hitPosition }
+                    : new MarginPadding { Bottom = hitPosition };
             }
         }
     }

From 6fe1279e9deb3b3bea1ec7c53b2695fd47d6eb30 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 26 Aug 2020 20:23:01 +0900
Subject: [PATCH 04396/10326] Re-use existing inset container

---
 .../Skinning/HitTargetInsetContainer.cs       | 46 +++++++++++++++++++
 .../Skinning/LegacyBodyPiece.cs               | 35 --------------
 .../Skinning/LegacyStageBackground.cs         | 35 --------------
 3 files changed, 46 insertions(+), 70 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.cs b/osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.cs
new file mode 100644
index 0000000000..c8b05ed2f8
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class HitTargetInsetContainer : Container
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        private float hitPosition;
+
+        public HitTargetInsetContainer()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChild = content = new Container { RelativeSizeAxes = Axes.Both };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        {
+            hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition)?.Value ?? Stage.HIT_TARGET_POSITION;
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            content.Padding = direction.NewValue == ScrollingDirection.Up
+                ? new MarginPadding { Top = hitPosition }
+                : new MarginPadding { Bottom = hitPosition };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index d922934532..338dd5bb1d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -6,10 +6,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
@@ -144,38 +142,5 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             lightContainer?.Expire();
         }
-
-        private class HitTargetInsetContainer : Container
-        {
-            private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-
-            protected override Container<Drawable> Content => content;
-            private readonly Container content;
-
-            private float hitPosition;
-
-            public HitTargetInsetContainer()
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                InternalChild = content = new Container { RelativeSizeAxes = Axes.Both };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
-            {
-                hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition)?.Value ?? Stage.HIT_TARGET_POSITION;
-
-                direction.BindTo(scrollingInfo.Direction);
-                direction.BindValueChanged(onDirectionChanged, true);
-            }
-
-            private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
-            {
-                content.Padding = direction.NewValue == ScrollingDirection.Up
-                    ? new MarginPadding { Top = hitPosition }
-                    : new MarginPadding { Bottom = hitPosition };
-            }
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
index 19ec86b1ed..ead51d91d7 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
@@ -2,14 +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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -145,38 +143,5 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 };
             }
         }
-
-        private class HitTargetInsetContainer : Container
-        {
-            private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-
-            protected override Container<Drawable> Content => content;
-            private readonly Container content;
-
-            private float hitPosition;
-
-            public HitTargetInsetContainer()
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                InternalChild = content = new Container { RelativeSizeAxes = Axes.Both };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
-            {
-                hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition)?.Value ?? Stage.HIT_TARGET_POSITION;
-
-                direction.BindTo(scrollingInfo.Direction);
-                direction.BindValueChanged(onDirectionChanged, true);
-            }
-
-            private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
-            {
-                content.Padding = direction.NewValue == ScrollingDirection.Up
-                    ? new MarginPadding { Top = hitPosition }
-                    : new MarginPadding { Bottom = hitPosition };
-            }
-        }
     }
 }

From 157e1d89651a4866b1e413ee1f953eea5058e948 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 26 Aug 2020 20:46:12 +0900
Subject: [PATCH 04397/10326] Add fades

---
 .../Skinning/LegacyBodyPiece.cs               | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index 338dd5bb1d..a1c2559386 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -59,7 +59,13 @@ namespace osu.Game.Rulesets.Mania.Skinning
             });
 
             if (light != null)
-                lightContainer = new HitTargetInsetContainer { Child = light };
+            {
+                lightContainer = new HitTargetInsetContainer
+                {
+                    Alpha = 0,
+                    Child = light
+                };
+            }
 
             bodySprite = skin.GetAnimation(imageName, WrapMode.ClampToEdge, WrapMode.ClampToEdge, true, true).With(d =>
             {
@@ -99,14 +105,24 @@ namespace osu.Game.Rulesets.Mania.Skinning
             {
                 if (isHitting.NewValue)
                 {
-                    Column.TopLevelContainer.Add(lightContainer);
+                    // Clear the fade out and, more importantly, the removal.
+                    lightContainer.ClearTransforms();
 
-                    // The light must be seeked only after being loaded, otherwise a nullref happens (https://github.com/ppy/osu-framework/issues/3847).
+                    // Only add the container if the removal has taken place.
+                    if (lightContainer.Parent == null)
+                        Column.TopLevelContainer.Add(lightContainer);
+
+                    // The light must be seeked only after being loaded, otherwise a nullref occurs (https://github.com/ppy/osu-framework/issues/3847).
                     if (light is TextureAnimation lightAnimation)
                         lightAnimation.GotoFrame(0);
+
+                    lightContainer.FadeIn(80);
                 }
                 else
-                    Column.TopLevelContainer.Remove(lightContainer);
+                {
+                    lightContainer.FadeOut(120)
+                                  .OnComplete(d => Column.TopLevelContainer.Remove(d));
+                }
             }
         }
 

From f65991f31fbe30fcfd55a30e921b890b0709715d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Aug 2020 23:28:58 +0900
Subject: [PATCH 04398/10326] Revert some usages based on review feedback

---
 osu.Game/Graphics/Containers/BeatSyncedContainer.cs  |  8 ++------
 osu.Game/Overlays/Music/PlaylistOverlay.cs           |  9 +++------
 .../Edit/Compose/Components/Timeline/Timeline.cs     |  4 ----
 osu.Game/Screens/Menu/LogoVisualisation.cs           | 12 ++++--------
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index 69021e1634..1c9cdc174a 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -15,9 +14,6 @@ namespace osu.Game.Graphics.Containers
     {
         protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         private int lastBeat;
         private TimingControlPoint lastTimingPoint;
 
@@ -58,9 +54,9 @@ namespace osu.Game.Graphics.Containers
             TimingControlPoint timingPoint = null;
             EffectControlPoint effectPoint = null;
 
-            if (musicController.TrackLoaded && Beatmap.Value.BeatmapLoaded)
+            if (Beatmap.Value.TrackLoaded && Beatmap.Value.BeatmapLoaded)
             {
-                track = musicController.CurrentTrack;
+                track = Beatmap.Value.Track;
                 beatmap = Beatmap.Value.Beatmap;
             }
 
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 7471e31923..b45d84049f 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -30,9 +30,6 @@ namespace osu.Game.Overlays.Music
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         private FilterControl filter;
         private Playlist list;
 
@@ -85,7 +82,7 @@ namespace osu.Game.Overlays.Music
                 if (toSelect != null)
                 {
                     beatmap.Value = beatmaps.GetWorkingBeatmap(toSelect);
-                    musicController.CurrentTrack.Restart();
+                    beatmap.Value.Track.Restart();
                 }
             };
         }
@@ -119,12 +116,12 @@ namespace osu.Game.Overlays.Music
         {
             if (set.ID == (beatmap.Value?.BeatmapSetInfo?.ID ?? -1))
             {
-                musicController.CurrentTrack.Seek(0);
+                beatmap.Value?.Track.Seek(0);
                 return;
             }
 
             beatmap.Value = beatmaps.GetWorkingBeatmap(set.Beatmaps.First());
-            musicController.CurrentTrack.Restart();
+            beatmap.Value.Track.Restart();
         }
     }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index c617950c64..8c0e35b80e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Audio;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
 using osuTK;
 
@@ -27,9 +26,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private EditorClock editorClock { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         /// <summary>
         /// The timeline's scroll position in the last frame.
         /// </summary>
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 4d95ee9b7b..ebbb19636c 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -20,7 +20,6 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Utils;
-using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Menu
 {
@@ -75,9 +74,6 @@ namespace osu.Game.Screens.Menu
         /// </summary>
         public float Magnitude { get; set; } = 1;
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         private readonly float[] frequencyAmplitudes = new float[256];
 
         private IShader shader;
@@ -107,15 +103,15 @@ namespace osu.Game.Screens.Menu
 
         private void updateAmplitudes()
         {
-            var effect = beatmap.Value.BeatmapLoaded && musicController.TrackLoaded
-                ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(musicController.CurrentTrack.CurrentTime)
+            var effect = beatmap.Value.BeatmapLoaded && beatmap.Value.TrackLoaded
+                ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(beatmap.Value.Track.CurrentTime)
                 : null;
 
             for (int i = 0; i < temporalAmplitudes.Length; i++)
                 temporalAmplitudes[i] = 0;
 
-            if (musicController.TrackLoaded)
-                addAmplitudesFromSource(musicController.CurrentTrack);
+            if (beatmap.Value.TrackLoaded)
+                addAmplitudesFromSource(beatmap.Value.Track);
 
             foreach (var source in amplitudeSources)
                 addAmplitudesFromSource(source);

From fcf703864288ea6b974f21f8bf049cd254ab4036 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 27 Aug 2020 00:21:50 +0900
Subject: [PATCH 04399/10326] Fix a couple of missed cases

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs   | 4 ++--
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index cd46e8c545..3d100e4b1c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("enable autoplay", () => autoplay = true);
             base.SetUpSteps();
-            AddUntilStep("wait for track to start running", () => MusicController.IsPlaying);
+            AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
 
             double startTime = hitObjects[sliderIndex].StartTime;
             retrieveDrawableSlider(sliderIndex);
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("have autoplay", () => autoplay = true);
             base.SetUpSteps();
-            AddUntilStep("wait for track to start running", () => MusicController.IsPlaying);
+            AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
 
             double startTime = hitObjects[sliderIndex].StartTime;
             retrieveDrawableSlider(sliderIndex);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 3c559765d4..f7909071ea 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             base.SetUpSteps();
 
-            AddUntilStep("wait for track to start running", () => MusicController.IsPlaying);
+            AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
             AddStep("retrieve spinner", () => drawableSpinner = (DrawableSpinner)Player.DrawableRuleset.Playfield.AllHitObjects.First());
         }
 

From edc15c965cf6a29321cf84c1dcd1d7bb0fcdd17a Mon Sep 17 00:00:00 2001
From: Poliwrath <Poliwrath@users.noreply.github.com>
Date: Wed, 26 Aug 2020 12:52:39 -0400
Subject: [PATCH 04400/10326] Update osu.Game/Screens/Menu/IntroSequence.cs
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/Menu/IntroSequence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/IntroSequence.cs b/osu.Game/Screens/Menu/IntroSequence.cs
index 98da31b93e..d92d38da45 100644
--- a/osu.Game/Screens/Menu/IntroSequence.cs
+++ b/osu.Game/Screens/Menu/IntroSequence.cs
@@ -205,7 +205,7 @@ namespace osu.Game.Screens.Menu
                 const int line_end_offset = 120;
 
                 smallRing.Foreground.ResizeTo(1, line_duration, Easing.OutQuint);
-                smallRing.Delay(400).FadeOut();
+                smallRing.Delay(400).FadeColour(Color4.Black, 300);
 
                 lineTopLeft.MoveTo(new Vector2(-line_end_offset, -line_end_offset), line_duration, Easing.OutQuint);
                 lineTopRight.MoveTo(new Vector2(line_end_offset, -line_end_offset), line_duration, Easing.OutQuint);

From 927a2a3d2df98bb3c93e9c4b8d7af6f35e71636e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Aug 2020 19:19:42 +0200
Subject: [PATCH 04401/10326] Introduce IStatisticRow interface

---
 .../Ranking/Statistics/IStatisticRow.cs       | 18 +++++++++++++
 .../Ranking/Statistics/StatisticRow.cs        | 26 +++++++++++++++++--
 .../Ranking/Statistics/StatisticsPanel.cs     | 24 +++--------------
 3 files changed, 45 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Screens/Ranking/Statistics/IStatisticRow.cs

diff --git a/osu.Game/Screens/Ranking/Statistics/IStatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/IStatisticRow.cs
new file mode 100644
index 0000000000..67224041d5
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/IStatisticRow.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.Graphics;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    /// <summary>
+    /// A row of statistics to be displayed on the results screen.
+    /// </summary>
+    public interface IStatisticRow
+    {
+        /// <summary>
+        /// Creates the visual representation of this row.
+        /// </summary>
+        Drawable CreateDrawableStatisticRow();
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
index e1ca9799a3..fff60cdcad 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
@@ -1,19 +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.Linq;
 using JetBrains.Annotations;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Screens.Ranking.Statistics
 {
     /// <summary>
-    /// A row of statistics to be displayed in the results screen.
+    /// A row of graphically detailed <see cref="StatisticItem"/>s to be displayed in the results screen.
     /// </summary>
-    public class StatisticRow
+    public class StatisticRow : IStatisticRow
     {
         /// <summary>
         /// The columns of this <see cref="StatisticRow"/>.
         /// </summary>
         [ItemNotNull]
         public StatisticItem[] Columns;
+
+        public Drawable CreateDrawableStatisticRow() => new GridContainer
+        {
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre,
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Content = new[]
+            {
+                Columns?.Select(c => new StatisticContainer(c)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }).Cast<Drawable>().ToArray()
+            },
+            ColumnDimensions = Enumerable.Range(0, Columns?.Length ?? 0)
+                                         .Select(i => Columns[i].Dimension ?? new Dimension()).ToArray(),
+            RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
+        };
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 7f406331cd..fd62c9e7d9 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -96,27 +96,9 @@ namespace osu.Game.Screens.Ranking.Statistics
                         Spacing = new Vector2(30, 15),
                     };
 
-                    foreach (var row in newScore.Ruleset.CreateInstance().CreateStatisticsForScore(newScore, playableBeatmap))
-                    {
-                        rows.Add(new GridContainer
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Content = new[]
-                            {
-                                row.Columns?.Select(c => new StatisticContainer(c)
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                }).Cast<Drawable>().ToArray()
-                            },
-                            ColumnDimensions = Enumerable.Range(0, row.Columns?.Length ?? 0)
-                                                         .Select(i => row.Columns[i].Dimension ?? new Dimension()).ToArray(),
-                            RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
-                        });
-                    }
+                    rows.AddRange(newScore.Ruleset.CreateInstance()
+                                          .CreateStatisticsForScore(newScore, playableBeatmap)
+                                          .Select(row => row.CreateDrawableStatisticRow()));
 
                     LoadComponentAsync(rows, d =>
                     {

From bbb3d7522e3e606c94d3564b28b9ec21c3865a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Aug 2020 19:24:12 +0200
Subject: [PATCH 04402/10326] Scope up return type to IStatisticRow

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 2 +-
 osu.Game/Rulesets/Ruleset.cs            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 2795868c97..8cc635c316 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -314,7 +314,7 @@ namespace osu.Game.Rulesets.Mania
             return (PlayfieldType)Enum.GetValues(typeof(PlayfieldType)).Cast<int>().OrderByDescending(i => i).First(v => variant >= v);
         }
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
+        public override IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new IStatisticRow[]
         {
             new StatisticRow
             {
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index eaa5d8937a..298f1aec91 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -193,7 +193,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
+        public override IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new IStatisticRow[]
         {
             new StatisticRow
             {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 2011842591..0125e0a3ad 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -161,7 +161,7 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
+        public override IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new IStatisticRow[]
         {
             new StatisticRow
             {
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 3a7f433a37..f82ecd842a 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -217,6 +217,6 @@ namespace osu.Game.Rulesets
         /// <param name="playableBeatmap">The <see cref="IBeatmap"/>, converted for this <see cref="Ruleset"/> with all relevant <see cref="Mod"/>s applied.</param>
         /// <returns>The <see cref="StatisticRow"/>s to display. Each <see cref="StatisticRow"/> may contain 0 or more <see cref="StatisticItem"/>.</returns>
         [NotNull]
-        public virtual StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => Array.Empty<StatisticRow>();
+        public virtual IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => Array.Empty<IStatisticRow>();
     }
 }

From f5e52c80b4db250bcb18df027a06095f35347508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Aug 2020 19:25:59 +0200
Subject: [PATCH 04403/10326] Rename {-> Drawable}SimpleStatisticRow

---
 ...atisticRow.cs => TestSceneDrawableSimpleStatisticRow.cs} | 6 +++---
 ...{SimpleStatisticRow.cs => DrawableSimpleStatisticRow.cs} | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game.Tests/Visual/Ranking/{TestSceneSimpleStatisticRow.cs => TestSceneDrawableSimpleStatisticRow.cs} (88%)
 rename osu.Game/Screens/Ranking/Statistics/{SimpleStatisticRow.cs => DrawableSimpleStatisticRow.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticRow.cs b/osu.Game.Tests/Visual/Ranking/TestSceneDrawableSimpleStatisticRow.cs
similarity index 88%
rename from osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticRow.cs
rename to osu.Game.Tests/Visual/Ranking/TestSceneDrawableSimpleStatisticRow.cs
index aa569e47b1..2b0ba30357 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticRow.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneDrawableSimpleStatisticRow.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
-    public class TestSceneSimpleStatisticRow : OsuTestScene
+    public class TestSceneDrawableSimpleStatisticRow : OsuTestScene
     {
         private Container container;
 
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Ranking
         public void TestEmpty()
         {
             AddStep("create with no items",
-                () => container.Add(new SimpleStatisticRow(2, Enumerable.Empty<SimpleStatisticItem>())));
+                () => container.Add(new DrawableSimpleStatisticRow(2, Enumerable.Empty<SimpleStatisticItem>())));
         }
 
         [Test]
@@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual.Ranking
                                           Value = RNG.Next(100)
                                       });
 
-                container.Add(new SimpleStatisticRow(columnCount, items));
+                container.Add(new DrawableSimpleStatisticRow(columnCount, items));
             });
         }
     }
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/DrawableSimpleStatisticRow.cs
similarity index 96%
rename from osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs
rename to osu.Game/Screens/Ranking/Statistics/DrawableSimpleStatisticRow.cs
index 16501aae54..a592724bc3 100644
--- a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/DrawableSimpleStatisticRow.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Ranking.Statistics
     /// Represents a statistic row with simple statistics (ones that only need textual display).
     /// Richer visualisations should be done with <see cref="StatisticRow"/>s and <see cref="StatisticItem"/>s.
     /// </summary>
-    public class SimpleStatisticRow : CompositeDrawable
+    public class DrawableSimpleStatisticRow : CompositeDrawable
     {
         private readonly SimpleStatisticItem[] items;
         private readonly int columnCount;
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// </summary>
         /// <param name="columnCount">The number of columns to layout the <paramref name="items"/> into.</param>
         /// <param name="items">The <see cref="SimpleStatisticItem"/>s to display in this row.</param>
-        public SimpleStatisticRow(int columnCount, IEnumerable<SimpleStatisticItem> items)
+        public DrawableSimpleStatisticRow(int columnCount, IEnumerable<SimpleStatisticItem> items)
         {
             if (columnCount < 1)
                 throw new ArgumentOutOfRangeException(nameof(columnCount));

From 7c3368ecbe1ed8c6af1bd684f5af13027049b548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Aug 2020 19:30:49 +0200
Subject: [PATCH 04404/10326] Reintroduce SimpleStatisticRow as a data class

---
 .../Statistics/DrawableSimpleStatisticRow.cs  |  3 +-
 .../Ranking/Statistics/SimpleStatisticRow.cs  | 34 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs

diff --git a/osu.Game/Screens/Ranking/Statistics/DrawableSimpleStatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/DrawableSimpleStatisticRow.cs
index a592724bc3..7f69b323d8 100644
--- a/osu.Game/Screens/Ranking/Statistics/DrawableSimpleStatisticRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/DrawableSimpleStatisticRow.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -28,7 +29,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// </summary>
         /// <param name="columnCount">The number of columns to layout the <paramref name="items"/> into.</param>
         /// <param name="items">The <see cref="SimpleStatisticItem"/>s to display in this row.</param>
-        public DrawableSimpleStatisticRow(int columnCount, IEnumerable<SimpleStatisticItem> items)
+        public DrawableSimpleStatisticRow(int columnCount, [ItemNotNull] IEnumerable<SimpleStatisticItem> items)
         {
             if (columnCount < 1)
                 throw new ArgumentOutOfRangeException(nameof(columnCount));
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs
new file mode 100644
index 0000000000..cd6afeb3a5
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.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 JetBrains.Annotations;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    /// <summary>
+    /// Contains textual statistic data to display in a <see cref="DrawableSimpleStatisticRow"/>.
+    /// </summary>
+    public class SimpleStatisticRow : IStatisticRow
+    {
+        /// <summary>
+        /// The number of columns to layout the <see cref="Items"/> in.
+        /// </summary>
+        public int Columns { get; set; }
+
+        /// <summary>
+        /// The <see cref="StatisticItem"/>s that this row should contain.
+        /// </summary>
+        [ItemNotNull]
+        public SimpleStatisticItem[] Items { get; set; }
+
+        public Drawable CreateDrawableStatisticRow() => new Container
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Padding = new MarginPadding(20),
+            Child = new DrawableSimpleStatisticRow(Columns, Items)
+        };
+    }
+}

From 5973e2ce4e6d595a6f910b55250ed174a97db92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Aug 2020 21:20:43 +0200
Subject: [PATCH 04405/10326] Add component for unstable rate statistic

---
 .../Ranking/Statistics/UnstableRate.cs        | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 osu.Game/Screens/Ranking/Statistics/UnstableRate.cs

diff --git a/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs b/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
new file mode 100644
index 0000000000..5b368c3e8d
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/UnstableRate.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 System.Linq;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    /// <summary>
+    /// Displays the unstable rate statistic for a given play.
+    /// </summary>
+    public class UnstableRate : SimpleStatisticItem<double>
+    {
+        /// <summary>
+        /// Creates and computes an <see cref="UnstableRate"/> statistic.
+        /// </summary>
+        /// <param name="hitEvents">Sequence of <see cref="HitEvent"/>s to calculate the unstable rate based on.</param>
+        public UnstableRate(IEnumerable<HitEvent> hitEvents)
+            : base("Unstable Rate")
+        {
+            var timeOffsets = hitEvents.Select(ev => ev.TimeOffset).ToArray();
+            Value = 10 * standardDeviation(timeOffsets);
+        }
+
+        private static double standardDeviation(double[] timeOffsets)
+        {
+            if (timeOffsets.Length == 0)
+                return double.NaN;
+
+            var mean = timeOffsets.Average();
+            var squares = timeOffsets.Select(offset => Math.Pow(offset - mean, 2)).Sum();
+            return Math.Sqrt(squares / timeOffsets.Length);
+        }
+
+        protected override string DisplayValue(double value) => double.IsNaN(value) ? "(not available)" : value.ToString("N2");
+    }
+}

From 05e725d59fd5b7710e18f2fb414eb51e02d99e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Aug 2020 21:28:41 +0200
Subject: [PATCH 04406/10326] Add unstable rate statistic to rulesets in which
 it makes sense

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs |  8 ++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 50 ++++++++++++++++---------
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 31 ++++++++++-----
 3 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 8cc635c316..490223b7a5 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -326,6 +326,14 @@ namespace osu.Game.Rulesets.Mania
                         Height = 250
                     }),
                 }
+            },
+            new SimpleStatisticRow
+            {
+                Columns = 3,
+                Items = new SimpleStatisticItem[]
+                {
+                    new UnstableRate(score.HitEvents)
+                }
             }
         };
     }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 298f1aec91..dd950c60ec 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -193,30 +193,44 @@ namespace osu.Game.Rulesets.Osu
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
-        public override IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new IStatisticRow[]
+        public override IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
         {
-            new StatisticRow
+            var timedHitEvents = score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)).ToList();
+
+            return new IStatisticRow[]
             {
-                Columns = new[]
+                new StatisticRow
                 {
-                    new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)).ToList())
+                    Columns = new[]
                     {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 250
-                    }),
-                }
-            },
-            new StatisticRow
-            {
-                Columns = new[]
+                        new StatisticItem("Timing Distribution",
+                            new HitEventTimingDistributionGraph(timedHitEvents)
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                Height = 250
+                            }),
+                    }
+                },
+                new StatisticRow
                 {
-                    new StatisticItem("Accuracy Heatmap", new AccuracyHeatmap(score, playableBeatmap)
+                    Columns = new[]
                     {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 250
-                    }),
+                        new StatisticItem("Accuracy Heatmap", new AccuracyHeatmap(score, playableBeatmap)
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 250
+                        }),
+                    }
+                },
+                new SimpleStatisticRow
+                {
+                    Columns = 3,
+                    Items = new SimpleStatisticItem[]
+                    {
+                        new UnstableRate(timedHitEvents)
+                    }
                 }
-            }
-        };
+            };
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 0125e0a3ad..938c038413 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -161,19 +161,32 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
 
-        public override IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new IStatisticRow[]
+        public override IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
         {
-            new StatisticRow
+            var timedHitEvents = score.HitEvents.Where(e => e.HitObject is Hit).ToList();
+
+            return new IStatisticRow[]
             {
-                Columns = new[]
+                new StatisticRow
                 {
-                    new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents.Where(e => e.HitObject is Hit).ToList())
+                    Columns = new[]
                     {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 250
-                    }),
+                        new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(timedHitEvents)
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 250
+                        }),
+                    }
+                },
+                new SimpleStatisticRow
+                {
+                    Columns = 3,
+                    Items = new SimpleStatisticItem[]
+                    {
+                        new UnstableRate(timedHitEvents)
+                    }
                 }
-            }
-        };
+            };
+        }
     }
 }

From d81d538b7e202362c8208f403c449bdc018cf443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Aug 2020 21:29:01 +0200
Subject: [PATCH 04407/10326] Move out row anchor/origin set to one central
 place

---
 osu.Game/Screens/Ranking/Statistics/StatisticRow.cs    | 2 --
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
index fff60cdcad..d5324e14f0 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Screens.Ranking.Statistics
 
         public Drawable CreateDrawableStatisticRow() => new GridContainer
         {
-            Anchor = Anchor.Centre,
-            Origin = Anchor.Centre,
             RelativeSizeAxes = Axes.X,
             AutoSizeAxes = Axes.Y,
             Content = new[]
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index fd62c9e7d9..2f3304e810 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -98,7 +98,11 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                     rows.AddRange(newScore.Ruleset.CreateInstance()
                                           .CreateStatisticsForScore(newScore, playableBeatmap)
-                                          .Select(row => row.CreateDrawableStatisticRow()));
+                                          .Select(row => row.CreateDrawableStatisticRow().With(r =>
+                                          {
+                                              r.Anchor = Anchor.TopCentre;
+                                              r.Origin = Anchor.TopCentre;
+                                          })));
 
                     LoadComponentAsync(rows, d =>
                     {

From c3197da3dac494617364c88899eef62b5d7f9bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Aug 2020 21:43:33 +0200
Subject: [PATCH 04408/10326] Adjust simple statistic item font sizes

---
 osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
index e6c4ab1c4e..3d9ba2f225 100644
--- a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
@@ -41,13 +41,14 @@ namespace osu.Game.Screens.Ranking.Statistics
                 {
                     Text = Name,
                     Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft
+                    Origin = Anchor.CentreLeft,
+                    Font = OsuFont.GetFont(size: 14)
                 },
                 value = new OsuSpriteText
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
-                    Font = OsuFont.Torus.With(weight: FontWeight.Bold)
+                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold)
                 }
             });
         }

From f8042e6fd311b4f6713e75c310de746d4ea5daf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Aug 2020 22:34:02 +0200
Subject: [PATCH 04409/10326] Add fade to prevent jarring transitions

---
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 2f3304e810..3b8f980070 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -94,6 +94,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                         RelativeSizeAxes = Axes.Both,
                         Direction = FillDirection.Vertical,
                         Spacing = new Vector2(30, 15),
+                        Alpha = 0
                     };
 
                     rows.AddRange(newScore.Ruleset.CreateInstance()
@@ -111,6 +112,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                         spinner.Hide();
                         content.Add(d);
+                        d.FadeIn(250, Easing.OutQuint);
                     }, localCancellationSource.Token);
                 }), localCancellationSource.Token);
             }

From deb172bb6ccab9cc46f015957eb45bb06ce1c04f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Aug 2020 20:24:08 +0900
Subject: [PATCH 04410/10326] Implement basic mania hit order policy

---
 .../TestSceneOutOfOrderHits.cs                | 124 ++++++++++++++++++
 .../Objects/Drawables/DrawableHoldNote.cs     |   3 +
 .../Drawables/DrawableManiaHitObject.cs       |   9 ++
 .../Objects/Drawables/DrawableNote.cs         |   3 +
 osu.Game.Rulesets.Mania/UI/Column.cs          |  10 ++
 .../UI/OrderedHitPolicy.cs                    |  66 ++++++++++
 6 files changed, 215 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
 create mode 100644 osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
new file mode 100644
index 0000000000..ed187e65bf
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Extensions.TypeExtensions;
+using osu.Framework.Screens;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public class TestSceneOutOfOrderHits : RateAdjustedBeatmapTestScene
+    {
+        [Test]
+        public void TestPreviousHitWindowDoesNotExtendPastNextObject()
+        {
+            var objects = new List<ManiaHitObject>();
+            var frames = new List<ReplayFrame>();
+
+            for (int i = 0; i < 7; i++)
+            {
+                double time = 1000 + i * 100;
+
+                objects.Add(new Note { StartTime = time });
+
+                if (i > 0)
+                {
+                    frames.Add(new ManiaReplayFrame(time + 10, ManiaAction.Key1));
+                    frames.Add(new ManiaReplayFrame(time + 11));
+                }
+            }
+
+            performTest(objects, frames);
+
+            addJudgementAssert(objects[0], HitResult.Miss);
+
+            for (int i = 1; i < 7; i++)
+            {
+                addJudgementAssert(objects[i], HitResult.Perfect);
+                addJudgementOffsetAssert(objects[i], 10);
+            }
+        }
+
+        private void addJudgementAssert(ManiaHitObject hitObject, HitResult result)
+        {
+            AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
+                () => judgementResults.Single(r => r.HitObject == hitObject).Type == result);
+        }
+
+        private void addJudgementAssert(string name, Func<ManiaHitObject> hitObject, HitResult result)
+        {
+            AddAssert($"{name} judgement is {result}",
+                () => judgementResults.Single(r => r.HitObject == hitObject()).Type == result);
+        }
+
+        private void addJudgementOffsetAssert(ManiaHitObject hitObject, double offset)
+        {
+            AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judged at {offset}",
+                () => Precision.AlmostEquals(judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, offset, 100));
+        }
+
+        private ScoreAccessibleReplayPlayer currentPlayer;
+        private List<JudgementResult> judgementResults;
+
+        private void performTest(List<ManiaHitObject> hitObjects, List<ReplayFrame> frames)
+        {
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(new ManiaBeatmap(new StageDefinition { Columns = 4 })
+                {
+                    HitObjects = hitObjects,
+                    BeatmapInfo =
+                    {
+                        Ruleset = new ManiaRuleset().RulesetInfo
+                    },
+                });
+
+                Beatmap.Value.Beatmap.ControlPointInfo.Add(0, new DifficultyControlPoint { SpeedMultiplier = 0.1f });
+
+                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
+
+                p.OnLoadComplete += _ =>
+                {
+                    p.ScoreProcessor.NewJudgement += result =>
+                    {
+                        if (currentPlayer == p) judgementResults.Add(result);
+                    };
+                };
+
+                LoadScreen(currentPlayer = p);
+                judgementResults = new List<JudgementResult>();
+            });
+
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
+        }
+
+        private class ScoreAccessibleReplayPlayer : ReplayPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            protected override bool PauseOnFocusLost => false;
+
+            public ScoreAccessibleReplayPlayer(Score score)
+                : base(score, false, false)
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 0712026ca6..a04e5bc2f9 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -252,6 +252,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (action != Action.Value)
                 return false;
 
+            if (CheckHittable?.Invoke(this, Time.Current) == false)
+                return false;
+
             // The tail has a lenience applied to it which is factored into the miss window (i.e. the miss judgement will be delayed).
             // But the hold cannot ever be started within the late-lenience window, so we should skip trying to begin the hold during that time.
             // Note: Unlike below, we use the tail's start time to determine the time offset.
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index ab76a5b8f8..0594d1e143 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.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;
@@ -8,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -34,6 +36,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             }
         }
 
+        public Func<DrawableHitObject, double, bool> CheckHittable;
+
         protected DrawableManiaHitObject(ManiaHitObject hitObject)
             : base(hitObject)
         {
@@ -124,6 +128,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                     break;
             }
         }
+
+        /// <summary>
+        /// Causes this <see cref="DrawableManiaHitObject"/> to get missed, disregarding all conditions in implementations of <see cref="DrawableHitObject.CheckForResult"/>.
+        /// </summary>
+        public void MissForcefully() => ApplyResult(r => r.Type = HitResult.Miss);
     }
 
     public abstract class DrawableManiaHitObject<TObject> : DrawableManiaHitObject
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 9451bc4430..973dc06e05 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -64,6 +64,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (action != Action.Value)
                 return false;
 
+            if (CheckHittable?.Invoke(this, Time.Current) == false)
+                return false;
+
             return UpdateResult(true);
         }
 
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index de4648e4fa..9aabcc6699 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -36,6 +37,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public readonly ColumnHitObjectArea HitObjectArea;
         internal readonly Container TopLevelContainer;
         private readonly DrawablePool<PoolableHitExplosion> hitExplosionPool;
+        private readonly OrderedHitPolicy hitPolicy;
 
         public Container UnderlayElements => HitObjectArea.UnderlayElements;
 
@@ -65,6 +67,8 @@ namespace osu.Game.Rulesets.Mania.UI
                 TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
             };
 
+            hitPolicy = new OrderedHitPolicy(HitObjectContainer);
+
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
         }
 
@@ -90,6 +94,9 @@ namespace osu.Game.Rulesets.Mania.UI
             hitObject.AccentColour.Value = AccentColour;
             hitObject.OnNewResult += OnNewResult;
 
+            DrawableManiaHitObject maniaObject = (DrawableManiaHitObject)hitObject;
+            maniaObject.CheckHittable = hitPolicy.IsHittable;
+
             HitObjectContainer.Add(hitObject);
         }
 
@@ -104,6 +111,9 @@ namespace osu.Game.Rulesets.Mania.UI
 
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
+            if (result.IsHit)
+                hitPolicy.HandleHit(judgedObject);
+
             if (!result.IsHit || !judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
diff --git a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
new file mode 100644
index 0000000000..68183be89f
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
@@ -0,0 +1,66 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public class OrderedHitPolicy
+    {
+        private readonly HitObjectContainer hitObjectContainer;
+
+        public OrderedHitPolicy(HitObjectContainer hitObjectContainer)
+        {
+            this.hitObjectContainer = hitObjectContainer;
+        }
+
+        public bool IsHittable(DrawableHitObject hitObject, double time)
+        {
+            var nextObject = hitObjectContainer.AliveObjects.GetNext(hitObject);
+            return nextObject == null || time < nextObject.HitObject.StartTime;
+        }
+
+        /// <summary>
+        /// Handles a <see cref="HitObject"/> being hit to potentially miss all earlier <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
+        public void HandleHit(DrawableHitObject hitObject)
+        {
+            if (!IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
+                throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
+
+            foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))
+            {
+                if (obj.Judged)
+                    continue;
+
+                ((DrawableManiaHitObject)obj).MissForcefully();
+            }
+        }
+
+        private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(double targetTime)
+        {
+            foreach (var obj in hitObjectContainer.AliveObjects)
+            {
+                if (obj.HitObject.StartTime >= targetTime)
+                    yield break;
+
+                yield return obj;
+
+                foreach (var nestedObj in obj.NestedHitObjects)
+                {
+                    if (nestedObj.HitObject.StartTime >= targetTime)
+                        break;
+
+                    yield return nestedObj;
+                }
+            }
+        }
+    }
+}

From 6f93df0b9dbd1317b072c61b124fb50b30017b41 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Aug 2020 21:05:12 +0900
Subject: [PATCH 04411/10326] Fix ticks causing hold note misses

---
 osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
index 68183be89f..dfd5136e3e 100644
--- a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
@@ -48,14 +48,14 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             foreach (var obj in hitObjectContainer.AliveObjects)
             {
-                if (obj.HitObject.StartTime >= targetTime)
+                if (obj.HitObject.GetEndTime() >= targetTime)
                     yield break;
 
                 yield return obj;
 
                 foreach (var nestedObj in obj.NestedHitObjects)
                 {
-                    if (nestedObj.HitObject.StartTime >= targetTime)
+                    if (nestedObj.HitObject.GetEndTime() >= targetTime)
                         break;
 
                     yield return nestedObj;

From 7a5292936e57096e3521a1781d33d777fdc386d4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Aug 2020 21:15:05 +0900
Subject: [PATCH 04412/10326] Add some xmldocs

---
 osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
index dfd5136e3e..0f9cd48dd8 100644
--- a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
@@ -11,6 +11,9 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
+    /// <summary>
+    /// Ensures that only the most recent <see cref="HitObject"/> is hittable, affectionately known as "note lock".
+    /// </summary>
     public class OrderedHitPolicy
     {
         private readonly HitObjectContainer hitObjectContainer;
@@ -20,6 +23,15 @@ namespace osu.Game.Rulesets.Mania.UI
             this.hitObjectContainer = hitObjectContainer;
         }
 
+        /// <summary>
+        /// Determines whether a <see cref="DrawableHitObject"/> can be hit at a point in time.
+        /// </summary>
+        /// <remarks>
+        /// Only the most recent <see cref="DrawableHitObject"/> can be hit, a previous hitobject's window cannot extend past the next one.
+        /// </remarks>
+        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to check.</param>
+        /// <param name="time">The time to check.</param>
+        /// <returns>Whether <paramref name="hitObject"/> can be hit at the given <paramref name="time"/>.</returns>
         public bool IsHittable(DrawableHitObject hitObject, double time)
         {
             var nextObject = hitObjectContainer.AliveObjects.GetNext(hitObject);

From 29b29cde8e69330a1fdb62aec6ea802288242ec3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Aug 2020 23:09:54 +0900
Subject: [PATCH 04413/10326] Flip condition to reduce nesting

---
 .../Skinning/LegacyBodyPiece.cs               | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index a1c2559386..f2e92a7258 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -101,28 +101,28 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 bodyAnimation.IsPlaying = isHitting.NewValue;
             }
 
-            if (lightContainer != null)
+            if (lightContainer == null)
+                return;
+
+            if (isHitting.NewValue)
             {
-                if (isHitting.NewValue)
-                {
-                    // Clear the fade out and, more importantly, the removal.
-                    lightContainer.ClearTransforms();
+                // Clear the fade out and, more importantly, the removal.
+                lightContainer.ClearTransforms();
 
-                    // Only add the container if the removal has taken place.
-                    if (lightContainer.Parent == null)
-                        Column.TopLevelContainer.Add(lightContainer);
+                // Only add the container if the removal has taken place.
+                if (lightContainer.Parent == null)
+                    Column.TopLevelContainer.Add(lightContainer);
 
-                    // The light must be seeked only after being loaded, otherwise a nullref occurs (https://github.com/ppy/osu-framework/issues/3847).
-                    if (light is TextureAnimation lightAnimation)
-                        lightAnimation.GotoFrame(0);
+                // The light must be seeked only after being loaded, otherwise a nullref occurs (https://github.com/ppy/osu-framework/issues/3847).
+                if (light is TextureAnimation lightAnimation)
+                    lightAnimation.GotoFrame(0);
 
-                    lightContainer.FadeIn(80);
-                }
-                else
-                {
-                    lightContainer.FadeOut(120)
-                                  .OnComplete(d => Column.TopLevelContainer.Remove(d));
-                }
+                lightContainer.FadeIn(80);
+            }
+            else
+            {
+                lightContainer.FadeOut(120)
+                              .OnComplete(d => Column.TopLevelContainer.Remove(d));
             }
         }
 

From 700219316519201aa90ec2327091244553b6e250 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Aug 2020 23:16:54 +0900
Subject: [PATCH 04414/10326] Mark nullable members

---
 osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index f2e92a7258..c0f0fcb4af 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -2,6 +2,7 @@
 // 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.Graphics;
@@ -20,8 +21,13 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
         private readonly IBindable<bool> isHitting = new Bindable<bool>();
 
+        [CanBeNull]
         private Drawable bodySprite;
+
+        [CanBeNull]
         private Drawable lightContainer;
+
+        [CanBeNull]
         private Drawable light;
 
         public LegacyBodyPiece()

From 9d70b4af0922a20a1877df82bd745896d8b72132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 27 Aug 2020 17:35:42 +0200
Subject: [PATCH 04415/10326] Add failing test case

---
 .../Formats/LegacyScoreDecoderTest.cs         |  66 ++++++++++++++++++
 .../Resources/Replays/mania-replay.osr        | Bin 0 -> 1012 bytes
 2 files changed, 66 insertions(+)
 create mode 100644 osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
 create mode 100644 osu.Game.Tests/Resources/Replays/mania-replay.osr

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
new file mode 100644
index 0000000000..31c367aad1
--- /dev/null
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
@@ -0,0 +1,66 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko;
+using osu.Game.Scoring.Legacy;
+using osu.Game.Tests.Resources;
+
+namespace osu.Game.Tests.Beatmaps.Formats
+{
+    [TestFixture]
+    public class LegacyScoreDecoderTest
+    {
+        [Test]
+        public void TestDecodeManiaReplay()
+        {
+            var decoder = new TestLegacyScoreDecoder();
+
+            using (var resourceStream = TestResources.OpenResource("Replays/mania-replay.osr"))
+            {
+                var score = decoder.Parse(resourceStream);
+
+                Assert.AreEqual(3, score.ScoreInfo.Ruleset.ID);
+
+                Assert.AreEqual(2, score.ScoreInfo.Statistics[HitResult.Great]);
+                Assert.AreEqual(1, score.ScoreInfo.Statistics[HitResult.Good]);
+
+                Assert.AreEqual(829_931, score.ScoreInfo.TotalScore);
+                Assert.AreEqual(3, score.ScoreInfo.MaxCombo);
+
+                Assert.That(score.Replay.Frames, Is.Not.Empty);
+            }
+        }
+
+        private class TestLegacyScoreDecoder : LegacyScoreDecoder
+        {
+            private static readonly Dictionary<int, Ruleset> rulesets = new Ruleset[]
+            {
+                new OsuRuleset(),
+                new TaikoRuleset(),
+                new CatchRuleset(),
+                new ManiaRuleset()
+            }.ToDictionary(ruleset => ((ILegacyRuleset)ruleset).LegacyID);
+
+            protected override Ruleset GetRuleset(int rulesetId) => rulesets[rulesetId];
+
+            protected override WorkingBeatmap GetBeatmap(string md5Hash) => new TestWorkingBeatmap(new Beatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    MD5Hash = md5Hash,
+                    Ruleset = new OsuRuleset().RulesetInfo,
+                    BaseDifficulty = new BeatmapDifficulty()
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tests/Resources/Replays/mania-replay.osr b/osu.Game.Tests/Resources/Replays/mania-replay.osr
new file mode 100644
index 0000000000000000000000000000000000000000..da1a7bdd28e5b89eddd9742bce2b27bc8e75e6f5
GIT binary patch
literal 1012
zcmV<Q0}K2Edp$G(3m{=RWMpPFV=yyjWiU2nVmV`EH!wD3Gc;smFf}(ZVKoZ?3m{=K
zWMySJGC46dH!@>2Fk>_^VL323Gh;F`G&3?}Wi$c+0000000031008T$3;+WF00000
z01FT?FgZ6ed@(FBI50Uld@(FxP`z80O4tZ&0{{SB001BW<U;@e0000002m(vLs0{?
z099AmQ>z5CvGFroXr>*+lrR^_@@;>&b?uOx<^mMIMT(+z#h{kY?X9fc(g(Lwebtx#
z7Q6Lh=|qk7uqqmlbl#mwF~34O;`FY?03m(j9XrY3L)0)1?Fw}$4J_CNJKO;4?X$~q
z;+wGa#wD!!0q2PlCzFrV3*3>Lz{D|fez@9JR^@L#NXJJJ;9{+KP~}bh@_eim%+NSk
zzegnGWya)SS7pW`<9yI$g`b0t!?MZslqBX+4bVy#tZV0pDNGmeSXKuOXGQ|f3zg8y
z<AsO~?3eVD1%59InB6h_n68+bu8v9?`wn|TAYf^s(DX=_xd?hp!lyZQ<gFQgLb&&t
z*f8aWorsyr8}ikKCh;jAZjSqW4G>GrMu+gxo2?L-AA5RBaNH&*&Dv9Dc!%ufdTEO?
zp@}%SBej)D4N{g#xwHF)8|Ks=@OJ2<iYxVRC?$%3E6#qHo}LxrMT}}an5QCKRR)Ai
z4s&dvI}#8M4{|9Q$}35sMV1!F#r@+E72xq4>^BGnjH?@$dDOeELCl()%CSSocJ#J0
zrMz`0akC4=AW51K>p71-r!saF*3AP)S9{~9<H(}o<HlCR$AcQ!Izv<kcJjWkD(9o$
z{0Qh@zv`<X{qNKHkz_w`>8w6pYSsUr1=*o_Q#S)6A-dHA@d9~(^0+ax|D@!;n;Z||
zFvVlqvtKZJf2x8EVoS#`3YPzS-*vaun`i1N*BG`MvK_+XgTPh^GgHpdy!e==KZIaT
z3!YC}(8nGj*i;imyixwy9zyF`AooHY90sBzR$Obzb-Vi~&7$v#i3~s7*O{}|SLmeL
zoMGZCnRwCc_XbwVIh5g#M@wt{FGra$aqhxs9vn18+0v`>fSkg3XKs=0k_AUDZ~8>a
zDG78!sD4dHOSBcg!q83SKA#^J)eG3=oY`jU3QIF2QVgemNl8@7S4(W%aYN@e0jDu%
zmqiUorSh0*IbBRsW~4cH;@gJJOutPU2TVP<=OEnHm=mZ{2D~6Z=U*j5r!6K@YHyj*
zwhC8cbzc~TkcHU?&2W;Km_To^u4o{p7%^`#txPglTyDD<S}hY59fKa)zSzO6lq%=w
i{9>Fl%vh<nu?kD+6RG+sT+PT;D`x-z000000002^n95K9

literal 0
HcmV?d00001


From fc51e9d81a50f74dc179ec2db8db81fbb7ac428d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 27 Aug 2020 17:40:22 +0200
Subject: [PATCH 04416/10326] Fix some legacy mania replays crashing on import

---
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index a4a560c8e4..a3469f0965 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -241,12 +241,15 @@ namespace osu.Game.Scoring.Legacy
                 }
 
                 var diff = Parsing.ParseFloat(split[0]);
+                var mouseX = Parsing.ParseFloat(split[1], Parsing.MAX_COORDINATE_VALUE);
+                var mouseY = Parsing.ParseFloat(split[2], Parsing.MAX_COORDINATE_VALUE);
 
                 lastTime += diff;
 
-                if (i == 0 && diff == 0)
-                    // osu-stable adds a zero-time frame before potentially valid negative user frames.
-                    // we need to ignore this.
+                if (i < 2 && mouseX == 256 && mouseY == -500)
+                    // at the start of the replay, stable places two replay frames, at time 0 and SkipBoundary - 1, respectively.
+                    // both frames use a position of (256, -500).
+                    // ignore these frames as they serve no real purpose (and can even mislead ruleset-specific handlers - see mania)
                     continue;
 
                 // Todo: At some point we probably want to rewind and play back the negative-time frames
@@ -255,8 +258,8 @@ namespace osu.Game.Scoring.Legacy
                     continue;
 
                 currentFrame = convertFrame(new LegacyReplayFrame(lastTime,
-                    Parsing.ParseFloat(split[1], Parsing.MAX_COORDINATE_VALUE),
-                    Parsing.ParseFloat(split[2], Parsing.MAX_COORDINATE_VALUE),
+                    mouseX,
+                    mouseY,
                     (ReplayButtonState)Parsing.ParseInt(split[3])), currentFrame);
 
                 replay.Frames.Add(currentFrame);

From 37387d774165340e14c1e1ea493e23bb3aea693a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 27 Aug 2020 17:57:55 +0200
Subject: [PATCH 04417/10326] Add assertions to existing test to cover bug

---
 osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
index 31c367aad1..9c71466489 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
@@ -11,6 +12,7 @@ using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko;
+using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
 using osu.Game.Tests.Resources;
 
@@ -35,6 +37,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
                 Assert.AreEqual(829_931, score.ScoreInfo.TotalScore);
                 Assert.AreEqual(3, score.ScoreInfo.MaxCombo);
+                Assert.IsTrue(Precision.AlmostEquals(0.8889, score.ScoreInfo.Accuracy, 0.0001));
+                Assert.AreEqual(ScoreRank.B, score.ScoreInfo.Rank);
 
                 Assert.That(score.Replay.Frames, Is.Not.Empty);
             }

From af59e2c17954ce8fbf3df20ed2a0b6d3eeb74fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 27 Aug 2020 18:05:06 +0200
Subject: [PATCH 04418/10326] Use extension methods instead of reading directly

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

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index a3469f0965..97cb5ca7ab 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -13,7 +13,6 @@ using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Users;
 using SharpCompress.Compressors.LZMA;
 
@@ -123,12 +122,12 @@ namespace osu.Game.Scoring.Legacy
 
         protected void CalculateAccuracy(ScoreInfo score)
         {
-            score.Statistics.TryGetValue(HitResult.Miss, out int countMiss);
-            score.Statistics.TryGetValue(HitResult.Meh, out int count50);
-            score.Statistics.TryGetValue(HitResult.Good, out int count100);
-            score.Statistics.TryGetValue(HitResult.Great, out int count300);
-            score.Statistics.TryGetValue(HitResult.Perfect, out int countGeki);
-            score.Statistics.TryGetValue(HitResult.Ok, out int countKatu);
+            int countMiss = score.GetCountMiss() ?? 0;
+            int count50 = score.GetCount50() ?? 0;
+            int count100 = score.GetCount100() ?? 0;
+            int count300 = score.GetCount300() ?? 0;
+            int countGeki = score.GetCountGeki() ?? 0;
+            int countKatu = score.GetCountKatu() ?? 0;
 
             switch (score.Ruleset.ID)
             {

From f152e1b924f23da565ce0a89fb19ca3f2f16ac50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 27 Aug 2020 20:07:30 +0200
Subject: [PATCH 04419/10326] Revert IStatisticRow changes

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 10 +------
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 12 ++------
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       | 12 ++------
 osu.Game/Rulesets/Ruleset.cs                  |  2 +-
 .../Ranking/Statistics/IStatisticRow.cs       | 18 ------------
 .../Ranking/Statistics/SimpleStatisticRow.cs  |  2 +-
 .../Ranking/Statistics/StatisticRow.cs        | 24 ++--------------
 .../Ranking/Statistics/StatisticsPanel.cs     | 28 ++++++++++++++-----
 8 files changed, 30 insertions(+), 78 deletions(-)
 delete mode 100644 osu.Game/Screens/Ranking/Statistics/IStatisticRow.cs

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 490223b7a5..bbfc5739ec 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -314,7 +314,7 @@ namespace osu.Game.Rulesets.Mania
             return (PlayfieldType)Enum.GetValues(typeof(PlayfieldType)).Cast<int>().OrderByDescending(i => i).First(v => variant >= v);
         }
 
-        public override IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new IStatisticRow[]
+        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
         {
             new StatisticRow
             {
@@ -327,14 +327,6 @@ namespace osu.Game.Rulesets.Mania
                     }),
                 }
             },
-            new SimpleStatisticRow
-            {
-                Columns = 3,
-                Items = new SimpleStatisticItem[]
-                {
-                    new UnstableRate(score.HitEvents)
-                }
-            }
         };
     }
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index dd950c60ec..14e7b9e9a4 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -193,11 +193,11 @@ namespace osu.Game.Rulesets.Osu
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
-        public override IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
+        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
         {
             var timedHitEvents = score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)).ToList();
 
-            return new IStatisticRow[]
+            return new[]
             {
                 new StatisticRow
                 {
@@ -222,14 +222,6 @@ namespace osu.Game.Rulesets.Osu
                         }),
                     }
                 },
-                new SimpleStatisticRow
-                {
-                    Columns = 3,
-                    Items = new SimpleStatisticItem[]
-                    {
-                        new UnstableRate(timedHitEvents)
-                    }
-                }
             };
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 938c038413..367d991677 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -161,11 +161,11 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
 
-        public override IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
+        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
         {
             var timedHitEvents = score.HitEvents.Where(e => e.HitObject is Hit).ToList();
 
-            return new IStatisticRow[]
+            return new[]
             {
                 new StatisticRow
                 {
@@ -178,14 +178,6 @@ namespace osu.Game.Rulesets.Taiko
                         }),
                     }
                 },
-                new SimpleStatisticRow
-                {
-                    Columns = 3,
-                    Items = new SimpleStatisticItem[]
-                    {
-                        new UnstableRate(timedHitEvents)
-                    }
-                }
             };
         }
     }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index f82ecd842a..3a7f433a37 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -217,6 +217,6 @@ namespace osu.Game.Rulesets
         /// <param name="playableBeatmap">The <see cref="IBeatmap"/>, converted for this <see cref="Ruleset"/> with all relevant <see cref="Mod"/>s applied.</param>
         /// <returns>The <see cref="StatisticRow"/>s to display. Each <see cref="StatisticRow"/> may contain 0 or more <see cref="StatisticItem"/>.</returns>
         [NotNull]
-        public virtual IStatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => Array.Empty<IStatisticRow>();
+        public virtual StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => Array.Empty<StatisticRow>();
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/IStatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/IStatisticRow.cs
deleted file mode 100644
index 67224041d5..0000000000
--- a/osu.Game/Screens/Ranking/Statistics/IStatisticRow.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 osu.Framework.Graphics;
-
-namespace osu.Game.Screens.Ranking.Statistics
-{
-    /// <summary>
-    /// A row of statistics to be displayed on the results screen.
-    /// </summary>
-    public interface IStatisticRow
-    {
-        /// <summary>
-        /// Creates the visual representation of this row.
-        /// </summary>
-        Drawable CreateDrawableStatisticRow();
-    }
-}
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs
index cd6afeb3a5..5c0cb5b116 100644
--- a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Screens.Ranking.Statistics
     /// <summary>
     /// Contains textual statistic data to display in a <see cref="DrawableSimpleStatisticRow"/>.
     /// </summary>
-    public class SimpleStatisticRow : IStatisticRow
+    public class SimpleStatisticRow
     {
         /// <summary>
         /// The number of columns to layout the <see cref="Items"/> in.
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
index d5324e14f0..e1ca9799a3 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
@@ -1,39 +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.Linq;
 using JetBrains.Annotations;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Screens.Ranking.Statistics
 {
     /// <summary>
-    /// A row of graphically detailed <see cref="StatisticItem"/>s to be displayed in the results screen.
+    /// A row of statistics to be displayed in the results screen.
     /// </summary>
-    public class StatisticRow : IStatisticRow
+    public class StatisticRow
     {
         /// <summary>
         /// The columns of this <see cref="StatisticRow"/>.
         /// </summary>
         [ItemNotNull]
         public StatisticItem[] Columns;
-
-        public Drawable CreateDrawableStatisticRow() => new GridContainer
-        {
-            RelativeSizeAxes = Axes.X,
-            AutoSizeAxes = Axes.Y,
-            Content = new[]
-            {
-                Columns?.Select(c => new StatisticContainer(c)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                }).Cast<Drawable>().ToArray()
-            },
-            ColumnDimensions = Enumerable.Range(0, Columns?.Length ?? 0)
-                                         .Select(i => Columns[i].Dimension ?? new Dimension()).ToArray(),
-            RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
-        };
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 3b8f980070..128c6674e8 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -97,13 +97,27 @@ namespace osu.Game.Screens.Ranking.Statistics
                         Alpha = 0
                     };
 
-                    rows.AddRange(newScore.Ruleset.CreateInstance()
-                                          .CreateStatisticsForScore(newScore, playableBeatmap)
-                                          .Select(row => row.CreateDrawableStatisticRow().With(r =>
-                                          {
-                                              r.Anchor = Anchor.TopCentre;
-                                              r.Origin = Anchor.TopCentre;
-                                          })));
+                    foreach (var row in newScore.Ruleset.CreateInstance().CreateStatisticsForScore(newScore, playableBeatmap))
+                    {
+                        rows.Add(new GridContainer
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Content = new[]
+                            {
+                                row.Columns?.Select(c => new StatisticContainer(c)
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                }).Cast<Drawable>().ToArray()
+                            },
+                            ColumnDimensions = Enumerable.Range(0, row.Columns?.Length ?? 0)
+                                                         .Select(i => row.Columns[i].Dimension ?? new Dimension()).ToArray(),
+                            RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
+                        });
+                    }
 
                     LoadComponentAsync(rows, d =>
                     {

From ce013ac9b4fe80910f187b2856985b695b93cf88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 27 Aug 2020 20:18:53 +0200
Subject: [PATCH 04420/10326] Make statistic header optional

---
 .../Ranking/Statistics/StatisticContainer.cs  | 60 +++++++++++--------
 .../Ranking/Statistics/StatisticItem.cs       |  2 +-
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
index ed98698411..485d24d024 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
@@ -32,33 +32,9 @@ namespace osu.Game.Screens.Ranking.Statistics
                 AutoSizeAxes = Axes.Y,
                 Content = new[]
                 {
-                    new Drawable[]
+                    new[]
                     {
-                        new FillFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(5, 0),
-                            Children = new Drawable[]
-                            {
-                                new Circle
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    Height = 9,
-                                    Width = 4,
-                                    Colour = Color4Extensions.FromHex("#00FFAA")
-                                },
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    Text = item.Name,
-                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
-                                }
-                            }
-                        }
+                        createHeader(item)
                     },
                     new Drawable[]
                     {
@@ -78,5 +54,37 @@ namespace osu.Game.Screens.Ranking.Statistics
                 }
             };
         }
+
+        private static Drawable createHeader(StatisticItem item)
+        {
+            if (string.IsNullOrEmpty(item.Name))
+                return Empty();
+
+            return new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(5, 0),
+                Children = new Drawable[]
+                {
+                    new Circle
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Height = 9,
+                        Width = 4,
+                        Colour = Color4Extensions.FromHex("#00FFAA")
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Text = item.Name,
+                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
+                    }
+                }
+            };
+        }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
index e959ed24fc..4903983759 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// <summary>
         /// Creates a new <see cref="StatisticItem"/>, to be displayed inside a <see cref="StatisticRow"/> in the results screen.
         /// </summary>
-        /// <param name="name">The name of the item.</param>
+        /// <param name="name">The name of the item. Can be <see cref="string.Empty"/> to hide the item header.</param>
         /// <param name="content">The <see cref="Drawable"/> content to be displayed.</param>
         /// <param name="dimension">The <see cref="Dimension"/> of this item. This can be thought of as the column dimension of an encompassing <see cref="GridContainer"/>.</param>
         public StatisticItem([NotNull] string name, [NotNull] Drawable content, [CanBeNull] Dimension dimension = null)

From ea1f07e311add124437f0346fbb85300c88ab699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 27 Aug 2020 20:30:57 +0200
Subject: [PATCH 04421/10326] Simplify/rename SimpleStatisticRow mess

---
 ...ow.cs => TestSceneSimpleStatisticTable.cs} |  6 ++--
 .../Ranking/Statistics/SimpleStatisticRow.cs  | 34 -------------------
 ...tatisticRow.cs => SimpleStatisticTable.cs} |  6 ++--
 3 files changed, 6 insertions(+), 40 deletions(-)
 rename osu.Game.Tests/Visual/Ranking/{TestSceneDrawableSimpleStatisticRow.cs => TestSceneSimpleStatisticTable.cs} (88%)
 delete mode 100644 osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs
 rename osu.Game/Screens/Ranking/Statistics/{DrawableSimpleStatisticRow.cs => SimpleStatisticTable.cs} (93%)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneDrawableSimpleStatisticRow.cs b/osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticTable.cs
similarity index 88%
rename from osu.Game.Tests/Visual/Ranking/TestSceneDrawableSimpleStatisticRow.cs
rename to osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticTable.cs
index 2b0ba30357..07a0bcc8d8 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneDrawableSimpleStatisticRow.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticTable.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
-    public class TestSceneDrawableSimpleStatisticRow : OsuTestScene
+    public class TestSceneSimpleStatisticTable : OsuTestScene
     {
         private Container container;
 
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Ranking
         public void TestEmpty()
         {
             AddStep("create with no items",
-                () => container.Add(new DrawableSimpleStatisticRow(2, Enumerable.Empty<SimpleStatisticItem>())));
+                () => container.Add(new SimpleStatisticTable(2, Enumerable.Empty<SimpleStatisticItem>())));
         }
 
         [Test]
@@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual.Ranking
                                           Value = RNG.Next(100)
                                       });
 
-                container.Add(new DrawableSimpleStatisticRow(columnCount, items));
+                container.Add(new SimpleStatisticTable(columnCount, items));
             });
         }
     }
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs
deleted file mode 100644
index 5c0cb5b116..0000000000
--- a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs
+++ /dev/null
@@ -1,34 +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 JetBrains.Annotations;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-
-namespace osu.Game.Screens.Ranking.Statistics
-{
-    /// <summary>
-    /// Contains textual statistic data to display in a <see cref="DrawableSimpleStatisticRow"/>.
-    /// </summary>
-    public class SimpleStatisticRow
-    {
-        /// <summary>
-        /// The number of columns to layout the <see cref="Items"/> in.
-        /// </summary>
-        public int Columns { get; set; }
-
-        /// <summary>
-        /// The <see cref="StatisticItem"/>s that this row should contain.
-        /// </summary>
-        [ItemNotNull]
-        public SimpleStatisticItem[] Items { get; set; }
-
-        public Drawable CreateDrawableStatisticRow() => new Container
-        {
-            RelativeSizeAxes = Axes.X,
-            AutoSizeAxes = Axes.Y,
-            Padding = new MarginPadding(20),
-            Child = new DrawableSimpleStatisticRow(Columns, Items)
-        };
-    }
-}
diff --git a/osu.Game/Screens/Ranking/Statistics/DrawableSimpleStatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
similarity index 93%
rename from osu.Game/Screens/Ranking/Statistics/DrawableSimpleStatisticRow.cs
rename to osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
index 7f69b323d8..8b503cc04e 100644
--- a/osu.Game/Screens/Ranking/Statistics/DrawableSimpleStatisticRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
@@ -14,10 +14,10 @@ using osu.Framework.Graphics.Shapes;
 namespace osu.Game.Screens.Ranking.Statistics
 {
     /// <summary>
-    /// Represents a statistic row with simple statistics (ones that only need textual display).
+    /// Represents a table with simple statistics (ones that only need textual display).
     /// Richer visualisations should be done with <see cref="StatisticRow"/>s and <see cref="StatisticItem"/>s.
     /// </summary>
-    public class DrawableSimpleStatisticRow : CompositeDrawable
+    public class SimpleStatisticTable : CompositeDrawable
     {
         private readonly SimpleStatisticItem[] items;
         private readonly int columnCount;
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// </summary>
         /// <param name="columnCount">The number of columns to layout the <paramref name="items"/> into.</param>
         /// <param name="items">The <see cref="SimpleStatisticItem"/>s to display in this row.</param>
-        public DrawableSimpleStatisticRow(int columnCount, [ItemNotNull] IEnumerable<SimpleStatisticItem> items)
+        public SimpleStatisticTable(int columnCount, [ItemNotNull] IEnumerable<SimpleStatisticItem> items)
         {
             if (columnCount < 1)
                 throw new ArgumentOutOfRangeException(nameof(columnCount));

From 43d6d2b2e8845d073f78fa491d4f9946217828c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 27 Aug 2020 20:46:49 +0200
Subject: [PATCH 04422/10326] Add back unstable rate display

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 10 ++++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 10 ++++++++++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index bbfc5739ec..f7098faa5d 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -327,6 +327,16 @@ namespace osu.Game.Rulesets.Mania
                     }),
                 }
             },
+            new StatisticRow
+            {
+                Columns = new[]
+                {
+                    new StatisticItem(string.Empty, new SimpleStatisticTable(3, new SimpleStatisticItem[]
+                    {
+                        new UnstableRate(score.HitEvents)
+                    }))
+                }
+            }
         };
     }
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 14e7b9e9a4..f527eb2312 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -222,6 +222,16 @@ namespace osu.Game.Rulesets.Osu
                         }),
                     }
                 },
+                new StatisticRow
+                {
+                    Columns = new[]
+                    {
+                        new StatisticItem(string.Empty, new SimpleStatisticTable(3, new SimpleStatisticItem[]
+                        {
+                            new UnstableRate(timedHitEvents)
+                        }))
+                    }
+                }
             };
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 367d991677..dbc32f2c3e 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -178,6 +178,16 @@ namespace osu.Game.Rulesets.Taiko
                         }),
                     }
                 },
+                new StatisticRow
+                {
+                    Columns = new[]
+                    {
+                        new StatisticItem(string.Empty, new SimpleStatisticTable(3, new SimpleStatisticItem[]
+                        {
+                            new UnstableRate(timedHitEvents)
+                        }))
+                    }
+                }
             };
         }
     }

From 6846a245f42e60955ea20be79c7a2b43e334cbde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 27 Aug 2020 20:51:28 +0200
Subject: [PATCH 04423/10326] Reapply lost anchoring fix

---
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 128c6674e8..c2ace6a04e 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -101,8 +101,8 @@ namespace osu.Game.Screens.Ranking.Statistics
                     {
                         rows.Add(new GridContainer
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Content = new[]

From 1c1afa1c962b99fe082d8f7e1dfc06336922ec7f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 28 Aug 2020 19:16:20 +0900
Subject: [PATCH 04424/10326] Move MaxCombo to base DifficultyAttributes

---
 osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs | 1 -
 osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs     | 1 -
 osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs | 1 -
 osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs            | 1 +
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs
index 75f5b18607..fa9011d826 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs
@@ -8,6 +8,5 @@ namespace osu.Game.Rulesets.Catch.Difficulty
     public class CatchDifficultyAttributes : DifficultyAttributes
     {
         public double ApproachRate;
-        public int MaxCombo;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
index 6e991a1d08..a9879013f8 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
@@ -11,6 +11,5 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         public double SpeedStrain;
         public double ApproachRate;
         public double OverallDifficulty;
-        public int MaxCombo;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
index 75d3807bba..00ad956c8f 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
@@ -8,6 +8,5 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
     public class TaikoDifficultyAttributes : DifficultyAttributes
     {
         public double GreatHitWindow;
-        public int MaxCombo;
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index b4b4bb9cd1..732dc772b7 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -12,6 +12,7 @@ namespace osu.Game.Rulesets.Difficulty
         public Skill[] Skills;
 
         public double StarRating;
+        public int MaxCombo;
 
         public DifficultyAttributes()
         {

From 85bda29b71a790cb7675d46b86dce2462deae3c7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 28 Aug 2020 19:16:24 +0900
Subject: [PATCH 04425/10326] Add mania max combo attribute

---
 osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index 37cba1fd3c..b08c520c54 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Mania.Difficulty.Skills;
 using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -43,6 +44,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 Mods = mods,
                 // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be removed in the future
                 GreatHitWindow = (int)(hitWindows.WindowFor(HitResult.Great)) / clockRate,
+                MaxCombo = beatmap.HitObjects.Sum(h => h is HoldNote ? 2 : 1),
                 Skills = skills
             };
         }

From 4d15f0fe520f188c9219aa7e716679967d4c5f49 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 28 Aug 2020 19:16:46 +0900
Subject: [PATCH 04426/10326] Implement basic score recalculation

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 10 ++++---
 .../Online/Leaderboards/LeaderboardScore.cs   |  4 +--
 osu.Game/OsuGameBase.cs                       |  9 +++---
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  |  5 +++-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 13 +++++---
 osu.Game/Scoring/ScoreManager.cs              | 30 ++++++++++++++++++-
 6 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index b80b4e45ed..c02b6002d9 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -201,11 +201,11 @@ namespace osu.Game.Beatmaps
                 var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(beatmapInfo));
                 var attributes = calculator.Calculate(key.Mods);
 
-                return difficultyCache[key] = new StarDifficulty(attributes.StarRating);
+                return difficultyCache[key] = new StarDifficulty(attributes.StarRating, attributes.MaxCombo);
             }
             catch
             {
-                return difficultyCache[key] = new StarDifficulty(0);
+                return difficultyCache[key] = new StarDifficulty();
             }
         }
 
@@ -227,7 +227,7 @@ namespace osu.Game.Beatmaps
             if (beatmapInfo.ID == 0 || rulesetInfo.ID == null)
             {
                 // If not, fall back to the existing star difficulty (e.g. from an online source).
-                existingDifficulty = new StarDifficulty(beatmapInfo.StarDifficulty);
+                existingDifficulty = new StarDifficulty(beatmapInfo.StarDifficulty, beatmapInfo.MaxCombo ?? 0);
                 key = default;
 
                 return true;
@@ -292,10 +292,12 @@ namespace osu.Game.Beatmaps
     public readonly struct StarDifficulty
     {
         public readonly double Stars;
+        public readonly int MaxCombo;
 
-        public StarDifficulty(double stars)
+        public StarDifficulty(double stars, int maxCombo)
         {
             Stars = stars;
+            MaxCombo = maxCombo;
 
             // Todo: Add more members (BeatmapInfo.DifficultyRating? Attributes? Etc...)
         }
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 87b283f6b5..3c7ef73594 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Online.Leaderboards
         }
 
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider api, OsuColour colour)
+        private void load(IAPIProvider api, OsuColour colour, ScoreManager scoreManager)
         {
             var user = score.User;
 
@@ -194,7 +194,7 @@ namespace osu.Game.Online.Leaderboards
                                         {
                                             TextColour = Color4.White,
                                             GlowColour = Color4Extensions.FromHex(@"83ccfa"),
-                                            Text = score.TotalScore.ToString(@"N0"),
+                                            Text = scoreManager.GetTotalScore(score).ToString(@"N0"),
                                             Font = OsuFont.Numeric.With(size: 23),
                                         },
                                         RankContainer = new Container
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 98f60d52d3..1d92315b1f 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -57,6 +57,8 @@ namespace osu.Game
 
         protected ScoreManager ScoreManager;
 
+        protected BeatmapDifficultyManager DifficultyManager;
+
         protected SkinManager SkinManager;
 
         protected RulesetStore RulesetStore;
@@ -194,7 +196,7 @@ namespace osu.Game
             dependencies.Cache(FileStore = new FileStore(contextFactory, Storage));
 
             // ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup()
-            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Host));
+            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Host, () => DifficultyManager));
             dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Host, defaultBeatmap));
 
             // this should likely be moved to ArchiveModelManager when another case appers where it is necessary
@@ -218,9 +220,8 @@ namespace osu.Game
                     ScoreManager.Undelete(getBeatmapScores(item), true);
             });
 
-            var difficultyManager = new BeatmapDifficultyManager();
-            dependencies.Cache(difficultyManager);
-            AddInternal(difficultyManager);
+            dependencies.Cache(DifficultyManager = new BeatmapDifficultyManager());
+            AddInternal(DifficultyManager);
 
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 097ca27bf7..a3500826a0 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private const float row_height = 22;
         private const int text_size = 12;
 
+        [Resolved]
+        private ScoreManager scoreManager { get; set; }
+
         private readonly FillFlowContainer backgroundFlow;
 
         private Color4 highAccuracyColour;
@@ -121,7 +124,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new OsuSpriteText
                 {
                     Margin = new MarginPadding { Right = horizontal_inset },
-                    Text = $@"{score.TotalScore:N0}",
+                    Text = $@"{scoreManager.GetTotalScore(score):N0}",
                     Font = OsuFont.GetFont(size: text_size, weight: index == 0 ? FontWeight.Bold : FontWeight.Medium)
                 },
                 new OsuSpriteText
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index eac47aa089..057b1820f7 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -203,19 +203,24 @@ namespace osu.Game.Rulesets.Scoring
         }
 
         private double getScore(ScoringMode mode)
+        {
+            return GetScore(baseScore / maxBaseScore, HighestCombo.Value / maxHighestCombo, bonusScore, mode);
+        }
+
+        public double GetScore(double accuracyRatio, double comboRatio, double bonus, ScoringMode mode)
         {
             switch (mode)
             {
                 default:
                 case ScoringMode.Standardised:
-                    double accuracyScore = accuracyPortion * baseScore / maxBaseScore;
-                    double comboScore = comboPortion * HighestCombo.Value / maxHighestCombo;
+                    double accuracyScore = accuracyPortion * accuracyRatio;
+                    double comboScore = comboPortion * comboRatio;
 
-                    return (max_score * (accuracyScore + comboScore) + bonusScore) * scoreMultiplier;
+                    return (max_score * (accuracyScore + comboScore) + bonus) * scoreMultiplier;
 
                 case ScoringMode.Classic:
                     // should emulate osu-stable's scoring as closely as we can (https://osu.ppy.sh/help/wiki/Score/ScoreV1)
-                    return bonusScore + baseScore * (1 + Math.Max(0, HighestCombo.Value - 1) * scoreMultiplier / 25);
+                    return bonus + (accuracyRatio * maxBaseScore) * (1 + Math.Max(0, (comboRatio * maxHighestCombo) - 1) * scoreMultiplier / 25);
             }
         }
 
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index d5bd486e43..a82970d3df 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
+using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -15,6 +16,7 @@ using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring.Legacy;
 
 namespace osu.Game.Scoring
@@ -30,11 +32,16 @@ namespace osu.Game.Scoring
         private readonly RulesetStore rulesets;
         private readonly Func<BeatmapManager> beatmaps;
 
-        public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, IAPIProvider api, IDatabaseContextFactory contextFactory, IIpcHost importHost = null)
+        [CanBeNull]
+        private readonly Func<BeatmapDifficultyManager> difficulties;
+
+        public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, IAPIProvider api, IDatabaseContextFactory contextFactory, IIpcHost importHost = null,
+                            Func<BeatmapDifficultyManager> difficulties = null)
             : base(storage, contextFactory, api, new ScoreStore(contextFactory, storage), importHost)
         {
             this.rulesets = rulesets;
             this.beatmaps = beatmaps;
+            this.difficulties = difficulties;
         }
 
         protected override ScoreInfo CreateModel(ArchiveReader archive)
@@ -72,5 +79,26 @@ namespace osu.Game.Scoring
         protected override bool CheckLocalAvailability(ScoreInfo model, IQueryable<ScoreInfo> items)
             => base.CheckLocalAvailability(model, items)
                || (model.OnlineScoreID != null && items.Any(i => i.OnlineScoreID == model.OnlineScoreID));
+
+        public long GetTotalScore(ScoreInfo score)
+        {
+            int? beatmapMaxCombo = score.Beatmap.MaxCombo;
+
+            if (beatmapMaxCombo == null)
+            {
+                if (score.Beatmap.ID == 0 || difficulties == null)
+                    return score.TotalScore; // Can't do anything.
+
+                // We can compute the max combo locally.
+                beatmapMaxCombo = difficulties().GetDifficulty(score.Beatmap, score.Ruleset, score.Mods).MaxCombo;
+            }
+
+            var ruleset = score.Ruleset.CreateInstance();
+            var scoreProcessor = ruleset.CreateScoreProcessor();
+
+            scoreProcessor.Mods.Value = score.Mods;
+
+            return (long)Math.Round(scoreProcessor.GetScore(score.Accuracy, (double)score.MaxCombo / beatmapMaxCombo.Value, 0, ScoringMode.Standardised));
+        }
     }
 }

From 1e5e5cae0cbeee115aa09337051e22c943164893 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 28 Aug 2020 21:34:34 +0900
Subject: [PATCH 04427/10326] Add support for standardised -> classic changes

---
 .../Graphics/Sprites/GlowingSpriteText.cs     |  7 +++
 .../Online/Leaderboards/LeaderboardScore.cs   |  2 +-
 osu.Game/OsuGameBase.cs                       |  2 +-
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  |  2 +-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   |  8 +--
 osu.Game/Scoring/ScoreManager.cs              | 60 +++++++++++++++----
 6 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
index 4aea5aa518..85df2d167f 100644
--- a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/GlowingSpriteText.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.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -55,6 +56,12 @@ namespace osu.Game.Graphics.Sprites
             set => spriteText.UseFullGlyphHeight = blurredText.UseFullGlyphHeight = value;
         }
 
+        public Bindable<string> Current
+        {
+            get => spriteText.Current;
+            set => spriteText.Current = value;
+        }
+
         public GlowingSpriteText()
         {
             AutoSizeAxes = Axes.Both;
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 3c7ef73594..24bb43f1b7 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -194,7 +194,7 @@ namespace osu.Game.Online.Leaderboards
                                         {
                                             TextColour = Color4.White,
                                             GlowColour = Color4Extensions.FromHex(@"83ccfa"),
-                                            Text = scoreManager.GetTotalScore(score).ToString(@"N0"),
+                                            Current = scoreManager.GetTotalScore(score),
                                             Font = OsuFont.Numeric.With(size: 23),
                                         },
                                         RankContainer = new Container
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 1d92315b1f..3839d4e734 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -196,7 +196,7 @@ namespace osu.Game
             dependencies.Cache(FileStore = new FileStore(contextFactory, Storage));
 
             // ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup()
-            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Host, () => DifficultyManager));
+            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Host, () => DifficultyManager, LocalConfig));
             dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Host, defaultBeatmap));
 
             // this should likely be moved to ArchiveModelManager when another case appers where it is necessary
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index a3500826a0..832ac75882 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new OsuSpriteText
                 {
                     Margin = new MarginPadding { Right = horizontal_inset },
-                    Text = $@"{scoreManager.GetTotalScore(score):N0}",
+                    Current = scoreManager.GetTotalScore(score),
                     Font = OsuFont.GetFont(size: text_size, weight: index == 0 ? FontWeight.Bold : FontWeight.Medium)
                 },
                 new OsuSpriteText
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 057b1820f7..7d138bd878 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -204,10 +204,10 @@ namespace osu.Game.Rulesets.Scoring
 
         private double getScore(ScoringMode mode)
         {
-            return GetScore(baseScore / maxBaseScore, HighestCombo.Value / maxHighestCombo, bonusScore, mode);
+            return GetScore(mode, maxBaseScore, maxHighestCombo, baseScore / maxBaseScore, HighestCombo.Value / maxHighestCombo, bonusScore);
         }
 
-        public double GetScore(double accuracyRatio, double comboRatio, double bonus, ScoringMode mode)
+        public double GetScore(ScoringMode mode, double maxBaseScore, double maxHighestCombo, double accuracyRatio, double comboRatio, double bonusScore)
         {
             switch (mode)
             {
@@ -216,11 +216,11 @@ namespace osu.Game.Rulesets.Scoring
                     double accuracyScore = accuracyPortion * accuracyRatio;
                     double comboScore = comboPortion * comboRatio;
 
-                    return (max_score * (accuracyScore + comboScore) + bonus) * scoreMultiplier;
+                    return (max_score * (accuracyScore + comboScore) + bonusScore) * scoreMultiplier;
 
                 case ScoringMode.Classic:
                     // should emulate osu-stable's scoring as closely as we can (https://osu.ppy.sh/help/wiki/Score/ScoreV1)
-                    return bonus + (accuracyRatio * maxBaseScore) * (1 + Math.Max(0, (comboRatio * maxHighestCombo) - 1) * scoreMultiplier / 25);
+                    return bonusScore + (accuracyRatio * maxBaseScore) * (1 + Math.Max(0, (comboRatio * maxHighestCombo) - 1) * scoreMultiplier / 25);
             }
         }
 
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index a82970d3df..134a41a7d4 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -8,9 +8,11 @@ using System.Linq;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
+using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
@@ -35,13 +37,17 @@ namespace osu.Game.Scoring
         [CanBeNull]
         private readonly Func<BeatmapDifficultyManager> difficulties;
 
+        [CanBeNull]
+        private readonly OsuConfigManager configManager;
+
         public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, IAPIProvider api, IDatabaseContextFactory contextFactory, IIpcHost importHost = null,
-                            Func<BeatmapDifficultyManager> difficulties = null)
+                            Func<BeatmapDifficultyManager> difficulties = null, OsuConfigManager configManager = null)
             : base(storage, contextFactory, api, new ScoreStore(contextFactory, storage), importHost)
         {
             this.rulesets = rulesets;
             this.beatmaps = beatmaps;
             this.difficulties = difficulties;
+            this.configManager = configManager;
         }
 
         protected override ScoreInfo CreateModel(ArchiveReader archive)
@@ -80,25 +86,55 @@ namespace osu.Game.Scoring
             => base.CheckLocalAvailability(model, items)
                || (model.OnlineScoreID != null && items.Any(i => i.OnlineScoreID == model.OnlineScoreID));
 
-        public long GetTotalScore(ScoreInfo score)
+        public Bindable<string> GetTotalScore(ScoreInfo score)
         {
-            int? beatmapMaxCombo = score.Beatmap.MaxCombo;
+            var bindable = new TotalScoreBindable(score, difficulties);
+            configManager?.BindWith(OsuSetting.ScoreDisplayMode, bindable.ScoringMode);
+            return bindable;
+        }
 
-            if (beatmapMaxCombo == null)
+        private class TotalScoreBindable : Bindable<string>
+        {
+            public readonly Bindable<ScoringMode> ScoringMode = new Bindable<ScoringMode>();
+
+            private readonly ScoreInfo score;
+            private readonly Func<BeatmapDifficultyManager> difficulties;
+
+            public TotalScoreBindable(ScoreInfo score, Func<BeatmapDifficultyManager> difficulties)
             {
-                if (score.Beatmap.ID == 0 || difficulties == null)
-                    return score.TotalScore; // Can't do anything.
+                this.score = score;
+                this.difficulties = difficulties;
 
-                // We can compute the max combo locally.
-                beatmapMaxCombo = difficulties().GetDifficulty(score.Beatmap, score.Ruleset, score.Mods).MaxCombo;
+                ScoringMode.BindValueChanged(onScoringModeChanged, true);
             }
 
-            var ruleset = score.Ruleset.CreateInstance();
-            var scoreProcessor = ruleset.CreateScoreProcessor();
+            private void onScoringModeChanged(ValueChangedEvent<ScoringMode> mode)
+            {
+                int? beatmapMaxCombo = score.Beatmap.MaxCombo;
 
-            scoreProcessor.Mods.Value = score.Mods;
+                if (beatmapMaxCombo == null)
+                {
+                    if (score.Beatmap.ID == 0 || difficulties == null)
+                    {
+                        // We don't have enough information (max combo) to compute the score, so let's use the provided score.
+                        Value = score.TotalScore.ToString("N0");
+                        return;
+                    }
 
-            return (long)Math.Round(scoreProcessor.GetScore(score.Accuracy, (double)score.MaxCombo / beatmapMaxCombo.Value, 0, ScoringMode.Standardised));
+                    // We can compute the max combo locally.
+                    beatmapMaxCombo = difficulties().GetDifficulty(score.Beatmap, score.Ruleset, score.Mods).MaxCombo;
+                }
+
+                var ruleset = score.Ruleset.CreateInstance();
+                var scoreProcessor = ruleset.CreateScoreProcessor();
+
+                scoreProcessor.Mods.Value = score.Mods;
+
+                double maxBaseScore = 300 * beatmapMaxCombo.Value;
+                double maxHighestCombo = beatmapMaxCombo.Value;
+
+                Value = Math.Round(scoreProcessor.GetScore(mode.NewValue, maxBaseScore, maxHighestCombo, score.Accuracy, score.MaxCombo / maxHighestCombo, 0)).ToString("N0");
+            }
         }
     }
 }

From 39f8b5eb854df85ff989c71e57aad50dfb558bbf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 28 Aug 2020 21:45:27 +0900
Subject: [PATCH 04428/10326] Use async difficulty calculation

---
 osu.Game/Scoring/ScoreManager.cs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 134a41a7d4..8d3872cda0 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -108,6 +108,8 @@ namespace osu.Game.Scoring
                 ScoringMode.BindValueChanged(onScoringModeChanged, true);
             }
 
+            private IBindable<StarDifficulty> difficultyBindable;
+
             private void onScoringModeChanged(ValueChangedEvent<ScoringMode> mode)
             {
                 int? beatmapMaxCombo = score.Beatmap.MaxCombo;
@@ -121,19 +123,25 @@ namespace osu.Game.Scoring
                         return;
                     }
 
-                    // We can compute the max combo locally.
-                    beatmapMaxCombo = difficulties().GetDifficulty(score.Beatmap, score.Ruleset, score.Mods).MaxCombo;
+                    // We can compute the max combo locally after the async beatmap difficulty computation.
+                    difficultyBindable = difficulties().GetBindableDifficulty(score.Beatmap, score.Ruleset, score.Mods);
+                    difficultyBindable.BindValueChanged(d => updateScore(d.NewValue.MaxCombo), true);
                 }
+                else
+                    updateScore(beatmapMaxCombo.Value);
+            }
 
+            private void updateScore(int beatmapMaxCombo)
+            {
                 var ruleset = score.Ruleset.CreateInstance();
                 var scoreProcessor = ruleset.CreateScoreProcessor();
 
                 scoreProcessor.Mods.Value = score.Mods;
 
-                double maxBaseScore = 300 * beatmapMaxCombo.Value;
-                double maxHighestCombo = beatmapMaxCombo.Value;
+                double maxBaseScore = 300 * beatmapMaxCombo;
+                double maxHighestCombo = beatmapMaxCombo;
 
-                Value = Math.Round(scoreProcessor.GetScore(mode.NewValue, maxBaseScore, maxHighestCombo, score.Accuracy, score.MaxCombo / maxHighestCombo, 0)).ToString("N0");
+                Value = Math.Round(scoreProcessor.GetScore(ScoringMode.Value, maxBaseScore, maxHighestCombo, score.Accuracy, score.MaxCombo / maxHighestCombo, 0)).ToString("N0");
             }
         }
     }

From 43c61e58308e2f411971a72da430292088d03487 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 28 Aug 2020 22:08:28 +0900
Subject: [PATCH 04429/10326] Re-query beatmap difficulty before computing

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index b80b4e45ed..490f1ba67c 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -89,8 +89,14 @@ namespace osu.Game.Beatmaps
             if (tryGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
                 return existing;
 
-            return await Task.Factory.StartNew(() => computeDifficulty(key, beatmapInfo, rulesetInfo), cancellationToken,
-                TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
+            return await Task.Factory.StartNew(() =>
+            {
+                // Computation may have finished in a previous task.
+                if (tryGetExisting(beatmapInfo, rulesetInfo, mods, out existing, out _))
+                    return existing;
+
+                return computeDifficulty(key, beatmapInfo, rulesetInfo);
+            }, cancellationToken, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
         }
 
         /// <summary>

From 436dbafe57614261e9380825aea13b802c9a6dbb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 28 Aug 2020 22:12:17 +0900
Subject: [PATCH 04430/10326] Fix incorrect comparison for mods of different
 instances

---
 .../Beatmaps/BeatmapDifficultyManagerTest.cs  | 32 +++++++++++++++++++
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs |  4 +--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs

diff --git a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs b/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
new file mode 100644
index 0000000000..0f6d956b3c
--- /dev/null
+++ b/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.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 NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+
+namespace osu.Game.Tests.Beatmaps
+{
+    [TestFixture]
+    public class BeatmapDifficultyManagerTest
+    {
+        [Test]
+        public void TestKeyEqualsWithDifferentModInstances()
+        {
+            var key1 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+            var key2 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+
+            Assert.That(key1, Is.EqualTo(key2));
+        }
+
+        [Test]
+        public void TestKeyEqualsWithDifferentModOrder()
+        {
+            var key1 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+            var key2 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHidden(), new OsuModHardRock() });
+
+            Assert.That(key1, Is.EqualTo(key2));
+        }
+    }
+}
diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 490f1ba67c..0100c9b210 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -251,7 +251,7 @@ namespace osu.Game.Beatmaps
             updateScheduler?.Dispose();
         }
 
-        private readonly struct DifficultyCacheLookup : IEquatable<DifficultyCacheLookup>
+        public readonly struct DifficultyCacheLookup : IEquatable<DifficultyCacheLookup>
         {
             public readonly int BeatmapId;
             public readonly int RulesetId;
@@ -267,7 +267,7 @@ namespace osu.Game.Beatmaps
             public bool Equals(DifficultyCacheLookup other)
                 => BeatmapId == other.BeatmapId
                    && RulesetId == other.RulesetId
-                   && Mods.SequenceEqual(other.Mods);
+                   && Mods.Select(m => m.Acronym).SequenceEqual(other.Mods.Select(m => m.Acronym));
 
             public override int GetHashCode()
             {

From 8ffc4309fb14937c57dfad9270968d3488cbc91c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 28 Aug 2020 22:23:44 +0900
Subject: [PATCH 04431/10326] Fix possible NaN values

---
 osu.Game/Scoring/ScoreManager.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 8d3872cda0..0165c5dc82 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -105,6 +105,8 @@ namespace osu.Game.Scoring
                 this.score = score;
                 this.difficulties = difficulties;
 
+                Value = "0";
+
                 ScoringMode.BindValueChanged(onScoringModeChanged, true);
             }
 
@@ -133,6 +135,12 @@ namespace osu.Game.Scoring
 
             private void updateScore(int beatmapMaxCombo)
             {
+                if (beatmapMaxCombo == 0)
+                {
+                    Value = "0";
+                    return;
+                }
+
                 var ruleset = score.Ruleset.CreateInstance();
                 var scoreProcessor = ruleset.CreateScoreProcessor();
 

From d7bbb362bf5f0051bbecd4468e63be079a3252f3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 28 Aug 2020 22:51:19 +0900
Subject: [PATCH 04432/10326] Separate bindables

---
 .../Online/Leaderboards/LeaderboardScore.cs   |  2 +-
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  |  2 +-
 osu.Game/Scoring/ScoreManager.cs              | 26 ++++++++++++++-----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 24bb43f1b7..846bebe347 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -194,7 +194,7 @@ namespace osu.Game.Online.Leaderboards
                                         {
                                             TextColour = Color4.White,
                                             GlowColour = Color4Extensions.FromHex(@"83ccfa"),
-                                            Current = scoreManager.GetTotalScore(score),
+                                            Current = scoreManager.GetTotalScoreString(score),
                                             Font = OsuFont.Numeric.With(size: 23),
                                         },
                                         RankContainer = new Container
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 832ac75882..6bebd98eef 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new OsuSpriteText
                 {
                     Margin = new MarginPadding { Right = horizontal_inset },
-                    Current = scoreManager.GetTotalScore(score),
+                    Current = scoreManager.GetTotalScoreString(score),
                     Font = OsuFont.GetFont(size: text_size, weight: index == 0 ? FontWeight.Bold : FontWeight.Medium)
                 },
                 new OsuSpriteText
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 0165c5dc82..1943cab992 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -86,14 +86,16 @@ namespace osu.Game.Scoring
             => base.CheckLocalAvailability(model, items)
                || (model.OnlineScoreID != null && items.Any(i => i.OnlineScoreID == model.OnlineScoreID));
 
-        public Bindable<string> GetTotalScore(ScoreInfo score)
+        public Bindable<long> GetTotalScore(ScoreInfo score)
         {
             var bindable = new TotalScoreBindable(score, difficulties);
             configManager?.BindWith(OsuSetting.ScoreDisplayMode, bindable.ScoringMode);
             return bindable;
         }
 
-        private class TotalScoreBindable : Bindable<string>
+        public Bindable<string> GetTotalScoreString(ScoreInfo score) => new TotalScoreStringBindable(GetTotalScore(score));
+
+        private class TotalScoreBindable : Bindable<long>
         {
             public readonly Bindable<ScoringMode> ScoringMode = new Bindable<ScoringMode>();
 
@@ -105,7 +107,7 @@ namespace osu.Game.Scoring
                 this.score = score;
                 this.difficulties = difficulties;
 
-                Value = "0";
+                Value = 0;
 
                 ScoringMode.BindValueChanged(onScoringModeChanged, true);
             }
@@ -121,7 +123,7 @@ namespace osu.Game.Scoring
                     if (score.Beatmap.ID == 0 || difficulties == null)
                     {
                         // We don't have enough information (max combo) to compute the score, so let's use the provided score.
-                        Value = score.TotalScore.ToString("N0");
+                        Value = score.TotalScore;
                         return;
                     }
 
@@ -137,7 +139,7 @@ namespace osu.Game.Scoring
             {
                 if (beatmapMaxCombo == 0)
                 {
-                    Value = "0";
+                    Value = 0;
                     return;
                 }
 
@@ -149,7 +151,19 @@ namespace osu.Game.Scoring
                 double maxBaseScore = 300 * beatmapMaxCombo;
                 double maxHighestCombo = beatmapMaxCombo;
 
-                Value = Math.Round(scoreProcessor.GetScore(ScoringMode.Value, maxBaseScore, maxHighestCombo, score.Accuracy, score.MaxCombo / maxHighestCombo, 0)).ToString("N0");
+                Value = (long)Math.Round(scoreProcessor.GetScore(ScoringMode.Value, maxBaseScore, maxHighestCombo, score.Accuracy, score.MaxCombo / maxHighestCombo, 0));
+            }
+        }
+
+        private class TotalScoreStringBindable : Bindable<string>
+        {
+            // ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable (need to hold a reference)
+            private readonly IBindable<long> totalScore;
+
+            public TotalScoreStringBindable(IBindable<long> totalScore)
+            {
+                this.totalScore = totalScore;
+                this.totalScore.BindValueChanged(v => Value = v.NewValue.ToString("N0"), true);
             }
         }
     }

From ec2674e1ea60be3b7a649b38da3ff5ce39eadbe0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 28 Aug 2020 22:51:39 +0900
Subject: [PATCH 04433/10326] Fix nullref with null beatmap

---
 osu.Game/Scoring/ScoreManager.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 1943cab992..634cca159a 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -116,6 +116,12 @@ namespace osu.Game.Scoring
 
             private void onScoringModeChanged(ValueChangedEvent<ScoringMode> mode)
             {
+                if (score.Beatmap == null)
+                {
+                    Value = score.TotalScore;
+                    return;
+                }
+
                 int? beatmapMaxCombo = score.Beatmap.MaxCombo;
 
                 if (beatmapMaxCombo == null)

From c1838902a669f3e8fb7c4b0c1e25bf50dfa36c84 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 28 Aug 2020 22:51:48 +0900
Subject: [PATCH 04434/10326] Add to more places

---
 .../Graphics/UserInterface/RollingCounter.cs  | 14 ++++++----
 .../Scores/TopScoreStatisticsSection.cs       | 28 ++++++++++++++++++-
 .../ContractedPanelMiddleContent.cs           |  5 +++-
 .../Expanded/ExpandedPanelMiddleContent.cs    |  9 +++---
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index 6763198213..a469927595 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -9,16 +9,20 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public abstract class RollingCounter<T> : Container
+    public abstract class RollingCounter<T> : Container, IHasCurrentValue<T>
         where T : struct, IEquatable<T>
     {
-        /// <summary>
-        /// The current value.
-        /// </summary>
-        public Bindable<T> Current = new Bindable<T>();
+        private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();
+
+        public Bindable<T> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
 
         private SpriteText displayedCountSpriteText;
 
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index a92346e0fe..507c692eb1 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.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;
@@ -38,6 +39,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private readonly FillFlowContainer<InfoColumn> statisticsColumns;
         private readonly ModsInfoColumn modsColumn;
 
+        [Resolved]
+        private ScoreManager scoreManager { get; set; }
+
         public TopScoreStatisticsSection()
         {
             RelativeSizeAxes = Axes.X;
@@ -87,6 +91,15 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (score != null)
+                totalScoreColumn.Current = scoreManager.GetTotalScoreString(score);
+        }
+
+        private ScoreInfo score;
+
         /// <summary>
         /// Sets the score to be displayed.
         /// </summary>
@@ -94,7 +107,11 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         {
             set
             {
-                totalScoreColumn.Text = $@"{value.TotalScore:N0}";
+                if (score == value)
+                    return;
+
+                score = value;
+
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
                 ppColumn.Alpha = value.Beatmap?.Status == BeatmapSetOnlineStatus.Ranked ? 1 : 0;
@@ -102,6 +119,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
                 statisticsColumns.ChildrenEnumerable = value.SortedStatistics.Select(kvp => createStatisticsColumn(kvp.Key, kvp.Value));
                 modsColumn.Mods = value.Mods;
+
+                if (IsLoaded)
+                    totalScoreColumn.Current = scoreManager.GetTotalScoreString(value);
             }
         }
 
@@ -190,6 +210,12 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             {
                 set => text.Text = value;
             }
+
+            public Bindable<string> Current
+            {
+                get => text.Current;
+                set => text.Current = value;
+            }
         }
 
         private class ModsInfoColumn : InfoColumn
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index 8cd0e7025e..b37b89e6c0 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -30,6 +30,9 @@ namespace osu.Game.Screens.Ranking.Contracted
     {
         private readonly ScoreInfo score;
 
+        [Resolved]
+        private ScoreManager scoreManager { get; set; }
+
         /// <summary>
         /// Creates a new <see cref="ContractedPanelMiddleContent"/>.
         /// </summary>
@@ -160,7 +163,7 @@ namespace osu.Game.Screens.Ranking.Contracted
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
-                                            Text = score.TotalScore.ToString("N0"),
+                                            Current = scoreManager.GetTotalScoreString(score),
                                             Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, fixedWidth: true),
                                             Spacing = new Vector2(-1, 0)
                                         },
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 01502c0913..3433410d3c 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -25,15 +25,16 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// </summary>
     public class ExpandedPanelMiddleContent : CompositeDrawable
     {
-        private readonly ScoreInfo score;
+        private const float padding = 10;
 
+        private readonly ScoreInfo score;
         private readonly List<StatisticDisplay> statisticDisplays = new List<StatisticDisplay>();
 
         private FillFlowContainer starAndModDisplay;
-
         private RollingCounter<long> scoreCounter;
 
-        private const float padding = 10;
+        [Resolved]
+        private ScoreManager scoreManager { get; set; }
 
         /// <summary>
         /// Creates a new <see cref="ExpandedPanelMiddleContent"/>.
@@ -238,7 +239,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                 using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY, true))
                 {
                     scoreCounter.FadeIn();
-                    scoreCounter.Current.Value = score.TotalScore;
+                    scoreCounter.Current = scoreManager.GetTotalScore(score);
 
                     double delay = 0;
 

From da5853e7eb2c7dd95c8d5ca22ca4a0d4488ae731 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 29 Aug 2020 10:25:43 +0200
Subject: [PATCH 04435/10326] Create a new BeatmapSetInfo when setting files

---
 .../Beatmaps/Formats/LegacyBeatmapEncoderTest.cs      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index f093180085..dee4626cd0 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -60,12 +60,15 @@ namespace osu.Game.Tests.Beatmaps.Formats
             using (var reader = new LineBufferedReader(stream))
             {
                 var beatmap = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(reader);
-                beatmap.BeatmapInfo.BeatmapSet.Files = new List<BeatmapSetFileInfo>
+                beatmap.BeatmapInfo.BeatmapSet = new BeatmapSetInfo
                 {
-                    new BeatmapSetFileInfo
+                    Files = new List<BeatmapSetFileInfo>
                     {
-                        Filename = name,
-                        FileInfo = new osu.Game.IO.FileInfo { Hash = name }
+                        new BeatmapSetFileInfo
+                        {
+                            Filename = name,
+                            FileInfo = new osu.Game.IO.FileInfo { Hash = name }
+                        }
                     }
                 };
 

From 4cb9e1d4438895b7176c72464fcd6c65e738ac71 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 29 Aug 2020 10:33:43 +0200
Subject: [PATCH 04436/10326] Initial commit

---
 .../TestSceneLegacyBeatmapSkin.cs                        | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs    | 9 ++++++---
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs    | 5 +++--
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs       | 2 +-
 osu.Game/Beatmaps/IWorkingBeatmap.cs                     | 2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs                      | 8 ++++----
 osu.Game/Skinning/BeatmapSkinProvidingContainer.cs       | 4 ++--
 osu.Game/Skinning/DefaultBeatmapSkin.cs                  | 9 +++++++++
 osu.Game/Skinning/IBeatmapSkin.cs                        | 9 +++++++++
 osu.Game/Skinning/LegacyBeatmapSkin.cs                   | 2 +-
 osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs           | 2 +-
 11 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Skinning/DefaultBeatmapSkin.cs
 create mode 100644 osu.Game/Skinning/IBeatmapSkin.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 3ff37c4147..03d18cefef 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 this.hasColours = hasColours;
             }
 
-            protected override ISkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, hasColours);
+            protected override IBeatmapSkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, hasColours);
         }
 
         private class TestBeatmapSkin : LegacyBeatmapSkin
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 075bf314bc..c3c19de17c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -80,15 +80,18 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         public class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
         {
-            private readonly ISkinSource skin;
+            private readonly ISkinSource skinSource;
 
             public CustomSkinWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock frameBasedClock, AudioManager audio, ISkinSource skin)
                 : base(beatmap, storyboard, frameBasedClock, audio)
             {
-                this.skin = skin;
+                if (!(skinSource is IBeatmapSkin))
+                    throw new ArgumentException("The provided skin source must be of type IBeatmapSkin.");
+
+                skinSource = skin;
             }
 
-            protected override ISkin GetSkin() => skin;
+            protected override IBeatmapSkin GetSkin() => (IBeatmapSkin)skinSource;
         }
 
         public class SkinProvidingPlayer : TestPlayer
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index b30870d057..996d495e17 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -116,7 +116,8 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("sample playback rate matches mod rates", () => sample.Channel.AggregateFrequency.Value == expectedRate);
         }
 
-        private class TestSkin : LegacySkin
+        // TODO: adding IBeatmapSkin changes are as minimal as possible, but this shouldn't exist or should be reworked to work with LegacyBeatmapSkin
+        private class TestSkin : LegacySkin, IBeatmapSkin
         {
             public TestSkin(string resourceName, AudioManager audioManager)
                 : base(DefaultLegacySkin.Info, new TestResourceStore(resourceName), audioManager, "skin.ini")
@@ -156,7 +157,7 @@ namespace osu.Game.Tests.Gameplay
                 this.audio = audio;
             }
 
-            protected override ISkin GetSkin() => new TestSkin("test-sample", audio);
+            protected override IBeatmapSkin GetSkin() => new TestSkin("test-sample", audio);
         }
 
         private class TestDrawableStoryboardSample : DrawableStoryboardSample
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 39c5ccab27..44728cc251 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Beatmaps
                 return storyboard;
             }
 
-            protected override ISkin GetSkin()
+            protected override IBeatmapSkin GetSkin()
             {
                 try
                 {
diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 31975157a0..dac9389822 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Retrieves the <see cref="Skin"/> which this <see cref="WorkingBeatmap"/> provides.
         /// </summary>
-        ISkin Skin { get; }
+        IBeatmapSkin Skin { get; }
 
         /// <summary>
         /// Constructs a playable <see cref="IBeatmap"/> from <see cref="Beatmap"/> using the applicable converters for a specific <see cref="RulesetInfo"/>.
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index b4bcf285b9..163b62a55c 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Beatmaps
             background = new RecyclableLazy<Texture>(GetBackground, BackgroundStillValid);
             waveform = new RecyclableLazy<Waveform>(GetWaveform);
             storyboard = new RecyclableLazy<Storyboard>(GetStoryboard);
-            skin = new RecyclableLazy<ISkin>(GetSkin);
+            skin = new RecyclableLazy<IBeatmapSkin>(GetSkin);
 
             total_count.Value++;
         }
@@ -275,10 +275,10 @@ namespace osu.Game.Beatmaps
         private readonly RecyclableLazy<Storyboard> storyboard;
 
         public bool SkinLoaded => skin.IsResultAvailable;
-        public ISkin Skin => skin.Value;
+        public IBeatmapSkin Skin => skin.Value;
 
-        protected virtual ISkin GetSkin() => new DefaultSkin();
-        private readonly RecyclableLazy<ISkin> skin;
+        protected virtual IBeatmapSkin GetSkin() => new DefaultBeatmapSkin();
+        private readonly RecyclableLazy<IBeatmapSkin> skin;
 
         /// <summary>
         /// Transfer pieces of a beatmap to a new one, where possible, to save on loading.
diff --git a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
index 40335db697..346bfe53b8 100644
--- a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Skinning
     /// <summary>
     /// A container which overrides existing skin options with beatmap-local values.
     /// </summary>
-    public class BeatmapSkinProvidingContainer : SkinProvidingContainer
+    public class BeatmapSkinProvidingContainer : SkinProvidingContainer, IBeatmapSkin
     {
         private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
         private readonly Bindable<bool> beatmapHitsounds = new Bindable<bool>();
@@ -21,7 +21,7 @@ namespace osu.Game.Skinning
         protected override bool AllowTextureLookup(string componentName) => beatmapSkins.Value;
         protected override bool AllowSampleLookup(ISampleInfo componentName) => beatmapHitsounds.Value;
 
-        public BeatmapSkinProvidingContainer(ISkin skin)
+        public BeatmapSkinProvidingContainer(IBeatmapSkin skin)
             : base(skin)
         {
         }
diff --git a/osu.Game/Skinning/DefaultBeatmapSkin.cs b/osu.Game/Skinning/DefaultBeatmapSkin.cs
new file mode 100644
index 0000000000..7b5ccd45c3
--- /dev/null
+++ b/osu.Game/Skinning/DefaultBeatmapSkin.cs
@@ -0,0 +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.
+
+namespace osu.Game.Skinning
+{
+    public class DefaultBeatmapSkin : DefaultSkin, IBeatmapSkin
+    {
+    }
+}
diff --git a/osu.Game/Skinning/IBeatmapSkin.cs b/osu.Game/Skinning/IBeatmapSkin.cs
new file mode 100644
index 0000000000..77c34b8ad7
--- /dev/null
+++ b/osu.Game/Skinning/IBeatmapSkin.cs
@@ -0,0 +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.
+
+namespace osu.Game.Skinning
+{
+    public interface IBeatmapSkin : ISkin
+    {
+    }
+}
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index d647bc4a2d..d53349dd11 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyBeatmapSkin : LegacySkin
+    public class LegacyBeatmapSkin : LegacySkin, IBeatmapSkin
     {
         protected override bool AllowManiaSkin => false;
         protected override bool UseCustomSampleBanks => true;
diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index ab4fb38657..db080d889f 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Tests.Beatmaps
                 this.resourceStore = resourceStore;
             }
 
-            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, AudioManager);
+            protected override IBeatmapSkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, AudioManager);
         }
     }
 }

From 1b81415a16e82131bb170f5473202112a82182ab Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 29 Aug 2020 10:50:25 +0200
Subject: [PATCH 04437/10326] Correct comment

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

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 996d495e17..1e3755c186 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("sample playback rate matches mod rates", () => sample.Channel.AggregateFrequency.Value == expectedRate);
         }
 
-        // TODO: adding IBeatmapSkin changes are as minimal as possible, but this shouldn't exist or should be reworked to work with LegacyBeatmapSkin
+        // TODO: adding IBeatmapSkin to keep changes as minimal as possible, but this shouldn't exist or should be reworked to inherit LegacyBeatmapSkin
         private class TestSkin : LegacySkin, IBeatmapSkin
         {
             public TestSkin(string resourceName, AudioManager audioManager)

From 08329aa382d7afd64e9ce5afe30a94d55d0557ec Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 29 Aug 2020 11:05:10 +0200
Subject: [PATCH 04438/10326] Remove comment again

---
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 1e3755c186..bc9528beb6 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -116,7 +116,6 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("sample playback rate matches mod rates", () => sample.Channel.AggregateFrequency.Value == expectedRate);
         }
 
-        // TODO: adding IBeatmapSkin to keep changes as minimal as possible, but this shouldn't exist or should be reworked to inherit LegacyBeatmapSkin
         private class TestSkin : LegacySkin, IBeatmapSkin
         {
             public TestSkin(string resourceName, AudioManager audioManager)

From 82acb3506cbc36a0546ff77fc76c20d8854bb2ed Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 29 Aug 2020 11:07:28 +0200
Subject: [PATCH 04439/10326] Add and change xmldocs

---
 osu.Game/Beatmaps/IWorkingBeatmap.cs | 2 +-
 osu.Game/Skinning/IBeatmapSkin.cs    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index dac9389822..aac41725a9 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Beatmaps
         Storyboard Storyboard { get; }
 
         /// <summary>
-        /// Retrieves the <see cref="Skin"/> which this <see cref="WorkingBeatmap"/> provides.
+        /// Retrieves the <see cref="IBeatmapSkin"/> which this <see cref="WorkingBeatmap"/> provides.
         /// </summary>
         IBeatmapSkin Skin { get; }
 
diff --git a/osu.Game/Skinning/IBeatmapSkin.cs b/osu.Game/Skinning/IBeatmapSkin.cs
index 77c34b8ad7..91caaed557 100644
--- a/osu.Game/Skinning/IBeatmapSkin.cs
+++ b/osu.Game/Skinning/IBeatmapSkin.cs
@@ -3,6 +3,9 @@
 
 namespace osu.Game.Skinning
 {
+    /// <summary>
+    /// Marker interface for skins that originate from beatmaps.
+    /// </summary>
     public interface IBeatmapSkin : ISkin
     {
     }

From 658a1d159f03df2a55339c5eab7e11085c75ac43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Aug 2020 11:45:59 +0200
Subject: [PATCH 04440/10326] Add legacy flag value for mirror mod

---
 osu.Game/Beatmaps/Legacy/LegacyMods.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Beatmaps/Legacy/LegacyMods.cs b/osu.Game/Beatmaps/Legacy/LegacyMods.cs
index 583e950e49..0e517ea3df 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyMods.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyMods.cs
@@ -38,5 +38,6 @@ namespace osu.Game.Beatmaps.Legacy
         Key1 = 1 << 26,
         Key3 = 1 << 27,
         Key2 = 1 << 28,
+        Mirror = 1 << 30,
     }
 }

From 58742afd99f131baeb23f0bc85b8161da1559847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Aug 2020 11:47:31 +0200
Subject: [PATCH 04441/10326] Add failing test case

---
 osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
index 957743c5f1..b22687a0a7 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(ManiaModPerfect) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath | LegacyMods.DoubleTime, new[] { typeof(ManiaModDoubleTime), typeof(ManiaModPerfect) })]
         [TestCase(LegacyMods.Random | LegacyMods.SuddenDeath, new[] { typeof(ManiaModRandom), typeof(ManiaModSuddenDeath) })]
+        [TestCase(LegacyMods.Flashlight | LegacyMods.Mirror, new[] { typeof(ManiaModFlashlight), typeof(ManiaModMirror) })]
         public new void Test(LegacyMods legacyMods, Type[] expectedMods) => base.Test(legacyMods, expectedMods);
 
         protected override Ruleset CreateRuleset() => new ManiaRuleset();

From da82556f6b647dff1d17b384c4061d80665b0393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Aug 2020 11:49:17 +0200
Subject: [PATCH 04442/10326] Add two-way legacy conversions for mirror mod

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index f7098faa5d..37b34d1721 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -126,6 +126,9 @@ namespace osu.Game.Rulesets.Mania
 
             if (mods.HasFlag(LegacyMods.Random))
                 yield return new ManiaModRandom();
+
+            if (mods.HasFlag(LegacyMods.Mirror))
+                yield return new ManiaModMirror();
         }
 
         public override LegacyMods ConvertToLegacyMods(Mod[] mods)
@@ -175,6 +178,10 @@ namespace osu.Game.Rulesets.Mania
                     case ManiaModFadeIn _:
                         value |= LegacyMods.FadeIn;
                         break;
+
+                    case ManiaModMirror _:
+                        value |= LegacyMods.Mirror;
+                        break;
                 }
             }
 

From 9ce9ba3a0d1906448611749a0dc391dcf3944e3d Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 29 Aug 2020 13:50:29 +0200
Subject: [PATCH 04443/10326] Update TestSceneSkinFallbacks.cs

---
 .../TestSceneSkinFallbacks.cs                        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index c3c19de17c..0fe8949360 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         public TestSceneSkinFallbacks()
         {
             testUserSkin = new TestSource("user");
-            testBeatmapSkin = new TestSource("beatmap");
+            testBeatmapSkin = new BeatmapTestSource();
         }
 
         [Test]
@@ -85,7 +85,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             public CustomSkinWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock frameBasedClock, AudioManager audio, ISkinSource skin)
                 : base(beatmap, storyboard, frameBasedClock, audio)
             {
-                if (!(skinSource is IBeatmapSkin))
+                if (!(skin is IBeatmapSkin))
                     throw new ArgumentException("The provided skin source must be of type IBeatmapSkin.");
 
                 skinSource = skin;
@@ -115,6 +115,14 @@ namespace osu.Game.Rulesets.Osu.Tests
             }
         }
 
+        public class BeatmapTestSource : TestSource, IBeatmapSkin
+        {
+            public BeatmapTestSource()
+                : base("beatmap")
+            {
+            }
+        }
+
         public class TestSource : ISkinSource
         {
             private readonly string identifier;

From 43e91877a71c3451f4b9617212dbd0c38f7bdb2f Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 29 Aug 2020 14:47:26 +0200
Subject: [PATCH 04444/10326] Scope and limit parameter to IBeatmapSkin

---
 .../TestSceneSkinFallbacks.cs                     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 0fe8949360..64da80a88e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.Tests
     public class TestSceneSkinFallbacks : TestSceneOsuPlayer
     {
         private readonly TestSource testUserSkin;
-        private readonly TestSource testBeatmapSkin;
+        private readonly BeatmapTestSource testBeatmapSkin;
 
         public TestSceneSkinFallbacks()
         {
@@ -80,18 +80,15 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         public class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
         {
-            private readonly ISkinSource skinSource;
+            private readonly IBeatmapSkin skin;
 
-            public CustomSkinWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock frameBasedClock, AudioManager audio, ISkinSource skin)
+            public CustomSkinWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock frameBasedClock, AudioManager audio, IBeatmapSkin skin)
                 : base(beatmap, storyboard, frameBasedClock, audio)
             {
-                if (!(skin is IBeatmapSkin))
-                    throw new ArgumentException("The provided skin source must be of type IBeatmapSkin.");
-
-                skinSource = skin;
+                this.skin = skin;
             }
 
-            protected override IBeatmapSkin GetSkin() => (IBeatmapSkin)skinSource;
+            protected override IBeatmapSkin GetSkin() => skin;
         }
 
         public class SkinProvidingPlayer : TestPlayer
@@ -115,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             }
         }
 
-        public class BeatmapTestSource : TestSource, IBeatmapSkin
+        private class BeatmapTestSource : TestSource, IBeatmapSkin
         {
             public BeatmapTestSource()
                 : base("beatmap")

From 69fae0f4122ad64b9c25bdc83ccd4e9cb00c34ba Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 29 Aug 2020 09:30:56 -0700
Subject: [PATCH 04445/10326] Add failing replay download button test

---
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 74808bc2f5..a86fa05129 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -13,6 +13,7 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
@@ -212,6 +213,25 @@ namespace osu.Game.Tests.Visual.Ranking
             AddAssert("expanded panel still on screen", () => this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded).ScreenSpaceDrawQuad.TopLeft.X > 0);
         }
 
+        [Test]
+        public void TestDownloadButtonInitallyDisabled()
+        {
+            TestResultsScreen screen = null;
+
+            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
+
+            AddAssert("download button is disabled", () => !screen.ChildrenOfType<DownloadButton>().First().Enabled.Value);
+
+            AddStep("click contracted panel", () =>
+            {
+                var contractedPanel = this.ChildrenOfType<ScorePanel>().First(p => p.State == PanelState.Contracted && p.ScreenSpaceDrawQuad.TopLeft.X > screen.ScreenSpaceDrawQuad.TopLeft.X);
+                InputManager.MoveMouseTo(contractedPanel);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("download button is enabled", () => screen.ChildrenOfType<DownloadButton>().First().Enabled.Value);
+        }
+
         private class TestResultsContainer : Container
         {
             [Cached(typeof(Player))]
@@ -255,6 +275,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 {
                     var score = new TestScoreInfo(new OsuRuleset().RulesetInfo);
                     score.TotalScore += 10 - i;
+                    score.Hash = $"test{i}";
                     scores.Add(score);
                 }
 

From 0a643fd5e5a4f8b6e5b92f0a27ffe6995fc26b2c Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 29 Aug 2020 09:33:01 -0700
Subject: [PATCH 04446/10326] Fix replay download button always being disabled
 when initial score's replay is unavailable

---
 .../Screens/Ranking/ReplayDownloadButton.cs   | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index d0142e57fe..b76842f405 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -74,23 +74,33 @@ namespace osu.Game.Screens.Ranking
             {
                 button.State.Value = state.NewValue;
 
-                switch (replayAvailability)
-                {
-                    case ReplayAvailability.Local:
-                        button.TooltipText = @"watch replay";
-                        break;
-
-                    case ReplayAvailability.Online:
-                        button.TooltipText = @"download replay";
-                        break;
-
-                    default:
-                        button.TooltipText = @"replay unavailable";
-                        break;
-                }
+                updateTooltip();
             }, true);
 
-            button.Enabled.Value = replayAvailability != ReplayAvailability.NotAvailable;
+            Model.BindValueChanged(_ =>
+            {
+                button.Enabled.Value = replayAvailability != ReplayAvailability.NotAvailable;
+
+                updateTooltip();
+            }, true);
+        }
+
+        private void updateTooltip()
+        {
+            switch (replayAvailability)
+            {
+                case ReplayAvailability.Local:
+                    button.TooltipText = @"watch replay";
+                    break;
+
+                case ReplayAvailability.Online:
+                    button.TooltipText = @"download replay";
+                    break;
+
+                default:
+                    button.TooltipText = @"replay unavailable";
+                    break;
+            }
         }
 
         private enum ReplayAvailability

From 5949a281fc54e94b34843ec5d91d8b819b1851b4 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 27 Aug 2020 19:29:18 +0200
Subject: [PATCH 04447/10326] Make Introduce bindable property
 OverlayActivationMode in OsuScreen

---
 osu.Game/OsuGame.cs            | 5 ++++-
 osu.Game/Screens/IOsuScreen.cs | 4 ++--
 osu.Game/Screens/OsuScreen.cs  | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 053eb01dcd..6a390942b7 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -972,9 +972,12 @@ namespace osu.Game
                     break;
             }
 
+            if (current is IOsuScreen currentOsuScreen)
+                OverlayActivationMode.UnbindFrom(currentOsuScreen.OverlayActivationMode);
+
             if (newScreen is IOsuScreen newOsuScreen)
             {
-                OverlayActivationMode.Value = newOsuScreen.InitialOverlayActivationMode;
+                OverlayActivationMode.BindTo(newOsuScreen.OverlayActivationMode);
 
                 MusicController.AllowRateAdjustments = newOsuScreen.AllowRateAdjustments;
 
diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index 761f842c22..c9dce310af 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -39,9 +39,9 @@ namespace osu.Game.Screens
         bool HideOverlaysOnEnter { get; }
 
         /// <summary>
-        /// Whether overlays should be able to be opened once this screen is entered or resumed.
+        /// Whether overlays should be able to be opened when this screen is current.
         /// </summary>
-        OverlayActivation InitialOverlayActivationMode { get; }
+        public Bindable<OverlayActivation> OverlayActivationMode { get; }
 
         /// <summary>
         /// The amount of parallax to be applied while this screen is displayed.
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 872a1cd39a..c687c34ce9 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -44,10 +44,12 @@ namespace osu.Game.Screens
         public virtual bool HideOverlaysOnEnter => false;
 
         /// <summary>
-        /// Whether overlays should be able to be opened once this screen is entered or resumed.
+        /// The initial initial overlay activation mode to use when this screen is entered for the first time.
         /// </summary>
         public virtual OverlayActivation InitialOverlayActivationMode => OverlayActivation.All;
 
+        public Bindable<OverlayActivation> OverlayActivationMode { get; }
+
         public virtual bool CursorVisible => true;
 
         protected new OsuGameBase Game => base.Game as OsuGameBase;
@@ -138,6 +140,8 @@ namespace osu.Game.Screens
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
+
+            OverlayActivationMode = new Bindable<OverlayActivation>(InitialOverlayActivationMode);
         }
 
         [BackgroundDependencyLoader(true)]

From ad223bc460ea0d1a6a4d07a86d17cfa3ad0b5b38 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 27 Aug 2020 20:07:24 +0200
Subject: [PATCH 04448/10326] Make game bindable immutable.

---
 osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs            | 7 ++++++-
 osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs | 2 +-
 osu.Game/OsuGame.cs                                        | 2 +-
 osu.Game/Overlays/Toolbar/Toolbar.cs                       | 2 +-
 osu.Game/Screens/Menu/ButtonSystem.cs                      | 3 ---
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index f819ae4682..841860accb 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -91,7 +91,12 @@ namespace osu.Game.Tests.Visual.Menus
 
         public class TestToolbar : Toolbar
         {
-            public new Bindable<OverlayActivation> OverlayActivationMode => base.OverlayActivationMode;
+            public TestToolbar()
+            {
+                base.OverlayActivationMode.BindTo(OverlayActivationMode);
+            }
+
+            public new Bindable<OverlayActivation> OverlayActivationMode { get; } = new Bindable<OverlayActivation>(OverlayActivation.All);
         }
     }
 }
diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 93ac69bdbf..751ccc8f15 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Graphics.Containers
         [Resolved]
         private PreviewTrackManager previewTrackManager { get; set; }
 
-        protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
+        protected readonly IBindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio)
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6a390942b7..e6d96df927 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -88,7 +88,7 @@ namespace osu.Game
 
         private IdleTracker idleTracker;
 
-        public readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>();
+        public readonly IBindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>();
 
         protected OsuScreenStack ScreenStack;
 
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 3bf9e85428..393e349bd0 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Toolbar
 
         private const double transition_time = 500;
 
-        protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
+        protected readonly IBindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
         // Toolbar components like RulesetSelector should receive keyboard input events even when the toolbar is hidden.
         public override bool PropagateNonPositionalInputSubTree => true;
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 5ba7a8ddc3..4becdd58cd 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -270,9 +270,6 @@ namespace osu.Game.Screens.Menu
                 ButtonSystemState lastState = state;
                 state = value;
 
-                if (game != null)
-                    game.OverlayActivationMode.Value = state == ButtonSystemState.Exit ? OverlayActivation.Disabled : OverlayActivation.All;
-
                 updateLogoState(lastState);
 
                 Logger.Log($"{nameof(ButtonSystem)}'s state changed from {lastState} to {state}");

From 8de7744b52e98d0e42a9b88ec08b10ac1a5c2f6f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 28 Aug 2020 09:55:14 +0200
Subject: [PATCH 04449/10326] Add back disabling of overlays on exiting game.

---
 osu.Game/Screens/Menu/MainMenu.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 57252d557e..859184834b 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -280,6 +280,7 @@ namespace osu.Game.Screens.Menu
             }
 
             buttons.State = ButtonSystemState.Exit;
+            OverlayActivationMode.Value = OverlayActivation.Disabled;
 
             songTicker.Hide();
 

From 03b7c8b88969ae337ac52bcddd56c0c5d034f111 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 29 Aug 2020 19:39:50 +0200
Subject: [PATCH 04450/10326] Remove unneeded access modifier.

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

diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index c9dce310af..ead8e4bc22 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens
         /// <summary>
         /// Whether overlays should be able to be opened when this screen is current.
         /// </summary>
-        public Bindable<OverlayActivation> OverlayActivationMode { get; }
+        Bindable<OverlayActivation> OverlayActivationMode { get; }
 
         /// <summary>
         /// The amount of parallax to be applied while this screen is displayed.

From e0eece11b1cde8e12856b33c5050335605b8c3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Aug 2020 20:13:03 +0200
Subject: [PATCH 04451/10326] Fix typo in test name

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

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index a86fa05129..49fa581108 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -214,7 +214,7 @@ namespace osu.Game.Tests.Visual.Ranking
         }
 
         [Test]
-        public void TestDownloadButtonInitallyDisabled()
+        public void TestDownloadButtonInitiallyDisabled()
         {
             TestResultsScreen screen = null;
 

From 13df0783fe091b3171cf37972df3aa5a62c0d267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Aug 2020 20:23:22 +0200
Subject: [PATCH 04452/10326] Use Single() instead of First() where applicable

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

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 49fa581108..03cb5fa3db 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.Visual.Ranking
 
             AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
 
-            AddAssert("download button is disabled", () => !screen.ChildrenOfType<DownloadButton>().First().Enabled.Value);
+            AddAssert("download button is disabled", () => !screen.ChildrenOfType<DownloadButton>().Single().Enabled.Value);
 
             AddStep("click contracted panel", () =>
             {
@@ -229,7 +229,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("download button is enabled", () => screen.ChildrenOfType<DownloadButton>().First().Enabled.Value);
+            AddAssert("download button is enabled", () => screen.ChildrenOfType<DownloadButton>().Single().Enabled.Value);
         }
 
         private class TestResultsContainer : Container

From d22768a98cba3c9d312ba2408536905371840668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Aug 2020 23:20:59 +0200
Subject: [PATCH 04453/10326] Add scale specification to spinner scene for
 visibility

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 47b3926ceb..94d1cb8864 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -9,6 +9,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -62,7 +63,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             drawableSpinner = new TestDrawableSpinner(spinner, auto)
             {
                 Anchor = Anchor.Centre,
-                Depth = depthIndex++
+                Depth = depthIndex++,
+                Scale = new Vector2(0.75f)
             };
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObjects>())

From c9723e541a464c84b8e3e5c27e94af4f0c3fd32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Aug 2020 23:21:19 +0200
Subject: [PATCH 04454/10326] Add metrics skin resources for old style spinner

---
 .../metrics-skin/spinner-background@2x.png      | Bin 0 -> 14515 bytes
 .../metrics-skin/spinner-circle@2x.png          | Bin 0 -> 6561 bytes
 .../Resources/metrics-skin/spinner-metre@2x.png | Bin 0 -> 14516 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-background@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-circle@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-metre@2x.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-background@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-background@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f50f638c5de06d711fc7d09a3a4ee13618cd59e
GIT binary patch
literal 14515
zcmeHNO)G>^6n=(b#_-liY7o6PHa3!?BrnZ0Grp3Pln{j-@{v*u+4u)Seu8Xl*pOm;
z6rvQ$EbPd_Mxi)&ym$V<Y%tHM>7L$?+uU=Wd(Lz2dzRbVf`+Hi1HcG}{2hQ>)Qk~#
zrVQ0L^+z&f4m1b-G6G-M4V|wtW{riqCxGlc^>bi#-6t1ali}8Y>(O1DpIcjAr!JWY
z`x`oEZlCY>4U~EhteVUD)7h#1p{D5F$;S4OL(M7D_0jU90B<tok600{A<d~(uc@^N
z^xJT%zZ@6SvK7FQrd79BYn&3aB|s2?y9W##5}+9`nJ6UXGeeRZkQxY0BsCy45E!tc
zAT<yeu!bZx07wl;4M+{d0)Lts#8zYhGq)=+2iKIg=29zCl1%k8H~kWG0!s_N#gFsn
zlHtn6hoFPGQ>@C|nG~>iHlwyCK|~OdfT^9pPhdQo`P&4{QZSASqk2k3_0NLiL%>(1
zdI7}$^nOZtpB`5+FPR$i_ml!#WwMmsqIiqWMJ&;OLvBKDLT;kAIlmi$EhYbp;`HoJ
zo9P1Wis-|8N#D2}cJ4(K)Z>z#XtK;n^k7z)_Dw!W^Jpj#6xtFXD6}aE3T+93g6YG?
s0<$YQg$)J9N5)6n0;Ja(3XG2_6dx^P)VSK|ID1mw4+q-(n~nX8-{y?j8UO$Q

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-circle@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-circle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..daf28e09cbe6bbb7fc531b4773e4d381054e65cf
GIT binary patch
literal 6561
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
U!O2zVX9|qE*U6@05B=Bw0VYd*8vp<R

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-metre@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-metre@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ef1068420cf8abb9b12781061801321e3ea298c
GIT binary patch
literal 14516
zcmeHNPbh<N7=AXNZEVXVg-l=6&Mv0qVAEt@B1y@~zZAC>n&Wa)oHgy>;=0`AK-hts
z0}&;PqoOHpc;DH#+pbEUxAuGAw(tA4-aXIrzP~?fBf|s!+Ll@Xek&0l1w0Z~&wE_r
zy03dr#kpn%2jb#^ugln2L3~XzF|i1E8}#MCR<=prbT3&${q84Eu+bY?Zgal?CaidD
zY~}X(_P8FVFTZ>8*|QmWwK|?MZ<!m1+*4?k0fE$zI<+r(<c~$ub_AzkhXK=$($M>h
zX6R2Yni(wxfWv8ro`4<kkzg(bZl(<gf(RgcK-r*PiX^a5fEAJzQkcLB3AP4o4TK47
z4cHp6HINLjHIN)|A%d*|*cu2ExN6YWlS(?_%SYFv@00s?kL?=|AJY})kXHt9v~X^q
zc~+JsAHsDisA_Dq$tHmT*~CU$V8A_#3i>JX`D4^e>ZKrodP%($7*H?&f?n3|1m}RJ
zE<Fn%e;RjLxRfF=;8F@Ff0dR}rt~;aHXM=>+s9Sv)L8Xd^#um3`mCYcj!;4TjT)N1
z&jru)%Y22s!_)CrId$nPpSSEZ^%J$DbkXThRX%yi3+<#ZJp@Gw3*?MV3MvJKw1frf
pBlVH`Sj+&aKq`<5q=IJP-%q8CgOLB?u=&}m*|7SD<GH@6)o)L?*O~wT

literal 0
HcmV?d00001


From 3ab32a5d35ab4768f4ddb71e862de6b9d9b7f182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Aug 2020 23:29:29 +0200
Subject: [PATCH 04455/10326] Change structure of old style spinner to be
 closer to stable

---
 .../Skinning/LegacyOldStyleSpinner.cs         | 85 +++++++++++--------
 1 file changed, 51 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 81a0df5ea5..e157842fd1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -22,11 +22,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
     {
         private DrawableSpinner drawableSpinner;
         private Sprite disc;
+        private Sprite metreSprite;
         private Container metre;
 
-        private const float background_y_offset = 20;
-
         private const float sprite_scale = 1 / 1.6f;
+        private const float final_metre_height = 692 * sprite_scale;
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
@@ -35,50 +35,58 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             RelativeSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
+            InternalChild = new Container
             {
-                new Sprite
+                // the old-style spinner relied heavily on absolute screen-space coordinate values.
+                // wrap everything in a container simulating absolute coords to preserve alignment
+                // as there are skins that depend on it.
+                Width = 640,
+                Height = 480,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    Texture = source.GetTexture("spinner-background"),
-                    Y = background_y_offset,
-                    Scale = new Vector2(sprite_scale)
-                },
-                disc = new Sprite
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Texture = source.GetTexture("spinner-circle"),
-                    Scale = new Vector2(sprite_scale)
-                },
-                metre = new Container
-                {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    Y = background_y_offset,
-                    Masking = true,
-                    Child = new Sprite
+                    new Sprite
                     {
-                        Texture = source.GetTexture("spinner-metre"),
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.BottomCentre,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-background"),
+                        Scale = new Vector2(sprite_scale)
                     },
-                    Scale = new Vector2(0.625f)
+                    disc = new Sprite
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-circle"),
+                        Scale = new Vector2(sprite_scale)
+                    },
+                    metre = new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        // this anchor makes no sense, but that's what stable uses.
+                        Anchor = Anchor.TopLeft,
+                        Origin = Anchor.TopLeft,
+                        // adjustment for stable (metre has additional offset)
+                        Margin = new MarginPadding { Top = 20 },
+                        Masking = true,
+                        Child = metreSprite = new Sprite
+                        {
+                            Texture = source.GetTexture("spinner-metre"),
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                            Scale = new Vector2(0.625f)
+                        }
+                    }
                 }
             };
         }
 
-        private Vector2 metreFinalSize;
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
             this.FadeOut();
             drawableSpinner.State.BindValueChanged(updateStateTransforms, true);
-
-            metreFinalSize = metre.Size = metre.Child.Size;
         }
 
         private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
@@ -93,7 +101,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             base.Update();
             disc.Rotation = drawableSpinner.RotationTracker.Rotation;
-            metre.Height = getMetreHeight(drawableSpinner.Progress);
+
+            // careful: need to call this exactly once for all calculations in a frame
+            // as the function has a random factor in it
+            var metreHeight = getMetreHeight(drawableSpinner.Progress);
+
+            // hack to make the metre blink up from below than down from above.
+            // move down the container to be able to apply masking for the metre,
+            // and then move the sprite back up the same amount to keep its position absolute.
+            metre.Y = final_metre_height - metreHeight;
+            metreSprite.Y = -metre.Y;
         }
 
         private const int total_bars = 10;
@@ -108,7 +125,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             if (RNG.NextBool(((int)progress % 10) / 10f))
                 barCount++;
 
-            return (float)barCount / total_bars * metreFinalSize.Y;
+            return (float)barCount / total_bars * final_metre_height;
         }
     }
 }

From e428144f736cdbbb818f9c001d31866fb975b1f2 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 11:34:50 +0200
Subject: [PATCH 04456/10326] Use IBeatmapSkin

---
 .../Beatmaps/Formats/LegacyBeatmapEncoderTest.cs       |  4 ++--
 osu.Game/Beatmaps/BeatmapManager.cs                    | 10 +---------
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs      |  9 +++------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index dee4626cd0..8d5060e2fe 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             Assert.IsTrue(decoded.beatmapSkin.Configuration.Equals(decodedAfterEncode.beatmapSkin.Configuration));
         }
 
-        private void sort((IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) tuple)
+        private void sort((IBeatmap beatmap, IBeatmapSkin beatmapSkin) tuple)
         {
             // Sort control points to ensure a sane ordering, as they may be parsed in different orders. This works because each group contains only uniquely-typed control points.
             foreach (var g in tuple.beatmap.ControlPointInfo.Groups)
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private Stream encodeToLegacy((IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) fullBeatmap)
+        private Stream encodeToLegacy((IBeatmap beatmap, IBeatmapSkin beatmapSkin) fullBeatmap)
         {
             var (beatmap, beatmapSkin) = fullBeatmap;
             var stream = new MemoryStream();
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 86d35749ac..89a776dd31 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -196,22 +196,14 @@ namespace osu.Game.Beatmaps
         /// <param name="info">The <see cref="BeatmapInfo"/> to save the content against. The file referenced by <see cref="BeatmapInfo.Path"/> will be replaced.</param>
         /// <param name="beatmapContent">The <see cref="IBeatmap"/> content to write.</param>
         /// <param name="beatmapSkin">The beatmap <see cref="ISkin"/> content to write, or null if not to be changed.</param>
-        public void Save(BeatmapInfo info, IBeatmap beatmapContent, LegacyBeatmapSkin beatmapSkin = null)
+        public void Save(BeatmapInfo info, IBeatmap beatmapContent, IBeatmapSkin beatmapSkin = null)
         {
             var setInfo = QueryBeatmapSet(s => s.Beatmaps.Any(b => b.ID == info.ID));
 
             using (var stream = new MemoryStream())
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                {
-                    if (beatmapSkin == null)
-                    {
-                        var workingBeatmap = GetWorkingBeatmap(info);
-                        beatmapSkin = (workingBeatmap.Skin is LegacyBeatmapSkin legacy) ? legacy : null;
-                    }
-
                     new LegacyBeatmapEncoder(beatmapContent, beatmapSkin).Encode(sw);
-                }
 
                 stream.Seek(0, SeekOrigin.Begin);
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 497c3c88d0..543d960300 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -25,14 +25,14 @@ namespace osu.Game.Beatmaps.Formats
         public const int LATEST_VERSION = 128;
 
         private readonly IBeatmap beatmap;
-        private readonly LegacyBeatmapSkin skin;
+        private readonly IBeatmapSkin skin;
 
         /// <summary>
         /// Creates a new <see cref="LegacyBeatmapEncoder"/>.
         /// </summary>
         /// <param name="beatmap">The beatmap to encode.</param>
         /// <param name="skin">An optional skin, for encoding the beatmap's combo colours.</param>
-        public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] LegacyBeatmapSkin skin)
+        public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] IBeatmapSkin skin)
         {
             this.beatmap = beatmap;
             this.skin = skin;
@@ -211,10 +211,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleComboColours(TextWriter writer)
         {
-            if (!(skin is LegacyBeatmapSkin legacySkin))
-                return;
-
-            var colours = legacySkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+            var colours = skin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
 
             if (colours == null || colours.Count == 0)
                 return;

From 08321d8dec457381c1e52cab064dd304e309a1ac Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 11:37:43 +0200
Subject: [PATCH 04457/10326] Safe checking against ComboColours instead of
 CustomColours

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

diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index 2ac4dfa0c8..0f6162d6c4 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -51,6 +51,6 @@ namespace osu.Game.Skinning
 
         public readonly SortedDictionary<string, string> ConfigDictionary = new SortedDictionary<string, string>();
 
-        public bool Equals(SkinConfiguration other) => other != null && ConfigDictionary.SequenceEqual(other.ConfigDictionary) && ComboColours.SequenceEqual(other.ComboColours) && CustomColours?.SequenceEqual(other.CustomColours) == true;
+        public bool Equals(SkinConfiguration other) => other != null && ConfigDictionary.SequenceEqual(other.ConfigDictionary) && ComboColours?.SequenceEqual(other.ComboColours) == true && CustomColours.SequenceEqual(other.CustomColours);
     }
 }

From f5c82d41eb010912aebd758db6c4b3e9677ac01a Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 16:06:48 +0200
Subject: [PATCH 04458/10326] Remove if-cast

---
 osu.Game/Screens/Edit/Editor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 7bd6529897..273ae67ffd 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Edit
         private IBeatmap playableBeatmap;
         private EditorBeatmap editorBeatmap;
         private EditorChangeHandler changeHandler;
-        private LegacyBeatmapSkin beatmapSkin;
+        private IBeatmapSkin beatmapSkin;
 
         private DependencyContainer dependencies;
 
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Edit
             AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap));
             dependencies.CacheAs(editorBeatmap);
 
-            beatmapSkin = (Beatmap.Value.Skin is LegacyBeatmapSkin legacy) ? legacy : null;
+            beatmapSkin = Beatmap.Value.Skin;
             changeHandler = new EditorChangeHandler(editorBeatmap, beatmapSkin);
             dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
 

From b39ec74bb812f5c582936cb2ca9877700d786968 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 16:07:06 +0200
Subject: [PATCH 04459/10326] Scope down to IBeatmapSkin in EditorChangeHandler

---
 osu.Game/Screens/Edit/EditorChangeHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 1d10eaf5cb..60d869ec82 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Edit
         private int currentState = -1;
 
         private readonly EditorBeatmap editorBeatmap;
-        private readonly LegacyBeatmapSkin beatmapSkin;
+        private readonly IBeatmapSkin beatmapSkin;
         private int bulkChangesStarted;
         private bool isRestoring;
 
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         /// <param name="editorBeatmap">The <see cref="EditorBeatmap"/> to track the <see cref="HitObject"/>s of.</param>
         /// <param name="beatmapSkin">The skin to track the inline skin configuration of.</param>
-        public EditorChangeHandler(EditorBeatmap editorBeatmap, LegacyBeatmapSkin beatmapSkin)
+        public EditorChangeHandler(EditorBeatmap editorBeatmap, IBeatmapSkin beatmapSkin)
         {
             this.editorBeatmap = editorBeatmap;
 

From 7e57af3ca437b5ae7a053051eb3b64cc1c0bc0e4 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 16:07:46 +0200
Subject: [PATCH 04460/10326] Return true if both ComboColours are null

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

diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index 0f6162d6c4..18d970dd64 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -51,6 +51,6 @@ namespace osu.Game.Skinning
 
         public readonly SortedDictionary<string, string> ConfigDictionary = new SortedDictionary<string, string>();
 
-        public bool Equals(SkinConfiguration other) => other != null && ConfigDictionary.SequenceEqual(other.ConfigDictionary) && ComboColours?.SequenceEqual(other.ComboColours) == true && CustomColours.SequenceEqual(other.CustomColours);
+        public bool Equals(SkinConfiguration other) => other != null && ConfigDictionary.SequenceEqual(other.ConfigDictionary) && ((ComboColours == null && other.ComboColours == null) || ComboColours.SequenceEqual(other.ComboColours)) && CustomColours.SequenceEqual(other.CustomColours);
     }
 }

From 1fdf8e62004f59ec098a793c6d1a8591cf053b37 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 16:07:58 +0200
Subject: [PATCH 04461/10326] Fix xmldoc in LegacyBeatmapEncoder

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

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 543d960300..8d7e509070 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Beatmaps.Formats
         /// Creates a new <see cref="LegacyBeatmapEncoder"/>.
         /// </summary>
         /// <param name="beatmap">The beatmap to encode.</param>
-        /// <param name="skin">An optional skin, for encoding the beatmap's combo colours.</param>
+        /// <param name="skin">The beatmap's skin, used for encoding combo colours.</param>
         public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] IBeatmapSkin skin)
         {
             this.beatmap = beatmap;

From 919d7b77855435bc90df339ac3c939550145ca96 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 16:08:13 +0200
Subject: [PATCH 04462/10326] Remove redundant call to TestResources

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 8d5060e2fe..b25f2f1fd3 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         [TestCaseSource(nameof(allBeatmaps))]
         public void TestEncodeDecodeStability(string name)
         {
-            var decoded = decodeFromLegacy(TestResources.GetStore().GetStream(name), name);
+            var decoded = decodeFromLegacy(beatmaps_resource_store.GetStream(name), name);
             var decodedAfterEncode = decodeFromLegacy(encodeToLegacy(decoded), name);
 
             sort(decoded);

From 337037ab3b0f33474c1d9cc829b25b169a49337d Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 16:08:52 +0200
Subject: [PATCH 04463/10326] Make test load actual beatmap's skin
 configuration

---
 .../Formats/LegacyBeatmapEncoderTest.cs        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index b25f2f1fd3..bea21087c5 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             sort(decodedAfterEncode);
 
             Assert.That(decodedAfterEncode.beatmap.Serialize(), Is.EqualTo(decoded.beatmap.Serialize()));
-            Assert.IsTrue(decoded.beatmapSkin.Configuration.Equals(decodedAfterEncode.beatmapSkin.Configuration));
+            Assert.IsTrue(decodedAfterEncode.beatmapSkin.Configuration.Equals(decoded.beatmapSkin.Configuration));
         }
 
         private void sort((IBeatmap beatmap, IBeatmapSkin beatmapSkin) tuple)
@@ -55,11 +55,13 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private (IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) decodeFromLegacy(Stream stream, string name)
+        private (IBeatmap beatmap, TestLegacySkin beatmapSkin) decodeFromLegacy(Stream stream, string name)
         {
             using (var reader = new LineBufferedReader(stream))
             {
                 var beatmap = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(reader);
+
+                beatmap.BeatmapInfo.Path = name;
                 beatmap.BeatmapInfo.BeatmapSet = new BeatmapSetInfo
                 {
                     Files = new List<BeatmapSetFileInfo>
@@ -69,14 +71,22 @@ namespace osu.Game.Tests.Beatmaps.Formats
                             Filename = name,
                             FileInfo = new osu.Game.IO.FileInfo { Hash = name }
                         }
-                    }
+                    },
                 };
 
-                var beatmapSkin = new LegacyBeatmapSkin(beatmap.BeatmapInfo, beatmaps_resource_store, null);
+                var beatmapSkin = new TestLegacySkin(beatmap, beatmaps_resource_store, name);
                 return (convert(beatmap), beatmapSkin);
             }
         }
 
+        private class TestLegacySkin : LegacySkin, IBeatmapSkin
+        {
+            public TestLegacySkin(Beatmap beatmap, IResourceStore<byte[]> storage, string fileName)
+                : base(new SkinInfo() { Name = "Test Skin", Creator = "Craftplacer" }, storage, null, fileName)
+            {
+            }
+        }
+
         private Stream encodeToLegacy((IBeatmap beatmap, IBeatmapSkin beatmapSkin) fullBeatmap)
         {
             var (beatmap, beatmapSkin) = fullBeatmap;

From 7e668fc31a619ca1d89dc6532898433bf40efe07 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 16:11:49 +0200
Subject: [PATCH 04464/10326] Update
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs

Co-authored-by: Salman Ahmed <email@iisalman.me>
---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 8d7e509070..cae6a43cd4 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -226,7 +226,8 @@ namespace osu.Game.Beatmaps.Formats
                 writer.Write(FormattableString.Invariant($"{(byte)(comboColour.R * byte.MaxValue)},"));
                 writer.Write(FormattableString.Invariant($"{(byte)(comboColour.G * byte.MaxValue)},"));
                 writer.Write(FormattableString.Invariant($"{(byte)(comboColour.B * byte.MaxValue)},"));
-                writer.WriteLine(FormattableString.Invariant($"{(byte)(comboColour.A * byte.MaxValue)}"));
+                writer.Write(FormattableString.Invariant($"{(byte)(comboColour.A * byte.MaxValue)}"));
+                writer.WriteLine();
             }
         }
 

From 43d144b7c00756a0cb0d94a7c88750614fcd97f6 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 16:23:00 +0200
Subject: [PATCH 04465/10326] Remove empty argument list

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index bea21087c5..dc91af72e8 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         private class TestLegacySkin : LegacySkin, IBeatmapSkin
         {
             public TestLegacySkin(Beatmap beatmap, IResourceStore<byte[]> storage, string fileName)
-                : base(new SkinInfo() { Name = "Test Skin", Creator = "Craftplacer" }, storage, null, fileName)
+                : base(new SkinInfo { Name = "Test Skin", Creator = "Craftplacer" }, storage, null, fileName)
             {
             }
         }

From db413686bbe7db6dadf72d71d54fe1def027427b Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 21:12:45 +0200
Subject: [PATCH 04466/10326] Add BeatmapSkin to EditorBeatmap

---
 osu.Game.Tests/Editing/EditorChangeHandlerTest.cs |  6 +++---
 osu.Game/Screens/Edit/Editor.cs                   | 10 +++-------
 osu.Game/Screens/Edit/EditorBeatmap.cs            |  6 +++++-
 osu.Game/Screens/Edit/EditorChangeHandler.cs      |  9 ++-------
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
index 6d708ce838..feda1ae0e9 100644
--- a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
+++ b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void TestSaveRestoreState()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()), null);
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
 
             Assert.That(handler.CanUndo.Value, Is.False);
             Assert.That(handler.CanRedo.Value, Is.False);
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void TestMaxStatesSaved()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()), null);
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
 
             Assert.That(handler.CanUndo.Value, Is.False);
 
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void TestMaxStatesExceeded()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()), null);
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
 
             Assert.That(handler.CanUndo.Value, Is.False);
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 273ae67ffd..b1f11d79f9 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -33,7 +33,6 @@ using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Edit.Timing;
 using osu.Game.Screens.Play;
-using osu.Game.Skinning;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Edit
@@ -65,7 +64,6 @@ namespace osu.Game.Screens.Edit
         private IBeatmap playableBeatmap;
         private EditorBeatmap editorBeatmap;
         private EditorChangeHandler changeHandler;
-        private IBeatmapSkin beatmapSkin;
 
         private DependencyContainer dependencies;
 
@@ -103,11 +101,9 @@ namespace osu.Game.Screens.Edit
                 return;
             }
 
-            AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap));
+            AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap, Beatmap.Value.Skin));
             dependencies.CacheAs(editorBeatmap);
-
-            beatmapSkin = Beatmap.Value.Skin;
-            changeHandler = new EditorChangeHandler(editorBeatmap, beatmapSkin);
+            changeHandler = new EditorChangeHandler(editorBeatmap);
             dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
 
             EditorMenuBar menuBar;
@@ -402,7 +398,7 @@ namespace osu.Game.Screens.Edit
                 clock.SeekForward(!clock.IsRunning, amount);
         }
 
-        private void saveBeatmap() => beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap, beatmapSkin);
+        private void saveBeatmap() => beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap, editorBeatmap.BeatmapSkin);
 
         private void exportBeatmap()
         {
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 23c8c9f605..a314d50e60 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -15,6 +15,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Edit
 {
@@ -47,6 +48,8 @@ namespace osu.Game.Screens.Edit
 
         public readonly IBeatmap PlayableBeatmap;
 
+        public readonly IBeatmapSkin BeatmapSkin;
+
         [Resolved]
         private BindableBeatDivisor beatDivisor { get; set; }
 
@@ -54,9 +57,10 @@ namespace osu.Game.Screens.Edit
 
         private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();
 
-        public EditorBeatmap(IBeatmap playableBeatmap)
+        public EditorBeatmap(IBeatmap playableBeatmap, IBeatmapSkin beatmapSkin = null)
         {
             PlayableBeatmap = playableBeatmap;
+            BeatmapSkin = beatmapSkin;
 
             beatmapProcessor = playableBeatmap.BeatmapInfo.Ruleset?.CreateInstance().CreateBeatmapProcessor(PlayableBeatmap);
 
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 60d869ec82..927c823c64 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -8,7 +8,6 @@ using System.Text;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Edit
 {
@@ -26,7 +25,6 @@ namespace osu.Game.Screens.Edit
         private int currentState = -1;
 
         private readonly EditorBeatmap editorBeatmap;
-        private readonly IBeatmapSkin beatmapSkin;
         private int bulkChangesStarted;
         private bool isRestoring;
 
@@ -36,8 +34,7 @@ namespace osu.Game.Screens.Edit
         /// Creates a new <see cref="EditorChangeHandler"/>.
         /// </summary>
         /// <param name="editorBeatmap">The <see cref="EditorBeatmap"/> to track the <see cref="HitObject"/>s of.</param>
-        /// <param name="beatmapSkin">The skin to track the inline skin configuration of.</param>
-        public EditorChangeHandler(EditorBeatmap editorBeatmap, IBeatmapSkin beatmapSkin)
+        public EditorChangeHandler(EditorBeatmap editorBeatmap)
         {
             this.editorBeatmap = editorBeatmap;
 
@@ -47,8 +44,6 @@ namespace osu.Game.Screens.Edit
 
             patcher = new LegacyEditorBeatmapPatcher(editorBeatmap);
 
-            this.beatmapSkin = beatmapSkin;
-
             // Initial state.
             SaveState();
         }
@@ -90,7 +85,7 @@ namespace osu.Game.Screens.Edit
             using (var stream = new MemoryStream())
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                    new LegacyBeatmapEncoder(editorBeatmap, beatmapSkin).Encode(sw);
+                    new LegacyBeatmapEncoder(editorBeatmap, editorBeatmap.BeatmapSkin).Encode(sw);
 
                 savedStates.Add(stream.ToArray());
             }

From 07f6a6817961c0426baacb14507df4d1e4937451 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sun, 30 Aug 2020 21:13:06 +0200
Subject: [PATCH 04467/10326] Update LegacyBeatmapEncoderTest.cs

---
 .../Formats/LegacyBeatmapEncoderTest.cs       | 65 +++++++++++++++----
 1 file changed, 51 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index dc91af72e8..a8a3f266fc 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -7,8 +7,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Beatmaps;
@@ -61,24 +63,59 @@ namespace osu.Game.Tests.Beatmaps.Formats
             {
                 var beatmap = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(reader);
 
-                beatmap.BeatmapInfo.Path = name;
-                beatmap.BeatmapInfo.BeatmapSet = new BeatmapSetInfo
+                using (var rs = new MemoryBeatmapResourceStore(stream, name))
                 {
-                    Files = new List<BeatmapSetFileInfo>
-                    {
-                        new BeatmapSetFileInfo
-                        {
-                            Filename = name,
-                            FileInfo = new osu.Game.IO.FileInfo { Hash = name }
-                        }
-                    },
-                };
-
-                var beatmapSkin = new TestLegacySkin(beatmap, beatmaps_resource_store, name);
-                return (convert(beatmap), beatmapSkin);
+                    var beatmapSkin = new TestLegacySkin(beatmap, rs, name);
+                    return (convert(beatmap), beatmapSkin);
+                }
             }
         }
 
+        private class MemoryBeatmapResourceStore : IResourceStore<byte[]>
+        {
+            private readonly Stream beatmapData;
+            private readonly string beatmapName;
+
+            public MemoryBeatmapResourceStore(Stream beatmapData, string beatmapName)
+            {
+                this.beatmapData = beatmapData;
+                this.beatmapName = beatmapName;
+            }
+
+            public void Dispose() => beatmapData.Dispose();
+
+            public byte[] Get(string name)
+            {
+                if (name != beatmapName)
+                    return null;
+
+                byte[] buffer = new byte[beatmapData.Length];
+                beatmapData.Read(buffer, 0, buffer.Length);
+                return buffer;
+            }
+
+            public async Task<byte[]> GetAsync(string name)
+            {
+                if (name != beatmapName)
+                    return null;
+
+                byte[] buffer = new byte[beatmapData.Length];
+                await beatmapData.ReadAsync(buffer.AsMemory());
+                return buffer;
+            }
+
+            public Stream GetStream(string name)
+            {
+                if (name != beatmapName)
+                    return null;
+
+                beatmapData.Seek(0, SeekOrigin.Begin);
+                return beatmapData;
+            }
+
+            public IEnumerable<string> GetAvailableResources() => beatmapName.Yield();
+        }
+
         private class TestLegacySkin : LegacySkin, IBeatmapSkin
         {
             public TestLegacySkin(Beatmap beatmap, IResourceStore<byte[]> storage, string fileName)

From 8151aa6ed8b761f4b51ceb7345c0c9bb855d7ad1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 13:31:55 +0900
Subject: [PATCH 04468/10326] Remove unused method

---
 osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index ed187e65bf..ab840e1c46 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.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.Linq;
 using NUnit.Framework;
@@ -60,12 +59,6 @@ namespace osu.Game.Rulesets.Mania.Tests
                 () => judgementResults.Single(r => r.HitObject == hitObject).Type == result);
         }
 
-        private void addJudgementAssert(string name, Func<ManiaHitObject> hitObject, HitResult result)
-        {
-            AddAssert($"{name} judgement is {result}",
-                () => judgementResults.Single(r => r.HitObject == hitObject()).Type == result);
-        }
-
         private void addJudgementOffsetAssert(ManiaHitObject hitObject, double offset)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judged at {offset}",

From acbeb5406f320d5749e2301f3b471b14eb85b62c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 13:33:41 +0900
Subject: [PATCH 04469/10326] Add/improve xmldoc

---
 .../Objects/Drawables/DrawableManiaHitObject.cs               | 4 ++++
 .../Objects/Drawables/DrawableOsuHitObject.cs                 | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 0594d1e143..e16413bce7 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -36,6 +36,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             }
         }
 
+        /// <summary>
+        /// Whether this <see cref="DrawableManiaHitObject"/> can be hit, given a time value.
+        /// If non-null, judgements will be ignored (resulting in a shake) whilst the function returns false.
+        /// </summary>
         public Func<DrawableHitObject, double, bool> CheckHittable;
 
         protected DrawableManiaHitObject(ManiaHitObject hitObject)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 8308c0c576..2946331bc6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override float SamplePlaybackPosition => HitObject.X / OsuPlayfield.BASE_SIZE.X;
 
         /// <summary>
-        /// Whether this <see cref="DrawableOsuHitObject"/> can be hit.
+        /// Whether this <see cref="DrawableOsuHitObject"/> can be hit, given a time value.
         /// If non-null, judgements will be ignored (resulting in a shake) whilst the function returns false.
         /// </summary>
         public Func<DrawableHitObject, double, bool> CheckHittable;

From abdb99192397e21964706822c9d9fa8948a54c8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 31 Aug 2020 14:15:47 +0900
Subject: [PATCH 04470/10326] Hide misses from timing distribution graph

---
 .../TestSceneHitEventTimingDistributionGraph.cs      | 12 ++++++++++++
 .../Statistics/HitEventTimingDistributionGraph.cs    |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index 7ca1fc842f..144f8da2fa 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -35,6 +35,18 @@ namespace osu.Game.Tests.Visual.Ranking
             createTest(new List<HitEvent>());
         }
 
+        [Test]
+        public void TestMissesDontShow()
+        {
+            createTest(Enumerable.Range(0, 100).Select(i =>
+            {
+                if (i % 2 == 0)
+                    return new HitEvent(0, HitResult.Perfect, new HitCircle(), new HitCircle(), null);
+
+                return new HitEvent(30, HitResult.Miss, new HitCircle(), new HitCircle(), null);
+            }).ToList());
+        }
+
         private void createTest(List<HitEvent> events) => AddStep("create test", () =>
         {
             Children = new Drawable[]
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 527da429ed..45fdc3ff33 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// <param name="hitEvents">The <see cref="HitEvent"/>s to display the timing distribution of.</param>
         public HitEventTimingDistributionGraph(IReadOnlyList<HitEvent> hitEvents)
         {
-            this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows)).ToList();
+            this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result != HitResult.Miss).ToList();
         }
 
         [BackgroundDependencyLoader]

From c3bfce6ccff2bd908a80e47614b1329d1f585e00 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 15:03:41 +0900
Subject: [PATCH 04471/10326] Add star rating to beatmap wedge

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 27ce9e82dd..cb3a347af4 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -27,6 +27,7 @@ using osu.Framework.Logging;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Ranking.Expanded;
 
 namespace osu.Game.Screens.Select
 {
@@ -224,8 +225,15 @@ namespace osu.Game.Screens.Select
                         AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
+                            new StarRatingDisplay(beatmapInfo)
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                            },
                             StatusPill = new BeatmapSetOnlineStatusPill
                             {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
                                 TextSize = 11,
                                 TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
                                 Status = beatmapInfo.Status,

From 4736845318acac3c4e4da894500389a933bc8c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 31 Aug 2020 10:56:06 +0200
Subject: [PATCH 04472/10326] Add spacing between star rating and beatmap
 status

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index cb3a347af4..518ad33529 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -229,6 +229,7 @@ namespace osu.Game.Screens.Select
                             {
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
+                                Margin = new MarginPadding { Bottom = 5 }
                             },
                             StatusPill = new BeatmapSetOnlineStatusPill
                             {

From bee01bdd38cf13bfeddac343c68ad315daef570f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 31 Aug 2020 18:01:16 +0900
Subject: [PATCH 04473/10326] Fix first scroll wheel in editor incorrectly
 advancing twice

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index d92f3922c3..e178459d5c 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -284,7 +284,7 @@ namespace osu.Game.Screens.Edit
             // this is a special case to handle the "pivot" scenario.
             // if we are precise scrolling in one direction then change our mind and scroll backwards,
             // the existing accumulation should be applied in the inverse direction to maintain responsiveness.
-            if (Math.Sign(scrollAccumulation) != scrollDirection)
+            if (scrollAccumulation != 0 && Math.Sign(scrollAccumulation) != scrollDirection)
                 scrollAccumulation = scrollDirection * (precision - Math.Abs(scrollAccumulation));
 
             scrollAccumulation += scrollComponent * (e.IsPrecise ? 0.1 : 1);

From 7d273d631be6491d3ad6ae769770469ba0cb9214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 31 Aug 2020 11:05:42 +0200
Subject: [PATCH 04474/10326] Do not show star difficulty on wedge if zero

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 518ad33529..2b2c40411d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -223,14 +223,13 @@ namespace osu.Game.Screens.Select
                         Direction = FillDirection.Vertical,
                         Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
                         AutoSizeAxes = Axes.Both,
-                        Children = new Drawable[]
+                        Children = new[]
                         {
-                            new StarRatingDisplay(beatmapInfo)
+                            createStarRatingDisplay(beatmapInfo).With(display =>
                             {
-                                Anchor = Anchor.CentreRight,
-                                Origin = Anchor.CentreRight,
-                                Margin = new MarginPadding { Bottom = 5 }
-                            },
+                                display.Anchor = Anchor.CentreRight;
+                                display.Origin = Anchor.CentreRight;
+                            }),
                             StatusPill = new BeatmapSetOnlineStatusPill
                             {
                                 Anchor = Anchor.CentreRight,
@@ -291,6 +290,13 @@ namespace osu.Game.Screens.Select
                     StatusPill.Hide();
             }
 
+            private static Drawable createStarRatingDisplay(BeatmapInfo beatmapInfo) => beatmapInfo.StarDifficulty > 0
+                ? new StarRatingDisplay(beatmapInfo)
+                {
+                    Margin = new MarginPadding { Bottom = 5 }
+                }
+                : Empty();
+
             private void setMetadata(string source)
             {
                 ArtistLabel.Text = artistBinding.Value;

From 8b7446c43f1a53bbf83804486289ee6e42c5ec8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 31 Aug 2020 18:13:51 +0900
Subject: [PATCH 04475/10326] Fix RollingCounter not updating initial value if
 changed before loaded

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

diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index 6763198213..ceb388600e 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -65,12 +65,6 @@ namespace osu.Game.Graphics.UserInterface
         protected RollingCounter()
         {
             AutoSizeAxes = Axes.Both;
-
-            Current.ValueChanged += val =>
-            {
-                if (IsLoaded)
-                    TransformCount(DisplayedCount, val.NewValue);
-            };
         }
 
         [BackgroundDependencyLoader]
@@ -81,6 +75,13 @@ namespace osu.Game.Graphics.UserInterface
             Child = displayedCountSpriteText;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(val => TransformCount(DisplayedCount, val.NewValue), true);
+        }
+
         /// <summary>
         /// Sets count value, bypassing rollover animation.
         /// </summary>

From a171d0e292be37a8c85d1f5e40b933f9d07b7619 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 31 Aug 2020 18:14:22 +0900
Subject: [PATCH 04476/10326] Remove unused methods and classes

---
 .../UserInterface/PercentageCounter.cs        |  5 ---
 .../Graphics/UserInterface/RollingCounter.cs  |  2 --
 .../Graphics/UserInterface/ScoreCounter.cs    |  5 ---
 .../UserInterface/SimpleComboCounter.cs       |  5 ---
 .../Screens/Play/HUD/ComboResultCounter.cs    | 32 -------------------
 .../Expanded/Statistics/AccuracyStatistic.cs  |  3 --
 .../Expanded/Statistics/CounterStatistic.cs   |  3 --
 .../Ranking/Expanded/TotalScoreCounter.cs     |  3 --
 8 files changed, 58 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/ComboResultCounter.cs

diff --git a/osu.Game/Graphics/UserInterface/PercentageCounter.cs b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
index 3ea9c1053c..1ccf7798e5 100644
--- a/osu.Game/Graphics/UserInterface/PercentageCounter.cs
+++ b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
@@ -40,10 +40,5 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override OsuSpriteText CreateSpriteText()
             => base.CreateSpriteText().With(s => s.Font = s.Font.With(size: 20f, fixedWidth: true));
-
-        public override void Increment(double amount)
-        {
-            Current.Value += amount;
-        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index ceb388600e..ece1b8e22c 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -57,8 +57,6 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public abstract void Increment(T amount);
-
         /// <summary>
         /// Skeleton of a numeric counter which value rolls over time.
         /// </summary>
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index faabe69f87..73bbe5f03e 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
@@ -51,10 +51,5 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override OsuSpriteText CreateSpriteText()
             => base.CreateSpriteText().With(s => s.Font = s.Font.With(fixedWidth: true));
-
-        public override void Increment(double amount)
-        {
-            Current.Value += amount;
-        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs b/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
index aac0166774..c9790aed46 100644
--- a/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
+++ b/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
@@ -33,11 +33,6 @@ namespace osu.Game.Graphics.UserInterface
             return Math.Abs(currentValue - newValue) * RollingDuration * 100.0f;
         }
 
-        public override void Increment(int amount)
-        {
-            Current.Value += amount;
-        }
-
         protected override OsuSpriteText CreateSpriteText()
             => base.CreateSpriteText().With(s => s.Font = s.Font.With(size: 20f));
     }
diff --git a/osu.Game/Screens/Play/HUD/ComboResultCounter.cs b/osu.Game/Screens/Play/HUD/ComboResultCounter.cs
deleted file mode 100644
index 7ae8bc0ddf..0000000000
--- a/osu.Game/Screens/Play/HUD/ComboResultCounter.cs
+++ /dev/null
@@ -1,32 +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.Graphics.UserInterface;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// Used to display combo with a roll-up animation in results screen.
-    /// </summary>
-    public class ComboResultCounter : RollingCounter<long>
-    {
-        protected override double RollingDuration => 500;
-        protected override Easing RollingEasing => Easing.Out;
-
-        protected override double GetProportionalDuration(long currentValue, long newValue)
-        {
-            return currentValue > newValue ? currentValue - newValue : newValue - currentValue;
-        }
-
-        protected override string FormatCount(long count)
-        {
-            return $@"{count}x";
-        }
-
-        public override void Increment(long amount)
-        {
-            Current.Value += amount;
-        }
-    }
-}
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
index 6933456e7e..288a107874 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
@@ -46,9 +46,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
 
             protected override string FormatCount(double count) => count.FormatAccuracy();
 
-            public override void Increment(double amount)
-                => Current.Value += amount;
-
             protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
             {
                 s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index 043a560d12..e820831809 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -49,9 +49,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
                 s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
                 s.Spacing = new Vector2(-2, 0);
             });
-
-            public override void Increment(int amount)
-                => Current.Value += amount;
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
index 7f6fd1eabe..65082d3fae 100644
--- a/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
+++ b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
@@ -36,8 +36,5 @@ namespace osu.Game.Screens.Ranking.Expanded
             s.Font = OsuFont.Torus.With(size: 60, weight: FontWeight.Light, fixedWidth: true);
             s.Spacing = new Vector2(-5, 0);
         });
-
-        public override void Increment(long amount)
-            => Current.Value += amount;
     }
 }

From dd093f44d8826af623ed5232e6a38d8f39b0ce20 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 31 Aug 2020 11:16:13 +0200
Subject: [PATCH 04477/10326] Cast base immutable bindable to mutable for
 testing purposes and make InitialOverlayActivationMode property protected

---
 osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs | 7 +------
 osu.Game/Screens/OsuScreen.cs                   | 2 +-
 osu.Game/Screens/Play/Player.cs                 | 2 +-
 osu.Game/Screens/StartupScreen.cs               | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index 841860accb..2a4486812c 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -91,12 +91,7 @@ namespace osu.Game.Tests.Visual.Menus
 
         public class TestToolbar : Toolbar
         {
-            public TestToolbar()
-            {
-                base.OverlayActivationMode.BindTo(OverlayActivationMode);
-            }
-
-            public new Bindable<OverlayActivation> OverlayActivationMode { get; } = new Bindable<OverlayActivation>(OverlayActivation.All);
+            public new Bindable<OverlayActivation> OverlayActivationMode => base.OverlayActivationMode as Bindable<OverlayActivation>;
         }
     }
 }
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index c687c34ce9..c10deaf1e5 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens
         /// <summary>
         /// The initial initial overlay activation mode to use when this screen is entered for the first time.
         /// </summary>
-        public virtual OverlayActivation InitialOverlayActivationMode => OverlayActivation.All;
+        protected virtual OverlayActivation InitialOverlayActivationMode => OverlayActivation.All;
 
         public Bindable<OverlayActivation> OverlayActivationMode { get; }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 541275cf55..0a5158c6dc 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play
 
         public override bool HideOverlaysOnEnter => true;
 
-        public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
+        protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
 
         /// <summary>
         /// Whether gameplay should pause when the game window focus is lost.
diff --git a/osu.Game/Screens/StartupScreen.cs b/osu.Game/Screens/StartupScreen.cs
index c3e36c8e9d..e5e134fd39 100644
--- a/osu.Game/Screens/StartupScreen.cs
+++ b/osu.Game/Screens/StartupScreen.cs
@@ -18,6 +18,6 @@ namespace osu.Game.Screens
 
         public override bool AllowRateAdjustments => false;
 
-        public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
+        protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
     }
 }

From d419fe4dbf5f54edddd67cfb4507150ae43c2f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 31 Aug 2020 12:02:02 +0200
Subject: [PATCH 04478/10326] Remove note shaking mention that doesn't apply in
 mania

---
 .../Objects/Drawables/DrawableManiaHitObject.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index e16413bce7..08c41b0d75 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         /// <summary>
         /// Whether this <see cref="DrawableManiaHitObject"/> can be hit, given a time value.
-        /// If non-null, judgements will be ignored (resulting in a shake) whilst the function returns false.
+        /// If non-null, judgements will be ignored whilst the function returns false.
         /// </summary>
         public Func<DrawableHitObject, double, bool> CheckHittable;
 

From ed74c39b5587e2084dd9fe957aef6d4e9f422644 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 19:54:22 +0900
Subject: [PATCH 04479/10326] Move UserTopScoreContainer into base leaderboard

---
 .../SongSelect/TestSceneBeatmapLeaderboard.cs | 61 ++++++-------
 .../TestSceneUserTopScoreContainer.cs         | 91 +++++++++----------
 .../API/Requests/Responses/APILegacyScores.cs |  9 ++
 osu.Game/Online/Leaderboards/Leaderboard.cs   | 21 ++++-
 .../Leaderboards/UserTopScoreContainer.cs     | 26 ++----
 .../Match/Components/MatchLeaderboard.cs      |  2 +
 .../Select/Leaderboards/BeatmapLeaderboard.cs | 30 ++----
 7 files changed, 114 insertions(+), 126 deletions(-)
 rename osu.Game/{Screens/Select => Online}/Leaderboards/UserTopScoreContainer.cs (77%)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
index 48b718c04d..67cd720260 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
@@ -5,9 +5,9 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Select.Leaderboards;
@@ -53,53 +53,46 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void showPersonalBestWithNullPosition()
         {
-            leaderboard.TopScore = new APILegacyUserTopScoreInfo
+            leaderboard.TopScore = new ScoreInfo
             {
-                Position = null,
-                Score = new APILegacyScoreInfo
+                Rank = ScoreRank.XH,
+                Accuracy = 1,
+                MaxCombo = 244,
+                TotalScore = 1707827,
+                Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock() },
+                User = new User
                 {
-                    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
                     {
-                        Id = 6602580,
-                        Username = @"waaiiru",
-                        Country = new Country
-                        {
-                            FullName = @"Spain",
-                            FlagName = @"ES",
-                        },
+                        FullName = @"Spain",
+                        FlagName = @"ES",
                     },
-                }
+                },
             };
         }
 
         private void showPersonalBest()
         {
-            leaderboard.TopScore = new APILegacyUserTopScoreInfo
+            leaderboard.TopScore = new ScoreInfo
             {
                 Position = 999,
-                Score = new APILegacyScoreInfo
+                Rank = ScoreRank.XH,
+                Accuracy = 1,
+                MaxCombo = 244,
+                TotalScore = 1707827,
+                Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                User = new User
                 {
-                    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
                     {
-                        Id = 6602580,
-                        Username = @"waaiiru",
-                        Country = new Country
-                        {
-                            FullName = @"Spain",
-                            FlagName = @"ES",
-                        },
+                        FullName = @"Spain",
+                        FlagName = @"ES",
                     },
-                }
+                },
             };
         }
 
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
index 0598324110..b8b8792b9b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
@@ -6,11 +6,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osuTK.Graphics;
-using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.SongSelect
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         public TestSceneUserTopScoreContainer()
         {
-            UserTopScoreContainer topScoreContainer;
+            UserTopScoreContainer<ScoreInfo> topScoreContainer;
 
             Add(dialogOverlay = new DialogOverlay
             {
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4.DarkGreen,
                     },
-                    topScoreContainer = new UserTopScoreContainer
+                    topScoreContainer = new UserTopScoreContainer<ScoreInfo>(s => new LeaderboardScore(s, s.Position, false))
                     {
                         Origin = Anchor.BottomCentre,
                         Anchor = Anchor.BottomCentre,
@@ -52,69 +52,60 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             var scores = new[]
             {
-                new APILegacyUserTopScoreInfo
+                new ScoreInfo
                 {
                     Position = 999,
-                    Score = new APILegacyScoreInfo
+                    Rank = ScoreRank.XH,
+                    Accuracy = 1,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
                     {
-                        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
                         {
-                            Id = 6602580,
-                            Username = @"waaiiru",
-                            Country = new Country
-                            {
-                                FullName = @"Spain",
-                                FlagName = @"ES",
-                            },
+                            FullName = @"Spain",
+                            FlagName = @"ES",
                         },
-                    }
+                    },
                 },
-                new APILegacyUserTopScoreInfo
+                new ScoreInfo
                 {
                     Position = 110000,
-                    Score = new APILegacyScoreInfo
+                    Rank = ScoreRank.X,
+                    Accuracy = 1,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    User = new User
                     {
-                        Rank = ScoreRank.X,
-                        Accuracy = 1,
-                        MaxCombo = 244,
-                        TotalScore = 1707827,
-                        User = new User
+                        Id = 4608074,
+                        Username = @"Skycries",
+                        Country = new Country
                         {
-                            Id = 4608074,
-                            Username = @"Skycries",
-                            Country = new Country
-                            {
-                                FullName = @"Brazil",
-                                FlagName = @"BR",
-                            },
+                            FullName = @"Brazil",
+                            FlagName = @"BR",
                         },
-                    }
+                    },
                 },
-                new APILegacyUserTopScoreInfo
+                new ScoreInfo
                 {
                     Position = 22333,
-                    Score = new APILegacyScoreInfo
+                    Rank = ScoreRank.S,
+                    Accuracy = 1,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    User = new User
                     {
-                        Rank = ScoreRank.S,
-                        Accuracy = 1,
-                        MaxCombo = 244,
-                        TotalScore = 1707827,
-                        User = new User
+                        Id = 1541390,
+                        Username = @"Toukai",
+                        Country = new Country
                         {
-                            Id = 1541390,
-                            Username = @"Toukai",
-                            Country = new Country
-                            {
-                                FullName = @"Canada",
-                                FlagName = @"CA",
-                            },
+                            FullName = @"Canada",
+                            FlagName = @"CA",
                         },
-                    }
+                    },
                 }
             };
 
diff --git a/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs b/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs
index 75be9171b0..009639c1dc 100644
--- a/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs
+++ b/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs
@@ -3,6 +3,8 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Game.Rulesets;
+using osu.Game.Scoring;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
@@ -22,5 +24,12 @@ namespace osu.Game.Online.API.Requests.Responses
 
         [JsonProperty(@"score")]
         public APILegacyScoreInfo Score;
+
+        public ScoreInfo CreateScoreInfo(RulesetStore rulesets)
+        {
+            var score = Score.CreateScoreInfo(rulesets);
+            score.Position = Position;
+            return score;
+        }
     }
 }
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 800029ceb9..003d90d400 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Online.Leaderboards
 
         private readonly OsuScrollContainer scrollContainer;
         private readonly Container placeholderContainer;
+        private readonly UserTopScoreContainer<TScoreInfo> topScoreContainer;
 
         private FillFlowContainer<LeaderboardScore> scrollFlow;
 
@@ -87,6 +88,21 @@ namespace osu.Game.Online.Leaderboards
             }
         }
 
+        public TScoreInfo TopScore
+        {
+            get => topScoreContainer.Score.Value;
+            set
+            {
+                if (value == null)
+                    topScoreContainer.Hide();
+                else
+                {
+                    topScoreContainer.Show();
+                    topScoreContainer.Score.Value = value;
+                }
+            }
+        }
+
         protected virtual FillFlowContainer<LeaderboardScore> CreateScoreFlow()
             => new FillFlowContainer<LeaderboardScore>
             {
@@ -198,8 +214,9 @@ namespace osu.Game.Online.Leaderboards
                                 {
                                     AutoSizeAxes = Axes.Y,
                                     RelativeSizeAxes = Axes.X,
+                                    Child = topScoreContainer = new UserTopScoreContainer<TScoreInfo>(CreateDrawableTopScore)
                                 },
-                            }
+                            },
                         },
                     },
                 },
@@ -367,5 +384,7 @@ namespace osu.Game.Online.Leaderboards
         }
 
         protected abstract LeaderboardScore CreateDrawableScore(TScoreInfo model, int index);
+
+        protected abstract LeaderboardScore CreateDrawableTopScore(TScoreInfo model);
     }
 }
diff --git a/osu.Game/Screens/Select/Leaderboards/UserTopScoreContainer.cs b/osu.Game/Online/Leaderboards/UserTopScoreContainer.cs
similarity index 77%
rename from osu.Game/Screens/Select/Leaderboards/UserTopScoreContainer.cs
rename to osu.Game/Online/Leaderboards/UserTopScoreContainer.cs
index 8e10734454..ffa7fa2c0b 100644
--- a/osu.Game/Screens/Select/Leaderboards/UserTopScoreContainer.cs
+++ b/osu.Game/Online/Leaderboards/UserTopScoreContainer.cs
@@ -9,31 +9,28 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets;
-using osu.Game.Scoring;
 using osuTK;
 
-namespace osu.Game.Screens.Select.Leaderboards
+namespace osu.Game.Online.Leaderboards
 {
-    public class UserTopScoreContainer : VisibilityContainer
+    public class UserTopScoreContainer<TScoreInfo> : VisibilityContainer
     {
         private const int duration = 500;
 
+        public Bindable<TScoreInfo> Score = new Bindable<TScoreInfo>();
+
         private readonly Container scoreContainer;
-
-        public Bindable<APILegacyUserTopScoreInfo> Score = new Bindable<APILegacyUserTopScoreInfo>();
-
-        public Action<ScoreInfo> ScoreSelected;
+        private readonly Func<TScoreInfo, LeaderboardScore> createScoreDelegate;
 
         protected override bool StartHidden => true;
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        public UserTopScoreContainer()
+        public UserTopScoreContainer(Func<TScoreInfo, LeaderboardScore> createScoreDelegate)
         {
+            this.createScoreDelegate = createScoreDelegate;
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
@@ -72,7 +69,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private CancellationTokenSource loadScoreCancellation;
 
-        private void onScoreChanged(ValueChangedEvent<APILegacyUserTopScoreInfo> score)
+        private void onScoreChanged(ValueChangedEvent<TScoreInfo> score)
         {
             var newScore = score.NewValue;
 
@@ -82,12 +79,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             if (newScore == null)
                 return;
 
-            var scoreInfo = newScore.Score.CreateScoreInfo(rulesets);
-
-            LoadComponentAsync(new LeaderboardScore(scoreInfo, newScore.Position, false)
-            {
-                Action = () => ScoreSelected?.Invoke(scoreInfo)
-            }, drawableScore =>
+            LoadComponentAsync(createScoreDelegate(newScore), drawableScore =>
             {
                 scoreContainer.Child = drawableScore;
                 drawableScore.FadeInFromZero(duration, Easing.OutQuint);
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index 1afbf5c32a..01137dad43 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -51,6 +51,8 @@ namespace osu.Game.Screens.Multi.Match.Components
         }
 
         protected override LeaderboardScore CreateDrawableScore(APIUserScoreAggregate model, int index) => new MatchLeaderboardScore(model, index);
+
+        protected override LeaderboardScore CreateDrawableTopScore(APIUserScoreAggregate model) => new MatchLeaderboardScore(model, 0);
     }
 
     public enum MatchLeaderboardScope
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index 8e85eb4eb2..a78d8e3be0 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -9,7 +9,6 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -41,25 +40,8 @@ namespace osu.Game.Screens.Select.Leaderboards
             }
         }
 
-        public APILegacyUserTopScoreInfo TopScore
-        {
-            get => topScoreContainer.Score.Value;
-            set
-            {
-                if (value == null)
-                    topScoreContainer.Hide();
-                else
-                {
-                    topScoreContainer.Show();
-                    topScoreContainer.Score.Value = value;
-                }
-            }
-        }
-
         private bool filterMods;
 
-        private UserTopScoreContainer topScoreContainer;
-
         private IBindable<WeakReference<ScoreInfo>> itemRemoved;
 
         /// <summary>
@@ -101,11 +83,6 @@ namespace osu.Game.Screens.Select.Leaderboards
                     UpdateScores();
             };
 
-            Content.Add(topScoreContainer = new UserTopScoreContainer
-            {
-                ScoreSelected = s => ScoreSelected?.Invoke(s)
-            });
-
             itemRemoved = scoreManager.ItemRemoved.GetBoundCopy();
             itemRemoved.BindValueChanged(onScoreRemoved);
         }
@@ -183,7 +160,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             req.Success += r =>
             {
                 scoresCallback?.Invoke(r.Scores.Select(s => s.CreateScoreInfo(rulesets)));
-                TopScore = r.UserScore;
+                TopScore = r.UserScore.CreateScoreInfo(rulesets);
             };
 
             return req;
@@ -193,5 +170,10 @@ namespace osu.Game.Screens.Select.Leaderboards
         {
             Action = () => ScoreSelected?.Invoke(model)
         };
+
+        protected override LeaderboardScore CreateDrawableTopScore(ScoreInfo model) => new LeaderboardScore(model, model.Position, false)
+        {
+            Action = () => ScoreSelected?.Invoke(model)
+        };
     }
 }

From d1ceb81797a8bd19b931f3816c26502673b0d8be Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 19:54:41 +0900
Subject: [PATCH 04480/10326] Rename request

---
 ...GetRoomScoresRequest.cs => GetRoomLeaderboardRequest.cs} | 6 ++----
 osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)
 rename osu.Game/Online/Multiplayer/{GetRoomScoresRequest.cs => GetRoomLeaderboardRequest.cs} (65%)

diff --git a/osu.Game/Online/Multiplayer/GetRoomScoresRequest.cs b/osu.Game/Online/Multiplayer/GetRoomLeaderboardRequest.cs
similarity index 65%
rename from osu.Game/Online/Multiplayer/GetRoomScoresRequest.cs
rename to osu.Game/Online/Multiplayer/GetRoomLeaderboardRequest.cs
index bc913030dd..37c21457bc 100644
--- a/osu.Game/Online/Multiplayer/GetRoomScoresRequest.cs
+++ b/osu.Game/Online/Multiplayer/GetRoomLeaderboardRequest.cs
@@ -1,17 +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.Collections.Generic;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public class GetRoomScoresRequest : APIRequest<List<APIUserScoreAggregate>>
+    public class GetRoomLeaderboardRequest : APIRequest<APILeaderboard>
     {
         private readonly int roomId;
 
-        public GetRoomScoresRequest(int roomId)
+        public GetRoomLeaderboardRequest(int roomId)
         {
             this.roomId = roomId;
         }
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index 01137dad43..56381dccb6 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             if (roomId.Value == null)
                 return null;
 
-            var req = new GetRoomScoresRequest(roomId.Value ?? 0);
+            var req = new GetRoomLeaderboardRequest(roomId.Value ?? 0);
 
             req.Success += r =>
             {

From 77698ec31e8cae2550c2dac2d68bae51ab2805a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 19:54:57 +0900
Subject: [PATCH 04481/10326] Add support for showing own top score in
 timeshift

---
 osu.Game/Online/Multiplayer/APILeaderboard.cs  | 18 ++++++++++++++++++
 .../Multi/Match/Components/MatchLeaderboard.cs |  6 ++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/APILeaderboard.cs

diff --git a/osu.Game/Online/Multiplayer/APILeaderboard.cs b/osu.Game/Online/Multiplayer/APILeaderboard.cs
new file mode 100644
index 0000000000..96fe7cefb0
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/APILeaderboard.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 System.Collections.Generic;
+using Newtonsoft.Json;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Online.Multiplayer
+{
+    public class APILeaderboard
+    {
+        [JsonProperty("leaderboard")]
+        public List<APIUserScoreAggregate> Leaderboard;
+
+        [JsonProperty("own_score")]
+        public APIUserScoreAggregate OwnScore;
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index 56381dccb6..847f3a7b55 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -14,8 +14,6 @@ namespace osu.Game.Screens.Multi.Match.Components
 {
     public class MatchLeaderboard : Leaderboard<MatchLeaderboardScope, APIUserScoreAggregate>
     {
-        public Action<IEnumerable<APIUserScoreAggregate>> ScoresLoaded;
-
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
 
@@ -43,8 +41,8 @@ namespace osu.Game.Screens.Multi.Match.Components
 
             req.Success += r =>
             {
-                scoresCallback?.Invoke(r);
-                ScoresLoaded?.Invoke(r);
+                scoresCallback?.Invoke(r.Leaderboard);
+                TopScore = r.OwnScore;
             };
 
             return req;

From 6ed191786f978e3b6bb943bc8e33633ac17ff80e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 20:01:59 +0900
Subject: [PATCH 04482/10326] Add support for position

---
 .../Online/API/Requests/Responses/APIUserScoreAggregate.cs    | 4 ++++
 osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs b/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
index 0bba6a93bd..bcc8721400 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
@@ -33,6 +33,9 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty("user")]
         public User User { get; set; }
 
+        [JsonProperty("position")]
+        public int? Position { get; set; }
+
         public ScoreInfo CreateScoreInfo() =>
             new ScoreInfo
             {
@@ -40,6 +43,7 @@ namespace osu.Game.Online.API.Requests.Responses
                 PP = PP,
                 TotalScore = TotalScore,
                 User = User,
+                Position = Position
             };
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index 847f3a7b55..7d5968202c 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Multi.Match.Components
 
         protected override LeaderboardScore CreateDrawableScore(APIUserScoreAggregate model, int index) => new MatchLeaderboardScore(model, index);
 
-        protected override LeaderboardScore CreateDrawableTopScore(APIUserScoreAggregate model) => new MatchLeaderboardScore(model, 0);
+        protected override LeaderboardScore CreateDrawableTopScore(APIUserScoreAggregate model) => new MatchLeaderboardScore(model, model.Position ?? 0);
     }
 
     public enum MatchLeaderboardScope

From d22de26afb354e82769fd2ffdd3a587ae1a32f04 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 20:08:36 +0900
Subject: [PATCH 04483/10326] Add whitespace

---
 osu.Game/Online/Leaderboards/UserTopScoreContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Leaderboards/UserTopScoreContainer.cs b/osu.Game/Online/Leaderboards/UserTopScoreContainer.cs
index ffa7fa2c0b..ab4210251e 100644
--- a/osu.Game/Online/Leaderboards/UserTopScoreContainer.cs
+++ b/osu.Game/Online/Leaderboards/UserTopScoreContainer.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Online.Leaderboards
         public UserTopScoreContainer(Func<TScoreInfo, LeaderboardScore> createScoreDelegate)
         {
             this.createScoreDelegate = createScoreDelegate;
+
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 

From 8cf26979fb11ec81199cf87378b20134a809d816 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 20:16:28 +0900
Subject: [PATCH 04484/10326] Allow null user score

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

diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index a78d8e3be0..8ddae67dba 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             req.Success += r =>
             {
                 scoresCallback?.Invoke(r.Scores.Select(s => s.CreateScoreInfo(rulesets)));
-                TopScore = r.UserScore.CreateScoreInfo(rulesets);
+                TopScore = r.UserScore?.CreateScoreInfo(rulesets);
             };
 
             return req;

From 61d580b6ba9841793e81600d0c228ea7848bff3e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 20:17:23 +0900
Subject: [PATCH 04485/10326] Don't highlight top score

---
 osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs   | 2 +-
 .../Screens/Multi/Match/Components/MatchLeaderboardScore.cs   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index 7d5968202c..50afbb39fe 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Multi.Match.Components
 
         protected override LeaderboardScore CreateDrawableScore(APIUserScoreAggregate model, int index) => new MatchLeaderboardScore(model, index);
 
-        protected override LeaderboardScore CreateDrawableTopScore(APIUserScoreAggregate model) => new MatchLeaderboardScore(model, model.Position ?? 0);
+        protected override LeaderboardScore CreateDrawableTopScore(APIUserScoreAggregate model) => new MatchLeaderboardScore(model, model.Position ?? 0, false);
     }
 
     public enum MatchLeaderboardScope
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
index 73a40d9579..c4e2b332b3 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Screens.Multi.Match.Components
     {
         private readonly APIUserScoreAggregate score;
 
-        public MatchLeaderboardScore(APIUserScoreAggregate score, int rank)
-            : base(score.CreateScoreInfo(), rank)
+        public MatchLeaderboardScore(APIUserScoreAggregate score, int rank, bool allowHighlight = true)
+            : base(score.CreateScoreInfo(), rank, allowHighlight)
         {
             this.score = score;
         }

From 5e77e8cfcf74e642c2076773799ab355097fa22b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 20:21:57 +0900
Subject: [PATCH 04486/10326] Reduce min size of chat

---
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 7c2d5cf85d..0d2adeb27c 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Screens.Multi.Match
                                                                 new Dimension(GridSizeMode.AutoSize),
                                                                 new Dimension(),
                                                                 new Dimension(GridSizeMode.AutoSize),
-                                                                new Dimension(GridSizeMode.Relative, size: 0.4f, minSize: 240),
+                                                                new Dimension(GridSizeMode.Relative, size: 0.4f, minSize: 120),
                                                             }
                                                         },
                                                         null

From 3b22b891d13e9d53d0266d234363dfd2362436c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 31 Aug 2020 14:28:45 +0200
Subject: [PATCH 04487/10326] Add failing test cases

---
 .../NonVisual/Ranking/UnstableRateTest.cs     | 43 +++++++++++++++++++
 .../Ranking/Statistics/SimpleStatisticItem.cs |  9 +++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs

diff --git a/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs b/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs
new file mode 100644
index 0000000000..bf4145754a
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Ranking.Statistics;
+
+namespace osu.Game.Tests.NonVisual.Ranking
+{
+    [TestFixture]
+    public class UnstableRateTest
+    {
+        [Test]
+        public void TestDistributedHits()
+        {
+            var events = Enumerable.Range(-5, 11)
+                                   .Select(t => new HitEvent(t - 5, HitResult.Great, new HitObject(), null, null));
+
+            var unstableRate = new UnstableRate(events);
+
+            Assert.IsTrue(Precision.AlmostEquals(unstableRate.Value, 10 * Math.Sqrt(10)));
+        }
+
+        [Test]
+        public void TestMissesAndEmptyWindows()
+        {
+            var events = new[]
+            {
+                new HitEvent(-100, HitResult.Miss, new HitObject(), null, null),
+                new HitEvent(0, HitResult.Great, new HitObject(), null, null),
+                new HitEvent(200, HitResult.Meh, new HitObject { HitWindows = HitWindows.Empty }, null, null),
+            };
+
+            var unstableRate = new UnstableRate(events);
+
+            Assert.IsTrue(Precision.AlmostEquals(0, unstableRate.Value));
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
index 3d9ba2f225..6fe7e4eda8 100644
--- a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
@@ -59,12 +59,19 @@ namespace osu.Game.Screens.Ranking.Statistics
     /// </summary>
     public class SimpleStatisticItem<TValue> : SimpleStatisticItem
     {
+        private TValue value;
+
         /// <summary>
         /// The statistic's value to be displayed.
         /// </summary>
         public new TValue Value
         {
-            set => base.Value = DisplayValue(value);
+            get => value;
+            set
+            {
+                this.value = value;
+                base.Value = DisplayValue(value);
+            }
         }
 
         /// <summary>

From 3ca2a7767a04d2911d8244bb1d2755747e099a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 31 Aug 2020 14:29:01 +0200
Subject: [PATCH 04488/10326] Exclude misses and empty window hits from UR
 calculation

---
 osu.Game/Screens/Ranking/Statistics/UnstableRate.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs b/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
index 5b368c3e8d..18a2238784 100644
--- a/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
+++ b/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
@@ -20,7 +20,8 @@ namespace osu.Game.Screens.Ranking.Statistics
         public UnstableRate(IEnumerable<HitEvent> hitEvents)
             : base("Unstable Rate")
         {
-            var timeOffsets = hitEvents.Select(ev => ev.TimeOffset).ToArray();
+            var timeOffsets = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result != HitResult.Miss)
+                                       .Select(ev => ev.TimeOffset).ToArray();
             Value = 10 * standardDeviation(timeOffsets);
         }
 

From 0980f97ea2c8da99030f6f9d7b16425c35865ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 31 Aug 2020 16:06:24 +0200
Subject: [PATCH 04489/10326] Replace precision check with absolute equality
 assert

---
 osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs b/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs
index bf4145754a..ad6f01881b 100644
--- a/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs
+++ b/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.NonVisual.Ranking
 
             var unstableRate = new UnstableRate(events);
 
-            Assert.IsTrue(Precision.AlmostEquals(0, unstableRate.Value));
+            Assert.AreEqual(0, unstableRate.Value);
         }
     }
 }

From fde4b03dabe1f58d871f7785f431a6c68f5b5ee5 Mon Sep 17 00:00:00 2001
From: Pavle Aleksov <pavle.a@codemancystudio.com>
Date: Mon, 31 Aug 2020 16:21:00 +0200
Subject: [PATCH 04490/10326] added spinner duration check - skip
 HitObjectReplay if duration is 0

---
 osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index 4cb2cd6539..5a439734c6 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -156,6 +156,9 @@ namespace osu.Game.Rulesets.Osu.Replays
             // TODO: Shouldn't the spinner always spin in the same direction?
             if (h is Spinner)
             {
+                if ((h as Spinner).Duration == 0)
+                    return;
+
                 calcSpinnerStartPosAndDirection(((OsuReplayFrame)Frames[^1]).Position, out startPosition, out spinnerDirection);
 
                 Vector2 spinCentreOffset = SPINNER_CENTRE - ((OsuReplayFrame)Frames[^1]).Position;

From 0655fc14737c76def98ebb375329044c4ff0392b Mon Sep 17 00:00:00 2001
From: PajLe <pajle.ok@elfak.rs>
Date: Mon, 31 Aug 2020 16:50:31 +0200
Subject: [PATCH 04491/10326] changed comparing Duration to autoplay's
 reactionTime instead of 0
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.Rulesets.Osu/Replays/OsuAutoGenerator.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index 5a439734c6..9ef2ff9ebb 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -154,9 +154,9 @@ namespace osu.Game.Rulesets.Osu.Replays
             // The startPosition for the slider should not be its .Position, but the point on the circle whose tangent crosses the current cursor position
             // We also modify spinnerDirection so it spins in the direction it enters the spin circle, to make a smooth transition.
             // TODO: Shouldn't the spinner always spin in the same direction?
-            if (h is Spinner)
+            if (h is Spinner spinner)
             {
-                if ((h as Spinner).Duration == 0)
+                if (spinner.Duration < reactionTime)
                     return;
 
                 calcSpinnerStartPosAndDirection(((OsuReplayFrame)Frames[^1]).Position, out startPosition, out spinnerDirection);

From 69ec2a76ef1586f76bb26658fec7ab183cc7762e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 31 Aug 2020 17:20:45 +0200
Subject: [PATCH 04492/10326] Replace reaction time check with spins required
 check

---
 osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index 9ef2ff9ebb..76b2631894 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -156,7 +156,8 @@ namespace osu.Game.Rulesets.Osu.Replays
             // TODO: Shouldn't the spinner always spin in the same direction?
             if (h is Spinner spinner)
             {
-                if (spinner.Duration < reactionTime)
+                // spinners with 0 spins required will auto-complete - don't bother
+                if (spinner.SpinsRequired == 0)
                     return;
 
                 calcSpinnerStartPosAndDirection(((OsuReplayFrame)Frames[^1]).Position, out startPosition, out spinnerDirection);

From eafa97af17a1ef203ccd4f25759401ccce169cc0 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 31 Aug 2020 17:23:42 +0200
Subject: [PATCH 04493/10326] Revert changes done to SkinConfiguration and
 IHasCustomColours

---
 osu.Game/Beatmaps/Formats/IHasCustomColours.cs    | 2 +-
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs | 2 +-
 osu.Game/Skinning/SkinConfiguration.cs            | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/IHasCustomColours.cs b/osu.Game/Beatmaps/Formats/IHasCustomColours.cs
index 1ac5ca83cb..dba3a37545 100644
--- a/osu.Game/Beatmaps/Formats/IHasCustomColours.cs
+++ b/osu.Game/Beatmaps/Formats/IHasCustomColours.cs
@@ -8,6 +8,6 @@ namespace osu.Game.Beatmaps.Formats
 {
     public interface IHasCustomColours
     {
-        IDictionary<string, Color4> CustomColours { get; }
+        Dictionary<string, Color4> CustomColours { get; }
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 7972cc7d06..65d5851455 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Skinning
 
         public readonly int Keys;
 
-        public IDictionary<string, Color4> CustomColours { get; } = new SortedDictionary<string, Color4>();
+        public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
 
         public Dictionary<string, string> ImageLookups = new Dictionary<string, string>();
 
diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index 18d970dd64..2857ad3824 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Beatmaps.Formats;
 using osuTK.Graphics;
 
@@ -12,7 +10,7 @@ namespace osu.Game.Skinning
     /// <summary>
     /// An empty skin configuration.
     /// </summary>
-    public class SkinConfiguration : IEquatable<SkinConfiguration>, IHasComboColours, IHasCustomColours
+    public class SkinConfiguration : IHasComboColours, IHasCustomColours
     {
         public readonly SkinInfo SkinInfo = new SkinInfo();
 
@@ -47,10 +45,8 @@ namespace osu.Game.Skinning
 
         public void AddComboColours(params Color4[] colours) => comboColours.AddRange(colours);
 
-        public IDictionary<string, Color4> CustomColours { get; } = new SortedDictionary<string, Color4>();
+        public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
 
         public readonly SortedDictionary<string, string> ConfigDictionary = new SortedDictionary<string, string>();
-
-        public bool Equals(SkinConfiguration other) => other != null && ConfigDictionary.SequenceEqual(other.ConfigDictionary) && ((ComboColours == null && other.ComboColours == null) || ComboColours.SequenceEqual(other.ComboColours)) && CustomColours.SequenceEqual(other.CustomColours);
     }
 }

From 1484e78654743b8e68ead43811ed5735d681b13d Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 31 Aug 2020 17:24:00 +0200
Subject: [PATCH 04494/10326] Update xmldoc

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

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 89a776dd31..f725d55970 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -195,7 +195,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="info">The <see cref="BeatmapInfo"/> to save the content against. The file referenced by <see cref="BeatmapInfo.Path"/> will be replaced.</param>
         /// <param name="beatmapContent">The <see cref="IBeatmap"/> content to write.</param>
-        /// <param name="beatmapSkin">The beatmap <see cref="ISkin"/> content to write, or null if not to be changed.</param>
+        /// <param name="beatmapSkin">The beatmap <see cref="ISkin"/> content to write, null if to be omitted.</param>
         public void Save(BeatmapInfo info, IBeatmap beatmapContent, IBeatmapSkin beatmapSkin = null)
         {
             var setInfo = QueryBeatmapSet(s => s.Beatmaps.Any(b => b.ID == info.ID));

From fb37a14d577416754f17a569b9658989d7327c07 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 31 Aug 2020 17:24:03 +0200
Subject: [PATCH 04495/10326] Update LegacyBeatmapEncoder.cs

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index cae6a43cd4..53ce1c831c 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Beatmaps.Formats
         public const int LATEST_VERSION = 128;
 
         private readonly IBeatmap beatmap;
+
+        [CanBeNull]
         private readonly IBeatmapSkin skin;
 
         /// <summary>
@@ -64,7 +66,7 @@ namespace osu.Game.Beatmaps.Formats
             handleControlPoints(writer);
 
             writer.WriteLine();
-            handleComboColours(writer);
+            handleColours(writer);
 
             writer.WriteLine();
             handleHitObjects(writer);
@@ -209,9 +211,9 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
-        private void handleComboColours(TextWriter writer)
+        private void handleColours(TextWriter writer)
         {
-            var colours = skin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+            var colours = skin?.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
 
             if (colours == null || colours.Count == 0)
                 return;

From a893aa8af86b5037dc1662adfe789112a61afea7 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 31 Aug 2020 17:24:24 +0200
Subject: [PATCH 04496/10326] Cut down changes done to LegacyBeatmapEncoderTest

---
 .../Formats/LegacyBeatmapEncoderTest.cs       | 71 +++++--------------
 1 file changed, 16 insertions(+), 55 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index a8a3f266fc..bcc5970a27 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -7,10 +7,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Beatmaps;
@@ -44,7 +42,19 @@ namespace osu.Game.Tests.Beatmaps.Formats
             sort(decodedAfterEncode);
 
             Assert.That(decodedAfterEncode.beatmap.Serialize(), Is.EqualTo(decoded.beatmap.Serialize()));
-            Assert.IsTrue(decodedAfterEncode.beatmapSkin.Configuration.Equals(decoded.beatmapSkin.Configuration));
+            Assert.IsTrue(areComboColoursEqual(decodedAfterEncode.beatmapSkin.Configuration, decoded.beatmapSkin.Configuration));
+        }
+
+        private bool areComboColoursEqual(IHasComboColours a, IHasComboColours b)
+        {
+            // equal to null, no need to SequenceEqual
+            if (a.ComboColours == null && b.ComboColours == null)
+                return true;
+
+            if (a.ComboColours == null || b.ComboColours == null)
+                return false;
+
+            return a.ComboColours.SequenceEqual(b.ComboColours);
         }
 
         private void sort((IBeatmap beatmap, IBeatmapSkin beatmapSkin) tuple)
@@ -62,63 +72,14 @@ namespace osu.Game.Tests.Beatmaps.Formats
             using (var reader = new LineBufferedReader(stream))
             {
                 var beatmap = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(reader);
-
-                using (var rs = new MemoryBeatmapResourceStore(stream, name))
-                {
-                    var beatmapSkin = new TestLegacySkin(beatmap, rs, name);
-                    return (convert(beatmap), beatmapSkin);
-                }
+                var beatmapSkin = new TestLegacySkin(beatmaps_resource_store, name);
+                return (convert(beatmap), beatmapSkin);
             }
         }
 
-        private class MemoryBeatmapResourceStore : IResourceStore<byte[]>
-        {
-            private readonly Stream beatmapData;
-            private readonly string beatmapName;
-
-            public MemoryBeatmapResourceStore(Stream beatmapData, string beatmapName)
-            {
-                this.beatmapData = beatmapData;
-                this.beatmapName = beatmapName;
-            }
-
-            public void Dispose() => beatmapData.Dispose();
-
-            public byte[] Get(string name)
-            {
-                if (name != beatmapName)
-                    return null;
-
-                byte[] buffer = new byte[beatmapData.Length];
-                beatmapData.Read(buffer, 0, buffer.Length);
-                return buffer;
-            }
-
-            public async Task<byte[]> GetAsync(string name)
-            {
-                if (name != beatmapName)
-                    return null;
-
-                byte[] buffer = new byte[beatmapData.Length];
-                await beatmapData.ReadAsync(buffer.AsMemory());
-                return buffer;
-            }
-
-            public Stream GetStream(string name)
-            {
-                if (name != beatmapName)
-                    return null;
-
-                beatmapData.Seek(0, SeekOrigin.Begin);
-                return beatmapData;
-            }
-
-            public IEnumerable<string> GetAvailableResources() => beatmapName.Yield();
-        }
-
         private class TestLegacySkin : LegacySkin, IBeatmapSkin
         {
-            public TestLegacySkin(Beatmap beatmap, IResourceStore<byte[]> storage, string fileName)
+            public TestLegacySkin(IResourceStore<byte[]> storage, string fileName)
                 : base(new SkinInfo { Name = "Test Skin", Creator = "Craftplacer" }, storage, null, fileName)
             {
             }

From a290f7eeec4ecefb46dc4288eb98f94c909f492b Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 31 Aug 2020 17:34:18 +0200
Subject: [PATCH 04497/10326] Revert left-over type change in SkinConfiguration

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

diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index 2857ad3824..a55870aa6d 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -47,6 +47,6 @@ namespace osu.Game.Skinning
 
         public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
 
-        public readonly SortedDictionary<string, string> ConfigDictionary = new SortedDictionary<string, string>();
+        public readonly Dictionary<string, string> ConfigDictionary = new Dictionary<string, string>();
     }
 }

From 3cc169c933f2e4518fb9756d7905641d4fcf4167 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 31 Aug 2020 17:48:36 +0200
Subject: [PATCH 04498/10326] Remove set from properties in SkinConfiguration
 classes

I don't get why this wasn't resolved in the first place when this file was originally written.

*sigh*
---
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs | 2 +-
 osu.Game/Skinning/SkinConfiguration.cs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 65d5851455..35a6140cbc 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Skinning
 
         public readonly int Keys;
 
-        public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
+        public Dictionary<string, Color4> CustomColours { get; } = new Dictionary<string, Color4>();
 
         public Dictionary<string, string> ImageLookups = new Dictionary<string, string>();
 
diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index a55870aa6d..25a924c929 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Skinning
 
         public void AddComboColours(params Color4[] colours) => comboColours.AddRange(colours);
 
-        public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
+        public Dictionary<string, Color4> CustomColours { get; } = new Dictionary<string, Color4>();
 
         public readonly Dictionary<string, string> ConfigDictionary = new Dictionary<string, string>();
     }

From 9b3a48ee5e3426c8474232518755b429d563ff5d Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 31 Aug 2020 18:29:46 +0200
Subject: [PATCH 04499/10326] Revert "Add marker interface for beatmap skins"

---
 .../TestSceneLegacyBeatmapSkin.cs              |  2 +-
 .../TestSceneSkinFallbacks.cs                  | 18 +++++-------------
 .../Gameplay/TestSceneStoryboardSamples.cs     |  4 ++--
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs  |  2 +-
 osu.Game/Beatmaps/IWorkingBeatmap.cs           |  4 ++--
 osu.Game/Beatmaps/WorkingBeatmap.cs            |  8 ++++----
 .../Skinning/BeatmapSkinProvidingContainer.cs  |  4 ++--
 osu.Game/Skinning/DefaultBeatmapSkin.cs        |  9 ---------
 osu.Game/Skinning/IBeatmapSkin.cs              | 12 ------------
 osu.Game/Skinning/LegacyBeatmapSkin.cs         |  2 +-
 osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs |  2 +-
 11 files changed, 19 insertions(+), 48 deletions(-)
 delete mode 100644 osu.Game/Skinning/DefaultBeatmapSkin.cs
 delete mode 100644 osu.Game/Skinning/IBeatmapSkin.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 03d18cefef..3ff37c4147 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 this.hasColours = hasColours;
             }
 
-            protected override IBeatmapSkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, hasColours);
+            protected override ISkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, hasColours);
         }
 
         private class TestBeatmapSkin : LegacyBeatmapSkin
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 64da80a88e..075bf314bc 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -29,12 +29,12 @@ namespace osu.Game.Rulesets.Osu.Tests
     public class TestSceneSkinFallbacks : TestSceneOsuPlayer
     {
         private readonly TestSource testUserSkin;
-        private readonly BeatmapTestSource testBeatmapSkin;
+        private readonly TestSource testBeatmapSkin;
 
         public TestSceneSkinFallbacks()
         {
             testUserSkin = new TestSource("user");
-            testBeatmapSkin = new BeatmapTestSource();
+            testBeatmapSkin = new TestSource("beatmap");
         }
 
         [Test]
@@ -80,15 +80,15 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         public class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
         {
-            private readonly IBeatmapSkin skin;
+            private readonly ISkinSource skin;
 
-            public CustomSkinWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock frameBasedClock, AudioManager audio, IBeatmapSkin skin)
+            public CustomSkinWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock frameBasedClock, AudioManager audio, ISkinSource skin)
                 : base(beatmap, storyboard, frameBasedClock, audio)
             {
                 this.skin = skin;
             }
 
-            protected override IBeatmapSkin GetSkin() => skin;
+            protected override ISkin GetSkin() => skin;
         }
 
         public class SkinProvidingPlayer : TestPlayer
@@ -112,14 +112,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             }
         }
 
-        private class BeatmapTestSource : TestSource, IBeatmapSkin
-        {
-            public BeatmapTestSource()
-                : base("beatmap")
-            {
-            }
-        }
-
         public class TestSource : ISkinSource
         {
             private readonly string identifier;
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index bc9528beb6..b30870d057 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("sample playback rate matches mod rates", () => sample.Channel.AggregateFrequency.Value == expectedRate);
         }
 
-        private class TestSkin : LegacySkin, IBeatmapSkin
+        private class TestSkin : LegacySkin
         {
             public TestSkin(string resourceName, AudioManager audioManager)
                 : base(DefaultLegacySkin.Info, new TestResourceStore(resourceName), audioManager, "skin.ini")
@@ -156,7 +156,7 @@ namespace osu.Game.Tests.Gameplay
                 this.audio = audio;
             }
 
-            protected override IBeatmapSkin GetSkin() => new TestSkin("test-sample", audio);
+            protected override ISkin GetSkin() => new TestSkin("test-sample", audio);
         }
 
         private class TestDrawableStoryboardSample : DrawableStoryboardSample
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 44728cc251..39c5ccab27 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Beatmaps
                 return storyboard;
             }
 
-            protected override IBeatmapSkin GetSkin()
+            protected override ISkin GetSkin()
             {
                 try
                 {
diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index aac41725a9..31975157a0 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -42,9 +42,9 @@ namespace osu.Game.Beatmaps
         Storyboard Storyboard { get; }
 
         /// <summary>
-        /// Retrieves the <see cref="IBeatmapSkin"/> which this <see cref="WorkingBeatmap"/> provides.
+        /// Retrieves the <see cref="Skin"/> which this <see cref="WorkingBeatmap"/> provides.
         /// </summary>
-        IBeatmapSkin Skin { get; }
+        ISkin Skin { get; }
 
         /// <summary>
         /// Constructs a playable <see cref="IBeatmap"/> from <see cref="Beatmap"/> using the applicable converters for a specific <see cref="RulesetInfo"/>.
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 163b62a55c..b4bcf285b9 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Beatmaps
             background = new RecyclableLazy<Texture>(GetBackground, BackgroundStillValid);
             waveform = new RecyclableLazy<Waveform>(GetWaveform);
             storyboard = new RecyclableLazy<Storyboard>(GetStoryboard);
-            skin = new RecyclableLazy<IBeatmapSkin>(GetSkin);
+            skin = new RecyclableLazy<ISkin>(GetSkin);
 
             total_count.Value++;
         }
@@ -275,10 +275,10 @@ namespace osu.Game.Beatmaps
         private readonly RecyclableLazy<Storyboard> storyboard;
 
         public bool SkinLoaded => skin.IsResultAvailable;
-        public IBeatmapSkin Skin => skin.Value;
+        public ISkin Skin => skin.Value;
 
-        protected virtual IBeatmapSkin GetSkin() => new DefaultBeatmapSkin();
-        private readonly RecyclableLazy<IBeatmapSkin> skin;
+        protected virtual ISkin GetSkin() => new DefaultSkin();
+        private readonly RecyclableLazy<ISkin> skin;
 
         /// <summary>
         /// Transfer pieces of a beatmap to a new one, where possible, to save on loading.
diff --git a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
index 346bfe53b8..40335db697 100644
--- a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Skinning
     /// <summary>
     /// A container which overrides existing skin options with beatmap-local values.
     /// </summary>
-    public class BeatmapSkinProvidingContainer : SkinProvidingContainer, IBeatmapSkin
+    public class BeatmapSkinProvidingContainer : SkinProvidingContainer
     {
         private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
         private readonly Bindable<bool> beatmapHitsounds = new Bindable<bool>();
@@ -21,7 +21,7 @@ namespace osu.Game.Skinning
         protected override bool AllowTextureLookup(string componentName) => beatmapSkins.Value;
         protected override bool AllowSampleLookup(ISampleInfo componentName) => beatmapHitsounds.Value;
 
-        public BeatmapSkinProvidingContainer(IBeatmapSkin skin)
+        public BeatmapSkinProvidingContainer(ISkin skin)
             : base(skin)
         {
         }
diff --git a/osu.Game/Skinning/DefaultBeatmapSkin.cs b/osu.Game/Skinning/DefaultBeatmapSkin.cs
deleted file mode 100644
index 7b5ccd45c3..0000000000
--- a/osu.Game/Skinning/DefaultBeatmapSkin.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.Skinning
-{
-    public class DefaultBeatmapSkin : DefaultSkin, IBeatmapSkin
-    {
-    }
-}
diff --git a/osu.Game/Skinning/IBeatmapSkin.cs b/osu.Game/Skinning/IBeatmapSkin.cs
deleted file mode 100644
index 91caaed557..0000000000
--- a/osu.Game/Skinning/IBeatmapSkin.cs
+++ /dev/null
@@ -1,12 +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.Skinning
-{
-    /// <summary>
-    /// Marker interface for skins that originate from beatmaps.
-    /// </summary>
-    public interface IBeatmapSkin : ISkin
-    {
-    }
-}
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index d53349dd11..d647bc4a2d 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyBeatmapSkin : LegacySkin, IBeatmapSkin
+    public class LegacyBeatmapSkin : LegacySkin
     {
         protected override bool AllowManiaSkin => false;
         protected override bool UseCustomSampleBanks => true;
diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index db080d889f..ab4fb38657 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Tests.Beatmaps
                 this.resourceStore = resourceStore;
             }
 
-            protected override IBeatmapSkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, AudioManager);
+            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, AudioManager);
         }
     }
 }

From 2e2f26449d1304e6bcd0af00a7aa2e130bb9919d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 31 Aug 2020 19:23:19 +0200
Subject: [PATCH 04500/10326] Change anchoring to TopRight

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 2b2c40411d..44d7d0f765 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -227,13 +227,13 @@ namespace osu.Game.Screens.Select
                         {
                             createStarRatingDisplay(beatmapInfo).With(display =>
                             {
-                                display.Anchor = Anchor.CentreRight;
-                                display.Origin = Anchor.CentreRight;
+                                display.Anchor = Anchor.TopRight;
+                                display.Origin = Anchor.TopRight;
                             }),
                             StatusPill = new BeatmapSetOnlineStatusPill
                             {
-                                Anchor = Anchor.CentreRight,
-                                Origin = Anchor.CentreRight,
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
                                 TextSize = 11,
                                 TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
                                 Status = beatmapInfo.Status,

From 876fd21230a401d0d75877a3d681d167c2f38a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 31 Aug 2020 19:31:47 +0200
Subject: [PATCH 04501/10326] Apply shear to right-anchored items

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 44d7d0f765..ad977c70b5 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -223,17 +223,20 @@ namespace osu.Game.Screens.Select
                         Direction = FillDirection.Vertical,
                         Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
                         AutoSizeAxes = Axes.Both,
+                        Shear = wedged_container_shear,
                         Children = new[]
                         {
                             createStarRatingDisplay(beatmapInfo).With(display =>
                             {
                                 display.Anchor = Anchor.TopRight;
                                 display.Origin = Anchor.TopRight;
+                                display.Shear = -wedged_container_shear;
                             }),
                             StatusPill = new BeatmapSetOnlineStatusPill
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
                                 TextSize = 11,
                                 TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
                                 Status = beatmapInfo.Status,

From c8aa197e5b472f9b3389382106253d0eeea61cb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Sep 2020 11:36:18 +0900
Subject: [PATCH 04502/10326] 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 1a76a24496..d4a6d6759e 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.819.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.831.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d1e2033596..5cc2f61e86 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.819.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.831.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
     <PackageReference Include="Sentry" Version="2.1.5" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 9b25eaab41..e7addc1c2c 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.Framework.iOS" Version="2020.819.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.831.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.819.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.831.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From d45a1521a1e6441ec47f391c2575c5ac79239fb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Sep 2020 11:56:23 +0900
Subject: [PATCH 04503/10326] Update BindableList usages

---
 osu.Game/Overlays/ChatOverlay.cs              | 63 ++++++++++---------
 .../Sections/Graphics/LayoutSettings.cs       |  3 +-
 .../Screens/Edit/Timing/ControlPointTable.cs  |  3 +-
 osu.Game/Screens/Edit/Timing/TimingScreen.cs  |  3 +-
 .../Multi/Lounge/Components/RoomsContainer.cs | 18 +++++-
 5 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 5ba55f6d45..692175603c 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.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 osuTK;
 using osuTK.Graphics;
@@ -218,14 +219,13 @@ namespace osu.Game.Overlays
             Schedule(() =>
             {
                 // TODO: consider scheduling bindable callbacks to not perform when overlay is not present.
-                channelManager.JoinedChannels.ItemsAdded += onChannelAddedToJoinedChannels;
-                channelManager.JoinedChannels.ItemsRemoved += onChannelRemovedFromJoinedChannels;
+                channelManager.JoinedChannels.CollectionChanged += joinedChannelsChanged;
+
                 foreach (Channel channel in channelManager.JoinedChannels)
                     ChannelTabControl.AddChannel(channel);
 
-                channelManager.AvailableChannels.ItemsAdded += availableChannelsChanged;
-                channelManager.AvailableChannels.ItemsRemoved += availableChannelsChanged;
-                ChannelSelectionOverlay.UpdateAvailableChannels(channelManager.AvailableChannels);
+                channelManager.AvailableChannels.CollectionChanged += availableChannelsChanged;
+                availableChannelsChanged(null, null);
 
                 currentChannel = channelManager.CurrentChannel.GetBoundCopy();
                 currentChannel.BindValueChanged(currentChannelChanged, true);
@@ -384,34 +384,41 @@ namespace osu.Game.Overlays
             base.PopOut();
         }
 
-        private void onChannelAddedToJoinedChannels(IEnumerable<Channel> channels)
+        private void joinedChannelsChanged(object sender, NotifyCollectionChangedEventArgs args)
         {
-            foreach (Channel channel in channels)
-                ChannelTabControl.AddChannel(channel);
-        }
-
-        private void onChannelRemovedFromJoinedChannels(IEnumerable<Channel> channels)
-        {
-            foreach (Channel channel in channels)
+            switch (args.Action)
             {
-                ChannelTabControl.RemoveChannel(channel);
+                case NotifyCollectionChangedAction.Add:
+                    foreach (Channel channel in args.NewItems.Cast<Channel>())
+                        ChannelTabControl.AddChannel(channel);
+                    break;
 
-                var loaded = loadedChannels.Find(c => c.Channel == channel);
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (Channel channel in args.OldItems.Cast<Channel>())
+                    {
+                        ChannelTabControl.RemoveChannel(channel);
 
-                if (loaded != null)
-                {
-                    loadedChannels.Remove(loaded);
+                        var loaded = loadedChannels.Find(c => c.Channel == channel);
 
-                    // Because the container is only cleared in the async load callback of a new channel, it is forcefully cleared
-                    // to ensure that the previous channel doesn't get updated after it's disposed
-                    currentChannelContainer.Remove(loaded);
-                    loaded.Dispose();
-                }
+                        if (loaded != null)
+                        {
+                            loadedChannels.Remove(loaded);
+
+                            // Because the container is only cleared in the async load callback of a new channel, it is forcefully cleared
+                            // to ensure that the previous channel doesn't get updated after it's disposed
+                            currentChannelContainer.Remove(loaded);
+                            loaded.Dispose();
+                        }
+                    }
+
+                    break;
             }
         }
 
-        private void availableChannelsChanged(IEnumerable<Channel> channels)
-            => ChannelSelectionOverlay.UpdateAvailableChannels(channelManager.AvailableChannels);
+        private void availableChannelsChanged(object sender, NotifyCollectionChangedEventArgs args)
+        {
+            ChannelSelectionOverlay.UpdateAvailableChannels(channelManager.AvailableChannels);
+        }
 
         protected override void Dispose(bool isDisposing)
         {
@@ -420,10 +427,8 @@ namespace osu.Game.Overlays
             if (channelManager != null)
             {
                 channelManager.CurrentChannel.ValueChanged -= currentChannelChanged;
-                channelManager.JoinedChannels.ItemsAdded -= onChannelAddedToJoinedChannels;
-                channelManager.JoinedChannels.ItemsRemoved -= onChannelRemovedFromJoinedChannels;
-                channelManager.AvailableChannels.ItemsAdded -= availableChannelsChanged;
-                channelManager.AvailableChannels.ItemsRemoved -= availableChannelsChanged;
+                channelManager.JoinedChannels.CollectionChanged -= joinedChannelsChanged;
+                channelManager.AvailableChannels.CollectionChanged -= availableChannelsChanged;
             }
         }
 
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 00b7643332..4312b319c0 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -163,8 +163,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 scalingSettings.ForEach(s => s.TransferValueOnCommit = mode.NewValue == ScalingMode.Everything);
             }, true);
 
-            windowModes.ItemsAdded += _ => windowModesChanged();
-            windowModes.ItemsRemoved += _ => windowModesChanged();
+            windowModes.CollectionChanged += (sender, args) => windowModesChanged();
 
             windowModesChanged();
         }
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 5c59cfbfe8..c0c0bcead2 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -112,8 +112,7 @@ namespace osu.Game.Screens.Edit.Timing
                 };
 
                 controlPoints = group.ControlPoints.GetBoundCopy();
-                controlPoints.ItemsAdded += _ => createChildren();
-                controlPoints.ItemsRemoved += _ => createChildren();
+                controlPoints.CollectionChanged += (_, __) => createChildren();
 
                 createChildren();
             }
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index a08a660e7e..8c40c8e721 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -124,8 +124,7 @@ namespace osu.Game.Screens.Edit.Timing
                 selectedGroup.BindValueChanged(selected => { deleteButton.Enabled.Value = selected.NewValue != null; }, true);
 
                 controlGroups = Beatmap.Value.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
-                controlGroups.ItemsAdded += _ => createContent();
-                controlGroups.ItemsRemoved += _ => createContent();
+                controlGroups.CollectionChanged += (sender, args) => createContent();
                 createContent();
             }
 
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index 447c99039a..321d7b0a19 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -53,8 +54,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         protected override void LoadComplete()
         {
-            rooms.ItemsAdded += addRooms;
-            rooms.ItemsRemoved += removeRooms;
+            rooms.CollectionChanged += roomsChanged;
             roomManager.RoomsUpdated += updateSorting;
 
             rooms.BindTo(roomManager.Rooms);
@@ -82,6 +82,20 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             });
         }
 
+        private void roomsChanged(object sender, NotifyCollectionChangedEventArgs args)
+        {
+            switch (args.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    addRooms(args.NewItems.Cast<Room>());
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    removeRooms(args.OldItems.Cast<Room>());
+                    break;
+            }
+        }
+
         private void addRooms(IEnumerable<Room> rooms)
         {
             foreach (var room in rooms)

From d1f79a6a488a9b8f07f88e35d7b96ac71192a458 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Aug 2020 20:00:24 +0900
Subject: [PATCH 04504/10326] Fix potentially incorrect zoom level getting set
 on very short audio track

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 717d60b4f3..ce2954f301 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }, true);
         }
 
-        private float getZoomLevelForVisibleMilliseconds(double milliseconds) => (float)(track.Length / milliseconds);
+        private float getZoomLevelForVisibleMilliseconds(double milliseconds) => Math.Max(1, (float)(track.Length / milliseconds));
 
         /// <summary>
         /// The timeline's scroll position in the last frame.

From 9e3b809cab6f61489f90379327928768778672fb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Sep 2020 15:42:47 +0900
Subject: [PATCH 04505/10326] Rename to user_score to match API

---
 osu.Game/Online/Multiplayer/APILeaderboard.cs               | 4 ++--
 osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/APILeaderboard.cs b/osu.Game/Online/Multiplayer/APILeaderboard.cs
index 96fe7cefb0..65863d6e0e 100644
--- a/osu.Game/Online/Multiplayer/APILeaderboard.cs
+++ b/osu.Game/Online/Multiplayer/APILeaderboard.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Online.Multiplayer
         [JsonProperty("leaderboard")]
         public List<APIUserScoreAggregate> Leaderboard;
 
-        [JsonProperty("own_score")]
-        public APIUserScoreAggregate OwnScore;
+        [JsonProperty("user_score")]
+        public APIUserScoreAggregate UserScore;
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index 50afbb39fe..5bf61eb4ee 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             req.Success += r =>
             {
                 scoresCallback?.Invoke(r.Leaderboard);
-                TopScore = r.OwnScore;
+                TopScore = r.UserScore;
             };
 
             return req;

From 26b4226b5538c9f95657fdc985b9a873c763b4f1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Sep 2020 16:55:10 +0900
Subject: [PATCH 04506/10326] Fix ModTimeRamp not working

---
 osu.Game/Screens/Play/Player.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 9be4fd6a65..07be482529 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -52,6 +52,9 @@ namespace osu.Game.Screens.Play
 
         public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
 
+        // We are managing our own adjustments (see OnEntering/OnExiting).
+        public override bool AllowRateAdjustments => false;
+
         /// <summary>
         /// Whether gameplay should pause when the game window focus is lost.
         /// </summary>
@@ -627,6 +630,10 @@ namespace osu.Game.Screens.Play
 
             foreach (var mod in Mods.Value.OfType<IApplicableToHUD>())
                 mod.ApplyToHUD(HUDOverlay);
+
+            Beatmap.Value.Track.ResetSpeedAdjustments();
+            foreach (var mod in Mods.Value.OfType<IApplicableToTrack>())
+                mod.ApplyToTrack(Beatmap.Value.Track);
         }
 
         public override void OnSuspending(IScreen next)
@@ -660,6 +667,8 @@ namespace osu.Game.Screens.Play
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             GameplayClockContainer?.StopUsingBeatmapClock();
 
+            Beatmap.Value.Track.ResetSpeedAdjustments();
+
             fadeOut();
             return base.OnExiting(next);
         }

From 7e1844ed773368a4b932ea0e2d7fc87fa0fc53b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Sep 2020 18:07:19 +0900
Subject: [PATCH 04507/10326] Fix track adjusments being reset incorrectly

---
 osu.Game/Screens/Play/Player.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 07be482529..82c446f5e4 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -80,6 +80,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         private SampleChannel sampleRestart;
 
         public BreakOverlay BreakOverlay;
@@ -631,9 +634,12 @@ namespace osu.Game.Screens.Play
             foreach (var mod in Mods.Value.OfType<IApplicableToHUD>())
                 mod.ApplyToHUD(HUDOverlay);
 
-            Beatmap.Value.Track.ResetSpeedAdjustments();
+            // Our mods are local copies of the global mods so they need to be re-applied to the track.
+            // This is done through the music controller (for now), because resetting speed adjustments on the beatmap track also removes adjustments provided by DrawableTrack.
+            // Todo: In the future, player will receive in a track and will probably not have to worry about this...
+            musicController.ResetTrackAdjustments();
             foreach (var mod in Mods.Value.OfType<IApplicableToTrack>())
-                mod.ApplyToTrack(Beatmap.Value.Track);
+                mod.ApplyToTrack(musicController.CurrentTrack);
         }
 
         public override void OnSuspending(IScreen next)
@@ -667,7 +673,7 @@ namespace osu.Game.Screens.Play
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             GameplayClockContainer?.StopUsingBeatmapClock();
 
-            Beatmap.Value.Track.ResetSpeedAdjustments();
+            musicController.ResetTrackAdjustments();
 
             fadeOut();
             return base.OnExiting(next);

From e4cb7eb964b6b5b7e1072c0a1efa9d613351da59 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Sep 2020 17:28:41 +0900
Subject: [PATCH 04508/10326] Initial structure

---
 osu.Game/Collections/CollectionManager.cs | 93 +++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 osu.Game/Collections/CollectionManager.cs

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
new file mode 100644
index 0000000000..1058e7b5b8
--- /dev/null
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -0,0 +1,93 @@
+// Copyright (c) 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.Threading.Tasks;
+using osu.Framework.Logging;
+using osu.Framework.Platform;
+using osu.Game.Beatmaps;
+using osu.Game.IO.Legacy;
+
+namespace osu.Game.Collections
+{
+    public class CollectionManager
+    {
+        private const string import_from_stable_path = "collection.db";
+
+        private readonly BeatmapManager beatmaps;
+
+        public CollectionManager(BeatmapManager beatmaps)
+        {
+            this.beatmaps = beatmaps;
+        }
+
+        /// <summary>
+        /// Set a storage with access to an osu-stable install for import purposes.
+        /// </summary>
+        public Func<Storage> GetStableStorage { private get; set; }
+
+        /// <summary>
+        /// This is a temporary method and will likely be replaced by a full-fledged (and more correctly placed) migration process in the future.
+        /// </summary>
+        public Task ImportFromStableAsync()
+        {
+            var stable = GetStableStorage?.Invoke();
+
+            if (stable == null)
+            {
+                Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
+                return Task.CompletedTask;
+            }
+
+            if (!stable.ExistsDirectory(import_from_stable_path))
+            {
+                // This handles situations like when the user does not have a Skins folder
+                Logger.Log($"No {import_from_stable_path} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
+                return Task.CompletedTask;
+            }
+
+            return Task.Run(async () => await Import(GetStableImportPaths(GetStableStorage()).Select(f => stable.GetFullPath(f)).ToArray()));
+        }
+
+        private List<BeatmapCollection> readCollection(Stream stream)
+        {
+            var result = new List<BeatmapCollection>();
+
+            using (var reader = new SerializationReader(stream))
+            {
+                reader.ReadInt32(); // Version
+
+                int collectionCount = reader.ReadInt32();
+                result.Capacity = collectionCount;
+
+                for (int i = 0; i < collectionCount; i++)
+                {
+                    var collection = new BeatmapCollection { Name = reader.ReadString() };
+
+                    int mapCount = reader.ReadInt32();
+                    collection.Beatmaps.Capacity = mapCount;
+
+                    for (int j = 0; j < mapCount; j++)
+                    {
+                        string checksum = reader.ReadString();
+
+                        var beatmap = beatmaps.QueryBeatmap(b => b.MD5Hash == checksum);
+                        if (beatmap != null)
+                            collection.Beatmaps.Add(beatmap);
+                    }
+                }
+            }
+
+            return result;
+        }
+    }
+
+    public class BeatmapCollection
+    {
+        public string Name;
+
+        public readonly List<BeatmapInfo> Beatmaps = new List<BeatmapInfo>();
+    }
+}

From 78648cb90d409878171b9b9cc500a4d9adae28cc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Sep 2020 19:33:06 +0900
Subject: [PATCH 04509/10326] Add reading from local file

---
 osu.Game/Collections/CollectionManager.cs | 65 +++++++++++++----------
 osu.Game/OsuGameBase.cs                   |  7 +++
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 1058e7b5b8..302d892efb 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -4,23 +4,33 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading.Tasks;
-using osu.Framework.Logging;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.IO.Legacy;
 
 namespace osu.Game.Collections
 {
-    public class CollectionManager
+    public class CollectionManager : CompositeDrawable
     {
-        private const string import_from_stable_path = "collection.db";
+        private const string database_name = "collection.db";
 
-        private readonly BeatmapManager beatmaps;
+        public IBindableList<BeatmapCollection> Collections => collections;
+        private readonly BindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
 
-        public CollectionManager(BeatmapManager beatmaps)
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
         {
-            this.beatmaps = beatmaps;
+            if (host.Storage.Exists(database_name))
+            {
+                using (var stream = host.Storage.GetStream(database_name))
+                    collections.AddRange(readCollection(stream));
+            }
         }
 
         /// <summary>
@@ -31,26 +41,25 @@ namespace osu.Game.Collections
         /// <summary>
         /// This is a temporary method and will likely be replaced by a full-fledged (and more correctly placed) migration process in the future.
         /// </summary>
-        public Task ImportFromStableAsync()
-        {
-            var stable = GetStableStorage?.Invoke();
-
-            if (stable == null)
-            {
-                Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
-                return Task.CompletedTask;
-            }
-
-            if (!stable.ExistsDirectory(import_from_stable_path))
-            {
-                // This handles situations like when the user does not have a Skins folder
-                Logger.Log($"No {import_from_stable_path} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
-                return Task.CompletedTask;
-            }
-
-            return Task.Run(async () => await Import(GetStableImportPaths(GetStableStorage()).Select(f => stable.GetFullPath(f)).ToArray()));
-        }
-
+        // public Task ImportFromStableAsync()
+        // {
+        //     var stable = GetStableStorage?.Invoke();
+        //
+        //     if (stable == null)
+        //     {
+        //         Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
+        //         return Task.CompletedTask;
+        //     }
+        //
+        //     if (!stable.ExistsDirectory(database_name))
+        //     {
+        //         // This handles situations like when the user does not have a Skins folder
+        //         Logger.Log($"No {database_name} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
+        //         return Task.CompletedTask;
+        //     }
+        //
+        //     return Task.Run(async () => await Import(GetStableImportPaths(GetStableStorage()).Select(f => stable.GetFullPath(f)).ToArray()));
+        // }
         private List<BeatmapCollection> readCollection(Stream stream)
         {
             var result = new List<BeatmapCollection>();
@@ -77,6 +86,8 @@ namespace osu.Game.Collections
                         if (beatmap != null)
                             collection.Beatmaps.Add(beatmap);
                     }
+
+                    result.Add(collection);
                 }
             }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 98f60d52d3..3ba164e87f 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -26,6 +26,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
 using osu.Framework.Logging;
 using osu.Game.Audio;
+using osu.Game.Collections;
 using osu.Game.Database;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
@@ -55,6 +56,8 @@ namespace osu.Game
 
         protected BeatmapManager BeatmapManager;
 
+        protected CollectionManager CollectionManager;
+
         protected ScoreManager ScoreManager;
 
         protected SkinManager SkinManager;
@@ -222,6 +225,10 @@ namespace osu.Game
             dependencies.Cache(difficultyManager);
             AddInternal(difficultyManager);
 
+            var collectionManager = new CollectionManager();
+            dependencies.Cache(collectionManager);
+            AddInternal(collectionManager);
+
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
             dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore));

From c2ade44656c3ea7d397d39652c77a70056d8fe1c Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Tue, 1 Sep 2020 17:58:06 +0200
Subject: [PATCH 04510/10326] Change types back

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 6 +++---
 osu.Game/Beatmaps/BeatmapManager.cs                         | 2 +-
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs           | 4 ++--
 osu.Game/Screens/Edit/EditorBeatmap.cs                      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index bcc5970a27..613db79242 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             return a.ComboColours.SequenceEqual(b.ComboColours);
         }
 
-        private void sort((IBeatmap beatmap, IBeatmapSkin beatmapSkin) tuple)
+        private void sort((IBeatmap beatmap, ISkin beatmapSkin) tuple)
         {
             // Sort control points to ensure a sane ordering, as they may be parsed in different orders. This works because each group contains only uniquely-typed control points.
             foreach (var g in tuple.beatmap.ControlPointInfo.Groups)
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private class TestLegacySkin : LegacySkin, IBeatmapSkin
+        private class TestLegacySkin : LegacySkin, ISkin
         {
             public TestLegacySkin(IResourceStore<byte[]> storage, string fileName)
                 : base(new SkinInfo { Name = "Test Skin", Creator = "Craftplacer" }, storage, null, fileName)
@@ -85,7 +85,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private Stream encodeToLegacy((IBeatmap beatmap, IBeatmapSkin beatmapSkin) fullBeatmap)
+        private Stream encodeToLegacy((IBeatmap beatmap, ISkin beatmapSkin) fullBeatmap)
         {
             var (beatmap, beatmapSkin) = fullBeatmap;
             var stream = new MemoryStream();
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index f725d55970..a96af68714 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Beatmaps
         /// <param name="info">The <see cref="BeatmapInfo"/> to save the content against. The file referenced by <see cref="BeatmapInfo.Path"/> will be replaced.</param>
         /// <param name="beatmapContent">The <see cref="IBeatmap"/> content to write.</param>
         /// <param name="beatmapSkin">The beatmap <see cref="ISkin"/> content to write, null if to be omitted.</param>
-        public void Save(BeatmapInfo info, IBeatmap beatmapContent, IBeatmapSkin beatmapSkin = null)
+        public void Save(BeatmapInfo info, IBeatmap beatmapContent, ISkin beatmapSkin = null)
         {
             var setInfo = QueryBeatmapSet(s => s.Beatmaps.Any(b => b.ID == info.ID));
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 53ce1c831c..80a4d6dea4 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -27,14 +27,14 @@ namespace osu.Game.Beatmaps.Formats
         private readonly IBeatmap beatmap;
 
         [CanBeNull]
-        private readonly IBeatmapSkin skin;
+        private readonly ISkin skin;
 
         /// <summary>
         /// Creates a new <see cref="LegacyBeatmapEncoder"/>.
         /// </summary>
         /// <param name="beatmap">The beatmap to encode.</param>
         /// <param name="skin">The beatmap's skin, used for encoding combo colours.</param>
-        public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] IBeatmapSkin skin)
+        public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] ISkin skin)
         {
             this.beatmap = beatmap;
             this.skin = skin;
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index a314d50e60..061009e519 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Edit
 
         public readonly IBeatmap PlayableBeatmap;
 
-        public readonly IBeatmapSkin BeatmapSkin;
+        public readonly ISkin BeatmapSkin;
 
         [Resolved]
         private BindableBeatDivisor beatDivisor { get; set; }
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Edit
 
         private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();
 
-        public EditorBeatmap(IBeatmap playableBeatmap, IBeatmapSkin beatmapSkin = null)
+        public EditorBeatmap(IBeatmap playableBeatmap, ISkin beatmapSkin = null)
         {
             PlayableBeatmap = playableBeatmap;
             BeatmapSkin = beatmapSkin;

From 2a7259f7aa76d1dac116af9b6d0f016ab15db2bb Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Tue, 1 Sep 2020 18:15:46 +0200
Subject: [PATCH 04511/10326] Update LegacyBeatmapEncoderTest.cs

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 613db79242..6e103af3f0 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private class TestLegacySkin : LegacySkin, ISkin
+        private class TestLegacySkin : LegacySkin
         {
             public TestLegacySkin(IResourceStore<byte[]> storage, string fileName)
                 : base(new SkinInfo { Name = "Test Skin", Creator = "Craftplacer" }, storage, null, fileName)

From ba8a4eb6f0ffd493b346701a8d1886796f6736c5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 29 Aug 2020 23:14:29 +0300
Subject: [PATCH 04512/10326] Move osu!catch combo counter display to inside
 CatcherArea

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs | 19 ++-----------------
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs    | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index d4a1740c12..409ea6dbc6 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -28,7 +28,8 @@ namespace osu.Game.Rulesets.Catch.UI
         public const float CENTER_X = WIDTH / 2;
 
         internal readonly CatcherArea CatcherArea;
-        private readonly CatchComboDisplay comboDisplay;
+
+        private CatchComboDisplay comboDisplay => CatcherArea.ComboDisplay;
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             // only check the X position; handle all vertical space.
@@ -49,22 +50,12 @@ namespace osu.Game.Rulesets.Catch.UI
                 Origin = Anchor.TopLeft,
             };
 
-            comboDisplay = new CatchComboDisplay
-            {
-                RelativeSizeAxes = Axes.None,
-                AutoSizeAxes = Axes.Both,
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.Centre,
-                Y = 30f,
-            };
-
             InternalChildren = new[]
             {
                 explodingFruitContainer,
                 CatcherArea.MovableCatcher.CreateProxiedContent(),
                 HitObjectContainer,
                 CatcherArea,
-                comboDisplay,
             };
         }
 
@@ -81,12 +72,6 @@ namespace osu.Game.Rulesets.Catch.UI
             fruit.CheckPosition = CheckIfWeCanCatch;
         }
 
-        protected override void Update()
-        {
-            base.Update();
-            comboDisplay.X = CatcherArea.MovableCatcher.X;
-        }
-
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             var catchObject = (DrawableCatchHitObject)judgedObject;
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 03ebf01b9b..9cfb9f41d7 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Catch.UI
         public Func<CatchHitObject, DrawableHitObject<CatchHitObject>> CreateDrawableRepresentation;
 
         public readonly Catcher MovableCatcher;
+        internal readonly CatchComboDisplay ComboDisplay;
 
         public Container ExplodingFruitTarget
         {
@@ -34,7 +35,19 @@ namespace osu.Game.Rulesets.Catch.UI
         public CatcherArea(BeatmapDifficulty difficulty = null)
         {
             Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
-            Child = MovableCatcher = new Catcher(this, difficulty) { X = CatchPlayfield.CENTER_X };
+            Children = new Drawable[]
+            {
+                ComboDisplay = new CatchComboDisplay
+                {
+                    RelativeSizeAxes = Axes.None,
+                    AutoSizeAxes = Axes.Both,
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.Centre,
+                    Margin = new MarginPadding { Bottom = 350f },
+                    X = CatchPlayfield.CENTER_X
+                },
+                MovableCatcher = new Catcher(this, difficulty) { X = CatchPlayfield.CENTER_X },
+            };
         }
 
         public void OnResult(DrawableCatchHitObject fruit, JudgementResult result)
@@ -105,6 +118,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (state?.CatcherX != null)
                 MovableCatcher.X = state.CatcherX.Value;
+
+            ComboDisplay.X = MovableCatcher.X;
         }
     }
 }

From a0a45010080308898c088430c8aa3e66db4ce98d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 29 Aug 2020 23:23:36 +0300
Subject: [PATCH 04513/10326] Merge remote-tracking branch 'upstream/master'
 into catch-combo-counter

---
 .../Mods/TestSceneCatchModRelax.cs            |  84 ++++++++++++
 .../TestSceneHyperDash.cs                     |  42 ++++--
 .../Beatmaps/CatchBeatmapProcessor.cs         |   6 +
 osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs |   2 +-
 .../Skinning/CatchLegacySkinTransformer.cs    |   8 +-
 .../Skinning/LegacyFruitPiece.cs              |   3 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |   9 +-
 .../UI/CatcherTrailDisplay.cs                 |   8 +-
 .../Skinning/ColumnTestContainer.cs           |  24 ++--
 .../Skinning/ManiaHitObjectTestScene.cs       |   4 +-
 .../Skinning/TestSceneStageBackground.cs      |   4 +-
 .../Skinning/TestSceneStageForeground.cs      |   3 +-
 .../Beatmaps/StageDefinition.cs               |   4 +-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  10 ++
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |  11 +-
 .../Objects/Drawables/DrawableHoldNote.cs     |  92 ++++++++++++-
 .../Objects/Drawables/DrawableHoldNoteHead.cs |   8 ++
 .../Drawables/DrawableManiaHitObject.cs       |   2 +-
 .../Skinning/HitTargetInsetContainer.cs       |  46 +++++++
 .../Skinning/LegacyBodyPiece.cs               | 109 ++++++++++++++--
 .../Skinning/LegacyColumnBackground.cs        |  65 +--------
 .../Skinning/LegacyHitTarget.cs               |   7 +-
 .../Skinning/LegacyKeyArea.cs                 |   3 +
 .../Skinning/LegacyStageBackground.cs         |  88 ++++++++++++-
 .../Skinning/ManiaLegacySkinTransformer.cs    |  10 +-
 osu.Game.Rulesets.Mania/UI/Column.cs          |   2 -
 osu.Game.Rulesets.Mania/UI/ColumnFlow.cs      | 105 +++++++++++++++
 osu.Game.Rulesets.Mania/UI/Stage.cs           |  69 ++--------
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  52 +++++---
 .../Skinning/LegacyMainCirclePiece.cs         |   3 +-
 .../Skinning/LegacySliderBall.cs              |   6 +-
 .../Skinning/LegacyCirclePiece.cs             |   2 +-
 .../Skinning/LegacyDrumRoll.cs                |   8 +-
 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs |   8 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  33 +++--
 .../Beatmaps/BeatmapDifficultyManagerTest.cs  |  32 +++++
 .../Formats/LegacyScoreDecoderTest.cs         |  70 ++++++++++
 ...tSceneHitObjectComposerDistanceSnapping.cs |  14 +-
 .../Filtering/FilterQueryParserTest.cs        |  16 ++-
 .../Resources/Replays/mania-replay.osr        | Bin 0 -> 1012 bytes
 .../Resources/skin-zero-alpha-colour.ini      |   5 -
 osu.Game.Tests/Skins/LegacySkinDecoderTest.cs |  10 --
 .../TestSceneBeatmapSetOverlaySuccessRate.cs  |  28 ++++
 .../Ranking/TestSceneSimpleStatisticTable.cs  |  68 ++++++++++
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs |  14 +-
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    |   4 -
 osu.Game/Online/Chat/MessageFormatter.cs      |   2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  13 +-
 .../Rulesets/Edit/IPositionSnapProvider.cs    |   1 +
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs |  26 ++--
 osu.Game/Screens/Menu/IntroSequence.cs        |   1 +
 .../Ranking/Statistics/SimpleStatisticItem.cs |  81 ++++++++++++
 .../Statistics/SimpleStatisticTable.cs        | 123 ++++++++++++++++++
 .../Ranking/Statistics/StatisticContainer.cs  |  60 +++++----
 .../Ranking/Statistics/StatisticItem.cs       |   2 +-
 .../Ranking/Statistics/StatisticsPanel.cs     |   6 +-
 .../Ranking/Statistics/UnstableRate.cs        |  39 ++++++
 osu.Game/Screens/Select/BeatmapDetails.cs     |   2 +-
 .../Screens/Select/Details/FailRetryGraph.cs  |  20 ++-
 osu.Game/Screens/Select/FilterQueryParser.cs  |   3 +-
 .../Skinning/LegacyColourCompatibility.cs     |  46 +++++++
 .../Skinning/LegacyManiaSkinConfiguration.cs  |   3 +
 .../LegacyManiaSkinConfigurationLookup.cs     |   3 +
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs   |   9 ++
 osu.Game/Skinning/LegacySkin.cs               |  20 +++
 65 files changed, 1352 insertions(+), 309 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.cs
 create mode 100644 osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
 create mode 100644 osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
 create mode 100644 osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
 create mode 100644 osu.Game.Tests/Resources/Replays/mania-replay.osr
 delete mode 100644 osu.Game.Tests/Resources/skin-zero-alpha-colour.ini
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticTable.cs
 create mode 100644 osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
 create mode 100644 osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
 create mode 100644 osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
 create mode 100644 osu.Game/Skinning/LegacyColourCompatibility.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
new file mode 100644
index 0000000000..1eb0975010
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -0,0 +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 System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Mods;
+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.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Tests.Mods
+{
+    public class TestSceneCatchModRelax : ModTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
+
+        [Test]
+        public void TestModRelax() => CreateModTest(new ModTestData
+        {
+            Mod = new CatchModRelax(),
+            Autoplay = false,
+            PassCondition = passCondition,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Fruit
+                    {
+                        X = CatchPlayfield.CENTER_X,
+                        StartTime = 0
+                    },
+                    new Fruit
+                    {
+                        X = 0,
+                        StartTime = 250
+                    },
+                    new Fruit
+                    {
+                        X = CatchPlayfield.WIDTH,
+                        StartTime = 500
+                    },
+                    new JuiceStream
+                    {
+                        X = CatchPlayfield.CENTER_X,
+                        StartTime = 750,
+                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 })
+                    }
+                }
+            }
+        });
+
+        private bool passCondition()
+        {
+            var playfield = this.ChildrenOfType<CatchPlayfield>().Single();
+
+            switch (Player.ScoreProcessor.Combo.Value)
+            {
+                case 0:
+                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre);
+                    break;
+
+                case 1:
+                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.BottomLeft);
+                    break;
+
+                case 2:
+                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.BottomRight);
+                    break;
+
+                case 3:
+                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre);
+                    break;
+            }
+
+            return Player.ScoreProcessor.Combo.Value >= 6;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 6dab2a0b56..db09b2bc6b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -19,25 +19,43 @@ namespace osu.Game.Rulesets.Catch.Tests
     {
         protected override bool Autoplay => true;
 
+        private int hyperDashCount;
+        private bool inHyperDash;
+
         [Test]
         public void TestHyperDash()
         {
-            AddAssert("First note is hyperdash", () => Beatmap.Value.Beatmap.HitObjects[0] is Fruit f && f.HyperDash);
-            AddUntilStep("wait for right movement", () => getCatcher().Scale.X > 0); // don't check hyperdashing as it happens too fast.
-
-            AddUntilStep("wait for left movement", () => getCatcher().Scale.X < 0);
-
-            for (int i = 0; i < 3; i++)
+            AddStep("reset count", () =>
             {
-                AddUntilStep("wait for right hyperdash", () => getCatcher().Scale.X > 0 && getCatcher().HyperDashing);
-                AddUntilStep("wait for left hyperdash", () => getCatcher().Scale.X < 0 && getCatcher().HyperDashing);
+                inHyperDash = false;
+                hyperDashCount = 0;
+
+                // this needs to be done within the frame stable context due to how quickly hyperdash state changes occur.
+                Player.DrawableRuleset.FrameStableComponents.OnUpdate += d =>
+                {
+                    var catcher = Player.ChildrenOfType<CatcherArea>().FirstOrDefault()?.MovableCatcher;
+
+                    if (catcher == null)
+                        return;
+
+                    if (catcher.HyperDashing != inHyperDash)
+                    {
+                        inHyperDash = catcher.HyperDashing;
+                        if (catcher.HyperDashing)
+                            hyperDashCount++;
+                    }
+                };
+            });
+
+            AddAssert("First note is hyperdash", () => Beatmap.Value.Beatmap.HitObjects[0] is Fruit f && f.HyperDash);
+
+            for (int i = 0; i < 9; i++)
+            {
+                int count = i + 1;
+                AddUntilStep($"wait for hyperdash #{count}", () => hyperDashCount >= count);
             }
-
-            AddUntilStep("wait for right hyperdash", () => getCatcher().Scale.X > 0 && getCatcher().HyperDashing);
         }
 
-        private Catcher getCatcher() => Player.ChildrenOfType<CatcherArea>().First().MovableCatcher;
-
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 15e6e98f5a..a08c5b6fb1 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -212,6 +212,12 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             objectWithDroplets.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime));
 
             double halfCatcherWidth = Catcher.CalculateCatchWidth(beatmap.BeatmapInfo.BaseDifficulty) / 2;
+
+            // Todo: This is wrong. osu!stable calculated hyperdashes using the full catcher size, excluding the margins.
+            // This should theoretically cause impossible scenarios, but practically, likely due to the size of the playfield, it doesn't seem possible.
+            // For now, to bring gameplay (and diffcalc!) completely in-line with stable, this code also uses the full catcher size.
+            halfCatcherWidth /= Catcher.ALLOWED_CATCH_RANGE;
+
             int lastDirection = 0;
             double lastExcess = halfCatcherWidth;
 
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
index c1d24395e4..1e42c6a240 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 
             protected override bool OnMouseMove(MouseMoveEvent e)
             {
-                catcher.UpdatePosition(e.MousePosition.X / DrawSize.X);
+                catcher.UpdatePosition(e.MousePosition.X / DrawSize.X * CatchPlayfield.WIDTH);
                 return base.OnMouseMove(e);
             }
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 28cd0fb65b..47224bd195 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK;
+using osuTK.Graphics;
 using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Catch.Skinning
@@ -71,7 +72,12 @@ namespace osu.Game.Rulesets.Catch.Skinning
             switch (lookup)
             {
                 case CatchSkinColour colour:
-                    return Source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+                    var result = (Bindable<Color4>)Source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+                    if (result == null)
+                        return null;
+
+                    result.Value = LegacyColourCompatibility.DisallowZeroAlpha(result.Value);
+                    return (IBindable<TValue>)result;
             }
 
             return Source.GetConfig<TLookup, TValue>(lookup);
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 5be54d3882..381d066750 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 colouredSprite = new Sprite
                 {
                     Texture = skin.GetTexture(lookupName),
-                    Colour = drawableObject.AccentColour.Value,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                 },
@@ -76,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
         {
             base.LoadComplete();
 
-            accentColour.BindValueChanged(colour => colouredSprite.Colour = colour.NewValue, true);
+            accentColour.BindValueChanged(colour => colouredSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue), true);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 952ff6b0ce..9289a6162c 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// The width of the catcher which can receive fruit. Equivalent to "catchMargin" in osu-stable.
         /// </summary>
-        private const float allowed_catch_range = 0.8f;
+        public const float ALLOWED_CATCH_RANGE = 0.8f;
 
         /// <summary>
         /// The drawable catcher for <see cref="CurrentState"/>.
@@ -166,7 +166,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         /// <param name="scale">The scale of the catcher.</param>
         internal static float CalculateCatchWidth(Vector2 scale)
-            => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * allowed_catch_range;
+            => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * ALLOWED_CATCH_RANGE;
 
         /// <summary>
         /// Calculates the width of the area used for attempting catches in gameplay.
@@ -285,8 +285,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void runHyperDashStateTransition(bool hyperDashing)
         {
-            trails.HyperDashTrailsColour = hyperDashColour;
-            trails.EndGlowSpritesColour = hyperDashEndGlowColour;
             updateTrailVisibility();
 
             if (hyperDashing)
@@ -403,6 +401,9 @@ namespace osu.Game.Rulesets.Catch.UI
                 skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage)?.Value ??
                 hyperDashColour;
 
+            trails.HyperDashTrailsColour = hyperDashColour;
+            trails.EndGlowSpritesColour = hyperDashEndGlowColour;
+
             runHyperDashStateTransition(HyperDashing);
         }
 
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
index bab3cb748b..f7e9fd19a7 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.UI
         private readonly Container<CatcherTrailSprite> hyperDashTrails;
         private readonly Container<CatcherTrailSprite> endGlowSprites;
 
-        private Color4 hyperDashTrailsColour;
+        private Color4 hyperDashTrailsColour = Catcher.DEFAULT_HYPER_DASH_COLOUR;
 
         public Color4 HyperDashTrailsColour
         {
@@ -35,11 +35,11 @@ namespace osu.Game.Rulesets.Catch.UI
                     return;
 
                 hyperDashTrailsColour = value;
-                hyperDashTrails.FadeColour(hyperDashTrailsColour, Catcher.HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+                hyperDashTrails.Colour = hyperDashTrailsColour;
             }
         }
 
-        private Color4 endGlowSpritesColour;
+        private Color4 endGlowSpritesColour = Catcher.DEFAULT_HYPER_DASH_COLOUR;
 
         public Color4 EndGlowSpritesColour
         {
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     return;
 
                 endGlowSpritesColour = value;
-                endGlowSprites.FadeColour(endGlowSpritesColour, Catcher.HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+                endGlowSprites.Colour = endGlowSpritesColour;
             }
         }
 
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
index ff4865c71d..8ba58e3af3 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
@@ -22,18 +22,22 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached]
         private readonly Column column;
 
-        public ColumnTestContainer(int column, ManiaAction action)
+        public ColumnTestContainer(int column, ManiaAction action, bool showColumn = false)
         {
-            this.column = new Column(column)
+            InternalChildren = new[]
             {
-                Action = { Value = action },
-                AccentColour = Color4.Orange,
-                ColumnType = column % 2 == 0 ? ColumnType.Even : ColumnType.Odd
-            };
-
-            InternalChild = content = new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)
-            {
-                RelativeSizeAxes = Axes.Both
+                this.column = new Column(column)
+                {
+                    Action = { Value = action },
+                    AccentColour = Color4.Orange,
+                    ColumnType = column % 2 == 0 ? ColumnType.Even : ColumnType.Odd,
+                    Alpha = showColumn ? 1 : 0
+                },
+                content = new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                this.column.TopLevelContainer.CreateProxy()
             };
         }
     }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
index 18eebada00..d24c81dac6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                 Direction = FillDirection.Horizontal,
                 Children = new Drawable[]
                 {
-                    new ColumnTestContainer(0, ManiaAction.Key1)
+                    new ColumnTestContainer(0, ManiaAction.Key1, true)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                             }));
                         })
                     },
-                    new ColumnTestContainer(1, ManiaAction.Key2)
+                    new ColumnTestContainer(1, ManiaAction.Key2, true)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
index 87c84cf89c..a15fb392d6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Skinning;
 
@@ -13,7 +14,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground), _ => new DefaultStageBackground())
+            SetContents(() => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground, stageDefinition: new StageDefinition { Columns = 4 }),
+                _ => new DefaultStageBackground())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
index 4e99068ed5..bceee1c599 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Tests.Skinning
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground), _ => null)
+            SetContents(() => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground, stageDefinition: new StageDefinition { Columns = 4 }), _ => null)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
index 2557f2acdf..3052fc7d34 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
@@ -21,14 +21,14 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
         /// </summary>
         /// <param name="column">The 0-based column index.</param>
         /// <returns>Whether the column is a special column.</returns>
-        public bool IsSpecialColumn(int column) => Columns % 2 == 1 && column == Columns / 2;
+        public readonly bool IsSpecialColumn(int column) => Columns % 2 == 1 && column == Columns / 2;
 
         /// <summary>
         /// Get the type of column given a column index.
         /// </summary>
         /// <param name="column">The 0-based column index.</param>
         /// <returns>The type of the column.</returns>
-        public ColumnType GetTypeOfColumn(int column)
+        public readonly ColumnType GetTypeOfColumn(int column)
         {
             if (IsSpecialColumn(column))
                 return ColumnType.Special;
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 2795868c97..f7098faa5d 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -326,6 +326,16 @@ namespace osu.Game.Rulesets.Mania
                         Height = 250
                     }),
                 }
+            },
+            new StatisticRow
+            {
+                Columns = new[]
+                {
+                    new StatisticItem(string.Empty, new SimpleStatisticTable(3, new SimpleStatisticItem[]
+                    {
+                        new UnstableRate(score.HitEvents)
+                    }))
+                }
             }
         };
     }
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index c0c8505f44..f078345fc1 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.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.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
 
@@ -14,15 +15,23 @@ namespace osu.Game.Rulesets.Mania
         /// </summary>
         public readonly int? TargetColumn;
 
+        /// <summary>
+        /// The intended <see cref="StageDefinition"/> for this component.
+        /// May be null if the component is not a direct member of a <see cref="Stage"/>.
+        /// </summary>
+        public readonly StageDefinition? StageDefinition;
+
         /// <summary>
         /// Creates a new <see cref="ManiaSkinComponent"/>.
         /// </summary>
         /// <param name="component">The component.</param>
         /// <param name="targetColumn">The intended <see cref="Column"/> index for this component. May be null if the component does not exist in a <see cref="Column"/>.</param>
-        public ManiaSkinComponent(ManiaSkinComponents component, int? targetColumn = null)
+        /// <param name="stageDefinition">The intended <see cref="StageDefinition"/> for this component. May be null if the component is not a direct member of a <see cref="Stage"/>.</param>
+        public ManiaSkinComponent(ManiaSkinComponents component, int? targetColumn = null, StageDefinition? stageDefinition = null)
             : base(component)
         {
             TargetColumn = targetColumn;
+            StageDefinition = stageDefinition;
         }
 
         protected override string RulesetPrefix => ManiaRuleset.SHORT_NAME;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index a44f8a8886..549a71daaa 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.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.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
@@ -32,6 +33,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private readonly Container<DrawableHoldNoteTail> tailContainer;
         private readonly Container<DrawableHoldNoteTick> tickContainer;
 
+        /// <summary>
+        /// Contains the size of the hold note covering the whole head/tail bounds. The size of this container changes as the hold note is being pressed.
+        /// </summary>
+        private readonly Container sizingContainer;
+
+        /// <summary>
+        /// Contains the contents of the hold note that should be masked as the hold note is being pressed. Follows changes in the size of <see cref="sizingContainer"/>.
+        /// </summary>
+        private readonly Container maskingContainer;
+
         private readonly SkinnableDrawable bodyPiece;
 
         /// <summary>
@@ -44,24 +55,54 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// </summary>
         public bool HasBroken { get; private set; }
 
+        /// <summary>
+        /// Whether the hold note has been released potentially without having caused a break.
+        /// </summary>
+        private double? releaseTime;
+
         public DrawableHoldNote(HoldNote hitObject)
             : base(hitObject)
         {
             RelativeSizeAxes = Axes.X;
 
+            Container maskedContents;
+
             AddRangeInternal(new Drawable[]
             {
+                sizingContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        maskingContainer = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Child = maskedContents = new Container
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Masking = true,
+                            }
+                        },
+                        headContainer = new Container<DrawableHoldNoteHead> { RelativeSizeAxes = Axes.Both }
+                    }
+                },
                 bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
                 {
-                    RelativeSizeAxes = Axes.Both
+                    RelativeSizeAxes = Axes.Both,
                 })
                 {
                     RelativeSizeAxes = Axes.X
                 },
                 tickContainer = new Container<DrawableHoldNoteTick> { RelativeSizeAxes = Axes.Both },
-                headContainer = new Container<DrawableHoldNoteHead> { RelativeSizeAxes = Axes.Both },
                 tailContainer = new Container<DrawableHoldNoteTail> { RelativeSizeAxes = Axes.Both },
             });
+
+            maskedContents.AddRange(new[]
+            {
+                bodyPiece.CreateProxy(),
+                tickContainer.CreateProxy(),
+                tailContainer.CreateProxy(),
+            });
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
@@ -127,7 +168,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.OnDirectionChanged(e);
 
-            bodyPiece.Anchor = bodyPiece.Origin = e.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+            if (e.NewValue == ScrollingDirection.Up)
+            {
+                bodyPiece.Anchor = bodyPiece.Origin = Anchor.TopLeft;
+                sizingContainer.Anchor = sizingContainer.Origin = Anchor.BottomLeft;
+            }
+            else
+            {
+                bodyPiece.Anchor = bodyPiece.Origin = Anchor.BottomLeft;
+                sizingContainer.Anchor = sizingContainer.Origin = Anchor.TopLeft;
+            }
         }
 
         public override void PlaySamples()
@@ -145,9 +195,38 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.Update();
 
-            // Make the body piece not lie under the head note
+            if (Time.Current < releaseTime)
+                releaseTime = null;
+
+            // Pad the full size container so its contents (i.e. the masking container) reach under the tail.
+            // This is required for the tail to not be masked away, since it lies outside the bounds of the hold note.
+            sizingContainer.Padding = new MarginPadding
+            {
+                Top = Direction.Value == ScrollingDirection.Down ? -Tail.Height : 0,
+                Bottom = Direction.Value == ScrollingDirection.Up ? -Tail.Height : 0,
+            };
+
+            // Pad the masking container to the starting position of the body piece (half-way under the head).
+            // This is required to make the body start getting masked immediately as soon as the note is held.
+            maskingContainer.Padding = new MarginPadding
+            {
+                Top = Direction.Value == ScrollingDirection.Up ? Head.Height / 2 : 0,
+                Bottom = Direction.Value == ScrollingDirection.Down ? Head.Height / 2 : 0,
+            };
+
+            // Position and resize the body to lie half-way under the head and the tail notes.
             bodyPiece.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
             bodyPiece.Height = DrawHeight - Head.Height / 2 + Tail.Height / 2;
+
+            // As the note is being held, adjust the size of the sizing container. This has two effects:
+            // 1. The contained masking container will mask the body and ticks.
+            // 2. The head note will move along with the new "head position" in the container.
+            if (Head.IsHit && releaseTime == null)
+            {
+                // How far past the hit target this hold note is. Always a positive value.
+                float yOffset = Math.Max(0, Direction.Value == ScrollingDirection.Up ? -Y : Y);
+                sizingContainer.Height = Math.Clamp(1 - yOffset / DrawHeight, 0, 1);
+            }
         }
 
         protected override void UpdateStateTransforms(ArmedState state)
@@ -159,7 +238,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (Tail.AllJudged)
+            {
                 ApplyResult(r => r.Type = HitResult.Perfect);
+                endHold();
+            }
 
             if (Tail.Result.Type == HitResult.Miss)
                 HasBroken = true;
@@ -212,6 +294,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // If the key has been released too early, the user should not receive full score for the release
             if (!Tail.IsHit)
                 HasBroken = true;
+
+            releaseTime = Time.Current;
         }
 
         private void endHold()
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
index a73fe259e4..cd56b81e10 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.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.Objects.Drawables;
+
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
     /// <summary>
@@ -17,6 +19,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public void UpdateResult() => base.UpdateResult(true);
 
+        protected override void UpdateStateTransforms(ArmedState state)
+        {
+            // This hitobject should never expire, so this is just a safe maximum.
+            LifetimeEnd = LifetimeStart + 30000;
+        }
+
         public override bool OnPressed(ManiaAction action) => false; // Handled by the hold note
 
         public override void OnReleased(ManiaAction action)
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index a44d8b09aa..ab76a5b8f8 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                     break;
 
                 case ArmedState.Hit:
-                    this.FadeOut(150, Easing.OutQuint);
+                    this.FadeOut();
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.cs b/osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.cs
new file mode 100644
index 0000000000..c8b05ed2f8
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.Skinning
+{
+    public class HitTargetInsetContainer : Container
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        private float hitPosition;
+
+        public HitTargetInsetContainer()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChild = content = new Container { RelativeSizeAxes = Axes.Both };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        {
+            hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition)?.Value ?? Stage.HIT_TARGET_POSITION;
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            content.Padding = direction.NewValue == ScrollingDirection.Up
+                ? new MarginPadding { Top = hitPosition }
+                : new MarginPadding { Bottom = hitPosition };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index 9f716428c0..c0f0fcb4af 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -19,7 +21,14 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
         private readonly IBindable<bool> isHitting = new Bindable<bool>();
 
-        private Drawable sprite;
+        [CanBeNull]
+        private Drawable bodySprite;
+
+        [CanBeNull]
+        private Drawable lightContainer;
+
+        [CanBeNull]
+        private Drawable light;
 
         public LegacyBodyPiece()
         {
@@ -32,7 +41,39 @@ namespace osu.Game.Rulesets.Mania.Skinning
             string imageName = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage)?.Value
                                ?? $"mania-note{FallbackColumnIndex}L";
 
-            sprite = skin.GetAnimation(imageName, WrapMode.ClampToEdge, WrapMode.ClampToEdge, true, true).With(d =>
+            string lightImage = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteLightImage)?.Value
+                                ?? "lightingL";
+
+            float lightScale = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteLightScale)?.Value
+                               ?? 1;
+
+            // Create a temporary animation to retrieve the number of frames, in an effort to calculate the intended frame length.
+            // This animation is discarded and re-queried with the appropriate frame length afterwards.
+            var tmp = skin.GetAnimation(lightImage, true, false);
+            double frameLength = 0;
+            if (tmp is IFramedAnimation tmpAnimation && tmpAnimation.FrameCount > 0)
+                frameLength = Math.Max(1000 / 60.0, 170.0 / tmpAnimation.FrameCount);
+
+            light = skin.GetAnimation(lightImage, true, true, frameLength: frameLength).With(d =>
+            {
+                if (d == null)
+                    return;
+
+                d.Origin = Anchor.Centre;
+                d.Blending = BlendingParameters.Additive;
+                d.Scale = new Vector2(lightScale);
+            });
+
+            if (light != null)
+            {
+                lightContainer = new HitTargetInsetContainer
+                {
+                    Alpha = 0,
+                    Child = light
+                };
+            }
+
+            bodySprite = skin.GetAnimation(imageName, WrapMode.ClampToEdge, WrapMode.ClampToEdge, true, true).With(d =>
             {
                 if (d == null)
                     return;
@@ -47,8 +88,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 // Todo: Wrap
             });
 
-            if (sprite != null)
-                InternalChild = sprite;
+            if (bodySprite != null)
+                InternalChild = bodySprite;
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
@@ -60,28 +101,68 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         private void onIsHittingChanged(ValueChangedEvent<bool> isHitting)
         {
-            if (!(sprite is TextureAnimation animation))
+            if (bodySprite is TextureAnimation bodyAnimation)
+            {
+                bodyAnimation.GotoFrame(0);
+                bodyAnimation.IsPlaying = isHitting.NewValue;
+            }
+
+            if (lightContainer == null)
                 return;
 
-            animation.GotoFrame(0);
-            animation.IsPlaying = isHitting.NewValue;
+            if (isHitting.NewValue)
+            {
+                // Clear the fade out and, more importantly, the removal.
+                lightContainer.ClearTransforms();
+
+                // Only add the container if the removal has taken place.
+                if (lightContainer.Parent == null)
+                    Column.TopLevelContainer.Add(lightContainer);
+
+                // The light must be seeked only after being loaded, otherwise a nullref occurs (https://github.com/ppy/osu-framework/issues/3847).
+                if (light is TextureAnimation lightAnimation)
+                    lightAnimation.GotoFrame(0);
+
+                lightContainer.FadeIn(80);
+            }
+            else
+            {
+                lightContainer.FadeOut(120)
+                              .OnComplete(d => Column.TopLevelContainer.Remove(d));
+            }
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
         {
-            if (sprite == null)
-                return;
-
             if (direction.NewValue == ScrollingDirection.Up)
             {
-                sprite.Origin = Anchor.BottomCentre;
-                sprite.Scale = new Vector2(1, -1);
+                if (bodySprite != null)
+                {
+                    bodySprite.Origin = Anchor.BottomCentre;
+                    bodySprite.Scale = new Vector2(1, -1);
+                }
+
+                if (light != null)
+                    light.Anchor = Anchor.TopCentre;
             }
             else
             {
-                sprite.Origin = Anchor.TopCentre;
-                sprite.Scale = Vector2.One;
+                if (bodySprite != null)
+                {
+                    bodySprite.Origin = Anchor.TopCentre;
+                    bodySprite.Scale = Vector2.One;
+                }
+
+                if (light != null)
+                    light.Anchor = Anchor.BottomCentre;
             }
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            lightContainer?.Expire();
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index f9286b5095..3bf51b3073 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -5,10 +5,8 @@ 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.Input.Bindings;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
@@ -19,17 +17,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
     public class LegacyColumnBackground : LegacyManiaColumnElement, IKeyBindingHandler<ManiaAction>
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-        private readonly bool isLastColumn;
 
-        private Container borderLineContainer;
         private Container lightContainer;
         private Sprite light;
 
-        private float hitPosition;
-
-        public LegacyColumnBackground(bool isLastColumn)
+        public LegacyColumnBackground()
         {
-            this.isLastColumn = isLastColumn;
             RelativeSizeAxes = Axes.Both;
         }
 
@@ -39,62 +32,14 @@ namespace osu.Game.Rulesets.Mania.Skinning
             string lightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LightImage)?.Value
                                 ?? "mania-stage-light";
 
-            float leftLineWidth = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LeftLineWidth)
-                ?.Value ?? 1;
-            float rightLineWidth = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.RightLineWidth)
-                ?.Value ?? 1;
-
-            bool hasLeftLine = leftLineWidth > 0;
-            bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
-                                || isLastColumn;
-
-            hitPosition = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.HitPosition)?.Value
-                          ?? Stage.HIT_TARGET_POSITION;
-
             float lightPosition = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LightPosition)?.Value
                                   ?? 0;
 
-            Color4 lineColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLineColour)?.Value
-                                ?? Color4.White;
-
-            Color4 backgroundColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour)?.Value
-                                      ?? Color4.Black;
-
             Color4 lightColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
                                  ?? Color4.White;
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = backgroundColour
-                },
-                borderLineContainer = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Y,
-                            Width = leftLineWidth,
-                            Scale = new Vector2(0.740f, 1),
-                            Colour = lineColour,
-                            Alpha = hasLeftLine ? 1 : 0
-                        },
-                        new Box
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            RelativeSizeAxes = Axes.Y,
-                            Width = rightLineWidth,
-                            Scale = new Vector2(0.740f, 1),
-                            Colour = lineColour,
-                            Alpha = hasRightLine ? 1 : 0
-                        }
-                    }
-                },
                 lightContainer = new Container
                 {
                     Origin = Anchor.BottomCentre,
@@ -104,7 +49,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     {
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
-                        Colour = lightColour,
+                        Colour = LegacyColourCompatibility.DisallowZeroAlpha(lightColour),
                         Texture = skin.GetTexture(lightImage),
                         RelativeSizeAxes = Axes.X,
                         Width = 1,
@@ -123,15 +68,11 @@ namespace osu.Game.Rulesets.Mania.Skinning
             {
                 lightContainer.Anchor = Anchor.TopCentre;
                 lightContainer.Scale = new Vector2(1, -1);
-
-                borderLineContainer.Padding = new MarginPadding { Top = hitPosition };
             }
             else
             {
                 lightContainer.Anchor = Anchor.BottomCentre;
                 lightContainer.Scale = Vector2.One;
-
-                borderLineContainer.Padding = new MarginPadding { Bottom = hitPosition };
             }
         }
 
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index d055ef3480..6eced571d2 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -20,11 +20,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         private Container directionContainer;
 
-        public LegacyHitTarget()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
@@ -56,7 +51,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                         Anchor = Anchor.CentreLeft,
                         RelativeSizeAxes = Axes.X,
                         Height = 1,
-                        Colour = lineColour,
+                        Colour = LegacyColourCompatibility.DisallowZeroAlpha(lineColour),
                         Alpha = showJudgementLine ? 0.9f : 0
                     }
                 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
index 44f3e7d7b3..b269ea25d4 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
@@ -65,6 +65,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
+
+            if (GetColumnSkinConfig<bool>(skin, LegacyManiaSkinConfigurationLookups.KeysUnderNotes)?.Value ?? false)
+                Column.UnderlayElements.Add(CreateProxy());
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
index 7f5de601ca..b0bab8e760 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
@@ -4,19 +4,27 @@
 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.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
     public class LegacyStageBackground : CompositeDrawable
     {
+        private readonly StageDefinition stageDefinition;
+
         private Drawable leftSprite;
         private Drawable rightSprite;
+        private ColumnFlow<Drawable> columnBackgrounds;
 
-        public LegacyStageBackground()
+        public LegacyStageBackground(StageDefinition stageDefinition)
         {
+            this.stageDefinition = stageDefinition;
             RelativeSizeAxes = Axes.Both;
         }
 
@@ -44,8 +52,19 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     Origin = Anchor.TopLeft,
                     X = -0.05f,
                     Texture = skin.GetTexture(rightImage)
+                },
+                columnBackgrounds = new ColumnFlow<Drawable>(stageDefinition)
+                {
+                    RelativeSizeAxes = Axes.Y
+                },
+                new HitTargetInsetContainer
+                {
+                    Child = new LegacyHitTarget { RelativeSizeAxes = Axes.Both }
                 }
             };
+
+            for (int i = 0; i < stageDefinition.Columns; i++)
+                columnBackgrounds.SetContentForColumn(i, new ColumnBackground(i, i == stageDefinition.Columns - 1));
         }
 
         protected override void Update()
@@ -58,5 +77,72 @@ namespace osu.Game.Rulesets.Mania.Skinning
             if (rightSprite?.Height > 0)
                 rightSprite.Scale = new Vector2(1, DrawHeight / rightSprite.Height);
         }
+
+        private class ColumnBackground : CompositeDrawable
+        {
+            private readonly int columnIndex;
+            private readonly bool isLastColumn;
+
+            public ColumnBackground(int columnIndex, bool isLastColumn)
+            {
+                this.columnIndex = columnIndex;
+                this.isLastColumn = isLastColumn;
+
+                RelativeSizeAxes = Axes.Both;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(ISkinSource skin)
+            {
+                float leftLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.LeftLineWidth, columnIndex)?.Value ?? 1;
+                float rightLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.RightLineWidth, columnIndex)?.Value ?? 1;
+
+                bool hasLeftLine = leftLineWidth > 0;
+                bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
+                                    || isLastColumn;
+
+                Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnLineColour, columnIndex)?.Value ?? Color4.White;
+                Color4 backgroundColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, columnIndex)?.Value ?? Color4.Black;
+
+                InternalChildren = new Drawable[]
+                {
+                    LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    }, backgroundColour),
+                    new HitTargetInsetContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new[]
+                        {
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.Y,
+                                Width = leftLineWidth,
+                                Scale = new Vector2(0.740f, 1),
+                                Alpha = hasLeftLine ? 1 : 0,
+                                Child = LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both
+                                }, lineColour)
+                            },
+                            new Container
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                RelativeSizeAxes = Axes.Y,
+                                Width = rightLineWidth,
+                                Scale = new Vector2(0.740f, 1),
+                                Alpha = hasRightLine ? 1 : 0,
+                                Child = LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both
+                                }, lineColour)
+                            },
+                        }
+                    }
+                };
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index e167135556..439e6f7df2 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -9,6 +9,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
 using System.Collections.Generic;
+using System.Diagnostics;
 using osu.Framework.Audio.Sample;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Legacy;
@@ -88,10 +89,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     switch (maniaComponent.Component)
                     {
                         case ManiaSkinComponents.ColumnBackground:
-                            return new LegacyColumnBackground(maniaComponent.TargetColumn == beatmap.TotalColumns - 1);
+                            return new LegacyColumnBackground();
 
                         case ManiaSkinComponents.HitTarget:
-                            return new LegacyHitTarget();
+                            // Legacy skins sandwich the hit target between the column background and the column light.
+                            // To preserve this ordering, it's created manually inside LegacyStageBackground.
+                            return Drawable.Empty();
 
                         case ManiaSkinComponents.KeyArea:
                             return new LegacyKeyArea();
@@ -112,7 +115,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
                             return new LegacyHitExplosion();
 
                         case ManiaSkinComponents.StageBackground:
-                            return new LegacyStageBackground();
+                            Debug.Assert(maniaComponent.StageDefinition != null);
+                            return new LegacyStageBackground(maniaComponent.StageDefinition.Value);
 
                         case ManiaSkinComponents.StageForeground:
                             return new LegacyStageForeground();
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 255ce4c064..de4648e4fa 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -68,8 +68,6 @@ namespace osu.Game.Rulesets.Mania.UI
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
         }
 
-        public override Axes RelativeSizeAxes => Axes.Y;
-
         public ColumnType ColumnType { get; set; }
 
         public bool IsSpecial => ColumnType == ColumnType.Special;
diff --git a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
new file mode 100644
index 0000000000..aef82d4c08
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
@@ -0,0 +1,105 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Skinning;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    /// <summary>
+    /// A <see cref="Drawable"/> which flows its contents according to the <see cref="Column"/>s in a <see cref="Stage"/>.
+    /// Content can be added to individual columns via <see cref="SetContentForColumn"/>.
+    /// </summary>
+    /// <typeparam name="TContent">The type of content in each column.</typeparam>
+    public class ColumnFlow<TContent> : CompositeDrawable
+        where TContent : Drawable
+    {
+        /// <summary>
+        /// All contents added to this <see cref="ColumnFlow{TContent}"/>.
+        /// </summary>
+        public IReadOnlyList<TContent> Content => columns.Children.Select(c => c.Count == 0 ? null : (TContent)c.Child).ToList();
+
+        private readonly FillFlowContainer<Container> columns;
+        private readonly StageDefinition stageDefinition;
+
+        public ColumnFlow(StageDefinition stageDefinition)
+        {
+            this.stageDefinition = stageDefinition;
+
+            AutoSizeAxes = Axes.X;
+
+            InternalChild = columns = new FillFlowContainer<Container>
+            {
+                RelativeSizeAxes = Axes.Y,
+                AutoSizeAxes = Axes.X,
+                Direction = FillDirection.Horizontal,
+            };
+
+            for (int i = 0; i < stageDefinition.Columns; i++)
+                columns.Add(new Container { RelativeSizeAxes = Axes.Y });
+        }
+
+        private ISkinSource currentSkin;
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            currentSkin = skin;
+
+            skin.SourceChanged += onSkinChanged;
+            onSkinChanged();
+        }
+
+        private void onSkinChanged()
+        {
+            for (int i = 0; i < stageDefinition.Columns; i++)
+            {
+                if (i > 0)
+                {
+                    float spacing = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnSpacing, i - 1))
+                                               ?.Value ?? Stage.COLUMN_SPACING;
+
+                    columns[i].Margin = new MarginPadding { Left = spacing };
+                }
+
+                float? width = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                              new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, i))
+                                          ?.Value;
+
+                if (width == null)
+                    // only used by default skin (legacy skins get defaults set in LegacyManiaSkinConfiguration)
+                    columns[i].Width = stageDefinition.IsSpecialColumn(i) ? Column.SPECIAL_COLUMN_WIDTH : Column.COLUMN_WIDTH;
+                else
+                    columns[i].Width = width.Value;
+            }
+        }
+
+        /// <summary>
+        /// Sets the content of one of the columns of this <see cref="ColumnFlow{TContent}"/>.
+        /// </summary>
+        /// <param name="column">The index of the column to set the content of.</param>
+        /// <param name="content">The content.</param>
+        public void SetContentForColumn(int column, TContent content) => columns[column].Child = content;
+
+        public new MarginPadding Padding
+        {
+            get => base.Padding;
+            set => base.Padding = value;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (currentSkin != null)
+                currentSkin.SourceChanged -= onSkinChanged;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 36780b0f80..e7a2de266d 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
@@ -11,7 +10,6 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -31,14 +29,13 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public const float HIT_TARGET_POSITION = 110;
 
-        public IReadOnlyList<Column> Columns => columnFlow.Children;
-        private readonly FillFlowContainer<Column> columnFlow;
+        public IReadOnlyList<Column> Columns => columnFlow.Content;
+        private readonly ColumnFlow<Column> columnFlow;
 
         private readonly JudgementContainer<DrawableManiaJudgement> judgements;
         private readonly DrawablePool<DrawableManiaJudgement> judgementPool;
 
         private readonly Drawable barLineContainer;
-        private readonly Container topLevelContainer;
 
         private readonly Dictionary<ColumnType, Color4> columnColours = new Dictionary<ColumnType, Color4>
         {
@@ -62,6 +59,8 @@ namespace osu.Game.Rulesets.Mania.UI
             RelativeSizeAxes = Axes.Y;
             AutoSizeAxes = Axes.X;
 
+            Container topLevelContainer;
+
             InternalChildren = new Drawable[]
             {
                 judgementPool = new DrawablePool<DrawableManiaJudgement>(2),
@@ -73,17 +72,13 @@ namespace osu.Game.Rulesets.Mania.UI
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground), _ => new DefaultStageBackground())
+                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground, stageDefinition: definition), _ => new DefaultStageBackground())
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        columnFlow = new FillFlowContainer<Column>
+                        columnFlow = new ColumnFlow<Column>(definition)
                         {
-                            Name = "Columns",
                             RelativeSizeAxes = Axes.Y,
-                            AutoSizeAxes = Axes.X,
-                            Direction = FillDirection.Horizontal,
-                            Padding = new MarginPadding { Left = COLUMN_SPACING, Right = COLUMN_SPACING },
                         },
                         new Container
                         {
@@ -102,7 +97,7 @@ namespace osu.Game.Rulesets.Mania.UI
                                 RelativeSizeAxes = Axes.Y,
                             }
                         },
-                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground), _ => null)
+                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground, stageDefinition: definition), _ => null)
                         {
                             RelativeSizeAxes = Axes.Both
                         },
@@ -121,60 +116,22 @@ namespace osu.Game.Rulesets.Mania.UI
             for (int i = 0; i < definition.Columns; i++)
             {
                 var columnType = definition.GetTypeOfColumn(i);
+
                 var column = new Column(firstColumnIndex + i)
                 {
+                    RelativeSizeAxes = Axes.Both,
+                    Width = 1,
                     ColumnType = columnType,
                     AccentColour = columnColours[columnType],
                     Action = { Value = columnType == ColumnType.Special ? specialColumnStartAction++ : normalColumnStartAction++ }
                 };
 
-                AddColumn(column);
+                topLevelContainer.Add(column.TopLevelContainer.CreateProxy());
+                columnFlow.SetContentForColumn(i, column);
+                AddNested(column);
             }
         }
 
-        private ISkin currentSkin;
-
-        [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
-        {
-            currentSkin = skin;
-            skin.SourceChanged += onSkinChanged;
-
-            onSkinChanged();
-        }
-
-        private void onSkinChanged()
-        {
-            foreach (var col in columnFlow)
-            {
-                if (col.Index > 0)
-                {
-                    float spacing = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnSpacing, col.Index - 1))
-                                               ?.Value ?? COLUMN_SPACING;
-
-                    col.Margin = new MarginPadding { Left = spacing };
-                }
-
-                float? width = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                              new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, col.Index))
-                                          ?.Value;
-
-                if (width == null)
-                    // only used by default skin (legacy skins get defaults set in LegacyManiaSkinConfiguration)
-                    col.Width = col.IsSpecial ? Column.SPECIAL_COLUMN_WIDTH : Column.COLUMN_WIDTH;
-                else
-                    col.Width = width.Value;
-            }
-        }
-
-        public void AddColumn(Column c)
-        {
-            topLevelContainer.Add(c.TopLevelContainer.CreateProxy());
-            columnFlow.Add(c);
-            AddNested(c);
-        }
-
         public override void Add(DrawableHitObject h)
         {
             var maniaObject = (ManiaHitObject)h.HitObject;
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index eaa5d8937a..f527eb2312 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -193,30 +193,46 @@ namespace osu.Game.Rulesets.Osu
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
+        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
         {
-            new StatisticRow
+            var timedHitEvents = score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)).ToList();
+
+            return new[]
             {
-                Columns = new[]
+                new StatisticRow
                 {
-                    new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)).ToList())
+                    Columns = new[]
                     {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 250
-                    }),
-                }
-            },
-            new StatisticRow
-            {
-                Columns = new[]
+                        new StatisticItem("Timing Distribution",
+                            new HitEventTimingDistributionGraph(timedHitEvents)
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                Height = 250
+                            }),
+                    }
+                },
+                new StatisticRow
                 {
-                    new StatisticItem("Accuracy Heatmap", new AccuracyHeatmap(score, playableBeatmap)
+                    Columns = new[]
                     {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 250
-                    }),
+                        new StatisticItem("Accuracy Heatmap", new AccuracyHeatmap(score, playableBeatmap)
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 250
+                        }),
+                    }
+                },
+                new StatisticRow
+                {
+                    Columns = new[]
+                    {
+                        new StatisticItem(string.Empty, new SimpleStatisticTable(3, new SimpleStatisticItem[]
+                        {
+                            new UnstableRate(timedHitEvents)
+                        }))
+                    }
                 }
-            }
-        };
+            };
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 0ab3e8825b..d15a0a3203 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -59,7 +59,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         hitCircleSprite = new Sprite
                         {
                             Texture = getTextureWithFallback(string.Empty),
-                            Colour = drawableObject.AccentColour.Value,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         },
@@ -107,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             base.LoadComplete();
 
             state.BindValueChanged(updateState, true);
-            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue, true);
+            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue), true);
             indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
index 0f586034d5..25ab96445a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, DrawableHitObject drawableObject)
         {
-            animationContent.Colour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
+            var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
 
             InternalChildren = new[]
             {
@@ -39,11 +39,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Texture = skin.GetTexture("sliderb-nd"),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                animationContent.With(d =>
+                LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
                 {
                     d.Anchor = Anchor.Centre;
                     d.Origin = Anchor.Centre;
-                }),
+                }), ballColour),
                 layerSpec = new Sprite
                 {
                     Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
index bfcf268c3d..9b73ccd248 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            backgroundLayer.Colour = accentColour;
+            backgroundLayer.Colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
index 8223e3bc01..5ab8e3a8c8 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
@@ -76,9 +76,11 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            headCircle.AccentColour = accentColour;
-            body.Colour = accentColour;
-            end.Colour = accentColour;
+            var colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
+
+            headCircle.AccentColour = colour;
+            body.Colour = colour;
+            end.Colour = colour;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
index 656728f6e4..b11b64c22c 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
@@ -18,9 +19,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            AccentColour = component == TaikoSkinComponents.CentreHit
-                ? new Color4(235, 69, 44, 255)
-                : new Color4(67, 142, 172, 255);
+            AccentColour = LegacyColourCompatibility.DisallowZeroAlpha(
+                component == TaikoSkinComponents.CentreHit
+                    ? new Color4(235, 69, 44, 255)
+                    : new Color4(67, 142, 172, 255));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 2011842591..dbc32f2c3e 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -161,19 +161,34 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
+        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
         {
-            new StatisticRow
+            var timedHitEvents = score.HitEvents.Where(e => e.HitObject is Hit).ToList();
+
+            return new[]
             {
-                Columns = new[]
+                new StatisticRow
                 {
-                    new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(score.HitEvents.Where(e => e.HitObject is Hit).ToList())
+                    Columns = new[]
                     {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 250
-                    }),
+                        new StatisticItem("Timing Distribution", new HitEventTimingDistributionGraph(timedHitEvents)
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 250
+                        }),
+                    }
+                },
+                new StatisticRow
+                {
+                    Columns = new[]
+                    {
+                        new StatisticItem(string.Empty, new SimpleStatisticTable(3, new SimpleStatisticItem[]
+                        {
+                            new UnstableRate(timedHitEvents)
+                        }))
+                    }
                 }
-            }
-        };
+            };
+        }
     }
 }
diff --git a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs b/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
new file mode 100644
index 0000000000..0f6d956b3c
--- /dev/null
+++ b/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.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 NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+
+namespace osu.Game.Tests.Beatmaps
+{
+    [TestFixture]
+    public class BeatmapDifficultyManagerTest
+    {
+        [Test]
+        public void TestKeyEqualsWithDifferentModInstances()
+        {
+            var key1 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+            var key2 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+
+            Assert.That(key1, Is.EqualTo(key2));
+        }
+
+        [Test]
+        public void TestKeyEqualsWithDifferentModOrder()
+        {
+            var key1 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+            var key2 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHidden(), new OsuModHardRock() });
+
+            Assert.That(key1, Is.EqualTo(key2));
+        }
+    }
+}
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
new file mode 100644
index 0000000000..9c71466489
--- /dev/null
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.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 System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko;
+using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
+using osu.Game.Tests.Resources;
+
+namespace osu.Game.Tests.Beatmaps.Formats
+{
+    [TestFixture]
+    public class LegacyScoreDecoderTest
+    {
+        [Test]
+        public void TestDecodeManiaReplay()
+        {
+            var decoder = new TestLegacyScoreDecoder();
+
+            using (var resourceStream = TestResources.OpenResource("Replays/mania-replay.osr"))
+            {
+                var score = decoder.Parse(resourceStream);
+
+                Assert.AreEqual(3, score.ScoreInfo.Ruleset.ID);
+
+                Assert.AreEqual(2, score.ScoreInfo.Statistics[HitResult.Great]);
+                Assert.AreEqual(1, score.ScoreInfo.Statistics[HitResult.Good]);
+
+                Assert.AreEqual(829_931, score.ScoreInfo.TotalScore);
+                Assert.AreEqual(3, score.ScoreInfo.MaxCombo);
+                Assert.IsTrue(Precision.AlmostEquals(0.8889, score.ScoreInfo.Accuracy, 0.0001));
+                Assert.AreEqual(ScoreRank.B, score.ScoreInfo.Rank);
+
+                Assert.That(score.Replay.Frames, Is.Not.Empty);
+            }
+        }
+
+        private class TestLegacyScoreDecoder : LegacyScoreDecoder
+        {
+            private static readonly Dictionary<int, Ruleset> rulesets = new Ruleset[]
+            {
+                new OsuRuleset(),
+                new TaikoRuleset(),
+                new CatchRuleset(),
+                new ManiaRuleset()
+            }.ToDictionary(ruleset => ((ILegacyRuleset)ruleset).LegacyID);
+
+            protected override Ruleset GetRuleset(int rulesetId) => rulesets[rulesetId];
+
+            protected override WorkingBeatmap GetBeatmap(string md5Hash) => new TestWorkingBeatmap(new Beatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    MD5Hash = md5Hash,
+                    Ruleset = new OsuRuleset().RulesetInfo,
+                    BaseDifficulty = new BeatmapDifficulty()
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index 168ec0f09d..bd34eaff63 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -169,17 +169,17 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void GetSnappedDistanceFromDistance()
         {
-            assertSnappedDistance(50, 100);
+            assertSnappedDistance(50, 0);
             assertSnappedDistance(100, 100);
-            assertSnappedDistance(150, 200);
+            assertSnappedDistance(150, 100);
             assertSnappedDistance(200, 200);
-            assertSnappedDistance(250, 300);
+            assertSnappedDistance(250, 200);
 
             AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier = 2);
 
             assertSnappedDistance(50, 0);
-            assertSnappedDistance(100, 200);
-            assertSnappedDistance(150, 200);
+            assertSnappedDistance(100, 0);
+            assertSnappedDistance(150, 0);
             assertSnappedDistance(200, 200);
             assertSnappedDistance(250, 200);
 
@@ -190,8 +190,8 @@ namespace osu.Game.Tests.Editing
             });
 
             assertSnappedDistance(50, 0);
-            assertSnappedDistance(100, 200);
-            assertSnappedDistance(150, 200);
+            assertSnappedDistance(100, 0);
+            assertSnappedDistance(150, 0);
             assertSnappedDistance(200, 200);
             assertSnappedDistance(250, 200);
             assertSnappedDistance(400, 400);
diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 7b2913b817..d15682b1eb 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
         }
 
         [Test]
-        public void TestApplyDrainRateQueries()
+        public void TestApplyDrainRateQueriesByDrKeyword()
         {
             const string query = "dr>2 quite specific dr<:6";
             var filterCriteria = new FilterCriteria();
@@ -73,6 +73,20 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.Less(filterCriteria.DrainRate.Min, 6.1f);
         }
 
+        [Test]
+        public void TestApplyDrainRateQueriesByHpKeyword()
+        {
+            const string query = "hp>2 quite specific hp<=6";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("quite specific", filterCriteria.SearchText.Trim());
+            Assert.AreEqual(2, filterCriteria.SearchTerms.Length);
+            Assert.Greater(filterCriteria.DrainRate.Min, 2.0f);
+            Assert.Less(filterCriteria.DrainRate.Min, 2.1f);
+            Assert.Greater(filterCriteria.DrainRate.Max, 6.0f);
+            Assert.Less(filterCriteria.DrainRate.Min, 6.1f);
+        }
+
         [Test]
         public void TestApplyBPMQueries()
         {
diff --git a/osu.Game.Tests/Resources/Replays/mania-replay.osr b/osu.Game.Tests/Resources/Replays/mania-replay.osr
new file mode 100644
index 0000000000000000000000000000000000000000..da1a7bdd28e5b89eddd9742bce2b27bc8e75e6f5
GIT binary patch
literal 1012
zcmV<Q0}K2Edp$G(3m{=RWMpPFV=yyjWiU2nVmV`EH!wD3Gc;smFf}(ZVKoZ?3m{=K
zWMySJGC46dH!@>2Fk>_^VL323Gh;F`G&3?}Wi$c+0000000031008T$3;+WF00000
z01FT?FgZ6ed@(FBI50Uld@(FxP`z80O4tZ&0{{SB001BW<U;@e0000002m(vLs0{?
z099AmQ>z5CvGFroXr>*+lrR^_@@;>&b?uOx<^mMIMT(+z#h{kY?X9fc(g(Lwebtx#
z7Q6Lh=|qk7uqqmlbl#mwF~34O;`FY?03m(j9XrY3L)0)1?Fw}$4J_CNJKO;4?X$~q
z;+wGa#wD!!0q2PlCzFrV3*3>Lz{D|fez@9JR^@L#NXJJJ;9{+KP~}bh@_eim%+NSk
zzegnGWya)SS7pW`<9yI$g`b0t!?MZslqBX+4bVy#tZV0pDNGmeSXKuOXGQ|f3zg8y
z<AsO~?3eVD1%59InB6h_n68+bu8v9?`wn|TAYf^s(DX=_xd?hp!lyZQ<gFQgLb&&t
z*f8aWorsyr8}ikKCh;jAZjSqW4G>GrMu+gxo2?L-AA5RBaNH&*&Dv9Dc!%ufdTEO?
zp@}%SBej)D4N{g#xwHF)8|Ks=@OJ2<iYxVRC?$%3E6#qHo}LxrMT}}an5QCKRR)Ai
z4s&dvI}#8M4{|9Q$}35sMV1!F#r@+E72xq4>^BGnjH?@$dDOeELCl()%CSSocJ#J0
zrMz`0akC4=AW51K>p71-r!saF*3AP)S9{~9<H(}o<HlCR$AcQ!Izv<kcJjWkD(9o$
z{0Qh@zv`<X{qNKHkz_w`>8w6pYSsUr1=*o_Q#S)6A-dHA@d9~(^0+ax|D@!;n;Z||
zFvVlqvtKZJf2x8EVoS#`3YPzS-*vaun`i1N*BG`MvK_+XgTPh^GgHpdy!e==KZIaT
z3!YC}(8nGj*i;imyixwy9zyF`AooHY90sBzR$Obzb-Vi~&7$v#i3~s7*O{}|SLmeL
zoMGZCnRwCc_XbwVIh5g#M@wt{FGra$aqhxs9vn18+0v`>fSkg3XKs=0k_AUDZ~8>a
zDG78!sD4dHOSBcg!q83SKA#^J)eG3=oY`jU3QIF2QVgemNl8@7S4(W%aYN@e0jDu%
zmqiUorSh0*IbBRsW~4cH;@gJJOutPU2TVP<=OEnHm=mZ{2D~6Z=U*j5r!6K@YHyj*
zwhC8cbzc~TkcHU?&2W;Km_To^u4o{p7%^`#txPglTyDD<S}hY59fKa)zSzO6lq%=w
i{9>Fl%vh<nu?kD+6RG+sT+PT;D`x-z000000002^n95K9

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini b/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini
deleted file mode 100644
index 3c0dae6b13..0000000000
--- a/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[General]
-Version: latest
-
-[Colours]
-Combo1: 255,255,255,0
\ No newline at end of file
diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
index c408d2f182..aedf26ee75 100644
--- a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
@@ -108,15 +108,5 @@ namespace osu.Game.Tests.Skins
             using (var stream = new LineBufferedReader(resStream))
                 Assert.That(decoder.Decode(stream).LegacyVersion, Is.EqualTo(1.0m));
         }
-
-        [Test]
-        public void TestDecodeColourWithZeroAlpha()
-        {
-            var decoder = new LegacySkinDecoder();
-
-            using (var resStream = TestResources.OpenResource("skin-zero-alpha-colour.ini"))
-            using (var stream = new LineBufferedReader(resStream))
-                Assert.That(decoder.Decode(stream).ComboColours[0].A, Is.EqualTo(1.0f));
-        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
index 4cb22bf1fe..fd5c188b94 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
@@ -7,8 +7,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Screens.Select.Details;
@@ -72,6 +74,32 @@ namespace osu.Game.Tests.Visual.Online
             };
         }
 
+        [Test]
+        public void TestOnlyFailMetrics()
+        {
+            AddStep("set beatmap", () => successRate.Beatmap = new BeatmapInfo
+            {
+                Metrics = new BeatmapMetrics
+                {
+                    Fails = Enumerable.Range(1, 100).ToArray(),
+                }
+            });
+            AddAssert("graph max values correct",
+                () => successRate.ChildrenOfType<BarGraph>().All(graph => graph.MaxValue == 100));
+        }
+
+        [Test]
+        public void TestEmptyMetrics()
+        {
+            AddStep("set beatmap", () => successRate.Beatmap = new BeatmapInfo
+            {
+                Metrics = new BeatmapMetrics()
+            });
+
+            AddAssert("graph max values correct",
+                () => successRate.ChildrenOfType<BarGraph>().All(graph => graph.MaxValue == 0));
+        }
+
         private class GraphExposingSuccessRate : SuccessRate
         {
             public new FailRetryGraph Graph => base.Graph;
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticTable.cs b/osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticTable.cs
new file mode 100644
index 0000000000..07a0bcc8d8
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticTable.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 System.Linq;
+using Humanizer;
+using NUnit.Framework;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
+using osu.Game.Screens.Ranking.Statistics;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestSceneSimpleStatisticTable : OsuTestScene
+    {
+        private Container container;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = new Container
+            {
+                AutoSizeAxes = Axes.Y,
+                Width = 700,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4Extensions.FromHex("#333"),
+                    },
+                    container = new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding(20)
+                    }
+                }
+            };
+        });
+
+        [Test]
+        public void TestEmpty()
+        {
+            AddStep("create with no items",
+                () => container.Add(new SimpleStatisticTable(2, Enumerable.Empty<SimpleStatisticItem>())));
+        }
+
+        [Test]
+        public void TestManyItems(
+            [Values(1, 2, 3, 4, 12)] int itemCount,
+            [Values(1, 3, 5)] int columnCount)
+        {
+            AddStep($"create with {"item".ToQuantity(itemCount)}", () =>
+            {
+                var items = Enumerable.Range(1, itemCount)
+                                      .Select(i => new SimpleStatisticItem<int>($"Statistic #{i}")
+                                      {
+                                          Value = RNG.Next(100)
+                                      });
+
+                container.Add(new SimpleStatisticTable(columnCount, items));
+            });
+        }
+    }
+}
diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index b80b4e45ed..0100c9b210 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -89,8 +89,14 @@ namespace osu.Game.Beatmaps
             if (tryGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
                 return existing;
 
-            return await Task.Factory.StartNew(() => computeDifficulty(key, beatmapInfo, rulesetInfo), cancellationToken,
-                TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
+            return await Task.Factory.StartNew(() =>
+            {
+                // Computation may have finished in a previous task.
+                if (tryGetExisting(beatmapInfo, rulesetInfo, mods, out existing, out _))
+                    return existing;
+
+                return computeDifficulty(key, beatmapInfo, rulesetInfo);
+            }, cancellationToken, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
         }
 
         /// <summary>
@@ -245,7 +251,7 @@ namespace osu.Game.Beatmaps
             updateScheduler?.Dispose();
         }
 
-        private readonly struct DifficultyCacheLookup : IEquatable<DifficultyCacheLookup>
+        public readonly struct DifficultyCacheLookup : IEquatable<DifficultyCacheLookup>
         {
             public readonly int BeatmapId;
             public readonly int RulesetId;
@@ -261,7 +267,7 @@ namespace osu.Game.Beatmaps
             public bool Equals(DifficultyCacheLookup other)
                 => BeatmapId == other.BeatmapId
                    && RulesetId == other.RulesetId
-                   && Mods.SequenceEqual(other.Mods);
+                   && Mods.Select(m => m.Acronym).SequenceEqual(other.Mods.Select(m => m.Acronym));
 
             public override int GetHashCode()
             {
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 44ef9bcacc..c15240a4f6 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -104,10 +104,6 @@ namespace osu.Game.Beatmaps.Formats
             try
             {
                 byte alpha = split.Length == 4 ? byte.Parse(split[3]) : (byte)255;
-
-                if (alpha == 0)
-                    alpha = 255;
-
                 colour = new Color4(byte.Parse(split[0]), byte.Parse(split[1]), byte.Parse(split[2]), alpha);
             }
             catch
diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 6af2561c89..648e4a762b 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Online.Chat
                 case "http":
                 case "https":
                     // length > 3 since all these links need another argument to work
-                    if (args.Length > 3 && (args[1] == "osu.ppy.sh" || args[1] == "new.ppy.sh"))
+                    if (args.Length > 3 && args[1] == "osu.ppy.sh")
                     {
                         switch (args[2])
                         {
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index c25fb03fd0..f134db1ffe 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -25,7 +25,7 @@ using osu.Game.Screens.Edit.Components.RadioButtons;
 using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
-using Key = osuTK.Input.Key;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Edit
 {
@@ -293,7 +293,16 @@ namespace osu.Game.Rulesets.Edit
 
         public override float GetSnappedDistanceFromDistance(double referenceTime, float distance)
         {
-            var snappedEndTime = BeatSnapProvider.SnapTime(referenceTime + DistanceToDuration(referenceTime, distance), referenceTime);
+            double actualDuration = referenceTime + DistanceToDuration(referenceTime, distance);
+
+            double snappedEndTime = BeatSnapProvider.SnapTime(actualDuration, referenceTime);
+
+            double beatLength = BeatSnapProvider.GetBeatLengthAtTime(referenceTime);
+
+            // we don't want to exceed the actual duration and snap to a point in the future.
+            // as we are snapping to beat length via SnapTime (which will round-to-nearest), check for snapping in the forward direction and reverse it.
+            if (snappedEndTime > actualDuration + 1)
+                snappedEndTime -= beatLength;
 
             return DurationToDistance(referenceTime, snappedEndTime - referenceTime);
         }
diff --git a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
index c854c06031..cce631464f 100644
--- a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
@@ -47,6 +47,7 @@ namespace osu.Game.Rulesets.Edit
 
         /// <summary>
         /// Converts an unsnapped distance to a snapped distance.
+        /// The returned distance will always be floored (as to never exceed the provided <paramref name="distance"/>.
         /// </summary>
         /// <param name="referenceTime">The time of the timing point which <paramref name="distance"/> resides in.</param>
         /// <param name="distance">The distance to convert.</param>
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index a4a560c8e4..97cb5ca7ab 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -13,7 +13,6 @@ using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Users;
 using SharpCompress.Compressors.LZMA;
 
@@ -123,12 +122,12 @@ namespace osu.Game.Scoring.Legacy
 
         protected void CalculateAccuracy(ScoreInfo score)
         {
-            score.Statistics.TryGetValue(HitResult.Miss, out int countMiss);
-            score.Statistics.TryGetValue(HitResult.Meh, out int count50);
-            score.Statistics.TryGetValue(HitResult.Good, out int count100);
-            score.Statistics.TryGetValue(HitResult.Great, out int count300);
-            score.Statistics.TryGetValue(HitResult.Perfect, out int countGeki);
-            score.Statistics.TryGetValue(HitResult.Ok, out int countKatu);
+            int countMiss = score.GetCountMiss() ?? 0;
+            int count50 = score.GetCount50() ?? 0;
+            int count100 = score.GetCount100() ?? 0;
+            int count300 = score.GetCount300() ?? 0;
+            int countGeki = score.GetCountGeki() ?? 0;
+            int countKatu = score.GetCountKatu() ?? 0;
 
             switch (score.Ruleset.ID)
             {
@@ -241,12 +240,15 @@ namespace osu.Game.Scoring.Legacy
                 }
 
                 var diff = Parsing.ParseFloat(split[0]);
+                var mouseX = Parsing.ParseFloat(split[1], Parsing.MAX_COORDINATE_VALUE);
+                var mouseY = Parsing.ParseFloat(split[2], Parsing.MAX_COORDINATE_VALUE);
 
                 lastTime += diff;
 
-                if (i == 0 && diff == 0)
-                    // osu-stable adds a zero-time frame before potentially valid negative user frames.
-                    // we need to ignore this.
+                if (i < 2 && mouseX == 256 && mouseY == -500)
+                    // at the start of the replay, stable places two replay frames, at time 0 and SkipBoundary - 1, respectively.
+                    // both frames use a position of (256, -500).
+                    // ignore these frames as they serve no real purpose (and can even mislead ruleset-specific handlers - see mania)
                     continue;
 
                 // Todo: At some point we probably want to rewind and play back the negative-time frames
@@ -255,8 +257,8 @@ namespace osu.Game.Scoring.Legacy
                     continue;
 
                 currentFrame = convertFrame(new LegacyReplayFrame(lastTime,
-                    Parsing.ParseFloat(split[1], Parsing.MAX_COORDINATE_VALUE),
-                    Parsing.ParseFloat(split[2], Parsing.MAX_COORDINATE_VALUE),
+                    mouseX,
+                    mouseY,
                     (ReplayButtonState)Parsing.ParseInt(split[3])), currentFrame);
 
                 replay.Frames.Add(currentFrame);
diff --git a/osu.Game/Screens/Menu/IntroSequence.cs b/osu.Game/Screens/Menu/IntroSequence.cs
index 6731fef6f7..d92d38da45 100644
--- a/osu.Game/Screens/Menu/IntroSequence.cs
+++ b/osu.Game/Screens/Menu/IntroSequence.cs
@@ -205,6 +205,7 @@ namespace osu.Game.Screens.Menu
                 const int line_end_offset = 120;
 
                 smallRing.Foreground.ResizeTo(1, line_duration, Easing.OutQuint);
+                smallRing.Delay(400).FadeColour(Color4.Black, 300);
 
                 lineTopLeft.MoveTo(new Vector2(-line_end_offset, -line_end_offset), line_duration, Easing.OutQuint);
                 lineTopRight.MoveTo(new Vector2(line_end_offset, -line_end_offset), line_duration, Easing.OutQuint);
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
new file mode 100644
index 0000000000..3d9ba2f225
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    /// <summary>
+    /// Represents a simple statistic item (one that only needs textual display).
+    /// Richer visualisations should be done with <see cref="StatisticItem"/>s.
+    /// </summary>
+    public abstract class SimpleStatisticItem : Container
+    {
+        /// <summary>
+        /// The text to display as the statistic's value.
+        /// </summary>
+        protected string Value
+        {
+            set => this.value.Text = value;
+        }
+
+        private readonly OsuSpriteText value;
+
+        /// <summary>
+        /// Creates a new simple statistic item.
+        /// </summary>
+        /// <param name="name">The name of the statistic.</param>
+        protected SimpleStatisticItem(string name)
+        {
+            Name = name;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            AddRange(new[]
+            {
+                new OsuSpriteText
+                {
+                    Text = Name,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Font = OsuFont.GetFont(size: 14)
+                },
+                value = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold)
+                }
+            });
+        }
+    }
+
+    /// <summary>
+    /// Strongly-typed generic specialisation for <see cref="SimpleStatisticItem"/>.
+    /// </summary>
+    public class SimpleStatisticItem<TValue> : SimpleStatisticItem
+    {
+        /// <summary>
+        /// The statistic's value to be displayed.
+        /// </summary>
+        public new TValue Value
+        {
+            set => base.Value = DisplayValue(value);
+        }
+
+        /// <summary>
+        /// Used to convert <see cref="Value"/> to a text representation.
+        /// Defaults to using <see cref="object.ToString"/>.
+        /// </summary>
+        protected virtual string DisplayValue(TValue value) => value.ToString();
+
+        public SimpleStatisticItem(string name)
+            : base(name)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
new file mode 100644
index 0000000000..8b503cc04e
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
@@ -0,0 +1,123 @@
+// Copyright (c) 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 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;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    /// <summary>
+    /// Represents a table with simple statistics (ones that only need textual display).
+    /// Richer visualisations should be done with <see cref="StatisticRow"/>s and <see cref="StatisticItem"/>s.
+    /// </summary>
+    public class SimpleStatisticTable : CompositeDrawable
+    {
+        private readonly SimpleStatisticItem[] items;
+        private readonly int columnCount;
+
+        private FillFlowContainer[] columns;
+
+        /// <summary>
+        /// Creates a statistic row for the supplied <see cref="SimpleStatisticItem"/>s.
+        /// </summary>
+        /// <param name="columnCount">The number of columns to layout the <paramref name="items"/> into.</param>
+        /// <param name="items">The <see cref="SimpleStatisticItem"/>s to display in this row.</param>
+        public SimpleStatisticTable(int columnCount, [ItemNotNull] IEnumerable<SimpleStatisticItem> items)
+        {
+            if (columnCount < 1)
+                throw new ArgumentOutOfRangeException(nameof(columnCount));
+
+            this.columnCount = columnCount;
+            this.items = items.ToArray();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            columns = new FillFlowContainer[columnCount];
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                ColumnDimensions = createColumnDimensions().ToArray(),
+                Content = new[] { createColumns().ToArray() }
+            };
+
+            for (int i = 0; i < items.Length; ++i)
+                columns[i % columnCount].Add(items[i]);
+        }
+
+        private IEnumerable<Dimension> createColumnDimensions()
+        {
+            for (int column = 0; column < columnCount; ++column)
+            {
+                if (column > 0)
+                    yield return new Dimension(GridSizeMode.Absolute, 30);
+
+                yield return new Dimension();
+            }
+        }
+
+        private IEnumerable<Drawable> createColumns()
+        {
+            for (int column = 0; column < columnCount; ++column)
+            {
+                if (column > 0)
+                {
+                    yield return new Spacer
+                    {
+                        Alpha = items.Length > column ? 1 : 0
+                    };
+                }
+
+                yield return columns[column] = createColumn();
+            }
+        }
+
+        private FillFlowContainer createColumn() => new FillFlowContainer
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Direction = FillDirection.Vertical
+        };
+
+        private class Spacer : CompositeDrawable
+        {
+            public Spacer()
+            {
+                RelativeSizeAxes = Axes.Both;
+                Padding = new MarginPadding { Vertical = 4 };
+
+                InternalChild = new CircularContainer
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 3,
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    CornerRadius = 2,
+                    Masking = true,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4Extensions.FromHex("#222")
+                    }
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
index ed98698411..485d24d024 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
@@ -32,33 +32,9 @@ namespace osu.Game.Screens.Ranking.Statistics
                 AutoSizeAxes = Axes.Y,
                 Content = new[]
                 {
-                    new Drawable[]
+                    new[]
                     {
-                        new FillFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(5, 0),
-                            Children = new Drawable[]
-                            {
-                                new Circle
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    Height = 9,
-                                    Width = 4,
-                                    Colour = Color4Extensions.FromHex("#00FFAA")
-                                },
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    Text = item.Name,
-                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
-                                }
-                            }
-                        }
+                        createHeader(item)
                     },
                     new Drawable[]
                     {
@@ -78,5 +54,37 @@ namespace osu.Game.Screens.Ranking.Statistics
                 }
             };
         }
+
+        private static Drawable createHeader(StatisticItem item)
+        {
+            if (string.IsNullOrEmpty(item.Name))
+                return Empty();
+
+            return new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(5, 0),
+                Children = new Drawable[]
+                {
+                    new Circle
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Height = 9,
+                        Width = 4,
+                        Colour = Color4Extensions.FromHex("#00FFAA")
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Text = item.Name,
+                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
+                    }
+                }
+            };
+        }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
index e959ed24fc..4903983759 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// <summary>
         /// Creates a new <see cref="StatisticItem"/>, to be displayed inside a <see cref="StatisticRow"/> in the results screen.
         /// </summary>
-        /// <param name="name">The name of the item.</param>
+        /// <param name="name">The name of the item. Can be <see cref="string.Empty"/> to hide the item header.</param>
         /// <param name="content">The <see cref="Drawable"/> content to be displayed.</param>
         /// <param name="dimension">The <see cref="Dimension"/> of this item. This can be thought of as the column dimension of an encompassing <see cref="GridContainer"/>.</param>
         public StatisticItem([NotNull] string name, [NotNull] Drawable content, [CanBeNull] Dimension dimension = null)
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 7f406331cd..c2ace6a04e 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -94,14 +94,15 @@ namespace osu.Game.Screens.Ranking.Statistics
                         RelativeSizeAxes = Axes.Both,
                         Direction = FillDirection.Vertical,
                         Spacing = new Vector2(30, 15),
+                        Alpha = 0
                     };
 
                     foreach (var row in newScore.Ruleset.CreateInstance().CreateStatisticsForScore(newScore, playableBeatmap))
                     {
                         rows.Add(new GridContainer
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Content = new[]
@@ -125,6 +126,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                         spinner.Hide();
                         content.Add(d);
+                        d.FadeIn(250, Easing.OutQuint);
                     }, localCancellationSource.Token);
                 }), localCancellationSource.Token);
             }
diff --git a/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs b/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
new file mode 100644
index 0000000000..5b368c3e8d
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Statistics/UnstableRate.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 System.Linq;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Ranking.Statistics
+{
+    /// <summary>
+    /// Displays the unstable rate statistic for a given play.
+    /// </summary>
+    public class UnstableRate : SimpleStatisticItem<double>
+    {
+        /// <summary>
+        /// Creates and computes an <see cref="UnstableRate"/> statistic.
+        /// </summary>
+        /// <param name="hitEvents">Sequence of <see cref="HitEvent"/>s to calculate the unstable rate based on.</param>
+        public UnstableRate(IEnumerable<HitEvent> hitEvents)
+            : base("Unstable Rate")
+        {
+            var timeOffsets = hitEvents.Select(ev => ev.TimeOffset).ToArray();
+            Value = 10 * standardDeviation(timeOffsets);
+        }
+
+        private static double standardDeviation(double[] timeOffsets)
+        {
+            if (timeOffsets.Length == 0)
+                return double.NaN;
+
+            var mean = timeOffsets.Average();
+            var squares = timeOffsets.Select(offset => Math.Pow(offset - mean, 2)).Sum();
+            return Math.Sqrt(squares / timeOffsets.Length);
+        }
+
+        protected override string DisplayValue(double value) => double.IsNaN(value) ? "(not available)" : value.ToString("N2");
+    }
+}
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 9669a1391c..0ee52f3e48 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -236,7 +236,7 @@ namespace osu.Game.Screens.Select
         private void updateMetrics()
         {
             var hasRatings = beatmap?.BeatmapSet?.Metrics?.Ratings?.Any() ?? false;
-            var hasRetriesFails = (beatmap?.Metrics?.Retries?.Any() ?? false) && (beatmap?.Metrics.Fails?.Any() ?? false);
+            var hasRetriesFails = (beatmap?.Metrics?.Retries?.Any() ?? false) || (beatmap?.Metrics?.Fails?.Any() ?? false);
 
             if (hasRatings)
             {
diff --git a/osu.Game/Screens/Select/Details/FailRetryGraph.cs b/osu.Game/Screens/Select/Details/FailRetryGraph.cs
index 134fd0598a..7cc80acfd3 100644
--- a/osu.Game/Screens/Select/Details/FailRetryGraph.cs
+++ b/osu.Game/Screens/Select/Details/FailRetryGraph.cs
@@ -29,16 +29,30 @@ namespace osu.Game.Screens.Select.Details
 
                 var retries = Metrics?.Retries ?? Array.Empty<int>();
                 var fails = Metrics?.Fails ?? Array.Empty<int>();
+                var retriesAndFails = sumRetriesAndFails(retries, fails);
 
-                float maxValue = fails.Any() ? fails.Zip(retries, (fail, retry) => fail + retry).Max() : 0;
+                float maxValue = retriesAndFails.Any() ? retriesAndFails.Max() : 0;
                 failGraph.MaxValue = maxValue;
                 retryGraph.MaxValue = maxValue;
 
-                failGraph.Values = fails.Select(f => (float)f);
-                retryGraph.Values = retries.Zip(fails, (retry, fail) => retry + Math.Clamp(fail, 0, maxValue));
+                failGraph.Values = fails.Select(v => (float)v);
+                retryGraph.Values = retriesAndFails.Select(v => (float)v);
             }
         }
 
+        private int[] sumRetriesAndFails(int[] retries, int[] fails)
+        {
+            var result = new int[Math.Max(retries.Length, fails.Length)];
+
+            for (int i = 0; i < retries.Length; ++i)
+                result[i] = retries[i];
+
+            for (int i = 0; i < fails.Length; ++i)
+                result[i] += fails[i];
+
+            return result;
+        }
+
         public FailRetryGraph()
         {
             Children = new[]
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 89afc729fe..39fa4f777d 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.Select
     internal static class FilterQueryParser
     {
         private static readonly Regex query_syntax_regex = new Regex(
-            @"\b(?<key>stars|ar|dr|cs|divisor|length|objects|bpm|status|creator|artist)(?<op>[=:><]+)(?<value>("".*"")|(\S*))",
+            @"\b(?<key>stars|ar|dr|hp|cs|divisor|length|objects|bpm|status|creator|artist)(?<op>[=:><]+)(?<value>("".*"")|(\S*))",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         internal static void ApplyQueries(FilterCriteria criteria, string query)
@@ -43,6 +43,7 @@ namespace osu.Game.Screens.Select
                     break;
 
                 case "dr" when parseFloatWithPoint(value, out var dr):
+                case "hp" when parseFloatWithPoint(value, out dr):
                     updateCriteriaRange(ref criteria.DrainRate, op, dr, 0.1f / 2);
                     break;
 
diff --git a/osu.Game/Skinning/LegacyColourCompatibility.cs b/osu.Game/Skinning/LegacyColourCompatibility.cs
new file mode 100644
index 0000000000..b842b50426
--- /dev/null
+++ b/osu.Game/Skinning/LegacyColourCompatibility.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.Graphics;
+using osuTK.Graphics;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// Compatibility methods to convert osu!stable colours to osu!lazer-compatible ones. Should be used for legacy skins only.
+    /// </summary>
+    public static class LegacyColourCompatibility
+    {
+        /// <summary>
+        /// Forces an alpha of 1 if a given <see cref="Color4"/> is fully transparent.
+        /// </summary>
+        /// <remarks>
+        /// This is equivalent to setting colour post-constructor in osu!stable.
+        /// </remarks>
+        /// <param name="colour">The <see cref="Color4"/> to disallow zero alpha on.</param>
+        /// <returns>The resultant <see cref="Color4"/>.</returns>
+        public static Color4 DisallowZeroAlpha(Color4 colour)
+        {
+            if (colour.A == 0)
+                colour.A = 1;
+            return colour;
+        }
+
+        /// <summary>
+        /// Applies a <see cref="Color4"/> to a <see cref="Drawable"/>, doubling the alpha value into the <see cref="Drawable.Alpha"/> property.
+        /// </summary>
+        /// <remarks>
+        /// This is equivalent to setting colour in the constructor in osu!stable.
+        /// </remarks>
+        /// <param name="drawable">The <see cref="Drawable"/> to apply the colour to.</param>
+        /// <param name="colour">The <see cref="Color4"/> to apply.</param>
+        /// <returns>The given <paramref name="drawable"/>.</returns>
+        public static T ApplyWithDoubledAlpha<T>(T drawable, Color4 colour)
+            where T : Drawable
+        {
+            drawable.Alpha = colour.A;
+            drawable.Colour = DisallowZeroAlpha(colour);
+            return drawable;
+        }
+    }
+}
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index af7d6007f3..65d5851455 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -31,10 +31,12 @@ namespace osu.Game.Skinning
         public readonly float[] ColumnSpacing;
         public readonly float[] ColumnWidth;
         public readonly float[] ExplosionWidth;
+        public readonly float[] HoldNoteLightWidth;
 
         public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
         public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;
+        public bool KeysUnderNotes;
 
         public LegacyManiaSkinConfiguration(int keys)
         {
@@ -44,6 +46,7 @@ namespace osu.Game.Skinning
             ColumnSpacing = new float[keys - 1];
             ColumnWidth = new float[keys];
             ExplosionWidth = new float[keys];
+            HoldNoteLightWidth = new float[keys];
 
             ColumnLineWidth.AsSpan().Fill(2);
             ColumnWidth.AsSpan().Fill(DEFAULT_COLUMN_SIZE);
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 4990ca8e60..a99710ea96 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Skinning
         HoldNoteHeadImage,
         HoldNoteTailImage,
         HoldNoteBodyImage,
+        HoldNoteLightImage,
+        HoldNoteLightScale,
         ExplosionImage,
         ExplosionScale,
         ColumnLineColour,
@@ -50,5 +52,6 @@ namespace osu.Game.Skinning
         Hit100,
         Hit50,
         Hit0,
+        KeysUnderNotes,
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index aebc229f7c..a9d88e77ad 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -97,10 +97,18 @@ namespace osu.Game.Skinning
                         currentConfig.ShowJudgementLine = pair.Value == "1";
                         break;
 
+                    case "KeysUnderNotes":
+                        currentConfig.KeysUnderNotes = pair.Value == "1";
+                        break;
+
                     case "LightingNWidth":
                         parseArrayValue(pair.Value, currentConfig.ExplosionWidth);
                         break;
 
+                    case "LightingLWidth":
+                        parseArrayValue(pair.Value, currentConfig.HoldNoteLightWidth);
+                        break;
+
                     case "WidthForNoteHeightScale":
                         float minWidth = float.Parse(pair.Value, CultureInfo.InvariantCulture) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         if (minWidth > 0)
@@ -116,6 +124,7 @@ namespace osu.Game.Skinning
                     case string _ when pair.Key.StartsWith("KeyImage"):
                     case string _ when pair.Key.StartsWith("Hit"):
                     case string _ when pair.Key.StartsWith("Stage"):
+                    case string _ when pair.Key.StartsWith("Lighting"):
                         currentConfig.ImageLookups[pair.Key] = pair.Value;
                         break;
                 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 02d07eee45..5caf07b554 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -173,6 +173,9 @@ namespace osu.Game.Skinning
                 case LegacyManiaSkinConfigurationLookups.ShowJudgementLine:
                     return SkinUtils.As<TValue>(new Bindable<bool>(existing.ShowJudgementLine));
 
+                case LegacyManiaSkinConfigurationLookups.ExplosionImage:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "LightingN"));
+
                 case LegacyManiaSkinConfigurationLookups.ExplosionScale:
                     Debug.Assert(maniaLookup.TargetColumn != null);
 
@@ -217,6 +220,20 @@ namespace osu.Game.Skinning
                     Debug.Assert(maniaLookup.TargetColumn != null);
                     return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}L"));
 
+                case LegacyManiaSkinConfigurationLookups.HoldNoteLightImage:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, "LightingL"));
+
+                case LegacyManiaSkinConfigurationLookups.HoldNoteLightScale:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+
+                    if (GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value < 2.5m)
+                        return SkinUtils.As<TValue>(new Bindable<float>(1));
+
+                    if (existing.HoldNoteLightWidth[maniaLookup.TargetColumn.Value] != 0)
+                        return SkinUtils.As<TValue>(new Bindable<float>(existing.HoldNoteLightWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+
                 case LegacyManiaSkinConfigurationLookups.KeyImage:
                     Debug.Assert(maniaLookup.TargetColumn != null);
                     return SkinUtils.As<TValue>(getManiaImage(existing, $"KeyImage{maniaLookup.TargetColumn}"));
@@ -255,6 +272,9 @@ namespace osu.Game.Skinning
                 case LegacyManiaSkinConfigurationLookups.Hit300:
                 case LegacyManiaSkinConfigurationLookups.Hit300g:
                     return SkinUtils.As<TValue>(getManiaImage(existing, maniaLookup.Lookup.ToString()));
+
+                case LegacyManiaSkinConfigurationLookups.KeysUnderNotes:
+                    return SkinUtils.As<TValue>(new Bindable<bool>(existing.KeysUnderNotes));
             }
 
             return null;

From 112ecf085d6a44b59be0c12f131d7fee2a20d4f1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 17:19:04 +0000
Subject: [PATCH 04514/10326] Bump Sentry from 2.1.5 to 2.1.6

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

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 d1e2033596..c021770d7b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.819.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
-    <PackageReference Include="Sentry" Version="2.1.5" />
+    <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From 846189659b935cf970a22fa17e23a63f1353604a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 17:19:29 +0000
Subject: [PATCH 04515/10326] Bump Microsoft.Build.Traversal from 2.0.52 to
 2.1.1

Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.52 to 2.1.1.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.0.52...Microsoft.Build.Traversal.2.1.1)

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

diff --git a/global.json b/global.json
index 233a040d18..a9a531f59c 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,6 @@
     "version": "3.1.100"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "2.0.52"
+    "Microsoft.Build.Traversal": "2.1.1"
   }
 }
\ No newline at end of file

From 66c0d12da619a86b43cbbb594987c59712a8acff Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 17:19:46 +0000
Subject: [PATCH 04516/10326] Bump Microsoft.NET.Test.Sdk from 16.7.0 to 16.7.1

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.0 to 16.7.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.7.0...v16.7.1)

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 f9d56dfa78..dfe3bf8af4 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.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 ed00ed0b4c..892f27d27f 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.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 f3837ea6b1..3639c3616f 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.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 e896606ee8..b59f3a4344 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.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 d767973528..c692bcd5e4 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.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 95f5deb2cc..5d55196dcf 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.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>

From 8bf679db8be69f18ac06aba4972a14bcf5e8f513 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 13:17:17 +0900
Subject: [PATCH 04517/10326] Fix nullref in date text box

---
 osu.Game.Tournament/Components/DateTextBox.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index ee7e350970..aee5241e35 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -22,11 +22,12 @@ namespace osu.Game.Tournament.Components
         }
 
         // hold a reference to the provided bindable so we don't have to in every settings section.
-        private Bindable<DateTimeOffset> bindable;
+        private Bindable<DateTimeOffset> bindable = new Bindable<DateTimeOffset>();
 
         public DateTextBox()
         {
             base.Bindable = new Bindable<string>();
+
             ((OsuTextBox)Control).OnCommit = (sender, newText) =>
             {
                 try

From 8f90cc182099075a3651d22d1c31b9303aabd6ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 13:21:51 +0900
Subject: [PATCH 04518/10326] Add test

---
 .../Components/TestSceneDateTextBox.cs        | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs b/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
new file mode 100644
index 0000000000..33165d385a
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.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.Tests.Visual;
+using osu.Game.Tournament.Components;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tournament.Tests.Components
+{
+    public class TestSceneDateTextBox : OsuManualInputManagerTestScene
+    {
+        private DateTextBox textBox;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Child = textBox = new DateTextBox
+            {
+                Width = 0.3f
+            };
+        });
+
+        [Test]
+        public void TestCommitWithoutSettingBindable()
+        {
+            AddStep("click textbox", () =>
+            {
+                InputManager.MoveMouseTo(textBox);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("unfocus", () =>
+            {
+                InputManager.MoveMouseTo(Vector2.Zero);
+                InputManager.Click(MouseButton.Left);
+            });
+        }
+    }
+}

From f793bf66e5e34c94c374b4f19391c83ce08fd361 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 14:25:24 +0900
Subject: [PATCH 04519/10326] Remove rate adjustment from player test scene

---
 osu.Game/Tests/Visual/PlayerTestScene.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 7d06c99133..2c46e7f6d3 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -29,8 +29,6 @@ namespace osu.Game.Tests.Visual
         {
             Dependencies.Cache(LocalConfig = new OsuConfigManager(LocalStorage));
             LocalConfig.GetBindable<double>(OsuSetting.DimLevel).Value = 1.0;
-
-            MusicController.AllowRateAdjustments = true;
         }
 
         [SetUpSteps]

From 7a6e02c558cffb2eaa5f665611f6ce778359d035 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 14:28:31 +0900
Subject: [PATCH 04520/10326] Allow null rank

---
 osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs     | 2 +-
 .../Screens/Multi/Match/Components/MatchLeaderboardScore.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index 5bf61eb4ee..f2409d64e7 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Multi.Match.Components
 
         protected override LeaderboardScore CreateDrawableScore(APIUserScoreAggregate model, int index) => new MatchLeaderboardScore(model, index);
 
-        protected override LeaderboardScore CreateDrawableTopScore(APIUserScoreAggregate model) => new MatchLeaderboardScore(model, model.Position ?? 0, false);
+        protected override LeaderboardScore CreateDrawableTopScore(APIUserScoreAggregate model) => new MatchLeaderboardScore(model, model.Position, false);
     }
 
     public enum MatchLeaderboardScope
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
index c4e2b332b3..1fabdbb86a 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Multi.Match.Components
     {
         private readonly APIUserScoreAggregate score;
 
-        public MatchLeaderboardScore(APIUserScoreAggregate score, int rank, bool allowHighlight = true)
+        public MatchLeaderboardScore(APIUserScoreAggregate score, int? rank, bool allowHighlight = true)
             : base(score.CreateScoreInfo(), rank, allowHighlight)
         {
             this.score = score;

From bff652a26f4755e3b18546af495d8bab778ef67f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 14:29:46 +0900
Subject: [PATCH 04521/10326] Persist nulls to the top score bindable

---
 osu.Game/Online/Leaderboards/Leaderboard.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 003d90d400..db0f835c67 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -93,13 +93,12 @@ namespace osu.Game.Online.Leaderboards
             get => topScoreContainer.Score.Value;
             set
             {
+                topScoreContainer.Score.Value = value;
+
                 if (value == null)
                     topScoreContainer.Hide();
                 else
-                {
                     topScoreContainer.Show();
-                    topScoreContainer.Score.Value = value;
-                }
             }
         }
 

From 5195da3ceb6abc93db51e711c94086a009bf197d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Sep 2020 15:18:51 +0900
Subject: [PATCH 04522/10326] Add message box in bracket editor explaining how
 to get started

---
 .../Screens/Editors/LadderEditorScreen.cs     | 12 ++++++
 osu.Game.Tournament/TournamentGame.cs         | 25 +-----------
 osu.Game.Tournament/WarningBox.cs             | 40 +++++++++++++++++++
 3 files changed, 53 insertions(+), 24 deletions(-)
 create mode 100644 osu.Game.Tournament/WarningBox.cs

diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index f3eecf8afe..efec4cffdd 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Tournament.Screens.Editors
         [Cached]
         private LadderEditorInfo editorInfo = new LadderEditorInfo();
 
+        private WarningBox rightClickMessage;
+
         protected override bool DrawLoserPaths => true;
 
         [BackgroundDependencyLoader]
@@ -37,6 +39,16 @@ namespace osu.Game.Tournament.Screens.Editors
                 Origin = Anchor.TopRight,
                 Margin = new MarginPadding(5)
             });
+
+            AddInternal(rightClickMessage = new WarningBox("Right click to place and link matches"));
+
+            LadderInfo.Matches.CollectionChanged += (_, __) => updateMessage();
+            updateMessage();
+        }
+
+        private void updateMessage()
+        {
+            rightClickMessage.Alpha = LadderInfo.Matches.Count > 0 ? 0 : 1;
         }
 
         public void BeginJoin(TournamentMatch match, bool losers)
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 307ee1c773..bbe4a53d8f 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -87,30 +87,7 @@ namespace osu.Game.Tournament
                         },
                     }
                 },
-                heightWarning = new Container
-                {
-                    Masking = true,
-                    CornerRadius = 5,
-                    Depth = float.MinValue,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    AutoSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = Color4.Red,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new TournamentSpriteText
-                        {
-                            Text = "Please make the window wider",
-                            Font = OsuFont.Torus.With(weight: FontWeight.Bold),
-                            Colour = Color4.White,
-                            Padding = new MarginPadding(20)
-                        }
-                    }
-                },
+                heightWarning = new WarningBox("Please make the window wider"),
                 new OsuContextMenuContainer
                 {
                     RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Tournament/WarningBox.cs b/osu.Game.Tournament/WarningBox.cs
new file mode 100644
index 0000000000..814482aea4
--- /dev/null
+++ b/osu.Game.Tournament/WarningBox.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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osuTK.Graphics;
+
+namespace osu.Game.Tournament
+{
+    internal class WarningBox : Container
+    {
+        public WarningBox(string text)
+        {
+            Masking = true;
+            CornerRadius = 5;
+            Depth = float.MinValue;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+            AutoSizeAxes = Axes.Both;
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = Color4.Red,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new TournamentSpriteText
+                {
+                    Text = text,
+                    Font = OsuFont.Torus.With(weight: FontWeight.Bold),
+                    Colour = Color4.White,
+                    Padding = new MarginPadding(20)
+                }
+            };
+        }
+    }
+}

From 555b2196b734cbce88a2acd2a0832367bf1c33d4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 15:23:50 +0900
Subject: [PATCH 04523/10326] Add xmldoc to
 MusicController.ResetTrackAdjustments()

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

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 6d5b5d43cd..c831584248 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -382,6 +382,12 @@ namespace osu.Game.Overlays
             }
         }
 
+        /// <summary>
+        /// Resets the speed adjustments currently applied on <see cref="CurrentTrack"/> and applies the mod adjustments if <see cref="AllowRateAdjustments"/> is <c>true</c>.
+        /// </summary>
+        /// <remarks>
+        /// Does not reset speed adjustments applied directly to the beatmap track.
+        /// </remarks>
         public void ResetTrackAdjustments()
         {
             CurrentTrack.ResetSpeedAdjustments();

From 6a765d2d765dd01f4bd145560d6b30542aae7813 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Sep 2020 20:04:56 +0900
Subject: [PATCH 04524/10326] Add smooth fading between audio tracks on
 transition

---
 osu.Game/Overlays/MusicController.cs | 6 +++++-
 osu.Game/Screens/Menu/IntroScreen.cs | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index c831584248..17877a69a5 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -341,10 +342,13 @@ namespace osu.Game.Overlays
             // but the mutation of the hierarchy is scheduled to avoid exceptions.
             Schedule(() =>
             {
-                lastTrack.Expire();
+                lastTrack.VolumeTo(0, 500, Easing.Out).Expire();
 
                 if (queuedTrack == CurrentTrack)
+                {
                     AddInternal(queuedTrack);
+                    queuedTrack.VolumeTo(0).Then().VolumeTo(1, 300, Easing.Out);
+                }
                 else
                 {
                     // If the track has changed since the call to changeTrack, it is safe to dispose the
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 884cbfe107..473e6b0364 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -12,6 +12,7 @@ using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.IO.Archives;
+using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Skinning;
 using osuTK;
@@ -60,6 +61,9 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private AudioManager audio { get; set; }
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         /// <summary>
         /// Whether the <see cref="Track"/> is provided by osu! resources, rather than a user beatmap.
         /// Only valid during or after <see cref="LogoArriving"/>.
@@ -167,6 +171,9 @@ namespace osu.Game.Screens.Menu
                 Track = initialBeatmap.Track;
                 UsingThemedIntro = !initialBeatmap.Track.IsDummyDevice;
 
+                // ensure the track starts at maximum volume
+                musicController.CurrentTrack.FinishTransforms();
+
                 logo.MoveTo(new Vector2(0.5f));
                 logo.ScaleTo(Vector2.One);
                 logo.Hide();

From 4459287b35f1a85461661f5d98042dbb2334b066 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 20:25:12 +0900
Subject: [PATCH 04525/10326] Add filter control test scene

---
 .../SongSelect/TestSceneFilterControl.cs      | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
new file mode 100644
index 0000000000..f89300661c
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.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;
+using osu.Game.Screens.Select;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    public class TestSceneFilterControl : OsuTestScene
+    {
+        public TestSceneFilterControl()
+        {
+            Child = new FilterControl
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.X,
+                Height = FilterControl.HEIGHT,
+            };
+        }
+    }
+}

From bb090a55e03b35c47192ef9c6f8bce46a84c74e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 20:25:25 +0900
Subject: [PATCH 04526/10326] Add dropdown to filter control

---
 osu.Game/Screens/Select/FilterControl.cs | 196 +++++++++++++++++------
 1 file changed, 150 insertions(+), 46 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index e111ec4b15..24ea4946af 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -2,12 +2,17 @@
 // 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.Bindables;
 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.Collections;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -21,7 +26,8 @@ namespace osu.Game.Screens.Select
 {
     public class FilterControl : Container
     {
-        public const float HEIGHT = 100;
+        public const float HEIGHT = 2 * side_margin + 85;
+        private const float side_margin = 20;
 
         public Action<FilterCriteria> FilterChanged;
 
@@ -41,6 +47,7 @@ namespace osu.Game.Screens.Select
                 Sort = sortMode.Value,
                 AllowConvertedBeatmaps = showConverted.Value,
                 Ruleset = ruleset.Value,
+                Collection = collectionDropdown?.Current.Value
             };
 
             if (!minimumStars.IsDefault)
@@ -54,6 +61,7 @@ namespace osu.Game.Screens.Select
         }
 
         private SeekLimitedSearchTextBox searchTextBox;
+        private CollectionFilterDropdown collectionDropdown;
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             base.ReceivePositionalInputAt(screenSpacePos) || sortTabs.ReceivePositionalInputAt(screenSpacePos);
@@ -90,73 +98,169 @@ namespace osu.Game.Screens.Select
                 },
                 new Container
                 {
-                    Padding = new MarginPadding(20),
+                    Padding = new MarginPadding(side_margin),
                     RelativeSizeAxes = Axes.Both,
                     Width = 0.5f,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    Children = new Drawable[]
+                    Child = new GridContainer
                     {
-                        searchTextBox = new SeekLimitedSearchTextBox { RelativeSizeAxes = Axes.X },
-                        new Box
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
                         {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 1,
-                            Colour = OsuColour.Gray(80),
-                            Origin = Anchor.BottomLeft,
-                            Anchor = Anchor.BottomLeft,
+                            new Dimension(GridSizeMode.Absolute, 60),
+                            new Dimension(GridSizeMode.Absolute, 5),
+                            new Dimension(GridSizeMode.Absolute, 20),
                         },
-                        new FillFlowContainer
+                        Content = new[]
                         {
-                            Anchor = Anchor.BottomRight,
-                            Origin = Anchor.BottomRight,
-                            Direction = FillDirection.Horizontal,
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Spacing = new Vector2(OsuTabControl<SortMode>.HORIZONTAL_SPACING, 0),
-                            Children = new Drawable[]
+                            new Drawable[]
                             {
-                                new OsuTabControlCheckbox
+                                new Container
                                 {
-                                    Text = "Show converted",
-                                    Current = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
-                                    Anchor = Anchor.BottomRight,
-                                    Origin = Anchor.BottomRight,
-                                },
-                                sortTabs = new OsuTabControl<SortMode>
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
+                                        searchTextBox = new SeekLimitedSearchTextBox { RelativeSizeAxes = Axes.X },
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+                                            Height = 1,
+                                            Colour = OsuColour.Gray(80),
+                                            Origin = Anchor.BottomLeft,
+                                            Anchor = Anchor.BottomLeft,
+                                        },
+                                        new FillFlowContainer
+                                        {
+                                            Anchor = Anchor.BottomRight,
+                                            Origin = Anchor.BottomRight,
+                                            Direction = FillDirection.Horizontal,
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Spacing = new Vector2(OsuTabControl<SortMode>.HORIZONTAL_SPACING, 0),
+                                            Children = new Drawable[]
+                                            {
+                                                new OsuTabControlCheckbox
+                                                {
+                                                    Text = "Show converted",
+                                                    Current = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
+                                                    Anchor = Anchor.BottomRight,
+                                                    Origin = Anchor.BottomRight,
+                                                },
+                                                sortTabs = new OsuTabControl<SortMode>
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    Width = 0.5f,
+                                                    Height = 24,
+                                                    AutoSort = true,
+                                                    Anchor = Anchor.BottomRight,
+                                                    Origin = Anchor.BottomRight,
+                                                    AccentColour = colours.GreenLight,
+                                                    Current = { BindTarget = sortMode }
+                                                },
+                                                new OsuSpriteText
+                                                {
+                                                    Text = "Sort by",
+                                                    Font = OsuFont.GetFont(size: 14),
+                                                    Margin = new MarginPadding(5),
+                                                    Anchor = Anchor.BottomRight,
+                                                    Origin = Anchor.BottomRight,
+                                                },
+                                            }
+                                        },
+                                    }
+                                }
+                            },
+                            null,
+                            new Drawable[]
+                            {
+                                new Container
                                 {
-                                    RelativeSizeAxes = Axes.X,
-                                    Width = 0.5f,
-                                    Height = 24,
-                                    AutoSort = true,
-                                    Anchor = Anchor.BottomRight,
-                                    Origin = Anchor.BottomRight,
-                                    AccentColour = colours.GreenLight,
-                                    Current = { BindTarget = sortMode }
-                                },
-                                new OsuSpriteText
-                                {
-                                    Text = "Sort by",
-                                    Font = OsuFont.GetFont(size: 14),
-                                    Margin = new MarginPadding(5),
-                                    Anchor = Anchor.BottomRight,
-                                    Origin = Anchor.BottomRight,
-                                },
-                            }
-                        },
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
+                                        collectionDropdown = new CollectionFilterDropdown
+                                        {
+                                            Anchor = Anchor.TopRight,
+                                            Origin = Anchor.TopRight,
+                                            RelativeSizeAxes = Axes.X,
+                                            Width = 0.4f,
+                                        }
+                                    }
+                                }
+                            },
+                        }
                     }
                 }
             };
 
-            searchTextBox.Current.ValueChanged += _ => FilterChanged?.Invoke(CreateCriteria());
+            collectionDropdown.Current.ValueChanged += _ => updateCriteria();
+            searchTextBox.Current.ValueChanged += _ => updateCriteria();
 
             updateCriteria();
         }
 
+        private class CollectionFilterDropdown : OsuDropdown<CollectionFilter>
+        {
+            private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
+            private readonly BindableList<CollectionFilter> filters = new BindableList<CollectionFilter>();
+
+            public CollectionFilterDropdown()
+            {
+                ItemSource = filters;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(CollectionManager collectionManager)
+            {
+                collections.BindTo(collectionManager.Collections);
+                collections.CollectionChanged += (_, __) => updateItems();
+                updateItems();
+            }
+
+            private void updateItems()
+            {
+                var selectedItem = SelectedItem?.Value?.Collection;
+
+                filters.Clear();
+                filters.Add(new CollectionFilter(null));
+                filters.AddRange(collections.Select(c => new CollectionFilter(c)));
+
+                Current.Value = filters.FirstOrDefault(f => f.Collection == selectedItem) ?? filters[0];
+            }
+
+            protected override string GenerateItemText(CollectionFilter item) => item.Collection?.Name ?? "All beatmaps";
+
+            protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader();
+
+            private class CollectionDropdownHeader : OsuDropdownHeader
+            {
+                public CollectionDropdownHeader()
+                {
+                    Height = 25;
+                    Icon.Size = new Vector2(16);
+                    Foreground.Padding = new MarginPadding { Top = 4, Bottom = 4, Left = 8, Right = 4 };
+                }
+            }
+        }
+
+        public class CollectionFilter
+        {
+            [CanBeNull]
+            public readonly BeatmapCollection Collection;
+
+            public CollectionFilter([CanBeNull] BeatmapCollection collection)
+            {
+                Collection = collection;
+            }
+
+            public virtual bool ContainsBeatmap(BeatmapInfo beatmap)
+                => Collection?.Beatmaps.Any(b => b.Equals(beatmap)) ?? true;
+        }
+
         public void Deactivate()
         {
             searchTextBox.ReadOnly = true;
-
             searchTextBox.HoldFocus = false;
             if (searchTextBox.HasFocus)
                 GetContainingInputManager().ChangeFocus(searchTextBox);

From 9dde37fe40b7a49e5743844de3bb42007d49ea9e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 20:25:36 +0900
Subject: [PATCH 04527/10326] Hook up collection filter

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 3 +++
 osu.Game/Screens/Select/FilterCriteria.cs           | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index ed54c158db..8e5655e514 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -60,6 +60,9 @@ namespace osu.Game.Screens.Select.Carousel
                     match &= terms.Any(term => term.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0);
             }
 
+            if (match)
+                match &= criteria.Collection?.ContainsBeatmap(Beatmap) ?? true;
+
             Filtered.Value = !match;
         }
 
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 18be4fcac8..5a5c0e1b50 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -51,6 +51,8 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        public FilterControl.CollectionFilter Collection;
+
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct
         {

From 6d5e155106d721940bb6a9f56822511986b86853 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 20:44:26 +0900
Subject: [PATCH 04528/10326] Change to BindableList to notify of changes

---
 osu.Game/Collections/CollectionManager.cs |  4 +--
 osu.Game/Screens/Select/FilterControl.cs  | 41 ++++++++++++++++++++---
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 302d892efb..3ba604cc39 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -74,9 +74,7 @@ namespace osu.Game.Collections
                 for (int i = 0; i < collectionCount; i++)
                 {
                     var collection = new BeatmapCollection { Name = reader.ReadString() };
-
                     int mapCount = reader.ReadInt32();
-                    collection.Beatmaps.Capacity = mapCount;
 
                     for (int j = 0; j < mapCount; j++)
                     {
@@ -99,6 +97,6 @@ namespace osu.Game.Collections
     {
         public string Name;
 
-        public readonly List<BeatmapInfo> Beatmaps = new List<BeatmapInfo>();
+        public readonly BindableList<BeatmapInfo> Beatmaps = new BindableList<BeatmapInfo>();
     }
 }
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 24ea4946af..58c27751fd 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Specialized;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -214,11 +215,21 @@ namespace osu.Game.Screens.Select
             private void load(CollectionManager collectionManager)
             {
                 collections.BindTo(collectionManager.Collections);
-                collections.CollectionChanged += (_, __) => updateItems();
-                updateItems();
+                collections.CollectionChanged += (_, __) => collectionsChanged();
+                collectionsChanged();
             }
 
-            private void updateItems()
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                Current.BindValueChanged(filterChanged);
+            }
+
+            /// <summary>
+            /// Occurs when a collection has been added or removed.
+            /// </summary>
+            private void collectionsChanged()
             {
                 var selectedItem = SelectedItem?.Value?.Collection;
 
@@ -226,7 +237,29 @@ namespace osu.Game.Screens.Select
                 filters.Add(new CollectionFilter(null));
                 filters.AddRange(collections.Select(c => new CollectionFilter(c)));
 
-                Current.Value = filters.FirstOrDefault(f => f.Collection == selectedItem) ?? filters[0];
+                Current.Value = filters.SingleOrDefault(f => f.Collection == selectedItem) ?? filters[0];
+            }
+
+            /// <summary>
+            /// Occurs when the <see cref="CollectionFilter"/> selection has changed.
+            /// </summary>
+            private void filterChanged(ValueChangedEvent<CollectionFilter> filter)
+            {
+                if (filter.OldValue?.Collection != null)
+                    filter.OldValue.Collection.Beatmaps.CollectionChanged -= filterBeatmapsChanged;
+
+                if (filter.NewValue?.Collection != null)
+                    filter.NewValue.Collection.Beatmaps.CollectionChanged += filterBeatmapsChanged;
+            }
+
+            /// <summary>
+            /// Occurs when the beatmaps contained by a <see cref="BeatmapCollection"/> have changed.
+            /// </summary>
+            private void filterBeatmapsChanged(object sender, NotifyCollectionChangedEventArgs e)
+            {
+                // The filtered beatmaps have changed, without the filter having changed itself. So a change in filter must be notified.
+                // Note that this does NOT propagate to bound bindables, so the FilterControl must bind directly to the value change event of this bindable.
+                Current.TriggerChange();
             }
 
             protected override string GenerateItemText(CollectionFilter item) => item.Collection?.Name ?? "All beatmaps";

From 094ddecc9510f5e5e020c24b5952f979ad673741 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 21:08:31 +0900
Subject: [PATCH 04529/10326] Add dropdowns to carousel items

---
 .../Carousel/DrawableCarouselBeatmap.cs       | 26 ++++++++++
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 48 +++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index c559b4f8f5..760b888288 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -17,6 +18,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
+using osu.Game.Collections;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
@@ -46,6 +48,9 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved]
         private BeatmapDifficultyManager difficultyManager { get; set; }
 
+        [Resolved]
+        private CollectionManager collectionManager { get; set; }
+
         private IBindable<StarDifficulty> starDifficultyBindable;
         private CancellationTokenSource starDifficultyCancellationSource;
 
@@ -219,10 +224,31 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmap.OnlineBeatmapID.HasValue && beatmapOverlay != null)
                     items.Add(new OsuMenuItem("Details", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
 
+                items.Add(new OsuMenuItem("Add to...")
+                {
+                    Items = collectionManager.Collections.Take(3).Select(createCollectionMenuItem)
+                                             .Append(new OsuMenuItem("More...", MenuItemType.Standard, () => { }))
+                                             .ToArray()
+                });
+
                 return items.ToArray();
             }
         }
 
+        private MenuItem createCollectionMenuItem(BeatmapCollection collection)
+        {
+            return new ToggleMenuItem(collection.Name, MenuItemType.Standard, s =>
+            {
+                if (s)
+                    collection.Beatmaps.Add(beatmap);
+                else
+                    collection.Beatmaps.Remove(beatmap);
+            })
+            {
+                State = { Value = collection.Beatmaps.Contains(beatmap) }
+            };
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 5acb6d1946..66851657bc 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -16,6 +16,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
+using osu.Game.Collections;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -34,6 +35,9 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved(CanBeNull = true)]
         private DialogOverlay dialogOverlay { get; set; }
 
+        [Resolved]
+        private CollectionManager collectionManager { get; set; }
+
         private readonly BeatmapSetInfo beatmapSet;
 
         public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)
@@ -141,10 +145,54 @@ namespace osu.Game.Screens.Select.Carousel
                 if (dialogOverlay != null)
                     items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay.Push(new BeatmapDeleteDialog(beatmapSet))));
 
+                items.Add(new OsuMenuItem("Add all to...")
+                {
+                    Items = collectionManager.Collections.Take(3).Select(createCollectionMenuItem)
+                                             .Append(new OsuMenuItem("More...", MenuItemType.Standard, () => { }))
+                                             .ToArray()
+                });
+
                 return items.ToArray();
             }
         }
 
+        private MenuItem createCollectionMenuItem(BeatmapCollection collection)
+        {
+            TernaryState state;
+
+            var countExisting = beatmapSet.Beatmaps.Count(b => collection.Beatmaps.Contains(b));
+
+            if (countExisting == beatmapSet.Beatmaps.Count)
+                state = TernaryState.True;
+            else if (countExisting > 0)
+                state = TernaryState.Indeterminate;
+            else
+                state = TernaryState.False;
+
+            return new TernaryStateMenuItem(collection.Name, MenuItemType.Standard, s =>
+            {
+                foreach (var b in beatmapSet.Beatmaps)
+                {
+                    switch (s)
+                    {
+                        case TernaryState.True:
+                            if (collection.Beatmaps.Contains(b))
+                                continue;
+
+                            collection.Beatmaps.Add(b);
+                            break;
+
+                        case TernaryState.False:
+                            collection.Beatmaps.Remove(b);
+                            break;
+                    }
+                }
+            })
+            {
+                State = { Value = state }
+            };
+        }
+
         private class PanelBackground : BufferedContainer
         {
             public PanelBackground(WorkingBeatmap working)

From d363a5d164755423b23c5bd1c3531605d0866f2b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 21:19:15 +0900
Subject: [PATCH 04530/10326] Add basic ordering

---
 osu.Game/Collections/CollectionManager.cs                | 9 +++++++++
 .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs   | 2 +-
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs        | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 3ba604cc39..c18cc30427 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -98,5 +98,14 @@ namespace osu.Game.Collections
         public string Name;
 
         public readonly BindableList<BeatmapInfo> Beatmaps = new BindableList<BeatmapInfo>();
+
+        public DateTimeOffset LastModifyTime { get; private set; }
+
+        public BeatmapCollection()
+        {
+            LastModifyTime = DateTimeOffset.UtcNow;
+
+            Beatmaps.CollectionChanged += (_, __) => LastModifyTime = DateTimeOffset.Now;
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 760b888288..1bd4447248 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Screens.Select.Carousel
 
                 items.Add(new OsuMenuItem("Add to...")
                 {
-                    Items = collectionManager.Collections.Take(3).Select(createCollectionMenuItem)
+                    Items = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem)
                                              .Append(new OsuMenuItem("More...", MenuItemType.Standard, () => { }))
                                              .ToArray()
                 });
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 66851657bc..e05b5ee951 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Select.Carousel
 
                 items.Add(new OsuMenuItem("Add all to...")
                 {
-                    Items = collectionManager.Collections.Take(3).Select(createCollectionMenuItem)
+                    Items = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem)
                                              .Append(new OsuMenuItem("More...", MenuItemType.Standard, () => { }))
                                              .ToArray()
                 });

From 5ebead2bfd27a6df4c7150625f9d9e0da38b1116 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 21:44:07 +0900
Subject: [PATCH 04531/10326] Prevent ValueChanged binds to external bindable

---
 osu.Game/Screens/Select/FilterControl.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 58c27751fd..d49d0c57e6 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -204,6 +204,7 @@ namespace osu.Game.Screens.Select
         private class CollectionFilterDropdown : OsuDropdown<CollectionFilter>
         {
             private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
+            private readonly IBindableList<BeatmapInfo> beatmaps = new BindableList<BeatmapInfo>();
             private readonly BindableList<CollectionFilter> filters = new BindableList<CollectionFilter>();
 
             public CollectionFilterDropdown()
@@ -223,7 +224,8 @@ namespace osu.Game.Screens.Select
             {
                 base.LoadComplete();
 
-                Current.BindValueChanged(filterChanged);
+                beatmaps.CollectionChanged += filterBeatmapsChanged;
+                Current.BindValueChanged(filterChanged, true);
             }
 
             /// <summary>
@@ -246,10 +248,10 @@ namespace osu.Game.Screens.Select
             private void filterChanged(ValueChangedEvent<CollectionFilter> filter)
             {
                 if (filter.OldValue?.Collection != null)
-                    filter.OldValue.Collection.Beatmaps.CollectionChanged -= filterBeatmapsChanged;
+                    beatmaps.UnbindFrom(filter.OldValue.Collection.Beatmaps);
 
                 if (filter.NewValue?.Collection != null)
-                    filter.NewValue.Collection.Beatmaps.CollectionChanged += filterBeatmapsChanged;
+                    beatmaps.BindTo(filter.NewValue.Collection.Beatmaps);
             }
 
             /// <summary>

From 02a908752f61509ed45df94d6db41712647f11d3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 21:52:56 +0900
Subject: [PATCH 04532/10326] Fix stackoverflow

---
 osu.Game/Screens/Select/FilterControl.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index d49d0c57e6..fcaacef97b 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -224,7 +224,6 @@ namespace osu.Game.Screens.Select
             {
                 base.LoadComplete();
 
-                beatmaps.CollectionChanged += filterBeatmapsChanged;
                 Current.BindValueChanged(filterChanged, true);
             }
 
@@ -247,11 +246,15 @@ namespace osu.Game.Screens.Select
             /// </summary>
             private void filterChanged(ValueChangedEvent<CollectionFilter> filter)
             {
+                beatmaps.CollectionChanged -= filterBeatmapsChanged;
+
                 if (filter.OldValue?.Collection != null)
                     beatmaps.UnbindFrom(filter.OldValue.Collection.Beatmaps);
 
                 if (filter.NewValue?.Collection != null)
                     beatmaps.BindTo(filter.NewValue.Collection.Beatmaps);
+
+                beatmaps.CollectionChanged += filterBeatmapsChanged;
             }
 
             /// <summary>

From 686257167223fec69675cbe5d0b6c2999132c68f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 22:02:50 +0900
Subject: [PATCH 04533/10326] Fix IconButton sometimes not recolourising

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

diff --git a/osu.Game/Graphics/UserInterface/IconButton.cs b/osu.Game/Graphics/UserInterface/IconButton.cs
index d7e5666545..858f517985 100644
--- a/osu.Game/Graphics/UserInterface/IconButton.cs
+++ b/osu.Game/Graphics/UserInterface/IconButton.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 iconColour = value;
-                icon.Colour = value;
+                icon.FadeColour(value);
             }
         }
 

From 661eac8f1dd0731fe0476038be5a3c37b72d3b95 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 22:03:38 +0900
Subject: [PATCH 04534/10326] Add add/remove button to dropdown items

---
 osu.Game/Screens/Select/FilterControl.cs | 82 ++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index fcaacef97b..31c3bd6d1c 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -10,12 +11,14 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 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.Rulesets;
@@ -271,6 +274,8 @@ namespace osu.Game.Screens.Select
 
             protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader();
 
+            protected override DropdownMenu CreateMenu() => new CollectionDropdownMenu();
+
             private class CollectionDropdownHeader : OsuDropdownHeader
             {
                 public CollectionDropdownHeader()
@@ -280,6 +285,83 @@ namespace osu.Game.Screens.Select
                     Foreground.Padding = new MarginPadding { Top = 4, Bottom = 4, Left = 8, Right = 4 };
                 }
             }
+
+            private class CollectionDropdownMenu : OsuDropdownMenu
+            {
+                protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new CollectionDropdownMenuItem(item);
+            }
+
+            private class CollectionDropdownMenuItem : OsuDropdownMenu.DrawableOsuDropdownMenuItem
+            {
+                [Resolved]
+                private OsuColour colours { get; set; }
+
+                [Resolved]
+                private IBindable<WorkingBeatmap> beatmap { get; set; }
+
+                [CanBeNull]
+                private readonly BindableList<BeatmapInfo> collectionBeatmaps;
+
+                private IconButton addOrRemoveButton;
+
+                public CollectionDropdownMenuItem(MenuItem item)
+                    : base(item)
+                {
+                    collectionBeatmaps = ((DropdownMenuItem<CollectionFilter>)item).Value.Collection?.Beatmaps.GetBoundCopy();
+                }
+
+                [BackgroundDependencyLoader]
+                private void load()
+                {
+                    AddRangeInternal(new Drawable[]
+                    {
+                        addOrRemoveButton = new IconButton
+                        {
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
+                            X = -OsuScrollContainer.SCROLL_BAR_HEIGHT,
+                            Scale = new Vector2(0.75f),
+                            Alpha = collectionBeatmaps == null ? 0 : 1,
+                            Action = addOrRemove
+                        }
+                    });
+                }
+
+                protected override void LoadComplete()
+                {
+                    base.LoadComplete();
+
+                    if (collectionBeatmaps != null)
+                    {
+                        collectionBeatmaps.CollectionChanged += (_, __) => collectionChanged();
+                        collectionChanged();
+                    }
+                }
+
+                private void collectionChanged()
+                {
+                    Debug.Assert(collectionBeatmaps != null);
+
+                    if (collectionBeatmaps.Contains(beatmap.Value.BeatmapInfo))
+                    {
+                        addOrRemoveButton.Icon = FontAwesome.Solid.MinusSquare;
+                        addOrRemoveButton.IconColour = colours.Red;
+                    }
+                    else
+                    {
+                        addOrRemoveButton.Icon = FontAwesome.Solid.PlusSquare;
+                        addOrRemoveButton.IconColour = colours.Green;
+                    }
+                }
+
+                private void addOrRemove()
+                {
+                    Debug.Assert(collectionBeatmaps != null);
+
+                    if (!collectionBeatmaps.Remove(beatmap.Value.BeatmapInfo))
+                        collectionBeatmaps.Add(beatmap.Value.BeatmapInfo);
+                }
+            }
         }
 
         public class CollectionFilter

From 7fcbc3a814b24c78f8a2facf901112ec0e0bc561 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 22:06:17 +0900
Subject: [PATCH 04535/10326] Respond to changes in beatmap

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

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 31c3bd6d1c..a8f9835240 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -334,7 +334,7 @@ namespace osu.Game.Screens.Select
                     if (collectionBeatmaps != null)
                     {
                         collectionBeatmaps.CollectionChanged += (_, __) => collectionChanged();
-                        collectionChanged();
+                        beatmap.BindValueChanged(_ => collectionChanged(), true);
                     }
                 }
 

From d83264f5385d2890f4b9ccd4e021ac77498e1d84 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 22:56:13 +0900
Subject: [PATCH 04536/10326] Add max height

---
 osu.Game/Screens/Select/FilterControl.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index a8f9835240..0ae5e70fc2 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -288,6 +288,11 @@ namespace osu.Game.Screens.Select
 
             private class CollectionDropdownMenu : OsuDropdownMenu
             {
+                public CollectionDropdownMenu()
+                {
+                    MaxHeight = 200;
+                }
+
                 protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new CollectionDropdownMenuItem(item);
             }
 

From b7adb4b1fd1c17b0044cb572b329fd7c96f1780f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 23:31:37 +0900
Subject: [PATCH 04537/10326] Add background save support + read safety

---
 osu.Game/Collections/CollectionManager.cs | 130 +++++++++++++++++++---
 1 file changed, 112 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index c18cc30427..3f89866749 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -4,9 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.IO.Legacy;
@@ -15,8 +18,16 @@ namespace osu.Game.Collections
 {
     public class CollectionManager : CompositeDrawable
     {
+        /// <summary>
+        /// Database version in YYYYMMDD format (matching stable).
+        /// </summary>
+        private const int database_version = 30000000;
+
         private const string database_name = "collection.db";
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         public IBindableList<BeatmapCollection> Collections => collections;
         private readonly BindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
 
@@ -24,13 +35,17 @@ namespace osu.Game.Collections
         private BeatmapManager beatmaps { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(GameHost host)
+        private void load()
         {
             if (host.Storage.Exists(database_name))
             {
                 using (var stream = host.Storage.GetStream(database_name))
                     collections.AddRange(readCollection(stream));
             }
+
+            foreach (var c in collections)
+                c.Changed += backgroundSave;
+            collections.CollectionChanged += (_, __) => backgroundSave();
         }
 
         /// <summary>
@@ -64,37 +79,112 @@ namespace osu.Game.Collections
         {
             var result = new List<BeatmapCollection>();
 
-            using (var reader = new SerializationReader(stream))
+            try
             {
-                reader.ReadInt32(); // Version
-
-                int collectionCount = reader.ReadInt32();
-                result.Capacity = collectionCount;
-
-                for (int i = 0; i < collectionCount; i++)
+                using (var sr = new SerializationReader(stream))
                 {
-                    var collection = new BeatmapCollection { Name = reader.ReadString() };
-                    int mapCount = reader.ReadInt32();
+                    sr.ReadInt32(); // Version
 
-                    for (int j = 0; j < mapCount; j++)
+                    int collectionCount = sr.ReadInt32();
+                    result.Capacity = collectionCount;
+
+                    for (int i = 0; i < collectionCount; i++)
                     {
-                        string checksum = reader.ReadString();
+                        var collection = new BeatmapCollection { Name = sr.ReadString() };
+                        int mapCount = sr.ReadInt32();
 
-                        var beatmap = beatmaps.QueryBeatmap(b => b.MD5Hash == checksum);
-                        if (beatmap != null)
-                            collection.Beatmaps.Add(beatmap);
+                        for (int j = 0; j < mapCount; j++)
+                        {
+                            string checksum = sr.ReadString();
+
+                            var beatmap = beatmaps.QueryBeatmap(b => b.MD5Hash == checksum);
+                            if (beatmap != null)
+                                collection.Beatmaps.Add(beatmap);
+                        }
+
+                        result.Add(collection);
                     }
-
-                    result.Add(collection);
                 }
             }
+            catch (Exception e)
+            {
+                Logger.Error(e, "Failed to read collections");
+            }
 
             return result;
         }
+
+        private readonly object saveLock = new object();
+        private int lastSave;
+        private int saveFailures;
+
+        /// <summary>
+        /// Perform a save with debounce.
+        /// </summary>
+        private void backgroundSave()
+        {
+            var current = Interlocked.Increment(ref lastSave);
+            Task.Delay(100).ContinueWith(task =>
+            {
+                if (current != lastSave)
+                    return;
+
+                if (!save())
+                    backgroundSave();
+            });
+        }
+
+        private bool save()
+        {
+            lock (saveLock)
+            {
+                Interlocked.Increment(ref lastSave);
+
+                try
+                {
+                    // This is NOT thread-safe!!
+
+                    using (var sw = new SerializationWriter(host.Storage.GetStream(database_name, FileAccess.Write)))
+                    {
+                        sw.Write(database_version);
+                        sw.Write(collections.Count);
+
+                        foreach (var c in collections)
+                        {
+                            sw.Write(c.Name);
+                            sw.Write(c.Beatmaps.Count);
+
+                            foreach (var b in c.Beatmaps)
+                                sw.Write(b.MD5Hash);
+                        }
+                    }
+
+                    saveFailures = 0;
+                    return true;
+                }
+                catch (Exception e)
+                {
+                    // Since this code is not thread-safe, we may run into random exceptions (such as collection enumeration or out of range indexing).
+                    // Failures are thus only alerted if they exceed a threshold to indicate "actual" errors.
+                    if (++saveFailures >= 10)
+                    {
+                        Logger.Error(e, "Failed to save collections");
+                        saveFailures = 0;
+                    }
+                }
+
+                return false;
+            }
+        }
     }
 
     public class BeatmapCollection
     {
+        /// <summary>
+        /// Invoked whenever any change occurs on this <see cref="BeatmapCollection"/>.
+        /// </summary>
+        public event Action Changed;
+
         public string Name;
 
         public readonly BindableList<BeatmapInfo> Beatmaps = new BindableList<BeatmapInfo>();
@@ -105,7 +195,11 @@ namespace osu.Game.Collections
         {
             LastModifyTime = DateTimeOffset.UtcNow;
 
-            Beatmaps.CollectionChanged += (_, __) => LastModifyTime = DateTimeOffset.Now;
+            Beatmaps.CollectionChanged += (_, __) =>
+            {
+                LastModifyTime = DateTimeOffset.Now;
+                Changed?.Invoke();
+            };
         }
     }
 }

From fd3ab417312e56ded809bb98a86f54f23ddaa0df Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 23:32:08 +0900
Subject: [PATCH 04538/10326] Save on disposal

---
 osu.Game/Collections/CollectionManager.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 3f89866749..5427f6a489 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -176,6 +176,12 @@ namespace osu.Game.Collections
                 return false;
             }
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            save();
+        }
     }
 
     public class BeatmapCollection

From fca03242644bf67d679158588b4224ac0b1bfd57 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 23:34:38 +0900
Subject: [PATCH 04539/10326] Disallow being able to add dummy beatmap

---
 osu.Game/Screens/Select/FilterControl.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 0ae5e70fc2..0b85ae0e6a 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -347,6 +347,8 @@ namespace osu.Game.Screens.Select
                 {
                     Debug.Assert(collectionBeatmaps != null);
 
+                    addOrRemoveButton.Enabled.Value = !beatmap.IsDefault;
+
                     if (collectionBeatmaps.Contains(beatmap.Value.BeatmapInfo))
                     {
                         addOrRemoveButton.Icon = FontAwesome.Solid.MinusSquare;

From ae1de1adcb7b95e84b60f28d84cf67a21f9034f0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 23:42:44 +0900
Subject: [PATCH 04540/10326] Adjust to prevent runaway errors

---
 osu.Game/Collections/CollectionManager.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 5427f6a489..1388a27806 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -159,18 +159,16 @@ namespace osu.Game.Collections
                         }
                     }
 
-                    saveFailures = 0;
+                    if (saveFailures < 10)
+                        saveFailures = 0;
                     return true;
                 }
                 catch (Exception e)
                 {
                     // Since this code is not thread-safe, we may run into random exceptions (such as collection enumeration or out of range indexing).
-                    // Failures are thus only alerted if they exceed a threshold to indicate "actual" errors.
-                    if (++saveFailures >= 10)
-                    {
+                    // Failures are thus only alerted if they exceed a threshold (once) to indicate "actual" errors having occurred.
+                    if (++saveFailures == 10)
                         Logger.Error(e, "Failed to save collections");
-                        saveFailures = 0;
-                    }
                 }
 
                 return false;

From 39c304d008ca981ffae95004db43c57789f57435 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 23:47:42 +0900
Subject: [PATCH 04541/10326] Adjust error messages

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

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 1388a27806..e6eed40dfc 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Collections
             }
             catch (Exception e)
             {
-                Logger.Error(e, "Failed to read collections");
+                Logger.Error(e, "Failed to read collection database.");
             }
 
             return result;
@@ -168,7 +168,7 @@ namespace osu.Game.Collections
                     // Since this code is not thread-safe, we may run into random exceptions (such as collection enumeration or out of range indexing).
                     // Failures are thus only alerted if they exceed a threshold (once) to indicate "actual" errors having occurred.
                     if (++saveFailures == 10)
-                        Logger.Error(e, "Failed to save collections");
+                        Logger.Error(e, "Failed to save collection database!");
                 }
 
                 return false;

From a56f9d6770e0ea9f3392a59dd2a2e99706c2654e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Sep 2020 00:08:33 +0900
Subject: [PATCH 04542/10326] Implement collection import

---
 osu.Game/Collections/CollectionManager.cs     | 88 +++++++++++++------
 osu.Game/OsuGame.cs                           |  2 +
 osu.Game/OsuGameBase.cs                       |  5 +-
 .../Sections/Maintenance/GeneralSettings.cs   | 45 +++++++---
 4 files changed, 99 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index e6eed40dfc..20bf96da9d 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -4,8 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
@@ -25,12 +27,13 @@ namespace osu.Game.Collections
 
         private const string database_name = "collection.db";
 
+        public readonly BindableList<BeatmapCollection> Collections = new BindableList<BeatmapCollection>();
+
+        public bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
+
         [Resolved]
         private GameHost host { get; set; }
 
-        public IBindableList<BeatmapCollection> Collections => collections;
-        private readonly BindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
-
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
@@ -40,12 +43,12 @@ namespace osu.Game.Collections
             if (host.Storage.Exists(database_name))
             {
                 using (var stream = host.Storage.GetStream(database_name))
-                    collections.AddRange(readCollection(stream));
+                    importCollections(readCollections(stream));
             }
 
-            foreach (var c in collections)
+            foreach (var c in Collections)
                 c.Changed += backgroundSave;
-            collections.CollectionChanged += (_, __) => backgroundSave();
+            Collections.CollectionChanged += (_, __) => backgroundSave();
         }
 
         /// <summary>
@@ -56,26 +59,55 @@ namespace osu.Game.Collections
         /// <summary>
         /// This is a temporary method and will likely be replaced by a full-fledged (and more correctly placed) migration process in the future.
         /// </summary>
-        // public Task ImportFromStableAsync()
-        // {
-        //     var stable = GetStableStorage?.Invoke();
-        //
-        //     if (stable == null)
-        //     {
-        //         Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
-        //         return Task.CompletedTask;
-        //     }
-        //
-        //     if (!stable.ExistsDirectory(database_name))
-        //     {
-        //         // This handles situations like when the user does not have a Skins folder
-        //         Logger.Log($"No {database_name} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
-        //         return Task.CompletedTask;
-        //     }
-        //
-        //     return Task.Run(async () => await Import(GetStableImportPaths(GetStableStorage()).Select(f => stable.GetFullPath(f)).ToArray()));
-        // }
-        private List<BeatmapCollection> readCollection(Stream stream)
+        public Task ImportFromStableAsync()
+        {
+            var stable = GetStableStorage?.Invoke();
+
+            if (stable == null)
+            {
+                Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
+                return Task.CompletedTask;
+            }
+
+            if (!stable.Exists(database_name))
+            {
+                // This handles situations like when the user does not have a collections.db file
+                Logger.Log($"No {database_name} available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
+                return Task.CompletedTask;
+            }
+
+            return Task.Run(() =>
+            {
+                var storage = GetStableStorage();
+
+                if (storage.Exists(database_name))
+                {
+                    using (var stream = storage.GetStream(database_name))
+                    {
+                        var collection = readCollections(stream);
+                        Schedule(() => importCollections(collection));
+                    }
+                }
+            });
+        }
+
+        private void importCollections(List<BeatmapCollection> newCollections)
+        {
+            foreach (var newCol in newCollections)
+            {
+                var existing = Collections.FirstOrDefault(c => c.Name == newCol.Name);
+                if (existing == null)
+                    Collections.Add(existing = new BeatmapCollection { Name = newCol.Name });
+
+                foreach (var newBeatmap in newCol.Beatmaps)
+                {
+                    if (!existing.Beatmaps.Contains(newBeatmap))
+                        existing.Beatmaps.Add(newBeatmap);
+                }
+            }
+        }
+
+        private List<BeatmapCollection> readCollections(Stream stream)
         {
             var result = new List<BeatmapCollection>();
 
@@ -147,9 +179,9 @@ namespace osu.Game.Collections
                     using (var sw = new SerializationWriter(host.Storage.GetStream(database_name, FileAccess.Write)))
                     {
                         sw.Write(database_version);
-                        sw.Write(collections.Count);
+                        sw.Write(Collections.Count);
 
-                        foreach (var c in collections)
+                        foreach (var c in Collections)
                         {
                             sw.Write(c.Name);
                             sw.Write(c.Beatmaps.Count);
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 053eb01dcd..5008a3cf3b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -549,6 +549,8 @@ namespace osu.Game
             ScoreManager.GetStableStorage = GetStorageForStableInstall;
             ScoreManager.PresentImport = items => PresentScore(items.First());
 
+            CollectionManager.GetStableStorage = GetStorageForStableInstall;
+
             Container logoContainer;
             BackButton.Receptor receptor;
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 3ba164e87f..d512f57ca5 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -225,9 +225,8 @@ namespace osu.Game
             dependencies.Cache(difficultyManager);
             AddInternal(difficultyManager);
 
-            var collectionManager = new CollectionManager();
-            dependencies.Cache(collectionManager);
-            AddInternal(collectionManager);
+            dependencies.Cache(CollectionManager = new CollectionManager());
+            AddInternal(CollectionManager);
 
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 832673703b..21a5ed6b31 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Collections;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
@@ -19,6 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton importBeatmapsButton;
         private TriangleButton importScoresButton;
         private TriangleButton importSkinsButton;
+        private TriangleButton importCollectionsButton;
         private TriangleButton deleteBeatmapsButton;
         private TriangleButton deleteScoresButton;
         private TriangleButton deleteSkinsButton;
@@ -26,7 +28,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton undeleteButton;
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, DialogOverlay dialogOverlay)
+        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, CollectionManager collections, DialogOverlay dialogOverlay)
         {
             if (beatmaps.SupportsImportFromStable)
             {
@@ -93,20 +95,43 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 });
             }
 
-            AddRange(new Drawable[]
+            Add(deleteSkinsButton = new DangerousSettingsButton
             {
-                deleteSkinsButton = new DangerousSettingsButton
+                Text = "Delete ALL skins",
+                Action = () =>
                 {
-                    Text = "Delete ALL skins",
+                    dialogOverlay?.Push(new DeleteAllBeatmapsDialog(() =>
+                    {
+                        deleteSkinsButton.Enabled.Value = false;
+                        Task.Run(() => skins.Delete(skins.GetAllUserSkins())).ContinueWith(t => Schedule(() => deleteSkinsButton.Enabled.Value = true));
+                    }));
+                }
+            });
+
+            if (collections.SupportsImportFromStable)
+            {
+                Add(importCollectionsButton = new SettingsButton
+                {
+                    Text = "Import collections from stable",
                     Action = () =>
                     {
-                        dialogOverlay?.Push(new DeleteAllBeatmapsDialog(() =>
-                        {
-                            deleteSkinsButton.Enabled.Value = false;
-                            Task.Run(() => skins.Delete(skins.GetAllUserSkins())).ContinueWith(t => Schedule(() => deleteSkinsButton.Enabled.Value = true));
-                        }));
+                        importCollectionsButton.Enabled.Value = false;
+                        collections.ImportFromStableAsync().ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
                     }
-                },
+                });
+            }
+
+            Add(new DangerousSettingsButton
+            {
+                Text = "Delete ALL collections",
+                Action = () =>
+                {
+                    dialogOverlay?.Push(new DeleteAllBeatmapsDialog(() => collections.Collections.Clear()));
+                }
+            });
+
+            AddRange(new Drawable[]
+            {
                 restoreButton = new SettingsButton
                 {
                     Text = "Restore all hidden difficulties",

From 3fc6a74fdfa1bfd30c05b4748b7712c97530a923 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 2 Sep 2020 19:55:46 +0200
Subject: [PATCH 04543/10326] Expose an immutable bindable in interface.

---
 osu.Game/Screens/IOsuScreen.cs | 2 +-
 osu.Game/Screens/OsuScreen.cs  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index ead8e4bc22..e19037c2c4 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens
         /// <summary>
         /// Whether overlays should be able to be opened when this screen is current.
         /// </summary>
-        Bindable<OverlayActivation> OverlayActivationMode { get; }
+        IBindable<OverlayActivation> OverlayActivationMode { get; }
 
         /// <summary>
         /// The amount of parallax to be applied while this screen is displayed.
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index c10deaf1e5..cb8f2d21fe 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -48,7 +48,9 @@ namespace osu.Game.Screens
         /// </summary>
         protected virtual OverlayActivation InitialOverlayActivationMode => OverlayActivation.All;
 
-        public Bindable<OverlayActivation> OverlayActivationMode { get; }
+        protected readonly Bindable<OverlayActivation> OverlayActivationMode;
+
+        IBindable<OverlayActivation> IOsuScreen.OverlayActivationMode => OverlayActivationMode;
 
         public virtual bool CursorVisible => true;
 

From 754274a146522ce3a8e69bda0ff4541819b539a2 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 2 Sep 2020 20:55:26 +0200
Subject: [PATCH 04544/10326] Fix and add XMLDoc

---
 osu.Game/OsuGame.cs           | 3 +++
 osu.Game/Screens/OsuScreen.cs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e6d96df927..31926a6845 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -88,6 +88,9 @@ namespace osu.Game
 
         private IdleTracker idleTracker;
 
+        /// <summary>
+        /// Whether overlays should be able to be opened game-wide. Value is sourced from the current active screen.
+        /// </summary>
         public readonly IBindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>();
 
         protected OsuScreenStack ScreenStack;
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index cb8f2d21fe..a44d14fb5c 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens
         public virtual bool HideOverlaysOnEnter => false;
 
         /// <summary>
-        /// The initial initial overlay activation mode to use when this screen is entered for the first time.
+        /// The initial overlay activation mode to use when this screen is entered for the first time.
         /// </summary>
         protected virtual OverlayActivation InitialOverlayActivationMode => OverlayActivation.All;
 

From e7eaaf8b02efd43448b6dbbb11b4e98e7062aca7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 3 Sep 2020 04:42:05 +0300
Subject: [PATCH 04545/10326] Bring legacy slider border width closer to
 osu!stable

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

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
index 21df49d80b..28277ac443 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             private const float shadow_portion = 1 - (OsuLegacySkinTransformer.LEGACY_CIRCLE_RADIUS / OsuHitObject.OBJECT_RADIUS);
 
+            protected new float CalculatedBorderPortion => base.CalculatedBorderPortion * 0.77f;
+
             public new Color4 AccentColour => new Color4(base.AccentColour.R, base.AccentColour.G, base.AccentColour.B, base.AccentColour.A * 0.70f);
 
             protected override Color4 ColourAt(float position)

From 5180d71fd9fda153ac8c895b5fad8cc7c345d0f7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 3 Sep 2020 06:09:52 +0300
Subject: [PATCH 04546/10326] Attach an inline comment explaining how the value
 was reached

---
 osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
index 28277ac443..aad8b189d9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
@@ -18,7 +18,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             private const float shadow_portion = 1 - (OsuLegacySkinTransformer.LEGACY_CIRCLE_RADIUS / OsuHitObject.OBJECT_RADIUS);
 
-            protected new float CalculatedBorderPortion => base.CalculatedBorderPortion * 0.77f;
+            protected new float CalculatedBorderPortion
+                // Roughly matches osu!stable's slider border portions.
+                => base.CalculatedBorderPortion * 0.77f;
 
             public new Color4 AccentColour => new Color4(base.AccentColour.R, base.AccentColour.G, base.AccentColour.B, base.AccentColour.A * 0.70f);
 

From 547c8090e5a5ae5d3c232debdfe5cbb95ce2f8ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 13:13:48 +0900
Subject: [PATCH 04547/10326] Improve game exit music fade

---
 osu.Game/Screens/Menu/IntroScreen.cs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 473e6b0364..bed8dbcdcb 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -46,8 +46,6 @@ namespace osu.Game.Screens.Menu
 
         protected ITrack Track { get; private set; }
 
-        private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);
-
         private const int exit_delay = 3000;
 
         private SampleChannel seeya;
@@ -127,17 +125,29 @@ namespace osu.Game.Screens.Menu
             this.FadeIn(300);
 
             double fadeOutTime = exit_delay;
+
             // we also handle the exit transition.
             if (MenuVoice.Value)
+            {
                 seeya.Play();
+
+                // if playing the outro voice, we have more time to have fun with the background track.
+                // initially fade to almost silent then ramp out over the remaining time.
+                const double initial_fade = 200;
+                musicController.CurrentTrack
+                               .VolumeTo(0.03f, initial_fade).Then()
+                               .VolumeTo(0, fadeOutTime - initial_fade, Easing.In);
+            }
             else
+            {
                 fadeOutTime = 500;
 
-            audio.AddAdjustment(AdjustableProperty.Volume, exitingVolumeFade);
-            this.TransformBindableTo(exitingVolumeFade, 0, fadeOutTime).OnComplete(_ => this.Exit());
+                // if outro voice is turned off, just do a simple fade out.
+                musicController.CurrentTrack.VolumeTo(0, fadeOutTime, Easing.Out);
+            }
 
             //don't want to fade out completely else we will stop running updates.
-            Game.FadeTo(0.01f, fadeOutTime);
+            Game.FadeTo(0.01f, fadeOutTime).OnComplete(_ => this.Exit());
 
             base.OnResuming(last);
         }

From 2f42c57f4b7cbe4a9ae4f2ab0ed5fb5d2e65a53d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 13:15:16 +0900
Subject: [PATCH 04548/10326] Add safeties to ensure the current track doesn't
 loop or change

---
 osu.Game/Screens/Menu/IntroScreen.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index bed8dbcdcb..1df5c503d6 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -126,6 +126,12 @@ namespace osu.Game.Screens.Menu
 
             double fadeOutTime = exit_delay;
 
+            var track = musicController.CurrentTrack;
+
+            // ensure the track doesn't change or loop as we are exiting.
+            track.Looping = false;
+            Beatmap.Disabled = true;
+
             // we also handle the exit transition.
             if (MenuVoice.Value)
             {
@@ -134,16 +140,16 @@ namespace osu.Game.Screens.Menu
                 // if playing the outro voice, we have more time to have fun with the background track.
                 // initially fade to almost silent then ramp out over the remaining time.
                 const double initial_fade = 200;
-                musicController.CurrentTrack
-                               .VolumeTo(0.03f, initial_fade).Then()
-                               .VolumeTo(0, fadeOutTime - initial_fade, Easing.In);
+                track
+                    .VolumeTo(0.03f, initial_fade).Then()
+                    .VolumeTo(0, fadeOutTime - initial_fade, Easing.In);
             }
             else
             {
                 fadeOutTime = 500;
 
                 // if outro voice is turned off, just do a simple fade out.
-                musicController.CurrentTrack.VolumeTo(0, fadeOutTime, Easing.Out);
+                track.VolumeTo(0, fadeOutTime, Easing.Out);
             }
 
             //don't want to fade out completely else we will stop running updates.

From e0328445709f5218befafe0eb091ab7d0e1e738a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Aug 2020 19:38:05 +0900
Subject: [PATCH 04549/10326] Start with a fresh beatmap when entering editor
 from main menu

---
 osu.Game/Beatmaps/BeatmapManager.cs           | 25 +++++++++++++++++++
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs |  3 +++
 .../Menus/ScreenSelectionTabControl.cs        |  2 --
 osu.Game/Screens/Edit/Editor.cs               |  9 +++++++
 osu.Game/Screens/Menu/MainMenu.cs             |  6 ++++-
 5 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 0cadcf5947..9289ed29d9 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -27,6 +27,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Users;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
 namespace osu.Game.Beatmaps
@@ -94,6 +95,30 @@ namespace osu.Game.Beatmaps
 
         protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path)?.ToLowerInvariant() == ".osz";
 
+        public WorkingBeatmap CreateNew(RulesetInfo ruleset)
+        {
+            var set = new BeatmapSetInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Artist = "unknown",
+                    Title = "unknown",
+                    Author = User.SYSTEM_USER,
+                },
+                Beatmaps = new List<BeatmapInfo>
+                {
+                    new BeatmapInfo
+                    {
+                        BaseDifficulty = new BeatmapDifficulty(),
+                        Ruleset = ruleset
+                    }
+                }
+            };
+
+            var working = Import(set).Result;
+            return GetWorkingBeatmap(working.Beatmaps.First());
+        }
+
         protected override async Task Populate(BeatmapSetInfo beatmapSet, ArchiveReader archive, CancellationToken cancellationToken = default)
         {
             if (archive != null)
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 92199789ec..63b1647f33 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -33,6 +33,9 @@ namespace osu.Game.Beatmaps
 
             protected override IBeatmap GetBeatmap()
             {
+                if (BeatmapInfo.Path == null)
+                    return BeatmapInfo.Ruleset.CreateInstance().CreateBeatmapConverter(new Beatmap()).Beatmap;
+
                 try
                 {
                     using (var stream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
diff --git a/osu.Game/Screens/Edit/Components/Menus/ScreenSelectionTabControl.cs b/osu.Game/Screens/Edit/Components/Menus/ScreenSelectionTabControl.cs
index 089da4f222..b8bc5cdf36 100644
--- a/osu.Game/Screens/Edit/Components/Menus/ScreenSelectionTabControl.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/ScreenSelectionTabControl.cs
@@ -32,8 +32,6 @@ namespace osu.Game.Screens.Edit.Components.Menus
                 Height = 1,
                 Colour = Color4.White.Opacity(0.2f),
             });
-
-            Current.Value = EditorScreenMode.Compose;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index e178459d5c..dfba5f457b 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -89,6 +89,14 @@ namespace osu.Game.Screens.Edit
             // todo: remove caching of this and consume via editorBeatmap?
             dependencies.Cache(beatDivisor);
 
+            bool isNewBeatmap = false;
+
+            if (Beatmap.Value is DummyWorkingBeatmap)
+            {
+                isNewBeatmap = true;
+                Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value);
+            }
+
             try
             {
                 playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
@@ -148,6 +156,7 @@ namespace osu.Game.Screens.Edit
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             RelativeSizeAxes = Axes.Both,
+                            Mode = { Value = isNewBeatmap ? EditorScreenMode.SongSetup : EditorScreenMode.Compose },
                             Items = new[]
                             {
                                 new MenuItem("File")
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index fac9e9eb49..e0ac19cbaf 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -98,7 +98,11 @@ namespace osu.Game.Screens.Menu
                     {
                         buttons = new ButtonSystem
                         {
-                            OnEdit = delegate { this.Push(new Editor()); },
+                            OnEdit = delegate
+                            {
+                                Beatmap.SetDefault();
+                                this.Push(new Editor());
+                            },
                             OnSolo = onSolo,
                             OnMulti = delegate { this.Push(new Multiplayer()); },
                             OnExit = confirmAndExit,

From faf9b0a52864b2d5f8beedb12ab02cefb6bdb15a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Sep 2020 15:48:13 +0900
Subject: [PATCH 04550/10326] Fix hard crash when trying to retrieve a
 beatmap's track when no file is present

---
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 63b1647f33..9e4c29a8d4 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -70,6 +70,9 @@ namespace osu.Game.Beatmaps
 
             protected override Track GetBeatmapTrack()
             {
+                if (Metadata?.AudioFile == null)
+                    return null;
+
                 try
                 {
                     return trackStore.Get(getPathForFile(Metadata.AudioFile));
@@ -83,6 +86,9 @@ namespace osu.Game.Beatmaps
 
             protected override Waveform GetWaveform()
             {
+                if (Metadata?.AudioFile == null)
+                    return null;
+
                 try
                 {
                     var trackData = store.GetStream(getPathForFile(Metadata.AudioFile));

From 218cc39a4c46ce467264d11600a15b1e169795de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Sep 2020 15:49:21 +0900
Subject: [PATCH 04551/10326] Avoid throwing exceptions when MutatePath is
 called with null path

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

diff --git a/osu.Game/IO/WrappedStorage.cs b/osu.Game/IO/WrappedStorage.cs
index 1dd3afbfae..766e36ef14 100644
--- a/osu.Game/IO/WrappedStorage.cs
+++ b/osu.Game/IO/WrappedStorage.cs
@@ -25,7 +25,7 @@ namespace osu.Game.IO
             this.subPath = subPath;
         }
 
-        protected virtual string MutatePath(string path) => !string.IsNullOrEmpty(subPath) ? Path.Combine(subPath, path) : path;
+        protected virtual string MutatePath(string path) => !string.IsNullOrEmpty(subPath) && !string.IsNullOrEmpty(path) ? Path.Combine(subPath, path) : path;
 
         protected virtual void ChangeTargetStorage(Storage newStorage)
         {

From e80ef341d2663ea07c272154b8ddb1e0bde13467 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Sep 2020 15:50:08 +0900
Subject: [PATCH 04552/10326] Allow UpdateFile to be called when a previous
 file doesn't exist

---
 osu.Game/Database/ArchiveModelManager.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 915d980d24..49d7edd56c 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -397,15 +397,24 @@ namespace osu.Game.Database
             }
         }
 
+        /// <summary>
+        /// Update an existing file, or create a new entry if not already part of the <paramref name="model"/>'s files.
+        /// </summary>
+        /// <param name="model">The item to operate on.</param>
+        /// <param name="file">The file model to be updated or added.</param>
+        /// <param name="contents">The new file contents.</param>
         public void UpdateFile(TModel model, TFileModel file, Stream contents)
         {
             using (var usage = ContextFactory.GetForWrite())
             {
                 // Dereference the existing file info, since the file model will be removed.
-                Files.Dereference(file.FileInfo);
+                if (file.FileInfo != null)
+                {
+                    Files.Dereference(file.FileInfo);
 
-                // Remove the file model.
-                usage.Context.Set<TFileModel>().Remove(file);
+                    // Remove the file model.
+                    usage.Context.Set<TFileModel>().Remove(file);
+                }
 
                 // Add the new file info and containing file model.
                 model.Files.Remove(file);

From e337e6b3b0d804c40aac0667471c52a205584a20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Sep 2020 18:55:49 +0900
Subject: [PATCH 04553/10326] Use a more correct filename when saving

---
 osu.Game/Beatmaps/BeatmapManager.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 9289ed29d9..fee7a71df4 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -237,10 +237,20 @@ namespace osu.Game.Beatmaps
                 using (ContextFactory.GetForWrite())
                 {
                     var beatmapInfo = setInfo.Beatmaps.Single(b => b.ID == info.ID);
+                    var metadata = beatmapInfo.Metadata ?? setInfo.Metadata;
+
+                    // metadata may have changed; update the path with the standard format.
+                    beatmapInfo.Path = $"{metadata.Artist} - {metadata.Title} ({metadata.Author}) [{beatmapInfo.Version}]";
+
                     beatmapInfo.MD5Hash = stream.ComputeMD5Hash();
 
+                    var fileInfo = setInfo.Files.SingleOrDefault(f => string.Equals(f.Filename, beatmapInfo.Path, StringComparison.OrdinalIgnoreCase)) ?? new BeatmapSetFileInfo
+                    {
+                        Filename = beatmapInfo.Path
+                    };
+
                     stream.Seek(0, SeekOrigin.Begin);
-                    UpdateFile(setInfo, setInfo.Files.Single(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase)), stream);
+                    UpdateFile(setInfo, fileInfo, stream);
                 }
             }
 

From d849f7f2b5b83b76b1e2a1803aadcbb10f6e3d1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Sep 2020 18:56:49 +0900
Subject: [PATCH 04554/10326] Use the local user's username when saving a new
 beatmap

---
 osu.Game/Beatmaps/BeatmapManager.cs | 18 +++++++++++-------
 osu.Game/Screens/Edit/Editor.cs     | 14 +++++++++++++-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index fee7a71df4..325e6c6e98 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -97,20 +97,24 @@ namespace osu.Game.Beatmaps
 
         public WorkingBeatmap CreateNew(RulesetInfo ruleset)
         {
+            var metadata = new BeatmapMetadata
+            {
+                Artist = "artist",
+                Title = "title",
+                Author = User.SYSTEM_USER,
+            };
+
             var set = new BeatmapSetInfo
             {
-                Metadata = new BeatmapMetadata
-                {
-                    Artist = "unknown",
-                    Title = "unknown",
-                    Author = User.SYSTEM_USER,
-                },
+                Metadata = metadata,
                 Beatmaps = new List<BeatmapInfo>
                 {
                     new BeatmapInfo
                     {
                         BaseDifficulty = new BeatmapDifficulty(),
-                        Ruleset = ruleset
+                        Ruleset = ruleset,
+                        Metadata = metadata,
+                        Version = "difficulty"
                     }
                 }
             };
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index dfba5f457b..b8c1932186 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -28,6 +28,7 @@ using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
+using osu.Game.Online.API;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Setup;
@@ -72,6 +73,9 @@ namespace osu.Game.Screens.Edit
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, GameHost host)
         {
@@ -95,6 +99,7 @@ namespace osu.Game.Screens.Edit
             {
                 isNewBeatmap = true;
                 Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value);
+                Beatmap.Value.BeatmapSetInfo.Metadata.Author = api.LocalUser.Value;
             }
 
             try
@@ -408,7 +413,14 @@ namespace osu.Game.Screens.Edit
                 clock.SeekForward(!clock.IsRunning, amount);
         }
 
-        private void saveBeatmap() => beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap);
+        private void saveBeatmap()
+        {
+            // apply any set-level metadata changes.
+            beatmapManager.Update(playableBeatmap.BeatmapInfo.BeatmapSet);
+
+            // save the loaded beatmap's data stream.
+            beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap);
+        }
 
         private void exportBeatmap()
         {

From 0530c4b8a740d63f6c4c06faab5dac23cf517c63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 14:58:22 +0900
Subject: [PATCH 04555/10326] 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 d4a6d6759e..2d3bfaf7ce 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.831.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.903.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 2a592108b7..166910b165 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.831.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.903.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index e7addc1c2c..51f8141bac 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.Framework.iOS" Version="2020.831.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.903.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.831.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.903.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From dceae21bbf4083f912b61b5fcb9d4b3b9422ffb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 15:46:56 +0900
Subject: [PATCH 04556/10326] Centralise fetching of overlay component titles
 and textures

---
 .../BeatmapListing/BeatmapListingHeader.cs    |  3 ++-
 osu.Game/Overlays/BeatmapSetOverlay.cs        |  4 +++-
 .../Overlays/Changelog/ChangelogHeader.cs     |  1 +
 osu.Game/Overlays/ChangelogOverlay.cs         |  9 ++++----
 osu.Game/Overlays/ChatOverlay.cs              |  6 ++++-
 .../Dashboard/DashboardOverlayHeader.cs       |  3 ++-
 osu.Game/Overlays/DashboardOverlay.cs         |  2 +-
 osu.Game/Overlays/FullscreenOverlay.cs        |  8 ++++++-
 osu.Game/Overlays/INamedOverlayComponent.cs   | 14 ++++++++++++
 osu.Game/Overlays/News/NewsHeader.cs          |  1 +
 osu.Game/Overlays/NewsOverlay.cs              |  5 +++--
 osu.Game/Overlays/NotificationOverlay.cs      |  6 ++++-
 osu.Game/Overlays/NowPlayingOverlay.cs        |  6 ++++-
 osu.Game/Overlays/OverlayHeader.cs            |  4 +++-
 osu.Game/Overlays/OverlayTitle.cs             | 22 +++++++++++++------
 .../Rankings/RankingsOverlayHeader.cs         |  1 +
 osu.Game/Overlays/RankingsOverlay.cs          |  2 +-
 .../SearchableList/SearchableListOverlay.cs   |  2 +-
 osu.Game/Overlays/SettingsOverlay.cs          |  6 ++++-
 .../Toolbar/ToolbarBeatmapListingButton.cs    |  5 -----
 osu.Game/Overlays/Toolbar/ToolbarButton.cs    | 11 ----------
 .../Toolbar/ToolbarChangelogButton.cs         |  8 -------
 .../Overlays/Toolbar/ToolbarChatButton.cs     |  5 -----
 .../Overlays/Toolbar/ToolbarHomeButton.cs     |  3 +--
 .../Overlays/Toolbar/ToolbarMusicButton.cs    |  5 -----
 .../Overlays/Toolbar/ToolbarNewsButton.cs     |  8 -------
 .../Toolbar/ToolbarNotificationButton.cs      |  5 -----
 .../Toolbar/ToolbarOverlayToggleButton.cs     | 16 ++++++++++++++
 .../Overlays/Toolbar/ToolbarRankingsButton.cs |  8 -------
 .../Overlays/Toolbar/ToolbarSettingsButton.cs |  5 -----
 .../Overlays/Toolbar/ToolbarSocialButton.cs   |  5 -----
 osu.Game/Overlays/UserProfileOverlay.cs       |  4 ++--
 32 files changed, 98 insertions(+), 95 deletions(-)
 create mode 100644 osu.Game/Overlays/INamedOverlayComponent.cs

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
index 1bab200fec..1cf86b78cf 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
@@ -12,7 +12,8 @@ namespace osu.Game.Overlays.BeatmapListing
             public BeatmapListingTitle()
             {
                 Title = "beatmap listing";
-                IconTexture = "Icons/changelog";
+                Description = "Browse for new beatmaps";
+                IconTexture = "Icons/Hexacons/music";
             }
         }
     }
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 3e23442023..2dfd1fa20f 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -24,7 +24,9 @@ namespace osu.Game.Overlays
         public const float X_PADDING = 40;
         public const float Y_PADDING = 25;
         public const float RIGHT_WIDTH = 275;
-        protected readonly Header Header;
+
+        //todo: should be an OverlayHeader? or maybe not?
+        protected new readonly Header Header;
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 050bdea03a..35a4fc7014 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -115,6 +115,7 @@ namespace osu.Game.Overlays.Changelog
             public ChangelogHeaderTitle()
             {
                 Title = "changelog";
+                Description = "Track recent dev updates in the osu! ecosystem";
                 IconTexture = "Icons/changelog";
             }
         }
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 726be9e194..e9520906ea 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -25,10 +25,10 @@ namespace osu.Game.Overlays
     {
         public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
 
-        protected ChangelogHeader Header;
-
         private Container<ChangelogContent> content;
 
+        protected new ChangelogHeader Header;
+
         private SampleChannel sampleBack;
 
         private List<APIChangelogBuild> builds;
@@ -61,9 +61,10 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header = new ChangelogHeader
+                            base.Header = Header = new ChangelogHeader
                             {
                                 ListingSelected = ShowListing,
+                                Build = { BindTarget = Current }
                             },
                             content = new Container<ChangelogContent>
                             {
@@ -77,8 +78,6 @@ namespace osu.Game.Overlays
 
             sampleBack = audio.Samples.Get(@"UI/generic-select-soft");
 
-            Header.Build.BindTo(Current);
-
             Current.BindValueChanged(e =>
             {
                 if (e.NewValue != null)
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 692175603c..8e34f5d2c0 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -26,8 +26,12 @@ using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Overlays
 {
-    public class ChatOverlay : OsuFocusedOverlayContainer
+    public class ChatOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
+        public string IconTexture => "Icons/chat";
+        public string Title => "Chat";
+        public string Description => "Join the real-time discussion";
+
         private const float textbox_height = 60;
         private const float channel_selection_min_height = 0.3f;
 
diff --git a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
index 9ee679a866..1330a44374 100644
--- a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
+++ b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
@@ -12,7 +12,8 @@ namespace osu.Game.Overlays.Dashboard
             public DashboardTitle()
             {
                 Title = "dashboard";
-                IconTexture = "Icons/changelog";
+                Description = "View your friends and other top level information";
+                IconTexture = "Icons/hexacons/dashboard";
             }
         }
     }
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index e3a4b0e152..68eb35c7da 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            header = new DashboardOverlayHeader
+                            Header = header = new DashboardOverlayHeader
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 3464ce6086..6d0441ff46 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -12,8 +12,14 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public abstract class FullscreenOverlay : WaveOverlayContainer, IOnlineComponent
+    public abstract class FullscreenOverlay : WaveOverlayContainer, IOnlineComponent, INamedOverlayComponent
     {
+        public virtual string IconTexture => Header?.Title.IconTexture ?? string.Empty;
+        public virtual string Title => Header?.Title.Title ?? string.Empty;
+        public virtual string Description => Header?.Title.Description ?? string.Empty;
+
+        public OverlayHeader Header { get; protected set; }
+
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
diff --git a/osu.Game/Overlays/INamedOverlayComponent.cs b/osu.Game/Overlays/INamedOverlayComponent.cs
new file mode 100644
index 0000000000..38fb8679a0
--- /dev/null
+++ b/osu.Game/Overlays/INamedOverlayComponent.cs
@@ -0,0 +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.
+
+namespace osu.Game.Overlays
+{
+    public interface INamedOverlayComponent
+    {
+        string IconTexture { get; }
+
+        string Title { get; }
+
+        string Description { get; }
+    }
+}
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index ddada2bdaf..f85d765d46 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -57,6 +57,7 @@ namespace osu.Game.Overlays.News
             public NewsHeaderTitle()
             {
                 Title = "news";
+                Description = "Get up-to-date on community happenings";
                 IconTexture = "Icons/news";
             }
         }
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 09fb445b1f..bc3e080158 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Overlays
 
         private Container content;
         private LoadingLayer loading;
-        private NewsHeader header;
         private OverlayScrollContainer scrollFlow;
 
         public NewsOverlay()
@@ -48,7 +47,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            header = new NewsHeader
+                            Header = new NewsHeader
                             {
                                 ShowFrontPage = ShowFrontPage
                             },
@@ -110,6 +109,8 @@ namespace osu.Game.Overlays
             cancellationToken?.Cancel();
             loading.Show();
 
+            var header = (NewsHeader)Header;
+
             if (e.NewValue == null)
             {
                 header.SetFrontPage();
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 41160d10ec..6bdacb9c5e 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -16,8 +16,12 @@ using osu.Framework.Threading;
 
 namespace osu.Game.Overlays
 {
-    public class NotificationOverlay : OsuFocusedOverlayContainer
+    public class NotificationOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
+        public string IconTexture => "Icons/Hexacons/";
+        public string Title => "Notifications";
+        public string Description => "Waiting for 'ya";
+
         private const float width = 320;
 
         public const float TRANSITION_LENGTH = 600;
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index af692486b7..f19f7bbc61 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -25,8 +25,12 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class NowPlayingOverlay : OsuFocusedOverlayContainer
+    public class NowPlayingOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
+        public string IconTexture => "Icons/Hexacons/music";
+        public string Title => "Now playing";
+        public string Description => "Manage the currently playing track";
+
         private const float player_height = 130;
         private const float transition_length = 800;
         private const float progress_height = 10;
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index cc7f798c4a..fed1e57686 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Overlays
 {
     public abstract class OverlayHeader : Container
     {
+        public OverlayTitle Title { get; }
+
         private float contentSidePadding;
 
         /// <summary>
@@ -73,7 +75,7 @@ namespace osu.Game.Overlays
                                         AutoSizeAxes = Axes.Y,
                                         Children = new[]
                                         {
-                                            CreateTitle().With(title =>
+                                            Title = CreateTitle().With(title =>
                                             {
                                                 title.Anchor = Anchor.CentreLeft;
                                                 title.Origin = Anchor.CentreLeft;
diff --git a/osu.Game/Overlays/OverlayTitle.cs b/osu.Game/Overlays/OverlayTitle.cs
index 1c9567428c..17eeece1f8 100644
--- a/osu.Game/Overlays/OverlayTitle.cs
+++ b/osu.Game/Overlays/OverlayTitle.cs
@@ -12,19 +12,27 @@ using osuTK;
 
 namespace osu.Game.Overlays
 {
-    public abstract class OverlayTitle : CompositeDrawable
+    public abstract class OverlayTitle : CompositeDrawable, INamedOverlayComponent
     {
-        private readonly OsuSpriteText title;
+        private readonly OsuSpriteText titleText;
         private readonly Container icon;
 
-        protected string Title
+        private string title;
+
+        public string Title
         {
-            set => title.Text = value;
+            get => title;
+            protected set => titleText.Text = title = value;
         }
 
-        protected string IconTexture
+        public string Description { get; protected set; }
+
+        private string iconTexture;
+
+        public string IconTexture
         {
-            set => icon.Child = new OverlayTitleIcon(value);
+            get => iconTexture;
+            protected set => icon.Child = new OverlayTitleIcon(iconTexture = value);
         }
 
         protected OverlayTitle()
@@ -45,7 +53,7 @@ namespace osu.Game.Overlays
                         Margin = new MarginPadding { Horizontal = 5 }, // compensates for osu-web sprites having around 5px of whitespace on each side
                         Size = new Vector2(30)
                     },
-                    title = new OsuSpriteText
+                    titleText = new OsuSpriteText
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index e30c6f07a8..b12294c6c1 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Overlays.Rankings
             public RankingsTitle()
             {
                 Title = "ranking";
+                Description = "Find out who's the best right now";
                 IconTexture = "Icons/rankings";
             }
         }
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 7b200d4226..6e8a7d8554 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            header = new RankingsOverlayHeader
+                            Header = header = new RankingsOverlayHeader
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
index 4ab2de06b6..da2066e677 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.SearchableList
     {
         private readonly Container scrollContainer;
 
-        protected readonly SearchableListHeader<THeader> Header;
+        protected new readonly SearchableListHeader<THeader> Header;
         protected readonly SearchableListFilterControl<TTab, TCategory> Filter;
         protected readonly FillFlowContainer ScrollFlow;
 
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index bb84de5d3a..9a7937dfce 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -13,8 +13,12 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Overlays
 {
-    public class SettingsOverlay : SettingsPanel
+    public class SettingsOverlay : SettingsPanel, INamedOverlayComponent
     {
+        public string IconTexture => "Icons/Hexacons/settings";
+        public string Title => "Settings";
+        public string Description => "Change your settings";
+
         protected override IEnumerable<SettingsSection> CreateSections() => new SettingsSection[]
         {
             new GeneralSection(),
diff --git a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index cde305fffd..0363873326 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.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.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
@@ -11,10 +10,6 @@ namespace osu.Game.Overlays.Toolbar
     {
         public ToolbarBeatmapListingButton()
         {
-            SetIcon(OsuIcon.ChevronDownCircle);
-            TooltipMain = "Beatmap listing";
-            TooltipSub = "Browse for new beatmaps";
-
             Hotkey = GlobalAction.ToggleDirect;
         }
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 0afc6642b2..5d402c9a23 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -35,17 +35,6 @@ namespace osu.Game.Overlays.Toolbar
             IconContainer.Show();
         }
 
-        public void SetIcon(IconUsage icon) => SetIcon(new SpriteIcon
-        {
-            Size = new Vector2(20),
-            Icon = icon
-        });
-
-        public IconUsage Icon
-        {
-            set => SetIcon(value);
-        }
-
         public string Text
         {
             get => DrawableText.Text;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
index c88b418853..23f8b141b2 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
@@ -2,19 +2,11 @@
 // 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 ToolbarChangelogButton : ToolbarOverlayToggleButton
     {
-        public ToolbarChangelogButton()
-        {
-            SetIcon(FontAwesome.Solid.Bullhorn);
-            TooltipMain = "Changelog";
-            TooltipSub = "Track recent dev updates in the osu! ecosystem";
-        }
-
         [BackgroundDependencyLoader(true)]
         private void load(ChangelogOverlay changelog)
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
index dee4be0c1f..f9a66ae7bb 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChatButton.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.Sprites;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
@@ -11,10 +10,6 @@ namespace osu.Game.Overlays.Toolbar
     {
         public ToolbarChatButton()
         {
-            SetIcon(FontAwesome.Solid.Comments);
-            TooltipMain = "Chat";
-            TooltipSub = "Join the real-time discussion";
-
             Hotkey = GlobalAction.ToggleChat;
         }
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
index 4845c9a99f..08ba65fc47 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.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.Graphics.Sprites;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
@@ -10,7 +9,7 @@ namespace osu.Game.Overlays.Toolbar
     {
         public ToolbarHomeButton()
         {
-            Icon = FontAwesome.Solid.Home;
+            // todo: icon
             TooltipMain = "Home";
             TooltipSub = "Return to the main menu";
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
index f9aa2de497..0f5e8e5456 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
@@ -14,10 +13,6 @@ namespace osu.Game.Overlays.Toolbar
 
         public ToolbarMusicButton()
         {
-            Icon = FontAwesome.Solid.Music;
-            TooltipMain = "Now playing";
-            TooltipSub = "Manage the currently playing track";
-
             Hotkey = GlobalAction.ToggleNowPlaying;
         }
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
index 106c67a041..0ba2935c80 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
@@ -2,19 +2,11 @@
 // 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 ToolbarNewsButton : ToolbarOverlayToggleButton
     {
-        public ToolbarNewsButton()
-        {
-            Icon = FontAwesome.Solid.Newspaper;
-            TooltipMain = "News";
-            TooltipSub = "Get up-to-date on community happenings";
-        }
-
         [BackgroundDependencyLoader(true)]
         private void load(NewsOverlay news)
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
index a699fd907f..79d0fc74c1 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.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.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
@@ -25,10 +24,6 @@ namespace osu.Game.Overlays.Toolbar
 
         public ToolbarNotificationButton()
         {
-            Icon = FontAwesome.Solid.Bars;
-            TooltipMain = "Notifications";
-            TooltipSub = "Waiting for 'ya";
-
             Hotkey = GlobalAction.ToggleNotifications;
 
             Add(countDisplay = new CountCircle
diff --git a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
index 36387bb00d..a76ca26a47 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
@@ -1,11 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using 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.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
@@ -18,6 +21,9 @@ namespace osu.Game.Overlays.Toolbar
 
         private readonly Bindable<Visibility> overlayState = new Bindable<Visibility>();
 
+        [Resolved]
+        private TextureStore textures { get; set; }
+
         public OverlayContainer StateContainer
         {
             get => stateContainer;
@@ -32,6 +38,16 @@ namespace osu.Game.Overlays.Toolbar
                     Action = stateContainer.ToggleVisibility;
                     overlayState.BindTo(stateContainer.State);
                 }
+
+                if (stateContainer is INamedOverlayComponent named)
+                {
+                    TooltipMain = named.Title;
+                    TooltipSub = named.Description;
+                    SetIcon(new Sprite
+                    {
+                        Texture = textures.Get(named.IconTexture),
+                    });
+                }
             }
         }
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
index c026ce99fe..22a01bcdb5 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
@@ -2,19 +2,11 @@
 // 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);
-            TooltipMain = "Ranking";
-            TooltipSub = "Find out who's the best right now";
-        }
-
         [BackgroundDependencyLoader(true)]
         private void load(RankingsOverlay rankings)
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
index ed2a23ec2a..4051a2a194 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.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.Sprites;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
@@ -11,10 +10,6 @@ namespace osu.Game.Overlays.Toolbar
     {
         public ToolbarSettingsButton()
         {
-            Icon = FontAwesome.Solid.Cog;
-            TooltipMain = "Settings";
-            TooltipSub = "Change your settings";
-
             Hotkey = GlobalAction.ToggleSettings;
         }
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
index 6faa58c559..e62c7bc807 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.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.Sprites;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
@@ -11,10 +10,6 @@ namespace osu.Game.Overlays.Toolbar
     {
         public ToolbarSocialButton()
         {
-            Icon = FontAwesome.Solid.Users;
-            TooltipMain = "Friends";
-            TooltipSub = "Interact with those close to you";
-
             Hotkey = GlobalAction.ToggleSocial;
         }
 
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index b4c8a2d3ca..625758614e 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays
         private ProfileSection lastSection;
         private ProfileSection[] sections;
         private GetUserRequest userReq;
-        protected ProfileHeader Header;
+        protected new ProfileHeader Header;
         private ProfileSectionsContainer sectionsContainer;
         private ProfileSectionTabControl tabs;
 
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays
 
             Add(sectionsContainer = new ProfileSectionsContainer
             {
-                ExpandableHeader = Header = new ProfileHeader(),
+                ExpandableHeader = base.Header = Header = new ProfileHeader(),
                 FixedHeader = tabs,
                 HeaderBackground = new Box
                 {

From dbf44fbaf265b2bf7142e57370e5764d7f7269ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 16:26:09 +0900
Subject: [PATCH 04557/10326] Update names and icons to match new designs

---
 osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs      | 2 +-
 osu.Game/Overlays/Changelog/ChangelogHeader.cs        | 2 +-
 osu.Game/Overlays/ChatOverlay.cs                      | 4 ++--
 osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs | 4 ++--
 osu.Game/Overlays/News/NewsHeader.cs                  | 2 +-
 osu.Game/Overlays/NowPlayingOverlay.cs                | 2 +-
 osu.Game/Overlays/Profile/ProfileHeader.cs            | 2 +-
 osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs   | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
index 4626589d81..329045c743 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.BeatmapSet
             public BeatmapHeaderTitle()
             {
                 Title = "beatmap info";
-                IconTexture = "Icons/changelog";
+                IconTexture = "Icons/Hexacons/music";
             }
         }
     }
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 35a4fc7014..bdc59297bb 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Overlays.Changelog
             {
                 Title = "changelog";
                 Description = "Track recent dev updates in the osu! ecosystem";
-                IconTexture = "Icons/changelog";
+                IconTexture = "Icons/Hexacons/devtools";
             }
         }
     }
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 8e34f5d2c0..bcc2227be8 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -28,8 +28,8 @@ namespace osu.Game.Overlays
 {
     public class ChatOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
-        public string IconTexture => "Icons/chat";
-        public string Title => "Chat";
+        public string IconTexture => "Icons/Hexacons/messaging";
+        public string Title => "chat";
         public string Description => "Join the real-time discussion";
 
         private const float textbox_height = 60;
diff --git a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
index 1330a44374..a964d84c4f 100644
--- a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
+++ b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
@@ -12,8 +12,8 @@ namespace osu.Game.Overlays.Dashboard
             public DashboardTitle()
             {
                 Title = "dashboard";
-                Description = "View your friends and other top level information";
-                IconTexture = "Icons/hexacons/dashboard";
+                Description = "View your friends and other information";
+                IconTexture = "Icons/Hexacons/social";
             }
         }
     }
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index f85d765d46..38ac519387 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.News
             {
                 Title = "news";
                 Description = "Get up-to-date on community happenings";
-                IconTexture = "Icons/news";
+                IconTexture = "Icons/Hexacons/news";
             }
         }
     }
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index f19f7bbc61..d1df1fa936 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays
     public class NowPlayingOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
         public string IconTexture => "Icons/Hexacons/music";
-        public string Title => "Now playing";
+        public string Title => "now playing";
         public string Description => "Manage the currently playing track";
 
         private const float player_height = 130;
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 55474c9d3e..c947ef0781 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Overlays.Profile
             public ProfileHeaderTitle()
             {
                 Title = "player info";
-                IconTexture = "Icons/profile";
+                IconTexture = "Icons/Hexacons/profile";
             }
         }
 
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index b12294c6c1..7039ab8214 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Rankings
             {
                 Title = "ranking";
                 Description = "Find out who's the best right now";
-                IconTexture = "Icons/rankings";
+                IconTexture = "Icons/Hexacons/rankings";
             }
         }
     }

From 7bcbac6f45000482ed566b7be6b221eef639d05b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 16:27:31 +0900
Subject: [PATCH 04558/10326] Move header setting to FullscreenOverlay

---
 .../Online/TestSceneFullscreenOverlay.cs      |  6 ++---
 osu.Game/Overlays/BeatmapListingOverlay.cs    |  6 ++---
 osu.Game/Overlays/BeatmapSetOverlay.cs        |  4 ++--
 osu.Game/Overlays/ChangelogOverlay.cs         | 14 +++++------
 osu.Game/Overlays/DashboardOverlay.cs         | 23 +++++++++----------
 osu.Game/Overlays/FullscreenOverlay.cs        |  9 +++++---
 osu.Game/Overlays/NewsOverlay.cs              | 16 ++++++-------
 osu.Game/Overlays/OverlayScrollContainer.cs   |  2 +-
 osu.Game/Overlays/OverlayView.cs              |  2 +-
 osu.Game/Overlays/RankingsOverlay.cs          | 23 +++++++++----------
 osu.Game/Overlays/UserProfileOverlay.cs       |  7 +++---
 11 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
index e60adcee34..8f20bcdcc1 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneFullscreenOverlay : OsuTestScene
     {
-        private FullscreenOverlay overlay;
+        private FullscreenOverlay<OverlayHeader> overlay;
 
         protected override void LoadComplete()
         {
@@ -38,10 +38,10 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("fire count 3", () => fireCount == 3);
         }
 
-        private class TestFullscreenOverlay : FullscreenOverlay
+        private class TestFullscreenOverlay : FullscreenOverlay<OverlayHeader>
         {
             public TestFullscreenOverlay()
-                : base(OverlayColourScheme.Pink)
+                : base(OverlayColourScheme.Pink, null)
             {
                 Children = new Drawable[]
                 {
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 225a8a0578..144af91145 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -24,7 +24,7 @@ using osuTK;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapListingOverlay : FullscreenOverlay
+    public class BeatmapListingOverlay : FullscreenOverlay<BeatmapListingHeader>
     {
         [Resolved]
         private PreviewTrackManager previewTrackManager { get; set; }
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays
         private OverlayScrollContainer resultScrollContainer;
 
         public BeatmapListingOverlay()
-            : base(OverlayColourScheme.Blue)
+            : base(OverlayColourScheme.Blue, new BeatmapListingHeader())
         {
         }
 
@@ -65,7 +65,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            new BeatmapListingHeader(),
+                            Header,
                             filterControl = new BeatmapListingFilterControl
                             {
                                 SearchStarted = onSearchStarted,
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 2dfd1fa20f..bbec62a85a 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapSetOverlay : FullscreenOverlay
+    public class BeatmapSetOverlay : FullscreenOverlay<OverlayHeader> // we don't provide a standard header for now.
     {
         public const float X_PADDING = 40;
         public const float Y_PADDING = 25;
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays
         private readonly Box background;
 
         public BeatmapSetOverlay()
-            : base(OverlayColourScheme.Blue)
+            : base(OverlayColourScheme.Blue, null)
         {
             OverlayScrollContainer scroll;
             Info info;
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index e9520906ea..c7e9a86fa4 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -21,14 +21,12 @@ using osu.Game.Overlays.Changelog;
 
 namespace osu.Game.Overlays
 {
-    public class ChangelogOverlay : FullscreenOverlay
+    public class ChangelogOverlay : FullscreenOverlay<ChangelogHeader>
     {
         public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
 
         private Container<ChangelogContent> content;
 
-        protected new ChangelogHeader Header;
-
         private SampleChannel sampleBack;
 
         private List<APIChangelogBuild> builds;
@@ -36,7 +34,7 @@ namespace osu.Game.Overlays
         protected List<APIUpdateStream> Streams;
 
         public ChangelogOverlay()
-            : base(OverlayColourScheme.Purple)
+            : base(OverlayColourScheme.Purple, new ChangelogHeader())
         {
         }
 
@@ -61,11 +59,11 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            base.Header = Header = new ChangelogHeader
+                            Header.With(h =>
                             {
-                                ListingSelected = ShowListing,
-                                Build = { BindTarget = Current }
-                            },
+                                h.ListingSelected = ShowListing;
+                                h.Build.BindTarget = Current;
+                            }),
                             content = new Container<ChangelogContent>
                             {
                                 RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 68eb35c7da..8135b83a03 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -15,17 +15,21 @@ using osu.Game.Overlays.Dashboard.Friends;
 
 namespace osu.Game.Overlays
 {
-    public class DashboardOverlay : FullscreenOverlay
+    public class DashboardOverlay : FullscreenOverlay<DashboardOverlayHeader>
     {
         private CancellationTokenSource cancellationToken;
 
         private Container content;
-        private DashboardOverlayHeader header;
         private LoadingLayer loading;
         private OverlayScrollContainer scrollFlow;
 
         public DashboardOverlay()
-            : base(OverlayColourScheme.Purple)
+            : base(OverlayColourScheme.Purple, new DashboardOverlayHeader
+            {
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                Depth = -float.MaxValue
+            })
         {
         }
 
@@ -50,12 +54,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header = header = new DashboardOverlayHeader
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Depth = -float.MaxValue
-                            },
+                            Header,
                             content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,
@@ -72,7 +71,7 @@ namespace osu.Game.Overlays
         {
             base.LoadComplete();
 
-            header.Current.BindValueChanged(onTabChanged);
+            Header.Current.BindValueChanged(onTabChanged);
         }
 
         private bool displayUpdateRequired = true;
@@ -84,7 +83,7 @@ namespace osu.Game.Overlays
             // We don't want to create a new display on every call, only when exiting from fully closed state.
             if (displayUpdateRequired)
             {
-                header.Current.TriggerChange();
+                Header.Current.TriggerChange();
                 displayUpdateRequired = false;
             }
         }
@@ -136,7 +135,7 @@ namespace osu.Game.Overlays
             if (State.Value == Visibility.Hidden)
                 return;
 
-            header.Current.TriggerChange();
+            Header.Current.TriggerChange();
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 6d0441ff46..bd6b07c65f 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -12,13 +12,14 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public abstract class FullscreenOverlay : WaveOverlayContainer, IOnlineComponent, INamedOverlayComponent
+    public abstract class FullscreenOverlay<T> : WaveOverlayContainer, IOnlineComponent, INamedOverlayComponent
+        where T : OverlayHeader
     {
         public virtual string IconTexture => Header?.Title.IconTexture ?? string.Empty;
         public virtual string Title => Header?.Title.Title ?? string.Empty;
         public virtual string Description => Header?.Title.Description ?? string.Empty;
 
-        public OverlayHeader Header { get; protected set; }
+        public T Header { get; }
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
@@ -26,8 +27,10 @@ namespace osu.Game.Overlays
         [Cached]
         protected readonly OverlayColourProvider ColourProvider;
 
-        protected FullscreenOverlay(OverlayColourScheme colourScheme)
+        protected FullscreenOverlay(OverlayColourScheme colourScheme, T header)
         {
+            Header = header;
+
             ColourProvider = new OverlayColourProvider(colourScheme);
 
             RelativeSizeAxes = Axes.Both;
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index bc3e080158..c8c1db012f 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -13,7 +13,7 @@ using osu.Game.Overlays.News.Displays;
 
 namespace osu.Game.Overlays
 {
-    public class NewsOverlay : FullscreenOverlay
+    public class NewsOverlay : FullscreenOverlay<NewsHeader>
     {
         private readonly Bindable<string> article = new Bindable<string>(null);
 
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays
         private OverlayScrollContainer scrollFlow;
 
         public NewsOverlay()
-            : base(OverlayColourScheme.Purple)
+            : base(OverlayColourScheme.Purple, new NewsHeader())
         {
         }
 
@@ -47,10 +47,10 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header = new NewsHeader
+                            Header.With(h =>
                             {
-                                ShowFrontPage = ShowFrontPage
-                            },
+                                h.ShowFrontPage = ShowFrontPage;
+                            }),
                             content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,
@@ -109,16 +109,14 @@ namespace osu.Game.Overlays
             cancellationToken?.Cancel();
             loading.Show();
 
-            var header = (NewsHeader)Header;
-
             if (e.NewValue == null)
             {
-                header.SetFrontPage();
+                Header.SetFrontPage();
                 LoadDisplay(new FrontPageDisplay());
                 return;
             }
 
-            header.SetArticle(e.NewValue);
+            Header.SetArticle(e.NewValue);
             LoadDisplay(Empty());
         }
 
diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index e7415e6f74..b67d5db1a4 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 namespace osu.Game.Overlays
 {
     /// <summary>
-    /// <see cref="OsuScrollContainer"/> which provides <see cref="ScrollToTopButton"/>. Mostly used in <see cref="FullscreenOverlay"/>.
+    /// <see cref="OsuScrollContainer"/> which provides <see cref="ScrollToTopButton"/>. Mostly used in <see cref="FullscreenOverlay{T}"/>.
     /// </summary>
     public class OverlayScrollContainer : OsuScrollContainer
     {
diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
index 3e2c54c726..312271316a 100644
--- a/osu.Game/Overlays/OverlayView.cs
+++ b/osu.Game/Overlays/OverlayView.cs
@@ -9,7 +9,7 @@ using osu.Game.Online.API;
 namespace osu.Game.Overlays
 {
     /// <summary>
-    /// A subview containing online content, to be displayed inside a <see cref="FullscreenOverlay"/>.
+    /// A subview containing online content, to be displayed inside a <see cref="FullscreenOverlay{T}"/>.
     /// </summary>
     /// <remarks>
     /// Automatically performs a data fetch on load.
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 6e8a7d8554..ae6d49960a 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -17,17 +17,16 @@ using osu.Game.Overlays.Rankings.Tables;
 
 namespace osu.Game.Overlays
 {
-    public class RankingsOverlay : FullscreenOverlay
+    public class RankingsOverlay : FullscreenOverlay<RankingsOverlayHeader>
     {
-        protected Bindable<Country> Country => header.Country;
+        protected Bindable<Country> Country => Header.Country;
 
-        protected Bindable<RankingsScope> Scope => header.Current;
+        protected Bindable<RankingsScope> Scope => Header.Current;
 
         private readonly OverlayScrollContainer scrollFlow;
         private readonly Container contentContainer;
         private readonly LoadingLayer loading;
         private readonly Box background;
-        private readonly RankingsOverlayHeader header;
 
         private APIRequest lastRequest;
         private CancellationTokenSource cancellationToken;
@@ -36,7 +35,12 @@ namespace osu.Game.Overlays
         private IAPIProvider api { get; set; }
 
         public RankingsOverlay()
-            : base(OverlayColourScheme.Green)
+            : base(OverlayColourScheme.Green, new RankingsOverlayHeader
+            {
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                Depth = -float.MaxValue
+            })
         {
             Children = new Drawable[]
             {
@@ -55,12 +59,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header = header = new RankingsOverlayHeader
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Depth = -float.MaxValue
-                            },
+                            Header,
                             new Container
                             {
                                 RelativeSizeAxes = Axes.X,
@@ -97,7 +96,7 @@ namespace osu.Game.Overlays
         {
             base.LoadComplete();
 
-            header.Ruleset.BindTo(ruleset);
+            Header.Ruleset.BindTo(ruleset);
 
             Country.BindValueChanged(_ =>
             {
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 625758614e..965ad790ed 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -17,19 +17,18 @@ using osuTK;
 
 namespace osu.Game.Overlays
 {
-    public class UserProfileOverlay : FullscreenOverlay
+    public class UserProfileOverlay : FullscreenOverlay<ProfileHeader>
     {
         private ProfileSection lastSection;
         private ProfileSection[] sections;
         private GetUserRequest userReq;
-        protected new ProfileHeader Header;
         private ProfileSectionsContainer sectionsContainer;
         private ProfileSectionTabControl tabs;
 
         public const float CONTENT_X_MARGIN = 70;
 
         public UserProfileOverlay()
-            : base(OverlayColourScheme.Pink)
+            : base(OverlayColourScheme.Pink, new ProfileHeader())
         {
         }
 
@@ -77,7 +76,7 @@ namespace osu.Game.Overlays
 
             Add(sectionsContainer = new ProfileSectionsContainer
             {
-                ExpandableHeader = base.Header = Header = new ProfileHeader(),
+                ExpandableHeader = Header,
                 FixedHeader = tabs,
                 HeaderBackground = new Box
                 {

From 942276d88f10e83fb8eb1ddb4894583f94876a0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 16:28:14 +0900
Subject: [PATCH 04559/10326] Remove outdated SearchableList classes

---
 .../Chat/Selection/ChannelSelectionOverlay.cs |   2 +-
 .../SearchableListFilterControl.cs            |   2 +-
 .../SearchableList/SearchableListHeader.cs    |  82 -----------
 .../SearchableList/SearchableListOverlay.cs   | 128 ------------------
 osu.Game/Overlays/WaveOverlayContainer.cs     |   2 +
 osu.Game/Screens/Multi/Header.cs              |   4 +-
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |   5 +-
 .../Match/Components/MatchSettingsOverlay.cs  |   4 +-
 8 files changed, 10 insertions(+), 219 deletions(-)
 delete mode 100644 osu.Game/Overlays/SearchableList/SearchableListHeader.cs
 delete mode 100644 osu.Game/Overlays/SearchableList/SearchableListOverlay.cs

diff --git a/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs b/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
index b46ca6b040..be9ecc6746 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Chat.Selection
 {
     public class ChannelSelectionOverlay : WaveOverlayContainer
     {
-        public const float WIDTH_PADDING = 170;
+        public new const float WIDTH_PADDING = 170;
 
         private const float transition_duration = 500;
 
diff --git a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
index e0163b5b0c..1990674aa9 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.SearchableList
         /// <summary>
         /// The amount of padding added to content (does not affect background or tab control strip).
         /// </summary>
-        protected virtual float ContentHorizontalPadding => SearchableListOverlay.WIDTH_PADDING;
+        protected virtual float ContentHorizontalPadding => WaveOverlayContainer.WIDTH_PADDING;
 
         protected SearchableListFilterControl()
         {
diff --git a/osu.Game/Overlays/SearchableList/SearchableListHeader.cs b/osu.Game/Overlays/SearchableList/SearchableListHeader.cs
deleted file mode 100644
index 66fedf0a56..0000000000
--- a/osu.Game/Overlays/SearchableList/SearchableListHeader.cs
+++ /dev/null
@@ -1,82 +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 osuTK;
-using osuTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-
-namespace osu.Game.Overlays.SearchableList
-{
-    public abstract class SearchableListHeader<T> : Container
-        where T : struct, Enum
-    {
-        public readonly HeaderTabControl<T> Tabs;
-
-        protected abstract Color4 BackgroundColour { get; }
-        protected abstract T DefaultTab { get; }
-        protected abstract Drawable CreateHeaderText();
-        protected abstract IconUsage Icon { get; }
-
-        protected SearchableListHeader()
-        {
-            RelativeSizeAxes = Axes.X;
-            Height = 90;
-
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = BackgroundColour,
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = SearchableListOverlay.WIDTH_PADDING, Right = SearchableListOverlay.WIDTH_PADDING },
-                    Children = new Drawable[]
-                    {
-                        new FillFlowContainer
-                        {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.BottomLeft,
-                            Position = new Vector2(-35f, 5f),
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(10f, 0f),
-                            Children = new[]
-                            {
-                                new SpriteIcon
-                                {
-                                    Size = new Vector2(25),
-                                    Icon = Icon,
-                                },
-                                CreateHeaderText(),
-                            },
-                        },
-                        Tabs = new HeaderTabControl<T>
-                        {
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            RelativeSizeAxes = Axes.X,
-                        },
-                    },
-                },
-            };
-
-            Tabs.Current.Value = DefaultTab;
-            Tabs.Current.TriggerChange();
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            Tabs.StripColour = colours.Green;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
deleted file mode 100644
index da2066e677..0000000000
--- a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
+++ /dev/null
@@ -1,128 +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 osuTK.Graphics;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics.Backgrounds;
-using osu.Game.Graphics.Cursor;
-
-namespace osu.Game.Overlays.SearchableList
-{
-    public abstract class SearchableListOverlay : FullscreenOverlay
-    {
-        public const float WIDTH_PADDING = 80;
-
-        protected SearchableListOverlay(OverlayColourScheme colourScheme)
-            : base(colourScheme)
-        {
-        }
-    }
-
-    public abstract class SearchableListOverlay<THeader, TTab, TCategory> : SearchableListOverlay
-        where THeader : struct, Enum
-        where TTab : struct, Enum
-        where TCategory : struct, Enum
-    {
-        private readonly Container scrollContainer;
-
-        protected new readonly SearchableListHeader<THeader> Header;
-        protected readonly SearchableListFilterControl<TTab, TCategory> Filter;
-        protected readonly FillFlowContainer ScrollFlow;
-
-        protected abstract Color4 BackgroundColour { get; }
-        protected abstract Color4 TrianglesColourLight { get; }
-        protected abstract Color4 TrianglesColourDark { get; }
-        protected abstract SearchableListHeader<THeader> CreateHeader();
-        protected abstract SearchableListFilterControl<TTab, TCategory> CreateFilterControl();
-
-        protected SearchableListOverlay(OverlayColourScheme colourScheme)
-            : base(colourScheme)
-        {
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = BackgroundColour,
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Children = new[]
-                    {
-                        new Triangles
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            TriangleScale = 5,
-                            ColourLight = TrianglesColourLight,
-                            ColourDark = TrianglesColourDark,
-                        },
-                    },
-                },
-                scrollContainer = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = new OsuContextMenuContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        Child = new OverlayScrollContainer
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            ScrollbarVisible = false,
-                            Child = ScrollFlow = new FillFlowContainer
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Padding = new MarginPadding { Horizontal = 10, Bottom = 50 },
-                                Direction = FillDirection.Vertical,
-                            },
-                        },
-                    },
-                },
-                new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
-                    Children = new Drawable[]
-                    {
-                        Header = CreateHeader(),
-                        Filter = CreateFilterControl(),
-                    },
-                },
-            };
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            scrollContainer.Padding = new MarginPadding { Top = Header.Height + Filter.Height };
-        }
-
-        protected override void OnFocus(FocusEvent e)
-        {
-            Filter.Search.TakeFocus();
-        }
-
-        protected override void PopIn()
-        {
-            base.PopIn();
-
-            Filter.Search.HoldFocus = true;
-        }
-
-        protected override void PopOut()
-        {
-            base.PopOut();
-
-            Filter.Search.HoldFocus = false;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index 5c87096dd4..d0fa9987d5 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Overlays
         protected override bool BlockNonPositionalInput => true;
         protected override Container<Drawable> Content => Waves;
 
+        public const float WIDTH_PADDING = 80;
+
         protected override bool StartHidden => true;
 
         protected WaveOverlayContainer()
diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index 653cb3791a..cd8695286b 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -11,8 +11,8 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays.SearchableList;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Multi
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = SearchableListOverlay.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
+                    Padding = new MarginPadding { Left = WaveOverlayContainer.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
                     Children = new Drawable[]
                     {
                         title = new MultiHeaderTitle
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index f9c5fd13a4..a1e99c83b2 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -12,7 +12,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
-using osu.Game.Overlays.SearchableList;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
 
@@ -102,8 +101,8 @@ namespace osu.Game.Screens.Multi.Lounge
             content.Padding = new MarginPadding
             {
                 Top = Filter.DrawHeight,
-                Left = SearchableListOverlay.WIDTH_PADDING - DrawableRoom.SELECTION_BORDER_WIDTH + HORIZONTAL_OVERFLOW_PADDING,
-                Right = SearchableListOverlay.WIDTH_PADDING + HORIZONTAL_OVERFLOW_PADDING,
+                Left = WaveOverlayContainer.WIDTH_PADDING - DrawableRoom.SELECTION_BORDER_WIDTH + HORIZONTAL_OVERFLOW_PADDING,
+                Right = WaveOverlayContainer.WIDTH_PADDING + HORIZONTAL_OVERFLOW_PADDING,
             };
         }
 
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 49a0fc434b..caefc194b1 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Overlays.SearchableList;
+using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 
@@ -117,7 +117,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                                             {
                                                 new Container
                                                 {
-                                                    Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING },
+                                                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
                                                     RelativeSizeAxes = Axes.X,
                                                     AutoSizeAxes = Axes.Y,
                                                     Children = new Drawable[]

From 98c5a04a09b715de91ed305c4313e6d2055db963 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 16:28:53 +0900
Subject: [PATCH 04560/10326] Update home button

---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs           |  9 +++++++++
 osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs       | 12 +++++++++---
 .../Overlays/Toolbar/ToolbarOverlayToggleButton.cs   | 11 +----------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 5d402c9a23..d0787664a0 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -35,6 +35,15 @@ namespace osu.Game.Overlays.Toolbar
             IconContainer.Show();
         }
 
+        [Resolved]
+        private TextureStore textures { get; set; }
+
+        public void SetIcon(string texture) =>
+            SetIcon(new Sprite
+            {
+                Texture = textures.Get(texture),
+            });
+
         public string Text
         {
             get => DrawableText.Text;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
index 08ba65fc47..6b2c24c0f3 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.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.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
@@ -9,11 +10,16 @@ namespace osu.Game.Overlays.Toolbar
     {
         public ToolbarHomeButton()
         {
-            // todo: icon
+            Width *= 1.4f;
+            Hotkey = GlobalAction.Home;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             TooltipMain = "Home";
             TooltipSub = "Return to the main menu";
-
-            Hotkey = GlobalAction.Home;
+            SetIcon("Icons/Hexacons/home");
         }
     }
 }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
index a76ca26a47..0dea71cc08 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
@@ -1,14 +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 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.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
@@ -21,9 +18,6 @@ namespace osu.Game.Overlays.Toolbar
 
         private readonly Bindable<Visibility> overlayState = new Bindable<Visibility>();
 
-        [Resolved]
-        private TextureStore textures { get; set; }
-
         public OverlayContainer StateContainer
         {
             get => stateContainer;
@@ -43,10 +37,7 @@ namespace osu.Game.Overlays.Toolbar
                 {
                     TooltipMain = named.Title;
                     TooltipSub = named.Description;
-                    SetIcon(new Sprite
-                    {
-                        Texture = textures.Get(named.IconTexture),
-                    });
+                    SetIcon(named.IconTexture);
                 }
             }
         }

From 2fac0a180e0640362b8ce0294e261b3ac2134d5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 16:29:15 +0900
Subject: [PATCH 04561/10326] Adjust toolbar button sizing

---
 osu.Game/OsuGame.cs                                  | 4 ++--
 osu.Game/Overlays/Settings/Sidebar.cs                | 7 +++----
 osu.Game/Overlays/Toolbar/ToolbarButton.cs           | 7 +++----
 osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs  | 2 +-
 osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs | 6 ------
 osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs   | 1 +
 6 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6b8e70e546..164a40c6a5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -698,9 +698,9 @@ namespace osu.Game
                 float offset = 0;
 
                 if (Settings.State.Value == Visibility.Visible)
-                    offset += ToolbarButton.WIDTH / 2;
+                    offset += Toolbar.HEIGHT / 2;
                 if (notifications.State.Value == Visibility.Visible)
-                    offset -= ToolbarButton.WIDTH / 2;
+                    offset -= Toolbar.HEIGHT / 2;
 
                 screenContainer.MoveToX(offset, SettingsPanel.TRANSITION_LENGTH, Easing.OutQuint);
             }
diff --git a/osu.Game/Overlays/Settings/Sidebar.cs b/osu.Game/Overlays/Settings/Sidebar.cs
index 358f94b659..3783d15e5a 100644
--- a/osu.Game/Overlays/Settings/Sidebar.cs
+++ b/osu.Game/Overlays/Settings/Sidebar.cs
@@ -4,22 +4,21 @@
 using System;
 using System.Linq;
 using osu.Framework;
-using osuTK;
-using osuTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Containers;
-using osu.Game.Overlays.Toolbar;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Settings
 {
     public class Sidebar : Container<SidebarButton>, IStateful<ExpandedState>
     {
         private readonly FillFlowContainer<SidebarButton> content;
-        public const float DEFAULT_WIDTH = ToolbarButton.WIDTH;
+        public const float DEFAULT_WIDTH = Toolbar.Toolbar.HEIGHT;
         public const int EXPANDED_WIDTH = 200;
 
         public event Action<ExpandedState> StateChanged;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index d0787664a0..49b9c62d85 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -9,6 +9,7 @@ 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.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
@@ -25,8 +26,6 @@ namespace osu.Game.Overlays.Toolbar
 {
     public abstract class ToolbarButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
     {
-        public const float WIDTH = Toolbar.HEIGHT * 1.4f;
-
         protected GlobalAction? Hotkey { get; set; }
 
         public void SetIcon(Drawable icon)
@@ -80,7 +79,7 @@ namespace osu.Game.Overlays.Toolbar
         protected ToolbarButton()
             : base(HoverSampleSet.Loud)
         {
-            Width = WIDTH;
+            Width = Toolbar.HEIGHT;
             RelativeSizeAxes = Axes.Y;
 
             Children = new Drawable[]
@@ -114,7 +113,7 @@ namespace osu.Game.Overlays.Toolbar
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Size = new Vector2(20),
+                            Size = new Vector2(26),
                             Alpha = 0,
                         },
                         DrawableText = new OsuSpriteText
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
index 422bf00c6d..905d5b44c6 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Toolbar
                 },
                 ModeButtonLine = new Container
                 {
-                    Size = new Vector2(ToolbarButton.WIDTH, 3),
+                    Size = new Vector2(Toolbar.HEIGHT, 3),
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.TopLeft,
                     Masking = true,
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index a5194ea752..754b679599 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -65,12 +65,6 @@ namespace osu.Game.Overlays.Toolbar
                 Parent.Click();
                 return base.OnClick(e);
             }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                IconContainer.Scale *= 1.4f;
-            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
index 4051a2a194..c53f4a55d9 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
@@ -10,6 +10,7 @@ namespace osu.Game.Overlays.Toolbar
     {
         public ToolbarSettingsButton()
         {
+            Width *= 1.4f;
             Hotkey = GlobalAction.ToggleSettings;
         }
 

From 0d1674ca5e28fce53ab48fe478e44faa376b7caa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 16:32:43 +0900
Subject: [PATCH 04562/10326] Combine settings strings to read from same
 location

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

diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 9a7937dfce..0532a031f3 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -16,8 +16,8 @@ namespace osu.Game.Overlays
     public class SettingsOverlay : SettingsPanel, INamedOverlayComponent
     {
         public string IconTexture => "Icons/Hexacons/settings";
-        public string Title => "Settings";
-        public string Description => "Change your settings";
+        public string Title => "settings";
+        public string Description => "Change the way osu! behaves";
 
         protected override IEnumerable<SettingsSection> CreateSections() => new SettingsSection[]
         {
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays
 
         private readonly List<SettingsSubPanel> subPanels = new List<SettingsSubPanel>();
 
-        protected override Drawable CreateHeader() => new SettingsHeader("settings", "Change the way osu! behaves");
+        protected override Drawable CreateHeader() => new SettingsHeader(Title, Description);
         protected override Drawable CreateFooter() => new SettingsFooter();
 
         public SettingsOverlay()

From f5a73130e1aa32ca1001669f4118a15decfce8c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 16:34:47 +0900
Subject: [PATCH 04563/10326] Fix regression in sidebar button sizing

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

diff --git a/osu.Game/Overlays/Settings/Sidebar.cs b/osu.Game/Overlays/Settings/Sidebar.cs
index 3783d15e5a..031ecaae46 100644
--- a/osu.Game/Overlays/Settings/Sidebar.cs
+++ b/osu.Game/Overlays/Settings/Sidebar.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Settings
     public class Sidebar : Container<SidebarButton>, IStateful<ExpandedState>
     {
         private readonly FillFlowContainer<SidebarButton> content;
-        public const float DEFAULT_WIDTH = Toolbar.Toolbar.HEIGHT;
+        public const float DEFAULT_WIDTH = Toolbar.Toolbar.HEIGHT * 1.4f;
         public const int EXPANDED_WIDTH = 200;
 
         public event Action<ExpandedState> StateChanged;

From 99e34d85621b283476376d72d8cb70c3f9a50eb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 17:05:45 +0900
Subject: [PATCH 04564/10326] Update with missing icons

---
 osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs | 2 +-
 osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs         | 2 +-
 osu.Game/Overlays/NotificationOverlay.cs                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
index 1cf86b78cf..b7f511271c 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.BeatmapListing
             {
                 Title = "beatmap listing";
                 Description = "Browse for new beatmaps";
-                IconTexture = "Icons/Hexacons/music";
+                IconTexture = "Icons/Hexacons/beatmap";
             }
         }
     }
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
index 329045c743..6511b15fc8 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.BeatmapSet
             public BeatmapHeaderTitle()
             {
                 Title = "beatmap info";
-                IconTexture = "Icons/Hexacons/music";
+                IconTexture = "Icons/Hexacons/beatmap";
             }
         }
     }
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 6bdacb9c5e..b7d916c48f 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays
 {
     public class NotificationOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
-        public string IconTexture => "Icons/Hexacons/";
+        public string IconTexture => "Icons/Hexacons/notification";
         public string Title => "Notifications";
         public string Description => "Waiting for 'ya";
 

From d55c9c3cc2e6f951ff5bf8776c9cff638f3f5726 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 17:11:34 +0900
Subject: [PATCH 04565/10326] Fix UserProfile weirdness

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 5 ++++-
 osu.Game/Overlays/UserProfileOverlay.cs           | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index d739f56828..f32f8e0c67 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -26,8 +26,11 @@ namespace osu.Game.Graphics.Containers
             {
                 if (value == expandableHeader) return;
 
-                expandableHeader?.Expire();
+                if (expandableHeader != null)
+                    RemoveInternal(expandableHeader);
+
                 expandableHeader = value;
+
                 if (value == null) return;
 
                 AddInternal(expandableHeader);
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 965ad790ed..2b316c0e34 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -44,6 +44,9 @@ namespace osu.Game.Overlays
             if (user.Id == Header?.User.Value?.Id)
                 return;
 
+            if (sectionsContainer != null)
+                sectionsContainer.ExpandableHeader = null;
+
             userReq?.Cancel();
             Clear();
             lastSection = null;

From 72cb65c22f55c89677a4bf3a466e082788831a99 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 17:51:54 +0900
Subject: [PATCH 04566/10326] Update and add missing beatmap statistic icons to
 info wedge

---
 .../Beatmaps/CatchBeatmap.cs                  |  7 +++---
 .../Beatmaps/ManiaBeatmap.cs                  |  5 ++--
 osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs  |  7 +++---
 .../Beatmaps/TaikoBeatmap.cs                  |  7 +++---
 osu.Game/Beatmaps/BeatmapStatistic.cs         | 18 ++++++++++++-
 osu.Game/Beatmaps/BeatmapStatisticSprite.cs   | 25 +++++++++++++++++++
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 16 +++++++++---
 7 files changed, 65 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Beatmaps/BeatmapStatisticSprite.cs

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs
index 18cc300ff9..5dc19ce15b 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 
@@ -23,19 +22,19 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 {
                     Name = @"Fruit Count",
                     Content = fruits.ToString(),
-                    Icon = FontAwesome.Regular.Circle
+                    CreateIcon = () => new BeatmapStatisticSprite("circles"),
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Juice Stream Count",
                     Content = juiceStreams.ToString(),
-                    Icon = FontAwesome.Regular.Circle
+                    CreateIcon = () => new BeatmapStatisticSprite("sliders"),
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Banana Shower Count",
                     Content = bananaShowers.ToString(),
-                    Icon = FontAwesome.Regular.Circle
+                    CreateIcon = () => new BeatmapStatisticSprite("spinners"),
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
index dc24a344e9..f6b460f269 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
@@ -41,14 +40,14 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 new BeatmapStatistic
                 {
                     Name = @"Note Count",
+                    CreateIcon = () => new BeatmapStatisticSprite("circles"),
                     Content = notes.ToString(),
-                    Icon = FontAwesome.Regular.Circle
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Hold Note Count",
+                    CreateIcon = () => new BeatmapStatisticSprite("sliders"),
                     Content = holdnotes.ToString(),
-                    Icon = FontAwesome.Regular.Circle
                 },
             };
         }
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs
index 491d82b89e..513a9254ec 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 
@@ -23,19 +22,19 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                 {
                     Name = @"Circle Count",
                     Content = circles.ToString(),
-                    Icon = FontAwesome.Regular.Circle
+                    CreateIcon = () => new BeatmapStatisticSprite("circles"),
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Slider Count",
                     Content = sliders.ToString(),
-                    Icon = FontAwesome.Regular.Circle
+                    CreateIcon = () => new BeatmapStatisticSprite("sliders"),
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Spinner Count",
                     Content = spinners.ToString(),
-                    Icon = FontAwesome.Regular.Circle
+                    CreateIcon = () => new BeatmapStatisticSprite("spinners"),
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs
index b595f43fbb..c0f8af4fff 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Taiko.Objects;
 
@@ -22,20 +21,20 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 new BeatmapStatistic
                 {
                     Name = @"Hit Count",
+                    CreateIcon = () => new BeatmapStatisticSprite("circles"),
                     Content = hits.ToString(),
-                    Icon = FontAwesome.Regular.Circle
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Drumroll Count",
+                    CreateIcon = () => new BeatmapStatisticSprite("sliders"),
                     Content = drumrolls.ToString(),
-                    Icon = FontAwesome.Regular.Circle
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Swell Count",
+                    CreateIcon = () => new BeatmapStatisticSprite("spinners"),
                     Content = swells.ToString(),
-                    Icon = FontAwesome.Regular.Circle
                 }
             };
         }
diff --git a/osu.Game/Beatmaps/BeatmapStatistic.cs b/osu.Game/Beatmaps/BeatmapStatistic.cs
index 0745ec5222..5a466c24be 100644
--- a/osu.Game/Beatmaps/BeatmapStatistic.cs
+++ b/osu.Game/Beatmaps/BeatmapStatistic.cs
@@ -1,14 +1,30 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Beatmaps
 {
     public class BeatmapStatistic
     {
-        public IconUsage Icon;
+        [Obsolete("Use CreateIcon instead")] // can be removed 20210203
+        public IconUsage Icon = FontAwesome.Regular.QuestionCircle;
+
+        /// <summary>
+        /// A function to create the icon for display purposes.
+        /// </summary>
+        public Func<Drawable> CreateIcon;
+
         public string Content;
         public string Name;
+
+        public BeatmapStatistic()
+        {
+#pragma warning disable 618
+            CreateIcon = () => new SpriteIcon { Icon = Icon };
+#pragma warning restore 618
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapStatisticSprite.cs b/osu.Game/Beatmaps/BeatmapStatisticSprite.cs
new file mode 100644
index 0000000000..1cb0bacf0f
--- /dev/null
+++ b/osu.Game/Beatmaps/BeatmapStatisticSprite.cs
@@ -0,0 +1,25 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Beatmaps
+{
+    public class BeatmapStatisticSprite : Sprite
+    {
+        private readonly string iconName;
+
+        public BeatmapStatisticSprite(string iconName)
+        {
+            this.iconName = iconName;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            Texture = textures.Get($"Icons/BeatmapDetails/{iconName}");
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index ad977c70b5..4ef074b967 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -318,14 +318,14 @@ namespace osu.Game.Screens.Select
                     labels.Add(new InfoLabel(new BeatmapStatistic
                     {
                         Name = "Length",
-                        Icon = FontAwesome.Regular.Clock,
+                        CreateIcon = () => new BeatmapStatisticSprite("length"),
                         Content = TimeSpan.FromMilliseconds(b.BeatmapInfo.Length).ToString(@"m\:ss"),
                     }));
 
                     labels.Add(new InfoLabel(new BeatmapStatistic
                     {
                         Name = "BPM",
-                        Icon = FontAwesome.Regular.Circle,
+                        CreateIcon = () => new BeatmapStatisticSprite("bpm"),
                         Content = getBPMRange(b),
                     }));
 
@@ -418,10 +418,18 @@ namespace osu.Game.Screens.Select
                                     Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
                                     RelativeSizeAxes = Axes.Both,
-                                    Scale = new Vector2(0.8f),
                                     Colour = Color4Extensions.FromHex(@"f7dd55"),
-                                    Icon = statistic.Icon,
+                                    Icon = FontAwesome.Regular.Circle,
+                                    Scale = new Vector2(0.8f)
                                 },
+                                statistic.CreateIcon().With(i =>
+                                {
+                                    i.Anchor = Anchor.Centre;
+                                    i.Origin = Anchor.Centre;
+                                    i.RelativeSizeAxes = Axes.Both;
+                                    i.Size = new Vector2(1.2f);
+                                    i.Colour = Color4Extensions.FromHex(@"f7dd55");
+                                }),
                             }
                         },
                         new OsuSpriteText

From 58e84760b959362ee49fd98d36b8222f30298f70 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 19:17:07 +0900
Subject: [PATCH 04567/10326] Fix path empty string check causing regression in
 behaviour

---
 osu.Game/IO/WrappedStorage.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/IO/WrappedStorage.cs b/osu.Game/IO/WrappedStorage.cs
index 766e36ef14..5b2549d2ee 100644
--- a/osu.Game/IO/WrappedStorage.cs
+++ b/osu.Game/IO/WrappedStorage.cs
@@ -25,7 +25,13 @@ namespace osu.Game.IO
             this.subPath = subPath;
         }
 
-        protected virtual string MutatePath(string path) => !string.IsNullOrEmpty(subPath) && !string.IsNullOrEmpty(path) ? Path.Combine(subPath, path) : path;
+        protected virtual string MutatePath(string path)
+        {
+            if (path == null)
+                return null;
+
+            return !string.IsNullOrEmpty(subPath) ? Path.Combine(subPath, path) : path;
+        }
 
         protected virtual void ChangeTargetStorage(Storage newStorage)
         {

From a555407f3772353b2b4f8b9b3a93179ec2212585 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 19:20:42 +0900
Subject: [PATCH 04568/10326] Fix various test failures due to missing beatmap
 info in empty beatmap

---
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs | 2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 9e4c29a8d4..11b6ad8c29 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Beatmaps
             protected override IBeatmap GetBeatmap()
             {
                 if (BeatmapInfo.Path == null)
-                    return BeatmapInfo.Ruleset.CreateInstance().CreateBeatmapConverter(new Beatmap()).Beatmap;
+                    return BeatmapInfo?.Ruleset.CreateInstance().CreateBeatmapConverter(new Beatmap { BeatmapInfo = BeatmapInfo }).Beatmap;
 
                 try
                 {
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 6a161e6e04..aefeb48453 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Beatmaps
         {
             const double excess_length = 1000;
 
-            var lastObject = Beatmap.HitObjects.LastOrDefault();
+            var lastObject = Beatmap?.HitObjects.LastOrDefault();
 
             double length;
 

From 1c1c583d3b9bf0ed2b306f7fef8ebae0bd11f1b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 19:31:40 +0900
Subject: [PATCH 04569/10326] Fix regression in file update logic (filename set
 too early)

---
 osu.Game/Beatmaps/BeatmapManager.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 325e6c6e98..1456e7487b 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -243,15 +243,15 @@ namespace osu.Game.Beatmaps
                     var beatmapInfo = setInfo.Beatmaps.Single(b => b.ID == info.ID);
                     var metadata = beatmapInfo.Metadata ?? setInfo.Metadata;
 
+                    // grab the original file (or create a new one if not found).
+                    var fileInfo = setInfo.Files.SingleOrDefault(f => string.Equals(f.Filename, beatmapInfo.Path, StringComparison.OrdinalIgnoreCase)) ?? new BeatmapSetFileInfo();
+
                     // metadata may have changed; update the path with the standard format.
                     beatmapInfo.Path = $"{metadata.Artist} - {metadata.Title} ({metadata.Author}) [{beatmapInfo.Version}]";
-
                     beatmapInfo.MD5Hash = stream.ComputeMD5Hash();
 
-                    var fileInfo = setInfo.Files.SingleOrDefault(f => string.Equals(f.Filename, beatmapInfo.Path, StringComparison.OrdinalIgnoreCase)) ?? new BeatmapSetFileInfo
-                    {
-                        Filename = beatmapInfo.Path
-                    };
+                    // update existing or populate new file's filename.
+                    fileInfo.Filename = beatmapInfo.Path;
 
                     stream.Seek(0, SeekOrigin.Begin);
                     UpdateFile(setInfo, fileInfo, stream);

From c9a73926a68cd4104eb719f8b365be601c67373c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 19:38:01 +0900
Subject: [PATCH 04570/10326] Add basic test coverage

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 0151678db3..4547613b5a 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -15,6 +15,7 @@ using osu.Framework.Extensions;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.IO;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Resources;
 using SharpCompress.Archives;
@@ -756,6 +757,63 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
+        [Test]
+        public void TestCreateNewEmptyBeatmap()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestUpdateBeatmapFile)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+                    var manager = osu.Dependencies.Get<BeatmapManager>();
+
+                    var working = osu.Dependencies.Get<BeatmapManager>().CreateNew(new OsuRuleset().RulesetInfo);
+
+                    manager.Save(working.BeatmapInfo, working.Beatmap);
+
+                    var retrievedSet = manager.GetAllUsableBeatmapSets()[0];
+
+                    // Check that the new file is referenced correctly by attempting a retrieval
+                    Beatmap updatedBeatmap = (Beatmap)manager.GetWorkingBeatmap(retrievedSet.Beatmaps[0]).Beatmap;
+                    Assert.That(updatedBeatmap.HitObjects.Count, Is.EqualTo(0));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public void TestCreateNewBeatmapWithObject()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestUpdateBeatmapFile)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+                    var manager = osu.Dependencies.Get<BeatmapManager>();
+
+                    var working = osu.Dependencies.Get<BeatmapManager>().CreateNew(new OsuRuleset().RulesetInfo);
+
+                    ((Beatmap)working.Beatmap).HitObjects.Add(new HitCircle { StartTime = 5000 });
+
+                    manager.Save(working.BeatmapInfo, working.Beatmap);
+
+                    var retrievedSet = manager.GetAllUsableBeatmapSets()[0];
+
+                    // Check that the new file is referenced correctly by attempting a retrieval
+                    Beatmap updatedBeatmap = (Beatmap)manager.GetWorkingBeatmap(retrievedSet.Beatmaps[0]).Beatmap;
+                    Assert.That(updatedBeatmap.HitObjects.Count, Is.EqualTo(1));
+                    Assert.That(updatedBeatmap.HitObjects[0].StartTime, Is.EqualTo(5000));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         public static async Task<BeatmapSetInfo> LoadOszIntoOsu(OsuGameBase osu, string path = null, bool virtualTrack = false)
         {
             var temp = path ?? TestResources.GetTestBeatmapForImport(virtualTrack);

From d32b77f045a120ee21645baff1209f5c9215118c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 21:33:25 +0900
Subject: [PATCH 04571/10326] Add missing extension to filename

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Beatmaps/BeatmapManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 1456e7487b..12add76b46 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Beatmaps
                     var fileInfo = setInfo.Files.SingleOrDefault(f => string.Equals(f.Filename, beatmapInfo.Path, StringComparison.OrdinalIgnoreCase)) ?? new BeatmapSetFileInfo();
 
                     // metadata may have changed; update the path with the standard format.
-                    beatmapInfo.Path = $"{metadata.Artist} - {metadata.Title} ({metadata.Author}) [{beatmapInfo.Version}]";
+                    beatmapInfo.Path = $"{metadata.Artist} - {metadata.Title} ({metadata.Author}) [{beatmapInfo.Version}].osu";
                     beatmapInfo.MD5Hash = stream.ComputeMD5Hash();
 
                     // update existing or populate new file's filename.

From ebed7d09e3412206660666a3231b406e4550206d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Sep 2020 21:56:36 +0900
Subject: [PATCH 04572/10326] 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 2d3bfaf7ce..a41c1a5864 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.812.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.903.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.903.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 166910b165..d79806883e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.903.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.903.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 51f8141bac..16a8a1acb7 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.903.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.812.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.903.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 18927304f10bd912fc9a09cb22aaed3dd38974d0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 3 Sep 2020 16:29:25 +0300
Subject: [PATCH 04573/10326] Move adjustment to LegacySkinConfiguration as a
 default value

---
 osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs | 4 ----
 osu.Game/Skinning/LegacySkinConfiguration.cs       | 9 +++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
index aad8b189d9..21df49d80b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
@@ -18,10 +18,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             private const float shadow_portion = 1 - (OsuLegacySkinTransformer.LEGACY_CIRCLE_RADIUS / OsuHitObject.OBJECT_RADIUS);
 
-            protected new float CalculatedBorderPortion
-                // Roughly matches osu!stable's slider border portions.
-                => base.CalculatedBorderPortion * 0.77f;
-
             public new Color4 AccentColour => new Color4(base.AccentColour.R, base.AccentColour.G, base.AccentColour.B, base.AccentColour.A * 0.70f);
 
             protected override Color4 ColourAt(float position)
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
index 41b7aea34b..b980d727ed 100644
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacySkinConfiguration.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.Globalization;
+
 namespace osu.Game.Skinning
 {
     public class LegacySkinConfiguration : SkinConfiguration
@@ -12,6 +14,13 @@ namespace osu.Game.Skinning
         /// </summary>
         public decimal? LegacyVersion { get; internal set; }
 
+        public LegacySkinConfiguration()
+        {
+            // Roughly matches osu!stable's slider border portions.
+            // Can't use nameof(SliderBorderSize) as the lookup enum is declared in the osu! ruleset.
+            ConfigDictionary["SliderBorderSize"] = 0.77f.ToString(CultureInfo.InvariantCulture);
+        }
+
         public enum LegacySetting
         {
             Version,

From d6b46936a0f7100617815b67130252f413ef03d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 12:55:28 +0900
Subject: [PATCH 04574/10326] Adjust sizing to match updated textures with less
 padding

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 4ef074b967..b3bf306431 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -420,15 +420,15 @@ namespace osu.Game.Screens.Select
                                     RelativeSizeAxes = Axes.Both,
                                     Colour = Color4Extensions.FromHex(@"f7dd55"),
                                     Icon = FontAwesome.Regular.Circle,
-                                    Scale = new Vector2(0.8f)
+                                    Size = new Vector2(0.8f)
                                 },
                                 statistic.CreateIcon().With(i =>
                                 {
                                     i.Anchor = Anchor.Centre;
                                     i.Origin = Anchor.Centre;
                                     i.RelativeSizeAxes = Axes.Both;
-                                    i.Size = new Vector2(1.2f);
                                     i.Colour = Color4Extensions.FromHex(@"f7dd55");
+                                    i.Size = new Vector2(0.8f);
                                 }),
                             }
                         },

From 9d2dff2cb871403637511e2d7545dfad89d59c68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 12:55:39 +0900
Subject: [PATCH 04575/10326] Add scale to allow legacy icons to display
 correctly sized

---
 osu.Game/Beatmaps/BeatmapStatistic.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapStatistic.cs b/osu.Game/Beatmaps/BeatmapStatistic.cs
index 5a466c24be..15036d1cd6 100644
--- a/osu.Game/Beatmaps/BeatmapStatistic.cs
+++ b/osu.Game/Beatmaps/BeatmapStatistic.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osuTK;
 
 namespace osu.Game.Beatmaps
 {
@@ -23,7 +24,7 @@ namespace osu.Game.Beatmaps
         public BeatmapStatistic()
         {
 #pragma warning disable 618
-            CreateIcon = () => new SpriteIcon { Icon = Icon };
+            CreateIcon = () => new SpriteIcon { Icon = Icon, Scale = new Vector2(0.6f) };
 #pragma warning restore 618
         }
     }

From cd253ab055e97b67cdc7b59a2fcea6bdeb971a39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 13:05:39 +0900
Subject: [PATCH 04576/10326] Further tweaks to get closer to design originals

---
 osu.Game/Beatmaps/BeatmapStatistic.cs       | 2 +-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapStatistic.cs b/osu.Game/Beatmaps/BeatmapStatistic.cs
index 15036d1cd6..825bb08246 100644
--- a/osu.Game/Beatmaps/BeatmapStatistic.cs
+++ b/osu.Game/Beatmaps/BeatmapStatistic.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Beatmaps
         public BeatmapStatistic()
         {
 #pragma warning disable 618
-            CreateIcon = () => new SpriteIcon { Icon = Icon, Scale = new Vector2(0.6f) };
+            CreateIcon = () => new SpriteIcon { Icon = Icon, Scale = new Vector2(0.7f) };
 #pragma warning restore 618
         }
     }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index b3bf306431..400f3e3063 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -428,7 +428,7 @@ namespace osu.Game.Screens.Select
                                     i.Origin = Anchor.Centre;
                                     i.RelativeSizeAxes = Axes.Both;
                                     i.Colour = Color4Extensions.FromHex(@"f7dd55");
-                                    i.Size = new Vector2(0.8f);
+                                    i.Size = new Vector2(0.64f);
                                 }),
                             }
                         },

From f14a82e3a927950e23631ed1c5eeb430c94c8957 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 13:13:53 +0900
Subject: [PATCH 04577/10326] Remove unnecessary conversion

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

diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 11b6ad8c29..362c99ea3f 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Beatmaps
             protected override IBeatmap GetBeatmap()
             {
                 if (BeatmapInfo.Path == null)
-                    return BeatmapInfo?.Ruleset.CreateInstance().CreateBeatmapConverter(new Beatmap { BeatmapInfo = BeatmapInfo }).Beatmap;
+                    return new Beatmap { BeatmapInfo = BeatmapInfo };
 
                 try
                 {

From d3fbc7cc53ea92a28e76ed07f11a6edc855c584e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 13:16:35 +0900
Subject: [PATCH 04578/10326] Use more direct reference in tests

---
 osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 4547613b5a..6c60d7b467 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -767,7 +767,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     var osu = loadOsu(host);
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
-                    var working = osu.Dependencies.Get<BeatmapManager>().CreateNew(new OsuRuleset().RulesetInfo);
+                    var working = manager.CreateNew(new OsuRuleset().RulesetInfo);
 
                     manager.Save(working.BeatmapInfo, working.Beatmap);
 
@@ -794,7 +794,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     var osu = loadOsu(host);
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
-                    var working = osu.Dependencies.Get<BeatmapManager>().CreateNew(new OsuRuleset().RulesetInfo);
+                    var working = manager.CreateNew(new OsuRuleset().RulesetInfo);
 
                     ((Beatmap)working.Beatmap).HitObjects.Add(new HitCircle { StartTime = 5000 });
 

From fba253f131e7f5d279a0f011d404ef7685ab2c1c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 13:17:43 +0900
Subject: [PATCH 04579/10326] Take user argument in CreateNew method parameters

---
 osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 5 +++--
 osu.Game/Beatmaps/BeatmapManager.cs             | 4 ++--
 osu.Game/Screens/Edit/Editor.cs                 | 3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 6c60d7b467..cef8105490 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -18,6 +18,7 @@ using osu.Game.IO;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Resources;
+using osu.Game.Users;
 using SharpCompress.Archives;
 using SharpCompress.Archives.Zip;
 using SharpCompress.Common;
@@ -767,7 +768,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     var osu = loadOsu(host);
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
-                    var working = manager.CreateNew(new OsuRuleset().RulesetInfo);
+                    var working = manager.CreateNew(new OsuRuleset().RulesetInfo, User.SYSTEM_USER);
 
                     manager.Save(working.BeatmapInfo, working.Beatmap);
 
@@ -794,7 +795,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     var osu = loadOsu(host);
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
-                    var working = manager.CreateNew(new OsuRuleset().RulesetInfo);
+                    var working = manager.CreateNew(new OsuRuleset().RulesetInfo, User.SYSTEM_USER);
 
                     ((Beatmap)working.Beatmap).HitObjects.Add(new HitCircle { StartTime = 5000 });
 
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 12add76b46..844af31a16 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -95,13 +95,13 @@ namespace osu.Game.Beatmaps
 
         protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path)?.ToLowerInvariant() == ".osz";
 
-        public WorkingBeatmap CreateNew(RulesetInfo ruleset)
+        public WorkingBeatmap CreateNew(RulesetInfo ruleset, User user)
         {
             var metadata = new BeatmapMetadata
             {
                 Artist = "artist",
                 Title = "title",
-                Author = User.SYSTEM_USER,
+                Author = user,
             };
 
             var set = new BeatmapSetInfo
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b8c1932186..ef497e3246 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -98,8 +98,7 @@ namespace osu.Game.Screens.Edit
             if (Beatmap.Value is DummyWorkingBeatmap)
             {
                 isNewBeatmap = true;
-                Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value);
-                Beatmap.Value.BeatmapSetInfo.Metadata.Author = api.LocalUser.Value;
+                Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
             }
 
             try

From 7c99f66cf518fe4696ac33c5a4e2ad1a01a7825f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 14:13:42 +0900
Subject: [PATCH 04580/10326] 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 a41c1a5864..7dfda5babb 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.903.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.903.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d79806883e..cd7dcbb8db 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.903.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.903.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 16a8a1acb7..284b717a0f 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.903.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.903.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 25e142965d925ef6936b6424175b3736041dbcfd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 15:01:32 +0900
Subject: [PATCH 04581/10326] Strongly type and expose default beatmap
 information icon implementations for other rulesets

---
 .../Beatmaps/CatchBeatmap.cs                  |  6 +--
 .../Beatmaps/ManiaBeatmap.cs                  |  4 +-
 osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs  |  6 +--
 .../Beatmaps/TaikoBeatmap.cs                  |  6 +--
 osu.Game/Beatmaps/BeatmapStatistic.cs         |  2 +-
 osu.Game/Beatmaps/BeatmapStatisticIcon.cs     | 43 +++++++++++++++++++
 osu.Game/Beatmaps/BeatmapStatisticSprite.cs   | 25 -----------
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   |  4 +-
 8 files changed, 57 insertions(+), 39 deletions(-)
 create mode 100644 osu.Game/Beatmaps/BeatmapStatisticIcon.cs
 delete mode 100644 osu.Game/Beatmaps/BeatmapStatisticSprite.cs

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs
index 5dc19ce15b..f009c10a9c 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs
@@ -22,19 +22,19 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 {
                     Name = @"Fruit Count",
                     Content = fruits.ToString(),
-                    CreateIcon = () => new BeatmapStatisticSprite("circles"),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles),
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Juice Stream Count",
                     Content = juiceStreams.ToString(),
-                    CreateIcon = () => new BeatmapStatisticSprite("sliders"),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders),
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Banana Shower Count",
                     Content = bananaShowers.ToString(),
-                    CreateIcon = () => new BeatmapStatisticSprite("spinners"),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Spinners),
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
index f6b460f269..d1d5adea75 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
@@ -40,13 +40,13 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 new BeatmapStatistic
                 {
                     Name = @"Note Count",
-                    CreateIcon = () => new BeatmapStatisticSprite("circles"),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles),
                     Content = notes.ToString(),
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Hold Note Count",
-                    CreateIcon = () => new BeatmapStatisticSprite("sliders"),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders),
                     Content = holdnotes.ToString(),
                 },
             };
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs
index 513a9254ec..2d3cc3c103 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs
@@ -22,19 +22,19 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                 {
                     Name = @"Circle Count",
                     Content = circles.ToString(),
-                    CreateIcon = () => new BeatmapStatisticSprite("circles"),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles),
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Slider Count",
                     Content = sliders.ToString(),
-                    CreateIcon = () => new BeatmapStatisticSprite("sliders"),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders),
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Spinner Count",
                     Content = spinners.ToString(),
-                    CreateIcon = () => new BeatmapStatisticSprite("spinners"),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Spinners),
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs
index c0f8af4fff..16a0726c8c 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs
@@ -21,19 +21,19 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 new BeatmapStatistic
                 {
                     Name = @"Hit Count",
-                    CreateIcon = () => new BeatmapStatisticSprite("circles"),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles),
                     Content = hits.ToString(),
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Drumroll Count",
-                    CreateIcon = () => new BeatmapStatisticSprite("sliders"),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders),
                     Content = drumrolls.ToString(),
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Swell Count",
-                    CreateIcon = () => new BeatmapStatisticSprite("spinners"),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Spinners),
                     Content = swells.ToString(),
                 }
             };
diff --git a/osu.Game/Beatmaps/BeatmapStatistic.cs b/osu.Game/Beatmaps/BeatmapStatistic.cs
index 825bb08246..9d87a20d60 100644
--- a/osu.Game/Beatmaps/BeatmapStatistic.cs
+++ b/osu.Game/Beatmaps/BeatmapStatistic.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Beatmaps
         public IconUsage Icon = FontAwesome.Regular.QuestionCircle;
 
         /// <summary>
-        /// A function to create the icon for display purposes.
+        /// A function to create the icon for display purposes. Use default icons available via <see cref="BeatmapStatisticIcon"/> whenever possible for conformity.
         /// </summary>
         public Func<Drawable> CreateIcon;
 
diff --git a/osu.Game/Beatmaps/BeatmapStatisticIcon.cs b/osu.Game/Beatmaps/BeatmapStatisticIcon.cs
new file mode 100644
index 0000000000..181fb540df
--- /dev/null
+++ b/osu.Game/Beatmaps/BeatmapStatisticIcon.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 Humanizer;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Beatmaps
+{
+    /// <summary>
+    /// A default implementation of an icon used to represent beatmap statistics.
+    /// </summary>
+    public class BeatmapStatisticIcon : Sprite
+    {
+        private readonly BeatmapStatisticsIconType iconType;
+
+        public BeatmapStatisticIcon(BeatmapStatisticsIconType iconType)
+        {
+            this.iconType = iconType;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            Texture = textures.Get($"Icons/BeatmapDetails/{iconType.ToString().Kebaberize()}");
+        }
+    }
+
+    public enum BeatmapStatisticsIconType
+    {
+        Accuracy,
+        ApproachRate,
+        Bpm,
+        Circles,
+        HpDrain,
+        Length,
+        OverallDifficulty,
+        Size,
+        Sliders,
+        Spinners,
+    }
+}
diff --git a/osu.Game/Beatmaps/BeatmapStatisticSprite.cs b/osu.Game/Beatmaps/BeatmapStatisticSprite.cs
deleted file mode 100644
index 1cb0bacf0f..0000000000
--- a/osu.Game/Beatmaps/BeatmapStatisticSprite.cs
+++ /dev/null
@@ -1,25 +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.Sprites;
-using osu.Framework.Graphics.Textures;
-
-namespace osu.Game.Beatmaps
-{
-    public class BeatmapStatisticSprite : Sprite
-    {
-        private readonly string iconName;
-
-        public BeatmapStatisticSprite(string iconName)
-        {
-            this.iconName = iconName;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            Texture = textures.Get($"Icons/BeatmapDetails/{iconName}");
-        }
-    }
-}
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 400f3e3063..2a3eb8c67a 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -318,14 +318,14 @@ namespace osu.Game.Screens.Select
                     labels.Add(new InfoLabel(new BeatmapStatistic
                     {
                         Name = "Length",
-                        CreateIcon = () => new BeatmapStatisticSprite("length"),
+                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
                         Content = TimeSpan.FromMilliseconds(b.BeatmapInfo.Length).ToString(@"m\:ss"),
                     }));
 
                     labels.Add(new InfoLabel(new BeatmapStatistic
                     {
                         Name = "BPM",
-                        CreateIcon = () => new BeatmapStatisticSprite("bpm"),
+                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Bpm),
                         Content = getBPMRange(b),
                     }));
 

From 4399f5976c2e380937311e925652c4a4be60accc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 4 Sep 2020 15:20:55 +0900
Subject: [PATCH 04582/10326] Fix global mods being retained by rooms

---
 .../Multiplayer/TestSceneMatchSongSelect.cs   | 22 +++++++++++++++++++
 osu.Game/Screens/Select/MatchSongSelect.cs    |  4 +---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 3d225aa0a9..faea32f90f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -162,6 +162,28 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("item 2 has rate 2", () => Precision.AlmostEquals(2, ((OsuModDoubleTime)Room.Playlist.Last().RequiredMods[0]).SpeedChange.Value));
         }
 
+        /// <summary>
+        /// Tests that the global mod instances are not retained by the rooms, as global mod instances are retained and re-used by the mod select overlay.
+        /// </summary>
+        [Test]
+        public void TestGlobalModInstancesNotRetained()
+        {
+            OsuModDoubleTime mod = null;
+
+            AddStep("set dt mod and store", () =>
+            {
+                SelectedMods.Value = new[] { new OsuModDoubleTime() };
+
+                // Mod select overlay replaces our mod.
+                mod = (OsuModDoubleTime)SelectedMods.Value[0];
+            });
+
+            AddStep("create item", () => songSelect.BeatmapDetails.CreateNewItem());
+
+            AddStep("change stored mod rate", () => mod.SpeedChange.Value = 2);
+            AddAssert("item has rate 1.5", () => Precision.AlmostEquals(1.5, ((OsuModDoubleTime)Room.Playlist.First().RequiredMods[0]).SpeedChange.Value));
+        }
+
         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 96a48fa3ac..8692833a21 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -76,9 +76,7 @@ namespace osu.Game.Screens.Select
             item.Ruleset.Value = Ruleset.Value;
 
             item.RequiredMods.Clear();
-            item.RequiredMods.AddRange(Mods.Value);
-
-            Mods.Value = Mods.Value.Select(m => m.CreateCopy()).ToArray();
+            item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
     }
 }

From 0b3f2fe7df1d956d6cf3d53a263461957cb580ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 15:21:48 +0900
Subject: [PATCH 04583/10326] 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 a41c1a5864..a096370a05 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.903.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.903.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.904.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d79806883e..cb8e30a084 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.903.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.904.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.903.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 16a8a1acb7..72b17d216d 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.Framework.iOS" Version="2020.903.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.904.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.903.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.903.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.904.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From a15653c77cf79c1a6fc8628979d30c2dbb95492e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 16:15:57 +0900
Subject: [PATCH 04584/10326] Fix potential hard crash if ruleset settings fail
 to construct

---
 .../Overlays/Settings/Sections/GameplaySection.cs  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index aca507f20a..c09e3a227d 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -1,12 +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;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Settings.Sections.Gameplay;
 using osu.Game.Rulesets;
 using System.Linq;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Logging;
 
 namespace osu.Game.Overlays.Settings.Sections
 {
@@ -35,8 +37,18 @@ namespace osu.Game.Overlays.Settings.Sections
             foreach (Ruleset ruleset in rulesets.AvailableRulesets.Select(info => info.CreateInstance()))
             {
                 SettingsSubsection section = ruleset.CreateSettings();
+
                 if (section != null)
-                    Add(section);
+                {
+                    try
+                    {
+                        Add(section);
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error(e, $"Failed to load ruleset settings");
+                    }
+                }
             }
         }
     }

From 54013790fc9c4d86612c9bcce0609c76aeaada9d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 4 Sep 2020 09:45:24 +0300
Subject: [PATCH 04585/10326] Fix MusicController raising TrackChanged event
 twice

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

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 17877a69a5..119aad5226 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -279,6 +279,10 @@ namespace osu.Game.Overlays
 
         private void changeBeatmap(WorkingBeatmap newWorking)
         {
+            // The provided beatmap is same as current, no need to do any changes.
+            if (newWorking == current)
+                return;
+
             var lastWorking = current;
 
             TrackChangeDirection direction = TrackChangeDirection.None;

From 42895e27b6f1188e6e623d5a921c99f4b4f0038f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 4 Sep 2020 10:10:14 +0300
Subject: [PATCH 04586/10326] Expose track change results on the methods

---
 osu.Game/Overlays/MusicController.cs | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 119aad5226..ea72ef0b84 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -207,7 +207,18 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Play the previous track or restart the current track if it's current time below <see cref="restart_cutoff_point"/>.
         /// </summary>
-        public void PreviousTrack() => Schedule(() => prev());
+        /// <param name="onSuccess">
+        /// Invoked when the operation has been performed successfully.
+        /// The result isn't returned directly to the caller because
+        /// the operation is scheduled and isn't performed immediately.
+        /// </param>
+        /// <returns>A <see cref="ScheduledDelegate"/> of the operation.</returns>
+        public ScheduledDelegate PreviousTrack(Action<PreviousTrackResult> onSuccess = null) => Schedule(() =>
+        {
+            PreviousTrackResult res = prev();
+            if (res != PreviousTrackResult.None)
+                onSuccess?.Invoke(res);
+        });
 
         /// <summary>
         /// Play the previous track or restart the current track if it's current time below <see cref="restart_cutoff_point"/>.
@@ -243,7 +254,18 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Play the next random or playlist track.
         /// </summary>
-        public void NextTrack() => Schedule(() => next());
+        /// <param name="onSuccess">
+        /// Invoked when the operation has been performed successfully.
+        /// The result isn't returned directly to the caller because
+        /// the operation is scheduled and isn't performed immediately.
+        /// </param>
+        /// <returns>A <see cref="ScheduledDelegate"/> of the operation.</returns>
+        public ScheduledDelegate NextTrack(Action onSuccess = null) => Schedule(() =>
+        {
+            bool res = next();
+            if (res)
+                onSuccess?.Invoke();
+        });
 
         private bool next()
         {

From 001509df55015a32b5b6f6d582c805f0a4f459f8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 4 Sep 2020 10:22:37 +0300
Subject: [PATCH 04587/10326] Move music global action handling to an own
 component

Due to requiring components that are added at an OsuGame-level
---
 osu.Game/OsuGame.cs                           |  2 +
 osu.Game/Overlays/Music/MusicActionHandler.cs | 82 +++++++++++++++++++
 osu.Game/Overlays/MusicController.cs          | 56 +------------
 3 files changed, 85 insertions(+), 55 deletions(-)
 create mode 100644 osu.Game/Overlays/Music/MusicActionHandler.cs

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 164a40c6a5..a73469d836 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -38,6 +38,7 @@ using osu.Game.Input;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.Chat;
+using osu.Game.Overlays.Music;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 using osu.Game.Overlays.Volume;
@@ -647,6 +648,7 @@ namespace osu.Game
             chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible;
 
             Add(externalLinkOpener = new ExternalLinkOpener());
+            Add(new MusicActionHandler());
 
             // side overlays which cancel each other.
             var singleDisplaySideOverlays = new OverlayContainer[] { Settings, notifications };
diff --git a/osu.Game/Overlays/Music/MusicActionHandler.cs b/osu.Game/Overlays/Music/MusicActionHandler.cs
new file mode 100644
index 0000000000..17aa4c1d32
--- /dev/null
+++ b/osu.Game/Overlays/Music/MusicActionHandler.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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Bindings;
+using osu.Game.Overlays.OSD;
+
+namespace osu.Game.Overlays.Music
+{
+    /// <summary>
+    /// Handles <see cref="GlobalAction"/> relating to music playback, and displays a <see cref="Toast"/> via the cached <see cref="OnScreenDisplay"/> accordingly.
+    /// </summary>
+    public class MusicActionHandler : Component, IKeyBindingHandler<GlobalAction>
+    {
+        [Resolved]
+        private IBindable<WorkingBeatmap> beatmap { get; set; }
+
+        [Resolved]
+        private MusicController musicController { get; set; }
+
+        [Resolved]
+        private OnScreenDisplay onScreenDisplay { get; set; }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            if (beatmap.Disabled)
+                return false;
+
+            switch (action)
+            {
+                case GlobalAction.MusicPlay:
+                    if (musicController.TogglePause())
+                        onScreenDisplay.Display(new MusicActionToast(musicController.IsPlaying ? "Play track" : "Pause track"));
+
+                    return true;
+
+                case GlobalAction.MusicNext:
+                    musicController.NextTrack(() =>
+                    {
+                        onScreenDisplay.Display(new MusicActionToast("Next track"));
+                    }).RunTask();
+
+                    return true;
+
+                case GlobalAction.MusicPrev:
+                    musicController.PreviousTrack(res =>
+                    {
+                        switch (res)
+                        {
+                            case PreviousTrackResult.Restart:
+                                onScreenDisplay.Display(new MusicActionToast("Restart track"));
+                                break;
+
+                            case PreviousTrackResult.Previous:
+                                onScreenDisplay.Display(new MusicActionToast("Previous track"));
+                                break;
+                        }
+                    }).RunTask();
+
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
+
+        private class MusicActionToast : Toast
+        {
+            public MusicActionToast(string action)
+                : base("Music Playback", action, string.Empty)
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index ea72ef0b84..69722a8c0c 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -12,12 +12,9 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Bindings;
 using osu.Framework.Utils;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
-using osu.Game.Input.Bindings;
-using osu.Game.Overlays.OSD;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Overlays
@@ -25,7 +22,7 @@ namespace osu.Game.Overlays
     /// <summary>
     /// Handles playback of the global music track.
     /// </summary>
-    public class MusicController : CompositeDrawable, IKeyBindingHandler<GlobalAction>
+    public class MusicController : CompositeDrawable
     {
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -62,9 +59,6 @@ namespace osu.Game.Overlays
         [Resolved]
         private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private OnScreenDisplay onScreenDisplay { get; set; }
-
         [NotNull]
         public DrawableTrack CurrentTrack { get; private set; } = new DrawableTrack(new TrackVirtual(1000));
 
@@ -428,54 +422,6 @@ namespace osu.Game.Overlays
                     mod.ApplyToTrack(CurrentTrack);
             }
         }
-
-        public bool OnPressed(GlobalAction action)
-        {
-            if (beatmap.Disabled)
-                return false;
-
-            switch (action)
-            {
-                case GlobalAction.MusicPlay:
-                    if (TogglePause())
-                        onScreenDisplay?.Display(new MusicControllerToast(IsPlaying ? "Play track" : "Pause track"));
-                    return true;
-
-                case GlobalAction.MusicNext:
-                    if (next())
-                        onScreenDisplay?.Display(new MusicControllerToast("Next track"));
-
-                    return true;
-
-                case GlobalAction.MusicPrev:
-                    switch (prev())
-                    {
-                        case PreviousTrackResult.Restart:
-                            onScreenDisplay?.Display(new MusicControllerToast("Restart track"));
-                            break;
-
-                        case PreviousTrackResult.Previous:
-                            onScreenDisplay?.Display(new MusicControllerToast("Previous track"));
-                            break;
-                    }
-
-                    return true;
-            }
-
-            return false;
-        }
-
-        public void OnReleased(GlobalAction action)
-        {
-        }
-
-        public class MusicControllerToast : Toast
-        {
-            public MusicControllerToast(string action)
-                : base("Music Playback", action, string.Empty)
-            {
-            }
-        }
     }
 
     public enum TrackChangeDirection

From 4d9a06bde993bd416604e0b13e71a4fedf72873f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 4 Sep 2020 10:23:06 +0300
Subject: [PATCH 04588/10326] Expose the global binding container to
 OsuGameTestScene

---
 osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs |  3 +++
 osu.Game/OsuGameBase.cs                              | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index c4acf4f7da..e29d23ba75 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -14,6 +14,7 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
@@ -109,6 +110,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             public new OsuConfigManager LocalConfig => base.LocalConfig;
 
+            public new GlobalActionContainer GlobalBinding => base.GlobalBinding;
+
             public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap;
 
             public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 51b9b7278d..8e01bda6ec 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -64,6 +64,8 @@ namespace osu.Game
 
         protected FileStore FileStore;
 
+        protected GlobalActionContainer GlobalBinding;
+
         protected KeyBindingStore KeyBindingStore;
 
         protected SettingsStore SettingsStore;
@@ -250,10 +252,8 @@ namespace osu.Game
                 AddInternal(apiAccess);
             AddInternal(RulesetConfigCache);
 
-            GlobalActionContainer globalBinding;
-
             MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both };
-            MenuCursorContainer.Child = globalBinding = new GlobalActionContainer(this)
+            MenuCursorContainer.Child = GlobalBinding = new GlobalActionContainer(this)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }
@@ -261,8 +261,8 @@ namespace osu.Game
 
             base.Content.Add(CreateScalingContainer().WithChild(MenuCursorContainer));
 
-            KeyBindingStore.Register(globalBinding);
-            dependencies.Cache(globalBinding);
+            KeyBindingStore.Register(GlobalBinding);
+            dependencies.Cache(GlobalBinding);
 
             PreviewTrackManager previewTrackManager;
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());

From 314031d56d342f722d998d0897769ea2de4bde9c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 4 Sep 2020 10:23:34 +0300
Subject: [PATCH 04589/10326] Add test cases ensuring music actions are handled
 from a game instance

---
 .../Menus/TestSceneMusicActionHandling.cs     | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
new file mode 100644
index 0000000000..9121309489
--- /dev/null
+++ b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Bindings;
+using osu.Game.Overlays;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual.Navigation;
+
+namespace osu.Game.Tests.Visual.Menus
+{
+    public class TestSceneMusicActionHandling : OsuGameTestScene
+    {
+        [Test]
+        public void TestMusicPlayAction()
+        {
+            AddStep("ensure playing something", () => Game.MusicController.EnsurePlayingSomething());
+            AddStep("trigger music playback toggle action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPlay));
+            AddAssert("music paused", () => !Game.MusicController.IsPlaying && Game.MusicController.IsUserPaused);
+            AddStep("trigger music playback toggle action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPlay));
+            AddAssert("music resumed", () => Game.MusicController.IsPlaying && !Game.MusicController.IsUserPaused);
+        }
+
+        [Test]
+        public void TestMusicNavigationActions()
+        {
+            int importId = 0;
+            Queue<(WorkingBeatmap working, TrackChangeDirection dir)> trackChangeQueue = null;
+
+            // ensure we have at least two beatmaps available to identify the direction the music controller navigated to.
+            AddRepeatStep("import beatmap", () => Game.BeatmapManager.Import(new BeatmapSetInfo
+            {
+                Beatmaps = new List<BeatmapInfo>
+                {
+                    new BeatmapInfo
+                    {
+                        BaseDifficulty = new BeatmapDifficulty(),
+                    }
+                },
+                Metadata = new BeatmapMetadata
+                {
+                    Artist = $"a test map {importId++}",
+                    Title = "title",
+                }
+            }).Wait(), 5);
+
+            AddStep("import beatmap with track", () =>
+            {
+                var setWithTrack = Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).Result;
+                Beatmap.Value = Game.BeatmapManager.GetWorkingBeatmap(setWithTrack.Beatmaps.First());
+            });
+
+            AddStep("bind to track change", () =>
+            {
+                trackChangeQueue = new Queue<(WorkingBeatmap working, TrackChangeDirection dir)>();
+                Game.MusicController.TrackChanged += (working, dir) => trackChangeQueue.Enqueue((working, dir));
+            });
+
+            AddStep("seek track to 6 second", () => Game.MusicController.SeekTo(6000));
+            AddUntilStep("wait for current time to update", () => Game.MusicController.CurrentTrack.CurrentTime > 5000);
+
+            AddStep("trigger music prev action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPrev));
+            AddAssert("no track change", () => trackChangeQueue.Count == 0);
+            AddUntilStep("track restarted", () => Game.MusicController.CurrentTrack.CurrentTime < 5000);
+
+            AddStep("trigger music prev action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPrev));
+            AddAssert("track changed to previous", () =>
+                trackChangeQueue.Count == 1 &&
+                trackChangeQueue.Dequeue().dir == TrackChangeDirection.Prev);
+
+            AddStep("trigger music next action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicNext));
+            AddAssert("track changed to next", () =>
+                trackChangeQueue.Count == 1 &&
+                trackChangeQueue.Dequeue().dir == TrackChangeDirection.Next);
+        }
+    }
+}

From 0500f24a1dbdede80d403e1f9b03fea9cfabc901 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 4 Sep 2020 10:24:07 +0300
Subject: [PATCH 04590/10326] Remove now-redundant test case

---
 .../TestSceneNowPlayingOverlay.cs             | 58 +------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index c14a1ddbf2..475ab0c414 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
@@ -1,18 +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 System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.Graphics;
-using osu.Framework.Platform;
-using osu.Game.Beatmaps;
 using osu.Game.Overlays;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -24,14 +17,9 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private NowPlayingOverlay nowPlayingOverlay;
 
-        private RulesetStore rulesets;
-
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, GameHost host)
+        private void load()
         {
-            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
-            Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
-
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
 
             nowPlayingOverlay = new NowPlayingOverlay
@@ -51,49 +39,5 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddToggleStep(@"toggle beatmap lock", state => Beatmap.Disabled = state);
             AddStep(@"hide", () => nowPlayingOverlay.Hide());
         }
-
-        private BeatmapManager manager { get; set; }
-
-        private int importId;
-
-        [Test]
-        public void TestPrevTrackBehavior()
-        {
-            // ensure we have at least two beatmaps available.
-            AddRepeatStep("import beatmap", () => manager.Import(new BeatmapSetInfo
-            {
-                Beatmaps = new List<BeatmapInfo>
-                {
-                    new BeatmapInfo
-                    {
-                        BaseDifficulty = new BeatmapDifficulty(),
-                    }
-                },
-                Metadata = new BeatmapMetadata
-                {
-                    Artist = $"a test map {importId++}",
-                    Title = "title",
-                }
-            }).Wait(), 5);
-
-            WorkingBeatmap currentBeatmap = null;
-
-            AddStep("import beatmap with track", () =>
-            {
-                var setWithTrack = manager.Import(TestResources.GetTestBeatmapForImport()).Result;
-                Beatmap.Value = currentBeatmap = manager.GetWorkingBeatmap(setWithTrack.Beatmaps.First());
-            });
-
-            AddStep(@"Seek track to 6 second", () => musicController.SeekTo(6000));
-            AddUntilStep(@"Wait for current time to update", () => musicController.CurrentTrack.CurrentTime > 5000);
-
-            AddStep(@"Set previous", () => musicController.PreviousTrack());
-
-            AddAssert(@"Check beatmap didn't change", () => currentBeatmap == Beatmap.Value);
-            AddUntilStep("Wait for current time to update", () => musicController.CurrentTrack.CurrentTime < 5000);
-
-            AddStep(@"Set previous", () => musicController.PreviousTrack());
-            AddAssert(@"Check beatmap did change", () => currentBeatmap != Beatmap.Value);
-        }
     }
 }

From 644f3375ac2210428cf7dfbd8afb58fb9e0dd0aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 16:28:19 +0900
Subject: [PATCH 04591/10326] Also catch exceptions in the construction call

---
 .../Settings/Sections/GameplaySection.cs       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index c09e3a227d..f76b8e085b 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -36,18 +36,16 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             foreach (Ruleset ruleset in rulesets.AvailableRulesets.Select(info => info.CreateInstance()))
             {
-                SettingsSubsection section = ruleset.CreateSettings();
-
-                if (section != null)
+                try
                 {
-                    try
-                    {
+                    SettingsSubsection section = ruleset.CreateSettings();
+
+                    if (section != null)
                         Add(section);
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.Error(e, $"Failed to load ruleset settings");
-                    }
+                }
+                catch (Exception e)
+                {
+                    Logger.Error(e, $"Failed to load ruleset settings");
                 }
             }
         }

From ab057e6c654886d961b5abd7b2bdd795a93ed28f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 16:28:35 +0900
Subject: [PATCH 04592/10326] Remove unnecessary string interpolation

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

diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index f76b8e085b..e5cebd28e2 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Settings.Sections
                 }
                 catch (Exception e)
                 {
-                    Logger.Error(e, $"Failed to load ruleset settings");
+                    Logger.Error(e, "Failed to load ruleset settings");
                 }
             }
         }

From 65d541456ab8a408095c1b028930f72dfc72f902 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 4 Sep 2020 11:11:07 +0300
Subject: [PATCH 04593/10326] Slight rewording

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

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 119aad5226..74a438a124 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -279,7 +279,7 @@ namespace osu.Game.Overlays
 
         private void changeBeatmap(WorkingBeatmap newWorking)
         {
-            // The provided beatmap is same as current, no need to do any changes.
+            // If the provided beatmap is same as current, then there is no need to do any changes.
             if (newWorking == current)
                 return;
 

From 4236e5fe71ceec15ffd6881532d8fda26dbd8f38 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 4 Sep 2020 11:31:54 +0300
Subject: [PATCH 04594/10326] Replace useless "matching-code" comment with
 explanation of how it could happen

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Overlays/MusicController.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 74a438a124..edef4d8589 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -279,7 +279,8 @@ namespace osu.Game.Overlays
 
         private void changeBeatmap(WorkingBeatmap newWorking)
         {
-            // If the provided beatmap is same as current, then there is no need to do any changes.
+            // This method can potentially be triggered multiple times as it is eagerly fired in next() / prev() to ensure correct execution order
+            // (changeBeatmap must be called before consumers receive the bindable changed event, which is not the case when called from the bindable itself).
             if (newWorking == current)
                 return;
 

From 3239576a239922e8dad80f61bff40a1b42205618 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <slmanarendo1950@gmail.com>
Date: Fri, 4 Sep 2020 11:50:49 +0300
Subject: [PATCH 04595/10326] Minor rewording of new comment

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Overlays/MusicController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index edef4d8589..31bd80d6f3 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -280,7 +280,7 @@ namespace osu.Game.Overlays
         private void changeBeatmap(WorkingBeatmap newWorking)
         {
             // This method can potentially be triggered multiple times as it is eagerly fired in next() / prev() to ensure correct execution order
-            // (changeBeatmap must be called before consumers receive the bindable changed event, which is not the case when called from the bindable itself).
+            // (changeBeatmap must be called before consumers receive the bindable changed event, which is not the case when the local beatmap bindable is updated directly).
             if (newWorking == current)
                 return;
 

From 569a56eccb85307cd3e4c080cb22492a116c2480 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Fri, 4 Sep 2020 13:33:23 +0300
Subject: [PATCH 04596/10326] Revert "Move adjustment to
 LegacySkinConfiguration as a default value"

This reverts commit 18927304f10bd912fc9a09cb22aaed3dd38974d0.
---
 osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs | 4 ++++
 osu.Game/Skinning/LegacySkinConfiguration.cs       | 9 ---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
index 21df49d80b..aad8b189d9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
@@ -18,6 +18,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             private const float shadow_portion = 1 - (OsuLegacySkinTransformer.LEGACY_CIRCLE_RADIUS / OsuHitObject.OBJECT_RADIUS);
 
+            protected new float CalculatedBorderPortion
+                // Roughly matches osu!stable's slider border portions.
+                => base.CalculatedBorderPortion * 0.77f;
+
             public new Color4 AccentColour => new Color4(base.AccentColour.R, base.AccentColour.G, base.AccentColour.B, base.AccentColour.A * 0.70f);
 
             protected override Color4 ColourAt(float position)
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
index b980d727ed..41b7aea34b 100644
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacySkinConfiguration.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.Globalization;
-
 namespace osu.Game.Skinning
 {
     public class LegacySkinConfiguration : SkinConfiguration
@@ -14,13 +12,6 @@ namespace osu.Game.Skinning
         /// </summary>
         public decimal? LegacyVersion { get; internal set; }
 
-        public LegacySkinConfiguration()
-        {
-            // Roughly matches osu!stable's slider border portions.
-            // Can't use nameof(SliderBorderSize) as the lookup enum is declared in the osu! ruleset.
-            ConfigDictionary["SliderBorderSize"] = 0.77f.ToString(CultureInfo.InvariantCulture);
-        }
-
         public enum LegacySetting
         {
             Version,

From 1143d5d9928d58fb2dd058b2b1dca31f1b868281 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 4 Sep 2020 20:34:26 +0900
Subject: [PATCH 04597/10326] Update class exclusion for dynamic compilation

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |  2 --
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  2 --
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  2 --
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  2 --
 .../Navigation/TestScenePresentScore.cs       |  1 +
 osu.Game/Beatmaps/BeatmapInfo.cs              |  2 ++
 osu.Game/Beatmaps/BeatmapMetadata.cs          |  2 ++
 osu.Game/Beatmaps/BeatmapSetInfo.cs           |  2 ++
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  2 ++
 osu.Game/Configuration/OsuConfigManager.cs    |  2 ++
 osu.Game/Input/GameIdleTracker.cs             | 25 +++++++++++++++++++
 osu.Game/OsuGame.cs                           | 24 ------------------
 osu.Game/Rulesets/Mods/Mod.cs                 |  2 ++
 osu.Game/Rulesets/Ruleset.cs                  |  2 ++
 osu.Game/Rulesets/RulesetInfo.cs              |  2 ++
 osu.Game/Screens/ScorePresentType.cs          | 11 ++++++++
 osu.Game/Tests/Visual/OsuTestScene.cs         |  1 +
 17 files changed, 54 insertions(+), 32 deletions(-)
 create mode 100644 osu.Game/Input/GameIdleTracker.cs
 create mode 100644 osu.Game/Screens/ScorePresentType.cs

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 9437023c70..ca75a816f1 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -21,13 +21,11 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using System;
-using osu.Framework.Testing;
 using osu.Game.Rulesets.Catch.Skinning;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch
 {
-    [ExcludeFromDynamicCompile]
     public class CatchRuleset : Ruleset, ILegacyRuleset
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableCatchRuleset(this, beatmap, mods);
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 37b34d1721..71ac85dd1b 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -12,7 +12,6 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
-using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Replays.Types;
@@ -35,7 +34,6 @@ using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets.Mania
 {
-    [ExcludeFromDynamicCompile]
     public class ManiaRuleset : Ruleset, ILegacyRuleset
     {
         /// <summary>
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index f527eb2312..7f4a0dcbbb 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -30,14 +30,12 @@ using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
 using System.Linq;
-using osu.Framework.Testing;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets.Osu
 {
-    [ExcludeFromDynamicCompile]
     public class OsuRuleset : Ruleset, ILegacyRuleset
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableOsuRuleset(this, beatmap, mods);
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index dbc32f2c3e..9d485e3f20 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -22,7 +22,6 @@ using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Scoring;
 using System;
 using System.Linq;
-using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Taiko.Edit;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -32,7 +31,6 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko
 {
-    [ExcludeFromDynamicCompile]
     public class TaikoRuleset : Ruleset, ILegacyRuleset
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableTaikoRuleset(this, beatmap, mods);
diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
index b2e18849c9..a899d072ac 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
+using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 3860f12baa..c5be5810e9 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -7,6 +7,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Newtonsoft.Json;
+using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.IO.Serialization;
 using osu.Game.Rulesets;
@@ -14,6 +15,7 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Beatmaps
 {
+    [ExcludeFromDynamicCompile]
     [Serializable]
     public class BeatmapInfo : IEquatable<BeatmapInfo>, IJsonSerializable, IHasPrimaryKey
     {
diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 775d78f1fb..39b3c23ddd 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -6,11 +6,13 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Newtonsoft.Json;
+using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.Users;
 
 namespace osu.Game.Beatmaps
 {
+    [ExcludeFromDynamicCompile]
     [Serializable]
     public class BeatmapMetadata : IEquatable<BeatmapMetadata>, IHasPrimaryKey
     {
diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index a8b83dca38..b76d780860 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -5,10 +5,12 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using osu.Framework.Testing;
 using osu.Game.Database;
 
 namespace osu.Game.Beatmaps
 {
+    [ExcludeFromDynamicCompile]
     public class BeatmapSetInfo : IHasPrimaryKey, IHasFiles<BeatmapSetFileInfo>, ISoftDelete, IEquatable<BeatmapSetInfo>
     {
         public int ID { get; set; }
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 6a161e6e04..19b54e1783 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -13,6 +13,7 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
 using osu.Framework.Statistics;
+using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Types;
@@ -22,6 +23,7 @@ using osu.Game.Storyboards;
 
 namespace osu.Game.Beatmaps
 {
+    [ExcludeFromDynamicCompile]
     public abstract class WorkingBeatmap : IWorkingBeatmap
     {
         public readonly BeatmapInfo BeatmapInfo;
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index a8a8794320..e5432cb84e 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -6,6 +6,7 @@ using osu.Framework.Configuration;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Extensions;
 using osu.Framework.Platform;
+using osu.Framework.Testing;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Select;
@@ -13,6 +14,7 @@ using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Configuration
 {
+    [ExcludeFromDynamicCompile]
     public class OsuConfigManager : IniConfigManager<OsuSetting>
     {
         protected override void InitialiseDefaults()
diff --git a/osu.Game/Input/GameIdleTracker.cs b/osu.Game/Input/GameIdleTracker.cs
new file mode 100644
index 0000000000..260be7e5c9
--- /dev/null
+++ b/osu.Game/Input/GameIdleTracker.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.Input;
+
+namespace osu.Game.Input
+{
+    public class GameIdleTracker : IdleTracker
+    {
+        private InputManager inputManager;
+
+        public GameIdleTracker(int time)
+            : base(time)
+        {
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            inputManager = GetContainingInputManager();
+        }
+
+        protected override bool AllowIdle => inputManager.FocusedDrawable == null;
+    }
+}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 164a40c6a5..a8722d03ab 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -718,24 +718,6 @@ namespace osu.Game
                 overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime);
         }
 
-        public class GameIdleTracker : IdleTracker
-        {
-            private InputManager inputManager;
-
-            public GameIdleTracker(int time)
-                : base(time)
-            {
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                inputManager = GetContainingInputManager();
-            }
-
-            protected override bool AllowIdle => inputManager.FocusedDrawable == null;
-        }
-
         private void forwardLoggedErrorsToNotifications()
         {
             int recentLogCount = 0;
@@ -991,10 +973,4 @@ namespace osu.Game
                 Exit();
         }
     }
-
-    public enum ScorePresentType
-    {
-        Results,
-        Gameplay
-    }
 }
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 52ffa0ad2a..b8dc7a2661 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -9,6 +9,7 @@ using System.Reflection;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.IO.Serialization;
 using osu.Game.Rulesets.UI;
@@ -18,6 +19,7 @@ namespace osu.Game.Rulesets.Mods
     /// <summary>
     /// The base class for gameplay modifiers.
     /// </summary>
+    [ExcludeFromDynamicCompile]
     public abstract class Mod : IMod, IJsonSerializable
     {
         /// <summary>
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 3a7f433a37..915544d010 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -23,10 +23,12 @@ using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Users;
 using JetBrains.Annotations;
+using osu.Framework.Testing;
 using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets
 {
+    [ExcludeFromDynamicCompile]
     public abstract class Ruleset
     {
         public RulesetInfo RulesetInfo { get; internal set; }
diff --git a/osu.Game/Rulesets/RulesetInfo.cs b/osu.Game/Rulesets/RulesetInfo.cs
index 2e32b96084..d5aca8c650 100644
--- a/osu.Game/Rulesets/RulesetInfo.cs
+++ b/osu.Game/Rulesets/RulesetInfo.cs
@@ -5,9 +5,11 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Newtonsoft.Json;
+using osu.Framework.Testing;
 
 namespace osu.Game.Rulesets
 {
+    [ExcludeFromDynamicCompile]
     public class RulesetInfo : IEquatable<RulesetInfo>
     {
         public int? ID { get; set; }
diff --git a/osu.Game/Screens/ScorePresentType.cs b/osu.Game/Screens/ScorePresentType.cs
new file mode 100644
index 0000000000..3216f92091
--- /dev/null
+++ b/osu.Game/Screens/ScorePresentType.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
+{
+    public enum ScorePresentType
+    {
+        Results,
+        Gameplay
+    }
+}
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 756074c0b3..4db5139813 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -30,6 +30,7 @@ using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Visual
 {
+    [ExcludeFromDynamicCompile]
     public abstract class OsuTestScene : TestScene
     {
         protected Bindable<WorkingBeatmap> Beatmap { get; private set; }

From ebd11ae0b7a3afe13d0054ed845dc42d9efa944c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 5 Sep 2020 03:52:07 +0900
Subject: [PATCH 04598/10326] Add a collection management dialog

---
 .../Collections/TestSceneCollectionDialog.cs  |  26 +++
 osu.Game/Collections/CollectionDialog.cs      | 125 ++++++++++++++
 osu.Game/Collections/CollectionList.cs        |  27 ++++
 osu.Game/Collections/CollectionListItem.cs    | 152 ++++++++++++++++++
 .../Collections/DeleteCollectionDialog.cs     |  36 +++++
 osu.Game/OsuGame.cs                           |   2 +
 .../Carousel/DrawableCarouselBeatmap.cs       |  14 +-
 .../Carousel/DrawableCarouselBeatmapSet.cs    |  14 +-
 8 files changed, 384 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs
 create mode 100644 osu.Game/Collections/CollectionDialog.cs
 create mode 100644 osu.Game/Collections/CollectionList.cs
 create mode 100644 osu.Game/Collections/CollectionListItem.cs
 create mode 100644 osu.Game/Collections/DeleteCollectionDialog.cs

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs
new file mode 100644
index 0000000000..f810361610
--- /dev/null
+++ b/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Collections;
+using osu.Game.Overlays;
+
+namespace osu.Game.Tests.Visual.Collections
+{
+    public class TestSceneCollectionDialog : OsuTestScene
+    {
+        [Cached]
+        private DialogOverlay dialogOverlay;
+
+        public TestSceneCollectionDialog()
+        {
+            Children = new Drawable[]
+            {
+                new CollectionDialog { State = { Value = Visibility.Visible } },
+                dialogOverlay = new DialogOverlay()
+            };
+        }
+    }
+}
diff --git a/osu.Game/Collections/CollectionDialog.cs b/osu.Game/Collections/CollectionDialog.cs
new file mode 100644
index 0000000000..e911b507e5
--- /dev/null
+++ b/osu.Game/Collections/CollectionDialog.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.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+namespace osu.Game.Collections
+{
+    public class CollectionDialog : OsuFocusedOverlayContainer
+    {
+        private const double enter_duration = 500;
+        private const double exit_duration = 200;
+
+        [Resolved]
+        private CollectionManager collectionManager { get; set; }
+
+        public CollectionDialog()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            RelativeSizeAxes = Axes.Both;
+            Size = new Vector2(0.5f, 0.8f);
+
+            Masking = true;
+            CornerRadius = 10;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colours.GreySeafoamDark,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.Absolute, 50),
+                            new Dimension(),
+                            new Dimension(GridSizeMode.Absolute, 50),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Text = "Manage collections",
+                                    Font = OsuFont.GetFont(size: 30),
+                                }
+                            },
+                            new Drawable[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = colours.GreySeafoamDarker
+                                        },
+                                        new CollectionList
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Items = { BindTarget = collectionManager.Collections }
+                                        }
+                                    }
+                                }
+                            },
+                            new Drawable[]
+                            {
+                                new OsuButton
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Size = Vector2.One,
+                                    Padding = new MarginPadding(10),
+                                    Text = "Create new collection",
+                                    Action = () => collectionManager.Collections.Add(new BeatmapCollection { Name = "My new collection" })
+                                },
+                            },
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+
+            this.FadeIn(enter_duration, Easing.OutQuint);
+            this.ScaleTo(0.9f).Then().ScaleTo(1f, enter_duration, Easing.OutElastic);
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+
+            this.FadeOut(exit_duration, Easing.OutQuint);
+            this.ScaleTo(0.9f, exit_duration);
+        }
+    }
+}
diff --git a/osu.Game/Collections/CollectionList.cs b/osu.Game/Collections/CollectionList.cs
new file mode 100644
index 0000000000..990f82e702
--- /dev/null
+++ b/osu.Game/Collections/CollectionList.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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.Containers;
+using osuTK;
+
+namespace osu.Game.Collections
+{
+    public class CollectionList : OsuRearrangeableListContainer<BeatmapCollection>
+    {
+        protected override ScrollContainer<Drawable> CreateScrollContainer() => base.CreateScrollContainer().With(d =>
+        {
+            d.ScrollbarVisible = false;
+        });
+
+        protected override FillFlowContainer<RearrangeableListItem<BeatmapCollection>> CreateListFillFlowContainer() => new FillFlowContainer<RearrangeableListItem<BeatmapCollection>>
+        {
+            LayoutDuration = 200,
+            LayoutEasing = Easing.OutQuint,
+            Spacing = new Vector2(0, 2)
+        };
+
+        protected override OsuRearrangeableListItem<BeatmapCollection> CreateOsuDrawable(BeatmapCollection item) => new CollectionListItem(item);
+    }
+}
diff --git a/osu.Game/Collections/CollectionListItem.cs b/osu.Game/Collections/CollectionListItem.cs
new file mode 100644
index 0000000000..527ed57cd0
--- /dev/null
+++ b/osu.Game/Collections/CollectionListItem.cs
@@ -0,0 +1,152 @@
+// Copyright (c) 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.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Collections
+{
+    public class CollectionListItem : OsuRearrangeableListItem<BeatmapCollection>
+    {
+        private const float item_height = 35;
+
+        public CollectionListItem(BeatmapCollection item)
+            : base(item)
+        {
+            Padding = new MarginPadding { Right = 20 };
+        }
+
+        protected override Drawable CreateContent() => new ItemContent(Model);
+
+        private class ItemContent : CircularContainer
+        {
+            private readonly BeatmapCollection collection;
+
+            private ItemTextBox textBox;
+
+            public ItemContent(BeatmapCollection collection)
+            {
+                this.collection = collection;
+
+                RelativeSizeAxes = Axes.X;
+                Height = item_height;
+                Masking = true;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Children = new Drawable[]
+                {
+                    new DeleteButton(collection)
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        IsTextBoxHovered = v => textBox.ReceivePositionalInputAt(v)
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Right = item_height / 2 },
+                        Children = new Drawable[]
+                        {
+                            textBox = new ItemTextBox
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Size = Vector2.One,
+                                CornerRadius = item_height / 2,
+                                Text = collection.Name
+                            },
+                        }
+                    },
+                };
+            }
+        }
+
+        private class ItemTextBox : OsuTextBox
+        {
+            protected override float LeftRightPadding => item_height / 2;
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundUnfocused = colours.GreySeafoamDarker.Darken(0.5f);
+                BackgroundFocused = colours.GreySeafoam;
+            }
+        }
+
+        private class DeleteButton : CompositeDrawable
+        {
+            public Func<Vector2, bool> IsTextBoxHovered;
+
+            [Resolved(CanBeNull = true)]
+            private DialogOverlay dialogOverlay { get; set; }
+
+            private readonly BeatmapCollection collection;
+
+            private Drawable background;
+
+            public DeleteButton(BeatmapCollection collection)
+            {
+                this.collection = collection;
+                RelativeSizeAxes = Axes.Both;
+                FillMode = FillMode.Fit;
+
+                Alpha = 0.1f;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                InternalChildren = new[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colours.Red
+                    },
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        X = -6,
+                        Size = new Vector2(10),
+                        Icon = FontAwesome.Solid.Trash
+                    }
+                };
+            }
+
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) && !IsTextBoxHovered(screenSpacePos);
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                this.FadeTo(1f, 100, Easing.Out);
+                return false;
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                this.FadeTo(0.1f, 100);
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                background.FlashColour(Color4.White, 150);
+                dialogOverlay?.Push(new DeleteCollectionDialog(collection));
+                return true;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Collections/DeleteCollectionDialog.cs b/osu.Game/Collections/DeleteCollectionDialog.cs
new file mode 100644
index 0000000000..a7677e9de2
--- /dev/null
+++ b/osu.Game/Collections/DeleteCollectionDialog.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.Framework.Graphics.Sprites;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Game.Collections
+{
+    public class DeleteCollectionDialog : PopupDialog
+    {
+        [Resolved]
+        private CollectionManager collectionManager { get; set; }
+
+        public DeleteCollectionDialog(BeatmapCollection collection)
+        {
+            HeaderText = "Confirm deletion of";
+            BodyText = collection.Name;
+
+            Icon = FontAwesome.Regular.TrashAlt;
+
+            Buttons = new PopupDialogButton[]
+            {
+                new PopupDialogOkButton
+                {
+                    Text = @"Yes. Go for it.",
+                    Action = () => collectionManager.Collections.Remove(collection)
+                },
+                new PopupDialogCancelButton
+                {
+                    Text = @"No! Abort mission!",
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5008a3cf3b..1f69888d2e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -31,6 +31,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
+using osu.Game.Collections;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
@@ -632,6 +633,7 @@ namespace osu.Game
             loadComponentSingleFile(CreateUpdateManager(), Add, true);
 
             // overlay elements
+            loadComponentSingleFile(new CollectionDialog(), overlayContent.Add, true);
             loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(dashboard = new DashboardOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(news = new NewsOverlay(), overlayContent.Add, true);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 1bd4447248..fe4c95f4e3 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -51,6 +51,9 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved]
         private CollectionManager collectionManager { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private CollectionDialog collectionDialog { get; set; }
+
         private IBindable<StarDifficulty> starDifficultyBindable;
         private CancellationTokenSource starDifficultyCancellationSource;
 
@@ -224,12 +227,11 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmap.OnlineBeatmapID.HasValue && beatmapOverlay != null)
                     items.Add(new OsuMenuItem("Details", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
 
-                items.Add(new OsuMenuItem("Add to...")
-                {
-                    Items = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem)
-                                             .Append(new OsuMenuItem("More...", MenuItemType.Standard, () => { }))
-                                             .ToArray()
-                });
+                var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem).ToList();
+                if (collectionDialog != null)
+                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, collectionDialog.Show));
+
+                items.Add(new OsuMenuItem("Add to...") { Items = collectionItems });
 
                 return items.ToArray();
             }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index e05b5ee951..8a9b0dc5b3 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -38,6 +38,9 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved]
         private CollectionManager collectionManager { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private CollectionDialog collectionDialog { get; set; }
+
         private readonly BeatmapSetInfo beatmapSet;
 
         public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)
@@ -145,12 +148,11 @@ namespace osu.Game.Screens.Select.Carousel
                 if (dialogOverlay != null)
                     items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay.Push(new BeatmapDeleteDialog(beatmapSet))));
 
-                items.Add(new OsuMenuItem("Add all to...")
-                {
-                    Items = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem)
-                                             .Append(new OsuMenuItem("More...", MenuItemType.Standard, () => { }))
-                                             .ToArray()
-                });
+                var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem).ToList();
+                if (collectionDialog != null)
+                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, collectionDialog.Show));
+
+                items.Add(new OsuMenuItem("Add all to...") { Items = collectionItems });
 
                 return items.ToArray();
             }

From 345fb9d8e02f057c33a8430126463285c9a27c1e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 5 Sep 2020 03:55:43 +0900
Subject: [PATCH 04599/10326] Rename classes

---
 .../Visual/Collections/TestSceneCollectionDialog.cs       | 2 +-
 .../{CollectionManager.cs => BeatmapCollectionManager.cs} | 2 +-
 osu.Game/Collections/DeleteCollectionDialog.cs            | 2 +-
 .../{CollectionList.cs => DrawableCollectionList.cs}      | 4 ++--
 ...ollectionListItem.cs => DrawableCollectionListItem.cs} | 4 ++--
 .../{CollectionDialog.cs => ManageCollectionDialog.cs}    | 8 ++++----
 osu.Game/OsuGame.cs                                       | 2 +-
 osu.Game/OsuGameBase.cs                                   | 4 ++--
 .../Settings/Sections/Maintenance/GeneralSettings.cs      | 8 ++++----
 .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs    | 8 ++++----
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 8 ++++----
 osu.Game/Screens/Select/FilterControl.cs                  | 2 +-
 12 files changed, 27 insertions(+), 27 deletions(-)
 rename osu.Game/Collections/{CollectionManager.cs => BeatmapCollectionManager.cs} (99%)
 rename osu.Game/Collections/{CollectionList.cs => DrawableCollectionList.cs} (83%)
 rename osu.Game/Collections/{CollectionListItem.cs => DrawableCollectionListItem.cs} (96%)
 rename osu.Game/Collections/{CollectionDialog.cs => ManageCollectionDialog.cs} (94%)

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs
index f810361610..247d27f67a 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Collections
         {
             Children = new Drawable[]
             {
-                new CollectionDialog { State = { Value = Visibility.Visible } },
+                new ManageCollectionDialog { State = { Value = Visibility.Visible } },
                 dialogOverlay = new DialogOverlay()
             };
         }
diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
similarity index 99%
rename from osu.Game/Collections/CollectionManager.cs
rename to osu.Game/Collections/BeatmapCollectionManager.cs
index 20bf96da9d..0b066708d8 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -18,7 +18,7 @@ using osu.Game.IO.Legacy;
 
 namespace osu.Game.Collections
 {
-    public class CollectionManager : CompositeDrawable
+    public class BeatmapCollectionManager : CompositeDrawable
     {
         /// <summary>
         /// Database version in YYYYMMDD format (matching stable).
diff --git a/osu.Game/Collections/DeleteCollectionDialog.cs b/osu.Game/Collections/DeleteCollectionDialog.cs
index a7677e9de2..81bedca638 100644
--- a/osu.Game/Collections/DeleteCollectionDialog.cs
+++ b/osu.Game/Collections/DeleteCollectionDialog.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Collections
     public class DeleteCollectionDialog : PopupDialog
     {
         [Resolved]
-        private CollectionManager collectionManager { get; set; }
+        private BeatmapCollectionManager collectionManager { get; set; }
 
         public DeleteCollectionDialog(BeatmapCollection collection)
         {
diff --git a/osu.Game/Collections/CollectionList.cs b/osu.Game/Collections/DrawableCollectionList.cs
similarity index 83%
rename from osu.Game/Collections/CollectionList.cs
rename to osu.Game/Collections/DrawableCollectionList.cs
index 990f82e702..ab146c17b6 100644
--- a/osu.Game/Collections/CollectionList.cs
+++ b/osu.Game/Collections/DrawableCollectionList.cs
@@ -8,7 +8,7 @@ using osuTK;
 
 namespace osu.Game.Collections
 {
-    public class CollectionList : OsuRearrangeableListContainer<BeatmapCollection>
+    public class DrawableCollectionList : OsuRearrangeableListContainer<BeatmapCollection>
     {
         protected override ScrollContainer<Drawable> CreateScrollContainer() => base.CreateScrollContainer().With(d =>
         {
@@ -22,6 +22,6 @@ namespace osu.Game.Collections
             Spacing = new Vector2(0, 2)
         };
 
-        protected override OsuRearrangeableListItem<BeatmapCollection> CreateOsuDrawable(BeatmapCollection item) => new CollectionListItem(item);
+        protected override OsuRearrangeableListItem<BeatmapCollection> CreateOsuDrawable(BeatmapCollection item) => new DrawableCollectionListItem(item);
     }
 }
diff --git a/osu.Game/Collections/CollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
similarity index 96%
rename from osu.Game/Collections/CollectionListItem.cs
rename to osu.Game/Collections/DrawableCollectionListItem.cs
index 527ed57cd0..67756cdb43 100644
--- a/osu.Game/Collections/CollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -18,11 +18,11 @@ using osuTK.Graphics;
 
 namespace osu.Game.Collections
 {
-    public class CollectionListItem : OsuRearrangeableListItem<BeatmapCollection>
+    public class DrawableCollectionListItem : OsuRearrangeableListItem<BeatmapCollection>
     {
         private const float item_height = 35;
 
-        public CollectionListItem(BeatmapCollection item)
+        public DrawableCollectionListItem(BeatmapCollection item)
             : base(item)
         {
             Padding = new MarginPadding { Right = 20 };
diff --git a/osu.Game/Collections/CollectionDialog.cs b/osu.Game/Collections/ManageCollectionDialog.cs
similarity index 94%
rename from osu.Game/Collections/CollectionDialog.cs
rename to osu.Game/Collections/ManageCollectionDialog.cs
index e911b507e5..6a0d815e43 100644
--- a/osu.Game/Collections/CollectionDialog.cs
+++ b/osu.Game/Collections/ManageCollectionDialog.cs
@@ -13,15 +13,15 @@ using osuTK;
 
 namespace osu.Game.Collections
 {
-    public class CollectionDialog : OsuFocusedOverlayContainer
+    public class ManageCollectionDialog : OsuFocusedOverlayContainer
     {
         private const double enter_duration = 500;
         private const double exit_duration = 200;
 
         [Resolved]
-        private CollectionManager collectionManager { get; set; }
+        private BeatmapCollectionManager collectionManager { get; set; }
 
-        public CollectionDialog()
+        public ManageCollectionDialog()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -79,7 +79,7 @@ namespace osu.Game.Collections
                                             RelativeSizeAxes = Axes.Both,
                                             Colour = colours.GreySeafoamDarker
                                         },
-                                        new CollectionList
+                                        new DrawableCollectionList
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                             Items = { BindTarget = collectionManager.Collections }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1f69888d2e..2f8f1b2f17 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -633,7 +633,7 @@ namespace osu.Game
             loadComponentSingleFile(CreateUpdateManager(), Add, true);
 
             // overlay elements
-            loadComponentSingleFile(new CollectionDialog(), overlayContent.Add, true);
+            loadComponentSingleFile(new ManageCollectionDialog(), overlayContent.Add, true);
             loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(dashboard = new DashboardOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(news = new NewsOverlay(), overlayContent.Add, true);
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d512f57ca5..a7efecadfd 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -56,7 +56,7 @@ namespace osu.Game
 
         protected BeatmapManager BeatmapManager;
 
-        protected CollectionManager CollectionManager;
+        protected BeatmapCollectionManager CollectionManager;
 
         protected ScoreManager ScoreManager;
 
@@ -225,7 +225,7 @@ namespace osu.Game
             dependencies.Cache(difficultyManager);
             AddInternal(difficultyManager);
 
-            dependencies.Cache(CollectionManager = new CollectionManager());
+            dependencies.Cache(CollectionManager = new BeatmapCollectionManager());
             AddInternal(CollectionManager);
 
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 21a5ed6b31..74f9920ae0 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton undeleteButton;
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, CollectionManager collections, DialogOverlay dialogOverlay)
+        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, BeatmapCollectionManager collectionManager, DialogOverlay dialogOverlay)
         {
             if (beatmaps.SupportsImportFromStable)
             {
@@ -108,7 +108,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (collections.SupportsImportFromStable)
+            if (collectionManager.SupportsImportFromStable)
             {
                 Add(importCollectionsButton = new SettingsButton
                 {
@@ -116,7 +116,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     Action = () =>
                     {
                         importCollectionsButton.Enabled.Value = false;
-                        collections.ImportFromStableAsync().ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
+                        collectionManager.ImportFromStableAsync().ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
                     }
                 });
             }
@@ -126,7 +126,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 Text = "Delete ALL collections",
                 Action = () =>
                 {
-                    dialogOverlay?.Push(new DeleteAllBeatmapsDialog(() => collections.Collections.Clear()));
+                    dialogOverlay?.Push(new DeleteAllBeatmapsDialog(() => collectionManager.Collections.Clear()));
                 }
             });
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index fe4c95f4e3..8fd428d26e 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -49,10 +49,10 @@ namespace osu.Game.Screens.Select.Carousel
         private BeatmapDifficultyManager difficultyManager { get; set; }
 
         [Resolved]
-        private CollectionManager collectionManager { get; set; }
+        private BeatmapCollectionManager collectionManager { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private CollectionDialog collectionDialog { get; set; }
+        private ManageCollectionDialog manageCollectionDialog { get; set; }
 
         private IBindable<StarDifficulty> starDifficultyBindable;
         private CancellationTokenSource starDifficultyCancellationSource;
@@ -228,8 +228,8 @@ namespace osu.Game.Screens.Select.Carousel
                     items.Add(new OsuMenuItem("Details", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
 
                 var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem).ToList();
-                if (collectionDialog != null)
-                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, collectionDialog.Show));
+                if (manageCollectionDialog != null)
+                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionDialog.Show));
 
                 items.Add(new OsuMenuItem("Add to...") { Items = collectionItems });
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 8a9b0dc5b3..12c6b320e9 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -36,10 +36,10 @@ namespace osu.Game.Screens.Select.Carousel
         private DialogOverlay dialogOverlay { get; set; }
 
         [Resolved]
-        private CollectionManager collectionManager { get; set; }
+        private BeatmapCollectionManager collectionManager { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private CollectionDialog collectionDialog { get; set; }
+        private ManageCollectionDialog manageCollectionDialog { get; set; }
 
         private readonly BeatmapSetInfo beatmapSet;
 
@@ -149,8 +149,8 @@ namespace osu.Game.Screens.Select.Carousel
                     items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay.Push(new BeatmapDeleteDialog(beatmapSet))));
 
                 var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem).ToList();
-                if (collectionDialog != null)
-                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, collectionDialog.Show));
+                if (manageCollectionDialog != null)
+                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionDialog.Show));
 
                 items.Add(new OsuMenuItem("Add all to...") { Items = collectionItems });
 
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 0b85ae0e6a..0db24f0738 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -216,7 +216,7 @@ namespace osu.Game.Screens.Select
             }
 
             [BackgroundDependencyLoader]
-            private void load(CollectionManager collectionManager)
+            private void load(BeatmapCollectionManager collectionManager)
             {
                 collections.BindTo(collectionManager.Collections);
                 collections.CollectionChanged += (_, __) => collectionsChanged();

From 4b4dd02942c6e8d1ec7faa6490cce8051958c47c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 5 Sep 2020 04:43:51 +0900
Subject: [PATCH 04600/10326] Make collection name a bindable

---
 osu.Game/Collections/BeatmapCollectionManager.cs          | 8 ++++----
 osu.Game/Collections/DeleteCollectionDialog.cs            | 2 +-
 osu.Game/Collections/DrawableCollectionListItem.cs        | 2 +-
 osu.Game/Collections/ManageCollectionDialog.cs            | 5 ++++-
 .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs    | 2 +-
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 2 +-
 osu.Game/Screens/Select/FilterControl.cs                  | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
index 0b066708d8..3e5976300f 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Collections
             {
                 var existing = Collections.FirstOrDefault(c => c.Name == newCol.Name);
                 if (existing == null)
-                    Collections.Add(existing = new BeatmapCollection { Name = newCol.Name });
+                    Collections.Add(existing = new BeatmapCollection { Name = { Value = newCol.Name.Value } });
 
                 foreach (var newBeatmap in newCol.Beatmaps)
                 {
@@ -122,7 +122,7 @@ namespace osu.Game.Collections
 
                     for (int i = 0; i < collectionCount; i++)
                     {
-                        var collection = new BeatmapCollection { Name = sr.ReadString() };
+                        var collection = new BeatmapCollection { Name = { Value = sr.ReadString() } };
                         int mapCount = sr.ReadInt32();
 
                         for (int j = 0; j < mapCount; j++)
@@ -183,7 +183,7 @@ namespace osu.Game.Collections
 
                         foreach (var c in Collections)
                         {
-                            sw.Write(c.Name);
+                            sw.Write(c.Name.Value);
                             sw.Write(c.Beatmaps.Count);
 
                             foreach (var b in c.Beatmaps)
@@ -221,7 +221,7 @@ namespace osu.Game.Collections
         /// </summary>
         public event Action Changed;
 
-        public string Name;
+        public readonly Bindable<string> Name = new Bindable<string>();
 
         public readonly BindableList<BeatmapInfo> Beatmaps = new BindableList<BeatmapInfo>();
 
diff --git a/osu.Game/Collections/DeleteCollectionDialog.cs b/osu.Game/Collections/DeleteCollectionDialog.cs
index 81bedca638..f2b8de7c1e 100644
--- a/osu.Game/Collections/DeleteCollectionDialog.cs
+++ b/osu.Game/Collections/DeleteCollectionDialog.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Collections
         public DeleteCollectionDialog(BeatmapCollection collection)
         {
             HeaderText = "Confirm deletion of";
-            BodyText = collection.Name;
+            BodyText = collection.Name.Value;
 
             Icon = FontAwesome.Regular.TrashAlt;
 
diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index 67756cdb43..7c1a2e1287 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Collections
                                 RelativeSizeAxes = Axes.Both,
                                 Size = Vector2.One,
                                 CornerRadius = item_height / 2,
-                                Text = collection.Name
+                                Current = collection.Name
                             },
                         }
                     },
diff --git a/osu.Game/Collections/ManageCollectionDialog.cs b/osu.Game/Collections/ManageCollectionDialog.cs
index 6a0d815e43..1e222a9c71 100644
--- a/osu.Game/Collections/ManageCollectionDialog.cs
+++ b/osu.Game/Collections/ManageCollectionDialog.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Collections
                                     Size = Vector2.One,
                                     Padding = new MarginPadding(10),
                                     Text = "Create new collection",
-                                    Action = () => collectionManager.Collections.Add(new BeatmapCollection { Name = "My new collection" })
+                                    Action = () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "My new collection" } })
                                 },
                             },
                         }
@@ -120,6 +120,9 @@ namespace osu.Game.Collections
 
             this.FadeOut(exit_duration, Easing.OutQuint);
             this.ScaleTo(0.9f, exit_duration);
+
+            // Ensure that textboxes commit
+            GetContainingInputManager()?.TriggerFocusContention(this);
         }
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 8fd428d26e..6c43bf5bed 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.Select.Carousel
 
         private MenuItem createCollectionMenuItem(BeatmapCollection collection)
         {
-            return new ToggleMenuItem(collection.Name, MenuItemType.Standard, s =>
+            return new ToggleMenuItem(collection.Name.Value, MenuItemType.Standard, s =>
             {
                 if (s)
                     collection.Beatmaps.Add(beatmap);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 12c6b320e9..fc262730cb 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Screens.Select.Carousel
             else
                 state = TernaryState.False;
 
-            return new TernaryStateMenuItem(collection.Name, MenuItemType.Standard, s =>
+            return new TernaryStateMenuItem(collection.Name.Value, MenuItemType.Standard, s =>
             {
                 foreach (var b in beatmapSet.Beatmaps)
                 {
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 0db24f0738..a66bcfb3b1 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -270,7 +270,7 @@ namespace osu.Game.Screens.Select
                 Current.TriggerChange();
             }
 
-            protected override string GenerateItemText(CollectionFilter item) => item.Collection?.Name ?? "All beatmaps";
+            protected override string GenerateItemText(CollectionFilter item) => item.Collection?.Name.Value ?? "All beatmaps";
 
             protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader();
 

From 33b76015d80df41618867a94227fbe2251bae200 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 6 Sep 2020 01:54:08 +0300
Subject: [PATCH 04601/10326] Fix MusicActionHandler unnecessarily depending on
 OnScreenDisplay's existance

---
 osu.Game/Overlays/Music/MusicActionHandler.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Music/MusicActionHandler.cs b/osu.Game/Overlays/Music/MusicActionHandler.cs
index 17aa4c1d32..cd8548c1c0 100644
--- a/osu.Game/Overlays/Music/MusicActionHandler.cs
+++ b/osu.Game/Overlays/Music/MusicActionHandler.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Music
         [Resolved]
         private MusicController musicController { get; set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
         public bool OnPressed(GlobalAction action)
@@ -34,14 +34,14 @@ namespace osu.Game.Overlays.Music
             {
                 case GlobalAction.MusicPlay:
                     if (musicController.TogglePause())
-                        onScreenDisplay.Display(new MusicActionToast(musicController.IsPlaying ? "Play track" : "Pause track"));
+                        onScreenDisplay?.Display(new MusicActionToast(musicController.IsPlaying ? "Play track" : "Pause track"));
 
                     return true;
 
                 case GlobalAction.MusicNext:
                     musicController.NextTrack(() =>
                     {
-                        onScreenDisplay.Display(new MusicActionToast("Next track"));
+                        onScreenDisplay?.Display(new MusicActionToast("Next track"));
                     }).RunTask();
 
                     return true;
@@ -52,11 +52,11 @@ namespace osu.Game.Overlays.Music
                         switch (res)
                         {
                             case PreviousTrackResult.Restart:
-                                onScreenDisplay.Display(new MusicActionToast("Restart track"));
+                                onScreenDisplay?.Display(new MusicActionToast("Restart track"));
                                 break;
 
                             case PreviousTrackResult.Previous:
-                                onScreenDisplay.Display(new MusicActionToast("Previous track"));
+                                onScreenDisplay?.Display(new MusicActionToast("Previous track"));
                                 break;
                         }
                     }).RunTask();

From e37a3a84fd2e232d6f1eeb0f71eec3c64417256d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 5 Sep 2020 15:40:26 +0200
Subject: [PATCH 04602/10326] Use legible tuple member name

---
 .../Visual/Menus/TestSceneMusicActionHandling.cs       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
index 9121309489..9ee86eaf78 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual.Menus
         public void TestMusicNavigationActions()
         {
             int importId = 0;
-            Queue<(WorkingBeatmap working, TrackChangeDirection dir)> trackChangeQueue = null;
+            Queue<(WorkingBeatmap working, TrackChangeDirection changeDirection)> trackChangeQueue = null;
 
             // ensure we have at least two beatmaps available to identify the direction the music controller navigated to.
             AddRepeatStep("import beatmap", () => Game.BeatmapManager.Import(new BeatmapSetInfo
@@ -55,8 +55,8 @@ namespace osu.Game.Tests.Visual.Menus
 
             AddStep("bind to track change", () =>
             {
-                trackChangeQueue = new Queue<(WorkingBeatmap working, TrackChangeDirection dir)>();
-                Game.MusicController.TrackChanged += (working, dir) => trackChangeQueue.Enqueue((working, dir));
+                trackChangeQueue = new Queue<(WorkingBeatmap, TrackChangeDirection)>();
+                Game.MusicController.TrackChanged += (working, changeDirection) => trackChangeQueue.Enqueue((working, changeDirection));
             });
 
             AddStep("seek track to 6 second", () => Game.MusicController.SeekTo(6000));
@@ -69,12 +69,12 @@ namespace osu.Game.Tests.Visual.Menus
             AddStep("trigger music prev action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPrev));
             AddAssert("track changed to previous", () =>
                 trackChangeQueue.Count == 1 &&
-                trackChangeQueue.Dequeue().dir == TrackChangeDirection.Prev);
+                trackChangeQueue.Dequeue().changeDirection == TrackChangeDirection.Prev);
 
             AddStep("trigger music next action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicNext));
             AddAssert("track changed to next", () =>
                 trackChangeQueue.Count == 1 &&
-                trackChangeQueue.Dequeue().dir == TrackChangeDirection.Next);
+                trackChangeQueue.Dequeue().changeDirection == TrackChangeDirection.Next);
         }
     }
 }

From 8b1151284c507b12cbb56811a90018f916645873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 5 Sep 2020 15:43:16 +0200
Subject: [PATCH 04603/10326] Simplify overly verbose step names

---
 .../Visual/Menus/TestSceneMusicActionHandling.cs       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
index 9ee86eaf78..9b8ba47992 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
@@ -18,9 +18,9 @@ namespace osu.Game.Tests.Visual.Menus
         public void TestMusicPlayAction()
         {
             AddStep("ensure playing something", () => Game.MusicController.EnsurePlayingSomething());
-            AddStep("trigger music playback toggle action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPlay));
+            AddStep("toggle playback", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPlay));
             AddAssert("music paused", () => !Game.MusicController.IsPlaying && Game.MusicController.IsUserPaused);
-            AddStep("trigger music playback toggle action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPlay));
+            AddStep("toggle playback", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPlay));
             AddAssert("music resumed", () => Game.MusicController.IsPlaying && !Game.MusicController.IsUserPaused);
         }
 
@@ -62,16 +62,16 @@ namespace osu.Game.Tests.Visual.Menus
             AddStep("seek track to 6 second", () => Game.MusicController.SeekTo(6000));
             AddUntilStep("wait for current time to update", () => Game.MusicController.CurrentTrack.CurrentTime > 5000);
 
-            AddStep("trigger music prev action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPrev));
+            AddStep("press previous", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPrev));
             AddAssert("no track change", () => trackChangeQueue.Count == 0);
             AddUntilStep("track restarted", () => Game.MusicController.CurrentTrack.CurrentTime < 5000);
 
-            AddStep("trigger music prev action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPrev));
+            AddStep("press previous", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPrev));
             AddAssert("track changed to previous", () =>
                 trackChangeQueue.Count == 1 &&
                 trackChangeQueue.Dequeue().changeDirection == TrackChangeDirection.Prev);
 
-            AddStep("trigger music next action", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicNext));
+            AddStep("press next", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicNext));
             AddAssert("track changed to next", () =>
                 trackChangeQueue.Count == 1 &&
                 trackChangeQueue.Dequeue().changeDirection == TrackChangeDirection.Next);

From 2b16e2535304263507f338bad1591e4d25cf70e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 6 Sep 2020 18:44:41 +0200
Subject: [PATCH 04604/10326] Revert unnecessary passing down of tuple in test

---
 .../Beatmaps/Formats/LegacyBeatmapEncoderTest.cs          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 6e103af3f0..17d910036f 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -38,8 +38,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoded = decodeFromLegacy(beatmaps_resource_store.GetStream(name), name);
             var decodedAfterEncode = decodeFromLegacy(encodeToLegacy(decoded), name);
 
-            sort(decoded);
-            sort(decodedAfterEncode);
+            sort(decoded.beatmap);
+            sort(decodedAfterEncode.beatmap);
 
             Assert.That(decodedAfterEncode.beatmap.Serialize(), Is.EqualTo(decoded.beatmap.Serialize()));
             Assert.IsTrue(areComboColoursEqual(decodedAfterEncode.beatmapSkin.Configuration, decoded.beatmapSkin.Configuration));
@@ -57,10 +57,10 @@ namespace osu.Game.Tests.Beatmaps.Formats
             return a.ComboColours.SequenceEqual(b.ComboColours);
         }
 
-        private void sort((IBeatmap beatmap, ISkin beatmapSkin) tuple)
+        private void sort(IBeatmap beatmap)
         {
             // Sort control points to ensure a sane ordering, as they may be parsed in different orders. This works because each group contains only uniquely-typed control points.
-            foreach (var g in tuple.beatmap.ControlPointInfo.Groups)
+            foreach (var g in beatmap.ControlPointInfo.Groups)
             {
                 ArrayList.Adapter((IList)g.ControlPoints).Sort(
                     Comparer<ControlPoint>.Create((c1, c2) => string.Compare(c1.GetType().ToString(), c2.GetType().ToString(), StringComparison.Ordinal)));

From b4b9c71f00eab44bb189a3d1936b71edc6219c03 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 6 Sep 2020 10:13:06 -0700
Subject: [PATCH 04605/10326] Make all toolbar tooltips lowercase

---
 osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs | 2 +-
 osu.Game/Overlays/Changelog/ChangelogHeader.cs           | 2 +-
 osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs    | 2 +-
 osu.Game/Overlays/News/NewsHeader.cs                     | 2 +-
 osu.Game/Overlays/NotificationOverlay.cs                 | 4 ++--
 osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs      | 2 +-
 osu.Game/Overlays/SettingsOverlay.cs                     | 2 +-
 osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs           | 4 ++--
 osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
index b7f511271c..6a9a71210a 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.BeatmapListing
             public BeatmapListingTitle()
             {
                 Title = "beatmap listing";
-                Description = "Browse for new beatmaps";
+                Description = "browse for new beatmaps";
                 IconTexture = "Icons/Hexacons/beatmap";
             }
         }
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index bdc59297bb..f4be4328e7 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Overlays.Changelog
             public ChangelogHeaderTitle()
             {
                 Title = "changelog";
-                Description = "Track recent dev updates in the osu! ecosystem";
+                Description = "track recent dev updates in the osu! ecosystem";
                 IconTexture = "Icons/Hexacons/devtools";
             }
         }
diff --git a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
index a964d84c4f..36bf589877 100644
--- a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
+++ b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Dashboard
             public DashboardTitle()
             {
                 Title = "dashboard";
-                Description = "View your friends and other information";
+                Description = "view your friends and other information";
                 IconTexture = "Icons/Hexacons/social";
             }
         }
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index 38ac519387..63174128e7 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.News
             public NewsHeaderTitle()
             {
                 Title = "news";
-                Description = "Get up-to-date on community happenings";
+                Description = "get up-to-date on community happenings";
                 IconTexture = "Icons/Hexacons/news";
             }
         }
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index b7d916c48f..b5714fbcae 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Overlays
     public class NotificationOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
         public string IconTexture => "Icons/Hexacons/notification";
-        public string Title => "Notifications";
-        public string Description => "Waiting for 'ya";
+        public string Title => "notifications";
+        public string Description => "waiting for 'ya";
 
         private const float width = 320;
 
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 7039ab8214..92e22f5873 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Rankings
             public RankingsTitle()
             {
                 Title = "ranking";
-                Description = "Find out who's the best right now";
+                Description = "find out who's the best right now";
                 IconTexture = "Icons/Hexacons/rankings";
             }
         }
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 0532a031f3..e1bcdbbaf0 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays
     {
         public string IconTexture => "Icons/Hexacons/settings";
         public string Title => "settings";
-        public string Description => "Change the way osu! behaves";
+        public string Description => "change the way osu! behaves";
 
         protected override IEnumerable<SettingsSection> CreateSections() => new SettingsSection[]
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
index 6b2c24c0f3..76fbd40d66 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Overlays.Toolbar
         [BackgroundDependencyLoader]
         private void load()
         {
-            TooltipMain = "Home";
-            TooltipSub = "Return to the main menu";
+            TooltipMain = "home";
+            TooltipSub = "return to the main menu";
             SetIcon("Icons/Hexacons/home");
         }
     }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index 754b679599..564fd65719 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Toolbar
             var rInstance = value.CreateInstance();
 
             ruleset.TooltipMain = rInstance.Description;
-            ruleset.TooltipSub = $"Play some {rInstance.Description}";
+            ruleset.TooltipSub = $"play some {rInstance.Description}";
             ruleset.SetIcon(rInstance.CreateIcon());
         }
 

From 8f8f907fc7c3dda37646e8e6a8eca762ca47d32a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Sep 2020 13:27:28 +0900
Subject: [PATCH 04606/10326] Fix missed string

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

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index d1df1fa936..55adf02a45 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays
     {
         public string IconTexture => "Icons/Hexacons/music";
         public string Title => "now playing";
-        public string Description => "Manage the currently playing track";
+        public string Description => "manage the currently playing track";
 
         private const float player_height = 130;
         private const float transition_length = 800;

From daff060c9a0ff86c12c662583b641871d23c8a5e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Sep 2020 15:18:15 +0900
Subject: [PATCH 04607/10326] Hide the game-wide cursor on touch input

---
 osu.Game/Graphics/Cursor/MenuCursorContainer.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs b/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
index 3015c44613..8da80f25ff 100644
--- a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
@@ -5,6 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input;
+using osu.Framework.Input.StateChanges;
 
 namespace osu.Game.Graphics.Cursor
 {
@@ -47,7 +48,10 @@ namespace osu.Game.Graphics.Cursor
         {
             base.Update();
 
-            if (!CanShowCursor)
+            var lastMouseSource = GetContainingInputManager().CurrentState.Mouse.LastSource;
+            bool hasValidInput = lastMouseSource != null && !(lastMouseSource is ISourcedFromTouch);
+
+            if (!hasValidInput || !CanShowCursor)
             {
                 currentTarget?.Cursor?.Hide();
                 currentTarget = null;

From 1a55d92c719c0d2db2eb0d2c977be242fe2afda8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Sep 2020 15:31:05 +0900
Subject: [PATCH 04608/10326] Use local input manager

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

diff --git a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs b/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
index 8da80f25ff..4c7f7957e9 100644
--- a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Graphics.Cursor
         {
             base.Update();
 
-            var lastMouseSource = GetContainingInputManager().CurrentState.Mouse.LastSource;
+            var lastMouseSource = inputManager.CurrentState.Mouse.LastSource;
             bool hasValidInput = lastMouseSource != null && !(lastMouseSource is ISourcedFromTouch);
 
             if (!hasValidInput || !CanShowCursor)

From ecc9c2957ffa287c6eff47fcc49b7dd544f7d0f1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Sep 2020 16:30:05 +0900
Subject: [PATCH 04609/10326] Avoid float precision error in mania conversion

---
 .../Beatmaps/ManiaBeatmapConverter.cs         |  5 ++--
 .../Legacy/DistanceObjectPatternGenerator.cs  | 23 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index b025ac7992..211905835c 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -5,7 +5,6 @@ using osu.Game.Rulesets.Mania.Objects;
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
@@ -167,8 +166,10 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                     var positionData = original as IHasPosition;
 
-                    for (double time = original.StartTime; !Precision.DefinitelyBigger(time, generator.EndTime); time += generator.SegmentDuration)
+                    for (int i = 0; i <= generator.SpanCount; i++)
                     {
+                        double time = original.StartTime + generator.SegmentDuration * i;
+
                         recordNote(time, positionData?.Position ?? Vector2.Zero);
                         computeDensity(time);
                     }
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index d03eb0b3c9..fe146c5324 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -27,8 +27,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
         public readonly double EndTime;
         public readonly double SegmentDuration;
-
-        private readonly int spanCount;
+        public readonly int SpanCount;
 
         private PatternType convertType;
 
@@ -42,20 +41,20 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             var distanceData = hitObject as IHasDistance;
             var repeatsData = hitObject as IHasRepeats;
 
-            spanCount = repeatsData?.SpanCount() ?? 1;
+            SpanCount = repeatsData?.SpanCount() ?? 1;
 
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
             DifficultyControlPoint difficultyPoint = beatmap.ControlPointInfo.DifficultyPointAt(hitObject.StartTime);
 
             // The true distance, accounting for any repeats
-            double distance = (distanceData?.Distance ?? 0) * spanCount;
+            double distance = (distanceData?.Distance ?? 0) * SpanCount;
             // The velocity of the osu! hit object - calculated as the velocity of a slider
             double osuVelocity = osu_base_scoring_distance * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier / timingPoint.BeatLength;
             // The duration of the osu! hit object
             double osuDuration = distance / osuVelocity;
 
             EndTime = hitObject.StartTime + osuDuration;
-            SegmentDuration = (EndTime - HitObject.StartTime) / spanCount;
+            SegmentDuration = (EndTime - HitObject.StartTime) / SpanCount;
         }
 
         public override IEnumerable<Pattern> Generate()
@@ -96,7 +95,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 return pattern;
             }
 
-            if (spanCount > 1)
+            if (SpanCount > 1)
             {
                 if (SegmentDuration <= 90)
                     return generateRandomHoldNotes(HitObject.StartTime, 1);
@@ -104,7 +103,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 if (SegmentDuration <= 120)
                 {
                     convertType |= PatternType.ForceNotStack;
-                    return generateRandomNotes(HitObject.StartTime, spanCount + 1);
+                    return generateRandomNotes(HitObject.StartTime, SpanCount + 1);
                 }
 
                 if (SegmentDuration <= 160)
@@ -117,7 +116,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 if (duration >= 4000)
                     return generateNRandomNotes(HitObject.StartTime, 0.23, 0, 0);
 
-                if (SegmentDuration > 400 && spanCount < TotalColumns - 1 - RandomStart)
+                if (SegmentDuration > 400 && SpanCount < TotalColumns - 1 - RandomStart)
                     return generateTiledHoldNotes(HitObject.StartTime);
 
                 return generateHoldAndNormalNotes(HitObject.StartTime);
@@ -251,7 +250,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             int column = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
             bool increasing = Random.NextDouble() > 0.5;
 
-            for (int i = 0; i <= spanCount; i++)
+            for (int i = 0; i <= SpanCount; i++)
             {
                 addToPattern(pattern, column, startTime, startTime);
                 startTime += SegmentDuration;
@@ -302,7 +301,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
 
-            for (int i = 0; i <= spanCount; i++)
+            for (int i = 0; i <= SpanCount; i++)
             {
                 addToPattern(pattern, nextColumn, startTime, startTime);
 
@@ -393,7 +392,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             var pattern = new Pattern();
 
-            int columnRepeat = Math.Min(spanCount, TotalColumns);
+            int columnRepeat = Math.Min(SpanCount, TotalColumns);
 
             int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
             if (convertType.HasFlag(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
@@ -447,7 +446,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             var rowPattern = new Pattern();
 
-            for (int i = 0; i <= spanCount; i++)
+            for (int i = 0; i <= SpanCount; i++)
             {
                 if (!(ignoreHead && startTime == HitObject.StartTime))
                 {

From c72a8d475552049d602b69a8867ff5f5b440e081 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Sep 2020 17:18:40 +0900
Subject: [PATCH 04610/10326] Add zero-length slider test

---
 .../ManiaBeatmapConversionTest.cs             |  1 +
 ...ero-length-slider-expected-conversion.json | 14 +++++++++++++
 .../Testing/Beatmaps/zero-length-slider.osu   | 20 +++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider.osu

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
index d0ff1fab43..d1e1280c7f 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";
 
         [TestCase("basic")]
+        [TestCase("zero-length-slider")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json
new file mode 100644
index 0000000000..229760cd1c
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json
@@ -0,0 +1,14 @@
+{
+    "Mappings": [{
+        "RandomW": 3083084786,
+        "RandomX": 273326509,
+        "RandomY": 273553282,
+        "RandomZ": 2659838971,
+        "StartTime": 4836,
+        "Objects": [{
+            "StartTime": 4836,
+            "EndTime": 4836,
+            "Column": 0
+        }]
+    }]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider.osu b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider.osu
new file mode 100644
index 0000000000..9b8ac1f9db
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider.osu
@@ -0,0 +1,20 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:1
+CircleSize:4
+OverallDifficulty:1
+ApproachRate:9
+SliderMultiplier:2.5
+SliderTickRate:0.5
+
+[TimingPoints]
+34,431.654676258993,4,1,0,50,1,0
+4782,-66.6666666666667,4,1,0,20,0,0
+
+[HitObjects]
+15,199,4836,22,0,L,1,46.8750017881394
\ No newline at end of file

From 679dc34aa410ec3c6732c52b981537136f5ab0c7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Sep 2020 17:18:54 +0900
Subject: [PATCH 04611/10326] Add test timeouts

---
 osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs | 1 +
 osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs | 1 +
 osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs     | 1 +
 osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs | 1 +
 4 files changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index 8c48158acd..466cbdaf8d 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -14,6 +14,7 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
+    [Timeout(10000)]
     public class CatchBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Catch";
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
index d1e1280c7f..0c57267970 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
@@ -14,6 +14,7 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
+    [Timeout(10000)]
     public class ManiaBeatmapConversionTest : BeatmapConversionTest<ManiaConvertMapping, ConvertValue>
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index cd3daf18a9..7d32895083 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -12,6 +12,7 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
+    [Timeout(10000)]
     public class OsuBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index d0c57b20c0..5e550a5d03 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -12,6 +12,7 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
+    [Timeout(10000)]
     public class TaikoBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Taiko";

From a8a0bfb8aa26012fd6d4d3343eadf58bede72752 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Sep 2020 18:01:56 +0900
Subject: [PATCH 04612/10326] 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 f62ba48953..62397ca028 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.904.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.907.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 526dca421a..1de0633d1f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.904.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.907.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 0cbbba70b9..7187b48907 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.Framework.iOS" Version="2020.904.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.907.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.904.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.907.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 6091714f158ff4675612d43de3bf1be99b1910f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Sep 2020 17:34:30 +0900
Subject: [PATCH 04613/10326] Limit BPM entry via slider to a sane range

---
 osu.Game/Screens/Edit/Timing/TimingSection.cs | 39 ++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index 906644ce14..8e6ea90797 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -12,7 +13,7 @@ namespace osu.Game.Screens.Edit.Timing
 {
     internal class TimingSection : Section<TimingControlPoint>
     {
-        private SettingsSlider<double> bpm;
+        private SettingsSlider<double> bpmSlider;
         private SettingsEnumDropdown<TimeSignatures> timeSignature;
 
         [BackgroundDependencyLoader]
@@ -20,7 +21,7 @@ namespace osu.Game.Screens.Edit.Timing
         {
             Flow.AddRange(new Drawable[]
             {
-                bpm = new BPMSlider
+                bpmSlider = new BPMSlider
                 {
                     Bindable = new TimingControlPoint().BeatLengthBindable,
                     LabelText = "BPM",
@@ -36,7 +37,7 @@ namespace osu.Game.Screens.Edit.Timing
         {
             if (point.NewValue != null)
             {
-                bpm.Bindable = point.NewValue.BeatLengthBindable;
+                bpmSlider.Bindable = point.NewValue.BeatLengthBindable;
                 timeSignature.Bindable = point.NewValue.TimeSignatureBindable;
             }
         }
@@ -54,6 +55,9 @@ namespace osu.Game.Screens.Edit.Timing
 
         private class BPMSlider : SettingsSlider<double>
         {
+            private const double sane_minimum = 60;
+            private const double sane_maximum = 200;
+
             private readonly BindableDouble beatLengthBindable = new BindableDouble();
 
             private BindableDouble bpmBindable;
@@ -63,22 +67,39 @@ namespace osu.Game.Screens.Edit.Timing
                 get => base.Bindable;
                 set
                 {
-                    // incoming will be beatlength
-
+                    // incoming will be beat length, not bpm
                     beatLengthBindable.UnbindBindings();
                     beatLengthBindable.BindTo(value);
 
-                    base.Bindable = bpmBindable = new BindableDouble(beatLengthToBpm(beatLengthBindable.Value))
+                    double initial = beatLengthToBpm(beatLengthBindable.Value);
+
+                    bpmBindable = new BindableDouble(initial)
                     {
-                        MinValue = beatLengthToBpm(beatLengthBindable.MaxValue),
-                        MaxValue = beatLengthToBpm(beatLengthBindable.MinValue),
                         Default = beatLengthToBpm(beatLengthBindable.Default),
                     };
 
-                    bpmBindable.BindValueChanged(bpm => beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue));
+                    updateCurrent(initial);
+
+                    bpmBindable.BindValueChanged(bpm =>
+                    {
+                        updateCurrent(bpm.NewValue);
+                        beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue);
+                    });
+
+                    base.Bindable = bpmBindable;
                 }
             }
 
+            private void updateCurrent(double newValue)
+            {
+                // we use a more sane range for the slider display unless overridden by the user.
+                // if a value comes in outside our range, we should expand temporarily.
+                bpmBindable.MinValue = Math.Min(newValue, sane_minimum);
+                bpmBindable.MaxValue = Math.Max(newValue, sane_maximum);
+
+                bpmBindable.Value = newValue;
+            }
+
             private double beatLengthToBpm(double beatLength) => 60000 / beatLength;
         }
     }

From 86512d6e8d4ad6ba2d20c14bcc76a6fd2708f372 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Sep 2020 17:39:13 +0900
Subject: [PATCH 04614/10326] Add BPM entry textbox

---
 osu.Game/Screens/Edit/Timing/TimingSection.cs | 81 ++++++++++++++-----
 1 file changed, 60 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index 8e6ea90797..6fed4589ce 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Screens.Edit.Timing
@@ -15,16 +16,21 @@ namespace osu.Game.Screens.Edit.Timing
     {
         private SettingsSlider<double> bpmSlider;
         private SettingsEnumDropdown<TimeSignatures> timeSignature;
+        private BPMTextBox bpmTextEntry;
 
         [BackgroundDependencyLoader]
         private void load()
         {
             Flow.AddRange(new Drawable[]
             {
+                bpmTextEntry = new BPMTextBox
+                {
+                    Bindable = new TimingControlPoint().BeatLengthBindable,
+                    Label = "BPM",
+                },
                 bpmSlider = new BPMSlider
                 {
                     Bindable = new TimingControlPoint().BeatLengthBindable,
-                    LabelText = "BPM",
                 },
                 timeSignature = new SettingsEnumDropdown<TimeSignatures>
                 {
@@ -38,6 +44,7 @@ namespace osu.Game.Screens.Edit.Timing
             if (point.NewValue != null)
             {
                 bpmSlider.Bindable = point.NewValue.BeatLengthBindable;
+                bpmTextEntry.Bindable = point.NewValue.BeatLengthBindable;
                 timeSignature.Bindable = point.NewValue.TimeSignatureBindable;
             }
         }
@@ -53,14 +60,63 @@ namespace osu.Game.Screens.Edit.Timing
             };
         }
 
+        private class BPMTextBox : LabelledTextBox
+        {
+            public BPMTextBox()
+            {
+                OnCommit += (val, isNew) =>
+                {
+                    if (!isNew) return;
+
+                    if (double.TryParse(Current.Value, out double doubleVal))
+                    {
+                        try
+                        {
+                            beatLengthBindable.Value = beatLengthToBpm(doubleVal);
+                        }
+                        catch
+                        {
+                            // will restore the previous text value on failure.
+                            beatLengthBindable.TriggerChange();
+                        }
+                    }
+                };
+
+                beatLengthBindable.BindValueChanged(val =>
+                {
+                    Current.Value = beatLengthToBpm(val.NewValue).ToString();
+                });
+            }
+
+            private readonly BindableDouble beatLengthBindable = new BindableDouble();
+
+            public Bindable<double> Bindable
+            {
+                get => beatLengthBindable;
+                set
+                {
+                    // incoming will be beat length, not bpm
+                    beatLengthBindable.UnbindBindings();
+                    beatLengthBindable.BindTo(value);
+                }
+            }
+        }
+
         private class BPMSlider : SettingsSlider<double>
         {
             private const double sane_minimum = 60;
             private const double sane_maximum = 200;
 
             private readonly BindableDouble beatLengthBindable = new BindableDouble();
+            private readonly BindableDouble bpmBindable = new BindableDouble();
 
-            private BindableDouble bpmBindable;
+            public BPMSlider()
+            {
+                beatLengthBindable.BindValueChanged(beatLength => updateCurrent(beatLengthToBpm(beatLength.NewValue)));
+                bpmBindable.BindValueChanged(bpm => bpmBindable.Default = beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue));
+
+                base.Bindable = bpmBindable;
+            }
 
             public override Bindable<double> Bindable
             {
@@ -70,23 +126,6 @@ namespace osu.Game.Screens.Edit.Timing
                     // incoming will be beat length, not bpm
                     beatLengthBindable.UnbindBindings();
                     beatLengthBindable.BindTo(value);
-
-                    double initial = beatLengthToBpm(beatLengthBindable.Value);
-
-                    bpmBindable = new BindableDouble(initial)
-                    {
-                        Default = beatLengthToBpm(beatLengthBindable.Default),
-                    };
-
-                    updateCurrent(initial);
-
-                    bpmBindable.BindValueChanged(bpm =>
-                    {
-                        updateCurrent(bpm.NewValue);
-                        beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue);
-                    });
-
-                    base.Bindable = bpmBindable;
                 }
             }
 
@@ -99,8 +138,8 @@ namespace osu.Game.Screens.Edit.Timing
 
                 bpmBindable.Value = newValue;
             }
-
-            private double beatLengthToBpm(double beatLength) => 60000 / beatLength;
         }
+
+        private static double beatLengthToBpm(double beatLength) => 60000 / beatLength;
     }
 }

From 98676af7bb3b737aeb07f8fbb8f7a821e21372d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Sep 2020 18:18:34 +0900
Subject: [PATCH 04615/10326] Move default declarations for readability

---
 osu.Game/Screens/Edit/Timing/TimingSection.cs | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index 6fed4589ce..0112471522 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -23,15 +23,8 @@ namespace osu.Game.Screens.Edit.Timing
         {
             Flow.AddRange(new Drawable[]
             {
-                bpmTextEntry = new BPMTextBox
-                {
-                    Bindable = new TimingControlPoint().BeatLengthBindable,
-                    Label = "BPM",
-                },
-                bpmSlider = new BPMSlider
-                {
-                    Bindable = new TimingControlPoint().BeatLengthBindable,
-                },
+                bpmTextEntry = new BPMTextBox(),
+                bpmSlider = new BPMSlider(),
                 timeSignature = new SettingsEnumDropdown<TimeSignatures>
                 {
                     LabelText = "Time Signature"
@@ -62,8 +55,12 @@ namespace osu.Game.Screens.Edit.Timing
 
         private class BPMTextBox : LabelledTextBox
         {
+            private readonly BindableNumber<double> beatLengthBindable = new TimingControlPoint().BeatLengthBindable;
+
             public BPMTextBox()
             {
+                Label = "BPM";
+
                 OnCommit += (val, isNew) =>
                 {
                     if (!isNew) return;
@@ -84,12 +81,10 @@ namespace osu.Game.Screens.Edit.Timing
 
                 beatLengthBindable.BindValueChanged(val =>
                 {
-                    Current.Value = beatLengthToBpm(val.NewValue).ToString();
-                });
+                    Current.Value = beatLengthToBpm(val.NewValue).ToString("N2");
+                }, true);
             }
 
-            private readonly BindableDouble beatLengthBindable = new BindableDouble();
-
             public Bindable<double> Bindable
             {
                 get => beatLengthBindable;
@@ -107,12 +102,12 @@ namespace osu.Game.Screens.Edit.Timing
             private const double sane_minimum = 60;
             private const double sane_maximum = 200;
 
-            private readonly BindableDouble beatLengthBindable = new BindableDouble();
+            private readonly BindableNumber<double> beatLengthBindable = new TimingControlPoint().BeatLengthBindable;
             private readonly BindableDouble bpmBindable = new BindableDouble();
 
             public BPMSlider()
             {
-                beatLengthBindable.BindValueChanged(beatLength => updateCurrent(beatLengthToBpm(beatLength.NewValue)));
+                beatLengthBindable.BindValueChanged(beatLength => updateCurrent(beatLengthToBpm(beatLength.NewValue)), true);
                 bpmBindable.BindValueChanged(bpm => bpmBindable.Default = beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue));
 
                 base.Bindable = bpmBindable;

From 1468b9589fd7e843cc53c27dcfa6cddcb7bcf1a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Sep 2020 18:20:47 +0900
Subject: [PATCH 04616/10326] Increase max sane BPM value

---
 osu.Game/Screens/Edit/Timing/TimingSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index 0112471522..879363ba08 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Edit.Timing
         private class BPMSlider : SettingsSlider<double>
         {
             private const double sane_minimum = 60;
-            private const double sane_maximum = 200;
+            private const double sane_maximum = 240;
 
             private readonly BindableNumber<double> beatLengthBindable = new TimingControlPoint().BeatLengthBindable;
             private readonly BindableDouble bpmBindable = new BindableDouble();

From b91a376f0a9438191b285510b88aa2c6b693632b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Sep 2020 20:06:38 +0900
Subject: [PATCH 04617/10326] Split dropdown into separate file

---
 .../Select/CollectionFilterDropdown.cs        | 188 ++++++++++++++++++
 osu.Game/Screens/Select/FilterControl.cs      | 172 ----------------
 2 files changed, 188 insertions(+), 172 deletions(-)
 create mode 100644 osu.Game/Screens/Select/CollectionFilterDropdown.cs

diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
new file mode 100644
index 0000000000..883c2c69f0
--- /dev/null
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -0,0 +1,188 @@
+// Copyright (c) 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.Diagnostics;
+using System.Linq;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Beatmaps;
+using osu.Game.Collections;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+namespace osu.Game.Screens.Select
+{
+    public class CollectionFilterDropdown : OsuDropdown<FilterControl.CollectionFilter>
+    {
+        private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
+        private readonly IBindableList<BeatmapInfo> beatmaps = new BindableList<BeatmapInfo>();
+        private readonly BindableList<FilterControl.CollectionFilter> filters = new BindableList<FilterControl.CollectionFilter>();
+
+        public CollectionFilterDropdown()
+        {
+            ItemSource = filters;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(BeatmapCollectionManager collectionManager)
+        {
+            collections.BindTo(collectionManager.Collections);
+            collections.CollectionChanged += (_, __) => collectionsChanged();
+            collectionsChanged();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(filterChanged, true);
+        }
+
+        /// <summary>
+        /// Occurs when a collection has been added or removed.
+        /// </summary>
+        private void collectionsChanged()
+        {
+            var selectedItem = SelectedItem?.Value?.Collection;
+
+            filters.Clear();
+            filters.Add(new FilterControl.CollectionFilter(null));
+            filters.AddRange(collections.Select(c => new FilterControl.CollectionFilter(c)));
+
+            Current.Value = filters.SingleOrDefault(f => f.Collection == selectedItem) ?? filters[0];
+        }
+
+        /// <summary>
+        /// Occurs when the <see cref="FilterControl.CollectionFilter"/> selection has changed.
+        /// </summary>
+        private void filterChanged(ValueChangedEvent<FilterControl.CollectionFilter> filter)
+        {
+            beatmaps.CollectionChanged -= filterBeatmapsChanged;
+
+            if (filter.OldValue?.Collection != null)
+                beatmaps.UnbindFrom(filter.OldValue.Collection.Beatmaps);
+
+            if (filter.NewValue?.Collection != null)
+                beatmaps.BindTo(filter.NewValue.Collection.Beatmaps);
+
+            beatmaps.CollectionChanged += filterBeatmapsChanged;
+        }
+
+        /// <summary>
+        /// Occurs when the beatmaps contained by a <see cref="BeatmapCollection"/> have changed.
+        /// </summary>
+        private void filterBeatmapsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            // The filtered beatmaps have changed, without the filter having changed itself. So a change in filter must be notified.
+            // Note that this does NOT propagate to bound bindables, so the FilterControl must bind directly to the value change event of this bindable.
+            Current.TriggerChange();
+        }
+
+        protected override string GenerateItemText(FilterControl.CollectionFilter item) => item.Collection?.Name.Value ?? "All beatmaps";
+
+        protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader();
+
+        protected override DropdownMenu CreateMenu() => new CollectionDropdownMenu();
+
+        private class CollectionDropdownHeader : OsuDropdownHeader
+        {
+            public CollectionDropdownHeader()
+            {
+                Height = 25;
+                Icon.Size = new Vector2(16);
+                Foreground.Padding = new MarginPadding { Top = 4, Bottom = 4, Left = 8, Right = 4 };
+            }
+        }
+
+        private class CollectionDropdownMenu : OsuDropdownMenu
+        {
+            public CollectionDropdownMenu()
+            {
+                MaxHeight = 200;
+            }
+
+            protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new CollectionDropdownMenuItem(item);
+        }
+
+        private class CollectionDropdownMenuItem : OsuDropdownMenu.DrawableOsuDropdownMenuItem
+        {
+            [Resolved]
+            private OsuColour colours { get; set; }
+
+            [Resolved]
+            private IBindable<WorkingBeatmap> beatmap { get; set; }
+
+            [CanBeNull]
+            private readonly BindableList<BeatmapInfo> collectionBeatmaps;
+
+            private IconButton addOrRemoveButton;
+
+            public CollectionDropdownMenuItem(MenuItem item)
+                : base(item)
+            {
+                collectionBeatmaps = ((DropdownMenuItem<FilterControl.CollectionFilter>)item).Value.Collection?.Beatmaps.GetBoundCopy();
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                AddRangeInternal(new Drawable[]
+                {
+                    addOrRemoveButton = new IconButton
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        X = -OsuScrollContainer.SCROLL_BAR_HEIGHT,
+                        Scale = new Vector2(0.75f),
+                        Alpha = collectionBeatmaps == null ? 0 : 1,
+                        Action = addOrRemove
+                    }
+                });
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                if (collectionBeatmaps != null)
+                {
+                    collectionBeatmaps.CollectionChanged += (_, __) => collectionChanged();
+                    beatmap.BindValueChanged(_ => collectionChanged(), true);
+                }
+            }
+
+            private void collectionChanged()
+            {
+                Debug.Assert(collectionBeatmaps != null);
+
+                addOrRemoveButton.Enabled.Value = !beatmap.IsDefault;
+
+                if (collectionBeatmaps.Contains(beatmap.Value.BeatmapInfo))
+                {
+                    addOrRemoveButton.Icon = FontAwesome.Solid.MinusSquare;
+                    addOrRemoveButton.IconColour = colours.Red;
+                }
+                else
+                {
+                    addOrRemoveButton.Icon = FontAwesome.Solid.PlusSquare;
+                    addOrRemoveButton.IconColour = colours.Green;
+                }
+            }
+
+            private void addOrRemove()
+            {
+                Debug.Assert(collectionBeatmaps != null);
+
+                if (!collectionBeatmaps.Remove(beatmap.Value.BeatmapInfo))
+                    collectionBeatmaps.Add(beatmap.Value.BeatmapInfo);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index a66bcfb3b1..706909e71e 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Specialized;
-using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -11,14 +9,11 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 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.Rulesets;
@@ -204,173 +199,6 @@ namespace osu.Game.Screens.Select
             updateCriteria();
         }
 
-        private class CollectionFilterDropdown : OsuDropdown<CollectionFilter>
-        {
-            private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
-            private readonly IBindableList<BeatmapInfo> beatmaps = new BindableList<BeatmapInfo>();
-            private readonly BindableList<CollectionFilter> filters = new BindableList<CollectionFilter>();
-
-            public CollectionFilterDropdown()
-            {
-                ItemSource = filters;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(BeatmapCollectionManager collectionManager)
-            {
-                collections.BindTo(collectionManager.Collections);
-                collections.CollectionChanged += (_, __) => collectionsChanged();
-                collectionsChanged();
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                Current.BindValueChanged(filterChanged, true);
-            }
-
-            /// <summary>
-            /// Occurs when a collection has been added or removed.
-            /// </summary>
-            private void collectionsChanged()
-            {
-                var selectedItem = SelectedItem?.Value?.Collection;
-
-                filters.Clear();
-                filters.Add(new CollectionFilter(null));
-                filters.AddRange(collections.Select(c => new CollectionFilter(c)));
-
-                Current.Value = filters.SingleOrDefault(f => f.Collection == selectedItem) ?? filters[0];
-            }
-
-            /// <summary>
-            /// Occurs when the <see cref="CollectionFilter"/> selection has changed.
-            /// </summary>
-            private void filterChanged(ValueChangedEvent<CollectionFilter> filter)
-            {
-                beatmaps.CollectionChanged -= filterBeatmapsChanged;
-
-                if (filter.OldValue?.Collection != null)
-                    beatmaps.UnbindFrom(filter.OldValue.Collection.Beatmaps);
-
-                if (filter.NewValue?.Collection != null)
-                    beatmaps.BindTo(filter.NewValue.Collection.Beatmaps);
-
-                beatmaps.CollectionChanged += filterBeatmapsChanged;
-            }
-
-            /// <summary>
-            /// Occurs when the beatmaps contained by a <see cref="BeatmapCollection"/> have changed.
-            /// </summary>
-            private void filterBeatmapsChanged(object sender, NotifyCollectionChangedEventArgs e)
-            {
-                // The filtered beatmaps have changed, without the filter having changed itself. So a change in filter must be notified.
-                // Note that this does NOT propagate to bound bindables, so the FilterControl must bind directly to the value change event of this bindable.
-                Current.TriggerChange();
-            }
-
-            protected override string GenerateItemText(CollectionFilter item) => item.Collection?.Name.Value ?? "All beatmaps";
-
-            protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader();
-
-            protected override DropdownMenu CreateMenu() => new CollectionDropdownMenu();
-
-            private class CollectionDropdownHeader : OsuDropdownHeader
-            {
-                public CollectionDropdownHeader()
-                {
-                    Height = 25;
-                    Icon.Size = new Vector2(16);
-                    Foreground.Padding = new MarginPadding { Top = 4, Bottom = 4, Left = 8, Right = 4 };
-                }
-            }
-
-            private class CollectionDropdownMenu : OsuDropdownMenu
-            {
-                public CollectionDropdownMenu()
-                {
-                    MaxHeight = 200;
-                }
-
-                protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new CollectionDropdownMenuItem(item);
-            }
-
-            private class CollectionDropdownMenuItem : OsuDropdownMenu.DrawableOsuDropdownMenuItem
-            {
-                [Resolved]
-                private OsuColour colours { get; set; }
-
-                [Resolved]
-                private IBindable<WorkingBeatmap> beatmap { get; set; }
-
-                [CanBeNull]
-                private readonly BindableList<BeatmapInfo> collectionBeatmaps;
-
-                private IconButton addOrRemoveButton;
-
-                public CollectionDropdownMenuItem(MenuItem item)
-                    : base(item)
-                {
-                    collectionBeatmaps = ((DropdownMenuItem<CollectionFilter>)item).Value.Collection?.Beatmaps.GetBoundCopy();
-                }
-
-                [BackgroundDependencyLoader]
-                private void load()
-                {
-                    AddRangeInternal(new Drawable[]
-                    {
-                        addOrRemoveButton = new IconButton
-                        {
-                            Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreRight,
-                            X = -OsuScrollContainer.SCROLL_BAR_HEIGHT,
-                            Scale = new Vector2(0.75f),
-                            Alpha = collectionBeatmaps == null ? 0 : 1,
-                            Action = addOrRemove
-                        }
-                    });
-                }
-
-                protected override void LoadComplete()
-                {
-                    base.LoadComplete();
-
-                    if (collectionBeatmaps != null)
-                    {
-                        collectionBeatmaps.CollectionChanged += (_, __) => collectionChanged();
-                        beatmap.BindValueChanged(_ => collectionChanged(), true);
-                    }
-                }
-
-                private void collectionChanged()
-                {
-                    Debug.Assert(collectionBeatmaps != null);
-
-                    addOrRemoveButton.Enabled.Value = !beatmap.IsDefault;
-
-                    if (collectionBeatmaps.Contains(beatmap.Value.BeatmapInfo))
-                    {
-                        addOrRemoveButton.Icon = FontAwesome.Solid.MinusSquare;
-                        addOrRemoveButton.IconColour = colours.Red;
-                    }
-                    else
-                    {
-                        addOrRemoveButton.Icon = FontAwesome.Solid.PlusSquare;
-                        addOrRemoveButton.IconColour = colours.Green;
-                    }
-                }
-
-                private void addOrRemove()
-                {
-                    Debug.Assert(collectionBeatmaps != null);
-
-                    if (!collectionBeatmaps.Remove(beatmap.Value.BeatmapInfo))
-                        collectionBeatmaps.Add(beatmap.Value.BeatmapInfo);
-                }
-            }
-        }
-
         public class CollectionFilter
         {
             [CanBeNull]

From 120dfd50a6c6ddb4f74f8cb63dd81c9026920672 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Sep 2020 20:29:28 +0900
Subject: [PATCH 04618/10326] Fix collection names not updating in dropdown

---
 .../Select/CollectionFilterDropdown.cs        | 47 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index 883c2c69f0..6b5d63771f 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -87,18 +87,47 @@ namespace osu.Game.Screens.Select
 
         protected override string GenerateItemText(FilterControl.CollectionFilter item) => item.Collection?.Name.Value ?? "All beatmaps";
 
-        protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader();
+        protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader
+        {
+            SelectedItem = { BindTarget = Current }
+        };
 
         protected override DropdownMenu CreateMenu() => new CollectionDropdownMenu();
 
         private class CollectionDropdownHeader : OsuDropdownHeader
         {
+            public readonly Bindable<FilterControl.CollectionFilter> SelectedItem = new Bindable<FilterControl.CollectionFilter>();
+            private readonly Bindable<string> collectionName = new Bindable<string>();
+
+            protected override string Label
+            {
+                get => base.Label;
+                set { } // See updateText().
+            }
+
             public CollectionDropdownHeader()
             {
                 Height = 25;
                 Icon.Size = new Vector2(16);
                 Foreground.Padding = new MarginPadding { Top = 4, Bottom = 4, Left = 8, Right = 4 };
             }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                SelectedItem.BindValueChanged(_ => updateBindable(), true);
+            }
+
+            private void updateBindable()
+            {
+                collectionName.UnbindAll();
+                collectionName.BindTo(SelectedItem.Value.Collection?.Name ?? new Bindable<string>("All beatmaps"));
+                collectionName.BindValueChanged(_ => updateText(), true);
+            }
+
+            // Dropdowns don't bind to value changes, so the real name is copied directly from the selected item here.
+            private void updateText() => base.Label = collectionName.Value;
         }
 
         private class CollectionDropdownMenu : OsuDropdownMenu
@@ -113,6 +142,9 @@ namespace osu.Game.Screens.Select
 
         private class CollectionDropdownMenuItem : OsuDropdownMenu.DrawableOsuDropdownMenuItem
         {
+            [NotNull]
+            protected new FilterControl.CollectionFilter Item => ((DropdownMenuItem<FilterControl.CollectionFilter>)base.Item).Value;
+
             [Resolved]
             private OsuColour colours { get; set; }
 
@@ -122,12 +154,17 @@ namespace osu.Game.Screens.Select
             [CanBeNull]
             private readonly BindableList<BeatmapInfo> collectionBeatmaps;
 
+            [NotNull]
+            private readonly Bindable<string> collectionName;
+
             private IconButton addOrRemoveButton;
+            private Content content;
 
             public CollectionDropdownMenuItem(MenuItem item)
                 : base(item)
             {
-                collectionBeatmaps = ((DropdownMenuItem<FilterControl.CollectionFilter>)item).Value.Collection?.Beatmaps.GetBoundCopy();
+                collectionBeatmaps = Item.Collection?.Beatmaps.GetBoundCopy();
+                collectionName = Item.Collection?.Name.GetBoundCopy() ?? new Bindable<string>("All beatmaps");
             }
 
             [BackgroundDependencyLoader]
@@ -156,6 +193,10 @@ namespace osu.Game.Screens.Select
                     collectionBeatmaps.CollectionChanged += (_, __) => collectionChanged();
                     beatmap.BindValueChanged(_ => collectionChanged(), true);
                 }
+
+                // Although the DrawableMenuItem binds to value changes of the item's text, the item is an internal implementation detail of Dropdown that has no knowledge
+                // of the underlying CollectionFilter value and its accompanying name, so the real name has to be copied here. Without this, the collection name wouldn't update when changed.
+                collectionName.BindValueChanged(name => content.Text = name.NewValue, true);
             }
 
             private void collectionChanged()
@@ -183,6 +224,8 @@ namespace osu.Game.Screens.Select
                 if (!collectionBeatmaps.Remove(beatmap.Value.BeatmapInfo))
                     collectionBeatmaps.Add(beatmap.Value.BeatmapInfo);
             }
+
+            protected override Drawable CreateContent() => content = (Content)base.CreateContent();
         }
     }
 }

From c1d255a04c74c05949bfbe3d9b3ec784a4834047 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Sep 2020 20:44:39 +0900
Subject: [PATCH 04619/10326] Split filter control into separate class

---
 osu.Game/Screens/Select/CollectionFilter.cs   | 24 +++++++++++++++++++
 .../Select/CollectionFilterDropdown.cs        | 18 +++++++-------
 osu.Game/Screens/Select/FilterControl.cs      | 18 --------------
 osu.Game/Screens/Select/FilterCriteria.cs     |  2 +-
 4 files changed, 34 insertions(+), 28 deletions(-)
 create mode 100644 osu.Game/Screens/Select/CollectionFilter.cs

diff --git a/osu.Game/Screens/Select/CollectionFilter.cs b/osu.Game/Screens/Select/CollectionFilter.cs
new file mode 100644
index 0000000000..e1f19b41c3
--- /dev/null
+++ b/osu.Game/Screens/Select/CollectionFilter.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 System.Linq;
+using JetBrains.Annotations;
+using osu.Game.Beatmaps;
+using osu.Game.Collections;
+
+namespace osu.Game.Screens.Select
+{
+    public class CollectionFilter
+    {
+        [CanBeNull]
+        public readonly BeatmapCollection Collection;
+
+        public CollectionFilter([CanBeNull] BeatmapCollection collection)
+        {
+            Collection = collection;
+        }
+
+        public virtual bool ContainsBeatmap(BeatmapInfo beatmap)
+            => Collection?.Beatmaps.Any(b => b.Equals(beatmap)) ?? true;
+    }
+}
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index 6b5d63771f..ae2f09e11a 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -19,11 +19,11 @@ using osuTK;
 
 namespace osu.Game.Screens.Select
 {
-    public class CollectionFilterDropdown : OsuDropdown<FilterControl.CollectionFilter>
+    public class CollectionFilterDropdown : OsuDropdown<CollectionFilter>
     {
         private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
         private readonly IBindableList<BeatmapInfo> beatmaps = new BindableList<BeatmapInfo>();
-        private readonly BindableList<FilterControl.CollectionFilter> filters = new BindableList<FilterControl.CollectionFilter>();
+        private readonly BindableList<CollectionFilter> filters = new BindableList<CollectionFilter>();
 
         public CollectionFilterDropdown()
         {
@@ -53,16 +53,16 @@ namespace osu.Game.Screens.Select
             var selectedItem = SelectedItem?.Value?.Collection;
 
             filters.Clear();
-            filters.Add(new FilterControl.CollectionFilter(null));
-            filters.AddRange(collections.Select(c => new FilterControl.CollectionFilter(c)));
+            filters.Add(new CollectionFilter(null));
+            filters.AddRange(collections.Select(c => new CollectionFilter(c)));
 
             Current.Value = filters.SingleOrDefault(f => f.Collection == selectedItem) ?? filters[0];
         }
 
         /// <summary>
-        /// Occurs when the <see cref="FilterControl.CollectionFilter"/> selection has changed.
+        /// Occurs when the <see cref="CollectionFilter"/> selection has changed.
         /// </summary>
-        private void filterChanged(ValueChangedEvent<FilterControl.CollectionFilter> filter)
+        private void filterChanged(ValueChangedEvent<CollectionFilter> filter)
         {
             beatmaps.CollectionChanged -= filterBeatmapsChanged;
 
@@ -85,7 +85,7 @@ namespace osu.Game.Screens.Select
             Current.TriggerChange();
         }
 
-        protected override string GenerateItemText(FilterControl.CollectionFilter item) => item.Collection?.Name.Value ?? "All beatmaps";
+        protected override string GenerateItemText(CollectionFilter item) => item.Collection?.Name.Value ?? "All beatmaps";
 
         protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader
         {
@@ -96,7 +96,7 @@ namespace osu.Game.Screens.Select
 
         private class CollectionDropdownHeader : OsuDropdownHeader
         {
-            public readonly Bindable<FilterControl.CollectionFilter> SelectedItem = new Bindable<FilterControl.CollectionFilter>();
+            public readonly Bindable<CollectionFilter> SelectedItem = new Bindable<CollectionFilter>();
             private readonly Bindable<string> collectionName = new Bindable<string>();
 
             protected override string Label
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Select
         private class CollectionDropdownMenuItem : OsuDropdownMenu.DrawableOsuDropdownMenuItem
         {
             [NotNull]
-            protected new FilterControl.CollectionFilter Item => ((DropdownMenuItem<FilterControl.CollectionFilter>)base.Item).Value;
+            protected new CollectionFilter Item => ((DropdownMenuItem<CollectionFilter>)base.Item).Value;
 
             [Resolved]
             private OsuColour colours { get; set; }
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 706909e71e..41ce0d65cd 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -2,16 +2,12 @@
 // 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.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps;
-using osu.Game.Collections;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -199,20 +195,6 @@ namespace osu.Game.Screens.Select
             updateCriteria();
         }
 
-        public class CollectionFilter
-        {
-            [CanBeNull]
-            public readonly BeatmapCollection Collection;
-
-            public CollectionFilter([CanBeNull] BeatmapCollection collection)
-            {
-                Collection = collection;
-            }
-
-            public virtual bool ContainsBeatmap(BeatmapInfo beatmap)
-                => Collection?.Beatmaps.Any(b => b.Equals(beatmap)) ?? true;
-        }
-
         public void Deactivate()
         {
             searchTextBox.ReadOnly = true;
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 5a5c0e1b50..af4802f308 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public FilterControl.CollectionFilter Collection;
+        public CollectionFilter Collection;
 
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct

From 98e9c4dc256e3397d3ed2fa15c269bc7f0239943 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Sep 2020 21:08:48 +0900
Subject: [PATCH 04620/10326] General refactorings

---
 .../Collections/TestSceneCollectionDialog.cs  |  2 +-
 osu.Game/Collections/BeatmapCollection.cs     | 47 +++++++++++++++++++
 .../Collections/BeatmapCollectionManager.cs   | 27 +----------
 ...onDialog.cs => ManageCollectionsDialog.cs} |  4 +-
 osu.Game/OsuGame.cs                           |  2 +-
 .../Carousel/DrawableCarouselBeatmap.cs       |  8 ++--
 .../Carousel/DrawableCarouselBeatmapSet.cs    |  8 ++--
 osu.Game/Screens/Select/CollectionFilter.cs   | 24 ++++++++++
 .../Select/CollectionFilterDropdown.cs        |  8 +++-
 osu.Game/Screens/Select/FilterCriteria.cs     |  5 ++
 10 files changed, 95 insertions(+), 40 deletions(-)
 create mode 100644 osu.Game/Collections/BeatmapCollection.cs
 rename osu.Game/Collections/{ManageCollectionDialog.cs => ManageCollectionsDialog.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs
index 247d27f67a..5782e627ba 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Collections
         {
             Children = new Drawable[]
             {
-                new ManageCollectionDialog { State = { Value = Visibility.Visible } },
+                new ManageCollectionsDialog { State = { Value = Visibility.Visible } },
                 dialogOverlay = new DialogOverlay()
             };
         }
diff --git a/osu.Game/Collections/BeatmapCollection.cs b/osu.Game/Collections/BeatmapCollection.cs
new file mode 100644
index 0000000000..7e4b15ecf9
--- /dev/null
+++ b/osu.Game/Collections/BeatmapCollection.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 System;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Collections
+{
+    /// <summary>
+    /// A collection of beatmaps grouped by a name.
+    /// </summary>
+    public class BeatmapCollection
+    {
+        /// <summary>
+        /// Invoked whenever any change occurs on this <see cref="BeatmapCollection"/>.
+        /// </summary>
+        public event Action Changed;
+
+        /// <summary>
+        /// The collection's name.
+        /// </summary>
+        public readonly Bindable<string> Name = new Bindable<string>();
+
+        /// <summary>
+        /// The beatmaps contained by the collection.
+        /// </summary>
+        public readonly BindableList<BeatmapInfo> Beatmaps = new BindableList<BeatmapInfo>();
+
+        /// <summary>
+        /// The date when this collection was last modified.
+        /// </summary>
+        public DateTimeOffset LastModifyDate { get; private set; } = DateTimeOffset.UtcNow;
+
+        public BeatmapCollection()
+        {
+            Beatmaps.CollectionChanged += (_, __) => onChange();
+            Name.ValueChanged += _ => onChange();
+        }
+
+        private void onChange()
+        {
+            LastModifyDate = DateTimeOffset.Now;
+            Changed?.Invoke();
+        }
+    }
+}
diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
index 3e5976300f..ed07f0d3e2 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Collections
     public class BeatmapCollectionManager : CompositeDrawable
     {
         /// <summary>
-        /// Database version in YYYYMMDD format (matching stable).
+        /// Database version in stable-compatible YYYYMMDD format.
         /// </summary>
         private const int database_version = 30000000;
 
@@ -213,29 +213,4 @@ namespace osu.Game.Collections
             save();
         }
     }
-
-    public class BeatmapCollection
-    {
-        /// <summary>
-        /// Invoked whenever any change occurs on this <see cref="BeatmapCollection"/>.
-        /// </summary>
-        public event Action Changed;
-
-        public readonly Bindable<string> Name = new Bindable<string>();
-
-        public readonly BindableList<BeatmapInfo> Beatmaps = new BindableList<BeatmapInfo>();
-
-        public DateTimeOffset LastModifyTime { get; private set; }
-
-        public BeatmapCollection()
-        {
-            LastModifyTime = DateTimeOffset.UtcNow;
-
-            Beatmaps.CollectionChanged += (_, __) =>
-            {
-                LastModifyTime = DateTimeOffset.Now;
-                Changed?.Invoke();
-            };
-        }
-    }
 }
diff --git a/osu.Game/Collections/ManageCollectionDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
similarity index 97%
rename from osu.Game/Collections/ManageCollectionDialog.cs
rename to osu.Game/Collections/ManageCollectionsDialog.cs
index 1e222a9c71..f2aedb1c29 100644
--- a/osu.Game/Collections/ManageCollectionDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Collections
 {
-    public class ManageCollectionDialog : OsuFocusedOverlayContainer
+    public class ManageCollectionsDialog : OsuFocusedOverlayContainer
     {
         private const double enter_duration = 500;
         private const double exit_duration = 200;
@@ -21,7 +21,7 @@ namespace osu.Game.Collections
         [Resolved]
         private BeatmapCollectionManager collectionManager { get; set; }
 
-        public ManageCollectionDialog()
+        public ManageCollectionsDialog()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 701a65dbeb..8434ee11fa 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -618,7 +618,7 @@ namespace osu.Game
             loadComponentSingleFile(CreateUpdateManager(), Add, true);
 
             // overlay elements
-            loadComponentSingleFile(new ManageCollectionDialog(), overlayContent.Add, true);
+            loadComponentSingleFile(new ManageCollectionsDialog(), overlayContent.Add, true);
             loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(dashboard = new DashboardOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(news = new NewsOverlay(), overlayContent.Add, true);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 6c43bf5bed..008cf85018 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Select.Carousel
         private BeatmapCollectionManager collectionManager { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private ManageCollectionDialog manageCollectionDialog { get; set; }
+        private ManageCollectionsDialog manageCollectionsDialog { get; set; }
 
         private IBindable<StarDifficulty> starDifficultyBindable;
         private CancellationTokenSource starDifficultyCancellationSource;
@@ -227,9 +227,9 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmap.OnlineBeatmapID.HasValue && beatmapOverlay != null)
                     items.Add(new OsuMenuItem("Details", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
 
-                var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem).ToList();
-                if (manageCollectionDialog != null)
-                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionDialog.Show));
+                var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyDate).Take(3).Select(createCollectionMenuItem).ToList();
+                if (manageCollectionsDialog != null)
+                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
                 items.Add(new OsuMenuItem("Add to...") { Items = collectionItems });
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index fc262730cb..fe0ad31b32 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Select.Carousel
         private BeatmapCollectionManager collectionManager { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private ManageCollectionDialog manageCollectionDialog { get; set; }
+        private ManageCollectionsDialog manageCollectionsDialog { get; set; }
 
         private readonly BeatmapSetInfo beatmapSet;
 
@@ -148,9 +148,9 @@ namespace osu.Game.Screens.Select.Carousel
                 if (dialogOverlay != null)
                     items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay.Push(new BeatmapDeleteDialog(beatmapSet))));
 
-                var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem).ToList();
-                if (manageCollectionDialog != null)
-                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionDialog.Show));
+                var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyDate).Take(3).Select(createCollectionMenuItem).ToList();
+                if (manageCollectionsDialog != null)
+                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
                 items.Add(new OsuMenuItem("Add all to...") { Items = collectionItems });
 
diff --git a/osu.Game/Screens/Select/CollectionFilter.cs b/osu.Game/Screens/Select/CollectionFilter.cs
index e1f19b41c3..7628ed391e 100644
--- a/osu.Game/Screens/Select/CollectionFilter.cs
+++ b/osu.Game/Screens/Select/CollectionFilter.cs
@@ -3,21 +3,45 @@
 
 using System.Linq;
 using JetBrains.Annotations;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 
 namespace osu.Game.Screens.Select
 {
+    /// <summary>
+    /// A <see cref="BeatmapCollection"/> filter.
+    /// </summary>
     public class CollectionFilter
     {
+        /// <summary>
+        /// The collection to filter beatmaps from.
+        /// May be null to not filter by collection (include all beatmaps).
+        /// </summary>
         [CanBeNull]
         public readonly BeatmapCollection Collection;
 
+        /// <summary>
+        /// The name of the collection.
+        /// </summary>
+        [NotNull]
+        public readonly Bindable<string> CollectionName;
+
+        /// <summary>
+        /// Creates a new <see cref="CollectionFilter"/>.
+        /// </summary>
+        /// <param name="collection">The collection to filter beatmaps from.</param>
         public CollectionFilter([CanBeNull] BeatmapCollection collection)
         {
             Collection = collection;
+            CollectionName = Collection?.Name.GetBoundCopy() ?? new Bindable<string>("All beatmaps");
         }
 
+        /// <summary>
+        /// Whether the collection contains a given beatmap.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to check.</param>
+        /// <returns>Whether <see cref="Collection"/> contains <paramref name="beatmap"/>.</returns>
         public virtual bool ContainsBeatmap(BeatmapInfo beatmap)
             => Collection?.Beatmaps.Any(b => b.Equals(beatmap)) ?? true;
     }
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index ae2f09e11a..02484f6c64 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -19,6 +19,9 @@ using osuTK;
 
 namespace osu.Game.Screens.Select
 {
+    /// <summary>
+    /// A dropdown to select the <see cref="CollectionFilter"/> to filter beatmaps using.
+    /// </summary>
     public class CollectionFilterDropdown : OsuDropdown<CollectionFilter>
     {
         private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
@@ -64,6 +67,7 @@ namespace osu.Game.Screens.Select
         /// </summary>
         private void filterChanged(ValueChangedEvent<CollectionFilter> filter)
         {
+            // Binding the beatmaps will trigger a collection change event, which results in an infinite-loop. This is rebound later, when it's safe to do so.
             beatmaps.CollectionChanged -= filterBeatmapsChanged;
 
             if (filter.OldValue?.Collection != null)
@@ -122,7 +126,7 @@ namespace osu.Game.Screens.Select
             private void updateBindable()
             {
                 collectionName.UnbindAll();
-                collectionName.BindTo(SelectedItem.Value.Collection?.Name ?? new Bindable<string>("All beatmaps"));
+                collectionName.BindTo(SelectedItem.Value.CollectionName);
                 collectionName.BindValueChanged(_ => updateText(), true);
             }
 
@@ -164,7 +168,7 @@ namespace osu.Game.Screens.Select
                 : base(item)
             {
                 collectionBeatmaps = Item.Collection?.Beatmaps.GetBoundCopy();
-                collectionName = Item.Collection?.Name.GetBoundCopy() ?? new Bindable<string>("All beatmaps");
+                collectionName = Item.CollectionName.GetBoundCopy();
             }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index af4802f308..acab982945 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Select.Filter;
@@ -51,6 +52,10 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        /// <summary>
+        /// The collection to filter beatmaps from.
+        /// </summary>
+        [CanBeNull]
         public CollectionFilter Collection;
 
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>

From ad625ecc7a199e3f93a4e827312d07b4fbeee957 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Sep 2020 22:10:12 +0900
Subject: [PATCH 04621/10326] Add collection IO tests

---
 .../Collections/IO/ImportCollectionsTest.cs   | 215 ++++++++++++++++++
 .../Resources/Collections/collections.db      | Bin 0 -> 473 bytes
 .../Collections/BeatmapCollectionManager.cs   |  22 +-
 3 files changed, 232 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
 create mode 100644 osu.Game.Tests/Resources/Collections/collections.db

diff --git a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
new file mode 100644
index 0000000000..7d772d3989
--- /dev/null
+++ b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
@@ -0,0 +1,215 @@
+// Copyright (c) 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.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Platform;
+using osu.Game.Beatmaps;
+using osu.Game.Collections;
+using osu.Game.Tests.Resources;
+
+namespace osu.Game.Tests.Collections.IO
+{
+    [TestFixture]
+    public class ImportCollectionsTest
+    {
+        [Test]
+        public async Task TestImportEmptyDatabase()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportEmptyDatabase"))
+            {
+                try
+                {
+                    var osu = await loadOsu(host);
+
+                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    await collectionManager.Import(new MemoryStream());
+
+                    Assert.That(collectionManager.Collections.Count, Is.Zero);
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public async Task TestImportWithNoBeatmaps()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportWithNoBeatmaps"))
+            {
+                try
+                {
+                    var osu = await loadOsu(host);
+
+                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
+
+                    Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
+
+                    Assert.That(collectionManager.Collections[0].Name.Value, Is.EqualTo("First"));
+                    Assert.That(collectionManager.Collections[0].Beatmaps.Count, Is.Zero);
+
+                    Assert.That(collectionManager.Collections[1].Name.Value, Is.EqualTo("Second"));
+                    Assert.That(collectionManager.Collections[1].Beatmaps.Count, Is.Zero);
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public async Task TestImportWithBeatmaps()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportWithBeatmaps"))
+            {
+                try
+                {
+                    var osu = await loadOsu(host, true);
+
+                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
+
+                    Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
+
+                    Assert.That(collectionManager.Collections[0].Name.Value, Is.EqualTo("First"));
+                    Assert.That(collectionManager.Collections[0].Beatmaps.Count, Is.EqualTo(1));
+
+                    Assert.That(collectionManager.Collections[1].Name.Value, Is.EqualTo("Second"));
+                    Assert.That(collectionManager.Collections[1].Beatmaps.Count, Is.EqualTo(12));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public async Task TestImportMalformedDatabase()
+        {
+            bool exceptionThrown = false;
+            UnhandledExceptionEventHandler setException = (_, __) => exceptionThrown = true;
+
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportMalformedDatabase"))
+            {
+                try
+                {
+                    AppDomain.CurrentDomain.UnhandledException += setException;
+
+                    var osu = await loadOsu(host, true);
+
+                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+
+                    using (var ms = new MemoryStream())
+                    {
+                        using (var bw = new BinaryWriter(ms, Encoding.UTF8, true))
+                        {
+                            for (int i = 0; i < 10000; i++)
+                                bw.Write((byte)i);
+                        }
+
+                        ms.Seek(0, SeekOrigin.Begin);
+
+                        await collectionManager.Import(ms);
+                    }
+
+                    Assert.That(host.UpdateThread.Running, Is.True);
+                    Assert.That(exceptionThrown, Is.False);
+                    Assert.That(collectionManager.Collections.Count, Is.EqualTo(0));
+                }
+                finally
+                {
+                    host.Exit();
+                    AppDomain.CurrentDomain.UnhandledException -= setException;
+                }
+            }
+        }
+
+        [Test]
+        public async Task TestSaveAndReload()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestSaveAndReload"))
+            {
+                try
+                {
+                    var osu = await loadOsu(host, true);
+
+                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
+
+                    // Move first beatmap from second collection into the first.
+                    collectionManager.Collections[0].Beatmaps.Add(collectionManager.Collections[1].Beatmaps[0]);
+                    collectionManager.Collections[1].Beatmaps.RemoveAt(0);
+
+                    // Rename the second collecction.
+                    collectionManager.Collections[1].Name.Value = "Another";
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+
+            using (HeadlessGameHost host = new HeadlessGameHost("TestSaveAndReload"))
+            {
+                try
+                {
+                    var osu = await loadOsu(host, true);
+
+                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+
+                    Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
+
+                    Assert.That(collectionManager.Collections[0].Name.Value, Is.EqualTo("First"));
+                    Assert.That(collectionManager.Collections[0].Beatmaps.Count, Is.EqualTo(2));
+
+                    Assert.That(collectionManager.Collections[1].Name.Value, Is.EqualTo("Another"));
+                    Assert.That(collectionManager.Collections[1].Beatmaps.Count, Is.EqualTo(11));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        private async Task<OsuGameBase> loadOsu(GameHost host, bool withBeatmap = false)
+        {
+            var osu = new OsuGameBase();
+
+#pragma warning disable 4014
+            Task.Run(() => host.Run(osu));
+#pragma warning restore 4014
+
+            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
+
+            if (withBeatmap)
+            {
+                var beatmapFile = TestResources.GetTestBeatmapForImport();
+                var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
+                await beatmapManager.Import(beatmapFile);
+            }
+
+            return osu;
+        }
+
+        private void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 60000)
+        {
+            Task task = Task.Run(() =>
+            {
+                while (!result()) Thread.Sleep(200);
+            });
+
+            Assert.IsTrue(task.Wait(timeout), failureMessage);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Resources/Collections/collections.db b/osu.Game.Tests/Resources/Collections/collections.db
new file mode 100644
index 0000000000000000000000000000000000000000..83e1c0f10a9058f3f376e75d3b5a88f671a95f63
GIT binary patch
literal 473
zcmah_%W0lL4E!CiFJFrIO3>=Ld+;?4qyjxw;7bCryL3}or-29rgV2mL^ZCk8-yV<0
z_59=Q&-=&I7rdJX!-hP)U7D7xkTeI>lFo6x{M`BbSAGAty`>hfB!!t?h{`*ueUU(z
zwqLg>Kq9oOjOI0BLY+xkyAg0+_rhpwBocF}ptLdFxMa3XucLvnYP9pNF;*O~cDSX^
zm8A@4W6w#hixgKP0&(j^RSP^kU2@%VUNsbpr9-6>Ab1NHf^gOz*PS64xg(D-ELaUW
z$6;(dB@EZi9CA)@46-aEqHY}+Vltepue&O_nhD)wo)}crPm*6o_5?jw{+sW8lH<ZP
kNH@uZBa9f-g*jy`kL$KgBcM?&osZjN(4vhK)2B541#QN7)Bpeg

literal 0
HcmV?d00001

diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
index ed07f0d3e2..3d3e9e0e07 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -76,21 +76,33 @@ namespace osu.Game.Collections
                 return Task.CompletedTask;
             }
 
-            return Task.Run(() =>
+            return Task.Run(async () =>
             {
                 var storage = GetStableStorage();
 
                 if (storage.Exists(database_name))
                 {
                     using (var stream = storage.GetStream(database_name))
-                    {
-                        var collection = readCollections(stream);
-                        Schedule(() => importCollections(collection));
-                    }
+                        await Import(stream);
                 }
             });
         }
 
+        public async Task Import(Stream stream) => await Task.Run(async () =>
+        {
+            var collection = readCollections(stream);
+            bool importCompleted = false;
+
+            Schedule(() =>
+            {
+                importCollections(collection);
+                importCompleted = true;
+            });
+
+            while (!IsDisposed && !importCompleted)
+                await Task.Delay(10);
+        });
+
         private void importCollections(List<BeatmapCollection> newCollections)
         {
             foreach (var newCol in newCollections)

From 0d5d293279eb96bcefc739c19fd69da4fcdcdad2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Sep 2020 22:47:19 +0900
Subject: [PATCH 04622/10326] Add manage collections dialog tests

---
 .../Collections/TestSceneCollectionDialog.cs  |  26 ---
 .../TestSceneManageCollectionsDialog.cs       | 198 ++++++++++++++++++
 .../Collections/BeatmapCollectionManager.cs   |  19 +-
 .../Collections/DrawableCollectionListItem.cs |   2 +-
 osu.Game/OsuGameBase.cs                       |   2 +-
 5 files changed, 212 insertions(+), 35 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs
 create mode 100644 osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs
deleted file mode 100644
index 5782e627ba..0000000000
--- a/osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.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.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Collections;
-using osu.Game.Overlays;
-
-namespace osu.Game.Tests.Visual.Collections
-{
-    public class TestSceneCollectionDialog : OsuTestScene
-    {
-        [Cached]
-        private DialogOverlay dialogOverlay;
-
-        public TestSceneCollectionDialog()
-        {
-            Children = new Drawable[]
-            {
-                new ManageCollectionsDialog { State = { Value = Visibility.Visible } },
-                dialogOverlay = new DialogOverlay()
-            };
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
new file mode 100644
index 0000000000..2d6f8abd8b
--- /dev/null
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -0,0 +1,198 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+using osu.Game.Collections;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Collections
+{
+    public class TestSceneManageCollectionsDialog : OsuManualInputManagerTestScene
+    {
+        [Cached]
+        private readonly DialogOverlay dialogOverlay;
+
+        protected override Container<Drawable> Content => content;
+
+        private readonly Container content;
+
+        private BeatmapCollectionManager manager;
+        private ManageCollectionsDialog dialog;
+
+        public TestSceneManageCollectionsDialog()
+        {
+            base.Content.AddRange(new Drawable[]
+            {
+                content = new Container { RelativeSizeAxes = Axes.Both },
+                dialogOverlay = new DialogOverlay()
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Dependencies.Cache(manager = new BeatmapCollectionManager(LocalStorage));
+            Add(manager);
+        }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            manager.Collections.Clear();
+            Child = dialog = new ManageCollectionsDialog();
+        });
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("show dialog", () => dialog.Show());
+        }
+
+        [Test]
+        public void TestHideDialog()
+        {
+            AddWaitStep("wait for animation", 3);
+            AddStep("hide dialog", () => dialog.Hide());
+        }
+
+        [Test]
+        public void TestAddCollectionExternal()
+        {
+            AddStep("add collection", () => manager.Collections.Add(new BeatmapCollection { Name = { Value = "First collection" } }));
+            assertCollectionCount(1);
+            assertCollectionName(0, "First collection");
+
+            AddStep("add another collection", () => manager.Collections.Add(new BeatmapCollection { Name = { Value = "Second collection" } }));
+            assertCollectionCount(2);
+            assertCollectionName(1, "Second collection");
+        }
+
+        [Test]
+        public void TestAddCollectionViaButton()
+        {
+            AddStep("press new collection button", () =>
+            {
+                InputManager.MoveMouseTo(dialog.ChildrenOfType<OsuButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            assertCollectionCount(1);
+
+            AddStep("press again", () =>
+            {
+                InputManager.MoveMouseTo(dialog.ChildrenOfType<OsuButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            assertCollectionCount(2);
+        }
+
+        [Test]
+        public void TestRemoveCollectionExternal()
+        {
+            AddStep("add two collections", () => manager.Collections.AddRange(new[]
+            {
+                new BeatmapCollection { Name = { Value = "1" } },
+                new BeatmapCollection { Name = { Value = "2" } },
+            }));
+
+            AddStep("remove first collection", () => manager.Collections.RemoveAt(0));
+            assertCollectionCount(1);
+            assertCollectionName(0, "2");
+        }
+
+        [Test]
+        public void TestRemoveCollectionViaButton()
+        {
+            AddStep("add two collections", () => manager.Collections.AddRange(new[]
+            {
+                new BeatmapCollection { Name = { Value = "1" } },
+                new BeatmapCollection { Name = { Value = "2" } },
+            }));
+
+            AddStep("click first delete button", () =>
+            {
+                InputManager.MoveMouseTo(dialog.ChildrenOfType<DrawableCollectionListItem.DeleteButton>().First(), new Vector2(5, 0));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is DeleteCollectionDialog);
+            AddStep("click confirmation", () =>
+            {
+                InputManager.MoveMouseTo(dialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().First());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            assertCollectionCount(1);
+            assertCollectionName(0, "2");
+        }
+
+        [Test]
+        public void TestCollectionNotRemovedWhenDialogCancelled()
+        {
+            AddStep("add two collections", () => manager.Collections.AddRange(new[]
+            {
+                new BeatmapCollection { Name = { Value = "1" } },
+                new BeatmapCollection { Name = { Value = "2" } },
+            }));
+
+            AddStep("click first delete button", () =>
+            {
+                InputManager.MoveMouseTo(dialog.ChildrenOfType<DrawableCollectionListItem.DeleteButton>().First(), new Vector2(5, 0));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is DeleteCollectionDialog);
+            AddStep("click confirmation", () =>
+            {
+                InputManager.MoveMouseTo(dialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().Last());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            assertCollectionCount(2);
+        }
+
+        [Test]
+        public void TestCollectionRenamedExternal()
+        {
+            AddStep("add two collections", () => manager.Collections.AddRange(new[]
+            {
+                new BeatmapCollection { Name = { Value = "1" } },
+                new BeatmapCollection { Name = { Value = "2" } },
+            }));
+
+            AddStep("change first collection name", () => manager.Collections[0].Name.Value = "First");
+
+            assertCollectionName(0, "First");
+        }
+
+        [Test]
+        public void TestCollectionRenamedOnTextChange()
+        {
+            AddStep("add two collections", () => manager.Collections.AddRange(new[]
+            {
+                new BeatmapCollection { Name = { Value = "1" } },
+                new BeatmapCollection { Name = { Value = "2" } },
+            }));
+
+            AddStep("change first collection name", () => dialog.ChildrenOfType<TextBox>().First().Text = "First");
+            AddAssert("collection has new name", () => manager.Collections[0].Name.Value == "First");
+        }
+
+        private void assertCollectionCount(int count)
+            => AddAssert($"{count} collections shown", () => dialog.ChildrenOfType<DrawableCollectionListItem>().Count() == count);
+
+        private void assertCollectionName(int index, string name)
+            => AddAssert($"item {index + 1} has correct name", () => dialog.ChildrenOfType<DrawableCollectionListItem>().ElementAt(index).ChildrenOfType<TextBox>().First().Text == name);
+    }
+}
diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
index 3d3e9e0e07..a553ac632e 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -37,12 +37,19 @@ namespace osu.Game.Collections
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
+        private readonly Storage storage;
+
+        public BeatmapCollectionManager(Storage storage)
+        {
+            this.storage = storage;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (host.Storage.Exists(database_name))
+            if (storage.Exists(database_name))
             {
-                using (var stream = host.Storage.GetStream(database_name))
+                using (var stream = storage.GetStream(database_name))
                     importCollections(readCollections(stream));
             }
 
@@ -78,11 +85,9 @@ namespace osu.Game.Collections
 
             return Task.Run(async () =>
             {
-                var storage = GetStableStorage();
-
-                if (storage.Exists(database_name))
+                if (stable.Exists(database_name))
                 {
-                    using (var stream = storage.GetStream(database_name))
+                    using (var stream = stable.GetStream(database_name))
                         await Import(stream);
                 }
             });
@@ -188,7 +193,7 @@ namespace osu.Game.Collections
                 {
                     // This is NOT thread-safe!!
 
-                    using (var sw = new SerializationWriter(host.Storage.GetStream(database_name, FileAccess.Write)))
+                    using (var sw = new SerializationWriter(storage.GetStream(database_name, FileAccess.Write)))
                     {
                         sw.Write(database_version);
                         sw.Write(Collections.Count);
diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index 7c1a2e1287..c7abf58d10 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Collections
             }
         }
 
-        private class DeleteButton : CompositeDrawable
+        public class DeleteButton : CompositeDrawable
         {
             public Func<Vector2, bool> IsTextBoxHovered;
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 30494d18fb..3114727d54 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -228,7 +228,7 @@ namespace osu.Game
             dependencies.Cache(difficultyManager);
             AddInternal(difficultyManager);
 
-            dependencies.Cache(CollectionManager = new BeatmapCollectionManager());
+            dependencies.Cache(CollectionManager = new BeatmapCollectionManager(Storage));
             AddInternal(CollectionManager);
 
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));

From a1214512bc96532f984166b20b77ecaa56bd890d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Sep 2020 23:57:49 +0900
Subject: [PATCH 04623/10326] Add filter control tests

---
 .../SongSelect/TestSceneFilterControl.cs      | 213 +++++++++++++++++-
 .../Select/CollectionFilterDropdown.cs        |  28 +--
 2 files changed, 225 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index f89300661c..fe1c194c5b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -1,22 +1,231 @@
 // Copyright (c) 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.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Platform;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Collections;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Select;
+using osu.Game.Tests.Resources;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.SongSelect
 {
-    public class TestSceneFilterControl : OsuTestScene
+    public class TestSceneFilterControl : OsuManualInputManagerTestScene
     {
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        [Cached]
+        private readonly BeatmapCollectionManager collectionManager;
+
+        private RulesetStore rulesets;
+        private BeatmapManager beatmapManager;
+
+        private FilterControl control;
+
         public TestSceneFilterControl()
         {
-            Child = new FilterControl
+            base.Content.AddRange(new Drawable[]
+            {
+                collectionManager = new BeatmapCollectionManager(LocalStorage),
+                content = new Container { RelativeSizeAxes = Axes.Both }
+            });
+        }
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies.Cache(collectionManager);
+            return dependencies;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
+
+            beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+        }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            collectionManager.Collections.Clear();
+
+            Child = control = new FilterControl
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.X,
                 Height = FilterControl.HEIGHT,
             };
+        });
+
+        [Test]
+        public void TestEmptyCollectionFilterContainsAllBeatmaps()
+        {
+            assertCollectionDropdownContains("All beatmaps");
+            assertCollectionHeaderDisplays("All beatmaps");
         }
+
+        [Test]
+        public void TestCollectionAddedToDropdown()
+        {
+            AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
+            AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "2" } }));
+            assertCollectionDropdownContains("1");
+            assertCollectionDropdownContains("2");
+        }
+
+        [Test]
+        public void TestCollectionRemovedFromDropdown()
+        {
+            AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
+            AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "2" } }));
+            AddStep("remove collection", () => collectionManager.Collections.RemoveAt(0));
+
+            assertCollectionDropdownContains("1", false);
+            assertCollectionDropdownContains("2");
+        }
+
+        [Test]
+        public void TestCollectionRenamed()
+        {
+            AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
+            AddStep("select collection", () =>
+            {
+                var dropdown = control.ChildrenOfType<CollectionFilterDropdown>().Single();
+                dropdown.Current.Value = dropdown.ItemSource.ElementAt(1);
+            });
+
+            AddStep("expand header", () =>
+            {
+                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("change name", () => collectionManager.Collections[0].Name.Value = "First");
+
+            assertCollectionDropdownContains("First");
+            assertCollectionHeaderDisplays("First");
+        }
+
+        [Test]
+        public void TestAllBeatmapFilterDoesNotHaveAddButton()
+        {
+            AddAssert("'All beatmaps' filter does not have add button", () => !getCollectionDropdownItems().First().ChildrenOfType<IconButton>().Single().IsPresent);
+        }
+
+        [Test]
+        public void TestCollectionFilterHasAddButton()
+        {
+            AddStep("expand header", () =>
+            {
+                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
+            AddAssert("collection has add button", () => !getAddOrRemoveButton(0).IsPresent);
+        }
+
+        [Test]
+        public void TestButtonDisabledAndEnabledWithBeatmapChanges()
+        {
+            AddStep("expand header", () =>
+            {
+                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
+            AddAssert("button disabled", () => !getAddOrRemoveButton(1).Enabled.Value);
+
+            AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
+            AddAssert("button enabled", () => getAddOrRemoveButton(1).Enabled.Value);
+
+            AddStep("set dummy beatmap", () => Beatmap.SetDefault());
+            AddAssert("button enabled", () => !getAddOrRemoveButton(1).Enabled.Value);
+        }
+
+        [Test]
+        public void TestButtonChangesWhenAddedAndRemovedFromCollection()
+        {
+            AddStep("expand header", () =>
+            {
+                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
+
+            AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.PlusSquare));
+
+            AddStep("add beatmap to collection", () => collectionManager.Collections[0].Beatmaps.Add(Beatmap.Value.BeatmapInfo));
+            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.MinusSquare));
+
+            AddStep("remove beatmap from collection", () => collectionManager.Collections[0].Beatmaps.Clear());
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.PlusSquare));
+        }
+
+        [Test]
+        public void TestButtonAddsAndRemovesBeatmap()
+        {
+            AddStep("expand header", () =>
+            {
+                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
+
+            AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.PlusSquare));
+
+            addClickAddOrRemoveButtonStep(1);
+            AddAssert("collection contains beatmap", () => collectionManager.Collections[0].Beatmaps.Contains(Beatmap.Value.BeatmapInfo));
+            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.MinusSquare));
+
+            addClickAddOrRemoveButtonStep(1);
+            AddAssert("collection does not contain beatmap", () => !collectionManager.Collections[0].Beatmaps.Contains(Beatmap.Value.BeatmapInfo));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.PlusSquare));
+        }
+
+        private void assertCollectionHeaderDisplays(string collectionName, bool shouldDisplay = true)
+            => AddAssert($"collection dropdown header displays '{collectionName}'",
+                () => shouldDisplay == (control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single().ChildrenOfType<SpriteText>().First().Text == collectionName));
+
+        private void assertCollectionDropdownContains(string collectionName, bool shouldContain = true) =>
+            AddAssert($"collection dropdown {(shouldContain ? "contains" : "does not contain")} '{collectionName}'",
+                // A bit of a roundabout way of going about this, see: https://github.com/ppy/osu-framework/issues/3871 + https://github.com/ppy/osu-framework/issues/3872
+                () => shouldContain == (getCollectionDropdownItems().Any(i => i.ChildrenOfType<FillFlowContainer>().OfType<IHasText>().First().Text == collectionName)));
+
+        private IconButton getAddOrRemoveButton(int index)
+            => getCollectionDropdownItems().ElementAt(index).ChildrenOfType<IconButton>().Single();
+
+        private void addClickAddOrRemoveButtonStep(int index)
+        {
+            AddStep("click add or remove button", () =>
+            {
+                InputManager.MoveMouseTo(getAddOrRemoveButton(index));
+                InputManager.Click(MouseButton.Left);
+            });
+        }
+
+        private IEnumerable<Dropdown<CollectionFilter>.DropdownMenu.DrawableDropdownMenuItem> getCollectionDropdownItems()
+            => control.ChildrenOfType<CollectionFilterDropdown>().Single().ChildrenOfType<Dropdown<CollectionFilter>.DropdownMenu.DrawableDropdownMenuItem>();
     }
 }
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index 02484f6c64..2d30263d78 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.Select
 
         protected override DropdownMenu CreateMenu() => new CollectionDropdownMenu();
 
-        private class CollectionDropdownHeader : OsuDropdownHeader
+        public class CollectionDropdownHeader : OsuDropdownHeader
         {
             public readonly Bindable<CollectionFilter> SelectedItem = new Bindable<CollectionFilter>();
             private readonly Bindable<string> collectionName = new Bindable<string>();
@@ -126,7 +126,10 @@ namespace osu.Game.Screens.Select
             private void updateBindable()
             {
                 collectionName.UnbindAll();
-                collectionName.BindTo(SelectedItem.Value.CollectionName);
+
+                if (SelectedItem.Value != null)
+                    collectionName.BindTo(SelectedItem.Value.CollectionName);
+
                 collectionName.BindValueChanged(_ => updateText(), true);
             }
 
@@ -174,17 +177,14 @@ namespace osu.Game.Screens.Select
             [BackgroundDependencyLoader]
             private void load()
             {
-                AddRangeInternal(new Drawable[]
+                AddInternal(addOrRemoveButton = new IconButton
                 {
-                    addOrRemoveButton = new IconButton
-                    {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        X = -OsuScrollContainer.SCROLL_BAR_HEIGHT,
-                        Scale = new Vector2(0.75f),
-                        Alpha = collectionBeatmaps == null ? 0 : 1,
-                        Action = addOrRemove
-                    }
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    X = -OsuScrollContainer.SCROLL_BAR_HEIGHT,
+                    Scale = new Vector2(0.75f),
+                    Alpha = collectionBeatmaps == null ? 0 : 1,
+                    Action = addOrRemove
                 });
             }
 
@@ -211,12 +211,12 @@ namespace osu.Game.Screens.Select
 
                 if (collectionBeatmaps.Contains(beatmap.Value.BeatmapInfo))
                 {
-                    addOrRemoveButton.Icon = FontAwesome.Solid.MinusSquare;
+                    addOrRemoveButton.Icon = FontAwesome.Regular.MinusSquare;
                     addOrRemoveButton.IconColour = colours.Red;
                 }
                 else
                 {
-                    addOrRemoveButton.Icon = FontAwesome.Solid.PlusSquare;
+                    addOrRemoveButton.Icon = FontAwesome.Regular.PlusSquare;
                     addOrRemoveButton.IconColour = colours.Green;
                 }
             }

From e37c04cb6d97c96df6d2858d4d8f31152ac3b1bc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 00:04:03 +0900
Subject: [PATCH 04624/10326] Change back to solid icon

---
 .../Visual/SongSelect/TestSceneFilterControl.cs      | 12 ++++++------
 osu.Game/Screens/Select/CollectionFilterDropdown.cs  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index fe1c194c5b..89a9536a04 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -172,13 +172,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
 
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.PlusSquare));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
 
             AddStep("add beatmap to collection", () => collectionManager.Collections[0].Beatmaps.Add(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.MinusSquare));
+            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusSquare));
 
             AddStep("remove beatmap from collection", () => collectionManager.Collections[0].Beatmaps.Clear());
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.PlusSquare));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
         }
 
         [Test]
@@ -193,15 +193,15 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
 
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.PlusSquare));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
 
             addClickAddOrRemoveButtonStep(1);
             AddAssert("collection contains beatmap", () => collectionManager.Collections[0].Beatmaps.Contains(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.MinusSquare));
+            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusSquare));
 
             addClickAddOrRemoveButtonStep(1);
             AddAssert("collection does not contain beatmap", () => !collectionManager.Collections[0].Beatmaps.Contains(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Regular.PlusSquare));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
         }
 
         private void assertCollectionHeaderDisplays(string collectionName, bool shouldDisplay = true)
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index 2d30263d78..e2e8fbe0ea 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -211,12 +211,12 @@ namespace osu.Game.Screens.Select
 
                 if (collectionBeatmaps.Contains(beatmap.Value.BeatmapInfo))
                 {
-                    addOrRemoveButton.Icon = FontAwesome.Regular.MinusSquare;
+                    addOrRemoveButton.Icon = FontAwesome.Solid.MinusSquare;
                     addOrRemoveButton.IconColour = colours.Red;
                 }
                 else
                 {
-                    addOrRemoveButton.Icon = FontAwesome.Regular.PlusSquare;
+                    addOrRemoveButton.Icon = FontAwesome.Solid.PlusSquare;
                     addOrRemoveButton.IconColour = colours.Green;
                 }
             }

From ca4423af74bd57088baa5b96abdf66d0fd6fc5ba Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 00:07:12 +0900
Subject: [PATCH 04625/10326] Fix tests

---
 .../Visual/SongSelect/TestSceneFilterControl.cs   | 15 +++++++--------
 .../Screens/Select/CollectionFilterDropdown.cs    |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 89a9536a04..c2dd652b3a 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -151,13 +151,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             });
 
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
-            AddAssert("button disabled", () => !getAddOrRemoveButton(1).Enabled.Value);
 
             AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
             AddAssert("button enabled", () => getAddOrRemoveButton(1).Enabled.Value);
 
             AddStep("set dummy beatmap", () => Beatmap.SetDefault());
-            AddAssert("button enabled", () => !getAddOrRemoveButton(1).Enabled.Value);
+            AddAssert("button disabled", () => !getAddOrRemoveButton(1).Enabled.Value);
         }
 
         [Test]
@@ -172,13 +171,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
 
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
 
             AddStep("add beatmap to collection", () => collectionManager.Collections[0].Beatmaps.Add(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusSquare));
+            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusCircle));
 
             AddStep("remove beatmap from collection", () => collectionManager.Collections[0].Beatmaps.Clear());
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
         }
 
         [Test]
@@ -193,15 +192,15 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
 
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
 
             addClickAddOrRemoveButtonStep(1);
             AddAssert("collection contains beatmap", () => collectionManager.Collections[0].Beatmaps.Contains(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusSquare));
+            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusCircle));
 
             addClickAddOrRemoveButtonStep(1);
             AddAssert("collection does not contain beatmap", () => !collectionManager.Collections[0].Beatmaps.Contains(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
         }
 
         private void assertCollectionHeaderDisplays(string collectionName, bool shouldDisplay = true)
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index e2e8fbe0ea..18caae9545 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -211,12 +211,12 @@ namespace osu.Game.Screens.Select
 
                 if (collectionBeatmaps.Contains(beatmap.Value.BeatmapInfo))
                 {
-                    addOrRemoveButton.Icon = FontAwesome.Solid.MinusSquare;
+                    addOrRemoveButton.Icon = FontAwesome.Solid.MinusCircle;
                     addOrRemoveButton.IconColour = colours.Red;
                 }
                 else
                 {
-                    addOrRemoveButton.Icon = FontAwesome.Solid.PlusSquare;
+                    addOrRemoveButton.Icon = FontAwesome.Solid.PlusCircle;
                     addOrRemoveButton.IconColour = colours.Green;
                 }
             }

From 01c0b61b203df181285cc052fb73509073ffefbb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 01:52:31 +0900
Subject: [PATCH 04626/10326] Fix incorrect test names

---
 osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index cef8105490..0702b02bb1 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -761,7 +761,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public void TestCreateNewEmptyBeatmap()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestUpdateBeatmapFile)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestCreateNewEmptyBeatmap)))
             {
                 try
                 {
@@ -788,7 +788,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public void TestCreateNewBeatmapWithObject()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestUpdateBeatmapFile)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestCreateNewBeatmapWithObject)))
             {
                 try
                 {

From 2b62579488c76a5f3bc65455085178912081e459 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 7 Sep 2020 10:18:22 -0700
Subject: [PATCH 04627/10326] Lowercase one more toolbar tooltip

---
 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 bcc2227be8..25a59e9b25 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays
     {
         public string IconTexture => "Icons/Hexacons/messaging";
         public string Title => "chat";
-        public string Description => "Join the real-time discussion";
+        public string Description => "join the real-time discussion";
 
         private const float textbox_height = 60;
         private const float channel_selection_min_height = 0.3f;

From 3a24cc1aa976e746e57509a5b0ddb4f71eed4340 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 7 Sep 2020 22:13:29 +0300
Subject: [PATCH 04628/10326] Implement PaginatedContainerHeader component

---
 .../TestScenePaginatedContainerHeader.cs      |  77 +++++++++++
 .../Overlays/Profile/Sections/CounterPill.cs  |  14 +-
 .../Sections/PaginatedContainerHeader.cs      | 129 ++++++++++++++++++
 3 files changed, 208 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs
 create mode 100644 osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs
new file mode 100644
index 0000000000..114a3af1d9
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs
@@ -0,0 +1,77 @@
+using NUnit.Framework;
+using osu.Game.Overlays.Profile.Sections;
+using osu.Framework.Testing;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestScenePaginatedContainerHeader : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
+
+        private PaginatedContainerHeader header;
+
+        [Test]
+        public void TestHiddenCounter()
+        {
+            AddStep("Create header", () => createHeader("Header with hidden counter", CounterVisibilityState.AlwaysHidden));
+            AddAssert("Value is 0", () => header.Current.Value == 0);
+            AddAssert("Counter is hidden", () => header.ChildrenOfType<CounterPill>().First().Alpha == 0);
+            AddStep("Set count 10", () => header.Current.Value = 10);
+            AddAssert("Value is 10", () => header.Current.Value == 10);
+            AddAssert("Counter is hidden", () => header.ChildrenOfType<CounterPill>().First().Alpha == 0);
+        }
+
+        [Test]
+        public void TestVisibleCounter()
+        {
+            AddStep("Create header", () => createHeader("Header with visible counter", CounterVisibilityState.AlwaysVisible));
+            AddAssert("Value is 0", () => header.Current.Value == 0);
+            AddAssert("Counter is visible", () => header.ChildrenOfType<CounterPill>().First().Alpha == 1);
+            AddStep("Set count 10", () => header.Current.Value = 10);
+            AddAssert("Value is 10", () => header.Current.Value == 10);
+            AddAssert("Counter is visible", () => header.ChildrenOfType<CounterPill>().First().Alpha == 1);
+        }
+
+        [Test]
+        public void TestVisibleWhenZeroCounter()
+        {
+            AddStep("Create header", () => createHeader("Header with visible when zero counter", CounterVisibilityState.VisibleWhenNonZero));
+            AddAssert("Value is 0", () => header.Current.Value == 0);
+            AddAssert("Counter is visible", () => header.ChildrenOfType<CounterPill>().First().Alpha == 1);
+            AddStep("Set count 10", () => header.Current.Value = 10);
+            AddAssert("Value is 10", () => header.Current.Value == 10);
+            AddAssert("Counter is hidden", () => header.ChildrenOfType<CounterPill>().First().Alpha == 0);
+            AddStep("Set count 0", () => header.Current.Value = 0);
+            AddAssert("Value is 0", () => header.Current.Value == 0);
+            AddAssert("Counter is visible", () => header.ChildrenOfType<CounterPill>().First().Alpha == 1);
+        }
+
+        [Test]
+        public void TestInitialVisibility()
+        {
+            AddStep("Create header with 0 value", () => createHeader("Header with visible when zero counter", CounterVisibilityState.VisibleWhenNonZero, 0));
+            AddAssert("Value is 0", () => header.Current.Value == 0);
+            AddAssert("Counter is visible", () => header.ChildrenOfType<CounterPill>().First().Alpha == 1);
+
+            AddStep("Create header with 1 value", () => createHeader("Header with visible when zero counter", CounterVisibilityState.VisibleWhenNonZero, 1));
+            AddAssert("Value is 1", () => header.Current.Value == 1);
+            AddAssert("Counter is hidden", () => header.ChildrenOfType<CounterPill>().First().Alpha == 0);
+        }
+
+        private void createHeader(string text, CounterVisibilityState state, int initialValue = 0)
+        {
+            Clear();
+            Add(header = new PaginatedContainerHeader(text, state)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Current = { Value = initialValue }
+            });
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Sections/CounterPill.cs b/osu.Game/Overlays/Profile/Sections/CounterPill.cs
index 52adefa4ad..131df105ad 100644
--- a/osu.Game/Overlays/Profile/Sections/CounterPill.cs
+++ b/osu.Game/Overlays/Profile/Sections/CounterPill.cs
@@ -13,8 +13,6 @@ namespace osu.Game.Overlays.Profile.Sections
 {
     public class CounterPill : CircularContainer
     {
-        private const int duration = 200;
-
         public readonly BindableInt Current = new BindableInt();
 
         private OsuSpriteText counter;
@@ -23,7 +21,6 @@ namespace osu.Game.Overlays.Profile.Sections
         private void load(OverlayColourProvider colourProvider)
         {
             AutoSizeAxes = Axes.Both;
-            Alpha = 0;
             Masking = true;
             Children = new Drawable[]
             {
@@ -36,8 +33,8 @@ namespace osu.Game.Overlays.Profile.Sections
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Margin = new MarginPadding { Horizontal = 10, Vertical = 5 },
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                    Margin = new MarginPadding { Horizontal = 10, Bottom = 1 },
+                    Font = OsuFont.GetFont(size: 14 * 0.8f, weight: FontWeight.Bold),
                     Colour = colourProvider.Foreground1
                 }
             };
@@ -51,14 +48,7 @@ namespace osu.Game.Overlays.Profile.Sections
 
         private void onCurrentChanged(ValueChangedEvent<int> value)
         {
-            if (value.NewValue == 0)
-            {
-                this.FadeOut(duration, Easing.OutQuint);
-                return;
-            }
-
             counter.Text = value.NewValue.ToString("N0");
-            this.FadeIn(duration, Easing.OutQuint);
         }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs
new file mode 100644
index 0000000000..e965b83682
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs
@@ -0,0 +1,129 @@
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Bindables;
+using System;
+using osu.Framework.Graphics.Shapes;
+using osuTK;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics;
+
+namespace osu.Game.Overlays.Profile.Sections
+{
+    public class PaginatedContainerHeader : CompositeDrawable, IHasCurrentValue<int>
+    {
+        public Bindable<int> Current
+        {
+            get => current;
+            set
+            {
+                if (value == null)
+                    throw new ArgumentNullException(nameof(value));
+
+                current.UnbindBindings();
+                current.BindTo(value);
+            }
+        }
+
+        private readonly Bindable<int> current = new Bindable<int>();
+
+        private readonly string text;
+        private readonly CounterVisibilityState counterState;
+
+        private CounterPill counterPill;
+
+        public PaginatedContainerHeader(string text, CounterVisibilityState counterState)
+        {
+            this.text = text;
+            this.counterState = counterState;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            AutoSizeAxes = Axes.Both;
+            Padding = new MarginPadding { Vertical = 10 };
+            InternalChildren = new Drawable[]
+            {
+                new CircularContainer
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Height = 0.65f,
+                    Width = 3,
+                    Masking = true,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreRight,
+                    Margin = new MarginPadding { Right = 10 },
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Highlight1
+                    }
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(10, 0),
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Text = text,
+                            Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
+                        },
+                        counterPill = new CounterPill
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Alpha = getInitialCounterAlpha(),
+                            Current = { BindTarget = current }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            current.BindValueChanged(onCurrentChanged);
+        }
+
+        private float getInitialCounterAlpha()
+        {
+            switch (counterState)
+            {
+                case CounterVisibilityState.AlwaysHidden:
+                    return 0;
+
+                case CounterVisibilityState.AlwaysVisible:
+                    return 1;
+
+                case CounterVisibilityState.VisibleWhenNonZero:
+                    return current.Value == 0 ? 1 : 0;
+
+                default:
+                    throw new NotImplementedException($"{counterState} has an incorrect value.");
+            }
+        }
+
+        private void onCurrentChanged(ValueChangedEvent<int> countValue)
+        {
+            if (counterState == CounterVisibilityState.VisibleWhenNonZero)
+            {
+                counterPill.Alpha = countValue.NewValue == 0 ? 1 : 0;
+            }
+        }
+    }
+
+    public enum CounterVisibilityState
+    {
+        AlwaysHidden,
+        AlwaysVisible,
+        VisibleWhenNonZero
+    }
+}

From 33f14fe7b7b7f4c10b629b582dfd6e9c6219e8f7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 7 Sep 2020 22:19:19 +0300
Subject: [PATCH 04629/10326] Remove no longer needed test

---
 .../Online/TestSceneProfileCounterPill.cs     | 40 -------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
deleted file mode 100644
index eaa989f0de..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Game.Overlays;
-using osu.Game.Overlays.Profile.Sections;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneProfileCounterPill : OsuTestScene
-    {
-        [Cached]
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
-
-        private readonly CounterPill pill;
-        private readonly BindableInt value = new BindableInt();
-
-        public TestSceneProfileCounterPill()
-        {
-            Child = pill = new CounterPill
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Current = { BindTarget = value }
-            };
-        }
-
-        [Test]
-        public void TestVisibility()
-        {
-            AddStep("Set value to 0", () => value.Value = 0);
-            AddAssert("Check hidden", () => !pill.IsPresent);
-            AddStep("Set value to 10", () => value.Value = 10);
-            AddAssert("Check visible", () => pill.IsPresent);
-        }
-    }
-}

From 1c55039994e80d827d5739610d2e6b4710c9b04f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 7 Sep 2020 22:24:10 +0300
Subject: [PATCH 04630/10326] Remove old header from PaginatedContainer

---
 .../Beatmaps/PaginatedBeatmapContainer.cs     | 14 ++-------
 .../Profile/Sections/BeatmapsSection.cs       | 10 +++----
 .../PaginatedMostPlayedBeatmapContainer.cs    |  3 +-
 .../Profile/Sections/HistoricalSection.cs     |  2 +-
 .../Kudosu/PaginatedKudosuHistoryContainer.cs |  4 +--
 .../Profile/Sections/KudosuSection.cs         |  2 +-
 .../Profile/Sections/PaginatedContainer.cs    | 29 +------------------
 .../Sections/Ranks/PaginatedScoreContainer.cs | 11 ++-----
 .../Overlays/Profile/Sections/RanksSection.cs |  4 +--
 .../PaginatedRecentActivityContainer.cs       |  4 +--
 .../Profile/Sections/RecentSection.cs         |  2 +-
 11 files changed, 20 insertions(+), 65 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index 191f3c908a..1936cb6188 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
         private const float panel_padding = 10f;
         private readonly BeatmapSetType type;
 
-        public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<User> user, string header, string missing = "None... yet.")
-            : base(user, header, missing)
+        public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<User> user)
+            : base(user, "None... yet.")
         {
             this.type = type;
 
@@ -38,15 +38,5 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
             };
-
-        protected override int GetCount(User user) => type switch
-        {
-            BeatmapSetType.Favourite => user.FavouriteBeatmapsetCount,
-            BeatmapSetType.Graveyard => user.GraveyardBeatmapsetCount,
-            BeatmapSetType.Loved => user.LovedBeatmapsetCount,
-            BeatmapSetType.RankedAndApproved => user.RankedAndApprovedBeatmapsetCount,
-            BeatmapSetType.Unranked => user.UnrankedBeatmapsetCount,
-            _ => 0
-        };
     }
 }
diff --git a/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs b/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs
index 37f017277f..156696da16 100644
--- a/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs
@@ -16,11 +16,11 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new[]
             {
-                new PaginatedBeatmapContainer(BeatmapSetType.Favourite, User, "Favourite Beatmaps"),
-                new PaginatedBeatmapContainer(BeatmapSetType.RankedAndApproved, User, "Ranked & Approved Beatmaps"),
-                new PaginatedBeatmapContainer(BeatmapSetType.Loved, User, "Loved Beatmaps"),
-                new PaginatedBeatmapContainer(BeatmapSetType.Unranked, User, "Pending Beatmaps"),
-                new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User, "Graveyarded Beatmaps"),
+                new PaginatedBeatmapContainer(BeatmapSetType.Favourite, User),
+                new PaginatedBeatmapContainer(BeatmapSetType.RankedAndApproved, User),
+                new PaginatedBeatmapContainer(BeatmapSetType.Loved, User),
+                new PaginatedBeatmapContainer(BeatmapSetType.Unranked, User),
+                new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User)
             };
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index 6e6d6272c7..f16842f4ab 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -15,10 +15,9 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     public class PaginatedMostPlayedBeatmapContainer : PaginatedContainer<APIUserMostPlayedBeatmap>
     {
         public PaginatedMostPlayedBeatmapContainer(Bindable<User> user)
-            : base(user, "Most Played Beatmaps", "No records. :(")
+            : base(user, "No records. :(")
         {
             ItemsPerPage = 5;
-
             ItemsContainer.Direction = FillDirection.Vertical;
         }
 
diff --git a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
index 4bdd25ee66..3d1a1efe6e 100644
--- a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections
             Children = new Drawable[]
             {
                 new PaginatedMostPlayedBeatmapContainer(User),
-                new PaginatedScoreContainer(ScoreType.Recent, User, "Recent Plays (24h)", "No performance records. :("),
+                new PaginatedScoreContainer(ScoreType.Recent, User, "No performance records. :("),
             };
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
index 0e7cfc37c0..923316d8c5 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
@@ -13,8 +13,8 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
 {
     public class PaginatedKudosuHistoryContainer : PaginatedContainer<APIKudosuHistory>
     {
-        public PaginatedKudosuHistoryContainer(Bindable<User> user, string header, string missing)
-            : base(user, header, missing)
+        public PaginatedKudosuHistoryContainer(Bindable<User> user, string missing)
+            : base(user, missing)
         {
             ItemsPerPage = 5;
         }
diff --git a/osu.Game/Overlays/Profile/Sections/KudosuSection.cs b/osu.Game/Overlays/Profile/Sections/KudosuSection.cs
index 9ccce7d837..7e75e7e3e4 100644
--- a/osu.Game/Overlays/Profile/Sections/KudosuSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/KudosuSection.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Profile.Sections
             Children = new Drawable[]
             {
                 new KudosuInfo(User),
-                new PaginatedKudosuHistoryContainer(User, null, @"This user hasn't received any kudosu!"),
+                new PaginatedKudosuHistoryContainer(User, "This user hasn't received any kudosu!"),
             };
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index 9720469548..87472e77ea 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -24,7 +24,6 @@ namespace osu.Game.Overlays.Profile.Sections
         private readonly OsuSpriteText missingText;
         private APIRequest<List<TModel>> retrievalRequest;
         private CancellationTokenSource loadCancellation;
-        private readonly BindableInt count = new BindableInt();
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -36,7 +35,7 @@ namespace osu.Game.Overlays.Profile.Sections
         protected readonly FillFlowContainer ItemsContainer;
         protected RulesetStore Rulesets;
 
-        protected PaginatedContainer(Bindable<User> user, string header, string missing)
+        protected PaginatedContainer(Bindable<User> user, string missing)
         {
             User.BindTo(user);
 
@@ -46,29 +45,6 @@ namespace osu.Game.Overlays.Profile.Sections
 
             Children = new Drawable[]
             {
-                new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(5, 0),
-                    Margin = new MarginPadding { Top = 10, Bottom = 10 },
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Text = header,
-                            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold),
-                        },
-                        new CounterPill
-                        {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Current = { BindTarget = count }
-                        }
-                    }
-                },
                 ItemsContainer = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Y,
@@ -112,7 +88,6 @@ namespace osu.Game.Overlays.Profile.Sections
             if (e.NewValue != null)
             {
                 showMore();
-                count.Value = GetCount(e.NewValue);
             }
         }
 
@@ -146,8 +121,6 @@ namespace osu.Game.Overlays.Profile.Sections
             }, loadCancellation.Token);
         });
 
-        protected virtual int GetCount(User user) => 0;
-
         protected abstract APIRequest<List<TModel>> CreateRequest();
 
         protected abstract Drawable CreateDrawableItem(TModel model);
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 64494f9814..2cefe45e4a 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -17,25 +17,18 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
     {
         private readonly ScoreType type;
 
-        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string header, string missing)
-            : base(user, header, missing)
+        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string missing)
+            : base(user, missing)
         {
             this.type = type;
 
             ItemsPerPage = 5;
-
             ItemsContainer.Direction = FillDirection.Vertical;
         }
 
         protected override APIRequest<List<APILegacyScoreInfo>> CreateRequest() =>
             new GetUserScoresRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
 
-        protected override int GetCount(User user) => type switch
-        {
-            ScoreType.Firsts => user.ScoresFirstCount,
-            _ => 0
-        };
-
         protected override Drawable CreateDrawableItem(APILegacyScoreInfo model)
         {
             switch (type)
diff --git a/osu.Game/Overlays/Profile/Sections/RanksSection.cs b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
index dbdff3a273..40bd050955 100644
--- a/osu.Game/Overlays/Profile/Sections/RanksSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
@@ -16,8 +16,8 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new[]
             {
-                new PaginatedScoreContainer(ScoreType.Best, User, "Best Performance", "No performance records. :("),
-                new PaginatedScoreContainer(ScoreType.Firsts, User, "First Place Ranks", "No awesome performance records yet. :("),
+                new PaginatedScoreContainer(ScoreType.Best, User, "No performance records. :("),
+                new PaginatedScoreContainer(ScoreType.Firsts, User, "No awesome performance records yet. :("),
             };
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index a37f398272..4c828ef0c1 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
 {
     public class PaginatedRecentActivityContainer : PaginatedContainer<APIRecentActivity>
     {
-        public PaginatedRecentActivityContainer(Bindable<User> user, string header, string missing)
-            : base(user, header, missing)
+        public PaginatedRecentActivityContainer(Bindable<User> user, string missing)
+            : base(user, missing)
         {
             ItemsPerPage = 10;
             ItemsContainer.Spacing = new Vector2(0, 8);
diff --git a/osu.Game/Overlays/Profile/Sections/RecentSection.cs b/osu.Game/Overlays/Profile/Sections/RecentSection.cs
index 8fcc5cc7c0..0c118b80b5 100644
--- a/osu.Game/Overlays/Profile/Sections/RecentSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/RecentSection.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new[]
             {
-                new PaginatedRecentActivityContainer(User, null, @"This user hasn't done anything notable recently!"),
+                new PaginatedRecentActivityContainer(User, "This user hasn't done anything notable recently!"),
             };
         }
     }

From b7bd084296a90a50672b7355b41842a405ad79d1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 7 Sep 2020 22:30:43 +0300
Subject: [PATCH 04631/10326] Remove missing text where not needed

---
 .../Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs | 2 +-
 osu.Game/Overlays/Profile/Sections/HistoricalSection.cs    | 2 +-
 .../Sections/Kudosu/PaginatedKudosuHistoryContainer.cs     | 4 ++--
 osu.Game/Overlays/Profile/Sections/KudosuSection.cs        | 2 +-
 osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs   | 7 +++++--
 .../Profile/Sections/Ranks/PaginatedScoreContainer.cs      | 4 ++--
 osu.Game/Overlays/Profile/Sections/RanksSection.cs         | 4 ++--
 .../Sections/Recent/PaginatedRecentActivityContainer.cs    | 4 ++--
 osu.Game/Overlays/Profile/Sections/RecentSection.cs        | 2 +-
 9 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index 1936cb6188..1f99b75909 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
         private readonly BeatmapSetType type;
 
         public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<User> user)
-            : base(user, "None... yet.")
+            : base(user)
         {
             this.type = type;
 
diff --git a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
index 3d1a1efe6e..e021f16e5e 100644
--- a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections
             Children = new Drawable[]
             {
                 new PaginatedMostPlayedBeatmapContainer(User),
-                new PaginatedScoreContainer(ScoreType.Recent, User, "No performance records. :("),
+                new PaginatedScoreContainer(ScoreType.Recent, User),
             };
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
index 923316d8c5..c823053c4b 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
@@ -13,8 +13,8 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
 {
     public class PaginatedKudosuHistoryContainer : PaginatedContainer<APIKudosuHistory>
     {
-        public PaginatedKudosuHistoryContainer(Bindable<User> user, string missing)
-            : base(user, missing)
+        public PaginatedKudosuHistoryContainer(Bindable<User> user)
+            : base(user, "This user hasn't received any kudosu!")
         {
             ItemsPerPage = 5;
         }
diff --git a/osu.Game/Overlays/Profile/Sections/KudosuSection.cs b/osu.Game/Overlays/Profile/Sections/KudosuSection.cs
index 7e75e7e3e4..a9e9952257 100644
--- a/osu.Game/Overlays/Profile/Sections/KudosuSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/KudosuSection.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Profile.Sections
             Children = new Drawable[]
             {
                 new KudosuInfo(User),
-                new PaginatedKudosuHistoryContainer(User, "This user hasn't received any kudosu!"),
+                new PaginatedKudosuHistoryContainer(User),
             };
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index 87472e77ea..9ddca48298 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Profile.Sections
         protected readonly FillFlowContainer ItemsContainer;
         protected RulesetStore Rulesets;
 
-        protected PaginatedContainer(Bindable<User> user, string missing)
+        protected PaginatedContainer(Bindable<User> user, string missing = "")
         {
             User.BindTo(user);
 
@@ -107,7 +107,10 @@ namespace osu.Game.Overlays.Profile.Sections
             {
                 moreButton.Hide();
                 moreButton.IsLoading = false;
-                missingText.Show();
+
+                if (!string.IsNullOrEmpty(missingText.Text))
+                    missingText.Show();
+
                 return;
             }
 
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 2cefe45e4a..fbf92fd2e6 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
     {
         private readonly ScoreType type;
 
-        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string missing)
-            : base(user, missing)
+        public PaginatedScoreContainer(ScoreType type, Bindable<User> user)
+            : base(user)
         {
             this.type = type;
 
diff --git a/osu.Game/Overlays/Profile/Sections/RanksSection.cs b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
index 40bd050955..18bf4f31d8 100644
--- a/osu.Game/Overlays/Profile/Sections/RanksSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
@@ -16,8 +16,8 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new[]
             {
-                new PaginatedScoreContainer(ScoreType.Best, User, "No performance records. :("),
-                new PaginatedScoreContainer(ScoreType.Firsts, User, "No awesome performance records yet. :("),
+                new PaginatedScoreContainer(ScoreType.Best, User),
+                new PaginatedScoreContainer(ScoreType.Firsts, User),
             };
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index 4c828ef0c1..a2f844503f 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
 {
     public class PaginatedRecentActivityContainer : PaginatedContainer<APIRecentActivity>
     {
-        public PaginatedRecentActivityContainer(Bindable<User> user, string missing)
-            : base(user, missing)
+        public PaginatedRecentActivityContainer(Bindable<User> user)
+            : base(user)
         {
             ItemsPerPage = 10;
             ItemsContainer.Spacing = new Vector2(0, 8);
diff --git a/osu.Game/Overlays/Profile/Sections/RecentSection.cs b/osu.Game/Overlays/Profile/Sections/RecentSection.cs
index 0c118b80b5..1e6cfcc9fd 100644
--- a/osu.Game/Overlays/Profile/Sections/RecentSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/RecentSection.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new[]
             {
-                new PaginatedRecentActivityContainer(User, "This user hasn't done anything notable recently!"),
+                new PaginatedRecentActivityContainer(User),
             };
         }
     }

From e39609d3ca6bf4b55009def24f13997c5ea7efc4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 7 Sep 2020 23:08:50 +0300
Subject: [PATCH 04632/10326] Implement PaginatedContainerWithHeader component

---
 .../TestScenePaginatedContainerHeader.cs      | 11 ++++--
 .../Beatmaps/PaginatedBeatmapContainer.cs     | 37 +++++++++++++++++--
 .../Profile/Sections/BeatmapsSection.cs       | 10 ++---
 .../PaginatedMostPlayedBeatmapContainer.cs    | 10 ++++-
 .../Profile/Sections/HistoricalSection.cs     |  2 +-
 .../Profile/Sections/PaginatedContainer.cs    | 33 +++++++++++------
 .../Sections/PaginatedContainerHeader.cs      | 11 ++++--
 .../Sections/PaginatedContainerWithHeader.cs  | 34 +++++++++++++++++
 .../Sections/Ranks/PaginatedScoreContainer.cs | 24 ++++++++++--
 .../Overlays/Profile/Sections/RanksSection.cs |  4 +-
 .../PaginatedRecentActivityContainer.cs       |  8 +++-
 11 files changed, 147 insertions(+), 37 deletions(-)
 create mode 100644 osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs
index 114a3af1d9..2e9f919cfd 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs
@@ -1,4 +1,7 @@
-using NUnit.Framework;
+// Copyright (c) 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.Overlays.Profile.Sections;
 using osu.Framework.Testing;
 using System.Linq;
@@ -40,7 +43,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestVisibleWhenZeroCounter()
         {
-            AddStep("Create header", () => createHeader("Header with visible when zero counter", CounterVisibilityState.VisibleWhenNonZero));
+            AddStep("Create header", () => createHeader("Header with visible when zero counter", CounterVisibilityState.VisibleWhenZero));
             AddAssert("Value is 0", () => header.Current.Value == 0);
             AddAssert("Counter is visible", () => header.ChildrenOfType<CounterPill>().First().Alpha == 1);
             AddStep("Set count 10", () => header.Current.Value = 10);
@@ -54,11 +57,11 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestInitialVisibility()
         {
-            AddStep("Create header with 0 value", () => createHeader("Header with visible when zero counter", CounterVisibilityState.VisibleWhenNonZero, 0));
+            AddStep("Create header with 0 value", () => createHeader("Header with visible when zero counter", CounterVisibilityState.VisibleWhenZero, 0));
             AddAssert("Value is 0", () => header.Current.Value == 0);
             AddAssert("Counter is visible", () => header.ChildrenOfType<CounterPill>().First().Alpha == 1);
 
-            AddStep("Create header with 1 value", () => createHeader("Header with visible when zero counter", CounterVisibilityState.VisibleWhenNonZero, 1));
+            AddStep("Create header with 1 value", () => createHeader("Header with visible when zero counter", CounterVisibilityState.VisibleWhenZero, 1));
             AddAssert("Value is 1", () => header.Current.Value == 1);
             AddAssert("Counter is hidden", () => header.ChildrenOfType<CounterPill>().First().Alpha == 0);
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index 1f99b75909..ea700a812f 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.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.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
@@ -13,21 +14,49 @@ using osuTK;
 
 namespace osu.Game.Overlays.Profile.Sections.Beatmaps
 {
-    public class PaginatedBeatmapContainer : PaginatedContainer<APIBeatmapSet>
+    public class PaginatedBeatmapContainer : PaginatedContainerWithHeader<APIBeatmapSet>
     {
         private const float panel_padding = 10f;
         private readonly BeatmapSetType type;
 
-        public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<User> user)
-            : base(user)
+        public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<User> user, string headerText)
+            : base(user, headerText, CounterVisibilityState.AlwaysVisible)
         {
             this.type = type;
-
             ItemsPerPage = 6;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             ItemsContainer.Spacing = new Vector2(panel_padding);
         }
 
+        protected override int GetCount(User user)
+        {
+            switch (type)
+            {
+                case BeatmapSetType.Favourite:
+                    return user.FavouriteBeatmapsetCount;
+
+                case BeatmapSetType.Graveyard:
+                    return user.GraveyardBeatmapsetCount;
+
+                case BeatmapSetType.Loved:
+                    return user.LovedBeatmapsetCount;
+
+                case BeatmapSetType.RankedAndApproved:
+                    return user.RankedAndApprovedBeatmapsetCount;
+
+                case BeatmapSetType.Unranked:
+                    return user.UnrankedBeatmapsetCount;
+
+                default:
+                    return 0;
+            }
+        }
+
+
         protected override APIRequest<List<APIBeatmapSet>> CreateRequest() =>
             new GetUserBeatmapsRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
 
diff --git a/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs b/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs
index 156696da16..c283de42f3 100644
--- a/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs
@@ -16,11 +16,11 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new[]
             {
-                new PaginatedBeatmapContainer(BeatmapSetType.Favourite, User),
-                new PaginatedBeatmapContainer(BeatmapSetType.RankedAndApproved, User),
-                new PaginatedBeatmapContainer(BeatmapSetType.Loved, User),
-                new PaginatedBeatmapContainer(BeatmapSetType.Unranked, User),
-                new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User)
+                new PaginatedBeatmapContainer(BeatmapSetType.Favourite, User, "Favourite Beatmaps"),
+                new PaginatedBeatmapContainer(BeatmapSetType.RankedAndApproved, User, "Ranked & Approved Beatmaps"),
+                new PaginatedBeatmapContainer(BeatmapSetType.Loved, User, "Loved Beatmaps"),
+                new PaginatedBeatmapContainer(BeatmapSetType.Unranked, User, "Pending Beatmaps"),
+                new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User, "Graveyarded Beatmaps")
             };
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index f16842f4ab..ad35ea1460 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.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.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,12 +13,17 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
-    public class PaginatedMostPlayedBeatmapContainer : PaginatedContainer<APIUserMostPlayedBeatmap>
+    public class PaginatedMostPlayedBeatmapContainer : PaginatedContainerWithHeader<APIUserMostPlayedBeatmap>
     {
         public PaginatedMostPlayedBeatmapContainer(Bindable<User> user)
-            : base(user, "No records. :(")
+            : base(user, "Most Played Beatmaps", CounterVisibilityState.AlwaysHidden, "No records. :(")
         {
             ItemsPerPage = 5;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             ItemsContainer.Direction = FillDirection.Vertical;
         }
 
diff --git a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
index e021f16e5e..bfc47bd88c 100644
--- a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections
             Children = new Drawable[]
             {
                 new PaginatedMostPlayedBeatmapContainer(User),
-                new PaginatedScoreContainer(ScoreType.Recent, User),
+                new PaginatedScoreContainer(ScoreType.Recent, User, "Recent Plays (24h)", CounterVisibilityState.VisibleWhenZero),
             };
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index 9ddca48298..1bc8ffe671 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -20,11 +20,6 @@ namespace osu.Game.Overlays.Profile.Sections
 {
     public abstract class PaginatedContainer<TModel> : FillFlowContainer
     {
-        private readonly ShowMoreButton moreButton;
-        private readonly OsuSpriteText missingText;
-        private APIRequest<List<TModel>> retrievalRequest;
-        private CancellationTokenSource loadCancellation;
-
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -32,19 +27,32 @@ namespace osu.Game.Overlays.Profile.Sections
         protected int ItemsPerPage;
 
         protected readonly Bindable<User> User = new Bindable<User>();
-        protected readonly FillFlowContainer ItemsContainer;
+        protected FillFlowContainer ItemsContainer;
         protected RulesetStore Rulesets;
 
+        private APIRequest<List<TModel>> retrievalRequest;
+        private CancellationTokenSource loadCancellation;
+
+        private readonly string missing;
+        private ShowMoreButton moreButton;
+        private OsuSpriteText missingText;
+
         protected PaginatedContainer(Bindable<User> user, string missing = "")
         {
+            this.missing = missing;
             User.BindTo(user);
+        }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Direction = FillDirection.Vertical;
 
             Children = new Drawable[]
             {
+                CreateHeaderContent,
                 ItemsContainer = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Y,
@@ -66,11 +74,7 @@ namespace osu.Game.Overlays.Profile.Sections
                     Alpha = 0,
                 },
             };
-        }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetStore rulesets)
-        {
             Rulesets = rulesets;
 
             User.ValueChanged += onUserChanged;
@@ -87,7 +91,7 @@ namespace osu.Game.Overlays.Profile.Sections
 
             if (e.NewValue != null)
             {
-                showMore();
+                OnUserChanged(e.NewValue);
             }
         }
 
@@ -124,6 +128,13 @@ namespace osu.Game.Overlays.Profile.Sections
             }, loadCancellation.Token);
         });
 
+        protected virtual void OnUserChanged(User user)
+        {
+            showMore();
+        }
+
+        protected virtual Drawable CreateHeaderContent => Empty();
+
         protected abstract APIRequest<List<TModel>> CreateRequest();
 
         protected abstract Drawable CreateDrawableItem(TModel model);
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs
index e965b83682..4779b44eb0 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.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.Containers;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
@@ -103,7 +106,7 @@ namespace osu.Game.Overlays.Profile.Sections
                 case CounterVisibilityState.AlwaysVisible:
                     return 1;
 
-                case CounterVisibilityState.VisibleWhenNonZero:
+                case CounterVisibilityState.VisibleWhenZero:
                     return current.Value == 0 ? 1 : 0;
 
                 default:
@@ -113,7 +116,7 @@ namespace osu.Game.Overlays.Profile.Sections
 
         private void onCurrentChanged(ValueChangedEvent<int> countValue)
         {
-            if (counterState == CounterVisibilityState.VisibleWhenNonZero)
+            if (counterState == CounterVisibilityState.VisibleWhenZero)
             {
                 counterPill.Alpha = countValue.NewValue == 0 ? 1 : 0;
             }
@@ -124,6 +127,6 @@ namespace osu.Game.Overlays.Profile.Sections
     {
         AlwaysHidden,
         AlwaysVisible,
-        VisibleWhenNonZero
+        VisibleWhenZero
     }
 }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
new file mode 100644
index 0000000000..cf88b290ae
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.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.Users;
+
+namespace osu.Game.Overlays.Profile.Sections
+{
+    public abstract class PaginatedContainerWithHeader<TModel> : PaginatedContainer<TModel>
+    {
+        private readonly string headerText;
+        private readonly CounterVisibilityState counterVisibilityState;
+
+        private PaginatedContainerHeader header;
+
+        public PaginatedContainerWithHeader(Bindable<User> user, string headerText, CounterVisibilityState counterVisibilityState, string missing = "")
+            : base(user, missing)
+        {
+            this.headerText = headerText;
+            this.counterVisibilityState = counterVisibilityState;
+        }
+
+        protected override Drawable CreateHeaderContent => header = new PaginatedContainerHeader(headerText, counterVisibilityState);
+
+        protected override void OnUserChanged(User user)
+        {
+            base.OnUserChanged(user);
+            header.Current.Value = GetCount(user);
+        }
+
+        protected virtual int GetCount(User user) => 0;
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index fbf92fd2e6..f1cf3e632c 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -10,22 +10,40 @@ using osu.Framework.Graphics;
 using osu.Game.Online.API.Requests.Responses;
 using System.Collections.Generic;
 using osu.Game.Online.API;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
-    public class PaginatedScoreContainer : PaginatedContainer<APILegacyScoreInfo>
+    public class PaginatedScoreContainer : PaginatedContainerWithHeader<APILegacyScoreInfo>
     {
         private readonly ScoreType type;
 
-        public PaginatedScoreContainer(ScoreType type, Bindable<User> user)
-            : base(user)
+        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string headerText, CounterVisibilityState counterVisibilityState, string missingText = "")
+            : base(user, headerText, counterVisibilityState, missingText)
         {
             this.type = type;
 
             ItemsPerPage = 5;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             ItemsContainer.Direction = FillDirection.Vertical;
         }
 
+        protected override int GetCount(User user)
+        {
+            switch (type)
+            {
+                case ScoreType.Firsts:
+                    return user.ScoresFirstCount;
+
+                default:
+                    return 0;
+            }
+        }
+
         protected override APIRequest<List<APILegacyScoreInfo>> CreateRequest() =>
             new GetUserScoresRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
 
diff --git a/osu.Game/Overlays/Profile/Sections/RanksSection.cs b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
index 18bf4f31d8..e41e414893 100644
--- a/osu.Game/Overlays/Profile/Sections/RanksSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
@@ -16,8 +16,8 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new[]
             {
-                new PaginatedScoreContainer(ScoreType.Best, User),
-                new PaginatedScoreContainer(ScoreType.Firsts, User),
+                new PaginatedScoreContainer(ScoreType.Best, User, "Best Performance", CounterVisibilityState.AlwaysHidden, "No performance records. :("),
+                new PaginatedScoreContainer(ScoreType.Firsts, User, "First Place Ranks", CounterVisibilityState.AlwaysVisible)
             };
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index a2f844503f..adfe31109b 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -9,15 +9,21 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.API;
 using System.Collections.Generic;
 using osuTK;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Profile.Sections.Recent
 {
     public class PaginatedRecentActivityContainer : PaginatedContainer<APIRecentActivity>
     {
         public PaginatedRecentActivityContainer(Bindable<User> user)
-            : base(user)
+            : base(user, "This user hasn't done anything notable recently!")
         {
             ItemsPerPage = 10;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             ItemsContainer.Spacing = new Vector2(0, 8);
         }
 

From c72a192cb5f59c5e85ac7b1ec381f16ab760a0f9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 7 Sep 2020 23:33:04 +0300
Subject: [PATCH 04633/10326] Fix recent plays counter is always zero

---
 .../Overlays/Profile/Sections/PaginatedContainer.cs  |  6 ++++++
 .../Profile/Sections/PaginatedContainerWithHeader.cs | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index 1bc8ffe671..9693c8b5f3 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -107,6 +107,8 @@ namespace osu.Game.Overlays.Profile.Sections
 
         protected virtual void UpdateItems(List<TModel> items) => Schedule(() =>
         {
+            OnItemsReceived(items);
+
             if (!items.Any() && VisiblePages == 1)
             {
                 moreButton.Hide();
@@ -133,6 +135,10 @@ namespace osu.Game.Overlays.Profile.Sections
             showMore();
         }
 
+        protected virtual void OnItemsReceived(List<TModel> items)
+        {
+        }
+
         protected virtual Drawable CreateHeaderContent => Empty();
 
         protected abstract APIRequest<List<TModel>> CreateRequest();
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
index cf88b290ae..f27ea7a626 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.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.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Users;
@@ -29,6 +30,17 @@ namespace osu.Game.Overlays.Profile.Sections
             header.Current.Value = GetCount(user);
         }
 
+        protected override void OnItemsReceived(List<TModel> items)
+        {
+            base.OnItemsReceived(items);
+
+            if (counterVisibilityState == CounterVisibilityState.VisibleWhenZero)
+            {
+                header.Current.Value = items.Count;
+                header.Current.TriggerChange();
+            }
+        }
+
         protected virtual int GetCount(User user) => 0;
     }
 }

From f88b2509f862062383e32bd1a78c585fcaa8fc09 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 7 Sep 2020 23:43:26 +0300
Subject: [PATCH 04634/10326] Fix ProfileSection header margin is too small

---
 osu.Game/Overlays/Profile/ProfileSection.cs                     | 2 +-
 .../Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs      | 1 -
 osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs        | 2 +-
 .../Overlays/Profile/Sections/PaginatedContainerWithHeader.cs   | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/ProfileSection.cs b/osu.Game/Overlays/Profile/ProfileSection.cs
index 2e19ae4b64..21f7921da6 100644
--- a/osu.Game/Overlays/Profile/ProfileSection.cs
+++ b/osu.Game/Overlays/Profile/ProfileSection.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Profile
                             {
                                 Horizontal = UserProfileOverlay.CONTENT_X_MARGIN,
                                 Top = 15,
-                                Bottom = 10,
+                                Bottom = 20,
                             },
                             Children = new Drawable[]
                             {
diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index ea700a812f..d7c72131ea 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -56,7 +56,6 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
             }
         }
 
-
         protected override APIRequest<List<APIBeatmapSet>> CreateRequest() =>
             new GetUserBeatmapsRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
 
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index 9693c8b5f3..c22e5660e6 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Profile.Sections
             AutoSizeAxes = Axes.Y;
             Direction = FillDirection.Vertical;
 
-            Children = new Drawable[]
+            Children = new[]
             {
                 CreateHeaderContent,
                 ItemsContainer = new FillFlowContainer
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
index f27ea7a626..9d8ed89053 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Profile.Sections
 
         private PaginatedContainerHeader header;
 
-        public PaginatedContainerWithHeader(Bindable<User> user, string headerText, CounterVisibilityState counterVisibilityState, string missing = "")
+        protected PaginatedContainerWithHeader(Bindable<User> user, string headerText, CounterVisibilityState counterVisibilityState, string missing = "")
             : base(user, missing)
         {
             this.headerText = headerText;

From 1bc41bcfd7d61fb44e3a6fed3a1171664a1f658b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 8 Sep 2020 00:04:14 +0300
Subject: [PATCH 04635/10326] Move scores counter logic to a better place

---
 .../Sections/PaginatedContainerWithHeader.cs   | 18 +++---------------
 .../Sections/Ranks/PaginatedScoreContainer.cs  | 13 +++++++++++++
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
index 9d8ed89053..32c589e342 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.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 osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Users;
@@ -13,7 +12,7 @@ namespace osu.Game.Overlays.Profile.Sections
         private readonly string headerText;
         private readonly CounterVisibilityState counterVisibilityState;
 
-        private PaginatedContainerHeader header;
+        protected PaginatedContainerHeader Header;
 
         protected PaginatedContainerWithHeader(Bindable<User> user, string headerText, CounterVisibilityState counterVisibilityState, string missing = "")
             : base(user, missing)
@@ -22,23 +21,12 @@ namespace osu.Game.Overlays.Profile.Sections
             this.counterVisibilityState = counterVisibilityState;
         }
 
-        protected override Drawable CreateHeaderContent => header = new PaginatedContainerHeader(headerText, counterVisibilityState);
+        protected override Drawable CreateHeaderContent => Header = new PaginatedContainerHeader(headerText, counterVisibilityState);
 
         protected override void OnUserChanged(User user)
         {
             base.OnUserChanged(user);
-            header.Current.Value = GetCount(user);
-        }
-
-        protected override void OnItemsReceived(List<TModel> items)
-        {
-            base.OnItemsReceived(items);
-
-            if (counterVisibilityState == CounterVisibilityState.VisibleWhenZero)
-            {
-                header.Current.Value = items.Count;
-                header.Current.TriggerChange();
-            }
+            Header.Current.Value = GetCount(user);
         }
 
         protected virtual int GetCount(User user) => 0;
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index f1cf3e632c..0b2bddabbc 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -44,6 +44,19 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             }
         }
 
+        protected override void OnItemsReceived(List<APILegacyScoreInfo> items)
+        {
+            base.OnItemsReceived(items);
+
+            if (type == ScoreType.Recent)
+            {
+                var count = items.Count;
+
+                Header.Current.Value = count == 0 ? 0 : -1;
+                Header.Current.TriggerChange();
+            }
+        }
+
         protected override APIRequest<List<APILegacyScoreInfo>> CreateRequest() =>
             new GetUserScoresRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
 

From 5268eee0fb7a51866d78eec067a4d5e2e069f264 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 11:31:42 +0900
Subject: [PATCH 04636/10326] Avoid requiring sending the calling method for
 CleanRunHeadlessGameHost

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 38 +++++++++----------
 osu.Game.Tests/Scores/IO/ImportScoreTest.cs   | 10 ++---
 osu.Game/Tests/CleanRunHeadlessGameHost.cs    | 12 +++++-
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 0702b02bb1..dd3dba1274 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportWhenClosed()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportWhenClosed)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportThenDelete()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenDelete)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportThenImport()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImport)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportThenImportWithReZip()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportWithReZip)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -156,7 +156,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportThenImportWithChangedFile()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportWithChangedFile)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -207,7 +207,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportThenImportWithDifferentFilename()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenImportWithDifferentFilename)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -259,7 +259,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportCorruptThenImport()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportCorruptThenImport)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -301,7 +301,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestRollbackOnFailure()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestRollbackOnFailure)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -378,7 +378,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportThenDeleteThenImport()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportThenDeleteThenImport)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -406,7 +406,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportThenDeleteThenImportWithOnlineIDMismatch(bool set)
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost($"{nameof(TestImportThenDeleteThenImportWithOnlineIDMismatch)}-{set}"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(set.ToString()))
             {
                 try
                 {
@@ -440,7 +440,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportWithDuplicateBeatmapIDs()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportWithDuplicateBeatmapIDs)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -526,7 +526,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportWhenFileOpen()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportWhenFileOpen)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -548,7 +548,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportWithDuplicateHashes()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportWithDuplicateHashes)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -590,7 +590,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportNestedStructure()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportNestedStructure)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -635,7 +635,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportWithIgnoredDirectoryInArchive()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportWithIgnoredDirectoryInArchive)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -689,7 +689,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestUpdateBeatmapInfo()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestUpdateBeatmapInfo)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -719,7 +719,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestUpdateBeatmapFile()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestUpdateBeatmapFile)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -761,7 +761,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public void TestCreateNewEmptyBeatmap()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestCreateNewEmptyBeatmap)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -788,7 +788,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public void TestCreateNewBeatmapWithObject()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestCreateNewBeatmapWithObject)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index 57f0d7e957..a4d20714fa 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Scores.IO
         [Test]
         public async Task TestBasicImport()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestBasicImport"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Scores.IO
         [Test]
         public async Task TestImportMods()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportMods"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Scores.IO
         [Test]
         public async Task TestImportStatistics()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportStatistics"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -122,7 +122,7 @@ namespace osu.Game.Tests.Scores.IO
         [Test]
         public async Task TestImportWithDeletedBeatmapSet()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportWithDeletedBeatmapSet"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
@@ -159,7 +159,7 @@ namespace osu.Game.Tests.Scores.IO
         [Test]
         public async Task TestOnlineScoreIsAvailableLocally()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestOnlineScoreIsAvailableLocally"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
diff --git a/osu.Game/Tests/CleanRunHeadlessGameHost.cs b/osu.Game/Tests/CleanRunHeadlessGameHost.cs
index bfbf7bb9da..baa7b27d28 100644
--- a/osu.Game/Tests/CleanRunHeadlessGameHost.cs
+++ b/osu.Game/Tests/CleanRunHeadlessGameHost.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.Runtime.CompilerServices;
 using osu.Framework.Platform;
 
 namespace osu.Game.Tests
@@ -10,8 +11,15 @@ namespace osu.Game.Tests
     /// </summary>
     public class CleanRunHeadlessGameHost : HeadlessGameHost
     {
-        public CleanRunHeadlessGameHost(string gameName = @"", bool bindIPC = false, bool realtime = true)
-            : base(gameName, bindIPC, realtime)
+        /// <summary>
+        /// Create a new instance.
+        /// </summary>
+        /// <param name="gameSuffix">An optional suffix which will isolate this host from others called from the same method source.</param>
+        /// <param name="bindIPC">Whether to bind IPC channels.</param>
+        /// <param name="realtime">Whether the host should be forced to run in realtime, rather than accelerated test time.</param>
+        /// <param name="callingMethodName">The name of the calling method, used for test file isolation and clean-up.</param>
+        public CleanRunHeadlessGameHost(string gameSuffix = @"", bool bindIPC = false, bool realtime = true, [CallerMemberName] string callingMethodName = @"")
+            : base(callingMethodName + gameSuffix, bindIPC, realtime)
         {
         }
 

From 3e5ea6c42fc43c6a31635863481cb0186e799952 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 11:59:47 +0900
Subject: [PATCH 04637/10326] Change "Add to" to "Collections"

Doesn't make send to be 'add to' when it can also remove
---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs    | 2 +-
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 008cf85018..5618f8f97f 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Screens.Select.Carousel
                 if (manageCollectionsDialog != null)
                     collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
-                items.Add(new OsuMenuItem("Add to...") { Items = collectionItems });
+                items.Add(new OsuMenuItem("Collections") { Items = collectionItems });
 
                 return items.ToArray();
             }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index fe0ad31b32..78ec59eb5b 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Screens.Select.Carousel
                 if (manageCollectionsDialog != null)
                     collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
-                items.Add(new OsuMenuItem("Add all to...") { Items = collectionItems });
+                items.Add(new OsuMenuItem("Collections") { Items = collectionItems });
 
                 return items.ToArray();
             }

From b15bbc882af8150af0681dac588a18afe17bc61a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 12:04:35 +0900
Subject: [PATCH 04638/10326] Move items up in menu

---
 .../Select/Carousel/DrawableCarouselBeatmap.cs        |  6 +++---
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs     | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 5618f8f97f..28c3529fc0 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -221,9 +221,6 @@ namespace osu.Game.Screens.Select.Carousel
                 if (editRequested != null)
                     items.Add(new OsuMenuItem("Edit", MenuItemType.Standard, () => editRequested(beatmap)));
 
-                if (hideRequested != null)
-                    items.Add(new OsuMenuItem("Hide", MenuItemType.Destructive, () => hideRequested(beatmap)));
-
                 if (beatmap.OnlineBeatmapID.HasValue && beatmapOverlay != null)
                     items.Add(new OsuMenuItem("Details", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
 
@@ -233,6 +230,9 @@ namespace osu.Game.Screens.Select.Carousel
 
                 items.Add(new OsuMenuItem("Collections") { Items = collectionItems });
 
+                if (hideRequested != null)
+                    items.Add(new OsuMenuItem("Hide", MenuItemType.Destructive, () => hideRequested(beatmap)));
+
                 return items.ToArray();
             }
         }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 78ec59eb5b..327cbc4765 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -142,18 +142,17 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmapSet.OnlineBeatmapSetID != null && viewDetails != null)
                     items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => viewDetails(beatmapSet.OnlineBeatmapSetID.Value)));
 
-                if (beatmapSet.Beatmaps.Any(b => b.Hidden))
-                    items.Add(new OsuMenuItem("Restore all hidden", MenuItemType.Standard, () => restoreHiddenRequested(beatmapSet)));
-
-                if (dialogOverlay != null)
-                    items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay.Push(new BeatmapDeleteDialog(beatmapSet))));
-
                 var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyDate).Take(3).Select(createCollectionMenuItem).ToList();
                 if (manageCollectionsDialog != null)
                     collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
                 items.Add(new OsuMenuItem("Collections") { Items = collectionItems });
 
+                if (beatmapSet.Beatmaps.Any(b => b.Hidden))
+                    items.Add(new OsuMenuItem("Restore all hidden", MenuItemType.Standard, () => restoreHiddenRequested(beatmapSet)));
+
+                if (dialogOverlay != null)
+                    items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay.Push(new BeatmapDeleteDialog(beatmapSet))));
                 return items.ToArray();
             }
         }

From 8b770626fa877e08eef3baf54aa3657c84b4b664 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 12:18:08 +0900
Subject: [PATCH 04639/10326] Add missing '...' from some popup menu items

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs    | 2 +-
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 28c3529fc0..9f21ec1ad1 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -222,7 +222,7 @@ namespace osu.Game.Screens.Select.Carousel
                     items.Add(new OsuMenuItem("Edit", MenuItemType.Standard, () => editRequested(beatmap)));
 
                 if (beatmap.OnlineBeatmapID.HasValue && beatmapOverlay != null)
-                    items.Add(new OsuMenuItem("Details", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
+                    items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
 
                 var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyDate).Take(3).Select(createCollectionMenuItem).ToList();
                 if (manageCollectionsDialog != null)
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 327cbc4765..19ecc277c4 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Screens.Select.Carousel
                     items.Add(new OsuMenuItem("Restore all hidden", MenuItemType.Standard, () => restoreHiddenRequested(beatmapSet)));
 
                 if (dialogOverlay != null)
-                    items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay.Push(new BeatmapDeleteDialog(beatmapSet))));
+                    items.Add(new OsuMenuItem("Delete...", MenuItemType.Destructive, () => dialogOverlay.Push(new BeatmapDeleteDialog(beatmapSet))));
                 return items.ToArray();
             }
         }

From ab58f60529d5a53cda28ee8cc010ac3f13d23cf2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 12:47:21 +0900
Subject: [PATCH 04640/10326] Remove elasticity from dialog appearing

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

diff --git a/osu.Game/Collections/ManageCollectionsDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
index f2aedb1c29..036a745913 100644
--- a/osu.Game/Collections/ManageCollectionsDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Collections
             base.PopIn();
 
             this.FadeIn(enter_duration, Easing.OutQuint);
-            this.ScaleTo(0.9f).Then().ScaleTo(1f, enter_duration, Easing.OutElastic);
+            this.ScaleTo(0.9f).Then().ScaleTo(1f, enter_duration, Easing.OutQuint);
         }
 
         protected override void PopOut()

From 3e96c6d036116cd8ef477dd529a26ccc90f90f6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 12:51:42 +0900
Subject: [PATCH 04641/10326] Improve paddings of collection management dialog

---
 osu.Game/Collections/DrawableCollectionList.cs     | 3 ++-
 osu.Game/Collections/DrawableCollectionListItem.cs | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Collections/DrawableCollectionList.cs b/osu.Game/Collections/DrawableCollectionList.cs
index ab146c17b6..e8bde9066f 100644
--- a/osu.Game/Collections/DrawableCollectionList.cs
+++ b/osu.Game/Collections/DrawableCollectionList.cs
@@ -13,13 +13,14 @@ namespace osu.Game.Collections
         protected override ScrollContainer<Drawable> CreateScrollContainer() => base.CreateScrollContainer().With(d =>
         {
             d.ScrollbarVisible = false;
+            d.Padding = new MarginPadding(10);
         });
 
         protected override FillFlowContainer<RearrangeableListItem<BeatmapCollection>> CreateListFillFlowContainer() => new FillFlowContainer<RearrangeableListItem<BeatmapCollection>>
         {
             LayoutDuration = 200,
             LayoutEasing = Easing.OutQuint,
-            Spacing = new Vector2(0, 2)
+            Spacing = new Vector2(0, 5)
         };
 
         protected override OsuRearrangeableListItem<BeatmapCollection> CreateOsuDrawable(BeatmapCollection item) => new DrawableCollectionListItem(item);
diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index c7abf58d10..e11f14ccae 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -25,7 +25,6 @@ namespace osu.Game.Collections
         public DrawableCollectionListItem(BeatmapCollection item)
             : base(item)
         {
-            Padding = new MarginPadding { Right = 20 };
         }
 
         protected override Drawable CreateContent() => new ItemContent(Model);

From 0e93bbb62df3c7197513b414e2612559f0f5e2f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 13:02:58 +0900
Subject: [PATCH 04642/10326] Adjust sizing of delete button

---
 osu.Game/Collections/DrawableCollectionListItem.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index e11f14ccae..9b7505f7c3 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Collections
     {
         private const float item_height = 35;
 
+        private const float button_width = item_height * 0.75f;
+
         public DrawableCollectionListItem(BeatmapCollection item)
             : base(item)
         {
@@ -58,7 +60,7 @@ namespace osu.Game.Collections
                     new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Right = item_height / 2 },
+                        Padding = new MarginPadding { Right = button_width },
                         Children = new Drawable[]
                         {
                             textBox = new ItemTextBox
@@ -100,8 +102,9 @@ namespace osu.Game.Collections
             public DeleteButton(BeatmapCollection collection)
             {
                 this.collection = collection;
-                RelativeSizeAxes = Axes.Both;
-                FillMode = FillMode.Fit;
+                RelativeSizeAxes = Axes.Y;
+
+                Width = button_width + item_height / 2; // add corner radius to cover with fill
 
                 Alpha = 0.1f;
             }
@@ -119,8 +122,8 @@ namespace osu.Game.Collections
                     new SpriteIcon
                     {
                         Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        X = -6,
+                        Origin = Anchor.Centre,
+                        X = -button_width * 0.6f,
                         Size = new Vector2(10),
                         Icon = FontAwesome.Solid.Trash
                     }

From 525026e7f09d788f5abdce40b546b0c7617569d5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 13:23:50 +0900
Subject: [PATCH 04643/10326] Fix tests failing due to timings

---
 .../TestSceneManageCollectionsDialog.cs       | 26 ++++++++++++-------
 .../SongSelect/TestSceneFilterControl.cs      |  1 -
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index 2d6f8abd8b..fdaded6a5c 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -19,30 +19,30 @@ namespace osu.Game.Tests.Visual.Collections
 {
     public class TestSceneManageCollectionsDialog : OsuManualInputManagerTestScene
     {
-        [Cached]
-        private readonly DialogOverlay dialogOverlay;
-
         protected override Container<Drawable> Content => content;
 
         private readonly Container content;
+        private readonly DialogOverlay dialogOverlay;
+        private readonly BeatmapCollectionManager manager;
 
-        private BeatmapCollectionManager manager;
         private ManageCollectionsDialog dialog;
 
         public TestSceneManageCollectionsDialog()
         {
             base.Content.AddRange(new Drawable[]
             {
+                manager = new BeatmapCollectionManager(LocalStorage),
                 content = new Container { RelativeSizeAxes = Axes.Both },
                 dialogOverlay = new DialogOverlay()
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
-            Dependencies.Cache(manager = new BeatmapCollectionManager(LocalStorage));
-            Add(manager);
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies.Cache(manager);
+            dependencies.Cache(dialogOverlay);
+            return dependencies;
         }
 
         [SetUp]
@@ -120,6 +120,8 @@ namespace osu.Game.Tests.Visual.Collections
                 new BeatmapCollection { Name = { Value = "2" } },
             }));
 
+            assertCollectionCount(2);
+
             AddStep("click first delete button", () =>
             {
                 InputManager.MoveMouseTo(dialog.ChildrenOfType<DrawableCollectionListItem.DeleteButton>().First(), new Vector2(5, 0));
@@ -146,6 +148,8 @@ namespace osu.Game.Tests.Visual.Collections
                 new BeatmapCollection { Name = { Value = "2" } },
             }));
 
+            assertCollectionCount(2);
+
             AddStep("click first delete button", () =>
             {
                 InputManager.MoveMouseTo(dialog.ChildrenOfType<DrawableCollectionListItem.DeleteButton>().First(), new Vector2(5, 0));
@@ -185,14 +189,16 @@ namespace osu.Game.Tests.Visual.Collections
                 new BeatmapCollection { Name = { Value = "2" } },
             }));
 
+            assertCollectionCount(2);
+
             AddStep("change first collection name", () => dialog.ChildrenOfType<TextBox>().First().Text = "First");
             AddAssert("collection has new name", () => manager.Collections[0].Name.Value == "First");
         }
 
         private void assertCollectionCount(int count)
-            => AddAssert($"{count} collections shown", () => dialog.ChildrenOfType<DrawableCollectionListItem>().Count() == count);
+            => AddUntilStep($"{count} collections shown", () => dialog.ChildrenOfType<DrawableCollectionListItem>().Count() == count);
 
         private void assertCollectionName(int index, string name)
-            => AddAssert($"item {index + 1} has correct name", () => dialog.ChildrenOfType<DrawableCollectionListItem>().ElementAt(index).ChildrenOfType<TextBox>().First().Text == name);
+            => AddUntilStep($"item {index + 1} has correct name", () => dialog.ChildrenOfType<DrawableCollectionListItem>().ElementAt(index).ChildrenOfType<TextBox>().First().Text == name);
     }
 }
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index c2dd652b3a..dea1c4b9b4 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -26,7 +26,6 @@ namespace osu.Game.Tests.Visual.SongSelect
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        [Cached]
         private readonly BeatmapCollectionManager collectionManager;
 
         private RulesetStore rulesets;

From 32e3f5d0919abc55ab518e6d4c6dfddd9d7feb5a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 13:45:26 +0900
Subject: [PATCH 04644/10326] Adjust button styling

---
 .../Select/CollectionFilterDropdown.cs        | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index 18caae9545..b0bd91b07d 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -10,6 +10,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Graphics;
@@ -166,6 +167,7 @@ namespace osu.Game.Screens.Select
 
             private IconButton addOrRemoveButton;
             private Content content;
+            private bool beatmapInCollection;
 
             public CollectionDropdownMenuItem(MenuItem item)
                 : base(item)
@@ -182,9 +184,10 @@ namespace osu.Game.Screens.Select
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
                     X = -OsuScrollContainer.SCROLL_BAR_HEIGHT,
-                    Scale = new Vector2(0.75f),
+                    Scale = new Vector2(0.7f),
+                    AlwaysPresent = true,
                     Alpha = collectionBeatmaps == null ? 0 : 1,
-                    Action = addOrRemove
+                    Action = addOrRemove,
                 });
             }
 
@@ -203,24 +206,33 @@ namespace osu.Game.Screens.Select
                 collectionName.BindValueChanged(name => content.Text = name.NewValue, true);
             }
 
+            protected override bool OnHover(HoverEvent e)
+            {
+                updateButtonVisibility();
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateButtonVisibility();
+                base.OnHoverLost(e);
+            }
+
             private void collectionChanged()
             {
                 Debug.Assert(collectionBeatmaps != null);
 
-                addOrRemoveButton.Enabled.Value = !beatmap.IsDefault;
+                beatmapInCollection = collectionBeatmaps.Contains(beatmap.Value.BeatmapInfo);
 
-                if (collectionBeatmaps.Contains(beatmap.Value.BeatmapInfo))
-                {
-                    addOrRemoveButton.Icon = FontAwesome.Solid.MinusCircle;
-                    addOrRemoveButton.IconColour = colours.Red;
-                }
-                else
-                {
-                    addOrRemoveButton.Icon = FontAwesome.Solid.PlusCircle;
-                    addOrRemoveButton.IconColour = colours.Green;
-                }
+                addOrRemoveButton.Enabled.Value = !beatmap.IsDefault;
+                addOrRemoveButton.Icon = beatmapInCollection ? FontAwesome.Solid.MinusSquare : FontAwesome.Solid.PlusSquare;
+                addOrRemoveButton.TooltipText = beatmapInCollection ? "Remove selected beatmap" : "Add selected beatmap";
+
+                updateButtonVisibility();
             }
 
+            private void updateButtonVisibility() => addOrRemoveButton.Alpha = IsHovered || beatmapInCollection ? 1 : 0;
+
             private void addOrRemove()
             {
                 Debug.Assert(collectionBeatmaps != null);

From 8a3c8a61854d123b74b23caf9b5c389727a59592 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 14:03:49 +0900
Subject: [PATCH 04645/10326] Show button when selected or preselected

---
 osu.Game/Screens/Select/CollectionFilterDropdown.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index b0bd91b07d..c4b98fa854 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -231,7 +231,13 @@ namespace osu.Game.Screens.Select
                 updateButtonVisibility();
             }
 
-            private void updateButtonVisibility() => addOrRemoveButton.Alpha = IsHovered || beatmapInCollection ? 1 : 0;
+            protected override void OnSelectChange()
+            {
+                base.OnSelectChange();
+                updateButtonVisibility();
+            }
+
+            private void updateButtonVisibility() => addOrRemoveButton.Alpha = IsHovered || IsPreSelected || beatmapInCollection ? 1 : 0;
 
             private void addOrRemove()
             {

From c2da3d9c84edfb98b6ca09efa1d9505267e3ceb0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 14:36:38 +0900
Subject: [PATCH 04646/10326] Fix button input and tests

---
 .../SongSelect/TestSceneFilterControl.cs      | 67 +++++++------------
 .../Select/CollectionFilterDropdown.cs        | 14 ++--
 2 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index dea1c4b9b4..65b554b27b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -109,11 +109,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 dropdown.Current.Value = dropdown.ItemSource.ElementAt(1);
             });
 
-            AddStep("expand header", () =>
-            {
-                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
+            addExpandHeaderStep();
 
             AddStep("change name", () => collectionManager.Collections[0].Name.Value = "First");
 
@@ -124,30 +120,24 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestAllBeatmapFilterDoesNotHaveAddButton()
         {
-            AddAssert("'All beatmaps' filter does not have add button", () => !getCollectionDropdownItems().First().ChildrenOfType<IconButton>().Single().IsPresent);
+            addExpandHeaderStep();
+            AddStep("hover all beatmaps", () => InputManager.MoveMouseTo(getAddOrRemoveButton(0)));
+            AddAssert("'All beatmaps' filter does not have add button", () => !getAddOrRemoveButton(0).IsPresent);
         }
 
         [Test]
         public void TestCollectionFilterHasAddButton()
         {
-            AddStep("expand header", () =>
-            {
-                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
-
+            addExpandHeaderStep();
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
-            AddAssert("collection has add button", () => !getAddOrRemoveButton(0).IsPresent);
+            AddStep("hover collection", () => InputManager.MoveMouseTo(getAddOrRemoveButton(1)));
+            AddAssert("collection has add button", () => getAddOrRemoveButton(1).IsPresent);
         }
 
         [Test]
         public void TestButtonDisabledAndEnabledWithBeatmapChanges()
         {
-            AddStep("expand header", () =>
-            {
-                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
+            addExpandHeaderStep();
 
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
 
@@ -161,45 +151,37 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestButtonChangesWhenAddedAndRemovedFromCollection()
         {
-            AddStep("expand header", () =>
-            {
-                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
+            addExpandHeaderStep();
 
             AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
 
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
 
             AddStep("add beatmap to collection", () => collectionManager.Collections[0].Beatmaps.Add(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusCircle));
+            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusSquare));
 
             AddStep("remove beatmap from collection", () => collectionManager.Collections[0].Beatmaps.Clear());
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
         }
 
         [Test]
         public void TestButtonAddsAndRemovesBeatmap()
         {
-            AddStep("expand header", () =>
-            {
-                InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
+            addExpandHeaderStep();
 
             AddStep("select available beatmap", () => Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0]));
 
             AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
 
             addClickAddOrRemoveButtonStep(1);
             AddAssert("collection contains beatmap", () => collectionManager.Collections[0].Beatmaps.Contains(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusCircle));
+            AddAssert("button is minus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.MinusSquare));
 
             addClickAddOrRemoveButtonStep(1);
             AddAssert("collection does not contain beatmap", () => !collectionManager.Collections[0].Beatmaps.Contains(Beatmap.Value.BeatmapInfo));
-            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusCircle));
+            AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
         }
 
         private void assertCollectionHeaderDisplays(string collectionName, bool shouldDisplay = true)
@@ -214,14 +196,17 @@ namespace osu.Game.Tests.Visual.SongSelect
         private IconButton getAddOrRemoveButton(int index)
             => getCollectionDropdownItems().ElementAt(index).ChildrenOfType<IconButton>().Single();
 
-        private void addClickAddOrRemoveButtonStep(int index)
+        private void addExpandHeaderStep() => AddStep("expand header", () =>
         {
-            AddStep("click add or remove button", () =>
-            {
-                InputManager.MoveMouseTo(getAddOrRemoveButton(index));
-                InputManager.Click(MouseButton.Left);
-            });
-        }
+            InputManager.MoveMouseTo(control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single());
+            InputManager.Click(MouseButton.Left);
+        });
+
+        private void addClickAddOrRemoveButtonStep(int index) => AddStep("click add or remove button", () =>
+        {
+            InputManager.MoveMouseTo(getAddOrRemoveButton(index));
+            InputManager.Click(MouseButton.Left);
+        });
 
         private IEnumerable<Dropdown<CollectionFilter>.DropdownMenu.DrawableDropdownMenuItem> getCollectionDropdownItems()
             => control.ChildrenOfType<CollectionFilterDropdown>().Single().ChildrenOfType<Dropdown<CollectionFilter>.DropdownMenu.DrawableDropdownMenuItem>();
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index c4b98fa854..4e9e12fcaf 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -184,9 +184,7 @@ namespace osu.Game.Screens.Select
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
                     X = -OsuScrollContainer.SCROLL_BAR_HEIGHT,
-                    Scale = new Vector2(0.7f),
-                    AlwaysPresent = true,
-                    Alpha = collectionBeatmaps == null ? 0 : 1,
+                    Scale = new Vector2(0.65f),
                     Action = addOrRemove,
                 });
             }
@@ -204,6 +202,8 @@ namespace osu.Game.Screens.Select
                 // Although the DrawableMenuItem binds to value changes of the item's text, the item is an internal implementation detail of Dropdown that has no knowledge
                 // of the underlying CollectionFilter value and its accompanying name, so the real name has to be copied here. Without this, the collection name wouldn't update when changed.
                 collectionName.BindValueChanged(name => content.Text = name.NewValue, true);
+
+                updateButtonVisibility();
             }
 
             protected override bool OnHover(HoverEvent e)
@@ -237,7 +237,13 @@ namespace osu.Game.Screens.Select
                 updateButtonVisibility();
             }
 
-            private void updateButtonVisibility() => addOrRemoveButton.Alpha = IsHovered || IsPreSelected || beatmapInCollection ? 1 : 0;
+            private void updateButtonVisibility()
+            {
+                if (collectionBeatmaps == null)
+                    addOrRemoveButton.Alpha = 0;
+                else
+                    addOrRemoveButton.Alpha = IsHovered || IsPreSelected || beatmapInCollection ? 1 : 0;
+            }
 
             private void addOrRemove()
             {

From 17e8171827c7b8150d376683491ded9c59b5264d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 14:38:25 +0900
Subject: [PATCH 04647/10326] Don't prompt to remove empty collection

---
 osu.Game/Collections/DeleteCollectionDialog.cs     |  9 +++------
 osu.Game/Collections/DrawableCollectionListItem.cs | 12 +++++++++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Collections/DeleteCollectionDialog.cs b/osu.Game/Collections/DeleteCollectionDialog.cs
index f2b8de7c1e..8c8c897146 100644
--- a/osu.Game/Collections/DeleteCollectionDialog.cs
+++ b/osu.Game/Collections/DeleteCollectionDialog.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.Allocation;
+using System;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 
@@ -9,10 +9,7 @@ namespace osu.Game.Collections
 {
     public class DeleteCollectionDialog : PopupDialog
     {
-        [Resolved]
-        private BeatmapCollectionManager collectionManager { get; set; }
-
-        public DeleteCollectionDialog(BeatmapCollection collection)
+        public DeleteCollectionDialog(BeatmapCollection collection, Action deleteAction)
         {
             HeaderText = "Confirm deletion of";
             BodyText = collection.Name.Value;
@@ -24,7 +21,7 @@ namespace osu.Game.Collections
                 new PopupDialogOkButton
                 {
                     Text = @"Yes. Go for it.",
-                    Action = () => collectionManager.Collections.Remove(collection)
+                    Action = deleteAction
                 },
                 new PopupDialogCancelButton
                 {
diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index 9b7505f7c3..a1fc55556e 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -95,6 +95,9 @@ namespace osu.Game.Collections
             [Resolved(CanBeNull = true)]
             private DialogOverlay dialogOverlay { get; set; }
 
+            [Resolved]
+            private BeatmapCollectionManager collectionManager { get; set; }
+
             private readonly BeatmapCollection collection;
 
             private Drawable background;
@@ -146,9 +149,16 @@ namespace osu.Game.Collections
             protected override bool OnClick(ClickEvent e)
             {
                 background.FlashColour(Color4.White, 150);
-                dialogOverlay?.Push(new DeleteCollectionDialog(collection));
+
+                if (collection.Beatmaps.Count == 0)
+                    deleteCollection();
+                else
+                    dialogOverlay?.Push(new DeleteCollectionDialog(collection, deleteCollection));
+
                 return true;
             }
+
+            private void deleteCollection() => collectionManager.Collections.Remove(collection);
         }
     }
 }

From 1260e30cde06611ca403a972a54403879c338223 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 16:36:36 +0900
Subject: [PATCH 04648/10326] Make ShowDragHandle into a bindable

---
 .../OsuRearrangeableListContainer.cs          |  4 ++--
 .../Containers/OsuRearrangeableListItem.cs    | 20 ++++++++++---------
 .../Screens/Multi/DrawableRoomPlaylistItem.cs |  5 ++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs b/osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs
index 47aed1c500..1048fd094c 100644
--- a/osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs
@@ -12,13 +12,13 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// Whether any item is currently being dragged. Used to hide other items' drag handles.
         /// </summary>
-        private readonly BindableBool playlistDragActive = new BindableBool();
+        protected readonly BindableBool DragActive = 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);
+            d.DragActive.BindTo(DragActive);
         });
 
         protected abstract OsuRearrangeableListItem<TModel> CreateOsuDrawable(TModel item);
diff --git a/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs b/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
index 29553954fe..9cdcb19a81 100644
--- a/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
+++ b/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// Whether any item is currently being dragged. Used to hide other items' drag handles.
         /// </summary>
-        public readonly BindableBool PlaylistDragActive = new BindableBool();
+        public readonly BindableBool DragActive = new BindableBool();
 
         private Color4 handleColour = Color4.White;
 
@@ -44,8 +44,9 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// Whether the drag handle should be shown.
         /// </summary>
-        protected virtual bool ShowDragHandle => true;
+        protected readonly Bindable<bool> ShowDragHandle = new Bindable<bool>();
 
+        private Container handleContainer;
         private PlaylistItemHandle handle;
 
         protected OsuRearrangeableListItem(TModel item)
@@ -58,8 +59,6 @@ namespace osu.Game.Graphics.Containers
         [BackgroundDependencyLoader]
         private void load()
         {
-            Container handleContainer;
-
             InternalChild = new GridContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -88,9 +87,12 @@ namespace osu.Game.Graphics.Containers
                 ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
                 RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
             };
+        }
 
-            if (!ShowDragHandle)
-                handleContainer.Alpha = 0;
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            ShowDragHandle.BindValueChanged(show => handleContainer.Alpha = show.NewValue ? 1 : 0, true);
         }
 
         protected override bool OnDragStart(DragStartEvent e)
@@ -98,13 +100,13 @@ namespace osu.Game.Graphics.Containers
             if (!base.OnDragStart(e))
                 return false;
 
-            PlaylistDragActive.Value = true;
+            DragActive.Value = true;
             return true;
         }
 
         protected override void OnDragEnd(DragEndEvent e)
         {
-            PlaylistDragActive.Value = false;
+            DragActive.Value = false;
             base.OnDragEnd(e);
         }
 
@@ -112,7 +114,7 @@ namespace osu.Game.Graphics.Containers
 
         protected override bool OnHover(HoverEvent e)
         {
-            handle.UpdateHoverState(IsDragged || !PlaylistDragActive.Value);
+            handle.UpdateHoverState(IsDragged || !DragActive.Value);
             return base.OnHover(e);
         }
 
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index c0892235f2..b007e0349d 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -37,8 +37,6 @@ namespace osu.Game.Screens.Multi
 
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
-        protected override bool ShowDragHandle => allowEdit;
-
         private Container maskingContainer;
         private Container difficultyIconContainer;
         private LinkFlowContainer beatmapText;
@@ -63,12 +61,13 @@ namespace osu.Game.Screens.Multi
 
             // TODO: edit support should be moved out into a derived class
             this.allowEdit = allowEdit;
-
             this.allowSelection = allowSelection;
 
             beatmap.BindTo(item.Beatmap);
             ruleset.BindTo(item.Ruleset);
             requiredMods.BindTo(item.RequiredMods);
+
+            ShowDragHandle.Value = allowEdit;
         }
 
         [BackgroundDependencyLoader]

From 0bf6bfe5ee4569bc7b2c0e83e92dd659d33299fc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 16:43:07 +0900
Subject: [PATCH 04649/10326] Create a new collection via a placeholder item

---
 .../Collections/DrawableCollectionList.cs     | 97 +++++++++++++++++--
 .../Collections/DrawableCollectionListItem.cs | 94 ++++++++++++++----
 .../Collections/ManageCollectionsDialog.cs    | 19 +---
 3 files changed, 163 insertions(+), 47 deletions(-)

diff --git a/osu.Game/Collections/DrawableCollectionList.cs b/osu.Game/Collections/DrawableCollectionList.cs
index e8bde9066f..f4b5a89b3e 100644
--- a/osu.Game/Collections/DrawableCollectionList.cs
+++ b/osu.Game/Collections/DrawableCollectionList.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.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
@@ -10,19 +12,94 @@ namespace osu.Game.Collections
 {
     public class DrawableCollectionList : OsuRearrangeableListContainer<BeatmapCollection>
     {
-        protected override ScrollContainer<Drawable> CreateScrollContainer() => base.CreateScrollContainer().With(d =>
-        {
-            d.ScrollbarVisible = false;
-            d.Padding = new MarginPadding(10);
-        });
+        private Scroll scroll;
 
-        protected override FillFlowContainer<RearrangeableListItem<BeatmapCollection>> CreateListFillFlowContainer() => new FillFlowContainer<RearrangeableListItem<BeatmapCollection>>
+        protected override ScrollContainer<Drawable> CreateScrollContainer() => scroll = new Scroll();
+
+        protected override FillFlowContainer<RearrangeableListItem<BeatmapCollection>> CreateListFillFlowContainer() => new Flow
         {
-            LayoutDuration = 200,
-            LayoutEasing = Easing.OutQuint,
-            Spacing = new Vector2(0, 5)
+            DragActive = { BindTarget = DragActive }
         };
 
-        protected override OsuRearrangeableListItem<BeatmapCollection> CreateOsuDrawable(BeatmapCollection item) => new DrawableCollectionListItem(item);
+        protected override OsuRearrangeableListItem<BeatmapCollection> CreateOsuDrawable(BeatmapCollection item)
+        {
+            if (item == scroll.PlaceholderItem.Model)
+                return scroll.ReplacePlaceholder();
+
+            return new DrawableCollectionListItem(item, true);
+        }
+
+        private class Scroll : OsuScrollContainer
+        {
+            public DrawableCollectionListItem PlaceholderItem { get; private set; }
+
+            protected override Container<Drawable> Content => content;
+            private readonly Container content;
+
+            private readonly Container<DrawableCollectionListItem> placeholderContainer;
+
+            public Scroll()
+            {
+                ScrollbarVisible = false;
+                Padding = new MarginPadding(10);
+
+                base.Content.Add(new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    LayoutDuration = 200,
+                    LayoutEasing = Easing.OutQuint,
+                    Children = new Drawable[]
+                    {
+                        content = new Container { RelativeSizeAxes = Axes.X },
+                        placeholderContainer = new Container<DrawableCollectionListItem>
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y
+                        }
+                    }
+                });
+
+                ReplacePlaceholder();
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                // AutoSizeAxes cannot be used as the height should represent the post-layout-transform height at all times, so that the placeholder doesn't bounce around.
+                content.Height = ((Flow)Child).Children.Sum(c => c.DrawHeight + 5);
+            }
+
+            /// <summary>
+            /// Replaces the current <see cref="PlaceholderItem"/> with a new one, and returns the previous.
+            /// </summary>
+            public DrawableCollectionListItem ReplacePlaceholder()
+            {
+                var previous = PlaceholderItem;
+
+                placeholderContainer.Clear(false);
+                placeholderContainer.Add(PlaceholderItem = new DrawableCollectionListItem(new BeatmapCollection(), false));
+
+                return previous;
+            }
+        }
+
+        private class Flow : FillFlowContainer<RearrangeableListItem<BeatmapCollection>>
+        {
+            public readonly IBindable<bool> DragActive = new Bindable<bool>();
+
+            public Flow()
+            {
+                Spacing = new Vector2(0, 5);
+                LayoutEasing = Easing.OutQuint;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                DragActive.BindValueChanged(active => LayoutDuration = active.NewValue ? 200 : 0);
+            }
+        }
     }
 }
diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index a1fc55556e..90d5bae223 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -3,6 +3,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;
@@ -21,20 +22,33 @@ namespace osu.Game.Collections
     public class DrawableCollectionListItem : OsuRearrangeableListItem<BeatmapCollection>
     {
         private const float item_height = 35;
-
         private const float button_width = item_height * 0.75f;
 
-        public DrawableCollectionListItem(BeatmapCollection item)
+        private readonly Bindable<bool> isCreated = new Bindable<bool>();
+
+        public DrawableCollectionListItem(BeatmapCollection item, bool isCreated)
             : base(item)
         {
+            this.isCreated.Value = isCreated;
+
+            ShowDragHandle.BindTo(this.isCreated);
         }
 
-        protected override Drawable CreateContent() => new ItemContent(Model);
+        protected override Drawable CreateContent() => new ItemContent(Model)
+        {
+            IsCreated = { BindTarget = isCreated }
+        };
 
         private class ItemContent : CircularContainer
         {
+            public readonly Bindable<bool> IsCreated = new Bindable<bool>();
+
+            private readonly IBindable<string> collectionName;
             private readonly BeatmapCollection collection;
 
+            [Resolved]
+            private BeatmapCollectionManager collectionManager { get; set; }
+
             private ItemTextBox textBox;
 
             public ItemContent(BeatmapCollection collection)
@@ -44,6 +58,8 @@ namespace osu.Game.Collections
                 RelativeSizeAxes = Axes.X;
                 Height = item_height;
                 Masking = true;
+
+                collectionName = collection.Name.GetBoundCopy();
             }
 
             [BackgroundDependencyLoader]
@@ -55,6 +71,7 @@ namespace osu.Game.Collections
                     {
                         Anchor = Anchor.CentreRight,
                         Origin = Anchor.CentreRight,
+                        IsCreated = { BindTarget = IsCreated },
                         IsTextBoxHovered = v => textBox.ReceivePositionalInputAt(v)
                     },
                     new Container
@@ -68,12 +85,37 @@ namespace osu.Game.Collections
                                 RelativeSizeAxes = Axes.Both,
                                 Size = Vector2.One,
                                 CornerRadius = item_height / 2,
-                                Current = collection.Name
+                                Current = collection.Name,
+                                PlaceholderText = IsCreated.Value ? string.Empty : "Create a new collection"
                             },
                         }
                     },
                 };
             }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                collectionName.BindValueChanged(_ => createNewCollection(), true);
+            }
+
+            private void createNewCollection()
+            {
+                if (IsCreated.Value)
+                    return;
+
+                if (string.IsNullOrEmpty(collectionName.Value))
+                    return;
+
+                // Add the new collection and disable our placeholder. If all text is removed, the placeholder should not show back again.
+                collectionManager.Collections.Add(collection);
+                textBox.PlaceholderText = string.Empty;
+
+                // When this item changes from placeholder to non-placeholder (via changing containers), its textbox will lose focus, so it needs to be re-focused.
+                Schedule(() => GetContainingInputManager().ChangeFocus(textBox));
+
+                IsCreated.Value = true;
+            }
         }
 
         private class ItemTextBox : OsuTextBox
@@ -90,6 +132,8 @@ namespace osu.Game.Collections
 
         public class DeleteButton : CompositeDrawable
         {
+            public readonly IBindable<bool> IsCreated = new Bindable<bool>();
+
             public Func<Vector2, bool> IsTextBoxHovered;
 
             [Resolved(CanBeNull = true)]
@@ -100,6 +144,7 @@ namespace osu.Game.Collections
 
             private readonly BeatmapCollection collection;
 
+            private Drawable fadeContainer;
             private Drawable background;
 
             public DeleteButton(BeatmapCollection collection)
@@ -108,42 +153,51 @@ namespace osu.Game.Collections
                 RelativeSizeAxes = Axes.Y;
 
                 Width = button_width + item_height / 2; // add corner radius to cover with fill
-
-                Alpha = 0.1f;
             }
 
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
-                InternalChildren = new[]
+                InternalChild = fadeContainer = new Container
                 {
-                    background = new Box
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.1f,
+                    Children = new[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colours.Red
-                    },
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.Centre,
-                        X = -button_width * 0.6f,
-                        Size = new Vector2(10),
-                        Icon = FontAwesome.Solid.Trash
+                        background = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = colours.Red
+                        },
+                        new SpriteIcon
+                        {
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.Centre,
+                            X = -button_width * 0.6f,
+                            Size = new Vector2(10),
+                            Icon = FontAwesome.Solid.Trash
+                        }
                     }
                 };
             }
 
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                IsCreated.BindValueChanged(created => Alpha = created.NewValue ? 1 : 0, true);
+            }
+
             public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) && !IsTextBoxHovered(screenSpacePos);
 
             protected override bool OnHover(HoverEvent e)
             {
-                this.FadeTo(1f, 100, Easing.Out);
+                fadeContainer.FadeTo(1f, 100, Easing.Out);
                 return false;
             }
 
             protected override void OnHoverLost(HoverLostEvent e)
             {
-                this.FadeTo(0.1f, 100);
+                fadeContainer.FadeTo(0.1f, 100);
             }
 
             protected override bool OnClick(ClickEvent e)
diff --git a/osu.Game/Collections/ManageCollectionsDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
index 036a745913..8f8ac9542c 100644
--- a/osu.Game/Collections/ManageCollectionsDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osuTK;
 
 namespace osu.Game.Collections
@@ -51,9 +50,7 @@ namespace osu.Game.Collections
                         RelativeSizeAxes = Axes.Both,
                         RowDimensions = new[]
                         {
-                            new Dimension(GridSizeMode.Absolute, 50),
-                            new Dimension(),
-                            new Dimension(GridSizeMode.Absolute, 50),
+                            new Dimension(GridSizeMode.AutoSize),
                         },
                         Content = new[]
                         {
@@ -65,6 +62,7 @@ namespace osu.Game.Collections
                                     Origin = Anchor.Centre,
                                     Text = "Manage collections",
                                     Font = OsuFont.GetFont(size: 30),
+                                    Padding = new MarginPadding { Vertical = 10 },
                                 }
                             },
                             new Drawable[]
@@ -87,19 +85,6 @@ namespace osu.Game.Collections
                                     }
                                 }
                             },
-                            new Drawable[]
-                            {
-                                new OsuButton
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    RelativeSizeAxes = Axes.Both,
-                                    Size = Vector2.One,
-                                    Padding = new MarginPadding(10),
-                                    Text = "Create new collection",
-                                    Action = () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "My new collection" } })
-                                },
-                            },
                         }
                     }
                 }

From 38ade433a62b449be687ba3409cfd854d4d04876 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 16:50:51 +0900
Subject: [PATCH 04650/10326] Add some xmldocs

---
 osu.Game/Collections/DrawableCollectionList.cs  | 17 +++++++++++++++++
 .../Collections/DrawableCollectionListItem.cs   | 11 +++++++++++
 2 files changed, 28 insertions(+)

diff --git a/osu.Game/Collections/DrawableCollectionList.cs b/osu.Game/Collections/DrawableCollectionList.cs
index f4b5a89b3e..3c664a11d9 100644
--- a/osu.Game/Collections/DrawableCollectionList.cs
+++ b/osu.Game/Collections/DrawableCollectionList.cs
@@ -10,6 +10,9 @@ using osuTK;
 
 namespace osu.Game.Collections
 {
+    /// <summary>
+    /// Visualises a list of <see cref="BeatmapCollection"/>s.
+    /// </summary>
     public class DrawableCollectionList : OsuRearrangeableListContainer<BeatmapCollection>
     {
         private Scroll scroll;
@@ -29,8 +32,18 @@ namespace osu.Game.Collections
             return new DrawableCollectionListItem(item, true);
         }
 
+        /// <summary>
+        /// The scroll container for this <see cref="DrawableCollectionList"/>.
+        /// Contains the main flow of <see cref="DrawableCollectionListItem"/> and attaches a placeholder item to the end of the list.
+        /// </summary>
+        /// <remarks>
+        /// Use <see cref="ReplacePlaceholder"/> to transfer the placeholder into the main list.
+        /// </remarks>
         private class Scroll : OsuScrollContainer
         {
+            /// <summary>
+            /// The currently-displayed placeholder item.
+            /// </summary>
             public DrawableCollectionListItem PlaceholderItem { get; private set; }
 
             protected override Container<Drawable> Content => content;
@@ -74,6 +87,7 @@ namespace osu.Game.Collections
             /// <summary>
             /// Replaces the current <see cref="PlaceholderItem"/> with a new one, and returns the previous.
             /// </summary>
+            /// <returns>The current <see cref="PlaceholderItem"/>.</returns>
             public DrawableCollectionListItem ReplacePlaceholder()
             {
                 var previous = PlaceholderItem;
@@ -85,6 +99,9 @@ namespace osu.Game.Collections
             }
         }
 
+        /// <summary>
+        /// The flow of <see cref="DrawableCollectionListItem"/>. Disables layout easing unless a drag is in progress.
+        /// </summary>
         private class Flow : FillFlowContainer<RearrangeableListItem<BeatmapCollection>>
         {
             public readonly IBindable<bool> DragActive = new Bindable<bool>();
diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index 90d5bae223..489382ec9e 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -19,6 +19,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Collections
 {
+    /// <summary>
+    /// Visualises a <see cref="BeatmapCollection"/> inside a <see cref="DrawableCollectionList"/>.
+    /// </summary>
     public class DrawableCollectionListItem : OsuRearrangeableListItem<BeatmapCollection>
     {
         private const float item_height = 35;
@@ -26,6 +29,11 @@ namespace osu.Game.Collections
 
         private readonly Bindable<bool> isCreated = new Bindable<bool>();
 
+        /// <summary>
+        /// Creates a new <see cref="DrawableCollectionListItem"/>.
+        /// </summary>
+        /// <param name="item">The <see cref="BeatmapCollection"/>.</param>
+        /// <param name="isCreated">Whether <paramref name="item"/> currently exists inside the <see cref="BeatmapCollectionManager"/>.</param>
         public DrawableCollectionListItem(BeatmapCollection item, bool isCreated)
             : base(item)
         {
@@ -39,6 +47,9 @@ namespace osu.Game.Collections
             IsCreated = { BindTarget = isCreated }
         };
 
+        /// <summary>
+        /// The main content of the <see cref="DrawableCollectionListItem"/>.
+        /// </summary>
         private class ItemContent : CircularContainer
         {
             public readonly Bindable<bool> IsCreated = new Bindable<bool>();

From 2e40ff25f7228ed74aaf12fbd83ada10b4a0a917 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 17:05:31 +0900
Subject: [PATCH 04651/10326] Only pad textbox after collection is created

---
 osu.Game/Collections/DrawableCollectionListItem.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index 489382ec9e..c67946977d 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -60,6 +60,7 @@ namespace osu.Game.Collections
             [Resolved]
             private BeatmapCollectionManager collectionManager { get; set; }
 
+            private Container textBoxPaddingContainer;
             private ItemTextBox textBox;
 
             public ItemContent(BeatmapCollection collection)
@@ -85,7 +86,7 @@ namespace osu.Game.Collections
                         IsCreated = { BindTarget = IsCreated },
                         IsTextBoxHovered = v => textBox.ReceivePositionalInputAt(v)
                     },
-                    new Container
+                    textBoxPaddingContainer = new Container
                     {
                         RelativeSizeAxes = Axes.Both,
                         Padding = new MarginPadding { Right = button_width },
@@ -107,7 +108,9 @@ namespace osu.Game.Collections
             protected override void LoadComplete()
             {
                 base.LoadComplete();
+
                 collectionName.BindValueChanged(_ => createNewCollection(), true);
+                IsCreated.BindValueChanged(created => textBoxPaddingContainer.Padding = new MarginPadding { Right = created.NewValue ? button_width : 0 }, true);
             }
 
             private void createNewCollection()

From bee450ae1ecba24a161e681e53e53f94462428fd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 17:05:43 +0900
Subject: [PATCH 04652/10326] Fix tests/add placeholder item tests

---
 .../TestSceneManageCollectionsDialog.cs       | 80 ++++++++++++++-----
 .../SongSelect/TestSceneFilterControl.cs      | 14 ++--
 .../Collections/DrawableCollectionListItem.cs |  5 ++
 3 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index fdaded6a5c..0c57c27911 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -7,11 +7,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Platform;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps;
 using osu.Game.Collections;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
+using osu.Game.Rulesets;
+using osu.Game.Tests.Resources;
 using osuTK;
 using osuTK.Input;
 
@@ -25,6 +28,9 @@ namespace osu.Game.Tests.Visual.Collections
         private readonly DialogOverlay dialogOverlay;
         private readonly BeatmapCollectionManager manager;
 
+        private RulesetStore rulesets;
+        private BeatmapManager beatmapManager;
+
         private ManageCollectionsDialog dialog;
 
         public TestSceneManageCollectionsDialog()
@@ -37,6 +43,15 @@ namespace osu.Game.Tests.Visual.Collections
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
+
+            beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+        }
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
@@ -65,6 +80,12 @@ namespace osu.Game.Tests.Visual.Collections
             AddStep("hide dialog", () => dialog.Hide());
         }
 
+        [Test]
+        public void TestLastItemIsPlaceholder()
+        {
+            AddAssert("last item is placeholder", () => !manager.Collections.Contains(dialog.ChildrenOfType<DrawableCollectionListItem>().Last().Model));
+        }
+
         [Test]
         public void TestAddCollectionExternal()
         {
@@ -78,23 +99,34 @@ namespace osu.Game.Tests.Visual.Collections
         }
 
         [Test]
-        public void TestAddCollectionViaButton()
+        public void TestFocusPlaceholderDoesNotCreateCollection()
         {
-            AddStep("press new collection button", () =>
+            AddStep("focus placeholder", () =>
             {
-                InputManager.MoveMouseTo(dialog.ChildrenOfType<OsuButton>().Single());
+                InputManager.MoveMouseTo(dialog.ChildrenOfType<DrawableCollectionListItem>().Last());
                 InputManager.Click(MouseButton.Left);
             });
 
+            assertCollectionCount(0);
+        }
+
+        [Test]
+        public void TestAddCollectionViaPlaceholder()
+        {
+            DrawableCollectionListItem placeholderItem = null;
+
+            AddStep("focus placeholder", () =>
+            {
+                InputManager.MoveMouseTo(placeholderItem = dialog.ChildrenOfType<DrawableCollectionListItem>().Last());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            // Done directly via the collection since InputManager methods cannot add text to textbox...
+            AddStep("change collection name", () => placeholderItem.Model.Name.Value = "a");
             assertCollectionCount(1);
+            AddAssert("collection now exists", () => manager.Collections.Contains(placeholderItem.Model));
 
-            AddStep("press again", () =>
-            {
-                InputManager.MoveMouseTo(dialog.ChildrenOfType<OsuButton>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
-
-            assertCollectionCount(2);
+            AddAssert("last item is placeholder", () => !manager.Collections.Contains(dialog.ChildrenOfType<DrawableCollectionListItem>().Last().Model));
         }
 
         [Test]
@@ -117,7 +149,7 @@ namespace osu.Game.Tests.Visual.Collections
             AddStep("add two collections", () => manager.Collections.AddRange(new[]
             {
                 new BeatmapCollection { Name = { Value = "1" } },
-                new BeatmapCollection { Name = { Value = "2" } },
+                new BeatmapCollection { Name = { Value = "2" }, Beatmaps = { beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0] } },
             }));
 
             assertCollectionCount(2);
@@ -128,6 +160,16 @@ namespace osu.Game.Tests.Visual.Collections
                 InputManager.Click(MouseButton.Left);
             });
 
+            AddAssert("dialog not displayed", () => dialogOverlay.CurrentDialog == null);
+            assertCollectionCount(1);
+            assertCollectionName(0, "2");
+
+            AddStep("click first delete button", () =>
+            {
+                InputManager.MoveMouseTo(dialog.ChildrenOfType<DrawableCollectionListItem.DeleteButton>().First(), new Vector2(5, 0));
+                InputManager.Click(MouseButton.Left);
+            });
+
             AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is DeleteCollectionDialog);
             AddStep("click confirmation", () =>
             {
@@ -135,8 +177,7 @@ namespace osu.Game.Tests.Visual.Collections
                 InputManager.Click(MouseButton.Left);
             });
 
-            assertCollectionCount(1);
-            assertCollectionName(0, "2");
+            assertCollectionCount(0);
         }
 
         [Test]
@@ -144,11 +185,10 @@ namespace osu.Game.Tests.Visual.Collections
         {
             AddStep("add two collections", () => manager.Collections.AddRange(new[]
             {
-                new BeatmapCollection { Name = { Value = "1" } },
-                new BeatmapCollection { Name = { Value = "2" } },
+                new BeatmapCollection { Name = { Value = "1" }, Beatmaps = { beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0] } },
             }));
 
-            assertCollectionCount(2);
+            assertCollectionCount(1);
 
             AddStep("click first delete button", () =>
             {
@@ -157,13 +197,13 @@ namespace osu.Game.Tests.Visual.Collections
             });
 
             AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is DeleteCollectionDialog);
-            AddStep("click confirmation", () =>
+            AddStep("click cancellation", () =>
             {
                 InputManager.MoveMouseTo(dialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().Last());
                 InputManager.Click(MouseButton.Left);
             });
 
-            assertCollectionCount(2);
+            assertCollectionCount(1);
         }
 
         [Test]
@@ -196,7 +236,7 @@ namespace osu.Game.Tests.Visual.Collections
         }
 
         private void assertCollectionCount(int count)
-            => AddUntilStep($"{count} collections shown", () => dialog.ChildrenOfType<DrawableCollectionListItem>().Count() == count);
+            => AddUntilStep($"{count} collections shown", () => dialog.ChildrenOfType<DrawableCollectionListItem>().Count(i => i.IsCreated.Value) == count);
 
         private void assertCollectionName(int index, string name)
             => AddUntilStep($"item {index + 1} has correct name", () => dialog.ChildrenOfType<DrawableCollectionListItem>().ElementAt(index).ChildrenOfType<TextBox>().First().Text == name);
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 65b554b27b..4606c7b0c3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -42,13 +42,6 @@ namespace osu.Game.Tests.Visual.SongSelect
             });
         }
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.Cache(collectionManager);
-            return dependencies;
-        }
-
         [BackgroundDependencyLoader]
         private void load(GameHost host)
         {
@@ -58,6 +51,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
         }
 
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies.Cache(collectionManager);
+            return dependencies;
+        }
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index c67946977d..a7075c3179 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -27,6 +27,11 @@ namespace osu.Game.Collections
         private const float item_height = 35;
         private const float button_width = item_height * 0.75f;
 
+        /// <summary>
+        /// Whether the <see cref="BeatmapCollection"/> currently exists inside the <see cref="BeatmapCollectionManager"/>.
+        /// </summary>
+        public IBindable<bool> IsCreated => isCreated;
+
         private readonly Bindable<bool> isCreated = new Bindable<bool>();
 
         /// <summary>

From d2650fc1a05e012a58a2283a59ce4dfdc6e634e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 17:12:58 +0900
Subject: [PATCH 04653/10326] Add count to deletion dialog

---
 osu.Game/Collections/DeleteCollectionDialog.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Collections/DeleteCollectionDialog.cs b/osu.Game/Collections/DeleteCollectionDialog.cs
index 8c8c897146..e5a2f6fb81 100644
--- a/osu.Game/Collections/DeleteCollectionDialog.cs
+++ b/osu.Game/Collections/DeleteCollectionDialog.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Humanizer;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 
@@ -12,7 +13,7 @@ namespace osu.Game.Collections
         public DeleteCollectionDialog(BeatmapCollection collection, Action deleteAction)
         {
             HeaderText = "Confirm deletion of";
-            BodyText = collection.Name.Value;
+            BodyText = $"{collection.Name.Value} ({"beatmap".ToQuantity(collection.Beatmaps.Count)})";
 
             Icon = FontAwesome.Regular.TrashAlt;
 

From 4737add00bc99290652f585bf85a6acbc4d70c55 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 17:21:29 +0900
Subject: [PATCH 04654/10326] Add close button to dialog

---
 .../Collections/ManageCollectionsDialog.cs    | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Collections/ManageCollectionsDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
index 8f8ac9542c..f6964191a1 100644
--- a/osu.Game/Collections/ManageCollectionsDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -5,9 +5,11 @@ 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.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osuTK;
 
 namespace osu.Game.Collections
@@ -56,13 +58,31 @@ namespace osu.Game.Collections
                         {
                             new Drawable[]
                             {
-                                new OsuSpriteText
+                                new Container
                                 {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Text = "Manage collections",
-                                    Font = OsuFont.GetFont(size: 30),
-                                    Padding = new MarginPadding { Vertical = 10 },
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            Text = "Manage collections",
+                                            Font = OsuFont.GetFont(size: 30),
+                                            Padding = new MarginPadding { Vertical = 10 },
+                                        },
+                                        new IconButton
+                                        {
+                                            Anchor = Anchor.CentreRight,
+                                            Origin = Anchor.CentreRight,
+                                            Icon = FontAwesome.Solid.Times,
+                                            Colour = colours.GreySeafoamDarker,
+                                            Scale = new Vector2(0.8f),
+                                            X = -10,
+                                            Action = () => State.Value = Visibility.Hidden
+                                        }
+                                    }
                                 }
                             },
                             new Drawable[]

From c3123bf11712937fed58039477442717e7e8076b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 17:22:59 +0900
Subject: [PATCH 04655/10326] Rename drag blueprint selection method for
 discoverability

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index fcff672045..865e225645 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             AddRangeInternal(new[]
             {
-                DragBox = CreateDragBox(select),
+                DragBox = CreateDragBox(selectBlueprintsFromDragRectangle),
                 selectionHandler,
                 SelectionBlueprints = CreateSelectionBlueprintContainer(),
                 selectionHandler.CreateProxy(),
@@ -326,7 +326,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Select all masks in a given rectangle selection area.
         /// </summary>
         /// <param name="rect">The rectangle to perform a selection on in screen-space coordinates.</param>
-        private void select(RectangleF rect)
+        private void selectBlueprintsFromDragRectangle(RectangleF rect)
         {
             foreach (var blueprint in SelectionBlueprints)
             {

From 06328e00001315d83d70cfabef4a350d434d8399 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 17:58:56 +0900
Subject: [PATCH 04656/10326] Add import/deletion progress notifications

---
 .../Collections/BeatmapCollectionManager.cs   | 56 ++++++++++++++++++-
 osu.Game/OsuGame.cs                           |  1 +
 .../Sections/Maintenance/GeneralSettings.cs   |  2 +-
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
index a553ac632e..6a5ed6bbbc 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -57,6 +57,10 @@ namespace osu.Game.Collections
                 c.Changed += backgroundSave;
             Collections.CollectionChanged += (_, __) => backgroundSave();
         }
+        /// <summary>
+        /// Set an endpoint for notifications to be posted to.
+        /// </summary>
+        public Action<Notification> PostNotification { protected get; set; }
 
         /// <summary>
         /// Set a storage with access to an osu-stable install for import purposes.
@@ -93,9 +97,25 @@ namespace osu.Game.Collections
             });
         }
 
-        public async Task Import(Stream stream) => await Task.Run(async () =>
+        public async Task Import(Stream stream)
         {
-            var collection = readCollections(stream);
+            var notification = new ProgressNotification
+            {
+                State = ProgressNotificationState.Active,
+                Text = "Collections import is initialising..."
+            };
+
+            PostNotification?.Invoke(notification);
+
+            await import(stream, notification);
+        }
+
+        private async Task import(Stream stream, ProgressNotification notification = null) => await Task.Run(async () =>
+        {
+            if (notification != null)
+                notification.Progress = 0;
+
+            var collection = readCollections(stream, notification);
             bool importCompleted = false;
 
             Schedule(() =>
@@ -106,6 +126,12 @@ namespace osu.Game.Collections
 
             while (!IsDisposed && !importCompleted)
                 await Task.Delay(10);
+
+            if (notification != null)
+            {
+                notification.CompletionText = $"Imported {collection.Count} collections";
+                notification.State = ProgressNotificationState.Completed;
+            }
         });
 
         private void importCollections(List<BeatmapCollection> newCollections)
@@ -124,8 +150,14 @@ namespace osu.Game.Collections
             }
         }
 
-        private List<BeatmapCollection> readCollections(Stream stream)
+        private List<BeatmapCollection> readCollections(Stream stream, ProgressNotification notification = null)
         {
+            if (notification != null)
+            {
+                notification.Text = "Reading collections...";
+                notification.Progress = 0;
+            }
+
             var result = new List<BeatmapCollection>();
 
             try
@@ -139,11 +171,17 @@ namespace osu.Game.Collections
 
                     for (int i = 0; i < collectionCount; i++)
                     {
+                        if (notification?.CancellationToken.IsCancellationRequested == true)
+                            return result;
+
                         var collection = new BeatmapCollection { Name = { Value = sr.ReadString() } };
                         int mapCount = sr.ReadInt32();
 
                         for (int j = 0; j < mapCount; j++)
                         {
+                            if (notification?.CancellationToken.IsCancellationRequested == true)
+                                return result;
+
                             string checksum = sr.ReadString();
 
                             var beatmap = beatmaps.QueryBeatmap(b => b.MD5Hash == checksum);
@@ -151,6 +189,12 @@ namespace osu.Game.Collections
                                 collection.Beatmaps.Add(beatmap);
                         }
 
+                        if (notification != null)
+                        {
+                            notification.Text = $"Imported {i + 1} of {collectionCount} collections";
+                            notification.Progress = (float)(i + 1) / collectionCount;
+                        }
+
                         result.Add(collection);
                     }
                 }
@@ -163,6 +207,12 @@ namespace osu.Game.Collections
             return result;
         }
 
+        public void DeleteAll()
+        {
+            Collections.Clear();
+            PostNotification?.Invoke(new SimpleNotification { Text = "Deleted all collections!" });
+        }
+
         private readonly object saveLock = new object();
         private int lastSave;
         private int saveFailures;
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 8434ee11fa..33a353742d 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -537,6 +537,7 @@ namespace osu.Game
             ScoreManager.GetStableStorage = GetStorageForStableInstall;
             ScoreManager.PresentImport = items => PresentScore(items.First());
 
+            CollectionManager.PostNotification = n => notifications.Post(n);
             CollectionManager.GetStableStorage = GetStorageForStableInstall;
 
             Container logoContainer;
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 74f9920ae0..30fd5921eb 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 Text = "Delete ALL collections",
                 Action = () =>
                 {
-                    dialogOverlay?.Push(new DeleteAllBeatmapsDialog(() => collectionManager.Collections.Clear()));
+                    dialogOverlay?.Push(new DeleteAllBeatmapsDialog(collectionManager.DeleteAll));
                 }
             });
 

From 070704cba719a124bd48c6b5a9133ddaae157e92 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 17:59:38 +0900
Subject: [PATCH 04657/10326] Asyncify initial load

---
 .../Collections/BeatmapCollectionManager.cs   | 41 ++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
index 6a5ed6bbbc..e4fc4c377b 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -15,6 +16,7 @@ using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.IO.Legacy;
+using osu.Game.Overlays.Notifications;
 
 namespace osu.Game.Collections
 {
@@ -46,17 +48,46 @@ namespace osu.Game.Collections
 
         [BackgroundDependencyLoader]
         private void load()
+        {
+            Collections.CollectionChanged += collectionsChanged;
+            loadDatabase();
+        }
+
+        private void collectionsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (var c in e.NewItems.Cast<BeatmapCollection>())
+                        c.Changed += backgroundSave;
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (var c in e.OldItems.Cast<BeatmapCollection>())
+                        c.Changed -= backgroundSave;
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (var c in e.OldItems.Cast<BeatmapCollection>())
+                        c.Changed -= backgroundSave;
+
+                    foreach (var c in e.NewItems.Cast<BeatmapCollection>())
+                        c.Changed += backgroundSave;
+                    break;
+            }
+
+            backgroundSave();
+        }
+
+        private void loadDatabase() => Task.Run(async () =>
         {
             if (storage.Exists(database_name))
             {
                 using (var stream = storage.GetStream(database_name))
-                    importCollections(readCollections(stream));
+                    await import(stream);
             }
+        });
 
-            foreach (var c in Collections)
-                c.Changed += backgroundSave;
-            Collections.CollectionChanged += (_, __) => backgroundSave();
-        }
         /// <summary>
         /// Set an endpoint for notifications to be posted to.
         /// </summary>

From b1110e5e3a1778a4cf5075728194e524c468f0c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 18:10:14 +0900
Subject: [PATCH 04658/10326] Rename class to match derived class

---
 osu.Game/OsuGame.cs                                             | 2 +-
 .../Music/{MusicActionHandler.cs => MusicKeyBindingHandler.cs}  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game/Overlays/Music/{MusicActionHandler.cs => MusicKeyBindingHandler.cs} (96%)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a73469d836..b4e671d0b0 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -648,7 +648,7 @@ namespace osu.Game
             chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible;
 
             Add(externalLinkOpener = new ExternalLinkOpener());
-            Add(new MusicActionHandler());
+            Add(new MusicKeyBindingHandler());
 
             // side overlays which cancel each other.
             var singleDisplaySideOverlays = new OverlayContainer[] { Settings, notifications };
diff --git a/osu.Game/Overlays/Music/MusicActionHandler.cs b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
similarity index 96%
rename from osu.Game/Overlays/Music/MusicActionHandler.cs
rename to osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
index cd8548c1c0..78e6ba1381 100644
--- a/osu.Game/Overlays/Music/MusicActionHandler.cs
+++ b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Music
     /// <summary>
     /// Handles <see cref="GlobalAction"/> relating to music playback, and displays a <see cref="Toast"/> via the cached <see cref="OnScreenDisplay"/> accordingly.
     /// </summary>
-    public class MusicActionHandler : Component, IKeyBindingHandler<GlobalAction>
+    public class MusicKeyBindingHandler : Component, IKeyBindingHandler<GlobalAction>
     {
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }

From a46be45a71b9b70ca1b70b68d54d33a625070a4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 18:12:03 +0900
Subject: [PATCH 04659/10326] Fix OSD occasionally display incorrect play/pause
 state

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

diff --git a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
index 78e6ba1381..277fb1a35d 100644
--- a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
+++ b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
@@ -33,9 +33,11 @@ namespace osu.Game.Overlays.Music
             switch (action)
             {
                 case GlobalAction.MusicPlay:
-                    if (musicController.TogglePause())
-                        onScreenDisplay?.Display(new MusicActionToast(musicController.IsPlaying ? "Play track" : "Pause track"));
+                    // use previous state as TogglePause may not update the track's state immediately (state update is run on the audio thread see https://github.com/ppy/osu/issues/9880#issuecomment-674668842)
+                    bool wasPlaying = musicController.IsPlaying;
 
+                    if (musicController.TogglePause())
+                        onScreenDisplay?.Display(new MusicActionToast(wasPlaying ? "Pause track" : "Play track"));
                     return true;
 
                 case GlobalAction.MusicNext:

From 14bf2ab936b38c16cccbac254293d28791002b33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 18:21:26 +0900
Subject: [PATCH 04660/10326] Fix grammar in xmldoc

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

diff --git a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
index 78e6ba1381..02196348ae 100644
--- a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
+++ b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
@@ -12,7 +12,7 @@ using osu.Game.Overlays.OSD;
 namespace osu.Game.Overlays.Music
 {
     /// <summary>
-    /// Handles <see cref="GlobalAction"/> relating to music playback, and displays a <see cref="Toast"/> via the cached <see cref="OnScreenDisplay"/> accordingly.
+    /// Handles <see cref="GlobalAction"/>s related to music playback, and displays <see cref="Toast"/>s via the global <see cref="OnScreenDisplay"/> accordingly.
     /// </summary>
     public class MusicKeyBindingHandler : Component, IKeyBindingHandler<GlobalAction>
     {

From f581df47c8edcf03771ae1e019323f0a23301995 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 18:25:09 +0900
Subject: [PATCH 04661/10326] Add "New collection..." item to dropdown

---
 .../SongSelect/TestSceneFilterControl.cs      | 23 +++++++++++++++++++
 osu.Game/Screens/Select/CollectionFilter.cs   | 17 ++++++++++++++
 .../Select/CollectionFilterDropdown.cs        | 18 ++++++++++++---
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 4606c7b0c3..955fe04c8c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -184,6 +184,29 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("button is plus", () => getAddOrRemoveButton(1).Icon.Equals(FontAwesome.Solid.PlusSquare));
         }
 
+        [Test]
+        public void TestNewCollectionFilterIsNotSelected()
+        {
+            addExpandHeaderStep();
+
+            AddStep("add collection", () => collectionManager.Collections.Add(new BeatmapCollection { Name = { Value = "1" } }));
+            AddStep("select collection", () =>
+            {
+                InputManager.MoveMouseTo(getCollectionDropdownItems().ElementAt(1));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            addExpandHeaderStep();
+
+            AddStep("click manage collections filter", () =>
+            {
+                InputManager.MoveMouseTo(getCollectionDropdownItems().Last());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("collection filter still selected", () => control.CreateCriteria().Collection?.CollectionName.Value == "1");
+        }
+
         private void assertCollectionHeaderDisplays(string collectionName, bool shouldDisplay = true)
             => AddAssert($"collection dropdown header displays '{collectionName}'",
                 () => shouldDisplay == (control.ChildrenOfType<CollectionFilterDropdown.CollectionDropdownHeader>().Single().ChildrenOfType<SpriteText>().First().Text == collectionName));
diff --git a/osu.Game/Screens/Select/CollectionFilter.cs b/osu.Game/Screens/Select/CollectionFilter.cs
index 7628ed391e..9e36e3e089 100644
--- a/osu.Game/Screens/Select/CollectionFilter.cs
+++ b/osu.Game/Screens/Select/CollectionFilter.cs
@@ -45,4 +45,21 @@ namespace osu.Game.Screens.Select
         public virtual bool ContainsBeatmap(BeatmapInfo beatmap)
             => Collection?.Beatmaps.Any(b => b.Equals(beatmap)) ?? true;
     }
+
+    public class AllBeatmapCollectionFilter : CollectionFilter
+    {
+        public AllBeatmapCollectionFilter()
+            : base(null)
+        {
+        }
+    }
+
+    public class NewCollectionFilter : CollectionFilter
+    {
+        public NewCollectionFilter()
+            : base(null)
+        {
+            CollectionName.Value = "New collection...";
+        }
+    }
 }
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index 4e9e12fcaf..5e5c684fe2 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -29,6 +29,9 @@ namespace osu.Game.Screens.Select
         private readonly IBindableList<BeatmapInfo> beatmaps = new BindableList<BeatmapInfo>();
         private readonly BindableList<CollectionFilter> filters = new BindableList<CollectionFilter>();
 
+        [Resolved(CanBeNull = true)]
+        private ManageCollectionsDialog manageCollectionsDialog { get; set; }
+
         public CollectionFilterDropdown()
         {
             ItemSource = filters;
@@ -57,10 +60,11 @@ namespace osu.Game.Screens.Select
             var selectedItem = SelectedItem?.Value?.Collection;
 
             filters.Clear();
-            filters.Add(new CollectionFilter(null));
+            filters.Add(new AllBeatmapCollectionFilter());
             filters.AddRange(collections.Select(c => new CollectionFilter(c)));
+            filters.Add(new NewCollectionFilter());
 
-            Current.Value = filters.SingleOrDefault(f => f.Collection == selectedItem) ?? filters[0];
+            Current.Value = filters.SingleOrDefault(f => f.Collection != null && f.Collection == selectedItem) ?? filters[0];
         }
 
         /// <summary>
@@ -78,6 +82,14 @@ namespace osu.Game.Screens.Select
                 beatmaps.BindTo(filter.NewValue.Collection.Beatmaps);
 
             beatmaps.CollectionChanged += filterBeatmapsChanged;
+
+            // Never select the manage collection filter - rollback to the previous filter.
+            // This is done after the above since it is important that bindable is unbound from OldValue, which is lost after forcing it back to the old value.
+            if (filter.NewValue is NewCollectionFilter)
+            {
+                Current.Value = filter.OldValue;
+                manageCollectionsDialog?.Show();
+            }
         }
 
         /// <summary>
@@ -90,7 +102,7 @@ namespace osu.Game.Screens.Select
             Current.TriggerChange();
         }
 
-        protected override string GenerateItemText(CollectionFilter item) => item.Collection?.Name.Value ?? "All beatmaps";
+        protected override string GenerateItemText(CollectionFilter item) => item.CollectionName.Value;
 
         protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader
         {

From ad5d6117c76856237d2215a89f8c2f7c2ab7524d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 18:26:13 +0900
Subject: [PATCH 04662/10326] Remove unnecessary RunTask calls

---
 .../Overlays/Music/MusicKeyBindingHandler.cs    |  7 ++-----
 osu.Game/Overlays/MusicController.cs            | 17 ++++-------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
index 02196348ae..f5968614cd 100644
--- a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
+++ b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
@@ -39,10 +39,7 @@ namespace osu.Game.Overlays.Music
                     return true;
 
                 case GlobalAction.MusicNext:
-                    musicController.NextTrack(() =>
-                    {
-                        onScreenDisplay?.Display(new MusicActionToast("Next track"));
-                    }).RunTask();
+                    musicController.NextTrack(() => onScreenDisplay?.Display(new MusicActionToast("Next track")));
 
                     return true;
 
@@ -59,7 +56,7 @@ namespace osu.Game.Overlays.Music
                                 onScreenDisplay?.Display(new MusicActionToast("Previous track"));
                                 break;
                         }
-                    }).RunTask();
+                    });
 
                     return true;
             }
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index a405be1b74..b568e4d02b 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -201,13 +201,8 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Play the previous track or restart the current track if it's current time below <see cref="restart_cutoff_point"/>.
         /// </summary>
-        /// <param name="onSuccess">
-        /// Invoked when the operation has been performed successfully.
-        /// The result isn't returned directly to the caller because
-        /// the operation is scheduled and isn't performed immediately.
-        /// </param>
-        /// <returns>A <see cref="ScheduledDelegate"/> of the operation.</returns>
-        public ScheduledDelegate PreviousTrack(Action<PreviousTrackResult> onSuccess = null) => Schedule(() =>
+        /// <param name="onSuccess">Invoked when the operation has been performed successfully.</param>
+        public void PreviousTrack(Action<PreviousTrackResult> onSuccess = null) => Schedule(() =>
         {
             PreviousTrackResult res = prev();
             if (res != PreviousTrackResult.None)
@@ -248,13 +243,9 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Play the next random or playlist track.
         /// </summary>
-        /// <param name="onSuccess">
-        /// Invoked when the operation has been performed successfully.
-        /// The result isn't returned directly to the caller because
-        /// the operation is scheduled and isn't performed immediately.
-        /// </param>
+        /// <param name="onSuccess">Invoked when the operation has been performed successfully.</param>
         /// <returns>A <see cref="ScheduledDelegate"/> of the operation.</returns>
-        public ScheduledDelegate NextTrack(Action onSuccess = null) => Schedule(() =>
+        public void NextTrack(Action onSuccess = null) => Schedule(() =>
         {
             bool res = next();
             if (res)

From e1053c4b6f9376884786084e0d48a26962f6edcf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 18:36:11 +0900
Subject: [PATCH 04663/10326] Revert exposure changes to GlobalActionContainer

---
 .../Visual/Menus/TestSceneMusicActionHandling.cs    | 13 ++++++++-----
 .../Visual/Navigation/OsuGameTestScene.cs           |  3 ---
 osu.Game/OsuGameBase.cs                             | 11 ++++++-----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
index 9b8ba47992..4cad2b19d5 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
@@ -14,13 +15,15 @@ namespace osu.Game.Tests.Visual.Menus
 {
     public class TestSceneMusicActionHandling : OsuGameTestScene
     {
+        private GlobalActionContainer globalActionContainer => Game.ChildrenOfType<GlobalActionContainer>().First();
+
         [Test]
         public void TestMusicPlayAction()
         {
             AddStep("ensure playing something", () => Game.MusicController.EnsurePlayingSomething());
-            AddStep("toggle playback", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPlay));
+            AddStep("toggle playback", () => globalActionContainer.TriggerPressed(GlobalAction.MusicPlay));
             AddAssert("music paused", () => !Game.MusicController.IsPlaying && Game.MusicController.IsUserPaused);
-            AddStep("toggle playback", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPlay));
+            AddStep("toggle playback", () => globalActionContainer.TriggerPressed(GlobalAction.MusicPlay));
             AddAssert("music resumed", () => Game.MusicController.IsPlaying && !Game.MusicController.IsUserPaused);
         }
 
@@ -62,16 +65,16 @@ namespace osu.Game.Tests.Visual.Menus
             AddStep("seek track to 6 second", () => Game.MusicController.SeekTo(6000));
             AddUntilStep("wait for current time to update", () => Game.MusicController.CurrentTrack.CurrentTime > 5000);
 
-            AddStep("press previous", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPrev));
+            AddStep("press previous", () => globalActionContainer.TriggerPressed(GlobalAction.MusicPrev));
             AddAssert("no track change", () => trackChangeQueue.Count == 0);
             AddUntilStep("track restarted", () => Game.MusicController.CurrentTrack.CurrentTime < 5000);
 
-            AddStep("press previous", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicPrev));
+            AddStep("press previous", () => globalActionContainer.TriggerPressed(GlobalAction.MusicPrev));
             AddAssert("track changed to previous", () =>
                 trackChangeQueue.Count == 1 &&
                 trackChangeQueue.Dequeue().changeDirection == TrackChangeDirection.Prev);
 
-            AddStep("press next", () => Game.GlobalBinding.TriggerPressed(GlobalAction.MusicNext));
+            AddStep("press next", () => globalActionContainer.TriggerPressed(GlobalAction.MusicNext));
             AddAssert("track changed to next", () =>
                 trackChangeQueue.Count == 1 &&
                 trackChangeQueue.Dequeue().changeDirection == TrackChangeDirection.Next);
diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index e29d23ba75..c4acf4f7da 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -14,7 +14,6 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Input.Bindings;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
@@ -110,8 +109,6 @@ namespace osu.Game.Tests.Visual.Navigation
 
             public new OsuConfigManager LocalConfig => base.LocalConfig;
 
-            public new GlobalActionContainer GlobalBinding => base.GlobalBinding;
-
             public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap;
 
             public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 8e01bda6ec..4bc8f4c527 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -64,8 +64,6 @@ namespace osu.Game
 
         protected FileStore FileStore;
 
-        protected GlobalActionContainer GlobalBinding;
-
         protected KeyBindingStore KeyBindingStore;
 
         protected SettingsStore SettingsStore;
@@ -253,7 +251,10 @@ namespace osu.Game
             AddInternal(RulesetConfigCache);
 
             MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both };
-            MenuCursorContainer.Child = GlobalBinding = new GlobalActionContainer(this)
+
+            GlobalActionContainer globalBindings;
+
+            MenuCursorContainer.Child = globalBindings = new GlobalActionContainer(this)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }
@@ -261,8 +262,8 @@ namespace osu.Game
 
             base.Content.Add(CreateScalingContainer().WithChild(MenuCursorContainer));
 
-            KeyBindingStore.Register(GlobalBinding);
-            dependencies.Cache(GlobalBinding);
+            KeyBindingStore.Register(globalBindings);
+            dependencies.Cache(globalBindings);
 
             PreviewTrackManager previewTrackManager;
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());

From 4962213cc499eecf9df2f876fc8b14672b11b104 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 18:42:55 +0900
Subject: [PATCH 04664/10326] Rename manage collections filter/text

---
 osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs | 2 +-
 osu.Game/Screens/Select/CollectionFilter.cs                | 6 +++---
 osu.Game/Screens/Select/CollectionFilterDropdown.cs        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 955fe04c8c..5b0e244bbe 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
-        public void TestNewCollectionFilterIsNotSelected()
+        public void TestManageCollectionsFilterIsNotSelected()
         {
             addExpandHeaderStep();
 
diff --git a/osu.Game/Screens/Select/CollectionFilter.cs b/osu.Game/Screens/Select/CollectionFilter.cs
index 9e36e3e089..883019ab06 100644
--- a/osu.Game/Screens/Select/CollectionFilter.cs
+++ b/osu.Game/Screens/Select/CollectionFilter.cs
@@ -54,12 +54,12 @@ namespace osu.Game.Screens.Select
         }
     }
 
-    public class NewCollectionFilter : CollectionFilter
+    public class ManageCollectionsFilter : CollectionFilter
     {
-        public NewCollectionFilter()
+        public ManageCollectionsFilter()
             : base(null)
         {
-            CollectionName.Value = "New collection...";
+            CollectionName.Value = "Manage collections...";
         }
     }
 }
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index 5e5c684fe2..6b9ae1b5c8 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Select
             filters.Clear();
             filters.Add(new AllBeatmapCollectionFilter());
             filters.AddRange(collections.Select(c => new CollectionFilter(c)));
-            filters.Add(new NewCollectionFilter());
+            filters.Add(new ManageCollectionsFilter());
 
             Current.Value = filters.SingleOrDefault(f => f.Collection != null && f.Collection == selectedItem) ?? filters[0];
         }
@@ -85,7 +85,7 @@ namespace osu.Game.Screens.Select
 
             // Never select the manage collection filter - rollback to the previous filter.
             // This is done after the above since it is important that bindable is unbound from OldValue, which is lost after forcing it back to the old value.
-            if (filter.NewValue is NewCollectionFilter)
+            if (filter.NewValue is ManageCollectionsFilter)
             {
                 Current.Value = filter.OldValue;
                 manageCollectionsDialog?.Show();

From ae022d755964536843265ab1e1b7169edeef40a3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 18:55:53 +0900
Subject: [PATCH 04665/10326] Show all items in dropdown, set global max height

---
 osu.Game/Graphics/UserInterface/OsuContextMenu.cs              | 2 ++
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs    | 2 +-
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuContextMenu.cs b/osu.Game/Graphics/UserInterface/OsuContextMenu.cs
index 4b629080e1..8c7b44f952 100644
--- a/osu.Game/Graphics/UserInterface/OsuContextMenu.cs
+++ b/osu.Game/Graphics/UserInterface/OsuContextMenu.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Graphics.UserInterface
             };
 
             ItemsContainer.Padding = new MarginPadding { Vertical = DrawableOsuMenuItem.MARGIN_VERTICAL };
+
+            MaxHeight = 250;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 9f21ec1ad1..cf1c51acd1 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -224,7 +224,7 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmap.OnlineBeatmapID.HasValue && beatmapOverlay != null)
                     items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
 
-                var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyDate).Take(3).Select(createCollectionMenuItem).ToList();
+                var collectionItems = collectionManager.Collections.Select(createCollectionMenuItem).ToList();
                 if (manageCollectionsDialog != null)
                     collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 19ecc277c4..2c098291fa 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmapSet.OnlineBeatmapSetID != null && viewDetails != null)
                     items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => viewDetails(beatmapSet.OnlineBeatmapSetID.Value)));
 
-                var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyDate).Take(3).Select(createCollectionMenuItem).ToList();
+                var collectionItems = collectionManager.Collections.Select(createCollectionMenuItem).ToList();
                 if (manageCollectionsDialog != null)
                     collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionsDialog.Show));
 

From a5e1e8d043c98438e748d4c956febb6e29900a56 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 18:57:18 +0900
Subject: [PATCH 04666/10326] Rename More... to Manage...

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs    | 2 +-
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index cf1c51acd1..e9990ab078 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Screens.Select.Carousel
 
                 var collectionItems = collectionManager.Collections.Select(createCollectionMenuItem).ToList();
                 if (manageCollectionsDialog != null)
-                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionsDialog.Show));
+                    collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
                 items.Add(new OsuMenuItem("Collections") { Items = collectionItems });
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 2c098291fa..fe700f12df 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Screens.Select.Carousel
 
                 var collectionItems = collectionManager.Collections.Select(createCollectionMenuItem).ToList();
                 if (manageCollectionsDialog != null)
-                    collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionsDialog.Show));
+                    collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
                 items.Add(new OsuMenuItem("Collections") { Items = collectionItems });
 

From 2b4e2d8ed63c4500aba1fb3236fb481469caab6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 19:04:46 +0900
Subject: [PATCH 04667/10326] Standardise corner radius of dropdowns

---
 osu.Game/Graphics/UserInterface/OsuDropdown.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index fc3a7229fa..cc76c12975 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuDropdown<T> : Dropdown<T>, IHasAccentColour
     {
+        private const float corner_radius = 4;
+
         private Color4 accentColour;
 
         public Color4 AccentColour
@@ -57,9 +59,11 @@ namespace osu.Game.Graphics.UserInterface
             // todo: this uses the same styling as OsuMenu. hopefully we can just use OsuMenu in the future with some refactoring
             public OsuDropdownMenu()
             {
-                CornerRadius = 4;
+                CornerRadius = corner_radius;
                 BackgroundColour = Color4.Black.Opacity(0.5f);
 
+                MaskingContainer.CornerRadius = corner_radius;
+
                 // todo: this uses the same styling as OsuMenu. hopefully we can just use OsuMenu in the future with some refactoring
                 ItemsContainer.Padding = new MarginPadding(5);
             }
@@ -138,7 +142,7 @@ namespace osu.Game.Graphics.UserInterface
                     Foreground.Padding = new MarginPadding(2);
 
                     Masking = true;
-                    CornerRadius = 6;
+                    CornerRadius = corner_radius;
                 }
 
                 [BackgroundDependencyLoader]
@@ -237,7 +241,7 @@ namespace osu.Game.Graphics.UserInterface
 
                 AutoSizeAxes = Axes.None;
                 Margin = new MarginPadding { Bottom = 4 };
-                CornerRadius = 4;
+                CornerRadius = corner_radius;
                 Height = 40;
 
                 Foreground.Children = new Drawable[]

From b7ca0039282769ea2388da23af8e9884a7c265c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 19:14:48 +0900
Subject: [PATCH 04668/10326] Remove unnecessary check

---
 osu.Game/Collections/BeatmapCollectionManager.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
index e4fc4c377b..c14b67a7e8 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -120,11 +120,8 @@ namespace osu.Game.Collections
 
             return Task.Run(async () =>
             {
-                if (stable.Exists(database_name))
-                {
-                    using (var stream = stable.GetStream(database_name))
-                        await Import(stream);
-                }
+                using (var stream = stable.GetStream(database_name))
+                    await Import(stream);
             });
         }
 

From 8e2f5d4ea85be3d3f62678d2a84094e52ed15d37 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Sep 2020 19:41:05 +0900
Subject: [PATCH 04669/10326] Fix test failures

---
 .../Collections/IO/ImportCollectionsTest.cs   | 55 ++++++++++++-------
 .../Collections/BeatmapCollectionManager.cs   |  7 +++
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
index 7d772d3989..95013859f0 100644
--- a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
+++ b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
@@ -8,8 +8,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Platform;
-using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Tests.Resources;
 
@@ -21,11 +21,11 @@ namespace osu.Game.Tests.Collections.IO
         [Test]
         public async Task TestImportEmptyDatabase()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportEmptyDatabase"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
-                    var osu = await loadOsu(host);
+                    var osu = loadOsu(host);
 
                     var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
                     await collectionManager.Import(new MemoryStream());
@@ -42,11 +42,11 @@ namespace osu.Game.Tests.Collections.IO
         [Test]
         public async Task TestImportWithNoBeatmaps()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportWithNoBeatmaps"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
-                    var osu = await loadOsu(host);
+                    var osu = loadOsu(host);
 
                     var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
                     await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
@@ -69,11 +69,11 @@ namespace osu.Game.Tests.Collections.IO
         [Test]
         public async Task TestImportWithBeatmaps()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportWithBeatmaps"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
-                    var osu = await loadOsu(host, true);
+                    var osu = loadOsu(host, true);
 
                     var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
                     await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
@@ -99,13 +99,13 @@ namespace osu.Game.Tests.Collections.IO
             bool exceptionThrown = false;
             UnhandledExceptionEventHandler setException = (_, __) => exceptionThrown = true;
 
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportMalformedDatabase"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
                     AppDomain.CurrentDomain.UnhandledException += setException;
 
-                    var osu = await loadOsu(host, true);
+                    var osu = loadOsu(host, true);
 
                     var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
 
@@ -137,11 +137,11 @@ namespace osu.Game.Tests.Collections.IO
         [Test]
         public async Task TestSaveAndReload()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestSaveAndReload"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
-                    var osu = await loadOsu(host, true);
+                    var osu = loadOsu(host, true);
 
                     var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
                     await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
@@ -163,7 +163,7 @@ namespace osu.Game.Tests.Collections.IO
             {
                 try
                 {
-                    var osu = await loadOsu(host, true);
+                    var osu = loadOsu(host, true);
 
                     var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
 
@@ -182,9 +182,9 @@ namespace osu.Game.Tests.Collections.IO
             }
         }
 
-        private async Task<OsuGameBase> loadOsu(GameHost host, bool withBeatmap = false)
+        private OsuGameBase loadOsu(GameHost host, bool withBeatmap = false)
         {
-            var osu = new OsuGameBase();
+            var osu = new TestOsuGameBase(withBeatmap);
 
 #pragma warning disable 4014
             Task.Run(() => host.Run(osu));
@@ -192,12 +192,8 @@ namespace osu.Game.Tests.Collections.IO
 
             waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
 
-            if (withBeatmap)
-            {
-                var beatmapFile = TestResources.GetTestBeatmapForImport();
-                var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
-                await beatmapManager.Import(beatmapFile);
-            }
+            var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+            waitForOrAssert(() => collectionManager.DatabaseLoaded, "Collection database did not load in a reasonable amount of time");
 
             return osu;
         }
@@ -211,5 +207,24 @@ namespace osu.Game.Tests.Collections.IO
 
             Assert.IsTrue(task.Wait(timeout), failureMessage);
         }
+
+        private class TestOsuGameBase : OsuGameBase
+        {
+            private readonly bool withBeatmap;
+
+            public TestOsuGameBase(bool withBeatmap)
+            {
+                this.withBeatmap = withBeatmap;
+            }
+
+            protected override void AddInternal(Drawable drawable)
+            {
+                // The beatmap must be imported just before the collection manager is loaded.
+                if (drawable is BeatmapCollectionManager && withBeatmap)
+                    BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+
+                base.AddInternal(drawable);
+            }
+        }
     }
 }
diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
index c14b67a7e8..ed41627d63 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -33,6 +33,11 @@ namespace osu.Game.Collections
 
         public bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
 
+        /// <summary>
+        /// Whether the user's database has finished loading.
+        /// </summary>
+        public bool DatabaseLoaded { get; private set; }
+
         [Resolved]
         private GameHost host { get; set; }
 
@@ -86,6 +91,8 @@ namespace osu.Game.Collections
                 using (var stream = storage.GetStream(database_name))
                     await import(stream);
             }
+
+            DatabaseLoaded = true;
         });
 
         /// <summary>

From a501df954b3337ef6782a07aeb565a0172c7c7b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 19:50:29 +0900
Subject: [PATCH 04670/10326] Avoid multiple editor screens potentially loading
 on top of each other

---
 osu.Game/Screens/Edit/Editor.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 3ba3eb108a..ac1f61c4fd 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -398,7 +398,11 @@ namespace osu.Game.Screens.Edit
                     break;
             }
 
-            LoadComponentAsync(currentScreen, screenContainer.Add);
+            LoadComponentAsync(currentScreen, newScreen =>
+            {
+                if (newScreen == currentScreen)
+                    screenContainer.Add(newScreen);
+            });
         }
 
         private void seek(UIEvent e, int direction)

From 379fdadbe54e34ea99e57a86106b94bdd9b8bcd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Sep 2020 18:47:14 +0900
Subject: [PATCH 04671/10326] Add test scene for setup screen

---
 .../Visual/Editing/TestSceneSetupScreen.cs    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneSetupScreen.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneSetupScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneSetupScreen.cs
new file mode 100644
index 0000000000..62e12158ab
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneSetupScreen.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Setup;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    [TestFixture]
+    public class TestSceneSetupScreen : EditorClockTestScene
+    {
+        [Cached(typeof(EditorBeatmap))]
+        [Cached(typeof(IBeatSnapProvider))]
+        private readonly EditorBeatmap editorBeatmap;
+
+        public TestSceneSetupScreen()
+        {
+            editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Beatmap.Value = CreateWorkingBeatmap(editorBeatmap.PlayableBeatmap);
+            Child = new SetupScreen();
+        }
+    }
+}

From f43f8cf6b95bebf5c18683acdb0e96a6ff731fb3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Sep 2020 19:21:35 +0900
Subject: [PATCH 04672/10326] Add basic setup for song select screen

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 74 +++++++++++++++++++++-
 1 file changed, 72 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 758dbc6e16..84e96a14e2 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -1,13 +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.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK;
+
 namespace osu.Game.Screens.Edit.Setup
 {
     public class SetupScreen : EditorScreen
     {
-        public SetupScreen()
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
         {
-            Child = new ScreenWhiteBox.UnderConstructionMessage("Setup mode");
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colours.Gray0,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new OsuScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding(50),
+                    Child = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(20),
+                        Direction = FillDirection.Vertical,
+                        Children = new Drawable[]
+                        {
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                Height = 250,
+                                Masking = true,
+                                CornerRadius = 50,
+                                Child = new BeatmapBackgroundSprite(Beatmap.Value)
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    FillMode = FillMode.Fill,
+                                },
+                            },
+                            new OsuSpriteText
+                            {
+                                Text = "Beatmap metadata"
+                            },
+                            new LabelledTextBox
+                            {
+                                Label = "Artist",
+                                Current = { Value = Beatmap.Value.Metadata.Artist }
+                            },
+                            new LabelledTextBox
+                            {
+                                Label = "Title",
+                                Current = { Value = Beatmap.Value.Metadata.Title }
+                            },
+                            new LabelledTextBox
+                            {
+                                Label = "Creator",
+                                Current = { Value = Beatmap.Value.Metadata.AuthorString }
+                            },
+                            new LabelledTextBox
+                            {
+                                Label = "Difficulty Name",
+                                Current = { Value = Beatmap.Value.BeatmapInfo.Version }
+                            },
+                        }
+                    },
+                },
+            };
         }
     }
 }

From fe31edfa26a126c1a3d55a1cad2c51e60ce3aaa7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 19:28:20 +0900
Subject: [PATCH 04673/10326] Add rudimentary saving logic

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 34 ++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 84e96a14e2..7ea810c514 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -1,10 +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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -16,6 +18,12 @@ namespace osu.Game.Screens.Edit.Setup
 {
     public class SetupScreen : EditorScreen
     {
+        private FillFlowContainer flow;
+        private LabelledTextBox artistTextBox;
+        private LabelledTextBox titleTextBox;
+        private LabelledTextBox creatorTextBox;
+        private LabelledTextBox difficultyTextBox;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -24,13 +32,14 @@ namespace osu.Game.Screens.Edit.Setup
                 new Box
                 {
                     Colour = colours.Gray0,
+                    Alpha = 0.4f,
                     RelativeSizeAxes = Axes.Both,
                 },
                 new OsuScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding(50),
-                    Child = new FillFlowContainer
+                    Child = flow = new FillFlowContainer
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
@@ -54,22 +63,22 @@ namespace osu.Game.Screens.Edit.Setup
                             {
                                 Text = "Beatmap metadata"
                             },
-                            new LabelledTextBox
+                            artistTextBox = new LabelledTextBox
                             {
                                 Label = "Artist",
                                 Current = { Value = Beatmap.Value.Metadata.Artist }
                             },
-                            new LabelledTextBox
+                            titleTextBox = new LabelledTextBox
                             {
                                 Label = "Title",
                                 Current = { Value = Beatmap.Value.Metadata.Title }
                             },
-                            new LabelledTextBox
+                            creatorTextBox = new LabelledTextBox
                             {
                                 Label = "Creator",
                                 Current = { Value = Beatmap.Value.Metadata.AuthorString }
                             },
-                            new LabelledTextBox
+                            difficultyTextBox = new LabelledTextBox
                             {
                                 Label = "Difficulty Name",
                                 Current = { Value = Beatmap.Value.BeatmapInfo.Version }
@@ -78,6 +87,21 @@ namespace osu.Game.Screens.Edit.Setup
                     },
                 },
             };
+
+            foreach (var item in flow.OfType<LabelledTextBox>())
+                item.OnCommit += onCommit;
+        }
+
+        private void onCommit(TextBox sender, bool newText)
+        {
+            if (!newText) return;
+
+            // for now, update these on commit rather than making BeatmapMetadata bindables.
+            // after switching database engines we can reconsider if switching to bindables is a good direction.
+            Beatmap.Value.Metadata.Artist = artistTextBox.Current.Value;
+            Beatmap.Value.Metadata.Title = titleTextBox.Current.Value;
+            Beatmap.Value.Metadata.AuthorString = creatorTextBox.Current.Value;
+            Beatmap.Value.BeatmapInfo.Version = difficultyTextBox.Current.Value;
         }
     }
 }

From c8281b17bdee45478edfbb71ecfec3541d1e1e7b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 19:49:26 +0900
Subject: [PATCH 04674/10326] Remove editor screen fade (looks bad)

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

diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs
index d42447ac4b..8b5f0aaa71 100644
--- a/osu.Game/Screens/Edit/EditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorScreen.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Edit
 
         public void Exit()
         {
-            this.FadeOut(250).Expire();
+            Expire();
         }
     }
 }

From b55b6e374699e06eed4c0178ad88eec195b4d972 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 19:50:44 +0900
Subject: [PATCH 04675/10326] Bring design somewhat in line with collections
 dialog

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 112 ++++++++++++---------
 1 file changed, 62 insertions(+), 50 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 7ea810c514..da8eb3a3b3 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -27,65 +27,77 @@ namespace osu.Game.Screens.Edit.Setup
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Children = new Drawable[]
+            Child = new Container
             {
-                new Box
-                {
-                    Colour = colours.Gray0,
-                    Alpha = 0.4f,
-                    RelativeSizeAxes = Axes.Both,
-                },
-                new OsuScrollContainer
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding(50),
+                Child = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding(50),
-                    Child = flow = new FillFlowContainer
+                    Masking = true,
+                    CornerRadius = 10,
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Spacing = new Vector2(20),
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
+                        new Box
                         {
-                            new Container
+                            Colour = colours.GreySeafoamDark,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new OsuScrollContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding(10),
+                            Child = flow = new FillFlowContainer
                             {
                                 RelativeSizeAxes = Axes.X,
-                                Height = 250,
-                                Masking = true,
-                                CornerRadius = 50,
-                                Child = new BeatmapBackgroundSprite(Beatmap.Value)
+                                AutoSizeAxes = Axes.Y,
+                                Spacing = new Vector2(20),
+                                Direction = FillDirection.Vertical,
+                                Children = new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.Both,
-                                    FillMode = FillMode.Fill,
-                                },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        Height = 250,
+                                        Masking = true,
+                                        CornerRadius = 10,
+                                        Child = new BeatmapBackgroundSprite(Beatmap.Value)
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            FillMode = FillMode.Fill,
+                                        },
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Text = "Beatmap metadata"
+                                    },
+                                    artistTextBox = new LabelledTextBox
+                                    {
+                                        Label = "Artist",
+                                        Current = { Value = Beatmap.Value.Metadata.Artist }
+                                    },
+                                    titleTextBox = new LabelledTextBox
+                                    {
+                                        Label = "Title",
+                                        Current = { Value = Beatmap.Value.Metadata.Title }
+                                    },
+                                    creatorTextBox = new LabelledTextBox
+                                    {
+                                        Label = "Creator",
+                                        Current = { Value = Beatmap.Value.Metadata.AuthorString }
+                                    },
+                                    difficultyTextBox = new LabelledTextBox
+                                    {
+                                        Label = "Difficulty Name",
+                                        Current = { Value = Beatmap.Value.BeatmapInfo.Version }
+                                    },
+                                }
                             },
-                            new OsuSpriteText
-                            {
-                                Text = "Beatmap metadata"
-                            },
-                            artistTextBox = new LabelledTextBox
-                            {
-                                Label = "Artist",
-                                Current = { Value = Beatmap.Value.Metadata.Artist }
-                            },
-                            titleTextBox = new LabelledTextBox
-                            {
-                                Label = "Title",
-                                Current = { Value = Beatmap.Value.Metadata.Title }
-                            },
-                            creatorTextBox = new LabelledTextBox
-                            {
-                                Label = "Creator",
-                                Current = { Value = Beatmap.Value.Metadata.AuthorString }
-                            },
-                            difficultyTextBox = new LabelledTextBox
-                            {
-                                Label = "Difficulty Name",
-                                Current = { Value = Beatmap.Value.BeatmapInfo.Version }
-                            },
-                        }
-                    },
-                },
+                        },
+                    }
+                }
             };
 
             foreach (var item in flow.OfType<LabelledTextBox>())

From c38e7d796a577c477fbb844376dc6902667aa015 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Sep 2020 19:51:31 +0900
Subject: [PATCH 04676/10326] Fix tab key not working

---
 osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs |  6 ++++++
 osu.Game/Screens/Edit/Setup/SetupScreen.cs           | 12 ++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
index 2cbe095d0b..290aba3468 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 
@@ -32,6 +33,11 @@ namespace osu.Game.Graphics.UserInterfaceV2
             set => Component.Text = value;
         }
 
+        public Container TabbableContentContainer
+        {
+            set => Component.TabbableContentContainer = value;
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index da8eb3a3b3..a2c8f19016 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -76,22 +76,26 @@ namespace osu.Game.Screens.Edit.Setup
                                     artistTextBox = new LabelledTextBox
                                     {
                                         Label = "Artist",
-                                        Current = { Value = Beatmap.Value.Metadata.Artist }
+                                        Current = { Value = Beatmap.Value.Metadata.Artist },
+                                        TabbableContentContainer = this
                                     },
                                     titleTextBox = new LabelledTextBox
                                     {
                                         Label = "Title",
-                                        Current = { Value = Beatmap.Value.Metadata.Title }
+                                        Current = { Value = Beatmap.Value.Metadata.Title },
+                                        TabbableContentContainer = this
                                     },
                                     creatorTextBox = new LabelledTextBox
                                     {
                                         Label = "Creator",
-                                        Current = { Value = Beatmap.Value.Metadata.AuthorString }
+                                        Current = { Value = Beatmap.Value.Metadata.AuthorString },
+                                        TabbableContentContainer = this
                                     },
                                     difficultyTextBox = new LabelledTextBox
                                     {
                                         Label = "Difficulty Name",
-                                        Current = { Value = Beatmap.Value.BeatmapInfo.Version }
+                                        Current = { Value = Beatmap.Value.BeatmapInfo.Version },
+                                        TabbableContentContainer = this
                                     },
                                 }
                             },

From 95eeebd93fd8aba3d3d2b837273944ad21328fdb Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 8 Sep 2020 15:31:00 +0300
Subject: [PATCH 04677/10326] Fix setting count for recent scores is
 overcomplicated

---
 .../Profile/Sections/Ranks/PaginatedScoreContainer.cs      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 0b2bddabbc..7dbdf47cad 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -49,12 +49,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             base.OnItemsReceived(items);
 
             if (type == ScoreType.Recent)
-            {
-                var count = items.Count;
-
-                Header.Current.Value = count == 0 ? 0 : -1;
-                Header.Current.TriggerChange();
-            }
+                Header.Current.Value = items.Count;
         }
 
         protected override APIRequest<List<APILegacyScoreInfo>> CreateRequest() =>

From 2cd07b2d3c8d6e54e82c352b17870e48bcd0c060 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 12:48:11 +0900
Subject: [PATCH 04678/10326] Fix editor crash on saving more than once

I'm fixing this in the simplest way possible as this kind of issue is
specific to EF core, which may cease to exist quite soon. Turns out the
re-retrieval of the beatmap set causes concurrency confusion and wasn't
actually needed in my final iteration of the new beatmap logic.
---
 osu.Game/Beatmaps/BeatmapManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 34bb578b2a..4496f3b330 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Beatmaps
         /// <param name="beatmapSkin">The beatmap <see cref="ISkin"/> content to write, null if to be omitted.</param>
         public void Save(BeatmapInfo info, IBeatmap beatmapContent, ISkin beatmapSkin = null)
         {
-            var setInfo = QueryBeatmapSet(s => s.Beatmaps.Any(b => b.ID == info.ID));
+            var setInfo = info.BeatmapSet;
 
             using (var stream = new MemoryStream())
             {

From 8cd0bbe469436ce28999541fa9545c0193193cdb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 14:31:23 +0900
Subject: [PATCH 04679/10326] Make BeatmapCollectionManager a component

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

diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
index ed41627d63..00ca660381 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
@@ -20,7 +20,7 @@ using osu.Game.Overlays.Notifications;
 
 namespace osu.Game.Collections
 {
-    public class BeatmapCollectionManager : CompositeDrawable
+    public class BeatmapCollectionManager : Component
     {
         /// <summary>
         /// Database version in stable-compatible YYYYMMDD format.

From 5d9ce0df980bf7ea645c9362889f5ffa363c4750 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 14:44:04 +0900
Subject: [PATCH 04680/10326] Add remark about temporary nature of database
 format

---
 osu.Game/Collections/BeatmapCollectionManager.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/BeatmapCollectionManager.cs
index 00ca660381..0e78c44024 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/BeatmapCollectionManager.cs
@@ -20,6 +20,13 @@ using osu.Game.Overlays.Notifications;
 
 namespace osu.Game.Collections
 {
+    /// <summary>
+    /// Handles user-defined collections of beatmaps.
+    /// </summary>
+    /// <remarks>
+    /// This is currently reading and writing from the osu-stable file format. This is a temporary arrangement until we refactor the
+    /// database backing the game. Going forward writing should be done in a similar way to other model stores.
+    /// </remarks>
     public class BeatmapCollectionManager : Component
     {
         /// <summary>

From 4ddf5f054ba3422d6e7c092ff8873e2a3815dea7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 15:31:08 +0900
Subject: [PATCH 04681/10326] Rename BeatmapCollectionManager ->
 CollectionManager

---
 .../Collections/IO/ImportCollectionsTest.cs      | 16 ++++++++--------
 .../TestSceneManageCollectionsDialog.cs          |  4 ++--
 .../Visual/SongSelect/TestSceneFilterControl.cs  |  4 ++--
 ...CollectionManager.cs => CollectionManager.cs} |  4 ++--
 .../Collections/DrawableCollectionListItem.cs    |  8 ++++----
 osu.Game/Collections/ManageCollectionsDialog.cs  |  2 +-
 osu.Game/OsuGameBase.cs                          |  4 ++--
 .../Sections/Maintenance/GeneralSettings.cs      |  2 +-
 .../Select/Carousel/DrawableCarouselBeatmap.cs   |  2 +-
 .../Carousel/DrawableCarouselBeatmapSet.cs       |  2 +-
 .../Screens/Select/CollectionFilterDropdown.cs   |  2 +-
 11 files changed, 25 insertions(+), 25 deletions(-)
 rename osu.Game/Collections/{BeatmapCollectionManager.cs => CollectionManager.cs} (99%)

diff --git a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
index 95013859f0..e2335b4d3c 100644
--- a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
+++ b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
                     await collectionManager.Import(new MemoryStream());
 
                     Assert.That(collectionManager.Collections.Count, Is.Zero);
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
                     await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
                     Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
@@ -75,7 +75,7 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
                     await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
                     Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Collections.IO
 
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
 
                     using (var ms = new MemoryStream())
                     {
@@ -143,7 +143,7 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
                     await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
                     // Move first beatmap from second collection into the first.
@@ -165,7 +165,7 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
 
                     Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
 
@@ -192,7 +192,7 @@ namespace osu.Game.Tests.Collections.IO
 
             waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
 
-            var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+            var collectionManager = osu.Dependencies.Get<CollectionManager>();
             waitForOrAssert(() => collectionManager.DatabaseLoaded, "Collection database did not load in a reasonable amount of time");
 
             return osu;
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.Collections.IO
             protected override void AddInternal(Drawable drawable)
             {
                 // The beatmap must be imported just before the collection manager is loaded.
-                if (drawable is BeatmapCollectionManager && withBeatmap)
+                if (drawable is CollectionManager && withBeatmap)
                     BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
 
                 base.AddInternal(drawable);
diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index 0c57c27911..54ab20af7f 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Collections
 
         private readonly Container content;
         private readonly DialogOverlay dialogOverlay;
-        private readonly BeatmapCollectionManager manager;
+        private readonly CollectionManager manager;
 
         private RulesetStore rulesets;
         private BeatmapManager beatmapManager;
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Collections
         {
             base.Content.AddRange(new Drawable[]
             {
-                manager = new BeatmapCollectionManager(LocalStorage),
+                manager = new CollectionManager(LocalStorage),
                 content = new Container { RelativeSizeAxes = Axes.Both },
                 dialogOverlay = new DialogOverlay()
             });
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 5b0e244bbe..6012150513 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        private readonly BeatmapCollectionManager collectionManager;
+        private readonly CollectionManager collectionManager;
 
         private RulesetStore rulesets;
         private BeatmapManager beatmapManager;
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             base.Content.AddRange(new Drawable[]
             {
-                collectionManager = new BeatmapCollectionManager(LocalStorage),
+                collectionManager = new CollectionManager(LocalStorage),
                 content = new Container { RelativeSizeAxes = Axes.Both }
             });
         }
diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
similarity index 99%
rename from osu.Game/Collections/BeatmapCollectionManager.cs
rename to osu.Game/Collections/CollectionManager.cs
index 0e78c44024..8b91ab219f 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Collections
     /// This is currently reading and writing from the osu-stable file format. This is a temporary arrangement until we refactor the
     /// database backing the game. Going forward writing should be done in a similar way to other model stores.
     /// </remarks>
-    public class BeatmapCollectionManager : Component
+    public class CollectionManager : Component
     {
         /// <summary>
         /// Database version in stable-compatible YYYYMMDD format.
@@ -53,7 +53,7 @@ namespace osu.Game.Collections
 
         private readonly Storage storage;
 
-        public BeatmapCollectionManager(Storage storage)
+        public CollectionManager(Storage storage)
         {
             this.storage = storage;
         }
diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index a7075c3179..7d158f182f 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Collections
         private const float button_width = item_height * 0.75f;
 
         /// <summary>
-        /// Whether the <see cref="BeatmapCollection"/> currently exists inside the <see cref="BeatmapCollectionManager"/>.
+        /// Whether the <see cref="BeatmapCollection"/> currently exists inside the <see cref="CollectionManager"/>.
         /// </summary>
         public IBindable<bool> IsCreated => isCreated;
 
@@ -38,7 +38,7 @@ namespace osu.Game.Collections
         /// Creates a new <see cref="DrawableCollectionListItem"/>.
         /// </summary>
         /// <param name="item">The <see cref="BeatmapCollection"/>.</param>
-        /// <param name="isCreated">Whether <paramref name="item"/> currently exists inside the <see cref="BeatmapCollectionManager"/>.</param>
+        /// <param name="isCreated">Whether <paramref name="item"/> currently exists inside the <see cref="CollectionManager"/>.</param>
         public DrawableCollectionListItem(BeatmapCollection item, bool isCreated)
             : base(item)
         {
@@ -63,7 +63,7 @@ namespace osu.Game.Collections
             private readonly BeatmapCollection collection;
 
             [Resolved]
-            private BeatmapCollectionManager collectionManager { get; set; }
+            private CollectionManager collectionManager { get; set; }
 
             private Container textBoxPaddingContainer;
             private ItemTextBox textBox;
@@ -159,7 +159,7 @@ namespace osu.Game.Collections
             private DialogOverlay dialogOverlay { get; set; }
 
             [Resolved]
-            private BeatmapCollectionManager collectionManager { get; set; }
+            private CollectionManager collectionManager { get; set; }
 
             private readonly BeatmapCollection collection;
 
diff --git a/osu.Game/Collections/ManageCollectionsDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
index f6964191a1..cfde9d5550 100644
--- a/osu.Game/Collections/ManageCollectionsDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Collections
         private const double exit_duration = 200;
 
         [Resolved]
-        private BeatmapCollectionManager collectionManager { get; set; }
+        private CollectionManager collectionManager { get; set; }
 
         public ManageCollectionsDialog()
         {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d98d4e2123..d4741f9e69 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -57,7 +57,7 @@ namespace osu.Game
 
         protected BeatmapManager BeatmapManager;
 
-        protected BeatmapCollectionManager CollectionManager;
+        protected CollectionManager CollectionManager;
 
         protected ScoreManager ScoreManager;
 
@@ -228,7 +228,7 @@ namespace osu.Game
             dependencies.Cache(difficultyManager);
             AddInternal(difficultyManager);
 
-            dependencies.Cache(CollectionManager = new BeatmapCollectionManager(Storage));
+            dependencies.Cache(CollectionManager = new CollectionManager(Storage));
             AddInternal(CollectionManager);
 
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 30fd5921eb..83ee5e497a 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton undeleteButton;
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, BeatmapCollectionManager collectionManager, DialogOverlay dialogOverlay)
+        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, CollectionManager collectionManager, DialogOverlay dialogOverlay)
         {
             if (beatmaps.SupportsImportFromStable)
             {
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index e9990ab078..1db73702bb 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Select.Carousel
         private BeatmapDifficultyManager difficultyManager { get; set; }
 
         [Resolved]
-        private BeatmapCollectionManager collectionManager { get; set; }
+        private CollectionManager collectionManager { get; set; }
 
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index fe700f12df..fd66315f67 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Select.Carousel
         private DialogOverlay dialogOverlay { get; set; }
 
         [Resolved]
-        private BeatmapCollectionManager collectionManager { get; set; }
+        private CollectionManager collectionManager { get; set; }
 
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index 6b9ae1b5c8..7270354e87 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Select
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapCollectionManager collectionManager)
+        private void load(CollectionManager collectionManager)
         {
             collections.BindTo(collectionManager.Collections);
             collections.CollectionChanged += (_, __) => collectionsChanged();

From 0360f7d8456b0dd43f27713a55e81d9319d96ae0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 15:39:15 +0900
Subject: [PATCH 04682/10326] Move CollectionManager to OsuGame

---
 osu.Game/Collections/DrawableCollectionListItem.cs  |  8 ++++----
 osu.Game/Collections/ManageCollectionsDialog.cs     |  5 +++--
 osu.Game/OsuGame.cs                                 |  9 ++++++---
 osu.Game/OsuGameBase.cs                             |  6 ------
 .../Select/Carousel/DrawableCarouselBeatmap.cs      | 13 ++++++++-----
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs   | 13 ++++++++-----
 6 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index 7d158f182f..988a3443c3 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Collections
             private readonly IBindable<string> collectionName;
             private readonly BeatmapCollection collection;
 
-            [Resolved]
+            [Resolved(CanBeNull = true)]
             private CollectionManager collectionManager { get; set; }
 
             private Container textBoxPaddingContainer;
@@ -127,7 +127,7 @@ namespace osu.Game.Collections
                     return;
 
                 // Add the new collection and disable our placeholder. If all text is removed, the placeholder should not show back again.
-                collectionManager.Collections.Add(collection);
+                collectionManager?.Collections.Add(collection);
                 textBox.PlaceholderText = string.Empty;
 
                 // When this item changes from placeholder to non-placeholder (via changing containers), its textbox will lose focus, so it needs to be re-focused.
@@ -158,7 +158,7 @@ namespace osu.Game.Collections
             [Resolved(CanBeNull = true)]
             private DialogOverlay dialogOverlay { get; set; }
 
-            [Resolved]
+            [Resolved(CanBeNull = true)]
             private CollectionManager collectionManager { get; set; }
 
             private readonly BeatmapCollection collection;
@@ -231,7 +231,7 @@ namespace osu.Game.Collections
                 return true;
             }
 
-            private void deleteCollection() => collectionManager.Collections.Remove(collection);
+            private void deleteCollection() => collectionManager?.Collections.Remove(collection);
         }
     }
 }
diff --git a/osu.Game/Collections/ManageCollectionsDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
index cfde9d5550..680fec904f 100644
--- a/osu.Game/Collections/ManageCollectionsDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -2,6 +2,7 @@
 // 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;
@@ -19,7 +20,7 @@ namespace osu.Game.Collections
         private const double enter_duration = 500;
         private const double exit_duration = 200;
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private CollectionManager collectionManager { get; set; }
 
         public ManageCollectionsDialog()
@@ -100,7 +101,7 @@ namespace osu.Game.Collections
                                         new DrawableCollectionList
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Items = { BindTarget = collectionManager.Collections }
+                                            Items = { BindTarget = collectionManager?.Collections ?? new BindableList<BeatmapCollection>() }
                                         }
                                     }
                                 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 0977f6c242..4a699dc82e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -538,9 +538,6 @@ namespace osu.Game
             ScoreManager.GetStableStorage = GetStorageForStableInstall;
             ScoreManager.PresentImport = items => PresentScore(items.First());
 
-            CollectionManager.PostNotification = n => notifications.Post(n);
-            CollectionManager.GetStableStorage = GetStorageForStableInstall;
-
             Container logoContainer;
             BackButton.Receptor receptor;
 
@@ -614,6 +611,12 @@ namespace osu.Game
                 d.Origin = Anchor.TopRight;
             }), rightFloatingOverlayContent.Add, true);
 
+            loadComponentSingleFile(new CollectionManager(Storage)
+            {
+                PostNotification = n => notifications.Post(n),
+                GetStableStorage = GetStorageForStableInstall
+            }, Add, true);
+
             loadComponentSingleFile(screenshotManager, Add);
 
             // dependency on notification overlay, dependent by settings overlay
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d4741f9e69..4bc8f4c527 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -26,7 +26,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
 using osu.Framework.Logging;
 using osu.Game.Audio;
-using osu.Game.Collections;
 using osu.Game.Database;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
@@ -57,8 +56,6 @@ namespace osu.Game
 
         protected BeatmapManager BeatmapManager;
 
-        protected CollectionManager CollectionManager;
-
         protected ScoreManager ScoreManager;
 
         protected SkinManager SkinManager;
@@ -228,9 +225,6 @@ namespace osu.Game
             dependencies.Cache(difficultyManager);
             AddInternal(difficultyManager);
 
-            dependencies.Cache(CollectionManager = new CollectionManager(Storage));
-            AddInternal(CollectionManager);
-
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
             dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore));
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 1db73702bb..10745fe3c1 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved]
         private BeatmapDifficultyManager difficultyManager { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private CollectionManager collectionManager { get; set; }
 
         [Resolved(CanBeNull = true)]
@@ -224,11 +224,14 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmap.OnlineBeatmapID.HasValue && beatmapOverlay != null)
                     items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
 
-                var collectionItems = collectionManager.Collections.Select(createCollectionMenuItem).ToList();
-                if (manageCollectionsDialog != null)
-                    collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
+                if (collectionManager != null)
+                {
+                    var collectionItems = collectionManager.Collections.Select(createCollectionMenuItem).ToList();
+                    if (manageCollectionsDialog != null)
+                        collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
-                items.Add(new OsuMenuItem("Collections") { Items = collectionItems });
+                    items.Add(new OsuMenuItem("Collections") { Items = collectionItems });
+                }
 
                 if (hideRequested != null)
                     items.Add(new OsuMenuItem("Hide", MenuItemType.Destructive, () => hideRequested(beatmap)));
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index fd66315f67..3c8ac69dd2 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved(CanBeNull = true)]
         private DialogOverlay dialogOverlay { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private CollectionManager collectionManager { get; set; }
 
         [Resolved(CanBeNull = true)]
@@ -142,11 +142,14 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmapSet.OnlineBeatmapSetID != null && viewDetails != null)
                     items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => viewDetails(beatmapSet.OnlineBeatmapSetID.Value)));
 
-                var collectionItems = collectionManager.Collections.Select(createCollectionMenuItem).ToList();
-                if (manageCollectionsDialog != null)
-                    collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
+                if (collectionManager != null)
+                {
+                    var collectionItems = collectionManager.Collections.Select(createCollectionMenuItem).ToList();
+                    if (manageCollectionsDialog != null)
+                        collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
-                items.Add(new OsuMenuItem("Collections") { Items = collectionItems });
+                    items.Add(new OsuMenuItem("Collections") { Items = collectionItems });
+                }
 
                 if (beatmapSet.Beatmaps.Any(b => b.Hidden))
                     items.Add(new OsuMenuItem("Restore all hidden", MenuItemType.Standard, () => restoreHiddenRequested(beatmapSet)));

From 2d7e85f62203d5c017acd893d60d90fe22bc1325 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 15:40:45 +0900
Subject: [PATCH 04683/10326] Remove async load (now using
 loadComponentSingleFile)

---
 osu.Game/Collections/CollectionManager.cs | 40 +++++------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 8b91ab219f..a50ab5b07a 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -40,11 +40,6 @@ namespace osu.Game.Collections
 
         public bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
 
-        /// <summary>
-        /// Whether the user's database has finished loading.
-        /// </summary>
-        public bool DatabaseLoaded { get; private set; }
-
         [Resolved]
         private GameHost host { get; set; }
 
@@ -62,7 +57,12 @@ namespace osu.Game.Collections
         private void load()
         {
             Collections.CollectionChanged += collectionsChanged;
-            loadDatabase();
+
+            if (storage.Exists(database_name))
+            {
+                using (var stream = storage.GetStream(database_name))
+                    importCollections(readCollections(stream));
+            }
         }
 
         private void collectionsChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -91,17 +91,6 @@ namespace osu.Game.Collections
             backgroundSave();
         }
 
-        private void loadDatabase() => Task.Run(async () =>
-        {
-            if (storage.Exists(database_name))
-            {
-                using (var stream = storage.GetStream(database_name))
-                    await import(stream);
-            }
-
-            DatabaseLoaded = true;
-        });
-
         /// <summary>
         /// Set an endpoint for notifications to be posted to.
         /// </summary>
@@ -149,14 +138,6 @@ namespace osu.Game.Collections
 
             PostNotification?.Invoke(notification);
 
-            await import(stream, notification);
-        }
-
-        private async Task import(Stream stream, ProgressNotification notification = null) => await Task.Run(async () =>
-        {
-            if (notification != null)
-                notification.Progress = 0;
-
             var collection = readCollections(stream, notification);
             bool importCompleted = false;
 
@@ -169,12 +150,9 @@ namespace osu.Game.Collections
             while (!IsDisposed && !importCompleted)
                 await Task.Delay(10);
 
-            if (notification != null)
-            {
-                notification.CompletionText = $"Imported {collection.Count} collections";
-                notification.State = ProgressNotificationState.Completed;
-            }
-        });
+            notification.CompletionText = $"Imported {collection.Count} collections";
+            notification.State = ProgressNotificationState.Completed;
+        }
 
         private void importCollections(List<BeatmapCollection> newCollections)
         {

From b1b99e4d6f3d54bea94cd65b8b38f649a3037c25 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 15:55:56 +0900
Subject: [PATCH 04684/10326] Fix tests

---
 .../Collections/IO/ImportCollectionsTest.cs   | 75 ++++++++-----------
 1 file changed, 33 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
index e2335b4d3c..a79e0d0338 100644
--- a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
+++ b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
@@ -8,7 +8,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Game.Collections;
 using osu.Game.Tests.Resources;
@@ -27,10 +26,9 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host);
 
-                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
-                    await collectionManager.Import(new MemoryStream());
+                    await osu.CollectionManager.Import(new MemoryStream());
 
-                    Assert.That(collectionManager.Collections.Count, Is.Zero);
+                    Assert.That(osu.CollectionManager.Collections.Count, Is.Zero);
                 }
                 finally
                 {
@@ -48,16 +46,15 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host);
 
-                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
-                    await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
+                    await osu.CollectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
-                    Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
+                    Assert.That(osu.CollectionManager.Collections.Count, Is.EqualTo(2));
 
-                    Assert.That(collectionManager.Collections[0].Name.Value, Is.EqualTo("First"));
-                    Assert.That(collectionManager.Collections[0].Beatmaps.Count, Is.Zero);
+                    Assert.That(osu.CollectionManager.Collections[0].Name.Value, Is.EqualTo("First"));
+                    Assert.That(osu.CollectionManager.Collections[0].Beatmaps.Count, Is.Zero);
 
-                    Assert.That(collectionManager.Collections[1].Name.Value, Is.EqualTo("Second"));
-                    Assert.That(collectionManager.Collections[1].Beatmaps.Count, Is.Zero);
+                    Assert.That(osu.CollectionManager.Collections[1].Name.Value, Is.EqualTo("Second"));
+                    Assert.That(osu.CollectionManager.Collections[1].Beatmaps.Count, Is.Zero);
                 }
                 finally
                 {
@@ -75,16 +72,15 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
-                    await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
+                    await osu.CollectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
-                    Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
+                    Assert.That(osu.CollectionManager.Collections.Count, Is.EqualTo(2));
 
-                    Assert.That(collectionManager.Collections[0].Name.Value, Is.EqualTo("First"));
-                    Assert.That(collectionManager.Collections[0].Beatmaps.Count, Is.EqualTo(1));
+                    Assert.That(osu.CollectionManager.Collections[0].Name.Value, Is.EqualTo("First"));
+                    Assert.That(osu.CollectionManager.Collections[0].Beatmaps.Count, Is.EqualTo(1));
 
-                    Assert.That(collectionManager.Collections[1].Name.Value, Is.EqualTo("Second"));
-                    Assert.That(collectionManager.Collections[1].Beatmaps.Count, Is.EqualTo(12));
+                    Assert.That(osu.CollectionManager.Collections[1].Name.Value, Is.EqualTo("Second"));
+                    Assert.That(osu.CollectionManager.Collections[1].Beatmaps.Count, Is.EqualTo(12));
                 }
                 finally
                 {
@@ -107,8 +103,6 @@ namespace osu.Game.Tests.Collections.IO
 
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
-
                     using (var ms = new MemoryStream())
                     {
                         using (var bw = new BinaryWriter(ms, Encoding.UTF8, true))
@@ -119,12 +113,12 @@ namespace osu.Game.Tests.Collections.IO
 
                         ms.Seek(0, SeekOrigin.Begin);
 
-                        await collectionManager.Import(ms);
+                        await osu.CollectionManager.Import(ms);
                     }
 
                     Assert.That(host.UpdateThread.Running, Is.True);
                     Assert.That(exceptionThrown, Is.False);
-                    Assert.That(collectionManager.Collections.Count, Is.EqualTo(0));
+                    Assert.That(osu.CollectionManager.Collections.Count, Is.EqualTo(0));
                 }
                 finally
                 {
@@ -143,15 +137,14 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
-                    await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
+                    await osu.CollectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
                     // Move first beatmap from second collection into the first.
-                    collectionManager.Collections[0].Beatmaps.Add(collectionManager.Collections[1].Beatmaps[0]);
-                    collectionManager.Collections[1].Beatmaps.RemoveAt(0);
+                    osu.CollectionManager.Collections[0].Beatmaps.Add(osu.CollectionManager.Collections[1].Beatmaps[0]);
+                    osu.CollectionManager.Collections[1].Beatmaps.RemoveAt(0);
 
                     // Rename the second collecction.
-                    collectionManager.Collections[1].Name.Value = "Another";
+                    osu.CollectionManager.Collections[1].Name.Value = "Another";
                 }
                 finally
                 {
@@ -165,15 +158,13 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
+                    Assert.That(osu.CollectionManager.Collections.Count, Is.EqualTo(2));
 
-                    Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
+                    Assert.That(osu.CollectionManager.Collections[0].Name.Value, Is.EqualTo("First"));
+                    Assert.That(osu.CollectionManager.Collections[0].Beatmaps.Count, Is.EqualTo(2));
 
-                    Assert.That(collectionManager.Collections[0].Name.Value, Is.EqualTo("First"));
-                    Assert.That(collectionManager.Collections[0].Beatmaps.Count, Is.EqualTo(2));
-
-                    Assert.That(collectionManager.Collections[1].Name.Value, Is.EqualTo("Another"));
-                    Assert.That(collectionManager.Collections[1].Beatmaps.Count, Is.EqualTo(11));
+                    Assert.That(osu.CollectionManager.Collections[1].Name.Value, Is.EqualTo("Another"));
+                    Assert.That(osu.CollectionManager.Collections[1].Beatmaps.Count, Is.EqualTo(11));
                 }
                 finally
                 {
@@ -182,7 +173,7 @@ namespace osu.Game.Tests.Collections.IO
             }
         }
 
-        private OsuGameBase loadOsu(GameHost host, bool withBeatmap = false)
+        private TestOsuGameBase loadOsu(GameHost host, bool withBeatmap = false)
         {
             var osu = new TestOsuGameBase(withBeatmap);
 
@@ -192,9 +183,6 @@ namespace osu.Game.Tests.Collections.IO
 
             waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
 
-            var collectionManager = osu.Dependencies.Get<CollectionManager>();
-            waitForOrAssert(() => collectionManager.DatabaseLoaded, "Collection database did not load in a reasonable amount of time");
-
             return osu;
         }
 
@@ -210,6 +198,8 @@ namespace osu.Game.Tests.Collections.IO
 
         private class TestOsuGameBase : OsuGameBase
         {
+            public CollectionManager CollectionManager { get; private set; }
+
             private readonly bool withBeatmap;
 
             public TestOsuGameBase(bool withBeatmap)
@@ -217,13 +207,14 @@ namespace osu.Game.Tests.Collections.IO
                 this.withBeatmap = withBeatmap;
             }
 
-            protected override void AddInternal(Drawable drawable)
+            [BackgroundDependencyLoader]
+            private void load()
             {
-                // The beatmap must be imported just before the collection manager is loaded.
-                if (drawable is CollectionManager && withBeatmap)
+                // Beatmap must be imported before the collection manager is loaded.
+                if (withBeatmap)
                     BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
 
-                base.AddInternal(drawable);
+                AddInternal(CollectionManager = new CollectionManager(Storage));
             }
         }
     }

From 1a023d2c887ab72795c34e435cb22b4a130e2a6f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 16:33:48 +0900
Subject: [PATCH 04685/10326] Fix a few more tests

---
 .../Sections/Maintenance/GeneralSettings.cs   | 36 ++++++++++---------
 .../Select/CollectionFilterDropdown.cs        |  8 +++--
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 83ee5e497a..848ce381a9 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
@@ -27,8 +28,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton restoreButton;
         private TriangleButton undeleteButton;
 
-        [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, CollectionManager collectionManager, DialogOverlay dialogOverlay)
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, DialogOverlay dialogOverlay)
         {
             if (beatmaps.SupportsImportFromStable)
             {
@@ -108,28 +109,31 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (collectionManager.SupportsImportFromStable)
+            if (collectionManager != null)
             {
-                Add(importCollectionsButton = new SettingsButton
+                if (collectionManager.SupportsImportFromStable)
                 {
-                    Text = "Import collections from stable",
+                    Add(importCollectionsButton = new SettingsButton
+                    {
+                        Text = "Import collections from stable",
+                        Action = () =>
+                        {
+                            importCollectionsButton.Enabled.Value = false;
+                            collectionManager.ImportFromStableAsync().ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
+                        }
+                    });
+                }
+
+                Add(new DangerousSettingsButton
+                {
+                    Text = "Delete ALL collections",
                     Action = () =>
                     {
-                        importCollectionsButton.Enabled.Value = false;
-                        collectionManager.ImportFromStableAsync().ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
+                        dialogOverlay?.Push(new DeleteAllBeatmapsDialog(collectionManager.DeleteAll));
                     }
                 });
             }
 
-            Add(new DangerousSettingsButton
-            {
-                Text = "Delete ALL collections",
-                Action = () =>
-                {
-                    dialogOverlay?.Push(new DeleteAllBeatmapsDialog(collectionManager.DeleteAll));
-                }
-            });
-
             AddRange(new Drawable[]
             {
                 restoreButton = new SettingsButton
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index 7270354e87..1e2a3d0aa7 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -37,10 +37,12 @@ namespace osu.Game.Screens.Select
             ItemSource = filters;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(CollectionManager collectionManager)
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load([CanBeNull] CollectionManager collectionManager)
         {
-            collections.BindTo(collectionManager.Collections);
+            if (collectionManager != null)
+                collections.BindTo(collectionManager.Collections);
+
             collections.CollectionChanged += (_, __) => collectionsChanged();
             collectionsChanged();
         }

From e271408fca532fd6e1dcd93fc68c380e1b19eab4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 16:51:53 +0900
Subject: [PATCH 04686/10326] Move max score calculation inside ScoreProcessor

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 8 ++++----
 osu.Game/Scoring/ScoreManager.cs            | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 7d138bd878..46994d4f18 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Scoring
         private readonly double accuracyPortion;
         private readonly double comboPortion;
 
-        private double maxHighestCombo;
+        private int maxHighestCombo;
         private double maxBaseScore;
         private double rollingMaxBaseScore;
         private double baseScore;
@@ -204,10 +204,10 @@ namespace osu.Game.Rulesets.Scoring
 
         private double getScore(ScoringMode mode)
         {
-            return GetScore(mode, maxBaseScore, maxHighestCombo, baseScore / maxBaseScore, HighestCombo.Value / maxHighestCombo, bonusScore);
+            return GetScore(mode, maxHighestCombo, baseScore / maxBaseScore, (double)HighestCombo.Value / maxHighestCombo, bonusScore);
         }
 
-        public double GetScore(ScoringMode mode, double maxBaseScore, double maxHighestCombo, double accuracyRatio, double comboRatio, double bonusScore)
+        public double GetScore(ScoringMode mode, int maxCombo, double accuracyRatio, double comboRatio, double bonusScore)
         {
             switch (mode)
             {
@@ -220,7 +220,7 @@ namespace osu.Game.Rulesets.Scoring
 
                 case ScoringMode.Classic:
                     // should emulate osu-stable's scoring as closely as we can (https://osu.ppy.sh/help/wiki/Score/ScoreV1)
-                    return bonusScore + (accuracyRatio * maxBaseScore) * (1 + Math.Max(0, (comboRatio * maxHighestCombo) - 1) * scoreMultiplier / 25);
+                    return bonusScore + (accuracyRatio * maxCombo * 300) * (1 + Math.Max(0, (comboRatio * maxCombo) - 1) * scoreMultiplier / 25);
             }
         }
 
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 634cca159a..5518c86910 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -154,10 +154,7 @@ namespace osu.Game.Scoring
 
                 scoreProcessor.Mods.Value = score.Mods;
 
-                double maxBaseScore = 300 * beatmapMaxCombo;
-                double maxHighestCombo = beatmapMaxCombo;
-
-                Value = (long)Math.Round(scoreProcessor.GetScore(ScoringMode.Value, maxBaseScore, maxHighestCombo, score.Accuracy, score.MaxCombo / maxHighestCombo, 0));
+                Value = (long)Math.Round(scoreProcessor.GetScore(ScoringMode.Value, beatmapMaxCombo, score.Accuracy, (double)score.MaxCombo / beatmapMaxCombo, 0));
             }
         }
 

From 37a659b2af22ca0246cd9833ed1d21fe37726fa6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 17:04:02 +0900
Subject: [PATCH 04687/10326] Refactor/add xmldocs

---
 .../Online/Leaderboards/LeaderboardScore.cs   |  2 +-
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  |  2 +-
 .../Scores/TopScoreStatisticsSection.cs       |  4 +--
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 14 +++++---
 osu.Game/Scoring/ScoreManager.cs              | 33 ++++++++++++++++---
 .../ContractedPanelMiddleContent.cs           |  2 +-
 .../Expanded/ExpandedPanelMiddleContent.cs    |  2 +-
 7 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 846bebe347..dcd0cb435a 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -194,7 +194,7 @@ namespace osu.Game.Online.Leaderboards
                                         {
                                             TextColour = Color4.White,
                                             GlowColour = Color4Extensions.FromHex(@"83ccfa"),
-                                            Current = scoreManager.GetTotalScoreString(score),
+                                            Current = scoreManager.GetBindableTotalScoreString(score),
                                             Font = OsuFont.Numeric.With(size: 23),
                                         },
                                         RankContainer = new Container
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 6bebd98eef..56866765b6 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new OsuSpriteText
                 {
                     Margin = new MarginPadding { Right = horizontal_inset },
-                    Current = scoreManager.GetTotalScoreString(score),
+                    Current = scoreManager.GetBindableTotalScoreString(score),
                     Font = OsuFont.GetFont(size: text_size, weight: index == 0 ? FontWeight.Bold : FontWeight.Medium)
                 },
                 new OsuSpriteText
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 507c692eb1..2fd522dc9d 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private void load()
         {
             if (score != null)
-                totalScoreColumn.Current = scoreManager.GetTotalScoreString(score);
+                totalScoreColumn.Current = scoreManager.GetBindableTotalScoreString(score);
         }
 
         private ScoreInfo score;
@@ -121,7 +121,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 modsColumn.Mods = value.Mods;
 
                 if (IsLoaded)
-                    totalScoreColumn.Current = scoreManager.GetTotalScoreString(value);
+                    totalScoreColumn.Current = scoreManager.GetBindableTotalScoreString(value);
             }
         }
 
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 46994d4f18..983f9a3abf 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -202,11 +202,17 @@ namespace osu.Game.Rulesets.Scoring
             TotalScore.Value = getScore(Mode.Value);
         }
 
-        private double getScore(ScoringMode mode)
-        {
-            return GetScore(mode, maxHighestCombo, baseScore / maxBaseScore, (double)HighestCombo.Value / maxHighestCombo, bonusScore);
-        }
+        private double getScore(ScoringMode mode) => GetScore(mode, maxHighestCombo, baseScore / maxBaseScore, (double)HighestCombo.Value / maxHighestCombo, bonusScore);
 
+        /// <summary>
+        /// Computes the total score.
+        /// </summary>
+        /// <param name="mode">The <see cref="ScoringMode"/> to compute the total score in.</param>
+        /// <param name="maxCombo">The maximum combo achievable in the beatmap.</param>
+        /// <param name="accuracyRatio">The accuracy percentage achieved by the player.</param>
+        /// <param name="comboRatio">The proportion of <paramref name="maxCombo"/> achieved by the player.</param>
+        /// <param name="bonusScore">Any bonus score to be added.</param>
+        /// <returns>The total score.</returns>
         public double GetScore(ScoringMode mode, int maxCombo, double accuracyRatio, double comboRatio, double bonusScore)
         {
             switch (mode)
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 5518c86910..5a6ef6945c 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -86,15 +86,34 @@ namespace osu.Game.Scoring
             => base.CheckLocalAvailability(model, items)
                || (model.OnlineScoreID != null && items.Any(i => i.OnlineScoreID == model.OnlineScoreID));
 
-        public Bindable<long> GetTotalScore(ScoreInfo score)
+        /// <summary>
+        /// Retrieves a bindable that represents the total score of a <see cref="ScoreInfo"/>.
+        /// </summary>
+        /// <remarks>
+        /// Responds to changes in the currently-selected <see cref="ScoringMode"/>.
+        /// </remarks>
+        /// <param name="score">The <see cref="ScoreInfo"/> to retrieve the bindable for.</param>
+        /// <returns>The bindable containing the total score.</returns>
+        public Bindable<long> GetBindableTotalScore(ScoreInfo score)
         {
             var bindable = new TotalScoreBindable(score, difficulties);
             configManager?.BindWith(OsuSetting.ScoreDisplayMode, bindable.ScoringMode);
             return bindable;
         }
 
-        public Bindable<string> GetTotalScoreString(ScoreInfo score) => new TotalScoreStringBindable(GetTotalScore(score));
+        /// <summary>
+        /// Retrieves a bindable that represents the formatted total score string of a <see cref="ScoreInfo"/>.
+        /// </summary>
+        /// <remarks>
+        /// Responds to changes in the currently-selected <see cref="ScoringMode"/>.
+        /// </remarks>
+        /// <param name="score">The <see cref="ScoreInfo"/> to retrieve the bindable for.</param>
+        /// <returns>The bindable containing the formatted total score string.</returns>
+        public Bindable<string> GetBindableTotalScoreString(ScoreInfo score) => new TotalScoreStringBindable(GetBindableTotalScore(score));
 
+        /// <summary>
+        /// Provides the total score of a <see cref="ScoreInfo"/>. Responds to changes in the currently-selected <see cref="ScoringMode"/>.
+        /// </summary>
         private class TotalScoreBindable : Bindable<long>
         {
             public readonly Bindable<ScoringMode> ScoringMode = new Bindable<ScoringMode>();
@@ -102,13 +121,16 @@ namespace osu.Game.Scoring
             private readonly ScoreInfo score;
             private readonly Func<BeatmapDifficultyManager> difficulties;
 
+            /// <summary>
+            /// Creates a new <see cref="TotalScoreBindable"/>.
+            /// </summary>
+            /// <param name="score">The <see cref="ScoreInfo"/> to provide the total score of.</param>
+            /// <param name="difficulties">A function to retrieve the <see cref="BeatmapDifficultyManager"/>.</param>
             public TotalScoreBindable(ScoreInfo score, Func<BeatmapDifficultyManager> difficulties)
             {
                 this.score = score;
                 this.difficulties = difficulties;
 
-                Value = 0;
-
                 ScoringMode.BindValueChanged(onScoringModeChanged, true);
             }
 
@@ -158,6 +180,9 @@ namespace osu.Game.Scoring
             }
         }
 
+        /// <summary>
+        /// Provides the total score of a <see cref="ScoreInfo"/> as a formatted string. Responds to changes in the currently-selected <see cref="ScoringMode"/>.
+        /// </summary>
         private class TotalScoreStringBindable : Bindable<string>
         {
             // ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable (need to hold a reference)
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index b37b89e6c0..0b85eeafa8 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Screens.Ranking.Contracted
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
-                                            Current = scoreManager.GetTotalScoreString(score),
+                                            Current = scoreManager.GetBindableTotalScoreString(score),
                                             Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, fixedWidth: true),
                                             Spacing = new Vector2(-1, 0)
                                         },
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 3433410d3c..0033cd1f43 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                 using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY, true))
                 {
                     scoreCounter.FadeIn();
-                    scoreCounter.Current = scoreManager.GetTotalScore(score);
+                    scoreCounter.Current = scoreManager.GetBindableTotalScore(score);
 
                     double delay = 0;
 

From 5cdc8d2e7b46c092031a7a0a7daf8f645cae4c13 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 17:37:11 +0900
Subject: [PATCH 04688/10326] Add cancellation support

---
 osu.Game/Scoring/ScoreManager.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 5a6ef6945c..619ca76598 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Threading;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using osu.Framework.Bindables;
@@ -135,9 +136,13 @@ namespace osu.Game.Scoring
             }
 
             private IBindable<StarDifficulty> difficultyBindable;
+            private CancellationTokenSource difficultyCancellationSource;
 
             private void onScoringModeChanged(ValueChangedEvent<ScoringMode> mode)
             {
+                difficultyCancellationSource?.Cancel();
+                difficultyCancellationSource = null;
+
                 if (score.Beatmap == null)
                 {
                     Value = score.TotalScore;
@@ -156,7 +161,7 @@ namespace osu.Game.Scoring
                     }
 
                     // We can compute the max combo locally after the async beatmap difficulty computation.
-                    difficultyBindable = difficulties().GetBindableDifficulty(score.Beatmap, score.Ruleset, score.Mods);
+                    difficultyBindable = difficulties().GetBindableDifficulty(score.Beatmap, score.Ruleset, score.Mods, (difficultyCancellationSource = new CancellationTokenSource()).Token);
                     difficultyBindable.BindValueChanged(d => updateScore(d.NewValue.MaxCombo), true);
                 }
                 else

From b1daca6cd33e19c71b91f90ad86f0247ebd4f628 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 18:05:44 +0900
Subject: [PATCH 04689/10326] Fix overlay sound effects playing when open
 requested while disabled

---
 .../Graphics/Containers/OsuFocusedOverlayContainer.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 751ccc8f15..1d96e602d0 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -103,6 +103,8 @@ namespace osu.Game.Graphics.Containers
         {
         }
 
+        private bool playedPopInSound;
+
         protected override void UpdateState(ValueChangedEvent<Visibility> state)
         {
             switch (state.NewValue)
@@ -115,11 +117,18 @@ namespace osu.Game.Graphics.Containers
                     }
 
                     samplePopIn?.Play();
+                    playedPopInSound = true;
+
                     if (BlockScreenWideMouse && DimMainContent) game?.AddBlockingOverlay(this);
                     break;
 
                 case Visibility.Hidden:
-                    samplePopOut?.Play();
+                    if (playedPopInSound)
+                    {
+                        samplePopOut?.Play();
+                        playedPopInSound = false;
+                    }
+
                     if (BlockScreenWideMouse) game?.RemoveBlockingOverlay(this);
                     break;
             }

From cdf3e206857186de7052061b5210642a421f6524 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 18:07:58 +0900
Subject: [PATCH 04690/10326] Add comment regarding feedback

---
 osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 1d96e602d0..41fd37a0d7 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -112,6 +112,7 @@ namespace osu.Game.Graphics.Containers
                 case Visibility.Visible:
                     if (OverlayActivationMode.Value == OverlayActivation.Disabled)
                     {
+                        // todo: visual/audible feedback that this operation could not complete.
                         State.Value = Visibility.Hidden;
                         return;
                     }

From c9f5005efd19270f54ab6834c5c3be301d38c11e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 18:35:25 +0900
Subject: [PATCH 04691/10326] Add icons for editor toolbox tools

---
 .../Edit/HitCircleCompositionTool.cs          |  4 +++
 .../Edit/SliderCompositionTool.cs             |  4 +++
 .../Edit/SpinnerCompositionTool.cs            |  4 +++
 .../TestSceneEditorComposeRadioButtons.cs     |  3 ++-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  2 +-
 .../Edit/Tools/HitObjectCompositionTool.cs    |  4 +++
 osu.Game/Rulesets/Edit/Tools/SelectTool.cs    |  5 ++++
 .../RadioButtons/DrawableRadioButton.cs       | 27 +++++++------------
 .../Components/RadioButtons/RadioButton.cs    |  9 ++++++-
 9 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs b/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs
index 9c94fe0e3d..5f7c8b77b0 100644
--- a/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs
+++ b/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.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.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
@@ -15,6 +17,8 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
+        public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles);
+
         public override PlacementBlueprint CreatePlacementBlueprint() => new HitCirclePlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.cs b/osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.cs
index a377deb35f..596224e5c6 100644
--- a/osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.cs
+++ b/osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.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.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
@@ -15,6 +17,8 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
+        public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders);
+
         public override PlacementBlueprint CreatePlacementBlueprint() => new SliderPlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs b/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs
index 0de0af8f8c..c5e90da3bd 100644
--- a/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs
+++ b/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.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.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners;
@@ -15,6 +17,8 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
+        public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Spinners);
+
         public override PlacementBlueprint CreatePlacementBlueprint() => new SpinnerPlacementBlueprint();
     }
 }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
index e4d7e025a8..0b52ae2b95 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Screens.Edit.Components.RadioButtons;
 
 namespace osu.Game.Tests.Visual.Editing
@@ -22,7 +23,7 @@ namespace osu.Game.Tests.Visual.Editing
                 {
                     new RadioButton("Item 1", () => { }),
                     new RadioButton("Item 2", () => { }),
-                    new RadioButton("Item 3", () => { }),
+                    new RadioButton("Item 3", () => { }, () => new SpriteIcon { Icon = FontAwesome.Regular.Angry }),
                     new RadioButton("Item 4", () => { }),
                     new RadioButton("Item 5", () => { })
                 }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index f134db1ffe..955548fee9 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Edit
 
             toolboxCollection.Items = CompositionTools
                                       .Prepend(new SelectTool())
-                                      .Select(t => new RadioButton(t.Name, () => toolSelected(t)))
+                                      .Select(t => new RadioButton(t.Name, () => toolSelected(t), t.CreateIcon))
                                       .ToList();
 
             setSelectTool();
diff --git a/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs b/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
index 0631031302..0a01ac4320 100644
--- a/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
+++ b/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.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;
+
 namespace osu.Game.Rulesets.Edit.Tools
 {
     public abstract class HitObjectCompositionTool
@@ -14,6 +16,8 @@ namespace osu.Game.Rulesets.Edit.Tools
 
         public abstract PlacementBlueprint CreatePlacementBlueprint();
 
+        public virtual Drawable CreateIcon() => null;
+
         public override string ToString() => Name;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Tools/SelectTool.cs b/osu.Game/Rulesets/Edit/Tools/SelectTool.cs
index b96eeb0790..c050766b23 100644
--- a/osu.Game/Rulesets/Edit/Tools/SelectTool.cs
+++ b/osu.Game/Rulesets/Edit/Tools/SelectTool.cs
@@ -1,6 +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.Graphics;
+using osu.Framework.Graphics.Sprites;
+
 namespace osu.Game.Rulesets.Edit.Tools
 {
     public class SelectTool : HitObjectCompositionTool
@@ -10,6 +13,8 @@ namespace osu.Game.Rulesets.Edit.Tools
         {
         }
 
+        public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.MousePointer };
+
         public override PlacementBlueprint CreatePlacementBlueprint() => null;
     }
 }
diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
index 7be91f4e8e..0cf7b83f3b 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
@@ -5,7 +5,6 @@ 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.Graphics.Sprites;
@@ -29,7 +28,7 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
         private Color4 selectedBackgroundColour;
         private Color4 selectedBubbleColour;
 
-        private readonly Drawable bubble;
+        private Drawable icon;
         private readonly RadioButton button;
 
         public DrawableRadioButton(RadioButton button)
@@ -40,19 +39,6 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
             Action = button.Select;
 
             RelativeSizeAxes = Axes.X;
-
-            bubble = new CircularContainer
-            {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                RelativeSizeAxes = Axes.Both,
-                FillMode = FillMode.Fit,
-                Scale = new Vector2(0.5f),
-                X = 10,
-                Masking = true,
-                Blending = BlendingParameters.Additive,
-                Child = new Box { RelativeSizeAxes = Axes.Both }
-            };
         }
 
         [BackgroundDependencyLoader]
@@ -73,7 +59,14 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
                 Colour = Color4.Black.Opacity(0.5f)
             };
 
-            Add(bubble);
+            Add(icon = (button.CreateIcon?.Invoke() ?? new Circle()).With(b =>
+            {
+                b.Blending = BlendingParameters.Additive;
+                b.Anchor = Anchor.CentreLeft;
+                b.Origin = Anchor.CentreLeft;
+                b.Size = new Vector2(20);
+                b.X = 10;
+            }));
         }
 
         protected override void LoadComplete()
@@ -96,7 +89,7 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
                 return;
 
             BackgroundColour = button.Selected.Value ? selectedBackgroundColour : defaultBackgroundColour;
-            bubble.Colour = button.Selected.Value ? selectedBubbleColour : defaultBubbleColour;
+            icon.Colour = button.Selected.Value ? selectedBubbleColour : defaultBubbleColour;
         }
 
         protected override SpriteText CreateText() => new OsuSpriteText
diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
index b515d7c8bd..a7b0fb05e3 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Edit.Components.RadioButtons
 {
@@ -19,11 +20,17 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
         /// </summary>
         public object Item;
 
+        /// <summary>
+        /// A function which creates a drawable icon to represent this item. If null, a sane default should be used.
+        /// </summary>
+        public readonly Func<Drawable> CreateIcon;
+
         private readonly Action action;
 
-        public RadioButton(object item, Action action)
+        public RadioButton(object item, Action action, Func<Drawable> createIcon = null)
         {
             Item = item;
+            CreateIcon = createIcon;
             this.action = action;
             Selected = new BindableBool();
         }

From a65f564e45b9cedee263ae7016d24b7c1f2928f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 18:39:55 +0900
Subject: [PATCH 04692/10326] Add icons for other ruleset editors

---
 osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs | 4 ++++
 osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs     | 4 ++++
 osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs | 4 ++++
 osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs      | 4 ++++
 osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs    | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
index 295bf417c4..a5f10ed436 100644
--- a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.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.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
@@ -14,6 +16,8 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
+        public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders);
+
         public override PlacementBlueprint CreatePlacementBlueprint() => new HoldNotePlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
index 50b5f9a8fe..9f54152596 100644
--- a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.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.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
@@ -15,6 +17,8 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
+        public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles);
+
         public override PlacementBlueprint CreatePlacementBlueprint() => new NotePlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs
index bf77c76670..587a4efecb 100644
--- a/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.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.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
@@ -15,6 +17,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
         {
         }
 
+        public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders);
+
         public override PlacementBlueprint CreatePlacementBlueprint() => new DrumRollPlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs
index e877cf6240..3e97b4e322 100644
--- a/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.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.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
@@ -15,6 +17,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
         {
         }
 
+        public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles);
+
         public override PlacementBlueprint CreatePlacementBlueprint() => new HitPlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs
index a6191fcedc..918afde1dd 100644
--- a/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.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.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
@@ -15,6 +17,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
         {
         }
 
+        public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Spinners);
+
         public override PlacementBlueprint CreatePlacementBlueprint() => new SwellPlacementBlueprint();
     }
 }

From d3957e6155de4871e74d41fc7efe91b6eda53d6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 18:48:02 +0900
Subject: [PATCH 04693/10326] Move title specification for settings groups to
 constructor

Using an abstract property was awkward for this as it is being consumed
in the underlying constructor but could not be dynamically set in time from a
derived class.
---
 .../Gameplay/TestSceneReplaySettingsOverlay.cs      |  5 ++++-
 .../Ladder/Components/LadderEditorSettings.cs       |  7 +++++--
 osu.Game/Rulesets/Edit/ToolboxGroup.cs              |  3 +--
 .../Play/PlayerSettings/CollectionSettings.cs       |  5 ++++-
 .../Play/PlayerSettings/DiscussionSettings.cs       |  5 ++++-
 .../Screens/Play/PlayerSettings/InputSettings.cs    |  3 +--
 .../Screens/Play/PlayerSettings/PlaybackSettings.cs |  3 +--
 .../Play/PlayerSettings/PlayerSettingsGroup.cs      | 13 ++++++-------
 .../Screens/Play/PlayerSettings/VisualSettings.cs   |  3 +--
 9 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplaySettingsOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplaySettingsOverlay.cs
index cdfb3beb19..f8fab784cc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplaySettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplaySettingsOverlay.cs
@@ -48,7 +48,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class ExampleContainer : PlayerSettingsGroup
         {
-            protected override string Title => @"example";
+            public ExampleContainer()
+                : base("example")
+            {
+            }
         }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index fa530ea2c4..b60eb814e5 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
     {
         private const int padding = 10;
 
-        protected override string Title => @"ladder";
-
         private SettingsDropdown<TournamentRound> roundDropdown;
         private PlayerCheckbox losersCheckbox;
         private DateTextBox dateTimeBox;
@@ -34,6 +32,11 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         [Resolved]
         private LadderInfo ladderInfo { get; set; }
 
+        public LadderEditorSettings()
+            : base("ladder")
+        {
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Rulesets/Edit/ToolboxGroup.cs b/osu.Game/Rulesets/Edit/ToolboxGroup.cs
index eabb834616..7e17d88e17 100644
--- a/osu.Game/Rulesets/Edit/ToolboxGroup.cs
+++ b/osu.Game/Rulesets/Edit/ToolboxGroup.cs
@@ -8,9 +8,8 @@ namespace osu.Game.Rulesets.Edit
 {
     public class ToolboxGroup : PlayerSettingsGroup
     {
-        protected override string Title => "toolbox";
-
         public ToolboxGroup()
+            : base("toolbox")
         {
             RelativeSizeAxes = Axes.X;
             Width = 1;
diff --git a/osu.Game/Screens/Play/PlayerSettings/CollectionSettings.cs b/osu.Game/Screens/Play/PlayerSettings/CollectionSettings.cs
index d3570a8d2d..9e7f8e7394 100644
--- a/osu.Game/Screens/Play/PlayerSettings/CollectionSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/CollectionSettings.cs
@@ -10,7 +10,10 @@ namespace osu.Game.Screens.Play.PlayerSettings
 {
     public class CollectionSettings : PlayerSettingsGroup
     {
-        protected override string Title => @"collections";
+        public CollectionSettings()
+            : base("collections")
+        {
+        }
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Play/PlayerSettings/DiscussionSettings.cs b/osu.Game/Screens/Play/PlayerSettings/DiscussionSettings.cs
index bb4eea47ca..ac040774ee 100644
--- a/osu.Game/Screens/Play/PlayerSettings/DiscussionSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/DiscussionSettings.cs
@@ -10,7 +10,10 @@ namespace osu.Game.Screens.Play.PlayerSettings
 {
     public class DiscussionSettings : PlayerSettingsGroup
     {
-        protected override string Title => @"discussions";
+        public DiscussionSettings()
+            : base("discussions")
+        {
+        }
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
diff --git a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
index 7a8696e27c..725a6e86bf 100644
--- a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
@@ -9,11 +9,10 @@ namespace osu.Game.Screens.Play.PlayerSettings
 {
     public class InputSettings : PlayerSettingsGroup
     {
-        protected override string Title => "Input settings";
-
         private readonly PlayerCheckbox mouseButtonsCheckbox;
 
         public InputSettings()
+            : base("Input Settings")
         {
             Children = new Drawable[]
             {
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
index c691d161ed..24ddc277cd 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
@@ -13,8 +13,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
     {
         private const int padding = 10;
 
-        protected override string Title => @"playback";
-
         public readonly Bindable<double> UserPlaybackRate = new BindableDouble(1)
         {
             Default = 1,
@@ -28,6 +26,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
         private readonly OsuSpriteText multiplierText;
 
         public PlaybackSettings()
+            : base("playback")
         {
             Children = new Drawable[]
             {
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
index 90424ec007..7928d41e3b 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
@@ -17,11 +17,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
 {
     public abstract class PlayerSettingsGroup : Container
     {
-        /// <summary>
-        /// The title to be displayed in the header of this group.
-        /// </summary>
-        protected abstract string Title { get; }
-
         private const float transition_duration = 250;
         private const int container_width = 270;
         private const int border_thickness = 2;
@@ -58,7 +53,11 @@ namespace osu.Game.Screens.Play.PlayerSettings
 
         private Color4 expandedColour;
 
-        protected PlayerSettingsGroup()
+        /// <summary>
+        /// Create a new instance.
+        /// </summary>
+        /// <param name="title">The title to be displayed in the header of this group.</param>
+        protected PlayerSettingsGroup(string title)
         {
             AutoSizeAxes = Axes.Y;
             Width = container_width;
@@ -95,7 +94,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
                                 {
                                     Origin = Anchor.CentreLeft,
                                     Anchor = Anchor.CentreLeft,
-                                    Text = Title.ToUpperInvariant(),
+                                    Text = title.ToUpperInvariant(),
                                     Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 17),
                                     Margin = new MarginPadding { Left = 10 },
                                 },
diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
index d6c66d0751..e06cf5c6d5 100644
--- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
@@ -10,8 +10,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
 {
     public class VisualSettings : PlayerSettingsGroup
     {
-        protected override string Title => "Visual settings";
-
         private readonly PlayerSliderBar<double> dimSliderBar;
         private readonly PlayerSliderBar<double> blurSliderBar;
         private readonly PlayerCheckbox showStoryboardToggle;
@@ -19,6 +17,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
         private readonly PlayerCheckbox beatmapHitsoundsToggle;
 
         public VisualSettings()
+            : base("Visual Settings")
         {
             Children = new Drawable[]
             {

From fb2aced3ac32d4e312913e410557885700c85933 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 19:14:28 +0900
Subject: [PATCH 04694/10326] Add toggle for distance snap

---
 .../Edit/OsuHitObjectComposer.cs               | 13 +++++++++++++
 osu.Game/Rulesets/Edit/HitObjectComposer.cs    | 18 +++++++++++++++++-
 osu.Game/Rulesets/Edit/ToolboxGroup.cs         |  4 ++--
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 37019a7a05..f87bd53ec3 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -38,6 +39,13 @@ namespace osu.Game.Rulesets.Osu.Edit
             new SpinnerCompositionTool()
         };
 
+        private readonly BindableBool distanceSnapToggle = new BindableBool(true) { Description = "Distance Snap" };
+
+        protected override IEnumerable<BindableBool> Toggles => new[]
+        {
+            distanceSnapToggle
+        };
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -45,6 +53,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             EditorBeatmap.SelectedHitObjects.CollectionChanged += (_, __) => updateDistanceSnapGrid();
             EditorBeatmap.PlacementObject.ValueChanged += _ => updateDistanceSnapGrid();
+            distanceSnapToggle.ValueChanged += _ => updateDistanceSnapGrid();
         }
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
@@ -87,6 +96,10 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             distanceSnapGridContainer.Clear();
             distanceSnapGridCache.Invalidate();
+            distanceSnapGrid = null;
+
+            if (!distanceSnapToggle.Value)
+                return;
 
             switch (BlueprintContainer.CurrentTool)
             {
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index f134db1ffe..ee42cd9bae 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
@@ -13,6 +14,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
@@ -94,7 +96,15 @@ namespace osu.Game.Rulesets.Edit
                             Padding = new MarginPadding { Right = 10 },
                             Children = new Drawable[]
                             {
-                                new ToolboxGroup { Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X } }
+                                new ToolboxGroup("toolbox") { Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X } },
+                                new ToolboxGroup("toggles")
+                                {
+                                    ChildrenEnumerable = Toggles.Select(b => new SettingsCheckbox
+                                    {
+                                        Bindable = b,
+                                        LabelText = b?.Description ?? "unknown"
+                                    })
+                                }
                             }
                         },
                         new Container
@@ -156,6 +166,12 @@ namespace osu.Game.Rulesets.Edit
         /// </remarks>
         protected abstract IReadOnlyList<HitObjectCompositionTool> CompositionTools { get; }
 
+        /// <summary>
+        /// A collection of toggles which will be displayed to the user.
+        /// The display name will be decided by <see cref="Bindable{T}.Description"/>.
+        /// </summary>
+        protected virtual IEnumerable<BindableBool> Toggles => Enumerable.Empty<BindableBool>();
+
         /// <summary>
         /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/ToolboxGroup.cs b/osu.Game/Rulesets/Edit/ToolboxGroup.cs
index 7e17d88e17..22b2b05657 100644
--- a/osu.Game/Rulesets/Edit/ToolboxGroup.cs
+++ b/osu.Game/Rulesets/Edit/ToolboxGroup.cs
@@ -8,8 +8,8 @@ namespace osu.Game.Rulesets.Edit
 {
     public class ToolboxGroup : PlayerSettingsGroup
     {
-        public ToolboxGroup()
-            : base("toolbox")
+        public ToolboxGroup(string title)
+            : base(title)
         {
             RelativeSizeAxes = Axes.X;
             Width = 1;

From d210e056294b8bd92e9828e6a7c30c3ae960d239 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 19:20:11 +0900
Subject: [PATCH 04695/10326] Add a touch of spacing between toolbox groups

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index ee42cd9bae..928cdd2ea0 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -94,6 +94,7 @@ namespace osu.Game.Rulesets.Edit
                             Name = "Sidebar",
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Right = 10 },
+                            Spacing = new Vector2(10),
                             Children = new Drawable[]
                             {
                                 new ToolboxGroup("toolbox") { Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X } },

From ac0c4fcb8c2bfb162b820c9b03a128304fe31d0b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 19:31:18 +0900
Subject: [PATCH 04696/10326] Add prompt to save beatmap on exiting editor

---
 osu.Game/Screens/Edit/Editor.cs              | 57 ++++++++++++++------
 osu.Game/Screens/Edit/PromptForSaveDialog.cs | 33 ++++++++++++
 2 files changed, 74 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/PromptForSaveDialog.cs

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index ac1f61c4fd..7e17225846 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -2,39 +2,40 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK.Graphics;
-using osu.Framework.Screens;
+using System.Collections.Generic;
+using osu.Framework;
+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.Screens.Edit.Components.Timelines.Summary;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osu.Framework.Platform;
-using osu.Framework.Timing;
-using osu.Game.Graphics.UserInterface;
-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;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Framework.Logging;
+using osu.Framework.Platform;
+using osu.Framework.Screens;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.API;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Screens.Edit.Components;
+using osu.Game.Screens.Edit.Components.Menus;
+using osu.Game.Screens.Edit.Components.Timelines.Summary;
 using osu.Game.Screens.Edit.Compose;
+using osu.Game.Screens.Edit.Design;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Edit.Timing;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
+using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit
 {
@@ -54,6 +55,11 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private DialogOverlay dialogOverlay { get; set; }
+
+        private bool exitConfirmed;
+
         private Box bottomBackground;
         private Container screenContainer;
 
@@ -346,12 +352,31 @@ namespace osu.Game.Screens.Edit
 
         public override bool OnExiting(IScreen next)
         {
+            if (!exitConfirmed && dialogOverlay != null)
+            {
+                dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave));
+                return true;
+            }
+
             Background.FadeColour(Color4.White, 500);
             resetTrack();
 
             return base.OnExiting(next);
         }
 
+        private void confirmExitWithSave()
+        {
+            exitConfirmed = true;
+            saveBeatmap();
+            this.Exit();
+        }
+
+        private void confirmExit()
+        {
+            exitConfirmed = true;
+            this.Exit();
+        }
+
         protected void Undo() => changeHandler.RestoreState(-1);
 
         protected void Redo() => changeHandler.RestoreState(1);
diff --git a/osu.Game/Screens/Edit/PromptForSaveDialog.cs b/osu.Game/Screens/Edit/PromptForSaveDialog.cs
new file mode 100644
index 0000000000..38d956557d
--- /dev/null
+++ b/osu.Game/Screens/Edit/PromptForSaveDialog.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 osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Game.Screens.Edit
+{
+    public class PromptForSaveDialog : PopupDialog
+    {
+        public PromptForSaveDialog(Action exit, Action saveAndExit)
+        {
+            HeaderText = "Did you want to save your changes?";
+
+            Icon = FontAwesome.Regular.Save;
+
+            Buttons = new PopupDialogButton[]
+            {
+                new PopupDialogCancelButton
+                {
+                    Text = @"Save my masterpiece!",
+                    Action = saveAndExit
+                },
+                new PopupDialogOkButton
+                {
+                    Text = @"Forget all changes",
+                    Action = exit
+                },
+            };
+        }
+    }
+}

From 6f067ff300910cf82a0cfac72d3578fd73c520d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 19:40:41 +0900
Subject: [PATCH 04697/10326] Only show confirmation if changes have been made
 since last save

---
 osu.Game/Screens/Edit/Editor.cs              | 13 ++++++++++++-
 osu.Game/Screens/Edit/EditorChangeHandler.cs | 13 +++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 7e17225846..58395e4848 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Screens.Edit
 
         private bool exitConfirmed;
 
+        private string lastSavedHash;
+
         private Box bottomBackground;
         private Container screenContainer;
 
@@ -124,6 +126,8 @@ namespace osu.Game.Screens.Edit
             changeHandler = new EditorChangeHandler(editorBeatmap);
             dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
 
+            updateLastSavedHash();
+
             EditorMenuBar menuBar;
             OsuMenuItem undoMenuItem;
             OsuMenuItem redoMenuItem;
@@ -352,7 +356,7 @@ namespace osu.Game.Screens.Edit
 
         public override bool OnExiting(IScreen next)
         {
-            if (!exitConfirmed && dialogOverlay != null)
+            if (!exitConfirmed && dialogOverlay != null && changeHandler.CurrentStateHash != lastSavedHash)
             {
                 dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave));
                 return true;
@@ -447,6 +451,8 @@ namespace osu.Game.Screens.Edit
 
             // save the loaded beatmap's data stream.
             beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap, editorBeatmap.BeatmapSkin);
+
+            updateLastSavedHash();
         }
 
         private void exportBeatmap()
@@ -455,6 +461,11 @@ namespace osu.Game.Screens.Edit
             beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
         }
 
+        private void updateLastSavedHash()
+        {
+            lastSavedHash = changeHandler.CurrentStateHash;
+        }
+
         public double SnapTime(double time, double? referenceTime) => editorBeatmap.SnapTime(time, referenceTime);
 
         public double GetBeatLengthAtTime(double referenceTime) => editorBeatmap.GetBeatLengthAtTime(referenceTime);
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 927c823c64..aa0f89912a 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Objects;
 
@@ -24,6 +25,18 @@ namespace osu.Game.Screens.Edit
 
         private int currentState = -1;
 
+        /// <summary>
+        /// A SHA-2 hash representing the current visible editor state.
+        /// </summary>
+        public string CurrentStateHash
+        {
+            get
+            {
+                using (var stream = new MemoryStream(savedStates[currentState]))
+                    return stream.ComputeSHA2Hash();
+            }
+        }
+
         private readonly EditorBeatmap editorBeatmap;
         private int bulkChangesStarted;
         private bool isRestoring;

From 327179a81efbc9524be1a3a7d0ba1d54a3e46dff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 19:42:03 +0900
Subject: [PATCH 04698/10326] Expose unsaved changes state

---
 osu.Game/Screens/Edit/Editor.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 58395e4848..34c69d09e0 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -52,6 +52,8 @@ namespace osu.Game.Screens.Edit
 
         public override bool AllowRateAdjustments => false;
 
+        public bool HasUnsavedChanges => lastSavedHash != changeHandler.CurrentStateHash;
+
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -356,7 +358,7 @@ namespace osu.Game.Screens.Edit
 
         public override bool OnExiting(IScreen next)
         {
-            if (!exitConfirmed && dialogOverlay != null && changeHandler.CurrentStateHash != lastSavedHash)
+            if (!exitConfirmed && dialogOverlay != null && HasUnsavedChanges)
             {
                 dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave));
                 return true;

From c6e72dabd372c35a589e2b5c23220e5478b43536 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 19:57:28 +0900
Subject: [PATCH 04699/10326] Add test coverage

---
 .../Editing/TestSceneEditorChangeStates.cs    | 29 +++++++++++++++--
 osu.Game/Screens/Edit/Editor.cs               | 32 +++++++++----------
 osu.Game/Tests/Beatmaps/TestBeatmap.cs        |  1 +
 3 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
index 293a6e6869..c8a32d966f 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Tests.Visual.Editing
 
         protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
 
+        protected new TestEditor Editor => (TestEditor)base.Editor;
+
         public override void SetUpSteps()
         {
             base.SetUpSteps();
@@ -35,6 +37,7 @@ namespace osu.Game.Tests.Visual.Editing
             addUndoSteps();
 
             AddAssert("no change occurred", () => hitObjectCount == editorBeatmap.HitObjects.Count);
+            AddAssert("no unsaved changes", () => !Editor.HasUnsavedChanges);
         }
 
         [Test]
@@ -47,6 +50,7 @@ namespace osu.Game.Tests.Visual.Editing
             addRedoSteps();
 
             AddAssert("no change occurred", () => hitObjectCount == editorBeatmap.HitObjects.Count);
+            AddAssert("no unsaved changes", () => !Editor.HasUnsavedChanges);
         }
 
         [Test]
@@ -64,9 +68,11 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("add hitobject", () => editorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
             AddAssert("hitobject added", () => addedObject == expectedObject);
+            AddAssert("unsaved changes", () => Editor.HasUnsavedChanges);
 
             addUndoSteps();
             AddAssert("hitobject removed", () => removedObject == expectedObject);
+            AddAssert("no unsaved changes", () => !Editor.HasUnsavedChanges);
         }
 
         [Test]
@@ -94,6 +100,17 @@ namespace osu.Game.Tests.Visual.Editing
             addRedoSteps();
             AddAssert("hitobject added", () => addedObject.StartTime == expectedObject.StartTime); // Can't compare via equality (new hitobject instance)
             AddAssert("no hitobject removed", () => removedObject == null);
+            AddAssert("unsaved changes", () => Editor.HasUnsavedChanges);
+        }
+
+        [Test]
+        public void TestAddObjectThenSaveHasNoUnsavedChanges()
+        {
+            AddStep("add hitobject", () => editorBeatmap.Add(new HitCircle { StartTime = 1000 }));
+
+            AddAssert("unsaved changes", () => Editor.HasUnsavedChanges);
+            AddStep("save changes", () => Editor.Save());
+            AddAssert("no unsaved changes", () => !Editor.HasUnsavedChanges);
         }
 
         [Test]
@@ -120,6 +137,7 @@ namespace osu.Game.Tests.Visual.Editing
             addUndoSteps();
             AddAssert("hitobject added", () => addedObject.StartTime == expectedObject.StartTime); // Can't compare via equality (new hitobject instance)
             AddAssert("no hitobject removed", () => removedObject == null);
+            AddAssert("unsaved changes", () => Editor.HasUnsavedChanges); // 2 steps performed, 1 undone
         }
 
         [Test]
@@ -148,19 +166,24 @@ namespace osu.Game.Tests.Visual.Editing
             addRedoSteps();
             AddAssert("hitobject removed", () => removedObject.StartTime == expectedObject.StartTime); // Can't compare via equality (new hitobject instance after undo)
             AddAssert("no hitobject added", () => addedObject == null);
+            AddAssert("no changes", () => !Editor.HasUnsavedChanges); // end result is empty beatmap, matching original state
         }
 
-        private void addUndoSteps() => AddStep("undo", () => ((TestEditor)Editor).Undo());
+        private void addUndoSteps() => AddStep("undo", () => Editor.Undo());
 
-        private void addRedoSteps() => AddStep("redo", () => ((TestEditor)Editor).Redo());
+        private void addRedoSteps() => AddStep("redo", () => Editor.Redo());
 
         protected override Editor CreateEditor() => new TestEditor();
 
-        private class TestEditor : Editor
+        protected class TestEditor : Editor
         {
             public new void Undo() => base.Undo();
 
             public new void Redo() => base.Redo();
+
+            public new void Save() => base.Save();
+
+            public new bool HasUnsavedChanges => base.HasUnsavedChanges;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 34c69d09e0..23eb704920 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Edit
 
         public override bool AllowRateAdjustments => false;
 
-        public bool HasUnsavedChanges => lastSavedHash != changeHandler.CurrentStateHash;
+        protected bool HasUnsavedChanges => lastSavedHash != changeHandler.CurrentStateHash;
 
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
@@ -136,7 +136,7 @@ namespace osu.Game.Screens.Edit
 
             var fileMenuItems = new List<MenuItem>
             {
-                new EditorMenuItem("Save", MenuItemType.Standard, saveBeatmap)
+                new EditorMenuItem("Save", MenuItemType.Standard, Save)
             };
 
             if (RuntimeInfo.IsDesktop)
@@ -249,6 +249,17 @@ namespace osu.Game.Screens.Edit
             bottomBackground.Colour = colours.Gray2;
         }
 
+        protected void Save()
+        {
+            // apply any set-level metadata changes.
+            beatmapManager.Update(playableBeatmap.BeatmapInfo.BeatmapSet);
+
+            // save the loaded beatmap's data stream.
+            beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap, editorBeatmap.BeatmapSkin);
+
+            updateLastSavedHash();
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -268,7 +279,7 @@ namespace osu.Game.Screens.Edit
                     return true;
 
                 case PlatformActionType.Save:
-                    saveBeatmap();
+                    Save();
                     return true;
             }
 
@@ -373,7 +384,7 @@ namespace osu.Game.Screens.Edit
         private void confirmExitWithSave()
         {
             exitConfirmed = true;
-            saveBeatmap();
+            Save();
             this.Exit();
         }
 
@@ -446,20 +457,9 @@ namespace osu.Game.Screens.Edit
                 clock.SeekForward(!clock.IsRunning, amount);
         }
 
-        private void saveBeatmap()
-        {
-            // apply any set-level metadata changes.
-            beatmapManager.Update(playableBeatmap.BeatmapInfo.BeatmapSet);
-
-            // save the loaded beatmap's data stream.
-            beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap, editorBeatmap.BeatmapSkin);
-
-            updateLastSavedHash();
-        }
-
         private void exportBeatmap()
         {
-            saveBeatmap();
+            Save();
             beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
         }
 
diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index 9fc20fd0f2..a375a17bcf 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Tests.Beatmaps
             BeatmapInfo.Ruleset = ruleset;
             BeatmapInfo.RulesetID = ruleset.ID ?? 0;
             BeatmapInfo.BeatmapSet.Metadata = BeatmapInfo.Metadata;
+            BeatmapInfo.BeatmapSet.Files = new List<BeatmapSetFileInfo>();
             BeatmapInfo.BeatmapSet.Beatmaps = new List<BeatmapInfo> { BeatmapInfo };
             BeatmapInfo.BeatmapSet.OnlineInfo = new BeatmapSetOnlineInfo
             {

From 1803ecad8001db57c39b62fbab2ecacc07d7a9fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Sep 2020 20:00:38 +0900
Subject: [PATCH 04700/10326] Add cancel exit button

---
 osu.Game/Screens/Edit/PromptForSaveDialog.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Edit/PromptForSaveDialog.cs b/osu.Game/Screens/Edit/PromptForSaveDialog.cs
index 38d956557d..16504b47bd 100644
--- a/osu.Game/Screens/Edit/PromptForSaveDialog.cs
+++ b/osu.Game/Screens/Edit/PromptForSaveDialog.cs
@@ -27,6 +27,10 @@ namespace osu.Game.Screens.Edit
                     Text = @"Forget all changes",
                     Action = exit
                 },
+                new PopupDialogCancelButton
+                {
+                    Text = @"Oops, continue editing",
+                },
             };
         }
     }

From aeae009512aad6f33a7ba5b4a54b161460cc3ead Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 20:11:29 +0900
Subject: [PATCH 04701/10326] Disable online beatmap lookups in tests

---
 osu.Game/Beatmaps/BeatmapManager.cs | 12 ++++++++----
 osu.Game/OsuGameBase.cs             |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 34bb578b2a..d53f85c68d 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -66,12 +66,14 @@ namespace osu.Game.Beatmaps
         private readonly RulesetStore rulesets;
         private readonly BeatmapStore beatmaps;
         private readonly AudioManager audioManager;
-        private readonly BeatmapOnlineLookupQueue onlineLookupQueue;
         private readonly TextureStore textureStore;
         private readonly ITrackStore trackStore;
 
+        [CanBeNull]
+        private readonly BeatmapOnlineLookupQueue onlineLookupQueue;
+
         public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, GameHost host = null,
-                              WorkingBeatmap defaultBeatmap = null)
+                              WorkingBeatmap defaultBeatmap = null, bool performOnlineLookups = false)
             : base(storage, contextFactory, api, new BeatmapStore(contextFactory), host)
         {
             this.rulesets = rulesets;
@@ -85,7 +87,8 @@ namespace osu.Game.Beatmaps
             beatmaps.ItemRemoved += removeWorkingCache;
             beatmaps.ItemUpdated += removeWorkingCache;
 
-            onlineLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
+            if (performOnlineLookups)
+                onlineLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
 
             textureStore = new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store));
             trackStore = audioManager.GetTrackStore(Files.Store);
@@ -142,7 +145,8 @@ namespace osu.Game.Beatmaps
 
             bool hadOnlineBeatmapIDs = beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0);
 
-            await onlineLookupQueue.UpdateAsync(beatmapSet, cancellationToken);
+            if (onlineLookupQueue != null)
+                await onlineLookupQueue.UpdateAsync(beatmapSet, cancellationToken);
 
             // ensure at least one beatmap was able to retrieve or keep an online ID, else drop the set ID.
             if (hadOnlineBeatmapIDs && !beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0))
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 4bc8f4c527..b61017f038 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -198,7 +198,7 @@ namespace osu.Game
 
             // ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup()
             dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Host));
-            dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Host, defaultBeatmap));
+            dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Host, defaultBeatmap, true));
 
             // this should likely be moved to ArchiveModelManager when another case appers where it is necessary
             // to have inter-dependent model managers. this could be obtained with an IHasForeign<T> interface to

From bbef7ff720c91dce79839d9d3182fbc712ec388b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 20:19:07 +0900
Subject: [PATCH 04702/10326] Fix leaderboard loading spinner disappearing too
 early

---
 osu.Game/Online/Leaderboards/Leaderboard.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index db0f835c67..084ba89f6e 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -56,13 +56,14 @@ namespace osu.Game.Online.Leaderboards
                 scrollFlow?.FadeOut(fade_duration, Easing.OutQuint).Expire();
                 scrollFlow = null;
 
-                loading.Hide();
-
                 showScoresDelegate?.Cancel();
                 showScoresCancellationSource?.Cancel();
 
                 if (scores == null || !scores.Any())
+                {
+                    loading.Hide();
                     return;
+                }
 
                 // ensure placeholder is hidden when displaying scores
                 PlaceholderState = PlaceholderState.Successful;
@@ -84,6 +85,7 @@ namespace osu.Game.Online.Leaderboards
                     }
 
                     scrollContainer.ScrollTo(0f, false);
+                    loading.Hide();
                 }, (showScoresCancellationSource = new CancellationTokenSource()).Token));
             }
         }

From 12188ec3c931bc30e5bdb7e1c99f988027dbc33b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 20:49:59 +0900
Subject: [PATCH 04703/10326] Fix broken RollingCounter current value

---
 osu.Game/Graphics/UserInterface/RollingCounter.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index ece1b8e22c..91a557094d 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -9,16 +9,20 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public abstract class RollingCounter<T> : Container
+    public abstract class RollingCounter<T> : Container, IHasCurrentValue<T>
         where T : struct, IEquatable<T>
     {
-        /// <summary>
-        /// The current value.
-        /// </summary>
-        public Bindable<T> Current = new Bindable<T>();
+        private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();
+
+        public Bindable<T> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
 
         private SpriteText displayedCountSpriteText;
 

From d7ca2cf1cca15da8fe476dfd4292d5bbd77cd167 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 22:01:09 +0900
Subject: [PATCH 04704/10326] Replace loaded check with better variation

---
 .../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 2fd522dc9d..3a842d0a43 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
                 statisticsColumns.ChildrenEnumerable = value.SortedStatistics.Select(kvp => createStatisticsColumn(kvp.Key, kvp.Value));
                 modsColumn.Mods = value.Mods;
 
-                if (IsLoaded)
+                if (scoreManager != null)
                     totalScoreColumn.Current = scoreManager.GetBindableTotalScoreString(value);
             }
         }

From 43525614adefa151a20805225646b4421c9cbd3c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 23:10:21 +0900
Subject: [PATCH 04705/10326] Store raw BeatmapCollection in filter control

---
 osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs | 2 +-
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs        | 2 +-
 osu.Game/Screens/Select/FilterControl.cs                   | 2 +-
 osu.Game/Screens/Select/FilterCriteria.cs                  | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 6012150513..f89f22bf23 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -204,7 +204,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("collection filter still selected", () => control.CreateCriteria().Collection?.CollectionName.Value == "1");
+            AddAssert("collection filter still selected", () => control.CreateCriteria().Collection?.Name.Value == "1");
         }
 
         private void assertCollectionHeaderDisplays(string collectionName, bool shouldDisplay = true)
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 8e5655e514..3892e02a8f 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Select.Carousel
             }
 
             if (match)
-                match &= criteria.Collection?.ContainsBeatmap(Beatmap) ?? true;
+                match &= criteria.Collection?.Beatmaps.Contains(Beatmap) ?? true;
 
             Filtered.Value = !match;
         }
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 41ce0d65cd..9128160608 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Select
                 Sort = sortMode.Value,
                 AllowConvertedBeatmaps = showConverted.Value,
                 Ruleset = ruleset.Value,
-                Collection = collectionDropdown?.Current.Value
+                Collection = collectionDropdown?.Current.Value.Collection
             };
 
             if (!minimumStars.IsDefault)
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index acab982945..66f164bca8 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Beatmaps;
+using osu.Game.Collections;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Select.Filter;
 
@@ -56,7 +57,7 @@ namespace osu.Game.Screens.Select
         /// The collection to filter beatmaps from.
         /// </summary>
         [CanBeNull]
-        public CollectionFilter Collection;
+        public BeatmapCollection Collection;
 
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct

From 6b56c6e83ff29b2c375af41c69ed89c344d4c72a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 9 Sep 2020 23:11:19 +0900
Subject: [PATCH 04706/10326] Rename to CollectionMenuItem

---
 .../SongSelect/TestSceneFilterControl.cs      |  4 ++--
 .../Select/CollectionFilterDropdown.cs        | 24 +++++++++----------
 ...lectionFilter.cs => CollectionMenuItem.cs} | 24 ++++++-------------
 3 files changed, 21 insertions(+), 31 deletions(-)
 rename osu.Game/Screens/Select/{CollectionFilter.cs => CollectionMenuItem.cs} (60%)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index f89f22bf23..23feb1466e 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             InputManager.Click(MouseButton.Left);
         });
 
-        private IEnumerable<Dropdown<CollectionFilter>.DropdownMenu.DrawableDropdownMenuItem> getCollectionDropdownItems()
-            => control.ChildrenOfType<CollectionFilterDropdown>().Single().ChildrenOfType<Dropdown<CollectionFilter>.DropdownMenu.DrawableDropdownMenuItem>();
+        private IEnumerable<Dropdown<CollectionMenuItem>.DropdownMenu.DrawableDropdownMenuItem> getCollectionDropdownItems()
+            => control.ChildrenOfType<CollectionFilterDropdown>().Single().ChildrenOfType<Dropdown<CollectionMenuItem>.DropdownMenu.DrawableDropdownMenuItem>();
     }
 }
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index 1e2a3d0aa7..b08c3b167d 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -21,13 +21,13 @@ using osuTK;
 namespace osu.Game.Screens.Select
 {
     /// <summary>
-    /// A dropdown to select the <see cref="CollectionFilter"/> to filter beatmaps using.
+    /// A dropdown to select the <see cref="CollectionMenuItem"/> to filter beatmaps using.
     /// </summary>
-    public class CollectionFilterDropdown : OsuDropdown<CollectionFilter>
+    public class CollectionFilterDropdown : OsuDropdown<CollectionMenuItem>
     {
         private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
         private readonly IBindableList<BeatmapInfo> beatmaps = new BindableList<BeatmapInfo>();
-        private readonly BindableList<CollectionFilter> filters = new BindableList<CollectionFilter>();
+        private readonly BindableList<CollectionMenuItem> filters = new BindableList<CollectionMenuItem>();
 
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
@@ -62,17 +62,17 @@ namespace osu.Game.Screens.Select
             var selectedItem = SelectedItem?.Value?.Collection;
 
             filters.Clear();
-            filters.Add(new AllBeatmapCollectionFilter());
-            filters.AddRange(collections.Select(c => new CollectionFilter(c)));
-            filters.Add(new ManageCollectionsFilter());
+            filters.Add(new AllBeatmapsCollectionMenuItem());
+            filters.AddRange(collections.Select(c => new CollectionMenuItem(c)));
+            filters.Add(new ManageCollectionsMenuItem());
 
             Current.Value = filters.SingleOrDefault(f => f.Collection != null && f.Collection == selectedItem) ?? filters[0];
         }
 
         /// <summary>
-        /// Occurs when the <see cref="CollectionFilter"/> selection has changed.
+        /// Occurs when the <see cref="CollectionMenuItem"/> selection has changed.
         /// </summary>
-        private void filterChanged(ValueChangedEvent<CollectionFilter> filter)
+        private void filterChanged(ValueChangedEvent<CollectionMenuItem> filter)
         {
             // Binding the beatmaps will trigger a collection change event, which results in an infinite-loop. This is rebound later, when it's safe to do so.
             beatmaps.CollectionChanged -= filterBeatmapsChanged;
@@ -87,7 +87,7 @@ namespace osu.Game.Screens.Select
 
             // Never select the manage collection filter - rollback to the previous filter.
             // This is done after the above since it is important that bindable is unbound from OldValue, which is lost after forcing it back to the old value.
-            if (filter.NewValue is ManageCollectionsFilter)
+            if (filter.NewValue is ManageCollectionsMenuItem)
             {
                 Current.Value = filter.OldValue;
                 manageCollectionsDialog?.Show();
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Select
             Current.TriggerChange();
         }
 
-        protected override string GenerateItemText(CollectionFilter item) => item.CollectionName.Value;
+        protected override string GenerateItemText(CollectionMenuItem item) => item.CollectionName.Value;
 
         protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader
         {
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.Select
 
         public class CollectionDropdownHeader : OsuDropdownHeader
         {
-            public readonly Bindable<CollectionFilter> SelectedItem = new Bindable<CollectionFilter>();
+            public readonly Bindable<CollectionMenuItem> SelectedItem = new Bindable<CollectionMenuItem>();
             private readonly Bindable<string> collectionName = new Bindable<string>();
 
             protected override string Label
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.Select
         private class CollectionDropdownMenuItem : OsuDropdownMenu.DrawableOsuDropdownMenuItem
         {
             [NotNull]
-            protected new CollectionFilter Item => ((DropdownMenuItem<CollectionFilter>)base.Item).Value;
+            protected new CollectionMenuItem Item => ((DropdownMenuItem<CollectionMenuItem>)base.Item).Value;
 
             [Resolved]
             private OsuColour colours { get; set; }
diff --git a/osu.Game/Screens/Select/CollectionFilter.cs b/osu.Game/Screens/Select/CollectionMenuItem.cs
similarity index 60%
rename from osu.Game/Screens/Select/CollectionFilter.cs
rename to osu.Game/Screens/Select/CollectionMenuItem.cs
index 883019ab06..995651de19 100644
--- a/osu.Game/Screens/Select/CollectionFilter.cs
+++ b/osu.Game/Screens/Select/CollectionMenuItem.cs
@@ -1,10 +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.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
-using osu.Game.Beatmaps;
 using osu.Game.Collections;
 
 namespace osu.Game.Screens.Select
@@ -12,7 +10,7 @@ namespace osu.Game.Screens.Select
     /// <summary>
     /// A <see cref="BeatmapCollection"/> filter.
     /// </summary>
-    public class CollectionFilter
+    public class CollectionMenuItem
     {
         /// <summary>
         /// The collection to filter beatmaps from.
@@ -28,35 +26,27 @@ namespace osu.Game.Screens.Select
         public readonly Bindable<string> CollectionName;
 
         /// <summary>
-        /// Creates a new <see cref="CollectionFilter"/>.
+        /// Creates a new <see cref="CollectionMenuItem"/>.
         /// </summary>
         /// <param name="collection">The collection to filter beatmaps from.</param>
-        public CollectionFilter([CanBeNull] BeatmapCollection collection)
+        public CollectionMenuItem([CanBeNull] BeatmapCollection collection)
         {
             Collection = collection;
             CollectionName = Collection?.Name.GetBoundCopy() ?? new Bindable<string>("All beatmaps");
         }
-
-        /// <summary>
-        /// Whether the collection contains a given beatmap.
-        /// </summary>
-        /// <param name="beatmap">The beatmap to check.</param>
-        /// <returns>Whether <see cref="Collection"/> contains <paramref name="beatmap"/>.</returns>
-        public virtual bool ContainsBeatmap(BeatmapInfo beatmap)
-            => Collection?.Beatmaps.Any(b => b.Equals(beatmap)) ?? true;
     }
 
-    public class AllBeatmapCollectionFilter : CollectionFilter
+    public class AllBeatmapsCollectionMenuItem : CollectionMenuItem
     {
-        public AllBeatmapCollectionFilter()
+        public AllBeatmapsCollectionMenuItem()
             : base(null)
         {
         }
     }
 
-    public class ManageCollectionsFilter : CollectionFilter
+    public class ManageCollectionsMenuItem : CollectionMenuItem
     {
-        public ManageCollectionsFilter()
+        public ManageCollectionsMenuItem()
             : base(null)
         {
             CollectionName.Value = "Manage collections...";

From df1537f2a03e55aad03e83223ed4656b146cb126 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Sep 2020 18:09:03 +0900
Subject: [PATCH 04707/10326] Update framework

---
 osu.Android.props                                   | 2 +-
 osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs | 2 +-
 osu.Game/osu.Game.csproj                            | 2 +-
 osu.iOS.props                                       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 62397ca028..a2686c380e 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.907.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.910.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 20adbc1c02..88c855d768 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
         protected void AddPoint(Vector2 start, Vector2 end, Vector2 hitPoint, float radius)
         {
-            if (pointGrid.Content.Length == 0)
+            if (pointGrid.Content.Count == 0)
                 return;
 
             double angle1 = Math.Atan2(end.Y - hitPoint.Y, hitPoint.X - end.X); // Angle between the end point and the hit point.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1de0633d1f..48582ae29d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.907.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.910.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 7187b48907..0eed2fa911 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.Framework.iOS" Version="2020.907.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.910.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.907.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.910.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 18d96738a11133e3b82f7d8f3049e8d7d27d1aa4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Sep 2020 19:37:40 +0900
Subject: [PATCH 04708/10326] Fix hard crash on deleting a collection with no
 collection selected

---
 osu.Game/Screens/Select/FilterControl.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 9128160608..3f1c88a1e3 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -189,7 +189,15 @@ namespace osu.Game.Screens.Select
                 }
             };
 
-            collectionDropdown.Current.ValueChanged += _ => updateCriteria();
+            collectionDropdown.Current.ValueChanged += val =>
+            {
+                if (val.NewValue == null)
+                    // may be null briefly while menu is repopulated.
+                    return;
+
+                updateCriteria();
+            };
+
             searchTextBox.Current.ValueChanged += _ => updateCriteria();
 
             updateCriteria();

From 74eea8900bc2015bdb5f33a7e9f8e4f504bc8ce4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 10 Sep 2020 20:00:57 +0900
Subject: [PATCH 04709/10326] Remove unnecessary check for negative durations

---
 .../Difficulty/TaikoDifficultyCalculator.cs     | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index ef43fc6d1e..e5485db4df 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -51,18 +51,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             for (int i = 2; i < beatmap.HitObjects.Count; i++)
             {
-                // Check for negative durations
-                var currentAfterLast = beatmap.HitObjects[i].StartTime > beatmap.HitObjects[i - 1].StartTime;
-                var lastAfterSecondLast = beatmap.HitObjects[i - 1].StartTime > beatmap.HitObjects[i - 2].StartTime;
-
-                if (currentAfterLast && lastAfterSecondLast)
-                {
-                    taikoDifficultyHitObjects.Add(
-                        new TaikoDifficultyHitObject(
-                            beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate, i
-                        )
-                    );
-                }
+                taikoDifficultyHitObjects.Add(
+                    new TaikoDifficultyHitObject(
+                        beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate, i
+                    )
+                );
             }
 
             new StaminaCheeseDetector(taikoDifficultyHitObjects).FindCheese();

From 314cd13b7446c5497ff2e2b0a331a3d744ffbb52 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 10 Sep 2020 23:36:22 +0900
Subject: [PATCH 04710/10326] Fix song select filter ordering

---
 osu.Game/Screens/Select/FilterControl.cs | 132 +++++++++++------------
 1 file changed, 62 insertions(+), 70 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 3f1c88a1e3..079667a457 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 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.Rulesets;
@@ -98,89 +99,80 @@ namespace osu.Game.Screens.Select
                     Width = 0.5f,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    Child = new GridContainer
+                    // Reverse ChildID so that dropdowns in the top section appear on top of the bottom section.
+                    Child = new ReverseChildIDFillFlowContainer<Drawable>
                     {
                         RelativeSizeAxes = Axes.Both,
-                        RowDimensions = new[]
+                        Spacing = new Vector2(0, 5),
+                        Children = new[]
                         {
-                            new Dimension(GridSizeMode.Absolute, 60),
-                            new Dimension(GridSizeMode.Absolute, 5),
-                            new Dimension(GridSizeMode.Absolute, 20),
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
+                            new Container
                             {
-                                new Container
+                                RelativeSizeAxes = Axes.X,
+                                Height = 60,
+                                Children = new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Children = new Drawable[]
+                                    searchTextBox = new SeekLimitedSearchTextBox { RelativeSizeAxes = Axes.X },
+                                    new Box
                                     {
-                                        searchTextBox = new SeekLimitedSearchTextBox { RelativeSizeAxes = Axes.X },
-                                        new Box
+                                        RelativeSizeAxes = Axes.X,
+                                        Height = 1,
+                                        Colour = OsuColour.Gray(80),
+                                        Origin = Anchor.BottomLeft,
+                                        Anchor = Anchor.BottomLeft,
+                                    },
+                                    new FillFlowContainer
+                                    {
+                                        Anchor = Anchor.BottomRight,
+                                        Origin = Anchor.BottomRight,
+                                        Direction = FillDirection.Horizontal,
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Spacing = new Vector2(OsuTabControl<SortMode>.HORIZONTAL_SPACING, 0),
+                                        Children = new Drawable[]
                                         {
-                                            RelativeSizeAxes = Axes.X,
-                                            Height = 1,
-                                            Colour = OsuColour.Gray(80),
-                                            Origin = Anchor.BottomLeft,
-                                            Anchor = Anchor.BottomLeft,
-                                        },
-                                        new FillFlowContainer
-                                        {
-                                            Anchor = Anchor.BottomRight,
-                                            Origin = Anchor.BottomRight,
-                                            Direction = FillDirection.Horizontal,
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Spacing = new Vector2(OsuTabControl<SortMode>.HORIZONTAL_SPACING, 0),
-                                            Children = new Drawable[]
+                                            new OsuTabControlCheckbox
                                             {
-                                                new OsuTabControlCheckbox
-                                                {
-                                                    Text = "Show converted",
-                                                    Current = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
-                                                    Anchor = Anchor.BottomRight,
-                                                    Origin = Anchor.BottomRight,
-                                                },
-                                                sortTabs = new OsuTabControl<SortMode>
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    Width = 0.5f,
-                                                    Height = 24,
-                                                    AutoSort = true,
-                                                    Anchor = Anchor.BottomRight,
-                                                    Origin = Anchor.BottomRight,
-                                                    AccentColour = colours.GreenLight,
-                                                    Current = { BindTarget = sortMode }
-                                                },
-                                                new OsuSpriteText
-                                                {
-                                                    Text = "Sort by",
-                                                    Font = OsuFont.GetFont(size: 14),
-                                                    Margin = new MarginPadding(5),
-                                                    Anchor = Anchor.BottomRight,
-                                                    Origin = Anchor.BottomRight,
-                                                },
-                                            }
-                                        },
-                                    }
+                                                Text = "Show converted",
+                                                Current = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
+                                                Anchor = Anchor.BottomRight,
+                                                Origin = Anchor.BottomRight,
+                                            },
+                                            sortTabs = new OsuTabControl<SortMode>
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                Width = 0.5f,
+                                                Height = 24,
+                                                AutoSort = true,
+                                                Anchor = Anchor.BottomRight,
+                                                Origin = Anchor.BottomRight,
+                                                AccentColour = colours.GreenLight,
+                                                Current = { BindTarget = sortMode }
+                                            },
+                                            new OsuSpriteText
+                                            {
+                                                Text = "Sort by",
+                                                Font = OsuFont.GetFont(size: 14),
+                                                Margin = new MarginPadding(5),
+                                                Anchor = Anchor.BottomRight,
+                                                Origin = Anchor.BottomRight,
+                                            },
+                                        }
+                                    },
                                 }
                             },
-                            null,
-                            new Drawable[]
+                            new Container
                             {
-                                new Container
+                                RelativeSizeAxes = Axes.X,
+                                Height = 20,
+                                Children = new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Children = new Drawable[]
+                                    collectionDropdown = new CollectionFilterDropdown
                                     {
-                                        collectionDropdown = new CollectionFilterDropdown
-                                        {
-                                            Anchor = Anchor.TopRight,
-                                            Origin = Anchor.TopRight,
-                                            RelativeSizeAxes = Axes.X,
-                                            Width = 0.4f,
-                                        }
+                                        Anchor = Anchor.TopRight,
+                                        Origin = Anchor.TopRight,
+                                        RelativeSizeAxes = Axes.X,
+                                        Width = 0.4f,
                                     }
                                 }
                             },

From 447fd07b4ed4b7bf7f71862946ad975d8c07526f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 11 Sep 2020 01:13:55 +0900
Subject: [PATCH 04711/10326] Fix maps with only bonus score having NaN scores

---
 .../Gameplay/TestSceneScoreProcessor.cs       | 26 +++++++++++++++++++
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   |  8 +++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
index b0baf0385e..c9ab4fa489 100644
--- a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
@@ -28,6 +28,20 @@ namespace osu.Game.Tests.Gameplay
             Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(0.0));
         }
 
+        [Test]
+        public void TestOnlyBonusScore()
+        {
+            var beatmap = new Beatmap<TestBonusHitObject> { HitObjects = { new TestBonusHitObject() } };
+
+            var scoreProcessor = new ScoreProcessor();
+            scoreProcessor.ApplyBeatmap(beatmap);
+
+            // Apply a judgement
+            scoreProcessor.ApplyResult(new JudgementResult(new TestBonusHitObject(), new TestBonusJudgement()) { Type = HitResult.Perfect });
+
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(100));
+        }
+
         private class TestHitObject : HitObject
         {
             public override Judgement CreateJudgement() => new TestJudgement();
@@ -37,5 +51,17 @@ namespace osu.Game.Tests.Gameplay
         {
             protected override int NumericResultFor(HitResult result) => 100;
         }
+
+        private class TestBonusHitObject : HitObject
+        {
+            public override Judgement CreateJudgement() => new TestBonusJudgement();
+        }
+
+        private class TestBonusJudgement : Judgement
+        {
+            public override bool AffectsCombo => false;
+
+            protected override int NumericResultFor(HitResult result) => 100;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 983f9a3abf..6fa5a87c8e 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -202,7 +202,13 @@ namespace osu.Game.Rulesets.Scoring
             TotalScore.Value = getScore(Mode.Value);
         }
 
-        private double getScore(ScoringMode mode) => GetScore(mode, maxHighestCombo, baseScore / maxBaseScore, (double)HighestCombo.Value / maxHighestCombo, bonusScore);
+        private double getScore(ScoringMode mode)
+        {
+            return GetScore(mode, maxHighestCombo,
+                maxBaseScore > 0 ? baseScore / maxBaseScore : 0,
+                maxHighestCombo > 0 ? (double)HighestCombo.Value / maxHighestCombo : 0,
+                bonusScore);
+        }
 
         /// <summary>
         /// Computes the total score.

From 6e5c5ab9015e9b98ab52e344d38e5f97ffe57d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 10 Sep 2020 18:22:49 +0200
Subject: [PATCH 04712/10326] Fix invalid initial value of currentMonoLength

---
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index 9fad83c6a1..ecd74f54ed 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         /// <summary>
         /// Length of the current mono pattern.
         /// </summary>
-        private int currentMonoLength = 1;
+        private int currentMonoLength;
 
         protected override double StrainValueOf(DifficultyHitObject current)
         {

From 9b504272e41e9e6fadcb315eb732c05c9a458c0b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 10 Sep 2020 20:24:43 +0300
Subject: [PATCH 04713/10326] Make Header a property

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

diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
index 32c589e342..5e175a2203 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Profile.Sections
         private readonly string headerText;
         private readonly CounterVisibilityState counterVisibilityState;
 
-        protected PaginatedContainerHeader Header;
+        protected PaginatedContainerHeader Header { get; private set; }
 
         protected PaginatedContainerWithHeader(Bindable<User> user, string headerText, CounterVisibilityState counterVisibilityState, string missing = "")
             : base(user, missing)

From 931e567c7e809401526f3dda607ace733c07212c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 10 Sep 2020 20:25:35 +0300
Subject: [PATCH 04714/10326] Replace counter font size with an actual value

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

diff --git a/osu.Game/Overlays/Profile/Sections/CounterPill.cs b/osu.Game/Overlays/Profile/Sections/CounterPill.cs
index 131df105ad..ca8abcfe5a 100644
--- a/osu.Game/Overlays/Profile/Sections/CounterPill.cs
+++ b/osu.Game/Overlays/Profile/Sections/CounterPill.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Profile.Sections
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Margin = new MarginPadding { Horizontal = 10, Bottom = 1 },
-                    Font = OsuFont.GetFont(size: 14 * 0.8f, weight: FontWeight.Bold),
+                    Font = OsuFont.GetFont(size: 11.2f, weight: FontWeight.Bold),
                     Colour = colourProvider.Foreground1
                 }
             };

From e5f70d8eae57ae2892130730cb86ec2fdb990087 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 10 Sep 2020 20:31:00 +0300
Subject: [PATCH 04715/10326] Simplify counter visibility changes in
 PaginatedContainerHeader

---
 .../Sections/PaginatedContainerHeader.cs      | 57 ++++++++-----------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs
index 4779b44eb0..8c617e5fbd 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs
@@ -16,21 +16,14 @@ namespace osu.Game.Overlays.Profile.Sections
 {
     public class PaginatedContainerHeader : CompositeDrawable, IHasCurrentValue<int>
     {
+        private readonly BindableWithCurrent<int> current = new BindableWithCurrent<int>();
+
         public Bindable<int> Current
         {
-            get => current;
-            set
-            {
-                if (value == null)
-                    throw new ArgumentNullException(nameof(value));
-
-                current.UnbindBindings();
-                current.BindTo(value);
-            }
+            get => current.Current;
+            set => current.Current = value;
         }
 
-        private readonly Bindable<int> current = new Bindable<int>();
-
         private readonly string text;
         private readonly CounterVisibilityState counterState;
 
@@ -82,7 +75,6 @@ namespace osu.Game.Overlays.Profile.Sections
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Alpha = getInitialCounterAlpha(),
                             Current = { BindTarget = current }
                         }
                     }
@@ -93,33 +85,32 @@ namespace osu.Game.Overlays.Profile.Sections
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            current.BindValueChanged(onCurrentChanged);
-        }
-
-        private float getInitialCounterAlpha()
-        {
-            switch (counterState)
-            {
-                case CounterVisibilityState.AlwaysHidden:
-                    return 0;
-
-                case CounterVisibilityState.AlwaysVisible:
-                    return 1;
-
-                case CounterVisibilityState.VisibleWhenZero:
-                    return current.Value == 0 ? 1 : 0;
-
-                default:
-                    throw new NotImplementedException($"{counterState} has an incorrect value.");
-            }
+            current.BindValueChanged(onCurrentChanged, true);
         }
 
         private void onCurrentChanged(ValueChangedEvent<int> countValue)
         {
-            if (counterState == CounterVisibilityState.VisibleWhenZero)
+            float alpha;
+
+            switch (counterState)
             {
-                counterPill.Alpha = countValue.NewValue == 0 ? 1 : 0;
+                case CounterVisibilityState.AlwaysHidden:
+                    alpha = 0;
+                    break;
+
+                case CounterVisibilityState.AlwaysVisible:
+                    alpha = 1;
+                    break;
+
+                case CounterVisibilityState.VisibleWhenZero:
+                    alpha = current.Value == 0 ? 1 : 0;
+                    break;
+
+                default:
+                    throw new NotImplementedException($"{counterState} has an incorrect value.");
             }
+
+            counterPill.Alpha = alpha;
         }
     }
 

From 6c9fcae69f3f55c6b23d8fbcc47c41df3aa5d88c Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 10 Sep 2020 10:48:00 -0700
Subject: [PATCH 04716/10326] Fix drag handles not showing on now playing
 playlist items

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

diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 840fa51b4f..12f7c7e09d 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Overlays.Music
             Padding = new MarginPadding { Left = 5 };
 
             FilterTerms = item.Metadata.SearchableTerms;
+
+            ShowDragHandle.Value = true;
         }
 
         [BackgroundDependencyLoader]

From 913e3faf606130e9c1f4eb6308a403357e6b5ff1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 10 Sep 2020 20:48:06 +0300
Subject: [PATCH 04717/10326] Move PaginatedContainerWithHeader logic to a base
 class

---
 .../Beatmaps/PaginatedBeatmapContainer.cs     |  4 +--
 .../PaginatedMostPlayedBeatmapContainer.cs    |  4 +--
 .../Profile/Sections/PaginatedContainer.cs    | 27 +++++++++------
 .../Sections/PaginatedContainerWithHeader.cs  | 34 -------------------
 .../Sections/Ranks/PaginatedScoreContainer.cs |  6 ++--
 5 files changed, 24 insertions(+), 51 deletions(-)
 delete mode 100644 osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs

diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index d7c72131ea..265972bb86 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -14,13 +14,13 @@ using osuTK;
 
 namespace osu.Game.Overlays.Profile.Sections.Beatmaps
 {
-    public class PaginatedBeatmapContainer : PaginatedContainerWithHeader<APIBeatmapSet>
+    public class PaginatedBeatmapContainer : PaginatedContainer<APIBeatmapSet>
     {
         private const float panel_padding = 10f;
         private readonly BeatmapSetType type;
 
         public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<User> user, string headerText)
-            : base(user, headerText, CounterVisibilityState.AlwaysVisible)
+            : base(user, "", headerText, CounterVisibilityState.AlwaysVisible)
         {
             this.type = type;
             ItemsPerPage = 6;
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index ad35ea1460..8f1d894379 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -13,10 +13,10 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
-    public class PaginatedMostPlayedBeatmapContainer : PaginatedContainerWithHeader<APIUserMostPlayedBeatmap>
+    public class PaginatedMostPlayedBeatmapContainer : PaginatedContainer<APIUserMostPlayedBeatmap>
     {
         public PaginatedMostPlayedBeatmapContainer(Bindable<User> user)
-            : base(user, "Most Played Beatmaps", CounterVisibilityState.AlwaysHidden, "No records. :(")
+            : base(user, "No records. :(")
         {
             ItemsPerPage = 5;
         }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index c22e5660e6..f0b11dc147 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -36,10 +36,16 @@ namespace osu.Game.Overlays.Profile.Sections
         private readonly string missing;
         private ShowMoreButton moreButton;
         private OsuSpriteText missingText;
+        private PaginatedContainerHeader header;
 
-        protected PaginatedContainer(Bindable<User> user, string missing = "")
+        private readonly string headerText;
+        private readonly CounterVisibilityState counterVisibilityState;
+
+        protected PaginatedContainer(Bindable<User> user, string missing = "", string headerText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
         {
+            this.headerText = headerText;
             this.missing = missing;
+            this.counterVisibilityState = counterVisibilityState;
             User.BindTo(user);
         }
 
@@ -50,9 +56,12 @@ namespace osu.Game.Overlays.Profile.Sections
             AutoSizeAxes = Axes.Y;
             Direction = FillDirection.Vertical;
 
-            Children = new[]
+            Children = new Drawable[]
             {
-                CreateHeaderContent,
+                header = new PaginatedContainerHeader(headerText, counterVisibilityState)
+                {
+                    Alpha = string.IsNullOrEmpty(headerText) ? 0 : 1
+                },
                 ItemsContainer = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Y,
@@ -91,7 +100,8 @@ namespace osu.Game.Overlays.Profile.Sections
 
             if (e.NewValue != null)
             {
-                OnUserChanged(e.NewValue);
+                showMore();
+                SetCount(GetCount(e.NewValue));
             }
         }
 
@@ -130,17 +140,14 @@ namespace osu.Game.Overlays.Profile.Sections
             }, loadCancellation.Token);
         });
 
-        protected virtual void OnUserChanged(User user)
-        {
-            showMore();
-        }
+        protected virtual int GetCount(User user) => 0;
+
+        protected void SetCount(int value) => header.Current.Value = value;
 
         protected virtual void OnItemsReceived(List<TModel> items)
         {
         }
 
-        protected virtual Drawable CreateHeaderContent => Empty();
-
         protected abstract APIRequest<List<TModel>> CreateRequest();
 
         protected abstract Drawable CreateDrawableItem(TModel model);
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
deleted file mode 100644
index 5e175a2203..0000000000
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainerWithHeader.cs
+++ /dev/null
@@ -1,34 +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.Game.Users;
-
-namespace osu.Game.Overlays.Profile.Sections
-{
-    public abstract class PaginatedContainerWithHeader<TModel> : PaginatedContainer<TModel>
-    {
-        private readonly string headerText;
-        private readonly CounterVisibilityState counterVisibilityState;
-
-        protected PaginatedContainerHeader Header { get; private set; }
-
-        protected PaginatedContainerWithHeader(Bindable<User> user, string headerText, CounterVisibilityState counterVisibilityState, string missing = "")
-            : base(user, missing)
-        {
-            this.headerText = headerText;
-            this.counterVisibilityState = counterVisibilityState;
-        }
-
-        protected override Drawable CreateHeaderContent => Header = new PaginatedContainerHeader(headerText, counterVisibilityState);
-
-        protected override void OnUserChanged(User user)
-        {
-            base.OnUserChanged(user);
-            Header.Current.Value = GetCount(user);
-        }
-
-        protected virtual int GetCount(User user) => 0;
-    }
-}
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 7dbdf47cad..71ee89d526 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -14,12 +14,12 @@ using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
-    public class PaginatedScoreContainer : PaginatedContainerWithHeader<APILegacyScoreInfo>
+    public class PaginatedScoreContainer : PaginatedContainer<APILegacyScoreInfo>
     {
         private readonly ScoreType type;
 
         public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string headerText, CounterVisibilityState counterVisibilityState, string missingText = "")
-            : base(user, headerText, counterVisibilityState, missingText)
+            : base(user, missingText, headerText, counterVisibilityState)
         {
             this.type = type;
 
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             base.OnItemsReceived(items);
 
             if (type == ScoreType.Recent)
-                Header.Current.Value = items.Count;
+                SetCount(items.Count);
         }
 
         protected override APIRequest<List<APILegacyScoreInfo>> CreateRequest() =>

From cfc6e2175d2fc9ae36b60402ed4a210d55ff33df Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 10 Sep 2020 20:58:37 +0300
Subject: [PATCH 04718/10326] Add missing header to MostPlayedBeatmapsContainer

---
 .../Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index 8f1d894379..30284818a6 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     public class PaginatedMostPlayedBeatmapContainer : PaginatedContainer<APIUserMostPlayedBeatmap>
     {
         public PaginatedMostPlayedBeatmapContainer(Bindable<User> user)
-            : base(user, "No records. :(")
+            : base(user, "No records. :(", "Most Played Beatmaps")
         {
             ItemsPerPage = 5;
         }

From 370f22f975268dcea64886e36f6fe0d3079f4502 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 10 Sep 2020 11:11:45 -0700
Subject: [PATCH 04719/10326] Show drag handle by default on main class

---
 osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs | 2 +-
 osu.Game/Overlays/Music/PlaylistItem.cs                  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs b/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
index 9cdcb19a81..911d47704a 100644
--- a/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
+++ b/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// Whether the drag handle should be shown.
         /// </summary>
-        protected readonly Bindable<bool> ShowDragHandle = new Bindable<bool>();
+        protected readonly Bindable<bool> ShowDragHandle = new Bindable<bool>(true);
 
         private Container handleContainer;
         private PlaylistItemHandle handle;
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 12f7c7e09d..840fa51b4f 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -39,8 +39,6 @@ namespace osu.Game.Overlays.Music
             Padding = new MarginPadding { Left = 5 };
 
             FilterTerms = item.Metadata.SearchableTerms;
-
-            ShowDragHandle.Value = true;
         }
 
         [BackgroundDependencyLoader]

From a350802158d7413c9bdb37319b47d92efb17a1be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 10 Sep 2020 19:21:16 +0200
Subject: [PATCH 04720/10326] Fix wrong mono streak length handling in corner
 case

---
 .../Difficulty/Skills/Colour.cs               |  7 ++++++-
 .../NonVisual/LimitedCapacityQueueTest.cs     | 21 +++++++++++++++++++
 .../Difficulty/Utils/LimitedCapacityQueue.cs  |  9 ++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index ecd74f54ed..32421ee00a 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -45,7 +45,12 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
             // hits spaced more than a second apart are also exempt from colour strain.
             if (!(current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000))
             {
-                previousHitType = null;
+                monoHistory.Clear();
+
+                var currentHit = current.BaseObject as Hit;
+                currentMonoLength = currentHit != null ? 1 : 0;
+                previousHitType = currentHit?.Type;
+
                 return 0.0;
             }
 
diff --git a/osu.Game.Tests/NonVisual/LimitedCapacityQueueTest.cs b/osu.Game.Tests/NonVisual/LimitedCapacityQueueTest.cs
index 52463dd7eb..a04415bc7f 100644
--- a/osu.Game.Tests/NonVisual/LimitedCapacityQueueTest.cs
+++ b/osu.Game.Tests/NonVisual/LimitedCapacityQueueTest.cs
@@ -94,5 +94,26 @@ namespace osu.Game.Tests.NonVisual
 
             Assert.Throws<InvalidOperationException>(() => queue.Dequeue());
         }
+
+        [Test]
+        public void TestClearQueue()
+        {
+            queue.Enqueue(3);
+            queue.Enqueue(5);
+            Assert.AreEqual(2, queue.Count);
+
+            queue.Clear();
+            Assert.AreEqual(0, queue.Count);
+            Assert.Throws<ArgumentOutOfRangeException>(() => _ = queue[0]);
+
+            queue.Enqueue(7);
+            Assert.AreEqual(1, queue.Count);
+            Assert.AreEqual(7, queue[0]);
+            Assert.Throws<ArgumentOutOfRangeException>(() => _ = queue[1]);
+
+            queue.Enqueue(9);
+            Assert.AreEqual(2, queue.Count);
+            Assert.AreEqual(9, queue[1]);
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityQueue.cs b/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityQueue.cs
index 0f014e8a8c..bc0eb8af88 100644
--- a/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityQueue.cs
+++ b/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityQueue.cs
@@ -40,8 +40,17 @@ namespace osu.Game.Rulesets.Difficulty.Utils
 
             this.capacity = capacity;
             array = new T[capacity];
+            Clear();
+        }
+
+        /// <summary>
+        /// Removes all elements from the <see cref="LimitedCapacityQueue{T}"/>.
+        /// </summary>
+        public void Clear()
+        {
             start = 0;
             end = -1;
+            Count = 0;
         }
 
         /// <summary>

From 64b1a009efb5f80f5c78faae44682b5895c2fd2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 10 Sep 2020 20:56:55 +0200
Subject: [PATCH 04721/10326] Adjust diffcalc test case to pass

---
 .../TaikoDifficultyCalculatorTest.cs                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
index 2d51e82bc4..71b3c23b50 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
@@ -13,8 +13,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Taiko";
 
-        [TestCase(2.2905937546434592d, "diffcalc-test")]
-        [TestCase(2.2905937546434592d, "diffcalc-test-strong")]
+        [TestCase(2.2867022617692685d, "diffcalc-test")]
+        [TestCase(2.2867022617692685d, "diffcalc-test-strong")]
         public void Test(double expected, string name)
             => base.Test(expected, name);
 

From 97690c818c444190dab9f3f589ee4aeefd3d41f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 11 Sep 2020 00:12:05 +0200
Subject: [PATCH 04722/10326] Add regression test coverage

---
 .../UserInterface/TestScenePlaylistOverlay.cs | 51 +++++++++++++++++--
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
index a470244f53..52141dea1a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
@@ -2,32 +2,35 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays.Music;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestScenePlaylistOverlay : OsuTestScene
+    public class TestScenePlaylistOverlay : OsuManualInputManagerTestScene
     {
         private readonly BindableList<BeatmapSetInfo> beatmapSets = new BindableList<BeatmapSetInfo>();
 
+        private PlaylistOverlay playlistOverlay;
+
         [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
+                Child = playlistOverlay = new PlaylistOverlay
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -53,7 +56,45 @@ namespace osu.Game.Tests.Visual.UserInterface
                 });
             }
 
-            overlay.BeatmapSets.BindTo(beatmapSets);
+            playlistOverlay.BeatmapSets.BindTo(beatmapSets);
         });
+
+        [Test]
+        public void TestRearrangeItems()
+        {
+            AddUntilStep("wait for animations to complete", () => !playlistOverlay.Transforms.Any());
+
+            AddStep("hold 1st item handle", () =>
+            {
+                var handle = this.ChildrenOfType<PlaylistItem.PlaylistItemHandle>().First();
+                InputManager.MoveMouseTo(handle.ScreenSpaceDrawQuad.Centre);
+                InputManager.PressButton(MouseButton.Left);
+            });
+
+            AddStep("drag to 5th", () =>
+            {
+                var item = this.ChildrenOfType<PlaylistItem>().ElementAt(4);
+                InputManager.MoveMouseTo(item.ScreenSpaceDrawQuad.Centre);
+            });
+
+            AddAssert("song 1 is 5th", () => beatmapSets[4].Metadata.Title == "Some Song 1");
+
+            AddStep("release handle", () => InputManager.ReleaseButton(MouseButton.Left));
+        }
+
+        [Test]
+        public void TestFiltering()
+        {
+            AddStep("set filter to \"10\"", () =>
+            {
+                var filterControl = playlistOverlay.ChildrenOfType<FilterControl>().Single();
+                filterControl.Search.Current.Value = "10";
+            });
+
+            AddAssert("results filtered correctly",
+                () => playlistOverlay.ChildrenOfType<PlaylistItem>()
+                                     .Where(item => item.MatchingFilter)
+                                     .All(item => item.FilterTerms.Any(term => term.Contains("10"))));
+        }
     }
 }

From b594a2a507d82ab1cc45b8161e1874383cb10608 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 11:15:50 +0900
Subject: [PATCH 04723/10326] Import collections on initial import-from-stable
 step

---
 osu.Game/Screens/Select/ImportFromStablePopup.cs |  2 +-
 osu.Game/Screens/Select/SongSelect.cs            | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/ImportFromStablePopup.cs b/osu.Game/Screens/Select/ImportFromStablePopup.cs
index 272f9566d5..8dab83b24c 100644
--- a/osu.Game/Screens/Select/ImportFromStablePopup.cs
+++ b/osu.Game/Screens/Select/ImportFromStablePopup.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Select
         public ImportFromStablePopup(Action importFromStable)
         {
             HeaderText = @"You have no beatmaps!";
-            BodyText = "An existing copy of osu! was found, though.\nWould you like to import your beatmaps, skins and scores?\nThis will create a second copy of all files on disk.";
+            BodyText = "An existing copy of osu! was found, though.\nWould you like to import your beatmaps, skins, collections and scores?\nThis will create a second copy of all files on disk.";
 
             Icon = FontAwesome.Solid.Plane;
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ddbb021054..d313f67446 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -34,6 +34,7 @@ using System.Threading.Tasks;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
+using osu.Game.Collections;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 
@@ -103,7 +104,7 @@ namespace osu.Game.Screens.Select
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores)
+        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores, CollectionManager collections)
         {
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
@@ -294,7 +295,12 @@ namespace osu.Game.Screens.Select
                     {
                         dialogOverlay.Push(new ImportFromStablePopup(() =>
                         {
-                            Task.Run(beatmaps.ImportFromStableAsync).ContinueWith(_ => scores.ImportFromStableAsync(), TaskContinuationOptions.OnlyOnRanToCompletion);
+                            Task.Run(beatmaps.ImportFromStableAsync)
+                                .ContinueWith(_ =>
+                                {
+                                    Task.Run(scores.ImportFromStableAsync);
+                                    Task.Run(collections.ImportFromStableAsync);
+                                }, TaskContinuationOptions.OnlyOnRanToCompletion);
                             Task.Run(skins.ImportFromStableAsync);
                         }));
                     }

From be5d143b5a6b28030a2f39c7e5c03c3ec803318e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 11 Sep 2020 12:17:12 +0900
Subject: [PATCH 04724/10326] Reorder params

---
 .../Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs      | 2 +-
 .../Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs  | 2 +-
 .../Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs  | 2 +-
 osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs        | 2 +-
 .../Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs  | 2 +-
 .../Profile/Sections/Recent/PaginatedRecentActivityContainer.cs | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index 265972bb86..4b7de8de90 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
         private readonly BeatmapSetType type;
 
         public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<User> user, string headerText)
-            : base(user, "", headerText, CounterVisibilityState.AlwaysVisible)
+            : base(user, headerText, "", CounterVisibilityState.AlwaysVisible)
         {
             this.type = type;
             ItemsPerPage = 6;
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index 30284818a6..8f19cd900c 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     public class PaginatedMostPlayedBeatmapContainer : PaginatedContainer<APIUserMostPlayedBeatmap>
     {
         public PaginatedMostPlayedBeatmapContainer(Bindable<User> user)
-            : base(user, "No records. :(", "Most Played Beatmaps")
+            : base(user, "Most Played Beatmaps", "No records. :(")
         {
             ItemsPerPage = 5;
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
index c823053c4b..b968edcb5a 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
     public class PaginatedKudosuHistoryContainer : PaginatedContainer<APIKudosuHistory>
     {
         public PaginatedKudosuHistoryContainer(Bindable<User> user)
-            : base(user, "This user hasn't received any kudosu!")
+            : base(user, missing: "This user hasn't received any kudosu!")
         {
             ItemsPerPage = 5;
         }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index f0b11dc147..6e681a779f 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Profile.Sections
         private readonly string headerText;
         private readonly CounterVisibilityState counterVisibilityState;
 
-        protected PaginatedContainer(Bindable<User> user, string missing = "", string headerText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
+        protected PaginatedContainer(Bindable<User> user, string headerText = "", string missing = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
         {
             this.headerText = headerText;
             this.missing = missing;
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 71ee89d526..3c540d6fbb 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         private readonly ScoreType type;
 
         public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string headerText, CounterVisibilityState counterVisibilityState, string missingText = "")
-            : base(user, missingText, headerText, counterVisibilityState)
+            : base(user, headerText, missingText, counterVisibilityState)
         {
             this.type = type;
 
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index adfe31109b..4901789963 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
     public class PaginatedRecentActivityContainer : PaginatedContainer<APIRecentActivity>
     {
         public PaginatedRecentActivityContainer(Bindable<User> user)
-            : base(user, "This user hasn't done anything notable recently!")
+            : base(user, missing: "This user hasn't done anything notable recently!")
         {
             ItemsPerPage = 10;
         }

From 22c5e9f64f03e5cdca648028442e46e3c33439a8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 11 Sep 2020 12:19:26 +0900
Subject: [PATCH 04725/10326] Rename missing parameter

---
 .../Kudosu/PaginatedKudosuHistoryContainer.cs  |  2 +-
 .../Profile/Sections/PaginatedContainer.cs     | 18 +++++++++---------
 .../Recent/PaginatedRecentActivityContainer.cs |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
index b968edcb5a..1b8bd23eb4 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
     public class PaginatedKudosuHistoryContainer : PaginatedContainer<APIKudosuHistory>
     {
         public PaginatedKudosuHistoryContainer(Bindable<User> user)
-            : base(user, missing: "This user hasn't received any kudosu!")
+            : base(user, missingText: "This user hasn't received any kudosu!")
         {
             ItemsPerPage = 5;
         }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index 6e681a779f..c1107ce907 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -33,18 +33,18 @@ namespace osu.Game.Overlays.Profile.Sections
         private APIRequest<List<TModel>> retrievalRequest;
         private CancellationTokenSource loadCancellation;
 
-        private readonly string missing;
+        private readonly string missingText;
         private ShowMoreButton moreButton;
-        private OsuSpriteText missingText;
+        private OsuSpriteText missing;
         private PaginatedContainerHeader header;
 
         private readonly string headerText;
         private readonly CounterVisibilityState counterVisibilityState;
 
-        protected PaginatedContainer(Bindable<User> user, string headerText = "", string missing = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
+        protected PaginatedContainer(Bindable<User> user, string headerText = "", string missingText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
         {
             this.headerText = headerText;
-            this.missing = missing;
+            this.missingText = missingText;
             this.counterVisibilityState = counterVisibilityState;
             User.BindTo(user);
         }
@@ -76,10 +76,10 @@ namespace osu.Game.Overlays.Profile.Sections
                     Margin = new MarginPadding { Top = 10 },
                     Action = showMore,
                 },
-                missingText = new OsuSpriteText
+                missing = new OsuSpriteText
                 {
                     Font = OsuFont.GetFont(size: 15),
-                    Text = missing,
+                    Text = missingText,
                     Alpha = 0,
                 },
             };
@@ -124,15 +124,15 @@ namespace osu.Game.Overlays.Profile.Sections
                 moreButton.Hide();
                 moreButton.IsLoading = false;
 
-                if (!string.IsNullOrEmpty(missingText.Text))
-                    missingText.Show();
+                if (!string.IsNullOrEmpty(missing.Text))
+                    missing.Show();
 
                 return;
             }
 
             LoadComponentsAsync(items.Select(CreateDrawableItem).Where(d => d != null), drawables =>
             {
-                missingText.Hide();
+                missing.Hide();
                 moreButton.FadeTo(items.Count == ItemsPerPage ? 1 : 0);
                 moreButton.IsLoading = false;
 
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index 4901789963..08f39c6272 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
     public class PaginatedRecentActivityContainer : PaginatedContainer<APIRecentActivity>
     {
         public PaginatedRecentActivityContainer(Bindable<User> user)
-            : base(user, missing: "This user hasn't done anything notable recently!")
+            : base(user, missingText: "This user hasn't done anything notable recently!")
         {
             ItemsPerPage = 10;
         }

From 5b80a7db5fcd6d2dd09079a286b8f838bc531aa3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 11 Sep 2020 16:01:01 +0900
Subject: [PATCH 04726/10326] Re-namespace collections dropdown

---
 .../Select => Collections}/CollectionFilterDropdown.cs     | 7 +++----
 .../{Screens/Select => Collections}/CollectionMenuItem.cs  | 3 +--
 osu.Game/Screens/Select/FilterControl.cs                   | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename osu.Game/{Screens/Select => Collections}/CollectionFilterDropdown.cs (97%)
 rename osu.Game/{Screens/Select => Collections}/CollectionMenuItem.cs (96%)

diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
similarity index 97%
rename from osu.Game/Screens/Select/CollectionFilterDropdown.cs
rename to osu.Game/Collections/CollectionFilterDropdown.cs
index b08c3b167d..c85efb73f5 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -12,13 +12,12 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
-using osu.Game.Collections;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 
-namespace osu.Game.Screens.Select
+namespace osu.Game.Collections
 {
     /// <summary>
     /// A dropdown to select the <see cref="CollectionMenuItem"/> to filter beatmaps using.
@@ -152,7 +151,7 @@ namespace osu.Game.Screens.Select
             private void updateText() => base.Label = collectionName.Value;
         }
 
-        private class CollectionDropdownMenu : OsuDropdownMenu
+        protected class CollectionDropdownMenu : OsuDropdownMenu
         {
             public CollectionDropdownMenu()
             {
@@ -162,7 +161,7 @@ namespace osu.Game.Screens.Select
             protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new CollectionDropdownMenuItem(item);
         }
 
-        private class CollectionDropdownMenuItem : OsuDropdownMenu.DrawableOsuDropdownMenuItem
+        protected class CollectionDropdownMenuItem : OsuDropdownMenu.DrawableOsuDropdownMenuItem
         {
             [NotNull]
             protected new CollectionMenuItem Item => ((DropdownMenuItem<CollectionMenuItem>)base.Item).Value;
diff --git a/osu.Game/Screens/Select/CollectionMenuItem.cs b/osu.Game/Collections/CollectionMenuItem.cs
similarity index 96%
rename from osu.Game/Screens/Select/CollectionMenuItem.cs
rename to osu.Game/Collections/CollectionMenuItem.cs
index 995651de19..0560e03956 100644
--- a/osu.Game/Screens/Select/CollectionMenuItem.cs
+++ b/osu.Game/Collections/CollectionMenuItem.cs
@@ -3,9 +3,8 @@
 
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
-using osu.Game.Collections;
 
-namespace osu.Game.Screens.Select
+namespace osu.Game.Collections
 {
     /// <summary>
     /// A <see cref="BeatmapCollection"/> filter.
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 079667a457..c82a3742cc 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Game.Collections;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;

From 4061480419f3fcc3c2d4758c2da380e7ac33d070 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 11 Sep 2020 16:02:46 +0900
Subject: [PATCH 04727/10326] Rename menu item

---
 .../SongSelect/TestSceneFilterControl.cs      |  4 ++--
 .../Collections/CollectionFilterDropdown.cs   | 24 +++++++++----------
 ...enuItem.cs => CollectionFilterMenuItem.cs} | 14 +++++------
 3 files changed, 21 insertions(+), 21 deletions(-)
 rename osu.Game/Collections/{CollectionMenuItem.cs => CollectionFilterMenuItem.cs} (73%)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 23feb1466e..7cd4791acb 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             InputManager.Click(MouseButton.Left);
         });
 
-        private IEnumerable<Dropdown<CollectionMenuItem>.DropdownMenu.DrawableDropdownMenuItem> getCollectionDropdownItems()
-            => control.ChildrenOfType<CollectionFilterDropdown>().Single().ChildrenOfType<Dropdown<CollectionMenuItem>.DropdownMenu.DrawableDropdownMenuItem>();
+        private IEnumerable<Dropdown<CollectionFilterMenuItem>.DropdownMenu.DrawableDropdownMenuItem> getCollectionDropdownItems()
+            => control.ChildrenOfType<CollectionFilterDropdown>().Single().ChildrenOfType<Dropdown<CollectionFilterMenuItem>.DropdownMenu.DrawableDropdownMenuItem>();
     }
 }
diff --git a/osu.Game/Collections/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
index c85efb73f5..bdd6e73f3f 100644
--- a/osu.Game/Collections/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -20,13 +20,13 @@ using osuTK;
 namespace osu.Game.Collections
 {
     /// <summary>
-    /// A dropdown to select the <see cref="CollectionMenuItem"/> to filter beatmaps using.
+    /// A dropdown to select the <see cref="CollectionFilterMenuItem"/> to filter beatmaps using.
     /// </summary>
-    public class CollectionFilterDropdown : OsuDropdown<CollectionMenuItem>
+    public class CollectionFilterDropdown : OsuDropdown<CollectionFilterMenuItem>
     {
         private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
         private readonly IBindableList<BeatmapInfo> beatmaps = new BindableList<BeatmapInfo>();
-        private readonly BindableList<CollectionMenuItem> filters = new BindableList<CollectionMenuItem>();
+        private readonly BindableList<CollectionFilterMenuItem> filters = new BindableList<CollectionFilterMenuItem>();
 
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
@@ -61,17 +61,17 @@ namespace osu.Game.Collections
             var selectedItem = SelectedItem?.Value?.Collection;
 
             filters.Clear();
-            filters.Add(new AllBeatmapsCollectionMenuItem());
-            filters.AddRange(collections.Select(c => new CollectionMenuItem(c)));
-            filters.Add(new ManageCollectionsMenuItem());
+            filters.Add(new AllBeatmapsCollectionFilterMenuItem());
+            filters.AddRange(collections.Select(c => new CollectionFilterMenuItem(c)));
+            filters.Add(new ManageCollectionsFilterMenuItem());
 
             Current.Value = filters.SingleOrDefault(f => f.Collection != null && f.Collection == selectedItem) ?? filters[0];
         }
 
         /// <summary>
-        /// Occurs when the <see cref="CollectionMenuItem"/> selection has changed.
+        /// Occurs when the <see cref="CollectionFilterMenuItem"/> selection has changed.
         /// </summary>
-        private void filterChanged(ValueChangedEvent<CollectionMenuItem> filter)
+        private void filterChanged(ValueChangedEvent<CollectionFilterMenuItem> filter)
         {
             // Binding the beatmaps will trigger a collection change event, which results in an infinite-loop. This is rebound later, when it's safe to do so.
             beatmaps.CollectionChanged -= filterBeatmapsChanged;
@@ -86,7 +86,7 @@ namespace osu.Game.Collections
 
             // Never select the manage collection filter - rollback to the previous filter.
             // This is done after the above since it is important that bindable is unbound from OldValue, which is lost after forcing it back to the old value.
-            if (filter.NewValue is ManageCollectionsMenuItem)
+            if (filter.NewValue is ManageCollectionsFilterMenuItem)
             {
                 Current.Value = filter.OldValue;
                 manageCollectionsDialog?.Show();
@@ -103,7 +103,7 @@ namespace osu.Game.Collections
             Current.TriggerChange();
         }
 
-        protected override string GenerateItemText(CollectionMenuItem item) => item.CollectionName.Value;
+        protected override string GenerateItemText(CollectionFilterMenuItem item) => item.CollectionName.Value;
 
         protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader
         {
@@ -114,7 +114,7 @@ namespace osu.Game.Collections
 
         public class CollectionDropdownHeader : OsuDropdownHeader
         {
-            public readonly Bindable<CollectionMenuItem> SelectedItem = new Bindable<CollectionMenuItem>();
+            public readonly Bindable<CollectionFilterMenuItem> SelectedItem = new Bindable<CollectionFilterMenuItem>();
             private readonly Bindable<string> collectionName = new Bindable<string>();
 
             protected override string Label
@@ -164,7 +164,7 @@ namespace osu.Game.Collections
         protected class CollectionDropdownMenuItem : OsuDropdownMenu.DrawableOsuDropdownMenuItem
         {
             [NotNull]
-            protected new CollectionMenuItem Item => ((DropdownMenuItem<CollectionMenuItem>)base.Item).Value;
+            protected new CollectionFilterMenuItem Item => ((DropdownMenuItem<CollectionFilterMenuItem>)base.Item).Value;
 
             [Resolved]
             private OsuColour colours { get; set; }
diff --git a/osu.Game/Collections/CollectionMenuItem.cs b/osu.Game/Collections/CollectionFilterMenuItem.cs
similarity index 73%
rename from osu.Game/Collections/CollectionMenuItem.cs
rename to osu.Game/Collections/CollectionFilterMenuItem.cs
index 0560e03956..4a489d2945 100644
--- a/osu.Game/Collections/CollectionMenuItem.cs
+++ b/osu.Game/Collections/CollectionFilterMenuItem.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Collections
     /// <summary>
     /// A <see cref="BeatmapCollection"/> filter.
     /// </summary>
-    public class CollectionMenuItem
+    public class CollectionFilterMenuItem
     {
         /// <summary>
         /// The collection to filter beatmaps from.
@@ -25,27 +25,27 @@ namespace osu.Game.Collections
         public readonly Bindable<string> CollectionName;
 
         /// <summary>
-        /// Creates a new <see cref="CollectionMenuItem"/>.
+        /// Creates a new <see cref="CollectionFilterMenuItem"/>.
         /// </summary>
         /// <param name="collection">The collection to filter beatmaps from.</param>
-        public CollectionMenuItem([CanBeNull] BeatmapCollection collection)
+        public CollectionFilterMenuItem([CanBeNull] BeatmapCollection collection)
         {
             Collection = collection;
             CollectionName = Collection?.Name.GetBoundCopy() ?? new Bindable<string>("All beatmaps");
         }
     }
 
-    public class AllBeatmapsCollectionMenuItem : CollectionMenuItem
+    public class AllBeatmapsCollectionFilterMenuItem : CollectionFilterMenuItem
     {
-        public AllBeatmapsCollectionMenuItem()
+        public AllBeatmapsCollectionFilterMenuItem()
             : base(null)
         {
         }
     }
 
-    public class ManageCollectionsMenuItem : CollectionMenuItem
+    public class ManageCollectionsFilterMenuItem : CollectionFilterMenuItem
     {
-        public ManageCollectionsMenuItem()
+        public ManageCollectionsFilterMenuItem()
             : base(null)
         {
             CollectionName.Value = "Manage collections...";

From 06c49070b130c7f9a7a394475b5db51009a045fa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 11 Sep 2020 16:03:59 +0900
Subject: [PATCH 04728/10326] Remove player collection settings

---
 .../Play/PlayerSettings/CollectionSettings.cs | 35 -------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/PlayerSettings/CollectionSettings.cs

diff --git a/osu.Game/Screens/Play/PlayerSettings/CollectionSettings.cs b/osu.Game/Screens/Play/PlayerSettings/CollectionSettings.cs
deleted file mode 100644
index 9e7f8e7394..0000000000
--- a/osu.Game/Screens/Play/PlayerSettings/CollectionSettings.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 osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Overlays.Music;
-
-namespace osu.Game.Screens.Play.PlayerSettings
-{
-    public class CollectionSettings : PlayerSettingsGroup
-    {
-        public CollectionSettings()
-            : base("collections")
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Children = new Drawable[]
-            {
-                new OsuSpriteText
-                {
-                    Text = @"Add current song to",
-                },
-                new CollectionsDropdown<PlaylistCollection>
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Items = new[] { PlaylistCollection.All },
-                },
-            };
-        }
-    }
-}

From a6a76de7a9254f9bc90bc4d8752035fa7bdf0d74 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 11 Sep 2020 16:08:49 +0900
Subject: [PATCH 04729/10326] Re-expose sealed methods

---
 osu.Game/Collections/CollectionFilterDropdown.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Collections/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
index bdd6e73f3f..486f0a4fff 100644
--- a/osu.Game/Collections/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -105,12 +105,16 @@ namespace osu.Game.Collections
 
         protected override string GenerateItemText(CollectionFilterMenuItem item) => item.CollectionName.Value;
 
-        protected override DropdownHeader CreateHeader() => new CollectionDropdownHeader
+        protected sealed override DropdownHeader CreateHeader() => CreateCollectionHeader().With(d =>
         {
-            SelectedItem = { BindTarget = Current }
-        };
+            d.SelectedItem.BindTarget = Current;
+        });
 
-        protected override DropdownMenu CreateMenu() => new CollectionDropdownMenu();
+        protected sealed override DropdownMenu CreateMenu() => CreateCollectionMenu();
+
+        protected virtual CollectionDropdownHeader CreateCollectionHeader() => new CollectionDropdownHeader();
+
+        protected virtual CollectionDropdownMenu CreateCollectionMenu() => new CollectionDropdownMenu();
 
         public class CollectionDropdownHeader : OsuDropdownHeader
         {

From 15b533f2a4dcf427b9ddfe5838e237427a7f0bbb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 15:06:10 +0900
Subject: [PATCH 04730/10326] Hash skins based on name, not skin.ini contents

It is feasible that a user may be changing the contents of skin.ini
without changing the skin name / author. Such changes should not create
a new skin if already imported.
---
 osu.Game/Database/ArchiveModelManager.cs | 10 +++++++---
 osu.Game/Skinning/SkinManager.cs         |  8 ++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 49d7edd56c..e87ab8167a 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -253,6 +253,9 @@ namespace osu.Game.Database
         /// Generally should include all file types which determine the file's uniqueness.
         /// Large files should be avoided if possible.
         /// </summary>
+        /// <remarks>
+        /// This is only used by the default hash implementation. If <see cref="ComputeHash"/> is overridden, it will not be used.
+        /// </remarks>
         protected abstract string[] HashableFileTypes { get; }
 
         internal static void LogForModel(TModel model, string message, Exception e = null)
@@ -271,7 +274,7 @@ namespace osu.Game.Database
         /// <remarks>
         ///  In the case of no matching files, a hash will be generated from the passed archive's <see cref="ArchiveReader.Name"/>.
         /// </remarks>
-        private string computeHash(TModel item, ArchiveReader reader = null)
+        protected virtual string ComputeHash(TModel item, ArchiveReader reader = null)
         {
             // for now, concatenate all .osu files in the set to create a unique hash.
             MemoryStream hashable = new MemoryStream();
@@ -318,10 +321,11 @@ namespace osu.Game.Database
                 LogForModel(item, "Beginning import...");
 
                 item.Files = archive != null ? createFileInfos(archive, Files) : new List<TFileModel>();
-                item.Hash = computeHash(item, archive);
 
                 await Populate(item, archive, cancellationToken);
 
+                item.Hash = ComputeHash(item, archive);
+
                 using (var write = ContextFactory.GetForWrite()) // used to share a context for full import. keep in mind this will block all writes.
                 {
                     try
@@ -437,7 +441,7 @@ namespace osu.Game.Database
         {
             using (ContextFactory.GetForWrite())
             {
-                item.Hash = computeHash(item);
+                item.Hash = ComputeHash(item);
                 ModelStore.Update(item);
             }
         }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index e1f713882a..46130cbdd4 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -12,6 +12,7 @@ using Microsoft.EntityFrameworkCore;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
@@ -86,6 +87,13 @@ namespace osu.Game.Skinning
 
         protected override SkinInfo CreateModel(ArchiveReader archive) => new SkinInfo { Name = archive.Name };
 
+        protected override string ComputeHash(SkinInfo item, ArchiveReader reader = null)
+        {
+            // this is the optimal way to hash legacy skins, but will need to be reconsidered when we move forward with skin implementation.
+            // likely, the skin should expose a real version (ie. the version of the skin, not the skin.ini version it's targeting).
+            return item.ToString().ComputeSHA2Hash();
+        }
+
         protected override async Task Populate(SkinInfo model, ArchiveReader archive, CancellationToken cancellationToken = default)
         {
             await base.Populate(model, archive, cancellationToken);

From 62e5c9d2636cd1b21b064633471e0e6e9c4844d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 16:20:30 +0900
Subject: [PATCH 04731/10326] Add test coverage

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 170 ++++++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100644 osu.Game.Tests/Skins/IO/ImportSkinTest.cs

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
new file mode 100644
index 0000000000..af38d0f3c4
--- /dev/null
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -0,0 +1,170 @@
+// Copyright (c) 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;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Platform;
+using osu.Game.Beatmaps;
+using osu.Game.IO.Archives;
+using osu.Game.Skinning;
+using osu.Game.Tests.Resources;
+using SharpCompress.Archives.Zip;
+
+namespace osu.Game.Tests.Skins.IO
+{
+    public class ImportSkinTest
+    {
+        [Test]
+        public async Task TestBasicImport()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = await loadOsu(host);
+
+                    var imported = await loadIntoOsu(osu, new ZipArchiveReader(createOsk("test skin", "skinner"), "skin.osk"));
+
+                    Assert.That(imported.Name, Is.EqualTo("test skin"));
+                    Assert.That(imported.Creator, Is.EqualTo("skinner"));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public async Task TestImportTwiceWithSameMetadata()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = await loadOsu(host);
+
+                    var imported = await loadIntoOsu(osu, new ZipArchiveReader(createOsk("test skin", "skinner"), "skin.osk"));
+                    var imported2 = await loadIntoOsu(osu, new ZipArchiveReader(createOsk("test skin", "skinner"), "skin2.osk"));
+
+                    Assert.That(imported2.ID, Is.Not.EqualTo(imported.ID));
+                    Assert.That(osu.Dependencies.Get<SkinManager>().GetAllUserSkins().Count, Is.EqualTo(1));
+
+                    // the first should be overwritten by the second import.
+                    Assert.That(osu.Dependencies.Get<SkinManager>().GetAllUserSkins().First().Files.First().FileInfoID, Is.EqualTo(imported2.Files.First().FileInfoID));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public async Task TestImportTwiceWithDifferentMetadata()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = await loadOsu(host);
+
+                    var imported = await loadIntoOsu(osu, new ZipArchiveReader(createOsk("test skin v2", "skinner"), "skin.osk"));
+                    var imported2 = await loadIntoOsu(osu, new ZipArchiveReader(createOsk("test skin v2.1", "skinner"), "skin2.osk"));
+
+                    Assert.That(imported2.ID, Is.Not.EqualTo(imported.ID));
+                    Assert.That(osu.Dependencies.Get<SkinManager>().GetAllUserSkins().Count, Is.EqualTo(2));
+
+                    Assert.That(osu.Dependencies.Get<SkinManager>().GetAllUserSkins().First().Files.First().FileInfoID, Is.EqualTo(imported.Files.First().FileInfoID));
+                    Assert.That(osu.Dependencies.Get<SkinManager>().GetAllUserSkins().Last().Files.First().FileInfoID, Is.EqualTo(imported2.Files.First().FileInfoID));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        private MemoryStream createOsk(string name, string author)
+        {
+            var zipStream = new MemoryStream();
+            using var zip = ZipArchive.Create();
+            zip.AddEntry("skin.ini", generateSkinIni(name, author));
+            zip.SaveTo(zipStream);
+            return zipStream;
+        }
+
+        private MemoryStream generateSkinIni(string name, string author)
+        {
+            var stream = new MemoryStream();
+            var writer = new StreamWriter(stream);
+
+            writer.WriteLine("[General]");
+            writer.WriteLine($"Name: {name}");
+            writer.WriteLine($"Author: {author}");
+            writer.WriteLine();
+            writer.WriteLine($"# unique {Guid.NewGuid()}");
+
+            writer.Flush();
+
+            return stream;
+        }
+
+        private async Task<SkinInfo> loadIntoOsu(OsuGameBase osu, ArchiveReader archive = null)
+        {
+            var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
+
+            var skinManager = osu.Dependencies.Get<SkinManager>();
+            return await skinManager.Import(archive);
+        }
+
+        private async Task<OsuGameBase> loadOsu(GameHost host)
+        {
+            var osu = new OsuGameBase();
+
+#pragma warning disable 4014
+            Task.Run(() => host.Run(osu));
+#pragma warning restore 4014
+
+            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
+
+            var beatmapFile = TestResources.GetTestBeatmapForImport();
+            var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
+            await beatmapManager.Import(beatmapFile);
+
+            return osu;
+        }
+
+        private void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 60000)
+        {
+            Task task = Task.Run(() =>
+            {
+                while (!result()) Thread.Sleep(200);
+            });
+
+            Assert.IsTrue(task.Wait(timeout), failureMessage);
+        }
+
+        private class TestArchiveReader : ArchiveReader
+        {
+            public TestArchiveReader()
+                : base("test_archive")
+            {
+            }
+
+            public override Stream GetStream(string name) => new MemoryStream();
+
+            public override void Dispose()
+            {
+            }
+
+            public override IEnumerable<string> Filenames => new[] { "test_file.osr" };
+        }
+    }
+}

From ef77658311f2d7471e1bcbc56f252862131e1615 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 16:29:14 +0900
Subject: [PATCH 04732/10326] Add coverage of case where skin.ini doesn't
 specify name/author

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 26 +++++++++++++++++++++++
 osu.Game/Skinning/SkinManager.cs          | 16 ++++++++++----
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index af38d0f3c4..ad1a41a2b3 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -66,6 +66,32 @@ namespace osu.Game.Tests.Skins.IO
             }
         }
 
+        [Test]
+        public async Task TestImportTwiceWithNoMetadata()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = await loadOsu(host);
+
+                    // if a user downloads two skins that do have skin.ini files but don't have any creator metadata in the skin.ini, they should both import separately just for safety.
+                    var imported = await loadIntoOsu(osu, new ZipArchiveReader(createOsk(string.Empty, string.Empty), "download.osk"));
+                    var imported2 = await loadIntoOsu(osu, new ZipArchiveReader(createOsk(string.Empty, string.Empty), "download.osk"));
+
+                    Assert.That(imported2.ID, Is.Not.EqualTo(imported.ID));
+                    Assert.That(osu.Dependencies.Get<SkinManager>().GetAllUserSkins().Count, Is.EqualTo(2));
+
+                    Assert.That(osu.Dependencies.Get<SkinManager>().GetAllUserSkins().First().Files.First().FileInfoID, Is.EqualTo(imported.Files.First().FileInfoID));
+                    Assert.That(osu.Dependencies.Get<SkinManager>().GetAllUserSkins().Last().Files.First().FileInfoID, Is.EqualTo(imported2.Files.First().FileInfoID));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         [Test]
         public async Task TestImportTwiceWithDifferentMetadata()
         {
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 46130cbdd4..eacfdaec4a 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -87,11 +87,19 @@ namespace osu.Game.Skinning
 
         protected override SkinInfo CreateModel(ArchiveReader archive) => new SkinInfo { Name = archive.Name };
 
+        private const string unknown_creator_string = "Unknown";
+
         protected override string ComputeHash(SkinInfo item, ArchiveReader reader = null)
         {
-            // this is the optimal way to hash legacy skins, but will need to be reconsidered when we move forward with skin implementation.
-            // likely, the skin should expose a real version (ie. the version of the skin, not the skin.ini version it's targeting).
-            return item.ToString().ComputeSHA2Hash();
+            if (item.Creator != null && item.Creator != unknown_creator_string)
+            {
+                // this is the optimal way to hash legacy skins, but will need to be reconsidered when we move forward with skin implementation.
+                // likely, the skin should expose a real version (ie. the version of the skin, not the skin.ini version it's targeting).
+                return item.ToString().ComputeSHA2Hash();
+            }
+
+            // if there was no creator, the ToString above would give the filename, which along isn't really enough to base any decisions on.
+            return base.ComputeHash(item, reader);
         }
 
         protected override async Task Populate(SkinInfo model, ArchiveReader archive, CancellationToken cancellationToken = default)
@@ -108,7 +116,7 @@ namespace osu.Game.Skinning
             else
             {
                 model.Name = model.Name.Replace(".osk", "");
-                model.Creator ??= "Unknown";
+                model.Creator ??= unknown_creator_string;
             }
         }
 

From 948437865b32bafbe7af9df7c51c675f041e30d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 16:42:11 +0900
Subject: [PATCH 04733/10326] Remove unused code

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index ad1a41a2b3..14eff4c5e3 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.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.IO;
 using System.Linq;
 using System.Threading;
@@ -144,8 +143,6 @@ namespace osu.Game.Tests.Skins.IO
 
         private async Task<SkinInfo> loadIntoOsu(OsuGameBase osu, ArchiveReader archive = null)
         {
-            var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
-
             var skinManager = osu.Dependencies.Get<SkinManager>();
             return await skinManager.Import(archive);
         }
@@ -176,21 +173,5 @@ namespace osu.Game.Tests.Skins.IO
 
             Assert.IsTrue(task.Wait(timeout), failureMessage);
         }
-
-        private class TestArchiveReader : ArchiveReader
-        {
-            public TestArchiveReader()
-                : base("test_archive")
-            {
-            }
-
-            public override Stream GetStream(string name) => new MemoryStream();
-
-            public override void Dispose()
-            {
-            }
-
-            public override IEnumerable<string> Filenames => new[] { "test_file.osr" };
-        }
     }
 }

From fcc868362971a6ac8b9dd013157aab91fd6a2bf7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 11 Sep 2020 16:46:11 +0900
Subject: [PATCH 04734/10326] Hook up now playing overlay to collections

---
 ...tionsDropdown.cs => CollectionDropdown.cs} | 16 +++++-----
 osu.Game/Overlays/Music/FilterControl.cs      | 28 +++++++++++-------
 osu.Game/Overlays/Music/FilterCriteria.cs     | 22 ++++++++++++++
 osu.Game/Overlays/Music/Playlist.cs           | 10 ++++++-
 osu.Game/Overlays/Music/PlaylistItem.cs       | 29 +++++++++++++++----
 osu.Game/Overlays/Music/PlaylistOverlay.cs    |  8 +----
 6 files changed, 82 insertions(+), 31 deletions(-)
 rename osu.Game/Overlays/Music/{CollectionsDropdown.cs => CollectionDropdown.cs} (75%)
 create mode 100644 osu.Game/Overlays/Music/FilterCriteria.cs

diff --git a/osu.Game/Overlays/Music/CollectionsDropdown.cs b/osu.Game/Overlays/Music/CollectionDropdown.cs
similarity index 75%
rename from osu.Game/Overlays/Music/CollectionsDropdown.cs
rename to osu.Game/Overlays/Music/CollectionDropdown.cs
index 5bd321f31e..4ab0ad643c 100644
--- a/osu.Game/Overlays/Music/CollectionsDropdown.cs
+++ b/osu.Game/Overlays/Music/CollectionDropdown.cs
@@ -7,13 +7,15 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.UserInterface;
+using osu.Game.Collections;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Music
 {
-    public class CollectionsDropdown<T> : OsuDropdown<T>
+    /// <summary>
+    /// A <see cref="CollectionFilterDropdown"/> for use in the <see cref="NowPlayingOverlay"/>.
+    /// </summary>
+    public class CollectionDropdown : CollectionFilterDropdown
     {
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
@@ -21,11 +23,11 @@ namespace osu.Game.Overlays.Music
             AccentColour = colours.Gray6;
         }
 
-        protected override DropdownHeader CreateHeader() => new CollectionsHeader();
+        protected override CollectionDropdownHeader CreateCollectionHeader() => new CollectionsHeader();
 
-        protected override DropdownMenu CreateMenu() => new CollectionsMenu();
+        protected override CollectionDropdownMenu CreateCollectionMenu() => new CollectionsMenu();
 
-        private class CollectionsMenu : OsuDropdownMenu
+        private class CollectionsMenu : CollectionDropdownMenu
         {
             public CollectionsMenu()
             {
@@ -40,7 +42,7 @@ namespace osu.Game.Overlays.Music
             }
         }
 
-        private class CollectionsHeader : OsuDropdownHeader
+        private class CollectionsHeader : CollectionDropdownHeader
         {
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
diff --git a/osu.Game/Overlays/Music/FilterControl.cs b/osu.Game/Overlays/Music/FilterControl.cs
index 278bb55170..3e43387035 100644
--- a/osu.Game/Overlays/Music/FilterControl.cs
+++ b/osu.Game/Overlays/Music/FilterControl.cs
@@ -8,13 +8,15 @@ using osu.Game.Graphics.UserInterface;
 using osuTK;
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 
 namespace osu.Game.Overlays.Music
 {
     public class FilterControl : Container
     {
+        public Action<FilterCriteria> FilterChanged;
+
         public readonly FilterTextBox Search;
+        private readonly CollectionDropdown collectionDropdown;
 
         public FilterControl()
         {
@@ -32,21 +34,27 @@ namespace osu.Game.Overlays.Music
                             RelativeSizeAxes = Axes.X,
                             Height = 40,
                         },
-                        new CollectionsDropdown<PlaylistCollection>
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Items = new[] { PlaylistCollection.All },
-                        }
+                        collectionDropdown = new CollectionDropdown { RelativeSizeAxes = Axes.X }
                     },
                 },
             };
-
-            Search.Current.ValueChanged += current_ValueChanged;
         }
 
-        private void current_ValueChanged(ValueChangedEvent<string> e) => FilterChanged?.Invoke(e.NewValue);
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
-        public Action<string> FilterChanged;
+            Search.Current.BindValueChanged(_ => updateCriteria());
+            collectionDropdown.Current.BindValueChanged(_ => updateCriteria(), true);
+        }
+
+        private void updateCriteria() => FilterChanged?.Invoke(createCriteria());
+
+        private FilterCriteria createCriteria() => new FilterCriteria
+        {
+            SearchText = Search.Text,
+            Collection = collectionDropdown.Current.Value?.Collection
+        };
 
         public class FilterTextBox : SearchTextBox
         {
diff --git a/osu.Game/Overlays/Music/FilterCriteria.cs b/osu.Game/Overlays/Music/FilterCriteria.cs
new file mode 100644
index 0000000000..f15edff4d0
--- /dev/null
+++ b/osu.Game/Overlays/Music/FilterCriteria.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 JetBrains.Annotations;
+using osu.Game.Collections;
+
+namespace osu.Game.Overlays.Music
+{
+    public class FilterCriteria
+    {
+        /// <summary>
+        /// The search text.
+        /// </summary>
+        public string SearchText;
+
+        /// <summary>
+        /// The collection to filter beatmaps from.
+        /// </summary>
+        [CanBeNull]
+        public BeatmapCollection Collection;
+    }
+}
diff --git a/osu.Game/Overlays/Music/Playlist.cs b/osu.Game/Overlays/Music/Playlist.cs
index 621a533dd6..4fe338926f 100644
--- a/osu.Game/Overlays/Music/Playlist.cs
+++ b/osu.Game/Overlays/Music/Playlist.cs
@@ -24,7 +24,15 @@ namespace osu.Game.Overlays.Music
             set => base.Padding = value;
         }
 
-        public void Filter(string searchTerm) => ((SearchContainer<RearrangeableListItem<BeatmapSetInfo>>)ListContainer).SearchTerm = searchTerm;
+        public void Filter(FilterCriteria criteria)
+        {
+            var items = (SearchContainer<RearrangeableListItem<BeatmapSetInfo>>)ListContainer;
+
+            foreach (var item in items.OfType<PlaylistItem>())
+                item.InSelectedCollection = criteria.Collection?.Beatmaps.Any(b => b.BeatmapSet.Equals(item.Model)) ?? true;
+
+            items.SearchTerm = criteria.SearchText;
+        }
 
         public BeatmapSetInfo FirstVisibleSet => Items.FirstOrDefault(i => ((PlaylistItem)ItemMap[i]).MatchingFilter);
 
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 840fa51b4f..96dff39fae 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -95,23 +95,40 @@ namespace osu.Game.Overlays.Music
             return true;
         }
 
+        private bool inSelectedCollection = true;
+
+        public bool InSelectedCollection
+        {
+            get => inSelectedCollection;
+            set
+            {
+                if (inSelectedCollection == value)
+                    return;
+
+                inSelectedCollection = value;
+                updateFilter();
+            }
+        }
+
         public IEnumerable<string> FilterTerms { get; }
 
-        private bool matching = true;
+        private bool matchingFilter = true;
 
         public bool MatchingFilter
         {
-            get => matching;
+            get => matchingFilter && inSelectedCollection;
             set
             {
-                if (matching == value) return;
+                if (matchingFilter == value)
+                    return;
 
-                matching = value;
-
-                this.FadeTo(matching ? 1 : 0, 200);
+                matchingFilter = value;
+                updateFilter();
             }
         }
 
+        private void updateFilter() => this.FadeTo(MatchingFilter ? 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 b45d84049f..050e687dfb 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays.Music
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
-                            FilterChanged = search => list.Filter(search),
+                            FilterChanged = criteria => list.Filter(criteria),
                             Padding = new MarginPadding(10),
                         },
                     },
@@ -124,10 +124,4 @@ namespace osu.Game.Overlays.Music
             beatmap.Value.Track.Restart();
         }
     }
-
-    //todo: placeholder
-    public enum PlaylistCollection
-    {
-        All
-    }
 }

From 6327f12fe4a0fa587257ab2559d36f09c7a8a0e8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 11 Sep 2020 16:58:18 +0900
Subject: [PATCH 04735/10326] Disable manage collections item in now playing
 overlay

---
 osu.Game/Collections/CollectionFilterDropdown.cs | 9 ++++++++-
 osu.Game/Overlays/Music/CollectionDropdown.cs    | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Collections/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
index 486f0a4fff..ec0e9d5a89 100644
--- a/osu.Game/Collections/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -24,6 +24,11 @@ namespace osu.Game.Collections
     /// </summary>
     public class CollectionFilterDropdown : OsuDropdown<CollectionFilterMenuItem>
     {
+        /// <summary>
+        /// Whether to show the "manage collections..." menu item in the dropdown.
+        /// </summary>
+        protected virtual bool ShowManageCollectionsItem => true;
+
         private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
         private readonly IBindableList<BeatmapInfo> beatmaps = new BindableList<BeatmapInfo>();
         private readonly BindableList<CollectionFilterMenuItem> filters = new BindableList<CollectionFilterMenuItem>();
@@ -63,7 +68,9 @@ namespace osu.Game.Collections
             filters.Clear();
             filters.Add(new AllBeatmapsCollectionFilterMenuItem());
             filters.AddRange(collections.Select(c => new CollectionFilterMenuItem(c)));
-            filters.Add(new ManageCollectionsFilterMenuItem());
+
+            if (ShowManageCollectionsItem)
+                filters.Add(new ManageCollectionsFilterMenuItem());
 
             Current.Value = filters.SingleOrDefault(f => f.Collection != null && f.Collection == selectedItem) ?? filters[0];
         }
diff --git a/osu.Game/Overlays/Music/CollectionDropdown.cs b/osu.Game/Overlays/Music/CollectionDropdown.cs
index 4ab0ad643c..ed0ebf696b 100644
--- a/osu.Game/Overlays/Music/CollectionDropdown.cs
+++ b/osu.Game/Overlays/Music/CollectionDropdown.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Overlays.Music
     /// </summary>
     public class CollectionDropdown : CollectionFilterDropdown
     {
+        protected override bool ShowManageCollectionsItem => false;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {

From b047fbb8ee98de23bc4e23aa0856b38a1b66d44d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 11 Sep 2020 17:45:57 +0900
Subject: [PATCH 04736/10326] Use bindable value for search text

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

diff --git a/osu.Game/Overlays/Music/FilterControl.cs b/osu.Game/Overlays/Music/FilterControl.cs
index 3e43387035..66adbeebe8 100644
--- a/osu.Game/Overlays/Music/FilterControl.cs
+++ b/osu.Game/Overlays/Music/FilterControl.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Overlays.Music
 
         private FilterCriteria createCriteria() => new FilterCriteria
         {
-            SearchText = Search.Text,
+            SearchText = Search.Current.Value,
             Collection = collectionDropdown.Current.Value?.Collection
         };
 

From 8bae00454edbeffdfef9e47a3f5c7ccf87a5f508 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 19:53:55 +0900
Subject: [PATCH 04737/10326] Fix slider serialization

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 705e88040f..5aeb23a425 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -112,8 +112,9 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public double TickDistanceMultiplier = 1;
 
-        public HitCircle HeadCircle;
-        public SliderTailCircle TailCircle;
+        public HitCircle HeadCircle { get; protected set; }
+
+        public SliderTailCircle TailCircle { get; protected set; }
 
         public Slider()
         {

From 8e028dd88fa5c8ac1feda1128fb403fb22519c88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 19:54:11 +0900
Subject: [PATCH 04738/10326] Fix incorrect ordering of ApplyDefaults for newly
 added objects

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 061009e519..fd5270653d 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -79,11 +79,11 @@ namespace osu.Game.Screens.Edit
 
         private void updateHitObject([CanBeNull] HitObject hitObject, bool silent)
         {
-            scheduledUpdate?.Cancel();
-
             if (hitObject != null)
                 pendingUpdates.Add(hitObject);
 
+            if (scheduledUpdate?.Completed == false) return;
+
             scheduledUpdate = Schedule(() =>
             {
                 beatmapProcessor?.PreProcess();
@@ -158,10 +158,14 @@ namespace osu.Game.Screens.Edit
         {
             trackStartTime(hitObject);
 
-            mutableHitObjects.Insert(index, hitObject);
-
-            HitObjectAdded?.Invoke(hitObject);
             updateHitObject(hitObject, true);
+
+            // must occur after the batch-scheduled ApplyDefaults.
+            Schedule(() =>
+            {
+                mutableHitObjects.Insert(index, hitObject);
+                HitObjectAdded?.Invoke(hitObject);
+            });
         }
 
         /// <summary>

From 7d7401123c05a2179bab664c027c5bdba252fd90 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 19:54:20 +0900
Subject: [PATCH 04739/10326] Add initial implementation of editor clipboard

---
 osu.Game/Screens/Edit/ClipboardContent.cs | 27 ++++++++++++
 osu.Game/Screens/Edit/Editor.cs           | 52 ++++++++++++++++++++++-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Edit/ClipboardContent.cs

diff --git a/osu.Game/Screens/Edit/ClipboardContent.cs b/osu.Game/Screens/Edit/ClipboardContent.cs
new file mode 100644
index 0000000000..b2edbedccc
--- /dev/null
+++ b/osu.Game/Screens/Edit/ClipboardContent.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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.Game.IO.Serialization;
+using osu.Game.IO.Serialization.Converters;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Screens.Edit
+{
+    public class ClipboardContent : IJsonSerializable
+    {
+        [JsonConverter(typeof(TypedListConverter<HitObject>))]
+        public IList<HitObject> HitObjects;
+
+        public ClipboardContent()
+        {
+        }
+
+        public ClipboardContent(EditorBeatmap editorBeatmap)
+        {
+            HitObjects = editorBeatmap.SelectedHitObjects.ToList();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 23eb704920..a063b0a303 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -22,6 +23,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
+using osu.Game.IO.Serialization;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
@@ -131,9 +133,14 @@ namespace osu.Game.Screens.Edit
             updateLastSavedHash();
 
             EditorMenuBar menuBar;
+
             OsuMenuItem undoMenuItem;
             OsuMenuItem redoMenuItem;
 
+            EditorMenuItem cutMenuItem;
+            EditorMenuItem copyMenuItem;
+            EditorMenuItem pasteMenuItem;
+
             var fileMenuItems = new List<MenuItem>
             {
                 new EditorMenuItem("Save", MenuItemType.Standard, Save)
@@ -183,7 +190,11 @@ namespace osu.Game.Screens.Edit
                                     Items = new[]
                                     {
                                         undoMenuItem = new EditorMenuItem("Undo", MenuItemType.Standard, Undo),
-                                        redoMenuItem = new EditorMenuItem("Redo", MenuItemType.Standard, Redo)
+                                        redoMenuItem = new EditorMenuItem("Redo", MenuItemType.Standard, Redo),
+                                        new EditorMenuItemSpacer(),
+                                        cutMenuItem = new EditorMenuItem("Cut", MenuItemType.Standard, Cut),
+                                        copyMenuItem = new EditorMenuItem("Copy", MenuItemType.Standard, Copy),
+                                        pasteMenuItem = new EditorMenuItem("Paste", MenuItemType.Standard, Paste),
                                     }
                                 }
                             }
@@ -244,6 +255,17 @@ namespace osu.Game.Screens.Edit
             changeHandler.CanUndo.BindValueChanged(v => undoMenuItem.Action.Disabled = !v.NewValue, true);
             changeHandler.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
 
+            // todo: BindCollectionChanged
+            editorBeatmap.SelectedHitObjects.CollectionChanged += (_, __) =>
+            {
+                var hasObjects = editorBeatmap.SelectedHitObjects.Count > 0;
+
+                cutMenuItem.Action.Disabled = !hasObjects;
+                copyMenuItem.Action.Disabled = !hasObjects;
+            };
+
+            clipboard.BindValueChanged(content => pasteMenuItem.Action.Disabled = string.IsNullOrEmpty(content.NewValue));
+
             menuBar.Mode.ValueChanged += onModeChanged;
 
             bottomBackground.Colour = colours.Gray2;
@@ -394,6 +416,34 @@ namespace osu.Game.Screens.Edit
             this.Exit();
         }
 
+        private readonly Bindable<string> clipboard = new Bindable<string>();
+
+        protected void Cut()
+        {
+            Copy();
+            foreach (var h in editorBeatmap.SelectedHitObjects.ToArray())
+                editorBeatmap.Remove(h);
+        }
+
+        protected void Copy()
+        {
+            clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
+        }
+
+        protected void Paste()
+        {
+            if (string.IsNullOrEmpty(clipboard.Value))
+                return;
+
+            var objects = clipboard.Value.Deserialize<ClipboardContent>().HitObjects;
+            double timeOffset = clock.CurrentTime - objects.First().StartTime;
+
+            foreach (var h in objects)
+                h.StartTime += timeOffset;
+
+            editorBeatmap.AddRange(objects);
+        }
+
         protected void Undo() => changeHandler.RestoreState(-1);
 
         protected void Redo() => changeHandler.RestoreState(1);

From de3d8e83e178986573108086bc59ecf7601aa74f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 19:55:41 +0900
Subject: [PATCH 04740/10326] Add keyboard shortcuts

---
 osu.Game/Screens/Edit/Editor.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index a063b0a303..2af319870d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -292,6 +292,18 @@ namespace osu.Game.Screens.Edit
         {
             switch (action.ActionType)
             {
+                case PlatformActionType.Cut:
+                    Cut();
+                    return true;
+
+                case PlatformActionType.Copy:
+                    Copy();
+                    return true;
+
+                case PlatformActionType.Paste:
+                    Paste();
+                    return true;
+
                 case PlatformActionType.Undo:
                     Undo();
                     return true;

From 2858296c255a5c2427e756366cd4364a0bd30c01 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 19:58:34 +0900
Subject: [PATCH 04741/10326] Avoid editor confirm-save dialog looping
 infinitely when using keyboard shortcut to exit

Will now exit without saving if the keyboard shortcut is activated twice
in a row, as expected.

Closes #10136.
---
 osu.Game/Screens/Edit/Editor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 23eb704920..ce34c1dac0 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -369,7 +369,7 @@ namespace osu.Game.Screens.Edit
 
         public override bool OnExiting(IScreen next)
         {
-            if (!exitConfirmed && dialogOverlay != null && HasUnsavedChanges)
+            if (!exitConfirmed && dialogOverlay != null && HasUnsavedChanges && !(dialogOverlay.CurrentDialog is PromptForSaveDialog))
             {
                 dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave));
                 return true;

From 139a5acd1b98ec8ae9e2775f3480ab3bf5052519 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 20:14:12 +0900
Subject: [PATCH 04742/10326] Fix editor hitobjects getting masked weirdly

Closes #10124
---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index b9cc054ed3..abb32bb6a8 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -112,7 +112,6 @@ namespace osu.Game.Rulesets.Edit
                         {
                             Name = "Content",
                             RelativeSizeAxes = Axes.Both,
-                            Masking = true,
                             Children = new Drawable[]
                             {
                                 // layers below playfield

From 432c3e17ebd3fc7d05bf53c861e7946ee302febc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 20:23:34 +0900
Subject: [PATCH 04743/10326] Fix toolbox becoming inoperable due to incorrect
 ordering

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 81 ++++++++++-----------
 1 file changed, 37 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index abb32bb6a8..e42a359d2e 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -82,56 +82,49 @@ namespace osu.Game.Rulesets.Edit
                 return;
             }
 
-            InternalChild = new GridContainer
+            const float toolbar_width = 200;
+
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Content = new[]
+                new Container
                 {
-                    new Drawable[]
+                    Name = "Content",
+                    Padding = new MarginPadding { Left = toolbar_width },
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
                     {
-                        new FillFlowContainer
+                        // layers below playfield
+                        drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
                         {
-                            Name = "Sidebar",
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Right = 10 },
-                            Spacing = new Vector2(10),
-                            Children = new Drawable[]
-                            {
-                                new ToolboxGroup("toolbox") { Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X } },
-                                new ToolboxGroup("toggles")
-                                {
-                                    ChildrenEnumerable = Toggles.Select(b => new SettingsCheckbox
-                                    {
-                                        Bindable = b,
-                                        LabelText = b?.Description ?? "unknown"
-                                    })
-                                }
-                            }
-                        },
-                        new Container
-                        {
-                            Name = "Content",
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
-                            {
-                                // layers below playfield
-                                drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
-                                {
-                                    LayerBelowRuleset,
-                                    new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
-                                }),
-                                drawableRulesetWrapper,
-                                // layers above playfield
-                                drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer()
-                                                      .WithChild(BlueprintContainer = CreateBlueprintContainer(HitObjects))
-                            }
-                        }
-                    },
+                            LayerBelowRuleset,
+                            new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
+                        }),
+                        drawableRulesetWrapper,
+                        // layers above playfield
+                        drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer()
+                                              .WithChild(BlueprintContainer = CreateBlueprintContainer(HitObjects))
+                    }
                 },
-                ColumnDimensions = new[]
+                new FillFlowContainer
                 {
-                    new Dimension(GridSizeMode.Absolute, 200),
-                }
+                    Name = "Sidebar",
+                    RelativeSizeAxes = Axes.Y,
+                    Width = toolbar_width,
+                    Padding = new MarginPadding { Right = 10 },
+                    Spacing = new Vector2(10),
+                    Children = new Drawable[]
+                    {
+                        new ToolboxGroup("toolbox") { Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X } },
+                        new ToolboxGroup("toggles")
+                        {
+                            ChildrenEnumerable = Toggles.Select(b => new SettingsCheckbox
+                            {
+                                Bindable = b,
+                                LabelText = b?.Description ?? "unknown"
+                            })
+                        }
+                    }
+                },
             };
 
             toolboxCollection.Items = CompositionTools

From 73dd21c8fcdaa49157287747b8be14abb1388296 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 20:27:04 +0900
Subject: [PATCH 04744/10326] Add failing test

---
 .../Visual/Editing/TestSceneEditorChangeStates.cs     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
index c8a32d966f..dfe1e434dc 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
@@ -27,6 +27,17 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("get beatmap", () => editorBeatmap = Editor.ChildrenOfType<EditorBeatmap>().Single());
         }
 
+        [Test]
+        public void TestSelectedObjects()
+        {
+            HitCircle obj = null;
+            AddStep("add hitobject", () => editorBeatmap.Add(obj = new HitCircle { StartTime = 1000 }));
+            AddStep("select hitobject", () => editorBeatmap.SelectedHitObjects.Add(obj));
+            AddAssert("confirm 1 selected", () => editorBeatmap.SelectedHitObjects.Count == 1);
+            AddStep("deselect hitobject", () => editorBeatmap.SelectedHitObjects.Remove(obj));
+            AddAssert("confirm 0 selected", () => editorBeatmap.SelectedHitObjects.Count == 0);
+        }
+
         [Test]
         public void TestUndoFromInitialState()
         {

From 22e6df02b650d72d6d22a0787c446984e9df982b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 20:13:54 +0900
Subject: [PATCH 04745/10326] Fix editor selected hitobjects containing the
 selection up to five times

---
 .../Compose/Components/BlueprintContainer.cs  |  2 --
 .../Compose/Components/SelectionHandler.cs    | 20 +++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 865e225645..b7b222d87b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -367,14 +367,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             selectionHandler.HandleSelected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 1);
-            beatmap.SelectedHitObjects.Add(blueprint.HitObject);
         }
 
         private void onBlueprintDeselected(SelectionBlueprint blueprint)
         {
             selectionHandler.HandleDeselected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 0);
-            beatmap.SelectedHitObjects.Remove(blueprint.HitObject);
         }
 
         #endregion
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 9700cb8c8e..f397ee1596 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -145,10 +145,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal void HandleSelected(SelectionBlueprint blueprint)
         {
-            selectedBlueprints.Add(blueprint);
-            EditorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
+            if (!selectedBlueprints.Contains(blueprint))
+            {
+                selectedBlueprints.Add(blueprint);
 
-            UpdateVisibility();
+                // need to check this as well, as there are potentially multiple SelectionHandlers and the above check is not enough.
+                if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.HitObject))
+                    EditorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
+
+                UpdateVisibility();
+            }
         }
 
         /// <summary>
@@ -157,10 +163,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal void HandleDeselected(SelectionBlueprint blueprint)
         {
-            selectedBlueprints.Remove(blueprint);
-            EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
+            if (selectedBlueprints.Remove(blueprint))
+            {
+                EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
 
-            UpdateVisibility();
+                UpdateVisibility();
+            }
         }
 
         /// <summary>

From 94d929d8cdf64a648afca7408ecd192287fc2479 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 22:03:19 +0900
Subject: [PATCH 04746/10326] Remove unnecessary contains checks

---
 .../Compose/Components/SelectionHandler.cs    | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index f397ee1596..0a3c9072cf 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -145,16 +145,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal void HandleSelected(SelectionBlueprint blueprint)
         {
-            if (!selectedBlueprints.Contains(blueprint))
-            {
-                selectedBlueprints.Add(blueprint);
+            selectedBlueprints.Add(blueprint);
 
-                // need to check this as well, as there are potentially multiple SelectionHandlers and the above check is not enough.
-                if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.HitObject))
-                    EditorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
+            // need to check this as well, as there are potentially multiple SelectionHandlers and the above check is not enough.
+            if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.HitObject))
+                EditorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
 
-                UpdateVisibility();
-            }
+            UpdateVisibility();
         }
 
         /// <summary>
@@ -163,12 +160,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal void HandleDeselected(SelectionBlueprint blueprint)
         {
-            if (selectedBlueprints.Remove(blueprint))
-            {
-                EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
+            EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
 
-                UpdateVisibility();
-            }
+            UpdateVisibility();
         }
 
         /// <summary>

From cb14d847deec463a2d236e33f516d74c61f80340 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 22:40:12 +0900
Subject: [PATCH 04747/10326] 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 a2686c380e..6cbb4b2e68 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.910.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.911.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 48582ae29d..8d23a32c3c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.910.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.911.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 0eed2fa911..d00b174195 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.Framework.iOS" Version="2020.910.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.911.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.910.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.911.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 001cd1194c934d02c326ce55a8da991396e568a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 22:53:03 +0900
Subject: [PATCH 04748/10326] Consume BindCollectionChanged

---
 osu.Game/Screens/Edit/Editor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 896c4f9f61..d6b2b4ba3a 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -256,13 +256,13 @@ namespace osu.Game.Screens.Edit
             changeHandler.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
 
             // todo: BindCollectionChanged
-            editorBeatmap.SelectedHitObjects.CollectionChanged += (_, __) =>
+            editorBeatmap.SelectedHitObjects.BindCollectionChanged((_, __) =>
             {
                 var hasObjects = editorBeatmap.SelectedHitObjects.Count > 0;
 
                 cutMenuItem.Action.Disabled = !hasObjects;
                 copyMenuItem.Action.Disabled = !hasObjects;
-            };
+            }, true);
 
             clipboard.BindValueChanged(content => pasteMenuItem.Action.Disabled = string.IsNullOrEmpty(content.NewValue));
 

From 2d9b0acabe7fd4826e7d791d88c89a348afc0601 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 12 Sep 2020 15:33:13 +0900
Subject: [PATCH 04749/10326] Fix empty selection via keyboard shortcuts
 crashing

---
 osu.Game/Screens/Edit/Editor.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index d6b2b4ba3a..19bac2a778 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework;
 using osu.Framework.Allocation;
@@ -439,6 +440,9 @@ namespace osu.Game.Screens.Edit
 
         protected void Copy()
         {
+            if (editorBeatmap.SelectedHitObjects.Count == 0)
+                return;
+
             clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
         }
 
@@ -448,6 +452,9 @@ namespace osu.Game.Screens.Edit
                 return;
 
             var objects = clipboard.Value.Deserialize<ClipboardContent>().HitObjects;
+
+            Debug.Assert(objects.Any());
+
             double timeOffset = clock.CurrentTime - objects.First().StartTime;
 
             foreach (var h in objects)

From 81f30cd2649a6edd2abc28868e13f492fc95bf1e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 12 Sep 2020 20:31:50 +0900
Subject: [PATCH 04750/10326] Select blueprint if object is already selected at
 the point of adding

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index b7b222d87b..bf1e18771f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -271,6 +271,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             blueprint.Selected += onBlueprintSelected;
             blueprint.Deselected += onBlueprintDeselected;
 
+            if (beatmap.SelectedHitObjects.Contains(hitObject))
+                blueprint.Select();
+
             SelectionBlueprints.Add(blueprint);
         }
 

From 3854caae9b0a6df9ba6599960a0a02fade064ae5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 12 Sep 2020 21:20:37 +0900
Subject: [PATCH 04751/10326] Remove secondary schedule logic

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index fd5270653d..5272530228 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Edit
         /// <param name="hitObject">The <see cref="HitObject"/> to update.</param>
         public void UpdateHitObject([NotNull] HitObject hitObject) => updateHitObject(hitObject, false);
 
-        private void updateHitObject([CanBeNull] HitObject hitObject, bool silent)
+        private void updateHitObject([CanBeNull] HitObject hitObject, bool silent, bool performAdd = false)
         {
             if (hitObject != null)
                 pendingUpdates.Add(hitObject);
@@ -93,6 +93,12 @@ namespace osu.Game.Screens.Edit
 
                 beatmapProcessor?.PostProcess();
 
+                if (performAdd)
+                {
+                    foreach (var obj in pendingUpdates)
+                        HitObjectAdded?.Invoke(obj);
+                }
+
                 if (!silent)
                 {
                     foreach (var obj in pendingUpdates)
@@ -158,14 +164,8 @@ namespace osu.Game.Screens.Edit
         {
             trackStartTime(hitObject);
 
-            updateHitObject(hitObject, true);
-
-            // must occur after the batch-scheduled ApplyDefaults.
-            Schedule(() =>
-            {
-                mutableHitObjects.Insert(index, hitObject);
-                HitObjectAdded?.Invoke(hitObject);
-            });
+            mutableHitObjects.Insert(index, hitObject);
+            updateHitObject(hitObject, true, true);
         }
 
         /// <summary>

From 1a9f0ac16afbc396728521cc2664509b07695808 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Sep 2020 23:02:23 +0900
Subject: [PATCH 04752/10326] Select new objects

---
 osu.Game/Screens/Edit/Editor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 19bac2a778..ee3befe8bd 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -460,7 +460,10 @@ namespace osu.Game.Screens.Edit
             foreach (var h in objects)
                 h.StartTime += timeOffset;
 
+            editorBeatmap.SelectedHitObjects.Clear();
+
             editorBeatmap.AddRange(objects);
+            editorBeatmap.SelectedHitObjects.AddRange(objects);
         }
 
         protected void Undo() => changeHandler.RestoreState(-1);

From f17b2f1359eba9e9296f9e0a4ba1caac57f52f6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Sep 2020 20:43:17 +0200
Subject: [PATCH 04753/10326] Ensure track is looping in song select
 immediately

---
 osu.Game/Screens/Select/SongSelect.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d313f67446..683e3abcc2 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -517,6 +517,8 @@ namespace osu.Game.Screens.Select
             FilterControl.Activate();
 
             ModSelect.SelectedMods.BindTo(selectedMods);
+
+            music.TrackChanged += ensureTrackLooping;
         }
 
         private const double logo_transition = 250;
@@ -568,6 +570,7 @@ namespace osu.Game.Screens.Select
             BeatmapDetails.Refresh();
 
             music.CurrentTrack.Looping = true;
+            music.TrackChanged += ensureTrackLooping;
             music.ResetTrackAdjustments();
 
             if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
@@ -593,6 +596,7 @@ namespace osu.Game.Screens.Select
             BeatmapOptions.Hide();
 
             music.CurrentTrack.Looping = false;
+            music.TrackChanged -= ensureTrackLooping;
 
             this.ScaleTo(1.1f, 250, Easing.InSine);
 
@@ -614,10 +618,14 @@ namespace osu.Game.Screens.Select
             FilterControl.Deactivate();
 
             music.CurrentTrack.Looping = false;
+            music.TrackChanged -= ensureTrackLooping;
 
             return false;
         }
 
+        private void ensureTrackLooping(WorkingBeatmap beatmap, TrackChangeDirection changeDirection)
+            => music.CurrentTrack.Looping = true;
+
         public override bool OnBackButton()
         {
             if (ModSelect.State.Value == Visibility.Visible)
@@ -653,8 +661,6 @@ namespace osu.Game.Screens.Select
             beatmapInfoWedge.Beatmap = beatmap;
 
             BeatmapDetails.Beatmap = beatmap;
-
-            music.CurrentTrack.Looping = true;
         }
 
         private readonly WeakReference<ITrack> lastTrack = new WeakReference<ITrack>(null);

From 3db0e7cd75d55126d45b94661a865b17a1b8babd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Sep 2020 22:34:57 +0200
Subject: [PATCH 04754/10326] Generalise LegacyRollingCounter

---
 .../Skinning/LegacyComboCounter.cs            | 33 ------------
 osu.Game/Skinning/LegacyRollingCounter.cs     | 51 +++++++++++++++++++
 2 files changed, 51 insertions(+), 33 deletions(-)
 create mode 100644 osu.Game/Skinning/LegacyRollingCounter.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index e03b30f58f..ccfabdc5fd 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -1,13 +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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
@@ -128,35 +125,5 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
             lastExplosion = explosion;
         }
-
-        private class LegacyRollingCounter : RollingCounter<int>
-        {
-            private readonly ISkin skin;
-
-            private readonly string fontName;
-            private readonly float fontOverlap;
-
-            protected override bool IsRollingProportional => true;
-
-            public LegacyRollingCounter(ISkin skin, string fontName, float fontOverlap)
-            {
-                this.skin = skin;
-                this.fontName = fontName;
-                this.fontOverlap = fontOverlap;
-            }
-
-            protected override double GetProportionalDuration(int currentValue, int newValue)
-            {
-                return Math.Abs(newValue - currentValue) * 75.0;
-            }
-
-            protected override OsuSpriteText CreateSpriteText()
-            {
-                return new LegacySpriteText(skin, fontName)
-                {
-                    Spacing = new Vector2(-fontOverlap, 0f)
-                };
-            }
-        }
     }
 }
diff --git a/osu.Game/Skinning/LegacyRollingCounter.cs b/osu.Game/Skinning/LegacyRollingCounter.cs
new file mode 100644
index 0000000000..8aa9d4e9af
--- /dev/null
+++ b/osu.Game/Skinning/LegacyRollingCounter.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 System;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// An integer <see cref="RollingCounter{T}"/> that uses number sprites from a legacy skin.
+    /// </summary>
+    public class LegacyRollingCounter : RollingCounter<int>
+    {
+        private readonly ISkin skin;
+
+        private readonly string fontName;
+        private readonly float fontOverlap;
+
+        protected override bool IsRollingProportional => true;
+
+        /// <summary>
+        /// Creates a new <see cref="LegacyRollingCounter"/>.
+        /// </summary>
+        /// <param name="skin">The <see cref="ISkin"/> from which to get counter number sprites.</param>
+        /// <param name="fontName">The name of the legacy font to use.</param>
+        /// <param name="fontOverlap">
+        /// The numeric overlap of number sprites to use.
+        /// A positive number will bring the number sprites closer together, while a negative number
+        /// will split them apart more.
+        /// </param>
+        public LegacyRollingCounter(ISkin skin, string fontName, float fontOverlap)
+        {
+            this.skin = skin;
+            this.fontName = fontName;
+            this.fontOverlap = fontOverlap;
+        }
+
+        protected override double GetProportionalDuration(int currentValue, int newValue)
+        {
+            return Math.Abs(newValue - currentValue) * 75.0;
+        }
+
+        protected sealed override OsuSpriteText CreateSpriteText() =>
+            new LegacySpriteText(skin, fontName)
+            {
+                Spacing = new Vector2(-fontOverlap, 0f)
+            };
+    }
+}

From fcf3a1d13c9dcad3652062c613c741e049e9ea43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Sep 2020 22:39:06 +0200
Subject: [PATCH 04755/10326] Encapsulate combo display better

---
 .../TestSceneCatcherArea.cs                         |  2 +-
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs        | 13 ++-----------
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs           | 13 +++++++++----
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index b4f123598b..e055f08dc2 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 Schedule(() =>
                 {
                     area.AttemptCatch(fruit);
-                    area.OnResult(drawable, new JudgementResult(fruit, new CatchJudgement()) { Type = miss ? HitResult.Miss : HitResult.Great });
+                    area.OnNewResult(drawable, new JudgementResult(fruit, new CatchJudgement()) { Type = miss ? HitResult.Miss : HitResult.Great });
 
                     drawable.Expire();
                 });
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 409ea6dbc6..735d7fc300 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -29,8 +29,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
         internal readonly CatcherArea CatcherArea;
 
-        private CatchComboDisplay comboDisplay => CatcherArea.ComboDisplay;
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             // only check the X position; handle all vertical space.
             base.ReceivePositionalInputAt(new Vector2(screenSpacePos.X, ScreenSpaceDrawQuad.Centre.Y));
@@ -73,16 +71,9 @@ namespace osu.Game.Rulesets.Catch.UI
         }
 
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
-        {
-            var catchObject = (DrawableCatchHitObject)judgedObject;
-            CatcherArea.OnResult(catchObject, result);
-
-            comboDisplay.OnNewResult(catchObject, result);
-        }
+            => CatcherArea.OnNewResult((DrawableCatchHitObject)judgedObject, result);
 
         private void onRevertResult(DrawableHitObject judgedObject, JudgementResult result)
-        {
-            comboDisplay.OnRevertResult((DrawableCatchHitObject)judgedObject, result);
-        }
+            => CatcherArea.OnRevertResult((DrawableCatchHitObject)judgedObject, result);
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 9cfb9f41d7..d3e63b0333 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Catch.UI
         public Func<CatchHitObject, DrawableHitObject<CatchHitObject>> CreateDrawableRepresentation;
 
         public readonly Catcher MovableCatcher;
-        internal readonly CatchComboDisplay ComboDisplay;
+        private readonly CatchComboDisplay comboDisplay;
 
         public Container ExplodingFruitTarget
         {
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Catch.UI
             Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
             Children = new Drawable[]
             {
-                ComboDisplay = new CatchComboDisplay
+                comboDisplay = new CatchComboDisplay
                 {
                     RelativeSizeAxes = Axes.None,
                     AutoSizeAxes = Axes.Both,
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Catch.UI
             };
         }
 
-        public void OnResult(DrawableCatchHitObject fruit, JudgementResult result)
+        public void OnNewResult(DrawableCatchHitObject fruit, JudgementResult result)
         {
             if (result.Judgement is IgnoreJudgement)
                 return;
@@ -99,8 +99,13 @@ namespace osu.Game.Rulesets.Catch.UI
                 else
                     MovableCatcher.Drop();
             }
+
+            comboDisplay.OnNewResult(fruit, result);
         }
 
+        public void OnRevertResult(DrawableCatchHitObject fruit, JudgementResult result)
+            => comboDisplay.OnRevertResult(fruit, result);
+
         public void OnReleased(CatchAction action)
         {
         }
@@ -119,7 +124,7 @@ namespace osu.Game.Rulesets.Catch.UI
             if (state?.CatcherX != null)
                 MovableCatcher.X = state.CatcherX.Value;
 
-            ComboDisplay.X = MovableCatcher.X;
+            comboDisplay.X = MovableCatcher.X;
         }
     }
 }

From c573392bb2db182233f2b45c17aa1c0c565c9c54 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 13 Sep 2020 22:31:59 +0900
Subject: [PATCH 04756/10326] Remove completed todo

---
 osu.Game/Screens/Edit/Editor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index ee3befe8bd..d80f899f90 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -256,7 +256,6 @@ namespace osu.Game.Screens.Edit
             changeHandler.CanUndo.BindValueChanged(v => undoMenuItem.Action.Disabled = !v.NewValue, true);
             changeHandler.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
 
-            // todo: BindCollectionChanged
             editorBeatmap.SelectedHitObjects.BindCollectionChanged((_, __) =>
             {
                 var hasObjects = editorBeatmap.SelectedHitObjects.Count > 0;

From 320e3143565023804e2e5279a6fc8267c49ec87e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 13 Sep 2020 22:53:30 +0900
Subject: [PATCH 04757/10326] Use minimum start time to handle
 SelectedHitObjects not being sorted

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index d80f899f90..64365bd512 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -454,7 +454,7 @@ namespace osu.Game.Screens.Edit
 
             Debug.Assert(objects.Any());
 
-            double timeOffset = clock.CurrentTime - objects.First().StartTime;
+            double timeOffset = clock.CurrentTime - objects.Min(o => o.StartTime);
 
             foreach (var h in objects)
                 h.StartTime += timeOffset;

From 3e37f27a66f65d7a7b938fdb8c8bc1c5edc03d76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 13 Sep 2020 23:22:19 +0900
Subject: [PATCH 04758/10326] Fix regressed tests due to schedule changes

---
 .../Beatmaps/TestSceneEditorBeatmap.cs        | 50 ++++++++-----------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs b/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
index b7b48ec06a..902f0d7c23 100644
--- a/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
+++ b/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
@@ -23,15 +23,19 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestHitObjectAddEvent()
         {
-            var editorBeatmap = new EditorBeatmap(new OsuBeatmap());
-
-            HitObject addedObject = null;
-            editorBeatmap.HitObjectAdded += h => addedObject = h;
-
             var hitCircle = new HitCircle();
 
-            editorBeatmap.Add(hitCircle);
-            Assert.That(addedObject, Is.EqualTo(hitCircle));
+            HitObject addedObject = null;
+            EditorBeatmap editorBeatmap = null;
+
+            AddStep("add beatmap", () =>
+            {
+                Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+                editorBeatmap.HitObjectAdded += h => addedObject = h;
+            });
+
+            AddStep("add hitobject", () => editorBeatmap.Add(hitCircle));
+            AddAssert("received add event", () => addedObject == hitCircle);
         }
 
         /// <summary>
@@ -41,13 +45,15 @@ namespace osu.Game.Tests.Beatmaps
         public void HitObjectRemoveEvent()
         {
             var hitCircle = new HitCircle();
-            var editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
-
             HitObject removedObject = null;
-            editorBeatmap.HitObjectRemoved += h => removedObject = h;
-
-            editorBeatmap.Remove(hitCircle);
-            Assert.That(removedObject, Is.EqualTo(hitCircle));
+            EditorBeatmap editorBeatmap = null;
+            AddStep("add beatmap", () =>
+            {
+                Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
+                editorBeatmap.HitObjectRemoved += h => removedObject = h;
+            });
+            AddStep("remove hitobject", () => editorBeatmap.Remove(editorBeatmap.HitObjects.First()));
+            AddAssert("received remove event", () => removedObject == hitCircle);
         }
 
         /// <summary>
@@ -58,9 +64,7 @@ namespace osu.Game.Tests.Beatmaps
         public void TestInitialHitObjectStartTimeChangeEvent()
         {
             var hitCircle = new HitCircle();
-
             HitObject changedObject = null;
-
             AddStep("add beatmap", () =>
             {
                 EditorBeatmap editorBeatmap;
@@ -68,7 +72,6 @@ namespace osu.Game.Tests.Beatmaps
                 Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
                 editorBeatmap.HitObjectUpdated += h => changedObject = h;
             });
-
             AddStep("change start time", () => hitCircle.StartTime = 1000);
             AddAssert("received change event", () => changedObject == hitCircle);
         }
@@ -82,18 +85,14 @@ namespace osu.Game.Tests.Beatmaps
         {
             EditorBeatmap editorBeatmap = null;
             HitObject changedObject = null;
-
             AddStep("add beatmap", () =>
             {
                 Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap());
                 editorBeatmap.HitObjectUpdated += h => changedObject = h;
             });
-
             var hitCircle = new HitCircle();
-
             AddStep("add object", () => editorBeatmap.Add(hitCircle));
             AddAssert("event not received", () => changedObject == null);
-
             AddStep("change start time", () => hitCircle.StartTime = 1000);
             AddAssert("event received", () => changedObject == hitCircle);
         }
@@ -106,13 +105,10 @@ namespace osu.Game.Tests.Beatmaps
         {
             var hitCircle = new HitCircle();
             var editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
-
             HitObject changedObject = null;
             editorBeatmap.HitObjectUpdated += h => changedObject = h;
-
             editorBeatmap.Remove(hitCircle);
             Assert.That(changedObject, Is.Null);
-
             hitCircle.StartTime = 1000;
             Assert.That(changedObject, Is.Null);
         }
@@ -147,6 +143,7 @@ namespace osu.Game.Tests.Beatmaps
         public void TestResortWhenStartTimeChanged()
         {
             var hitCircle = new HitCircle { StartTime = 1000 };
+
             var editorBeatmap = new EditorBeatmap(new OsuBeatmap
             {
                 HitObjects =
@@ -173,7 +170,6 @@ namespace osu.Game.Tests.Beatmaps
             var updatedObjects = new List<HitObject>();
             var allHitObjects = new List<HitObject>();
             EditorBeatmap editorBeatmap = null;
-
             AddStep("add beatmap", () =>
             {
                 updatedObjects.Clear();
@@ -187,11 +183,9 @@ namespace osu.Game.Tests.Beatmaps
                     allHitObjects.Add(h);
                 }
             });
-
             AddStep("change all start times", () =>
             {
                 editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h);
-
                 for (int i = 0; i < 10; i++)
                     allHitObjects[i].StartTime += 10;
             });
@@ -208,7 +202,6 @@ namespace osu.Game.Tests.Beatmaps
         {
             var updatedObjects = new List<HitObject>();
             EditorBeatmap editorBeatmap = null;
-
             AddStep("add beatmap", () =>
             {
                 updatedObjects.Clear();
@@ -216,15 +209,12 @@ namespace osu.Game.Tests.Beatmaps
                 Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap());
                 editorBeatmap.Add(new HitCircle());
             });
-
             AddStep("change start time twice", () =>
             {
                 editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h);
-
                 editorBeatmap.HitObjects[0].StartTime = 10;
                 editorBeatmap.HitObjects[0].StartTime = 20;
             });
-
             AddAssert("only updated once", () => updatedObjects.Count == 1);
         }
     }

From 18ae17e1290a936a4f854d6cbf740c2ad9dbe1f0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 13 Sep 2020 19:55:21 +0200
Subject: [PATCH 04759/10326] Add scale to GroupTeam and remove unnecessary
 sizing and scaling in other scenes

---
 osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs   | 1 +
 osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs | 1 -
 osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs           | 2 --
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs b/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
index 4f0ce0bbe7..119f71ebfa 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
             AcronymText.Origin = Anchor.TopCentre;
             AcronymText.Text = team.Acronym.Value.ToUpperInvariant();
             AcronymText.Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 10);
+            Flag.Scale = new Vector2(0.5f);
 
             InternalChildren = new Drawable[]
             {
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index b01c93ae03..48aea46497 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -29,7 +29,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             var anchor = flip ? Anchor.TopLeft : Anchor.TopRight;
 
             Flag.RelativeSizeAxes = Axes.None;
-            Flag.Size = new Vector2(60, 40);
             Flag.Origin = anchor;
             Flag.Anchor = anchor;
 
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index 3870f486e1..dde140ab91 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -90,8 +90,6 @@ namespace osu.Game.Tournament.Screens.TeamWin
             {
                 new DrawableTeamFlag(match.Winner)
                 {
-                    Size = new Vector2(300, 200),
-                    Scale = new Vector2(0.5f),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Position = new Vector2(-300, 10),

From e328b791dfbaff551cccda920cef2cae410eeee8 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 13 Sep 2020 11:49:16 -0700
Subject: [PATCH 04760/10326] Add failing mod select input test

---
 .../Navigation/TestSceneScreenNavigation.cs   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 73a833c15d..0901976af2 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -6,9 +6,11 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
+using osu.Game.Overlays.Toolbar;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Tests.Beatmaps.IO;
@@ -143,6 +145,29 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("Track was restarted", () => Game.MusicController.IsPlaying);
         }
 
+        [Test]
+        public void TestModSelectInput()
+        {
+            TestSongSelect songSelect = null;
+
+            PushAndConfirm(() => songSelect = new TestSongSelect());
+
+            AddStep("Show mods overlay", () => songSelect.ModSelectOverlay.Show());
+
+            AddStep("Change ruleset to osu!taiko", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.PressKey(Key.Number2);
+
+                InputManager.ReleaseKey(Key.ControlLeft);
+                InputManager.ReleaseKey(Key.Number2);
+            });
+
+            AddAssert("Ruleset changed to osu!taiko", () => Game.Toolbar.ChildrenOfType<ToolbarRulesetSelector>().Single().Current.Value.ID == 1);
+
+            AddAssert("Mods overlay still visible", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
+        }
+
         private void pushEscape() =>
             AddStep("Press escape", () => pressAndRelease(Key.Escape));
 

From 4dacdb9994eecdc9043b19706b6683be1d892025 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 13 Sep 2020 11:50:21 -0700
Subject: [PATCH 04761/10326] Fix mod select overlay absorbing input from
 toolbar ruleset selector

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 8a5e4d2683..4eb4fc6501 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -390,6 +390,9 @@ namespace osu.Game.Overlays.Mods
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
+            // don't absorb control as ToolbarRulesetSelector uses control + number to navigate
+            if (e.ControlPressed) return false;
+
             switch (e.Key)
             {
                 case Key.Number1:

From 9f1a231f929677d806f0a1ecb4afb9499dda66a0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 13 Sep 2020 21:03:46 +0200
Subject: [PATCH 04762/10326] Add anchor to the fillflowcontainer in
 TeamDisplay

---
 osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index b01c93ae03..1b4a769b84 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -62,6 +62,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                                         AutoSizeAxes = Axes.Both,
                                         Direction = FillDirection.Horizontal,
                                         Spacing = new Vector2(5),
+                                        Origin = anchor,
+                                        Anchor = anchor,
                                         Children = new Drawable[]
                                         {
                                             new DrawableTeamHeader(colour)

From 692f2c8489751852c0ed717d8f9373f3a34c5ffd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 14:45:49 +0900
Subject: [PATCH 04763/10326] Simplify debounced update pathway

---
 osu.Game/Screens/Edit/Editor.cs        |   4 +
 osu.Game/Screens/Edit/EditorBeatmap.cs | 123 ++++++++++++-------------
 2 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 64365bd512..71340041f0 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -459,10 +459,14 @@ namespace osu.Game.Screens.Edit
             foreach (var h in objects)
                 h.StartTime += timeOffset;
 
+            changeHandler.BeginChange();
+
             editorBeatmap.SelectedHitObjects.Clear();
 
             editorBeatmap.AddRange(objects);
             editorBeatmap.SelectedHitObjects.AddRange(objects);
+
+            changeHandler.EndChange();
         }
 
         protected void Undo() => changeHandler.RestoreState(-1);
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 5272530228..3876fb0903 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -9,7 +9,6 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 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;
@@ -68,47 +67,6 @@ namespace osu.Game.Screens.Edit
                 trackStartTime(obj);
         }
 
-        private readonly HashSet<HitObject> pendingUpdates = new HashSet<HitObject>();
-        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([NotNull] HitObject hitObject) => updateHitObject(hitObject, false);
-
-        private void updateHitObject([CanBeNull] HitObject hitObject, bool silent, bool performAdd = false)
-        {
-            if (hitObject != null)
-                pendingUpdates.Add(hitObject);
-
-            if (scheduledUpdate?.Completed == false) return;
-
-            scheduledUpdate = Schedule(() =>
-            {
-                beatmapProcessor?.PreProcess();
-
-                foreach (var obj in pendingUpdates)
-                    obj.ApplyDefaults(ControlPointInfo, BeatmapInfo.BaseDifficulty);
-
-                beatmapProcessor?.PostProcess();
-
-                if (performAdd)
-                {
-                    foreach (var obj in pendingUpdates)
-                        HitObjectAdded?.Invoke(obj);
-                }
-
-                if (!silent)
-                {
-                    foreach (var obj in pendingUpdates)
-                        HitObjectUpdated?.Invoke(obj);
-                }
-
-                pendingUpdates.Clear();
-            });
-        }
-
         public BeatmapInfo BeatmapInfo
         {
             get => PlayableBeatmap.BeatmapInfo;
@@ -131,6 +89,8 @@ namespace osu.Game.Screens.Edit
 
         private IList mutableHitObjects => (IList)PlayableBeatmap.HitObjects;
 
+        private readonly HashSet<HitObject> pendingUpdates = new HashSet<HitObject>();
+
         /// <summary>
         /// Adds a collection of <see cref="HitObject"/>s to this <see cref="EditorBeatmap"/>.
         /// </summary>
@@ -165,23 +125,40 @@ namespace osu.Game.Screens.Edit
             trackStartTime(hitObject);
 
             mutableHitObjects.Insert(index, hitObject);
-            updateHitObject(hitObject, true, true);
+
+            // must be run after any change to hitobject ordering
+            beatmapProcessor?.PreProcess();
+            processHitObject(hitObject);
+            beatmapProcessor?.PostProcess();
+
+            HitObjectAdded?.Invoke(hitObject);
+        }
+
+        /// <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([NotNull] HitObject hitObject)
+        {
+            pendingUpdates.Add(hitObject);
         }
 
         /// <summary>
         /// Removes a <see cref="HitObject"/> from this <see cref="EditorBeatmap"/>.
         /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to add.</param>
+        /// <param name="hitObjects">All <see cref="HitObject"/> to remove.</param>
         /// <returns>True if the <see cref="HitObject"/> has been removed, false otherwise.</returns>
-        public bool Remove(HitObject hitObject)
+        public void Remove(params HitObject[] hitObjects)
         {
-            int index = FindIndex(hitObject);
+            foreach (var h in hitObjects)
+            {
+                int index = FindIndex(h);
 
-            if (index == -1)
-                return false;
+                if (index == -1)
+                    continue;
 
-            RemoveAt(index);
-            return true;
+                RemoveAt(index);
+            }
         }
 
         /// <summary>
@@ -203,11 +180,14 @@ namespace osu.Game.Screens.Edit
 
             var bindable = startTimeBindables[hitObject];
             bindable.UnbindAll();
-
             startTimeBindables.Remove(hitObject);
-            HitObjectRemoved?.Invoke(hitObject);
 
-            updateHitObject(null, true);
+            // must be run after any change to hitobject ordering
+            beatmapProcessor?.PreProcess();
+            processHitObject(hitObject);
+            beatmapProcessor?.PostProcess();
+
+            HitObjectRemoved?.Invoke(hitObject);
         }
 
         /// <summary>
@@ -215,20 +195,35 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         public void Clear()
         {
-            var removed = HitObjects.ToList();
+            var removable = HitObjects.ToList();
 
-            mutableHitObjects.Clear();
-
-            foreach (var b in startTimeBindables)
-                b.Value.UnbindAll();
-            startTimeBindables.Clear();
-
-            foreach (var h in removed)
-                HitObjectRemoved?.Invoke(h);
-
-            updateHitObject(null, true);
+            foreach (var h in removable)
+                Remove(h);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            // debounce updates as they are common and may come from input events, which can run needlessly many times per update frame.
+            if (pendingUpdates.Count > 0)
+            {
+                beatmapProcessor?.PreProcess();
+
+                foreach (var hitObject in pendingUpdates)
+                {
+                    processHitObject(hitObject);
+                    HitObjectUpdated?.Invoke(hitObject);
+                }
+
+                pendingUpdates.Clear();
+
+                beatmapProcessor?.PostProcess();
+            }
+        }
+
+        private void processHitObject(HitObject hitObject) => hitObject.ApplyDefaults(ControlPointInfo, BeatmapInfo.BaseDifficulty);
+
         private void trackStartTime(HitObject hitObject)
         {
             startTimeBindables[hitObject] = hitObject.StartTimeBindable.GetBoundCopy();

From da02ee88283a1c9012d4a26dbb6aff5385280671 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 15:26:57 +0900
Subject: [PATCH 04764/10326] Add ability to create a TestBeatmap with no
 HitObjects

---
 osu.Game/Tests/Beatmaps/TestBeatmap.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index a375a17bcf..87b77f4616 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -15,14 +15,16 @@ namespace osu.Game.Tests.Beatmaps
 {
     public class TestBeatmap : Beatmap
     {
-        public TestBeatmap(RulesetInfo ruleset)
+        public TestBeatmap(RulesetInfo ruleset, bool withHitObjects = true)
         {
             var baseBeatmap = CreateBeatmap();
 
             BeatmapInfo = baseBeatmap.BeatmapInfo;
             ControlPointInfo = baseBeatmap.ControlPointInfo;
             Breaks = baseBeatmap.Breaks;
-            HitObjects = baseBeatmap.HitObjects;
+
+            if (withHitObjects)
+                HitObjects = baseBeatmap.HitObjects;
 
             BeatmapInfo.Ruleset = ruleset;
             BeatmapInfo.RulesetID = ruleset.ID ?? 0;

From 0ef4dfc192a6725c9e62c7871bcb749bfdd3bb5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 15:27:08 +0900
Subject: [PATCH 04765/10326] Move more logic to base EditorTestScene

---
 .../Editing/TestSceneEditorChangeStates.cs    | 75 ++++++-------------
 osu.Game/Tests/Visual/EditorTestScene.cs      | 27 ++++++-
 2 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
index dfe1e434dc..ab53f4fd93 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
@@ -1,41 +1,27 @@
 // Copyright (c) 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.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Screens.Edit;
 
 namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneEditorChangeStates : EditorTestScene
     {
-        private EditorBeatmap editorBeatmap;
-
         protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
 
-        protected new TestEditor Editor => (TestEditor)base.Editor;
-
-        public override void SetUpSteps()
-        {
-            base.SetUpSteps();
-
-            AddStep("get beatmap", () => editorBeatmap = Editor.ChildrenOfType<EditorBeatmap>().Single());
-        }
-
         [Test]
         public void TestSelectedObjects()
         {
             HitCircle obj = null;
-            AddStep("add hitobject", () => editorBeatmap.Add(obj = new HitCircle { StartTime = 1000 }));
-            AddStep("select hitobject", () => editorBeatmap.SelectedHitObjects.Add(obj));
-            AddAssert("confirm 1 selected", () => editorBeatmap.SelectedHitObjects.Count == 1);
-            AddStep("deselect hitobject", () => editorBeatmap.SelectedHitObjects.Remove(obj));
-            AddAssert("confirm 0 selected", () => editorBeatmap.SelectedHitObjects.Count == 0);
+            AddStep("add hitobject", () => EditorBeatmap.Add(obj = new HitCircle { StartTime = 1000 }));
+            AddStep("select hitobject", () => EditorBeatmap.SelectedHitObjects.Add(obj));
+            AddAssert("confirm 1 selected", () => EditorBeatmap.SelectedHitObjects.Count == 1);
+            AddStep("deselect hitobject", () => EditorBeatmap.SelectedHitObjects.Remove(obj));
+            AddAssert("confirm 0 selected", () => EditorBeatmap.SelectedHitObjects.Count == 0);
         }
 
         [Test]
@@ -43,11 +29,11 @@ namespace osu.Game.Tests.Visual.Editing
         {
             int hitObjectCount = 0;
 
-            AddStep("get initial state", () => hitObjectCount = editorBeatmap.HitObjects.Count);
+            AddStep("get initial state", () => hitObjectCount = EditorBeatmap.HitObjects.Count);
 
             addUndoSteps();
 
-            AddAssert("no change occurred", () => hitObjectCount == editorBeatmap.HitObjects.Count);
+            AddAssert("no change occurred", () => hitObjectCount == EditorBeatmap.HitObjects.Count);
             AddAssert("no unsaved changes", () => !Editor.HasUnsavedChanges);
         }
 
@@ -56,11 +42,11 @@ namespace osu.Game.Tests.Visual.Editing
         {
             int hitObjectCount = 0;
 
-            AddStep("get initial state", () => hitObjectCount = editorBeatmap.HitObjects.Count);
+            AddStep("get initial state", () => hitObjectCount = EditorBeatmap.HitObjects.Count);
 
             addRedoSteps();
 
-            AddAssert("no change occurred", () => hitObjectCount == editorBeatmap.HitObjects.Count);
+            AddAssert("no change occurred", () => hitObjectCount == EditorBeatmap.HitObjects.Count);
             AddAssert("no unsaved changes", () => !Editor.HasUnsavedChanges);
         }
 
@@ -73,11 +59,11 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("bind removal", () =>
             {
-                editorBeatmap.HitObjectAdded += h => addedObject = h;
-                editorBeatmap.HitObjectRemoved += h => removedObject = h;
+                EditorBeatmap.HitObjectAdded += h => addedObject = h;
+                EditorBeatmap.HitObjectRemoved += h => removedObject = h;
             });
 
-            AddStep("add hitobject", () => editorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
+            AddStep("add hitobject", () => EditorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
             AddAssert("hitobject added", () => addedObject == expectedObject);
             AddAssert("unsaved changes", () => Editor.HasUnsavedChanges);
 
@@ -95,11 +81,11 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("bind removal", () =>
             {
-                editorBeatmap.HitObjectAdded += h => addedObject = h;
-                editorBeatmap.HitObjectRemoved += h => removedObject = h;
+                EditorBeatmap.HitObjectAdded += h => addedObject = h;
+                EditorBeatmap.HitObjectRemoved += h => removedObject = h;
             });
 
-            AddStep("add hitobject", () => editorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
+            AddStep("add hitobject", () => EditorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
             addUndoSteps();
 
             AddStep("reset variables", () =>
@@ -117,7 +103,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestAddObjectThenSaveHasNoUnsavedChanges()
         {
-            AddStep("add hitobject", () => editorBeatmap.Add(new HitCircle { StartTime = 1000 }));
+            AddStep("add hitobject", () => EditorBeatmap.Add(new HitCircle { StartTime = 1000 }));
 
             AddAssert("unsaved changes", () => Editor.HasUnsavedChanges);
             AddStep("save changes", () => Editor.Save());
@@ -133,12 +119,12 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("bind removal", () =>
             {
-                editorBeatmap.HitObjectAdded += h => addedObject = h;
-                editorBeatmap.HitObjectRemoved += h => removedObject = h;
+                EditorBeatmap.HitObjectAdded += h => addedObject = h;
+                EditorBeatmap.HitObjectRemoved += h => removedObject = h;
             });
 
-            AddStep("add hitobject", () => editorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
-            AddStep("remove object", () => editorBeatmap.Remove(expectedObject));
+            AddStep("add hitobject", () => EditorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
+            AddStep("remove object", () => EditorBeatmap.Remove(expectedObject));
             AddStep("reset variables", () =>
             {
                 addedObject = null;
@@ -160,12 +146,12 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("bind removal", () =>
             {
-                editorBeatmap.HitObjectAdded += h => addedObject = h;
-                editorBeatmap.HitObjectRemoved += h => removedObject = h;
+                EditorBeatmap.HitObjectAdded += h => addedObject = h;
+                EditorBeatmap.HitObjectRemoved += h => removedObject = h;
             });
 
-            AddStep("add hitobject", () => editorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
-            AddStep("remove object", () => editorBeatmap.Remove(expectedObject));
+            AddStep("add hitobject", () => EditorBeatmap.Add(expectedObject = new HitCircle { StartTime = 1000 }));
+            AddStep("remove object", () => EditorBeatmap.Remove(expectedObject));
             addUndoSteps();
 
             AddStep("reset variables", () =>
@@ -183,18 +169,5 @@ namespace osu.Game.Tests.Visual.Editing
         private void addUndoSteps() => AddStep("undo", () => Editor.Undo());
 
         private void addRedoSteps() => AddStep("redo", () => Editor.Redo());
-
-        protected override Editor CreateEditor() => new TestEditor();
-
-        protected class TestEditor : Editor
-        {
-            public new void Undo() => base.Undo();
-
-            public new void Redo() => base.Redo();
-
-            public new void Save() => base.Save();
-
-            public new bool HasUnsavedChanges => base.HasUnsavedChanges;
-        }
     }
 }
diff --git a/osu.Game/Tests/Visual/EditorTestScene.cs b/osu.Game/Tests/Visual/EditorTestScene.cs
index cd08f4712a..8f76f247cf 100644
--- a/osu.Game/Tests/Visual/EditorTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorTestScene.cs
@@ -14,7 +14,11 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class EditorTestScene : ScreenTestScene
     {
-        protected Editor Editor { get; private set; }
+        protected EditorBeatmap EditorBeatmap;
+
+        protected TestEditor Editor { get; private set; }
+
+        protected EditorClock EditorClock { get; private set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -29,6 +33,8 @@ namespace osu.Game.Tests.Visual
             AddStep("load editor", () => LoadScreen(Editor = CreateEditor()));
             AddUntilStep("wait for editor to load", () => Editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
                                                           && Editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true);
+            AddStep("get beatmap", () => EditorBeatmap = Editor.ChildrenOfType<EditorBeatmap>().Single());
+            AddStep("get clock", () => EditorClock = Editor.ChildrenOfType<EditorClock>().Single());
         }
 
         /// <summary>
@@ -39,6 +45,23 @@ namespace osu.Game.Tests.Visual
 
         protected sealed override Ruleset CreateRuleset() => CreateEditorRuleset();
 
-        protected virtual Editor CreateEditor() => new Editor();
+        protected virtual TestEditor CreateEditor() => new TestEditor();
+
+        protected class TestEditor : Editor
+        {
+            public new void Undo() => base.Undo();
+
+            public new void Redo() => base.Redo();
+
+            public new void Save() => base.Save();
+
+            public new void Cut() => base.Cut();
+
+            public new void Copy() => base.Copy();
+
+            public new void Paste() => base.Paste();
+
+            public new bool HasUnsavedChanges => base.HasUnsavedChanges;
+        }
     }
 }

From 66faae2a6b9634fc8c7ed3502ae88e22032e480e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 15:27:16 +0900
Subject: [PATCH 04766/10326] Add basic clipboards tests

---
 .../Editing/TestSceneEditorClipboard.cs       | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
new file mode 100644
index 0000000000..284127d66b
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -0,0 +1,96 @@
+// Copyright (c) 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.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Beatmaps;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneEditorClipboard : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
+
+        [Test]
+        public void TestCutRemovesObjects()
+        {
+            var addedObject = new HitCircle { StartTime = 1000 };
+
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
+
+            AddStep("cut hitobject", () => Editor.Cut());
+
+            AddAssert("no hitobjects in beatmap", () => EditorBeatmap.HitObjects.Count == 0);
+        }
+
+        [TestCase(1000)]
+        [TestCase(2000)]
+        public void TestCutPaste(double newTime)
+        {
+            var addedObject = new HitCircle { StartTime = 1000 };
+
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
+
+            AddStep("cut hitobject", () => Editor.Cut());
+
+            AddStep("move forward in time", () => EditorClock.Seek(newTime));
+
+            AddStep("paste hitobject", () => Editor.Paste());
+
+            AddAssert("is one object", () => EditorBeatmap.HitObjects.Count == 1);
+
+            AddAssert("new object selected", () => EditorBeatmap.SelectedHitObjects.Single().StartTime == newTime);
+        }
+
+        [Test]
+        public void TestCopyPaste()
+        {
+            var addedObject = new HitCircle { StartTime = 1000 };
+
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
+
+            AddStep("copy hitobject", () => Editor.Copy());
+
+            AddStep("move forward in time", () => EditorClock.Seek(2000));
+
+            AddStep("paste hitobject", () => Editor.Paste());
+
+            AddAssert("are two objects", () => EditorBeatmap.HitObjects.Count == 2);
+
+            AddAssert("new object selected", () => EditorBeatmap.SelectedHitObjects.Single().StartTime == 2000);
+        }
+
+        [Test]
+        public void TestCutNothing()
+        {
+            AddStep("cut hitobject", () => Editor.Cut());
+            AddAssert("are no objects", () => EditorBeatmap.HitObjects.Count == 0);
+        }
+
+        [Test]
+        public void TestCopyNothing()
+        {
+            AddStep("copy hitobject", () => Editor.Copy());
+            AddAssert("are no objects", () => EditorBeatmap.HitObjects.Count == 0);
+        }
+
+        [Test]
+        public void TestPasteNothing()
+        {
+            AddStep("paste hitobject", () => Editor.Paste());
+            AddAssert("are no objects", () => EditorBeatmap.HitObjects.Count == 0);
+        }
+    }
+}

From 75e4f224e5a1d0a2f21db48d711dce86f1ee4239 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 15:47:04 +0900
Subject: [PATCH 04767/10326] Add back accidentally removed remove

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 0a3c9072cf..60e25b01df 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -160,6 +160,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal void HandleDeselected(SelectionBlueprint blueprint)
         {
+            selectedBlueprints.Remove(blueprint);
+
             EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
 
             UpdateVisibility();

From b7a06524fb94c77f0c1719047b0f58466ab2a52a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 15:47:10 +0900
Subject: [PATCH 04768/10326] Update comment to make more sense

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 60e25b01df..f95bf350b6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             selectedBlueprints.Add(blueprint);
 
-            // need to check this as well, as there are potentially multiple SelectionHandlers and the above check is not enough.
+            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
             if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.HitObject))
                 EditorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
 

From 3e7f70e225625429fd3cdc1b1d68b9746b2abd09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 17:27:25 +0900
Subject: [PATCH 04769/10326] Add failing test covering post-converted json
 serializing

---
 .../Beatmaps/Formats/OsuJsonDecoderTest.cs    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
index b4c78ce273..e97c83e2c2 100644
--- a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
@@ -11,6 +11,8 @@ using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.IO.Serialization;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Tests.Resources;
 using osuTK;
@@ -90,6 +92,38 @@ namespace osu.Game.Tests.Beatmaps.Formats
             Assert.AreEqual(2, difficulty.SliderTickRate);
         }
 
+        [Test]
+        public void TestDecodePostConverted()
+        {
+            var converted = new OsuBeatmapConverter(decodeAsJson(normal), new OsuRuleset()).Convert();
+
+            var processor = new OsuBeatmapProcessor(converted);
+
+            processor.PreProcess();
+            foreach (var o in converted.HitObjects)
+                o.ApplyDefaults(converted.ControlPointInfo, converted.BeatmapInfo.BaseDifficulty);
+            processor.PostProcess();
+
+            var beatmap = converted.Serialize().Deserialize<Beatmap>();
+
+            var curveData = beatmap.HitObjects[0] as IHasPathWithRepeats;
+            var positionData = beatmap.HitObjects[0] as IHasPosition;
+
+            Assert.IsNotNull(positionData);
+            Assert.IsNotNull(curveData);
+            Assert.AreEqual(90, curveData.Path.Distance);
+            Assert.AreEqual(new Vector2(192, 168), positionData.Position);
+            Assert.AreEqual(956, beatmap.HitObjects[0].StartTime);
+            Assert.IsTrue(beatmap.HitObjects[0].Samples.Any(s => s.Name == HitSampleInfo.HIT_NORMAL));
+
+            positionData = beatmap.HitObjects[1] as IHasPosition;
+
+            Assert.IsNotNull(positionData);
+            Assert.AreEqual(new Vector2(304, 56), positionData.Position);
+            Assert.AreEqual(1285, beatmap.HitObjects[1].StartTime);
+            Assert.IsTrue(beatmap.HitObjects[1].Samples.Any(s => s.Name == HitSampleInfo.HIT_CLAP));
+        }
+
         [Test]
         public void TestDecodeHitObjects()
         {
@@ -100,6 +134,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
             Assert.IsNotNull(positionData);
             Assert.IsNotNull(curveData);
+            Assert.AreEqual(90, curveData.Path.Distance);
             Assert.AreEqual(new Vector2(192, 168), positionData.Position);
             Assert.AreEqual(956, beatmap.HitObjects[0].StartTime);
             Assert.IsTrue(beatmap.HitObjects[0].Samples.Any(s => s.Name == HitSampleInfo.HIT_NORMAL));

From a8b405791a76c320dfd397ac7be261dac07f2c7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 17:08:22 +0900
Subject: [PATCH 04770/10326] Fix non-convert slider and spinner serialization

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs           | 9 +++++++--
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs | 2 ++
 osu.Game/Rulesets/Objects/PathControlPoint.cs     | 3 +++
 osu.Game/Rulesets/Objects/Types/IHasDuration.cs   | 3 ---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 705e88040f..51f6a44a87 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using System.Linq;
 using System.Threading;
+using Newtonsoft.Json;
 using osu.Framework.Caching;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -21,6 +22,7 @@ namespace osu.Game.Rulesets.Osu.Objects
     {
         public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity;
 
+        [JsonIgnore]
         public double Duration
         {
             get => EndTime - StartTime;
@@ -112,8 +114,11 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public double TickDistanceMultiplier = 1;
 
-        public HitCircle HeadCircle;
-        public SliderTailCircle TailCircle;
+        [JsonIgnore]
+        public HitCircle HeadCircle { get; protected set; }
+
+        [JsonIgnore]
+        public SliderTailCircle TailCircle { get; protected set; }
 
         public Slider()
         {
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index c522dc623c..36b421586e 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -3,6 +3,7 @@
 
 using osu.Game.Rulesets.Objects.Types;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -29,6 +30,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
         public List<IList<HitSampleInfo>> NodeSamples { get; set; }
         public int RepeatCount { get; set; }
 
+        [JsonIgnore]
         public double Duration
         {
             get => this.SpanCount() * Distance / Velocity;
diff --git a/osu.Game/Rulesets/Objects/PathControlPoint.cs b/osu.Game/Rulesets/Objects/PathControlPoint.cs
index 0336f94313..f11917f4f4 100644
--- a/osu.Game/Rulesets/Objects/PathControlPoint.cs
+++ b/osu.Game/Rulesets/Objects/PathControlPoint.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -13,12 +14,14 @@ namespace osu.Game.Rulesets.Objects
         /// <summary>
         /// The position of this <see cref="PathControlPoint"/>.
         /// </summary>
+        [JsonProperty]
         public readonly Bindable<Vector2> Position = new Bindable<Vector2>();
 
         /// <summary>
         /// The type of path segment starting at this <see cref="PathControlPoint"/>.
         /// If null, this <see cref="PathControlPoint"/> will be a part of the previous path segment.
         /// </summary>
+        [JsonProperty]
         public readonly Bindable<PathType?> Type = new Bindable<PathType?>();
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
index 185fd5977b..b558273650 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDuration.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 Newtonsoft.Json;
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
@@ -28,7 +26,6 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <summary>
         /// The duration of the HitObject.
         /// </summary>
-        [JsonIgnore]
         new double Duration { get; set; }
     }
 }

From 36a234e5d95c283ef1cbeed754eefe4e2bcd9874 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 17:43:27 +0900
Subject: [PATCH 04771/10326] Add slider specific clipboard test

---
 .../Editing/TestSceneEditorClipboard.cs       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
index 284127d66b..808d471e36 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -5,9 +5,12 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Beatmaps;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Editing
 {
@@ -52,6 +55,39 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("new object selected", () => EditorBeatmap.SelectedHitObjects.Single().StartTime == newTime);
         }
 
+        [Test]
+        public void TestCutPasteSlider()
+        {
+            var addedObject = new Slider
+            {
+                StartTime = 1000,
+                Path = new SliderPath
+                {
+                    ControlPoints =
+                    {
+                        new PathControlPoint(),
+                        new PathControlPoint(new Vector2(100, 0), PathType.Bezier)
+                    }
+                }
+            };
+
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
+
+            AddStep("cut hitobject", () => Editor.Cut());
+
+            AddStep("paste hitobject", () => Editor.Paste());
+
+            AddAssert("is one object", () => EditorBeatmap.HitObjects.Count == 1);
+
+            AddAssert("path matches", () =>
+            {
+                var path = ((Slider)EditorBeatmap.HitObjects.Single()).Path;
+                return path.ControlPoints.Count == 2 && path.ControlPoints.SequenceEqual(addedObject.Path.ControlPoints);
+            });
+        }
+
         [Test]
         public void TestCopyPaste()
         {

From dafbeda68136ad134f5df3e09e7c93d902717264 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 17:48:29 +0900
Subject: [PATCH 04772/10326] Add test coverage for spinners too

---
 .../Editing/TestSceneEditorClipboard.cs       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
index 808d471e36..29046c82a6 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -88,6 +88,28 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        [Test]
+        public void TestCutPasteSpinner()
+        {
+            var addedObject = new Spinner
+            {
+                StartTime = 1000,
+                Duration = 5000
+            };
+
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
+
+            AddStep("cut hitobject", () => Editor.Cut());
+
+            AddStep("paste hitobject", () => Editor.Paste());
+
+            AddAssert("is one object", () => EditorBeatmap.HitObjects.Count == 1);
+
+            AddAssert("duration matches", () => ((Spinner)EditorBeatmap.HitObjects.Single()).Duration == 5000);
+        }
+
         [Test]
         public void TestCopyPaste()
         {

From 70bc0b2bd025e234880bca5408b3ea6116ef8d7d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 17:52:59 +0900
Subject: [PATCH 04773/10326] Add back inadvertently removed spacing

---
 .../Beatmaps/TestSceneEditorBeatmap.cs          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs b/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
index 902f0d7c23..bf5b517603 100644
--- a/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
+++ b/osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
@@ -64,7 +64,9 @@ namespace osu.Game.Tests.Beatmaps
         public void TestInitialHitObjectStartTimeChangeEvent()
         {
             var hitCircle = new HitCircle();
+
             HitObject changedObject = null;
+
             AddStep("add beatmap", () =>
             {
                 EditorBeatmap editorBeatmap;
@@ -72,6 +74,7 @@ namespace osu.Game.Tests.Beatmaps
                 Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
                 editorBeatmap.HitObjectUpdated += h => changedObject = h;
             });
+
             AddStep("change start time", () => hitCircle.StartTime = 1000);
             AddAssert("received change event", () => changedObject == hitCircle);
         }
@@ -85,14 +88,18 @@ namespace osu.Game.Tests.Beatmaps
         {
             EditorBeatmap editorBeatmap = null;
             HitObject changedObject = null;
+
             AddStep("add beatmap", () =>
             {
                 Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap());
                 editorBeatmap.HitObjectUpdated += h => changedObject = h;
             });
+
             var hitCircle = new HitCircle();
+
             AddStep("add object", () => editorBeatmap.Add(hitCircle));
             AddAssert("event not received", () => changedObject == null);
+
             AddStep("change start time", () => hitCircle.StartTime = 1000);
             AddAssert("event received", () => changedObject == hitCircle);
         }
@@ -105,10 +112,13 @@ namespace osu.Game.Tests.Beatmaps
         {
             var hitCircle = new HitCircle();
             var editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
+
             HitObject changedObject = null;
             editorBeatmap.HitObjectUpdated += h => changedObject = h;
+
             editorBeatmap.Remove(hitCircle);
             Assert.That(changedObject, Is.Null);
+
             hitCircle.StartTime = 1000;
             Assert.That(changedObject, Is.Null);
         }
@@ -170,6 +180,7 @@ namespace osu.Game.Tests.Beatmaps
             var updatedObjects = new List<HitObject>();
             var allHitObjects = new List<HitObject>();
             EditorBeatmap editorBeatmap = null;
+
             AddStep("add beatmap", () =>
             {
                 updatedObjects.Clear();
@@ -183,9 +194,11 @@ namespace osu.Game.Tests.Beatmaps
                     allHitObjects.Add(h);
                 }
             });
+
             AddStep("change all start times", () =>
             {
                 editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h);
+
                 for (int i = 0; i < 10; i++)
                     allHitObjects[i].StartTime += 10;
             });
@@ -202,6 +215,7 @@ namespace osu.Game.Tests.Beatmaps
         {
             var updatedObjects = new List<HitObject>();
             EditorBeatmap editorBeatmap = null;
+
             AddStep("add beatmap", () =>
             {
                 updatedObjects.Clear();
@@ -209,12 +223,15 @@ namespace osu.Game.Tests.Beatmaps
                 Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap());
                 editorBeatmap.Add(new HitCircle());
             });
+
             AddStep("change start time twice", () =>
             {
                 editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h);
+
                 editorBeatmap.HitObjects[0].StartTime = 10;
                 editorBeatmap.HitObjects[0].StartTime = 20;
             });
+
             AddAssert("only updated once", () => updatedObjects.Count == 1);
         }
     }

From daf54c7eb962c6abe35c04202da6c7c9d71e12b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 17:55:41 +0900
Subject: [PATCH 04774/10326] Revert EditorBeatmap.Remove API

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 3876fb0903..3a9bd85b0f 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -146,19 +146,17 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// Removes a <see cref="HitObject"/> from this <see cref="EditorBeatmap"/>.
         /// </summary>
-        /// <param name="hitObjects">All <see cref="HitObject"/> to remove.</param>
+        /// <param name="hitObject">The <see cref="HitObject"/> to remove.</param>
         /// <returns>True if the <see cref="HitObject"/> has been removed, false otherwise.</returns>
-        public void Remove(params HitObject[] hitObjects)
+        public bool Remove(HitObject hitObject)
         {
-            foreach (var h in hitObjects)
-            {
-                int index = FindIndex(h);
+            int index = FindIndex(hitObject);
 
-                if (index == -1)
-                    continue;
+            if (index == -1)
+                return false;
 
-                RemoveAt(index);
-            }
+            RemoveAt(index);
+            return true;
         }
 
         /// <summary>
@@ -195,9 +193,7 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         public void Clear()
         {
-            var removable = HitObjects.ToList();
-
-            foreach (var h in removable)
+            foreach (var h in HitObjects.ToArray())
                 Remove(h);
         }
 

From 91d37e0459e37f1caacfb7c623b05cd83d454848 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 20:17:00 +0900
Subject: [PATCH 04775/10326] Fix typo in comment

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

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index eacfdaec4a..303c59b05e 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Skinning
                 return item.ToString().ComputeSHA2Hash();
             }
 
-            // if there was no creator, the ToString above would give the filename, which along isn't really enough to base any decisions on.
+            // if there was no creator, the ToString above would give the filename, which alone isn't really enough to base any decisions on.
             return base.ComputeHash(item, reader);
         }
 

From 1884e0167bdb5bfa1d2769e00874520b39af8c71 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 23:31:03 +0900
Subject: [PATCH 04776/10326] Eagerly populate skin metadata to allow usage in
 hashing computation

---
 osu.Game/Database/ArchiveModelManager.cs |  3 +--
 osu.Game/Skinning/SkinManager.cs         | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index e87ab8167a..76bc4f7755 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -321,11 +321,10 @@ namespace osu.Game.Database
                 LogForModel(item, "Beginning import...");
 
                 item.Files = archive != null ? createFileInfos(archive, Files) : new List<TFileModel>();
+                item.Hash = ComputeHash(item, archive);
 
                 await Populate(item, archive, cancellationToken);
 
-                item.Hash = ComputeHash(item, archive);
-
                 using (var write = ContextFactory.GetForWrite()) // used to share a context for full import. keep in mind this will block all writes.
                 {
                     try
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 303c59b05e..ee4b7bc8e7 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -91,6 +91,10 @@ namespace osu.Game.Skinning
 
         protected override string ComputeHash(SkinInfo item, ArchiveReader reader = null)
         {
+            // we need to populate early to create a hash based off skin.ini contents
+            if (item.Name?.Contains(".osk") == true)
+                populateMetadata(item);
+
             if (item.Creator != null && item.Creator != unknown_creator_string)
             {
                 // this is the optimal way to hash legacy skins, but will need to be reconsidered when we move forward with skin implementation.
@@ -106,17 +110,23 @@ namespace osu.Game.Skinning
         {
             await base.Populate(model, archive, cancellationToken);
 
-            Skin reference = GetSkin(model);
+            if (model.Name?.Contains(".osk") == true)
+                populateMetadata(model);
+        }
+
+        private void populateMetadata(SkinInfo item)
+        {
+            Skin reference = GetSkin(item);
 
             if (!string.IsNullOrEmpty(reference.Configuration.SkinInfo.Name))
             {
-                model.Name = reference.Configuration.SkinInfo.Name;
-                model.Creator = reference.Configuration.SkinInfo.Creator;
+                item.Name = reference.Configuration.SkinInfo.Name;
+                item.Creator = reference.Configuration.SkinInfo.Creator;
             }
             else
             {
-                model.Name = model.Name.Replace(".osk", "");
-                model.Creator ??= unknown_creator_string;
+                item.Name = item.Name.Replace(".osk", "");
+                item.Creator ??= unknown_creator_string;
             }
         }
 

From a377cccb4db62c9ed91c843c3511bdcd7f6f1786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Sep 2020 17:03:09 +0200
Subject: [PATCH 04777/10326] Unsubscribe from track changed event on disposal

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 683e3abcc2..2312985e1b 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -642,6 +642,7 @@ namespace osu.Game.Screens.Select
             base.Dispose(isDisposing);
 
             decoupledRuleset.UnbindAll();
+            music.TrackChanged -= ensureTrackLooping;
         }
 
         /// <summary>

From 368aca015a43d918c6e06fe7d5f25e83e8f01678 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 14 Sep 2020 11:18:00 -0700
Subject: [PATCH 04778/10326] Move override methods to bottom

---
 .../Select/Options/BeatmapOptionsOverlay.cs   | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
index c01970f536..87e4505cd2 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
@@ -27,33 +27,6 @@ namespace osu.Game.Screens.Select.Options
 
         public override bool BlockScreenWideMouse => false;
 
-        protected override void PopIn()
-        {
-            base.PopIn();
-
-            this.FadeIn(transition_duration, Easing.OutQuint);
-
-            if (buttonsContainer.Position.X == 1 || Alpha == 0)
-                buttonsContainer.MoveToX(x_position - x_movement);
-
-            holder.ScaleTo(new Vector2(1, 1), transition_duration / 2, Easing.OutQuint);
-
-            buttonsContainer.MoveToX(x_position, transition_duration, Easing.OutQuint);
-            buttonsContainer.TransformSpacingTo(Vector2.Zero, transition_duration, Easing.OutQuint);
-        }
-
-        protected override void PopOut()
-        {
-            base.PopOut();
-
-            holder.ScaleTo(new Vector2(1, 0), transition_duration / 2, Easing.InSine);
-
-            buttonsContainer.MoveToX(x_position + x_movement, transition_duration, Easing.InSine);
-            buttonsContainer.TransformSpacingTo(new Vector2(200f, 0f), transition_duration, Easing.InSine);
-
-            this.FadeOut(transition_duration, Easing.InQuint);
-        }
-
         public BeatmapOptionsOverlay()
         {
             AutoSizeAxes = Axes.Y;
@@ -107,5 +80,32 @@ namespace osu.Game.Screens.Select.Options
 
             buttonsContainer.Add(button);
         }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+
+            this.FadeIn(transition_duration, Easing.OutQuint);
+
+            if (buttonsContainer.Position.X == 1 || Alpha == 0)
+                buttonsContainer.MoveToX(x_position - x_movement);
+
+            holder.ScaleTo(new Vector2(1, 1), transition_duration / 2, Easing.OutQuint);
+
+            buttonsContainer.MoveToX(x_position, transition_duration, Easing.OutQuint);
+            buttonsContainer.TransformSpacingTo(Vector2.Zero, transition_duration, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+
+            holder.ScaleTo(new Vector2(1, 0), transition_duration / 2, Easing.InSine);
+
+            buttonsContainer.MoveToX(x_position + x_movement, transition_duration, Easing.InSine);
+            buttonsContainer.TransformSpacingTo(new Vector2(200f, 0f), transition_duration, Easing.InSine);
+
+            this.FadeOut(transition_duration, Easing.InQuint);
+        }
     }
 }

From 1a8a7ae7f8fd0271c779ba15dec8aace09ac5cb4 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 14 Sep 2020 11:19:18 -0700
Subject: [PATCH 04779/10326] Remove hardcoded key param from AddButton

---
 .../TestSceneBeatmapOptionsOverlay.cs         |  9 +++----
 .../Select/Options/BeatmapOptionsButton.cs    | 13 ----------
 .../Select/Options/BeatmapOptionsOverlay.cs   | 25 ++++++++++++++++---
 osu.Game/Screens/Select/PlaySongSelect.cs     |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         |  6 ++---
 5 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
index f55c099d83..82d0c63917 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
@@ -5,7 +5,6 @@ using System.ComponentModel;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Screens.Select.Options;
 using osuTK.Graphics;
-using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.SongSelect
 {
@@ -16,10 +15,10 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             var overlay = new BeatmapOptionsOverlay();
 
-            overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, Color4.Purple, null, Key.Number1);
-            overlay.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, Color4.Purple, null, Key.Number2);
-            overlay.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, Color4.Pink, null, Key.Number3);
-            overlay.AddButton(@"Edit", @"beatmap", FontAwesome.Solid.PencilAlt, Color4.Yellow, null, Key.Number4);
+            overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, Color4.Purple, null);
+            overlay.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, Color4.Purple, null);
+            overlay.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, Color4.Pink, null);
+            overlay.AddButton(@"Edit", @"beatmap", FontAwesome.Solid.PencilAlt, Color4.Yellow, null);
 
             Add(overlay);
 
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
index 4e4653cb57..bd610608b9 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
@@ -52,8 +52,6 @@ namespace osu.Game.Screens.Select.Options
             set => secondLine.Text = value;
         }
 
-        public Key? HotKey;
-
         protected override bool OnMouseDown(MouseDownEvent e)
         {
             flash.FadeTo(0.1f, 1000, Easing.OutQuint);
@@ -75,17 +73,6 @@ namespace osu.Game.Screens.Select.Options
             return base.OnClick(e);
         }
 
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            if (!e.Repeat && e.Key == HotKey)
-            {
-                Click();
-                return true;
-            }
-
-            return false;
-        }
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
         public BeatmapOptionsButton()
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
index 87e4505cd2..70cbc7d588 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
@@ -11,6 +11,8 @@ using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
 using osu.Game.Graphics.Containers;
+using osu.Framework.Input.Events;
+using System.Linq;
 
 namespace osu.Game.Screens.Select.Options
 {
@@ -60,9 +62,8 @@ namespace osu.Game.Screens.Select.Options
         /// <param name="secondLine">Text in the second line.</param>
         /// <param name="colour">Colour of the button.</param>
         /// <param name="icon">Icon of the button.</param>
-        /// <param name="hotkey">Hotkey of the button.</param>
         /// <param name="action">Binding the button does.</param>
-        public void AddButton(string firstLine, string secondLine, IconUsage icon, Color4 colour, Action action, Key? hotkey = null)
+        public void AddButton(string firstLine, string secondLine, IconUsage icon, Color4 colour, Action action)
         {
             var button = new BeatmapOptionsButton
             {
@@ -75,7 +76,6 @@ namespace osu.Game.Screens.Select.Options
                     Hide();
                     action?.Invoke();
                 },
-                HotKey = hotkey
             };
 
             buttonsContainer.Add(button);
@@ -107,5 +107,24 @@ namespace osu.Game.Screens.Select.Options
 
             this.FadeOut(transition_duration, Easing.InQuint);
         }
+
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (!e.Repeat && e.Key >= Key.Number1 && e.Key <= Key.Number9)
+            {
+                int requested = e.Key - Key.Number1;
+
+                // go reverse as buttonsContainer is a ReverseChildIDFillFlowContainer
+                BeatmapOptionsButton found = buttonsContainer.Children.ElementAtOrDefault((buttonsContainer.Children.Count - 1) - requested);
+
+                if (found != null)
+                {
+                    found.Click();
+                    return true;
+                }
+            }
+
+            return base.OnKeyDown(e);
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 2236aa4d72..19769f487d 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Select
             {
                 ValidForResume = false;
                 Edit();
-            }, Key.Number4);
+            });
 
             ((PlayBeatmapDetailArea)BeatmapDetails).Leaderboard.ScoreSelected += PresentScore;
         }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d313f67446..f5a7c54519 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -275,9 +275,9 @@ namespace osu.Game.Screens.Select
                 Footer.AddButton(new FooterButtonRandom { Action = triggerRandom });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
-                BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null, Key.Number1);
-                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo), Key.Number2);
-                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo), Key.Number3);
+                BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null);
+                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo));
+                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo));
             }
 
             dialogOverlay = dialog;

From ce9c63970cce934caa8b06303780160251d7ff72 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 14 Sep 2020 11:20:43 -0700
Subject: [PATCH 04780/10326] Fix button colors in beatmap options test

---
 .../SongSelect/TestSceneBeatmapOptionsOverlay.cs     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
index 82d0c63917..61e61af028 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
@@ -3,8 +3,8 @@
 
 using System.ComponentModel;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
 using osu.Game.Screens.Select.Options;
-using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.SongSelect
 {
@@ -15,10 +15,12 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             var overlay = new BeatmapOptionsOverlay();
 
-            overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, Color4.Purple, null);
-            overlay.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, Color4.Purple, null);
-            overlay.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, Color4.Pink, null);
-            overlay.AddButton(@"Edit", @"beatmap", FontAwesome.Solid.PencilAlt, Color4.Yellow, null);
+            var colours = new OsuColour();
+
+            overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null);
+            overlay.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, null);
+            overlay.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, null);
+            overlay.AddButton(@"Edit", @"beatmap", FontAwesome.Solid.PencilAlt, colours.Yellow, null);
 
             Add(overlay);
 

From c30174cea36744b881bc236d2f8085c887854972 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 14 Sep 2020 11:21:23 -0700
Subject: [PATCH 04781/10326] Add manage collections button to beatmap options

---
 .../Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs       | 1 +
 osu.Game/Screens/Select/SongSelect.cs                         | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
index 61e61af028..cab47dca65 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             var colours = new OsuColour();
 
+            overlay.AddButton(@"Manage", @"collections", FontAwesome.Solid.Book, colours.Green, null);
             overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null);
             overlay.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, null);
             overlay.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, null);
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index f5a7c54519..482d469cc3 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -103,6 +103,9 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private MusicController music { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private ManageCollectionsDialog manageCollectionsDialog { get; set; }
+
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores, CollectionManager collections)
         {
@@ -275,6 +278,7 @@ namespace osu.Game.Screens.Select
                 Footer.AddButton(new FooterButtonRandom { Action = triggerRandom });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
+                BeatmapOptions.AddButton(@"Manage", @"collections", FontAwesome.Solid.Book, colours.Green, () => manageCollectionsDialog?.Show());
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null);
                 BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo));
                 BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo));

From a09bd787f0b5b20b6a678e2a8cdeb1ba2c5c614a Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 14 Sep 2020 11:21:39 -0700
Subject: [PATCH 04782/10326] Add failing beatmap options input test

---
 .../Navigation/TestSceneScreenNavigation.cs   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 0901976af2..c96952431a 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -13,6 +13,7 @@ using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Options;
 using osu.Game.Tests.Beatmaps.IO;
 using osuTK;
 using osuTK.Input;
@@ -168,6 +169,29 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("Mods overlay still visible", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
         }
 
+        [Test]
+        public void TestBeatmapOptionsInput()
+        {
+            TestSongSelect songSelect = null;
+
+            PushAndConfirm(() => songSelect = new TestSongSelect());
+
+            AddStep("Show options overlay", () => songSelect.BeatmapOptionsOverlay.Show());
+
+            AddStep("Change ruleset to osu!taiko", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.PressKey(Key.Number2);
+
+                InputManager.ReleaseKey(Key.ControlLeft);
+                InputManager.ReleaseKey(Key.Number2);
+            });
+
+            AddAssert("Ruleset changed to osu!taiko", () => Game.Toolbar.ChildrenOfType<ToolbarRulesetSelector>().Single().Current.Value.ID == 1);
+
+            AddAssert("Options overlay still visible", () => songSelect.BeatmapOptionsOverlay.State.Value == Visibility.Visible);
+        }
+
         private void pushEscape() =>
             AddStep("Press escape", () => pressAndRelease(Key.Escape));
 
@@ -193,6 +217,8 @@ namespace osu.Game.Tests.Visual.Navigation
         private class TestSongSelect : PlaySongSelect
         {
             public ModSelectOverlay ModSelectOverlay => ModSelect;
+
+            public BeatmapOptionsOverlay BeatmapOptionsOverlay => BeatmapOptions;
         }
     }
 }

From 57610ddad51c1a07bc346f2e6beab161b97058ee Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 14 Sep 2020 11:22:16 -0700
Subject: [PATCH 04783/10326] Fix beatmap options absorbing input from toolbar
 ruleset selector

---
 osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
index 70cbc7d588..2676635764 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
@@ -110,6 +110,9 @@ namespace osu.Game.Screens.Select.Options
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
+            // don't absorb control as ToolbarRulesetSelector uses control + number to navigate
+            if (e.ControlPressed) return false;
+
             if (!e.Repeat && e.Key >= Key.Number1 && e.Key <= Key.Number9)
             {
                 int requested = e.Key - Key.Number1;

From c833f5fcc4b046da16676b0a4a5aae58d799927d Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 14 Sep 2020 11:23:41 -0700
Subject: [PATCH 04784/10326] Reorder buttons to match stable

---
 .../Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs         | 2 +-
 osu.Game/Screens/Select/SongSelect.cs                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
index cab47dca65..e9742acdde 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
@@ -18,9 +18,9 @@ namespace osu.Game.Tests.Visual.SongSelect
             var colours = new OsuColour();
 
             overlay.AddButton(@"Manage", @"collections", FontAwesome.Solid.Book, colours.Green, null);
+            overlay.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, null);
             overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null);
             overlay.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, null);
-            overlay.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, null);
             overlay.AddButton(@"Edit", @"beatmap", FontAwesome.Solid.PencilAlt, colours.Yellow, null);
 
             Add(overlay);
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 482d469cc3..ed2e24c5bf 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -279,9 +279,9 @@ namespace osu.Game.Screens.Select
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
                 BeatmapOptions.AddButton(@"Manage", @"collections", FontAwesome.Solid.Book, colours.Green, () => manageCollectionsDialog?.Show());
+                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo));
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null);
                 BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo));
-                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo));
             }
 
             dialogOverlay = dialog;

From 43daabc98242bec098d78285f542d0179b817495 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 14 Sep 2020 12:10:00 -0700
Subject: [PATCH 04785/10326] Remove unused using and move dialog to BDL

---
 osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs | 1 -
 osu.Game/Screens/Select/SongSelect.cs                   | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
index bd610608b9..6e2f3cc9df 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
@@ -12,7 +12,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
-using osuTK.Input;
 using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Select.Options
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ed2e24c5bf..180752a579 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -103,11 +103,8 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private MusicController music { get; set; }
 
-        [Resolved(CanBeNull = true)]
-        private ManageCollectionsDialog manageCollectionsDialog { get; set; }
-
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores, CollectionManager collections)
+        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores, CollectionManager collections, ManageCollectionsDialog manageCollectionsDialog)
         {
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();

From 15e423157b4c49db9764ad99162341f11a37110c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 14:01:29 +0900
Subject: [PATCH 04786/10326] Fix tests that access LocalStorage before BDL

---
 .../TestSceneManageCollectionsDialog.cs       | 27 +++++++------------
 .../SongSelect/TestSceneFilterControl.cs      | 22 +++++----------
 2 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index 54ab20af7f..55b61bc54a 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -22,44 +22,35 @@ namespace osu.Game.Tests.Visual.Collections
 {
     public class TestSceneManageCollectionsDialog : OsuManualInputManagerTestScene
     {
-        protected override Container<Drawable> Content => content;
+        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
-        private readonly Container content;
-        private readonly DialogOverlay dialogOverlay;
-        private readonly CollectionManager manager;
+        private DialogOverlay dialogOverlay;
+        private CollectionManager manager;
 
         private RulesetStore rulesets;
         private BeatmapManager beatmapManager;
 
         private ManageCollectionsDialog dialog;
 
-        public TestSceneManageCollectionsDialog()
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
         {
             base.Content.AddRange(new Drawable[]
             {
                 manager = new CollectionManager(LocalStorage),
-                content = new Container { RelativeSizeAxes = Axes.Both },
+                Content,
                 dialogOverlay = new DialogOverlay()
             });
-        }
 
-        [BackgroundDependencyLoader]
-        private void load(GameHost host)
-        {
+            Dependencies.Cache(manager);
+            Dependencies.Cache(dialogOverlay);
+
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
 
             beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
         }
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.Cache(manager);
-            dependencies.Cache(dialogOverlay);
-            return dependencies;
-        }
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 7cd4791acb..0f03368296 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -23,41 +23,31 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public class TestSceneFilterControl : OsuManualInputManagerTestScene
     {
-        protected override Container<Drawable> Content => content;
-        private readonly Container content;
+        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
-        private readonly CollectionManager collectionManager;
+        private CollectionManager collectionManager;
 
         private RulesetStore rulesets;
         private BeatmapManager beatmapManager;
 
         private FilterControl control;
 
-        public TestSceneFilterControl()
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
         {
             base.Content.AddRange(new Drawable[]
             {
                 collectionManager = new CollectionManager(LocalStorage),
-                content = new Container { RelativeSizeAxes = Axes.Both }
+                Content
             });
-        }
 
-        [BackgroundDependencyLoader]
-        private void load(GameHost host)
-        {
+            Dependencies.Cache(collectionManager);
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
 
             beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
         }
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.Cache(collectionManager);
-            return dependencies;
-        }
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {

From 234152b2fe6a886051acf5aea1d49edaf343bac9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 14:03:36 +0900
Subject: [PATCH 04787/10326] Use host storage as LocalStorage for headless
 test runs

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 32 ++++++++++++++++-----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 4db5139813..6286809595 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual
         private Lazy<Storage> localStorage;
         protected Storage LocalStorage => localStorage.Value;
 
-        private readonly Lazy<DatabaseContextFactory> contextFactory;
+        private Lazy<DatabaseContextFactory> contextFactory;
 
         protected IAPIProvider API
         {
@@ -71,6 +71,17 @@ namespace osu.Game.Tests.Visual
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
+            contextFactory = new Lazy<DatabaseContextFactory>(() =>
+            {
+                var factory = new DatabaseContextFactory(LocalStorage);
+                factory.ResetDatabase();
+                using (var usage = factory.Get())
+                    usage.Migrate();
+                return factory;
+            });
+
+            RecycleLocalStorage();
+
             var baseDependencies = base.CreateChildDependencies(parent);
 
             var providedRuleset = CreateRuleset();
@@ -104,16 +115,6 @@ namespace osu.Game.Tests.Visual
 
         protected OsuTestScene()
         {
-            RecycleLocalStorage();
-            contextFactory = new Lazy<DatabaseContextFactory>(() =>
-            {
-                var factory = new DatabaseContextFactory(LocalStorage);
-                factory.ResetDatabase();
-                using (var usage = factory.Get())
-                    usage.Migrate();
-                return factory;
-            });
-
             base.Content.Add(content = new DrawSizePreservingFillContainer());
         }
 
@@ -131,9 +132,14 @@ namespace osu.Game.Tests.Visual
                 }
             }
 
-            localStorage = new Lazy<Storage>(() => new NativeStorage(Path.Combine(RuntimeInfo.StartupDirectory, $"{GetType().Name}-{Guid.NewGuid()}")));
+            localStorage = host is HeadlessGameHost
+                ? new Lazy<Storage>(() => host.Storage)
+                : new Lazy<Storage>(() => new NativeStorage(Path.Combine(RuntimeInfo.StartupDirectory, $"{GetType().Name}-{Guid.NewGuid()}")));
         }
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         [Resolved]
         protected AudioManager Audio { get; private set; }
 
@@ -172,7 +178,7 @@ namespace osu.Game.Tests.Visual
             if (MusicController?.TrackLoaded == true)
                 MusicController.CurrentTrack.Stop();
 
-            if (contextFactory.IsValueCreated)
+            if (contextFactory?.IsValueCreated == true)
                 contextFactory.Value.ResetDatabase();
 
             RecycleLocalStorage();

From 879979ef57f4b8139c1f37d117f2229d84f3d45b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 14:25:31 +0900
Subject: [PATCH 04788/10326] Move host lookup to inside lazy retrieval to
 handle edge cases

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

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 6286809595..611bc8f30f 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -132,9 +132,8 @@ namespace osu.Game.Tests.Visual
                 }
             }
 
-            localStorage = host is HeadlessGameHost
-                ? new Lazy<Storage>(() => host.Storage)
-                : new Lazy<Storage>(() => new NativeStorage(Path.Combine(RuntimeInfo.StartupDirectory, $"{GetType().Name}-{Guid.NewGuid()}")));
+            localStorage =
+                new Lazy<Storage>(() => host is HeadlessGameHost ? host.Storage : new NativeStorage(Path.Combine(RuntimeInfo.StartupDirectory, $"{GetType().Name}-{Guid.NewGuid()}")));
         }
 
         [Resolved]

From 2c7492d717fad46a677b09749b37aabeb1781f5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 14:34:58 +0900
Subject: [PATCH 04789/10326] Add null check in SongSelect disposal for safety

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 2312985e1b..260ab0e89f 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -642,7 +642,9 @@ namespace osu.Game.Screens.Select
             base.Dispose(isDisposing);
 
             decoupledRuleset.UnbindAll();
-            music.TrackChanged -= ensureTrackLooping;
+
+            if (music != null)
+                music.TrackChanged -= ensureTrackLooping;
         }
 
         /// <summary>

From 0446bc861043a80862bb39a2743c5087579774a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 14:43:24 +0900
Subject: [PATCH 04790/10326] Fix game.ini getting left over by PlayerTestScene
 subclasses

---
 osu.Game/Tests/Visual/PlayerTestScene.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 2c46e7f6d3..aa3bd2e4b7 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -81,6 +81,12 @@ namespace osu.Game.Tests.Visual
             LoadScreen(Player);
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            LocalConfig?.Dispose();
+            base.Dispose(isDisposing);
+        }
+
         /// <summary>
         /// Creates the ruleset for setting up the <see cref="Player"/> component.
         /// </summary>

From 3242b10187f77e55f171e71610e17026187e30e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 15:00:04 +0900
Subject: [PATCH 04791/10326] Change order of dependency caching to promote use
 of locals

---
 .../Collections/TestSceneManageCollectionsDialog.cs    | 10 +++++-----
 .../Visual/SongSelect/TestSceneFilterControl.cs        |  9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index 55b61bc54a..fef1605f0c 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -35,6 +35,11 @@ namespace osu.Game.Tests.Visual.Collections
         [BackgroundDependencyLoader]
         private void load(GameHost host)
         {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
+
+            beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+
             base.Content.AddRange(new Drawable[]
             {
                 manager = new CollectionManager(LocalStorage),
@@ -44,11 +49,6 @@ namespace osu.Game.Tests.Visual.Collections
 
             Dependencies.Cache(manager);
             Dependencies.Cache(dialogOverlay);
-
-            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
-            Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
-
-            beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
         }
 
         [SetUp]
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 0f03368296..5d0fb248df 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -35,6 +35,11 @@ namespace osu.Game.Tests.Visual.SongSelect
         [BackgroundDependencyLoader]
         private void load(GameHost host)
         {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
+
+            beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+
             base.Content.AddRange(new Drawable[]
             {
                 collectionManager = new CollectionManager(LocalStorage),
@@ -42,10 +47,6 @@ namespace osu.Game.Tests.Visual.SongSelect
             });
 
             Dependencies.Cache(collectionManager);
-            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
-            Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
-
-            beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
         }
 
         [SetUp]

From 9e73237a900e8b9cb3bdf9689a140f4ee11ce2ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 15:21:03 +0900
Subject: [PATCH 04792/10326] Fix score present tests potentially succeeding a
 step when they shouldn't

---
 .../Visual/Navigation/TestScenePresentScore.cs       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
index a899d072ac..74037dd3ec 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
@@ -133,6 +133,12 @@ namespace osu.Game.Tests.Visual.Navigation
             return () => imported;
         }
 
+        /// <summary>
+        /// Some tests test waiting for a particular screen twice in a row, but expect a new instance each time.
+        /// There's a case where they may succeed incorrectly if we don't compare against the previous instance.
+        /// </summary>
+        private IScreen lastWaitedScreen;
+
         private void presentAndConfirm(Func<ScoreInfo> getImport, ScorePresentType type)
         {
             AddStep("present score", () => Game.PresentScore(getImport(), type));
@@ -140,13 +146,15 @@ namespace osu.Game.Tests.Visual.Navigation
             switch (type)
             {
                 case ScorePresentType.Results:
-                    AddUntilStep("wait for results", () => Game.ScreenStack.CurrentScreen is ResultsScreen);
+                    AddUntilStep("wait for results", () => lastWaitedScreen != Game.ScreenStack.CurrentScreen && Game.ScreenStack.CurrentScreen is ResultsScreen);
+                    AddStep("store last waited screen", () => lastWaitedScreen = Game.ScreenStack.CurrentScreen);
                     AddUntilStep("correct score displayed", () => ((ResultsScreen)Game.ScreenStack.CurrentScreen).Score.ID == getImport().ID);
                     AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Ruleset.ID);
                     break;
 
                 case ScorePresentType.Gameplay:
-                    AddUntilStep("wait for player loader", () => Game.ScreenStack.CurrentScreen is ReplayPlayerLoader);
+                    AddUntilStep("wait for player loader", () => lastWaitedScreen != Game.ScreenStack.CurrentScreen && Game.ScreenStack.CurrentScreen is ReplayPlayerLoader);
+                    AddStep("store last waited screen", () => lastWaitedScreen = Game.ScreenStack.CurrentScreen);
                     AddUntilStep("correct score displayed", () => ((ReplayPlayerLoader)Game.ScreenStack.CurrentScreen).Score.ID == getImport().ID);
                     AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Ruleset.ID);
                     break;

From 9c041dbac2fba1bafe1f9290b091048e8c6438f3 Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Tue, 15 Sep 2020 08:24:01 +0200
Subject: [PATCH 04793/10326] Fix mania scrollspeed slider precision

---
 .../Configuration/ManiaRulesetConfigManager.cs                 | 2 +-
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 7e84f17809..756f2b7b2f 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
         {
             base.InitialiseDefaults();
 
-            Set(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 1);
+            Set(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
             Set(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
         }
 
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index 2ebfd0cfc1..b470405df2 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -34,7 +34,8 @@ namespace osu.Game.Rulesets.Mania
                 new SettingsSlider<double, TimeSlider>
                 {
                     LabelText = "Scroll speed",
-                    Bindable = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime)
+                    Bindable = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
+                    KeyboardStep = 5
                 },
             };
         }

From f7c9c805665152a526f9b67b48281fc51ca7e4ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 19:01:32 +0900
Subject: [PATCH 04794/10326] Force OsuGameTests to use a unique storage each
 run

---
 osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs | 2 ++
 osu.Game/Tests/Visual/OsuTestScene.cs                | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index c4acf4f7da..4c18cfa61c 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
         protected TestOsuGame Game;
 
+        protected override bool UseFreshStoragePerRun => true;
+
         [BackgroundDependencyLoader]
         private void load(GameHost host)
         {
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 611bc8f30f..f00cefaefd 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -118,6 +118,8 @@ namespace osu.Game.Tests.Visual
             base.Content.Add(content = new DrawSizePreservingFillContainer());
         }
 
+        protected virtual bool UseFreshStoragePerRun => false;
+
         public virtual void RecycleLocalStorage()
         {
             if (localStorage?.IsValueCreated == true)
@@ -133,7 +135,7 @@ namespace osu.Game.Tests.Visual
             }
 
             localStorage =
-                new Lazy<Storage>(() => host is HeadlessGameHost ? host.Storage : new NativeStorage(Path.Combine(RuntimeInfo.StartupDirectory, $"{GetType().Name}-{Guid.NewGuid()}")));
+                new Lazy<Storage>(() => !UseFreshStoragePerRun && host is HeadlessGameHost ? host.Storage : new NativeStorage(Path.Combine(RuntimeInfo.StartupDirectory, $"{GetType().Name}-{Guid.NewGuid()}")));
         }
 
         [Resolved]

From e43e12cb2dd0504917f27fb2b83efd637885366b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 20:17:59 +0900
Subject: [PATCH 04795/10326] Pause playback in present tests to avoid track
 inadvertently changing at menu

---
 .../Visual/Navigation/TestScenePresentBeatmap.cs           | 7 +++++++
 osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs  | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
index 27f5b29738..a003b9ae4d 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
@@ -74,6 +74,13 @@ namespace osu.Game.Tests.Visual.Navigation
 
         private void returnToMenu()
         {
+            // if we don't pause, there's a chance the track may change at the main menu out of our control (due to reaching the end of the track).
+            AddStep("pause audio", () =>
+            {
+                if (Game.MusicController.IsPlaying)
+                    Game.MusicController.TogglePause();
+            });
+
             AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
             AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
         }
diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
index 74037dd3ec..52b577b402 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
@@ -110,6 +110,13 @@ namespace osu.Game.Tests.Visual.Navigation
 
         private void returnToMenu()
         {
+            // if we don't pause, there's a chance the track may change at the main menu out of our control (due to reaching the end of the track).
+            AddStep("pause audio", () =>
+            {
+                if (Game.MusicController.IsPlaying)
+                    Game.MusicController.TogglePause();
+            });
+
             AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
             AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
         }

From dbfaa4a0df5ae5924d1c640fa200ecea39d318f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 22:50:44 +0900
Subject: [PATCH 04796/10326] Remove beatmap paths from tests where they would
 result in exceptions

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs | 1 -
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs  | 3 ---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs   | 1 -
 3 files changed, 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index faea32f90f..55b8902d7b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -54,7 +54,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Ruleset = new OsuRuleset().RulesetInfo,
                     OnlineBeatmapID = beatmapId,
-                    Path = "normal.osu",
                     Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss}, bpm {bpm:0.#})",
                     Length = length,
                     BPM = bpm,
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index a3ea4619cc..3aff390a47 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -839,7 +839,6 @@ namespace osu.Game.Tests.Visual.SongSelect
                     new BeatmapInfo
                     {
                         OnlineBeatmapID = id * 10,
-                        Path = "normal.osu",
                         Version = "Normal",
                         StarDifficulty = 2,
                         BaseDifficulty = new BeatmapDifficulty
@@ -850,7 +849,6 @@ namespace osu.Game.Tests.Visual.SongSelect
                     new BeatmapInfo
                     {
                         OnlineBeatmapID = id * 10 + 1,
-                        Path = "hard.osu",
                         Version = "Hard",
                         StarDifficulty = 5,
                         BaseDifficulty = new BeatmapDifficulty
@@ -861,7 +859,6 @@ namespace osu.Game.Tests.Visual.SongSelect
                     new BeatmapInfo
                     {
                         OnlineBeatmapID = id * 10 + 2,
-                        Path = "insane.osu",
                         Version = "Insane",
                         StarDifficulty = 6,
                         BaseDifficulty = new BeatmapDifficulty
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index f7d66ca5cf..0299b7a084 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -879,7 +879,6 @@ namespace osu.Game.Tests.Visual.SongSelect
                 {
                     Ruleset = getRuleset(),
                     OnlineBeatmapID = beatmapId,
-                    Path = "normal.osu",
                     Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss}, bpm {bpm:0.#})",
                     Length = length,
                     BPM = bpm,

From 3c70b3127c31a9098a294f09749e49d7e9ca6da9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 23:19:31 +0900
Subject: [PATCH 04797/10326] Fix potential nullref in FilterControl during
 asynchronous load

---
 osu.Game/Screens/Select/FilterControl.cs | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index c82a3742cc..952a5d1eaa 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -66,24 +66,9 @@ namespace osu.Game.Screens.Select
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(OsuColour colours, IBindable<RulesetInfo> parentRuleset, OsuConfigManager config)
         {
-            config.BindWith(OsuSetting.ShowConvertedBeatmaps, showConverted);
-            showConverted.ValueChanged += _ => updateCriteria();
-
-            config.BindWith(OsuSetting.DisplayStarsMinimum, minimumStars);
-            minimumStars.ValueChanged += _ => updateCriteria();
-
-            config.BindWith(OsuSetting.DisplayStarsMaximum, maximumStars);
-            maximumStars.ValueChanged += _ => updateCriteria();
-
-            ruleset.BindTo(parentRuleset);
-            ruleset.BindValueChanged(_ => updateCriteria());
-
             sortMode = config.GetBindable<SortMode>(OsuSetting.SongSelectSortingMode);
             groupMode = config.GetBindable<GroupMode>(OsuSetting.SongSelectGroupingMode);
 
-            groupMode.BindValueChanged(_ => updateCriteria());
-            sortMode.BindValueChanged(_ => updateCriteria());
-
             Children = new Drawable[]
             {
                 new Box
@@ -182,6 +167,21 @@ namespace osu.Game.Screens.Select
                 }
             };
 
+            config.BindWith(OsuSetting.ShowConvertedBeatmaps, showConverted);
+            showConverted.ValueChanged += _ => updateCriteria();
+
+            config.BindWith(OsuSetting.DisplayStarsMinimum, minimumStars);
+            minimumStars.ValueChanged += _ => updateCriteria();
+
+            config.BindWith(OsuSetting.DisplayStarsMaximum, maximumStars);
+            maximumStars.ValueChanged += _ => updateCriteria();
+
+            ruleset.BindTo(parentRuleset);
+            ruleset.BindValueChanged(_ => updateCriteria());
+
+            groupMode.BindValueChanged(_ => updateCriteria());
+            sortMode.BindValueChanged(_ => updateCriteria());
+
             collectionDropdown.Current.ValueChanged += val =>
             {
                 if (val.NewValue == null)

From 35c7677d0a0996d4df518aa6da5c7b464f0059a3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 16 Sep 2020 01:59:07 +0300
Subject: [PATCH 04798/10326] Fix gameplay samples potentially start playing
 while player is paused

---
 osu.Game/Skinning/SkinnableSound.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index cf629f231f..9e49134806 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -114,6 +114,8 @@ namespace osu.Game.Skinning
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
+            bool wasPlaying = IsPlaying;
+
             var channels = hitSamples.Select(s =>
             {
                 var ch = skin.GetSample(s);
@@ -138,8 +140,10 @@ namespace osu.Game.Skinning
 
             samplesContainer.ChildrenEnumerable = channels.Select(c => new DrawableSample(c));
 
-            if (requestedPlaying)
-                Play();
+            // Sample channels have been reloaded to new ones because skin has changed.
+            // Start playback internally for them if they were playing previously.
+            if (wasPlaying)
+                play();
         }
 
         #region Re-expose AudioContainer

From 105634c09936295a4083fef5b3f7c7d56f10a56a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 16 Sep 2020 01:59:41 +0300
Subject: [PATCH 04799/10326] Add test case ensuring correct behaviour

---
 .../Gameplay/TestSceneSkinnableSound.cs       | 61 ++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index e0a1f947ec..5f39a57d8a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -1,12 +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 System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Audio;
@@ -20,6 +25,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private GameplayClock gameplayClock = new GameplayClock(new FramedClock());
 
+        private TestSkinSourceContainer skinSource;
         private SkinnableSound skinnableSound;
 
         [SetUp]
@@ -29,7 +35,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             Children = new Drawable[]
             {
-                new Container
+                skinSource = new TestSkinSourceContainer
                 {
                     Clock = gameplayClock,
                     RelativeSizeAxes = Axes.Both,
@@ -101,5 +107,58 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("sample not playing", () => !sample.Playing);
             AddAssert("sample not playing", () => !sample.Playing);
         }
+
+        [Test]
+        public void TestSkinChangeDoesntPlayOnPause()
+        {
+            DrawableSample sample = null;
+            AddStep("start sample", () =>
+            {
+                skinnableSound.Play();
+                sample = skinnableSound.ChildrenOfType<DrawableSample>().Single();
+            });
+
+            AddAssert("sample playing", () => sample.Playing);
+
+            AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
+            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+
+            AddStep("trigger skin change", () =>
+            {
+                skinSource.TriggerSourceChanged();
+            });
+
+            AddStep("retrieve new sample", () =>
+            {
+                DrawableSample newSample = skinnableSound.ChildrenOfType<DrawableSample>().Single();
+                Assert.IsTrue(newSample != sample, "Sample still hasn't been updated after a skin change event");
+                sample = newSample;
+            });
+
+            AddAssert("new sample paused", () => !sample.Playing);
+            AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
+
+            AddWaitStep("wait a bit", 5);
+            AddAssert("new sample not played", () => !sample.Playing);
+        }
+
+        [Cached(typeof(ISkinSource))]
+        private class TestSkinSourceContainer : Container, ISkinSource
+        {
+            [Resolved]
+            private ISkinSource source { get; set; }
+
+            public event Action SourceChanged;
+
+            public Drawable GetDrawableComponent(ISkinComponent component) => source?.GetDrawableComponent(component);
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source?.GetTexture(componentName, wrapModeS, wrapModeT);
+            public SampleChannel GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);
+            public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => source?.GetConfig<TLookup, TValue>(lookup);
+
+            public void TriggerSourceChanged()
+            {
+                SourceChanged?.Invoke();
+            }
+        }
     }
 }

From c6386ea60505e10b56e2189423fa36d4d0f6a87a Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 15 Sep 2020 21:33:52 -0700
Subject: [PATCH 04800/10326] Remember leaderboard mods filter selection in
 song select

---
 osu.Game/Configuration/OsuConfigManager.cs             | 2 ++
 osu.Game/Screens/Select/BeatmapDetailArea.cs           | 2 ++
 osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs | 6 ++++++
 osu.Game/Screens/Select/PlayBeatmapDetailArea.cs       | 7 +++++++
 4 files changed, 17 insertions(+)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 71820dea55..207a3f01d3 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.Skin, 0, -1, int.MaxValue);
 
             Set(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
+            Set(OsuSetting.BeatmapDetailModsFilter, false);
 
             Set(OsuSetting.ShowConvertedBeatmaps, true);
             Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);
@@ -200,6 +201,7 @@ namespace osu.Game.Configuration
         CursorRotation,
         MenuParallax,
         BeatmapDetailTab,
+        BeatmapDetailModsFilter,
         Username,
         ReleaseStream,
         SavePassword,
diff --git a/osu.Game/Screens/Select/BeatmapDetailArea.cs b/osu.Game/Screens/Select/BeatmapDetailArea.cs
index 2e78b1aed2..89ae92ec91 100644
--- a/osu.Game/Screens/Select/BeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailArea.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Select
 
         protected Bindable<BeatmapDetailAreaTabItem> CurrentTab => tabControl.Current;
 
+        protected Bindable<bool> CurrentModsFilter => tabControl.CurrentModsFilter;
+
         private readonly Container content;
         protected override Container<Drawable> Content => content;
 
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
index 63711e3e50..df8c68a0dd 100644
--- a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
@@ -26,6 +26,12 @@ namespace osu.Game.Screens.Select
             set => tabs.Current = value;
         }
 
+        public Bindable<bool> CurrentModsFilter
+        {
+            get => modsCheckbox.Current;
+            set => modsCheckbox.Current = value;
+        }
+
         public Action<BeatmapDetailAreaTabItem, bool> OnFilter; // passed the selected tab and if mods is checked
 
         public IReadOnlyList<BeatmapDetailAreaTabItem> TabItems
diff --git a/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs b/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs
index d719502a4f..c87a4bbc54 100644
--- a/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Screens.Select
 
         private Bindable<TabType> selectedTab;
 
+        private Bindable<bool> selectedModsFilter;
+
         public PlayBeatmapDetailArea()
         {
             Add(Leaderboard = new BeatmapLeaderboard { RelativeSizeAxes = Axes.Both });
@@ -38,8 +40,13 @@ namespace osu.Game.Screens.Select
         private void load(OsuConfigManager config)
         {
             selectedTab = config.GetBindable<TabType>(OsuSetting.BeatmapDetailTab);
+            selectedModsFilter = config.GetBindable<bool>(OsuSetting.BeatmapDetailModsFilter);
+
             selectedTab.BindValueChanged(tab => CurrentTab.Value = getTabItemFromTabType(tab.NewValue), true);
             CurrentTab.BindValueChanged(tab => selectedTab.Value = getTabTypeFromTabItem(tab.NewValue));
+
+            selectedModsFilter.BindValueChanged(checkbox => CurrentModsFilter.Value = checkbox.NewValue, true);
+            CurrentModsFilter.BindValueChanged(checkbox => selectedModsFilter.Value = checkbox.NewValue);
         }
 
         public override void Refresh()

From ff5b29230261ac3ef26b1e1e375652b29357ddfe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Sep 2020 19:36:36 +0900
Subject: [PATCH 04801/10326] Fix global bindings being lost when running tests
 under headless contexts

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index f00cefaefd..b59a1db403 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -69,12 +69,26 @@ namespace osu.Game.Tests.Visual
         /// </summary>
         protected virtual bool UseOnlineAPI => false;
 
+        /// <summary>
+        /// When running headless, there is an opportunity to use the host storage rather than creating a second isolated one.
+        /// This is because the host is recycled per TestScene execution in headless at an nunit level.
+        /// </summary>
+        private Storage isolatedHostStorage;
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
+            if (!UseFreshStoragePerRun)
+                isolatedHostStorage = (parent.Get<GameHost>() as HeadlessGameHost)?.Storage;
+
             contextFactory = new Lazy<DatabaseContextFactory>(() =>
             {
                 var factory = new DatabaseContextFactory(LocalStorage);
-                factory.ResetDatabase();
+
+                // only reset the database if not using the host storage.
+                // if we reset the host storage, it will delete global key bindings.
+                if (isolatedHostStorage == null)
+                    factory.ResetDatabase();
+
                 using (var usage = factory.Get())
                     usage.Migrate();
                 return factory;
@@ -135,12 +149,9 @@ namespace osu.Game.Tests.Visual
             }
 
             localStorage =
-                new Lazy<Storage>(() => !UseFreshStoragePerRun && host is HeadlessGameHost ? host.Storage : new NativeStorage(Path.Combine(RuntimeInfo.StartupDirectory, $"{GetType().Name}-{Guid.NewGuid()}")));
+                new Lazy<Storage>(() => isolatedHostStorage ?? new NativeStorage(Path.Combine(RuntimeInfo.StartupDirectory, $"{GetType().Name}-{Guid.NewGuid()}")));
         }
 
-        [Resolved]
-        private GameHost host { get; set; }
-
         [Resolved]
         protected AudioManager Audio { get; private set; }
 

From 9063c60b9cb79ee5fb6db07f736a8510d8371861 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 16 Sep 2020 12:00:27 -0700
Subject: [PATCH 04802/10326] Fix profile section tab control not absorbing
 input from behind

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

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 2b316c0e34..d52ad84592 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -8,6 +8,7 @@ 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.Graphics.Containers;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Profile;
@@ -176,6 +177,10 @@ namespace osu.Game.Overlays
                 AccentColour = colourProvider.Highlight1;
             }
 
+            protected override bool OnClick(ClickEvent e) => true;
+
+            protected override bool OnHover(HoverEvent e) => true;
+
             private class ProfileSectionTabItem : OverlayTabItem
             {
                 public ProfileSectionTabItem(ProfileSection value)

From 3529a1bfeacf3c765731871d54db2b7f01911fb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Sep 2020 19:36:36 +0900
Subject: [PATCH 04803/10326] Fix global bindings being lost when running tests
 under headless contexts

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index f00cefaefd..b59a1db403 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -69,12 +69,26 @@ namespace osu.Game.Tests.Visual
         /// </summary>
         protected virtual bool UseOnlineAPI => false;
 
+        /// <summary>
+        /// When running headless, there is an opportunity to use the host storage rather than creating a second isolated one.
+        /// This is because the host is recycled per TestScene execution in headless at an nunit level.
+        /// </summary>
+        private Storage isolatedHostStorage;
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
+            if (!UseFreshStoragePerRun)
+                isolatedHostStorage = (parent.Get<GameHost>() as HeadlessGameHost)?.Storage;
+
             contextFactory = new Lazy<DatabaseContextFactory>(() =>
             {
                 var factory = new DatabaseContextFactory(LocalStorage);
-                factory.ResetDatabase();
+
+                // only reset the database if not using the host storage.
+                // if we reset the host storage, it will delete global key bindings.
+                if (isolatedHostStorage == null)
+                    factory.ResetDatabase();
+
                 using (var usage = factory.Get())
                     usage.Migrate();
                 return factory;
@@ -135,12 +149,9 @@ namespace osu.Game.Tests.Visual
             }
 
             localStorage =
-                new Lazy<Storage>(() => !UseFreshStoragePerRun && host is HeadlessGameHost ? host.Storage : new NativeStorage(Path.Combine(RuntimeInfo.StartupDirectory, $"{GetType().Name}-{Guid.NewGuid()}")));
+                new Lazy<Storage>(() => isolatedHostStorage ?? new NativeStorage(Path.Combine(RuntimeInfo.StartupDirectory, $"{GetType().Name}-{Guid.NewGuid()}")));
         }
 
-        [Resolved]
-        private GameHost host { get; set; }
-
         [Resolved]
         protected AudioManager Audio { get; private set; }
 

From d2580ebc7023b9730dbf4fe4e047dcd597946803 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Sep 2020 13:01:34 +0900
Subject: [PATCH 04804/10326] Attempt to fix tests by avoiding clash between
 import tests names

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 14eff4c5e3..ef5ff0e75d 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Skins.IO
         [Test]
         public async Task TestBasicImport()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportSkinTest)))
             {
                 try
                 {
@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Skins.IO
         [Test]
         public async Task TestImportTwiceWithSameMetadata()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportSkinTest)))
             {
                 try
                 {
@@ -68,7 +68,7 @@ namespace osu.Game.Tests.Skins.IO
         [Test]
         public async Task TestImportTwiceWithNoMetadata()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportSkinTest)))
             {
                 try
                 {
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Skins.IO
         [Test]
         public async Task TestImportTwiceWithDifferentMetadata()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportSkinTest)))
             {
                 try
                 {

From 0b289d2e779140930d8fd90c3de13bd3b0dcef8d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Sep 2020 13:07:05 +0900
Subject: [PATCH 04805/10326] Add hostname differentiation to beatmap tests too

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index dd3dba1274..bc6fbed07a 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportWhenClosed()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportThenDelete()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportThenImport()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportThenImportWithReZip()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -156,7 +156,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportThenImportWithChangedFile()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -207,7 +207,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportThenImportWithDifferentFilename()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -259,7 +259,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportCorruptThenImport()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -301,7 +301,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestRollbackOnFailure()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -378,7 +378,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportThenDeleteThenImport()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -406,7 +406,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportThenDeleteThenImportWithOnlineIDMismatch(bool set)
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(set.ToString()))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost($"{nameof(ImportBeatmapTest)}-{set}"))
             {
                 try
                 {
@@ -440,7 +440,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public async Task TestImportWithDuplicateBeatmapIDs()
         {
             // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -496,8 +496,8 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Ignore("Binding IPC on Appveyor isn't working (port in use). Need to figure out why")]
         public void TestImportOverIPC()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("host", true))
-            using (HeadlessGameHost client = new CleanRunHeadlessGameHost("client", true))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost($"{nameof(ImportBeatmapTest)}-host", true))
+            using (HeadlessGameHost client = new CleanRunHeadlessGameHost($"{nameof(ImportBeatmapTest)}-client", true))
             {
                 try
                 {
@@ -526,7 +526,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportWhenFileOpen()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -548,7 +548,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportWithDuplicateHashes()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -590,7 +590,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportNestedStructure()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -635,7 +635,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportWithIgnoredDirectoryInArchive()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -689,7 +689,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestUpdateBeatmapInfo()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -719,7 +719,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestUpdateBeatmapFile()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -761,7 +761,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public void TestCreateNewEmptyBeatmap()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {
@@ -788,7 +788,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public void TestCreateNewBeatmapWithObject()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
             {
                 try
                 {

From 835c8d74b77298faef44e1b37a45596e9ff93cd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Sep 2020 16:12:18 +0900
Subject: [PATCH 04806/10326] Wait for two update frames before attempting to
 migrate storage

---
 osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 199e69a19d..17e6b712f3 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -272,8 +272,16 @@ namespace osu.Game.Tests.NonVisual
         {
             var osu = new OsuGameBase();
             Task.Run(() => host.Run(osu));
+
             waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
 
+            bool ready = false;
+            // wait for two update frames to be executed. this ensures that all components have had a change to run LoadComplete and hopefully avoid
+            // database access (GlobalActionContainer is one to do this).
+            host.UpdateThread.Scheduler.Add(() => host.UpdateThread.Scheduler.Add(() => ready = true));
+
+            waitForOrAssert(() => ready, @"osu! failed to start in a reasonable amount of time");
+
             return osu;
         }
 

From 89a2f20922fea81dc585b9681d43a2f995157c17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Sep 2020 16:12:30 +0900
Subject: [PATCH 04807/10326] Use new CleanRun host class in import tests

---
 .../NonVisual/CustomDataDirectoryTest.cs      | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 17e6b712f3..211fa4ca42 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -22,7 +23,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestDefaultDirectory()
         {
-            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestDefaultDirectory)))
+            using (var host = new CustomTestHeadlessGameHost())
             {
                 try
                 {
@@ -45,7 +46,7 @@ namespace osu.Game.Tests.NonVisual
         {
             string customPath = prepareCustomPath();
 
-            using (var host = new CustomTestHeadlessGameHost(nameof(TestCustomDirectory)))
+            using (var host = new CustomTestHeadlessGameHost())
             {
                 using (var storageConfig = new StorageConfigManager(host.InitialStorage))
                     storageConfig.Set(StorageConfig.FullPath, customPath);
@@ -71,7 +72,7 @@ namespace osu.Game.Tests.NonVisual
         {
             string customPath = prepareCustomPath();
 
-            using (var host = new CustomTestHeadlessGameHost(nameof(TestSubDirectoryLookup)))
+            using (var host = new CustomTestHeadlessGameHost())
             {
                 using (var storageConfig = new StorageConfigManager(host.InitialStorage))
                     storageConfig.Set(StorageConfig.FullPath, customPath);
@@ -104,7 +105,7 @@ namespace osu.Game.Tests.NonVisual
         {
             string customPath = prepareCustomPath();
 
-            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestMigration)))
+            using (var host = new CustomTestHeadlessGameHost())
             {
                 try
                 {
@@ -165,7 +166,7 @@ namespace osu.Game.Tests.NonVisual
             string customPath = prepareCustomPath();
             string customPath2 = prepareCustomPath("-2");
 
-            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestMigrationBetweenTwoTargets)))
+            using (var host = new CustomTestHeadlessGameHost())
             {
                 try
                 {
@@ -194,7 +195,7 @@ namespace osu.Game.Tests.NonVisual
         {
             string customPath = prepareCustomPath();
 
-            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestMigrationToSameTargetFails)))
+            using (var host = new CustomTestHeadlessGameHost())
             {
                 try
                 {
@@ -215,7 +216,7 @@ namespace osu.Game.Tests.NonVisual
         {
             string customPath = prepareCustomPath();
 
-            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestMigrationToNestedTargetFails)))
+            using (var host = new CustomTestHeadlessGameHost())
             {
                 try
                 {
@@ -244,7 +245,7 @@ namespace osu.Game.Tests.NonVisual
         {
             string customPath = prepareCustomPath();
 
-            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestMigrationToSeeminglyNestedTarget)))
+            using (var host = new CustomTestHeadlessGameHost())
             {
                 try
                 {
@@ -315,14 +316,14 @@ namespace osu.Game.Tests.NonVisual
             return path;
         }
 
-        public class CustomTestHeadlessGameHost : HeadlessGameHost
+        public class CustomTestHeadlessGameHost : CleanRunHeadlessGameHost
         {
             public Storage InitialStorage { get; }
 
-            public CustomTestHeadlessGameHost(string name)
-                : base(name)
+            public CustomTestHeadlessGameHost([CallerMemberName] string callingMethodName = @"")
+                : base(callingMethodName: callingMethodName)
             {
-                string defaultStorageLocation = getDefaultLocationFor(name);
+                string defaultStorageLocation = getDefaultLocationFor(callingMethodName);
 
                 InitialStorage = new DesktopStorage(defaultStorageLocation, this);
                 InitialStorage.DeleteDirectory(string.Empty);

From 81f0a06fc41a5d3332303133ac885c4595717d5a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 17 Sep 2020 16:30:34 +0900
Subject: [PATCH 04808/10326] Fix potential endless taiko beatmap conversion

---
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 2a1aa5d1df..e6f6b9faac 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -8,6 +8,7 @@ using osu.Game.Rulesets.Taiko.Objects;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
@@ -87,6 +88,9 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                     {
                         List<IList<HitSampleInfo>> allSamples = obj is IHasPathWithRepeats curveData ? curveData.NodeSamples : new List<IList<HitSampleInfo>>(new[] { samples });
 
+                        if (Precision.AlmostEquals(0, tickSpacing))
+                            yield break;
+
                         int i = 0;
 
                         for (double j = obj.StartTime; j <= obj.StartTime + taikoDuration + tickSpacing / 8; j += tickSpacing)

From 73a7b759cb048146ff1afb27e63367c5eb95eb27 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 17 Sep 2020 17:04:44 +0900
Subject: [PATCH 04809/10326] Add missing obsoletion notice

---
 osu.Game/Rulesets/Objects/HitObject.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 1d60b266e3..0dfde834ee 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -145,6 +145,7 @@ namespace osu.Game.Rulesets.Objects
 #pragma warning restore 618
         }
 
+        [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
         protected virtual void CreateNestedHitObjects()
         {
         }

From 009e1b44450309991b4e660fef58b41a4df4ad58 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 17 Sep 2020 17:05:24 +0900
Subject: [PATCH 04810/10326] Make Spinner use cancellation token

---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 1658a4e7c2..194aa640f9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.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.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
@@ -48,14 +49,16 @@ namespace osu.Game.Rulesets.Osu.Objects
             MaximumBonusSpins = (int)((maximum_rotations_per_second - minimumRotationsPerSecond) * secondsDuration);
         }
 
-        protected override void CreateNestedHitObjects()
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
-            base.CreateNestedHitObjects();
+            base.CreateNestedHitObjects(cancellationToken);
 
             int totalSpins = MaximumBonusSpins + SpinsRequired;
 
             for (int i = 0; i < totalSpins; i++)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 double startTime = StartTime + (float)(i + 1) / totalSpins * Duration;
 
                 AddNested(i < SpinsRequired

From c7d24203ceb00022fe10d74be6e81d9434e89d6c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 17 Sep 2020 17:40:05 +0900
Subject: [PATCH 04811/10326] Make beatmap conversion support cancellation
 tokens

---
 .../Beatmaps/CatchBeatmapConverter.cs         |  3 ++-
 .../Beatmaps/ManiaBeatmapConverter.cs         |  7 ++++---
 .../Beatmaps/OsuBeatmapConverter.cs           |  3 ++-
 .../Beatmaps/TaikoBeatmapConverter.cs         |  7 ++++---
 .../TestSceneDrawableScrollingRuleset.cs      |  3 ++-
 osu.Game/Beatmaps/BeatmapConverter.cs         | 21 +++++++++----------
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs      |  3 ++-
 osu.Game/Beatmaps/IBeatmapConverter.cs        |  5 ++++-
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  2 +-
 9 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 145a40f5f5..34964fc4ae 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -5,6 +5,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Objects;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -20,7 +21,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
         public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition);
 
-        protected override IEnumerable<CatchHitObject> ConvertHitObject(HitObject obj, IBeatmap beatmap)
+        protected override IEnumerable<CatchHitObject> ConvertHitObject(HitObject obj, IBeatmap beatmap, CancellationToken cancellationToken)
         {
             var positionData = obj as IHasXPosition;
             var comboData = obj as IHasCombo;
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 211905835c..524ea27efa 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -5,6 +5,7 @@ using osu.Game.Rulesets.Mania.Objects;
 using System;
 using System.Linq;
 using System.Collections.Generic;
+using System.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
@@ -68,14 +69,14 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
         public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition);
 
-        protected override Beatmap<ManiaHitObject> ConvertBeatmap(IBeatmap original)
+        protected override Beatmap<ManiaHitObject> ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
         {
             BeatmapDifficulty difficulty = original.BeatmapInfo.BaseDifficulty;
 
             int seed = (int)MathF.Round(difficulty.DrainRate + difficulty.CircleSize) * 20 + (int)(difficulty.OverallDifficulty * 41.2) + (int)MathF.Round(difficulty.ApproachRate);
             Random = new FastRandom(seed);
 
-            return base.ConvertBeatmap(original);
+            return base.ConvertBeatmap(original, cancellationToken);
         }
 
         protected override Beatmap<ManiaHitObject> CreateBeatmap()
@@ -88,7 +89,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             return beatmap;
         }
 
-        protected override IEnumerable<ManiaHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap)
+        protected override IEnumerable<ManiaHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
         {
             if (original is ManiaHitObject maniaOriginal)
             {
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
index fcad356a1c..a2fc4848af 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -8,6 +8,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Objects.Types;
 using System.Linq;
+using System.Threading;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Framework.Extensions.IEnumerableExtensions;
 
@@ -22,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
 
         public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasPosition);
 
-        protected override IEnumerable<OsuHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap)
+        protected override IEnumerable<OsuHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
         {
             var positionData = original as IHasPosition;
             var comboData = original as IHasCombo;
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 2a1aa5d1df..91e31aeced 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -8,6 +8,7 @@ using osu.Game.Rulesets.Taiko.Objects;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
@@ -48,14 +49,14 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
         public override bool CanConvert() => true;
 
-        protected override Beatmap<TaikoHitObject> ConvertBeatmap(IBeatmap original)
+        protected override Beatmap<TaikoHitObject> ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
         {
             // Rewrite the beatmap info to add the slider velocity multiplier
             original.BeatmapInfo = original.BeatmapInfo.Clone();
             original.BeatmapInfo.BaseDifficulty = original.BeatmapInfo.BaseDifficulty.Clone();
             original.BeatmapInfo.BaseDifficulty.SliderMultiplier *= LEGACY_VELOCITY_MULTIPLIER;
 
-            Beatmap<TaikoHitObject> converted = base.ConvertBeatmap(original);
+            Beatmap<TaikoHitObject> converted = base.ConvertBeatmap(original, cancellationToken);
 
             if (original.BeatmapInfo.RulesetID == 3)
             {
@@ -72,7 +73,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             return converted;
         }
 
-        protected override IEnumerable<TaikoHitObject> ConvertHitObject(HitObject obj, IBeatmap beatmap)
+        protected override IEnumerable<TaikoHitObject> ConvertHitObject(HitObject obj, IBeatmap beatmap, CancellationToken cancellationToken)
         {
             // Old osu! used hit sounding to determine various hit type information
             IList<HitSampleInfo> samples = obj.Samples;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index bd7e894cf8..1a1babb4a8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -276,7 +277,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public override bool CanConvert() => true;
 
-            protected override IEnumerable<TestHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap)
+            protected override IEnumerable<TestHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
             {
                 yield return new TestHitObject
                 {
diff --git a/osu.Game/Beatmaps/BeatmapConverter.cs b/osu.Game/Beatmaps/BeatmapConverter.cs
index 11fee030f8..3083cee07e 100644
--- a/osu.Game/Beatmaps/BeatmapConverter.cs
+++ b/osu.Game/Beatmaps/BeatmapConverter.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 
@@ -36,34 +37,31 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public abstract bool CanConvert();
 
-        /// <summary>
-        /// Converts <see cref="Beatmap"/>.
-        /// </summary>
-        /// <returns>The converted Beatmap.</returns>
-        public IBeatmap Convert()
+        public IBeatmap Convert(CancellationToken cancellationToken = default)
         {
             // We always operate on a clone of the original beatmap, to not modify it game-wide
-            return ConvertBeatmap(Beatmap.Clone());
+            return ConvertBeatmap(Beatmap.Clone(), cancellationToken);
         }
 
         /// <summary>
         /// Performs the conversion of a Beatmap using this Beatmap Converter.
         /// </summary>
         /// <param name="original">The un-converted Beatmap.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The converted Beatmap.</returns>
-        protected virtual Beatmap<T> ConvertBeatmap(IBeatmap original)
+        protected virtual Beatmap<T> ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
         {
             var beatmap = CreateBeatmap();
 
             beatmap.BeatmapInfo = original.BeatmapInfo;
             beatmap.ControlPointInfo = original.ControlPointInfo;
-            beatmap.HitObjects = convertHitObjects(original.HitObjects, original).OrderBy(s => s.StartTime).ToList();
+            beatmap.HitObjects = convertHitObjects(original.HitObjects, original, cancellationToken).OrderBy(s => s.StartTime).ToList();
             beatmap.Breaks = original.Breaks;
 
             return beatmap;
         }
 
-        private List<T> convertHitObjects(IReadOnlyList<HitObject> hitObjects, IBeatmap beatmap)
+        private List<T> convertHitObjects(IReadOnlyList<HitObject> hitObjects, IBeatmap beatmap, CancellationToken cancellationToken)
         {
             var result = new List<T>(hitObjects.Count);
 
@@ -75,7 +73,7 @@ namespace osu.Game.Beatmaps
                     continue;
                 }
 
-                var converted = ConvertHitObject(obj, beatmap);
+                var converted = ConvertHitObject(obj, beatmap, cancellationToken);
 
                 if (ObjectConverted != null)
                 {
@@ -104,7 +102,8 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="original">The hit object to convert.</param>
         /// <param name="beatmap">The un-converted Beatmap.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The converted hit object.</returns>
-        protected abstract IEnumerable<T> ConvertHitObject(HitObject original, IBeatmap beatmap);
+        protected abstract IEnumerable<T> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken);
     }
 }
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index af2a2ac250..fdc839ccff 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using JetBrains.Annotations;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
@@ -76,7 +77,7 @@ namespace osu.Game.Beatmaps
 
                     public bool CanConvert() => true;
 
-                    public IBeatmap Convert()
+                    public IBeatmap Convert(CancellationToken cancellationToken)
                     {
                         foreach (var obj in Beatmap.HitObjects)
                             ObjectConverted?.Invoke(obj, obj.Yield());
diff --git a/osu.Game/Beatmaps/IBeatmapConverter.cs b/osu.Game/Beatmaps/IBeatmapConverter.cs
index 173d5494ba..83d0ada1b9 100644
--- a/osu.Game/Beatmaps/IBeatmapConverter.cs
+++ b/osu.Game/Beatmaps/IBeatmapConverter.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 
@@ -30,6 +31,8 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Converts <see cref="Beatmap"/>.
         /// </summary>
-        IBeatmap Convert();
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The converted Beatmap.</returns>
+        IBeatmap Convert(CancellationToken cancellationToken);
     }
 }
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index d9780233d1..30382c444f 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Beatmaps
                 }
 
                 // Convert
-                IBeatmap converted = converter.Convert();
+                IBeatmap converted = converter.Convert(cancellationSource.Token);
 
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())

From e71991a53c068cb86bdc77396d7a6ec40640a9fe Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 17 Sep 2020 18:37:48 +0900
Subject: [PATCH 04812/10326] Add default token

---
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs | 2 +-
 osu.Game/Beatmaps/IBeatmapConverter.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index fdc839ccff..c114358771 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Beatmaps
 
                     public bool CanConvert() => true;
 
-                    public IBeatmap Convert(CancellationToken cancellationToken)
+                    public IBeatmap Convert(CancellationToken cancellationToken = default)
                     {
                         foreach (var obj in Beatmap.HitObjects)
                             ObjectConverted?.Invoke(obj, obj.Yield());
diff --git a/osu.Game/Beatmaps/IBeatmapConverter.cs b/osu.Game/Beatmaps/IBeatmapConverter.cs
index 83d0ada1b9..2833af8ca2 100644
--- a/osu.Game/Beatmaps/IBeatmapConverter.cs
+++ b/osu.Game/Beatmaps/IBeatmapConverter.cs
@@ -33,6 +33,6 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The converted Beatmap.</returns>
-        IBeatmap Convert(CancellationToken cancellationToken);
+        IBeatmap Convert(CancellationToken cancellationToken = default);
     }
 }

From de5ef8a4715dc1c138c6cd3aba93f02765bdae95 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 17 Sep 2020 21:36:55 +0900
Subject: [PATCH 04813/10326] Rework to support obsoletion

---
 osu.Game/Beatmaps/BeatmapConverter.cs | 34 ++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapConverter.cs b/osu.Game/Beatmaps/BeatmapConverter.cs
index 3083cee07e..cb0b3a8d09 100644
--- a/osu.Game/Beatmaps/BeatmapConverter.cs
+++ b/osu.Game/Beatmaps/BeatmapConverter.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Beatmaps
 
         public IBeatmap Beatmap { get; }
 
+        private CancellationToken cancellationToken;
+
         protected BeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
         {
             Beatmap = beatmap;
@@ -39,6 +41,8 @@ namespace osu.Game.Beatmaps
 
         public IBeatmap Convert(CancellationToken cancellationToken = default)
         {
+            this.cancellationToken = cancellationToken;
+
             // We always operate on a clone of the original beatmap, to not modify it game-wide
             return ConvertBeatmap(Beatmap.Clone(), cancellationToken);
         }
@@ -51,6 +55,19 @@ namespace osu.Game.Beatmaps
         /// <returns>The converted Beatmap.</returns>
         protected virtual Beatmap<T> ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
         {
+#pragma warning disable 618
+            return ConvertBeatmap(original);
+#pragma warning restore 618
+        }
+
+        /// <summary>
+        /// Performs the conversion of a Beatmap using this Beatmap Converter.
+        /// </summary>
+        /// <param name="original">The un-converted Beatmap.</param>
+        /// <returns>The converted Beatmap.</returns>
+        [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
+        protected virtual Beatmap<T> ConvertBeatmap(IBeatmap original)
+        {
             var beatmap = CreateBeatmap();
 
             beatmap.BeatmapInfo = original.BeatmapInfo;
@@ -104,6 +121,21 @@ namespace osu.Game.Beatmaps
         /// <param name="beatmap">The un-converted Beatmap.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The converted hit object.</returns>
-        protected abstract IEnumerable<T> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken);
+        protected virtual IEnumerable<T> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
+        {
+#pragma warning disable 618
+            return ConvertHitObject(original, beatmap);
+#pragma warning restore 618
+        }
+
+        /// <summary>
+        /// Performs the conversion of a hit object.
+        /// This method is generally executed sequentially for all objects in a beatmap.
+        /// </summary>
+        /// <param name="original">The hit object to convert.</param>
+        /// <param name="beatmap">The un-converted Beatmap.</param>
+        /// <returns>The converted hit object.</returns>
+        [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
+        protected virtual IEnumerable<T> ConvertHitObject(HitObject original, IBeatmap beatmap) => Enumerable.Empty<T>();
     }
 }

From 83d23c954712e401758a2591ceff241c2384ae14 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 17 Sep 2020 14:56:08 -0700
Subject: [PATCH 04814/10326] Use new icon in chat overlay

---
 osu.Game/Overlays/ChatOverlay.cs  | 11 ++++++-----
 osu.Game/Overlays/OverlayTitle.cs |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 25a59e9b25..c53eccf78b 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -23,6 +23,7 @@ using osu.Game.Overlays.Chat.Selection;
 using osu.Game.Overlays.Chat.Tabs;
 using osuTK.Input;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 
 namespace osu.Game.Overlays
 {
@@ -78,7 +79,7 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, OsuColour colours)
+        private void load(OsuConfigManager config, OsuColour colours, TextureStore textures)
         {
             const float padding = 5;
 
@@ -163,13 +164,13 @@ namespace osu.Game.Overlays
                                     RelativeSizeAxes = Axes.Both,
                                     Colour = Color4.Black,
                                 },
-                                new SpriteIcon
+                                new Sprite
                                 {
-                                    Icon = FontAwesome.Solid.Comments,
+                                    Texture = textures.Get(IconTexture),
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
-                                    Size = new Vector2(20),
-                                    Margin = new MarginPadding(10),
+                                    Size = new Vector2(OverlayTitle.ICON_SIZE),
+                                    Margin = new MarginPadding { Left = 10 },
                                 },
                                 ChannelTabControl = CreateChannelTabControl().With(d =>
                                 {
diff --git a/osu.Game/Overlays/OverlayTitle.cs b/osu.Game/Overlays/OverlayTitle.cs
index 17eeece1f8..c3ea35adfc 100644
--- a/osu.Game/Overlays/OverlayTitle.cs
+++ b/osu.Game/Overlays/OverlayTitle.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Overlays
 {
     public abstract class OverlayTitle : CompositeDrawable, INamedOverlayComponent
     {
+        public const float ICON_SIZE = 30;
+
         private readonly OsuSpriteText titleText;
         private readonly Container icon;
 
@@ -51,7 +53,7 @@ namespace osu.Game.Overlays
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Margin = new MarginPadding { Horizontal = 5 }, // compensates for osu-web sprites having around 5px of whitespace on each side
-                        Size = new Vector2(30)
+                        Size = new Vector2(ICON_SIZE)
                     },
                     titleText = new OsuSpriteText
                     {

From 2ad7e6ca880ec24bc87d0ee3e8bfa6cba8a478b4 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 17 Sep 2020 19:10:58 -0700
Subject: [PATCH 04815/10326] Fix hovered channel tabs color when unselected

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

diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs
index 09dc06b95f..cca4dc33e5 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Overlays.Chat.Tabs
 
             TweenEdgeEffectTo(deactivateEdgeEffect, TRANSITION_LENGTH);
 
-            box.FadeColour(BackgroundInactive, TRANSITION_LENGTH, Easing.OutQuint);
+            box.FadeColour(IsHovered ? backgroundHover : BackgroundInactive, TRANSITION_LENGTH, Easing.OutQuint);
             highlightBox.FadeOut(TRANSITION_LENGTH, Easing.OutQuint);
 
             Text.Font = Text.Font.With(weight: FontWeight.Medium);

From c62e4ef5e5b81954db33625748179186947bf53a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Sep 2020 13:06:41 +0900
Subject: [PATCH 04816/10326] Allow one hitobject in taiko beatmap converter
 edge case

---
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 9e82161a61..ed7b8589ba 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -89,9 +89,6 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                     {
                         List<IList<HitSampleInfo>> allSamples = obj is IHasPathWithRepeats curveData ? curveData.NodeSamples : new List<IList<HitSampleInfo>>(new[] { samples });
 
-                        if (Precision.AlmostEquals(0, tickSpacing))
-                            yield break;
-
                         int i = 0;
 
                         for (double j = obj.StartTime; j <= obj.StartTime + taikoDuration + tickSpacing / 8; j += tickSpacing)
@@ -109,6 +106,9 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                             };
 
                             i = (i + 1) % allSamples.Count;
+
+                            if (Precision.AlmostEquals(0, tickSpacing))
+                                break;
                         }
                     }
                     else

From 393ee1c9f5e4719efc9eb35ee97752cd7ae6d4ba Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 17 Sep 2020 23:09:09 -0700
Subject: [PATCH 04817/10326] Fix hovered osu tab items not showing hover state
 when deselected

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

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 61501b0cd8..dbcce9a84a 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -123,8 +123,8 @@ namespace osu.Game.Graphics.UserInterface
 
             protected void FadeUnhovered()
             {
-                Bar.FadeOut(transition_length, Easing.OutQuint);
-                Text.FadeColour(AccentColour, transition_length, Easing.OutQuint);
+                Bar.FadeTo(IsHovered ? 1 : 0, transition_length, Easing.OutQuint);
+                Text.FadeColour(IsHovered ? Color4.White : AccentColour, transition_length, Easing.OutQuint);
             }
 
             protected override bool OnHover(HoverEvent e)

From 3cef93ee27dac06ea85c761bc4c24f19e17637ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Sep 2020 18:05:33 +0900
Subject: [PATCH 04818/10326] Centralise import test helper methods

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 50 ++++++--------
 .../Collections/IO/ImportCollectionsTest.cs   | 62 ++---------------
 osu.Game.Tests/ImportTest.cs                  | 66 +++++++++++++++++++
 .../NonVisual/CustomDataDirectoryTest.cs      | 47 +++----------
 osu.Game.Tests/Scores/IO/ImportScoreTest.cs   | 55 ++++------------
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs     | 56 ++++------------
 6 files changed, 129 insertions(+), 207 deletions(-)
 create mode 100644 osu.Game.Tests/ImportTest.cs

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index bc6fbed07a..80fbda8e1d 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -28,7 +28,7 @@ using FileInfo = System.IO.FileInfo;
 namespace osu.Game.Tests.Beatmaps.IO
 {
     [TestFixture]
-    public class ImportBeatmapTest
+    public class ImportBeatmapTest : ImportTest
     {
         [Test]
         public async Task TestImportWhenClosed()
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    await LoadOszIntoOsu(loadOsu(host));
+                    await LoadOszIntoOsu(LoadOsuIntoHost(host));
                 }
                 finally
                 {
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var imported = await LoadOszIntoOsu(osu);
 
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var imported = await LoadOszIntoOsu(osu);
                     var importedSecondTime = await LoadOszIntoOsu(osu);
@@ -102,7 +102,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var temp = TestResources.GetTestBeatmapForImport();
 
@@ -160,7 +160,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var temp = TestResources.GetTestBeatmapForImport();
 
@@ -211,7 +211,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var temp = TestResources.GetTestBeatmapForImport();
 
@@ -263,7 +263,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var imported = await LoadOszIntoOsu(osu);
 
@@ -314,7 +314,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                             Interlocked.Increment(ref loggedExceptionCount);
                     };
 
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
                     // ReSharper disable once AccessToModifiedClosure
@@ -382,7 +382,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var imported = await LoadOszIntoOsu(osu);
 
@@ -410,7 +410,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var imported = await LoadOszIntoOsu(osu);
 
@@ -444,7 +444,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var metadata = new BeatmapMetadata
                     {
@@ -504,7 +504,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     Assert.IsTrue(host.IsPrimaryInstance);
                     Assert.IsFalse(client.IsPrimaryInstance);
 
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var temp = TestResources.GetTestBeatmapForImport();
 
@@ -530,7 +530,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
                     var temp = TestResources.GetTestBeatmapForImport();
                     using (File.OpenRead(temp))
                         await osu.Dependencies.Get<BeatmapManager>().Import(temp);
@@ -552,7 +552,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var temp = TestResources.GetTestBeatmapForImport();
 
@@ -594,7 +594,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var temp = TestResources.GetTestBeatmapForImport();
 
@@ -639,7 +639,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     var temp = TestResources.GetTestBeatmapForImport();
 
@@ -693,7 +693,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
                     var temp = TestResources.GetTestBeatmapForImport();
@@ -723,7 +723,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
                     var temp = TestResources.GetTestBeatmapForImport();
@@ -765,7 +765,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
                     var working = manager.CreateNew(new OsuRuleset().RulesetInfo, User.SYSTEM_USER);
@@ -792,7 +792,7 @@ namespace osu.Game.Tests.Beatmaps.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
                     var working = manager.CreateNew(new OsuRuleset().RulesetInfo, User.SYSTEM_USER);
@@ -863,14 +863,6 @@ namespace osu.Game.Tests.Beatmaps.IO
             Assert.AreEqual(expected, osu.Dependencies.Get<FileStore>().QueryFiles(f => f.ReferenceCount == 1).Count());
         }
 
-        private OsuGameBase loadOsu(GameHost host)
-        {
-            var osu = new OsuGameBase();
-            Task.Run(() => host.Run(osu));
-            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
-            return osu;
-        }
-
         private static void ensureLoaded(OsuGameBase osu, int timeout = 60000)
         {
             IEnumerable<BeatmapSetInfo> resultSets = null;
diff --git a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
index a79e0d0338..a8ee1bcc2e 100644
--- a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
+++ b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
@@ -4,18 +4,15 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Platform;
-using osu.Game.Collections;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Collections.IO
 {
     [TestFixture]
-    public class ImportCollectionsTest
+    public class ImportCollectionsTest : ImportTest
     {
         [Test]
         public async Task TestImportEmptyDatabase()
@@ -24,7 +21,7 @@ namespace osu.Game.Tests.Collections.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     await osu.CollectionManager.Import(new MemoryStream());
 
@@ -44,7 +41,7 @@ namespace osu.Game.Tests.Collections.IO
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     await osu.CollectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
@@ -70,7 +67,7 @@ namespace osu.Game.Tests.Collections.IO
             {
                 try
                 {
-                    var osu = loadOsu(host, true);
+                    var osu = LoadOsuIntoHost(host, true);
 
                     await osu.CollectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
@@ -101,7 +98,7 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     AppDomain.CurrentDomain.UnhandledException += setException;
 
-                    var osu = loadOsu(host, true);
+                    var osu = LoadOsuIntoHost(host, true);
 
                     using (var ms = new MemoryStream())
                     {
@@ -135,7 +132,7 @@ namespace osu.Game.Tests.Collections.IO
             {
                 try
                 {
-                    var osu = loadOsu(host, true);
+                    var osu = LoadOsuIntoHost(host, true);
 
                     await osu.CollectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
@@ -156,7 +153,7 @@ namespace osu.Game.Tests.Collections.IO
             {
                 try
                 {
-                    var osu = loadOsu(host, true);
+                    var osu = LoadOsuIntoHost(host, true);
 
                     Assert.That(osu.CollectionManager.Collections.Count, Is.EqualTo(2));
 
@@ -172,50 +169,5 @@ namespace osu.Game.Tests.Collections.IO
                 }
             }
         }
-
-        private TestOsuGameBase loadOsu(GameHost host, bool withBeatmap = false)
-        {
-            var osu = new TestOsuGameBase(withBeatmap);
-
-#pragma warning disable 4014
-            Task.Run(() => host.Run(osu));
-#pragma warning restore 4014
-
-            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
-
-            return osu;
-        }
-
-        private void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 60000)
-        {
-            Task task = Task.Run(() =>
-            {
-                while (!result()) Thread.Sleep(200);
-            });
-
-            Assert.IsTrue(task.Wait(timeout), failureMessage);
-        }
-
-        private class TestOsuGameBase : OsuGameBase
-        {
-            public CollectionManager CollectionManager { get; private set; }
-
-            private readonly bool withBeatmap;
-
-            public TestOsuGameBase(bool withBeatmap)
-            {
-                this.withBeatmap = withBeatmap;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                // Beatmap must be imported before the collection manager is loaded.
-                if (withBeatmap)
-                    BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
-
-                AddInternal(CollectionManager = new CollectionManager(Storage));
-            }
-        }
     }
 }
diff --git a/osu.Game.Tests/ImportTest.cs b/osu.Game.Tests/ImportTest.cs
new file mode 100644
index 0000000000..ea351e0d45
--- /dev/null
+++ b/osu.Game.Tests/ImportTest.cs
@@ -0,0 +1,66 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Platform;
+using osu.Game.Collections;
+using osu.Game.Tests.Resources;
+
+namespace osu.Game.Tests
+{
+    public abstract class ImportTest
+    {
+        protected virtual TestOsuGameBase LoadOsuIntoHost(GameHost host, bool withBeatmap = false)
+        {
+            var osu = new TestOsuGameBase(withBeatmap);
+            Task.Run(() => host.Run(osu));
+
+            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
+
+            bool ready = false;
+            // wait for two update frames to be executed. this ensures that all components have had a change to run LoadComplete and hopefully avoid
+            // database access (GlobalActionContainer is one to do this).
+            host.UpdateThread.Scheduler.Add(() => host.UpdateThread.Scheduler.Add(() => ready = true));
+
+            waitForOrAssert(() => ready, @"osu! failed to start in a reasonable amount of time");
+
+            return osu;
+        }
+
+        private void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 60000)
+        {
+            Task task = Task.Run(() =>
+            {
+                while (!result()) Thread.Sleep(200);
+            });
+
+            Assert.IsTrue(task.Wait(timeout), failureMessage);
+        }
+
+        public class TestOsuGameBase : OsuGameBase
+        {
+            public CollectionManager CollectionManager { get; private set; }
+
+            private readonly bool withBeatmap;
+
+            public TestOsuGameBase(bool withBeatmap)
+            {
+                this.withBeatmap = withBeatmap;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                // Beatmap must be imported before the collection manager is loaded.
+                if (withBeatmap)
+                    BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+
+                AddInternal(CollectionManager = new CollectionManager(Storage));
+            }
+        }
+    }
+}
diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 211fa4ca42..b6ab73eceb 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -5,8 +5,6 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework;
 using osu.Framework.Allocation;
@@ -18,7 +16,7 @@ using osu.Game.IO;
 namespace osu.Game.Tests.NonVisual
 {
     [TestFixture]
-    public class CustomDataDirectoryTest
+    public class CustomDataDirectoryTest : ImportTest
     {
         [Test]
         public void TestDefaultDirectory()
@@ -29,7 +27,7 @@ namespace osu.Game.Tests.NonVisual
                 {
                     string defaultStorageLocation = getDefaultLocationFor(nameof(TestDefaultDirectory));
 
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
                     var storage = osu.Dependencies.Get<Storage>();
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
@@ -53,7 +51,7 @@ namespace osu.Game.Tests.NonVisual
 
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     // switch to DI'd storage
                     var storage = osu.Dependencies.Get<Storage>();
@@ -79,7 +77,7 @@ namespace osu.Game.Tests.NonVisual
 
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     // switch to DI'd storage
                     var storage = osu.Dependencies.Get<Storage>();
@@ -111,7 +109,7 @@ namespace osu.Game.Tests.NonVisual
                 {
                     string defaultStorageLocation = getDefaultLocationFor(nameof(TestMigration));
 
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
                     var storage = osu.Dependencies.Get<Storage>();
 
                     // Store the current storage's path. We'll need to refer to this for assertions in the original directory after the migration completes.
@@ -170,7 +168,7 @@ namespace osu.Game.Tests.NonVisual
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     const string database_filename = "client.db";
 
@@ -199,7 +197,7 @@ namespace osu.Game.Tests.NonVisual
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     Assert.DoesNotThrow(() => osu.Migrate(customPath));
                     Assert.Throws<ArgumentException>(() => osu.Migrate(customPath));
@@ -220,7 +218,7 @@ namespace osu.Game.Tests.NonVisual
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     Assert.DoesNotThrow(() => osu.Migrate(customPath));
 
@@ -249,7 +247,7 @@ namespace osu.Game.Tests.NonVisual
             {
                 try
                 {
-                    var osu = loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     Assert.DoesNotThrow(() => osu.Migrate(customPath));
 
@@ -269,33 +267,6 @@ namespace osu.Game.Tests.NonVisual
             }
         }
 
-        private OsuGameBase loadOsu(GameHost host)
-        {
-            var osu = new OsuGameBase();
-            Task.Run(() => host.Run(osu));
-
-            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
-
-            bool ready = false;
-            // wait for two update frames to be executed. this ensures that all components have had a change to run LoadComplete and hopefully avoid
-            // database access (GlobalActionContainer is one to do this).
-            host.UpdateThread.Scheduler.Add(() => host.UpdateThread.Scheduler.Add(() => ready = true));
-
-            waitForOrAssert(() => ready, @"osu! failed to start in a reasonable amount of time");
-
-            return osu;
-        }
-
-        private static void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 60000)
-        {
-            Task task = Task.Run(() =>
-            {
-                while (!result()) Thread.Sleep(200);
-            });
-
-            Assert.IsTrue(task.Wait(timeout), failureMessage);
-        }
-
         private static string getDefaultLocationFor(string testTypeName)
         {
             string path = Path.Combine(RuntimeInfo.StartupDirectory, "headless", testTypeName);
diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index a4d20714fa..7522aca5dc 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -17,12 +16,11 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Tests.Resources;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Scores.IO
 {
-    public class ImportScoreTest
+    public class ImportScoreTest : ImportTest
     {
         [Test]
         public async Task TestBasicImport()
@@ -31,7 +29,7 @@ namespace osu.Game.Tests.Scores.IO
             {
                 try
                 {
-                    var osu = await loadOsu(host);
+                    var osu = LoadOsuIntoHost(host, true);
 
                     var toImport = new ScoreInfo
                     {
@@ -45,7 +43,7 @@ namespace osu.Game.Tests.Scores.IO
                         OnlineScoreID = 12345,
                     };
 
-                    var imported = await loadIntoOsu(osu, toImport);
+                    var imported = await loadScoreIntoOsu(osu, toImport);
 
                     Assert.AreEqual(toImport.Rank, imported.Rank);
                     Assert.AreEqual(toImport.TotalScore, imported.TotalScore);
@@ -70,14 +68,14 @@ namespace osu.Game.Tests.Scores.IO
             {
                 try
                 {
-                    var osu = await loadOsu(host);
+                    var osu = LoadOsuIntoHost(host, true);
 
                     var toImport = new ScoreInfo
                     {
                         Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
                     };
 
-                    var imported = await loadIntoOsu(osu, toImport);
+                    var imported = await loadScoreIntoOsu(osu, toImport);
 
                     Assert.IsTrue(imported.Mods.Any(m => m is OsuModHardRock));
                     Assert.IsTrue(imported.Mods.Any(m => m is OsuModDoubleTime));
@@ -96,7 +94,7 @@ namespace osu.Game.Tests.Scores.IO
             {
                 try
                 {
-                    var osu = await loadOsu(host);
+                    var osu = LoadOsuIntoHost(host, true);
 
                     var toImport = new ScoreInfo
                     {
@@ -107,7 +105,7 @@ namespace osu.Game.Tests.Scores.IO
                         }
                     };
 
-                    var imported = await loadIntoOsu(osu, toImport);
+                    var imported = await loadScoreIntoOsu(osu, toImport);
 
                     Assert.AreEqual(toImport.Statistics[HitResult.Perfect], imported.Statistics[HitResult.Perfect]);
                     Assert.AreEqual(toImport.Statistics[HitResult.Miss], imported.Statistics[HitResult.Miss]);
@@ -126,7 +124,7 @@ namespace osu.Game.Tests.Scores.IO
             {
                 try
                 {
-                    var osu = await loadOsu(host);
+                    var osu = LoadOsuIntoHost(host, true);
 
                     var toImport = new ScoreInfo
                     {
@@ -138,7 +136,7 @@ namespace osu.Game.Tests.Scores.IO
                         }
                     };
 
-                    var imported = await loadIntoOsu(osu, toImport);
+                    var imported = await loadScoreIntoOsu(osu, toImport);
 
                     var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
                     var scoreManager = osu.Dependencies.Get<ScoreManager>();
@@ -146,7 +144,7 @@ namespace osu.Game.Tests.Scores.IO
                     beatmapManager.Delete(beatmapManager.QueryBeatmapSet(s => s.Beatmaps.Any(b => b.ID == imported.Beatmap.ID)));
                     Assert.That(scoreManager.Query(s => s.ID == imported.ID).DeletePending, Is.EqualTo(true));
 
-                    var secondImport = await loadIntoOsu(osu, imported);
+                    var secondImport = await loadScoreIntoOsu(osu, imported);
                     Assert.That(secondImport, Is.Null);
                 }
                 finally
@@ -163,9 +161,9 @@ namespace osu.Game.Tests.Scores.IO
             {
                 try
                 {
-                    var osu = await loadOsu(host);
+                    var osu = LoadOsuIntoHost(host, true);
 
-                    await loadIntoOsu(osu, new ScoreInfo { OnlineScoreID = 2 }, new TestArchiveReader());
+                    await loadScoreIntoOsu(osu, new ScoreInfo { OnlineScoreID = 2 }, new TestArchiveReader());
 
                     var scoreManager = osu.Dependencies.Get<ScoreManager>();
 
@@ -179,7 +177,7 @@ namespace osu.Game.Tests.Scores.IO
             }
         }
 
-        private async Task<ScoreInfo> loadIntoOsu(OsuGameBase osu, ScoreInfo score, ArchiveReader archive = null)
+        private async Task<ScoreInfo> loadScoreIntoOsu(OsuGameBase osu, ScoreInfo score, ArchiveReader archive = null)
         {
             var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
 
@@ -192,33 +190,6 @@ namespace osu.Game.Tests.Scores.IO
             return scoreManager.GetAllUsableScores().FirstOrDefault();
         }
 
-        private async Task<OsuGameBase> loadOsu(GameHost host)
-        {
-            var osu = new OsuGameBase();
-
-#pragma warning disable 4014
-            Task.Run(() => host.Run(osu));
-#pragma warning restore 4014
-
-            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
-
-            var beatmapFile = TestResources.GetTestBeatmapForImport();
-            var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
-            await beatmapManager.Import(beatmapFile);
-
-            return osu;
-        }
-
-        private void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 60000)
-        {
-            Task task = Task.Run(() =>
-            {
-                while (!result()) Thread.Sleep(200);
-            });
-
-            Assert.IsTrue(task.Wait(timeout), failureMessage);
-        }
-
         private class TestArchiveReader : ArchiveReader
         {
             public TestArchiveReader()
diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index ef5ff0e75d..a5b4b04ef5 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -4,20 +4,17 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Platform;
-using osu.Game.Beatmaps;
 using osu.Game.IO.Archives;
 using osu.Game.Skinning;
-using osu.Game.Tests.Resources;
 using SharpCompress.Archives.Zip;
 
 namespace osu.Game.Tests.Skins.IO
 {
-    public class ImportSkinTest
+    public class ImportSkinTest : ImportTest
     {
         [Test]
         public async Task TestBasicImport()
@@ -26,9 +23,9 @@ namespace osu.Game.Tests.Skins.IO
             {
                 try
                 {
-                    var osu = await loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
-                    var imported = await loadIntoOsu(osu, new ZipArchiveReader(createOsk("test skin", "skinner"), "skin.osk"));
+                    var imported = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("test skin", "skinner"), "skin.osk"));
 
                     Assert.That(imported.Name, Is.EqualTo("test skin"));
                     Assert.That(imported.Creator, Is.EqualTo("skinner"));
@@ -47,10 +44,10 @@ namespace osu.Game.Tests.Skins.IO
             {
                 try
                 {
-                    var osu = await loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
-                    var imported = await loadIntoOsu(osu, new ZipArchiveReader(createOsk("test skin", "skinner"), "skin.osk"));
-                    var imported2 = await loadIntoOsu(osu, new ZipArchiveReader(createOsk("test skin", "skinner"), "skin2.osk"));
+                    var imported = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("test skin", "skinner"), "skin.osk"));
+                    var imported2 = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("test skin", "skinner"), "skin2.osk"));
 
                     Assert.That(imported2.ID, Is.Not.EqualTo(imported.ID));
                     Assert.That(osu.Dependencies.Get<SkinManager>().GetAllUserSkins().Count, Is.EqualTo(1));
@@ -72,11 +69,11 @@ namespace osu.Game.Tests.Skins.IO
             {
                 try
                 {
-                    var osu = await loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
                     // if a user downloads two skins that do have skin.ini files but don't have any creator metadata in the skin.ini, they should both import separately just for safety.
-                    var imported = await loadIntoOsu(osu, new ZipArchiveReader(createOsk(string.Empty, string.Empty), "download.osk"));
-                    var imported2 = await loadIntoOsu(osu, new ZipArchiveReader(createOsk(string.Empty, string.Empty), "download.osk"));
+                    var imported = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk(string.Empty, string.Empty), "download.osk"));
+                    var imported2 = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk(string.Empty, string.Empty), "download.osk"));
 
                     Assert.That(imported2.ID, Is.Not.EqualTo(imported.ID));
                     Assert.That(osu.Dependencies.Get<SkinManager>().GetAllUserSkins().Count, Is.EqualTo(2));
@@ -98,10 +95,10 @@ namespace osu.Game.Tests.Skins.IO
             {
                 try
                 {
-                    var osu = await loadOsu(host);
+                    var osu = LoadOsuIntoHost(host);
 
-                    var imported = await loadIntoOsu(osu, new ZipArchiveReader(createOsk("test skin v2", "skinner"), "skin.osk"));
-                    var imported2 = await loadIntoOsu(osu, new ZipArchiveReader(createOsk("test skin v2.1", "skinner"), "skin2.osk"));
+                    var imported = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("test skin v2", "skinner"), "skin.osk"));
+                    var imported2 = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("test skin v2.1", "skinner"), "skin2.osk"));
 
                     Assert.That(imported2.ID, Is.Not.EqualTo(imported.ID));
                     Assert.That(osu.Dependencies.Get<SkinManager>().GetAllUserSkins().Count, Is.EqualTo(2));
@@ -141,37 +138,10 @@ namespace osu.Game.Tests.Skins.IO
             return stream;
         }
 
-        private async Task<SkinInfo> loadIntoOsu(OsuGameBase osu, ArchiveReader archive = null)
+        private async Task<SkinInfo> loadSkinIntoOsu(OsuGameBase osu, ArchiveReader archive = null)
         {
             var skinManager = osu.Dependencies.Get<SkinManager>();
             return await skinManager.Import(archive);
         }
-
-        private async Task<OsuGameBase> loadOsu(GameHost host)
-        {
-            var osu = new OsuGameBase();
-
-#pragma warning disable 4014
-            Task.Run(() => host.Run(osu));
-#pragma warning restore 4014
-
-            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
-
-            var beatmapFile = TestResources.GetTestBeatmapForImport();
-            var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
-            await beatmapManager.Import(beatmapFile);
-
-            return osu;
-        }
-
-        private void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 60000)
-        {
-            Task task = Task.Run(() =>
-            {
-                while (!result()) Thread.Sleep(200);
-            });
-
-            Assert.IsTrue(task.Wait(timeout), failureMessage);
-        }
     }
 }

From 1fcf443314f2d75d34d791d4a13c8a2e3af8547f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Sep 2020 19:33:03 +0900
Subject: [PATCH 04819/10326] Ensure BeatmapProcessor.PostProcess is run before
 firing HitObjectUpdated events

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 3a9bd85b0f..3248c5b8be 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -207,14 +207,15 @@ namespace osu.Game.Screens.Edit
                 beatmapProcessor?.PreProcess();
 
                 foreach (var hitObject in pendingUpdates)
-                {
                     processHitObject(hitObject);
-                    HitObjectUpdated?.Invoke(hitObject);
-                }
-
-                pendingUpdates.Clear();
 
                 beatmapProcessor?.PostProcess();
+
+                // explicitly needs to be fired after PostProcess
+                foreach (var hitObject in pendingUpdates)
+                    HitObjectUpdated?.Invoke(hitObject);
+
+                pendingUpdates.Clear();
             }
         }
 

From 735b6b0d6ffd51dc96d9b74c6e5a07af5193aed4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 19 Sep 2020 05:54:06 +0300
Subject: [PATCH 04820/10326] Remove a pointless portion of the inline comment

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

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 9e49134806..ba14049b41 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -140,8 +140,7 @@ namespace osu.Game.Skinning
 
             samplesContainer.ChildrenEnumerable = channels.Select(c => new DrawableSample(c));
 
-            // Sample channels have been reloaded to new ones because skin has changed.
-            // Start playback internally for them if they were playing previously.
+            // Start playback internally for the new samples if the previous ones were playing beforehand.
             if (wasPlaying)
                 play();
         }

From b3ffd36b656ea39a6d5b6d3cb2a344716c67aa17 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 19 Sep 2020 05:55:28 +0300
Subject: [PATCH 04821/10326] Use lambda expression instead

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 5f39a57d8a..eb3636ab66 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -123,10 +123,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
             AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
 
-            AddStep("trigger skin change", () =>
-            {
-                skinSource.TriggerSourceChanged();
-            });
+            AddStep("trigger skin change", () => skinSource.TriggerSourceChanged());
 
             AddStep("retrieve new sample", () =>
             {

From 1e1422c16a52219c1a2b9c79f546172d1a943e6a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 19 Sep 2020 05:55:39 +0300
Subject: [PATCH 04822/10326] Samples don't get paused...

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index eb3636ab66..ab66ee252c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 sample = newSample;
             });
 
-            AddAssert("new sample paused", () => !sample.Playing);
+            AddAssert("new sample stopped", () => !sample.Playing);
             AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
 
             AddWaitStep("wait a bit", 5);

From 522e2cdbcdf41c3e7816caa51032ee30bf6ca6c6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 19 Sep 2020 05:56:35 +0300
Subject: [PATCH 04823/10326] Avoid embedding NUnit Assert inside test steps if
 possible

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index ab66ee252c..ed75d83151 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -125,11 +125,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("trigger skin change", () => skinSource.TriggerSourceChanged());
 
-            AddStep("retrieve new sample", () =>
+            AddAssert("retrieve and ensure current sample is different", () =>
             {
-                DrawableSample newSample = skinnableSound.ChildrenOfType<DrawableSample>().Single();
-                Assert.IsTrue(newSample != sample, "Sample still hasn't been updated after a skin change event");
-                sample = newSample;
+                DrawableSample oldSample = sample;
+                sample = skinnableSound.ChildrenOfType<DrawableSample>().Single();
+                return sample != oldSample;
             });
 
             AddAssert("new sample stopped", () => !sample.Playing);

From 847ec8c248e640227d781e06ab4f3188d7c3c3b5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Sep 2020 14:52:05 +0900
Subject: [PATCH 04824/10326] Fix n^2 characteristic in taiko diffcalc

---
 .../Preprocessing/StaminaCheeseDetector.cs      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
index d07bff4369..3b1a9ad777 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/StaminaCheeseDetector.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.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -67,6 +68,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
             // as that index can be simply subtracted from the current index to get the number of elements in between
             // without off-by-one errors
             int indexBeforeLastRepeat = -1;
+            int lastMarkEnd = 0;
 
             for (int i = 0; i < hitObjects.Count; i++)
             {
@@ -87,7 +89,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
                 if (repeatedLength < roll_min_repetitions)
                     continue;
 
-                markObjectsAsCheese(i, repeatedLength);
+                markObjectsAsCheese(Math.Max(lastMarkEnd, i - repeatedLength + 1), i);
+                lastMarkEnd = i;
             }
         }
 
@@ -113,6 +116,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
         private void findTlTap(int parity, HitType type)
         {
             int tlLength = -2;
+            int lastMarkEnd = 0;
 
             for (int i = parity; i < hitObjects.Count; i += 2)
             {
@@ -124,17 +128,18 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
                 if (tlLength < tl_min_repetitions)
                     continue;
 
-                markObjectsAsCheese(i, tlLength);
+                markObjectsAsCheese(Math.Max(lastMarkEnd, i - tlLength + 1), i);
+                lastMarkEnd = i;
             }
         }
 
         /// <summary>
-        /// Marks <paramref name="count"/> elements counting backwards from <paramref name="end"/> as <see cref="TaikoDifficultyHitObject.StaminaCheese"/>.
+        /// Marks all objects from <paramref name="start"/> to <paramref name="end"/> (inclusive) as <see cref="TaikoDifficultyHitObject.StaminaCheese"/>.
         /// </summary>
-        private void markObjectsAsCheese(int end, int count)
+        private void markObjectsAsCheese(int start, int end)
         {
-            for (int i = 0; i < count; ++i)
-                hitObjects[end - i].StaminaCheese = true;
+            for (int i = start; i <= end; i++)
+                hitObjects[i].StaminaCheese = true;
         }
     }
 }

From e0cef6686d5b80c53d460d540ab4843c12471d30 Mon Sep 17 00:00:00 2001
From: S Stewart <tilda@users.noreply.github.com>
Date: Sat, 19 Sep 2020 14:54:14 -0500
Subject: [PATCH 04825/10326] Change collection deletion notif to be consistent

---
 osu.Game/Collections/CollectionManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index a50ab5b07a..f96a689faf 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -12,6 +12,7 @@ using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
@@ -230,7 +231,7 @@ namespace osu.Game.Collections
         public void DeleteAll()
         {
             Collections.Clear();
-            PostNotification?.Invoke(new SimpleNotification { Text = "Deleted all collections!" });
+            PostNotification?.Invoke(new ProgressCompletionNotification { Text = "Deleted all collections!"});
         }
 
         private readonly object saveLock = new object();

From c49dcca1ff9b2946efe38548ed5ffe7f4e8356b8 Mon Sep 17 00:00:00 2001
From: S Stewart <tilda@users.noreply.github.com>
Date: Sat, 19 Sep 2020 14:55:52 -0500
Subject: [PATCH 04826/10326] spacing oops

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

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index f96a689faf..5f0f52125b 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Collections
         public void DeleteAll()
         {
             Collections.Clear();
-            PostNotification?.Invoke(new ProgressCompletionNotification { Text = "Deleted all collections!"});
+            PostNotification?.Invoke(new ProgressCompletionNotification { Text = "Deleted all collections!" });
         }
 
         private readonly object saveLock = new object();

From d2f498a2689031099233203121e171c192fee810 Mon Sep 17 00:00:00 2001
From: S Stewart <tilda@users.noreply.github.com>
Date: Sat, 19 Sep 2020 15:13:52 -0500
Subject: [PATCH 04827/10326] remove unnec using

---
 osu.Game/Collections/CollectionManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 5f0f52125b..569ac749a4 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -12,7 +12,6 @@ using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;

From 026fc2023b9d47352ce302f5a1dff3747cec6245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Sep 2020 18:10:44 +0200
Subject: [PATCH 04828/10326] Add visual tests for strong hit explosions

---
 .../DrawableTestStrongHit.cs                  | 44 +++++++++++++++++++
 .../Skinning/TestSceneHitExplosion.cs         | 25 +++++++----
 2 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs
new file mode 100644
index 0000000000..7cb984b254
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.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 System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class DrawableTestStrongHit : DrawableHit
+    {
+        private readonly HitResult type;
+        private readonly bool hitBoth;
+
+        public DrawableTestStrongHit(double startTime, HitResult type = HitResult.Great, bool hitBoth = true)
+            : base(new Hit
+            {
+                IsStrong = true,
+                StartTime = startTime,
+            })
+        {
+            // in order to create nested strong hit
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            this.type = type;
+            this.hitBoth = hitBoth;
+        }
+
+        protected override void LoadAsyncComplete()
+        {
+            base.LoadAsyncComplete();
+
+            Result.Type = type;
+
+            var nestedStrongHit = (DrawableStrongNestedHit)NestedHitObjects.Single();
+            nestedStrongHit.Result.Type = hitBoth ? type : HitResult.Miss;
+        }
+
+        public override bool OnPressed(TaikoAction action) => false;
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index 2b5efec7f9..48969e0f5a 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Scoring;
@@ -15,24 +14,29 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     [TestFixture]
     public class TestSceneHitExplosion : TaikoSkinnableTestScene
     {
-        [BackgroundDependencyLoader]
-        private void load()
+        [Test]
+        public void TestNormalHit()
         {
-            AddStep("Great", () => SetContents(() => getContentFor(HitResult.Great)));
-            AddStep("Good", () => SetContents(() => getContentFor(HitResult.Good)));
-            AddStep("Miss", () => SetContents(() => getContentFor(HitResult.Miss)));
+            AddStep("Great", () => SetContents(() => getContentFor(createHit(HitResult.Great))));
+            AddStep("Good", () => SetContents(() => getContentFor(createHit(HitResult.Good))));
+            AddStep("Miss", () => SetContents(() => getContentFor(createHit(HitResult.Miss))));
         }
 
-        private Drawable getContentFor(HitResult type)
+        [Test]
+        public void TestStrongHit([Values(false, true)] bool hitBoth)
         {
-            DrawableTaikoHitObject hit;
+            AddStep("Great", () => SetContents(() => getContentFor(createStrongHit(HitResult.Great, hitBoth))));
+            AddStep("Good", () => SetContents(() => getContentFor(createStrongHit(HitResult.Good, hitBoth))));
+        }
 
+        private Drawable getContentFor(DrawableTaikoHitObject hit)
+        {
             return new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    hit = createHit(type),
+                    hit,
                     new HitExplosion(hit)
                     {
                         Anchor = Anchor.Centre,
@@ -43,5 +47,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         }
 
         private DrawableTaikoHitObject createHit(HitResult type) => new DrawableTestHit(new Hit { StartTime = Time.Current }, type);
+
+        private DrawableTaikoHitObject createStrongHit(HitResult type, bool hitBoth)
+            => new DrawableTestStrongHit(Time.Current, type, hitBoth);
     }
 }

From 919b19612f06e622c799a001ac65aa508a1b0cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Sep 2020 16:29:36 +0200
Subject: [PATCH 04829/10326] Add lookups for strong hit explosions

---
 .../Skinning/TaikoLegacySkinTransformer.cs                | 8 ++++++++
 osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs            | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index f032c5f485..c222ccb51f 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -75,7 +75,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     return null;
 
                 case TaikoSkinComponents.TaikoExplosionGood:
+                case TaikoSkinComponents.TaikoExplosionGoodStrong:
                 case TaikoSkinComponents.TaikoExplosionGreat:
+                case TaikoSkinComponents.TaikoExplosionGreatStrong:
                 case TaikoSkinComponents.TaikoExplosionMiss:
 
                     var sprite = this.GetAnimation(getHitName(taikoComponent.Component), true, false);
@@ -107,8 +109,14 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 case TaikoSkinComponents.TaikoExplosionGood:
                     return "taiko-hit100";
 
+                case TaikoSkinComponents.TaikoExplosionGoodStrong:
+                    return "taiko-hit100k";
+
                 case TaikoSkinComponents.TaikoExplosionGreat:
                     return "taiko-hit300";
+
+                case TaikoSkinComponents.TaikoExplosionGreatStrong:
+                    return "taiko-hit300k";
             }
 
             throw new ArgumentOutOfRangeException(nameof(component), "Invalid result type");
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index ac4fb51661..0d785adb4a 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -17,7 +17,9 @@ namespace osu.Game.Rulesets.Taiko
         BarLine,
         TaikoExplosionMiss,
         TaikoExplosionGood,
+        TaikoExplosionGoodStrong,
         TaikoExplosionGreat,
+        TaikoExplosionGreatStrong,
         Scroller,
         Mascot,
     }

From 074387c6763ed34c157fc85ef8a4b950e4b8a6ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Sep 2020 18:07:57 +0200
Subject: [PATCH 04830/10326] Show strong hit explosion where applicable

---
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs | 29 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index f0585b9c50..e3eabbf88f 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -9,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.UI
@@ -45,24 +47,41 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(JudgedObject.Result?.Type ?? HitResult.Great)), _ => new DefaultHitExplosion());
+            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(JudgedObject)), _ => new DefaultHitExplosion());
         }
 
-        private TaikoSkinComponents getComponentName(HitResult resultType)
+        private TaikoSkinComponents getComponentName(DrawableHitObject judgedObject)
         {
+            var resultType = judgedObject.Result?.Type ?? HitResult.Great;
+
             switch (resultType)
             {
                 case HitResult.Miss:
                     return TaikoSkinComponents.TaikoExplosionMiss;
 
                 case HitResult.Good:
-                    return TaikoSkinComponents.TaikoExplosionGood;
+                    return useStrongExplosion(judgedObject)
+                        ? TaikoSkinComponents.TaikoExplosionGoodStrong
+                        : TaikoSkinComponents.TaikoExplosionGood;
 
                 case HitResult.Great:
-                    return TaikoSkinComponents.TaikoExplosionGreat;
+                    return useStrongExplosion(judgedObject)
+                        ? TaikoSkinComponents.TaikoExplosionGreatStrong
+                        : TaikoSkinComponents.TaikoExplosionGreat;
             }
 
-            throw new ArgumentOutOfRangeException(nameof(resultType), "Invalid result type");
+            throw new ArgumentOutOfRangeException(nameof(judgedObject), "Invalid result type");
+        }
+
+        private bool useStrongExplosion(DrawableHitObject judgedObject)
+        {
+            if (!(judgedObject.HitObject is Hit))
+                return false;
+
+            if (!(judgedObject.NestedHitObjects.SingleOrDefault() is DrawableStrongNestedHit nestedHit))
+                return false;
+
+            return judgedObject.Result.Type == nestedHit.Result.Type;
         }
 
         /// <summary>

From 1c7556ea5d67793c6f363a6e661b2d042896baf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Sep 2020 19:38:57 +0200
Subject: [PATCH 04831/10326] Schedule explosion addition to ensure both hits
 are processed

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index dabdfe6f44..0e241be2bd 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -218,12 +218,16 @@ namespace osu.Game.Rulesets.Taiko.UI
         private void addDrumRollHit(DrawableDrumRollTick drawableTick) =>
             drumRollHitContainer.Add(new DrawableFlyingHit(drawableTick));
 
-        private void addExplosion(DrawableHitObject drawableObject, HitType type)
+        /// <remarks>
+        /// As legacy skins have different explosions for singular and double strong hits,
+        /// explosion addition is scheduled to ensure that both hits are processed if they occur on the same frame.
+        /// </remarks>
+        private void addExplosion(DrawableHitObject drawableObject, HitType type) => Schedule(() =>
         {
             hitExplosionContainer.Add(new HitExplosion(drawableObject));
             if (drawableObject.HitObject.Kiai)
                 kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
-        }
+        });
 
         private class ProxyContainer : LifetimeManagementContainer
         {

From 4072abaed8ba980a5890656f6aa20b693cecf295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Sep 2020 16:26:33 +0200
Subject: [PATCH 04832/10326] Allow miss explosions to be displayed

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 0e241be2bd..7976d5bc6d 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -205,9 +205,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                         X = result.IsHit ? judgedObject.Position.X : 0,
                     });
 
-                    if (!result.IsHit)
-                        break;
-
                     var type = (judgedObject.HitObject as Hit)?.Type ?? HitType.Centre;
 
                     addExplosion(judgedObject, type);

From a0573af0e1edd56f58f8af59674de1ad95fa067a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Sep 2020 20:44:31 +0200
Subject: [PATCH 04833/10326] Fix test failure due to uninitialised drawable
 hit object

---
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 44452d70c1..99d1b72ea4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -174,7 +174,9 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private void addMissJudgement()
         {
-            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(new DrawableTestHit(new Hit()), new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = HitResult.Miss });
+            DrawableTestHit h;
+            Add(h = new DrawableTestHit(new Hit(), HitResult.Miss));
+            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = HitResult.Miss });
         }
 
         private void addBarLine(bool major, double delay = scroll_time)

From 5b697580afcf26ce430d6dc7abc991f7a1769946 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Sep 2020 16:38:16 +0900
Subject: [PATCH 04834/10326] Add mention of ruleset templates to readme

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d3e9ca5121..7c749f3422 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,13 @@ If you are looking to install or test osu! without setting up a development envi
 
 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
+## Developing a custom ruleset
+
+osu! is designed to have extensible modular gameplay modes, called "rulesets". Building one of these allows a developer to harness the power of osu! for their own game style. To get started working on a ruleset, we have some templates available [here](https://github.com/ppy/osu-templates).
+
+You can see some examples of custom rulesets by visiting the [custom ruleset directory](https://github.com/ppy/osu/issues/5852).
+
+## Developing osu!
 
 Please make sure you have the following prerequisites:
 

From 842f8bea55bce02fffffe3980719a871c6d0422f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Sep 2020 18:15:33 +0900
Subject: [PATCH 04835/10326] Fix bindings not correctly being cleaned up in
 OsuHitObjectComposer

---
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index f87bd53ec3..6513334977 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -46,13 +46,20 @@ namespace osu.Game.Rulesets.Osu.Edit
             distanceSnapToggle
         };
 
+        private BindableList<HitObject> selectedHitObjects;
+
+        private Bindable<HitObject> placementObject;
+
         [BackgroundDependencyLoader]
         private void load()
         {
             LayerBelowRuleset.Add(distanceSnapGridContainer = new Container { RelativeSizeAxes = Axes.Both });
 
-            EditorBeatmap.SelectedHitObjects.CollectionChanged += (_, __) => updateDistanceSnapGrid();
-            EditorBeatmap.PlacementObject.ValueChanged += _ => updateDistanceSnapGrid();
+            selectedHitObjects = EditorBeatmap.SelectedHitObjects.GetBoundCopy();
+            selectedHitObjects.CollectionChanged += (_, __) => updateDistanceSnapGrid();
+
+            placementObject = EditorBeatmap.PlacementObject.GetBoundCopy();
+            placementObject.ValueChanged += _ => updateDistanceSnapGrid();
             distanceSnapToggle.ValueChanged += _ => updateDistanceSnapGrid();
         }
 

From dd5b15c64fb422ca50475b879ec9130f55f528e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Sep 2020 18:27:15 +0900
Subject: [PATCH 04836/10326] Fix HitObjectContainer not correctly unbinding
 from startTime fast enough

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index f4f66f1272..9a0217a1eb 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -43,10 +43,20 @@ namespace osu.Game.Rulesets.UI
             return true;
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            unbindStartTimeMap();
+        }
+
         public virtual void Clear(bool disposeChildren = true)
         {
             ClearInternal(disposeChildren);
+            unbindStartTimeMap();
+        }
 
+        private void unbindStartTimeMap()
+        {
             foreach (var kvp in startTimeMap)
                 kvp.Value.bindable.UnbindAll();
             startTimeMap.Clear();

From 0cecb2bba348e9d178704d911339ba6df7a1b26b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Sep 2020 19:33:19 +0900
Subject: [PATCH 04837/10326] Remove incorrect assumption from tests

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index f7909071ea..9e78185272 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
@@ -194,13 +193,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addSeekStep(0);
 
-            AddStep("adjust track rate", () => MusicController.CurrentTrack.AddAdjustment(AdjustableProperty.Tempo, new BindableDouble(rate)));
-            // autoplay replay frames use track time;
-            // if a spin takes 1000ms in track time and we're playing with a 2x rate adjustment, the spin will take 500ms of *real* time.
-            // therefore we need to apply the rate adjustment to the replay itself to change from track time to real time,
-            // as real time is what we care about for spinners
-            // (so we're making the spin take 1000ms in real time *always*, regardless of the track clock's rate).
-            transformReplay(replay => applyRateAdjustment(replay, rate));
+            AddStep("adjust track rate", () => Player.GameplayClockContainer.UserPlaybackRate.Value = rate);
 
             addSeekStep(1000);
             AddAssert("progress almost same", () => Precision.AlmostEquals(expectedProgress, drawableSpinner.Progress, 0.05));

From 3f788da06d0aa4379f8133ce319dcde18cabe1fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Sep 2020 19:39:54 +0900
Subject: [PATCH 04838/10326] Fix SPM changing incorrectly with playback rate
 changes

---
 .../Pieces/SpinnerRotationTracker.cs          |  7 +++-
 .../Rulesets/UI/FrameStabilityContainer.cs    |  8 +++-
 osu.Game/Screens/Play/GameplayClock.cs        | 24 +++++++++++
 .../Screens/Play/GameplayClockContainer.cs    | 42 +++++++++++++++++--
 4 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
index f1a782cbb5..e949017ccf 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
@@ -2,11 +2,13 @@
 // 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.Input.Events;
 using osu.Framework.Utils;
+using osu.Game.Screens.Play;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
@@ -77,6 +79,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private bool rotationTransferred;
 
+        [Resolved]
+        private GameplayClock gameplayClock { get; set; }
+
         protected override void Update()
         {
             base.Update();
@@ -126,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             currentRotation += angle;
             // rate has to be applied each frame, because it's not guaranteed to be constant throughout playback
             // (see: ModTimeRamp)
-            RateAdjustedRotation += (float)(Math.Abs(angle) * Clock.Rate);
+            RateAdjustedRotation += (float)(Math.Abs(angle) * gameplayClock.TrueGameplayRate);
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index d574991fa0..b585a78f42 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -2,7 +2,9 @@
 // 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.Framework.Timing;
@@ -59,7 +61,7 @@ namespace osu.Game.Rulesets.UI
         {
             if (clock != null)
             {
-                stabilityGameplayClock.ParentGameplayClock = parentGameplayClock = clock;
+                parentGameplayClock = stabilityGameplayClock.ParentGameplayClock = clock;
                 GameplayClock.IsPaused.BindTo(clock.IsPaused);
             }
         }
@@ -191,7 +193,9 @@ namespace osu.Game.Rulesets.UI
 
         private class StabilityGameplayClock : GameplayClock
         {
-            public IFrameBasedClock ParentGameplayClock;
+            public GameplayClock ParentGameplayClock;
+
+            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => ParentGameplayClock.NonGameplayAdjustments;
 
             public StabilityGameplayClock(FramedClock underlyingClock)
                 : base(underlyingClock)
diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index 4f2cf5005c..45da8816d6 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.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.Bindables;
 using osu.Framework.Timing;
 
@@ -20,6 +22,11 @@ namespace osu.Game.Screens.Play
 
         public readonly BindableBool IsPaused = new BindableBool();
 
+        /// <summary>
+        /// All adjustments applied to this clock which don't come from gameplay or mods.
+        /// </summary>
+        public virtual IEnumerable<Bindable<double>> NonGameplayAdjustments => Enumerable.Empty<Bindable<double>>();
+
         public GameplayClock(IFrameBasedClock underlyingClock)
         {
             this.underlyingClock = underlyingClock;
@@ -29,6 +36,23 @@ namespace osu.Game.Screens.Play
 
         public double Rate => underlyingClock.Rate;
 
+        /// <summary>
+        /// The rate of gameplay when playback is at 100%.
+        /// This excludes any seeking / user adjustments.
+        /// </summary>
+        public double TrueGameplayRate
+        {
+            get
+            {
+                double baseRate = Rate;
+
+                foreach (var adjustment in NonGameplayAdjustments)
+                    baseRate /= adjustment.Value;
+
+                return baseRate;
+            }
+        }
+
         public bool IsRunning => underlyingClock.IsRunning;
 
         /// <summary>
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 7a9cb3dddd..d5c3a7232f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.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.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
@@ -50,8 +51,10 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// The final clock which is exposed to underlying components.
         /// </summary>
-        [Cached]
-        public readonly GameplayClock GameplayClock;
+        public GameplayClock GameplayClock => localGameplayClock;
+
+        [Cached(typeof(GameplayClock))]
+        private readonly LocalGameplayClock localGameplayClock;
 
         private Bindable<double> userAudioOffset;
 
@@ -79,7 +82,7 @@ namespace osu.Game.Screens.Play
             userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
 
             // the clock to be exposed via DI to children.
-            GameplayClock = new GameplayClock(userOffsetClock);
+            localGameplayClock = new LocalGameplayClock(userOffsetClock);
 
             GameplayClock.IsPaused.BindTo(IsPaused);
         }
@@ -200,11 +203,26 @@ namespace osu.Game.Screens.Play
         protected override void Update()
         {
             if (!IsPaused.Value)
+            {
                 userOffsetClock.ProcessFrame();
+            }
 
             base.Update();
         }
 
+        private double getTrueGameplayRate()
+        {
+            double baseRate = track.Rate;
+
+            if (speedAdjustmentsApplied)
+            {
+                baseRate /= UserPlaybackRate.Value;
+                baseRate /= pauseFreqAdjust.Value;
+            }
+
+            return baseRate;
+        }
+
         private bool speedAdjustmentsApplied;
 
         private void updateRate()
@@ -215,6 +233,9 @@ namespace osu.Game.Screens.Play
             track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
+            localGameplayClock.MutableNonGameplayAdjustments.Add(pauseFreqAdjust);
+            localGameplayClock.MutableNonGameplayAdjustments.Add(UserPlaybackRate);
+
             speedAdjustmentsApplied = true;
         }
 
@@ -231,9 +252,24 @@ namespace osu.Game.Screens.Play
             track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
             track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
+            localGameplayClock.MutableNonGameplayAdjustments.Remove(pauseFreqAdjust);
+            localGameplayClock.MutableNonGameplayAdjustments.Remove(UserPlaybackRate);
+
             speedAdjustmentsApplied = false;
         }
 
+        public class LocalGameplayClock : GameplayClock
+        {
+            public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
+
+            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
+
+            public LocalGameplayClock(FramedOffsetClock underlyingClock)
+                : base(underlyingClock)
+            {
+            }
+        }
+
         private class HardwareCorrectionOffsetClock : FramedOffsetClock
         {
             // we always want to apply the same real-time offset, so it should be adjusted by the difference in playback rate (from realtime) to achieve this.

From 508278505f71a7b72531787364f8ece28f07f9d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Sep 2020 19:40:57 +0900
Subject: [PATCH 04839/10326] Make local clock private

---
 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 d5c3a7232f..4094de1c4f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -258,7 +258,7 @@ namespace osu.Game.Screens.Play
             speedAdjustmentsApplied = false;
         }
 
-        public class LocalGameplayClock : GameplayClock
+        private class LocalGameplayClock : GameplayClock
         {
             public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
 

From bfe332909c5312df0e1e338217463305a5a5b691 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 21 Sep 2020 14:25:36 +0300
Subject: [PATCH 04840/10326] Remove "hide combo counter on break time" feature
 for being too complex

The combo counter will be hidden at most one second after the break has started anyways, so why not just remove this feature if the way of implementing it is complicated to be merged within the legacy counter implementation.
---
 .../TestSceneComboCounter.cs                  | 15 --------------
 .../Skinning/LegacyComboCounter.cs            | 20 -------------------
 osu.Game/Screens/Play/GameplayBeatmap.cs      |  5 -----
 osu.Game/Screens/Play/Player.cs               |  1 -
 4 files changed, 41 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
index 89521d616d..e79792e04a 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
@@ -3,8 +3,6 @@
 
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Objects;
@@ -12,7 +10,6 @@ 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.Screens.Play;
 using osuTK;
 using osuTK.Graphics;
 
@@ -21,20 +18,9 @@ namespace osu.Game.Rulesets.Catch.Tests
     public class TestSceneComboCounter : CatchSkinnableTestScene
     {
         private ScoreProcessor scoreProcessor;
-        private GameplayBeatmap gameplayBeatmap;
-        private readonly Bindable<bool> isBreakTime = new BindableBool();
 
         private Color4 judgedObjectColour = Color4.White;
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            gameplayBeatmap = new GameplayBeatmap(CreateBeatmapForSkinProvider());
-            gameplayBeatmap.IsBreakTime.BindTo(isBreakTime);
-            Dependencies.Cache(gameplayBeatmap);
-            Add(gameplayBeatmap);
-        }
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -54,7 +40,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddRepeatStep("perform hit", () => performJudgement(HitResult.Perfect), 20);
             AddStep("perform miss", () => performJudgement(HitResult.Miss));
 
-            AddToggleStep("toggle gameplay break", v => isBreakTime.Value = v);
             AddStep("randomize judged object colour", () =>
             {
                 judgedObjectColour = new Color4(
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index ccfabdc5fd..6a10ba5eb3 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -1,12 +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.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -47,23 +44,6 @@ namespace osu.Game.Rulesets.Catch.Skinning
             };
         }
 
-        private IBindable<bool> isBreakTime;
-
-        [Resolved(canBeNull: true)]
-        private GameplayBeatmap beatmap { get; set; }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            isBreakTime = beatmap?.IsBreakTime.GetBoundCopy();
-            isBreakTime?.BindValueChanged(b =>
-            {
-                if (b.NewValue)
-                    this.FadeOut(400.0, Easing.OutQuint);
-            });
-        }
-
         public void DisplayInitialCombo(int combo) => updateCombo(combo, null, true);
         public void UpdateCombo(int combo, Color4? hitObjectColour) => updateCombo(combo, hitObjectColour, false);
 
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index d7eed73275..64894544f4 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -16,11 +16,6 @@ namespace osu.Game.Screens.Play
     {
         public readonly IBeatmap PlayableBeatmap;
 
-        /// <summary>
-        /// Whether the gameplay is currently in a break.
-        /// </summary>
-        public IBindable<bool> IsBreakTime { get; } = new Bindable<bool>();
-
         public GameplayBeatmap(IBeatmap playableBeatmap)
         {
             PlayableBeatmap = playableBeatmap;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 478f88ab11..539f9227a3 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -632,7 +632,6 @@ namespace osu.Game.Screens.Play
 
             // bind component bindables.
             Background.IsBreakTime.BindTo(breakTracker.IsBreakTime);
-            gameplayBeatmap.IsBreakTime.BindTo(breakTracker.IsBreakTime);
             DimmableStoryboard.IsBreakTime.BindTo(breakTracker.IsBreakTime);
 
             Background.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);

From 25bf160d942d8c1bdb6dac7951073a145fe57656 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Sep 2020 22:30:14 +0900
Subject: [PATCH 04841/10326] Fix missing GameplayClock in some tests

---
 .../Objects/Drawables/Pieces/SpinnerRotationTracker.cs        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
index e949017ccf..05ed38d241 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private bool rotationTransferred;
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private GameplayClock gameplayClock { get; set; }
 
         protected override void Update()
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             currentRotation += angle;
             // rate has to be applied each frame, because it's not guaranteed to be constant throughout playback
             // (see: ModTimeRamp)
-            RateAdjustedRotation += (float)(Math.Abs(angle) * gameplayClock.TrueGameplayRate);
+            RateAdjustedRotation += (float)(Math.Abs(angle) * (gameplayClock?.TrueGameplayRate ?? Clock.Rate));
         }
     }
 }

From f629c33dc0544e920aeb18f0de40d0e4e1ea9887 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 12:14:31 +0900
Subject: [PATCH 04842/10326] Make explosion additive to match stable

---
 osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index 6a10ba5eb3..cce8a81c00 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -89,6 +89,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
             var explosion = new LegacyRollingCounter(skin, fontName, fontOverlap)
             {
                 Alpha = 0.65f,
+                Blending = BlendingParameters.Additive,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Scale = new Vector2(1.5f),

From a27a65bf03d1a2d5ac3a8ef98a41f867ef4528d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 12:24:26 +0900
Subject: [PATCH 04843/10326] Don't recreate explosion counter each increment

---
 .../Skinning/LegacyComboCounter.cs            | 59 +++++++------------
 1 file changed, 22 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index cce8a81c00..c3231e1e55 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -16,19 +16,14 @@ namespace osu.Game.Rulesets.Catch.Skinning
     /// </summary>
     public class LegacyComboCounter : CompositeDrawable, ICatchComboCounter
     {
-        private readonly ISkin skin;
-
-        private readonly string fontName;
-        private readonly float fontOverlap;
-
         private readonly LegacyRollingCounter counter;
 
+        private readonly LegacyRollingCounter explosion;
+
         public LegacyComboCounter(ISkin skin)
         {
-            this.skin = skin;
-
-            fontName = skin.GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
-            fontOverlap = skin.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
+            var fontName = skin.GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
+            var fontOverlap = skin.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
 
             AutoSizeAxes = Axes.Both;
 
@@ -37,18 +32,27 @@ namespace osu.Game.Rulesets.Catch.Skinning
             Origin = Anchor.Centre;
             Scale = new Vector2(0.8f);
 
-            InternalChild = counter = new LegacyRollingCounter(skin, fontName, fontOverlap)
+            InternalChildren = new Drawable[]
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
+                explosion = new LegacyRollingCounter(skin, fontName, fontOverlap)
+                {
+                    Alpha = 0.65f,
+                    Blending = BlendingParameters.Additive,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(1.5f),
+                },
+                counter = new LegacyRollingCounter(skin, fontName, fontOverlap)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
             };
         }
 
         public void DisplayInitialCombo(int combo) => updateCombo(combo, null, true);
         public void UpdateCombo(int combo, Color4? hitObjectColour) => updateCombo(combo, hitObjectColour, false);
 
-        private LegacyRollingCounter lastExplosion;
-
         private void updateCombo(int combo, Color4? hitObjectColour, bool immediate)
         {
             // There may still be existing transforms to the counter (including value change after 250ms),
@@ -59,17 +63,12 @@ namespace osu.Game.Rulesets.Catch.Skinning
             if (combo == 0)
             {
                 counter.Current.Value = 0;
-                if (lastExplosion != null)
-                    lastExplosion.Current.Value = 0;
+                explosion.Current.Value = 0;
 
                 this.FadeOut(immediate ? 0.0 : 400.0, Easing.Out);
                 return;
             }
 
-            // Remove last explosion to not conflict with the upcoming one.
-            if (lastExplosion != null)
-                RemoveInternal(lastExplosion);
-
             this.FadeIn().Delay(1000.0).FadeOut(300.0);
 
             // For simplicity, in the case of rewinding we'll just set the counter to the current combo value.
@@ -86,25 +85,11 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
             counter.Delay(250.0).ScaleTo(1f).ScaleTo(1.1f, 60.0).Then().ScaleTo(1f, 30.0);
 
-            var explosion = new LegacyRollingCounter(skin, fontName, fontOverlap)
-            {
-                Alpha = 0.65f,
-                Blending = BlendingParameters.Additive,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Scale = new Vector2(1.5f),
-                Colour = hitObjectColour ?? Color4.White,
-                Depth = 1f,
-            };
-
-            AddInternal(explosion);
+            explosion.Colour = hitObjectColour ?? Color4.White;
 
             explosion.SetCountWithoutRolling(combo);
-            explosion.ScaleTo(1.9f, 400.0, Easing.Out)
-                     .FadeOut(400.0)
-                     .Expire(true);
-
-            lastExplosion = explosion;
+            explosion.ScaleTo(1.5f).ScaleTo(1.9f, 400.0, Easing.Out)
+                     .FadeOutFromOne(400.0);
         }
     }
 }

From 92cda6bccb2e2ae4e5ca461b92d0fa42322726f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 12:27:47 +0900
Subject: [PATCH 04844/10326] Adjust xmldoc slightly

---
 osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index c3231e1e55..320fc9c440 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -12,7 +12,7 @@ using static osu.Game.Skinning.LegacySkinConfiguration;
 namespace osu.Game.Rulesets.Catch.Skinning
 {
     /// <summary>
-    /// A combo counter implementation that visually behaves almost similar to osu!stable's combo counter.
+    /// A combo counter implementation that visually behaves almost similar to stable's osu!catch combo counter.
     /// </summary>
     public class LegacyComboCounter : CompositeDrawable, ICatchComboCounter
     {

From 08d8975566b9a3474c3df1b3882e86e49fd3f649 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 12:35:18 +0900
Subject: [PATCH 04845/10326] Remove DisplayInitialCombo method for simplicity

---
 .../Skinning/LegacyComboCounter.cs                   | 12 +++++++++---
 osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs      |  2 +-
 osu.Game.Rulesets.Catch/UI/ICatchComboCounter.cs     | 12 +-----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index 320fc9c440..047d9b3602 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -50,11 +50,17 @@ namespace osu.Game.Rulesets.Catch.Skinning
             };
         }
 
-        public void DisplayInitialCombo(int combo) => updateCombo(combo, null, true);
-        public void UpdateCombo(int combo, Color4? hitObjectColour) => updateCombo(combo, hitObjectColour, false);
+        private int lastDisplayedCombo;
 
-        private void updateCombo(int combo, Color4? hitObjectColour, bool immediate)
+        public void UpdateCombo(int combo, Color4? hitObjectColour = null)
         {
+            bool immediate = Time.Elapsed < 0;
+
+            if (combo == lastDisplayedCombo)
+                return;
+
+            lastDisplayedCombo = combo;
+
             // There may still be existing transforms to the counter (including value change after 250ms),
             // finish them immediately before new transforms.
             counter.FinishTransforms();
diff --git a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
index b53711e4ed..deb2cb99ed 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Catch.UI
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);
-            ComboCounter?.DisplayInitialCombo(currentCombo);
+            ComboCounter?.UpdateCombo(currentCombo);
         }
 
         public void OnNewResult(DrawableCatchHitObject judgedObject, JudgementResult result)
diff --git a/osu.Game.Rulesets.Catch/UI/ICatchComboCounter.cs b/osu.Game.Rulesets.Catch/UI/ICatchComboCounter.cs
index 1363ed1352..cfb6879067 100644
--- a/osu.Game.Rulesets.Catch/UI/ICatchComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/UI/ICatchComboCounter.cs
@@ -11,16 +11,6 @@ namespace osu.Game.Rulesets.Catch.UI
     /// </summary>
     public interface ICatchComboCounter : IDrawable
     {
-        /// <summary>
-        /// Updates the counter to display the provided <paramref name="combo"/> as initial value.
-        /// The value should be immediately displayed without any animation.
-        /// </summary>
-        /// <remarks>
-        /// This is required for when instantiating a combo counter in middle of accumulating combo (via skin change).
-        /// </remarks>
-        /// <param name="combo">The combo value to be displayed as initial.</param>
-        void DisplayInitialCombo(int combo);
-
         /// <summary>
         /// Updates the counter to animate a transition from the old combo value it had to the current provided one.
         /// </summary>
@@ -29,6 +19,6 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </remarks>
         /// <param name="combo">The new combo value.</param>
         /// <param name="hitObjectColour">The colour of the object if hit, null on miss.</param>
-        void UpdateCombo(int combo, Color4? hitObjectColour);
+        void UpdateCombo(int combo, Color4? hitObjectColour = null);
     }
 }

From ffd4874ac0f6e98df62d7e09520e8ce46cead0b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 12:37:18 +0900
Subject: [PATCH 04846/10326] Remove unnecessary double suffixes

---
 osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index 047d9b3602..5dcc532a08 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -86,16 +86,16 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 return;
             }
 
-            counter.ScaleTo(1.5f).ScaleTo(0.8f, 250.0, Easing.Out)
+            counter.ScaleTo(1.5f).ScaleTo(0.8f, 250, Easing.Out)
                    .OnComplete(c => c.SetCountWithoutRolling(combo));
 
-            counter.Delay(250.0).ScaleTo(1f).ScaleTo(1.1f, 60.0).Then().ScaleTo(1f, 30.0);
+            counter.Delay(250).ScaleTo(1f).ScaleTo(1.1f, 60).Then().ScaleTo(1f, 30);
 
             explosion.Colour = hitObjectColour ?? Color4.White;
 
             explosion.SetCountWithoutRolling(combo);
-            explosion.ScaleTo(1.5f).ScaleTo(1.9f, 400.0, Easing.Out)
-                     .FadeOutFromOne(400.0);
+            explosion.ScaleTo(1.5f).ScaleTo(1.9f, 400, Easing.Out)
+                     .FadeOutFromOne(400);
         }
     }
 }

From 1c58f568d61584ef5a5568b52c1eeefa9bcdf1d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 12:54:21 +0900
Subject: [PATCH 04847/10326] Simplify and reformat rewind/transform logic

---
 .../Skinning/LegacyComboCounter.cs            | 48 ++++++++-----------
 .../UI/CatchComboDisplay.cs                   |  6 ---
 2 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index 5dcc532a08..a87286da89 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -54,16 +54,14 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
         public void UpdateCombo(int combo, Color4? hitObjectColour = null)
         {
-            bool immediate = Time.Elapsed < 0;
-
             if (combo == lastDisplayedCombo)
                 return;
 
-            lastDisplayedCombo = combo;
-
             // There may still be existing transforms to the counter (including value change after 250ms),
             // finish them immediately before new transforms.
-            counter.FinishTransforms();
+            counter.SetCountWithoutRolling(lastDisplayedCombo);
+
+            lastDisplayedCombo = combo;
 
             // Combo fell to zero, roll down and fade out the counter.
             if (combo == 0)
@@ -71,31 +69,27 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 counter.Current.Value = 0;
                 explosion.Current.Value = 0;
 
-                this.FadeOut(immediate ? 0.0 : 400.0, Easing.Out);
-                return;
+                this.FadeOut(400, Easing.Out);
             }
-
-            this.FadeIn().Delay(1000.0).FadeOut(300.0);
-
-            // For simplicity, in the case of rewinding we'll just set the counter to the current combo value.
-            immediate |= Time.Elapsed < 0;
-
-            if (immediate)
+            else
             {
-                counter.SetCountWithoutRolling(combo);
-                return;
+                this.FadeInFromZero().Delay(1000).FadeOut(300);
+
+                counter.ScaleTo(1.5f)
+                       .ScaleTo(0.8f, 250, Easing.Out)
+                       .OnComplete(c => c.SetCountWithoutRolling(combo));
+
+                counter.Delay(250)
+                       .ScaleTo(1f)
+                       .ScaleTo(1.1f, 60).Then().ScaleTo(1f, 30);
+
+                explosion.Colour = hitObjectColour ?? Color4.White;
+
+                explosion.SetCountWithoutRolling(combo);
+                explosion.ScaleTo(1.5f)
+                         .ScaleTo(1.9f, 400, Easing.Out)
+                         .FadeOutFromOne(400);
             }
-
-            counter.ScaleTo(1.5f).ScaleTo(0.8f, 250, Easing.Out)
-                   .OnComplete(c => c.SetCountWithoutRolling(combo));
-
-            counter.Delay(250).ScaleTo(1f).ScaleTo(1.1f, 60).Then().ScaleTo(1f, 30);
-
-            explosion.Colour = hitObjectColour ?? Color4.White;
-
-            explosion.SetCountWithoutRolling(combo);
-            explosion.ScaleTo(1.5f).ScaleTo(1.9f, 400, Easing.Out)
-                     .FadeOutFromOne(400);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
index deb2cb99ed..58a3140bb5 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
@@ -50,12 +50,6 @@ namespace osu.Game.Rulesets.Catch.UI
             if (!result.Judgement.AffectsCombo || !result.HasResult)
                 return;
 
-            if (result.Type == HitResult.Miss)
-            {
-                updateCombo(result.ComboAtJudgement, null);
-                return;
-            }
-
             updateCombo(result.ComboAtJudgement, judgedObject.AccentColour.Value);
         }
 

From 1b261f177f8ea0f4b1ffc5bf554d5588daddeac6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 13:17:53 +0900
Subject: [PATCH 04848/10326] Disable rewind handling

---
 osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index a87286da89..c8abc9e832 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -63,6 +63,14 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
             lastDisplayedCombo = combo;
 
+            if (Time.Elapsed < 0)
+            {
+                // needs more work to make rewind somehow look good.
+                // basically we want the previous increment to play... or turning off RemoveCompletedTransforms (not feasible from a performance angle).
+                Hide();
+                return;
+            }
+
             // Combo fell to zero, roll down and fade out the counter.
             if (combo == 0)
             {
@@ -73,7 +81,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
             }
             else
             {
-                this.FadeInFromZero().Delay(1000).FadeOut(300);
+                this.FadeInFromZero().Then().Delay(1000).FadeOut(300);
 
                 counter.ScaleTo(1.5f)
                        .ScaleTo(0.8f, 250, Easing.Out)

From 7c40071b21d047d3f14e92a4d876d8d11e8fc4c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 13:32:00 +0900
Subject: [PATCH 04849/10326] Revert changes to SkinnableTestScene but change
 load order

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 33 ++++++++-------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 58e0b23fab..c0db05d5c5 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -153,38 +153,29 @@ namespace osu.Game.Tests.Visual
         {
             private readonly bool extrapolateAnimations;
 
-            private readonly HashSet<string> legacyFontPrefixes = new HashSet<string>();
-
             public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, bool extrapolateAnimations)
                 : base(skin, storage, audioManager, "skin.ini")
             {
                 this.extrapolateAnimations = extrapolateAnimations;
-
-                // use a direct string lookup instead of enum to avoid having to reference ruleset assemblies.
-                legacyFontPrefixes.Add(GetConfig<string, string>("HitCirclePrefix")?.Value ?? "default");
-                legacyFontPrefixes.Add(GetConfig<string, string>("ScorePrefix")?.Value ?? "score");
-                legacyFontPrefixes.Add(GetConfig<string, string>("ComboPrefix")?.Value ?? "score");
             }
 
             public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
+                var lookup = base.GetTexture(componentName, wrapModeS, wrapModeT);
+
+                if (lookup != null)
+                    return lookup;
+
                 // extrapolate frames to test longer animations
-                if (extrapolateAnimations && isAnimationComponent(componentName, out var number) && number < 60)
-                    return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), wrapModeS, wrapModeT);
+                if (extrapolateAnimations)
+                {
+                    var match = Regex.Match(componentName, "-([0-9]*)");
 
-                return base.GetTexture(componentName, wrapModeS, wrapModeT);
-            }
+                    if (match.Length > 0 && int.TryParse(match.Groups[1].Value, out var number) && number < 60)
+                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), wrapModeS, wrapModeT);
+                }
 
-            private bool isAnimationComponent(string componentName, out int number)
-            {
-                number = 0;
-
-                // legacy font glyph textures have the pattern "{fontPrefix}-{character}", which could be mistaken for an animation frame.
-                if (legacyFontPrefixes.Any(p => componentName.StartsWith($"{p}-")))
-                    return false;
-
-                var match = Regex.Match(componentName, "-([0-9]*)");
-                return match.Length > 0 && int.TryParse(match.Groups[1].Value, out number);
+                return null;
             }
         }
     }

From 552968f65f7c5451faef6c96c144efe3bcefce31 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 13:38:52 +0900
Subject: [PATCH 04850/10326] Remove unnecessary using

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

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index c0db05d5c5..a856789d96 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;

From 3276b9ae9cba2aaeb7b9d60001bfe05353931b0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 15:08:53 +0900
Subject: [PATCH 04851/10326] Fix fail animation breaking on post-fail
 judgements

---
 osu.Game/Screens/Play/FailAnimation.cs | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index 54c644c999..608f20affd 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -89,6 +89,8 @@ namespace osu.Game.Screens.Play
 
         private void applyToPlayfield(Playfield playfield)
         {
+            double failTime = playfield.Time.Current;
+
             foreach (var nested in playfield.NestedPlayfields)
                 applyToPlayfield(nested);
 
@@ -97,13 +99,29 @@ namespace osu.Game.Screens.Play
                 if (appliedObjects.Contains(obj))
                     continue;
 
-                obj.RotateTo(RNG.NextSingle(-90, 90), duration);
-                obj.ScaleTo(obj.Scale * 0.5f, duration);
-                obj.MoveToOffset(new Vector2(0, 400), duration);
+                float rotation = RNG.NextSingle(-90, 90);
+                Vector2 originalPosition = obj.Position;
+                Vector2 originalScale = obj.Scale;
+
+                dropOffScreen(obj, failTime, rotation, originalScale, originalPosition);
+
+                // need to reapply the fail drop after judgement state changes
+                obj.ApplyCustomUpdateState += (o, _) => dropOffScreen(obj, failTime, rotation, originalScale, originalPosition);
+
                 appliedObjects.Add(obj);
             }
         }
 
+        private void dropOffScreen(DrawableHitObject obj, double failTime, float randomRotation, Vector2 originalScale, Vector2 originalPosition)
+        {
+            using (obj.BeginAbsoluteSequence(failTime))
+            {
+                obj.RotateTo(randomRotation, duration);
+                obj.ScaleTo(originalScale * 0.5f, duration);
+                obj.MoveTo(originalPosition + new Vector2(0, 400), duration);
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 3062fe44113c0ea8ef8e829db291297eac7d0f65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 15:55:25 +0900
Subject: [PATCH 04852/10326] Add editor key bindings to switch between screens

---
 .../Input/Bindings/GlobalActionContainer.cs   | 27 +++++++++++++--
 .../KeyBinding/GlobalKeyBindingsSection.cs    | 12 +++++++
 osu.Game/Screens/Edit/Editor.cs               | 34 ++++++++++++++-----
 3 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 45b07581ec..3cabfce7bb 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Input.Bindings
                 handler = game;
         }
 
-        public override IEnumerable<KeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings);
+        public override IEnumerable<KeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings).Concat(EditorKeyBindings);
 
         public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {
@@ -50,6 +50,14 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.KeypadEnter, GlobalAction.Select),
         };
 
+        public IEnumerable<KeyBinding> EditorKeyBindings => new[]
+        {
+            new KeyBinding(new[] { InputKey.F1 }, GlobalAction.EditorComposeMode),
+            new KeyBinding(new[] { InputKey.F2 }, GlobalAction.EditorDesignMode),
+            new KeyBinding(new[] { InputKey.F3 }, GlobalAction.EditorTimingMode),
+            new KeyBinding(new[] { InputKey.F4 }, GlobalAction.EditorSetupMode),
+        };
+
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]
         {
             new KeyBinding(InputKey.Space, GlobalAction.SkipCutscene),
@@ -68,7 +76,7 @@ namespace osu.Game.Input.Bindings
             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.Mute, GlobalAction.ToggleMute),
 
             new KeyBinding(InputKey.TrackPrevious, GlobalAction.MusicPrev),
             new KeyBinding(InputKey.F1, GlobalAction.MusicPrev),
@@ -139,7 +147,7 @@ namespace osu.Game.Input.Bindings
         [Description("Quick exit (Hold)")]
         QuickExit,
 
-        // Game-wide beatmap msi ccotolle keybindings
+        // Game-wide beatmap music controller keybindings
         [Description("Next track")]
         MusicNext,
 
@@ -166,5 +174,18 @@ namespace osu.Game.Input.Bindings
 
         [Description("Pause")]
         PauseGameplay,
+
+        // Editor
+        [Description("Setup Mode")]
+        EditorSetupMode,
+
+        [Description("Compose Mode")]
+        EditorComposeMode,
+
+        [Description("Design Mode")]
+        EditorDesignMode,
+
+        [Description("Timing Mode")]
+        EditorTimingMode,
     }
 }
diff --git a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
index 5b44c486a3..9a27c55c53 100644
--- a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Overlays.KeyBinding
             Add(new DefaultBindingsSubsection(manager));
             Add(new AudioControlKeyBindingsSubsection(manager));
             Add(new InGameKeyBindingsSubsection(manager));
+            Add(new EditorKeyBindingsSubsection(manager));
         }
 
         private class DefaultBindingsSubsection : KeyBindingsSubsection
@@ -56,5 +57,16 @@ namespace osu.Game.Overlays.KeyBinding
                 Defaults = manager.AudioControlKeyBindings;
             }
         }
+
+        private class EditorKeyBindingsSubsection : KeyBindingsSubsection
+        {
+            protected override string Header => "Editor";
+
+            public EditorKeyBindingsSubsection(GlobalActionContainer manager)
+                : base(null)
+            {
+                Defaults = manager.EditorKeyBindings;
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 71340041f0..b7a59bc2e2 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -79,6 +79,8 @@ namespace osu.Game.Screens.Edit
         private EditorBeatmap editorBeatmap;
         private EditorChangeHandler changeHandler;
 
+        private EditorMenuBar menuBar;
+
         private DependencyContainer dependencies;
 
         protected override UserActivity InitialActivity => new UserActivity.Editing(Beatmap.Value.BeatmapInfo);
@@ -133,8 +135,6 @@ namespace osu.Game.Screens.Edit
 
             updateLastSavedHash();
 
-            EditorMenuBar menuBar;
-
             OsuMenuItem undoMenuItem;
             OsuMenuItem redoMenuItem;
 
@@ -374,14 +374,32 @@ namespace osu.Game.Screens.Edit
 
         public bool OnPressed(GlobalAction action)
         {
-            if (action == GlobalAction.Back)
+            switch (action)
             {
-                // as we don't want to display the back button, manual handling of exit action is required.
-                this.Exit();
-                return true;
-            }
+                case GlobalAction.Back:
+                    // as we don't want to display the back button, manual handling of exit action is required.
+                    this.Exit();
+                    return true;
 
-            return false;
+                case GlobalAction.EditorComposeMode:
+                    menuBar.Mode.Value = EditorScreenMode.Compose;
+                    return true;
+
+                case GlobalAction.EditorDesignMode:
+                    menuBar.Mode.Value = EditorScreenMode.Design;
+                    return true;
+
+                case GlobalAction.EditorTimingMode:
+                    menuBar.Mode.Value = EditorScreenMode.Timing;
+                    return true;
+
+                case GlobalAction.EditorSetupMode:
+                    menuBar.Mode.Value = EditorScreenMode.SongSetup;
+                    return true;
+
+                default:
+                    return false;
+            }
         }
 
         public void OnReleased(GlobalAction action)

From 8e432664600f4fb2c3ad2c19991ff61ae385fa5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 16:02:07 +0900
Subject: [PATCH 04853/10326] Fix compose mode not showing distance snap grid
 when entering with a selection

---
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index f87bd53ec3..f086b92b60 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -54,6 +54,9 @@ namespace osu.Game.Rulesets.Osu.Edit
             EditorBeatmap.SelectedHitObjects.CollectionChanged += (_, __) => updateDistanceSnapGrid();
             EditorBeatmap.PlacementObject.ValueChanged += _ => updateDistanceSnapGrid();
             distanceSnapToggle.ValueChanged += _ => updateDistanceSnapGrid();
+
+            // we may be entering the screen with a selection already active
+            updateDistanceSnapGrid();
         }
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)

From b1f7cfbd5b81b397dddf3487f23bf62a03fb1bc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 17:34:14 +0900
Subject: [PATCH 04854/10326] Reduce children levels in RingPiece

---
 .../Spinners/Components/SpinnerPiece.cs       |  6 +----
 .../Objects/Drawables/Pieces/RingPiece.cs     | 24 +++++++------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
index 65c8720031..2347d8a34c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
@@ -34,11 +34,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components
                     Alpha = 0.5f,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
-                ring = new RingPiece
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
-                }
+                ring = new RingPiece()
             };
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs
index 82e4383143..bcf64b81a6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
-    public class RingPiece : Container
+    public class RingPiece : CircularContainer
     {
         public RingPiece()
         {
@@ -18,21 +18,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            InternalChild = new CircularContainer
+            Masking = true;
+            BorderThickness = 10;
+            BorderColour = Color4.White;
+
+            Child = new Box
             {
-                Masking = true,
-                BorderThickness = 10,
-                BorderColour = Color4.White,
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        AlwaysPresent = true,
-                        Alpha = 0,
-                        RelativeSizeAxes = Axes.Both
-                    }
-                }
+                AlwaysPresent = true,
+                Alpha = 0,
+                RelativeSizeAxes = Axes.Both
             };
         }
     }

From e0a2321822f5ddd9c9a2cf443703bd4f38f62801 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Sep 2020 18:17:04 +0900
Subject: [PATCH 04855/10326] Reduce complexity of AllHitObjects enumerator
 when nested playfields are not present

---
 osu.Game/Rulesets/UI/Playfield.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index c52183f3f2..d92ba210db 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -37,7 +37,21 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// All the <see cref="DrawableHitObject"/>s contained in this <see cref="Playfield"/> and all <see cref="NestedPlayfields"/>.
         /// </summary>
-        public IEnumerable<DrawableHitObject> AllHitObjects => HitObjectContainer?.Objects.Concat(NestedPlayfields.SelectMany(p => p.AllHitObjects)) ?? Enumerable.Empty<DrawableHitObject>();
+        public IEnumerable<DrawableHitObject> AllHitObjects
+        {
+            get
+            {
+                if (HitObjectContainer == null)
+                    return Enumerable.Empty<DrawableHitObject>();
+
+                var enumerable = HitObjectContainer.Objects;
+
+                if (nestedPlayfields.IsValueCreated)
+                    enumerable = enumerable.Concat(NestedPlayfields.SelectMany(p => p.AllHitObjects));
+
+                return enumerable;
+            }
+        }
 
         /// <summary>
         /// All <see cref="Playfield"/>s nested inside this <see cref="Playfield"/>.

From 260ca31df038384f63d3addbbe83c013883dad18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 12:31:50 +0900
Subject: [PATCH 04856/10326] Change default mute key to Ctrl+F4 for now

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

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 3cabfce7bb..41be4cfcc3 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Alt, InputKey.Down }, GlobalAction.DecreaseVolume),
             new KeyBinding(new[] { InputKey.Alt, InputKey.MouseWheelDown }, GlobalAction.DecreaseVolume),
 
-            new KeyBinding(InputKey.Mute, GlobalAction.ToggleMute),
+            new KeyBinding(new[] { InputKey.Control, InputKey.F4 }, GlobalAction.ToggleMute),
 
             new KeyBinding(InputKey.TrackPrevious, GlobalAction.MusicPrev),
             new KeyBinding(InputKey.F1, GlobalAction.MusicPrev),

From c38cd50723a204bd2fecbe357f5fd81ef01e1ac0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 13:16:46 +0900
Subject: [PATCH 04857/10326] Fix editor not using beatmap combo colours
 initially on load

---
 .../Screens/Edit/EditorScreenWithTimeline.cs  |  1 +
 .../Skinning/BeatmapSkinProvidingContainer.cs | 58 +++++++++++++++----
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 67442aa55e..66d90809db 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -94,6 +94,7 @@ namespace osu.Game.Screens.Edit
                     }
                 },
             };
+
             LoadComponentAsync(CreateMainContent(), content =>
             {
                 spinner.State.Value = Visibility.Hidden;
diff --git a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
index 40335db697..fc01f0bd31 100644
--- a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Audio;
@@ -13,25 +14,62 @@ namespace osu.Game.Skinning
     /// </summary>
     public class BeatmapSkinProvidingContainer : SkinProvidingContainer
     {
-        private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
-        private readonly Bindable<bool> beatmapHitsounds = new Bindable<bool>();
+        private Bindable<bool> beatmapSkins;
+        private Bindable<bool> beatmapHitsounds;
 
-        protected override bool AllowConfigurationLookup => beatmapSkins.Value;
-        protected override bool AllowDrawableLookup(ISkinComponent component) => beatmapSkins.Value;
-        protected override bool AllowTextureLookup(string componentName) => beatmapSkins.Value;
-        protected override bool AllowSampleLookup(ISampleInfo componentName) => beatmapHitsounds.Value;
+        protected override bool AllowConfigurationLookup
+        {
+            get
+            {
+                if (beatmapSkins == null)
+                    throw new InvalidOperationException($"{nameof(BeatmapSkinProvidingContainer)} needs to be loaded before being consumed.");
+
+                return beatmapSkins.Value;
+            }
+        }
+
+        protected override bool AllowDrawableLookup(ISkinComponent component)
+        {
+            if (beatmapSkins == null)
+                throw new InvalidOperationException($"{nameof(BeatmapSkinProvidingContainer)} needs to be loaded before being consumed.");
+
+            return beatmapSkins.Value;
+        }
+
+        protected override bool AllowTextureLookup(string componentName)
+        {
+            if (beatmapSkins == null)
+                throw new InvalidOperationException($"{nameof(BeatmapSkinProvidingContainer)} needs to be loaded before being consumed.");
+
+            return beatmapSkins.Value;
+        }
+
+        protected override bool AllowSampleLookup(ISampleInfo componentName)
+        {
+            if (beatmapSkins == null)
+                throw new InvalidOperationException($"{nameof(BeatmapSkinProvidingContainer)} needs to be loaded before being consumed.");
+
+            return beatmapHitsounds.Value;
+        }
 
         public BeatmapSkinProvidingContainer(ISkin skin)
             : base(skin)
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
-            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
-            config.BindWith(OsuSetting.BeatmapHitsounds, beatmapHitsounds);
+            var config = parent.Get<OsuConfigManager>();
 
+            beatmapSkins = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
+            beatmapHitsounds = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
+
+            return base.CreateChildDependencies(parent);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             beatmapSkins.BindValueChanged(_ => TriggerSourceChanged());
             beatmapHitsounds.BindValueChanged(_ => TriggerSourceChanged());
         }

From ba160aab76bbdc32484f08fe1751a2f5bd2501d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 15:41:43 +0900
Subject: [PATCH 04858/10326] Fix large construction/disposal overhead on
 beatmaps with hitobjects at same point in time

---
 .../Drawables/Connections/FollowPointRenderer.cs  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index 4d73e711bb..11571ea761 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -46,7 +46,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         private void addConnection(FollowPointConnection 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)));
+            int index = connections.AddInPlace(connection, Comparer<FollowPointConnection>.Create((g1, g2) =>
+            {
+                int comp = g1.StartTime.Value.CompareTo(g2.StartTime.Value);
+
+                if (comp != 0)
+                    return comp;
+
+                // we always want to insert the new item after equal ones.
+                // this is important for beatmaps with multiple hitobjects at the same point in time.
+                // if we use standard comparison insert order, there will be a churn of connections getting re-updated to
+                // the next object at the point-in-time, adding a construction/disposal overhead (see FollowPointConnection.End implementation's ClearInternal).
+                // this is easily visible on https://osu.ppy.sh/beatmapsets/150945#osu/372245
+                return -1;
+            }));
 
             if (index < connections.Count - 1)
             {

From c5b684bd2e5b6862da0248ce8ce9d86f7e0b9a94 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 23 Sep 2020 00:30:20 -0700
Subject: [PATCH 04859/10326] Fix typo in log when beatmap fails to load

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 2 +-
 osu.Game/Screens/Play/Player.cs             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index e42a359d2e..28a77a8bdf 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Edit
             }
             catch (Exception e)
             {
-                Logger.Error(e, "Could not load beatmap sucessfully!");
+                Logger.Error(e, "Could not load beatmap successfully!");
                 return;
             }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 539f9227a3..8e2ed583f2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -399,7 +399,7 @@ namespace osu.Game.Screens.Play
             }
             catch (Exception e)
             {
-                Logger.Error(e, "Could not load beatmap sucessfully!");
+                Logger.Error(e, "Could not load beatmap successfully!");
                 //couldn't load, hard abort!
                 return null;
             }

From a1ec167982705b3802c75dad79a1d032f918a4a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 16:38:16 +0900
Subject: [PATCH 04860/10326] Add the ability to toggle new combo state from
 composer context menu

---
 .../TestSceneHitObjectAccentColour.cs         |  2 +-
 .../Objects/Types/IHasComboInformation.cs     |  5 ++
 .../Compose/Components/SelectionHandler.cs    | 57 +++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index 2d5e4b911e..58cc324233 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Tests.Gameplay
 
         private class TestHitObjectWithCombo : ConvertHitObject, IHasComboInformation
         {
-            public bool NewCombo { get; } = false;
+            public bool NewCombo { get; set; } = false;
             public int ComboOffset { get; } = 0;
 
             public Bindable<int> IndexInCurrentComboBindable { get; } = new Bindable<int>();
diff --git a/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs b/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
index 4e3de04278..211c077d4f 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
@@ -24,6 +24,11 @@ namespace osu.Game.Rulesets.Objects.Types
         /// </summary>
         int ComboIndex { get; set; }
 
+        /// <summary>
+        /// Whether the HitObject starts a new combo.
+        /// </summary>
+        new bool NewCombo { get; set; }
+
         Bindable<bool> LastInComboBindable { get; }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index f95bf350b6..c33c755940 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -20,6 +20,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Types;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components
@@ -268,6 +269,24 @@ namespace osu.Game.Screens.Edit.Compose.Components
             changeHandler?.EndChange();
         }
 
+        public void SetNewCombo(bool state)
+        {
+            changeHandler?.BeginChange();
+
+            foreach (var h in SelectedHitObjects)
+            {
+                var comboInfo = h as IHasComboInformation;
+
+                if (comboInfo == null)
+                    throw new InvalidOperationException($"Tried to change combo state of a {h.GetType()}, which doesn't implement {nameof(IHasComboInformation)}");
+
+                comboInfo.NewCombo = state;
+                EditorBeatmap?.UpdateHitObject(h);
+            }
+
+            changeHandler?.EndChange();
+        }
+
         /// <summary>
         /// Removes a hit sample from all selected <see cref="HitObject"/>s.
         /// </summary>
@@ -297,6 +316,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                 items.AddRange(GetContextMenuItemsForSelection(selectedBlueprints));
 
+                if (selectedBlueprints.All(b => b.HitObject is IHasComboInformation))
+                    items.Add(createNewComboMenuItem());
+
                 if (selectedBlueprints.Count == 1)
                     items.AddRange(selectedBlueprints[0].ContextMenuItems);
 
@@ -326,6 +348,41 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected virtual IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
             => Enumerable.Empty<MenuItem>();
 
+        private MenuItem createNewComboMenuItem()
+        {
+            return new TernaryStateMenuItem("New combo", MenuItemType.Standard, setNewComboState)
+            {
+                State = { Value = getHitSampleState() }
+            };
+
+            void setNewComboState(TernaryState state)
+            {
+                switch (state)
+                {
+                    case TernaryState.False:
+                        SetNewCombo(false);
+                        break;
+
+                    case TernaryState.True:
+                        SetNewCombo(true);
+                        break;
+                }
+            }
+
+            TernaryState getHitSampleState()
+            {
+                int countExisting = selectedBlueprints.Select(b => b.HitObject as IHasComboInformation).Count(h => h.NewCombo);
+
+                if (countExisting == 0)
+                    return TernaryState.False;
+
+                if (countExisting < SelectedHitObjects.Count())
+                    return TernaryState.Indeterminate;
+
+                return TernaryState.True;
+            }
+        }
+
         private MenuItem createHitSampleMenuItem(string name, string sampleName)
         {
             return new TernaryStateMenuItem(name, MenuItemType.Standard, setHitSampleState)

From 2d67faeb7250687ccf2457502452fffce705c839 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 16:40:56 +0900
Subject: [PATCH 04861/10326] Add xmldoc

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index c33c755940..71177fe3e4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -269,6 +269,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
             changeHandler?.EndChange();
         }
 
+        /// <summary>
+        /// Set the new combo state of all selected <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="state">Whether to set or unset.</param>
+        /// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
         public void SetNewCombo(bool state)
         {
             changeHandler?.BeginChange();

From 487fc2a2c6912de760946f22bd31a5c9c7384901 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 16:58:22 +0900
Subject: [PATCH 04862/10326] Add missing change handler scopings to taiko
 context menu operations

---
 .../Edit/TaikoSelectionHandler.cs              |  8 ++++++++
 .../Compose/Components/SelectionHandler.cs     | 18 +++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index eebf6980fe..40565048c2 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
                 yield return new TernaryStateMenuItem("Rim", action: state =>
                 {
+                    ChangeHandler.BeginChange();
+
                     foreach (var h in hits)
                     {
                         switch (state)
@@ -35,6 +37,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
                                 break;
                         }
                     }
+
+                    ChangeHandler.EndChange();
                 })
                 {
                     State = { Value = getTernaryState(hits, h => h.Type == HitType.Rim) }
@@ -47,6 +51,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
                 yield return new TernaryStateMenuItem("Strong", action: state =>
                 {
+                    ChangeHandler.BeginChange();
+
                     foreach (var h in hits)
                     {
                         switch (state)
@@ -62,6 +68,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
                         EditorBeatmap?.UpdateHitObject(h);
                     }
+
+                    ChangeHandler.EndChange();
                 })
                 {
                     State = { Value = getTernaryState(hits, h => h.IsStrong) }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 71177fe3e4..ca824a7cef 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected EditorBeatmap EditorBeatmap { get; private set; }
 
         [Resolved(CanBeNull = true)]
-        private IEditorChangeHandler changeHandler { get; set; }
+        protected IEditorChangeHandler ChangeHandler { get; private set; }
 
         public SelectionHandler()
         {
@@ -194,12 +194,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void deleteSelected()
         {
-            changeHandler?.BeginChange();
+            ChangeHandler?.BeginChange();
 
             foreach (var h in selectedBlueprints.ToList())
                 EditorBeatmap?.Remove(h.HitObject);
 
-            changeHandler?.EndChange();
+            ChangeHandler?.EndChange();
         }
 
         #endregion
@@ -255,7 +255,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void AddHitSample(string sampleName)
         {
-            changeHandler?.BeginChange();
+            ChangeHandler?.BeginChange();
 
             foreach (var h in SelectedHitObjects)
             {
@@ -266,7 +266,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 h.Samples.Add(new HitSampleInfo { Name = sampleName });
             }
 
-            changeHandler?.EndChange();
+            ChangeHandler?.EndChange();
         }
 
         /// <summary>
@@ -276,7 +276,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
         public void SetNewCombo(bool state)
         {
-            changeHandler?.BeginChange();
+            ChangeHandler?.BeginChange();
 
             foreach (var h in SelectedHitObjects)
             {
@@ -289,7 +289,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 EditorBeatmap?.UpdateHitObject(h);
             }
 
-            changeHandler?.EndChange();
+            ChangeHandler?.EndChange();
         }
 
         /// <summary>
@@ -298,12 +298,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void RemoveHitSample(string sampleName)
         {
-            changeHandler?.BeginChange();
+            ChangeHandler?.BeginChange();
 
             foreach (var h in SelectedHitObjects)
                 h.SamplesBindable.RemoveAll(s => s.Name == sampleName);
 
-            changeHandler?.EndChange();
+            ChangeHandler?.EndChange();
         }
 
         #endregion

From 02201d0ec66a23dbfa05001397bc216667e610e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 17:08:25 +0900
Subject: [PATCH 04863/10326] Fix incorrect cast logic

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 71177fe3e4..e85dbee6d9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -376,7 +376,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             TernaryState getHitSampleState()
             {
-                int countExisting = selectedBlueprints.Select(b => b.HitObject as IHasComboInformation).Count(h => h.NewCombo);
+                int countExisting = selectedBlueprints.Select(b => (IHasComboInformation)b.HitObject).Count(h => h.NewCombo);
 
                 if (countExisting == 0)
                     return TernaryState.False;

From 8f3eb9a422c25472c35f08cc6c82f98881eadf84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 17:57:57 +0900
Subject: [PATCH 04864/10326] Fix taiko sample selection not updating when
 changing strong/rim type

---
 .../Objects/Drawables/DrawableHit.cs          | 32 +++++++++++++++----
 .../Drawables/DrawableTaikoHitObject.cs       | 28 +++++++++++++++-
 2 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 92ae7e0fd3..f4234445d6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             : base(hit)
         {
             FillMode = FillMode.Fit;
+
+            updateActionsFromType();
         }
 
         [BackgroundDependencyLoader]
@@ -50,21 +52,39 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             type = HitObject.TypeBindable.GetBoundCopy();
             type.BindValueChanged(_ =>
             {
-                updateType();
+                updateActionsFromType();
+
+                // will overwrite samples, should only be called on change.
+                updateSamplesFromTypeChange();
+
                 RecreatePieces();
             });
-
-            updateType();
         }
 
-        private void updateType()
+        private void updateSamplesFromTypeChange()
+        {
+            var rimSamples = HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
+
+            bool isRimType = HitObject.Type == HitType.Rim;
+
+            if (isRimType != rimSamples.Any())
+            {
+                if (isRimType)
+                    HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_CLAP });
+                else
+                {
+                    foreach (var sample in rimSamples)
+                        HitObject.Samples.Remove(sample);
+                }
+            }
+        }
+
+        private void updateActionsFromType()
         {
             HitActions =
                 HitObject.Type == HitType.Centre
                     ? new[] { TaikoAction.LeftCentre, TaikoAction.RightCentre }
                     : new[] { TaikoAction.LeftRim, TaikoAction.RightRim };
-
-            RecreatePieces();
         }
 
         protected override SkinnableDrawable CreateMainPiece() => HitObject.Type == HitType.Centre
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 929cf8a937..0474de8453 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -141,7 +141,31 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private void load()
         {
             isStrong = HitObject.IsStrongBindable.GetBoundCopy();
-            isStrong.BindValueChanged(_ => RecreatePieces(), true);
+            isStrong.BindValueChanged(_ =>
+            {
+                // will overwrite samples, should only be called on change.
+                updateSamplesFromStrong();
+
+                RecreatePieces();
+            });
+
+            RecreatePieces();
+        }
+
+        private void updateSamplesFromStrong()
+        {
+            var strongSamples = HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
+
+            if (isStrong.Value != strongSamples.Any())
+            {
+                if (isStrong.Value)
+                    HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH });
+                else
+                {
+                    foreach (var sample in strongSamples)
+                        HitObject.Samples.Remove(sample);
+                }
+            }
         }
 
         protected virtual void RecreatePieces()
@@ -150,6 +174,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             MainPiece?.Expire();
             Content.Add(MainPiece = CreateMainPiece());
+
+            LoadSamples();
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)

From 9a0e5ac154242ee6fd1764582899e6c1c48114b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 18:09:40 +0900
Subject: [PATCH 04865/10326] Handle type/strength changes from samples changes

---
 .../Objects/Drawables/DrawableSlider.cs       |  4 +--
 .../Objects/Drawables/DrawableSpinner.cs      |  4 +--
 .../Objects/Drawables/DrawableHit.cs          | 16 ++++++++--
 .../Drawables/DrawableTaikoHitObject.cs       | 30 ++++++++++++-------
 .../Objects/Drawables/DrawableHitObject.cs    | 10 +++++--
 5 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 07f40f763b..fc3bb76ae1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -89,9 +89,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private SkinnableSound slidingSample;
 
-        protected override void LoadSamples()
+        protected override void LoadSamples(bool changed)
         {
-            base.LoadSamples();
+            base.LoadSamples(changed);
 
             slidingSample?.Expire();
             slidingSample = null;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index a57bb466c7..e78c886beb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -88,9 +88,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private const float spinning_sample_initial_frequency = 1.0f;
         private const float spinning_sample_modulated_base_frequency = 0.5f;
 
-        protected override void LoadSamples()
+        protected override void LoadSamples(bool changed)
         {
-            base.LoadSamples();
+            base.LoadSamples(changed);
 
             spinningSample?.Expire();
             spinningSample = null;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index f4234445d6..7608514817 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -61,19 +61,29 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             });
         }
 
+        private HitSampleInfo[] rimSamples => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
+
+        protected override void LoadSamples(bool changed)
+        {
+            base.LoadSamples(changed);
+
+            if (changed)
+                type.Value = rimSamples.Any() ? HitType.Rim : HitType.Centre;
+        }
+
         private void updateSamplesFromTypeChange()
         {
-            var rimSamples = HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
+            var samples = rimSamples;
 
             bool isRimType = HitObject.Type == HitType.Rim;
 
-            if (isRimType != rimSamples.Any())
+            if (isRimType != samples.Any())
             {
                 if (isRimType)
                     HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_CLAP });
                 else
                 {
-                    foreach (var sample in rimSamples)
+                    foreach (var sample in samples)
                         HitObject.Samples.Remove(sample);
                 }
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 0474de8453..4b1cd80967 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -1,19 +1,19 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Graphics;
-using osu.Framework.Input.Bindings;
-using osu.Game.Rulesets.Objects.Drawables;
-using osuTK;
-using System.Linq;
-using osu.Game.Audio;
 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.Primitives;
+using osu.Framework.Input.Bindings;
+using osu.Game.Audio;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
@@ -152,17 +152,27 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             RecreatePieces();
         }
 
+        private HitSampleInfo[] strongSamples => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
+
+        protected override void LoadSamples(bool changed)
+        {
+            base.LoadSamples(changed);
+
+            if (changed)
+                isStrong.Value = strongSamples.Any();
+        }
+
         private void updateSamplesFromStrong()
         {
-            var strongSamples = HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
+            var samples = strongSamples;
 
-            if (isStrong.Value != strongSamples.Any())
+            if (isStrong.Value != samples.Any())
             {
                 if (isStrong.Value)
                     HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH });
                 else
                 {
-                    foreach (var sample in strongSamples)
+                    foreach (var sample in samples)
                         HitObject.Samples.Remove(sample);
                 }
             }
@@ -174,8 +184,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             MainPiece?.Expire();
             Content.Add(MainPiece = CreateMainPiece());
-
-            LoadSamples();
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 581617b567..4521556182 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (Result == null)
                 throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
-            LoadSamples();
+            LoadSamples(false);
         }
 
         protected override void LoadAsyncComplete()
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             samplesBindable = HitObject.SamplesBindable.GetBoundCopy();
-            samplesBindable.CollectionChanged += (_, __) => LoadSamples();
+            samplesBindable.CollectionChanged += (_, __) => LoadSamples(true);
 
             apply(HitObject);
         }
@@ -157,7 +157,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
             updateState(ArmedState.Idle, true);
         }
 
-        protected virtual void LoadSamples()
+        /// <summary>
+        /// Called to perform sample-related logic.
+        /// </summary>
+        /// <param name="changed">True if triggered from a post-load change to samples.</param>
+        protected virtual void LoadSamples(bool changed)
         {
             if (Samples != null)
             {

From fee379b4b9b997bd53e73e76fe626a2bd71fff93 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 18:12:07 +0900
Subject: [PATCH 04866/10326] Reword xmldoc for legibility

---
 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 4521556182..08235e4ff8 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -158,9 +158,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         }
 
         /// <summary>
-        /// Called to perform sample-related logic.
+        /// Invoked by the base <see cref="DrawableHitObject"/> to populate samples, once on initial load and potentially again on any change to the samples collection.
         /// </summary>
-        /// <param name="changed">True if triggered from a post-load change to samples.</param>
+        /// <param name="changed">True if triggered from a change to the samples collection.</param>
         protected virtual void LoadSamples(bool changed)
         {
             if (Samples != null)

From e8d099c01d842822acffe33a8dea781edba509a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 19:28:20 +0900
Subject: [PATCH 04867/10326] 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 6cbb4b2e68..d701aaf199 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.911.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.923.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8d23a32c3c..71826e161c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.911.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.923.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index d00b174195..90aa903318 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.Framework.iOS" Version="2020.911.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.923.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.911.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.923.1" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 673a75c46c6f0e57e903bb4b8c9f81111ca76587 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Sep 2020 21:06:11 +0900
Subject: [PATCH 04868/10326] Fix failing test

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 08130e60db..c2a18330c9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Tests.Visual.Online
         public void TestMultipleLoads()
         {
             var comments = exampleComments;
-            int topLevelCommentCount = exampleComments.Comments.Count(comment => comment.IsTopLevel);
+            int topLevelCommentCount = exampleComments.Comments.Count;
 
             AddStep("hide container", () => commentsContainer.Hide());
             setUpCommentsResponse(comments);

From f4d2c2684dd6dda8e53f0338a586d18c9e180491 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 12:21:08 +0900
Subject: [PATCH 04869/10326] Add more descriptive description and download
 button when statistics not available

---
 .../Ranking/Statistics/StatisticsPanel.cs        | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index c2ace6a04e..b0cff244b2 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -75,7 +75,21 @@ namespace osu.Game.Screens.Ranking.Statistics
                 return;
 
             if (newScore.HitEvents == null || newScore.HitEvents.Count == 0)
-                content.Add(new MessagePlaceholder("Score has no statistics :("));
+                content.Add(new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new MessagePlaceholder("Extended statistics are only available after watching a replay!"),
+                        new ReplayDownloadButton(newScore)
+                        {
+                            Scale = new Vector2(1.5f),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                    }
+                });
             else
             {
                 spinner.Show();

From cb903ec9e2a378575a5b686a5c543f6883761036 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 12:21:46 +0900
Subject: [PATCH 04870/10326] Fix extended statistics not being vertically
 centered

---
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index c2ace6a04e..bd1b038181 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -91,7 +91,10 @@ namespace osu.Game.Screens.Ranking.Statistics
                 {
                     var rows = new FillFlowContainer
                     {
-                        RelativeSizeAxes = Axes.Both,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
                         Direction = FillDirection.Vertical,
                         Spacing = new Vector2(30, 15),
                         Alpha = 0

From fda6e88dd364eb53e851e44abb5e390b09abd461 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 12:39:08 +0900
Subject: [PATCH 04871/10326] Fix braces style

---
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index b0cff244b2..997a5b47ac 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -75,6 +75,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 return;
 
             if (newScore.HitEvents == null || newScore.HitEvents.Count == 0)
+            {
                 content.Add(new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -90,6 +91,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                         },
                     }
                 });
+            }
             else
             {
                 spinner.Show();

From 56123575747a57bf2eca568f1d5b484a00bba7ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 12:49:32 +0900
Subject: [PATCH 04872/10326] Fix score panel being incorrectly vertically
 aligned on screen resize

---
 osu.Game/Screens/Ranking/ResultsScreen.cs  | 6 +++---
 osu.Game/Screens/Ranking/ScorePanelList.cs | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index c95cf1066e..c48cd238c0 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -273,10 +273,10 @@ namespace osu.Game.Screens.Ranking
                 detachedPanelContainer.Add(expandedPanel);
 
                 // Move into its original location in the local container first, then to the final location.
-                var origLocation = detachedPanelContainer.ToLocalSpace(screenSpacePos);
-                expandedPanel.MoveTo(origLocation)
+                var origLocation = detachedPanelContainer.ToLocalSpace(screenSpacePos).X;
+                expandedPanel.MoveToX(origLocation)
                              .Then()
-                             .MoveTo(new Vector2(StatisticsPanel.SIDE_PADDING, origLocation.Y), 150, Easing.OutQuint);
+                             .MoveToX(StatisticsPanel.SIDE_PADDING, 150, Easing.OutQuint);
 
                 // Hide contracted panels.
                 foreach (var contracted in ScorePanelList.GetScorePanels().Where(p => p.State == PanelState.Contracted))
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 10bd99c8ce..0d7d339df0 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -99,6 +99,8 @@ namespace osu.Game.Screens.Ranking
         {
             var panel = new ScorePanel(score)
             {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
                 PostExpandAction = () => PostExpandAction?.Invoke()
             }.With(p =>
             {

From 9c074e0ffbf10fe23af9ddd867c7b6eadd5c25e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 13:10:54 +0900
Subject: [PATCH 04873/10326] Fix editor not showing sign when time goes
 negative

---
 .../Screens/Edit/Components/TimeInfoContainer.cs    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
index c1f54d7938..c68eeeb4f9 100644
--- a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
+++ b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
@@ -22,10 +22,12 @@ namespace osu.Game.Screens.Edit.Components
             {
                 trackTimer = new OsuSpriteText
                 {
-                    Origin = Anchor.BottomLeft,
-                    RelativePositionAxes = Axes.Y,
-                    Font = OsuFont.GetFont(size: 22, fixedWidth: true),
-                    Y = 0.5f,
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    // intentionally fudged centre to avoid movement of the number portion when
+                    // going negative.
+                    X = -35,
+                    Font = OsuFont.GetFont(size: 25, fixedWidth: true),
                 }
             };
         }
@@ -34,7 +36,8 @@ namespace osu.Game.Screens.Edit.Components
         {
             base.Update();
 
-            trackTimer.Text = TimeSpan.FromMilliseconds(editorClock.CurrentTime).ToString(@"mm\:ss\:fff");
+            var timespan = TimeSpan.FromMilliseconds(editorClock.CurrentTime);
+            trackTimer.Text = $"{(timespan < TimeSpan.Zero ? "-" : string.Empty)}{timespan:mm\\:ss\\:fff}";
         }
     }
 }

From eb39f6dbd8f68244f6e91dca0706aa737636d46c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 13:17:03 +0900
Subject: [PATCH 04874/10326] Update failing test to find correct download
 button

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

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 03cb5fa3db..ff96a999ec 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.Visual.Ranking
 
             AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
 
-            AddAssert("download button is disabled", () => !screen.ChildrenOfType<DownloadButton>().Single().Enabled.Value);
+            AddAssert("download button is disabled", () => !screen.ChildrenOfType<DownloadButton>().Last().Enabled.Value);
 
             AddStep("click contracted panel", () =>
             {
@@ -229,7 +229,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("download button is enabled", () => screen.ChildrenOfType<DownloadButton>().Single().Enabled.Value);
+            AddAssert("download button is enabled", () => screen.ChildrenOfType<DownloadButton>().Last().Enabled.Value);
         }
 
         private class TestResultsContainer : Container

From 156edf24c2736b28d134b9675e64aab08fd1f708 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 13:22:14 +0900
Subject: [PATCH 04875/10326] Change properties to methods and improve naming

---
 .../Objects/Drawables/DrawableHit.cs                   | 10 +++++-----
 .../Objects/Drawables/DrawableTaikoHitObject.cs        | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 7608514817..7cf77885cf 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -61,29 +61,29 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             });
         }
 
-        private HitSampleInfo[] rimSamples => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
+        private HitSampleInfo[] getRimSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
 
         protected override void LoadSamples(bool changed)
         {
             base.LoadSamples(changed);
 
             if (changed)
-                type.Value = rimSamples.Any() ? HitType.Rim : HitType.Centre;
+                type.Value = getRimSamples().Any() ? HitType.Rim : HitType.Centre;
         }
 
         private void updateSamplesFromTypeChange()
         {
-            var samples = rimSamples;
+            var rimSamples = getRimSamples();
 
             bool isRimType = HitObject.Type == HitType.Rim;
 
-            if (isRimType != samples.Any())
+            if (isRimType != rimSamples.Any())
             {
                 if (isRimType)
                     HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_CLAP });
                 else
                 {
-                    foreach (var sample in samples)
+                    foreach (var sample in rimSamples)
                         HitObject.Samples.Remove(sample);
                 }
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 4b1cd80967..f3790e65af 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -152,27 +152,27 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             RecreatePieces();
         }
 
-        private HitSampleInfo[] strongSamples => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
+        private HitSampleInfo[] getStrongSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
 
         protected override void LoadSamples(bool changed)
         {
             base.LoadSamples(changed);
 
             if (changed)
-                isStrong.Value = strongSamples.Any();
+                isStrong.Value = getStrongSamples().Any();
         }
 
         private void updateSamplesFromStrong()
         {
-            var samples = strongSamples;
+            var strongSamples = getStrongSamples();
 
-            if (isStrong.Value != samples.Any())
+            if (isStrong.Value != strongSamples.Any())
             {
                 if (isStrong.Value)
                     HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH });
                 else
                 {
-                    foreach (var sample in samples)
+                    foreach (var sample in strongSamples)
                         HitObject.Samples.Remove(sample);
                 }
             }

From 33fad27ec21705999cb6ad123d6c588fe60ff802 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 13:28:29 +0900
Subject: [PATCH 04876/10326] Avoid API change to DrawableHitObject

---
 .../Objects/Drawables/DrawableSlider.cs               |  4 ++--
 .../Objects/Drawables/DrawableSpinner.cs              |  4 ++--
 .../Objects/Drawables/DrawableHit.cs                  | 11 +++++------
 .../Objects/Drawables/DrawableTaikoHitObject.cs       | 11 +++++------
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs   |  7 +++----
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index fc3bb76ae1..07f40f763b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -89,9 +89,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private SkinnableSound slidingSample;
 
-        protected override void LoadSamples(bool changed)
+        protected override void LoadSamples()
         {
-            base.LoadSamples(changed);
+            base.LoadSamples();
 
             slidingSample?.Expire();
             slidingSample = null;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index e78c886beb..a57bb466c7 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -88,9 +88,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private const float spinning_sample_initial_frequency = 1.0f;
         private const float spinning_sample_modulated_base_frequency = 0.5f;
 
-        protected override void LoadSamples(bool changed)
+        protected override void LoadSamples()
         {
-            base.LoadSamples(changed);
+            base.LoadSamples();
 
             spinningSample?.Expire();
             spinningSample = null;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 7cf77885cf..3a6eaa83db 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -36,11 +36,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private bool pressHandledThisFrame;
 
-        private Bindable<HitType> type;
+        private readonly Bindable<HitType> type;
 
         public DrawableHit(Hit hit)
             : base(hit)
         {
+            type = HitObject.TypeBindable.GetBoundCopy();
             FillMode = FillMode.Fit;
 
             updateActionsFromType();
@@ -49,7 +50,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            type = HitObject.TypeBindable.GetBoundCopy();
             type.BindValueChanged(_ =>
             {
                 updateActionsFromType();
@@ -63,12 +63,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private HitSampleInfo[] getRimSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
 
-        protected override void LoadSamples(bool changed)
+        protected override void LoadSamples()
         {
-            base.LoadSamples(changed);
+            base.LoadSamples();
 
-            if (changed)
-                type.Value = getRimSamples().Any() ? HitType.Rim : HitType.Centre;
+            type.Value = getRimSamples().Any() ? HitType.Rim : HitType.Centre;
         }
 
         private void updateSamplesFromTypeChange()
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index f3790e65af..9cd23383c4 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected Vector2 BaseSize;
         protected SkinnableDrawable MainPiece;
 
-        private Bindable<bool> isStrong;
+        private readonly Bindable<bool> isStrong;
 
         private readonly Container<DrawableStrongNestedHit> strongHitContainer;
 
@@ -128,6 +128,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             : base(hitObject)
         {
             HitObject = hitObject;
+            isStrong = HitObject.IsStrongBindable.GetBoundCopy();
 
             Anchor = Anchor.CentreLeft;
             Origin = Anchor.Custom;
@@ -140,7 +141,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            isStrong = HitObject.IsStrongBindable.GetBoundCopy();
             isStrong.BindValueChanged(_ =>
             {
                 // will overwrite samples, should only be called on change.
@@ -154,12 +154,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private HitSampleInfo[] getStrongSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
 
-        protected override void LoadSamples(bool changed)
+        protected override void LoadSamples()
         {
-            base.LoadSamples(changed);
+            base.LoadSamples();
 
-            if (changed)
-                isStrong.Value = getStrongSamples().Any();
+            isStrong.Value = getStrongSamples().Any();
         }
 
         private void updateSamplesFromStrong()
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 08235e4ff8..28d3a39096 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (Result == null)
                 throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
-            LoadSamples(false);
+            LoadSamples();
         }
 
         protected override void LoadAsyncComplete()
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             samplesBindable = HitObject.SamplesBindable.GetBoundCopy();
-            samplesBindable.CollectionChanged += (_, __) => LoadSamples(true);
+            samplesBindable.CollectionChanged += (_, __) => LoadSamples();
 
             apply(HitObject);
         }
@@ -160,8 +160,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// Invoked by the base <see cref="DrawableHitObject"/> to populate samples, once on initial load and potentially again on any change to the samples collection.
         /// </summary>
-        /// <param name="changed">True if triggered from a change to the samples collection.</param>
-        protected virtual void LoadSamples(bool changed)
+        protected virtual void LoadSamples()
         {
             if (Samples != null)
             {

From 600b823a30aa562b350351c155db3f13fbfec5ee Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 24 Sep 2020 14:29:44 +0900
Subject: [PATCH 04877/10326] Fix game texture store being disposed by rulesets

---
 .../UI/DrawableRulesetDependencies.cs         | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index 83a1077d70..c1742970c7 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -10,6 +10,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Rulesets.Configuration;
@@ -46,12 +47,11 @@ namespace osu.Game.Rulesets.UI
             if (resources != null)
             {
                 TextureStore = new TextureStore(new TextureLoaderStore(new NamespacedResourceStore<byte[]>(resources, @"Textures")));
-                TextureStore.AddStore(parent.Get<TextureStore>());
-                Cache(TextureStore);
+                CacheAs(TextureStore = new FallbackTextureStore(TextureStore, parent.Get<TextureStore>()));
 
                 SampleStore = parent.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, @"Samples"));
                 SampleStore.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
-                CacheAs<ISampleStore>(new FallbackSampleStore(SampleStore, parent.Get<ISampleStore>()));
+                CacheAs(SampleStore = new FallbackSampleStore(SampleStore, parent.Get<ISampleStore>()));
             }
 
             RulesetConfigManager = parent.Get<RulesetConfigCache>().GetConfigFor(ruleset);
@@ -82,6 +82,7 @@ namespace osu.Game.Rulesets.UI
             isDisposed = true;
 
             SampleStore?.Dispose();
+            TextureStore?.Dispose();
             RulesetConfigManager = null;
         }
 
@@ -89,27 +90,24 @@ namespace osu.Game.Rulesets.UI
     }
 
     /// <summary>
-    /// A sample store which adds a fallback source.
+    /// A sample store which adds a fallback source and prevents disposal of the fallback source.
     /// </summary>
-    /// <remarks>
-    /// This is a temporary implementation to workaround ISampleStore limitations.
-    /// </remarks>
     public class FallbackSampleStore : ISampleStore
     {
         private readonly ISampleStore primary;
-        private readonly ISampleStore secondary;
+        private readonly ISampleStore fallback;
 
-        public FallbackSampleStore(ISampleStore primary, ISampleStore secondary)
+        public FallbackSampleStore(ISampleStore primary, ISampleStore fallback)
         {
             this.primary = primary;
-            this.secondary = secondary;
+            this.fallback = fallback;
         }
 
-        public SampleChannel Get(string name) => primary.Get(name) ?? secondary.Get(name);
+        public SampleChannel Get(string name) => primary.Get(name) ?? fallback.Get(name);
 
-        public Task<SampleChannel> GetAsync(string name) => primary.GetAsync(name) ?? secondary.GetAsync(name);
+        public Task<SampleChannel> GetAsync(string name) => primary.GetAsync(name) ?? fallback.GetAsync(name);
 
-        public Stream GetStream(string name) => primary.GetStream(name) ?? secondary.GetStream(name);
+        public Stream GetStream(string name) => primary.GetStream(name) ?? fallback.GetStream(name);
 
         public IEnumerable<string> GetAvailableResources() => throw new NotSupportedException();
 
@@ -145,6 +143,31 @@ namespace osu.Game.Rulesets.UI
 
         public void Dispose()
         {
+            primary?.Dispose();
+        }
+    }
+
+    /// <summary>
+    /// A texture store which adds a fallback source and prevents disposal of the fallback source.
+    /// </summary>
+    public class FallbackTextureStore : TextureStore
+    {
+        private readonly TextureStore primary;
+        private readonly TextureStore fallback;
+
+        public FallbackTextureStore(TextureStore primary, TextureStore fallback)
+        {
+            this.primary = primary;
+            this.fallback = fallback;
+        }
+
+        public override Texture Get(string name, WrapMode wrapModeS, WrapMode wrapModeT)
+            => primary.Get(name, wrapModeS, wrapModeT) ?? fallback.Get(name, wrapModeS, wrapModeT);
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            primary?.Dispose();
         }
     }
 }

From 62c2dbc3104157b88b981634e8a3d42f322eb7cf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 24 Sep 2020 14:33:43 +0900
Subject: [PATCH 04878/10326] Nest classes + make private

---
 .../UI/DrawableRulesetDependencies.cs         | 146 +++++++++---------
 1 file changed, 73 insertions(+), 73 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index c1742970c7..a9b2a15b35 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -87,87 +87,87 @@ namespace osu.Game.Rulesets.UI
         }
 
         #endregion
-    }
 
-    /// <summary>
-    /// A sample store which adds a fallback source and prevents disposal of the fallback source.
-    /// </summary>
-    public class FallbackSampleStore : ISampleStore
-    {
-        private readonly ISampleStore primary;
-        private readonly ISampleStore fallback;
-
-        public FallbackSampleStore(ISampleStore primary, ISampleStore fallback)
+        /// <summary>
+        /// A sample store which adds a fallback source and prevents disposal of the fallback source.
+        /// </summary>
+        private class FallbackSampleStore : ISampleStore
         {
-            this.primary = primary;
-            this.fallback = fallback;
+            private readonly ISampleStore primary;
+            private readonly ISampleStore fallback;
+
+            public FallbackSampleStore(ISampleStore primary, ISampleStore fallback)
+            {
+                this.primary = primary;
+                this.fallback = fallback;
+            }
+
+            public SampleChannel Get(string name) => primary.Get(name) ?? fallback.Get(name);
+
+            public Task<SampleChannel> GetAsync(string name) => primary.GetAsync(name) ?? fallback.GetAsync(name);
+
+            public Stream GetStream(string name) => primary.GetStream(name) ?? fallback.GetStream(name);
+
+            public IEnumerable<string> GetAvailableResources() => throw new NotSupportedException();
+
+            public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
+
+            public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
+
+            public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotSupportedException();
+
+            public BindableNumber<double> Volume => throw new NotSupportedException();
+
+            public BindableNumber<double> Balance => throw new NotSupportedException();
+
+            public BindableNumber<double> Frequency => throw new NotSupportedException();
+
+            public BindableNumber<double> Tempo => throw new NotSupportedException();
+
+            public IBindable<double> GetAggregate(AdjustableProperty type) => throw new NotSupportedException();
+
+            public IBindable<double> AggregateVolume => throw new NotSupportedException();
+
+            public IBindable<double> AggregateBalance => throw new NotSupportedException();
+
+            public IBindable<double> AggregateFrequency => throw new NotSupportedException();
+
+            public IBindable<double> AggregateTempo => throw new NotSupportedException();
+
+            public int PlaybackConcurrency
+            {
+                get => throw new NotSupportedException();
+                set => throw new NotSupportedException();
+            }
+
+            public void Dispose()
+            {
+                primary?.Dispose();
+            }
         }
 
-        public SampleChannel Get(string name) => primary.Get(name) ?? fallback.Get(name);
-
-        public Task<SampleChannel> GetAsync(string name) => primary.GetAsync(name) ?? fallback.GetAsync(name);
-
-        public Stream GetStream(string name) => primary.GetStream(name) ?? fallback.GetStream(name);
-
-        public IEnumerable<string> GetAvailableResources() => throw new NotSupportedException();
-
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
-
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
-
-        public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotSupportedException();
-
-        public BindableNumber<double> Volume => throw new NotSupportedException();
-
-        public BindableNumber<double> Balance => throw new NotSupportedException();
-
-        public BindableNumber<double> Frequency => throw new NotSupportedException();
-
-        public BindableNumber<double> Tempo => throw new NotSupportedException();
-
-        public IBindable<double> GetAggregate(AdjustableProperty type) => throw new NotSupportedException();
-
-        public IBindable<double> AggregateVolume => throw new NotSupportedException();
-
-        public IBindable<double> AggregateBalance => throw new NotSupportedException();
-
-        public IBindable<double> AggregateFrequency => throw new NotSupportedException();
-
-        public IBindable<double> AggregateTempo => throw new NotSupportedException();
-
-        public int PlaybackConcurrency
+        /// <summary>
+        /// A texture store which adds a fallback source and prevents disposal of the fallback source.
+        /// </summary>
+        private class FallbackTextureStore : TextureStore
         {
-            get => throw new NotSupportedException();
-            set => throw new NotSupportedException();
-        }
+            private readonly TextureStore primary;
+            private readonly TextureStore fallback;
 
-        public void Dispose()
-        {
-            primary?.Dispose();
-        }
-    }
+            public FallbackTextureStore(TextureStore primary, TextureStore fallback)
+            {
+                this.primary = primary;
+                this.fallback = fallback;
+            }
 
-    /// <summary>
-    /// A texture store which adds a fallback source and prevents disposal of the fallback source.
-    /// </summary>
-    public class FallbackTextureStore : TextureStore
-    {
-        private readonly TextureStore primary;
-        private readonly TextureStore fallback;
+            public override Texture Get(string name, WrapMode wrapModeS, WrapMode wrapModeT)
+                => primary.Get(name, wrapModeS, wrapModeT) ?? fallback.Get(name, wrapModeS, wrapModeT);
 
-        public FallbackTextureStore(TextureStore primary, TextureStore fallback)
-        {
-            this.primary = primary;
-            this.fallback = fallback;
-        }
-
-        public override Texture Get(string name, WrapMode wrapModeS, WrapMode wrapModeT)
-            => primary.Get(name, wrapModeS, wrapModeT) ?? fallback.Get(name, wrapModeS, wrapModeT);
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            primary?.Dispose();
+            protected override void Dispose(bool disposing)
+            {
+                base.Dispose(disposing);
+                primary?.Dispose();
+            }
         }
     }
 }

From d666db362366bee77515635474325a7633138607 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 24 Sep 2020 14:46:28 +0900
Subject: [PATCH 04879/10326] Add test

---
 .../TestSceneDrawableRulesetDependencies.cs   | 134 ++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs

diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
new file mode 100644
index 0000000000..89e3b48aa3
--- /dev/null
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -0,0 +1,134 @@
+// Copyright (c) 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.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.UI;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Rulesets
+{
+    public class TestSceneDrawableRulesetDependencies : OsuTestScene
+    {
+        [Test]
+        public void TestDisposalDoesNotDisposeParentStores()
+        {
+            DrawableWithDependencies drawable = null;
+            TestTextureStore textureStore = null;
+            TestSampleStore sampleStore = null;
+
+            AddStep("add dependencies", () =>
+            {
+                Child = drawable = new DrawableWithDependencies();
+                textureStore = drawable.ParentTextureStore;
+                sampleStore = drawable.ParentSampleStore;
+            });
+
+            AddStep("clear children", Clear);
+            AddUntilStep("wait for disposal", () => drawable.IsDisposed);
+
+            AddStep("GC", () =>
+            {
+                drawable = null;
+
+                GC.Collect();
+                GC.WaitForPendingFinalizers();
+            });
+
+            AddAssert("parent texture store not disposed", () => !textureStore.IsDisposed);
+            AddAssert("parent sample store not disposed", () => !sampleStore.IsDisposed);
+        }
+
+        private class DrawableWithDependencies : CompositeDrawable
+        {
+            public TestTextureStore ParentTextureStore { get; private set; }
+            public TestSampleStore ParentSampleStore { get; private set; }
+
+            public DrawableWithDependencies()
+            {
+                InternalChild = new Box { RelativeSizeAxes = Axes.Both };
+            }
+
+            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            {
+                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+                dependencies.CacheAs<TextureStore>(ParentTextureStore = new TestTextureStore());
+                dependencies.CacheAs<ISampleStore>(ParentSampleStore = new TestSampleStore());
+
+                return new DrawableRulesetDependencies(new OsuRuleset(), dependencies);
+            }
+
+            public new bool IsDisposed { get; private set; }
+
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+                IsDisposed = true;
+            }
+        }
+
+        private class TestTextureStore : TextureStore
+        {
+            public override Texture Get(string name, WrapMode wrapModeS, WrapMode wrapModeT) => null;
+
+            public bool IsDisposed { get; private set; }
+
+            protected override void Dispose(bool disposing)
+            {
+                base.Dispose(disposing);
+                IsDisposed = true;
+            }
+        }
+
+        private class TestSampleStore : ISampleStore
+        {
+            public bool IsDisposed { get; private set; }
+
+            public void Dispose()
+            {
+                IsDisposed = true;
+            }
+
+            public SampleChannel Get(string name) => null;
+
+            public Task<SampleChannel> GetAsync(string name) => null;
+
+            public Stream GetStream(string name) => null;
+
+            public IEnumerable<string> GetAvailableResources() => throw new NotImplementedException();
+
+            public BindableNumber<double> Volume => throw new NotImplementedException();
+            public BindableNumber<double> Balance => throw new NotImplementedException();
+            public BindableNumber<double> Frequency => throw new NotImplementedException();
+            public BindableNumber<double> Tempo => throw new NotImplementedException();
+
+            public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotImplementedException();
+
+            public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotImplementedException();
+
+            public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotImplementedException();
+
+            public IBindable<double> AggregateVolume => throw new NotImplementedException();
+            public IBindable<double> AggregateBalance => throw new NotImplementedException();
+            public IBindable<double> AggregateFrequency => throw new NotImplementedException();
+            public IBindable<double> AggregateTempo => throw new NotImplementedException();
+
+            public int PlaybackConcurrency { get; set; }
+        }
+    }
+}

From 6ebea3f6f2c9f706b49ed5e367da4904c15a574c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 16:09:06 +0900
Subject: [PATCH 04880/10326] Add ability to toggle editor toggles using
 keyboard shortcuts (Q~P)

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 83 ++++++++++++++++++++-
 1 file changed, 80 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 28a77a8bdf..b81e0ce159 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -58,6 +58,8 @@ namespace osu.Game.Rulesets.Edit
 
         private RadioButtonCollection toolboxCollection;
 
+        private ToolboxGroup togglesCollection;
+
         protected HitObjectComposer(Ruleset ruleset)
         {
             Ruleset = ruleset;
@@ -115,7 +117,7 @@ namespace osu.Game.Rulesets.Edit
                     Children = new Drawable[]
                     {
                         new ToolboxGroup("toolbox") { Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X } },
-                        new ToolboxGroup("toggles")
+                        togglesCollection = new ToolboxGroup("toggles")
                         {
                             ChildrenEnumerable = Toggles.Select(b => new SettingsCheckbox
                             {
@@ -190,9 +192,9 @@ namespace osu.Game.Rulesets.Edit
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
-            if (e.Key >= Key.Number1 && e.Key <= Key.Number9)
+            if (checkLeftToggleFromKey(e.Key, out var leftIndex))
             {
-                var item = toolboxCollection.Items.ElementAtOrDefault(e.Key - Key.Number1);
+                var item = toolboxCollection.Items.ElementAtOrDefault(leftIndex);
 
                 if (item != null)
                 {
@@ -201,9 +203,84 @@ namespace osu.Game.Rulesets.Edit
                 }
             }
 
+            if (checkRightToggleFromKey(e.Key, out var rightIndex))
+            {
+                var item = togglesCollection.Children[rightIndex];
+
+                if (item is SettingsCheckbox checkbox)
+                {
+                    checkbox.Bindable.Value = !checkbox.Bindable.Value;
+                    return true;
+                }
+            }
+
             return base.OnKeyDown(e);
         }
 
+        private bool checkLeftToggleFromKey(Key key, out int index)
+        {
+            if (key < Key.Number1 || key > Key.Number9)
+            {
+                index = -1;
+                return false;
+            }
+
+            index = key - Key.Number1;
+            return true;
+        }
+
+        private bool checkRightToggleFromKey(Key key, out int index)
+        {
+            switch (key)
+            {
+                case Key.Q:
+                    index = 0;
+                    break;
+
+                case Key.W:
+                    index = 1;
+                    break;
+
+                case Key.E:
+                    index = 2;
+                    break;
+
+                case Key.R:
+                    index = 3;
+                    break;
+
+                case Key.T:
+                    index = 4;
+                    break;
+
+                case Key.Y:
+                    index = 5;
+                    break;
+
+                case Key.U:
+                    index = 6;
+                    break;
+
+                case Key.I:
+                    index = 7;
+                    break;
+
+                case Key.O:
+                    index = 8;
+                    break;
+
+                case Key.P:
+                    index = 9;
+                    break;
+
+                default:
+                    index = -1;
+                    break;
+            }
+
+            return index >= 0;
+        }
+
         private void selectionChanged(object sender, NotifyCollectionChangedEventArgs changedArgs)
         {
             if (EditorBeatmap.SelectedHitObjects.Any())

From 44be0ab76220d8c0e1d720fb26181e2c54c00788 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 14:22:18 +0900
Subject: [PATCH 04881/10326] Add basic osu! object to object snapping

---
 .../Edit/OsuHitObjectComposer.cs              | 41 +++++++++++++++++++
 .../Compose/Components/BlueprintContainer.cs  |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index e1cbfa93f6..9fb9e49ad3 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -94,6 +95,10 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
         {
+            if (snapToVisibleBlueprints(screenSpacePosition, out var snapResult))
+                return snapResult;
+
+            // will be null if distance snap is disabled or not feasible for the current time value.
             if (distanceSnapGrid == null)
                 return base.SnapScreenSpacePositionToValidTime(screenSpacePosition);
 
@@ -102,6 +107,42 @@ namespace osu.Game.Rulesets.Osu.Edit
             return new SnapResult(distanceSnapGrid.ToScreenSpace(pos), time, PlayfieldAtScreenSpacePosition(screenSpacePosition));
         }
 
+        private bool snapToVisibleBlueprints(Vector2 screenSpacePosition, out SnapResult snapResult)
+        {
+            // check other on-screen objects for snapping/stacking
+            var blueprints = BlueprintContainer.SelectionBlueprints.AliveChildren;
+
+            var playfield = PlayfieldAtScreenSpacePosition(screenSpacePosition);
+
+            float snapRadius =
+                playfield.GamefieldToScreenSpace(new Vector2(OsuHitObject.OBJECT_RADIUS / 5)).X -
+                playfield.GamefieldToScreenSpace(Vector2.Zero).X;
+
+            foreach (var b in blueprints)
+            {
+                if (b.IsSelected)
+                    continue;
+
+                var hitObject = b.HitObject;
+
+                Vector2 startPos = ((IHasPosition)hitObject).Position;
+
+                Vector2 objectScreenPos = playfield.GamefieldToScreenSpace(startPos);
+
+                if (Vector2.Distance(objectScreenPos, screenSpacePosition) < snapRadius)
+                {
+                    // bypasses time snapping
+                    {
+                        snapResult = new SnapResult(objectScreenPos, null, playfield);
+                        return true;
+                    }
+                }
+            }
+
+            snapResult = null;
+            return false;
+        }
+
         private void updateDistanceSnapGrid()
         {
             distanceSnapGridContainer.Clear();
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index bf1e18771f..d5e4b4fee5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     {
         protected DragBox DragBox { get; private set; }
 
-        protected Container<SelectionBlueprint> SelectionBlueprints { get; private set; }
+        public Container<SelectionBlueprint> SelectionBlueprints { get; private set; }
 
         private SelectionHandler selectionHandler;
 

From d9e8ac6842f1ea3ed145ee07c8885964276b3a18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 14:34:41 +0900
Subject: [PATCH 04882/10326] Add support for slider end snapping

---
 .../Edit/OsuHitObjectComposer.cs              | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 9fb9e49ad3..ad92016cd0 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -123,19 +122,27 @@ namespace osu.Game.Rulesets.Osu.Edit
                 if (b.IsSelected)
                     continue;
 
-                var hitObject = b.HitObject;
+                var hitObject = (OsuHitObject)b.HitObject;
 
-                Vector2 startPos = ((IHasPosition)hitObject).Position;
+                Vector2? snap = checkSnap(hitObject.Position);
+                if (snap == null && hitObject.Position != hitObject.EndPosition)
+                    snap = checkSnap(hitObject.EndPosition);
 
-                Vector2 objectScreenPos = playfield.GamefieldToScreenSpace(startPos);
-
-                if (Vector2.Distance(objectScreenPos, screenSpacePosition) < snapRadius)
+                if (snap != null)
                 {
-                    // bypasses time snapping
-                    {
-                        snapResult = new SnapResult(objectScreenPos, null, playfield);
-                        return true;
-                    }
+                    // only return distance portion, since time is not really valid
+                    snapResult = new SnapResult(snap.Value, null, playfield);
+                    return true;
+                }
+
+                Vector2? checkSnap(Vector2 checkPos)
+                {
+                    Vector2 checkScreenPos = playfield.GamefieldToScreenSpace(checkPos);
+
+                    if (Vector2.Distance(checkScreenPos, screenSpacePosition) < snapRadius)
+                        return checkScreenPos;
+
+                    return null;
                 }
             }
 

From 1a98e8d7156c5dd624821e20ac59c168d6ebbdc2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 14:46:03 +0900
Subject: [PATCH 04883/10326] Add test coverage of object-object snapping

---
 .../Editor/TestSceneObjectObjectSnap.cs       | 67 +++++++++++++++++++
 .../TestSceneOsuEditor.cs}                    |  4 +-
 2 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
 rename osu.Game.Rulesets.Osu.Tests/{TestSceneEditor.cs => Editor/TestSceneOsuEditor.cs} (76%)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
new file mode 100644
index 0000000000..b20c790bcb
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.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.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    [TestFixture]
+    public class TestSceneObjectObjectSnap : TestSceneOsuEditor
+    {
+        private OsuPlayfield playfield;
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(Ruleset.Value, false);
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("get playfield", () => playfield = Editor.ChildrenOfType<OsuPlayfield>().First());
+        }
+
+        [Test]
+        public void TestHitCircleSnapsToOtherHitCircle()
+        {
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre));
+
+            AddStep("disable distance snap", () =>
+            {
+                InputManager.PressKey(Key.Q);
+                InputManager.ReleaseKey(Key.Q);
+            });
+
+            AddStep("enter placement mode", () =>
+            {
+                InputManager.PressKey(Key.Number2);
+                InputManager.ReleaseKey(Key.Number2);
+            });
+
+            AddStep("place first object", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(5)));
+
+            AddStep("place second object", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("both objects at same location", () =>
+            {
+                var objects = EditorBeatmap.HitObjects;
+
+                var first = (OsuHitObject)objects.First();
+                var second = (OsuHitObject)objects.Last();
+
+                return first.Position == second.Position;
+            });
+
+            // TODO: remove
+            AddWaitStep("wait", 10);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneEditor.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditor.cs
similarity index 76%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneEditor.cs
rename to osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditor.cs
index 9239034a53..e1ca3ddd61 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneEditor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditor.cs
@@ -4,10 +4,10 @@
 using NUnit.Framework;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Osu.Tests
+namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     [TestFixture]
-    public class TestSceneEditor : EditorTestScene
+    public class TestSceneOsuEditor : EditorTestScene
     {
         protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
     }

From 89ded2903c70a92d8a69951c3929b907d092507a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 16:22:47 +0900
Subject: [PATCH 04884/10326] Add test coverage of circle-slider snapping

---
 .../Editor/TestSceneObjectObjectSnap.cs       | 47 +++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
index b20c790bcb..94f826d01f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
@@ -4,8 +4,8 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Tests.Beatmaps;
@@ -59,9 +59,50 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
                 return first.Position == second.Position;
             });
+        }
 
-            // TODO: remove
-            AddWaitStep("wait", 10);
+        [Test]
+        public void TestHitCircleSnapsToSliderEnd()
+        {
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre));
+
+            AddStep("disable distance snap", () =>
+            {
+                InputManager.PressKey(Key.Q);
+                InputManager.ReleaseKey(Key.Q);
+            });
+
+            AddStep("enter slider placement mode", () =>
+            {
+                InputManager.PressKey(Key.Number3);
+                InputManager.ReleaseKey(Key.Number3);
+            });
+
+            AddStep("start slider placement", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("move to place end", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(120, 0)));
+
+            AddStep("end slider placement", () => InputManager.Click(MouseButton.Right));
+
+            AddStep("enter circle placement mode", () =>
+            {
+                InputManager.PressKey(Key.Number2);
+                InputManager.ReleaseKey(Key.Number2);
+            });
+
+            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(130, 0)));
+
+            AddStep("place second object", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("circle is at slider's end", () =>
+            {
+                var objects = EditorBeatmap.HitObjects;
+
+                var first = (Slider)objects.First();
+                var second = (OsuHitObject)objects.Last();
+
+                return Precision.AlmostEquals(first.EndPosition, second.Position);
+            });
         }
     }
 }

From ead6479442614d54987f51a9c0ae9efb21e4cb67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 16:31:30 +0900
Subject: [PATCH 04885/10326] Also test with distance snap enabled for sanity

---
 .../Editor/TestSceneObjectObjectSnap.cs          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
index 94f826d01f..1638ec8224 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
@@ -27,16 +27,20 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("get playfield", () => playfield = Editor.ChildrenOfType<OsuPlayfield>().First());
         }
 
-        [Test]
-        public void TestHitCircleSnapsToOtherHitCircle()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestHitCircleSnapsToOtherHitCircle(bool distanceSnapEnabled)
         {
             AddStep("move mouse to centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre));
 
-            AddStep("disable distance snap", () =>
+            if (!distanceSnapEnabled)
             {
-                InputManager.PressKey(Key.Q);
-                InputManager.ReleaseKey(Key.Q);
-            });
+                AddStep("disable distance snap", () =>
+                {
+                    InputManager.PressKey(Key.Q);
+                    InputManager.ReleaseKey(Key.Q);
+                });
+            }
 
             AddStep("enter placement mode", () =>
             {

From 15b1069099a8ff53e719839e570f08a8c1cd9fa1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 16:37:08 +0900
Subject: [PATCH 04886/10326] Fix tests not being relative to screen space

---
 .../Editor/TestSceneObjectObjectSnap.cs                     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
index 1638ec8224..da987c7f47 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("place first object", () => InputManager.Click(MouseButton.Left));
 
-            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(5)));
+            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.02f, 0)));
 
             AddStep("place second object", () => InputManager.Click(MouseButton.Left));
 
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("start slider placement", () => InputManager.Click(MouseButton.Left));
 
-            AddStep("move to place end", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(120, 0)));
+            AddStep("move to place end", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.185f, 0)));
 
             AddStep("end slider placement", () => InputManager.Click(MouseButton.Right));
 
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 InputManager.ReleaseKey(Key.Number2);
             });
 
-            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(130, 0)));
+            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.20f, 0)));
 
             AddStep("place second object", () => InputManager.Click(MouseButton.Left));
 

From 158d3071261592bc6c5e41b39ac0909e6e938661 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 17:03:54 +0900
Subject: [PATCH 04887/10326] Avoid destroying editor screens when changing
 between modes

---
 .../Screens/Edit/Compose/ComposeScreen.cs     |  5 +++++
 osu.Game/Screens/Edit/Design/DesignScreen.cs  |  1 +
 osu.Game/Screens/Edit/Editor.cs               | 20 ++++++++++++++++---
 osu.Game/Screens/Edit/EditorScreen.cs         |  6 +++++-
 .../Screens/Edit/EditorScreenWithTimeline.cs  |  5 +++++
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    |  5 +++++
 osu.Game/Screens/Edit/Timing/TimingScreen.cs  |  5 +++++
 7 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 04983ca597..d7a4661fa0 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -13,6 +13,11 @@ namespace osu.Game.Screens.Edit.Compose
     {
         private HitObjectComposer composer;
 
+        public ComposeScreen()
+            : base(EditorScreenMode.Compose)
+        {
+        }
+
         protected override Drawable CreateMainContent()
         {
             var ruleset = Beatmap.Value.BeatmapInfo.Ruleset?.CreateInstance();
diff --git a/osu.Game/Screens/Edit/Design/DesignScreen.cs b/osu.Game/Screens/Edit/Design/DesignScreen.cs
index 9f1fcf55b2..f15639733c 100644
--- a/osu.Game/Screens/Edit/Design/DesignScreen.cs
+++ b/osu.Game/Screens/Edit/Design/DesignScreen.cs
@@ -6,6 +6,7 @@ namespace osu.Game.Screens.Edit.Design
     public class DesignScreen : EditorScreen
     {
         public DesignScreen()
+            : base(EditorScreenMode.Design)
         {
             Child = new ScreenWhiteBox.UnderConstructionMessage("Design mode");
         }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b7a59bc2e2..2ffffe1c66 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Edit
         private string lastSavedHash;
 
         private Box bottomBackground;
-        private Container screenContainer;
+        private Container<EditorScreen> screenContainer;
 
         private EditorScreen currentScreen;
 
@@ -163,7 +163,7 @@ namespace osu.Game.Screens.Edit
                         Name = "Screen container",
                         RelativeSizeAxes = Axes.Both,
                         Padding = new MarginPadding { Top = 40, Bottom = 60 },
-                        Child = screenContainer = new Container
+                        Child = screenContainer = new Container<EditorScreen>
                         {
                             RelativeSizeAxes = Axes.Both,
                             Masking = true
@@ -512,7 +512,21 @@ namespace osu.Game.Screens.Edit
 
         private void onModeChanged(ValueChangedEvent<EditorScreenMode> e)
         {
-            currentScreen?.Exit();
+            var lastScreen = currentScreen;
+
+            lastScreen?
+                .ScaleTo(0.98f, 200, Easing.OutQuint)
+                .FadeOut(200, Easing.OutQuint);
+
+            if ((currentScreen = screenContainer.FirstOrDefault(s => s.Type == e.NewValue)) != null)
+            {
+                screenContainer.ChangeChildDepth(currentScreen, lastScreen?.Depth + 1 ?? 0);
+
+                currentScreen
+                    .ScaleTo(1, 200, Easing.OutQuint)
+                    .FadeIn(200, Easing.OutQuint);
+                return;
+            }
 
             switch (e.NewValue)
             {
diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs
index 8b5f0aaa71..52bffc4342 100644
--- a/osu.Game/Screens/Edit/EditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorScreen.cs
@@ -23,8 +23,12 @@ namespace osu.Game.Screens.Edit
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        protected EditorScreen()
+        public readonly EditorScreenMode Type;
+
+        protected EditorScreen(EditorScreenMode type)
         {
+            Type = type;
+
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
             RelativeSizeAxes = Axes.Both;
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 66d90809db..34eddbefad 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -25,6 +25,11 @@ namespace osu.Game.Screens.Edit
 
         private Container timelineContainer;
 
+        protected EditorScreenWithTimeline(EditorScreenMode type)
+            : base(type)
+        {
+        }
+
         [BackgroundDependencyLoader(true)]
         private void load([CanBeNull] BindableBeatDivisor beatDivisor)
         {
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index a2c8f19016..9dcdcb25f5 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -24,6 +24,11 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox creatorTextBox;
         private LabelledTextBox difficultyTextBox;
 
+        public SetupScreen()
+            : base(EditorScreenMode.SongSetup)
+        {
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 8c40c8e721..d7da29218f 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -24,6 +24,11 @@ namespace osu.Game.Screens.Edit.Timing
         [Resolved]
         private EditorClock clock { get; set; }
 
+        public TimingScreen()
+            : base(EditorScreenMode.Timing)
+        {
+        }
+
         protected override Drawable CreateMainContent() => new GridContainer
         {
             RelativeSizeAxes = Axes.Both,

From 937d5870b3bde89750e79e3f0f5237641114a026 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 18:18:34 +0900
Subject: [PATCH 04888/10326] Add a basic file selector with extension
 filtering support

---
 .../Settings/TestSceneDirectorySelector.cs    |  3 +-
 .../Visual/Settings/TestSceneFileSelector.cs  | 18 +++++
 .../Screens/StablePathSelectScreen.cs         |  2 +-
 .../UserInterfaceV2/DirectorySelector.cs      | 79 ++++++++++++-------
 .../Graphics/UserInterfaceV2/FileSelector.cs  | 68 ++++++++++++++++
 .../Maintenance/MigrationSelectScreen.cs      |  2 +-
 6 files changed, 138 insertions(+), 34 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/FileSelector.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
index 0cd0f13b5f..082d85603e 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Platform;
 using osu.Game.Graphics.UserInterfaceV2;
 
 namespace osu.Game.Tests.Visual.Settings
@@ -11,7 +10,7 @@ namespace osu.Game.Tests.Visual.Settings
     public class TestSceneDirectorySelector : OsuTestScene
     {
         [BackgroundDependencyLoader]
-        private void load(GameHost host)
+        private void load()
         {
             Add(new DirectorySelector { RelativeSizeAxes = Axes.Both });
         }
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs b/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs
new file mode 100644
index 0000000000..08173148b0
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.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;
+using osu.Game.Graphics.UserInterfaceV2;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    public class TestSceneFileSelector : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Add(new FileSelector { RelativeSizeAxes = Axes.Both });
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index b4d56f60c7..717b43f704 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Tournament.Screens
 
         protected virtual void ChangePath()
         {
-            var target = directorySelector.CurrentDirectory.Value.FullName;
+            var target = directorySelector.CurrentPath.Value.FullName;
             var fileBasedIpc = ipc as FileBasedIPC;
             Logger.Log($"Changing Stable CE location to {target}");
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
index ae34281bfb..a1cd074619 100644
--- a/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/DirectorySelector.cs
@@ -28,11 +28,11 @@ namespace osu.Game.Graphics.UserInterfaceV2
         private GameHost host { get; set; }
 
         [Cached]
-        public readonly Bindable<DirectoryInfo> CurrentDirectory = new Bindable<DirectoryInfo>();
+        public readonly Bindable<DirectoryInfo> CurrentPath = new Bindable<DirectoryInfo>();
 
         public DirectorySelector(string initialPath = null)
         {
-            CurrentDirectory.Value = new DirectoryInfo(initialPath ?? Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
+            CurrentPath.Value = new DirectoryInfo(initialPath ?? Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
         }
 
         [BackgroundDependencyLoader]
@@ -74,7 +74,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 }
             };
 
-            CurrentDirectory.BindValueChanged(updateDisplay, true);
+            CurrentPath.BindValueChanged(updateDisplay, true);
         }
 
         private void updateDisplay(ValueChangedEvent<DirectoryInfo> directory)
@@ -92,22 +92,27 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 }
                 else
                 {
-                    directoryFlow.Add(new ParentDirectoryPiece(CurrentDirectory.Value.Parent));
+                    directoryFlow.Add(new ParentDirectoryPiece(CurrentPath.Value.Parent));
 
-                    foreach (var dir in CurrentDirectory.Value.GetDirectories().OrderBy(d => d.Name))
-                    {
-                        if ((dir.Attributes & FileAttributes.Hidden) == 0)
-                            directoryFlow.Add(new DirectoryPiece(dir));
-                    }
+                    directoryFlow.AddRange(GetEntriesForPath(CurrentPath.Value));
                 }
             }
             catch (Exception)
             {
-                CurrentDirectory.Value = directory.OldValue;
+                CurrentPath.Value = directory.OldValue;
                 this.FlashColour(Color4.Red, 300);
             }
         }
 
+        protected virtual IEnumerable<DisplayPiece> GetEntriesForPath(DirectoryInfo path)
+        {
+            foreach (var dir in path.GetDirectories().OrderBy(d => d.Name))
+            {
+                if ((dir.Attributes & FileAttributes.Hidden) == 0)
+                    yield return new DirectoryPiece(dir);
+            }
+        }
+
         private class CurrentDirectoryDisplay : CompositeDrawable
         {
             [Resolved]
@@ -126,7 +131,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
                         Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.X,
                         Spacing = new Vector2(5),
-                        Height = DirectoryPiece.HEIGHT,
+                        Height = DisplayPiece.HEIGHT,
                         Direction = FillDirection.Horizontal,
                     },
                 };
@@ -150,7 +155,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
                 flow.ChildrenEnumerable = new Drawable[]
                 {
-                    new OsuSpriteText { Text = "Current Directory: ", Font = OsuFont.Default.With(size: DirectoryPiece.HEIGHT), },
+                    new OsuSpriteText { Text = "Current Directory: ", Font = OsuFont.Default.With(size: DisplayPiece.HEIGHT), },
                     new ComputerPiece(),
                 }.Concat(pathPieces);
             }
@@ -198,24 +203,44 @@ namespace osu.Game.Graphics.UserInterfaceV2
             }
         }
 
-        private class DirectoryPiece : CompositeDrawable
+        protected class DirectoryPiece : DisplayPiece
         {
-            public const float HEIGHT = 20;
-
-            protected const float FONT_SIZE = 16;
-
             protected readonly DirectoryInfo Directory;
 
-            private readonly string displayName;
-
-            protected FillFlowContainer Flow;
-
             [Resolved]
             private Bindable<DirectoryInfo> currentDirectory { get; set; }
 
             public DirectoryPiece(DirectoryInfo directory, string displayName = null)
+                : base(displayName)
             {
                 Directory = directory;
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                currentDirectory.Value = Directory;
+                return true;
+            }
+
+            protected override string FallbackName => Directory.Name;
+
+            protected override IconUsage? Icon => Directory.Name.Contains(Path.DirectorySeparatorChar)
+                ? FontAwesome.Solid.Database
+                : FontAwesome.Regular.Folder;
+        }
+
+        protected abstract class DisplayPiece : CompositeDrawable
+        {
+            public const float HEIGHT = 20;
+
+            protected const float FONT_SIZE = 16;
+
+            private readonly string displayName;
+
+            protected FillFlowContainer Flow;
+
+            protected DisplayPiece(string displayName = null)
+            {
                 this.displayName = displayName;
             }
 
@@ -259,20 +284,14 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    Text = displayName ?? Directory.Name,
+                    Text = displayName ?? FallbackName,
                     Font = OsuFont.Default.With(size: FONT_SIZE)
                 });
             }
 
-            protected override bool OnClick(ClickEvent e)
-            {
-                currentDirectory.Value = Directory;
-                return true;
-            }
+            protected abstract string FallbackName { get; }
 
-            protected virtual IconUsage? Icon => Directory.Name.Contains(Path.DirectorySeparatorChar)
-                ? FontAwesome.Solid.Database
-                : FontAwesome.Regular.Folder;
+            protected abstract IconUsage? Icon { get; }
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterfaceV2/FileSelector.cs b/osu.Game/Graphics/UserInterfaceV2/FileSelector.cs
new file mode 100644
index 0000000000..861d1887e1
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/FileSelector.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 System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    public class FileSelector : DirectorySelector
+    {
+        private readonly string[] validFileExtensions;
+
+        [Cached]
+        public readonly Bindable<FileInfo> CurrentFile = new Bindable<FileInfo>();
+
+        public FileSelector(string initialPath = null, string[] validFileExtensions = null)
+            : base(initialPath)
+        {
+            this.validFileExtensions = validFileExtensions ?? Array.Empty<string>();
+        }
+
+        protected override IEnumerable<DisplayPiece> GetEntriesForPath(DirectoryInfo path)
+        {
+            foreach (var dir in base.GetEntriesForPath(path))
+                yield return dir;
+
+            IEnumerable<FileInfo> files = path.GetFiles();
+
+            if (validFileExtensions.Length > 0)
+                files = files.Where(f => validFileExtensions.Contains(f.Extension));
+
+            foreach (var file in files.OrderBy(d => d.Name))
+            {
+                if ((file.Attributes & FileAttributes.Hidden) == 0)
+                    yield return new FilePiece(file);
+            }
+        }
+
+        protected class FilePiece : DisplayPiece
+        {
+            private readonly FileInfo file;
+
+            [Resolved]
+            private Bindable<FileInfo> currentFile { get; set; }
+
+            public FilePiece(FileInfo file)
+            {
+                this.file = file;
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                currentFile.Value = file;
+                return true;
+            }
+
+            protected override string FallbackName => file.Name;
+
+            protected override IconUsage? Icon => FontAwesome.Regular.FileAudio;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index 79d842a617..ad540e3691 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         private void start()
         {
-            var target = directorySelector.CurrentDirectory.Value;
+            var target = directorySelector.CurrentPath.Value;
 
             try
             {

From ea77ea4a08757dc77cf2d1470666395efe79f349 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 17:24:05 +0900
Subject: [PATCH 04889/10326] Add basic testing of new beatmaps persistence

---
 .../Editing/TestSceneEditorBeatmapCreation.cs | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
new file mode 100644
index 0000000000..3cc95dec9e
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.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 NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Storyboards;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneEditorBeatmapCreation : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) => new DummyWorkingBeatmap(Audio, null);
+
+        [Test]
+        public void TestCreateNewBeatmap()
+        {
+            AddStep("save beatmap", () => Editor.Save());
+            AddAssert("new beatmap persisted", () => EditorBeatmap.BeatmapInfo.ID > 0);
+        }
+    }
+}

From 4b9581bca0cbab33263239a8204dece936de3faa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 18:18:50 +0900
Subject: [PATCH 04890/10326] Add audio selection to song setup screen

---
 .../UserInterfaceV2/LabelledTextBox.cs        |  9 ++-
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    | 80 +++++++++++++++++++
 2 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
index 290aba3468..72d25a7836 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
@@ -44,12 +44,17 @@ namespace osu.Game.Graphics.UserInterfaceV2
             Component.BorderColour = colours.Blue;
         }
 
-        protected override OsuTextBox CreateComponent() => new OsuTextBox
+        protected virtual OsuTextBox CreateTextBox() => new OsuTextBox
         {
             Anchor = Anchor.Centre,
             Origin = Anchor.Centre,
             RelativeSizeAxes = Axes.X,
             CornerRadius = CORNER_RADIUS,
-        }.With(t => t.OnCommit += (sender, newText) => OnCommit?.Invoke(sender, newText));
+        };
+
+        protected override OsuTextBox CreateComponent() => CreateTextBox().With(t =>
+        {
+            t.OnCommit += (sender, newText) => OnCommit?.Invoke(sender, newText);
+        });
     }
 }
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index a2c8f19016..b0de9e6674 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -1,16 +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;
+using System.IO;
 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.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK;
 
@@ -23,10 +28,17 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox titleTextBox;
         private LabelledTextBox creatorTextBox;
         private LabelledTextBox difficultyTextBox;
+        private LabelledTextBox audioTrackTextBox;
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
+            Container audioTrackFileChooserContainer = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+            };
+
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
@@ -70,6 +82,18 @@ namespace osu.Game.Screens.Edit.Setup
                                         },
                                     },
                                     new OsuSpriteText
+                                    {
+                                        Text = "Resources"
+                                    },
+                                    audioTrackTextBox = new FileChooserLabelledTextBox
+                                    {
+                                        Label = "Audio Track",
+                                        Current = { Value = Beatmap.Value.Metadata.AudioFile ?? "Click to select a track" },
+                                        Target = audioTrackFileChooserContainer,
+                                        TabbableContentContainer = this
+                                    },
+                                    audioTrackFileChooserContainer,
+                                    new OsuSpriteText
                                     {
                                         Text = "Beatmap metadata"
                                     },
@@ -120,4 +144,60 @@ namespace osu.Game.Screens.Edit.Setup
             Beatmap.Value.BeatmapInfo.Version = difficultyTextBox.Current.Value;
         }
     }
+
+    internal class FileChooserLabelledTextBox : LabelledTextBox
+    {
+        public Container Target;
+
+        private readonly IBindable<FileInfo> currentFile = new Bindable<FileInfo>();
+
+        public FileChooserLabelledTextBox()
+        {
+            currentFile.BindValueChanged(onFileSelected);
+        }
+
+        private void onFileSelected(ValueChangedEvent<FileInfo> file)
+        {
+            if (file.NewValue == null)
+                return;
+
+            Target.Clear();
+            Current.Value = file.NewValue.FullName;
+        }
+
+        protected override OsuTextBox CreateTextBox() =>
+            new FileChooserOsuTextBox
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.X,
+                CornerRadius = CORNER_RADIUS,
+                OnFocused = DisplayFileChooser
+            };
+
+        public void DisplayFileChooser()
+        {
+            Target.Child = new FileSelector("/Users/Dean/.osu/Songs", new[] { ".mp3", ".ogg" })
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = 400,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                CurrentFile = { BindTarget = currentFile }
+            };
+        }
+
+        internal class FileChooserOsuTextBox : OsuTextBox
+        {
+            public Action OnFocused;
+
+            protected override void OnFocus(FocusEvent e)
+            {
+                OnFocused?.Invoke();
+                base.OnFocus(e);
+
+                GetContainingInputManager().TriggerFocusContention(this);
+            }
+        }
+    }
 }

From 4d714866cdba4d3ef7c171c6d3f9316eb8cd5d43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 18:30:02 +0900
Subject: [PATCH 04891/10326] Add ability to actually import a new audio file
 to the beatmap / database

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 30 +++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index b0de9e6674..02b8afffe9 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,13 +10,16 @@ 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.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.IO;
 using osuTK;
+using FileInfo = System.IO.FileInfo;
 
 namespace osu.Game.Screens.Edit.Setup
 {
@@ -128,10 +130,36 @@ namespace osu.Game.Screens.Edit.Setup
                 }
             };
 
+            audioTrackTextBox.Current.BindValueChanged(audioTrackChanged);
+
             foreach (var item in flow.OfType<LabelledTextBox>())
                 item.OnCommit += onCommit;
         }
 
+        [Resolved]
+        private FileStore files { get; set; }
+
+        private void audioTrackChanged(ValueChangedEvent<string> filePath)
+        {
+            var info = new FileInfo(filePath.NewValue);
+
+            if (!info.Exists)
+                audioTrackTextBox.Current.Value = filePath.OldValue;
+
+            IO.FileInfo osuFileInfo;
+
+            using (var stream = info.OpenRead())
+                osuFileInfo = files.Add(stream);
+
+            Beatmap.Value.BeatmapSetInfo.Files.Add(new BeatmapSetFileInfo
+            {
+                FileInfo = osuFileInfo,
+                Filename = info.Name
+            });
+
+            Beatmap.Value.Metadata.AudioFile = info.Name;
+        }
+
         private void onCommit(TextBox sender, bool newText)
         {
             if (!newText) return;

From 65e6dd2ac3e01f205b9d4b838696bd49acf2a7d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 18:34:17 +0900
Subject: [PATCH 04892/10326] Remove the previous audio file before adding a
 new one

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 02b8afffe9..ce201e544a 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -144,14 +144,29 @@ namespace osu.Game.Screens.Edit.Setup
             var info = new FileInfo(filePath.NewValue);
 
             if (!info.Exists)
+            {
                 audioTrackTextBox.Current.Value = filePath.OldValue;
+                return;
+            }
 
+            var beatmapFiles = Beatmap.Value.BeatmapSetInfo.Files;
+
+            // remove the old file
+            var oldFile = beatmapFiles.FirstOrDefault(f => f.Filename == filePath.OldValue);
+
+            if (oldFile != null)
+            {
+                beatmapFiles.Remove(oldFile);
+                files.Dereference(oldFile.FileInfo);
+            }
+
+            // add the new file
             IO.FileInfo osuFileInfo;
 
             using (var stream = info.OpenRead())
                 osuFileInfo = files.Add(stream);
 
-            Beatmap.Value.BeatmapSetInfo.Files.Add(new BeatmapSetFileInfo
+            beatmapFiles.Add(new BeatmapSetFileInfo
             {
                 FileInfo = osuFileInfo,
                 Filename = info.Name

From 978f6edf38488d7299f6e6df27a2887c74a077a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 18:55:49 +0900
Subject: [PATCH 04893/10326] Add basic track reloading support while inside
 the editor

---
 osu.Game/Overlays/MusicController.cs       |  5 +++++
 osu.Game/Screens/Edit/Editor.cs            | 17 +++++++++++++++--
 osu.Game/Screens/Edit/EditorClock.cs       |  9 +++++++--
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 11 +++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index b568e4d02b..66c9b15c0a 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -81,6 +81,11 @@ namespace osu.Game.Overlays
             mods.BindValueChanged(_ => ResetTrackAdjustments(), true);
         }
 
+        /// <summary>
+        /// Forcefully reload the current <see cref="WorkingBeatmap"/>'s track from disk.
+        /// </summary>
+        public void ForceReloadCurrentBeatmap() => changeTrack();
+
         /// <summary>
         /// Change the position of a <see cref="BeatmapSetInfo"/> in the current playlist.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b7a59bc2e2..74b92f3168 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -43,6 +43,7 @@ using osuTK.Input;
 namespace osu.Game.Screens.Edit
 {
     [Cached(typeof(IBeatSnapProvider))]
+    [Cached]
     public class Editor : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>, IKeyBindingHandler<PlatformAction>, IBeatSnapProvider
     {
         public override float BackgroundParallaxAmount => 0.1f;
@@ -91,6 +92,9 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private MusicController music { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, GameHost host)
         {
@@ -98,9 +102,9 @@ namespace osu.Game.Screens.Edit
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
-            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
             clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
-            clock.ChangeSource(sourceClock);
+
+            UpdateClockSource();
 
             dependencies.CacheAs(clock);
             AddInternal(clock);
@@ -271,6 +275,15 @@ namespace osu.Game.Screens.Edit
             bottomBackground.Colour = colours.Gray2;
         }
 
+        /// <summary>
+        /// If the beatmap's track has changed, this method must be called to keep the editor in a valid state.
+        /// </summary>
+        public void UpdateClockSource()
+        {
+            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
+            clock.ChangeSource(sourceClock);
+        }
+
         protected void Save()
         {
             // apply any set-level metadata changes.
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index d4d0feb813..a829f23697 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Utils;
@@ -17,7 +18,7 @@ namespace osu.Game.Screens.Edit
     /// </summary>
     public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock
     {
-        public readonly double TrackLength;
+        public double TrackLength;
 
         public ControlPointInfo ControlPointInfo;
 
@@ -190,7 +191,11 @@ namespace osu.Game.Screens.Edit
 
         public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
 
-        public void ChangeSource(IClock source) => underlyingClock.ChangeSource(source);
+        public void ChangeSource(IClock source)
+        {
+            underlyingClock.ChangeSource(source);
+            TrackLength = (source as Track)?.Length ?? 60000;
+        }
 
         public IClock Source => underlyingClock.Source;
 
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index ce201e544a..075815203c 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -18,6 +18,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.IO;
+using osu.Game.Overlays;
 using osuTK;
 using FileInfo = System.IO.FileInfo;
 
@@ -139,6 +140,12 @@ namespace osu.Game.Screens.Edit.Setup
         [Resolved]
         private FileStore files { get; set; }
 
+        [Resolved]
+        private MusicController music { get; set; }
+
+        [Resolved]
+        private Editor editor { get; set; }
+
         private void audioTrackChanged(ValueChangedEvent<string> filePath)
         {
             var info = new FileInfo(filePath.NewValue);
@@ -173,6 +180,10 @@ namespace osu.Game.Screens.Edit.Setup
             });
 
             Beatmap.Value.Metadata.AudioFile = info.Name;
+
+            music.ForceReloadCurrentBeatmap();
+
+            editor.UpdateClockSource();
         }
 
         private void onCommit(TextBox sender, bool newText)

From 7e7e2fd64a6c9e95919028e838fd5439971d83b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 19:01:28 +0900
Subject: [PATCH 04894/10326] Use bindable for track to fix rate adjustments
 not applying correctly

---
 osu.Game/Screens/Edit/Components/BottomBarContainer.cs |  7 +++++--
 osu.Game/Screens/Edit/Components/PlaybackControl.cs    |  4 ++--
 osu.Game/Screens/Edit/EditorClock.cs                   | 10 +++++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/BottomBarContainer.cs b/osu.Game/Screens/Edit/Components/BottomBarContainer.cs
index cb5078a479..08091fc3f7 100644
--- a/osu.Game/Screens/Edit/Components/BottomBarContainer.cs
+++ b/osu.Game/Screens/Edit/Components/BottomBarContainer.cs
@@ -18,7 +18,8 @@ namespace osu.Game.Screens.Edit.Components
         private const float contents_padding = 15;
 
         protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
-        protected Track Track => Beatmap.Value.Track;
+
+        protected readonly IBindable<Track> Track = new Bindable<Track>();
 
         private readonly Drawable background;
         private readonly Container content;
@@ -42,9 +43,11 @@ namespace osu.Game.Screens.Edit.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours)
+        private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours, EditorClock clock)
         {
             Beatmap.BindTo(beatmap);
+            Track.BindTo(clock.Track);
+
             background.Colour = colours.Gray1;
         }
     }
diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 59b3d1c565..9739f2876a 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -62,12 +62,12 @@ namespace osu.Game.Screens.Edit.Components
                 }
             };
 
-            Track?.AddAdjustment(AdjustableProperty.Tempo, tempo);
+            Track.BindValueChanged(tr => tr.NewValue?.AddAdjustment(AdjustableProperty.Tempo, tempo), true);
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            Track?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
+            Track.Value?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
 
             base.Dispose(isDisposing);
         }
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index a829f23697..ec203df064 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Utils;
@@ -18,7 +19,11 @@ namespace osu.Game.Screens.Edit
     /// </summary>
     public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock
     {
-        public double TrackLength;
+        public IBindable<Track> Track => track;
+
+        private readonly Bindable<Track> track = new Bindable<Track>();
+
+        public double TrackLength => track.Value?.Length ?? 60000;
 
         public ControlPointInfo ControlPointInfo;
 
@@ -36,7 +41,6 @@ namespace osu.Game.Screens.Edit
             this.beatDivisor = beatDivisor;
 
             ControlPointInfo = controlPointInfo;
-            TrackLength = trackLength;
 
             underlyingClock = new DecoupleableInterpolatingFramedClock();
         }
@@ -193,8 +197,8 @@ namespace osu.Game.Screens.Edit
 
         public void ChangeSource(IClock source)
         {
+            track.Value = source as Track;
             underlyingClock.ChangeSource(source);
-            TrackLength = (source as Track)?.Length ?? 60000;
         }
 
         public IClock Source => underlyingClock.Source;

From 833ff1c1d77df62adf003cfa30c1753699e59a77 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 19:12:12 +0900
Subject: [PATCH 04895/10326] Fix test failures due to editor dependency

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 075815203c..7090987093 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Edit.Setup
         [Resolved]
         private MusicController music { get; set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private Editor editor { get; set; }
 
         private void audioTrackChanged(ValueChangedEvent<string> filePath)

From cc9ae328116900fee199aff64e87d44d32f5be7b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 21:05:29 +0900
Subject: [PATCH 04896/10326] Fix summary timeline not updating to new track
 length correctly

---
 .../Components/Timelines/Summary/Parts/TimelinePart.cs    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index 4a7c3f26bc..5b8f7c747b 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osuTK;
 using osu.Framework.Graphics;
@@ -22,6 +23,8 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     {
         protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
+        protected readonly IBindable<Track> Track = new Bindable<Track>();
+
         private readonly Container<T> content;
 
         protected override Container<T> Content => content;
@@ -35,12 +38,15 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                 updateRelativeChildSize();
                 LoadBeatmap(b.NewValue);
             };
+
+            Track.ValueChanged += _ => updateRelativeChildSize();
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap)
+        private void load(IBindable<WorkingBeatmap> beatmap, EditorClock clock)
         {
             Beatmap.BindTo(beatmap);
+            Track.BindTo(clock.Track);
         }
 
         private void updateRelativeChildSize()

From 011b17624429504950f3befcf6159a931a806f0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 22:00:13 +0900
Subject: [PATCH 04897/10326] Add test coverage of audio track changing

---
 .../Editing/TestSceneEditorBeatmapCreation.cs | 35 ++++++++++++++++++
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    | 36 ++++++++++---------
 osu.Game/Tests/Visual/EditorTestScene.cs      |  6 ++--
 3 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 3cc95dec9e..8ba172fc70 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -1,11 +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.IO;
+using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Edit.Setup;
 using osu.Game.Storyboards;
+using osu.Game.Tests.Resources;
+using SharpCompress.Archives;
+using SharpCompress.Archives.Zip;
 
 namespace osu.Game.Tests.Visual.Editing
 {
@@ -13,6 +20,8 @@ namespace osu.Game.Tests.Visual.Editing
     {
         protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
 
+        protected override bool EditorComponentsReady => Editor.ChildrenOfType<SetupScreen>().FirstOrDefault()?.IsLoaded == true;
+
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) => new DummyWorkingBeatmap(Audio, null);
 
         [Test]
@@ -21,5 +30,31 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("save beatmap", () => Editor.Save());
             AddAssert("new beatmap persisted", () => EditorBeatmap.BeatmapInfo.ID > 0);
         }
+
+        [Test]
+        public void TestAddAudioTrack()
+        {
+            AddAssert("switch track to real track", () =>
+            {
+                var setup = Editor.ChildrenOfType<SetupScreen>().First();
+
+                var temp = TestResources.GetTestBeatmapForImport();
+
+                string extractedFolder = $"{temp}_extracted";
+                Directory.CreateDirectory(extractedFolder);
+
+                using (var zip = ZipArchive.Open(temp))
+                    zip.WriteToDirectory(extractedFolder);
+
+                bool success = setup.ChangeAudioTrack(Path.Combine(extractedFolder, "03. Renatus - Soleily 192kbps.mp3"));
+
+                File.Delete(temp);
+                Directory.Delete(extractedFolder, true);
+
+                return success;
+            });
+
+            AddAssert("track length changed", () => Beatmap.Value.Track.Length > 60000);
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 7090987093..e238e1fcf0 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -33,6 +33,15 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox difficultyTextBox;
         private LabelledTextBox audioTrackTextBox;
 
+        [Resolved]
+        private FileStore files { get; set; }
+
+        [Resolved]
+        private MusicController music { get; set; }
+
+        [Resolved(canBeNull: true)]
+        private Editor editor { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -137,29 +146,17 @@ namespace osu.Game.Screens.Edit.Setup
                 item.OnCommit += onCommit;
         }
 
-        [Resolved]
-        private FileStore files { get; set; }
-
-        [Resolved]
-        private MusicController music { get; set; }
-
-        [Resolved(canBeNull: true)]
-        private Editor editor { get; set; }
-
-        private void audioTrackChanged(ValueChangedEvent<string> filePath)
+        public bool ChangeAudioTrack(string path)
         {
-            var info = new FileInfo(filePath.NewValue);
+            var info = new FileInfo(path);
 
             if (!info.Exists)
-            {
-                audioTrackTextBox.Current.Value = filePath.OldValue;
-                return;
-            }
+                return false;
 
             var beatmapFiles = Beatmap.Value.BeatmapSetInfo.Files;
 
             // remove the old file
-            var oldFile = beatmapFiles.FirstOrDefault(f => f.Filename == filePath.OldValue);
+            var oldFile = beatmapFiles.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.AudioFile);
 
             if (oldFile != null)
             {
@@ -184,6 +181,13 @@ namespace osu.Game.Screens.Edit.Setup
             music.ForceReloadCurrentBeatmap();
 
             editor.UpdateClockSource();
+            return true;
+        }
+
+        private void audioTrackChanged(ValueChangedEvent<string> filePath)
+        {
+            if (!ChangeAudioTrack(filePath.NewValue))
+                audioTrackTextBox.Current.Value = filePath.OldValue;
         }
 
         private void onCommit(TextBox sender, bool newText)
diff --git a/osu.Game/Tests/Visual/EditorTestScene.cs b/osu.Game/Tests/Visual/EditorTestScene.cs
index 8f76f247cf..a9ee8e2668 100644
--- a/osu.Game/Tests/Visual/EditorTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorTestScene.cs
@@ -26,13 +26,15 @@ namespace osu.Game.Tests.Visual
             Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
         }
 
+        protected virtual bool EditorComponentsReady => Editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
+                                                        && Editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true;
+
         public override void SetUpSteps()
         {
             base.SetUpSteps();
 
             AddStep("load editor", () => LoadScreen(Editor = CreateEditor()));
-            AddUntilStep("wait for editor to load", () => Editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
-                                                          && Editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true);
+            AddUntilStep("wait for editor to load", () => EditorComponentsReady);
             AddStep("get beatmap", () => EditorBeatmap = Editor.ChildrenOfType<EditorBeatmap>().Single());
             AddStep("get clock", () => EditorClock = Editor.ChildrenOfType<EditorClock>().Single());
         }

From 94c1cc8ffa4b8eefb0c7bd498084e0d2dbee9c6f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 22:25:04 +0900
Subject: [PATCH 04898/10326] Fix test runs under headless

---
 .../Visual/Editing/TestSceneEditorBeatmapCreation.cs     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 8ba172fc70..7215b80a97 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.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.IO;
 using System.Linq;
 using NUnit.Framework;
@@ -22,11 +23,17 @@ namespace osu.Game.Tests.Visual.Editing
 
         protected override bool EditorComponentsReady => Editor.ChildrenOfType<SetupScreen>().FirstOrDefault()?.IsLoaded == true;
 
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) => new DummyWorkingBeatmap(Audio, null);
+        public override void SetUpSteps()
+        {
+            AddStep("set dummy", () => Beatmap.Value = new DummyWorkingBeatmap(Audio, null));
+
+            base.SetUpSteps();
+        }
 
         [Test]
         public void TestCreateNewBeatmap()
         {
+            AddStep("add random hitobject", () => EditorBeatmap.Metadata.Title = Guid.NewGuid().ToString());
             AddStep("save beatmap", () => Editor.Save());
             AddAssert("new beatmap persisted", () => EditorBeatmap.BeatmapInfo.ID > 0);
         }

From dbc522aedea4e0cf3e5b36b07e4e5f04d36f4b0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Sep 2020 22:41:52 +0900
Subject: [PATCH 04899/10326] Remove weird using

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

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 7215b80a97..df2fdfa79d 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -10,7 +10,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit.Setup;
-using osu.Game.Storyboards;
 using osu.Game.Tests.Resources;
 using SharpCompress.Archives;
 using SharpCompress.Archives.Zip;

From c3df7e1fa8c897971e9662f909ada3444e203930 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 01:05:12 +0900
Subject: [PATCH 04900/10326] Fix scroll container's scrollbar not respecting
 minimum size on first resize

---
 osu.Game/Graphics/Containers/OsuScrollContainer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Graphics/Containers/OsuScrollContainer.cs b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
index d504a11b22..ed5c73bee6 100644
--- a/osu.Game/Graphics/Containers/OsuScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
@@ -112,6 +112,9 @@ namespace osu.Game.Graphics.Containers
 
                 CornerRadius = 5;
 
+                // needs to be set initially for the ResizeTo to respect minimum size
+                Size = new Vector2(SCROLL_BAR_HEIGHT);
+
                 const float margin = 3;
 
                 Margin = new MarginPadding

From 6ff26f6b8c943e1178a5e4ebf78c086501cc75cb Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 24 Sep 2020 12:52:42 -0700
Subject: [PATCH 04901/10326] Fix anchor of tournament ruleset selector
 dropdown

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

diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
index 0e995ca73d..af0043436a 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
@@ -73,8 +73,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
                                     },
                                     new Container
                                     {
-                                        Anchor = Anchor.CentreRight,
-                                        Origin = Anchor.CentreRight,
+                                        Anchor = Anchor.TopRight,
+                                        Origin = Anchor.TopRight,
                                         RelativeSizeAxes = Axes.X,
                                         AutoSizeAxes = Axes.Y,
                                         Child = Component = CreateComponent().With(d =>

From 8a0c79466d8fdf159b07d360b150b27b9e73b23d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 12:16:50 +0900
Subject: [PATCH 04902/10326] Use simplified methods for press/release key

---
 .../Editor/TestSceneObjectObjectSnap.cs       | 32 +++----------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
index da987c7f47..1ca94df26b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
@@ -34,19 +34,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("move mouse to centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre));
 
             if (!distanceSnapEnabled)
-            {
-                AddStep("disable distance snap", () =>
-                {
-                    InputManager.PressKey(Key.Q);
-                    InputManager.ReleaseKey(Key.Q);
-                });
-            }
+                AddStep("disable distance snap", () => InputManager.Key(Key.Q));
 
-            AddStep("enter placement mode", () =>
-            {
-                InputManager.PressKey(Key.Number2);
-                InputManager.ReleaseKey(Key.Number2);
-            });
+            AddStep("enter placement mode", () => InputManager.Key(Key.Number2));
 
             AddStep("place first object", () => InputManager.Click(MouseButton.Left));
 
@@ -70,17 +60,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             AddStep("move mouse to centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre));
 
-            AddStep("disable distance snap", () =>
-            {
-                InputManager.PressKey(Key.Q);
-                InputManager.ReleaseKey(Key.Q);
-            });
+            AddStep("disable distance snap", () => InputManager.Key(Key.Q));
 
-            AddStep("enter slider placement mode", () =>
-            {
-                InputManager.PressKey(Key.Number3);
-                InputManager.ReleaseKey(Key.Number3);
-            });
+            AddStep("enter slider placement mode", () => InputManager.Key(Key.Number3));
 
             AddStep("start slider placement", () => InputManager.Click(MouseButton.Left));
 
@@ -88,11 +70,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("end slider placement", () => InputManager.Click(MouseButton.Right));
 
-            AddStep("enter circle placement mode", () =>
-            {
-                InputManager.PressKey(Key.Number2);
-                InputManager.ReleaseKey(Key.Number2);
-            });
+            AddStep("enter circle placement mode", () => InputManager.Key(Key.Number2));
 
             AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.20f, 0)));
 

From 44a6637c36a065f13b22d7786a8f22ed16c40840 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 12:20:37 +0900
Subject: [PATCH 04903/10326] Use SingleOrDefault

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 2ffffe1c66..c9d57785f9 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -518,7 +518,7 @@ namespace osu.Game.Screens.Edit
                 .ScaleTo(0.98f, 200, Easing.OutQuint)
                 .FadeOut(200, Easing.OutQuint);
 
-            if ((currentScreen = screenContainer.FirstOrDefault(s => s.Type == e.NewValue)) != null)
+            if ((currentScreen = screenContainer.SingleOrDefault(s => s.Type == e.NewValue)) != null)
             {
                 screenContainer.ChangeChildDepth(currentScreen, lastScreen?.Depth + 1 ?? 0);
 

From d602072ee3ddb834899295a7c664b6f170d73175 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 12:24:41 +0900
Subject: [PATCH 04904/10326] Use SingleOrDefault where feasible

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

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index df2fdfa79d..d4976c3d48 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Editing
     {
         protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
 
-        protected override bool EditorComponentsReady => Editor.ChildrenOfType<SetupScreen>().FirstOrDefault()?.IsLoaded == true;
+        protected override bool EditorComponentsReady => Editor.ChildrenOfType<SetupScreen>().SingleOrDefault()?.IsLoaded == true;
 
         public override void SetUpSteps()
         {

From 9846d87eb0787ec65f0df9ec6558448dbb18f0b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 12:25:50 +0900
Subject: [PATCH 04905/10326] Fix misleading step name (and add comment as to
 its purpose)

---
 .../Visual/Editing/TestSceneEditorBeatmapCreation.cs         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index d4976c3d48..ceacbd51a2 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -32,7 +32,10 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestCreateNewBeatmap()
         {
-            AddStep("add random hitobject", () => EditorBeatmap.Metadata.Title = Guid.NewGuid().ToString());
+            // if we save a beatmap with a hash collision, things fall over.
+            // probably needs a more solid resolution in the future but this will do for now.
+            AddStep("make new beatmap unique", () => EditorBeatmap.Metadata.Title = Guid.NewGuid().ToString());
+
             AddStep("save beatmap", () => Editor.Save());
             AddAssert("new beatmap persisted", () => EditorBeatmap.BeatmapInfo.ID > 0);
         }

From a17eac3692441e5664bc98c31c6b1c71a5c8ece2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 12:27:08 +0900
Subject: [PATCH 04906/10326] Rename reload method to not mention beatmap
 unnecessarily

---
 osu.Game/Overlays/MusicController.cs       | 2 +-
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 66c9b15c0a..0764f34697 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Forcefully reload the current <see cref="WorkingBeatmap"/>'s track from disk.
         /// </summary>
-        public void ForceReloadCurrentBeatmap() => changeTrack();
+        public void ReloadCurrentTrack() => changeTrack();
 
         /// <summary>
         /// Change the position of a <see cref="BeatmapSetInfo"/> in the current playlist.
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index e238e1fcf0..9c72268eea 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Screens.Edit.Setup
 
             Beatmap.Value.Metadata.AudioFile = info.Name;
 
-            music.ForceReloadCurrentBeatmap();
+            music.ReloadCurrentTrack();
 
             editor.UpdateClockSource();
             return true;

From b1e72c311edc68d3c98136349b4597418ba5e6c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 12:28:41 +0900
Subject: [PATCH 04907/10326] Add null check because we can

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 9c72268eea..4d553756b8 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Screens.Edit.Setup
 
             music.ReloadCurrentTrack();
 
-            editor.UpdateClockSource();
+            editor?.UpdateClockSource();
             return true;
         }
 

From f047ff10bfcb616b236b864cd5ae663d74875100 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 12:30:05 +0900
Subject: [PATCH 04908/10326] Remove local specification for file selector
 search path

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 4d553756b8..edbe75448b 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -235,7 +235,7 @@ namespace osu.Game.Screens.Edit.Setup
 
         public void DisplayFileChooser()
         {
-            Target.Child = new FileSelector("/Users/Dean/.osu/Songs", new[] { ".mp3", ".ogg" })
+            Target.Child = new FileSelector(validFileExtensions: new[] { ".mp3", ".ogg" })
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 400,

From a890e5830d8e2af9a200fd170d91202bc87fd514 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 12:42:28 +0900
Subject: [PATCH 04909/10326] Add more file icons

---
 .../Graphics/UserInterfaceV2/FileSelector.cs  | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/FileSelector.cs b/osu.Game/Graphics/UserInterfaceV2/FileSelector.cs
index 861d1887e1..e10b8f7033 100644
--- a/osu.Game/Graphics/UserInterfaceV2/FileSelector.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/FileSelector.cs
@@ -62,7 +62,33 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
             protected override string FallbackName => file.Name;
 
-            protected override IconUsage? Icon => FontAwesome.Regular.FileAudio;
+            protected override IconUsage? Icon
+            {
+                get
+                {
+                    switch (file.Extension)
+                    {
+                        case ".ogg":
+                        case ".mp3":
+                        case ".wav":
+                            return FontAwesome.Regular.FileAudio;
+
+                        case ".jpg":
+                        case ".jpeg":
+                        case ".png":
+                            return FontAwesome.Regular.FileImage;
+
+                        case ".mp4":
+                        case ".avi":
+                        case ".mov":
+                        case ".flv":
+                            return FontAwesome.Regular.FileVideo;
+
+                        default:
+                            return FontAwesome.Regular.File;
+                    }
+                }
+            }
         }
     }
 }

From a8c85ed882f2e7c7424e86d4a79ac7a6e05387ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 12:42:37 +0900
Subject: [PATCH 04910/10326] Add test for filtered mode

---
 .../Visual/Settings/TestSceneFileSelector.cs       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs b/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs
index 08173148b0..311e4c3362 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.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.Allocation;
+using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 
@@ -9,10 +9,16 @@ namespace osu.Game.Tests.Visual.Settings
 {
     public class TestSceneFileSelector : OsuTestScene
     {
-        [BackgroundDependencyLoader]
-        private void load()
+        [Test]
+        public void TestAllFiles()
         {
-            Add(new FileSelector { RelativeSizeAxes = Axes.Both });
+            AddStep("create", () => Child = new FileSelector { RelativeSizeAxes = Axes.Both });
+        }
+
+        [Test]
+        public void TestJpgFilesOnly()
+        {
+            AddStep("create", () => Child = new FileSelector(validFileExtensions: new[] { ".jpg" }) { RelativeSizeAxes = Axes.Both });
         }
     }
 }

From c21745eb075e2f0e44c3d8ea5b314f1224234622 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 12:43:41 +0900
Subject: [PATCH 04911/10326] Fix missing HeadlessTest specification in new
 test

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

diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index 89e3b48aa3..33e3c7cb8c 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -16,12 +16,14 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.UI;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.Rulesets
 {
+    [HeadlessTest]
     public class TestSceneDrawableRulesetDependencies : OsuTestScene
     {
         [Test]

From eff6af3111eba46adb782205eca4f2b7a40347c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 12:45:13 +0900
Subject: [PATCH 04912/10326] Add "bindables" to dictionary

---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 29ca385275..64f3d41acb 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -909,6 +909,7 @@ private void load()
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>

From 50ba320a5118e3bcd6c5d40022ca2df22ac4ab89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 13:10:04 +0900
Subject: [PATCH 04913/10326] Expand available file operations in
 ArchiveModelManager

---
 osu.Game/Beatmaps/BeatmapManager.cs      |  2 +-
 osu.Game/Database/ArchiveModelManager.cs | 44 +++++++++++++++++++-----
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index e9f41f6bff..b48ab6112e 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -260,7 +260,7 @@ namespace osu.Game.Beatmaps
                     fileInfo.Filename = beatmapInfo.Path;
 
                     stream.Seek(0, SeekOrigin.Begin);
-                    UpdateFile(setInfo, fileInfo, stream);
+                    ReplaceFile(setInfo, fileInfo, stream);
                 }
             }
 
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 76bc4f7755..c39b71b058 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -401,29 +401,55 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Update an existing file, or create a new entry if not already part of the <paramref name="model"/>'s files.
+        /// Replace an existing file with a new version.
         /// </summary>
         /// <param name="model">The item to operate on.</param>
-        /// <param name="file">The file model to be updated or added.</param>
+        /// <param name="file">The existing file to be replaced.</param>
         /// <param name="contents">The new file contents.</param>
-        public void UpdateFile(TModel model, TFileModel file, Stream contents)
+        /// <param name="filename">An optional filename for the new file. Will use the previous filename if not specified.</param>
+        public void ReplaceFile(TModel model, TFileModel file, Stream contents, string filename = null)
+        {
+            using (ContextFactory.GetForWrite())
+            {
+                DeleteFile(model, file);
+                AddFile(model, contents, filename ?? file.Filename);
+            }
+        }
+
+        /// <summary>
+        /// Delete new file.
+        /// </summary>
+        /// <param name="model">The item to operate on.</param>
+        /// <param name="file">The existing file to be deleted.</param>
+        public void DeleteFile(TModel model, TFileModel file)
         {
             using (var usage = ContextFactory.GetForWrite())
             {
                 // Dereference the existing file info, since the file model will be removed.
                 if (file.FileInfo != null)
-                {
                     Files.Dereference(file.FileInfo);
 
-                    // Remove the file model.
-                    usage.Context.Set<TFileModel>().Remove(file);
-                }
+                // This shouldn't be required, but here for safety in case the provided TModel is not being change tracked
+                // Definitely can be removed once we rework the database backend.
+                usage.Context.Set<TFileModel>().Remove(file);
 
-                // Add the new file info and containing file model.
                 model.Files.Remove(file);
+            }
+        }
+
+        /// <summary>
+        /// Add a new file.
+        /// </summary>
+        /// <param name="model">The item to operate on.</param>
+        /// <param name="contents">The new file contents.</param>
+        /// <param name="filename">The filename for the new file.</param>
+        public void AddFile(TModel model, Stream contents, string filename)
+        {
+            using (ContextFactory.GetForWrite())
+            {
                 model.Files.Add(new TFileModel
                 {
-                    Filename = file.Filename,
+                    Filename = filename,
                     FileInfo = Files.Add(contents)
                 });
 

From ea971ecb9008f2b09cee1fe546cf8a6ce4c65c81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 13:11:34 +0900
Subject: [PATCH 04914/10326] Remove local file handling from SetupScreen

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 34 ++++++++--------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index edbe75448b..802f304835 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.IO;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -17,10 +18,8 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.IO;
 using osu.Game.Overlays;
 using osuTK;
-using FileInfo = System.IO.FileInfo;
 
 namespace osu.Game.Screens.Edit.Setup
 {
@@ -34,10 +33,10 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox audioTrackTextBox;
 
         [Resolved]
-        private FileStore files { get; set; }
+        private MusicController music { get; set; }
 
         [Resolved]
-        private MusicController music { get; set; }
+        private BeatmapManager beatmaps { get; set; }
 
         [Resolved(canBeNull: true)]
         private Editor editor { get; set; }
@@ -153,28 +152,19 @@ namespace osu.Game.Screens.Edit.Setup
             if (!info.Exists)
                 return false;
 
-            var beatmapFiles = Beatmap.Value.BeatmapSetInfo.Files;
+            var set = Beatmap.Value.BeatmapSetInfo;
 
-            // remove the old file
-            var oldFile = beatmapFiles.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.AudioFile);
-
-            if (oldFile != null)
-            {
-                beatmapFiles.Remove(oldFile);
-                files.Dereference(oldFile.FileInfo);
-            }
-
-            // add the new file
-            IO.FileInfo osuFileInfo;
+            // remove the previous audio track for now.
+            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.AudioFile);
 
             using (var stream = info.OpenRead())
-                osuFileInfo = files.Add(stream);
-
-            beatmapFiles.Add(new BeatmapSetFileInfo
             {
-                FileInfo = osuFileInfo,
-                Filename = info.Name
-            });
+                if (oldFile != null)
+                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
+                else
+                    beatmaps.AddFile(set, stream, info.Name);
+            }
 
             Beatmap.Value.Metadata.AudioFile = info.Name;
 

From 892d440ed0f337ac47ed192f6db3fdebfbfa5b19 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 13:19:07 +0900
Subject: [PATCH 04915/10326] Add fallback path for potential null
 ParentGameplayClock

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index b585a78f42..6716f828ed 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -195,7 +196,7 @@ namespace osu.Game.Rulesets.UI
         {
             public GameplayClock ParentGameplayClock;
 
-            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => ParentGameplayClock.NonGameplayAdjustments;
+            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => ParentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty<Bindable<double>>();
 
             public StabilityGameplayClock(FramedClock underlyingClock)
                 : base(underlyingClock)

From 26ba7d3100ff77a91cf01ae4737f3c014b7fe5ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 13:20:19 +0900
Subject: [PATCH 04916/10326] Remove unused method (was moved to a more local
 location)

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

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 4094de1c4f..6679e56871 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -210,19 +210,6 @@ namespace osu.Game.Screens.Play
             base.Update();
         }
 
-        private double getTrueGameplayRate()
-        {
-            double baseRate = track.Rate;
-
-            if (speedAdjustmentsApplied)
-            {
-                baseRate /= UserPlaybackRate.Value;
-                baseRate /= pauseFreqAdjust.Value;
-            }
-
-            return baseRate;
-        }
-
         private bool speedAdjustmentsApplied;
 
         private void updateRate()

From 325bfdbf7139a779341d7ecd48fb758b2de4556a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 13:25:42 +0900
Subject: [PATCH 04917/10326] Fix hard crash on hitting an out of range key
 (Q~P)

---
 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 b81e0ce159..e2a49221c0 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -205,7 +205,7 @@ namespace osu.Game.Rulesets.Edit
 
             if (checkRightToggleFromKey(e.Key, out var rightIndex))
             {
-                var item = togglesCollection.Children[rightIndex];
+                var item = togglesCollection.ElementAtOrDefault(rightIndex);
 
                 if (item is SettingsCheckbox checkbox)
                 {

From 3c191cfe257280d2ef89983435cb4b3f22fff3a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 14:08:47 +0900
Subject: [PATCH 04918/10326] Add basic xmldoc to HitObjectComposer

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index b81e0ce159..0ea57ef4e1 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -31,6 +31,11 @@ using osuTK.Input;
 
 namespace osu.Game.Rulesets.Edit
 {
+    /// <summary>
+    /// Top level container for editor compose mode.
+    /// Responsible for providing snapping and generally gluing components together.
+    /// </summary>
+    /// <typeparam name="TObject">The base type of supported objects.</typeparam>
     [Cached(Type = typeof(IPlacementHandler))]
     public abstract class HitObjectComposer<TObject> : HitObjectComposer, IPlacementHandler
         where TObject : HitObject

From bca774a0d4c16b8ca53ddd5dc7d19061dbf35971 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 14:09:31 +0900
Subject: [PATCH 04919/10326] Allow BlueprintContainer to specify toggles

---
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs | 4 ++--
 osu.Game/Rulesets/Edit/HitObjectComposer.cs        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index e1cbfa93f6..2127385ab5 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -41,10 +41,10 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private readonly BindableBool distanceSnapToggle = new BindableBool(true) { Description = "Distance Snap" };
 
-        protected override IEnumerable<BindableBool> Toggles => new[]
+        protected override IEnumerable<Bindable<bool>> Toggles => base.Toggles.Concat(new[]
         {
             distanceSnapToggle
-        };
+        });
 
         private BindableList<HitObject> selectedHitObjects;
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 0ea57ef4e1..b2d7c40a22 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -170,7 +170,7 @@ namespace osu.Game.Rulesets.Edit
         /// A collection of toggles which will be displayed to the user.
         /// The display name will be decided by <see cref="Bindable{T}.Description"/>.
         /// </summary>
-        protected virtual IEnumerable<BindableBool> Toggles => Enumerable.Empty<BindableBool>();
+        protected virtual IEnumerable<Bindable<bool>> Toggles => BlueprintContainer.Toggles;
 
         /// <summary>
         /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.

From e009264f1029fa336439f2a2d10d081b6b2d9c03 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 14:10:30 +0900
Subject: [PATCH 04920/10326] Add new combo toggle to main composer interface

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs  |  2 +-
 .../Compose/Components/BlueprintContainer.cs  | 18 ++++----
 .../Components/ComposeBlueprintContainer.cs   | 41 +++++++++++++++++++
 .../Compose/Components/SelectionHandler.cs    |  2 +
 4 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 02d5955ae6..d986b71380 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// The <see cref="HitObject"/> that is being placed.
         /// </summary>
-        protected readonly HitObject HitObject;
+        public readonly HitObject HitObject;
 
         [Resolved(canBeNull: true)]
         protected EditorClock EditorClock { get; private set; }
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index bf1e18771f..aa567dbdf4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private EditorClock editorClock { get; set; }
 
         [Resolved]
-        private EditorBeatmap beatmap { get; set; }
+        protected EditorBeatmap Beatmap { get; private set; }
 
         private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
 
@@ -68,10 +68,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DragBox.CreateProxy().With(p => p.Depth = float.MinValue)
             });
 
-            foreach (var obj in beatmap.HitObjects)
+            foreach (var obj in Beatmap.HitObjects)
                 AddBlueprintFor(obj);
 
-            selectedHitObjects.BindTo(beatmap.SelectedHitObjects);
+            selectedHitObjects.BindTo(Beatmap.SelectedHitObjects);
             selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
             {
                 switch (args.Action)
@@ -94,8 +94,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.LoadComplete();
 
-            beatmap.HitObjectAdded += AddBlueprintFor;
-            beatmap.HitObjectRemoved += removeBlueprintFor;
+            Beatmap.HitObjectAdded += AddBlueprintFor;
+            Beatmap.HitObjectRemoved += removeBlueprintFor;
         }
 
         protected virtual Container<SelectionBlueprint> CreateSelectionBlueprintContainer() =>
@@ -271,7 +271,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             blueprint.Selected += onBlueprintSelected;
             blueprint.Deselected += onBlueprintDeselected;
 
-            if (beatmap.SelectedHitObjects.Contains(hitObject))
+            if (Beatmap.SelectedHitObjects.Contains(hitObject))
                 blueprint.Select();
 
             SelectionBlueprints.Add(blueprint);
@@ -460,10 +460,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.Dispose(isDisposing);
 
-            if (beatmap != null)
+            if (Beatmap != null)
             {
-                beatmap.HitObjectAdded -= AddBlueprintFor;
-                beatmap.HitObjectRemoved -= removeBlueprintFor;
+                Beatmap.HitObjectAdded -= AddBlueprintFor;
+                Beatmap.HitObjectRemoved -= removeBlueprintFor;
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index e1f311f1b8..2a7c52579f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -4,6 +4,7 @@
 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.Input;
@@ -11,6 +12,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Types;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components
@@ -54,8 +56,45 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.LoadComplete();
 
             inputManager = GetContainingInputManager();
+
+            Beatmap.SelectedHitObjects.CollectionChanged += (_, __) => updateTogglesFromSelection();
+
+            // the updated object may be in the selection
+            Beatmap.HitObjectUpdated += _ => updateTogglesFromSelection();
+
+            NewCombo.ValueChanged += combo =>
+            {
+                if (Beatmap.SelectedHitObjects.Count > 0)
+                {
+                    foreach (var h in Beatmap.SelectedHitObjects)
+                    {
+                        if (h is IHasComboInformation c)
+                        {
+                            c.NewCombo = combo.NewValue;
+                            Beatmap.UpdateHitObject(h);
+                        }
+                    }
+                }
+                else if (currentPlacement != null)
+                {
+                    // update placement object from toggle
+                    if (currentPlacement.HitObject is IHasComboInformation c)
+                        c.NewCombo = combo.NewValue;
+                }
+            };
         }
 
+        private void updateTogglesFromSelection() =>
+            NewCombo.Value = Beatmap.SelectedHitObjects.OfType<IHasComboInformation>().All(c => c.NewCombo);
+
+        public readonly Bindable<bool> NewCombo = new Bindable<bool> { Description = "New Combo" };
+
+        public virtual IEnumerable<Bindable<bool>> Toggles => new[]
+        {
+            //TODO: this should only be enabled (visible?) for rulesets that provide combo-supporting HitObjects.
+            NewCombo
+        };
+
         #region Placement
 
         /// <summary>
@@ -86,7 +125,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 removePlacement();
 
             if (currentPlacement != null)
+            {
                 updatePlacementPosition();
+            }
         }
 
         protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 6e2c8bd01c..ca22b443fb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -35,6 +35,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
         private readonly List<SelectionBlueprint> selectedBlueprints;
 
+        public int SelectedCount => selectedBlueprints.Count;
+
         public IEnumerable<HitObject> SelectedHitObjects => selectedBlueprints.Select(b => b.HitObject);
 
         private Drawable content;

From a6adf8334eea25818c0c38ba7dc59ff7358ee910 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 14:19:35 +0900
Subject: [PATCH 04921/10326] Use existing method to update combo state of
 selection

---
 .../Compose/Components/BlueprintContainer.cs  | 44 +++++++++----------
 .../Components/ComposeBlueprintContainer.cs   |  9 +---
 .../Compose/Components/SelectionHandler.cs    |  2 +-
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index aa567dbdf4..fc37aa577c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
     /// A container which provides a "blueprint" display of hitobjects.
-    /// Includes selection and manipulation support via a <see cref="SelectionHandler"/>.
+    /// Includes selection and manipulation support via a <see cref="Components.SelectionHandler"/>.
     /// </summary>
     public abstract class BlueprintContainer : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected Container<SelectionBlueprint> SelectionBlueprints { get; private set; }
 
-        private SelectionHandler selectionHandler;
+        protected SelectionHandler SelectionHandler;
 
         [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }
@@ -56,15 +56,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            selectionHandler = CreateSelectionHandler();
-            selectionHandler.DeselectAll = deselectAll;
+            SelectionHandler = CreateSelectionHandler();
+            SelectionHandler.DeselectAll = deselectAll;
 
             AddRangeInternal(new[]
             {
                 DragBox = CreateDragBox(selectBlueprintsFromDragRectangle),
-                selectionHandler,
+                SelectionHandler,
                 SelectionBlueprints = CreateSelectionBlueprintContainer(),
-                selectionHandler.CreateProxy(),
+                SelectionHandler.CreateProxy(),
                 DragBox.CreateProxy().With(p => p.Depth = float.MinValue)
             });
 
@@ -102,7 +102,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             new Container<SelectionBlueprint> { RelativeSizeAxes = Axes.Both };
 
         /// <summary>
-        /// Creates a <see cref="SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
+        /// Creates a <see cref="Components.SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
         /// </summary>
         protected virtual SelectionHandler CreateSelectionHandler() => new SelectionHandler();
 
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
 
             // store for double-click handling
-            clickedBlueprint = selectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered);
+            clickedBlueprint = SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered);
 
             // Deselection should only occur if no selected blueprints are hovered
             // A special case for when a blueprint was selected via this click is added since OnClick() may occur outside the hitobject and should not trigger deselection
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
 
             // ensure the blueprint which was hovered for the first click is still the hovered blueprint.
-            if (clickedBlueprint == null || selectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != clickedBlueprint)
+            if (clickedBlueprint == null || SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != clickedBlueprint)
                 return false;
 
             editorClock?.SeekTo(clickedBlueprint.HitObject.StartTime);
@@ -208,7 +208,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (DragBox.State == Visibility.Visible)
             {
                 DragBox.Hide();
-                selectionHandler.UpdateVisibility();
+                SelectionHandler.UpdateVisibility();
             }
         }
 
@@ -217,7 +217,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             switch (e.Key)
             {
                 case Key.Escape:
-                    if (!selectionHandler.SelectedBlueprints.Any())
+                    if (!SelectionHandler.SelectedBlueprints.Any())
                         return false;
 
                     deselectAll();
@@ -298,14 +298,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             bool allowDeselection = e.ControlPressed && e.Button == MouseButton.Left;
 
             // Todo: This is probably incorrectly disallowing multiple selections on stacked objects
-            if (!allowDeselection && selectionHandler.SelectedBlueprints.Any(s => s.IsHovered))
+            if (!allowDeselection && SelectionHandler.SelectedBlueprints.Any(s => s.IsHovered))
                 return;
 
             foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
             {
                 if (blueprint.IsHovered)
                 {
-                    selectionHandler.HandleSelectionRequested(blueprint, e.CurrentState);
+                    SelectionHandler.HandleSelectionRequested(blueprint, e.CurrentState);
                     clickSelectionBegan = true;
                     break;
                 }
@@ -358,23 +358,23 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void selectAll()
         {
             SelectionBlueprints.ToList().ForEach(m => m.Select());
-            selectionHandler.UpdateVisibility();
+            SelectionHandler.UpdateVisibility();
         }
 
         /// <summary>
         /// Deselects all selected <see cref="SelectionBlueprint"/>s.
         /// </summary>
-        private void deselectAll() => selectionHandler.SelectedBlueprints.ToList().ForEach(m => m.Deselect());
+        private void deselectAll() => SelectionHandler.SelectedBlueprints.ToList().ForEach(m => m.Deselect());
 
         private void onBlueprintSelected(SelectionBlueprint blueprint)
         {
-            selectionHandler.HandleSelected(blueprint);
+            SelectionHandler.HandleSelected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 1);
         }
 
         private void onBlueprintDeselected(SelectionBlueprint blueprint)
         {
-            selectionHandler.HandleDeselected(blueprint);
+            SelectionHandler.HandleDeselected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 0);
         }
 
@@ -391,16 +391,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private void prepareSelectionMovement()
         {
-            if (!selectionHandler.SelectedBlueprints.Any())
+            if (!SelectionHandler.SelectedBlueprints.Any())
                 return;
 
             // Any selected blueprint that is hovered can begin the movement of the group, however only the earliest hitobject is used for movement
             // A special case is added for when a click selection occurred before the drag
-            if (!clickSelectionBegan && !selectionHandler.SelectedBlueprints.Any(b => b.IsHovered))
+            if (!clickSelectionBegan && !SelectionHandler.SelectedBlueprints.Any(b => b.IsHovered))
                 return;
 
             // Movement is tracked from the blueprint of the earliest hitobject, since it only makes sense to distance snap from that hitobject
-            movementBlueprint = selectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime).First();
+            movementBlueprint = SelectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime).First();
             movementBlueprintOriginalPosition = movementBlueprint.ScreenSpaceSelectionPoint; // todo: unsure if correct
         }
 
@@ -425,14 +425,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             var result = snapProvider.SnapScreenSpacePositionToValidTime(movePosition);
 
             // Move the hitobjects.
-            if (!selectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, result.ScreenSpacePosition)))
+            if (!SelectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, result.ScreenSpacePosition)))
                 return true;
 
             if (result.Time.HasValue)
             {
                 // Apply the start time at the newly snapped-to position
                 double offset = result.Time.Value - draggedObject.StartTime;
-                foreach (HitObject obj in selectionHandler.SelectedHitObjects)
+                foreach (HitObject obj in SelectionHandler.SelectedHitObjects)
                     obj.StartTime += offset;
             }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 2a7c52579f..6f66c1bd6f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -66,14 +66,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 if (Beatmap.SelectedHitObjects.Count > 0)
                 {
-                    foreach (var h in Beatmap.SelectedHitObjects)
-                    {
-                        if (h is IHasComboInformation c)
-                        {
-                            c.NewCombo = combo.NewValue;
-                            Beatmap.UpdateHitObject(h);
-                        }
-                    }
+                    SelectionHandler.SetNewCombo(combo.NewValue);
                 }
                 else if (currentPlacement != null)
                 {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index ca22b443fb..1c5c3179ca 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -285,7 +285,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 var comboInfo = h as IHasComboInformation;
 
                 if (comboInfo == null)
-                    throw new InvalidOperationException($"Tried to change combo state of a {h.GetType()}, which doesn't implement {nameof(IHasComboInformation)}");
+                    continue;
 
                 comboInfo.NewCombo = state;
                 EditorBeatmap?.UpdateHitObject(h);

From 7f9a5f5f0df1bceb5c8f1d3d1aedf2be9d6acadf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 14:25:24 +0900
Subject: [PATCH 04922/10326] Ensure setup screen text boxes commit on losing
 focus

---
 osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
index 290aba3468..902c23c3c6 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
         protected override OsuTextBox CreateComponent() => new OsuTextBox
         {
+            CommitOnFocusLost = true,
             Anchor = Anchor.Centre,
             Origin = Anchor.Centre,
             RelativeSizeAxes = Axes.X,

From 50290f3cb4730ca93a1ed388ce432241520bd8e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 15:09:47 +0900
Subject: [PATCH 04923/10326] Rework ternary states to fix context menus not
 updating after already displayed

---
 .../Compose/Components/SelectionHandler.cs    | 170 ++++++++++--------
 1 file changed, 93 insertions(+), 77 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 6e2c8bd01c..1c564c6605 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -4,7 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Humanizer;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -59,6 +61,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
+            createStateBindables();
+
             InternalChild = content = new Container
             {
                 Children = new Drawable[]
@@ -308,6 +312,90 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #endregion
 
+        #region Selection State
+
+        private readonly Bindable<TernaryState> selectionNewComboState = new Bindable<TernaryState>();
+
+        private readonly Dictionary<string, Bindable<TernaryState>> selectionSampleStates = new Dictionary<string, Bindable<TernaryState>>();
+
+        /// <summary>
+        /// Set up ternary state bindables and bind them to selection/hitobject changes (in both directions)
+        /// </summary>
+        private void createStateBindables()
+        {
+            // hit samples
+            var sampleTypes = new[] { HitSampleInfo.HIT_WHISTLE, HitSampleInfo.HIT_CLAP, HitSampleInfo.HIT_FINISH };
+
+            foreach (var sampleName in sampleTypes)
+            {
+                var bindable = new Bindable<TernaryState>
+                {
+                    Description = sampleName.Replace("hit", string.Empty).Titleize()
+                };
+
+                bindable.ValueChanged += state =>
+                {
+                    switch (state.NewValue)
+                    {
+                        case TernaryState.False:
+                            RemoveHitSample(sampleName);
+                            break;
+
+                        case TernaryState.True:
+                            AddHitSample(sampleName);
+                            break;
+                    }
+                };
+
+                selectionSampleStates[sampleName] = bindable;
+            }
+
+            // new combo
+            selectionNewComboState.ValueChanged += state =>
+            {
+                switch (state.NewValue)
+                {
+                    case TernaryState.False:
+                        SetNewCombo(false);
+                        break;
+
+                    case TernaryState.True:
+                        SetNewCombo(true);
+                        break;
+                }
+            };
+
+            // bring in updates from selection changes
+            EditorBeatmap.HitObjectUpdated += _ => updateTernaryStates();
+            EditorBeatmap.SelectedHitObjects.CollectionChanged += (sender, args) => updateTernaryStates();
+        }
+
+        private void updateTernaryStates()
+        {
+            selectionNewComboState.Value = getStateFromBlueprints(selectedBlueprints.Select(b => (IHasComboInformation)b.HitObject).Count(h => h.NewCombo));
+
+            foreach (var (sampleName, bindable) in selectionSampleStates)
+            {
+                bindable.Value = getStateFromBlueprints(SelectedHitObjects.Count(h => h.Samples.Any(s => s.Name == sampleName)));
+            }
+        }
+
+        /// <summary>
+        /// Given a count of "true" blueprints, retrieve the correct ternary display state.
+        /// </summary>
+        private TernaryState getStateFromBlueprints(int count)
+        {
+            if (count == 0)
+                return TernaryState.False;
+
+            if (count < SelectedHitObjects.Count())
+                return TernaryState.Indeterminate;
+
+            return TernaryState.True;
+        }
+
+        #endregion
+
         #region Context Menu
 
         public MenuItem[] ContextMenuItems
@@ -322,7 +410,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 items.AddRange(GetContextMenuItemsForSelection(selectedBlueprints));
 
                 if (selectedBlueprints.All(b => b.HitObject is IHasComboInformation))
-                    items.Add(createNewComboMenuItem());
+                {
+                    items.Add(new TernaryStateMenuItem("New combo") { State = { BindTarget = selectionNewComboState } });
+                }
 
                 if (selectedBlueprints.Count == 1)
                     items.AddRange(selectedBlueprints[0].ContextMenuItems);
@@ -331,12 +421,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 {
                     new OsuMenuItem("Sound")
                     {
-                        Items = new[]
-                        {
-                            createHitSampleMenuItem("Whistle", HitSampleInfo.HIT_WHISTLE),
-                            createHitSampleMenuItem("Clap", HitSampleInfo.HIT_CLAP),
-                            createHitSampleMenuItem("Finish", HitSampleInfo.HIT_FINISH)
-                        }
+                        Items = selectionSampleStates.Select(kvp =>
+                            new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
                     },
                     new OsuMenuItem("Delete", MenuItemType.Destructive, deleteSelected),
                 });
@@ -353,76 +439,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected virtual IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
             => Enumerable.Empty<MenuItem>();
 
-        private MenuItem createNewComboMenuItem()
-        {
-            return new TernaryStateMenuItem("New combo", MenuItemType.Standard, setNewComboState)
-            {
-                State = { Value = getHitSampleState() }
-            };
-
-            void setNewComboState(TernaryState state)
-            {
-                switch (state)
-                {
-                    case TernaryState.False:
-                        SetNewCombo(false);
-                        break;
-
-                    case TernaryState.True:
-                        SetNewCombo(true);
-                        break;
-                }
-            }
-
-            TernaryState getHitSampleState()
-            {
-                int countExisting = selectedBlueprints.Select(b => (IHasComboInformation)b.HitObject).Count(h => h.NewCombo);
-
-                if (countExisting == 0)
-                    return TernaryState.False;
-
-                if (countExisting < SelectedHitObjects.Count())
-                    return TernaryState.Indeterminate;
-
-                return TernaryState.True;
-            }
-        }
-
-        private MenuItem createHitSampleMenuItem(string name, string sampleName)
-        {
-            return new TernaryStateMenuItem(name, MenuItemType.Standard, setHitSampleState)
-            {
-                State = { Value = getHitSampleState() }
-            };
-
-            void setHitSampleState(TernaryState state)
-            {
-                switch (state)
-                {
-                    case TernaryState.False:
-                        RemoveHitSample(sampleName);
-                        break;
-
-                    case TernaryState.True:
-                        AddHitSample(sampleName);
-                        break;
-                }
-            }
-
-            TernaryState getHitSampleState()
-            {
-                int countExisting = SelectedHitObjects.Count(h => h.Samples.Any(s => s.Name == sampleName));
-
-                if (countExisting == 0)
-                    return TernaryState.False;
-
-                if (countExisting < SelectedHitObjects.Count())
-                    return TernaryState.Indeterminate;
-
-                return TernaryState.True;
-            }
-        }
-
         #endregion
     }
 }

From a859fe78ee52841fd458f4949e2b1e72d3c59a1c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 15:27:45 +0900
Subject: [PATCH 04924/10326] Expose update ternary state method and use better
 state determination function

---
 .../Compose/Components/SelectionHandler.cs    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 1c564c6605..8a152a9c57 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -366,32 +366,32 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
 
             // bring in updates from selection changes
-            EditorBeatmap.HitObjectUpdated += _ => updateTernaryStates();
-            EditorBeatmap.SelectedHitObjects.CollectionChanged += (sender, args) => updateTernaryStates();
+            EditorBeatmap.HitObjectUpdated += _ => UpdateTernaryStates();
+            EditorBeatmap.SelectedHitObjects.CollectionChanged += (sender, args) => UpdateTernaryStates();
         }
 
-        private void updateTernaryStates()
+        /// <summary>
+        /// Called when context menu ternary states may need to be recalculated (selection changed or hitobject updated).
+        /// </summary>
+        protected virtual void UpdateTernaryStates()
         {
-            selectionNewComboState.Value = getStateFromBlueprints(selectedBlueprints.Select(b => (IHasComboInformation)b.HitObject).Count(h => h.NewCombo));
+            selectionNewComboState.Value = GetStateFromSelection(SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
 
             foreach (var (sampleName, bindable) in selectionSampleStates)
             {
-                bindable.Value = getStateFromBlueprints(SelectedHitObjects.Count(h => h.Samples.Any(s => s.Name == sampleName)));
+                bindable.Value = GetStateFromSelection(SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName));
             }
         }
 
         /// <summary>
-        /// Given a count of "true" blueprints, retrieve the correct ternary display state.
+        /// Given a selection target and a function of truth, retrieve the correct ternary state for display.
         /// </summary>
-        private TernaryState getStateFromBlueprints(int count)
+        protected TernaryState GetStateFromSelection<T>(IEnumerable<T> selection, Func<T, bool> func)
         {
-            if (count == 0)
-                return TernaryState.False;
+            if (selection.Any(func))
+                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
 
-            if (count < SelectedHitObjects.Count())
-                return TernaryState.Indeterminate;
-
-            return TernaryState.True;
+            return TernaryState.False;
         }
 
         #endregion

From 727ab98d22d2b748f1148f8bcc1f7cb27b41f538 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 15:32:45 +0900
Subject: [PATCH 04925/10326] Update taiko selection handler with new logic

---
 .../Edit/TaikoSelectionHandler.cs             | 128 +++++++++---------
 1 file changed, 67 insertions(+), 61 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index 40565048c2..a3ecf7ed95 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -1,9 +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 System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
@@ -14,75 +15,80 @@ namespace osu.Game.Rulesets.Taiko.Edit
 {
     public class TaikoSelectionHandler : SelectionHandler
     {
+        private readonly Bindable<TernaryState> selectionRimState = new Bindable<TernaryState>();
+        private readonly Bindable<TernaryState> selectionStrongState = new Bindable<TernaryState>();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            selectionStrongState.ValueChanged += state =>
+            {
+                switch (state.NewValue)
+                {
+                    case TernaryState.False:
+                        SetStrongState(false);
+                        break;
+
+                    case TernaryState.True:
+                        SetStrongState(true);
+                        break;
+                }
+            };
+
+            selectionRimState.ValueChanged += state =>
+            {
+                switch (state.NewValue)
+                {
+                    case TernaryState.False:
+                        SetRimState(false);
+                        break;
+
+                    case TernaryState.True:
+                        SetRimState(true);
+                        break;
+                }
+            };
+        }
+
+        public void SetStrongState(bool state)
+        {
+            var hits = SelectedHitObjects.OfType<Hit>();
+
+            ChangeHandler.BeginChange();
+
+            foreach (var h in hits)
+                h.IsStrong = state;
+
+            ChangeHandler.EndChange();
+        }
+
+        public void SetRimState(bool state)
+        {
+            var hits = SelectedHitObjects.OfType<Hit>();
+
+            ChangeHandler.BeginChange();
+
+            foreach (var h in hits)
+                h.Type = state ? HitType.Rim : HitType.Centre;
+
+            ChangeHandler.EndChange();
+        }
+
         protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
         {
             if (selection.All(s => s.HitObject is Hit))
-            {
-                var hits = selection.Select(s => s.HitObject).OfType<Hit>();
-
-                yield return new TernaryStateMenuItem("Rim", action: state =>
-                {
-                    ChangeHandler.BeginChange();
-
-                    foreach (var h in hits)
-                    {
-                        switch (state)
-                        {
-                            case TernaryState.True:
-                                h.Type = HitType.Rim;
-                                break;
-
-                            case TernaryState.False:
-                                h.Type = HitType.Centre;
-                                break;
-                        }
-                    }
-
-                    ChangeHandler.EndChange();
-                })
-                {
-                    State = { Value = getTernaryState(hits, h => h.Type == HitType.Rim) }
-                };
-            }
+                yield return new TernaryStateMenuItem("Rim") { State = { BindTarget = selectionRimState } };
 
             if (selection.All(s => s.HitObject is TaikoHitObject))
-            {
-                var hits = selection.Select(s => s.HitObject).OfType<TaikoHitObject>();
-
-                yield return new TernaryStateMenuItem("Strong", action: state =>
-                {
-                    ChangeHandler.BeginChange();
-
-                    foreach (var h in hits)
-                    {
-                        switch (state)
-                        {
-                            case TernaryState.True:
-                                h.IsStrong = true;
-                                break;
-
-                            case TernaryState.False:
-                                h.IsStrong = false;
-                                break;
-                        }
-
-                        EditorBeatmap?.UpdateHitObject(h);
-                    }
-
-                    ChangeHandler.EndChange();
-                })
-                {
-                    State = { Value = getTernaryState(hits, h => h.IsStrong) }
-                };
-            }
+                yield return new TernaryStateMenuItem("Strong") { State = { BindTarget = selectionStrongState } };
         }
 
-        private TernaryState getTernaryState<T>(IEnumerable<T> selection, Func<T, bool> func)
+        protected override void UpdateTernaryStates()
         {
-            if (selection.Any(func))
-                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
+            base.UpdateTernaryStates();
 
-            return TernaryState.False;
+            selectionRimState.Value = GetStateFromSelection(SelectedHitObjects.OfType<Hit>(), h => h.Type == HitType.Rim);
+            selectionStrongState.Value = GetStateFromSelection(SelectedHitObjects.OfType<TaikoHitObject>(), h => h.IsStrong);
         }
     }
 }

From ae68dcd962090efe418228f4c11c09d166a12af1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 16:33:22 +0900
Subject: [PATCH 04926/10326] Add ternary toggle buttons to editor toolbox
 selection

---
 .../Edit/OsuHitObjectComposer.cs              |  11 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  14 +--
 .../TernaryButtons/DrawableTernaryButton.cs   | 112 ++++++++++++++++++
 .../TernaryButtons/TernaryButton.cs           |  44 +++++++
 .../Components/ComposeBlueprintContainer.cs   |  29 ++---
 .../Compose/Components/SelectionHandler.cs    |  22 ++--
 6 files changed, 194 insertions(+), 38 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
 create mode 100644 osu.Game/Screens/Edit/Components/TernaryButtons/TernaryButton.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 0d0a139a8a..49af80dd63 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -9,7 +9,9 @@ using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
@@ -17,6 +19,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
@@ -39,11 +42,11 @@ namespace osu.Game.Rulesets.Osu.Edit
             new SpinnerCompositionTool()
         };
 
-        private readonly BindableBool distanceSnapToggle = new BindableBool(true) { Description = "Distance Snap" };
+        private readonly Bindable<TernaryState> distanceSnapToggle = new Bindable<TernaryState>();
 
-        protected override IEnumerable<Bindable<bool>> Toggles => base.Toggles.Concat(new[]
+        protected override IEnumerable<TernaryButton> Toggles => base.Toggles.Concat(new[]
         {
-            distanceSnapToggle
+            new TernaryButton(distanceSnapToggle, "Distance Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Ruler })
         });
 
         private BindableList<HitObject> selectedHitObjects;
@@ -156,7 +159,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             distanceSnapGridCache.Invalidate();
             distanceSnapGrid = null;
 
-            if (!distanceSnapToggle.Value)
+            if (distanceSnapToggle.Value != TernaryState.True)
                 return;
 
             switch (BlueprintContainer.CurrentTool)
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index b2d7c40a22..afef542e36 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -14,7 +14,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
@@ -24,6 +23,7 @@ using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components.RadioButtons;
+using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
@@ -124,11 +124,7 @@ namespace osu.Game.Rulesets.Edit
                         new ToolboxGroup("toolbox") { Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X } },
                         togglesCollection = new ToolboxGroup("toggles")
                         {
-                            ChildrenEnumerable = Toggles.Select(b => new SettingsCheckbox
-                            {
-                                Bindable = b,
-                                LabelText = b?.Description ?? "unknown"
-                            })
+                            ChildrenEnumerable = Toggles.Select(b => new DrawableTernaryButton(b))
                         }
                     }
                 },
@@ -170,7 +166,7 @@ namespace osu.Game.Rulesets.Edit
         /// A collection of toggles which will be displayed to the user.
         /// The display name will be decided by <see cref="Bindable{T}.Description"/>.
         /// </summary>
-        protected virtual IEnumerable<Bindable<bool>> Toggles => BlueprintContainer.Toggles;
+        protected virtual IEnumerable<TernaryButton> Toggles => BlueprintContainer.Toggles;
 
         /// <summary>
         /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
@@ -212,9 +208,9 @@ namespace osu.Game.Rulesets.Edit
             {
                 var item = togglesCollection.Children[rightIndex];
 
-                if (item is SettingsCheckbox checkbox)
+                if (item is DrawableTernaryButton button)
                 {
-                    checkbox.Bindable.Value = !checkbox.Bindable.Value;
+                    button.Button.Toggle();
                     return true;
                 }
             }
diff --git a/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs b/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
new file mode 100644
index 0000000000..c72fff5c91
--- /dev/null
+++ b/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
@@ -0,0 +1,112 @@
+// Copyright (c) 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.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Components.TernaryButtons
+{
+    internal class DrawableTernaryButton : TriangleButton
+    {
+        private Color4 defaultBackgroundColour;
+        private Color4 defaultBubbleColour;
+        private Color4 selectedBackgroundColour;
+        private Color4 selectedBubbleColour;
+
+        private Drawable icon;
+
+        public readonly TernaryButton Button;
+
+        public DrawableTernaryButton(TernaryButton button)
+        {
+            Button = button;
+
+            Text = button.Description;
+
+            RelativeSizeAxes = Axes.X;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            defaultBackgroundColour = colours.Gray3;
+            defaultBubbleColour = defaultBackgroundColour.Darken(0.5f);
+            selectedBackgroundColour = colours.BlueDark;
+            selectedBubbleColour = selectedBackgroundColour.Lighten(0.5f);
+
+            Triangles.Alpha = 0;
+
+            Content.EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Shadow,
+                Radius = 2,
+                Offset = new Vector2(0, 1),
+                Colour = Color4.Black.Opacity(0.5f)
+            };
+
+            Add(icon = (Button.CreateIcon?.Invoke() ?? new Circle()).With(b =>
+            {
+                b.Blending = BlendingParameters.Additive;
+                b.Anchor = Anchor.CentreLeft;
+                b.Origin = Anchor.CentreLeft;
+                b.Size = new Vector2(20);
+                b.X = 10;
+            }));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Button.Bindable.BindValueChanged(selected => updateSelectionState(), true);
+
+            Action = onAction;
+        }
+
+        private void onAction()
+        {
+            Button.Toggle();
+        }
+
+        private void updateSelectionState()
+        {
+            if (!IsLoaded)
+                return;
+
+            switch (Button.Bindable.Value)
+            {
+                case TernaryState.Indeterminate:
+                    icon.Colour = selectedBubbleColour.Darken(0.5f);
+                    BackgroundColour = selectedBackgroundColour.Darken(0.5f);
+                    break;
+
+                case TernaryState.False:
+                    icon.Colour = defaultBubbleColour;
+                    BackgroundColour = defaultBackgroundColour;
+                    break;
+
+                case TernaryState.True:
+                    icon.Colour = selectedBubbleColour;
+                    BackgroundColour = selectedBackgroundColour;
+                    break;
+            }
+        }
+
+        protected override SpriteText CreateText() => new OsuSpriteText
+        {
+            Depth = -1,
+            Origin = Anchor.CentreLeft,
+            Anchor = Anchor.CentreLeft,
+            X = 40f
+        };
+    }
+}
diff --git a/osu.Game/Screens/Edit/Components/TernaryButtons/TernaryButton.cs b/osu.Game/Screens/Edit/Components/TernaryButtons/TernaryButton.cs
new file mode 100644
index 0000000000..7f64695bde
--- /dev/null
+++ b/osu.Game/Screens/Edit/Components/TernaryButtons/TernaryButton.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 System;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Edit.Components.TernaryButtons
+{
+    public class TernaryButton
+    {
+        public readonly Bindable<TernaryState> Bindable;
+
+        public readonly string Description;
+
+        /// <summary>
+        /// A function which creates a drawable icon to represent this item. If null, a sane default should be used.
+        /// </summary>
+        public readonly Func<Drawable> CreateIcon;
+
+        public TernaryButton(Bindable<TernaryState> bindable, string description, Func<Drawable> createIcon = null)
+        {
+            Bindable = bindable;
+            Description = description;
+            CreateIcon = createIcon;
+        }
+
+        public void Toggle()
+        {
+            switch (Bindable.Value)
+            {
+                case TernaryState.False:
+                case TernaryState.Indeterminate:
+                    Bindable.Value = TernaryState.True;
+                    break;
+
+                case TernaryState.True:
+                    Bindable.Value = TernaryState.False;
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 6f66c1bd6f..91eab18acb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -7,12 +7,16 @@ 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;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components
@@ -57,35 +61,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             inputManager = GetContainingInputManager();
 
-            Beatmap.SelectedHitObjects.CollectionChanged += (_, __) => updateTogglesFromSelection();
-
-            // the updated object may be in the selection
-            Beatmap.HitObjectUpdated += _ => updateTogglesFromSelection();
+            // updates to selected are handled for us by SelectionHandler.
+            NewCombo.BindTo(SelectionHandler.SelectionNewComboState);
 
+            // we are responsible for current placement blueprint updated based on state changes.
             NewCombo.ValueChanged += combo =>
             {
-                if (Beatmap.SelectedHitObjects.Count > 0)
+                if (currentPlacement != null)
                 {
-                    SelectionHandler.SetNewCombo(combo.NewValue);
-                }
-                else if (currentPlacement != null)
-                {
-                    // update placement object from toggle
                     if (currentPlacement.HitObject is IHasComboInformation c)
-                        c.NewCombo = combo.NewValue;
+                        c.NewCombo = combo.NewValue == TernaryState.True;
                 }
             };
         }
 
-        private void updateTogglesFromSelection() =>
-            NewCombo.Value = Beatmap.SelectedHitObjects.OfType<IHasComboInformation>().All(c => c.NewCombo);
+        public readonly Bindable<TernaryState> NewCombo = new Bindable<TernaryState> { Description = "New Combo" };
 
-        public readonly Bindable<bool> NewCombo = new Bindable<bool> { Description = "New Combo" };
-
-        public virtual IEnumerable<Bindable<bool>> Toggles => new[]
+        public virtual IEnumerable<TernaryButton> Toggles => new[]
         {
             //TODO: this should only be enabled (visible?) for rulesets that provide combo-supporting HitObjects.
-            NewCombo
+            new TernaryButton(NewCombo, "New combo", () => new SpriteIcon { Icon = FontAwesome.Regular.DotCircle })
         };
 
         #region Placement
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index a316f34ad0..ed956357b6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -316,9 +316,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #region Selection State
 
-        private readonly Bindable<TernaryState> selectionNewComboState = new Bindable<TernaryState>();
+        /// <summary>
+        /// The state of "new combo" for all selected hitobjects.
+        /// </summary>
+        public readonly Bindable<TernaryState> SelectionNewComboState = new Bindable<TernaryState>();
 
-        private readonly Dictionary<string, Bindable<TernaryState>> selectionSampleStates = new Dictionary<string, Bindable<TernaryState>>();
+        /// <summary>
+        /// The state of each sample type for all selected hitobjects. Keys match with <see cref="HitSampleInfo"/> constant specifications.
+        /// </summary>
+        public readonly Dictionary<string, Bindable<TernaryState>> SelectionSampleStates = new Dictionary<string, Bindable<TernaryState>>();
 
         /// <summary>
         /// Set up ternary state bindables and bind them to selection/hitobject changes (in both directions)
@@ -349,11 +355,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     }
                 };
 
-                selectionSampleStates[sampleName] = bindable;
+                SelectionSampleStates[sampleName] = bindable;
             }
 
             // new combo
-            selectionNewComboState.ValueChanged += state =>
+            SelectionNewComboState.ValueChanged += state =>
             {
                 switch (state.NewValue)
                 {
@@ -377,9 +383,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         protected virtual void UpdateTernaryStates()
         {
-            selectionNewComboState.Value = GetStateFromSelection(SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
+            SelectionNewComboState.Value = GetStateFromSelection(SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
 
-            foreach (var (sampleName, bindable) in selectionSampleStates)
+            foreach (var (sampleName, bindable) in SelectionSampleStates)
             {
                 bindable.Value = GetStateFromSelection(SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName));
             }
@@ -413,7 +419,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                 if (selectedBlueprints.All(b => b.HitObject is IHasComboInformation))
                 {
-                    items.Add(new TernaryStateMenuItem("New combo") { State = { BindTarget = selectionNewComboState } });
+                    items.Add(new TernaryStateMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } });
                 }
 
                 if (selectedBlueprints.Count == 1)
@@ -423,7 +429,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 {
                     new OsuMenuItem("Sound")
                     {
-                        Items = selectionSampleStates.Select(kvp =>
+                        Items = SelectionSampleStates.Select(kvp =>
                             new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
                     },
                     new OsuMenuItem("Delete", MenuItemType.Destructive, deleteSelected),

From a6298c60eb30d5c7f0bf5dc8422148f531c315ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 16:44:37 +0900
Subject: [PATCH 04927/10326] Fix button spacing

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index afef542e36..f823d37060 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Edit
 
         private RadioButtonCollection toolboxCollection;
 
-        private ToolboxGroup togglesCollection;
+        private FillFlowContainer togglesCollection;
 
         protected HitObjectComposer(Ruleset ruleset)
         {
@@ -121,10 +121,20 @@ namespace osu.Game.Rulesets.Edit
                     Spacing = new Vector2(10),
                     Children = new Drawable[]
                     {
-                        new ToolboxGroup("toolbox") { Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X } },
-                        togglesCollection = new ToolboxGroup("toggles")
+                        new ToolboxGroup("toolbox")
                         {
-                            ChildrenEnumerable = Toggles.Select(b => new DrawableTernaryButton(b))
+                            Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X }
+                        },
+                        new ToolboxGroup("toggles")
+                        {
+                            Child = togglesCollection = new FillFlowContainer
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Direction = FillDirection.Vertical,
+                                Spacing = new Vector2(0, 5),
+                                ChildrenEnumerable = Toggles.Select(b => new DrawableTernaryButton(b))
+                            },
                         }
                     }
                 },

From da820c815e5fc97a350669e9904d2700c25fbe44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 16:46:06 +0900
Subject: [PATCH 04928/10326] Add shortcut keys to toolbox gorup titles

---
 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 f823d37060..a592500a87 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -121,11 +121,11 @@ namespace osu.Game.Rulesets.Edit
                     Spacing = new Vector2(10),
                     Children = new Drawable[]
                     {
-                        new ToolboxGroup("toolbox")
+                        new ToolboxGroup("toolbox (1-9)")
                         {
                             Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X }
                         },
-                        new ToolboxGroup("toggles")
+                        new ToolboxGroup("toggles (Q~P)")
                         {
                             Child = togglesCollection = new FillFlowContainer
                             {

From b70a20e7f198b236b4b404cb3eea54dca3ae105e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 16:56:39 +0900
Subject: [PATCH 04929/10326] Avoid consuming keystrokes in editor when a
 modifier key is held down

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index b81e0ce159..7c9d996039 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -192,6 +192,9 @@ namespace osu.Game.Rulesets.Edit
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
+            if (e.ControlPressed || e.AltPressed || e.SuperPressed)
+                return false;
+
             if (checkLeftToggleFromKey(e.Key, out var leftIndex))
             {
                 var item = toolboxCollection.Items.ElementAtOrDefault(leftIndex);

From 98c6027352deb80fd0d80e9bc5abcb12ead00552 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 17:07:58 +0900
Subject: [PATCH 04930/10326] Remove unused using

---
 .../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 91eab18acb..cab277f10b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;

From b8e9f19b92195f8c6e270540c9d77f8a17b5e2c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 17:30:31 +0900
Subject: [PATCH 04931/10326] Move common HitSampleInfo lookup to static method

---
 osu.Game/Audio/HitSampleInfo.cs                              | 5 +++++
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index f6b0107bd2..8b1f5a366a 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -17,6 +17,11 @@ namespace osu.Game.Audio
         public const string HIT_NORMAL = @"hitnormal";
         public const string HIT_CLAP = @"hitclap";
 
+        /// <summary>
+        /// All valid sample addition constants.
+        /// </summary>
+        public static IEnumerable<string> AllAdditions => new[] { HIT_WHISTLE, HIT_CLAP, HIT_FINISH };
+
         /// <summary>
         /// The bank to load the sample from.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index ed956357b6..6ca85fe026 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -331,10 +331,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private void createStateBindables()
         {
-            // hit samples
-            var sampleTypes = new[] { HitSampleInfo.HIT_WHISTLE, HitSampleInfo.HIT_CLAP, HitSampleInfo.HIT_FINISH };
-
-            foreach (var sampleName in sampleTypes)
+            foreach (var sampleName in HitSampleInfo.AllAdditions)
             {
                 var bindable = new Bindable<TernaryState>
                 {

From 51cc644b7b203110f88b7bee33cd6321ab1fb66b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 17:42:49 +0900
Subject: [PATCH 04932/10326] Fix set access to SelectionHandler

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 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 8934a1b6d3..8908520cd7 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
 
         public Container<SelectionBlueprint> SelectionBlueprints { get; private set; }
 
-        protected SelectionHandler SelectionHandler;
+        protected SelectionHandler SelectionHandler { get; private set; }
 
         [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }

From 22511c36c3b0d306418b55adbb61376796f85187 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 17:40:43 +0900
Subject: [PATCH 04933/10326] Ensure toggles are not instantiated more than
 once for safety

---
 .../Edit/OsuHitObjectComposer.cs              |  2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  8 ++++++--
 .../Components/ComposeBlueprintContainer.cs   | 19 +++++++++++--------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 49af80dd63..a4dd463ea5 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private readonly Bindable<TernaryState> distanceSnapToggle = new Bindable<TernaryState>();
 
-        protected override IEnumerable<TernaryButton> Toggles => base.Toggles.Concat(new[]
+        protected override IEnumerable<TernaryButton> CreateToggles() => base.CreateToggles().Concat(new[]
         {
             new TernaryButton(distanceSnapToggle, "Distance Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Ruler })
         });
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index a592500a87..e692f8d606 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -133,7 +133,6 @@ namespace osu.Game.Rulesets.Edit
                                 AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Vertical,
                                 Spacing = new Vector2(0, 5),
-                                ChildrenEnumerable = Toggles.Select(b => new DrawableTernaryButton(b))
                             },
                         }
                     }
@@ -145,6 +144,9 @@ namespace osu.Game.Rulesets.Edit
                                       .Select(t => new RadioButton(t.Name, () => toolSelected(t), t.CreateIcon))
                                       .ToList();
 
+            Toggles = CreateToggles().ToArray();
+            togglesCollection.AddRange(Toggles.Select(b => new DrawableTernaryButton(b)));
+
             setSelectTool();
 
             EditorBeatmap.SelectedHitObjects.CollectionChanged += selectionChanged;
@@ -176,7 +178,9 @@ namespace osu.Game.Rulesets.Edit
         /// A collection of toggles which will be displayed to the user.
         /// The display name will be decided by <see cref="Bindable{T}.Description"/>.
         /// </summary>
-        protected virtual IEnumerable<TernaryButton> Toggles => BlueprintContainer.Toggles;
+        public TernaryButton[] Toggles { get; private set; }
+
+        protected virtual IEnumerable<TernaryButton> CreateToggles() => BlueprintContainer.Toggles;
 
         /// <summary>
         /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index cab277f10b..0f4bab8b33 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -51,6 +51,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
+            Toggles = CreateToggles().ToArray();
+
             AddInternal(placementBlueprintContainer);
         }
 
@@ -66,21 +68,22 @@ namespace osu.Game.Screens.Edit.Compose.Components
             // we are responsible for current placement blueprint updated based on state changes.
             NewCombo.ValueChanged += combo =>
             {
-                if (currentPlacement != null)
-                {
-                    if (currentPlacement.HitObject is IHasComboInformation c)
-                        c.NewCombo = combo.NewValue == TernaryState.True;
-                }
+                if (currentPlacement == null) return;
+
+                if (currentPlacement.HitObject is IHasComboInformation c)
+                    c.NewCombo = combo.NewValue == TernaryState.True;
             };
         }
 
         public readonly Bindable<TernaryState> NewCombo = new Bindable<TernaryState> { Description = "New Combo" };
 
-        public virtual IEnumerable<TernaryButton> Toggles => new[]
+        public TernaryButton[] Toggles { get; private set; }
+
+        protected virtual IEnumerable<TernaryButton> CreateToggles()
         {
             //TODO: this should only be enabled (visible?) for rulesets that provide combo-supporting HitObjects.
-            new TernaryButton(NewCombo, "New combo", () => new SpriteIcon { Icon = FontAwesome.Regular.DotCircle })
-        };
+            yield return new TernaryButton(NewCombo, "New combo", () => new SpriteIcon { Icon = FontAwesome.Regular.DotCircle });
+        }
 
         #region Placement
 

From 346d14d40bfc09d0da125c0850dafe587eccb376 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 17:45:19 +0900
Subject: [PATCH 04934/10326] Rename variables to match

---
 .../Edit/OsuHitObjectComposer.cs                  |  2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs       | 15 ++++++++-------
 .../Components/ComposeBlueprintContainer.cs       | 12 +++++++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index a4dd463ea5..912a705d16 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private readonly Bindable<TernaryState> distanceSnapToggle = new Bindable<TernaryState>();
 
-        protected override IEnumerable<TernaryButton> CreateToggles() => base.CreateToggles().Concat(new[]
+        protected override IEnumerable<TernaryButton> CreateTernaryButtons() => base.CreateTernaryButtons().Concat(new[]
         {
             new TernaryButton(distanceSnapToggle, "Distance Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Ruler })
         });
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index e692f8d606..3ad2394420 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
@@ -144,8 +143,8 @@ namespace osu.Game.Rulesets.Edit
                                       .Select(t => new RadioButton(t.Name, () => toolSelected(t), t.CreateIcon))
                                       .ToList();
 
-            Toggles = CreateToggles().ToArray();
-            togglesCollection.AddRange(Toggles.Select(b => new DrawableTernaryButton(b)));
+            TernaryStates = CreateTernaryButtons().ToArray();
+            togglesCollection.AddRange(TernaryStates.Select(b => new DrawableTernaryButton(b)));
 
             setSelectTool();
 
@@ -175,12 +174,14 @@ namespace osu.Game.Rulesets.Edit
         protected abstract IReadOnlyList<HitObjectCompositionTool> CompositionTools { get; }
 
         /// <summary>
-        /// A collection of toggles which will be displayed to the user.
-        /// The display name will be decided by <see cref="Bindable{T}.Description"/>.
+        /// A collection of states which will be displayed to the user in the toolbox.
         /// </summary>
-        public TernaryButton[] Toggles { get; private set; }
+        public TernaryButton[] TernaryStates { get; private set; }
 
-        protected virtual IEnumerable<TernaryButton> CreateToggles() => BlueprintContainer.Toggles;
+        /// <summary>
+        /// Create all ternary states required to be displayed to the user.
+        /// </summary>
+        protected virtual IEnumerable<TernaryButton> CreateTernaryButtons() => BlueprintContainer.TernaryStates;
 
         /// <summary>
         /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 0f4bab8b33..88c3170c34 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            Toggles = CreateToggles().ToArray();
+            TernaryStates = CreateTernaryButtons().ToArray();
 
             AddInternal(placementBlueprintContainer);
         }
@@ -77,9 +77,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public readonly Bindable<TernaryState> NewCombo = new Bindable<TernaryState> { Description = "New Combo" };
 
-        public TernaryButton[] Toggles { get; private set; }
+        /// <summary>
+        /// A collection of states which will be displayed to the user in the toolbox.
+        /// </summary>
+        public TernaryButton[] TernaryStates { get; private set; }
 
-        protected virtual IEnumerable<TernaryButton> CreateToggles()
+        /// <summary>
+        /// Create all ternary states required to be displayed to the user.
+        /// </summary>
+        protected virtual IEnumerable<TernaryButton> CreateTernaryButtons()
         {
             //TODO: this should only be enabled (visible?) for rulesets that provide combo-supporting HitObjects.
             yield return new TernaryButton(NewCombo, "New combo", () => new SpriteIcon { Icon = FontAwesome.Regular.DotCircle });

From b561429f920d52c53e5ae33f1efbd1e1e9f0f1be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 17:53:41 +0900
Subject: [PATCH 04935/10326] Add toolbar toggle buttons for hit samples

---
 .../Components/ComposeBlueprintContainer.cs   | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 88c3170c34..a83977c15f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -3,12 +3,14 @@
 
 using System.Collections.Generic;
 using System.Linq;
+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;
+using osu.Game.Audio;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
@@ -73,6 +75,34 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 if (currentPlacement.HitObject is IHasComboInformation c)
                     c.NewCombo = combo.NewValue == TernaryState.True;
             };
+
+            // we own SelectionHandler so don't need to worry about making bindable copies (for simplicity)
+            foreach (var kvp in SelectionHandler.SelectionSampleStates)
+            {
+                kvp.Value.BindValueChanged(c => sampleChanged(kvp.Key, c.NewValue));
+            }
+        }
+
+        private void sampleChanged(string sampleName, TernaryState state)
+        {
+            if (currentPlacement == null) return;
+
+            var samples = currentPlacement.HitObject.Samples;
+
+            var existingSample = samples.FirstOrDefault(s => s.Name == sampleName);
+
+            switch (state)
+            {
+                case TernaryState.False:
+                    if (existingSample != null)
+                        samples.Remove(existingSample);
+                    break;
+
+                case TernaryState.True:
+                    if (existingSample == null)
+                        samples.Add(new HitSampleInfo { Name = sampleName });
+                    break;
+            }
         }
 
         public readonly Bindable<TernaryState> NewCombo = new Bindable<TernaryState> { Description = "New Combo" };
@@ -89,6 +119,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             //TODO: this should only be enabled (visible?) for rulesets that provide combo-supporting HitObjects.
             yield return new TernaryButton(NewCombo, "New combo", () => new SpriteIcon { Icon = FontAwesome.Regular.DotCircle });
+
+            foreach (var kvp in SelectionHandler.SelectionSampleStates)
+                yield return new TernaryButton(kvp.Value, kvp.Key.Replace("hit", string.Empty).Titleize(), () => getIconForSample(kvp.Key));
+        }
+
+        private Drawable getIconForSample(string sampleName)
+        {
+            switch (sampleName)
+            {
+                case HitSampleInfo.HIT_CLAP:
+                    return new SpriteIcon { Icon = FontAwesome.Solid.Hands };
+
+                case HitSampleInfo.HIT_WHISTLE:
+                    return new SpriteIcon { Icon = FontAwesome.Solid.Bullhorn };
+
+                case HitSampleInfo.HIT_FINISH:
+                    return new SpriteIcon { Icon = FontAwesome.Solid.DrumSteelpan };
+            }
+
+            return null;
         }
 
         #region Placement

From dbfa05d3b34339ecb139de74a4c3c2aa24f48342 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 18:00:17 +0900
Subject: [PATCH 04936/10326] Fix placement object not getting updated with
 initial state

---
 .../Components/ComposeBlueprintContainer.cs   | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index a83977c15f..81d7fa4b32 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -68,21 +68,31 @@ namespace osu.Game.Screens.Edit.Compose.Components
             NewCombo.BindTo(SelectionHandler.SelectionNewComboState);
 
             // we are responsible for current placement blueprint updated based on state changes.
-            NewCombo.ValueChanged += combo =>
-            {
-                if (currentPlacement == null) return;
-
-                if (currentPlacement.HitObject is IHasComboInformation c)
-                    c.NewCombo = combo.NewValue == TernaryState.True;
-            };
+            NewCombo.ValueChanged += _ => updatePlacementNewCombo();
 
             // we own SelectionHandler so don't need to worry about making bindable copies (for simplicity)
             foreach (var kvp in SelectionHandler.SelectionSampleStates)
             {
-                kvp.Value.BindValueChanged(c => sampleChanged(kvp.Key, c.NewValue));
+                kvp.Value.BindValueChanged(_ => updatePlacementSamples());
             }
         }
 
+        private void updatePlacementNewCombo()
+        {
+            if (currentPlacement == null) return;
+
+            if (currentPlacement.HitObject is IHasComboInformation c)
+                c.NewCombo = NewCombo.Value == TernaryState.True;
+        }
+
+        private void updatePlacementSamples()
+        {
+            if (currentPlacement == null) return;
+
+            foreach (var kvp in SelectionHandler.SelectionSampleStates)
+                sampleChanged(kvp.Key, kvp.Value.Value);
+        }
+
         private void sampleChanged(string sampleName, TernaryState state)
         {
             if (currentPlacement == null) return;
@@ -206,6 +216,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                 // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame
                 updatePlacementPosition();
+
+                updatePlacementSamples();
+
+                updatePlacementNewCombo();
             }
         }
 

From 4cc02abc76be15a30aeb82427aa04a80de2c696a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 18:11:49 +0900
Subject: [PATCH 04937/10326] 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 d701aaf199..dc3e14c141 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.923.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.925.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 71826e161c..6412f707d0 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.923.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.925.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 90aa903318..f1e13169a5 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.Framework.iOS" Version="2020.923.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.925.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.923.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.925.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 59bfa086847f8b89874a88b2257c5bd105eb9bd2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 18:26:54 +0900
Subject: [PATCH 04938/10326] Forcefully re-apply DrawableHitObject state
 transforms on post-load DefaultsApplied

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 28d3a39096..7c05bc9aa7 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -186,6 +186,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private void onDefaultsApplied(HitObject hitObject)
         {
             apply(hitObject);
+            updateState(state.Value, true);
             DefaultsApplied?.Invoke(this);
         }
 

From 8b255f457971745411f896764889edc92a650a98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 18:40:20 +0900
Subject: [PATCH 04939/10326] Fix test failures

The issue was the ArchiveModelManager change; the test local change is
just there because it makes more sense to run for every test in that
scene.
---
 .../Visual/Editing/TestSceneEditorBeatmapCreation.cs      | 8 ++++----
 osu.Game/Database/ArchiveModelManager.cs                  | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index ceacbd51a2..720cf51f2c 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -27,15 +27,15 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("set dummy", () => Beatmap.Value = new DummyWorkingBeatmap(Audio, null));
 
             base.SetUpSteps();
+
+            // if we save a beatmap with a hash collision, things fall over.
+            // probably needs a more solid resolution in the future but this will do for now.
+            AddStep("make new beatmap unique", () => EditorBeatmap.Metadata.Title = Guid.NewGuid().ToString());
         }
 
         [Test]
         public void TestCreateNewBeatmap()
         {
-            // if we save a beatmap with a hash collision, things fall over.
-            // probably needs a more solid resolution in the future but this will do for now.
-            AddStep("make new beatmap unique", () => EditorBeatmap.Metadata.Title = Guid.NewGuid().ToString());
-
             AddStep("save beatmap", () => Editor.Save());
             AddAssert("new beatmap persisted", () => EditorBeatmap.BeatmapInfo.ID > 0);
         }
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index c39b71b058..bbe2604216 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -427,11 +427,13 @@ namespace osu.Game.Database
             {
                 // Dereference the existing file info, since the file model will be removed.
                 if (file.FileInfo != null)
+                {
                     Files.Dereference(file.FileInfo);
 
-                // This shouldn't be required, but here for safety in case the provided TModel is not being change tracked
-                // Definitely can be removed once we rework the database backend.
-                usage.Context.Set<TFileModel>().Remove(file);
+                    // This shouldn't be required, but here for safety in case the provided TModel is not being change tracked
+                    // Definitely can be removed once we rework the database backend.
+                    usage.Context.Set<TFileModel>().Remove(file);
+                }
 
                 model.Files.Remove(file);
             }

From c41fb67e730cba4dc9c8b706a511acf430b3938a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Sep 2020 18:48:04 +0900
Subject: [PATCH 04940/10326] Move all ruleset editor tests to their own
 namespace

---
 .../{ => Editor}/ManiaPlacementBlueprintTestScene.cs            | 2 +-
 .../{ => Editor}/ManiaSelectionBlueprintTestScene.cs            | 2 +-
 osu.Game.Rulesets.Mania.Tests/{ => Editor}/TestSceneEditor.cs   | 2 +-
 .../{ => Editor}/TestSceneHoldNotePlacementBlueprint.cs         | 2 +-
 .../{ => Editor}/TestSceneHoldNoteSelectionBlueprint.cs         | 2 +-
 .../{ => Editor}/TestSceneManiaBeatSnapGrid.cs                  | 2 +-
 .../{ => Editor}/TestSceneManiaHitObjectComposer.cs             | 2 +-
 .../{ => Editor}/TestSceneNotePlacementBlueprint.cs             | 2 +-
 .../{ => Editor}/TestSceneNoteSelectionBlueprint.cs             | 2 +-
 .../{ => Editor}/TestSceneHitCirclePlacementBlueprint.cs        | 2 +-
 .../{ => Editor}/TestSceneHitCircleSelectionBlueprint.cs        | 2 +-
 .../{ => Editor}/TestSceneOsuDistanceSnapGrid.cs                | 2 +-
 .../{ => Editor}/TestScenePathControlPointVisualiser.cs         | 2 +-
 .../{ => Editor}/TestSceneSliderPlacementBlueprint.cs           | 2 +-
 .../{ => Editor}/TestSceneSliderSelectionBlueprint.cs           | 2 +-
 .../{ => Editor}/TestSceneSpinnerPlacementBlueprint.cs          | 2 +-
 .../{ => Editor}/TestSceneSpinnerSelectionBlueprint.cs          | 2 +-
 osu.Game.Rulesets.Taiko.Tests/{ => Editor}/TestSceneEditor.cs   | 2 +-
 .../{ => Editor}/TestSceneTaikoHitObjectComposer.cs             | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)
 rename osu.Game.Rulesets.Mania.Tests/{ => Editor}/ManiaPlacementBlueprintTestScene.cs (97%)
 rename osu.Game.Rulesets.Mania.Tests/{ => Editor}/ManiaSelectionBlueprintTestScene.cs (95%)
 rename osu.Game.Rulesets.Mania.Tests/{ => Editor}/TestSceneEditor.cs (96%)
 rename osu.Game.Rulesets.Mania.Tests/{ => Editor}/TestSceneHoldNotePlacementBlueprint.cs (93%)
 rename osu.Game.Rulesets.Mania.Tests/{ => Editor}/TestSceneHoldNoteSelectionBlueprint.cs (97%)
 rename osu.Game.Rulesets.Mania.Tests/{ => Editor}/TestSceneManiaBeatSnapGrid.cs (98%)
 rename osu.Game.Rulesets.Mania.Tests/{ => Editor}/TestSceneManiaHitObjectComposer.cs (99%)
 rename osu.Game.Rulesets.Mania.Tests/{ => Editor}/TestSceneNotePlacementBlueprint.cs (97%)
 rename osu.Game.Rulesets.Mania.Tests/{ => Editor}/TestSceneNoteSelectionBlueprint.cs (96%)
 rename osu.Game.Rulesets.Osu.Tests/{ => Editor}/TestSceneHitCirclePlacementBlueprint.cs (94%)
 rename osu.Game.Rulesets.Osu.Tests/{ => Editor}/TestSceneHitCircleSelectionBlueprint.cs (98%)
 rename osu.Game.Rulesets.Osu.Tests/{ => Editor}/TestSceneOsuDistanceSnapGrid.cs (99%)
 rename osu.Game.Rulesets.Osu.Tests/{ => Editor}/TestScenePathControlPointVisualiser.cs (97%)
 rename osu.Game.Rulesets.Osu.Tests/{ => Editor}/TestSceneSliderPlacementBlueprint.cs (99%)
 rename osu.Game.Rulesets.Osu.Tests/{ => Editor}/TestSceneSliderSelectionBlueprint.cs (99%)
 rename osu.Game.Rulesets.Osu.Tests/{ => Editor}/TestSceneSpinnerPlacementBlueprint.cs (94%)
 rename osu.Game.Rulesets.Osu.Tests/{ => Editor}/TestSceneSpinnerSelectionBlueprint.cs (96%)
 rename osu.Game.Rulesets.Taiko.Tests/{ => Editor}/TestSceneEditor.cs (88%)
 rename osu.Game.Rulesets.Taiko.Tests/{ => Editor}/TestSceneTaikoHitObjectComposer.cs (97%)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
similarity index 97%
rename from osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
rename to osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index 0fe4a3c669..ece523e84c 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -16,7 +16,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
     public abstract class ManiaPlacementBlueprintTestScene : PlacementBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
similarity index 95%
rename from osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
rename to osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 149f6582ab..176fbba921 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
     public abstract class ManiaSelectionBlueprintTestScene : SelectionBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneEditor.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneEditor.cs
similarity index 96%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneEditor.cs
rename to osu.Game.Rulesets.Mania.Tests/Editor/TestSceneEditor.cs
index 3b9c03b86a..d3afbc63eb 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneEditor.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneEditor.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
     [TestFixture]
     public class TestSceneEditor : EditorTestScene
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
similarity index 93%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneHoldNotePlacementBlueprint.cs
rename to osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
index b4332264b9..87c74a12cf 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
     public class TestSceneHoldNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
similarity index 97%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs
rename to osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
index 90394f3d1b..24f4c6858e 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
@@ -12,7 +12,7 @@ using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
     public class TestSceneHoldNoteSelectionBlueprint : ManiaSelectionBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
similarity index 98%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
rename to osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
index 639be0bc11..654b752001 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
@@ -20,7 +20,7 @@ using osu.Game.Screens.Edit;
 using osu.Game.Tests.Visual;
 using osuTK;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
     public class TestSceneManiaBeatSnapGrid : EditorClockTestScene
     {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
similarity index 99%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
rename to osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
index 1a3fa29d4a..c9551ee79e 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
@@ -23,7 +23,7 @@ using osu.Game.Tests.Visual;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
     public class TestSceneManiaHitObjectComposer : EditorClockTestScene
     {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
similarity index 97%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs
rename to osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
index 2d97e61aa5..36c34a8fb9 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
@@ -18,7 +18,7 @@ using osu.Game.Tests.Visual;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
     public class TestSceneNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
similarity index 96%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs
rename to osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
index 1514bdf0bd..0e47a12a8e 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
@@ -12,7 +12,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
 using osuTK;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
     public class TestSceneNoteSelectionBlueprint : ManiaSelectionBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCirclePlacementBlueprint.cs
similarity index 94%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneHitCirclePlacementBlueprint.cs
rename to osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCirclePlacementBlueprint.cs
index 4c6abc45f7..7bccec6c97 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCirclePlacementBlueprint.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Osu.Tests
+namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public class TestSceneHitCirclePlacementBlueprint : PlacementBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCircleSelectionBlueprint.cs
similarity index 98%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs
rename to osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCircleSelectionBlueprint.cs
index 0ecce42e88..66cd405195 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCircleSelectionBlueprint.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Tests.Visual;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Tests
+namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public class TestSceneHitCircleSelectionBlueprint : SelectionBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
similarity index 99%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
rename to osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
index 0d0be2953b..1232369a0b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
@@ -19,7 +19,7 @@ using osu.Game.Tests.Visual;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Tests
+namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public class TestSceneOsuDistanceSnapGrid : OsuManualInputManagerTestScene
     {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
similarity index 97%
rename from osu.Game.Rulesets.Osu.Tests/TestScenePathControlPointVisualiser.cs
rename to osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 21fa283b6d..738a21b17e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -12,7 +12,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.Editor
 {
     public class TestScenePathControlPointVisualiser : OsuTestScene
     {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
similarity index 99%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs
rename to osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index fe9973f4d8..49d7d9249c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -14,7 +14,7 @@ using osu.Game.Tests.Visual;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Rulesets.Osu.Tests
+namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public class TestSceneSliderPlacementBlueprint : PlacementBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
similarity index 99%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs
rename to osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index d5be538d94..f6e1be693b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -16,7 +16,7 @@ using osu.Game.Tests.Visual;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Rulesets.Osu.Tests
+namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public class TestSceneSliderSelectionBlueprint : SelectionBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerPlacementBlueprint.cs
similarity index 94%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerPlacementBlueprint.cs
rename to osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerPlacementBlueprint.cs
index d74d072857..fa6c660b01 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerPlacementBlueprint.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Osu.Tests
+namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public class TestSceneSpinnerPlacementBlueprint : PlacementBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
similarity index 96%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs
rename to osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
index 011463ab14..4248f68a60 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Tests.Visual;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Tests
+namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public class TestSceneSpinnerSelectionBlueprint : SelectionBlueprintTestScene
     {
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneEditor.cs
similarity index 88%
rename from osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs
rename to osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneEditor.cs
index 411fe08bcf..e3c1613bd9 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneEditor.cs
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Taiko.Tests
+namespace osu.Game.Rulesets.Taiko.Tests.Editor
 {
     [TestFixture]
     public class TestSceneEditor : EditorTestScene
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoHitObjectComposer.cs
similarity index 97%
rename from osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs
rename to osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoHitObjectComposer.cs
index 34d5fdf857..626537053a 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoHitObjectComposer.cs
@@ -12,7 +12,7 @@ using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Taiko.Tests
+namespace osu.Game.Rulesets.Taiko.Tests.Editor
 {
     public class TestSceneTaikoHitObjectComposer : EditorClockTestScene
     {

From acfa62bb50e669cdcfdc45f24f67339df7799eba Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 25 Sep 2020 19:25:58 +0900
Subject: [PATCH 04941/10326] Fix potential taiko crash on rewind

---
 osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs  | 13 +++++++++----
 .../DrawableTestStrongHit.cs                      | 15 +++------------
 .../Skinning/TestSceneHitExplosion.cs             | 10 ++++------
 osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs | 12 +++++++++---
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs        | 11 +++++------
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs      |  8 ++++----
 6 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
index 1db07b3244..3ffc6187b7 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
@@ -2,26 +2,31 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
-    internal class DrawableTestHit : DrawableTaikoHitObject
+    public class DrawableTestHit : DrawableHit
     {
-        private readonly HitResult type;
+        public readonly HitResult Type;
 
         public DrawableTestHit(Hit hit, HitResult type = HitResult.Great)
             : base(hit)
         {
-            this.type = type;
+            Type = type;
+
+            // in order to create nested strong hit
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Result.Type = type;
+            Result.Type = Type;
         }
 
         public override bool OnPressed(TaikoAction action) => false;
diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs
index 7cb984b254..829bcf34a1 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs
@@ -2,17 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
-    public class DrawableTestStrongHit : DrawableHit
+    public class DrawableTestStrongHit : DrawableTestHit
     {
-        private readonly HitResult type;
         private readonly bool hitBoth;
 
         public DrawableTestStrongHit(double startTime, HitResult type = HitResult.Great, bool hitBoth = true)
@@ -20,12 +17,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
             {
                 IsStrong = true,
                 StartTime = startTime,
-            })
+            }, type)
         {
-            // in order to create nested strong hit
-            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-            this.type = type;
             this.hitBoth = hitBoth;
         }
 
@@ -33,10 +26,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             base.LoadAsyncComplete();
 
-            Result.Type = type;
-
             var nestedStrongHit = (DrawableStrongNestedHit)NestedHitObjects.Single();
-            nestedStrongHit.Result.Type = hitBoth ? type : HitResult.Miss;
+            nestedStrongHit.Result.Type = hitBoth ? Type : HitResult.Miss;
         }
 
         public override bool OnPressed(TaikoAction action) => false;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index 48969e0f5a..19cc56527e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -6,7 +6,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.UI;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Skinning
@@ -29,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             AddStep("Good", () => SetContents(() => getContentFor(createStrongHit(HitResult.Good, hitBoth))));
         }
 
-        private Drawable getContentFor(DrawableTaikoHitObject hit)
+        private Drawable getContentFor(DrawableTestHit hit)
         {
             return new Container
             {
@@ -37,7 +36,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 Children = new Drawable[]
                 {
                     hit,
-                    new HitExplosion(hit)
+                    new HitExplosion(hit, hit.Type)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -46,9 +45,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             };
         }
 
-        private DrawableTaikoHitObject createHit(HitResult type) => new DrawableTestHit(new Hit { StartTime = Time.Current }, type);
+        private DrawableTestHit createHit(HitResult type) => new DrawableTestHit(new Hit { StartTime = Time.Current }, type);
 
-        private DrawableTaikoHitObject createStrongHit(HitResult type, bool hitBoth)
-            => new DrawableTestStrongHit(Time.Current, type, hitBoth);
+        private DrawableTestHit createStrongHit(HitResult type, bool hitBoth) => new DrawableTestStrongHit(Time.Current, type, hitBoth);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
index 9943a58e3e..7b8ab89233 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
@@ -15,8 +15,14 @@ namespace osu.Game.Rulesets.Taiko.UI
 {
     internal class DefaultHitExplosion : CircularContainer
     {
-        [Resolved]
-        private DrawableHitObject judgedObject { get; set; }
+        private readonly DrawableHitObject judgedObject;
+        private readonly HitResult result;
+
+        public DefaultHitExplosion(DrawableHitObject judgedObject, HitResult result)
+        {
+            this.judgedObject = judgedObject;
+            this.result = result;
+        }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
@@ -31,7 +37,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             Alpha = 0.15f;
             Masking = true;
 
-            if (judgedObject.Result.Type == HitResult.Miss)
+            if (result == HitResult.Miss)
                 return;
 
             bool isRim = (judgedObject.HitObject as Hit)?.Type == HitType.Rim;
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index e3eabbf88f..16300d5715 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Rulesets.Taiko.UI
     {
         public override bool RemoveWhenNotAlive => true;
 
-        [Cached(typeof(DrawableHitObject))]
         public readonly DrawableHitObject JudgedObject;
+        private readonly HitResult result;
 
         private SkinnableDrawable skinnable;
 
@@ -31,9 +31,10 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public override double LifetimeEnd => skinnable.Drawable.LifetimeEnd;
 
-        public HitExplosion(DrawableHitObject judgedObject)
+        public HitExplosion(DrawableHitObject judgedObject, HitResult result)
         {
             JudgedObject = judgedObject;
+            this.result = result;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -47,14 +48,12 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(JudgedObject)), _ => new DefaultHitExplosion());
+            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(JudgedObject)), _ => new DefaultHitExplosion(JudgedObject, result));
         }
 
         private TaikoSkinComponents getComponentName(DrawableHitObject judgedObject)
         {
-            var resultType = judgedObject.Result?.Type ?? HitResult.Great;
-
-            switch (resultType)
+            switch (result)
             {
                 case HitResult.Miss:
                     return TaikoSkinComponents.TaikoExplosionMiss;
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 7976d5bc6d..7b3fbb1faf 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -9,6 +9,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
@@ -206,8 +207,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     });
 
                     var type = (judgedObject.HitObject as Hit)?.Type ?? HitType.Centre;
-
-                    addExplosion(judgedObject, type);
+                    addExplosion(judgedObject, result.Type, type);
                     break;
             }
         }
@@ -219,9 +219,9 @@ namespace osu.Game.Rulesets.Taiko.UI
         /// As legacy skins have different explosions for singular and double strong hits,
         /// explosion addition is scheduled to ensure that both hits are processed if they occur on the same frame.
         /// </remarks>
-        private void addExplosion(DrawableHitObject drawableObject, HitType type) => Schedule(() =>
+        private void addExplosion(DrawableHitObject drawableObject, HitResult result, HitType type) => Schedule(() =>
         {
-            hitExplosionContainer.Add(new HitExplosion(drawableObject));
+            hitExplosionContainer.Add(new HitExplosion(drawableObject, result));
             if (drawableObject.HitObject.Kiai)
                 kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
         });

From 480eeb5fbee83ce1ac7eb5c28fb55e71b78c4640 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 25 Sep 2020 19:37:34 +0900
Subject: [PATCH 04942/10326] Add back caching

---
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index 16300d5715..efd1b25046 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -22,7 +22,9 @@ namespace osu.Game.Rulesets.Taiko.UI
     {
         public override bool RemoveWhenNotAlive => true;
 
+        [Cached(typeof(DrawableHitObject))]
         public readonly DrawableHitObject JudgedObject;
+
         private readonly HitResult result;
 
         private SkinnableDrawable skinnable;

From 0853f0e128dc14a880bc8d7ae0c2553fd67b4b9f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 25 Sep 2020 19:38:23 +0900
Subject: [PATCH 04943/10326] Remove comment

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

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
index 3ffc6187b7..e0af973b53 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             Type = type;
 
-            // in order to create nested strong hit
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }
 

From 1c4baa4e2adf718272cede63b8ae0393a3b77ef3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 25 Sep 2020 20:11:27 +0900
Subject: [PATCH 04944/10326] Add bonus hit results and orderings

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 103 ++++++++++++++++++++++++-
 1 file changed, 102 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index b057af2a50..370ffb3a7f 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -2,17 +2,23 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.ComponentModel;
+using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Scoring
 {
+    [HasOrderedElements]
     public enum HitResult
     {
         /// <summary>
         /// Indicates that the object has not been judged yet.
         /// </summary>
         [Description(@"")]
+        [Order(13)]
         None,
 
+        [Order(12)]
+        Ignore,
+
         /// <summary>
         /// Indicates that the object has been judged as a miss.
         /// </summary>
@@ -21,47 +27,142 @@ namespace osu.Game.Rulesets.Scoring
         /// "too far in the future). It should also define when a forced miss should be triggered (as a result of no user input in time).
         /// </remarks>
         [Description(@"Miss")]
+        [Order(5)]
         Miss,
 
         [Description(@"Meh")]
+        [Order(4)]
         Meh,
 
         /// <summary>
         /// Optional judgement.
         /// </summary>
         [Description(@"OK")]
+        [Order(3)]
         Ok,
 
         [Description(@"Good")]
+        [Order(2)]
         Good,
 
         [Description(@"Great")]
+        [Order(1)]
         Great,
 
         /// <summary>
         /// Optional judgement.
         /// </summary>
         [Description(@"Perfect")]
+        [Order(0)]
         Perfect,
 
         /// <summary>
         /// Indicates small tick miss.
         /// </summary>
+        [Order(11)]
         SmallTickMiss,
 
         /// <summary>
         /// Indicates a small tick hit.
         /// </summary>
+        [Description(@"S Tick")]
+        [Order(7)]
         SmallTickHit,
 
         /// <summary>
         /// Indicates a large tick miss.
         /// </summary>
+        [Order(10)]
         LargeTickMiss,
 
         /// <summary>
         /// Indicates a large tick hit.
         /// </summary>
-        LargeTickHit
+        [Description(@"L Tick")]
+        [Order(6)]
+        LargeTickHit,
+
+        /// <summary>
+        /// Indicates a small bonus.
+        /// </summary>
+        [Description("S Bonus")]
+        [Order(9)]
+        SmallBonus,
+
+        /// <summary>
+        /// Indicate a large bonus.
+        /// </summary>
+        [Description("L Bonus")]
+        [Order(8)]
+        LargeBonus,
+    }
+
+    public static class HitResultExtensions
+    {
+        /// <summary>
+        /// Whether a <see cref="HitResult"/> affects the combo.
+        /// </summary>
+        public static bool AffectsCombo(this HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.Miss:
+                case HitResult.Meh:
+                case HitResult.Ok:
+                case HitResult.Good:
+                case HitResult.Great:
+                case HitResult.Perfect:
+                case HitResult.LargeTickHit:
+                case HitResult.LargeTickMiss:
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Whether a <see cref="HitResult"/> should be counted as combo score.
+        /// </summary>
+        /// <remarks>
+        /// This is not the reciprocal of <see cref="AffectsCombo"/>, as <see cref="HitResult.SmallTickHit"/> and <see cref="HitResult.SmallTickMiss"/> do not affect combo
+        /// but are still considered as part of the accuracy (not bonus) portion of the score.
+        /// </remarks>
+        public static bool IsBonus(this HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.SmallBonus:
+                case HitResult.LargeBonus:
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Whether a <see cref="HitResult"/> represents a successful hit.
+        /// </summary>
+        public static bool IsHit(this HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.None:
+                case HitResult.Ignore:
+                case HitResult.Miss:
+                case HitResult.SmallTickMiss:
+                case HitResult.LargeTickMiss:
+                    return false;
+
+                default:
+                    return true;
+            }
+        }
+
+        /// <summary>
+        /// Whether a <see cref="HitResult"/> is scorable.
+        /// </summary>
+        public static bool IsScorable(this HitResult result) => result > HitResult.Ignore;
     }
 }

From a07597c3691ef68583269ef5e2b41487e64458b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 25 Sep 2020 20:22:59 +0900
Subject: [PATCH 04945/10326] Adjust displays to use new results/orderings

---
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  | 12 +++--
 .../Scores/TopScoreStatisticsSection.cs       |  6 +--
 osu.Game/Scoring/ScoreInfo.cs                 | 45 ++++++++++++++++++-
 .../ContractedPanelMiddleContent.cs           |  6 ++-
 .../Expanded/ExpandedPanelMiddleContent.cs    |  5 ++-
 .../Expanded/Statistics/CounterStatistic.cs   | 34 +++++++++++++-
 .../Expanded/Statistics/HitResultStatistic.cs |  4 +-
 osu.Game/Tests/TestScoreInfo.cs               |  6 +++
 8 files changed, 99 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 56866765b6..edf04dc55a 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -92,10 +92,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new TableColumn("max combo", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 70, maxSize: 120))
             };
 
-            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)));
+            foreach (var (key, _, _) in score.GetStatisticsForDisplay())
+                columns.Add(new TableColumn(key.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 35, maxSize: 60)));
 
             if (showPerformancePoints)
                 columns.Add(new TableColumn("pp", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 30)));
@@ -148,13 +146,13 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 }
             };
 
-            foreach (var kvp in score.SortedStatistics)
+            foreach (var (_, value, maxCount) in score.GetStatisticsForDisplay())
             {
                 content.Add(new OsuSpriteText
                 {
-                    Text = $"{kvp.Value}",
+                    Text = maxCount == null ? $"{value}" : $"{value}/{maxCount}",
                     Font = OsuFont.GetFont(size: text_size),
-                    Colour = kvp.Value == 0 ? Color4.Gray : Color4.White
+                    Colour = value == 0 ? Color4.Gray : Color4.White
                 });
             }
 
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 3a842d0a43..05789e1fc0 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 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));
+                statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(s => createStatisticsColumn(s.result, s.count, s.maxCount));
                 modsColumn.Mods = value.Mods;
 
                 if (scoreManager != null)
@@ -125,9 +125,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             }
         }
 
-        private TextColumn createStatisticsColumn(HitResult hitResult, int count) => new TextColumn(hitResult.GetDescription(), smallFont, bottom_columns_min_width)
+        private TextColumn createStatisticsColumn(HitResult hitResult, int count, int? maxCount) => new TextColumn(hitResult.GetDescription(), smallFont, bottom_columns_min_width)
         {
-            Text = count.ToString()
+            Text = maxCount == null ? $"{count}" : $"{count}/{maxCount}"
         };
 
         private class InfoColumn : CompositeDrawable
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index efcf1737c9..4ed3f92e25 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -7,6 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Rulesets;
@@ -147,8 +148,6 @@ 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
@@ -186,6 +185,48 @@ namespace osu.Game.Scoring
         [JsonProperty("position")]
         public int? Position { get; set; }
 
+        public IEnumerable<(HitResult result, int count, int? maxCount)> GetStatisticsForDisplay()
+        {
+            foreach (var key in OrderAttributeUtils.GetValuesInOrder<HitResult>())
+            {
+                if (key.IsBonus())
+                    continue;
+
+                int value = Statistics.GetOrDefault(key);
+
+                switch (key)
+                {
+                    case HitResult.SmallTickHit:
+                    {
+                        int total = value + Statistics.GetOrDefault(HitResult.SmallTickMiss);
+                        if (total > 0)
+                            yield return (key, value, total);
+
+                        break;
+                    }
+
+                    case HitResult.LargeTickHit:
+                    {
+                        int total = value + Statistics.GetOrDefault(HitResult.LargeTickMiss);
+                        if (total > 0)
+                            yield return (key, value, total);
+
+                        break;
+                    }
+
+                    case HitResult.SmallTickMiss:
+                    case HitResult.LargeTickMiss:
+                        break;
+
+                    default:
+                        if (value > 0 || key == HitResult.Miss)
+                            yield return (key, value, null);
+
+                        break;
+                }
+            }
+        }
+
         [Serializable]
         protected class DeserializedMod : IMod
         {
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index 0b85eeafa8..95ece1a9fb 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Leaderboards;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
@@ -116,7 +117,7 @@ namespace osu.Game.Screens.Ranking.Contracted
                                             AutoSizeAxes = Axes.Y,
                                             Direction = FillDirection.Vertical,
                                             Spacing = new Vector2(0, 5),
-                                            ChildrenEnumerable = score.SortedStatistics.Select(s => createStatistic(s.Key.GetDescription(), s.Value.ToString()))
+                                            ChildrenEnumerable = score.GetStatisticsForDisplay().Select(s => createStatistic(s.result, s.count, s.maxCount))
                                         },
                                         new FillFlowContainer
                                         {
@@ -198,6 +199,9 @@ namespace osu.Game.Screens.Ranking.Contracted
             };
         }
 
+        private Drawable createStatistic(HitResult result, int count, int? maxCount)
+            => createStatistic(result.GetDescription(), maxCount == null ? $"{count}" : $"{count}/{maxCount}");
+
         private Drawable createStatistic(string key, string value) => new Container
         {
             RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 0033cd1f43..ebab8c88f6 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -65,8 +65,9 @@ namespace osu.Game.Screens.Ranking.Expanded
             };
 
             var bottomStatistics = new List<StatisticDisplay>();
-            foreach (var stat in score.SortedStatistics)
-                bottomStatistics.Add(new HitResultStatistic(stat.Key, stat.Value));
+
+            foreach (var (key, value, maxCount) in score.GetStatisticsForDisplay())
+                bottomStatistics.Add(new HitResultStatistic(key, value, maxCount));
 
             statisticDisplays.AddRange(topStatistics);
             statisticDisplays.AddRange(bottomStatistics);
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index e820831809..fc01f5e9c4 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -2,6 +2,7 @@
 // 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.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -16,6 +17,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
     public class CounterStatistic : StatisticDisplay
     {
         private readonly int count;
+        private readonly int? maxCount;
 
         private RollingCounter<int> counter;
 
@@ -24,10 +26,12 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         /// </summary>
         /// <param name="header">The name of the statistic.</param>
         /// <param name="count">The value to display.</param>
-        public CounterStatistic(string header, int count)
+        /// <param name="maxCount">The maximum value of <paramref name="count"/>. Not displayed if null.</param>
+        public CounterStatistic(string header, int count, int? maxCount = null)
             : base(header)
         {
             this.count = count;
+            this.maxCount = maxCount;
         }
 
         public override void Appear()
@@ -36,7 +40,33 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             counter.Current.Value = count;
         }
 
-        protected override Drawable CreateContent() => counter = new Counter();
+        protected override Drawable CreateContent()
+        {
+            var container = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Child = counter = new Counter
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre
+                }
+            };
+
+            if (maxCount != null)
+            {
+                container.Add(new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Font = OsuFont.Torus.With(size: 12, fixedWidth: true),
+                    Spacing = new Vector2(-2, 0),
+                    Text = $"/{maxCount}"
+                });
+            }
+
+            return container;
+        }
 
         private class Counter : RollingCounter<int>
         {
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
index faa4a6a96c..a86033713f 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
@@ -12,8 +12,8 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
     {
         private readonly HitResult result;
 
-        public HitResultStatistic(HitResult result, int count)
-            : base(result.GetDescription(), count)
+        public HitResultStatistic(HitResult result, int count, int? maxCount = null)
+            : base(result.GetDescription(), count, maxCount)
         {
             this.result = result;
         }
diff --git a/osu.Game/Tests/TestScoreInfo.cs b/osu.Game/Tests/TestScoreInfo.cs
index 31cced6ce4..704d01e479 100644
--- a/osu.Game/Tests/TestScoreInfo.cs
+++ b/osu.Game/Tests/TestScoreInfo.cs
@@ -37,6 +37,12 @@ namespace osu.Game.Tests
             Statistics[HitResult.Meh] = 50;
             Statistics[HitResult.Good] = 100;
             Statistics[HitResult.Great] = 300;
+            Statistics[HitResult.SmallTickHit] = 50;
+            Statistics[HitResult.SmallTickMiss] = 25;
+            Statistics[HitResult.LargeTickHit] = 100;
+            Statistics[HitResult.LargeTickMiss] = 50;
+            Statistics[HitResult.SmallBonus] = 10;
+            Statistics[HitResult.SmallBonus] = 50;
 
             Position = 1;
         }

From 2517fffb7e61b4bad9f0f9da41a834d1c42a14d8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 25 Sep 2020 20:48:16 +0900
Subject: [PATCH 04946/10326] Fix incorrect display in beatmap overlay table

---
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index edf04dc55a..968355c377 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -11,9 +11,11 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Leaderboards;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Users.Drawables;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -55,6 +57,11 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             highAccuracyColour = colours.GreenLight;
         }
 
+        /// <summary>
+        /// The statistics that appear in the table, in order of appearance.
+        /// </summary>
+        private readonly List<HitResult> statisticResultTypes = new List<HitResult>();
+
         private bool showPerformancePoints;
 
         public void DisplayScores(IReadOnlyList<ScoreInfo> scores, bool showPerformanceColumn)
@@ -65,11 +72,12 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 return;
 
             showPerformancePoints = showPerformanceColumn;
+            statisticResultTypes.Clear();
 
             for (int i = 0; i < scores.Count; i++)
                 backgroundFlow.Add(new ScoreTableRowBackground(i, scores[i], row_height));
 
-            Columns = createHeaders(scores.FirstOrDefault());
+            Columns = createHeaders(scores);
             Content = scores.Select((s, i) => createContent(i, s)).ToArray().ToRectangular();
         }
 
@@ -79,7 +87,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             backgroundFlow.Clear();
         }
 
-        private TableColumn[] createHeaders(ScoreInfo score)
+        private TableColumn[] createHeaders(IReadOnlyList<ScoreInfo> scores)
         {
             var columns = new List<TableColumn>
             {
@@ -92,8 +100,17 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new TableColumn("max combo", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 70, maxSize: 120))
             };
 
-            foreach (var (key, _, _) in score.GetStatisticsForDisplay())
-                columns.Add(new TableColumn(key.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 35, maxSize: 60)));
+            // All statistics across all scores, unordered.
+            var allScoreStatistics = scores.SelectMany(s => s.GetStatisticsForDisplay().Select(stat => stat.result)).ToHashSet();
+
+            foreach (var result in OrderAttributeUtils.GetValuesInOrder<HitResult>())
+            {
+                if (!allScoreStatistics.Contains(result))
+                    continue;
+
+                columns.Add(new TableColumn(result.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 35, maxSize: 60)));
+                statisticResultTypes.Add(result);
+            }
 
             if (showPerformancePoints)
                 columns.Add(new TableColumn("pp", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 30)));
@@ -146,13 +163,18 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 }
             };
 
-            foreach (var (_, value, maxCount) in score.GetStatisticsForDisplay())
+            var availableStatistics = score.GetStatisticsForDisplay().ToDictionary(tuple => tuple.result);
+
+            foreach (var result in statisticResultTypes)
             {
+                if (!availableStatistics.TryGetValue(result, out var stat))
+                    stat = (result, 0, null);
+
                 content.Add(new OsuSpriteText
                 {
-                    Text = maxCount == null ? $"{value}" : $"{value}/{maxCount}",
+                    Text = stat.maxCount == null ? $"{stat.count}" : $"{stat.count}/{stat.maxCount}",
                     Font = OsuFont.GetFont(size: text_size),
-                    Colour = value == 0 ? Color4.Gray : Color4.White
+                    Colour = stat.count == 0 ? Color4.Gray : Color4.White
                 });
             }
 

From 4bcc3ca82883588cd152a1d8efa58e5a60711b76 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 25 Sep 2020 22:16:14 +0900
Subject: [PATCH 04947/10326] Add AffectsAccuracy extension

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 370ffb3a7f..1de62cf8e5 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Scoring
     public static class HitResultExtensions
     {
         /// <summary>
-        /// Whether a <see cref="HitResult"/> affects the combo.
+        /// Whether a <see cref="HitResult"/> increases/decreases the combo, and affects the combo portion of the score.
         /// </summary>
         public static bool AffectsCombo(this HitResult result)
         {
@@ -122,12 +122,14 @@ namespace osu.Game.Rulesets.Scoring
         }
 
         /// <summary>
-        /// Whether a <see cref="HitResult"/> should be counted as combo score.
+        /// Whether a <see cref="HitResult"/> affects the accuracy portion of the score.
+        /// </summary>
+        public static bool AffectsAccuracy(this HitResult result)
+            => IsScorable(result) && !IsBonus(result);
+
+        /// <summary>
+        /// Whether a <see cref="HitResult"/> should be counted as bonus score.
         /// </summary>
-        /// <remarks>
-        /// This is not the reciprocal of <see cref="AffectsCombo"/>, as <see cref="HitResult.SmallTickHit"/> and <see cref="HitResult.SmallTickMiss"/> do not affect combo
-        /// but are still considered as part of the accuracy (not bonus) portion of the score.
-        /// </remarks>
         public static bool IsBonus(this HitResult result)
         {
             switch (result)

From 9a24346a008ed8c730bea94adb9271324c5a79a7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 25 Sep 2020 23:29:40 +0900
Subject: [PATCH 04948/10326] Fix HP drain edgecase potentially causing
 insta-fails

---
 .../TestSceneDrainingHealthProcessor.cs       | 39 +++++++++++++++++++
 .../Scoring/DrainingHealthProcessor.cs        |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
index 460ad1b898..4876d051aa 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
@@ -1,15 +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.Threading;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Tests.Visual;
 
@@ -175,6 +178,24 @@ namespace osu.Game.Tests.Gameplay
             assertHealthNotEqualTo(0);
         }
 
+        [Test]
+        public void TestSingleLongObjectDoesNotDrain()
+        {
+            var beatmap = new Beatmap
+            {
+                HitObjects = { new JudgeableLongHitObject() }
+            };
+
+            beatmap.HitObjects[0].ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            createProcessor(beatmap);
+            setTime(0);
+            assertHealthEqualTo(1);
+
+            setTime(5000);
+            assertHealthEqualTo(1);
+        }
+
         private Beatmap createBeatmap(double startTime, double endTime, params BreakPeriod[] breaks)
         {
             var beatmap = new Beatmap
@@ -235,5 +256,23 @@ namespace osu.Game.Tests.Gameplay
                 }
             }
         }
+
+        private class JudgeableLongHitObject : JudgeableHitObject, IHasDuration
+        {
+            public double EndTime => StartTime + Duration;
+            public double Duration { get; set; } = 5000;
+
+            public JudgeableLongHitObject()
+                : base(false)
+            {
+            }
+
+            protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
+            {
+                base.CreateNestedHitObjects(cancellationToken);
+
+                AddNested(new JudgeableHitObject());
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index 130907b242..ba9bbb055f 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Rulesets.Scoring
 
         private double computeDrainRate()
         {
-            if (healthIncreases.Count == 0)
+            if (healthIncreases.Count <= 1)
                 return 0;
 
             int adjustment = 1;

From 4d743f64f52ec3ce7123ccab545f5e1445b69db1 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 23 Sep 2020 21:15:41 +0200
Subject: [PATCH 04949/10326] Add a method to calculate asynchronously
 performance on a beatmap.

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index e9d26683c3..d9fb6ccd81 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -16,6 +16,7 @@ using osu.Framework.Lists;
 using osu.Framework.Threading;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Scoring;
 
 namespace osu.Game.Beatmaps
 {
@@ -114,6 +115,28 @@ namespace osu.Game.Beatmaps
             return computeDifficulty(key, beatmapInfo, rulesetInfo);
         }
 
+        /// <summary>
+        /// Calculates performance for the given <see cref="ScoreInfo"/> on a given <see cref="WorkingBeatmap"/>.
+        /// </summary>
+        /// <param name="beatmap">The <see cref="WorkingBeatmap"/> to do the calculation on. </param>
+        /// <param name="score">The score to do the calculation on. </param>
+        /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
+        /// <returns></returns>
+        public async Task<double> CalculateScorePerformance([NotNull] WorkingBeatmap beatmap, [NotNull] ScoreInfo score, CancellationToken token = default)
+        {
+            return await Task.Factory.StartNew(() =>
+            {
+                if (token.IsCancellationRequested)
+                    return default;
+
+                var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(beatmap, score);
+                var total = calculator.Calculate(null);
+
+                return total;
+
+            }, token, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
+        }
+
         private CancellationTokenSource trackedUpdateCancellationSource;
         private readonly List<CancellationTokenSource> linkedCancellationSources = new List<CancellationTokenSource>();
 

From 77a9d92f4221a21b75e597696a796244e2c899c8 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 25 Sep 2020 19:15:40 +0200
Subject: [PATCH 04950/10326] Add dynamic pp calculation to score panels for
 local scores

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs |  1 -
 .../Expanded/ExpandedPanelMiddleContent.cs    |  2 +-
 .../Statistics/PerformanceStatistic.cs        | 76 +++++++++++++++++++
 3 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index d9fb6ccd81..280e1f5a67 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -133,7 +133,6 @@ namespace osu.Game.Beatmaps
                 var total = calculator.Calculate(null);
 
                 return total;
-
             }, token, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
         }
 
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 0033cd1f43..88c61ce267 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Ranking.Expanded
             {
                 new AccuracyStatistic(score.Accuracy),
                 new ComboStatistic(score.MaxCombo, !score.Statistics.TryGetValue(HitResult.Miss, out var missCount) || missCount == 0),
-                new CounterStatistic("pp", (int)(score.PP ?? 0)),
+                new PerformanceStatistic(score),
             };
 
             var bottomStatistics = new List<StatisticDisplay>();
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
new file mode 100644
index 0000000000..e92e3df2dc
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -0,0 +1,76 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Threading;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking.Expanded.Statistics
+{
+    public class PerformanceStatistic : StatisticDisplay
+    {
+        private readonly ScoreInfo score;
+
+        private readonly Bindable<int> performance = new Bindable<int>();
+
+        private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
+
+        private RollingCounter<int> counter;
+
+        public PerformanceStatistic(ScoreInfo score)
+            : base("PP")
+        {
+            this.score = score;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(BeatmapManager beatmapManager, BeatmapDifficultyManager difficultyManager)
+        {
+            if (score.PP.HasValue)
+            {
+                performance.Value = (int)score.PP.Value;
+            }
+            else
+            {
+                var beatmap = beatmapManager.GetWorkingBeatmap(score.Beatmap);
+                difficultyManager.CalculateScorePerformance(beatmap, score, cancellationTokenSource.Token)
+                                 .ContinueWith(t => Schedule(() => performance.Value = (int)t.Result), cancellationTokenSource.Token);
+            }
+        }
+
+        public override void Appear()
+        {
+            base.Appear();
+            counter.Current.BindTo(performance);
+        }
+
+        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;
+
+            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
+            {
+                s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
+                s.Spacing = new Vector2(-2, 0);
+            });
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            cancellationTokenSource.Cancel();
+            base.Dispose(isDisposing);
+        }
+    }
+}

From 4d94bf3163e76240ade710e775f54da14b6e62a5 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 25 Sep 2020 19:16:33 +0200
Subject: [PATCH 04951/10326] Rename CalculateScorePerformance ->
 CalculatePerformance

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs                   | 2 +-
 .../Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 280e1f5a67..73834a137f 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Beatmaps
         /// <param name="score">The score to do the calculation on. </param>
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
         /// <returns></returns>
-        public async Task<double> CalculateScorePerformance([NotNull] WorkingBeatmap beatmap, [NotNull] ScoreInfo score, CancellationToken token = default)
+        public async Task<double> CalculatePerformance([NotNull] WorkingBeatmap beatmap, [NotNull] ScoreInfo score, CancellationToken token = default)
         {
             return await Task.Factory.StartNew(() =>
             {
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index e92e3df2dc..11edab6636 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             else
             {
                 var beatmap = beatmapManager.GetWorkingBeatmap(score.Beatmap);
-                difficultyManager.CalculateScorePerformance(beatmap, score, cancellationTokenSource.Token)
+                difficultyManager.CalculatePerformance(beatmap, score, cancellationTokenSource.Token)
                                  .ContinueWith(t => Schedule(() => performance.Value = (int)t.Result), cancellationTokenSource.Token);
             }
         }

From e7d04564545cb4fe87d04add0792d6d14c1284c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Sat, 26 Sep 2020 16:25:17 +0200
Subject: [PATCH 04952/10326] Add SpinnerNoBlink to LegacySettings

---
 osu.Game/Skinning/LegacySkinConfiguration.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
index 1d5412d93f..a0e8fb2f92 100644
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacySkinConfiguration.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Skinning
             ComboOverlap,
             AnimationFramerate,
             LayeredHitSounds,
+            SpinnerNoBlink
         }
     }
 }

From 33d000e5325af0ca813c9c26de761761332f51b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Sat, 26 Sep 2020 16:25:57 +0200
Subject: [PATCH 04953/10326] Add support for SpinnerNoBlink in legacy spinner

---
 .../Skinning/LegacyOldStyleSpinner.cs              | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index e157842fd1..ada3a825d0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -25,12 +26,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private Sprite metreSprite;
         private Container metre;
 
+        private bool spinnerNoBlink;
+
         private const float sprite_scale = 1 / 1.6f;
         private const float final_metre_height = 692 * sprite_scale;
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
         {
+            spinnerNoBlink = source.GetConfig<LegacySetting, bool>(LegacySetting.SpinnerNoBlink)?.Value ?? false;
+
             drawableSpinner = (DrawableSpinner)drawableObject;
 
             RelativeSizeAxes = Axes.Both;
@@ -117,12 +122,15 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private float getMetreHeight(float progress)
         {
-            progress = Math.Min(99, progress * 100);
+            progress *= 100;
+
+            // the spinner should still blink at 100% progress.
+            if (!spinnerNoBlink)
+                progress = Math.Min(99, progress);
 
             int barCount = (int)progress / 10;
 
-            // todo: add SpinnerNoBlink support
-            if (RNG.NextBool(((int)progress % 10) / 10f))
+            if (!spinnerNoBlink && RNG.NextBool(((int)progress % 10) / 10f))
                 barCount++;
 
             return (float)barCount / total_bars * final_metre_height;

From b64e69fabd46f83e64853e8630ac06090032f904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Sep 2020 17:18:50 +0200
Subject: [PATCH 04954/10326] Add test hits to playfields directly where
 possible

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs                | 2 +-
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 47d8a5c012..36289bda93 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -212,7 +212,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             foreach (var playfield in playfields)
             {
                 var hit = new DrawableTestHit(new Hit(), judgementResult.Type);
-                Add(hit);
+                playfield.Add(hit);
 
                 playfield.OnNewResult(hit, judgementResult);
             }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 99d1b72ea4..9fc07340c6 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -149,7 +149,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) };
 
-            Add(h);
+            drawableRuleset.Playfield.Add(h);
 
             ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
         }
@@ -166,7 +166,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) };
 
-            Add(h);
+            drawableRuleset.Playfield.Add(h);
 
             ((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 });
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         private void addMissJudgement()
         {
             DrawableTestHit h;
-            Add(h = new DrawableTestHit(new Hit(), HitResult.Miss));
+            drawableRuleset.Playfield.Add(h = new DrawableTestHit(new Hit(), HitResult.Miss));
             ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = HitResult.Miss });
         }
 

From 095686a320823d80be303f2d6028a0da1bf4bb8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Sep 2020 17:26:26 +0200
Subject: [PATCH 04955/10326] Hide test hit directly in explosion scene

---
 osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs            | 6 ++++++
 .../Skinning/TestSceneHitExplosion.cs                       | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
index e0af973b53..4eeb4a1475 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
@@ -22,6 +22,12 @@ namespace osu.Game.Rulesets.Taiko.Tests
             HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         }
 
+        protected override void UpdateInitialTransforms()
+        {
+            // base implementation in DrawableHitObject forces alpha to 1.
+            // suppress locally to allow hiding the visuals wherever necessary.
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index 19cc56527e..45c94a8a86 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -35,7 +35,9 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    hit,
+                    // the hit needs to be added to hierarchy in order for nested objects to be created correctly.
+                    // setting zero alpha is supposed to prevent the test from looking broken.
+                    hit.With(h => h.Alpha = 0),
                     new HitExplosion(hit, hit.Type)
                     {
                         Anchor = Anchor.Centre,

From b1e02db8742e0510d88c68cbe0e15823abee86e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Sep 2020 20:36:38 +0200
Subject: [PATCH 04956/10326] Extract base taiko drawable ruleset scene

---
 .../DrawableTaikoRulesetTestScene.cs          | 55 ++++++++++++++
 .../TestSceneHits.cs                          | 74 +++++--------------
 2 files changed, 75 insertions(+), 54 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs
new file mode 100644
index 0000000000..d1c4a1c56d
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public abstract class DrawableTaikoRulesetTestScene : OsuTestScene
+    {
+        protected DrawableTaikoRuleset DrawableRuleset { get; private set; }
+        protected Container PlayfieldContainer { get; private set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var controlPointInfo = new ControlPointInfo();
+            controlPointInfo.Add(0, new TimingControlPoint());
+
+            WorkingBeatmap beatmap = CreateWorkingBeatmap(new Beatmap
+            {
+                HitObjects = new List<HitObject> { new Hit { Type = HitType.Centre } },
+                BeatmapInfo = new BeatmapInfo
+                {
+                    BaseDifficulty = new BeatmapDifficulty(),
+                    Metadata = new BeatmapMetadata
+                    {
+                        Artist = @"Unknown",
+                        Title = @"Sample Beatmap",
+                        AuthorString = @"peppy",
+                    },
+                    Ruleset = new TaikoRuleset().RulesetInfo
+                },
+                ControlPointInfo = controlPointInfo
+            });
+
+            Add(PlayfieldContainer = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.X,
+                Height = 768,
+                Children = new[] { DrawableRuleset = new DrawableTaikoRuleset(new TaikoRuleset(), beatmap.GetPlayableBeatmap(new TaikoRuleset().RulesetInfo)) }
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 9fc07340c6..b6cfe368f7 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -2,11 +2,9 @@
 // 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.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -18,13 +16,12 @@ using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.UI;
-using osu.Game.Tests.Visual;
 using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
-    public class TestSceneHits : OsuTestScene
+    public class TestSceneHits : DrawableTaikoRulesetTestScene
     {
         private const double default_duration = 3000;
         private const float scroll_time = 1000;
@@ -32,8 +29,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
         protected override double TimePerAction => default_duration * 2;
 
         private readonly Random rng = new Random(1337);
-        private DrawableTaikoRuleset drawableRuleset;
-        private Container playfieldContainer;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -64,35 +59,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
             AddStep("Height test 4", () => changePlayfieldSize(4));
             AddStep("Height test 5", () => changePlayfieldSize(5));
             AddStep("Reset height", () => changePlayfieldSize(6));
-
-            var controlPointInfo = new ControlPointInfo();
-            controlPointInfo.Add(0, new TimingControlPoint());
-
-            WorkingBeatmap beatmap = CreateWorkingBeatmap(new Beatmap
-            {
-                HitObjects = new List<HitObject> { new Hit { Type = HitType.Centre } },
-                BeatmapInfo = new BeatmapInfo
-                {
-                    BaseDifficulty = new BeatmapDifficulty(),
-                    Metadata = new BeatmapMetadata
-                    {
-                        Artist = @"Unknown",
-                        Title = @"Sample Beatmap",
-                        AuthorString = @"peppy",
-                    },
-                    Ruleset = new TaikoRuleset().RulesetInfo
-                },
-                ControlPointInfo = controlPointInfo
-            });
-
-            Add(playfieldContainer = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.X,
-                Height = 768,
-                Children = new[] { drawableRuleset = new DrawableTaikoRuleset(new TaikoRuleset(), beatmap.GetPlayableBeatmap(new TaikoRuleset().RulesetInfo)) }
-            });
         }
 
         private void changePlayfieldSize(int step)
@@ -128,11 +94,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
             switch (step)
             {
                 default:
-                    playfieldContainer.Delay(delay).ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
+                    PlayfieldContainer.Delay(delay).ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
                     break;
 
                 case 6:
-                    playfieldContainer.Delay(delay).ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_HEIGHT), 500);
+                    PlayfieldContainer.Delay(delay).ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_HEIGHT), 500);
                     break;
             }
         }
@@ -149,9 +115,9 @@ 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) };
 
-            drawableRuleset.Playfield.Add(h);
+            DrawableRuleset.Playfield.Add(h);
 
-            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
         }
 
         private void addStrongHitJudgement(bool kiai)
@@ -166,37 +132,37 @@ 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) };
 
-            drawableRuleset.Playfield.Add(h);
+            DrawableRuleset.Playfield.Add(h);
 
-            ((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 HitObject(), new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(new TestStrongNestedHit(h), new JudgementResult(new HitObject(), new TaikoStrongJudgement()) { Type = HitResult.Great });
         }
 
         private void addMissJudgement()
         {
             DrawableTestHit h;
-            drawableRuleset.Playfield.Add(h = new DrawableTestHit(new Hit(), HitResult.Miss));
-            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = HitResult.Miss });
+            DrawableRuleset.Playfield.Add(h = new DrawableTestHit(new Hit(), HitResult.Miss));
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = HitResult.Miss });
         }
 
         private void addBarLine(bool major, double delay = scroll_time)
         {
-            BarLine bl = new BarLine { StartTime = drawableRuleset.Playfield.Time.Current + delay };
+            BarLine bl = new BarLine { StartTime = DrawableRuleset.Playfield.Time.Current + delay };
 
-            drawableRuleset.Playfield.Add(major ? new DrawableBarLineMajor(bl) : new DrawableBarLine(bl));
+            DrawableRuleset.Playfield.Add(major ? new DrawableBarLineMajor(bl) : new DrawableBarLine(bl));
         }
 
         private void addSwell(double duration = default_duration)
         {
             var swell = new Swell
             {
-                StartTime = drawableRuleset.Playfield.Time.Current + scroll_time,
+                StartTime = DrawableRuleset.Playfield.Time.Current + scroll_time,
                 Duration = duration,
             };
 
             swell.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            drawableRuleset.Playfield.Add(new DrawableSwell(swell));
+            DrawableRuleset.Playfield.Add(new DrawableSwell(swell));
         }
 
         private void addDrumRoll(bool strong, double duration = default_duration, bool kiai = false)
@@ -206,7 +172,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             var d = new DrumRoll
             {
-                StartTime = drawableRuleset.Playfield.Time.Current + scroll_time,
+                StartTime = DrawableRuleset.Playfield.Time.Current + scroll_time,
                 IsStrong = strong,
                 Duration = duration,
                 TickRate = 8,
@@ -217,33 +183,33 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             d.ApplyDefaults(cpi, new BeatmapDifficulty());
 
-            drawableRuleset.Playfield.Add(new DrawableDrumRoll(d));
+            DrawableRuleset.Playfield.Add(new DrawableDrumRoll(d));
         }
 
         private void addCentreHit(bool strong)
         {
             Hit h = new Hit
             {
-                StartTime = drawableRuleset.Playfield.Time.Current + scroll_time,
+                StartTime = DrawableRuleset.Playfield.Time.Current + scroll_time,
                 IsStrong = strong
             };
 
             h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            drawableRuleset.Playfield.Add(new DrawableHit(h));
+            DrawableRuleset.Playfield.Add(new DrawableHit(h));
         }
 
         private void addRimHit(bool strong)
         {
             Hit h = new Hit
             {
-                StartTime = drawableRuleset.Playfield.Time.Current + scroll_time,
+                StartTime = DrawableRuleset.Playfield.Time.Current + scroll_time,
                 IsStrong = strong
             };
 
             h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            drawableRuleset.Playfield.Add(new DrawableHit(h));
+            DrawableRuleset.Playfield.Add(new DrawableHit(h));
         }
 
         private class TestStrongNestedHit : DrawableStrongNestedHit

From 0563a488f479083260753908b2ca8c140d3d98b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Sep 2020 20:37:23 +0200
Subject: [PATCH 04957/10326] Add failing test case

---
 .../TestSceneFlyingHits.cs                    | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
new file mode 100644
index 0000000000..7492a76a67
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+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.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.UI;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    [TestFixture]
+    public class TestSceneFlyingHits : DrawableTaikoRulesetTestScene
+    {
+        [TestCase(HitType.Centre)]
+        [TestCase(HitType.Rim)]
+        public void TestFlyingHits(HitType hitType)
+        {
+            DrawableFlyingHit flyingHit = null;
+
+            AddStep("add flying hit", () =>
+            {
+                addFlyingHit(hitType);
+
+                // flying hits all land in one common scrolling container (and stay there for rewind purposes),
+                // so we need to manually get the latest one.
+                flyingHit = this.ChildrenOfType<DrawableFlyingHit>()
+                                .OrderByDescending(h => h.HitObject.StartTime)
+                                .FirstOrDefault();
+            });
+
+            AddAssert("hit type is correct", () => flyingHit.HitObject.Type == hitType);
+        }
+
+        private void addFlyingHit(HitType hitType)
+        {
+            var tick = new DrumRollTick { HitWindows = HitWindows.Empty, StartTime = DrawableRuleset.Playfield.Time.Current };
+
+            DrawableDrumRollTick h;
+            DrawableRuleset.Playfield.Add(h = new DrawableDrumRollTick(tick) { JudgementType = hitType });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Perfect });
+        }
+    }
+}

From d61a8327da94243b65d7761ee23d9a5f4649a5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Sep 2020 20:59:55 +0200
Subject: [PATCH 04958/10326] Fix rim flying hits changing colour

---
 .../Objects/Drawables/DrawableFlyingHit.cs                  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
index 460e760629..3253c1ce5a 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
@@ -27,5 +27,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             base.LoadComplete();
             ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
+
+        protected override void LoadSamples()
+        {
+            // block base call - flying hits are not supposed to play samples
+            // the base call could overwrite the type of this hit
+        }
     }
 }

From c5cf0d0410e57ffd63f105d4467ba9b4c05df1b1 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 26 Sep 2020 21:50:39 +0200
Subject: [PATCH 04959/10326] Fix tests failing.

---
 .../Visual/Background/TestSceneUserDimBackgrounds.cs           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 19294d12fc..ce73e9061b 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -194,7 +194,8 @@ namespace osu.Game.Tests.Visual.Background
             AddStep("Transition to Results", () => player.Push(results = new FadeAccessibleResults(new ScoreInfo
             {
                 User = new User { Username = "osu!" },
-                Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo
+                Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
+                Ruleset = new OsuRuleset().RulesetInfo,
             })));
 
             AddUntilStep("Wait for results is current", () => results.IsCurrentScreen());

From 84cc6068f5819a86c57e17dbdf4dc8e9270e8db4 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 27 Sep 2020 09:25:01 +0200
Subject: [PATCH 04960/10326] Remove unnecessary XMLDoc comment and remove
 unecessary implicit null parm

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

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 73834a137f..1acc4b290f 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -121,7 +121,6 @@ namespace osu.Game.Beatmaps
         /// <param name="beatmap">The <see cref="WorkingBeatmap"/> to do the calculation on. </param>
         /// <param name="score">The score to do the calculation on. </param>
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
-        /// <returns></returns>
         public async Task<double> CalculatePerformance([NotNull] WorkingBeatmap beatmap, [NotNull] ScoreInfo score, CancellationToken token = default)
         {
             return await Task.Factory.StartNew(() =>
@@ -130,7 +129,7 @@ namespace osu.Game.Beatmaps
                     return default;
 
                 var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(beatmap, score);
-                var total = calculator.Calculate(null);
+                var total = calculator.Calculate();
 
                 return total;
             }, token, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);

From 3cb9103fe094fdfe5845a877e9bd3bf4307f4dd2 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 27 Sep 2020 09:37:57 +0200
Subject: [PATCH 04961/10326] Inherit PerformanceStatistic from
 CounterStatistic

---
 .../Expanded/Statistics/CounterStatistic.cs   |  8 ++---
 .../Statistics/PerformanceStatistic.cs        | 29 ++-----------------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index e820831809..1f8deb4d59 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
     {
         private readonly int count;
 
-        private RollingCounter<int> counter;
+        protected RollingCounter<int> Counter;
 
         /// <summary>
         /// Creates a new <see cref="CounterStatistic"/>.
@@ -33,12 +33,12 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         public override void Appear()
         {
             base.Appear();
-            counter.Current.Value = count;
+            Counter.Current.Value = count;
         }
 
-        protected override Drawable CreateContent() => counter = new Counter();
+        protected override Drawable CreateContent() => Counter = new StatisticCounter();
 
-        private class Counter : RollingCounter<int>
+        private class StatisticCounter : RollingCounter<int>
         {
             protected override double RollingDuration => AccuracyCircle.ACCURACY_TRANSFORM_DURATION;
 
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index 11edab6636..b84d0b7ff7 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -4,18 +4,12 @@
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
-using osu.Game.Screens.Ranking.Expanded.Accuracy;
-using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded.Statistics
 {
-    public class PerformanceStatistic : StatisticDisplay
+    public class PerformanceStatistic : CounterStatistic
     {
         private readonly ScoreInfo score;
 
@@ -23,10 +17,8 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
 
         private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
 
-        private RollingCounter<int> counter;
-
         public PerformanceStatistic(ScoreInfo score)
-            : base("PP")
+            : base("PP", 0)
         {
             this.score = score;
         }
@@ -49,22 +41,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         public override void Appear()
         {
             base.Appear();
-            counter.Current.BindTo(performance);
-        }
-
-        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;
-
-            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
-            {
-                s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
-                s.Spacing = new Vector2(-2, 0);
-            });
+            Counter.Current.BindTo(performance);
         }
 
         protected override void Dispose(bool isDisposing)

From 00aea7748970cb3d29bde9f7a171d6ba5a545480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 27 Sep 2020 11:18:13 +0200
Subject: [PATCH 04962/10326] Fix potential instability of overlay activation
 tests

---
 .../Visual/Gameplay/TestSceneOverlayActivation.cs         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
index 3ee0f4e720..e36cc6861d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
@@ -12,6 +12,14 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         protected new OverlayTestPlayer Player => base.Player as OverlayTestPlayer;
 
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddUntilStep("gameplay has started",
+                () => Player.GameplayClockContainer.GameplayClock.CurrentTime > Player.DrawableRuleset.GameplayStartTime);
+        }
+
         [Test]
         public void TestGameplayOverlayActivation()
         {

From 8d9945dea895ab03f7fcb9562a1d533ebc502d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 27 Sep 2020 11:28:20 +0200
Subject: [PATCH 04963/10326] Change until step to assert for consistency

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
index e36cc6861d..ce04b940e7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestGameplayOverlayActivationPaused()
         {
-            AddUntilStep("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
+            AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
             AddStep("pause gameplay", () => Player.Pause());
             AddUntilStep("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
         }

From ddede857043f8a7a189cd69dcffde9503bccdf88 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 27 Sep 2020 12:44:29 +0200
Subject: [PATCH 04964/10326] Split performance calculation to its own class.

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 21 ----------
 osu.Game/OsuGameBase.cs                       |  5 +++
 osu.Game/Scoring/ScorePerformanceManager.cs   | 39 +++++++++++++++++++
 .../Statistics/PerformanceStatistic.cs        |  8 ++--
 4 files changed, 47 insertions(+), 26 deletions(-)
 create mode 100644 osu.Game/Scoring/ScorePerformanceManager.cs

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 1acc4b290f..e9d26683c3 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -16,7 +16,6 @@ using osu.Framework.Lists;
 using osu.Framework.Threading;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Scoring;
 
 namespace osu.Game.Beatmaps
 {
@@ -115,26 +114,6 @@ namespace osu.Game.Beatmaps
             return computeDifficulty(key, beatmapInfo, rulesetInfo);
         }
 
-        /// <summary>
-        /// Calculates performance for the given <see cref="ScoreInfo"/> on a given <see cref="WorkingBeatmap"/>.
-        /// </summary>
-        /// <param name="beatmap">The <see cref="WorkingBeatmap"/> to do the calculation on. </param>
-        /// <param name="score">The score to do the calculation on. </param>
-        /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
-        public async Task<double> CalculatePerformance([NotNull] WorkingBeatmap beatmap, [NotNull] ScoreInfo score, CancellationToken token = default)
-        {
-            return await Task.Factory.StartNew(() =>
-            {
-                if (token.IsCancellationRequested)
-                    return default;
-
-                var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(beatmap, score);
-                var total = calculator.Calculate();
-
-                return total;
-            }, token, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
-        }
-
         private CancellationTokenSource trackedUpdateCancellationSource;
         private readonly List<CancellationTokenSource> linkedCancellationSources = new List<CancellationTokenSource>();
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index b1269e9300..9a4710d576 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -58,6 +58,8 @@ namespace osu.Game
 
         protected ScoreManager ScoreManager;
 
+        protected ScorePerformanceManager ScorePerformanceManager;
+
         protected BeatmapDifficultyManager DifficultyManager;
 
         protected SkinManager SkinManager;
@@ -226,6 +228,9 @@ namespace osu.Game
             dependencies.Cache(DifficultyManager = new BeatmapDifficultyManager());
             AddInternal(DifficultyManager);
 
+            dependencies.Cache(ScorePerformanceManager = new ScorePerformanceManager());
+            AddInternal(ScorePerformanceManager);
+
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
             dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore));
diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
new file mode 100644
index 0000000000..c8fec3b40c
--- /dev/null
+++ b/osu.Game/Scoring/ScorePerformanceManager.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.Threading;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Scoring
+{
+    public class ScorePerformanceManager : Component
+    {
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
+        /// <summary>
+        /// Calculates performance for the given <see cref="ScoreInfo"/>.
+        /// </summary>
+        /// <param name="score">The score to do the calculation on. </param>
+        /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
+        public async Task<double> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default)
+        {
+            return await Task.Factory.StartNew(() =>
+            {
+                if (token.IsCancellationRequested)
+                    return default;
+
+                var beatmap = beatmapManager.GetWorkingBeatmap(score.Beatmap);
+
+                var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(beatmap, score);
+                var total = calculator.Calculate();
+
+                return total;
+            }, token);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index b84d0b7ff7..e014258fd4 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -4,7 +4,6 @@
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Beatmaps;
 using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Ranking.Expanded.Statistics
@@ -24,7 +23,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmapManager, BeatmapDifficultyManager difficultyManager)
+        private void load(ScorePerformanceManager performanceManager)
         {
             if (score.PP.HasValue)
             {
@@ -32,9 +31,8 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             }
             else
             {
-                var beatmap = beatmapManager.GetWorkingBeatmap(score.Beatmap);
-                difficultyManager.CalculatePerformance(beatmap, score, cancellationTokenSource.Token)
-                                 .ContinueWith(t => Schedule(() => performance.Value = (int)t.Result), cancellationTokenSource.Token);
+                performanceManager.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
+                                  .ContinueWith(t => Schedule(() => performance.Value = (int)t.Result), cancellationTokenSource.Token);
             }
         }
 

From deb207001a8fc34feea461fd6cc6d7f275b0df27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 27 Sep 2020 15:23:34 +0200
Subject: [PATCH 04965/10326] Remove schedule causing default skin explosion
 regression

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 7b3fbb1faf..120cf264c3 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -215,16 +215,12 @@ namespace osu.Game.Rulesets.Taiko.UI
         private void addDrumRollHit(DrawableDrumRollTick drawableTick) =>
             drumRollHitContainer.Add(new DrawableFlyingHit(drawableTick));
 
-        /// <remarks>
-        /// As legacy skins have different explosions for singular and double strong hits,
-        /// explosion addition is scheduled to ensure that both hits are processed if they occur on the same frame.
-        /// </remarks>
-        private void addExplosion(DrawableHitObject drawableObject, HitResult result, HitType type) => Schedule(() =>
+        private void addExplosion(DrawableHitObject drawableObject, HitResult result, HitType type)
         {
             hitExplosionContainer.Add(new HitExplosion(drawableObject, result));
             if (drawableObject.HitObject.Kiai)
                 kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
-        });
+        }
 
         private class ProxyContainer : LifetimeManagementContainer
         {

From d5f1d94b517703f202bfcf6dfe695eb46ee02f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 27 Sep 2020 15:29:04 +0200
Subject: [PATCH 04966/10326] Allow specifying two sprites for legacy hit
 explosions

---
 .../Skinning/LegacyHitExplosion.cs            | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
index b5ec2e8def..ca0a8f601c 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.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;
 
@@ -8,14 +9,36 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 {
     public class LegacyHitExplosion : CompositeDrawable
     {
-        public LegacyHitExplosion(Drawable sprite)
-        {
-            InternalChild = sprite;
+        private readonly Drawable sprite;
+        private readonly Drawable strongSprite;
 
+        /// <summary>
+        /// Creates a new legacy hit explosion.
+        /// </summary>
+        /// <remarks>
+        /// Contrary to stable's, this implementation doesn't require a frame-perfect hit
+        /// for the strong sprite to be displayed.
+        /// </remarks>
+        /// <param name="sprite">The normal legacy explosion sprite.</param>
+        /// <param name="strongSprite">The strong legacy explosion sprite.</param>
+        public LegacyHitExplosion(Drawable sprite, Drawable strongSprite = null)
+        {
+            this.sprite = sprite;
+            this.strongSprite = strongSprite;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
             AutoSizeAxes = Axes.Both;
+
+            AddInternal(sprite);
+
+            if (strongSprite != null)
+                AddInternal(strongSprite.With(s => s.Alpha = 0));
         }
 
         protected override void LoadComplete()

From eb62ad4e551e72c3642ba56db21c954a4c850c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 27 Sep 2020 15:33:18 +0200
Subject: [PATCH 04967/10326] Look up both sprites for legacy explosions

---
 .../Skinning/TaikoLegacySkinTransformer.cs    | 30 ++++++++++---------
 .../TaikoSkinComponents.cs                    |  2 --
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs    | 27 ++++-------------
 3 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index c222ccb51f..d320b824e6 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -74,15 +74,23 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                     return null;
 
-                case TaikoSkinComponents.TaikoExplosionGood:
-                case TaikoSkinComponents.TaikoExplosionGoodStrong:
-                case TaikoSkinComponents.TaikoExplosionGreat:
-                case TaikoSkinComponents.TaikoExplosionGreatStrong:
                 case TaikoSkinComponents.TaikoExplosionMiss:
 
-                    var sprite = this.GetAnimation(getHitName(taikoComponent.Component), true, false);
-                    if (sprite != null)
-                        return new LegacyHitExplosion(sprite);
+                    var missSprite = this.GetAnimation(getHitName(taikoComponent.Component), true, false);
+                    if (missSprite != null)
+                        return new LegacyHitExplosion(missSprite);
+
+                    return null;
+
+                case TaikoSkinComponents.TaikoExplosionGood:
+                case TaikoSkinComponents.TaikoExplosionGreat:
+
+                    var hitName = getHitName(taikoComponent.Component);
+                    var hitSprite = this.GetAnimation(hitName, true, false);
+                    var strongHitSprite = this.GetAnimation($"{hitName}k", true, false);
+
+                    if (hitSprite != null)
+                        return new LegacyHitExplosion(hitSprite, strongHitSprite);
 
                     return null;
 
@@ -109,17 +117,11 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 case TaikoSkinComponents.TaikoExplosionGood:
                     return "taiko-hit100";
 
-                case TaikoSkinComponents.TaikoExplosionGoodStrong:
-                    return "taiko-hit100k";
-
                 case TaikoSkinComponents.TaikoExplosionGreat:
                     return "taiko-hit300";
-
-                case TaikoSkinComponents.TaikoExplosionGreatStrong:
-                    return "taiko-hit300k";
             }
 
-            throw new ArgumentOutOfRangeException(nameof(component), "Invalid result type");
+            throw new ArgumentOutOfRangeException(nameof(component), $"Invalid component type: {component}");
         }
 
         public override SampleChannel GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index 0d785adb4a..ac4fb51661 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -17,9 +17,7 @@ namespace osu.Game.Rulesets.Taiko
         BarLine,
         TaikoExplosionMiss,
         TaikoExplosionGood,
-        TaikoExplosionGoodStrong,
         TaikoExplosionGreat,
-        TaikoExplosionGreatStrong,
         Scroller,
         Mascot,
     }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index efd1b25046..53765f04dd 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -10,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.UI
@@ -50,10 +48,10 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(JudgedObject)), _ => new DefaultHitExplosion(JudgedObject, result));
+            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(result)), _ => new DefaultHitExplosion(JudgedObject, result));
         }
 
-        private TaikoSkinComponents getComponentName(DrawableHitObject judgedObject)
+        private static TaikoSkinComponents getComponentName(HitResult result)
         {
             switch (result)
             {
@@ -61,28 +59,13 @@ namespace osu.Game.Rulesets.Taiko.UI
                     return TaikoSkinComponents.TaikoExplosionMiss;
 
                 case HitResult.Good:
-                    return useStrongExplosion(judgedObject)
-                        ? TaikoSkinComponents.TaikoExplosionGoodStrong
-                        : TaikoSkinComponents.TaikoExplosionGood;
+                    return TaikoSkinComponents.TaikoExplosionGood;
 
                 case HitResult.Great:
-                    return useStrongExplosion(judgedObject)
-                        ? TaikoSkinComponents.TaikoExplosionGreatStrong
-                        : TaikoSkinComponents.TaikoExplosionGreat;
+                    return TaikoSkinComponents.TaikoExplosionGreat;
             }
 
-            throw new ArgumentOutOfRangeException(nameof(judgedObject), "Invalid result type");
-        }
-
-        private bool useStrongExplosion(DrawableHitObject judgedObject)
-        {
-            if (!(judgedObject.HitObject is Hit))
-                return false;
-
-            if (!(judgedObject.NestedHitObjects.SingleOrDefault() is DrawableStrongNestedHit nestedHit))
-                return false;
-
-            return judgedObject.Result.Type == nestedHit.Result.Type;
+            throw new ArgumentOutOfRangeException(nameof(result), $"Invalid result type: {result}");
         }
 
         /// <summary>

From 2f7c0b49344127ea1ccbe286f021edc71285352b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 27 Sep 2020 16:07:19 +0200
Subject: [PATCH 04968/10326] Allow switching between legacy sprites

---
 .../Skinning/LegacyHitExplosion.cs            | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
index ca0a8f601c..0f91239819 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
 {
@@ -12,6 +15,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         private readonly Drawable sprite;
         private readonly Drawable strongSprite;
 
+        private DrawableHit hit;
+        private DrawableStrongNestedHit nestedStrongHit;
+
         /// <summary>
         /// Creates a new legacy hit explosion.
         /// </summary>
@@ -28,7 +34,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(DrawableHitObject judgedObject)
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -39,6 +45,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
             if (strongSprite != null)
                 AddInternal(strongSprite.With(s => s.Alpha = 0));
+
+            if (judgedObject is DrawableHit h)
+            {
+                hit = h;
+                nestedStrongHit = hit.NestedHitObjects.SingleOrDefault() as DrawableStrongNestedHit;
+            }
         }
 
         protected override void LoadComplete()
@@ -56,5 +68,24 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
             Expire(true);
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (shouldSwitchToStrongSprite() && strongSprite != null)
+            {
+                sprite.FadeOut(50, Easing.OutQuint);
+                strongSprite.FadeIn(50, Easing.OutQuint);
+            }
+        }
+
+        private bool shouldSwitchToStrongSprite()
+        {
+            if (hit == null || nestedStrongHit == null)
+                return false;
+
+            return hit.Result.Type == nestedStrongHit.Result.Type;
+        }
     }
 }

From 49441286311c0c052a1100c13324b9c5b5f90f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 27 Sep 2020 18:11:12 +0200
Subject: [PATCH 04969/10326] Ensure both sprites are centered

---
 .../Skinning/LegacyHitExplosion.cs                | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
index 0f91239819..f24f75f097 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
@@ -41,10 +41,21 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
             AutoSizeAxes = Axes.Both;
 
-            AddInternal(sprite);
+            AddInternal(sprite.With(s =>
+            {
+                s.Anchor = Anchor.Centre;
+                s.Origin = Anchor.Centre;
+            }));
 
             if (strongSprite != null)
-                AddInternal(strongSprite.With(s => s.Alpha = 0));
+            {
+                AddInternal(strongSprite.With(s =>
+                {
+                    s.Alpha = 0;
+                    s.Anchor = Anchor.Centre;
+                    s.Origin = Anchor.Centre;
+                }));
+            }
 
             if (judgedObject is DrawableHit h)
             {

From 3cf430f49434ed3883ca1c5dc06844ca3d287327 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 15:30:18 +0900
Subject: [PATCH 04970/10326] Avoid saving state changes if nothing has changed
 (via binary comparison)

---
 .../Editing/EditorChangeHandlerTest.cs        | 57 ++++++++++++++++++-
 osu.Game/Screens/Edit/EditorChangeHandler.cs  | 28 +++++----
 2 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
index feda1ae0e9..ff2c9fb1a9 100644
--- a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
+++ b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
@@ -2,7 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
 
 namespace osu.Game.Tests.Editing
@@ -13,11 +15,12 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void TestSaveRestoreState()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
+            var (handler, beatmap) = createChangeHandler();
 
             Assert.That(handler.CanUndo.Value, Is.False);
             Assert.That(handler.CanRedo.Value, Is.False);
 
+            addArbitraryChange(beatmap);
             handler.SaveState();
 
             Assert.That(handler.CanUndo.Value, Is.True);
@@ -29,15 +32,48 @@ namespace osu.Game.Tests.Editing
             Assert.That(handler.CanRedo.Value, Is.True);
         }
 
+        [Test]
+        public void TestSaveSameStateDoesNotSave()
+        {
+            var (handler, beatmap) = createChangeHandler();
+
+            Assert.That(handler.CanUndo.Value, Is.False);
+            Assert.That(handler.CanRedo.Value, Is.False);
+
+            addArbitraryChange(beatmap);
+            handler.SaveState();
+
+            Assert.That(handler.CanUndo.Value, Is.True);
+            Assert.That(handler.CanRedo.Value, Is.False);
+
+            string hash = handler.CurrentStateHash;
+
+            // save a save without making any changes
+            handler.SaveState();
+
+            Assert.That(hash, Is.EqualTo(handler.CurrentStateHash));
+
+            handler.RestoreState(-1);
+
+            Assert.That(hash, Is.Not.EqualTo(handler.CurrentStateHash));
+
+            // we should only be able to restore once even though we saved twice.
+            Assert.That(handler.CanUndo.Value, Is.False);
+            Assert.That(handler.CanRedo.Value, Is.True);
+        }
+
         [Test]
         public void TestMaxStatesSaved()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
+            var (handler, beatmap) = createChangeHandler();
 
             Assert.That(handler.CanUndo.Value, Is.False);
 
             for (int i = 0; i < EditorChangeHandler.MAX_SAVED_STATES; i++)
+            {
+                addArbitraryChange(beatmap);
                 handler.SaveState();
+            }
 
             Assert.That(handler.CanUndo.Value, Is.True);
 
@@ -53,12 +89,15 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void TestMaxStatesExceeded()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
+            var (handler, beatmap) = createChangeHandler();
 
             Assert.That(handler.CanUndo.Value, Is.False);
 
             for (int i = 0; i < EditorChangeHandler.MAX_SAVED_STATES * 2; i++)
+            {
+                addArbitraryChange(beatmap);
                 handler.SaveState();
+            }
 
             Assert.That(handler.CanUndo.Value, Is.True);
 
@@ -70,5 +109,17 @@ namespace osu.Game.Tests.Editing
 
             Assert.That(handler.CanUndo.Value, Is.False);
         }
+
+        private (EditorChangeHandler, EditorBeatmap) createChangeHandler()
+        {
+            var beatmap = new EditorBeatmap(new Beatmap());
+
+            return (new EditorChangeHandler(beatmap), beatmap);
+        }
+
+        private void addArbitraryChange(EditorBeatmap beatmap)
+        {
+            beatmap.Add(new HitCircle { StartTime = RNG.Next(0, 100000) });
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index aa0f89912a..286fdbb020 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -4,9 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Objects;
 
@@ -89,23 +91,27 @@ namespace osu.Game.Screens.Edit
             if (isRestoring)
                 return;
 
-            if (currentState < savedStates.Count - 1)
-                savedStates.RemoveRange(currentState + 1, savedStates.Count - currentState - 1);
-
-            if (savedStates.Count > MAX_SAVED_STATES)
-                savedStates.RemoveAt(0);
-
             using (var stream = new MemoryStream())
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
                     new LegacyBeatmapEncoder(editorBeatmap, editorBeatmap.BeatmapSkin).Encode(sw);
 
-                savedStates.Add(stream.ToArray());
+                var newState = stream.ToArray();
+
+                // if the previous state is binary equal we don't need to push a new one, unless this is the initial state.
+                if (savedStates.Count > 0 && newState.SequenceEqual(savedStates.Last())) return;
+
+                if (currentState < savedStates.Count - 1)
+                    savedStates.RemoveRange(currentState + 1, savedStates.Count - currentState - 1);
+
+                if (savedStates.Count > MAX_SAVED_STATES)
+                    savedStates.RemoveAt(0);
+
+                savedStates.Add(newState);
+
+                currentState = savedStates.Count - 1;
+                updateBindables();
             }
-
-            currentState = savedStates.Count - 1;
-
-            updateBindables();
         }
 
         /// <summary>

From 1aa8b400d432b17031d4d5a37898dc0a3ac66d2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 14:45:36 +0900
Subject: [PATCH 04971/10326] Avoid unnecessary object updates from
 SelectionHandlers

---
 osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs     | 8 +++++++-
 .../Screens/Edit/Compose/Components/SelectionHandler.cs   | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index a3ecf7ed95..d5dd758e10 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -57,7 +57,13 @@ namespace osu.Game.Rulesets.Taiko.Edit
             ChangeHandler.BeginChange();
 
             foreach (var h in hits)
-                h.IsStrong = state;
+            {
+                if (h.IsStrong != state)
+                {
+                    h.IsStrong = state;
+                    EditorBeatmap.UpdateHitObject(h);
+                }
+            }
 
             ChangeHandler.EndChange();
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 6ca85fe026..a0220cf987 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -288,8 +288,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 var comboInfo = h as IHasComboInformation;
 
-                if (comboInfo == null)
-                    continue;
+                if (comboInfo == null || comboInfo.NewCombo == state) continue;
 
                 comboInfo.NewCombo = state;
                 EditorBeatmap?.UpdateHitObject(h);

From 0ae2266b8229ba5c8192385230c4506b2bf3e5a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 14:51:28 +0900
Subject: [PATCH 04972/10326] Fix new placement hitobjects in the editor not
 getting the default sample added

---
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 81d7fa4b32..9b3314e2ad 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -212,6 +212,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (blueprint != null)
             {
+                // doing this post-creations as adding the default hit sample should be the case regardless of the ruleset.
+                blueprint.HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_NORMAL });
+
                 placementBlueprintContainer.Child = currentPlacement = blueprint;
 
                 // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame

From a4e9c85333b06d293cc88a921ac38612490b1c04 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 14:37:55 +0900
Subject: [PATCH 04973/10326] Trigger a hitobject update after blueprint drag
 ends

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 8908520cd7..970e16d1c3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -201,6 +201,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (isDraggingBlueprint)
             {
+                // handle positional change etc.
+                foreach (var obj in selectedHitObjects)
+                    Beatmap.UpdateHitObject(obj);
+
                 changeHandler?.EndChange();
                 isDraggingBlueprint = false;
             }

From 6095446f10df0a34b1676aa1bf46deb9cceb7a26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 14:15:26 +0900
Subject: [PATCH 04974/10326] Fix autoplay generators failing on empty
 hitobjects lists

---
 osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs | 3 +++
 osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs | 3 +++
 osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs     | 3 +++
 osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index 5d11c574b1..a4f54bfe82 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -31,6 +31,9 @@ namespace osu.Game.Rulesets.Catch.Replays
 
         public override Replay Generate()
         {
+            if (Beatmap.HitObjects.Count == 0)
+                return Replay;
+
             // todo: add support for HT DT
             const double dash_speed = Catcher.BASE_SPEED;
             const double movement_speed = dash_speed / 2;
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index 483327d5b3..3ebbe5af8e 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -46,6 +46,9 @@ namespace osu.Game.Rulesets.Mania.Replays
 
         public override Replay Generate()
         {
+            if (Beatmap.HitObjects.Count == 0)
+                return Replay;
+
             var pointGroups = generateActionPoints().GroupBy(a => a.Time).OrderBy(g => g.First().Time);
 
             var actions = new List<ManiaAction>();
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index 76b2631894..9b350278f3 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -72,6 +72,9 @@ namespace osu.Game.Rulesets.Osu.Replays
 
         public override Replay Generate()
         {
+            if (Beatmap.HitObjects.Count == 0)
+                return Replay;
+
             buttonIndex = 0;
 
             AddFrameToReplay(new OsuReplayFrame(-100000, new Vector2(256, 500)));
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 273f4e4105..db2e5948f5 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -30,6 +30,9 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
         public override Replay Generate()
         {
+            if (Beatmap.HitObjects.Count == 0)
+                return Replay;
+
             bool hitButton = true;
 
             Frames.Add(new TaikoReplayFrame(-100000));

From e8220cf1b62dd7fcdd2afa13bb39b53b8a3771a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 14:03:56 +0900
Subject: [PATCH 04975/10326] Allow attaching a replay to a
 FrameStabilityContainer when FrameStablePlayback is off

---
 .../Rulesets/UI/FrameStabilityContainer.cs    | 72 ++++++++++++-------
 1 file changed, 48 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index d574991fa0..a4af92749f 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -123,39 +123,63 @@ namespace osu.Game.Rulesets.UI
 
             try
             {
-                if (!FrameStablePlayback)
-                    return;
-
-                if (firstConsumption)
+                if (FrameStablePlayback)
                 {
-                    // On the first update, frame-stability seeking would result in unexpected/unwanted behaviour.
-                    // Instead we perform an initial seek to the proposed time.
+                    if (firstConsumption)
+                    {
+                        // On the first update, frame-stability seeking would result in unexpected/unwanted behaviour.
+                        // Instead we perform an initial seek to the proposed time.
 
-                    // process frame (in addition to finally clause) to clear out ElapsedTime
-                    manualClock.CurrentTime = newProposedTime;
-                    framedClock.ProcessFrame();
+                        // process frame (in addition to finally clause) to clear out ElapsedTime
+                        manualClock.CurrentTime = newProposedTime;
+                        framedClock.ProcessFrame();
 
-                    firstConsumption = false;
-                }
-                else if (manualClock.CurrentTime < gameplayStartTime)
-                    manualClock.CurrentTime = newProposedTime = Math.Min(gameplayStartTime, newProposedTime);
-                else if (Math.Abs(manualClock.CurrentTime - newProposedTime) > sixty_frame_time * 1.2f)
-                {
-                    newProposedTime = newProposedTime > manualClock.CurrentTime
-                        ? Math.Min(newProposedTime, manualClock.CurrentTime + sixty_frame_time)
-                        : Math.Max(newProposedTime, manualClock.CurrentTime - sixty_frame_time);
+                        firstConsumption = false;
+                    }
+                    else if (manualClock.CurrentTime < gameplayStartTime)
+                        manualClock.CurrentTime = newProposedTime = Math.Min(gameplayStartTime, newProposedTime);
+                    else if (Math.Abs(manualClock.CurrentTime - newProposedTime) > sixty_frame_time * 1.2f)
+                    {
+                        newProposedTime = newProposedTime > manualClock.CurrentTime
+                            ? Math.Min(newProposedTime, manualClock.CurrentTime + sixty_frame_time)
+                            : Math.Max(newProposedTime, manualClock.CurrentTime - sixty_frame_time);
+                    }
                 }
 
                 if (isAttached)
                 {
-                    double? newTime = ReplayInputHandler.SetFrameFromTime(newProposedTime);
+                    double? newTime;
 
-                    if (newTime == null)
+                    if (FrameStablePlayback)
                     {
-                        // we shouldn't execute for this time value. probably waiting on more replay data.
-                        validState = false;
-                        requireMoreUpdateLoops = true;
-                        return;
+                        // when stability is turned on, we shouldn't execute for time values the replay is unable to satisfy.
+                        if ((newTime = ReplayInputHandler.SetFrameFromTime(newProposedTime)) == null)
+                        {
+                            // setting invalid state here ensures that gameplay will not continue (ie. our child
+                            // hierarchy won't be updated).
+                            validState = false;
+
+                            // potentially loop to catch-up playback.
+                            requireMoreUpdateLoops = true;
+
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        // when stability is disabled, we don't really care about accuracy.
+                        // looping over the replay will allow it to catch up and feed out the required values
+                        // for the current time.
+                        while ((newTime = ReplayInputHandler.SetFrameFromTime(newProposedTime)) != newProposedTime)
+                        {
+                            if (newTime == null)
+                            {
+                                // special case for when the replay actually can't arrive at the required time.
+                                // protects from potential endless loop.
+                                validState = false;
+                                return;
+                            }
+                        }
                     }
 
                     newProposedTime = newTime.Value;

From ff7c904996083e985dd41b389656b190f357b202 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 14:03:37 +0900
Subject: [PATCH 04976/10326] Add autoplay mod in editor specific ruleset
 construction

---
 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 b9b7c1ef54..6e377ff207 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Edit
 
             try
             {
-                drawableRulesetWrapper = new DrawableEditRulesetWrapper<TObject>(CreateDrawableRuleset(Ruleset, EditorBeatmap.PlayableBeatmap))
+                drawableRulesetWrapper = new DrawableEditRulesetWrapper<TObject>(CreateDrawableRuleset(Ruleset, EditorBeatmap.PlayableBeatmap, new[] { Ruleset.GetAutoplayMod() }))
                 {
                     Clock = EditorClock,
                     ProcessCustomClock = false

From 524c2b678c68b71d604342b32e5274fbb7684607 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 14:15:54 +0900
Subject: [PATCH 04977/10326] Forcefully regenerate autoplay on editor changes

---
 .../Rulesets/Edit/DrawableEditRulesetWrapper.cs    |  8 ++++++++
 osu.Game/Rulesets/UI/DrawableRuleset.cs            | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs b/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
index 89e7866707..1070b8cbd2 100644
--- a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
+++ b/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
@@ -45,15 +45,21 @@ namespace osu.Game.Rulesets.Edit
             base.LoadComplete();
 
             beatmap.HitObjectAdded += addHitObject;
+            beatmap.HitObjectUpdated += updateReplay;
             beatmap.HitObjectRemoved += removeHitObject;
         }
 
+        private void updateReplay(HitObject obj = null) =>
+            drawableRuleset.RegenerateAutoplay();
+
         private void addHitObject(HitObject hitObject)
         {
             var drawableObject = drawableRuleset.CreateDrawableRepresentation((TObject)hitObject);
 
             drawableRuleset.Playfield.Add(drawableObject);
             drawableRuleset.Playfield.PostProcess();
+
+            updateReplay();
         }
 
         private void removeHitObject(HitObject hitObject)
@@ -62,6 +68,8 @@ namespace osu.Game.Rulesets.Edit
 
             drawableRuleset.Playfield.Remove(drawableObject);
             drawableRuleset.Playfield.PostProcess();
+
+            drawableRuleset.RegenerateAutoplay();
         }
 
         public override bool PropagatePositionalInputSubTree => false;
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index fbb9acfe90..50e9a93e22 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -151,8 +151,11 @@ namespace osu.Game.Rulesets.UI
 
         public virtual PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new PlayfieldAdjustmentContainer();
 
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, CancellationToken? cancellationToken)
+        private void load(CancellationToken? cancellationToken)
         {
             InternalChildren = new Drawable[]
             {
@@ -178,11 +181,18 @@ namespace osu.Game.Rulesets.UI
                         .WithChild(ResumeOverlay)));
             }
 
-            applyRulesetMods(Mods, config);
+            RegenerateAutoplay();
 
             loadObjects(cancellationToken);
         }
 
+        public void RegenerateAutoplay()
+        {
+            // for now this is applying mods which aren't just autoplay.
+            // we'll need to reconsider this flow in the future.
+            applyRulesetMods(Mods, config);
+        }
+
         /// <summary>
         /// Creates and adds drawable representations of hit objects to the play field.
         /// </summary>

From 7949eabaac45fe2a67ab5a4f283c8851e314300c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 15:49:45 +0900
Subject: [PATCH 04978/10326] Remove left-over using

---
 osu.Game/Screens/Edit/EditorChangeHandler.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 286fdbb020..617c436ee0 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -8,7 +8,6 @@ using System.Linq;
 using System.Text;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
-using osu.Framework.Logging;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Objects;
 

From 467a16bf750600b0edc47674acd022334c632d89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 16:21:20 +0900
Subject: [PATCH 04979/10326] Fix fade out extension logic (and make it
 generally look better for sliders)

---
 .../Edit/DrawableOsuEditRuleset.cs            | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index a8719e0aa8..01e59c9598 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -8,6 +8,7 @@ using osu.Game.Beatmaps;
 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 osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
 using osuTK;
@@ -20,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// Hit objects are intentionally made to fade out at a constant slower rate than in gameplay.
         /// This allows a mapper to gain better historical context and use recent hitobjects as reference / snap points.
         /// </summary>
-        private const double editor_hit_object_fade_out_extension = 500;
+        private const double editor_hit_object_fade_out_extension = 700;
 
         public DrawableOsuEditRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(ruleset, beatmap, mods)
@@ -32,20 +33,37 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private void updateState(DrawableHitObject hitObject, ArmedState state)
         {
-            switch (state)
+            if (state == ArmedState.Idle)
+                return;
+
+            // adjust the visuals of certain object types to make them stay on screen for longer than usual.
+            switch (hitObject)
             {
-                case ArmedState.Miss:
-                    // Get the existing fade out transform
-                    var existing = hitObject.Transforms.LastOrDefault(t => t.TargetMember == nameof(Alpha));
-                    if (existing == null)
-                        return;
-
-                    hitObject.RemoveTransform(existing);
-
-                    using (hitObject.BeginAbsoluteSequence(existing.StartTime))
-                        hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
+                case DrawableSlider slider:
+                    // no specifics to sliders but let them fade slower below.
                     break;
+
+                case DrawableHitCircle circle: // also handles slider heads
+                    circle.ApproachCircle
+                          .FadeOutFromOne(editor_hit_object_fade_out_extension)
+                          .Expire();
+                    break;
+
+                default:
+                    // there are quite a few drawable hit types we don't want to extent (spinners, ticks etc.)
+                    return;
             }
+
+            // Get the existing fade out transform
+            var existing = hitObject.Transforms.LastOrDefault(t => t.TargetMember == nameof(Alpha));
+
+            if (existing == null)
+                return;
+
+            hitObject.RemoveTransform(existing);
+
+            using (hitObject.BeginAbsoluteSequence(existing.StartTime))
+                hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
         }
 
         protected override Playfield CreatePlayfield() => new OsuPlayfieldNoCursor();

From 5237fa7bf24cdaca9e2a8c2e24bdceff5906ff84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 16:37:54 +0900
Subject: [PATCH 04980/10326] Remove unused local in case statement

---
 osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index 01e59c9598..746ff4ac19 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -39,7 +39,11 @@ namespace osu.Game.Rulesets.Osu.Edit
             // adjust the visuals of certain object types to make them stay on screen for longer than usual.
             switch (hitObject)
             {
-                case DrawableSlider slider:
+                default:
+                    // there are quite a few drawable hit types we don't want to extent (spinners, ticks etc.)
+                    return;
+
+                case DrawableSlider _:
                     // no specifics to sliders but let them fade slower below.
                     break;
 
@@ -48,10 +52,6 @@ namespace osu.Game.Rulesets.Osu.Edit
                           .FadeOutFromOne(editor_hit_object_fade_out_extension)
                           .Expire();
                     break;
-
-                default:
-                    // there are quite a few drawable hit types we don't want to extent (spinners, ticks etc.)
-                    return;
             }
 
             // Get the existing fade out transform

From 8692c24dfc624f739d10209cafa173b125ff024d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 17:20:36 +0900
Subject: [PATCH 04981/10326] Fix extending spinners in editor causing them to
 disappear temporarily

---
 .../Objects/Drawables/Pieces/DefaultSpinnerDisc.cs       | 9 ++++-----
 osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs  | 5 ++---
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs  | 5 ++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 1476fe6010..e45ea9c6cc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -93,7 +92,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             base.LoadComplete();
 
             drawableSpinner.RotationTracker.Complete.BindValueChanged(complete => updateComplete(complete.NewValue, 200));
-            drawableSpinner.State.BindValueChanged(updateStateTransforms, true);
+            drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
         }
 
         protected override void Update()
@@ -123,7 +122,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             mainContainer.Rotation = drawableSpinner.RotationTracker.Rotation;
         }
 
-        private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
+        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
             centre.ScaleTo(0);
             mainContainer.ScaleTo(0);
@@ -144,11 +143,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
 
             // transforms we have from completing the spinner will be rolled back, so reapply immediately.
-            updateComplete(state.NewValue == ArmedState.Hit, 0);
+            updateComplete(state == ArmedState.Hit, 0);
 
             using (BeginDelayedSequence(spinner.Duration, true))
             {
-                switch (state.NewValue)
+                switch (state)
                 {
                     case ArmedState.Hit:
                         this.ScaleTo(Scale * 1.2f, 320, Easing.Out);
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 739c87e037..734c66ce7d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -2,7 +2,6 @@
 // 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;
@@ -72,10 +71,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
             base.LoadComplete();
 
             this.FadeOut();
-            drawableSpinner.State.BindValueChanged(updateStateTransforms, true);
+            drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
         }
 
-        private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
+        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
             var spinner = (Spinner)drawableSpinner.HitObject;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index e157842fd1..09f8894d53 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -86,10 +85,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
             base.LoadComplete();
 
             this.FadeOut();
-            drawableSpinner.State.BindValueChanged(updateStateTransforms, true);
+            drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
         }
 
-        private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
+        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
             var spinner = drawableSpinner.HitObject;
 

From 63b5b8b84187251bb51e72da4e295d00b7a8226d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 17:32:57 +0900
Subject: [PATCH 04982/10326] Fix sliders not dragging correctly after snaking
 has begun

Closes #10278.
---
 .../Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs    | 5 +++++
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
index 78f4c4d992..9349ef7a18 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -15,6 +15,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
     {
         private readonly ManualSliderBody body;
 
+        /// <summary>
+        /// Offset in absolute (local) coordinates from the start of the curve.
+        /// </summary>
+        public Vector2 PathStartLocation => body.PathOffset;
+
         public SliderBodyPiece()
         {
             InternalChild = body = new ManualSliderBody
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 6633136673..94862eb205 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -190,7 +190,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 ScreenSpaceSelectionPoint => ((DrawableSlider)DrawableObject).HeadCircle.ScreenSpaceDrawQuad.Centre;
+        public override Vector2 ScreenSpaceSelectionPoint => BodyPiece.ToScreenSpace(BodyPiece.PathStartLocation);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => BodyPiece.ReceivePositionalInputAt(screenSpacePos);
 

From e60e47ff66b623c230cdfe832bc4b12d2688e479 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 17:41:10 +0900
Subject: [PATCH 04983/10326] Unbind events on disposal

---
 .../Objects/Drawables/Pieces/DefaultSpinnerDisc.cs          | 6 ++++++
 osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs     | 6 ++++++
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs     | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index e45ea9c6cc..51d67c7f67 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -184,5 +184,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 return true;
             }
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 734c66ce7d..8baa6a3dd3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -94,5 +94,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             Scale = new Vector2(final_scale * (0.8f + (float)Interpolation.ApplyEasing(Easing.Out, drawableSpinner.Progress) * 0.2f));
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 09f8894d53..a895298ec3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -126,5 +126,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             return (float)barCount / total_bars * final_metre_height;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
+        }
     }
 }

From b6bc829bd5a8ea160a26fd66f7f18362395d9bb5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 28 Sep 2020 17:46:22 +0900
Subject: [PATCH 04984/10326] Guard against nulls (load not run)

---
 .../Objects/Drawables/Pieces/DefaultSpinnerDisc.cs            | 4 +++-
 osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs       | 4 +++-
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs       | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 51d67c7f67..2862fe49bd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -188,7 +188,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
+
+            if (drawableSpinner != null)
+                drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 8baa6a3dd3..bcb2af8e3e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -98,7 +98,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
+
+            if (drawableSpinner != null)
+                drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index a895298ec3..a45d91801d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -130,7 +130,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
+
+            if (drawableSpinner != null)
+                drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }

From 4f0c0ea5f9bb4d3dc7b671af349cf6ab87d15313 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Sep 2020 18:16:19 +0900
Subject: [PATCH 04985/10326] Fix hit samples playing while paused / seeking in
 the editor

---
 .../Objects/Drawables/DrawableHitObject.cs    |  4 ++--
 osu.Game/Screens/Edit/Editor.cs               |  1 +
 osu.Game/Screens/Edit/EditorClock.cs          | 22 +++++++++++++++++--
 osu.Game/Screens/Play/GameplayClock.cs        |  2 +-
 osu.Game/Screens/Play/ISeekableClock.cs       | 13 +++++++++++
 5 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Screens/Play/ISeekableClock.cs

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 7c05bc9aa7..5b26607bf7 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -360,7 +360,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         }
 
         [Resolved(canBeNull: true)]
-        private GameplayClock gameplayClock { get; set; }
+        private ISeekableClock seekableClock { get; set; }
 
         /// <summary>
         /// Calculate the position to be used for sample playback at a specified X position (0..1).
@@ -377,7 +377,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// Whether samples should currently be playing. Will be false during seek operations.
         /// </summary>
-        protected bool ShouldPlaySamples => gameplayClock?.IsSeeking != true;
+        protected bool ShouldPlaySamples => seekableClock?.IsSeeking != true;
 
         /// <summary>
         /// Plays all the hit sounds for this <see cref="DrawableHitObject"/>.
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index fd090e0959..1f5e261588 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -107,6 +107,7 @@ namespace osu.Game.Screens.Edit
             UpdateClockSource();
 
             dependencies.CacheAs(clock);
+            dependencies.CacheAs<ISeekableClock>(clock);
             AddInternal(clock);
 
             // todo: remove caching of this and consume via editorBeatmap?
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index ec203df064..ebc73c2bb8 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -7,17 +7,18 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
-using osu.Framework.Utils;
 using osu.Framework.Timing;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.Edit
 {
     /// <summary>
     /// A decoupled clock which adds editor-specific functionality, such as snapping to a user-defined beat divisor.
     /// </summary>
-    public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock
+    public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock, ISeekableClock
     {
         public IBindable<Track> Track => track;
 
@@ -211,8 +212,25 @@ namespace osu.Game.Screens.Edit
 
         private const double transform_time = 300;
 
+        public bool IsSeeking { get; private set; }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (IsSeeking)
+            {
+                // we are either running a seek tween or doing an immediate seek.
+                // in the case of an immediate seek the seeking bool will be set to false after one update.
+                // this allows for silencing hit sounds and the likes.
+                IsSeeking = Transforms.Any();
+            }
+        }
+
         public void SeekTo(double seekDestination)
         {
+            IsSeeking = true;
+
             if (IsRunning)
                 Seek(seekDestination);
             else
diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index 4f2cf5005c..b10e50882c 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play
     /// <see cref="IFrameBasedClock"/>, as this should only be done once to ensure accuracy.
     /// </remarks>
     /// </summary>
-    public class GameplayClock : IFrameBasedClock
+    public class GameplayClock : IFrameBasedClock, ISeekableClock
     {
         private readonly IFrameBasedClock underlyingClock;
 
diff --git a/osu.Game/Screens/Play/ISeekableClock.cs b/osu.Game/Screens/Play/ISeekableClock.cs
new file mode 100644
index 0000000000..9d992a45fd
--- /dev/null
+++ b/osu.Game/Screens/Play/ISeekableClock.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.
+
+namespace osu.Game.Screens.Play
+{
+    public interface ISeekableClock
+    {
+        /// <summary>
+        /// Whether an ongoing seek operation is active.
+        /// </summary>
+        bool IsSeeking { get; }
+    }
+}

From 40a4654ef91c2ec9f92cf8b944eb48edd1ab9972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Mon, 28 Sep 2020 12:21:43 +0200
Subject: [PATCH 04986/10326] Invert spinnerNoBlink to spinnerBlink locally

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

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index ada3a825d0..cce50b24ac 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private Sprite metreSprite;
         private Container metre;
 
-        private bool spinnerNoBlink;
+        private bool spinnerBlink;
 
         private const float sprite_scale = 1 / 1.6f;
         private const float final_metre_height = 692 * sprite_scale;
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
         {
-            spinnerNoBlink = source.GetConfig<LegacySetting, bool>(LegacySetting.SpinnerNoBlink)?.Value ?? false;
+            spinnerBlink = !source.GetConfig<LegacySetting, bool>(LegacySetting.SpinnerNoBlink)?.Value ?? true;
 
             drawableSpinner = (DrawableSpinner)drawableObject;
 
@@ -125,12 +125,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
             progress *= 100;
 
             // the spinner should still blink at 100% progress.
-            if (!spinnerNoBlink)
+            if (spinnerBlink)
                 progress = Math.Min(99, progress);
 
             int barCount = (int)progress / 10;
 
-            if (!spinnerNoBlink && RNG.NextBool(((int)progress % 10) / 10f))
+            if (spinnerBlink && RNG.NextBool(((int)progress % 10) / 10f))
                 barCount++;
 
             return (float)barCount / total_bars * final_metre_height;

From 54852991f36f2136dd5240058e5db758f81e65ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Mon, 28 Sep 2020 12:24:30 +0200
Subject: [PATCH 04987/10326] Move SpinnerNoBlink to OsuSkinConfiguration

---
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs | 3 +--
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs  | 3 ++-
 osu.Game/Skinning/LegacySkinConfiguration.cs            | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index cce50b24ac..63cd48676e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -12,7 +12,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
-using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -34,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
         {
-            spinnerBlink = !source.GetConfig<LegacySetting, bool>(LegacySetting.SpinnerNoBlink)?.Value ?? true;
+            spinnerBlink = !source.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerNoBlink)?.Value ?? true;
 
             drawableSpinner = (DrawableSpinner)drawableObject;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index e034e14eb0..63c9b53278 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         CursorRotate,
         HitCircleOverlayAboveNumber,
         HitCircleOverlayAboveNumer, // Some old skins will have this typo
-        SpinnerFrequencyModulate
+        SpinnerFrequencyModulate,
+        SpinnerNoBlink
     }
 }
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
index a0e8fb2f92..828804b9cb 100644
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacySkinConfiguration.cs
@@ -18,8 +18,7 @@ namespace osu.Game.Skinning
             ComboPrefix,
             ComboOverlap,
             AnimationFramerate,
-            LayeredHitSounds,
-            SpinnerNoBlink
+            LayeredHitSounds
         }
     }
 }

From 0900661b23e0cd3aea39142d551d442e8f084c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Sep 2020 16:34:04 +0200
Subject: [PATCH 04988/10326] Use IsHit for strong hit instead of checking
 result type

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
index f24f75f097..58dfa1747a 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             if (hit == null || nestedStrongHit == null)
                 return false;
 
-            return hit.Result.Type == nestedStrongHit.Result.Type;
+            return nestedStrongHit.IsHit;
         }
     }
 }

From f6f267a43a1651deaddb1f2a013b6efdde043a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Sep 2020 16:38:30 +0200
Subject: [PATCH 04989/10326] Switch to strong sprite exactly once

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
index 58dfa1747a..cd5c9c757f 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private DrawableHit hit;
         private DrawableStrongNestedHit nestedStrongHit;
+        private bool switchedToStrongSprite;
 
         /// <summary>
         /// Creates a new legacy hit explosion.
@@ -84,16 +85,17 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         {
             base.Update();
 
-            if (shouldSwitchToStrongSprite() && strongSprite != null)
+            if (shouldSwitchToStrongSprite() && !switchedToStrongSprite)
             {
                 sprite.FadeOut(50, Easing.OutQuint);
                 strongSprite.FadeIn(50, Easing.OutQuint);
+                switchedToStrongSprite = true;
             }
         }
 
         private bool shouldSwitchToStrongSprite()
         {
-            if (hit == null || nestedStrongHit == null)
+            if (hit == null || nestedStrongHit == null || strongSprite == null)
                 return false;
 
             return nestedStrongHit.IsHit;

From 2fb9a5d7342e63569dff7705450539ece330736c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Sep 2020 16:59:33 +0200
Subject: [PATCH 04990/10326] Remove no longer required field

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
index cd5c9c757f..19493271be 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
@@ -15,7 +15,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         private readonly Drawable sprite;
         private readonly Drawable strongSprite;
 
-        private DrawableHit hit;
         private DrawableStrongNestedHit nestedStrongHit;
         private bool switchedToStrongSprite;
 
@@ -58,11 +57,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 }));
             }
 
-            if (judgedObject is DrawableHit h)
-            {
-                hit = h;
+            if (judgedObject is DrawableHit hit)
                 nestedStrongHit = hit.NestedHitObjects.SingleOrDefault() as DrawableStrongNestedHit;
-            }
         }
 
         protected override void LoadComplete()
@@ -95,7 +91,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private bool shouldSwitchToStrongSprite()
         {
-            if (hit == null || nestedStrongHit == null || strongSprite == null)
+            if (nestedStrongHit == null || strongSprite == null)
                 return false;
 
             return nestedStrongHit.IsHit;

From 6efc4c42505bbfd373a196a8639b5954869335fc Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 28 Sep 2020 19:04:39 +0200
Subject: [PATCH 04991/10326] Cache performance calculations to prevent
 recomputations.

---
 osu.Game/Scoring/ScorePerformanceManager.cs   | 78 ++++++++++++++++---
 .../Statistics/PerformanceStatistic.cs        | 11 +--
 2 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index c8fec3b40c..0a57ccbd1f 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -1,17 +1,22 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Scoring
 {
     public class ScorePerformanceManager : Component
     {
+        private readonly ConcurrentDictionary<PerformanceCacheLookup, double> performanceCache = new ConcurrentDictionary<PerformanceCacheLookup, double>();
+
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -22,18 +27,73 @@ namespace osu.Game.Scoring
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
         public async Task<double> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default)
         {
+            if (score.PP.HasValue)
+                return score.PP.Value;
+
+            if (tryGetExisting(score, out var perf, out var lookupKey))
+                return perf;
+
             return await Task.Factory.StartNew(() =>
             {
-                if (token.IsCancellationRequested)
-                    return default;
-
-                var beatmap = beatmapManager.GetWorkingBeatmap(score.Beatmap);
-
-                var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(beatmap, score);
-                var total = calculator.Calculate();
-
-                return total;
+                return computePerformance(score, lookupKey, token);
             }, token);
         }
+
+        private bool tryGetExisting(ScoreInfo score, out double performance, out PerformanceCacheLookup lookupKey)
+        {
+            lookupKey = new PerformanceCacheLookup(score);
+
+            return performanceCache.TryGetValue(lookupKey, out performance);
+        }
+
+        private double computePerformance(ScoreInfo score, PerformanceCacheLookup lookupKey, CancellationToken token = default)
+        {
+            var beatmap = beatmapManager.GetWorkingBeatmap(score.Beatmap);
+
+            if (token.IsCancellationRequested)
+                return default;
+
+            var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(beatmap, score);
+            var total = calculator.Calculate();
+
+            performanceCache[lookupKey] = total;
+
+            return total;
+        }
+
+        public readonly struct PerformanceCacheLookup
+        {
+            public readonly double Accuracy;
+            public readonly int BeatmapId;
+            public readonly long TotalScore;
+            public readonly int Combo;
+            public readonly Mod[] Mods;
+            public readonly int RulesetId;
+
+            public PerformanceCacheLookup(ScoreInfo info)
+            {
+                Accuracy = info.Accuracy;
+                BeatmapId = info.Beatmap.ID;
+                TotalScore = info.TotalScore;
+                Combo = info.Combo;
+                Mods = info.Mods;
+                RulesetId = info.Ruleset.ID.Value;
+            }
+
+            public override int GetHashCode()
+            {
+                var hash = new HashCode();
+
+                hash.Add(Accuracy);
+                hash.Add(BeatmapId);
+                hash.Add(TotalScore);
+                hash.Add(Combo);
+                hash.Add(RulesetId);
+                foreach (var mod in Mods)
+                    hash.Add(mod);
+
+                return hash.ToHashCode();
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index e014258fd4..6c2ad5844b 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -25,15 +25,8 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         [BackgroundDependencyLoader]
         private void load(ScorePerformanceManager performanceManager)
         {
-            if (score.PP.HasValue)
-            {
-                performance.Value = (int)score.PP.Value;
-            }
-            else
-            {
-                performanceManager.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
-                                  .ContinueWith(t => Schedule(() => performance.Value = (int)t.Result), cancellationTokenSource.Token);
-            }
+            performanceManager.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
+                              .ContinueWith(t => Schedule(() => performance.Value = (int)t.Result), cancellationTokenSource.Token);
         }
 
         public override void Appear()

From 585b857a0c7f417a5fdfeb877d032324b4879f13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 12:17:38 +0900
Subject: [PATCH 04992/10326] Handle paused state correctly

---
 osu.Game/Screens/Edit/EditorClock.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index ebc73c2bb8..99e5044b1f 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -220,10 +220,12 @@ namespace osu.Game.Screens.Edit
 
             if (IsSeeking)
             {
+                bool isPaused = track.Value?.IsRunning != true;
+
                 // we are either running a seek tween or doing an immediate seek.
                 // in the case of an immediate seek the seeking bool will be set to false after one update.
                 // this allows for silencing hit sounds and the likes.
-                IsSeeking = Transforms.Any();
+                IsSeeking = isPaused || Transforms.Any();
             }
         }
 

From d6f3beffb648f1a0e059a5d641984522c799b77b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 12:45:20 +0900
Subject: [PATCH 04993/10326] Use existing bindable flow instead

---
 .../Objects/Drawables/DrawableSlider.cs       |  5 +--
 .../Objects/Drawables/DrawableSpinner.cs      |  5 +--
 .../Gameplay/TestSceneSkinnableSound.cs       |  2 +-
 .../Objects/Drawables/DrawableHitObject.cs    |  9 ++----
 osu.Game/Screens/Edit/Editor.cs               |  2 +-
 osu.Game/Screens/Edit/EditorClock.cs          | 29 +++++++++++++----
 osu.Game/Screens/Play/GameplayClock.cs        |  4 ++-
 .../Screens/Play/ISamplePlaybackDisabler.cs   | 20 ++++++++++++
 osu.Game/Screens/Play/ISeekableClock.cs       | 13 --------
 osu.Game/Skinning/SkinnableSound.cs           | 32 +++++++++++--------
 10 files changed, 70 insertions(+), 51 deletions(-)
 create mode 100644 osu.Game/Screens/Play/ISamplePlaybackDisabler.cs
 delete mode 100644 osu.Game/Screens/Play/ISeekableClock.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 07f40f763b..68f203db47 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -112,10 +112,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private void updateSlidingSample(ValueChangedEvent<bool> tracking)
         {
-            // note that samples will not start playing if exiting a seek operation in the middle of a slider.
-            // may be something we want to address at a later point, but not so easy to make happen right now
-            // (SkinnableSound would need to expose whether the sample is already playing and this logic would need to run in Update).
-            if (tracking.NewValue && ShouldPlaySamples)
+            if (tracking.NewValue)
                 slidingSample?.Play();
             else
                 slidingSample?.Stop();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index a57bb466c7..b2a706833c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -113,10 +113,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private void updateSpinningSample(ValueChangedEvent<bool> tracking)
         {
-            // note that samples will not start playing if exiting a seek operation in the middle of a spinner.
-            // may be something we want to address at a later point, but not so easy to make happen right now
-            // (SkinnableSound would need to expose whether the sample is already playing and this logic would need to run in Update).
-            if (tracking.NewValue && ShouldPlaySamples)
+            if (tracking.NewValue)
             {
                 spinningSample?.Play();
                 spinningSample?.VolumeTo(1, 200);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index ed75d83151..8b37cbd06f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinnableSound : OsuTestScene
     {
-        [Cached]
+        [Cached(typeof(ISamplePlaybackDisabler))]
         private GameplayClock gameplayClock = new GameplayClock(new FramedClock());
 
         private TestSkinSourceContainer skinSource;
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 5b26607bf7..796b8f7aae 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -360,7 +360,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         }
 
         [Resolved(canBeNull: true)]
-        private ISeekableClock seekableClock { get; set; }
+        private ISamplePlaybackDisabler samplePlaybackDisabler { get; set; }
 
         /// <summary>
         /// Calculate the position to be used for sample playback at a specified X position (0..1).
@@ -374,18 +374,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
             return balance_adjust_amount * (userPositionalHitSounds.Value ? position - 0.5f : 0);
         }
 
-        /// <summary>
-        /// Whether samples should currently be playing. Will be false during seek operations.
-        /// </summary>
-        protected bool ShouldPlaySamples => seekableClock?.IsSeeking != true;
-
         /// <summary>
         /// Plays all the hit sounds for this <see cref="DrawableHitObject"/>.
         /// This is invoked automatically when this <see cref="DrawableHitObject"/> is hit.
         /// </summary>
         public virtual void PlaySamples()
         {
-            if (Samples != null && ShouldPlaySamples)
+            if (Samples != null)
             {
                 Samples.Balance.Value = CalculateSamplePlaybackBalance(SamplePlaybackPosition);
                 Samples.Play();
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 1f5e261588..a0692d94e6 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Edit
             UpdateClockSource();
 
             dependencies.CacheAs(clock);
-            dependencies.CacheAs<ISeekableClock>(clock);
+            dependencies.CacheAs<ISamplePlaybackDisabler>(clock);
             AddInternal(clock);
 
             // todo: remove caching of this and consume via editorBeatmap?
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 99e5044b1f..4b7cd82637 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Edit
     /// <summary>
     /// A decoupled clock which adds editor-specific functionality, such as snapping to a user-defined beat divisor.
     /// </summary>
-    public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock, ISeekableClock
+    public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock, ISamplePlaybackDisabler
     {
         public IBindable<Track> Track => track;
 
@@ -32,6 +32,10 @@ namespace osu.Game.Screens.Edit
 
         private readonly DecoupleableInterpolatingFramedClock underlyingClock;
 
+        public IBindable<bool> SamplePlaybackDisabled => samplePlaybackDisabled;
+
+        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
             : this(beatmap.Beatmap.ControlPointInfo, beatmap.Track.Length, beatDivisor)
         {
@@ -167,11 +171,14 @@ namespace osu.Game.Screens.Edit
 
         public void Stop()
         {
+            samplePlaybackDisabled.Value = true;
             underlyingClock.Stop();
         }
 
         public bool Seek(double position)
         {
+            samplePlaybackDisabled.Value = true;
+
             ClearTransforms();
             return underlyingClock.Seek(position);
         }
@@ -212,26 +219,34 @@ namespace osu.Game.Screens.Edit
 
         private const double transform_time = 300;
 
-        public bool IsSeeking { get; private set; }
-
         protected override void Update()
         {
             base.Update();
 
-            if (IsSeeking)
+            updateSeekingState();
+        }
+
+        private void updateSeekingState()
+        {
+            if (samplePlaybackDisabled.Value)
             {
-                bool isPaused = track.Value?.IsRunning != true;
+                if (track.Value?.IsRunning != true)
+                {
+                    // seeking in the editor can happen while the track isn't running.
+                    // in this case we always want to expose ourselves as seeking (to avoid sample playback).
+                    return;
+                }
 
                 // we are either running a seek tween or doing an immediate seek.
                 // in the case of an immediate seek the seeking bool will be set to false after one update.
                 // this allows for silencing hit sounds and the likes.
-                IsSeeking = isPaused || Transforms.Any();
+                samplePlaybackDisabled.Value = Transforms.Any();
             }
         }
 
         public void SeekTo(double seekDestination)
         {
-            IsSeeking = true;
+            samplePlaybackDisabled.Value = true;
 
             if (IsRunning)
                 Seek(seekDestination);
diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index b10e50882c..da4648fd2b 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play
     /// <see cref="IFrameBasedClock"/>, as this should only be done once to ensure accuracy.
     /// </remarks>
     /// </summary>
-    public class GameplayClock : IFrameBasedClock, ISeekableClock
+    public class GameplayClock : IFrameBasedClock, ISamplePlaybackDisabler
     {
         private readonly IFrameBasedClock underlyingClock;
 
@@ -48,5 +48,7 @@ namespace osu.Game.Screens.Play
         public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
 
         public IClock Source => underlyingClock;
+
+        public IBindable<bool> SamplePlaybackDisabled => IsPaused;
     }
 }
diff --git a/osu.Game/Screens/Play/ISamplePlaybackDisabler.cs b/osu.Game/Screens/Play/ISamplePlaybackDisabler.cs
new file mode 100644
index 0000000000..83e89d654b
--- /dev/null
+++ b/osu.Game/Screens/Play/ISamplePlaybackDisabler.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.Bindables;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play
+{
+    /// <summary>
+    /// Allows a component to disable sample playback dynamically as required.
+    /// Handled by <see cref="SkinnableSound"/>.
+    /// </summary>
+    public interface ISamplePlaybackDisabler
+    {
+        /// <summary>
+        /// Whether sample playback should be disabled (or paused for looping samples).
+        /// </summary>
+        IBindable<bool> SamplePlaybackDisabled { get; }
+    }
+}
diff --git a/osu.Game/Screens/Play/ISeekableClock.cs b/osu.Game/Screens/Play/ISeekableClock.cs
deleted file mode 100644
index 9d992a45fd..0000000000
--- a/osu.Game/Screens/Play/ISeekableClock.cs
+++ /dev/null
@@ -1,13 +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.Play
-{
-    public interface ISeekableClock
-    {
-        /// <summary>
-        /// Whether an ongoing seek operation is active.
-        /// </summary>
-        bool IsSeeking { get; }
-    }
-}
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index ba14049b41..704ba099c1 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -50,25 +50,28 @@ namespace osu.Game.Skinning
             InternalChild = samplesContainer = new AudioContainer<DrawableSample>();
         }
 
-        private Bindable<bool> gameplayClockPaused;
+        private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
 
         [BackgroundDependencyLoader(true)]
-        private void load(GameplayClock gameplayClock)
+        private void load(ISamplePlaybackDisabler samplePlaybackDisabler)
         {
             // if in a gameplay context, pause sample playback when gameplay is paused.
-            gameplayClockPaused = gameplayClock?.IsPaused.GetBoundCopy();
-            gameplayClockPaused?.BindValueChanged(paused =>
+            if (samplePlaybackDisabler != null)
             {
-                if (requestedPlaying)
+                samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
+                samplePlaybackDisabled.BindValueChanged(disabled =>
                 {
-                    if (paused.NewValue)
-                        stop();
-                    // it's not easy to know if a sample has finished playing (to end).
-                    // to keep things simple only resume playing looping samples.
-                    else if (Looping)
-                        play();
-                }
-            });
+                    if (requestedPlaying)
+                    {
+                        if (disabled.NewValue)
+                            stop();
+                        // it's not easy to know if a sample has finished playing (to end).
+                        // to keep things simple only resume playing looping samples.
+                        else if (Looping)
+                            play();
+                    }
+                });
+            }
         }
 
         private bool looping;
@@ -94,6 +97,9 @@ namespace osu.Game.Skinning
 
         private void play()
         {
+            if (samplePlaybackDisabled.Value)
+                return;
+
             samplesContainer.ForEach(c =>
             {
                 if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)

From c5f6b77bbaa03be219cf5978391852ff5019287a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 13:42:17 +0900
Subject: [PATCH 04994/10326] Add missing cached type

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 7a9cb3dddd..cc25a733f1 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -51,6 +51,7 @@ namespace osu.Game.Screens.Play
         /// The final clock which is exposed to underlying components.
         /// </summary>
         [Cached]
+        [Cached(typeof(ISamplePlaybackDisabler))]
         public readonly GameplayClock GameplayClock;
 
         private Bindable<double> userAudioOffset;

From 74e74e1c31acdd58bfb258ca6a3dc0b291c548e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 14:20:41 +0900
Subject: [PATCH 04995/10326] Fix pause loop sound not working because paused

---
 osu.Game/Screens/Play/PauseOverlay.cs | 12 +++++++++++-
 osu.Game/Skinning/SkinnableSound.cs   |  6 ++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 65f34aba3e..9494971f8a 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play
             AddButton("Retry", colours.YellowDark, () => OnRetry?.Invoke());
             AddButton("Quit", new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
 
-            AddInternal(pauseLoop = new SkinnableSound(new SampleInfo("pause-loop"))
+            AddInternal(pauseLoop = new UnpausableSkinnableSound(new SampleInfo("pause-loop"))
             {
                 Looping = true,
                 Volume = { Value = 0 }
@@ -54,5 +54,15 @@ namespace osu.Game.Screens.Play
 
             pauseLoop.VolumeTo(0, TRANSITION_DURATION, Easing.OutQuad).Finally(_ => pauseLoop.Stop());
         }
+
+        private class UnpausableSkinnableSound : SkinnableSound
+        {
+            protected override bool PlayWhenPaused => true;
+
+            public UnpausableSkinnableSound(SampleInfo sampleInfo)
+                : base(sampleInfo)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 704ba099c1..f3ab8b86bc 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Skinning
         /// </remarks>
         protected bool PlayWhenZeroVolume => Looping;
 
+        protected virtual bool PlayWhenPaused => false;
+
         private readonly AudioContainer<DrawableSample> samplesContainer;
 
         public SkinnableSound(ISampleInfo hitSamples)
@@ -63,7 +65,7 @@ namespace osu.Game.Skinning
                 {
                     if (requestedPlaying)
                     {
-                        if (disabled.NewValue)
+                        if (disabled.NewValue && !PlayWhenPaused)
                             stop();
                         // it's not easy to know if a sample has finished playing (to end).
                         // to keep things simple only resume playing looping samples.
@@ -97,7 +99,7 @@ namespace osu.Game.Skinning
 
         private void play()
         {
-            if (samplePlaybackDisabled.Value)
+            if (samplePlaybackDisabled.Value && !PlayWhenPaused)
                 return;
 
             samplesContainer.ForEach(c =>

From 136843c8e450507ad0527622af851d648afb1545 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 14:09:51 +0900
Subject: [PATCH 04996/10326] Make DrawableStoryboardSample a SkinnableSound

Allows sharing pause logic with gameplay samples.
---
 .../Gameplay/TestSceneStoryboardSamples.cs    | 15 ++--
 osu.Game/Rulesets/Mods/IApplicableToSample.cs |  4 +-
 osu.Game/Rulesets/Mods/ModRateAdjust.cs       |  4 +-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  6 +-
 osu.Game/Screens/Play/Player.cs               | 80 ++++++++++---------
 osu.Game/Skinning/SkinnableSound.cs           | 39 ++++-----
 .../Drawables/DrawableStoryboardSample.cs     | 41 ++++------
 7 files changed, 94 insertions(+), 95 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index a690eb3b59..d46769a7c0 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Graphics.Audio;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Audio;
@@ -106,9 +108,14 @@ namespace osu.Game.Tests.Gameplay
                 Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, Audio);
                 SelectedMods.Value = new[] { testedMod };
 
-                Add(gameplayContainer = new GameplayClockContainer(Beatmap.Value, 0));
+                var beatmapSkinSourceContainer = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
 
-                gameplayContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
+                Add(gameplayContainer = new GameplayClockContainer(Beatmap.Value, 0)
+                {
+                    Child = beatmapSkinSourceContainer
+                });
+
+                beatmapSkinSourceContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
                 {
                     Clock = gameplayContainer.GameplayClock
                 });
@@ -116,7 +123,7 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("start", () => gameplayContainer.Start());
 
-            AddAssert("sample playback rate matches mod rates", () => sample.Channel.AggregateFrequency.Value == expectedRate);
+            AddAssert("sample playback rate matches mod rates", () => sample.ChildrenOfType<DrawableSample>().First().AggregateFrequency.Value == expectedRate);
         }
 
         private class TestSkin : LegacySkin
@@ -168,8 +175,6 @@ namespace osu.Game.Tests.Gameplay
                 : base(sampleInfo)
             {
             }
-
-            public new SampleChannel Channel => base.Channel;
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/IApplicableToSample.cs b/osu.Game/Rulesets/Mods/IApplicableToSample.cs
index 559d127cfc..50a6d501b6 100644
--- a/osu.Game/Rulesets/Mods/IApplicableToSample.cs
+++ b/osu.Game/Rulesets/Mods/IApplicableToSample.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.Audio.Sample;
+using osu.Framework.Graphics.Audio;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Mods
     /// </summary>
     public interface IApplicableToSample : IApplicableMod
     {
-        void ApplyToSample(SampleChannel sample);
+        void ApplyToSample(DrawableSample sample);
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index fec21764b0..2150b0fb68 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.Audio;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Mods
             track.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
         }
 
-        public virtual void ApplyToSample(SampleChannel sample)
+        public virtual void ApplyToSample(DrawableSample sample)
         {
             sample.AddAdjustment(AdjustableProperty.Frequency, SpeedChange);
         }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 20c8d0f3e7..4d43ae73d3 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -6,11 +6,11 @@ using System.Linq;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Objects;
-using osu.Framework.Audio.Sample;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Mods
             AdjustPitch.TriggerChange();
         }
 
-        public void ApplyToSample(SampleChannel sample)
+        public void ApplyToSample(DrawableSample sample)
         {
             sample.AddAdjustment(AdjustableProperty.Frequency, SpeedChange);
         }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8e2ed583f2..175722c44e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -191,9 +191,25 @@ namespace osu.Game.Screens.Play
 
             dependencies.CacheAs(gameplayBeatmap);
 
-            addUnderlayComponents(GameplayClockContainer);
-            addGameplayComponents(GameplayClockContainer, Beatmap.Value, playableBeatmap);
-            addOverlayComponents(GameplayClockContainer, Beatmap.Value);
+            var beatmapSkinProvider = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
+
+            // the beatmapSkinProvider is used as the fallback source here to allow the ruleset-specific skin implementation
+            // full access to all skin sources.
+            var rulesetSkinProvider = new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(beatmapSkinProvider, playableBeatmap));
+
+            // load the skinning hierarchy first.
+            // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
+            GameplayClockContainer.Add(beatmapSkinProvider.WithChild(rulesetSkinProvider));
+
+            rulesetSkinProvider.AddRange(new[]
+            {
+                // underlay and gameplay should have access the to skinning sources.
+                createUnderlayComponents(),
+                createGameplayComponents(Beatmap.Value, playableBeatmap)
+            });
+
+            // add the overlay components as a separate step as they proxy some elements from the above underlay/gameplay components.
+            GameplayClockContainer.Add(createOverlayComponents(Beatmap.Value));
 
             if (!DrawableRuleset.AllowGameplayOverlays)
             {
@@ -238,45 +254,31 @@ namespace osu.Game.Screens.Play
             breakTracker.IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
         }
 
-        private void addUnderlayComponents(Container target)
+        private Drawable createUnderlayComponents() =>
+            DimmableStoryboard = new DimmableStoryboard(Beatmap.Value.Storyboard) { RelativeSizeAxes = Axes.Both };
+
+        private Drawable createGameplayComponents(WorkingBeatmap working, IBeatmap playableBeatmap) => new ScalingContainer(ScalingMode.Gameplay)
         {
-            target.Add(DimmableStoryboard = new DimmableStoryboard(Beatmap.Value.Storyboard) { RelativeSizeAxes = Axes.Both });
-        }
-
-        private void addGameplayComponents(Container target, WorkingBeatmap working, IBeatmap playableBeatmap)
-        {
-            var beatmapSkinProvider = new BeatmapSkinProvidingContainer(working.Skin);
-
-            // the beatmapSkinProvider is used as the fallback source here to allow the ruleset-specific skin implementation
-            // full access to all skin sources.
-            var rulesetSkinProvider = new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(beatmapSkinProvider, playableBeatmap));
-
-            // load the skinning hierarchy first.
-            // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
-            target.Add(new ScalingContainer(ScalingMode.Gameplay)
-                .WithChild(beatmapSkinProvider
-                    .WithChild(target = rulesetSkinProvider)));
-
-            target.AddRange(new Drawable[]
+            Children = new Drawable[]
             {
-                DrawableRuleset,
+                DrawableRuleset.With(r =>
+                    r.FrameStableComponents.Children = new Drawable[]
+                    {
+                        ScoreProcessor,
+                        HealthProcessor,
+                        breakTracker = new BreakTracker(DrawableRuleset.GameplayStartTime, ScoreProcessor)
+                        {
+                            Breaks = working.Beatmap.Breaks
+                        }
+                    }),
                 new ComboEffects(ScoreProcessor)
-            });
+            }
+        };
 
-            DrawableRuleset.FrameStableComponents.AddRange(new Drawable[]
-            {
-                ScoreProcessor,
-                HealthProcessor,
-                breakTracker = new BreakTracker(DrawableRuleset.GameplayStartTime, ScoreProcessor)
-                {
-                    Breaks = working.Beatmap.Breaks
-                }
-            });
-        }
-
-        private void addOverlayComponents(Container target, WorkingBeatmap working)
+        private Drawable createOverlayComponents(WorkingBeatmap working) => new Container
         {
-            target.AddRange(new[]
+            RelativeSizeAxes = Axes.Both,
+            Children = new[]
             {
                 DimmableStoryboard.OverlayLayerContainer.CreateProxy(),
                 BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)
@@ -342,8 +344,8 @@ namespace osu.Game.Screens.Play
                     },
                 },
                 failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
-            });
-        }
+            }
+        };
 
         private void onBreakTimeChanged(ValueChangedEvent<bool> isBreakTime)
         {
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index f3ab8b86bc..07b759843c 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -22,7 +22,10 @@ namespace osu.Game.Skinning
         [Resolved]
         private ISampleStore samples { get; set; }
 
-        private bool requestedPlaying;
+        /// <summary>
+        /// Whether playback of this sound has been requested, regardless of whether it could be played or not (due to being paused, for instance).
+        /// </summary>
+        protected bool PlaybackRequested;
 
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
@@ -39,7 +42,7 @@ namespace osu.Game.Skinning
 
         protected virtual bool PlayWhenPaused => false;
 
-        private readonly AudioContainer<DrawableSample> samplesContainer;
+        protected readonly AudioContainer<DrawableSample> SamplesContainer;
 
         public SkinnableSound(ISampleInfo hitSamples)
             : this(new[] { hitSamples })
@@ -49,7 +52,7 @@ namespace osu.Game.Skinning
         public SkinnableSound(IEnumerable<ISampleInfo> hitSamples)
         {
             this.hitSamples = hitSamples.ToArray();
-            InternalChild = samplesContainer = new AudioContainer<DrawableSample>();
+            InternalChild = SamplesContainer = new AudioContainer<DrawableSample>();
         }
 
         private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
@@ -63,7 +66,7 @@ namespace osu.Game.Skinning
                 samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
                 samplePlaybackDisabled.BindValueChanged(disabled =>
                 {
-                    if (requestedPlaying)
+                    if (PlaybackRequested)
                     {
                         if (disabled.NewValue && !PlayWhenPaused)
                             stop();
@@ -87,13 +90,13 @@ namespace osu.Game.Skinning
 
                 looping = value;
 
-                samplesContainer.ForEach(c => c.Looping = looping);
+                SamplesContainer.ForEach(c => c.Looping = looping);
             }
         }
 
         public void Play()
         {
-            requestedPlaying = true;
+            PlaybackRequested = true;
             play();
         }
 
@@ -102,7 +105,7 @@ namespace osu.Game.Skinning
             if (samplePlaybackDisabled.Value && !PlayWhenPaused)
                 return;
 
-            samplesContainer.ForEach(c =>
+            SamplesContainer.ForEach(c =>
             {
                 if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
                     c.Play();
@@ -111,13 +114,13 @@ namespace osu.Game.Skinning
 
         public void Stop()
         {
-            requestedPlaying = false;
+            PlaybackRequested = false;
             stop();
         }
 
         private void stop()
         {
-            samplesContainer.ForEach(c => c.Stop());
+            SamplesContainer.ForEach(c => c.Stop());
         }
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
@@ -146,7 +149,7 @@ namespace osu.Game.Skinning
                 return ch;
             }).Where(c => c != null);
 
-            samplesContainer.ChildrenEnumerable = channels.Select(c => new DrawableSample(c));
+            SamplesContainer.ChildrenEnumerable = channels.Select(c => new DrawableSample(c));
 
             // Start playback internally for the new samples if the previous ones were playing beforehand.
             if (wasPlaying)
@@ -155,24 +158,24 @@ namespace osu.Game.Skinning
 
         #region Re-expose AudioContainer
 
-        public BindableNumber<double> Volume => samplesContainer.Volume;
+        public BindableNumber<double> Volume => SamplesContainer.Volume;
 
-        public BindableNumber<double> Balance => samplesContainer.Balance;
+        public BindableNumber<double> Balance => SamplesContainer.Balance;
 
-        public BindableNumber<double> Frequency => samplesContainer.Frequency;
+        public BindableNumber<double> Frequency => SamplesContainer.Frequency;
 
-        public BindableNumber<double> Tempo => samplesContainer.Tempo;
+        public BindableNumber<double> Tempo => SamplesContainer.Tempo;
 
         public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => samplesContainer.AddAdjustment(type, adjustBindable);
+            => SamplesContainer.AddAdjustment(type, adjustBindable);
 
         public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => samplesContainer.RemoveAdjustment(type, adjustBindable);
+            => SamplesContainer.RemoveAdjustment(type, adjustBindable);
 
         public void RemoveAllAdjustments(AdjustableProperty type)
-            => samplesContainer.RemoveAllAdjustments(type);
+            => SamplesContainer.RemoveAllAdjustments(type);
 
-        public bool IsPlaying => samplesContainer.Any(s => s.Playing);
+        public bool IsPlaying => SamplesContainer.Any(s => s.Playing);
 
         #endregion
     }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 119c48836b..83e3b8203e 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -4,15 +4,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Skinning;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    public class DrawableStoryboardSample : Component
+    public class DrawableStoryboardSample : SkinnableSound
     {
         /// <summary>
         /// The amount of time allowable beyond the start time of the sample, for the sample to start.
@@ -21,38 +19,37 @@ namespace osu.Game.Storyboards.Drawables
 
         private readonly StoryboardSampleInfo sampleInfo;
 
-        protected SampleChannel Channel { get; private set; }
-
         public override bool RemoveWhenNotAlive => false;
 
         public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
+            : base(sampleInfo)
         {
             this.sampleInfo = sampleInfo;
             LifetimeStart = sampleInfo.StartTime;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, IBindable<IReadOnlyList<Mod>> mods)
-        {
-            Channel = beatmap.Value.Skin.GetSample(sampleInfo);
-            if (Channel == null)
-                return;
+        [Resolved]
+        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
-            Channel.Volume.Value = sampleInfo.Volume / 100.0;
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
 
             foreach (var mod in mods.Value.OfType<IApplicableToSample>())
-                mod.ApplyToSample(Channel);
+            {
+                foreach (var sample in SamplesContainer)
+                    mod.ApplyToSample(sample);
+            }
         }
 
         protected override void Update()
         {
             base.Update();
 
-            // TODO: this logic will need to be consolidated with other game samples like hit sounds.
             if (Time.Current < sampleInfo.StartTime)
             {
                 // We've rewound before the start time of the sample
-                Channel?.Stop();
+                Stop();
 
                 // In the case that the user fast-forwards to a point far beyond the start time of the sample,
                 // we want to be able to fall into the if-conditional below (therefore we must not have a life time end)
@@ -63,8 +60,8 @@ namespace osu.Game.Storyboards.Drawables
             {
                 // We've passed the start time of the sample. We only play the sample if we're within an allowable range
                 // from the sample's start, to reduce layering if we've been fast-forwarded far into the future
-                if (Time.Current - sampleInfo.StartTime < allowable_late_start)
-                    Channel?.Play();
+                if (!PlaybackRequested && Time.Current - sampleInfo.StartTime < allowable_late_start)
+                    Play();
 
                 // In the case that the user rewinds to a point far behind the start time of the sample,
                 // we want to be able to fall into the if-conditional above (therefore we must not have a life time start)
@@ -72,13 +69,5 @@ namespace osu.Game.Storyboards.Drawables
                 LifetimeEnd = sampleInfo.StartTime;
             }
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            Channel?.Stop();
-            Channel = null;
-
-            base.Dispose(isDisposing);
-        }
     }
 }

From 56c8e4dacfba027675db746c668ac2541efddda0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 14:18:54 +0900
Subject: [PATCH 04997/10326] Fix failing tests

---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 420bf29429..ac0e8eb0d4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestQuickRetryFromFailedGameplay()
         {
             AddUntilStep("wait for fail", () => Player.HasFailed);
-            AddStep("quick retry", () => Player.GameplayClockContainer.OfType<HotkeyRetryOverlay>().First().Action?.Invoke());
+            AddStep("quick retry", () => Player.GameplayClockContainer.ChildrenOfType<HotkeyRetryOverlay>().First().Action?.Invoke());
 
             confirmExited();
         }
@@ -167,7 +167,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestQuickExitFromFailedGameplay()
         {
             AddUntilStep("wait for fail", () => Player.HasFailed);
-            AddStep("quick exit", () => Player.GameplayClockContainer.OfType<HotkeyExitOverlay>().First().Action?.Invoke());
+            AddStep("quick exit", () => Player.GameplayClockContainer.ChildrenOfType<HotkeyExitOverlay>().First().Action?.Invoke());
 
             confirmExited();
         }
@@ -183,7 +183,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestQuickExitFromGameplay()
         {
-            AddStep("quick exit", () => Player.GameplayClockContainer.OfType<HotkeyExitOverlay>().First().Action?.Invoke());
+            AddStep("quick exit", () => Player.GameplayClockContainer.ChildrenOfType<HotkeyExitOverlay>().First().Action?.Invoke());
 
             confirmExited();
         }

From 1a70002cdd0bfe2c0fafd2d5f8a9e552ebf5c267 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 14:41:50 +0900
Subject: [PATCH 04998/10326] Split ignore into hit/miss

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 1de62cf8e5..f5f2e269f0 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -13,12 +13,9 @@ namespace osu.Game.Rulesets.Scoring
         /// Indicates that the object has not been judged yet.
         /// </summary>
         [Description(@"")]
-        [Order(13)]
+        [Order(14)]
         None,
 
-        [Order(12)]
-        Ignore,
-
         /// <summary>
         /// Indicates that the object has been judged as a miss.
         /// </summary>
@@ -95,6 +92,12 @@ namespace osu.Game.Rulesets.Scoring
         [Description("L Bonus")]
         [Order(8)]
         LargeBonus,
+
+        [Order(13)]
+        IgnoreMiss,
+
+        [Order(12)]
+        IgnoreHit,
     }
 
     public static class HitResultExtensions
@@ -151,7 +154,7 @@ namespace osu.Game.Rulesets.Scoring
             switch (result)
             {
                 case HitResult.None:
-                case HitResult.Ignore:
+                case HitResult.IgnoreMiss:
                 case HitResult.Miss:
                 case HitResult.SmallTickMiss:
                 case HitResult.LargeTickMiss:
@@ -165,6 +168,6 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// Whether a <see cref="HitResult"/> is scorable.
         /// </summary>
-        public static bool IsScorable(this HitResult result) => result > HitResult.Ignore;
+        public static bool IsScorable(this HitResult result) => result >= HitResult.Miss && result < HitResult.IgnoreMiss;
     }
 }

From 5d1c3773790beb4b40ae02b11a230ddef47d7e05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 15:07:55 +0900
Subject: [PATCH 04999/10326] Fix HitObject samples getting stuck in a playing
 state on seeking far into the future

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs  | 6 ++++++
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 6 ++++++
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs   | 7 +++++++
 osu.Game/Skinning/SkinnableSound.cs                        | 3 ++-
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 68f203db47..ba328e15c6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -110,6 +110,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        public override void StopAllSamples()
+        {
+            base.StopAllSamples();
+            slidingSample?.Stop();
+        }
+
         private void updateSlidingSample(ValueChangedEvent<bool> tracking)
         {
             if (tracking.NewValue)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index b2a706833c..9e552981ea 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -124,6 +124,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        public override void StopAllSamples()
+        {
+            base.StopAllSamples();
+            spinningSample?.Stop();
+        }
+
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
         {
             base.AddNestedHitObject(hitObject);
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 796b8f7aae..56e3a98ca3 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -387,6 +387,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
         }
 
+        /// <summary>
+        /// Stops playback of all samples. Automatically called when <see cref="DrawableHitObject{TObject}"/>'s lifetime has been exceeded.
+        /// </summary>
+        public virtual void StopAllSamples() => Samples?.Stop();
+
         protected override void Update()
         {
             base.Update();
@@ -455,6 +460,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             foreach (var nested in NestedHitObjects)
                 nested.OnKilled();
 
+            StopAllSamples();
+
             UpdateResult(false);
         }
 
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 07b759843c..c1f0b78d3b 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -73,7 +73,8 @@ namespace osu.Game.Skinning
                         // it's not easy to know if a sample has finished playing (to end).
                         // to keep things simple only resume playing looping samples.
                         else if (Looping)
-                            play();
+                            // schedule so we don't start playing a sample which is no longer alive.
+                            Schedule(play);
                     }
                 });
             }

From 2f26728cdb6a28235a9e15c9e1acd0296938fb05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 15:29:56 +0900
Subject: [PATCH 05000/10326] Add test coverage of editor sample playback

---
 .../Editing/TestSceneEditorSamplePlayback.cs  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
new file mode 100644
index 0000000000..039a21fd94
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics.Audio;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneEditorSamplePlayback : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        [Test]
+        public void TestSlidingSampleStopsOnSeek()
+        {
+            DrawableSlider slider = null;
+            DrawableSample[] samples = null;
+
+            AddStep("get first slider", () =>
+            {
+                slider = Editor.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
+                samples = slider.ChildrenOfType<DrawableSample>().ToArray();
+            });
+
+            AddStep("start playback", () => EditorClock.Start());
+
+            AddUntilStep("wait for slider sliding then seek", () =>
+            {
+                if (!slider.Tracking.Value)
+                    return false;
+
+                if (!samples.Any(s => s.Playing))
+                    return false;
+
+                EditorClock.Seek(20000);
+                return true;
+            });
+
+            AddAssert("slider samples are not playing", () => samples.Length == 5 && samples.All(s => s.Played && !s.Playing));
+        }
+    }
+}

From cee58e89a34e6e072a5d6adeaefafb90bec7aa0e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 16:32:02 +0900
Subject: [PATCH 05001/10326] Pad hit results

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index f5f2e269f0..6abf91e9d3 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         [Description(@"")]
         [Order(14)]
-        None,
+        None = 0,
 
         /// <summary>
         /// Indicates that the object has been judged as a miss.
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Scoring
         /// </remarks>
         [Description(@"Miss")]
         [Order(5)]
-        Miss,
+        Miss = 64,
 
         [Description(@"Meh")]
         [Order(4)]
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Scoring
         /// Indicates small tick miss.
         /// </summary>
         [Order(11)]
-        SmallTickMiss,
+        SmallTickMiss = 128,
 
         /// <summary>
         /// Indicates a small tick hit.
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Scoring
         /// Indicates a large tick miss.
         /// </summary>
         [Order(10)]
-        LargeTickMiss,
+        LargeTickMiss = 192,
 
         /// <summary>
         /// Indicates a large tick hit.
@@ -84,17 +84,17 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         [Description("S Bonus")]
         [Order(9)]
-        SmallBonus,
+        SmallBonus = 254,
 
         /// <summary>
         /// Indicate a large bonus.
         /// </summary>
         [Description("L Bonus")]
         [Order(8)]
-        LargeBonus,
+        LargeBonus = 320,
 
         [Order(13)]
-        IgnoreMiss,
+        IgnoreMiss = 384,
 
         [Order(12)]
         IgnoreHit,

From 07226c79b64918aeefcdb53df6dd339359700312 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 16:32:50 +0900
Subject: [PATCH 05002/10326] Add xmldocs

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 6abf91e9d3..fc33ff9df2 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -87,15 +87,21 @@ namespace osu.Game.Rulesets.Scoring
         SmallBonus = 254,
 
         /// <summary>
-        /// Indicate a large bonus.
+        /// Indicates a large bonus.
         /// </summary>
         [Description("L Bonus")]
         [Order(8)]
         LargeBonus = 320,
 
+        /// <summary>
+        /// Indicates a miss that should be ignored for scoring purposes.
+        /// </summary>
         [Order(13)]
         IgnoreMiss = 384,
 
+        /// <summary>
+        /// Indicates a hit that should be ignored for scoring purposes.
+        /// </summary>
         [Order(12)]
         IgnoreHit,
     }

From 519f376e7b5377b8965e05aa34815cee399428c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 14:26:12 +0900
Subject: [PATCH 05003/10326] Standardise Judgement across all rulesets

---
 osu.Game/Rulesets/Judgements/Judgement.cs | 122 +++++++++++++++++++---
 1 file changed, 108 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 9105b920ca..ea7a8d8d25 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.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.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 
@@ -11,31 +12,69 @@ namespace osu.Game.Rulesets.Judgements
     /// </summary>
     public class Judgement
     {
+        /// <summary>
+        /// The score awarded for a small bonus.
+        /// </summary>
+        public const double SMALL_BONUS_SCORE = 10;
+
+        /// <summary>
+        /// The score awarded for a large bonus.
+        /// </summary>
+        public const double LARGE_BONUS_SCORE = 50;
+
         /// <summary>
         /// The default health increase for a maximum judgement, as a proportion of total health.
         /// By default, each maximum judgement restores 5% of total health.
         /// </summary>
         protected const double DEFAULT_MAX_HEALTH_INCREASE = 0.05;
 
+        /// <summary>
+        /// Whether this <see cref="Judgement"/> should affect the current combo.
+        /// </summary>
+        [Obsolete("Has no effect. Use HitResult members instead (e.g. use small-tick or bonus to not affect combo).")] // Can be removed 20210328
+        public virtual bool AffectsCombo => true;
+
+        /// <summary>
+        /// Whether this <see cref="Judgement"/> should be counted as base (combo) or bonus score.
+        /// </summary>
+        [Obsolete("Has no effect. Use HitResult members instead (e.g. use small-tick or bonus to not affect combo).")] // Can be removed 20210328
+        public virtual bool IsBonus => !AffectsCombo;
+
         /// <summary>
         /// The maximum <see cref="HitResult"/> that can be achieved.
         /// </summary>
         public virtual HitResult MaxResult => HitResult.Perfect;
 
         /// <summary>
-        /// Whether this <see cref="Judgement"/> should affect the current combo.
+        /// The minimum <see cref="HitResult"/> that can be achieved - the inverse of <see cref="MaxResult"/>.
         /// </summary>
-        public virtual bool AffectsCombo => true;
+        public HitResult MinResult
+        {
+            get
+            {
+                switch (MaxResult)
+                {
+                    case HitResult.SmallBonus:
+                    case HitResult.LargeBonus:
+                    case HitResult.IgnoreHit:
+                        return HitResult.IgnoreMiss;
 
-        /// <summary>
-        /// Whether this <see cref="Judgement"/> should be counted as base (combo) or bonus score.
-        /// </summary>
-        public virtual bool IsBonus => !AffectsCombo;
+                    case HitResult.SmallTickHit:
+                        return HitResult.SmallTickMiss;
+
+                    case HitResult.LargeTickHit:
+                        return HitResult.LargeTickMiss;
+
+                    default:
+                        return HitResult.Miss;
+                }
+            }
+        }
 
         /// <summary>
         /// The numeric score representation for the maximum achievable result.
         /// </summary>
-        public int MaxNumericResult => NumericResultFor(MaxResult);
+        public double MaxNumericResult => ToNumericResult(MaxResult);
 
         /// <summary>
         /// The health increase for the maximum achievable result.
@@ -43,18 +82,19 @@ namespace osu.Game.Rulesets.Judgements
         public double MaxHealthIncrease => HealthIncreaseFor(MaxResult);
 
         /// <summary>
-        /// Retrieves the numeric score representation of a <see cref="HitResult"/>.
+        /// Retrieves the numeric score representation of a <see cref="JudgementResult"/>.
         /// </summary>
-        /// <param name="result">The <see cref="HitResult"/> to find the numeric score representation for.</param>
+        /// <param name="result">The <see cref="JudgementResult"/> to find the numeric score representation for.</param>
         /// <returns>The numeric score representation of <paramref name="result"/>.</returns>
-        protected virtual int NumericResultFor(HitResult result) => result > HitResult.Miss ? 1 : 0;
+        [Obsolete("Has no effect. Use ToNumericResult(HitResult) (standardised across all rulesets).")] // Can be removed 20210328
+        protected virtual int NumericResultFor(HitResult result) => result == HitResult.Miss ? 0 : 1;
 
         /// <summary>
         /// Retrieves the numeric score representation of a <see cref="JudgementResult"/>.
         /// </summary>
         /// <param name="result">The <see cref="JudgementResult"/> to find the numeric score representation for.</param>
         /// <returns>The numeric score representation of <paramref name="result"/>.</returns>
-        public int NumericResultFor(JudgementResult result) => NumericResultFor(result.Type);
+        public double NumericResultFor(JudgementResult result) => ToNumericResult(result.Type);
 
         /// <summary>
         /// Retrieves the numeric health increase of a <see cref="HitResult"/>.
@@ -65,6 +105,21 @@ namespace osu.Game.Rulesets.Judgements
         {
             switch (result)
             {
+                default:
+                    return 0;
+
+                case HitResult.SmallTickHit:
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.05;
+
+                case HitResult.SmallTickMiss:
+                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.05;
+
+                case HitResult.LargeTickHit:
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.1;
+
+                case HitResult.LargeTickMiss:
+                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.1;
+
                 case HitResult.Miss:
                     return -DEFAULT_MAX_HEALTH_INCREASE;
 
@@ -83,8 +138,11 @@ namespace osu.Game.Rulesets.Judgements
                 case HitResult.Perfect:
                     return DEFAULT_MAX_HEALTH_INCREASE * 1.05;
 
-                default:
-                    return 0;
+                case HitResult.SmallBonus:
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.1;
+
+                case HitResult.LargeBonus:
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.2;
             }
         }
 
@@ -95,6 +153,42 @@ namespace osu.Game.Rulesets.Judgements
         /// <returns>The numeric health increase of <paramref name="result"/>.</returns>
         public double HealthIncreaseFor(JudgementResult result) => HealthIncreaseFor(result.Type);
 
-        public override string ToString() => $"AffectsCombo:{AffectsCombo} MaxResult:{MaxResult} MaxScore:{MaxNumericResult}";
+        public override string ToString() => $"MaxResult:{MaxResult} MaxScore:{MaxNumericResult}";
+
+        public static double ToNumericResult(HitResult result)
+        {
+            switch (result)
+            {
+                default:
+                    return 0;
+
+                case HitResult.SmallTickHit:
+                    return 1 / 30d;
+
+                case HitResult.LargeTickHit:
+                    return 1 / 10d;
+
+                case HitResult.Meh:
+                    return 1 / 6d;
+
+                case HitResult.Ok:
+                    return 1 / 3d;
+
+                case HitResult.Good:
+                    return 2 / 3d;
+
+                case HitResult.Great:
+                    return 1d;
+
+                case HitResult.Perfect:
+                    return 7 / 6d;
+
+                case HitResult.SmallBonus:
+                    return SMALL_BONUS_SCORE;
+
+                case HitResult.LargeBonus:
+                    return LARGE_BONUS_SCORE;
+            }
+        }
     }
 }

From 4ca9a69de25dcf23cdfab050ed2632057ce50e19 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 14:26:36 +0900
Subject: [PATCH 05004/10326] Use new hit results in catch

---
 .../Judgements/CatchBananaJudgement.cs        | 26 +------------------
 .../Judgements/CatchDropletJudgement.cs       | 12 +--------
 .../Judgements/CatchJudgement.cs              | 14 +---------
 .../Judgements/CatchTinyDropletJudgement.cs   | 26 +------------------
 .../Drawables/DrawableCatchHitObject.cs       |  3 +--
 .../UI/CatchComboDisplay.cs                   |  4 +--
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     |  3 ++-
 7 files changed, 9 insertions(+), 79 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs
index a7449ba4e1..b919102215 100644
--- a/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs
+++ b/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs
@@ -8,31 +8,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
 {
     public class CatchBananaJudgement : CatchJudgement
     {
-        public override bool AffectsCombo => false;
-
-        protected override int NumericResultFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.Perfect:
-                    return 1100;
-            }
-        }
-
-        protected override double HealthIncreaseFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.Perfect:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 0.75;
-            }
-        }
+        public override HitResult MaxResult => HitResult.LargeBonus;
 
         public override bool ShouldExplodeFor(JudgementResult result) => true;
     }
diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
index e87ecba749..8fd7b93e4c 100644
--- a/osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
+++ b/osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
@@ -7,16 +7,6 @@ namespace osu.Game.Rulesets.Catch.Judgements
 {
     public class CatchDropletJudgement : CatchJudgement
     {
-        protected override int NumericResultFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.Perfect:
-                    return 30;
-            }
-        }
+        public override HitResult MaxResult => HitResult.LargeTickHit;
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
index 2149ed9712..ccafe0abc4 100644
--- a/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
+++ b/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
@@ -9,19 +9,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
 {
     public class CatchJudgement : Judgement
     {
-        public override HitResult MaxResult => HitResult.Perfect;
-
-        protected override int NumericResultFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.Perfect:
-                    return 300;
-            }
-        }
+        public override HitResult MaxResult => HitResult.Great;
 
         /// <summary>
         /// Whether fruit on the platter should explode or drop.
diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchTinyDropletJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchTinyDropletJudgement.cs
index d607b49ea4..d957d4171b 100644
--- a/osu.Game.Rulesets.Catch/Judgements/CatchTinyDropletJudgement.cs
+++ b/osu.Game.Rulesets.Catch/Judgements/CatchTinyDropletJudgement.cs
@@ -7,30 +7,6 @@ namespace osu.Game.Rulesets.Catch.Judgements
 {
     public class CatchTinyDropletJudgement : CatchJudgement
     {
-        public override bool AffectsCombo => false;
-
-        protected override int NumericResultFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.Perfect:
-                    return 10;
-            }
-        }
-
-        protected override double HealthIncreaseFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.Perfect:
-                    return 0.02;
-            }
-        }
+        public override HitResult MaxResult => HitResult.SmallTickHit;
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 2fe017dc62..d03a764bda 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -8,7 +8,6 @@ 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 osu.Game.Rulesets.Catch.UI;
 using osuTK;
 using osuTK.Graphics;
@@ -86,7 +85,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             if (CheckPosition == null) return;
 
             if (timeOffset >= 0 && Result != null)
-                ApplyResult(r => r.Type = CheckPosition.Invoke(HitObject) ? HitResult.Perfect : HitResult.Miss);
+                ApplyResult(r => r.Type = CheckPosition.Invoke(HitObject) ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
         protected override void UpdateStateTransforms(ArmedState state)
diff --git a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
index 58a3140bb5..cc01009dd9 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void OnNewResult(DrawableCatchHitObject judgedObject, JudgementResult result)
         {
-            if (!result.Judgement.AffectsCombo || !result.HasResult)
+            if (!result.Type.AffectsCombo() || !result.HasResult)
                 return;
 
             if (result.Type == HitResult.Miss)
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void OnRevertResult(DrawableCatchHitObject judgedObject, JudgementResult result)
         {
-            if (!result.Judgement.AffectsCombo || !result.HasResult)
+            if (!result.Type.AffectsCombo() || !result.HasResult)
                 return;
 
             updateCombo(result.ComboAtJudgement, judgedObject.AccentColour.Value);
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index d3e63b0333..5e794a76aa 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osuTK;
 
@@ -52,7 +53,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void OnNewResult(DrawableCatchHitObject fruit, JudgementResult result)
         {
-            if (result.Judgement is IgnoreJudgement)
+            if (!result.Type.IsScorable())
                 return;
 
             void runAfterLoaded(Action action)

From b1877b649ba53a00dc7c083c6d5799f6652e5d68 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 14:29:43 +0900
Subject: [PATCH 05005/10326] Use new hit results in mania

---
 .../Judgements/HoldNoteTickJudgement.cs       | 14 +----------
 .../Judgements/ManiaJudgement.cs              | 24 -------------------
 .../Objects/Drawables/DrawableHoldNote.cs     |  2 +-
 .../Objects/Drawables/DrawableHoldNoteTick.cs |  5 ++--
 .../Skinning/ManiaLegacySkinTransformer.cs    |  3 +++
 5 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
index 28e5d2cc1b..ee6cbbc828 100644
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
@@ -7,18 +7,6 @@ namespace osu.Game.Rulesets.Mania.Judgements
 {
     public class HoldNoteTickJudgement : ManiaJudgement
     {
-        protected override int NumericResultFor(HitResult result) => result == MaxResult ? 20 : 0;
-
-        protected override double HealthIncreaseFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.Perfect:
-                    return 0.01;
-            }
-        }
+        public override HitResult MaxResult => HitResult.LargeTickHit;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
index 53967ffa05..220dedc4a4 100644
--- a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
@@ -2,34 +2,10 @@
 // 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.Mania.Judgements
 {
     public class ManiaJudgement : Judgement
     {
-        protected override int NumericResultFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.Meh:
-                    return 50;
-
-                case HitResult.Ok:
-                    return 100;
-
-                case HitResult.Good:
-                    return 200;
-
-                case HitResult.Great:
-                    return 300;
-
-                case HitResult.Perfect:
-                    return 350;
-            }
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 2ebcc5451a..ba6cad978d 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             if (Tail.AllJudged)
             {
-                ApplyResult(r => r.Type = HitResult.Perfect);
+                ApplyResult(r => r.Type = r.Judgement.MaxResult);
                 endHold();
             }
 
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
index 9b0322a6cd..98931dceed 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -73,9 +72,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             var startTime = HoldStartTime?.Invoke();
 
             if (startTime == null || startTime > HitObject.StartTime)
-                ApplyResult(r => r.Type = HitResult.Miss);
+                ApplyResult(r => r.Type = r.Judgement.MinResult);
             else
-                ApplyResult(r => r.Type = HitResult.Perfect);
+                ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
index 439e6f7df2..3724269f4d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
@@ -130,6 +130,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         private Drawable getResult(HitResult result)
         {
+            if (!hitresult_mapping.ContainsKey(result))
+                return null;
+
             string filename = this.GetManiaSkinConfig<string>(hitresult_mapping[result])?.Value
                               ?? default_hitresult_skin_filenames[result];
 

From a77741927cf3e0b84e72cfde6210769047dd8d58 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 14:35:43 +0900
Subject: [PATCH 05006/10326] Use new hit results in osu

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs   | 2 +-
 osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs    | 6 +-----
 .../Objects/Drawables/DrawableSliderRepeat.cs             | 3 +--
 .../Objects/Drawables/DrawableSliderTail.cs               | 3 +--
 .../Objects/Drawables/DrawableSliderTick.cs               | 3 +--
 .../Objects/Drawables/DrawableSpinnerTick.cs              | 4 +---
 .../Objects/Drawables/Pieces/SpinnerBonusDisplay.cs       | 3 ++-
 osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs             | 2 +-
 osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs         | 4 +---
 osu.Game.Rulesets.Osu/Objects/SliderTick.cs               | 2 +-
 osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs         | 6 +-----
 osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs              | 8 +-------
 12 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index f7909071ea..dbab048b25 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -146,7 +146,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
                 var totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value * 2;
-                return totalScore == (int)(drawableSpinner.RotationTracker.RateAdjustedRotation / 360) * SpinnerTick.SCORE_PER_TICK;
+                return totalScore == (int)(drawableSpinner.RotationTracker.RateAdjustedRotation / 360) * new SpinnerTick().CreateJudgement().MaxNumericResult;
             });
 
             addSeekStep(0);
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs
index e528f65dca..1999785efe 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs
@@ -7,10 +7,6 @@ namespace osu.Game.Rulesets.Osu.Judgements
 {
     public class OsuIgnoreJudgement : OsuJudgement
     {
-        public override bool AffectsCombo => false;
-
-        protected override int NumericResultFor(HitResult result) => 0;
-
-        protected override double HealthIncreaseFor(HitResult result) => 0;
+        public override HitResult MaxResult => HitResult.IgnoreHit;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index d79ecb7b4e..f65077685f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
-using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
@@ -50,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (sliderRepeat.StartTime <= Time.Current)
-                ApplyResult(r => r.Type = drawableSlider.Tracking.Value ? HitResult.Great : HitResult.Miss);
+                ApplyResult(r => r.Type = drawableSlider.Tracking.Value ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 29a4929c1b..0939e2847a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
@@ -46,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (!userTriggered && timeOffset >= 0)
-                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : HitResult.Miss);
+                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
         private void updatePosition() => Position = HitObject.Position - slider.Position;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 66eb60aa28..9b68b446a4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -10,7 +10,6 @@ using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Skinning;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -64,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (timeOffset >= 0)
-                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : HitResult.Miss);
+                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index c390b673be..e9cede1398 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.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.Osu.Objects.Drawables
 {
     public class DrawableSpinnerTick : DrawableOsuHitObject
@@ -18,6 +16,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// Apply a judgement result.
         /// </summary>
         /// <param name="hit">Whether this tick was reached.</param>
-        internal void TriggerResult(bool hit) => ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : HitResult.Miss);
+        internal void TriggerResult(bool hit) => ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
index b499d7a92b..1668cd73bd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
@@ -5,6 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Judgements;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
@@ -36,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 return;
 
             displayedCount = count;
-            bonusCounter.Text = $"{SpinnerBonusTick.SCORE_PER_TICK * count}";
+            bonusCounter.Text = $"{Judgement.LARGE_BONUS_SCORE * count}";
             bonusCounter.FadeOutFromOne(1500);
             bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
index ac6c6905e4..b6c58a75d1 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public class SliderRepeatJudgement : OsuJudgement
         {
-            protected override int NumericResultFor(HitResult result) => result == MaxResult ? 30 : 0;
+            public override HitResult MaxResult => HitResult.LargeTickHit;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index 1e54b576f1..aff3f38e17 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -29,9 +29,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public class SliderTailJudgement : OsuJudgement
         {
-            protected override int NumericResultFor(HitResult result) => 0;
-
-            public override bool AffectsCombo => false;
+            public override HitResult MaxResult => HitResult.IgnoreHit;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
index 22f3f559db..a427ee1955 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public class SliderTickJudgement : OsuJudgement
         {
-            protected override int NumericResultFor(HitResult result) => result == MaxResult ? 10 : 0;
+            public override HitResult MaxResult => HitResult.LargeTickHit;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
index 0b1232b8db..235dc8710a 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
@@ -9,8 +9,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SpinnerBonusTick : SpinnerTick
     {
-        public new const int SCORE_PER_TICK = 50;
-
         public SpinnerBonusTick()
         {
             Samples.Add(new HitSampleInfo { Name = "spinnerbonus" });
@@ -20,9 +18,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public class OsuSpinnerBonusTickJudgement : OsuSpinnerTickJudgement
         {
-            protected override int NumericResultFor(HitResult result) => result == MaxResult ? SCORE_PER_TICK : 0;
-
-            protected override double HealthIncreaseFor(HitResult result) => base.HealthIncreaseFor(result) * 2;
+            public override HitResult MaxResult => HitResult.LargeBonus;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
index f54e7a9a15..d715b9a428 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
@@ -9,19 +9,13 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SpinnerTick : OsuHitObject
     {
-        public const int SCORE_PER_TICK = 10;
-
         public override Judgement CreateJudgement() => new OsuSpinnerTickJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
         public class OsuSpinnerTickJudgement : OsuJudgement
         {
-            public override bool AffectsCombo => false;
-
-            protected override int NumericResultFor(HitResult result) => result == MaxResult ? SCORE_PER_TICK : 0;
-
-            protected override double HealthIncreaseFor(HitResult result) => result == MaxResult ? 0.6 * base.HealthIncreaseFor(result) : 0;
+            public override HitResult MaxResult => HitResult.SmallBonus;
         }
     }
 }

From c45b5690cfcc0469d01e27689f73e8c262a4a449 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 15:13:11 +0900
Subject: [PATCH 05007/10326] Use new hit results in taiko

---
 .../Judgements/TaikoDrumRollTickJudgement.cs      | 14 +-------------
 .../Judgements/TaikoJudgement.cs                  | 15 ---------------
 .../Judgements/TaikoStrongJudgement.cs            |  4 ++--
 .../Objects/Drawables/DrawableDrumRoll.cs         |  4 ++--
 .../Objects/Drawables/DrawableDrumRollTick.cs     |  7 +++----
 .../Objects/Drawables/DrawableHit.cs              |  6 +++---
 .../Objects/Drawables/DrawableSwell.cs            |  6 +++---
 .../Objects/Drawables/DrawableSwellTick.cs        |  5 ++---
 .../Skinning/LegacyTaikoScroller.cs               |  2 +-
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs |  5 +++--
 10 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
index a617028f1c..0551df3211 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
@@ -7,19 +7,7 @@ namespace osu.Game.Rulesets.Taiko.Judgements
 {
     public class TaikoDrumRollTickJudgement : TaikoJudgement
     {
-        public override bool AffectsCombo => false;
-
-        protected override int NumericResultFor(HitResult result)
-        {
-            switch (result)
-            {
-                case HitResult.Great:
-                    return 200;
-
-                default:
-                    return 0;
-            }
-        }
+        public override HitResult MaxResult => HitResult.SmallTickHit;
 
         protected override double HealthIncreaseFor(HitResult result)
         {
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs
index eb5f443365..3d22860814 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs
@@ -10,21 +10,6 @@ namespace osu.Game.Rulesets.Taiko.Judgements
     {
         public override HitResult MaxResult => HitResult.Great;
 
-        protected override int NumericResultFor(HitResult result)
-        {
-            switch (result)
-            {
-                case HitResult.Good:
-                    return 100;
-
-                case HitResult.Great:
-                    return 300;
-
-                default:
-                    return 0;
-            }
-        }
-
         protected override double HealthIncreaseFor(HitResult result)
         {
             switch (result)
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongJudgement.cs
index e045ea324f..06495ad9f4 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongJudgement.cs
@@ -7,9 +7,9 @@ namespace osu.Game.Rulesets.Taiko.Judgements
 {
     public class TaikoStrongJudgement : TaikoJudgement
     {
+        public override HitResult MaxResult => HitResult.SmallBonus;
+
         // MainObject already changes the HP
         protected override double HealthIncreaseFor(HitResult result) => 0;
-
-        public override bool AffectsCombo => false;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 2c1c2d2bc1..286feac5ba 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             if (countHit >= HitObject.RequiredGoodHits)
             {
-                ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Good);
+                ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Ok);
             }
             else
                 ApplyResult(r => r.Type = HitResult.Miss);
@@ -174,7 +174,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 if (!MainObject.Judged)
                     return;
 
-                ApplyResult(r => r.Type = MainObject.IsHit ? HitResult.Great : HitResult.Miss);
+                ApplyResult(r => r.Type = MainObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
             }
 
             public override bool OnPressed(TaikoAction action) => false;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index 62405cf047..9d7dcc7218 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -4,7 +4,6 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 
@@ -34,14 +33,14 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             if (!userTriggered)
             {
                 if (timeOffset > HitObject.HitWindow)
-                    ApplyResult(r => r.Type = HitResult.Miss);
+                    ApplyResult(r => r.Type = r.Judgement.MinResult);
                 return;
             }
 
             if (Math.Abs(timeOffset) > HitObject.HitWindow)
                 return;
 
-            ApplyResult(r => r.Type = HitResult.Great);
+            ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
 
         protected override void UpdateStateTransforms(ArmedState state)
@@ -74,7 +73,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 if (!MainObject.Judged)
                     return;
 
-                ApplyResult(r => r.Type = MainObject.IsHit ? HitResult.Great : HitResult.Miss);
+                ApplyResult(r => r.Type = MainObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
             }
 
             public override bool OnPressed(TaikoAction action) => false;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 3a6eaa83db..03df28f850 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -257,19 +257,19 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
                 if (!MainObject.Result.IsHit)
                 {
-                    ApplyResult(r => r.Type = HitResult.Miss);
+                    ApplyResult(r => r.Type = r.Judgement.MinResult);
                     return;
                 }
 
                 if (!userTriggered)
                 {
                     if (timeOffset - MainObject.Result.TimeOffset > second_hit_window)
-                        ApplyResult(r => r.Type = HitResult.Miss);
+                        ApplyResult(r => r.Type = r.Judgement.MinResult);
                     return;
                 }
 
                 if (Math.Abs(timeOffset - MainObject.Result.TimeOffset) <= second_hit_window)
-                    ApplyResult(r => r.Type = MainObject.Result.Type);
+                    ApplyResult(r => r.Type = r.Judgement.MaxResult);
             }
 
             public override bool OnPressed(TaikoAction action)
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 7294587b10..11ff0729e2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     }
                 }
 
-                nextTick?.TriggerResult(HitResult.Great);
+                nextTick?.TriggerResult(true);
 
                 var numHits = ticks.Count(r => r.IsHit);
 
@@ -208,10 +208,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                         continue;
                     }
 
-                    tick.TriggerResult(HitResult.Miss);
+                    tick.TriggerResult(false);
                 }
 
-                var hitResult = numHits > HitObject.RequiredHits / 2 ? HitResult.Good : HitResult.Miss;
+                var hitResult = numHits > HitObject.RequiredHits / 2 ? HitResult.Ok : HitResult.Miss;
 
                 ApplyResult(r => r.Type = hitResult);
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
index 1685576f0d..6202583494 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 
@@ -19,10 +18,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override void UpdateInitialTransforms() => this.FadeOut();
 
-        public void TriggerResult(HitResult type)
+        public void TriggerResult(bool hit)
         {
             HitObject.StartTime = Time.Current;
-            ApplyResult(r => r.Type = type);
+            ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 03813e0a99..928072c491 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 var r = result.NewValue;
 
                 // always ignore hitobjects that don't affect combo (drumroll ticks etc.)
-                if (r?.Judgement.AffectsCombo == false)
+                if (r?.Type.AffectsCombo() == false)
                     return;
 
                 passing = r == null || r.Type > HitResult.Miss;
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
index b937beae3c..6a16f311bf 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Screens.Play;
 
@@ -77,7 +78,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                 lastObjectHit = true;
             }
 
-            if (!result.Judgement.AffectsCombo)
+            if (!result.Type.AffectsCombo())
                 return;
 
             lastObjectHit = result.IsHit;
@@ -115,7 +116,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         }
 
         private bool triggerComboClear(JudgementResult judgementResult)
-            => (judgementResult.ComboAtJudgement + 1) % 50 == 0 && judgementResult.Judgement.AffectsCombo && judgementResult.IsHit;
+            => (judgementResult.ComboAtJudgement + 1) % 50 == 0 && judgementResult.Type.AffectsCombo() && judgementResult.IsHit;
 
         private bool triggerSwellClear(JudgementResult judgementResult)
             => judgementResult.Judgement is TaikoSwellJudgement && judgementResult.IsHit;

From 6264a01eccff56acb06f74b04d2a40534bf263d8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 15:14:03 +0900
Subject: [PATCH 05008/10326] Add guard against using the wrong hit result

---
 .../Objects/Drawables/DrawableHitObject.cs    | 15 ++++++++++++++
 osu.Game/Rulesets/Scoring/HitResult.cs        | 20 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 7c05bc9aa7..2a3e3716e5 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -475,6 +475,21 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (!Result.HasResult)
                 throw new InvalidOperationException($"{GetType().ReadableName()} applied a {nameof(JudgementResult)} but did not update {nameof(JudgementResult.Type)}.");
 
+            // Some (especially older) rulesets use scorable judgements instead of the newer ignorehit/ignoremiss judgements.
+            if (Result.Judgement.MaxResult == HitResult.IgnoreHit)
+            {
+                if (Result.Type == HitResult.Miss)
+                    Result.Type = HitResult.IgnoreMiss;
+                else if (Result.Type >= HitResult.Meh && Result.Type <= HitResult.Perfect)
+                    Result.Type = HitResult.IgnoreHit;
+            }
+
+            if (!Result.Type.IsValidHitResult(Result.Judgement.MinResult, Result.Judgement.MaxResult))
+            {
+                throw new InvalidOperationException(
+                    $"{GetType().ReadableName()} applied an invalid hit result (was: {Result.Type}, expected: [{Result.Judgement.MinResult} ... {Result.Judgement.MaxResult}]).");
+            }
+
             // Ensure that the judgement is given a valid time offset, because this may not get set by the caller
             var endTime = HitObject.GetEndTime();
 
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index fc33ff9df2..7a02db190a 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.ComponentModel;
+using System.Diagnostics;
 using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Scoring
@@ -175,5 +176,24 @@ namespace osu.Game.Rulesets.Scoring
         /// Whether a <see cref="HitResult"/> is scorable.
         /// </summary>
         public static bool IsScorable(this HitResult result) => result >= HitResult.Miss && result < HitResult.IgnoreMiss;
+
+        /// <summary>
+        /// Whether a <see cref="HitResult"/> is valid within a given <see cref="HitResult"/> range.
+        /// </summary>
+        /// <param name="result">The <see cref="HitResult"/> to check.</param>
+        /// <param name="minResult">The minimum <see cref="HitResult"/>.</param>
+        /// <param name="maxResult">The maximum <see cref="HitResult"/>.</param>
+        /// <returns>Whether <see cref="HitResult"/> falls between <paramref name="minResult"/> and <paramref name="maxResult"/>.</returns>
+        public static bool IsValidHitResult(this HitResult result, HitResult minResult, HitResult maxResult)
+        {
+            if (result == HitResult.None)
+                return false;
+
+            if (result == minResult || result == maxResult)
+                return true;
+
+            Debug.Assert(minResult <= maxResult);
+            return result > minResult && result < maxResult;
+        }
     }
 }

From a1394c183056c52a4d1648d6120a2a65e85fa21b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 15:20:47 +0900
Subject: [PATCH 05009/10326] Fix a few missed judgements

---
 .../Judgements/OsuJudgement.cs                 | 18 ------------------
 .../Rulesets/Judgements/IgnoreJudgement.cs     |  6 +-----
 .../Rulesets/Judgements/JudgementResult.cs     |  2 +-
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs
index bf30fbc351..1a88e2a8b2 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs
@@ -9,23 +9,5 @@ namespace osu.Game.Rulesets.Osu.Judgements
     public class OsuJudgement : Judgement
     {
         public override HitResult MaxResult => HitResult.Great;
-
-        protected override int NumericResultFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.Meh:
-                    return 50;
-
-                case HitResult.Good:
-                    return 100;
-
-                case HitResult.Great:
-                    return 300;
-            }
-        }
     }
 }
diff --git a/osu.Game/Rulesets/Judgements/IgnoreJudgement.cs b/osu.Game/Rulesets/Judgements/IgnoreJudgement.cs
index 1871249c94..d2a434058d 100644
--- a/osu.Game/Rulesets/Judgements/IgnoreJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/IgnoreJudgement.cs
@@ -7,10 +7,6 @@ namespace osu.Game.Rulesets.Judgements
 {
     public class IgnoreJudgement : Judgement
     {
-        public override bool AffectsCombo => false;
-
-        protected override int NumericResultFor(HitResult result) => 0;
-
-        protected override double HealthIncreaseFor(HitResult result) => 0;
+        public override HitResult MaxResult => HitResult.IgnoreHit;
     }
 }
diff --git a/osu.Game/Rulesets/Judgements/JudgementResult.cs b/osu.Game/Rulesets/Judgements/JudgementResult.cs
index 59a7917e55..3a35fd4433 100644
--- a/osu.Game/Rulesets/Judgements/JudgementResult.cs
+++ b/osu.Game/Rulesets/Judgements/JudgementResult.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Judgements
         /// <summary>
         /// Whether a successful hit occurred.
         /// </summary>
-        public bool IsHit => Type > HitResult.Miss;
+        public bool IsHit => Type.IsHit();
 
         /// <summary>
         /// Creates a new <see cref="JudgementResult"/>.

From 31fae045fa26854c3d4af4c988b03ea792aa9137 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 15:25:31 +0900
Subject: [PATCH 05010/10326] Update judgement processors with new hit results

---
 .../Scoring/CatchScoreProcessor.cs            |  1 -
 .../Scoring/ManiaScoreProcessor.cs            |  2 -
 .../Scoring/OsuScoreProcessor.cs              |  2 -
 .../Scoring/TaikoScoreProcessor.cs            |  2 -
 .../TestSceneDrainingHealthProcessor.cs       | 16 ++---
 .../Gameplay/TestSceneScoreProcessor.cs       | 32 +++-------
 .../Scoring/DrainingHealthProcessor.cs        |  2 +-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 61 ++++++++-----------
 osu.Game/Scoring/ScoreManager.cs              |  2 +-
 9 files changed, 47 insertions(+), 73 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index 4c7bc4ab73..2cc05826b4 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -7,6 +7,5 @@ namespace osu.Game.Rulesets.Catch.Scoring
 {
     public class CatchScoreProcessor : ScoreProcessor
     {
-        public override HitWindows CreateHitWindows() => new CatchHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 4b2f643333..71cc0bdf1f 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -10,7 +10,5 @@ namespace osu.Game.Rulesets.Mania.Scoring
         protected override double DefaultAccuracyPortion => 0.95;
 
         protected override double DefaultComboPortion => 0.05;
-
-        public override HitWindows CreateHitWindows() => new ManiaHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 86ec76e373..44118227d9 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -25,7 +25,5 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     return new OsuJudgementResult(hitObject, judgement);
             }
         }
-
-        public override HitWindows CreateHitWindows() => new OsuHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index e29ea87d25..1829ea2513 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -10,7 +10,5 @@ namespace osu.Game.Rulesets.Taiko.Scoring
         protected override double DefaultAccuracyPortion => 0.75;
 
         protected override double DefaultComboPortion => 0.25;
-
-        public override HitWindows CreateHitWindows() => new TaikoHitWindows();
     }
 }
diff --git a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
index 460ad1b898..0bb2c4b60c 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
@@ -167,7 +167,7 @@ namespace osu.Game.Tests.Gameplay
 
             beatmap.HitObjects.Add(new JudgeableHitObject { StartTime = 0 });
             for (double time = 0; time < 5000; time += 100)
-                beatmap.HitObjects.Add(new JudgeableHitObject(false) { StartTime = time });
+                beatmap.HitObjects.Add(new JudgeableHitObject(HitResult.LargeBonus) { StartTime = time });
             beatmap.HitObjects.Add(new JudgeableHitObject { StartTime = 5000 });
 
             createProcessor(beatmap);
@@ -215,23 +215,23 @@ namespace osu.Game.Tests.Gameplay
 
         private class JudgeableHitObject : HitObject
         {
-            private readonly bool affectsCombo;
+            private readonly HitResult maxResult;
 
-            public JudgeableHitObject(bool affectsCombo = true)
+            public JudgeableHitObject(HitResult maxResult = HitResult.Perfect)
             {
-                this.affectsCombo = affectsCombo;
+                this.maxResult = maxResult;
             }
 
-            public override Judgement CreateJudgement() => new TestJudgement(affectsCombo);
+            public override Judgement CreateJudgement() => new TestJudgement(maxResult);
             protected override HitWindows CreateHitWindows() => new HitWindows();
 
             private class TestJudgement : Judgement
             {
-                public override bool AffectsCombo { get; }
+                public override HitResult MaxResult { get; }
 
-                public TestJudgement(bool affectsCombo)
+                public TestJudgement(HitResult maxResult)
                 {
-                    AffectsCombo = affectsCombo;
+                    MaxResult = maxResult;
                 }
             }
         }
diff --git a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
index c9ab4fa489..432e3df95e 100644
--- a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
@@ -17,13 +17,13 @@ namespace osu.Game.Tests.Gameplay
         [Test]
         public void TestNoScoreIncreaseFromMiss()
         {
-            var beatmap = new Beatmap<TestHitObject> { HitObjects = { new TestHitObject() } };
+            var beatmap = new Beatmap<HitObject> { HitObjects = { new HitObject() } };
 
             var scoreProcessor = new ScoreProcessor();
             scoreProcessor.ApplyBeatmap(beatmap);
 
             // Apply a miss judgement
-            scoreProcessor.ApplyResult(new JudgementResult(new TestHitObject(), new TestJudgement()) { Type = HitResult.Miss });
+            scoreProcessor.ApplyResult(new JudgementResult(new HitObject(), new TestJudgement()) { Type = HitResult.Miss });
 
             Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(0.0));
         }
@@ -31,37 +31,25 @@ namespace osu.Game.Tests.Gameplay
         [Test]
         public void TestOnlyBonusScore()
         {
-            var beatmap = new Beatmap<TestBonusHitObject> { HitObjects = { new TestBonusHitObject() } };
+            var beatmap = new Beatmap<HitObject> { HitObjects = { new HitObject() } };
 
             var scoreProcessor = new ScoreProcessor();
             scoreProcessor.ApplyBeatmap(beatmap);
 
             // Apply a judgement
-            scoreProcessor.ApplyResult(new JudgementResult(new TestBonusHitObject(), new TestBonusJudgement()) { Type = HitResult.Perfect });
+            scoreProcessor.ApplyResult(new JudgementResult(new HitObject(), new TestJudgement(HitResult.LargeBonus)) { Type = HitResult.LargeBonus });
 
-            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(100));
-        }
-
-        private class TestHitObject : HitObject
-        {
-            public override Judgement CreateJudgement() => new TestJudgement();
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(Judgement.LARGE_BONUS_SCORE));
         }
 
         private class TestJudgement : Judgement
         {
-            protected override int NumericResultFor(HitResult result) => 100;
-        }
+            public override HitResult MaxResult { get; }
 
-        private class TestBonusHitObject : HitObject
-        {
-            public override Judgement CreateJudgement() => new TestBonusJudgement();
-        }
-
-        private class TestBonusJudgement : Judgement
-        {
-            public override bool AffectsCombo => false;
-
-            protected override int NumericResultFor(HitResult result) => 100;
+            public TestJudgement(HitResult maxResult = HitResult.Perfect)
+            {
+                MaxResult = maxResult;
+            }
         }
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index 130907b242..91793e3f70 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.Scoring
         {
             base.ApplyResultInternal(result);
 
-            if (!result.Judgement.IsBonus)
+            if (!result.Type.IsBonus())
                 healthIncreases.Add((result.HitObject.GetEndTime() + result.TimeOffset, GetHealthIncreaseFor(result)));
         }
 
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 6fa5a87c8e..7a5b707357 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -71,7 +71,6 @@ namespace osu.Game.Rulesets.Scoring
         private double maxBaseScore;
         private double rollingMaxBaseScore;
         private double baseScore;
-        private double bonusScore;
 
         private readonly List<HitEvent> hitEvents = new List<HitEvent>();
         private HitObject lastHitObject;
@@ -116,14 +115,15 @@ namespace osu.Game.Rulesets.Scoring
             if (result.FailedAtJudgement)
                 return;
 
-            if (result.Judgement.AffectsCombo)
+            if (!result.Type.IsScorable())
+                return;
+
+            if (result.Type.AffectsCombo())
             {
                 switch (result.Type)
                 {
-                    case HitResult.None:
-                        break;
-
                     case HitResult.Miss:
+                    case HitResult.LargeTickMiss:
                         Combo.Value = 0;
                         break;
 
@@ -133,22 +133,16 @@ namespace osu.Game.Rulesets.Scoring
                 }
             }
 
-            double scoreIncrease = result.Type == HitResult.Miss ? 0 : result.Judgement.NumericResultFor(result);
+            double scoreIncrease = result.Type.IsHit() ? result.Judgement.NumericResultFor(result) : 0;
 
-            if (result.Judgement.IsBonus)
+            if (!result.Type.IsBonus())
             {
-                if (result.IsHit)
-                    bonusScore += scoreIncrease;
-            }
-            else
-            {
-                if (result.HasResult)
-                    scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) + 1;
-
                 baseScore += scoreIncrease;
                 rollingMaxBaseScore += result.Judgement.MaxNumericResult;
             }
 
+            scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) + 1;
+
             hitEvents.Add(CreateHitEvent(result));
             lastHitObject = result.HitObject;
 
@@ -171,22 +165,19 @@ namespace osu.Game.Rulesets.Scoring
             if (result.FailedAtJudgement)
                 return;
 
-            double scoreIncrease = result.Type == HitResult.Miss ? 0 : result.Judgement.NumericResultFor(result);
+            if (!result.Type.IsScorable())
+                return;
 
-            if (result.Judgement.IsBonus)
-            {
-                if (result.IsHit)
-                    bonusScore -= scoreIncrease;
-            }
-            else
-            {
-                if (result.HasResult)
-                    scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) - 1;
+            double scoreIncrease = result.Type.IsHit() ? result.Judgement.NumericResultFor(result) : 0;
 
+            if (!result.Type.IsBonus())
+            {
                 baseScore -= scoreIncrease;
                 rollingMaxBaseScore -= result.Judgement.MaxNumericResult;
             }
 
+            scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) - 1;
+
             Debug.Assert(hitEvents.Count > 0);
             lastHitObject = hitEvents[^1].LastHitObject;
             hitEvents.RemoveAt(hitEvents.Count - 1);
@@ -207,7 +198,7 @@ namespace osu.Game.Rulesets.Scoring
             return GetScore(mode, maxHighestCombo,
                 maxBaseScore > 0 ? baseScore / maxBaseScore : 0,
                 maxHighestCombo > 0 ? (double)HighestCombo.Value / maxHighestCombo : 0,
-                bonusScore);
+                scoreResultCounts);
         }
 
         /// <summary>
@@ -217,9 +208,9 @@ namespace osu.Game.Rulesets.Scoring
         /// <param name="maxCombo">The maximum combo achievable in the beatmap.</param>
         /// <param name="accuracyRatio">The accuracy percentage achieved by the player.</param>
         /// <param name="comboRatio">The proportion of <paramref name="maxCombo"/> achieved by the player.</param>
-        /// <param name="bonusScore">Any bonus score to be added.</param>
+        /// <param name="statistics">Any statistics to be factored in.</param>
         /// <returns>The total score.</returns>
-        public double GetScore(ScoringMode mode, int maxCombo, double accuracyRatio, double comboRatio, double bonusScore)
+        public double GetScore(ScoringMode mode, int maxCombo, double accuracyRatio, double comboRatio, Dictionary<HitResult, int> statistics)
         {
             switch (mode)
             {
@@ -228,14 +219,18 @@ namespace osu.Game.Rulesets.Scoring
                     double accuracyScore = accuracyPortion * accuracyRatio;
                     double comboScore = comboPortion * comboRatio;
 
-                    return (max_score * (accuracyScore + comboScore) + bonusScore) * scoreMultiplier;
+                    return (max_score * (accuracyScore + comboScore) + getBonusScore(statistics)) * scoreMultiplier;
 
                 case ScoringMode.Classic:
                     // should emulate osu-stable's scoring as closely as we can (https://osu.ppy.sh/help/wiki/Score/ScoreV1)
-                    return bonusScore + (accuracyRatio * maxCombo * 300) * (1 + Math.Max(0, (comboRatio * maxCombo) - 1) * scoreMultiplier / 25);
+                    return getBonusScore(statistics) + (accuracyRatio * maxCombo * 300) * (1 + Math.Max(0, (comboRatio * maxCombo) - 1) * scoreMultiplier / 25);
             }
         }
 
+        private double getBonusScore(Dictionary<HitResult, int> statistics)
+            => statistics.GetOrDefault(HitResult.SmallBonus) * Judgement.SMALL_BONUS_SCORE
+               + statistics.GetOrDefault(HitResult.LargeBonus) * Judgement.LARGE_BONUS_SCORE;
+
         private ScoreRank rankFrom(double acc)
         {
             if (acc == 1)
@@ -282,7 +277,6 @@ namespace osu.Game.Rulesets.Scoring
 
             baseScore = 0;
             rollingMaxBaseScore = 0;
-            bonusScore = 0;
 
             TotalScore.Value = 0;
             Accuracy.Value = 1;
@@ -309,9 +303,7 @@ namespace osu.Game.Rulesets.Scoring
             score.Rank = Rank.Value;
             score.Date = DateTimeOffset.Now;
 
-            var hitWindows = CreateHitWindows();
-
-            foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
+            foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r.IsScorable()))
                 score.Statistics[result] = GetStatistic(result);
 
             score.HitEvents = hitEvents;
@@ -320,6 +312,7 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// Create a <see cref="HitWindows"/> for this processor.
         /// </summary>
+        [Obsolete("Method is now unused.")] // Can be removed 20210328
         public virtual HitWindows CreateHitWindows() => new HitWindows();
     }
 
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 619ca76598..561ca631b3 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Scoring
 
                 scoreProcessor.Mods.Value = score.Mods;
 
-                Value = (long)Math.Round(scoreProcessor.GetScore(ScoringMode.Value, beatmapMaxCombo, score.Accuracy, (double)score.MaxCombo / beatmapMaxCombo, 0));
+                Value = (long)Math.Round(scoreProcessor.GetScore(ScoringMode.Value, beatmapMaxCombo, score.Accuracy, (double)score.MaxCombo / beatmapMaxCombo, score.Statistics));
             }
         }
 

From bc8f6a58fd307302cb998e1e7af9fc79dd443740 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 15:26:42 +0900
Subject: [PATCH 05011/10326] Update PF/SD with new hit results

---
 osu.Game/Rulesets/Mods/ModPerfect.cs     | 3 +--
 osu.Game/Rulesets/Mods/ModSuddenDeath.cs | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModPerfect.cs b/osu.Game/Rulesets/Mods/ModPerfect.cs
index 65f1a972ed..df0fc9c4b6 100644
--- a/osu.Game/Rulesets/Mods/ModPerfect.cs
+++ b/osu.Game/Rulesets/Mods/ModPerfect.cs
@@ -16,8 +16,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Description => "SS or quit.";
 
         protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
-            => !(result.Judgement is IgnoreJudgement)
-               && result.Judgement.AffectsCombo
+            => result.Type.AffectsAccuracy()
                && result.Type != result.Judgement.MaxResult;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
index df10262845..ae71041a64 100644
--- a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
+++ b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Rulesets.Mods
             healthProcessor.FailConditions += FailCondition;
         }
 
-        protected virtual bool FailCondition(HealthProcessor healthProcessor, JudgementResult result) => !result.IsHit && result.Judgement.AffectsCombo;
+        protected virtual bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
+            => result.Type.AffectsCombo()
+               && !result.IsHit;
     }
 }

From 4ef7ab28728e9c4543b5a049b153f742a925378b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 15:36:08 +0900
Subject: [PATCH 05012/10326] Fix tests

---
 .../Mods/TestSceneCatchModPerfect.cs                          | 2 +-
 .../Skinning/TestSceneDrawableTaikoMascot.cs                  | 4 ++--
 osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs   | 2 +-
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
index c1b7214d72..3e06e78dba 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
         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(false)]
+        [TestCase(true)]
         public void TestTinyDroplet(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new TinyDroplet { StartTime = 1000 }), shouldMiss);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 36289bda93..ae42bf8a90 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             createDrawableRuleset();
 
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
-            assertStateAfterResult(new JudgementResult(new StrongHitObject(), new TaikoStrongJudgement()) { Type = HitResult.Miss }, TaikoMascotAnimationState.Idle);
+            assertStateAfterResult(new JudgementResult(new StrongHitObject(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Idle);
         }
 
         [Test]
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             createDrawableRuleset();
 
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Good }, TaikoMascotAnimationState.Kiai);
-            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoStrongJudgement()) { Type = HitResult.Miss }, TaikoMascotAnimationState.Kiai);
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Kiai);
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss }, TaikoMascotAnimationState.Fail);
         }
 
diff --git a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
index efeb5eeba2..7264083338 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
@@ -263,7 +263,7 @@ namespace osu.Game.Tests.Gameplay
             public double Duration { get; set; } = 5000;
 
             public JudgeableLongHitObject()
-                : base(false)
+                : base(HitResult.LargeBonus)
             {
             }
 
diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 64d1024efb..84b7bc3723 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -35,10 +35,10 @@ namespace osu.Game.Tests.Rulesets.Scoring
         }
 
         [TestCase(ScoringMode.Standardised, HitResult.Meh, 750_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.Good, 800_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.Good, 900_000)]
         [TestCase(ScoringMode.Standardised, HitResult.Great, 1_000_000)]
         [TestCase(ScoringMode.Classic, HitResult.Meh, 50)]
-        [TestCase(ScoringMode.Classic, HitResult.Good, 100)]
+        [TestCase(ScoringMode.Classic, HitResult.Good, 200)]
         [TestCase(ScoringMode.Classic, HitResult.Great, 300)]
         public void TestSingleOsuHit(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
         {

From e789e06c86ac973754a4f71b053b7b1becdb97f7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 16:00:45 +0900
Subject: [PATCH 05013/10326] Don't display hold note tick judgements

---
 .../Objects/Drawables/DrawableHoldNoteTick.cs                   | 2 ++
 osu.Game.Rulesets.Mania/UI/Column.cs                            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
index 98931dceed..f265419aa0 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     /// </summary>
     public class DrawableHoldNoteTick : DrawableManiaHitObject<HoldNoteTick>
     {
+        public override bool DisplayResult => false;
+
         /// <summary>
         /// References the time at which the user started holding the hold note.
         /// </summary>
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 9aabcc6699..c28a1c13d8 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Mania.UI
             if (result.IsHit)
                 hitPolicy.HandleHit(judgedObject);
 
-            if (!result.IsHit || !judgedObject.DisplayResult || !DisplayJudgements.Value)
+            if (!result.IsHit || !DisplayJudgements.Value)
                 return;
 
             HitObjectArea.Explosions.Add(hitExplosionPool.Get(e => e.Apply(result)));

From 903bcd747e777757150310877bf256594b818bcf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 16:39:29 +0900
Subject: [PATCH 05014/10326] Revert unintended changes

---
 osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs          | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
index ccafe0abc4..fd61647a7c 100644
--- a/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
+++ b/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
 {
     public class CatchJudgement : Judgement
     {
-        public override HitResult MaxResult => HitResult.Great;
+        public override HitResult MaxResult => HitResult.Perfect;
 
         /// <summary>
         /// Whether fruit on the platter should explode or drop.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 286feac5ba..dfab24f239 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             if (countHit >= HitObject.RequiredGoodHits)
             {
-                ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Ok);
+                ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Good);
             }
             else
                 ApplyResult(r => r.Type = HitResult.Miss);
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 11ff0729e2..999a159cce 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     tick.TriggerResult(false);
                 }
 
-                var hitResult = numHits > HitObject.RequiredHits / 2 ? HitResult.Ok : HitResult.Miss;
+                var hitResult = numHits > HitObject.RequiredHits / 2 ? HitResult.Good : HitResult.Miss;
 
                 ApplyResult(r => r.Type = hitResult);
             }

From f439c1afbc7310991681ba2bd1867a7540494508 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 17:16:55 +0900
Subject: [PATCH 05015/10326] Make osu/taiko/catch use Ok+Great

---
 .../TestSceneComboCounter.cs                  |  2 +-
 .../Difficulty/CatchPerformanceCalculator.cs  |  2 +-
 .../Judgements/CatchJudgement.cs              |  2 +-
 .../Scoring/CatchHitWindows.cs                |  2 +-
 .../Difficulty/OsuPerformanceCalculator.cs    | 10 ++---
 .../Objects/Drawables/DrawableSpinner.cs      |  2 +-
 .../Replays/OsuAutoGenerator.cs               |  6 +--
 .../Scoring/OsuHitWindows.cs                  |  4 +-
 .../Skinning/TestSceneDrawableTaikoMascot.cs  |  6 +--
 .../Skinning/TestSceneHitExplosion.cs         |  4 +-
 .../Skinning/TestSceneTaikoScroller.cs        |  2 +-
 .../TestSceneFlyingHits.cs                    |  2 +-
 .../TestSceneHits.cs                          |  8 ++--
 .../Difficulty/TaikoPerformanceCalculator.cs  |  6 +--
 .../Judgements/TaikoJudgement.cs              |  2 +-
 .../Objects/Drawables/DrawableDrumRoll.cs     |  2 +-
 .../Objects/Drawables/DrawableSwell.cs        |  2 +-
 .../Scoring/TaikoHitWindows.cs                |  4 +-
 .../Skinning/TaikoLegacySkinTransformer.cs    |  8 ++--
 .../TaikoSkinComponents.cs                    |  4 +-
 .../UI/DrawableTaikoJudgement.cs              |  2 +-
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs    |  6 +--
 .../Rulesets/Scoring/ScoreProcessorTest.cs    |  4 +-
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs |  2 +-
 .../Scoring/Legacy/ScoreInfoExtensions.cs     | 37 +------------------
 osu.Game/Skinning/LegacySkin.cs               |  2 +-
 osu.Game/Tests/TestScoreInfo.cs               |  4 +-
 27 files changed, 53 insertions(+), 84 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
index e79792e04a..c7b322c8a0 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Test]
         public void TestCatchComboCounter()
         {
-            AddRepeatStep("perform hit", () => performJudgement(HitResult.Perfect), 20);
+            AddRepeatStep("perform hit", () => performJudgement(HitResult.Great), 20);
             AddStep("perform miss", () => performJudgement(HitResult.Miss));
 
             AddStep("randomize judged object colour", () =>
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
index d700f79e5b..a4b9ca35eb 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         {
             mods = Score.Mods;
 
-            fruitsHit = Score.Statistics.GetOrDefault(HitResult.Perfect);
+            fruitsHit = Score.Statistics.GetOrDefault(HitResult.Great);
             ticksHit = Score.Statistics.GetOrDefault(HitResult.LargeTickHit);
             tinyTicksHit = Score.Statistics.GetOrDefault(HitResult.SmallTickHit);
             tinyTicksMissed = Score.Statistics.GetOrDefault(HitResult.SmallTickMiss);
diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
index fd61647a7c..ccafe0abc4 100644
--- a/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
+++ b/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
 {
     public class CatchJudgement : Judgement
     {
-        public override HitResult MaxResult => HitResult.Perfect;
+        public override HitResult MaxResult => HitResult.Great;
 
         /// <summary>
         /// Whether fruit on the platter should explode or drop.
diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchHitWindows.cs b/osu.Game.Rulesets.Catch/Scoring/CatchHitWindows.cs
index ff793a372e..0a444d923e 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchHitWindows.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchHitWindows.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Catch.Scoring
         {
             switch (result)
             {
-                case HitResult.Perfect:
+                case HitResult.Great:
                 case HitResult.Miss:
                     return true;
             }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 6f4c0f9cfa..02577461f0 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         private double accuracy;
         private int scoreMaxCombo;
         private int countGreat;
-        private int countGood;
+        private int countOk;
         private int countMeh;
         private int countMiss;
 
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             accuracy = Score.Accuracy;
             scoreMaxCombo = Score.MaxCombo;
             countGreat = Score.Statistics.GetOrDefault(HitResult.Great);
-            countGood = Score.Statistics.GetOrDefault(HitResult.Good);
+            countOk = Score.Statistics.GetOrDefault(HitResult.Ok);
             countMeh = Score.Statistics.GetOrDefault(HitResult.Meh);
             countMiss = Score.Statistics.GetOrDefault(HitResult.Miss);
 
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             int amountHitObjectsWithAccuracy = countHitCircles;
 
             if (amountHitObjectsWithAccuracy > 0)
-                betterAccuracyPercentage = ((countGreat - (totalHits - amountHitObjectsWithAccuracy)) * 6 + countGood * 2 + countMeh) / (double)(amountHitObjectsWithAccuracy * 6);
+                betterAccuracyPercentage = ((countGreat - (totalHits - amountHitObjectsWithAccuracy)) * 6 + countOk * 2 + countMeh) / (double)(amountHitObjectsWithAccuracy * 6);
             else
                 betterAccuracyPercentage = 0;
 
@@ -204,7 +204,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             return accuracyValue;
         }
 
-        private int totalHits => countGreat + countGood + countMeh + countMiss;
-        private int totalSuccessfulHits => countGreat + countGood + countMeh;
+        private int totalHits => countGreat + countOk + countMeh + countMiss;
+        private int totalSuccessfulHits => countGreat + countOk + countMeh;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index a57bb466c7..d77213f3ed 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -217,7 +217,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 if (Progress >= 1)
                     r.Type = HitResult.Great;
                 else if (Progress > .9)
-                    r.Type = HitResult.Good;
+                    r.Type = HitResult.Ok;
                 else if (Progress > .75)
                     r.Type = HitResult.Meh;
                 else if (Time.Current >= Spinner.EndTime)
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index 9b350278f3..954a217473 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -137,13 +137,13 @@ namespace osu.Game.Rulesets.Osu.Replays
                 if (!(h is Spinner))
                     AddFrameToReplay(new OsuReplayFrame(h.StartTime - hitWindows.WindowFor(HitResult.Meh), new Vector2(h.StackedPosition.X, h.StackedPosition.Y)));
             }
-            else if (h.StartTime - hitWindows.WindowFor(HitResult.Good) > endTime + hitWindows.WindowFor(HitResult.Good) + 50)
+            else if (h.StartTime - hitWindows.WindowFor(HitResult.Ok) > endTime + hitWindows.WindowFor(HitResult.Ok) + 50)
             {
                 if (!(prev is Spinner) && h.StartTime - endTime < 1000)
-                    AddFrameToReplay(new OsuReplayFrame(endTime + hitWindows.WindowFor(HitResult.Good), new Vector2(prev.StackedEndPosition.X, prev.StackedEndPosition.Y)));
+                    AddFrameToReplay(new OsuReplayFrame(endTime + hitWindows.WindowFor(HitResult.Ok), new Vector2(prev.StackedEndPosition.X, prev.StackedEndPosition.Y)));
 
                 if (!(h is Spinner))
-                    AddFrameToReplay(new OsuReplayFrame(h.StartTime - hitWindows.WindowFor(HitResult.Good), new Vector2(h.StackedPosition.X, h.StackedPosition.Y)));
+                    AddFrameToReplay(new OsuReplayFrame(h.StartTime - hitWindows.WindowFor(HitResult.Ok), new Vector2(h.StackedPosition.X, h.StackedPosition.Y)));
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
index 6f2998006f..dafe63a6d1 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
         private static readonly DifficultyRange[] osu_ranges =
         {
             new DifficultyRange(HitResult.Great, 80, 50, 20),
-            new DifficultyRange(HitResult.Good, 140, 100, 60),
+            new DifficultyRange(HitResult.Ok, 140, 100, 60),
             new DifficultyRange(HitResult.Meh, 200, 150, 100),
             new DifficultyRange(HitResult.Miss, 400, 400, 400),
         };
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
             switch (result)
             {
                 case HitResult.Great:
-                case HitResult.Good:
+                case HitResult.Ok:
                 case HitResult.Meh:
                 case HitResult.Miss:
                     return true;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index ae42bf8a90..99e103da3b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
             createDrawableRuleset();
 
-            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Good }, TaikoMascotAnimationState.Kiai);
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Ok }, TaikoMascotAnimationState.Kiai);
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Kiai);
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss }, TaikoMascotAnimationState.Fail);
         }
@@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss }, TaikoMascotAnimationState.Fail);
             assertStateAfterResult(new JudgementResult(new DrumRoll(), new TaikoDrumRollJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
-            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Good }, TaikoMascotAnimationState.Idle);
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Ok }, TaikoMascotAnimationState.Idle);
         }
 
         [TestCase(true)]
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
             AddRepeatStep("reach 49 combo", () => applyNewResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }), 49);
 
-            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Good }, TaikoMascotAnimationState.Clear);
+            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Ok }, TaikoMascotAnimationState.Clear);
         }
 
         [TestCase(true, TaikoMascotAnimationState.Kiai)]
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index 45c94a8a86..fecb5d4a74 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         public void TestNormalHit()
         {
             AddStep("Great", () => SetContents(() => getContentFor(createHit(HitResult.Great))));
-            AddStep("Good", () => SetContents(() => getContentFor(createHit(HitResult.Good))));
+            AddStep("Ok", () => SetContents(() => getContentFor(createHit(HitResult.Ok))));
             AddStep("Miss", () => SetContents(() => getContentFor(createHit(HitResult.Miss))));
         }
 
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         public void TestStrongHit([Values(false, true)] bool hitBoth)
         {
             AddStep("Great", () => SetContents(() => getContentFor(createStrongHit(HitResult.Great, hitBoth))));
-            AddStep("Good", () => SetContents(() => getContentFor(createStrongHit(HitResult.Good, hitBoth))));
+            AddStep("Good", () => SetContents(() => getContentFor(createStrongHit(HitResult.Ok, hitBoth))));
         }
 
         private Drawable getContentFor(DrawableTestHit hit)
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
index 16ef5b968d..114038b81c 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 }));
 
             AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.LastResult.Value =
-                new JudgementResult(null, new Judgement()) { Type = passing ? HitResult.Perfect : HitResult.Miss }));
+                new JudgementResult(null, new Judgement()) { Type = passing ? HitResult.Great : HitResult.Miss }));
 
             AddToggleStep("toggle playback direction", reversed => this.reversed = reversed);
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
index 7492a76a67..63854e7ead 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableDrumRollTick h;
             DrawableRuleset.Playfield.Add(h = new DrawableDrumRollTick(tick) { JudgementType = hitType });
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Perfect });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Great });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index b6cfe368f7..0f605be8f9 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private void addHitJudgement(bool kiai)
         {
-            HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Good : HitResult.Great;
+            HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Ok : HitResult.Great;
 
             var cpi = new ControlPointInfo();
             cpi.Add(0, new EffectControlPoint { KiaiMode = kiai });
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             Hit hit = new Hit();
             hit.ApplyDefaults(cpi, new BeatmapDifficulty());
 
-            var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Good ? -0.1f : -0.05f, hitResult == HitResult.Good ? 0.1f : 0.05f) };
+            var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
 
             DrawableRuleset.Playfield.Add(h);
 
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private void addStrongHitJudgement(bool kiai)
         {
-            HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Good : HitResult.Great;
+            HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Ok : HitResult.Great;
 
             var cpi = new ControlPointInfo();
             cpi.Add(0, new EffectControlPoint { KiaiMode = kiai });
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             Hit hit = new Hit();
             hit.ApplyDefaults(cpi, new BeatmapDifficulty());
 
-            var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Good ? -0.1f : -0.05f, hitResult == HitResult.Good ? 0.1f : 0.05f) };
+            var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
 
             DrawableRuleset.Playfield.Add(h);
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
index b9d95a6ba6..c04fffa2e7 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         private Mod[] mods;
         private int countGreat;
-        private int countGood;
+        private int countOk;
         private int countMeh;
         private int countMiss;
 
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         {
             mods = Score.Mods;
             countGreat = Score.Statistics.GetOrDefault(HitResult.Great);
-            countGood = Score.Statistics.GetOrDefault(HitResult.Good);
+            countOk = Score.Statistics.GetOrDefault(HitResult.Ok);
             countMeh = Score.Statistics.GetOrDefault(HitResult.Meh);
             countMiss = Score.Statistics.GetOrDefault(HitResult.Miss);
 
@@ -102,6 +102,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             return accValue * Math.Min(1.15, Math.Pow(totalHits / 1500.0, 0.3));
         }
 
-        private int totalHits => countGreat + countGood + countMeh + countMiss;
+        private int totalHits => countGreat + countOk + countMeh + countMiss;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs
index 3d22860814..e272c1a4ef 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Judgements
                 case HitResult.Miss:
                     return -1.0;
 
-                case HitResult.Good:
+                case HitResult.Ok:
                     return 1.1;
 
                 case HitResult.Great:
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index dfab24f239..286feac5ba 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             if (countHit >= HitObject.RequiredGoodHits)
             {
-                ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Good);
+                ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Ok);
             }
             else
                 ApplyResult(r => r.Type = HitResult.Miss);
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 999a159cce..11ff0729e2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     tick.TriggerResult(false);
                 }
 
-                var hitResult = numHits > HitObject.RequiredHits / 2 ? HitResult.Good : HitResult.Miss;
+                var hitResult = numHits > HitObject.RequiredHits / 2 ? HitResult.Ok : HitResult.Miss;
 
                 ApplyResult(r => r.Type = hitResult);
             }
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs
index 9d273392ff..cf806c0c97 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Taiko.Scoring
         private static readonly DifficultyRange[] taiko_ranges =
         {
             new DifficultyRange(HitResult.Great, 50, 35, 20),
-            new DifficultyRange(HitResult.Good, 120, 80, 50),
+            new DifficultyRange(HitResult.Ok, 120, 80, 50),
             new DifficultyRange(HitResult.Miss, 135, 95, 70),
         };
 
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Scoring
             switch (result)
             {
                 case HitResult.Great:
-                case HitResult.Good:
+                case HitResult.Ok:
                 case HitResult.Miss:
                     return true;
             }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index c222ccb51f..73a56f3fbc 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -74,8 +74,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                     return null;
 
-                case TaikoSkinComponents.TaikoExplosionGood:
-                case TaikoSkinComponents.TaikoExplosionGoodStrong:
+                case TaikoSkinComponents.TaikoExplosionOk:
+                case TaikoSkinComponents.TaikoExplosionOkStrong:
                 case TaikoSkinComponents.TaikoExplosionGreat:
                 case TaikoSkinComponents.TaikoExplosionGreatStrong:
                 case TaikoSkinComponents.TaikoExplosionMiss:
@@ -106,10 +106,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 case TaikoSkinComponents.TaikoExplosionMiss:
                     return "taiko-hit0";
 
-                case TaikoSkinComponents.TaikoExplosionGood:
+                case TaikoSkinComponents.TaikoExplosionOk:
                     return "taiko-hit100";
 
-                case TaikoSkinComponents.TaikoExplosionGoodStrong:
+                case TaikoSkinComponents.TaikoExplosionOkStrong:
                     return "taiko-hit100k";
 
                 case TaikoSkinComponents.TaikoExplosionGreat:
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index 0d785adb4a..b274608d84 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -16,8 +16,8 @@ namespace osu.Game.Rulesets.Taiko
         PlayfieldBackgroundRight,
         BarLine,
         TaikoExplosionMiss,
-        TaikoExplosionGood,
-        TaikoExplosionGoodStrong,
+        TaikoExplosionOk,
+        TaikoExplosionOkStrong,
         TaikoExplosionGreat,
         TaikoExplosionGreatStrong,
         Scroller,
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
index f91bbb14e8..cbfc5a8628 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             switch (Result.Type)
             {
-                case HitResult.Good:
+                case HitResult.Ok:
                     JudgementBody.Colour = colours.GreenLight;
                     break;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index efd1b25046..6d800b812d 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -60,10 +60,10 @@ namespace osu.Game.Rulesets.Taiko.UI
                 case HitResult.Miss:
                     return TaikoSkinComponents.TaikoExplosionMiss;
 
-                case HitResult.Good:
+                case HitResult.Ok:
                     return useStrongExplosion(judgedObject)
-                        ? TaikoSkinComponents.TaikoExplosionGoodStrong
-                        : TaikoSkinComponents.TaikoExplosionGood;
+                        ? TaikoSkinComponents.TaikoExplosionOkStrong
+                        : TaikoSkinComponents.TaikoExplosionOk;
 
                 case HitResult.Great:
                     return useStrongExplosion(judgedObject)
diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 84b7bc3723..ace57aad1d 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -35,10 +35,10 @@ namespace osu.Game.Tests.Rulesets.Scoring
         }
 
         [TestCase(ScoringMode.Standardised, HitResult.Meh, 750_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.Good, 900_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.Ok, 800_000)]
         [TestCase(ScoringMode.Standardised, HitResult.Great, 1_000_000)]
         [TestCase(ScoringMode.Classic, HitResult.Meh, 50)]
-        [TestCase(ScoringMode.Classic, HitResult.Good, 200)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, 100)]
         [TestCase(ScoringMode.Classic, HitResult.Great, 300)]
         public void TestSingleOsuHit(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 253b8d9c55..377f305d63 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Children = new[]
                 {
                     new OsuSpriteText { Text = $@"Great: {hitWindows?.WindowFor(HitResult.Great)}" },
-                    new OsuSpriteText { Text = $@"Good: {hitWindows?.WindowFor(HitResult.Good)}" },
+                    new OsuSpriteText { Text = $@"Good: {hitWindows?.WindowFor(HitResult.Ok)}" },
                     new OsuSpriteText { Text = $@"Meh: {hitWindows?.WindowFor(HitResult.Meh)}" },
                 }
             });
diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index 6f73a284a2..b58f65800d 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -28,37 +28,9 @@ namespace osu.Game.Scoring.Legacy
             }
         }
 
-        public static int? GetCount300(this ScoreInfo scoreInfo)
-        {
-            switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
-            {
-                case 0:
-                case 1:
-                case 3:
-                    return getCount(scoreInfo, HitResult.Great);
+        public static int? GetCount300(this ScoreInfo scoreInfo) => getCount(scoreInfo, HitResult.Great);
 
-                case 2:
-                    return getCount(scoreInfo, HitResult.Perfect);
-            }
-
-            return null;
-        }
-
-        public static void SetCount300(this ScoreInfo scoreInfo, int value)
-        {
-            switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
-            {
-                case 0:
-                case 1:
-                case 3:
-                    scoreInfo.Statistics[HitResult.Great] = value;
-                    break;
-
-                case 2:
-                    scoreInfo.Statistics[HitResult.Perfect] = value;
-                    break;
-            }
-        }
+        public static void SetCount300(this ScoreInfo scoreInfo, int value) => scoreInfo.Statistics[HitResult.Great] = value;
 
         public static int? GetCountKatu(this ScoreInfo scoreInfo)
         {
@@ -94,8 +66,6 @@ namespace osu.Game.Scoring.Legacy
             {
                 case 0:
                 case 1:
-                    return getCount(scoreInfo, HitResult.Good);
-
                 case 3:
                     return getCount(scoreInfo, HitResult.Ok);
 
@@ -112,9 +82,6 @@ namespace osu.Game.Scoring.Legacy
             {
                 case 0:
                 case 1:
-                    scoreInfo.Statistics[HitResult.Good] = value;
-                    break;
-
                 case 3:
                     scoreInfo.Statistics[HitResult.Ok] = value;
                     break;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 5caf07b554..e38913b13a 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -336,7 +336,7 @@ namespace osu.Game.Skinning
                         case HitResult.Meh:
                             return this.GetAnimation("hit50", true, false);
 
-                        case HitResult.Good:
+                        case HitResult.Ok:
                             return this.GetAnimation("hit100", true, false);
 
                         case HitResult.Great:
diff --git a/osu.Game/Tests/TestScoreInfo.cs b/osu.Game/Tests/TestScoreInfo.cs
index 704d01e479..9090a12d3f 100644
--- a/osu.Game/Tests/TestScoreInfo.cs
+++ b/osu.Game/Tests/TestScoreInfo.cs
@@ -35,8 +35,10 @@ namespace osu.Game.Tests
 
             Statistics[HitResult.Miss] = 1;
             Statistics[HitResult.Meh] = 50;
-            Statistics[HitResult.Good] = 100;
+            Statistics[HitResult.Ok] = 100;
+            Statistics[HitResult.Good] = 200;
             Statistics[HitResult.Great] = 300;
+            Statistics[HitResult.Perfect] = 320;
             Statistics[HitResult.SmallTickHit] = 50;
             Statistics[HitResult.SmallTickMiss] = 25;
             Statistics[HitResult.LargeTickHit] = 100;

From 91262620d3c72bb14880d1e7262c734aa4672fd2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 17:17:06 +0900
Subject: [PATCH 05016/10326] Remove XMLDocs from Ok/Perfect hit results

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 7a02db190a..d979c342e1 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -32,9 +32,6 @@ namespace osu.Game.Rulesets.Scoring
         [Order(4)]
         Meh,
 
-        /// <summary>
-        /// Optional judgement.
-        /// </summary>
         [Description(@"OK")]
         [Order(3)]
         Ok,
@@ -47,9 +44,6 @@ namespace osu.Game.Rulesets.Scoring
         [Order(1)]
         Great,
 
-        /// <summary>
-        /// Optional judgement.
-        /// </summary>
         [Description(@"Perfect")]
         [Order(0)]
         Perfect,

From 53b3d238427d456be3e5acbd79d221b7d1937136 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 17:26:49 +0900
Subject: [PATCH 05017/10326] Expose HitObjectComposer for other components in
 the Compose csreen to use

---
 .../Screens/Edit/Compose/ComposeScreen.cs     | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index d7a4661fa0..5282b4d998 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -1,8 +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.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osu.Game.Skinning;
@@ -18,11 +22,23 @@ namespace osu.Game.Screens.Edit.Compose
         {
         }
 
-        protected override Drawable CreateMainContent()
+        private Ruleset ruleset;
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
-            var ruleset = Beatmap.Value.BeatmapInfo.Ruleset?.CreateInstance();
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+            ruleset = parent.Get<IBindable<WorkingBeatmap>>().Value.BeatmapInfo.Ruleset?.CreateInstance();
             composer = ruleset?.CreateHitObjectComposer();
 
+            // make the composer available to the timeline and other components in this screen.
+            dependencies.CacheAs(composer);
+
+            return dependencies;
+        }
+
+        protected override Drawable CreateMainContent()
+        {
             if (ruleset == null || composer == null)
                 return new ScreenWhiteBox.UnderConstructionMessage(ruleset == null ? "This beatmap" : $"{ruleset.Description}'s composer");
 

From f16fc2907188da26ff64cb7743eb1e0a2319f444 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 16:42:54 +0900
Subject: [PATCH 05018/10326] Add combo colour display support

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index b95b3842b3..7dfaf02af4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -15,6 +16,7 @@ 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.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
 using osuTK.Graphics;
@@ -34,6 +36,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private readonly List<Container> shadowComponents = new List<Container>();
 
+        private DrawableHitObject drawableHitObject;
+
+        private Bindable<Color4> comboColour;
+
         private const float thickness = 5;
 
         private const float shadow_radius = 5;
@@ -123,6 +129,30 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             updateShadows();
         }
 
+        [BackgroundDependencyLoader(true)]
+        private void load(HitObjectComposer composer)
+        {
+            if (composer != null)
+            {
+                // best effort to get the drawable representation for grabbing colour and what not.
+                drawableHitObject = composer.HitObjects.FirstOrDefault(d => d.HitObject == HitObject);
+            }
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (drawableHitObject != null)
+            {
+                comboColour = drawableHitObject.AccentColour.GetBoundCopy();
+                comboColour.BindValueChanged(colour =>
+                {
+                    Colour = drawableHitObject.AccentColour.Value;
+                }, true);
+            }
+        }
+
         protected override void Update()
         {
             base.Update();

From 8d8d45a0c068a9348e1ba37eecdf673900dae70d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 17:04:59 +0900
Subject: [PATCH 05019/10326] Add combo index display support

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 48 +++++++++++++++++--
 1 file changed, 44 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 7dfaf02af4..9aa0fee96e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -13,6 +13,8 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Primitives;
 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.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -40,11 +42,17 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private Bindable<Color4> comboColour;
 
+        private readonly Container mainComponents;
+
+        private readonly OsuSpriteText comboIndexText;
+
+        private Bindable<int> comboIndex;
+
         private const float thickness = 5;
 
         private const float shadow_radius = 5;
 
-        private const float circle_size = 16;
+        private const float circle_size = 24;
 
         public TimelineHitObjectBlueprint(HitObject hitObject)
             : base(hitObject)
@@ -60,6 +68,23 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
+            AddRangeInternal(new Drawable[]
+            {
+                mainComponents = new Container
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                },
+                comboIndexText = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.Centre,
+                    Font = OsuFont.Numeric.With(size: circle_size / 2, weight: FontWeight.Black),
+                },
+            });
+
             circle = new Circle
             {
                 Size = new Vector2(circle_size),
@@ -83,7 +108,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 DragBar dragBarUnderlay;
                 Container extensionBar;
 
-                AddRangeInternal(new Drawable[]
+                mainComponents.AddRange(new Drawable[]
                 {
                     extensionBar = new Container
                     {
@@ -123,7 +148,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
             else
             {
-                AddInternal(circle);
+                mainComponents.Add(circle);
             }
 
             updateShadows();
@@ -143,12 +168,27 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.LoadComplete();
 
+            if (HitObject is IHasComboInformation comboInfo)
+            {
+                comboIndex = comboInfo.IndexInCurrentComboBindable.GetBoundCopy();
+                comboIndex.BindValueChanged(combo =>
+                {
+                    comboIndexText.Text = (combo.NewValue + 1).ToString();
+                }, true);
+            }
+
             if (drawableHitObject != null)
             {
                 comboColour = drawableHitObject.AccentColour.GetBoundCopy();
                 comboColour.BindValueChanged(colour =>
                 {
-                    Colour = drawableHitObject.AccentColour.Value;
+                    mainComponents.Colour = drawableHitObject.AccentColour.Value;
+
+                    var col = mainComponents.Colour.AverageColour.Linear;
+                    float brightness = col.R + col.G + col.B;
+
+                    // decide the combo index colour based on brightness?
+                    comboIndexText.Colour = brightness > 0.5f ? Color4.Black : Color4.White;
                 }, true);
             }
         }

From c47652c97a22350e3d14269fc4d6936c2856e444 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 17:22:47 +0900
Subject: [PATCH 05020/10326] Add gradient to hide subtractive colour issues

Good thing is looks better than without.
---
 .../Compose/Components/Timeline/TimelineHitObjectBlueprint.cs  | 3 ++-
 1 file changed, 2 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 9aa0fee96e..11f44c59ac 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -8,6 +8,7 @@ using JetBrains.Annotations;
 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.Effects;
 using osu.Framework.Graphics.Primitives;
@@ -182,7 +183,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 comboColour = drawableHitObject.AccentColour.GetBoundCopy();
                 comboColour.BindValueChanged(colour =>
                 {
-                    mainComponents.Colour = drawableHitObject.AccentColour.Value;
+                    mainComponents.Colour = ColourInfo.GradientHorizontal(drawableHitObject.AccentColour.Value, Color4.White);
 
                     var col = mainComponents.Colour.AverageColour.Linear;
                     float brightness = col.R + col.G + col.B;

From 6e1ea004436fcdc09da0b6599d37a75e778b5a18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 17:34:50 +0900
Subject: [PATCH 05021/10326] Don't apply gradient to non-duration objects

---
 .../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 11f44c59ac..455f1e17bd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -91,9 +91,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 Size = new Vector2(circle_size),
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.Centre,
-                RelativePositionAxes = Axes.X,
-                AlwaysPresent = true,
-                Colour = Color4.White,
                 EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Shadow,
@@ -183,7 +180,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 comboColour = drawableHitObject.AccentColour.GetBoundCopy();
                 comboColour.BindValueChanged(colour =>
                 {
-                    mainComponents.Colour = ColourInfo.GradientHorizontal(drawableHitObject.AccentColour.Value, Color4.White);
+                    if (HitObject is IHasDuration)
+                        mainComponents.Colour = ColourInfo.GradientHorizontal(drawableHitObject.AccentColour.Value, Color4.White);
+                    else
+                        mainComponents.Colour = drawableHitObject.AccentColour.Value;
 
                     var col = mainComponents.Colour.AverageColour.Linear;
                     float brightness = col.R + col.G + col.B;

From 379a4cca85bec432dc2fa18da48fbdd7e09e8158 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 17:48:44 +0900
Subject: [PATCH 05022/10326] Adjust hold note tests

---
 .../TestSceneHoldNoteInput.cs                 | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 95072cf4f8..5cb1519196 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -45,9 +45,9 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.Miss);
+            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
-            assertNoteJudgement(HitResult.Perfect);
+            assertNoteJudgement(HitResult.IgnoreHit);
         }
 
         /// <summary>
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.Miss);
+            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.Miss);
+            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.Perfect);
+            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.Perfect);
+            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Perfect);
         }
 
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.Miss);
+            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -161,7 +161,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.Perfect);
+            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.Perfect);
+            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Meh);
         }
 
@@ -199,7 +199,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.Perfect);
+            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -217,7 +217,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.Perfect);
+            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Meh);
         }
 
@@ -235,7 +235,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.Miss);
+            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Meh);
         }
 
@@ -280,10 +280,10 @@ namespace osu.Game.Rulesets.Mania.Tests
             }, beatmap);
 
             AddAssert("first hold note missed", () => judgementResults.Where(j => beatmap.HitObjects[0].NestedHitObjects.Contains(j.HitObject))
-                                                                      .All(j => j.Type == HitResult.Miss));
+                                                                      .All(j => !j.Type.IsHit()));
 
             AddAssert("second hold note missed", () => judgementResults.Where(j => beatmap.HitObjects[1].NestedHitObjects.Contains(j.HitObject))
-                                                                       .All(j => j.Type == HitResult.Perfect));
+                                                                       .All(j => j.Type.IsHit()));
         }
 
         private void assertHeadJudgement(HitResult result)

From cc9fa4675c00a905272c63d2e963d48d0fb2b94a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 17:59:42 +0900
Subject: [PATCH 05023/10326] Adjust HP increases

---
 osu.Game/Rulesets/Judgements/Judgement.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index ea7a8d8d25..d80ebfe402 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -124,19 +124,19 @@ namespace osu.Game.Rulesets.Judgements
                     return -DEFAULT_MAX_HEALTH_INCREASE;
 
                 case HitResult.Meh:
-                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.05;
+                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.5;
 
                 case HitResult.Ok:
-                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.01;
+                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.3;
 
                 case HitResult.Good:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 0.5;
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.1;
 
                 case HitResult.Great:
-                    return DEFAULT_MAX_HEALTH_INCREASE;
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.8;
 
                 case HitResult.Perfect:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 1.05;
+                    return DEFAULT_MAX_HEALTH_INCREASE;
 
                 case HitResult.SmallBonus:
                     return DEFAULT_MAX_HEALTH_INCREASE * 0.1;

From 4c872094c9a3eb1ff64468b30f999c486ae8d73f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 18:29:50 +0900
Subject: [PATCH 05024/10326] Adjust slider tests

---
 osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs | 10 +++++-----
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs    |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index 854626d362..32a36ab317 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -209,9 +209,9 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
-            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.IgnoreHit);
             addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.Miss);
-            addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.Great);
+            addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
         }
 
         /// <summary>
@@ -252,9 +252,9 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
-            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.IgnoreHit);
             addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.Great);
-            addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.Great);
+            addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
         }
 
         /// <summary>
@@ -331,7 +331,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
-            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.IgnoreHit);
         }
 
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index b543b6fa94..3d8a52a864 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -312,13 +312,13 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Tracking dropped", assertMidSliderJudgementFail);
         }
 
-        private bool assertGreatJudge() => judgementResults.Any() && judgementResults.All(t => t.Type == HitResult.Great);
+        private bool assertGreatJudge() => judgementResults.Any() && judgementResults.All(t => t.Type.IsHit());
 
-        private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.Great && judgementResults.First().Type == HitResult.Miss;
+        private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.IgnoreHit && judgementResults.First().Type == HitResult.Miss;
 
-        private bool assertMidSliderJudgements() => judgementResults[^2].Type == HitResult.Great;
+        private bool assertMidSliderJudgements() => judgementResults[^2].Type == HitResult.IgnoreHit;
 
-        private bool assertMidSliderJudgementFail() => judgementResults[^2].Type == HitResult.Miss;
+        private bool assertMidSliderJudgementFail() => judgementResults[^2].Type == HitResult.IgnoreMiss;
 
         private ScoreAccessibleReplayPlayer currentPlayer;
 

From 297168ecc41e7dd053fac1d0a17c0ac898315e79 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 29 Sep 2020 18:55:06 +0900
Subject: [PATCH 05025/10326] Fix scores sometimes not being re-standardised
 correctly

---
 .../Requests/Responses/APILegacyScoreInfo.cs  |  1 +
 osu.Game/Scoring/ScoreInfo.cs                 | 28 +++++++++++++++
 osu.Game/Scoring/ScoreManager.cs              | 34 ++++++++++++++-----
 3 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
index b941cd8973..3d3c07a5ad 100644
--- a/osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Online.API.Requests.Responses
                 Rank = Rank,
                 Ruleset = ruleset,
                 Mods = mods,
+                IsLegacyScore = true
             };
 
             if (Statistics != null)
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 4ed3f92e25..0206989231 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -185,6 +185,34 @@ namespace osu.Game.Scoring
         [JsonProperty("position")]
         public int? Position { get; set; }
 
+        private bool isLegacyScore;
+
+        /// <summary>
+        /// Whether this <see cref="ScoreInfo"/> represents a legacy (osu!stable) score.
+        /// </summary>
+        [JsonIgnore]
+        [NotMapped]
+        public bool IsLegacyScore
+        {
+            get
+            {
+                if (isLegacyScore)
+                    return true;
+
+                // The above check will catch legacy online scores that have an appropriate UserString + UserId.
+                // For non-online scores such as those imported in, a heuristic is used based on the following table:
+                //
+                //       Mode      | UserString | UserId
+                // --------------- | ---------- | ---------
+                // stable          | <username> | 1
+                // lazer           | <username> | <userid>
+                // lazer (offline) | Guest      | 1
+
+                return ID > 0 && UserID == 1 && UserString != "Guest";
+            }
+            set => isLegacyScore = value;
+        }
+
         public IEnumerable<(HitResult result, int count, int? maxCount)> GetStatisticsForDisplay()
         {
             foreach (var key in OrderAttributeUtils.GetValuesInOrder<HitResult>())
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 561ca631b3..8e8147ff39 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -10,6 +10,7 @@ using System.Threading;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
@@ -149,23 +150,38 @@ namespace osu.Game.Scoring
                     return;
                 }
 
-                int? beatmapMaxCombo = score.Beatmap.MaxCombo;
+                int beatmapMaxCombo;
 
-                if (beatmapMaxCombo == null)
+                if (score.IsLegacyScore)
                 {
-                    if (score.Beatmap.ID == 0 || difficulties == null)
+                    // This score is guaranteed to be an osu!stable score.
+                    // The combo must be determined through either the beatmap's max combo value or the difficulty calculator, as lazer's scoring has changed and the score statistics cannot be used.
+                    if (score.Beatmap.MaxCombo == null)
                     {
-                        // We don't have enough information (max combo) to compute the score, so let's use the provided score.
-                        Value = score.TotalScore;
+                        if (score.Beatmap.ID == 0 || difficulties == null)
+                        {
+                            // We don't have enough information (max combo) to compute the score, so use the provided score.
+                            Value = score.TotalScore;
+                            return;
+                        }
+
+                        // We can compute the max combo locally after the async beatmap difficulty computation.
+                        difficultyBindable = difficulties().GetBindableDifficulty(score.Beatmap, score.Ruleset, score.Mods, (difficultyCancellationSource = new CancellationTokenSource()).Token);
+                        difficultyBindable.BindValueChanged(d => updateScore(d.NewValue.MaxCombo), true);
+
                         return;
                     }
 
-                    // We can compute the max combo locally after the async beatmap difficulty computation.
-                    difficultyBindable = difficulties().GetBindableDifficulty(score.Beatmap, score.Ruleset, score.Mods, (difficultyCancellationSource = new CancellationTokenSource()).Token);
-                    difficultyBindable.BindValueChanged(d => updateScore(d.NewValue.MaxCombo), true);
+                    beatmapMaxCombo = score.Beatmap.MaxCombo.Value;
                 }
                 else
-                    updateScore(beatmapMaxCombo.Value);
+                {
+                    // This score is guaranteed to be an osu!lazer score.
+                    // The combo must be determined through the score's statistics, as both the beatmap's max combo and the difficulty calculator will provide osu!stable combo values.
+                    beatmapMaxCombo = Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r.AffectsCombo()).Select(r => score.Statistics.GetOrDefault(r)).Sum();
+                }
+
+                updateScore(beatmapMaxCombo);
             }
 
             private void updateScore(int beatmapMaxCombo)

From cd794eaa65ac483ce7f59d8a322b7e5890ba16fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 19:07:40 +0900
Subject: [PATCH 05026/10326] Add basic selection box with drag handles

---
 .../Editing/TestSceneBlueprintSelectBox.cs    |  39 +++
 .../Compose/Components/ComposeSelectionBox.cs | 308 ++++++++++++++++++
 .../Edit/Compose/Components/DragBox.cs        |   2 +-
 .../Compose/Components/SelectionHandler.cs    |  16 +-
 4 files changed, 349 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelectBox.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelectBox.cs
new file mode 100644
index 0000000000..dd44472c09
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelectBox.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.Screens.Edit.Compose.Components;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneComposeSelectBox : OsuTestScene
+    {
+        public TestSceneComposeSelectBox()
+        {
+            ComposeSelectionBox selectionBox = null;
+
+            AddStep("create box", () =>
+                Child = new Container
+                {
+                    Size = new Vector2(300),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        selectionBox = new ComposeSelectionBox
+                        {
+                            CanRotate = true,
+                            CanScaleX = true,
+                            CanScaleY = true
+                        }
+                    }
+                });
+
+            AddToggleStep("toggle rotation", state => selectionBox.CanRotate = state);
+            AddToggleStep("toggle x", state => selectionBox.CanScaleX = state);
+            AddToggleStep("toggle y", state => selectionBox.CanScaleY = state);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
new file mode 100644
index 0000000000..c7fc078b98
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
@@ -0,0 +1,308 @@
+// Copyright (c) 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.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class ComposeSelectionBox : CompositeDrawable
+    {
+        public Action<DragEvent> OnRotation;
+        public Action<DragEvent, Anchor> OnScaleX;
+        public Action<DragEvent, Anchor> OnScaleY;
+
+        private bool canRotate;
+
+        public bool CanRotate
+        {
+            get => canRotate;
+            set
+            {
+                canRotate = value;
+                recreate();
+            }
+        }
+
+        private bool canScaleX;
+
+        public bool CanScaleX
+        {
+            get => canScaleX;
+            set
+            {
+                canScaleX = value;
+                recreate();
+            }
+        }
+
+        private bool canScaleY;
+
+        public bool CanScaleY
+        {
+            get => canScaleY;
+            set
+            {
+                canScaleY = value;
+                recreate();
+            }
+        }
+
+        public const float BORDER_RADIUS = 3;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            recreate();
+        }
+
+        private void recreate()
+        {
+            if (LoadState < LoadState.Loading)
+                return;
+
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    Masking = true,
+                    BorderThickness = BORDER_RADIUS,
+                    BorderColour = colours.YellowDark,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+
+                            AlwaysPresent = true,
+                            Alpha = 0
+                        },
+                    }
+                },
+            };
+
+            if (CanRotate)
+            {
+                const float separation = 40;
+
+                AddRangeInternal(new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = colours.YellowLight,
+                        Blending = BlendingParameters.Additive,
+                        Alpha = 0.3f,
+                        Size = new Vector2(BORDER_RADIUS, separation),
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.BottomCentre,
+                    },
+                    new RotationDragHandle
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Y = -separation,
+                        HandleDrag = e => OnRotation?.Invoke(e)
+                    }
+                });
+            }
+
+            if (CanScaleY)
+            {
+                AddRangeInternal(new[]
+                {
+                    new DragHandle
+                    {
+                        Anchor = Anchor.TopCentre,
+                        HandleDrag = e => OnScaleY?.Invoke(e, Anchor.TopCentre)
+                    },
+                    new DragHandle
+                    {
+                        Anchor = Anchor.BottomCentre,
+                        HandleDrag = e => OnScaleY?.Invoke(e, Anchor.BottomCentre)
+                    },
+                });
+            }
+
+            if (CanScaleX)
+            {
+                AddRangeInternal(new[]
+                {
+                    new DragHandle
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        HandleDrag = e => OnScaleX?.Invoke(e, Anchor.CentreLeft)
+                    },
+                    new DragHandle
+                    {
+                        Anchor = Anchor.CentreRight,
+                        HandleDrag = e => OnScaleX?.Invoke(e, Anchor.CentreRight)
+                    },
+                });
+            }
+
+            if (CanScaleX && CanScaleY)
+            {
+                AddRangeInternal(new[]
+                {
+                    new DragHandle
+                    {
+                        Anchor = Anchor.TopLeft,
+                        HandleDrag = e =>
+                        {
+                            OnScaleX?.Invoke(e, Anchor.TopLeft);
+                            OnScaleY?.Invoke(e, Anchor.TopLeft);
+                        }
+                    },
+                    new DragHandle
+                    {
+                        Anchor = Anchor.TopRight,
+                        HandleDrag = e =>
+                        {
+                            OnScaleX?.Invoke(e, Anchor.TopRight);
+                            OnScaleY?.Invoke(e, Anchor.TopRight);
+                        }
+                    },
+                    new DragHandle
+                    {
+                        Anchor = Anchor.BottomLeft,
+                        HandleDrag = e =>
+                        {
+                            OnScaleX?.Invoke(e, Anchor.BottomLeft);
+                            OnScaleY?.Invoke(e, Anchor.BottomLeft);
+                        }
+                    },
+                    new DragHandle
+                    {
+                        Anchor = Anchor.BottomRight,
+                        HandleDrag = e =>
+                        {
+                            OnScaleX?.Invoke(e, Anchor.BottomRight);
+                            OnScaleY?.Invoke(e, Anchor.BottomRight);
+                        }
+                    },
+                });
+            }
+        }
+
+        private class RotationDragHandle : DragHandle
+        {
+            private SpriteIcon icon;
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Size *= 2;
+
+                AddInternal(icon = new SpriteIcon
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Size = new Vector2(0.5f),
+                    Icon = FontAwesome.Solid.Redo,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                });
+            }
+
+            protected override void UpdateHoverState()
+            {
+                base.UpdateHoverState();
+                icon.Colour = !HandlingMouse && IsHovered ? Color4.White : Color4.Black;
+            }
+        }
+
+        private class DragHandle : Container
+        {
+            public Action<DragEvent> HandleDrag { get; set; }
+
+            private Circle circle;
+
+            [Resolved]
+            private OsuColour colours { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Size = new Vector2(10);
+                Origin = Anchor.Centre;
+
+                InternalChildren = new Drawable[]
+                {
+                    circle = new Circle
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                UpdateHoverState();
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                UpdateHoverState();
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                base.OnHoverLost(e);
+                UpdateHoverState();
+            }
+
+            protected bool HandlingMouse;
+
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                HandlingMouse = true;
+                UpdateHoverState();
+                return true;
+            }
+
+            protected override bool OnDragStart(DragStartEvent e) => true;
+
+            protected override void OnDrag(DragEvent e)
+            {
+                HandleDrag?.Invoke(e);
+                base.OnDrag(e);
+            }
+
+            protected override void OnDragEnd(DragEndEvent e)
+            {
+                HandlingMouse = false;
+                UpdateHoverState();
+                base.OnDragEnd(e);
+            }
+
+            protected override void OnMouseUp(MouseUpEvent e)
+            {
+                HandlingMouse = false;
+                UpdateHoverState();
+                base.OnMouseUp(e);
+            }
+
+            protected virtual void UpdateHoverState()
+            {
+                circle.Colour = HandlingMouse ? colours.GrayF : (IsHovered ? colours.Red : colours.YellowDark);
+                this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, 100, Easing.OutQuint);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
index 0615ebfc20..0ec981203a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             Masking = true,
             BorderColour = Color4.White,
-            BorderThickness = SelectionHandler.BORDER_RADIUS,
+            BorderThickness = ComposeSelectionBox.BORDER_RADIUS,
             Child = new Box
             {
                 RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index a0220cf987..ef97403d02 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -32,8 +32,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public class SelectionHandler : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
     {
-        public const float BORDER_RADIUS = 2;
-
         public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
         private readonly List<SelectionBlueprint> selectedBlueprints;
 
@@ -69,19 +67,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 Children = new Drawable[]
                 {
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        BorderThickness = BORDER_RADIUS,
-                        BorderColour = colours.YellowDark,
-                        Child = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            AlwaysPresent = true,
-                            Alpha = 0
-                        }
-                    },
+                    new ComposeSelectionBox(),
                     new Container
                     {
                         Name = "info text",

From 265bba1a886db2e988bbed5a502597128badda1b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 19:19:48 +0900
Subject: [PATCH 05027/10326] Add test coverage of event handling

---
 .../Editing/TestSceneBlueprintSelectBox.cs    | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelectBox.cs
index dd44472c09..4b12000fc3 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelectBox.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
@@ -10,23 +11,29 @@ namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneComposeSelectBox : OsuTestScene
     {
+        private Container selectionArea;
+
         public TestSceneComposeSelectBox()
         {
             ComposeSelectionBox selectionBox = null;
 
             AddStep("create box", () =>
-                Child = new Container
+                Child = selectionArea = new Container
                 {
                     Size = new Vector2(300),
+                    Position = -new Vector2(150),
                     Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
                     Children = new Drawable[]
                     {
                         selectionBox = new ComposeSelectionBox
                         {
                             CanRotate = true,
                             CanScaleX = true,
-                            CanScaleY = true
+                            CanScaleY = true,
+
+                            OnRotation = handleRotation,
+                            OnScaleX = handleScaleX,
+                            OnScaleY = handleScaleY,
                         }
                     }
                 });
@@ -35,5 +42,26 @@ namespace osu.Game.Tests.Visual.Editing
             AddToggleStep("toggle x", state => selectionBox.CanScaleX = state);
             AddToggleStep("toggle y", state => selectionBox.CanScaleY = state);
         }
+
+        private void handleScaleY(DragEvent e, Anchor reference)
+        {
+            int direction = (reference & Anchor.y0) > 0 ? -1 : 1;
+            if (direction < 0)
+                selectionArea.Y += e.Delta.Y;
+            selectionArea.Height += direction * e.Delta.Y;
+        }
+
+        private void handleScaleX(DragEvent e, Anchor reference)
+        {
+            int direction = (reference & Anchor.x0) > 0 ? -1 : 1;
+            if (direction < 0)
+                selectionArea.X += e.Delta.X;
+            selectionArea.Width += direction * e.Delta.X;
+        }
+
+        private void handleRotation(DragEvent e)
+        {
+            selectionArea.Rotation += e.Delta.X;
+        }
     }
 }

From 0a10e40ce0091d40dcd0bc7e7cecebffe912ea49 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 19:43:50 +0900
Subject: [PATCH 05028/10326] Add scaling support to osu! editor

---
 .../Edit/OsuSelectionHandler.cs               | 97 ++++++++++++++++++-
 .../Compose/Components/SelectionHandler.cs    |  4 +-
 2 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 9418565907..e29536d6b2 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
@@ -10,7 +12,55 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuSelectionHandler : SelectionHandler
     {
-        public override bool HandleMovement(MoveSelectionEvent moveEvent)
+        public override ComposeSelectionBox CreateSelectionBox()
+            => new ComposeSelectionBox
+            {
+                CanRotate = true,
+                CanScaleX = true,
+                CanScaleY = true,
+
+                // OnRotation = handleRotation,
+                OnScaleX = handleScaleX,
+                OnScaleY = handleScaleY,
+            };
+
+        private void handleScaleY(DragEvent e, Anchor reference)
+        {
+            int direction = (reference & Anchor.y0) > 0 ? -1 : 1;
+
+            if (direction < 0)
+            {
+                // when resizing from a top drag handle, we want to move the selection first
+                if (!moveSelection(new Vector2(0, e.Delta.Y)))
+                    return;
+            }
+
+            scaleSelection(new Vector2(0, direction * e.Delta.Y));
+        }
+
+        private void handleScaleX(DragEvent e, Anchor reference)
+        {
+            int direction = (reference & Anchor.x0) > 0 ? -1 : 1;
+
+            if (direction < 0)
+            {
+                // when resizing from a top drag handle, we want to move the selection first
+                if (!moveSelection(new Vector2(e.Delta.X, 0)))
+                    return;
+            }
+
+            scaleSelection(new Vector2(direction * e.Delta.X, 0));
+        }
+
+        private void handleRotation(DragEvent e)
+        {
+            // selectionArea.Rotation += e.Delta.X;
+        }
+
+        public override bool HandleMovement(MoveSelectionEvent moveEvent) =>
+            moveSelection(moveEvent.InstantDelta);
+
+        private bool scaleSelection(Vector2 scale)
         {
             Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
             Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
@@ -25,8 +75,47 @@ namespace osu.Game.Rulesets.Osu.Edit
                 }
 
                 // Stacking is not considered
-                minPosition = Vector2.ComponentMin(minPosition, Vector2.ComponentMin(h.EndPosition + moveEvent.InstantDelta, h.Position + moveEvent.InstantDelta));
-                maxPosition = Vector2.ComponentMax(maxPosition, Vector2.ComponentMax(h.EndPosition + moveEvent.InstantDelta, h.Position + moveEvent.InstantDelta));
+                minPosition = Vector2.ComponentMin(minPosition, Vector2.ComponentMin(h.EndPosition, h.Position));
+                maxPosition = Vector2.ComponentMax(maxPosition, Vector2.ComponentMax(h.EndPosition, h.Position));
+            }
+
+            Vector2 size = maxPosition - minPosition;
+            Vector2 newSize = size + scale;
+
+            foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
+            {
+                if (h is Spinner)
+                {
+                    // Spinners don't support position adjustments
+                    continue;
+                }
+
+                if (scale.X != 1)
+                    h.Position = new Vector2(minPosition.X + (h.X - minPosition.X) / size.X * newSize.X, h.Y);
+                if (scale.Y != 1)
+                    h.Position = new Vector2(h.X, minPosition.Y + (h.Y - minPosition.Y) / size.Y * newSize.Y);
+            }
+
+            return true;
+        }
+
+        private bool moveSelection(Vector2 delta)
+        {
+            Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
+            Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
+
+            // Go through all hitobjects to make sure they would remain in the bounds of the editor after movement, before any movement is attempted
+            foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
+            {
+                if (h is Spinner)
+                {
+                    // Spinners don't support position adjustments
+                    continue;
+                }
+
+                // Stacking is not considered
+                minPosition = Vector2.ComponentMin(minPosition, Vector2.ComponentMin(h.EndPosition + delta, h.Position + delta));
+                maxPosition = Vector2.ComponentMax(maxPosition, Vector2.ComponentMax(h.EndPosition + delta, h.Position + delta));
             }
 
             if (minPosition.X < 0 || minPosition.Y < 0 || maxPosition.X > DrawWidth || maxPosition.Y > DrawHeight)
@@ -40,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                     continue;
                 }
 
-                h.Position += moveEvent.InstantDelta;
+                h.Position += delta;
             }
 
             return true;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index ef97403d02..39e413ef05 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 Children = new Drawable[]
                 {
-                    new ComposeSelectionBox(),
+                    CreateSelectionBox(),
                     new Container
                     {
                         Name = "info text",
@@ -91,6 +91,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
         }
 
+        public virtual ComposeSelectionBox CreateSelectionBox() => new ComposeSelectionBox();
+
         #region User Input Handling
 
         /// <summary>

From 33b24b6f46a6b9ffa596a443d5ddaf67aa40940e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 19:50:03 +0900
Subject: [PATCH 05029/10326] Refactor to be able to get a quad for the current
 selection

---
 .../Edit/OsuSelectionHandler.cs               | 69 ++++++++++++++-----
 1 file changed, 52 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index e29536d6b2..7f4ee54243 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.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.Linq;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -54,7 +56,6 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private void handleRotation(DragEvent e)
         {
-            // selectionArea.Rotation += e.Delta.X;
         }
 
         public override bool HandleMovement(MoveSelectionEvent moveEvent) =>
@@ -62,24 +63,11 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private bool scaleSelection(Vector2 scale)
         {
-            Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
-            Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
+            Quad quad = getSelectionQuad();
 
-            // Go through all hitobjects to make sure they would remain in the bounds of the editor after movement, before any movement is attempted
-            foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
-            {
-                if (h is Spinner)
-                {
-                    // Spinners don't support position adjustments
-                    continue;
-                }
+            Vector2 minPosition = quad.TopLeft;
 
-                // Stacking is not considered
-                minPosition = Vector2.ComponentMin(minPosition, Vector2.ComponentMin(h.EndPosition, h.Position));
-                maxPosition = Vector2.ComponentMax(maxPosition, Vector2.ComponentMax(h.EndPosition, h.Position));
-            }
-
-            Vector2 size = maxPosition - minPosition;
+            Vector2 size = quad.Size;
             Vector2 newSize = size + scale;
 
             foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
@@ -134,5 +122,52 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             return true;
         }
+
+        private Quad getSelectionQuad()
+        {
+            Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
+            Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
+
+            // Go through all hitobjects to make sure they would remain in the bounds of the editor after movement, before any movement is attempted
+            foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
+            {
+                if (h is Spinner)
+                {
+                    // Spinners don't support position adjustments
+                    continue;
+                }
+
+                // Stacking is not considered
+                minPosition = Vector2.ComponentMin(minPosition, Vector2.ComponentMin(h.EndPosition, h.Position));
+                maxPosition = Vector2.ComponentMax(maxPosition, Vector2.ComponentMax(h.EndPosition, h.Position));
+            }
+
+            Vector2 size = maxPosition - minPosition;
+
+            return new Quad(minPosition.X, minPosition.Y, size.X, size.Y);
+        }
+
+        /// <summary>
+        /// Returns rotated position from a given point.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        /// <param name="center">The center to rotate around.</param>
+        /// <param name="angle">The angle to rotate (in degrees).</param>
+        internal static Vector2 Rotate(Vector2 p, Vector2 center, int angle)
+        {
+            angle = -angle;
+
+            p.X -= center.X;
+            p.Y -= center.Y;
+
+            Vector2 ret;
+            ret.X = (float)(p.X * Math.Cos(angle / 180f * Math.PI) + p.Y * Math.Sin(angle / 180f * Math.PI));
+            ret.Y = (float)(p.X * -Math.Sin(angle / 180f * Math.PI) + p.Y * Math.Cos(angle / 180f * Math.PI));
+
+            ret.X += center.X;
+            ret.Y += center.Y;
+
+            return ret;
+        }
     }
 }

From 934db14e037cedb82666904b7f390df62b426f90 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 20:00:19 +0900
Subject: [PATCH 05030/10326] Add rotation support

---
 .../Edit/OsuSelectionHandler.cs               | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 7f4ee54243..84056a69c7 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
@@ -21,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                 CanScaleX = true,
                 CanScaleY = true,
 
-                // OnRotation = handleRotation,
+                OnRotation = handleRotation,
                 OnScaleX = handleScaleX,
                 OnScaleY = handleScaleY,
             };
@@ -54,13 +55,45 @@ namespace osu.Game.Rulesets.Osu.Edit
             scaleSelection(new Vector2(direction * e.Delta.X, 0));
         }
 
+        private Vector2? centre;
+
         private void handleRotation(DragEvent e)
         {
+            rotateSelection(e.Delta.X);
         }
 
         public override bool HandleMovement(MoveSelectionEvent moveEvent) =>
             moveSelection(moveEvent.InstantDelta);
 
+        private bool rotateSelection(in float delta)
+        {
+            Quad quad = getSelectionQuad();
+
+            if (!centre.HasValue)
+                centre = quad.Centre;
+
+            foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
+            {
+                if (h is Spinner)
+                {
+                    // Spinners don't support position adjustments
+                    continue;
+                }
+
+                h.Position = Rotate(h.Position, centre.Value, delta);
+
+                if (h is IHasPath path)
+                {
+                    foreach (var point in path.Path.ControlPoints)
+                    {
+                        point.Position.Value = Rotate(point.Position.Value, Vector2.Zero, delta);
+                    }
+                }
+            }
+
+            return true;
+        }
+
         private bool scaleSelection(Vector2 scale)
         {
             Quad quad = getSelectionQuad();
@@ -153,7 +186,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// <param name="p">The point.</param>
         /// <param name="center">The center to rotate around.</param>
         /// <param name="angle">The angle to rotate (in degrees).</param>
-        internal static Vector2 Rotate(Vector2 p, Vector2 center, int angle)
+        internal static Vector2 Rotate(Vector2 p, Vector2 center, float angle)
         {
             angle = -angle;
 

From a2e2cca396e2765221185f95644157afc0b51bd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 20:08:28 +0900
Subject: [PATCH 05031/10326] Add proper change handler support

---
 .../Edit/OsuSelectionHandler.cs               | 14 ++++
 .../Compose/Components/ComposeSelectionBox.cs | 64 ++++++++++++++++---
 2 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 84056a69c7..126fdf0932 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -22,11 +22,25 @@ namespace osu.Game.Rulesets.Osu.Edit
                 CanScaleX = true,
                 CanScaleY = true,
 
+                OperationStarted = onStart,
+                OperationEnded = onEnd,
+
                 OnRotation = handleRotation,
                 OnScaleX = handleScaleX,
                 OnScaleY = handleScaleY,
             };
 
+        private void onEnd()
+        {
+            ChangeHandler.EndChange();
+            centre = null;
+        }
+
+        private void onStart()
+        {
+            ChangeHandler.BeginChange();
+        }
+
         private void handleScaleY(DragEvent e, Anchor reference)
         {
             int direction = (reference & Anchor.y0) > 0 ? -1 : 1;
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
index c7fc078b98..dba1965569 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
@@ -20,6 +20,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public Action<DragEvent, Anchor> OnScaleX;
         public Action<DragEvent, Anchor> OnScaleY;
 
+        public Action OperationStarted;
+        public Action OperationEnded;
+
         private bool canRotate;
 
         public bool CanRotate
@@ -114,7 +117,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     {
                         Anchor = Anchor.TopCentre,
                         Y = -separation,
-                        HandleDrag = e => OnRotation?.Invoke(e)
+                        HandleDrag = e => OnRotation?.Invoke(e),
+                        OperationStarted = operationStarted,
+                        OperationEnded = operationEnded
                     }
                 });
             }
@@ -126,12 +131,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     new DragHandle
                     {
                         Anchor = Anchor.TopCentre,
-                        HandleDrag = e => OnScaleY?.Invoke(e, Anchor.TopCentre)
+                        HandleDrag = e => OnScaleY?.Invoke(e, Anchor.TopCentre),
+                        OperationStarted = operationStarted,
+                        OperationEnded = operationEnded
                     },
                     new DragHandle
                     {
                         Anchor = Anchor.BottomCentre,
-                        HandleDrag = e => OnScaleY?.Invoke(e, Anchor.BottomCentre)
+                        HandleDrag = e => OnScaleY?.Invoke(e, Anchor.BottomCentre),
+                        OperationStarted = operationStarted,
+                        OperationEnded = operationEnded
                     },
                 });
             }
@@ -143,12 +152,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     new DragHandle
                     {
                         Anchor = Anchor.CentreLeft,
-                        HandleDrag = e => OnScaleX?.Invoke(e, Anchor.CentreLeft)
+                        HandleDrag = e => OnScaleX?.Invoke(e, Anchor.CentreLeft),
+                        OperationStarted = operationStarted,
+                        OperationEnded = operationEnded
                     },
                     new DragHandle
                     {
                         Anchor = Anchor.CentreRight,
-                        HandleDrag = e => OnScaleX?.Invoke(e, Anchor.CentreRight)
+                        HandleDrag = e => OnScaleX?.Invoke(e, Anchor.CentreRight),
+                        OperationStarted = operationStarted,
+                        OperationEnded = operationEnded
                     },
                 });
             }
@@ -164,7 +177,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         {
                             OnScaleX?.Invoke(e, Anchor.TopLeft);
                             OnScaleY?.Invoke(e, Anchor.TopLeft);
-                        }
+                        },
+                        OperationStarted = operationStarted,
+                        OperationEnded = operationEnded
                     },
                     new DragHandle
                     {
@@ -173,7 +188,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         {
                             OnScaleX?.Invoke(e, Anchor.TopRight);
                             OnScaleY?.Invoke(e, Anchor.TopRight);
-                        }
+                        },
+                        OperationStarted = operationStarted,
+                        OperationEnded = operationEnded
                     },
                     new DragHandle
                     {
@@ -182,7 +199,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         {
                             OnScaleX?.Invoke(e, Anchor.BottomLeft);
                             OnScaleY?.Invoke(e, Anchor.BottomLeft);
-                        }
+                        },
+                        OperationStarted = operationStarted,
+                        OperationEnded = operationEnded
                     },
                     new DragHandle
                     {
@@ -191,12 +210,28 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         {
                             OnScaleX?.Invoke(e, Anchor.BottomRight);
                             OnScaleY?.Invoke(e, Anchor.BottomRight);
-                        }
+                        },
+                        OperationStarted = operationStarted,
+                        OperationEnded = operationEnded
                     },
                 });
             }
         }
 
+        private int activeOperations;
+
+        private void operationEnded()
+        {
+            if (--activeOperations == 0)
+                OperationEnded?.Invoke();
+        }
+
+        private void operationStarted()
+        {
+            if (activeOperations++ == 0)
+                OperationStarted?.Invoke();
+        }
+
         private class RotationDragHandle : DragHandle
         {
             private SpriteIcon icon;
@@ -225,6 +260,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private class DragHandle : Container
         {
+            public Action OperationStarted;
+            public Action OperationEnded;
+
             public Action<DragEvent> HandleDrag { get; set; }
 
             private Circle circle;
@@ -276,7 +314,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return true;
             }
 
-            protected override bool OnDragStart(DragStartEvent e) => true;
+            protected override bool OnDragStart(DragStartEvent e)
+            {
+                OperationStarted?.Invoke();
+                return true;
+            }
 
             protected override void OnDrag(DragEvent e)
             {
@@ -287,6 +329,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             protected override void OnDragEnd(DragEndEvent e)
             {
                 HandlingMouse = false;
+                OperationEnded?.Invoke();
+
                 UpdateHoverState();
                 base.OnDragEnd(e);
             }

From 5ae6b2cf5b0bea7c5f53fd3c84934a4b57492f34 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 20:10:17 +0900
Subject: [PATCH 05032/10326] Fix syntax

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 126fdf0932..505b84e699 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -83,8 +83,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             Quad quad = getSelectionQuad();
 
-            if (!centre.HasValue)
-                centre = quad.Centre;
+            centre ??= quad.Centre;
 
             foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
             {

From f93c72dd920a2d239919380bb954dfa2cfdd4cb7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Sep 2020 20:21:13 +0900
Subject: [PATCH 05033/10326] Fix non-matching filename

---
 ...estSceneBlueprintSelectBox.cs => TestSceneComposeSelectBox.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Tests/Visual/Editing/{TestSceneBlueprintSelectBox.cs => TestSceneComposeSelectBox.cs} (100%)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
similarity index 100%
rename from osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelectBox.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs

From 42f666cd24456ac823736fb2a6f5a876c092e735 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Tue, 29 Sep 2020 23:04:03 +0930
Subject: [PATCH 05034/10326] Set icon for SDL desktop window

---
 osu.Desktop/OsuGameDesktop.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 2079f136d2..659730630a 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -138,6 +138,7 @@ namespace osu.Desktop
                 // SDL2 DesktopWindow
                 case DesktopWindow desktopWindow:
                     desktopWindow.CursorState.Value |= CursorState.Hidden;
+                    desktopWindow.SetIconFromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
                     desktopWindow.Title = Name;
                     desktopWindow.DragDrop += f => fileDrop(new[] { f });
                     break;

From 35f7de2084ada88bbe7c25de3e36d4e4266c521c Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 28 Sep 2020 19:05:22 +0200
Subject: [PATCH 05035/10326] Apply review suggestions.

---
 osu.Game/Scoring/ScorePerformanceManager.cs         |  3 ---
 .../Ranking/Expanded/Statistics/CounterStatistic.cs |  2 +-
 .../Expanded/Statistics/PerformanceStatistic.cs     | 13 ++++++++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index 0a57ccbd1f..a27e38fb07 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -27,9 +27,6 @@ namespace osu.Game.Scoring
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
         public async Task<double> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default)
         {
-            if (score.PP.HasValue)
-                return score.PP.Value;
-
             if (tryGetExisting(score, out var perf, out var lookupKey))
                 return perf;
 
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index 1f8deb4d59..368075b13b 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
     {
         private readonly int count;
 
-        protected RollingCounter<int> Counter;
+        protected RollingCounter<int> Counter { get; private set; }
 
         /// <summary>
         /// Creates a new <see cref="CounterStatistic"/>.
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index 6c2ad5844b..7e342a33f1 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -25,8 +25,15 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         [BackgroundDependencyLoader]
         private void load(ScorePerformanceManager performanceManager)
         {
-            performanceManager.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
-                              .ContinueWith(t => Schedule(() => performance.Value = (int)t.Result), cancellationTokenSource.Token);
+            if (score.PP.HasValue)
+            {
+                performance.Value = (int)score.PP.Value;
+            }
+            else
+            {
+                performanceManager.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
+                                  .ContinueWith(t => Schedule(() => performance.Value = (int)t.Result), cancellationTokenSource.Token);
+            }
         }
 
         public override void Appear()
@@ -37,7 +44,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
 
         protected override void Dispose(bool isDisposing)
         {
-            cancellationTokenSource.Cancel();
+            cancellationTokenSource?.Cancel();
             base.Dispose(isDisposing);
         }
     }

From 2766cf73b492ea751723b387399a40c4b6e20bc3 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 29 Sep 2020 18:32:02 +0200
Subject: [PATCH 05036/10326] Reuse BeatmapDifficultyManager cache for beatmap
 difficulty attributes.

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs           |  2 +-
 .../Difficulty/CatchPerformanceCalculator.cs      |  4 ++--
 .../Difficulty/ManiaPerformanceCalculator.cs      |  4 ++--
 osu.Game.Rulesets.Mania/ManiaRuleset.cs           |  2 +-
 .../Difficulty/OsuPerformanceCalculator.cs        |  4 ++--
 osu.Game.Rulesets.Osu/OsuRuleset.cs               |  2 +-
 .../Difficulty/TaikoPerformanceCalculator.cs      |  4 ++--
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs           |  2 +-
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs     |  9 ++++++---
 .../Rulesets/Difficulty/PerformanceCalculator.cs  |  4 ++--
 osu.Game/Rulesets/Ruleset.cs                      |  2 +-
 osu.Game/Scoring/ScorePerformanceManager.cs       | 15 ++++++++-------
 12 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index ca75a816f1..1a9a79f6ff 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Catch
 
         public override ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => new CatchLegacySkinTransformer(source);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new CatchPerformanceCalculator(this, beatmap, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score, DifficultyAttributes attributes = null) => new CatchPerformanceCalculator(this, beatmap, score);
 
         public int LegacyID => 2;
 
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
index d700f79e5b..33c807333f 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
@@ -25,8 +25,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         private int tinyTicksMissed;
         private int misses;
 
-        public CatchPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
-            : base(ruleset, beatmap, score)
+        public CatchPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score, DifficultyAttributes attributes = null)
+            : base(ruleset, beatmap, score, attributes)
         {
         }
 
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
index 91383c5548..5a32509b8d 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
@@ -29,8 +29,8 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         private int countMeh;
         private int countMiss;
 
-        public ManiaPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
-            : base(ruleset, beatmap, score)
+        public ManiaPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score, DifficultyAttributes attributes)
+            : base(ruleset, beatmap, score, attributes)
         {
         }
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 71ac85dd1b..93390c1f0a 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mania
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new ManiaBeatmapConverter(beatmap, this);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new ManiaPerformanceCalculator(this, beatmap, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score, DifficultyAttributes attributes = null) => new ManiaPerformanceCalculator(this, beatmap, score, attributes);
 
         public const string SHORT_NAME = "mania";
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 6f4c0f9cfa..e3faa55d9e 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -31,8 +31,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         private int countMeh;
         private int countMiss;
 
-        public OsuPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
-            : base(ruleset, beatmap, score)
+        public OsuPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score, DifficultyAttributes attributes)
+            : base(ruleset, beatmap, score, attributes)
         {
             countHitCircles = Beatmap.HitObjects.Count(h => h is HitCircle);
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 7f4a0dcbbb..452491361a 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new OsuDifficultyCalculator(this, beatmap);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new OsuPerformanceCalculator(this, beatmap, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score, DifficultyAttributes attributes = null) => new OsuPerformanceCalculator(this, beatmap, score, attributes);
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
index b9d95a6ba6..26840d72f1 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
@@ -24,8 +24,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         private int countMeh;
         private int countMiss;
 
-        public TaikoPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
-            : base(ruleset, beatmap, score)
+        public TaikoPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score, DifficultyAttributes attributes = null)
+            : base(ruleset, beatmap, score, attributes)
         {
         }
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 9d485e3f20..093084805d 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Taiko
 
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new TaikoDifficultyCalculator(this, beatmap);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new TaikoPerformanceCalculator(this, beatmap, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score, DifficultyAttributes attributes = null) => new TaikoPerformanceCalculator(this, beatmap, score, attributes);
 
         public int LegacyID => 1;
 
diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index e9d26683c3..ee85908aa2 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Lists;
 using osu.Framework.Threading;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Beatmaps
@@ -207,7 +208,7 @@ namespace osu.Game.Beatmaps
                 var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(beatmapInfo));
                 var attributes = calculator.Calculate(key.Mods);
 
-                return difficultyCache[key] = new StarDifficulty(attributes.StarRating, attributes.MaxCombo);
+                return difficultyCache[key] = new StarDifficulty(attributes.StarRating, attributes.MaxCombo, attributes);
             }
             catch
             {
@@ -300,11 +301,13 @@ namespace osu.Game.Beatmaps
         public readonly double Stars;
         public readonly int MaxCombo;
 
-        public StarDifficulty(double stars, int maxCombo)
+        public readonly DifficultyAttributes Attributes;
+
+        public StarDifficulty(double stars, int maxCombo, DifficultyAttributes attributes = null)
         {
             Stars = stars;
             MaxCombo = maxCombo;
-
+            Attributes = attributes;
             // Todo: Add more members (BeatmapInfo.DifficultyRating? Attributes? Etc...)
         }
     }
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs
index ac3b817840..fc1d232a00 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs
@@ -21,14 +21,14 @@ namespace osu.Game.Rulesets.Difficulty
 
         protected double TimeRate { get; private set; } = 1;
 
-        protected PerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
+        protected PerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score, DifficultyAttributes attributes = null)
         {
             Ruleset = ruleset;
             Score = score;
 
             Beatmap = beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods);
 
-            Attributes = ruleset.CreateDifficultyCalculator(beatmap).Calculate(score.Mods);
+            Attributes = attributes ?? ruleset.CreateDifficultyCalculator(beatmap).Calculate(score.Mods);
 
             ApplyMods(score.Mods);
         }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 915544d010..a8f62bca4a 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Rulesets
 
         public abstract DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap);
 
-        public virtual PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => null;
+        public virtual PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score, DifficultyAttributes attributes = null) => null;
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index a27e38fb07..97b4be7edc 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -20,6 +20,9 @@ namespace osu.Game.Scoring
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        [Resolved]
+        private BeatmapDifficultyManager difficultyManager { get; set; }
+
         /// <summary>
         /// Calculates performance for the given <see cref="ScoreInfo"/>.
         /// </summary>
@@ -30,10 +33,7 @@ namespace osu.Game.Scoring
             if (tryGetExisting(score, out var perf, out var lookupKey))
                 return perf;
 
-            return await Task.Factory.StartNew(() =>
-            {
-                return computePerformance(score, lookupKey, token);
-            }, token);
+            return await computePerformanceAsync(score, lookupKey, token);
         }
 
         private bool tryGetExisting(ScoreInfo score, out double performance, out PerformanceCacheLookup lookupKey)
@@ -43,14 +43,15 @@ namespace osu.Game.Scoring
             return performanceCache.TryGetValue(lookupKey, out performance);
         }
 
-        private double computePerformance(ScoreInfo score, PerformanceCacheLookup lookupKey, CancellationToken token = default)
+        private async Task<double> computePerformanceAsync(ScoreInfo score, PerformanceCacheLookup lookupKey, CancellationToken token = default)
         {
             var beatmap = beatmapManager.GetWorkingBeatmap(score.Beatmap);
+            var attributes = await difficultyManager.GetDifficultyAsync(score.Beatmap, score.Ruleset, score.Mods, token);
 
             if (token.IsCancellationRequested)
                 return default;
 
-            var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(beatmap, score);
+            var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(beatmap, score, attributes.Attributes);
             var total = calculator.Calculate();
 
             performanceCache[lookupKey] = total;
@@ -74,7 +75,7 @@ namespace osu.Game.Scoring
                 TotalScore = info.TotalScore;
                 Combo = info.Combo;
                 Mods = info.Mods;
-                RulesetId = info.Ruleset.ID.Value;
+                RulesetId = info.Ruleset.ID ?? 0;
             }
 
             public override int GetHashCode()

From 1386c9fe668e13c89259c44d92e704503eff0e64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 12:45:43 +0900
Subject: [PATCH 05037/10326] Standardise time display formats across the
 editor

---
 .../Extensions/EditorDisplayExtensions.cs     | 26 +++++++++++++++++++
 .../Edit/Components/TimeInfoContainer.cs      |  6 ++---
 .../Screens/Edit/Timing/ControlPointTable.cs  |  3 ++-
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Extensions/EditorDisplayExtensions.cs

diff --git a/osu.Game/Extensions/EditorDisplayExtensions.cs b/osu.Game/Extensions/EditorDisplayExtensions.cs
new file mode 100644
index 0000000000..f749b88b46
--- /dev/null
+++ b/osu.Game/Extensions/EditorDisplayExtensions.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 System;
+
+namespace osu.Game.Extensions
+{
+    public static class EditorDisplayExtensions
+    {
+        /// <summary>
+        /// Get an editor formatted string (mm:ss:mss)
+        /// </summary>
+        /// <param name="milliseconds">A time value in milliseconds.</param>
+        /// <returns>An editor formatted display string.</returns>
+        public static string ToEditorFormattedString(this double milliseconds) =>
+            ToEditorFormattedString(TimeSpan.FromMilliseconds(milliseconds));
+
+        /// <summary>
+        /// Get an editor formatted string (mm:ss:mss)
+        /// </summary>
+        /// <param name="timeSpan">A time value.</param>
+        /// <returns>An editor formatted display string.</returns>
+        public static string ToEditorFormattedString(this TimeSpan timeSpan) =>
+            $"{(timeSpan < TimeSpan.Zero ? "-" : string.Empty)}{timeSpan:mm\\:ss\\:fff}";
+    }
+}
diff --git a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
index c68eeeb4f9..0a8c339559 100644
--- a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
+++ b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
@@ -3,8 +3,8 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
-using System;
 using osu.Framework.Allocation;
+using osu.Game.Extensions;
 using osu.Game.Graphics;
 
 namespace osu.Game.Screens.Edit.Components
@@ -35,9 +35,7 @@ namespace osu.Game.Screens.Edit.Components
         protected override void Update()
         {
             base.Update();
-
-            var timespan = TimeSpan.FromMilliseconds(editorClock.CurrentTime);
-            trackTimer.Text = $"{(timespan < TimeSpan.Zero ? "-" : string.Empty)}{timespan:mm\\:ss\\:fff}";
+            trackTimer.Text = editorClock.CurrentTime.ToEditorFormattedString();
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index c0c0bcead2..87af4546f1 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -89,7 +90,7 @@ namespace osu.Game.Screens.Edit.Timing
             },
             new OsuSpriteText
             {
-                Text = $"{group.Time:n0}ms",
+                Text = group.Time.ToEditorFormattedString(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
             },
             new ControlGroupAttributes(group),

From 99a3801267d7e45daea36638c695d146385c7072 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 13:02:05 +0900
Subject: [PATCH 05038/10326] Tidy up scale/rotation operation code

---
 .../Edit/OsuSelectionHandler.cs               | 64 ++++++++-----------
 1 file changed, 28 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 505b84e699..c7be921a4e 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -22,24 +23,25 @@ namespace osu.Game.Rulesets.Osu.Edit
                 CanScaleX = true,
                 CanScaleY = true,
 
-                OperationStarted = onStart,
-                OperationEnded = onEnd,
+                OperationStarted = () => ChangeHandler.BeginChange(),
+                OperationEnded = () =>
+                {
+                    ChangeHandler.EndChange();
+                    referenceOrigin = null;
+                },
 
-                OnRotation = handleRotation,
+                OnRotation = e => rotateSelection(e.Delta.X),
                 OnScaleX = handleScaleX,
                 OnScaleY = handleScaleY,
             };
 
-        private void onEnd()
-        {
-            ChangeHandler.EndChange();
-            centre = null;
-        }
+        public override bool HandleMovement(MoveSelectionEvent moveEvent) =>
+            moveSelection(moveEvent.InstantDelta);
 
-        private void onStart()
-        {
-            ChangeHandler.BeginChange();
-        }
+        /// <summary>
+        /// During a transform, the initial origin is stored so it can be used throughout the operation.
+        /// </summary>
+        private Vector2? referenceOrigin;
 
         private void handleScaleY(DragEvent e, Anchor reference)
         {
@@ -61,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             if (direction < 0)
             {
-                // when resizing from a top drag handle, we want to move the selection first
+                // when resizing from a left drag handle, we want to move the selection first
                 if (!moveSelection(new Vector2(e.Delta.X, 0)))
                     return;
             }
@@ -69,21 +71,11 @@ namespace osu.Game.Rulesets.Osu.Edit
             scaleSelection(new Vector2(direction * e.Delta.X, 0));
         }
 
-        private Vector2? centre;
-
-        private void handleRotation(DragEvent e)
-        {
-            rotateSelection(e.Delta.X);
-        }
-
-        public override bool HandleMovement(MoveSelectionEvent moveEvent) =>
-            moveSelection(moveEvent.InstantDelta);
-
         private bool rotateSelection(in float delta)
         {
             Quad quad = getSelectionQuad();
 
-            centre ??= quad.Centre;
+            referenceOrigin ??= quad.Centre;
 
             foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
             {
@@ -93,13 +85,13 @@ namespace osu.Game.Rulesets.Osu.Edit
                     continue;
                 }
 
-                h.Position = Rotate(h.Position, centre.Value, delta);
+                h.Position = rotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
 
                 if (h is IHasPath path)
                 {
                     foreach (var point in path.Path.ControlPoints)
                     {
-                        point.Position.Value = Rotate(point.Position.Value, Vector2.Zero, delta);
+                        point.Position.Value = rotatePointAroundOrigin(point.Position.Value, Vector2.Zero, delta);
                     }
                 }
             }
@@ -194,24 +186,24 @@ namespace osu.Game.Rulesets.Osu.Edit
         }
 
         /// <summary>
-        /// Returns rotated position from a given point.
+        /// Rotate a point around an arbitrary origin.
         /// </summary>
-        /// <param name="p">The point.</param>
-        /// <param name="center">The center to rotate around.</param>
+        /// <param name="point">The point.</param>
+        /// <param name="origin">The centre origin to rotate around.</param>
         /// <param name="angle">The angle to rotate (in degrees).</param>
-        internal static Vector2 Rotate(Vector2 p, Vector2 center, float angle)
+        private static Vector2 rotatePointAroundOrigin(Vector2 point, Vector2 origin, float angle)
         {
             angle = -angle;
 
-            p.X -= center.X;
-            p.Y -= center.Y;
+            point.X -= origin.X;
+            point.Y -= origin.Y;
 
             Vector2 ret;
-            ret.X = (float)(p.X * Math.Cos(angle / 180f * Math.PI) + p.Y * Math.Sin(angle / 180f * Math.PI));
-            ret.Y = (float)(p.X * -Math.Sin(angle / 180f * Math.PI) + p.Y * Math.Cos(angle / 180f * Math.PI));
+            ret.X = (float)(point.X * Math.Cos(MathUtils.DegreesToRadians(angle)) + point.Y * Math.Sin(angle / 180f * Math.PI));
+            ret.Y = (float)(point.X * -Math.Sin(MathUtils.DegreesToRadians(angle)) + point.Y * Math.Cos(angle / 180f * Math.PI));
 
-            ret.X += center.X;
-            ret.Y += center.Y;
+            ret.X += origin.X;
+            ret.Y += origin.Y;
 
             return ret;
         }

From f2c26c0927c1cc7dfc5d55b74218be066eead32b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 13:07:24 +0900
Subject: [PATCH 05039/10326] Move information text underneath the selection
 box

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 39e413ef05..afaa5b0f3d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 Children = new Drawable[]
                 {
-                    CreateSelectionBox(),
+                    // todo: should maybe be inside the SelectionBox?
                     new Container
                     {
                         Name = "info text",
@@ -86,7 +86,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
                                 Font = OsuFont.Default.With(size: 11)
                             }
                         }
-                    }
+                    },
+                    CreateSelectionBox(),
                 }
             };
         }

From 39b55a85df11a2dc36257990d176245ebb9d2500 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 13:52:57 +0900
Subject: [PATCH 05040/10326] Move a lot of the implementation to base
 SelectionHandler

---
 .../Edit/OsuSelectionHandler.cs               | 56 +++++++++-------
 .../Compose/Components/SelectionHandler.cs    | 67 ++++++++++++++++++-
 2 files changed, 94 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index c7be921a4e..a2642bda83 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -5,7 +5,6 @@ using System;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
-using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
@@ -16,24 +15,22 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuSelectionHandler : SelectionHandler
     {
-        public override ComposeSelectionBox CreateSelectionBox()
-            => new ComposeSelectionBox
-            {
-                CanRotate = true,
-                CanScaleX = true,
-                CanScaleY = true,
+        protected override void OnSelectionChanged()
+        {
+            base.OnSelectionChanged();
 
-                OperationStarted = () => ChangeHandler.BeginChange(),
-                OperationEnded = () =>
-                {
-                    ChangeHandler.EndChange();
-                    referenceOrigin = null;
-                },
+            bool canOperate = SelectedHitObjects.Count() > 1 || SelectedHitObjects.Any(s => s is Slider);
 
-                OnRotation = e => rotateSelection(e.Delta.X),
-                OnScaleX = handleScaleX,
-                OnScaleY = handleScaleY,
-            };
+            SelectionBox.CanRotate = canOperate;
+            SelectionBox.CanScaleX = canOperate;
+            SelectionBox.CanScaleY = canOperate;
+        }
+
+        protected override void OnDragOperationEnded()
+        {
+            base.OnDragOperationEnded();
+            referenceOrigin = null;
+        }
 
         public override bool HandleMovement(MoveSelectionEvent moveEvent) =>
             moveSelection(moveEvent.InstantDelta);
@@ -43,35 +40,35 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </summary>
         private Vector2? referenceOrigin;
 
-        private void handleScaleY(DragEvent e, Anchor reference)
+        public override bool HandleScaleY(in float scale, Anchor reference)
         {
             int direction = (reference & Anchor.y0) > 0 ? -1 : 1;
 
             if (direction < 0)
             {
                 // when resizing from a top drag handle, we want to move the selection first
-                if (!moveSelection(new Vector2(0, e.Delta.Y)))
-                    return;
+                if (!moveSelection(new Vector2(0, scale)))
+                    return false;
             }
 
-            scaleSelection(new Vector2(0, direction * e.Delta.Y));
+            return scaleSelection(new Vector2(0, direction * scale));
         }
 
-        private void handleScaleX(DragEvent e, Anchor reference)
+        public override bool HandleScaleX(in float scale, Anchor reference)
         {
             int direction = (reference & Anchor.x0) > 0 ? -1 : 1;
 
             if (direction < 0)
             {
                 // when resizing from a left drag handle, we want to move the selection first
-                if (!moveSelection(new Vector2(e.Delta.X, 0)))
-                    return;
+                if (!moveSelection(new Vector2(scale, 0)))
+                    return false;
             }
 
-            scaleSelection(new Vector2(direction * e.Delta.X, 0));
+            return scaleSelection(new Vector2(direction * scale, 0));
         }
 
-        private bool rotateSelection(in float delta)
+        public override bool HandleRotation(float delta)
         {
             Quad quad = getSelectionQuad();
 
@@ -96,6 +93,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                 }
             }
 
+            // todo: not always
             return true;
         }
 
@@ -161,8 +159,14 @@ namespace osu.Game.Rulesets.Osu.Edit
             return true;
         }
 
+        /// <summary>
+        /// Returns a gamefield-space quad surrounding the current selection.
+        /// </summary>
         private Quad getSelectionQuad()
         {
+            if (!SelectedHitObjects.Any())
+                return new Quad();
+
             Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
             Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index afaa5b0f3d..6cd503b580 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -43,6 +43,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private OsuSpriteText selectionDetailsText;
 
+        protected ComposeSelectionBox SelectionBox { get; private set; }
+
         [Resolved(CanBeNull = true)]
         protected EditorBeatmap EditorBeatmap { get; private set; }
 
@@ -87,12 +89,37 @@ namespace osu.Game.Screens.Edit.Compose.Components
                             }
                         }
                     },
-                    CreateSelectionBox(),
+                    SelectionBox = CreateSelectionBox(),
                 }
             };
         }
 
-        public virtual ComposeSelectionBox CreateSelectionBox() => new ComposeSelectionBox();
+        public ComposeSelectionBox CreateSelectionBox()
+            => new ComposeSelectionBox
+            {
+                OperationStarted = OnDragOperationBegan,
+                OperationEnded = OnDragOperationEnded,
+
+                OnRotation = e => HandleRotation(e.Delta.X),
+                OnScaleX = (e, anchor) => HandleScaleX(e.Delta.X, anchor),
+                OnScaleY = (e, anchor) => HandleScaleY(e.Delta.Y, anchor),
+            };
+
+        /// <summary>
+        /// Fired when a drag operation ends from the selection box.
+        /// </summary>
+        protected virtual void OnDragOperationBegan()
+        {
+            ChangeHandler.BeginChange();
+        }
+
+        /// <summary>
+        /// Fired when a drag operation begins from the selection box.
+        /// </summary>
+        protected virtual void OnDragOperationEnded()
+        {
+            ChangeHandler.EndChange();
+        }
 
         #region User Input Handling
 
@@ -108,7 +135,30 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Whether any <see cref="DrawableHitObject"/>s could be moved.
         /// Returning true will also propagate StartTime changes provided by the closest <see cref="IPositionSnapProvider.SnapScreenSpacePositionToValidTime"/>.
         /// </returns>
-        public virtual bool HandleMovement(MoveSelectionEvent moveEvent) => true;
+        public virtual bool HandleMovement(MoveSelectionEvent moveEvent) => false;
+
+        /// <summary>
+        /// Handles the selected <see cref="DrawableHitObject"/>s being rotated.
+        /// </summary>
+        /// <param name="angle">The delta angle to apply to the selection.</param>
+        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be moved.</returns>
+        public virtual bool HandleRotation(float angle) => false;
+
+        /// <summary>
+        /// Handles the selected <see cref="DrawableHitObject"/>s being scaled in a vertical direction.
+        /// </summary>
+        /// <param name="scale">The delta scale to apply.</param>
+        /// <param name="anchor">The point of reference where the scale is originating from.</param>
+        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be moved.</returns>
+        public virtual bool HandleScaleY(in float scale, Anchor anchor) => false;
+
+        /// <summary>
+        /// Handles the selected <see cref="DrawableHitObject"/>s being scaled in a horizontal direction.
+        /// </summary>
+        /// <param name="scale">The delta scale to apply.</param>
+        /// <param name="anchor">The point of reference where the scale is originating from.</param>
+        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be moved.</returns>
+        public virtual bool HandleScaleX(in float scale, Anchor anchor) => false;
 
         public bool OnPressed(PlatformAction action)
         {
@@ -211,11 +261,22 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
 
             if (count > 0)
+            {
                 Show();
+                OnSelectionChanged();
+            }
             else
                 Hide();
         }
 
+        /// <summary>
+        /// Triggered whenever more than one object is selected, on each change.
+        /// Should update the selection box's state to match supported operations.
+        /// </summary>
+        protected virtual void OnSelectionChanged()
+        {
+        }
+
         protected override void Update()
         {
             base.Update();

From 313b0d149fa8d5da93dade143312f8d0d437d0f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 14:41:32 +0900
Subject: [PATCH 05041/10326] Refactor scale and rotation operations to share
 code better

Also adds support for scaling individual sliders.
---
 .../Edit/OsuSelectionHandler.cs               | 160 ++++++++----------
 1 file changed, 69 insertions(+), 91 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index a2642bda83..706c41c2e3 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
@@ -40,84 +41,70 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </summary>
         private Vector2? referenceOrigin;
 
-        public override bool HandleScaleY(in float scale, Anchor reference)
-        {
-            int direction = (reference & Anchor.y0) > 0 ? -1 : 1;
+        public override bool HandleScaleY(in float scale, Anchor reference) =>
+            scaleSelection(new Vector2(0, ((reference & Anchor.y0) > 0 ? -1 : 1) * scale), reference);
 
-            if (direction < 0)
-            {
-                // when resizing from a top drag handle, we want to move the selection first
-                if (!moveSelection(new Vector2(0, scale)))
-                    return false;
-            }
-
-            return scaleSelection(new Vector2(0, direction * scale));
-        }
-
-        public override bool HandleScaleX(in float scale, Anchor reference)
-        {
-            int direction = (reference & Anchor.x0) > 0 ? -1 : 1;
-
-            if (direction < 0)
-            {
-                // when resizing from a left drag handle, we want to move the selection first
-                if (!moveSelection(new Vector2(scale, 0)))
-                    return false;
-            }
-
-            return scaleSelection(new Vector2(direction * scale, 0));
-        }
+        public override bool HandleScaleX(in float scale, Anchor reference) =>
+            scaleSelection(new Vector2(((reference & Anchor.x0) > 0 ? -1 : 1) * scale, 0), reference);
 
         public override bool HandleRotation(float delta)
         {
-            Quad quad = getSelectionQuad();
+            var hitObjects = selectedMovableObjects;
+
+            Quad quad = getSurroundingQuad(hitObjects);
 
             referenceOrigin ??= quad.Centre;
 
-            foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
+            foreach (var h in hitObjects)
             {
-                if (h is Spinner)
-                {
-                    // Spinners don't support position adjustments
-                    continue;
-                }
-
                 h.Position = rotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
 
                 if (h is IHasPath path)
                 {
                     foreach (var point in path.Path.ControlPoints)
-                    {
                         point.Position.Value = rotatePointAroundOrigin(point.Position.Value, Vector2.Zero, delta);
-                    }
                 }
             }
 
-            // todo: not always
+            // this isn't always the case but let's be lenient for now.
             return true;
         }
 
-        private bool scaleSelection(Vector2 scale)
+        private bool scaleSelection(Vector2 scale, Anchor reference)
         {
-            Quad quad = getSelectionQuad();
+            var hitObjects = selectedMovableObjects;
 
-            Vector2 minPosition = quad.TopLeft;
-
-            Vector2 size = quad.Size;
-            Vector2 newSize = size + scale;
-
-            foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
+            // for the time being, allow resizing of slider paths only if the slider is
+            // the only hit object selected. with a group selection, it's likely the user
+            // is not looking to change the duration of the slider but expand the whole pattern.
+            if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
             {
-                if (h is Spinner)
-                {
-                    // Spinners don't support position adjustments
-                    continue;
-                }
+                var quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+                Vector2 delta = Vector2.One + new Vector2(scale.X / quad.Width, scale.Y / quad.Height);
 
-                if (scale.X != 1)
-                    h.Position = new Vector2(minPosition.X + (h.X - minPosition.X) / size.X * newSize.X, h.Y);
-                if (scale.Y != 1)
-                    h.Position = new Vector2(h.X, minPosition.Y + (h.Y - minPosition.Y) / size.Y * newSize.Y);
+                foreach (var point in slider.Path.ControlPoints)
+                    point.Position.Value *= delta;
+            }
+            else
+            {
+                // move the selection before scaling if dragging from top or left anchors.
+                if ((reference & Anchor.x0) > 0 && !moveSelection(new Vector2(-scale.X, 0))) return false;
+                if ((reference & Anchor.y0) > 0 && !moveSelection(new Vector2(0, -scale.Y))) return false;
+
+                Quad quad = getSurroundingQuad(hitObjects);
+
+                Vector2 minPosition = quad.TopLeft;
+
+                Vector2 size = quad.Size;
+                Vector2 newSize = size + scale;
+
+                foreach (var h in hitObjects)
+                {
+                    if (scale.X != 1)
+                        h.Position = new Vector2(minPosition.X + (h.X - minPosition.X) / size.X * newSize.X, h.Y);
+                    if (scale.Y != 1)
+                        h.Position = new Vector2(h.X, minPosition.Y + (h.Y - minPosition.Y) / size.Y * newSize.Y);
+                }
             }
 
             return true;
@@ -125,44 +112,34 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private bool moveSelection(Vector2 delta)
         {
-            Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
-            Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
+            var hitObjects = selectedMovableObjects;
 
-            // Go through all hitobjects to make sure they would remain in the bounds of the editor after movement, before any movement is attempted
-            foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
-            {
-                if (h is Spinner)
-                {
-                    // Spinners don't support position adjustments
-                    continue;
-                }
+            Quad quad = getSurroundingQuad(hitObjects);
 
-                // Stacking is not considered
-                minPosition = Vector2.ComponentMin(minPosition, Vector2.ComponentMin(h.EndPosition + delta, h.Position + delta));
-                maxPosition = Vector2.ComponentMax(maxPosition, Vector2.ComponentMax(h.EndPosition + delta, h.Position + delta));
-            }
-
-            if (minPosition.X < 0 || minPosition.Y < 0 || maxPosition.X > DrawWidth || maxPosition.Y > DrawHeight)
+            if (quad.TopLeft.X + delta.X < 0 ||
+                quad.TopLeft.Y + delta.Y < 0 ||
+                quad.BottomRight.X + delta.X > DrawWidth ||
+                quad.BottomRight.Y + delta.Y > DrawHeight)
                 return false;
 
-            foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
-            {
-                if (h is Spinner)
-                {
-                    // Spinners don't support position adjustments
-                    continue;
-                }
-
+            foreach (var h in hitObjects)
                 h.Position += delta;
-            }
 
             return true;
         }
 
         /// <summary>
-        /// Returns a gamefield-space quad surrounding the current selection.
+        /// Returns a gamefield-space quad surrounding the provided hit objects.
         /// </summary>
-        private Quad getSelectionQuad()
+        /// <param name="hitObjects">The hit objects to calculate a quad for.</param>
+        private Quad getSurroundingQuad(OsuHitObject[] hitObjects) =>
+            getSurroundingQuad(hitObjects.SelectMany(h => new[] { h.Position, h.EndPosition }));
+
+        /// <summary>
+        /// Returns a gamefield-space quad surrounding the provided points.
+        /// </summary>
+        /// <param name="points">The points to calculate a quad for.</param>
+        private Quad getSurroundingQuad(IEnumerable<Vector2> points)
         {
             if (!SelectedHitObjects.Any())
                 return new Quad();
@@ -171,17 +148,10 @@ namespace osu.Game.Rulesets.Osu.Edit
             Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
 
             // Go through all hitobjects to make sure they would remain in the bounds of the editor after movement, before any movement is attempted
-            foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
+            foreach (var p in points)
             {
-                if (h is Spinner)
-                {
-                    // Spinners don't support position adjustments
-                    continue;
-                }
-
-                // Stacking is not considered
-                minPosition = Vector2.ComponentMin(minPosition, Vector2.ComponentMin(h.EndPosition, h.Position));
-                maxPosition = Vector2.ComponentMax(maxPosition, Vector2.ComponentMax(h.EndPosition, h.Position));
+                minPosition = Vector2.ComponentMin(minPosition, p);
+                maxPosition = Vector2.ComponentMax(maxPosition, p);
             }
 
             Vector2 size = maxPosition - minPosition;
@@ -189,6 +159,14 @@ namespace osu.Game.Rulesets.Osu.Edit
             return new Quad(minPosition.X, minPosition.Y, size.X, size.Y);
         }
 
+        /// <summary>
+        /// All osu! hitobjects which can be moved/rotated/scaled.
+        /// </summary>
+        private OsuHitObject[] selectedMovableObjects => SelectedHitObjects
+                                                         .OfType<OsuHitObject>()
+                                                         .Where(h => !(h is Spinner))
+                                                         .ToArray();
+
         /// <summary>
         /// Rotate a point around an arbitrary origin.
         /// </summary>

From f1298bed798f8d31de5b17571f0c4f7bb4362f7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 15:08:56 +0900
Subject: [PATCH 05042/10326] Combine scale operations and tidy up scale drag
 handle construction

---
 .../Edit/OsuSelectionHandler.cs               | 58 +++++------
 .../Editing/TestSceneComposeSelectBox.cs      | 31 +++---
 .../Compose/Components/ComposeSelectionBox.cs | 99 +++++--------------
 .../Compose/Components/SelectionHandler.cs    | 19 +---
 4 files changed, 77 insertions(+), 130 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 706c41c2e3..1f250f078d 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -41,37 +41,16 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </summary>
         private Vector2? referenceOrigin;
 
-        public override bool HandleScaleY(in float scale, Anchor reference) =>
-            scaleSelection(new Vector2(0, ((reference & Anchor.y0) > 0 ? -1 : 1) * scale), reference);
-
-        public override bool HandleScaleX(in float scale, Anchor reference) =>
-            scaleSelection(new Vector2(((reference & Anchor.x0) > 0 ? -1 : 1) * scale, 0), reference);
-
-        public override bool HandleRotation(float delta)
+        public override bool HandleScale(Vector2 scale, Anchor reference)
         {
-            var hitObjects = selectedMovableObjects;
+            // cancel out scale in axes we don't care about (based on which drag handle was used).
+            if ((reference & Anchor.x1) > 0) scale.X = 0;
+            if ((reference & Anchor.y1) > 0) scale.Y = 0;
 
-            Quad quad = getSurroundingQuad(hitObjects);
+            // reverse the scale direction if dragging from top or left.
+            if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
+            if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
 
-            referenceOrigin ??= quad.Centre;
-
-            foreach (var h in hitObjects)
-            {
-                h.Position = rotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
-
-                if (h is IHasPath path)
-                {
-                    foreach (var point in path.Path.ControlPoints)
-                        point.Position.Value = rotatePointAroundOrigin(point.Position.Value, Vector2.Zero, delta);
-                }
-            }
-
-            // this isn't always the case but let's be lenient for now.
-            return true;
-        }
-
-        private bool scaleSelection(Vector2 scale, Anchor reference)
-        {
             var hitObjects = selectedMovableObjects;
 
             // for the time being, allow resizing of slider paths only if the slider is
@@ -110,6 +89,29 @@ namespace osu.Game.Rulesets.Osu.Edit
             return true;
         }
 
+        public override bool HandleRotation(float delta)
+        {
+            var hitObjects = selectedMovableObjects;
+
+            Quad quad = getSurroundingQuad(hitObjects);
+
+            referenceOrigin ??= quad.Centre;
+
+            foreach (var h in hitObjects)
+            {
+                h.Position = rotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
+
+                if (h is IHasPath path)
+                {
+                    foreach (var point in path.Path.ControlPoints)
+                        point.Position.Value = rotatePointAroundOrigin(point.Position.Value, Vector2.Zero, delta);
+                }
+            }
+
+            // this isn't always the case but let's be lenient for now.
+            return true;
+        }
+
         private bool moveSelection(Vector2 delta)
         {
             var hitObjects = selectedMovableObjects;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 4b12000fc3..a1fb91024b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -32,8 +32,7 @@ namespace osu.Game.Tests.Visual.Editing
                             CanScaleY = true,
 
                             OnRotation = handleRotation,
-                            OnScaleX = handleScaleX,
-                            OnScaleY = handleScaleY,
+                            OnScale = handleScale
                         }
                     }
                 });
@@ -43,24 +42,28 @@ namespace osu.Game.Tests.Visual.Editing
             AddToggleStep("toggle y", state => selectionBox.CanScaleY = state);
         }
 
-        private void handleScaleY(DragEvent e, Anchor reference)
+        private void handleScale(DragEvent e, Anchor reference)
         {
-            int direction = (reference & Anchor.y0) > 0 ? -1 : 1;
-            if (direction < 0)
-                selectionArea.Y += e.Delta.Y;
-            selectionArea.Height += direction * e.Delta.Y;
-        }
+            if ((reference & Anchor.y1) == 0)
+            {
+                int directionY = (reference & Anchor.y0) > 0 ? -1 : 1;
+                if (directionY < 0)
+                    selectionArea.Y += e.Delta.Y;
+                selectionArea.Height += directionY * e.Delta.Y;
+            }
 
-        private void handleScaleX(DragEvent e, Anchor reference)
-        {
-            int direction = (reference & Anchor.x0) > 0 ? -1 : 1;
-            if (direction < 0)
-                selectionArea.X += e.Delta.X;
-            selectionArea.Width += direction * e.Delta.X;
+            if ((reference & Anchor.x1) == 0)
+            {
+                int directionX = (reference & Anchor.x0) > 0 ? -1 : 1;
+                if (directionX < 0)
+                    selectionArea.X += e.Delta.X;
+                selectionArea.Width += directionX * e.Delta.X;
+            }
         }
 
         private void handleRotation(DragEvent e)
         {
+            // kinda silly and wrong, but just showing that the drag handles work.
             selectionArea.Rotation += e.Delta.X;
         }
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
index dba1965569..424705c755 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
@@ -17,8 +17,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     public class ComposeSelectionBox : CompositeDrawable
     {
         public Action<DragEvent> OnRotation;
-        public Action<DragEvent, Anchor> OnScaleX;
-        public Action<DragEvent, Anchor> OnScaleY;
+        public Action<DragEvent, Anchor> OnScale;
 
         public Action OperationStarted;
         public Action OperationEnded;
@@ -128,20 +127,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 AddRangeInternal(new[]
                 {
-                    new DragHandle
-                    {
-                        Anchor = Anchor.TopCentre,
-                        HandleDrag = e => OnScaleY?.Invoke(e, Anchor.TopCentre),
-                        OperationStarted = operationStarted,
-                        OperationEnded = operationEnded
-                    },
-                    new DragHandle
-                    {
-                        Anchor = Anchor.BottomCentre,
-                        HandleDrag = e => OnScaleY?.Invoke(e, Anchor.BottomCentre),
-                        OperationStarted = operationStarted,
-                        OperationEnded = operationEnded
-                    },
+                    createDragHandle(Anchor.TopCentre),
+                    createDragHandle(Anchor.BottomCentre),
                 });
             }
 
@@ -149,20 +136,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 AddRangeInternal(new[]
                 {
-                    new DragHandle
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        HandleDrag = e => OnScaleX?.Invoke(e, Anchor.CentreLeft),
-                        OperationStarted = operationStarted,
-                        OperationEnded = operationEnded
-                    },
-                    new DragHandle
-                    {
-                        Anchor = Anchor.CentreRight,
-                        HandleDrag = e => OnScaleX?.Invoke(e, Anchor.CentreRight),
-                        OperationStarted = operationStarted,
-                        OperationEnded = operationEnded
-                    },
+                    createDragHandle(Anchor.CentreLeft),
+                    createDragHandle(Anchor.CentreRight),
                 });
             }
 
@@ -170,52 +145,20 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 AddRangeInternal(new[]
                 {
-                    new DragHandle
-                    {
-                        Anchor = Anchor.TopLeft,
-                        HandleDrag = e =>
-                        {
-                            OnScaleX?.Invoke(e, Anchor.TopLeft);
-                            OnScaleY?.Invoke(e, Anchor.TopLeft);
-                        },
-                        OperationStarted = operationStarted,
-                        OperationEnded = operationEnded
-                    },
-                    new DragHandle
-                    {
-                        Anchor = Anchor.TopRight,
-                        HandleDrag = e =>
-                        {
-                            OnScaleX?.Invoke(e, Anchor.TopRight);
-                            OnScaleY?.Invoke(e, Anchor.TopRight);
-                        },
-                        OperationStarted = operationStarted,
-                        OperationEnded = operationEnded
-                    },
-                    new DragHandle
-                    {
-                        Anchor = Anchor.BottomLeft,
-                        HandleDrag = e =>
-                        {
-                            OnScaleX?.Invoke(e, Anchor.BottomLeft);
-                            OnScaleY?.Invoke(e, Anchor.BottomLeft);
-                        },
-                        OperationStarted = operationStarted,
-                        OperationEnded = operationEnded
-                    },
-                    new DragHandle
-                    {
-                        Anchor = Anchor.BottomRight,
-                        HandleDrag = e =>
-                        {
-                            OnScaleX?.Invoke(e, Anchor.BottomRight);
-                            OnScaleY?.Invoke(e, Anchor.BottomRight);
-                        },
-                        OperationStarted = operationStarted,
-                        OperationEnded = operationEnded
-                    },
+                    createDragHandle(Anchor.TopLeft),
+                    createDragHandle(Anchor.TopRight),
+                    createDragHandle(Anchor.BottomLeft),
+                    createDragHandle(Anchor.BottomRight),
                 });
             }
+
+            ScaleDragHandle createDragHandle(Anchor anchor) =>
+                new ScaleDragHandle(anchor)
+                {
+                    HandleDrag = e => OnScale?.Invoke(e, anchor),
+                    OperationStarted = operationStarted,
+                    OperationEnded = operationEnded
+                };
         }
 
         private int activeOperations;
@@ -232,6 +175,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 OperationStarted?.Invoke();
         }
 
+        private class ScaleDragHandle : DragHandle
+        {
+            public ScaleDragHandle(Anchor anchor)
+            {
+                Anchor = anchor;
+            }
+        }
+
         private class RotationDragHandle : DragHandle
         {
             private SpriteIcon icon;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 6cd503b580..5ed9bb65a8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.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;
@@ -101,8 +101,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 OperationEnded = OnDragOperationEnded,
 
                 OnRotation = e => HandleRotation(e.Delta.X),
-                OnScaleX = (e, anchor) => HandleScaleX(e.Delta.X, anchor),
-                OnScaleY = (e, anchor) => HandleScaleY(e.Delta.Y, anchor),
+                OnScale = (e, anchor) => HandleScale(e.Delta, anchor),
             };
 
         /// <summary>
@@ -145,20 +144,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public virtual bool HandleRotation(float angle) => false;
 
         /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being scaled in a vertical direction.
+        /// Handles the selected <see cref="DrawableHitObject"/>s being scaled.
         /// </summary>
-        /// <param name="scale">The delta scale to apply.</param>
+        /// <param name="scale">The delta scale to apply, in playfield local coordinates.</param>
         /// <param name="anchor">The point of reference where the scale is originating from.</param>
         /// <returns>Whether any <see cref="DrawableHitObject"/>s could be moved.</returns>
-        public virtual bool HandleScaleY(in float scale, Anchor anchor) => false;
-
-        /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being scaled in a horizontal direction.
-        /// </summary>
-        /// <param name="scale">The delta scale to apply.</param>
-        /// <param name="anchor">The point of reference where the scale is originating from.</param>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be moved.</returns>
-        public virtual bool HandleScaleX(in float scale, Anchor anchor) => false;
+        public virtual bool HandleScale(Vector2 scale, Anchor anchor) => false;
 
         public bool OnPressed(PlatformAction action)
         {

From 7fad9ce34ac7a94847143b3a5ffeeb62fba5c1b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 15:17:27 +0900
Subject: [PATCH 05043/10326] Simplify HandleScale method

---
 .../Edit/OsuSelectionHandler.cs               | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 1f250f078d..6b4f13db35 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -43,13 +43,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         public override bool HandleScale(Vector2 scale, Anchor reference)
         {
-            // cancel out scale in axes we don't care about (based on which drag handle was used).
-            if ((reference & Anchor.x1) > 0) scale.X = 0;
-            if ((reference & Anchor.y1) > 0) scale.Y = 0;
-
-            // reverse the scale direction if dragging from top or left.
-            if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
-            if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
+            adjustScaleFromAnchor(ref scale, reference);
 
             var hitObjects = selectedMovableObjects;
 
@@ -58,11 +52,11 @@ namespace osu.Game.Rulesets.Osu.Edit
             // is not looking to change the duration of the slider but expand the whole pattern.
             if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
             {
-                var quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
-                Vector2 delta = Vector2.One + new Vector2(scale.X / quad.Width, scale.Y / quad.Height);
+                Quad quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+                Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / quad.Width, 1 + scale.Y / quad.Height);
 
                 foreach (var point in slider.Path.ControlPoints)
-                    point.Position.Value *= delta;
+                    point.Position.Value *= pathRelativeDeltaScale;
             }
             else
             {
@@ -72,23 +66,29 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 Quad quad = getSurroundingQuad(hitObjects);
 
-                Vector2 minPosition = quad.TopLeft;
-
-                Vector2 size = quad.Size;
-                Vector2 newSize = size + scale;
-
                 foreach (var h in hitObjects)
                 {
-                    if (scale.X != 1)
-                        h.Position = new Vector2(minPosition.X + (h.X - minPosition.X) / size.X * newSize.X, h.Y);
-                    if (scale.Y != 1)
-                        h.Position = new Vector2(h.X, minPosition.Y + (h.Y - minPosition.Y) / size.Y * newSize.Y);
+                    h.Position = new Vector2(
+                        quad.TopLeft.X + (h.X - quad.TopLeft.X) / quad.Width * (quad.Width + scale.X),
+                        quad.TopLeft.Y + (h.Y - quad.TopLeft.Y) / quad.Height * (quad.Height + scale.Y)
+                    );
                 }
             }
 
             return true;
         }
 
+        private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
+        {
+            // cancel out scale in axes we don't care about (based on which drag handle was used).
+            if ((reference & Anchor.x1) > 0) scale.X = 0;
+            if ((reference & Anchor.y1) > 0) scale.Y = 0;
+
+            // reverse the scale direction if dragging from top or left.
+            if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
+            if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
+        }
+
         public override bool HandleRotation(float delta)
         {
             var hitObjects = selectedMovableObjects;

From ae9e884a483fd5940a429a4b924c5d1cb059653e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 15:35:25 +0900
Subject: [PATCH 05044/10326] Fix header casing

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 5ed9bb65a8..ee094c6246 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.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;

From 414c40d29849932734343123a8b89bf0725381c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 15:45:14 +0900
Subject: [PATCH 05045/10326] Reverse inheritance order of SkinnableSound's
 pause logic

---
 .../Objects/Drawables/DrawableSlider.cs       |  4 +-
 .../Objects/Drawables/DrawableSpinner.cs      |  4 +-
 .../Audio/DrumSampleContainer.cs              |  8 +--
 .../Gameplay/TestSceneSkinnableSound.cs       |  4 +-
 osu.Game/Rulesets/Mods/ModNightcore.cs        | 16 ++---
 .../Objects/Drawables/DrawableHitObject.cs    |  4 +-
 .../Screens/Play/ISamplePlaybackDisabler.cs   |  2 +-
 osu.Game/Screens/Play/PauseOverlay.cs         | 12 +---
 osu.Game/Skinning/PausableSkinnableSound.cs   | 66 +++++++++++++++++++
 osu.Game/Skinning/SkinnableSound.cs           | 50 +-------------
 10 files changed, 91 insertions(+), 79 deletions(-)
 create mode 100644 osu.Game/Skinning/PausableSkinnableSound.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 68f203db47..b73ae5eeb9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Tracking.BindValueChanged(updateSlidingSample);
         }
 
-        private SkinnableSound slidingSample;
+        private PausableSkinnableSound slidingSample;
 
         protected override void LoadSamples()
         {
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
                 clone.Name = "sliderslide";
 
-                AddInternal(slidingSample = new SkinnableSound(clone)
+                AddInternal(slidingSample = new PausableSkinnableSound(clone)
                 {
                     Looping = true
                 });
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index b2a706833c..6488c60acf 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             isSpinning.BindValueChanged(updateSpinningSample);
         }
 
-        private SkinnableSound spinningSample;
+        private PausableSkinnableSound spinningSample;
         private const float spinning_sample_initial_frequency = 1.0f;
         private const float spinning_sample_modulated_base_frequency = 0.5f;
 
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
                 clone.Name = "spinnerspin";
 
-                AddInternal(spinningSample = new SkinnableSound(clone)
+                AddInternal(spinningSample = new PausableSkinnableSound(clone)
                 {
                     Volume = { Value = 0 },
                     Looping = true,
diff --git a/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs b/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
index 7c39c040b1..fcf7c529f5 100644
--- a/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
@@ -42,9 +42,9 @@ namespace osu.Game.Rulesets.Taiko.Audio
             }
         }
 
-        private SkinnableSound addSound(HitSampleInfo hitSampleInfo, double lifetimeStart, double lifetimeEnd)
+        private PausableSkinnableSound addSound(HitSampleInfo hitSampleInfo, double lifetimeStart, double lifetimeEnd)
         {
-            var drawable = new SkinnableSound(hitSampleInfo)
+            var drawable = new PausableSkinnableSound(hitSampleInfo)
             {
                 LifetimeStart = lifetimeStart,
                 LifetimeEnd = lifetimeEnd
@@ -57,8 +57,8 @@ namespace osu.Game.Rulesets.Taiko.Audio
 
         public class DrumSample
         {
-            public SkinnableSound Centre;
-            public SkinnableSound Rim;
+            public PausableSkinnableSound Centre;
+            public PausableSkinnableSound Rim;
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 8b37cbd06f..8f2011e5dd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayClock gameplayClock = new GameplayClock(new FramedClock());
 
         private TestSkinSourceContainer skinSource;
-        private SkinnableSound skinnableSound;
+        private PausableSkinnableSound skinnableSound;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 {
                     Clock = gameplayClock,
                     RelativeSizeAxes = Axes.Both,
-                    Child = skinnableSound = new SkinnableSound(new SampleInfo("normal-sliderslide"))
+                    Child = skinnableSound = new PausableSkinnableSound(new SampleInfo("normal-sliderslide"))
                 },
             };
         });
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 4004953cd1..282de3a8e1 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -52,10 +52,10 @@ namespace osu.Game.Rulesets.Mods
 
         public class NightcoreBeatContainer : BeatSyncedContainer
         {
-            private SkinnableSound hatSample;
-            private SkinnableSound clapSample;
-            private SkinnableSound kickSample;
-            private SkinnableSound finishSample;
+            private PausableSkinnableSound hatSample;
+            private PausableSkinnableSound clapSample;
+            private PausableSkinnableSound kickSample;
+            private PausableSkinnableSound finishSample;
 
             private int? firstBeat;
 
@@ -69,10 +69,10 @@ namespace osu.Game.Rulesets.Mods
             {
                 InternalChildren = new Drawable[]
                 {
-                    hatSample = new SkinnableSound(new SampleInfo("nightcore-hat")),
-                    clapSample = new SkinnableSound(new SampleInfo("nightcore-clap")),
-                    kickSample = new SkinnableSound(new SampleInfo("nightcore-kick")),
-                    finishSample = new SkinnableSound(new SampleInfo("nightcore-finish")),
+                    hatSample = new PausableSkinnableSound(new SampleInfo("nightcore-hat")),
+                    clapSample = new PausableSkinnableSound(new SampleInfo("nightcore-clap")),
+                    kickSample = new PausableSkinnableSound(new SampleInfo("nightcore-kick")),
+                    finishSample = new PausableSkinnableSound(new SampleInfo("nightcore-finish")),
                 };
             }
 
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 796b8f7aae..59a3381b8b 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public readonly Bindable<Color4> AccentColour = new Bindable<Color4>(Color4.Gray);
 
-        protected SkinnableSound Samples { get; private set; }
+        protected PausableSkinnableSound Samples { get; private set; }
 
         public virtual IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples;
 
@@ -179,7 +179,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                                                     + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
             }
 
-            Samples = new SkinnableSound(samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)));
+            Samples = new PausableSkinnableSound(samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)));
             AddInternal(Samples);
         }
 
diff --git a/osu.Game/Screens/Play/ISamplePlaybackDisabler.cs b/osu.Game/Screens/Play/ISamplePlaybackDisabler.cs
index 83e89d654b..6b37021fe6 100644
--- a/osu.Game/Screens/Play/ISamplePlaybackDisabler.cs
+++ b/osu.Game/Screens/Play/ISamplePlaybackDisabler.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Screens.Play
 {
     /// <summary>
     /// Allows a component to disable sample playback dynamically as required.
-    /// Handled by <see cref="SkinnableSound"/>.
+    /// Handled by <see cref="PausableSkinnableSound"/>.
     /// </summary>
     public interface ISamplePlaybackDisabler
     {
diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 9494971f8a..65f34aba3e 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play
             AddButton("Retry", colours.YellowDark, () => OnRetry?.Invoke());
             AddButton("Quit", new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
 
-            AddInternal(pauseLoop = new UnpausableSkinnableSound(new SampleInfo("pause-loop"))
+            AddInternal(pauseLoop = new SkinnableSound(new SampleInfo("pause-loop"))
             {
                 Looping = true,
                 Volume = { Value = 0 }
@@ -54,15 +54,5 @@ namespace osu.Game.Screens.Play
 
             pauseLoop.VolumeTo(0, TRANSITION_DURATION, Easing.OutQuad).Finally(_ => pauseLoop.Stop());
         }
-
-        private class UnpausableSkinnableSound : SkinnableSound
-        {
-            protected override bool PlayWhenPaused => true;
-
-            public UnpausableSkinnableSound(SampleInfo sampleInfo)
-                : base(sampleInfo)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
new file mode 100644
index 0000000000..991278fb98
--- /dev/null
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -0,0 +1,66 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Audio;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Skinning
+{
+    public class PausableSkinnableSound : SkinnableSound
+    {
+        protected bool RequestedPlaying { get; private set; }
+
+        public PausableSkinnableSound(ISampleInfo hitSamples)
+            : base(hitSamples)
+        {
+        }
+
+        public PausableSkinnableSound(IEnumerable<ISampleInfo> hitSamples)
+            : base(hitSamples)
+        {
+        }
+
+        private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
+        [BackgroundDependencyLoader(true)]
+        private void load(ISamplePlaybackDisabler samplePlaybackDisabler)
+        {
+            // if in a gameplay context, pause sample playback when gameplay is paused.
+            if (samplePlaybackDisabler != null)
+            {
+                samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
+                samplePlaybackDisabled.BindValueChanged(disabled =>
+                {
+                    if (RequestedPlaying)
+                    {
+                        if (disabled.NewValue)
+                            base.Stop();
+                        // it's not easy to know if a sample has finished playing (to end).
+                        // to keep things simple only resume playing looping samples.
+                        else if (Looping)
+                            base.Play();
+                    }
+                });
+            }
+        }
+
+        public override void Play()
+        {
+            RequestedPlaying = true;
+
+            if (samplePlaybackDisabled.Value)
+                return;
+
+            base.Play();
+        }
+
+        public override void Stop()
+        {
+            RequestedPlaying = false;
+            base.Stop();
+        }
+    }
+}
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index f3ab8b86bc..91bdcd7444 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -11,7 +11,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Skinning
 {
@@ -22,8 +21,6 @@ namespace osu.Game.Skinning
         [Resolved]
         private ISampleStore samples { get; set; }
 
-        private bool requestedPlaying;
-
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
 
@@ -37,8 +34,6 @@ namespace osu.Game.Skinning
         /// </remarks>
         protected bool PlayWhenZeroVolume => Looping;
 
-        protected virtual bool PlayWhenPaused => false;
-
         private readonly AudioContainer<DrawableSample> samplesContainer;
 
         public SkinnableSound(ISampleInfo hitSamples)
@@ -52,30 +47,6 @@ namespace osu.Game.Skinning
             InternalChild = samplesContainer = new AudioContainer<DrawableSample>();
         }
 
-        private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
-
-        [BackgroundDependencyLoader(true)]
-        private void load(ISamplePlaybackDisabler samplePlaybackDisabler)
-        {
-            // if in a gameplay context, pause sample playback when gameplay is paused.
-            if (samplePlaybackDisabler != null)
-            {
-                samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
-                samplePlaybackDisabled.BindValueChanged(disabled =>
-                {
-                    if (requestedPlaying)
-                    {
-                        if (disabled.NewValue && !PlayWhenPaused)
-                            stop();
-                        // it's not easy to know if a sample has finished playing (to end).
-                        // to keep things simple only resume playing looping samples.
-                        else if (Looping)
-                            play();
-                    }
-                });
-            }
-        }
-
         private bool looping;
 
         public bool Looping
@@ -91,17 +62,8 @@ namespace osu.Game.Skinning
             }
         }
 
-        public void Play()
+        public virtual void Play()
         {
-            requestedPlaying = true;
-            play();
-        }
-
-        private void play()
-        {
-            if (samplePlaybackDisabled.Value && !PlayWhenPaused)
-                return;
-
             samplesContainer.ForEach(c =>
             {
                 if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
@@ -109,13 +71,7 @@ namespace osu.Game.Skinning
             });
         }
 
-        public void Stop()
-        {
-            requestedPlaying = false;
-            stop();
-        }
-
-        private void stop()
+        public virtual void Stop()
         {
             samplesContainer.ForEach(c => c.Stop());
         }
@@ -150,7 +106,7 @@ namespace osu.Game.Skinning
 
             // Start playback internally for the new samples if the previous ones were playing beforehand.
             if (wasPlaying)
-                play();
+                Play();
         }
 
         #region Re-expose AudioContainer

From 6cceb42ad5f21861b839fca68f358183ad1b3da6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 15:50:53 +0900
Subject: [PATCH 05046/10326] Remove unused DI resolution

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 59a3381b8b..eb12c1cdfc 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -17,7 +17,6 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Configuration;
-using osu.Game.Screens.Play;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Drawables
@@ -359,9 +358,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
         }
 
-        [Resolved(canBeNull: true)]
-        private ISamplePlaybackDisabler samplePlaybackDisabler { get; set; }
-
         /// <summary>
         /// Calculate the position to be used for sample playback at a specified X position (0..1).
         /// </summary>

From a40c2ea5ee54863c0991c5be9fdcfc5fa76cbc03 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 16:02:22 +0900
Subject: [PATCH 05047/10326] Simplify control point group binding/update logic

---
 osu.Game/Screens/Edit/Timing/TimingScreen.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index d7da29218f..1d550b7cc3 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Edit.Timing
             private OsuButton deleteButton;
             private ControlPointTable table;
 
-            private IBindableList<ControlPointGroup> controlGroups;
+            private BindableList<ControlPointGroup> controlGroups;
 
             [Resolved]
             private EditorClock clock { get; set; }
@@ -128,12 +128,14 @@ namespace osu.Game.Screens.Edit.Timing
 
                 selectedGroup.BindValueChanged(selected => { deleteButton.Enabled.Value = selected.NewValue != null; }, true);
 
-                controlGroups = Beatmap.Value.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
-                controlGroups.CollectionChanged += (sender, args) => createContent();
-                createContent();
-            }
+                // todo: remove cast after https://github.com/ppy/osu-framework/pull/3906 is merged
+                controlGroups = (BindableList<ControlPointGroup>)Beatmap.Value.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
 
-            private void createContent() => table.ControlGroups = controlGroups;
+                controlGroups.BindCollectionChanged((sender, args) =>
+                {
+                    table.ControlGroups = controlGroups;
+                }, true);
+            }
 
             private void delete()
             {

From 2ef09a8730085609f3ecb5eeba827e5a15554f60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 16:06:58 +0900
Subject: [PATCH 05048/10326] Populate test scene with control points

---
 osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
index 09f5ac2224..cda4ade6e1 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Timing;
@@ -19,7 +20,7 @@ namespace osu.Game.Tests.Visual.Editing
 
         public TestSceneTimingScreen()
         {
-            editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+            editorBeatmap = new EditorBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
         }
 
         [BackgroundDependencyLoader]

From 1dd354120b1013759d210e49902e08393c6d18b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 16:16:14 +0900
Subject: [PATCH 05049/10326] Fix beatmap potentially changing in test scene

---
 osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
index cda4ade6e1..04cdfd7a67 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
@@ -5,7 +5,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Timing;
 
@@ -27,7 +26,15 @@ namespace osu.Game.Tests.Visual.Editing
         private void load()
         {
             Beatmap.Value = CreateWorkingBeatmap(editorBeatmap.PlayableBeatmap);
+            Beatmap.Disabled = true;
+
             Child = new TimingScreen();
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            Beatmap.Disabled = false;
+            base.Dispose(isDisposing);
+        }
     }
 }

From e760ed8e01921c42c6adc6e8039b475f0b5758b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 16:39:02 +0900
Subject: [PATCH 05050/10326] Fix scroll wheel being handled by base test scene

---
 osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs | 2 ++
 osu.Game/Tests/Visual/EditorClockTestScene.cs          | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
index 04cdfd7a67..b82e776164 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Tests.Visual.Editing
         [Cached(typeof(IBeatSnapProvider))]
         private readonly EditorBeatmap editorBeatmap;
 
+        protected override bool ScrollUsingMouseWheel => false;
+
         public TestSceneTimingScreen()
         {
             editorBeatmap = new EditorBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index f0ec638fc9..693c9cb792 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Tests.Visual
         protected readonly BindableBeatDivisor BeatDivisor = new BindableBeatDivisor();
         protected new readonly EditorClock Clock;
 
+        protected virtual bool ScrollUsingMouseWheel => true;
+
         protected EditorClockTestScene()
         {
             Clock = new EditorClock(new ControlPointInfo(), 5000, BeatDivisor) { IsCoupled = false };
@@ -57,6 +59,9 @@ namespace osu.Game.Tests.Visual
 
         protected override bool OnScroll(ScrollEvent e)
         {
+            if (!ScrollUsingMouseWheel)
+                return false;
+
             if (e.ScrollDelta.Y > 0)
                 Clock.SeekBackward(true);
             else

From 5b200a8ca41f44084a3c0cc3703b50042a76a3bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 16:39:27 +0900
Subject: [PATCH 05051/10326] Change default zoom of timing screen timeline to
 most zoomed out

---
 .../Edit/Compose/Components/Timeline/TimelineArea.cs   | 10 +++++-----
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs      | 10 +++++++++-
 osu.Game/Screens/Edit/Timing/TimingScreen.cs           |  7 +++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index b99a053859..d870eb5279 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -14,9 +14,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class TimelineArea : Container
     {
-        private readonly Timeline timeline = new Timeline { RelativeSizeAxes = Axes.Both };
+        public readonly Timeline Timeline = new Timeline { RelativeSizeAxes = Axes.Both };
 
-        protected override Container<Drawable> Content => timeline;
+        protected override Container<Drawable> Content => Timeline;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     }
                                 }
                             },
-                            timeline
+                            Timeline
                         },
                     },
                     ColumnDimensions = new[]
@@ -121,9 +121,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             waveformCheckbox.Current.Value = true;
 
-            timeline.WaveformVisible.BindTo(waveformCheckbox.Current);
+            Timeline.WaveformVisible.BindTo(waveformCheckbox.Current);
         }
 
-        private void changeZoom(float change) => timeline.Zoom += change;
+        private void changeZoom(float change) => Timeline.Zoom += change;
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 34eddbefad..d6d782e70c 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -115,10 +115,18 @@ namespace osu.Game.Screens.Edit
                         new TimelineTickDisplay(),
                         CreateTimelineContent(),
                     }
-                }, timelineContainer.Add);
+                }, t =>
+                {
+                    timelineContainer.Add(t);
+                    OnTimelineLoaded(t);
+                });
             });
         }
 
+        protected virtual void OnTimelineLoaded(TimelineArea timelineArea)
+        {
+        }
+
         protected abstract Drawable CreateMainContent();
 
         protected virtual Drawable CreateTimelineContent() => new Container();
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 1d550b7cc3..66c1f4895b 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -12,6 +12,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Timing
@@ -58,6 +59,12 @@ namespace osu.Game.Screens.Edit.Timing
             });
         }
 
+        protected override void OnTimelineLoaded(TimelineArea timelineArea)
+        {
+            base.OnTimelineLoaded(timelineArea);
+            timelineArea.Timeline.Zoom = timelineArea.Timeline.MinZoom;
+        }
+
         public class ControlPointList : CompositeDrawable
         {
             private OsuButton deleteButton;

From 698042268ff4463a4b18544b68e3dea806c6524a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 16:58:19 +0900
Subject: [PATCH 05052/10326] Show control points in timing screen timeline

---
 osu.Game/Screens/Edit/Timing/TimingScreen.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 66c1f4895b..4ab27ff1c0 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -12,6 +12,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 
@@ -30,6 +31,11 @@ namespace osu.Game.Screens.Edit.Timing
         {
         }
 
+        protected override Drawable CreateTimelineContent() => new ControlPointPart
+        {
+            RelativeSizeAxes = Axes.Both,
+        };
+
         protected override Drawable CreateMainContent() => new GridContainer
         {
             RelativeSizeAxes = Axes.Both,

From 3422db1bb291f7daf0b42887edb24a54ac3637b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 17:10:22 +0900
Subject: [PATCH 05053/10326] Use top-left colour for deciding the text colour
 (gradient was added in some cases)

---
 .../Compose/Components/Timeline/TimelineHitObjectBlueprint.cs   | 2 +-
 1 file changed, 1 insertion(+), 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 455f1e17bd..bc2ccfc605 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     else
                         mainComponents.Colour = drawableHitObject.AccentColour.Value;
 
-                    var col = mainComponents.Colour.AverageColour.Linear;
+                    var col = mainComponents.Colour.TopLeft.Linear;
                     float brightness = col.R + col.G + col.B;
 
                     // decide the combo index colour based on brightness?

From b0f8e11bd46b54ab14ee678a10b576daa7ed4278 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 17:34:14 +0900
Subject: [PATCH 05054/10326] Fix incorrect caching

---
 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 e404d7ca42..9f8e55f577 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public GameplayClock GameplayClock => localGameplayClock;
 
-        [Cached]
+        [Cached(typeof(GameplayClock))]
         [Cached(typeof(ISamplePlaybackDisabler))]
         private readonly LocalGameplayClock localGameplayClock;
 

From bc943dee53e7208e57aa1dc77f38bfcac3e818a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 17:52:12 +0900
Subject: [PATCH 05055/10326] Add textbox entry for speed multiplier and volume

---
 .../Screens/Edit/Timing/DifficultySection.cs  | 12 +--
 osu.Game/Screens/Edit/Timing/SampleSection.cs | 12 ++-
 .../Edit/Timing/SliderWithTextBoxInput.cs     | 74 +++++++++++++++++++
 3 files changed, 83 insertions(+), 15 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs

diff --git a/osu.Game/Screens/Edit/Timing/DifficultySection.cs b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
index 58a7f97e5f..78766d9777 100644
--- a/osu.Game/Screens/Edit/Timing/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
@@ -2,27 +2,23 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Screens.Edit.Timing
 {
     internal class DifficultySection : Section<DifficultyControlPoint>
     {
-        private SettingsSlider<double> multiplier;
+        private SliderWithTextBoxInput<double> multiplierSlider;
 
         [BackgroundDependencyLoader]
         private void load()
         {
             Flow.AddRange(new[]
             {
-                multiplier = new SettingsSlider<double>
+                multiplierSlider = new SliderWithTextBoxInput<double>("Speed Multiplier")
                 {
-                    LabelText = "Speed Multiplier",
-                    Bindable = new DifficultyControlPoint().SpeedMultiplierBindable,
-                    RelativeSizeAxes = Axes.X,
+                    Current = new DifficultyControlPoint().SpeedMultiplierBindable
                 }
             });
         }
@@ -31,7 +27,7 @@ namespace osu.Game.Screens.Edit.Timing
         {
             if (point.NewValue != null)
             {
-                multiplier.Bindable = point.NewValue.SpeedMultiplierBindable;
+                multiplierSlider.Current = point.NewValue.SpeedMultiplierBindable;
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Timing/SampleSection.cs b/osu.Game/Screens/Edit/Timing/SampleSection.cs
index 4665c77991..de986e28ca 100644
--- a/osu.Game/Screens/Edit/Timing/SampleSection.cs
+++ b/osu.Game/Screens/Edit/Timing/SampleSection.cs
@@ -2,18 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Screens.Edit.Timing
 {
     internal class SampleSection : Section<SampleControlPoint>
     {
         private LabelledTextBox bank;
-        private SettingsSlider<int> volume;
+        private SliderWithTextBoxInput<int> volume;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -24,10 +23,9 @@ namespace osu.Game.Screens.Edit.Timing
                 {
                     Label = "Bank Name",
                 },
-                volume = new SettingsSlider<int>
+                volume = new SliderWithTextBoxInput<int>("Volume")
                 {
-                    Bindable = new SampleControlPoint().SampleVolumeBindable,
-                    LabelText = "Volume",
+                    Current = new SampleControlPoint().SampleVolumeBindable,
                 }
             });
         }
@@ -37,7 +35,7 @@ namespace osu.Game.Screens.Edit.Timing
             if (point.NewValue != null)
             {
                 bank.Current = point.NewValue.SampleBankBindable;
-                volume.Bindable = point.NewValue.SampleVolumeBindable;
+                volume.Current = point.NewValue.SampleVolumeBindable;
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
new file mode 100644
index 0000000000..07b914c506
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Game.Screens.Edit.Timing
+{
+    internal class SliderWithTextBoxInput<T> : CompositeDrawable, IHasCurrentValue<T>
+        where T : struct, IEquatable<T>, IComparable<T>, IConvertible
+    {
+        private readonly SettingsSlider<T> slider;
+
+        public SliderWithTextBoxInput(string labelText)
+        {
+            LabelledTextBox textbox;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        textbox = new LabelledTextBox
+                        {
+                            Label = labelText,
+                        },
+                        slider = new SettingsSlider<T>
+                        {
+                            RelativeSizeAxes = Axes.X,
+                        }
+                    }
+                },
+            };
+
+            textbox.OnCommit += (t, isNew) =>
+            {
+                if (!isNew) return;
+
+                try
+                {
+                    slider.Bindable.Parse(t.Text);
+                }
+                catch
+                {
+                    // will restore the previous text value on failure.
+                    Current.TriggerChange();
+                }
+            };
+
+            Current.BindValueChanged(val =>
+            {
+                textbox.Text = val.NewValue.ToString();
+            }, true);
+        }
+
+        public Bindable<T> Current
+        {
+            get => slider.Bindable;
+            set => slider.Bindable = value;
+        }
+    }
+}

From 44fc0c672304486c7706334ab990802f03aaa793 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 18:08:55 +0900
Subject: [PATCH 05056/10326] Fix default value of bpm being too high

---
 osu.Game/Screens/Edit/Timing/TimingSection.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index 879363ba08..cc79dd2acc 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -103,12 +103,17 @@ namespace osu.Game.Screens.Edit.Timing
             private const double sane_maximum = 240;
 
             private readonly BindableNumber<double> beatLengthBindable = new TimingControlPoint().BeatLengthBindable;
-            private readonly BindableDouble bpmBindable = new BindableDouble();
+
+            private readonly BindableDouble bpmBindable = new BindableDouble(60000 / TimingControlPoint.DEFAULT_BEAT_LENGTH)
+            {
+                MinValue = sane_minimum,
+                MaxValue = sane_maximum,
+            };
 
             public BPMSlider()
             {
                 beatLengthBindable.BindValueChanged(beatLength => updateCurrent(beatLengthToBpm(beatLength.NewValue)), true);
-                bpmBindable.BindValueChanged(bpm => bpmBindable.Default = beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue));
+                bpmBindable.BindValueChanged(bpm => beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue));
 
                 base.Bindable = bpmBindable;
             }

From 5242f5648dd26d89829d130f78459589f220434b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 18:34:13 +0900
Subject: [PATCH 05057/10326] Fix timeline control point display not updating
 with changes

---
 .../Summary/Parts/ControlPointPart.cs         | 70 +++++++------------
 .../Summary/Parts/GroupVisualisation.cs       | 46 ++++++++++++
 2 files changed, 71 insertions(+), 45 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
index 102955657e..6edb49ba1b 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
@@ -1,70 +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 System.Collections.Specialized;
 using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
-using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 {
     /// <summary>
     /// The part of the timeline that displays the control points.
     /// </summary>
-    public class ControlPointPart : TimelinePart
+    public class ControlPointPart : TimelinePart<GroupVisualisation>
     {
+        private BindableList<ControlPointGroup> controlPointGroups;
+
         protected override void LoadBeatmap(WorkingBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);
 
-            ControlPointInfo cpi = beatmap.Beatmap.ControlPointInfo;
-
-            cpi.TimingPoints.ForEach(addTimingPoint);
-
-            // Consider all non-timing points as the same type
-            cpi.SamplePoints.Select(c => (ControlPoint)c)
-               .Concat(cpi.EffectPoints)
-               .Concat(cpi.DifficultyPoints)
-               .Distinct()
-               // Non-timing points should not be added where there are timing points
-               .Where(c => cpi.TimingPointAt(c.Time).Time != c.Time)
-               .ForEach(addNonTimingPoint);
-        }
-
-        private void addTimingPoint(ControlPoint controlPoint) => Add(new TimingPointVisualisation(controlPoint));
-        private void addNonTimingPoint(ControlPoint controlPoint) => Add(new NonTimingPointVisualisation(controlPoint));
-
-        private class TimingPointVisualisation : ControlPointVisualisation
-        {
-            public TimingPointVisualisation(ControlPoint controlPoint)
-                : base(controlPoint)
+            controlPointGroups = (BindableList<ControlPointGroup>)beatmap.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
+            controlPointGroups.BindCollectionChanged((sender, args) =>
             {
-            }
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Reset:
+                        Clear();
+                        break;
 
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours) => Colour = colours.YellowDark;
-        }
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (var group in args.NewItems.OfType<ControlPointGroup>())
+                            Add(new GroupVisualisation(group));
+                        break;
 
-        private class NonTimingPointVisualisation : ControlPointVisualisation
-        {
-            public NonTimingPointVisualisation(ControlPoint controlPoint)
-                : base(controlPoint)
-            {
-            }
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (var group in args.OldItems.OfType<ControlPointGroup>())
+                        {
+                            var matching = Children.SingleOrDefault(gv => gv.Group == group);
 
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours) => Colour = colours.Green;
-        }
+                            matching?.Expire();
+                        }
 
-        private abstract class ControlPointVisualisation : PointVisualisation
-        {
-            protected ControlPointVisualisation(ControlPoint controlPoint)
-                : base(controlPoint.Time)
-            {
-            }
+                        break;
+                }
+            }, true);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
new file mode 100644
index 0000000000..b9eb53b697
--- /dev/null
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.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.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
+{
+    public class GroupVisualisation : PointVisualisation
+    {
+        public readonly ControlPointGroup Group;
+
+        private BindableList<ControlPoint> controlPoints;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public GroupVisualisation(ControlPointGroup group)
+            : base(group.Time)
+        {
+            Group = group;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            controlPoints = (BindableList<ControlPoint>)Group.ControlPoints.GetBoundCopy();
+            controlPoints.BindCollectionChanged((_, __) =>
+            {
+                if (controlPoints.Count == 0)
+                {
+                    Colour = Color4.Transparent;
+                    return;
+                }
+
+                Colour = controlPoints.Any(c => c is TimingControlPoint) ? colours.YellowDark : colours.Green;
+            }, true);
+        }
+    }
+}

From fab11a8241e470cd428d33a9084e0c927242c542 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 18:36:40 +0900
Subject: [PATCH 05058/10326] 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 dc3e14c141..afc5d4ec52 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.925.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.930.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6412f707d0..5fa1685d9b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.925.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.930.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f1e13169a5..60708a39e2 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.Framework.iOS" Version="2020.925.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.930.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.925.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.930.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From a11c74d60044d0ba9ee39e7a1e8e91674577b3cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 20:27:02 +0900
Subject: [PATCH 05059/10326] Update to consume framework fixes

---
 osu.Game/Screens/Edit/Timing/TimingScreen.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 4ab27ff1c0..0a0cfe193d 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Screens.Edit.Timing
             private OsuButton deleteButton;
             private ControlPointTable table;
 
-            private BindableList<ControlPointGroup> controlGroups;
+            private IBindableList<ControlPointGroup> controlGroups;
 
             [Resolved]
             private EditorClock clock { get; set; }
@@ -141,8 +141,7 @@ namespace osu.Game.Screens.Edit.Timing
 
                 selectedGroup.BindValueChanged(selected => { deleteButton.Enabled.Value = selected.NewValue != null; }, true);
 
-                // todo: remove cast after https://github.com/ppy/osu-framework/pull/3906 is merged
-                controlGroups = (BindableList<ControlPointGroup>)Beatmap.Value.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
+                controlGroups = Beatmap.Value.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
 
                 controlGroups.BindCollectionChanged((sender, args) =>
                 {

From fa742a2ef1567072065c8bb3d7b8de7ccf5def1d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Sep 2020 20:28:02 +0900
Subject: [PATCH 05060/10326] Update to consume framework fixes

---
 .../Components/Timelines/Summary/Parts/ControlPointPart.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
index 6edb49ba1b..8c0e31c04c 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
@@ -14,13 +14,13 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// </summary>
     public class ControlPointPart : TimelinePart<GroupVisualisation>
     {
-        private BindableList<ControlPointGroup> controlPointGroups;
+        private IBindableList<ControlPointGroup> controlPointGroups;
 
         protected override void LoadBeatmap(WorkingBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);
 
-            controlPointGroups = (BindableList<ControlPointGroup>)beatmap.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
+            controlPointGroups = beatmap.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
             controlPointGroups.BindCollectionChanged((sender, args) =>
             {
                 switch (args.Action)

From 77651be2caff6e95fb52801462130197d9e02183 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 30 Sep 2020 21:32:50 +0900
Subject: [PATCH 05061/10326] Remove padding from HitResult

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index fc33ff9df2..2b9b1a6c8e 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         [Description(@"")]
         [Order(14)]
-        None = 0,
+        None,
 
         /// <summary>
         /// Indicates that the object has been judged as a miss.
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Scoring
         /// </remarks>
         [Description(@"Miss")]
         [Order(5)]
-        Miss = 64,
+        Miss,
 
         [Description(@"Meh")]
         [Order(4)]
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Scoring
         /// Indicates small tick miss.
         /// </summary>
         [Order(11)]
-        SmallTickMiss = 128,
+        SmallTickMiss,
 
         /// <summary>
         /// Indicates a small tick hit.
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Scoring
         /// Indicates a large tick miss.
         /// </summary>
         [Order(10)]
-        LargeTickMiss = 192,
+        LargeTickMiss,
 
         /// <summary>
         /// Indicates a large tick hit.
@@ -84,20 +84,20 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         [Description("S Bonus")]
         [Order(9)]
-        SmallBonus = 254,
+        SmallBonus,
 
         /// <summary>
         /// Indicates a large bonus.
         /// </summary>
         [Description("L Bonus")]
         [Order(8)]
-        LargeBonus = 320,
+        LargeBonus,
 
         /// <summary>
         /// Indicates a miss that should be ignored for scoring purposes.
         /// </summary>
         [Order(13)]
-        IgnoreMiss = 384,
+        IgnoreMiss,
 
         /// <summary>
         /// Indicates a hit that should be ignored for scoring purposes.

From 917e8fc3ba041d40e09396f39f020d2b508ac16e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 00:53:01 +0900
Subject: [PATCH 05062/10326] Add difficulty rating to StarDifficulty

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index e9d26683c3..159a229499 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -307,5 +307,19 @@ namespace osu.Game.Beatmaps
 
             // Todo: Add more members (BeatmapInfo.DifficultyRating? Attributes? Etc...)
         }
+
+        public DifficultyRating DifficultyRating
+        {
+            get
+            {
+                if (Stars < 2.0) return DifficultyRating.Easy;
+                if (Stars < 2.7) return DifficultyRating.Normal;
+                if (Stars < 4.0) return DifficultyRating.Hard;
+                if (Stars < 5.3) return DifficultyRating.Insane;
+                if (Stars < 6.5) return DifficultyRating.Expert;
+
+                return DifficultyRating.ExpertPlus;
+            }
+        }
     }
 }

From fde00d343197d16ed0140d412b4fa4017e369907 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 00:53:25 +0900
Subject: [PATCH 05063/10326] Make DifficultyIcon support dynamic star rating

---
 osu.Game/Beatmaps/Drawables/DifficultyIcon.cs | 135 +++++++++++++++---
 .../Drawables/GroupedDifficultyIcon.cs        |   2 +-
 .../Screens/Multi/Components/ModeTypeInfo.cs  |   2 +-
 .../Screens/Multi/DrawableRoomPlaylistItem.cs |   2 +-
 4 files changed, 117 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index 8a0d981e49..d5e4b13a84 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
@@ -2,7 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Threading;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -14,6 +18,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
 
@@ -21,9 +26,6 @@ namespace osu.Game.Beatmaps.Drawables
 {
     public class DifficultyIcon : CompositeDrawable, IHasCustomTooltip
     {
-        private readonly BeatmapInfo beatmap;
-        private readonly RulesetInfo ruleset;
-
         private readonly Container iconContainer;
 
         /// <summary>
@@ -35,23 +37,49 @@ namespace osu.Game.Beatmaps.Drawables
             set => iconContainer.Size = value;
         }
 
-        public DifficultyIcon(BeatmapInfo beatmap, RulesetInfo ruleset = null, bool shouldShowTooltip = true)
+        [NotNull]
+        private readonly BeatmapInfo beatmap;
+
+        [CanBeNull]
+        private readonly RulesetInfo ruleset;
+
+        [CanBeNull]
+        private readonly IReadOnlyList<Mod> mods;
+
+        private readonly bool shouldShowTooltip;
+        private readonly IBindable<StarDifficulty> difficultyBindable = new Bindable<StarDifficulty>();
+
+        private Drawable background;
+
+        /// <summary>
+        /// Creates a new <see cref="DifficultyIcon"/> with a given <see cref="RulesetInfo"/> and <see cref="Mod"/> combination.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to show the difficulty of.</param>
+        /// <param name="ruleset">The ruleset to show the difficulty with.</param>
+        /// <param name="mods">The mods to show the difficulty with.</param>
+        /// <param name="shouldShowTooltip">Whether to display a tooltip when hovered.</param>
+        public DifficultyIcon([NotNull] BeatmapInfo beatmap, [CanBeNull] RulesetInfo ruleset, [CanBeNull] IReadOnlyList<Mod> mods, bool shouldShowTooltip = true)
+            : this(beatmap, shouldShowTooltip)
+        {
+            this.ruleset = ruleset ?? beatmap.Ruleset;
+            this.mods = mods ?? Array.Empty<Mod>();
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DifficultyIcon"/> that follows the currently-selected ruleset and mods.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to show the difficulty of.</param>
+        /// <param name="shouldShowTooltip">Whether to display a tooltip when hovered.</param>
+        public DifficultyIcon([NotNull] BeatmapInfo beatmap, bool shouldShowTooltip = true)
         {
             this.beatmap = beatmap ?? throw new ArgumentNullException(nameof(beatmap));
-
-            this.ruleset = ruleset ?? beatmap.Ruleset;
-            if (shouldShowTooltip)
-                TooltipContent = beatmap;
+            this.shouldShowTooltip = shouldShowTooltip;
 
             AutoSizeAxes = Axes.Both;
 
             InternalChild = iconContainer = new Container { Size = new Vector2(20f) };
         }
 
-        public ITooltip GetCustomTooltip() => new DifficultyIconTooltip();
-
-        public object TooltipContent { get; }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -70,10 +98,10 @@ namespace osu.Game.Beatmaps.Drawables
                         Type = EdgeEffectType.Shadow,
                         Radius = 5,
                     },
-                    Child = new Box
+                    Child = background = new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = colours.ForDifficultyRating(beatmap.DifficultyRating),
+                        Colour = colours.ForDifficultyRating(beatmap.DifficultyRating) // Default value that will be re-populated once difficulty calculation completes
                     },
                 },
                 new ConstrainedIconContainer
@@ -82,16 +110,73 @@ namespace osu.Game.Beatmaps.Drawables
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
                     // the null coalesce here is only present to make unit tests work (ruleset dlls aren't copied correctly for testing at the moment)
-                    Icon = ruleset?.CreateInstance()?.CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.Regular.QuestionCircle }
-                }
+                    Icon = beatmap.Ruleset?.CreateInstance()?.CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.Regular.QuestionCircle }
+                },
+                new DelayedLoadUnloadWrapper(() => new DifficultyRetriever(beatmap, ruleset, mods) { StarDifficulty = { BindTarget = difficultyBindable } }, 0),
             };
+
+            difficultyBindable.BindValueChanged(difficulty => background.Colour = colours.ForDifficultyRating(difficulty.NewValue.DifficultyRating));
+        }
+
+        public ITooltip GetCustomTooltip() => new DifficultyIconTooltip();
+
+        public object TooltipContent => shouldShowTooltip ? new DifficultyIconTooltipContent(beatmap, difficultyBindable) : null;
+
+        private class DifficultyRetriever : Drawable
+        {
+            public readonly Bindable<StarDifficulty> StarDifficulty = new Bindable<StarDifficulty>();
+
+            private readonly BeatmapInfo beatmap;
+            private readonly RulesetInfo ruleset;
+            private readonly IReadOnlyList<Mod> mods;
+
+            private CancellationTokenSource difficultyCancellation;
+
+            [Resolved]
+            private BeatmapDifficultyManager difficultyManager { get; set; }
+
+            public DifficultyRetriever(BeatmapInfo beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods)
+            {
+                this.beatmap = beatmap;
+                this.ruleset = ruleset;
+                this.mods = mods;
+            }
+
+            private IBindable<StarDifficulty> localStarDifficulty;
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                difficultyCancellation = new CancellationTokenSource();
+                localStarDifficulty = ruleset != null
+                    ? difficultyManager.GetBindableDifficulty(beatmap, ruleset, mods, difficultyCancellation.Token)
+                    : difficultyManager.GetBindableDifficulty(beatmap, difficultyCancellation.Token);
+                localStarDifficulty.BindValueChanged(difficulty => StarDifficulty.Value = difficulty.NewValue);
+            }
+
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+                difficultyCancellation?.Cancel();
+            }
+        }
+
+        private class DifficultyIconTooltipContent
+        {
+            public readonly BeatmapInfo Beatmap;
+            public readonly IBindable<StarDifficulty> Difficulty;
+
+            public DifficultyIconTooltipContent(BeatmapInfo beatmap, IBindable<StarDifficulty> difficulty)
+            {
+                Beatmap = beatmap;
+                Difficulty = difficulty;
+            }
         }
 
         private class DifficultyIconTooltip : VisibilityContainer, ITooltip
         {
             private readonly OsuSpriteText difficultyName, starRating;
             private readonly Box background;
-
             private readonly FillFlowContainer difficultyFlow;
 
             public DifficultyIconTooltip()
@@ -159,14 +244,22 @@ namespace osu.Game.Beatmaps.Drawables
                 background.Colour = colours.Gray3;
             }
 
+            private readonly IBindable<StarDifficulty> starDifficulty = new Bindable<StarDifficulty>();
+
             public bool SetContent(object content)
             {
-                if (!(content is BeatmapInfo beatmap))
+                if (!(content is DifficultyIconTooltipContent iconContent))
                     return false;
 
-                difficultyName.Text = beatmap.Version;
-                starRating.Text = $"{beatmap.StarDifficulty:0.##}";
-                difficultyFlow.Colour = colours.ForDifficultyRating(beatmap.DifficultyRating, true);
+                difficultyName.Text = iconContent.Beatmap.Version;
+
+                starDifficulty.UnbindAll();
+                starDifficulty.BindTo(iconContent.Difficulty);
+                starDifficulty.BindValueChanged(difficulty =>
+                {
+                    starRating.Text = $"{difficulty.NewValue.Stars:0.##}";
+                    difficultyFlow.Colour = colours.ForDifficultyRating(difficulty.NewValue.DifficultyRating, true);
+                }, true);
 
                 return true;
             }
diff --git a/osu.Game/Beatmaps/Drawables/GroupedDifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/GroupedDifficultyIcon.cs
index fbad113caa..fcee4c2f1a 100644
--- a/osu.Game/Beatmaps/Drawables/GroupedDifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/GroupedDifficultyIcon.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Beatmaps.Drawables
     public class GroupedDifficultyIcon : DifficultyIcon
     {
         public GroupedDifficultyIcon(List<BeatmapInfo> beatmaps, RulesetInfo ruleset, Color4 counterColour)
-            : base(beatmaps.OrderBy(b => b.StarDifficulty).Last(), ruleset, false)
+            : base(beatmaps.OrderBy(b => b.StarDifficulty).Last(), ruleset, null, false)
         {
             AddInternal(new OsuSpriteText
             {
diff --git a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
index 0015feb26a..f07bd8c3b2 100644
--- a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Screens.Multi.Components
             if (item?.Beatmap != null)
             {
                 drawableRuleset.FadeIn(transition_duration);
-                drawableRuleset.Child = new DifficultyIcon(item.Beatmap.Value, item.Ruleset.Value) { Size = new Vector2(height) };
+                drawableRuleset.Child = new DifficultyIcon(item.Beatmap.Value, item.Ruleset.Value, item.RequiredMods) { Size = new Vector2(height) };
             }
             else
                 drawableRuleset.FadeOut(transition_duration);
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index b007e0349d..bda00b65b5 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Screens.Multi
 
         private void refresh()
         {
-            difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value) { Size = new Vector2(32) };
+            difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
             beatmapText.AddLink(Item.Beatmap.ToString(), LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());

From 2213db20886ab1952bf33dc370cb67efa3b0e681 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 00:59:41 +0900
Subject: [PATCH 05064/10326] Use the given ruleset by default

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

diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index d5e4b13a84..9ffe813187 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Beatmaps.Drawables
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
                     // the null coalesce here is only present to make unit tests work (ruleset dlls aren't copied correctly for testing at the moment)
-                    Icon = beatmap.Ruleset?.CreateInstance()?.CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.Regular.QuestionCircle }
+                    Icon = (ruleset ?? beatmap.Ruleset)?.CreateInstance()?.CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.Regular.QuestionCircle }
                 },
                 new DelayedLoadUnloadWrapper(() => new DifficultyRetriever(beatmap, ruleset, mods) { StarDifficulty = { BindTarget = difficultyBindable } }, 0),
             };

From ca9f5b447ee643dc3ebe558b9e21707e1e41d2e3 Mon Sep 17 00:00:00 2001
From: Ganendra Afrasya <gsculerlor@hotmail.com>
Date: Thu, 1 Oct 2020 02:02:27 +0700
Subject: [PATCH 05065/10326] Fix UserListPanel background position

---
 osu.Game/Users/UserListPanel.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Users/UserListPanel.cs b/osu.Game/Users/UserListPanel.cs
index 9c95eff739..cc4fca9b94 100644
--- a/osu.Game/Users/UserListPanel.cs
+++ b/osu.Game/Users/UserListPanel.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Users
         private void load()
         {
             Background.Width = 0.5f;
+            Background.Origin = Anchor.CentreRight;
+            Background.Anchor = Anchor.CentreRight;
             Background.Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(1), Color4.White.Opacity(0.3f));
         }
 

From 6b416c9881ab19dcc2291849777f729b6a422e57 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 12:09:12 +0900
Subject: [PATCH 05066/10326] Rename method and improve method implementation

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 3d8a52a864..d5c3538c81 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_2 },
             });
 
-            AddAssert("Tracking retained", assertGreatJudge);
+            AddAssert("Tracking retained", assertMaxJudge);
         }
 
         /// <summary>
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_1 },
             });
 
-            AddAssert("Tracking retained", assertGreatJudge);
+            AddAssert("Tracking retained", assertMaxJudge);
         }
 
         /// <summary>
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_1 },
             });
 
-            AddAssert("Tracking retained", assertGreatJudge);
+            AddAssert("Tracking retained", assertMaxJudge);
         }
 
         /// <summary>
@@ -288,7 +288,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.199f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 
-            AddAssert("Tracking kept", assertGreatJudge);
+            AddAssert("Tracking kept", assertMaxJudge);
         }
 
         /// <summary>
@@ -312,7 +312,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Tracking dropped", assertMidSliderJudgementFail);
         }
 
-        private bool assertGreatJudge() => judgementResults.Any() && judgementResults.All(t => t.Type.IsHit());
+        private bool assertMaxJudge() => judgementResults.Any() && judgementResults.All(t => t.Type == t.Judgement.MaxResult);
 
         private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.IgnoreHit && judgementResults.First().Type == HitResult.Miss;
 

From 806d8b4b1dddcc35bb7512dd60cc078a6000e95f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 12:13:24 +0900
Subject: [PATCH 05067/10326] Make scoring int-based again

---
 osu.Game/Rulesets/Judgements/Judgement.cs | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index ea7a8d8d25..c7d572b629 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -15,12 +15,12 @@ namespace osu.Game.Rulesets.Judgements
         /// <summary>
         /// The score awarded for a small bonus.
         /// </summary>
-        public const double SMALL_BONUS_SCORE = 10;
+        public const int SMALL_BONUS_SCORE = 10;
 
         /// <summary>
         /// The score awarded for a large bonus.
         /// </summary>
-        public const double LARGE_BONUS_SCORE = 50;
+        public const int LARGE_BONUS_SCORE = 50;
 
         /// <summary>
         /// The default health increase for a maximum judgement, as a proportion of total health.
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Judgements
         /// <summary>
         /// The numeric score representation for the maximum achievable result.
         /// </summary>
-        public double MaxNumericResult => ToNumericResult(MaxResult);
+        public int MaxNumericResult => ToNumericResult(MaxResult);
 
         /// <summary>
         /// The health increase for the maximum achievable result.
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Judgements
         /// </summary>
         /// <param name="result">The <see cref="JudgementResult"/> to find the numeric score representation for.</param>
         /// <returns>The numeric score representation of <paramref name="result"/>.</returns>
-        public double NumericResultFor(JudgementResult result) => ToNumericResult(result.Type);
+        public int NumericResultFor(JudgementResult result) => ToNumericResult(result.Type);
 
         /// <summary>
         /// Retrieves the numeric health increase of a <see cref="HitResult"/>.
@@ -155,7 +155,7 @@ namespace osu.Game.Rulesets.Judgements
 
         public override string ToString() => $"MaxResult:{MaxResult} MaxScore:{MaxNumericResult}";
 
-        public static double ToNumericResult(HitResult result)
+        public static int ToNumericResult(HitResult result)
         {
             switch (result)
             {
@@ -163,25 +163,25 @@ namespace osu.Game.Rulesets.Judgements
                     return 0;
 
                 case HitResult.SmallTickHit:
-                    return 1 / 30d;
+                    return 10;
 
                 case HitResult.LargeTickHit:
-                    return 1 / 10d;
+                    return 30;
 
                 case HitResult.Meh:
-                    return 1 / 6d;
+                    return 50;
 
                 case HitResult.Ok:
-                    return 1 / 3d;
+                    return 100;
 
                 case HitResult.Good:
-                    return 2 / 3d;
+                    return 200;
 
                 case HitResult.Great:
-                    return 1d;
+                    return 300;
 
                 case HitResult.Perfect:
-                    return 7 / 6d;
+                    return 350;
 
                 case HitResult.SmallBonus:
                     return SMALL_BONUS_SCORE;

From 3a26bd8d9ba87590f2e6f8d35afd9c255f543979 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 12:14:16 +0900
Subject: [PATCH 05068/10326] Adjust obsoletion + xmldoc of NumericResultFor()

---
 osu.Game/Rulesets/Judgements/Judgement.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index c7d572b629..738ae0d6d2 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -82,12 +82,12 @@ namespace osu.Game.Rulesets.Judgements
         public double MaxHealthIncrease => HealthIncreaseFor(MaxResult);
 
         /// <summary>
-        /// Retrieves the numeric score representation of a <see cref="JudgementResult"/>.
+        /// Retrieves the numeric score representation of a <see cref="HitResult"/>.
         /// </summary>
-        /// <param name="result">The <see cref="JudgementResult"/> to find the numeric score representation for.</param>
+        /// <param name="result">The <see cref="HitResult"/> to find the numeric score representation for.</param>
         /// <returns>The numeric score representation of <paramref name="result"/>.</returns>
-        [Obsolete("Has no effect. Use ToNumericResult(HitResult) (standardised across all rulesets).")] // Can be removed 20210328
-        protected virtual int NumericResultFor(HitResult result) => result == HitResult.Miss ? 0 : 1;
+        [Obsolete("Has no effect. Use ToNumericResult(HitResult) (standardised across all rulesets).")] // Can be made non-virtual 20210328
+        protected virtual int NumericResultFor(HitResult result) => ToNumericResult(result);
 
         /// <summary>
         /// Retrieves the numeric score representation of a <see cref="JudgementResult"/>.

From 3c9ee6abc11f227eb6a18d10b66f0c7e6aedf04b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 12:15:34 +0900
Subject: [PATCH 05069/10326] Use local static to determine score per spinner
 tick

---
 .../Objects/Drawables/Pieces/SpinnerBonusDisplay.cs          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
index 1668cd73bd..f483bb1b26 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets.Judgements;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
@@ -14,6 +13,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
     /// </summary>
     public class SpinnerBonusDisplay : CompositeDrawable
     {
+        private static readonly int score_per_tick = new SpinnerBonusTick().CreateJudgement().MaxNumericResult;
+
         private readonly OsuSpriteText bonusCounter;
 
         public SpinnerBonusDisplay()
@@ -37,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 return;
 
             displayedCount = count;
-            bonusCounter.Text = $"{Judgement.LARGE_BONUS_SCORE * count}";
+            bonusCounter.Text = $"{score_per_tick * count}";
             bonusCounter.FadeOutFromOne(1500);
             bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
         }

From c9f38f7bb6af116fa7ec813ceb3f100dcad30adb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 12:28:33 +0900
Subject: [PATCH 05070/10326] Add obsoletion notice

---
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 2a3e3716e5..a48627208d 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -10,6 +10,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
+using osu.Framework.Logging;
 using osu.Framework.Threading;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Judgements;
@@ -476,12 +477,21 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 throw new InvalidOperationException($"{GetType().ReadableName()} applied a {nameof(JudgementResult)} but did not update {nameof(JudgementResult.Type)}.");
 
             // Some (especially older) rulesets use scorable judgements instead of the newer ignorehit/ignoremiss judgements.
+            // Can be removed 20210328
             if (Result.Judgement.MaxResult == HitResult.IgnoreHit)
             {
+                HitResult originalType = Result.Type;
+
                 if (Result.Type == HitResult.Miss)
                     Result.Type = HitResult.IgnoreMiss;
                 else if (Result.Type >= HitResult.Meh && Result.Type <= HitResult.Perfect)
                     Result.Type = HitResult.IgnoreHit;
+
+                if (Result.Type != originalType)
+                {
+                    Logger.Log($"{GetType().ReadableName()} applied an invalid hit result ({originalType}) when {nameof(HitResult.IgnoreMiss)} or {nameof(HitResult.IgnoreHit)} is expected.\n"
+                               + $"This has been automatically adjusted to {Result.Type}, and support will be removed from 2020-03-28 onwards.", level: LogLevel.Important);
+                }
             }
 
             if (!Result.Type.IsValidHitResult(Result.Judgement.MinResult, Result.Judgement.MaxResult))

From 61e62929eeccb402000af318ba438c0c78e2e6ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 12:51:33 +0900
Subject: [PATCH 05071/10326] Apply changes in line with framework event logic
 update

---
 osu.Game.Tournament/Components/DateTextBox.cs                | 2 +-
 osu.Game/Online/Chat/StandAloneChatDisplay.cs                | 3 ++-
 osu.Game/Overlays/ChatOverlay.cs                             | 3 ++-
 osu.Game/Overlays/Music/PlaylistOverlay.cs                   | 2 +-
 osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index aee5241e35..a1b5ac38ea 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Tournament.Components
         {
             base.Bindable = new Bindable<string>();
 
-            ((OsuTextBox)Control).OnCommit = (sender, newText) =>
+            ((OsuTextBox)Control).OnCommit += (sender, newText) =>
             {
                 try
                 {
diff --git a/osu.Game/Online/Chat/StandAloneChatDisplay.cs b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
index f8810c778f..8b0caddbc6 100644
--- a/osu.Game/Online/Chat/StandAloneChatDisplay.cs
+++ b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
@@ -59,12 +59,13 @@ namespace osu.Game.Online.Chat
                     RelativeSizeAxes = Axes.X,
                     Height = textbox_height,
                     PlaceholderText = "type your message",
-                    OnCommit = postMessage,
                     ReleaseFocusOnCommit = false,
                     HoldFocus = true,
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                 });
+
+                textbox.OnCommit += postMessage;
             }
 
             Channel.BindValueChanged(channelChanged);
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index c53eccf78b..8bc7e21047 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -146,7 +146,6 @@ namespace osu.Game.Overlays
                                             RelativeSizeAxes = Axes.Both,
                                             Height = 1,
                                             PlaceholderText = "type your message",
-                                            OnCommit = postMessage,
                                             ReleaseFocusOnCommit = false,
                                             HoldFocus = true,
                                         }
@@ -186,6 +185,8 @@ namespace osu.Game.Overlays
                 },
             };
 
+            textbox.OnCommit += postMessage;
+
             ChannelTabControl.Current.ValueChanged += current => channelManager.CurrentChannel.Value = current.NewValue;
             ChannelTabControl.ChannelSelectorActive.ValueChanged += active => ChannelSelectionOverlay.State.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
             ChannelSelectionOverlay.State.ValueChanged += state =>
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 050e687dfb..b8d04eab4e 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Music
                 },
             };
 
-            filter.Search.OnCommit = (sender, newText) =>
+            filter.Search.OnCommit += (sender, newText) =>
             {
                 BeatmapInfo toSelect = list.FirstVisibleSet?.Beatmaps?.FirstOrDefault();
 
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index 34e5da4ef4..f96e204f62 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -236,7 +236,6 @@ namespace osu.Game.Overlays.Settings.Sections.General
                         PlaceholderText = "password",
                         RelativeSizeAxes = Axes.X,
                         TabbableContentContainer = this,
-                        OnCommit = (sender, newText) => performLogin()
                     },
                     new SettingsCheckbox
                     {
@@ -276,6 +275,8 @@ namespace osu.Game.Overlays.Settings.Sections.General
                         }
                     }
                 };
+
+                password.OnCommit += (sender, newText) => performLogin();
             }
 
             public override bool AcceptsFocus => true;

From e0a0902a15f9e1dac34b8795035c2ef48e47dbec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 13:06:24 +0900
Subject: [PATCH 05072/10326] Ensure textbox always reverts to sane state on
 out-of-range failures

---
 .../Edit/Timing/SliderWithTextBoxInput.cs     |  7 +++++--
 osu.Game/Screens/Edit/Timing/TimingSection.cs | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
index 07b914c506..14023b0c35 100644
--- a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
+++ b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
@@ -54,9 +54,12 @@ namespace osu.Game.Screens.Edit.Timing
                 }
                 catch
                 {
-                    // will restore the previous text value on failure.
-                    Current.TriggerChange();
+                    // TriggerChange below will restore the previous text value on failure.
                 }
+
+                // This is run regardless of parsing success as the parsed number may not actually trigger a change
+                // due to bindable clamping. Even in such a case we want to update the textbox to a sane visual state.
+                Current.TriggerChange();
             };
 
             Current.BindValueChanged(val =>
diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index cc79dd2acc..0202441537 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -65,18 +65,19 @@ namespace osu.Game.Screens.Edit.Timing
                 {
                     if (!isNew) return;
 
-                    if (double.TryParse(Current.Value, out double doubleVal))
+                    try
                     {
-                        try
-                        {
+                        if (double.TryParse(Current.Value, out double doubleVal) && doubleVal > 0)
                             beatLengthBindable.Value = beatLengthToBpm(doubleVal);
-                        }
-                        catch
-                        {
-                            // will restore the previous text value on failure.
-                            beatLengthBindable.TriggerChange();
-                        }
                     }
+                    catch
+                    {
+                        // TriggerChange below will restore the previous text value on failure.
+                    }
+
+                    // This is run regardless of parsing success as the parsed number may not actually trigger a change
+                    // due to bindable clamping. Even in such a case we want to update the textbox to a sane visual state.
+                    beatLengthBindable.TriggerChange();
                 };
 
                 beatLengthBindable.BindValueChanged(val =>

From b1f2bdd579ee4a6b91d3f5b3b78e62ea204a97fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 13:47:49 +0900
Subject: [PATCH 05073/10326] Add missing xmldoc

---
 .../Edit/Compose/Components/ComposeSelectionBox.cs       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
index 424705c755..530c6007cf 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private bool canRotate;
 
+        /// <summary>
+        /// Whether rotation support should be enabled.
+        /// </summary>
         public bool CanRotate
         {
             get => canRotate;
@@ -36,6 +39,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private bool canScaleX;
 
+        /// <summary>
+        /// Whether vertical scale support should be enabled.
+        /// </summary>
         public bool CanScaleX
         {
             get => canScaleX;
@@ -48,6 +54,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private bool canScaleY;
 
+        /// <summary>
+        /// Whether horizontal scale support should be enabled.
+        /// </summary>
         public bool CanScaleY
         {
             get => canScaleY;

From 02f14ab4b0045249c9a9bf681ee324c8ed5dfdbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 16:24:04 +0900
Subject: [PATCH 05074/10326] Rename operation start/end to be more
 encompassing

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs         | 4 ++--
 .../Screens/Edit/Compose/Components/SelectionHandler.cs   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 6b4f13db35..f275e08234 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Rulesets.Osu.Edit
             SelectionBox.CanScaleY = canOperate;
         }
 
-        protected override void OnDragOperationEnded()
+        protected override void OnOperationEnded()
         {
-            base.OnDragOperationEnded();
+            base.OnOperationEnded();
             referenceOrigin = null;
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index ee094c6246..435f84996a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -97,8 +97,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public ComposeSelectionBox CreateSelectionBox()
             => new ComposeSelectionBox
             {
-                OperationStarted = OnDragOperationBegan,
-                OperationEnded = OnDragOperationEnded,
+                OperationStarted = OnOperationBegan,
+                OperationEnded = OnOperationEnded,
 
                 OnRotation = e => HandleRotation(e.Delta.X),
                 OnScale = (e, anchor) => HandleScale(e.Delta, anchor),
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Fired when a drag operation ends from the selection box.
         /// </summary>
-        protected virtual void OnDragOperationBegan()
+        protected virtual void OnOperationBegan()
         {
             ChangeHandler.BeginChange();
         }
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Fired when a drag operation begins from the selection box.
         /// </summary>
-        protected virtual void OnDragOperationEnded()
+        protected virtual void OnOperationEnded()
         {
             ChangeHandler.EndChange();
         }

From 983b693858195cfbcece3c1f76a52c2dc7e59a91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 16:24:50 +0900
Subject: [PATCH 05075/10326] Add flip logic to OsuSelectionHandler

---
 .../Edit/OsuSelectionHandler.cs               | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index f275e08234..2bd4bc5015 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -41,6 +41,45 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </summary>
         private Vector2? referenceOrigin;
 
+        public override bool HandleFlip(Direction direction)
+        {
+            var hitObjects = selectedMovableObjects;
+
+            var selectedObjectsQuad = getSurroundingQuad(hitObjects);
+            var centre = selectedObjectsQuad.Centre;
+
+            foreach (var h in hitObjects)
+            {
+                var pos = h.Position;
+
+                switch (direction)
+                {
+                    case Direction.Horizontal:
+                        pos.X = centre.X - (pos.X - centre.X);
+                        break;
+
+                    case Direction.Vertical:
+                        pos.Y = centre.Y - (pos.Y - centre.Y);
+                        break;
+                }
+
+                h.Position = pos;
+
+                if (h is Slider slider)
+                {
+                    foreach (var point in slider.Path.ControlPoints)
+                    {
+                        point.Position.Value = new Vector2(
+                            (direction == Direction.Horizontal ? -1 : 1) * point.Position.Value.X,
+                            (direction == Direction.Vertical ? -1 : 1) * point.Position.Value.Y
+                        );
+                    }
+                }
+            }
+
+            return true;
+        }
+
         public override bool HandleScale(Vector2 scale, Anchor reference)
         {
             adjustScaleFromAnchor(ref scale, reference);

From 78c5d5707496f4b7af3277c805063a0b7e5a5ec7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 16:25:29 +0900
Subject: [PATCH 05076/10326] Add flip event flow and stop passing raw input
 events to handle methods

---
 .../Visual/Editing/TestSceneComposeSelectBox.cs | 17 ++++++++---------
 .../Compose/Components/ComposeSelectionBox.cs   |  5 +++--
 .../Edit/Compose/Components/SelectionHandler.cs | 12 ++++++++++--
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index a1fb91024b..2e0be95ff7 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
@@ -20,7 +19,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("create box", () =>
                 Child = selectionArea = new Container
                 {
-                    Size = new Vector2(300),
+                    Size = new Vector2(400),
                     Position = -new Vector2(150),
                     Anchor = Anchor.Centre,
                     Children = new Drawable[]
@@ -42,29 +41,29 @@ namespace osu.Game.Tests.Visual.Editing
             AddToggleStep("toggle y", state => selectionBox.CanScaleY = state);
         }
 
-        private void handleScale(DragEvent e, Anchor reference)
+        private void handleScale(Vector2 amount, Anchor reference)
         {
             if ((reference & Anchor.y1) == 0)
             {
                 int directionY = (reference & Anchor.y0) > 0 ? -1 : 1;
                 if (directionY < 0)
-                    selectionArea.Y += e.Delta.Y;
-                selectionArea.Height += directionY * e.Delta.Y;
+                    selectionArea.Y += amount.Y;
+                selectionArea.Height += directionY * amount.Y;
             }
 
             if ((reference & Anchor.x1) == 0)
             {
                 int directionX = (reference & Anchor.x0) > 0 ? -1 : 1;
                 if (directionX < 0)
-                    selectionArea.X += e.Delta.X;
-                selectionArea.Width += directionX * e.Delta.X;
+                    selectionArea.X += amount.X;
+                selectionArea.Width += directionX * amount.X;
             }
         }
 
-        private void handleRotation(DragEvent e)
+        private void handleRotation(float angle)
         {
             // kinda silly and wrong, but just showing that the drag handles work.
-            selectionArea.Rotation += e.Delta.X;
+            selectionArea.Rotation += angle;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
index 530c6007cf..c457a68368 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
@@ -16,8 +16,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     public class ComposeSelectionBox : CompositeDrawable
     {
-        public Action<DragEvent> OnRotation;
-        public Action<DragEvent, Anchor> OnScale;
+        public Action<float> OnRotation;
+        public Action<Vector2, Anchor> OnScale;
+        public Action<Direction> OnFlip;
 
         public Action OperationStarted;
         public Action OperationEnded;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 435f84996a..1c2f09f831 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -100,8 +100,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 OperationStarted = OnOperationBegan,
                 OperationEnded = OnOperationEnded,
 
-                OnRotation = e => HandleRotation(e.Delta.X),
-                OnScale = (e, anchor) => HandleScale(e.Delta, anchor),
+                OnRotation = angle => HandleRotation(angle),
+                OnScale = (amount, anchor) => HandleScale(amount, anchor),
+                OnFlip = direction => HandleFlip(direction),
             };
 
         /// <summary>
@@ -151,6 +152,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether any <see cref="DrawableHitObject"/>s could be moved.</returns>
         public virtual bool HandleScale(Vector2 scale, Anchor anchor) => false;
 
+        /// <summary>
+        /// Handled the selected <see cref="DrawableHitObject"/>s being flipped.
+        /// </summary>
+        /// <param name="direction">The direction to flip</param>
+        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be moved.</returns>
+        public virtual bool HandleFlip(Direction direction) => false;
+
         public bool OnPressed(PlatformAction action)
         {
             switch (action.ActionMethod)

From 4e6a505a99740bee31ace700aa7994b994d0188d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 16:25:40 +0900
Subject: [PATCH 05077/10326] Add new icons and tooltips

---
 .../Compose/Components/ComposeSelectionBox.cs | 180 ++++++++++++------
 1 file changed, 124 insertions(+), 56 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
index c457a68368..a26533fdb5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
@@ -5,6 +5,7 @@ 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.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
@@ -68,6 +69,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        private FillFlowContainer buttons;
+
         public const float BORDER_RADIUS = 3;
 
         [Resolved]
@@ -105,72 +108,114 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         },
                     }
                 },
+                buttons = new FillFlowContainer
+                {
+                    Y = 20,
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.Centre
+                }
             };
 
-            if (CanRotate)
+            if (CanScaleX) addXScaleComponents();
+            if (CanScaleX && CanScaleY) addFullScaleComponents();
+            if (CanScaleY) addYScaleComponents();
+            if (CanRotate) addRotationComponents();
+        }
+
+        private void addRotationComponents()
+        {
+            const float separation = 40;
+
+            buttons.Insert(-1, new DragHandleButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise")
             {
-                const float separation = 40;
+                OperationStarted = operationStarted,
+                OperationEnded = operationEnded,
+                Action = () => OnRotation?.Invoke(-90)
+            });
 
-                AddRangeInternal(new Drawable[]
-                {
-                    new Box
-                    {
-                        Colour = colours.YellowLight,
-                        Blending = BlendingParameters.Additive,
-                        Alpha = 0.3f,
-                        Size = new Vector2(BORDER_RADIUS, separation),
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.BottomCentre,
-                    },
-                    new RotationDragHandle
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Y = -separation,
-                        HandleDrag = e => OnRotation?.Invoke(e),
-                        OperationStarted = operationStarted,
-                        OperationEnded = operationEnded
-                    }
-                });
-            }
-
-            if (CanScaleY)
+            buttons.Add(new DragHandleButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise")
             {
-                AddRangeInternal(new[]
-                {
-                    createDragHandle(Anchor.TopCentre),
-                    createDragHandle(Anchor.BottomCentre),
-                });
-            }
+                OperationStarted = operationStarted,
+                OperationEnded = operationEnded,
+                Action = () => OnRotation?.Invoke(90)
+            });
 
-            if (CanScaleX)
+            AddRangeInternal(new Drawable[]
             {
-                AddRangeInternal(new[]
+                new Box
                 {
-                    createDragHandle(Anchor.CentreLeft),
-                    createDragHandle(Anchor.CentreRight),
-                });
-            }
-
-            if (CanScaleX && CanScaleY)
-            {
-                AddRangeInternal(new[]
+                    Depth = float.MaxValue,
+                    Colour = colours.YellowLight,
+                    Blending = BlendingParameters.Additive,
+                    Alpha = 0.3f,
+                    Size = new Vector2(BORDER_RADIUS, separation),
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.BottomCentre,
+                },
+                new DragHandleButton(FontAwesome.Solid.Redo, "Free rotate")
                 {
-                    createDragHandle(Anchor.TopLeft),
-                    createDragHandle(Anchor.TopRight),
-                    createDragHandle(Anchor.BottomLeft),
-                    createDragHandle(Anchor.BottomRight),
-                });
-            }
-
-            ScaleDragHandle createDragHandle(Anchor anchor) =>
-                new ScaleDragHandle(anchor)
-                {
-                    HandleDrag = e => OnScale?.Invoke(e, anchor),
+                    Anchor = Anchor.TopCentre,
+                    Y = -separation,
+                    HandleDrag = e => OnRotation?.Invoke(e.Delta.X),
                     OperationStarted = operationStarted,
                     OperationEnded = operationEnded
-                };
+                }
+            });
         }
 
+        private void addYScaleComponents()
+        {
+            buttons.Add(new DragHandleButton(FontAwesome.Solid.ArrowsAltV, "Flip vertically")
+            {
+                OperationStarted = operationStarted,
+                OperationEnded = operationEnded,
+                Action = () => OnFlip?.Invoke(Direction.Vertical)
+            });
+
+            AddRangeInternal(new[]
+            {
+                createDragHandle(Anchor.TopCentre),
+                createDragHandle(Anchor.BottomCentre),
+            });
+        }
+
+        private void addFullScaleComponents()
+        {
+            AddRangeInternal(new[]
+            {
+                createDragHandle(Anchor.TopLeft),
+                createDragHandle(Anchor.TopRight),
+                createDragHandle(Anchor.BottomLeft),
+                createDragHandle(Anchor.BottomRight),
+            });
+        }
+
+        private void addXScaleComponents()
+        {
+            buttons.Add(new DragHandleButton(FontAwesome.Solid.ArrowsAltH, "Flip horizontally")
+            {
+                OperationStarted = operationStarted,
+                OperationEnded = operationEnded,
+                Action = () => OnFlip?.Invoke(Direction.Horizontal)
+            });
+
+            AddRangeInternal(new[]
+            {
+                createDragHandle(Anchor.CentreLeft),
+                createDragHandle(Anchor.CentreRight),
+            });
+        }
+
+        private ScaleDragHandle createDragHandle(Anchor anchor) =>
+            new ScaleDragHandle(anchor)
+            {
+                HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
+                OperationStarted = operationStarted,
+                OperationEnded = operationEnded
+            };
+
         private int activeOperations;
 
         private void operationEnded()
@@ -193,30 +238,53 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private class RotationDragHandle : DragHandle
+        private sealed class DragHandleButton : DragHandle, IHasTooltip
         {
             private SpriteIcon icon;
 
+            private readonly IconUsage iconUsage;
+
+            public Action Action;
+
+            public DragHandleButton(IconUsage iconUsage, string tooltip)
+            {
+                this.iconUsage = iconUsage;
+
+                TooltipText = tooltip;
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+            }
+
             [BackgroundDependencyLoader]
             private void load()
             {
                 Size *= 2;
-
                 AddInternal(icon = new SpriteIcon
                 {
                     RelativeSizeAxes = Axes.Both,
                     Size = new Vector2(0.5f),
-                    Icon = FontAwesome.Solid.Redo,
+                    Icon = iconUsage,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                 });
             }
 
+            protected override bool OnClick(ClickEvent e)
+            {
+                OperationStarted?.Invoke();
+                Action?.Invoke();
+                OperationEnded?.Invoke();
+                return true;
+            }
+
             protected override void UpdateHoverState()
             {
                 base.UpdateHoverState();
                 icon.Colour = !HandlingMouse && IsHovered ? Color4.White : Color4.Black;
             }
+
+            public string TooltipText { get; }
         }
 
         private class DragHandle : Container

From db1ad4243ec35e224580d00af45d9ee288296958 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 16:27:42 +0900
Subject: [PATCH 05078/10326] Remove need for ScaleDragHandle class

---
 .../Edit/Compose/Components/ComposeSelectionBox.cs  | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
index a26533fdb5..ef7bc0ba36 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
@@ -208,9 +208,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             });
         }
 
-        private ScaleDragHandle createDragHandle(Anchor anchor) =>
-            new ScaleDragHandle(anchor)
+        private DragHandle createDragHandle(Anchor anchor) =>
+            new DragHandle
             {
+                Anchor = anchor,
                 HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
                 OperationStarted = operationStarted,
                 OperationEnded = operationEnded
@@ -230,14 +231,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 OperationStarted?.Invoke();
         }
 
-        private class ScaleDragHandle : DragHandle
-        {
-            public ScaleDragHandle(Anchor anchor)
-            {
-                Anchor = anchor;
-            }
-        }
-
         private sealed class DragHandleButton : DragHandle, IHasTooltip
         {
             private SpriteIcon icon;

From 1aff263419080160c9bbe078fb26005ae41ef0cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 16:34:34 +0900
Subject: [PATCH 05079/10326] Split out classes and simplify construction of
 buttons

---
 .../Editing/TestSceneComposeSelectBox.cs      |   4 +-
 .../Compose/Components/ComposeSelectionBox.cs | 374 ------------------
 .../Edit/Compose/Components/DragBox.cs        |   2 +-
 .../Edit/Compose/Components/SelectionBox.cs   | 210 ++++++++++
 .../Components/SelectionBoxDragHandle.cs      | 105 +++++
 .../SelectionBoxDragHandleButton.cs           |  66 ++++
 .../Compose/Components/SelectionHandler.cs    |   6 +-
 7 files changed, 387 insertions(+), 380 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleButton.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 2e0be95ff7..da98a7a024 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual.Editing
 
         public TestSceneComposeSelectBox()
         {
-            ComposeSelectionBox selectionBox = null;
+            SelectionBox selectionBox = null;
 
             AddStep("create box", () =>
                 Child = selectionArea = new Container
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Editing
                     Anchor = Anchor.Centre,
                     Children = new Drawable[]
                     {
-                        selectionBox = new ComposeSelectionBox
+                        selectionBox = new SelectionBox
                         {
                             CanRotate = true,
                             CanScaleX = true,
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
deleted file mode 100644
index ef7bc0ba36..0000000000
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeSelectionBox.cs
+++ /dev/null
@@ -1,374 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Screens.Edit.Compose.Components
-{
-    public class ComposeSelectionBox : CompositeDrawable
-    {
-        public Action<float> OnRotation;
-        public Action<Vector2, Anchor> OnScale;
-        public Action<Direction> OnFlip;
-
-        public Action OperationStarted;
-        public Action OperationEnded;
-
-        private bool canRotate;
-
-        /// <summary>
-        /// Whether rotation support should be enabled.
-        /// </summary>
-        public bool CanRotate
-        {
-            get => canRotate;
-            set
-            {
-                canRotate = value;
-                recreate();
-            }
-        }
-
-        private bool canScaleX;
-
-        /// <summary>
-        /// Whether vertical scale support should be enabled.
-        /// </summary>
-        public bool CanScaleX
-        {
-            get => canScaleX;
-            set
-            {
-                canScaleX = value;
-                recreate();
-            }
-        }
-
-        private bool canScaleY;
-
-        /// <summary>
-        /// Whether horizontal scale support should be enabled.
-        /// </summary>
-        public bool CanScaleY
-        {
-            get => canScaleY;
-            set
-            {
-                canScaleY = value;
-                recreate();
-            }
-        }
-
-        private FillFlowContainer buttons;
-
-        public const float BORDER_RADIUS = 3;
-
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            RelativeSizeAxes = Axes.Both;
-
-            recreate();
-        }
-
-        private void recreate()
-        {
-            if (LoadState < LoadState.Loading)
-                return;
-
-            InternalChildren = new Drawable[]
-            {
-                new Container
-                {
-                    Masking = true,
-                    BorderThickness = BORDER_RADIUS,
-                    BorderColour = colours.YellowDark,
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-
-                            AlwaysPresent = true,
-                            Alpha = 0
-                        },
-                    }
-                },
-                buttons = new FillFlowContainer
-                {
-                    Y = 20,
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.Centre
-                }
-            };
-
-            if (CanScaleX) addXScaleComponents();
-            if (CanScaleX && CanScaleY) addFullScaleComponents();
-            if (CanScaleY) addYScaleComponents();
-            if (CanRotate) addRotationComponents();
-        }
-
-        private void addRotationComponents()
-        {
-            const float separation = 40;
-
-            buttons.Insert(-1, new DragHandleButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise")
-            {
-                OperationStarted = operationStarted,
-                OperationEnded = operationEnded,
-                Action = () => OnRotation?.Invoke(-90)
-            });
-
-            buttons.Add(new DragHandleButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise")
-            {
-                OperationStarted = operationStarted,
-                OperationEnded = operationEnded,
-                Action = () => OnRotation?.Invoke(90)
-            });
-
-            AddRangeInternal(new Drawable[]
-            {
-                new Box
-                {
-                    Depth = float.MaxValue,
-                    Colour = colours.YellowLight,
-                    Blending = BlendingParameters.Additive,
-                    Alpha = 0.3f,
-                    Size = new Vector2(BORDER_RADIUS, separation),
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.BottomCentre,
-                },
-                new DragHandleButton(FontAwesome.Solid.Redo, "Free rotate")
-                {
-                    Anchor = Anchor.TopCentre,
-                    Y = -separation,
-                    HandleDrag = e => OnRotation?.Invoke(e.Delta.X),
-                    OperationStarted = operationStarted,
-                    OperationEnded = operationEnded
-                }
-            });
-        }
-
-        private void addYScaleComponents()
-        {
-            buttons.Add(new DragHandleButton(FontAwesome.Solid.ArrowsAltV, "Flip vertically")
-            {
-                OperationStarted = operationStarted,
-                OperationEnded = operationEnded,
-                Action = () => OnFlip?.Invoke(Direction.Vertical)
-            });
-
-            AddRangeInternal(new[]
-            {
-                createDragHandle(Anchor.TopCentre),
-                createDragHandle(Anchor.BottomCentre),
-            });
-        }
-
-        private void addFullScaleComponents()
-        {
-            AddRangeInternal(new[]
-            {
-                createDragHandle(Anchor.TopLeft),
-                createDragHandle(Anchor.TopRight),
-                createDragHandle(Anchor.BottomLeft),
-                createDragHandle(Anchor.BottomRight),
-            });
-        }
-
-        private void addXScaleComponents()
-        {
-            buttons.Add(new DragHandleButton(FontAwesome.Solid.ArrowsAltH, "Flip horizontally")
-            {
-                OperationStarted = operationStarted,
-                OperationEnded = operationEnded,
-                Action = () => OnFlip?.Invoke(Direction.Horizontal)
-            });
-
-            AddRangeInternal(new[]
-            {
-                createDragHandle(Anchor.CentreLeft),
-                createDragHandle(Anchor.CentreRight),
-            });
-        }
-
-        private DragHandle createDragHandle(Anchor anchor) =>
-            new DragHandle
-            {
-                Anchor = anchor,
-                HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
-                OperationStarted = operationStarted,
-                OperationEnded = operationEnded
-            };
-
-        private int activeOperations;
-
-        private void operationEnded()
-        {
-            if (--activeOperations == 0)
-                OperationEnded?.Invoke();
-        }
-
-        private void operationStarted()
-        {
-            if (activeOperations++ == 0)
-                OperationStarted?.Invoke();
-        }
-
-        private sealed class DragHandleButton : DragHandle, IHasTooltip
-        {
-            private SpriteIcon icon;
-
-            private readonly IconUsage iconUsage;
-
-            public Action Action;
-
-            public DragHandleButton(IconUsage iconUsage, string tooltip)
-            {
-                this.iconUsage = iconUsage;
-
-                TooltipText = tooltip;
-
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                Size *= 2;
-                AddInternal(icon = new SpriteIcon
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(0.5f),
-                    Icon = iconUsage,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                });
-            }
-
-            protected override bool OnClick(ClickEvent e)
-            {
-                OperationStarted?.Invoke();
-                Action?.Invoke();
-                OperationEnded?.Invoke();
-                return true;
-            }
-
-            protected override void UpdateHoverState()
-            {
-                base.UpdateHoverState();
-                icon.Colour = !HandlingMouse && IsHovered ? Color4.White : Color4.Black;
-            }
-
-            public string TooltipText { get; }
-        }
-
-        private class DragHandle : Container
-        {
-            public Action OperationStarted;
-            public Action OperationEnded;
-
-            public Action<DragEvent> HandleDrag { get; set; }
-
-            private Circle circle;
-
-            [Resolved]
-            private OsuColour colours { get; set; }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                Size = new Vector2(10);
-                Origin = Anchor.Centre;
-
-                InternalChildren = new Drawable[]
-                {
-                    circle = new Circle
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    },
-                };
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                UpdateHoverState();
-            }
-
-            protected override bool OnHover(HoverEvent e)
-            {
-                UpdateHoverState();
-                return base.OnHover(e);
-            }
-
-            protected override void OnHoverLost(HoverLostEvent e)
-            {
-                base.OnHoverLost(e);
-                UpdateHoverState();
-            }
-
-            protected bool HandlingMouse;
-
-            protected override bool OnMouseDown(MouseDownEvent e)
-            {
-                HandlingMouse = true;
-                UpdateHoverState();
-                return true;
-            }
-
-            protected override bool OnDragStart(DragStartEvent e)
-            {
-                OperationStarted?.Invoke();
-                return true;
-            }
-
-            protected override void OnDrag(DragEvent e)
-            {
-                HandleDrag?.Invoke(e);
-                base.OnDrag(e);
-            }
-
-            protected override void OnDragEnd(DragEndEvent e)
-            {
-                HandlingMouse = false;
-                OperationEnded?.Invoke();
-
-                UpdateHoverState();
-                base.OnDragEnd(e);
-            }
-
-            protected override void OnMouseUp(MouseUpEvent e)
-            {
-                HandlingMouse = false;
-                UpdateHoverState();
-                base.OnMouseUp(e);
-            }
-
-            protected virtual void UpdateHoverState()
-            {
-                circle.Colour = HandlingMouse ? colours.GrayF : (IsHovered ? colours.Red : colours.YellowDark);
-                this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, 100, Easing.OutQuint);
-            }
-        }
-    }
-}
diff --git a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
index 0ec981203a..eaee2cd1e2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DragBox.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             Masking = true,
             BorderColour = Color4.White,
-            BorderThickness = ComposeSelectionBox.BORDER_RADIUS,
+            BorderThickness = SelectionBox.BORDER_RADIUS,
             Child = new Box
             {
                 RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
new file mode 100644
index 0000000000..ac6a7da361
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -0,0 +1,210 @@
+// Copyright (c) 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.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class SelectionBox : CompositeDrawable
+    {
+        public Action<float> OnRotation;
+        public Action<Vector2, Anchor> OnScale;
+        public Action<Direction> OnFlip;
+
+        public Action OperationStarted;
+        public Action OperationEnded;
+
+        private bool canRotate;
+
+        /// <summary>
+        /// Whether rotation support should be enabled.
+        /// </summary>
+        public bool CanRotate
+        {
+            get => canRotate;
+            set
+            {
+                canRotate = value;
+                recreate();
+            }
+        }
+
+        private bool canScaleX;
+
+        /// <summary>
+        /// Whether vertical scale support should be enabled.
+        /// </summary>
+        public bool CanScaleX
+        {
+            get => canScaleX;
+            set
+            {
+                canScaleX = value;
+                recreate();
+            }
+        }
+
+        private bool canScaleY;
+
+        /// <summary>
+        /// Whether horizontal scale support should be enabled.
+        /// </summary>
+        public bool CanScaleY
+        {
+            get => canScaleY;
+            set
+            {
+                canScaleY = value;
+                recreate();
+            }
+        }
+
+        private FillFlowContainer buttons;
+
+        public const float BORDER_RADIUS = 3;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            recreate();
+        }
+
+        private void recreate()
+        {
+            if (LoadState < LoadState.Loading)
+                return;
+
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    Masking = true,
+                    BorderThickness = BORDER_RADIUS,
+                    BorderColour = colours.YellowDark,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+
+                            AlwaysPresent = true,
+                            Alpha = 0
+                        },
+                    }
+                },
+                buttons = new FillFlowContainer
+                {
+                    Y = 20,
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.Centre
+                }
+            };
+
+            if (CanScaleX) addXScaleComponents();
+            if (CanScaleX && CanScaleY) addFullScaleComponents();
+            if (CanScaleY) addYScaleComponents();
+            if (CanRotate) addRotationComponents();
+        }
+
+        private void addRotationComponents()
+        {
+            const float separation = 40;
+
+            addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise", () => OnRotation?.Invoke(-90));
+            addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise", () => OnRotation?.Invoke(90));
+
+            AddRangeInternal(new Drawable[]
+            {
+                new Box
+                {
+                    Depth = float.MaxValue,
+                    Colour = colours.YellowLight,
+                    Blending = BlendingParameters.Additive,
+                    Alpha = 0.3f,
+                    Size = new Vector2(BORDER_RADIUS, separation),
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.BottomCentre,
+                },
+                new SelectionBoxDragHandleButton(FontAwesome.Solid.Redo, "Free rotate")
+                {
+                    Anchor = Anchor.TopCentre,
+                    Y = -separation,
+                    HandleDrag = e => OnRotation?.Invoke(e.Delta.X),
+                    OperationStarted = operationStarted,
+                    OperationEnded = operationEnded
+                }
+            });
+        }
+
+        private void addYScaleComponents()
+        {
+            addButton(FontAwesome.Solid.ArrowsAltV, "Flip vertically", () => OnFlip?.Invoke(Direction.Vertical));
+
+            addDragHandle(Anchor.TopCentre);
+            addDragHandle(Anchor.BottomCentre);
+        }
+
+        private void addFullScaleComponents()
+        {
+            addDragHandle(Anchor.TopLeft);
+            addDragHandle(Anchor.TopRight);
+            addDragHandle(Anchor.BottomLeft);
+            addDragHandle(Anchor.BottomRight);
+        }
+
+        private void addXScaleComponents()
+        {
+            addButton(FontAwesome.Solid.ArrowsAltH, "Flip horizontally", () => OnFlip?.Invoke(Direction.Horizontal));
+
+            addDragHandle(Anchor.CentreLeft);
+            addDragHandle(Anchor.CentreRight);
+        }
+
+        private void addButton(IconUsage icon, string tooltip, Action action)
+        {
+            buttons.Add(new SelectionBoxDragHandleButton(icon, tooltip)
+            {
+                OperationStarted = operationStarted,
+                OperationEnded = operationEnded,
+                Action = action
+            });
+        }
+
+        private void addDragHandle(Anchor anchor) => AddInternal(new SelectionBoxDragHandle
+        {
+            Anchor = anchor,
+            HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
+            OperationStarted = operationStarted,
+            OperationEnded = operationEnded
+        });
+
+        private int activeOperations;
+
+        private void operationEnded()
+        {
+            if (--activeOperations == 0)
+                OperationEnded?.Invoke();
+        }
+
+        private void operationStarted()
+        {
+            if (activeOperations++ == 0)
+                OperationStarted?.Invoke();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
new file mode 100644
index 0000000000..921b4eb042
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -0,0 +1,105 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+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;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class SelectionBoxDragHandle : Container
+    {
+        public Action OperationStarted;
+        public Action OperationEnded;
+
+        public Action<DragEvent> HandleDrag { get; set; }
+
+        private Circle circle;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Size = new Vector2(10);
+            Origin = Anchor.Centre;
+
+            InternalChildren = new Drawable[]
+            {
+                circle = new Circle
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            UpdateHoverState();
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            UpdateHoverState();
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            UpdateHoverState();
+        }
+
+        protected bool HandlingMouse;
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            HandlingMouse = true;
+            UpdateHoverState();
+            return true;
+        }
+
+        protected override bool OnDragStart(DragStartEvent e)
+        {
+            OperationStarted?.Invoke();
+            return true;
+        }
+
+        protected override void OnDrag(DragEvent e)
+        {
+            HandleDrag?.Invoke(e);
+            base.OnDrag(e);
+        }
+
+        protected override void OnDragEnd(DragEndEvent e)
+        {
+            HandlingMouse = false;
+            OperationEnded?.Invoke();
+
+            UpdateHoverState();
+            base.OnDragEnd(e);
+        }
+
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            HandlingMouse = false;
+            UpdateHoverState();
+            base.OnMouseUp(e);
+        }
+
+        protected virtual void UpdateHoverState()
+        {
+            circle.Colour = HandlingMouse ? colours.GrayF : (IsHovered ? colours.Red : colours.YellowDark);
+            this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, 100, Easing.OutQuint);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleButton.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleButton.cs
new file mode 100644
index 0000000000..74ae949389
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleButton.cs
@@ -0,0 +1,66 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    /// <summary>
+    /// A drag "handle" which shares the visual appearance but behaves more like a clickable button.
+    /// </summary>
+    public sealed class SelectionBoxDragHandleButton : SelectionBoxDragHandle, IHasTooltip
+    {
+        private SpriteIcon icon;
+
+        private readonly IconUsage iconUsage;
+
+        public Action Action;
+
+        public SelectionBoxDragHandleButton(IconUsage iconUsage, string tooltip)
+        {
+            this.iconUsage = iconUsage;
+
+            TooltipText = tooltip;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Size *= 2;
+            AddInternal(icon = new SpriteIcon
+            {
+                RelativeSizeAxes = Axes.Both,
+                Size = new Vector2(0.5f),
+                Icon = iconUsage,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+        }
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            OperationStarted?.Invoke();
+            Action?.Invoke();
+            OperationEnded?.Invoke();
+            return true;
+        }
+
+        protected override void UpdateHoverState()
+        {
+            base.UpdateHoverState();
+            icon.Colour = !HandlingMouse && IsHovered ? Color4.White : Color4.Black;
+        }
+
+        public string TooltipText { get; }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 1c2f09f831..fdf8dbe44e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private OsuSpriteText selectionDetailsText;
 
-        protected ComposeSelectionBox SelectionBox { get; private set; }
+        protected SelectionBox SelectionBox { get; private set; }
 
         [Resolved(CanBeNull = true)]
         protected EditorBeatmap EditorBeatmap { get; private set; }
@@ -94,8 +94,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
         }
 
-        public ComposeSelectionBox CreateSelectionBox()
-            => new ComposeSelectionBox
+        public SelectionBox CreateSelectionBox()
+            => new SelectionBox
             {
                 OperationStarted = OnOperationBegan,
                 OperationEnded = OnOperationEnded,

From 60e6cfa45cbfdd11768610ac6e10eb68497ea834 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 16:36:03 +0900
Subject: [PATCH 05080/10326] Avoid recreating child hierarchy when unnecessary

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index ac6a7da361..64191e48e2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             get => canRotate;
             set
             {
+                if (canRotate == value) return;
+
                 canRotate = value;
                 recreate();
             }
@@ -46,6 +48,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             get => canScaleX;
             set
             {
+                if (canScaleX == value) return;
+
                 canScaleX = value;
                 recreate();
             }
@@ -61,6 +65,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             get => canScaleY;
             set
             {
+                if (canScaleY == value) return;
+
                 canScaleY = value;
                 recreate();
             }

From 482c23901b4b9aed6f62be5d2fbe719874e72ff6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 16:54:56 +0900
Subject: [PATCH 05081/10326] Check RequestedPlaying state before allowing
 scheduled resume of looped sample

---
 osu.Game/Skinning/PausableSkinnableSound.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index d080e2ccd9..9819574b1d 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -41,8 +41,14 @@ namespace osu.Game.Skinning
                         // it's not easy to know if a sample has finished playing (to end).
                         // to keep things simple only resume playing looping samples.
                         else if (Looping)
+                        {
                             // schedule so we don't start playing a sample which is no longer alive.
-                            Schedule(base.Play);
+                            Schedule(() =>
+                            {
+                                if (RequestedPlaying)
+                                    base.Play();
+                            });
+                        }
                     }
                 });
             }

From 538973e3942ea8c589e5e98f35890605cb69f5b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 17:06:05 +0900
Subject: [PATCH 05082/10326] Use float methods for math operations

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 6b4f13db35..daf4a0102b 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -183,8 +183,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             point.Y -= origin.Y;
 
             Vector2 ret;
-            ret.X = (float)(point.X * Math.Cos(MathUtils.DegreesToRadians(angle)) + point.Y * Math.Sin(angle / 180f * Math.PI));
-            ret.Y = (float)(point.X * -Math.Sin(MathUtils.DegreesToRadians(angle)) + point.Y * Math.Cos(angle / 180f * Math.PI));
+            ret.X = point.X * MathF.Cos(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Sin(angle / 180f * MathF.PI);
+            ret.Y = point.X * -MathF.Sin(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Cos(angle / 180f * MathF.PI);
 
             ret.X += origin.X;
             ret.Y += origin.Y;

From b6dc8bb2d3f16fa41934187fe9957865db1d2f20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 18:10:05 +0900
Subject: [PATCH 05083/10326] Fix remaining manual degree-to-radian conversions

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index daf4a0102b..a0f70ce408 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -183,8 +183,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             point.Y -= origin.Y;
 
             Vector2 ret;
-            ret.X = point.X * MathF.Cos(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Sin(angle / 180f * MathF.PI);
-            ret.Y = point.X * -MathF.Sin(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Cos(angle / 180f * MathF.PI);
+            ret.X = point.X * MathF.Cos(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Sin(MathUtils.DegreesToRadians(angle));
+            ret.Y = point.X * -MathF.Sin(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Cos(MathUtils.DegreesToRadians(angle));
 
             ret.X += origin.X;
             ret.Y += origin.Y;

From 0d03084cdc03c849e25320913ae2cff97bdda723 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 17:19:35 +0900
Subject: [PATCH 05084/10326] Move control point display to the base timeline
 class

We want them to display on all screens with a timeline as they are quite
useful in all cases.
---
 .../Compose/Components/Timeline/Timeline.cs   | 28 ++++++++++++++-----
 .../Components/Timeline/TimelineArea.cs       | 17 ++++++++---
 osu.Game/Screens/Edit/Timing/TimingScreen.cs  |  6 ----
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index ed3d328330..a93ad9ac0d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -12,6 +12,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
@@ -21,6 +22,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     public class Timeline : ZoomableScrollContainer, IPositionSnapProvider
     {
         public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
+
+        public readonly Bindable<bool> ControlPointsVisible = new Bindable<bool>();
+
         public readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
         [Resolved]
@@ -56,24 +60,34 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         }
 
         private WaveformGraph waveform;
+        private ControlPointPart controlPoints;
 
         [BackgroundDependencyLoader]
         private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours)
         {
-            Add(waveform = new WaveformGraph
+            AddRange(new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Colour = colours.Blue.Opacity(0.2f),
-                LowColour = colours.BlueLighter,
-                MidColour = colours.BlueDark,
-                HighColour = colours.BlueDarker,
-                Depth = float.MaxValue
+                waveform = new WaveformGraph
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colours.Blue.Opacity(0.2f),
+                    LowColour = colours.BlueLighter,
+                    MidColour = colours.BlueDark,
+                    HighColour = colours.BlueDarker,
+                    Depth = float.MaxValue
+                },
+                controlPoints = new ControlPointPart
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                new TimelineTickDisplay(),
             });
 
             // We don't want the centre marker to scroll
             AddInternal(new CentreMarker { Depth = float.MaxValue });
 
             WaveformVisible.ValueChanged += visible => waveform.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
+            ControlPointsVisible.ValueChanged += visible => controlPoints.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
 
             Beatmap.BindTo(beatmap);
             Beatmap.BindValueChanged(b =>
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index d870eb5279..1d2d46517b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             CornerRadius = 5;
 
             OsuCheckbox waveformCheckbox;
+            OsuCheckbox controlPointsCheckbox;
 
             InternalChildren = new Drawable[]
             {
@@ -57,12 +58,21 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                         Origin = Anchor.CentreLeft,
                                         AutoSizeAxes = Axes.Y,
                                         Width = 160,
-                                        Padding = new MarginPadding { Horizontal = 15 },
+                                        Padding = new MarginPadding { Horizontal = 10 },
                                         Direction = FillDirection.Vertical,
                                         Spacing = new Vector2(0, 4),
                                         Children = new[]
                                         {
-                                            waveformCheckbox = new OsuCheckbox { LabelText = "Waveform" }
+                                            waveformCheckbox = new OsuCheckbox
+                                            {
+                                                LabelText = "Waveform",
+                                                Current = { Value = true },
+                                            },
+                                            controlPointsCheckbox = new OsuCheckbox
+                                            {
+                                                LabelText = "Control Points",
+                                                Current = { Value = true },
+                                            }
                                         }
                                     }
                                 }
@@ -119,9 +129,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 }
             };
 
-            waveformCheckbox.Current.Value = true;
-
             Timeline.WaveformVisible.BindTo(waveformCheckbox.Current);
+            Timeline.ControlPointsVisible.BindTo(controlPointsCheckbox.Current);
         }
 
         private void changeZoom(float change) => Timeline.Zoom += change;
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 0a0cfe193d..269874fea8 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -12,7 +12,6 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 
@@ -31,11 +30,6 @@ namespace osu.Game.Screens.Edit.Timing
         {
         }
 
-        protected override Drawable CreateTimelineContent() => new ControlPointPart
-        {
-            RelativeSizeAxes = Axes.Both,
-        };
-
         protected override Drawable CreateMainContent() => new GridContainer
         {
             RelativeSizeAxes = Axes.Both,

From b654396a4cb89def74d240b795cc73dbf2602534 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 17:40:31 +0900
Subject: [PATCH 05085/10326] Move ticks display to timeline

---
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index d6d782e70c..b9457f422a 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -112,7 +112,6 @@ namespace osu.Game.Screens.Edit
                     RelativeSizeAxes = Axes.Both,
                     Children = new[]
                     {
-                        new TimelineTickDisplay(),
                         CreateTimelineContent(),
                     }
                 }, t =>

From 00a19b4879954b5ab4f143f417eb477763f4e5f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 18:14:10 +0900
Subject: [PATCH 05086/10326] Also add toggle for ticks display

---
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs   | 6 +++++-
 .../Edit/Compose/Components/Timeline/TimelineArea.cs       | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index a93ad9ac0d..e6b0dd715a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         public readonly Bindable<bool> ControlPointsVisible = new Bindable<bool>();
 
+        public readonly Bindable<bool> TicksVisible = new Bindable<bool>();
+
         public readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
         [Resolved]
@@ -61,6 +63,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private WaveformGraph waveform;
         private ControlPointPart controlPoints;
+        private TimelineTickDisplay ticks;
 
         [BackgroundDependencyLoader]
         private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours)
@@ -80,7 +83,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 {
                     RelativeSizeAxes = Axes.Both
                 },
-                new TimelineTickDisplay(),
+                ticks = new TimelineTickDisplay(),
             });
 
             // We don't want the centre marker to scroll
@@ -88,6 +91,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             WaveformVisible.ValueChanged += visible => waveform.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
             ControlPointsVisible.ValueChanged += visible => controlPoints.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
+            TicksVisible.ValueChanged += visible => ticks.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
 
             Beatmap.BindTo(beatmap);
             Beatmap.BindValueChanged(b =>
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index 1d2d46517b..0ec48e04c6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             OsuCheckbox waveformCheckbox;
             OsuCheckbox controlPointsCheckbox;
+            OsuCheckbox ticksCheckbox;
 
             InternalChildren = new Drawable[]
             {
@@ -72,6 +73,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                             {
                                                 LabelText = "Control Points",
                                                 Current = { Value = true },
+                                            },
+                                            ticksCheckbox = new OsuCheckbox
+                                            {
+                                                LabelText = "Ticks",
+                                                Current = { Value = true },
                                             }
                                         }
                                     }
@@ -131,6 +137,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             Timeline.WaveformVisible.BindTo(waveformCheckbox.Current);
             Timeline.ControlPointsVisible.BindTo(controlPointsCheckbox.Current);
+            Timeline.TicksVisible.BindTo(ticksCheckbox.Current);
         }
 
         private void changeZoom(float change) => Timeline.Zoom += change;

From ffc1e9c35881288b24a2e11b5a405190bb14e860 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 18:23:38 +0900
Subject: [PATCH 05087/10326] 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 afc5d4ec52..78ceaa8616 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.930.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1001.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5fa1685d9b..3a839ac1a4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.930.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1001.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 60708a39e2..48c91f0d53 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.Framework.iOS" Version="2020.930.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1001.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.930.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1001.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 70d475be1fec41d3e565fb38cd1e1f768c8525a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 18:54:59 +0900
Subject: [PATCH 05088/10326] Fix elements appearing in front of hitobjects

---
 .../Compose/Components/Timeline/Timeline.cs   | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index e6b0dd715a..3e54813a14 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -8,6 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -70,20 +71,27 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             AddRange(new Drawable[]
             {
-                waveform = new WaveformGraph
+                new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colours.Blue.Opacity(0.2f),
-                    LowColour = colours.BlueLighter,
-                    MidColour = colours.BlueDark,
-                    HighColour = colours.BlueDarker,
-                    Depth = float.MaxValue
+                    Depth = float.MaxValue,
+                    Children = new Drawable[]
+                    {
+                        waveform = new WaveformGraph
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = colours.Blue.Opacity(0.2f),
+                            LowColour = colours.BlueLighter,
+                            MidColour = colours.BlueDark,
+                            HighColour = colours.BlueDarker,
+                        },
+                        controlPoints = new ControlPointPart
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        },
+                        ticks = new TimelineTickDisplay(),
+                    }
                 },
-                controlPoints = new ControlPointPart
-                {
-                    RelativeSizeAxes = Axes.Both
-                },
-                ticks = new TimelineTickDisplay(),
             });
 
             // We don't want the centre marker to scroll

From 70931abcb0a2b80cfc9aaecbddbc71e6c7ff5b89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 17:54:54 +0900
Subject: [PATCH 05089/10326] Separate out timeline control point display from
 summary timeline display

---
 .../Timeline/DifficultyPointPiece.cs          | 66 +++++++++++++++++++
 .../Compose/Components/Timeline/Timeline.cs   | 10 ++-
 .../Timeline/TimelineControlPointDisplay.cs   | 57 ++++++++++++++++
 .../Timeline/TimelineControlPointGroup.cs     | 55 ++++++++++++++++
 4 files changed, 182 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
new file mode 100644
index 0000000000..4d5970d7e7
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
+{
+    public class DifficultyPointPiece : CompositeDrawable
+    {
+        private OsuSpriteText speedMultiplierText;
+        private readonly BindableNumber<double> speedMultiplier;
+
+        public DifficultyPointPiece(DifficultyControlPoint point)
+        {
+            speedMultiplier = point.SpeedMultiplierBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            RelativeSizeAxes = Axes.Y;
+            AutoSizeAxes = Axes.X;
+
+            Color4 colour = colours.GreenDark;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colour,
+                    Width = 2,
+                    RelativeSizeAxes = Axes.Y,
+                },
+                new Container
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colour,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        speedMultiplierText = new OsuSpriteText
+                        {
+                            Font = OsuFont.Default.With(weight: FontWeight.Bold),
+                            Colour = Color4.White,
+                        }
+                    }
+                },
+            };
+
+            speedMultiplier.BindValueChanged(multiplier => speedMultiplierText.Text = $"{multiplier.NewValue:n2}x", true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 3e54813a14..3d2e2ebef7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -13,7 +13,6 @@ using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
@@ -63,9 +62,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         }
 
         private WaveformGraph waveform;
-        private ControlPointPart controlPoints;
+
         private TimelineTickDisplay ticks;
 
+        private TimelineControlPointDisplay controlPoints;
+
         [BackgroundDependencyLoader]
         private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours)
         {
@@ -85,10 +86,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             MidColour = colours.BlueDark,
                             HighColour = colours.BlueDarker,
                         },
-                        controlPoints = new ControlPointPart
-                        {
-                            RelativeSizeAxes = Axes.Both
-                        },
+                        controlPoints = new TimelineControlPointDisplay(),
                         ticks = new TimelineTickDisplay(),
                     }
                 },
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
new file mode 100644
index 0000000000..3f13e8e5d4
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.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.Collections.Specialized;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
+
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
+{
+    /// <summary>
+    /// The part of the timeline that displays the control points.
+    /// </summary>
+    public class TimelineControlPointDisplay : TimelinePart<TimelineControlPointGroup>
+    {
+        private IBindableList<ControlPointGroup> controlPointGroups;
+
+        public TimelineControlPointDisplay()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        {
+            base.LoadBeatmap(beatmap);
+
+            controlPointGroups = beatmap.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
+            controlPointGroups.BindCollectionChanged((sender, args) =>
+            {
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Reset:
+                        Clear();
+                        break;
+
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (var group in args.NewItems.OfType<ControlPointGroup>())
+                            Add(new TimelineControlPointGroup(group));
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (var group in args.OldItems.OfType<ControlPointGroup>())
+                        {
+                            var matching = Children.SingleOrDefault(gv => gv.Group == group);
+
+                            matching?.Expire();
+                        }
+
+                        break;
+                }
+            }, true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
new file mode 100644
index 0000000000..5429e7c55b
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
+{
+    public class TimelineControlPointGroup : CompositeDrawable
+    {
+        public readonly ControlPointGroup Group;
+
+        private BindableList<ControlPoint> controlPoints;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public TimelineControlPointGroup(ControlPointGroup group)
+        {
+            Origin = Anchor.TopCentre;
+
+            Group = group;
+
+            RelativePositionAxes = Axes.X;
+            RelativeSizeAxes = Axes.Y;
+
+            Width = 1;
+
+            X = (float)group.Time;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            controlPoints = (BindableList<ControlPoint>)Group.ControlPoints.GetBoundCopy();
+            controlPoints.BindCollectionChanged((_, __) =>
+            {
+                foreach (var point in controlPoints)
+                {
+                    switch (point)
+                    {
+                        case DifficultyControlPoint difficultyPoint:
+                            AddInternal(new DifficultyPointPiece(difficultyPoint));
+                            break;
+                    }
+                }
+            }, true);
+        }
+    }
+}

From 0bced34272de9f403bd85c47a5d99ffb844870e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 18:07:39 +0900
Subject: [PATCH 05090/10326] Add visualisation of bpm (timing) changes to
 timeline

---
 .../Timeline/TimelineControlPointGroup.cs     | 11 ++--
 .../Components/Timeline/TimingPointPiece.cs   | 57 +++++++++++++++++++
 2 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
index 5429e7c55b..05a7f6e493 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
@@ -21,14 +21,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         public TimelineControlPointGroup(ControlPointGroup group)
         {
-            Origin = Anchor.TopCentre;
-
             Group = group;
 
             RelativePositionAxes = Axes.X;
             RelativeSizeAxes = Axes.Y;
-
-            Width = 1;
+            AutoSizeAxes = Axes.X;
 
             X = (float)group.Time;
         }
@@ -40,6 +37,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             controlPoints = (BindableList<ControlPoint>)Group.ControlPoints.GetBoundCopy();
             controlPoints.BindCollectionChanged((_, __) =>
             {
+                ClearInternal();
+
                 foreach (var point in controlPoints)
                 {
                     switch (point)
@@ -47,6 +46,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         case DifficultyControlPoint difficultyPoint:
                             AddInternal(new DifficultyPointPiece(difficultyPoint));
                             break;
+
+                        case TimingControlPoint timingPoint:
+                            AddInternal(new TimingPointPiece(timingPoint));
+                            break;
                     }
                 }
             }, true);
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
new file mode 100644
index 0000000000..de7cfecbf0
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.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 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.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
+{
+    public class TimingPointPiece : CompositeDrawable
+    {
+        private readonly BindableNumber<double> beatLength;
+        private OsuSpriteText bpmText;
+
+        public TimingPointPiece(TimingControlPoint point)
+        {
+            beatLength = point.BeatLengthBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Origin = Anchor.CentreLeft;
+            Anchor = Anchor.CentreLeft;
+
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Alpha = 0.9f,
+                    Colour = ColourInfo.GradientHorizontal(colours.YellowDark, colours.YellowDark.Opacity(0.5f)),
+                    RelativeSizeAxes = Axes.Both,
+                },
+                bpmText = new OsuSpriteText
+                {
+                    Alpha = 0.9f,
+                    Padding = new MarginPadding(3),
+                    Font = OsuFont.Default.With(size: 40)
+                }
+            };
+
+            beatLength.BindValueChanged(beatLength =>
+            {
+                bpmText.Text = $"{60000 / beatLength.NewValue:n1} BPM";
+            }, true);
+        }
+    }
+}

From b75c202a7e5547b4cf4d12c15bc1537418150ab8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 18:49:48 +0900
Subject: [PATCH 05091/10326] Add sample control point display in timeline

---
 .../Timeline/DifficultyPointPiece.cs          |  2 -
 .../Components/Timeline/SamplePointPiece.cs   | 81 +++++++++++++++++++
 .../Timeline/TimelineControlPointGroup.cs     |  4 +
 3 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 4d5970d7e7..31cc768056 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -41,8 +41,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 },
                 new Container
                 {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
                     AutoSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
new file mode 100644
index 0000000000..67da335f6b
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.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 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.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
+{
+    public class SamplePointPiece : CompositeDrawable
+    {
+        private readonly Bindable<string> bank;
+        private readonly BindableNumber<int> volume;
+
+        private OsuSpriteText text;
+        private Box volumeBox;
+
+        public SamplePointPiece(SampleControlPoint samplePoint)
+        {
+            volume = samplePoint.SampleVolumeBindable.GetBoundCopy();
+            bank = samplePoint.SampleBankBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Origin = Anchor.TopLeft;
+            Anchor = Anchor.TopLeft;
+
+            AutoSizeAxes = Axes.X;
+            RelativeSizeAxes = Axes.Y;
+
+            Color4 colour = colours.BlueDarker;
+
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 20,
+                    Children = new Drawable[]
+                    {
+                        volumeBox = new Box
+                        {
+                            X = 2,
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Colour = ColourInfo.GradientVertical(colour, Color4.Black),
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new Box
+                        {
+                            Colour = colours.Blue,
+                            Width = 2,
+                            RelativeSizeAxes = Axes.Y,
+                        },
+                    }
+                },
+                text = new OsuSpriteText
+                {
+                    X = 2,
+                    Y = -5,
+                    Anchor = Anchor.BottomLeft,
+                    Alpha = 0.9f,
+                    Rotation = -90,
+                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold)
+                }
+            };
+
+            volume.BindValueChanged(volume => volumeBox.Height = volume.NewValue / 100f, true);
+            bank.BindValueChanged(bank => text.Text = $"{bank.NewValue}", true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
index 05a7f6e493..1a09a05a6c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
@@ -50,6 +50,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         case TimingControlPoint timingPoint:
                             AddInternal(new TimingPointPiece(timingPoint));
                             break;
+
+                        case SampleControlPoint samplePoint:
+                            AddInternal(new SamplePointPiece(samplePoint));
+                            break;
                     }
                 }
             }, true);

From 589a26a149d11b99c70560b117d79913729d4f59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 18:59:35 +0900
Subject: [PATCH 05092/10326] Ensure stable display order for control points in
 the same group

---
 .../Compose/Components/Timeline/TimelineControlPointGroup.cs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
index 1a09a05a6c..e32616a574 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     switch (point)
                     {
                         case DifficultyControlPoint difficultyPoint:
-                            AddInternal(new DifficultyPointPiece(difficultyPoint));
+                            AddInternal(new DifficultyPointPiece(difficultyPoint) { Depth = -2 });
                             break;
 
                         case TimingControlPoint timingPoint:
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             break;
 
                         case SampleControlPoint samplePoint:
-                            AddInternal(new SamplePointPiece(samplePoint));
+                            AddInternal(new SamplePointPiece(samplePoint) { Depth = -1 });
                             break;
                     }
                 }

From fcccce8b4e2f5466059906b82c4ad1f76ba45df7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 19:03:17 +0900
Subject: [PATCH 05093/10326] Use pink for sample control points to avoid clash
 with waveform blue

---
 .../Edit/Compose/Components/Timeline/SamplePointPiece.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index 67da335f6b..6a6e947343 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             AutoSizeAxes = Axes.X;
             RelativeSizeAxes = Axes.Y;
 
-            Color4 colour = colours.BlueDarker;
+            Color4 colour = colours.PinkDarker;
 
             InternalChildren = new Drawable[]
             {
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         },
                         new Box
                         {
-                            Colour = colours.Blue,
+                            Colour = colours.Pink,
                             Width = 2,
                             RelativeSizeAxes = Axes.Y,
                         },

From e96e30a19d3bf861ada8cac8d85c59852e63c25f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 19:29:34 +0900
Subject: [PATCH 05094/10326] Move control point colour specifications to
 common location and use for formatting timing screen table

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs |  4 ++++
 .../ControlPoints/DifficultyControlPoint.cs     |  4 ++++
 .../ControlPoints/EffectControlPoint.cs         |  4 ++++
 .../ControlPoints/SampleControlPoint.cs         |  4 ++++
 .../ControlPoints/TimingControlPoint.cs         |  4 ++++
 .../Components/Timeline/DifficultyPointPiece.cs |  9 ++++++---
 .../Components/Timeline/SamplePointPiece.cs     |  8 ++++++--
 .../Components/Timeline/TimingPointPiece.cs     |  8 +++++++-
 .../Screens/Edit/Timing/ControlPointTable.cs    | 17 +++++++++++++----
 osu.Game/Screens/Edit/Timing/RowAttribute.cs    |  7 +++++--
 10 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index a1822a1163..c6649f6af1 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Game.Graphics;
+using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.ControlPoints
 {
@@ -18,6 +20,8 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public int CompareTo(ControlPoint other) => Time.CompareTo(other.Time);
 
+        public virtual Color4 GetRepresentingColour(OsuColour colours) => colours.Yellow;
+
         /// <summary>
         /// Determines whether this <see cref="ControlPoint"/> results in a meaningful change when placed alongside another.
         /// </summary>
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 1d38790f87..283bf76572 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Game.Graphics;
+using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.ControlPoints
 {
@@ -23,6 +25,8 @@ namespace osu.Game.Beatmaps.ControlPoints
             MaxValue = 10
         };
 
+        public override Color4 GetRepresentingColour(OsuColour colours) => colours.GreenDark;
+
         /// <summary>
         /// The speed multiplier at this control point.
         /// </summary>
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index 9e8e3978be..ea28fca170 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Game.Graphics;
+using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.ControlPoints
 {
@@ -18,6 +20,8 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         public readonly BindableBool OmitFirstBarLineBindable = new BindableBool();
 
+        public override Color4 GetRepresentingColour(OsuColour colours) => colours.Purple;
+
         /// <summary>
         /// Whether the first bar line of this control point is ignored.
         /// </summary>
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index c052c04ea0..f57ecfb9e3 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -3,6 +3,8 @@
 
 using osu.Framework.Bindables;
 using osu.Game.Audio;
+using osu.Game.Graphics;
+using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.ControlPoints
 {
@@ -16,6 +18,8 @@ namespace osu.Game.Beatmaps.ControlPoints
             SampleVolumeBindable = { Disabled = true }
         };
 
+        public override Color4 GetRepresentingColour(OsuColour colours) => colours.Pink;
+
         /// <summary>
         /// The default sample bank at this control point.
         /// </summary>
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 9345299c3a..d9378bca4a 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -3,6 +3,8 @@
 
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Graphics;
+using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.ControlPoints
 {
@@ -18,6 +20,8 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         private const double default_beat_length = 60000.0 / 60.0;
 
+        public override Color4 GetRepresentingColour(OsuColour colours) => colours.YellowDark;
+
         public static readonly TimingControlPoint DEFAULT = new TimingControlPoint
         {
             BeatLengthBindable =
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 31cc768056..510ba8c094 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -15,12 +15,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class DifficultyPointPiece : CompositeDrawable
     {
+        private readonly DifficultyControlPoint difficultyPoint;
+
         private OsuSpriteText speedMultiplierText;
         private readonly BindableNumber<double> speedMultiplier;
 
-        public DifficultyPointPiece(DifficultyControlPoint point)
+        public DifficultyPointPiece(DifficultyControlPoint difficultyPoint)
         {
-            speedMultiplier = point.SpeedMultiplierBindable.GetBoundCopy();
+            this.difficultyPoint = difficultyPoint;
+            speedMultiplier = difficultyPoint.SpeedMultiplierBindable.GetBoundCopy();
         }
 
         [BackgroundDependencyLoader]
@@ -29,7 +32,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.Y;
             AutoSizeAxes = Axes.X;
 
-            Color4 colour = colours.GreenDark;
+            Color4 colour = difficultyPoint.GetRepresentingColour(colours);
 
             InternalChildren = new Drawable[]
             {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index 6a6e947343..ffc0e55940 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.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.Colour;
 using osu.Framework.Graphics.Containers;
@@ -16,6 +17,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class SamplePointPiece : CompositeDrawable
     {
+        private readonly SampleControlPoint samplePoint;
+
         private readonly Bindable<string> bank;
         private readonly BindableNumber<int> volume;
 
@@ -24,6 +27,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         public SamplePointPiece(SampleControlPoint samplePoint)
         {
+            this.samplePoint = samplePoint;
             volume = samplePoint.SampleVolumeBindable.GetBoundCopy();
             bank = samplePoint.SampleBankBindable.GetBoundCopy();
         }
@@ -37,7 +41,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             AutoSizeAxes = Axes.X;
             RelativeSizeAxes = Axes.Y;
 
-            Color4 colour = colours.PinkDarker;
+            Color4 colour = samplePoint.GetRepresentingColour(colours);
 
             InternalChildren = new Drawable[]
             {
@@ -57,7 +61,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         },
                         new Box
                         {
-                            Colour = colours.Pink,
+                            Colour = colour.Lighten(0.2f),
                             Width = 2,
                             RelativeSizeAxes = Axes.Y,
                         },
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
index de7cfecbf0..ba94916458 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
@@ -11,16 +11,20 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class TimingPointPiece : CompositeDrawable
     {
+        private readonly TimingControlPoint point;
+
         private readonly BindableNumber<double> beatLength;
         private OsuSpriteText bpmText;
 
         public TimingPointPiece(TimingControlPoint point)
         {
+            this.point = point;
             beatLength = point.BeatLengthBindable.GetBoundCopy();
         }
 
@@ -32,12 +36,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             AutoSizeAxes = Axes.Both;
 
+            Color4 colour = point.GetRepresentingColour(colours);
+
             InternalChildren = new Drawable[]
             {
                 new Box
                 {
                     Alpha = 0.9f,
-                    Colour = ColourInfo.GradientHorizontal(colours.YellowDark, colours.YellowDark.Opacity(0.5f)),
+                    Colour = ColourInfo.GradientHorizontal(colour, colour.Opacity(0.5f)),
                     RelativeSizeAxes = Axes.Both,
                 },
                 bpmText = new OsuSpriteText
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 87af4546f1..4121e1f7bb 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -114,7 +114,14 @@ namespace osu.Game.Screens.Edit.Timing
 
                 controlPoints = group.ControlPoints.GetBoundCopy();
                 controlPoints.CollectionChanged += (_, __) => createChildren();
+            }
 
+            [Resolved]
+            private OsuColour colours { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
                 createChildren();
             }
 
@@ -125,20 +132,22 @@ namespace osu.Game.Screens.Edit.Timing
 
             private Drawable createAttribute(ControlPoint controlPoint)
             {
+                Color4 colour = controlPoint.GetRepresentingColour(colours);
+
                 switch (controlPoint)
                 {
                     case TimingControlPoint timing:
-                        return new RowAttribute("timing", () => $"{60000 / timing.BeatLength:n1}bpm {timing.TimeSignature}");
+                        return new RowAttribute("timing", () => $"{60000 / timing.BeatLength:n1}bpm {timing.TimeSignature}", colour);
 
                     case DifficultyControlPoint difficulty:
 
-                        return new RowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x");
+                        return new RowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x", colour);
 
                     case EffectControlPoint effect:
-                        return new RowAttribute("effect", () => $"{(effect.KiaiMode ? "Kiai " : "")}{(effect.OmitFirstBarLine ? "NoBarLine " : "")}");
+                        return new RowAttribute("effect", () => $"{(effect.KiaiMode ? "Kiai " : "")}{(effect.OmitFirstBarLine ? "NoBarLine " : "")}", colour);
 
                     case SampleControlPoint sample:
-                        return new RowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%");
+                        return new RowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);
                 }
 
                 return null;
diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index be8f693683..c45995ee83 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Timing
 {
@@ -16,11 +17,13 @@ namespace osu.Game.Screens.Edit.Timing
     {
         private readonly string header;
         private readonly Func<string> content;
+        private readonly Color4 colour;
 
-        public RowAttribute(string header, Func<string> content)
+        public RowAttribute(string header, Func<string> content, Color4 colour)
         {
             this.header = header;
             this.content = content;
+            this.colour = colour;
         }
 
         [BackgroundDependencyLoader]
@@ -40,7 +43,7 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 new Box
                 {
-                    Colour = colours.Yellow,
+                    Colour = colour,
                     RelativeSizeAxes = Axes.Both,
                 },
                 new OsuSpriteText

From 5ad2944e26e9714a10006ad2879a0840623b46d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Oct 2020 19:31:41 +0900
Subject: [PATCH 05095/10326] Fix ticks displaying higher than control point
 info

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 3d2e2ebef7..be3bca3242 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -86,8 +86,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             MidColour = colours.BlueDark,
                             HighColour = colours.BlueDarker,
                         },
-                        controlPoints = new TimelineControlPointDisplay(),
                         ticks = new TimelineTickDisplay(),
+                        controlPoints = new TimelineControlPointDisplay(),
                     }
                 },
             });

From 7e5ecd84bc39dabad82b32e926e3a73ceee4ae46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 1 Oct 2020 12:41:44 +0200
Subject: [PATCH 05096/10326] Add braces to clear up operator precedence

---
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 63cd48676e..a5f20378fe 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
         {
-            spinnerBlink = !source.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerNoBlink)?.Value ?? true;
+            spinnerBlink = !(source.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerNoBlink)?.Value) ?? true;
 
             drawableSpinner = (DrawableSpinner)drawableObject;
 

From 3e6af7ce43975aea05208ef52654038a7984360a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 20:09:09 +0900
Subject: [PATCH 05097/10326] Refactor for readability

---
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index a5f20378fe..c952500bbf 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
         {
-            spinnerBlink = !(source.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerNoBlink)?.Value) ?? true;
+            spinnerBlink = source.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerNoBlink)?.Value != true;
 
             drawableSpinner = (DrawableSpinner)drawableObject;
 

From ba76089219cd9489cf10b160898cafea7414192c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 20:24:32 +0900
Subject: [PATCH 05098/10326] Fix spinner flashing yellow glow before
 completion

---
 .../Objects/Drawables/Pieces/DefaultSpinnerDisc.cs           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 2862fe49bd..587bd415ee 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -93,6 +93,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             drawableSpinner.RotationTracker.Complete.BindValueChanged(complete => updateComplete(complete.NewValue, 200));
             drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
+
+            updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
         }
 
         protected override void Update()
@@ -124,6 +126,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
+            if (!(drawableHitObject is DrawableSpinner))
+                return;
+
             centre.ScaleTo(0);
             mainContainer.ScaleTo(0);
 

From 6d3f4c8699f713ab5146401254647c9aab421f6b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 20:38:47 +0900
Subject: [PATCH 05099/10326] Fix a few more similar cases

---
 osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs | 5 +++++
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index bcb2af8e3e..1dfc9c0772 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -72,10 +72,15 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             this.FadeOut();
             drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
+
+            updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
         }
 
         private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
+            if (!(drawableHitObject is DrawableSpinner))
+                return;
+
             var spinner = (Spinner)drawableSpinner.HitObject;
 
             using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index a45d91801d..c498179eef 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -86,10 +86,15 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             this.FadeOut();
             drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
+
+            updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
         }
 
         private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
+            if (!(drawableHitObject is DrawableSpinner))
+                return;
+
             var spinner = drawableSpinner.HitObject;
 
             using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))

From 62b55c4c9cb57eb436c8a3a4447f6f20c691dade Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 20:50:47 +0900
Subject: [PATCH 05100/10326] Use static method, add xmldoc + link to wiki

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 33 +++++++++++--------
 osu.Game/Beatmaps/BeatmapInfo.cs              | 16 +--------
 2 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 159a229499..945a60fb62 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -114,6 +114,25 @@ namespace osu.Game.Beatmaps
             return computeDifficulty(key, beatmapInfo, rulesetInfo);
         }
 
+        /// <summary>
+        /// Retrieves the <see cref="DifficultyRating"/> that describes a star rating.
+        /// </summary>
+        /// <remarks>
+        /// For more information, see: https://osu.ppy.sh/help/wiki/Difficulties
+        /// </remarks>
+        /// <param name="starRating">The star rating.</param>
+        /// <returns>The <see cref="DifficultyRating"/> that best describes <paramref name="starRating"/>.</returns>
+        public static DifficultyRating GetDifficultyRating(double starRating)
+        {
+            if (starRating < 2.0) return DifficultyRating.Easy;
+            if (starRating < 2.7) return DifficultyRating.Normal;
+            if (starRating < 4.0) return DifficultyRating.Hard;
+            if (starRating < 5.3) return DifficultyRating.Insane;
+            if (starRating < 6.5) return DifficultyRating.Expert;
+
+            return DifficultyRating.ExpertPlus;
+        }
+
         private CancellationTokenSource trackedUpdateCancellationSource;
         private readonly List<CancellationTokenSource> linkedCancellationSources = new List<CancellationTokenSource>();
 
@@ -308,18 +327,6 @@ namespace osu.Game.Beatmaps
             // Todo: Add more members (BeatmapInfo.DifficultyRating? Attributes? Etc...)
         }
 
-        public DifficultyRating DifficultyRating
-        {
-            get
-            {
-                if (Stars < 2.0) return DifficultyRating.Easy;
-                if (Stars < 2.7) return DifficultyRating.Normal;
-                if (Stars < 4.0) return DifficultyRating.Hard;
-                if (Stars < 5.3) return DifficultyRating.Insane;
-                if (Stars < 6.5) return DifficultyRating.Expert;
-
-                return DifficultyRating.ExpertPlus;
-            }
-        }
+        public DifficultyRating DifficultyRating => BeatmapDifficultyManager.GetDifficultyRating(Stars);
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index c5be5810e9..acab525821 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -135,21 +135,7 @@ namespace osu.Game.Beatmaps
         public List<ScoreInfo> Scores { get; set; }
 
         [JsonIgnore]
-        public DifficultyRating DifficultyRating
-        {
-            get
-            {
-                var rating = StarDifficulty;
-
-                if (rating < 2.0) return DifficultyRating.Easy;
-                if (rating < 2.7) return DifficultyRating.Normal;
-                if (rating < 4.0) return DifficultyRating.Hard;
-                if (rating < 5.3) return DifficultyRating.Insane;
-                if (rating < 6.5) return DifficultyRating.Expert;
-
-                return DifficultyRating.ExpertPlus;
-            }
-        }
+        public DifficultyRating DifficultyRating => BeatmapDifficultyManager.GetDifficultyRating(StarDifficulty);
 
         public string[] SearchableTerms => new[]
         {

From d7f9b8045cc99a153342527217246953c146401f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 21:33:54 +0900
Subject: [PATCH 05101/10326] Safeguard againts multiple ApplyResult()
 invocations

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index f159d28eed..abfe7eb58c 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -469,6 +469,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <param name="application">The callback that applies changes to the <see cref="JudgementResult"/>.</param>
         protected void ApplyResult(Action<JudgementResult> application)
         {
+            if (Result.HasResult)
+                throw new InvalidOperationException($"Cannot apply result on a hitobject that already has a result.");
+
             application?.Invoke(Result);
 
             if (!Result.HasResult)

From 40c153e705f2bcb9cbcfa96615fe853edfd62a01 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 21:39:40 +0900
Subject: [PATCH 05102/10326] Use component instead of drawable

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

diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index 9ffe813187..45327d4514 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Beatmaps.Drawables
 
         public object TooltipContent => shouldShowTooltip ? new DifficultyIconTooltipContent(beatmap, difficultyBindable) : null;
 
-        private class DifficultyRetriever : Drawable
+        private class DifficultyRetriever : Component
         {
             public readonly Bindable<StarDifficulty> StarDifficulty = new Bindable<StarDifficulty>();
 

From 042c39ae1b04f3653cb068acb2089f01213a3aed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 21:48:45 +0900
Subject: [PATCH 05103/10326] Remove redundant string interpolation

---
 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 abfe7eb58c..a2d222d0a8 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -470,7 +470,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         protected void ApplyResult(Action<JudgementResult> application)
         {
             if (Result.HasResult)
-                throw new InvalidOperationException($"Cannot apply result on a hitobject that already has a result.");
+                throw new InvalidOperationException("Cannot apply result on a hitobject that already has a result.");
 
             application?.Invoke(Result);
 

From ab33434a8a80f3c50228e52e7e7f643a3f71e40c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Oct 2020 21:54:43 +0900
Subject: [PATCH 05104/10326] Reword xmldocs to better describe nested events

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index f159d28eed..24ee3f629d 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -51,12 +51,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
         public override bool PropagateNonPositionalInputSubTree => HandleUserInput;
 
         /// <summary>
-        /// Invoked when a <see cref="JudgementResult"/> has been applied by this <see cref="DrawableHitObject"/> or a nested <see cref="DrawableHitObject"/>.
+        /// Invoked by this or a nested <see cref="DrawableHitObject"/> after a <see cref="JudgementResult"/> has been applied.
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> OnNewResult;
 
         /// <summary>
-        /// Invoked when a <see cref="JudgementResult"/> is being reverted by this <see cref="DrawableHitObject"/> or a nested <see cref="DrawableHitObject"/>.
+        /// Invoked by this or a nested <see cref="DrawableHitObject"/> prior to a <see cref="JudgementResult"/> being reverted.
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> OnRevertResult;
 
@@ -236,7 +236,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         #region State / Transform Management
 
         /// <summary>
-        /// Bind to apply a custom state which can override the default implementation.
+        /// Invoked by this or a nested <see cref="DrawableHitObject"/> to apply a custom state that can override the default implementation.
         /// </summary>
         public event Action<DrawableHitObject, ArmedState> ApplyCustomUpdateState;
 

From c72dbf1ba0e84ff3d19c2eb780d292ad1c4d56cf Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 1 Oct 2020 17:15:49 +0000
Subject: [PATCH 05105/10326] Bump ppy.osu.Framework.NativeLibs from 2020.213.0
 to 2020.923.0

Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework) from 2020.213.0 to 2020.923.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2020.213.0...2020.923.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 48c91f0d53..31f1af135d 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -85,6 +85,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="2020.213.0" ExcludeAssets="all" />
+    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2020.923.0" ExcludeAssets="all" />
   </ItemGroup>
 </Project>

From 9e52f9c8582ec697d8ba3658a035747e04336697 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 1 Oct 2020 23:23:28 +0300
Subject: [PATCH 05106/10326] Consider cursor size in trail interval

---
 osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index 9bcb3abc63..546bb3f233 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Batches;
 using osu.Framework.Graphics.OpenGL.Vertices;
@@ -15,6 +16,7 @@ using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Layout;
 using osu.Framework.Timing;
+using osu.Game.Configuration;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Graphics.ES30;
@@ -28,6 +30,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         private readonly TrailPart[] parts = new TrailPart[max_sprites];
         private int currentIndex;
         private IShader shader;
+        private Bindable<float> cursorSize;
         private double timeOffset;
         private float time;
 
@@ -48,9 +51,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         }
 
         [BackgroundDependencyLoader]
-        private void load(ShaderManager shaders)
+        private void load(ShaderManager shaders, OsuConfigManager config)
         {
             shader = shaders.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE);
+            cursorSize = config.GetBindable<float>(OsuSetting.GameplayCursorSize);
         }
 
         protected override void LoadComplete()
@@ -147,7 +151,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     float distance = diff.Length;
                     Vector2 direction = diff / distance;
 
-                    float interval = partSize.X / 2.5f;
+                    float interval = partSize.X / 2.5f / cursorSize.Value;
 
                     for (float d = interval; d < distance; d += interval)
                     {

From abf1afd3f125ac970ab1924c7d956629f5477e10 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 1 Oct 2020 23:27:57 +0300
Subject: [PATCH 05107/10326] Do not decrease density

---
 osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index 546bb3f233..8a1dc9b8cb 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     float distance = diff.Length;
                     Vector2 direction = diff / distance;
 
-                    float interval = partSize.X / 2.5f / cursorSize.Value;
+                    float interval = partSize.X / 2.5f / Math.Max(cursorSize.Value, 1);
 
                     for (float d = interval; d < distance; d += interval)
                     {

From fa1903cd03c4e5f4efa2e796379ee041f1772ac8 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 1 Oct 2020 23:41:24 +0300
Subject: [PATCH 05108/10326] Get bound copy instead

---
 osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index 8a1dc9b8cb..fb8a850223 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         private void load(ShaderManager shaders, OsuConfigManager config)
         {
             shader = shaders.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE);
-            cursorSize = config.GetBindable<float>(OsuSetting.GameplayCursorSize);
+            cursorSize = config.GetBindable<float>(OsuSetting.GameplayCursorSize).GetBoundCopy();
         }
 
         protected override void LoadComplete()

From 50722cc754f8cfc20042c11e2a27da2ffb5cdd7b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 14:48:56 +0900
Subject: [PATCH 05109/10326] Update slider test scene sliders to fit better

---
 .../TestSceneSlider.cs                        | 74 ++++++++++---------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index 6a689a1f80..c79cae2fe5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -164,7 +164,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             var slider = new Slider
             {
-                StartTime = Time.Current + 1000,
+                StartTime = Time.Current + time_offset,
                 Position = new Vector2(239, 176),
                 Path = new SliderPath(PathType.PerfectCurve, new[]
                 {
@@ -185,22 +185,26 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private Drawable testSlowSpeed() => createSlider(speedMultiplier: 0.5);
 
-        private Drawable testShortSlowSpeed(int repeats = 0) => createSlider(distance: 100, repeats: repeats, speedMultiplier: 0.5);
+        private Drawable testShortSlowSpeed(int repeats = 0) => createSlider(distance: max_length / 4, repeats: repeats, speedMultiplier: 0.5);
 
         private Drawable testHighSpeed(int repeats = 0) => createSlider(repeats: repeats, speedMultiplier: 15);
 
-        private Drawable testShortHighSpeed(int repeats = 0) => createSlider(distance: 100, repeats: repeats, speedMultiplier: 15);
+        private Drawable testShortHighSpeed(int repeats = 0) => createSlider(distance: max_length / 4, repeats: repeats, speedMultiplier: 15);
 
-        private Drawable createSlider(float circleSize = 2, float distance = 400, int repeats = 0, double speedMultiplier = 2, int stackHeight = 0)
+        private const double time_offset = 1500;
+
+        private const float max_length = 200;
+
+        private Drawable createSlider(float circleSize = 2, float distance = max_length, int repeats = 0, double speedMultiplier = 2, int stackHeight = 0)
         {
             var slider = new Slider
             {
-                StartTime = Time.Current + 1000,
-                Position = new Vector2(-(distance / 2), 0),
+                StartTime = Time.Current + time_offset,
+                Position = new Vector2(0, -(distance / 2)),
                 Path = new SliderPath(PathType.PerfectCurve, new[]
                 {
                     Vector2.Zero,
-                    new Vector2(distance, 0),
+                    new Vector2(0, distance),
                 }, distance),
                 RepeatCount = repeats,
                 StackHeight = stackHeight
@@ -213,14 +217,14 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             var slider = new Slider
             {
-                StartTime = Time.Current + 1000,
-                Position = new Vector2(-200, 0),
+                StartTime = Time.Current + time_offset,
+                Position = new Vector2(-max_length / 2, 0),
                 Path = new SliderPath(PathType.PerfectCurve, new[]
                 {
                     Vector2.Zero,
-                    new Vector2(200, 200),
-                    new Vector2(400, 0)
-                }, 600),
+                    new Vector2(max_length / 2, max_length / 2),
+                    new Vector2(max_length, 0)
+                }, max_length * 1.5f),
                 RepeatCount = repeats,
             };
 
@@ -233,16 +237,16 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             var slider = new Slider
             {
-                StartTime = Time.Current + 1000,
-                Position = new Vector2(-200, 0),
+                StartTime = Time.Current + time_offset,
+                Position = new Vector2(-max_length / 2, 0),
                 Path = new SliderPath(PathType.Linear, new[]
                 {
                     Vector2.Zero,
-                    new Vector2(150, 75),
-                    new Vector2(200, 0),
-                    new Vector2(300, -200),
-                    new Vector2(400, 0),
-                    new Vector2(430, 0)
+                    new Vector2(max_length * 0.375f, max_length * 0.18f),
+                    new Vector2(max_length / 2, 0),
+                    new Vector2(max_length * 0.75f, -max_length / 2),
+                    new Vector2(max_length * 0.95f, 0),
+                    new Vector2(max_length, 0)
                 }),
                 RepeatCount = repeats,
             };
@@ -256,15 +260,15 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             var slider = new Slider
             {
-                StartTime = Time.Current + 1000,
-                Position = new Vector2(-200, 0),
+                StartTime = Time.Current + time_offset,
+                Position = new Vector2(-max_length / 2, 0),
                 Path = new SliderPath(PathType.Bezier, new[]
                 {
                     Vector2.Zero,
-                    new Vector2(150, 75),
-                    new Vector2(200, 100),
-                    new Vector2(300, -200),
-                    new Vector2(430, 0)
+                    new Vector2(max_length * 0.375f, max_length * 0.18f),
+                    new Vector2(max_length / 2, max_length / 4),
+                    new Vector2(max_length * 0.75f, -max_length / 2),
+                    new Vector2(max_length, 0)
                 }),
                 RepeatCount = repeats,
             };
@@ -278,16 +282,16 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             var slider = new Slider
             {
-                StartTime = Time.Current + 1000,
+                StartTime = Time.Current + time_offset,
                 Position = new Vector2(0, 0),
                 Path = new SliderPath(PathType.Linear, new[]
                 {
                     Vector2.Zero,
-                    new Vector2(-200, 0),
+                    new Vector2(-max_length / 2, 0),
                     new Vector2(0, 0),
-                    new Vector2(0, -200),
-                    new Vector2(-200, -200),
-                    new Vector2(0, -200)
+                    new Vector2(0, -max_length / 2),
+                    new Vector2(-max_length / 2, -max_length / 2),
+                    new Vector2(0, -max_length / 2)
                 }),
                 RepeatCount = repeats,
             };
@@ -305,14 +309,14 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var slider = new Slider
             {
-                StartTime = Time.Current + 1000,
-                Position = new Vector2(-100, 0),
+                StartTime = Time.Current + time_offset,
+                Position = new Vector2(-max_length / 4, 0),
                 Path = new SliderPath(PathType.Catmull, new[]
                 {
                     Vector2.Zero,
-                    new Vector2(50, -50),
-                    new Vector2(150, 50),
-                    new Vector2(200, 0)
+                    new Vector2(max_length * 0.125f, max_length * 0.125f),
+                    new Vector2(max_length * 0.375f, max_length * 0.125f),
+                    new Vector2(max_length / 2, 0)
                 }),
                 RepeatCount = repeats,
                 NodeSamples = repeatSamples

From 78bf58f4f8c469f4dce04f7b3db7c31174a04cd3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 13:38:13 +0900
Subject: [PATCH 05110/10326] Add metrics skin elements for sliderendcircle

---
 .../metrics-skin/sliderendcircle@2x.png         | Bin 0 -> 18105 bytes
 .../metrics-skin/sliderendcircleoverlay@2x.png  | Bin 0 -> 45734 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderendcircle@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderendcircleoverlay@2x.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderendcircle@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderendcircle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6c3771593701a825f5cf61c8e05be66bd30699f
GIT binary patch
literal 18105
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderendcircleoverlay@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/sliderendcircleoverlay@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..232560a1d4e37538ef5a73d1928e0b00d362098d
GIT binary patch
literal 45734
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

literal 0
HcmV?d00001


From fce3eacd7de3254ce75619efaa2d15d59d564623 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 13:38:48 +0900
Subject: [PATCH 05111/10326] Move tail circle to display beneath ticks etc.

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 9abcef83c4..e77bca1e20 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             InternalChildren = new Drawable[]
             {
                 Body = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderBody), _ => new DefaultSliderBody(), confineMode: ConfineMode.NoScaling),
+                tailContainer = new Container<DrawableSliderTail> { RelativeSizeAxes = Axes.Both },
                 tickContainer = new Container<DrawableSliderTick> { RelativeSizeAxes = Axes.Both },
                 repeatContainer = new Container<DrawableSliderRepeat> { RelativeSizeAxes = Axes.Both },
                 Ball = new SliderBall(s, this)
@@ -63,7 +64,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Alpha = 0
                 },
                 headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both },
-                tailContainer = new Container<DrawableSliderTail> { RelativeSizeAxes = Axes.Both },
             };
         }
 

From fc7f3173e19aa8d47ebba85490425eb9e434407c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 13:40:24 +0900
Subject: [PATCH 05112/10326] Add the ability to use LegacyMainCirclePiece with
 no combo number displayed

---
 .../Skinning/LegacyMainCirclePiece.cs         | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index d15a0a3203..f051cbfa3b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -21,10 +21,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
     public class LegacyMainCirclePiece : CompositeDrawable
     {
         private readonly string priorityLookup;
+        private readonly bool hasNumber;
 
-        public LegacyMainCirclePiece(string priorityLookup = null)
+        public LegacyMainCirclePiece(string priorityLookup = null, bool hasNumber = true)
         {
             this.priorityLookup = priorityLookup;
+            this.hasNumber = hasNumber;
 
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
         }
@@ -70,7 +72,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         }
                     }
                 },
-                hitCircleText = new SkinnableSpriteText(new OsuSkinComponent(OsuSkinComponents.HitCircleText), _ => new OsuSpriteText
+            };
+
+            if (hasNumber)
+            {
+                AddInternal(hitCircleText = new SkinnableSpriteText(new OsuSkinComponent(OsuSkinComponents.HitCircleText), _ => new OsuSpriteText
                 {
                     Font = OsuFont.Numeric.With(size: 40),
                     UseFullGlyphHeight = false,
@@ -78,8 +84,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                },
-            };
+                });
+            }
 
             bool overlayAboveNumber = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value ?? true;
 
@@ -107,7 +113,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             state.BindValueChanged(updateState, true);
             accentColour.BindValueChanged(colour => hitCircleSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue), true);
-            indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
+            if (hasNumber)
+                indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
         }
 
         private void updateState(ValueChangedEvent<ArmedState> state)
@@ -120,16 +127,19 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     circleSprites.FadeOut(legacy_fade_duration, Easing.Out);
                     circleSprites.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
 
-                    var legacyVersion = skin.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value;
-
-                    if (legacyVersion >= 2.0m)
-                        // legacy skins of version 2.0 and newer only apply very short fade out to the number piece.
-                        hitCircleText.FadeOut(legacy_fade_duration / 4, Easing.Out);
-                    else
+                    if (hasNumber)
                     {
-                        // old skins scale and fade it normally along other pieces.
-                        hitCircleText.FadeOut(legacy_fade_duration, Easing.Out);
-                        hitCircleText.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+                        var legacyVersion = skin.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value;
+
+                        if (legacyVersion >= 2.0m)
+                            // legacy skins of version 2.0 and newer only apply very short fade out to the number piece.
+                            hitCircleText.FadeOut(legacy_fade_duration / 4, Easing.Out);
+                        else
+                        {
+                            // old skins scale and fade it normally along other pieces.
+                            hitCircleText.FadeOut(legacy_fade_duration, Easing.Out);
+                            hitCircleText.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+                        }
                     }
 
                     break;

From 5d2a8ec7640fff9ff189f9adca1e9e5c381d29c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 13:41:22 +0900
Subject: [PATCH 05113/10326] Add final sliderendcircle display support

---
 .../Objects/Drawables/DrawableSliderRepeat.cs | 25 ++++--
 .../Objects/Drawables/DrawableSliderTail.cs   | 79 ++++++++++++++++---
 .../{SliderCircle.cs => SliderEndCircle.cs}   |  2 +-
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs    |  1 +
 .../Skinning/OsuLegacySkinTransformer.cs      |  6 ++
 5 files changed, 94 insertions(+), 19 deletions(-)
 rename osu.Game.Rulesets.Osu/Objects/{SliderCircle.cs => SliderEndCircle.cs} (82%)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index f65077685f..9d775de7df 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -6,9 +6,11 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
@@ -34,7 +36,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Origin = Anchor.Centre;
 
-            InternalChild = scaleContainer = new ReverseArrowPiece();
+            InternalChild = scaleContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new Drawable[]
+                {
+                    // no default for this; only visible in legacy skins.
+                    new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty()),
+                    arrow = new ReverseArrowPiece(),
+                }
+            };
         }
 
         private readonly IBindable<float> scaleBindable = new BindableFloat();
@@ -85,6 +98,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private bool hasRotation;
 
+        private readonly ReverseArrowPiece arrow;
+
         public void UpdateSnakingPosition(Vector2 start, Vector2 end)
         {
             // When the repeat is hit, the arrow should fade out on spot rather than following the slider
@@ -114,18 +129,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
 
             float aimRotation = MathUtils.RadiansToDegrees(MathF.Atan2(aimRotationVector.Y - Position.Y, aimRotationVector.X - Position.X));
-            while (Math.Abs(aimRotation - Rotation) > 180)
-                aimRotation += aimRotation < Rotation ? 360 : -360;
+            while (Math.Abs(aimRotation - arrow.Rotation) > 180)
+                aimRotation += aimRotation < arrow.Rotation ? 360 : -360;
 
             if (!hasRotation)
             {
-                Rotation = aimRotation;
+                arrow.Rotation = aimRotation;
                 hasRotation = true;
             }
             else
             {
                 // If we're already snaking, interpolate to smooth out sharp curves (linear sliders, mainly).
-                Rotation = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 100), Rotation, aimRotation, 0, 50, Easing.OutQuint);
+                arrow.Rotation = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 100), arrow.Rotation, aimRotation, 0, 50, Easing.OutQuint);
             }
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 0939e2847a..3751ff0975 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -1,13 +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.Diagnostics;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableSliderTail : DrawableOsuHitObject, IRequireTracking
+    public class DrawableSliderTail : DrawableOsuHitObject, IRequireTracking, ITrackSnaking
     {
         private readonly Slider slider;
 
@@ -18,28 +23,73 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public bool Tracking { get; set; }
 
-        private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
-        private readonly IBindable<int> pathVersion = new Bindable<int>();
+        private readonly IBindable<float> scaleBindable = new BindableFloat();
+
+        private readonly SkinnableDrawable circlePiece;
+
+        private readonly Container scaleContainer;
 
         public DrawableSliderTail(Slider slider, SliderTailCircle hitCircle)
             : base(hitCircle)
         {
             this.slider = slider;
-
             Origin = Anchor.Centre;
 
-            RelativeSizeAxes = Axes.Both;
-            FillMode = FillMode.Fit;
+            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 
-            AlwaysPresent = true;
+            InternalChildren = new Drawable[]
+            {
+                scaleContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        // no default for this; only visible in legacy skins.
+                        circlePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty())
+                    }
+                },
+            };
+        }
 
-            positionBindable.BindTo(hitCircle.PositionBindable);
-            pathVersion.BindTo(slider.Path.Version);
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            scaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
+            scaleBindable.BindTo(HitObject.ScaleBindable);
+        }
 
-            positionBindable.BindValueChanged(_ => updatePosition());
-            pathVersion.BindValueChanged(_ => updatePosition(), true);
+        protected override void UpdateInitialTransforms()
+        {
+            base.UpdateInitialTransforms();
 
-            // TODO: This has no drawable content. Support for skins should be added.
+            circlePiece.FadeInFromZero(HitObject.TimeFadeIn);
+        }
+
+        protected override void UpdateStateTransforms(ArmedState state)
+        {
+            base.UpdateStateTransforms(state);
+
+            Debug.Assert(HitObject.HitWindows != null);
+
+            switch (state)
+            {
+                case ArmedState.Idle:
+                    this.Delay(HitObject.TimePreempt).FadeOut(500);
+
+                    Expire(true);
+                    break;
+
+                case ArmedState.Miss:
+                    this.FadeOut(100);
+                    break;
+
+                case ArmedState.Hit:
+                    // todo: temporary / arbitrary
+                    this.Delay(800).FadeOut();
+                    break;
+            }
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
@@ -48,6 +98,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
-        private void updatePosition() => Position = HitObject.Position - slider.Position;
+        public void UpdateSnakingPosition(Vector2 start, Vector2 end)
+        {
+            Position = end;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
similarity index 82%
rename from osu.Game.Rulesets.Osu/Objects/SliderCircle.cs
rename to osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
index 151902a752..d9ae520f5c 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    public class SliderCircle : HitCircle
+    public class SliderEndCircle : HitCircle
     {
     }
 }
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index 5468764692..2883f0c187 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Rulesets.Osu
         ReverseArrow,
         HitCircleText,
         SliderHeadHitCircle,
+        SliderTailHitCircle,
         SliderFollowCircle,
         SliderBall,
         SliderBody,
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 851a8d56c9..78bc26eff7 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -66,6 +66,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                     return null;
 
+                case OsuSkinComponents.SliderTailHitCircle:
+                    if (hasHitCircle.Value)
+                        return new LegacyMainCirclePiece("sliderendcircle", false);
+
+                    return null;
+
                 case OsuSkinComponents.SliderHeadHitCircle:
                     if (hasHitCircle.Value)
                         return new LegacyMainCirclePiece("sliderstartcircle");

From 2427ae43da2284d31e5c2b26662f6df93c0739ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 14:20:55 +0900
Subject: [PATCH 05114/10326] Share fade in logic with repeats

---
 .../Objects/Drawables/DrawableSliderTail.cs   | 14 +++++-----
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  4 ++-
 .../Objects/SliderEndCircle.cs                | 27 ++++++++++++++++++-
 osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs | 23 +---------------
 .../Objects/SliderTailCircle.cs               | 13 +--------
 5 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 3751ff0975..f5bcecccdf 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSliderTail : DrawableOsuHitObject, IRequireTracking, ITrackSnaking
     {
-        private readonly Slider slider;
+        private readonly SliderTailCircle tailCircle;
 
         /// <summary>
         /// The judgement text is provided by the <see cref="DrawableSlider"/>.
@@ -29,10 +29,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private readonly Container scaleContainer;
 
-        public DrawableSliderTail(Slider slider, SliderTailCircle hitCircle)
-            : base(hitCircle)
+        public DrawableSliderTail(Slider slider, SliderTailCircle tailCircle)
+            : base(tailCircle)
         {
-            this.slider = slider;
+            this.tailCircle = tailCircle;
             Origin = Anchor.Centre;
 
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
@@ -98,9 +98,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
-        public void UpdateSnakingPosition(Vector2 start, Vector2 end)
-        {
-            Position = end;
-        }
+        public void UpdateSnakingPosition(Vector2 start, Vector2 end) =>
+            Position = tailCircle.RepeatIndex % 2 == 0 ? end : start;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 51f6a44a87..9cc3f17c55 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -174,8 +174,10 @@ namespace osu.Game.Rulesets.Osu.Objects
                         // we need to use the LegacyLastTick here for compatibility reasons (difficulty).
                         // it is *okay* to use this because the TailCircle is not used for any meaningful purpose in gameplay.
                         // if this is to change, we should revisit this.
-                        AddNested(TailCircle = new SliderTailCircle(this)
+                        AddNested(TailCircle = new SliderTailCircle
                         {
+                            RepeatIndex = e.SpanIndex,
+                            SpanDuration = SpanDuration,
                             StartTime = e.Time,
                             Position = EndPosition,
                             StackHeight = StackHeight
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
index d9ae520f5c..a34eec0c79 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
@@ -1,9 +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 osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Scoring;
+
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    public class SliderEndCircle : HitCircle
+    /// <summary>
+    /// A hitcircle which is at the end of a slider path (either repeat or final tail).
+    /// </summary>
+    public abstract class SliderEndCircle : HitCircle
     {
+        public int RepeatIndex { get; set; }
+        public double SpanDuration { get; set; }
+
+        protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
+        {
+            base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
+
+            // Out preempt should be one span early to give the user ample warning.
+            TimePreempt += SpanDuration;
+
+            // We want to show the first RepeatPoint as the TimePreempt dictates but on short (and possibly fast) sliders
+            // we may need to cut down this time on following RepeatPoints to only show up to two RepeatPoints at any given time.
+            if (RepeatIndex > 0)
+                TimePreempt = Math.Min(SpanDuration * 2, TimePreempt);
+        }
+
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
index b6c58a75d1..6bf0ec0355 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
@@ -1,35 +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;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    public class SliderRepeat : OsuHitObject
+    public class SliderRepeat : SliderEndCircle
     {
-        public int RepeatIndex { get; set; }
-        public double SpanDuration { get; set; }
-
-        protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
-        {
-            base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
-
-            // Out preempt should be one span early to give the user ample warning.
-            TimePreempt += SpanDuration;
-
-            // We want to show the first RepeatPoint as the TimePreempt dictates but on short (and possibly fast) sliders
-            // we may need to cut down this time on following RepeatPoints to only show up to two RepeatPoints at any given time.
-            if (RepeatIndex > 0)
-                TimePreempt = Math.Min(SpanDuration * 2, TimePreempt);
-        }
-
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
-
         public override Judgement CreateJudgement() => new SliderRepeatJudgement();
 
         public class SliderRepeatJudgement : OsuJudgement
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index aff3f38e17..2f1bfdfcc0 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.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.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
@@ -13,18 +12,8 @@ namespace osu.Game.Rulesets.Osu.Objects
     /// Note that this should not be used for timing correctness.
     /// See <see cref="SliderEventType.LegacyLastTick"/> usage in <see cref="Slider"/> for more information.
     /// </summary>
-    public class SliderTailCircle : SliderCircle
+    public class SliderTailCircle : SliderEndCircle
     {
-        private readonly IBindable<int> pathVersion = new Bindable<int>();
-
-        public SliderTailCircle(Slider slider)
-        {
-            pathVersion.BindTo(slider.Path.Version);
-            pathVersion.BindValueChanged(_ => Position = slider.EndPosition);
-        }
-
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
-
         public override Judgement CreateJudgement() => new SliderTailJudgement();
 
         public class SliderTailJudgement : OsuJudgement

From 2975ea9210a7e329a2ae35dfb7f0ef57a283fd74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 14:37:07 +0900
Subject: [PATCH 05115/10326] Adjust repeat/tail fade in to match stable closer

---
 osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
index a34eec0c79..e0bbac67fc 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.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.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Scoring;
@@ -20,13 +19,14 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
-            // Out preempt should be one span early to give the user ample warning.
-            TimePreempt += SpanDuration;
-
-            // We want to show the first RepeatPoint as the TimePreempt dictates but on short (and possibly fast) sliders
-            // we may need to cut down this time on following RepeatPoints to only show up to two RepeatPoints at any given time.
             if (RepeatIndex > 0)
-                TimePreempt = Math.Min(SpanDuration * 2, TimePreempt);
+            {
+                // Repeat points after the first span should appear behind the still-visible one.
+                TimeFadeIn = 0;
+
+                // The next end circle should appear exactly after the previous circle (on the same end) is hit.
+                TimePreempt = SpanDuration * 2;
+            }
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;

From ad4cac13acccaa6a30b81470afa0a4a74f5a166c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 15:21:52 +0900
Subject: [PATCH 05116/10326] Add preempt adjustment and fade in first end
 circle with slider to match stable

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  6 ++----
 .../Objects/SliderEndCircle.cs                | 20 +++++++++++++++++--
 osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs |  5 +++++
 .../Objects/SliderTailCircle.cs               |  5 +++++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 9cc3f17c55..917382eccf 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -174,10 +174,9 @@ namespace osu.Game.Rulesets.Osu.Objects
                         // we need to use the LegacyLastTick here for compatibility reasons (difficulty).
                         // it is *okay* to use this because the TailCircle is not used for any meaningful purpose in gameplay.
                         // if this is to change, we should revisit this.
-                        AddNested(TailCircle = new SliderTailCircle
+                        AddNested(TailCircle = new SliderTailCircle(this)
                         {
                             RepeatIndex = e.SpanIndex,
-                            SpanDuration = SpanDuration,
                             StartTime = e.Time,
                             Position = EndPosition,
                             StackHeight = StackHeight
@@ -185,10 +184,9 @@ namespace osu.Game.Rulesets.Osu.Objects
                         break;
 
                     case SliderEventType.Repeat:
-                        AddNested(new SliderRepeat
+                        AddNested(new SliderRepeat(this)
                         {
                             RepeatIndex = e.SpanIndex,
-                            SpanDuration = SpanDuration,
                             StartTime = StartTime + (e.SpanIndex + 1) * SpanDuration,
                             Position = Position + Path.PositionAt(e.PathProgress),
                             StackHeight = StackHeight,
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
index e0bbac67fc..a6aed2c00e 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
@@ -8,12 +8,20 @@ using osu.Game.Rulesets.Scoring;
 namespace osu.Game.Rulesets.Osu.Objects
 {
     /// <summary>
-    /// A hitcircle which is at the end of a slider path (either repeat or final tail).
+    /// A hit circle which is at the end of a slider path (either repeat or final tail).
     /// </summary>
     public abstract class SliderEndCircle : HitCircle
     {
+        private readonly Slider slider;
+
+        protected SliderEndCircle(Slider slider)
+        {
+            this.slider = slider;
+        }
+
         public int RepeatIndex { get; set; }
-        public double SpanDuration { get; set; }
+
+        public double SpanDuration => slider.SpanDuration;
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
@@ -27,6 +35,14 @@ namespace osu.Game.Rulesets.Osu.Objects
                 // The next end circle should appear exactly after the previous circle (on the same end) is hit.
                 TimePreempt = SpanDuration * 2;
             }
+            else
+            {
+                // taken from osu-stable
+                const float first_end_circle_preempt_adjust = 2 / 3f;
+
+                // The first end circle should fade in with the slider.
+                TimePreempt = (StartTime - slider.StartTime) + slider.TimePreempt * first_end_circle_preempt_adjust;
+            }
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
index 6bf0ec0355..cca86361c2 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
@@ -9,6 +9,11 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SliderRepeat : SliderEndCircle
     {
+        public SliderRepeat(Slider slider)
+            : base(slider)
+        {
+        }
+
         public override Judgement CreateJudgement() => new SliderRepeatJudgement();
 
         public class SliderRepeatJudgement : OsuJudgement
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index 2f1bfdfcc0..5aa2940e10 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Rulesets.Osu.Objects
     /// </summary>
     public class SliderTailCircle : SliderEndCircle
     {
+        public SliderTailCircle(Slider slider)
+            : base(slider)
+        {
+        }
+
         public override Judgement CreateJudgement() => new SliderTailJudgement();
 
         public class SliderTailJudgement : OsuJudgement

From d6fe5482d30fe8f5197d18145a47ec8a2644dcca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 15:28:08 +0900
Subject: [PATCH 05117/10326] Add failing test showing missing control point
 removal

---
 osu.Game.Tests/NonVisual/ControlPointInfoTest.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
index 830e4bc603..90a487c0ac 100644
--- a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
+++ b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
@@ -139,6 +139,22 @@ namespace osu.Game.Tests.NonVisual
             Assert.That(cpi.Groups.Count, Is.EqualTo(0));
         }
 
+        [Test]
+        public void TestRemoveGroupAlsoRemovedControlPoints()
+        {
+            var cpi = new ControlPointInfo();
+
+            var group = cpi.GroupAt(1000, true);
+
+            group.Add(new SampleControlPoint());
+
+            Assert.That(cpi.SamplePoints.Count, Is.EqualTo(1));
+
+            cpi.RemoveGroup(group);
+
+            Assert.That(cpi.SamplePoints.Count, Is.EqualTo(0));
+        }
+
         [Test]
         public void TestAddControlPointToGroup()
         {

From f501c88b46f09b6bbcda0ddcc520151a882bdc64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 15:25:35 +0900
Subject: [PATCH 05118/10326] Fix individual control points not being removed
 from group when group is removed

---
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index e7788b75f3..22314f28c7 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -158,6 +158,9 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public void RemoveGroup(ControlPointGroup group)
         {
+            foreach (var item in group.ControlPoints.ToArray())
+                group.Remove(item);
+
             group.ItemAdded -= groupItemAdded;
             group.ItemRemoved -= groupItemRemoved;
 

From 959c8730f6c673d1f4ac3970ca43426b4ac97e13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 15:25:48 +0900
Subject: [PATCH 05119/10326] Add settings section from TimingPointGroups on
 timing screen

---
 .../Edit/Timing/ControlPointSettings.cs       |  1 +
 osu.Game/Screens/Edit/Timing/GroupSection.cs  | 96 +++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Timing/GroupSection.cs

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
index e1182d9fa4..c40061b97c 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         private IReadOnlyList<Drawable> createSections() => new Drawable[]
         {
+            new GroupSection(),
             new TimingSection(),
             new DifficultySection(),
             new SampleSection(),
diff --git a/osu.Game/Screens/Edit/Timing/GroupSection.cs b/osu.Game/Screens/Edit/Timing/GroupSection.cs
new file mode 100644
index 0000000000..2c3c393e3c
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/GroupSection.cs
@@ -0,0 +1,96 @@
+// Copyright (c) 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.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Timing
+{
+    internal class GroupSection : CompositeDrawable
+    {
+        private LabelledTextBox textBox;
+
+        [Resolved]
+        protected Bindable<ControlPointGroup> SelectedGroup { get; private set; }
+
+        [Resolved]
+        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
+
+        [Resolved]
+        private EditorClock clock { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Padding = new MarginPadding(10);
+
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Spacing = new Vector2(10),
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        textBox = new LabelledTextBox
+                        {
+                            Label = "Time"
+                        },
+                        new TriangleButton
+                        {
+                            Text = "Use current time",
+                            RelativeSizeAxes = Axes.X,
+                            Action = () => changeSelectedGroupTime(clock.CurrentTime)
+                        }
+                    }
+                },
+            };
+
+            textBox.OnCommit += (sender, isNew) =>
+            {
+                if (double.TryParse(sender.Text, out var newTime))
+                {
+                    changeSelectedGroupTime(newTime);
+                }
+            };
+
+            SelectedGroup.BindValueChanged(group =>
+            {
+                if (group.NewValue == null)
+                {
+                    textBox.Text = string.Empty;
+                    textBox.Current.Disabled = true;
+                    return;
+                }
+
+                textBox.Current.Disabled = false;
+                textBox.Text = $"{group.NewValue.Time:n0}";
+            }, true);
+        }
+
+        private void changeSelectedGroupTime(in double time)
+        {
+            var currentGroupItems = SelectedGroup.Value.ControlPoints.ToArray();
+
+            Beatmap.Value.Beatmap.ControlPointInfo.RemoveGroup(SelectedGroup.Value);
+
+            foreach (var cp in currentGroupItems)
+                Beatmap.Value.Beatmap.ControlPointInfo.Add(time, cp);
+
+            SelectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(time);
+        }
+    }
+}

From 2698dc513f31d4d2a0a0f75b1615c50cdc106800 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 15:33:33 +0900
Subject: [PATCH 05120/10326] Add basic textbox error handling

---
 osu.Game/Screens/Edit/Timing/GroupSection.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/GroupSection.cs b/osu.Game/Screens/Edit/Timing/GroupSection.cs
index 2c3c393e3c..ac9c4be97a 100644
--- a/osu.Game/Screens/Edit/Timing/GroupSection.cs
+++ b/osu.Game/Screens/Edit/Timing/GroupSection.cs
@@ -61,10 +61,17 @@ namespace osu.Game.Screens.Edit.Timing
 
             textBox.OnCommit += (sender, isNew) =>
             {
+                if (!isNew)
+                    return;
+
                 if (double.TryParse(sender.Text, out var newTime))
                 {
                     changeSelectedGroupTime(newTime);
                 }
+                else
+                {
+                    SelectedGroup.TriggerChange();
+                }
             };
 
             SelectedGroup.BindValueChanged(group =>

From 0cb3926e1d090b7c336b16a5512f31f696d18661 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 15:44:32 +0900
Subject: [PATCH 05121/10326] Add event on EditorChangeHandler state change

---
 .../Editing/EditorChangeHandlerTest.cs        | 22 ++++++++++++++++++-
 osu.Game/Screens/Edit/EditorChangeHandler.cs  |  5 +++++
 osu.Game/Screens/Edit/IEditorChangeHandler.cs |  6 +++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
index ff2c9fb1a9..b7a41ffd1c 100644
--- a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
+++ b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
@@ -12,6 +12,14 @@ namespace osu.Game.Tests.Editing
     [TestFixture]
     public class EditorChangeHandlerTest
     {
+        private int stateChangedFired;
+
+        [SetUp]
+        public void SetUp()
+        {
+            stateChangedFired = 0;
+        }
+
         [Test]
         public void TestSaveRestoreState()
         {
@@ -23,6 +31,8 @@ namespace osu.Game.Tests.Editing
             addArbitraryChange(beatmap);
             handler.SaveState();
 
+            Assert.That(stateChangedFired, Is.EqualTo(1));
+
             Assert.That(handler.CanUndo.Value, Is.True);
             Assert.That(handler.CanRedo.Value, Is.False);
 
@@ -30,6 +40,8 @@ namespace osu.Game.Tests.Editing
 
             Assert.That(handler.CanUndo.Value, Is.False);
             Assert.That(handler.CanRedo.Value, Is.True);
+
+            Assert.That(stateChangedFired, Is.EqualTo(2));
         }
 
         [Test]
@@ -45,6 +57,7 @@ namespace osu.Game.Tests.Editing
 
             Assert.That(handler.CanUndo.Value, Is.True);
             Assert.That(handler.CanRedo.Value, Is.False);
+            Assert.That(stateChangedFired, Is.EqualTo(1));
 
             string hash = handler.CurrentStateHash;
 
@@ -52,6 +65,7 @@ namespace osu.Game.Tests.Editing
             handler.SaveState();
 
             Assert.That(hash, Is.EqualTo(handler.CurrentStateHash));
+            Assert.That(stateChangedFired, Is.EqualTo(1));
 
             handler.RestoreState(-1);
 
@@ -60,6 +74,7 @@ namespace osu.Game.Tests.Editing
             // we should only be able to restore once even though we saved twice.
             Assert.That(handler.CanUndo.Value, Is.False);
             Assert.That(handler.CanRedo.Value, Is.True);
+            Assert.That(stateChangedFired, Is.EqualTo(2));
         }
 
         [Test]
@@ -71,6 +86,8 @@ namespace osu.Game.Tests.Editing
 
             for (int i = 0; i < EditorChangeHandler.MAX_SAVED_STATES; i++)
             {
+                Assert.That(stateChangedFired, Is.EqualTo(i));
+
                 addArbitraryChange(beatmap);
                 handler.SaveState();
             }
@@ -114,7 +131,10 @@ namespace osu.Game.Tests.Editing
         {
             var beatmap = new EditorBeatmap(new Beatmap());
 
-            return (new EditorChangeHandler(beatmap), beatmap);
+            var changeHandler = new EditorChangeHandler(beatmap);
+
+            changeHandler.OnStateChange += () => stateChangedFired++;
+            return (changeHandler, beatmap);
         }
 
         private void addArbitraryChange(EditorBeatmap beatmap)
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 617c436ee0..616d0608c0 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Screens.Edit
         public readonly Bindable<bool> CanUndo = new Bindable<bool>();
         public readonly Bindable<bool> CanRedo = new Bindable<bool>();
 
+        public event Action OnStateChange;
+
         private readonly LegacyEditorBeatmapPatcher patcher;
         private readonly List<byte[]> savedStates = new List<byte[]>();
 
@@ -109,6 +111,8 @@ namespace osu.Game.Screens.Edit
                 savedStates.Add(newState);
 
                 currentState = savedStates.Count - 1;
+
+                OnStateChange?.Invoke();
                 updateBindables();
             }
         }
@@ -136,6 +140,7 @@ namespace osu.Game.Screens.Edit
 
             isRestoring = false;
 
+            OnStateChange?.Invoke();
             updateBindables();
         }
 
diff --git a/osu.Game/Screens/Edit/IEditorChangeHandler.cs b/osu.Game/Screens/Edit/IEditorChangeHandler.cs
index c1328252d4..a23a956e14 100644
--- a/osu.Game/Screens/Edit/IEditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/IEditorChangeHandler.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.Game.Rulesets.Objects;
 
 namespace osu.Game.Screens.Edit
@@ -10,6 +11,11 @@ namespace osu.Game.Screens.Edit
     /// </summary>
     public interface IEditorChangeHandler
     {
+        /// <summary>
+        /// Fired whenever a state change occurs.
+        /// </summary>
+        public event Action OnStateChange;
+
         /// <summary>
         /// Begins a bulk state change event. <see cref="EndChange"/> should be invoked soon after.
         /// </summary>

From 501e02db097eab45553f0376caf420457b6cbb2d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 15:44:37 +0900
Subject: [PATCH 05122/10326] Only regenerate autoplay on editor state change

---
 osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs b/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
index 1070b8cbd2..d259a89055 100644
--- a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
+++ b/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
@@ -40,17 +40,21 @@ namespace osu.Game.Rulesets.Edit
             Playfield.DisplayJudgements.Value = false;
         }
 
+        [Resolved]
+        private IEditorChangeHandler changeHandler { get; set; }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
             beatmap.HitObjectAdded += addHitObject;
-            beatmap.HitObjectUpdated += updateReplay;
             beatmap.HitObjectRemoved += removeHitObject;
+
+            // for now only regenerate replay on a finalised state change, not HitObjectUpdated.
+            changeHandler.OnStateChange += updateReplay;
         }
 
-        private void updateReplay(HitObject obj = null) =>
-            drawableRuleset.RegenerateAutoplay();
+        private void updateReplay() => drawableRuleset.RegenerateAutoplay();
 
         private void addHitObject(HitObject hitObject)
         {
@@ -69,7 +73,7 @@ namespace osu.Game.Rulesets.Edit
             drawableRuleset.Playfield.Remove(drawableObject);
             drawableRuleset.Playfield.PostProcess();
 
-            drawableRuleset.RegenerateAutoplay();
+            updateReplay();
         }
 
         public override bool PropagatePositionalInputSubTree => false;

From dde7f706aafae01330c084719124c504b1abc0ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 01:48:41 +0900
Subject: [PATCH 05123/10326] Avoid rapid triangle repositioning during editor
 slider placement

---
 .../Objects/Drawables/Pieces/CirclePiece.cs   |  5 +++--
 .../Drawables/Pieces/TrianglesPiece.cs        |  3 ++-
 osu.Game/Graphics/Backgrounds/Triangles.cs    | 21 ++++++++++++++-----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
index aab01f45d4..e95cdc7ee3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
@@ -25,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         }
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        private void load(TextureStore textures, DrawableHitObject drawableHitObject)
         {
             InternalChildren = new Drawable[]
             {
@@ -35,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     Origin = Anchor.Centre,
                     Texture = textures.Get(@"Gameplay/osu/disc"),
                 },
-                new TrianglesPiece
+                new TrianglesPiece((int)drawableHitObject.HitObject.StartTime)
                 {
                     RelativeSizeAxes = Axes.Both,
                     Blending = BlendingParameters.Additive,
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs
index 0e29a1dcd8..6cdb0d3df3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs
@@ -11,7 +11,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         protected override bool CreateNewTriangles => false;
         protected override float SpawnRatio => 0.5f;
 
-        public TrianglesPiece()
+        public TrianglesPiece(int? seed = null)
+            : base(seed)
         {
             TriangleScale = 1.2f;
             HideAlphaDiscrepancies = false;
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index 27027202ce..5b0fa44444 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -86,13 +86,24 @@ namespace osu.Game.Graphics.Backgrounds
         /// </summary>
         public float Velocity = 1;
 
+        private readonly Random stableRandom;
+
+        private float nextRandom() => (float)(stableRandom?.NextDouble() ?? RNG.NextSingle());
+
         private readonly SortedList<TriangleParticle> parts = new SortedList<TriangleParticle>(Comparer<TriangleParticle>.Default);
 
         private IShader shader;
         private readonly Texture texture;
 
-        public Triangles()
+        /// <summary>
+        /// Construct a new triangle visualisation.
+        /// </summary>
+        /// <param name="seed">An optional seed to stabilise random positions / attributes. Note that this does not guarantee stable playback when seeking in time.</param>
+        public Triangles(int? seed = null)
         {
+            if (seed != null)
+                stableRandom = new Random(seed.Value);
+
             texture = Texture.WhitePixel;
         }
 
@@ -175,8 +186,8 @@ namespace osu.Game.Graphics.Backgrounds
         {
             TriangleParticle particle = CreateTriangle();
 
-            particle.Position = new Vector2(RNG.NextSingle(), randomY ? RNG.NextSingle() : 1);
-            particle.ColourShade = RNG.NextSingle();
+            particle.Position = new Vector2(nextRandom(), randomY ? nextRandom() : 1);
+            particle.ColourShade = nextRandom();
             particle.Colour = CreateTriangleShade(particle.ColourShade);
 
             return particle;
@@ -191,8 +202,8 @@ namespace osu.Game.Graphics.Backgrounds
             const float std_dev = 0.16f;
             const float mean = 0.5f;
 
-            float u1 = 1 - RNG.NextSingle(); //uniform(0,1] random floats
-            float u2 = 1 - RNG.NextSingle();
+            float u1 = 1 - nextRandom(); //uniform(0,1] random floats
+            float u2 = 1 - nextRandom();
             float randStdNormal = (float)(Math.Sqrt(-2.0 * Math.Log(u1)) * Math.Sin(2.0 * Math.PI * u2)); // random normal(0,1)
             var scale = Math.Max(triangleScale * (mean + std_dev * randStdNormal), 0.1f); // random normal(mean,stdDev^2)
 

From e49ec092c9a35f2aa414102153829aa4ea221402 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 16:08:11 +0900
Subject: [PATCH 05124/10326] Expose ability to register a component as an
 import handler

---
 osu.Game/OsuGameBase.cs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index b1269e9300..11c1f6c5cf 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -232,9 +232,9 @@ namespace osu.Game
             dependencies.Cache(new SessionStatics());
             dependencies.Cache(new OsuColour());
 
-            fileImporters.Add(BeatmapManager);
-            fileImporters.Add(ScoreManager);
-            fileImporters.Add(SkinManager);
+            RegisterImportHandler(BeatmapManager);
+            RegisterImportHandler(ScoreManager);
+            RegisterImportHandler(SkinManager);
 
             // tracks play so loud our samples can't keep up.
             // this adds a global reduction of track volume for the time being.
@@ -341,7 +341,19 @@ namespace osu.Game
 
         protected override Storage CreateStorage(GameHost host, Storage defaultStorage) => new OsuStorage(host, defaultStorage);
 
-        private readonly List<ICanAcceptFiles> fileImporters = new List<ICanAcceptFiles>();
+        private readonly HashSet<ICanAcceptFiles> fileImporters = new HashSet<ICanAcceptFiles>();
+
+        /// <summary>
+        /// Register a global handler for file imports.
+        /// </summary>
+        /// <param name="handler">The handler to register.</param>
+        public void RegisterImportHandler(ICanAcceptFiles handler) => fileImporters.Add(handler);
+
+        /// <summary>
+        /// Unregister a global handler for file imports.
+        /// </summary>
+        /// <param name="handler">The previously registered handler.</param>
+        public void UnregisterImportHandler(ICanAcceptFiles handler) => fileImporters.Remove(handler);
 
         public async Task Import(params string[] paths)
         {

From fc65cb43759477e96d48337513a1e9565b10082d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 16:14:21 +0900
Subject: [PATCH 05125/10326] Ensure precedence is given to newer registered
 handlers

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 11c1f6c5cf..dfda0d0118 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -341,13 +341,13 @@ namespace osu.Game
 
         protected override Storage CreateStorage(GameHost host, Storage defaultStorage) => new OsuStorage(host, defaultStorage);
 
-        private readonly HashSet<ICanAcceptFiles> fileImporters = new HashSet<ICanAcceptFiles>();
+        private readonly List<ICanAcceptFiles> fileImporters = new List<ICanAcceptFiles>();
 
         /// <summary>
-        /// Register a global handler for file imports.
+        /// Register a global handler for file imports. Most recently registered will have precedence.
         /// </summary>
         /// <param name="handler">The handler to register.</param>
-        public void RegisterImportHandler(ICanAcceptFiles handler) => fileImporters.Add(handler);
+        public void RegisterImportHandler(ICanAcceptFiles handler) => fileImporters.Insert(0, handler);
 
         /// <summary>
         /// Unregister a global handler for file imports.

From f3c8cd91f4e87c461b2cee362a84fd096f838d05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 16:14:27 +0900
Subject: [PATCH 05126/10326] Remove unused method

---
 osu.Game/Screens/Edit/EditorScreen.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs
index 52bffc4342..4d62a7d3cd 100644
--- a/osu.Game/Screens/Edit/EditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorScreen.cs
@@ -44,10 +44,5 @@ namespace osu.Game.Screens.Edit
                 .Then()
                 .FadeTo(1f, 250, Easing.OutQuint);
         }
-
-        public void Exit()
-        {
-            Expire();
-        }
     }
 }

From 50eca202f48a08bbeb0ac5c8867a81507a4a2881 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 16:17:10 +0900
Subject: [PATCH 05127/10326] User IEnumerable for HandledExtensions

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 2 +-
 osu.Game/Database/ArchiveModelManager.cs | 2 +-
 osu.Game/Database/ICanAcceptFiles.cs     | 3 ++-
 osu.Game/OsuGameBase.cs                  | 2 +-
 osu.Game/Scoring/ScoreManager.cs         | 2 +-
 osu.Game/Skinning/SkinManager.cs         | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b48ab6112e..4c75069f08 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public readonly WorkingBeatmap DefaultBeatmap;
 
-        public override string[] HandledExtensions => new[] { ".osz" };
+        public override IEnumerable<string> HandledExtensions => new[] { ".osz" };
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index bbe2604216..3292936f5f 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Database
 
         private readonly Bindable<WeakReference<TModel>> itemRemoved = new Bindable<WeakReference<TModel>>();
 
-        public virtual string[] HandledExtensions => new[] { ".zip" };
+        public virtual IEnumerable<string> HandledExtensions => new[] { ".zip" };
 
         public virtual bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
 
diff --git a/osu.Game/Database/ICanAcceptFiles.cs b/osu.Game/Database/ICanAcceptFiles.cs
index b9f882468d..e4d92d957c 100644
--- a/osu.Game/Database/ICanAcceptFiles.cs
+++ b/osu.Game/Database/ICanAcceptFiles.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 System.Threading.Tasks;
 
 namespace osu.Game.Database
@@ -19,6 +20,6 @@ namespace osu.Game.Database
         /// <summary>
         /// An array of accepted file extensions (in the standard format of ".abc").
         /// </summary>
-        string[] HandledExtensions { get; }
+        IEnumerable<string> HandledExtensions { get; }
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index dfda0d0118..f61ff43ca9 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -366,7 +366,7 @@ namespace osu.Game
             }
         }
 
-        public string[] HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions).ToArray();
+        public IEnumerable<string> HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions);
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 8e8147ff39..5a6da53839 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Scoring
 {
     public class ScoreManager : DownloadableArchiveModelManager<ScoreInfo, ScoreFileInfo>
     {
-        public override string[] HandledExtensions => new[] { ".osr" };
+        public override IEnumerable<string> HandledExtensions => new[] { ".osr" };
 
         protected override string[] HashableFileTypes => new[] { ".osr" };
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index ee4b7bc8e7..7af400e807 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Skinning
         public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin());
         public readonly Bindable<SkinInfo> CurrentSkinInfo = new Bindable<SkinInfo>(SkinInfo.Default) { Default = SkinInfo.Default };
 
-        public override string[] HandledExtensions => new[] { ".osk" };
+        public override IEnumerable<string> HandledExtensions => new[] { ".osk" };
 
         protected override string[] HashableFileTypes => new[] { ".ini" };
 

From fe818a020a52896aa082de261d4dee9d2ec6a37e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 2 Oct 2020 16:17:57 +0900
Subject: [PATCH 05128/10326] Fix spinners not transforming correctly

---
 .../Drawables/Pieces/DefaultSpinnerDisc.cs    | 74 +++++++++++--------
 .../Skinning/LegacyNewStyleSpinner.cs         | 15 ++--
 .../Skinning/LegacyOldStyleSpinner.cs         |  5 +-
 3 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 587bd415ee..e855317544 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private Spinner spinner;
 
+        private const float initial_scale = 1.3f;
         private const float idle_alpha = 0.2f;
         private const float tracking_alpha = 0.4f;
 
@@ -41,7 +42,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             // we are slightly bigger than our parent, to clip the top and bottom of the circle
             // this should probably be revisited when scaled spinners are a thing.
-            Scale = new Vector2(1.3f);
+            Scale = new Vector2(initial_scale);
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -117,8 +118,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 fill.Alpha = (float)Interpolation.Damp(fill.Alpha, drawableSpinner.RotationTracker.Tracking ? tracking_alpha : idle_alpha, 0.98f, (float)Math.Abs(Clock.ElapsedFrameTime));
             }
 
-            const float initial_scale = 0.2f;
-            float targetScale = initial_scale + (1 - initial_scale) * drawableSpinner.Progress;
+            const float initial_fill_scale = 0.2f;
+            float targetScale = initial_fill_scale + (1 - initial_fill_scale) * drawableSpinner.Progress;
 
             fill.Scale = new Vector2((float)Interpolation.Lerp(fill.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
             mainContainer.Rotation = drawableSpinner.RotationTracker.Rotation;
@@ -129,41 +130,54 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             if (!(drawableHitObject is DrawableSpinner))
                 return;
 
-            centre.ScaleTo(0);
-            mainContainer.ScaleTo(0);
-
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt / 2, true))
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
             {
-                // constant ambient rotation to give the spinner "spinning" character.
-                this.RotateTo((float)(25 * spinner.Duration / 2000), spinner.TimePreempt + spinner.Duration);
-
-                centre.ScaleTo(0.3f, spinner.TimePreempt / 4, Easing.OutQuint);
-                mainContainer.ScaleTo(0.2f, spinner.TimePreempt / 4, Easing.OutQuint);
+                this.ScaleTo(initial_scale);
+                this.RotateTo(0);
 
                 using (BeginDelayedSequence(spinner.TimePreempt / 2, true))
                 {
-                    centre.ScaleTo(0.5f, spinner.TimePreempt / 2, Easing.OutQuint);
-                    mainContainer.ScaleTo(1, spinner.TimePreempt / 2, Easing.OutQuint);
+                    // constant ambient rotation to give the spinner "spinning" character.
+                    this.RotateTo((float)(25 * spinner.Duration / 2000), spinner.TimePreempt + spinner.Duration);
+                }
+
+                using (BeginDelayedSequence(spinner.TimePreempt + spinner.Duration + drawableHitObject.Result.TimeOffset, true))
+                {
+                    switch (state)
+                    {
+                        case ArmedState.Hit:
+                            this.ScaleTo(initial_scale * 1.2f, 320, Easing.Out);
+                            this.RotateTo(mainContainer.Rotation + 180, 320);
+                            break;
+
+                        case ArmedState.Miss:
+                            this.ScaleTo(initial_scale * 0.8f, 320, Easing.In);
+                            break;
+                    }
+                }
+            }
+
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+            {
+                centre.ScaleTo(0);
+                mainContainer.ScaleTo(0);
+
+                using (BeginDelayedSequence(spinner.TimePreempt / 2, true))
+                {
+                    centre.ScaleTo(0.3f, spinner.TimePreempt / 4, Easing.OutQuint);
+                    mainContainer.ScaleTo(0.2f, spinner.TimePreempt / 4, Easing.OutQuint);
+
+                    using (BeginDelayedSequence(spinner.TimePreempt / 2, true))
+                    {
+                        centre.ScaleTo(0.5f, spinner.TimePreempt / 2, Easing.OutQuint);
+                        mainContainer.ScaleTo(1, spinner.TimePreempt / 2, Easing.OutQuint);
+                    }
                 }
             }
 
             // transforms we have from completing the spinner will be rolled back, so reapply immediately.
-            updateComplete(state == ArmedState.Hit, 0);
-
-            using (BeginDelayedSequence(spinner.Duration, true))
-            {
-                switch (state)
-                {
-                    case ArmedState.Hit:
-                        this.ScaleTo(Scale * 1.2f, 320, Easing.Out);
-                        this.RotateTo(mainContainer.Rotation + 180, 320);
-                        break;
-
-                    case ArmedState.Miss:
-                        this.ScaleTo(Scale * 0.8f, 320, Easing.In);
-                        break;
-                }
-            }
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+                updateComplete(state == ArmedState.Hit, 0);
         }
 
         private void updateComplete(bool complete, double duration)
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 1dfc9c0772..56b5571ce1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -70,9 +70,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             base.LoadComplete();
 
-            this.FadeOut();
             drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
-
             updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
         }
 
@@ -83,12 +81,19 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             var spinner = (Spinner)drawableSpinner.HitObject;
 
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+                this.FadeOut();
+
             using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))
                 this.FadeInFromZero(spinner.TimeFadeIn / 2);
 
-            fixedMiddle.FadeColour(Color4.White);
-            using (BeginAbsoluteSequence(spinner.StartTime, true))
-                fixedMiddle.FadeColour(Color4.Red, spinner.Duration);
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+            {
+                fixedMiddle.FadeColour(Color4.White);
+
+                using (BeginDelayedSequence(spinner.TimePreempt, true))
+                    fixedMiddle.FadeColour(Color4.Red, spinner.Duration);
+            }
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index eba9abda0b..7b0d7acbbc 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -88,9 +88,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             base.LoadComplete();
 
-            this.FadeOut();
             drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
-
             updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
         }
 
@@ -101,6 +99,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             var spinner = drawableSpinner.HitObject;
 
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+                this.FadeOut();
+
             using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))
                 this.FadeInFromZero(spinner.TimeFadeIn / 2);
         }

From b7c276093db90227293a4fc8505e3d3aaa46f5cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 16:21:50 +0900
Subject: [PATCH 05129/10326] Add fallback case when EditorChangeHandler is not
 present (for tests)

---
 .../Rulesets/Edit/DrawableEditRulesetWrapper.cs     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs b/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
index d259a89055..43e5153f24 100644
--- a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
+++ b/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Edit
             Playfield.DisplayJudgements.Value = false;
         }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private IEditorChangeHandler changeHandler { get; set; }
 
         protected override void LoadComplete()
@@ -50,8 +50,15 @@ namespace osu.Game.Rulesets.Edit
             beatmap.HitObjectAdded += addHitObject;
             beatmap.HitObjectRemoved += removeHitObject;
 
-            // for now only regenerate replay on a finalised state change, not HitObjectUpdated.
-            changeHandler.OnStateChange += updateReplay;
+            if (changeHandler != null)
+            {
+                // for now only regenerate replay on a finalised state change, not HitObjectUpdated.
+                changeHandler.OnStateChange += updateReplay;
+            }
+            else
+            {
+                beatmap.HitObjectUpdated += _ => updateReplay();
+            }
         }
 
         private void updateReplay() => drawableRuleset.RegenerateAutoplay();

From b7aba194411ea28ab6de45246edce05e62964ac1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 16:31:11 +0900
Subject: [PATCH 05130/10326] Add audio file drag-drop support at editor setup
 screen

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 44 +++++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index f6eb92e1ec..7bb4e8bbc4 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -2,8 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -13,6 +15,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
+using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -23,8 +26,14 @@ using osuTK;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    public class SetupScreen : EditorScreen
+    public class SetupScreen : EditorScreen, ICanAcceptFiles
     {
+        public IEnumerable<string> HandledExtensions => ImageExtensions.Concat(AudioExtensions);
+
+        public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
+
+        public static string[] AudioExtensions { get; } = { ".mp3", ".ogg" };
+
         private FillFlowContainer flow;
         private LabelledTextBox artistTextBox;
         private LabelledTextBox titleTextBox;
@@ -32,6 +41,9 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox difficultyTextBox;
         private LabelledTextBox audioTrackTextBox;
 
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
         [Resolved]
         private MusicController music { get; set; }
 
@@ -150,6 +162,12 @@ namespace osu.Game.Screens.Edit.Setup
                 item.OnCommit += onCommit;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            game.RegisterImportHandler(this);
+        }
+
         public bool ChangeAudioTrack(string path)
         {
             var info = new FileInfo(path);
@@ -196,6 +214,28 @@ namespace osu.Game.Screens.Edit.Setup
             Beatmap.Value.Metadata.AuthorString = creatorTextBox.Current.Value;
             Beatmap.Value.BeatmapInfo.Version = difficultyTextBox.Current.Value;
         }
+
+        public Task Import(params string[] paths)
+        {
+            var firstFile = new FileInfo(paths.First());
+
+            if (ImageExtensions.Contains(firstFile.Extension))
+            {
+                // todo: add image drag drop support
+            }
+            else if (AudioExtensions.Contains(firstFile.Extension))
+            {
+                audioTrackTextBox.Text = firstFile.FullName;
+            }
+
+            return Task.CompletedTask;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            game.UnregisterImportHandler(this);
+        }
     }
 
     internal class FileChooserLabelledTextBox : LabelledTextBox
@@ -230,7 +270,7 @@ namespace osu.Game.Screens.Edit.Setup
 
         public void DisplayFileChooser()
         {
-            Target.Child = new FileSelector(validFileExtensions: new[] { ".mp3", ".ogg" })
+            Target.Child = new FileSelector(validFileExtensions: SetupScreen.AudioExtensions)
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 400,

From 4139301afa172f2edc0eb734fa05dfe0596a30f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 16:49:47 +0900
Subject: [PATCH 05131/10326] Exit import process after first handler is run

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index f61ff43ca9..611bd783cd 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -362,7 +362,10 @@ namespace osu.Game
             foreach (var importer in fileImporters)
             {
                 if (importer.HandledExtensions.Contains(extension))
+                {
                     await importer.Import(paths);
+                    continue;
+                }
             }
         }
 

From 2a02f8f3f3ba5dbbf86d807e0ddb29b4a26b4ebc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 16:49:55 +0900
Subject: [PATCH 05132/10326] Add support for background changing

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 89 ++++++++++++++++------
 1 file changed, 65 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 7bb4e8bbc4..bbd0e23210 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox creatorTextBox;
         private LabelledTextBox difficultyTextBox;
         private LabelledTextBox audioTrackTextBox;
+        private Container backgroundSpriteContainer;
 
         [Resolved]
         private OsuGameBase game { get; set; }
@@ -95,19 +96,12 @@ namespace osu.Game.Screens.Edit.Setup
                                 Direction = FillDirection.Vertical,
                                 Children = new Drawable[]
                                 {
-                                    new Container
+                                    backgroundSpriteContainer = new Container
                                     {
                                         RelativeSizeAxes = Axes.X,
                                         Height = 250,
                                         Masking = true,
                                         CornerRadius = 10,
-                                        Child = new BeatmapBackgroundSprite(Beatmap.Value)
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
-                                            FillMode = FillMode.Fill,
-                                        },
                                     },
                                     new OsuSpriteText
                                     {
@@ -156,18 +150,81 @@ namespace osu.Game.Screens.Edit.Setup
                 }
             };
 
+            updateBackgroundSprite();
+
             audioTrackTextBox.Current.BindValueChanged(audioTrackChanged);
 
             foreach (var item in flow.OfType<LabelledTextBox>())
                 item.OnCommit += onCommit;
         }
 
+        Task ICanAcceptFiles.Import(params string[] paths)
+        {
+            Schedule(() =>
+            {
+                var firstFile = new FileInfo(paths.First());
+
+                if (ImageExtensions.Contains(firstFile.Extension))
+                {
+                    ChangeBackgroundImage(firstFile.FullName);
+                }
+                else if (AudioExtensions.Contains(firstFile.Extension))
+                {
+                    audioTrackTextBox.Text = firstFile.FullName;
+                }
+            });
+
+            return Task.CompletedTask;
+        }
+
+        private void updateBackgroundSprite()
+        {
+            LoadComponentAsync(new BeatmapBackgroundSprite(Beatmap.Value)
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                FillMode = FillMode.Fill,
+            }, background =>
+            {
+                backgroundSpriteContainer.Child = background;
+                background.FadeInFromZero(500);
+            });
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
             game.RegisterImportHandler(this);
         }
 
+        public bool ChangeBackgroundImage(string path)
+        {
+            var info = new FileInfo(path);
+
+            if (!info.Exists)
+                return false;
+
+            var set = Beatmap.Value.BeatmapSetInfo;
+
+            // remove the previous background for now.
+            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.BackgroundFile);
+
+            using (var stream = info.OpenRead())
+            {
+                if (oldFile != null)
+                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
+                else
+                    beatmaps.AddFile(set, stream, info.Name);
+            }
+
+            Beatmap.Value.Metadata.BackgroundFile = info.Name;
+            updateBackgroundSprite();
+
+            return true;
+        }
+
         public bool ChangeAudioTrack(string path)
         {
             var info = new FileInfo(path);
@@ -215,22 +272,6 @@ namespace osu.Game.Screens.Edit.Setup
             Beatmap.Value.BeatmapInfo.Version = difficultyTextBox.Current.Value;
         }
 
-        public Task Import(params string[] paths)
-        {
-            var firstFile = new FileInfo(paths.First());
-
-            if (ImageExtensions.Contains(firstFile.Extension))
-            {
-                // todo: add image drag drop support
-            }
-            else if (AudioExtensions.Contains(firstFile.Extension))
-            {
-                audioTrackTextBox.Text = firstFile.FullName;
-            }
-
-            return Task.CompletedTask;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From faeb9910e5e98bae54ffc7503e554134ded98a85 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 17:06:55 +0900
Subject: [PATCH 05133/10326] Revert "Exit import process after first handler
 is run"

This reverts commit 4139301afa172f2edc0eb734fa05dfe0596a30f9.
---
 osu.Game/OsuGameBase.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 611bd783cd..f61ff43ca9 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -362,10 +362,7 @@ namespace osu.Game
             foreach (var importer in fileImporters)
             {
                 if (importer.HandledExtensions.Contains(extension))
-                {
                     await importer.Import(paths);
-                    continue;
-                }
             }
         }
 

From fc920a8899478ff4e00ff5be84188386799148f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 17:32:34 +0900
Subject: [PATCH 05134/10326] Add change handler logic

---
 osu.Game/Screens/Edit/Timing/GroupSection.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/GroupSection.cs b/osu.Game/Screens/Edit/Timing/GroupSection.cs
index ac9c4be97a..0cc78315d2 100644
--- a/osu.Game/Screens/Edit/Timing/GroupSection.cs
+++ b/osu.Game/Screens/Edit/Timing/GroupSection.cs
@@ -27,6 +27,9 @@ namespace osu.Game.Screens.Edit.Timing
         [Resolved]
         private EditorClock clock { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private IEditorChangeHandler changeHandler { get; set; }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -90,6 +93,8 @@ namespace osu.Game.Screens.Edit.Timing
 
         private void changeSelectedGroupTime(in double time)
         {
+            changeHandler?.BeginChange();
+
             var currentGroupItems = SelectedGroup.Value.ControlPoints.ToArray();
 
             Beatmap.Value.Beatmap.ControlPointInfo.RemoveGroup(SelectedGroup.Value);
@@ -98,6 +103,8 @@ namespace osu.Game.Screens.Edit.Timing
                 Beatmap.Value.Beatmap.ControlPointInfo.Add(time, cp);
 
             SelectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(time);
+
+            changeHandler?.EndChange();
         }
     }
 }

From 00eed295272b57ae3570fa9ef8e87274e9b1870f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 17:35:41 +0900
Subject: [PATCH 05135/10326] Don't update time if it hasn't changed

---
 osu.Game/Screens/Edit/Timing/GroupSection.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/GroupSection.cs b/osu.Game/Screens/Edit/Timing/GroupSection.cs
index 0cc78315d2..ee19aaface 100644
--- a/osu.Game/Screens/Edit/Timing/GroupSection.cs
+++ b/osu.Game/Screens/Edit/Timing/GroupSection.cs
@@ -93,6 +93,9 @@ namespace osu.Game.Screens.Edit.Timing
 
         private void changeSelectedGroupTime(in double time)
         {
+            if (time == SelectedGroup.Value.Time)
+                return;
+
             changeHandler?.BeginChange();
 
             var currentGroupItems = SelectedGroup.Value.ControlPoints.ToArray();

From 436cc572d3666353d24669846155b6c709f0b4f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 17:15:28 +0900
Subject: [PATCH 05136/10326] Expose ChangeHandler.SaveState via interface

---
 osu.Game/Screens/Edit/EditorChangeHandler.cs  | 3 ---
 osu.Game/Screens/Edit/IEditorChangeHandler.cs | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 617c436ee0..66331d54c0 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -79,9 +79,6 @@ namespace osu.Game.Screens.Edit
                 SaveState();
         }
 
-        /// <summary>
-        /// Saves the current <see cref="Editor"/> state.
-        /// </summary>
         public void SaveState()
         {
             if (bulkChangesStarted > 0)
diff --git a/osu.Game/Screens/Edit/IEditorChangeHandler.cs b/osu.Game/Screens/Edit/IEditorChangeHandler.cs
index c1328252d4..f95df76907 100644
--- a/osu.Game/Screens/Edit/IEditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/IEditorChangeHandler.cs
@@ -29,5 +29,11 @@ namespace osu.Game.Screens.Edit
         /// This should be invoked as soon as possible after <see cref="BeginChange"/> to cause a state change.
         /// </remarks>
         void EndChange();
+
+        /// <summary>
+        /// Immediately saves the current <see cref="Editor"/> state.
+        /// Note that this will be a no-op if there is a change in progress via <see cref="BeginChange"/>.
+        /// </summary>
+        void SaveState();
     }
 }

From c1c5b5da8e703e7fc37b9585c4c63f743d4a7180 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 17:15:58 +0900
Subject: [PATCH 05137/10326] Push state change on control point group addition
 / removal

---
 osu.Game/Screens/Edit/Timing/TimingScreen.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 0a0cfe193d..3b3ae949c1 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -87,6 +87,9 @@ namespace osu.Game.Screens.Edit.Timing
             [Resolved]
             private Bindable<ControlPointGroup> selectedGroup { get; set; }
 
+            [Resolved(canBeNull: true)]
+            private IEditorChangeHandler changeHandler { get; set; }
+
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
@@ -146,6 +149,7 @@ namespace osu.Game.Screens.Edit.Timing
                 controlGroups.BindCollectionChanged((sender, args) =>
                 {
                     table.ControlGroups = controlGroups;
+                    changeHandler.SaveState();
                 }, true);
             }
 

From 98fd661b239dbd189cc7fb36cd1a30b8e20083c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 17:55:47 +0900
Subject: [PATCH 05138/10326] Add change handling for timing section

---
 osu.Game/Screens/Edit/Timing/Section.cs       | 3 +++
 osu.Game/Screens/Edit/Timing/TimingSection.cs | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/Section.cs b/osu.Game/Screens/Edit/Timing/Section.cs
index 603fb77f31..7a81eeb1a4 100644
--- a/osu.Game/Screens/Edit/Timing/Section.cs
+++ b/osu.Game/Screens/Edit/Timing/Section.cs
@@ -32,6 +32,9 @@ namespace osu.Game.Screens.Edit.Timing
         [Resolved]
         protected Bindable<ControlPointGroup> SelectedGroup { get; private set; }
 
+        [Resolved(canBeNull: true)]
+        protected IEditorChangeHandler ChangeHandler { get; private set; }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index 0202441537..2ab8703cc4 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -37,8 +37,13 @@ namespace osu.Game.Screens.Edit.Timing
             if (point.NewValue != null)
             {
                 bpmSlider.Bindable = point.NewValue.BeatLengthBindable;
+                bpmSlider.Bindable.BindValueChanged(_ => ChangeHandler?.SaveState());
+
                 bpmTextEntry.Bindable = point.NewValue.BeatLengthBindable;
+                // no need to hook change handler here as it's the same bindable as above
+
                 timeSignature.Bindable = point.NewValue.TimeSignatureBindable;
+                timeSignature.Bindable.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }
 
@@ -117,6 +122,8 @@ namespace osu.Game.Screens.Edit.Timing
                 bpmBindable.BindValueChanged(bpm => beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue));
 
                 base.Bindable = bpmBindable;
+
+                TransferValueOnCommit = true;
             }
 
             public override Bindable<double> Bindable

From 693a4ff474ea957bd1d8bc4276b3d75616904278 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 17:56:30 +0900
Subject: [PATCH 05139/10326] Add change handling for effects section

---
 osu.Game/Screens/Edit/Timing/EffectSection.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/EffectSection.cs b/osu.Game/Screens/Edit/Timing/EffectSection.cs
index 71e7f42713..2f143108a9 100644
--- a/osu.Game/Screens/Edit/Timing/EffectSection.cs
+++ b/osu.Game/Screens/Edit/Timing/EffectSection.cs
@@ -28,7 +28,10 @@ namespace osu.Game.Screens.Edit.Timing
             if (point.NewValue != null)
             {
                 kiai.Current = point.NewValue.KiaiModeBindable;
+                kiai.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
+
                 omitBarLine.Current = point.NewValue.OmitFirstBarLineBindable;
+                omitBarLine.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }
 

From 08faef694bde8b66b7234c231ea58b89a058a951 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 17:58:22 +0900
Subject: [PATCH 05140/10326] Add change handling for difficulty section

---
 osu.Game/Screens/Edit/Timing/DifficultySection.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Timing/DifficultySection.cs b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
index 78766d9777..b55d74e3b4 100644
--- a/osu.Game/Screens/Edit/Timing/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Screens.Edit.Timing
             if (point.NewValue != null)
             {
                 multiplierSlider.Current = point.NewValue.SpeedMultiplierBindable;
+                multiplierSlider.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }
 

From 9fc9009dbe1a6bba52686e41413aae20c4804652 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 17:59:47 +0900
Subject: [PATCH 05141/10326] Add change handling for sample section

---
 osu.Game/Screens/Edit/Timing/SampleSection.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/SampleSection.cs b/osu.Game/Screens/Edit/Timing/SampleSection.cs
index de986e28ca..280e19c99a 100644
--- a/osu.Game/Screens/Edit/Timing/SampleSection.cs
+++ b/osu.Game/Screens/Edit/Timing/SampleSection.cs
@@ -35,7 +35,10 @@ namespace osu.Game.Screens.Edit.Timing
             if (point.NewValue != null)
             {
                 bank.Current = point.NewValue.SampleBankBindable;
+                bank.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
+
                 volume.Current = point.NewValue.SampleVolumeBindable;
+                volume.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }
 

From 519c3ac2bdb6a23e30f48cac57db9e4f62c858e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 17:59:57 +0900
Subject: [PATCH 05142/10326] Change SliderWithTextBoxInput to transfer on
 commit

---
 osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
index 14023b0c35..d5afc8978d 100644
--- a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
+++ b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Screens.Edit.Timing
                         },
                         slider = new SettingsSlider<T>
                         {
+                            TransferValueOnCommit = true,
                             RelativeSizeAxes = Axes.X,
                         }
                     }

From 66f5187e6a26ea480fb777d9f5abef93ce7a4e13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 18:20:59 +0900
Subject: [PATCH 05143/10326] Remove redundant access permission

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

diff --git a/osu.Game/Screens/Edit/IEditorChangeHandler.cs b/osu.Game/Screens/Edit/IEditorChangeHandler.cs
index a23a956e14..1774ec6c04 100644
--- a/osu.Game/Screens/Edit/IEditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/IEditorChangeHandler.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// Fired whenever a state change occurs.
         /// </summary>
-        public event Action OnStateChange;
+        event Action OnStateChange;
 
         /// <summary>
         /// Begins a bulk state change event. <see cref="EndChange"/> should be invoked soon after.

From 575046e5fdc34bc13797cab78517f337136734c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 18:21:13 +0900
Subject: [PATCH 05144/10326] Don't update reply on add/remove (will be
 automatically handled by change handler events)

---
 osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs b/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
index 43e5153f24..8ed7885101 100644
--- a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
+++ b/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
@@ -69,8 +69,6 @@ namespace osu.Game.Rulesets.Edit
 
             drawableRuleset.Playfield.Add(drawableObject);
             drawableRuleset.Playfield.PostProcess();
-
-            updateReplay();
         }
 
         private void removeHitObject(HitObject hitObject)
@@ -79,8 +77,6 @@ namespace osu.Game.Rulesets.Edit
 
             drawableRuleset.Playfield.Remove(drawableObject);
             drawableRuleset.Playfield.PostProcess();
-
-            updateReplay();
         }
 
         public override bool PropagatePositionalInputSubTree => false;

From 1a0171fb2dc2a4fea5eaa8c57a86cd74932d4ff9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 18:18:14 +0900
Subject: [PATCH 05145/10326] Fix tests specifying steps in their constructors

---
 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs | 4 +++-
 osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs             | 4 ++--
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs           | 3 ++-
 osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs              | 3 ++-
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs              | 5 ++---
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
index 95e86de884..9c4c2b3d5b 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
@@ -13,7 +14,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
     public class TestSceneHoldNote : ManiaHitObjectTestScene
     {
-        public TestSceneHoldNote()
+        [Test]
+        public void TestHoldNote()
         {
             AddToggleStep("toggle hitting", v =>
             {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index dd5fd93710..76c1b47cca 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -28,8 +28,8 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class TestSceneNotes : OsuTestScene
     {
-        [BackgroundDependencyLoader]
-        private void load()
+        [Test]
+        public void TestVariousNotes()
         {
             Child = new FillFlowContainer
             {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index 37df0d6e37..596bc06c68 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -20,7 +20,8 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         private int depthIndex;
 
-        public TestSceneHitCircle()
+        [Test]
+        public void TestVariousHitCircles()
         {
             AddStep("Miss Big Single", () => SetContents(() => testSingle(2)));
             AddStep("Miss Medium Single", () => SetContents(() => testSingle(5)));
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index c79cae2fe5..c9e112f76d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -27,7 +27,8 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         private int depthIndex;
 
-        public TestSceneSlider()
+        [Test]
+        public void TestVariousSliders()
         {
             AddStep("Big Single", () => SetContents(() => testSimpleBig()));
             AddStep("Medium Single", () => SetContents(() => testSimpleMedium()));
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 0f605be8f9..e4c0766844 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -3,7 +3,6 @@
 
 using System;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -30,8 +29,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private readonly Random rng = new Random(1337);
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [Test]
+        public void TestVariousHits()
         {
             AddStep("Hit", () => addHitJudgement(false));
             AddStep("Strong hit", () => addStrongHitJudgement(false));

From 5a6c45e2ff43fa7e4c811a46883d577db715faea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 18:41:28 +0900
Subject: [PATCH 05146/10326] Fix hidden mod support for sliderendcircle

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs    | 31 +++++++++++++++++++
 .../Objects/Drawables/DrawableSliderRepeat.cs |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 08fd13915d..80e40af717 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Rulesets.Osu.Mods
             base.ApplyToDrawableHitObjects(drawables);
         }
 
+        private double lastSliderHeadFadeOutStartTime;
+        private double lastSliderHeadFadeOutDuration;
+
         protected override void ApplyHiddenState(DrawableHitObject drawable, ArmedState state)
         {
             if (!(drawable is DrawableOsuHitObject d))
@@ -54,7 +57,35 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             switch (drawable)
             {
+                case DrawableSliderTail sliderTail:
+                    // use stored values from head circle to achieve same fade sequence.
+                    fadeOutDuration = lastSliderHeadFadeOutDuration;
+                    fadeOutStartTime = lastSliderHeadFadeOutStartTime;
+
+                    using (drawable.BeginAbsoluteSequence(fadeOutStartTime, true))
+                        sliderTail.FadeOut(fadeOutDuration);
+
+                    break;
+
+                case DrawableSliderRepeat sliderRepeat:
+                    // use stored values from head circle to achieve same fade sequence.
+                    fadeOutDuration = lastSliderHeadFadeOutDuration;
+                    fadeOutStartTime = lastSliderHeadFadeOutStartTime;
+
+                    using (drawable.BeginAbsoluteSequence(fadeOutStartTime, true))
+                        // only apply to circle piece – reverse arrow is not affected by hidden.
+                        sliderRepeat.CirclePiece.FadeOut(fadeOutDuration);
+
+                    break;
+
                 case DrawableHitCircle circle:
+
+                    if (circle is DrawableSliderHead)
+                    {
+                        lastSliderHeadFadeOutDuration = fadeOutDuration;
+                        lastSliderHeadFadeOutStartTime = fadeOutStartTime;
+                    }
+
                     // we don't want to see the approach circle
                     using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
                         circle.ApproachCircle.Hide();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 9d775de7df..46d47a8c94 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private readonly Drawable scaleContainer;
 
+        public readonly Drawable CirclePiece;
+
         public override bool DisplayResult => false;
 
         public DrawableSliderRepeat(SliderRepeat sliderRepeat, DrawableSlider drawableSlider)
@@ -44,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 Children = new Drawable[]
                 {
                     // no default for this; only visible in legacy skins.
-                    new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty()),
+                    CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty()),
                     arrow = new ReverseArrowPiece(),
                 }
             };

From ed34985fdde5b8bcf86169a1f66219def3e0ac9f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 18:47:11 +0900
Subject: [PATCH 05147/10326] Add step for mania note construction

---
 .../TestSceneNotes.cs                         | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 76c1b47cca..fd8a01766b 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -9,6 +9,7 @@ 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.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -31,22 +32,30 @@ namespace osu.Game.Rulesets.Mania.Tests
         [Test]
         public void TestVariousNotes()
         {
-            Child = new FillFlowContainer
+            DrawableNote note1 = null;
+            DrawableNote note2 = null;
+            DrawableHoldNote holdNote1 = null;
+            DrawableHoldNote holdNote2 = null;
+
+            AddStep("create notes", () =>
             {
-                Clock = new FramedClock(new ManualClock()),
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(20),
-                Children = new[]
+                Child = new FillFlowContainer
                 {
-                    createNoteDisplay(ScrollingDirection.Down, 1, out var note1),
-                    createNoteDisplay(ScrollingDirection.Up, 2, out var note2),
-                    createHoldNoteDisplay(ScrollingDirection.Down, 1, out var holdNote1),
-                    createHoldNoteDisplay(ScrollingDirection.Up, 2, out var holdNote2),
-                }
-            };
+                    Clock = new FramedClock(new ManualClock()),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(20),
+                    Children = new[]
+                    {
+                        createNoteDisplay(ScrollingDirection.Down, 1, out note1),
+                        createNoteDisplay(ScrollingDirection.Up, 2, out note2),
+                        createHoldNoteDisplay(ScrollingDirection.Down, 1, out holdNote1),
+                        createHoldNoteDisplay(ScrollingDirection.Up, 2, out holdNote2),
+                    }
+                };
+            });
 
             AddAssert("note 1 facing downwards", () => verifyAnchors(note1, Anchor.y2));
             AddAssert("note 2 facing upwards", () => verifyAnchors(note2, Anchor.y0));

From fcc6cb36e4c1e204e4ea106e6756b2cdb442bb48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 18:50:47 +0900
Subject: [PATCH 05148/10326] Change text colour to black

---
 osu.Game/Screens/Edit/Timing/RowAttribute.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index c45995ee83..2757e08026 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Edit.Timing
                     Origin = Anchor.Centre,
                     Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
                     Text = header,
-                    Colour = colours.Gray3
+                    Colour = colours.Gray0
                 },
             };
         }

From 0d3a95d8fca626aededdff8bbc4e329b4401818c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 19:54:13 +0900
Subject: [PATCH 05149/10326] Remove unnecessary string interpolation

---
 .../Edit/Compose/Components/Timeline/SamplePointPiece.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index 6a6e947343..37c8c8402a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             };
 
             volume.BindValueChanged(volume => volumeBox.Height = volume.NewValue / 100f, true);
-            bank.BindValueChanged(bank => text.Text = $"{bank.NewValue}", true);
+            bank.BindValueChanged(bank => text.Text = bank.NewValue, true);
         }
     }
 }

From a3ecc6c5a4bb55553b9a4ab97f1859e3f665ec0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 19:56:24 +0900
Subject: [PATCH 05150/10326] Remove redundant array type specification

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 46d47a8c94..2a88f11f69 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Children = new Drawable[]
+                Children = new[]
                 {
                     // no default for this; only visible in legacy skins.
                     CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty()),

From 75ae9f1b30c47e3802fa7b2170e8f9d4d695cc52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Oct 2020 19:57:14 +0900
Subject: [PATCH 05151/10326] Remove unused using

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

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index fd8a01766b..6b8f5d5d9d 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -9,7 +9,6 @@ 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.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;

From dab50bff6f28dcddc8c9ed68ed2a3e0be71e9822 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 3 Oct 2020 01:27:42 +0900
Subject: [PATCH 05152/10326] Protect "use current time" button against crash
 when no timing point is selected

---
 osu.Game/Screens/Edit/Timing/GroupSection.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/GroupSection.cs b/osu.Game/Screens/Edit/Timing/GroupSection.cs
index ee19aaface..c77d48ef0a 100644
--- a/osu.Game/Screens/Edit/Timing/GroupSection.cs
+++ b/osu.Game/Screens/Edit/Timing/GroupSection.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Screens.Edit.Timing
     {
         private LabelledTextBox textBox;
 
+        private TriangleButton button;
+
         [Resolved]
         protected Bindable<ControlPointGroup> SelectedGroup { get; private set; }
 
@@ -52,7 +54,7 @@ namespace osu.Game.Screens.Edit.Timing
                         {
                             Label = "Time"
                         },
-                        new TriangleButton
+                        button = new TriangleButton
                         {
                             Text = "Use current time",
                             RelativeSizeAxes = Axes.X,
@@ -82,18 +84,22 @@ namespace osu.Game.Screens.Edit.Timing
                 if (group.NewValue == null)
                 {
                     textBox.Text = string.Empty;
+
                     textBox.Current.Disabled = true;
+                    button.Enabled.Value = false;
                     return;
                 }
 
                 textBox.Current.Disabled = false;
+                button.Enabled.Value = true;
+
                 textBox.Text = $"{group.NewValue.Time:n0}";
             }, true);
         }
 
         private void changeSelectedGroupTime(in double time)
         {
-            if (time == SelectedGroup.Value.Time)
+            if (SelectedGroup.Value == null || time == SelectedGroup.Value.Time)
                 return;
 
             changeHandler?.BeginChange();

From 16f331cf6d09601c655234cfa245252a90adbe03 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Fri, 2 Oct 2020 19:34:06 +0300
Subject: [PATCH 05153/10326] Move implementation to LegacyCursorTrail

---
 osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.cs | 10 +++++++++-
 osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs      | 10 ++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.cs
index 1885c76fcc..eabf797607 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Skinning;
 
@@ -15,6 +18,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private bool disjointTrail;
         private double lastTrailTime;
+        private IBindable<float> cursorSize;
 
         public LegacyCursorTrail()
         {
@@ -22,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        private void load(ISkinSource skin, OsuConfigManager config)
         {
             Texture = skin.GetTexture("cursortrail");
             disjointTrail = skin.GetTexture("cursormiddle") == null;
@@ -32,12 +36,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 // stable "magic ratio". see OsuPlayfieldAdjustmentContainer for full explanation.
                 Texture.ScaleAdjust *= 1.6f;
             }
+
+            cursorSize = config.GetBindable<float>(OsuSetting.GameplayCursorSize).GetBoundCopy();
         }
 
         protected override double FadeDuration => disjointTrail ? 150 : 500;
 
         protected override bool InterpolateMovements => !disjointTrail;
 
+        protected override float IntervalMultiplier => Math.Max(cursorSize.Value, 1);
+
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
             if (!disjointTrail)
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index fb8a850223..c30615e6e9 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.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Batches;
 using osu.Framework.Graphics.OpenGL.Vertices;
@@ -16,7 +15,6 @@ using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Layout;
 using osu.Framework.Timing;
-using osu.Game.Configuration;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Graphics.ES30;
@@ -30,7 +28,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         private readonly TrailPart[] parts = new TrailPart[max_sprites];
         private int currentIndex;
         private IShader shader;
-        private Bindable<float> cursorSize;
         private double timeOffset;
         private float time;
 
@@ -51,10 +48,9 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         }
 
         [BackgroundDependencyLoader]
-        private void load(ShaderManager shaders, OsuConfigManager config)
+        private void load(ShaderManager shaders)
         {
             shader = shaders.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE);
-            cursorSize = config.GetBindable<float>(OsuSetting.GameplayCursorSize).GetBoundCopy();
         }
 
         protected override void LoadComplete()
@@ -123,6 +119,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         /// </summary>
         protected virtual bool InterpolateMovements => true;
 
+        protected virtual float IntervalMultiplier => 1.0f;
+
         private Vector2? lastPosition;
         private readonly InputResampler resampler = new InputResampler();
 
@@ -151,7 +149,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     float distance = diff.Length;
                     Vector2 direction = diff / distance;
 
-                    float interval = partSize.X / 2.5f / Math.Max(cursorSize.Value, 1);
+                    float interval = partSize.X / 2.5f / IntervalMultiplier;
 
                     for (float d = interval; d < distance; d += interval)
                     {

From 8cd13729eeabb94dccdea6057994007ad4dbeac4 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Fri, 2 Oct 2020 19:34:49 +0300
Subject: [PATCH 05154/10326] Actually multiply by the multiplier

---
 osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.cs | 2 +-
 osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.cs
index eabf797607..e6cd7bc59d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         protected override bool InterpolateMovements => !disjointTrail;
 
-        protected override float IntervalMultiplier => Math.Max(cursorSize.Value, 1);
+        protected override float IntervalMultiplier => 1 / Math.Max(cursorSize.Value, 1);
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index c30615e6e9..0b30c28b8d 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     float distance = diff.Length;
                     Vector2 direction = diff / distance;
 
-                    float interval = partSize.X / 2.5f / IntervalMultiplier;
+                    float interval = partSize.X / 2.5f * IntervalMultiplier;
 
                     for (float d = interval; d < distance; d += interval)
                     {

From 0163688a174d84305b191caa1a2a42ce48ed3a6f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 2 Oct 2020 19:24:30 +0200
Subject: [PATCH 05155/10326] Remove IBeatmap from PerformanceCalculator.

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs                  | 2 +-
 .../Difficulty/CatchPerformanceCalculator.cs             | 4 ++--
 .../Difficulty/ManiaPerformanceCalculator.cs             | 4 ++--
 osu.Game.Rulesets.Mania/ManiaRuleset.cs                  | 2 +-
 .../Difficulty/OsuPerformanceCalculator.cs               | 4 ++--
 osu.Game.Rulesets.Osu/OsuRuleset.cs                      | 2 +-
 .../Difficulty/TaikoPerformanceCalculator.cs             | 4 ++--
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs                  | 2 +-
 osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs    | 9 +++------
 osu.Game/Rulesets/Ruleset.cs                             | 2 +-
 10 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index ca75a816f1..cb7cac436b 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Catch
 
         public override ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => new CatchLegacySkinTransformer(source);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new CatchPerformanceCalculator(this, beatmap, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, DifficultyAttributes attributes, ScoreInfo score) => new CatchPerformanceCalculator(this, attributes, score);
 
         public int LegacyID => 2;
 
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
index a4b9ca35eb..e671e581cf 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
@@ -25,8 +25,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         private int tinyTicksMissed;
         private int misses;
 
-        public CatchPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
-            : base(ruleset, beatmap, score)
+        public CatchPerformanceCalculator(Ruleset ruleset, DifficultyAttributes attributes, ScoreInfo score)
+            : base(ruleset, attributes, score)
         {
         }
 
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
index 91383c5548..086afb3254 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
@@ -29,8 +29,8 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         private int countMeh;
         private int countMiss;
 
-        public ManiaPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
-            : base(ruleset, beatmap, score)
+        public ManiaPerformanceCalculator(Ruleset ruleset, DifficultyAttributes attributes, ScoreInfo score)
+            : base(ruleset, attributes, score)
         {
         }
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 71ac85dd1b..8bf6b5e064 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mania
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new ManiaBeatmapConverter(beatmap, this);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new ManiaPerformanceCalculator(this, beatmap, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, DifficultyAttributes attributes, ScoreInfo score) => new ManiaPerformanceCalculator(this, attributes, score);
 
         public const string SHORT_NAME = "mania";
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 02577461f0..9e08163329 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -31,8 +31,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         private int countMeh;
         private int countMiss;
 
-        public OsuPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
-            : base(ruleset, beatmap, score)
+        public OsuPerformanceCalculator(Ruleset ruleset, DifficultyAttributes attributes, ScoreInfo score)
+            : base(ruleset, attributes, score)
         {
             countHitCircles = Beatmap.HitObjects.Count(h => h is HitCircle);
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 7f4a0dcbbb..9798f15f21 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new OsuDifficultyCalculator(this, beatmap);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new OsuPerformanceCalculator(this, beatmap, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, DifficultyAttributes attributes, ScoreInfo score) => new OsuPerformanceCalculator(this, attributes, score);
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
index c04fffa2e7..2505300425 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
@@ -24,8 +24,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         private int countMeh;
         private int countMiss;
 
-        public TaikoPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
-            : base(ruleset, beatmap, score)
+        public TaikoPerformanceCalculator(Ruleset ruleset, DifficultyAttributes attributes, ScoreInfo score)
+            : base(ruleset, attributes, score)
         {
         }
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 9d485e3f20..3bc749b868 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Taiko
 
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new TaikoDifficultyCalculator(this, beatmap);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new TaikoPerformanceCalculator(this, beatmap, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, DifficultyAttributes attributes, ScoreInfo score) => new TaikoPerformanceCalculator(this, attributes, score);
 
         public int LegacyID => 1;
 
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs
index ac3b817840..58427f6945 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceCalculator.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;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 
@@ -16,19 +16,16 @@ namespace osu.Game.Rulesets.Difficulty
         protected readonly DifficultyAttributes Attributes;
 
         protected readonly Ruleset Ruleset;
-        protected readonly IBeatmap Beatmap;
         protected readonly ScoreInfo Score;
 
         protected double TimeRate { get; private set; } = 1;
 
-        protected PerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
+        protected PerformanceCalculator(Ruleset ruleset, DifficultyAttributes attributes, ScoreInfo score)
         {
             Ruleset = ruleset;
             Score = score;
 
-            Beatmap = beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods);
-
-            Attributes = ruleset.CreateDifficultyCalculator(beatmap).Calculate(score.Mods);
+            Attributes = attributes ?? throw new ArgumentNullException(nameof(attributes));
 
             ApplyMods(score.Mods);
         }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 915544d010..25c5f41b5b 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Rulesets
 
         public abstract DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap);
 
-        public virtual PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => null;
+        public virtual PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, DifficultyAttributes attributes, ScoreInfo score) => null;
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 

From cb2f695fddf3fca6c2fd6654a25984be5b721dcf Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 2 Oct 2020 19:34:41 +0200
Subject: [PATCH 05156/10326] Calculate hit circle count in
 OsuPerformanceCalculator.

---
 .../Difficulty/OsuDifficultyAttributes.cs     |  1 +
 .../Difficulty/OsuDifficultyCalculator.cs     |  3 +++
 .../Difficulty/OsuPerformanceCalculator.cs    | 20 ++++++-------------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
index a9879013f8..50f060cf06 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
@@ -11,5 +11,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         public double SpeedStrain;
         public double ApproachRate;
         public double OverallDifficulty;
+        public int HitCirclesCount;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index b0d261a1cc..86c7cd2298 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -47,6 +47,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             // Add the ticks + tail of the slider. 1 is subtracted because the head circle would be counted twice (once for the slider itself in the line above)
             maxCombo += beatmap.HitObjects.OfType<Slider>().Sum(s => s.NestedHitObjects.Count - 1);
 
+            int hitCirclesCount = beatmap.HitObjects.Count(h => h is HitCircle);
+
             return new OsuDifficultyAttributes
             {
                 StarRating = starRating,
@@ -56,6 +58,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 ApproachRate = preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5,
                 OverallDifficulty = (80 - hitWindowGreat) / 6,
                 MaxCombo = maxCombo,
+                HitCirclesCount = hitCirclesCount,
                 Skills = skills
             };
         }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 9e08163329..6acd8f9a87 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -19,9 +19,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
     {
         public new OsuDifficultyAttributes Attributes => (OsuDifficultyAttributes)base.Attributes;
 
-        private readonly int countHitCircles;
-        private readonly int beatmapMaxCombo;
-
         private Mod[] mods;
 
         private double accuracy;
@@ -34,11 +31,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         public OsuPerformanceCalculator(Ruleset ruleset, DifficultyAttributes attributes, ScoreInfo score)
             : base(ruleset, attributes, score)
         {
-            countHitCircles = Beatmap.HitObjects.Count(h => h is HitCircle);
-
-            beatmapMaxCombo = Beatmap.HitObjects.Count;
-            // Add the ticks + tail of the slider. 1 is subtracted because the "headcircle" would be counted twice (once for the slider itself in the line above)
-            beatmapMaxCombo += Beatmap.HitObjects.OfType<Slider>().Sum(s => s.NestedHitObjects.Count - 1);
         }
 
         public override double Calculate(Dictionary<string, double> categoryRatings = null)
@@ -81,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 categoryRatings.Add("Accuracy", accuracyValue);
                 categoryRatings.Add("OD", Attributes.OverallDifficulty);
                 categoryRatings.Add("AR", Attributes.ApproachRate);
-                categoryRatings.Add("Max Combo", beatmapMaxCombo);
+                categoryRatings.Add("Max Combo", Attributes.MaxCombo);
             }
 
             return totalValue;
@@ -106,8 +98,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             aimValue *= Math.Pow(0.97, countMiss);
 
             // Combo scaling
-            if (beatmapMaxCombo > 0)
-                aimValue *= Math.Min(Math.Pow(scoreMaxCombo, 0.8) / Math.Pow(beatmapMaxCombo, 0.8), 1.0);
+            if (Attributes.MaxCombo > 0)
+                aimValue *= Math.Min(Math.Pow(scoreMaxCombo, 0.8) / Math.Pow(Attributes.MaxCombo, 0.8), 1.0);
 
             double approachRateFactor = 1.0;
 
@@ -154,8 +146,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             speedValue *= Math.Pow(0.97, countMiss);
 
             // Combo scaling
-            if (beatmapMaxCombo > 0)
-                speedValue *= Math.Min(Math.Pow(scoreMaxCombo, 0.8) / Math.Pow(beatmapMaxCombo, 0.8), 1.0);
+            if (Attributes.MaxCombo > 0)
+                speedValue *= Math.Min(Math.Pow(scoreMaxCombo, 0.8) / Math.Pow(Attributes.MaxCombo, 0.8), 1.0);
 
             double approachRateFactor = 1.0;
             if (Attributes.ApproachRate > 10.33)
@@ -178,7 +170,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         {
             // This percentage only considers HitCircles of any value - in this part of the calculation we focus on hitting the timing hit window
             double betterAccuracyPercentage;
-            int amountHitObjectsWithAccuracy = countHitCircles;
+            int amountHitObjectsWithAccuracy = Attributes.HitCirclesCount;
 
             if (amountHitObjectsWithAccuracy > 0)
                 betterAccuracyPercentage = ((countGreat - (totalHits - amountHitObjectsWithAccuracy)) * 6 + countOk * 2 + countMeh) / (double)(amountHitObjectsWithAccuracy * 6);

From abd395a03098808ff3926be50d7063394d572342 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 2 Oct 2020 19:41:24 +0200
Subject: [PATCH 05157/10326] Remove unecessary using references.

---
 .../Difficulty/CatchPerformanceCalculator.cs                    | 1 -
 .../Difficulty/ManiaPerformanceCalculator.cs                    | 1 -
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs    | 2 --
 .../Difficulty/TaikoPerformanceCalculator.cs                    | 1 -
 4 files changed, 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
index e671e581cf..6a3a16ed33 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
index 086afb3254..00bec18a45 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 6acd8f9a87..fed0a12536 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -5,11 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
index 2505300425..2d9b95ae88 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;

From 2b1ef16f89ef4e7d9b1646ee0fe5d183176d49fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 2 Oct 2020 22:57:49 +0200
Subject: [PATCH 05158/10326] Replace comparison references to HitResult.Miss
 with IsHit

---
 osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs               | 2 +-
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs | 2 +-
 .../TestSceneMissHitWindowJudgements.cs                       | 4 ++--
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs           | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs  | 2 +-
 .../Objects/Drawables/DrawableOsuJudgement.cs                 | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs     | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs | 2 +-
 osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs       | 4 ++--
 osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs       | 2 +-
 osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs             | 2 +-
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs      | 2 +-
 osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs            | 2 +-
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs     | 2 +-
 osu.Game/Screens/Ranking/Statistics/UnstableRate.cs           | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
index cc01009dd9..75feb21298 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchComboDisplay.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.UI
             if (!result.Type.AffectsCombo() || !result.HasResult)
                 return;
 
-            if (result.Type == HitResult.Miss)
+            if (!result.IsHit)
             {
                 updateCombo(0, null);
                 return;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index ba6cad978d..f6d539c91b 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -243,7 +243,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 endHold();
             }
 
-            if (Tail.Result.Type == HitResult.Miss)
+            if (Tail.Judged && !Tail.IsHit)
                 HasBroken = true;
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
index f3221ffe32..39deba2f57 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     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
+                PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset < -hitWindows.WindowFor(HitResult.Meh) && !Player.Results[0].IsHit
             });
         }
 
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 Autoplay = false,
                 Beatmap = beatmap,
-                PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset >= hitWindows.WindowFor(HitResult.Meh) && Player.Results[0].Type == HitResult.Miss
+                PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset >= hitWindows.WindowFor(HitResult.Meh) && !Player.Results[0].IsHit
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index d5c3538c81..844449851f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -314,7 +314,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private bool assertMaxJudge() => judgementResults.Any() && judgementResults.All(t => t.Type == t.Judgement.MaxResult);
 
-        private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.IgnoreHit && judgementResults.First().Type == HitResult.Miss;
+        private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.IgnoreHit && !judgementResults.First().IsHit;
 
         private bool assertMidSliderJudgements() => judgementResults[^2].Type == HitResult.IgnoreHit;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index a438dc8be4..6d6bd7fc97 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 var circleResult = (OsuHitCircleJudgementResult)r;
 
                 // Todo: This should also consider misses, but they're a little more interesting to handle, since we don't necessarily know the position at the time of a miss.
-                if (result != HitResult.Miss)
+                if (result.IsHit())
                 {
                     var localMousePosition = ToLocalSpace(inputManager.CurrentState.Mouse.Position);
                     circleResult.CursorPositionAtHit = HitObject.StackedPosition + (localMousePosition - DrawSize / 2);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 012d9f8878..46f6276a85 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (JudgedObject != null)
             {
                 lightingColour = JudgedObject.AccentColour.GetBoundCopy();
-                lightingColour.BindValueChanged(colour => Lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
+                lightingColour.BindValueChanged(colour => Lighting.Colour = Result.IsHit ? colour.NewValue : Color4.Transparent, true);
             }
             else
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 9abcef83c4..21c7d49961 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             // rather than doing it this way, we should probably attach the sample to the tail circle.
             // this can only be done after we stop using LegacyLastTick.
-            if (TailCircle.Result.Type != HitResult.Miss)
+            if (TailCircle.IsHit)
                 base.PlaySamples();
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 286feac5ba..677e63c993 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             if (!(obj is DrawableDrumRollTick))
                 return;
 
-            if (result.Type > HitResult.Miss)
+            if (result.IsHit)
                 rollingHits++;
             else
                 rollingHits--;
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs
index dd3c2289ea..f7a1d130eb 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Taiko.Scoring
         private double hpMultiplier;
 
         /// <summary>
-        /// HP multiplier for a <see cref="HitResult.Miss"/>.
+        /// HP multiplier for a <see cref="HitResult"/> that does not satisfy <see cref="HitResultExtensions.IsHit"/>.
         /// </summary>
         private double hpMissMultiplier;
 
@@ -45,6 +45,6 @@ namespace osu.Game.Rulesets.Taiko.Scoring
         }
 
         protected override double GetHealthIncreaseFor(JudgementResult result)
-            => base.GetHealthIncreaseFor(result) * (result.Type == HitResult.Miss ? hpMissMultiplier : hpMultiplier);
+            => base.GetHealthIncreaseFor(result) * (result.IsHit ? hpMultiplier : hpMissMultiplier);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
index 928072c491..e029040ef3 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 if (r?.Type.AffectsCombo() == false)
                     return;
 
-                passing = r == null || r.Type > HitResult.Miss;
+                passing = r == null || r.IsHit;
 
                 foreach (var sprite in InternalChildren.OfType<ScrollerSprite>())
                     sprite.Passing = passing;
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
index 7b8ab89233..3bd20e4bb4 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             Alpha = 0.15f;
             Masking = true;
 
-            if (result == HitResult.Miss)
+            if (!result.IsHit())
                 return;
 
             bool isRim = (judgedObject.HitObject as Hit)?.Type == HitType.Rim;
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 29c25f20a4..9af7ae12a2 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -511,7 +511,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 case HitResult.None:
                     break;
 
-                case HitResult.Miss:
+                case { } result when !result.IsHit():
                     updateState(ArmedState.Miss);
                     break;
 
diff --git a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
index 7736541c92..aff5a36c81 100644
--- a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Play.HUD
 
         public void Flash(JudgementResult result)
         {
-            if (result.Type == HitResult.Miss)
+            if (!result.IsHit)
                 return;
 
             Scheduler.AddOnce(flash);
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 45fdc3ff33..aa2a83774e 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// <param name="hitEvents">The <see cref="HitEvent"/>s to display the timing distribution of.</param>
         public HitEventTimingDistributionGraph(IReadOnlyList<HitEvent> hitEvents)
         {
-            this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result != HitResult.Miss).ToList();
+            this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsHit()).ToList();
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs b/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
index 18a2238784..055db143d1 100644
--- a/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
+++ b/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         public UnstableRate(IEnumerable<HitEvent> hitEvents)
             : base("Unstable Rate")
         {
-            var timeOffsets = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result != HitResult.Miss)
+            var timeOffsets = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsHit())
                                        .Select(ev => ev.TimeOffset).ToArray();
             Value = 10 * standardDeviation(timeOffsets);
         }

From 1f0620ffd49921a28a4edf9abcc61805f97d3243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 2 Oct 2020 22:58:10 +0200
Subject: [PATCH 05159/10326] Replace assignment references to HitResult.Miss
 with Judgement.MinResult

---
 .../Objects/Drawables/DrawableHoldNoteTail.cs                 | 2 +-
 .../Objects/Drawables/DrawableManiaHitObject.cs               | 3 +--
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs     | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs  | 2 +-
 .../Objects/Drawables/DrawableOsuHitObject.cs                 | 3 +--
 .../Objects/Drawables/DrawableOsuJudgement.cs                 | 1 -
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs     | 1 -
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs    | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs      | 4 ++--
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs    | 4 +---
 osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs            | 1 -
 12 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index 31e43d3ee2..c780c0836e 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (!userTriggered)
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
-                    ApplyResult(r => r.Type = HitResult.Miss);
+                    ApplyResult(r => r.Type = r.Judgement.MinResult);
 
                 return;
             }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 08c41b0d75..27960b3f3a 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -136,7 +135,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// <summary>
         /// Causes this <see cref="DrawableManiaHitObject"/> to get missed, disregarding all conditions in implementations of <see cref="DrawableHitObject.CheckForResult"/>.
         /// </summary>
-        public void MissForcefully() => ApplyResult(r => r.Type = HitResult.Miss);
+        public void MissForcefully() => ApplyResult(r => r.Type = r.Judgement.MinResult);
     }
 
     public abstract class DrawableManiaHitObject<TObject> : DrawableManiaHitObject
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 973dc06e05..b3402d13e4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (!userTriggered)
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
-                    ApplyResult(r => r.Type = HitResult.Miss);
+                    ApplyResult(r => r.Type = r.Judgement.MinResult);
                 return;
             }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 6d6bd7fc97..b5ac26c824 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (!userTriggered)
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
-                    ApplyResult(r => r.Type = HitResult.Miss);
+                    ApplyResult(r => r.Type = r.Judgement.MinResult);
 
                 return;
             }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 2946331bc6..45c664ba3b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -8,7 +8,6 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Osu.UI;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -68,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// Causes this <see cref="DrawableOsuHitObject"/> to get missed, disregarding all conditions in implementations of <see cref="DrawableHitObject.CheckForResult"/>.
         /// </summary>
-        public void MissForcefully() => ApplyResult(r => r.Type = HitResult.Miss);
+        public void MissForcefully() => ApplyResult(r => r.Type = r.Judgement.MinResult);
 
         protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(HitObject, judgement);
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 46f6276a85..49535e7fff 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -8,7 +8,6 @@ using osu.Game.Configuration;
 using osuTK;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 21c7d49961..280ca33234 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.UI;
-using osu.Game.Rulesets.Scoring;
 using osuTK.Graphics;
 using osu.Game.Skinning;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index fe7cb278b0..130b4e6e53 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -224,7 +224,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 else if (Progress > .75)
                     r.Type = HitResult.Meh;
                 else if (Time.Current >= Spinner.EndTime)
-                    r.Type = HitResult.Miss;
+                    r.Type = r.Judgement.MinResult;
             });
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 677e63c993..8f268dc1c7 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Ok);
             }
             else
-                ApplyResult(r => r.Type = HitResult.Miss);
+                ApplyResult(r => r.Type = r.Judgement.MinResult);
         }
 
         protected override void UpdateStateTransforms(ArmedState state)
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 03df28f850..bb42240f25 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             if (!userTriggered)
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
-                    ApplyResult(r => r.Type = HitResult.Miss);
+                    ApplyResult(r => r.Type = r.Judgement.MinResult);
                 return;
             }
 
@@ -152,7 +152,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 return;
 
             if (!validActionPressed)
-                ApplyResult(r => r.Type = HitResult.Miss);
+                ApplyResult(r => r.Type = r.Judgement.MinResult);
             else
                 ApplyResult(r => r.Type = result);
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 11ff0729e2..8ee4a5db71 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -211,9 +211,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     tick.TriggerResult(false);
                 }
 
-                var hitResult = numHits > HitObject.RequiredHits / 2 ? HitResult.Ok : HitResult.Miss;
-
-                ApplyResult(r => r.Type = hitResult);
+                ApplyResult(r => r.Type = numHits > HitObject.RequiredHits / 2 ? HitResult.Ok : r.Judgement.MinResult);
             }
         }
 
diff --git a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
index aff5a36c81..fc4a1a5d83 100644
--- a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
@@ -13,7 +13,6 @@ 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
 {

From 7359c422dd377f7b589bbb12ce8662c41060124d Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Sat, 3 Oct 2020 12:58:43 +0930
Subject: [PATCH 05160/10326] Hoist icon stream

---
 osu.Desktop/OsuGameDesktop.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 659730630a..836b968a67 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -125,12 +125,14 @@ namespace osu.Desktop
         {
             base.SetHost(host);
 
+            var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
+
             switch (host.Window)
             {
                 // Legacy osuTK DesktopGameWindow
                 case DesktopGameWindow desktopGameWindow:
                     desktopGameWindow.CursorState |= CursorState.Hidden;
-                    desktopGameWindow.SetIconFromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
+                    desktopGameWindow.SetIconFromStream(iconStream);
                     desktopGameWindow.Title = Name;
                     desktopGameWindow.FileDrop += (_, e) => fileDrop(e.FileNames);
                     break;
@@ -138,7 +140,7 @@ namespace osu.Desktop
                 // SDL2 DesktopWindow
                 case DesktopWindow desktopWindow:
                     desktopWindow.CursorState.Value |= CursorState.Hidden;
-                    desktopWindow.SetIconFromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
+                    desktopWindow.SetIconFromStream(iconStream);
                     desktopWindow.Title = Name;
                     desktopWindow.DragDrop += f => fileDrop(new[] { f });
                     break;

From 2ddfd799230c0336bb3ffa6b215281032e996ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Oct 2020 08:09:10 +0200
Subject: [PATCH 05161/10326] Replace object pattern match with simple
 conditional

---
 .../Objects/Drawables/DrawableHitObject.cs        | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 9af7ae12a2..66fc61720a 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -506,19 +506,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             Result.TimeOffset = Math.Min(HitObject.HitWindows.WindowFor(HitResult.Miss), Time.Current - endTime);
 
-            switch (Result.Type)
-            {
-                case HitResult.None:
-                    break;
-
-                case { } result when !result.IsHit():
-                    updateState(ArmedState.Miss);
-                    break;
-
-                default:
-                    updateState(ArmedState.Hit);
-                    break;
-            }
+            if (Result.HasResult)
+                updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss);
 
             OnNewResult?.Invoke(this, Result);
         }

From feb39920c5d9e3d5353ab71eb5be230767af1273 Mon Sep 17 00:00:00 2001
From: tytydraco <tylernij@gmail.com>
Date: Sat, 3 Oct 2020 00:48:49 -0700
Subject: [PATCH 05162/10326] Allow rotation lock on Android to function
 properly

According to Google's documentation, fullSensor will ignore rotation
locking preferences, while fullUser will obey them.

Signed-off-by: tytydraco <tylernij@gmail.com>
---
 osu.Android/OsuGameActivity.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 9839d16030..db73bb7e7f 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -9,7 +9,7 @@ using osu.Framework.Android;
 
 namespace osu.Android
 {
-    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullSensor, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
+    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
     public class OsuGameActivity : AndroidGameActivity
     {
         protected override Framework.Game CreateGame() => new OsuGameAndroid();

From 309714081fa99023d06560f19b293acee4783df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Oct 2020 11:08:51 +0200
Subject: [PATCH 05163/10326] Make new health increase values mania-specific

---
 .../Judgements/ManiaJudgement.cs              | 30 +++++++++++++++++++
 osu.Game/Rulesets/Judgements/Judgement.cs     | 10 +++----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
index 220dedc4a4..d28b7bdf58 100644
--- a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
@@ -2,10 +2,40 @@
 // 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.Mania.Judgements
 {
     public class ManiaJudgement : Judgement
     {
+        protected override double HealthIncreaseFor(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.LargeTickHit:
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.1;
+
+                case HitResult.LargeTickMiss:
+                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.1;
+
+                case HitResult.Meh:
+                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.5;
+
+                case HitResult.Ok:
+                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.3;
+
+                case HitResult.Good:
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.1;
+
+                case HitResult.Great:
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.8;
+
+                case HitResult.Perfect:
+                    return DEFAULT_MAX_HEALTH_INCREASE;
+
+                default:
+                    return base.HealthIncreaseFor(result);
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 4ee0ce437c..5d7444e9b0 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -124,19 +124,19 @@ namespace osu.Game.Rulesets.Judgements
                     return -DEFAULT_MAX_HEALTH_INCREASE;
 
                 case HitResult.Meh:
-                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.5;
+                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.05;
 
                 case HitResult.Ok:
-                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.3;
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.5;
 
                 case HitResult.Good:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 0.1;
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.75;
 
                 case HitResult.Great:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 0.8;
+                    return DEFAULT_MAX_HEALTH_INCREASE;
 
                 case HitResult.Perfect:
-                    return DEFAULT_MAX_HEALTH_INCREASE;
+                    return DEFAULT_MAX_HEALTH_INCREASE * 1.05;
 
                 case HitResult.SmallBonus:
                     return DEFAULT_MAX_HEALTH_INCREASE * 0.1;

From 601675db073b9f12f83a20f8462825ef3d19a725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Oct 2020 11:10:08 +0200
Subject: [PATCH 05164/10326] Adjust health increase values to match old ones
 better

---
 osu.Game/Rulesets/Judgements/Judgement.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 5d7444e9b0..89a3a2b855 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -109,16 +109,16 @@ namespace osu.Game.Rulesets.Judgements
                     return 0;
 
                 case HitResult.SmallTickHit:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 0.05;
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.5;
 
                 case HitResult.SmallTickMiss:
-                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.05;
+                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.5;
 
                 case HitResult.LargeTickHit:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 0.1;
+                    return DEFAULT_MAX_HEALTH_INCREASE;
 
                 case HitResult.LargeTickMiss:
-                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.1;
+                    return -DEFAULT_MAX_HEALTH_INCREASE;
 
                 case HitResult.Miss:
                     return -DEFAULT_MAX_HEALTH_INCREASE;
@@ -139,10 +139,10 @@ namespace osu.Game.Rulesets.Judgements
                     return DEFAULT_MAX_HEALTH_INCREASE * 1.05;
 
                 case HitResult.SmallBonus:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 0.1;
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.5;
 
                 case HitResult.LargeBonus:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 0.2;
+                    return DEFAULT_MAX_HEALTH_INCREASE;
             }
         }
 

From db31280671cf969e09000ac135455094dc1c012d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Oct 2020 11:10:28 +0200
Subject: [PATCH 05165/10326] Award health for completed slider tails

---
 osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index aff3f38e17..3afd36669f 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public class SliderTailJudgement : OsuJudgement
         {
-            public override HitResult MaxResult => HitResult.IgnoreHit;
+            public override HitResult MaxResult => HitResult.SmallTickHit;
         }
     }
 }

From 682b5fb056ae9ecc50dd863b6490f851d1508a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Oct 2020 11:41:26 +0200
Subject: [PATCH 05166/10326] Adjust health increase for drum roll tick to
 match new max result

---
 .../Judgements/TaikoDrumRollTickJudgement.cs                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
index 0551df3211..647ad7853d 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Judgements
         {
             switch (result)
             {
-                case HitResult.Great:
+                case HitResult.SmallTickHit:
                     return 0.15;
 
                 default:

From 7e7f225eee6bd5ea896944d65c509d5b87f1bf95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Oct 2020 12:34:34 +0200
Subject: [PATCH 05167/10326] Adjust slider input test to match new judgement
 result

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index d5c3538c81..1810ef4353 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -314,11 +314,11 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private bool assertMaxJudge() => judgementResults.Any() && judgementResults.All(t => t.Type == t.Judgement.MaxResult);
 
-        private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.IgnoreHit && judgementResults.First().Type == HitResult.Miss;
+        private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.SmallTickHit && judgementResults.First().Type == HitResult.Miss;
 
-        private bool assertMidSliderJudgements() => judgementResults[^2].Type == HitResult.IgnoreHit;
+        private bool assertMidSliderJudgements() => judgementResults[^2].Type == HitResult.SmallTickHit;
 
-        private bool assertMidSliderJudgementFail() => judgementResults[^2].Type == HitResult.IgnoreMiss;
+        private bool assertMidSliderJudgementFail() => judgementResults[^2].Type == HitResult.SmallTickMiss;
 
         private ScoreAccessibleReplayPlayer currentPlayer;
 

From d87e4c524c1c03539881df35fa97ccf800751aae Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Sat, 3 Oct 2020 14:21:40 +0300
Subject: [PATCH 05168/10326] Test HitResultExtensions methods

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 100 ++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index ace57aad1d..38d2b4a47f 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -53,5 +53,105 @@ namespace osu.Game.Tests.Rulesets.Scoring
 
             Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
         }
+
+        [TestCase(HitResult.None, false)]
+        [TestCase(HitResult.IgnoreMiss, false)]
+        [TestCase(HitResult.IgnoreHit, false)]
+        [TestCase(HitResult.Miss, true)]
+        [TestCase(HitResult.Meh, true)]
+        [TestCase(HitResult.Ok, true)]
+        [TestCase(HitResult.Good, true)]
+        [TestCase(HitResult.Great, true)]
+        [TestCase(HitResult.Perfect, true)]
+        [TestCase(HitResult.SmallTickMiss, false)]
+        [TestCase(HitResult.SmallTickHit, false)]
+        [TestCase(HitResult.LargeTickMiss, true)]
+        [TestCase(HitResult.LargeTickHit, true)]
+        [TestCase(HitResult.SmallBonus, false)]
+        [TestCase(HitResult.LargeBonus, false)]
+        public void TestAffectsCombo(HitResult hitResult, bool expectedReturnValue)
+        {
+            Assert.IsTrue(hitResult.AffectsCombo() == expectedReturnValue);
+        }
+
+        [TestCase(HitResult.None, false)]
+        [TestCase(HitResult.IgnoreMiss, false)]
+        [TestCase(HitResult.IgnoreHit, false)]
+        [TestCase(HitResult.Miss, true)]
+        [TestCase(HitResult.Meh, true)]
+        [TestCase(HitResult.Ok, true)]
+        [TestCase(HitResult.Good, true)]
+        [TestCase(HitResult.Great, true)]
+        [TestCase(HitResult.Perfect, true)]
+        [TestCase(HitResult.SmallTickMiss, true)]
+        [TestCase(HitResult.SmallTickHit, true)]
+        [TestCase(HitResult.LargeTickMiss, true)]
+        [TestCase(HitResult.LargeTickHit, true)]
+        [TestCase(HitResult.SmallBonus, false)]
+        [TestCase(HitResult.LargeBonus, false)]
+        public void TestAffectsAccuracy(HitResult hitResult, bool expectedReturnValue)
+        {
+            Assert.IsTrue(hitResult.AffectsAccuracy() == expectedReturnValue);
+        }
+
+        [TestCase(HitResult.None, false)]
+        [TestCase(HitResult.IgnoreMiss, false)]
+        [TestCase(HitResult.IgnoreHit, false)]
+        [TestCase(HitResult.Miss, false)]
+        [TestCase(HitResult.Meh, false)]
+        [TestCase(HitResult.Ok, false)]
+        [TestCase(HitResult.Good, false)]
+        [TestCase(HitResult.Great, false)]
+        [TestCase(HitResult.Perfect, false)]
+        [TestCase(HitResult.SmallTickMiss, false)]
+        [TestCase(HitResult.SmallTickHit, false)]
+        [TestCase(HitResult.LargeTickMiss, false)]
+        [TestCase(HitResult.LargeTickHit, false)]
+        [TestCase(HitResult.SmallBonus, true)]
+        [TestCase(HitResult.LargeBonus, true)]
+        public void TestIsBonus(HitResult hitResult, bool expectedReturnValue)
+        {
+            Assert.IsTrue(hitResult.IsBonus() == expectedReturnValue);
+        }
+
+        [TestCase(HitResult.None, false)]
+        [TestCase(HitResult.IgnoreMiss, false)]
+        [TestCase(HitResult.IgnoreHit, true)]
+        [TestCase(HitResult.Miss, false)]
+        [TestCase(HitResult.Meh, true)]
+        [TestCase(HitResult.Ok, true)]
+        [TestCase(HitResult.Good, true)]
+        [TestCase(HitResult.Great, true)]
+        [TestCase(HitResult.Perfect, true)]
+        [TestCase(HitResult.SmallTickMiss, false)]
+        [TestCase(HitResult.SmallTickHit, true)]
+        [TestCase(HitResult.LargeTickMiss, false)]
+        [TestCase(HitResult.LargeTickHit, true)]
+        [TestCase(HitResult.SmallBonus, true)]
+        [TestCase(HitResult.LargeBonus, true)]
+        public void TestIsHit(HitResult hitResult, bool expectedReturnValue)
+        {
+            Assert.IsTrue(hitResult.IsHit() == expectedReturnValue);
+        }
+
+        [TestCase(HitResult.None, false)]
+        [TestCase(HitResult.IgnoreMiss, false)]
+        [TestCase(HitResult.IgnoreHit, false)]
+        [TestCase(HitResult.Miss, true)]
+        [TestCase(HitResult.Meh, true)]
+        [TestCase(HitResult.Ok, true)]
+        [TestCase(HitResult.Good, true)]
+        [TestCase(HitResult.Great, true)]
+        [TestCase(HitResult.Perfect, true)]
+        [TestCase(HitResult.SmallTickMiss, true)]
+        [TestCase(HitResult.SmallTickHit, true)]
+        [TestCase(HitResult.LargeTickMiss, true)]
+        [TestCase(HitResult.LargeTickHit, true)]
+        [TestCase(HitResult.SmallBonus, true)]
+        [TestCase(HitResult.LargeBonus, true)]
+        public void TestIsScorable(HitResult hitResult, bool expectedReturnValue)
+        {
+            Assert.IsTrue(hitResult.IsScorable() == expectedReturnValue);
+        }
     }
 }

From d7747ebb2d5ba27bf6e5272e381dbdafc6c921bc Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 3 Oct 2020 16:51:22 +0200
Subject: [PATCH 05169/10326] Remove unused WorkingBeatmap argument.

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs |  2 +-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs |  2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs     |  2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs |  2 +-
 osu.Game/Rulesets/Ruleset.cs            | 10 +++++++++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index cb7cac436b..1f27de3352 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Catch
 
         public override ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => new CatchLegacySkinTransformer(source);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, DifficultyAttributes attributes, ScoreInfo score) => new CatchPerformanceCalculator(this, attributes, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(DifficultyAttributes attributes, ScoreInfo score) => new CatchPerformanceCalculator(this, attributes, score);
 
         public int LegacyID => 2;
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 8bf6b5e064..ecb09ebe85 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mania
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new ManiaBeatmapConverter(beatmap, this);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, DifficultyAttributes attributes, ScoreInfo score) => new ManiaPerformanceCalculator(this, attributes, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(DifficultyAttributes attributes, ScoreInfo score) => new ManiaPerformanceCalculator(this, attributes, score);
 
         public const string SHORT_NAME = "mania";
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 9798f15f21..cc2eebdd36 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new OsuDifficultyCalculator(this, beatmap);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, DifficultyAttributes attributes, ScoreInfo score) => new OsuPerformanceCalculator(this, attributes, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(DifficultyAttributes attributes, ScoreInfo score) => new OsuPerformanceCalculator(this, attributes, score);
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 3bc749b868..642eb0ddcc 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Taiko
 
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new TaikoDifficultyCalculator(this, beatmap);
 
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, DifficultyAttributes attributes, ScoreInfo score) => new TaikoPerformanceCalculator(this, attributes, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(DifficultyAttributes attributes, ScoreInfo score) => new TaikoPerformanceCalculator(this, attributes, score);
 
         public int LegacyID => 1;
 
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 25c5f41b5b..2ba884efc2 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -158,7 +158,15 @@ namespace osu.Game.Rulesets
 
         public abstract DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap);
 
-        public virtual PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, DifficultyAttributes attributes, ScoreInfo score) => null;
+        public virtual PerformanceCalculator CreatePerformanceCalculator(DifficultyAttributes attributes, ScoreInfo score) => null;
+
+        [Obsolete("Use the DifficultyAttributes overload instead.")]
+        public PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score)
+        {
+            var difficultyCalculator = CreateDifficultyCalculator(beatmap);
+            var difficultyAttributes = difficultyCalculator.Calculate(score.Mods);
+            return CreatePerformanceCalculator(difficultyAttributes, score);
+        }
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 

From 27cc6c50467616f63daa1b1de1e43a9306bc30f1 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 3 Oct 2020 16:52:33 +0200
Subject: [PATCH 05170/10326] Rename HitCirclesCount -> HitCircleCount.

---
 osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs  | 2 +-
 osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs  | 2 +-
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
index 50f060cf06..fff033357d 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
@@ -11,6 +11,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         public double SpeedStrain;
         public double ApproachRate;
         public double OverallDifficulty;
-        public int HitCirclesCount;
+        public int HitCircleCount;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 86c7cd2298..6027635b75 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 ApproachRate = preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5,
                 OverallDifficulty = (80 - hitWindowGreat) / 6,
                 MaxCombo = maxCombo,
-                HitCirclesCount = hitCirclesCount,
+                HitCircleCount = hitCirclesCount,
                 Skills = skills
             };
         }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index fed0a12536..063cde8747 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         {
             // This percentage only considers HitCircles of any value - in this part of the calculation we focus on hitting the timing hit window
             double betterAccuracyPercentage;
-            int amountHitObjectsWithAccuracy = Attributes.HitCirclesCount;
+            int amountHitObjectsWithAccuracy = Attributes.HitCircleCount;
 
             if (amountHitObjectsWithAccuracy > 0)
                 betterAccuracyPercentage = ((countGreat - (totalHits - amountHitObjectsWithAccuracy)) * 6 + countOk * 2 + countMeh) / (double)(amountHitObjectsWithAccuracy * 6);

From 5888ecdeb16a6db3d8acd2825f086c0fd323d5a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 4 Oct 2020 01:08:24 +0900
Subject: [PATCH 05171/10326] Fix spinner crashing on rewind

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index fe7cb278b0..0f249c8bbf 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -268,7 +268,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             while (wholeSpins != spins)
             {
-                var tick = ticks.FirstOrDefault(t => !t.IsHit);
+                var tick = ticks.FirstOrDefault(t => !t.Result.HasResult);
 
                 // tick may be null if we've hit the spin limit.
                 if (tick != null)

From 26eff0120db42daed55b375cb22db982b8d60d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Oct 2020 21:11:34 +0200
Subject: [PATCH 05172/10326] Apply same fix for miss-triggering case

See 5888ecd - the same fix is applied here, but in the miss case.
---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 0f249c8bbf..5e1b7bdcae 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -212,7 +212,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 return;
 
             // Trigger a miss result for remaining ticks to avoid infinite gameplay.
-            foreach (var tick in ticks.Where(t => !t.IsHit))
+            foreach (var tick in ticks.Where(t => !t.Result.HasResult))
                 tick.TriggerResult(false);
 
             ApplyResult(r =>

From ad42ce5639d5ae92dd6fc4e9bc067f446da04214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Oct 2020 14:50:25 +0200
Subject: [PATCH 05173/10326] Add failing test cases

---
 osu.Game.Tests/NonVisual/GameplayClockTest.cs | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/GameplayClockTest.cs

diff --git a/osu.Game.Tests/NonVisual/GameplayClockTest.cs b/osu.Game.Tests/NonVisual/GameplayClockTest.cs
new file mode 100644
index 0000000000..3fd7c364b7
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/GameplayClockTest.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.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Framework.Timing;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class GameplayClockTest
+    {
+        [TestCase(0)]
+        [TestCase(1)]
+        public void TestTrueGameplayRateWithZeroAdjustment(double underlyingClockRate)
+        {
+            var framedClock = new FramedClock(new ManualClock { Rate = underlyingClockRate });
+            var gameplayClock = new TestGameplayClock(framedClock);
+
+            gameplayClock.MutableNonGameplayAdjustments.Add(new BindableDouble());
+
+            Assert.That(gameplayClock.TrueGameplayRate, Is.EqualTo(0));
+        }
+
+        private class TestGameplayClock : GameplayClock
+        {
+            public List<Bindable<double>> MutableNonGameplayAdjustments { get; } = new List<Bindable<double>>();
+
+            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
+
+            public TestGameplayClock(IFrameBasedClock underlyingClock)
+                : base(underlyingClock)
+            {
+            }
+        }
+    }
+}

From 6f2b991b329cb9b44980995e668ecc5d7e5980a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Oct 2020 14:51:27 +0200
Subject: [PATCH 05174/10326] Ensure true gameplay rate is finite when paused
 externally

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

diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index 9d04722c12..9f2868573e 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
+using osu.Framework.Utils;
 
 namespace osu.Game.Screens.Play
 {
@@ -47,7 +48,12 @@ namespace osu.Game.Screens.Play
                 double baseRate = Rate;
 
                 foreach (var adjustment in NonGameplayAdjustments)
+                {
+                    if (Precision.AlmostEquals(adjustment.Value, 0))
+                        return 0;
+
                     baseRate /= adjustment.Value;
+                }
 
                 return baseRate;
             }

From 02e4f3ddafc4678df1965523d29296f058523708 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 4 Oct 2020 23:47:16 +0900
Subject: [PATCH 05175/10326] Fix the editor saving new beatmaps even when the
 user chooses not to

---
 osu.Game/Screens/Edit/Editor.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index a0692d94e6..956b77b0d4 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -84,6 +84,8 @@ namespace osu.Game.Screens.Edit
 
         private DependencyContainer dependencies;
 
+        private bool isNewBeatmap;
+
         protected override UserActivity InitialActivity => new UserActivity.Editing(Beatmap.Value.BeatmapInfo);
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -113,8 +115,6 @@ namespace osu.Game.Screens.Edit
             // todo: remove caching of this and consume via editorBeatmap?
             dependencies.Cache(beatDivisor);
 
-            bool isNewBeatmap = false;
-
             if (Beatmap.Value is DummyWorkingBeatmap)
             {
                 isNewBeatmap = true;
@@ -287,6 +287,9 @@ namespace osu.Game.Screens.Edit
 
         protected void Save()
         {
+            // no longer new after first user-triggered save.
+            isNewBeatmap = false;
+
             // apply any set-level metadata changes.
             beatmapManager.Update(playableBeatmap.BeatmapInfo.BeatmapSet);
 
@@ -435,7 +438,7 @@ namespace osu.Game.Screens.Edit
 
         public override bool OnExiting(IScreen next)
         {
-            if (!exitConfirmed && dialogOverlay != null && HasUnsavedChanges && !(dialogOverlay.CurrentDialog is PromptForSaveDialog))
+            if (!exitConfirmed && dialogOverlay != null && (isNewBeatmap || HasUnsavedChanges) && !(dialogOverlay.CurrentDialog is PromptForSaveDialog))
             {
                 dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave));
                 return true;
@@ -456,6 +459,12 @@ namespace osu.Game.Screens.Edit
 
         private void confirmExit()
         {
+            if (isNewBeatmap)
+            {
+                // confirming exit without save means we should delete the new beatmap completely.
+                beatmapManager.Delete(playableBeatmap.BeatmapInfo.BeatmapSet);
+            }
+
             exitConfirmed = true;
             this.Exit();
         }

From 1b02c814d6ba33141cc71461ffc876c20e97035b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 4 Oct 2020 23:47:47 +0900
Subject: [PATCH 05176/10326] 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 78ceaa8616..d7817cf4cf 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1001.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1004.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3a839ac1a4..fa2135580d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.1001.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1004.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 31f1af135d..20a51e5feb 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.Framework.iOS" Version="2020.1001.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1004.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.1001.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1004.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 9ca0e48accc80a4778c60b7049e994a7abd4d58e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 4 Oct 2020 23:57:28 +0900
Subject: [PATCH 05177/10326] Change exit logic to be more test-friendly

---
 osu.Game/Screens/Edit/Editor.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 956b77b0d4..875ab25003 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -438,10 +438,20 @@ namespace osu.Game.Screens.Edit
 
         public override bool OnExiting(IScreen next)
         {
-            if (!exitConfirmed && dialogOverlay != null && (isNewBeatmap || HasUnsavedChanges) && !(dialogOverlay.CurrentDialog is PromptForSaveDialog))
+            if (!exitConfirmed)
             {
-                dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave));
-                return true;
+                // if the confirm dialog is already showing (or we can't show it, ie. in tests) exit without save.
+                if (dialogOverlay == null || dialogOverlay.CurrentDialog is PromptForSaveDialog)
+                {
+                    confirmExit();
+                    return true;
+                }
+
+                if (isNewBeatmap || HasUnsavedChanges)
+                {
+                    dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave));
+                    return true;
+                }
             }
 
             Background.FadeColour(Color4.White, 500);

From 432ba7cdf953f1806b914769518d0e6f1cf3c23c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 4 Oct 2020 23:57:35 +0900
Subject: [PATCH 05178/10326] Add test coverage of exit-without-save

---
 .../Editing/TestSceneEditorBeatmapCreation.cs      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 720cf51f2c..13a3195824 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -5,6 +5,8 @@ using System;
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
@@ -22,6 +24,9 @@ namespace osu.Game.Tests.Visual.Editing
 
         protected override bool EditorComponentsReady => Editor.ChildrenOfType<SetupScreen>().SingleOrDefault()?.IsLoaded == true;
 
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
         public override void SetUpSteps()
         {
             AddStep("set dummy", () => Beatmap.Value = new DummyWorkingBeatmap(Audio, null));
@@ -38,6 +43,15 @@ namespace osu.Game.Tests.Visual.Editing
         {
             AddStep("save beatmap", () => Editor.Save());
             AddAssert("new beatmap persisted", () => EditorBeatmap.BeatmapInfo.ID > 0);
+            AddAssert("new beatmap in database", () => beatmapManager.QueryBeatmapSet(s => s.ID == EditorBeatmap.BeatmapInfo.BeatmapSet.ID)?.DeletePending == false);
+        }
+
+        [Test]
+        public void TestExitWithoutSave()
+        {
+            AddStep("exit without save", () => Editor.Exit());
+            AddUntilStep("wait for exit", () => !Editor.IsCurrentScreen());
+            AddAssert("new beatmap not persisted", () => beatmapManager.QueryBeatmapSet(s => s.ID == EditorBeatmap.BeatmapInfo.BeatmapSet.ID)?.DeletePending == true);
         }
 
         [Test]

From 5859755886ac3e141e00e72a421bf61d19d6524e Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Mon, 5 Oct 2020 11:11:46 +1030
Subject: [PATCH 05179/10326] Use current OverlayActivationMode to determine
 confine logic

---
 osu.Game/Input/ConfineMouseTracker.cs | 33 +++++++++++----------------
 osu.Game/Screens/Play/Player.cs       |  5 ++--
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Input/ConfineMouseTracker.cs b/osu.Game/Input/ConfineMouseTracker.cs
index b111488a5b..6565967d1d 100644
--- a/osu.Game/Input/ConfineMouseTracker.cs
+++ b/osu.Game/Input/ConfineMouseTracker.cs
@@ -7,44 +7,37 @@ using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Game.Configuration;
+using osu.Game.Overlays;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Input
 {
     /// <summary>
-    /// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>
-    /// while providing a property for <see cref="Player"/> to indicate whether gameplay is currently active.
+    /// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>,
+    /// while optionally binding an <see cref="OverlayActivation"/> mode, usually that of the current <see cref="Player"/>.
+    /// It is assumed that while overlay activation is <see cref="OverlayActivation.Disabled"/>, we should also confine the
+    /// mouse cursor if it has been requested with <see cref="OsuConfineMouseMode.DuringGameplay"/>.
     /// </summary>
     public class ConfineMouseTracker : Component
     {
         private Bindable<ConfineMouseMode> frameworkConfineMode;
         private Bindable<OsuConfineMouseMode> osuConfineMode;
 
-        private bool gameplayActive;
-
         /// <summary>
-        /// Indicates whether osu! is currently considered "in gameplay" for the
-        /// purposes of <see cref="OsuConfineMouseMode.DuringGameplay"/>.
+        /// The bindable used to indicate whether gameplay is active.
+        /// Should be bound to the corresponding bindable of the current <see cref="Player"/>.
+        /// Defaults to <see cref="OverlayActivation.All"/> to assume that all other screens are considered "not gameplay".
         /// </summary>
-        public bool GameplayActive
-        {
-            get => gameplayActive;
-            set
-            {
-                if (gameplayActive == value)
-                    return;
-
-                gameplayActive = value;
-                updateConfineMode();
-            }
-        }
+        public IBindable<OverlayActivation> OverlayActivationMode { get; } = new Bindable<OverlayActivation>(OverlayActivation.All);
 
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfigManager, OsuConfigManager osuConfigManager)
         {
             frameworkConfineMode = frameworkConfigManager.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode);
             osuConfineMode = osuConfigManager.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode);
-            osuConfineMode.BindValueChanged(_ => updateConfineMode(), true);
+            osuConfineMode.ValueChanged += _ => updateConfineMode();
+
+            OverlayActivationMode.BindValueChanged(_ => updateConfineMode(), true);
         }
 
         private void updateConfineMode()
@@ -60,7 +53,7 @@ namespace osu.Game.Input
                     break;
 
                 case OsuConfineMouseMode.DuringGameplay:
-                    frameworkConfineMode.Value = GameplayActive ? ConfineMouseMode.Always : ConfineMouseMode.Never;
+                    frameworkConfineMode.Value = OverlayActivationMode.Value == OverlayActivation.Disabled ? ConfineMouseMode.Always : ConfineMouseMode.Never;
                     break;
 
                 case OsuConfineMouseMode.Always:
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 77f873083a..6d2f61bdf1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -229,6 +229,8 @@ namespace osu.Game.Screens.Play
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
+            confineMouseTracker.OverlayActivationMode.BindTo(OverlayActivationMode);
+
             // bind clock into components that require it
             DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);
 
@@ -365,9 +367,6 @@ namespace osu.Game.Screens.Play
                 OverlayActivationMode.Value = OverlayActivation.UserTriggered;
             else
                 OverlayActivationMode.Value = OverlayActivation.Disabled;
-
-            if (confineMouseTracker != null)
-                confineMouseTracker.GameplayActive = !GameplayClockContainer.IsPaused.Value && !DrawableRuleset.HasReplayLoaded.Value && !HasFailed;
         }
 
         private void updatePauseOnFocusLostState() =>

From a483dfd2d7157131d886d8b7c92a4b08defdbf63 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Mon, 5 Oct 2020 11:54:39 +1030
Subject: [PATCH 05180/10326] Allow confineMouseTracker to be null

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 6d2f61bdf1..de67b2d46d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Screens.Play
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
-            confineMouseTracker.OverlayActivationMode.BindTo(OverlayActivationMode);
+            confineMouseTracker?.OverlayActivationMode.BindTo(OverlayActivationMode);
 
             // bind clock into components that require it
             DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);

From a8cbd400d36b8997a0ba87ae1ec55227381764fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 13:17:13 +0900
Subject: [PATCH 05181/10326] Ensure virtual track time is long enough for test
 beatmaps

---
 osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs |  5 ++---
 osu.Game/Tests/Visual/OsuTestScene.cs          | 10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index ab4fb38657..1e43e5d148 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -180,9 +180,8 @@ namespace osu.Game.Tests.Beatmaps
             private readonly BeatmapInfo skinBeatmapInfo;
             private readonly IResourceStore<byte[]> resourceStore;
 
-            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio,
-                                      double length = 60000)
-                : base(beatmap, storyboard, referenceClock, audio, length)
+            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio)
+                : base(beatmap, storyboard, referenceClock, audio)
             {
                 this.skinBeatmapInfo = skinBeatmapInfo;
                 this.resourceStore = resourceStore;
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index b59a1db403..6e2fd0a6d7 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -23,6 +23,7 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens;
 using osu.Game.Storyboards;
@@ -222,18 +223,19 @@ namespace osu.Game.Tests.Visual
             /// <param name="storyboard">The storyboard.</param>
             /// <param name="referenceClock">An optional clock which should be used instead of a stopwatch for virtual time progression.</param>
             /// <param name="audio">Audio manager. Required if a reference clock isn't provided.</param>
-            /// <param name="length">The length of the returned virtual track.</param>
-            public ClockBackedTestWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio, double length = 60000)
+            public ClockBackedTestWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio)
                 : base(beatmap, storyboard, audio)
             {
+                double lastObjectTime = beatmap.HitObjects.LastOrDefault()?.GetEndTime() ?? 60000;
+
                 if (referenceClock != null)
                 {
                     store = new TrackVirtualStore(referenceClock);
                     audio.AddItem(store);
-                    track = store.GetVirtual(length);
+                    track = store.GetVirtual(lastObjectTime);
                 }
                 else
-                    track = audio?.Tracks.GetVirtual(length);
+                    track = audio?.Tracks.GetVirtual(lastObjectTime);
             }
 
             ~ClockBackedTestWorkingBeatmap()

From 21bf93a7c2b6d07e4e825c6b14f59a4ea3edd0af Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 13:29:36 +0900
Subject: [PATCH 05182/10326] Ensure there's a buffer after the last hitobject
 to allow certain replay tests to complete correctly

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

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 6e2fd0a6d7..e3f07dbad4 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -226,16 +226,18 @@ namespace osu.Game.Tests.Visual
             public ClockBackedTestWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio)
                 : base(beatmap, storyboard, audio)
             {
-                double lastObjectTime = beatmap.HitObjects.LastOrDefault()?.GetEndTime() ?? 60000;
+                var lastHitObject = beatmap.HitObjects.LastOrDefault();
+
+                double trackLength = lastHitObject?.GetEndTime() + 2000 ?? 60000;
 
                 if (referenceClock != null)
                 {
                     store = new TrackVirtualStore(referenceClock);
                     audio.AddItem(store);
-                    track = store.GetVirtual(lastObjectTime);
+                    track = store.GetVirtual(trackLength);
                 }
                 else
-                    track = audio?.Tracks.GetVirtual(lastObjectTime);
+                    track = audio?.Tracks.GetVirtual(trackLength);
             }
 
             ~ClockBackedTestWorkingBeatmap()

From 4b8188065504cf88de4c8cb487a180f1a0696904 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 14:04:04 +0900
Subject: [PATCH 05183/10326] Account for potentially longer non-last objects

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

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index e3f07dbad4..8886188d95 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -226,9 +226,11 @@ namespace osu.Game.Tests.Visual
             public ClockBackedTestWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio)
                 : base(beatmap, storyboard, audio)
             {
-                var lastHitObject = beatmap.HitObjects.LastOrDefault();
+                double trackLength = 60000;
 
-                double trackLength = lastHitObject?.GetEndTime() + 2000 ?? 60000;
+                if (beatmap.HitObjects.Count > 0)
+                    // add buffer after last hitobject to allow for final replay frames etc.
+                    trackLength = beatmap.HitObjects.Max(h => h.GetEndTime()) + 2000;
 
                 if (referenceClock != null)
                 {

From 7fead6ee41dcf4a242eec2d0b13df47d6c2fd50c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 14:22:32 +0900
Subject: [PATCH 05184/10326] Add comment making mania test behaviour clearer

---
 osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index ab840e1c46..e8c2472c3b 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
                 objects.Add(new Note { StartTime = time });
 
+                // don't hit the first note
                 if (i > 0)
                 {
                     frames.Add(new ManiaReplayFrame(time + 10, ManiaAction.Key1));

From e1c4c8f3d5401ce298c4f3392a1464103a931385 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 13:16:45 +0900
Subject: [PATCH 05185/10326] Add failing test coverage of gameplay sample
 pausing (during seek)

---
 .../TestSceneGameplaySamplePlayback.cs        | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
new file mode 100644
index 0000000000..3ab4df20df
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics.Audio;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneGameplaySamplePlayback : PlayerTestScene
+    {
+        [Test]
+        public void TestAllSamplesStopDuringSeek()
+        {
+            DrawableSlider slider = null;
+            DrawableSample[] samples = null;
+            ISamplePlaybackDisabler gameplayClock = null;
+
+            AddStep("get variables", () =>
+            {
+                gameplayClock = Player.ChildrenOfType<FrameStabilityContainer>().First().GameplayClock;
+                slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
+                samples = slider.ChildrenOfType<DrawableSample>().ToArray();
+            });
+
+            AddUntilStep("wait for slider sliding then seek", () =>
+            {
+                if (!slider.Tracking.Value)
+                    return false;
+
+                if (!samples.Any(s => s.Playing))
+                    return false;
+
+                Player.ChildrenOfType<GameplayClockContainer>().First().Seek(40000);
+                return true;
+            });
+
+            AddAssert("sample playback disabled", () => gameplayClock.SamplePlaybackDisabled.Value);
+
+            // because we are in frame stable context, it's quite likely that not all samples are "played" at this point.
+            // the important thing is that at least one started, and that sample has since stopped.
+            AddAssert("no samples are playing", () => Player.ChildrenOfType<PausableSkinnableSound>().All(s => !s.IsPlaying));
+
+            AddAssert("sample playback still disabled", () => gameplayClock.SamplePlaybackDisabled.Value);
+
+            AddUntilStep("seek finished, sample playback enabled", () => !gameplayClock.SamplePlaybackDisabled.Value);
+            AddUntilStep("any sample is playing", () => Player.ChildrenOfType<PausableSkinnableSound>().Any(s => s.IsPlaying));
+        }
+
+        protected override bool Autoplay => true;
+
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+    }
+}

From 2a46f905ff130c465676019d2e9daed638543870 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 12:45:37 +0900
Subject: [PATCH 05186/10326] Remove unnecessary IsSeeking checks from taiko
 drum implementation

---
 osu.Game.Rulesets.Taiko/UI/InputDrum.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
index 5966b24b34..1ca1be1bdf 100644
--- a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
@@ -163,16 +163,14 @@ namespace osu.Game.Rulesets.Taiko.UI
                     target = centreHit;
                     back = centre;
 
-                    if (gameplayClock?.IsSeeking != true)
-                        drumSample.Centre?.Play();
+                    drumSample.Centre?.Play();
                 }
                 else if (action == RimAction)
                 {
                     target = rimHit;
                     back = rim;
 
-                    if (gameplayClock?.IsSeeking != true)
-                        drumSample.Rim?.Play();
+                    drumSample.Rim?.Play();
                 }
 
                 if (target != null)

From af7d10afe0f532e7d339a0c28675817cd0b11226 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 12:45:57 +0900
Subject: [PATCH 05187/10326] Fix FrameStabilityContainer not re-caching its
 GameplayClock correctly

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 55c4edfbd1..668cbbdc35 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Rulesets.UI
         public GameplayClock GameplayClock => stabilityGameplayClock;
 
         [Cached(typeof(GameplayClock))]
+        [Cached(typeof(ISamplePlaybackDisabler))]
         private readonly StabilityGameplayClock stabilityGameplayClock;
 
         public FrameStabilityContainer(double gameplayStartTime = double.MinValue)

From e4710f82ec5a06258970ec01d9073838b8d7e581 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 12:46:15 +0900
Subject: [PATCH 05188/10326] Fix sample disabled status not being updated
 correctly from seek state

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs |  4 +++-
 osu.Game/Screens/Play/GameplayClock.cs          | 12 ++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 668cbbdc35..6956d3c31a 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -228,7 +228,9 @@ namespace osu.Game.Rulesets.UI
             {
             }
 
-            public override bool IsSeeking => ParentGameplayClock != null && Math.Abs(CurrentTime - ParentGameplayClock.CurrentTime) > 200;
+            protected override bool ShouldDisableSamplePlayback =>
+                // handle the case where playback is catching up to real-time.
+                base.ShouldDisableSamplePlayback || (ParentGameplayClock != null && Math.Abs(CurrentTime - ParentGameplayClock.CurrentTime) > 200);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index 9f2868573e..eeea6777c6 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual IEnumerable<Bindable<double>> NonGameplayAdjustments => Enumerable.Empty<Bindable<double>>();
 
+        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
         public GameplayClock(IFrameBasedClock underlyingClock)
         {
             this.underlyingClock = underlyingClock;
@@ -62,13 +64,15 @@ namespace osu.Game.Screens.Play
         public bool IsRunning => underlyingClock.IsRunning;
 
         /// <summary>
-        /// Whether an ongoing seek operation is active.
+        /// Whether nested samples supporting the <see cref="ISamplePlaybackDisabler"/> interface should be paused.
         /// </summary>
-        public virtual bool IsSeeking => false;
+        protected virtual bool ShouldDisableSamplePlayback => IsPaused.Value;
 
         public void ProcessFrame()
         {
-            // we do not want to process the underlying clock.
+            // intentionally not updating the underlying clock (handled externally).
+
+            samplePlaybackDisabled.Value = ShouldDisableSamplePlayback;
         }
 
         public double ElapsedFrameTime => underlyingClock.ElapsedFrameTime;
@@ -79,6 +83,6 @@ namespace osu.Game.Screens.Play
 
         public IClock Source => underlyingClock;
 
-        public IBindable<bool> SamplePlaybackDisabled => IsPaused;
+        IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => samplePlaybackDisabled;
     }
 }

From ae8bf8cdd4ca70eb5455b4389f4be459783b8c4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 12:47:00 +0900
Subject: [PATCH 05189/10326] Fix StabilityGameClock not being updated

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 6956d3c31a..f32f8d177b 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -208,11 +208,15 @@ namespace osu.Game.Rulesets.UI
 
         private void setClock()
         {
-            // in case a parent gameplay clock isn't available, just use the parent clock.
-            parentGameplayClock ??= Clock;
-
-            Clock = GameplayClock;
-            ProcessCustomClock = false;
+            if (parentGameplayClock == null)
+            {
+                // in case a parent gameplay clock isn't available, just use the parent clock.
+                parentGameplayClock ??= Clock;
+            }
+            else
+            {
+                Clock = GameplayClock;
+            }
         }
 
         public ReplayInputHandler ReplayInputHandler { get; set; }

From 758088672cf9b7e58c8c83a5c4aebae143063d56 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 15:07:46 +0900
Subject: [PATCH 05190/10326] Don't stop non-looping samples immediately when
 pausing

---
 .../Objects/Drawables/DrawableSlider.cs       |  4 +--
 .../Objects/Drawables/DrawableSpinner.cs      |  4 +--
 .../Objects/Drawables/DrawableHitObject.cs    | 10 +++++--
 osu.Game/Skinning/PausableSkinnableSound.cs   | 26 +++++++++----------
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 280ca33234..4433aac9b5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -109,9 +109,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        public override void StopAllSamples()
+        public override void StopLoopingSamples()
         {
-            base.StopAllSamples();
+            base.StopLoopingSamples();
             slidingSample?.Stop();
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 130b4e6e53..dda0c94982 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -124,9 +124,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        public override void StopAllSamples()
+        public override void StopLoopingSamples()
         {
-            base.StopAllSamples();
+            base.StopLoopingSamples();
             spinningSample?.Stop();
         }
 
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 66fc61720a..7a4970d172 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -18,6 +18,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Configuration;
+using osu.Game.Screens.Play;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Drawables
@@ -387,7 +388,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// Stops playback of all samples. Automatically called when <see cref="DrawableHitObject{TObject}"/>'s lifetime has been exceeded.
         /// </summary>
-        public virtual void StopAllSamples() => Samples?.Stop();
+        public virtual void StopLoopingSamples()
+        {
+            if (Samples?.Looping == true)
+                Samples.Stop();
 
         protected override void Update()
         {
@@ -457,7 +461,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
             foreach (var nested in NestedHitObjects)
                 nested.OnKilled();
 
-            StopAllSamples();
+            // failsafe to ensure looping samples don't get stuck in a playing state.
+            // this could occur in a non-frame-stable context where DrawableHitObjects get killed before a SkinnableSound has the chance to be stopped.
+            StopLoopingSamples();
 
             UpdateResult(false);
         }
diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 9819574b1d..d340f67575 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -34,21 +34,21 @@ namespace osu.Game.Skinning
                 samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
                 samplePlaybackDisabled.BindValueChanged(disabled =>
                 {
-                    if (RequestedPlaying)
+                    if (!RequestedPlaying) return;
+
+                    // let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
+                    if (!Looping) return;
+
+                    if (disabled.NewValue)
+                        base.Stop();
+                    else
                     {
-                        if (disabled.NewValue)
-                            base.Stop();
-                        // it's not easy to know if a sample has finished playing (to end).
-                        // to keep things simple only resume playing looping samples.
-                        else if (Looping)
+                        // schedule so we don't start playing a sample which is no longer alive.
+                        Schedule(() =>
                         {
-                            // schedule so we don't start playing a sample which is no longer alive.
-                            Schedule(() =>
-                            {
-                                if (RequestedPlaying)
-                                    base.Play();
-                            });
-                        }
+                            if (RequestedPlaying)
+                                base.Play();
+                        });
                     }
                 });
             }

From 9f43dedf59da624a4ea1381cedb982dce40d1b24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 15:12:34 +0900
Subject: [PATCH 05191/10326] Fix missing line

---
 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 7a4970d172..11f84d370a 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -18,7 +18,6 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Configuration;
-using osu.Game.Screens.Play;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Drawables
@@ -392,6 +391,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             if (Samples?.Looping == true)
                 Samples.Stop();
+        }
 
         protected override void Update()
         {

From a69b1636be75e094a7323a0961a45a1703a878f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 15:18:28 +0900
Subject: [PATCH 05192/10326] Update tests

---
 .../Visual/Editing/TestSceneEditorSamplePlayback.cs   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
index 039a21fd94..f182023c0e 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
@@ -19,12 +19,14 @@ namespace osu.Game.Tests.Visual.Editing
         public void TestSlidingSampleStopsOnSeek()
         {
             DrawableSlider slider = null;
-            DrawableSample[] samples = null;
+            DrawableSample[] loopingSamples = null;
+            DrawableSample[] onceOffSamples = null;
 
             AddStep("get first slider", () =>
             {
                 slider = Editor.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
-                samples = slider.ChildrenOfType<DrawableSample>().ToArray();
+                onceOffSamples = slider.ChildrenOfType<DrawableSample>().Where(s => !s.Looping).ToArray();
+                loopingSamples = slider.ChildrenOfType<DrawableSample>().Where(s => s.Looping).ToArray();
             });
 
             AddStep("start playback", () => EditorClock.Start());
@@ -34,14 +36,15 @@ namespace osu.Game.Tests.Visual.Editing
                 if (!slider.Tracking.Value)
                     return false;
 
-                if (!samples.Any(s => s.Playing))
+                if (!loopingSamples.Any(s => s.Playing))
                     return false;
 
                 EditorClock.Seek(20000);
                 return true;
             });
 
-            AddAssert("slider samples are not playing", () => samples.Length == 5 && samples.All(s => s.Played && !s.Playing));
+            AddAssert("non-looping samples are playing", () => onceOffSamples.Length == 4 && loopingSamples.All(s => s.Played || s.Playing));
+            AddAssert("looping samples are not playing", () => loopingSamples.Length == 1 && loopingSamples.All(s => s.Played && !s.Playing));
         }
     }
 }

From 0605bb9b8d565b843dda3fdbf9702474fc8a5592 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 16:20:29 +0900
Subject: [PATCH 05193/10326] Fix incorrect parent state transfer

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index f32f8d177b..70b3d0c7d4 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -59,13 +59,16 @@ namespace osu.Game.Rulesets.UI
         private int direction;
 
         [BackgroundDependencyLoader(true)]
-        private void load(GameplayClock clock)
+        private void load(GameplayClock clock, ISamplePlaybackDisabler sampleDisabler)
         {
             if (clock != null)
             {
                 parentGameplayClock = stabilityGameplayClock.ParentGameplayClock = clock;
                 GameplayClock.IsPaused.BindTo(clock.IsPaused);
             }
+
+            // this is a bit temporary. should really be done inside of GameplayClock (but requires large structural changes).
+            stabilityGameplayClock.ParentSampleDisabler = sampleDisabler;
         }
 
         protected override void LoadComplete()
@@ -225,6 +228,8 @@ namespace osu.Game.Rulesets.UI
         {
             public GameplayClock ParentGameplayClock;
 
+            public ISamplePlaybackDisabler ParentSampleDisabler;
+
             public override IEnumerable<Bindable<double>> NonGameplayAdjustments => ParentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty<Bindable<double>>();
 
             public StabilityGameplayClock(FramedClock underlyingClock)
@@ -234,7 +239,9 @@ namespace osu.Game.Rulesets.UI
 
             protected override bool ShouldDisableSamplePlayback =>
                 // handle the case where playback is catching up to real-time.
-                base.ShouldDisableSamplePlayback || (ParentGameplayClock != null && Math.Abs(CurrentTime - ParentGameplayClock.CurrentTime) > 200);
+                base.ShouldDisableSamplePlayback
+                || ParentSampleDisabler?.SamplePlaybackDisabled.Value == true
+                || (ParentGameplayClock != null && Math.Abs(CurrentTime - ParentGameplayClock.CurrentTime) > 200);
         }
     }
 }

From c622adde7a9374459a3a9a6ed93b7064685eb14d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 16:24:02 +0900
Subject: [PATCH 05194/10326] Rename method back and add xmldoc

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs  | 4 ++--
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 4 ++--
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs   | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 4433aac9b5..280ca33234 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -109,9 +109,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        public override void StopLoopingSamples()
+        public override void StopAllSamples()
         {
-            base.StopLoopingSamples();
+            base.StopAllSamples();
             slidingSample?.Stop();
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index dda0c94982..130b4e6e53 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -124,9 +124,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        public override void StopLoopingSamples()
+        public override void StopAllSamples()
         {
-            base.StopLoopingSamples();
+            base.StopAllSamples();
             spinningSample?.Stop();
         }
 
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 11f84d370a..8012b4d95c 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -385,9 +385,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
         }
 
         /// <summary>
-        /// Stops playback of all samples. Automatically called when <see cref="DrawableHitObject{TObject}"/>'s lifetime has been exceeded.
+        /// Stops playback of all relevant samples. Generally only looping samples should be stopped by this, and the rest let to play out.
+        /// Automatically called when <see cref="DrawableHitObject{TObject}"/>'s lifetime has been exceeded.
         /// </summary>
-        public virtual void StopLoopingSamples()
+        public virtual void StopAllSamples()
         {
             if (Samples?.Looping == true)
                 Samples.Stop();
@@ -463,7 +464,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             // failsafe to ensure looping samples don't get stuck in a playing state.
             // this could occur in a non-frame-stable context where DrawableHitObjects get killed before a SkinnableSound has the chance to be stopped.
-            StopLoopingSamples();
+            StopAllSamples();
 
             UpdateResult(false);
         }

From 2b824787c1c4a2620f6bf3ab4e43a3fbee78b807 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 5 Oct 2020 19:28:13 +0900
Subject: [PATCH 05195/10326] Guard against potential nullref

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index bbd0e23210..3d94737e59 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -275,7 +275,7 @@ namespace osu.Game.Screens.Edit.Setup
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            game.UnregisterImportHandler(this);
+            game?.UnregisterImportHandler(this);
         }
     }
 

From 606a08c6ad38b967a557a2605e0c1184bedb33eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 20:01:12 +0900
Subject: [PATCH 05196/10326] Temporarily ignore failing gameplay samples test

---
 .../Visual/Gameplay/TestSceneGameplaySamplePlayback.cs           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index 3ab4df20df..f0d39a8b18 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Tests.Visual.Gameplay
     public class TestSceneGameplaySamplePlayback : PlayerTestScene
     {
         [Test]
+        [Ignore("temporarily disabled pending investigation")]
         public void TestAllSamplesStopDuringSeek()
         {
             DrawableSlider slider = null;

From 6bc0afdafb32c9e5728458fa8e099b39e9f7902a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 20:09:18 +0900
Subject: [PATCH 05197/10326] Fix remaining conflicts

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 0bb3d25011..be3bca3242 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -13,7 +13,6 @@ using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
@@ -63,8 +62,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         }
 
         private WaveformGraph waveform;
-        private ControlPointPart controlPoints;
-        private TimelineTickDisplay ticks;
 
         private TimelineTickDisplay ticks;
 

From 9eeac759b8e5fd150db97118c15a99fb2496c658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 5 Oct 2020 21:22:07 +0200
Subject: [PATCH 05198/10326] Re-enable and fix gameplay sample playback test

---
 .../Visual/Gameplay/TestSceneGameplaySamplePlayback.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index f0d39a8b18..5bb3851264 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.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 System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics.Audio;
@@ -17,7 +18,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     public class TestSceneGameplaySamplePlayback : PlayerTestScene
     {
         [Test]
-        [Ignore("temporarily disabled pending investigation")]
         public void TestAllSamplesStopDuringSeek()
         {
             DrawableSlider slider = null;
@@ -47,7 +47,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             // because we are in frame stable context, it's quite likely that not all samples are "played" at this point.
             // the important thing is that at least one started, and that sample has since stopped.
-            AddAssert("no samples are playing", () => Player.ChildrenOfType<PausableSkinnableSound>().All(s => !s.IsPlaying));
+            AddAssert("all looping samples stopped immediately", () => allStopped(allLoopingSounds));
+            AddUntilStep("all samples stopped eventually", () => allStopped(allSounds));
 
             AddAssert("sample playback still disabled", () => gameplayClock.SamplePlaybackDisabled.Value);
 
@@ -55,6 +56,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("any sample is playing", () => Player.ChildrenOfType<PausableSkinnableSound>().Any(s => s.IsPlaying));
         }
 
+        private IEnumerable<PausableSkinnableSound> allSounds => Player.ChildrenOfType<PausableSkinnableSound>();
+        private IEnumerable<PausableSkinnableSound> allLoopingSounds => allSounds.Where(sound => sound.Looping);
+
+        private bool allStopped(IEnumerable<PausableSkinnableSound> sounds) => sounds.All(sound => !sound.IsPlaying);
+
         protected override bool Autoplay => true;
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();

From 46f6e84a3351dd77e4de78f785670788ab92a908 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 12:33:57 +0900
Subject: [PATCH 05199/10326] Fix disclaimer potentially running same code from
 two different threads

---
 osu.Game/Screens/Menu/Disclaimer.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index fcb9aacd76..8368047d5a 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -42,8 +42,11 @@ namespace osu.Game.Screens.Menu
             ValidForResume = false;
         }
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, IAPIProvider api)
+        private void load(OsuColour colours)
         {
             InternalChildren = new Drawable[]
             {
@@ -104,7 +107,9 @@ namespace osu.Game.Screens.Menu
 
             iconColour = colours.Yellow;
 
-            currentUser.BindTo(api.LocalUser);
+            // manually transfer the user once, but only do the final bind in LoadComplete to avoid thread woes (API scheduler could run while this screen is still loading).
+            // the manual transfer is here to ensure all text content is loaded ahead of time as this is very early in the game load process and we want to avoid stutters.
+            currentUser.Value = api.LocalUser.Value;
             currentUser.BindValueChanged(e =>
             {
                 supportFlow.Children.ForEach(d => d.FadeOut().Expire());
@@ -141,6 +146,8 @@ namespace osu.Game.Screens.Menu
             base.LoadComplete();
             if (nextScreen != null)
                 LoadComponentAsync(nextScreen);
+
+            currentUser.BindTo(api.LocalUser);
         }
 
         public override void OnEntering(IScreen last)

From 22b0105d629a70344609d33314a76978053e633d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 13:00:02 +0900
Subject: [PATCH 05200/10326] Show a notification if checking for updates via
 button and there are none available

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs  |  8 ++++---
 .../Sections/General/UpdateSettings.cs        | 21 +++++++++++++++++--
 osu.Game/Updater/SimpleUpdateManager.cs       |  7 ++++++-
 osu.Game/Updater/UpdateManager.cs             | 19 ++++++++++-------
 4 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 05c8e835ac..b9b148b383 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -37,9 +37,9 @@ namespace osu.Desktop.Updater
             Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
         }
 
-        protected override async Task PerformUpdateCheck() => await checkForUpdateAsync();
+        protected override async Task<bool> PerformUpdateCheck() => await checkForUpdateAsync();
 
-        private async Task checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
+        private async Task<bool> checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
         {
             // should we schedule a retry on completion of this check?
             bool scheduleRecheck = true;
@@ -51,7 +51,7 @@ namespace osu.Desktop.Updater
                 var info = await updateManager.CheckForUpdate(!useDeltaPatching);
                 if (info.ReleasesToApply.Count == 0)
                     // no updates available. bail and retry later.
-                    return;
+                    return false;
 
                 if (notification == null)
                 {
@@ -103,6 +103,8 @@ namespace osu.Desktop.Updater
                     Scheduler.AddDelayed(async () => await checkForUpdateAsync(), 60000 * 30);
                 }
             }
+
+            return true;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 9c7d0b0be4..9b7b7392d8 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -4,9 +4,11 @@
 using System.Threading.Tasks;
 using osu.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.Configuration;
+using osu.Game.Overlays.Notifications;
 using osu.Game.Overlays.Settings.Sections.Maintenance;
 using osu.Game.Updater;
 
@@ -21,6 +23,9 @@ namespace osu.Game.Overlays.Settings.Sections.General
 
         private SettingsButton checkForUpdatesButton;
 
+        [Resolved]
+        private NotificationOverlay notifications { get; set; }
+
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuConfigManager config, OsuGame game)
         {
@@ -30,7 +35,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
-            if (updateManager?.CanCheckForUpdate == true)
+            //if (updateManager?.CanCheckForUpdate == true)
             {
                 Add(checkForUpdatesButton = new SettingsButton
                 {
@@ -38,7 +43,19 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     Action = () =>
                     {
                         checkForUpdatesButton.Enabled.Value = false;
-                        Task.Run(updateManager.CheckForUpdateAsync).ContinueWith(t => Schedule(() => checkForUpdatesButton.Enabled.Value = true));
+                        Task.Run(updateManager.CheckForUpdateAsync).ContinueWith(t => Schedule(() =>
+                        {
+                            if (!t.Result)
+                            {
+                                notifications.Post(new SimpleNotification
+                                {
+                                    Text = $"You are running the latest release ({game.Version})",
+                                    Icon = FontAwesome.Solid.CheckCircle,
+                                });
+                            }
+
+                            checkForUpdatesButton.Enabled.Value = true;
+                        }));
                     }
                 });
             }
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index ebb9995c66..79b2d46b93 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Updater
             version = game.Version;
         }
 
-        protected override async Task PerformUpdateCheck()
+        protected override async Task<bool> PerformUpdateCheck()
         {
             try
             {
@@ -53,12 +53,17 @@ namespace osu.Game.Updater
                             return true;
                         }
                     });
+
+                    return true;
                 }
             }
             catch
             {
                 // we shouldn't crash on a web failure. or any failure for the matter.
+                return true;
             }
+
+            return false;
         }
 
         private string getBestUrl(GitHubRelease release)
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 61775a26b7..30e28f0e95 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -57,25 +57,28 @@ namespace osu.Game.Updater
 
         private readonly object updateTaskLock = new object();
 
-        private Task updateCheckTask;
+        private Task<bool> updateCheckTask;
 
-        public async Task CheckForUpdateAsync()
+        public async Task<bool> CheckForUpdateAsync()
         {
-            if (!CanCheckForUpdate)
-                return;
-
-            Task waitTask;
+            Task<bool> waitTask;
 
             lock (updateTaskLock)
                 waitTask = (updateCheckTask ??= PerformUpdateCheck());
 
-            await waitTask;
+            bool hasUpdates = await waitTask;
 
             lock (updateTaskLock)
                 updateCheckTask = null;
+
+            return hasUpdates;
         }
 
-        protected virtual Task PerformUpdateCheck() => Task.CompletedTask;
+        /// <summary>
+        /// Performs an asynchronous check for application updates.
+        /// </summary>
+        /// <returns>Whether any update is waiting. May return true if an error occured (there is potentially an update available).</returns>
+        protected virtual Task<bool> PerformUpdateCheck() => Task.FromResult(false);
 
         private class UpdateCompleteNotification : SimpleNotification
         {

From 5e10ac418bb188044f990d0b96c6544f16eff26b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 13:09:42 +0900
Subject: [PATCH 05201/10326] Add update notifications for iOS builds

---
 osu.Game/Updater/SimpleUpdateManager.cs | 5 +++++
 osu.iOS/OsuGameIOS.cs                   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index ebb9995c66..48c6722bd9 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -79,6 +79,11 @@ namespace osu.Game.Updater
                     bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".AppImage"));
                     break;
 
+                case RuntimeInfo.Platform.iOS:
+                    // iOS releases are available via testflight. this link seems to work well enough for now.
+                    // see https://stackoverflow.com/a/32960501
+                    return "itms-beta://beta.itunes.apple.com/v1/app/1447765923";
+
                 case RuntimeInfo.Platform.Android:
                     // on our testing device this causes the download to magically disappear.
                     //bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".apk"));
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index 3a16f81530..5125ad81e0 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -11,5 +11,7 @@ namespace osu.iOS
     public class OsuGameIOS : OsuGame
     {
         public override Version AssemblyVersion => new Version(NSBundle.MainBundle.InfoDictionary["CFBundleVersion"].ToString());
+
+        protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
     }
 }

From de47392e3d11ddf7e7831c029ac4c5bf353007d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 13:18:42 +0900
Subject: [PATCH 05202/10326] Display the "restart to update" notification on
 checking for update after dismissal

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs | 50 ++++++++++++++------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index b9b148b383..71f9fafe57 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -29,6 +29,11 @@ namespace osu.Desktop.Updater
 
         private static readonly Logger logger = Logger.GetLogger("updater");
 
+        /// <summary>
+        /// Whether an update has been downloaded but not yet applied.
+        /// </summary>
+        private bool updatePending;
+
         [BackgroundDependencyLoader]
         private void load(NotificationOverlay notification)
         {
@@ -49,9 +54,19 @@ namespace osu.Desktop.Updater
                 updateManager ??= await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
 
                 var info = await updateManager.CheckForUpdate(!useDeltaPatching);
+
                 if (info.ReleasesToApply.Count == 0)
+                {
+                    if (updatePending)
+                    {
+                        // the user may have dismissed the completion notice, so show it again.
+                        notificationOverlay.Post(new UpdateCompleteNotification(this));
+                        return true;
+                    }
+
                     // no updates available. bail and retry later.
                     return false;
+                }
 
                 if (notification == null)
                 {
@@ -72,6 +87,7 @@ namespace osu.Desktop.Updater
                     await updateManager.ApplyReleases(info, p => notification.Progress = p / 100f);
 
                     notification.State = ProgressNotificationState.Completed;
+                    updatePending = true;
                 }
                 catch (Exception e)
                 {
@@ -113,10 +129,27 @@ namespace osu.Desktop.Updater
             updateManager?.Dispose();
         }
 
+        private class UpdateCompleteNotification : ProgressCompletionNotification
+        {
+            [Resolved]
+            private OsuGame game { get; set; }
+
+            public UpdateCompleteNotification(SquirrelUpdateManager updateManager)
+            {
+                Text = @"Update ready to install. Click to restart!";
+
+                Activated = () =>
+                {
+                    updateManager.PrepareUpdateAsync()
+                                 .ContinueWith(_ => updateManager.Schedule(() => game.GracefullyExit()));
+                    return true;
+                };
+            }
+        }
+
         private class UpdateProgressNotification : ProgressNotification
         {
             private readonly SquirrelUpdateManager updateManager;
-            private OsuGame game;
 
             public UpdateProgressNotification(SquirrelUpdateManager updateManager)
             {
@@ -125,23 +158,12 @@ namespace osu.Desktop.Updater
 
             protected override Notification CreateCompletionNotification()
             {
-                return new ProgressCompletionNotification
-                {
-                    Text = @"Update ready to install. Click to restart!",
-                    Activated = () =>
-                    {
-                        updateManager.PrepareUpdateAsync()
-                                     .ContinueWith(_ => updateManager.Schedule(() => game.GracefullyExit()));
-                        return true;
-                    }
-                };
+                return new UpdateCompleteNotification(updateManager);
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours, OsuGame game)
+            private void load(OsuColour colours)
             {
-                this.game = game;
-
                 IconContent.AddRange(new Drawable[]
                 {
                     new Box

From 767a2a10bd0f0798eb5b313068c5b43b3f962160 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 13:56:38 +0900
Subject: [PATCH 05203/10326] Fix incorrect sliderendcircle fallback logic

Correctly handle the case where a skin has "sliderendcircle.png" but not
"sliderendcircleoverlay.png".
---
 .../Skinning/LegacyMainCirclePiece.cs         | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index f051cbfa3b..d556ecb9bc 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -49,6 +49,25 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
 
+            Texture baseTexture;
+            Texture overlayTexture;
+            bool allowFallback = false;
+
+            // attempt lookup using priority specification
+            baseTexture = getTextureWithFallback(string.Empty);
+
+            // if the base texture was not found without a fallback, switch on fallback mode and re-perform the lookup.
+            if (baseTexture == null)
+            {
+                allowFallback = true;
+                baseTexture = getTextureWithFallback(string.Empty);
+            }
+
+            // at this point, any further texture fetches should be correctly using the priority source if the base texture was retrieved using it.
+            // the flow above handles the case where a sliderendcircle.png is retrieved from the skin, but sliderendcircleoverlay.png doesn't exist.
+            // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png (potentially from the default/fall-through skin).
+            overlayTexture = getTextureWithFallback("overlay");
+
             InternalChildren = new Drawable[]
             {
                 circleSprites = new Container<Sprite>
@@ -60,13 +79,13 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     {
                         hitCircleSprite = new Sprite
                         {
-                            Texture = getTextureWithFallback(string.Empty),
+                            Texture = baseTexture,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         },
                         hitCircleOverlay = new Sprite
                         {
-                            Texture = getTextureWithFallback("overlay"),
+                            Texture = overlayTexture,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         }
@@ -101,8 +120,13 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 Texture tex = null;
 
                 if (!string.IsNullOrEmpty(priorityLookup))
+                {
                     tex = skin.GetTexture($"{priorityLookup}{name}");
 
+                    if (!allowFallback)
+                        return tex;
+                }
+
                 return tex ?? skin.GetTexture($"hitcircle{name}");
             }
         }

From ed982e8dd13f9f4657e1463a7bd19a7aac2f41f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 14:08:55 +0900
Subject: [PATCH 05204/10326] Make stacked hitcircles more visible when using
 default skin

---
 osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs
index bcf64b81a6..619fea73bc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             Origin = Anchor.Centre;
 
             Masking = true;
-            BorderThickness = 10;
+            BorderThickness = 9; // roughly matches slider borders and makes stacked circles distinctly visible from each other.
             BorderColour = Color4.White;
 
             Child = new Box

From 048507478ee199fc155be842a5d008a05dcf1869 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 14:12:46 +0900
Subject: [PATCH 05205/10326] Join declaration and specification

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

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index d556ecb9bc..382d6e53cc 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -49,12 +49,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
 
-            Texture baseTexture;
-            Texture overlayTexture;
             bool allowFallback = false;
 
             // attempt lookup using priority specification
-            baseTexture = getTextureWithFallback(string.Empty);
+            Texture baseTexture = getTextureWithFallback(string.Empty);
 
             // if the base texture was not found without a fallback, switch on fallback mode and re-perform the lookup.
             if (baseTexture == null)
@@ -66,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             // at this point, any further texture fetches should be correctly using the priority source if the base texture was retrieved using it.
             // the flow above handles the case where a sliderendcircle.png is retrieved from the skin, but sliderendcircleoverlay.png doesn't exist.
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png (potentially from the default/fall-through skin).
-            overlayTexture = getTextureWithFallback("overlay");
+            Texture overlayTexture = getTextureWithFallback("overlay");
 
             InternalChildren = new Drawable[]
             {

From 9d7880afdaebdc2f929c5a04f0ce674cfdab8706 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 17:18:41 +0900
Subject: [PATCH 05206/10326] Make SettingsItem conform to IHasCurrentValue

---
 .../ManiaSettingsSubsection.cs                |  4 ++--
 .../UI/OsuSettingsSubsection.cs               |  6 ++---
 osu.Game.Tournament/Components/DateTextBox.cs | 18 +++++++-------
 .../Screens/Editors/RoundEditorScreen.cs      | 12 +++++-----
 .../Screens/Editors/SeedingEditorScreen.cs    | 10 ++++----
 .../Screens/Editors/TeamEditorScreen.cs       | 12 +++++-----
 .../Screens/Gameplay/GameplayScreen.cs        |  4 ++--
 .../Ladder/Components/LadderEditorSettings.cs | 12 +++++-----
 .../Screens/TeamIntro/SeedingScreen.cs        |  2 +-
 .../Configuration/SettingSourceAttribute.cs   | 12 +++++-----
 .../Sections/Audio/AudioDevicesSettings.cs    |  2 +-
 .../Sections/Audio/MainMenuSettings.cs        |  8 +++----
 .../Settings/Sections/Audio/OffsetSettings.cs |  2 +-
 .../Settings/Sections/Audio/VolumeSettings.cs |  8 +++----
 .../Sections/Debug/GeneralSettings.cs         |  4 ++--
 .../Sections/Gameplay/GeneralSettings.cs      | 24 +++++++++----------
 .../Sections/Gameplay/ModsSettings.cs         |  2 +-
 .../Sections/Gameplay/SongSelectSettings.cs   | 10 ++++----
 .../Sections/General/LanguageSettings.cs      |  2 +-
 .../Sections/General/LoginSettings.cs         |  4 ++--
 .../Sections/General/UpdateSettings.cs        |  2 +-
 .../Sections/Graphics/DetailSettings.cs       |  8 +++----
 .../Sections/Graphics/LayoutSettings.cs       | 20 ++++++++--------
 .../Sections/Graphics/RendererSettings.cs     |  6 ++---
 .../Graphics/UserInterfaceSettings.cs         |  6 ++---
 .../Settings/Sections/Input/MouseSettings.cs  | 12 +++++-----
 .../Settings/Sections/Online/WebSettings.cs   |  4 ++--
 .../Overlays/Settings/Sections/SkinSection.cs | 12 +++++-----
 osu.Game/Overlays/Settings/SettingsItem.cs    |  4 ++--
 .../Edit/Timing/SliderWithTextBoxInput.cs     |  8 +++----
 osu.Game/Screens/Edit/Timing/TimingSection.cs | 14 +++++------
 .../Play/PlayerSettings/PlaybackSettings.cs   |  4 ++--
 .../Play/PlayerSettings/VisualSettings.cs     |  4 ++--
 33 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index b470405df2..de77af8306 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -29,12 +29,12 @@ namespace osu.Game.Rulesets.Mania
                 new SettingsEnumDropdown<ManiaScrollingDirection>
                 {
                     LabelText = "Scrolling direction",
-                    Bindable = config.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection)
+                    Current = config.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection)
                 },
                 new SettingsSlider<double, TimeSlider>
                 {
                     LabelText = "Scroll speed",
-                    Bindable = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
+                    Current = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
                     KeyboardStep = 5
                 },
             };
diff --git a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
index 88adf72551..3870f303b4 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
@@ -27,17 +27,17 @@ namespace osu.Game.Rulesets.Osu.UI
                 new SettingsCheckbox
                 {
                     LabelText = "Snaking in sliders",
-                    Bindable = config.GetBindable<bool>(OsuRulesetSetting.SnakingInSliders)
+                    Current = config.GetBindable<bool>(OsuRulesetSetting.SnakingInSliders)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Snaking out sliders",
-                    Bindable = config.GetBindable<bool>(OsuRulesetSetting.SnakingOutSliders)
+                    Current = config.GetBindable<bool>(OsuRulesetSetting.SnakingOutSliders)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Cursor trail",
-                    Bindable = config.GetBindable<bool>(OsuRulesetSetting.ShowCursorTrail)
+                    Current = config.GetBindable<bool>(OsuRulesetSetting.ShowCursorTrail)
                 },
             };
         }
diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index a1b5ac38ea..5782301a65 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -10,34 +10,34 @@ namespace osu.Game.Tournament.Components
 {
     public class DateTextBox : SettingsTextBox
     {
-        public new Bindable<DateTimeOffset> Bindable
+        public new Bindable<DateTimeOffset> Current
         {
-            get => bindable;
+            get => current;
             set
             {
-                bindable = value.GetBoundCopy();
-                bindable.BindValueChanged(dto =>
-                    base.Bindable.Value = dto.NewValue.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ"), true);
+                current = value.GetBoundCopy();
+                current.BindValueChanged(dto =>
+                    base.Current.Value = dto.NewValue.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ"), true);
             }
         }
 
         // hold a reference to the provided bindable so we don't have to in every settings section.
-        private Bindable<DateTimeOffset> bindable = new Bindable<DateTimeOffset>();
+        private Bindable<DateTimeOffset> current = new Bindable<DateTimeOffset>();
 
         public DateTextBox()
         {
-            base.Bindable = new Bindable<string>();
+            base.Current = new Bindable<string>();
 
             ((OsuTextBox)Control).OnCommit += (sender, newText) =>
             {
                 try
                 {
-                    bindable.Value = DateTimeOffset.Parse(sender.Text);
+                    current.Value = DateTimeOffset.Parse(sender.Text);
                 }
                 catch
                 {
                     // reset textbox content to its last valid state on a parse failure.
-                    bindable.TriggerChange();
+                    current.TriggerChange();
                 }
             };
         }
diff --git a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index 8b8078e119..069ddfa4db 100644
--- a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -63,25 +63,25 @@ namespace osu.Game.Tournament.Screens.Editors
                             {
                                 LabelText = "Name",
                                 Width = 0.33f,
-                                Bindable = Model.Name
+                                Current = Model.Name
                             },
                             new SettingsTextBox
                             {
                                 LabelText = "Description",
                                 Width = 0.33f,
-                                Bindable = Model.Description
+                                Current = Model.Description
                             },
                             new DateTextBox
                             {
                                 LabelText = "Start Time",
                                 Width = 0.33f,
-                                Bindable = Model.StartDate
+                                Current = Model.StartDate
                             },
                             new SettingsSlider<int>
                             {
                                 LabelText = "Best of",
                                 Width = 0.33f,
-                                Bindable = Model.BestOf
+                                Current = Model.BestOf
                             },
                             new SettingsButton
                             {
@@ -186,14 +186,14 @@ namespace osu.Game.Tournament.Screens.Editors
                                         LabelText = "Beatmap ID",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = beatmapId,
+                                        Current = beatmapId,
                                     },
                                     new SettingsTextBox
                                     {
                                         LabelText = "Mods",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = mods,
+                                        Current = mods,
                                     },
                                     drawableContainer = new Container
                                     {
diff --git a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
index 0973a7dc75..7bd8d3f6a0 100644
--- a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
@@ -74,13 +74,13 @@ namespace osu.Game.Tournament.Screens.Editors
                             {
                                 LabelText = "Mod",
                                 Width = 0.33f,
-                                Bindable = Model.Mod
+                                Current = Model.Mod
                             },
                             new SettingsSlider<int>
                             {
                                 LabelText = "Seed",
                                 Width = 0.33f,
-                                Bindable = Model.Seed
+                                Current = Model.Seed
                             },
                             new SettingsButton
                             {
@@ -187,21 +187,21 @@ namespace osu.Game.Tournament.Screens.Editors
                                         LabelText = "Beatmap ID",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = beatmapId,
+                                        Current = beatmapId,
                                     },
                                     new SettingsSlider<int>
                                     {
                                         LabelText = "Seed",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = beatmap.Seed
+                                        Current = beatmap.Seed
                                     },
                                     new SettingsTextBox
                                     {
                                         LabelText = "Score",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = score,
+                                        Current = score,
                                     },
                                     drawableContainer = new Container
                                     {
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index dbfcfe4225..7196f47bd6 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -102,31 +102,31 @@ namespace osu.Game.Tournament.Screens.Editors
                             {
                                 LabelText = "Name",
                                 Width = 0.2f,
-                                Bindable = Model.FullName
+                                Current = Model.FullName
                             },
                             new SettingsTextBox
                             {
                                 LabelText = "Acronym",
                                 Width = 0.2f,
-                                Bindable = Model.Acronym
+                                Current = Model.Acronym
                             },
                             new SettingsTextBox
                             {
                                 LabelText = "Flag",
                                 Width = 0.2f,
-                                Bindable = Model.FlagName
+                                Current = Model.FlagName
                             },
                             new SettingsTextBox
                             {
                                 LabelText = "Seed",
                                 Width = 0.2f,
-                                Bindable = Model.Seed
+                                Current = Model.Seed
                             },
                             new SettingsSlider<int>
                             {
                                 LabelText = "Last Year Placement",
                                 Width = 0.33f,
-                                Bindable = Model.LastYearPlacing
+                                Current = Model.LastYearPlacing
                             },
                             new SettingsButton
                             {
@@ -247,7 +247,7 @@ namespace osu.Game.Tournament.Screens.Editors
                                         LabelText = "User ID",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = userId,
+                                        Current = userId,
                                     },
                                     drawableContainer = new Container
                                     {
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index e4e3842369..e4ec45c00e 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -113,13 +113,13 @@ namespace osu.Game.Tournament.Screens.Gameplay
                         new SettingsSlider<int>
                         {
                             LabelText = "Chroma width",
-                            Bindable = LadderInfo.ChromaKeyWidth,
+                            Current = LadderInfo.ChromaKeyWidth,
                             KeyboardStep = 1,
                         },
                         new SettingsSlider<int>
                         {
                             LabelText = "Players per team",
-                            Bindable = LadderInfo.PlayersPerTeam,
+                            Current = LadderInfo.PlayersPerTeam,
                             KeyboardStep = 1,
                         }
                     }
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index b60eb814e5..cf4466a2e3 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -51,15 +51,15 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 
             editorInfo.Selected.ValueChanged += selection =>
             {
-                roundDropdown.Bindable = selection.NewValue?.Round;
+                roundDropdown.Current = selection.NewValue?.Round;
                 losersCheckbox.Current = selection.NewValue?.Losers;
-                dateTimeBox.Bindable = selection.NewValue?.Date;
+                dateTimeBox.Current = selection.NewValue?.Date;
 
-                team1Dropdown.Bindable = selection.NewValue?.Team1;
-                team2Dropdown.Bindable = selection.NewValue?.Team2;
+                team1Dropdown.Current = selection.NewValue?.Team1;
+                team2Dropdown.Current = selection.NewValue?.Team2;
             };
 
-            roundDropdown.Bindable.ValueChanged += round =>
+            roundDropdown.Current.ValueChanged += round =>
             {
                 if (editorInfo.Selected.Value?.Date.Value < round.NewValue?.StartDate.Value)
                 {
@@ -88,7 +88,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         {
             public SettingsRoundDropdown(BindableList<TournamentRound> rounds)
             {
-                Bindable = new Bindable<TournamentRound>();
+                Current = new Bindable<TournamentRound>();
 
                 foreach (var r in rounds.Prepend(new TournamentRound()))
                     add(r);
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index eed3cac9f0..b343608e69 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                         new SettingsTeamDropdown(LadderInfo.Teams)
                         {
                             LabelText = "Show specific team",
-                            Bindable = currentTeam,
+                            Current = currentTeam,
                         }
                     }
                 }
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index fe487cb1d0..50069be4b2 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<float>
                         {
                             LabelText = attr.Label,
-                            Bindable = bNumber,
+                            Current = bNumber,
                             KeyboardStep = 0.1f,
                         };
 
@@ -67,7 +67,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<double>
                         {
                             LabelText = attr.Label,
-                            Bindable = bNumber,
+                            Current = bNumber,
                             KeyboardStep = 0.1f,
                         };
 
@@ -77,7 +77,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<int>
                         {
                             LabelText = attr.Label,
-                            Bindable = bNumber
+                            Current = bNumber
                         };
 
                         break;
@@ -86,7 +86,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsCheckbox
                         {
                             LabelText = attr.Label,
-                            Bindable = bBool
+                            Current = bBool
                         };
 
                         break;
@@ -95,7 +95,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsTextBox
                         {
                             LabelText = attr.Label,
-                            Bindable = bString
+                            Current = bString
                         };
 
                         break;
@@ -105,7 +105,7 @@ namespace osu.Game.Configuration
                         var dropdown = (Drawable)Activator.CreateInstance(dropdownType);
 
                         dropdownType.GetProperty(nameof(SettingsDropdown<object>.LabelText))?.SetValue(dropdown, attr.Label);
-                        dropdownType.GetProperty(nameof(SettingsDropdown<object>.Bindable))?.SetValue(dropdown, bindable);
+                        dropdownType.GetProperty(nameof(SettingsDropdown<object>.Current))?.SetValue(dropdown, bindable);
 
                         yield return dropdown;
 
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
index 3da64e0de4..bed74542c9 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
 
             updateItems();
 
-            dropdown.Bindable = audio.AudioDevice;
+            dropdown.Current = audio.AudioDevice;
 
             audio.OnNewDevice += onDeviceChanged;
             audio.OnLostDevice += onDeviceChanged;
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
index a303f93b34..d5de32ed05 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
@@ -21,23 +21,23 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                 new SettingsCheckbox
                 {
                     LabelText = "Interface voices",
-                    Bindable = config.GetBindable<bool>(OsuSetting.MenuVoice)
+                    Current = config.GetBindable<bool>(OsuSetting.MenuVoice)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "osu! music theme",
-                    Bindable = config.GetBindable<bool>(OsuSetting.MenuMusic)
+                    Current = config.GetBindable<bool>(OsuSetting.MenuMusic)
                 },
                 new SettingsDropdown<IntroSequence>
                 {
                     LabelText = "Intro sequence",
-                    Bindable = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence),
+                    Current = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence),
                     Items = Enum.GetValues(typeof(IntroSequence)).Cast<IntroSequence>()
                 },
                 new SettingsDropdown<BackgroundSource>
                 {
                     LabelText = "Background source",
-                    Bindable = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
+                    Current = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
                     Items = Enum.GetValues(typeof(BackgroundSource)).Cast<BackgroundSource>()
                 }
             };
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
index aaa4302553..c9a81b955b 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                 new SettingsSlider<double, OffsetSlider>
                 {
                     LabelText = "Audio offset",
-                    Bindable = config.GetBindable<double>(OsuSetting.AudioOffset),
+                    Current = config.GetBindable<double>(OsuSetting.AudioOffset),
                     KeyboardStep = 1f
                 },
                 new SettingsButton
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
index bda677ecd6..c172a76ab9 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
@@ -20,28 +20,28 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                 new SettingsSlider<double>
                 {
                     LabelText = "Master",
-                    Bindable = audio.Volume,
+                    Current = audio.Volume,
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
                 new SettingsSlider<double>
                 {
                     LabelText = "Master (window inactive)",
-                    Bindable = config.GetBindable<double>(OsuSetting.VolumeInactive),
+                    Current = config.GetBindable<double>(OsuSetting.VolumeInactive),
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
                 new SettingsSlider<double>
                 {
                     LabelText = "Effect",
-                    Bindable = audio.VolumeSample,
+                    Current = audio.VolumeSample,
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
                 new SettingsSlider<double>
                 {
                     LabelText = "Music",
-                    Bindable = audio.VolumeTrack,
+                    Current = audio.VolumeTrack,
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
index 9edb18e065..f05b876d8f 100644
--- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
@@ -19,12 +19,12 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
                 new SettingsCheckbox
                 {
                     LabelText = "Show log overlay",
-                    Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowLogOverlay)
+                    Current = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowLogOverlay)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Bypass front-to-back render pass",
-                    Bindable = config.GetBindable<bool>(DebugSetting.BypassFrontToBackPass)
+                    Current = config.GetBindable<bool>(DebugSetting.BypassFrontToBackPass)
                 }
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 0149e6c3a6..73968761e2 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -21,62 +21,62 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 new SettingsSlider<double>
                 {
                     LabelText = "Background dim",
-                    Bindable = config.GetBindable<double>(OsuSetting.DimLevel),
+                    Current = config.GetBindable<double>(OsuSetting.DimLevel),
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
                 new SettingsSlider<double>
                 {
                     LabelText = "Background blur",
-                    Bindable = config.GetBindable<double>(OsuSetting.BlurLevel),
+                    Current = config.GetBindable<double>(OsuSetting.BlurLevel),
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Lighten playfield during breaks",
-                    Bindable = config.GetBindable<bool>(OsuSetting.LightenDuringBreaks)
+                    Current = config.GetBindable<bool>(OsuSetting.LightenDuringBreaks)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show score overlay",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowInterface)
+                    Current = config.GetBindable<bool>(OsuSetting.ShowInterface)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show difficulty graph on progress bar",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowProgressGraph)
+                    Current = config.GetBindable<bool>(OsuSetting.ShowProgressGraph)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show health display even when you can't fail",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowHealthDisplayWhenCantFail),
+                    Current = config.GetBindable<bool>(OsuSetting.ShowHealthDisplayWhenCantFail),
                     Keywords = new[] { "hp", "bar" }
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Fade playfield to red when health is low",
-                    Bindable = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow),
+                    Current = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow),
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Always show key overlay",
-                    Bindable = config.GetBindable<bool>(OsuSetting.KeyOverlay)
+                    Current = config.GetBindable<bool>(OsuSetting.KeyOverlay)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Positional hitsounds",
-                    Bindable = config.GetBindable<bool>(OsuSetting.PositionalHitSounds)
+                    Current = config.GetBindable<bool>(OsuSetting.PositionalHitSounds)
                 },
                 new SettingsEnumDropdown<ScoreMeterType>
                 {
                     LabelText = "Score meter type",
-                    Bindable = config.GetBindable<ScoreMeterType>(OsuSetting.ScoreMeter)
+                    Current = config.GetBindable<ScoreMeterType>(OsuSetting.ScoreMeter)
                 },
                 new SettingsEnumDropdown<ScoringMode>
                 {
                     LabelText = "Score display mode",
-                    Bindable = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode)
+                    Current = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode)
                 }
             };
 
@@ -85,7 +85,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 Add(new SettingsCheckbox
                 {
                     LabelText = "Disable Windows key during gameplay",
-                    Bindable = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey)
+                    Current = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey)
                 });
             }
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
index 0babb98066..2b2fb9cef7 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 new SettingsCheckbox
                 {
                     LabelText = "Increase visibility of first object when visual impairment mods are enabled",
-                    Bindable = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility),
+                    Current = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility),
                 },
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
index 0c42247993..b26876556e 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
@@ -31,31 +31,31 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 new SettingsCheckbox
                 {
                     LabelText = "Right mouse drag to absolute scroll",
-                    Bindable = config.GetBindable<bool>(OsuSetting.SongSelectRightMouseScroll),
+                    Current = config.GetBindable<bool>(OsuSetting.SongSelectRightMouseScroll),
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show converted beatmaps",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
+                    Current = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
                 },
                 new SettingsSlider<double, StarsSlider>
                 {
                     LabelText = "Display beatmaps from",
-                    Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum),
+                    Current = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum),
                     KeyboardStep = 0.1f,
                     Keywords = new[] { "minimum", "maximum", "star", "difficulty" }
                 },
                 new SettingsSlider<double, MaximumStarsSlider>
                 {
                     LabelText = "up to",
-                    Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum),
+                    Current = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum),
                     KeyboardStep = 0.1f,
                     Keywords = new[] { "minimum", "maximum", "star", "difficulty" }
                 },
                 new SettingsEnumDropdown<RandomSelectAlgorithm>
                 {
                     LabelText = "Random selection algorithm",
-                    Bindable = config.GetBindable<RandomSelectAlgorithm>(OsuSetting.RandomSelectAlgorithm),
+                    Current = config.GetBindable<RandomSelectAlgorithm>(OsuSetting.RandomSelectAlgorithm),
                 }
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
index 236bfbecc3..44e42ecbfe 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 new SettingsCheckbox
                 {
                     LabelText = "Prefer metadata in original language",
-                    Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowUnicode)
+                    Current = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowUnicode)
                 },
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index f96e204f62..9e358d0cf5 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -240,12 +240,12 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     new SettingsCheckbox
                     {
                         LabelText = "Remember username",
-                        Bindable = config.GetBindable<bool>(OsuSetting.SaveUsername),
+                        Current = config.GetBindable<bool>(OsuSetting.SaveUsername),
                     },
                     new SettingsCheckbox
                     {
                         LabelText = "Stay signed in",
-                        Bindable = config.GetBindable<bool>(OsuSetting.SavePassword),
+                        Current = config.GetBindable<bool>(OsuSetting.SavePassword),
                     },
                     new Container
                     {
diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 9c7d0b0be4..a59a6b00b9 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
             Add(new SettingsEnumDropdown<ReleaseStream>
             {
                 LabelText = "Release stream",
-                Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
+                Current = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
             if (updateManager?.CanCheckForUpdate == true)
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
index 3089040f96..30caa45995 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
@@ -19,22 +19,22 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 new SettingsCheckbox
                 {
                     LabelText = "Storyboard / Video",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowStoryboard)
+                    Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Hit Lighting",
-                    Bindable = config.GetBindable<bool>(OsuSetting.HitLighting)
+                    Current = config.GetBindable<bool>(OsuSetting.HitLighting)
                 },
                 new SettingsEnumDropdown<ScreenshotFormat>
                 {
                     LabelText = "Screenshot format",
-                    Bindable = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat)
+                    Current = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show menu cursor in screenshots",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ScreenshotCaptureMenuCursor)
+                    Current = config.GetBindable<bool>(OsuSetting.ScreenshotCaptureMenuCursor)
                 }
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 4312b319c0..14b8dbfac0 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 windowModeDropdown = new SettingsDropdown<WindowMode>
                 {
                     LabelText = "Screen mode",
-                    Bindable = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
+                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
                     ItemSource = windowModes,
                 },
                 resolutionSettingsContainer = new Container
@@ -74,14 +74,14 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 {
                     LabelText = "UI Scaling",
                     TransferValueOnCommit = true,
-                    Bindable = osuConfig.GetBindable<float>(OsuSetting.UIScale),
+                    Current = osuConfig.GetBindable<float>(OsuSetting.UIScale),
                     KeyboardStep = 0.01f,
                     Keywords = new[] { "scale", "letterbox" },
                 },
                 new SettingsEnumDropdown<ScalingMode>
                 {
                     LabelText = "Screen Scaling",
-                    Bindable = osuConfig.GetBindable<ScalingMode>(OsuSetting.Scaling),
+                    Current = osuConfig.GetBindable<ScalingMode>(OsuSetting.Scaling),
                     Keywords = new[] { "scale", "letterbox" },
                 },
                 scalingSettings = new FillFlowContainer<SettingsSlider<float>>
@@ -97,28 +97,28 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                         new SettingsSlider<float>
                         {
                             LabelText = "Horizontal position",
-                            Bindable = scalingPositionX,
+                            Current = scalingPositionX,
                             KeyboardStep = 0.01f,
                             DisplayAsPercentage = true
                         },
                         new SettingsSlider<float>
                         {
                             LabelText = "Vertical position",
-                            Bindable = scalingPositionY,
+                            Current = scalingPositionY,
                             KeyboardStep = 0.01f,
                             DisplayAsPercentage = true
                         },
                         new SettingsSlider<float>
                         {
                             LabelText = "Horizontal scale",
-                            Bindable = scalingSizeX,
+                            Current = scalingSizeX,
                             KeyboardStep = 0.01f,
                             DisplayAsPercentage = true
                         },
                         new SettingsSlider<float>
                         {
                             LabelText = "Vertical scale",
-                            Bindable = scalingSizeY,
+                            Current = scalingSizeY,
                             KeyboardStep = 0.01f,
                             DisplayAsPercentage = true
                         },
@@ -126,7 +126,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 },
             };
 
-            scalingSettings.ForEach(s => bindPreviewEvent(s.Bindable));
+            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
 
             var resolutions = getResolutions();
 
@@ -137,10 +137,10 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     LabelText = "Resolution",
                     ShowsDefaultIndicator = false,
                     Items = resolutions,
-                    Bindable = sizeFullscreen
+                    Current = sizeFullscreen
                 };
 
-                windowModeDropdown.Bindable.BindValueChanged(mode =>
+                windowModeDropdown.Current.BindValueChanged(mode =>
                 {
                     if (mode.NewValue == WindowMode.Fullscreen)
                     {
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index 69ff9b43e5..8773e6763c 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -23,17 +23,17 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 new SettingsEnumDropdown<FrameSync>
                 {
                     LabelText = "Frame limiter",
-                    Bindable = config.GetBindable<FrameSync>(FrameworkSetting.FrameSync)
+                    Current = config.GetBindable<FrameSync>(FrameworkSetting.FrameSync)
                 },
                 new SettingsEnumDropdown<ExecutionMode>
                 {
                     LabelText = "Threading mode",
-                    Bindable = config.GetBindable<ExecutionMode>(FrameworkSetting.ExecutionMode)
+                    Current = config.GetBindable<ExecutionMode>(FrameworkSetting.ExecutionMode)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show FPS",
-                    Bindable = osuConfig.GetBindable<bool>(OsuSetting.ShowFpsDisplay)
+                    Current = osuConfig.GetBindable<bool>(OsuSetting.ShowFpsDisplay)
                 },
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
index a8953ac3a2..38c30ddd64 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
@@ -20,17 +20,17 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 new SettingsCheckbox
                 {
                     LabelText = "Rotate cursor when dragging",
-                    Bindable = config.GetBindable<bool>(OsuSetting.CursorRotation)
+                    Current = config.GetBindable<bool>(OsuSetting.CursorRotation)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Parallax",
-                    Bindable = config.GetBindable<bool>(OsuSetting.MenuParallax)
+                    Current = config.GetBindable<bool>(OsuSetting.MenuParallax)
                 },
                 new SettingsSlider<float, TimeSlider>
                 {
                     LabelText = "Hold-to-confirm activation time",
-                    Bindable = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
+                    Current = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
                     KeyboardStep = 50
                 },
             };
diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index d27ab63fb7..5227e328ec 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -35,32 +35,32 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 new SettingsCheckbox
                 {
                     LabelText = "Raw input",
-                    Bindable = rawInputToggle
+                    Current = rawInputToggle
                 },
                 new SensitivitySetting
                 {
                     LabelText = "Cursor sensitivity",
-                    Bindable = sensitivityBindable
+                    Current = sensitivityBindable
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Map absolute input to window",
-                    Bindable = config.GetBindable<bool>(FrameworkSetting.MapAbsoluteInputToWindow)
+                    Current = config.GetBindable<bool>(FrameworkSetting.MapAbsoluteInputToWindow)
                 },
                 new SettingsEnumDropdown<ConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor to window",
-                    Bindable = config.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode),
+                    Current = config.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode),
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Disable mouse wheel during gameplay",
-                    Bindable = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableWheel)
+                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableWheel)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Disable mouse buttons during gameplay",
-                    Bindable = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
+                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
                 },
             };
 
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index 23513eade8..6461bd7b93 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -19,13 +19,13 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                 new SettingsCheckbox
                 {
                     LabelText = "Warn about opening external links",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ExternalLinkWarning)
+                    Current = config.GetBindable<bool>(OsuSetting.ExternalLinkWarning)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Prefer downloads without video",
                     Keywords = new[] { "no-video" },
-                    Bindable = config.GetBindable<bool>(OsuSetting.PreferNoVideo)
+                    Current = config.GetBindable<bool>(OsuSetting.PreferNoVideo)
                 },
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 596d3a9801..1ade4befdc 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -47,29 +47,29 @@ namespace osu.Game.Overlays.Settings.Sections
                 new SettingsSlider<float, SizeSlider>
                 {
                     LabelText = "Menu cursor size",
-                    Bindable = config.GetBindable<float>(OsuSetting.MenuCursorSize),
+                    Current = config.GetBindable<float>(OsuSetting.MenuCursorSize),
                     KeyboardStep = 0.01f
                 },
                 new SettingsSlider<float, SizeSlider>
                 {
                     LabelText = "Gameplay cursor size",
-                    Bindable = config.GetBindable<float>(OsuSetting.GameplayCursorSize),
+                    Current = config.GetBindable<float>(OsuSetting.GameplayCursorSize),
                     KeyboardStep = 0.01f
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Adjust gameplay cursor size based on current beatmap",
-                    Bindable = config.GetBindable<bool>(OsuSetting.AutoCursorSize)
+                    Current = config.GetBindable<bool>(OsuSetting.AutoCursorSize)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Beatmap skins",
-                    Bindable = config.GetBindable<bool>(OsuSetting.BeatmapSkins)
+                    Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Beatmap hitsounds",
-                    Bindable = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds)
+                    Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds)
                 },
             };
 
@@ -81,7 +81,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
             config.BindWith(OsuSetting.Skin, configBindable);
 
-            skinDropdown.Bindable = dropdownBindable;
+            skinDropdown.Current = dropdownBindable;
             skinDropdown.Items = skins.GetAllUsableSkins().ToArray();
 
             // Todo: This should not be necessary when OsuConfigManager is databased
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index c2dd40d2a6..ad6aaafd9d 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -21,7 +21,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Settings
 {
-    public abstract class SettingsItem<T> : Container, IFilterable, ISettingsItem
+    public abstract class SettingsItem<T> : Container, IFilterable, ISettingsItem, IHasCurrentValue<T>
     {
         protected abstract Drawable CreateControl();
 
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
-        public virtual Bindable<T> Bindable
+        public virtual Bindable<T> Current
         {
             get => controlWithCurrent.Current;
             set => controlWithCurrent.Current = value;
diff --git a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
index d5afc8978d..f2f9f76143 100644
--- a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
+++ b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
@@ -11,7 +11,7 @@ using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    internal class SliderWithTextBoxInput<T> : CompositeDrawable, IHasCurrentValue<T>
+    public class SliderWithTextBoxInput<T> : CompositeDrawable, IHasCurrentValue<T>
         where T : struct, IEquatable<T>, IComparable<T>, IConvertible
     {
         private readonly SettingsSlider<T> slider;
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Edit.Timing
 
                 try
                 {
-                    slider.Bindable.Parse(t.Text);
+                    slider.Current.Parse(t.Text);
                 }
                 catch
                 {
@@ -71,8 +71,8 @@ namespace osu.Game.Screens.Edit.Timing
 
         public Bindable<T> Current
         {
-            get => slider.Bindable;
-            set => slider.Bindable = value;
+            get => slider.Current;
+            set => slider.Current = value;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index 2ab8703cc4..1ae2a86885 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -36,14 +36,14 @@ namespace osu.Game.Screens.Edit.Timing
         {
             if (point.NewValue != null)
             {
-                bpmSlider.Bindable = point.NewValue.BeatLengthBindable;
-                bpmSlider.Bindable.BindValueChanged(_ => ChangeHandler?.SaveState());
+                bpmSlider.Current = point.NewValue.BeatLengthBindable;
+                bpmSlider.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
 
                 bpmTextEntry.Bindable = point.NewValue.BeatLengthBindable;
                 // no need to hook change handler here as it's the same bindable as above
 
-                timeSignature.Bindable = point.NewValue.TimeSignatureBindable;
-                timeSignature.Bindable.BindValueChanged(_ => ChangeHandler?.SaveState());
+                timeSignature.Current = point.NewValue.TimeSignatureBindable;
+                timeSignature.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }
 
@@ -121,14 +121,14 @@ namespace osu.Game.Screens.Edit.Timing
                 beatLengthBindable.BindValueChanged(beatLength => updateCurrent(beatLengthToBpm(beatLength.NewValue)), true);
                 bpmBindable.BindValueChanged(bpm => beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue));
 
-                base.Bindable = bpmBindable;
+                base.Current = bpmBindable;
 
                 TransferValueOnCommit = true;
             }
 
-            public override Bindable<double> Bindable
+            public override Bindable<double> Current
             {
-                get => base.Bindable;
+                get => base.Current;
                 set
                 {
                     // incoming will be beat length, not bpm
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
index 24ddc277cd..16e29ac3c8 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
@@ -51,14 +51,14 @@ namespace osu.Game.Screens.Play.PlayerSettings
                         }
                     },
                 },
-                rateSlider = new PlayerSliderBar<double> { Bindable = UserPlaybackRate }
+                rateSlider = new PlayerSliderBar<double> { Current = UserPlaybackRate }
             };
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            rateSlider.Bindable.BindValueChanged(multiplier => multiplierText.Text = $"{multiplier.NewValue:0.0}x", true);
+            rateSlider.Current.BindValueChanged(multiplier => multiplierText.Text = $"{multiplier.NewValue:0.0}x", true);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
index e06cf5c6d5..8f29fe7893 100644
--- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
@@ -50,8 +50,8 @@ namespace osu.Game.Screens.Play.PlayerSettings
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            dimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.DimLevel);
-            blurSliderBar.Bindable = config.GetBindable<double>(OsuSetting.BlurLevel);
+            dimSliderBar.Current = config.GetBindable<double>(OsuSetting.DimLevel);
+            blurSliderBar.Current = config.GetBindable<double>(OsuSetting.BlurLevel);
             showStoryboardToggle.Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
             beatmapSkinsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
             beatmapHitsoundsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);

From 28756d862b630eb5b28eecf8c9373dfca97be24b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 14:22:53 +0900
Subject: [PATCH 05207/10326] Add placeholder text/colour when no beatmap
 background is specified yet

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs | 27 ++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 3d94737e59..1e9ebec41d 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -59,8 +59,11 @@ namespace osu.Game.Screens.Edit.Setup
         {
         }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             Container audioTrackFileChooserContainer = new Container
             {
@@ -187,7 +190,27 @@ namespace osu.Game.Screens.Edit.Setup
                 FillMode = FillMode.Fill,
             }, background =>
             {
-                backgroundSpriteContainer.Child = background;
+                if (background.Texture != null)
+                    backgroundSpriteContainer.Child = background;
+                else
+                {
+                    backgroundSpriteContainer.Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colours.GreySeafoamDarker,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 24))
+                        {
+                            Text = "Drag image here to set beatmap background!",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            AutoSizeAxes = Axes.X,
+                        }
+                    };
+                }
+
                 background.FadeInFromZero(500);
             });
         }

From 87bf3bdc161a601893e25ab7899ab2151952e39f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 16:40:47 +0900
Subject: [PATCH 05208/10326] Add the most basic implementation of
 LabelledSliderBar feasible

---
 .../TestSceneLabelledSliderBar.cs             | 46 +++++++++++++++++++
 .../UserInterfaceV2/LabelledSliderBar.cs      | 24 ++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.cs
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.cs
new file mode 100644
index 0000000000..393420e700
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.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 NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterfaceV2;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneLabelledSliderBar : OsuTestScene
+    {
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestSliderBar(bool hasDescription) => createSliderBar(hasDescription);
+
+        private void createSliderBar(bool hasDescription = false)
+        {
+            AddStep("create component", () =>
+            {
+                LabelledSliderBar<double> component;
+
+                Child = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 500,
+                    AutoSizeAxes = Axes.Y,
+                    Child = component = new LabelledSliderBar<double>
+                    {
+                        Current = new BindableDouble(5)
+                        {
+                            MinValue = 0,
+                            MaxValue = 10,
+                            Precision = 1,
+                        }
+                    }
+                };
+
+                component.Label = "a sample component";
+                component.Description = hasDescription ? "this text describes the component" : string.Empty;
+            });
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs
new file mode 100644
index 0000000000..cba94e314b
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.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 System;
+using osu.Framework.Graphics;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    public class LabelledSliderBar<TNumber> : LabelledComponent<SettingsSlider<TNumber>, TNumber>
+        where TNumber : struct, IEquatable<TNumber>, IComparable<TNumber>, IConvertible
+    {
+        public LabelledSliderBar()
+            : base(true)
+        {
+        }
+
+        protected override SettingsSlider<TNumber> CreateComponent() => new SettingsSlider<TNumber>
+        {
+            TransferValueOnCommit = true,
+            RelativeSizeAxes = Axes.X,
+        };
+    }
+}

From 98fe5f78ee956d3765324a1d8482fb1945a63673 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 15:17:15 +0900
Subject: [PATCH 05209/10326] Split setup screen up into sections (and use a
 SectionContainer)

---
 .../Editing/TestSceneEditorBeatmapCreation.cs |   2 +-
 .../Edit/Setup/FileChooserLabelledTextBox.cs  |  73 ++++
 .../Screens/Edit/Setup/MetadataSection.cs     |  71 ++++
 .../Screens/Edit/Setup/ResourcesSection.cs    | 211 ++++++++++++
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    | 319 +-----------------
 osu.Game/Screens/Edit/Setup/SetupSection.cs   |  43 +++
 6 files changed, 417 insertions(+), 302 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
 create mode 100644 osu.Game/Screens/Edit/Setup/MetadataSection.cs
 create mode 100644 osu.Game/Screens/Edit/Setup/ResourcesSection.cs
 create mode 100644 osu.Game/Screens/Edit/Setup/SetupSection.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 13a3195824..7584c74c71 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.Editing
                 using (var zip = ZipArchive.Open(temp))
                     zip.WriteToDirectory(extractedFolder);
 
-                bool success = setup.ChangeAudioTrack(Path.Combine(extractedFolder, "03. Renatus - Soleily 192kbps.mp3"));
+                bool success = setup.ChildrenOfType<ResourcesSection>().First().ChangeAudioTrack(Path.Combine(extractedFolder, "03. Renatus - Soleily 192kbps.mp3"));
 
                 File.Delete(temp);
                 Directory.Delete(extractedFolder, true);
diff --git a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
new file mode 100644
index 0000000000..b802b3405a
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.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 System.IO;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    /// <summary>
+    /// A labelled textbox which reveals an inline file chooser when clicked.
+    /// </summary>
+    internal class FileChooserLabelledTextBox : LabelledTextBox
+    {
+        public Container Target;
+
+        private readonly IBindable<FileInfo> currentFile = new Bindable<FileInfo>();
+
+        public FileChooserLabelledTextBox()
+        {
+            currentFile.BindValueChanged(onFileSelected);
+        }
+
+        private void onFileSelected(ValueChangedEvent<FileInfo> file)
+        {
+            if (file.NewValue == null)
+                return;
+
+            Target.Clear();
+            Current.Value = file.NewValue.FullName;
+        }
+
+        protected override OsuTextBox CreateTextBox() =>
+            new FileChooserOsuTextBox
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.X,
+                CornerRadius = CORNER_RADIUS,
+                OnFocused = DisplayFileChooser
+            };
+
+        public void DisplayFileChooser()
+        {
+            Target.Child = new FileSelector(validFileExtensions: ResourcesSection.AudioExtensions)
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = 400,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                CurrentFile = { BindTarget = currentFile }
+            };
+        }
+
+        internal class FileChooserOsuTextBox : OsuTextBox
+        {
+            public Action OnFocused;
+
+            protected override void OnFocus(FocusEvent e)
+            {
+                OnFocused?.Invoke();
+                base.OnFocus(e);
+
+                GetContainingInputManager().TriggerFocusContention(this);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
new file mode 100644
index 0000000000..31a2c2ce1a
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterfaceV2;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    internal class MetadataSection : SetupSection
+    {
+        private LabelledTextBox artistTextBox;
+        private LabelledTextBox titleTextBox;
+        private LabelledTextBox creatorTextBox;
+        private LabelledTextBox difficultyTextBox;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Flow.Children = new Drawable[]
+            {
+                new OsuSpriteText
+                {
+                    Text = "Beatmap metadata"
+                },
+                artistTextBox = new LabelledTextBox
+                {
+                    Label = "Artist",
+                    Current = { Value = Beatmap.Value.Metadata.Artist },
+                    TabbableContentContainer = this
+                },
+                titleTextBox = new LabelledTextBox
+                {
+                    Label = "Title",
+                    Current = { Value = Beatmap.Value.Metadata.Title },
+                    TabbableContentContainer = this
+                },
+                creatorTextBox = new LabelledTextBox
+                {
+                    Label = "Creator",
+                    Current = { Value = Beatmap.Value.Metadata.AuthorString },
+                    TabbableContentContainer = this
+                },
+                difficultyTextBox = new LabelledTextBox
+                {
+                    Label = "Difficulty Name",
+                    Current = { Value = Beatmap.Value.BeatmapInfo.Version },
+                    TabbableContentContainer = this
+                },
+            };
+
+            foreach (var item in Flow.OfType<LabelledTextBox>())
+                item.OnCommit += onCommit;
+        }
+
+        private void onCommit(TextBox sender, bool newText)
+        {
+            if (!newText) return;
+
+            // for now, update these on commit rather than making BeatmapMetadata bindables.
+            // after switching database engines we can reconsider if switching to bindables is a good direction.
+            Beatmap.Value.Metadata.Artist = artistTextBox.Current.Value;
+            Beatmap.Value.Metadata.Title = titleTextBox.Current.Value;
+            Beatmap.Value.Metadata.AuthorString = creatorTextBox.Current.Value;
+            Beatmap.Value.BeatmapInfo.Version = difficultyTextBox.Current.Value;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
new file mode 100644
index 0000000000..86d7968856
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -0,0 +1,211 @@
+// Copyright (c) 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.IO;
+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.Graphics.Shapes;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Database;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Overlays;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    internal class ResourcesSection : SetupSection, ICanAcceptFiles
+    {
+        private LabelledTextBox audioTrackTextBox;
+        private Container backgroundSpriteContainer;
+
+        public IEnumerable<string> HandledExtensions => ImageExtensions.Concat(AudioExtensions);
+
+        public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
+
+        public static string[] AudioExtensions { get; } = { ".mp3", ".ogg" };
+
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
+        [Resolved]
+        private MusicController music { get; set; }
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Resolved(canBeNull: true)]
+        private Editor editor { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Container audioTrackFileChooserContainer = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+            };
+
+            Flow.Children = new Drawable[]
+            {
+                backgroundSpriteContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 250,
+                    Masking = true,
+                    CornerRadius = 10,
+                },
+                new OsuSpriteText
+                {
+                    Text = "Resources"
+                },
+                audioTrackTextBox = new FileChooserLabelledTextBox
+                {
+                    Label = "Audio Track",
+                    Current = { Value = Beatmap.Value.Metadata.AudioFile ?? "Click to select a track" },
+                    Target = audioTrackFileChooserContainer,
+                    TabbableContentContainer = this
+                },
+                audioTrackFileChooserContainer,
+            };
+
+            updateBackgroundSprite();
+
+            audioTrackTextBox.Current.BindValueChanged(audioTrackChanged);
+        }
+
+        Task ICanAcceptFiles.Import(params string[] paths)
+        {
+            Schedule(() =>
+            {
+                var firstFile = new FileInfo(paths.First());
+
+                if (ImageExtensions.Contains(firstFile.Extension))
+                {
+                    ChangeBackgroundImage(firstFile.FullName);
+                }
+                else if (AudioExtensions.Contains(firstFile.Extension))
+                {
+                    audioTrackTextBox.Text = firstFile.FullName;
+                }
+            });
+            return Task.CompletedTask;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            game.RegisterImportHandler(this);
+        }
+
+        public bool ChangeBackgroundImage(string path)
+        {
+            var info = new FileInfo(path);
+
+            if (!info.Exists)
+                return false;
+
+            var set = Beatmap.Value.BeatmapSetInfo;
+
+            // remove the previous background for now.
+            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.BackgroundFile);
+
+            using (var stream = info.OpenRead())
+            {
+                if (oldFile != null)
+                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
+                else
+                    beatmaps.AddFile(set, stream, info.Name);
+            }
+
+            Beatmap.Value.Metadata.BackgroundFile = info.Name;
+            updateBackgroundSprite();
+
+            return true;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            game?.UnregisterImportHandler(this);
+        }
+
+        public bool ChangeAudioTrack(string path)
+        {
+            var info = new FileInfo(path);
+
+            if (!info.Exists)
+                return false;
+
+            var set = Beatmap.Value.BeatmapSetInfo;
+
+            // remove the previous audio track for now.
+            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.AudioFile);
+
+            using (var stream = info.OpenRead())
+            {
+                if (oldFile != null)
+                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
+                else
+                    beatmaps.AddFile(set, stream, info.Name);
+            }
+
+            Beatmap.Value.Metadata.AudioFile = info.Name;
+
+            music.ReloadCurrentTrack();
+
+            editor?.UpdateClockSource();
+            return true;
+        }
+
+        private void audioTrackChanged(ValueChangedEvent<string> filePath)
+        {
+            if (!ChangeAudioTrack(filePath.NewValue))
+                audioTrackTextBox.Current.Value = filePath.OldValue;
+        }
+
+        private void updateBackgroundSprite()
+        {
+            LoadComponentAsync(new BeatmapBackgroundSprite(Beatmap.Value)
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                FillMode = FillMode.Fill,
+            }, background =>
+            {
+                if (background.Texture != null)
+                    backgroundSpriteContainer.Child = background;
+                else
+                {
+                    backgroundSpriteContainer.Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = Colours.GreySeafoamDarker,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 24))
+                        {
+                            Text = "Drag image here to set beatmap background!",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            AutoSizeAxes = Axes.X,
+                        }
+                    };
+                }
+
+                background.FadeInFromZero(500);
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 1e9ebec41d..cd4f6733c0 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -1,76 +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 System.IO;
-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.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
-using osuTK;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    public class SetupScreen : EditorScreen, ICanAcceptFiles
+    public class SetupScreen : EditorScreen
     {
-        public IEnumerable<string> HandledExtensions => ImageExtensions.Concat(AudioExtensions);
-
-        public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
-
-        public static string[] AudioExtensions { get; } = { ".mp3", ".ogg" };
-
-        private FillFlowContainer flow;
-        private LabelledTextBox artistTextBox;
-        private LabelledTextBox titleTextBox;
-        private LabelledTextBox creatorTextBox;
-        private LabelledTextBox difficultyTextBox;
-        private LabelledTextBox audioTrackTextBox;
-        private Container backgroundSpriteContainer;
-
         [Resolved]
-        private OsuGameBase game { get; set; }
+        private OsuColour colours { get; set; }
 
-        [Resolved]
-        private MusicController music { get; set; }
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        [Resolved(canBeNull: true)]
-        private Editor editor { get; set; }
+        [Cached]
+        protected readonly OverlayColourProvider ColourProvider;
 
         public SetupScreen()
             : base(EditorScreenMode.SongSetup)
         {
+            ColourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
         }
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            Container audioTrackFileChooserContainer = new Container
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-            };
-
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
@@ -87,273 +44,33 @@ namespace osu.Game.Screens.Edit.Setup
                             Colour = colours.GreySeafoamDark,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        new OsuScrollContainer
+                        new SectionsContainer<SetupSection>
                         {
+                            FixedHeader = new SetupScreenHeader(),
                             RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding(10),
-                            Child = flow = new FillFlowContainer
+                            Children = new SetupSection[]
                             {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Spacing = new Vector2(20),
-                                Direction = FillDirection.Vertical,
-                                Children = new Drawable[]
-                                {
-                                    backgroundSpriteContainer = new Container
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        Height = 250,
-                                        Masking = true,
-                                        CornerRadius = 10,
-                                    },
-                                    new OsuSpriteText
-                                    {
-                                        Text = "Resources"
-                                    },
-                                    audioTrackTextBox = new FileChooserLabelledTextBox
-                                    {
-                                        Label = "Audio Track",
-                                        Current = { Value = Beatmap.Value.Metadata.AudioFile ?? "Click to select a track" },
-                                        Target = audioTrackFileChooserContainer,
-                                        TabbableContentContainer = this
-                                    },
-                                    audioTrackFileChooserContainer,
-                                    new OsuSpriteText
-                                    {
-                                        Text = "Beatmap metadata"
-                                    },
-                                    artistTextBox = new LabelledTextBox
-                                    {
-                                        Label = "Artist",
-                                        Current = { Value = Beatmap.Value.Metadata.Artist },
-                                        TabbableContentContainer = this
-                                    },
-                                    titleTextBox = new LabelledTextBox
-                                    {
-                                        Label = "Title",
-                                        Current = { Value = Beatmap.Value.Metadata.Title },
-                                        TabbableContentContainer = this
-                                    },
-                                    creatorTextBox = new LabelledTextBox
-                                    {
-                                        Label = "Creator",
-                                        Current = { Value = Beatmap.Value.Metadata.AuthorString },
-                                        TabbableContentContainer = this
-                                    },
-                                    difficultyTextBox = new LabelledTextBox
-                                    {
-                                        Label = "Difficulty Name",
-                                        Current = { Value = Beatmap.Value.BeatmapInfo.Version },
-                                        TabbableContentContainer = this
-                                    },
-                                }
-                            },
+                                new ResourcesSection(),
+                                new MetadataSection(),
+                            }
                         },
                     }
                 }
             };
-
-            updateBackgroundSprite();
-
-            audioTrackTextBox.Current.BindValueChanged(audioTrackChanged);
-
-            foreach (var item in flow.OfType<LabelledTextBox>())
-                item.OnCommit += onCommit;
-        }
-
-        Task ICanAcceptFiles.Import(params string[] paths)
-        {
-            Schedule(() =>
-            {
-                var firstFile = new FileInfo(paths.First());
-
-                if (ImageExtensions.Contains(firstFile.Extension))
-                {
-                    ChangeBackgroundImage(firstFile.FullName);
-                }
-                else if (AudioExtensions.Contains(firstFile.Extension))
-                {
-                    audioTrackTextBox.Text = firstFile.FullName;
-                }
-            });
-
-            return Task.CompletedTask;
-        }
-
-        private void updateBackgroundSprite()
-        {
-            LoadComponentAsync(new BeatmapBackgroundSprite(Beatmap.Value)
-            {
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                FillMode = FillMode.Fill,
-            }, background =>
-            {
-                if (background.Texture != null)
-                    backgroundSpriteContainer.Child = background;
-                else
-                {
-                    backgroundSpriteContainer.Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = colours.GreySeafoamDarker,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 24))
-                        {
-                            Text = "Drag image here to set beatmap background!",
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.X,
-                        }
-                    };
-                }
-
-                background.FadeInFromZero(500);
-            });
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            game.RegisterImportHandler(this);
-        }
-
-        public bool ChangeBackgroundImage(string path)
-        {
-            var info = new FileInfo(path);
-
-            if (!info.Exists)
-                return false;
-
-            var set = Beatmap.Value.BeatmapSetInfo;
-
-            // remove the previous background for now.
-            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.BackgroundFile);
-
-            using (var stream = info.OpenRead())
-            {
-                if (oldFile != null)
-                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
-                else
-                    beatmaps.AddFile(set, stream, info.Name);
-            }
-
-            Beatmap.Value.Metadata.BackgroundFile = info.Name;
-            updateBackgroundSprite();
-
-            return true;
-        }
-
-        public bool ChangeAudioTrack(string path)
-        {
-            var info = new FileInfo(path);
-
-            if (!info.Exists)
-                return false;
-
-            var set = Beatmap.Value.BeatmapSetInfo;
-
-            // remove the previous audio track for now.
-            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.AudioFile);
-
-            using (var stream = info.OpenRead())
-            {
-                if (oldFile != null)
-                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
-                else
-                    beatmaps.AddFile(set, stream, info.Name);
-            }
-
-            Beatmap.Value.Metadata.AudioFile = info.Name;
-
-            music.ReloadCurrentTrack();
-
-            editor?.UpdateClockSource();
-            return true;
-        }
-
-        private void audioTrackChanged(ValueChangedEvent<string> filePath)
-        {
-            if (!ChangeAudioTrack(filePath.NewValue))
-                audioTrackTextBox.Current.Value = filePath.OldValue;
-        }
-
-        private void onCommit(TextBox sender, bool newText)
-        {
-            if (!newText) return;
-
-            // for now, update these on commit rather than making BeatmapMetadata bindables.
-            // after switching database engines we can reconsider if switching to bindables is a good direction.
-            Beatmap.Value.Metadata.Artist = artistTextBox.Current.Value;
-            Beatmap.Value.Metadata.Title = titleTextBox.Current.Value;
-            Beatmap.Value.Metadata.AuthorString = creatorTextBox.Current.Value;
-            Beatmap.Value.BeatmapInfo.Version = difficultyTextBox.Current.Value;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            game?.UnregisterImportHandler(this);
         }
     }
 
-    internal class FileChooserLabelledTextBox : LabelledTextBox
+    internal class SetupScreenHeader : OverlayHeader
     {
-        public Container Target;
+        protected override OverlayTitle CreateTitle() => new SetupScreenTitle();
 
-        private readonly IBindable<FileInfo> currentFile = new Bindable<FileInfo>();
-
-        public FileChooserLabelledTextBox()
+        private class SetupScreenTitle : OverlayTitle
         {
-            currentFile.BindValueChanged(onFileSelected);
-        }
-
-        private void onFileSelected(ValueChangedEvent<FileInfo> file)
-        {
-            if (file.NewValue == null)
-                return;
-
-            Target.Clear();
-            Current.Value = file.NewValue.FullName;
-        }
-
-        protected override OsuTextBox CreateTextBox() =>
-            new FileChooserOsuTextBox
+            public SetupScreenTitle()
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.X,
-                CornerRadius = CORNER_RADIUS,
-                OnFocused = DisplayFileChooser
-            };
-
-        public void DisplayFileChooser()
-        {
-            Target.Child = new FileSelector(validFileExtensions: SetupScreen.AudioExtensions)
-            {
-                RelativeSizeAxes = Axes.X,
-                Height = 400,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                CurrentFile = { BindTarget = currentFile }
-            };
-        }
-
-        internal class FileChooserOsuTextBox : OsuTextBox
-        {
-            public Action OnFocused;
-
-            protected override void OnFocus(FocusEvent e)
-            {
-                OnFocused?.Invoke();
-                base.OnFocus(e);
-
-                GetContainingInputManager().TriggerFocusContention(this);
+                Title = "beatmap setup";
+                Description = "change general settings of your beatmap";
+                IconTexture = "Icons/Hexacons/social";
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
new file mode 100644
index 0000000000..54e383a4d8
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.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.Beatmaps;
+using osu.Game.Graphics;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    internal class SetupSection : Container
+    {
+        protected FillFlowContainer Flow;
+
+        [Resolved]
+        protected OsuColour Colours { get; private set; }
+
+        [Resolved]
+        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
+
+        public override void Add(Drawable drawable) => throw new InvalidOperationException("Use Flow.Add instead");
+
+        public SetupSection()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Padding = new MarginPadding(10);
+
+            InternalChild = Flow = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(20),
+                Direction = FillDirection.Vertical,
+            };
+        }
+    }
+}

From 505dd37a75e98261394327771ffa764099716a73 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 17:18:41 +0900
Subject: [PATCH 05210/10326] Make SettingsItem conform to IHasCurrentValue

---
 .../ManiaSettingsSubsection.cs                |  4 ++--
 .../UI/OsuSettingsSubsection.cs               |  6 ++---
 osu.Game.Tournament/Components/DateTextBox.cs | 18 +++++++-------
 .../Screens/Editors/RoundEditorScreen.cs      | 12 +++++-----
 .../Screens/Editors/SeedingEditorScreen.cs    | 10 ++++----
 .../Screens/Editors/TeamEditorScreen.cs       | 12 +++++-----
 .../Screens/Gameplay/GameplayScreen.cs        |  4 ++--
 .../Ladder/Components/LadderEditorSettings.cs | 12 +++++-----
 .../Screens/TeamIntro/SeedingScreen.cs        |  2 +-
 .../Configuration/SettingSourceAttribute.cs   | 12 +++++-----
 .../Sections/Audio/AudioDevicesSettings.cs    |  2 +-
 .../Sections/Audio/MainMenuSettings.cs        |  8 +++----
 .../Settings/Sections/Audio/OffsetSettings.cs |  2 +-
 .../Settings/Sections/Audio/VolumeSettings.cs |  8 +++----
 .../Sections/Debug/GeneralSettings.cs         |  4 ++--
 .../Sections/Gameplay/GeneralSettings.cs      | 24 +++++++++----------
 .../Sections/Gameplay/ModsSettings.cs         |  2 +-
 .../Sections/Gameplay/SongSelectSettings.cs   | 10 ++++----
 .../Sections/General/LanguageSettings.cs      |  2 +-
 .../Sections/General/LoginSettings.cs         |  4 ++--
 .../Sections/General/UpdateSettings.cs        |  2 +-
 .../Sections/Graphics/DetailSettings.cs       |  8 +++----
 .../Sections/Graphics/LayoutSettings.cs       | 20 ++++++++--------
 .../Sections/Graphics/RendererSettings.cs     |  6 ++---
 .../Graphics/UserInterfaceSettings.cs         |  6 ++---
 .../Settings/Sections/Input/MouseSettings.cs  | 12 +++++-----
 .../Settings/Sections/Online/WebSettings.cs   |  4 ++--
 .../Overlays/Settings/Sections/SkinSection.cs | 12 +++++-----
 osu.Game/Overlays/Settings/SettingsItem.cs    |  4 ++--
 .../Edit/Timing/SliderWithTextBoxInput.cs     |  8 +++----
 osu.Game/Screens/Edit/Timing/TimingSection.cs | 14 +++++------
 .../Play/PlayerSettings/PlaybackSettings.cs   |  4 ++--
 .../Play/PlayerSettings/VisualSettings.cs     |  4 ++--
 33 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index b470405df2..de77af8306 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -29,12 +29,12 @@ namespace osu.Game.Rulesets.Mania
                 new SettingsEnumDropdown<ManiaScrollingDirection>
                 {
                     LabelText = "Scrolling direction",
-                    Bindable = config.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection)
+                    Current = config.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection)
                 },
                 new SettingsSlider<double, TimeSlider>
                 {
                     LabelText = "Scroll speed",
-                    Bindable = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
+                    Current = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
                     KeyboardStep = 5
                 },
             };
diff --git a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
index 88adf72551..3870f303b4 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
@@ -27,17 +27,17 @@ namespace osu.Game.Rulesets.Osu.UI
                 new SettingsCheckbox
                 {
                     LabelText = "Snaking in sliders",
-                    Bindable = config.GetBindable<bool>(OsuRulesetSetting.SnakingInSliders)
+                    Current = config.GetBindable<bool>(OsuRulesetSetting.SnakingInSliders)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Snaking out sliders",
-                    Bindable = config.GetBindable<bool>(OsuRulesetSetting.SnakingOutSliders)
+                    Current = config.GetBindable<bool>(OsuRulesetSetting.SnakingOutSliders)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Cursor trail",
-                    Bindable = config.GetBindable<bool>(OsuRulesetSetting.ShowCursorTrail)
+                    Current = config.GetBindable<bool>(OsuRulesetSetting.ShowCursorTrail)
                 },
             };
         }
diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index a1b5ac38ea..5782301a65 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -10,34 +10,34 @@ namespace osu.Game.Tournament.Components
 {
     public class DateTextBox : SettingsTextBox
     {
-        public new Bindable<DateTimeOffset> Bindable
+        public new Bindable<DateTimeOffset> Current
         {
-            get => bindable;
+            get => current;
             set
             {
-                bindable = value.GetBoundCopy();
-                bindable.BindValueChanged(dto =>
-                    base.Bindable.Value = dto.NewValue.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ"), true);
+                current = value.GetBoundCopy();
+                current.BindValueChanged(dto =>
+                    base.Current.Value = dto.NewValue.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ"), true);
             }
         }
 
         // hold a reference to the provided bindable so we don't have to in every settings section.
-        private Bindable<DateTimeOffset> bindable = new Bindable<DateTimeOffset>();
+        private Bindable<DateTimeOffset> current = new Bindable<DateTimeOffset>();
 
         public DateTextBox()
         {
-            base.Bindable = new Bindable<string>();
+            base.Current = new Bindable<string>();
 
             ((OsuTextBox)Control).OnCommit += (sender, newText) =>
             {
                 try
                 {
-                    bindable.Value = DateTimeOffset.Parse(sender.Text);
+                    current.Value = DateTimeOffset.Parse(sender.Text);
                 }
                 catch
                 {
                     // reset textbox content to its last valid state on a parse failure.
-                    bindable.TriggerChange();
+                    current.TriggerChange();
                 }
             };
         }
diff --git a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index 8b8078e119..069ddfa4db 100644
--- a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -63,25 +63,25 @@ namespace osu.Game.Tournament.Screens.Editors
                             {
                                 LabelText = "Name",
                                 Width = 0.33f,
-                                Bindable = Model.Name
+                                Current = Model.Name
                             },
                             new SettingsTextBox
                             {
                                 LabelText = "Description",
                                 Width = 0.33f,
-                                Bindable = Model.Description
+                                Current = Model.Description
                             },
                             new DateTextBox
                             {
                                 LabelText = "Start Time",
                                 Width = 0.33f,
-                                Bindable = Model.StartDate
+                                Current = Model.StartDate
                             },
                             new SettingsSlider<int>
                             {
                                 LabelText = "Best of",
                                 Width = 0.33f,
-                                Bindable = Model.BestOf
+                                Current = Model.BestOf
                             },
                             new SettingsButton
                             {
@@ -186,14 +186,14 @@ namespace osu.Game.Tournament.Screens.Editors
                                         LabelText = "Beatmap ID",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = beatmapId,
+                                        Current = beatmapId,
                                     },
                                     new SettingsTextBox
                                     {
                                         LabelText = "Mods",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = mods,
+                                        Current = mods,
                                     },
                                     drawableContainer = new Container
                                     {
diff --git a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
index 0973a7dc75..7bd8d3f6a0 100644
--- a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
@@ -74,13 +74,13 @@ namespace osu.Game.Tournament.Screens.Editors
                             {
                                 LabelText = "Mod",
                                 Width = 0.33f,
-                                Bindable = Model.Mod
+                                Current = Model.Mod
                             },
                             new SettingsSlider<int>
                             {
                                 LabelText = "Seed",
                                 Width = 0.33f,
-                                Bindable = Model.Seed
+                                Current = Model.Seed
                             },
                             new SettingsButton
                             {
@@ -187,21 +187,21 @@ namespace osu.Game.Tournament.Screens.Editors
                                         LabelText = "Beatmap ID",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = beatmapId,
+                                        Current = beatmapId,
                                     },
                                     new SettingsSlider<int>
                                     {
                                         LabelText = "Seed",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = beatmap.Seed
+                                        Current = beatmap.Seed
                                     },
                                     new SettingsTextBox
                                     {
                                         LabelText = "Score",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = score,
+                                        Current = score,
                                     },
                                     drawableContainer = new Container
                                     {
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index dbfcfe4225..7196f47bd6 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -102,31 +102,31 @@ namespace osu.Game.Tournament.Screens.Editors
                             {
                                 LabelText = "Name",
                                 Width = 0.2f,
-                                Bindable = Model.FullName
+                                Current = Model.FullName
                             },
                             new SettingsTextBox
                             {
                                 LabelText = "Acronym",
                                 Width = 0.2f,
-                                Bindable = Model.Acronym
+                                Current = Model.Acronym
                             },
                             new SettingsTextBox
                             {
                                 LabelText = "Flag",
                                 Width = 0.2f,
-                                Bindable = Model.FlagName
+                                Current = Model.FlagName
                             },
                             new SettingsTextBox
                             {
                                 LabelText = "Seed",
                                 Width = 0.2f,
-                                Bindable = Model.Seed
+                                Current = Model.Seed
                             },
                             new SettingsSlider<int>
                             {
                                 LabelText = "Last Year Placement",
                                 Width = 0.33f,
-                                Bindable = Model.LastYearPlacing
+                                Current = Model.LastYearPlacing
                             },
                             new SettingsButton
                             {
@@ -247,7 +247,7 @@ namespace osu.Game.Tournament.Screens.Editors
                                         LabelText = "User ID",
                                         RelativeSizeAxes = Axes.None,
                                         Width = 200,
-                                        Bindable = userId,
+                                        Current = userId,
                                     },
                                     drawableContainer = new Container
                                     {
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index e4e3842369..e4ec45c00e 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -113,13 +113,13 @@ namespace osu.Game.Tournament.Screens.Gameplay
                         new SettingsSlider<int>
                         {
                             LabelText = "Chroma width",
-                            Bindable = LadderInfo.ChromaKeyWidth,
+                            Current = LadderInfo.ChromaKeyWidth,
                             KeyboardStep = 1,
                         },
                         new SettingsSlider<int>
                         {
                             LabelText = "Players per team",
-                            Bindable = LadderInfo.PlayersPerTeam,
+                            Current = LadderInfo.PlayersPerTeam,
                             KeyboardStep = 1,
                         }
                     }
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index b60eb814e5..cf4466a2e3 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -51,15 +51,15 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 
             editorInfo.Selected.ValueChanged += selection =>
             {
-                roundDropdown.Bindable = selection.NewValue?.Round;
+                roundDropdown.Current = selection.NewValue?.Round;
                 losersCheckbox.Current = selection.NewValue?.Losers;
-                dateTimeBox.Bindable = selection.NewValue?.Date;
+                dateTimeBox.Current = selection.NewValue?.Date;
 
-                team1Dropdown.Bindable = selection.NewValue?.Team1;
-                team2Dropdown.Bindable = selection.NewValue?.Team2;
+                team1Dropdown.Current = selection.NewValue?.Team1;
+                team2Dropdown.Current = selection.NewValue?.Team2;
             };
 
-            roundDropdown.Bindable.ValueChanged += round =>
+            roundDropdown.Current.ValueChanged += round =>
             {
                 if (editorInfo.Selected.Value?.Date.Value < round.NewValue?.StartDate.Value)
                 {
@@ -88,7 +88,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         {
             public SettingsRoundDropdown(BindableList<TournamentRound> rounds)
             {
-                Bindable = new Bindable<TournamentRound>();
+                Current = new Bindable<TournamentRound>();
 
                 foreach (var r in rounds.Prepend(new TournamentRound()))
                     add(r);
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index eed3cac9f0..b343608e69 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                         new SettingsTeamDropdown(LadderInfo.Teams)
                         {
                             LabelText = "Show specific team",
-                            Bindable = currentTeam,
+                            Current = currentTeam,
                         }
                     }
                 }
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index fe487cb1d0..50069be4b2 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<float>
                         {
                             LabelText = attr.Label,
-                            Bindable = bNumber,
+                            Current = bNumber,
                             KeyboardStep = 0.1f,
                         };
 
@@ -67,7 +67,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<double>
                         {
                             LabelText = attr.Label,
-                            Bindable = bNumber,
+                            Current = bNumber,
                             KeyboardStep = 0.1f,
                         };
 
@@ -77,7 +77,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<int>
                         {
                             LabelText = attr.Label,
-                            Bindable = bNumber
+                            Current = bNumber
                         };
 
                         break;
@@ -86,7 +86,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsCheckbox
                         {
                             LabelText = attr.Label,
-                            Bindable = bBool
+                            Current = bBool
                         };
 
                         break;
@@ -95,7 +95,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsTextBox
                         {
                             LabelText = attr.Label,
-                            Bindable = bString
+                            Current = bString
                         };
 
                         break;
@@ -105,7 +105,7 @@ namespace osu.Game.Configuration
                         var dropdown = (Drawable)Activator.CreateInstance(dropdownType);
 
                         dropdownType.GetProperty(nameof(SettingsDropdown<object>.LabelText))?.SetValue(dropdown, attr.Label);
-                        dropdownType.GetProperty(nameof(SettingsDropdown<object>.Bindable))?.SetValue(dropdown, bindable);
+                        dropdownType.GetProperty(nameof(SettingsDropdown<object>.Current))?.SetValue(dropdown, bindable);
 
                         yield return dropdown;
 
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
index 3da64e0de4..bed74542c9 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
 
             updateItems();
 
-            dropdown.Bindable = audio.AudioDevice;
+            dropdown.Current = audio.AudioDevice;
 
             audio.OnNewDevice += onDeviceChanged;
             audio.OnLostDevice += onDeviceChanged;
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
index a303f93b34..d5de32ed05 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
@@ -21,23 +21,23 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                 new SettingsCheckbox
                 {
                     LabelText = "Interface voices",
-                    Bindable = config.GetBindable<bool>(OsuSetting.MenuVoice)
+                    Current = config.GetBindable<bool>(OsuSetting.MenuVoice)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "osu! music theme",
-                    Bindable = config.GetBindable<bool>(OsuSetting.MenuMusic)
+                    Current = config.GetBindable<bool>(OsuSetting.MenuMusic)
                 },
                 new SettingsDropdown<IntroSequence>
                 {
                     LabelText = "Intro sequence",
-                    Bindable = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence),
+                    Current = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence),
                     Items = Enum.GetValues(typeof(IntroSequence)).Cast<IntroSequence>()
                 },
                 new SettingsDropdown<BackgroundSource>
                 {
                     LabelText = "Background source",
-                    Bindable = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
+                    Current = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
                     Items = Enum.GetValues(typeof(BackgroundSource)).Cast<BackgroundSource>()
                 }
             };
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
index aaa4302553..c9a81b955b 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                 new SettingsSlider<double, OffsetSlider>
                 {
                     LabelText = "Audio offset",
-                    Bindable = config.GetBindable<double>(OsuSetting.AudioOffset),
+                    Current = config.GetBindable<double>(OsuSetting.AudioOffset),
                     KeyboardStep = 1f
                 },
                 new SettingsButton
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
index bda677ecd6..c172a76ab9 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
@@ -20,28 +20,28 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                 new SettingsSlider<double>
                 {
                     LabelText = "Master",
-                    Bindable = audio.Volume,
+                    Current = audio.Volume,
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
                 new SettingsSlider<double>
                 {
                     LabelText = "Master (window inactive)",
-                    Bindable = config.GetBindable<double>(OsuSetting.VolumeInactive),
+                    Current = config.GetBindable<double>(OsuSetting.VolumeInactive),
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
                 new SettingsSlider<double>
                 {
                     LabelText = "Effect",
-                    Bindable = audio.VolumeSample,
+                    Current = audio.VolumeSample,
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
                 new SettingsSlider<double>
                 {
                     LabelText = "Music",
-                    Bindable = audio.VolumeTrack,
+                    Current = audio.VolumeTrack,
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
index 9edb18e065..f05b876d8f 100644
--- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
@@ -19,12 +19,12 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
                 new SettingsCheckbox
                 {
                     LabelText = "Show log overlay",
-                    Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowLogOverlay)
+                    Current = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowLogOverlay)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Bypass front-to-back render pass",
-                    Bindable = config.GetBindable<bool>(DebugSetting.BypassFrontToBackPass)
+                    Current = config.GetBindable<bool>(DebugSetting.BypassFrontToBackPass)
                 }
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 0149e6c3a6..73968761e2 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -21,62 +21,62 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 new SettingsSlider<double>
                 {
                     LabelText = "Background dim",
-                    Bindable = config.GetBindable<double>(OsuSetting.DimLevel),
+                    Current = config.GetBindable<double>(OsuSetting.DimLevel),
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
                 new SettingsSlider<double>
                 {
                     LabelText = "Background blur",
-                    Bindable = config.GetBindable<double>(OsuSetting.BlurLevel),
+                    Current = config.GetBindable<double>(OsuSetting.BlurLevel),
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Lighten playfield during breaks",
-                    Bindable = config.GetBindable<bool>(OsuSetting.LightenDuringBreaks)
+                    Current = config.GetBindable<bool>(OsuSetting.LightenDuringBreaks)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show score overlay",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowInterface)
+                    Current = config.GetBindable<bool>(OsuSetting.ShowInterface)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show difficulty graph on progress bar",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowProgressGraph)
+                    Current = config.GetBindable<bool>(OsuSetting.ShowProgressGraph)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show health display even when you can't fail",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowHealthDisplayWhenCantFail),
+                    Current = config.GetBindable<bool>(OsuSetting.ShowHealthDisplayWhenCantFail),
                     Keywords = new[] { "hp", "bar" }
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Fade playfield to red when health is low",
-                    Bindable = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow),
+                    Current = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow),
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Always show key overlay",
-                    Bindable = config.GetBindable<bool>(OsuSetting.KeyOverlay)
+                    Current = config.GetBindable<bool>(OsuSetting.KeyOverlay)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Positional hitsounds",
-                    Bindable = config.GetBindable<bool>(OsuSetting.PositionalHitSounds)
+                    Current = config.GetBindable<bool>(OsuSetting.PositionalHitSounds)
                 },
                 new SettingsEnumDropdown<ScoreMeterType>
                 {
                     LabelText = "Score meter type",
-                    Bindable = config.GetBindable<ScoreMeterType>(OsuSetting.ScoreMeter)
+                    Current = config.GetBindable<ScoreMeterType>(OsuSetting.ScoreMeter)
                 },
                 new SettingsEnumDropdown<ScoringMode>
                 {
                     LabelText = "Score display mode",
-                    Bindable = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode)
+                    Current = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode)
                 }
             };
 
@@ -85,7 +85,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 Add(new SettingsCheckbox
                 {
                     LabelText = "Disable Windows key during gameplay",
-                    Bindable = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey)
+                    Current = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey)
                 });
             }
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
index 0babb98066..2b2fb9cef7 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 new SettingsCheckbox
                 {
                     LabelText = "Increase visibility of first object when visual impairment mods are enabled",
-                    Bindable = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility),
+                    Current = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility),
                 },
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
index 0c42247993..b26876556e 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
@@ -31,31 +31,31 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 new SettingsCheckbox
                 {
                     LabelText = "Right mouse drag to absolute scroll",
-                    Bindable = config.GetBindable<bool>(OsuSetting.SongSelectRightMouseScroll),
+                    Current = config.GetBindable<bool>(OsuSetting.SongSelectRightMouseScroll),
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show converted beatmaps",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
+                    Current = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
                 },
                 new SettingsSlider<double, StarsSlider>
                 {
                     LabelText = "Display beatmaps from",
-                    Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum),
+                    Current = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum),
                     KeyboardStep = 0.1f,
                     Keywords = new[] { "minimum", "maximum", "star", "difficulty" }
                 },
                 new SettingsSlider<double, MaximumStarsSlider>
                 {
                     LabelText = "up to",
-                    Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum),
+                    Current = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum),
                     KeyboardStep = 0.1f,
                     Keywords = new[] { "minimum", "maximum", "star", "difficulty" }
                 },
                 new SettingsEnumDropdown<RandomSelectAlgorithm>
                 {
                     LabelText = "Random selection algorithm",
-                    Bindable = config.GetBindable<RandomSelectAlgorithm>(OsuSetting.RandomSelectAlgorithm),
+                    Current = config.GetBindable<RandomSelectAlgorithm>(OsuSetting.RandomSelectAlgorithm),
                 }
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
index 236bfbecc3..44e42ecbfe 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 new SettingsCheckbox
                 {
                     LabelText = "Prefer metadata in original language",
-                    Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowUnicode)
+                    Current = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowUnicode)
                 },
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index f96e204f62..9e358d0cf5 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -240,12 +240,12 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     new SettingsCheckbox
                     {
                         LabelText = "Remember username",
-                        Bindable = config.GetBindable<bool>(OsuSetting.SaveUsername),
+                        Current = config.GetBindable<bool>(OsuSetting.SaveUsername),
                     },
                     new SettingsCheckbox
                     {
                         LabelText = "Stay signed in",
-                        Bindable = config.GetBindable<bool>(OsuSetting.SavePassword),
+                        Current = config.GetBindable<bool>(OsuSetting.SavePassword),
                     },
                     new Container
                     {
diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 9c7d0b0be4..a59a6b00b9 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
             Add(new SettingsEnumDropdown<ReleaseStream>
             {
                 LabelText = "Release stream",
-                Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
+                Current = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
             if (updateManager?.CanCheckForUpdate == true)
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
index 3089040f96..30caa45995 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
@@ -19,22 +19,22 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 new SettingsCheckbox
                 {
                     LabelText = "Storyboard / Video",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowStoryboard)
+                    Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Hit Lighting",
-                    Bindable = config.GetBindable<bool>(OsuSetting.HitLighting)
+                    Current = config.GetBindable<bool>(OsuSetting.HitLighting)
                 },
                 new SettingsEnumDropdown<ScreenshotFormat>
                 {
                     LabelText = "Screenshot format",
-                    Bindable = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat)
+                    Current = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show menu cursor in screenshots",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ScreenshotCaptureMenuCursor)
+                    Current = config.GetBindable<bool>(OsuSetting.ScreenshotCaptureMenuCursor)
                 }
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 4312b319c0..14b8dbfac0 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 windowModeDropdown = new SettingsDropdown<WindowMode>
                 {
                     LabelText = "Screen mode",
-                    Bindable = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
+                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
                     ItemSource = windowModes,
                 },
                 resolutionSettingsContainer = new Container
@@ -74,14 +74,14 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 {
                     LabelText = "UI Scaling",
                     TransferValueOnCommit = true,
-                    Bindable = osuConfig.GetBindable<float>(OsuSetting.UIScale),
+                    Current = osuConfig.GetBindable<float>(OsuSetting.UIScale),
                     KeyboardStep = 0.01f,
                     Keywords = new[] { "scale", "letterbox" },
                 },
                 new SettingsEnumDropdown<ScalingMode>
                 {
                     LabelText = "Screen Scaling",
-                    Bindable = osuConfig.GetBindable<ScalingMode>(OsuSetting.Scaling),
+                    Current = osuConfig.GetBindable<ScalingMode>(OsuSetting.Scaling),
                     Keywords = new[] { "scale", "letterbox" },
                 },
                 scalingSettings = new FillFlowContainer<SettingsSlider<float>>
@@ -97,28 +97,28 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                         new SettingsSlider<float>
                         {
                             LabelText = "Horizontal position",
-                            Bindable = scalingPositionX,
+                            Current = scalingPositionX,
                             KeyboardStep = 0.01f,
                             DisplayAsPercentage = true
                         },
                         new SettingsSlider<float>
                         {
                             LabelText = "Vertical position",
-                            Bindable = scalingPositionY,
+                            Current = scalingPositionY,
                             KeyboardStep = 0.01f,
                             DisplayAsPercentage = true
                         },
                         new SettingsSlider<float>
                         {
                             LabelText = "Horizontal scale",
-                            Bindable = scalingSizeX,
+                            Current = scalingSizeX,
                             KeyboardStep = 0.01f,
                             DisplayAsPercentage = true
                         },
                         new SettingsSlider<float>
                         {
                             LabelText = "Vertical scale",
-                            Bindable = scalingSizeY,
+                            Current = scalingSizeY,
                             KeyboardStep = 0.01f,
                             DisplayAsPercentage = true
                         },
@@ -126,7 +126,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 },
             };
 
-            scalingSettings.ForEach(s => bindPreviewEvent(s.Bindable));
+            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
 
             var resolutions = getResolutions();
 
@@ -137,10 +137,10 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     LabelText = "Resolution",
                     ShowsDefaultIndicator = false,
                     Items = resolutions,
-                    Bindable = sizeFullscreen
+                    Current = sizeFullscreen
                 };
 
-                windowModeDropdown.Bindable.BindValueChanged(mode =>
+                windowModeDropdown.Current.BindValueChanged(mode =>
                 {
                     if (mode.NewValue == WindowMode.Fullscreen)
                     {
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index 69ff9b43e5..8773e6763c 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -23,17 +23,17 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 new SettingsEnumDropdown<FrameSync>
                 {
                     LabelText = "Frame limiter",
-                    Bindable = config.GetBindable<FrameSync>(FrameworkSetting.FrameSync)
+                    Current = config.GetBindable<FrameSync>(FrameworkSetting.FrameSync)
                 },
                 new SettingsEnumDropdown<ExecutionMode>
                 {
                     LabelText = "Threading mode",
-                    Bindable = config.GetBindable<ExecutionMode>(FrameworkSetting.ExecutionMode)
+                    Current = config.GetBindable<ExecutionMode>(FrameworkSetting.ExecutionMode)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show FPS",
-                    Bindable = osuConfig.GetBindable<bool>(OsuSetting.ShowFpsDisplay)
+                    Current = osuConfig.GetBindable<bool>(OsuSetting.ShowFpsDisplay)
                 },
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
index a8953ac3a2..38c30ddd64 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
@@ -20,17 +20,17 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 new SettingsCheckbox
                 {
                     LabelText = "Rotate cursor when dragging",
-                    Bindable = config.GetBindable<bool>(OsuSetting.CursorRotation)
+                    Current = config.GetBindable<bool>(OsuSetting.CursorRotation)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Parallax",
-                    Bindable = config.GetBindable<bool>(OsuSetting.MenuParallax)
+                    Current = config.GetBindable<bool>(OsuSetting.MenuParallax)
                 },
                 new SettingsSlider<float, TimeSlider>
                 {
                     LabelText = "Hold-to-confirm activation time",
-                    Bindable = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
+                    Current = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
                     KeyboardStep = 50
                 },
             };
diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index d27ab63fb7..5227e328ec 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -35,32 +35,32 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 new SettingsCheckbox
                 {
                     LabelText = "Raw input",
-                    Bindable = rawInputToggle
+                    Current = rawInputToggle
                 },
                 new SensitivitySetting
                 {
                     LabelText = "Cursor sensitivity",
-                    Bindable = sensitivityBindable
+                    Current = sensitivityBindable
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Map absolute input to window",
-                    Bindable = config.GetBindable<bool>(FrameworkSetting.MapAbsoluteInputToWindow)
+                    Current = config.GetBindable<bool>(FrameworkSetting.MapAbsoluteInputToWindow)
                 },
                 new SettingsEnumDropdown<ConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor to window",
-                    Bindable = config.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode),
+                    Current = config.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode),
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Disable mouse wheel during gameplay",
-                    Bindable = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableWheel)
+                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableWheel)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Disable mouse buttons during gameplay",
-                    Bindable = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
+                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
                 },
             };
 
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index 23513eade8..6461bd7b93 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -19,13 +19,13 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                 new SettingsCheckbox
                 {
                     LabelText = "Warn about opening external links",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ExternalLinkWarning)
+                    Current = config.GetBindable<bool>(OsuSetting.ExternalLinkWarning)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Prefer downloads without video",
                     Keywords = new[] { "no-video" },
-                    Bindable = config.GetBindable<bool>(OsuSetting.PreferNoVideo)
+                    Current = config.GetBindable<bool>(OsuSetting.PreferNoVideo)
                 },
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 596d3a9801..1ade4befdc 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -47,29 +47,29 @@ namespace osu.Game.Overlays.Settings.Sections
                 new SettingsSlider<float, SizeSlider>
                 {
                     LabelText = "Menu cursor size",
-                    Bindable = config.GetBindable<float>(OsuSetting.MenuCursorSize),
+                    Current = config.GetBindable<float>(OsuSetting.MenuCursorSize),
                     KeyboardStep = 0.01f
                 },
                 new SettingsSlider<float, SizeSlider>
                 {
                     LabelText = "Gameplay cursor size",
-                    Bindable = config.GetBindable<float>(OsuSetting.GameplayCursorSize),
+                    Current = config.GetBindable<float>(OsuSetting.GameplayCursorSize),
                     KeyboardStep = 0.01f
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Adjust gameplay cursor size based on current beatmap",
-                    Bindable = config.GetBindable<bool>(OsuSetting.AutoCursorSize)
+                    Current = config.GetBindable<bool>(OsuSetting.AutoCursorSize)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Beatmap skins",
-                    Bindable = config.GetBindable<bool>(OsuSetting.BeatmapSkins)
+                    Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins)
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Beatmap hitsounds",
-                    Bindable = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds)
+                    Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds)
                 },
             };
 
@@ -81,7 +81,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
             config.BindWith(OsuSetting.Skin, configBindable);
 
-            skinDropdown.Bindable = dropdownBindable;
+            skinDropdown.Current = dropdownBindable;
             skinDropdown.Items = skins.GetAllUsableSkins().ToArray();
 
             // Todo: This should not be necessary when OsuConfigManager is databased
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index c2dd40d2a6..ad6aaafd9d 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -21,7 +21,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Settings
 {
-    public abstract class SettingsItem<T> : Container, IFilterable, ISettingsItem
+    public abstract class SettingsItem<T> : Container, IFilterable, ISettingsItem, IHasCurrentValue<T>
     {
         protected abstract Drawable CreateControl();
 
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
-        public virtual Bindable<T> Bindable
+        public virtual Bindable<T> Current
         {
             get => controlWithCurrent.Current;
             set => controlWithCurrent.Current = value;
diff --git a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
index d5afc8978d..f2f9f76143 100644
--- a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
+++ b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
@@ -11,7 +11,7 @@ using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    internal class SliderWithTextBoxInput<T> : CompositeDrawable, IHasCurrentValue<T>
+    public class SliderWithTextBoxInput<T> : CompositeDrawable, IHasCurrentValue<T>
         where T : struct, IEquatable<T>, IComparable<T>, IConvertible
     {
         private readonly SettingsSlider<T> slider;
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Edit.Timing
 
                 try
                 {
-                    slider.Bindable.Parse(t.Text);
+                    slider.Current.Parse(t.Text);
                 }
                 catch
                 {
@@ -71,8 +71,8 @@ namespace osu.Game.Screens.Edit.Timing
 
         public Bindable<T> Current
         {
-            get => slider.Bindable;
-            set => slider.Bindable = value;
+            get => slider.Current;
+            set => slider.Current = value;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index 2ab8703cc4..1ae2a86885 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -36,14 +36,14 @@ namespace osu.Game.Screens.Edit.Timing
         {
             if (point.NewValue != null)
             {
-                bpmSlider.Bindable = point.NewValue.BeatLengthBindable;
-                bpmSlider.Bindable.BindValueChanged(_ => ChangeHandler?.SaveState());
+                bpmSlider.Current = point.NewValue.BeatLengthBindable;
+                bpmSlider.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
 
                 bpmTextEntry.Bindable = point.NewValue.BeatLengthBindable;
                 // no need to hook change handler here as it's the same bindable as above
 
-                timeSignature.Bindable = point.NewValue.TimeSignatureBindable;
-                timeSignature.Bindable.BindValueChanged(_ => ChangeHandler?.SaveState());
+                timeSignature.Current = point.NewValue.TimeSignatureBindable;
+                timeSignature.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }
 
@@ -121,14 +121,14 @@ namespace osu.Game.Screens.Edit.Timing
                 beatLengthBindable.BindValueChanged(beatLength => updateCurrent(beatLengthToBpm(beatLength.NewValue)), true);
                 bpmBindable.BindValueChanged(bpm => beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue));
 
-                base.Bindable = bpmBindable;
+                base.Current = bpmBindable;
 
                 TransferValueOnCommit = true;
             }
 
-            public override Bindable<double> Bindable
+            public override Bindable<double> Current
             {
-                get => base.Bindable;
+                get => base.Current;
                 set
                 {
                     // incoming will be beat length, not bpm
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
index 24ddc277cd..16e29ac3c8 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
@@ -51,14 +51,14 @@ namespace osu.Game.Screens.Play.PlayerSettings
                         }
                     },
                 },
-                rateSlider = new PlayerSliderBar<double> { Bindable = UserPlaybackRate }
+                rateSlider = new PlayerSliderBar<double> { Current = UserPlaybackRate }
             };
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            rateSlider.Bindable.BindValueChanged(multiplier => multiplierText.Text = $"{multiplier.NewValue:0.0}x", true);
+            rateSlider.Current.BindValueChanged(multiplier => multiplierText.Text = $"{multiplier.NewValue:0.0}x", true);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
index e06cf5c6d5..8f29fe7893 100644
--- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
@@ -50,8 +50,8 @@ namespace osu.Game.Screens.Play.PlayerSettings
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            dimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.DimLevel);
-            blurSliderBar.Bindable = config.GetBindable<double>(OsuSetting.BlurLevel);
+            dimSliderBar.Current = config.GetBindable<double>(OsuSetting.DimLevel);
+            blurSliderBar.Current = config.GetBindable<double>(OsuSetting.BlurLevel);
             showStoryboardToggle.Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
             beatmapSkinsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
             beatmapHitsoundsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);

From e1a6f47d90b226ed0525d4e113cdac3b59e05afb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 16:40:47 +0900
Subject: [PATCH 05211/10326] Add the most basic implementation of
 LabelledSliderBar feasible

---
 .../TestSceneLabelledSliderBar.cs             | 46 +++++++++++++++++++
 .../UserInterfaceV2/LabelledSliderBar.cs      | 24 ++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.cs
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.cs
new file mode 100644
index 0000000000..393420e700
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.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 NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterfaceV2;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneLabelledSliderBar : OsuTestScene
+    {
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestSliderBar(bool hasDescription) => createSliderBar(hasDescription);
+
+        private void createSliderBar(bool hasDescription = false)
+        {
+            AddStep("create component", () =>
+            {
+                LabelledSliderBar<double> component;
+
+                Child = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 500,
+                    AutoSizeAxes = Axes.Y,
+                    Child = component = new LabelledSliderBar<double>
+                    {
+                        Current = new BindableDouble(5)
+                        {
+                            MinValue = 0,
+                            MaxValue = 10,
+                            Precision = 1,
+                        }
+                    }
+                };
+
+                component.Label = "a sample component";
+                component.Description = hasDescription ? "this text describes the component" : string.Empty;
+            });
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs
new file mode 100644
index 0000000000..cba94e314b
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.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 System;
+using osu.Framework.Graphics;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    public class LabelledSliderBar<TNumber> : LabelledComponent<SettingsSlider<TNumber>, TNumber>
+        where TNumber : struct, IEquatable<TNumber>, IComparable<TNumber>, IConvertible
+    {
+        public LabelledSliderBar()
+            : base(true)
+        {
+        }
+
+        protected override SettingsSlider<TNumber> CreateComponent() => new SettingsSlider<TNumber>
+        {
+            TransferValueOnCommit = true,
+            RelativeSizeAxes = Axes.X,
+        };
+    }
+}

From 13b67b93a5ba3ff79a78b3a92a7ae1c60f6d0f7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 15:51:40 +0900
Subject: [PATCH 05212/10326] Add difficulty section

---
 .../Screens/Edit/Setup/DifficultySection.cs   | 25 +++++++++++++++++++
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Setup/DifficultySection.cs

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
new file mode 100644
index 0000000000..952ce90273
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -0,0 +1,25 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    internal class DifficultySection : SetupSection
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Flow.Children = new Drawable[]
+            {
+                new OsuSpriteText
+                {
+                    Text = "Difficulty settings"
+                },
+                new LabelledSlider()
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index cd4f6733c0..1c3cbb7206 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Screens.Edit.Setup
                             {
                                 new ResourcesSection(),
                                 new MetadataSection(),
+                                new DifficultySection(),
                             }
                         },
                     }

From 6d7f12ad4bc68c1573a71b8811e8b0a4adebc09e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 17:01:50 +0900
Subject: [PATCH 05213/10326] Add basic difficulty setting sliders

---
 .../Screens/Edit/Setup/DifficultySection.cs   | 63 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 952ce90273..0434c1cf1f 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -1,14 +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.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterfaceV2;
 
 namespace osu.Game.Screens.Edit.Setup
 {
     internal class DifficultySection : SetupSection
     {
+        private LabelledSliderBar<float> circleSizeSlider;
+        private LabelledSliderBar<float> healthDrainSlider;
+        private LabelledSliderBar<float> approachRateSlider;
+        private LabelledSliderBar<float> overallDifficultySlider;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -18,8 +27,60 @@ namespace osu.Game.Screens.Edit.Setup
                 {
                     Text = "Difficulty settings"
                 },
-                new LabelledSlider()
+                circleSizeSlider = new LabelledSliderBar<float>
+                {
+                    Label = "Circle Size",
+                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize)
+                    {
+                        Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
+                        MinValue = 2,
+                        MaxValue = 7
+                    }
+                },
+                healthDrainSlider = new LabelledSliderBar<float>
+                {
+                    Label = "Health Drain",
+                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.DrainRate)
+                    {
+                        Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
+                        MinValue = 0,
+                        MaxValue = 10
+                    }
+                },
+                approachRateSlider = new LabelledSliderBar<float>
+                {
+                    Label = "Approach Rate",
+                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.ApproachRate)
+                    {
+                        Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
+                        MinValue = 0,
+                        MaxValue = 10
+                    }
+                },
+                overallDifficultySlider = new LabelledSliderBar<float>
+                {
+                    Label = "Overall Difficulty",
+                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.OverallDifficulty)
+                    {
+                        Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
+                        MinValue = 0,
+                        MaxValue = 10
+                    }
+                },
             };
+
+            foreach (var item in Flow.OfType<LabelledSliderBar<float>>())
+                item.Current.ValueChanged += onValueChanged;
+        }
+
+        private void onValueChanged(ValueChangedEvent<float> args)
+        {
+            // for now, update these on commit rather than making BeatmapMetadata bindables.
+            // after switching database engines we can reconsider if switching to bindables is a good direction.
+            Beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize = circleSizeSlider.Current.Value;
+            Beatmap.Value.BeatmapInfo.BaseDifficulty.DrainRate = healthDrainSlider.Current.Value;
+            Beatmap.Value.BeatmapInfo.BaseDifficulty.ApproachRate = approachRateSlider.Current.Value;
+            Beatmap.Value.BeatmapInfo.BaseDifficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
         }
     }
 }

From 7a20a34aff82cbf491a21da19c18ae156d346378 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 17:12:19 +0900
Subject: [PATCH 05214/10326] Add support to EditorBeatmap to update all
 hitobjects

---
 osu.Game/Screens/Edit/EditorBeatmap.cs           | 9 +++++++++
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 3248c5b8be..d37b7dd2b5 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -258,5 +258,14 @@ namespace osu.Game.Screens.Edit
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
 
         public int BeatDivisor => beatDivisor?.Value ?? 1;
+
+        /// <summary>
+        /// Update all hit objects with potentially changed difficulty or control point data.
+        /// </summary>
+        public void UpdateBeatmap()
+        {
+            foreach (var h in HitObjects)
+                pendingUpdates.Add(h);
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 0434c1cf1f..ce6f617f37 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -13,6 +13,9 @@ namespace osu.Game.Screens.Edit.Setup
 {
     internal class DifficultySection : SetupSection
     {
+        [Resolved]
+        private EditorBeatmap editorBeatmap { get; set; }
+
         private LabelledSliderBar<float> circleSizeSlider;
         private LabelledSliderBar<float> healthDrainSlider;
         private LabelledSliderBar<float> approachRateSlider;
@@ -81,6 +84,8 @@ namespace osu.Game.Screens.Edit.Setup
             Beatmap.Value.BeatmapInfo.BaseDifficulty.DrainRate = healthDrainSlider.Current.Value;
             Beatmap.Value.BeatmapInfo.BaseDifficulty.ApproachRate = approachRateSlider.Current.Value;
             Beatmap.Value.BeatmapInfo.BaseDifficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
+
+            editorBeatmap.UpdateBeatmap();
         }
     }
 }

From 7e8ab1cb9587913ba6c50ec362c871e7b4240e73 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 17:17:03 +0900
Subject: [PATCH 05215/10326] Add description text

---
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index ce6f617f37..4ed8d0164b 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -32,7 +32,8 @@ namespace osu.Game.Screens.Edit.Setup
                 },
                 circleSizeSlider = new LabelledSliderBar<float>
                 {
-                    Label = "Circle Size",
+                    Label = "Object Size",
+                    Description = "The size of all hit objects",
                     Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
@@ -43,6 +44,7 @@ namespace osu.Game.Screens.Edit.Setup
                 healthDrainSlider = new LabelledSliderBar<float>
                 {
                     Label = "Health Drain",
+                    Description = "The rate of passive health drain throughout playable time",
                     Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.DrainRate)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
@@ -53,6 +55,7 @@ namespace osu.Game.Screens.Edit.Setup
                 approachRateSlider = new LabelledSliderBar<float>
                 {
                     Label = "Approach Rate",
+                    Description = "The speed at which objects are presented to the player",
                     Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.ApproachRate)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
@@ -63,6 +66,7 @@ namespace osu.Game.Screens.Edit.Setup
                 overallDifficultySlider = new LabelledSliderBar<float>
                 {
                     Label = "Overall Difficulty",
+                    Description = "The harshness of hit windows and difficulty of special objects (ie. spinners)",
                     Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.OverallDifficulty)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,

From 3ce234d552bb5ae708b8915c4bfad7b7b8e7c896 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 17:47:22 +0900
Subject: [PATCH 05216/10326] Seek at 4x normal speed when holding shift

This matches osu-stable 1:1. Not sure if it feels better or not but
let's stick with what people are used to for the time being.
---
 osu.Game/Screens/Edit/Editor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 875ab25003..4b4266d049 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -589,7 +589,7 @@ namespace osu.Game.Screens.Edit
 
         private void seek(UIEvent e, int direction)
         {
-            double amount = e.ShiftPressed ? 2 : 1;
+            double amount = e.ShiftPressed ? 4 : 1;
 
             if (direction < 1)
                 clock.SeekBackward(!clock.IsRunning, amount);

From b1a64f89d78603ef86157940ec582127698f1707 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 17:49:12 +0900
Subject: [PATCH 05217/10326] Increase backwards seek magnitude when the track
 is running

This matches osu-stable. When the track is running, seeking backwards
(against the flow) is harder than seeking forwards. Adding a mutliplier
makes it feel much better.

Note that this is additive not multiplicative because for larger seeks
the (where `amount` > 1) we don't want to jump an insanely huge amount -
just offset the seek slightly to account for playing audio.
---
 osu.Game/Screens/Edit/EditorClock.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 4b7cd82637..64ed34f5ec 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         /// <param name="snapped">Whether to snap to the closest beat after seeking.</param>
         /// <param name="amount">The relative amount (magnitude) which should be seeked.</param>
-        public void SeekBackward(bool snapped = false, double amount = 1) => seek(-1, snapped, amount);
+        public void SeekBackward(bool snapped = false, double amount = 1) => seek(-1, snapped, amount + (IsRunning ? 1.5 : 0));
 
         /// <summary>
         /// Seeks forwards by one beat length.

From 1877312a917ce017b5fa8e58951a4c373cb7cecb Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Tue, 6 Oct 2020 19:52:18 +1030
Subject: [PATCH 05218/10326] Rename DuringGameplay

---
 osu.Game/Configuration/OsuConfigManager.cs | 2 +-
 osu.Game/Input/ConfineMouseTracker.cs      | 4 ++--
 osu.Game/Input/OsuConfineMouseMode.cs      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 78179a781a..71cbdb345c 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.MouseDisableButtons, false);
             Set(OsuSetting.MouseDisableWheel, false);
-            Set(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay);
+            Set(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.WhenOverlaysDisabled);
 
             // Graphics
             Set(OsuSetting.ShowFpsDisplay, false);
diff --git a/osu.Game/Input/ConfineMouseTracker.cs b/osu.Game/Input/ConfineMouseTracker.cs
index 6565967d1d..653622e881 100644
--- a/osu.Game/Input/ConfineMouseTracker.cs
+++ b/osu.Game/Input/ConfineMouseTracker.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Input
     /// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>,
     /// while optionally binding an <see cref="OverlayActivation"/> mode, usually that of the current <see cref="Player"/>.
     /// It is assumed that while overlay activation is <see cref="OverlayActivation.Disabled"/>, we should also confine the
-    /// mouse cursor if it has been requested with <see cref="OsuConfineMouseMode.DuringGameplay"/>.
+    /// mouse cursor if it has been requested with <see cref="OsuConfineMouseMode.WhenOverlaysDisabled"/>.
     /// </summary>
     public class ConfineMouseTracker : Component
     {
@@ -52,7 +52,7 @@ namespace osu.Game.Input
                     frameworkConfineMode.Value = ConfineMouseMode.Fullscreen;
                     break;
 
-                case OsuConfineMouseMode.DuringGameplay:
+                case OsuConfineMouseMode.WhenOverlaysDisabled:
                     frameworkConfineMode.Value = OverlayActivationMode.Value == OverlayActivation.Disabled ? ConfineMouseMode.Always : ConfineMouseMode.Never;
                     break;
 
diff --git a/osu.Game/Input/OsuConfineMouseMode.cs b/osu.Game/Input/OsuConfineMouseMode.cs
index 32b456395c..53e352c8bd 100644
--- a/osu.Game/Input/OsuConfineMouseMode.cs
+++ b/osu.Game/Input/OsuConfineMouseMode.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Input
         /// but may otherwise move freely.
         /// </summary>
         [Description("During Gameplay")]
-        DuringGameplay,
+        WhenOverlaysDisabled,
 
         /// <summary>
         /// The mouse cursor will always be locked to the window bounds while the game has focus.

From 782fc1d60fe1c10768ef393ba3102a77e3237662 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Tue, 6 Oct 2020 20:11:48 +1030
Subject: [PATCH 05219/10326] Use OsuGame.OverlayActivationMode rather than
 per-Player

---
 osu.Game/Input/ConfineMouseTracker.cs | 19 ++++++-------------
 osu.Game/Input/OsuConfineMouseMode.cs |  2 +-
 osu.Game/Screens/Play/Player.cs       |  6 ------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Input/ConfineMouseTracker.cs b/osu.Game/Input/ConfineMouseTracker.cs
index 653622e881..3b54c03bb0 100644
--- a/osu.Game/Input/ConfineMouseTracker.cs
+++ b/osu.Game/Input/ConfineMouseTracker.cs
@@ -8,13 +8,12 @@ using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Game.Configuration;
 using osu.Game.Overlays;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Input
 {
     /// <summary>
     /// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>,
-    /// while optionally binding an <see cref="OverlayActivation"/> mode, usually that of the current <see cref="Player"/>.
+    /// while binding <see cref="OsuGame.OverlayActivationMode"/>.
     /// It is assumed that while overlay activation is <see cref="OverlayActivation.Disabled"/>, we should also confine the
     /// mouse cursor if it has been requested with <see cref="OsuConfineMouseMode.WhenOverlaysDisabled"/>.
     /// </summary>
@@ -22,22 +21,16 @@ namespace osu.Game.Input
     {
         private Bindable<ConfineMouseMode> frameworkConfineMode;
         private Bindable<OsuConfineMouseMode> osuConfineMode;
-
-        /// <summary>
-        /// The bindable used to indicate whether gameplay is active.
-        /// Should be bound to the corresponding bindable of the current <see cref="Player"/>.
-        /// Defaults to <see cref="OverlayActivation.All"/> to assume that all other screens are considered "not gameplay".
-        /// </summary>
-        public IBindable<OverlayActivation> OverlayActivationMode { get; } = new Bindable<OverlayActivation>(OverlayActivation.All);
+        private IBindable<OverlayActivation> overlayActivationMode;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfigManager, OsuConfigManager osuConfigManager)
+        private void load(OsuGame game, FrameworkConfigManager frameworkConfigManager, OsuConfigManager osuConfigManager)
         {
             frameworkConfineMode = frameworkConfigManager.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode);
             osuConfineMode = osuConfigManager.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode);
             osuConfineMode.ValueChanged += _ => updateConfineMode();
-
-            OverlayActivationMode.BindValueChanged(_ => updateConfineMode(), true);
+            overlayActivationMode = game.OverlayActivationMode.GetBoundCopy();
+            overlayActivationMode.BindValueChanged(_ => updateConfineMode(), true);
         }
 
         private void updateConfineMode()
@@ -53,7 +46,7 @@ namespace osu.Game.Input
                     break;
 
                 case OsuConfineMouseMode.WhenOverlaysDisabled:
-                    frameworkConfineMode.Value = OverlayActivationMode.Value == OverlayActivation.Disabled ? ConfineMouseMode.Always : ConfineMouseMode.Never;
+                    frameworkConfineMode.Value = overlayActivationMode?.Value == OverlayActivation.Disabled ? ConfineMouseMode.Always : ConfineMouseMode.Never;
                     break;
 
                 case OsuConfineMouseMode.Always:
diff --git a/osu.Game/Input/OsuConfineMouseMode.cs b/osu.Game/Input/OsuConfineMouseMode.cs
index 53e352c8bd..e8411a3d9f 100644
--- a/osu.Game/Input/OsuConfineMouseMode.cs
+++ b/osu.Game/Input/OsuConfineMouseMode.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Input
         Fullscreen,
 
         /// <summary>
-        /// The mouse cursor will be locked to the window bounds during gameplay,
+        /// The mouse cursor will be locked to the window bounds while overlays are disabled,
         /// but may otherwise move freely.
         /// </summary>
         [Description("During Gameplay")]
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index de67b2d46d..175722c44e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -18,7 +18,6 @@ using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
-using osu.Game.Input;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
@@ -67,9 +66,6 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> mouseWheelDisabled;
 
-        [Resolved(CanBeNull = true)]
-        private ConfineMouseTracker confineMouseTracker { get; set; }
-
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
         public int RestartCount;
@@ -229,8 +225,6 @@ namespace osu.Game.Screens.Play
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
-            confineMouseTracker?.OverlayActivationMode.BindTo(OverlayActivationMode);
-
             // bind clock into components that require it
             DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);
 

From e64cee10b8fa82ca05e2d365c760924a75fd3cfe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 19:07:31 +0900
Subject: [PATCH 05220/10326] Add obsoleted Bindable property back to
 SettingsItem for compatibility

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index ad6aaafd9d..278479e04f 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -54,6 +54,13 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
+        [Obsolete("Use Current instead")] // Can be removed 20210406
+        public Bindable<T> Bindable
+        {
+            get => Current;
+            set => Current = value;
+        }
+
         public virtual Bindable<T> Current
         {
             get => controlWithCurrent.Current;

From a2796d2c017bce185aaca88e3b581d56599888b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 19:20:53 +0900
Subject: [PATCH 05221/10326] Add repeats display to timeline blueprints

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 35 ++++++++++++++++++-
 1 file changed, 34 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 bc2ccfc605..f0757a3dda 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -199,7 +199,40 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             base.Update();
 
             // no bindable so we perform this every update
-            Width = (float)(HitObject.GetEndTime() - HitObject.StartTime);
+            float duration = (float)(HitObject.GetEndTime() - HitObject.StartTime);
+
+            if (Width != duration)
+            {
+                Width = duration;
+
+                // kind of haphazard but yeah, no bindables.
+                if (HitObject is IHasRepeats repeats)
+                    updateRepeats(repeats);
+            }
+        }
+
+        private Container repeatsContainer;
+
+        private void updateRepeats(IHasRepeats repeats)
+        {
+            repeatsContainer?.Expire();
+
+            mainComponents.Add(repeatsContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+            });
+
+            for (int i = 0; i < repeats.RepeatCount; i++)
+            {
+                repeatsContainer.Add(new Circle
+                {
+                    Size = new Vector2(circle_size / 2),
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.Centre,
+                    RelativePositionAxes = Axes.X,
+                    X = (float)(i + 1) / (repeats.RepeatCount + 1),
+                });
+            }
         }
 
         protected override bool ShouldBeConsideredForInput(Drawable child) => true;

From 06a51297a3f2b20d40a99e31d9ee024dea020261 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 19:26:57 +0900
Subject: [PATCH 05222/10326] Use content instead of exposing the flow
 container

---
 osu.Game/Screens/Edit/Setup/MetadataSection.cs  | 4 ++--
 osu.Game/Screens/Edit/Setup/ResourcesSection.cs | 2 +-
 osu.Game/Screens/Edit/Setup/SetupSection.cs     | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index 31a2c2ce1a..4ddee2acc6 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Edit.Setup
         [BackgroundDependencyLoader]
         private void load()
         {
-            Flow.Children = new Drawable[]
+            Children = new Drawable[]
             {
                 new OsuSpriteText
                 {
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Edit.Setup
                 },
             };
 
-            foreach (var item in Flow.OfType<LabelledTextBox>())
+            foreach (var item in Children.OfType<LabelledTextBox>())
                 item.OnCommit += onCommit;
         }
 
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 86d7968856..17ecfdd52e 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Edit.Setup
                 AutoSizeAxes = Axes.Y,
             };
 
-            Flow.Children = new Drawable[]
+            Children = new Drawable[]
             {
                 backgroundSpriteContainer = new Container
                 {
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index 54e383a4d8..cdf17d355e 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.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;
@@ -14,7 +13,7 @@ namespace osu.Game.Screens.Edit.Setup
 {
     internal class SetupSection : Container
     {
-        protected FillFlowContainer Flow;
+        private readonly FillFlowContainer flow;
 
         [Resolved]
         protected OsuColour Colours { get; private set; }
@@ -22,7 +21,7 @@ namespace osu.Game.Screens.Edit.Setup
         [Resolved]
         protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
 
-        public override void Add(Drawable drawable) => throw new InvalidOperationException("Use Flow.Add instead");
+        protected override Container<Drawable> Content => flow;
 
         public SetupSection()
         {
@@ -31,7 +30,7 @@ namespace osu.Game.Screens.Edit.Setup
 
             Padding = new MarginPadding(10);
 
-            InternalChild = Flow = new FillFlowContainer
+            InternalChild = flow = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,

From 461be02e6f9ff563ebe458603f9ecaaf6fd9aa26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 19:34:21 +0900
Subject: [PATCH 05223/10326] Update with underlying changes

---
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 4ed8d0164b..f23bc0f3b2 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit.Setup
         [BackgroundDependencyLoader]
         private void load()
         {
-            Flow.Children = new Drawable[]
+            Children = new Drawable[]
             {
                 new OsuSpriteText
                 {
@@ -76,7 +76,7 @@ namespace osu.Game.Screens.Edit.Setup
                 },
             };
 
-            foreach (var item in Flow.OfType<LabelledSliderBar<float>>())
+            foreach (var item in Children.OfType<LabelledSliderBar<float>>())
                 item.Current.ValueChanged += onValueChanged;
         }
 

From e8b34ba4acd0d5fb61e06bb3f1ce4c14bffdded4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 20:57:39 +0900
Subject: [PATCH 05224/10326] Fix incorrectly committed testing change

---
 osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 9b7b7392d8..c216d1efe9 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
-            //if (updateManager?.CanCheckForUpdate == true)
+            if (updateManager?.CanCheckForUpdate == true)
             {
                 Add(checkForUpdatesButton = new SettingsButton
                 {

From 478f2dec9624f13c9fdf8503774094a19da2e9da Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Tue, 6 Oct 2020 22:39:35 +1030
Subject: [PATCH 05225/10326] Maintain the current gameplay state in OsuGame

---
 osu.Game/Configuration/OsuConfigManager.cs |  2 +-
 osu.Game/Input/ConfineMouseTracker.cs      | 19 +++++++--------
 osu.Game/Input/OsuConfineMouseMode.cs      |  4 ++--
 osu.Game/OsuGame.cs                        |  5 ++++
 osu.Game/Screens/Play/Player.cs            | 28 ++++++++++++----------
 5 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 71cbdb345c..78179a781a 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.MouseDisableButtons, false);
             Set(OsuSetting.MouseDisableWheel, false);
-            Set(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.WhenOverlaysDisabled);
+            Set(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay);
 
             // Graphics
             Set(OsuSetting.ShowFpsDisplay, false);
diff --git a/osu.Game/Input/ConfineMouseTracker.cs b/osu.Game/Input/ConfineMouseTracker.cs
index 3b54c03bb0..c1089874ae 100644
--- a/osu.Game/Input/ConfineMouseTracker.cs
+++ b/osu.Game/Input/ConfineMouseTracker.cs
@@ -7,30 +7,29 @@ using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Game.Configuration;
-using osu.Game.Overlays;
 
 namespace osu.Game.Input
 {
     /// <summary>
-    /// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>,
-    /// while binding <see cref="OsuGame.OverlayActivationMode"/>.
-    /// It is assumed that while overlay activation is <see cref="OverlayActivation.Disabled"/>, we should also confine the
-    /// mouse cursor if it has been requested with <see cref="OsuConfineMouseMode.WhenOverlaysDisabled"/>.
+    /// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>.
+    /// If <see cref="OsuGame.IsGameplay"/> is true, we should also confine the mouse cursor if it has been
+    /// requested with <see cref="OsuConfineMouseMode.DuringGameplay"/>.
     /// </summary>
     public class ConfineMouseTracker : Component
     {
         private Bindable<ConfineMouseMode> frameworkConfineMode;
         private Bindable<OsuConfineMouseMode> osuConfineMode;
-        private IBindable<OverlayActivation> overlayActivationMode;
+        private IBindable<bool> isGameplay;
 
         [BackgroundDependencyLoader]
         private void load(OsuGame game, FrameworkConfigManager frameworkConfigManager, OsuConfigManager osuConfigManager)
         {
             frameworkConfineMode = frameworkConfigManager.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode);
             osuConfineMode = osuConfigManager.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode);
+            isGameplay = game.IsGameplay.GetBoundCopy();
+
             osuConfineMode.ValueChanged += _ => updateConfineMode();
-            overlayActivationMode = game.OverlayActivationMode.GetBoundCopy();
-            overlayActivationMode.BindValueChanged(_ => updateConfineMode(), true);
+            isGameplay.BindValueChanged(_ => updateConfineMode(), true);
         }
 
         private void updateConfineMode()
@@ -45,8 +44,8 @@ namespace osu.Game.Input
                     frameworkConfineMode.Value = ConfineMouseMode.Fullscreen;
                     break;
 
-                case OsuConfineMouseMode.WhenOverlaysDisabled:
-                    frameworkConfineMode.Value = overlayActivationMode?.Value == OverlayActivation.Disabled ? ConfineMouseMode.Always : ConfineMouseMode.Never;
+                case OsuConfineMouseMode.DuringGameplay:
+                    frameworkConfineMode.Value = isGameplay.Value ? ConfineMouseMode.Always : ConfineMouseMode.Never;
                     break;
 
                 case OsuConfineMouseMode.Always:
diff --git a/osu.Game/Input/OsuConfineMouseMode.cs b/osu.Game/Input/OsuConfineMouseMode.cs
index e8411a3d9f..32b456395c 100644
--- a/osu.Game/Input/OsuConfineMouseMode.cs
+++ b/osu.Game/Input/OsuConfineMouseMode.cs
@@ -23,11 +23,11 @@ namespace osu.Game.Input
         Fullscreen,
 
         /// <summary>
-        /// The mouse cursor will be locked to the window bounds while overlays are disabled,
+        /// The mouse cursor will be locked to the window bounds during gameplay,
         /// but may otherwise move freely.
         /// </summary>
         [Description("During Gameplay")]
-        WhenOverlaysDisabled,
+        DuringGameplay,
 
         /// <summary>
         /// The mouse cursor will always be locked to the window bounds while the game has focus.
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 06e6e4bfb0..466ff13615 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -97,6 +97,11 @@ namespace osu.Game
         /// </summary>
         public readonly IBindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>();
 
+        /// <summary>
+        /// Whether gameplay is currently active.
+        /// </summary>
+        public readonly Bindable<bool> IsGameplay = new BindableBool();
+
         protected OsuScreenStack ScreenStack;
 
         protected BackButton BackButton;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 175722c44e..a217d2a396 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Screens.Play
 
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
+        private readonly Bindable<bool> isGameplay = new Bindable<bool>();
+
         public int RestartCount;
 
         [Resolved]
@@ -156,7 +158,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuConfigManager config)
+        private void load(AudioManager audio, OsuConfigManager config, OsuGame game)
         {
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 
@@ -172,6 +174,8 @@ namespace osu.Game.Screens.Play
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
+            isGameplay.BindTo(game.IsGameplay);
+
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
 
             ScoreProcessor = ruleset.CreateScoreProcessor();
@@ -219,9 +223,9 @@ namespace osu.Game.Screens.Play
                 skipOverlay.Hide();
             }
 
-            DrawableRuleset.IsPaused.BindValueChanged(_ => updateOverlayActivationMode());
-            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateOverlayActivationMode());
-            breakTracker.IsBreakTime.BindValueChanged(_ => updateOverlayActivationMode());
+            DrawableRuleset.IsPaused.BindValueChanged(_ => updateGameplayState());
+            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateGameplayState());
+            breakTracker.IsBreakTime.BindValueChanged(_ => updateGameplayState());
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
@@ -353,14 +357,11 @@ namespace osu.Game.Screens.Play
             HUDOverlay.KeyCounter.IsCounting = !isBreakTime.NewValue;
         }
 
-        private void updateOverlayActivationMode()
+        private void updateGameplayState()
         {
-            bool canTriggerOverlays = DrawableRuleset.IsPaused.Value || breakTracker.IsBreakTime.Value;
-
-            if (DrawableRuleset.HasReplayLoaded.Value || canTriggerOverlays)
-                OverlayActivationMode.Value = OverlayActivation.UserTriggered;
-            else
-                OverlayActivationMode.Value = OverlayActivation.Disabled;
+            bool inGameplay = !DrawableRuleset.HasReplayLoaded.Value && !DrawableRuleset.IsPaused.Value && !breakTracker.IsBreakTime.Value;
+            OverlayActivationMode.Value = inGameplay ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
+            isGameplay.Value = inGameplay;
         }
 
         private void updatePauseOnFocusLostState() =>
@@ -657,7 +658,7 @@ namespace osu.Game.Screens.Play
             foreach (var mod in Mods.Value.OfType<IApplicableToTrack>())
                 mod.ApplyToTrack(musicController.CurrentTrack);
 
-            updateOverlayActivationMode();
+            updateGameplayState();
         }
 
         public override void OnSuspending(IScreen next)
@@ -693,6 +694,9 @@ namespace osu.Game.Screens.Play
 
             musicController.ResetTrackAdjustments();
 
+            // Ensure we reset the IsGameplay state
+            isGameplay.Value = false;
+
             fadeOut();
             return base.OnExiting(next);
         }

From b2dad67adead750b3b3f377d61449bf53e00d5a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 21:28:59 +0900
Subject: [PATCH 05226/10326] Fix unresolvable dependency in settings test
 scene

---
 osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index c216d1efe9..c0a525e012 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
 
         private SettingsButton checkForUpdatesButton;
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private NotificationOverlay notifications { get; set; }
 
         [BackgroundDependencyLoader(true)]
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                         {
                             if (!t.Result)
                             {
-                                notifications.Post(new SimpleNotification
+                                notifications?.Post(new SimpleNotification
                                 {
                                     Text = $"You are running the latest release ({game.Version})",
                                     Icon = FontAwesome.Solid.CheckCircle,

From 14c734c24407d7e8250ccf8dcba113065c37d623 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 21:21:09 +0900
Subject: [PATCH 05227/10326] Add a very simple method of applying batch
 changes to EditorBeatmap

---
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 69 ++++++++++++++++---
 .../Edit/LegacyEditorBeatmapPatcher.cs        | 21 +++---
 2 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 3248c5b8be..549423dfb8 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -91,6 +91,8 @@ namespace osu.Game.Screens.Edit
 
         private readonly HashSet<HitObject> pendingUpdates = new HashSet<HitObject>();
 
+        private bool isBatchApplying;
+
         /// <summary>
         /// Adds a collection of <see cref="HitObject"/>s to this <see cref="EditorBeatmap"/>.
         /// </summary>
@@ -126,12 +128,17 @@ namespace osu.Game.Screens.Edit
 
             mutableHitObjects.Insert(index, hitObject);
 
-            // must be run after any change to hitobject ordering
-            beatmapProcessor?.PreProcess();
-            processHitObject(hitObject);
-            beatmapProcessor?.PostProcess();
+            if (isBatchApplying)
+                batchPendingInserts.Add(hitObject);
+            else
+            {
+                // must be run after any change to hitobject ordering
+                beatmapProcessor?.PreProcess();
+                processHitObject(hitObject);
+                beatmapProcessor?.PostProcess();
 
-            HitObjectAdded?.Invoke(hitObject);
+                HitObjectAdded?.Invoke(hitObject);
+            }
         }
 
         /// <summary>
@@ -180,12 +187,58 @@ namespace osu.Game.Screens.Edit
             bindable.UnbindAll();
             startTimeBindables.Remove(hitObject);
 
-            // must be run after any change to hitobject ordering
+            if (isBatchApplying)
+                batchPendingDeletes.Add(hitObject);
+            else
+            {
+                // must be run after any change to hitobject ordering
+                beatmapProcessor?.PreProcess();
+                processHitObject(hitObject);
+                beatmapProcessor?.PostProcess();
+
+                HitObjectRemoved?.Invoke(hitObject);
+            }
+        }
+
+        private readonly List<HitObject> batchPendingInserts = new List<HitObject>();
+
+        private readonly List<HitObject> batchPendingDeletes = new List<HitObject>();
+
+        /// <summary>
+        /// Apply a batch of operations in one go, without performing Pre/Postprocessing each time.
+        /// </summary>
+        /// <param name="applyFunction">The function which will apply the batch changes.</param>
+        public void ApplyBatchChanges(Action<EditorBeatmap> applyFunction)
+        {
+            if (isBatchApplying)
+                throw new InvalidOperationException("Attempting to perform a batch application from within an existing batch");
+
+            isBatchApplying = true;
+
+            applyFunction(this);
+
             beatmapProcessor?.PreProcess();
-            processHitObject(hitObject);
             beatmapProcessor?.PostProcess();
 
-            HitObjectRemoved?.Invoke(hitObject);
+            isBatchApplying = false;
+
+            foreach (var h in batchPendingDeletes)
+            {
+                processHitObject(h);
+                HitObjectRemoved?.Invoke(h);
+            }
+
+            batchPendingDeletes.Clear();
+
+            foreach (var h in batchPendingInserts)
+            {
+                processHitObject(h);
+                HitObjectAdded?.Invoke(h);
+            }
+
+            batchPendingInserts.Clear();
+
+            isBatchApplying = false;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index 57b7ce6940..fb7d0dd826 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -68,16 +68,19 @@ namespace osu.Game.Screens.Edit
             toRemove.Sort();
             toAdd.Sort();
 
-            // Apply the changes.
-            for (int i = toRemove.Count - 1; i >= 0; i--)
-                editorBeatmap.RemoveAt(toRemove[i]);
-
-            if (toAdd.Count > 0)
+            editorBeatmap.ApplyBatchChanges(eb =>
             {
-                IBeatmap newBeatmap = readBeatmap(newState);
-                foreach (var i in toAdd)
-                    editorBeatmap.Insert(i, newBeatmap.HitObjects[i]);
-            }
+                // Apply the changes.
+                for (int i = toRemove.Count - 1; i >= 0; i--)
+                    eb.RemoveAt(toRemove[i]);
+
+                if (toAdd.Count > 0)
+                {
+                    IBeatmap newBeatmap = readBeatmap(newState);
+                    foreach (var i in toAdd)
+                        eb.Insert(i, newBeatmap.HitObjects[i]);
+                }
+            });
         }
 
         private string readString(byte[] state) => Encoding.UTF8.GetString(state);

From 09f5e9c9eb545bdc8880a6362e1de61f39077fb9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 22:09:48 +0900
Subject: [PATCH 05228/10326] Use batch change application in many places that
 can benefit from it

---
 .../Compose/Components/SelectionHandler.cs    |  5 +---
 osu.Game/Screens/Edit/Editor.cs               |  3 +-
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 28 +++++++++++++------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index fdf8dbe44e..7808d7a5bc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -239,10 +239,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void deleteSelected()
         {
             ChangeHandler?.BeginChange();
-
-            foreach (var h in selectedBlueprints.ToList())
-                EditorBeatmap?.Remove(h.HitObject);
-
+            EditorBeatmap?.RemoveRange(selectedBlueprints.Select(b => b.HitObject));
             ChangeHandler?.EndChange();
         }
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 4b4266d049..3c5cbf30e9 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -484,8 +484,7 @@ namespace osu.Game.Screens.Edit
         protected void Cut()
         {
             Copy();
-            foreach (var h in editorBeatmap.SelectedHitObjects.ToArray())
-                editorBeatmap.Remove(h);
+            editorBeatmap.RemoveRange(editorBeatmap.SelectedHitObjects.ToArray());
         }
 
         protected void Copy()
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 549423dfb8..1357f12055 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -99,8 +99,11 @@ namespace osu.Game.Screens.Edit
         /// <param name="hitObjects">The <see cref="HitObject"/>s to add.</param>
         public void AddRange(IEnumerable<HitObject> hitObjects)
         {
-            foreach (var h in hitObjects)
-                Add(h);
+            ApplyBatchChanges(_ =>
+            {
+                foreach (var h in hitObjects)
+                    Add(h);
+            });
         }
 
         /// <summary>
@@ -166,6 +169,19 @@ namespace osu.Game.Screens.Edit
             return true;
         }
 
+        /// <summary>
+        /// Removes a collection of <see cref="HitObject"/>s to this <see cref="EditorBeatmap"/>.
+        /// </summary>
+        /// <param name="hitObjects">The <see cref="HitObject"/>s to remove.</param>
+        public void RemoveRange(IEnumerable<HitObject> hitObjects)
+        {
+            ApplyBatchChanges(_ =>
+            {
+                foreach (var h in hitObjects)
+                    Remove(h);
+            });
+        }
+
         /// <summary>
         /// Finds the index of a <see cref="HitObject"/> in this <see cref="EditorBeatmap"/>.
         /// </summary>
@@ -237,18 +253,12 @@ namespace osu.Game.Screens.Edit
             }
 
             batchPendingInserts.Clear();
-
-            isBatchApplying = false;
         }
 
         /// <summary>
         /// Clears all <see cref="HitObjects"/> from this <see cref="EditorBeatmap"/>.
         /// </summary>
-        public void Clear()
-        {
-            foreach (var h in HitObjects.ToArray())
-                Remove(h);
-        }
+        public void Clear() => RemoveRange(HitObjects.ToArray());
 
         protected override void Update()
         {

From afe3d3989a08a4e6aa0e8d88cc01d7cff78e40ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 19:04:50 +0900
Subject: [PATCH 05229/10326] Force first hitobject to be a NewCombo in
 BeatmapProcessor preprocessing step

---
 osu.Game/Beatmaps/BeatmapProcessor.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapProcessor.cs b/osu.Game/Beatmaps/BeatmapProcessor.cs
index 250cc49ad4..b7b5adc52e 100644
--- a/osu.Game/Beatmaps/BeatmapProcessor.cs
+++ b/osu.Game/Beatmaps/BeatmapProcessor.cs
@@ -22,8 +22,18 @@ namespace osu.Game.Beatmaps
         {
             IHasComboInformation lastObj = null;
 
+            bool isFirst = true;
+
             foreach (var obj in Beatmap.HitObjects.OfType<IHasComboInformation>())
             {
+                if (isFirst)
+                {
+                    obj.NewCombo = true;
+
+                    // first hitobject should always be marked as a new combo for sanity.
+                    isFirst = false;
+                }
+
                 if (obj.NewCombo)
                 {
                     obj.IndexInCurrentCombo = 0;

From 1f2dd13b49ccaeb572150b159bac8420c22f2dd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 19:04:58 +0900
Subject: [PATCH 05230/10326] Update tests

---
 .../Editing/LegacyEditorBeatmapPatcherTest.cs | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
index b491157627..afaaafdd26 100644
--- a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
+++ b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Editing
             {
                 HitObjects =
                 {
-                    new HitCircle { StartTime = 1000 }
+                    new HitCircle { StartTime = 1000, NewCombo = true }
                 }
             };
 
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Editing
         {
             current.AddRange(new[]
             {
-                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 1000, NewCombo = true },
                 new HitCircle { StartTime = 3000 },
             });
 
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Editing
         {
             current.AddRange(new[]
             {
-                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 1000, NewCombo = true },
                 new HitCircle { StartTime = 2000 },
                 new HitCircle { StartTime = 3000 },
             });
@@ -100,7 +100,7 @@ namespace osu.Game.Tests.Editing
         {
             current.AddRange(new[]
             {
-                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 1000, NewCombo = true },
                 new HitCircle { StartTime = 2000 },
                 new HitCircle { StartTime = 3000 },
             });
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Editing
             {
                 HitObjects =
                 {
-                    new HitCircle { StartTime = 500 },
+                    new HitCircle { StartTime = 500, NewCombo = true },
                     (OsuHitObject)current.HitObjects[1],
                     (OsuHitObject)current.HitObjects[2],
                 }
@@ -123,7 +123,7 @@ namespace osu.Game.Tests.Editing
         {
             current.AddRange(new[]
             {
-                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 1000, NewCombo = true },
                 new HitCircle { StartTime = 2000 },
                 new HitCircle { StartTime = 3000 },
             });
@@ -146,7 +146,7 @@ namespace osu.Game.Tests.Editing
         {
             current.AddRange(new OsuHitObject[]
             {
-                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 1000, NewCombo = true },
                 new Slider
                 {
                     StartTime = 2000,
@@ -188,7 +188,7 @@ namespace osu.Game.Tests.Editing
         {
             current.AddRange(new[]
             {
-                new HitCircle { StartTime = 1000 },
+                new HitCircle { StartTime = 1000, NewCombo = true },
                 new HitCircle { StartTime = 2000 },
                 new HitCircle { StartTime = 3000 },
             });
@@ -197,7 +197,7 @@ namespace osu.Game.Tests.Editing
             {
                 HitObjects =
                 {
-                    new HitCircle { StartTime = 500 },
+                    new HitCircle { StartTime = 500, NewCombo = true },
                     (OsuHitObject)current.HitObjects[0],
                     new HitCircle { StartTime = 1500 },
                     (OsuHitObject)current.HitObjects[1],
@@ -216,7 +216,7 @@ namespace osu.Game.Tests.Editing
         {
             current.AddRange(new[]
             {
-                new HitCircle { StartTime = 500 },
+                new HitCircle { StartTime = 500, NewCombo = true },
                 new HitCircle { StartTime = 1000 },
                 new HitCircle { StartTime = 1500 },
                 new HitCircle { StartTime = 2000 },
@@ -226,6 +226,9 @@ namespace osu.Game.Tests.Editing
                 new HitCircle { StartTime = 3500 },
             });
 
+            var patchedFirst = (HitCircle)current.HitObjects[1];
+            patchedFirst.NewCombo = true;
+
             var patch = new OsuBeatmap
             {
                 HitObjects =
@@ -244,7 +247,7 @@ namespace osu.Game.Tests.Editing
         {
             current.AddRange(new[]
             {
-                new HitCircle { StartTime = 500 },
+                new HitCircle { StartTime = 500, NewCombo = true },
                 new HitCircle { StartTime = 1000 },
                 new HitCircle { StartTime = 1500 },
                 new HitCircle { StartTime = 2000 },
@@ -277,7 +280,7 @@ namespace osu.Game.Tests.Editing
         {
             current.AddRange(new[]
             {
-                new HitCircle { StartTime = 500 },
+                new HitCircle { StartTime = 500, NewCombo = true },
                 new HitCircle { StartTime = 1000 },
                 new HitCircle { StartTime = 1500 },
                 new HitCircle { StartTime = 2000 },
@@ -291,7 +294,7 @@ namespace osu.Game.Tests.Editing
             {
                 HitObjects =
                 {
-                    new HitCircle { StartTime = 750 },
+                    new HitCircle { StartTime = 750, NewCombo = true },
                     (OsuHitObject)current.HitObjects[1],
                     (OsuHitObject)current.HitObjects[4],
                     (OsuHitObject)current.HitObjects[5],
@@ -309,20 +312,20 @@ namespace osu.Game.Tests.Editing
         {
             current.AddRange(new[]
             {
-                new HitCircle { StartTime = 500, Position = new Vector2(50) },
-                new HitCircle { StartTime = 500, Position = new Vector2(100) },
-                new HitCircle { StartTime = 500, Position = new Vector2(150) },
-                new HitCircle { StartTime = 500, Position = new Vector2(200) },
+                new HitCircle { StartTime = 500, Position = new Vector2(50), NewCombo = true },
+                new HitCircle { StartTime = 500, Position = new Vector2(100), NewCombo = true },
+                new HitCircle { StartTime = 500, Position = new Vector2(150), NewCombo = true },
+                new HitCircle { StartTime = 500, Position = new Vector2(200), NewCombo = true },
             });
 
             var patch = new OsuBeatmap
             {
                 HitObjects =
                 {
-                    new HitCircle { StartTime = 500, Position = new Vector2(150) },
-                    new HitCircle { StartTime = 500, Position = new Vector2(100) },
-                    new HitCircle { StartTime = 500, Position = new Vector2(50) },
-                    new HitCircle { StartTime = 500, Position = new Vector2(200) },
+                    new HitCircle { StartTime = 500, Position = new Vector2(150), NewCombo = true },
+                    new HitCircle { StartTime = 500, Position = new Vector2(100), NewCombo = true },
+                    new HitCircle { StartTime = 500, Position = new Vector2(50), NewCombo = true },
+                    new HitCircle { StartTime = 500, Position = new Vector2(200), NewCombo = true },
                 }
             };
 

From 01636d501a0fc5dbf4a1959c23e9d3eaf577817f Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 6 Oct 2020 18:36:15 +0300
Subject: [PATCH 05231/10326] Add MinResults test and starts of score portion
 tests

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 38d2b4a47f..52848cb716 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -9,6 +10,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -54,6 +56,44 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
         }
 
+        [TestCase(ScoringMode.Standardised, "osu", typeof(HitCircle), HitResult.Great, 575_000)]
+        public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, string rulesetName, Type hitObjectType, HitResult hitResult, int expectedScore)
+        {
+            IBeatmap fourObjectBeatmap = new TestBeatmap(new OsuRuleset().RulesetInfo)
+            {
+                HitObjects = new List<HitObject>(Enumerable.Repeat((HitObject)Activator.CreateInstance(hitObjectType), 4))
+            };
+            scoreProcessor.Mode.Value = scoringMode;
+            scoreProcessor.ApplyBeatmap(fourObjectBeatmap);
+
+            for (int i = 0; i < 4; i++)
+            {
+                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], new Judgement())
+                {
+                    Type = i == 2 ? HitResult.Miss : hitResult
+                };
+                scoreProcessor.ApplyResult(judgementResult);
+            }
+
+            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
+        }
+
+        [TestCase(HitResult.IgnoreHit, HitResult.IgnoreMiss)]
+        [TestCase(HitResult.Meh, HitResult.Miss)]
+        [TestCase(HitResult.Ok, HitResult.Miss)]
+        [TestCase(HitResult.Good, HitResult.Miss)]
+        [TestCase(HitResult.Great, HitResult.Miss)]
+        [TestCase(HitResult.Perfect, HitResult.Miss)]
+        [TestCase(HitResult.SmallTickHit, HitResult.SmallTickMiss)]
+        [TestCase(HitResult.LargeTickHit, HitResult.LargeTickMiss)]
+        [TestCase(HitResult.SmallBonus, HitResult.IgnoreMiss)]
+        [TestCase(HitResult.LargeBonus, HitResult.IgnoreMiss)]
+        public void TestMinResults(HitResult hitResult, HitResult expectedMinResult)
+        {
+            var result = new JudgementResult(new HitObject(), new TestJudgement(hitResult));
+            Assert.IsTrue(result.Judgement.MinResult == expectedMinResult);
+        }
+
         [TestCase(HitResult.None, false)]
         [TestCase(HitResult.IgnoreMiss, false)]
         [TestCase(HitResult.IgnoreHit, false)]
@@ -153,5 +193,15 @@ namespace osu.Game.Tests.Rulesets.Scoring
         {
             Assert.IsTrue(hitResult.IsScorable() == expectedReturnValue);
         }
+
+        private class TestJudgement : Judgement
+        {
+            public override HitResult MaxResult { get; }
+
+            public TestJudgement(HitResult maxResult)
+            {
+                MaxResult = maxResult;
+            }
+        }
     }
 }

From bdc84c529114b14957aeb9959f2fddca675956f2 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 6 Oct 2020 19:53:24 +0300
Subject: [PATCH 05232/10326] Finish score portion tests for standardised
 scoring mode

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 38 +++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 52848cb716..d38a2a89cc 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.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.Linq;
 using NUnit.Framework;
@@ -10,7 +9,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -56,12 +54,23 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
         }
 
-        [TestCase(ScoringMode.Standardised, "osu", typeof(HitCircle), HitResult.Great, 575_000)]
-        public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, string rulesetName, Type hitObjectType, HitResult hitResult, int expectedScore)
+        [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)]
+        [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 387_500)]
+        [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 425_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 575_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 0)] // TODO: idk, this should be 225_000 from accuracy portion
+        [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
+        [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 30)]
+        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 150)]
+        public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
         {
-            IBeatmap fourObjectBeatmap = new TestBeatmap(new OsuRuleset().RulesetInfo)
+            var minResult = new JudgementResult(new HitObject(), new TestJudgement(hitResult)).Judgement.MinResult;
+
+            IBeatmap fourObjectBeatmap = new TestBeatmap(new RulesetInfo())
             {
-                HitObjects = new List<HitObject>(Enumerable.Repeat((HitObject)Activator.CreateInstance(hitObjectType), 4))
+                HitObjects = new List<HitObject>(Enumerable.Repeat(new TestHitObject(maxResult), 4))
             };
             scoreProcessor.Mode.Value = scoringMode;
             scoreProcessor.ApplyBeatmap(fourObjectBeatmap);
@@ -70,7 +79,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
             {
                 var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], new Judgement())
                 {
-                    Type = i == 2 ? HitResult.Miss : hitResult
+                    Type = i == 2 ? minResult : hitResult
                 };
                 scoreProcessor.ApplyResult(judgementResult);
             }
@@ -203,5 +212,20 @@ namespace osu.Game.Tests.Rulesets.Scoring
                 MaxResult = maxResult;
             }
         }
+
+        private class TestHitObject : HitObject
+        {
+            private readonly HitResult maxResult;
+
+            public override Judgement CreateJudgement()
+            {
+                return new TestJudgement(maxResult);
+            }
+
+            public TestHitObject(HitResult maxResult)
+            {
+                this.maxResult = maxResult;
+            }
+        }
     }
 }

From f5a6beb4e55f17407640c32f85cd21d1baf86284 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 6 Oct 2020 19:01:03 +0200
Subject: [PATCH 05233/10326] Remove obsoletion notice.

---
 osu.Game/Rulesets/Ruleset.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 2ba884efc2..ae1407fb8f 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -160,7 +160,6 @@ namespace osu.Game.Rulesets
 
         public virtual PerformanceCalculator CreatePerformanceCalculator(DifficultyAttributes attributes, ScoreInfo score) => null;
 
-        [Obsolete("Use the DifficultyAttributes overload instead.")]
         public PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score)
         {
             var difficultyCalculator = CreateDifficultyCalculator(beatmap);

From 879131c6752fcad96f42fe4bb17de0dc75b4095a Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 6 Oct 2020 20:02:33 +0300
Subject: [PATCH 05234/10326] Also test Goods and Perfects

---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index d38a2a89cc..e1afb82e81 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -57,14 +57,16 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)]
         [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 387_500)]
         [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 425_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 3_350_000 / 7.0)]
         [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 575_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 575_000)]
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 0)] // TODO: idk, this should be 225_000 from accuracy portion
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)]
         [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 30)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 150)]
-        public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
+        public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, double expectedScore)
         {
             var minResult = new JudgementResult(new HitObject(), new TestJudgement(hitResult)).Judgement.MinResult;
 

From 6684a98a321ff086811225f44b1d3c13b8039ec2 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 6 Oct 2020 20:24:42 +0300
Subject: [PATCH 05235/10326] Also test Classic scoring

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs         | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index e1afb82e81..dd364a645c 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -61,11 +61,23 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 575_000)]
         [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 575_000)]
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 0)] // TODO: idk, this should be 225_000 from accuracy portion
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 0)] // TODO: this should probably be 225_000 from accuracy portion
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)]
         [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 30)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 150)]
+        [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
+        [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 156)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 312)]
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 3744 / 7.0)]
+        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 936)]
+        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 936)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 0)]
+        [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
+        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 30)]
+        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 150)]
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, double expectedScore)
         {
             var minResult = new JudgementResult(new HitObject(), new TestJudgement(hitResult)).Judgement.MinResult;

From a31fe5f5ff9d23532c2b3c681a335236e51a72a7 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 6 Oct 2020 22:26:18 +0300
Subject: [PATCH 05236/10326] Temporarily remove SmallTickHit tests

---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index dd364a645c..2ad9837654 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -60,8 +60,6 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 3_350_000 / 7.0)]
         [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 575_000)]
         [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 575_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 0)] // TODO: this should probably be 225_000 from accuracy portion
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)]
         [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 30)]
@@ -72,8 +70,6 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 3744 / 7.0)]
         [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 936)]
         [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 936)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 0)]
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
         [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)]
         [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 30)]

From 4c9840ccf1f8bf91801f099b1c3d8ac43f9cde2c Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 6 Oct 2020 22:57:55 +0300
Subject: [PATCH 05237/10326] Apply review suggestions

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs        | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 2ad9837654..1181d82d09 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 150)]
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, double expectedScore)
         {
-            var minResult = new JudgementResult(new HitObject(), new TestJudgement(hitResult)).Judgement.MinResult;
+            var minResult = new TestJudgement(hitResult).MinResult;
 
             IBeatmap fourObjectBeatmap = new TestBeatmap(new RulesetInfo())
             {
@@ -109,8 +109,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.LargeBonus, HitResult.IgnoreMiss)]
         public void TestMinResults(HitResult hitResult, HitResult expectedMinResult)
         {
-            var result = new JudgementResult(new HitObject(), new TestJudgement(hitResult));
-            Assert.IsTrue(result.Judgement.MinResult == expectedMinResult);
+            Assert.AreEqual(expectedMinResult, new TestJudgement(hitResult).MinResult);
         }
 
         [TestCase(HitResult.None, false)]
@@ -130,7 +129,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.LargeBonus, false)]
         public void TestAffectsCombo(HitResult hitResult, bool expectedReturnValue)
         {
-            Assert.IsTrue(hitResult.AffectsCombo() == expectedReturnValue);
+            Assert.AreEqual(expectedReturnValue, hitResult.AffectsCombo());
         }
 
         [TestCase(HitResult.None, false)]
@@ -150,7 +149,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.LargeBonus, false)]
         public void TestAffectsAccuracy(HitResult hitResult, bool expectedReturnValue)
         {
-            Assert.IsTrue(hitResult.AffectsAccuracy() == expectedReturnValue);
+            Assert.AreEqual(expectedReturnValue, hitResult.AffectsAccuracy());
         }
 
         [TestCase(HitResult.None, false)]
@@ -170,7 +169,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.LargeBonus, true)]
         public void TestIsBonus(HitResult hitResult, bool expectedReturnValue)
         {
-            Assert.IsTrue(hitResult.IsBonus() == expectedReturnValue);
+            Assert.AreEqual(expectedReturnValue, hitResult.IsBonus());
         }
 
         [TestCase(HitResult.None, false)]
@@ -190,7 +189,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.LargeBonus, true)]
         public void TestIsHit(HitResult hitResult, bool expectedReturnValue)
         {
-            Assert.IsTrue(hitResult.IsHit() == expectedReturnValue);
+            Assert.AreEqual(expectedReturnValue, hitResult.IsHit());
         }
 
         [TestCase(HitResult.None, false)]
@@ -210,7 +209,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.LargeBonus, true)]
         public void TestIsScorable(HitResult hitResult, bool expectedReturnValue)
         {
-            Assert.IsTrue(hitResult.IsScorable() == expectedReturnValue);
+            Assert.AreEqual(expectedReturnValue, hitResult.IsScorable());
         }
 
         private class TestJudgement : Judgement

From 5e314c0662919757871761414682e3389886bfa3 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 6 Oct 2020 22:58:09 +0300
Subject: [PATCH 05238/10326] Write new test for small ticks

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 1181d82d09..f81ab6c866 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -97,6 +97,40 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
         }
 
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, 6_850_000 / 7.0)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, 6_400_000 / 7.0)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, 1950 / 7.0)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, 1500 / 7.0)]
+        public void TestSmallTicksAccuracy(ScoringMode scoringMode, HitResult hitResult, double expectedScore)
+        {
+            IEnumerable<HitObject> hitObjects = Enumerable
+                                                .Repeat(new TestHitObject(HitResult.SmallTickHit), 4)
+                                                .Append(new TestHitObject(HitResult.Ok));
+            IBeatmap fiveObjectBeatmap = new TestBeatmap(new RulesetInfo())
+            {
+                HitObjects = hitObjects.ToList()
+            };
+            scoreProcessor.Mode.Value = scoringMode;
+            scoreProcessor.ApplyBeatmap(fiveObjectBeatmap);
+
+            for (int i = 0; i < 4; i++)
+            {
+                var judgementResult = new JudgementResult(fiveObjectBeatmap.HitObjects[i], new Judgement())
+                {
+                    Type = i == 2 ? HitResult.SmallTickMiss : hitResult
+                };
+                scoreProcessor.ApplyResult(judgementResult);
+            }
+
+            var lastJudgementResult = new JudgementResult(fiveObjectBeatmap.HitObjects.Last(), new Judgement())
+            {
+                Type = HitResult.Ok
+            };
+            scoreProcessor.ApplyResult(lastJudgementResult);
+
+            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
+        }
+
         [TestCase(HitResult.IgnoreHit, HitResult.IgnoreMiss)]
         [TestCase(HitResult.Meh, HitResult.Miss)]
         [TestCase(HitResult.Ok, HitResult.Miss)]

From 8847b88e653490a62d5319bc066702d9151d100c Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 7 Oct 2020 11:44:41 +1030
Subject: [PATCH 05239/10326] Fix unit tests trying to resolve OsuGame

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a217d2a396..932c5ba1df 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuConfigManager config, OsuGame game)
+        private void load(AudioManager audio, OsuConfigManager config, OsuGameBase game)
         {
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 
@@ -174,7 +174,8 @@ namespace osu.Game.Screens.Play
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
-            isGameplay.BindTo(game.IsGameplay);
+            if (game is OsuGame osuGame)
+                isGameplay.BindTo(osuGame.IsGameplay);
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
 

From c1a8fe01ef6a5253e060fa1db27cbb730882c4a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 11:09:45 +0900
Subject: [PATCH 05240/10326] Fix postprocess order in batch events

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 1357f12055..be032d3104 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -234,25 +234,19 @@ namespace osu.Game.Screens.Edit
             applyFunction(this);
 
             beatmapProcessor?.PreProcess();
+
+            foreach (var h in batchPendingDeletes) processHitObject(h);
+            foreach (var h in batchPendingInserts) processHitObject(h);
+
             beatmapProcessor?.PostProcess();
 
-            isBatchApplying = false;
-
-            foreach (var h in batchPendingDeletes)
-            {
-                processHitObject(h);
-                HitObjectRemoved?.Invoke(h);
-            }
+            foreach (var h in batchPendingDeletes) HitObjectRemoved?.Invoke(h);
+            foreach (var h in batchPendingInserts) HitObjectAdded?.Invoke(h);
 
             batchPendingDeletes.Clear();
-
-            foreach (var h in batchPendingInserts)
-            {
-                processHitObject(h);
-                HitObjectAdded?.Invoke(h);
-            }
-
             batchPendingInserts.Clear();
+
+            isBatchApplying = false;
         }
 
         /// <summary>

From a8151d5c635c0803dc9fc5812904156ce49b405e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 13:45:41 +0900
Subject: [PATCH 05241/10326] Fix HitWindows getting serialized alongside
 HitObjects

These were being serialized as the base type. On deserialization, due to
the HitWindow of objects being non-null, they would not get correctly
initialised by the CreateHitWindows() virtual method.

- Closes #10403
---
 osu.Game/Rulesets/Objects/HitObject.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 0dfde834ee..826d411822 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -77,6 +77,7 @@ namespace osu.Game.Rulesets.Objects
         /// <summary>
         /// The hit windows for this <see cref="HitObject"/>.
         /// </summary>
+        [JsonIgnore]
         public HitWindows HitWindows { get; set; }
 
         private readonly List<HitObject> nestedHitObjects = new List<HitObject>();

From a6d1484ad5af2f5eb921133a283477b235da0d56 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 14:26:01 +0900
Subject: [PATCH 05242/10326] Add arbirary precision specification for now

---
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index f23bc0f3b2..2d8031c3c8 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -38,7 +38,8 @@ namespace osu.Game.Screens.Edit.Setup
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 2,
-                        MaxValue = 7
+                        MaxValue = 7,
+                        Precision = 0.1f,
                     }
                 },
                 healthDrainSlider = new LabelledSliderBar<float>
@@ -49,7 +50,8 @@ namespace osu.Game.Screens.Edit.Setup
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 0,
-                        MaxValue = 10
+                        MaxValue = 10,
+                        Precision = 0.1f,
                     }
                 },
                 approachRateSlider = new LabelledSliderBar<float>
@@ -60,7 +62,8 @@ namespace osu.Game.Screens.Edit.Setup
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 0,
-                        MaxValue = 10
+                        MaxValue = 10,
+                        Precision = 0.1f,
                     }
                 },
                 overallDifficultySlider = new LabelledSliderBar<float>
@@ -71,7 +74,8 @@ namespace osu.Game.Screens.Edit.Setup
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 0,
-                        MaxValue = 10
+                        MaxValue = 10,
+                        Precision = 0.1f,
                     }
                 },
             };

From c8c5998af475a9860041eea732e61a10f949f069 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 7 Oct 2020 16:02:35 +1030
Subject: [PATCH 05243/10326] Bail if FrameworkSetting.ConfineMouseMode is
 unavailable

---
 osu.Game/Input/ConfineMouseTracker.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Input/ConfineMouseTracker.cs b/osu.Game/Input/ConfineMouseTracker.cs
index c1089874ae..3d16e44607 100644
--- a/osu.Game/Input/ConfineMouseTracker.cs
+++ b/osu.Game/Input/ConfineMouseTracker.cs
@@ -34,6 +34,10 @@ namespace osu.Game.Input
 
         private void updateConfineMode()
         {
+            // confine mode is unavailable on some platforms
+            if (frameworkConfineMode.Disabled)
+                return;
+
             switch (osuConfineMode.Value)
             {
                 case OsuConfineMouseMode.Never:

From 7fff762dfc91222fe1823f3b73f90aa588b5129c Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 7 Oct 2020 16:14:49 +1030
Subject: [PATCH 05244/10326] Rename IsGameplay

---
 osu.Game/Input/ConfineMouseTracker.cs | 10 +++++-----
 osu.Game/OsuGame.cs                   |  4 ++--
 osu.Game/Screens/Play/Player.cs       | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Input/ConfineMouseTracker.cs b/osu.Game/Input/ConfineMouseTracker.cs
index 3d16e44607..3dadae6317 100644
--- a/osu.Game/Input/ConfineMouseTracker.cs
+++ b/osu.Game/Input/ConfineMouseTracker.cs
@@ -12,24 +12,24 @@ namespace osu.Game.Input
 {
     /// <summary>
     /// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>.
-    /// If <see cref="OsuGame.IsGameplay"/> is true, we should also confine the mouse cursor if it has been
+    /// If <see cref="OsuGame.LocalUserPlaying"/> is true, we should also confine the mouse cursor if it has been
     /// requested with <see cref="OsuConfineMouseMode.DuringGameplay"/>.
     /// </summary>
     public class ConfineMouseTracker : Component
     {
         private Bindable<ConfineMouseMode> frameworkConfineMode;
         private Bindable<OsuConfineMouseMode> osuConfineMode;
-        private IBindable<bool> isGameplay;
+        private IBindable<bool> localUserPlaying;
 
         [BackgroundDependencyLoader]
         private void load(OsuGame game, FrameworkConfigManager frameworkConfigManager, OsuConfigManager osuConfigManager)
         {
             frameworkConfineMode = frameworkConfigManager.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode);
             osuConfineMode = osuConfigManager.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode);
-            isGameplay = game.IsGameplay.GetBoundCopy();
+            localUserPlaying = game.LocalUserPlaying.GetBoundCopy();
 
             osuConfineMode.ValueChanged += _ => updateConfineMode();
-            isGameplay.BindValueChanged(_ => updateConfineMode(), true);
+            localUserPlaying.BindValueChanged(_ => updateConfineMode(), true);
         }
 
         private void updateConfineMode()
@@ -49,7 +49,7 @@ namespace osu.Game.Input
                     break;
 
                 case OsuConfineMouseMode.DuringGameplay:
-                    frameworkConfineMode.Value = isGameplay.Value ? ConfineMouseMode.Always : ConfineMouseMode.Never;
+                    frameworkConfineMode.Value = localUserPlaying.Value ? ConfineMouseMode.Always : ConfineMouseMode.Never;
                     break;
 
                 case OsuConfineMouseMode.Always:
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 466ff13615..c09ad0eeb9 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -98,9 +98,9 @@ namespace osu.Game
         public readonly IBindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>();
 
         /// <summary>
-        /// Whether gameplay is currently active.
+        /// Whether the local user is currently interacting with the game in a way that should not be interrupted.
         /// </summary>
-        public readonly Bindable<bool> IsGameplay = new BindableBool();
+        public readonly Bindable<bool> LocalUserPlaying = new BindableBool();
 
         protected OsuScreenStack ScreenStack;
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 932c5ba1df..e6c15521af 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
 
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
-        private readonly Bindable<bool> isGameplay = new Bindable<bool>();
+        private readonly Bindable<bool> localUserPlaying = new Bindable<bool>();
 
         public int RestartCount;
 
@@ -175,7 +175,7 @@ namespace osu.Game.Screens.Play
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
             if (game is OsuGame osuGame)
-                isGameplay.BindTo(osuGame.IsGameplay);
+                localUserPlaying.BindTo(osuGame.LocalUserPlaying);
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
 
@@ -362,7 +362,7 @@ namespace osu.Game.Screens.Play
         {
             bool inGameplay = !DrawableRuleset.HasReplayLoaded.Value && !DrawableRuleset.IsPaused.Value && !breakTracker.IsBreakTime.Value;
             OverlayActivationMode.Value = inGameplay ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
-            isGameplay.Value = inGameplay;
+            localUserPlaying.Value = inGameplay;
         }
 
         private void updatePauseOnFocusLostState() =>
@@ -695,8 +695,8 @@ namespace osu.Game.Screens.Play
 
             musicController.ResetTrackAdjustments();
 
-            // Ensure we reset the IsGameplay state
-            isGameplay.Value = false;
+            // Ensure we reset the LocalUserPlaying state
+            localUserPlaying.Value = false;
 
             fadeOut();
             return base.OnExiting(next);

From 485bd962c7d52d738547af4bcd43af535e2e935a Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 7 Oct 2020 16:15:17 +1030
Subject: [PATCH 05245/10326] Also reset LocalUserPlaying in OnSuspending

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e6c15521af..43dce0786d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -666,6 +666,9 @@ namespace osu.Game.Screens.Play
         {
             screenSuspension?.Expire();
 
+            // Ensure we reset the LocalUserPlaying state
+            localUserPlaying.Value = false;
+
             fadeOut();
             base.OnSuspending(next);
         }

From d1ec3806927a3bb042e47b76be921582ed87575e Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 7 Oct 2020 16:15:32 +1030
Subject: [PATCH 05246/10326] Don't cache ConfineMouseTracker

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index c09ad0eeb9..d22ac1aec8 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -549,7 +549,6 @@ namespace osu.Game
             BackButton.Receptor receptor;
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
-            dependencies.Cache(confineMouseTracker = new ConfineMouseTracker());
 
             AddRange(new Drawable[]
             {
@@ -586,7 +585,7 @@ namespace osu.Game
                 leftFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 topMostOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 idleTracker,
-                confineMouseTracker
+                confineMouseTracker = new ConfineMouseTracker()
             });
 
             ScreenStack.ScreenPushed += screenPushed;

From 8b8eb00bd75c4790bec72bdd8a79f5e6ddddf457 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 7 Oct 2020 16:16:58 +1030
Subject: [PATCH 05247/10326] Permit nulls rather than casting to OsuGame

---
 osu.Game/Screens/Play/Player.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 43dce0786d..39a6ac4ded 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -157,8 +157,8 @@ namespace osu.Game.Screens.Play
             DrawableRuleset.SetRecordTarget(recordingReplay = new Replay());
         }
 
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuConfigManager config, OsuGameBase game)
+        [BackgroundDependencyLoader(true)]
+        private void load(AudioManager audio, OsuConfigManager config, OsuGame game)
         {
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 
@@ -174,8 +174,8 @@ namespace osu.Game.Screens.Play
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
-            if (game is OsuGame osuGame)
-                localUserPlaying.BindTo(osuGame.LocalUserPlaying);
+            if (game != null)
+                localUserPlaying.BindTo(game.LocalUserPlaying);
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
 

From d6d0bd90a39e48747ce34ba08629373470127829 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 15:34:03 +0900
Subject: [PATCH 05248/10326] Extract tuple into class

---
 osu.Game/Scoring/HitResultDisplayStatistic.cs | 41 +++++++++++++++++++
 osu.Game/Scoring/ScoreInfo.cs                 | 17 ++++----
 2 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game/Scoring/HitResultDisplayStatistic.cs

diff --git a/osu.Game/Scoring/HitResultDisplayStatistic.cs b/osu.Game/Scoring/HitResultDisplayStatistic.cs
new file mode 100644
index 0000000000..d43d8bf0ba
--- /dev/null
+++ b/osu.Game/Scoring/HitResultDisplayStatistic.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 osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Scoring
+{
+    /// <summary>
+    /// Compiled result data for a specific <see cref="HitResult"/> in a score.
+    /// </summary>
+    public class HitResultDisplayStatistic
+    {
+        /// <summary>
+        /// The associated result type.
+        /// </summary>
+        public HitResult Result { get; }
+
+        /// <summary>
+        /// The count of successful hits of this type.
+        /// </summary>
+        public int Count { get; }
+
+        /// <summary>
+        /// The maximum achievable hits of this type. May be null if undetermined.
+        /// </summary>
+        public int? MaxCount { get; }
+
+        /// <summary>
+        /// A custom display name for the result type. May be provided by rulesets to give better clarity.
+        /// </summary>
+        public string DisplayName { get; }
+
+        public HitResultDisplayStatistic(HitResult result, int count, int? maxCount, string displayName)
+        {
+            Result = result;
+            Count = count;
+            MaxCount = maxCount;
+            DisplayName = displayName;
+        }
+    }
+}
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 0206989231..7cd9578ff1 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -213,22 +213,22 @@ namespace osu.Game.Scoring
             set => isLegacyScore = value;
         }
 
-        public IEnumerable<(HitResult result, int count, int? maxCount)> GetStatisticsForDisplay()
+        public IEnumerable<HitResultDisplayStatistic> GetStatisticsForDisplay()
         {
-            foreach (var key in OrderAttributeUtils.GetValuesInOrder<HitResult>())
+            foreach (var r in Ruleset.CreateInstance().GetHitResults())
             {
-                if (key.IsBonus())
+                if (r.result.IsBonus())
                     continue;
 
-                int value = Statistics.GetOrDefault(key);
+                int value = Statistics.GetOrDefault(r.result);
 
-                switch (key)
+                switch (r.result)
                 {
                     case HitResult.SmallTickHit:
                     {
                         int total = value + Statistics.GetOrDefault(HitResult.SmallTickMiss);
                         if (total > 0)
-                            yield return (key, value, total);
+                            yield return new HitResultDisplayStatistic(r.result, value, total, r.displayName);
 
                         break;
                     }
@@ -237,7 +237,7 @@ namespace osu.Game.Scoring
                     {
                         int total = value + Statistics.GetOrDefault(HitResult.LargeTickMiss);
                         if (total > 0)
-                            yield return (key, value, total);
+                            yield return new HitResultDisplayStatistic(r.result, value, total, r.displayName);
 
                         break;
                     }
@@ -247,8 +247,7 @@ namespace osu.Game.Scoring
                         break;
 
                     default:
-                        if (value > 0 || key == HitResult.Miss)
-                            yield return (key, value, null);
+                        yield return new HitResultDisplayStatistic(r.result, value, null, r.displayName);
 
                         break;
                 }

From 3363c3399eaa8a5e0a4efbb2e1742d694639c232 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 15:34:23 +0900
Subject: [PATCH 05249/10326] Allow rulesets to specify valid HitResult types
 (and display names for them)

---
 osu.Game/Rulesets/Ruleset.cs | 49 ++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 915544d010..48d94d2b3f 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -23,8 +23,10 @@ using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Users;
 using JetBrains.Annotations;
+using osu.Framework.Extensions;
 using osu.Framework.Testing;
 using osu.Game.Screens.Ranking.Statistics;
+using osu.Game.Utils;
 
 namespace osu.Game.Rulesets
 {
@@ -220,5 +222,52 @@ namespace osu.Game.Rulesets
         /// <returns>The <see cref="StatisticRow"/>s to display. Each <see cref="StatisticRow"/> may contain 0 or more <see cref="StatisticItem"/>.</returns>
         [NotNull]
         public virtual StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => Array.Empty<StatisticRow>();
+
+        /// <summary>
+        /// Get all valid <see cref="HitResult"/>s for this ruleset.
+        /// Generally used for results display purposes, where it can't be determined if zero-count means the user has not achieved any or the type is not used by this ruleset.
+        /// </summary>
+        /// <returns>
+        /// All valid <see cref="HitResult"/>s along with a display-friendly name.
+        /// </returns>
+        public IEnumerable<(HitResult result, string displayName)> GetHitResults()
+        {
+            var validResults = GetValidHitResults();
+
+            // enumerate over ordered list to guarantee return order is stable.
+            foreach (var result in OrderAttributeUtils.GetValuesInOrder<HitResult>())
+            {
+                switch (result)
+                {
+                    // hard blocked types, should never be displayed even if the ruleset tells us to.
+                    case HitResult.None:
+                    case HitResult.IgnoreHit:
+                    case HitResult.IgnoreMiss:
+                    // display is handled as a completion count with corresponding "hit" type.
+                    case HitResult.LargeTickMiss:
+                    case HitResult.SmallTickMiss:
+                        continue;
+                }
+
+                if (result == HitResult.Miss || validResults.Contains(result))
+                    yield return (result, GetDisplayNameForHitResult(result));
+            }
+        }
+
+        /// <summary>
+        /// Get all valid <see cref="HitResult"/>s for this ruleset.
+        /// Generally used for results display purposes, where it can't be determined if zero-count means the user has not achieved any or the type is not used by this ruleset.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="HitResult.Miss"/> is implicitly included. Special types like <see cref="HitResult.IgnoreHit"/> are ignored even when specified.
+        /// </remarks>
+        protected virtual IEnumerable<HitResult> GetValidHitResults() => OrderAttributeUtils.GetValuesInOrder<HitResult>();
+
+        /// <summary>
+        /// Get a display friendly name for the specified result type.
+        /// </summary>
+        /// <param name="result">The result type to get the name for.</param>
+        /// <returns>The display name.</returns>
+        public virtual string GetDisplayNameForHitResult(HitResult result) => result.GetDescription();
     }
 }

From 6020ec9ca3e786d95640da84dfc573ef181c452a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 15:34:36 +0900
Subject: [PATCH 05250/10326] Add valid result types for all rulesets

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 29 ++++++++++++++++++++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 25 ++++++++++++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 35 +++++++++++++++++++++++++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 22 ++++++++++++++++
 4 files changed, 111 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index ca75a816f1..eb845cdea6 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -141,6 +141,35 @@ namespace osu.Game.Rulesets.Catch
 
         public override Drawable CreateIcon() => new SpriteIcon { Icon = OsuIcon.RulesetCatch };
 
+        protected override IEnumerable<HitResult> GetValidHitResults()
+        {
+            return new[]
+            {
+                HitResult.Great,
+
+                HitResult.LargeTickHit,
+                HitResult.SmallTickHit,
+                HitResult.LargeBonus,
+            };
+        }
+
+        public override string GetDisplayNameForHitResult(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.LargeTickHit:
+                    return "large droplet";
+
+                case HitResult.SmallTickHit:
+                    return "small droplet";
+
+                case HitResult.LargeBonus:
+                    return "bananas";
+            }
+
+            return base.GetDisplayNameForHitResult(result);
+        }
+
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new CatchDifficultyCalculator(this, beatmap);
 
         public override ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => new CatchLegacySkinTransformer(source);
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 71ac85dd1b..d2feeb03af 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -319,6 +319,31 @@ namespace osu.Game.Rulesets.Mania
             return (PlayfieldType)Enum.GetValues(typeof(PlayfieldType)).Cast<int>().OrderByDescending(i => i).First(v => variant >= v);
         }
 
+        protected override IEnumerable<HitResult> GetValidHitResults()
+        {
+            return new[]
+            {
+                HitResult.Perfect,
+                HitResult.Great,
+                HitResult.Good,
+                HitResult.Ok,
+                HitResult.Meh,
+
+                HitResult.LargeTickHit,
+            };
+        }
+
+        public override string GetDisplayNameForHitResult(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.LargeTickHit:
+                    return "hold tick";
+            }
+
+            return base.GetDisplayNameForHitResult(result);
+        }
+
         public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
         {
             new StatisticRow
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 7f4a0dcbbb..d946e7a113 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -191,6 +191,41 @@ namespace osu.Game.Rulesets.Osu
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
+        protected override IEnumerable<HitResult> GetValidHitResults()
+        {
+            return new[]
+            {
+                HitResult.Great,
+                HitResult.Ok,
+                HitResult.Meh,
+
+                HitResult.LargeTickHit,
+                HitResult.SmallTickHit,
+                HitResult.SmallBonus,
+                HitResult.LargeBonus,
+            };
+        }
+
+        public override string GetDisplayNameForHitResult(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.LargeTickHit:
+                    return "slider tick";
+
+                case HitResult.SmallTickHit:
+                    return "slider end";
+
+                case HitResult.SmallBonus:
+                    return "spinner spin";
+
+                case HitResult.LargeBonus:
+                    return "spinner bonus";
+            }
+
+            return base.GetDisplayNameForHitResult(result);
+        }
+
         public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
         {
             var timedHitEvents = score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)).ToList();
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 9d485e3f20..f4c94c9248 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -159,6 +159,28 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
 
+        protected override IEnumerable<HitResult> GetValidHitResults()
+        {
+            return new[]
+            {
+                HitResult.Great,
+                HitResult.Ok,
+
+                HitResult.SmallTickHit,
+            };
+        }
+
+        public override string GetDisplayNameForHitResult(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.SmallTickHit:
+                    return "drum tick";
+            }
+
+            return base.GetDisplayNameForHitResult(result);
+        }
+
         public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
         {
             var timedHitEvents = score.HitEvents.Where(e => e.HitObject is Hit).ToList();

From e281d724b85feabb494169b6bd007e8e91621e1d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 15:35:04 +0900
Subject: [PATCH 05251/10326] Consume display name logic

---
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  | 22 +++++++++++--------
 .../Scores/TopScoreStatisticsSection.cs       |  8 +++----
 .../ContractedPanelMiddleContent.cs           |  8 +++----
 .../Expanded/ExpandedPanelMiddleContent.cs    |  4 ++--
 .../Expanded/Statistics/HitResultStatistic.cs |  8 +++----
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 968355c377..231d888a4e 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         /// <summary>
         /// The statistics that appear in the table, in order of appearance.
         /// </summary>
-        private readonly List<HitResult> statisticResultTypes = new List<HitResult>();
+        private readonly List<(HitResult result, string displayName)> statisticResultTypes = new List<(HitResult, string)>();
 
         private bool showPerformancePoints;
 
@@ -101,15 +101,19 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             };
 
             // All statistics across all scores, unordered.
-            var allScoreStatistics = scores.SelectMany(s => s.GetStatisticsForDisplay().Select(stat => stat.result)).ToHashSet();
+            var allScoreStatistics = scores.SelectMany(s => s.GetStatisticsForDisplay().Select(stat => stat.Result)).ToHashSet();
+
+            var ruleset = scores.First().Ruleset.CreateInstance();
 
             foreach (var result in OrderAttributeUtils.GetValuesInOrder<HitResult>())
             {
                 if (!allScoreStatistics.Contains(result))
                     continue;
 
-                columns.Add(new TableColumn(result.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 35, maxSize: 60)));
-                statisticResultTypes.Add(result);
+                string displayName = ruleset.GetDisplayNameForHitResult(result);
+
+                columns.Add(new TableColumn(displayName, Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 35, maxSize: 60)));
+                statisticResultTypes.Add((result, displayName));
             }
 
             if (showPerformancePoints)
@@ -163,18 +167,18 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 }
             };
 
-            var availableStatistics = score.GetStatisticsForDisplay().ToDictionary(tuple => tuple.result);
+            var availableStatistics = score.GetStatisticsForDisplay().ToDictionary(tuple => tuple.Result);
 
             foreach (var result in statisticResultTypes)
             {
-                if (!availableStatistics.TryGetValue(result, out var stat))
-                    stat = (result, 0, null);
+                if (!availableStatistics.TryGetValue(result.result, out var stat))
+                    stat = new HitResultDisplayStatistic(result.result, 0, null, result.displayName);
 
                 content.Add(new OsuSpriteText
                 {
-                    Text = stat.maxCount == null ? $"{stat.count}" : $"{stat.count}/{stat.maxCount}",
+                    Text = stat.MaxCount == null ? $"{stat.Count}" : $"{stat.Count}/{stat.MaxCount}",
                     Font = OsuFont.GetFont(size: text_size),
-                    Colour = stat.count == 0 ? Color4.Gray : Color4.White
+                    Colour = stat.Count == 0 ? Color4.Gray : Color4.White
                 });
             }
 
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 05789e1fc0..93744dd6a3 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -5,7 +5,6 @@ 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;
 using osu.Framework.Graphics.Shapes;
@@ -15,7 +14,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osuTK;
@@ -117,7 +115,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 ppColumn.Alpha = value.Beatmap?.Status == BeatmapSetOnlineStatus.Ranked ? 1 : 0;
                 ppColumn.Text = $@"{value.PP:N0}";
 
-                statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(s => createStatisticsColumn(s.result, s.count, s.maxCount));
+                statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(createStatisticsColumn);
                 modsColumn.Mods = value.Mods;
 
                 if (scoreManager != null)
@@ -125,9 +123,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             }
         }
 
-        private TextColumn createStatisticsColumn(HitResult hitResult, int count, int? maxCount) => new TextColumn(hitResult.GetDescription(), smallFont, bottom_columns_min_width)
+        private TextColumn createStatisticsColumn(HitResultDisplayStatistic stat) => new TextColumn(stat.DisplayName, smallFont, bottom_columns_min_width)
         {
-            Text = maxCount == null ? $"{count}" : $"{count}/{maxCount}"
+            Text = stat.MaxCount == null ? $"{stat.Count}" : $"{stat.Count}/{stat.MaxCount}"
         };
 
         private class InfoColumn : CompositeDrawable
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index 95ece1a9fb..9481f07342 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -3,7 +3,6 @@
 
 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;
@@ -13,7 +12,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Leaderboards;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
@@ -117,7 +115,7 @@ namespace osu.Game.Screens.Ranking.Contracted
                                             AutoSizeAxes = Axes.Y,
                                             Direction = FillDirection.Vertical,
                                             Spacing = new Vector2(0, 5),
-                                            ChildrenEnumerable = score.GetStatisticsForDisplay().Select(s => createStatistic(s.result, s.count, s.maxCount))
+                                            ChildrenEnumerable = score.GetStatisticsForDisplay().Select(createStatistic)
                                         },
                                         new FillFlowContainer
                                         {
@@ -199,8 +197,8 @@ namespace osu.Game.Screens.Ranking.Contracted
             };
         }
 
-        private Drawable createStatistic(HitResult result, int count, int? maxCount)
-            => createStatistic(result.GetDescription(), maxCount == null ? $"{count}" : $"{count}/{maxCount}");
+        private Drawable createStatistic(HitResultDisplayStatistic result)
+            => createStatistic(result.DisplayName, result.MaxCount == null ? $"{result.Count}" : $"{result.Count}/{result.MaxCount}");
 
         private Drawable createStatistic(string key, string value) => new Container
         {
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index ebab8c88f6..30b9f47f71 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -66,8 +66,8 @@ namespace osu.Game.Screens.Ranking.Expanded
 
             var bottomStatistics = new List<StatisticDisplay>();
 
-            foreach (var (key, value, maxCount) in score.GetStatisticsForDisplay())
-                bottomStatistics.Add(new HitResultStatistic(key, value, maxCount));
+            foreach (var result in score.GetStatisticsForDisplay())
+                bottomStatistics.Add(new HitResultStatistic(result));
 
             statisticDisplays.AddRange(topStatistics);
             statisticDisplays.AddRange(bottomStatistics);
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
index a86033713f..31ef51a031 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Ranking.Expanded.Statistics
 {
@@ -12,10 +12,10 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
     {
         private readonly HitResult result;
 
-        public HitResultStatistic(HitResult result, int count, int? maxCount = null)
-            : base(result.GetDescription(), count, maxCount)
+        public HitResultStatistic(HitResultDisplayStatistic result)
+            : base(result.DisplayName, result.Count, result.MaxCount)
         {
-            this.result = result;
+            this.result = result.Result;
         }
 
         [BackgroundDependencyLoader]

From c0bc6a75b35cb73cf960c1c444125cbea6c1155f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 16:17:08 +0900
Subject: [PATCH 05252/10326] Show auxiliary judgements on next line

---
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs | 14 ++++++++++++--
 .../Expanded/Statistics/HitResultStatistic.cs      |  6 +++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 30b9f47f71..b2d0c7a874 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                 new CounterStatistic("pp", (int)(score.PP ?? 0)),
             };
 
-            var bottomStatistics = new List<StatisticDisplay>();
+            var bottomStatistics = new List<HitResultStatistic>();
 
             foreach (var result in score.GetStatisticsForDisplay())
                 bottomStatistics.Add(new HitResultStatistic(result));
@@ -198,7 +198,17 @@ namespace osu.Game.Screens.Ranking.Expanded
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
-                                Content = new[] { bottomStatistics.Cast<Drawable>().ToArray() },
+                                Content = new[] { bottomStatistics.Where(s => s.Result <= HitResult.Perfect).ToArray() },
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(GridSizeMode.AutoSize),
+                                }
+                            },
+                            new GridContainer
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Content = new[] { bottomStatistics.Where(s => s.Result > HitResult.Perfect).ToArray() },
                                 RowDimensions = new[]
                                 {
                                     new Dimension(GridSizeMode.AutoSize),
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
index 31ef51a031..ada8dfabf0 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
@@ -10,18 +10,18 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
 {
     public class HitResultStatistic : CounterStatistic
     {
-        private readonly HitResult result;
+        public readonly HitResult Result;
 
         public HitResultStatistic(HitResultDisplayStatistic result)
             : base(result.DisplayName, result.Count, result.MaxCount)
         {
-            this.result = result.Result;
+            Result = result.Result;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            HeaderText.Colour = colours.ForHitResult(result);
+            HeaderText.Colour = colours.ForHitResult(Result);
         }
     }
 }

From 6ac70945f2be7f3be6c6daabaf12a5bda8619cf2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 16:17:28 +0900
Subject: [PATCH 05253/10326] Show bonus judgements on expanded panel

---
 osu.Game/Scoring/ScoreInfo.cs                                  | 3 ---
 .../Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 7cd9578ff1..596e98a6bd 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -217,9 +217,6 @@ namespace osu.Game.Scoring
         {
             foreach (var r in Ruleset.CreateInstance().GetHitResults())
             {
-                if (r.result.IsBonus())
-                    continue;
-
                 int value = Statistics.GetOrDefault(r.result);
 
                 switch (r.result)
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index 9481f07342..24f1116d0e 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Leaderboards;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
@@ -115,7 +116,7 @@ namespace osu.Game.Screens.Ranking.Contracted
                                             AutoSizeAxes = Axes.Y,
                                             Direction = FillDirection.Vertical,
                                             Spacing = new Vector2(0, 5),
-                                            ChildrenEnumerable = score.GetStatisticsForDisplay().Select(createStatistic)
+                                            ChildrenEnumerable = score.GetStatisticsForDisplay().Where(s => !s.Result.IsBonus()).Select(createStatistic)
                                         },
                                         new FillFlowContainer
                                         {

From 2e0a9f53c11a4d1e4fe2b63e22a3af3de579904d Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 7 Oct 2020 17:52:39 +1030
Subject: [PATCH 05254/10326] Add test coverage

---
 .../Visual/Gameplay/TestSceneOverlayActivation.cs      | 10 ++++++++++
 osu.Game/Screens/Play/Player.cs                        | 10 +++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
index ce04b940e7..41f7582d31 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 
@@ -23,32 +24,40 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestGameplayOverlayActivation()
         {
+            AddAssert("local user playing", () => Player.LocalUserPlaying.Value);
             AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
         }
 
         [Test]
         public void TestGameplayOverlayActivationPaused()
         {
+            AddAssert("local user playing", () => Player.LocalUserPlaying.Value);
             AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
             AddStep("pause gameplay", () => Player.Pause());
+            AddAssert("local user not playing", () => !Player.LocalUserPlaying.Value);
             AddUntilStep("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
         }
 
         [Test]
         public void TestGameplayOverlayActivationReplayLoaded()
         {
+            AddAssert("local user playing", () => Player.LocalUserPlaying.Value);
             AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
             AddStep("load a replay", () => Player.DrawableRuleset.HasReplayLoaded.Value = true);
+            AddAssert("local user not playing", () => !Player.LocalUserPlaying.Value);
             AddAssert("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
         }
 
         [Test]
         public void TestGameplayOverlayActivationBreaks()
         {
+            AddAssert("local user playing", () => Player.LocalUserPlaying.Value);
             AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
             AddStep("seek to break", () => Player.GameplayClockContainer.Seek(Beatmap.Value.Beatmap.Breaks.First().StartTime));
+            AddAssert("local user not playing", () => !Player.LocalUserPlaying.Value);
             AddUntilStep("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
             AddStep("seek to break end", () => Player.GameplayClockContainer.Seek(Beatmap.Value.Beatmap.Breaks.First().EndTime));
+            AddAssert("local user playing", () => Player.LocalUserPlaying.Value);
             AddUntilStep("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
         }
 
@@ -57,6 +66,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected class OverlayTestPlayer : TestPlayer
         {
             public new OverlayActivation OverlayActivationMode => base.OverlayActivationMode.Value;
+            public new Bindable<bool> LocalUserPlaying => base.LocalUserPlaying;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 39a6ac4ded..8830884a40 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
 
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
-        private readonly Bindable<bool> localUserPlaying = new Bindable<bool>();
+        protected readonly Bindable<bool> LocalUserPlaying = new Bindable<bool>();
 
         public int RestartCount;
 
@@ -175,7 +175,7 @@ namespace osu.Game.Screens.Play
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
             if (game != null)
-                localUserPlaying.BindTo(game.LocalUserPlaying);
+                LocalUserPlaying.BindTo(game.LocalUserPlaying);
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
 
@@ -362,7 +362,7 @@ namespace osu.Game.Screens.Play
         {
             bool inGameplay = !DrawableRuleset.HasReplayLoaded.Value && !DrawableRuleset.IsPaused.Value && !breakTracker.IsBreakTime.Value;
             OverlayActivationMode.Value = inGameplay ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
-            localUserPlaying.Value = inGameplay;
+            LocalUserPlaying.Value = inGameplay;
         }
 
         private void updatePauseOnFocusLostState() =>
@@ -667,7 +667,7 @@ namespace osu.Game.Screens.Play
             screenSuspension?.Expire();
 
             // Ensure we reset the LocalUserPlaying state
-            localUserPlaying.Value = false;
+            LocalUserPlaying.Value = false;
 
             fadeOut();
             base.OnSuspending(next);
@@ -699,7 +699,7 @@ namespace osu.Game.Screens.Play
             musicController.ResetTrackAdjustments();
 
             // Ensure we reset the LocalUserPlaying state
-            localUserPlaying.Value = false;
+            LocalUserPlaying.Value = false;
 
             fadeOut();
             return base.OnExiting(next);

From 67398b5d9551b7e147fa7398b337ee110ee456c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 16:30:14 +0900
Subject: [PATCH 05255/10326] Move timestamp text out of flow and attach to
 bottom edge

---
 .../Expanded/ExpandedPanelMiddleContent.cs    | 265 +++++++++---------
 1 file changed, 134 insertions(+), 131 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index b2d0c7a874..5aac449adb 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -72,157 +72,160 @@ namespace osu.Game.Screens.Ranking.Expanded
             statisticDisplays.AddRange(topStatistics);
             statisticDisplays.AddRange(bottomStatistics);
 
-            InternalChild = new FillFlowContainer
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(20),
-                Children = new Drawable[]
+                new FillFlowContainer
                 {
-                    new FillFlowContainer
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(20),
+                    Children = new Drawable[]
                     {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
+                        new FillFlowContainer
                         {
-                            new OsuSpriteText
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Vertical,
+                            Children = new Drawable[]
                             {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
-                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
-                                MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
-                                Truncate = true,
-                            },
-                            new OsuSpriteText
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
-                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
-                                MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
-                                Truncate = true,
-                            },
-                            new Container
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Margin = new MarginPadding { Top = 40 },
-                                RelativeSizeAxes = Axes.X,
-                                Height = 230,
-                                Child = new AccuracyCircle(score)
+                                new OsuSpriteText
                                 {
-                                    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
-                            },
-                            starAndModDisplay = new FillFlowContainer
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                AutoSizeAxes = Axes.Both,
-                                Spacing = new Vector2(5, 0),
-                                Children = new Drawable[]
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
+                                    Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
+                                    MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
+                                    Truncate = true,
+                                },
+                                new OsuSpriteText
                                 {
-                                    new StarRatingDisplay(beatmap)
-                                    {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft
-                                    },
-                                }
-                            },
-                            new FillFlowContainer
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Direction = FillDirection.Vertical,
-                                AutoSizeAxes = Axes.Both,
-                                Children = new Drawable[]
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
+                                    Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
+                                    MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
+                                    Truncate = true,
+                                },
+                                new Container
                                 {
-                                    new OsuSpriteText
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    Margin = new MarginPadding { Top = 40 },
+                                    RelativeSizeAxes = Axes.X,
+                                    Height = 230,
+                                    Child = new AccuracyCircle(score)
                                     {
-                                        Anchor = Anchor.TopCentre,
-                                        Origin = Anchor.TopCentre,
-                                        Text = beatmap.Version,
-                                        Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold),
-                                    },
-                                    new OsuTextFlowContainer(s => s.Font = OsuFont.Torus.With(size: 12))
+                                        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
+                                },
+                                starAndModDisplay = new FillFlowContainer
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    AutoSizeAxes = Axes.Both,
+                                    Spacing = new Vector2(5, 0),
+                                    Children = new Drawable[]
                                     {
-                                        Anchor = Anchor.TopCentre,
-                                        Origin = Anchor.TopCentre,
-                                        AutoSizeAxes = Axes.Both,
-                                        Direction = FillDirection.Horizontal,
-                                    }.With(t =>
-                                    {
-                                        if (!string.IsNullOrEmpty(creator))
+                                        new StarRatingDisplay(beatmap)
                                         {
-                                            t.AddText("mapped by ");
-                                            t.AddText(creator, 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[]
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.CentreLeft
+                                        },
+                                    }
+                                },
+                                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 = beatmap.Version,
+                                            Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold),
+                                        },
+                                        new OsuTextFlowContainer(s => s.Font = OsuFont.Torus.With(size: 12))
+                                        {
+                                            Anchor = Anchor.TopCentre,
+                                            Origin = Anchor.TopCentre,
+                                            AutoSizeAxes = Axes.Both,
+                                            Direction = FillDirection.Horizontal,
+                                        }.With(t =>
+                                        {
+                                            if (!string.IsNullOrEmpty(creator))
+                                            {
+                                                t.AddText("mapped by ");
+                                                t.AddText(creator, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
+                                            }
+                                        })
+                                    }
+                                },
+                            }
+                        },
+                        new FillFlowContainer
                         {
-                            new GridContainer
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(0, 5),
+                            Children = new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Content = new[] { topStatistics.Cast<Drawable>().ToArray() },
-                                RowDimensions = new[]
+                                new GridContainer
                                 {
-                                    new Dimension(GridSizeMode.AutoSize),
-                                }
-                            },
-                            new GridContainer
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Content = new[] { bottomStatistics.Where(s => s.Result <= HitResult.Perfect).ToArray() },
-                                RowDimensions = new[]
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Content = new[] { topStatistics.Cast<Drawable>().ToArray() },
+                                    RowDimensions = new[]
+                                    {
+                                        new Dimension(GridSizeMode.AutoSize),
+                                    }
+                                },
+                                new GridContainer
                                 {
-                                    new Dimension(GridSizeMode.AutoSize),
-                                }
-                            },
-                            new GridContainer
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Content = new[] { bottomStatistics.Where(s => s.Result > HitResult.Perfect).ToArray() },
-                                RowDimensions = new[]
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Content = new[] { bottomStatistics.Where(s => s.Result <= HitResult.Perfect).ToArray() },
+                                    RowDimensions = new[]
+                                    {
+                                        new Dimension(GridSizeMode.AutoSize),
+                                    }
+                                },
+                                new GridContainer
                                 {
-                                    new Dimension(GridSizeMode.AutoSize),
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Content = new[] { bottomStatistics.Where(s => s.Result > HitResult.Perfect).ToArray() },
+                                    RowDimensions = new[]
+                                    {
+                                        new Dimension(GridSizeMode.AutoSize),
+                                    }
                                 }
                             }
                         }
-                    },
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
-                        Text = $"Played on {score.Date.ToLocalTime():d MMMM yyyy HH:mm}"
                     }
+                },
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
+                    Text = $"Played on {score.Date.ToLocalTime():d MMMM yyyy HH:mm}"
                 }
             };
 

From f88ba1734bd6cc687d86de8a2a02a87d386dbbb9 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 7 Oct 2020 18:11:47 +1030
Subject: [PATCH 05256/10326] Remove ConfineMouseTracker field

---
 osu.Game/OsuGame.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d22ac1aec8..772f9ff145 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -90,8 +90,6 @@ namespace osu.Game
 
         private IdleTracker idleTracker;
 
-        private ConfineMouseTracker confineMouseTracker;
-
         /// <summary>
         /// Whether overlays should be able to be opened game-wide. Value is sourced from the current active screen.
         /// </summary>
@@ -585,7 +583,7 @@ namespace osu.Game
                 leftFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 topMostOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 idleTracker,
-                confineMouseTracker = new ConfineMouseTracker()
+                new ConfineMouseTracker()
             });
 
             ScreenStack.ScreenPushed += screenPushed;

From 31d347be5cfd24d63d3e39b78ecec916bab843c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 16:30:26 +0900
Subject: [PATCH 05257/10326] Make extended score panel taller to better fit
 all information

---
 osu.Game/Screens/Ranking/ScorePanel.cs                  | 7 ++++++-
 osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 1904da7094..8c8a547277 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Height of the panel when expanded.
         /// </summary>
-        private const float expanded_height = 560;
+        private const float expanded_height = 586;
 
         /// <summary>
         /// Height of the top layer when the panel is expanded.
@@ -105,11 +105,16 @@ namespace osu.Game.Screens.Ranking
         [BackgroundDependencyLoader]
         private void load()
         {
+            // ScorePanel doesn't include the top extruding area in its own size.
+            // Adding a manual offset here allows the expanded version to take on an "acceptable" vertical centre when at 100% UI scale.
+            const float vertical_fudge = 20;
+
             InternalChild = content = new Container
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(40),
+                Y = vertical_fudge,
                 Children = new Drawable[]
                 {
                     topLayerContainer = new Container
diff --git a/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs b/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
index c8010d1c32..67533aaa24 100644
--- a/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.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.Graphics.Containers;
 
 namespace osu.Game.Screens.Ranking

From f77ad8cf3907327834db7d12c129511f70c5b819 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 17:03:34 +0900
Subject: [PATCH 05258/10326] Remove unused using

---
 osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs b/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
index 67533aaa24..c8010d1c32 100644
--- a/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Screens.Ranking

From f90ac2e76c2bf20c88fafef834b3c9110156f660 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Wed, 7 Oct 2020 18:50:02 +1030
Subject: [PATCH 05259/10326] Ensure we assert after the seek has completed

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
index 41f7582d31..4fa4c00981 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
@@ -54,11 +54,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("local user playing", () => Player.LocalUserPlaying.Value);
             AddAssert("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
             AddStep("seek to break", () => Player.GameplayClockContainer.Seek(Beatmap.Value.Beatmap.Breaks.First().StartTime));
-            AddAssert("local user not playing", () => !Player.LocalUserPlaying.Value);
             AddUntilStep("activation mode is user triggered", () => Player.OverlayActivationMode == OverlayActivation.UserTriggered);
+            AddAssert("local user not playing", () => !Player.LocalUserPlaying.Value);
             AddStep("seek to break end", () => Player.GameplayClockContainer.Seek(Beatmap.Value.Beatmap.Breaks.First().EndTime));
-            AddAssert("local user playing", () => Player.LocalUserPlaying.Value);
             AddUntilStep("activation mode is disabled", () => Player.OverlayActivationMode == OverlayActivation.Disabled);
+            AddAssert("local user playing", () => Player.LocalUserPlaying.Value);
         }
 
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => new OverlayTestPlayer();

From 0f6eb9d4cb7750c1890da24f26d5080f42e643ea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 17:40:54 +0900
Subject: [PATCH 05260/10326] Ensure music playback is stopped when retrying by
 any means

---
 osu.Game/Screens/Play/Player.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 175722c44e..90a0eb0027 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -441,6 +441,10 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public void Restart()
         {
+            // at the point of restarting the track should either already be paused or the volume should be zero.
+            // stopping here is to ensure music doesn't become audible after exiting back to PlayerLoader.
+            musicController.Stop();
+
             sampleRestart?.Play();
             RestartRequested?.Invoke();
 

From 04fa0bff9d8c6bbb2d1b656619a103c7e17d4211 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 17:46:57 +0900
Subject: [PATCH 05261/10326] Add CanBeNull spec and xmldoc

---
 osu.Game/Rulesets/Ruleset.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index ae1407fb8f..fef36ef16a 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -158,8 +158,22 @@ namespace osu.Game.Rulesets
 
         public abstract DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap);
 
+        /// <summary>
+        /// Optionally creates a <see cref="PerformanceCalculator"/> to generate performance data from the provided score.
+        /// </summary>
+        /// <param name="attributes">Difficulty attributes for the beatmap related to the provided score.</param>
+        /// <param name="score">The score to be processed.</param>
+        /// <returns>A performance calculator instance for the provided score.</returns>
+        [CanBeNull]
         public virtual PerformanceCalculator CreatePerformanceCalculator(DifficultyAttributes attributes, ScoreInfo score) => null;
 
+        /// <summary>
+        /// Optionally creates a <see cref="PerformanceCalculator"/> to generate performance data from the provided score.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to use as a source for generating <see cref="DifficultyAttributes"/>.</param>
+        /// <param name="score">The score to be processed.</param>
+        /// <returns>A performance calculator instance for the provided score.</returns>
+        [CanBeNull]
         public PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score)
         {
             var difficultyCalculator = CreateDifficultyCalculator(beatmap);

From 6487f58e9ad11cc8f28592593e693057e3ecb38e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 17:52:35 +0900
Subject: [PATCH 05262/10326] Fix failing tests

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

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 19294d12fc..528689e67c 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -193,6 +193,7 @@ namespace osu.Game.Tests.Visual.Background
 
             AddStep("Transition to Results", () => player.Push(results = new FadeAccessibleResults(new ScoreInfo
             {
+                Ruleset = new OsuRuleset().RulesetInfo,
                 User = new User { Username = "osu!" },
                 Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo
             })));

From 3c3c1ce8855487356f0c6afec1fc6b25d70542c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 18:18:01 +0900
Subject: [PATCH 05263/10326] Don't force playback of (non-looping)
 DrawableHitObject samples after skin change

---
 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 8012b4d95c..1ef6c8c207 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -273,7 +273,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             // apply any custom state overrides
             ApplyCustomUpdateState?.Invoke(this, newState);
 
-            if (newState == ArmedState.Hit)
+            if (!force && newState == ArmedState.Hit)
                 PlaySamples();
         }
 

From 8c528c89108ca7a7ffde30f2a355f214205e3e88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 18:36:34 +0900
Subject: [PATCH 05264/10326] Fix legacy taiko skins showing double judgements

---
 .../Skinning/TaikoLegacySkinTransformer.cs    | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 93c9deec1f..a804ea5f82 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Audio;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Skinning;
 
@@ -14,13 +15,29 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 {
     public class TaikoLegacySkinTransformer : LegacySkinTransformer
     {
+        private Lazy<bool> hasExplosion;
+
         public TaikoLegacySkinTransformer(ISkinSource source)
             : base(source)
         {
+            Source.SourceChanged += sourceChanged;
+            sourceChanged();
+        }
+
+        private void sourceChanged()
+        {
+            hasExplosion = new Lazy<bool>(() => Source.GetTexture(getHitName(TaikoSkinComponents.TaikoExplosionGreat)) != null);
         }
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
+            if (component is GameplaySkinComponent<HitResult>)
+            {
+                // if a taiko skin is providing explosion sprites, hide the judgements completely
+                if (hasExplosion.Value)
+                    return Drawable.Empty();
+            }
+
             if (!(component is TaikoSkinComponent taikoComponent))
                 return null;
 
@@ -87,10 +104,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                     var hitName = getHitName(taikoComponent.Component);
                     var hitSprite = this.GetAnimation(hitName, true, false);
-                    var strongHitSprite = this.GetAnimation($"{hitName}k", true, false);
 
                     if (hitSprite != null)
+                    {
+                        var strongHitSprite = this.GetAnimation($"{hitName}k", true, false);
+
                         return new LegacyHitExplosion(hitSprite, strongHitSprite);
+                    }
 
                     return null;
 

From 94a6e2856570bcb281d2073cd7eb6f716362b0bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Oct 2020 18:40:09 +0900
Subject: [PATCH 05265/10326] Add back second removed condition

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

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 30e28f0e95..f772c6d282 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -61,6 +61,9 @@ namespace osu.Game.Updater
 
         public async Task<bool> CheckForUpdateAsync()
         {
+            if (!CanCheckForUpdate)
+                return false;
+
             Task<bool> waitTask;
 
             lock (updateTaskLock)

From a425cf4a31372b7fee31b71ae2748ba57f84a0ff Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 7 Oct 2020 13:29:10 +0200
Subject: [PATCH 05266/10326] Fix broken class reference.

---
 .../Screens/Ranking/Expanded/Statistics/CounterStatistic.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index e070f76289..08a9714fd8 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             {
                 AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Horizontal,
-                Child = Counter = new Counter
+                Child = Counter = new StatisticCounter
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre

From cd15f83f85341f86ac5f0e3f112ac4bb46c8e3ac Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 7 Oct 2020 14:10:25 +0200
Subject: [PATCH 05267/10326] Update ScorePerformanceCalculator code path.

---
 osu.Game/Scoring/ScorePerformanceManager.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index 97b4be7edc..0189a86172 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -17,9 +17,6 @@ namespace osu.Game.Scoring
     {
         private readonly ConcurrentDictionary<PerformanceCacheLookup, double> performanceCache = new ConcurrentDictionary<PerformanceCacheLookup, double>();
 
-        [Resolved]
-        private BeatmapManager beatmapManager { get; set; }
-
         [Resolved]
         private BeatmapDifficultyManager difficultyManager { get; set; }
 
@@ -45,14 +42,13 @@ namespace osu.Game.Scoring
 
         private async Task<double> computePerformanceAsync(ScoreInfo score, PerformanceCacheLookup lookupKey, CancellationToken token = default)
         {
-            var beatmap = beatmapManager.GetWorkingBeatmap(score.Beatmap);
             var attributes = await difficultyManager.GetDifficultyAsync(score.Beatmap, score.Ruleset, score.Mods, token);
 
             if (token.IsCancellationRequested)
                 return default;
 
-            var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(beatmap, score, attributes.Attributes);
-            var total = calculator.Calculate();
+            var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(attributes.Attributes, score);
+            var total = calculator?.Calculate() ?? default;
 
             performanceCache[lookupKey] = total;
 

From 74af7cc5036911b47238d9cde41691c0bcf5cf83 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Wed, 7 Oct 2020 17:00:00 +0300
Subject: [PATCH 05268/10326] Rework ScoreProcessor

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 7a5b707357..ca6a8622f7 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.Scoring
 
                 case ScoringMode.Classic:
                     // should emulate osu-stable's scoring as closely as we can (https://osu.ppy.sh/help/wiki/Score/ScoreV1)
-                    return getBonusScore(statistics) + (accuracyRatio * maxCombo * 300) * (1 + Math.Max(0, (comboRatio * maxCombo) - 1) * scoreMultiplier / 25);
+                    return getBonusScore(statistics) + (accuracyRatio * Math.Max(1, maxCombo) * 300) * (1 + Math.Max(0, (comboRatio * maxCombo) - 1) * scoreMultiplier / 25);
             }
         }
 
@@ -267,12 +267,6 @@ namespace osu.Game.Rulesets.Scoring
             {
                 maxHighestCombo = HighestCombo.Value;
                 maxBaseScore = baseScore;
-
-                if (maxBaseScore == 0 || maxHighestCombo == 0)
-                {
-                    Mode.Value = ScoringMode.Classic;
-                    Mode.Disabled = true;
-                }
             }
 
             baseScore = 0;

From 2b6e4e575e2668e102f491a66ff070cac66c5fdd Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Wed, 7 Oct 2020 17:04:55 +0300
Subject: [PATCH 05269/10326] Award max combo portion score if max achievable
 is 0

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

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index ca6a8622f7..9bfd737f7e 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Rulesets.Scoring
         {
             return GetScore(mode, maxHighestCombo,
                 maxBaseScore > 0 ? baseScore / maxBaseScore : 0,
-                maxHighestCombo > 0 ? (double)HighestCombo.Value / maxHighestCombo : 0,
+                maxHighestCombo > 0 ? (double)HighestCombo.Value / maxHighestCombo : 1,
                 scoreResultCounts);
         }
 

From 6113557acc346a572d710229553b133a9ebfdd91 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Wed, 7 Oct 2020 17:11:48 +0300
Subject: [PATCH 05270/10326] Add back small tick tests

---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index f81ab6c866..dd191b03c2 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -60,16 +60,20 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 3_350_000 / 7.0)]
         [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 575_000)]
         [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 575_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 700_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 925_000)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 30)]
-        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 150)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 700_030)]
+        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 700_150)]
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
         [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 156)]
         [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 312)]
         [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 3744 / 7.0)]
         [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 936)]
         [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 936)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 225)]
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
         [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)]
         [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 30)]

From 7109c3b6cd1777d5aa1b3eafceb547ff6de7742f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 7 Oct 2020 21:06:24 +0200
Subject: [PATCH 05271/10326] Rename variable as suggested

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 9bfd737f7e..33271d9689 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Scoring
         private readonly double accuracyPortion;
         private readonly double comboPortion;
 
-        private int maxHighestCombo;
+        private int maxAchievableCombo;
         private double maxBaseScore;
         private double rollingMaxBaseScore;
         private double baseScore;
@@ -195,9 +195,9 @@ namespace osu.Game.Rulesets.Scoring
 
         private double getScore(ScoringMode mode)
         {
-            return GetScore(mode, maxHighestCombo,
+            return GetScore(mode, maxAchievableCombo,
                 maxBaseScore > 0 ? baseScore / maxBaseScore : 0,
-                maxHighestCombo > 0 ? (double)HighestCombo.Value / maxHighestCombo : 1,
+                maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1,
                 scoreResultCounts);
         }
 
@@ -265,7 +265,7 @@ namespace osu.Game.Rulesets.Scoring
 
             if (storeResults)
             {
-                maxHighestCombo = HighestCombo.Value;
+                maxAchievableCombo = HighestCombo.Value;
                 maxBaseScore = baseScore;
             }
 

From 2d070934d912b9b05d0d587a30e80dee5ff0d838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 7 Oct 2020 21:12:48 +0200
Subject: [PATCH 05272/10326] Add test coverage for empty beatmaps

---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index dd191b03c2..e89562f893 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -135,6 +135,17 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
         }
 
+        [Test]
+        public void TestEmptyBeatmap(
+            [Values(ScoringMode.Standardised, ScoringMode.Classic)]
+            ScoringMode scoringMode)
+        {
+            scoreProcessor.Mode.Value = scoringMode;
+            scoreProcessor.ApplyBeatmap(new TestBeatmap(new RulesetInfo()));
+
+            Assert.IsTrue(Precision.AlmostEquals(0, scoreProcessor.TotalScore.Value));
+        }
+
         [TestCase(HitResult.IgnoreHit, HitResult.IgnoreMiss)]
         [TestCase(HitResult.Meh, HitResult.Miss)]
         [TestCase(HitResult.Ok, HitResult.Miss)]

From b1029a124ca6efd53a24a950d290c33f5efed148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 7 Oct 2020 22:57:20 +0200
Subject: [PATCH 05273/10326] Move event subscription to LoadComplete

Prevents attempting to read from the `colours` field before it is
actually injected.
---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 4121e1f7bb..c8982b819a 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -113,7 +113,6 @@ namespace osu.Game.Screens.Edit.Timing
                 };
 
                 controlPoints = group.ControlPoints.GetBoundCopy();
-                controlPoints.CollectionChanged += (_, __) => createChildren();
             }
 
             [Resolved]
@@ -125,6 +124,12 @@ namespace osu.Game.Screens.Edit.Timing
                 createChildren();
             }
 
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                controlPoints.CollectionChanged += (_, __) => createChildren();
+            }
+
             private void createChildren()
             {
                 fill.ChildrenEnumerable = controlPoints.Select(createAttribute).Where(c => c != null);

From ac44f6f679504554485edb3877f76615f463f1ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 7 Oct 2020 23:10:28 +0200
Subject: [PATCH 05274/10326] Ensure control point group exists after move

If the control point group moved was empty, it would not be created due
to a lack of ControlPointInfo.Add() calls.
---
 osu.Game/Screens/Edit/Timing/GroupSection.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/GroupSection.cs b/osu.Game/Screens/Edit/Timing/GroupSection.cs
index c77d48ef0a..d76b5e7406 100644
--- a/osu.Game/Screens/Edit/Timing/GroupSection.cs
+++ b/osu.Game/Screens/Edit/Timing/GroupSection.cs
@@ -111,7 +111,8 @@ namespace osu.Game.Screens.Edit.Timing
             foreach (var cp in currentGroupItems)
                 Beatmap.Value.Beatmap.ControlPointInfo.Add(time, cp);
 
-            SelectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(time);
+            // the control point might not necessarily exist yet, if currentGroupItems was empty.
+            SelectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(time, true);
 
             changeHandler?.EndChange();
         }

From d9089ef93c7d6a052a86fa55f27129903d1fa649 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 12:52:52 +0900
Subject: [PATCH 05275/10326] Add missing bonus type for taiko ruleset

---
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index f4c94c9248..7f8289aa91 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -167,6 +167,8 @@ namespace osu.Game.Rulesets.Taiko
                 HitResult.Ok,
 
                 HitResult.SmallTickHit,
+
+                HitResult.SmallBonus,
             };
         }
 
@@ -176,6 +178,9 @@ namespace osu.Game.Rulesets.Taiko
             {
                 case HitResult.SmallTickHit:
                     return "drum tick";
+
+                case HitResult.SmallBonus:
+                    return "strong bonus";
             }
 
             return base.GetDisplayNameForHitResult(result);

From f70252d07bc4ebea18b4cdf0d1e4bd44477354c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 12:52:58 +0900
Subject: [PATCH 05276/10326] Match plurality

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

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index eb845cdea6..bda595e840 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -164,7 +164,7 @@ namespace osu.Game.Rulesets.Catch
                     return "small droplet";
 
                 case HitResult.LargeBonus:
-                    return "bananas";
+                    return "banana";
             }
 
             return base.GetDisplayNameForHitResult(result);

From ef092de9baaf3bde1e50abf5441fcefd847b6007 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 16:56:55 +0900
Subject: [PATCH 05277/10326] Add missing UpdateHitObject calls and move local
 to usages (not via bindables)

---
 .../Compose/Components/BlueprintContainer.cs  |  4 ++
 .../Timeline/TimelineHitObjectBlueprint.cs    |  4 +-
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 42 +++++++------------
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 970e16d1c3..addb970e8a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -436,8 +436,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 // Apply the start time at the newly snapped-to position
                 double offset = result.Time.Value - draggedObject.StartTime;
+
                 foreach (HitObject obj in SelectionHandler.SelectedHitObjects)
+                {
                     obj.StartTime += offset;
+                    Beatmap.UpdateHitObject(obj);
+                }
             }
 
             return true;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index f0757a3dda..6c3bcfae32 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -392,6 +392,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                 return;
 
                             repeatHitObject.RepeatCount = proposedCount;
+                            beatmap.UpdateHitObject(hitObject);
                             break;
 
                         case IHasDuration endTimeHitObject:
@@ -401,10 +402,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                 return;
 
                             endTimeHitObject.Duration = snappedTime - hitObject.StartTime;
+                            beatmap.UpdateHitObject(hitObject);
                             break;
                     }
-
-                    beatmap.UpdateHitObject(hitObject);
                 }
             }
 
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index fb75d91d16..d02841a95f 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -89,8 +89,6 @@ namespace osu.Game.Screens.Edit
 
         private IList mutableHitObjects => (IList)PlayableBeatmap.HitObjects;
 
-        private readonly HashSet<HitObject> pendingUpdates = new HashSet<HitObject>();
-
         private bool isBatchApplying;
 
         /// <summary>
@@ -150,7 +148,16 @@ namespace osu.Game.Screens.Edit
         /// <param name="hitObject">The <see cref="HitObject"/> to update.</param>
         public void UpdateHitObject([NotNull] HitObject hitObject)
         {
-            pendingUpdates.Add(hitObject);
+            if (isBatchApplying)
+                batchPendingUpdates.Add(hitObject);
+            else
+            {
+                beatmapProcessor?.PreProcess();
+                processHitObject(hitObject);
+                beatmapProcessor?.PostProcess();
+
+                HitObjectUpdated?.Invoke(hitObject);
+            }
         }
 
         /// <summary>
@@ -220,6 +227,8 @@ namespace osu.Game.Screens.Edit
 
         private readonly List<HitObject> batchPendingDeletes = new List<HitObject>();
 
+        private readonly HashSet<HitObject> batchPendingUpdates = new HashSet<HitObject>();
+
         /// <summary>
         /// Apply a batch of operations in one go, without performing Pre/Postprocessing each time.
         /// </summary>
@@ -237,14 +246,17 @@ namespace osu.Game.Screens.Edit
 
             foreach (var h in batchPendingDeletes) processHitObject(h);
             foreach (var h in batchPendingInserts) processHitObject(h);
+            foreach (var h in batchPendingUpdates) processHitObject(h);
 
             beatmapProcessor?.PostProcess();
 
             foreach (var h in batchPendingDeletes) HitObjectRemoved?.Invoke(h);
             foreach (var h in batchPendingInserts) HitObjectAdded?.Invoke(h);
+            foreach (var h in batchPendingUpdates) HitObjectUpdated?.Invoke(h);
 
             batchPendingDeletes.Clear();
             batchPendingInserts.Clear();
+            batchPendingUpdates.Clear();
 
             isBatchApplying = false;
         }
@@ -254,28 +266,6 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         public void Clear() => RemoveRange(HitObjects.ToArray());
 
-        protected override void Update()
-        {
-            base.Update();
-
-            // debounce updates as they are common and may come from input events, which can run needlessly many times per update frame.
-            if (pendingUpdates.Count > 0)
-            {
-                beatmapProcessor?.PreProcess();
-
-                foreach (var hitObject in pendingUpdates)
-                    processHitObject(hitObject);
-
-                beatmapProcessor?.PostProcess();
-
-                // explicitly needs to be fired after PostProcess
-                foreach (var hitObject in pendingUpdates)
-                    HitObjectUpdated?.Invoke(hitObject);
-
-                pendingUpdates.Clear();
-            }
-        }
-
         private void processHitObject(HitObject hitObject) => hitObject.ApplyDefaults(ControlPointInfo, BeatmapInfo.BaseDifficulty);
 
         private void trackStartTime(HitObject hitObject)
@@ -322,7 +312,7 @@ namespace osu.Game.Screens.Edit
         public void UpdateBeatmap()
         {
             foreach (var h in HitObjects)
-                pendingUpdates.Add(h);
+                batchPendingUpdates.Add(h);
         }
     }
 }

From ce04daf053e20ba3a6506f5bd887696d6d6761a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 16:57:04 +0900
Subject: [PATCH 05278/10326] Split transaction handling code out into base
 class

---
 osu.Game/Screens/Edit/EditorChangeHandler.cs  | 21 ++-------
 .../Edit/LegacyEditorBeatmapPatcher.cs        | 25 ++++++-----
 .../Edit/TransactionalCommitComponent.cs      | 45 +++++++++++++++++++
 3 files changed, 61 insertions(+), 30 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/TransactionalCommitComponent.cs

diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index b69e9c4c51..0c80a3e187 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Edit
     /// <summary>
     /// Tracks changes to the <see cref="Editor"/>.
     /// </summary>
-    public class EditorChangeHandler : IEditorChangeHandler
+    public class EditorChangeHandler : TransactionalCommitComponent, IEditorChangeHandler
     {
         public readonly Bindable<bool> CanUndo = new Bindable<bool>();
         public readonly Bindable<bool> CanRedo = new Bindable<bool>();
@@ -41,7 +41,6 @@ namespace osu.Game.Screens.Edit
         }
 
         private readonly EditorBeatmap editorBeatmap;
-        private int bulkChangesStarted;
         private bool isRestoring;
 
         public const int MAX_SAVED_STATES = 50;
@@ -70,22 +69,8 @@ namespace osu.Game.Screens.Edit
 
         private void hitObjectUpdated(HitObject obj) => SaveState();
 
-        public void BeginChange() => bulkChangesStarted++;
-
-        public void EndChange()
+        protected override void UpdateState()
         {
-            if (bulkChangesStarted == 0)
-                throw new InvalidOperationException($"Cannot call {nameof(EndChange)} without a previous call to {nameof(BeginChange)}.");
-
-            if (--bulkChangesStarted == 0)
-                SaveState();
-        }
-
-        public void SaveState()
-        {
-            if (bulkChangesStarted > 0)
-                return;
-
             if (isRestoring)
                 return;
 
@@ -120,7 +105,7 @@ namespace osu.Game.Screens.Edit
         /// <param name="direction">The direction to restore in. If less than 0, an older state will be used. If greater than 0, a newer state will be used.</param>
         public void RestoreState(int direction)
         {
-            if (bulkChangesStarted > 0)
+            if (TransactionActive)
                 return;
 
             if (savedStates.Count == 0)
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index fb7d0dd826..72d3421755 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -68,19 +68,20 @@ namespace osu.Game.Screens.Edit
             toRemove.Sort();
             toAdd.Sort();
 
-            editorBeatmap.ApplyBatchChanges(eb =>
-            {
-                // Apply the changes.
-                for (int i = toRemove.Count - 1; i >= 0; i--)
-                    eb.RemoveAt(toRemove[i]);
+            editorBeatmap.BeginChange();
 
-                if (toAdd.Count > 0)
-                {
-                    IBeatmap newBeatmap = readBeatmap(newState);
-                    foreach (var i in toAdd)
-                        eb.Insert(i, newBeatmap.HitObjects[i]);
-                }
-            });
+            // Apply the changes.
+            for (int i = toRemove.Count - 1; i >= 0; i--)
+                editorBeatmap.RemoveAt(toRemove[i]);
+
+            if (toAdd.Count > 0)
+            {
+                IBeatmap newBeatmap = readBeatmap(newState);
+                foreach (var i in toAdd)
+                    editorBeatmap.Insert(i, newBeatmap.HitObjects[i]);
+            }
+
+            editorBeatmap.EndChange();
         }
 
         private string readString(byte[] state) => Encoding.UTF8.GetString(state);
diff --git a/osu.Game/Screens/Edit/TransactionalCommitComponent.cs b/osu.Game/Screens/Edit/TransactionalCommitComponent.cs
new file mode 100644
index 0000000000..87a29a6237
--- /dev/null
+++ b/osu.Game/Screens/Edit/TransactionalCommitComponent.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 System;
+
+namespace osu.Game.Screens.Edit
+{
+    /// <summary>
+    /// A component that tracks a batch change, only applying after all active changes are completed.
+    /// </summary>
+    public abstract class TransactionalCommitComponent
+    {
+        public bool TransactionActive => bulkChangesStarted > 0;
+
+        private int bulkChangesStarted;
+
+        /// <summary>
+        /// Signal the beginning of a change.
+        /// </summary>
+        public void BeginChange() => bulkChangesStarted++;
+
+        /// <summary>
+        /// Signal the end of a change.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Throws if <see cref="BeginChange"/> was not first called.</exception>
+        public void EndChange()
+        {
+            if (bulkChangesStarted == 0)
+                throw new InvalidOperationException($"Cannot call {nameof(EndChange)} without a previous call to {nameof(BeginChange)}.");
+
+            if (--bulkChangesStarted == 0)
+                UpdateState();
+        }
+
+        public void SaveState()
+        {
+            if (bulkChangesStarted > 0)
+                return;
+
+            UpdateState();
+        }
+
+        protected abstract void UpdateState();
+    }
+}

From a9bca671d0e3ae2d4a14cf36e5ac541a78bbb63e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 17:17:52 +0900
Subject: [PATCH 05279/10326] Make component and add hooking events

---
 .../Edit/TransactionalCommitComponent.cs      | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/TransactionalCommitComponent.cs b/osu.Game/Screens/Edit/TransactionalCommitComponent.cs
index 87a29a6237..3d3539ee2f 100644
--- a/osu.Game/Screens/Edit/TransactionalCommitComponent.cs
+++ b/osu.Game/Screens/Edit/TransactionalCommitComponent.cs
@@ -2,14 +2,30 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Edit
 {
     /// <summary>
     /// A component that tracks a batch change, only applying after all active changes are completed.
     /// </summary>
-    public abstract class TransactionalCommitComponent
+    public abstract class TransactionalCommitComponent : Component
     {
+        /// <summary>
+        /// Fires whenever a transaction begins. Will not fire on nested transactions.
+        /// </summary>
+        public event Action TransactionBegan;
+
+        /// <summary>
+        /// Fires when the last transaction completes.
+        /// </summary>
+        public event Action TransactionEnded;
+
+        /// <summary>
+        /// Fires when <see cref="SaveState"/> is called and results in a non-transactional state save.
+        /// </summary>
+        public event Action SaveStateTriggered;
+
         public bool TransactionActive => bulkChangesStarted > 0;
 
         private int bulkChangesStarted;
@@ -17,7 +33,11 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// Signal the beginning of a change.
         /// </summary>
-        public void BeginChange() => bulkChangesStarted++;
+        public void BeginChange()
+        {
+            if (bulkChangesStarted++ == 0)
+                TransactionBegan?.Invoke();
+        }
 
         /// <summary>
         /// Signal the end of a change.
@@ -29,14 +49,22 @@ namespace osu.Game.Screens.Edit
                 throw new InvalidOperationException($"Cannot call {nameof(EndChange)} without a previous call to {nameof(BeginChange)}.");
 
             if (--bulkChangesStarted == 0)
+            {
                 UpdateState();
+                TransactionEnded?.Invoke();
+            }
         }
 
+        /// <summary>
+        /// Force an update of the state with no attached transaction.
+        /// This is a no-op if a transaction is already active. Should generally be used as a safety measure to ensure granular changes are not left outside a transaction.
+        /// </summary>
         public void SaveState()
         {
             if (bulkChangesStarted > 0)
                 return;
 
+            SaveStateTriggered?.Invoke();
             UpdateState();
         }
 

From 0781fbd44360daccc23d0fe585a98c4b91b5676d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 17:18:20 +0900
Subject: [PATCH 05280/10326] Make EditorBeatmap implement
 TransactionalCommitComponent

---
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 61 +++++++------------
 .../Screens/Edit/Setup/DifficultySection.cs   |  2 +-
 2 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index d02841a95f..f776908a0b 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -8,7 +8,6 @@ using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
@@ -18,7 +17,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Edit
 {
-    public class EditorBeatmap : Component, IBeatmap, IBeatSnapProvider
+    public class EditorBeatmap : TransactionalCommitComponent, IBeatmap, IBeatSnapProvider
     {
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> is added to this <see cref="EditorBeatmap"/>.
@@ -89,19 +88,16 @@ namespace osu.Game.Screens.Edit
 
         private IList mutableHitObjects => (IList)PlayableBeatmap.HitObjects;
 
-        private bool isBatchApplying;
-
         /// <summary>
         /// Adds a collection of <see cref="HitObject"/>s to this <see cref="EditorBeatmap"/>.
         /// </summary>
         /// <param name="hitObjects">The <see cref="HitObject"/>s to add.</param>
         public void AddRange(IEnumerable<HitObject> hitObjects)
         {
-            ApplyBatchChanges(_ =>
-            {
-                foreach (var h in hitObjects)
-                    Add(h);
-            });
+            BeginChange();
+            foreach (var h in hitObjects)
+                Add(h);
+            EndChange();
         }
 
         /// <summary>
@@ -129,7 +125,7 @@ namespace osu.Game.Screens.Edit
 
             mutableHitObjects.Insert(index, hitObject);
 
-            if (isBatchApplying)
+            if (TransactionActive)
                 batchPendingInserts.Add(hitObject);
             else
             {
@@ -148,16 +144,8 @@ namespace osu.Game.Screens.Edit
         /// <param name="hitObject">The <see cref="HitObject"/> to update.</param>
         public void UpdateHitObject([NotNull] HitObject hitObject)
         {
-            if (isBatchApplying)
-                batchPendingUpdates.Add(hitObject);
-            else
-            {
-                beatmapProcessor?.PreProcess();
-                processHitObject(hitObject);
-                beatmapProcessor?.PostProcess();
-
-                HitObjectUpdated?.Invoke(hitObject);
-            }
+            // updates are debounced regardless of whether a batch is active.
+            batchPendingUpdates.Add(hitObject);
         }
 
         /// <summary>
@@ -182,11 +170,10 @@ namespace osu.Game.Screens.Edit
         /// <param name="hitObjects">The <see cref="HitObject"/>s to remove.</param>
         public void RemoveRange(IEnumerable<HitObject> hitObjects)
         {
-            ApplyBatchChanges(_ =>
-            {
-                foreach (var h in hitObjects)
-                    Remove(h);
-            });
+            BeginChange();
+            foreach (var h in hitObjects)
+                Remove(h);
+            EndChange();
         }
 
         /// <summary>
@@ -210,7 +197,7 @@ namespace osu.Game.Screens.Edit
             bindable.UnbindAll();
             startTimeBindables.Remove(hitObject);
 
-            if (isBatchApplying)
+            if (TransactionActive)
                 batchPendingDeletes.Add(hitObject);
             else
             {
@@ -229,18 +216,18 @@ namespace osu.Game.Screens.Edit
 
         private readonly HashSet<HitObject> batchPendingUpdates = new HashSet<HitObject>();
 
-        /// <summary>
-        /// Apply a batch of operations in one go, without performing Pre/Postprocessing each time.
-        /// </summary>
-        /// <param name="applyFunction">The function which will apply the batch changes.</param>
-        public void ApplyBatchChanges(Action<EditorBeatmap> applyFunction)
+        protected override void Update()
         {
-            if (isBatchApplying)
-                throw new InvalidOperationException("Attempting to perform a batch application from within an existing batch");
+            base.Update();
 
-            isBatchApplying = true;
+            if (batchPendingUpdates.Count > 0)
+                UpdateState();
+        }
 
-            applyFunction(this);
+        protected override void UpdateState()
+        {
+            if (batchPendingUpdates.Count == 0 && batchPendingDeletes.Count == 0 && batchPendingInserts.Count == 0)
+                return;
 
             beatmapProcessor?.PreProcess();
 
@@ -257,8 +244,6 @@ namespace osu.Game.Screens.Edit
             batchPendingDeletes.Clear();
             batchPendingInserts.Clear();
             batchPendingUpdates.Clear();
-
-            isBatchApplying = false;
         }
 
         /// <summary>
@@ -309,7 +294,7 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// Update all hit objects with potentially changed difficulty or control point data.
         /// </summary>
-        public void UpdateBeatmap()
+        public void UpdateAllHitObjects()
         {
             foreach (var h in HitObjects)
                 batchPendingUpdates.Add(h);
diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 2d8031c3c8..aa1d57db31 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Edit.Setup
             Beatmap.Value.BeatmapInfo.BaseDifficulty.ApproachRate = approachRateSlider.Current.Value;
             Beatmap.Value.BeatmapInfo.BaseDifficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
 
-            editorBeatmap.UpdateBeatmap();
+            editorBeatmap.UpdateAllHitObjects();
         }
     }
 }

From b2d93f799f8cc269f037baccf6ad7e903cbb5b00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 17:22:35 +0900
Subject: [PATCH 05281/10326] Hook ChangeHandler to transactional events rather
 than individual ones

---
 osu.Game/Screens/Edit/EditorChangeHandler.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 0c80a3e187..62187aed24 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -53,9 +53,9 @@ namespace osu.Game.Screens.Edit
         {
             this.editorBeatmap = editorBeatmap;
 
-            editorBeatmap.HitObjectAdded += hitObjectAdded;
-            editorBeatmap.HitObjectRemoved += hitObjectRemoved;
-            editorBeatmap.HitObjectUpdated += hitObjectUpdated;
+            editorBeatmap.TransactionBegan += BeginChange;
+            editorBeatmap.TransactionEnded += EndChange;
+            editorBeatmap.SaveStateTriggered += SaveState;
 
             patcher = new LegacyEditorBeatmapPatcher(editorBeatmap);
 
@@ -63,12 +63,6 @@ namespace osu.Game.Screens.Edit
             SaveState();
         }
 
-        private void hitObjectAdded(HitObject obj) => SaveState();
-
-        private void hitObjectRemoved(HitObject obj) => SaveState();
-
-        private void hitObjectUpdated(HitObject obj) => SaveState();
-
         protected override void UpdateState()
         {
             if (isRestoring)

From 7ffab38728014fffdeedbc9906258f693c26167a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 17:43:08 +0900
Subject: [PATCH 05282/10326] Add test coverage of TransactionalCommitComponent

---
 .../TransactionalCommitComponentTest.cs       | 100 ++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/TransactionalCommitComponentTest.cs

diff --git a/osu.Game.Tests/Editing/TransactionalCommitComponentTest.cs b/osu.Game.Tests/Editing/TransactionalCommitComponentTest.cs
new file mode 100644
index 0000000000..4ce9115ec4
--- /dev/null
+++ b/osu.Game.Tests/Editing/TransactionalCommitComponentTest.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 System;
+using NUnit.Framework;
+using osu.Game.Screens.Edit;
+
+namespace osu.Game.Tests.Editing
+{
+    [TestFixture]
+    public class TransactionalCommitComponentTest
+    {
+        private TestHandler handler;
+
+        [SetUp]
+        public void SetUp()
+        {
+            handler = new TestHandler();
+        }
+
+        [Test]
+        public void TestCommitTransaction()
+        {
+            Assert.That(handler.StateUpdateCount, Is.EqualTo(0));
+
+            handler.BeginChange();
+            Assert.That(handler.StateUpdateCount, Is.EqualTo(0));
+            handler.EndChange();
+
+            Assert.That(handler.StateUpdateCount, Is.EqualTo(1));
+        }
+
+        [Test]
+        public void TestSaveOutsideOfTransactionTriggersUpdates()
+        {
+            Assert.That(handler.StateUpdateCount, Is.EqualTo(0));
+
+            handler.SaveState();
+            Assert.That(handler.StateUpdateCount, Is.EqualTo(1));
+
+            handler.SaveState();
+            Assert.That(handler.StateUpdateCount, Is.EqualTo(2));
+        }
+
+        [Test]
+        public void TestEventsFire()
+        {
+            int transactionBegan = 0;
+            int transactionEnded = 0;
+            int stateSaved = 0;
+
+            handler.TransactionBegan += () => transactionBegan++;
+            handler.TransactionEnded += () => transactionEnded++;
+            handler.SaveStateTriggered += () => stateSaved++;
+
+            handler.BeginChange();
+            Assert.That(transactionBegan, Is.EqualTo(1));
+
+            handler.EndChange();
+            Assert.That(transactionEnded, Is.EqualTo(1));
+
+            Assert.That(stateSaved, Is.EqualTo(0));
+            handler.SaveState();
+            Assert.That(stateSaved, Is.EqualTo(1));
+        }
+
+        [Test]
+        public void TestSaveDuringTransactionDoesntTriggerUpdate()
+        {
+            Assert.That(handler.StateUpdateCount, Is.EqualTo(0));
+
+            handler.BeginChange();
+
+            handler.SaveState();
+            Assert.That(handler.StateUpdateCount, Is.EqualTo(0));
+
+            handler.EndChange();
+
+            Assert.That(handler.StateUpdateCount, Is.EqualTo(1));
+        }
+
+        [Test]
+        public void TestEndWithoutBeginThrows()
+        {
+            handler.BeginChange();
+            handler.EndChange();
+            Assert.That(() => handler.EndChange(), Throws.TypeOf<InvalidOperationException>());
+        }
+
+        private class TestHandler : TransactionalCommitComponent
+        {
+            public int StateUpdateCount { get; private set; }
+
+            protected override void UpdateState()
+            {
+                StateUpdateCount++;
+            }
+        }
+    }
+}

From 38babf3de587e86d83655f2c056d690ca4ab9a44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 17:43:27 +0900
Subject: [PATCH 05283/10326] Update usages of ChangeHandler to EditorBeatmap
 where relevant

---
 .../Edit/TaikoSelectionHandler.cs                  |  8 ++++----
 .../Edit/Compose/Components/SelectionHandler.cs    | 14 ++++++--------
 osu.Game/Screens/Edit/Editor.cs                    |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index d5dd758e10..97998c0f76 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
         {
             var hits = SelectedHitObjects.OfType<Hit>();
 
-            ChangeHandler.BeginChange();
+            EditorBeatmap.BeginChange();
 
             foreach (var h in hits)
             {
@@ -65,19 +65,19 @@ namespace osu.Game.Rulesets.Taiko.Edit
                 }
             }
 
-            ChangeHandler.EndChange();
+            EditorBeatmap.EndChange();
         }
 
         public void SetRimState(bool state)
         {
             var hits = SelectedHitObjects.OfType<Hit>();
 
-            ChangeHandler.BeginChange();
+            EditorBeatmap.BeginChange();
 
             foreach (var h in hits)
                 h.Type = state ? HitType.Rim : HitType.Centre;
 
-            ChangeHandler.EndChange();
+            EditorBeatmap.EndChange();
         }
 
         protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 7808d7a5bc..6a180c439b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -238,9 +238,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void deleteSelected()
         {
-            ChangeHandler?.BeginChange();
             EditorBeatmap?.RemoveRange(selectedBlueprints.Select(b => b.HitObject));
-            ChangeHandler?.EndChange();
         }
 
         #endregion
@@ -307,7 +305,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void AddHitSample(string sampleName)
         {
-            ChangeHandler?.BeginChange();
+            EditorBeatmap?.BeginChange();
 
             foreach (var h in SelectedHitObjects)
             {
@@ -318,7 +316,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 h.Samples.Add(new HitSampleInfo { Name = sampleName });
             }
 
-            ChangeHandler?.EndChange();
+            EditorBeatmap?.EndChange();
         }
 
         /// <summary>
@@ -328,7 +326,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
         public void SetNewCombo(bool state)
         {
-            ChangeHandler?.BeginChange();
+            EditorBeatmap?.BeginChange();
 
             foreach (var h in SelectedHitObjects)
             {
@@ -340,7 +338,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 EditorBeatmap?.UpdateHitObject(h);
             }
 
-            ChangeHandler?.EndChange();
+            EditorBeatmap?.EndChange();
         }
 
         /// <summary>
@@ -349,12 +347,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void RemoveHitSample(string sampleName)
         {
-            ChangeHandler?.BeginChange();
+            EditorBeatmap?.BeginChange();
 
             foreach (var h in SelectedHitObjects)
                 h.SamplesBindable.RemoveAll(s => s.Name == sampleName);
 
-            ChangeHandler?.EndChange();
+            EditorBeatmap?.EndChange();
         }
 
         #endregion
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 3c5cbf30e9..74f324364a 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -509,14 +509,14 @@ namespace osu.Game.Screens.Edit
             foreach (var h in objects)
                 h.StartTime += timeOffset;
 
-            changeHandler.BeginChange();
+            editorBeatmap.BeginChange();
 
             editorBeatmap.SelectedHitObjects.Clear();
 
             editorBeatmap.AddRange(objects);
             editorBeatmap.SelectedHitObjects.AddRange(objects);
 
-            changeHandler.EndChange();
+            editorBeatmap.EndChange();
         }
 
         protected void Undo() => changeHandler.RestoreState(-1);

From 1027b608ffb86df7c35afff6a9dd8a34124d4607 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 17:52:49 +0900
Subject: [PATCH 05284/10326] Copy list content before firing events to avoid
 pollution

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index f776908a0b..098d05471f 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -237,13 +237,19 @@ namespace osu.Game.Screens.Edit
 
             beatmapProcessor?.PostProcess();
 
-            foreach (var h in batchPendingDeletes) HitObjectRemoved?.Invoke(h);
-            foreach (var h in batchPendingInserts) HitObjectAdded?.Invoke(h);
-            foreach (var h in batchPendingUpdates) HitObjectUpdated?.Invoke(h);
-
+            // callbacks may modify the lists so let's be safe about it
+            var deletes = batchPendingDeletes.ToArray();
             batchPendingDeletes.Clear();
+
+            var inserts = batchPendingInserts.ToArray();
             batchPendingInserts.Clear();
+
+            var updates = batchPendingUpdates.ToArray();
             batchPendingUpdates.Clear();
+
+            foreach (var h in deletes) HitObjectRemoved?.Invoke(h);
+            foreach (var h in inserts) HitObjectAdded?.Invoke(h);
+            foreach (var h in updates) HitObjectUpdated?.Invoke(h);
         }
 
         /// <summary>

From afed832b19e3e8dfe3d3bf94105e0b84d2073f76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 18:06:46 +0900
Subject: [PATCH 05285/10326] Tidy up EditorBeatmap slightly

---
 .../Sliders/SliderSelectionBlueprint.cs       |  2 +-
 .../Edit/TaikoSelectionHandler.cs             |  2 +-
 .../Compose/Components/BlueprintContainer.cs  |  4 +--
 .../Compose/Components/SelectionHandler.cs    |  2 +-
 .../Timeline/TimelineHitObjectBlueprint.cs    |  4 +--
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 34 +++++++++----------
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 94862eb205..f260c5a8fa 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void updatePath()
         {
             HitObject.Path.ExpectedDistance.Value = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
-            editorBeatmap?.UpdateHitObject(HitObject);
+            editorBeatmap?.Update(HitObject);
         }
 
         public override MenuItem[] ContextMenuItems => new MenuItem[]
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index 97998c0f76..ee92936fc2 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
                 if (h.IsStrong != state)
                 {
                     h.IsStrong = state;
-                    EditorBeatmap.UpdateHitObject(h);
+                    EditorBeatmap.Update(h);
                 }
             }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index addb970e8a..c7f87ae08e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 // handle positional change etc.
                 foreach (var obj in selectedHitObjects)
-                    Beatmap.UpdateHitObject(obj);
+                    Beatmap.Update(obj);
 
                 changeHandler?.EndChange();
                 isDraggingBlueprint = false;
@@ -440,7 +440,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 foreach (HitObject obj in SelectionHandler.SelectedHitObjects)
                 {
                     obj.StartTime += offset;
-                    Beatmap.UpdateHitObject(obj);
+                    Beatmap.Update(obj);
                 }
             }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 6a180c439b..e8ab09df85 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -335,7 +335,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 if (comboInfo == null || comboInfo.NewCombo == state) continue;
 
                 comboInfo.NewCombo = state;
-                EditorBeatmap?.UpdateHitObject(h);
+                EditorBeatmap?.Update(h);
             }
 
             EditorBeatmap?.EndChange();
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 6c3bcfae32..975433d407 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -392,7 +392,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                 return;
 
                             repeatHitObject.RepeatCount = proposedCount;
-                            beatmap.UpdateHitObject(hitObject);
+                            beatmap.Update(hitObject);
                             break;
 
                         case IHasDuration endTimeHitObject:
@@ -402,7 +402,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                 return;
 
                             endTimeHitObject.Duration = snappedTime - hitObject.StartTime;
-                            beatmap.UpdateHitObject(hitObject);
+                            beatmap.Update(hitObject);
                             break;
                     }
                 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 098d05471f..3278f44e06 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -88,6 +88,12 @@ namespace osu.Game.Screens.Edit
 
         private IList mutableHitObjects => (IList)PlayableBeatmap.HitObjects;
 
+        private readonly List<HitObject> batchPendingInserts = new List<HitObject>();
+
+        private readonly List<HitObject> batchPendingDeletes = new List<HitObject>();
+
+        private readonly HashSet<HitObject> batchPendingUpdates = new HashSet<HitObject>();
+
         /// <summary>
         /// Adds a collection of <see cref="HitObject"/>s to this <see cref="EditorBeatmap"/>.
         /// </summary>
@@ -142,12 +148,21 @@ namespace osu.Game.Screens.Edit
         /// 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([NotNull] HitObject hitObject)
+        public void Update([NotNull] HitObject hitObject)
         {
             // updates are debounced regardless of whether a batch is active.
             batchPendingUpdates.Add(hitObject);
         }
 
+        /// <summary>
+        /// Update all hit objects with potentially changed difficulty or control point data.
+        /// </summary>
+        public void UpdateAllHitObjects()
+        {
+            foreach (var h in HitObjects)
+                batchPendingUpdates.Add(h);
+        }
+
         /// <summary>
         /// Removes a <see cref="HitObject"/> from this <see cref="EditorBeatmap"/>.
         /// </summary>
@@ -210,12 +225,6 @@ namespace osu.Game.Screens.Edit
             }
         }
 
-        private readonly List<HitObject> batchPendingInserts = new List<HitObject>();
-
-        private readonly List<HitObject> batchPendingDeletes = new List<HitObject>();
-
-        private readonly HashSet<HitObject> batchPendingUpdates = new HashSet<HitObject>();
-
         protected override void Update()
         {
             base.Update();
@@ -270,7 +279,7 @@ namespace osu.Game.Screens.Edit
                 var insertionIndex = findInsertionIndex(PlayableBeatmap.HitObjects, hitObject.StartTime);
                 mutableHitObjects.Insert(insertionIndex + 1, hitObject);
 
-                UpdateHitObject(hitObject);
+                Update(hitObject);
             };
         }
 
@@ -296,14 +305,5 @@ namespace osu.Game.Screens.Edit
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
 
         public int BeatDivisor => beatDivisor?.Value ?? 1;
-
-        /// <summary>
-        /// Update all hit objects with potentially changed difficulty or control point data.
-        /// </summary>
-        public void UpdateAllHitObjects()
-        {
-            foreach (var h in HitObjects)
-                batchPendingUpdates.Add(h);
-        }
     }
 }

From c9f069d7edd6add1e6625f0e28921acbd9ffa610 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 18:17:57 +0900
Subject: [PATCH 05286/10326] Fix taiko's HitObjectComposer not allowing
 movement o f selected hitobjects

---
 osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index d5dd758e10..ac14e6131a 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -89,6 +89,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
                 yield return new TernaryStateMenuItem("Strong") { State = { BindTarget = selectionStrongState } };
         }
 
+        public override bool HandleMovement(MoveSelectionEvent moveEvent) => true;
+
         protected override void UpdateTernaryStates()
         {
             base.UpdateTernaryStates();

From 0967db768ffb922e0d6e46fe71ada6bf94731533 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 18:25:40 +0900
Subject: [PATCH 05287/10326] Add xmldoc covering usage restrictions

---
 osu.Game/OsuGame.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 772f9ff145..e6f6d526cf 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -98,7 +98,11 @@ namespace osu.Game
         /// <summary>
         /// Whether the local user is currently interacting with the game in a way that should not be interrupted.
         /// </summary>
-        public readonly Bindable<bool> LocalUserPlaying = new BindableBool();
+        /// <remarks>
+        /// This is exclusively managed by <see cref="Player"/>. If other components are mutating this state, a more
+        /// resilient method should be used to ensure correct state.
+        /// </remarks>
+        public Bindable<bool> LocalUserPlaying = new BindableBool();
 
         protected OsuScreenStack ScreenStack;
 

From 43a575484ad1440a799aa41433840b47f5299f1e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 18:25:43 +0900
Subject: [PATCH 05288/10326] Remove pointless comments

---
 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 8830884a40..80dd8ae92c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -666,7 +666,6 @@ namespace osu.Game.Screens.Play
         {
             screenSuspension?.Expire();
 
-            // Ensure we reset the LocalUserPlaying state
             LocalUserPlaying.Value = false;
 
             fadeOut();
@@ -698,7 +697,6 @@ namespace osu.Game.Screens.Play
 
             musicController.ResetTrackAdjustments();
 
-            // Ensure we reset the LocalUserPlaying state
             LocalUserPlaying.Value = false;
 
             fadeOut();

From dbdb25ccf756cf48ec3ecff87a81aec86f0f0224 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 18:29:19 +0900
Subject: [PATCH 05289/10326] Move reset logic to OsuGame

---
 osu.Game/OsuGame.cs             | 3 +++
 osu.Game/Screens/Play/Player.cs | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e6f6d526cf..d315b213ab 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -957,6 +957,9 @@ namespace osu.Game
                     break;
             }
 
+            // reset on screen change for sanity.
+            LocalUserPlaying.Value = false;
+
             if (current is IOsuScreen currentOsuScreen)
                 OverlayActivationMode.UnbindFrom(currentOsuScreen.OverlayActivationMode);
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 80dd8ae92c..45f194fc29 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -666,8 +666,6 @@ namespace osu.Game.Screens.Play
         {
             screenSuspension?.Expire();
 
-            LocalUserPlaying.Value = false;
-
             fadeOut();
             base.OnSuspending(next);
         }
@@ -697,8 +695,6 @@ namespace osu.Game.Screens.Play
 
             musicController.ResetTrackAdjustments();
 
-            LocalUserPlaying.Value = false;
-
             fadeOut();
             return base.OnExiting(next);
         }

From 3114174e098a898bf09a9946b374fd99fc90ff48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 18:41:03 +0900
Subject: [PATCH 05290/10326] Add missing non-transactional SaveState calls

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 3278f44e06..946c6905db 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -141,6 +141,7 @@ namespace osu.Game.Screens.Edit
                 beatmapProcessor?.PostProcess();
 
                 HitObjectAdded?.Invoke(hitObject);
+                SaveState();
             }
         }
 
@@ -222,6 +223,7 @@ namespace osu.Game.Screens.Edit
                 beatmapProcessor?.PostProcess();
 
                 HitObjectRemoved?.Invoke(hitObject);
+                SaveState();
             }
         }
 

From 4ccd751604fdc8ceb9561f66f0dd5b5d50d66db6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Oct 2020 18:42:53 +0900
Subject: [PATCH 05291/10326] Further simplify non-transactional change logic

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 30 ++++++--------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 946c6905db..165d2ba278 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -131,18 +131,9 @@ namespace osu.Game.Screens.Edit
 
             mutableHitObjects.Insert(index, hitObject);
 
-            if (TransactionActive)
-                batchPendingInserts.Add(hitObject);
-            else
-            {
-                // must be run after any change to hitobject ordering
-                beatmapProcessor?.PreProcess();
-                processHitObject(hitObject);
-                beatmapProcessor?.PostProcess();
-
-                HitObjectAdded?.Invoke(hitObject);
-                SaveState();
-            }
+            BeginChange();
+            batchPendingInserts.Add(hitObject);
+            EndChange();
         }
 
         /// <summary>
@@ -213,18 +204,9 @@ namespace osu.Game.Screens.Edit
             bindable.UnbindAll();
             startTimeBindables.Remove(hitObject);
 
-            if (TransactionActive)
-                batchPendingDeletes.Add(hitObject);
-            else
-            {
-                // must be run after any change to hitobject ordering
-                beatmapProcessor?.PreProcess();
-                processHitObject(hitObject);
-                beatmapProcessor?.PostProcess();
-
-                HitObjectRemoved?.Invoke(hitObject);
-                SaveState();
-            }
+            BeginChange();
+            batchPendingDeletes.Add(hitObject);
+            EndChange();
         }
 
         protected override void Update()

From fa201be2adb1ef8c7382ea578585854d476bc128 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 8 Oct 2020 18:31:29 +0200
Subject: [PATCH 05292/10326] Simplify PerformanceCacheLookup

---
 osu.Game/Scoring/ScorePerformanceManager.cs | 26 +++++----------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index 0189a86172..783425052f 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -9,7 +9,6 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Scoring
 {
@@ -57,34 +56,21 @@ namespace osu.Game.Scoring
 
         public readonly struct PerformanceCacheLookup
         {
-            public readonly double Accuracy;
-            public readonly int BeatmapId;
-            public readonly long TotalScore;
-            public readonly int Combo;
-            public readonly Mod[] Mods;
-            public readonly int RulesetId;
+            public readonly string ScoreHash;
+            public readonly int LocalId;
 
             public PerformanceCacheLookup(ScoreInfo info)
             {
-                Accuracy = info.Accuracy;
-                BeatmapId = info.Beatmap.ID;
-                TotalScore = info.TotalScore;
-                Combo = info.Combo;
-                Mods = info.Mods;
-                RulesetId = info.Ruleset.ID ?? 0;
+                ScoreHash = info.Hash;
+                LocalId = info.ID;
             }
 
             public override int GetHashCode()
             {
                 var hash = new HashCode();
 
-                hash.Add(Accuracy);
-                hash.Add(BeatmapId);
-                hash.Add(TotalScore);
-                hash.Add(Combo);
-                hash.Add(RulesetId);
-                foreach (var mod in Mods)
-                    hash.Add(mod);
+                hash.Add(ScoreHash);
+                hash.Add(LocalId);
 
                 return hash.ToHashCode();
             }

From 2d0275ba958e9de5fbb8c68635177026a86487e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 03:07:01 +0900
Subject: [PATCH 05293/10326] Fix first hitobject in osu! hidden mod not
 getting correct fade applied

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 15 +++++++++++----
 osu.Game/Rulesets/Mods/ModHidden.cs        | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 80e40af717..d354a8a726 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -42,7 +42,11 @@ namespace osu.Game.Rulesets.Osu.Mods
         private double lastSliderHeadFadeOutStartTime;
         private double lastSliderHeadFadeOutDuration;
 
-        protected override void ApplyHiddenState(DrawableHitObject drawable, ArmedState state)
+        protected override void ApplyFirstObjectIncreaseVisibilityState(DrawableHitObject drawable, ArmedState state) => applyState(drawable, true);
+
+        protected override void ApplyHiddenState(DrawableHitObject drawable, ArmedState state) => applyState(drawable, false);
+
+        private void applyState(DrawableHitObject drawable, bool increaseVisibility)
         {
             if (!(drawable is DrawableOsuHitObject d))
                 return;
@@ -86,9 +90,12 @@ namespace osu.Game.Rulesets.Osu.Mods
                         lastSliderHeadFadeOutStartTime = fadeOutStartTime;
                     }
 
-                    // we don't want to see the approach circle
-                    using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
-                        circle.ApproachCircle.Hide();
+                    if (!increaseVisibility)
+                    {
+                        // we don't want to see the approach circle
+                        using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
+                            circle.ApproachCircle.Hide();
+                    }
 
                     // fade out immediately after fade in.
                     using (drawable.BeginAbsoluteSequence(fadeOutStartTime, true))
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index a1915b974c..d81b439f6a 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -38,7 +38,13 @@ namespace osu.Game.Rulesets.Mods
         public virtual void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
             if (IncreaseFirstObjectVisibility.Value)
+            {
+                var firstObject = drawables.FirstOrDefault();
+                if (firstObject != null)
+                    firstObject.ApplyCustomUpdateState += ApplyFirstObjectIncreaseVisibilityState;
+
                 drawables = drawables.SkipWhile(h => !IsFirstHideableObject(h)).Skip(1);
+            }
 
             foreach (var dho in drawables)
                 dho.ApplyCustomUpdateState += ApplyHiddenState;
@@ -65,6 +71,20 @@ namespace osu.Game.Rulesets.Mods
             }
         }
 
+        /// <summary>
+        /// Apply a special visibility state to the first object in a beatmap, if the user chooses to turn on the "increase first object visibility" setting.
+        /// </summary>
+        /// <param name="hitObject">The hit object to apply the state change to.</param>
+        /// <param name="state">The state of the hit object.</param>
+        protected virtual void ApplyFirstObjectIncreaseVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        /// <summary>
+        /// Apply a hidden state to the provided object.
+        /// </summary>
+        /// <param name="hitObject">The hit object to apply the state change to.</param>
+        /// <param name="state">The state of the hit object.</param>
         protected virtual void ApplyHiddenState(DrawableHitObject hitObject, ArmedState state)
         {
         }

From e7eda19b0723b8edd16d68989434e340c8e9992d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 03:31:01 +0900
Subject: [PATCH 05294/10326] Reset new combo button state after successful
 placement

---
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 9b3314e2ad..0336c74386 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -201,7 +201,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void AddBlueprintFor(HitObject hitObject)
         {
             refreshTool();
+
             base.AddBlueprintFor(hitObject);
+
+            // on successful placement, the new combo button should be reset as this is the most common user interaction.
+            if (Beatmap.SelectedHitObjects.Count == 0)
+                NewCombo.Value = TernaryState.False;
         }
 
         private void createPlacement()

From 5966205037867aefc6c0a4ed4ea5d0ecbe312b46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 04:31:33 +0900
Subject: [PATCH 05295/10326] Fix ternary button states not updating correctly
 after a paste operation

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 7808d7a5bc..c5e88ade84 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public int SelectedCount => selectedBlueprints.Count;
 
-        public IEnumerable<HitObject> SelectedHitObjects => selectedBlueprints.Select(b => b.HitObject);
+        public IEnumerable<HitObject> SelectedHitObjects => EditorBeatmap.SelectedHitObjects;
 
         private Drawable content;
 

From a5b2c4195efb48684a69a44655a1165c1168563b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 04:41:45 +0900
Subject: [PATCH 05296/10326] Fix incorrect timing distribution display due to
 lack of rounding

---
 .../Ranking/TestSceneHitEventTimingDistributionGraph.cs     | 6 ++++++
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index 144f8da2fa..9059fe34af 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -23,6 +23,12 @@ namespace osu.Game.Tests.Visual.Ranking
             createTest(CreateDistributedHitEvents());
         }
 
+        [Test]
+        public void TestAroundCentre()
+        {
+            createTest(Enumerable.Range(-100, 100).Select(i => new HitEvent(i / 50f, HitResult.Perfect, new HitCircle(), new HitCircle(), null)).ToList());
+        }
+
         [Test]
         public void TestZeroTimeOffset()
         {
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index aa2a83774e..980fc68788 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             foreach (var e in hitEvents)
             {
-                int binOffset = (int)(e.TimeOffset / binSize);
+                int binOffset = (int)Math.Round(e.TimeOffset / binSize);
                 bins[timing_distribution_centre_bin_index + binOffset]++;
             }
 

From ff5a1937f5f17cba7eadd82d3157a9499f6e06ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 05:04:03 +0900
Subject: [PATCH 05297/10326] Fix test logic and stabilise rounding direction

---
 .../Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs  | 2 +-
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index 9059fe34af..4bc843096f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestAroundCentre()
         {
-            createTest(Enumerable.Range(-100, 100).Select(i => new HitEvent(i / 50f, HitResult.Perfect, new HitCircle(), new HitCircle(), null)).ToList());
+            createTest(Enumerable.Range(-150, 300).Select(i => new HitEvent(i / 50f, HitResult.Perfect, new HitCircle(), new HitCircle(), null)).ToList());
         }
 
         [Test]
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 980fc68788..93885b6e02 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             foreach (var e in hitEvents)
             {
-                int binOffset = (int)Math.Round(e.TimeOffset / binSize);
+                int binOffset = (int)Math.Round(e.TimeOffset / binSize, MidpointRounding.AwayFromZero);
                 bins[timing_distribution_centre_bin_index + binOffset]++;
             }
 

From 85b33fffd028c2a5153c038a13f116c9f19c7e0a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 05:14:44 +0900
Subject: [PATCH 05298/10326] Fix incorrect comments

---
 .../Screens/Edit/Compose/Components/SelectionHandler.cs   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 7808d7a5bc..8a80ddd17c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Handles the selected <see cref="DrawableHitObject"/>s being rotated.
         /// </summary>
         /// <param name="angle">The delta angle to apply to the selection.</param>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be moved.</returns>
+        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be rotated.</returns>
         public virtual bool HandleRotation(float angle) => false;
 
         /// <summary>
@@ -149,14 +149,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         /// <param name="scale">The delta scale to apply, in playfield local coordinates.</param>
         /// <param name="anchor">The point of reference where the scale is originating from.</param>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be moved.</returns>
+        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be scaled.</returns>
         public virtual bool HandleScale(Vector2 scale, Anchor anchor) => false;
 
         /// <summary>
-        /// Handled the selected <see cref="DrawableHitObject"/>s being flipped.
+        /// Handles the selected <see cref="DrawableHitObject"/>s being flipped.
         /// </summary>
         /// <param name="direction">The direction to flip</param>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be moved.</returns>
+        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be flipped.</returns>
         public virtual bool HandleFlip(Direction direction) => false;
 
         public bool OnPressed(PlatformAction action)

From eacc7dca9a0d3815e7a4055f50b77c92505be911 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 06:31:59 +0900
Subject: [PATCH 05299/10326] Fix SliderPath not handling Clear correctly

---
 osu.Game/Rulesets/Objects/SliderPath.cs                     | 1 +
 .../Screens/Edit/Compose/Components/SelectionHandler.cs     | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index d577e8fdda..3083fcfccb 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -57,6 +57,7 @@ namespace osu.Game.Rulesets.Objects
                             c.Changed += invalidate;
                         break;
 
+                    case NotifyCollectionChangedAction.Reset:
                     case NotifyCollectionChangedAction.Remove:
                         foreach (var c in args.OldItems.Cast<PathControlPoint>())
                             c.Changed -= invalidate;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 8a80ddd17c..3fe0ab4396 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -159,6 +159,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether any <see cref="DrawableHitObject"/>s could be flipped.</returns>
         public virtual bool HandleFlip(Direction direction) => false;
 
+        /// <summary>
+        /// Handles the selected <see cref="DrawableHitObject"/>s being reversed pattern-wise.
+        /// </summary>
+        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be reversed.</returns>
+        public virtual bool HandleReverse() => false;
+
         public bool OnPressed(PlatformAction action)
         {
             switch (action.ActionMethod)

From 825e10ec8c350bae42e546c86370fada762473d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 06:32:23 +0900
Subject: [PATCH 05300/10326] Add reverse handler button to selection box

---
 .../Edit/Compose/Components/SelectionBox.cs   | 19 +++++++++++++++++++
 .../Compose/Components/SelectionHandler.cs    |  1 +
 2 files changed, 20 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 64191e48e2..b753c45cca 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -17,10 +17,28 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public Action<float> OnRotation;
         public Action<Vector2, Anchor> OnScale;
         public Action<Direction> OnFlip;
+        public Action OnReverse;
 
         public Action OperationStarted;
         public Action OperationEnded;
 
+        private bool canReverse;
+
+        /// <summary>
+        /// Whether pattern reversing support should be enabled.
+        /// </summary>
+        public bool CanReverse
+        {
+            get => canReverse;
+            set
+            {
+                if (canReverse == value) return;
+
+                canReverse = value;
+                recreate();
+            }
+        }
+
         private bool canRotate;
 
         /// <summary>
@@ -125,6 +143,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (CanScaleX && CanScaleY) addFullScaleComponents();
             if (CanScaleY) addYScaleComponents();
             if (CanRotate) addRotationComponents();
+            if (CanReverse) addButton(FontAwesome.Solid.Backward, "Reverse pattern", () => OnReverse?.Invoke());
         }
 
         private void addRotationComponents()
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 3fe0ab4396..b74095455c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -103,6 +103,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 OnRotation = angle => HandleRotation(angle),
                 OnScale = (amount, anchor) => HandleScale(amount, anchor),
                 OnFlip = direction => HandleFlip(direction),
+                OnReverse = () => HandleReverse(),
             };
 
         /// <summary>

From 2a790c76d5f9c668a842bbc72b0ddf54c076d28a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 06:32:33 +0900
Subject: [PATCH 05301/10326] Add reverse implementation for osu!

---
 .../Edit/OsuSelectionHandler.cs               | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 7ae0730e39..762c4a04e7 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Utils;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -25,6 +26,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             SelectionBox.CanRotate = canOperate;
             SelectionBox.CanScaleX = canOperate;
             SelectionBox.CanScaleY = canOperate;
+            SelectionBox.CanReverse = canOperate;
         }
 
         protected override void OnOperationEnded()
@@ -41,6 +43,54 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </summary>
         private Vector2? referenceOrigin;
 
+        public override bool HandleReverse()
+        {
+            var hitObjects = selectedMovableObjects;
+
+            double endTime = hitObjects.Max(h => h.GetEndTime());
+            double startTime = hitObjects.Min(h => h.StartTime);
+
+            bool moreThanOneObject = hitObjects.Length > 1;
+
+            foreach (var h in hitObjects)
+            {
+                if (moreThanOneObject)
+                    h.StartTime = endTime - (h.GetEndTime() - startTime);
+
+                if (h is Slider slider)
+                {
+                    var points = slider.Path.ControlPoints.ToArray();
+                    Vector2 endPos = points.Last().Position.Value;
+
+                    slider.Path.ControlPoints.Clear();
+
+                    slider.Position += endPos;
+
+                    PathType? lastType = null;
+
+                    for (var i = 0; i < points.Length; i++)
+                    {
+                        var p = points[i];
+                        p.Position.Value -= endPos;
+
+                        // propagate types forwards to last null type
+                        if (i == points.Length - 1)
+                            p.Type.Value = lastType;
+                        else if (p.Type.Value != null)
+                        {
+                            var newType = p.Type.Value;
+                            p.Type.Value = lastType;
+                            lastType = newType;
+                        }
+
+                        slider.Path.ControlPoints.Insert(0, p);
+                    }
+                }
+            }
+
+            return true;
+        }
+
         public override bool HandleFlip(Direction direction)
         {
             var hitObjects = selectedMovableObjects;

From 6649cb220431e7b3807fc8ae2d98c40e4f9d3811 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 06:41:53 +0900
Subject: [PATCH 05302/10326] Fix incorrect first object logic

---
 osu.Game/Rulesets/Mods/ModHidden.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index d81b439f6a..ad01bf036c 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -39,11 +39,13 @@ namespace osu.Game.Rulesets.Mods
         {
             if (IncreaseFirstObjectVisibility.Value)
             {
+                drawables = drawables.SkipWhile(h => !IsFirstHideableObject(h));
+
                 var firstObject = drawables.FirstOrDefault();
                 if (firstObject != null)
                     firstObject.ApplyCustomUpdateState += ApplyFirstObjectIncreaseVisibilityState;
 
-                drawables = drawables.SkipWhile(h => !IsFirstHideableObject(h)).Skip(1);
+                drawables = drawables.Skip(1);
             }
 
             foreach (var dho in drawables)

From c86b37f60d0f1c036ff4bdd2964ce7532d71bfe0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 13:11:24 +0900
Subject: [PATCH 05303/10326] Add check to ensure MusicController doesn't play
 a delete pending beatmap's track

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

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 0764f34697..12caf98021 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Overlays
         {
             if (IsUserPaused) return;
 
-            if (CurrentTrack.IsDummyDevice)
+            if (CurrentTrack.IsDummyDevice || beatmap.Value.BeatmapSetInfo.DeletePending)
             {
                 if (beatmap.Disabled)
                     return;

From 68039cff4089bf84e233a3c99ef1f24ffd40836d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 13:11:44 +0900
Subject: [PATCH 05304/10326] Set beatmap to sane default on exiting editor

---
 osu.Game/Screens/Edit/Editor.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 3c5cbf30e9..d6dbfef2bd 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -469,10 +469,17 @@ namespace osu.Game.Screens.Edit
 
         private void confirmExit()
         {
+            // stop the track if playing to allow the parent screen to choose a suitable playback mode.
+            Beatmap.Value.Track.Stop();
+
             if (isNewBeatmap)
             {
                 // confirming exit without save means we should delete the new beatmap completely.
                 beatmapManager.Delete(playableBeatmap.BeatmapInfo.BeatmapSet);
+
+                // in theory this shouldn't be required but due to EF core not sharing instance states 100%
+                // MusicController is unaware of the changed DeletePending state.
+                Beatmap.SetDefault();
             }
 
             exitConfirmed = true;

From 389ffe7da5b799e1b7e800e07d2ccce894e7cbb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 13:23:18 +0900
Subject: [PATCH 05305/10326] Hide bonus result types from score table for the
 time being

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

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 231d888a4e..324299ccba 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -110,6 +110,11 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 if (!allScoreStatistics.Contains(result))
                     continue;
 
+                // for the time being ignore bonus result types.
+                // this is not being sent from the API and will be empty in all cases.
+                if (result.IsBonus())
+                    continue;
+
                 string displayName = ruleset.GetDisplayNameForHitResult(result);
 
                 columns.Add(new TableColumn(displayName, Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 35, maxSize: 60)));

From 8be19fd82059e79f9141027b9e4e3cda086e32fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 13:26:09 +0900
Subject: [PATCH 05306/10326] Increase height of contracted score panel to fit
 mods again

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

diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 8c8a547277..ee97ee55eb 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Height of the panel when contracted.
         /// </summary>
-        private const float contracted_height = 355;
+        private const float contracted_height = 385;
 
         /// <summary>
         /// Width of the panel when expanded.

From beec0e41930ee69aafe15c7303101cca09f3dcaa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 14:03:13 +0900
Subject: [PATCH 05307/10326] Hide children of SelectionBlueprint when not
 selected

---
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 71256093d5..4abdbfc244 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -89,9 +89,23 @@ namespace osu.Game.Rulesets.Edit
             }
         }
 
-        protected virtual void OnDeselected() => Hide();
+        protected virtual void OnDeselected()
+        {
+            // selection blueprints are AlwaysPresent while the related DrawableHitObject is visible
+            // set the body piece's alpha directly to avoid arbitrarily rendering frame buffers etc. of children.
+            foreach (var d in InternalChildren)
+                d.Hide();
 
-        protected virtual void OnSelected() => Show();
+            Hide();
+        }
+
+        protected virtual void OnSelected()
+        {
+            foreach (var d in InternalChildren)
+                d.Show();
+
+            Show();
+        }
 
         // When not selected, input is only required for the blueprint itself to receive IsHovering
         protected override bool ShouldBeConsideredForInput(Drawable child) => State == SelectionState.Selected;

From 34d1439f8ef598cf155b2ef8fa21a003b009d112 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 14:04:26 +0900
Subject: [PATCH 05308/10326] Only update slider selection blueprints paths
 when visible

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 94862eb205..8fe4b8a9cf 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -66,13 +66,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             pathVersion = HitObject.Path.Version.GetBoundCopy();
             pathVersion.BindValueChanged(_ => updatePath());
+
+            BodyPiece.UpdateFrom(HitObject);
         }
 
         protected override void Update()
         {
             base.Update();
 
-            BodyPiece.UpdateFrom(HitObject);
+            if (IsSelected)
+                BodyPiece.UpdateFrom(HitObject);
         }
 
         private Vector2 rightClickPosition;

From 6b9e94ae93370a686aa62f7efeca2aaa0f9b721b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 14:05:00 +0900
Subject: [PATCH 05309/10326] Avoid retaining slider selection blueprints FBO
 backing textures after deselection

---
 .../Sliders/Components/SliderBodyPiece.cs     |  2 +
 .../Sliders/SliderSelectionBlueprint.cs       | 39 ++++++++++++++-----
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
index 9349ef7a18..5581ce4bfd 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -49,6 +49,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             OriginPosition = body.PathOffset;
         }
 
+        public void RecyclePath() => body.RecyclePath();
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => body.ReceivePositionalInputAt(screenSpacePos);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 8fe4b8a9cf..67f8088dbb 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -24,10 +24,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
     public class SliderSelectionBlueprint : OsuSelectionBlueprint<Slider>
     {
-        protected readonly SliderBodyPiece BodyPiece;
-        protected readonly SliderCircleSelectionBlueprint HeadBlueprint;
-        protected readonly SliderCircleSelectionBlueprint TailBlueprint;
-        protected readonly PathControlPointVisualiser ControlPointVisualiser;
+        protected SliderBodyPiece BodyPiece;
+        protected SliderCircleSelectionBlueprint HeadBlueprint;
+        protected SliderCircleSelectionBlueprint TailBlueprint;
+        protected PathControlPointVisualiser ControlPointVisualiser;
+
+        private readonly DrawableSlider slider;
 
         [Resolved(CanBeNull = true)]
         private HitObjectComposer composer { get; set; }
@@ -44,17 +46,17 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         public SliderSelectionBlueprint(DrawableSlider slider)
             : base(slider)
         {
-            var sliderObject = (Slider)slider.HitObject;
+            this.slider = slider;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             InternalChildren = new Drawable[]
             {
                 BodyPiece = new SliderBodyPiece(),
                 HeadBlueprint = CreateCircleSelectionBlueprint(slider, SliderPosition.Start),
                 TailBlueprint = CreateCircleSelectionBlueprint(slider, SliderPosition.End),
-                ControlPointVisualiser = new PathControlPointVisualiser(sliderObject, true)
-                {
-                    RemoveControlPointsRequested = removeControlPoints
-                }
             };
         }
 
@@ -78,6 +80,25 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 BodyPiece.UpdateFrom(HitObject);
         }
 
+        protected override void OnSelected()
+        {
+            AddInternal(ControlPointVisualiser = new PathControlPointVisualiser((Slider)slider.HitObject, true)
+            {
+                RemoveControlPointsRequested = removeControlPoints
+            });
+
+            base.OnSelected();
+        }
+
+        protected override void OnDeselected()
+        {
+            base.OnDeselected();
+
+            // throw away frame buffers on deselection.
+            ControlPointVisualiser?.Expire();
+            BodyPiece.RecyclePath();
+        }
+
         private Vector2 rightClickPosition;
 
         protected override bool OnMouseDown(MouseDownEvent e)

From 9baf704942288a18b60011c5ab9dbee80ca14633 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 15:38:58 +0900
Subject: [PATCH 05310/10326] Add local pooling to TimelineTickDisplay

---
 .../Visualisations/PointVisualisation.cs      |  13 ++-
 .../Timeline/TimelineTickDisplay.cs           | 102 ++++++++++++------
 2 files changed, 78 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
index 1ac960039e..ea093e6a4e 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.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 osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
 {
@@ -13,15 +13,20 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     public class PointVisualisation : Box
     {
         public PointVisualisation(double startTime)
+            : this()
+        {
+            X = (float)startTime;
+        }
+
+        public PointVisualisation()
         {
             Origin = Anchor.TopCentre;
 
+            RelativePositionAxes = Axes.X;
             RelativeSizeAxes = Axes.Y;
+
             Width = 1;
             EdgeSmoothness = new Vector2(1, 0);
-
-            RelativePositionAxes = Axes.X;
-            X = (float)startTime;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 36ee976bf7..745f3e393b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.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.Bindables;
@@ -12,7 +13,7 @@ using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    public class TimelineTickDisplay : TimelinePart
+    public class TimelineTickDisplay : TimelinePart<PointVisualisation>
     {
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
@@ -31,15 +32,23 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.Both;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            beatDivisor.BindValueChanged(_ => createLines(), true);
-        }
+        [Resolved(canBeNull: true)]
+        private Timeline timeline { get; set; }
 
-        private void createLines()
+        protected override void Update()
         {
-            Clear();
+            base.Update();
+
+            int drawableIndex = 0;
+
+            double minVisibleTime = double.MinValue;
+            double maxVisibleTime = double.MaxValue;
+
+            if (timeline != null)
+            {
+                minVisibleTime = ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X / DrawWidth * Content.RelativeChildSize.X;
+                maxVisibleTime = ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X / DrawWidth * Content.RelativeChildSize.X;
+            }
 
             for (var i = 0; i < beatmap.ControlPointInfo.TimingPoints.Count; i++)
             {
@@ -50,41 +59,68 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 for (double t = point.Time; t < until; t += point.BeatLength / beatDivisor.Value)
                 {
-                    var indexInBeat = beat % beatDivisor.Value;
-
-                    if (indexInBeat == 0)
+                    if (t >= minVisibleTime && t <= maxVisibleTime)
                     {
-                        Add(new PointVisualisation(t)
-                        {
-                            Colour = BindableBeatDivisor.GetColourFor(1, colours),
-                            Origin = Anchor.TopCentre,
-                        });
-                    }
-                    else
-                    {
-                        var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
-                        var colour = BindableBeatDivisor.GetColourFor(divisor, colours);
-                        var height = 0.1f - (float)divisor / BindableBeatDivisor.VALID_DIVISORS.Last() * 0.08f;
+                        var indexInBeat = beat % beatDivisor.Value;
 
-                        Add(new PointVisualisation(t)
+                        if (indexInBeat == 0)
                         {
-                            Colour = colour,
-                            Height = height,
-                            Origin = Anchor.TopCentre,
-                        });
+                            var downbeatPoint = getNextUsablePoint();
+                            downbeatPoint.X = (float)t;
 
-                        Add(new PointVisualisation(t)
+                            downbeatPoint.Colour = BindableBeatDivisor.GetColourFor(1, colours);
+                            downbeatPoint.Anchor = Anchor.TopLeft;
+                            downbeatPoint.Origin = Anchor.TopCentre;
+                            downbeatPoint.Height = 1;
+                        }
+                        else
                         {
-                            Colour = colour,
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomCentre,
-                            Height = height,
-                        });
+                            var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
+                            var colour = BindableBeatDivisor.GetColourFor(divisor, colours);
+                            var height = 0.1f - (float)divisor / BindableBeatDivisor.VALID_DIVISORS.Last() * 0.08f;
+
+                            var topPoint = getNextUsablePoint();
+                            topPoint.X = (float)t;
+                            topPoint.Colour = colour;
+                            topPoint.Height = height;
+                            topPoint.Anchor = Anchor.TopLeft;
+                            topPoint.Origin = Anchor.TopCentre;
+
+                            var bottomPoint = getNextUsablePoint();
+                            bottomPoint.X = (float)t;
+                            bottomPoint.Colour = colour;
+                            bottomPoint.Anchor = Anchor.BottomLeft;
+                            bottomPoint.Origin = Anchor.BottomCentre;
+                            bottomPoint.Height = height;
+                        }
                     }
 
                     beat++;
                 }
             }
+
+            int usedDrawables = drawableIndex;
+
+            // save a few drawables beyond the currently used for edge cases.
+            while (drawableIndex < Math.Min(usedDrawables + 16, Count))
+                Children[drawableIndex++].Hide();
+
+            // expire any excess
+            while (drawableIndex < Count)
+                Children[drawableIndex++].Expire();
+
+            Drawable getNextUsablePoint()
+            {
+                PointVisualisation point;
+                if (drawableIndex >= Count)
+                    Add(point = new PointVisualisation());
+                else
+                    point = Children[drawableIndex++];
+
+                point.Show();
+
+                return point;
+            }
         }
     }
 }

From 017a8ce496f74e19bf726ac9ab7a5fdf139aa679 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 15:57:31 +0900
Subject: [PATCH 05311/10326] Only recalculate when display actually changes

---
 .../Timeline/TimelineTickDisplay.cs           | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 745f3e393b..76428d6fbc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -32,6 +33,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.Both;
         }
 
+        private readonly Cached tickCache = new Cached();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            beatDivisor.BindValueChanged(_ => tickCache.Invalidate());
+        }
+
+        private (float min, float max) visibleRange = (float.MinValue, float.MaxValue);
+
         [Resolved(canBeNull: true)]
         private Timeline timeline { get; set; }
 
@@ -39,17 +50,26 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.Update();
 
-            int drawableIndex = 0;
-
-            double minVisibleTime = double.MinValue;
-            double maxVisibleTime = double.MaxValue;
-
             if (timeline != null)
             {
-                minVisibleTime = ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X / DrawWidth * Content.RelativeChildSize.X;
-                maxVisibleTime = ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X / DrawWidth * Content.RelativeChildSize.X;
+                var newRange = (
+                    ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X / DrawWidth * Content.RelativeChildSize.X,
+                    ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X / DrawWidth * Content.RelativeChildSize.X);
+
+                if (visibleRange != newRange)
+                    tickCache.Invalidate();
+
+                visibleRange = newRange;
             }
 
+            if (!tickCache.IsValid)
+                createTicks();
+        }
+
+        private void createTicks()
+        {
+            int drawableIndex = 0;
+
             for (var i = 0; i < beatmap.ControlPointInfo.TimingPoints.Count; i++)
             {
                 var point = beatmap.ControlPointInfo.TimingPoints[i];
@@ -59,7 +79,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 for (double t = point.Time; t < until; t += point.BeatLength / beatDivisor.Value)
                 {
-                    if (t >= minVisibleTime && t <= maxVisibleTime)
+                    if (t >= visibleRange.min && t <= visibleRange.max)
                     {
                         var indexInBeat = beat % beatDivisor.Value;
 
@@ -109,6 +129,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             while (drawableIndex < Count)
                 Children[drawableIndex++].Expire();
 
+            tickCache.Validate();
+
             Drawable getNextUsablePoint()
             {
                 PointVisualisation point;

From 955836916b340c3400efac07e4e385fbb6b4b744 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 16:45:11 +0900
Subject: [PATCH 05312/10326] Fix timeline tick display test making two
 instances of the component

---
 osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
index e33040acdc..20e58c3d2a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
@@ -5,7 +5,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Editing
@@ -13,7 +12,7 @@ namespace osu.Game.Tests.Visual.Editing
     [TestFixture]
     public class TestSceneTimelineTickDisplay : TimelineTestScene
     {
-        public override Drawable CreateTestComponent() => new TimelineTickDisplay();
+        public override Drawable CreateTestComponent() => Empty(); // tick display is implicitly inside the timeline.
 
         [BackgroundDependencyLoader]
         private void load()

From ceb1494c33285a0219f58111e3e10b1183509c55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 16:46:54 +0900
Subject: [PATCH 05313/10326] Only run regeneration when passing a new min/max
 tick boundary

---
 .../Timeline/TimelineTickDisplay.cs           | 83 ++++++++++++-------
 1 file changed, 52 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 76428d6fbc..c6e435b6ae 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -41,8 +41,21 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             beatDivisor.BindValueChanged(_ => tickCache.Invalidate());
         }
 
+        /// <summary>
+        /// The visible time/position range of the timeline.
+        /// </summary>
         private (float min, float max) visibleRange = (float.MinValue, float.MaxValue);
 
+        /// <summary>
+        /// The next time/position value to the left of the display when tick regeneration needs to be run.
+        /// </summary>
+        private float? nextMinTick;
+
+        /// <summary>
+        /// The next time/position value to the right of the display when tick regeneration needs to be run.
+        /// </summary>
+        private float? nextMaxTick;
+
         [Resolved(canBeNull: true)]
         private Timeline timeline { get; set; }
 
@@ -57,9 +70,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X / DrawWidth * Content.RelativeChildSize.X);
 
                 if (visibleRange != newRange)
-                    tickCache.Invalidate();
+                {
+                    visibleRange = newRange;
 
-                visibleRange = newRange;
+                    // actual regeneration only needs to occur if we've passed one of the known next min/max tick boundaries.
+                    if (nextMinTick == null || nextMaxTick == null || (visibleRange.min < nextMinTick || visibleRange.max > nextMaxTick))
+                        tickCache.Invalidate();
+                }
             }
 
             if (!tickCache.IsValid)
@@ -69,6 +86,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private void createTicks()
         {
             int drawableIndex = 0;
+            int highestDivisor = BindableBeatDivisor.VALID_DIVISORS.Last();
+
+            nextMinTick = null;
+            nextMaxTick = null;
 
             for (var i = 0; i < beatmap.ControlPointInfo.TimingPoints.Count; i++)
             {
@@ -79,40 +100,39 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 for (double t = point.Time; t < until; t += point.BeatLength / beatDivisor.Value)
                 {
-                    if (t >= visibleRange.min && t <= visibleRange.max)
+                    float xPos = (float)t;
+
+                    if (t < visibleRange.min)
+                        nextMinTick = xPos;
+                    else if (t > visibleRange.max)
+                        nextMaxTick ??= xPos;
+                    else
                     {
+                        // if this is the first beat in the beatmap, there is no next min tick
+                        if (beat == 0 && i == 0)
+                            nextMinTick = float.MinValue;
+
                         var indexInBeat = beat % beatDivisor.Value;
 
-                        if (indexInBeat == 0)
-                        {
-                            var downbeatPoint = getNextUsablePoint();
-                            downbeatPoint.X = (float)t;
+                        var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
+                        var colour = BindableBeatDivisor.GetColourFor(divisor, colours);
 
-                            downbeatPoint.Colour = BindableBeatDivisor.GetColourFor(1, colours);
-                            downbeatPoint.Anchor = Anchor.TopLeft;
-                            downbeatPoint.Origin = Anchor.TopCentre;
-                            downbeatPoint.Height = 1;
-                        }
-                        else
-                        {
-                            var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
-                            var colour = BindableBeatDivisor.GetColourFor(divisor, colours);
-                            var height = 0.1f - (float)divisor / BindableBeatDivisor.VALID_DIVISORS.Last() * 0.08f;
+                        // even though "bar lines" take up the full vertical space, we render them in two pieces because it allows for less anchor/origin churn.
+                        var height = indexInBeat == 0 ? 0.5f : 0.1f - (float)divisor / highestDivisor * 0.08f;
 
-                            var topPoint = getNextUsablePoint();
-                            topPoint.X = (float)t;
-                            topPoint.Colour = colour;
-                            topPoint.Height = height;
-                            topPoint.Anchor = Anchor.TopLeft;
-                            topPoint.Origin = Anchor.TopCentre;
+                        var topPoint = getNextUsablePoint();
+                        topPoint.X = xPos;
+                        topPoint.Colour = colour;
+                        topPoint.Height = height;
+                        topPoint.Anchor = Anchor.TopLeft;
+                        topPoint.Origin = Anchor.TopCentre;
 
-                            var bottomPoint = getNextUsablePoint();
-                            bottomPoint.X = (float)t;
-                            bottomPoint.Colour = colour;
-                            bottomPoint.Anchor = Anchor.BottomLeft;
-                            bottomPoint.Origin = Anchor.BottomCentre;
-                            bottomPoint.Height = height;
-                        }
+                        var bottomPoint = getNextUsablePoint();
+                        bottomPoint.X = xPos;
+                        bottomPoint.Colour = colour;
+                        bottomPoint.Anchor = Anchor.BottomLeft;
+                        bottomPoint.Origin = Anchor.BottomCentre;
+                        bottomPoint.Height = height;
                     }
 
                     beat++;
@@ -137,8 +157,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 if (drawableIndex >= Count)
                     Add(point = new PointVisualisation());
                 else
-                    point = Children[drawableIndex++];
+                    point = Children[drawableIndex];
 
+                drawableIndex++;
                 point.Show();
 
                 return point;

From 5d888f687ae809c1086ebce68033978475a16c56 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 16:49:51 +0900
Subject: [PATCH 05314/10326] Account for the width of points so they don't
 suddenly appear at timeline edges

---
 .../Timelines/Summary/Visualisations/PointVisualisation.cs  | 6 ++++--
 .../Edit/Compose/Components/Timeline/TimelineTickDisplay.cs | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
index ea093e6a4e..b0ecffdd24 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     /// </summary>
     public class PointVisualisation : Box
     {
+        public const float WIDTH = 1;
+
         public PointVisualisation(double startTime)
             : this()
         {
@@ -25,8 +27,8 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
             RelativePositionAxes = Axes.X;
             RelativeSizeAxes = Axes.Y;
 
-            Width = 1;
-            EdgeSmoothness = new Vector2(1, 0);
+            Width = WIDTH;
+            EdgeSmoothness = new Vector2(WIDTH, 0);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index c6e435b6ae..ce73a2b50b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -66,8 +66,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (timeline != null)
             {
                 var newRange = (
-                    ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X / DrawWidth * Content.RelativeChildSize.X,
-                    ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X / DrawWidth * Content.RelativeChildSize.X);
+                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X - PointVisualisation.WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X,
+                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X + PointVisualisation.WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X);
 
                 if (visibleRange != newRange)
                 {

From a0af2eb6c880fc727d15fcfdb662914a89d32d37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 16:54:43 +0900
Subject: [PATCH 05315/10326] Private protect setters

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 67f8088dbb..9cfb02ab20 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -24,10 +24,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
     public class SliderSelectionBlueprint : OsuSelectionBlueprint<Slider>
     {
-        protected SliderBodyPiece BodyPiece;
-        protected SliderCircleSelectionBlueprint HeadBlueprint;
-        protected SliderCircleSelectionBlueprint TailBlueprint;
-        protected PathControlPointVisualiser ControlPointVisualiser;
+        protected SliderBodyPiece BodyPiece { get; private set; }
+        protected SliderCircleSelectionBlueprint HeadBlueprint { get; private set; }
+        protected SliderCircleSelectionBlueprint TailBlueprint { get; private set; }
+        protected PathControlPointVisualiser ControlPointVisualiser { get; private set; }
 
         private readonly DrawableSlider slider;
 

From 144726e3c691aa2c0259cdae6e03f7d05759c8e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 17:12:01 +0900
Subject: [PATCH 05316/10326] Better guard against taiko swells becoming strong

---
 .../Beatmaps/TaikoBeatmapConverter.cs              |  2 +-
 osu.Game.Rulesets.Taiko/Objects/Swell.cs           |  2 ++
 osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs  | 14 +++++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index ed7b8589ba..607eaf5dbd 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 converted.HitObjects = converted.HitObjects.GroupBy(t => t.StartTime).Select(x =>
                 {
                     TaikoHitObject first = x.First();
-                    if (x.Skip(1).Any() && !(first is Swell))
+                    if (x.Skip(1).Any() && first.CanBeStrong)
                         first.IsStrong = true;
                     return first;
                 }).ToList();
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index eeae6e79f8..bf8b7bc178 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Taiko.Objects
             set => Duration = value - StartTime;
         }
 
+        public override bool CanBeStrong => false;
+
         public double Duration { get; set; }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
index 2922010001..d2c37d965c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.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.Threading;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
@@ -30,6 +31,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public readonly Bindable<bool> IsStrongBindable = new BindableBool();
 
+        /// <summary>
+        /// Whether this <see cref="TaikoHitObject"/> can be made a "strong" (large) hit.
+        /// </summary>
+        public virtual bool CanBeStrong => true;
+
         /// <summary>
         /// Whether this HitObject is a "strong" type.
         /// Strong hit objects give more points for hitting the hit object with both keys.
@@ -37,7 +43,13 @@ namespace osu.Game.Rulesets.Taiko.Objects
         public bool IsStrong
         {
             get => IsStrongBindable.Value;
-            set => IsStrongBindable.Value = value;
+            set
+            {
+                if (value && !CanBeStrong)
+                    throw new InvalidOperationException($"Object of type {GetType()} cannot be strong");
+
+                IsStrongBindable.Value = value;
+            }
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)

From cb96a40dd6eb389668ff2cfec630f47ec027029a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 17:12:10 +0900
Subject: [PATCH 05317/10326] Fix bindable propagation potentially making
 swells strong

---
 .../Objects/Drawables/DrawableTaikoHitObject.cs                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 9cd23383c4..d8d75a7614 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -158,7 +158,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             base.LoadSamples();
 
-            isStrong.Value = getStrongSamples().Any();
+            if (HitObject.CanBeStrong)
+                isStrong.Value = getStrongSamples().Any();
         }
 
         private void updateSamplesFromStrong()

From 21c6242f9064b8a8ac51af371640df29eb876718 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 18:35:44 +0900
Subject: [PATCH 05318/10326] Fix bar lines ("down beat" as people call it)
 showing up too often in timeline

---
 .../Edit/Compose/Components/Timeline/TimelineTickDisplay.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index ce73a2b50b..724256af8b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -112,13 +112,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         if (beat == 0 && i == 0)
                             nextMinTick = float.MinValue;
 
-                        var indexInBeat = beat % beatDivisor.Value;
+                        var indexInBar = beat % ((int)point.TimeSignature * beatDivisor.Value);
 
                         var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
                         var colour = BindableBeatDivisor.GetColourFor(divisor, colours);
 
                         // even though "bar lines" take up the full vertical space, we render them in two pieces because it allows for less anchor/origin churn.
-                        var height = indexInBeat == 0 ? 0.5f : 0.1f - (float)divisor / highestDivisor * 0.08f;
+                        var height = indexInBar == 0 ? 0.5f : 0.1f - (float)divisor / highestDivisor * 0.08f;
 
                         var topPoint = getNextUsablePoint();
                         topPoint.X = xPos;

From febfe9cdd049e6bef918074c6406411f1db6884d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 18:43:16 +0900
Subject: [PATCH 05319/10326] Don't fade the approach circle on increased
 visibility

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index d354a8a726..f69cacd432 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -90,7 +90,14 @@ namespace osu.Game.Rulesets.Osu.Mods
                         lastSliderHeadFadeOutStartTime = fadeOutStartTime;
                     }
 
-                    if (!increaseVisibility)
+                    Drawable fadeTarget = circle;
+
+                    if (increaseVisibility)
+                    {
+                        // only fade the circle piece (not the approach circle) for the increased visibility object.
+                        fadeTarget = circle.CirclePiece;
+                    }
+                    else
                     {
                         // we don't want to see the approach circle
                         using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
@@ -99,8 +106,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
                     // fade out immediately after fade in.
                     using (drawable.BeginAbsoluteSequence(fadeOutStartTime, true))
-                        circle.FadeOut(fadeOutDuration);
-
+                        fadeTarget.FadeOut(fadeOutDuration);
                     break;
 
                 case DrawableSlider slider:

From edaf6db5c6890a8475dd31b4dbfab45d3ddd9fa6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 18:44:23 +0900
Subject: [PATCH 05320/10326] Reference EditorBeatmap directly for selected
 objects

---
 .../Edit/Compose/Components/SelectionHandler.cs      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index c5e88ade84..8902e8119d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -37,8 +37,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public int SelectedCount => selectedBlueprints.Count;
 
-        public IEnumerable<HitObject> SelectedHitObjects => EditorBeatmap.SelectedHitObjects;
-
         private Drawable content;
 
         private OsuSpriteText selectionDetailsText;
@@ -309,7 +307,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             ChangeHandler?.BeginChange();
 
-            foreach (var h in SelectedHitObjects)
+            foreach (var h in EditorBeatmap.SelectedHitObjects)
             {
                 // Make sure there isn't already an existing sample
                 if (h.Samples.Any(s => s.Name == sampleName))
@@ -330,7 +328,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             ChangeHandler?.BeginChange();
 
-            foreach (var h in SelectedHitObjects)
+            foreach (var h in EditorBeatmap.SelectedHitObjects)
             {
                 var comboInfo = h as IHasComboInformation;
 
@@ -351,7 +349,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             ChangeHandler?.BeginChange();
 
-            foreach (var h in SelectedHitObjects)
+            foreach (var h in EditorBeatmap.SelectedHitObjects)
                 h.SamplesBindable.RemoveAll(s => s.Name == sampleName);
 
             ChangeHandler?.EndChange();
@@ -425,11 +423,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         protected virtual void UpdateTernaryStates()
         {
-            SelectionNewComboState.Value = GetStateFromSelection(SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
+            SelectionNewComboState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
 
             foreach (var (sampleName, bindable) in SelectionSampleStates)
             {
-                bindable.Value = GetStateFromSelection(SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName));
+                bindable.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName));
             }
         }
 

From 3838f405dd6ac1d00ddfad5c86c7d1619982c517 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 18:50:05 +0900
Subject: [PATCH 05321/10326] Fix missed usages

---
 .../Edit/ManiaSelectionHandler.cs                    |  4 ++--
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs    | 12 ++++++------
 .../Edit/TaikoSelectionHandler.cs                    |  8 ++++----
 .../Edit/Compose/Components/BlueprintContainer.cs    |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 65f40d7d0a..50629f41a9 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             int minColumn = int.MaxValue;
             int maxColumn = int.MinValue;
 
-            foreach (var obj in SelectedHitObjects.OfType<ManiaHitObject>())
+            foreach (var obj in EditorBeatmap.SelectedHitObjects.OfType<ManiaHitObject>())
             {
                 if (obj.Column < minColumn)
                     minColumn = obj.Column;
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             columnDelta = Math.Clamp(columnDelta, -minColumn, maniaPlayfield.TotalColumns - 1 - maxColumn);
 
-            foreach (var obj in SelectedHitObjects.OfType<ManiaHitObject>())
+            foreach (var obj in EditorBeatmap.SelectedHitObjects.OfType<ManiaHitObject>())
                 obj.Column += columnDelta;
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 7ae0730e39..68c4869a45 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             base.OnSelectionChanged();
 
-            bool canOperate = SelectedHitObjects.Count() > 1 || SelectedHitObjects.Any(s => s is Slider);
+            bool canOperate = EditorBeatmap.SelectedHitObjects.Count > 1 || EditorBeatmap.SelectedHitObjects.Any(s => s is Slider);
 
             SelectionBox.CanRotate = canOperate;
             SelectionBox.CanScaleX = canOperate;
@@ -182,7 +182,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// <param name="points">The points to calculate a quad for.</param>
         private Quad getSurroundingQuad(IEnumerable<Vector2> points)
         {
-            if (!SelectedHitObjects.Any())
+            if (!EditorBeatmap.SelectedHitObjects.Any())
                 return new Quad();
 
             Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
@@ -203,10 +203,10 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// <summary>
         /// All osu! hitobjects which can be moved/rotated/scaled.
         /// </summary>
-        private OsuHitObject[] selectedMovableObjects => SelectedHitObjects
-                                                         .OfType<OsuHitObject>()
-                                                         .Where(h => !(h is Spinner))
-                                                         .ToArray();
+        private OsuHitObject[] selectedMovableObjects => EditorBeatmap.SelectedHitObjects
+                                                                      .OfType<OsuHitObject>()
+                                                                      .Where(h => !(h is Spinner))
+                                                                      .ToArray();
 
         /// <summary>
         /// Rotate a point around an arbitrary origin.
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index d5dd758e10..6e940be54d 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
         public void SetStrongState(bool state)
         {
-            var hits = SelectedHitObjects.OfType<Hit>();
+            var hits = EditorBeatmap.SelectedHitObjects.OfType<Hit>();
 
             ChangeHandler.BeginChange();
 
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
         public void SetRimState(bool state)
         {
-            var hits = SelectedHitObjects.OfType<Hit>();
+            var hits = EditorBeatmap.SelectedHitObjects.OfType<Hit>();
 
             ChangeHandler.BeginChange();
 
@@ -93,8 +93,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
         {
             base.UpdateTernaryStates();
 
-            selectionRimState.Value = GetStateFromSelection(SelectedHitObjects.OfType<Hit>(), h => h.Type == HitType.Rim);
-            selectionStrongState.Value = GetStateFromSelection(SelectedHitObjects.OfType<TaikoHitObject>(), h => h.IsStrong);
+            selectionRimState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<Hit>(), h => h.Type == HitType.Rim);
+            selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoHitObject>(), h => h.IsStrong);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 970e16d1c3..1eff716b3d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -436,7 +436,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 // Apply the start time at the newly snapped-to position
                 double offset = result.Time.Value - draggedObject.StartTime;
-                foreach (HitObject obj in SelectionHandler.SelectedHitObjects)
+                foreach (HitObject obj in Beatmap.SelectedHitObjects)
                     obj.StartTime += offset;
             }
 

From 021777145fd279b0a2b80c9ba7e8cc9992b7729b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 18:51:52 +0900
Subject: [PATCH 05322/10326] 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 d7817cf4cf..3df894fbcc 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1004.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1009.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fa2135580d..8b10f0a7f7 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.1004.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1009.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 20a51e5feb..88abbca73d 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.Framework.iOS" Version="2020.1004.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1009.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.1004.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1009.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From e618b62ccd2367a67b06b414bf47d487f9d71fca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 19:02:53 +0900
Subject: [PATCH 05323/10326] Update waveform tests

---
 osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs b/osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs
index 0c1296b82c..c3a5a0e944 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneWaveform.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.Threading;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -76,7 +77,7 @@ namespace osu.Game.Tests.Visual.Editing
                 };
             });
 
-            AddUntilStep("wait for load", () => graph.ResampledWaveform != null);
+            AddUntilStep("wait for load", () => graph.Loaded.IsSet);
         }
 
         [Test]
@@ -98,12 +99,18 @@ namespace osu.Game.Tests.Visual.Editing
                 };
             });
 
-            AddUntilStep("wait for load", () => graph.ResampledWaveform != null);
+            AddUntilStep("wait for load", () => graph.Loaded.IsSet);
         }
 
         public class TestWaveformGraph : WaveformGraph
         {
-            public new Waveform ResampledWaveform => base.ResampledWaveform;
+            public readonly ManualResetEventSlim Loaded = new ManualResetEventSlim();
+
+            protected override void OnWaveformRegenerated(Waveform waveform)
+            {
+                base.OnWaveformRegenerated(waveform);
+                Loaded.Set();
+            }
         }
     }
 }

From 573336cb47d2549a670a90c8ce1200411f89e376 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 20:12:17 +0900
Subject: [PATCH 05324/10326] Ensure stable sorting order in beatmap conversion
 tests

---
 .../ManiaBeatmapConversionTest.cs              | 18 +++++++++++++++++-
 .../Tests/Beatmaps/BeatmapConversionTest.cs    | 13 +++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
index 0c57267970..3d4bc4748b 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
@@ -83,11 +83,17 @@ namespace osu.Game.Rulesets.Mania.Tests
             RandomZ = snapshot.RandomZ;
         }
 
+        public override void PostProcess()
+        {
+            base.PostProcess();
+            Objects.Sort();
+        }
+
         public bool Equals(ManiaConvertMapping other) => other != null && RandomW == other.RandomW && RandomX == other.RandomX && RandomY == other.RandomY && RandomZ == other.RandomZ;
         public override bool Equals(ConvertMapping<ConvertValue> other) => base.Equals(other) && Equals(other as ManiaConvertMapping);
     }
 
-    public struct ConvertValue : IEquatable<ConvertValue>
+    public struct ConvertValue : IEquatable<ConvertValue>, IComparable<ConvertValue>
     {
         /// <summary>
         /// A sane value to account for osu!stable using ints everwhere.
@@ -102,5 +108,15 @@ namespace osu.Game.Rulesets.Mania.Tests
             => Precision.AlmostEquals(StartTime, other.StartTime, conversion_lenience)
                && Precision.AlmostEquals(EndTime, other.EndTime, conversion_lenience)
                && Column == other.Column;
+
+        public int CompareTo(ConvertValue other)
+        {
+            var result = StartTime.CompareTo(other.StartTime);
+
+            if (result != 0)
+                return result;
+
+            return Column.CompareTo(other.Column);
+        }
     }
 }
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index e492069c5e..fcf20a2eb2 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -34,6 +34,12 @@ namespace osu.Game.Tests.Beatmaps
             var ourResult = convert(name, mods.Select(m => (Mod)Activator.CreateInstance(m)).ToArray());
             var expectedResult = read(name);
 
+            foreach (var m in ourResult.Mappings)
+                m.PostProcess();
+
+            foreach (var m in expectedResult.Mappings)
+                m.PostProcess();
+
             Assert.Multiple(() =>
             {
                 int mappingCounter = 0;
@@ -239,6 +245,13 @@ namespace osu.Game.Tests.Beatmaps
             set => Objects = value;
         }
 
+        /// <summary>
+        /// Invoked after this <see cref="ConvertMapping{TConvertValue}"/> is populated to post-process the contained data.
+        /// </summary>
+        public virtual void PostProcess()
+        {
+        }
+
         public virtual bool Equals(ConvertMapping<TConvertValue> other) => StartTime == other?.StartTime;
     }
 }

From 696e3d53afdc3754c7d8a2565d022520664d1c4c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 20:50:09 +0900
Subject: [PATCH 05325/10326] Fix slider samples being overwritten by the last
 node

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs        |  6 ++++--
 osu.Game.Rulesets.Osu/Objects/Slider.cs               | 11 ++++++-----
 .../Rulesets/Objects/Legacy/ConvertHitObjectParser.cs |  3 ---
 osu.Game/Rulesets/Objects/Types/IHasRepeats.cs        | 10 ++++++++++
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 6b8b70ed54..e209d012fa 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -56,6 +57,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                 Volume = s.Volume
             }).ToList();
 
+            int nodeIndex = 0;
             SliderEventDescriptor? lastEvent = null;
 
             foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken))
@@ -105,7 +107,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                     case SliderEventType.Repeat:
                         AddNested(new Fruit
                         {
-                            Samples = Samples,
+                            Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
                             X = X + Path.PositionAt(e.PathProgress).X,
                         });
@@ -119,7 +121,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         public double Duration
         {
             get => this.SpanCount() * Path.Distance / Velocity;
-            set => throw new System.NotSupportedException($"Adjust via {nameof(RepeatCount)} instead"); // can be implemented if/when needed.
+            set => throw new NotSupportedException($"Adjust via {nameof(RepeatCount)} instead"); // can be implemented if/when needed.
         }
 
         public double EndTime => StartTime + Duration;
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 917382eccf..755ce0866a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -137,6 +137,10 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             Velocity = scoringDistance / timingPoint.BeatLength;
             TickDistance = scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier;
+
+            // The samples should be attached to the slider tail, however this can only be done after LegacyLastTick is removed otherwise they would play earlier than they're intended to.
+            // For now, the samples are attached to and played by the slider itself at the correct end time.
+            Samples = this.GetNodeSamples(repeatCount + 1);
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
@@ -230,15 +234,12 @@ namespace osu.Game.Rulesets.Osu.Objects
                 tick.Samples = sampleList;
 
             foreach (var repeat in NestedHitObjects.OfType<SliderRepeat>())
-                repeat.Samples = getNodeSamples(repeat.RepeatIndex + 1);
+                repeat.Samples = this.GetNodeSamples(repeat.RepeatIndex + 1);
 
             if (HeadCircle != null)
-                HeadCircle.Samples = getNodeSamples(0);
+                HeadCircle.Samples = this.GetNodeSamples(0);
         }
 
-        private IList<HitSampleInfo> getNodeSamples(int nodeIndex) =>
-            nodeIndex < NodeSamples.Count ? NodeSamples[nodeIndex] : Samples;
-
         public override Judgement CreateJudgement() => new OsuIgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 9afc0ecaf4..f6adeced96 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -184,9 +184,6 @@ namespace osu.Game.Rulesets.Objects.Legacy
                     nodeSamples.Add(convertSoundType(nodeSoundTypes[i], nodeBankInfos[i]));
 
                 result = CreateSlider(pos, combo, comboOffset, convertControlPoints(points, pathType), length, repeatCount, nodeSamples);
-
-                // The samples are played when the slider ends, which is the last node
-                result.Samples = nodeSamples[^1];
             }
             else if (type.HasFlag(LegacyHitObjectType.Spinner))
             {
diff --git a/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs b/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
index 7a3fb16196..674e2aee88 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
@@ -35,5 +35,15 @@ namespace osu.Game.Rulesets.Objects.Types
         /// </summary>
         /// <param name="obj">The object that has repeats.</param>
         public static int SpanCount(this IHasRepeats obj) => obj.RepeatCount + 1;
+
+        /// <summary>
+        /// Retrieves the samples at a particular node in a <see cref="IHasRepeats"/> object.
+        /// </summary>
+        /// <param name="obj">The <see cref="HitObject"/>.</param>
+        /// <param name="nodeIndex">The node to attempt to retrieve the samples at.</param>
+        /// <returns>The samples at the given node index, or <paramref name="obj"/>'s default samples if the given node doesn't exist.</returns>
+        public static IList<HitSampleInfo> GetNodeSamples<T>(this T obj, int nodeIndex)
+            where T : HitObject, IHasRepeats
+            => nodeIndex < obj.NodeSamples.Count ? obj.NodeSamples[nodeIndex] : obj.Samples;
     }
 }

From d536a1f75e71a8075334b941aff91b9ab6c737c7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 21:04:56 +0900
Subject: [PATCH 05326/10326] Fix breaks being culled too early

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs | 7 +------
 osu.Game/Rulesets/Mods/ModFlashlight.cs           | 3 +++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index b30ec0ca2c..6dadbbd2da 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -307,12 +307,7 @@ namespace osu.Game.Beatmaps.Formats
                     double start = getOffsetTime(Parsing.ParseDouble(split[1]));
                     double end = Math.Max(start, getOffsetTime(Parsing.ParseDouble(split[2])));
 
-                    var breakEvent = new BreakPeriod(start, end);
-
-                    if (!breakEvent.HasEffect)
-                        return;
-
-                    beatmap.Breaks.Add(breakEvent);
+                    beatmap.Breaks.Add(new BreakPeriod(start, end));
                     break;
             }
         }
diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 6e94a84e7d..08f2ccb75c 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -107,6 +107,9 @@ namespace osu.Game.Rulesets.Mods
                 {
                     foreach (var breakPeriod in Breaks)
                     {
+                        if (!breakPeriod.HasEffect)
+                            continue;
+
                         if (breakPeriod.Duration < FLASHLIGHT_FADE_DURATION * 2) continue;
 
                         this.Delay(breakPeriod.StartTime + FLASHLIGHT_FADE_DURATION).FadeOutFromOne(FLASHLIGHT_FADE_DURATION);

From 4d0e4f4adeb0fb1c5c7ac0312b054dd4312d21fb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 21:11:12 +0900
Subject: [PATCH 05327/10326] Fix incorrect initial density

---
 osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 524ea27efa..c0fbd47899 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -116,7 +116,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 prevNoteTimes.RemoveAt(0);
             prevNoteTimes.Add(newNoteTime);
 
-            density = (prevNoteTimes[^1] - prevNoteTimes[0]) / prevNoteTimes.Count;
+            if (prevNoteTimes.Count >= 2)
+                density = (prevNoteTimes[^1] - prevNoteTimes[0]) / prevNoteTimes.Count;
         }
 
         private double lastTime;

From 9d09503ace3762d213bc15a664c5f02c7d9c984c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 21:12:38 +0900
Subject: [PATCH 05328/10326] Fix spinner conversion not considering stacking +
 forced initial column

---
 .../Beatmaps/ManiaBeatmapConverter.cs         |  2 +-
 .../Legacy/EndTimeObjectPatternGenerator.cs   | 26 ++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index c0fbd47899..b17ab3f375 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                 case IHasDuration endTimeData:
                 {
-                    conversion = new EndTimeObjectPatternGenerator(Random, original, beatmap, originalBeatmap);
+                    conversion = new EndTimeObjectPatternGenerator(Random, original, beatmap, lastPattern, originalBeatmap);
 
                     recordNote(endTimeData.EndTime, new Vector2(256, 192));
                     computeDensity(endTimeData.EndTime);
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
index d5286a3779..f816a70ab3 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -14,12 +14,17 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 {
     internal class EndTimeObjectPatternGenerator : PatternGenerator
     {
-        private readonly double endTime;
+        private readonly int endTime;
+        private readonly PatternType convertType;
 
-        public EndTimeObjectPatternGenerator(FastRandom random, HitObject hitObject, ManiaBeatmap beatmap, IBeatmap originalBeatmap)
-            : base(random, hitObject, beatmap, new Pattern(), originalBeatmap)
+        public EndTimeObjectPatternGenerator(FastRandom random, HitObject hitObject, ManiaBeatmap beatmap, Pattern previousPattern, IBeatmap originalBeatmap)
+            : base(random, hitObject, beatmap, previousPattern, originalBeatmap)
         {
-            endTime = (HitObject as IHasDuration)?.EndTime ?? 0;
+            endTime = (int)((HitObject as IHasDuration)?.EndTime ?? 0);
+
+            convertType = PreviousPattern.ColumnWithObjects == TotalColumns
+                ? PatternType.None
+                : PatternType.ForceNotStack;
         }
 
         public override IEnumerable<Pattern> Generate()
@@ -40,18 +45,25 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     break;
 
                 case 8:
-                    addToPattern(pattern, FindAvailableColumn(GetRandomColumn(), PreviousPattern), generateHold);
+                    addToPattern(pattern, getRandomColumn(), generateHold);
                     break;
 
                 default:
-                    if (TotalColumns > 0)
-                        addToPattern(pattern, GetRandomColumn(), generateHold);
+                    addToPattern(pattern, getRandomColumn(0), generateHold);
                     break;
             }
 
             return pattern;
         }
 
+        private int getRandomColumn(int? lowerBound = null)
+        {
+            if ((convertType & PatternType.ForceNotStack) > 0)
+                return FindAvailableColumn(GetRandomColumn(lowerBound), lowerBound, patterns: PreviousPattern);
+
+            return FindAvailableColumn(GetRandomColumn(lowerBound), lowerBound);
+        }
+
         /// <summary>
         /// Constructs and adds a note to a pattern.
         /// </summary>

From 5f19081db69efe63a0f96a52771d3cefbffb661e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 21:20:00 +0900
Subject: [PATCH 05329/10326] Fix incorrect probability calculation for
 hitobject conversion

---
 .../Legacy/HitObjectPatternGenerator.cs       | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index 84f950997d..bc4ab55767 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -397,7 +397,11 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 case 4:
                     centreProbability = 0;
-                    p2 = Math.Min(p2 * 2, 0.2);
+
+                    // Stable requires rngValue > x, which is an inverse-probability. Lazer uses true probability (1 - x).
+                    // But multiplying this value by 2 (stable) is not the same operation as dividing it by 2 (lazer),
+                    // so it needs to be converted to from a probability and then back after the multiplication.
+                    p2 = 1 - Math.Max((1 - p2) * 2, 0.8);
                     p3 = 0;
                     break;
 
@@ -408,11 +412,20 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 case 6:
                     centreProbability = 0;
-                    p2 = Math.Min(p2 * 2, 0.5);
-                    p3 = Math.Min(p3 * 2, 0.15);
+
+                    // Stable requires rngValue > x, which is an inverse-probability. Lazer uses true probability (1 - x).
+                    // But multiplying this value by 2 (stable) is not the same operation as dividing it by 2 (lazer),
+                    // so it needs to be converted to from a probability and then back after the multiplication.
+                    p2 = 1 - Math.Max((1 - p2) * 2, 0.5);
+                    p3 = 1 - Math.Max((1 - p3) * 2, 0.85);
                     break;
             }
 
+            // The stable values were allowed to exceed 1, which indicate <0% probability.
+            // These values needs to be clamped otherwise GetRandomNoteCount() will throw an exception.
+            p2 = Math.Clamp(p2, 0, 1);
+            p3 = Math.Clamp(p3, 0, 1);
+
             double centreVal = Random.NextDouble();
             int noteCount = GetRandomNoteCount(p2, p3);
 

From 08f3481b592c74a2151632661759c9e0380a2d65 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 21:22:13 +0900
Subject: [PATCH 05330/10326] Use integer calculations to replicate stable's
 slider conversion

---
 .../Legacy/DistanceObjectPatternGenerator.cs  | 101 ++++++++++--------
 1 file changed, 55 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index fe146c5324..415201951b 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -3,8 +3,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
-using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.MathUtils;
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Formats;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 {
@@ -25,8 +26,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// </summary>
         private const float osu_base_scoring_distance = 100;
 
-        public readonly double EndTime;
-        public readonly double SegmentDuration;
+        public readonly int StartTime;
+        public readonly int EndTime;
+        public readonly int SegmentDuration;
         public readonly int SpanCount;
 
         private PatternType convertType;
@@ -41,20 +43,25 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             var distanceData = hitObject as IHasDistance;
             var repeatsData = hitObject as IHasRepeats;
 
-            SpanCount = repeatsData?.SpanCount() ?? 1;
+            Debug.Assert(distanceData != null);
 
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
             DifficultyControlPoint difficultyPoint = beatmap.ControlPointInfo.DifficultyPointAt(hitObject.StartTime);
 
-            // The true distance, accounting for any repeats
-            double distance = (distanceData?.Distance ?? 0) * SpanCount;
-            // The velocity of the osu! hit object - calculated as the velocity of a slider
-            double osuVelocity = osu_base_scoring_distance * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier / timingPoint.BeatLength;
-            // The duration of the osu! hit object
-            double osuDuration = distance / osuVelocity;
+            double beatLength;
+#pragma warning disable 618
+            if (difficultyPoint is LegacyBeatmapDecoder.LegacyDifficultyControlPoint legacyDifficultyPoint)
+#pragma warning restore 618
+                beatLength = timingPoint.BeatLength * legacyDifficultyPoint.BpmMultiplier;
+            else
+                beatLength = timingPoint.BeatLength / difficultyPoint.SpeedMultiplier;
 
-            EndTime = hitObject.StartTime + osuDuration;
-            SegmentDuration = (EndTime - HitObject.StartTime) / SpanCount;
+            SpanCount = repeatsData?.SpanCount() ?? 1;
+
+            StartTime = (int)Math.Round(hitObject.StartTime);
+            EndTime = (int)Math.Floor(StartTime + distanceData.Distance * beatLength * SpanCount * 0.01 / beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier);
+
+            SegmentDuration = (EndTime - StartTime) / SpanCount;
         }
 
         public override IEnumerable<Pattern> Generate()
@@ -76,7 +83,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             foreach (var obj in originalPattern.HitObjects)
             {
-                if (!Precision.AlmostEquals(EndTime, obj.GetEndTime()))
+                if (EndTime != (int)Math.Round(obj.GetEndTime()))
                     intermediatePattern.Add(obj);
                 else
                     endTimePattern.Add(obj);
@@ -91,35 +98,35 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             if (TotalColumns == 1)
             {
                 var pattern = new Pattern();
-                addToPattern(pattern, 0, HitObject.StartTime, EndTime);
+                addToPattern(pattern, 0, StartTime, EndTime);
                 return pattern;
             }
 
             if (SpanCount > 1)
             {
                 if (SegmentDuration <= 90)
-                    return generateRandomHoldNotes(HitObject.StartTime, 1);
+                    return generateRandomHoldNotes(StartTime, 1);
 
                 if (SegmentDuration <= 120)
                 {
                     convertType |= PatternType.ForceNotStack;
-                    return generateRandomNotes(HitObject.StartTime, SpanCount + 1);
+                    return generateRandomNotes(StartTime, SpanCount + 1);
                 }
 
                 if (SegmentDuration <= 160)
-                    return generateStair(HitObject.StartTime);
+                    return generateStair(StartTime);
 
                 if (SegmentDuration <= 200 && ConversionDifficulty > 3)
-                    return generateRandomMultipleNotes(HitObject.StartTime);
+                    return generateRandomMultipleNotes(StartTime);
 
-                double duration = EndTime - HitObject.StartTime;
+                double duration = EndTime - StartTime;
                 if (duration >= 4000)
-                    return generateNRandomNotes(HitObject.StartTime, 0.23, 0, 0);
+                    return generateNRandomNotes(StartTime, 0.23, 0, 0);
 
                 if (SegmentDuration > 400 && SpanCount < TotalColumns - 1 - RandomStart)
-                    return generateTiledHoldNotes(HitObject.StartTime);
+                    return generateTiledHoldNotes(StartTime);
 
-                return generateHoldAndNormalNotes(HitObject.StartTime);
+                return generateHoldAndNormalNotes(StartTime);
             }
 
             if (SegmentDuration <= 110)
@@ -128,37 +135,37 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     convertType |= PatternType.ForceNotStack;
                 else
                     convertType &= ~PatternType.ForceNotStack;
-                return generateRandomNotes(HitObject.StartTime, SegmentDuration < 80 ? 1 : 2);
+                return generateRandomNotes(StartTime, SegmentDuration < 80 ? 1 : 2);
             }
 
             if (ConversionDifficulty > 6.5)
             {
                 if (convertType.HasFlag(PatternType.LowProbability))
-                    return generateNRandomNotes(HitObject.StartTime, 0.78, 0.3, 0);
+                    return generateNRandomNotes(StartTime, 0.78, 0.3, 0);
 
-                return generateNRandomNotes(HitObject.StartTime, 0.85, 0.36, 0.03);
+                return generateNRandomNotes(StartTime, 0.85, 0.36, 0.03);
             }
 
             if (ConversionDifficulty > 4)
             {
                 if (convertType.HasFlag(PatternType.LowProbability))
-                    return generateNRandomNotes(HitObject.StartTime, 0.43, 0.08, 0);
+                    return generateNRandomNotes(StartTime, 0.43, 0.08, 0);
 
-                return generateNRandomNotes(HitObject.StartTime, 0.56, 0.18, 0);
+                return generateNRandomNotes(StartTime, 0.56, 0.18, 0);
             }
 
             if (ConversionDifficulty > 2.5)
             {
                 if (convertType.HasFlag(PatternType.LowProbability))
-                    return generateNRandomNotes(HitObject.StartTime, 0.3, 0, 0);
+                    return generateNRandomNotes(StartTime, 0.3, 0, 0);
 
-                return generateNRandomNotes(HitObject.StartTime, 0.37, 0.08, 0);
+                return generateNRandomNotes(StartTime, 0.37, 0.08, 0);
             }
 
             if (convertType.HasFlag(PatternType.LowProbability))
-                return generateNRandomNotes(HitObject.StartTime, 0.17, 0, 0);
+                return generateNRandomNotes(StartTime, 0.17, 0, 0);
 
-            return generateNRandomNotes(HitObject.StartTime, 0.27, 0, 0);
+            return generateNRandomNotes(StartTime, 0.27, 0, 0);
         }
 
         /// <summary>
@@ -167,7 +174,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <param name="startTime">Start time of each hold note.</param>
         /// <param name="noteCount">Number of hold notes.</param>
         /// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
-        private Pattern generateRandomHoldNotes(double startTime, int noteCount)
+        private Pattern generateRandomHoldNotes(int startTime, int noteCount)
         {
             // - - - -
             // ■ - ■ ■
@@ -202,7 +209,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <param name="startTime">The start time.</param>
         /// <param name="noteCount">The number of notes.</param>
         /// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
-        private Pattern generateRandomNotes(double startTime, int noteCount)
+        private Pattern generateRandomNotes(int startTime, int noteCount)
         {
             // - - - -
             // x - - -
@@ -234,7 +241,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// </summary>
         /// <param name="startTime">The start time.</param>
         /// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
-        private Pattern generateStair(double startTime)
+        private Pattern generateStair(int startTime)
         {
             // - - - -
             // x - - -
@@ -286,7 +293,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// </summary>
         /// <param name="startTime">The start time.</param>
         /// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
-        private Pattern generateRandomMultipleNotes(double startTime)
+        private Pattern generateRandomMultipleNotes(int startTime)
         {
             // - - - -
             // x - - -
@@ -329,7 +336,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <param name="p3">The probability required for 3 hold notes to be generated.</param>
         /// <param name="p4">The probability required for 4 hold notes to be generated.</param>
         /// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
-        private Pattern generateNRandomNotes(double startTime, double p2, double p3, double p4)
+        private Pattern generateNRandomNotes(int startTime, double p2, double p3, double p4)
         {
             // - - - -
             // ■ - ■ ■
@@ -366,7 +373,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             static bool isDoubleSample(HitSampleInfo sample) => sample.Name == HitSampleInfo.HIT_CLAP || sample.Name == HitSampleInfo.HIT_FINISH;
 
             bool canGenerateTwoNotes = !convertType.HasFlag(PatternType.LowProbability);
-            canGenerateTwoNotes &= HitObject.Samples.Any(isDoubleSample) || sampleInfoListAt(HitObject.StartTime).Any(isDoubleSample);
+            canGenerateTwoNotes &= HitObject.Samples.Any(isDoubleSample) || sampleInfoListAt(StartTime).Any(isDoubleSample);
 
             if (canGenerateTwoNotes)
                 p2 = 1;
@@ -379,7 +386,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// </summary>
         /// <param name="startTime">The first hold note start time.</param>
         /// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
-        private Pattern generateTiledHoldNotes(double startTime)
+        private Pattern generateTiledHoldNotes(int startTime)
         {
             // - - - -
             // ■ ■ ■ ■
@@ -394,6 +401,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             int columnRepeat = Math.Min(SpanCount, TotalColumns);
 
+            // Due to integer rounding, this is not guaranteed to be the same as EndTime (the class-level variable).
+            int endTime = startTime + SegmentDuration * SpanCount;
+
             int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
             if (convertType.HasFlag(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
                 nextColumn = FindAvailableColumn(nextColumn, PreviousPattern);
@@ -401,7 +411,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             for (int i = 0; i < columnRepeat; i++)
             {
                 nextColumn = FindAvailableColumn(nextColumn, pattern);
-                addToPattern(pattern, nextColumn, startTime, EndTime);
+                addToPattern(pattern, nextColumn, startTime, endTime);
                 startTime += SegmentDuration;
             }
 
@@ -413,7 +423,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// </summary>
         /// <param name="startTime">The start time of notes.</param>
         /// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
-        private Pattern generateHoldAndNormalNotes(double startTime)
+        private Pattern generateHoldAndNormalNotes(int startTime)
         {
             // - - - -
             // ■ x x -
@@ -448,7 +458,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             for (int i = 0; i <= SpanCount; i++)
             {
-                if (!(ignoreHead && startTime == HitObject.StartTime))
+                if (!(ignoreHead && startTime == StartTime))
                 {
                     for (int j = 0; j < noteCount; j++)
                     {
@@ -471,19 +481,18 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// </summary>
         /// <param name="time">The time to retrieve the sample info list from.</param>
         /// <returns></returns>
-        private IList<HitSampleInfo> sampleInfoListAt(double time) => nodeSamplesAt(time)?.First() ?? HitObject.Samples;
+        private IList<HitSampleInfo> sampleInfoListAt(int time) => nodeSamplesAt(time)?.First() ?? HitObject.Samples;
 
         /// <summary>
         /// Retrieves the list of node samples that occur at time greater than or equal to <paramref name="time"/>.
         /// </summary>
         /// <param name="time">The time to retrieve node samples at.</param>
-        private List<IList<HitSampleInfo>> nodeSamplesAt(double time)
+        private List<IList<HitSampleInfo>> nodeSamplesAt(int time)
         {
             if (!(HitObject is IHasPathWithRepeats curveData))
                 return null;
 
-            // mathematically speaking this should be a whole number always, but floating-point arithmetic is not so kind
-            var index = (int)Math.Round(SegmentDuration == 0 ? 0 : (time - HitObject.StartTime) / SegmentDuration, MidpointRounding.AwayFromZero);
+            var index = SegmentDuration == 0 ? 0 : (time - StartTime) / SegmentDuration;
 
             // avoid slicing the list & creating copies, if at all possible.
             return index == 0 ? curveData.NodeSamples : curveData.NodeSamples.Skip(index).ToList();
@@ -496,7 +505,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <param name="column">The column to add the note to.</param>
         /// <param name="startTime">The start time of the note.</param>
         /// <param name="endTime">The end time of the note (set to <paramref name="startTime"/> for a non-hold note).</param>
-        private void addToPattern(Pattern pattern, int column, double startTime, double endTime)
+        private void addToPattern(Pattern pattern, int column, int startTime, int endTime)
         {
             ManiaHitObject newObject;
 

From 485a951281f62bb3ff7afad7b369e4442b61ab24 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 21:42:43 +0900
Subject: [PATCH 05331/10326] Expose current strain and retrieval of peak
 strain

---
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs | 25 ++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 227f2f4018..1063a24b27 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -41,7 +41,11 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected readonly LimitedCapacityStack<DifficultyHitObject> Previous = new LimitedCapacityStack<DifficultyHitObject>(2); // Contained objects not used yet
 
-        private double currentStrain = 1; // We keep track of the strain level at all times throughout the beatmap.
+        /// <summary>
+        /// The current strain level.
+        /// </summary>
+        protected double CurrentStrain { get; private set; } = 1;
+
         private double currentSectionPeak = 1; // We also keep track of the peak strain level in the current section.
 
         private readonly List<double> strainPeaks = new List<double>();
@@ -51,10 +55,10 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         public void Process(DifficultyHitObject current)
         {
-            currentStrain *= strainDecay(current.DeltaTime);
-            currentStrain += StrainValueOf(current) * SkillMultiplier;
+            CurrentStrain *= strainDecay(current.DeltaTime);
+            CurrentStrain += StrainValueOf(current) * SkillMultiplier;
 
-            currentSectionPeak = Math.Max(currentStrain, currentSectionPeak);
+            currentSectionPeak = Math.Max(CurrentStrain, currentSectionPeak);
 
             Previous.Push(current);
         }
@@ -71,15 +75,22 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <summary>
         /// Sets the initial strain level for a new section.
         /// </summary>
-        /// <param name="offset">The beginning of the new section in milliseconds.</param>
-        public void StartNewSectionFrom(double offset)
+        /// <param name="time">The beginning of the new section in milliseconds.</param>
+        public void StartNewSectionFrom(double time)
         {
             // The maximum strain of the new section is not zero by default, strain decays as usual regardless of section boundaries.
             // This means we need to capture the strain level at the beginning of the new section, and use that as the initial peak level.
             if (Previous.Count > 0)
-                currentSectionPeak = currentStrain * strainDecay(offset - Previous[0].BaseObject.StartTime);
+                currentSectionPeak = GetPeakStrain(time);
         }
 
+        /// <summary>
+        /// Retrieves the peak strain at a point in time.
+        /// </summary>
+        /// <param name="time">The time to retrieve the peak strain at.</param>
+        /// <returns>The peak strain.</returns>
+        protected virtual double GetPeakStrain(double time) => CurrentStrain * strainDecay(time - Previous[0].BaseObject.StartTime);
+
         /// <summary>
         /// Returns the calculated difficulty value representing all processed <see cref="DifficultyHitObject"/>s.
         /// </summary>

From 8f37d2290a4321bc569bc73f30cdbdb7755f1ed7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 21:43:46 +0900
Subject: [PATCH 05332/10326] Expose sorting of hitobjects

---
 osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 1902de5bda..e80a4e4b1c 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Difficulty
             if (!beatmap.HitObjects.Any())
                 return CreateDifficultyAttributes(beatmap, mods, skills, clockRate);
 
-            var difficultyHitObjects = CreateDifficultyHitObjects(beatmap, clockRate).OrderBy(h => h.BaseObject.StartTime).ToList();
+            var difficultyHitObjects = SortObjects(CreateDifficultyHitObjects(beatmap, clockRate)).ToList();
 
             double sectionLength = SectionLength * clockRate;
 
@@ -100,6 +100,14 @@ namespace osu.Game.Rulesets.Difficulty
             return CreateDifficultyAttributes(beatmap, mods, skills, clockRate);
         }
 
+        /// <summary>
+        /// Sorts a given set of <see cref="DifficultyHitObject"/>s.
+        /// </summary>
+        /// <param name="input">The <see cref="DifficultyHitObject"/>s to sort.</param>
+        /// <returns>The sorted <see cref="DifficultyHitObject"/>s.</returns>
+        protected virtual IEnumerable<DifficultyHitObject> SortObjects(IEnumerable<DifficultyHitObject> input)
+            => input.OrderBy(h => h.BaseObject.StartTime);
+
         /// <summary>
         /// Creates all <see cref="Mod"/> combinations which adjust the <see cref="Beatmap"/> difficulty.
         /// </summary>

From b0f8a7794a58a573a839e237d103bc4d50ac3eaa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Oct 2020 21:44:10 +0900
Subject: [PATCH 05333/10326] Make SelectionHandler require EditorBeatmap
 presence

---
 .../Compose/Components/SelectionHandler.cs     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 6e144fd5ff..4caceedc5a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected SelectionBox SelectionBox { get; private set; }
 
-        [Resolved(CanBeNull = true)]
+        [Resolved]
         protected EditorBeatmap EditorBeatmap { get; private set; }
 
         [Resolved(CanBeNull = true)]
@@ -243,7 +243,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void deleteSelected()
         {
-            EditorBeatmap?.RemoveRange(selectedBlueprints.Select(b => b.HitObject));
+            EditorBeatmap.RemoveRange(selectedBlueprints.Select(b => b.HitObject));
         }
 
         #endregion
@@ -310,7 +310,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void AddHitSample(string sampleName)
         {
-            EditorBeatmap?.BeginChange();
+            EditorBeatmap.BeginChange();
 
             foreach (var h in EditorBeatmap.SelectedHitObjects)
             {
@@ -321,7 +321,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 h.Samples.Add(new HitSampleInfo { Name = sampleName });
             }
 
-            EditorBeatmap?.EndChange();
+            EditorBeatmap.EndChange();
         }
 
         /// <summary>
@@ -331,7 +331,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
         public void SetNewCombo(bool state)
         {
-            EditorBeatmap?.BeginChange();
+            EditorBeatmap.BeginChange();
 
             foreach (var h in EditorBeatmap.SelectedHitObjects)
             {
@@ -340,10 +340,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 if (comboInfo == null || comboInfo.NewCombo == state) continue;
 
                 comboInfo.NewCombo = state;
-                EditorBeatmap?.Update(h);
+                EditorBeatmap.Update(h);
             }
 
-            EditorBeatmap?.EndChange();
+            EditorBeatmap.EndChange();
         }
 
         /// <summary>
@@ -352,12 +352,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void RemoveHitSample(string sampleName)
         {
-            EditorBeatmap?.BeginChange();
+            EditorBeatmap.BeginChange();
 
             foreach (var h in EditorBeatmap.SelectedHitObjects)
                 h.SamplesBindable.RemoveAll(s => s.Name == sampleName);
 
-            EditorBeatmap?.EndChange();
+            EditorBeatmap.EndChange();
         }
 
         #endregion

From 5017c92fe84973d58f3fa6c4c90af0b0858c2591 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 21:47:34 +0900
Subject: [PATCH 05334/10326] Combine mania skills

---
 .../Difficulty/ManiaDifficultyCalculator.cs   | 47 +----------
 .../Difficulty/Skills/Individual.cs           | 47 -----------
 .../Difficulty/Skills/Overall.cs              | 56 -------------
 .../Difficulty/Skills/Strain.cs               | 80 +++++++++++++++++++
 4 files changed, 84 insertions(+), 146 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Difficulty/Skills/Individual.cs
 delete mode 100644 osu.Game.Rulesets.Mania/Difficulty/Skills/Overall.cs
 create mode 100644 osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs

diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index b08c520c54..7dd1755742 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 
             return new ManiaDifficultyAttributes
             {
-                StarRating = difficultyValue(skills) * star_scaling_factor,
+                StarRating = skills[0].DifficultyValue() * star_scaling_factor,
                 Mods = mods,
                 // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be removed in the future
                 GreatHitWindow = (int)(hitWindows.WindowFor(HitResult.Great)) / clockRate,
@@ -49,55 +49,16 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             };
         }
 
-        private double difficultyValue(Skill[] skills)
-        {
-            // Preprocess the strains to find the maximum overall + individual (aggregate) strain from each section
-            var overall = skills.OfType<Overall>().Single();
-            var aggregatePeaks = new List<double>(Enumerable.Repeat(0.0, overall.StrainPeaks.Count));
-
-            foreach (var individual in skills.OfType<Individual>())
-            {
-                for (int i = 0; i < individual.StrainPeaks.Count; i++)
-                {
-                    double aggregate = individual.StrainPeaks[i] + overall.StrainPeaks[i];
-
-                    if (aggregate > aggregatePeaks[i])
-                        aggregatePeaks[i] = aggregate;
-                }
-            }
-
-            aggregatePeaks.Sort((a, b) => b.CompareTo(a)); // Sort from highest to lowest strain.
-
-            double difficulty = 0;
-            double weight = 1;
-
-            // Difficulty is the weighted sum of the highest strains from every section.
-            foreach (double strain in aggregatePeaks)
-            {
-                difficulty += strain * weight;
-                weight *= 0.9;
-            }
-
-            return difficulty;
-        }
-
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
         {
             for (int i = 1; i < beatmap.HitObjects.Count; i++)
                 yield return new ManiaDifficultyHitObject(beatmap.HitObjects[i], beatmap.HitObjects[i - 1], clockRate);
         }
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap)
+        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
         {
-            int columnCount = ((ManiaBeatmap)beatmap).TotalColumns;
-
-            var skills = new List<Skill> { new Overall(columnCount) };
-
-            for (int i = 0; i < columnCount; i++)
-                skills.Add(new Individual(i, columnCount));
-
-            return skills.ToArray();
-        }
+            new Strain(((ManiaBeatmap)beatmap).TotalColumns)
+        };
 
         protected override Mod[] DifficultyAdjustmentMods
         {
diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Individual.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Individual.cs
deleted file mode 100644
index 4f7ab87fad..0000000000
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Individual.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 System.Linq;
-using osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Skills;
-using osu.Game.Rulesets.Mania.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Objects;
-
-namespace osu.Game.Rulesets.Mania.Difficulty.Skills
-{
-    public class Individual : Skill
-    {
-        protected override double SkillMultiplier => 1;
-        protected override double StrainDecayBase => 0.125;
-
-        private readonly double[] holdEndTimes;
-
-        private readonly int column;
-
-        public Individual(int column, int columnCount)
-        {
-            this.column = column;
-
-            holdEndTimes = new double[columnCount];
-        }
-
-        protected override double StrainValueOf(DifficultyHitObject current)
-        {
-            var maniaCurrent = (ManiaDifficultyHitObject)current;
-            var endTime = maniaCurrent.BaseObject.GetEndTime();
-
-            try
-            {
-                if (maniaCurrent.BaseObject.Column != column)
-                    return 0;
-
-                // We give a slight bonus if something is held meanwhile
-                return holdEndTimes.Any(t => t > endTime) ? 2.5 : 2;
-            }
-            finally
-            {
-                holdEndTimes[maniaCurrent.BaseObject.Column] = endTime;
-            }
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Overall.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Overall.cs
deleted file mode 100644
index bbbb93fd8b..0000000000
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Overall.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.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Skills;
-using osu.Game.Rulesets.Mania.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Objects;
-
-namespace osu.Game.Rulesets.Mania.Difficulty.Skills
-{
-    public class Overall : Skill
-    {
-        protected override double SkillMultiplier => 1;
-        protected override double StrainDecayBase => 0.3;
-
-        private readonly double[] holdEndTimes;
-
-        private readonly int columnCount;
-
-        public Overall(int columnCount)
-        {
-            this.columnCount = columnCount;
-
-            holdEndTimes = new double[columnCount];
-        }
-
-        protected override double StrainValueOf(DifficultyHitObject current)
-        {
-            var maniaCurrent = (ManiaDifficultyHitObject)current;
-            var endTime = maniaCurrent.BaseObject.GetEndTime();
-
-            double holdFactor = 1.0; // Factor in case something else is held
-            double holdAddition = 0; // Addition to the current note in case it's a hold and has to be released awkwardly
-
-            for (int i = 0; i < columnCount; i++)
-            {
-                // If there is at least one other overlapping end or note, then we get an addition, buuuuuut...
-                if (current.BaseObject.StartTime < holdEndTimes[i] && endTime > holdEndTimes[i])
-                    holdAddition = 1.0;
-
-                // ... this addition only is valid if there is _no_ other note with the same ending.
-                // Releasing multiple notes at the same time is just as easy as releasing one
-                if (endTime == holdEndTimes[i])
-                    holdAddition = 0;
-
-                // We give a slight bonus if something is held meanwhile
-                if (holdEndTimes[i] > endTime)
-                    holdFactor = 1.25;
-            }
-
-            holdEndTimes[maniaCurrent.BaseObject.Column] = endTime;
-
-            return (1 + holdAddition) * holdFactor;
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
new file mode 100644
index 0000000000..7ebc1ff752
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.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 osu.Framework.Utils;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mania.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Mania.Difficulty.Skills
+{
+    public class Strain : Skill
+    {
+        private const double individual_decay_base = 0.125;
+        private const double overall_decay_base = 0.30;
+
+        protected override double SkillMultiplier => 1;
+        protected override double StrainDecayBase => 1;
+
+        private readonly double[] holdEndTimes;
+        private readonly double[] individualStrains;
+
+        private double individualStrain;
+        private double overallStrain;
+
+        public Strain(int totalColumns)
+        {
+            holdEndTimes = new double[totalColumns];
+            individualStrains = new double[totalColumns];
+            overallStrain = 1;
+        }
+
+        protected override double StrainValueOf(DifficultyHitObject current)
+        {
+            var maniaCurrent = (ManiaDifficultyHitObject)current;
+            var endTime = maniaCurrent.BaseObject.GetEndTime();
+            var column = maniaCurrent.BaseObject.Column;
+
+            double holdFactor = 1.0; // Factor to all additional strains in case something else is held
+            double holdAddition = 0; // Addition to the current note in case it's a hold and has to be released awkwardly
+
+            // Fill up the holdEndTimes array
+            for (int i = 0; i < holdEndTimes.Length; ++i)
+            {
+                // If there is at least one other overlapping end or note, then we get an addition, buuuuuut...
+                if (Precision.DefinitelyBigger(holdEndTimes[i], maniaCurrent.BaseObject.StartTime, 1) && Precision.DefinitelyBigger(endTime, holdEndTimes[i], 1))
+                    holdAddition = 1.0;
+
+                // ... this addition only is valid if there is _no_ other note with the same ending. Releasing multiple notes at the same time is just as easy as releasing 1
+                if (Precision.AlmostEquals(endTime, holdEndTimes[i], 1))
+                    holdAddition = 0;
+
+                // We give a slight bonus to everything if something is held meanwhile
+                if (Precision.DefinitelyBigger(holdEndTimes[i], endTime, 1))
+                    holdFactor = 1.25;
+
+                // Decay individual strains
+                individualStrains[i] = applyDecay(individualStrains[i], current.DeltaTime, individual_decay_base);
+            }
+
+            holdEndTimes[column] = endTime;
+
+            // Increase individual strain in own column
+            individualStrains[column] += 2.0 * holdFactor;
+            individualStrain = individualStrains[column];
+
+            overallStrain = applyDecay(overallStrain, current.DeltaTime, overall_decay_base) + (1 + holdAddition) * holdFactor;
+
+            return individualStrain + overallStrain - CurrentStrain;
+        }
+
+        protected override double GetPeakStrain(double offset)
+            => applyDecay(individualStrain, offset - Previous[0].BaseObject.StartTime, individual_decay_base)
+               + applyDecay(overallStrain, offset - Previous[0].BaseObject.StartTime, overall_decay_base);
+
+        private double applyDecay(double value, double deltaTime, double decayBase)
+            => value * Math.Pow(decayBase, deltaTime / 1000);
+    }
+}

From 306d876d22042d3e6d61b41e3bb534b254e7c276 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 21:50:11 +0900
Subject: [PATCH 05335/10326] Replicate stable's unstable sort

---
 .../Difficulty/ManiaDifficultyCalculator.cs   |  14 +-
 .../MathUtils/LegacySortHelper.cs             | 164 ++++++++++++++++++
 2 files changed, 176 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/MathUtils/LegacySortHelper.cs

diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index 7dd1755742..a3694f354b 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -10,10 +11,12 @@ using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Mania.Difficulty.Skills;
+using osu.Game.Rulesets.Mania.MathUtils;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Difficulty
@@ -51,10 +54,17 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
         {
-            for (int i = 1; i < beatmap.HitObjects.Count; i++)
-                yield return new ManiaDifficultyHitObject(beatmap.HitObjects[i], beatmap.HitObjects[i - 1], clockRate);
+            var sortedObjects = beatmap.HitObjects.ToArray();
+
+            LegacySortHelper<HitObject>.Sort(sortedObjects, Comparer<HitObject>.Create((a, b) => (int)Math.Round(a.StartTime) - (int)Math.Round(b.StartTime)));
+
+            for (int i = 1; i < sortedObjects.Length; i++)
+                yield return new ManiaDifficultyHitObject(sortedObjects[i], sortedObjects[i - 1], clockRate);
         }
 
+        // Sorting is done in CreateDifficultyHitObjects, since the full list of hitobjects is required.
+        protected override IEnumerable<DifficultyHitObject> SortObjects(IEnumerable<DifficultyHitObject> input) => input;
+
         protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
         {
             new Strain(((ManiaBeatmap)beatmap).TotalColumns)
diff --git a/osu.Game.Rulesets.Mania/MathUtils/LegacySortHelper.cs b/osu.Game.Rulesets.Mania/MathUtils/LegacySortHelper.cs
new file mode 100644
index 0000000000..421cc0ae04
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/MathUtils/LegacySortHelper.cs
@@ -0,0 +1,164 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+
+namespace osu.Game.Rulesets.Mania.MathUtils
+{
+    /// <summary>
+    /// Provides access to .NET4.0 unstable sorting methods.
+    /// </summary>
+    /// <remarks>
+    /// Source: https://referencesource.microsoft.com/#mscorlib/system/collections/generic/arraysorthelper.cs
+    /// </remarks>
+    internal static class LegacySortHelper<T>
+    {
+        private const int quick_sort_depth_threshold = 32;
+
+        public static void Sort(T[] keys, IComparer<T> comparer)
+        {
+            if (keys == null)
+                throw new ArgumentNullException(nameof(keys));
+
+            if (keys.Length == 0)
+                return;
+
+            comparer ??= Comparer<T>.Default;
+            depthLimitedQuickSort(keys, 0, keys.Length - 1, comparer, quick_sort_depth_threshold);
+        }
+
+        private static void depthLimitedQuickSort(T[] keys, int left, int right, IComparer<T> comparer, int depthLimit)
+        {
+            do
+            {
+                if (depthLimit == 0)
+                {
+                    heapsort(keys, left, right, comparer);
+                    return;
+                }
+
+                int i = left;
+                int j = right;
+
+                // pre-sort the low, middle (pivot), and high values in place.
+                // this improves performance in the face of already sorted data, or
+                // data that is made up of multiple sorted runs appended together.
+                int middle = i + ((j - i) >> 1);
+                swapIfGreater(keys, comparer, i, middle); // swap the low with the mid point
+                swapIfGreater(keys, comparer, i, j); // swap the low with the high
+                swapIfGreater(keys, comparer, middle, j); // swap the middle with the high
+
+                T x = keys[middle];
+
+                do
+                {
+                    while (comparer.Compare(keys[i], x) < 0) i++;
+                    while (comparer.Compare(x, keys[j]) < 0) j--;
+                    Contract.Assert(i >= left && j <= right, "(i>=left && j<=right)  Sort failed - Is your IComparer bogus?");
+                    if (i > j) break;
+
+                    if (i < j)
+                    {
+                        T key = keys[i];
+                        keys[i] = keys[j];
+                        keys[j] = key;
+                    }
+
+                    i++;
+                    j--;
+                } while (i <= j);
+
+                // The next iteration of the while loop is to "recursively" sort the larger half of the array and the
+                // following calls recrusively sort the smaller half.  So we subtrack one from depthLimit here so
+                // both sorts see the new value.
+                depthLimit--;
+
+                if (j - left <= right - i)
+                {
+                    if (left < j) depthLimitedQuickSort(keys, left, j, comparer, depthLimit);
+                    left = i;
+                }
+                else
+                {
+                    if (i < right) depthLimitedQuickSort(keys, i, right, comparer, depthLimit);
+                    right = j;
+                }
+            } while (left < right);
+        }
+
+        private static void heapsort(T[] keys, int lo, int hi, IComparer<T> comparer)
+        {
+            Contract.Requires(keys != null);
+            Contract.Requires(comparer != null);
+            Contract.Requires(lo >= 0);
+            Contract.Requires(hi > lo);
+            Contract.Requires(hi < keys.Length);
+
+            int n = hi - lo + 1;
+
+            for (int i = n / 2; i >= 1; i = i - 1)
+            {
+                downHeap(keys, i, n, lo, comparer);
+            }
+
+            for (int i = n; i > 1; i = i - 1)
+            {
+                swap(keys, lo, lo + i - 1);
+                downHeap(keys, 1, i - 1, lo, comparer);
+            }
+        }
+
+        private static void downHeap(T[] keys, int i, int n, int lo, IComparer<T> comparer)
+        {
+            Contract.Requires(keys != null);
+            Contract.Requires(comparer != null);
+            Contract.Requires(lo >= 0);
+            Contract.Requires(lo < keys.Length);
+
+            T d = keys[lo + i - 1];
+
+            while (i <= n / 2)
+            {
+                var child = 2 * i;
+
+                if (child < n && comparer.Compare(keys[lo + child - 1], keys[lo + child]) < 0)
+                {
+                    child++;
+                }
+
+                if (!(comparer.Compare(d, keys[lo + child - 1]) < 0))
+                    break;
+
+                keys[lo + i - 1] = keys[lo + child - 1];
+                i = child;
+            }
+
+            keys[lo + i - 1] = d;
+        }
+
+        private static void swap(T[] a, int i, int j)
+        {
+            if (i != j)
+            {
+                T t = a[i];
+                a[i] = a[j];
+                a[j] = t;
+            }
+        }
+
+        private static void swapIfGreater(T[] keys, IComparer<T> comparer, int a, int b)
+        {
+            if (a != b)
+            {
+                if (comparer.Compare(keys[a], keys[b]) > 0)
+                {
+                    T key = keys[a];
+                    keys[a] = keys[b];
+                    keys[b] = key;
+                }
+            }
+        }
+    }
+}

From 65d8530a11008333c8fc3b75c9fbee2a74c3d96b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Oct 2020 22:47:32 +0900
Subject: [PATCH 05336/10326] Fix tests

---
 .../Testing/Beatmaps/convert-samples-expected-conversion.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
index fec1360b26..d49ffa01c5 100644
--- a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
@@ -10,7 +10,7 @@
         ["soft-hitnormal"],
         ["drum-hitnormal"]
       ],
-      "Samples": ["drum-hitnormal"]
+      "Samples": ["-hitnormal"]
     }, {
       "StartTime": 1875.0,
       "EndTime": 2750.0,
@@ -19,7 +19,7 @@
         ["soft-hitnormal"],
         ["drum-hitnormal"]
       ],
-      "Samples": ["drum-hitnormal"]
+      "Samples": ["-hitnormal"]
     }]
   }, {
     "StartTime": 3750.0,

From 6e8011a7ee51a0f1a9a6abf528f227595abb4e6e Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Fri, 9 Oct 2020 17:28:59 +0300
Subject: [PATCH 05337/10326] Write xmldoc for TestFourVariousResultsOneMiss

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index dd191b03c2..f7144beda7 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -54,6 +54,21 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
         }
 
+        /// <summary>
+        /// Test to see that all <see cref="HitResult"/> contribute to score portions in correct amounts.
+        /// </summary>
+        /// <param name="scoringMode">Scoring mode to test</param>
+        /// <param name="hitResult">HitResult that will be applied to HitObjects</param>
+        /// <param name="maxResult">HitResult used for accuracy calcualtion</param>
+        /// <param name="expectedScore">Expected score after 3/4 hitobjects have been hit</param>
+        /// <remarks>
+        /// This test intentionally misses the 3rd hitobject to achieve lower than 75% accuracy and 50% max combo
+        /// expectedScore is calcualted using this algorithm for standardised scoring: 1_000_000 * ((75% * score_per_hitobject / max_per_hitobject * 30%) + (50% * 70%))
+        /// "75% * score_per_hitobject / max_per_hitobject" is the accuracy we would get for hitting 3/4 hitobjects that award "score_per_hitobject / max_per_hitobject" accuracy each hit
+        ///
+        /// expectedScore is calculated using this algorithm for classic scoring: score_per_hitobject / max_per_hitobject * 936
+        /// "936" is simplified from "75% * 4 * 300 * (1 + 1/25)"
+        /// </remarks>
         [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)]
         [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 387_500)]
         [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 425_000)]

From a279c38af49a57ea7a6b668d37b774c5863335f2 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Fri, 9 Oct 2020 17:33:13 +0300
Subject: [PATCH 05338/10326] Convert all expectedScore values to int

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index f7144beda7..4f4503faea 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         /// <param name="scoringMode">Scoring mode to test</param>
         /// <param name="hitResult">HitResult that will be applied to HitObjects</param>
         /// <param name="maxResult">HitResult used for accuracy calcualtion</param>
-        /// <param name="expectedScore">Expected score after 3/4 hitobjects have been hit</param>
+        /// <param name="expectedScore">Expected score after 3/4 hitobjects have been hit rounded to nearest integer</param>
         /// <remarks>
         /// This test intentionally misses the 3rd hitobject to achieve lower than 75% accuracy and 50% max combo
         /// expectedScore is calcualted using this algorithm for standardised scoring: 1_000_000 * ((75% * score_per_hitobject / max_per_hitobject * 30%) + (50% * 70%))
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)]
         [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 387_500)]
         [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 425_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 3_350_000 / 7.0)]
+        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 478_571)]
         [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 575_000)]
         [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 575_000)]
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 700_000)]
@@ -84,7 +84,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
         [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 156)]
         [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 312)]
-        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 3744 / 7.0)]
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 535)]
         [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 936)]
         [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 936)]
         [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
@@ -93,7 +93,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)]
         [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 30)]
         [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 150)]
-        public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, double expectedScore)
+        public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
         {
             var minResult = new TestJudgement(hitResult).MinResult;
 
@@ -113,14 +113,14 @@ namespace osu.Game.Tests.Rulesets.Scoring
                 scoreProcessor.ApplyResult(judgementResult);
             }
 
-            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
+            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value, 0.5));
         }
 
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, 6_850_000 / 7.0)]
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, 6_400_000 / 7.0)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, 1950 / 7.0)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, 1500 / 7.0)]
-        public void TestSmallTicksAccuracy(ScoringMode scoringMode, HitResult hitResult, double expectedScore)
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, 978_571)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, 914_286)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, 279)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, 214)]
+        public void TestSmallTicksAccuracy(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
         {
             IEnumerable<HitObject> hitObjects = Enumerable
                                                 .Repeat(new TestHitObject(HitResult.SmallTickHit), 4)
@@ -147,7 +147,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
             };
             scoreProcessor.ApplyResult(lastJudgementResult);
 
-            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
+            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value, 0.5));
         }
 
         [TestCase(HitResult.IgnoreHit, HitResult.IgnoreMiss)]

From cf76d777623d32947d1285384c71f540a586dea3 Mon Sep 17 00:00:00 2001
From: Sebastian Krajewski <mail@wieku.me>
Date: Fri, 9 Oct 2020 17:34:01 +0200
Subject: [PATCH 05339/10326] Fix osu!classic skin elements not showing up in
 storyboards

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 45c74da892..cd09cafbce 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.IO;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -138,7 +139,8 @@ namespace osu.Game.Storyboards.Drawables
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);
-            var newTexture = skin?.GetTexture(Sprite.Path) ?? storyboardTextureStore?.Get(texturePath);
+
+            var newTexture = skin?.GetTexture(Path.GetFileNameWithoutExtension(Sprite.Path)) ?? storyboardTextureStore?.Get(texturePath);
 
             if (drawableSprite.Texture == newTexture) return;
 

From f41fc71e42c9301889a8cff230a723a8ba8007d8 Mon Sep 17 00:00:00 2001
From: Sebastian Krajewski <mail@wieku.me>
Date: Fri, 9 Oct 2020 18:02:21 +0200
Subject: [PATCH 05340/10326] Allow storyboard animations to load textures from
 skins

---
 .../Drawables/DrawableStoryboardAnimation.cs  | 47 +++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 72e52f6106..963cf37fea 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.IO;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -10,13 +12,22 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Skinning;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    public class DrawableStoryboardAnimation : TextureAnimation, IFlippable, IVectorScalable
+    public class DrawableStoryboardAnimation : SkinReloadableDrawable, IFlippable, IVectorScalable
     {
         public StoryboardAnimation Animation { get; }
 
+        private TextureAnimation drawableTextureAnimation;
+
+        [Resolved]
+        private TextureStore storyboardTextureStore { get; set; }
+
+        private readonly List<string> texturePathsRaw = new List<string>();
+        private readonly List<string> texturePaths = new List<string>();
+
         private bool flipH;
 
         public bool FlipH
@@ -108,28 +119,48 @@ namespace osu.Game.Storyboards.Drawables
             Animation = animation;
             Origin = animation.Origin;
             Position = animation.InitialPosition;
-            Loop = animation.LoopType == AnimationLoopType.LoopForever;
 
             LifetimeStart = animation.StartTime;
             LifetimeEnd = animation.EndTime;
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
+        private void load(IBindable<WorkingBeatmap> beatmap)
         {
+            InternalChild = drawableTextureAnimation = new TextureAnimation
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Loop = Animation.LoopType == AnimationLoopType.LoopForever
+            };
+
             for (var frame = 0; frame < Animation.FrameCount; frame++)
             {
                 var framePath = Animation.Path.Replace(".", frame + ".");
+                texturePathsRaw.Add(Path.GetFileNameWithoutExtension(framePath));
 
                 var path = beatmap.Value.BeatmapSetInfo.Files.Find(f => f.Filename.Equals(framePath, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
-                if (path == null)
-                    continue;
-
-                var texture = textureStore.Get(path);
-                AddFrame(texture, Animation.FrameDelay);
+                texturePaths.Add(path);
             }
 
             Animation.ApplyTransforms(this);
         }
+
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+
+            drawableTextureAnimation.ClearFrames();
+
+            for (var frame = 0; frame < Animation.FrameCount; frame++)
+            {
+                var texture = skin?.GetTexture(texturePathsRaw[frame]) ?? storyboardTextureStore?.Get(texturePaths[frame]);
+
+                if (texture == null)
+                    continue;
+
+                drawableTextureAnimation.AddFrame(texture, Animation.FrameDelay);
+            }
+        }
     }
 }

From 6459ce28a34654c94c351e22340ce166c46b2ed8 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 9 Oct 2020 18:32:03 +0200
Subject: [PATCH 05341/10326] Don't calculate performance if difficulty
 attributes aren't locally computable.

---
 osu.Game/Scoring/ScorePerformanceManager.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index 783425052f..c2e36ae798 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -43,6 +43,10 @@ namespace osu.Game.Scoring
         {
             var attributes = await difficultyManager.GetDifficultyAsync(score.Beatmap, score.Ruleset, score.Mods, token);
 
+            // Performance calculation requires the beatmap and ruleset to be locally available. If not, return a default value.
+            if (attributes.Attributes == null)
+                return default;
+
             if (token.IsCancellationRequested)
                 return default;
 

From 20f1eb2b33765d477fdabf04a7f3e287fe2b9170 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 10 Oct 2020 13:11:36 +0900
Subject: [PATCH 05342/10326] Fix windows key blocking applying when window is
 inactive / when watching a replay

Closes #10467.
---
 osu.Desktop/Windows/GameplayWinKeyBlocker.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Desktop/Windows/GameplayWinKeyBlocker.cs b/osu.Desktop/Windows/GameplayWinKeyBlocker.cs
index 86174ceb90..07af009b81 100644
--- a/osu.Desktop/Windows/GameplayWinKeyBlocker.cs
+++ b/osu.Desktop/Windows/GameplayWinKeyBlocker.cs
@@ -5,24 +5,24 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
+using osu.Game;
 using osu.Game.Configuration;
 
 namespace osu.Desktop.Windows
 {
     public class GameplayWinKeyBlocker : Component
     {
-        private Bindable<bool> allowScreenSuspension;
         private Bindable<bool> disableWinKey;
+        private Bindable<bool> localUserPlaying;
 
-        private GameHost host;
+        [Resolved]
+        private GameHost host { get; set; }
 
-        [BackgroundDependencyLoader]
-        private void load(GameHost host, OsuConfigManager config)
+        [BackgroundDependencyLoader(true)]
+        private void load(OsuGame game, OsuConfigManager config)
         {
-            this.host = host;
-
-            allowScreenSuspension = host.AllowScreenSuspension.GetBoundCopy();
-            allowScreenSuspension.BindValueChanged(_ => updateBlocking());
+            localUserPlaying = game.LocalUserPlaying.GetBoundCopy();
+            localUserPlaying.BindValueChanged(_ => updateBlocking());
 
             disableWinKey = config.GetBindable<bool>(OsuSetting.GameplayDisableWinKey);
             disableWinKey.BindValueChanged(_ => updateBlocking(), true);
@@ -30,7 +30,7 @@ namespace osu.Desktop.Windows
 
         private void updateBlocking()
         {
-            bool shouldDisable = disableWinKey.Value && !allowScreenSuspension.Value;
+            bool shouldDisable = disableWinKey.Value && localUserPlaying.Value;
 
             if (shouldDisable)
                 host.InputThread.Scheduler.Add(WindowsKey.Disable);

From 09e350d14d069def409a82a1b56128bdd79fb17d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 10 Oct 2020 13:28:24 +0900
Subject: [PATCH 05343/10326] Remove canBNull specification

---
 osu.Desktop/Windows/GameplayWinKeyBlocker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Desktop/Windows/GameplayWinKeyBlocker.cs b/osu.Desktop/Windows/GameplayWinKeyBlocker.cs
index 07af009b81..efc3f21149 100644
--- a/osu.Desktop/Windows/GameplayWinKeyBlocker.cs
+++ b/osu.Desktop/Windows/GameplayWinKeyBlocker.cs
@@ -18,7 +18,7 @@ namespace osu.Desktop.Windows
         [Resolved]
         private GameHost host { get; set; }
 
-        [BackgroundDependencyLoader(true)]
+        [BackgroundDependencyLoader]
         private void load(OsuGame game, OsuConfigManager config)
         {
             localUserPlaying = game.LocalUserPlaying.GetBoundCopy();

From df9c4bf0a554dd9df255a84546b05aac2b605e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 10 Oct 2020 13:01:52 +0200
Subject: [PATCH 05344/10326] Improve test xmldoc slightly

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 40e6589ac4..b83b97a539 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -55,19 +55,24 @@ namespace osu.Game.Tests.Rulesets.Scoring
         }
 
         /// <summary>
-        /// Test to see that all <see cref="HitResult"/> contribute to score portions in correct amounts.
+        /// Test to see that all <see cref="HitResult"/>s contribute to score portions in correct amounts.
         /// </summary>
-        /// <param name="scoringMode">Scoring mode to test</param>
-        /// <param name="hitResult">HitResult that will be applied to HitObjects</param>
-        /// <param name="maxResult">HitResult used for accuracy calcualtion</param>
-        /// <param name="expectedScore">Expected score after 3/4 hitobjects have been hit rounded to nearest integer</param>
+        /// <param name="scoringMode">Scoring mode to test.</param>
+        /// <param name="hitResult">The <see cref="HitResult"/> that will be applied to selected hit objects.</param>
+        /// <param name="maxResult">The maximum <see cref="HitResult"/> achievable.</param>
+        /// <param name="expectedScore">Expected score after all objects have been judged, rounded to the nearest integer.</param>
         /// <remarks>
-        /// This test intentionally misses the 3rd hitobject to achieve lower than 75% accuracy and 50% max combo
-        /// expectedScore is calcualted using this algorithm for standardised scoring: 1_000_000 * ((75% * score_per_hitobject / max_per_hitobject * 30%) + (50% * 70%))
-        /// "75% * score_per_hitobject / max_per_hitobject" is the accuracy we would get for hitting 3/4 hitobjects that award "score_per_hitobject / max_per_hitobject" accuracy each hit
-        ///
-        /// expectedScore is calculated using this algorithm for classic scoring: score_per_hitobject / max_per_hitobject * 936
-        /// "936" is simplified from "75% * 4 * 300 * (1 + 1/25)"
+        /// This test intentionally misses the 3rd hitobject to achieve lower than 75% accuracy and exactly 50% max combo.
+        /// <para>
+        /// For standardised scoring, <paramref name="expectedScore"/> is calculated using the following formula:
+        /// 1_000_000 * ((3 * <paramref name="hitResult"/> / 4 * <paramref name="maxResult"/>) * 30% + 50% * 70%)
+        /// </para>
+        /// <para>
+        /// For classic scoring, <paramref name="expectedScore"/> is calculated using the following formula:
+        /// <paramref name="hitResult"/> / <paramref name="maxResult"/> * 936
+        /// where 936 is simplified from:
+        /// 75% * 4 * 300 * (1 + 1/25)
+        /// </para>
         /// </remarks>
         [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)]
         [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 387_500)]

From 73c238fae3d395f65f4089c2c68179ea828c4a77 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 10 Oct 2020 21:34:01 +0900
Subject: [PATCH 05345/10326] Add the ability to search for local beatmaps via
 online IDs

Closes #10470.
---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs |  8 ++++++++
 osu.Game/Screens/Select/FilterCriteria.cs           | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 3892e02a8f..83e3c84f39 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -58,6 +58,14 @@ namespace osu.Game.Screens.Select.Carousel
 
                 foreach (var criteriaTerm in criteria.SearchTerms)
                     match &= terms.Any(term => term.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0);
+
+                // if a match wasn't found via text matching of terms, do a second catch-all check matching against online IDs.
+                // this should be done after text matching so we can prioritise matching numbers in metadata.
+                if (!match && criteria.SearchNumber.HasValue)
+                {
+                    match = (Beatmap.OnlineBeatmapID == criteria.SearchNumber.Value) ||
+                            (Beatmap.BeatmapSet?.OnlineBeatmapSetID == criteria.SearchNumber.Value);
+                }
             }
 
             if (match)
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 66f164bca8..f34f8f6505 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -43,6 +43,11 @@ namespace osu.Game.Screens.Select
 
         private string searchText;
 
+        /// <summary>
+        /// <see cref="SearchText"/> as a number (if it can be parsed as one).
+        /// </summary>
+        public int? SearchNumber { get; private set; }
+
         public string SearchText
         {
             get => searchText;
@@ -50,6 +55,11 @@ namespace osu.Game.Screens.Select
             {
                 searchText = value;
                 SearchTerms = searchText.Split(new[] { ',', ' ', '!' }, StringSplitOptions.RemoveEmptyEntries).ToArray();
+
+                SearchNumber = null;
+
+                if (SearchTerms.Length == 1 && int.TryParse(SearchTerms[0], out int parsed))
+                    SearchNumber = parsed;
             }
         }
 

From 7bbdd6ab25917834bf04ac46a57424f53b97efa3 Mon Sep 17 00:00:00 2001
From: unknown <n20gaming2000@gmail.com>
Date: Sat, 10 Oct 2020 21:07:17 +0800
Subject: [PATCH 05346/10326] expose break time bindable

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 74714e7e59..6d910e39ed 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -89,6 +89,8 @@ namespace osu.Game.Screens.Play
 
         public BreakOverlay BreakOverlay;
 
+        public IBindable<bool> IsBreakTime => breakTracker?.IsBreakTime;
+
         private BreakTracker breakTracker;
 
         private SkipOverlay skipOverlay;

From a7c43e17c2a5a72ae358334f49ae46da5fbcb4a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 10 Oct 2020 15:41:48 +0200
Subject: [PATCH 05347/10326] Add test coverage

---
 .../NonVisual/Filtering/FilterMatchingTest.cs   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
index 30686cb947..24a0a662ba 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
@@ -197,5 +197,22 @@ namespace osu.Game.Tests.NonVisual.Filtering
             carouselItem.Filter(criteria);
             Assert.AreEqual(filtered, carouselItem.Filtered.Value);
         }
+
+        [TestCase("202010", true)]
+        [TestCase("20201010", false)]
+        [TestCase("153", true)]
+        [TestCase("1535", false)]
+        public void TestCriteriaMatchingBeatmapIDs(string query, bool filtered)
+        {
+            var beatmap = getExampleBeatmap();
+            beatmap.OnlineBeatmapID = 20201010;
+            beatmap.BeatmapSet = new BeatmapSetInfo { OnlineBeatmapSetID = 1535 };
+
+            var criteria = new FilterCriteria { SearchText = query };
+            var carouselItem = new CarouselBeatmap(beatmap);
+            carouselItem.Filter(criteria);
+
+            Assert.AreEqual(filtered, carouselItem.Filtered.Value);
+        }
     }
 }

From f41879ee7c84509bbab4018e7112e08a9a7bfd1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 10 Oct 2020 17:54:37 +0200
Subject: [PATCH 05348/10326] Show current hit circle placement in timeline

---
 .../Blueprints/HitCircles/HitCirclePlacementBlueprint.cs    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index 3dbbdcc5d0..e14d6647d2 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -21,6 +21,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
             InternalChild = circlePiece = new HitCirclePiece();
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            BeginPlacement();
+        }
+
         protected override void Update()
         {
             base.Update();

From 75b26d0cdecd5335c4009009036e0b2c160bde63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 10 Oct 2020 18:08:19 +0200
Subject: [PATCH 05349/10326] Add failing test cases

---
 .../Beatmaps/BeatmapDifficultyManagerTest.cs  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs b/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
index 0f6d956b3c..7c1ddd757f 100644
--- a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
+++ b/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
@@ -28,5 +28,28 @@ namespace osu.Game.Tests.Beatmaps
 
             Assert.That(key1, Is.EqualTo(key2));
         }
+
+        [TestCase(1.3, DifficultyRating.Easy)]
+        [TestCase(1.993, DifficultyRating.Easy)]
+        [TestCase(1.998, DifficultyRating.Normal)]
+        [TestCase(2.4, DifficultyRating.Normal)]
+        [TestCase(2.693, DifficultyRating.Normal)]
+        [TestCase(2.698, DifficultyRating.Hard)]
+        [TestCase(3.5, DifficultyRating.Hard)]
+        [TestCase(3.993, DifficultyRating.Hard)]
+        [TestCase(3.997, DifficultyRating.Insane)]
+        [TestCase(5.0, DifficultyRating.Insane)]
+        [TestCase(5.292, DifficultyRating.Insane)]
+        [TestCase(5.297, DifficultyRating.Expert)]
+        [TestCase(6.2, DifficultyRating.Expert)]
+        [TestCase(6.493, DifficultyRating.Expert)]
+        [TestCase(6.498, DifficultyRating.ExpertPlus)]
+        [TestCase(8.3, DifficultyRating.ExpertPlus)]
+        public void TestDifficultyRatingMapping(double starRating, DifficultyRating expectedBracket)
+        {
+            var actualBracket = BeatmapDifficultyManager.GetDifficultyRating(starRating);
+
+            Assert.AreEqual(expectedBracket, actualBracket);
+        }
     }
 }

From 8af78656e456b70f2f0366c8c3f4741147104037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 10 Oct 2020 18:15:52 +0200
Subject: [PATCH 05350/10326] Add precision tolerance to difficulty rating
 range checks

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 945a60fb62..8c12ca6f6e 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -14,6 +14,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Lists;
 using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 
@@ -124,13 +125,22 @@ namespace osu.Game.Beatmaps
         /// <returns>The <see cref="DifficultyRating"/> that best describes <paramref name="starRating"/>.</returns>
         public static DifficultyRating GetDifficultyRating(double starRating)
         {
-            if (starRating < 2.0) return DifficultyRating.Easy;
-            if (starRating < 2.7) return DifficultyRating.Normal;
-            if (starRating < 4.0) return DifficultyRating.Hard;
-            if (starRating < 5.3) return DifficultyRating.Insane;
-            if (starRating < 6.5) return DifficultyRating.Expert;
+            if (Precision.AlmostBigger(starRating, 6.5, 0.005))
+                return DifficultyRating.ExpertPlus;
 
-            return DifficultyRating.ExpertPlus;
+            if (Precision.AlmostBigger(starRating, 5.3, 0.005))
+                return DifficultyRating.Expert;
+
+            if (Precision.AlmostBigger(starRating, 4.0, 0.005))
+                return DifficultyRating.Insane;
+
+            if (Precision.AlmostBigger(starRating, 2.7, 0.005))
+                return DifficultyRating.Hard;
+
+            if (Precision.AlmostBigger(starRating, 2.0, 0.005))
+                return DifficultyRating.Normal;
+
+            return DifficultyRating.Easy;
         }
 
         private CancellationTokenSource trackedUpdateCancellationSource;

From de522d53eaf408238b81df3e8eb3dd3603b68549 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 10 Oct 2020 19:16:21 +0200
Subject: [PATCH 05351/10326] Make CalculatePerformanceAsync() nullable.

---
 osu.Game/Scoring/ScorePerformanceManager.cs        | 14 +++++++-------
 .../Expanded/Statistics/PerformanceStatistic.cs    |  6 +++++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index c2e36ae798..21b1b679eb 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Scoring
         /// </summary>
         /// <param name="score">The score to do the calculation on. </param>
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
-        public async Task<double> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default)
+        public async Task<double?> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default)
         {
             if (tryGetExisting(score, out var perf, out var lookupKey))
                 return perf;
@@ -39,21 +39,21 @@ namespace osu.Game.Scoring
             return performanceCache.TryGetValue(lookupKey, out performance);
         }
 
-        private async Task<double> computePerformanceAsync(ScoreInfo score, PerformanceCacheLookup lookupKey, CancellationToken token = default)
+        private async Task<double?> computePerformanceAsync(ScoreInfo score, PerformanceCacheLookup lookupKey, CancellationToken token = default)
         {
             var attributes = await difficultyManager.GetDifficultyAsync(score.Beatmap, score.Ruleset, score.Mods, token);
 
             // Performance calculation requires the beatmap and ruleset to be locally available. If not, return a default value.
             if (attributes.Attributes == null)
-                return default;
+                return null;
 
-            if (token.IsCancellationRequested)
-                return default;
+            token.ThrowIfCancellationRequested();
 
             var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(attributes.Attributes, score);
-            var total = calculator?.Calculate() ?? default;
+            var total = calculator?.Calculate();
 
-            performanceCache[lookupKey] = total;
+            if (total.HasValue)
+                performanceCache[lookupKey] = total.Value;
 
             return total;
         }
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index 7e342a33f1..068745ca17 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -32,7 +32,11 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             else
             {
                 performanceManager.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
-                                  .ContinueWith(t => Schedule(() => performance.Value = (int)t.Result), cancellationTokenSource.Token);
+                                  .ContinueWith(t => Schedule(() =>
+                                  {
+                                      if (t.Result.HasValue)
+                                          performance.Value = (int)t.Result.Value;
+                                  }), cancellationTokenSource.Token);
             }
         }
 

From a0e6226b7aef1decee427628fa0e2f54db2ad9ad Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 10 Oct 2020 19:19:24 +0200
Subject: [PATCH 05352/10326] Rename LocalId -> LocalScoreID

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

diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index 21b1b679eb..d8daf7189a 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -61,12 +61,12 @@ namespace osu.Game.Scoring
         public readonly struct PerformanceCacheLookup
         {
             public readonly string ScoreHash;
-            public readonly int LocalId;
+            public readonly int LocalScoreID;
 
             public PerformanceCacheLookup(ScoreInfo info)
             {
                 ScoreHash = info.Hash;
-                LocalId = info.ID;
+                LocalScoreID = info.ID;
             }
 
             public override int GetHashCode()
@@ -74,7 +74,7 @@ namespace osu.Game.Scoring
                 var hash = new HashCode();
 
                 hash.Add(ScoreHash);
-                hash.Add(LocalId);
+                hash.Add(LocalScoreID);
 
                 return hash.ToHashCode();
             }

From e845cc92b8d656373969dda9b767994fae0846ed Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 10 Oct 2020 19:58:06 +0200
Subject: [PATCH 05353/10326] Round pp values to nearest integer.

---
 .../Ranking/Expanded/Statistics/PerformanceStatistic.cs      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index 068745ca17..3976682241 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.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.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -27,7 +28,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         {
             if (score.PP.HasValue)
             {
-                performance.Value = (int)score.PP.Value;
+                performance.Value = (int)Math.Round(score.PP.Value, MidpointRounding.AwayFromZero);
             }
             else
             {
@@ -35,7 +36,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
                                   .ContinueWith(t => Schedule(() =>
                                   {
                                       if (t.Result.HasValue)
-                                          performance.Value = (int)t.Result.Value;
+                                          performance.Value = (int)Math.Round(t.Result.Value, MidpointRounding.AwayFromZero);
                                   }), cancellationTokenSource.Token);
             }
         }

From 6a52c98a428b5c3c032c5908d863ce4bcfc9ca89 Mon Sep 17 00:00:00 2001
From: unknown <n20gaming2000@gmail.com>
Date: Sun, 11 Oct 2020 06:15:20 +0800
Subject: [PATCH 05354/10326] make IsBreakTime its own bindable and bind it to
 BreakTracker on load

---
 osu.Game/Screens/Play/Player.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 6d910e39ed..4f13843503 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -89,7 +89,10 @@ namespace osu.Game.Screens.Play
 
         public BreakOverlay BreakOverlay;
 
-        public IBindable<bool> IsBreakTime => breakTracker?.IsBreakTime;
+        /// <summary>
+        /// Whether the gameplay is currently in a break.
+        /// </summary>
+        public readonly BindableBool IsBreakTime = new BindableBool();
 
         private BreakTracker breakTracker;
 
@@ -259,6 +262,7 @@ namespace osu.Game.Screens.Play
                 mod.ApplyToHealthProcessor(HealthProcessor);
 
             breakTracker.IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
+            IsBreakTime.BindTo((BindableBool)breakTracker.IsBreakTime);
         }
 
         private Drawable createUnderlayComponents() =>

From 8faa86b048e982eaa75e70abc49308a53000306e Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 10 Oct 2020 18:30:13 -0700
Subject: [PATCH 05355/10326] Add ability to toggle extended statistics using
 space or enter

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index c48cd238c0..026ce01857 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -10,9 +10,11 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
 using osu.Game.Online.API;
 using osu.Game.Scoring;
 using osu.Game.Screens.Backgrounds;
@@ -22,7 +24,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking
 {
-    public abstract class ResultsScreen : OsuScreen
+    public abstract class ResultsScreen : OsuScreen, IKeyBindingHandler<GlobalAction>
     {
         protected const float BACKGROUND_BLUR = 20;
         private static readonly float screen_height = 768 - TwoLayerButton.SIZE_EXTENDED.Y;
@@ -314,6 +316,22 @@ namespace osu.Game.Screens.Ranking
             }
         }
 
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.Select:
+                    statisticsPanel.ToggleVisibility();
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
+
         private class VerticalScrollContainer : OsuScrollContainer
         {
             protected override Container<Drawable> Content => content;

From 5fcdee6fd8e2fe9631b0564878aa2b63179dc6c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 11 Oct 2020 21:46:55 +0900
Subject: [PATCH 05356/10326] Remove cast and expose as IBindable

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4f13843503..4dfa609a2e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Whether the gameplay is currently in a break.
         /// </summary>
-        public readonly BindableBool IsBreakTime = new BindableBool();
+        public readonly IBindable<bool> IsBreakTime = new BindableBool();
 
         private BreakTracker breakTracker;
 
@@ -261,8 +261,8 @@ namespace osu.Game.Screens.Play
             foreach (var mod in Mods.Value.OfType<IApplicableToHealthProcessor>())
                 mod.ApplyToHealthProcessor(HealthProcessor);
 
+            IsBreakTime.BindTo(breakTracker.IsBreakTime);
             breakTracker.IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
-            IsBreakTime.BindTo((BindableBool)breakTracker.IsBreakTime);
         }
 
         private Drawable createUnderlayComponents() =>

From de6fe34361424c9ea1fa15697b90667e0d95b1e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 11 Oct 2020 21:51:48 +0900
Subject: [PATCH 05357/10326] Bind to local bindable and combine dual bindings

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4dfa609a2e..a2a53b4b75 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -231,7 +231,6 @@ namespace osu.Game.Screens.Play
 
             DrawableRuleset.IsPaused.BindValueChanged(_ => updateGameplayState());
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateGameplayState());
-            breakTracker.IsBreakTime.BindValueChanged(_ => updateGameplayState());
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
@@ -262,7 +261,7 @@ namespace osu.Game.Screens.Play
                 mod.ApplyToHealthProcessor(HealthProcessor);
 
             IsBreakTime.BindTo(breakTracker.IsBreakTime);
-            breakTracker.IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
+            IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
         }
 
         private Drawable createUnderlayComponents() =>
@@ -360,6 +359,7 @@ namespace osu.Game.Screens.Play
 
         private void onBreakTimeChanged(ValueChangedEvent<bool> isBreakTime)
         {
+            updateGameplayState();
             updatePauseOnFocusLostState();
             HUDOverlay.KeyCounter.IsCounting = !isBreakTime.NewValue;
         }

From e5548a12161afb7bf77c67f3cb68bcd662b61998 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 12 Oct 2020 00:16:18 +0200
Subject: [PATCH 05358/10326] Move ModSettingsContainer class inside
 ModSelectOverlay

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 4eb4fc6501..3b158ee98d 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -284,7 +284,7 @@ namespace osu.Game.Overlays.Mods
                         },
                     },
                 },
-                ModSettingsContainer = new Container
+                ModSettingsContainer = new CModSettingsContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.BottomRight,
@@ -495,5 +495,19 @@ namespace osu.Game.Overlays.Mods
         }
 
         #endregion
+
+        protected class CModSettingsContainer : Container
+        {
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                return true;
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                return true;
+            }
+        }
+
     }
 }

From ac4290dfb65c19374e66e6c47c7d132c4440dd03 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Oct 2020 15:27:33 +0900
Subject: [PATCH 05359/10326] Add comment about stable calculation

---
 .../Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 415201951b..30d33de06e 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -57,8 +57,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 beatLength = timingPoint.BeatLength / difficultyPoint.SpeedMultiplier;
 
             SpanCount = repeatsData?.SpanCount() ?? 1;
-
             StartTime = (int)Math.Round(hitObject.StartTime);
+
+            // This matches stable's calculation.
             EndTime = (int)Math.Floor(StartTime + distanceData.Distance * beatLength * SpanCount * 0.01 / beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier);
 
             SegmentDuration = (EndTime - StartTime) / SpanCount;

From 379971578dbc7cdc80c352ae35a46d0025602784 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Oct 2020 15:28:16 +0900
Subject: [PATCH 05360/10326] Remove culling notice from HasEffect

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

diff --git a/osu.Game/Beatmaps/Timing/BreakPeriod.cs b/osu.Game/Beatmaps/Timing/BreakPeriod.cs
index bb8ae4a66a..4c90b16745 100644
--- a/osu.Game/Beatmaps/Timing/BreakPeriod.cs
+++ b/osu.Game/Beatmaps/Timing/BreakPeriod.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Beatmaps.Timing
         public double Duration => EndTime - StartTime;
 
         /// <summary>
-        /// Whether the break has any effect. Breaks that are too short are culled before they are added to the beatmap.
+        /// Whether the break has any effect.
         /// </summary>
         public bool HasEffect => Duration >= MIN_BREAK_DURATION;
 

From ccf7e2c49a0818c51c669fc620dcfa13edbe083a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Oct 2020 16:31:42 +0900
Subject: [PATCH 05361/10326] Fallback to default ruleset star rating if
 conversion fails

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index 8c12ca6f6e..c1f4c07833 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -13,10 +13,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Lists;
+using osu.Framework.Logging;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Beatmaps
 {
@@ -238,6 +240,24 @@ namespace osu.Game.Beatmaps
 
                 return difficultyCache[key] = new StarDifficulty(attributes.StarRating, attributes.MaxCombo);
             }
+            catch (BeatmapInvalidForRulesetException e)
+            {
+                // Conversion has failed for the given ruleset, so return the difficulty in the beatmap's default ruleset.
+
+                // Ensure the beatmap's default ruleset isn't the one already being converted to.
+                // This shouldn't happen as it means something went seriously wrong, but if it does an endless loop should be avoided.
+                if (rulesetInfo.Equals(beatmapInfo.Ruleset))
+                {
+                    Logger.Error(e, $"Failed to convert {beatmapInfo.OnlineBeatmapID} to the beatmap's default ruleset ({beatmapInfo.Ruleset}).");
+                    return difficultyCache[key] = new StarDifficulty();
+                }
+
+                // Check the cache first because this is now a different ruleset than the one previously guarded against.
+                if (tryGetExisting(beatmapInfo, beatmapInfo.Ruleset, Array.Empty<Mod>(), out var existingDefault, out var existingDefaultKey))
+                    return existingDefault;
+
+                return computeDifficulty(existingDefaultKey, beatmapInfo, beatmapInfo.Ruleset);
+            }
             catch
             {
                 return difficultyCache[key] = new StarDifficulty();

From e70d2614747fafb47b6d0393117c890d0de176e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Oct 2020 18:03:41 +0900
Subject: [PATCH 05362/10326] Add failing test

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 39 +++++++++++++++++++
 .../Resources/multi-segment-slider.osu        |  8 ++++
 2 files changed, 47 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/multi-segment-slider.osu

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index dab923d75b..74055ca3ce 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -651,5 +651,44 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.IsInstanceOf<LegacyDifficultyCalculatorBeatmapDecoder>(decoder);
             }
         }
+
+        [Test]
+        public void TestMultiSegmentSliders()
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+
+            using (var resStream = TestResources.OpenResource("multi-segment-slider.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var decoded = decoder.Decode(stream);
+
+                // Multi-segment
+                var first = ((IHasPath)decoded.HitObjects[0]).Path;
+
+                Assert.That(first.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(first.ControlPoints[0].Type.Value, Is.EqualTo(PathType.PerfectCurve));
+                Assert.That(first.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(161, -244)));
+                Assert.That(first.ControlPoints[1].Type.Value, Is.EqualTo(null));
+
+                Assert.That(first.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(376, -3)));
+                Assert.That(first.ControlPoints[2].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(first.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(68, 15)));
+                Assert.That(first.ControlPoints[3].Type.Value, Is.EqualTo(null));
+                Assert.That(first.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(259, -132)));
+                Assert.That(first.ControlPoints[4].Type.Value, Is.EqualTo(null));
+                Assert.That(first.ControlPoints[5].Position.Value, Is.EqualTo(new Vector2(92, -107)));
+                Assert.That(first.ControlPoints[5].Type.Value, Is.EqualTo(null));
+
+                // Single-segment
+                var second = ((IHasPath)decoded.HitObjects[1]).Path;
+
+                Assert.That(second.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(second.ControlPoints[0].Type.Value, Is.EqualTo(PathType.PerfectCurve));
+                Assert.That(second.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(161, -244)));
+                Assert.That(second.ControlPoints[1].Type.Value, Is.EqualTo(null));
+                Assert.That(second.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(376, -3)));
+                Assert.That(second.ControlPoints[2].Type.Value, Is.EqualTo(null));
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Resources/multi-segment-slider.osu b/osu.Game.Tests/Resources/multi-segment-slider.osu
new file mode 100644
index 0000000000..03cddba5e5
--- /dev/null
+++ b/osu.Game.Tests/Resources/multi-segment-slider.osu
@@ -0,0 +1,8 @@
+osu file format v128
+
+[HitObjects]
+// Multi-segment
+63,301,1000,6,0,P|224:57|B|439:298|131:316|322:169|155:194,1,1040,0|0,0:0|0:0,0:0:0:0:
+
+// Single-segment
+63,301,2000,6,0,P|224:57|439:298,1,1040,0|0,0:0|0:0,0:0:0:0:
\ No newline at end of file

From 48c0ae40effb05113829dc5c6dffc8ac985ada28 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Oct 2020 18:04:28 +0900
Subject: [PATCH 05363/10326] Fix multi-segment sliders not parsing correctly

---
 .../Objects/Legacy/ConvertHitObjectParser.cs  | 157 ++++++++++++------
 1 file changed, 102 insertions(+), 55 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index f6adeced96..c5ea26bc20 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -70,53 +70,33 @@ namespace osu.Game.Rulesets.Objects.Legacy
             }
             else if (type.HasFlag(LegacyHitObjectType.Slider))
             {
-                PathType pathType = PathType.Catmull;
                 double? length = null;
 
                 string[] pointSplit = split[5].Split('|');
 
-                int pointCount = 1;
+                var controlPoints = new List<Memory<PathControlPoint>>();
+                int startIndex = 0;
+                int endIndex = 0;
+                bool first = true;
 
-                foreach (var t in pointSplit)
+                while (++endIndex < pointSplit.Length)
                 {
-                    if (t.Length > 1)
-                        pointCount++;
-                }
-
-                var points = new Vector2[pointCount];
-
-                int pointIndex = 1;
-
-                foreach (string t in pointSplit)
-                {
-                    if (t.Length == 1)
-                    {
-                        switch (t)
-                        {
-                            case @"C":
-                                pathType = PathType.Catmull;
-                                break;
-
-                            case @"B":
-                                pathType = PathType.Bezier;
-                                break;
-
-                            case @"L":
-                                pathType = PathType.Linear;
-                                break;
-
-                            case @"P":
-                                pathType = PathType.PerfectCurve;
-                                break;
-                        }
-
+                    // Keep incrementing endIndex while it's not the start of a new segment (indicated by having a type descriptor of length 1).
+                    if (pointSplit[endIndex].Length > 1)
                         continue;
-                    }
 
-                    string[] temp = t.Split(':');
-                    points[pointIndex++] = new Vector2((int)Parsing.ParseDouble(temp[0], Parsing.MAX_COORDINATE_VALUE), (int)Parsing.ParseDouble(temp[1], Parsing.MAX_COORDINATE_VALUE)) - pos;
+                    // Multi-segmented sliders DON'T contain the end point as part of the current segment as it's assumed to be the start of the next segment.
+                    // The start of the next segment is the index after the type descriptor.
+                    string endPoint = endIndex < pointSplit.Length - 1 ? pointSplit[endIndex + 1] : null;
+
+                    controlPoints.Add(convertControlPoints(pointSplit.AsSpan().Slice(startIndex, endIndex - startIndex), endPoint, first, pos));
+                    startIndex = endIndex;
+                    first = false;
                 }
 
+                if (endIndex > startIndex)
+                    controlPoints.Add(convertControlPoints(pointSplit.AsSpan().Slice(startIndex, endIndex - startIndex), null, first, pos));
+
                 int repeatCount = Parsing.ParseInt(split[6]);
 
                 if (repeatCount > 9000)
@@ -183,7 +163,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 for (int i = 0; i < nodes; i++)
                     nodeSamples.Add(convertSoundType(nodeSoundTypes[i], nodeBankInfos[i]));
 
-                result = CreateSlider(pos, combo, comboOffset, convertControlPoints(points, pathType), length, repeatCount, nodeSamples);
+                result = CreateSlider(pos, combo, comboOffset, mergeControlPoints(controlPoints), length, repeatCount, nodeSamples);
             }
             else if (type.HasFlag(LegacyHitObjectType.Spinner))
             {
@@ -252,8 +232,56 @@ namespace osu.Game.Rulesets.Objects.Legacy
             bankInfo.Filename = split.Length > 4 ? split[4] : null;
         }
 
-        private PathControlPoint[] convertControlPoints(Vector2[] vertices, PathType type)
+        private PathType convertPathType(string input)
         {
+            switch (input[0])
+            {
+                default:
+                case 'C':
+                    return PathType.Catmull;
+
+                case 'B':
+                    return PathType.Bezier;
+
+                case 'L':
+                    return PathType.Linear;
+
+                case 'P':
+                    return PathType.PerfectCurve;
+            }
+        }
+
+        /// <summary>
+        /// Converts a given point list into a set of <see cref="PathControlPoint"/>s.
+        /// </summary>
+        /// <param name="pointSpan">The point list.</param>
+        /// <param name="endPoint">Any extra endpoint to consider as part of the points. This will NOT be returned.</param>
+        /// <param name="first">Whether this is the first point list in the set. If <c>true</c> the returned set will contain a zero point.</param>
+        /// <param name="offset">The positional offset to apply to the control points.</param>
+        /// <returns>The set of points contained by <paramref name="pointSpan"/>, prepended by an extra zero point if <paramref name="first"/> is <c>true</c>.</returns>
+        private Memory<PathControlPoint> convertControlPoints(ReadOnlySpan<string> pointSpan, string endPoint, bool first, Vector2 offset)
+        {
+            PathType type = convertPathType(pointSpan[0]);
+
+            int readOffset = first ? 1 : 0; // First control point is zero for the first segment.
+            int readablePoints = pointSpan.Length - 1; // Total points readable from the base point span.
+            int endPointLength = endPoint != null ? 1 : 0; // Extra length if an endpoint is given that lies outside the base point span.
+
+            var vertices = new PathControlPoint[readOffset + readablePoints + endPointLength];
+
+            // Fill any non-read points.
+            for (int i = 0; i < readOffset; i++)
+                vertices[i] = new PathControlPoint();
+
+            // Parse into control points.
+            for (int i = 1; i < pointSpan.Length; i++)
+                readPoint(pointSpan[i], offset, out vertices[readOffset + i - 1]);
+
+            // If an endpoint is given, add it now.
+            if (endPoint != null)
+                readPoint(endPoint, offset, out vertices[^1]);
+
+            // Edge-case rules.
             if (type == PathType.PerfectCurve)
             {
                 if (vertices.Length != 3)
@@ -265,29 +293,48 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 }
             }
 
-            var points = new List<PathControlPoint>(vertices.Length)
-            {
-                new PathControlPoint
-                {
-                    Position = { Value = vertices[0] },
-                    Type = { Value = type }
-                }
-            };
+            // Set a definite type for the first control point.
+            vertices[0].Type.Value = type;
 
+            // A path can have multiple segments of the same type if there are two sequential control points with the same position.
             for (int i = 1; i < vertices.Length; i++)
             {
                 if (vertices[i] == vertices[i - 1])
-                {
-                    points[^1].Type.Value = type;
-                    continue;
-                }
-
-                points.Add(new PathControlPoint { Position = { Value = vertices[i] } });
+                    vertices[i].Type.Value = type;
             }
 
-            return points.ToArray();
+            return vertices.AsMemory().Slice(0, vertices.Length - endPointLength);
 
-            static bool isLinear(Vector2[] p) => Precision.AlmostEquals(0, (p[1].Y - p[0].Y) * (p[2].X - p[0].X) - (p[1].X - p[0].X) * (p[2].Y - p[0].Y));
+            static void readPoint(string value, Vector2 startPos, out PathControlPoint point)
+            {
+                string[] vertexSplit = value.Split(':');
+
+                Vector2 pos = new Vector2((int)Parsing.ParseDouble(vertexSplit[0], Parsing.MAX_COORDINATE_VALUE), (int)Parsing.ParseDouble(vertexSplit[1], Parsing.MAX_COORDINATE_VALUE)) - startPos;
+                point = new PathControlPoint { Position = { Value = pos } };
+            }
+
+            static bool isLinear(PathControlPoint[] p) => Precision.AlmostEquals(0, (p[1].Position.Value.Y - p[0].Position.Value.Y) * (p[2].Position.Value.X - p[0].Position.Value.X)
+                                                                                    - (p[1].Position.Value.X - p[0].Position.Value.X) * (p[2].Position.Value.Y - p[0].Position.Value.Y));
+        }
+
+        private PathControlPoint[] mergeControlPoints(List<Memory<PathControlPoint>> controlPointList)
+        {
+            int totalCount = 0;
+
+            foreach (var arr in controlPointList)
+                totalCount += arr.Length;
+
+            var mergedArray = new PathControlPoint[totalCount];
+            var mergedArrayMemory = mergedArray.AsMemory();
+            int copyIndex = 0;
+
+            foreach (var arr in controlPointList)
+            {
+                arr.CopyTo(mergedArrayMemory.Slice(copyIndex));
+                copyIndex += arr.Length;
+            }
+
+            return mergedArray;
         }
 
         /// <summary>

From 36a8f61d264372e26b9da448c441519fd4a3be31 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Oct 2020 18:58:07 +0900
Subject: [PATCH 05364/10326] Add failing test for implicit segments

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 20 +++++++++++++++++++
 .../Resources/multi-segment-slider.osu        |  5 ++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 74055ca3ce..58fd6b0448 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -688,6 +688,26 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(second.ControlPoints[1].Type.Value, Is.EqualTo(null));
                 Assert.That(second.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(376, -3)));
                 Assert.That(second.ControlPoints[2].Type.Value, Is.EqualTo(null));
+
+                // Implicit multi-segment
+                var third = ((IHasPath)decoded.HitObjects[2]).Path;
+
+                Assert.That(third.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(third.ControlPoints[0].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(third.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(0, 192)));
+                Assert.That(third.ControlPoints[1].Type.Value, Is.EqualTo(null));
+                Assert.That(third.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(224, 192)));
+                Assert.That(third.ControlPoints[2].Type.Value, Is.EqualTo(null));
+
+                Assert.That(third.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(224, 0)));
+                Assert.That(third.ControlPoints[3].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(third.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(224, -192)));
+                Assert.That(third.ControlPoints[4].Type.Value, Is.EqualTo(null));
+                Assert.That(third.ControlPoints[5].Position.Value, Is.EqualTo(new Vector2(480, -192)));
+                Assert.That(third.ControlPoints[5].Type.Value, Is.EqualTo(null));
+                Assert.That(third.ControlPoints[6].Position.Value, Is.EqualTo(new Vector2(480, 0)));
+                Assert.That(third.ControlPoints[6].Type.Value, Is.EqualTo(null));
+
             }
         }
     }
diff --git a/osu.Game.Tests/Resources/multi-segment-slider.osu b/osu.Game.Tests/Resources/multi-segment-slider.osu
index 03cddba5e5..6eabe640e4 100644
--- a/osu.Game.Tests/Resources/multi-segment-slider.osu
+++ b/osu.Game.Tests/Resources/multi-segment-slider.osu
@@ -5,4 +5,7 @@ osu file format v128
 63,301,1000,6,0,P|224:57|B|439:298|131:316|322:169|155:194,1,1040,0|0,0:0|0:0,0:0:0:0:
 
 // Single-segment
-63,301,2000,6,0,P|224:57|439:298,1,1040,0|0,0:0|0:0,0:0:0:0:
\ No newline at end of file
+63,301,2000,6,0,P|224:57|439:298,1,1040,0|0,0:0|0:0,0:0:0:0:
+
+// Implicit multi-segment
+32,192,3000,6,0,B|32:384|256:384|256:192|256:192|256:0|512:0|512:192,1,800

From eb4ef157ca3d1d9059bcc7f8a41690a3fa32773b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Oct 2020 19:16:37 +0900
Subject: [PATCH 05365/10326] Fix implicit segments not being constructed
 correctly

---
 .../Objects/Legacy/ConvertHitObjectParser.cs  | 121 ++++++++++++------
 1 file changed, 80 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index c5ea26bc20..22447180ec 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -72,31 +72,6 @@ namespace osu.Game.Rulesets.Objects.Legacy
             {
                 double? length = null;
 
-                string[] pointSplit = split[5].Split('|');
-
-                var controlPoints = new List<Memory<PathControlPoint>>();
-                int startIndex = 0;
-                int endIndex = 0;
-                bool first = true;
-
-                while (++endIndex < pointSplit.Length)
-                {
-                    // Keep incrementing endIndex while it's not the start of a new segment (indicated by having a type descriptor of length 1).
-                    if (pointSplit[endIndex].Length > 1)
-                        continue;
-
-                    // Multi-segmented sliders DON'T contain the end point as part of the current segment as it's assumed to be the start of the next segment.
-                    // The start of the next segment is the index after the type descriptor.
-                    string endPoint = endIndex < pointSplit.Length - 1 ? pointSplit[endIndex + 1] : null;
-
-                    controlPoints.Add(convertControlPoints(pointSplit.AsSpan().Slice(startIndex, endIndex - startIndex), endPoint, first, pos));
-                    startIndex = endIndex;
-                    first = false;
-                }
-
-                if (endIndex > startIndex)
-                    controlPoints.Add(convertControlPoints(pointSplit.AsSpan().Slice(startIndex, endIndex - startIndex), null, first, pos));
-
                 int repeatCount = Parsing.ParseInt(split[6]);
 
                 if (repeatCount > 9000)
@@ -163,7 +138,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 for (int i = 0; i < nodes; i++)
                     nodeSamples.Add(convertSoundType(nodeSoundTypes[i], nodeBankInfos[i]));
 
-                result = CreateSlider(pos, combo, comboOffset, mergeControlPoints(controlPoints), length, repeatCount, nodeSamples);
+                result = CreateSlider(pos, combo, comboOffset, convertPathString(split[5], pos), length, repeatCount, nodeSamples);
             }
             else if (type.HasFlag(LegacyHitObjectType.Spinner))
             {
@@ -252,19 +227,71 @@ namespace osu.Game.Rulesets.Objects.Legacy
         }
 
         /// <summary>
-        /// Converts a given point list into a set of <see cref="PathControlPoint"/>s.
+        /// Converts a given point string into a set of path control points.
         /// </summary>
-        /// <param name="pointSpan">The point list.</param>
-        /// <param name="endPoint">Any extra endpoint to consider as part of the points. This will NOT be returned.</param>
-        /// <param name="first">Whether this is the first point list in the set. If <c>true</c> the returned set will contain a zero point.</param>
+        /// <remarks>
+        /// A point string takes the form: X|1:1|2:2|2:2|3:3|Y|1:1|2:2.
+        /// This has three segments:
+        /// <list type="number">
+        ///     <item>
+        ///         <description>X: { (1,1), (2,2) } (implicit segment)</description>
+        ///     </item>
+        ///     <item>
+        ///         <description>X: { (2,2), (3,3) } (implicit segment)</description>
+        ///     </item>
+        ///     <item>
+        ///         <description>Y: { (3,3), (1,1), (2, 2) } (explicit segment)</description>
+        ///     </item>
+        /// </list>
+        /// </remarks>
+        /// <param name="pointString">The point string.</param>
         /// <param name="offset">The positional offset to apply to the control points.</param>
-        /// <returns>The set of points contained by <paramref name="pointSpan"/>, prepended by an extra zero point if <paramref name="first"/> is <c>true</c>.</returns>
-        private Memory<PathControlPoint> convertControlPoints(ReadOnlySpan<string> pointSpan, string endPoint, bool first, Vector2 offset)
+        /// <returns>All control points in the resultant path.</returns>
+        private PathControlPoint[] convertPathString(string pointString, Vector2 offset)
         {
-            PathType type = convertPathType(pointSpan[0]);
+            // This code takes on the responsibility of handling explicit segments of the path ("X" & "Y" from above). Implicit segments are handled by calls to convertPoints().
+            string[] pointSplit = pointString.Split('|');
+
+            var controlPoints = new List<Memory<PathControlPoint>>();
+            int startIndex = 0;
+            int endIndex = 0;
+            bool first = true;
+
+            while (++endIndex < pointSplit.Length)
+            {
+                // Keep incrementing endIndex while it's not the start of a new segment (indicated by having a type descriptor of length 1).
+                if (pointSplit[endIndex].Length > 1)
+                    continue;
+
+                // Multi-segmented sliders DON'T contain the end point as part of the current segment as it's assumed to be the start of the next segment.
+                // The start of the next segment is the index after the type descriptor.
+                string endPoint = endIndex < pointSplit.Length - 1 ? pointSplit[endIndex + 1] : null;
+
+                controlPoints.AddRange(convertPoints(pointSplit.AsMemory().Slice(startIndex, endIndex - startIndex), endPoint, first, offset));
+                startIndex = endIndex;
+                first = false;
+            }
+
+            if (endIndex > startIndex)
+                controlPoints.AddRange(convertPoints(pointSplit.AsMemory().Slice(startIndex, endIndex - startIndex), null, first, offset));
+
+            return mergePointsLists(controlPoints);
+        }
+
+        /// <summary>
+        /// Converts a given point list into a set of path segments.
+        /// </summary>
+        /// <param name="points">The point list.</param>
+        /// <param name="endPoint">Any extra endpoint to consider as part of the points. This will NOT be returned.</param>
+        /// <param name="first">Whether this is the first segment in the set. If <c>true</c> the first of the returned segments will contain a zero point.</param>
+        /// <param name="offset">The positional offset to apply to the control points.</param>
+        /// <returns>The set of points contained by <paramref name="points"/> as one or more segments of the path, prepended by an extra zero point if <paramref name="first"/> is <c>true</c>.</returns>
+        private IEnumerable<Memory<PathControlPoint>> convertPoints(ReadOnlyMemory<string> points, string endPoint, bool first, Vector2 offset)
+        {
+            PathType type = convertPathType(points.Span[0]);
 
             int readOffset = first ? 1 : 0; // First control point is zero for the first segment.
-            int readablePoints = pointSpan.Length - 1; // Total points readable from the base point span.
+            int readablePoints = points.Length - 1; // Total points readable from the base point span.
             int endPointLength = endPoint != null ? 1 : 0; // Extra length if an endpoint is given that lies outside the base point span.
 
             var vertices = new PathControlPoint[readOffset + readablePoints + endPointLength];
@@ -274,8 +301,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 vertices[i] = new PathControlPoint();
 
             // Parse into control points.
-            for (int i = 1; i < pointSpan.Length; i++)
-                readPoint(pointSpan[i], offset, out vertices[readOffset + i - 1]);
+            for (int i = 1; i < points.Length; i++)
+                readPoint(points.Span[i], offset, out vertices[readOffset + i - 1]);
 
             // If an endpoint is given, add it now.
             if (endPoint != null)
@@ -297,13 +324,25 @@ namespace osu.Game.Rulesets.Objects.Legacy
             vertices[0].Type.Value = type;
 
             // A path can have multiple segments of the same type if there are two sequential control points with the same position.
-            for (int i = 1; i < vertices.Length; i++)
+            // To handle such cases, this code may return multiple path segments with the final control point in each segment having a non-null type.
+            int startIndex = 0;
+            int endIndex = 0;
+
+            while (++endIndex < vertices.Length - endPointLength)
             {
-                if (vertices[i] == vertices[i - 1])
-                    vertices[i].Type.Value = type;
+                if (vertices[endIndex].Position.Value != vertices[endIndex - 1].Position.Value)
+                    continue;
+
+                // Force a type on the last point, and return the current control point set as a segment.
+                vertices[endIndex - 1].Type.Value = type;
+                yield return vertices.AsMemory().Slice(startIndex, endIndex - startIndex);
+
+                // Skip the current control point - as it's the same as the one that's just been returned.
+                startIndex = endIndex + 1;
             }
 
-            return vertices.AsMemory().Slice(0, vertices.Length - endPointLength);
+            if (endIndex > startIndex)
+                yield return vertices.AsMemory().Slice(startIndex, endIndex - startIndex);
 
             static void readPoint(string value, Vector2 startPos, out PathControlPoint point)
             {
@@ -317,7 +356,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                                                                                     - (p[1].Position.Value.X - p[0].Position.Value.X) * (p[2].Position.Value.Y - p[0].Position.Value.Y));
         }
 
-        private PathControlPoint[] mergeControlPoints(List<Memory<PathControlPoint>> controlPointList)
+        private PathControlPoint[] mergePointsLists(List<Memory<PathControlPoint>> controlPointList)
         {
             int totalCount = 0;
 

From 372761a46ff3fdd8693f4646d43542dfe21e4af3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Oct 2020 19:22:34 +0900
Subject: [PATCH 05366/10326] More/better commenting

---
 .../Objects/Legacy/ConvertHitObjectParser.cs         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 22447180ec..7dcbc52cea 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -304,11 +304,11 @@ namespace osu.Game.Rulesets.Objects.Legacy
             for (int i = 1; i < points.Length; i++)
                 readPoint(points.Span[i], offset, out vertices[readOffset + i - 1]);
 
-            // If an endpoint is given, add it now.
+            // If an endpoint is given, add it to the end.
             if (endPoint != null)
                 readPoint(endPoint, offset, out vertices[^1]);
 
-            // Edge-case rules.
+            // Edge-case rules (to match stable).
             if (type == PathType.PerfectCurve)
             {
                 if (vertices.Length != 3)
@@ -320,11 +320,15 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 }
             }
 
-            // Set a definite type for the first control point.
+            // The first control point must have a definite type.
             vertices[0].Type.Value = type;
 
-            // A path can have multiple segments of the same type if there are two sequential control points with the same position.
+            // A path can have multiple implicit segments of the same type if there are two sequential control points with the same position.
             // To handle such cases, this code may return multiple path segments with the final control point in each segment having a non-null type.
+            // For the point string X|1:1|2:2|2:2|3:3, this code returns the segments:
+            // X: { (1,1), (2, 2) }
+            // X: { (3, 3) }
+            // Note: (2, 2) is not returned in the second segments, as it is implicit in the path.
             int startIndex = 0;
             int endIndex = 0;
 

From 58194b4a31169f1cb65b4a6a742078e2040a2d40 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Oct 2020 19:36:35 +0900
Subject: [PATCH 05367/10326] Fix incorrect blank lines

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 58fd6b0448..b6e1af57fd 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -707,7 +707,6 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(third.ControlPoints[5].Type.Value, Is.EqualTo(null));
                 Assert.That(third.ControlPoints[6].Position.Value, Is.EqualTo(new Vector2(480, 0)));
                 Assert.That(third.ControlPoints[6].Type.Value, Is.EqualTo(null));
-
             }
         }
     }

From 8768891b12a34c0473f460dea604ddb3d1747d2d Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 12 Oct 2020 14:41:05 +0200
Subject: [PATCH 05368/10326] Add testing for clicking mods through
 customisation menu

---
 .../UserInterface/TestSceneModSettings.cs     | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index c5ce3751ef..d4c8b850d3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -18,10 +18,11 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.UI;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneModSettings : OsuTestScene
+    public class TestSceneModSettings : OsuManualInputManagerTestScene
     {
         private TestModSelectOverlay modSelect;
 
@@ -29,6 +30,8 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private readonly Mod testCustomisableAutoOpenMod = new TestModCustomisable2();
 
+        private readonly Mod testCustomisableMenuCoveredMod = new TestModCustomisable1();
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -95,6 +98,30 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("copy has original value", () => Precision.AlmostEquals(1.5, copy.SpeedChange.Value));
         }
 
+        [Test]
+        public void TestCustomisationMenuNoClickthrough()
+        {
+
+            createModSelect();
+            openModSelect();
+
+            AddStep("change mod settings menu width to full screen", () => modSelect.SetModSettingsWidth(1.0f));
+            AddStep("select cm2", () => modSelect.SelectMod(testCustomisableAutoOpenMod));
+            AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.Alpha == 1);
+            AddStep("hover over mod behind settings menu", () => InputManager.MoveMouseTo(modSelect.GetModButton(testCustomisableMenuCoveredMod)));
+            AddAssert("Mod is not considered hovered over", () => !modSelect.GetModButton(testCustomisableMenuCoveredMod).IsHovered);
+            AddStep("left click mod", () => InputManager.Click(MouseButton.Left));
+            AddAssert("only cm2 is active", () => SelectedMods.Value.Count == 1);
+            AddStep("right click mod", () => InputManager.Click(MouseButton.Right));
+            AddAssert("only cm2 is active", () => SelectedMods.Value.Count == 1);
+        }
+
+
+
+        private void clickPosition(int x, int y) {
+            //Move cursor to coordinates
+            //Click coordinates
+        }
         private void createModSelect()
         {
             AddStep("create mod select", () =>
@@ -124,6 +151,19 @@ namespace osu.Game.Tests.Visual.UserInterface
             public void SelectMod(Mod mod) =>
                 ModSectionsContainer.Children.Single(s => s.ModType == mod.Type)
                                     .ButtonsContainer.OfType<ModButton>().Single(b => b.Mods.Any(m => m.GetType() == mod.GetType())).SelectNext(1);
+            
+            public ModButton GetModButton(Mod mod)
+            {
+                return ModSectionsContainer.Children.Single(s => s.ModType == mod.Type).
+                                            ButtonsContainer.OfType<ModButton>().Single(b => b.Mods.Any(m => m.GetType() == mod.GetType()));
+            }
+
+            public float SetModSettingsWidth(float NewWidth)
+            {
+                float oldWidth = ModSettingsContainer.Width;
+                ModSettingsContainer.Width = NewWidth;
+                return oldWidth;
+            }
         }
 
         public class TestRulesetInfo : RulesetInfo

From 7df9282727c6997ccccc0df7ee55e930ffb674fe Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 12 Oct 2020 15:58:34 +0200
Subject: [PATCH 05369/10326] CodeAnalysis fixes

---
 .../UserInterface/TestSceneModSettings.cs     | 22 ++++++-------------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  1 -
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index d4c8b850d3..a31e244ca5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -101,7 +101,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestCustomisationMenuNoClickthrough()
         {
-
             createModSelect();
             openModSelect();
 
@@ -116,12 +115,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("only cm2 is active", () => SelectedMods.Value.Count == 1);
         }
 
-
-
-        private void clickPosition(int x, int y) {
-            //Move cursor to coordinates
-            //Click coordinates
-        }
         private void createModSelect()
         {
             AddStep("create mod select", () =>
@@ -148,20 +141,19 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             public bool ButtonsLoaded => ModSectionsContainer.Children.All(c => c.ModIconsLoaded);
 
-            public void SelectMod(Mod mod) =>
-                ModSectionsContainer.Children.Single(s => s.ModType == mod.Type)
-                                    .ButtonsContainer.OfType<ModButton>().Single(b => b.Mods.Any(m => m.GetType() == mod.GetType())).SelectNext(1);
-            
             public ModButton GetModButton(Mod mod)
             {
-                return ModSectionsContainer.Children.Single(s => s.ModType == mod.Type).
-                                            ButtonsContainer.OfType<ModButton>().Single(b => b.Mods.Any(m => m.GetType() == mod.GetType()));
+                return ModSectionsContainer.Children.Single(s => s.ModType == mod.Type)
+                                           .ButtonsContainer.OfType<ModButton>().Single(b => b.Mods.Any(m => m.GetType() == mod.GetType()));
             }
 
-            public float SetModSettingsWidth(float NewWidth)
+            public void SelectMod(Mod mod) =>
+                GetModButton(mod).SelectNext(1);
+
+            public float SetModSettingsWidth(float newWidth)
             {
                 float oldWidth = ModSettingsContainer.Width;
-                ModSettingsContainer.Width = NewWidth;
+                ModSettingsContainer.Width = newWidth;
                 return oldWidth;
             }
         }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 3b158ee98d..37541358b8 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -508,6 +508,5 @@ namespace osu.Game.Overlays.Mods
                 return true;
             }
         }
-
     }
 }

From 3224aa7a695828835a8aa00556614c50ecf53e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 12 Oct 2020 17:31:46 +0200
Subject: [PATCH 05370/10326] Clarify test math even further

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index b83b97a539..30b47d9bd7 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         /// This test intentionally misses the 3rd hitobject to achieve lower than 75% accuracy and exactly 50% max combo.
         /// <para>
         /// For standardised scoring, <paramref name="expectedScore"/> is calculated using the following formula:
-        /// 1_000_000 * ((3 * <paramref name="hitResult"/> / 4 * <paramref name="maxResult"/>) * 30% + 50% * 70%)
+        /// 1_000_000 * (((3 * <paramref name="hitResult"/>) / (4 * <paramref name="maxResult"/>)) * 30% + 50% * 70%)
         /// </para>
         /// <para>
         /// For classic scoring, <paramref name="expectedScore"/> is calculated using the following formula:
@@ -74,30 +74,30 @@ namespace osu.Game.Tests.Rulesets.Scoring
         /// 75% * 4 * 300 * (1 + 1/25)
         /// </para>
         /// </remarks>
-        [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)]
-        [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 387_500)]
-        [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 425_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 478_571)]
-        [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 575_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 575_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 700_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 925_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
-        [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 700_030)]
-        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 700_150)]
-        [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 156)]
-        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 312)]
-        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 535)]
-        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 936)]
-        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 936)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 225)]
-        [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 30)]
-        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 150)]
+        [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)] // (3 * 0) / (4 * 300) * 300_000 + (0 / 4) * 700_000
+        [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 387_500)] // (3 * 50) / (4 * 300) * 300_000 + (2 / 4) * 700_000
+        [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 425_000)] // (3 * 100) / (4 * 300) * 300_000 + (2 / 4) * 700_000
+        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 478_571)] // (3 * 200) / (4 * 350) * 300_000 + (2 / 4) * 700_000
+        [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 575_000)] // (3 * 300) / (4 * 300) * 300_000 + (2 / 4) * 700_000
+        [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 575_000)] // (3 * 350) / (4 * 350) * 300_000 + (2 / 4) * 700_000
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 700_000)] // (3 * 0) / (4 * 10) * 300_000 + 700_000 (max combo 0)
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 925_000)] // (3 * 10) / (4 * 10) * 300_000 + 700_000 (max combo 0)
+        [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (3 * 0) / (4 * 30) * 300_000 + (0 / 4) * 700_000
+        [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)] // (3 * 30) / (4 * 30) * 300_000 + (0 / 4) * 700_000
+        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 700_030)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 10 (bonus points)
+        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 700_150)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 50 (bonus points)
+        [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 156)] // (((3 * 50) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 312)] // (((3 * 100) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 535)] // (((3 * 200) / (4 * 350)) * 4 * 300) * (1 + 1 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 936)] // (((3 * 300) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 936)] // (((3 * 350) / (4 * 350)) * 4 * 300) * (1 + 1 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)] // (0 * 1 * 300) * (1 + 0 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 225)] // (((3 * 10) / (4 * 10)) * 1 * 300) * (1 + 0 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)] // (((3 * 50) / (4 * 50)) * 4 * 300) * (1 + 1 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 30)] // (0 * 1 * 300) * (1 + 0 / 25) + 3 * 10 (bonus points)
+        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 150)] // (0 * 1 * 300) * (1 + 0 / 25) * 3 * 50 (bonus points)
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
         {
             var minResult = new TestJudgement(hitResult).MinResult;
@@ -121,10 +121,10 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value, 0.5));
         }
 
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, 978_571)]
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, 914_286)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, 279)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, 214)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, 978_571)] // (3 * 10 + 100) / (4 * 10 + 100) * 300_000 + (1 / 1) * 700_000
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, 914_286)] // (3 * 0 + 100) / (4 * 10 + 100) * 300_000 + (1 / 1) * 700_000
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, 279)] // (((3 * 10 + 100) / (4 * 10 + 100)) * 1 * 300) * (1 + 0 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, 214)] // (((3 * 0 + 100) / (4 * 10 + 100)) * 1 * 300) * (1 + 0 / 25)
         public void TestSmallTicksAccuracy(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
         {
             IEnumerable<HitObject> hitObjects = Enumerable

From 82a28d4655277a6a061b5d09ce0b33afc1dd4317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 12 Oct 2020 17:34:20 +0200
Subject: [PATCH 05371/10326] Fix some inaccuracies

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

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 30b47d9bd7..0ca5101292 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -62,10 +62,10 @@ namespace osu.Game.Tests.Rulesets.Scoring
         /// <param name="maxResult">The maximum <see cref="HitResult"/> achievable.</param>
         /// <param name="expectedScore">Expected score after all objects have been judged, rounded to the nearest integer.</param>
         /// <remarks>
-        /// This test intentionally misses the 3rd hitobject to achieve lower than 75% accuracy and exactly 50% max combo.
+        /// This test intentionally misses the 3rd hitobject to achieve lower than 75% accuracy and 50% max combo.
         /// <para>
         /// For standardised scoring, <paramref name="expectedScore"/> is calculated using the following formula:
-        /// 1_000_000 * (((3 * <paramref name="hitResult"/>) / (4 * <paramref name="maxResult"/>)) * 30% + 50% * 70%)
+        /// 1_000_000 * (((3 * <paramref name="hitResult"/>) / (4 * <paramref name="maxResult"/>)) * 30% + (bestCombo / maxCombo) * 70%)
         /// </para>
         /// <para>
         /// For classic scoring, <paramref name="expectedScore"/> is calculated using the following formula:

From 25d9b1ecd08ba1b467c18b3b2ce3c4f762230697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 12 Oct 2020 17:36:07 +0200
Subject: [PATCH 05372/10326] Clarify purpose and construction of extra test

---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 0ca5101292..9f16312121 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -121,6 +121,12 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value, 0.5));
         }
 
+        /// <remarks>
+        /// This test uses a beatmap with four small ticks and one object with the <see cref="Judgement.MaxResult"/> of <see cref="HitResult.Ok"/>.
+        /// Its goal is to ensure that with the <see cref="ScoringMode"/> of <see cref="ScoringMode.Standardised"/>,
+        /// small ticks contribute to the accuracy portion, but not the combo portion.
+        /// In contrast, <see cref="ScoringMode.Classic"/> does not have separate combo and accuracy portion (they are multiplied by each other).
+        /// </remarks>
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, 978_571)] // (3 * 10 + 100) / (4 * 10 + 100) * 300_000 + (1 / 1) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, 914_286)] // (3 * 0 + 100) / (4 * 10 + 100) * 300_000 + (1 / 1) * 700_000
         [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, 279)] // (((3 * 10 + 100) / (4 * 10 + 100)) * 1 * 300) * (1 + 0 / 25)

From 1a85123b890c8630459561c80095bba22e1df7de Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 12 Oct 2020 21:24:42 +0200
Subject: [PATCH 05373/10326] rename container class to be more descriptive

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 37541358b8..f74f40b9b4 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -284,7 +284,7 @@ namespace osu.Game.Overlays.Mods
                         },
                     },
                 },
-                ModSettingsContainer = new CModSettingsContainer
+                ModSettingsContainer = new MouseInputAbsorbingContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.BottomRight,
@@ -496,17 +496,11 @@ namespace osu.Game.Overlays.Mods
 
         #endregion
 
-        protected class CModSettingsContainer : Container
+        protected class MouseInputAbsorbingContainer : Container
         {
-            protected override bool OnMouseDown(MouseDownEvent e)
-            {
-                return true;
-            }
+            protected override bool OnMouseDown(MouseDownEvent e) => true;
 
-            protected override bool OnHover(HoverEvent e)
-            {
-                return true;
-            }
+            protected override bool OnHover(HoverEvent e) => true;
         }
     }
 }

From 779e6e10a7516f2d3f961af5f9f9a5ba81880c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 12 Oct 2020 21:43:14 +0200
Subject: [PATCH 05374/10326] Split ctors to avoid passing fields one by one

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index bdabe148a7..bbd204dede 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -227,7 +227,7 @@ namespace osu.Game.Beatmaps
                 var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(beatmapInfo));
                 var attributes = calculator.Calculate(key.Mods);
 
-                return difficultyCache[key] = new StarDifficulty(attributes.StarRating, attributes.MaxCombo, attributes);
+                return difficultyCache[key] = new StarDifficulty(attributes);
             }
             catch
             {
@@ -322,14 +322,21 @@ namespace osu.Game.Beatmaps
 
         public readonly DifficultyAttributes Attributes;
 
-        public StarDifficulty(double stars, int maxCombo, DifficultyAttributes attributes = null)
+        public StarDifficulty([NotNull] DifficultyAttributes attributes)
         {
-            Stars = stars;
-            MaxCombo = maxCombo;
+            Stars = attributes.StarRating;
+            MaxCombo = attributes.MaxCombo;
             Attributes = attributes;
             // Todo: Add more members (BeatmapInfo.DifficultyRating? Attributes? Etc...)
         }
 
+        public StarDifficulty(double starDifficulty, int maxCombo)
+        {
+            Stars = starDifficulty;
+            MaxCombo = maxCombo;
+            Attributes = null;
+        }
+
         public DifficultyRating DifficultyRating => BeatmapDifficultyManager.GetDifficultyRating(Stars);
     }
 }

From 7117fd0fbaacaa1a7aa959bfa52fbc0ab5958f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 12 Oct 2020 21:44:04 +0200
Subject: [PATCH 05375/10326] Add xmldoc and nullability annotations

---
 osu.Game/Beatmaps/BeatmapDifficultyManager.cs | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
index bbd204dede..3a21df8aeb 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
@@ -317,11 +317,27 @@ namespace osu.Game.Beatmaps
 
     public readonly struct StarDifficulty
     {
+        /// <summary>
+        /// The star difficulty rating for the given beatmap.
+        /// </summary>
         public readonly double Stars;
+
+        /// <summary>
+        /// The maximum combo achievable on the given beatmap.
+        /// </summary>
         public readonly int MaxCombo;
 
+        /// <summary>
+        /// The difficulty attributes computed for the given beatmap.
+        /// Might not be available if the star difficulty is associated with a beatmap that's not locally available.
+        /// </summary>
+        [CanBeNull]
         public readonly DifficultyAttributes Attributes;
 
+        /// <summary>
+        /// Creates a <see cref="StarDifficulty"/> structure based on <see cref="DifficultyAttributes"/> computed
+        /// by a <see cref="DifficultyCalculator"/>.
+        /// </summary>
         public StarDifficulty([NotNull] DifficultyAttributes attributes)
         {
             Stars = attributes.StarRating;
@@ -330,6 +346,10 @@ namespace osu.Game.Beatmaps
             // Todo: Add more members (BeatmapInfo.DifficultyRating? Attributes? Etc...)
         }
 
+        /// <summary>
+        /// Creates a <see cref="StarDifficulty"/> structure with a pre-populated star difficulty and max combo
+        /// in scenarios where computing <see cref="DifficultyAttributes"/> is not feasible (i.e. when working with online sources).
+        /// </summary>
         public StarDifficulty(double starDifficulty, int maxCombo)
         {
             Stars = starDifficulty;

From d4ba9d268254278bef604aa16e80e8cb901d8d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 12 Oct 2020 22:10:02 +0200
Subject: [PATCH 05376/10326] Simplify implementation of
 CalculatePerformanceAsync

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

diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index d8daf7189a..b7657c73c6 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -26,19 +26,14 @@ namespace osu.Game.Scoring
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
         public async Task<double?> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default)
         {
-            if (tryGetExisting(score, out var perf, out var lookupKey))
-                return perf;
+            var lookupKey = new PerformanceCacheLookup(score);
+
+            if (performanceCache.TryGetValue(lookupKey, out double performance))
+                return performance;
 
             return await computePerformanceAsync(score, lookupKey, token);
         }
 
-        private bool tryGetExisting(ScoreInfo score, out double performance, out PerformanceCacheLookup lookupKey)
-        {
-            lookupKey = new PerformanceCacheLookup(score);
-
-            return performanceCache.TryGetValue(lookupKey, out performance);
-        }
-
         private async Task<double?> computePerformanceAsync(ScoreInfo score, PerformanceCacheLookup lookupKey, CancellationToken token = default)
         {
             var attributes = await difficultyManager.GetDifficultyAsync(score.Beatmap, score.Ruleset, score.Mods, token);

From 68b505ab86df0f77bc0888c780189e6da0970122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 12 Oct 2020 22:14:39 +0200
Subject: [PATCH 05377/10326] Extract helper function for pp value handling

---
 .../Expanded/Statistics/PerformanceStatistic.cs    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index 3976682241..1b4edb99d7 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -28,19 +28,21 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         {
             if (score.PP.HasValue)
             {
-                performance.Value = (int)Math.Round(score.PP.Value, MidpointRounding.AwayFromZero);
+                setPerformanceValue(score.PP.Value);
             }
             else
             {
                 performanceManager.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
-                                  .ContinueWith(t => Schedule(() =>
-                                  {
-                                      if (t.Result.HasValue)
-                                          performance.Value = (int)Math.Round(t.Result.Value, MidpointRounding.AwayFromZero);
-                                  }), cancellationTokenSource.Token);
+                                  .ContinueWith(t => Schedule(() => setPerformanceValue(t.Result)), cancellationTokenSource.Token);
             }
         }
 
+        private void setPerformanceValue(double? pp)
+        {
+            if (pp.HasValue)
+                performance.Value = (int)Math.Round(pp.Value, MidpointRounding.AwayFromZero);
+        }
+
         public override void Appear()
         {
             base.Appear();

From 7e709349b829a98660fd6dd839c5c10932c4ee50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 06:26:14 +0900
Subject: [PATCH 05378/10326] Use already available test ruleset

---
 .../Visual/Background/TestSceneUserDimBackgrounds.cs         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index ce73e9061b..9ef9649f77 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -19,7 +19,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens;
@@ -194,8 +193,8 @@ namespace osu.Game.Tests.Visual.Background
             AddStep("Transition to Results", () => player.Push(results = new FadeAccessibleResults(new ScoreInfo
             {
                 User = new User { Username = "osu!" },
-                Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
-                Ruleset = new OsuRuleset().RulesetInfo,
+                Beatmap = new TestBeatmap(Ruleset.Value).BeatmapInfo,
+                Ruleset = Ruleset.Value,
             })));
 
             AddUntilStep("Wait for results is current", () => results.IsCurrentScreen());

From 41d82e3e8ab5377955e7b978e749de7f52fc82ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 17:34:11 +0900
Subject: [PATCH 05379/10326] 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 3df894fbcc..c3c755ecd7 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1009.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1013.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8b10f0a7f7..e8498129a1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.1009.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1013.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 88abbca73d..4b38d9f22d 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.Framework.iOS" Version="2020.1009.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1013.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.1009.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1013.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From b08e7ce1f52743307e4c78c3feafc298b0c4dfc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 17:37:24 +0900
Subject: [PATCH 05380/10326] Update BaseColour specification

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index be3bca3242..9aff4ddf8f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         waveform = new WaveformGraph
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = colours.Blue.Opacity(0.2f),
+                            BaseColour = colours.Blue.Opacity(0.2f),
                             LowColour = colours.BlueLighter,
                             MidColour = colours.BlueDark,
                             HighColour = colours.BlueDarker,

From a393bbe8f7c905997d5e0c5717609d31848e4b99 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 12:37:32 +0900
Subject: [PATCH 05381/10326] Remove direct drawable storage from carousel
 models

---
 .../Select/Carousel/CarouselBeatmap.cs        |  2 +-
 .../Select/Carousel/CarouselBeatmapSet.cs     |  2 +-
 .../Screens/Select/Carousel/CarouselGroup.cs  | 18 +--------------
 .../Screens/Select/Carousel/CarouselItem.cs   | 23 ++-----------------
 4 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 83e3c84f39..6a18e2d6a3 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Select.Carousel
             State.Value = CarouselItemState.Collapsed;
         }
 
-        protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmap(this);
+        public override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmap(this);
 
         public override void Filter(FilterCriteria criteria)
         {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 92ccfde14b..75d40a6b03 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Select.Carousel
                       .ForEach(AddChild);
         }
 
-        protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this);
+        public override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this);
 
         protected override CarouselItem GetNextToSelect()
         {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
index aa48d1a04e..b85e868b89 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.Select.Carousel
     /// </summary>
     public class CarouselGroup : CarouselItem
     {
-        protected override DrawableCarouselItem CreateDrawableRepresentation() => null;
+        public override DrawableCarouselItem CreateDrawableRepresentation() => null;
 
         public IReadOnlyList<CarouselItem> Children => InternalChildren;
 
@@ -23,22 +23,6 @@ namespace osu.Game.Screens.Select.Carousel
         /// </summary>
         private ulong currentChildID;
 
-        public override List<DrawableCarouselItem> Drawables
-        {
-            get
-            {
-                var drawables = base.Drawables;
-
-                // if we are explicitly not present, don't ever present children.
-                // without this check, children drawables can potentially be presented without their group header.
-                if (DrawableRepresentation.Value?.IsPresent == false) return drawables;
-
-                foreach (var c in InternalChildren)
-                    drawables.AddRange(c.Drawables);
-                return drawables;
-            }
-        }
-
         public virtual void RemoveChild(CarouselItem i)
         {
             InternalChildren.Remove(i);
diff --git a/osu.Game/Screens/Select/Carousel/CarouselItem.cs b/osu.Game/Screens/Select/Carousel/CarouselItem.cs
index 79c1a4cb6b..555c32c041 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselItem.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 osu.Framework.Bindables;
 
 namespace osu.Game.Screens.Select.Carousel
@@ -18,23 +16,8 @@ namespace osu.Game.Screens.Select.Carousel
         /// </summary>
         public bool Visible => State.Value != CarouselItemState.Collapsed && !Filtered.Value;
 
-        public virtual List<DrawableCarouselItem> Drawables
-        {
-            get
-            {
-                var items = new List<DrawableCarouselItem>();
-
-                var self = DrawableRepresentation.Value;
-                if (self?.IsPresent == true) items.Add(self);
-
-                return items;
-            }
-        }
-
         protected CarouselItem()
         {
-            DrawableRepresentation = new Lazy<DrawableCarouselItem>(CreateDrawableRepresentation);
-
             Filtered.ValueChanged += filtered =>
             {
                 if (filtered.NewValue && State.Value == CarouselItemState.Selected)
@@ -42,17 +25,15 @@ namespace osu.Game.Screens.Select.Carousel
             };
         }
 
-        protected readonly Lazy<DrawableCarouselItem> DrawableRepresentation;
-
         /// <summary>
         /// Used as a default sort method for <see cref="CarouselItem"/>s of differing types.
         /// </summary>
         internal ulong ChildID;
 
         /// <summary>
-        /// Create a fresh drawable version of this item. If you wish to consume the current representation, use <see cref="DrawableRepresentation"/> instead.
+        /// Create a fresh drawable version of this item.
         /// </summary>
-        protected abstract DrawableCarouselItem CreateDrawableRepresentation();
+        public abstract DrawableCarouselItem CreateDrawableRepresentation();
 
         public virtual void Filter(FilterCriteria criteria)
         {

From 9193f5b0ba5b7208818898612e4fb2cefaeef379 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 12:37:41 +0900
Subject: [PATCH 05382/10326] Expose panel height from non-drawable models

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs         | 2 ++
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs    | 2 ++
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 75d40a6b03..44b8e72d51 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselBeatmapSet : CarouselGroupEagerSelect
     {
+        public float TotalHeight => DrawableCarouselBeatmapSet.HEIGHT + BeatmapSet.Beatmaps.Count * DrawableCarouselBeatmap.HEIGHT;
+
         public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>();
 
         public BeatmapSetInfo BeatmapSet;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 10745fe3c1..c8f9507b91 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class DrawableCarouselBeatmap : DrawableCarouselItem, IHasContextMenu
     {
+        public const float HEIGHT = MAX_HEIGHT;
+
         private readonly BeatmapInfo beatmap;
 
         private Sprite background;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 3c8ac69dd2..8332093a3c 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class DrawableCarouselBeatmapSet : DrawableCarouselItem, IHasContextMenu
     {
+        public const float HEIGHT = MAX_HEIGHT;
+
         private Action<BeatmapSetInfo> restoreHiddenRequested;
         private Action<int> viewDetails;
 

From 3143224e5b5b51f939c6130dd026de24bb3e96db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 14:23:18 +0900
Subject: [PATCH 05383/10326] Refactor how drawable carousel items are
 constructed

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    |  29 +--
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 187 ++++++++----------
 .../Select/Carousel/CarouselBeatmap.cs        |   2 +
 .../Select/Carousel/CarouselBeatmapSet.cs     |  15 +-
 .../Screens/Select/Carousel/CarouselItem.cs   |   2 +
 .../Carousel/DrawableCarouselBeatmap.cs       |   6 +-
 .../Carousel/DrawableCarouselBeatmapSet.cs    |  43 ++++
 .../Select/Carousel/DrawableCarouselItem.cs   |  35 ++--
 8 files changed, 177 insertions(+), 142 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 3aff390a47..680928b331 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -709,19 +709,20 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null, Action<BeatmapCarousel> carouselAdjust = null)
         {
-            createCarousel(carouselAdjust);
-
-            if (beatmapSets == null)
-            {
-                beatmapSets = new List<BeatmapSetInfo>();
-
-                for (int i = 1; i <= set_count; i++)
-                    beatmapSets.Add(createTestBeatmapSet(i));
-            }
-
             bool changed = false;
-            AddStep($"Load {(beatmapSets.Count > 0 ? beatmapSets.Count.ToString() : "some")} beatmaps", () =>
+
+            createCarousel(c =>
             {
+                carouselAdjust?.Invoke(c);
+
+                if (beatmapSets == null)
+                {
+                    beatmapSets = new List<BeatmapSetInfo>();
+
+                    for (int i = 1; i <= set_count; i++)
+                        beatmapSets.Add(createTestBeatmapSet(i));
+                }
+
                 carousel.Filter(initialCriteria?.Invoke() ?? new FilterCriteria());
                 carousel.BeatmapSetsChanged = () => changed = true;
                 carousel.BeatmapSets = beatmapSets;
@@ -807,7 +808,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private bool selectedBeatmapVisible()
         {
-            var currentlySelected = carousel.Items.Find(s => s.Item is CarouselBeatmap && s.Item.State.Value == CarouselItemState.Selected);
+            var currentlySelected = carousel.Items.FirstOrDefault(s => s.Item is CarouselBeatmap && s.Item.State.Value == CarouselItemState.Selected);
             if (currentlySelected == null)
                 return true;
 
@@ -908,10 +909,10 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapCarousel : BeatmapCarousel
         {
-            public new List<DrawableCarouselItem> Items => base.Items;
-
             public bool PendingFilterTask => PendingFilter != null;
 
+            public IEnumerable<DrawableCarouselItem> Items => InternalChildren.OfType<DrawableCarouselItem>();
+
             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 5f6f859d66..ef533a1456 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -96,9 +96,6 @@ namespace osu.Game.Screens.Select
 
             beatmapSets.Select(createCarouselSet).Where(g => g != null).ForEach(newRoot.AddChild);
 
-            // preload drawables as the ctor overhead is quite high currently.
-            _ = newRoot.Drawables;
-
             root = newRoot;
             if (selectedBeatmapSet != null && !beatmapSets.Contains(selectedBeatmapSet.BeatmapSet))
                 selectedBeatmapSet = null;
@@ -119,6 +116,8 @@ namespace osu.Game.Screens.Select
         }
 
         private readonly List<float> yPositions = new List<float>();
+        private readonly List<CarouselItem> visibleItems = new List<CarouselItem>();
+
         private readonly Cached itemsCache = new Cached();
         private readonly Cached scrollPositionCache = new Cached();
 
@@ -130,8 +129,6 @@ namespace osu.Game.Screens.Select
         private readonly List<CarouselBeatmapSet> previouslyVisitedRandomSets = new List<CarouselBeatmapSet>();
         private readonly Stack<CarouselBeatmap> randomSelectedBeatmaps = new Stack<CarouselBeatmap>();
 
-        protected List<DrawableCarouselItem> Items = new List<DrawableCarouselItem>();
-
         private CarouselRoot root;
 
         private IBindable<WeakReference<BeatmapSetInfo>> itemUpdated;
@@ -178,7 +175,8 @@ namespace osu.Game.Screens.Select
             itemRestored = beatmaps.BeatmapRestored.GetBoundCopy();
             itemRestored.BindValueChanged(beatmapRestored);
 
-            loadBeatmapSets(GetLoadableBeatmaps());
+            if (!beatmapSets.Any())
+                loadBeatmapSets(GetLoadableBeatmaps());
         }
 
         protected virtual IEnumerable<BeatmapSetInfo> GetLoadableBeatmaps() => beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.AllButFiles);
@@ -558,71 +556,78 @@ namespace osu.Game.Screens.Select
         {
             base.Update();
 
+            //todo: this should only refresh items, not everything here
             if (!itemsCache.IsValid)
+            {
                 updateItems();
 
-            // Remove all items that should no longer be on-screen
-            scrollableContent.RemoveAll(p => p.Y < visibleUpperBound - p.DrawHeight || p.Y > visibleBottomBound || !p.IsPresent);
+                // Remove all items that should no longer be on-screen
+                scrollableContent.RemoveAll(p => p.Y < visibleUpperBound - p.DrawHeight || p.Y > visibleBottomBound || !p.IsPresent);
 
-            // Find index range of all items that should be on-screen
-            Trace.Assert(Items.Count == yPositions.Count);
+                // Find index range of all items that should be on-screen
+                int firstIndex = yPositions.BinarySearch(visibleUpperBound - DrawableCarouselItem.MAX_HEIGHT);
+                if (firstIndex < 0) firstIndex = ~firstIndex;
+                int lastIndex = yPositions.BinarySearch(visibleBottomBound);
+                if (lastIndex < 0) lastIndex = ~lastIndex;
 
-            int firstIndex = yPositions.BinarySearch(visibleUpperBound - DrawableCarouselItem.MAX_HEIGHT);
-            if (firstIndex < 0) firstIndex = ~firstIndex;
-            int lastIndex = yPositions.BinarySearch(visibleBottomBound);
-            if (lastIndex < 0) lastIndex = ~lastIndex;
+                scrollableContent.Clear();
 
-            int notVisibleCount = 0;
-
-            // Add those items within the previously found index range that should be displayed.
-            for (int i = firstIndex; i < lastIndex; ++i)
-            {
-                DrawableCarouselItem item = Items[i];
-
-                if (!item.Item.Visible)
+                // Add those items within the previously found index range that should be displayed.
+                for (int i = firstIndex; i < lastIndex; ++i)
                 {
-                    if (!item.IsPresent)
-                        notVisibleCount++;
-                    continue;
-                }
+                    DrawableCarouselItem item = visibleItems[i].CreateDrawableRepresentation();
 
-                float depth = i + (item is DrawableCarouselBeatmapSet ? -Items.Count : 0);
+                    item.Y = yPositions[i];
+                    item.Depth = i;
 
-                // Only add if we're not already part of the content.
-                if (!scrollableContent.Contains(item))
-                {
-                    // Makes sure headers are always _below_ items,
-                    // and depth flows downward.
-                    item.Depth = depth;
+                    scrollableContent.Add(item);
 
-                    switch (item.LoadState)
+                    // if (!item.Item.Visible)
+                    // {
+                    //     if (!item.IsPresent)
+                    //         notVisibleCount++;
+                    //     continue;
+                    // }
+
+                    // Only add if we're not already part of the content.
+                    /*
+                    if (!scrollableContent.Contains(item))
                     {
-                        case LoadState.NotLoaded:
-                            LoadComponentAsync(item);
-                            break;
+                        // Makes sure headers are always _below_ items,
+                        // and depth flows downward.
+                        item.Depth = depth;
 
-                        case LoadState.Loading:
-                            break;
+                        switch (item.LoadState)
+                        {
+                            case LoadState.NotLoaded:
+                                LoadComponentAsync(item);
+                                break;
 
-                        default:
-                            scrollableContent.Add(item);
-                            break;
+                            case LoadState.Loading:
+                                break;
+
+                            default:
+                                scrollableContent.Add(item);
+                                break;
+                        }
                     }
-                }
-                else
-                {
-                    scrollableContent.ChangeChildDepth(item, depth);
+                    else
+                    {
+                        scrollableContent.ChangeChildDepth(item, depth);
+                    }
+                    */
                 }
             }
 
-            // this is not actually useful right now, but once we have groups may well be.
-            if (notVisibleCount > 50)
-                itemsCache.Invalidate();
-
             // Update externally controlled state of currently visible items
             // (e.g. x-offset and opacity).
             foreach (DrawableCarouselItem p in scrollableContent.Children)
+            {
                 updateItem(p);
+
+                // foreach (var pChild in p.ChildItems)
+                //     updateItem(pChild, p);
+            }
         }
 
         protected override void UpdateAfterChildren()
@@ -633,15 +638,6 @@ namespace osu.Game.Screens.Select
                 updateScrollPosition();
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            // aggressively dispose "off-screen" items to reduce GC pressure.
-            foreach (var i in Items)
-                i.Dispose();
-        }
-
         private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
@@ -704,69 +700,39 @@ namespace osu.Game.Screens.Select
         /// <returns>The Y position of the currently selected item.</returns>
         private void updateItems()
         {
-            Items = root.Drawables.ToList();
-
             yPositions.Clear();
+            visibleItems.Clear();
 
             float currentY = visibleHalfHeight;
-            DrawableCarouselBeatmapSet lastSet = null;
 
             scrollTarget = null;
 
-            foreach (DrawableCarouselItem d in Items)
+            foreach (CarouselItem item in root.Children)
             {
-                if (d.IsPresent)
+                if (item.Filtered.Value)
+                    continue;
+
+                switch (item)
                 {
-                    switch (d)
+                    case CarouselBeatmapSet set:
                     {
-                        case DrawableCarouselBeatmapSet set:
-                        {
-                            lastSet = set;
+                        visibleItems.Add(set);
+                        yPositions.Add(currentY);
+                        //lastSet = set;
 
-                            set.MoveToX(set.Item.State.Value == CarouselItemState.Selected ? -100 : 0, 500, Easing.OutExpo);
-                            set.MoveToY(currentY, 750, Easing.OutExpo);
-                            break;
-                        }
-
-                        case DrawableCarouselBeatmap beatmap:
-                        {
-                            if (beatmap.Item.State.Value == CarouselItemState.Selected)
-                                // scroll position at currentY makes the set panel appear at the very top of the carousel's screen space
-                                // move down by half of visible height (height of the carousel's visible extent, including semi-transparent areas)
-                                // then reapply the top semi-transparent area (because carousel's screen space starts below it)
-                                // and finally add half of the panel's own height to achieve vertical centering of the panel itself
-                                scrollTarget = currentY - visibleHalfHeight + BleedTop + beatmap.DrawHeight / 2;
-
-                            void performMove(float y, float? startY = null)
-                            {
-                                if (startY != null) beatmap.MoveTo(new Vector2(0, startY.Value));
-                                beatmap.MoveToX(beatmap.Item.State.Value == CarouselItemState.Selected ? -50 : 0, 500, Easing.OutExpo);
-                                beatmap.MoveToY(y, 750, Easing.OutExpo);
-                            }
-
-                            Debug.Assert(lastSet != null);
-
-                            float? setY = null;
-                            if (!d.IsLoaded || beatmap.Alpha == 0) // can't use IsPresent due to DrawableCarouselItem override.
-                                setY = lastSet.Y + lastSet.DrawHeight + 5;
-
-                            if (d.IsLoaded)
-                                performMove(currentY, setY);
-                            else
-                            {
-                                float y = currentY;
-                                d.OnLoadComplete += _ => performMove(y, setY);
-                            }
-
-                            break;
-                        }
+                        // TODO: move this logic to DCBS too.
+                        // set.MoveToX(set.Item.State.Value == CarouselItemState.Selected ? -100 : 0, 500, Easing.OutExpo);
+                        // set.MoveToY(currentY, 750, Easing.OutExpo);
+                        currentY += set.TotalHeight;
+                        break;
                     }
+
+                    default:
+                        continue;
+                    //
+                    //     break;
+                    // }
                 }
-
-                yPositions.Add(currentY);
-
-                if (d.Item.Visible)
-                    currentY += d.DrawHeight + 5;
             }
 
             currentY += visibleHalfHeight;
@@ -869,6 +835,7 @@ namespace osu.Game.Screens.Select
             /// </summary>
             public bool UserScrolling { get; private set; }
 
+            // ReSharper disable once OptionalParameterHierarchyMismatch fuck off rider
             protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
             {
                 UserScrolling = true;
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 6a18e2d6a3..dce4028f17 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -10,6 +10,8 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselBeatmap : CarouselItem
     {
+        public override float TotalHeight => DrawableCarouselBeatmap.HEIGHT;
+
         public readonly BeatmapInfo Beatmap;
 
         public CarouselBeatmap(BeatmapInfo beatmap)
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 44b8e72d51..e34710f71d 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -12,7 +12,20 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselBeatmapSet : CarouselGroupEagerSelect
     {
-        public float TotalHeight => DrawableCarouselBeatmapSet.HEIGHT + BeatmapSet.Beatmaps.Count * DrawableCarouselBeatmap.HEIGHT;
+        public override float TotalHeight
+        {
+            get
+            {
+                switch (State.Value)
+                {
+                    case CarouselItemState.Selected:
+                        return DrawableCarouselBeatmapSet.HEIGHT + Children.Count * DrawableCarouselBeatmap.HEIGHT;
+
+                    default:
+                        return DrawableCarouselBeatmapSet.HEIGHT;
+                }
+            }
+        }
 
         public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>();
 
diff --git a/osu.Game/Screens/Select/Carousel/CarouselItem.cs b/osu.Game/Screens/Select/Carousel/CarouselItem.cs
index 555c32c041..004d9779ef 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselItem.cs
@@ -7,6 +7,8 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public abstract class CarouselItem
     {
+        public virtual float TotalHeight => 0;
+
         public readonly BindableBool Filtered = new BindableBool();
 
         public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index c8f9507b91..7d69251265 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class DrawableCarouselBeatmap : DrawableCarouselItem, IHasContextMenu
     {
-        public const float HEIGHT = MAX_HEIGHT;
+        public const float HEIGHT = MAX_HEIGHT * 0.6f;
 
         private readonly BeatmapInfo beatmap;
 
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Select.Carousel
             : base(panel)
         {
             beatmap = panel.Beatmap;
-            Height *= 0.60f;
+            Height = HEIGHT;
         }
 
         [BackgroundDependencyLoader(true)]
@@ -170,6 +170,8 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Selected();
 
+            BorderContainer.MoveToX(Item.State.Value == CarouselItemState.Selected ? -50 : 0, 500, Easing.OutExpo);
+
             background.Colour = ColourInfo.GradientVertical(
                 new Color4(20, 43, 51, 255),
                 new Color4(40, 86, 102, 255));
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 8332093a3c..aaa925c6f8 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -43,8 +43,13 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
 
+        public override IEnumerable<DrawableCarouselItem> ChildItems => beatmapContainer?.Children ?? base.ChildItems;
+
         private readonly BeatmapSetInfo beatmapSet;
 
+        private Container<DrawableCarouselBeatmap> beatmapContainer;
+        private Bindable<CarouselItemState> beatmapSetState;
+
         public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)
             : base(set)
         {
@@ -119,6 +124,44 @@ namespace osu.Game.Screens.Select.Carousel
                     }
                 }
             };
+
+            // TODO: temporary. we probably want to *not* inherit DrawableCarouselItem for this class, but only the above header portion.
+            AddRangeInternal(new Drawable[]
+            {
+                beatmapContainer = new Container<DrawableCarouselBeatmap>
+                {
+                    X = 50,
+                    Y = MAX_HEIGHT,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                },
+            });
+
+            beatmapSetState = Item.State.GetBoundCopy();
+            beatmapSetState.BindValueChanged(setSelected, true);
+        }
+
+        private void setSelected(ValueChangedEvent<CarouselItemState> obj)
+        {
+            switch (obj.NewValue)
+            {
+                default:
+                    beatmapContainer.Clear();
+                    break;
+
+                case CarouselItemState.Selected:
+
+                    float yPos = 0;
+
+                    foreach (var item in ((CarouselBeatmapSet)Item).Beatmaps.Select(b => b.CreateDrawableRepresentation()).OfType<DrawableCarouselBeatmap>())
+                    {
+                        item.Y = yPos;
+                        beatmapContainer.Add(item);
+                        yPos += item.Item.TotalHeight;
+                    }
+
+                    break;
+            }
         }
 
         private const int maximum_difficulty_icons = 18;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index 121491d6ca..c0405b373d 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -27,10 +29,13 @@ namespace osu.Game.Screens.Select.Carousel
 
         public readonly CarouselItem Item;
 
-        private Container nestedContainer;
-        private Container borderContainer;
+        public virtual IEnumerable<DrawableCarouselItem> ChildItems => Enumerable.Empty<DrawableCarouselItem>();
 
-        private Box hoverLayer;
+        private readonly Container nestedContainer;
+
+        protected readonly Container BorderContainer;
+
+        private readonly Box hoverLayer;
 
         protected override Container<Drawable> Content => nestedContainer;
 
@@ -41,14 +46,8 @@ namespace osu.Game.Screens.Select.Carousel
             Height = MAX_HEIGHT;
             RelativeSizeAxes = Axes.X;
             Alpha = 0;
-        }
 
-        private SampleChannel sampleHover;
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuColour colours)
-        {
-            InternalChild = borderContainer = new Container
+            InternalChild = BorderContainer = new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
@@ -68,7 +67,13 @@ namespace osu.Game.Screens.Select.Carousel
                     },
                 }
             };
+        }
 
+        private SampleChannel sampleHover;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, OsuColour colours)
+        {
             sampleHover = audio.Samples.Get($@"SongSelect/song-ping-variation-{RNG.Next(1, 5)}");
             hoverLayer.Colour = colours.Blue.Opacity(0.1f);
         }
@@ -87,7 +92,7 @@ namespace osu.Game.Screens.Select.Carousel
             base.OnHoverLost(e);
         }
 
-        public void SetMultiplicativeAlpha(float alpha) => borderContainer.Alpha = alpha;
+        public void SetMultiplicativeAlpha(float alpha) => BorderContainer.Alpha = alpha;
 
         protected override void LoadComplete()
         {
@@ -123,8 +128,8 @@ namespace osu.Game.Screens.Select.Carousel
         {
             Item.State.Value = CarouselItemState.Selected;
 
-            borderContainer.BorderThickness = 2.5f;
-            borderContainer.EdgeEffect = new EdgeEffectParameters
+            BorderContainer.BorderThickness = 2.5f;
+            BorderContainer.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Colour = new Color4(130, 204, 255, 150),
@@ -137,8 +142,8 @@ namespace osu.Game.Screens.Select.Carousel
         {
             Item.State.Value = CarouselItemState.NotSelected;
 
-            borderContainer.BorderThickness = 0;
-            borderContainer.EdgeEffect = new EdgeEffectParameters
+            BorderContainer.BorderThickness = 0;
+            BorderContainer.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,
                 Offset = new Vector2(1),

From f17d661c1a1e1aa67865cb09e5e9e492cfbaa448 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 14:46:51 +0900
Subject: [PATCH 05384/10326] Add basic range-based invalidation

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 70 +++++++---------------
 1 file changed, 22 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index ef533a1456..94ba0caefb 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -552,70 +552,44 @@ namespace osu.Game.Screens.Select
 
         #endregion
 
+        private (int first, int last) displayedRange;
+
         protected override void Update()
         {
             base.Update();
 
+            bool revalidateItems = !itemsCache.IsValid;
+
             //todo: this should only refresh items, not everything here
-            if (!itemsCache.IsValid)
-            {
+            if (revalidateItems)
                 updateItems();
 
-                // Remove all items that should no longer be on-screen
-                scrollableContent.RemoveAll(p => p.Y < visibleUpperBound - p.DrawHeight || p.Y > visibleBottomBound || !p.IsPresent);
+            // Remove all items that should no longer be on-screen
+            scrollableContent.RemoveAll(p => p.Y < visibleUpperBound - p.DrawHeight || p.Y > visibleBottomBound || !p.IsPresent);
 
-                // Find index range of all items that should be on-screen
-                int firstIndex = yPositions.BinarySearch(visibleUpperBound - DrawableCarouselItem.MAX_HEIGHT);
-                if (firstIndex < 0) firstIndex = ~firstIndex;
-                int lastIndex = yPositions.BinarySearch(visibleBottomBound);
-                if (lastIndex < 0) lastIndex = ~lastIndex;
+            // Find index range of all items that should be on-screen
+            int firstIndex = yPositions.BinarySearch(visibleUpperBound - DrawableCarouselItem.MAX_HEIGHT);
+            if (firstIndex < 0) firstIndex = ~firstIndex;
+            int lastIndex = yPositions.BinarySearch(visibleBottomBound);
+            if (lastIndex < 0) lastIndex = ~lastIndex;
 
-                scrollableContent.Clear();
+            if (revalidateItems || firstIndex != displayedRange.first || lastIndex != displayedRange.last)
+            {
+                displayedRange = (firstIndex, lastIndex);
 
                 // Add those items within the previously found index range that should be displayed.
                 for (int i = firstIndex; i < lastIndex; ++i)
                 {
-                    DrawableCarouselItem item = visibleItems[i].CreateDrawableRepresentation();
+                    var panel = scrollableContent.FirstOrDefault(c => c.Item == visibleItems[i]);
 
-                    item.Y = yPositions[i];
-                    item.Depth = i;
-
-                    scrollableContent.Add(item);
-
-                    // if (!item.Item.Visible)
-                    // {
-                    //     if (!item.IsPresent)
-                    //         notVisibleCount++;
-                    //     continue;
-                    // }
-
-                    // Only add if we're not already part of the content.
-                    /*
-                    if (!scrollableContent.Contains(item))
+                    if (panel == null)
                     {
-                        // Makes sure headers are always _below_ items,
-                        // and depth flows downward.
-                        item.Depth = depth;
-
-                        switch (item.LoadState)
-                        {
-                            case LoadState.NotLoaded:
-                                LoadComponentAsync(item);
-                                break;
-
-                            case LoadState.Loading:
-                                break;
-
-                            default:
-                                scrollableContent.Add(item);
-                                break;
-                        }
+                        panel = visibleItems[i].CreateDrawableRepresentation();
+                        scrollableContent.Add(panel);
                     }
-                    else
-                    {
-                        scrollableContent.ChangeChildDepth(item, depth);
-                    }
-                    */
+
+                    panel.Y = yPositions[i];
+                    scrollableContent.ChangeChildDepth(panel, i);
                 }
             }
 

From 0a978c6131352794a60ea3c00db373c59d0144af Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 15:36:03 +0900
Subject: [PATCH 05385/10326] Add basic pooling setup

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 17 ++++--
 .../Select/Carousel/CarouselBeatmapSet.cs     |  2 -
 .../Carousel/DrawableCarouselBeatmap.cs       |  6 +-
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 55 ++++++++++--------
 .../Select/Carousel/DrawableCarouselItem.cs   | 58 +++++++++++++++----
 5 files changed, 95 insertions(+), 43 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 94ba0caefb..f5b524e57c 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -16,6 +16,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Threading;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
@@ -136,6 +137,8 @@ namespace osu.Game.Screens.Select
         private IBindable<WeakReference<BeatmapInfo>> itemHidden;
         private IBindable<WeakReference<BeatmapInfo>> itemRestored;
 
+        private readonly DrawablePool<DrawableCarouselBeatmapSet> setPool = new DrawablePool<DrawableCarouselBeatmapSet>(100);
+
         public BeatmapCarousel()
         {
             root = new CarouselRoot(this);
@@ -146,9 +149,13 @@ namespace osu.Game.Screens.Select
                 {
                     Masking = false,
                     RelativeSizeAxes = Axes.Both,
-                    Child = scrollableContent = new Container<DrawableCarouselItem>
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.X,
+                        setPool,
+                        scrollableContent = new Container<DrawableCarouselItem>
+                        {
+                            RelativeSizeAxes = Axes.X,
+                        }
                     }
                 }
             };
@@ -580,11 +587,13 @@ namespace osu.Game.Screens.Select
                 // Add those items within the previously found index range that should be displayed.
                 for (int i = firstIndex; i < lastIndex; ++i)
                 {
-                    var panel = scrollableContent.FirstOrDefault(c => c.Item == visibleItems[i]);
+                    var item = visibleItems[i];
+
+                    var panel = scrollableContent.FirstOrDefault(c => c.Item == item);
 
                     if (panel == null)
                     {
-                        panel = visibleItems[i].CreateDrawableRepresentation();
+                        panel = setPool.Get(p => p.Item = item);
                         scrollableContent.Add(panel);
                     }
 
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index e34710f71d..15f622f3c4 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -43,8 +43,6 @@ namespace osu.Game.Screens.Select.Carousel
                       .ForEach(AddChild);
         }
 
-        public override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this);
-
         protected override CarouselItem GetNextToSelect()
         {
             if (LastSelected == null)
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 7d69251265..4135960e06 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -60,10 +60,12 @@ namespace osu.Game.Screens.Select.Carousel
         private CancellationTokenSource starDifficultyCancellationSource;
 
         public DrawableCarouselBeatmap(CarouselBeatmap panel)
-            : base(panel)
         {
             beatmap = panel.Beatmap;
             Height = HEIGHT;
+
+            // todo: temporary
+            Item = panel;
         }
 
         [BackgroundDependencyLoader(true)]
@@ -79,7 +81,7 @@ namespace osu.Game.Screens.Select.Carousel
             if (manager != null)
                 hideRequested = manager.Hide;
 
-            Children = new Drawable[]
+            Content.Children = new Drawable[]
             {
                 background = new Box
                 {
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index aaa925c6f8..0bfec4f509 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -45,26 +45,40 @@ namespace osu.Game.Screens.Select.Carousel
 
         public override IEnumerable<DrawableCarouselItem> ChildItems => beatmapContainer?.Children ?? base.ChildItems;
 
-        private readonly BeatmapSetInfo beatmapSet;
+        private BeatmapSetInfo beatmapSet => (Item as CarouselBeatmapSet)?.BeatmapSet;
 
         private Container<DrawableCarouselBeatmap> beatmapContainer;
         private Bindable<CarouselItemState> beatmapSetState;
 
-        public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)
-            : base(set)
-        {
-            beatmapSet = set.BeatmapSet;
-        }
+        [Resolved]
+        private BeatmapManager manager { get; set; }
 
         [BackgroundDependencyLoader(true)]
-        private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay)
+        private void load(BeatmapSetOverlay beatmapOverlay)
         {
             restoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore);
 
             if (beatmapOverlay != null)
                 viewDetails = beatmapOverlay.FetchAndShowBeatmapSet;
 
-            Children = new Drawable[]
+            // TODO: temporary. we probably want to *not* inherit DrawableCarouselItem for this class, but only the above header portion.
+            AddRangeInternal(new Drawable[]
+            {
+                beatmapContainer = new Container<DrawableCarouselBeatmap>
+                {
+                    X = 50,
+                    Y = MAX_HEIGHT,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                },
+            });
+        }
+
+        protected override void UpdateItem()
+        {
+            base.UpdateItem();
+
+            Content.Children = new Drawable[]
             {
                 new DelayedLoadUnloadWrapper(() =>
                     {
@@ -125,17 +139,7 @@ namespace osu.Game.Screens.Select.Carousel
                 }
             };
 
-            // TODO: temporary. we probably want to *not* inherit DrawableCarouselItem for this class, but only the above header portion.
-            AddRangeInternal(new Drawable[]
-            {
-                beatmapContainer = new Container<DrawableCarouselBeatmap>
-                {
-                    X = 50,
-                    Y = MAX_HEIGHT,
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                },
-            });
+            beatmapContainer.Clear();
 
             beatmapSetState = Item.State.GetBoundCopy();
             beatmapSetState.BindValueChanged(setSelected, true);
@@ -153,11 +157,16 @@ namespace osu.Game.Screens.Select.Carousel
 
                     float yPos = 0;
 
-                    foreach (var item in ((CarouselBeatmapSet)Item).Beatmaps.Select(b => b.CreateDrawableRepresentation()).OfType<DrawableCarouselBeatmap>())
+                    var carouselBeatmapSet = (CarouselBeatmapSet)Item;
+
+                    foreach (var item in carouselBeatmapSet.Children)
                     {
-                        item.Y = yPos;
-                        beatmapContainer.Add(item);
-                        yPos += item.Item.TotalHeight;
+                        var beatmapPanel = item.CreateDrawableRepresentation();
+
+                        beatmapPanel.Y = yPos;
+                        yPos += item.TotalHeight;
+
+                        beatmapContainer.Add((DrawableCarouselBeatmap)beatmapPanel);
                     }
 
                     break;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index c0405b373d..4c4932c22a 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -2,14 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+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.Pooling;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
@@ -19,15 +22,32 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Select.Carousel
 {
-    public abstract class DrawableCarouselItem : Container
+    public abstract class DrawableCarouselItem : PoolableDrawable
     {
         public const float MAX_HEIGHT = 80;
 
-        public override bool RemoveWhenNotAlive => false;
+        public override bool IsPresent => base.IsPresent || Item?.Visible == true;
 
-        public override bool IsPresent => base.IsPresent || Item.Visible;
+        public CarouselItem Item
+        {
+            get => item;
+            set
+            {
+                if (item == value)
+                    return;
 
-        public readonly CarouselItem Item;
+                if (item != null)
+                {
+                    Item.Filtered.ValueChanged -= onStateChange;
+                    Item.State.ValueChanged -= onStateChange;
+                }
+
+                item = value;
+
+                if (IsLoaded)
+                    UpdateItem();
+            }
+        }
 
         public virtual IEnumerable<DrawableCarouselItem> ChildItems => Enumerable.Empty<DrawableCarouselItem>();
 
@@ -37,12 +57,10 @@ namespace osu.Game.Screens.Select.Carousel
 
         private readonly Box hoverLayer;
 
-        protected override Container<Drawable> Content => nestedContainer;
+        protected Container<Drawable> Content => nestedContainer;
 
-        protected DrawableCarouselItem(CarouselItem item)
+        protected DrawableCarouselItem()
         {
-            Item = item;
-
             Height = MAX_HEIGHT;
             RelativeSizeAxes = Axes.X;
             Alpha = 0;
@@ -70,6 +88,7 @@ namespace osu.Game.Screens.Select.Carousel
         }
 
         private SampleChannel sampleHover;
+        private CarouselItem item;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, OsuColour colours)
@@ -98,14 +117,27 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.LoadComplete();
 
-            ApplyState();
-            Item.Filtered.ValueChanged += _ => Schedule(ApplyState);
-            Item.State.ValueChanged += _ => Schedule(ApplyState);
+            UpdateItem();
         }
 
+        protected virtual void UpdateItem()
+        {
+            if (item == null)
+                return;
+
+            ApplyState();
+
+            Item.Filtered.ValueChanged += onStateChange;
+            Item.State.ValueChanged += onStateChange;
+        }
+
+        private void onStateChange(ValueChangedEvent<CarouselItemState> obj) => Schedule(ApplyState);
+
+        private void onStateChange(ValueChangedEvent<bool> _) => Schedule(ApplyState);
+
         protected virtual void ApplyState()
         {
-            if (!IsLoaded) return;
+            Debug.Assert(Item != null);
 
             switch (Item.State.Value)
             {
@@ -126,6 +158,8 @@ namespace osu.Game.Screens.Select.Carousel
 
         protected virtual void Selected()
         {
+            Debug.Assert(Item != null);
+
             Item.State.Value = CarouselItemState.Selected;
 
             BorderContainer.BorderThickness = 2.5f;

From f3b24b9bb5bd9a5fa9cf28e5c190a565a8ce9df3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 15:36:26 +0900
Subject: [PATCH 05386/10326] Avoid performing eager selection constantly on
 adding ranges of new children

---
 osu.Game/Screens/Select/BeatmapCarousel.cs               | 2 +-
 .../Screens/Select/Carousel/CarouselGroupEagerSelect.cs  | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index f5b524e57c..a8212f7e59 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Screens.Select
         {
             CarouselRoot newRoot = new CarouselRoot(this);
 
-            beatmapSets.Select(createCarouselSet).Where(g => g != null).ForEach(newRoot.AddChild);
+            newRoot.AddChildren(beatmapSets.Select(createCarouselSet).Where(g => g != null));
 
             root = newRoot;
             if (selectedBeatmapSet != null && !beatmapSets.Contains(selectedBeatmapSet.BeatmapSet))
diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
index 262bea9c71..9e8aad4b6f 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.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;
 
 namespace osu.Game.Screens.Select.Carousel
@@ -54,6 +55,14 @@ namespace osu.Game.Screens.Select.Carousel
                 updateSelectedIndex();
         }
 
+        public void AddChildren(IEnumerable<CarouselItem> items)
+        {
+            foreach (var i in items)
+                base.AddChild(i);
+
+            attemptSelection();
+        }
+
         public override void AddChild(CarouselItem i)
         {
             base.AddChild(i);

From 580ea62710810d80a92059fced01560b7085ee26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 15:36:36 +0900
Subject: [PATCH 05387/10326] Temporarily increase test beatmap count for perf
 testing

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 54 ++++++++-----------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 680928b331..7d850a0d13 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
@@ -835,42 +836,29 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Title = $"test set #{id}!",
                     AuthorString = string.Concat(Enumerable.Repeat((char)('z' - Math.Min(25, id - 1)), 5))
                 },
-                Beatmaps = new List<BeatmapInfo>(new[]
-                {
-                    new BeatmapInfo
-                    {
-                        OnlineBeatmapID = id * 10,
-                        Version = "Normal",
-                        StarDifficulty = 2,
-                        BaseDifficulty = new BeatmapDifficulty
-                        {
-                            OverallDifficulty = 3.5f,
-                        }
-                    },
-                    new BeatmapInfo
-                    {
-                        OnlineBeatmapID = id * 10 + 1,
-                        Version = "Hard",
-                        StarDifficulty = 5,
-                        BaseDifficulty = new BeatmapDifficulty
-                        {
-                            OverallDifficulty = 5,
-                        }
-                    },
-                    new BeatmapInfo
-                    {
-                        OnlineBeatmapID = id * 10 + 2,
-                        Version = "Insane",
-                        StarDifficulty = 6,
-                        BaseDifficulty = new BeatmapDifficulty
-                        {
-                            OverallDifficulty = 7,
-                        }
-                    },
-                }),
+                Beatmaps = getBeatmaps(RNG.Next(1, 20)).ToList()
             };
         }
 
+        private IEnumerable<BeatmapInfo> getBeatmaps(int count)
+        {
+            int id = 0;
+
+            for (int i = 0; i < count; i++)
+            {
+                yield return new BeatmapInfo
+                {
+                    OnlineBeatmapID = id++ * 10,
+                    Version = "Normal",
+                    StarDifficulty = RNG.NextSingle() * 10,
+                    BaseDifficulty = new BeatmapDifficulty
+                    {
+                        OverallDifficulty = RNG.NextSingle() * 10,
+                    }
+                };
+            }
+        }
+
         private BeatmapSetInfo createTestBeatmapSetWithManyDifficulties(int id)
         {
             var toReturn = new BeatmapSetInfo

From 0400b34349dd805750f78a8ac7b326c0a8299b88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 15:55:47 +0900
Subject: [PATCH 05388/10326] Load more components asynchronously after pool
 resolution

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    |   1 -
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 129 ++++++++++--------
 2 files changed, 70 insertions(+), 60 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index a8212f7e59..00f62aa515 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -15,7 +15,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Threading;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 0bfec4f509..6717788506 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Select.Carousel
 
         private BeatmapSetInfo beatmapSet => (Item as CarouselBeatmapSet)?.BeatmapSet;
 
-        private Container<DrawableCarouselBeatmap> beatmapContainer;
+        private Container<DrawableCarouselItem> beatmapContainer;
         private Bindable<CarouselItemState> beatmapSetState;
 
         [Resolved]
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Select.Carousel
             // TODO: temporary. we probably want to *not* inherit DrawableCarouselItem for this class, but only the above header portion.
             AddRangeInternal(new Drawable[]
             {
-                beatmapContainer = new Container<DrawableCarouselBeatmap>
+                beatmapContainer = new Container<DrawableCarouselItem>
                 {
                     X = 50,
                     Y = MAX_HEIGHT,
@@ -81,62 +81,68 @@ namespace osu.Game.Screens.Select.Carousel
             Content.Children = new Drawable[]
             {
                 new DelayedLoadUnloadWrapper(() =>
-                    {
-                        var background = new PanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        };
-
-                        background.OnLoadComplete += d => d.FadeInFromZero(1000, Easing.OutQuint);
-
-                        return background;
-                    }, 300, 5000
-                ),
-                new FillFlowContainer
                 {
-                    Direction = FillDirection.Vertical,
-                    Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
-                    AutoSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    var background = new PanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
                     {
-                        new OsuSpriteText
+                        RelativeSizeAxes = Axes.Both,
+                    };
+
+                    background.OnLoadComplete += d => d.FadeInFromZero(1000, Easing.OutQuint);
+
+                    return background;
+                }, 300, 5000),
+                new DelayedLoadUnloadWrapper(() =>
+                {
+                    var mainFlow = new FillFlowContainer
+                    {
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
+                        AutoSizeAxes = Axes.Both,
+                        Children = new Drawable[]
                         {
-                            Text = new LocalisedString((beatmapSet.Metadata.TitleUnicode, beatmapSet.Metadata.Title)),
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 22, italics: true),
-                            Shadow = true,
-                        },
-                        new OsuSpriteText
-                        {
-                            Text = new LocalisedString((beatmapSet.Metadata.ArtistUnicode, beatmapSet.Metadata.Artist)),
-                            Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
-                            Shadow = true,
-                        },
-                        new FillFlowContainer
-                        {
-                            Direction = FillDirection.Horizontal,
-                            AutoSizeAxes = Axes.Both,
-                            Margin = new MarginPadding { Top = 5 },
-                            Children = new Drawable[]
+                            new OsuSpriteText
                             {
-                                new BeatmapSetOnlineStatusPill
+                                Text = new LocalisedString((beatmapSet.Metadata.TitleUnicode, beatmapSet.Metadata.Title)),
+                                Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 22, italics: true),
+                                Shadow = true,
+                            },
+                            new OsuSpriteText
+                            {
+                                Text = new LocalisedString((beatmapSet.Metadata.ArtistUnicode, beatmapSet.Metadata.Artist)),
+                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
+                                Shadow = true,
+                            },
+                            new FillFlowContainer
+                            {
+                                Direction = FillDirection.Horizontal,
+                                AutoSizeAxes = Axes.Both,
+                                Margin = new MarginPadding { Top = 5 },
+                                Children = new Drawable[]
                                 {
-                                    Origin = Anchor.CentreLeft,
-                                    Anchor = Anchor.CentreLeft,
-                                    Margin = new MarginPadding { Right = 5 },
-                                    TextSize = 11,
-                                    TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
-                                    Status = beatmapSet.Status
-                                },
-                                new FillFlowContainer<DifficultyIcon>
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Spacing = new Vector2(3),
-                                    ChildrenEnumerable = getDifficultyIcons(),
-                                },
+                                    new BeatmapSetOnlineStatusPill
+                                    {
+                                        Origin = Anchor.CentreLeft,
+                                        Anchor = Anchor.CentreLeft,
+                                        Margin = new MarginPadding { Right = 5 },
+                                        TextSize = 11,
+                                        TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
+                                        Status = beatmapSet.Status
+                                    },
+                                    new FillFlowContainer<DifficultyIcon>
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                        Spacing = new Vector2(3),
+                                        ChildrenEnumerable = getDifficultyIcons(),
+                                    },
+                                }
                             }
                         }
-                    }
-                }
+                    };
+
+                    mainFlow.OnLoadComplete += d => d.FadeInFromZero(1000, Easing.OutQuint);
+
+                    return mainFlow;
+                }, 100, 5000)
             };
 
             beatmapContainer.Clear();
@@ -155,19 +161,24 @@ namespace osu.Game.Screens.Select.Carousel
 
                 case CarouselItemState.Selected:
 
-                    float yPos = 0;
-
                     var carouselBeatmapSet = (CarouselBeatmapSet)Item;
 
-                    foreach (var item in carouselBeatmapSet.Children)
+                    LoadComponentsAsync(carouselBeatmapSet.Children.Select(c => c.CreateDrawableRepresentation()), loaded =>
                     {
-                        var beatmapPanel = item.CreateDrawableRepresentation();
+                        // make sure the pooled target hasn't changed.
+                        if (carouselBeatmapSet != Item)
+                            return;
 
-                        beatmapPanel.Y = yPos;
-                        yPos += item.TotalHeight;
+                        float yPos = 0;
 
-                        beatmapContainer.Add((DrawableCarouselBeatmap)beatmapPanel);
-                    }
+                        foreach (var item in loaded)
+                        {
+                            item.Y = yPos;
+                            yPos += item.Item.TotalHeight;
+
+                            beatmapContainer.Add(item);
+                        }
+                    });
 
                     break;
             }

From ca1f5dcada5affbb485c93c67716c400d8eb4f8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 18:11:41 +0900
Subject: [PATCH 05389/10326] Add back panel padding

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 00f62aa515..09c7322c58 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -676,6 +676,8 @@ namespace osu.Game.Screens.Select
             return set;
         }
 
+        private const float panel_padding = 5;
+
         /// <summary>
         /// Computes the target Y positions for every item in the carousel.
         /// </summary>
@@ -705,7 +707,7 @@ namespace osu.Game.Screens.Select
                         // TODO: move this logic to DCBS too.
                         // set.MoveToX(set.Item.State.Value == CarouselItemState.Selected ? -100 : 0, 500, Easing.OutExpo);
                         // set.MoveToY(currentY, 750, Easing.OutExpo);
-                        currentY += set.TotalHeight;
+                        currentY += set.TotalHeight + panel_padding;
                         break;
                     }
 

From 954d43ef56a67d01680fd6f551a78f0d3e2ee725 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 18:13:25 +0900
Subject: [PATCH 05390/10326] Debounce state application events

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index 4c4932c22a..4ba827de86 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -125,15 +125,15 @@ namespace osu.Game.Screens.Select.Carousel
             if (item == null)
                 return;
 
-            ApplyState();
+            Scheduler.AddOnce(ApplyState);
 
             Item.Filtered.ValueChanged += onStateChange;
             Item.State.ValueChanged += onStateChange;
         }
 
-        private void onStateChange(ValueChangedEvent<CarouselItemState> obj) => Schedule(ApplyState);
+        private void onStateChange(ValueChangedEvent<CarouselItemState> obj) => Scheduler.AddOnce(ApplyState);
 
-        private void onStateChange(ValueChangedEvent<bool> _) => Schedule(ApplyState);
+        private void onStateChange(ValueChangedEvent<bool> _) => Scheduler.AddOnce(ApplyState);
 
         protected virtual void ApplyState()
         {

From 3cfc0dc82daf6846090eb4b1db81b12e8f8527d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 18:13:39 +0900
Subject: [PATCH 05391/10326] Add safeties to beatmap panel loading code

---
 .../Carousel/DrawableCarouselBeatmapSet.cs       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 6717788506..f59a6a26e6 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -4,6 +4,7 @@
 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;
@@ -78,6 +79,9 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.UpdateItem();
 
+            beatmapContainer.Clear();
+            beatmapSetState?.UnbindAll();
+
             Content.Children = new Drawable[]
             {
                 new DelayedLoadUnloadWrapper(() =>
@@ -145,8 +149,6 @@ namespace osu.Game.Screens.Select.Carousel
                 }, 100, 5000)
             };
 
-            beatmapContainer.Clear();
-
             beatmapSetState = Item.State.GetBoundCopy();
             beatmapSetState.BindValueChanged(setSelected, true);
         }
@@ -156,14 +158,16 @@ namespace osu.Game.Screens.Select.Carousel
             switch (obj.NewValue)
             {
                 default:
-                    beatmapContainer.Clear();
+                    foreach (var beatmap in beatmapContainer)
+                        beatmap.FadeOut(50).Expire();
                     break;
 
                 case CarouselItemState.Selected:
 
                     var carouselBeatmapSet = (CarouselBeatmapSet)Item;
 
-                    LoadComponentsAsync(carouselBeatmapSet.Children.Select(c => c.CreateDrawableRepresentation()), loaded =>
+                    // ToArray() in this line is required due to framework oversight: https://github.com/ppy/osu-framework/pull/3929
+                    LoadComponentsAsync(carouselBeatmapSet.Children.Select(c => c.CreateDrawableRepresentation()).ToArray(), loaded =>
                     {
                         // make sure the pooled target hasn't changed.
                         if (carouselBeatmapSet != Item)
@@ -175,9 +179,9 @@ namespace osu.Game.Screens.Select.Carousel
                         {
                             item.Y = yPos;
                             yPos += item.Item.TotalHeight;
-
-                            beatmapContainer.Add(item);
                         }
+
+                        beatmapContainer.ChildrenEnumerable = loaded;
                     });
 
                     break;

From 5c2f1346658f1a5a8d624da91040ba80db69b7f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 18:19:10 +0900
Subject: [PATCH 05392/10326] Add back left offset for selected set

---
 osu.Game/Screens/Select/BeatmapCarousel.cs             | 10 ----------
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs      |  7 ++++---
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 09c7322c58..956b2977bd 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -702,20 +702,10 @@ namespace osu.Game.Screens.Select
                     {
                         visibleItems.Add(set);
                         yPositions.Add(currentY);
-                        //lastSet = set;
 
-                        // TODO: move this logic to DCBS too.
-                        // set.MoveToX(set.Item.State.Value == CarouselItemState.Selected ? -100 : 0, 500, Easing.OutExpo);
-                        // set.MoveToY(currentY, 750, Easing.OutExpo);
                         currentY += set.TotalHeight + panel_padding;
                         break;
                     }
-
-                    default:
-                        continue;
-                    //
-                    //     break;
-                    // }
                 }
             }
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index f59a6a26e6..d92077cf36 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -4,7 +4,6 @@
 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;
@@ -153,9 +152,11 @@ namespace osu.Game.Screens.Select.Carousel
             beatmapSetState.BindValueChanged(setSelected, true);
         }
 
-        private void setSelected(ValueChangedEvent<CarouselItemState> obj)
+        private void setSelected(ValueChangedEvent<CarouselItemState> selected)
         {
-            switch (obj.NewValue)
+            BorderContainer.MoveToX(selected.NewValue == CarouselItemState.Selected ? -100 : 0, 500, Easing.OutExpo);
+
+            switch (selected.NewValue)
             {
                 default:
                     foreach (var beatmap in beatmapContainer)

From 5c29aa8cce966d27c92963ded66e48878eb9f70e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 18:19:20 +0900
Subject: [PATCH 05393/10326] Fix multiple difficulties being expanded at once

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 4135960e06..656d1e39ba 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Selected();
 
-            BorderContainer.MoveToX(Item.State.Value == CarouselItemState.Selected ? -50 : 0, 500, Easing.OutExpo);
+            BorderContainer.MoveToX(-50, 500, Easing.OutExpo);
 
             background.Colour = ColourInfo.GradientVertical(
                 new Color4(20, 43, 51, 255),
@@ -185,6 +185,8 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Deselected();
 
+            BorderContainer.MoveToX(0, 500, Easing.OutExpo);
+
             background.Colour = new Color4(20, 43, 51, 255);
             triangles.Colour = OsuColour.Gray(0.5f);
         }

From c5a6f4b453f241b9269bc31fe183ae6888e2cf26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 18:32:29 +0900
Subject: [PATCH 05394/10326] Fix scroll to selected beatmap

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 25 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 956b2977bd..9f5ee22106 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -604,12 +604,7 @@ namespace osu.Game.Screens.Select
             // Update externally controlled state of currently visible items
             // (e.g. x-offset and opacity).
             foreach (DrawableCarouselItem p in scrollableContent.Children)
-            {
                 updateItem(p);
-
-                // foreach (var pChild in p.ChildItems)
-                //     updateItem(pChild, p);
-            }
         }
 
         protected override void UpdateAfterChildren()
@@ -703,6 +698,26 @@ namespace osu.Game.Screens.Select
                         visibleItems.Add(set);
                         yPositions.Add(currentY);
 
+                        if (item.State.Value == CarouselItemState.Selected)
+                        {
+                            // scroll position at currentY makes the set panel appear at the very top of the carousel's screen space
+                            // move down by half of visible height (height of the carousel's visible extent, including semi-transparent areas)
+                            // then reapply the top semi-transparent area (because carousel's screen space starts below it)
+                            // and finally add half of the panel's own height to achieve vertical centering of the panel itself
+                            scrollTarget = currentY + DrawableCarouselBeatmapSet.HEIGHT - visibleHalfHeight + BleedTop;
+
+                            foreach (var b in set.Beatmaps)
+                            {
+                                if (b.State.Value == CarouselItemState.Selected)
+                                {
+                                    scrollTarget += b.TotalHeight / 2;
+                                    break;
+                                }
+
+                                scrollTarget += b.TotalHeight;
+                            }
+                        }
+
                         currentY += set.TotalHeight + panel_padding;
                         break;
                     }

From 0a144a1388df5ac6849ffc7e4d31bf304c77cff2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 18:50:10 +0900
Subject: [PATCH 05395/10326] Correctly free panels after use to avoid
 finalizer disposal of subtree

---
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index d92077cf36..1cdc496af8 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -53,6 +53,12 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved]
         private BeatmapManager manager { get; set; }
 
+        protected override void FreeAfterUse()
+        {
+            base.FreeAfterUse();
+            Item = null;
+        }
+
         [BackgroundDependencyLoader(true)]
         private void load(BeatmapSetOverlay beatmapOverlay)
         {
@@ -81,6 +87,9 @@ namespace osu.Game.Screens.Select.Carousel
             beatmapContainer.Clear();
             beatmapSetState?.UnbindAll();
 
+            if (Item == null)
+                return;
+
             Content.Children = new Drawable[]
             {
                 new DelayedLoadUnloadWrapper(() =>

From 524419d5e4ebff561ed99d332e666732a6479eaa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 19:02:08 +0900
Subject: [PATCH 05396/10326] Fix filtered items being considered for height
 calculation

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

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 15f622f3c4..7935debac7 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Select.Carousel
                 switch (State.Value)
                 {
                     case CarouselItemState.Selected:
-                        return DrawableCarouselBeatmapSet.HEIGHT + Children.Count * DrawableCarouselBeatmap.HEIGHT;
+                        return DrawableCarouselBeatmapSet.HEIGHT + Children.Count(c => c.Visible) * DrawableCarouselBeatmap.HEIGHT;
 
                     default:
                         return DrawableCarouselBeatmapSet.HEIGHT;

From bb03c5d77c15d0b0230e2ce8ef1ec7f67d15a483 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 19:11:02 +0900
Subject: [PATCH 05397/10326] Temporarily disable masking temporarily to fix
 panels disappearing at extents

---
 osu.Game/Screens/Select/BeatmapCarousel.cs                    | 2 +-
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 9f5ee22106..20a36dbdc5 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -571,7 +571,7 @@ namespace osu.Game.Screens.Select
                 updateItems();
 
             // Remove all items that should no longer be on-screen
-            scrollableContent.RemoveAll(p => p.Y < visibleUpperBound - p.DrawHeight || p.Y > visibleBottomBound || !p.IsPresent);
+            //scrollableContent.RemoveAll(p => p.Y < visibleUpperBound - p.DrawHeight || p.Y > visibleBottomBound || !p.IsPresent);
 
             // Find index range of all items that should be on-screen
             int firstIndex = yPositions.BinarySearch(visibleUpperBound - DrawableCarouselItem.MAX_HEIGHT);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 1cdc496af8..daee7abcc0 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
@@ -31,6 +32,9 @@ namespace osu.Game.Screens.Select.Carousel
     {
         public const float HEIGHT = MAX_HEIGHT;
 
+        // TODO: don't do this. need to split out the base class' style so our height isn't fixed to the panel display height (and autosize?).
+        protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
+
         private Action<BeatmapSetInfo> restoreHiddenRequested;
         private Action<int> viewDetails;
 

From 15325f5f510da118d146fa7543b2dff3d4a1406e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 19:12:00 +0900
Subject: [PATCH 05398/10326] Base bounds checks on +1 (to avoid worrying about
 current item heights)

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 20a36dbdc5..3c3804389b 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -574,11 +574,16 @@ namespace osu.Game.Screens.Select
             //scrollableContent.RemoveAll(p => p.Y < visibleUpperBound - p.DrawHeight || p.Y > visibleBottomBound || !p.IsPresent);
 
             // Find index range of all items that should be on-screen
-            int firstIndex = yPositions.BinarySearch(visibleUpperBound - DrawableCarouselItem.MAX_HEIGHT);
+            int firstIndex = yPositions.BinarySearch(visibleUpperBound);
             if (firstIndex < 0) firstIndex = ~firstIndex;
             int lastIndex = yPositions.BinarySearch(visibleBottomBound);
             if (lastIndex < 0) lastIndex = ~lastIndex;
 
+            // as we can't be 100% sure on the size of individual carousel drawables,
+            // always play it safe and extend bounds by one.
+            firstIndex = Math.Max(0, firstIndex - 1);
+            lastIndex = Math.Min(yPositions.Count - 1, lastIndex + 1);
+
             if (revalidateItems || firstIndex != displayedRange.first || lastIndex != displayedRange.last)
             {
                 displayedRange = (firstIndex, lastIndex);

From 8847cedf296f633008e3b7d8a38f90d8606f9fb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 19:55:17 +0900
Subject: [PATCH 05399/10326] Add initial pass of vertical transforms

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 26 +++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 3c3804389b..9c49f4bf67 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -566,12 +566,8 @@ namespace osu.Game.Screens.Select
 
             bool revalidateItems = !itemsCache.IsValid;
 
-            //todo: this should only refresh items, not everything here
             if (revalidateItems)
-                updateItems();
-
-            // Remove all items that should no longer be on-screen
-            //scrollableContent.RemoveAll(p => p.Y < visibleUpperBound - p.DrawHeight || p.Y > visibleBottomBound || !p.IsPresent);
+                updateYPositions();
 
             // Find index range of all items that should be on-screen
             int firstIndex = yPositions.BinarySearch(visibleUpperBound);
@@ -586,6 +582,9 @@ namespace osu.Game.Screens.Select
 
             if (revalidateItems || firstIndex != displayedRange.first || lastIndex != displayedRange.last)
             {
+                // Remove all items that should no longer be on-screen
+                scrollableContent.RemoveAll(p => p.Y + p.Item.TotalHeight < visibleUpperBound || p.Y > visibleBottomBound);
+
                 displayedRange = (firstIndex, lastIndex);
 
                 // Add those items within the previously found index range that should be displayed.
@@ -598,11 +597,22 @@ namespace osu.Game.Screens.Select
                     if (panel == null)
                     {
                         panel = setPool.Get(p => p.Item = item);
+                        panel.Y = yPositions[i];
+                        panel.Depth = i;
+
+                        panel.ClearTransforms();
+
                         scrollableContent.Add(panel);
                     }
+                    else
+                    {
+                        if (panel.IsPresent)
+                            panel.MoveToY(yPositions[i], 800, Easing.OutQuint);
+                        else
+                            panel.Y = yPositions[i];
 
-                    panel.Y = yPositions[i];
-                    scrollableContent.ChangeChildDepth(panel, i);
+                        scrollableContent.ChangeChildDepth(panel, i);
+                    }
                 }
             }
 
@@ -682,7 +692,7 @@ namespace osu.Game.Screens.Select
         /// Computes the target Y positions for every item in the carousel.
         /// </summary>
         /// <returns>The Y position of the currently selected item.</returns>
-        private void updateItems()
+        private void updateYPositions()
         {
             yPositions.Clear();
             visibleItems.Clear();

From 813ee1972895350f5ea563e5929acc4f5ca52659 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 19:55:33 +0900
Subject: [PATCH 05400/10326] Use existing event flow for rendering beatmap
 difficulties

---
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index daee7abcc0..f03b6fff4a 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -52,7 +52,6 @@ namespace osu.Game.Screens.Select.Carousel
         private BeatmapSetInfo beatmapSet => (Item as CarouselBeatmapSet)?.BeatmapSet;
 
         private Container<DrawableCarouselItem> beatmapContainer;
-        private Bindable<CarouselItemState> beatmapSetState;
 
         [Resolved]
         private BeatmapManager manager { get; set; }
@@ -89,7 +88,6 @@ namespace osu.Game.Screens.Select.Carousel
             base.UpdateItem();
 
             beatmapContainer.Clear();
-            beatmapSetState?.UnbindAll();
 
             if (Item == null)
                 return;
@@ -160,46 +158,48 @@ namespace osu.Game.Screens.Select.Carousel
                     return mainFlow;
                 }, 100, 5000)
             };
-
-            beatmapSetState = Item.State.GetBoundCopy();
-            beatmapSetState.BindValueChanged(setSelected, true);
         }
 
-        private void setSelected(ValueChangedEvent<CarouselItemState> selected)
+        protected override void Deselected()
         {
-            BorderContainer.MoveToX(selected.NewValue == CarouselItemState.Selected ? -100 : 0, 500, Easing.OutExpo);
+            base.Deselected();
 
-            switch (selected.NewValue)
+            BorderContainer.MoveToX(0, 500, Easing.OutExpo);
+
+            foreach (var beatmap in beatmapContainer)
+                beatmap.FadeOut(50).Expire();
+        }
+
+        protected override void Selected()
+        {
+            base.Selected();
+
+            BorderContainer.MoveToX(-100, 500, Easing.OutExpo);
+
+            var carouselBeatmapSet = (CarouselBeatmapSet)Item;
+
+            // ToArray() in this line is required due to framework oversight: https://github.com/ppy/osu-framework/pull/3929
+            var visibleBeatmaps = carouselBeatmapSet.Children
+                                                    .Where(c => c.Visible)
+                                                    .Select(c => c.CreateDrawableRepresentation())
+                                                    .ToArray();
+
+            LoadComponentsAsync(visibleBeatmaps, loaded =>
             {
-                default:
-                    foreach (var beatmap in beatmapContainer)
-                        beatmap.FadeOut(50).Expire();
-                    break;
+                // make sure the pooled target hasn't changed.
+                if (carouselBeatmapSet != Item)
+                    return;
 
-                case CarouselItemState.Selected:
+                float yPos = 0;
 
-                    var carouselBeatmapSet = (CarouselBeatmapSet)Item;
+                foreach (var item in loaded)
+                {
+                    item.Y = yPos;
+                    yPos += item.Item.TotalHeight;
+                }
 
-                    // ToArray() in this line is required due to framework oversight: https://github.com/ppy/osu-framework/pull/3929
-                    LoadComponentsAsync(carouselBeatmapSet.Children.Select(c => c.CreateDrawableRepresentation()).ToArray(), loaded =>
-                    {
-                        // make sure the pooled target hasn't changed.
-                        if (carouselBeatmapSet != Item)
-                            return;
-
-                        float yPos = 0;
-
-                        foreach (var item in loaded)
-                        {
-                            item.Y = yPos;
-                            yPos += item.Item.TotalHeight;
-                        }
-
-                        beatmapContainer.ChildrenEnumerable = loaded;
-                    });
-
-                    break;
-            }
+                beatmapContainer.ChildrenEnumerable = loaded;
+            });
         }
 
         private const int maximum_difficulty_icons = 18;

From 82f9ca3de98d1cef76f64a6c67217384e4700460 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 20:02:06 +0900
Subject: [PATCH 05401/10326] Bind to filter event changes in base drawable
 item

---
 .../Screens/Select/Carousel/DrawableCarouselItem.cs  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index 4ba827de86..8cf63d184c 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -40,6 +40,12 @@ namespace osu.Game.Screens.Select.Carousel
                 {
                     Item.Filtered.ValueChanged -= onStateChange;
                     Item.State.ValueChanged -= onStateChange;
+
+                    if (item is CarouselGroup group)
+                    {
+                        foreach (var c in group.Children)
+                            c.Filtered.ValueChanged -= onStateChange;
+                    }
                 }
 
                 item = value;
@@ -129,6 +135,12 @@ namespace osu.Game.Screens.Select.Carousel
 
             Item.Filtered.ValueChanged += onStateChange;
             Item.State.ValueChanged += onStateChange;
+
+            if (Item is CarouselGroup group)
+            {
+                foreach (var c in group.Children)
+                    c.Filtered.ValueChanged += onStateChange;
+            }
         }
 
         private void onStateChange(ValueChangedEvent<CarouselItemState> obj) => Scheduler.AddOnce(ApplyState);

From 220c8ba2c47a8f9ffc0df5cca1f1b465088c0838 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 20:02:45 +0900
Subject: [PATCH 05402/10326] Fix incorrect vertical offsets when difficulties
 are filtered away

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 9c49f4bf67..79ad9c4584 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -723,6 +723,9 @@ namespace osu.Game.Screens.Select
 
                             foreach (var b in set.Beatmaps)
                             {
+                                if (!b.Visible)
+                                    continue;
+
                                 if (b.State.Value == CarouselItemState.Selected)
                                 {
                                     scrollTarget += b.TotalHeight / 2;

From ce67f6508477ba96726bbb0c92e8397333fb030d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 20:11:10 +0900
Subject: [PATCH 05403/10326] Fix single results not showing up

---
 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 79ad9c4584..9e295b6f53 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -578,7 +578,7 @@ namespace osu.Game.Screens.Select
             // as we can't be 100% sure on the size of individual carousel drawables,
             // always play it safe and extend bounds by one.
             firstIndex = Math.Max(0, firstIndex - 1);
-            lastIndex = Math.Min(yPositions.Count - 1, lastIndex + 1);
+            lastIndex = Math.Min(yPositions.Count, lastIndex + 1);
 
             if (revalidateItems || firstIndex != displayedRange.first || lastIndex != displayedRange.last)
             {

From fd8654cff3c9343a78cdda2749f5f5a26d293846 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Oct 2020 20:26:20 +0900
Subject: [PATCH 05404/10326] Add back difficulty panel spacing

---
 osu.Game/Screens/Select/BeatmapCarousel.cs                    | 2 +-
 osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs        | 2 +-
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs   | 4 +++-
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs     | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 9e295b6f53..04af07846f 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -732,7 +732,7 @@ namespace osu.Game.Screens.Select
                                     break;
                                 }
 
-                                scrollTarget += b.TotalHeight;
+                                scrollTarget += b.TotalHeight + DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
                             }
                         }
 
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 7935debac7..f2f8cb9bd9 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Select.Carousel
                 switch (State.Value)
                 {
                     case CarouselItemState.Selected:
-                        return DrawableCarouselBeatmapSet.HEIGHT + Children.Count(c => c.Visible) * DrawableCarouselBeatmap.HEIGHT;
+                        return DrawableCarouselBeatmapSet.HEIGHT + Children.Count(c => c.Visible) * (DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING + DrawableCarouselBeatmap.HEIGHT);
 
                     default:
                         return DrawableCarouselBeatmapSet.HEIGHT;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 656d1e39ba..23404a6c6e 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -31,7 +31,9 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class DrawableCarouselBeatmap : DrawableCarouselItem, IHasContextMenu
     {
-        public const float HEIGHT = MAX_HEIGHT * 0.6f;
+        public const float CAROUSEL_BEATMAP_SPACING = 5;
+
+        public const float HEIGHT = MAX_HEIGHT * 0.6f; // TODO: add once base class is fixed + CAROUSEL_BEATMAP_SPACING;
 
         private readonly BeatmapInfo beatmap;
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index f03b6fff4a..20e6258433 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -190,12 +190,12 @@ namespace osu.Game.Screens.Select.Carousel
                 if (carouselBeatmapSet != Item)
                     return;
 
-                float yPos = 0;
+                float yPos = DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
 
                 foreach (var item in loaded)
                 {
                     item.Y = yPos;
-                    yPos += item.Item.TotalHeight;
+                    yPos += item.Item.TotalHeight + DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
                 }
 
                 beatmapContainer.ChildrenEnumerable = loaded;

From 975cd5a84021b5320207e0bfb7ce0d46c6757aa5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 12:47:12 +0900
Subject: [PATCH 05405/10326] Add back beatmap difficulty appear/disappear
 movement

---
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 20e6258433..660d5d5b31 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -167,7 +167,10 @@ namespace osu.Game.Screens.Select.Carousel
             BorderContainer.MoveToX(0, 500, Easing.OutExpo);
 
             foreach (var beatmap in beatmapContainer)
-                beatmap.FadeOut(50).Expire();
+            {
+                beatmap.MoveToY(0, 800, Easing.OutQuint);
+                beatmap.FadeOut(80).Expire();
+            }
         }
 
         protected override void Selected()
@@ -176,6 +179,9 @@ namespace osu.Game.Screens.Select.Carousel
 
             BorderContainer.MoveToX(-100, 500, Easing.OutExpo);
 
+            // on selection we show our child beatmaps.
+            // for now this is a simple drawable construction each selection.
+            // can be improved in the future.
             var carouselBeatmapSet = (CarouselBeatmapSet)Item;
 
             // ToArray() in this line is required due to framework oversight: https://github.com/ppy/osu-framework/pull/3929
@@ -190,15 +196,15 @@ namespace osu.Game.Screens.Select.Carousel
                 if (carouselBeatmapSet != Item)
                     return;
 
+                beatmapContainer.ChildrenEnumerable = loaded;
+
                 float yPos = DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
 
                 foreach (var item in loaded)
                 {
-                    item.Y = yPos;
+                    item.MoveToY(yPos, 800, Easing.OutQuint);
                     yPos += item.Item.TotalHeight + DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
                 }
-
-                beatmapContainer.ChildrenEnumerable = loaded;
             });
         }
 

From 9814e9ba7f098a4dfd78bb6ae3770e20c87592ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 12:50:39 +0900
Subject: [PATCH 05406/10326] Split classes out to reduce loc burder on
 DrawableCarouselBeatmapSet

---
 .../SongSelect/TestScenePlaySongSelect.cs     |  22 ++--
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 117 ------------------
 .../Carousel/FilterableDifficultyIcon.cs      |  32 +++++
 .../FilterableGroupedDifficultyIcon.cs        |  38 ++++++
 .../Select/Carousel/PanelBackground.cs        |  69 +++++++++++
 5 files changed, 150 insertions(+), 128 deletions(-)
 create mode 100644 osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs
 create mode 100644 osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs
 create mode 100644 osu.Game/Screens/Select/Carousel/PanelBackground.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 0299b7a084..cd97ffe9e7 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -507,7 +507,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 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 =>
+                return selectedPanel.ChildrenOfType<FilterableDifficultyIcon>().All(i =>
                     i.IsFiltered || i.Item.Beatmap.Ruleset.ID == targetRuleset || i.Item.Beatmap.Ruleset.ID == 0);
             });
 
@@ -606,10 +606,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 set = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First();
             });
 
-            DrawableCarouselBeatmapSet.FilterableDifficultyIcon difficultyIcon = null;
+            FilterableDifficultyIcon difficultyIcon = null;
             AddStep("Find an icon", () =>
             {
-                difficultyIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>()
+                difficultyIcon = set.ChildrenOfType<FilterableDifficultyIcon>()
                                     .First(icon => getDifficultyIconIndex(set, icon) != getCurrentBeatmapIndex());
             });
 
@@ -634,13 +634,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             }));
 
             BeatmapInfo filteredBeatmap = null;
-            DrawableCarouselBeatmapSet.FilterableDifficultyIcon filteredIcon = null;
+            FilterableDifficultyIcon filteredIcon = null;
 
             AddStep("Get filtered icon", () =>
             {
                 filteredBeatmap = songSelect.Carousel.SelectedBeatmapSet.Beatmaps.First(b => b.BPM < maxBPM);
                 int filteredBeatmapIndex = getBeatmapIndex(filteredBeatmap.BeatmapSet, filteredBeatmap);
-                filteredIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>().ElementAt(filteredBeatmapIndex);
+                filteredIcon = set.ChildrenOfType<FilterableDifficultyIcon>().ElementAt(filteredBeatmapIndex);
             });
 
             AddStep("Click on a filtered difficulty", () =>
@@ -674,10 +674,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 return set != null;
             });
 
-            DrawableCarouselBeatmapSet.FilterableDifficultyIcon difficultyIcon = null;
+            FilterableDifficultyIcon difficultyIcon = null;
             AddStep("Find an icon for different ruleset", () =>
             {
-                difficultyIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>()
+                difficultyIcon = set.ChildrenOfType<FilterableDifficultyIcon>()
                                     .First(icon => icon.Item.Beatmap.Ruleset.ID == 3);
             });
 
@@ -725,10 +725,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 return set != null;
             });
 
-            DrawableCarouselBeatmapSet.FilterableGroupedDifficultyIcon groupIcon = null;
+            FilterableGroupedDifficultyIcon groupIcon = null;
             AddStep("Find group icon for different ruleset", () =>
             {
-                groupIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableGroupedDifficultyIcon>()
+                groupIcon = set.ChildrenOfType<FilterableGroupedDifficultyIcon>()
                                .First(icon => icon.Items.First().Beatmap.Ruleset.ID == 3);
             });
 
@@ -821,9 +821,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private int getCurrentBeatmapIndex() => getBeatmapIndex(songSelect.Carousel.SelectedBeatmapSet, songSelect.Carousel.SelectedBeatmap);
 
-        private int getDifficultyIconIndex(DrawableCarouselBeatmapSet set, DrawableCarouselBeatmapSet.FilterableDifficultyIcon icon)
+        private int getDifficultyIconIndex(DrawableCarouselBeatmapSet set, FilterableDifficultyIcon icon)
         {
-            return set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>().ToList().FindIndex(i => i == icon);
+            return set.ChildrenOfType<FilterableDifficultyIcon>().ToList().FindIndex(i => i == icon);
         }
 
         private void addRulesetImportStep(int id) => AddStep($"import test map for ruleset {id}", () => importForRuleset(id));
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 660d5d5b31..8ab7a054ff 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -5,15 +5,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.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Primitives;
-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;
@@ -22,9 +18,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
-using osu.Game.Rulesets;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Select.Carousel
 {
@@ -285,116 +279,5 @@ namespace osu.Game.Screens.Select.Carousel
                 State = { Value = state }
             };
         }
-
-        private class PanelBackground : BufferedContainer
-        {
-            public PanelBackground(WorkingBeatmap working)
-            {
-                CacheDrawnFrameBuffer = true;
-                RedrawOnScale = false;
-
-                Children = new Drawable[]
-                {
-                    new BeatmapBackgroundSprite(working)
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        FillMode = FillMode.Fill,
-                    },
-                    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,
-                        Children = new[]
-                        {
-                            // The left half with no gradient applied
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.Black,
-                                Width = 0.4f,
-                            },
-                            // Piecewise-linear gradient with 3 segments to make it appear smoother
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.9f)),
-                                Width = 0.05f,
-                            },
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.9f), new Color4(0f, 0f, 0f, 0.1f)),
-                                Width = 0.2f,
-                            },
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.1f), new Color4(0, 0, 0, 0)),
-                                Width = 0.05f,
-                            },
-                        }
-                    },
-                };
-            }
-        }
-
-        public class FilterableDifficultyIcon : DifficultyIcon
-        {
-            private readonly BindableBool filtered = new BindableBool();
-
-            public bool IsFiltered => filtered.Value;
-
-            public readonly CarouselBeatmap Item;
-
-            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();
-
-                Item = item;
-            }
-
-            protected override bool OnClick(ClickEvent e)
-            {
-                Item.State.Value = CarouselItemState.Selected;
-                return true;
-            }
-        }
-
-        public class FilterableGroupedDifficultyIcon : GroupedDifficultyIcon
-        {
-            public readonly List<CarouselBeatmap> Items;
-
-            public FilterableGroupedDifficultyIcon(List<CarouselBeatmap> items, RulesetInfo ruleset)
-                : base(items.Select(i => i.Beatmap).ToList(), ruleset, Color4.White)
-            {
-                Items = items;
-
-                foreach (var item in items)
-                    item.Filtered.BindValueChanged(_ => Scheduler.AddOnce(updateFilteredDisplay));
-
-                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);
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs b/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs
new file mode 100644
index 0000000000..591e9fea22
--- /dev/null
+++ b/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs
@@ -0,0 +1,32 @@
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
+using osu.Game.Beatmaps.Drawables;
+
+namespace osu.Game.Screens.Select.Carousel
+{
+    public class FilterableDifficultyIcon : DifficultyIcon
+    {
+        private readonly BindableBool filtered = new BindableBool();
+
+        public bool IsFiltered => filtered.Value;
+
+        public readonly CarouselBeatmap Item;
+
+        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();
+
+            Item = item;
+        }
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            Item.State.Value = CarouselItemState.Selected;
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs b/osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs
new file mode 100644
index 0000000000..73b5781a37
--- /dev/null
+++ b/osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Rulesets;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Select.Carousel
+{
+    public class FilterableGroupedDifficultyIcon : GroupedDifficultyIcon
+    {
+        public readonly List<CarouselBeatmap> Items;
+
+        public FilterableGroupedDifficultyIcon(List<CarouselBeatmap> items, RulesetInfo ruleset)
+            : base(items.Select(i => i.Beatmap).ToList(), ruleset, Color4.White)
+        {
+            Items = items;
+
+            foreach (var item in items)
+                item.Filtered.BindValueChanged(_ => Scheduler.AddOnce(updateFilteredDisplay));
+
+            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);
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Screens/Select/Carousel/PanelBackground.cs b/osu.Game/Screens/Select/Carousel/PanelBackground.cs
new file mode 100644
index 0000000000..587aa0a74e
--- /dev/null
+++ b/osu.Game/Screens/Select/Carousel/PanelBackground.cs
@@ -0,0 +1,69 @@
+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.Beatmaps.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Select.Carousel
+{
+    public class PanelBackground : BufferedContainer
+    {
+        public PanelBackground(WorkingBeatmap working)
+        {
+            CacheDrawnFrameBuffer = true;
+            RedrawOnScale = false;
+
+            Children = new Drawable[]
+            {
+                new BeatmapBackgroundSprite(working)
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    FillMode = FillMode.Fill,
+                },
+                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,
+                    Children = new[]
+                    {
+                        // The left half with no gradient applied
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.Black,
+                            Width = 0.4f,
+                        },
+                        // Piecewise-linear gradient with 3 segments to make it appear smoother
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.9f)),
+                            Width = 0.05f,
+                        },
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.9f), new Color4(0f, 0f, 0f, 0.1f)),
+                            Width = 0.2f,
+                        },
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.1f), new Color4(0, 0, 0, 0)),
+                            Width = 0.05f,
+                        },
+                    }
+                },
+            };
+        }
+    }
+}

From b92c22ad42af399e43a40bfe6703790a4ce75ff6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 13:11:47 +0900
Subject: [PATCH 05407/10326] Add logging

---
 osu.Game/Screens/Select/BeatmapCarousel.cs                    | 4 ++++
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs     | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 04af07846f..78012e8bfd 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -18,6 +18,7 @@ using osu.Framework.Threading;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Extensions;
 using osu.Game.Graphics.Containers;
@@ -582,6 +583,8 @@ namespace osu.Game.Screens.Select
 
             if (revalidateItems || firstIndex != displayedRange.first || lastIndex != displayedRange.last)
             {
+                Logger.Log("revalidation requested");
+
                 // Remove all items that should no longer be on-screen
                 scrollableContent.RemoveAll(p => p.Y + p.Item.TotalHeight < visibleUpperBound || p.Y > visibleBottomBound);
 
@@ -596,6 +599,7 @@ namespace osu.Game.Screens.Select
 
                     if (panel == null)
                     {
+                        Logger.Log($"getting panel for {item} from pool");
                         panel = setPool.Get(p => p.Item = item);
                         panel.Y = yPositions[i];
                         panel.Depth = i;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 8ab7a054ff..fed32b5849 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Collections;
@@ -86,10 +87,12 @@ namespace osu.Game.Screens.Select.Carousel
             if (Item == null)
                 return;
 
+            Logger.Log($"updating item {beatmapSet}");
             Content.Children = new Drawable[]
             {
                 new DelayedLoadUnloadWrapper(() =>
                 {
+                    Logger.Log($"loaded background item {beatmapSet}");
                     var background = new PanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
                     {
                         RelativeSizeAxes = Axes.Both,

From f6aa448523b5e5fafe2c694d215671c08cd431df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 13:21:21 +0900
Subject: [PATCH 05408/10326] Store y positions inside items rather than in a
 separate array

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 54 +++++++++++++------
 .../Screens/Select/Carousel/CarouselItem.cs   | 10 +++-
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 78012e8bfd..87e930fe8a 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -116,7 +116,6 @@ namespace osu.Game.Screens.Select
             });
         }
 
-        private readonly List<float> yPositions = new List<float>();
         private readonly List<CarouselItem> visibleItems = new List<CarouselItem>();
 
         private readonly Cached itemsCache = new Cached();
@@ -570,23 +569,15 @@ namespace osu.Game.Screens.Select
             if (revalidateItems)
                 updateYPositions();
 
-            // Find index range of all items that should be on-screen
-            int firstIndex = yPositions.BinarySearch(visibleUpperBound);
-            if (firstIndex < 0) firstIndex = ~firstIndex;
-            int lastIndex = yPositions.BinarySearch(visibleBottomBound);
-            if (lastIndex < 0) lastIndex = ~lastIndex;
-
-            // as we can't be 100% sure on the size of individual carousel drawables,
-            // always play it safe and extend bounds by one.
-            firstIndex = Math.Max(0, firstIndex - 1);
-            lastIndex = Math.Min(yPositions.Count, lastIndex + 1);
+            var (firstIndex, lastIndex) = getDisplayRange();
 
             if (revalidateItems || firstIndex != displayedRange.first || lastIndex != displayedRange.last)
             {
                 Logger.Log("revalidation requested");
 
                 // Remove all items that should no longer be on-screen
-                scrollableContent.RemoveAll(p => p.Y + p.Item.TotalHeight < visibleUpperBound || p.Y > visibleBottomBound);
+                // TODO: figure out a more resilient way of doing this removal.
+                // scrollableContent.RemoveAll(p => p.Y + p.Item.TotalHeight < visibleUpperBound || p.Y > visibleBottomBound);
 
                 displayedRange = (firstIndex, lastIndex);
 
@@ -601,7 +592,7 @@ namespace osu.Game.Screens.Select
                     {
                         Logger.Log($"getting panel for {item} from pool");
                         panel = setPool.Get(p => p.Item = item);
-                        panel.Y = yPositions[i];
+                        panel.Y = item.CarouselYPosition;
                         panel.Depth = i;
 
                         panel.ClearTransforms();
@@ -611,9 +602,9 @@ namespace osu.Game.Screens.Select
                     else
                     {
                         if (panel.IsPresent)
-                            panel.MoveToY(yPositions[i], 800, Easing.OutQuint);
+                            panel.MoveToY(item.CarouselYPosition, 800, Easing.OutQuint);
                         else
-                            panel.Y = yPositions[i];
+                            panel.Y = item.CarouselYPosition;
 
                         scrollableContent.ChangeChildDepth(panel, i);
                     }
@@ -626,6 +617,22 @@ namespace osu.Game.Screens.Select
                 updateItem(p);
         }
 
+        private (int firstIndex, int lastIndex) getDisplayRange()
+        {
+            // Find index range of all items that should be on-screen
+            // TODO: reduce allocs of CarouselBoundsItem.
+            int firstIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleUpperBound));
+            if (firstIndex < 0) firstIndex = ~firstIndex;
+            int lastIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleBottomBound));
+            if (lastIndex < 0) lastIndex = ~lastIndex;
+
+            // as we can't be 100% sure on the size of individual carousel drawables,
+            // always play it safe and extend bounds by one.
+            firstIndex = Math.Max(0, firstIndex - 1);
+            lastIndex = Math.Min(visibleItems.Count, lastIndex + 1);
+            return (firstIndex, lastIndex);
+        }
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
@@ -698,7 +705,6 @@ namespace osu.Game.Screens.Select
         /// <returns>The Y position of the currently selected item.</returns>
         private void updateYPositions()
         {
-            yPositions.Clear();
             visibleItems.Clear();
 
             float currentY = visibleHalfHeight;
@@ -715,7 +721,7 @@ namespace osu.Game.Screens.Select
                     case CarouselBeatmapSet set:
                     {
                         visibleItems.Add(set);
-                        yPositions.Add(currentY);
+                        set.CarouselYPosition = currentY;
 
                         if (item.State.Value == CarouselItemState.Selected)
                         {
@@ -815,6 +821,20 @@ namespace osu.Game.Screens.Select
             p.SetMultiplicativeAlpha(Math.Clamp(1.75f - 1.5f * dist, 0, 1));
         }
 
+        /// <summary>
+        /// A carousel item strictly used for binary search purposes.
+        /// </summary>
+        private class CarouselBoundsItem : CarouselItem
+        {
+            public CarouselBoundsItem(in float pos)
+            {
+                CarouselYPosition = pos;
+            }
+
+            public override DrawableCarouselItem CreateDrawableRepresentation() =>
+                throw new NotImplementedException();
+        }
+
         private class CarouselRoot : CarouselGroupEagerSelect
         {
             private readonly BeatmapCarousel carousel;
diff --git a/osu.Game/Screens/Select/Carousel/CarouselItem.cs b/osu.Game/Screens/Select/Carousel/CarouselItem.cs
index 004d9779ef..4bd477412d 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselItem.cs
@@ -1,14 +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 osu.Framework.Bindables;
 
 namespace osu.Game.Screens.Select.Carousel
 {
-    public abstract class CarouselItem
+    public abstract class CarouselItem : IComparable<CarouselItem>
     {
         public virtual float TotalHeight => 0;
 
+        /// <summary>
+        /// An externally defined value used to determine this item's vertical display offset relative to the carousel.
+        /// </summary>
+        public float CarouselYPosition;
+
         public readonly BindableBool Filtered = new BindableBool();
 
         public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
@@ -42,6 +48,8 @@ namespace osu.Game.Screens.Select.Carousel
         }
 
         public virtual int CompareTo(FilterCriteria criteria, CarouselItem other) => ChildID.CompareTo(other.ChildID);
+
+        public int CompareTo(CarouselItem other) => CarouselYPosition.CompareTo(other.CarouselYPosition);
     }
 
     public enum CarouselItemState

From 20b54fb904957a208adb2fdbdfb9351f6a3ebe73 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 13:25:45 +0900
Subject: [PATCH 05409/10326] Move transform clean-up to pooling free call

---
 osu.Game/Screens/Select/BeatmapCarousel.cs                     | 2 --
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 87e930fe8a..c15652b132 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -595,8 +595,6 @@ namespace osu.Game.Screens.Select
                         panel.Y = item.CarouselYPosition;
                         panel.Depth = i;
 
-                        panel.ClearTransforms();
-
                         scrollableContent.Add(panel);
                     }
                     else
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index fed32b5849..635eb6f375 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -54,7 +54,9 @@ namespace osu.Game.Screens.Select.Carousel
         protected override void FreeAfterUse()
         {
             base.FreeAfterUse();
+
             Item = null;
+            ClearTransforms();
         }
 
         [BackgroundDependencyLoader(true)]

From 06e84c8eb3137c451fa0595fb5b55e92cbb9368f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 13:44:32 +0900
Subject: [PATCH 05410/10326] Add comments and split out update steps into a
 more logical flow

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 57 ++++++++++++----------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index c15652b132..ad2c4c2ca8 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -566,53 +566,56 @@ namespace osu.Game.Screens.Select
 
             bool revalidateItems = !itemsCache.IsValid;
 
+            // First we iterate over all non-filtered carousel items and populate their
+            // vertical position data.
             if (revalidateItems)
                 updateYPositions();
 
-            var (firstIndex, lastIndex) = getDisplayRange();
+            // This data is consumed to find the currently displayable range.
+            // This is the range we want to keep drawables for, and should exceed the visible range slightly to avoid drawable churn.
+            var newDisplayRange = getDisplayRange();
 
-            if (revalidateItems || firstIndex != displayedRange.first || lastIndex != displayedRange.last)
+            // If the filtered items or visible range has changed, pooling requirements need to be checked.
+            // This involves fetching new items from the pool, returning no-longer required items.
+            if (revalidateItems || newDisplayRange != displayedRange)
             {
                 Logger.Log("revalidation requested");
 
-                // Remove all items that should no longer be on-screen
-                // TODO: figure out a more resilient way of doing this removal.
-                // scrollableContent.RemoveAll(p => p.Y + p.Item.TotalHeight < visibleUpperBound || p.Y > visibleBottomBound);
-
-                displayedRange = (firstIndex, lastIndex);
+                displayedRange = newDisplayRange;
 
                 // Add those items within the previously found index range that should be displayed.
-                for (int i = firstIndex; i < lastIndex; ++i)
+                for (int i = displayedRange.first; i < displayedRange.last; ++i)
                 {
                     var item = visibleItems[i];
 
-                    var panel = scrollableContent.FirstOrDefault(c => c.Item == item);
+                    if (scrollableContent.Any(c => c.Item == item)) continue;
 
-                    if (panel == null)
-                    {
-                        Logger.Log($"getting panel for {item} from pool");
-                        panel = setPool.Get(p => p.Item = item);
-                        panel.Y = item.CarouselYPosition;
-                        panel.Depth = i;
+                    Logger.Log($"getting panel for {item} from pool");
+                    var panel = setPool.Get(p => p.Item = item);
+                    panel.Depth = i;
+                    panel.Y = item.CarouselYPosition;
+                    scrollableContent.Add(panel);
+                }
 
-                        scrollableContent.Add(panel);
-                    }
-                    else
-                    {
-                        if (panel.IsPresent)
-                            panel.MoveToY(item.CarouselYPosition, 800, Easing.OutQuint);
-                        else
-                            panel.Y = item.CarouselYPosition;
+                // Remove any items which are far out of the visible range.
+            }
 
-                        scrollableContent.ChangeChildDepth(panel, i);
-                    }
+            // Finally, if the filtered items have changed, animate drawables to their new locations.
+            // This is common if a selected/collapsed state has changed.
+            if (revalidateItems)
+            {
+                foreach (DrawableCarouselItem panel in scrollableContent.Children)
+                {
+                    panel.MoveToY(panel.Item.CarouselYPosition, 800, Easing.OutQuint);
                 }
             }
 
-            // Update externally controlled state of currently visible items
-            // (e.g. x-offset and opacity).
+            // Update externally controlled state of currently visible items (e.g. x-offset and opacity).
+            // This is a per-frame update on all drawable panels.
             foreach (DrawableCarouselItem p in scrollableContent.Children)
+            {
                 updateItem(p);
+            }
         }
 
         private (int firstIndex, int lastIndex) getDisplayRange()

From 29983afceffd4f44d91d114b49929cd4b27b584a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 13:51:27 +0900
Subject: [PATCH 05411/10326] Replace pool/cleanup logic with simplest form
 possible

This will temporarily break panels that go off-screen, as they will
disappear immediately
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 32 ++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index ad2c4c2ca8..56fe28fd14 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -583,21 +583,31 @@ namespace osu.Game.Screens.Select
 
                 displayedRange = newDisplayRange;
 
-                // Add those items within the previously found index range that should be displayed.
-                for (int i = displayedRange.first; i < displayedRange.last; ++i)
+                var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first);
+
+                foreach (var panel in scrollableContent.Children)
                 {
-                    var item = visibleItems[i];
+                    if (toDisplay.Remove(panel.Item))
+                    {
+                        // panel already displayed.
+                        continue;
+                    }
 
-                    if (scrollableContent.Any(c => c.Item == item)) continue;
-
-                    Logger.Log($"getting panel for {item} from pool");
-                    var panel = setPool.Get(p => p.Item = item);
-                    panel.Depth = i;
-                    panel.Y = item.CarouselYPosition;
-                    scrollableContent.Add(panel);
+                    // panel displayed but not required
+                    scrollableContent.Remove(panel);
                 }
 
-                // Remove any items which are far out of the visible range.
+                // Add those items within the previously found index range that should be displayed.
+                foreach (var item in toDisplay)
+                {
+                    Logger.Log($"getting panel for {item} from pool");
+                    var panel = setPool.Get(p => p.Item = item);
+
+                    panel.Depth = item.CarouselYPosition; // todo: i think this is correct
+                    panel.Y = item.CarouselYPosition;
+
+                    scrollableContent.Add(panel);
+                }
             }
 
             // Finally, if the filtered items have changed, animate drawables to their new locations.

From 075bf23714fe358b09481a7bab008042e4f3fa8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 14:14:39 +0900
Subject: [PATCH 05412/10326] Better track off-screen drawables (and return to
 pool less often)

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 56fe28fd14..c8ba98f6be 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -560,6 +560,16 @@ namespace osu.Game.Screens.Select
 
         private (int first, int last) displayedRange;
 
+        /// <summary>
+        /// Extend the range to retain already loaded pooled drawables.
+        /// </summary>
+        private const float distance_offscreen_before_unload = 1024;
+
+        /// <summary>
+        /// Extend the range to update positions / retrieve pooled drawables outside of visible range.
+        /// </summary>
+        private const float distance_offscreen_to_preload = 256;
+
         protected override void Update()
         {
             base.Update();
@@ -585,7 +595,7 @@ namespace osu.Game.Screens.Select
 
                 var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first);
 
-                foreach (var panel in scrollableContent.Children)
+                foreach (var panel in scrollableContent.Children.ToArray())
                 {
                     if (toDisplay.Remove(panel.Item))
                     {
@@ -593,8 +603,10 @@ namespace osu.Game.Screens.Select
                         continue;
                     }
 
-                    // panel displayed but not required
-                    scrollableContent.Remove(panel);
+                    // panel loaded as drawable but not required by visible range.
+                    // remove but only if too far off-screen
+                    if (panel.Y < visibleUpperBound - distance_offscreen_before_unload || panel.Y > visibleBottomBound + distance_offscreen_before_unload)
+                        scrollableContent.Remove(panel);
                 }
 
                 // Add those items within the previously found index range that should be displayed.
@@ -603,7 +615,7 @@ namespace osu.Game.Screens.Select
                     Logger.Log($"getting panel for {item} from pool");
                     var panel = setPool.Get(p => p.Item = item);
 
-                    panel.Depth = item.CarouselYPosition; // todo: i think this is correct
+                    panel.Depth = item.CarouselYPosition;
                     panel.Y = item.CarouselYPosition;
 
                     scrollableContent.Add(panel);
@@ -632,9 +644,9 @@ namespace osu.Game.Screens.Select
         {
             // Find index range of all items that should be on-screen
             // TODO: reduce allocs of CarouselBoundsItem.
-            int firstIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleUpperBound));
+            int firstIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleUpperBound - distance_offscreen_to_preload));
             if (firstIndex < 0) firstIndex = ~firstIndex;
-            int lastIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleBottomBound));
+            int lastIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleBottomBound + distance_offscreen_to_preload));
             if (lastIndex < 0) lastIndex = ~lastIndex;
 
             // as we can't be 100% sure on the size of individual carousel drawables,

From 1b7e3397c6df1e04233d3c37e3c83d9b4aeb90b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 14:23:29 +0900
Subject: [PATCH 05413/10326] Use expiry to avoid ToArray

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index c8ba98f6be..65bd607f85 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -595,7 +595,7 @@ namespace osu.Game.Screens.Select
 
                 var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first);
 
-                foreach (var panel in scrollableContent.Children.ToArray())
+                foreach (var panel in scrollableContent.Children)
                 {
                     if (toDisplay.Remove(panel.Item))
                     {
@@ -606,7 +606,11 @@ namespace osu.Game.Screens.Select
                     // panel loaded as drawable but not required by visible range.
                     // remove but only if too far off-screen
                     if (panel.Y < visibleUpperBound - distance_offscreen_before_unload || panel.Y > visibleBottomBound + distance_offscreen_before_unload)
-                        scrollableContent.Remove(panel);
+                    {
+                        // todo: may want a fade effect here (could be seen if a huge change happens, like a set with 20 difficulties becomes selected).
+                        panel.ClearTransforms();
+                        panel.Expire();
+                    }
                 }
 
                 // Add those items within the previously found index range that should be displayed.

From 2aad482545ce8a95fe3de3630278ddaf4d39b048 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 14:37:44 +0900
Subject: [PATCH 05414/10326] Fix x offsets of difficulties not being updated

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 27 +++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 65bd607f85..775b4ad7b6 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -638,9 +638,15 @@ namespace osu.Game.Screens.Select
 
             // Update externally controlled state of currently visible items (e.g. x-offset and opacity).
             // This is a per-frame update on all drawable panels.
-            foreach (DrawableCarouselItem p in scrollableContent.Children)
+            foreach (DrawableCarouselItem item in scrollableContent.Children)
             {
-                updateItem(p);
+                updateItem(item);
+
+                if (item is DrawableCarouselBeatmapSet set)
+                {
+                    foreach (var diff in set.ChildItems)
+                        updateItem(diff, item);
+                }
             }
         }
 
@@ -831,21 +837,20 @@ namespace osu.Game.Screens.Select
         /// Update a item's x position and multiplicative alpha based on its y position and
         /// the current scroll position.
         /// </summary>
-        /// <param name="p">The item to be updated.</param>
-        private void updateItem(DrawableCarouselItem p)
+        /// <param name="item">The item to be updated.</param>
+        /// <param name="parent">For nested items, the parent of the item to be updated.</param>
+        private void updateItem(DrawableCarouselItem item, DrawableCarouselItem parent = null)
         {
-            float itemDrawY = p.Position.Y - visibleUpperBound + p.DrawHeight / 2;
+            Vector2 posInScroll = scrollableContent.ToLocalSpace(item.ScreenSpaceDrawQuad.Centre);
+            float itemDrawY = posInScroll.Y - visibleUpperBound;
             float dist = Math.Abs(1f - itemDrawY / visibleHalfHeight);
 
-            // Setting the origin position serves as an additive position on top of potential
-            // local transformation we may want to apply (e.g. when a item gets selected, we
-            // may want to smoothly transform it leftwards.)
-            p.OriginPosition = new Vector2(-offsetX(dist, visibleHalfHeight), 0);
+            item.X = offsetX(dist, visibleHalfHeight) - (parent?.X ?? 0);
 
             // We are applying a multiplicative alpha (which is internally done by nesting an
             // additional container and setting that container's alpha) such that we can
-            // layer transformations on top, with a similar reasoning to the previous comment.
-            p.SetMultiplicativeAlpha(Math.Clamp(1.75f - 1.5f * dist, 0, 1));
+            // layer alpha transformations on top.
+            item.SetMultiplicativeAlpha(Math.Clamp(1.75f - 1.5f * dist, 0, 1));
         }
 
         /// <summary>

From cfec4f4fc14833562f464ec79eea0d4ee9f65549 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 15:19:32 +0900
Subject: [PATCH 05415/10326] Extract header element from base
 DrawableCarouselItem class

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    |   2 +-
 .../Screens/Select/Carousel/CarouselHeader.cs | 108 +++++++++++++++++
 .../Carousel/DrawableCarouselBeatmap.cs       |  11 +-
 .../Carousel/DrawableCarouselBeatmapSet.cs    |  20 ++--
 .../Select/Carousel/DrawableCarouselItem.cs   | 113 +++++-------------
 5 files changed, 152 insertions(+), 102 deletions(-)
 create mode 100644 osu.Game/Screens/Select/Carousel/CarouselHeader.cs

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 775b4ad7b6..bcdbc53e26 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -841,7 +841,7 @@ namespace osu.Game.Screens.Select
         /// <param name="parent">For nested items, the parent of the item to be updated.</param>
         private void updateItem(DrawableCarouselItem item, DrawableCarouselItem parent = null)
         {
-            Vector2 posInScroll = scrollableContent.ToLocalSpace(item.ScreenSpaceDrawQuad.Centre);
+            Vector2 posInScroll = scrollableContent.ToLocalSpace(item.Header.ScreenSpaceDrawQuad.Centre);
             float itemDrawY = posInScroll.Y - visibleUpperBound;
             float dist = Math.Abs(1f - itemDrawY / visibleHalfHeight);
 
diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
new file mode 100644
index 0000000000..f59cccd8b6
--- /dev/null
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.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 osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+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.Framework.Utils;
+using osu.Game.Graphics;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Select.Carousel
+{
+    public class CarouselHeader : Container
+    {
+        private SampleChannel sampleHover;
+
+        private readonly Box hoverLayer;
+
+        public Container BorderContainer;
+
+        public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
+
+        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+
+        public CarouselHeader()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = DrawableCarouselItem.MAX_HEIGHT;
+
+            InternalChild = BorderContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                CornerRadius = 10,
+                BorderColour = new Color4(221, 255, 255, 255),
+                Children = new Drawable[]
+                {
+                    Content,
+                    hoverLayer = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        Blending = BlendingParameters.Additive,
+                    },
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, OsuColour colours)
+        {
+            sampleHover = audio.Samples.Get($@"SongSelect/song-ping-variation-{RNG.Next(1, 5)}");
+            hoverLayer.Colour = colours.Blue.Opacity(0.1f);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            State.BindValueChanged(updateState, true);
+        }
+
+        private void updateState(ValueChangedEvent<CarouselItemState> state)
+        {
+            switch (state.NewValue)
+            {
+                case CarouselItemState.Collapsed:
+                case CarouselItemState.NotSelected:
+                    BorderContainer.BorderThickness = 0;
+                    BorderContainer.EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Shadow, Offset = new Vector2(1), Radius = 10, Colour = Color4.Black.Opacity(100),
+                    };
+                    break;
+
+                case CarouselItemState.Selected:
+                    BorderContainer.BorderThickness = 2.5f;
+                    BorderContainer.EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow, Colour = new Color4(130, 204, 255, 150), Radius = 20, Roundness = 10,
+                    };
+                    break;
+            }
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            sampleHover?.Play();
+
+            hoverLayer.FadeIn(100, Easing.OutQuint);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            hoverLayer.FadeOut(1000, Easing.OutQuint);
+            base.OnHoverLost(e);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 23404a6c6e..b06b60e6c5 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -64,15 +64,14 @@ namespace osu.Game.Screens.Select.Carousel
         public DrawableCarouselBeatmap(CarouselBeatmap panel)
         {
             beatmap = panel.Beatmap;
-            Height = HEIGHT;
-
-            // todo: temporary
             Item = panel;
         }
 
         [BackgroundDependencyLoader(true)]
         private void load(BeatmapManager manager, SongSelect songSelect)
         {
+            Header.Height = HEIGHT;
+
             if (songSelect != null)
             {
                 startRequested = b => songSelect.FinaliseSelection(b);
@@ -83,7 +82,7 @@ namespace osu.Game.Screens.Select.Carousel
             if (manager != null)
                 hideRequested = manager.Hide;
 
-            Content.Children = new Drawable[]
+            Header.Children = new Drawable[]
             {
                 background = new Box
                 {
@@ -174,7 +173,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Selected();
 
-            BorderContainer.MoveToX(-50, 500, Easing.OutExpo);
+            Header.MoveToX(-50, 500, Easing.OutExpo);
 
             background.Colour = ColourInfo.GradientVertical(
                 new Color4(20, 43, 51, 255),
@@ -187,7 +186,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Deselected();
 
-            BorderContainer.MoveToX(0, 500, Easing.OutExpo);
+            Header.MoveToX(0, 500, Easing.OutExpo);
 
             background.Colour = new Color4(20, 43, 51, 255);
             triangles.Colour = OsuColour.Gray(0.5f);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 635eb6f375..e1a2ce3962 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -67,16 +67,12 @@ namespace osu.Game.Screens.Select.Carousel
             if (beatmapOverlay != null)
                 viewDetails = beatmapOverlay.FetchAndShowBeatmapSet;
 
-            // TODO: temporary. we probably want to *not* inherit DrawableCarouselItem for this class, but only the above header portion.
-            AddRangeInternal(new Drawable[]
+            Content.Add(beatmapContainer = new Container<DrawableCarouselItem>
             {
-                beatmapContainer = new Container<DrawableCarouselItem>
-                {
-                    X = 50,
-                    Y = MAX_HEIGHT,
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                },
+                X = 50,
+                Y = MAX_HEIGHT,
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
             });
         }
 
@@ -90,7 +86,7 @@ namespace osu.Game.Screens.Select.Carousel
                 return;
 
             Logger.Log($"updating item {beatmapSet}");
-            Content.Children = new Drawable[]
+            Header.Children = new Drawable[]
             {
                 new DelayedLoadUnloadWrapper(() =>
                 {
@@ -163,7 +159,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Deselected();
 
-            BorderContainer.MoveToX(0, 500, Easing.OutExpo);
+            MovementContainer.MoveToX(0, 500, Easing.OutExpo);
 
             foreach (var beatmap in beatmapContainer)
             {
@@ -176,7 +172,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Selected();
 
-            BorderContainer.MoveToX(-100, 500, Easing.OutExpo);
+            MovementContainer.MoveToX(-100, 500, Easing.OutExpo);
 
             // on selection we show our child beatmaps.
             // for now this is a simple drawable construction each selection.
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index 8cf63d184c..6a9b60fa57 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -4,21 +4,11 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 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.Pooling;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Framework.Utils;
-using osu.Game.Graphics;
-using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Select.Carousel
 {
@@ -28,6 +18,14 @@ namespace osu.Game.Screens.Select.Carousel
 
         public override bool IsPresent => base.IsPresent || Item?.Visible == true;
 
+        public readonly CarouselHeader Header;
+
+        protected readonly Container<Drawable> Content;
+
+        protected readonly Container MovementContainer;
+
+        private CarouselItem item;
+
         public CarouselItem Item
         {
             get => item;
@@ -38,8 +36,10 @@ namespace osu.Game.Screens.Select.Carousel
 
                 if (item != null)
                 {
-                    Item.Filtered.ValueChanged -= onStateChange;
-                    Item.State.ValueChanged -= onStateChange;
+                    item.Filtered.ValueChanged -= onStateChange;
+                    item.State.ValueChanged -= onStateChange;
+
+                    Header.State.UnbindFrom(item.State);
 
                     if (item is CarouselGroup group)
                     {
@@ -57,67 +57,33 @@ namespace osu.Game.Screens.Select.Carousel
 
         public virtual IEnumerable<DrawableCarouselItem> ChildItems => Enumerable.Empty<DrawableCarouselItem>();
 
-        private readonly Container nestedContainer;
-
-        protected readonly Container BorderContainer;
-
-        private readonly Box hoverLayer;
-
-        protected Container<Drawable> Content => nestedContainer;
-
         protected DrawableCarouselItem()
         {
-            Height = MAX_HEIGHT;
             RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
             Alpha = 0;
 
-            InternalChild = BorderContainer = new Container
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Masking = true,
-                CornerRadius = 10,
-                BorderColour = new Color4(221, 255, 255, 255),
-                Children = new Drawable[]
+                MovementContainer = new Container
                 {
-                    nestedContainer = new Container
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    hoverLayer = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                        Blending = BlendingParameters.Additive,
-                    },
-                }
+                        Header = new CarouselHeader(),
+                        Content = new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                        }
+                    }
+                },
             };
         }
 
-        private SampleChannel sampleHover;
-        private CarouselItem item;
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuColour colours)
-        {
-            sampleHover = audio.Samples.Get($@"SongSelect/song-ping-variation-{RNG.Next(1, 5)}");
-            hoverLayer.Colour = colours.Blue.Opacity(0.1f);
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            sampleHover?.Play();
-
-            hoverLayer.FadeIn(100, Easing.OutQuint);
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            hoverLayer.FadeOut(1000, Easing.OutQuint);
-            base.OnHoverLost(e);
-        }
-
-        public void SetMultiplicativeAlpha(float alpha) => BorderContainer.Alpha = alpha;
+        public void SetMultiplicativeAlpha(float alpha) => Header.BorderContainer.Alpha = alpha;
 
         protected override void LoadComplete()
         {
@@ -136,6 +102,8 @@ namespace osu.Game.Screens.Select.Carousel
             Item.Filtered.ValueChanged += onStateChange;
             Item.State.ValueChanged += onStateChange;
 
+            Header.State.BindTo(Item.State);
+
             if (Item is CarouselGroup group)
             {
                 foreach (var c in group.Children)
@@ -171,31 +139,10 @@ namespace osu.Game.Screens.Select.Carousel
         protected virtual void Selected()
         {
             Debug.Assert(Item != null);
-
-            Item.State.Value = CarouselItemState.Selected;
-
-            BorderContainer.BorderThickness = 2.5f;
-            BorderContainer.EdgeEffect = new EdgeEffectParameters
-            {
-                Type = EdgeEffectType.Glow,
-                Colour = new Color4(130, 204, 255, 150),
-                Radius = 20,
-                Roundness = 10,
-            };
         }
 
         protected virtual void Deselected()
         {
-            Item.State.Value = CarouselItemState.NotSelected;
-
-            BorderContainer.BorderThickness = 0;
-            BorderContainer.EdgeEffect = new EdgeEffectParameters
-            {
-                Type = EdgeEffectType.Shadow,
-                Offset = new Vector2(1),
-                Radius = 10,
-                Colour = Color4.Black.Opacity(100),
-            };
         }
 
         protected override bool OnClick(ClickEvent e)

From dd8943eb7f5f3816fc2f3b1d218a41166e373b78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 15:19:41 +0900
Subject: [PATCH 05416/10326] Update test scene to fix crash

---
 .../Visual/SongSelect/TestSceneBeatmapCarousel.cs           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 7d850a0d13..d3ae3a19ea 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -427,7 +427,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             for (int i = 0; i < 3; i++)
             {
-                var set = createTestBeatmapSet(i);
+                var set = createTestBeatmapSet(i, 3);
                 set.Beatmaps[0].StarDifficulty = 3 - i;
                 set.Beatmaps[2].StarDifficulty = 6 + i;
                 sets.Add(set);
@@ -822,7 +822,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selection is visible", selectedBeatmapVisible);
         }
 
-        private BeatmapSetInfo createTestBeatmapSet(int id)
+        private BeatmapSetInfo createTestBeatmapSet(int id, int minimumDifficulties = 1)
         {
             return new BeatmapSetInfo
             {
@@ -836,7 +836,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Title = $"test set #{id}!",
                     AuthorString = string.Concat(Enumerable.Repeat((char)('z' - Math.Min(25, id - 1)), 5))
                 },
-                Beatmaps = getBeatmaps(RNG.Next(1, 20)).ToList()
+                Beatmaps = getBeatmaps(RNG.Next(minimumDifficulties, 20)).ToList()
             };
         }
 

From c08b5e8d03b83221ac0c56688d42374262f9c6ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 15:23:27 +0900
Subject: [PATCH 05417/10326] Align beatmap difficulties correctly

---
 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 e1a2ce3962..64a990a27d 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             Content.Add(beatmapContainer = new Container<DrawableCarouselItem>
             {
-                X = 50,
+                X = 100,
                 Y = MAX_HEIGHT,
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,

From 1da49073abd01ec14b84b3e32c9fa353eae7d738 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 15:32:37 +0900
Subject: [PATCH 05418/10326] Calculate content height automatically

---
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs   | 1 -
 osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs    | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 64a990a27d..b83915e0c6 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -70,7 +70,6 @@ namespace osu.Game.Screens.Select.Carousel
             Content.Add(beatmapContainer = new Container<DrawableCarouselItem>
             {
                 X = 100,
-                Y = MAX_HEIGHT,
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
             });
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index 6a9b60fa57..5bcaffa3cf 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -20,6 +20,9 @@ namespace osu.Game.Screens.Select.Carousel
 
         public readonly CarouselHeader Header;
 
+        /// <summary>
+        /// Optional content which sits below the header.
+        /// </summary>
         protected readonly Container<Drawable> Content;
 
         protected readonly Container MovementContainer;
@@ -89,6 +92,9 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.LoadComplete();
 
+            // avoid using fill flow for performance reasons. header size doesn't change after load.
+            Content.Y = Header.Height;
+
             UpdateItem();
         }
 

From cecdf14f5363d9590b130526a8e24e8c3bbddefd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 16:04:37 +0900
Subject: [PATCH 05419/10326] Avoid reconstructing beatmap difficulties that
 were recently displayed

---
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 78 ++++++++++++-------
 1 file changed, 49 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index b83915e0c6..9a822f83e3 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Screens.Select.Carousel
             base.FreeAfterUse();
 
             Item = null;
+
             ClearTransforms();
         }
 
@@ -66,20 +67,14 @@ namespace osu.Game.Screens.Select.Carousel
 
             if (beatmapOverlay != null)
                 viewDetails = beatmapOverlay.FetchAndShowBeatmapSet;
-
-            Content.Add(beatmapContainer = new Container<DrawableCarouselItem>
-            {
-                X = 100,
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-            });
         }
 
         protected override void UpdateItem()
         {
             base.UpdateItem();
 
-            beatmapContainer.Clear();
+            Content.Clear();
+            beatmapContainer = null;
 
             if (Item == null)
                 return;
@@ -160,10 +155,13 @@ namespace osu.Game.Screens.Select.Carousel
 
             MovementContainer.MoveToX(0, 500, Easing.OutExpo);
 
-            foreach (var beatmap in beatmapContainer)
+            if (beatmapContainer != null)
             {
-                beatmap.MoveToY(0, 800, Easing.OutQuint);
-                beatmap.FadeOut(80).Expire();
+                foreach (var beatmap in beatmapContainer)
+                {
+                    beatmap.MoveToY(0, 800, Easing.OutQuint);
+                    beatmap.FadeOut(80);
+                }
             }
         }
 
@@ -173,33 +171,55 @@ namespace osu.Game.Screens.Select.Carousel
 
             MovementContainer.MoveToX(-100, 500, Easing.OutExpo);
 
-            // on selection we show our child beatmaps.
-            // for now this is a simple drawable construction each selection.
-            // can be improved in the future.
-            var carouselBeatmapSet = (CarouselBeatmapSet)Item;
-
-            // ToArray() in this line is required due to framework oversight: https://github.com/ppy/osu-framework/pull/3929
-            var visibleBeatmaps = carouselBeatmapSet.Children
-                                                    .Where(c => c.Visible)
-                                                    .Select(c => c.CreateDrawableRepresentation())
-                                                    .ToArray();
-
-            LoadComponentsAsync(visibleBeatmaps, loaded =>
+            if (beatmapContainer != null)
             {
-                // make sure the pooled target hasn't changed.
-                if (carouselBeatmapSet != Item)
-                    return;
+                // if already loaded, we only need to re-animate.
+                animateBeatmaps();
+            }
+            else
+            {
+                // on selection we show our child beatmaps.
+                // for now this is a simple drawable construction each selection.
+                // can be improved in the future.
+                var carouselBeatmapSet = (CarouselBeatmapSet)Item;
 
-                beatmapContainer.ChildrenEnumerable = loaded;
+                // ToArray() in this line is required due to framework oversight: https://github.com/ppy/osu-framework/pull/3929
+                var visibleBeatmaps = carouselBeatmapSet.Children
+                                                        .Where(c => c.Visible)
+                                                        .Select(c => c.CreateDrawableRepresentation())
+                                                        .ToArray();
 
+                beatmapContainer = new Container<DrawableCarouselItem>
+                {
+                    X = 100,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    ChildrenEnumerable = visibleBeatmaps
+                };
+
+                Logger.Log($"loading {visibleBeatmaps.Length} beatmaps for {Item}");
+
+                LoadComponentAsync(beatmapContainer, loaded =>
+                {
+                    // make sure the pooled target hasn't changed.
+                    if (carouselBeatmapSet != Item)
+                        return;
+
+                    Content.Child = loaded;
+                    animateBeatmaps();
+                });
+            }
+
+            void animateBeatmaps()
+            {
                 float yPos = DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
 
-                foreach (var item in loaded)
+                foreach (var item in beatmapContainer.Children)
                 {
                     item.MoveToY(yPos, 800, Easing.OutQuint);
                     yPos += item.Item.TotalHeight + DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
                 }
-            });
+            }
         }
 
         private const int maximum_difficulty_icons = 18;

From ded09b78cbbda03d95df2c75f17785a02b84c434 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 16:33:37 +0900
Subject: [PATCH 05420/10326] Avoid usage of AutoSize for DrawableCarouselItems
 in general

---
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs     |  3 +--
 .../Screens/Select/Carousel/DrawableCarouselItem.cs   | 11 ++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 9a822f83e3..a6cea5ee53 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -192,8 +192,7 @@ namespace osu.Game.Screens.Select.Carousel
                 beatmapContainer = new Container<DrawableCarouselItem>
                 {
                     X = 100,
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.Both,
                     ChildrenEnumerable = visibleBeatmaps
                 };
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index 5bcaffa3cf..68825873ff 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -63,7 +63,6 @@ namespace osu.Game.Screens.Select.Carousel
         protected DrawableCarouselItem()
         {
             RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
 
             Alpha = 0;
 
@@ -71,15 +70,13 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 MovementContainer = new Container
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
                         Header = new CarouselHeader(),
                         Content = new Container
                         {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
+                            RelativeSizeAxes = Axes.Both,
                         }
                     }
                 },
@@ -123,6 +120,10 @@ namespace osu.Game.Screens.Select.Carousel
 
         protected virtual void ApplyState()
         {
+            // Use the fact that we know the precise height of the item from the model to avoid the need for AutoSize overhead.
+            // Additionally, AutoSize doesn't work well due to content starting off-screen and being masked away.
+            Height = Item.TotalHeight;
+
             Debug.Assert(Item != null);
 
             switch (Item.State.Value)

From b536f571fd7885ef2048b871997d5a012fb2cedb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 16:35:06 +0900
Subject: [PATCH 05421/10326] Move header height propagation to update for
 safety

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index 68825873ff..bafb338a04 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -89,10 +89,15 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.LoadComplete();
 
+            UpdateItem();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
             // avoid using fill flow for performance reasons. header size doesn't change after load.
             Content.Y = Header.Height;
-
-            UpdateItem();
         }
 
         protected virtual void UpdateItem()

From 1f0aa974dd0a0155e0703036f3c2825e76c94e2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 17:09:54 +0900
Subject: [PATCH 05422/10326] Fix failing tests

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 37 +++++++++++++++----
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 18 ++++-----
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index d3ae3a19ea..8e4e2ac257 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -427,7 +427,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             for (int i = 0; i < 3; i++)
             {
-                var set = createTestBeatmapSet(i, 3);
+                var set = createTestBeatmapSet(i);
                 set.Beatmaps[0].StarDifficulty = 3 - i;
                 set.Beatmaps[2].StarDifficulty = 6 + i;
                 sets.Add(set);
@@ -822,7 +822,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selection is visible", selectedBeatmapVisible);
         }
 
-        private BeatmapSetInfo createTestBeatmapSet(int id, int minimumDifficulties = 1)
+        private BeatmapSetInfo createTestBeatmapSet(int id, bool randomDifficultyCount = false)
         {
             return new BeatmapSetInfo
             {
@@ -836,7 +836,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Title = $"test set #{id}!",
                     AuthorString = string.Concat(Enumerable.Repeat((char)('z' - Math.Min(25, id - 1)), 5))
                 },
-                Beatmaps = getBeatmaps(RNG.Next(minimumDifficulties, 20)).ToList()
+                Beatmaps = getBeatmaps(randomDifficultyCount ? RNG.Next(1, 20) : 3).ToList()
             };
         }
 
@@ -846,14 +846,22 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             for (int i = 0; i < count; i++)
             {
+                float diff = (float)i / count * 10;
+
+                string version = "Normal";
+                if (diff > 6.6)
+                    version = "Insane";
+                else if (diff > 3.3)
+                    version = "Hard";
+
                 yield return new BeatmapInfo
                 {
                     OnlineBeatmapID = id++ * 10,
-                    Version = "Normal",
-                    StarDifficulty = RNG.NextSingle() * 10,
+                    Version = version,
+                    StarDifficulty = diff,
                     BaseDifficulty = new BeatmapDifficulty
                     {
-                        OverallDifficulty = RNG.NextSingle() * 10,
+                        OverallDifficulty = diff,
                     }
                 };
             }
@@ -899,7 +907,22 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             public bool PendingFilterTask => PendingFilter != null;
 
-            public IEnumerable<DrawableCarouselItem> Items => InternalChildren.OfType<DrawableCarouselItem>();
+            public IEnumerable<DrawableCarouselItem> Items
+            {
+                get
+                {
+                    foreach (var item in ScrollableContent)
+                    {
+                        yield return item;
+
+                        if (item is DrawableCarouselBeatmapSet set)
+                        {
+                            foreach (var difficulty in set.ChildItems)
+                                yield return difficulty;
+                        }
+                    }
+                }
+            }
 
             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 bcdbc53e26..b6ca6a242d 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.Select
             if (selectedBeatmapSet != null && !beatmapSets.Contains(selectedBeatmapSet.BeatmapSet))
                 selectedBeatmapSet = null;
 
-            scrollableContent.Clear(false);
+            ScrollableContent.Clear(false);
             itemsCache.Invalidate();
             scrollPositionCache.Invalidate();
 
@@ -121,7 +121,7 @@ namespace osu.Game.Screens.Select
         private readonly Cached itemsCache = new Cached();
         private readonly Cached scrollPositionCache = new Cached();
 
-        private readonly Container<DrawableCarouselItem> scrollableContent;
+        protected readonly Container<DrawableCarouselItem> ScrollableContent;
 
         public Bindable<bool> RightClickScrollingEnabled = new Bindable<bool>();
 
@@ -151,7 +151,7 @@ namespace osu.Game.Screens.Select
                     Children = new Drawable[]
                     {
                         setPool,
-                        scrollableContent = new Container<DrawableCarouselItem>
+                        ScrollableContent = new Container<DrawableCarouselItem>
                         {
                             RelativeSizeAxes = Axes.X,
                         }
@@ -595,7 +595,7 @@ namespace osu.Game.Screens.Select
 
                 var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first);
 
-                foreach (var panel in scrollableContent.Children)
+                foreach (var panel in ScrollableContent.Children)
                 {
                     if (toDisplay.Remove(panel.Item))
                     {
@@ -622,7 +622,7 @@ namespace osu.Game.Screens.Select
                     panel.Depth = item.CarouselYPosition;
                     panel.Y = item.CarouselYPosition;
 
-                    scrollableContent.Add(panel);
+                    ScrollableContent.Add(panel);
                 }
             }
 
@@ -630,7 +630,7 @@ namespace osu.Game.Screens.Select
             // This is common if a selected/collapsed state has changed.
             if (revalidateItems)
             {
-                foreach (DrawableCarouselItem panel in scrollableContent.Children)
+                foreach (DrawableCarouselItem panel in ScrollableContent.Children)
                 {
                     panel.MoveToY(panel.Item.CarouselYPosition, 800, Easing.OutQuint);
                 }
@@ -638,7 +638,7 @@ namespace osu.Game.Screens.Select
 
             // Update externally controlled state of currently visible items (e.g. x-offset and opacity).
             // This is a per-frame update on all drawable panels.
-            foreach (DrawableCarouselItem item in scrollableContent.Children)
+            foreach (DrawableCarouselItem item in ScrollableContent.Children)
             {
                 updateItem(item);
 
@@ -786,7 +786,7 @@ namespace osu.Game.Screens.Select
             }
 
             currentY += visibleHalfHeight;
-            scrollableContent.Height = currentY;
+            ScrollableContent.Height = currentY;
 
             if (BeatmapSetsLoaded && (selectedBeatmapSet == null || selectedBeatmap == null || selectedBeatmapSet.State.Value != CarouselItemState.Selected))
             {
@@ -841,7 +841,7 @@ namespace osu.Game.Screens.Select
         /// <param name="parent">For nested items, the parent of the item to be updated.</param>
         private void updateItem(DrawableCarouselItem item, DrawableCarouselItem parent = null)
         {
-            Vector2 posInScroll = scrollableContent.ToLocalSpace(item.Header.ScreenSpaceDrawQuad.Centre);
+            Vector2 posInScroll = ScrollableContent.ToLocalSpace(item.Header.ScreenSpaceDrawQuad.Centre);
             float itemDrawY = posInScroll.Y - visibleUpperBound;
             float dist = Math.Abs(1f - itemDrawY / visibleHalfHeight);
 

From fdd4d95cdc6cdbb209b2dd99d2794dd45e428a4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 17:24:41 +0900
Subject: [PATCH 05423/10326] Fix difficulties being at incorrect vertical
 positions after filter is applied

---
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index a6cea5ee53..6c35ebfd97 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -171,29 +171,36 @@ namespace osu.Game.Screens.Select.Carousel
 
             MovementContainer.MoveToX(-100, 500, Easing.OutExpo);
 
-            if (beatmapContainer != null)
+            updateBeatmapDifficulties();
+        }
+
+        private void updateBeatmapDifficulties()
+        {
+            var carouselBeatmapSet = (CarouselBeatmapSet)Item;
+
+            var visibleBeatmaps = carouselBeatmapSet.Children
+                                                    .Where(c => c.Visible)
+                                                    .ToArray();
+
+            // if we are already displaying all the correct beatmaps, only run animation updates.
+            // note that the displayed beatmaps may change due to the applied filter.
+            // a future optimisation could add/remove only changed difficulties rather than reinitialise.
+            if (beatmapContainer != null && visibleBeatmaps.Length == beatmapContainer.Count && visibleBeatmaps.All(b => beatmapContainer.Any(c => c.Item == b)))
             {
-                // if already loaded, we only need to re-animate.
-                animateBeatmaps();
+                updateBeatmapYPositions();
             }
             else
             {
                 // on selection we show our child beatmaps.
                 // for now this is a simple drawable construction each selection.
                 // can be improved in the future.
-                var carouselBeatmapSet = (CarouselBeatmapSet)Item;
-
-                // ToArray() in this line is required due to framework oversight: https://github.com/ppy/osu-framework/pull/3929
-                var visibleBeatmaps = carouselBeatmapSet.Children
-                                                        .Where(c => c.Visible)
-                                                        .Select(c => c.CreateDrawableRepresentation())
-                                                        .ToArray();
 
                 beatmapContainer = new Container<DrawableCarouselItem>
                 {
                     X = 100,
                     RelativeSizeAxes = Axes.Both,
-                    ChildrenEnumerable = visibleBeatmaps
+                    // ToArray() in this line is required due to framework oversight: https://github.com/ppy/osu-framework/pull/3929
+                    ChildrenEnumerable = visibleBeatmaps.Select(c => c.CreateDrawableRepresentation()).ToArray()
                 };
 
                 Logger.Log($"loading {visibleBeatmaps.Length} beatmaps for {Item}");
@@ -205,18 +212,18 @@ namespace osu.Game.Screens.Select.Carousel
                         return;
 
                     Content.Child = loaded;
-                    animateBeatmaps();
+                    updateBeatmapYPositions();
                 });
             }
 
-            void animateBeatmaps()
+            void updateBeatmapYPositions()
             {
                 float yPos = DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
 
-                foreach (var item in beatmapContainer.Children)
+                foreach (var panel in beatmapContainer.Children)
                 {
-                    item.MoveToY(yPos, 800, Easing.OutQuint);
-                    yPos += item.Item.TotalHeight + DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
+                    panel.MoveToY(yPos, 800, Easing.OutQuint);
+                    yPos += panel.Item.TotalHeight + DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
                 }
             }
         }

From 4160feb3da3dd6fc5c3154dd964ca2c8d61f92ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 17:26:17 +0900
Subject: [PATCH 05424/10326] Add test specifically for many panels visible

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 8e4e2ac257..239fa9ec4e 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -41,6 +41,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             this.rulesets = rulesets;
         }
 
+        [Test]
+        public void TestManyPanels()
+        {
+            loadBeatmaps(count: 5000, randomDifficulties: true);
+        }
+
         [Test]
         public void TestKeyRepeat()
         {
@@ -708,7 +714,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             checkVisibleItemCount(true, 15);
         }
 
-        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null, Action<BeatmapCarousel> carouselAdjust = null)
+        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null, Action<BeatmapCarousel> carouselAdjust = null, int? count = null, bool randomDifficulties = false)
         {
             bool changed = false;
 
@@ -720,8 +726,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                 {
                     beatmapSets = new List<BeatmapSetInfo>();
 
-                    for (int i = 1; i <= set_count; i++)
-                        beatmapSets.Add(createTestBeatmapSet(i));
+                    for (int i = 1; i <= (count ?? set_count); i++)
+                        beatmapSets.Add(createTestBeatmapSet(i, randomDifficulties));
                 }
 
                 carousel.Filter(initialCriteria?.Invoke() ?? new FilterCriteria());

From f3b937e358a8489d3559e5972010caa193b4655a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 17:33:35 +0900
Subject: [PATCH 05425/10326] Fix masking issues with certain aspect ratio
 displays

---
 osu.Game/Screens/Select/BeatmapCarousel.cs                  | 4 +++-
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index b6ca6a242d..bc2494e9b7 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -845,7 +845,9 @@ namespace osu.Game.Screens.Select
             float itemDrawY = posInScroll.Y - visibleUpperBound;
             float dist = Math.Abs(1f - itemDrawY / visibleHalfHeight);
 
-            item.X = offsetX(dist, visibleHalfHeight) - (parent?.X ?? 0);
+            // adjusting the item's overall X position can cause it to become masked away when
+            // child items (difficulties) are still visible.
+            item.Header.X = offsetX(dist, visibleHalfHeight) - (parent?.X ?? 0);
 
             // We are applying a multiplicative alpha (which is internally done by nesting an
             // additional container and setting that container's alpha) such that we can
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index b06b60e6c5..a655186986 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Selected();
 
-            Header.MoveToX(-50, 500, Easing.OutExpo);
+            MovementContainer.MoveToX(-50, 500, Easing.OutExpo);
 
             background.Colour = ColourInfo.GradientVertical(
                 new Color4(20, 43, 51, 255),
@@ -186,7 +186,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Deselected();
 
-            Header.MoveToX(0, 500, Easing.OutExpo);
+            MovementContainer.MoveToX(0, 500, Easing.OutExpo);
 
             background.Colour = new Color4(20, 43, 51, 255);
             triangles.Colour = OsuColour.Gray(0.5f);

From 9b2ebb8f0f07fef7f781edb9cf60a62a80206976 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 17:45:41 +0900
Subject: [PATCH 05426/10326] Fix main content DelayedLoadUnloadWrapper not
 getting a valid size before load

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 6c35ebfd97..b54325cf05 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -100,7 +100,8 @@ namespace osu.Game.Screens.Select.Carousel
                     {
                         Direction = FillDirection.Vertical,
                         Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
-                        AutoSizeAxes = Axes.Both,
+                        // required to ensure we load as soon as any part of the panel comes on screen
+                        RelativeSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
                             new OsuSpriteText

From d9a6a6b24543ddc7d1d7a259f37723700473376d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 17:55:56 +0900
Subject: [PATCH 05427/10326] Split content out into own class

---
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 66 +------------
 ...nelBackground.cs => SetPanelBackground.cs} |  4 +-
 .../Select/Carousel/SetPanelContent.cs        | 93 +++++++++++++++++++
 3 files changed, 98 insertions(+), 65 deletions(-)
 rename osu.Game/Screens/Select/Carousel/{PanelBackground.cs => SetPanelBackground.cs} (95%)
 create mode 100644 osu.Game/Screens/Select/Carousel/SetPanelContent.cs

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index b54325cf05..ad5c4e5e4f 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -10,16 +10,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
 using osu.Game.Collections;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
-using osuTK;
 
 namespace osu.Game.Screens.Select.Carousel
 {
@@ -85,7 +80,7 @@ namespace osu.Game.Screens.Select.Carousel
                 new DelayedLoadUnloadWrapper(() =>
                 {
                     Logger.Log($"loaded background item {beatmapSet}");
-                    var background = new PanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
+                    var background = new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
                     {
                         RelativeSizeAxes = Axes.Both,
                     };
@@ -96,52 +91,8 @@ namespace osu.Game.Screens.Select.Carousel
                 }, 300, 5000),
                 new DelayedLoadUnloadWrapper(() =>
                 {
-                    var mainFlow = new FillFlowContainer
-                    {
-                        Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
-                        // required to ensure we load as soon as any part of the panel comes on screen
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new OsuSpriteText
-                            {
-                                Text = new LocalisedString((beatmapSet.Metadata.TitleUnicode, beatmapSet.Metadata.Title)),
-                                Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 22, italics: true),
-                                Shadow = true,
-                            },
-                            new OsuSpriteText
-                            {
-                                Text = new LocalisedString((beatmapSet.Metadata.ArtistUnicode, beatmapSet.Metadata.Artist)),
-                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
-                                Shadow = true,
-                            },
-                            new FillFlowContainer
-                            {
-                                Direction = FillDirection.Horizontal,
-                                AutoSizeAxes = Axes.Both,
-                                Margin = new MarginPadding { Top = 5 },
-                                Children = new Drawable[]
-                                {
-                                    new BeatmapSetOnlineStatusPill
-                                    {
-                                        Origin = Anchor.CentreLeft,
-                                        Anchor = Anchor.CentreLeft,
-                                        Margin = new MarginPadding { Right = 5 },
-                                        TextSize = 11,
-                                        TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
-                                        Status = beatmapSet.Status
-                                    },
-                                    new FillFlowContainer<DifficultyIcon>
-                                    {
-                                        AutoSizeAxes = Axes.Both,
-                                        Spacing = new Vector2(3),
-                                        ChildrenEnumerable = getDifficultyIcons(),
-                                    },
-                                }
-                            }
-                        }
-                    };
+                    // main content split into own class to reduce allocation before load operation triggers.
+                    var mainFlow = new SetPanelContent((CarouselBeatmapSet)Item);
 
                     mainFlow.OnLoadComplete += d => d.FadeInFromZero(1000, Easing.OutQuint);
 
@@ -229,17 +180,6 @@ namespace osu.Game.Screens.Select.Carousel
             }
         }
 
-        private const int maximum_difficulty_icons = 18;
-
-        private IEnumerable<DifficultyIcon> getDifficultyIcons()
-        {
-            var beatmaps = ((CarouselBeatmapSet)Item).Beatmaps.ToList();
-
-            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));
-        }
-
         public MenuItem[] ContextMenuItems
         {
             get
diff --git a/osu.Game/Screens/Select/Carousel/PanelBackground.cs b/osu.Game/Screens/Select/Carousel/SetPanelBackground.cs
similarity index 95%
rename from osu.Game/Screens/Select/Carousel/PanelBackground.cs
rename to osu.Game/Screens/Select/Carousel/SetPanelBackground.cs
index 587aa0a74e..6af0cbf4ab 100644
--- a/osu.Game/Screens/Select/Carousel/PanelBackground.cs
+++ b/osu.Game/Screens/Select/Carousel/SetPanelBackground.cs
@@ -9,9 +9,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Select.Carousel
 {
-    public class PanelBackground : BufferedContainer
+    public class SetPanelBackground : BufferedContainer
     {
-        public PanelBackground(WorkingBeatmap working)
+        public SetPanelBackground(WorkingBeatmap working)
         {
             CacheDrawnFrameBuffer = true;
             RedrawOnScale = false;
diff --git a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
new file mode 100644
index 0000000000..4e8d27f14d
--- /dev/null
+++ b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
@@ -0,0 +1,93 @@
+// Copyright (c) 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Screens.Select.Carousel
+{
+    public class SetPanelContent : CompositeDrawable
+    {
+        private readonly CarouselBeatmapSet carouselSet;
+
+        public SetPanelContent(CarouselBeatmapSet carouselSet)
+        {
+            this.carouselSet = carouselSet;
+
+            // required to ensure we load as soon as any part of the panel comes on screen
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var beatmapSet = carouselSet.BeatmapSet;
+
+            InternalChild = new FillFlowContainer
+            {
+                // required to ensure we load as soon as any part of the panel comes on screen
+                RelativeSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Text = new LocalisedString((beatmapSet.Metadata.TitleUnicode, beatmapSet.Metadata.Title)),
+                        Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 22, italics: true),
+                        Shadow = true,
+                    },
+                    new OsuSpriteText
+                    {
+                        Text = new LocalisedString((beatmapSet.Metadata.ArtistUnicode, beatmapSet.Metadata.Artist)),
+                        Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
+                        Shadow = true,
+                    },
+                    new FillFlowContainer
+                    {
+                        Direction = FillDirection.Horizontal,
+                        AutoSizeAxes = Axes.Both,
+                        Margin = new MarginPadding { Top = 5 },
+                        Children = new Drawable[]
+                        {
+                            new BeatmapSetOnlineStatusPill
+                            {
+                                Origin = Anchor.CentreLeft,
+                                Anchor = Anchor.CentreLeft,
+                                Margin = new MarginPadding { Right = 5 },
+                                TextSize = 11,
+                                TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
+                                Status = beatmapSet.Status
+                            },
+                            new FillFlowContainer<DifficultyIcon>
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Spacing = new Vector2(3),
+                                ChildrenEnumerable = getDifficultyIcons(),
+                            },
+                        }
+                    }
+                }
+            };
+        }
+
+        private const int maximum_difficulty_icons = 18;
+
+        private IEnumerable<DifficultyIcon> getDifficultyIcons()
+        {
+            var beatmaps = carouselSet.Beatmaps.ToList();
+
+            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));
+        }
+    }
+}

From b1ddb08a4efefd378d65ec8756e21c597b089030 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 17:57:38 +0900
Subject: [PATCH 05428/10326] Fix right click context menus appearing in
 incorrect locations

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index bafb338a04..a66135196a 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Events;
+using osuTK;
 
 namespace osu.Game.Screens.Select.Carousel
 {
@@ -27,6 +28,9 @@ namespace osu.Game.Screens.Select.Carousel
 
         protected readonly Container MovementContainer;
 
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+            Header.ReceivePositionalInputAt(screenSpacePos);
+
         private CarouselItem item;
 
         public CarouselItem Item

From 69650c16fc539d66a589054792a1b5524d92a842 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 18:13:36 +0900
Subject: [PATCH 05429/10326] Simplify vertical position calculations by
 including spacing in height definition

---
 osu.Game/Screens/Select/BeatmapCarousel.cs               | 2 +-
 osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs   | 2 +-
 .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs   | 9 +++++++--
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs        | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index bc2494e9b7..955693a67c 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -775,7 +775,7 @@ namespace osu.Game.Screens.Select
                                     break;
                                 }
 
-                                scrollTarget += b.TotalHeight + DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
+                                scrollTarget += b.TotalHeight;
                             }
                         }
 
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index f2f8cb9bd9..7935debac7 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Select.Carousel
                 switch (State.Value)
                 {
                     case CarouselItemState.Selected:
-                        return DrawableCarouselBeatmapSet.HEIGHT + Children.Count(c => c.Visible) * (DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING + DrawableCarouselBeatmap.HEIGHT);
+                        return DrawableCarouselBeatmapSet.HEIGHT + Children.Count(c => c.Visible) * DrawableCarouselBeatmap.HEIGHT;
 
                     default:
                         return DrawableCarouselBeatmapSet.HEIGHT;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index a655186986..49a370724e 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -33,7 +33,12 @@ namespace osu.Game.Screens.Select.Carousel
     {
         public const float CAROUSEL_BEATMAP_SPACING = 5;
 
-        public const float HEIGHT = MAX_HEIGHT * 0.6f; // TODO: add once base class is fixed + CAROUSEL_BEATMAP_SPACING;
+        /// <summary>
+        /// The height of a carousel beatmap, including vertical spacing.
+        /// </summary>
+        public const float HEIGHT = height + CAROUSEL_BEATMAP_SPACING;
+
+        private const float height = MAX_HEIGHT * 0.6f;
 
         private readonly BeatmapInfo beatmap;
 
@@ -70,7 +75,7 @@ namespace osu.Game.Screens.Select.Carousel
         [BackgroundDependencyLoader(true)]
         private void load(BeatmapManager manager, SongSelect songSelect)
         {
-            Header.Height = HEIGHT;
+            Header.Height = height;
 
             if (songSelect != null)
             {
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index ad5c4e5e4f..68fea14757 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Screens.Select.Carousel
                 foreach (var panel in beatmapContainer.Children)
                 {
                     panel.MoveToY(yPos, 800, Easing.OutQuint);
-                    yPos += panel.Item.TotalHeight + DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
+                    yPos += panel.Item.TotalHeight;
                 }
             }
         }

From 3d9ea852ecf48cf40f8669665815b8c2bfb18abb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 18:14:23 +0900
Subject: [PATCH 05430/10326] Remove masking override (no longer needed as our
 size is now correct)

---
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 68fea14757..b80e789429 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -8,7 +8,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
@@ -22,9 +21,6 @@ namespace osu.Game.Screens.Select.Carousel
     {
         public const float HEIGHT = MAX_HEIGHT;
 
-        // TODO: don't do this. need to split out the base class' style so our height isn't fixed to the panel display height (and autosize?).
-        protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
-
         private Action<BeatmapSetInfo> restoreHiddenRequested;
         private Action<int> viewDetails;
 

From 83358d487fb5770877948e671621eada6cc91abb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 18:18:22 +0900
Subject: [PATCH 05431/10326] Remove logging

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 20 ++++++++-----------
 .../Carousel/DrawableCarouselBeatmapSet.cs    |  5 -----
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 955693a67c..e53beaef0b 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -1,30 +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 osuTK;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using osu.Game.Configuration;
-using osuTK.Input;
-using osu.Framework.Utils;
 using System.Diagnostics;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
-using osu.Framework.Threading;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Logging;
+using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Extensions;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
 using osu.Game.Screens.Select.Carousel;
+using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Select
 {
@@ -589,8 +588,6 @@ namespace osu.Game.Screens.Select
             // This involves fetching new items from the pool, returning no-longer required items.
             if (revalidateItems || newDisplayRange != displayedRange)
             {
-                Logger.Log("revalidation requested");
-
                 displayedRange = newDisplayRange;
 
                 var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first);
@@ -616,7 +613,6 @@ namespace osu.Game.Screens.Select
                 // Add those items within the previously found index range that should be displayed.
                 foreach (var item in toDisplay)
                 {
-                    Logger.Log($"getting panel for {item} from pool");
                     var panel = setPool.Get(p => p.Item = item);
 
                     panel.Depth = item.CarouselYPosition;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index b80e789429..bf76adc6ac 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Graphics.UserInterface;
@@ -70,12 +69,10 @@ namespace osu.Game.Screens.Select.Carousel
             if (Item == null)
                 return;
 
-            Logger.Log($"updating item {beatmapSet}");
             Header.Children = new Drawable[]
             {
                 new DelayedLoadUnloadWrapper(() =>
                 {
-                    Logger.Log($"loaded background item {beatmapSet}");
                     var background = new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -151,8 +148,6 @@ namespace osu.Game.Screens.Select.Carousel
                     ChildrenEnumerable = visibleBeatmaps.Select(c => c.CreateDrawableRepresentation()).ToArray()
                 };
 
-                Logger.Log($"loading {visibleBeatmaps.Length} beatmaps for {Item}");
-
                 LoadComponentAsync(beatmapContainer, loaded =>
                 {
                     // make sure the pooled target hasn't changed.

From 4f4f2225143c425e9ec9f35592adddffa16284f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 18:28:28 +0900
Subject: [PATCH 05432/10326] Remove unnecessary fade (already applied by base
 DrawableCarouselItem)

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index bf76adc6ac..aae4d0df5d 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -103,10 +103,7 @@ namespace osu.Game.Screens.Select.Carousel
             if (beatmapContainer != null)
             {
                 foreach (var beatmap in beatmapContainer)
-                {
                     beatmap.MoveToY(0, 800, Easing.OutQuint);
-                    beatmap.FadeOut(80);
-                }
             }
         }
 

From 40a0ab7aaaf1139fbcf068ad0e7d358772c43118 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 18:33:31 +0900
Subject: [PATCH 05433/10326] Avoid allocating CarouselItems for bounds checks

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index e53beaef0b..340f30c120 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -646,19 +646,24 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        private readonly CarouselBoundsItem carouselBoundsItem = new CarouselBoundsItem();
+
         private (int firstIndex, int lastIndex) getDisplayRange()
         {
             // Find index range of all items that should be on-screen
-            // TODO: reduce allocs of CarouselBoundsItem.
-            int firstIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleUpperBound - distance_offscreen_to_preload));
+            carouselBoundsItem.CarouselYPosition = visibleUpperBound - distance_offscreen_to_preload;
+            int firstIndex = visibleItems.BinarySearch(carouselBoundsItem);
             if (firstIndex < 0) firstIndex = ~firstIndex;
-            int lastIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleBottomBound + distance_offscreen_to_preload));
+
+            carouselBoundsItem.CarouselYPosition = visibleBottomBound + distance_offscreen_to_preload;
+            int lastIndex = visibleItems.BinarySearch(carouselBoundsItem);
             if (lastIndex < 0) lastIndex = ~lastIndex;
 
             // as we can't be 100% sure on the size of individual carousel drawables,
             // always play it safe and extend bounds by one.
             firstIndex = Math.Max(0, firstIndex - 1);
             lastIndex = Math.Min(visibleItems.Count, lastIndex + 1);
+
             return (firstIndex, lastIndex);
         }
 
@@ -856,11 +861,6 @@ namespace osu.Game.Screens.Select
         /// </summary>
         private class CarouselBoundsItem : CarouselItem
         {
-            public CarouselBoundsItem(in float pos)
-            {
-                CarouselYPosition = pos;
-            }
-
             public override DrawableCarouselItem CreateDrawableRepresentation() =>
                 throw new NotImplementedException();
         }

From a1801f8ae40f7e65da4305f7ab08dbb91ce0f7f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 18:33:55 +0900
Subject: [PATCH 05434/10326] Unmark todo for now

---
 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 340f30c120..dcebabae4d 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -604,7 +604,7 @@ namespace osu.Game.Screens.Select
                     // remove but only if too far off-screen
                     if (panel.Y < visibleUpperBound - distance_offscreen_before_unload || panel.Y > visibleBottomBound + distance_offscreen_before_unload)
                     {
-                        // todo: may want a fade effect here (could be seen if a huge change happens, like a set with 20 difficulties becomes selected).
+                        // may want a fade effect here (could be seen if a huge change happens, like a set with 20 difficulties becomes selected).
                         panel.ClearTransforms();
                         panel.Expire();
                     }

From 2346644c048b781fa6eae9fb144d038e9ed1ee40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 18:47:35 +0900
Subject: [PATCH 05435/10326] Switch DelayedLoadUnloadWrappers to
 DelayedLoadWrappers

Due to pooling usage, there is no time we need to unload. Switching to
DelayedLoadWrapper cleans up the code and reduces overhead
substantially.
---
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index aae4d0df5d..42d073976e 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -69,29 +69,25 @@ namespace osu.Game.Screens.Select.Carousel
             if (Item == null)
                 return;
 
+            DelayedLoadWrapper background;
+            DelayedLoadWrapper mainFlow;
+
             Header.Children = new Drawable[]
             {
-                new DelayedLoadUnloadWrapper(() =>
+                background = new DelayedLoadWrapper(new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
                 {
-                    var background = new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    };
-
-                    background.OnLoadComplete += d => d.FadeInFromZero(1000, Easing.OutQuint);
-
-                    return background;
-                }, 300, 5000),
-                new DelayedLoadUnloadWrapper(() =>
-                {
-                    // main content split into own class to reduce allocation before load operation triggers.
-                    var mainFlow = new SetPanelContent((CarouselBeatmapSet)Item);
-
-                    mainFlow.OnLoadComplete += d => d.FadeInFromZero(1000, Easing.OutQuint);
-
-                    return mainFlow;
-                }, 100, 5000)
+                    RelativeSizeAxes = Axes.Both,
+                }, 300),
+                mainFlow = new DelayedLoadWrapper(new SetPanelContent((CarouselBeatmapSet)Item), 100),
             };
+
+            background.DelayedLoadComplete += fadeContentIn;
+            mainFlow.DelayedLoadComplete += fadeContentIn;
+        }
+
+        private void fadeContentIn(Drawable d)
+        {
+            d.FadeInFromZero(1000, Easing.OutQuint);
         }
 
         protected override void Deselected()

From 834b0186f41f64b12a23f70abfdb34bc923d5074 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 18:50:10 +0900
Subject: [PATCH 05436/10326] Adjust fade duration to be slightly shorter

---
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 42d073976e..e83c460f15 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -85,10 +85,7 @@ namespace osu.Game.Screens.Select.Carousel
             mainFlow.DelayedLoadComplete += fadeContentIn;
         }
 
-        private void fadeContentIn(Drawable d)
-        {
-            d.FadeInFromZero(1000, Easing.OutQuint);
-        }
+        private void fadeContentIn(Drawable d) => d.FadeInFromZero(750, Easing.OutQuint);
 
         protected override void Deselected()
         {

From 8eca28e8bc3986ed99c78f54fbe6769dca3af6cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 19:10:35 +0900
Subject: [PATCH 05437/10326] Add comment about off-screen loading

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index dcebabae4d..21777c5c7c 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -74,6 +74,18 @@ namespace osu.Game.Screens.Select
         public override bool PropagatePositionalInputSubTree => AllowSelection;
         public override bool PropagateNonPositionalInputSubTree => AllowSelection;
 
+        private (int first, int last) displayedRange;
+
+        /// <summary>
+        /// Extend the range to retain already loaded pooled drawables.
+        /// </summary>
+        private const float distance_offscreen_before_unload = 1024;
+
+        /// <summary>
+        /// Extend the range to update positions / retrieve pooled drawables outside of visible range.
+        /// </summary>
+        private const float distance_offscreen_to_preload = 512; // todo: adjust this appropriately once we can make set panel contents load while off-screen.
+
         /// <summary>
         /// Whether carousel items have completed asynchronously loaded.
         /// </summary>
@@ -557,18 +569,6 @@ namespace osu.Game.Screens.Select
 
         #endregion
 
-        private (int first, int last) displayedRange;
-
-        /// <summary>
-        /// Extend the range to retain already loaded pooled drawables.
-        /// </summary>
-        private const float distance_offscreen_before_unload = 1024;
-
-        /// <summary>
-        /// Extend the range to update positions / retrieve pooled drawables outside of visible range.
-        /// </summary>
-        private const float distance_offscreen_to_preload = 256;
-
         protected override void Update()
         {
             base.Update();

From 37daefc2b59da55abe3fcc9a6fc62cf7deeee623 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 19:12:33 +0900
Subject: [PATCH 05438/10326] Remove outdated comment

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index a66135196a..df8d5cd565 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -99,8 +99,6 @@ namespace osu.Game.Screens.Select.Carousel
         protected override void Update()
         {
             base.Update();
-
-            // avoid using fill flow for performance reasons. header size doesn't change after load.
             Content.Y = Header.Height;
         }
 

From 5d11db7753212439c219b7c60863eb4bfb6680cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 19:15:56 +0900
Subject: [PATCH 05439/10326] Locallise ChildItems to
 DrawableCarouselBeatmapSet for clarity

---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs  | 2 +-
 osu.Game/Screens/Select/BeatmapCarousel.cs                    | 2 +-
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs     | 2 +-
 osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs      | 4 ----
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 239fa9ec4e..0ba8cfeb28 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -923,7 +923,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                         if (item is DrawableCarouselBeatmapSet set)
                         {
-                            foreach (var difficulty in set.ChildItems)
+                            foreach (var difficulty in set.DrawableBeatmaps)
                                 yield return difficulty;
                         }
                     }
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 21777c5c7c..c011ea7e05 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -640,7 +640,7 @@ namespace osu.Game.Screens.Select
 
                 if (item is DrawableCarouselBeatmapSet set)
                 {
-                    foreach (var diff in set.ChildItems)
+                    foreach (var diff in set.DrawableBeatmaps)
                         updateItem(diff, item);
                 }
             }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index e83c460f15..79387a9905 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
 
-        public override IEnumerable<DrawableCarouselItem> ChildItems => beatmapContainer?.Children ?? base.ChildItems;
+        public IEnumerable<DrawableCarouselItem> DrawableBeatmaps => beatmapContainer?.Children ?? Enumerable.Empty<DrawableCarouselItem>();
 
         private BeatmapSetInfo beatmapSet => (Item as CarouselBeatmapSet)?.BeatmapSet;
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index df8d5cd565..cde3edad39 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -1,9 +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 System.Diagnostics;
-using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -62,8 +60,6 @@ namespace osu.Game.Screens.Select.Carousel
             }
         }
 
-        public virtual IEnumerable<DrawableCarouselItem> ChildItems => Enumerable.Empty<DrawableCarouselItem>();
-
         protected DrawableCarouselItem()
         {
             RelativeSizeAxes = Axes.X;

From 75b6a5e17e23377b33f5ea463ecff07e40ac5b56 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 19:17:23 +0900
Subject: [PATCH 05440/10326] Remove unnecessary hack (fixed via framework
 update)

---
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 79387a9905..cd1c0a08c7 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -113,9 +113,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             var carouselBeatmapSet = (CarouselBeatmapSet)Item;
 
-            var visibleBeatmaps = carouselBeatmapSet.Children
-                                                    .Where(c => c.Visible)
-                                                    .ToArray();
+            var visibleBeatmaps = carouselBeatmapSet.Children.Where(c => c.Visible).ToArray();
 
             // if we are already displaying all the correct beatmaps, only run animation updates.
             // note that the displayed beatmaps may change due to the applied filter.
@@ -129,13 +127,11 @@ namespace osu.Game.Screens.Select.Carousel
                 // on selection we show our child beatmaps.
                 // for now this is a simple drawable construction each selection.
                 // can be improved in the future.
-
                 beatmapContainer = new Container<DrawableCarouselItem>
                 {
                     X = 100,
                     RelativeSizeAxes = Axes.Both,
-                    // ToArray() in this line is required due to framework oversight: https://github.com/ppy/osu-framework/pull/3929
-                    ChildrenEnumerable = visibleBeatmaps.Select(c => c.CreateDrawableRepresentation()).ToArray()
+                    ChildrenEnumerable = visibleBeatmaps.Select(c => c.CreateDrawableRepresentation())
                 };
 
                 LoadComponentAsync(beatmapContainer, loaded =>

From 3d416f4d6475c815424e71a8e97a34cb6b933b0a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 19:20:46 +0900
Subject: [PATCH 05441/10326] Clean up beatmapSet resolution in
 DrawableCarouselBeatmapSet

---
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index cd1c0a08c7..93dc79242e 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -34,10 +35,10 @@ namespace osu.Game.Screens.Select.Carousel
 
         public IEnumerable<DrawableCarouselItem> DrawableBeatmaps => beatmapContainer?.Children ?? Enumerable.Empty<DrawableCarouselItem>();
 
-        private BeatmapSetInfo beatmapSet => (Item as CarouselBeatmapSet)?.BeatmapSet;
-
         private Container<DrawableCarouselItem> beatmapContainer;
 
+        private BeatmapSetInfo beatmapSet;
+
         [Resolved]
         private BeatmapManager manager { get; set; }
 
@@ -69,6 +70,8 @@ namespace osu.Game.Screens.Select.Carousel
             if (Item == null)
                 return;
 
+            beatmapSet = ((CarouselBeatmapSet)Item).BeatmapSet;
+
             DelayedLoadWrapper background;
             DelayedLoadWrapper mainFlow;
 
@@ -161,6 +164,8 @@ namespace osu.Game.Screens.Select.Carousel
         {
             get
             {
+                Debug.Assert(beatmapSet != null);
+
                 List<MenuItem> items = new List<MenuItem>();
 
                 if (Item.State.Value == CarouselItemState.NotSelected)
@@ -189,6 +194,8 @@ namespace osu.Game.Screens.Select.Carousel
 
         private MenuItem createCollectionMenuItem(BeatmapCollection collection)
         {
+            Debug.Assert(beatmapSet != null);
+
             TernaryState state;
 
             var countExisting = beatmapSet.Beatmaps.Count(b => collection.Beatmaps.Contains(b));

From 8057ea1097b8d3fe570a4183d40e3369ecb82ee8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 20:50:36 +0900
Subject: [PATCH 05442/10326] Fix formatting issues

---
 osu.Game/Screens/Select/Carousel/CarouselHeader.cs     | 10 ++++++++--
 .../Select/Carousel/FilterableDifficultyIcon.cs        |  2 +-
 .../Select/Carousel/FilterableGroupedDifficultyIcon.cs |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index f59cccd8b6..f1120f55a6 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -77,7 +77,10 @@ namespace osu.Game.Screens.Select.Carousel
                     BorderContainer.BorderThickness = 0;
                     BorderContainer.EdgeEffect = new EdgeEffectParameters
                     {
-                        Type = EdgeEffectType.Shadow, Offset = new Vector2(1), Radius = 10, Colour = Color4.Black.Opacity(100),
+                        Type = EdgeEffectType.Shadow,
+                        Offset = new Vector2(1),
+                        Radius = 10,
+                        Colour = Color4.Black.Opacity(100),
                     };
                     break;
 
@@ -85,7 +88,10 @@ namespace osu.Game.Screens.Select.Carousel
                     BorderContainer.BorderThickness = 2.5f;
                     BorderContainer.EdgeEffect = new EdgeEffectParameters
                     {
-                        Type = EdgeEffectType.Glow, Colour = new Color4(130, 204, 255, 150), Radius = 20, Roundness = 10,
+                        Type = EdgeEffectType.Glow,
+                        Colour = new Color4(130, 204, 255, 150),
+                        Radius = 20,
+                        Roundness = 10,
                     };
                     break;
             }
diff --git a/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs b/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs
index 591e9fea22..aa832623fe 100644
--- a/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs
+++ b/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs
@@ -29,4 +29,4 @@ namespace osu.Game.Screens.Select.Carousel
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs b/osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs
index 73b5781a37..31a651d2c8 100644
--- a/osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs
+++ b/osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs
@@ -35,4 +35,4 @@ namespace osu.Game.Screens.Select.Carousel
             this.FadeTo(1 - 0.9f * ((float)Items.Count(i => i.Filtered.Value) / Items.Count), 100);
         }
     }
-}
\ No newline at end of file
+}

From e662dc5342b26ecedd265b55c121a058006e2ad3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 20:57:26 +0900
Subject: [PATCH 05443/10326] Add missing licence headers

---
 osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs   | 3 +++
 .../Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs | 3 +++
 osu.Game/Screens/Select/Carousel/SetPanelBackground.cs         | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs b/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs
index aa832623fe..dce593b85c 100644
--- a/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs
+++ b/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.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.
+
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
diff --git a/osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs b/osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs
index 31a651d2c8..d2f9ed3a6a 100644
--- a/osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.cs
+++ b/osu.Game/Screens/Select/Carousel/FilterableGroupedDifficultyIcon.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.
+
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Screens/Select/Carousel/SetPanelBackground.cs b/osu.Game/Screens/Select/Carousel/SetPanelBackground.cs
index 6af0cbf4ab..25139b27db 100644
--- a/osu.Game/Screens/Select/Carousel/SetPanelBackground.cs
+++ b/osu.Game/Screens/Select/Carousel/SetPanelBackground.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.
+
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;

From 663b8069746a5b79c1acc0b276a31be0e8710825 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 13 Oct 2020 17:45:40 +0200
Subject: [PATCH 05444/10326] move ModSettingsContainer to seperate component

---
 .../Overlays/Mods/CModSettingsContainer.cs    | 71 +++++++++++++++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 56 +--------------
 2 files changed, 74 insertions(+), 53 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/CModSettingsContainer.cs

diff --git a/osu.Game/Overlays/Mods/CModSettingsContainer.cs b/osu.Game/Overlays/Mods/CModSettingsContainer.cs
new file mode 100644
index 0000000000..a5f33e46c4
--- /dev/null
+++ b/osu.Game/Overlays/Mods/CModSettingsContainer.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.Collections.Generic;
+using System.Linq;
+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.Configuration;
+using osu.Game.Graphics.Containers;
+using osu.Game.Rulesets.Mods;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class CModSettingsContainer : Container
+    {
+        private readonly FillFlowContainer<ModControlSection> modSettingsContent;
+
+        public CModSettingsContainer()
+        {
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = new Color4(0, 0, 0, 192)
+                },
+                new OsuScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = modSettingsContent = new FillFlowContainer<ModControlSection>
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(0f, 10f),
+                        Padding = new MarginPadding(20),
+                    }
+                }
+            };
+        }
+
+        ///<returns>Bool indicating whether any settings are listed</returns>
+        public bool UpdateModSettings(ValueChangedEvent<IReadOnlyList<Mod>> mods)
+        {
+            modSettingsContent.Clear();
+
+            foreach (var mod in mods.NewValue)
+            {
+                var settings = mod.CreateSettingsControls().ToList();
+                if (settings.Count > 0)
+                    modSettingsContent.Add(new ModControlSection(mod, settings));
+            }
+
+            bool hasSettings = modSettingsContent.Count > 0;
+
+            if (!hasSettings)
+                Hide();
+
+            return hasSettings;
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
+        protected override bool OnHover(HoverEvent e) => true;
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index f74f40b9b4..b9a37094d7 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
@@ -45,9 +44,7 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly FillFlowContainer<ModSection> ModSectionsContainer;
 
-        protected readonly FillFlowContainer<ModControlSection> ModSettingsContent;
-
-        protected readonly Container ModSettingsContainer;
+        protected readonly CModSettingsContainer ModSettingsContainer;
 
         public readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
@@ -284,7 +281,7 @@ namespace osu.Game.Overlays.Mods
                         },
                     },
                 },
-                ModSettingsContainer = new MouseInputAbsorbingContainer
+                ModSettingsContainer = new CModSettingsContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.BottomRight,
@@ -292,27 +289,6 @@ namespace osu.Game.Overlays.Mods
                     Width = 0.25f,
                     Alpha = 0,
                     X = -100,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = new Color4(0, 0, 0, 192)
-                        },
-                        new OsuScrollContainer
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Child = ModSettingsContent = new FillFlowContainer<ModControlSection>
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Spacing = new Vector2(0f, 10f),
-                                Padding = new MarginPadding(20),
-                            }
-                        }
-                    }
                 }
             };
         }
@@ -424,7 +400,7 @@ namespace osu.Game.Overlays.Mods
 
             updateMods();
 
-            updateModSettings(mods);
+            CustomiseButton.Enabled.Value = ModSettingsContainer.UpdateModSettings(mods);
         }
 
         private void updateMods()
@@ -445,25 +421,6 @@ namespace osu.Game.Overlays.Mods
                 MultiplierLabel.FadeColour(Color4.White, 200);
         }
 
-        private void updateModSettings(ValueChangedEvent<IReadOnlyList<Mod>> selectedMods)
-        {
-            ModSettingsContent.Clear();
-
-            foreach (var mod in selectedMods.NewValue)
-            {
-                var settings = mod.CreateSettingsControls().ToList();
-                if (settings.Count > 0)
-                    ModSettingsContent.Add(new ModControlSection(mod, settings));
-            }
-
-            bool hasSettings = ModSettingsContent.Count > 0;
-
-            CustomiseButton.Enabled.Value = hasSettings;
-
-            if (!hasSettings)
-                ModSettingsContainer.Hide();
-        }
-
         private void modButtonPressed(Mod selectedMod)
         {
             if (selectedMod != null)
@@ -495,12 +452,5 @@ namespace osu.Game.Overlays.Mods
         }
 
         #endregion
-
-        protected class MouseInputAbsorbingContainer : Container
-        {
-            protected override bool OnMouseDown(MouseDownEvent e) => true;
-
-            protected override bool OnHover(HoverEvent e) => true;
-        }
     }
 }

From 28d3295f9f25df1cf60f77dd42353ef736390d6f Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 13 Oct 2020 19:20:15 +0200
Subject: [PATCH 05445/10326] Test Class Fixes

---
 .../Visual/UserInterface/TestSceneModSettings.cs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index a31e244ca5..6a46ff2666 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
@@ -30,8 +31,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private readonly Mod testCustomisableAutoOpenMod = new TestModCustomisable2();
 
-        private readonly Mod testCustomisableMenuCoveredMod = new TestModCustomisable1();
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -107,8 +106,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("change mod settings menu width to full screen", () => modSelect.SetModSettingsWidth(1.0f));
             AddStep("select cm2", () => modSelect.SelectMod(testCustomisableAutoOpenMod));
             AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.Alpha == 1);
-            AddStep("hover over mod behind settings menu", () => InputManager.MoveMouseTo(modSelect.GetModButton(testCustomisableMenuCoveredMod)));
-            AddAssert("Mod is not considered hovered over", () => !modSelect.GetModButton(testCustomisableMenuCoveredMod).IsHovered);
+            AddStep("hover over mod behind settings menu", () => InputManager.MoveMouseTo(modSelect.GetModButton(testCustomisableMod)));
+            AddAssert("Mod is not considered hovered over", () => !modSelect.GetModButton(testCustomisableMod).IsHovered);
             AddStep("left click mod", () => InputManager.Click(MouseButton.Left));
             AddAssert("only cm2 is active", () => SelectedMods.Value.Count == 1);
             AddStep("right click mod", () => InputManager.Click(MouseButton.Right));
@@ -143,19 +142,14 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             public ModButton GetModButton(Mod mod)
             {
-                return ModSectionsContainer.Children.Single(s => s.ModType == mod.Type)
-                                           .ButtonsContainer.OfType<ModButton>().Single(b => b.Mods.Any(m => m.GetType() == mod.GetType()));
+                return ModSectionsContainer.ChildrenOfType<ModButton>().Single(b => b.Mods.Any(m => m.GetType() == mod.GetType()));
             }
 
             public void SelectMod(Mod mod) =>
                 GetModButton(mod).SelectNext(1);
 
-            public float SetModSettingsWidth(float newWidth)
-            {
-                float oldWidth = ModSettingsContainer.Width;
+            public void SetModSettingsWidth(float newWidth) =>
                 ModSettingsContainer.Width = newWidth;
-                return oldWidth;
-            }
         }
 
         public class TestRulesetInfo : RulesetInfo

From 3fd913b13f5a4b317aa5edd45b5cf00de6d45b21 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 13 Oct 2020 19:25:42 +0200
Subject: [PATCH 05446/10326] rename customisation container class

---
 ...{CModSettingsContainer.cs => ModCustomisationContainer.cs} | 4 ++--
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Overlays/Mods/{CModSettingsContainer.cs => ModCustomisationContainer.cs} (95%)

diff --git a/osu.Game/Overlays/Mods/CModSettingsContainer.cs b/osu.Game/Overlays/Mods/ModCustomisationContainer.cs
similarity index 95%
rename from osu.Game/Overlays/Mods/CModSettingsContainer.cs
rename to osu.Game/Overlays/Mods/ModCustomisationContainer.cs
index a5f33e46c4..487d92882a 100644
--- a/osu.Game/Overlays/Mods/CModSettingsContainer.cs
+++ b/osu.Game/Overlays/Mods/ModCustomisationContainer.cs
@@ -16,11 +16,11 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class CModSettingsContainer : Container
+    public class ModCustomisationContainer : Container
     {
         private readonly FillFlowContainer<ModControlSection> modSettingsContent;
 
-        public CModSettingsContainer()
+        public ModCustomisationContainer()
         {
             Children = new Drawable[]
             {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b9a37094d7..b1ffd26bb9 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly FillFlowContainer<ModSection> ModSectionsContainer;
 
-        protected readonly CModSettingsContainer ModSettingsContainer;
+        protected readonly ModCustomisationContainer ModSettingsContainer;
 
         public readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
@@ -281,7 +281,7 @@ namespace osu.Game.Overlays.Mods
                         },
                     },
                 },
-                ModSettingsContainer = new CModSettingsContainer
+                ModSettingsContainer = new ModCustomisationContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.BottomRight,

From 07e6609e6de38054cbc5e9c64e04f8317da75e8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 14:15:53 +0900
Subject: [PATCH 05447/10326] Disable difficulty calculation for set-level
 difficulty icons

---
 osu.Game/Beatmaps/Drawables/DifficultyIcon.cs     | 15 ++++++++++++---
 .../Select/Carousel/FilterableDifficultyIcon.cs   |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index 45327d4514..a1d5e33d1e 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
@@ -47,7 +47,10 @@ namespace osu.Game.Beatmaps.Drawables
         private readonly IReadOnlyList<Mod> mods;
 
         private readonly bool shouldShowTooltip;
-        private readonly IBindable<StarDifficulty> difficultyBindable = new Bindable<StarDifficulty>();
+
+        private readonly bool performBackgroundDifficultyLookup;
+
+        private readonly Bindable<StarDifficulty> difficultyBindable = new Bindable<StarDifficulty>();
 
         private Drawable background;
 
@@ -70,10 +73,12 @@ namespace osu.Game.Beatmaps.Drawables
         /// </summary>
         /// <param name="beatmap">The beatmap to show the difficulty of.</param>
         /// <param name="shouldShowTooltip">Whether to display a tooltip when hovered.</param>
-        public DifficultyIcon([NotNull] BeatmapInfo beatmap, bool shouldShowTooltip = true)
+        /// <param name="performBackgroundDifficultyLookup">Whether to perform difficulty lookup (including calculation if necessary).</param>
+        public DifficultyIcon([NotNull] BeatmapInfo beatmap, bool shouldShowTooltip = true, bool performBackgroundDifficultyLookup = true)
         {
             this.beatmap = beatmap ?? throw new ArgumentNullException(nameof(beatmap));
             this.shouldShowTooltip = shouldShowTooltip;
+            this.performBackgroundDifficultyLookup = performBackgroundDifficultyLookup;
 
             AutoSizeAxes = Axes.Both;
 
@@ -112,9 +117,13 @@ namespace osu.Game.Beatmaps.Drawables
                     // the null coalesce here is only present to make unit tests work (ruleset dlls aren't copied correctly for testing at the moment)
                     Icon = (ruleset ?? beatmap.Ruleset)?.CreateInstance()?.CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.Regular.QuestionCircle }
                 },
-                new DelayedLoadUnloadWrapper(() => new DifficultyRetriever(beatmap, ruleset, mods) { StarDifficulty = { BindTarget = difficultyBindable } }, 0),
             };
 
+            if (performBackgroundDifficultyLookup)
+                iconContainer.Add(new DelayedLoadUnloadWrapper(() => new DifficultyRetriever(beatmap, ruleset, mods) { StarDifficulty = { BindTarget = difficultyBindable } }, 0));
+            else
+                difficultyBindable.Value = new StarDifficulty(beatmap.StarDifficulty, 0);
+
             difficultyBindable.BindValueChanged(difficulty => background.Colour = colours.ForDifficultyRating(difficulty.NewValue.DifficultyRating));
         }
 
diff --git a/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs b/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs
index dce593b85c..51fe7796c7 100644
--- a/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs
+++ b/osu.Game/Screens/Select/Carousel/FilterableDifficultyIcon.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Select.Carousel
         public readonly CarouselBeatmap Item;
 
         public FilterableDifficultyIcon(CarouselBeatmap item)
-            : base(item.Beatmap)
+            : base(item.Beatmap, performBackgroundDifficultyLookup: false)
         {
             filtered.BindTo(item.Filtered);
             filtered.ValueChanged += isFiltered => Schedule(() => this.FadeTo(isFiltered.NewValue ? 0.1f : 1, 100));

From 30e1fce7a4e82c7b595eb25115c9b0c38f0b7da7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 15:10:50 +0900
Subject: [PATCH 05448/10326] Reduce alloc overhead of
 DrawableCarouselBeatmapSet using new function-based ctor

---
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 93dc79242e..703b91c517 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -77,11 +77,11 @@ namespace osu.Game.Screens.Select.Carousel
 
             Header.Children = new Drawable[]
             {
-                background = new DelayedLoadWrapper(new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
+                background = new DelayedLoadWrapper(() => new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
                 {
                     RelativeSizeAxes = Axes.Both,
                 }, 300),
-                mainFlow = new DelayedLoadWrapper(new SetPanelContent((CarouselBeatmapSet)Item), 100),
+                mainFlow = new DelayedLoadWrapper(() => new SetPanelContent((CarouselBeatmapSet)Item), 100),
             };
 
             background.DelayedLoadComplete += fadeContentIn;

From 24eff8c66d8aab85a6509f9ea095c13cd5e8a09e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 15:13:49 +0900
Subject: [PATCH 05449/10326] Rename container to match "settings" term used
 everywhere

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                    | 4 ++--
 .../{ModCustomisationContainer.cs => ModSettingsContainer.cs} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Overlays/Mods/{ModCustomisationContainer.cs => ModSettingsContainer.cs} (95%)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b1ffd26bb9..2d8b4dba7c 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly FillFlowContainer<ModSection> ModSectionsContainer;
 
-        protected readonly ModCustomisationContainer ModSettingsContainer;
+        protected readonly ModSettingsContainer ModSettingsContainer;
 
         public readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
@@ -281,7 +281,7 @@ namespace osu.Game.Overlays.Mods
                         },
                     },
                 },
-                ModSettingsContainer = new ModCustomisationContainer
+                ModSettingsContainer = new ModSettingsContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.BottomRight,
diff --git a/osu.Game/Overlays/Mods/ModCustomisationContainer.cs b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
similarity index 95%
rename from osu.Game/Overlays/Mods/ModCustomisationContainer.cs
rename to osu.Game/Overlays/Mods/ModSettingsContainer.cs
index 487d92882a..0521bc35b8 100644
--- a/osu.Game/Overlays/Mods/ModCustomisationContainer.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
@@ -16,11 +16,11 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class ModCustomisationContainer : Container
+    public class ModSettingsContainer : Container
     {
         private readonly FillFlowContainer<ModControlSection> modSettingsContent;
 
-        public ModCustomisationContainer()
+        public ModSettingsContainer()
         {
             Children = new Drawable[]
             {

From 3e326a9234cb99d743f8ae80de42d85b4a43428c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 15:21:28 +0900
Subject: [PATCH 05450/10326] Use bindable flow for event propagation

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  5 +++--
 .../Overlays/Mods/ModSettingsContainer.cs     | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 2d8b4dba7c..31adf47456 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -289,8 +289,11 @@ namespace osu.Game.Overlays.Mods
                     Width = 0.25f,
                     Alpha = 0,
                     X = -100,
+                    SelectedMods = { BindTarget = SelectedMods },
                 }
             };
+
+            ((IBindable<bool>)CustomiseButton.Enabled).BindTo(ModSettingsContainer.HasSettingsForSelection);
         }
 
         [BackgroundDependencyLoader(true)]
@@ -399,8 +402,6 @@ namespace osu.Game.Overlays.Mods
                 section.SelectTypes(mods.NewValue.Select(m => m.GetType()).ToList());
 
             updateMods();
-
-            CustomiseButton.Enabled.Value = ModSettingsContainer.UpdateModSettings(mods);
         }
 
         private void updateMods()
diff --git a/osu.Game/Overlays/Mods/ModSettingsContainer.cs b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
index 0521bc35b8..b185b56ecd 100644
--- a/osu.Game/Overlays/Mods/ModSettingsContainer.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
@@ -18,6 +19,12 @@ namespace osu.Game.Overlays.Mods
 {
     public class ModSettingsContainer : Container
     {
+        public readonly IBindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+
+        public IBindable<bool> HasSettingsForSelection => hasSettingsForSelection;
+
+        private readonly Bindable<bool> hasSettingsForSelection = new Bindable<bool>();
+
         private readonly FillFlowContainer<ModControlSection> modSettingsContent;
 
         public ModSettingsContainer()
@@ -45,8 +52,14 @@ namespace osu.Game.Overlays.Mods
             };
         }
 
-        ///<returns>Bool indicating whether any settings are listed</returns>
-        public bool UpdateModSettings(ValueChangedEvent<IReadOnlyList<Mod>> mods)
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            SelectedMods.BindValueChanged(modsChanged, true);
+        }
+
+        private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             modSettingsContent.Clear();
 
@@ -62,7 +75,7 @@ namespace osu.Game.Overlays.Mods
             if (!hasSettings)
                 Hide();
 
-            return hasSettings;
+            hasSettingsForSelection.Value = hasSettings;
         }
 
         protected override bool OnMouseDown(MouseDownEvent e) => true;

From 4eccb03d71de9dd3ddb8e60c5a854bb92df1515e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 17:08:14 +0900
Subject: [PATCH 05451/10326] Add copyright notice

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game.Rulesets.Mania/MathUtils/LegacySortHelper.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/MathUtils/LegacySortHelper.cs b/osu.Game.Rulesets.Mania/MathUtils/LegacySortHelper.cs
index 421cc0ae04..0f4829028f 100644
--- a/osu.Game.Rulesets.Mania/MathUtils/LegacySortHelper.cs
+++ b/osu.Game.Rulesets.Mania/MathUtils/LegacySortHelper.cs
@@ -12,6 +12,7 @@ namespace osu.Game.Rulesets.Mania.MathUtils
     /// </summary>
     /// <remarks>
     /// Source: https://referencesource.microsoft.com/#mscorlib/system/collections/generic/arraysorthelper.cs
+    /// Copyright (c) Microsoft Corporation.  All rights reserved.
     /// </remarks>
     internal static class LegacySortHelper<T>
     {

From f9bdb664ee7b8fd1c2a041f6d91b92fedca32d3b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 17:09:01 +0900
Subject: [PATCH 05452/10326] Update diffcalc test

---
 osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
index 2c36e81190..a25551f854 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mania.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";
 
-        [TestCase(2.3683365342338796d, "diffcalc-test")]
+        [TestCase(2.3449735700206298d, "diffcalc-test")]
         public void Test(double expected, string name)
             => base.Test(expected, name);
 

From 3e6ed6c9ffe327c9767b9fb054e396bf1a295b9d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 17:53:28 +0900
Subject: [PATCH 05453/10326] Add support for dual stages (keycoop) and score
 multiplier

---
 .../Beatmaps/ManiaBeatmap.cs                  |  9 ++++-
 .../Beatmaps/ManiaBeatmapConverter.cs         |  6 +++-
 .../Difficulty/ManiaDifficultyAttributes.cs   |  1 +
 .../Difficulty/ManiaDifficultyCalculator.cs   | 33 +++++++++++++++++++
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
index d1d5adea75..93a9ce3dbd 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
@@ -21,13 +21,20 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
         /// </summary>
         public int TotalColumns => Stages.Sum(g => g.Columns);
 
+        /// <summary>
+        /// The total number of columns that were present in this <see cref="ManiaBeatmap"/> before any user adjustments.
+        /// </summary>
+        public readonly int OriginalTotalColumns;
+
         /// <summary>
         /// Creates a new <see cref="ManiaBeatmap"/>.
         /// </summary>
         /// <param name="defaultStage">The initial stages.</param>
-        public ManiaBeatmap(StageDefinition defaultStage)
+        /// <param name="originalTotalColumns">The total number of columns present before any user adjustments. Defaults to the total columns in <paramref name="defaultStage"/>.</param>
+        public ManiaBeatmap(StageDefinition defaultStage, int? originalTotalColumns = null)
         {
             Stages.Add(defaultStage);
+            OriginalTotalColumns = originalTotalColumns ?? defaultStage.Columns;
         }
 
         public override IEnumerable<BeatmapStatistic> GetStatistics()
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index b17ab3f375..757329c525 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
         public bool Dual;
         public readonly bool IsForCurrentRuleset;
 
+        private int originalTargetColumns;
+
         // Internal for testing purposes
         internal FastRandom Random { get; private set; }
 
@@ -65,6 +67,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 else
                     TargetColumns = Math.Max(4, Math.Min((int)roundedOverallDifficulty + 1, 7));
             }
+
+            originalTargetColumns = TargetColumns;
         }
 
         public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition);
@@ -81,7 +85,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
         protected override Beatmap<ManiaHitObject> CreateBeatmap()
         {
-            beatmap = new ManiaBeatmap(new StageDefinition { Columns = TargetColumns });
+            beatmap = new ManiaBeatmap(new StageDefinition { Columns = TargetColumns }, originalTargetColumns);
 
             if (Dual)
                 beatmap.Stages.Add(new StageDefinition { Columns = TargetColumns });
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs
index 3ff665d2c8..0b58d1efc6 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs
@@ -8,5 +8,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
     public class ManiaDifficultyAttributes : DifficultyAttributes
     {
         public double GreatHitWindow;
+        public double ScoreMultiplier;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index a3694f354b..356621acda 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -47,6 +47,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 Mods = mods,
                 // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be removed in the future
                 GreatHitWindow = (int)(hitWindows.WindowFor(HitResult.Great)) / clockRate,
+                ScoreMultiplier = getScoreMultiplier(beatmap, mods),
                 MaxCombo = beatmap.HitObjects.Sum(h => h is HoldNote ? 2 : 1),
                 Skills = skills
             };
@@ -93,12 +94,44 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                     new ManiaModKey3(),
                     new ManiaModKey4(),
                     new ManiaModKey5(),
+                    new MultiMod(new ManiaModKey5(), new ManiaModDualStages()),
                     new ManiaModKey6(),
+                    new MultiMod(new ManiaModKey6(), new ManiaModDualStages()),
                     new ManiaModKey7(),
+                    new MultiMod(new ManiaModKey7(), new ManiaModDualStages()),
                     new ManiaModKey8(),
+                    new MultiMod(new ManiaModKey8(), new ManiaModDualStages()),
                     new ManiaModKey9(),
+                    new MultiMod(new ManiaModKey9(), new ManiaModDualStages()),
                 }).ToArray();
             }
         }
+
+        private double getScoreMultiplier(IBeatmap beatmap, Mod[] mods)
+        {
+            double scoreMultiplier = 1;
+
+            foreach (var m in mods)
+            {
+                switch (m)
+                {
+                    case ManiaModNoFail _:
+                    case ManiaModEasy _:
+                    case ManiaModHalfTime _:
+                        scoreMultiplier *= 0.5;
+                        break;
+                }
+            }
+
+            var maniaBeatmap = (ManiaBeatmap)beatmap;
+            int diff = maniaBeatmap.TotalColumns - maniaBeatmap.OriginalTotalColumns;
+
+            if (diff > 0)
+                scoreMultiplier *= 0.9;
+            else if (diff < 0)
+                scoreMultiplier *= 0.9 + 0.04 * diff;
+
+            return scoreMultiplier;
+        }
     }
 }

From f04aec538fa6286743147eb2e6f7c83c1b6c4a6b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 18:12:19 +0900
Subject: [PATCH 05454/10326] Fix MultiMod throwing exceptions when creating
 copies

---
 .../UserInterface/TestSceneModSettings.cs      | 18 ++++++++++++++++++
 osu.Game/Rulesets/Mods/MultiMod.cs             |  4 +++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index c5ce3751ef..0d43be3f65 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -95,6 +95,24 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("copy has original value", () => Precision.AlmostEquals(1.5, copy.SpeedChange.Value));
         }
 
+        [Test]
+        public void TestMultiModSettingsUnboundWhenCopied()
+        {
+            MultiMod original = null;
+            MultiMod copy = null;
+
+            AddStep("create mods", () =>
+            {
+                original = new MultiMod(new OsuModDoubleTime());
+                copy = (MultiMod)original.CreateCopy();
+            });
+
+            AddStep("change property", () => ((OsuModDoubleTime)original.Mods[0]).SpeedChange.Value = 2);
+
+            AddAssert("original has new value", () => Precision.AlmostEquals(2.0, ((OsuModDoubleTime)original.Mods[0]).SpeedChange.Value));
+            AddAssert("copy has original value", () => Precision.AlmostEquals(1.5, ((OsuModDoubleTime)copy.Mods[0]).SpeedChange.Value));
+        }
+
         private void createModSelect()
         {
             AddStep("create mod select", () =>
diff --git a/osu.Game/Rulesets/Mods/MultiMod.cs b/osu.Game/Rulesets/Mods/MultiMod.cs
index f7d574d3c7..2107009dbb 100644
--- a/osu.Game/Rulesets/Mods/MultiMod.cs
+++ b/osu.Game/Rulesets/Mods/MultiMod.cs
@@ -6,7 +6,7 @@ using System.Linq;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public class MultiMod : Mod
+    public sealed class MultiMod : Mod
     {
         public override string Name => string.Empty;
         public override string Acronym => string.Empty;
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Mods
             Mods = mods;
         }
 
+        public override Mod CreateCopy() => new MultiMod(Mods.Select(m => m.CreateCopy()).ToArray());
+
         public override Type[] IncompatibleMods => Mods.SelectMany(m => m.IncompatibleMods).ToArray();
     }
 }

From da8565c0fa653c7b8dee30ec71d8a51d0cdf97f1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 18:28:19 +0900
Subject: [PATCH 05455/10326] Add 10K mod to incompatibility list

---
 osu.Game.Rulesets.Mania/Mods/ManiaKeyMod.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaKeyMod.cs b/osu.Game.Rulesets.Mania/Mods/ManiaKeyMod.cs
index 13fdd74113..8fd5950dfb 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaKeyMod.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaKeyMod.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Rulesets.Mania.Mods
             typeof(ManiaModKey7),
             typeof(ManiaModKey8),
             typeof(ManiaModKey9),
+            typeof(ManiaModKey10),
         }.Except(new[] { GetType() }).ToArray();
     }
 }

From ace9fbc8d392c6acae2b7a076b6134d5415d5e68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 18:15:29 +0900
Subject: [PATCH 05456/10326] Confine available area for HUD components to
 excluse the song progress area

---
 osu.Game/Screens/Play/HUDOverlay.cs | 53 +++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 26aefa138b..f20127bc63 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -80,26 +80,49 @@ namespace osu.Game.Screens.Play
                 visibilityContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    Child = new GridContainer
                     {
-                        HealthDisplay = CreateHealthDisplay(),
-                        topScoreContainer = new Container
+                        RelativeSizeAxes = Axes.Both,
+                        Content = new[]
                         {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            AutoSizeAxes = Axes.Both,
-                            Children = new Drawable[]
+                            new Drawable[]
                             {
-                                AccuracyCounter = CreateAccuracyCounter(),
-                                ScoreCounter = CreateScoreCounter(),
-                                ComboCounter = CreateComboCounter(),
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
+                                        HealthDisplay = CreateHealthDisplay(),
+                                        topScoreContainer = new Container
+                                        {
+                                            Anchor = Anchor.TopCentre,
+                                            Origin = Anchor.TopCentre,
+                                            AutoSizeAxes = Axes.Both,
+                                            Children = new Drawable[]
+                                            {
+                                                AccuracyCounter = CreateAccuracyCounter(),
+                                                ScoreCounter = CreateScoreCounter(),
+                                                ComboCounter = CreateComboCounter(),
+                                            },
+                                        },
+                                        ComboCounter = CreateComboCounter(),
+                                        ModDisplay = CreateModsContainer(),
+                                        HitErrorDisplay = CreateHitErrorDisplayOverlay(),
+                                        PlayerSettingsOverlay = CreatePlayerSettingsOverlay(),
+                                    }
+                                },
                             },
+                            new Drawable[]
+                            {
+                                Progress = CreateProgress(),
+                            }
                         },
-                        Progress = CreateProgress(),
-                        ModDisplay = CreateModsContainer(),
-                        HitErrorDisplay = CreateHitErrorDisplayOverlay(),
-                        PlayerSettingsOverlay = CreatePlayerSettingsOverlay(),
-                    }
+                        RowDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.Distributed),
+                            new Dimension(GridSizeMode.AutoSize)
+                        }
+                    },
                 },
                 new FillFlowContainer
                 {

From 0cf3e909042f301788d2abd682cc23dfc9013e6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 18:15:58 +0900
Subject: [PATCH 05457/10326] Update SongProgress height based on its dynamic
 height during resize

---
 osu.Game/Screens/Play/SongProgress.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index aa745f5ba2..acf4640aa4 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -70,7 +70,6 @@ namespace osu.Game.Screens.Play
         public SongProgress()
         {
             Masking = true;
-            Height = bottom_bar_height + graph_height + handle_size.Y + info_height;
 
             Children = new Drawable[]
             {
@@ -148,6 +147,8 @@ namespace osu.Game.Screens.Play
 
             bar.CurrentTime = gameplayTime;
             graph.Progress = (int)(graph.ColumnCount * progress);
+
+            Height = bottom_bar_height + graph_height + handle_size.Y + info_height - graph.Y;
         }
 
         private void updateBarVisibility()

From a7f8e26e3572f97b9bd085c202dc214e88bcac5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 18:51:53 +0900
Subject: [PATCH 05458/10326] Adjust bottom-right elements positions based on
 song progress display

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

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index f20127bc63..9d7b3f55be 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -63,6 +63,8 @@ namespace osu.Game.Screens.Play
 
         private readonly Container topScoreContainer;
 
+        private FillFlowContainer bottomRightElements;
+
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
 
         public HUDOverlay(ScoreProcessor scoreProcessor, HealthProcessor healthProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
@@ -119,16 +121,16 @@ namespace osu.Game.Screens.Play
                         },
                         RowDimensions = new[]
                         {
-                            new Dimension(GridSizeMode.Distributed),
+                            new Dimension(),
                             new Dimension(GridSizeMode.AutoSize)
                         }
                     },
                 },
-                new FillFlowContainer
+                bottomRightElements = new FillFlowContainer
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
-                    Position = -new Vector2(5, TwoLayerButton.SIZE_RETRACTED.Y),
+                    X = -5,
                     AutoSizeAxes = Axes.Both,
                     LayoutDuration = fade_duration / 2,
                     LayoutEasing = fade_easing,
@@ -209,6 +211,12 @@ namespace osu.Game.Screens.Play
             replayLoaded.BindValueChanged(replayLoadedValueChanged, true);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            bottomRightElements.Y = -Progress.Height;
+        }
+
         private void replayLoadedValueChanged(ValueChangedEvent<bool> e)
         {
             PlayerSettingsOverlay.ReplayLoaded = e.NewValue;

From d7a52e97fffd13fd780f6d9a8f283c68f3c637c3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 19:03:11 +0900
Subject: [PATCH 05459/10326] Fix multimod difficulty combinations not
 generating correctly

---
 ...DifficultyAdjustmentModCombinationsTest.cs | 39 +++++++++++++++++++
 .../Difficulty/DifficultyCalculator.cs        | 31 +++++++++++++--
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index 760a033aff..de0397dc84 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -94,6 +94,38 @@ namespace osu.Game.Tests.NonVisual
             Assert.IsTrue(combinations[2] is ModIncompatibleWithAofA);
         }
 
+        [Test]
+        public void TestMultiMod1()
+        {
+            var combinations = new TestLegacyDifficultyCalculator(new ModA(), new MultiMod(new ModB(), new ModC())).CreateDifficultyAdjustmentModCombinations();
+
+            Assert.AreEqual(4, combinations.Length);
+            Assert.IsTrue(combinations[0] is ModNoMod);
+            Assert.IsTrue(combinations[1] is ModA);
+            Assert.IsTrue(combinations[2] is MultiMod);
+            Assert.IsTrue(combinations[3] is MultiMod);
+
+            Assert.IsTrue(((MultiMod)combinations[2]).Mods[0] is ModA);
+            Assert.IsTrue(((MultiMod)combinations[2]).Mods[1] is ModB);
+            Assert.IsTrue(((MultiMod)combinations[2]).Mods[2] is ModC);
+            Assert.IsTrue(((MultiMod)combinations[3]).Mods[0] is ModB);
+            Assert.IsTrue(((MultiMod)combinations[3]).Mods[1] is ModC);
+        }
+
+        [Test]
+        public void TestMultiMod2()
+        {
+            var combinations = new TestLegacyDifficultyCalculator(new ModA(), new MultiMod(new ModB(), new ModIncompatibleWithA())).CreateDifficultyAdjustmentModCombinations();
+
+            Assert.AreEqual(3, combinations.Length);
+            Assert.IsTrue(combinations[0] is ModNoMod);
+            Assert.IsTrue(combinations[1] is ModA);
+            Assert.IsTrue(combinations[2] is MultiMod);
+
+            Assert.IsTrue(((MultiMod)combinations[2]).Mods[0] is ModB);
+            Assert.IsTrue(((MultiMod)combinations[2]).Mods[1] is ModIncompatibleWithA);
+        }
+
         private class ModA : Mod
         {
             public override string Name => nameof(ModA);
@@ -112,6 +144,13 @@ namespace osu.Game.Tests.NonVisual
             public override Type[] IncompatibleMods => new[] { typeof(ModIncompatibleWithAAndB) };
         }
 
+        private class ModC : Mod
+        {
+            public override string Name => nameof(ModC);
+            public override string Acronym => nameof(ModC);
+            public override double ScoreMultiplier => 1;
+        }
+
         private class ModIncompatibleWithA : Mod
         {
             public override string Name => $"Incompatible With {nameof(ModA)}";
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 1902de5bda..9989c750ee 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Difficulty
         {
             return createDifficultyAdjustmentModCombinations(Array.Empty<Mod>(), DifficultyAdjustmentMods).ToArray();
 
-            IEnumerable<Mod> createDifficultyAdjustmentModCombinations(IEnumerable<Mod> currentSet, Mod[] adjustmentSet, int currentSetCount = 0, int adjustmentSetStart = 0)
+            static IEnumerable<Mod> createDifficultyAdjustmentModCombinations(IEnumerable<Mod> currentSet, Mod[] adjustmentSet, int currentSetCount = 0, int adjustmentSetStart = 0)
             {
                 switch (currentSetCount)
                 {
@@ -133,13 +133,36 @@ namespace osu.Game.Rulesets.Difficulty
                 for (int i = adjustmentSetStart; i < adjustmentSet.Length; i++)
                 {
                     var adjustmentMod = adjustmentSet[i];
-                    if (currentSet.Any(c => c.IncompatibleMods.Any(m => m.IsInstanceOfType(adjustmentMod))))
-                        continue;
 
-                    foreach (var combo in createDifficultyAdjustmentModCombinations(currentSet.Append(adjustmentMod), adjustmentSet, currentSetCount + 1, i + 1))
+                    if (currentSet.Any(c => c.IncompatibleMods.Any(m => m.IsInstanceOfType(adjustmentMod))
+                                            || adjustmentMod.IncompatibleMods.Any(m => m.IsInstanceOfType(c))))
+                    {
+                        continue;
+                    }
+
+                    // Append the new mod.
+                    int newSetCount = currentSetCount;
+                    var newSet = append(currentSet, adjustmentMod, ref newSetCount);
+
+                    foreach (var combo in createDifficultyAdjustmentModCombinations(newSet, adjustmentSet, newSetCount, i + 1))
                         yield return combo;
                 }
             }
+
+            // Appends a mod to an existing enumerable, returning the result. Recurses for MultiMod.
+            static IEnumerable<Mod> append(IEnumerable<Mod> existing, Mod mod, ref int count)
+            {
+                if (mod is MultiMod multi)
+                {
+                    foreach (var nested in multi.Mods)
+                        existing = append(existing, nested, ref count);
+
+                    return existing;
+                }
+
+                count++;
+                return existing.Append(mod);
+            }
         }
 
         /// <summary>

From 98acf1e31dc86ea3a0872a4eea5f0043ea2ca4b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 19:16:25 +0900
Subject: [PATCH 05460/10326] Make field read only

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

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 9d7b3f55be..14ceadac81 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Play
 
         private readonly Container topScoreContainer;
 
-        private FillFlowContainer bottomRightElements;
+        private readonly FillFlowContainer bottomRightElements;
 
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
 

From 60603d2918b81eeecf6efb721913a825079e7664 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 16:45:40 +0900
Subject: [PATCH 05461/10326] Add skin components and interfaces

---
 osu.Game/Screens/Play/HUD/IComboCounter.cs | 19 +++++++++++++++++++
 osu.Game/Skinning/HUDSkinComponent.cs      | 22 ++++++++++++++++++++++
 osu.Game/Skinning/HUDSkinComponents.cs     | 10 ++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 osu.Game/Screens/Play/HUD/IComboCounter.cs
 create mode 100644 osu.Game/Skinning/HUDSkinComponent.cs
 create mode 100644 osu.Game/Skinning/HUDSkinComponents.cs

diff --git a/osu.Game/Screens/Play/HUD/IComboCounter.cs b/osu.Game/Screens/Play/HUD/IComboCounter.cs
new file mode 100644
index 0000000000..ff235bf04e
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/IComboCounter.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.Bindables;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// An interface providing a set of methods to update a combo counter.
+    /// </summary>
+    public interface IComboCounter : IDrawable
+    {
+        /// <summary>
+        /// The current combo to be displayed.
+        /// </summary>
+        Bindable<int> Current { get; }
+    }
+}
diff --git a/osu.Game/Skinning/HUDSkinComponent.cs b/osu.Game/Skinning/HUDSkinComponent.cs
new file mode 100644
index 0000000000..041beb68f2
--- /dev/null
+++ b/osu.Game/Skinning/HUDSkinComponent.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.Linq;
+
+namespace osu.Game.Skinning
+{
+    public class HUDSkinComponent : ISkinComponent
+    {
+        public readonly HUDSkinComponents Component;
+
+        public HUDSkinComponent(HUDSkinComponents component)
+        {
+            Component = component;
+        }
+
+        protected virtual string ComponentName => Component.ToString();
+
+        public string LookupName =>
+            string.Join("/", new[] { "HUD", ComponentName }.Where(s => !string.IsNullOrEmpty(s)));
+    }
+}
diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
new file mode 100644
index 0000000000..6f3e2cbaf5
--- /dev/null
+++ b/osu.Game/Skinning/HUDSkinComponents.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.Skinning
+{
+    public enum HUDSkinComponents
+    {
+        ComboCounter
+    }
+}

From 375146b4898e61e3378e9834a1a024b5c4804529 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 16:45:48 +0900
Subject: [PATCH 05462/10326] Make HUDOverlay test scene skinnable

---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index c192a7b0e0..e2b831b144 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -9,13 +9,15 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneHUDOverlay : OsuManualInputManagerTestScene
+    public class TestSceneHUDOverlay : SkinnableTestScene
     {
         private HUDOverlay hudOverlay;
 
@@ -107,13 +109,20 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create overlay", () =>
             {
-                Child = hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+                SetContents(() =>
+                {
+                    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));
+                    // Add any key just to display the key counter visually.
+                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
 
-                action?.Invoke(hudOverlay);
+                    action?.Invoke(hudOverlay);
+
+                    return hudOverlay;
+                });
             });
         }
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
     }
 }

From f5623ee21e2a229b4de574b961037ba487195bf1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 16:46:13 +0900
Subject: [PATCH 05463/10326] Setup skinnable combo counter component with
 default implementation

---
 .../UserInterface/SimpleComboCounter.cs       |  3 +-
 .../Screens/Play/HUD/SkinnableComboCounter.cs | 58 +++++++++++++++++++
 osu.Game/Screens/Play/HUDOverlay.cs           | 10 +---
 3 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs

diff --git a/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs b/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
index c9790aed46..59e31eff55 100644
--- a/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
+++ b/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
@@ -5,13 +5,14 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Graphics.UserInterface
 {
     /// <summary>
     /// Used as an accuracy counter. Represented visually as a percentage.
     /// </summary>
-    public class SimpleComboCounter : RollingCounter<int>
+    public class SimpleComboCounter : RollingCounter<int>, IComboCounter
     {
         protected override double RollingDuration => 750;
 
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
new file mode 100644
index 0000000000..a67953c790
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -0,0 +1,58 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class SkinnableComboCounter : SkinnableDrawable, IComboCounter
+    {
+        public SkinnableComboCounter()
+            : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), createDefault)
+        {
+        }
+
+        private IComboCounter skinnedCounter;
+
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            // todo: unnecessary?
+            if (skinnedCounter != null)
+            {
+                Current.UnbindFrom(skinnedCounter.Current);
+            }
+
+            base.SkinChanged(skin, allowFallback);
+
+            // temporary layout code, will eventually be replaced by the skin layout system.
+            if (Drawable is SimpleComboCounter)
+            {
+                Drawable.BypassAutoSizeAxes = Axes.X;
+                Drawable.Anchor = Anchor.TopRight;
+                Drawable.Origin = Anchor.TopLeft;
+                Drawable.Margin = new MarginPadding { Top = 5, Left = 20 };
+            }
+            else
+            {
+                Drawable.BypassAutoSizeAxes = Axes.X;
+                Drawable.Anchor = Anchor.BottomLeft;
+                Drawable.Origin = Anchor.BottomLeft;
+                Drawable.Margin = new MarginPadding { Top = 5, Left = 20 };
+            }
+
+            skinnedCounter = (IComboCounter)Drawable;
+
+            Current.BindTo(skinnedCounter.Current);
+        }
+
+        private static Drawable createDefault(ISkinComponent skinComponent) => new SimpleComboCounter();
+
+        public Bindable<int> Current { get; } = new Bindable<int>();
+
+        public void UpdateCombo(int combo, Color4? hitObjectColour = null) => Current.Value = combo;
+    }
+}
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 14ceadac81..ee5b4e3f34 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Play
         private const Easing fade_easing = Easing.Out;
 
         public readonly KeyCounterDisplay KeyCounter;
-        public readonly RollingCounter<int> ComboCounter;
+        public readonly SkinnableComboCounter ComboCounter;
         public readonly ScoreCounter ScoreCounter;
         public readonly RollingCounter<double> AccuracyCounter;
         public readonly HealthDisplay HealthDisplay;
@@ -275,13 +275,7 @@ namespace osu.Game.Screens.Play
             Origin = Anchor.TopCentre,
         };
 
-        protected virtual RollingCounter<int> CreateComboCounter() => new SimpleComboCounter
-        {
-            BypassAutoSizeAxes = Axes.X,
-            Anchor = Anchor.TopRight,
-            Origin = Anchor.TopLeft,
-            Margin = new MarginPadding { Top = 5, Left = 20 },
-        };
+        protected virtual SkinnableComboCounter CreateComboCounter() => new SkinnableComboCounter();
 
         protected virtual HealthDisplay CreateHealthDisplay() => new StandardHealthDisplay
         {

From 899bac6ca535a33b8434a79d941134c874547c68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 17:02:12 +0900
Subject: [PATCH 05464/10326] Rename catch combo counter for clarity

---
 .../Skinning/CatchLegacySkinTransformer.cs                    | 2 +-
 .../{LegacyComboCounter.cs => LegacyCatchComboCounter.cs}     | 4 ++--
 .../{SimpleComboCounter.cs => DefaultComboCounter.cs}         | 0
 .../HUD/{StandardComboCounter.cs => LegacyComboCounter.cs}    | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename osu.Game.Rulesets.Catch/Skinning/{LegacyComboCounter.cs => LegacyCatchComboCounter.cs} (96%)
 rename osu.Game/Graphics/UserInterface/{SimpleComboCounter.cs => DefaultComboCounter.cs} (100%)
 rename osu.Game/Screens/Play/HUD/{StandardComboCounter.cs => LegacyComboCounter.cs} (100%)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 47224bd195..916b4c5192 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
                     // For simplicity, let's use legacy combo font texture existence as a way to identify legacy skins from default.
                     if (this.HasFont(comboFont))
-                        return new LegacyComboCounter(Source);
+                        return new LegacyCatchComboCounter(Source);
 
                     break;
             }
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchComboCounter.cs
similarity index 96%
rename from osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
rename to osu.Game.Rulesets.Catch/Skinning/LegacyCatchComboCounter.cs
index c8abc9e832..34608b07ff 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchComboCounter.cs
@@ -14,13 +14,13 @@ namespace osu.Game.Rulesets.Catch.Skinning
     /// <summary>
     /// A combo counter implementation that visually behaves almost similar to stable's osu!catch combo counter.
     /// </summary>
-    public class LegacyComboCounter : CompositeDrawable, ICatchComboCounter
+    public class LegacyCatchComboCounter : CompositeDrawable, ICatchComboCounter
     {
         private readonly LegacyRollingCounter counter;
 
         private readonly LegacyRollingCounter explosion;
 
-        public LegacyComboCounter(ISkin skin)
+        public LegacyCatchComboCounter(ISkin skin)
         {
             var fontName = skin.GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
             var fontOverlap = skin.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
diff --git a/osu.Game/Graphics/UserInterface/SimpleComboCounter.cs b/osu.Game/Graphics/UserInterface/DefaultComboCounter.cs
similarity index 100%
rename from osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
rename to osu.Game/Graphics/UserInterface/DefaultComboCounter.cs
diff --git a/osu.Game/Screens/Play/HUD/StandardComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
similarity index 100%
rename from osu.Game/Screens/Play/HUD/StandardComboCounter.cs
rename to osu.Game/Screens/Play/HUD/LegacyComboCounter.cs

From 6a6718ebab2963afefacb3f05628ffdb7d48367c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 17:20:10 +0900
Subject: [PATCH 05465/10326] Allow bypassing origin/anchor setting of
 skinnable components

It makes little sense to set these when using RelativeSizeAxes.Both
---
 .../Screens/Play/HUD/SkinnableComboCounter.cs     |  1 +
 osu.Game/Skinning/SkinnableDrawable.cs            | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index a67953c790..36f615e9d0 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Screens.Play.HUD
         public SkinnableComboCounter()
             : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), createDefault)
         {
+            CentreComponent = false;
         }
 
         private IComboCounter skinnedCounter;
diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index d9a5036649..5a48bc4baf 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -19,6 +19,12 @@ namespace osu.Game.Skinning
         /// </summary>
         public Drawable Drawable { get; private set; }
 
+        /// <summary>
+        /// Whether the drawable component should be centered in available space.
+        /// Defaults to true.
+        /// </summary>
+        public bool CentreComponent { get; set; } = true;
+
         public new Axes AutoSizeAxes
         {
             get => base.AutoSizeAxes;
@@ -84,8 +90,13 @@ namespace osu.Game.Skinning
             if (Drawable != null)
             {
                 scaling.Invalidate();
-                Drawable.Origin = Anchor.Centre;
-                Drawable.Anchor = Anchor.Centre;
+
+                if (CentreComponent)
+                {
+                    Drawable.Origin = Anchor.Centre;
+                    Drawable.Anchor = Anchor.Centre;
+                }
+
                 InternalChild = Drawable;
             }
             else

From 6eb3176776808d3737923a76171293f642ffa95a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 17:20:44 +0900
Subject: [PATCH 05466/10326] Add combo incrementing tests to hud overlay test
 suite

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index e2b831b144..c02075bea9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -2,9 +2,11 @@
 // 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;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
@@ -21,6 +23,8 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private HUDOverlay hudOverlay;
 
+        private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
+
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.KeyCounter;
         private FillFlowContainer<KeyCounter> keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().First();
@@ -28,6 +32,24 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuConfigManager config { get; set; }
 
+        [Test]
+        public void TestComboCounterIncrementing()
+        {
+            createNew();
+
+            AddRepeatStep("increase combo", () =>
+            {
+                foreach (var hud in hudOverlays)
+                    hud.ComboCounter.Current.Value++;
+            }, 10);
+
+            AddStep("reset combo", () =>
+            {
+                foreach (var hud in hudOverlays)
+                    hud.ComboCounter.Current.Value = 0;
+            });
+        }
+
         [Test]
         public void TestShownByDefault()
         {
@@ -55,7 +77,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             createNew();
 
-            AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
+            AddStep("set showhud false", () => hudOverlays.ForEach(h => h.ShowHud.Value = false));
 
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
             AddAssert("pause button is still visible", () => hudOverlay.HoldToQuit.IsPresent);
@@ -91,14 +113,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("set keycounter visible false", () =>
             {
                 config.Set<bool>(OsuSetting.KeyOverlay, false);
-                hudOverlay.KeyCounter.AlwaysVisible.Value = false;
+                hudOverlays.ForEach(h => h.KeyCounter.AlwaysVisible.Value = false);
             });
 
-            AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
+            AddStep("set showhud false", () => hudOverlays.ForEach(h => h.ShowHud.Value = false));
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
             AddAssert("key counters hidden", () => !keyCounterFlow.IsPresent);
 
-            AddStep("set showhud true", () => hudOverlay.ShowHud.Value = true);
+            AddStep("set showhud true", () => hudOverlays.ForEach(h => h.ShowHud.Value = true));
             AddUntilStep("hidetarget is visible", () => hideTarget.IsPresent);
             AddAssert("key counters still hidden", () => !keyCounterFlow.IsPresent);
 
@@ -116,6 +138,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
 
+                    hudOverlay.ComboCounter.Current.Value = 1;
+
                     action?.Invoke(hudOverlay);
 
                     return hudOverlay;

From 2fce064e32d5a57b6c26a56b79a3d029246ddaae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 17:21:56 +0900
Subject: [PATCH 05467/10326] Add basic legacy combo counter and updating
 positioning logic

---
 .../Visual/Gameplay/TestSceneScoreCounter.cs  |  2 +-
 osu.Game/Screens/Play/HUD/ComboCounter.cs     |  4 +--
 .../Play/HUD}/DefaultComboCounter.cs          | 34 +++++++++++++++----
 .../Screens/Play/HUD/LegacyComboCounter.cs    | 10 +++++-
 .../Screens/Play/HUD/SkinnableComboCounter.cs | 31 ++---------------
 osu.Game/Screens/Play/HUDOverlay.cs           |  2 +-
 osu.Game/Skinning/LegacySkin.cs               | 12 +++++++
 7 files changed, 54 insertions(+), 41 deletions(-)
 rename osu.Game/{Graphics/UserInterface => Screens/Play/HUD}/DefaultComboCounter.cs (54%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
index 09b4f9b761..43b3dd501d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             };
             Add(score);
 
-            ComboCounter comboCounter = new StandardComboCounter
+            ComboCounter comboCounter = new LegacyComboCounter
             {
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
diff --git a/osu.Game/Screens/Play/HUD/ComboCounter.cs b/osu.Game/Screens/Play/HUD/ComboCounter.cs
index ea50a4a578..d15a8d25ec 100644
--- a/osu.Game/Screens/Play/HUD/ComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ComboCounter.cs
@@ -9,9 +9,9 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public abstract class ComboCounter : Container
+    public abstract class ComboCounter : Container, IComboCounter
     {
-        public BindableInt Current = new BindableInt
+        public Bindable<int> Current { get; } = new BindableInt
         {
             MinValue = 0,
         };
diff --git a/osu.Game/Graphics/UserInterface/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
similarity index 54%
rename from osu.Game/Graphics/UserInterface/DefaultComboCounter.cs
rename to osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 59e31eff55..1e23319c28 100644
--- a/osu.Game/Graphics/UserInterface/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -4,26 +4,46 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
 
-namespace osu.Game.Graphics.UserInterface
+namespace osu.Game.Screens.Play.HUD
 {
-    /// <summary>
-    /// Used as an accuracy counter. Represented visually as a percentage.
-    /// </summary>
-    public class SimpleComboCounter : RollingCounter<int>, IComboCounter
+    public class DefaultComboCounter : RollingCounter<int>, IComboCounter
     {
+        private readonly Vector2 offset = new Vector2(20, 5);
+
         protected override double RollingDuration => 750;
 
-        public SimpleComboCounter()
+        [Resolved(canBeNull: true)]
+        private HUDOverlay hud { get; set; }
+
+        public DefaultComboCounter()
         {
             Current.Value = DisplayedCount = 0;
+
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopLeft;
+
+            Position = offset;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours) => Colour = colours.BlueLighter;
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (hud != null)
+            {
+                // for now align with the score counter. eventually this will be user customisable.
+                Position += ToLocalSpace(hud.ScoreCounter.ScreenSpaceDrawQuad.TopRight) + offset;
+            }
+        }
+
         protected override string FormatCount(int count)
         {
             return $@"{count}x";
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 7301300b8d..8a94d19609 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// Uses the 'x' symbol and has a pop-out effect while rolling over.
     /// </summary>
-    public class StandardComboCounter : ComboCounter
+    public class LegacyComboCounter : ComboCounter
     {
         protected uint ScheduledPopOutCurrentId;
 
@@ -18,6 +18,14 @@ namespace osu.Game.Screens.Play.HUD
 
         public new Vector2 PopOutScale = new Vector2(1.6f);
 
+        public LegacyComboCounter()
+        {
+            Anchor = Anchor.BottomLeft;
+            Origin = Anchor.BottomLeft;
+
+            Margin = new MarginPadding { Top = 5, Left = 20 };
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index 36f615e9d0..9f8ad758e4 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -3,9 +3,7 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Skinning;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -21,39 +19,14 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
-            // todo: unnecessary?
-            if (skinnedCounter != null)
-            {
-                Current.UnbindFrom(skinnedCounter.Current);
-            }
-
             base.SkinChanged(skin, allowFallback);
 
-            // temporary layout code, will eventually be replaced by the skin layout system.
-            if (Drawable is SimpleComboCounter)
-            {
-                Drawable.BypassAutoSizeAxes = Axes.X;
-                Drawable.Anchor = Anchor.TopRight;
-                Drawable.Origin = Anchor.TopLeft;
-                Drawable.Margin = new MarginPadding { Top = 5, Left = 20 };
-            }
-            else
-            {
-                Drawable.BypassAutoSizeAxes = Axes.X;
-                Drawable.Anchor = Anchor.BottomLeft;
-                Drawable.Origin = Anchor.BottomLeft;
-                Drawable.Margin = new MarginPadding { Top = 5, Left = 20 };
-            }
-
             skinnedCounter = (IComboCounter)Drawable;
-
-            Current.BindTo(skinnedCounter.Current);
+            skinnedCounter.Current.BindTo(Current);
         }
 
-        private static Drawable createDefault(ISkinComponent skinComponent) => new SimpleComboCounter();
+        private static Drawable createDefault(ISkinComponent skinComponent) => new DefaultComboCounter();
 
         public Bindable<int> Current { get; } = new Bindable<int>();
-
-        public void UpdateCombo(int combo, Color4? hitObjectColour = null) => Current.Value = combo;
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index ee5b4e3f34..a3547bbc68 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -22,6 +22,7 @@ using osuTK.Input;
 
 namespace osu.Game.Screens.Play
 {
+    [Cached]
     public class HUDOverlay : Container
     {
         private const float fade_duration = 400;
@@ -104,7 +105,6 @@ namespace osu.Game.Screens.Play
                                             {
                                                 AccuracyCounter = CreateAccuracyCounter(),
                                                 ScoreCounter = CreateScoreCounter(),
-                                                ComboCounter = CreateComboCounter(),
                                             },
                                         },
                                         ComboCounter = CreateComboCounter(),
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e38913b13a..b8b9349cc0 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -18,6 +18,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -327,6 +328,17 @@ namespace osu.Game.Skinning
         {
             switch (component)
             {
+                case HUDSkinComponent hudComponent:
+                {
+                    switch (hudComponent.Component)
+                    {
+                        case HUDSkinComponents.ComboCounter:
+                            return new LegacyComboCounter();
+                    }
+
+                    return null;
+                }
+
                 case GameplaySkinComponent<HitResult> resultComponent:
                     switch (resultComponent.Component)
                     {

From fbbea48c8c45f5dfc1360c6cf749dc35123751a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 17:51:03 +0900
Subject: [PATCH 05468/10326] Add score text skinnability

---
 osu.Game/Screens/Play/HUD/ComboCounter.cs     | 43 ++++++++-----------
 .../Screens/Play/HUD/LegacyComboCounter.cs    | 27 ++++++++++--
 osu.Game/Skinning/HUDSkinComponents.cs        |  3 +-
 osu.Game/Skinning/LegacySkin.cs               |  9 ++++
 4 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ComboCounter.cs b/osu.Game/Screens/Play/HUD/ComboCounter.cs
index d15a8d25ec..5bffa18032 100644
--- a/osu.Game/Screens/Play/HUD/ComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ComboCounter.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.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,7 +19,7 @@ namespace osu.Game.Screens.Play.HUD
 
         public bool IsRolling { get; protected set; }
 
-        protected SpriteText PopOutCount;
+        protected Drawable PopOutCount;
 
         protected virtual double PopOutDuration => 150;
         protected virtual float PopOutScale => 2.0f;
@@ -37,7 +38,7 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         protected Easing RollingEasing => Easing.None;
 
-        protected SpriteText DisplayedCountSpriteText;
+        protected Drawable DisplayedCountSpriteText;
 
         private int previousValue;
 
@@ -47,30 +48,34 @@ namespace osu.Game.Screens.Play.HUD
         protected ComboCounter()
         {
             AutoSizeAxes = Axes.Both;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             Children = new Drawable[]
             {
-                DisplayedCountSpriteText = new OsuSpriteText
+                DisplayedCountSpriteText = CreateSpriteText().With(s =>
                 {
-                    Alpha = 0,
-                },
-                PopOutCount = new OsuSpriteText
+                    s.Alpha = 0;
+                }),
+                PopOutCount = CreateSpriteText().With(s =>
                 {
-                    Alpha = 0,
-                    Margin = new MarginPadding(0.05f),
-                }
+                    s.Alpha = 0;
+                    s.Margin = new MarginPadding(0.05f);
+                })
             };
 
-            TextSize = 80;
-
             Current.ValueChanged += combo => updateCount(combo.NewValue == 0);
         }
 
+        protected virtual Drawable CreateSpriteText() => new OsuSpriteText();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            DisplayedCountSpriteText.Text = FormatCount(Current.Value);
+            ((IHasText)DisplayedCountSpriteText).Text = FormatCount(Current.Value);
             DisplayedCountSpriteText.Anchor = Anchor;
             DisplayedCountSpriteText.Origin = Origin;
 
@@ -94,20 +99,6 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private float textSize;
-
-        public float TextSize
-        {
-            get => textSize;
-            set
-            {
-                textSize = value;
-
-                DisplayedCountSpriteText.Font = DisplayedCountSpriteText.Font.With(size: TextSize);
-                PopOutCount.Font = PopOutCount.Font.With(size: TextSize);
-            }
-        }
-
         /// <summary>
         /// Increments the combo by an amount.
         /// </summary>
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 8a94d19609..54a4338885 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -1,8 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osuTK;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -26,6 +31,22 @@ namespace osu.Game.Screens.Play.HUD
             Margin = new MarginPadding { Top = 5, Left = 20 };
         }
 
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
+        protected override Drawable CreateSpriteText()
+        {
+            return skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) ?? new OsuSpriteText();
+
+            /*
+            new OsuSpriteText
+            {
+                Font = OsuFont.Numeric.With(size: 40),
+                UseFullGlyphHeight = false,
+            });
+    */
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -41,7 +62,7 @@ namespace osu.Game.Screens.Play.HUD
 
         protected virtual void TransformPopOut(int newValue)
         {
-            PopOutCount.Text = FormatCount(newValue);
+            ((IHasText)PopOutCount).Text = FormatCount(newValue);
 
             PopOutCount.ScaleTo(PopOutScale);
             PopOutCount.FadeTo(PopOutInitialAlpha);
@@ -60,13 +81,13 @@ namespace osu.Game.Screens.Play.HUD
 
         protected virtual void TransformNoPopOut(int newValue)
         {
-            DisplayedCountSpriteText.Text = FormatCount(newValue);
+            ((IHasText)DisplayedCountSpriteText).Text = FormatCount(newValue);
             DisplayedCountSpriteText.ScaleTo(1);
         }
 
         protected virtual void TransformPopOutSmall(int newValue)
         {
-            DisplayedCountSpriteText.Text = FormatCount(newValue);
+            ((IHasText)DisplayedCountSpriteText).Text = FormatCount(newValue);
             DisplayedCountSpriteText.ScaleTo(PopOutSmallScale);
             DisplayedCountSpriteText.ScaleTo(1, PopOutDuration, PopOutEasing);
         }
diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index 6f3e2cbaf5..7577ba066c 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -5,6 +5,7 @@ namespace osu.Game.Skinning
 {
     public enum HUDSkinComponents
     {
-        ComboCounter
+        ComboCounter,
+        ScoreText
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index b8b9349cc0..fddea40b04 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -19,6 +19,7 @@ using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -334,6 +335,14 @@ namespace osu.Game.Skinning
                     {
                         case HUDSkinComponents.ComboCounter:
                             return new LegacyComboCounter();
+
+                        case HUDSkinComponents.ScoreText:
+                            const string font = "score";
+
+                            if (!this.HasFont(font))
+                                return null;
+
+                            return new LegacySpriteText(this, font);
                     }
 
                     return null;

From 9bb8a43bcee61d11f26598fff2228af1f07a4d17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 18:15:06 +0900
Subject: [PATCH 05469/10326] Combine LegacyComboCounter and ComboCounter
 classes

---
 .../Visual/Gameplay/TestSceneScoreCounter.cs  |   2 +-
 osu.Game/Screens/Play/HUD/ComboCounter.cs     | 191 ------------------
 .../Screens/Play/HUD/LegacyComboCounter.cs    | 176 ++++++++++++++--
 osu.Game/Skinning/LegacySkin.cs               |   1 -
 4 files changed, 155 insertions(+), 215 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/ComboCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
index 43b3dd501d..29e4b1f0cb 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             };
             Add(score);
 
-            ComboCounter comboCounter = new LegacyComboCounter
+            LegacyComboCounter comboCounter = new LegacyComboCounter
             {
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
diff --git a/osu.Game/Screens/Play/HUD/ComboCounter.cs b/osu.Game/Screens/Play/HUD/ComboCounter.cs
deleted file mode 100644
index 5bffa18032..0000000000
--- a/osu.Game/Screens/Play/HUD/ComboCounter.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Sprites;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public abstract class ComboCounter : Container, IComboCounter
-    {
-        public Bindable<int> Current { get; } = new BindableInt
-        {
-            MinValue = 0,
-        };
-
-        public bool IsRolling { get; protected set; }
-
-        protected Drawable PopOutCount;
-
-        protected virtual double PopOutDuration => 150;
-        protected virtual float PopOutScale => 2.0f;
-        protected virtual Easing PopOutEasing => Easing.None;
-        protected virtual float PopOutInitialAlpha => 0.75f;
-
-        protected virtual double FadeOutDuration => 100;
-
-        /// <summary>
-        /// Duration in milliseconds for the counter roll-up animation for each element.
-        /// </summary>
-        protected virtual double RollingDuration => 20;
-
-        /// <summary>
-        /// Easing for the counter rollover animation.
-        /// </summary>
-        protected Easing RollingEasing => Easing.None;
-
-        protected Drawable DisplayedCountSpriteText;
-
-        private int previousValue;
-
-        /// <summary>
-        /// Base of all combo counters.
-        /// </summary>
-        protected ComboCounter()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Children = new Drawable[]
-            {
-                DisplayedCountSpriteText = CreateSpriteText().With(s =>
-                {
-                    s.Alpha = 0;
-                }),
-                PopOutCount = CreateSpriteText().With(s =>
-                {
-                    s.Alpha = 0;
-                    s.Margin = new MarginPadding(0.05f);
-                })
-            };
-
-            Current.ValueChanged += combo => updateCount(combo.NewValue == 0);
-        }
-
-        protected virtual Drawable CreateSpriteText() => new OsuSpriteText();
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            ((IHasText)DisplayedCountSpriteText).Text = FormatCount(Current.Value);
-            DisplayedCountSpriteText.Anchor = Anchor;
-            DisplayedCountSpriteText.Origin = Origin;
-
-            StopRolling();
-        }
-
-        private int displayedCount;
-
-        /// <summary>
-        /// Value shown at the current moment.
-        /// </summary>
-        public virtual int DisplayedCount
-        {
-            get => displayedCount;
-            protected set
-            {
-                if (displayedCount.Equals(value))
-                    return;
-
-                updateDisplayedCount(displayedCount, value, IsRolling);
-            }
-        }
-
-        /// <summary>
-        /// Increments the combo by an amount.
-        /// </summary>
-        /// <param name="amount"></param>
-        public void Increment(int amount = 1)
-        {
-            Current.Value += amount;
-        }
-
-        /// <summary>
-        /// Stops rollover animation, forcing the displayed count to be the actual count.
-        /// </summary>
-        public void StopRolling()
-        {
-            updateCount(false);
-        }
-
-        protected virtual string FormatCount(int count)
-        {
-            return count.ToString();
-        }
-
-        protected virtual void OnCountRolling(int currentValue, int newValue)
-        {
-            transformRoll(currentValue, newValue);
-        }
-
-        protected virtual void OnCountIncrement(int currentValue, int newValue)
-        {
-            DisplayedCount = newValue;
-        }
-
-        protected virtual void OnCountChange(int currentValue, int newValue)
-        {
-            DisplayedCount = newValue;
-        }
-
-        private double getProportionalDuration(int currentValue, int newValue)
-        {
-            double difference = currentValue > newValue ? currentValue - newValue : newValue - currentValue;
-            return difference * RollingDuration;
-        }
-
-        private void updateDisplayedCount(int currentValue, int newValue, bool rolling)
-        {
-            displayedCount = newValue;
-            if (rolling)
-                OnDisplayedCountRolling(currentValue, newValue);
-            else if (currentValue + 1 == newValue)
-                OnDisplayedCountIncrement(newValue);
-            else
-                OnDisplayedCountChange(newValue);
-        }
-
-        private void updateCount(bool rolling)
-        {
-            int prev = previousValue;
-            previousValue = Current.Value;
-
-            if (!IsLoaded)
-                return;
-
-            if (!rolling)
-            {
-                FinishTransforms(false, nameof(DisplayedCount));
-                IsRolling = false;
-                DisplayedCount = prev;
-
-                if (prev + 1 == Current.Value)
-                    OnCountIncrement(prev, Current.Value);
-                else
-                    OnCountChange(prev, Current.Value);
-            }
-            else
-            {
-                OnCountRolling(displayedCount, Current.Value);
-                IsRolling = true;
-            }
-        }
-
-        private void transformRoll(int currentValue, int newValue)
-        {
-            this.TransformTo(nameof(DisplayedCount), newValue, getProportionalDuration(currentValue, newValue), RollingEasing);
-        }
-
-        protected abstract void OnDisplayedCountRolling(int currentValue, int newValue);
-        protected abstract void OnDisplayedCountIncrement(int newValue);
-        protected abstract void OnDisplayedCountChange(int newValue);
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 54a4338885..b62cd1c309 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -2,62 +2,124 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osuTK;
+using osu.Framework.Bindables;
 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.Skinning;
+using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
     /// Uses the 'x' symbol and has a pop-out effect while rolling over.
     /// </summary>
-    public class LegacyComboCounter : ComboCounter
+    public class LegacyComboCounter : CompositeDrawable, IComboCounter
     {
         protected uint ScheduledPopOutCurrentId;
 
         protected virtual float PopOutSmallScale => 1.1f;
         protected virtual bool CanPopOutWhileRolling => false;
 
-        public new Vector2 PopOutScale = new Vector2(1.6f);
+        protected Drawable PopOutCount;
+        protected Drawable DisplayedCountSpriteText;
+        private int previousValue;
+        private int displayedCount;
 
         public LegacyComboCounter()
         {
+            AutoSizeAxes = Axes.Both;
+
             Anchor = Anchor.BottomLeft;
             Origin = Anchor.BottomLeft;
 
-            Margin = new MarginPadding { Top = 5, Left = 20 };
+            Margin = new MarginPadding { Bottom = 20, Left = 20 };
+
+            Scale = new Vector2(1.6f);
         }
 
         [Resolved]
         private ISkinSource skin { get; set; }
 
-        protected override Drawable CreateSpriteText()
+        public Bindable<int> Current { get; } = new BindableInt
         {
-            return skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) ?? new OsuSpriteText();
+            MinValue = 0,
+        };
 
-            /*
-            new OsuSpriteText
+        public bool IsRolling { get; protected set; }
+        protected virtual double PopOutDuration => 150;
+        protected virtual float PopOutScale => 1.6f;
+        protected virtual Easing PopOutEasing => Easing.None;
+        protected virtual float PopOutInitialAlpha => 0.75f;
+        protected virtual double FadeOutDuration => 100;
+
+        /// <summary>
+        /// Duration in milliseconds for the counter roll-up animation for each element.
+        /// </summary>
+        protected virtual double RollingDuration => 20;
+
+        /// <summary>
+        /// Easing for the counter rollover animation.
+        /// </summary>
+        protected Easing RollingEasing => Easing.None;
+
+        /// <summary>
+        /// Value shown at the current moment.
+        /// </summary>
+        public virtual int DisplayedCount
+        {
+            get => displayedCount;
+            protected set
+            {
+                if (displayedCount.Equals(value))
+                    return;
+
+                updateDisplayedCount(displayedCount, value, IsRolling);
+            }
+        }
+
+        protected Drawable CreateSpriteText()
+        {
+            return skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) ?? new OsuSpriteText
             {
                 Font = OsuFont.Numeric.With(size: 40),
                 UseFullGlyphHeight = false,
-            });
-    */
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new Drawable[]
+            {
+                DisplayedCountSpriteText = CreateSpriteText().With(s =>
+                {
+                    s.Alpha = 0;
+                }),
+                PopOutCount = CreateSpriteText().With(s =>
+                {
+                    s.Alpha = 0;
+                    s.Margin = new MarginPadding(0.05f);
+                })
+            };
+
+            Current.ValueChanged += combo => updateCount(combo.NewValue == 0);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            ((IHasText)DisplayedCountSpriteText).Text = FormatCount(Current.Value);
+
+            DisplayedCountSpriteText.Anchor = Anchor;
+            DisplayedCountSpriteText.Origin = Origin;
             PopOutCount.Origin = Origin;
             PopOutCount.Anchor = Anchor;
-        }
 
-        protected override string FormatCount(int count)
-        {
-            return $@"{count}x";
+            StopRolling();
         }
 
         protected virtual void TransformPopOut(int newValue)
@@ -101,7 +163,7 @@ namespace osu.Game.Screens.Play.HUD
             DisplayedCount++;
         }
 
-        protected override void OnCountRolling(int currentValue, int newValue)
+        protected void OnCountRolling(int currentValue, int newValue)
         {
             ScheduledPopOutCurrentId++;
 
@@ -109,10 +171,10 @@ namespace osu.Game.Screens.Play.HUD
             if (currentValue == 0 && newValue == 0)
                 DisplayedCountSpriteText.FadeOut(FadeOutDuration);
 
-            base.OnCountRolling(currentValue, newValue);
+            transformRoll(currentValue, newValue);
         }
 
-        protected override void OnCountIncrement(int currentValue, int newValue)
+        protected void OnCountIncrement(int currentValue, int newValue)
         {
             ScheduledPopOutCurrentId++;
 
@@ -130,17 +192,17 @@ namespace osu.Game.Screens.Play.HUD
             }, PopOutDuration);
         }
 
-        protected override void OnCountChange(int currentValue, int newValue)
+        protected void OnCountChange(int currentValue, int newValue)
         {
             ScheduledPopOutCurrentId++;
 
             if (newValue == 0)
                 DisplayedCountSpriteText.FadeOut();
 
-            base.OnCountChange(currentValue, newValue);
+            DisplayedCount = newValue;
         }
 
-        protected override void OnDisplayedCountRolling(int currentValue, int newValue)
+        protected void OnDisplayedCountRolling(int currentValue, int newValue)
         {
             if (newValue == 0)
                 DisplayedCountSpriteText.FadeOut(FadeOutDuration);
@@ -153,18 +215,88 @@ namespace osu.Game.Screens.Play.HUD
                 TransformNoPopOut(newValue);
         }
 
-        protected override void OnDisplayedCountChange(int newValue)
+        protected void OnDisplayedCountChange(int newValue)
         {
             DisplayedCountSpriteText.FadeTo(newValue == 0 ? 0 : 1);
 
             TransformNoPopOut(newValue);
         }
 
-        protected override void OnDisplayedCountIncrement(int newValue)
+        protected void OnDisplayedCountIncrement(int newValue)
         {
             DisplayedCountSpriteText.Show();
 
             TransformPopOutSmall(newValue);
         }
+
+        /// <summary>
+        /// Increments the combo by an amount.
+        /// </summary>
+        /// <param name="amount"></param>
+        public void Increment(int amount = 1)
+        {
+            Current.Value += amount;
+        }
+
+        /// <summary>
+        /// Stops rollover animation, forcing the displayed count to be the actual count.
+        /// </summary>
+        public void StopRolling()
+        {
+            updateCount(false);
+        }
+
+        protected string FormatCount(int count)
+        {
+            return $@"{count}x";
+        }
+
+        private double getProportionalDuration(int currentValue, int newValue)
+        {
+            double difference = currentValue > newValue ? currentValue - newValue : newValue - currentValue;
+            return difference * RollingDuration;
+        }
+
+        private void updateDisplayedCount(int currentValue, int newValue, bool rolling)
+        {
+            displayedCount = newValue;
+            if (rolling)
+                OnDisplayedCountRolling(currentValue, newValue);
+            else if (currentValue + 1 == newValue)
+                OnDisplayedCountIncrement(newValue);
+            else
+                OnDisplayedCountChange(newValue);
+        }
+
+        private void updateCount(bool rolling)
+        {
+            int prev = previousValue;
+            previousValue = Current.Value;
+
+            if (!IsLoaded)
+                return;
+
+            if (!rolling)
+            {
+                FinishTransforms(false, nameof(DisplayedCount));
+                IsRolling = false;
+                DisplayedCount = prev;
+
+                if (prev + 1 == Current.Value)
+                    OnCountIncrement(prev, Current.Value);
+                else
+                    OnCountChange(prev, Current.Value);
+            }
+            else
+            {
+                OnCountRolling(displayedCount, Current.Value);
+                IsRolling = true;
+            }
+        }
+
+        private void transformRoll(int currentValue, int newValue)
+        {
+            this.TransformTo<LegacyComboCounter, int>(nameof(DisplayedCount), newValue, getProportionalDuration(currentValue, newValue), RollingEasing);
+        }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index fddea40b04..a4d47dd2f1 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -19,7 +19,6 @@ using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning

From 7f5ea57bd483bd528accc4b26f6e0f1f808bf660 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 18:34:51 +0900
Subject: [PATCH 05470/10326] Clean-up pass (best effort) on LegacyComboCounter

---
 .../Visual/Gameplay/TestSceneScoreCounter.cs  |   2 +-
 .../Screens/Play/HUD/LegacyComboCounter.cs    | 359 ++++++++----------
 2 files changed, 158 insertions(+), 203 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
index 29e4b1f0cb..ab010bee9f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep(@"Hit! :D", delegate
             {
                 score.Current.Value += 300 + (ulong)(300.0 * (comboCounter.Current.Value > 0 ? comboCounter.Current.Value - 1 : 0) / 25.0);
-                comboCounter.Increment();
+                comboCounter.Current.Value++;
                 numerator++;
                 denominator++;
                 accuracyCounter.SetFraction(numerator, denominator);
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index b62cd1c309..c96a20405c 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -18,16 +18,34 @@ namespace osu.Game.Screens.Play.HUD
     /// </summary>
     public class LegacyComboCounter : CompositeDrawable, IComboCounter
     {
-        protected uint ScheduledPopOutCurrentId;
+        public Bindable<int> Current { get; } = new BindableInt { MinValue = 0, };
 
-        protected virtual float PopOutSmallScale => 1.1f;
-        protected virtual bool CanPopOutWhileRolling => false;
+        private uint scheduledPopOutCurrentId;
+
+        private const double pop_out_duration = 150;
+
+        private const Easing pop_out_easing = Easing.None;
+
+        private const double fade_out_duration = 100;
+
+        /// <summary>
+        /// Duration in milliseconds for the counter roll-up animation for each element.
+        /// </summary>
+        private const double rolling_duration = 20;
+
+        private Drawable popOutCount;
+
+        private Drawable displayedCountSpriteText;
 
-        protected Drawable PopOutCount;
-        protected Drawable DisplayedCountSpriteText;
         private int previousValue;
+
         private int displayedCount;
 
+        private bool isRolling;
+
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
         public LegacyComboCounter()
         {
             AutoSizeAxes = Axes.Both;
@@ -40,65 +58,38 @@ namespace osu.Game.Screens.Play.HUD
             Scale = new Vector2(1.6f);
         }
 
-        [Resolved]
-        private ISkinSource skin { get; set; }
-
-        public Bindable<int> Current { get; } = new BindableInt
-        {
-            MinValue = 0,
-        };
-
-        public bool IsRolling { get; protected set; }
-        protected virtual double PopOutDuration => 150;
-        protected virtual float PopOutScale => 1.6f;
-        protected virtual Easing PopOutEasing => Easing.None;
-        protected virtual float PopOutInitialAlpha => 0.75f;
-        protected virtual double FadeOutDuration => 100;
-
-        /// <summary>
-        /// Duration in milliseconds for the counter roll-up animation for each element.
-        /// </summary>
-        protected virtual double RollingDuration => 20;
-
-        /// <summary>
-        /// Easing for the counter rollover animation.
-        /// </summary>
-        protected Easing RollingEasing => Easing.None;
-
         /// <summary>
         /// Value shown at the current moment.
         /// </summary>
         public virtual int DisplayedCount
         {
             get => displayedCount;
-            protected set
+            private set
             {
                 if (displayedCount.Equals(value))
                     return;
 
-                updateDisplayedCount(displayedCount, value, IsRolling);
-            }
-        }
+                if (isRolling)
+                    onDisplayedCountRolling(displayedCount, value);
+                else if (displayedCount + 1 == value)
+                    onDisplayedCountIncrement(value);
+                else
+                    onDisplayedCountChange(value);
 
-        protected Drawable CreateSpriteText()
-        {
-            return skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) ?? new OsuSpriteText
-            {
-                Font = OsuFont.Numeric.With(size: 40),
-                UseFullGlyphHeight = false,
-            };
+                displayedCount = value;
+            }
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
-                DisplayedCountSpriteText = CreateSpriteText().With(s =>
+                displayedCountSpriteText = createSpriteText().With(s =>
                 {
                     s.Alpha = 0;
                 }),
-                PopOutCount = CreateSpriteText().With(s =>
+                popOutCount = createSpriteText().With(s =>
                 {
                     s.Alpha = 0;
                     s.Margin = new MarginPadding(0.05f);
@@ -112,162 +103,16 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            ((IHasText)DisplayedCountSpriteText).Text = FormatCount(Current.Value);
+            ((IHasText)displayedCountSpriteText).Text = formatCount(Current.Value);
 
-            DisplayedCountSpriteText.Anchor = Anchor;
-            DisplayedCountSpriteText.Origin = Origin;
-            PopOutCount.Origin = Origin;
-            PopOutCount.Anchor = Anchor;
+            displayedCountSpriteText.Anchor = Anchor;
+            displayedCountSpriteText.Origin = Origin;
+            popOutCount.Origin = Origin;
+            popOutCount.Anchor = Anchor;
 
-            StopRolling();
-        }
-
-        protected virtual void TransformPopOut(int newValue)
-        {
-            ((IHasText)PopOutCount).Text = FormatCount(newValue);
-
-            PopOutCount.ScaleTo(PopOutScale);
-            PopOutCount.FadeTo(PopOutInitialAlpha);
-            PopOutCount.MoveTo(Vector2.Zero);
-
-            PopOutCount.ScaleTo(1, PopOutDuration, PopOutEasing);
-            PopOutCount.FadeOut(PopOutDuration, PopOutEasing);
-            PopOutCount.MoveTo(DisplayedCountSpriteText.Position, PopOutDuration, PopOutEasing);
-        }
-
-        protected virtual void TransformPopOutRolling(int newValue)
-        {
-            TransformPopOut(newValue);
-            TransformPopOutSmall(newValue);
-        }
-
-        protected virtual void TransformNoPopOut(int newValue)
-        {
-            ((IHasText)DisplayedCountSpriteText).Text = FormatCount(newValue);
-            DisplayedCountSpriteText.ScaleTo(1);
-        }
-
-        protected virtual void TransformPopOutSmall(int newValue)
-        {
-            ((IHasText)DisplayedCountSpriteText).Text = FormatCount(newValue);
-            DisplayedCountSpriteText.ScaleTo(PopOutSmallScale);
-            DisplayedCountSpriteText.ScaleTo(1, PopOutDuration, PopOutEasing);
-        }
-
-        protected virtual void ScheduledPopOutSmall(uint id)
-        {
-            // Too late; scheduled task invalidated
-            if (id != ScheduledPopOutCurrentId)
-                return;
-
-            DisplayedCount++;
-        }
-
-        protected void OnCountRolling(int currentValue, int newValue)
-        {
-            ScheduledPopOutCurrentId++;
-
-            // Hides displayed count if was increasing from 0 to 1 but didn't finish
-            if (currentValue == 0 && newValue == 0)
-                DisplayedCountSpriteText.FadeOut(FadeOutDuration);
-
-            transformRoll(currentValue, newValue);
-        }
-
-        protected void OnCountIncrement(int currentValue, int newValue)
-        {
-            ScheduledPopOutCurrentId++;
-
-            if (DisplayedCount < currentValue)
-                DisplayedCount++;
-
-            DisplayedCountSpriteText.Show();
-
-            TransformPopOut(newValue);
-
-            uint newTaskId = ScheduledPopOutCurrentId;
-            Scheduler.AddDelayed(delegate
-            {
-                ScheduledPopOutSmall(newTaskId);
-            }, PopOutDuration);
-        }
-
-        protected void OnCountChange(int currentValue, int newValue)
-        {
-            ScheduledPopOutCurrentId++;
-
-            if (newValue == 0)
-                DisplayedCountSpriteText.FadeOut();
-
-            DisplayedCount = newValue;
-        }
-
-        protected void OnDisplayedCountRolling(int currentValue, int newValue)
-        {
-            if (newValue == 0)
-                DisplayedCountSpriteText.FadeOut(FadeOutDuration);
-            else
-                DisplayedCountSpriteText.Show();
-
-            if (CanPopOutWhileRolling)
-                TransformPopOutRolling(newValue);
-            else
-                TransformNoPopOut(newValue);
-        }
-
-        protected void OnDisplayedCountChange(int newValue)
-        {
-            DisplayedCountSpriteText.FadeTo(newValue == 0 ? 0 : 1);
-
-            TransformNoPopOut(newValue);
-        }
-
-        protected void OnDisplayedCountIncrement(int newValue)
-        {
-            DisplayedCountSpriteText.Show();
-
-            TransformPopOutSmall(newValue);
-        }
-
-        /// <summary>
-        /// Increments the combo by an amount.
-        /// </summary>
-        /// <param name="amount"></param>
-        public void Increment(int amount = 1)
-        {
-            Current.Value += amount;
-        }
-
-        /// <summary>
-        /// Stops rollover animation, forcing the displayed count to be the actual count.
-        /// </summary>
-        public void StopRolling()
-        {
             updateCount(false);
         }
 
-        protected string FormatCount(int count)
-        {
-            return $@"{count}x";
-        }
-
-        private double getProportionalDuration(int currentValue, int newValue)
-        {
-            double difference = currentValue > newValue ? currentValue - newValue : newValue - currentValue;
-            return difference * RollingDuration;
-        }
-
-        private void updateDisplayedCount(int currentValue, int newValue, bool rolling)
-        {
-            displayedCount = newValue;
-            if (rolling)
-                OnDisplayedCountRolling(currentValue, newValue);
-            else if (currentValue + 1 == newValue)
-                OnDisplayedCountIncrement(newValue);
-            else
-                OnDisplayedCountChange(newValue);
-        }
-
         private void updateCount(bool rolling)
         {
             int prev = previousValue;
@@ -279,24 +124,134 @@ namespace osu.Game.Screens.Play.HUD
             if (!rolling)
             {
                 FinishTransforms(false, nameof(DisplayedCount));
-                IsRolling = false;
+                isRolling = false;
                 DisplayedCount = prev;
 
                 if (prev + 1 == Current.Value)
-                    OnCountIncrement(prev, Current.Value);
+                    onCountIncrement(prev, Current.Value);
                 else
-                    OnCountChange(prev, Current.Value);
+                    onCountChange(prev, Current.Value);
             }
             else
             {
-                OnCountRolling(displayedCount, Current.Value);
-                IsRolling = true;
+                onCountRolling(displayedCount, Current.Value);
+                isRolling = true;
             }
         }
 
-        private void transformRoll(int currentValue, int newValue)
+        private void transformPopOut(int newValue)
         {
-            this.TransformTo<LegacyComboCounter, int>(nameof(DisplayedCount), newValue, getProportionalDuration(currentValue, newValue), RollingEasing);
+            ((IHasText)popOutCount).Text = formatCount(newValue);
+
+            popOutCount.ScaleTo(1.6f);
+            popOutCount.FadeTo(0.75f);
+            popOutCount.MoveTo(Vector2.Zero);
+
+            popOutCount.ScaleTo(1, pop_out_duration, pop_out_easing);
+            popOutCount.FadeOut(pop_out_duration, pop_out_easing);
+            popOutCount.MoveTo(displayedCountSpriteText.Position, pop_out_duration, pop_out_easing);
         }
+
+        private void transformNoPopOut(int newValue)
+        {
+            ((IHasText)displayedCountSpriteText).Text = formatCount(newValue);
+
+            displayedCountSpriteText.ScaleTo(1);
+        }
+
+        private void transformPopOutSmall(int newValue)
+        {
+            ((IHasText)displayedCountSpriteText).Text = formatCount(newValue);
+            displayedCountSpriteText.ScaleTo(1.1f);
+            displayedCountSpriteText.ScaleTo(1, pop_out_duration, pop_out_easing);
+        }
+
+        private void scheduledPopOutSmall(uint id)
+        {
+            // Too late; scheduled task invalidated
+            if (id != scheduledPopOutCurrentId)
+                return;
+
+            DisplayedCount++;
+        }
+
+        private void onCountIncrement(int currentValue, int newValue)
+        {
+            scheduledPopOutCurrentId++;
+
+            if (DisplayedCount < currentValue)
+                DisplayedCount++;
+
+            displayedCountSpriteText.Show();
+
+            transformPopOut(newValue);
+
+            uint newTaskId = scheduledPopOutCurrentId;
+
+            Scheduler.AddDelayed(delegate
+            {
+                scheduledPopOutSmall(newTaskId);
+            }, pop_out_duration);
+        }
+
+        private void onCountRolling(int currentValue, int newValue)
+        {
+            scheduledPopOutCurrentId++;
+
+            // Hides displayed count if was increasing from 0 to 1 but didn't finish
+            if (currentValue == 0 && newValue == 0)
+                displayedCountSpriteText.FadeOut(fade_out_duration);
+
+            transformRoll(currentValue, newValue);
+        }
+
+        private void onCountChange(int currentValue, int newValue)
+        {
+            scheduledPopOutCurrentId++;
+
+            if (newValue == 0)
+                displayedCountSpriteText.FadeOut();
+
+            DisplayedCount = newValue;
+        }
+
+        private void onDisplayedCountRolling(int currentValue, int newValue)
+        {
+            if (newValue == 0)
+                displayedCountSpriteText.FadeOut(fade_out_duration);
+            else
+                displayedCountSpriteText.Show();
+
+            transformNoPopOut(newValue);
+        }
+
+        private void onDisplayedCountChange(int newValue)
+        {
+            displayedCountSpriteText.FadeTo(newValue == 0 ? 0 : 1);
+            transformNoPopOut(newValue);
+        }
+
+        private void onDisplayedCountIncrement(int newValue)
+        {
+            displayedCountSpriteText.Show();
+            transformPopOutSmall(newValue);
+        }
+
+        private void transformRoll(int currentValue, int newValue) =>
+            this.TransformTo(nameof(DisplayedCount), newValue, getProportionalDuration(currentValue, newValue), Easing.None);
+
+        private string formatCount(int count) => $@"{count}x";
+
+        private double getProportionalDuration(int currentValue, int newValue)
+        {
+            double difference = currentValue > newValue ? currentValue - newValue : newValue - currentValue;
+            return difference * rolling_duration;
+        }
+
+        private Drawable createSpriteText() => skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) ?? new OsuSpriteText
+        {
+            Font = OsuFont.Numeric.With(size: 40),
+            UseFullGlyphHeight = false,
+        };
     }
 }

From ac4f56403df80e1cfda6c9fb9d94879d63aa0930 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 19:15:52 +0900
Subject: [PATCH 05471/10326] Adjust size/position

---
 osu.Game/Screens/Play/HUD/LegacyComboCounter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index c96a20405c..55ce68fcc8 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -53,9 +53,9 @@ namespace osu.Game.Screens.Play.HUD
             Anchor = Anchor.BottomLeft;
             Origin = Anchor.BottomLeft;
 
-            Margin = new MarginPadding { Bottom = 20, Left = 20 };
+            Margin = new MarginPadding { Bottom = 10, Left = 10 };
 
-            Scale = new Vector2(1.6f);
+            Scale = new Vector2(1.2f);
         }
 
         /// <summary>

From 7d2eeb979532fc643eb6df12fed2691a2c417d66 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 19:18:04 +0900
Subject: [PATCH 05472/10326] Fix test names

---
 .../NonVisual/DifficultyAdjustmentModCombinationsTest.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index de0397dc84..917f245f4f 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.NonVisual
         }
 
         [Test]
-        public void TestMultiMod1()
+        public void TestMultiModFlattening()
         {
             var combinations = new TestLegacyDifficultyCalculator(new ModA(), new MultiMod(new ModB(), new ModC())).CreateDifficultyAdjustmentModCombinations();
 
@@ -113,7 +113,7 @@ namespace osu.Game.Tests.NonVisual
         }
 
         [Test]
-        public void TestMultiMod2()
+        public void TestIncompatibleThroughMultiMod()
         {
             var combinations = new TestLegacyDifficultyCalculator(new ModA(), new MultiMod(new ModB(), new ModIncompatibleWithA())).CreateDifficultyAdjustmentModCombinations();
 

From e9ebeedbe2edd7b1d4e62f9d01d8940b4cf5255a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 19:31:31 +0900
Subject: [PATCH 05473/10326] Refactor generation

---
 .../Difficulty/DifficultyCalculator.cs        | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 9989c750ee..70f248e072 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -105,10 +105,11 @@ namespace osu.Game.Rulesets.Difficulty
         /// </summary>
         public Mod[] CreateDifficultyAdjustmentModCombinations()
         {
-            return createDifficultyAdjustmentModCombinations(Array.Empty<Mod>(), DifficultyAdjustmentMods).ToArray();
+            return createDifficultyAdjustmentModCombinations(DifficultyAdjustmentMods, Array.Empty<Mod>()).ToArray();
 
-            static IEnumerable<Mod> createDifficultyAdjustmentModCombinations(IEnumerable<Mod> currentSet, Mod[] adjustmentSet, int currentSetCount = 0, int adjustmentSetStart = 0)
+            static IEnumerable<Mod> createDifficultyAdjustmentModCombinations(ReadOnlyMemory<Mod> remainingMods, IEnumerable<Mod> currentSet, int currentSetCount = 0)
             {
+                // Return the current set.
                 switch (currentSetCount)
                 {
                     case 0:
@@ -128,11 +129,10 @@ namespace osu.Game.Rulesets.Difficulty
                         break;
                 }
 
-                // Apply mods in the adjustment set recursively. Using the entire adjustment set would result in duplicate multi-mod mod
-                // combinations in further recursions, so a moving subset is used to eliminate this effect
-                for (int i = adjustmentSetStart; i < adjustmentSet.Length; i++)
+                // Apply the rest of the remaining mods recursively.
+                for (int i = 0; i < remainingMods.Length; i++)
                 {
-                    var adjustmentMod = adjustmentSet[i];
+                    var adjustmentMod = remainingMods.Span[i];
 
                     if (currentSet.Any(c => c.IncompatibleMods.Any(m => m.IsInstanceOfType(adjustmentMod))
                                             || adjustmentMod.IncompatibleMods.Any(m => m.IsInstanceOfType(c))))
@@ -141,27 +141,30 @@ namespace osu.Game.Rulesets.Difficulty
                     }
 
                     // Append the new mod.
-                    int newSetCount = currentSetCount;
-                    var newSet = append(currentSet, adjustmentMod, ref newSetCount);
+                    var (newSet, newSetCount) = flatten(adjustmentMod);
 
-                    foreach (var combo in createDifficultyAdjustmentModCombinations(newSet, adjustmentSet, newSetCount, i + 1))
+                    foreach (var combo in createDifficultyAdjustmentModCombinations(remainingMods.Slice(i + 1), currentSet.Concat(newSet), currentSetCount + newSetCount))
                         yield return combo;
                 }
             }
 
-            // Appends a mod to an existing enumerable, returning the result. Recurses for MultiMod.
-            static IEnumerable<Mod> append(IEnumerable<Mod> existing, Mod mod, ref int count)
+            // Flattens a mod hierarchy (through MultiMod) as an IEnumerable<Mod>
+            static (IEnumerable<Mod> set, int count) flatten(Mod mod)
             {
-                if (mod is MultiMod multi)
-                {
-                    foreach (var nested in multi.Mods)
-                        existing = append(existing, nested, ref count);
+                if (!(mod is MultiMod multi))
+                    return (mod.Yield(), 1);
 
-                    return existing;
+                IEnumerable<Mod> set = Enumerable.Empty<Mod>();
+                int count = 0;
+
+                foreach (var nested in multi.Mods)
+                {
+                    var (nestedSet, nestedCount) = flatten(nested);
+                    set = set.Concat(nestedSet);
+                    count += nestedCount;
                 }
 
-                count++;
-                return existing.Append(mod);
+                return (set, count);
             }
         }
 

From e3eaba7b2ca46685780041b788dd2d3a229bbd57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 19:39:48 +0900
Subject: [PATCH 05474/10326] Move ISampleDisabler implementation to Player and
 FrameStabilityContainer

---
 .../Gameplay/TestSceneGameplaySamplePlayback.cs     |  2 +-
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs     | 12 +++++++++---
 osu.Game/Screens/Play/GameplayClock.cs              | 10 ++--------
 osu.Game/Screens/Play/GameplayClockContainer.cs     |  1 -
 osu.Game/Screens/Play/Player.cs                     | 13 +++++++++++--
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index 5bb3851264..6e505b16c2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("get variables", () =>
             {
-                gameplayClock = Player.ChildrenOfType<FrameStabilityContainer>().First().GameplayClock;
+                gameplayClock = Player.ChildrenOfType<FrameStabilityContainer>().First();
                 slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
                 samples = slider.ChildrenOfType<DrawableSample>().ToArray();
             });
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 70b3d0c7d4..e4a3a2fe3d 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -18,8 +18,11 @@ namespace osu.Game.Rulesets.UI
     /// A container which consumes a parent gameplay clock and standardises frame counts for children.
     /// Will ensure a minimum of 50 frames per clock second is maintained, regardless of any system lag or seeks.
     /// </summary>
-    public class FrameStabilityContainer : Container, IHasReplayHandler
+    [Cached(typeof(ISamplePlaybackDisabler))]
+    public class FrameStabilityContainer : Container, IHasReplayHandler, ISamplePlaybackDisabler
     {
+        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
         private readonly double gameplayStartTime;
 
         /// <summary>
@@ -35,7 +38,6 @@ namespace osu.Game.Rulesets.UI
         public GameplayClock GameplayClock => stabilityGameplayClock;
 
         [Cached(typeof(GameplayClock))]
-        [Cached(typeof(ISamplePlaybackDisabler))]
         private readonly StabilityGameplayClock stabilityGameplayClock;
 
         public FrameStabilityContainer(double gameplayStartTime = double.MinValue)
@@ -102,6 +104,8 @@ namespace osu.Game.Rulesets.UI
             requireMoreUpdateLoops = true;
             validState = !GameplayClock.IsPaused.Value;
 
+            samplePlaybackDisabled.Value = stabilityGameplayClock.ShouldDisableSamplePlayback;
+
             int loops = 0;
 
             while (validState && requireMoreUpdateLoops && loops++ < MaxCatchUpFrames)
@@ -224,6 +228,8 @@ namespace osu.Game.Rulesets.UI
 
         public ReplayInputHandler ReplayInputHandler { get; set; }
 
+        IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => samplePlaybackDisabled;
+
         private class StabilityGameplayClock : GameplayClock
         {
             public GameplayClock ParentGameplayClock;
@@ -237,7 +243,7 @@ namespace osu.Game.Rulesets.UI
             {
             }
 
-            protected override bool ShouldDisableSamplePlayback =>
+            public override bool ShouldDisableSamplePlayback =>
                 // handle the case where playback is catching up to real-time.
                 base.ShouldDisableSamplePlayback
                 || ParentSampleDisabler?.SamplePlaybackDisabled.Value == true
diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index eeea6777c6..4d0872e5bb 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play
     /// <see cref="IFrameBasedClock"/>, as this should only be done once to ensure accuracy.
     /// </remarks>
     /// </summary>
-    public class GameplayClock : IFrameBasedClock, ISamplePlaybackDisabler
+    public class GameplayClock : IFrameBasedClock
     {
         private readonly IFrameBasedClock underlyingClock;
 
@@ -28,8 +28,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual IEnumerable<Bindable<double>> NonGameplayAdjustments => Enumerable.Empty<Bindable<double>>();
 
-        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
-
         public GameplayClock(IFrameBasedClock underlyingClock)
         {
             this.underlyingClock = underlyingClock;
@@ -66,13 +64,11 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Whether nested samples supporting the <see cref="ISamplePlaybackDisabler"/> interface should be paused.
         /// </summary>
-        protected virtual bool ShouldDisableSamplePlayback => IsPaused.Value;
+        public virtual bool ShouldDisableSamplePlayback => IsPaused.Value;
 
         public void ProcessFrame()
         {
             // intentionally not updating the underlying clock (handled externally).
-
-            samplePlaybackDisabled.Value = ShouldDisableSamplePlayback;
         }
 
         public double ElapsedFrameTime => underlyingClock.ElapsedFrameTime;
@@ -82,7 +78,5 @@ namespace osu.Game.Screens.Play
         public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
 
         public IClock Source => underlyingClock;
-
-        IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => samplePlaybackDisabled;
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 9f8e55f577..6679e56871 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -54,7 +54,6 @@ namespace osu.Game.Screens.Play
         public GameplayClock GameplayClock => localGameplayClock;
 
         [Cached(typeof(GameplayClock))]
-        [Cached(typeof(ISamplePlaybackDisabler))]
         private readonly LocalGameplayClock localGameplayClock;
 
         private Bindable<double> userAudioOffset;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a2a53b4b75..56b212291a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -35,7 +35,8 @@ using osu.Game.Users;
 namespace osu.Game.Screens.Play
 {
     [Cached]
-    public class Player : ScreenWithBeatmapBackground
+    [Cached(typeof(ISamplePlaybackDisabler))]
+    public class Player : ScreenWithBeatmapBackground, ISamplePlaybackDisabler
     {
         /// <summary>
         /// The delay upon completion of the beatmap before displaying the results screen.
@@ -55,6 +56,8 @@ namespace osu.Game.Screens.Play
         // We are managing our own adjustments (see OnEntering/OnExiting).
         public override bool AllowRateAdjustments => false;
 
+        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
         /// <summary>
         /// Whether gameplay should pause when the game window focus is lost.
         /// </summary>
@@ -229,7 +232,11 @@ namespace osu.Game.Screens.Play
                 skipOverlay.Hide();
             }
 
-            DrawableRuleset.IsPaused.BindValueChanged(_ => updateGameplayState());
+            DrawableRuleset.IsPaused.BindValueChanged(paused =>
+            {
+                updateGameplayState();
+                samplePlaybackDisabled.Value = paused.NewValue;
+            });
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateGameplayState());
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
@@ -752,5 +759,7 @@ namespace osu.Game.Screens.Play
         }
 
         #endregion
+
+        IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => samplePlaybackDisabled;
     }
 }

From c4fdd35223e85e383b26b82eec0e8c1212eb11f9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 19:53:37 +0900
Subject: [PATCH 05475/10326] Fix same-type incompatibility through multimod

---
 .../DifficultyAdjustmentModCombinationsTest.cs | 14 ++++++++++++++
 .../Difficulty/DifficultyCalculator.cs         | 18 ++++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index 917f245f4f..5c7adb3f49 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -126,6 +126,20 @@ namespace osu.Game.Tests.NonVisual
             Assert.IsTrue(((MultiMod)combinations[2]).Mods[1] is ModIncompatibleWithA);
         }
 
+        [Test]
+        public void TestIncompatibleWithSameInstanceViaMultiMod()
+        {
+            var combinations = new TestLegacyDifficultyCalculator(new ModA(), new MultiMod(new ModA(), new ModB())).CreateDifficultyAdjustmentModCombinations();
+
+            Assert.AreEqual(3, combinations.Length);
+            Assert.IsTrue(combinations[0] is ModNoMod);
+            Assert.IsTrue(combinations[1] is ModA);
+            Assert.IsTrue(combinations[2] is MultiMod);
+
+            Assert.IsTrue(((MultiMod)combinations[2]).Mods[0] is ModA);
+            Assert.IsTrue(((MultiMod)combinations[2]).Mods[1] is ModB);
+        }
+
         private class ModA : Mod
         {
             public override string Name => nameof(ModA);
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 70f248e072..55b3d6607c 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Beatmaps;
@@ -11,6 +12,7 @@ using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using Sentry;
 
 namespace osu.Game.Rulesets.Difficulty
 {
@@ -132,18 +134,18 @@ namespace osu.Game.Rulesets.Difficulty
                 // Apply the rest of the remaining mods recursively.
                 for (int i = 0; i < remainingMods.Length; i++)
                 {
-                    var adjustmentMod = remainingMods.Span[i];
+                    var (nextSet, nextCount) = flatten(remainingMods.Span[i]);
 
-                    if (currentSet.Any(c => c.IncompatibleMods.Any(m => m.IsInstanceOfType(adjustmentMod))
-                                            || adjustmentMod.IncompatibleMods.Any(m => m.IsInstanceOfType(c))))
-                    {
+                    // Check if any mods in the next set are incompatible with any of the current set.
+                    if (currentSet.SelectMany(m => m.IncompatibleMods).Any(c => nextSet.Any(c.IsInstanceOfType)))
                         continue;
-                    }
 
-                    // Append the new mod.
-                    var (newSet, newSetCount) = flatten(adjustmentMod);
+                    // Check if any mods in the next set are the same type as the current set. Mods of the exact same type are not incompatible with themselves.
+                    if (currentSet.Any(c => nextSet.Any(n => c.GetType() == n.GetType())))
+                        continue;
 
-                    foreach (var combo in createDifficultyAdjustmentModCombinations(remainingMods.Slice(i + 1), currentSet.Concat(newSet), currentSetCount + newSetCount))
+                    // If all's good, attach the next set to the current set and recurse further.
+                    foreach (var combo in createDifficultyAdjustmentModCombinations(remainingMods.Slice(i + 1), currentSet.Concat(nextSet), currentSetCount + nextCount))
                         yield return combo;
                 }
             }

From ed57b1363fdef33c350d1c65404739aca92750bd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 20:08:46 +0900
Subject: [PATCH 05476/10326] Remove unused usings

---
 osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 55b3d6607c..7616c48150 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Beatmaps;
@@ -12,7 +11,6 @@ using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
-using Sentry;
 
 namespace osu.Game.Rulesets.Difficulty
 {

From 1a2dc8374052f770fbd936de980901ba69909aeb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 20:40:17 +0900
Subject: [PATCH 05477/10326] Make field readonly

---
 osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 757329c525..7a0e3b2b76 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
         public bool Dual;
         public readonly bool IsForCurrentRuleset;
 
-        private int originalTargetColumns;
+        private readonly int originalTargetColumns;
 
         // Internal for testing purposes
         internal FastRandom Random { get; private set; }

From 26dffbfd3bed7b5eafc28d8885b276bfb778e9a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Oct 2020 20:40:29 +0900
Subject: [PATCH 05478/10326] Replicate hit window calculation

---
 .../Difficulty/ManiaDifficultyCalculator.cs   | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index 356621acda..ade830764d 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -26,11 +26,13 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         private const double star_scaling_factor = 0.018;
 
         private readonly bool isForCurrentRuleset;
+        private readonly double originalOverallDifficulty;
 
         public ManiaDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
             isForCurrentRuleset = beatmap.BeatmapInfo.Ruleset.Equals(ruleset.RulesetInfo);
+            originalOverallDifficulty = beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty;
         }
 
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
@@ -46,7 +48,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 StarRating = skills[0].DifficultyValue() * star_scaling_factor,
                 Mods = mods,
                 // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be removed in the future
-                GreatHitWindow = (int)(hitWindows.WindowFor(HitResult.Great)) / clockRate,
+                GreatHitWindow = (int)Math.Ceiling(getHitWindow300(mods) / clockRate),
                 ScoreMultiplier = getScoreMultiplier(beatmap, mods),
                 MaxCombo = beatmap.HitObjects.Sum(h => h is HoldNote ? 2 : 1),
                 Skills = skills
@@ -107,6 +109,35 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             }
         }
 
+        private int getHitWindow300(Mod[] mods)
+        {
+            if (isForCurrentRuleset)
+            {
+                double od = Math.Min(10.0, Math.Max(0, 10.0 - originalOverallDifficulty));
+                return applyModAdjustments(34 + 3 * od, mods);
+            }
+
+            if (Math.Round(originalOverallDifficulty) > 4)
+                return applyModAdjustments(34, mods);
+
+            return applyModAdjustments(47, mods);
+
+            static int applyModAdjustments(double value, Mod[] mods)
+            {
+                if (mods.Any(m => m is ManiaModHardRock))
+                    value /= 1.4;
+                else if (mods.Any(m => m is ManiaModEasy))
+                    value *= 1.4;
+
+                if (mods.Any(m => m is ManiaModDoubleTime))
+                    value *= 1.5;
+                else if (mods.Any(m => m is ManiaModHalfTime))
+                    value *= 0.75;
+
+                return (int)value;
+            }
+        }
+
         private double getScoreMultiplier(IBeatmap beatmap, Mod[] mods)
         {
             double scoreMultiplier = 1;

From b63303a2a813aef2b4a574ab5657157f52e1e2ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 21:40:49 +0900
Subject: [PATCH 05479/10326] Fix tests

---
 .../Gameplay/TestSceneSkinnableSound.cs       | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 8f2011e5dd..18eeb0a0e7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
 using osu.Game.Audio;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
@@ -22,27 +21,24 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinnableSound : OsuTestScene
     {
-        [Cached(typeof(ISamplePlaybackDisabler))]
-        private GameplayClock gameplayClock = new GameplayClock(new FramedClock());
-
         private TestSkinSourceContainer skinSource;
         private PausableSkinnableSound skinnableSound;
 
         [SetUp]
-        public void SetUp() => Schedule(() =>
+        public void SetUpSteps()
         {
-            gameplayClock.IsPaused.Value = false;
-
-            Children = new Drawable[]
+            AddStep("setup heirarchy", () =>
             {
-                skinSource = new TestSkinSourceContainer
+                Children = new Drawable[]
                 {
-                    Clock = gameplayClock,
-                    RelativeSizeAxes = Axes.Both,
-                    Child = skinnableSound = new PausableSkinnableSound(new SampleInfo("normal-sliderslide"))
-                },
-            };
-        });
+                    skinSource = new TestSkinSourceContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Child = skinnableSound = new PausableSkinnableSound(new SampleInfo("normal-sliderslide"))
+                    },
+                };
+            });
+        }
 
         [Test]
         public void TestStoppedSoundDoesntResumeAfterPause()
@@ -62,8 +58,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
 
-            AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
-            AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
+            AddStep("pause gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = true);
+
+            AddStep("resume gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = false);
 
             AddWaitStep("wait a bit", 5);
             AddAssert("sample not playing", () => !sample.Playing);
@@ -82,8 +79,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("wait for sample to start playing", () => sample.Playing);
 
-            AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
+            AddStep("pause gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = true);
             AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+
+            AddStep("resume gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = false);
+            AddUntilStep("wait for sample to start playing", () => sample.Playing);
         }
 
         [Test]
@@ -98,10 +98,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddAssert("sample playing", () => sample.Playing);
 
-            AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
-            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+            AddStep("pause gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = true);
 
-            AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
+            AddUntilStep("sample not playing", () => !sample.Playing);
+
+            AddStep("resume gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = false);
 
             AddAssert("sample not playing", () => !sample.Playing);
             AddAssert("sample not playing", () => !sample.Playing);
@@ -120,7 +121,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddAssert("sample playing", () => sample.Playing);
 
-            AddStep("pause gameplay clock", () => gameplayClock.IsPaused.Value = true);
+            AddStep("pause gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = true);
             AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
 
             AddStep("trigger skin change", () => skinSource.TriggerSourceChanged());
@@ -133,20 +134,25 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddAssert("new sample stopped", () => !sample.Playing);
-            AddStep("resume gameplay clock", () => gameplayClock.IsPaused.Value = false);
+            AddStep("resume gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = false);
 
             AddWaitStep("wait a bit", 5);
             AddAssert("new sample not played", () => !sample.Playing);
         }
 
         [Cached(typeof(ISkinSource))]
-        private class TestSkinSourceContainer : Container, ISkinSource
+        [Cached(typeof(ISamplePlaybackDisabler))]
+        private class TestSkinSourceContainer : Container, ISkinSource, ISamplePlaybackDisabler
         {
             [Resolved]
             private ISkinSource source { get; set; }
 
             public event Action SourceChanged;
 
+            public Bindable<bool> SamplePlaybackDisabled { get; } = new Bindable<bool>();
+
+            IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => SamplePlaybackDisabled;
+
             public Drawable GetDrawableComponent(ISkinComponent component) => source?.GetDrawableComponent(component);
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source?.GetTexture(componentName, wrapModeS, wrapModeT);
             public SampleChannel GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);

From e0210f5c4ce2c8ab00a74b35f9103da01824f148 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 23:52:58 +0900
Subject: [PATCH 05480/10326] Ignore failed casts to make tests happy

---
 osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index 9f8ad758e4..f7b6e419ea 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -21,8 +21,8 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.SkinChanged(skin, allowFallback);
 
-            skinnedCounter = (IComboCounter)Drawable;
-            skinnedCounter.Current.BindTo(Current);
+            skinnedCounter = Drawable as IComboCounter;
+            skinnedCounter?.Current.BindTo(Current);
         }
 
         private static Drawable createDefault(ISkinComponent skinComponent) => new DefaultComboCounter();

From 2ca6c4e377fd861e989649e3be5295826866022d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 14 Oct 2020 23:24:16 +0200
Subject: [PATCH 05481/10326] Adjust test step names

---
 .../Visual/Gameplay/TestSceneSkinnableSound.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 18eeb0a0e7..864e88d023 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUp]
         public void SetUpSteps()
         {
-            AddStep("setup heirarchy", () =>
+            AddStep("setup hierarchy", () =>
             {
                 Children = new Drawable[]
                 {
@@ -58,9 +58,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
 
-            AddStep("pause gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = true);
+            AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
 
-            AddStep("resume gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = false);
+            AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
 
             AddWaitStep("wait a bit", 5);
             AddAssert("sample not playing", () => !sample.Playing);
@@ -79,10 +79,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("wait for sample to start playing", () => sample.Playing);
 
-            AddStep("pause gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = true);
+            AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
             AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
 
-            AddStep("resume gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = false);
+            AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
             AddUntilStep("wait for sample to start playing", () => sample.Playing);
         }
 
@@ -98,11 +98,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddAssert("sample playing", () => sample.Playing);
 
-            AddStep("pause gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = true);
+            AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
 
             AddUntilStep("sample not playing", () => !sample.Playing);
 
-            AddStep("resume gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = false);
+            AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
 
             AddAssert("sample not playing", () => !sample.Playing);
             AddAssert("sample not playing", () => !sample.Playing);
@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddAssert("sample playing", () => sample.Playing);
 
-            AddStep("pause gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = true);
+            AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
             AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
 
             AddStep("trigger skin change", () => skinSource.TriggerSourceChanged());
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddAssert("new sample stopped", () => !sample.Playing);
-            AddStep("resume gameplay clock", () => skinSource.SamplePlaybackDisabled.Value = false);
+            AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
 
             AddWaitStep("wait a bit", 5);
             AddAssert("new sample not played", () => !sample.Playing);

From b06f59ffdcf99454bb4447b7e4efb936ebb0f399 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 15:35:33 +0900
Subject: [PATCH 05482/10326] Split out test for combo counter specifically

---
 .../Visual/Gameplay/TestSceneComboCounter.cs  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
new file mode 100644
index 0000000000..d0c2fb5064
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.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 System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneComboCounter : SkinnableTestScene
+    {
+        private IEnumerable<SkinnableComboCounter> comboCounters => CreatedDrawables.OfType<SkinnableComboCounter>();
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("Create combo counters", () => SetContents(() =>
+            {
+                var comboCounter = new SkinnableComboCounter();
+                comboCounter.Current.Value = 1;
+                return comboCounter;
+            }));
+        }
+
+        [Test]
+        public void TestComboCounterIncrementing()
+        {
+            AddRepeatStep("increase combo", () =>
+            {
+                foreach (var counter in comboCounters)
+                    counter.Current.Value++;
+            }, 10);
+
+            AddStep("reset combo", () =>
+            {
+                foreach (var counter in comboCounters)
+                    counter.Current.Value = 0;
+            });
+        }
+    }
+}

From d5f2aab52e4ba4f155118fe3450dc7e57a3979a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 15:37:40 +0900
Subject: [PATCH 05483/10326] Tidy up SkinnableComboCounter class slightly

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

diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index f7b6e419ea..c04c50141a 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -2,15 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableComboCounter : SkinnableDrawable, IComboCounter
     {
+        public Bindable<int> Current { get; } = new Bindable<int>();
+
         public SkinnableComboCounter()
-            : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), createDefault)
+            : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), skinComponent => new DefaultComboCounter())
         {
             CentreComponent = false;
         }
@@ -24,9 +25,5 @@ namespace osu.Game.Screens.Play.HUD
             skinnedCounter = Drawable as IComboCounter;
             skinnedCounter?.Current.BindTo(Current);
         }
-
-        private static Drawable createDefault(ISkinComponent skinComponent) => new DefaultComboCounter();
-
-        public Bindable<int> Current { get; } = new Bindable<int>();
     }
 }

From 219cbec6bdaae9f8b2c987a1be923b55d6d9a596 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 16:31:21 +0900
Subject: [PATCH 05484/10326] Split out DefaultScoreCounter and make
 ScoreCounter abstract

---
 .../Visual/Gameplay/TestSceneScoreCounter.cs  |  2 +-
 .../Graphics/UserInterface/ScoreCounter.cs    | 16 +++++++-----
 .../Screens/Play/HUD/DefaultScoreCounter.cs   | 26 +++++++++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
index ab010bee9f..ba165a70f4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             int numerator = 0, denominator = 0;
 
-            ScoreCounter score = new ScoreCounter(7)
+            ScoreCounter score = new DefaultScoreCounter()
             {
                 Origin = Anchor.TopRight,
                 Anchor = Anchor.TopRight,
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index 73bbe5f03e..17e5ceedb9 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
@@ -1,18 +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.Game.Graphics.Sprites;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class ScoreCounter : RollingCounter<double>
+    public abstract class ScoreCounter : RollingCounter<double>, IScoreCounter
     {
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
 
-        public bool UseCommaSeparator;
+        /// <summary>
+        /// Whether comma separators should be displayed.
+        /// </summary>
+        public bool UseCommaSeparator { get; }
 
         /// <summary>
         /// How many leading zeroes the counter has.
@@ -23,14 +26,13 @@ namespace osu.Game.Graphics.UserInterface
         /// Displays score.
         /// </summary>
         /// <param name="leading">How many leading zeroes the counter will have.</param>
-        public ScoreCounter(uint leading = 0)
+        /// <param name="useCommaSeparator">Whether comma separators should be displayed.</param>
+        protected ScoreCounter(uint leading = 0, bool useCommaSeparator = false)
         {
+            UseCommaSeparator = useCommaSeparator;
             LeadingZeroes = leading;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours) => Colour = colours.BlueLighter;
-
         protected override double GetProportionalDuration(double currentValue, double newValue)
         {
             return currentValue > newValue ? currentValue - newValue : newValue - currentValue;
diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
new file mode 100644
index 0000000000..a461b6a067
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class DefaultScoreCounter : ScoreCounter
+    {
+        public DefaultScoreCounter()
+            : base(6)
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Colour = colours.BlueLighter;
+        }
+    }
+}

From e1da64398e279d0eb6fe53bce2a9e2936403558f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 16:32:20 +0900
Subject: [PATCH 05485/10326] Add and consume skinnable score counter

---
 .../Visual/Gameplay/TestSceneScoreCounter.cs  |  2 +-
 .../TestSceneSkinnableScoreCounter.cs         | 47 +++++++++++++++++++
 osu.Game/Screens/Play/HUD/IScoreCounter.cs    | 19 ++++++++
 .../Screens/Play/HUD/SkinnableScoreCounter.cs | 29 ++++++++++++
 osu.Game/Screens/Play/HUDOverlay.cs           |  8 +---
 osu.Game/Skinning/HUDSkinComponents.cs        |  3 +-
 osu.Game/Skinning/LegacyScoreCounter.cs       | 42 +++++++++++++++++
 osu.Game/Skinning/LegacySkin.cs               |  3 ++
 8 files changed, 145 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
 create mode 100644 osu.Game/Screens/Play/HUD/IScoreCounter.cs
 create mode 100644 osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
 create mode 100644 osu.Game/Skinning/LegacyScoreCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
index ba165a70f4..34c657bf7f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             int numerator = 0, denominator = 0;
 
-            ScoreCounter score = new DefaultScoreCounter()
+            ScoreCounter score = new DefaultScoreCounter
             {
                 Origin = Anchor.TopRight,
                 Anchor = Anchor.TopRight,
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
new file mode 100644
index 0000000000..2d5003d1da
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.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 System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSkinnableScoreCounter : SkinnableTestScene
+    {
+        private IEnumerable<SkinnableScoreCounter> scoreCounters => CreatedDrawables.OfType<SkinnableScoreCounter>();
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("Create combo counters", () => SetContents(() =>
+            {
+                var comboCounter = new SkinnableScoreCounter();
+                comboCounter.Current.Value = 1;
+                return comboCounter;
+            }));
+        }
+
+        [Test]
+        public void TestScoreCounterIncrementing()
+        {
+            AddStep(@"Reset all", delegate
+            {
+                foreach (var s in scoreCounters)
+                    s.Current.Value = 0;
+            });
+
+            AddStep(@"Hit! :D", delegate
+            {
+                foreach (var s in scoreCounters)
+                    s.Current.Value += 300;
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/IScoreCounter.cs b/osu.Game/Screens/Play/HUD/IScoreCounter.cs
new file mode 100644
index 0000000000..2d39a64cfe
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/IScoreCounter.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.Bindables;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// An interface providing a set of methods to update a score counter.
+    /// </summary>
+    public interface IScoreCounter : IDrawable
+    {
+        /// <summary>
+        /// The current score to be displayed.
+        /// </summary>
+        Bindable<double> Current { get; }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
new file mode 100644
index 0000000000..a442ad0d9a
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.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.Bindables;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class SkinnableScoreCounter : SkinnableDrawable, IScoreCounter
+    {
+        public Bindable<double> Current { get; } = new Bindable<double>();
+
+        public SkinnableScoreCounter()
+            : base(new HUDSkinComponent(HUDSkinComponents.ScoreCounter), _ => new DefaultScoreCounter())
+        {
+            CentreComponent = false;
+        }
+
+        private IScoreCounter skinnedCounter;
+
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+
+            skinnedCounter = Drawable as IScoreCounter;
+            skinnedCounter?.Current.BindTo(Current);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index a3547bbc68..56b8d60bd4 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.Play
 
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableComboCounter ComboCounter;
-        public readonly ScoreCounter ScoreCounter;
+        public readonly SkinnableScoreCounter ScoreCounter;
         public readonly RollingCounter<double> AccuracyCounter;
         public readonly HealthDisplay HealthDisplay;
         public readonly SongProgress Progress;
@@ -269,11 +269,7 @@ namespace osu.Game.Screens.Play
             Margin = new MarginPadding { Top = 5, Right = 20 },
         };
 
-        protected virtual ScoreCounter CreateScoreCounter() => new ScoreCounter(6)
-        {
-            Anchor = Anchor.TopCentre,
-            Origin = Anchor.TopCentre,
-        };
+        protected virtual SkinnableScoreCounter CreateScoreCounter() => new SkinnableScoreCounter();
 
         protected virtual SkinnableComboCounter CreateComboCounter() => new SkinnableComboCounter();
 
diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index 7577ba066c..7863161971 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -6,6 +6,7 @@ namespace osu.Game.Skinning
     public enum HUDSkinComponents
     {
         ComboCounter,
-        ScoreText
+        ScoreText,
+        ScoreCounter
     }
 }
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
new file mode 100644
index 0000000000..0e1d4fba7f
--- /dev/null
+++ b/osu.Game/Skinning/LegacyScoreCounter.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 osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Skinning
+{
+    public class LegacyScoreCounter : ScoreCounter
+    {
+        private readonly ISkin skin;
+
+        protected override double RollingDuration => 1000;
+        protected override Easing RollingEasing => Easing.Out;
+
+        public new Bindable<double> Current { get; } = new Bindable<double>();
+
+        public LegacyScoreCounter(ISkin skin)
+            : base(6)
+        {
+            Anchor = Anchor.TopRight;
+            Origin = Anchor.TopRight;
+
+            this.skin = skin;
+
+            // base class uses int for display, but externally we bind to ScoreProcesssor as a double for now.
+            Current.BindValueChanged(v => base.Current.Value = (int)v.NewValue);
+
+            Margin = new MarginPadding { Bottom = 10, Left = 10 };
+            Scale = new Vector2(1.2f);
+        }
+
+        protected sealed override OsuSpriteText CreateSpriteText() =>
+            new LegacySpriteText(skin, "score" /*, true*/)
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+            };
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index a4d47dd2f1..8f4539ca6d 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -335,6 +335,9 @@ namespace osu.Game.Skinning
                         case HUDSkinComponents.ComboCounter:
                             return new LegacyComboCounter();
 
+                        case HUDSkinComponents.ScoreCounter:
+                            return new LegacyScoreCounter(this);
+
                         case HUDSkinComponents.ScoreText:
                             const string font = "score";
 

From 950c47287ca4ce9c4b71f3dc346ba75918341c6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 16:56:05 +0900
Subject: [PATCH 05486/10326] Fix positioning of score display in HUD overlay

---
 .../Screens/Play/HUD/DefaultScoreCounter.cs   | 12 ++++++
 osu.Game/Screens/Play/HUDOverlay.cs           | 41 ++++---------------
 osu.Game/Skinning/LegacyScoreCounter.cs       |  3 +-
 3 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index a461b6a067..af78ce4be2 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -5,11 +5,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class DefaultScoreCounter : ScoreCounter
     {
+        private readonly Vector2 offset = new Vector2(20, 5);
+
         public DefaultScoreCounter()
             : base(6)
         {
@@ -17,10 +20,19 @@ namespace osu.Game.Screens.Play.HUD
             Origin = Anchor.TopCentre;
         }
 
+        [Resolved(canBeNull: true)]
+        private HUDOverlay hud { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
             Colour = colours.BlueLighter;
+
+            // todo: check if default once health display is skinnable
+            hud?.ShowHealthbar.BindValueChanged(healthBar =>
+            {
+                this.MoveToY(healthBar.NewValue ? 30 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING);
+            }, true);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 56b8d60bd4..a507eaaa8d 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -25,8 +25,9 @@ namespace osu.Game.Screens.Play
     [Cached]
     public class HUDOverlay : Container
     {
-        private const float fade_duration = 400;
-        private const Easing fade_easing = Easing.Out;
+        public const float FADE_DURATION = 400;
+
+        public const Easing FADE_EASING = Easing.Out;
 
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableComboCounter ComboCounter;
@@ -62,8 +63,6 @@ namespace osu.Game.Screens.Play
 
         public Action<double> RequestSeek;
 
-        private readonly Container topScoreContainer;
-
         private readonly FillFlowContainer bottomRightElements;
 
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
@@ -96,17 +95,8 @@ namespace osu.Game.Screens.Play
                                     Children = new Drawable[]
                                     {
                                         HealthDisplay = CreateHealthDisplay(),
-                                        topScoreContainer = new Container
-                                        {
-                                            Anchor = Anchor.TopCentre,
-                                            Origin = Anchor.TopCentre,
-                                            AutoSizeAxes = Axes.Both,
-                                            Children = new Drawable[]
-                                            {
-                                                AccuracyCounter = CreateAccuracyCounter(),
-                                                ScoreCounter = CreateScoreCounter(),
-                                            },
-                                        },
+                                        AccuracyCounter = CreateAccuracyCounter(),
+                                        ScoreCounter = CreateScoreCounter(),
                                         ComboCounter = CreateComboCounter(),
                                         ModDisplay = CreateModsContainer(),
                                         HitErrorDisplay = CreateHitErrorDisplayOverlay(),
@@ -132,8 +122,8 @@ namespace osu.Game.Screens.Play
                     Origin = Anchor.BottomRight,
                     X = -5,
                     AutoSizeAxes = Axes.Both,
-                    LayoutDuration = fade_duration / 2,
-                    LayoutEasing = fade_easing,
+                    LayoutDuration = FADE_DURATION / 2,
+                    LayoutEasing = FADE_EASING,
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
@@ -186,21 +176,8 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            ShowHud.BindValueChanged(visible => hideTargets.ForEach(d => d.FadeTo(visible.NewValue ? 1 : 0, fade_duration, fade_easing)));
-
-            ShowHealthbar.BindValueChanged(healthBar =>
-            {
-                if (healthBar.NewValue)
-                {
-                    HealthDisplay.FadeIn(fade_duration, fade_easing);
-                    topScoreContainer.MoveToY(30, fade_duration, fade_easing);
-                }
-                else
-                {
-                    HealthDisplay.FadeOut(fade_duration, fade_easing);
-                    topScoreContainer.MoveToY(0, fade_duration, fade_easing);
-                }
-            }, true);
+            ShowHealthbar.BindValueChanged(healthBar => HealthDisplay.FadeTo(healthBar.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING), true);
+            ShowHud.BindValueChanged(visible => hideTargets.ForEach(d => d.FadeTo(visible.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING)));
 
             configShowHud.BindValueChanged(visible =>
             {
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 0e1d4fba7f..f94bef6652 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -28,8 +28,7 @@ namespace osu.Game.Skinning
             // base class uses int for display, but externally we bind to ScoreProcesssor as a double for now.
             Current.BindValueChanged(v => base.Current.Value = (int)v.NewValue);
 
-            Margin = new MarginPadding { Bottom = 10, Left = 10 };
-            Scale = new Vector2(1.2f);
+            Margin = new MarginPadding(10);
         }
 
         protected sealed override OsuSpriteText CreateSpriteText() =>

From b210147c2e4424f5c935ae28558c10b80a9aa61c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 16:55:47 +0900
Subject: [PATCH 05487/10326] Update combo counter to read from default score
 display's position correctly

---
 osu.Game/Screens/Play/HUD/DefaultComboCounter.cs | 4 ++--
 osu.Game/Screens/Play/HUD/LegacyComboCounter.cs  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 1e23319c28..5ffaf0d388 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -37,10 +37,10 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Update();
 
-            if (hud != null)
+            if (hud?.ScoreCounter.Drawable is DefaultScoreCounter score)
             {
                 // for now align with the score counter. eventually this will be user customisable.
-                Position += ToLocalSpace(hud.ScoreCounter.ScreenSpaceDrawQuad.TopRight) + offset;
+                Position += ToLocalSpace(score.ScreenSpaceDrawQuad.TopRight) + offset;
             }
         }
 
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 55ce68fcc8..66f4c5edb8 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Play.HUD
             Anchor = Anchor.BottomLeft;
             Origin = Anchor.BottomLeft;
 
-            Margin = new MarginPadding { Bottom = 10, Left = 10 };
+            Margin = new MarginPadding(10);
 
             Scale = new Vector2(1.2f);
         }

From 74c031cfbb385d4f081f0f110b66a33e6c7376f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 17:10:35 +0900
Subject: [PATCH 05488/10326] Fix ModOverlay not including "UNRANKED" text in
 size

---
 osu.Game/Screens/Play/HUD/ModDisplay.cs | 33 +++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 99c31241f1..68d019bf71 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -48,22 +48,29 @@ namespace osu.Game.Screens.Play.HUD
         {
             AutoSizeAxes = Axes.Both;
 
-            Children = new Drawable[]
+            Child = new FillFlowContainer
             {
-                iconsContainer = new ReverseChildIDFillFlowContainer<ModIcon>
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
+                    iconsContainer = new ReverseChildIDFillFlowContainer<ModIcon>
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                    },
+                    unrankedText = new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Text = @"/ UNRANKED /",
+                        Font = OsuFont.Numeric.With(size: 12)
+                    }
                 },
-                unrankedText = new OsuSpriteText
-                {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.TopCentre,
-                    Text = @"/ UNRANKED /",
-                    Font = OsuFont.Numeric.With(size: 12)
-                }
             };
 
             Current.ValueChanged += mods =>

From d8d085ede94aedf9051ab85ab035235bab38d215 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 17:11:02 +0900
Subject: [PATCH 05489/10326] Align top-right elements with lowest point in
 score display

---
 .../Screens/Play/HUD/PlayerSettingsOverlay.cs | 10 ++++----
 osu.Game/Screens/Play/HUDOverlay.cs           | 24 +++++++++++++++----
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
index fc80983834..ffcbb06fb3 100644
--- a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
@@ -20,14 +20,13 @@ namespace osu.Game.Screens.Play.HUD
 
         public readonly VisualSettings VisualSettings;
 
-        //public readonly CollectionSettings CollectionSettings;
-
-        //public readonly DiscussionSettings DiscussionSettings;
-
         public PlayerSettingsOverlay()
         {
             AlwaysPresent = true;
-            RelativeSizeAxes = Axes.Both;
+
+            Anchor = Anchor.TopRight;
+            Origin = Anchor.TopRight;
+            AutoSizeAxes = Axes.Both;
 
             Child = new FillFlowContainer<PlayerSettingsGroup>
             {
@@ -36,7 +35,6 @@ namespace osu.Game.Screens.Play.HUD
                 AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Vertical,
                 Spacing = new Vector2(0, 20),
-                Margin = new MarginPadding { Top = 100, Right = 10 },
                 Children = new PlayerSettingsGroup[]
                 {
                     //CollectionSettings = new CollectionSettings(),
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index a507eaaa8d..639da7a3b6 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -64,6 +64,7 @@ namespace osu.Game.Screens.Play
         public Action<double> RequestSeek;
 
         private readonly FillFlowContainer bottomRightElements;
+        private readonly FillFlowContainer topRightElements;
 
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
 
@@ -98,9 +99,7 @@ namespace osu.Game.Screens.Play
                                         AccuracyCounter = CreateAccuracyCounter(),
                                         ScoreCounter = CreateScoreCounter(),
                                         ComboCounter = CreateComboCounter(),
-                                        ModDisplay = CreateModsContainer(),
                                         HitErrorDisplay = CreateHitErrorDisplayOverlay(),
-                                        PlayerSettingsOverlay = CreatePlayerSettingsOverlay(),
                                     }
                                 },
                             },
@@ -116,11 +115,26 @@ namespace osu.Game.Screens.Play
                         }
                     },
                 },
+                topRightElements = new FillFlowContainer
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Margin = new MarginPadding(10),
+                    Spacing = new Vector2(10),
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        ModDisplay = CreateModsContainer(),
+                        PlayerSettingsOverlay = CreatePlayerSettingsOverlay(),
+                    }
+                },
                 bottomRightElements = new FillFlowContainer
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
-                    X = -5,
+                    Margin = new MarginPadding(10),
+                    Spacing = new Vector2(10),
                     AutoSizeAxes = Axes.Both,
                     LayoutDuration = FADE_DURATION / 2,
                     LayoutEasing = FADE_EASING,
@@ -191,6 +205,8 @@ namespace osu.Game.Screens.Play
         protected override void Update()
         {
             base.Update();
+
+            topRightElements.Y = ToLocalSpace(ScoreCounter.Drawable.ScreenSpaceDrawQuad.BottomRight).Y;
             bottomRightElements.Y = -Progress.Height;
         }
 
@@ -266,7 +282,6 @@ namespace osu.Game.Screens.Play
         {
             Anchor = Anchor.BottomRight,
             Origin = Anchor.BottomRight,
-            Margin = new MarginPadding(10),
         };
 
         protected virtual SongProgress CreateProgress() => new SongProgress
@@ -287,7 +302,6 @@ namespace osu.Game.Screens.Play
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
             AutoSizeAxes = Axes.Both,
-            Margin = new MarginPadding { Top = 20, Right = 20 },
         };
 
         protected virtual HitErrorDisplay CreateHitErrorDisplayOverlay() => new HitErrorDisplay(scoreProcessor, drawableRuleset?.FirstAvailableHitWindows);

From 5b5ba7df936f159df034467c0786e6ff4d161838 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 17:22:34 +0900
Subject: [PATCH 05490/10326] Remove unused offset

---
 osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index af78ce4be2..1dcfe2e067 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -5,14 +5,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
-using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class DefaultScoreCounter : ScoreCounter
     {
-        private readonly Vector2 offset = new Vector2(20, 5);
-
         public DefaultScoreCounter()
             : base(6)
         {

From 9f51327e4b409382f6750c4c8687a66ee59a6d7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 17:29:40 +0900
Subject: [PATCH 05491/10326] Fix completely incorrect default positioning
 logic

---
 osu.Game/Screens/Play/HUD/DefaultComboCounter.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 1e23319c28..d6a4d30af6 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -23,11 +23,6 @@ namespace osu.Game.Screens.Play.HUD
         public DefaultComboCounter()
         {
             Current.Value = DisplayedCount = 0;
-
-            Anchor = Anchor.TopCentre;
-            Origin = Anchor.TopLeft;
-
-            Position = offset;
         }
 
         [BackgroundDependencyLoader]
@@ -40,7 +35,7 @@ namespace osu.Game.Screens.Play.HUD
             if (hud != null)
             {
                 // for now align with the score counter. eventually this will be user customisable.
-                Position += ToLocalSpace(hud.ScoreCounter.ScreenSpaceDrawQuad.TopRight) + offset;
+                Position = Parent.ToLocalSpace(hud.ScoreCounter.ScreenSpaceDrawQuad.TopRight) + offset;
             }
         }
 

From 37e9f331ad78fb9ff10701888169e5ea47ddea7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 17:48:50 +0900
Subject: [PATCH 05492/10326] Simplify score font lookup

---
 osu.Game/Screens/Play/HUD/LegacyComboCounter.cs |  8 +-------
 osu.Game/Skinning/HUDSkinComponents.cs          |  1 -
 osu.Game/Skinning/LegacySkin.cs                 | 15 +++++++--------
 osu.Game/Skinning/LegacySpriteText.cs           |  2 +-
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 55ce68fcc8..5d96a48117 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -6,8 +6,6 @@ using osu.Framework.Bindables;
 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.Skinning;
 using osuTK;
 
@@ -248,10 +246,6 @@ namespace osu.Game.Screens.Play.HUD
             return difference * rolling_duration;
         }
 
-        private Drawable createSpriteText() => skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) ?? new OsuSpriteText
-        {
-            Font = OsuFont.Numeric.With(size: 40),
-            UseFullGlyphHeight = false,
-        };
+        private Drawable createSpriteText() => new LegacySpriteText(skin);
     }
 }
diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index 7577ba066c..06b22dc693 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -6,6 +6,5 @@ namespace osu.Game.Skinning
     public enum HUDSkinComponents
     {
         ComboCounter,
-        ScoreText
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index a4d47dd2f1..ea5a6e4e20 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -324,24 +324,23 @@ namespace osu.Game.Skinning
             return null;
         }
 
+        private const string score_font = "score";
+
+        private bool hasScoreFont => this.HasFont(score_font);
+
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             switch (component)
             {
                 case HUDSkinComponent hudComponent:
                 {
+                    if (!hasScoreFont)
+                        return null;
+
                     switch (hudComponent.Component)
                     {
                         case HUDSkinComponents.ComboCounter:
                             return new LegacyComboCounter();
-
-                        case HUDSkinComponents.ScoreText:
-                            const string font = "score";
-
-                            if (!this.HasFont(font))
-                                return null;
-
-                            return new LegacySpriteText(this, font);
                     }
 
                     return null;
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index 773a9dc5c6..858bbcd6a8 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Skinning
     {
         private readonly LegacyGlyphStore glyphStore;
 
-        public LegacySpriteText(ISkin skin, string font)
+        public LegacySpriteText(ISkin skin, string font = "score")
         {
             Shadow = false;
             UseFullGlyphHeight = false;

From 254eba90080f04398ade62a52c85b67345068954 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 17:48:50 +0900
Subject: [PATCH 05493/10326] Add and consume skinnable accuracy counter

---
 .../UserInterface/PercentageCounter.cs        |  4 --
 .../Play/HUD/DefaultAccuracyCounter.cs        | 41 ++++++++++++++++
 osu.Game/Screens/Play/HUD/IAccuracyCounter.cs | 19 ++++++++
 .../Play/HUD/SkinnableAccuracyCounter.cs      | 29 ++++++++++++
 osu.Game/Screens/Play/HUDOverlay.cs           | 11 +----
 osu.Game/Skinning/HUDSkinComponents.cs        |  3 +-
 osu.Game/Skinning/LegacyAccuracyCounter.cs    | 47 +++++++++++++++++++
 osu.Game/Skinning/LegacySkin.cs               |  3 ++
 8 files changed, 143 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
 create mode 100644 osu.Game/Screens/Play/HUD/IAccuracyCounter.cs
 create mode 100644 osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
 create mode 100644 osu.Game/Skinning/LegacyAccuracyCounter.cs

diff --git a/osu.Game/Graphics/UserInterface/PercentageCounter.cs b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
index 1ccf7798e5..2d53ec066b 100644
--- a/osu.Game/Graphics/UserInterface/PercentageCounter.cs
+++ b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Utils;
@@ -28,9 +27,6 @@ namespace osu.Game.Graphics.UserInterface
             Current.Value = DisplayedCount = 1.0f;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours) => Colour = colours.BlueLighter;
-
         protected override string FormatCount(double count) => count.FormatAccuracy();
 
         protected override double GetProportionalDuration(double currentValue, double newValue)
diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
new file mode 100644
index 0000000000..b286b380e0
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class DefaultAccuracyCounter : PercentageCounter, IAccuracyCounter
+    {
+        private readonly Vector2 offset = new Vector2(-20, 5);
+
+        public DefaultAccuracyCounter()
+        {
+            Origin = Anchor.TopRight;
+        }
+
+        [Resolved(canBeNull: true)]
+        private HUDOverlay hud { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Colour = colours.BlueLighter;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (hud?.ScoreCounter.Drawable is DefaultScoreCounter score)
+            {
+                // for now align with the score counter. eventually this will be user customisable.
+                Position = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.TopLeft) + offset;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/IAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/IAccuracyCounter.cs
new file mode 100644
index 0000000000..0199250a08
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/IAccuracyCounter.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.Bindables;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// An interface providing a set of methods to update a accuracy counter.
+    /// </summary>
+    public interface IAccuracyCounter : IDrawable
+    {
+        /// <summary>
+        /// The current accuracy to be displayed.
+        /// </summary>
+        Bindable<double> Current { get; }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
new file mode 100644
index 0000000000..76c9c30813
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.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.Bindables;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class SkinnableAccuracyCounter : SkinnableDrawable, IAccuracyCounter
+    {
+        public Bindable<double> Current { get; } = new Bindable<double>();
+
+        public SkinnableAccuracyCounter()
+            : base(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter), _ => new DefaultAccuracyCounter())
+        {
+            CentreComponent = false;
+        }
+
+        private IAccuracyCounter skinnedCounter;
+
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+
+            skinnedCounter = Drawable as IAccuracyCounter;
+            skinnedCounter?.Current.BindTo(Current);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 639da7a3b6..bb35bd3d69 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets.Mods;
@@ -32,7 +31,7 @@ namespace osu.Game.Screens.Play
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableComboCounter ComboCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
-        public readonly RollingCounter<double> AccuracyCounter;
+        public readonly SkinnableAccuracyCounter AccuracyCounter;
         public readonly HealthDisplay HealthDisplay;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
@@ -254,13 +253,7 @@ namespace osu.Game.Screens.Play
             return base.OnKeyDown(e);
         }
 
-        protected virtual RollingCounter<double> CreateAccuracyCounter() => new PercentageCounter
-        {
-            BypassAutoSizeAxes = Axes.X,
-            Anchor = Anchor.TopLeft,
-            Origin = Anchor.TopRight,
-            Margin = new MarginPadding { Top = 5, Right = 20 },
-        };
+        protected virtual SkinnableAccuracyCounter CreateAccuracyCounter() => new SkinnableAccuracyCounter();
 
         protected virtual SkinnableScoreCounter CreateScoreCounter() => new SkinnableScoreCounter();
 
diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index d810fc31d4..d690a23dee 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -6,6 +6,7 @@ namespace osu.Game.Skinning
     public enum HUDSkinComponents
     {
         ComboCounter,
-        ScoreCounter
+        ScoreCounter,
+        AccuracyCounter
     }
 }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
new file mode 100644
index 0000000000..0f3ac19ce6
--- /dev/null
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+
+namespace osu.Game.Skinning
+{
+    public class LegacyAccuracyCounter : PercentageCounter, IAccuracyCounter
+    {
+        private readonly ISkin skin;
+
+        public LegacyAccuracyCounter(ISkin skin)
+        {
+            Origin = Anchor.TopRight;
+            Scale = new Vector2(0.75f);
+
+            this.skin = skin;
+        }
+
+        [Resolved(canBeNull: true)]
+        private HUDOverlay hud { get; set; }
+
+        protected sealed override OsuSpriteText CreateSpriteText() =>
+            new LegacySpriteText(skin, "score" /*, true*/)
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+            };
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (hud?.ScoreCounter.Drawable is LegacyScoreCounter score)
+            {
+                // for now align with the score counter. eventually this will be user customisable.
+                Position = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index c8460ad797..e1cd095ba8 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -344,6 +344,9 @@ namespace osu.Game.Skinning
 
                         case HUDSkinComponents.ScoreCounter:
                             return new LegacyScoreCounter(this);
+
+                        case HUDSkinComponents.AccuracyCounter:
+                            return new LegacyAccuracyCounter(this);
                     }
 
                     return null;

From 4f6dd1586939eef71e4578131e4e5f55155421ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 17:56:37 +0900
Subject: [PATCH 05494/10326] Add legacy font lookup support for comma/percent

---
 osu.Game/Skinning/LegacySpriteText.cs | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index 858bbcd6a8..8394657b1c 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -34,7 +34,9 @@ namespace osu.Game.Skinning
 
             public ITexturedCharacterGlyph Get(string fontName, char character)
             {
-                var texture = skin.GetTexture($"{fontName}-{character}");
+                var lookup = getLookupName(character);
+
+                var texture = skin.GetTexture($"{fontName}-{lookup}");
 
                 if (texture == null)
                     return null;
@@ -42,6 +44,24 @@ namespace osu.Game.Skinning
                 return new TexturedCharacterGlyph(new CharacterGlyph(character, 0, 0, texture.Width, null), texture, 1f / texture.ScaleAdjust);
             }
 
+            private static string getLookupName(char character)
+            {
+                switch (character)
+                {
+                    case ',':
+                        return "comma";
+
+                    case '.':
+                        return "dot";
+
+                    case '%':
+                        return "percent";
+
+                    default:
+                        return character.ToString();
+                }
+            }
+
             public Task<ITexturedCharacterGlyph> GetAsync(string fontName, char character) => Task.Run(() => Get(fontName, character));
         }
     }

From b31a3fbabbe83ec779f789b9286c0f1bb025c1cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 18:11:30 +0900
Subject: [PATCH 05495/10326] Add test

---
 .../TestSceneSkinnableAccuracyCounter.cs      | 49 +++++++++++++++++++
 .../Play/HUD/DefaultAccuracyCounter.cs        |  2 +
 osu.Game/Skinning/LegacyAccuracyCounter.cs    |  4 +-
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
new file mode 100644
index 0000000000..709929dcb0
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.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 System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSkinnableAccuracyCounter : SkinnableTestScene
+    {
+        private IEnumerable<SkinnableAccuracyCounter> accuracyCounters => CreatedDrawables.OfType<SkinnableAccuracyCounter>();
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("Create combo counters", () => SetContents(() =>
+            {
+                var accuracyCounter = new SkinnableAccuracyCounter();
+
+                accuracyCounter.Current.Value = 1;
+
+                return accuracyCounter;
+            }));
+        }
+
+        [Test]
+        public void TestChangingAccuracy()
+        {
+            AddStep(@"Reset all", delegate
+            {
+                foreach (var s in accuracyCounters)
+                    s.Current.Value = 1;
+            });
+
+            AddStep(@"Hit! :D", delegate
+            {
+                foreach (var s in accuracyCounters)
+                    s.Current.Value -= 0.023f;
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index b286b380e0..d5d8ec570a 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -16,6 +16,7 @@ namespace osu.Game.Screens.Play.HUD
         public DefaultAccuracyCounter()
         {
             Origin = Anchor.TopRight;
+            Anchor = Anchor.TopRight;
         }
 
         [Resolved(canBeNull: true)]
@@ -34,6 +35,7 @@ namespace osu.Game.Screens.Play.HUD
             if (hud?.ScoreCounter.Drawable is DefaultScoreCounter score)
             {
                 // for now align with the score counter. eventually this will be user customisable.
+                Anchor = Anchor.TopLeft;
                 Position = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.TopLeft) + offset;
             }
         }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 0f3ac19ce6..815580e85f 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -17,7 +17,9 @@ namespace osu.Game.Skinning
 
         public LegacyAccuracyCounter(ISkin skin)
         {
+            Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
+
             Scale = new Vector2(0.75f);
 
             this.skin = skin;
@@ -40,7 +42,7 @@ namespace osu.Game.Skinning
             if (hud?.ScoreCounter.Drawable is LegacyScoreCounter score)
             {
                 // for now align with the score counter. eventually this will be user customisable.
-                Position = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight);
+                Y = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight).Y;
             }
         }
     }

From ca74cf824c6fd01b21b78e862cae58bd6eca534b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 18:24:28 +0900
Subject: [PATCH 05496/10326] Add padding

---
 osu.Game/Skinning/LegacyAccuracyCounter.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 815580e85f..9354b2b3bc 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Skinning
             Origin = Anchor.TopRight;
 
             Scale = new Vector2(0.75f);
+            Margin = new MarginPadding(10);
 
             this.skin = skin;
         }

From 6983978c989c5063d8d7fb77cbdc5bed95ede85b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 18:30:44 +0900
Subject: [PATCH 05497/10326] Correct top-right element offset by finding the
 lower top anchor element

---
 osu.Game/Screens/Play/HUDOverlay.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index bb35bd3d69..7553f332cd 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 using osuTK;
 using osuTK.Input;
 
@@ -65,6 +66,8 @@ namespace osu.Game.Screens.Play
         private readonly FillFlowContainer bottomRightElements;
         private readonly FillFlowContainer topRightElements;
 
+        private Container mainUIElements;
+
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
 
         public HUDOverlay(ScoreProcessor scoreProcessor, HealthProcessor healthProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
@@ -89,7 +92,7 @@ namespace osu.Game.Screens.Play
                         {
                             new Drawable[]
                             {
-                                new Container
+                                mainUIElements = new Container
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
@@ -205,7 +208,17 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            topRightElements.Y = ToLocalSpace(ScoreCounter.Drawable.ScreenSpaceDrawQuad.BottomRight).Y;
+            float topRightOffset = 0;
+
+            // fetch the bottom-most position of any main ui element that is anchored to the top of the screen.
+            // consider this kind of temporary.
+            foreach (var d in mainUIElements)
+            {
+                if (d is SkinnableDrawable sd && (sd.Drawable.Anchor & Anchor.y0) > 0)
+                    topRightOffset = Math.Max(sd.Drawable.ScreenSpaceDrawQuad.BottomRight.Y, topRightOffset);
+            }
+
+            topRightElements.Y = ToLocalSpace(new Vector2(0, topRightOffset)).Y;
             bottomRightElements.Y = -Progress.Height;
         }
 

From d76365ed1b26252b3c54aef204bbd3312526ad4b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 18:38:41 +0900
Subject: [PATCH 05498/10326] Make container readonly

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

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 7553f332cd..fa914c0ebc 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Play
         private readonly FillFlowContainer bottomRightElements;
         private readonly FillFlowContainer topRightElements;
 
-        private Container mainUIElements;
+        private readonly Container mainUIElements;
 
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
 

From 70806deba1195c41e5c59414482b6613d6965b33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Oct 2020 19:11:40 +0900
Subject: [PATCH 05499/10326] Add support for bottom-anchored hit error display

---
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs | 19 ++++++++
 osu.Game/Configuration/ScoreMeterType.cs      | 10 ++++-
 osu.Game/Screens/Play/HUD/HitErrorDisplay.cs  | 43 +++++++++++++------
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    |  8 +++-
 4 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 377f305d63..1021ac3760 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -22,8 +22,10 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private BarHitErrorMeter barMeter;
         private BarHitErrorMeter barMeter2;
+        private BarHitErrorMeter barMeter3;
         private ColourHitErrorMeter colourMeter;
         private ColourHitErrorMeter colourMeter2;
+        private ColourHitErrorMeter colourMeter3;
         private HitWindows hitWindows;
 
         public TestSceneHitErrorMeter()
@@ -115,6 +117,13 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Origin = Anchor.CentreLeft,
             });
 
+            Add(barMeter3 = new BarHitErrorMeter(hitWindows, true)
+            {
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.CentreLeft,
+                Rotation = 270,
+            });
+
             Add(colourMeter = new ColourHitErrorMeter(hitWindows)
             {
                 Anchor = Anchor.CentreRight,
@@ -128,6 +137,14 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Origin = Anchor.CentreLeft,
                 Margin = new MarginPadding { Left = 50 }
             });
+
+            Add(colourMeter3 = new ColourHitErrorMeter(hitWindows)
+            {
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.CentreLeft,
+                Rotation = 270,
+                Margin = new MarginPadding { Left = 50 }
+            });
         }
 
         private void newJudgement(double offset = 0)
@@ -140,8 +157,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             barMeter.OnNewJudgement(judgement);
             barMeter2.OnNewJudgement(judgement);
+            barMeter3.OnNewJudgement(judgement);
             colourMeter.OnNewJudgement(judgement);
             colourMeter2.OnNewJudgement(judgement);
+            colourMeter3.OnNewJudgement(judgement);
         }
     }
 }
diff --git a/osu.Game/Configuration/ScoreMeterType.cs b/osu.Game/Configuration/ScoreMeterType.cs
index 156c4b1377..b9499c758e 100644
--- a/osu.Game/Configuration/ScoreMeterType.cs
+++ b/osu.Game/Configuration/ScoreMeterType.cs
@@ -16,7 +16,10 @@ namespace osu.Game.Configuration
         [Description("Hit Error (right)")]
         HitErrorRight,
 
-        [Description("Hit Error (both)")]
+        [Description("Hit Error (bottom)")]
+        HitErrorBottom,
+
+        [Description("Hit Error (left+right)")]
         HitErrorBoth,
 
         [Description("Colour (left)")]
@@ -25,7 +28,10 @@ namespace osu.Game.Configuration
         [Description("Colour (right)")]
         ColourRight,
 
-        [Description("Colour (both)")]
+        [Description("Colour (left+right)")]
         ColourBoth,
+
+        [Description("Colour (bottom)")]
+        ColourBottom,
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
index 4d28f00f39..37d10a5320 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
@@ -66,54 +66,69 @@ namespace osu.Game.Screens.Play.HUD
             switch (type.NewValue)
             {
                 case ScoreMeterType.HitErrorBoth:
-                    createBar(false);
-                    createBar(true);
+                    createBar(Anchor.CentreLeft);
+                    createBar(Anchor.CentreRight);
                     break;
 
                 case ScoreMeterType.HitErrorLeft:
-                    createBar(false);
+                    createBar(Anchor.CentreLeft);
                     break;
 
                 case ScoreMeterType.HitErrorRight:
-                    createBar(true);
+                    createBar(Anchor.CentreRight);
+                    break;
+
+                case ScoreMeterType.HitErrorBottom:
+                    createBar(Anchor.BottomCentre);
                     break;
 
                 case ScoreMeterType.ColourBoth:
-                    createColour(false);
-                    createColour(true);
+                    createColour(Anchor.CentreLeft);
+                    createColour(Anchor.CentreRight);
                     break;
 
                 case ScoreMeterType.ColourLeft:
-                    createColour(false);
+                    createColour(Anchor.CentreLeft);
                     break;
 
                 case ScoreMeterType.ColourRight:
-                    createColour(true);
+                    createColour(Anchor.CentreRight);
+                    break;
+
+                case ScoreMeterType.ColourBottom:
+                    createColour(Anchor.BottomCentre);
                     break;
             }
         }
 
-        private void createBar(bool rightAligned)
+        private void createBar(Anchor anchor)
         {
+            bool rightAligned = (anchor & Anchor.x2) > 0;
+            bool bottomAligned = (anchor & Anchor.y2) > 0;
+
             var display = new BarHitErrorMeter(hitWindows, rightAligned)
             {
                 Margin = new MarginPadding(margin),
-                Anchor = rightAligned ? Anchor.CentreRight : Anchor.CentreLeft,
-                Origin = rightAligned ? Anchor.CentreRight : Anchor.CentreLeft,
+                Anchor = anchor,
+                Origin = bottomAligned ? Anchor.CentreLeft : anchor,
                 Alpha = 0,
+                Rotation = bottomAligned ? 270 : 0
             };
 
             completeDisplayLoading(display);
         }
 
-        private void createColour(bool rightAligned)
+        private void createColour(Anchor anchor)
         {
+            bool bottomAligned = (anchor & Anchor.y2) > 0;
+
             var display = new ColourHitErrorMeter(hitWindows)
             {
                 Margin = new MarginPadding(margin),
-                Anchor = rightAligned ? Anchor.CentreRight : Anchor.CentreLeft,
-                Origin = rightAligned ? Anchor.CentreRight : Anchor.CentreLeft,
+                Anchor = anchor,
+                Origin = bottomAligned ? Anchor.CentreLeft : anchor,
                 Alpha = 0,
+                Rotation = bottomAligned ? 270 : 0
             };
 
             completeDisplayLoading(display);
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index f99c84fc01..89f135de7f 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -99,7 +99,9 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                                 Size = new Vector2(10),
                                 Icon = FontAwesome.Solid.ShippingFast,
                                 Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
+                                Origin = Anchor.Centre,
+                                // undo any layout rotation to display the icon the correct orientation
+                                Rotation = -Rotation,
                             },
                             new SpriteIcon
                             {
@@ -107,7 +109,9 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                                 Size = new Vector2(10),
                                 Icon = FontAwesome.Solid.Bicycle,
                                 Anchor = Anchor.BottomCentre,
-                                Origin = Anchor.BottomCentre,
+                                Origin = Anchor.Centre,
+                                // undo any layout rotation to display the icon the correct orientation
+                                Rotation = -Rotation,
                             }
                         }
                     },

From e8235757512030f48f8ce423ba57f46b7c153702 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 14 Oct 2020 13:43:56 +0200
Subject: [PATCH 05500/10326] Lock screen rotation while in gameplay.

---
 osu.Android/GameplayScreenRotationLocker.cs | 31 +++++++++++++++++++++
 osu.Android/OsuGameActivity.cs              |  4 +++
 osu.Android/OsuGameAndroid.cs               |  6 ++++
 osu.Android/osu.Android.csproj              |  3 +-
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 osu.Android/GameplayScreenRotationLocker.cs

diff --git a/osu.Android/GameplayScreenRotationLocker.cs b/osu.Android/GameplayScreenRotationLocker.cs
new file mode 100644
index 0000000000..d1f4caba52
--- /dev/null
+++ b/osu.Android/GameplayScreenRotationLocker.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 Android.Content.PM;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game;
+
+namespace osu.Android
+{
+    public class GameplayScreenRotationLocker : Component
+    {
+        private Bindable<bool> localUserPlaying;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuGame game)
+        {
+            localUserPlaying = game.LocalUserPlaying.GetBoundCopy();
+            localUserPlaying.BindValueChanged(_ => updateLock());
+        }
+
+        private void updateLock()
+        {
+            OsuGameActivity.Activity.RunOnUiThread(() =>
+            {
+                OsuGameActivity.Activity.RequestedOrientation = localUserPlaying.Value ? ScreenOrientation.Locked : ScreenOrientation.FullUser;
+            });
+        }
+    }
+}
diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index db73bb7e7f..c2b28f3de4 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -12,10 +12,14 @@ namespace osu.Android
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
     public class OsuGameActivity : AndroidGameActivity
     {
+        internal static Activity Activity;
+
         protected override Framework.Game CreateGame() => new OsuGameAndroid();
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
+            Activity = this;
+
             // The default current directory on android is '/'.
             // On some devices '/' maps to the app data directory. On others it maps to the root of the internal storage.
             // In order to have a consistent current directory on all devices the full path of the app data directory is set as the current directory.
diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 7542a2b997..887a8395e3 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -55,6 +55,12 @@ namespace osu.Android
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            LoadComponentAsync(new GameplayScreenRotationLocker(), Add);
+        }
+
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
     }
 }
diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index 0598a50530..a2638e95c8 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -21,6 +21,7 @@
     <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="GameplayScreenRotationLocker.cs" />
     <Compile Include="OsuGameActivity.cs" />
     <Compile Include="OsuGameAndroid.cs" />
   </ItemGroup>
@@ -53,4 +54,4 @@
     <AndroidResource Include="Resources\drawable\lazer.png" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file

From 703f58bb2f0cae677c237a8c206458ce7df34180 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 11:54:11 +0900
Subject: [PATCH 05501/10326] Remove last.fm support

Has been broken for ages, and their service isn't really something
people use these days.
---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 1 -
 osu.Game/Users/User.cs                                    | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index c27b5f4b4a..946831d13b 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -135,7 +135,6 @@ namespace osu.Game.Overlays.Profile.Header
                 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
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index f8bb8f4c6a..89786e3bd8 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -111,9 +111,6 @@ namespace osu.Game.Users
         [JsonProperty(@"twitter")]
         public string Twitter;
 
-        [JsonProperty(@"lastfm")]
-        public string Lastfm;
-
         [JsonProperty(@"skype")]
         public string Skype;
 

From 39a74536f24d8bafd6bf787311024db647fd2757 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 12:48:31 +0900
Subject: [PATCH 05502/10326] Update inspections

---
 .idea/.idea.osu.Desktop/.idea/modules.xml | 2 +-
 osu.sln.DotSettings                       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/modules.xml b/.idea/.idea.osu.Desktop/.idea/modules.xml
index fe63f5faf3..680312ad27 100644
--- a/.idea/.idea.osu.Desktop/.idea/modules.xml
+++ b/.idea/.idea.osu.Desktop/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.osu.Desktop/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.osu.Desktop/riderModule.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.osu.Desktop/.idea/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.osu.Desktop/.idea/riderModule.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 64f3d41acb..3ef419c572 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -199,7 +199,9 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringStartsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StructCanBeMadeReadOnly/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -773,6 +775,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

From cc41845f56bc1a65fa10e01a1584334b6fd7c063 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 12:49:31 +0900
Subject: [PATCH 05503/10326] Add missing string function ordinal
 specifications

---
 .../Screens/Drawings/DrawingsScreen.cs              |  2 +-
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs          |  2 +-
 osu.Game/OsuGame.cs                                 |  4 ++--
 osu.Game/Rulesets/RulesetStore.cs                   |  2 +-
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs         | 13 +++++++------
 osu.Game/Utils/SentryLogger.cs                      |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index e10154b722..4c3adeae76 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -234,7 +234,7 @@ namespace osu.Game.Tournament.Screens.Drawings
                             if (string.IsNullOrEmpty(line))
                                 continue;
 
-                            if (line.ToUpperInvariant().StartsWith("GROUP"))
+                            if (line.ToUpperInvariant().StartsWith("GROUP", StringComparison.Ordinal))
                                 continue;
 
                             // ReSharper disable once AccessToModifiedClosure
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index c15240a4f6..7b377e481f 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Beatmaps.Formats
         {
             var pair = SplitKeyVal(line);
 
-            bool isCombo = pair.Key.StartsWith(@"Combo");
+            bool isCombo = pair.Key.StartsWith(@"Combo", StringComparison.Ordinal);
 
             string[] split = pair.Value.Split(',');
 
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d315b213ab..56cced9c04 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -181,7 +181,7 @@ namespace osu.Game
 
             if (args?.Length > 0)
             {
-                var paths = args.Where(a => !a.StartsWith(@"-")).ToArray();
+                var paths = args.Where(a => !a.StartsWith(@"-", StringComparison.Ordinal)).ToArray();
                 if (paths.Length > 0)
                     Task.Run(() => Import(paths));
             }
@@ -289,7 +289,7 @@ namespace osu.Game
 
         public void OpenUrlExternally(string url) => waitForReady(() => externalLinkOpener, _ =>
         {
-            if (url.StartsWith("/"))
+            if (url.StartsWith("/", StringComparison.Ordinal))
                 url = $"{API.Endpoint}{url}";
 
             externalLinkOpener.OpenUrlExternally(url);
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 5d93f5186b..c12d418771 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets
                 {
                     // todo: StartsWith can be changed to Equals on 2020-11-08
                     // This is to give users enough time to have their database use new abbreviated info).
-                    if (context.RulesetInfo.FirstOrDefault(ri => ri.InstantiationInfo.StartsWith(r.RulesetInfo.InstantiationInfo)) == null)
+                    if (context.RulesetInfo.FirstOrDefault(ri => ri.InstantiationInfo.StartsWith(r.RulesetInfo.InstantiationInfo, StringComparison.Ordinal)) == null)
                         context.RulesetInfo.Add(r.RulesetInfo);
                 }
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index a9d88e77ad..3dbec23194 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.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.Diagnostics;
 using System.Globalization;
@@ -115,16 +116,16 @@ namespace osu.Game.Skinning
                             currentConfig.MinimumColumnWidth = minWidth;
                         break;
 
-                    case string _ when pair.Key.StartsWith("Colour"):
+                    case string _ when pair.Key.StartsWith("Colour", StringComparison.Ordinal):
                         HandleColours(currentConfig, line);
                         break;
 
                     // Custom sprite paths
-                    case string _ when pair.Key.StartsWith("NoteImage"):
-                    case string _ when pair.Key.StartsWith("KeyImage"):
-                    case string _ when pair.Key.StartsWith("Hit"):
-                    case string _ when pair.Key.StartsWith("Stage"):
-                    case string _ when pair.Key.StartsWith("Lighting"):
+                    case string _ when pair.Key.StartsWith("NoteImage", StringComparison.Ordinal):
+                    case string _ when pair.Key.StartsWith("KeyImage", StringComparison.Ordinal):
+                    case string _ when pair.Key.StartsWith("Hit", StringComparison.Ordinal):
+                    case string _ when pair.Key.StartsWith("Stage", StringComparison.Ordinal):
+                    case string _ when pair.Key.StartsWith("Lighting", StringComparison.Ordinal):
                         currentConfig.ImageLookups[pair.Key] = pair.Value;
                         break;
                 }
diff --git a/osu.Game/Utils/SentryLogger.cs b/osu.Game/Utils/SentryLogger.cs
index 981251784e..e8e41cdbbe 100644
--- a/osu.Game/Utils/SentryLogger.cs
+++ b/osu.Game/Utils/SentryLogger.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Utils
 
                     // since we let unhandled exceptions go ignored at times, we want to ensure they don't get submitted on subsequent reports.
                     if (lastException != null &&
-                        lastException.Message == exception.Message && exception.StackTrace.StartsWith(lastException.StackTrace))
+                        lastException.Message == exception.Message && exception.StackTrace.StartsWith(lastException.StackTrace, StringComparison.Ordinal))
                         return;
 
                     lastException = exception;

From 88f74921fb9de5f01ddfb7be72cb145d9ca14a2d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 12:49:39 +0900
Subject: [PATCH 05504/10326] Update with new r# inspections

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs         | 2 +-
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index c02075bea9..603b5d4956 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             createNew(h => h.OnLoadComplete += _ => initialAlpha = hideTarget.Alpha);
             AddUntilStep("wait for load", () => hudOverlay.IsAlive);
-            AddAssert("initial alpha was less than 1", () => initialAlpha != null && initialAlpha < 1);
+            AddAssert("initial alpha was less than 1", () => initialAlpha < 1);
         }
 
         [Test]
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 0336c74386..1527d20f54 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -79,9 +79,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void updatePlacementNewCombo()
         {
-            if (currentPlacement == null) return;
-
-            if (currentPlacement.HitObject is IHasComboInformation c)
+            if (currentPlacement?.HitObject is IHasComboInformation c)
                 c.NewCombo = NewCombo.Value == TernaryState.True;
         }
 

From 88ffcb923408c0e9485f2e28bf38efa98409901a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 12:58:34 +0900
Subject: [PATCH 05505/10326] Update EndsWith usages

---
 .../Beatmaps/Formats/LegacyBeatmapEncoderTest.cs          | 2 +-
 .../Visual/SongSelect/TestSceneBeatmapCarousel.cs         | 2 +-
 osu.Game.Tests/WaveformTestBeatmap.cs                     | 5 +++--
 osu.Game/Beatmaps/BeatmapManager.cs                       | 4 ++--
 osu.Game/Beatmaps/BeatmapSetInfo.cs                       | 2 +-
 osu.Game/Database/ArchiveModelManager.cs                  | 4 ++--
 osu.Game/Screens/Select/FilterQueryParser.cs              | 8 ++++----
 osu.Game/Skinning/LegacySkin.cs                           | 4 ++--
 osu.Game/Updater/SimpleUpdateManager.cs                   | 7 ++++---
 9 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 8b22309033..0784109158 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
     {
         private static readonly DllResourceStore beatmaps_resource_store = TestResources.GetStore();
 
-        private static IEnumerable<string> allBeatmaps = beatmaps_resource_store.GetAvailableResources().Where(res => res.EndsWith(".osu"));
+        private static IEnumerable<string> allBeatmaps = beatmaps_resource_store.GetAvailableResources().Where(res => res.EndsWith(".osu", StringComparison.Ordinal));
 
         [TestCaseSource(nameof(allBeatmaps))]
         public void TestEncodeDecodeStability(string name)
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 3aff390a47..8669235a7a 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -394,7 +394,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("Sort by author", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Author }, false));
             AddAssert("Check zzzzz is at bottom", () => carousel.BeatmapSets.Last().Metadata.AuthorString == "zzzzz");
             AddStep("Sort by artist", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Artist }, false));
-            AddAssert($"Check #{set_count} is at bottom", () => carousel.BeatmapSets.Last().Metadata.Title.EndsWith($"#{set_count}!"));
+            AddAssert($"Check #{set_count} is at bottom", () => carousel.BeatmapSets.Last().Metadata.Title.EndsWith($"#{set_count}!", StringComparison.Ordinal));
         }
 
         [Test]
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index 7dc5ce1d7f..f9613d9e25 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.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.IO;
 using System.Linq;
 using osu.Framework.Audio;
@@ -59,7 +60,7 @@ namespace osu.Game.Tests
             get
             {
                 using (var reader = getZipReader())
-                    return reader.Filenames.First(f => f.EndsWith(".mp3"));
+                    return reader.Filenames.First(f => f.EndsWith(".mp3", StringComparison.Ordinal));
             }
         }
 
@@ -73,7 +74,7 @@ namespace osu.Game.Tests
             protected override Beatmap CreateBeatmap()
             {
                 using (var reader = getZipReader())
-                using (var beatmapStream = reader.GetStream(reader.Filenames.First(f => f.EndsWith(".osu"))))
+                using (var beatmapStream = reader.GetStream(reader.Filenames.First(f => f.EndsWith(".osu", StringComparison.Ordinal))))
                 using (var beatmapReader = new LineBufferedReader(beatmapStream))
                     return Decoder.GetDecoder<Beatmap>(beatmapReader).Decode(beatmapReader);
             }
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 4c75069f08..370e82b468 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -389,7 +389,7 @@ namespace osu.Game.Beatmaps
         protected override BeatmapSetInfo CreateModel(ArchiveReader reader)
         {
             // let's make sure there are actually .osu files to import.
-            string mapName = reader.Filenames.FirstOrDefault(f => f.EndsWith(".osu"));
+            string mapName = reader.Filenames.FirstOrDefault(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
 
             if (string.IsNullOrEmpty(mapName))
             {
@@ -417,7 +417,7 @@ namespace osu.Game.Beatmaps
         {
             var beatmapInfos = new List<BeatmapInfo>();
 
-            foreach (var file in files.Where(f => f.Filename.EndsWith(".osu")))
+            foreach (var file in files.Where(f => f.Filename.EndsWith(".osu", StringComparison.OrdinalIgnoreCase)))
             {
                 using (var raw = Files.Store.GetStream(file.FileInfo.StoragePath))
                 using (var ms = new MemoryStream()) // we need a memory stream so we can seek
diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index b76d780860..7bc1c8c7b9 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Beatmaps
 
         public string Hash { get; set; }
 
-        public string StoryboardFile => Files?.Find(f => f.Filename.EndsWith(".osb"))?.Filename;
+        public string StoryboardFile => Files?.Find(f => f.Filename.EndsWith(".osb", StringComparison.OrdinalIgnoreCase))?.Filename;
 
         public List<BeatmapSetFileInfo> Files { get; set; }
 
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 3292936f5f..b947056ebd 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -279,7 +279,7 @@ namespace osu.Game.Database
             // for now, concatenate all .osu files in the set to create a unique hash.
             MemoryStream hashable = new MemoryStream();
 
-            foreach (TFileModel file in item.Files.Where(f => HashableFileTypes.Any(f.Filename.EndsWith)).OrderBy(f => f.Filename))
+            foreach (TFileModel file in item.Files.Where(f => HashableFileTypes.Any(ext => f.Filename.EndsWith(ext, StringComparison.OrdinalIgnoreCase))).OrderBy(f => f.Filename))
             {
                 using (Stream s = Files.Store.GetStream(file.FileInfo.StoragePath))
                     s.CopyTo(hashable);
@@ -593,7 +593,7 @@ namespace osu.Game.Database
             var fileInfos = new List<TFileModel>();
 
             string prefix = reader.Filenames.GetCommonPrefix();
-            if (!(prefix.EndsWith("/") || prefix.EndsWith("\\")))
+            if (!(prefix.EndsWith("/", StringComparison.Ordinal) || prefix.EndsWith("\\", StringComparison.Ordinal)))
                 prefix = string.Empty;
 
             // import files to manager
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 39fa4f777d..fa2beb2652 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -79,10 +79,10 @@ namespace osu.Game.Screens.Select
         }
 
         private static int getLengthScale(string value) =>
-            value.EndsWith("ms") ? 1 :
-            value.EndsWith("s") ? 1000 :
-            value.EndsWith("m") ? 60000 :
-            value.EndsWith("h") ? 3600000 : 1000;
+            value.EndsWith("ms", StringComparison.Ordinal) ? 1 :
+            value.EndsWith("s", StringComparison.Ordinal) ? 1000 :
+            value.EndsWith("m", StringComparison.Ordinal) ? 60000 :
+            value.EndsWith("h", StringComparison.Ordinal) ? 3600000 : 1000;
 
         private static bool parseFloatWithPoint(string value, out float result) =>
             float.TryParse(value, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e1cd095ba8..069a887f63 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -422,7 +422,7 @@ namespace osu.Game.Skinning
 
             // Fall back to using the last piece for components coming from lazer (e.g. "Gameplay/osu/approachcircle" -> "approachcircle").
             string lastPiece = componentName.Split('/').Last();
-            yield return componentName.StartsWith("Gameplay/taiko/") ? "taiko-" + lastPiece : lastPiece;
+            yield return componentName.StartsWith("Gameplay/taiko/", StringComparison.Ordinal) ? "taiko-" + lastPiece : lastPiece;
         }
 
         private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
@@ -433,7 +433,7 @@ namespace osu.Game.Skinning
                 // for compatibility with stable, exclude the lookup names with the custom sample bank suffix, if they are not valid for use in this skin.
                 // using .EndsWith() is intentional as it ensures parity in all edge cases
                 // (see LegacyTaikoSampleInfo for an example of one - prioritising the taiko prefix should still apply, but the sample bank should not).
-                lookupNames = hitSample.LookupNames.Where(name => !name.EndsWith(hitSample.Suffix));
+                lookupNames = hitSample.LookupNames.Where(name => !name.EndsWith(hitSample.Suffix, StringComparison.Ordinal));
 
             // also for compatibility, try falling back to non-bank samples (so-called "universal" samples) as the last resort.
             // going forward specifying banks shall always be required, even for elements that wouldn't require it on stable,
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index b5fcb56c06..4ebf2a7368 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.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.Threading.Tasks;
 using Newtonsoft.Json;
@@ -73,15 +74,15 @@ namespace osu.Game.Updater
             switch (RuntimeInfo.OS)
             {
                 case RuntimeInfo.Platform.Windows:
-                    bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".exe"));
+                    bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".exe", StringComparison.Ordinal));
                     break;
 
                 case RuntimeInfo.Platform.MacOsx:
-                    bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".app.zip"));
+                    bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".app.zip", StringComparison.Ordinal));
                     break;
 
                 case RuntimeInfo.Platform.Linux:
-                    bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".AppImage"));
+                    bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".AppImage", StringComparison.Ordinal));
                     break;
 
                 case RuntimeInfo.Platform.iOS:

From aea31d1582e2c6120088e864479c2d6131d3e978 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 13:07:00 +0900
Subject: [PATCH 05506/10326] Fix editor not seeking by full beat when track is
 playing

This is expected behaviour as my osu-stable, and I still stand behind
the reasoning behind it.

Closes #10519.
---
 osu.Game/Screens/Edit/Editor.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 7444369e84..c3560dff38 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -597,10 +597,20 @@ namespace osu.Game.Screens.Edit
         {
             double amount = e.ShiftPressed ? 4 : 1;
 
+            bool trackPlaying = clock.IsRunning;
+
+            if (trackPlaying)
+            {
+                // generally users are not looking to perform tiny seeks when the track is playing,
+                // so seeks should always be by one full beat, bypassing the beatDivisor.
+                // this multiplication undoes the division that will be applied in the underlying seek operation.
+                amount *= beatDivisor.Value;
+            }
+
             if (direction < 1)
-                clock.SeekBackward(!clock.IsRunning, amount);
+                clock.SeekBackward(!trackPlaying, amount);
             else
-                clock.SeekForward(!clock.IsRunning, amount);
+                clock.SeekForward(!trackPlaying, amount);
         }
 
         private void exportBeatmap()

From 085d8d0ecbfa233c8ad6864ecf03885a3ba9cc7a Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Fri, 16 Oct 2020 06:16:20 +0200
Subject: [PATCH 05507/10326] Add support for ScorePrefix and ScoreOverlap
 values in legacy skins

---
 osu.Game/Skinning/LegacyAccuracyCounter.cs   |  8 +++++++-
 osu.Game/Skinning/LegacyScoreCounter.cs      | 11 +++++++++--
 osu.Game/Skinning/LegacySkinConfiguration.cs |  2 ++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 9354b2b3bc..0a64545aee 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -15,6 +15,9 @@ namespace osu.Game.Skinning
     {
         private readonly ISkin skin;
 
+        private readonly string scorePrefix;
+        private readonly int scoreOverlap;
+
         public LegacyAccuracyCounter(ISkin skin)
         {
             Anchor = Anchor.TopRight;
@@ -24,16 +27,19 @@ namespace osu.Game.Skinning
             Margin = new MarginPadding(10);
 
             this.skin = skin;
+            scorePrefix = skin.GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score";
+            scoreOverlap = skin.GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ScoreOverlap)?.Value ?? -2;
         }
 
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
         protected sealed override OsuSpriteText CreateSpriteText() =>
-            new LegacySpriteText(skin, "score" /*, true*/)
+            new LegacySpriteText(skin, scorePrefix)
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
+                Spacing = new Vector2(-scoreOverlap, 0)
             };
 
         protected override void Update()
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index f94bef6652..e931497564 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -5,6 +5,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -12,6 +13,9 @@ namespace osu.Game.Skinning
     {
         private readonly ISkin skin;
 
+        private readonly string scorePrefix;
+        private readonly int scoreOverlap;
+
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
 
@@ -24,18 +28,21 @@ namespace osu.Game.Skinning
             Origin = Anchor.TopRight;
 
             this.skin = skin;
+            scorePrefix = skin.GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score";
+            scoreOverlap = skin.GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ScoreOverlap)?.Value ?? -2;
 
-            // base class uses int for display, but externally we bind to ScoreProcesssor as a double for now.
+            // base class uses int for display, but externally we bind to ScoreProcessor as a double for now.
             Current.BindValueChanged(v => base.Current.Value = (int)v.NewValue);
 
             Margin = new MarginPadding(10);
         }
 
         protected sealed override OsuSpriteText CreateSpriteText() =>
-            new LegacySpriteText(skin, "score" /*, true*/)
+            new LegacySpriteText(skin, scorePrefix)
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
+                Spacing = new Vector2(-scoreOverlap, 0)
             };
     }
 }
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
index 828804b9cb..84a834ec22 100644
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacySkinConfiguration.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Skinning
             Version,
             ComboPrefix,
             ComboOverlap,
+            ScorePrefix,
+            ScoreOverlap,
             AnimationFramerate,
             LayeredHitSounds
         }

From 83482ca15c53d95b47bb0324cad7ec45ad298170 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 13:21:47 +0900
Subject: [PATCH 05508/10326] Fix one more missed occurrence

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

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 5a6da53839..cce6153953 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Scoring
             if (archive == null)
                 return null;
 
-            using (var stream = archive.GetStream(archive.Filenames.First(f => f.EndsWith(".osr"))))
+            using (var stream = archive.GetStream(archive.Filenames.First(f => f.EndsWith(".osr", StringComparison.OrdinalIgnoreCase))))
             {
                 try
                 {

From df1db8611c73c0f2d87154e3895d6f8b0f156705 Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Fri, 16 Oct 2020 08:36:20 +0200
Subject: [PATCH 05509/10326] move skin-specific config retrieval to
 GetDrawableComponent

---
 osu.Game/Skinning/HUDSkinComponents.cs     |  4 +++-
 osu.Game/Skinning/LegacyAccuracyCounter.cs | 13 +------------
 osu.Game/Skinning/LegacyScoreCounter.cs    | 14 +-------------
 osu.Game/Skinning/LegacySkin.cs            | 10 ++++++++++
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index d690a23dee..6ec575e106 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -7,6 +7,8 @@ namespace osu.Game.Skinning
     {
         ComboCounter,
         ScoreCounter,
-        AccuracyCounter
+        ScoreText,
+        AccuracyCounter,
+        AccuracyText
     }
 }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 0a64545aee..6c194a06d3 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -15,9 +15,6 @@ namespace osu.Game.Skinning
     {
         private readonly ISkin skin;
 
-        private readonly string scorePrefix;
-        private readonly int scoreOverlap;
-
         public LegacyAccuracyCounter(ISkin skin)
         {
             Anchor = Anchor.TopRight;
@@ -27,20 +24,12 @@ namespace osu.Game.Skinning
             Margin = new MarginPadding(10);
 
             this.skin = skin;
-            scorePrefix = skin.GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score";
-            scoreOverlap = skin.GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ScoreOverlap)?.Value ?? -2;
         }
 
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
-        protected sealed override OsuSpriteText CreateSpriteText() =>
-            new LegacySpriteText(skin, scorePrefix)
-            {
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                Spacing = new Vector2(-scoreOverlap, 0)
-            };
+        protected sealed override OsuSpriteText CreateSpriteText() => skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyText)) as OsuSpriteText ?? new OsuSpriteText();
 
         protected override void Update()
         {
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index e931497564..41bf35722b 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -5,7 +5,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -13,9 +12,6 @@ namespace osu.Game.Skinning
     {
         private readonly ISkin skin;
 
-        private readonly string scorePrefix;
-        private readonly int scoreOverlap;
-
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
 
@@ -28,8 +24,6 @@ namespace osu.Game.Skinning
             Origin = Anchor.TopRight;
 
             this.skin = skin;
-            scorePrefix = skin.GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score";
-            scoreOverlap = skin.GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ScoreOverlap)?.Value ?? -2;
 
             // base class uses int for display, but externally we bind to ScoreProcessor as a double for now.
             Current.BindValueChanged(v => base.Current.Value = (int)v.NewValue);
@@ -37,12 +31,6 @@ namespace osu.Game.Skinning
             Margin = new MarginPadding(10);
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() =>
-            new LegacySpriteText(skin, scorePrefix)
-            {
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                Spacing = new Vector2(-scoreOverlap, 0)
-            };
+        protected sealed override OsuSpriteText CreateSpriteText() => skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) as OsuSpriteText ?? new OsuSpriteText();
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e1cd095ba8..f5265f2d6e 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -19,6 +19,7 @@ using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -347,6 +348,15 @@ namespace osu.Game.Skinning
 
                         case HUDSkinComponents.AccuracyCounter:
                             return new LegacyAccuracyCounter(this);
+
+                        case HUDSkinComponents.ScoreText:
+                        case HUDSkinComponents.AccuracyText:
+                            string scorePrefix = GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score";
+                            int scoreOverlap = GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ScoreOverlap)?.Value ?? -2;
+                            return new LegacySpriteText(this, scorePrefix)
+                            {
+                                Spacing = new Vector2(-scoreOverlap, 0)
+                            };
                     }
 
                     return null;

From c0a1f2158cdfbc5539a8dd8e9d462c49e1b17c95 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 13:42:50 +0900
Subject: [PATCH 05510/10326] Add basic component structure for skinnable
 health displays

---
 .../TestSceneSkinnableHealthDisplay.cs        | 62 +++++++++++++++++++
 ...althDisplay.cs => DefaultHealthDisplay.cs} | 10 ++-
 osu.Game/Screens/Play/HUD/HealthDisplay.cs    |  9 ++-
 osu.Game/Screens/Play/HUD/IHealthDisplay.cs   | 26 ++++++++
 osu.Game/Screens/Play/HUDOverlay.cs           | 11 +---
 .../Screens/Play/SkinnableHealthDisplay.cs    | 47 ++++++++++++++
 osu.Game/Skinning/HUDSkinComponents.cs        |  3 +-
 7 files changed, 154 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
 rename osu.Game/Screens/Play/HUD/{StandardHealthDisplay.cs => DefaultHealthDisplay.cs} (92%)
 create mode 100644 osu.Game/Screens/Play/HUD/IHealthDisplay.cs
 create mode 100644 osu.Game/Screens/Play/SkinnableHealthDisplay.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
new file mode 100644
index 0000000000..181fc8ce98
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -0,0 +1,62 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Screens.Play;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSkinnableHealthDisplay : SkinnableTestScene
+    {
+        private IEnumerable<SkinnableHealthDisplay> healthDisplays => CreatedDrawables.OfType<SkinnableHealthDisplay>();
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("Create health displays", () =>
+            {
+                SetContents(() => new SkinnableHealthDisplay());
+            });
+            AddStep(@"Reset all", delegate
+            {
+                foreach (var s in healthDisplays)
+                    s.Current.Value = 1;
+            });
+        }
+
+        [Test]
+        public void TestHealthDisplayIncrementing()
+        {
+            AddRepeatStep(@"decrease hp", delegate
+            {
+                foreach (var healthDisplay in healthDisplays)
+                    healthDisplay.Current.Value -= 0.08f;
+            }, 10);
+
+            AddRepeatStep(@"increase hp without flash", delegate
+            {
+                foreach (var healthDisplay in healthDisplays)
+                    healthDisplay.Current.Value += 0.1f;
+            }, 3);
+
+            AddRepeatStep(@"increase hp with flash", delegate
+            {
+                foreach (var healthDisplay in healthDisplays)
+                {
+                    healthDisplay.Current.Value += 0.1f;
+                    healthDisplay.Flash(new JudgementResult(null, new OsuJudgement()));
+                }
+            }, 3);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
similarity index 92%
rename from osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
rename to osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index fc4a1a5d83..ae78d19c2d 100644
--- a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -16,7 +16,7 @@ using osu.Framework.Utils;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class StandardHealthDisplay : HealthDisplay, IHasAccentColour
+    public class DefaultHealthDisplay : HealthDisplay, IHasAccentColour
     {
         /// <summary>
         /// The base opacity of the glow.
@@ -71,8 +71,12 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        public StandardHealthDisplay()
+        public DefaultHealthDisplay()
         {
+            Size = new Vector2(1, 5);
+            RelativeSizeAxes = Axes.X;
+            Margin = new MarginPadding { Top = 20 };
+
             Children = new Drawable[]
             {
                 new Box
@@ -103,7 +107,7 @@ namespace osu.Game.Screens.Play.HUD
             GlowColour = colours.BlueDarker;
         }
 
-        public void Flash(JudgementResult result)
+        public override void Flash(JudgementResult result)
         {
             if (!result.IsHit)
                 return;
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index edc9dedf24..5c43e00192 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
@@ -12,14 +13,18 @@ namespace osu.Game.Screens.Play.HUD
     /// A container for components displaying the current player health.
     /// Gets bound automatically to the <see cref="HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy.
     /// </summary>
-    public abstract class HealthDisplay : Container
+    public abstract class HealthDisplay : Container, IHealthDisplay
     {
-        public readonly BindableDouble Current = new BindableDouble(1)
+        public Bindable<double> Current { get; } = new BindableDouble(1)
         {
             MinValue = 0,
             MaxValue = 1
         };
 
+        public virtual void Flash(JudgementResult result)
+        {
+        }
+
         /// <summary>
         /// Bind the tracked fields of <see cref="HealthProcessor"/> to this health display.
         /// </summary>
diff --git a/osu.Game/Screens/Play/HUD/IHealthDisplay.cs b/osu.Game/Screens/Play/HUD/IHealthDisplay.cs
new file mode 100644
index 0000000000..b1a64bd844
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/IHealthDisplay.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.Game.Rulesets.Judgements;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// An interface providing a set of methods to update a health display.
+    /// </summary>
+    public interface IHealthDisplay : IDrawable
+    {
+        /// <summary>
+        /// The current health to be displayed.
+        /// </summary>
+        Bindable<double> Current { get; }
+
+        /// <summary>
+        /// Flash the display for a specified result type.
+        /// </summary>
+        /// <param name="result">The result type.</param>
+        void Flash(JudgementResult result);
+    }
+}
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index fa914c0ebc..0d92611e0e 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play
         public readonly SkinnableComboCounter ComboCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
         public readonly SkinnableAccuracyCounter AccuracyCounter;
-        public readonly HealthDisplay HealthDisplay;
+        public readonly SkinnableHealthDisplay HealthDisplay;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HitErrorDisplay HitErrorDisplay;
@@ -272,12 +272,7 @@ namespace osu.Game.Screens.Play
 
         protected virtual SkinnableComboCounter CreateComboCounter() => new SkinnableComboCounter();
 
-        protected virtual HealthDisplay CreateHealthDisplay() => new StandardHealthDisplay
-        {
-            Size = new Vector2(1, 5),
-            RelativeSizeAxes = Axes.X,
-            Margin = new MarginPadding { Top = 20 }
-        };
+        protected virtual SkinnableHealthDisplay CreateHealthDisplay() => new SkinnableHealthDisplay();
 
         protected virtual FailingLayer CreateFailingLayer() => new FailingLayer
         {
@@ -320,7 +315,7 @@ namespace osu.Game.Screens.Play
             AccuracyCounter?.Current.BindTo(processor.Accuracy);
             ComboCounter?.Current.BindTo(processor.Combo);
 
-            if (HealthDisplay is StandardHealthDisplay shd)
+            if (HealthDisplay.Drawable is IHealthDisplay shd)
                 processor.NewJudgement += shd.Flash;
         }
 
diff --git a/osu.Game/Screens/Play/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/SkinnableHealthDisplay.cs
new file mode 100644
index 0000000000..5b77343278
--- /dev/null
+++ b/osu.Game/Screens/Play/SkinnableHealthDisplay.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 System;
+using osu.Framework.Bindables;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play
+{
+    public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
+    {
+        public Bindable<double> Current { get; } = new Bindable<double>();
+
+        public void Flash(JudgementResult result) => skinnedCounter?.Flash(result);
+
+        private HealthProcessor processor;
+
+        public void BindHealthProcessor(HealthProcessor processor)
+        {
+            if (this.processor != null)
+                throw new InvalidOperationException("Can't bind to a processor more than once");
+
+            this.processor = processor;
+
+            Current.BindTo(processor.Health);
+        }
+
+        public SkinnableHealthDisplay()
+            : base(new HUDSkinComponent(HUDSkinComponents.HealthDisplay), _ => new DefaultHealthDisplay())
+        {
+            CentreComponent = false;
+        }
+
+        private IHealthDisplay skinnedCounter;
+
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+
+            skinnedCounter = Drawable as IHealthDisplay;
+            skinnedCounter?.Current.BindTo(Current);
+        }
+    }
+}
diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index d690a23dee..8772704cef 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -7,6 +7,7 @@ namespace osu.Game.Skinning
     {
         ComboCounter,
         ScoreCounter,
-        AccuracyCounter
+        AccuracyCounter,
+        HealthDisplay
     }
 }

From e89c5c3b3cadfa20f529b76028cf8d9bba5d3fa0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 14:39:02 +0900
Subject: [PATCH 05511/10326] Add dynamic compile exceptions to fix skin test
 scenes

---
 osu.Game/Beatmaps/BeatmapManager.cs                          | 2 ++
 osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs | 2 ++
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs           | 2 ++
 osu.Game/Skinning/SkinManager.cs                             | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 4c75069f08..f3586ec0ec 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -19,6 +19,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Lists;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
 using osu.Game.IO;
@@ -36,6 +37,7 @@ namespace osu.Game.Beatmaps
     /// <summary>
     /// Handles the storage and retrieval of Beatmaps/WorkingBeatmaps.
     /// </summary>
+    [ExcludeFromDynamicCompile]
     public partial class BeatmapManager : DownloadableArchiveModelManager<BeatmapSetInfo, BeatmapSetFileInfo>, IDisposable
     {
         /// <summary>
diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index 16207c7d2a..cb4884aa51 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -13,6 +13,7 @@ using osu.Framework.Development;
 using osu.Framework.IO.Network;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
+using osu.Framework.Testing;
 using osu.Framework.Threading;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -23,6 +24,7 @@ namespace osu.Game.Beatmaps
 {
     public partial class BeatmapManager
     {
+        [ExcludeFromDynamicCompile]
         private class BeatmapOnlineLookupQueue : IDisposable
         {
             private readonly IAPIProvider api;
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 362c99ea3f..f5c0d97c1f 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -8,6 +8,7 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Skinning;
@@ -17,6 +18,7 @@ namespace osu.Game.Beatmaps
 {
     public partial class BeatmapManager
     {
+        [ExcludeFromDynamicCompile]
         private class BeatmapManagerWorkingBeatmap : WorkingBeatmap
         {
             private readonly IResourceStore<byte[]> store;
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 7af400e807..37a2309e01 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -18,12 +18,14 @@ using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
+using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Database;
 using osu.Game.IO.Archives;
 
 namespace osu.Game.Skinning
 {
+    [ExcludeFromDynamicCompile]
     public class SkinManager : ArchiveModelManager<SkinInfo, SkinFileInfo>, ISkinSource
     {
         private readonly AudioManager audio;

From 5be9e30cd0a8005eba7c1592c16016cbcb126e92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 14:39:45 +0900
Subject: [PATCH 05512/10326] Add legacy implementation

---
 osu.Game/Skinning/LegacyHealthDisplay.cs | 101 +++++++++++++++++++++++
 osu.Game/Skinning/LegacySkin.cs          |   3 +
 2 files changed, 104 insertions(+)
 create mode 100644 osu.Game/Skinning/LegacyHealthDisplay.cs

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
new file mode 100644
index 0000000000..26617ea422
--- /dev/null
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -0,0 +1,101 @@
+// Copyright (c) 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.Judgements;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+
+namespace osu.Game.Skinning
+{
+    public class LegacyHealthDisplay : CompositeDrawable, IHealthDisplay
+    {
+        private readonly Skin skin;
+        private Sprite fill;
+        private Marker marker;
+        public Bindable<double> Current { get; } = new BindableDouble { MinValue = 0, MaxValue = 1 };
+
+        public LegacyHealthDisplay(Skin skin)
+        {
+            this.skin = skin;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new Sprite
+                {
+                    Texture = skin.GetTexture("scorebar-bg")
+                },
+                fill = new Sprite
+                {
+                    Texture = skin.GetTexture("scorebar-colour"),
+                    Position = new Vector2(7.5f, 7.8f) * 1.6f
+                },
+                marker = new Marker(skin)
+                {
+                    Current = { BindTarget = Current },
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(updateHp, true);
+        }
+
+        private void updateHp(ValueChangedEvent<double> hp)
+        {
+            if (fill.Texture != null)
+                fill.ResizeWidthTo((float)(fill.Texture.DisplayWidth * hp.NewValue), 500, Easing.OutQuint);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            marker.Position = fill.Position + new Vector2(fill.DrawWidth, fill.DrawHeight / 2);
+        }
+
+        public void Flash(JudgementResult result)
+        {
+            marker.ScaleTo(1.4f).Then().ScaleTo(1, 200, Easing.Out);
+        }
+
+        private class Marker : CompositeDrawable
+        {
+            public Bindable<double> Current { get; } = new Bindable<double>();
+
+            public Marker(Skin skin)
+            {
+                Origin = Anchor.Centre;
+
+                if (skin.GetTexture("scorebar-ki") != null)
+                {
+                    // TODO: old style (marker changes as health decreases)
+                }
+                else
+                {
+                    InternalChildren = new Drawable[]
+                    {
+                        new Sprite
+                        {
+                            Texture = skin.GetTexture("scorebar-marker"),
+                            Origin = Anchor.Centre,
+                        }
+                    };
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e1cd095ba8..f02d70fc2a 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -347,6 +347,9 @@ namespace osu.Game.Skinning
 
                         case HUDSkinComponents.AccuracyCounter:
                             return new LegacyAccuracyCounter(this);
+
+                        case HUDSkinComponents.HealthDisplay:
+                            return new LegacyHealthDisplay(this);
                     }
 
                     return null;

From a810f56ec87f0aeeb1d454bceb72eb6a30cc083d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 14:49:05 +0900
Subject: [PATCH 05513/10326] Move "flash on hit only" logic to binding

---
 osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs |  8 +-------
 osu.Game/Screens/Play/HUDOverlay.cs               | 10 ++++++++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index ae78d19c2d..b550b469e9 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -107,13 +107,7 @@ namespace osu.Game.Screens.Play.HUD
             GlowColour = colours.BlueDarker;
         }
 
-        public override void Flash(JudgementResult result)
-        {
-            if (!result.IsHit)
-                return;
-
-            Scheduler.AddOnce(flash);
-        }
+        public override void Flash(JudgementResult result) => Scheduler.AddOnce(flash);
 
         private void flash()
         {
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 0d92611e0e..ac74dc22d3 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -315,8 +315,14 @@ namespace osu.Game.Screens.Play
             AccuracyCounter?.Current.BindTo(processor.Accuracy);
             ComboCounter?.Current.BindTo(processor.Combo);
 
-            if (HealthDisplay.Drawable is IHealthDisplay shd)
-                processor.NewJudgement += shd.Flash;
+            if (HealthDisplay is IHealthDisplay shd)
+            {
+                processor.NewJudgement += judgement =>
+                {
+                    if (judgement.IsHit)
+                        shd.Flash(judgement);
+                };
+            }
         }
 
         protected virtual void BindHealthProcessor(HealthProcessor processor)

From f28bcabae72a49841b59f7428455004944a9ace6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 14:54:46 +0900
Subject: [PATCH 05514/10326] Avoid transforms per hp change

---
 osu.Game/Skinning/LegacyHealthDisplay.cs | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 26617ea422..2fac11d7a4 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.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;
 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.Utils;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
@@ -17,6 +19,9 @@ namespace osu.Game.Skinning
         private readonly Skin skin;
         private Sprite fill;
         private Marker marker;
+
+        private float maxFillWidth;
+
         public Bindable<double> Current { get; } = new BindableDouble { MinValue = 0, MaxValue = 1 };
 
         public LegacyHealthDisplay(Skin skin)
@@ -45,25 +50,18 @@ namespace osu.Game.Skinning
                     Current = { BindTarget = Current },
                 }
             };
-        }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Current.BindValueChanged(updateHp, true);
-        }
-
-        private void updateHp(ValueChangedEvent<double> hp)
-        {
-            if (fill.Texture != null)
-                fill.ResizeWidthTo((float)(fill.Texture.DisplayWidth * hp.NewValue), 500, Easing.OutQuint);
+            maxFillWidth = fill.Width;
         }
 
         protected override void Update()
         {
             base.Update();
 
+            fill.Width = Interpolation.ValueAt(
+                Math.Clamp(Clock.ElapsedFrameTime, 0, 200),
+                fill.Width, (float)Current.Value * maxFillWidth, 0, 200, Easing.OutQuint);
+
             marker.Position = fill.Position + new Vector2(fill.DrawWidth, fill.DrawHeight / 2);
         }
 

From 6d3a106a868774862b1fd4187cece7729723c30e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 15:10:39 +0900
Subject: [PATCH 05515/10326] Simplify texture lookups

---
 osu.Game/Skinning/LegacyHealthDisplay.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 2fac11d7a4..3691dbc731 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Screens.Play.HUD;
@@ -22,6 +23,8 @@ namespace osu.Game.Skinning
 
         private float maxFillWidth;
 
+        private Texture isNewStyle;
+
         public Bindable<double> Current { get; } = new BindableDouble { MinValue = 0, MaxValue = 1 };
 
         public LegacyHealthDisplay(Skin skin)
@@ -34,15 +37,17 @@ namespace osu.Game.Skinning
         {
             AutoSizeAxes = Axes.Both;
 
+            isNewStyle = getTexture(skin, "marker");
+
             InternalChildren = new Drawable[]
             {
                 new Sprite
                 {
-                    Texture = skin.GetTexture("scorebar-bg")
+                    Texture = getTexture(skin, "bg")
                 },
                 fill = new Sprite
                 {
-                    Texture = skin.GetTexture("scorebar-colour"),
+                    Texture = getTexture(skin, "colour"),
                     Position = new Vector2(7.5f, 7.8f) * 1.6f
                 },
                 marker = new Marker(skin)
@@ -78,7 +83,7 @@ namespace osu.Game.Skinning
             {
                 Origin = Anchor.Centre;
 
-                if (skin.GetTexture("scorebar-ki") != null)
+                if (getTexture(skin, "ki") != null)
                 {
                     // TODO: old style (marker changes as health decreases)
                 }
@@ -88,12 +93,14 @@ namespace osu.Game.Skinning
                     {
                         new Sprite
                         {
-                            Texture = skin.GetTexture("scorebar-marker"),
+                            Texture = getTexture(skin, "marker"),
                             Origin = Anchor.Centre,
                         }
                     };
                 }
             }
         }
+
+        private static Texture getTexture(Skin skin, string name) => skin.GetTexture($"scorebar-{name}");
     }
 }

From bdebf2f1a4f8127393115d99c8c172ce27fe85a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 16:17:36 +0900
Subject: [PATCH 05516/10326] Fix skinnable test scene still not working with
 dynamic compilation

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

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index a856789d96..fe4f735325 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -35,12 +35,12 @@ namespace osu.Game.Tests.Visual
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, SkinManager skinManager)
+        private void load(AudioManager audio, SkinManager skinManager, OsuGameBase game)
         {
             var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly);
 
             metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
-            defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);
+            defaultSkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), audio);
             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);
         }

From f0b15813e206bc8074102905cd52c6a986e414f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 16:18:29 +0900
Subject: [PATCH 05517/10326] Add support for both legacy styles

---
 .../Screens/Play/SkinnableHealthDisplay.cs    |   6 +-
 osu.Game/Skinning/LegacyHealthDisplay.cs      | 140 ++++++++++++------
 2 files changed, 103 insertions(+), 43 deletions(-)

diff --git a/osu.Game/Screens/Play/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/SkinnableHealthDisplay.cs
index 5b77343278..d35d15d665 100644
--- a/osu.Game/Screens/Play/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/SkinnableHealthDisplay.cs
@@ -12,7 +12,11 @@ namespace osu.Game.Screens.Play
 {
     public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
     {
-        public Bindable<double> Current { get; } = new Bindable<double>();
+        public Bindable<double> Current { get; } = new BindableDouble(1)
+        {
+            MinValue = 0,
+            MaxValue = 1
+        };
 
         public void Flash(JudgementResult result) => skinnedCounter?.Flash(result);
 
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 3691dbc731..7d9a1dfc15 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -18,14 +18,18 @@ namespace osu.Game.Skinning
     public class LegacyHealthDisplay : CompositeDrawable, IHealthDisplay
     {
         private readonly Skin skin;
-        private Sprite fill;
-        private Marker marker;
+        private Drawable fill;
+        private LegacyMarker marker;
 
         private float maxFillWidth;
 
-        private Texture isNewStyle;
+        private bool isNewStyle;
 
-        public Bindable<double> Current { get; } = new BindableDouble { MinValue = 0, MaxValue = 1 };
+        public Bindable<double> Current { get; } = new BindableDouble(1)
+        {
+            MinValue = 0,
+            MaxValue = 1
+        };
 
         public LegacyHealthDisplay(Skin skin)
         {
@@ -37,25 +41,29 @@ namespace osu.Game.Skinning
         {
             AutoSizeAxes = Axes.Both;
 
-            isNewStyle = getTexture(skin, "marker");
+            isNewStyle = getTexture(skin, "marker") != null;
 
-            InternalChildren = new Drawable[]
+            // background implementation is the same for both versions.
+            AddInternal(new Sprite { Texture = getTexture(skin, "bg") });
+
+            if (isNewStyle)
             {
-                new Sprite
+                AddRangeInternal(new[]
                 {
-                    Texture = getTexture(skin, "bg")
-                },
-                fill = new Sprite
+                    fill = new LegacyNewStyleFill(skin),
+                    marker = new LegacyNewStyleMarker(skin),
+                });
+            }
+            else
+            {
+                AddRangeInternal(new[]
                 {
-                    Texture = getTexture(skin, "colour"),
-                    Position = new Vector2(7.5f, 7.8f) * 1.6f
-                },
-                marker = new Marker(skin)
-                {
-                    Current = { BindTarget = Current },
-                }
-            };
+                    fill = new LegacyOldStyleFill(skin),
+                    marker = new LegacyOldStyleMarker(skin),
+                });
+            }
 
+            marker.Current.BindTo(Current);
             maxFillWidth = fill.Width;
         }
 
@@ -70,37 +78,85 @@ namespace osu.Game.Skinning
             marker.Position = fill.Position + new Vector2(fill.DrawWidth, fill.DrawHeight / 2);
         }
 
-        public void Flash(JudgementResult result)
-        {
-            marker.ScaleTo(1.4f).Then().ScaleTo(1, 200, Easing.Out);
-        }
+        public void Flash(JudgementResult result) => marker.Flash(result);
 
-        private class Marker : CompositeDrawable
-        {
-            public Bindable<double> Current { get; } = new Bindable<double>();
+        private static Texture getTexture(Skin skin, string name) => skin.GetTexture($"scorebar-{name}");
 
-            public Marker(Skin skin)
+        public class LegacyOldStyleMarker : LegacyMarker
+        {
+            public LegacyOldStyleMarker(Skin skin)
             {
-                Origin = Anchor.Centre;
-
-                if (getTexture(skin, "ki") != null)
+                InternalChildren = new Drawable[]
                 {
-                    // TODO: old style (marker changes as health decreases)
-                }
-                else
-                {
-                    InternalChildren = new Drawable[]
+                    new Sprite
                     {
-                        new Sprite
-                        {
-                            Texture = getTexture(skin, "marker"),
-                            Origin = Anchor.Centre,
-                        }
-                    };
-                }
+                        Texture = getTexture(skin, "ki"),
+                        Origin = Anchor.Centre,
+                    }
+                };
             }
         }
 
-        private static Texture getTexture(Skin skin, string name) => skin.GetTexture($"scorebar-{name}");
+        public class LegacyNewStyleMarker : LegacyMarker
+        {
+            public LegacyNewStyleMarker(Skin skin)
+            {
+                InternalChildren = new Drawable[]
+                {
+                    new Sprite
+                    {
+                        Texture = getTexture(skin, "marker"),
+                        Origin = Anchor.Centre,
+                    }
+                };
+            }
+        }
+
+        public class LegacyMarker : CompositeDrawable, IHealthDisplay
+        {
+            public Bindable<double> Current { get; } = new Bindable<double>();
+
+            public LegacyMarker()
+            {
+                Origin = Anchor.Centre;
+            }
+
+            public void Flash(JudgementResult result)
+            {
+                this.ScaleTo(1.4f).Then().ScaleTo(1, 200, Easing.Out);
+            }
+        }
+
+        internal class LegacyOldStyleFill : CompositeDrawable
+        {
+            public LegacyOldStyleFill(Skin skin)
+            {
+                // required for sizing correctly..
+                var firstFrame = getTexture(skin, "colour-0");
+
+                if (firstFrame == null)
+                {
+                    InternalChild = new Sprite { Texture = getTexture(skin, "colour") };
+                    Size = InternalChild.Size;
+                }
+                else
+                {
+                    InternalChild = skin.GetAnimation("scorebar-colour", true, true, startAtCurrentTime: false, applyConfigFrameRate: true) ?? Drawable.Empty();
+                    Size = new Vector2(firstFrame.DisplayWidth, firstFrame.DisplayHeight);
+                }
+
+                Position = new Vector2(3, 10) * 1.6f;
+                Masking = true;
+            }
+        }
+
+        internal class LegacyNewStyleFill : Sprite
+        {
+            public LegacyNewStyleFill(Skin skin)
+            {
+                Texture = getTexture(skin, "colour");
+                Position = new Vector2(7.5f, 7.8f) * 1.6f;
+            }
+        }
     }
 }

From 9837286aea6ed1ce625197737d587749e29977f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 16:18:57 +0900
Subject: [PATCH 05518/10326] Add test resources

---
 osu.Game.Tests/Resources/old-skin/score-0.png    | Bin 0 -> 3092 bytes
 osu.Game.Tests/Resources/old-skin/score-1.png    | Bin 0 -> 1237 bytes
 osu.Game.Tests/Resources/old-skin/score-2.png    | Bin 0 -> 3134 bytes
 osu.Game.Tests/Resources/old-skin/score-3.png    | Bin 0 -> 3712 bytes
 osu.Game.Tests/Resources/old-skin/score-4.png    | Bin 0 -> 2395 bytes
 osu.Game.Tests/Resources/old-skin/score-5.png    | Bin 0 -> 3067 bytes
 osu.Game.Tests/Resources/old-skin/score-6.png    | Bin 0 -> 3337 bytes
 osu.Game.Tests/Resources/old-skin/score-7.png    | Bin 0 -> 1910 bytes
 osu.Game.Tests/Resources/old-skin/score-8.png    | Bin 0 -> 3652 bytes
 osu.Game.Tests/Resources/old-skin/score-9.png    | Bin 0 -> 3561 bytes
 .../Resources/old-skin/score-comma.png           | Bin 0 -> 865 bytes
 osu.Game.Tests/Resources/old-skin/score-dot.png  | Bin 0 -> 771 bytes
 .../Resources/old-skin/score-percent.png         | Bin 0 -> 4904 bytes
 osu.Game.Tests/Resources/old-skin/score-x.png    | Bin 0 -> 2536 bytes
 .../Resources/old-skin/scorebar-bg.png           | Bin 0 -> 7087 bytes
 .../Resources/old-skin/scorebar-colour-0.png     | Bin 0 -> 465 bytes
 .../Resources/old-skin/scorebar-colour-1.png     | Bin 0 -> 475 bytes
 .../Resources/old-skin/scorebar-colour-2.png     | Bin 0 -> 466 bytes
 .../Resources/old-skin/scorebar-colour-3.png     | Bin 0 -> 464 bytes
 .../Resources/old-skin/scorebar-ki.png           | Bin 0 -> 8579 bytes
 .../Resources/old-skin/scorebar-kidanger.png     | Bin 0 -> 7361 bytes
 .../Resources/old-skin/scorebar-kidanger2.png    | Bin 0 -> 9360 bytes
 osu.Game.Tests/Resources/old-skin/skin.ini       |   2 ++
 23 files changed, 2 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-0.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-1.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-2.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-3.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-4.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-5.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-6.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-7.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-8.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-9.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-comma.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-dot.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-percent.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/score-x.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/scorebar-bg.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/scorebar-colour-0.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/scorebar-colour-1.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/scorebar-colour-2.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/scorebar-colour-3.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/scorebar-ki.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/scorebar-kidanger.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/scorebar-kidanger2.png
 create mode 100644 osu.Game.Tests/Resources/old-skin/skin.ini

diff --git a/osu.Game.Tests/Resources/old-skin/score-0.png b/osu.Game.Tests/Resources/old-skin/score-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..8304617d8c94a8400b50a90f364941bb02983065
GIT binary patch
literal 3092
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-1.png b/osu.Game.Tests/Resources/old-skin/score-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3b85eb873a9f46dcc300d92afda6155353bab39
GIT binary patch
literal 1237
zcmV;`1S<Q9P)<h;3K|Lk000e1NJLTq001HY002A)1^@s61Dj|m0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$cS%G+RCwC#Sx-wFK@^|eO?GXqjnxSK
zM@tc;77>wp5aXdYkHvliKZD@OPa^24A3!|xAgxEeM50JaMX=Hu|InJ&7&j)_-M*K+
zDPx*sXOc}TGy^|Y;_STN{N}wkGjBD|^Vm&jI=dk)RQZFZX^l)q6P~=G)UNPk_0<1^
z$ol$v&CcWF<DyZ6-VYN(g2E0UFQ5qHI!cNNMm51`hzz4aQ$U9Ri~8d1bASxsC*T5b
z3FCnvo~uNJX3h<xf!hK)g(t@yz%3$jMFfrkhcp?7;HoNO5CJq00rV1j0Qcy(yYws}
z7K=R`92~q2uykFwmzS5{t*x!ShyN7-HmM}PG^9qDW*P-N20R5k0XzcSpO~0<*5BXX
zJ1{WNH8eD2j*gBp%d(hhnk*Cwv0N_4Iy*aG1CdYA{|u0(rBd<{oz@>``VcTUGc)t%
zdAW6ujEorEXgD1HZCs2t{QWL8__GhtMdRtJL^OI42YN6yHT7zKetx2_udk}nY7N6Q
zpU?9#ELv)<5k<n}eBIO2(__(S6s49<EX87x?d<HhL?Yxz!Y{LyA}11wn1*2}WjNP$
z+4=doCnPrUDNV!^64GTNkw{%!TrkIRR5PwCgsj^rkpg-7>Ehzz>eABEX)2Y%S(ap%
zY2Zg_yeN=SCgKW7>G0&_WOHtA?(O8{WPEmZmhJ8Bp(FY(O%)<c)mdFy7F6Vf6FxXN
z&=(dKym&nRa&>i;_4M@A92A#vcX#))BBQD)0-F=}5t|Ybrs+MvM?i9ObMx4?ZC^#Q
z*=(K^;UtuohS5%mesW2f5%-O+fG>a)8j|o4M@5mEyDyL_c{`+hhjvi(nI8n1<}@2M
z)d+Eg`1!&&vyvjsElrJ(_QcbcpO0iRnVih_-{_gucV;|lwzjr@HWf8K1YB7~DoM~1
z2cifk;h-UjYltK3AB`&FY;SMN>^)uu0wcns$2mJYQy~)Q1xqPvT7A>=WRuh1x^jB|
zT9N<b65b}#CekL->ddONf3$*#cy09H7$`$V6YjiPD->}RCaKAgXyh1BItqB@CNs9d
z2~kZhuwy{!Jd#W%i}minx~?;!%BWW<eFmclT*jSxmn<yi#A30iP>l?X$hA`%U9kNW
z(Pc?AdP0*5VelbCAQGq|s^?InLXkk1hAAkb3uLrb_=s;p!>S_@(PVRpYSduN=D-;X
zbxRBoHDhCA9kTacRU$ZOsn~CtX0~2J!>9o=IjXM|g1m%#RF233zNgda6xPvdk-=nV
zSyqN>DK;tDSfQpyUF{rjw7<Wf*x1;3F+4mRp`3B89UUDNR#sL%Pz^3as?_(Z%2|Pd
zKRVHe0{k@64Y<$B9|@kZ@<#&9pk34z75heYw|&58Dtloq&IVgfvx@NAE0(ZM$zM>N
z16KZ&(n0;Mh)kLYeW!PP{X~igRvJN-A~~yAheZOWFb=O+=ZKI^eT!7BY}!Xkl}7v=
zM#iparj>iiwW<M!Uy-J&kF*cZZ6X!zmjD9*_`52{RF+Q&00000NkvXXu0mjf@8UPi

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-2.png b/osu.Game.Tests/Resources/old-skin/score-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f65eb7ca7e52a69d645d3550d932ec55c44acd7
GIT binary patch
literal 3134
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
Y0OO;-v8NaCZ2$lO07*qoM6N<$f&jDokN^Mx

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-3.png b/osu.Game.Tests/Resources/old-skin/score-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..82bec3babebd59263dc486e5900a3a01ea4aaed7
GIT binary patch
literal 3712
zcmV-`4uA29P)<h;3K|Lk000e1NJLTq001li002A)1^@s69a31D0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU=B1uF+RCwCdT6t_$br!yF=|Y#+QfT{X
zDFvZyr3kW=ttb*k9U<b35k_K+NQeZD7=nTsHHynW#C4)%j3|sIGBQXc%n(s_<H$0y
z6b7L{%VO#Npv!xG+nw*bbAI*5<G$B2noPXOXYsxJ?mhSX&iT%F&hI)*(=>ifhvOHz
zhC{oSeoa&R8~uM7%-=W#Zb1^@5;(PUqk@Qru>6f`==sgR{r1})oj7UIB!^~XGSCZ1
z6Y$?Dn&A%3t6@P9=mY}V-=KisM`261#=CoHtZryJ-~qCM9H6)SKR-{^yliU5(m+4Z
z0ki|H8rtOZ0PYi__hESCe>PZ*O%g9=0et~4Pzc;4|L!|&+Oz@DXfy>$+;vTd!x3q1
zZS@~Ha-=~s)CaTxO&XfzbAIo~JuR=>dEDItW0Pgs>CFOQATSsh^1uTRl;3mDJ%zX5
zetS|%N{ZohI<NUX83+$ygu`K@sj10;;gS9O_qQHCe7N?TZ@xK&Q+^a&0xkn}V*FJx
zTzTB=Hik9Na;f_O{ehuC+1+>FJ^ksYpDr0Wa-=gOBg05ePQK3A*dr2&ScZ3Yb{c^|
zz^JXQHMVZu+Oc87hSNun9zBLr&I0Fv^J09HgiEJxbRrMCBqkZ7MZgGP+=>+|W<UAl
zlf7|RhGN-!l(a6F%K}%z<M9|dIXT9lL4(pBdE}8>wr}5F`u_XxpW3%?-#>Bczk$=T
zvi0KafaHR`hv8jiY>s%g3@Cr~)mMMNXwjm~?Cfmo=D)<jkfGPFT)AR=_St9t7hZT_
zS4&IF0en>nREf8*(9>2j(qJ7zNu;P;U<@!H_!B%)+tAQpVp+|e9x%p)F=ks^n|bx>
zRkOXl-3*07*5|PYLdH60=gytc(W6JxkX69%#96swlfy0~obqM1u)vT}qee}B>7|#v
zJ@qVOwWFiM07DoD4jeGB)CP<(ii(O1B&dPdH!?Fb4Y&KJ+cO844-+R&bgWyquKeML
zAC4e76%G0&mc#M9OE#DUEC&Ai`RAWU{C<D89;KIHq=_Ul5jve&Sy{*N`|ZHr1Us2n
zbLY-A>+0$(Z`&PsSQGaoL;M9;2uuL-8Q1PO-u1`{gYLio{>f9PPIWR_y7Q{f=QBR}
z<P#HdSc#aVu{A)0WV=H+d@z`y4G%MN_3G7@r(=)Q)KsIQqQbpk!Ghb?u3cL#)Yr)C
zIBl4rmn0ht!=NQgmJ~9p6R`n}ZES2bmM&e|4txn?x8dVmz&_wR;Gl-@fuo?bX2i6;
zUckNhAP+tC5N+ru51K)mb=nk(OgW)HygR<EtjtJCO6u0w#fumF;9VNJ2OvHD3pgPZ
zbuI=qmo8m8UteEu@w45*dk!5s)QJQv5o%>UNOmR&hyL^D&o5vi#Pcq1#xPjEe0kgE
z&6~dxL+Qbj5)O4**}Wp1s{XbeJ9f;7r^k6u@_a!-f$}bC*6p+j2eLzcadB};d3m{$
zKe9V`BhZ!c-h1zbKmPdR9r%dc$%=JG<IVt*IizU<rT8o<%GFC0YGkC6l9DW0c`mcl
ztw~2!hAqu7Z{EBiiM&g)2WJ|uzy7-N>Iv~`qfk+oq1yFRl-dKu_07x6yO9E98k*Qv
z;gBi1!F$(TcV#kL<Haq-%yZ8@SA~!`B<0lB*qAc!k?ZF}-4*ug)vH_Psj8~-b#X8X
zqf@(Jio{9|!l4)ee+{wg2ebR-mtPK4R#qO=;?>qzDf7x1xsvq*7A{<vmdId+Tre0k
zPM$njE40Ys5z;-}CC;Z$pI*d^*@Xk2x~8Va`1I3HkBG6=B2uVjgEqz{izD)YVxVNs
zoH=7qJrlAIii&aS)T!v%vuA5WKX=3$+|{4WoH^4I@99}`*Q{C7icqK&in>;uTx)ES
zW-N8|FqHSvFTVJqhddiEKj>YS^>^QW_kw6;B{hTYn4qS2g1A{PyQe3OQB`f*w(Wc2
z*GuyBerYV@d6veO0=FVbZ-J~#=v{^aC@%{2#)Q70g<III85<V2x1bP&k-=^zoyuZG
zV+e)DbLY+-5bvr`VBI&R_~<dKjHTk500A}azWeSo62&e<4yw?2{`u!w+J6v(e{zb5
zo)qcL#sUvcnKES^1a%!-n)Bz+n?!YWH3dm)Zf@=xoU;I!ED4mZwfgB&B?pOk`h&>C
zf56xvm?fb+<#(ulCMxVjN?MV&W8}fFk(W_X^?Z^V^jq73A4Iiz<eaM#uhqf|mt~ov
zTHBu~JnoeQ8wQMqu~VQ)To62Qc~^-iII4By#*JS}5vtb1fo+m*aHk}XA+v%;>5>&0
z`{nyatx*h#XVWx8`-z8#p*W0r>#es+?zrO)OY6onmN83SNBh;he*OBtOCe&DS}XSn
zs)37TFtb}a)OLwwzhq{r*7t>E6*}bmu&_%nC6*}mf#IO>ThURELhqN%-i^6n#|UhX
zptFrLXU-T;J@r)kjvYJpN^5jlB&AR8d3_U#55h27O=<$#=t<4ZVn<F+@vKKeXV|!L
z<7T3js<`*wd($aN)6&x7dX-5`V>fNuWIXfCGwh;kw06Hqk~t7NpSY%!$rsA#?glJL
z5)O=8FS>}|y!P5_cjo8kTORGM?We)?>?^OlVzvCjR8CDCsee1V9i)g@xo!<(^npWu
zZ)pU0^;R&5<<%Yy^$;Q~|9kfAF_7TKJMX-6GsIMlghI1~Cu5i4YIYSRt(S9YQ=TkI
zqFg~Ak)7#6FUn9hsZ)R@D_5>O!LIj44|dRjK)}3w`Lg-;+iwRD^ILGe6~J$WWpczW
zYb4<oZ@RVlS-K!iohS+Cm#1!*#4`o-LObHo$8yRFM$yFB?a7dZ=dfSo>Y!6j>EFNq
zo#^F4&CSg!!PS)0${klsW$Gin+yJRi1B9k>CAm^G8Z@=ANQNNtL+ls8Q>hm(UUb0-
zCo3aC?aZ>yxF+l#M0FU2g@vvGI8da16dG+6!-F4u@PT#1WKH@N$)IoG;K753^y}Bp
zi&b+#PWlcWJgAh}X-!TBB{bA;i{*jyWGOumJG~LBg{Yo+EX!1B>FMcl*@INa9ubuI
z17yH@e6(LUnca8DAxqy^ZdQurc<}MZAD@hDcPTxr_!3R#X^8eev+EV(n}t!*q)}9{
z?h)aWE`Rwz13-0U%a$$c|HKnd7_55nn1uKG@WT)NsE%v#zq^H-S+0Ysk5kjhk!#nk
zom*O3>f)4#o*-DI$g5CUeNLP>5d<Aw(3Z=uP1oCm?3+XwU6yKP4fPNjfnB?HWn$TT
zC(^_8J{*?x=9_OS)@YE57j<gwOBQtSXs_4nvTHnf5vnXay;nSzA&DB%%65a?phm{0
zr$yu+7j0lEu#Z0a$ns*mgPtdsqm3FE!%UX=QIwX7%uMQTWC}0$19$cjgB9JV>KBT$
z)!>(NIX-BptE+2;*vU+EFB*;fNs`~WRS|J&TT{lNLx-+XH6=0_+3%5r%Fv$N_RuP4
zMB6QL6ciM=de|+;Zlzfv5f#rc20NIc@uo3MLd2gMWo4;pjC2_B=FCbbXG^Z+&YnFx
zt-Fqyi4Lj@X&XCHWpG5unF-W_G8v%UvpX2u6%`c@S=zp0H1DhmkYUp%sm_D6cQdGR
z*rSg=YQ!5M=p8dc@4Vt*RXCiQoMh6}@7=riN4D{HBP1^4h!G=<^78VbVnDvo8EGwv
zF)K*csO~1=cJ_3)tXj3InA;7BLW0I3JR?Gzt(u(e@~~g%=<<dQ8xB@hR&sW0Ta8F@
zk3IHSo@~&R2!DIEFi}hI)tgUlIiOpfgcd)ccU5Qp#TQ@H%WO`y_?E%C-c^Do9h6fv
zW5$eZyV(RigJq=$a?y--$OAjH@_t>51Wup&?6c2KK|ykm&l7o<Nl)1cF|`+Vd@uB9
z?eme1Trty2D@l$YKW;*V3>`jvcv9?65&uoXpD<xUGKxSRl2mma9*Jv~=9|T{V^D;q
zL4}phn>VjpW0`0iBfRm(8+Ew$*D|kDU32Hcg$qq3FJ0mtF5wJd8D$;>NSIpycAF@a
zgbbZovu1^)RC6}G5!eKLjehR*qD70s5JD!m8|<zTD>Eri*R5Me0-%Oi1Wc41NLBLE
z`j0kU%urheTuLNI1xob{G?6aGZfxymoKsT5aAWuG-NuCr7pxKvCNaj3A8$?38CLOT
zbh>A$>d@1L!64gEz&I2?tc61dTevO(FJ4wln<s;hIlv#`>8<Dn{M_<F_S$-en=9PX
zqKCM}#jURHJgN>}lh@`wM7*yAX30ioAIS};vh$ja#h6KBp6FpF&L}jOGnOu0S}<_n
zz=X|ZPY)&+^#l^vfXJzZI{QjO%Wl9JiM!VfquttEtdBNl7>W=nTfTgG`TY6wGr06z
z?i<;@<<c{ZNLz?)W6PE;ZL3$W{;s8^<*1CM&Weoe+Gmb^6(P~qts?(y@peDeiNNq7
zXgbTlseQ+e9qS~ok~!#g#;bY&mUy)(PD8mVj_eNujhi=bu7shd)FzD>S}*mWBi6G$
z+0AzeH>(iI7Fp?)IRxQ_@i$GJII$QiE(h8<1(h)6zwGBQeLi3G<jIo(c+_82Rn@p}
z-@bE_MD?PR)hh=LLS1V2J{<2QkA$z#2zw|2lPY22k&>(4M#+{6m!UPTE^Q(jkV@Jr
zBHX9F<l$30N^;(H??>Fw3m)>r*ojc9)c9Jh!%i25>Duj4xuq#V{S}%HZR8b{b9(g7
z&yBuSrEgoQ<V@BKRa1O*U0v9RG~+@sZ&#T&V!+QioHo#>MrO?GUeTZX4x8iG_GX~d
e_>~?15nuodi5A$|t>!iW0000<MNUMnLSTZ_KSS*R

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-4.png b/osu.Game.Tests/Resources/old-skin/score-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e38c75a9ddf9dc183531b5332ecede96a3f0053
GIT binary patch
literal 2395
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
N002ovPDHLkV1f?Fo=yM&

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-5.png b/osu.Game.Tests/Resources/old-skin/score-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..a562d9f2accc9592595b3b07669195d5b75406f8
GIT binary patch
literal 3067
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
JPDHLkV1kmK?iT<6

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-6.png b/osu.Game.Tests/Resources/old-skin/score-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4cf81f26e5cab5a068ce282ee22b15b92d0df12
GIT binary patch
literal 3337
zcmV+k4fgVhP)<h;3K|Lk000e1NJLTq001Wd002A)1^@s6<+7t~0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU;t4TybRCwCVT6t^~_Zgi%Y_HchU@zFl
z;if=rZUcpY93TRkgGxXX)I#!4qf~1DDqy5iKov!mKn)U7nuID%6jYE>oInXkiAowm
zxg2vDgN+Ra8+@(L^|fAmr|*rvpF50qmLrXnksfBpyR&b;^L^jgq3gQ#Lp>Z%`8lV2
zR{d1aO$b|Fe{bXz5f|VFVg#}B+GQd~QvE>4f&uwm__4{IJ$u&nmkSmwP^3s84)6d8
zCV1t%Ti&M&u^`Y3bPKwG9yxCi#rF<8ikv$NF-0m?h$I7Pz;HpTob$?i6uFRzP&?2D
zv<mn-K%%&QpO6ec5jlL&C2orcQh*V_NFWQy1~Svq(z2#ao0dIu=FD^?l^by2Ai04{
zmo7Cwc<`X<&Ye58c-;up19gHXpatj<k|8@Q4sojxQ`Q<rBET460x)Uq+O_%X*RRi>
zJ$tsx<MC)QF)^Cc=^XrgI2_jc`}?(EFsM~lR_Z5Do(!Bgaia3dl`Gfq>)XH`phgI{
zh=qe<MctO1xRS&Yfpj1Tm<;5uT)A?|=FOWY<mTo&5)%`(*w|PNma>f(mMD_!?d{b%
zJ3F;6zW5@vckkZPt5>fU<JUKUN+H=Ou4at(KSYq^grFieObD$2ehd74_wL;t_4V~S
zzDS2<^d~(A1_t!*?ry!dwpK4JEbJIIY}j#JcPH>OU@kBkNRm);C{Aum?ea*VGp?ra
zgGY`W`RVh|KOaMDxm>QND~fP?e0;n%a^y&D%a$!k^XJcBv3>jY47fU82ste^v47BV
z@=LD-`~u*Yz~6T5+SS?C*7n%ef*bWvC}dd5?%=g(#mkp3>v?&3m+?J&fu93&B)%Ez
zE`yhlixGD|3#<eF{Kgw^JZNleG`{drF6-**(i<8YbXY<^c<`WJU0tp7vxqg@&oe~$
zej)fLU@ed*u^uM|GyWmlXMm+Z;n=Zbzd_*YeSLjViP1_;O-=gSZ@;ZinKH$X&t3t}
z1DEl-Y3I(JI%5@?YfF$8oH1htKeG*31x%Fk<yKZ>QJoI_0yqG7b_W81M-oFV(_eb&
zC1%-a;IF_R<x6()I>5gR3JSVz+_+(TqjYgmQ4wS8Fz_qj$Kqa(OH7z588davm@$j@
z?b|m7MfRckWj^3at)-<!d-KgVyN(?@_Ai_|2V4Sf0@c8MfR+rv#lf1In$gRbFOOke
zv|iKgb~90&2#t&j7cSIFCo#H+OI%7nkEQiCZQ8Va$&w|;h3pR2EtHpm4?g&S#Lfz_
z3RB%`kygbv7A`L@cO)exjhj1nu2CN!DzvDTEaW*kISGdkA8v=MRdMcA<%2%<!CK?t
zCT}!iaHod0q#ZbLfP@&#rNAvy)mQDRMha~i--GwxLgpJ*AJRi%z0spbYpYkUW@wF)
z<cwD(gl_dMUApu~nVFf!o1<B6$BrHNp0=xaSq|J47j^=D$bL5dK6%aabk%LRwhWdw
z+FGQ;>-B0czx;9r{+l6uyk>G4aAyYJWOuL~-MxEP`}EUKFPqwrU;1N6DGd1;lJhNM
z$=a{K{<^8BrzhgI>2CIGv09R{T!N5GU%Ys6tTiUg2Qo{0_uY59rGeL4EcTG}k=K1f
zkU`#9TwHw5&T@=Bem6Lb7Bv(*NDjsD8K2K*+oIUW>C(?X|GY|wHA>L;ipq_c*z$X3
zUo%4CzTfYU7<a18nUuFfxixv#tXZR?Sq*hcL#k`{?%k`h$eoZ?>X;6z_3BDXOZyle
zwgS`b?ol`F7II0jS|U^0?x6I62xu3<*sR>iJA~AVkvYOV@C=5NkmUR8>+0%Sk@3E`
zxVVS!0y>Zez<DJ^d)?ySq^VP<dhE#2r3_>!T;<B3Ni4*h1|GL*o=}!^Nr3ZQ;M}=$
zWhhs^l$4Y~H!5OG7zoodqL#Z9xrFJ{r#tOR2xFw8qC$g90zx8LQa;fn=RIO2Wkt<2
zZK>~ZeDcXBC8tiE@<X)d;JQ4g<9j==UAuM@@pw~eCc`G6rmA=dK-*+s;f2*Sv4Bsy
zNwR#gc^Zp1O=Bt{%%dS=)79MET>sTqU)7t2p*FErgAilbbQ{wZ`e|yk!b`K4m9fwp
zvOOTBhZl`WO-&t+L1z>Oo#6=y32_LII8)3~{e~bAdZ9j=&zw1PU&5kQ2>2!Io8<qh
z?HO~0F(7AWXD3Bdxg?GPt-bf&dvOydPMn2eIRk1|gVb@3A3vT!Z1hLIk5ID(V->D*
zBRk^}Q)y`K6F&a<<KX-6zh8l@zad%KC^y<}8XbeGJpFFr!i8lNhtUKjg(C$e^;v6c
zt08qLo1SE*pzx#=12G+Pz1=iRP~grMCC)f@tHJB{Aa^qwx&QY;lDt8*!G2i(Kj82O
zV2x<X3`s7hJ3?Lh-VcTlOUVl_yx>B-&wu^(*EPgsNLCiTQa=Zr-(}mRW>fY{D|kNI
zdW~_(iEPrONe-x-e7JZPPLDH{s3<9F*DO)<Sdb|K*flVu7^>KMur#41Y7m)*9I~qh
z)Q(6t7gY6P2-tg4P7JZBKJi%lGg^d1Fu79zG+;KUmJ4-D&C;a+GiHV*Cnx8uTemI;
zgN`<0#0V`?@1_NL18=?cRvMIW?rj`6{eahXn|5kZ54M+Ew{B@`)~xA)>@Jphp;iiL
zuMEP999g7wbadoE0Z&6)%16<S$;ilvSm=2UH=?atwd&dZ`}bdvZI&T62f#l3sMx|6
zX&X0g)Ip3n&i?lez)a)CNcLNxME-wKh9186JX+tkw6>kl<iYq`wrp9N%rhxUZ1#g(
zKf6G*ID-qdl9G}NH4^~W#d?(@KC5MebVpv7%fg25zlkttW}Mm`EaHe!vl8~utwA(&
zznuV7?TbT=$fa5t{giYHSyixXt2)KS{IdJFxmpzM;nA{JDPe?x(W7~hUKGR*#+04)
z=vFBUoznNZ)e1GzW>U_n^{d))c1H7#Qo{J2!CkXcJ{&lG`gEA;!|tv`dp&Kje(a4p
z$T`h2op;rC{rdH8TF<VcL+@!KE<L6#y5kX#1JwG~kY#oo1ha==h{3J9Q&d1JifN<W
zWJGf5>FJ!xeUeFu7Tp$U3-6X2;d@i&&6^i>Mp20eiKUcwNRewkfBt+Gv&k+lSjmx1
zS<+t86hYY`54j&9mMlvm-*eABmmY1CprkqyPf4htBIid^+&y~qXpk+*t`4nUy*fn}
zJ|iUyseav(o#usioDfTwjnOkNzW8Fyqt+bA(vWl<V@EtljwRyIp+mQ!w<21PE?Kc+
zg$9wCD>6Mx2zrH}3vio=`DEue@s(Fz$-~SLb<IJqp^G$$DsER>rdWZurl!V&i%gw7
zd9u?wi7{gtd${}L&p!LCQ_4!u;Qsc1gHEbgYZ5R6(rDpFAAOXam6c^Xqfo(ARaI$)
zg@xb1bC;xuH@ZxZkBp0B0?L33jGc)!yLfSKgV4f!K#xdihgd5~;wwwGlQV#M@4WNQ
zEX12;=Tc@Uy|ri09zWcAN;(R6Fs&|=o-@*(5*jnXggJBOcsLuFpEamm8q{kn#=8vM
zh|?7KBP1RtiK5Mi8p)@S<R;$knFT9EadB~Y+qP|AqW69)?XW>Sqp1ZVC#%K4ulelZ
z!w)|UqS;5B5xC1mUDRKD?KK84S79fCe*i}*2J-Xsn~REybZ+9KExgszT6V(QfuG3D
zF*Mx90|{9tBuJT{8qI@PTm-qZvY?>AO}%A}7iJe1I~azwW5<qZ?d|Qx!!O7lUeAy~
zR?C}RNsDn%->_jr2?%~Es-|3ec84L=P0t}b;+m;)2b+OITeog)<zgBpA7Vwm<|3Mt
z8Od?7;^sWsL`F-}q6mvHEOtTG{OjdO&d}!&LeM4ImM#SOc<DF5UluJ|RLYGv$3i}H
zi1rX9+V)+Ig}C81c;=s$M@-q0RBrW%$@*Z<`owUQ#Nv29H3Z3-ufF=~IApVj+05F<
z+C`T$vlUn;*^2m+?xzdu>gu%P$B%bnpuU1Ga8(xERg#%aYO`d1IA`}rQ`M}&_9G_G
zlAohMbUfVR%goI5qK3tSloP$zfl}jOvT!ctJbv-w#Q<uU|HO$C*F^``2=2?Y-zu3o
z<gsSN$LP|Iloh=~GF7ZOTz;m>`9!rQH7S(=nLX83vrXEPU#!$D=TsqQ)`zW2$cX(!
z#9|mE)#ABFT8dv>o+$8|h{c$ehe~YrnZ#y5$OPnEujzSz_`Cddg!L~YRLhGqEe>6l
zKj9cK5ey3Y1pSZmml98-Y@L=r<#3wduqfZK<xe)A>`ym-$bXUJ)PBIne+3u-Y^mm;
TZ*tsI00000NkvXXu0mjfuoP_o

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-7.png b/osu.Game.Tests/Resources/old-skin/score-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..a23f5379b223d61079e055162fdd93f107f0ec02
GIT binary patch
literal 1910
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-8.png b/osu.Game.Tests/Resources/old-skin/score-8.png
new file mode 100644
index 0000000000000000000000000000000000000000..430b18509d3b38dba358be5c825d62b5e3e96134
GIT binary patch
literal 3652
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
WlYXW<G5A^l0000<MNUMnLSTZTCi=1f

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-9.png b/osu.Game.Tests/Resources/old-skin/score-9.png
new file mode 100644
index 0000000000000000000000000000000000000000..add1202c31255cdf492a9f8bcdfeb21d105e8ef9
GIT binary patch
literal 3561
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-comma.png b/osu.Game.Tests/Resources/old-skin/score-comma.png
new file mode 100644
index 0000000000000000000000000000000000000000..f68d32957ff8dc2e6e26e2b739eab85385548faf
GIT binary patch
literal 865
zcmV-n1D^beP)<h;3K|Lk000e1NJLTq000vJ002A)1^@s6gsOor0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#14%?dRCwC#m`zUGKorNvj_nX=O4AUM
zHmRaYfI`Iq2=p4<pi;M-g41w_?t;_}0;O5eC=gZoE-g?8C${^4?we@hIILK7;gSB>
z8ION{U-N9C`MxinYv|$`M+}Q$F)W6~uoxD@Vpt6OzhDOaIXgR>o2*u=8V;)D@TF?C
z+T17S{{H?ym;%w+TADXmhT?$-O-NWvN0;UR_GXqT)+8VcT7_OfX+F1jnFIZS?x8!#
zh8}URz_+nygyLs1<TaFs3VgoGYX~%gdQgYY$=&gsWeiI~>rfHeIXpZ(*xcNFpGu`(
zwcG8nVHo$9mzUrA{eGSAow*&jOrP%XnP4jnsY0KQkB@6tS64o6^aq1MaO`wCezV#1
zPfkt<_8IyJm7o-H)Y71MrP!@^ySuwPg+f7WY;1^ZHX9uC`MfBVO5*6~=mXZgWiM7_
zg2J#BUQj3&i!V*nT&N{Y(}Zo?<X(njY0B~m!;+kU?B3oULS!t!T-OyB7Z)CTVXAeg
zEA^$8MLLm41XhH{bUGEI(a2W|m^HIZ))+l0SuU3|1dAF3Ycv{TE{8{&;;b&f$S(^)
zPCo_f^?DCnbB|mWb1+@8%tD$iUDubwP$Ivcf@#WrOm1&)FSTqknTUG5-ecG}%FQ{;
z*4EY{Eu%~hheL6T!TZu-*g^u-Zec{h$i?&XbDuZ5EfXNSMmPb1b(KoRigJ@+H#avF
zqX)$@H{5B}g7Pw%j93Ok@X0EffJm6nlXTIBi_>M9#738`=bqh+giU0>f>loV9|82+
zaU80#CVuw0IXW_vYCm)NDP(>JPj7d--Su=j9k?q&C<*&31~<mve9sJ~(L(G&lUsBS
zDnk|Q*MqICt({yhm%(+f)oNXzo}PZewFdMZ`T_l<TBDZ>y-*}fwjTm!p*P&Jvpnyz
z)m?^=o3|X6i423GymcH7s?X++lz!!LDcrGp4_y83T(4ux)LkG8*W#nj518@;Wz|pB
rcm*5<CX||!J0kK0tU^@SUjYUHNv2`hoe|eD00000NkvXXu0mjf`J|EL

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-dot.png b/osu.Game.Tests/Resources/old-skin/score-dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..80c39b874533f1996978af8ada97133b743870a8
GIT binary patch
literal 771
zcmV+e1N{7nP)<h;3K|Lk000e1NJLTq000sI002A)1^@s6YiQ~b0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!rAb6VRCwC#n7@w_K@`V#*;_mj;;F2}
zKtgfXoSGO53StEfv9_@@v7z!mkb+L+Pq3Ae%8G=71PPSHXtWRvM#STX5JZmKU3UDw
z&0DkHp_iDebSL>_XP0^3eKYf&7eE$5NN3S}(it^R$P@B}JRwiW6Y_*SAy4SP5!!0C
zTE9F<CX+HQGQY&>JKtC>>NlHB>x7U?fC3eMrUE}-6&6|p1Lzp5^Zgp4;-?Tka0Ir&
z1rTBaEJ%Zoz;`eQ3$UbTh&3rgX9|7}x(Kd<2wyLO^E@RI`3er0F^e8jrdymkWwHaJ
zU>EG6-At#`*8_n7WhgqG&Jb^YGairM;r=~O+gUez%_x%?%@8~chr`cux!mVouO}vx
ziI~l1Vmh6Q;czJ0?Y5Q8W=ZG?xDRe~_LPX7{ta*sJS`LoBN8x8Qyg!)u8YB7AXw}%
zxJ%jddP>*89q=fXO1<p&`x`~vVw4#&e~y?3oYfUt=yR;7WipxlP$(oRit=0Isj4bP
zqfr@SZ{hYb@3QK1ZF?vdiv?)lX^qBcnzrMzhvIX&*zTkK^;si_>TEF6vaC~s48xE{
zqtTROY?u4ELr$I4>-A5|<x=|7k3kZ_hFFzKrA;wxRD*<8U<L-|a=G4UG**knLfVuW
zXCf7gMaP&2>~39QXWMIpY}VCkbsmq$cd@;G3M5vml{BBvrEa%t<@5R1rBdky#=iw0
zIjg12+aCmBcDQpy_7jQ3UL+DBYmj&PwOZ{J`d!cgAHWx$%}VBs{OkvExyH8F_z-XN
zhAjBd4tYuwo)#^QA>$xAWkltmAR9EuCtu}5>6DRg%ppIcnq=Aa2%R;=oZ@xF169W7
zDr`CzH^QVBIE8JK`;M1drwJD)wp9Li|3LU5zyS0^RhH-3lmq|(002ovPDHLkV1mea
BUy%R+

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-percent.png b/osu.Game.Tests/Resources/old-skin/score-percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc750abc7e80287192efb65633e58b6b19e47125
GIT binary patch
literal 4904
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
aBftRVw!D&5)M2&&0000<MNUMnLSTaY-$WSz

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/score-x.png b/osu.Game.Tests/Resources/old-skin/score-x.png
new file mode 100644
index 0000000000000000000000000000000000000000..779773f8bdedd6c382b39e66b967b206cc5cdbda
GIT binary patch
literal 2536
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/scorebar-bg.png b/osu.Game.Tests/Resources/old-skin/scorebar-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e94f464ca497c1eb0645586af13f489c28bf6f3
GIT binary patch
literal 7087
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/scorebar-colour-0.png b/osu.Game.Tests/Resources/old-skin/scorebar-colour-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..1119ce289e0bf1f5e7d4aba634d5b42c169c32fc
GIT binary patch
literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq00M>p000dL0ssI2y8t*G0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzb4f%&RCwC#+rdtQKomyd|594)!lZz&
z=nMK_L!yZ>F@j|%O43XjXj74#FI`;6fzpk~S=1WINrg_BnVH9Dlg!W7&UMnyiC<4n
zbF=B^RNAz!<F$vKpHsh{wL_Eod+w#3UvHE@O8fTZYL&V4pgL3ar6TuxGPzIX#|PTB
zbM>L3o40cB%1c@5@AIaj?BDlQ#gm_p&r|uidw$nmYx<q#fAceU>*Zh$?YX?p%*;GG
zSME6xfV;7Y8|-Y^#y2na!vVOABm>Jx)1<!I%`!+w0g?<5?7@!~ms_K&z-l#mA<4k<
z4$wCJLaGdKN(OLkp)GJ+4n^0(AvR(SkYoViaK=V*w93Ps7IAO8<p%;ll7UrpI#f`L
z$e;yE9~o}~43K01SEes2*mtih*#<~5@DCFkc?j0oSCD5Pix>Sr1^|)_{7IKAdb3UM
zI!OdbGJu(f;~9OmDQ^@r({X?#1DF=W_$mWf$zO%Tw*UhGi7fzzR>awB00000NkvXX
Hu0mjf)F0A(

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/scorebar-colour-1.png b/osu.Game.Tests/Resources/old-skin/scorebar-colour-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7669474d8bcce7afd6a0bc8c247b2c0ccef46c22
GIT binary patch
literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq00M>p000dL0ssI2y8t*G0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzeMv+?RCwC#+uKfqKoo`HwP^v37s}Mv
z^v!%U1!Ihfi4kX}CPfX0X%(^kzi_c2n-*@mIwiGMK`l9bAd|@>+2kxH3;8PBW#@C;
z{Cu^Jc@@viL-4zIex{JtVGGC4)cTyOZsjiG@m%+Q=2AMB3N?PF(pxDjRlkO;GHmsW
zDi?wks-NXH;lwsq^CWj2U&p`iW6Y~g&f;}G#QE*L)Y`aRc23sGTTLhT%?uwWlgXpm
zbdw3dY%FoWz8$vl;l<t@fMHZJu#9R->R0=*8l*=7DjA@#JG(ZmZjD|Aj#jH%Dj8Vb
z0@~6~q?G|y$p8**XzN)n_m!^o7qL;+0F?}&zc{Cs<Y+5*CoSb-et%&PfJz4bNl*7Q
zo23@8CAOs{Unu}8892$s^zf7&P@DF**A9S61{PJZQ#$qY@74BYCUsf7=<gT+sAOQC
zQrhpo#Tt8xJlA7m08}z?8jIsS`qfh2XiBEX0V)|lS{Y7nWdKL=sZhNOFaR0c{GFYk
RsrCQ>002ovPDHLkV1lE5)RO=J

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/scorebar-colour-2.png b/osu.Game.Tests/Resources/old-skin/scorebar-colour-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..70fdb4b14637abdf6237c4bf883fac33542d91f1
GIT binary patch
literal 466
zcmV;@0WJQCP)<h;3K|Lk000e1NJLTq00M>p000dL0ssI2y8t*G0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzbV)=(RCwC#o83->Fc^m45BKBF0C$_a
zGcQd`G{%^iSZSw`Wa%hu62#{T2XC9NWt{Nvv0z?bIH@L+$vN5NEM^PGL-C!9SaTCX
zJA5o+j>AyD4&h@JYqruV9Br;{rFG10%`RlWm220Q(nhwE^D0YOyQH0eS6zqTH)`Hg
z?PZ&|_Eq&>KJL@JgsgaK_uR=(F&}?t6ZeTU?k78^yG}mNTPLS#&d-y{<lbyL6as+B
zuz>}3GHw0Ev%NR~I1fq&n1`AM`PHtbK|Bh8k^vBQXJ~o4HM|P2SiJ60GQj*AXdAu|
zD+ACa1Hh$*wnV#}lCGsiY{(h_B?CZOoVk+hwQ{%8GWND>UJwAFWPn9@I%QDH(4Zwu
zpDAwy41kgW;6n9f343z8qHO?_4DbgPo7n{G<P+r4ZSkz1F#rH1156{Oao-lJ?_cC!
zctH&SC>h`%H^(FVYC}$xlkqqJN(O*oGR(I!04(ILP<;w80AoP?p8+Di_5c6?07*qo
IM6N<$f~e2NAOHXW

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/scorebar-colour-3.png b/osu.Game.Tests/Resources/old-skin/scorebar-colour-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..18ac6976c95a162914d6cdd371abf71aca48c72a
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq00M>p000dL0ssI2y8t*G0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUza!Eu%RCwC#o54<lKomvq1KQe{m@w^c
z`e*)HsWHZdMv$3`AtvAqHMAw?gvHI{0W*toc#GOWa{8tslgTmJ{NZy5b=Ku9)J-n;
zp~*uoLcPm%(dCU)_{0AOw;``p)pGZ0+Ed%m^B`+a-RbZtS4x}E^C7oWvzAsmzWeO2
zU8#Cgx%b%$Rj;9*hiARW?YsOO>Zf&9a$#fb!hdqhv6oME>*b-I@j97I{xk2~V<rHY
z4NGjW(FRMr`K31p0OO!!fa_3Gl3(q@iv<9b46rz1+wkmb(f-7%0Jl%0CzK3ueFL<m
zUx<|fn34hDTtnNyxI84?m>y&efRX{Q>@;ykS-Ib75%;$L+z<euWPn9@ddQ#_p+Ork
zeWbh*FaSyhfHTz>CG6SlinakzGQbTgHgX8=7426~>R5c$-xvUZk^$zC(&YaZTe{a#
zA^=JTfQiHL1ixC!gJLos2SCXHkS4=;D+9nn-U{WH00RIwRsWn@QMIQ40000<MNUMn
GLSTYhywfBA

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/scorebar-ki.png b/osu.Game.Tests/Resources/old-skin/scorebar-ki.png
new file mode 100644
index 0000000000000000000000000000000000000000..a030c5801e76f56c80f0782ed6cf2bcc7de0a5a6
GIT binary patch
literal 8579
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
JPDHLkV1iG9rlSA=

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/scorebar-kidanger.png b/osu.Game.Tests/Resources/old-skin/scorebar-kidanger.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac5a2c5893b635520d3f8e3804ff87101664d591
GIT binary patch
literal 7361
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/scorebar-kidanger2.png b/osu.Game.Tests/Resources/old-skin/scorebar-kidanger2.png
new file mode 100644
index 0000000000000000000000000000000000000000..507be0463f0732a07aa7df87cd57c1f273c7d55b
GIT binary patch
literal 9360
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
KMNUMnLSTX<h9m(1

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/old-skin/skin.ini b/osu.Game.Tests/Resources/old-skin/skin.ini
new file mode 100644
index 0000000000..5369de24e9
--- /dev/null
+++ b/osu.Game.Tests/Resources/old-skin/skin.ini
@@ -0,0 +1,2 @@
+[General]
+Version: 1.0
\ No newline at end of file

From 5803c72b4ca80d1990ad756765a482d0d5e32174 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 16:29:10 +0900
Subject: [PATCH 05519/10326] Add support for old marker style danger textures

---
 osu.Game/Skinning/LegacyHealthDisplay.cs | 27 +++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 7d9a1dfc15..0da2de4f09 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -84,17 +84,42 @@ namespace osu.Game.Skinning
 
         public class LegacyOldStyleMarker : LegacyMarker
         {
+            private readonly Sprite sprite;
+
+            private readonly Texture normalTexture;
+            private readonly Texture dangerTexture;
+            private readonly Texture superDangerTexture;
+
             public LegacyOldStyleMarker(Skin skin)
             {
+                normalTexture = getTexture(skin, "ki");
+                dangerTexture = getTexture(skin, "kidanger");
+                superDangerTexture = getTexture(skin, "kidanger2");
+
                 InternalChildren = new Drawable[]
                 {
-                    new Sprite
+                    sprite = new Sprite
                     {
                         Texture = getTexture(skin, "ki"),
                         Origin = Anchor.Centre,
                     }
                 };
             }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                Current.BindValueChanged(hp =>
+                {
+                    if (hp.NewValue < 0.2f)
+                        sprite.Texture = superDangerTexture;
+                    else if (hp.NewValue < 0.5f)
+                        sprite.Texture = dangerTexture;
+                    else
+                        sprite.Texture = normalTexture;
+                });
+            }
         }
 
         public class LegacyNewStyleMarker : LegacyMarker

From 8104bd0f74b0874d6cc5f38f6aec0479aee4587b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 16:45:28 +0900
Subject: [PATCH 05520/10326] Add fill colour changes

---
 osu.Game/Skinning/LegacyHealthDisplay.cs | 76 +++++++++++++++++++-----
 1 file changed, 60 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 0da2de4f09..f44dd2b864 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -12,14 +12,15 @@ using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
     public class LegacyHealthDisplay : CompositeDrawable, IHealthDisplay
     {
         private readonly Skin skin;
-        private Drawable fill;
-        private LegacyMarker marker;
+        private LegacyHealthPiece fill;
+        private LegacyHealthPiece marker;
 
         private float maxFillWidth;
 
@@ -63,7 +64,9 @@ namespace osu.Game.Skinning
                 });
             }
 
+            fill.Current.BindTo(Current);
             marker.Current.BindTo(Current);
+
             maxFillWidth = fill.Width;
         }
 
@@ -82,7 +85,18 @@ namespace osu.Game.Skinning
 
         private static Texture getTexture(Skin skin, string name) => skin.GetTexture($"scorebar-{name}");
 
-        public class LegacyOldStyleMarker : LegacyMarker
+        private static Color4 getFillColour(double hp)
+        {
+            if (hp < 0.2)
+                return Interpolation.ValueAt(0.2 - hp, Color4.Black, Color4.Red, 0, 0.2);
+
+            if (hp < 0.5)
+                return Interpolation.ValueAt(0.5 - hp, Color4.White, Color4.Black, 0, 0.5);
+
+            return Color4.White;
+        }
+
+        public class LegacyOldStyleMarker : LegacyHealthPiece
         {
             private readonly Sprite sprite;
 
@@ -92,6 +106,8 @@ namespace osu.Game.Skinning
 
             public LegacyOldStyleMarker(Skin skin)
             {
+                Origin = Anchor.Centre;
+
                 normalTexture = getTexture(skin, "ki");
                 dangerTexture = getTexture(skin, "kidanger");
                 superDangerTexture = getTexture(skin, "kidanger2");
@@ -120,39 +136,46 @@ namespace osu.Game.Skinning
                         sprite.Texture = normalTexture;
                 });
             }
+
+            public override void Flash(JudgementResult result)
+            {
+                this.ScaleTo(1.4f).Then().ScaleTo(1, 200, Easing.Out);
+            }
         }
 
-        public class LegacyNewStyleMarker : LegacyMarker
+        public class LegacyNewStyleMarker : LegacyHealthPiece
         {
+            private readonly Sprite sprite;
+
             public LegacyNewStyleMarker(Skin skin)
             {
+                Origin = Anchor.Centre;
+
                 InternalChildren = new Drawable[]
                 {
-                    new Sprite
+                    sprite = new Sprite
                     {
                         Texture = getTexture(skin, "marker"),
                         Origin = Anchor.Centre,
                     }
                 };
             }
-        }
 
-        public class LegacyMarker : CompositeDrawable, IHealthDisplay
-        {
-            public Bindable<double> Current { get; } = new Bindable<double>();
-
-            public LegacyMarker()
+            protected override void Update()
             {
-                Origin = Anchor.Centre;
+                base.Update();
+
+                sprite.Colour = getFillColour(Current.Value);
+                sprite.Blending = Current.Value < 0.5f ? BlendingParameters.Inherit : BlendingParameters.Additive;
             }
 
-            public void Flash(JudgementResult result)
+            public override void Flash(JudgementResult result)
             {
                 this.ScaleTo(1.4f).Then().ScaleTo(1, 200, Easing.Out);
             }
         }
 
-        internal class LegacyOldStyleFill : CompositeDrawable
+        internal class LegacyOldStyleFill : LegacyHealthPiece
         {
             public LegacyOldStyleFill(Skin skin)
             {
@@ -175,12 +198,33 @@ namespace osu.Game.Skinning
             }
         }
 
-        internal class LegacyNewStyleFill : Sprite
+        internal class LegacyNewStyleFill : LegacyHealthPiece
         {
             public LegacyNewStyleFill(Skin skin)
             {
-                Texture = getTexture(skin, "colour");
+                InternalChild = new Sprite
+                {
+                    Texture = getTexture(skin, "colour"),
+                };
+
+                Size = InternalChild.Size;
                 Position = new Vector2(7.5f, 7.8f) * 1.6f;
+                Masking = true;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                this.Colour = getFillColour(Current.Value);
+            }
+        }
+
+        public class LegacyHealthPiece : CompositeDrawable, IHealthDisplay
+        {
+            public Bindable<double> Current { get; } = new Bindable<double>();
+
+            public virtual void Flash(JudgementResult result)
+            {
             }
         }
     }

From 9572260e6da84c1a4b762a5a16376e4b4fcaafa0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 17:09:00 +0900
Subject: [PATCH 05521/10326] Add bulge and explode support

---
 osu.Game/Skinning/LegacyHealthDisplay.cs | 114 ++++++++++++++---------
 1 file changed, 72 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index f44dd2b864..fece590f03 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -96,32 +96,25 @@ namespace osu.Game.Skinning
             return Color4.White;
         }
 
-        public class LegacyOldStyleMarker : LegacyHealthPiece
+        public class LegacyOldStyleMarker : LegacyMarker
         {
-            private readonly Sprite sprite;
-
             private readonly Texture normalTexture;
             private readonly Texture dangerTexture;
             private readonly Texture superDangerTexture;
 
             public LegacyOldStyleMarker(Skin skin)
             {
-                Origin = Anchor.Centre;
-
                 normalTexture = getTexture(skin, "ki");
                 dangerTexture = getTexture(skin, "kidanger");
                 superDangerTexture = getTexture(skin, "kidanger2");
-
-                InternalChildren = new Drawable[]
-                {
-                    sprite = new Sprite
-                    {
-                        Texture = getTexture(skin, "ki"),
-                        Origin = Anchor.Centre,
-                    }
-                };
             }
 
+            public override Sprite CreateSprite() => new Sprite
+            {
+                Texture = normalTexture,
+                Origin = Anchor.Centre,
+            };
+
             protected override void LoadComplete()
             {
                 base.LoadComplete();
@@ -129,49 +122,36 @@ namespace osu.Game.Skinning
                 Current.BindValueChanged(hp =>
                 {
                     if (hp.NewValue < 0.2f)
-                        sprite.Texture = superDangerTexture;
+                        Main.Texture = superDangerTexture;
                     else if (hp.NewValue < 0.5f)
-                        sprite.Texture = dangerTexture;
+                        Main.Texture = dangerTexture;
                     else
-                        sprite.Texture = normalTexture;
+                        Main.Texture = normalTexture;
                 });
             }
-
-            public override void Flash(JudgementResult result)
-            {
-                this.ScaleTo(1.4f).Then().ScaleTo(1, 200, Easing.Out);
-            }
         }
 
-        public class LegacyNewStyleMarker : LegacyHealthPiece
+        public class LegacyNewStyleMarker : LegacyMarker
         {
-            private readonly Sprite sprite;
+            private readonly Skin skin;
 
             public LegacyNewStyleMarker(Skin skin)
             {
-                Origin = Anchor.Centre;
-
-                InternalChildren = new Drawable[]
-                {
-                    sprite = new Sprite
-                    {
-                        Texture = getTexture(skin, "marker"),
-                        Origin = Anchor.Centre,
-                    }
-                };
+                this.skin = skin;
             }
 
+            public override Sprite CreateSprite() => new Sprite
+            {
+                Texture = getTexture(skin, "marker"),
+                Origin = Anchor.Centre,
+            };
+
             protected override void Update()
             {
                 base.Update();
 
-                sprite.Colour = getFillColour(Current.Value);
-                sprite.Blending = Current.Value < 0.5f ? BlendingParameters.Inherit : BlendingParameters.Additive;
-            }
-
-            public override void Flash(JudgementResult result)
-            {
-                this.ScaleTo(1.4f).Then().ScaleTo(1, 200, Easing.Out);
+                Main.Colour = getFillColour(Current.Value);
+                Main.Blending = Current.Value < 0.5f ? BlendingParameters.Inherit : BlendingParameters.Additive;
             }
         }
 
@@ -215,10 +195,60 @@ namespace osu.Game.Skinning
             protected override void Update()
             {
                 base.Update();
-                this.Colour = getFillColour(Current.Value);
+                Colour = getFillColour(Current.Value);
             }
         }
 
+        public abstract class LegacyMarker : LegacyHealthPiece
+        {
+            protected Sprite Main;
+
+            private Sprite explode;
+
+            protected LegacyMarker()
+            {
+                Origin = Anchor.Centre;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                InternalChildren = new Drawable[]
+                {
+                    Main = CreateSprite(),
+                    explode = CreateSprite().With(s =>
+                    {
+                        s.Alpha = 0;
+                        s.Blending = BlendingParameters.Additive;
+                    }),
+                };
+            }
+
+            public abstract Sprite CreateSprite();
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                Current.BindValueChanged(val =>
+                {
+                    if (val.NewValue > val.OldValue)
+                        bulgeMain();
+                });
+            }
+
+            public override void Flash(JudgementResult result)
+            {
+                bulgeMain();
+
+                explode.FadeOutFromOne(120);
+                explode.ScaleTo(1).Then().ScaleTo(Current.Value > 0.5f ? 2 : 1.6f, 120);
+            }
+
+            private void bulgeMain() =>
+                Main.ScaleTo(1.4f).Then().ScaleTo(1, 200, Easing.Out);
+        }
+
         public class LegacyHealthPiece : CompositeDrawable, IHealthDisplay
         {
             public Bindable<double> Current { get; } = new Bindable<double>();

From 77bf050a80733bba4b3a5a6434dc66dad933555e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 17:24:43 +0900
Subject: [PATCH 05522/10326] Ignore IgnoreHits for flashiness

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

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index ac74dc22d3..c3de249bf8 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -319,7 +319,7 @@ namespace osu.Game.Screens.Play
             {
                 processor.NewJudgement += judgement =>
                 {
-                    if (judgement.IsHit)
+                    if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
                         shd.Flash(judgement);
                 };
             }

From a1892aa0a7472605ea389bc48db9a465d484f4ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 17:24:56 +0900
Subject: [PATCH 05523/10326] Only additive flash explosions over the epic
 cutoff

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

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index fece590f03..489e23ab7a 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Skinning
 {
     public class LegacyHealthDisplay : CompositeDrawable, IHealthDisplay
     {
+        private const double epic_cutoff = 0.5;
+
         private readonly Skin skin;
         private LegacyHealthPiece fill;
         private LegacyHealthPiece marker;
@@ -90,7 +92,7 @@ namespace osu.Game.Skinning
             if (hp < 0.2)
                 return Interpolation.ValueAt(0.2 - hp, Color4.Black, Color4.Red, 0, 0.2);
 
-            if (hp < 0.5)
+            if (hp < epic_cutoff)
                 return Interpolation.ValueAt(0.5 - hp, Color4.White, Color4.Black, 0, 0.5);
 
             return Color4.White;
@@ -123,7 +125,7 @@ namespace osu.Game.Skinning
                 {
                     if (hp.NewValue < 0.2f)
                         Main.Texture = superDangerTexture;
-                    else if (hp.NewValue < 0.5f)
+                    else if (hp.NewValue < epic_cutoff)
                         Main.Texture = dangerTexture;
                     else
                         Main.Texture = normalTexture;
@@ -151,7 +153,7 @@ namespace osu.Game.Skinning
                 base.Update();
 
                 Main.Colour = getFillColour(Current.Value);
-                Main.Blending = Current.Value < 0.5f ? BlendingParameters.Inherit : BlendingParameters.Additive;
+                Main.Blending = Current.Value < epic_cutoff ? BlendingParameters.Inherit : BlendingParameters.Additive;
             }
         }
 
@@ -241,8 +243,11 @@ namespace osu.Game.Skinning
             {
                 bulgeMain();
 
+                bool isEpic = Current.Value >= epic_cutoff;
+
+                explode.Blending = isEpic ? BlendingParameters.Additive : BlendingParameters.Inherit;
+                explode.ScaleTo(1).Then().ScaleTo(isEpic ? 2 : 1.6f, 120);
                 explode.FadeOutFromOne(120);
-                explode.ScaleTo(1).Then().ScaleTo(Current.Value > 0.5f ? 2 : 1.6f, 120);
             }
 
             private void bulgeMain() =>

From de60374c88a5521cfeeb6d5d0d942b0cd1a719c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 17:26:14 +0900
Subject: [PATCH 05524/10326] Remove unused using

---
 .../Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index 181fc8ce98..e1b0820662 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Screens.Play;
-using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {

From 05f1017c282317d848265d15564ed8e48c7582f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 17:35:21 +0900
Subject: [PATCH 05525/10326] Fix lookup check not being updated to use prefix

---
 osu.Game/Skinning/LegacySkin.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index f5265f2d6e..06539d0f63 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -325,9 +325,9 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        private const string score_font = "score";
+        private string scorePrefix => GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score";
 
-        private bool hasScoreFont => this.HasFont(score_font);
+        private bool hasScoreFont => this.HasFont(scorePrefix);
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
@@ -351,7 +351,6 @@ namespace osu.Game.Skinning
 
                         case HUDSkinComponents.ScoreText:
                         case HUDSkinComponents.AccuracyText:
-                            string scorePrefix = GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score";
                             int scoreOverlap = GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ScoreOverlap)?.Value ?? -2;
                             return new LegacySpriteText(this, scorePrefix)
                             {

From e9c4b67cf4688154c1b044b20335a772103e996f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 17:35:35 +0900
Subject: [PATCH 05526/10326] Inline variable

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

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 06539d0f63..22ddd45851 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -351,10 +351,9 @@ namespace osu.Game.Skinning
 
                         case HUDSkinComponents.ScoreText:
                         case HUDSkinComponents.AccuracyText:
-                            int scoreOverlap = GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ScoreOverlap)?.Value ?? -2;
                             return new LegacySpriteText(this, scorePrefix)
                             {
-                                Spacing = new Vector2(-scoreOverlap, 0)
+                                Spacing = new Vector2(-(GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ScoreOverlap)?.Value ?? -2), 0)
                             };
                     }
 

From 3ce6d1fea103cf3c3d96df2f77684ffa6964cd4f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 17:36:15 +0900
Subject: [PATCH 05527/10326] Remove unnecessary AccuracyText enum

All elements use "score" regardless.
---
 osu.Game/Skinning/HUDSkinComponents.cs     | 1 -
 osu.Game/Skinning/LegacyAccuracyCounter.cs | 2 +-
 osu.Game/Skinning/LegacySkin.cs            | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index 6ec575e106..cb35425981 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -9,6 +9,5 @@ namespace osu.Game.Skinning
         ScoreCounter,
         ScoreText,
         AccuracyCounter,
-        AccuracyText
     }
 }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 6c194a06d3..27d5aa4dbd 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Skinning
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyText)) as OsuSpriteText ?? new OsuSpriteText();
+        protected sealed override OsuSpriteText CreateSpriteText() => skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) as OsuSpriteText ?? new OsuSpriteText();
 
         protected override void Update()
         {
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 22ddd45851..cd9809a22b 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -350,7 +350,6 @@ namespace osu.Game.Skinning
                             return new LegacyAccuracyCounter(this);
 
                         case HUDSkinComponents.ScoreText:
-                        case HUDSkinComponents.AccuracyText:
                             return new LegacySpriteText(this, scorePrefix)
                             {
                                 Spacing = new Vector2(-(GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ScoreOverlap)?.Value ?? -2), 0)

From 24b0a1b84b75b4ea10b92e54aaa6066b08e4452a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 17:38:21 +0900
Subject: [PATCH 05528/10326] Switch to direct casts (we can be sure
 LegacySpriteText is present at this point)

---
 osu.Game/Skinning/LegacyAccuracyCounter.cs | 2 +-
 osu.Game/Skinning/LegacyScoreCounter.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 27d5aa4dbd..a4a432ece2 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Skinning
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) as OsuSpriteText ?? new OsuSpriteText();
+        protected sealed override OsuSpriteText CreateSpriteText() => (OsuSpriteText)skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText));
 
         protected override void Update()
         {
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 41bf35722b..39c90211f2 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -31,6 +31,6 @@ namespace osu.Game.Skinning
             Margin = new MarginPadding(10);
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) as OsuSpriteText ?? new OsuSpriteText();
+        protected sealed override OsuSpriteText CreateSpriteText() => (OsuSpriteText)skin.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText));
     }
 }

From a774de2270c722de1d00c4cdef37a7d9f38c2aeb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 17:40:15 +0900
Subject: [PATCH 05529/10326] Also add support in LegacyComboCounter

---
 osu.Game/Screens/Play/HUD/LegacyComboCounter.cs | 3 ++-
 osu.Game/Skinning/HUDSkinComponents.cs          | 1 +
 osu.Game/Skinning/LegacySkin.cs                 | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index cc9398bc35..4784bca7dd 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -246,6 +247,6 @@ namespace osu.Game.Screens.Play.HUD
             return difference * rolling_duration;
         }
 
-        private Drawable createSpriteText() => new LegacySpriteText(skin);
+        private OsuSpriteText createSpriteText() => (OsuSpriteText)skin.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ComboText));
     }
 }
diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index cb35425981..c5dead7858 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -8,6 +8,7 @@ namespace osu.Game.Skinning
         ComboCounter,
         ScoreCounter,
         ScoreText,
+        ComboText,
         AccuracyCounter,
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index cd9809a22b..db7307b3fe 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -327,6 +327,8 @@ namespace osu.Game.Skinning
 
         private string scorePrefix => GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score";
 
+        private string comboPrefix => GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ComboPrefix)?.Value ?? "score";
+
         private bool hasScoreFont => this.HasFont(scorePrefix);
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
@@ -349,6 +351,12 @@ namespace osu.Game.Skinning
                         case HUDSkinComponents.AccuracyCounter:
                             return new LegacyAccuracyCounter(this);
 
+                        case HUDSkinComponents.ComboText:
+                            return new LegacySpriteText(this, comboPrefix)
+                            {
+                                Spacing = new Vector2(-(GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ComboOverlap)?.Value ?? -2), 0)
+                            };
+
                         case HUDSkinComponents.ScoreText:
                             return new LegacySpriteText(this, scorePrefix)
                             {

From 8a3bce3cc3efe0fbfd07bda9ad9fb3ec6c6b528c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 18:19:09 +0900
Subject: [PATCH 05530/10326] Fix osu!catch showing two combo counters for
 legacy skins

---
 .../Skinning/CatchLegacySkinTransformer.cs    | 19 ++++++++++++++++---
 osu.Game/Screens/Play/Player.cs               |  6 +++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 916b4c5192..22db147e32 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -13,6 +13,11 @@ namespace osu.Game.Rulesets.Catch.Skinning
 {
     public class CatchLegacySkinTransformer : LegacySkinTransformer
     {
+        /// <summary>
+        /// For simplicity, let's use legacy combo font texture existence as a way to identify legacy skins from default.
+        /// </summary>
+        private bool providesComboCounter => this.HasFont(GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score");
+
         public CatchLegacySkinTransformer(ISkinSource source)
             : base(source)
         {
@@ -20,6 +25,16 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
+            if (component is HUDSkinComponent hudComponent)
+            {
+                switch (hudComponent.Component)
+                {
+                    case HUDSkinComponents.ComboCounter:
+                        // catch may provide its own combo counter; hide the default.
+                        return providesComboCounter ? Drawable.Empty() : null;
+                }
+            }
+
             if (!(component is CatchSkinComponent catchSkinComponent))
                 return null;
 
@@ -55,10 +70,8 @@ namespace osu.Game.Rulesets.Catch.Skinning
                            this.GetAnimation("fruit-ryuuta", true, true, true);
 
                 case CatchSkinComponents.CatchComboCounter:
-                    var comboFont = GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
 
-                    // For simplicity, let's use legacy combo font texture existence as a way to identify legacy skins from default.
-                    if (this.HasFont(comboFont))
+                    if (providesComboCounter)
                         return new LegacyCatchComboCounter(Source);
 
                     break;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 56b212291a..df0a52a0e8 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -221,8 +221,12 @@ namespace osu.Game.Screens.Play
                 createGameplayComponents(Beatmap.Value, playableBeatmap)
             });
 
+            // also give the HUD a ruleset container to allow rulesets to potentially override HUD elements (used to disable combo counters etc.)
+            // we may want to limit this in the future to disallow rulesets from outright replacing elements the user expects to be there.
+            var hudRulesetContainer = new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(beatmapSkinProvider, playableBeatmap));
+
             // add the overlay components as a separate step as they proxy some elements from the above underlay/gameplay components.
-            GameplayClockContainer.Add(createOverlayComponents(Beatmap.Value));
+            GameplayClockContainer.Add(hudRulesetContainer.WithChild(createOverlayComponents(Beatmap.Value)));
 
             if (!DrawableRuleset.AllowGameplayOverlays)
             {

From 0437f7e7e982fef41611ab428c949744432a4a11 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 18:22:18 +0900
Subject: [PATCH 05531/10326] Delete outdated test scene

Has been replaced by the four new skinnable tests for each component.
---
 .../Visual/Gameplay/TestSceneScoreCounter.cs  | 68 -------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
deleted file mode 100644
index 34c657bf7f..0000000000
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Play.HUD;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.Gameplay
-{
-    [TestFixture]
-    public class TestSceneScoreCounter : OsuTestScene
-    {
-        public TestSceneScoreCounter()
-        {
-            int numerator = 0, denominator = 0;
-
-            ScoreCounter score = new DefaultScoreCounter
-            {
-                Origin = Anchor.TopRight,
-                Anchor = Anchor.TopRight,
-                Margin = new MarginPadding(20),
-            };
-            Add(score);
-
-            LegacyComboCounter comboCounter = new LegacyComboCounter
-            {
-                Origin = Anchor.BottomLeft,
-                Anchor = Anchor.BottomLeft,
-                Margin = new MarginPadding(10),
-            };
-            Add(comboCounter);
-
-            PercentageCounter accuracyCounter = new PercentageCounter
-            {
-                Origin = Anchor.TopRight,
-                Anchor = Anchor.TopRight,
-                Position = new Vector2(-20, 60),
-            };
-            Add(accuracyCounter);
-
-            AddStep(@"Reset all", delegate
-            {
-                score.Current.Value = 0;
-                comboCounter.Current.Value = 0;
-                numerator = denominator = 0;
-                accuracyCounter.SetFraction(0, 0);
-            });
-
-            AddStep(@"Hit! :D", delegate
-            {
-                score.Current.Value += 300 + (ulong)(300.0 * (comboCounter.Current.Value > 0 ? comboCounter.Current.Value - 1 : 0) / 25.0);
-                comboCounter.Current.Value++;
-                numerator++;
-                denominator++;
-                accuracyCounter.SetFraction(numerator, denominator);
-            });
-
-            AddStep(@"miss...", delegate
-            {
-                comboCounter.Current.Value = 0;
-                denominator++;
-                accuracyCounter.SetFraction(numerator, denominator);
-            });
-        }
-    }
-}

From cc1128314354b6393d5622f27dd032ac58e56968 Mon Sep 17 00:00:00 2001
From: Berkan Diler <b.diler@gmx.de>
Date: Fri, 16 Oct 2020 11:27:02 +0200
Subject: [PATCH 05532/10326] Use string.Starts-/EndsWith char overloads

---
 osu.Game/Database/ArchiveModelManager.cs     | 2 +-
 osu.Game/OsuGame.cs                          | 4 ++--
 osu.Game/Screens/Select/FilterQueryParser.cs | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index b947056ebd..8bdc804311 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -593,7 +593,7 @@ namespace osu.Game.Database
             var fileInfos = new List<TFileModel>();
 
             string prefix = reader.Filenames.GetCommonPrefix();
-            if (!(prefix.EndsWith("/", StringComparison.Ordinal) || prefix.EndsWith("\\", StringComparison.Ordinal)))
+            if (!(prefix.EndsWith('/') || prefix.EndsWith('\\')))
                 prefix = string.Empty;
 
             // import files to manager
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 56cced9c04..a0ddab702e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -181,7 +181,7 @@ namespace osu.Game
 
             if (args?.Length > 0)
             {
-                var paths = args.Where(a => !a.StartsWith(@"-", StringComparison.Ordinal)).ToArray();
+                var paths = args.Where(a => !a.StartsWith('-')).ToArray();
                 if (paths.Length > 0)
                     Task.Run(() => Import(paths));
             }
@@ -289,7 +289,7 @@ namespace osu.Game
 
         public void OpenUrlExternally(string url) => waitForReady(() => externalLinkOpener, _ =>
         {
-            if (url.StartsWith("/", StringComparison.Ordinal))
+            if (url.StartsWith('/'))
                 url = $"{API.Endpoint}{url}";
 
             externalLinkOpener.OpenUrlExternally(url);
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index fa2beb2652..4b6b3be45c 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -80,9 +80,9 @@ namespace osu.Game.Screens.Select
 
         private static int getLengthScale(string value) =>
             value.EndsWith("ms", StringComparison.Ordinal) ? 1 :
-            value.EndsWith("s", StringComparison.Ordinal) ? 1000 :
-            value.EndsWith("m", StringComparison.Ordinal) ? 60000 :
-            value.EndsWith("h", StringComparison.Ordinal) ? 3600000 : 1000;
+            value.EndsWith('s') ? 1000 :
+            value.EndsWith('m') ? 60000 :
+            value.EndsWith('h') ? 3600000 : 1000;
 
         private static bool parseFloatWithPoint(string value, out float result) =>
             float.TryParse(value, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);

From cbaad4eb56bf69a733b15c46f0332ec8b78f82cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 18:34:14 +0900
Subject: [PATCH 05533/10326] Adjust accuracy display to match stable

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

diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 9354b2b3bc..0d3adeb3ea 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Skinning
             Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
 
-            Scale = new Vector2(0.75f);
+            Scale = new Vector2(0.6f);
             Margin = new MarginPadding(10);
 
             this.skin = skin;

From 2ba8bc45fd1f68b54df68435eb0d88c3d28fff1c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Oct 2020 18:37:24 +0900
Subject: [PATCH 05534/10326] Also add slight adjustment to score display

---
 osu.Game/Skinning/LegacyScoreCounter.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index f94bef6652..93b50e0ac1 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -5,6 +5,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -28,6 +29,7 @@ namespace osu.Game.Skinning
             // base class uses int for display, but externally we bind to ScoreProcesssor as a double for now.
             Current.BindValueChanged(v => base.Current.Value = (int)v.NewValue);
 
+            Scale = new Vector2(0.96f);
             Margin = new MarginPadding(10);
         }
 

From fe3a23750c6bbda7427e765aa93007b1ee13a6b7 Mon Sep 17 00:00:00 2001
From: Berkan Diler <b.diler@gmx.de>
Date: Fri, 16 Oct 2020 11:52:29 +0200
Subject: [PATCH 05535/10326] Use char overloads for string methods

---
 osu.Game/Beatmaps/BeatmapInfo.cs                           | 2 +-
 osu.Game/Online/Chat/ChannelManager.cs                     | 2 +-
 osu.Game/Online/Chat/MessageFormatter.cs                   | 2 +-
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs  | 2 +-
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 2 +-
 osu.Game/Skinning/GameplaySkinComponent.cs                 | 2 +-
 osu.Game/Skinning/HUDSkinComponent.cs                      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index acab525821..8d1f0e59bf 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Beatmaps
         [JsonIgnore]
         public string StoredBookmarks
         {
-            get => string.Join(",", Bookmarks);
+            get => string.Join(',', Bookmarks);
             set
             {
                 if (string.IsNullOrEmpty(value))
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index f7ed57f207..16f46581c5 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Online.Chat
             if (target == null)
                 return;
 
-            var parameters = text.Split(new[] { ' ' }, 2);
+            var parameters = text.Split(' ', 2);
             string command = parameters[0];
             string content = parameters.Length == 2 ? parameters[1] : string.Empty;
 
diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 648e4a762b..d2a117876d 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Online.Chat
 
         public static LinkDetails GetLinkDetails(string url)
         {
-            var args = url.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+            var args = url.Split('/', StringSplitOptions.RemoveEmptyEntries);
             args[0] = args[0].TrimEnd(':');
 
             switch (args[0])
diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 946831d13b..ebee377a51 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Profile.Header
             if (string.IsNullOrEmpty(content)) return false;
 
             // newlines could be contained in API returned user content.
-            content = content.Replace("\n", " ");
+            content = content.Replace('\n', ' ');
 
             bottomLinkContainer.AddIcon(icon, text =>
             {
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 7dcbc52cea..44b22033dc 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 {
                     string[] ss = split[5].Split(':');
                     endTime = Math.Max(startTime, Parsing.ParseDouble(ss[0]));
-                    readCustomSampleBanks(string.Join(":", ss.Skip(1)), bankInfo);
+                    readCustomSampleBanks(string.Join(':', ss.Skip(1)), bankInfo);
                 }
 
                 result = CreateHold(pos, combo, comboOffset, endTime + Offset - startTime);
diff --git a/osu.Game/Skinning/GameplaySkinComponent.cs b/osu.Game/Skinning/GameplaySkinComponent.cs
index 2aa380fa90..80f6efc07a 100644
--- a/osu.Game/Skinning/GameplaySkinComponent.cs
+++ b/osu.Game/Skinning/GameplaySkinComponent.cs
@@ -18,6 +18,6 @@ namespace osu.Game.Skinning
         protected virtual string ComponentName => Component.ToString();
 
         public string LookupName =>
-            string.Join("/", new[] { "Gameplay", RulesetPrefix, ComponentName }.Where(s => !string.IsNullOrEmpty(s)));
+            string.Join('/', new[] { "Gameplay", RulesetPrefix, ComponentName }.Where(s => !string.IsNullOrEmpty(s)));
     }
 }
diff --git a/osu.Game/Skinning/HUDSkinComponent.cs b/osu.Game/Skinning/HUDSkinComponent.cs
index 041beb68f2..cc053421b7 100644
--- a/osu.Game/Skinning/HUDSkinComponent.cs
+++ b/osu.Game/Skinning/HUDSkinComponent.cs
@@ -17,6 +17,6 @@ namespace osu.Game.Skinning
         protected virtual string ComponentName => Component.ToString();
 
         public string LookupName =>
-            string.Join("/", new[] { "HUD", ComponentName }.Where(s => !string.IsNullOrEmpty(s)));
+            string.Join('/', new[] { "HUD", ComponentName }.Where(s => !string.IsNullOrEmpty(s)));
     }
 }

From 2586990301e0da95f5ffd272f942b86859bb595a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Oct 2020 23:19:34 +0900
Subject: [PATCH 05536/10326] 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 3df894fbcc..1d2cf22b28 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.904.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1009.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8b10f0a7f7..133855c6c4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <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.1009.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 88abbca73d..73faa8541e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1009.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.904.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 81cc5e1c42e787f906fda4c6c881474c74f33aac Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Oct 2020 23:31:01 +0900
Subject: [PATCH 05537/10326] Silence EF warning due to ordinal being
 unsupported

---
 osu.Game/Rulesets/RulesetStore.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index c12d418771..c4639375da 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -100,7 +100,8 @@ namespace osu.Game.Rulesets
                 {
                     // todo: StartsWith can be changed to Equals on 2020-11-08
                     // This is to give users enough time to have their database use new abbreviated info).
-                    if (context.RulesetInfo.FirstOrDefault(ri => ri.InstantiationInfo.StartsWith(r.RulesetInfo.InstantiationInfo, StringComparison.Ordinal)) == null)
+                    // ReSharper disable once StringStartsWithIsCultureSpecific (silences EF warning of ordinal being unsupported)
+                    if (context.RulesetInfo.FirstOrDefault(ri => ri.InstantiationInfo.StartsWith(r.RulesetInfo.InstantiationInfo)) == null)
                         context.RulesetInfo.Add(r.RulesetInfo);
                 }
 

From 6385d5f3692b95bbdcea9819292ce221e2795999 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Oct 2020 23:40:44 +0900
Subject: [PATCH 05538/10326] Replace with local tolist

---
 osu.Game/Rulesets/RulesetStore.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index c4639375da..d422bca087 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -96,12 +96,13 @@ namespace osu.Game.Rulesets
                 context.SaveChanges();
 
                 // add any other modes
+                var existingRulesets = context.RulesetInfo.ToList();
+
                 foreach (var r in instances.Where(r => !(r is ILegacyRuleset)))
                 {
                     // todo: StartsWith can be changed to Equals on 2020-11-08
                     // This is to give users enough time to have their database use new abbreviated info).
-                    // ReSharper disable once StringStartsWithIsCultureSpecific (silences EF warning of ordinal being unsupported)
-                    if (context.RulesetInfo.FirstOrDefault(ri => ri.InstantiationInfo.StartsWith(r.RulesetInfo.InstantiationInfo)) == null)
+                    if (existingRulesets.FirstOrDefault(ri => ri.InstantiationInfo.StartsWith(r.RulesetInfo.InstantiationInfo, StringComparison.Ordinal)) == null)
                         context.RulesetInfo.Add(r.RulesetInfo);
                 }
 

From bba9a0b2fe5be16ae37338cddb307121de41aaf1 Mon Sep 17 00:00:00 2001
From: unknown <n20gaming2000@gmail.com>
Date: Sat, 17 Oct 2020 00:25:16 +0800
Subject: [PATCH 05539/10326] set sprite text anchor and origin to top right

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

diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index e54c4e8eb4..fc7863fc4e 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -33,6 +33,6 @@ namespace osu.Game.Skinning
             Margin = new MarginPadding(10);
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => (OsuSpriteText)skin.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText));
+        protected sealed override OsuSpriteText CreateSpriteText() => ((OsuSpriteText)skin.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))).With(s => s.Anchor = s.Origin = Anchor.TopRight);
     }
 }

From b60dfc55b6625bea0f803c2ddd9d3c389d9ca7cb Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 16 Oct 2020 19:21:51 +0200
Subject: [PATCH 05540/10326] Apply review suggestions.

---
 osu.Android/GameplayScreenRotationLocker.cs | 6 +++---
 osu.Android/OsuGameActivity.cs              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android/GameplayScreenRotationLocker.cs b/osu.Android/GameplayScreenRotationLocker.cs
index d1f4caba52..07cca8c2f1 100644
--- a/osu.Android/GameplayScreenRotationLocker.cs
+++ b/osu.Android/GameplayScreenRotationLocker.cs
@@ -17,14 +17,14 @@ namespace osu.Android
         private void load(OsuGame game)
         {
             localUserPlaying = game.LocalUserPlaying.GetBoundCopy();
-            localUserPlaying.BindValueChanged(_ => updateLock());
+            localUserPlaying.BindValueChanged(userPlaying => updateLock(userPlaying));
         }
 
-        private void updateLock()
+        private void updateLock(ValueChangedEvent<bool> userPlaying)
         {
             OsuGameActivity.Activity.RunOnUiThread(() =>
             {
-                OsuGameActivity.Activity.RequestedOrientation = localUserPlaying.Value ? ScreenOrientation.Locked : ScreenOrientation.FullUser;
+                OsuGameActivity.Activity.RequestedOrientation = userPlaying.NewValue ? ScreenOrientation.Locked : ScreenOrientation.FullUser;
             });
         }
     }
diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index c2b28f3de4..d4d2b83502 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -12,7 +12,7 @@ namespace osu.Android
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
     public class OsuGameActivity : AndroidGameActivity
     {
-        internal static Activity Activity;
+        internal static Activity Activity { get; private set; }
 
         protected override Framework.Game CreateGame() => new OsuGameAndroid();
 

From e4463254d7feab088262dfb84826f4ce5a04ba43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 17 Oct 2020 15:29:30 +0200
Subject: [PATCH 05541/10326] Add test coverage for score counter alignment

---
 .../Visual/Gameplay/TestSceneSkinnableScoreCounter.cs      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
index 2d5003d1da..fc63340f20 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
@@ -43,5 +44,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                     s.Current.Value += 300;
             });
         }
+
+        [Test]
+        public void TestVeryLargeScore()
+        {
+            AddStep("set large score", () => scoreCounters.ForEach(counter => counter.Current.Value = 1_00_000_000));
+        }
     }
 }

From 0acc86f75724e6d1e5f348ee7878b7249be6078c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 17 Oct 2020 15:31:35 +0200
Subject: [PATCH 05542/10326] Split line for readability

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

diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index fc7863fc4e..5bffeff5a8 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Skinning
             Margin = new MarginPadding(10);
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => ((OsuSpriteText)skin.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))).With(s => s.Anchor = s.Origin = Anchor.TopRight);
+        protected sealed override OsuSpriteText CreateSpriteText()
+            => (OsuSpriteText)skin.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))
+                                  .With(s => s.Anchor = s.Origin = Anchor.TopRight);
     }
 }

From a5b0307cfb472342bb56a08548b8245d7a8604be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 17 Oct 2020 15:36:21 +0200
Subject: [PATCH 05543/10326] Apply same fix to legacy accuracy counter

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

diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 29d7046694..5eda374337 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -29,7 +29,9 @@ namespace osu.Game.Skinning
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => (OsuSpriteText)skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText));
+        protected sealed override OsuSpriteText CreateSpriteText()
+            => (OsuSpriteText)skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))
+                                  ?.With(s => s.Anchor = s.Origin = Anchor.TopRight);
 
         protected override void Update()
         {

From 8aeeed9402e2de7d6de6e477adc69bf914ed6f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 17 Oct 2020 15:47:37 +0200
Subject: [PATCH 05544/10326] Fix weird number formatting in test

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
index fc63340f20..e212ceeba7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestVeryLargeScore()
         {
-            AddStep("set large score", () => scoreCounters.ForEach(counter => counter.Current.Value = 1_00_000_000));
+            AddStep("set large score", () => scoreCounters.ForEach(counter => counter.Current.Value = 1_000_000_000));
         }
     }
 }

From 5b96f0156413e2694853b1a67557189fd4c7fb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 17 Oct 2020 14:53:29 +0200
Subject: [PATCH 05545/10326] Fix key counter actions displaying out of order

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index f2ac61eaf4..07de2bf601 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -136,7 +136,11 @@ namespace osu.Game.Rulesets.UI
             KeyBindingContainer.Add(receptor);
 
             keyCounter.SetReceptor(receptor);
-            keyCounter.AddRange(KeyBindingContainer.DefaultKeyBindings.Select(b => b.GetAction<T>()).Distinct().Select(b => new KeyCounterAction<T>(b)));
+            keyCounter.AddRange(KeyBindingContainer.DefaultKeyBindings
+                                                   .Select(b => b.GetAction<T>())
+                                                   .Distinct()
+                                                   .OrderBy(action => action)
+                                                   .Select(action => new KeyCounterAction<T>(action)));
         }
 
         public class ActionReceptor : KeyCounterDisplay.Receptor, IKeyBindingHandler<T>

From 9cd595800a5b826f8fac7a62c8eabfd7157a32f2 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 18 Oct 2020 19:42:05 +0200
Subject: [PATCH 05546/10326] Subscribe to event handler instead.

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

diff --git a/osu.Android/GameplayScreenRotationLocker.cs b/osu.Android/GameplayScreenRotationLocker.cs
index 07cca8c2f1..d25e22a0c2 100644
--- a/osu.Android/GameplayScreenRotationLocker.cs
+++ b/osu.Android/GameplayScreenRotationLocker.cs
@@ -17,7 +17,7 @@ namespace osu.Android
         private void load(OsuGame game)
         {
             localUserPlaying = game.LocalUserPlaying.GetBoundCopy();
-            localUserPlaying.BindValueChanged(userPlaying => updateLock(userPlaying));
+            localUserPlaying.ValueChanged += updateLock;
         }
 
         private void updateLock(ValueChangedEvent<bool> userPlaying)

From 371aecfca0856499cd0b014b4afab71f0bcd4b9f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 18 Oct 2020 20:07:42 +0200
Subject: [PATCH 05547/10326] Fetch OsuGameActivity through DI instead.

---
 osu.Android/GameplayScreenRotationLocker.cs |  7 +++++--
 osu.Android/OsuGameActivity.cs              |  6 +-----
 osu.Android/OsuGameAndroid.cs               | 10 ++++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Android/GameplayScreenRotationLocker.cs b/osu.Android/GameplayScreenRotationLocker.cs
index d25e22a0c2..fb471ceb78 100644
--- a/osu.Android/GameplayScreenRotationLocker.cs
+++ b/osu.Android/GameplayScreenRotationLocker.cs
@@ -13,6 +13,9 @@ namespace osu.Android
     {
         private Bindable<bool> localUserPlaying;
 
+        [Resolved]
+        private OsuGameActivity gameActivity { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(OsuGame game)
         {
@@ -22,9 +25,9 @@ namespace osu.Android
 
         private void updateLock(ValueChangedEvent<bool> userPlaying)
         {
-            OsuGameActivity.Activity.RunOnUiThread(() =>
+            gameActivity.RunOnUiThread(() =>
             {
-                OsuGameActivity.Activity.RequestedOrientation = userPlaying.NewValue ? ScreenOrientation.Locked : ScreenOrientation.FullUser;
+                gameActivity.RequestedOrientation = userPlaying.NewValue ? ScreenOrientation.Locked : ScreenOrientation.FullUser;
             });
         }
     }
diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index d4d2b83502..7e250dce0e 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -12,14 +12,10 @@ namespace osu.Android
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
     public class OsuGameActivity : AndroidGameActivity
     {
-        internal static Activity Activity { get; private set; }
-
-        protected override Framework.Game CreateGame() => new OsuGameAndroid();
+        protected override Framework.Game CreateGame() => new OsuGameAndroid(this);
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
-            Activity = this;
-
             // The default current directory on android is '/'.
             // On some devices '/' maps to the app data directory. On others it maps to the root of the internal storage.
             // In order to have a consistent current directory on all devices the full path of the app data directory is set as the current directory.
diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 887a8395e3..21d6336b2c 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -4,6 +4,7 @@
 using System;
 using Android.App;
 using Android.OS;
+using osu.Framework.Allocation;
 using osu.Game;
 using osu.Game.Updater;
 
@@ -11,6 +12,15 @@ namespace osu.Android
 {
     public class OsuGameAndroid : OsuGame
     {
+        [Cached]
+        private readonly OsuGameActivity gameActivity;
+
+        public OsuGameAndroid(OsuGameActivity activity)
+            : base(null)
+        {
+            gameActivity = activity;
+        }
+
         public override Version AssemblyVersion
         {
             get

From 4590d9b93b874550fde5a921bedff9353d48b69a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 13:04:12 +0900
Subject: [PATCH 05548/10326] Remove outdated comment logic

---
 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 c011ea7e05..83e20909a1 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -762,7 +762,6 @@ namespace osu.Game.Screens.Select
                             // scroll position at currentY makes the set panel appear at the very top of the carousel's screen space
                             // move down by half of visible height (height of the carousel's visible extent, including semi-transparent areas)
                             // then reapply the top semi-transparent area (because carousel's screen space starts below it)
-                            // and finally add half of the panel's own height to achieve vertical centering of the panel itself
                             scrollTarget = currentY + DrawableCarouselBeatmapSet.HEIGHT - visibleHalfHeight + BleedTop;
 
                             foreach (var b in set.Beatmaps)

From ee0efa0b4c1a5e19b665e3bf89999714d24408c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 13:05:42 +0900
Subject: [PATCH 05549/10326] Fix off-by-one in display range retrieval logic

---
 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 83e20909a1..04eff79533 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -590,7 +590,7 @@ namespace osu.Game.Screens.Select
             {
                 displayedRange = newDisplayRange;
 
-                var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first);
+                var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first + 1);
 
                 foreach (var panel in ScrollableContent.Children)
                 {

From bff3856c83ec9459185734fffeeef1aee3a41a29 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 13:13:32 +0900
Subject: [PATCH 05550/10326] Account for panel height when removing as
 off-screen

---
 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 04eff79533..06327bac3f 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -602,7 +602,7 @@ namespace osu.Game.Screens.Select
 
                     // panel loaded as drawable but not required by visible range.
                     // remove but only if too far off-screen
-                    if (panel.Y < visibleUpperBound - distance_offscreen_before_unload || panel.Y > visibleBottomBound + distance_offscreen_before_unload)
+                    if (panel.Y + panel.DrawHeight < visibleUpperBound - distance_offscreen_before_unload || panel.Y > visibleBottomBound + distance_offscreen_before_unload)
                     {
                         // may want a fade effect here (could be seen if a huge change happens, like a set with 20 difficulties becomes selected).
                         panel.ClearTransforms();

From cb1784a846901a15673575d25d2dcfc92ce85515 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 14:05:28 +0900
Subject: [PATCH 05551/10326] Fix score displays using non-matching zero
 padding depending on user score display mode

---
 .../Graphics/UserInterface/RollingCounter.cs  | 12 +++++--
 .../Graphics/UserInterface/ScoreCounter.cs    | 14 ++++----
 osu.Game/Screens/Play/HUD/IScoreCounter.cs    |  6 ++++
 .../Screens/Play/HUD/SkinnableScoreCounter.cs | 32 +++++++++++++++++++
 4 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index 91a557094d..b96181416d 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -56,8 +56,7 @@ namespace osu.Game.Graphics.UserInterface
                     return;
 
                 displayedCount = value;
-                if (displayedCountSpriteText != null)
-                    displayedCountSpriteText.Text = FormatCount(value);
+                UpdateDisplay();
             }
         }
 
@@ -73,10 +72,17 @@ namespace osu.Game.Graphics.UserInterface
         private void load()
         {
             displayedCountSpriteText = CreateSpriteText();
-            displayedCountSpriteText.Text = FormatCount(DisplayedCount);
+
+            UpdateDisplay();
             Child = displayedCountSpriteText;
         }
 
+        protected void UpdateDisplay()
+        {
+            if (displayedCountSpriteText != null)
+                displayedCountSpriteText.Text = FormatCount(DisplayedCount);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index 17e5ceedb9..d75e49a4ce 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.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.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
@@ -17,20 +18,19 @@ namespace osu.Game.Graphics.UserInterface
         /// </summary>
         public bool UseCommaSeparator { get; }
 
-        /// <summary>
-        /// How many leading zeroes the counter has.
-        /// </summary>
-        public uint LeadingZeroes { get; }
+        public Bindable<int> RequiredDisplayDigits { get; } = new Bindable<int>();
 
         /// <summary>
         /// Displays score.
         /// </summary>
         /// <param name="leading">How many leading zeroes the counter will have.</param>
         /// <param name="useCommaSeparator">Whether comma separators should be displayed.</param>
-        protected ScoreCounter(uint leading = 0, bool useCommaSeparator = false)
+        protected ScoreCounter(int leading = 0, bool useCommaSeparator = false)
         {
             UseCommaSeparator = useCommaSeparator;
-            LeadingZeroes = leading;
+
+            RequiredDisplayDigits.Value = leading;
+            RequiredDisplayDigits.BindValueChanged(_ => UpdateDisplay());
         }
 
         protected override double GetProportionalDuration(double currentValue, double newValue)
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override string FormatCount(double count)
         {
-            string format = new string('0', (int)LeadingZeroes);
+            string format = new string('0', RequiredDisplayDigits.Value);
 
             if (UseCommaSeparator)
             {
diff --git a/osu.Game/Screens/Play/HUD/IScoreCounter.cs b/osu.Game/Screens/Play/HUD/IScoreCounter.cs
index 2d39a64cfe..7f5e81d5ef 100644
--- a/osu.Game/Screens/Play/HUD/IScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/IScoreCounter.cs
@@ -15,5 +15,11 @@ namespace osu.Game.Screens.Play.HUD
         /// The current score to be displayed.
         /// </summary>
         Bindable<double> Current { get; }
+
+        /// <summary>
+        /// The number of digits required to display most sane scores.
+        /// This may be exceeded in very rare cases, but is useful to pad or space the display to avoid it jumping around.
+        /// </summary>
+        Bindable<int> RequiredDisplayDigits { get; }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
index a442ad0d9a..b46f5684b1 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
@@ -1,7 +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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
@@ -10,12 +14,38 @@ namespace osu.Game.Screens.Play.HUD
     {
         public Bindable<double> Current { get; } = new Bindable<double>();
 
+        private Bindable<ScoringMode> scoreDisplayMode;
+
+        public Bindable<int> RequiredDisplayDigits { get; } = new Bindable<int>();
+
         public SkinnableScoreCounter()
             : base(new HUDSkinComponent(HUDSkinComponents.ScoreCounter), _ => new DefaultScoreCounter())
         {
             CentreComponent = false;
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            scoreDisplayMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
+            scoreDisplayMode.BindValueChanged(scoreMode =>
+            {
+                switch (scoreMode.NewValue)
+                {
+                    case ScoringMode.Standardised:
+                        RequiredDisplayDigits.Value = 6;
+                        break;
+
+                    case ScoringMode.Classic:
+                        RequiredDisplayDigits.Value = 8;
+                        break;
+
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(scoreMode));
+                }
+            }, true);
+        }
+
         private IScoreCounter skinnedCounter;
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
@@ -23,7 +53,9 @@ namespace osu.Game.Screens.Play.HUD
             base.SkinChanged(skin, allowFallback);
 
             skinnedCounter = Drawable as IScoreCounter;
+
             skinnedCounter?.Current.BindTo(Current);
+            skinnedCounter?.RequiredDisplayDigits.BindTo(RequiredDisplayDigits);
         }
     }
 }

From e3b47083fc85ebc324575645b8d4c33c5661253f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 14:05:41 +0900
Subject: [PATCH 05552/10326] Add "scoring" as keyword to more easily find
 score display mode setting

---
 .../Overlays/Settings/Sections/Gameplay/GeneralSettings.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 73968761e2..66b3b8c4ca 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -76,7 +76,8 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 new SettingsEnumDropdown<ScoringMode>
                 {
                     LabelText = "Score display mode",
-                    Current = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode)
+                    Current = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode),
+                    Keywords = new[] { "scoring" }
                 }
             };
 

From cdb649476b8bf327c9ca561a26ce9ffabd660e32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 14:33:53 +0900
Subject: [PATCH 05553/10326] Allow legacy text to display fixed width
 correctly

---
 osu.Game/Skinning/LegacySpriteText.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index 8394657b1c..d7a3975c72 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Text;
 using osu.Game.Graphics.Sprites;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -17,11 +18,12 @@ namespace osu.Game.Skinning
             Shadow = false;
             UseFullGlyphHeight = false;
 
-            Font = new FontUsage(font, 1);
+            Font = new FontUsage(font, 1, fixedWidth: true);
             glyphStore = new LegacyGlyphStore(skin);
         }
 
-        protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);
+        protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) =>
+            new TextBuilder(glyphStore, Font, MaxWidth, UseFullGlyphHeight, Vector2.Zero, Spacing, CharactersBacking, neverFixedWidthCharacters: new[] { ',', '.', '%', 'x' }, fixedWidthCalculationCharacter: '5');
 
         private class LegacyGlyphStore : ITexturedGlyphLookupStore
         {

From ba99c5c134d5563725c46b57b6854befa2c91ac8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 14:39:02 +0900
Subject: [PATCH 05554/10326] Remove rolling delay on default combo counter

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

diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index a5c33f6dbe..63e7a88550 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -15,8 +15,6 @@ namespace osu.Game.Screens.Play.HUD
     {
         private readonly Vector2 offset = new Vector2(20, 5);
 
-        protected override double RollingDuration => 750;
-
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 

From 39cf27637e157ec13d8378ba89999d8a64809fd2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 14:59:03 +0900
Subject: [PATCH 05555/10326] Update to use virtual methods instead of
 reconstructing TextBuilder

---
 osu.Game/Skinning/LegacySpriteText.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index d7a3975c72..5d0e312f7c 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Text;
 using osu.Game.Graphics.Sprites;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -13,6 +12,10 @@ namespace osu.Game.Skinning
     {
         private readonly LegacyGlyphStore glyphStore;
 
+        protected override char FixedWidthReferenceCharacter => '5';
+
+        protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
+
         public LegacySpriteText(ISkin skin, string font = "score")
         {
             Shadow = false;
@@ -22,8 +25,7 @@ namespace osu.Game.Skinning
             glyphStore = new LegacyGlyphStore(skin);
         }
 
-        protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) =>
-            new TextBuilder(glyphStore, Font, MaxWidth, UseFullGlyphHeight, Vector2.Zero, Spacing, CharactersBacking, neverFixedWidthCharacters: new[] { ',', '.', '%', 'x' }, fixedWidthCalculationCharacter: '5');
+        protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);
 
         private class LegacyGlyphStore : ITexturedGlyphLookupStore
         {

From 7ed862edd7f81ff83a8b1dc98bed01a402977af6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 15:08:49 +0900
Subject: [PATCH 05556/10326] Add comment about migration code

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 6505135b42..49906eff6d 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -36,6 +36,10 @@ namespace osu.Game.Tournament.IO
 
         public override void Migrate(Storage newStorage)
         {
+            // this migration only happens once on moving to the per-tournament storage system.
+            // listed files are those known at that point in time.
+            // this can be removed at some point in the future (6 months obsoletion would mean 2021-04-19)
+
             var source = new DirectoryInfo(storage.GetFullPath("tournament"));
             var destination = new DirectoryInfo(newStorage.GetFullPath("."));
 
@@ -50,6 +54,7 @@ namespace osu.Game.Tournament.IO
             moveFileIfExists("drawings.txt", destination);
             moveFileIfExists("drawings_results.txt", destination);
             moveFileIfExists("drawings.ini", destination);
+
             ChangeTargetStorage(newStorage);
             storageConfig.Set(StorageConfig.CurrentTournament, default_tournament);
             storageConfig.Save();

From 9c566e7ffbe2c289306a17d494f82802d8fc4ec7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 15:34:46 +0900
Subject: [PATCH 05557/10326] Update tests to use correct parameters of
 CleanRunGameHost

---
 .../NonVisual/CustomTourneyDirectoryTest.cs      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index b75a9a6929..567d9f0d62 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -20,14 +20,14 @@ namespace osu.Game.Tournament.Tests.NonVisual
         [Test]
         public void TestDefaultDirectory()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestDefaultDirectory)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {
                 try
                 {
                     var osu = loadOsu(host);
                     var storage = osu.Dependencies.Get<Storage>();
-                    var defaultStorage = Path.Combine(tournamentBasePath(nameof(TestDefaultDirectory)), "default");
-                    Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorage));
+
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(host.Storage.GetFullPath("."), "tournaments", "default")));
                 }
                 finally
                 {
@@ -39,7 +39,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
         [Test]
         public void TestCustomDirectory()
         {
-            using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestCustomDirectory)))
+            using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestCustomDirectory))) // don't use clean run as we are writing a config file.
             {
                 string osuDesktopStorage = basePath(nameof(TestCustomDirectory));
                 const string custom_tournament = "custom";
@@ -58,7 +58,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
 
                     storage = osu.Dependencies.Get<Storage>();
 
-                    Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(tournamentBasePath(nameof(TestCustomDirectory)), custom_tournament)));
+                    Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(host.Storage.GetFullPath("."), "tournaments", custom_tournament)));
                 }
                 finally
                 {
@@ -70,7 +70,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
         [Test]
         public void TestMigration()
         {
-            using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestMigration)))
+            using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestMigration))) // don't use clean run as we are writing test files for migration.
             {
                 string osuRoot = basePath(nameof(TestMigration));
                 string configFile = Path.Combine(osuRoot, "tournament.ini");
@@ -115,7 +115,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
 
                     var storage = osu.Dependencies.Get<Storage>();
 
-                    var migratedPath = Path.Combine(tournamentBasePath(nameof(TestMigration)), "default");
+                    string migratedPath = Path.Combine(host.Storage.GetFullPath("."), "tournaments", "default");
 
                     videosPath = Path.Combine(migratedPath, "videos");
                     modsPath = Path.Combine(migratedPath, "mods");
@@ -165,7 +165,5 @@ namespace osu.Game.Tournament.Tests.NonVisual
         }
 
         private string basePath(string testInstance) => Path.Combine(RuntimeInfo.StartupDirectory, "headless", testInstance);
-
-        private string tournamentBasePath(string testInstance) => Path.Combine(basePath(testInstance), "tournaments");
     }
 }

From 31f6051db9504e4cef04fcc7fdd819a7f0827343 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 15:36:27 +0900
Subject: [PATCH 05558/10326] Add missing xmldoc

---
 osu.Game/IO/MigratableStorage.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index 21087d7dc6..1b76725b04 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -14,7 +14,14 @@ namespace osu.Game.IO
     /// </summary>
     public abstract class MigratableStorage : WrappedStorage
     {
+        /// <summary>
+        /// A relative list of directory paths which should not be migrated.
+        /// </summary>
         public virtual string[] IgnoreDirectories => Array.Empty<string>();
+
+        /// <summary>
+        /// A relative list of file paths which should not be migrated.
+        /// </summary>
         public virtual string[] IgnoreFiles => Array.Empty<string>();
 
         protected MigratableStorage(Storage storage, string subPath = null)

From 3f41003d355c82b28fffd11f27394283f2e67847 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 15:48:15 +0900
Subject: [PATCH 05559/10326] Move video store out of TournamentStorage

There was no reason it should be nested inside.
---
 osu.Game.Tournament/Components/TourneyVideo.cs | 5 ++---
 osu.Game.Tournament/IO/TournamentStorage.cs    | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 794b72b3a9..2709580385 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;
 using osu.Game.Tournament.IO;
@@ -28,9 +27,9 @@ namespace osu.Game.Tournament.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(Storage storage)
+        private void load(TournamentVideoResourceStore storage)
         {
-            var stream = (storage as TournamentStorage)?.VideoStore.GetStream(filename);
+            var stream = storage.GetStream(filename);
 
             if (stream != null)
             {
diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 49906eff6d..2e8a6ce667 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -14,7 +14,6 @@ namespace osu.Game.Tournament.IO
         private const string default_tournament = "default";
         private readonly Storage storage;
         private readonly TournamentStorageManager storageConfig;
-        public TournamentVideoResourceStore VideoStore { get; }
 
         public TournamentStorage(Storage storage)
             : base(storage.GetStorageForDirectory("tournaments"), string.Empty)
@@ -30,7 +29,6 @@ namespace osu.Game.Tournament.IO
             else
                 Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
 
-            VideoStore = new TournamentVideoResourceStore(this);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }
 

From daceb0c04991d0b103ed81434cd05db4decd64f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 15:48:33 +0900
Subject: [PATCH 05560/10326] Fix texture store not being initialised correctly

Without this change flags/mods would not work as expected. The video
store was being added as the texture store incorrectly.
---
 osu.Game.Tournament/TournamentGameBase.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 6a533f96d8..dbda6aa023 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -40,8 +40,9 @@ namespace osu.Game.Tournament
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
             dependencies.CacheAs<Storage>(storage = new TournamentStorage(baseStorage));
+            dependencies.Cache(new TournamentVideoResourceStore(storage));
 
-            Textures.AddStore(new TextureLoaderStore(storage.VideoStore));
+            Textures.AddStore(new TextureLoaderStore(new StorageBackedResourceStore(storage)));
 
             readBracket();
 

From f597572d739eeb71ac1a086cbf353e7233d236e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 16:02:39 +0900
Subject: [PATCH 05561/10326] Add comment with reasoning for TopRight anchor

---
 osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
index af0043436a..ec68223a3d 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
@@ -73,6 +73,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
                                     },
                                     new Container
                                     {
+                                        // top right works better when the vertical height of the component changes smoothly (avoids weird layout animations).
                                         Anchor = Anchor.TopRight,
                                         Origin = Anchor.TopRight,
                                         RelativeSizeAxes = Axes.X,

From 401dd2db37a55460a8f1332daa3d174e59f14a41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 16:55:00 +0900
Subject: [PATCH 05562/10326] 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 1d2cf22b28..2d531cf01e 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1009.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1019.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 133855c6c4..de7bde824f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,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.1009.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1019.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 73faa8541e..9c22dec330 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.Framework.iOS" Version="2020.1009.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1019.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.1009.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1019.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 79a17b23715b9fe0982d11975494de0cb43413da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 16:57:08 +0900
Subject: [PATCH 05563/10326] Reapply waveform colour fix

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index be3bca3242..9aff4ddf8f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         waveform = new WaveformGraph
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = colours.Blue.Opacity(0.2f),
+                            BaseColour = colours.Blue.Opacity(0.2f),
                             LowColour = colours.BlueLighter,
                             MidColour = colours.BlueDark,
                             HighColour = colours.BlueDarker,

From cd7c3021caf54210b5f2e3d80fb54d8d9a2917f8 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 19 Oct 2020 10:01:24 +0200
Subject: [PATCH 05564/10326] Trigger lock update on loading.

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

diff --git a/osu.Android/GameplayScreenRotationLocker.cs b/osu.Android/GameplayScreenRotationLocker.cs
index fb471ceb78..25bd659a5d 100644
--- a/osu.Android/GameplayScreenRotationLocker.cs
+++ b/osu.Android/GameplayScreenRotationLocker.cs
@@ -20,7 +20,7 @@ namespace osu.Android
         private void load(OsuGame game)
         {
             localUserPlaying = game.LocalUserPlaying.GetBoundCopy();
-            localUserPlaying.ValueChanged += updateLock;
+            localUserPlaying.BindValueChanged(updateLock, true);
         }
 
         private void updateLock(ValueChangedEvent<bool> userPlaying)

From 6d22f0e1962dd0530b473aca1105d6a6b01258c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 17:15:13 +0900
Subject: [PATCH 05565/10326] Use existing copy method and update xmldoc

---
 osu.Game/Online/Multiplayer/Room.cs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 5feebe8da1..9a21543b2e 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -104,21 +104,17 @@ namespace osu.Game.Online.Multiplayer
         public readonly Bindable<int> Position = new Bindable<int>(-1);
 
         /// <summary>
-        /// Create a copy of this room, without information specific to it, such as Room ID or host
+        /// Create a copy of this room without online information.
+        /// Should be used to create a local copy of a room for submitting in the future.
         /// </summary>
         public Room CreateCopy()
         {
-            Room newRoom = new Room
-            {
-                Name = { Value = Name.Value },
-                Availability = { Value = Availability.Value },
-                Type = { Value = Type.Value },
-                MaxParticipants = { Value = MaxParticipants.Value }
-            };
+            var copy = new Room();
 
-            newRoom.Playlist.AddRange(Playlist);
+            copy.CopyFrom(this);
+            copy.RoomID.Value = null;
 
-            return newRoom;
+            return copy;
         }
 
         public void CopyFrom(Room other)

From 437ca91b9441dc5891b39f81301b2c2af0989bf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 17:15:35 +0900
Subject: [PATCH 05566/10326] Use DI to open the copy rather than passing in an
 ugly action

---
 .../Screens/Multi/Lounge/Components/DrawableRoom.cs   | 10 +++++++---
 .../Screens/Multi/Lounge/Components/RoomsContainer.cs |  8 --------
 osu.Game/Screens/Multi/Multiplayer.cs                 | 11 ++++++-----
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index db75df6054..01a85382e4 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -38,11 +38,12 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         public event Action<SelectionState> StateChanged;
 
-        public Action DuplicateRoom;
-
         private readonly Box selectionBox;
         private CachedModelDependencyContainer<Room> dependencies;
 
+        [Resolved(canBeNull: true)]
+        private Multiplayer multiplayer { get; set; }
+
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
@@ -239,7 +240,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         public MenuItem[] ContextMenuItems => new MenuItem[]
         {
-            new OsuMenuItem("Create copy", MenuItemType.Standard, DuplicateRoom)
+            new OsuMenuItem("Create copy", MenuItemType.Standard, () =>
+            {
+                multiplayer?.CreateRoom(Room.CreateCopy());
+            })
         };
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index d9af38d19e..60c6aa1d8a 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -111,14 +111,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             {
                 roomFlow.Add(new DrawableRoom(room)
                 {
-                    DuplicateRoom = () =>
-                    {
-                        Room newRoom = room.CreateCopy();
-                        if (!newRoom.Name.Value.StartsWith("Copy of "))
-                            newRoom.Name.Value = $"Copy of {room.Name.Value}";
-
-                        loungeSubScreen?.Open(newRoom);
-                    },
                     Action = () =>
                     {
                         if (room == selectedRoom.Value)
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index cdaeebefb7..27f774e9ec 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Multi
                     {
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
-                        Action = createRoom
+                        Action = () => CreateRoom()
                     },
                     roomManager = new RoomManager()
                 }
@@ -289,10 +289,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" } });
-        }
+        /// <summary>
+        /// Create a new room.
+        /// </summary>
+        /// <param name="room">An optional template to use when creating the room.</param>
+        public void CreateRoom(Room room = null) => loungeSubScreen.Open(room ?? new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } });
 
         private void beginHandlingTrack()
         {

From 4024b44a53b0642bb15a18871caa9ecd80342925 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 17:41:21 +0900
Subject: [PATCH 05567/10326] Fix unsafe manipulation of parent's children from
 child

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 9289a6162c..a221ca7966 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -145,11 +145,19 @@ namespace osu.Game.Rulesets.Catch.UI
                 }
             };
 
-            trailsTarget.Add(trails = new CatcherTrailDisplay(this));
+            trails = new CatcherTrailDisplay(this);
 
             updateCatcher();
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // don't add in above load as we may potentially modify a parent in an unsafe manner.
+            trailsTarget.Add(trails);
+        }
+
         /// <summary>
         /// Creates proxied content to be displayed beneath hitobjects.
         /// </summary>

From 044622a7a60f3e588b2d2b6543ab6e81547bedc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 18:41:17 +0900
Subject: [PATCH 05568/10326] Fix out of bounds issues

---
 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 06327bac3f..54860a894b 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -662,7 +662,7 @@ namespace osu.Game.Screens.Select
             // as we can't be 100% sure on the size of individual carousel drawables,
             // always play it safe and extend bounds by one.
             firstIndex = Math.Max(0, firstIndex - 1);
-            lastIndex = Math.Min(visibleItems.Count, lastIndex + 1);
+            lastIndex = Math.Clamp(lastIndex + 1, firstIndex, visibleItems.Count - 1);
 
             return (firstIndex, lastIndex);
         }

From 1c2185e9691c1a595145d123555ad7decd5e2ffb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 18:41:28 +0900
Subject: [PATCH 05569/10326] Replace comment with link to issue

---
 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 54860a894b..e3cd3461c2 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -895,7 +895,7 @@ namespace osu.Game.Screens.Select
             /// </summary>
             public bool UserScrolling { get; private set; }
 
-            // ReSharper disable once OptionalParameterHierarchyMismatch fuck off rider
+            // ReSharper disable once OptionalParameterHierarchyMismatch 2020.3 EAP4 bug. (https://youtrack.jetbrains.com/issue/RSRP-481535?p=RIDER-51910)
             protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
             {
                 UserScrolling = true;

From 28eae5d26b0a1e8b69cfa4dbf7ea6b5f03f62b9c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 19:03:22 +0900
Subject: [PATCH 05570/10326] Fix migration test failures due to finalizer
 disposal of LocalConfigManager

---
 osu.Game/OsuGameBase.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 84766f196a..2d609668af 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -371,8 +371,10 @@ namespace osu.Game
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
+
             RulesetStore?.Dispose();
             BeatmapManager?.Dispose();
+            LocalConfig?.Dispose();
 
             contextFactory.FlushConnections();
         }

From 9106e97c37697812b3af9f508724273c27d4f457 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 19:10:01 +0900
Subject: [PATCH 05571/10326] Ensure max value in clamp is at least zero

---
 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 e3cd3461c2..92abec0eee 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -662,7 +662,7 @@ namespace osu.Game.Screens.Select
             // as we can't be 100% sure on the size of individual carousel drawables,
             // always play it safe and extend bounds by one.
             firstIndex = Math.Max(0, firstIndex - 1);
-            lastIndex = Math.Clamp(lastIndex + 1, firstIndex, visibleItems.Count - 1);
+            lastIndex = Math.Clamp(lastIndex + 1, firstIndex, Math.Max(0, visibleItems.Count - 1));
 
             return (firstIndex, lastIndex);
         }

From d5940193a2dce5dd5e35568b0784c624f1117500 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 19:55:20 +0900
Subject: [PATCH 05572/10326] Ensure visible items is greater than zero before
 trying to display a range

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 49 ++++++++++++----------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 92abec0eee..83631fd383 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -590,36 +590,39 @@ namespace osu.Game.Screens.Select
             {
                 displayedRange = newDisplayRange;
 
-                var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first + 1);
-
-                foreach (var panel in ScrollableContent.Children)
+                if (visibleItems.Count > 0)
                 {
-                    if (toDisplay.Remove(panel.Item))
+                    var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first + 1);
+
+                    foreach (var panel in ScrollableContent.Children)
                     {
-                        // panel already displayed.
-                        continue;
+                        if (toDisplay.Remove(panel.Item))
+                        {
+                            // panel already displayed.
+                            continue;
+                        }
+
+                        // panel loaded as drawable but not required by visible range.
+                        // remove but only if too far off-screen
+                        if (panel.Y + panel.DrawHeight < visibleUpperBound - distance_offscreen_before_unload || panel.Y > visibleBottomBound + distance_offscreen_before_unload)
+                        {
+                            // may want a fade effect here (could be seen if a huge change happens, like a set with 20 difficulties becomes selected).
+                            panel.ClearTransforms();
+                            panel.Expire();
+                        }
                     }
 
-                    // panel loaded as drawable but not required by visible range.
-                    // remove but only if too far off-screen
-                    if (panel.Y + panel.DrawHeight < visibleUpperBound - distance_offscreen_before_unload || panel.Y > visibleBottomBound + distance_offscreen_before_unload)
+                    // Add those items within the previously found index range that should be displayed.
+                    foreach (var item in toDisplay)
                     {
-                        // may want a fade effect here (could be seen if a huge change happens, like a set with 20 difficulties becomes selected).
-                        panel.ClearTransforms();
-                        panel.Expire();
+                        var panel = setPool.Get(p => p.Item = item);
+
+                        panel.Depth = item.CarouselYPosition;
+                        panel.Y = item.CarouselYPosition;
+
+                        ScrollableContent.Add(panel);
                     }
                 }
-
-                // Add those items within the previously found index range that should be displayed.
-                foreach (var item in toDisplay)
-                {
-                    var panel = setPool.Get(p => p.Item = item);
-
-                    panel.Depth = item.CarouselYPosition;
-                    panel.Y = item.CarouselYPosition;
-
-                    ScrollableContent.Add(panel);
-                }
             }
 
             // Finally, if the filtered items have changed, animate drawables to their new locations.

From a50ca0a1edba6a40af2ad24cc30c1abb86a6a95d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 20:00:17 +0900
Subject: [PATCH 05573/10326] Fix osu!catch test failures due to trying to
 retrieve container too early

---
 osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 1e708cce4b..1b8368794c 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -123,7 +123,10 @@ namespace osu.Game.Rulesets.Catch.Tests
                     Origin = Anchor.Centre,
                     Scale = new Vector2(4f),
                 }, skin);
+            });
 
+            AddStep("get trails container", () =>
+            {
                 trails = catcherArea.OfType<CatcherTrailDisplay>().Single();
                 catcherArea.MovableCatcher.SetHyperDashState(2);
             });

From 053c7a69a64ee67243f6a10d81c92644a824febb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Oct 2020 20:22:48 +0200
Subject: [PATCH 05574/10326] Fix code style issues & compilation failures

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs                     | 4 ++--
 .../Overlays/Settings/Sections/Gameplay/GeneralSettings.cs   | 5 ++---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs                  | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index a7ccc62e40..1d5d2f9431 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -20,6 +20,7 @@ using osu.Game.Skinning;
 using osu.Framework.Allocation;
 using osu.Game.Configuration;
 using osu.Framework.Bindables;
+using osu.Game.Screens;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -36,12 +37,10 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
 
-
         private Bindable<bool> showPlayfieldBorder;
 
         private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>();
 
-
         public OsuPlayfield()
         {
             InternalChildren = new Drawable[]
@@ -87,6 +86,7 @@ namespace osu.Game.Rulesets.Osu.UI
         private void load(OsuConfigManager config)
         {
             showPlayfieldBorder = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder);
+
             if (showPlayfieldBorder.Value)
             {
                 AddInternal(new PlayfieldBorder
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 755f4e990c..e8a07fc831 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -76,14 +76,13 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 new SettingsEnumDropdown<ScoringMode>
                 {
                     LabelText = "Score display mode",
-                    Bindable = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode),
+                    Current = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode),
                     Keywords = new[] { "scoring" }
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show playfield border",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder)
-                    Current = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode),
+                    Current = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder),
                 },
             };
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index fc80d4f3df..f4457c6aeb 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Edit
                         drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
                         {
                             LayerBelowRuleset,
-                            new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
+                            new PlayfieldBorder { RelativeSizeAxes = Axes.Both }
                         }),
                         drawableRulesetWrapper,
                         // layers above playfield

From 4af3fd1ed68830f250704246e3957bcfb36e92ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Oct 2020 20:41:45 +0200
Subject: [PATCH 05575/10326] Allow toggling border on & off during gameplay

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 18 ++++++++++--------
 osu.Game/Screens/PlayfieldBorder.cs      |  7 ++++++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 1d5d2f9431..8904345825 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Rulesets.Osu.UI
 {
     public class OsuPlayfield : Playfield
     {
+        private readonly PlayfieldBorder playfieldBorder;
         private readonly ProxyContainer approachCircles;
         private readonly ProxyContainer spinnerProxies;
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
@@ -45,6 +46,11 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             InternalChildren = new Drawable[]
             {
+                playfieldBorder = new PlayfieldBorder
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = 3
+                },
                 spinnerProxies = new ProxyContainer
                 {
                     RelativeSizeAxes = Axes.Both
@@ -86,16 +92,12 @@ namespace osu.Game.Rulesets.Osu.UI
         private void load(OsuConfigManager config)
         {
             showPlayfieldBorder = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder);
-
-            if (showPlayfieldBorder.Value)
-            {
-                AddInternal(new PlayfieldBorder
-                {
-                    RelativeSizeAxes = Axes.Both
-                });
-            }
+            showPlayfieldBorder.BindValueChanged(updateBorderVisibility, true);
         }
 
+        private void updateBorderVisibility(ValueChangedEvent<bool> settingChange)
+            => playfieldBorder.State.Value = settingChange.NewValue ? Visibility.Visible : Visibility.Hidden;
+
         public override void Add(DrawableHitObject h)
         {
             h.OnNewResult += onNewResult;
diff --git a/osu.Game/Screens/PlayfieldBorder.cs b/osu.Game/Screens/PlayfieldBorder.cs
index a3be38f0a2..e88b73bc71 100644
--- a/osu.Game/Screens/PlayfieldBorder.cs
+++ b/osu.Game/Screens/PlayfieldBorder.cs
@@ -11,8 +11,10 @@ namespace osu.Game.Screens
     /// <summary>
     /// Provides a border around the playfield.
     /// </summary>
-    public class PlayfieldBorder : CompositeDrawable
+    public class PlayfieldBorder : VisibilityContainer
     {
+        private const int fade_duration = 200;
+
         public PlayfieldBorder()
         {
             RelativeSizeAxes = Axes.Both;
@@ -28,5 +30,8 @@ namespace osu.Game.Screens
                 AlwaysPresent = true
             };
         }
+
+        protected override void PopIn() => this.FadeIn(fade_duration, Easing.OutQuint);
+        protected override void PopOut() => this.FadeOut(fade_duration, Easing.OutQuint);
     }
 }

From 4267d23d598f2635df363b5b42019c91ddc72ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Oct 2020 20:56:34 +0200
Subject: [PATCH 05576/10326] Move border to more appropriate namespace

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs             | 1 -
 osu.Game/Rulesets/Edit/HitObjectComposer.cs          | 1 -
 osu.Game/{Screens => Rulesets/UI}/PlayfieldBorder.cs | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)
 rename osu.Game/{Screens => Rulesets/UI}/PlayfieldBorder.cs (97%)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 8904345825..e536bd1503 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -20,7 +20,6 @@ using osu.Game.Skinning;
 using osu.Framework.Allocation;
 using osu.Game.Configuration;
 using osu.Framework.Bindables;
-using osu.Game.Screens;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index f4457c6aeb..4c552c5083 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -20,7 +20,6 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Screens;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components.RadioButtons;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
diff --git a/osu.Game/Screens/PlayfieldBorder.cs b/osu.Game/Rulesets/UI/PlayfieldBorder.cs
similarity index 97%
rename from osu.Game/Screens/PlayfieldBorder.cs
rename to osu.Game/Rulesets/UI/PlayfieldBorder.cs
index e88b73bc71..66371c89ad 100644
--- a/osu.Game/Screens/PlayfieldBorder.cs
+++ b/osu.Game/Rulesets/UI/PlayfieldBorder.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens
+namespace osu.Game.Rulesets.UI
 {
     /// <summary>
     /// Provides a border around the playfield.

From dbda18acea2f9644bfc5a618c52ecb08de85a55f Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 19 Oct 2020 12:04:23 -0700
Subject: [PATCH 05577/10326] Fix autoplay/replay settings going off screen on
 some legacy skins

---
 osu.Game/Screens/Play/HUDOverlay.cs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index c3de249bf8..af5e2b80e1 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -208,17 +208,9 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            float topRightOffset = 0;
+            // for now align with the accuracy counter. eventually this will be user customisable.
+            topRightElements.Y = ToLocalSpace(AccuracyCounter.Drawable.ScreenSpaceDrawQuad.BottomRight).Y;
 
-            // fetch the bottom-most position of any main ui element that is anchored to the top of the screen.
-            // consider this kind of temporary.
-            foreach (var d in mainUIElements)
-            {
-                if (d is SkinnableDrawable sd && (sd.Drawable.Anchor & Anchor.y0) > 0)
-                    topRightOffset = Math.Max(sd.Drawable.ScreenSpaceDrawQuad.BottomRight.Y, topRightOffset);
-            }
-
-            topRightElements.Y = ToLocalSpace(new Vector2(0, topRightOffset)).Y;
             bottomRightElements.Y = -Progress.Height;
         }
 

From bca05397350e213213aabce18d4c233187809cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Oct 2020 21:00:49 +0200
Subject: [PATCH 05578/10326] Move setting to osu! ruleset subsection

---
 .../Configuration/OsuRulesetConfigManager.cs           |  4 +++-
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs               | 10 +++++-----
 osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs      |  5 +++++
 osu.Game/Configuration/OsuConfigManager.cs             |  3 ---
 .../Settings/Sections/Gameplay/GeneralSettings.cs      |  5 -----
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs b/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
index f76635a932..da8767c017 100644
--- a/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Rulesets.Osu.Configuration
             Set(OsuRulesetSetting.SnakingInSliders, true);
             Set(OsuRulesetSetting.SnakingOutSliders, true);
             Set(OsuRulesetSetting.ShowCursorTrail, true);
+            Set(OsuRulesetSetting.ShowPlayfieldBorder, false);
         }
     }
 
@@ -26,6 +27,7 @@ namespace osu.Game.Rulesets.Osu.Configuration
     {
         SnakingInSliders,
         SnakingOutSliders,
-        ShowCursorTrail
+        ShowCursorTrail,
+        ShowPlayfieldBorder,
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index e536bd1503..26fe686b0d 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -18,8 +18,8 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
 using osu.Framework.Allocation;
-using osu.Game.Configuration;
 using osu.Framework.Bindables;
+using osu.Game.Rulesets.Osu.Configuration;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
 
-        private Bindable<bool> showPlayfieldBorder;
+        private readonly Bindable<bool> showPlayfieldBorder = new BindableBool();
 
         private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>();
 
@@ -87,10 +87,10 @@ namespace osu.Game.Rulesets.Osu.UI
             AddRangeInternal(poolDictionary.Values);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        [BackgroundDependencyLoader(true)]
+        private void load(OsuRulesetConfigManager config)
         {
-            showPlayfieldBorder = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder);
+            config?.BindWith(OsuRulesetSetting.ShowPlayfieldBorder, showPlayfieldBorder);
             showPlayfieldBorder.BindValueChanged(updateBorderVisibility, true);
         }
 
diff --git a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
index 3870f303b4..28c609f412 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
@@ -39,6 +39,11 @@ namespace osu.Game.Rulesets.Osu.UI
                     LabelText = "Cursor trail",
                     Current = config.GetBindable<bool>(OsuRulesetSetting.ShowCursorTrail)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Show playfield border",
+                    Current = config.GetBindable<bool>(OsuRulesetSetting.ShowPlayfieldBorder),
+                },
             };
         }
     }
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 14be15bb94..78179a781a 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -106,8 +106,6 @@ namespace osu.Game.Configuration
             Set(OsuSetting.IncreaseFirstObjectVisibility, true);
             Set(OsuSetting.GameplayDisableWinKey, true);
 
-            Set(OsuSetting.ShowPlayfieldBorder, false);
-
             // Update
             Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
 
@@ -241,6 +239,5 @@ namespace osu.Game.Configuration
         HitLighting,
         MenuBackgroundSource,
         GameplayDisableWinKey,
-        ShowPlayfieldBorder,
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index e8a07fc831..07ad3c6b64 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -79,11 +79,6 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     Current = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode),
                     Keywords = new[] { "scoring" }
                 },
-                new SettingsCheckbox
-                {
-                    LabelText = "Show playfield border",
-                    Current = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder),
-                },
             };
 
             if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)

From 7c388f1132cad566f0b8ef05f8326fd1a383899c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Oct 2020 21:20:13 +0200
Subject: [PATCH 05579/10326] Move editor playfield border locally to osu!
 composer

---
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs | 5 +++++
 osu.Game/Rulesets/Edit/HitObjectComposer.cs        | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 912a705d16..d9de9d2c5d 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -56,6 +56,11 @@ namespace osu.Game.Rulesets.Osu.Edit
         [BackgroundDependencyLoader]
         private void load()
         {
+            LayerBelowRuleset.Add(new PlayfieldBorder
+            {
+                RelativeSizeAxes = Axes.Both,
+                State = { Value = Visibility.Visible }
+            });
             LayerBelowRuleset.Add(distanceSnapGridContainer = new Container { RelativeSizeAxes = Axes.Both });
 
             selectedHitObjects = EditorBeatmap.SelectedHitObjects.GetBoundCopy();
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 4c552c5083..c9dd061b48 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -100,11 +100,7 @@ namespace osu.Game.Rulesets.Edit
                     Children = new Drawable[]
                     {
                         // layers below playfield
-                        drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
-                        {
-                            LayerBelowRuleset,
-                            new PlayfieldBorder { RelativeSizeAxes = Axes.Both }
-                        }),
+                        drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChild(LayerBelowRuleset),
                         drawableRulesetWrapper,
                         // layers above playfield
                         drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer()

From fef6e55b397130d90b055b2939088cddb346d3b8 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 19 Oct 2020 12:32:16 -0700
Subject: [PATCH 05580/10326] Remove unused using and field

---
 osu.Game/Screens/Play/HUDOverlay.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index af5e2b80e1..0a45df51a0 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -16,7 +16,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Skinning;
 using osuTK;
 using osuTK.Input;
 
@@ -66,8 +65,6 @@ namespace osu.Game.Screens.Play
         private readonly FillFlowContainer bottomRightElements;
         private readonly FillFlowContainer topRightElements;
 
-        private readonly Container mainUIElements;
-
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
 
         public HUDOverlay(ScoreProcessor scoreProcessor, HealthProcessor healthProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
@@ -92,7 +89,7 @@ namespace osu.Game.Screens.Play
                         {
                             new Drawable[]
                             {
-                                mainUIElements = new Container
+                                new Container
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]

From 6e4b28ed1e69cdb3aaa574b035ce0dd040d82933 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Tue, 20 Oct 2020 00:32:44 +0300
Subject: [PATCH 05581/10326] Different version of epilepsy warning display

---
 .../Screens/Play/BeatmapMetadataDisplay.cs    |  44 -------
 osu.Game/Screens/Play/PlayerLoader.cs         | 114 +++++++++++++++++-
 2 files changed, 113 insertions(+), 45 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index bab141a75e..5530b4beac 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -49,44 +49,6 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private class EpilepsyWarning : FillFlowContainer
-        {
-            public EpilepsyWarning(bool warning)
-            {
-                if (warning)
-                    this.Show();
-                else
-                    this.Hide();
-
-                AutoSizeAxes = Axes.Both;
-                Direction = FillDirection.Vertical;
-                Children = new Drawable[]
-                {
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Icon = FontAwesome.Solid.ExclamationTriangle,
-                        Size = new Vector2(40),
-                    },
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Text = "This beatmap contains scenes with rapidly flashing colours.",
-                        Font = OsuFont.GetFont(size: 20),
-                    },
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Text = "Please take caution if you are affected by epilepsy.",
-                        Font = OsuFont.GetFont(size: 20),
-                    }
-                };
-            }
-        }
-
         private readonly WorkingBeatmap beatmap;
         private readonly Bindable<IReadOnlyList<Mod>> mods;
         private readonly Drawable facade;
@@ -201,12 +163,6 @@ namespace osu.Game.Screens.Play
                             Margin = new MarginPadding { Top = 20 },
                             Current = mods
                         },
-                        new EpilepsyWarning(beatmap.BeatmapInfo.EpilepsyWarning)
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Margin = new MarginPadding { Top = 20 },
-                        }
                     },
                 }
             };
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 93a734589c..4c04627651 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -6,16 +6,21 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Audio.Track;
 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.Sprites;
 using osu.Framework.Input;
 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.Input;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
@@ -84,6 +89,8 @@ namespace osu.Game.Screens.Play
 
         private bool hideOverlays;
 
+        private bool epilepsyShown;
+
         private InputManager inputManager;
 
         private IdleTracker idleTracker;
@@ -308,7 +315,27 @@ namespace osu.Game.Screens.Play
                 {
                     contentOut();
 
-                    this.Delay(250).Schedule(() =>
+                    if (true && !epilepsyShown)
+                    {
+                        EpilepsyWarning warning;
+
+                        AddInternal(warning = new EpilepsyWarning
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            State = { Value = Visibility.Visible }
+                        });
+
+                        epilepsyShown = true;
+
+                        this.Delay(2000).Schedule(() =>
+                        {
+                            warning.Hide();
+                            warning.Expire();
+                        });
+                    }
+
+                    this.Delay(epilepsyShown ? 2500 : 250).Schedule(() =>
                     {
                         if (!this.IsCurrentScreen()) return;
 
@@ -398,5 +425,90 @@ namespace osu.Game.Screens.Play
         }
 
         #endregion
+
+        private class EpilepsyWarning : VisibilityContainer
+        {
+            private readonly BindableDouble trackVolumeOnEpilepsyWarning = new BindableDouble(1f);
+
+            private Track track;
+            private FillFlowContainer warningContent;
+
+            public EpilepsyWarning()
+            {
+                RelativeSizeAxes = Axes.Both;
+                Alpha = 0f;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours, IBindable<WorkingBeatmap> beatmap)
+            {
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black.Opacity(0.5f),
+                    },
+                    warningContent = new FillFlowContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Children = new Drawable[]
+                        {
+                            new SpriteIcon
+                            {
+                                Colour = colours.Yellow,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Icon = FontAwesome.Solid.ExclamationTriangle,
+                                Size = new Vector2(50),
+                            },
+                            new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 25))
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                TextAnchor = Anchor.Centre,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                            }.With(tfc =>
+                            {
+                                tfc.AddText("This beatmap contains scenes with ");
+                                tfc.AddText("rapidly flashing colours", s =>
+                                {
+                                    s.Font = s.Font.With(weight: FontWeight.Bold);
+                                    s.Colour = colours.Yellow;
+                                });
+                                tfc.AddText(".");
+
+                                tfc.NewParagraph();
+                                tfc.AddText("Please take caution if you are affected by epilepsy.");
+                            }),
+                        }
+                    }
+                };
+
+                track = beatmap.Value.Track;
+                track.AddAdjustment(AdjustableProperty.Volume, trackVolumeOnEpilepsyWarning);
+            }
+
+            protected override void PopIn()
+            {
+                this.FadeIn(500, Easing.InQuint)
+                    .TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, 500, Easing.InQuint);
+
+                warningContent.FadeIn(500, Easing.InQuint);
+            }
+
+            protected override void PopOut() => this.FadeOut(500, Easing.InQuint);
+
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+                track?.RemoveAdjustment(AdjustableProperty.Volume, trackVolumeOnEpilepsyWarning);
+            }
+        }
     }
 }

From afa86f959f184acb76ace6b5b7ae68ff490b8440 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 19 Oct 2020 23:38:06 +0200
Subject: [PATCH 05582/10326] Changed scales of Seeding and Win screen to match
 the original

These were measured by pixel-to-pixel comparing master vs this branch in ShareX at the same resolution.
---
 osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs | 3 +--
 osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs   | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index b343608e69..32830713f6 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -288,8 +288,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                     AutoSizeAxes = Axes.Both;
 
                     Flag.RelativeSizeAxes = Axes.None;
-                    Flag.Size = new Vector2(300, 200);
-                    Flag.Scale = new Vector2(0.3f);
+                    Flag.Scale = new Vector2(1.4f);
 
                     InternalChild = new FillFlowContainer
                     {
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index dde140ab91..3972c590ea 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -93,6 +93,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Position = new Vector2(-300, 10),
+                    Scale = new Vector2(2.2f)
                 },
                 new FillFlowContainer
                 {

From 44279ed34741fc9a376735d45620bb371b44e79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Oct 2020 23:46:09 +0200
Subject: [PATCH 05583/10326] Remove unused using directive

---
 osu.Game/Screens/Play/PlayerLoader.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 4c04627651..76020f5385 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -20,7 +20,6 @@ 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.Input;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;

From aeca61eb3ecf652ba1dab3ec0abc3bc935f535ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Oct 2020 23:48:02 +0200
Subject: [PATCH 05584/10326] Split warning to separate file

---
 osu.Game/Screens/Play/EpilepsyWarning.cs | 105 +++++++++++++++++++++++
 osu.Game/Screens/Play/PlayerLoader.cs    |  89 -------------------
 2 files changed, 105 insertions(+), 89 deletions(-)
 create mode 100644 osu.Game/Screens/Play/EpilepsyWarning.cs

diff --git a/osu.Game/Screens/Play/EpilepsyWarning.cs b/osu.Game/Screens/Play/EpilepsyWarning.cs
new file mode 100644
index 0000000000..e115c7e057
--- /dev/null
+++ b/osu.Game/Screens/Play/EpilepsyWarning.cs
@@ -0,0 +1,105 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Track;
+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.Sprites;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Play
+{
+    public class EpilepsyWarning : VisibilityContainer
+    {
+        private readonly BindableDouble trackVolumeOnEpilepsyWarning = new BindableDouble(1f);
+
+        private Track track;
+        private FillFlowContainer warningContent;
+
+        public EpilepsyWarning()
+        {
+            RelativeSizeAxes = Axes.Both;
+            Alpha = 0f;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, IBindable<WorkingBeatmap> beatmap)
+        {
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black.Opacity(0.5f),
+                },
+                warningContent = new FillFlowContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new SpriteIcon
+                        {
+                            Colour = colours.Yellow,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Icon = FontAwesome.Solid.ExclamationTriangle,
+                            Size = new Vector2(50),
+                        },
+                        new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 25))
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            TextAnchor = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        }.With(tfc =>
+                        {
+                            tfc.AddText("This beatmap contains scenes with ");
+                            tfc.AddText("rapidly flashing colours", s =>
+                            {
+                                s.Font = s.Font.With(weight: FontWeight.Bold);
+                                s.Colour = colours.Yellow;
+                            });
+                            tfc.AddText(".");
+
+                            tfc.NewParagraph();
+                            tfc.AddText("Please take caution if you are affected by epilepsy.");
+                        }),
+                    }
+                }
+            };
+
+            track = beatmap.Value.Track;
+            track.AddAdjustment(AdjustableProperty.Volume, trackVolumeOnEpilepsyWarning);
+        }
+
+        protected override void PopIn()
+        {
+            this.FadeIn(500, Easing.InQuint)
+                .TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, 500, Easing.InQuint);
+
+            warningContent.FadeIn(500, Easing.InQuint);
+        }
+
+        protected override void PopOut() => this.FadeOut(500, Easing.InQuint);
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            track?.RemoveAdjustment(AdjustableProperty.Volume, trackVolumeOnEpilepsyWarning);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 76020f5385..801feb7d01 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -6,17 +6,13 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
 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.Sprites;
 using osu.Framework.Input;
 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;
@@ -424,90 +420,5 @@ namespace osu.Game.Screens.Play
         }
 
         #endregion
-
-        private class EpilepsyWarning : VisibilityContainer
-        {
-            private readonly BindableDouble trackVolumeOnEpilepsyWarning = new BindableDouble(1f);
-
-            private Track track;
-            private FillFlowContainer warningContent;
-
-            public EpilepsyWarning()
-            {
-                RelativeSizeAxes = Axes.Both;
-                Alpha = 0f;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours, IBindable<WorkingBeatmap> beatmap)
-            {
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black.Opacity(0.5f),
-                    },
-                    warningContent = new FillFlowContainer
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
-                        {
-                            new SpriteIcon
-                            {
-                                Colour = colours.Yellow,
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Icon = FontAwesome.Solid.ExclamationTriangle,
-                                Size = new Vector2(50),
-                            },
-                            new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 25))
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                TextAnchor = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                            }.With(tfc =>
-                            {
-                                tfc.AddText("This beatmap contains scenes with ");
-                                tfc.AddText("rapidly flashing colours", s =>
-                                {
-                                    s.Font = s.Font.With(weight: FontWeight.Bold);
-                                    s.Colour = colours.Yellow;
-                                });
-                                tfc.AddText(".");
-
-                                tfc.NewParagraph();
-                                tfc.AddText("Please take caution if you are affected by epilepsy.");
-                            }),
-                        }
-                    }
-                };
-
-                track = beatmap.Value.Track;
-                track.AddAdjustment(AdjustableProperty.Volume, trackVolumeOnEpilepsyWarning);
-            }
-
-            protected override void PopIn()
-            {
-                this.FadeIn(500, Easing.InQuint)
-                    .TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, 500, Easing.InQuint);
-
-                warningContent.FadeIn(500, Easing.InQuint);
-            }
-
-            protected override void PopOut() => this.FadeOut(500, Easing.InQuint);
-
-            protected override void Dispose(bool isDisposing)
-            {
-                base.Dispose(isDisposing);
-                track?.RemoveAdjustment(AdjustableProperty.Volume, trackVolumeOnEpilepsyWarning);
-            }
-        }
     }
 }

From a9f27a71a2ff60b848632cf5595b354b49db760a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Oct 2020 23:53:41 +0200
Subject: [PATCH 05585/10326] Fix code formatting issues

---
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs | 6 +++---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs       | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 341924ae6d..1efc71cad3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private TestPlayerLoaderContainer container;
         private TestPlayer player;
 
-        private bool EpilepsyWarning = false;
+        private bool epilepsyWarning;
 
         [Resolved]
         private AudioManager audioManager { get; set; }
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             beforeLoadAction?.Invoke();
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
-            Beatmap.Value.BeatmapInfo.EpilepsyWarning = EpilepsyWarning;
+            Beatmap.Value.BeatmapInfo.EpilepsyWarning = epilepsyWarning;
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToTrack>())
                 mod.ApplyToTrack(Beatmap.Value.Track);
@@ -247,7 +247,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [TestCase(false)]
         public void TestEpilepsyWarning(bool warning)
         {
-            AddStep("change epilepsy warning", () => EpilepsyWarning = warning);
+            AddStep("change epilepsy warning", () => epilepsyWarning = warning);
             AddStep("load dummy beatmap", () => ResetPlayer(false));
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
         }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index fd17e38a4f..36a3880890 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -175,6 +175,7 @@ namespace osu.Game.Beatmaps.Formats
                 case @"WidescreenStoryboard":
                     beatmap.BeatmapInfo.WidescreenStoryboard = Parsing.ParseInt(pair.Value) == 1;
                     break;
+
                 case @"EpilepsyWarning":
                     beatmap.BeatmapInfo.EpilepsyWarning = Parsing.ParseInt(pair.Value) == 1;
                     break;

From 850590304142d76ccd59d130765283ec7020ce44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Oct 2020 00:08:05 +0200
Subject: [PATCH 05586/10326] Move warning construction to load()

---
 osu.Game/Screens/Play/PlayerLoader.cs | 34 ++++++++++++++-------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 801feb7d01..8d66eb67d3 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
@@ -84,14 +85,15 @@ namespace osu.Game.Screens.Play
 
         private bool hideOverlays;
 
-        private bool epilepsyShown;
-
         private InputManager inputManager;
 
         private IdleTracker idleTracker;
 
         private ScheduledDelegate scheduledPushPlayer;
 
+        [CanBeNull]
+        private EpilepsyWarning epilepsyWarning;
+
         [Resolved(CanBeNull = true)]
         private NotificationOverlay notificationOverlay { get; set; }
 
@@ -140,6 +142,15 @@ namespace osu.Game.Screens.Play
                 },
                 idleTracker = new IdleTracker(750)
             });
+
+            if (Beatmap.Value.BeatmapInfo.EpilepsyWarning)
+            {
+                AddInternal(epilepsyWarning = new EpilepsyWarning
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                });
+            }
         }
 
         protected override void LoadComplete()
@@ -310,27 +321,18 @@ namespace osu.Game.Screens.Play
                 {
                     contentOut();
 
-                    if (true && !epilepsyShown)
+                    if (epilepsyWarning != null)
                     {
-                        EpilepsyWarning warning;
-
-                        AddInternal(warning = new EpilepsyWarning
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            State = { Value = Visibility.Visible }
-                        });
-
-                        epilepsyShown = true;
+                        epilepsyWarning.State.Value = Visibility.Visible;
 
                         this.Delay(2000).Schedule(() =>
                         {
-                            warning.Hide();
-                            warning.Expire();
+                            epilepsyWarning.Hide();
+                            epilepsyWarning.Expire();
                         });
                     }
 
-                    this.Delay(epilepsyShown ? 2500 : 250).Schedule(() =>
+                    this.Delay(epilepsyWarning?.State.Value == Visibility.Visible ? 2500 : 250).Schedule(() =>
                     {
                         if (!this.IsCurrentScreen()) return;
 

From 1ac0b3b13d5cd90028b2fae6596741a01178c949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Oct 2020 00:08:26 +0200
Subject: [PATCH 05587/10326] Add asserts to tests

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 1efc71cad3..38eca72bd1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays;
@@ -249,7 +250,10 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("change epilepsy warning", () => epilepsyWarning = warning);
             AddStep("load dummy beatmap", () => ResetPlayer(false));
+
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
+
+            AddAssert($"epilepsy warning {(warning ? "present" : "absent")}", () => this.ChildrenOfType<EpilepsyWarning>().Any() == warning);
         }
 
         private class TestPlayerLoaderContainer : Container

From 6e50ae045834f85310fa2943a12bd17e69fcbee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Oct 2020 00:22:30 +0200
Subject: [PATCH 05588/10326] Reformulate push sequence code

---
 osu.Game/Screens/Play/PlayerLoader.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 8d66eb67d3..eabe090725 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
@@ -321,18 +322,24 @@ namespace osu.Game.Screens.Play
                 {
                     contentOut();
 
+                    TransformSequence<PlayerLoader> pushSequence;
+
                     if (epilepsyWarning != null)
                     {
                         epilepsyWarning.State.Value = Visibility.Visible;
 
-                        this.Delay(2000).Schedule(() =>
+                        pushSequence = this.Delay(3000).Schedule(() =>
                         {
                             epilepsyWarning.Hide();
                             epilepsyWarning.Expire();
                         });
                     }
+                    else
+                    {
+                        pushSequence = this.Delay(0);
+                    }
 
-                    this.Delay(epilepsyWarning?.State.Value == Visibility.Visible ? 2500 : 250).Schedule(() =>
+                    pushSequence.Delay(250).Schedule(() =>
                     {
                         if (!this.IsCurrentScreen()) return;
 

From 1238e6c30fc27f905bdf9274fe0feb976b07cd27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Oct 2020 00:46:08 +0200
Subject: [PATCH 05589/10326] Add flag value to database

Unfortunately required, as loadBeatmaps() refreshes the decoded beatmap
with the database-stored values, which can end up overwriting the
decoded ones.
---
 osu.Game/Beatmaps/BeatmapInfo.cs              |   2 -
 ...01019224408_AddEpilepsyWarning.Designer.cs | 508 ++++++++++++++++++
 .../20201019224408_AddEpilepsyWarning.cs      |  23 +
 .../Migrations/OsuDbContextModelSnapshot.cs   |   2 +
 4 files changed, 533 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs
 create mode 100644 osu.Game/Migrations/20201019224408_AddEpilepsyWarning.cs

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index b7946d53ca..1512240f8a 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -90,8 +90,6 @@ namespace osu.Game.Beatmaps
 
         public bool LetterboxInBreaks { get; set; }
         public bool WidescreenStoryboard { get; set; }
-
-        [NotMapped]
         public bool EpilepsyWarning { get; set; }
 
         // Editor
diff --git a/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs b/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs
new file mode 100644
index 0000000000..1c05de832e
--- /dev/null
+++ b/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs
@@ -0,0 +1,508 @@
+// <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("20201019224408_AddEpilepsyWarning")]
+    partial class AddEpilepsyWarning
+    {
+        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<bool>("EpilepsyWarning");
+
+                    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/20201019224408_AddEpilepsyWarning.cs b/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.cs
new file mode 100644
index 0000000000..be6968aa5d
--- /dev/null
+++ b/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace osu.Game.Migrations
+{
+    public partial class AddEpilepsyWarning : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "EpilepsyWarning",
+                table: "BeatmapInfo",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EpilepsyWarning",
+                table: "BeatmapInfo");
+        }
+    }
+}
diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
index bc4fc3342d..ec4461ca56 100644
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
@@ -57,6 +57,8 @@ namespace osu.Game.Migrations
 
                     b.Property<double>("DistanceSpacing");
 
+                    b.Property<bool>("EpilepsyWarning");
+
                     b.Property<int>("GridSize");
 
                     b.Property<string>("Hash");

From a164d330e57744b80f0834dfa8d5601c4baab9f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Oct 2020 00:51:31 +0200
Subject: [PATCH 05590/10326] Improve feel of transition

---
 osu.Game/Screens/Play/EpilepsyWarning.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/EpilepsyWarning.cs b/osu.Game/Screens/Play/EpilepsyWarning.cs
index e115c7e057..244a903bdd 100644
--- a/osu.Game/Screens/Play/EpilepsyWarning.cs
+++ b/osu.Game/Screens/Play/EpilepsyWarning.cs
@@ -89,12 +89,12 @@ namespace osu.Game.Screens.Play
         protected override void PopIn()
         {
             this.FadeIn(500, Easing.InQuint)
-                .TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, 500, Easing.InQuint);
+                .TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, 500, Easing.InSine);
 
             warningContent.FadeIn(500, Easing.InQuint);
         }
 
-        protected override void PopOut() => this.FadeOut(500, Easing.InQuint);
+        protected override void PopOut() => this.FadeOut(500, Easing.OutQuint);
 
         protected override void Dispose(bool isDisposing)
         {

From 1fc22bdbffdace861ad701520e6cc7d44055d5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Oct 2020 00:59:30 +0200
Subject: [PATCH 05591/10326] Only show warning once on given map

---
 osu.Game/Screens/Play/PlayerLoader.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index eabe090725..fb03f09d8e 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -324,7 +324,9 @@ namespace osu.Game.Screens.Play
 
                     TransformSequence<PlayerLoader> pushSequence;
 
-                    if (epilepsyWarning != null)
+                    // only show if the warning was created (i.e. the beatmap needs it)
+                    // and this is not a restart of the map (the warning expires after first load).
+                    if (epilepsyWarning?.IsAlive == true)
                     {
                         epilepsyWarning.State.Value = Visibility.Visible;
 

From 05251c646ed52a55027d558136f7f4a48a967ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Oct 2020 01:06:20 +0200
Subject: [PATCH 05592/10326] Fade volume back up on pop out

---
 osu.Game/Screens/Play/EpilepsyWarning.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/EpilepsyWarning.cs b/osu.Game/Screens/Play/EpilepsyWarning.cs
index 244a903bdd..051604f115 100644
--- a/osu.Game/Screens/Play/EpilepsyWarning.cs
+++ b/osu.Game/Screens/Play/EpilepsyWarning.cs
@@ -89,12 +89,14 @@ namespace osu.Game.Screens.Play
         protected override void PopIn()
         {
             this.FadeIn(500, Easing.InQuint)
-                .TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, 500, Easing.InSine);
+                .TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, 500, Easing.InQuint);
 
             warningContent.FadeIn(500, Easing.InQuint);
         }
 
-        protected override void PopOut() => this.FadeOut(500, Easing.OutQuint);
+        protected override void PopOut()
+            => this.FadeOut(500, Easing.OutQuint)
+                   .TransformBindableTo(trackVolumeOnEpilepsyWarning, 1, 500, Easing.OutQuint);
 
         protected override void Dispose(bool isDisposing)
         {

From c57fecd1fc4379b7d15e58c5612e8c425ddea375 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Oct 2020 12:43:57 +0900
Subject: [PATCH 05593/10326] Update comment to make it clear this is a hack

---
 osu.Game/Screens/Play/HUDOverlay.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 0a45df51a0..6425f8123d 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -205,7 +205,9 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            // for now align with the accuracy counter. eventually this will be user customisable.
+            // HACK: for now align with the accuracy counter.
+            // this is done for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
+            // it only works with the default skin due to padding offsetting it *just enough* to coexist.
             topRightElements.Y = ToLocalSpace(AccuracyCounter.Drawable.ScreenSpaceDrawQuad.BottomRight).Y;
 
             bottomRightElements.Y = -Progress.Height;

From 267b399f9f120f1d92500f775fbbbb949ee0290d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Oct 2020 13:59:03 +0900
Subject: [PATCH 05594/10326] Add some simple border styles

---
 .../Configuration/OsuRulesetConfigManager.cs  |   5 +-
 .../Edit/OsuHitObjectComposer.cs              |  14 +-
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |   8 +-
 .../UI/OsuSettingsSubsection.cs               |   7 +-
 osu.Game/Rulesets/UI/PlayfieldBorder.cs       | 137 ++++++++++++++++--
 osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs  |  12 ++
 6 files changed, 156 insertions(+), 27 deletions(-)
 create mode 100644 osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs

diff --git a/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs b/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
index da8767c017..e8272057f3 100644
--- a/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
@@ -3,6 +3,7 @@
 
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Configuration;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Configuration
 {
@@ -19,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Configuration
             Set(OsuRulesetSetting.SnakingInSliders, true);
             Set(OsuRulesetSetting.SnakingOutSliders, true);
             Set(OsuRulesetSetting.ShowCursorTrail, true);
-            Set(OsuRulesetSetting.ShowPlayfieldBorder, false);
+            Set(OsuRulesetSetting.PlayfieldBorderStyle, PlayfieldBorderStyle.None);
         }
     }
 
@@ -28,6 +29,6 @@ namespace osu.Game.Rulesets.Osu.Configuration
         SnakingInSliders,
         SnakingOutSliders,
         ShowCursorTrail,
-        ShowPlayfieldBorder,
+        PlayfieldBorderStyle,
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index d9de9d2c5d..edd684d886 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -56,12 +56,18 @@ namespace osu.Game.Rulesets.Osu.Edit
         [BackgroundDependencyLoader]
         private void load()
         {
-            LayerBelowRuleset.Add(new PlayfieldBorder
+            LayerBelowRuleset.AddRange(new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                State = { Value = Visibility.Visible }
+                new PlayfieldBorder
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    PlayfieldBorderStyle = { Value = PlayfieldBorderStyle.Corners }
+                },
+                distanceSnapGridContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both
+                }
             });
-            LayerBelowRuleset.Add(distanceSnapGridContainer = new Container { RelativeSizeAxes = Axes.Both });
 
             selectedHitObjects = EditorBeatmap.SelectedHitObjects.GetBoundCopy();
             selectedHitObjects.CollectionChanged += (_, __) => updateDistanceSnapGrid();
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 26fe686b0d..50727d590a 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
 
-        private readonly Bindable<bool> showPlayfieldBorder = new BindableBool();
+        private readonly Bindable<bool> playfieldBorderStyle = new BindableBool();
 
         private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>();
 
@@ -90,13 +90,9 @@ namespace osu.Game.Rulesets.Osu.UI
         [BackgroundDependencyLoader(true)]
         private void load(OsuRulesetConfigManager config)
         {
-            config?.BindWith(OsuRulesetSetting.ShowPlayfieldBorder, showPlayfieldBorder);
-            showPlayfieldBorder.BindValueChanged(updateBorderVisibility, true);
+            config?.BindWith(OsuRulesetSetting.PlayfieldBorderStyle, playfieldBorder.PlayfieldBorderStyle);
         }
 
-        private void updateBorderVisibility(ValueChangedEvent<bool> settingChange)
-            => playfieldBorder.State.Value = settingChange.NewValue ? Visibility.Visible : Visibility.Hidden;
-
         public override void Add(DrawableHitObject h)
         {
             h.OnNewResult += onNewResult;
diff --git a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
index 28c609f412..705ba3e929 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Osu.Configuration;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
@@ -39,10 +40,10 @@ namespace osu.Game.Rulesets.Osu.UI
                     LabelText = "Cursor trail",
                     Current = config.GetBindable<bool>(OsuRulesetSetting.ShowCursorTrail)
                 },
-                new SettingsCheckbox
+                new SettingsEnumDropdown<PlayfieldBorderStyle>
                 {
-                    LabelText = "Show playfield border",
-                    Current = config.GetBindable<bool>(OsuRulesetSetting.ShowPlayfieldBorder),
+                    LabelText = "Playfield border style",
+                    Current = config.GetBindable<PlayfieldBorderStyle>(OsuRulesetSetting.PlayfieldBorderStyle),
                 },
             };
         }
diff --git a/osu.Game/Rulesets/UI/PlayfieldBorder.cs b/osu.Game/Rulesets/UI/PlayfieldBorder.cs
index 66371c89ad..c83d1e7842 100644
--- a/osu.Game/Rulesets/UI/PlayfieldBorder.cs
+++ b/osu.Game/Rulesets/UI/PlayfieldBorder.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 osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.UI
@@ -11,27 +15,136 @@ namespace osu.Game.Rulesets.UI
     /// <summary>
     /// Provides a border around the playfield.
     /// </summary>
-    public class PlayfieldBorder : VisibilityContainer
+    public class PlayfieldBorder : CompositeDrawable
     {
-        private const int fade_duration = 200;
+        public Bindable<PlayfieldBorderStyle> PlayfieldBorderStyle { get; } = new Bindable<PlayfieldBorderStyle>();
+
+        private const int fade_duration = 500;
+
+        private const float corner_length = 0.05f;
+        private const float corner_thickness = 2;
 
         public PlayfieldBorder()
         {
             RelativeSizeAxes = Axes.Both;
 
-            Masking = true;
-            BorderColour = Color4.White;
-            BorderThickness = 2;
-
-            InternalChild = new Box
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Alpha = 0,
-                AlwaysPresent = true
+                new Line(Direction.Horizontal)
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                },
+                new Line(Direction.Horizontal)
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                },
+                new Line(Direction.Horizontal)
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                },
+                new Line(Direction.Horizontal)
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                },
+                new Line(Direction.Vertical)
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                },
+                new Line(Direction.Vertical)
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                },
+                new Line(Direction.Vertical)
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                },
+                new Line(Direction.Vertical)
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                },
             };
         }
 
-        protected override void PopIn() => this.FadeIn(fade_duration, Easing.OutQuint);
-        protected override void PopOut() => this.FadeOut(fade_duration, Easing.OutQuint);
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            PlayfieldBorderStyle.BindValueChanged(updateStyle, true);
+        }
+
+        private void updateStyle(ValueChangedEvent<PlayfieldBorderStyle> style)
+        {
+            switch (style.NewValue)
+            {
+                case UI.PlayfieldBorderStyle.None:
+                    this.FadeOut(fade_duration, Easing.OutQuint);
+                    foreach (var line in InternalChildren.OfType<Line>())
+                        line.TweenLength(0);
+
+                    break;
+
+                case UI.PlayfieldBorderStyle.Corners:
+                    this.FadeIn(fade_duration, Easing.OutQuint);
+                    foreach (var line in InternalChildren.OfType<Line>())
+                        line.TweenLength(corner_length);
+
+                    break;
+
+                case UI.PlayfieldBorderStyle.Full:
+                    this.FadeIn(fade_duration, Easing.OutQuint);
+                    foreach (var line in InternalChildren.OfType<Line>())
+                        line.TweenLength(0.5f);
+
+                    break;
+            }
+        }
+
+        private class Line : Box
+        {
+            private readonly Direction direction;
+
+            public Line(Direction direction)
+            {
+                this.direction = direction;
+
+                Colour = Color4.White;
+                // starting in relative avoids the framework thinking it knows best and setting the width to 1 initially.
+
+                switch (direction)
+                {
+                    case Direction.Horizontal:
+                        RelativeSizeAxes = Axes.X;
+                        Size = new Vector2(0, corner_thickness);
+                        break;
+
+                    case Direction.Vertical:
+                        RelativeSizeAxes = Axes.Y;
+                        Size = new Vector2(corner_thickness, 0);
+                        break;
+                }
+            }
+
+            public void TweenLength(float value)
+            {
+                switch (direction)
+                {
+                    case Direction.Horizontal:
+                        this.ResizeWidthTo(value, fade_duration, Easing.OutQuint);
+                        break;
+
+                    case Direction.Vertical:
+                        this.ResizeHeightTo(value, fade_duration, Easing.OutQuint);
+                        break;
+                }
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs b/osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs
new file mode 100644
index 0000000000..0a0aad884e
--- /dev/null
+++ b/osu.Game/Rulesets/UI/PlayfieldBorderStyle.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.UI
+{
+    public enum PlayfieldBorderStyle
+    {
+        None,
+        Corners,
+        Full
+    }
+}

From f9ca47ca86a2d7e40f6b05a46e3e9ddf5d85f37e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Oct 2020 13:59:07 +0900
Subject: [PATCH 05595/10326] Add test coverage

---
 .../TestPlayfieldBorder.cs                    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestPlayfieldBorder.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestPlayfieldBorder.cs b/osu.Game.Rulesets.Osu.Tests/TestPlayfieldBorder.cs
new file mode 100644
index 0000000000..23d9d265be
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestPlayfieldBorder.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 osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.UI;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestPlayfieldBorder : OsuTestScene
+    {
+        public TestPlayfieldBorder()
+        {
+            Bindable<PlayfieldBorderStyle> playfieldBorderStyle = new Bindable<PlayfieldBorderStyle>();
+
+            AddStep("add drawables", () =>
+            {
+                Child = new Container
+                {
+                    Size = new Vector2(400, 300),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        new PlayfieldBorder
+                        {
+                            PlayfieldBorderStyle = { BindTarget = playfieldBorderStyle }
+                        }
+                    }
+                };
+            });
+
+            AddStep("Set none", () => playfieldBorderStyle.Value = PlayfieldBorderStyle.None);
+            AddStep("Set corners", () => playfieldBorderStyle.Value = PlayfieldBorderStyle.Corners);
+            AddStep("Set full", () => playfieldBorderStyle.Value = PlayfieldBorderStyle.Full);
+        }
+    }
+}

From 024009e1749aee8c7a147c1ac2645080b88b25f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Oct 2020 14:19:15 +0900
Subject: [PATCH 05596/10326] Change default to "always visible"

---
 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 e95f8b571a..7d601c0cb9 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.HitLighting, true);
 
-            Set(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.DuringGameplay);
+            Set(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Always);
             Set(OsuSetting.ShowProgressGraph, true);
             Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
             Set(OsuSetting.FadePlayfieldWhenHealthLow, true);

From 4f8a755518d45ba9d4c40b717e0729cb8ebbac82 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Oct 2020 14:20:44 +0900
Subject: [PATCH 05597/10326] Add "hide during gameplay" mode

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs | 2 +-
 osu.Game/Configuration/HUDVisibilityMode.cs           | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 55d6b38b66..6ec673704c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestExternalHideDoesntAffectConfig()
         {
-            HUDVisibilityMode originalConfigValue = HUDVisibilityMode.DuringGameplay;
+            HUDVisibilityMode originalConfigValue = HUDVisibilityMode.HideDuringBreaks;
 
             createNew();
 
diff --git a/osu.Game/Configuration/HUDVisibilityMode.cs b/osu.Game/Configuration/HUDVisibilityMode.cs
index 2b133b1bcf..b0b55dd811 100644
--- a/osu.Game/Configuration/HUDVisibilityMode.cs
+++ b/osu.Game/Configuration/HUDVisibilityMode.cs
@@ -9,8 +9,11 @@ namespace osu.Game.Configuration
     {
         Never,
 
+        [Description("Hide during gameplay")]
+        HideDuringGameplay,
+
         [Description("Hide during breaks")]
-        DuringGameplay,
+        HideDuringBreaks,
 
         Always
     }

From 4e57751ca1ebe5284a58d783bea35c6786e7b8df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Oct 2020 15:03:12 +0900
Subject: [PATCH 05598/10326] Fix background dim application to avoid overdraw,
 transition smoother

---
 osu.Game/Screens/Play/EpilepsyWarning.cs | 18 +++++++-----------
 osu.Game/Screens/Play/PlayerLoader.cs    |  3 +++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/EpilepsyWarning.cs b/osu.Game/Screens/Play/EpilepsyWarning.cs
index 051604f115..960d549ab6 100644
--- a/osu.Game/Screens/Play/EpilepsyWarning.cs
+++ b/osu.Game/Screens/Play/EpilepsyWarning.cs
@@ -5,16 +5,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 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.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Screens.Backgrounds;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play
 {
@@ -31,16 +29,13 @@ namespace osu.Game.Screens.Play
             Alpha = 0f;
         }
 
+        public BackgroundScreenBeatmap DimmableBackground { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, IBindable<WorkingBeatmap> beatmap)
         {
             Children = new Drawable[]
             {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black.Opacity(0.5f),
-                },
                 warningContent = new FillFlowContainer
                 {
                     Anchor = Anchor.Centre,
@@ -88,10 +83,11 @@ namespace osu.Game.Screens.Play
 
         protected override void PopIn()
         {
-            this.FadeIn(500, Easing.InQuint)
-                .TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, 500, Easing.InQuint);
+            this.TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, FADE_DURATION);
 
-            warningContent.FadeIn(500, Easing.InQuint);
+            DimmableBackground?.FadeColour(OsuColour.Gray(0.5f), FADE_DURATION, Easing.OutQuint);
+
+            this.FadeIn(FADE_DURATION, Easing.OutQuint);
         }
 
         protected override void PopOut()
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index f68246c928..ef01072a62 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -167,6 +167,9 @@ namespace osu.Game.Screens.Play
         {
             base.OnEntering(last);
 
+            if (epilepsyWarning != null)
+                epilepsyWarning.DimmableBackground = Background;
+
             content.ScaleTo(0.7f);
             Background?.FadeColour(Color4.White, 800, Easing.OutQuint);
 

From 7a68636f71195e9003e84d52b3f1e598e3089ad4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Oct 2020 15:03:33 +0900
Subject: [PATCH 05599/10326] Adjust fade sequence and durations to feel better

---
 osu.Game/Screens/Play/EpilepsyWarning.cs |  6 +++---
 osu.Game/Screens/Play/PlayerLoader.cs    | 23 +++++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Play/EpilepsyWarning.cs b/osu.Game/Screens/Play/EpilepsyWarning.cs
index 960d549ab6..1c8e8c2f4e 100644
--- a/osu.Game/Screens/Play/EpilepsyWarning.cs
+++ b/osu.Game/Screens/Play/EpilepsyWarning.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Screens.Play
 {
     public class EpilepsyWarning : VisibilityContainer
     {
+        public const double FADE_DURATION = 500;
+
         private readonly BindableDouble trackVolumeOnEpilepsyWarning = new BindableDouble(1f);
 
         private Track track;
@@ -90,9 +92,7 @@ namespace osu.Game.Screens.Play
             this.FadeIn(FADE_DURATION, Easing.OutQuint);
         }
 
-        protected override void PopOut()
-            => this.FadeOut(500, Easing.OutQuint)
-                   .TransformBindableTo(trackVolumeOnEpilepsyWarning, 1, 500, Easing.OutQuint);
+        protected override void PopOut() => this.FadeOut(FADE_DURATION);
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index ef01072a62..fae0bfb295 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -323,26 +323,29 @@ namespace osu.Game.Screens.Play
                 {
                     contentOut();
 
-                    TransformSequence<PlayerLoader> pushSequence;
+                    TransformSequence<PlayerLoader> pushSequence = this.Delay(250);
 
                     // only show if the warning was created (i.e. the beatmap needs it)
                     // and this is not a restart of the map (the warning expires after first load).
                     if (epilepsyWarning?.IsAlive == true)
                     {
-                        epilepsyWarning.State.Value = Visibility.Visible;
+                        const double epilepsy_display_length = 3000;
 
-                        pushSequence = this.Delay(3000).Schedule(() =>
+                        pushSequence.Schedule(() =>
                         {
-                            epilepsyWarning.Hide();
-                            epilepsyWarning.Expire();
+                            epilepsyWarning.State.Value = Visibility.Visible;
+
+                            this.Delay(epilepsy_display_length).Schedule(() =>
+                            {
+                                epilepsyWarning.Hide();
+                                epilepsyWarning.Expire();
+                            });
                         });
-                    }
-                    else
-                    {
-                        pushSequence = this.Delay(0);
+
+                        pushSequence.Delay(epilepsy_display_length);
                     }
 
-                    pushSequence.Delay(250).Schedule(() =>
+                    pushSequence.Schedule(() =>
                     {
                         if (!this.IsCurrentScreen()) return;
 

From 411ae38605bd601336de5f01e88e48e65d2453be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Oct 2020 15:06:31 +0900
Subject: [PATCH 05600/10326] Remove unused using

---
 osu.Game/Rulesets/UI/PlayfieldBorder.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/PlayfieldBorder.cs b/osu.Game/Rulesets/UI/PlayfieldBorder.cs
index c83d1e7842..458b88c6db 100644
--- a/osu.Game/Rulesets/UI/PlayfieldBorder.cs
+++ b/osu.Game/Rulesets/UI/PlayfieldBorder.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 osu.Framework.Bindables;
 using osu.Framework.Graphics;

From 55d08fad5cdca600405551729126dbfe2634f687 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Oct 2020 15:18:15 +0900
Subject: [PATCH 05601/10326] Remove unused field

---
 osu.Game/Screens/Play/EpilepsyWarning.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/EpilepsyWarning.cs b/osu.Game/Screens/Play/EpilepsyWarning.cs
index 1c8e8c2f4e..e3cf0cd227 100644
--- a/osu.Game/Screens/Play/EpilepsyWarning.cs
+++ b/osu.Game/Screens/Play/EpilepsyWarning.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Screens.Play
         private readonly BindableDouble trackVolumeOnEpilepsyWarning = new BindableDouble(1f);
 
         private Track track;
-        private FillFlowContainer warningContent;
 
         public EpilepsyWarning()
         {
@@ -38,7 +37,7 @@ namespace osu.Game.Screens.Play
         {
             Children = new Drawable[]
             {
-                warningContent = new FillFlowContainer
+                new FillFlowContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

From 2c7880e9d6118d01ca5c0150780f1cf136c357df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Oct 2020 18:27:03 +0200
Subject: [PATCH 05602/10326] Add failing test case

---
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 888a2f2197..9b31dd045a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -265,6 +265,26 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
 
             AddAssert($"epilepsy warning {(warning ? "present" : "absent")}", () => this.ChildrenOfType<EpilepsyWarning>().Any() == warning);
+
+            if (warning)
+            {
+                AddUntilStep("sound volume decreased", () => Beatmap.Value.Track.AggregateVolume.Value == 0.25);
+                AddUntilStep("sound volume restored", () => Beatmap.Value.Track.AggregateVolume.Value == 1);
+            }
+        }
+
+        [Test]
+        public void TestEpilepsyWarningEarlyExit()
+        {
+            AddStep("set epilepsy warning", () => epilepsyWarning = true);
+            AddStep("load dummy beatmap", () => ResetPlayer(false));
+
+            AddUntilStep("wait for current", () => loader.IsCurrentScreen());
+
+            AddUntilStep("wait for epilepsy warning", () => loader.ChildrenOfType<EpilepsyWarning>().Single().Alpha > 0);
+            AddStep("exit early", () => loader.Exit());
+
+            AddUntilStep("sound volume restored", () => Beatmap.Value.Track.AggregateVolume.Value == 1);
         }
 
         private class TestPlayerLoaderContainer : Container

From e54836a63e4051bc517d1d044cfe566490fabf33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Oct 2020 22:27:59 +0200
Subject: [PATCH 05603/10326] Use SkinnableSprite to avoid unnecessary reloads

---
 .../Drawables/DrawableStoryboardAnimation.cs  | 52 +++++--------------
 .../Drawables/DrawableStoryboardSprite.cs     | 39 ++++----------
 2 files changed, 24 insertions(+), 67 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 963cf37fea..c3b6dde44b 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -2,13 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -16,18 +15,10 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    public class DrawableStoryboardAnimation : SkinReloadableDrawable, IFlippable, IVectorScalable
+    public class DrawableStoryboardAnimation : DrawableAnimation, IFlippable, IVectorScalable
     {
         public StoryboardAnimation Animation { get; }
 
-        private TextureAnimation drawableTextureAnimation;
-
-        [Resolved]
-        private TextureStore storyboardTextureStore { get; set; }
-
-        private readonly List<string> texturePathsRaw = new List<string>();
-        private readonly List<string> texturePaths = new List<string>();
-
         private bool flipH;
 
         public bool FlipH
@@ -119,48 +110,31 @@ namespace osu.Game.Storyboards.Drawables
             Animation = animation;
             Origin = animation.Origin;
             Position = animation.InitialPosition;
+            Loop = animation.LoopType == AnimationLoopType.LoopForever;
 
             LifetimeStart = animation.StartTime;
             LifetimeEnd = animation.EndTime;
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap)
+        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
         {
-            InternalChild = drawableTextureAnimation = new TextureAnimation
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Loop = Animation.LoopType == AnimationLoopType.LoopForever
-            };
-
             for (var frame = 0; frame < Animation.FrameCount; frame++)
             {
                 var framePath = Animation.Path.Replace(".", frame + ".");
-                texturePathsRaw.Add(Path.GetFileNameWithoutExtension(framePath));
 
-                var path = beatmap.Value.BeatmapSetInfo.Files.Find(f => f.Filename.Equals(framePath, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
-                texturePaths.Add(path);
+                var storyboardPath = beatmap.Value.BeatmapSetInfo.Files.Find(f => f.Filename.Equals(framePath, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+                var frameSprite = storyboardPath != null
+                    ? (Drawable)new Sprite
+                    {
+                        Texture = textureStore.Get(storyboardPath)
+                    }
+                    : new SkinnableSprite(framePath); // fall back to skin textures if not found in storyboard files.
+
+                AddFrame(frameSprite, Animation.FrameDelay);
             }
 
             Animation.ApplyTransforms(this);
         }
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            drawableTextureAnimation.ClearFrames();
-
-            for (var frame = 0; frame < Animation.FrameCount; frame++)
-            {
-                var texture = skin?.GetTexture(texturePathsRaw[frame]) ?? storyboardTextureStore?.Get(texturePaths[frame]);
-
-                if (texture == null)
-                    continue;
-
-                drawableTextureAnimation.AddFrame(texture, Animation.FrameDelay);
-            }
-        }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index cd09cafbce..95774de898 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -2,11 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
@@ -15,17 +15,10 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    public class DrawableStoryboardSprite : SkinReloadableDrawable, IFlippable, IVectorScalable
+    public class DrawableStoryboardSprite : CompositeDrawable, IFlippable, IVectorScalable
     {
         public StoryboardSprite Sprite { get; }
 
-        private Sprite drawableSprite;
-
-        [Resolved]
-        private TextureStore storyboardTextureStore { get; set; }
-
-        private string texturePath;
-
         private bool flipH;
 
         public bool FlipH
@@ -123,29 +116,19 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap)
+        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
         {
-            InternalChild = drawableSprite = new Sprite
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre
-            };
+            var storyboardPath = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Sprite.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+            var sprite = storyboardPath != null
+                ? (Drawable)new Sprite
+                {
+                    Texture = textureStore.Get(storyboardPath)
+                }
+                : new SkinnableSprite(Sprite.Path); // fall back to skin textures if not found in storyboard files.
 
-            texturePath = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Sprite.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+            InternalChild = sprite.With(s => s.Anchor = s.Origin = Anchor.Centre);
 
             Sprite.ApplyTransforms(this);
         }
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            var newTexture = skin?.GetTexture(Path.GetFileNameWithoutExtension(Sprite.Path)) ?? storyboardTextureStore?.Get(texturePath);
-
-            if (drawableSprite.Texture == newTexture) return;
-
-            drawableSprite.Size = Vector2.Zero; // Sprite size needs to be recalculated (e.g. aspect ratio of combo number textures may differ between skins)
-            drawableSprite.Texture = newTexture;
-        }
     }
 }

From cdd56ece871a9999288196a859033a44665a3c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Oct 2020 23:32:04 +0200
Subject: [PATCH 05604/10326] Read UseSkinSprites when decoding storyboards

---
 .../Beatmaps/Formats/LegacyStoryboardDecoder.cs  | 16 ++++++++++++++++
 osu.Game/Storyboards/Storyboard.cs               |  5 +++++
 2 files changed, 21 insertions(+)

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 269449ef80..e2550d1ca4 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -48,6 +48,10 @@ namespace osu.Game.Beatmaps.Formats
 
             switch (section)
             {
+                case Section.General:
+                    handleGeneral(storyboard, line);
+                    return;
+
                 case Section.Events:
                     handleEvents(line);
                     return;
@@ -60,6 +64,18 @@ namespace osu.Game.Beatmaps.Formats
             base.ParseLine(storyboard, section, line);
         }
 
+        private void handleGeneral(Storyboard storyboard, string line)
+        {
+            var pair = SplitKeyVal(line);
+
+            switch (pair.Key)
+            {
+                case "UseSkinSprites":
+                    storyboard.UseSkinSprites = pair.Value == "1";
+                    break;
+            }
+        }
+
         private void handleEvents(string line)
         {
             var depth = 0;
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index b0fb583d62..daafdf015d 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -15,6 +15,11 @@ namespace osu.Game.Storyboards
 
         public BeatmapInfo BeatmapInfo = new BeatmapInfo();
 
+        /// <summary>
+        /// Whether the storyboard can fall back to skin sprites in case no matching storyboard sprites are found.
+        /// </summary>
+        public bool UseSkinSprites { get; set; }
+
         public bool HasDrawable => Layers.Any(l => l.Elements.Any(e => e.IsDrawable));
 
         public double FirstEventTime => Layers.Min(l => l.Elements.FirstOrDefault()?.StartTime ?? 0);

From 58a54c5b6c71c01315dd5effeb33f08a61449db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Oct 2020 23:40:20 +0200
Subject: [PATCH 05605/10326] Utilise UseSkinSprites value in storyboard sprite
 logic

---
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs  |  1 +
 .../Drawables/DrawableStoryboardAnimation.cs          | 11 ++++-------
 .../Storyboards/Drawables/DrawableStoryboardSprite.cs | 11 ++++-------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index ec461fa095..4bc28e6cef 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -15,6 +15,7 @@ namespace osu.Game.Storyboards.Drawables
 {
     public class DrawableStoryboard : Container<DrawableStoryboardLayer>
     {
+        [Cached]
         public Storyboard Storyboard { get; }
 
         protected override Container<DrawableStoryboardLayer> Content { get; }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index c3b6dde44b..8382f91d1f 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -117,19 +117,16 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
+        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore, Storyboard storyboard)
         {
             for (var frame = 0; frame < Animation.FrameCount; frame++)
             {
                 var framePath = Animation.Path.Replace(".", frame + ".");
 
                 var storyboardPath = beatmap.Value.BeatmapSetInfo.Files.Find(f => f.Filename.Equals(framePath, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
-                var frameSprite = storyboardPath != null
-                    ? (Drawable)new Sprite
-                    {
-                        Texture = textureStore.Get(storyboardPath)
-                    }
-                    : new SkinnableSprite(framePath); // fall back to skin textures if not found in storyboard files.
+                var frameSprite = storyboard.UseSkinSprites && storyboardPath == null
+                    ? (Drawable)new SkinnableSprite(framePath)
+                    : new Sprite { Texture = textureStore.Get(storyboardPath) };
 
                 AddFrame(frameSprite, Animation.FrameDelay);
             }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 95774de898..9599375c76 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -116,15 +116,12 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
+        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore, Storyboard storyboard)
         {
             var storyboardPath = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Sprite.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
-            var sprite = storyboardPath != null
-                ? (Drawable)new Sprite
-                {
-                    Texture = textureStore.Get(storyboardPath)
-                }
-                : new SkinnableSprite(Sprite.Path); // fall back to skin textures if not found in storyboard files.
+            var sprite = storyboard.UseSkinSprites && storyboardPath == null
+                ? (Drawable)new SkinnableSprite(Sprite.Path)
+                : new Sprite { Texture = textureStore.Get(storyboardPath) };
 
             InternalChild = sprite.With(s => s.Anchor = s.Origin = Anchor.Centre);
 

From 8c14c9e1c4eb36789b150d14e273e6b6ccf1f772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Oct 2020 22:42:47 +0200
Subject: [PATCH 05606/10326] Add basic test coverage

---
 .../TestSceneDrawableStoryboardSprite.cs      | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
new file mode 100644
index 0000000000..9501026edc
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
@@ -0,0 +1,65 @@
+// Copyright (c) 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.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Skinning;
+using osu.Game.Storyboards;
+using osu.Game.Storyboards.Drawables;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneDrawableStoryboardSprite : SkinnableTestScene
+    {
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+
+        [Cached]
+        private Storyboard storyboard { get; set; } = new Storyboard();
+
+        [Test]
+        public void TestSkinSpriteDisallowedByDefault()
+        {
+            const string lookup_name = "hitcircleoverlay";
+
+            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = false);
+
+            AddStep("create sprites", () => SetContents(
+                () => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
+
+            assertSpritesFromSkin(false);
+        }
+
+        [Test]
+        public void TestAllowLookupFromSkin()
+        {
+            const string lookup_name = "hitcircleoverlay";
+
+            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
+
+            AddStep("create sprites", () => SetContents(
+                () => createSprite(lookup_name, Anchor.Centre, Vector2.Zero)));
+
+            assertSpritesFromSkin(true);
+        }
+
+        private DrawableStoryboardSprite createSprite(string lookupName, Anchor origin, Vector2 initialPosition)
+            => new DrawableStoryboardSprite(
+                new StoryboardSprite(lookupName, origin, initialPosition)
+            ).With(s =>
+            {
+                s.LifetimeStart = double.MinValue;
+                s.LifetimeEnd = double.MaxValue;
+            });
+
+        private void assertSpritesFromSkin(bool fromSkin) =>
+            AddAssert($"sprites are {(fromSkin ? "from skin" : "from storyboard")}",
+                () => this.ChildrenOfType<DrawableStoryboardSprite>()
+                          .All(sprite => sprite.ChildrenOfType<SkinnableSprite>().Any() == fromSkin));
+    }
+}

From 22112e4303e8f017730a8c87f8ccb03f8e07c537 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Oct 2020 23:09:39 +0900
Subject: [PATCH 05607/10326] Fix ISourcedFromTouch events being blocked by
 LoadingLayer

---
 osu.Game/Graphics/UserInterface/LoadingLayer.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index 35b33c3d03..200edf84a6 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -44,6 +44,11 @@ namespace osu.Game.Graphics.UserInterface
                 // blocking scroll can cause weird behaviour when this layer is used within a ScrollContainer.
                 case ScrollEvent _:
                     return false;
+
+                // blocking touch events causes the ISourcedFromTouch versions to not be fired, potentially impeding behaviour of drawables *above* the loading layer that may utilise these.
+                // note that this will not work well if touch handling elements are beneath the this loading layer (something to consider for the future).
+                case TouchEvent _:
+                    return false;
             }
 
             return true;

From 58c9e57a685d3cee372857f863aab575fd1cbf71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 21 Oct 2020 17:17:23 +0200
Subject: [PATCH 05608/10326] Fix comment

---
 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 200edf84a6..c8c4424bee 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Graphics.UserInterface
                     return false;
 
                 // blocking touch events causes the ISourcedFromTouch versions to not be fired, potentially impeding behaviour of drawables *above* the loading layer that may utilise these.
-                // note that this will not work well if touch handling elements are beneath the this loading layer (something to consider for the future).
+                // note that this will not work well if touch handling elements are beneath this loading layer (something to consider for the future).
                 case TouchEvent _:
                     return false;
             }

From 670775cecbe8d642a229b22d5854f0c2f519383d Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 21 Oct 2020 18:57:48 +0200
Subject: [PATCH 05609/10326] Make beatmap wedge difficulty indicator color
 update dynamically.

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 26 +++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 2a3eb8c67a..6085e266d7 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -39,6 +39,11 @@ namespace osu.Game.Screens.Select
 
         private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
+        [Resolved]
+        private BeatmapDifficultyManager difficultyManager { get; set; }
+
+        private IBindable<StarDifficulty> beatmapDifficulty;
+
         protected BufferedWedgeInfo Info;
 
         public BeatmapInfoWedge()
@@ -88,6 +93,11 @@ namespace osu.Game.Screens.Select
                 if (beatmap == value) return;
 
                 beatmap = value;
+
+                beatmapDifficulty?.UnbindAll();
+                beatmapDifficulty = difficultyManager.GetBindableDifficulty(beatmap.BeatmapInfo);
+                beatmapDifficulty.BindValueChanged(_ => updateDisplay());
+
                 updateDisplay();
             }
         }
@@ -113,7 +123,7 @@ namespace osu.Game.Screens.Select
                 return;
             }
 
-            LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value)
+            LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, beatmapDifficulty.Value)
             {
                 Shear = -Shear,
                 Depth = Info?.Depth + 1 ?? 0
@@ -141,12 +151,14 @@ namespace osu.Game.Screens.Select
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
+            private readonly StarDifficulty starDifficulty;
 
-            public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset)
+            public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset, StarDifficulty difficulty)
                 : base(pixelSnapping: true)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
+                starDifficulty = difficulty;
             }
 
             [BackgroundDependencyLoader]
@@ -190,7 +202,7 @@ namespace osu.Game.Screens.Select
                             },
                         },
                     },
-                    new DifficultyColourBar(beatmapInfo)
+                    new DifficultyColourBar(starDifficulty)
                     {
                         RelativeSizeAxes = Axes.Y,
                         Width = 20,
@@ -447,11 +459,11 @@ namespace osu.Game.Screens.Select
 
             private class DifficultyColourBar : Container
             {
-                private readonly BeatmapInfo beatmap;
+                private readonly StarDifficulty difficulty;
 
-                public DifficultyColourBar(BeatmapInfo beatmap)
+                public DifficultyColourBar(StarDifficulty difficulty)
                 {
-                    this.beatmap = beatmap;
+                    this.difficulty = difficulty;
                 }
 
                 [BackgroundDependencyLoader]
@@ -459,7 +471,7 @@ namespace osu.Game.Screens.Select
                 {
                     const float full_opacity_ratio = 0.7f;
 
-                    var difficultyColour = colours.ForDifficultyRating(beatmap.DifficultyRating);
+                    var difficultyColour = colours.ForDifficultyRating(difficulty.DifficultyRating);
 
                     Children = new Drawable[]
                     {

From cf69eacae9164311f973d10eb60bebf96330456c Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 21 Oct 2020 19:05:14 +0200
Subject: [PATCH 05610/10326] Make StarRatingDisplay dynamic.

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 25 +++++++++++++++----
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   |  6 ++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 4b38b298f1..402ab99908 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Screens.Ranking.Expanded
     {
         private readonly BeatmapInfo beatmap;
 
+        private StarDifficulty? difficulty;
+
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/>.
         /// </summary>
@@ -31,20 +33,33 @@ namespace osu.Game.Screens.Ranking.Expanded
         public StarRatingDisplay(BeatmapInfo beatmap)
         {
             this.beatmap = beatmap;
-            AutoSizeAxes = Axes.Both;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
+        /// </summary>
+        /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
+        public StarRatingDisplay(StarDifficulty starDifficulty)
+        {
+            difficulty = starDifficulty;
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, BeatmapDifficultyManager difficultyManager)
         {
-            var starRatingParts = beatmap.StarDifficulty.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            AutoSizeAxes = Axes.Both;
+
+            if (!difficulty.HasValue)
+                difficulty = difficultyManager.GetDifficulty(beatmap);
+
+            var starRatingParts = difficulty.Value.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
             string wholePart = starRatingParts[0];
             string fractionPart = starRatingParts[1];
             string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
 
-            ColourInfo backgroundColour = beatmap.DifficultyRating == DifficultyRating.ExpertPlus
+            ColourInfo backgroundColour = difficulty.Value.DifficultyRating == DifficultyRating.ExpertPlus
                 ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(beatmap.DifficultyRating);
+                : (ColourInfo)colours.ForDifficultyRating(difficulty.Value.DifficultyRating);
 
             InternalChildren = new Drawable[]
             {
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 6085e266d7..bdfcc2fd96 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -238,7 +238,7 @@ namespace osu.Game.Screens.Select
                         Shear = wedged_container_shear,
                         Children = new[]
                         {
-                            createStarRatingDisplay(beatmapInfo).With(display =>
+                            createStarRatingDisplay(starDifficulty).With(display =>
                             {
                                 display.Anchor = Anchor.TopRight;
                                 display.Origin = Anchor.TopRight;
@@ -305,8 +305,8 @@ namespace osu.Game.Screens.Select
                     StatusPill.Hide();
             }
 
-            private static Drawable createStarRatingDisplay(BeatmapInfo beatmapInfo) => beatmapInfo.StarDifficulty > 0
-                ? new StarRatingDisplay(beatmapInfo)
+            private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
+                ? new StarRatingDisplay(difficulty)
                 {
                     Margin = new MarginPadding { Bottom = 5 }
                 }

From 9753dab93bd1e71324be2a84cda27500877fb38e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 14:19:12 +0900
Subject: [PATCH 05611/10326] Remove IOnlineComponent and change existing
 components to use bindable flow

---
 .../Visual/Online/TestSceneFriendDisplay.cs   | 11 +--
 .../Online/TestSceneOnlineViewContainer.cs    |  8 +-
 ...BeatmapManager_BeatmapOnlineLookupQueue.cs |  2 +-
 osu.Game/Online/API/APIAccess.cs              | 73 +++++--------------
 osu.Game/Online/API/DummyAPIAccess.cs         | 40 +++-------
 osu.Game/Online/API/IAPIProvider.cs           | 14 +---
 osu.Game/Online/API/IOnlineComponent.cs       | 10 ---
 osu.Game/Online/Leaderboards/Leaderboard.cs   | 20 +++--
 osu.Game/Online/OnlineViewContainer.cs        | 28 ++++---
 osu.Game/Overlays/AccountCreationOverlay.cs   | 14 ++--
 osu.Game/Overlays/DashboardOverlay.cs         | 13 +++-
 osu.Game/Overlays/FullscreenOverlay.cs        | 18 +----
 osu.Game/Overlays/OverlayView.cs              | 19 +++--
 .../Sections/General/LoginSettings.cs         | 21 ++++--
 .../Overlays/Toolbar/ToolbarUserButton.cs     | 23 ++++--
 osu.Game/Screens/Multi/Multiplayer.cs         | 25 +++----
 .../Screens/Select/DifficultyRecommender.cs   | 20 ++---
 17 files changed, 140 insertions(+), 219 deletions(-)
 delete mode 100644 osu.Game/Online/API/IOnlineComponent.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
index 72033fc121..8280300caa 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestOffline()
         {
-            AddStep("Populate", () => display.Users = getUsers());
+            AddStep("Populate with offline test users", () => display.Users = getUsers());
         }
 
         [Test]
@@ -80,14 +80,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private class TestFriendDisplay : FriendDisplay
         {
-            public void Fetch()
-            {
-                base.APIStateChanged(API, APIState.Online);
-            }
-
-            public override void APIStateChanged(IAPIProvider api, APIState state)
-            {
-            }
+            public void Fetch() => PerformFetch();
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 9591d53b24..ec183adbbc 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
         [Test]
         public void TestOnlineStateVisibility()
         {
-            AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online);
+            AddStep("set status to online", () => ((DummyAPIAccess)API).SetState(APIState.Online));
 
             AddUntilStep("children are visible", () => onlineView.ViewTarget.IsPresent);
             AddUntilStep("loading animation is not visible", () => !onlineView.LoadingSpinner.IsPresent);
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestOfflineStateVisibility()
         {
-            AddStep("set status to offline", () => ((DummyAPIAccess)API).State = APIState.Offline);
+            AddStep("set status to offline", () => ((DummyAPIAccess)API).SetState(APIState.Offline));
 
             AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
             AddUntilStep("loading animation is not visible", () => !onlineView.LoadingSpinner.IsPresent);
@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestConnectingStateVisibility()
         {
-            AddStep("set status to connecting", () => ((DummyAPIAccess)API).State = APIState.Connecting);
+            AddStep("set status to connecting", () => ((DummyAPIAccess)API).SetState(APIState.Connecting));
 
             AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
             AddUntilStep("loading animation is visible", () => onlineView.LoadingSpinner.IsPresent);
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestFailingStateVisibility()
         {
-            AddStep("set status to failing", () => ((DummyAPIAccess)API).State = APIState.Failing);
+            AddStep("set status to failing", () => ((DummyAPIAccess)API).SetState(APIState.Failing));
 
             AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
             AddUntilStep("loading animation is visible", () => onlineView.LoadingSpinner.IsPresent);
diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index cb4884aa51..c4563d5844 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Beatmaps
                 if (checkLocalCache(set, beatmap))
                     return;
 
-                if (api?.State != APIState.Online)
+                if (api?.State.Value != APIState.Online)
                     return;
 
                 var req = new GetBeatmapRequest(beatmap);
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 4ea5c192fe..b916339a53 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -78,26 +78,8 @@ namespace osu.Game.Online.API
 
         private void onTokenChanged(ValueChangedEvent<OAuthToken> e) => config.Set(OsuSetting.Token, config.Get<bool>(OsuSetting.SavePassword) ? authentication.TokenString : string.Empty);
 
-        private readonly List<IOnlineComponent> components = new List<IOnlineComponent>();
-
         internal new void Schedule(Action action) => base.Schedule(action);
 
-        /// <summary>
-        /// Register a component to receive API events.
-        /// Fires <see cref="IOnlineComponent.APIStateChanged"/> once immediately to ensure a correct state.
-        /// </summary>
-        /// <param name="component"></param>
-        public void Register(IOnlineComponent component)
-        {
-            Schedule(() => components.Add(component));
-            component.APIStateChanged(this, state);
-        }
-
-        public void Unregister(IOnlineComponent component)
-        {
-            Schedule(() => components.Remove(component));
-        }
-
         public string AccessToken => authentication.RequestAccessToken();
 
         /// <summary>
@@ -109,7 +91,7 @@ namespace osu.Game.Online.API
         {
             while (!cancellationToken.IsCancellationRequested)
             {
-                switch (State)
+                switch (State.Value)
                 {
                     case APIState.Failing:
                         //todo: replace this with a ping request.
@@ -131,12 +113,12 @@ namespace osu.Game.Online.API
                         // work to restore a connection...
                         if (!HasLogin)
                         {
-                            State = APIState.Offline;
+                            state.Value = APIState.Offline;
                             Thread.Sleep(50);
                             continue;
                         }
 
-                        State = APIState.Connecting;
+                        state.Value = APIState.Connecting;
 
                         // save the username at this point, if the user requested for it to be.
                         config.Set(OsuSetting.Username, config.Get<bool>(OsuSetting.SaveUsername) ? ProvidedUsername : string.Empty);
@@ -162,20 +144,20 @@ namespace osu.Game.Online.API
                             failureCount = 0;
 
                             //we're connected!
-                            State = APIState.Online;
+                            state.Value = APIState.Online;
                         };
 
                         if (!handleRequest(userReq))
                         {
-                            if (State == APIState.Connecting)
-                                State = APIState.Failing;
+                            if (State.Value == APIState.Connecting)
+                                state.Value = APIState.Failing;
                             continue;
                         }
 
                         // The Success callback event is fired on the main thread, so we should wait for that to run before proceeding.
                         // Without this, we will end up circulating this Connecting loop multiple times and queueing up many web requests
                         // before actually going online.
-                        while (State > APIState.Offline && State < APIState.Online)
+                        while (State.Value > APIState.Offline && State.Value < APIState.Online)
                             Thread.Sleep(500);
 
                         break;
@@ -224,7 +206,7 @@ namespace osu.Game.Online.API
 
         public void Login(string username, string password)
         {
-            Debug.Assert(State == APIState.Offline);
+            Debug.Assert(State.Value == APIState.Offline);
 
             ProvidedUsername = username;
             this.password = password;
@@ -232,7 +214,7 @@ namespace osu.Game.Online.API
 
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
         {
-            Debug.Assert(State == APIState.Offline);
+            Debug.Assert(State.Value == APIState.Offline);
 
             var req = new RegistrationRequest
             {
@@ -276,7 +258,7 @@ namespace osu.Game.Online.API
                 req.Perform(this);
 
                 // we could still be in initialisation, at which point we don't want to say we're Online yet.
-                if (IsLoggedIn) State = APIState.Online;
+                if (IsLoggedIn) state.Value = APIState.Online;
 
                 failureCount = 0;
                 return true;
@@ -293,27 +275,12 @@ namespace osu.Game.Online.API
             }
         }
 
-        private APIState state;
+        private readonly Bindable<APIState> state = new Bindable<APIState>();
 
-        public APIState State
-        {
-            get => state;
-            private set
-            {
-                if (state == value)
-                    return;
-
-                APIState oldState = state;
-                state = value;
-
-                log.Add($@"We just went {state}!");
-                Schedule(() =>
-                {
-                    components.ForEach(c => c.APIStateChanged(this, state));
-                    OnStateChange?.Invoke(oldState, state);
-                });
-            }
-        }
+        /// <summary>
+        /// The current connectivity state of the API.
+        /// </summary>
+        public IBindable<APIState> State => state;
 
         private bool handleWebException(WebException we)
         {
@@ -343,9 +310,9 @@ namespace osu.Game.Online.API
                         // we might try again at an api level.
                         return false;
 
-                    if (State == APIState.Online)
+                    if (State.Value == APIState.Online)
                     {
-                        State = APIState.Failing;
+                        state.Value = APIState.Failing;
                         flushQueue();
                     }
 
@@ -362,10 +329,6 @@ namespace osu.Game.Online.API
             lock (queue) queue.Enqueue(request);
         }
 
-        public event StateChangeDelegate OnStateChange;
-
-        public delegate void StateChangeDelegate(APIState oldState, APIState newState);
-
         private void flushQueue(bool failOldRequests = true)
         {
             lock (queue)
@@ -392,7 +355,7 @@ namespace osu.Game.Online.API
             // Scheduled prior to state change such that the state changed event is invoked with the correct user present
             Schedule(() => LocalUser.Value = createGuestUser());
 
-            State = APIState.Offline;
+            state.Value = APIState.Offline;
         }
 
         private static User createGuestUser() => new GuestUser();
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 7800241904..1672d0495d 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -21,34 +21,23 @@ namespace osu.Game.Online.API
 
         public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
 
-        public bool IsLoggedIn => State == APIState.Online;
+        public bool IsLoggedIn => State.Value == APIState.Online;
 
         public string ProvidedUsername => LocalUser.Value.Username;
 
         public string Endpoint => "http://localhost";
 
-        private APIState state = APIState.Online;
-
-        private readonly List<IOnlineComponent> components = new List<IOnlineComponent>();
-
         /// <summary>
         /// Provide handling logic for an arbitrary API request.
         /// </summary>
         public Action<APIRequest> HandleRequest;
 
-        public APIState State
-        {
-            get => state;
-            set
-            {
-                if (state == value)
-                    return;
+        private readonly Bindable<APIState> state = new Bindable<APIState>(APIState.Online);
 
-                state = value;
-
-                Scheduler.Add(() => components.ForEach(c => c.APIStateChanged(this, value)));
-            }
-        }
+        /// <summary>
+        /// The current connectivity state of the API.
+        /// </summary>
+        public IBindable<APIState> State => state;
 
         public DummyAPIAccess()
         {
@@ -72,17 +61,6 @@ namespace osu.Game.Online.API
             return Task.CompletedTask;
         }
 
-        public void Register(IOnlineComponent component)
-        {
-            Scheduler.Add(delegate { components.Add(component); });
-            component.APIStateChanged(this, state);
-        }
-
-        public void Unregister(IOnlineComponent component)
-        {
-            Scheduler.Add(delegate { components.Remove(component); });
-        }
-
         public void Login(string username, string password)
         {
             LocalUser.Value = new User
@@ -91,13 +69,13 @@ namespace osu.Game.Online.API
                 Id = 1001,
             };
 
-            State = APIState.Online;
+            state.Value = APIState.Online;
         }
 
         public void Logout()
         {
             LocalUser.Value = new GuestUser();
-            State = APIState.Offline;
+            state.Value = APIState.Offline;
         }
 
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
@@ -105,5 +83,7 @@ namespace osu.Game.Online.API
             Thread.Sleep(200);
             return null;
         }
+
+        public void SetState(APIState newState) => state.Value = newState;
     }
 }
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index dff6d0b2ce..256d2ed151 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Online.API
         /// </summary>
         string Endpoint { get; }
 
-        APIState State { get; }
+        IBindable<APIState> State { get; }
 
         /// <summary>
         /// Queue a new request.
@@ -61,18 +61,6 @@ namespace osu.Game.Online.API
         /// <param name="request">The request to perform.</param>
         Task PerformAsync(APIRequest request);
 
-        /// <summary>
-        /// Register a component to receive state changes.
-        /// </summary>
-        /// <param name="component">The component to register.</param>
-        void Register(IOnlineComponent component);
-
-        /// <summary>
-        /// Unregisters a component to receive state changes.
-        /// </summary>
-        /// <param name="component">The component to unregister.</param>
-        void Unregister(IOnlineComponent component);
-
         /// <summary>
         /// Attempt to login using the provided credentials. This is a non-blocking operation.
         /// </summary>
diff --git a/osu.Game/Online/API/IOnlineComponent.cs b/osu.Game/Online/API/IOnlineComponent.cs
deleted file mode 100644
index da6b784759..0000000000
--- a/osu.Game/Online/API/IOnlineComponent.cs
+++ /dev/null
@@ -1,10 +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.Online.API
-{
-    public interface IOnlineComponent
-    {
-        void APIStateChanged(IAPIProvider api, APIState state);
-    }
-}
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 2acee394a6..3a5c2e181f 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -22,7 +23,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Online.Leaderboards
 {
-    public abstract class Leaderboard<TScope, TScoreInfo> : Container, IOnlineComponent
+    public abstract class Leaderboard<TScope, TScoreInfo> : Container
     {
         private const double fade_duration = 300;
 
@@ -242,16 +243,13 @@ namespace osu.Game.Online.Leaderboards
 
         private ScheduledDelegate pendingUpdateScores;
 
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            api?.Register(this);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            api?.Unregister(this);
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
         }
 
         public void RefreshScores() => UpdateScores();
@@ -260,9 +258,9 @@ namespace osu.Game.Online.Leaderboards
 
         protected abstract bool IsOnlineScope { get; }
 
-        public void APIStateChanged(IAPIProvider api, APIState state)
+        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
-            switch (state)
+            switch (state.NewValue)
             {
                 case APIState.Online:
                 case APIState.Offline:
@@ -271,7 +269,7 @@ namespace osu.Game.Online.Leaderboards
 
                     break;
             }
-        }
+        });
 
         protected void UpdateScores()
         {
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index b52e3d9e3c..295d079d29 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -2,6 +2,7 @@
 // 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.Game.Graphics.UserInterface;
@@ -14,7 +15,7 @@ namespace osu.Game.Online
     /// 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
+    public abstract class OnlineViewContainer : Container
     {
         protected LoadingSpinner LoadingSpinner { get; private set; }
 
@@ -34,8 +35,10 @@ namespace osu.Game.Online
             this.placeholderMessage = placeholderMessage;
         }
 
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(IAPIProvider api)
         {
             InternalChildren = new Drawable[]
             {
@@ -46,18 +49,19 @@ namespace osu.Game.Online
                     Alpha = 0,
                 }
             };
+
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            base.LoadComplete();
-
-            API.Register(this);
         }
 
-        public virtual void APIStateChanged(IAPIProvider api, APIState state)
+        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
-            switch (state)
+            switch (state.NewValue)
             {
                 case APIState.Offline:
                     PopContentOut(Content);
@@ -79,7 +83,7 @@ namespace osu.Game.Online
                     placeholder.FadeOut(transform_duration / 2, Easing.OutQuint);
                     break;
             }
-        }
+        });
 
         /// <summary>
         /// Applies a transform to the online content to make it hidden.
@@ -90,11 +94,5 @@ namespace osu.Game.Online
         /// Applies a transform to the online content to make it visible.
         /// </summary>
         protected virtual void PopContentIn(Drawable content) => content.FadeIn(transform_duration, Easing.OutQuint);
-
-        protected override void Dispose(bool isDisposing)
-        {
-            API?.Unregister(this);
-            base.Dispose(isDisposing);
-        }
     }
 }
diff --git a/osu.Game/Overlays/AccountCreationOverlay.cs b/osu.Game/Overlays/AccountCreationOverlay.cs
index 89d8cbde11..58ede5502a 100644
--- a/osu.Game/Overlays/AccountCreationOverlay.cs
+++ b/osu.Game/Overlays/AccountCreationOverlay.cs
@@ -2,6 +2,7 @@
 // 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.Containers;
@@ -17,7 +18,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class AccountCreationOverlay : OsuFocusedOverlayContainer, IOnlineComponent
+    public class AccountCreationOverlay : OsuFocusedOverlayContainer
     {
         private const float transition_time = 400;
 
@@ -30,10 +31,13 @@ namespace osu.Game.Overlays
             Origin = Anchor.Centre;
         }
 
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, IAPIProvider api)
         {
-            api.Register(this);
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(apiStateChanged, true);
 
             Children = new Drawable[]
             {
@@ -97,9 +101,9 @@ namespace osu.Game.Overlays
             this.FadeOut(100);
         }
 
-        public void APIStateChanged(IAPIProvider api, APIState state)
+        private void apiStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
-            switch (state)
+            switch (state.NewValue)
             {
                 case APIState.Offline:
                 case APIState.Failing:
@@ -112,6 +116,6 @@ namespace osu.Game.Overlays
                     Hide();
                     break;
             }
-        }
+        });
     }
 }
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 8135b83a03..6c58ed50fb 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -33,6 +33,15 @@ namespace osu.Game.Overlays
         {
         }
 
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -130,13 +139,13 @@ namespace osu.Game.Overlays
             }
         }
 
-        public override void APIStateChanged(IAPIProvider api, APIState state)
+        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
             if (State.Value == Visibility.Hidden)
                 return;
 
             Header.Current.TriggerChange();
-        }
+        });
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index bd6b07c65f..6f56d95929 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -12,7 +12,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public abstract class FullscreenOverlay<T> : WaveOverlayContainer, IOnlineComponent, INamedOverlayComponent
+    public abstract class FullscreenOverlay<T> : WaveOverlayContainer, INamedOverlayComponent
         where T : OverlayHeader
     {
         public virtual string IconTexture => Header?.Title.IconTexture ?? string.Empty;
@@ -86,21 +86,5 @@ namespace osu.Game.Overlays
         protected virtual void PopOutComplete()
         {
         }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            API.Register(this);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            API?.Unregister(this);
-        }
-
-        public virtual void APIStateChanged(IAPIProvider api, APIState state)
-        {
-        }
     }
 }
diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
index 312271316a..c254cdf290 100644
--- a/osu.Game/Overlays/OverlayView.cs
+++ b/osu.Game/Overlays/OverlayView.cs
@@ -2,6 +2,7 @@
 // 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.Game.Online.API;
@@ -15,7 +16,7 @@ namespace osu.Game.Overlays
     /// Automatically performs a data fetch on load.
     /// </remarks>
     /// <typeparam name="T">The type of the API response.</typeparam>
-    public abstract class OverlayView<T> : CompositeDrawable, IOnlineComponent
+    public abstract class OverlayView<T> : CompositeDrawable
         where T : class
     {
         [Resolved]
@@ -29,10 +30,13 @@ namespace osu.Game.Overlays
             AutoSizeAxes = Axes.Y;
         }
 
-        protected override void LoadComplete()
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            base.LoadComplete();
-            API.Register(this);
+            apiState.BindTo(API.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
         }
 
         /// <summary>
@@ -59,20 +63,19 @@ namespace osu.Game.Overlays
             API.Queue(request);
         }
 
-        public virtual void APIStateChanged(IAPIProvider api, APIState state)
+        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
-            switch (state)
+            switch (state.NewValue)
             {
                 case APIState.Online:
                     PerformFetch();
                     break;
             }
-        }
+        });
 
         protected override void Dispose(bool isDisposing)
         {
             request?.Cancel();
-            API?.Unregister(this);
             base.Dispose(isDisposing);
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index 9e358d0cf5..873272bf12 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -13,6 +13,7 @@ using osu.Game.Online.API;
 using osuTK;
 using osu.Game.Users;
 using System.ComponentModel;
+using osu.Framework.Bindables;
 using osu.Game.Graphics;
 using osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
@@ -25,7 +26,7 @@ using Container = osu.Framework.Graphics.Containers.Container;
 
 namespace osu.Game.Overlays.Settings.Sections.General
 {
-    public class LoginSettings : FillFlowContainer, IOnlineComponent
+    public class LoginSettings : FillFlowContainer
     {
         private bool bounding = true;
         private LoginForm form;
@@ -41,6 +42,11 @@ namespace osu.Game.Overlays.Settings.Sections.General
         /// </summary>
         public Action RequestHide;
 
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         public override RectangleF BoundingBox => bounding ? base.BoundingBox : RectangleF.Empty;
 
         public bool Bounding
@@ -61,17 +67,18 @@ namespace osu.Game.Overlays.Settings.Sections.General
             Spacing = new Vector2(0f, 5f);
         }
 
-        [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(IAPIProvider api)
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            api?.Register(this);
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
         }
 
-        public void APIStateChanged(IAPIProvider api, APIState state) => Schedule(() =>
+        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
             form = null;
 
-            switch (state)
+            switch (state.NewValue)
             {
                 case APIState.Offline:
                     Children = new Drawable[]
@@ -107,7 +114,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                             Origin = Anchor.TopCentre,
                             TextAnchor = Anchor.TopCentre,
                             AutoSizeAxes = Axes.Both,
-                            Text = state == APIState.Failing ? "Connection is failing, will attempt to reconnect... " : "Attempting to connect... ",
+                            Text = state.NewValue == APIState.Failing ? "Connection is failing, will attempt to reconnect... " : "Attempting to connect... ",
                             Margin = new MarginPadding { Top = 10, Bottom = 10 },
                         },
                     };
diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index bccef3d9fe..b21bc49a11 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -2,6 +2,7 @@
 // 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.Effects;
@@ -14,10 +15,15 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarUserButton : ToolbarOverlayToggleButton, IOnlineComponent
+    public class ToolbarUserButton : ToolbarOverlayToggleButton
     {
         private readonly UpdateableAvatar avatar;
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
         public ToolbarUserButton()
         {
             AutoSizeAxes = Axes.X;
@@ -43,17 +49,22 @@ namespace osu.Game.Overlays.Toolbar
             });
         }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(IAPIProvider api, LoginOverlay login)
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load()
         {
-            api.Register(this);
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
+        }
 
+        [BackgroundDependencyLoader(true)]
+        private void load(LoginOverlay login)
+        {
             StateContainer = login;
         }
 
-        public void APIStateChanged(IAPIProvider api, APIState state)
+        private void onlineStateChanged(ValueChangedEvent<APIState> state)
         {
-            switch (state)
+            switch (state.NewValue)
             {
                 default:
                     Text = @"Guest";
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 27f774e9ec..e6abde4d43 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -29,7 +29,7 @@ using osuTK;
 namespace osu.Game.Screens.Multi
 {
     [Cached]
-    public class Multiplayer : OsuScreen, IOnlineComponent
+    public class Multiplayer : OsuScreen
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
 
@@ -146,15 +146,24 @@ namespace osu.Game.Screens.Multi
             screenStack.ScreenExited += screenExited;
         }
 
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
         [BackgroundDependencyLoader(true)]
         private void load(IdleTracker idleTracker)
         {
-            api.Register(this);
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
 
             if (idleTracker != null)
                 isIdle.BindTo(idleTracker.IsIdle);
         }
 
+        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
+        {
+            if (state.NewValue != APIState.Online)
+                Schedule(forcefullyExit);
+        });
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -199,12 +208,6 @@ namespace osu.Game.Screens.Multi
             Logger.Log($"Polling adjusted (listing: {roomManager.TimeBetweenListingPolls}, selection: {roomManager.TimeBetweenSelectionPolls})");
         }
 
-        public void APIStateChanged(IAPIProvider api, APIState state)
-        {
-            if (state != APIState.Online)
-                Schedule(forcefullyExit);
-        }
-
         private void forcefullyExit()
         {
             // This is temporary since we don't currently have a way to force screens to be exited
@@ -371,12 +374,6 @@ namespace osu.Game.Screens.Multi
             }
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            api?.Unregister(this);
-        }
-
         private class MultiplayerWaveContainer : WaveContainer
         {
             protected override bool StartHidden => true;
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 0dd3341a93..ff54e0a8df 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -15,7 +15,7 @@ using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.Select
 {
-    public class DifficultyRecommender : Component, IOnlineComponent
+    public class DifficultyRecommender : Component
     {
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -28,10 +28,13 @@ namespace osu.Game.Screens.Select
 
         private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
 
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            api.Register(this);
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
         }
 
         /// <summary>
@@ -72,21 +75,14 @@ namespace osu.Game.Screens.Select
             });
         }
 
-        public void APIStateChanged(IAPIProvider api, APIState state)
+        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
-            switch (state)
+            switch (state.NewValue)
             {
                 case APIState.Online:
                     calculateRecommendedDifficulties();
                     break;
             }
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            api?.Unregister(this);
-        }
+        });
     }
 }

From 303975ccb152823110feea9b5dd8ced8983dca72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 14:27:49 +0900
Subject: [PATCH 05612/10326] Remove unnecessary permitNulls

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

diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index b21bc49a11..fc47eced77 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Toolbar
             });
         }
 
-        [BackgroundDependencyLoader(permitNulls: true)]
+        [BackgroundDependencyLoader]
         private void load()
         {
             apiState.BindTo(api.State);

From 3fe6f77444eae95d06373b93a5035764e012728f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 14:30:49 +0900
Subject: [PATCH 05613/10326] Fix cases of multiple bdl methods

---
 osu.Game/Online/OnlineViewContainer.cs         |  5 -----
 osu.Game/Overlays/DashboardOverlay.cs          |  4 ----
 osu.Game/Overlays/Toolbar/ToolbarUserButton.cs | 10 +++-------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 295d079d29..c9fb70f0cc 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -54,11 +54,6 @@ namespace osu.Game.Online
             apiState.BindValueChanged(onlineStateChanged, true);
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-        }
-
         private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
             switch (state.NewValue)
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 6c58ed50fb..a2490365e4 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -40,11 +40,7 @@ namespace osu.Game.Overlays
         {
             apiState.BindTo(api.State);
             apiState.BindValueChanged(onlineStateChanged, true);
-        }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
             Children = new Drawable[]
             {
                 new Box
diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index fc47eced77..9417224049 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -49,16 +49,12 @@ namespace osu.Game.Overlays.Toolbar
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            apiState.BindTo(api.State);
-            apiState.BindValueChanged(onlineStateChanged, true);
-        }
-
         [BackgroundDependencyLoader(true)]
         private void load(LoginOverlay login)
         {
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
+
             StateContainer = login;
         }
 

From da573c74870762dd15dcbec52c998e2a5a2567c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 14:43:47 +0900
Subject: [PATCH 05614/10326] Remove unused usings

---
 .../Visual/Online/TestSceneFriendDisplay.cs         | 13 ++++++-------
 osu.Game/Online/API/DummyAPIAccess.cs               |  1 -
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
index 8280300caa..0cc6e9f358 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
@@ -3,14 +3,13 @@
 
 using System;
 using System.Collections.Generic;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Overlays.Dashboard.Friends;
-using osu.Framework.Graphics;
-using osu.Game.Users;
-using osu.Game.Overlays;
-using osu.Framework.Allocation;
 using NUnit.Framework;
-using osu.Game.Online.API;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dashboard.Friends;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
 {
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 1672d0495d..da22a70bf8 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.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.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Bindables;

From b39a4da6bcec029855c513964a5d29fab3a35977 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Oct 2020 19:05:20 +0900
Subject: [PATCH 05615/10326] Add initial classes for spectator support

---
 .../Gameplay/TestSceneReplayRecorder.cs       | 20 +++++-
 osu.Game/Online/Spectator/FrameDataBundle.cs  | 17 +++++
 osu.Game/Online/Spectator/ISpectatorClient.cs | 14 ++++
 osu.Game/Online/Spectator/ISpectatorServer.cs | 14 ++++
 osu.Game/Online/Spectator/SpectatorClient.cs  | 70 +++++++++++++++++++
 osu.Game/Replays/Legacy/LegacyReplayFrame.cs  |  2 +
 osu.Game/osu.Game.csproj                      |  3 +
 7 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Online/Spectator/FrameDataBundle.cs
 create mode 100644 osu.Game/Online/Spectator/ISpectatorClient.cs
 create mode 100644 osu.Game/Online/Spectator/ISpectatorServer.cs
 create mode 100644 osu.Game/Online/Spectator/SpectatorClient.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index bc1c10e59d..88a4024576 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -3,6 +3,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.SignalR.Client;
+using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -13,7 +15,9 @@ using osu.Framework.Input.StateChanges;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Spectator;
 using osu.Game.Replays;
+using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
@@ -260,13 +264,27 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         internal class TestReplayRecorder : ReplayRecorder<TestAction>
         {
+            private readonly SpectatorClient client;
+
             public TestReplayRecorder(Replay target)
                 : base(target)
             {
+                var connection = new HubConnectionBuilder()
+                                 .WithUrl("http://localhost:5009/spectator")
+                                 .AddMessagePackProtocol()
+                                 // .ConfigureLogging(logging => { logging.AddConsole(); })
+                                 .Build();
+
+                connection.StartAsync().Wait();
+
+                client = new SpectatorClient(connection);
             }
 
             protected override ReplayFrame HandleFrame(Vector2 mousePosition, List<TestAction> actions, ReplayFrame previousFrame)
-                => new TestReplayFrame(Time.Current, mousePosition, actions.ToArray());
+            {
+                client.SendFrames(new FrameDataBundle(new[] { new LegacyReplayFrame(Time.Current, mousePosition.X, mousePosition.Y, ReplayButtonState.None) }));
+                return new TestReplayFrame(Time.Current, mousePosition, actions.ToArray());
+            }
         }
     }
 }
diff --git a/osu.Game/Online/Spectator/FrameDataBundle.cs b/osu.Game/Online/Spectator/FrameDataBundle.cs
new file mode 100644
index 0000000000..67f2688289
--- /dev/null
+++ b/osu.Game/Online/Spectator/FrameDataBundle.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using osu.Game.Replays.Legacy;
+
+namespace osu.Game.Online.Spectator
+{
+    [Serializable]
+    public class FrameDataBundle
+    {
+        public IEnumerable<LegacyReplayFrame> Frames { get; set; }
+
+        public FrameDataBundle(IEnumerable<LegacyReplayFrame> frames)
+        {
+            Frames = frames;
+        }
+    }
+}
diff --git a/osu.Game/Online/Spectator/ISpectatorClient.cs b/osu.Game/Online/Spectator/ISpectatorClient.cs
new file mode 100644
index 0000000000..4741d7409a
--- /dev/null
+++ b/osu.Game/Online/Spectator/ISpectatorClient.cs
@@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+using osu.Game.Online.Spectator;
+
+namespace osu.Server.Spectator.Hubs
+{
+    public interface ISpectatorClient
+    {
+        Task UserBeganPlaying(string userId, int beatmapId);
+
+        Task UserFinishedPlaying(string userId, int beatmapId);
+
+        Task UserSentFrames(string userId, FrameDataBundle data);
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Online/Spectator/ISpectatorServer.cs b/osu.Game/Online/Spectator/ISpectatorServer.cs
new file mode 100644
index 0000000000..1dcde30221
--- /dev/null
+++ b/osu.Game/Online/Spectator/ISpectatorServer.cs
@@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+
+namespace osu.Game.Online.Spectator
+{
+    public interface ISpectatorServer
+    {
+        Task BeginPlaySession(int beatmapId);
+        Task SendFrameData(FrameDataBundle data);
+        Task EndPlaySession(int beatmapId);
+
+        Task StartWatchingUser(string userId);
+        Task EndWatchingUser(string userId);
+    }
+}
diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
new file mode 100644
index 0000000000..c1414f7914
--- /dev/null
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Client;
+using osu.Server.Spectator.Hubs;
+
+namespace osu.Game.Online.Spectator
+{
+    public class SpectatorClient : ISpectatorClient
+    {
+        private readonly HubConnection connection;
+
+        private readonly List<string> watchingUsers = new List<string>();
+
+        public SpectatorClient(HubConnection connection)
+        {
+            this.connection = connection;
+
+            // this is kind of SILLY
+            // https://github.com/dotnet/aspnetcore/issues/15198
+            connection.On<string, int>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
+            connection.On<string, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
+            connection.On<string, int>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+        }
+
+        Task ISpectatorClient.UserBeganPlaying(string userId, int beatmapId)
+        {
+            if (connection.ConnectionId != userId)
+            {
+                if (watchingUsers.Contains(userId))
+                {
+                    Console.WriteLine($"{connection.ConnectionId} received began playing for already watched user {userId}");
+                }
+                else
+                {
+                    Console.WriteLine($"{connection.ConnectionId} requesting watch other user {userId}");
+                    WatchUser(userId);
+                    watchingUsers.Add(userId);
+                }
+            }
+            else
+            {
+                Console.WriteLine($"{connection.ConnectionId} Received user playing event for self {beatmapId}");
+            }
+
+            return Task.CompletedTask;
+        }
+
+        Task ISpectatorClient.UserFinishedPlaying(string userId, int beatmapId)
+        {
+            Console.WriteLine($"{connection.ConnectionId} Received user finished event {beatmapId}");
+            return Task.CompletedTask;
+        }
+
+        Task ISpectatorClient.UserSentFrames(string userId, FrameDataBundle data)
+        {
+            Console.WriteLine($"{connection.ConnectionId} Received frames from {userId}: {data.Frames.First().ToString()}");
+            return Task.CompletedTask;
+        }
+
+        public Task BeginPlaying(int beatmapId) => connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), beatmapId);
+
+        public Task SendFrames(FrameDataBundle data) => connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
+
+        public Task EndPlaying(int beatmapId) => connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), beatmapId);
+
+        private Task WatchUser(string userId) => connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
+    }
+}
diff --git a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
index c3cffa8699..656fd1814e 100644
--- a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
+++ b/osu.Game/Replays/Legacy/LegacyReplayFrame.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 MessagePack;
 using osu.Game.Rulesets.Replays;
 using osuTK;
 
@@ -8,6 +9,7 @@ namespace osu.Game.Replays.Legacy
 {
     public class LegacyReplayFrame : ReplayFrame
     {
+        [IgnoreMember]
         public Vector2 Position => new Vector2(MouseX ?? 0, MouseY ?? 0);
 
         public float? MouseX;
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index de7bde824f..fd010fcc43 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,6 +21,9 @@
     <PackageReference Include="Dapper" Version="2.0.35" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
+    <PackageReference Include="MessagePack" Version="1.7.3.7" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.9" />
     <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" />

From db4dd3182b2494f6aa641855a32928be9465c9d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 13:12:58 +0900
Subject: [PATCH 05616/10326] Add xmldoc to spectator interfaces

---
 osu.Game/Online/Spectator/ISpectatorClient.cs | 23 +++++++++++++--
 osu.Game/Online/Spectator/ISpectatorServer.cs | 28 +++++++++++++++++++
 osu.Game/Online/Spectator/SpectatorClient.cs  |  1 -
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Spectator/ISpectatorClient.cs b/osu.Game/Online/Spectator/ISpectatorClient.cs
index 4741d7409a..ed762ac1fe 100644
--- a/osu.Game/Online/Spectator/ISpectatorClient.cs
+++ b/osu.Game/Online/Spectator/ISpectatorClient.cs
@@ -1,14 +1,31 @@
 using System.Threading.Tasks;
-using osu.Game.Online.Spectator;
 
-namespace osu.Server.Spectator.Hubs
+namespace osu.Game.Online.Spectator
 {
+    /// <summary>
+    /// An interface defining a spectator client instance.
+    /// </summary>
     public interface ISpectatorClient
     {
+        /// <summary>
+        /// Signals that a user has begun a new play session.
+        /// </summary>
+        /// <param name="userId">The user.</param>
+        /// <param name="beatmapId">The beatmap the user is playing.</param>
         Task UserBeganPlaying(string userId, int beatmapId);
 
+        /// <summary>
+        /// Signals that a user has finished a play session.
+        /// </summary>
+        /// <param name="userId">The user.</param>
+        /// <param name="beatmapId">The beatmap the user has finished playing.</param>
         Task UserFinishedPlaying(string userId, int beatmapId);
 
+        /// <summary>
+        /// Called when new frames are available for a subscribed user's play session.
+        /// </summary>
+        /// <param name="userId">The user.</param>
+        /// <param name="data">The frame data.</param>
         Task UserSentFrames(string userId, FrameDataBundle data);
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Online/Spectator/ISpectatorServer.cs b/osu.Game/Online/Spectator/ISpectatorServer.cs
index 1dcde30221..03ca37d524 100644
--- a/osu.Game/Online/Spectator/ISpectatorServer.cs
+++ b/osu.Game/Online/Spectator/ISpectatorServer.cs
@@ -2,13 +2,41 @@ using System.Threading.Tasks;
 
 namespace osu.Game.Online.Spectator
 {
+    /// <summary>
+    /// An interface defining the spectator server instance.
+    /// </summary>
     public interface ISpectatorServer
     {
+        /// <summary>
+        /// Signal the start of a new play session.
+        /// </summary>
+        /// <param name="beatmapId">The beatmap currently being played. Eventually this should be replaced with more complete metadata.</param>
         Task BeginPlaySession(int beatmapId);
+
+        /// <summary>
+        /// Send a bundle of frame data for the current play session.
+        /// </summary>
+        /// <param name="data">The frame data.</param>
         Task SendFrameData(FrameDataBundle data);
+
+        /// <summary>
+        /// Signal the end of a play session.
+        /// </summary>
+        /// <param name="beatmapId">The beatmap that was completed. This should be replaced with a play token once that flow is established.</param>
         Task EndPlaySession(int beatmapId);
 
+        /// <summary>
+        /// Request spectating data for the specified user. May be called on multiple users and offline users.
+        /// For offline users, a subscription will be created and data will begin streaming on next play.
+        /// </summary>
+        /// <param name="userId">The user to subscribe to.</param>
+        /// <returns></returns>
         Task StartWatchingUser(string userId);
+
+        /// <summary>
+        /// Stop requesting spectating data for the specified user. Unsubscribes from receiving further data.
+        /// </summary>
+        /// <param name="userId">The user to unsubscribe from.</param>
         Task EndWatchingUser(string userId);
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index c1414f7914..4558699618 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
-using osu.Server.Spectator.Hubs;
 
 namespace osu.Game.Online.Spectator
 {

From 5a00a05a95d3c7c1dba85a8beb2e4758da321942 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 14:49:48 +0900
Subject: [PATCH 05617/10326] Add missing schedule call

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

diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index 9417224049..db4e491d9a 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Toolbar
             StateContainer = login;
         }
 
-        private void onlineStateChanged(ValueChangedEvent<APIState> state)
+        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
             switch (state.NewValue)
             {
@@ -72,6 +72,6 @@ namespace osu.Game.Overlays.Toolbar
                     avatar.User = api.LocalUser.Value;
                     break;
             }
-        }
+        });
     }
 }

From c6db832efa940ee40d238fc036ab67b2f51f2c76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 14:56:20 +0900
Subject: [PATCH 05618/10326] Add xmldoc notes about thread safety of api
 bindables

---
 osu.Game/Online/API/IAPIProvider.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 256d2ed151..fc675639bf 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -11,11 +11,13 @@ namespace osu.Game.Online.API
     {
         /// <summary>
         /// The local user.
+        /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
         /// </summary>
         Bindable<User> LocalUser { get; }
 
         /// <summary>
         /// The current user's activity.
+        /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
         /// </summary>
         Bindable<UserActivity> Activity { get; }
 
@@ -35,6 +37,10 @@ namespace osu.Game.Online.API
         /// </summary>
         string Endpoint { get; }
 
+        /// <summary>
+        /// The current connection state of the API.
+        /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
+        /// </summary>
         IBindable<APIState> State { get; }
 
         /// <summary>

From 93db75bd414e90bfd9eb655f3b022bdface0f3cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 13:41:54 +0900
Subject: [PATCH 05619/10326] Begin shaping the spectator streaming component

---
 .../Gameplay/TestSceneReplayRecorder.cs       | 14 -----
 ...rClient.cs => SpectatorStreamingClient.cs} | 60 ++++++++++++++++---
 osu.Game/OsuGameBase.cs                       |  7 ++-
 3 files changed, 58 insertions(+), 23 deletions(-)
 rename osu.Game/Online/Spectator/{SpectatorClient.cs => SpectatorStreamingClient.cs} (58%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index 88a4024576..71cd39953c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -3,8 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.SignalR.Client;
-using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -264,25 +262,13 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         internal class TestReplayRecorder : ReplayRecorder<TestAction>
         {
-            private readonly SpectatorClient client;
-
             public TestReplayRecorder(Replay target)
                 : base(target)
             {
-                var connection = new HubConnectionBuilder()
-                                 .WithUrl("http://localhost:5009/spectator")
-                                 .AddMessagePackProtocol()
-                                 // .ConfigureLogging(logging => { logging.AddConsole(); })
-                                 .Build();
-
-                connection.StartAsync().Wait();
-
-                client = new SpectatorClient(connection);
             }
 
             protected override ReplayFrame HandleFrame(Vector2 mousePosition, List<TestAction> actions, ReplayFrame previousFrame)
             {
-                client.SendFrames(new FrameDataBundle(new[] { new LegacyReplayFrame(Time.Current, mousePosition.X, mousePosition.Y, ReplayButtonState.None) }));
                 return new TestReplayFrame(Time.Current, mousePosition, actions.ToArray());
             }
         }
diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
similarity index 58%
rename from osu.Game/Online/Spectator/SpectatorClient.cs
rename to osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 4558699618..a1a4a2774a 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -3,24 +3,70 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
+using Microsoft.Extensions.DependencyInjection;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Online.API;
 
 namespace osu.Game.Online.Spectator
 {
-    public class SpectatorClient : ISpectatorClient
+    public class SpectatorStreamingClient : Component, ISpectatorClient
     {
-        private readonly HubConnection connection;
+        private HubConnection connection;
 
         private readonly List<string> watchingUsers = new List<string>();
 
-        public SpectatorClient(HubConnection connection)
-        {
-            this.connection = connection;
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
-            // this is kind of SILLY
-            // https://github.com/dotnet/aspnetcore/issues/15198
+        [Resolved]
+        private APIAccess api { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(apiStateChanged, true);
+        }
+
+        private void apiStateChanged(ValueChangedEvent<APIState> state)
+        {
+            switch (state.NewValue)
+            {
+                case APIState.Failing:
+                case APIState.Offline:
+                    connection?.StopAsync();
+                    connection = null;
+                    break;
+
+                case APIState.Online:
+                    connect();
+                    break;
+            }
+        }
+
+#if DEBUG
+        private const string endpoint = "http://localhost:5009/spectator";
+#else
+        private const string endpoint = "https://spectator.ppy.sh/spectator";
+#endif
+
+        private void connect()
+        {
+            connection = new HubConnectionBuilder()
+                         .WithUrl(endpoint, options =>
+                         {
+                             options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
+                         })
+                         .AddMessagePackProtocol()
+                         .Build();
+
+            // until strong typed client support is added, each method must be manually bound (see https://github.com/dotnet/aspnetcore/issues/15198)
             connection.On<string, int>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
             connection.On<string, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
             connection.On<string, int>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+
+            connection.StartAsync();
         }
 
         Task ISpectatorClient.UserBeganPlaying(string userId, int beatmapId)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 2d609668af..9b43d18a88 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -30,6 +30,7 @@ using osu.Game.Database;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
+using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Resources;
 using osu.Game.Rulesets;
@@ -74,6 +75,8 @@ namespace osu.Game
 
         protected IAPIProvider API;
 
+        private SpectatorStreamingClient spectatorStreaming;
+
         protected MenuCursorContainer MenuCursorContainer;
 
         protected MusicController MusicController;
@@ -189,9 +192,9 @@ namespace osu.Game
             dependencies.Cache(SkinManager = new SkinManager(Storage, contextFactory, Host, Audio, new NamespacedResourceStore<byte[]>(Resources, "Skins/Legacy")));
             dependencies.CacheAs<ISkinSource>(SkinManager);
 
-            API ??= new APIAccess(LocalConfig);
+            dependencies.CacheAs(API ??= new APIAccess(LocalConfig));
 
-            dependencies.CacheAs(API);
+            dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient());
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 

From 175fd512b00f26402023dcc21d36dfe9f0bddaee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 14:54:27 +0900
Subject: [PATCH 05620/10326] Send frames to streaming client from replay
 recorder

---
 .../Online/Spectator/SpectatorStreamingClient.cs    | 13 +++++++++++++
 osu.Game/OsuGameBase.cs                             |  3 +++
 osu.Game/Rulesets/UI/ReplayRecorder.cs              |  9 +++++++++
 3 files changed, 25 insertions(+)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index a1a4a2774a..c784eb09cd 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -7,7 +7,10 @@ using Microsoft.Extensions.DependencyInjection;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
 using osu.Game.Online.API;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Replays.Types;
 
 namespace osu.Game.Online.Spectator
 {
@@ -22,6 +25,9 @@ namespace osu.Game.Online.Spectator
         [Resolved]
         private APIAccess api { get; set; }
 
+        [Resolved]
+        private IBindable<WorkingBeatmap> beatmap { get; set; }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -111,5 +117,12 @@ namespace osu.Game.Online.Spectator
         public Task EndPlaying(int beatmapId) => connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), beatmapId);
 
         private Task WatchUser(string userId) => connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
+
+        public void HandleFrame(ReplayFrame frame)
+        {
+            if (frame is IConvertibleReplayFrame convertible)
+                // TODO: don't send a bundle for each individual frame
+                SendFrames(new FrameDataBundle(new[] { convertible.ToLegacy(beatmap.Value.Beatmap) }));
+        }
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 9b43d18a88..7364cf04b0 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -250,8 +250,11 @@ namespace osu.Game
 
             FileStore.Cleanup();
 
+            // add api components to hierarchy.
             if (API is APIAccess apiAccess)
                 AddInternal(apiAccess);
+            AddInternal(spectatorStreaming);
+
             AddInternal(RulesetConfigCache);
 
             MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both };
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index c977639584..3203d1afae 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Online.Spectator;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
 using osuTK;
@@ -60,6 +62,9 @@ namespace osu.Game.Rulesets.UI
             recordFrame(true);
         }
 
+        [Resolved(canBeNull: true)]
+        private SpectatorStreamingClient spectatorStreaming { get; set; }
+
         private void recordFrame(bool important)
         {
             var last = target.Frames.LastOrDefault();
@@ -72,7 +77,11 @@ namespace osu.Game.Rulesets.UI
             var frame = HandleFrame(position, pressedActions, last);
 
             if (frame != null)
+            {
                 target.Frames.Add(frame);
+
+                spectatorStreaming?.HandleFrame(frame);
+            }
         }
 
         protected abstract ReplayFrame HandleFrame(Vector2 mousePosition, List<T> actions, ReplayFrame previousFrame);

From 4788b4a643ac8b1465d200053aa6609ac7c8a679 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 15:03:43 +0900
Subject: [PATCH 05621/10326] Expose oauth access token via api interface

---
 osu.Game/Online/API/DummyAPIAccess.cs                 | 2 ++
 osu.Game/Online/API/IAPIProvider.cs                   | 5 +++++
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index da22a70bf8..e275676cea 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Online.API
 
         public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
 
+        public string AccessToken => "token";
+
         public bool IsLoggedIn => State.Value == APIState.Online;
 
         public string ProvidedUsername => LocalUser.Value.Username;
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 256d2ed151..9b7485decd 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -19,6 +19,11 @@ namespace osu.Game.Online.API
         /// </summary>
         Bindable<UserActivity> Activity { get; }
 
+        /// <summary>
+        /// Retrieve the OAuth access token.
+        /// </summary>
+        public string AccessToken { get; }
+
         /// <summary>
         /// Returns whether the local user is logged in.
         /// </summary>
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index c784eb09cd..a9a4987e69 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Online.Spectator
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
         [Resolved]
-        private APIAccess api { get; set; }
+        private IAPIProvider api { get; set; }
 
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }

From 96049c39c9f431f5eaa3709eb1332e83a9bb342b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 15:26:57 +0900
Subject: [PATCH 05622/10326] Add begin/end session logic

---
 osu.Game/Rulesets/UI/ReplayRecorder.cs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index 3203d1afae..c90b20caeb 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -5,10 +5,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Beatmaps;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
@@ -27,6 +29,12 @@ namespace osu.Game.Rulesets.UI
 
         public int RecordFrameRate = 60;
 
+        [Resolved(canBeNull: true)]
+        private SpectatorStreamingClient spectatorStreaming { get; set; }
+
+        [Resolved]
+        private IBindable<WorkingBeatmap> beatmap { get; set; }
+
         protected ReplayRecorder(Replay target)
         {
             this.target = target;
@@ -41,6 +49,14 @@ namespace osu.Game.Rulesets.UI
             base.LoadComplete();
 
             inputManager = GetContainingInputManager();
+
+            spectatorStreaming?.BeginPlaying(beatmap.Value.BeatmapInfo.ID);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            spectatorStreaming?.EndPlaying(beatmap.Value.BeatmapInfo.ID);
         }
 
         protected override bool OnMouseMove(MouseMoveEvent e)
@@ -62,9 +78,6 @@ namespace osu.Game.Rulesets.UI
             recordFrame(true);
         }
 
-        [Resolved(canBeNull: true)]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
-
         private void recordFrame(bool important)
         {
             var last = target.Frames.LastOrDefault();

From 2021945a8c87e4f8ec9a556705161f7e42b3c804 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 15:27:04 +0900
Subject: [PATCH 05623/10326] Add retry/error handling logic

---
 .../Spectator/SpectatorStreamingClient.cs     | 67 ++++++++++++++++---
 1 file changed, 59 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index a9a4987e69..2a19a665fc 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Online.Spectator
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
+        private bool isConnected;
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -46,7 +48,7 @@ namespace osu.Game.Online.Spectator
                     break;
 
                 case APIState.Online:
-                    connect();
+                    Task.Run(connect);
                     break;
             }
         }
@@ -57,8 +59,11 @@ namespace osu.Game.Online.Spectator
         private const string endpoint = "https://spectator.ppy.sh/spectator";
 #endif
 
-        private void connect()
+        private async Task connect()
         {
+            if (connection != null)
+                return;
+
             connection = new HubConnectionBuilder()
                          .WithUrl(endpoint, options =>
                          {
@@ -72,7 +77,33 @@ namespace osu.Game.Online.Spectator
             connection.On<string, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
             connection.On<string, int>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
 
-            connection.StartAsync();
+            connection.Closed += async ex =>
+            {
+                isConnected = false;
+                if (ex != null) await tryUntilConnected();
+            };
+
+            await tryUntilConnected();
+
+            async Task tryUntilConnected()
+            {
+                while (api.State.Value == APIState.Online)
+                {
+                    try
+                    {
+                        // reconnect on any failure
+                        await connection.StartAsync();
+
+                        // success
+                        isConnected = true;
+                        break;
+                    }
+                    catch
+                    {
+                        await Task.Delay(5000);
+                    }
+                }
+            }
         }
 
         Task ISpectatorClient.UserBeganPlaying(string userId, int beatmapId)
@@ -106,17 +137,37 @@ namespace osu.Game.Online.Spectator
 
         Task ISpectatorClient.UserSentFrames(string userId, FrameDataBundle data)
         {
-            Console.WriteLine($"{connection.ConnectionId} Received frames from {userId}: {data.Frames.First().ToString()}");
+            Console.WriteLine($"{connection.ConnectionId} Received frames from {userId}: {data.Frames.First()}");
             return Task.CompletedTask;
         }
 
-        public Task BeginPlaying(int beatmapId) => connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), beatmapId);
+        public void BeginPlaying(int beatmapId)
+        {
+            if (!isConnected) return;
 
-        public Task SendFrames(FrameDataBundle data) => connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
+            connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), beatmapId);
+        }
 
-        public Task EndPlaying(int beatmapId) => connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), beatmapId);
+        public void SendFrames(FrameDataBundle data)
+        {
+            if (!isConnected) return;
 
-        private Task WatchUser(string userId) => connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
+            connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
+        }
+
+        public void EndPlaying(int beatmapId)
+        {
+            if (!isConnected) return;
+
+            connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), beatmapId);
+        }
+
+        public void WatchUser(string userId)
+        {
+            if (!isConnected) return;
+
+            connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
+        }
 
         public void HandleFrame(ReplayFrame frame)
         {

From 05697dfe68a58d5a2e2c780a80bb562e31fcd923 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 17:29:38 +0900
Subject: [PATCH 05624/10326] Add spectator state object support

---
 osu.Game/Online/Spectator/ISpectatorClient.cs |  8 ++---
 osu.Game/Online/Spectator/ISpectatorServer.cs |  9 +++---
 osu.Game/Online/Spectator/SpectatorState.cs   | 32 +++++++++++++++++++
 .../Spectator/SpectatorStreamingClient.cs     | 23 ++++++++-----
 osu.Game/Rulesets/UI/ReplayRecorder.cs        |  4 +--
 5 files changed, 57 insertions(+), 19 deletions(-)
 create mode 100644 osu.Game/Online/Spectator/SpectatorState.cs

diff --git a/osu.Game/Online/Spectator/ISpectatorClient.cs b/osu.Game/Online/Spectator/ISpectatorClient.cs
index ed762ac1fe..dcff6e6c1c 100644
--- a/osu.Game/Online/Spectator/ISpectatorClient.cs
+++ b/osu.Game/Online/Spectator/ISpectatorClient.cs
@@ -11,15 +11,15 @@ namespace osu.Game.Online.Spectator
         /// Signals that a user has begun a new play session.
         /// </summary>
         /// <param name="userId">The user.</param>
-        /// <param name="beatmapId">The beatmap the user is playing.</param>
-        Task UserBeganPlaying(string userId, int beatmapId);
+        /// <param name="state">The state of gameplay.</param>
+        Task UserBeganPlaying(string userId, SpectatorState state);
 
         /// <summary>
         /// Signals that a user has finished a play session.
         /// </summary>
         /// <param name="userId">The user.</param>
-        /// <param name="beatmapId">The beatmap the user has finished playing.</param>
-        Task UserFinishedPlaying(string userId, int beatmapId);
+        /// <param name="state">The state of gameplay.</param>
+        Task UserFinishedPlaying(string userId, SpectatorState state);
 
         /// <summary>
         /// Called when new frames are available for a subscribed user's play session.
diff --git a/osu.Game/Online/Spectator/ISpectatorServer.cs b/osu.Game/Online/Spectator/ISpectatorServer.cs
index 03ca37d524..018fa6b66b 100644
--- a/osu.Game/Online/Spectator/ISpectatorServer.cs
+++ b/osu.Game/Online/Spectator/ISpectatorServer.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Online.Spectator
         /// <summary>
         /// Signal the start of a new play session.
         /// </summary>
-        /// <param name="beatmapId">The beatmap currently being played. Eventually this should be replaced with more complete metadata.</param>
-        Task BeginPlaySession(int beatmapId);
+        /// <param name="state">The state of gameplay.</param>
+        Task BeginPlaySession(SpectatorState state);
 
         /// <summary>
         /// Send a bundle of frame data for the current play session.
@@ -22,15 +22,14 @@ namespace osu.Game.Online.Spectator
         /// <summary>
         /// Signal the end of a play session.
         /// </summary>
-        /// <param name="beatmapId">The beatmap that was completed. This should be replaced with a play token once that flow is established.</param>
-        Task EndPlaySession(int beatmapId);
+        /// <param name="state">The state of gameplay.</param>
+        Task EndPlaySession(SpectatorState state);
 
         /// <summary>
         /// Request spectating data for the specified user. May be called on multiple users and offline users.
         /// For offline users, a subscription will be created and data will begin streaming on next play.
         /// </summary>
         /// <param name="userId">The user to subscribe to.</param>
-        /// <returns></returns>
         Task StartWatchingUser(string userId);
 
         /// <summary>
diff --git a/osu.Game/Online/Spectator/SpectatorState.cs b/osu.Game/Online/Spectator/SpectatorState.cs
new file mode 100644
index 0000000000..90238bfc38
--- /dev/null
+++ b/osu.Game/Online/Spectator/SpectatorState.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Online.Spectator
+{
+    [Serializable]
+    public class SpectatorState : IEquatable<SpectatorState>
+    {
+        public int? BeatmapID { get; set; }
+
+        [NotNull]
+        public IEnumerable<Mod> Mods { get; set; } = Enumerable.Empty<Mod>();
+
+        public SpectatorState(int? beatmapId = null, IEnumerable<Mod> mods = null)
+        {
+            BeatmapID = beatmapId;
+            if (mods != null)
+                Mods = mods;
+        }
+
+        public SpectatorState()
+        {
+        }
+
+        public bool Equals(SpectatorState other) => this.BeatmapID == other?.BeatmapID && this.Mods.SequenceEqual(other?.Mods);
+
+        public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods.SelectMany(m => m.Acronym))}";
+    }
+}
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 2a19a665fc..d93de3a710 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
 
@@ -30,6 +31,11 @@ namespace osu.Game.Online.Spectator
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
 
+        [Resolved]
+        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+
+        private readonly SpectatorState currentState = new SpectatorState();
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -73,9 +79,9 @@ namespace osu.Game.Online.Spectator
                          .Build();
 
             // until strong typed client support is added, each method must be manually bound (see https://github.com/dotnet/aspnetcore/issues/15198)
-            connection.On<string, int>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
+            connection.On<string, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
             connection.On<string, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
-            connection.On<string, int>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+            connection.On<string, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
 
             connection.Closed += async ex =>
             {
@@ -106,7 +112,7 @@ namespace osu.Game.Online.Spectator
             }
         }
 
-        Task ISpectatorClient.UserBeganPlaying(string userId, int beatmapId)
+        Task ISpectatorClient.UserBeganPlaying(string userId, SpectatorState state)
         {
             if (connection.ConnectionId != userId)
             {
@@ -123,15 +129,15 @@ namespace osu.Game.Online.Spectator
             }
             else
             {
-                Console.WriteLine($"{connection.ConnectionId} Received user playing event for self {beatmapId}");
+                Console.WriteLine($"{connection.ConnectionId} Received user playing event for self {state}");
             }
 
             return Task.CompletedTask;
         }
 
-        Task ISpectatorClient.UserFinishedPlaying(string userId, int beatmapId)
+        Task ISpectatorClient.UserFinishedPlaying(string userId, SpectatorState state)
         {
-            Console.WriteLine($"{connection.ConnectionId} Received user finished event {beatmapId}");
+            Console.WriteLine($"{connection.ConnectionId} Received user finished event {state}");
             return Task.CompletedTask;
         }
 
@@ -155,11 +161,11 @@ namespace osu.Game.Online.Spectator
             connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
         }
 
-        public void EndPlaying(int beatmapId)
+        public void EndPlaying()
         {
             if (!isConnected) return;
 
-            connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), beatmapId);
+            connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), currentState);
         }
 
         public void WatchUser(string userId)
@@ -171,6 +177,7 @@ namespace osu.Game.Online.Spectator
 
         public void HandleFrame(ReplayFrame frame)
         {
+            // ReSharper disable once SuspiciousTypeConversion.Global (implemented by rulesets)
             if (frame is IConvertibleReplayFrame convertible)
                 // TODO: don't send a bundle for each individual frame
                 SendFrames(new FrameDataBundle(new[] { convertible.ToLegacy(beatmap.Value.Beatmap) }));
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index c90b20caeb..a84b4f4ba8 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -50,13 +50,13 @@ namespace osu.Game.Rulesets.UI
 
             inputManager = GetContainingInputManager();
 
-            spectatorStreaming?.BeginPlaying(beatmap.Value.BeatmapInfo.ID);
+            spectatorStreaming?.BeginPlaying();
         }
 
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            spectatorStreaming?.EndPlaying(beatmap.Value.BeatmapInfo.ID);
+            spectatorStreaming?.EndPlaying();
         }
 
         protected override bool OnMouseMove(MouseMoveEvent e)

From 0611b30258e1c5c5dcb2c5b346c4658a3773f69a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 17:29:43 +0900
Subject: [PATCH 05625/10326] Drop webpack

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 11 ++++++++---
 osu.Game/Replays/Legacy/LegacyReplayFrame.cs          |  2 --
 osu.Game/osu.Game.csproj                              |  3 +--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index d93de3a710..a89cc82535 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -75,7 +76,7 @@ namespace osu.Game.Online.Spectator
                          {
                              options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
                          })
-                         .AddMessagePackProtocol()
+                         .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
                          .Build();
 
             // until strong typed client support is added, each method must be manually bound (see https://github.com/dotnet/aspnetcore/issues/15198)
@@ -147,11 +148,15 @@ namespace osu.Game.Online.Spectator
             return Task.CompletedTask;
         }
 
-        public void BeginPlaying(int beatmapId)
+        public void BeginPlaying()
         {
             if (!isConnected) return;
 
-            connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), beatmapId);
+            // transfer state at point of beginning play
+            currentState.BeatmapID = beatmap.Value.BeatmapInfo.OnlineBeatmapID;
+            currentState.Mods = mods.Value.ToArray();
+
+            connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), currentState);
         }
 
         public void SendFrames(FrameDataBundle data)
diff --git a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
index 656fd1814e..c3cffa8699 100644
--- a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
+++ b/osu.Game/Replays/Legacy/LegacyReplayFrame.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 MessagePack;
 using osu.Game.Rulesets.Replays;
 using osuTK;
 
@@ -9,7 +8,6 @@ namespace osu.Game.Replays.Legacy
 {
     public class LegacyReplayFrame : ReplayFrame
     {
-        [IgnoreMember]
         public Vector2 Position => new Vector2(MouseX ?? 0, MouseY ?? 0);
 
         public float? MouseX;
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fd010fcc43..ca588b89d9 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,9 +21,8 @@
     <PackageReference Include="Dapper" Version="2.0.35" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
-    <PackageReference Include="MessagePack" Version="1.7.3.7" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.9" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.9" />
     <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" />

From c834aa605103b95cd9e074b6bd55ac4861694181 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 17:38:16 +0900
Subject: [PATCH 05626/10326] Use APIMod for mod serialization

---
 osu.Game/Online/API/APIMod.cs                         |  8 ++++++++
 osu.Game/Online/Spectator/SpectatorState.cs           | 11 ++++-------
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 46a8db31b7..780e5daa16 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -53,5 +53,13 @@ namespace osu.Game.Online.API
         }
 
         public bool Equals(IMod other) => Acronym == other?.Acronym;
+
+        public override string ToString()
+        {
+            if (Settings.Count > 0)
+                return $"{Acronym} ({string.Join(',', Settings.Select(kvp => $"{kvp.Key}:{kvp.Value}"))})";
+
+            return $"{Acronym}";
+        }
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorState.cs b/osu.Game/Online/Spectator/SpectatorState.cs
index 90238bfc38..3d9997f006 100644
--- a/osu.Game/Online/Spectator/SpectatorState.cs
+++ b/osu.Game/Online/Spectator/SpectatorState.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using osu.Game.Online.API;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Online.Spectator
@@ -12,21 +13,17 @@ namespace osu.Game.Online.Spectator
         public int? BeatmapID { get; set; }
 
         [NotNull]
-        public IEnumerable<Mod> Mods { get; set; } = Enumerable.Empty<Mod>();
+        public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        public SpectatorState(int? beatmapId = null, IEnumerable<Mod> mods = null)
+        public SpectatorState(int? beatmapId = null, IEnumerable<APIMod> mods = null)
         {
             BeatmapID = beatmapId;
             if (mods != null)
                 Mods = mods;
         }
 
-        public SpectatorState()
-        {
-        }
-
         public bool Equals(SpectatorState other) => this.BeatmapID == other?.BeatmapID && this.Mods.SequenceEqual(other?.Mods);
 
-        public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods.SelectMany(m => m.Acronym))}";
+        public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)}";
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index a89cc82535..21259bad5f 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Online.Spectator
 
             // transfer state at point of beginning play
             currentState.BeatmapID = beatmap.Value.BeatmapInfo.OnlineBeatmapID;
-            currentState.Mods = mods.Value.ToArray();
+            currentState.Mods = mods.Value.Select(m => new APIMod(m));
 
             connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), currentState);
         }

From 1ab6f41b3ba0127db8ae00609a821fbea36ce26a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 18:10:27 +0900
Subject: [PATCH 05627/10326] Add basic send and receive test

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 264 ++++++++++++++++++
 .../Spectator/SpectatorStreamingClient.cs     |   3 +
 2 files changed, 267 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
new file mode 100644
index 0000000000..665df5f9c7
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -0,0 +1,264 @@
+// Copyright (c) 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.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Framework.Input.StateChanges;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Spectator;
+using osu.Game.Replays;
+using osu.Game.Replays.Legacy;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Replays.Types;
+using osu.Game.Rulesets.UI;
+using osu.Game.Tests.Visual.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSpectator : OsuManualInputManagerTestScene
+    {
+        protected override bool UseOnlineAPI => true;
+
+        private TestRulesetInputManager playbackManager;
+        private TestRulesetInputManager recordingManager;
+
+        private Replay replay;
+
+        private TestReplayRecorder recorder;
+
+        [Resolved]
+        private SpectatorStreamingClient streamingClient { get; set; }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            replay = new Replay();
+
+            streamingClient.OnNewFrames += frames =>
+            {
+                foreach (var legacyFrame in frames.Frames)
+                {
+                    var frame = new TestReplayFrame();
+                    frame.FromLegacy(legacyFrame, null, null);
+                    replay.Frames.Add(frame);
+                }
+            };
+
+            Add(new GridContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        recordingManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
+                        {
+                            Recorder = recorder = new TestReplayRecorder
+                            {
+                                ScreenSpaceToGamefield = pos => recordingManager.ToLocalSpace(pos),
+                            },
+                            Child = new Container
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        Colour = Color4.Brown,
+                                        RelativeSizeAxes = Axes.Both,
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Text = "Sending",
+                                        Scale = new Vector2(3),
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                    },
+                                    new TestInputConsumer()
+                                }
+                            },
+                        }
+                    },
+                    new Drawable[]
+                    {
+                        playbackManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
+                        {
+                            ReplayInputHandler = new TestFramedReplayInputHandler(replay)
+                            {
+                                GamefieldToScreenSpace = pos => playbackManager.ToScreenSpace(pos),
+                            },
+                            Child = new Container
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        Colour = Color4.DarkBlue,
+                                        RelativeSizeAxes = Axes.Both,
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Text = "Receiving",
+                                        Scale = new Vector2(3),
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                    },
+                                    new TestInputConsumer()
+                                }
+                            },
+                        }
+                    }
+                }
+            });
+        });
+
+        [Test]
+        public void TestBasic()
+        {
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            playbackManager?.ReplayInputHandler.SetFrameFromTime(Time.Current - 100);
+        }
+
+        public class TestFramedReplayInputHandler : FramedReplayInputHandler<TestReplayFrame>
+        {
+            public TestFramedReplayInputHandler(Replay replay)
+                : base(replay)
+            {
+            }
+
+            public override void CollectPendingInputs(List<IInput> inputs)
+            {
+                inputs.Add(new MousePositionAbsoluteInput { Position = GamefieldToScreenSpace(CurrentFrame?.Position ?? Vector2.Zero) });
+                inputs.Add(new ReplayState<TestAction> { PressedActions = CurrentFrame?.Actions ?? new List<TestAction>() });
+            }
+        }
+
+        public class TestInputConsumer : CompositeDrawable, IKeyBindingHandler<TestAction>
+        {
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent.ReceivePositionalInputAt(screenSpacePos);
+
+            private readonly Box box;
+
+            public TestInputConsumer()
+            {
+                Size = new Vector2(30);
+
+                Origin = Anchor.Centre;
+
+                InternalChildren = new Drawable[]
+                {
+                    box = new Box
+                    {
+                        Colour = Color4.Black,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                };
+            }
+
+            protected override bool OnMouseMove(MouseMoveEvent e)
+            {
+                Position = e.MousePosition;
+                return base.OnMouseMove(e);
+            }
+
+            public bool OnPressed(TestAction action)
+            {
+                box.Colour = Color4.White;
+                return true;
+            }
+
+            public void OnReleased(TestAction action)
+            {
+                box.Colour = Color4.Black;
+            }
+        }
+
+        public class TestRulesetInputManager : RulesetInputManager<TestAction>
+        {
+            public TestRulesetInputManager(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+                : base(ruleset, variant, unique)
+            {
+            }
+
+            protected override KeyBindingContainer<TestAction> CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+                => new TestKeyBindingContainer();
+
+            internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
+            {
+                public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+                {
+                    new KeyBinding(InputKey.MouseLeft, TestAction.Down),
+                };
+            }
+        }
+
+        public class TestReplayFrame : ReplayFrame, IConvertibleReplayFrame
+        {
+            public Vector2 Position;
+
+            public List<TestAction> Actions = new List<TestAction>();
+
+            public TestReplayFrame(double time, Vector2 position, params TestAction[] actions)
+                : base(time)
+            {
+                Position = position;
+                Actions.AddRange(actions);
+            }
+
+            public TestReplayFrame()
+            {
+            }
+
+            public void FromLegacy(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null)
+            {
+                Position = currentFrame.Position;
+                Time = currentFrame.Time;
+                if (currentFrame.MouseLeft)
+                    Actions.Add(TestAction.Down);
+            }
+
+            public LegacyReplayFrame ToLegacy(IBeatmap beatmap)
+            {
+                ReplayButtonState state = ReplayButtonState.None;
+
+                if (Actions.Contains(TestAction.Down))
+                    state |= ReplayButtonState.Left1;
+
+                return new LegacyReplayFrame(Time, Position.X, Position.Y, state);
+            }
+        }
+
+        public enum TestAction
+        {
+            Down,
+        }
+
+        internal class TestReplayRecorder : ReplayRecorder<TestAction>
+        {
+            public TestReplayRecorder()
+                : base(new Replay())
+            {
+            }
+
+            protected override ReplayFrame HandleFrame(Vector2 mousePosition, List<TestAction> actions, ReplayFrame previousFrame)
+            {
+                return new TestReplayFrame(Time.Current, mousePosition, actions.ToArray());
+            }
+        }
+    }
+}
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 21259bad5f..608123fbab 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Online.Spectator
 
         private readonly SpectatorState currentState = new SpectatorState();
 
+        public event Action<FrameDataBundle> OnNewFrames;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -145,6 +147,7 @@ namespace osu.Game.Online.Spectator
         Task ISpectatorClient.UserSentFrames(string userId, FrameDataBundle data)
         {
             Console.WriteLine($"{connection.ConnectionId} Received frames from {userId}: {data.Frames.First()}");
+            OnNewFrames?.Invoke(data);
             return Task.CompletedTask;
         }
 

From 34e889e66e3bfeabd22ea5eb6550b5e338c15bce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 18:37:19 +0900
Subject: [PATCH 05628/10326] Don't watch every user in normal gameplay (but
 allow so in test)

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 20 ++++-
 osu.Game/Online/Spectator/ISpectatorClient.cs |  6 +-
 osu.Game/Online/Spectator/ISpectatorServer.cs |  4 +-
 osu.Game/Online/Spectator/SpectatorState.cs   |  1 -
 .../Spectator/SpectatorStreamingClient.cs     | 85 ++++++++++++-------
 5 files changed, 78 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 665df5f9c7..2ec82ad5fb 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -2,8 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -34,7 +36,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private Replay replay;
 
-        private TestReplayRecorder recorder;
+        private IBindableList<int> users;
 
         [Resolved]
         private SpectatorStreamingClient streamingClient { get; set; }
@@ -44,7 +46,19 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             replay = new Replay();
 
-            streamingClient.OnNewFrames += frames =>
+            users = streamingClient.PlayingUsers.GetBoundCopy();
+            users.BindCollectionChanged((obj, args) =>
+            {
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (int user in args.NewItems)
+                            streamingClient.WatchUser(user);
+                        break;
+                }
+            }, true);
+
+            streamingClient.OnNewFrames += (userId, frames) =>
             {
                 foreach (var legacyFrame in frames.Frames)
                 {
@@ -63,7 +77,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         recordingManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
-                            Recorder = recorder = new TestReplayRecorder
+                            Recorder = new TestReplayRecorder
                             {
                                 ScreenSpaceToGamefield = pos => recordingManager.ToLocalSpace(pos),
                             },
diff --git a/osu.Game/Online/Spectator/ISpectatorClient.cs b/osu.Game/Online/Spectator/ISpectatorClient.cs
index dcff6e6c1c..18c9d61561 100644
--- a/osu.Game/Online/Spectator/ISpectatorClient.cs
+++ b/osu.Game/Online/Spectator/ISpectatorClient.cs
@@ -12,20 +12,20 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         /// <param name="userId">The user.</param>
         /// <param name="state">The state of gameplay.</param>
-        Task UserBeganPlaying(string userId, SpectatorState state);
+        Task UserBeganPlaying(int userId, SpectatorState state);
 
         /// <summary>
         /// Signals that a user has finished a play session.
         /// </summary>
         /// <param name="userId">The user.</param>
         /// <param name="state">The state of gameplay.</param>
-        Task UserFinishedPlaying(string userId, SpectatorState state);
+        Task UserFinishedPlaying(int userId, SpectatorState state);
 
         /// <summary>
         /// Called when new frames are available for a subscribed user's play session.
         /// </summary>
         /// <param name="userId">The user.</param>
         /// <param name="data">The frame data.</param>
-        Task UserSentFrames(string userId, FrameDataBundle data);
+        Task UserSentFrames(int userId, FrameDataBundle data);
     }
 }
diff --git a/osu.Game/Online/Spectator/ISpectatorServer.cs b/osu.Game/Online/Spectator/ISpectatorServer.cs
index 018fa6b66b..99893e385c 100644
--- a/osu.Game/Online/Spectator/ISpectatorServer.cs
+++ b/osu.Game/Online/Spectator/ISpectatorServer.cs
@@ -30,12 +30,12 @@ namespace osu.Game.Online.Spectator
         /// For offline users, a subscription will be created and data will begin streaming on next play.
         /// </summary>
         /// <param name="userId">The user to subscribe to.</param>
-        Task StartWatchingUser(string userId);
+        Task StartWatchingUser(int userId);
 
         /// <summary>
         /// Stop requesting spectating data for the specified user. Unsubscribes from receiving further data.
         /// </summary>
         /// <param name="userId">The user to unsubscribe from.</param>
-        Task EndWatchingUser(string userId);
+        Task EndWatchingUser(int userId);
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorState.cs b/osu.Game/Online/Spectator/SpectatorState.cs
index 3d9997f006..6b2b8b8cb2 100644
--- a/osu.Game/Online/Spectator/SpectatorState.cs
+++ b/osu.Game/Online/Spectator/SpectatorState.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using osu.Game.Online.API;
-using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Online.Spectator
 {
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 608123fbab..2665243e4c 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
@@ -20,7 +21,11 @@ namespace osu.Game.Online.Spectator
     {
         private HubConnection connection;
 
-        private readonly List<string> watchingUsers = new List<string>();
+        private readonly List<int> watchingUsers = new List<int>();
+
+        public IBindableList<int> PlayingUsers => playingUsers;
+
+        private readonly BindableList<int> playingUsers = new BindableList<int>();
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
@@ -37,7 +42,12 @@ namespace osu.Game.Online.Spectator
 
         private readonly SpectatorState currentState = new SpectatorState();
 
-        public event Action<FrameDataBundle> OnNewFrames;
+        private bool isPlaying;
+
+        /// <summary>
+        /// Called whenever new frames arrive from the server.
+        /// </summary>
+        public event Action<int, FrameDataBundle> OnNewFrames;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -82,13 +92,15 @@ namespace osu.Game.Online.Spectator
                          .Build();
 
             // until strong typed client support is added, each method must be manually bound (see https://github.com/dotnet/aspnetcore/issues/15198)
-            connection.On<string, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
-            connection.On<string, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
-            connection.On<string, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+            connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
+            connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
+            connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
 
             connection.Closed += async ex =>
             {
                 isConnected = false;
+                playingUsers.Clear();
+
                 if (ex != null) await tryUntilConnected();
             };
 
@@ -105,6 +117,17 @@ namespace osu.Game.Online.Spectator
 
                         // success
                         isConnected = true;
+
+                        // resubscribe to watched users
+                        var users = watchingUsers.ToArray();
+                        watchingUsers.Clear();
+                        foreach (var userId in users)
+                            WatchUser(userId);
+
+                        // re-send state in case it wasn't received
+                        if (isPlaying)
+                            beginPlaying();
+
                         break;
                     }
                     catch
@@ -115,39 +138,23 @@ namespace osu.Game.Online.Spectator
             }
         }
 
-        Task ISpectatorClient.UserBeganPlaying(string userId, SpectatorState state)
+        Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
         {
-            if (connection.ConnectionId != userId)
-            {
-                if (watchingUsers.Contains(userId))
-                {
-                    Console.WriteLine($"{connection.ConnectionId} received began playing for already watched user {userId}");
-                }
-                else
-                {
-                    Console.WriteLine($"{connection.ConnectionId} requesting watch other user {userId}");
-                    WatchUser(userId);
-                    watchingUsers.Add(userId);
-                }
-            }
-            else
-            {
-                Console.WriteLine($"{connection.ConnectionId} Received user playing event for self {state}");
-            }
+            if (!playingUsers.Contains(userId))
+                playingUsers.Add(userId);
 
             return Task.CompletedTask;
         }
 
-        Task ISpectatorClient.UserFinishedPlaying(string userId, SpectatorState state)
+        Task ISpectatorClient.UserFinishedPlaying(int userId, SpectatorState state)
         {
-            Console.WriteLine($"{connection.ConnectionId} Received user finished event {state}");
+            playingUsers.Remove(userId);
             return Task.CompletedTask;
         }
 
-        Task ISpectatorClient.UserSentFrames(string userId, FrameDataBundle data)
+        Task ISpectatorClient.UserSentFrames(int userId, FrameDataBundle data)
         {
-            Console.WriteLine($"{connection.ConnectionId} Received frames from {userId}: {data.Frames.First()}");
-            OnNewFrames?.Invoke(data);
+            OnNewFrames?.Invoke(userId, data);
             return Task.CompletedTask;
         }
 
@@ -155,10 +162,22 @@ namespace osu.Game.Online.Spectator
         {
             if (!isConnected) return;
 
+            if (isPlaying)
+                throw new InvalidOperationException($"Cannot invoke {nameof(BeginPlaying)} when already playing");
+
+            isPlaying = true;
+
             // transfer state at point of beginning play
             currentState.BeatmapID = beatmap.Value.BeatmapInfo.OnlineBeatmapID;
             currentState.Mods = mods.Value.Select(m => new APIMod(m));
 
+            beginPlaying();
+        }
+
+        private void beginPlaying()
+        {
+            Debug.Assert(isPlaying);
+
             connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), currentState);
         }
 
@@ -173,13 +192,21 @@ namespace osu.Game.Online.Spectator
         {
             if (!isConnected) return;
 
+            if (!isPlaying)
+                throw new InvalidOperationException($"Cannot invoke {nameof(EndPlaying)} when not playing");
+
+            isPlaying = false;
             connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), currentState);
         }
 
-        public void WatchUser(string userId)
+        public void WatchUser(int userId)
         {
             if (!isConnected) return;
 
+            if (watchingUsers.Contains(userId))
+                return;
+
+            watchingUsers.Add(userId);
             connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
         }
 

From d659b7739d4c78ff8926565145c1952fdb91b76f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 19:16:34 +0900
Subject: [PATCH 05629/10326] Correctly stop watching users that leave

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 2ec82ad5fb..be3241c784 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -55,6 +55,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                         foreach (int user in args.NewItems)
                             streamingClient.WatchUser(user);
                         break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (int user in args.OldItems)
+                            streamingClient.StopWatchingUser(user);
+                        break;
                 }
             }, true);
 

From 823d717a7d986e5551b50d87f1d3abefdffb560b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 19:17:10 +0900
Subject: [PATCH 05630/10326] Reduce the serialised size of LegacyReplayFrame

---
 osu.Game/Replays/Legacy/LegacyReplayFrame.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
index c3cffa8699..74bacae9e1 100644
--- a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
+++ b/osu.Game/Replays/Legacy/LegacyReplayFrame.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 Newtonsoft.Json;
 using osu.Game.Rulesets.Replays;
 using osuTK;
 
@@ -8,17 +9,28 @@ namespace osu.Game.Replays.Legacy
 {
     public class LegacyReplayFrame : ReplayFrame
     {
+        [JsonIgnore]
         public Vector2 Position => new Vector2(MouseX ?? 0, MouseY ?? 0);
 
         public float? MouseX;
         public float? MouseY;
 
+        [JsonIgnore]
         public bool MouseLeft => MouseLeft1 || MouseLeft2;
+
+        [JsonIgnore]
         public bool MouseRight => MouseRight1 || MouseRight2;
 
+        [JsonIgnore]
         public bool MouseLeft1 => ButtonState.HasFlag(ReplayButtonState.Left1);
+
+        [JsonIgnore]
         public bool MouseRight1 => ButtonState.HasFlag(ReplayButtonState.Right1);
+
+        [JsonIgnore]
         public bool MouseLeft2 => ButtonState.HasFlag(ReplayButtonState.Left2);
+
+        [JsonIgnore]
         public bool MouseRight2 => ButtonState.HasFlag(ReplayButtonState.Right2);
 
         public ReplayButtonState ButtonState;

From ee2513bf4b7fc17192dc584c21f1f1a911c59971 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 19:17:19 +0900
Subject: [PATCH 05631/10326] Add batch sending

---
 .../Spectator/SpectatorStreamingClient.cs     | 56 +++++++++++++++++--
 1 file changed, 50 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 2665243e4c..9ebb84c007 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
+using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
@@ -185,7 +186,7 @@ namespace osu.Game.Online.Spectator
         {
             if (!isConnected) return;
 
-            connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
+            lastSend = connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
         }
 
         public void EndPlaying()
@@ -201,21 +202,64 @@ namespace osu.Game.Online.Spectator
 
         public void WatchUser(int userId)
         {
-            if (!isConnected) return;
-
             if (watchingUsers.Contains(userId))
                 return;
 
             watchingUsers.Add(userId);
+
+            if (!isConnected) return;
+
             connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
         }
 
+        public void StopWatchingUser(int userId)
+        {
+            watchingUsers.Remove(userId);
+
+            if (!isConnected) return;
+
+            connection.SendAsync(nameof(ISpectatorServer.EndWatchingUser), userId);
+        }
+
+        private readonly Queue<LegacyReplayFrame> pendingFrames = new Queue<LegacyReplayFrame>();
+
+        private double lastSendTime;
+
+        private Task lastSend;
+
+        private const double time_between_sends = 200;
+
+        private const int max_pending_frames = 30;
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (pendingFrames.Count > 0 && Time.Current - lastSendTime > time_between_sends)
+                purgePendingFrames();
+        }
+
         public void HandleFrame(ReplayFrame frame)
         {
-            // ReSharper disable once SuspiciousTypeConversion.Global (implemented by rulesets)
             if (frame is IConvertibleReplayFrame convertible)
-                // TODO: don't send a bundle for each individual frame
-                SendFrames(new FrameDataBundle(new[] { convertible.ToLegacy(beatmap.Value.Beatmap) }));
+                pendingFrames.Enqueue(convertible.ToLegacy(beatmap.Value.Beatmap));
+
+            if (pendingFrames.Count > max_pending_frames)
+                purgePendingFrames();
+        }
+
+        private void purgePendingFrames()
+        {
+            if (lastSend?.IsCompleted == false)
+                return;
+
+            var frames = pendingFrames.ToArray();
+
+            pendingFrames.Clear();
+
+            SendFrames(new FrameDataBundle(frames));
+
+            lastSendTime = Time.Current;
         }
     }
 }

From 04f46bc1f84739780214d468f1d79a298ffd4ee3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 19:24:32 +0900
Subject: [PATCH 05632/10326] Clean up usings

---
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index 71cd39953c..d464eee7c5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -13,9 +13,7 @@ using osu.Framework.Input.StateChanges;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.Spectator;
 using osu.Game.Replays;
-using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;

From 147d502da13bb303af11cf53395cd53ed09f4e8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 19:30:07 +0900
Subject: [PATCH 05633/10326] Fix initial play state not being kept locally if
 not connected

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 9ebb84c007..6737625818 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -161,8 +161,6 @@ namespace osu.Game.Online.Spectator
 
         public void BeginPlaying()
         {
-            if (!isConnected) return;
-
             if (isPlaying)
                 throw new InvalidOperationException($"Cannot invoke {nameof(BeginPlaying)} when already playing");
 
@@ -179,6 +177,8 @@ namespace osu.Game.Online.Spectator
         {
             Debug.Assert(isPlaying);
 
+            if (!isConnected) return;
+
             connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), currentState);
         }
 

From 51ae93d484f31fd586fddee4095657caaf0924ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 19:31:56 +0900
Subject: [PATCH 05634/10326] Revert unnecessary file changes

---
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index d464eee7c5..bc1c10e59d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -266,9 +266,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
 
             protected override ReplayFrame HandleFrame(Vector2 mousePosition, List<TestAction> actions, ReplayFrame previousFrame)
-            {
-                return new TestReplayFrame(Time.Current, mousePosition, actions.ToArray());
-            }
+                => new TestReplayFrame(Time.Current, mousePosition, actions.ToArray());
         }
     }
 }

From 9f2f8d8cc778df600182d50defdf28ae5106f0ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 19:41:10 +0900
Subject: [PATCH 05635/10326] Fix missing licence headers

---
 osu.Game/Online/Spectator/FrameDataBundle.cs          | 3 +++
 osu.Game/Online/Spectator/ISpectatorClient.cs         | 3 +++
 osu.Game/Online/Spectator/ISpectatorServer.cs         | 3 +++
 osu.Game/Online/Spectator/SpectatorState.cs           | 5 ++++-
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 3 +++
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/FrameDataBundle.cs b/osu.Game/Online/Spectator/FrameDataBundle.cs
index 67f2688289..5281e61f9c 100644
--- a/osu.Game/Online/Spectator/FrameDataBundle.cs
+++ b/osu.Game/Online/Spectator/FrameDataBundle.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.
+
 using System;
 using System.Collections.Generic;
 using osu.Game.Replays.Legacy;
diff --git a/osu.Game/Online/Spectator/ISpectatorClient.cs b/osu.Game/Online/Spectator/ISpectatorClient.cs
index 18c9d61561..3acc9b2282 100644
--- a/osu.Game/Online/Spectator/ISpectatorClient.cs
+++ b/osu.Game/Online/Spectator/ISpectatorClient.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.
+
 using System.Threading.Tasks;
 
 namespace osu.Game.Online.Spectator
diff --git a/osu.Game/Online/Spectator/ISpectatorServer.cs b/osu.Game/Online/Spectator/ISpectatorServer.cs
index 99893e385c..af0196862a 100644
--- a/osu.Game/Online/Spectator/ISpectatorServer.cs
+++ b/osu.Game/Online/Spectator/ISpectatorServer.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.
+
 using System.Threading.Tasks;
 
 namespace osu.Game.Online.Spectator
diff --git a/osu.Game/Online/Spectator/SpectatorState.cs b/osu.Game/Online/Spectator/SpectatorState.cs
index 6b2b8b8cb2..48fad4b3b2 100644
--- a/osu.Game/Online/Spectator/SpectatorState.cs
+++ b/osu.Game/Online/Spectator/SpectatorState.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.
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -21,7 +24,7 @@ namespace osu.Game.Online.Spectator
                 Mods = mods;
         }
 
-        public bool Equals(SpectatorState other) => this.BeatmapID == other?.BeatmapID && this.Mods.SequenceEqual(other?.Mods);
+        public bool Equals(SpectatorState other) => BeatmapID == other?.BeatmapID && Mods.SequenceEqual(other?.Mods);
 
         public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)}";
     }
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 6737625818..006f75c1d2 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.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.
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

From 54d666604bc0daa207aa1c923715a391b22badb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 22:56:23 +0900
Subject: [PATCH 05636/10326] Fix incorrect order of flag settings

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 006f75c1d2..2fc1431702 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -194,12 +194,13 @@ namespace osu.Game.Online.Spectator
 
         public void EndPlaying()
         {
-            if (!isConnected) return;
-
             if (!isPlaying)
                 throw new InvalidOperationException($"Cannot invoke {nameof(EndPlaying)} when not playing");
 
             isPlaying = false;
+
+            if (!isConnected) return;
+
             connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), currentState);
         }
 

From 2871001cc294da01f2db8e8c35d84a86ab1503ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 22 Oct 2020 18:21:28 +0200
Subject: [PATCH 05637/10326] Add BackgroundSource.Seasonal

---
 osu.Game/Configuration/BackgroundSource.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/BackgroundSource.cs b/osu.Game/Configuration/BackgroundSource.cs
index 5726e96eb1..beef9ef1de 100644
--- a/osu.Game/Configuration/BackgroundSource.cs
+++ b/osu.Game/Configuration/BackgroundSource.cs
@@ -6,6 +6,7 @@ namespace osu.Game.Configuration
     public enum BackgroundSource
     {
         Skin,
-        Beatmap
+        Beatmap,
+        Seasonal
     }
 }

From cdb2d23578e6de7ca266a23a51b5fac2ed15b8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 22 Oct 2020 18:23:03 +0200
Subject: [PATCH 05638/10326] Set BackgroundSource.Seasonal as default setting

---
 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 7d601c0cb9..5c5af701bb 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
 
-            Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
+            Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Seasonal);
         }
 
         public OsuConfigManager(Storage storage)

From 09d49aa0f7b2d953370e02897ef382bd3ea04f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 22 Oct 2020 18:25:01 +0200
Subject: [PATCH 05639/10326] Add GetSeasonalBackgroundsRequest

---
 .../Requests/GetSeasonalBackgroundsRequest.cs | 12 +++++++++++
 .../Responses/APISeasonalBackgrounds.cs       | 20 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 osu.Game/Online/API/Requests/GetSeasonalBackgroundsRequest.cs
 create mode 100644 osu.Game/Online/API/Requests/Responses/APISeasonalBackgrounds.cs

diff --git a/osu.Game/Online/API/Requests/GetSeasonalBackgroundsRequest.cs b/osu.Game/Online/API/Requests/GetSeasonalBackgroundsRequest.cs
new file mode 100644
index 0000000000..941b47244a
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetSeasonalBackgroundsRequest.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.Online.API.Requests
+{
+    public class GetSeasonalBackgroundsRequest : APIRequest<APISeasonalBackgrounds>
+    {
+        protected override string Target => @"seasonal-backgrounds";
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/APISeasonalBackgrounds.cs b/osu.Game/Online/API/Requests/Responses/APISeasonalBackgrounds.cs
new file mode 100644
index 0000000000..6996ac4d9b
--- /dev/null
+++ b/osu.Game/Online/API/Requests/Responses/APISeasonalBackgrounds.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.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace osu.Game.Online.API.Requests.Responses
+{
+    public class APISeasonalBackgrounds
+    {
+        [JsonProperty("backgrounds")]
+        public List<APISeasonalBackground> Backgrounds { get; set; }
+    }
+
+    public class APISeasonalBackground
+    {
+        [JsonProperty("url")]
+        public string Url { get; set; }
+    }
+}

From f11bcfcb8f301b8d19e465176a7b66ca70f88858 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Oct 2020 10:03:33 +0900
Subject: [PATCH 05640/10326] Remove unnecessary public specification in
 interface
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/Online/API/IAPIProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 9b7485decd..d10cb4b6d2 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Online.API
         /// <summary>
         /// Retrieve the OAuth access token.
         /// </summary>
-        public string AccessToken { get; }
+        string AccessToken { get; }
 
         /// <summary>
         /// Returns whether the local user is logged in.

From e99cf369fac8e35b16a2b9458651f847cb1905f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Oct 2020 13:33:23 +0900
Subject: [PATCH 05641/10326] Don't worry about EndPlaying being invoked when
 not playing

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 2fc1431702..1ca0a378bb 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -194,9 +194,6 @@ namespace osu.Game.Online.Spectator
 
         public void EndPlaying()
         {
-            if (!isPlaying)
-                throw new InvalidOperationException($"Cannot invoke {nameof(EndPlaying)} when not playing");
-
             isPlaying = false;
 
             if (!isConnected) return;

From 55f1b05dbf6c74e389cfc6af2133ed03bd7e2da0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Oct 2020 14:47:08 +0900
Subject: [PATCH 05642/10326] Fix test failures due to recorder not stopping in
 time

---
 .../Visual/Gameplay/TestSceneReplayRecorder.cs        |  6 ++++++
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs  | 11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index bc1c10e59d..e964d2a40e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -166,6 +166,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             playbackManager?.ReplayInputHandler.SetFrameFromTime(Time.Current - 100);
         }
 
+        [TearDownSteps]
+        public void TearDown()
+        {
+            AddStep("stop recorder", () => recorder.Expire());
+        }
+
         public class TestFramedReplayInputHandler : FramedReplayInputHandler<TestReplayFrame>
         {
             public TestFramedReplayInputHandler(Replay replay)
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index be3241c784..f8b5d385a9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Spectator;
@@ -38,6 +39,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private IBindableList<int> users;
 
+        private TestReplayRecorder recorder;
+
         [Resolved]
         private SpectatorStreamingClient streamingClient { get; set; }
 
@@ -82,7 +85,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         recordingManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
-                            Recorder = new TestReplayRecorder
+                            Recorder = recorder = new TestReplayRecorder
                             {
                                 ScreenSpaceToGamefield = pos => recordingManager.ToLocalSpace(pos),
                             },
@@ -153,6 +156,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             playbackManager?.ReplayInputHandler.SetFrameFromTime(Time.Current - 100);
         }
 
+        [TearDownSteps]
+        public void TearDown()
+        {
+            AddStep("stop recorder", () => recorder.Expire());
+        }
+
         public class TestFramedReplayInputHandler : FramedReplayInputHandler<TestReplayFrame>
         {
             public TestFramedReplayInputHandler(Replay replay)

From 4fca7675b07fbd9c9784560ec22479cc986c0223 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Oct 2020 14:47:21 +0900
Subject: [PATCH 05643/10326] Don't send spectate data when an autoplay mod is
 active

---
 osu.Game/Screens/Play/Player.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 9ee0b8a54f..6b2d2f40d0 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -152,7 +152,9 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            PrepareReplay();
+            // replays should never be recorded or played back when autoplay is enabled
+            if (!Mods.Value.Any(m => m is ModAutoplay))
+                PrepareReplay();
         }
 
         private Replay recordingReplay;

From 9141f48b047c0a59fa49c0dfadfef578900753f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Oct 2020 14:57:27 +0900
Subject: [PATCH 05644/10326] Remove beatmap-based ctor to promote single flow

---
 .../Expanded/ExpandedPanelMiddleContent.cs    |  5 +++--
 .../Ranking/Expanded/StarRatingDisplay.cs     | 22 ++++---------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 5aac449adb..30747438c3 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 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;
@@ -51,7 +52,7 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(BeatmapDifficultyManager beatmapDifficultyManager)
         {
             var beatmap = score.Beatmap;
             var metadata = beatmap.BeatmapSet?.Metadata ?? beatmap.Metadata;
@@ -138,7 +139,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     Spacing = new Vector2(5, 0),
                                     Children = new Drawable[]
                                     {
-                                        new StarRatingDisplay(beatmap)
+                                        new StarRatingDisplay(beatmapDifficultyManager.GetDifficulty(beatmap, score.Ruleset, score.Mods))
                                         {
                                             Anchor = Anchor.CentreLeft,
                                             Origin = Anchor.CentreLeft
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 402ab99908..ffb12d474b 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -22,18 +22,7 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// </summary>
     public class StarRatingDisplay : CompositeDrawable
     {
-        private readonly BeatmapInfo beatmap;
-
-        private StarDifficulty? difficulty;
-
-        /// <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;
-        }
+        private readonly StarDifficulty difficulty;
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
@@ -49,17 +38,14 @@ namespace osu.Game.Screens.Ranking.Expanded
         {
             AutoSizeAxes = Axes.Both;
 
-            if (!difficulty.HasValue)
-                difficulty = difficultyManager.GetDifficulty(beatmap);
-
-            var starRatingParts = difficulty.Value.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
             string wholePart = starRatingParts[0];
             string fractionPart = starRatingParts[1];
             string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
 
-            ColourInfo backgroundColour = difficulty.Value.DifficultyRating == DifficultyRating.ExpertPlus
+            ColourInfo backgroundColour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
                 ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.Value.DifficultyRating);
+                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
 
             InternalChildren = new Drawable[]
             {

From 9404096a28c49a2c9370d6dd2d07a893d86f82df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Oct 2020 15:06:00 +0900
Subject: [PATCH 05645/10326] Update tests to match new constructor

---
 .../Visual/Ranking/TestSceneStarRatingDisplay.cs   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index d12f32e470..d0067c3396 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -18,13 +18,13 @@ namespace osu.Game.Tests.Visual.Ranking
                 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 }),
+                    new StarRatingDisplay(new StarDifficulty(1.23, 0)),
+                    new StarRatingDisplay(new StarDifficulty(2.34, 0)),
+                    new StarRatingDisplay(new StarDifficulty(3.45, 0)),
+                    new StarRatingDisplay(new StarDifficulty(4.56, 0)),
+                    new StarRatingDisplay(new StarDifficulty(5.67, 0)),
+                    new StarRatingDisplay(new StarDifficulty(6.78, 0)),
+                    new StarRatingDisplay(new StarDifficulty(10.11, 0)),
                 }
             };
         }

From 1b84402b966744babc95e20790f83fa3061b9f8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Oct 2020 15:33:38 +0900
Subject: [PATCH 05646/10326] Centralise and share logic for storyboard frame
 lookup method

---
 .../Drawables/DrawableStoryboardAnimation.cs  | 19 +++++--------------
 .../Drawables/DrawableStoryboardSprite.cs     | 16 +++++-----------
 osu.Game/Storyboards/Storyboard.cs            | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 8382f91d1f..97de239e4a 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -2,16 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
-using osu.Game.Beatmaps;
-using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -117,18 +113,13 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore, Storyboard storyboard)
+        private void load(TextureStore textureStore, Storyboard storyboard)
         {
-            for (var frame = 0; frame < Animation.FrameCount; frame++)
+            for (int frame = 0; frame < Animation.FrameCount; frame++)
             {
-                var framePath = Animation.Path.Replace(".", frame + ".");
+                string framePath = Animation.Path.Replace(".", frame + ".");
 
-                var storyboardPath = beatmap.Value.BeatmapSetInfo.Files.Find(f => f.Filename.Equals(framePath, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
-                var frameSprite = storyboard.UseSkinSprites && storyboardPath == null
-                    ? (Drawable)new SkinnableSprite(framePath)
-                    : new Sprite { Texture = textureStore.Get(storyboardPath) };
-
-                AddFrame(frameSprite, Animation.FrameDelay);
+                AddFrame(storyboard.CreateSpriteFromResourcePath(framePath, textureStore), Animation.FrameDelay);
             }
 
             Animation.ApplyTransforms(this);
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 9599375c76..1adbe688e7 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -2,16 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
-using osu.Game.Beatmaps;
-using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -116,14 +112,12 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore, Storyboard storyboard)
+        private void load(TextureStore textureStore, Storyboard storyboard)
         {
-            var storyboardPath = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Sprite.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
-            var sprite = storyboard.UseSkinSprites && storyboardPath == null
-                ? (Drawable)new SkinnableSprite(Sprite.Path)
-                : new Sprite { Texture = textureStore.Get(storyboardPath) };
+            var drawable = storyboard.CreateSpriteFromResourcePath(Sprite.Path, textureStore);
 
-            InternalChild = sprite.With(s => s.Anchor = s.Origin = Anchor.Centre);
+            if (drawable != null)
+                InternalChild = drawable.With(s => s.Anchor = s.Origin = Anchor.Centre);
 
             Sprite.ApplyTransforms(this);
         }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index daafdf015d..e0d18eab00 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -1,9 +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;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
+using osu.Game.Skinning;
 using osu.Game.Storyboards.Drawables;
 
 namespace osu.Game.Storyboards
@@ -69,5 +74,19 @@ namespace osu.Game.Storyboards
             drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard ? 16 / 9f : 4 / 3f);
             return drawable;
         }
+
+        public Drawable CreateSpriteFromResourcePath(string path, TextureStore textureStore)
+        {
+            Drawable drawable = null;
+            var storyboardPath = BeatmapInfo.BeatmapSet?.Files?.Find(f => f.Filename.Equals(path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+
+            if (storyboardPath != null)
+                drawable = new Sprite { Texture = textureStore.Get(storyboardPath) };
+            // if the texture isn't available locally in the beatmap, some storyboards choose to source from the underlying skin lookup hierarchy.
+            else if (UseSkinSprites)
+                drawable = new SkinnableSprite(path);
+
+            return drawable;
+        }
     }
 }

From 4f746792fba1f427357675b0c054ff84b2bd95b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Oct 2020 15:46:24 +0900
Subject: [PATCH 05647/10326] Fix regression causing storyboard sprites to have
 incorrect origin support

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 1adbe688e7..7b1a6d54da 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -109,6 +109,8 @@ namespace osu.Game.Storyboards.Drawables
 
             LifetimeStart = sprite.StartTime;
             LifetimeEnd = sprite.EndTime;
+
+            AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
@@ -117,7 +119,7 @@ namespace osu.Game.Storyboards.Drawables
             var drawable = storyboard.CreateSpriteFromResourcePath(Sprite.Path, textureStore);
 
             if (drawable != null)
-                InternalChild = drawable.With(s => s.Anchor = s.Origin = Anchor.Centre);
+                InternalChild = drawable;
 
             Sprite.ApplyTransforms(this);
         }

From e20a98640199bce08ba1f445ca283027f8fe9282 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Oct 2020 17:24:19 +0900
Subject: [PATCH 05648/10326] Add ruleset to state

---
 osu.Game/Online/Spectator/SpectatorState.cs         | 13 ++++---------
 .../Online/Spectator/SpectatorStreamingClient.cs    |  5 +++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorState.cs b/osu.Game/Online/Spectator/SpectatorState.cs
index 48fad4b3b2..101ce3d5d5 100644
--- a/osu.Game/Online/Spectator/SpectatorState.cs
+++ b/osu.Game/Online/Spectator/SpectatorState.cs
@@ -14,18 +14,13 @@ namespace osu.Game.Online.Spectator
     {
         public int? BeatmapID { get; set; }
 
+        public int? RulesetID { get; set; }
+
         [NotNull]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        public SpectatorState(int? beatmapId = null, IEnumerable<APIMod> mods = null)
-        {
-            BeatmapID = beatmapId;
-            if (mods != null)
-                Mods = mods;
-        }
+        public bool Equals(SpectatorState other) => BeatmapID == other?.BeatmapID && Mods.SequenceEqual(other?.Mods) && RulesetID == other?.RulesetID;
 
-        public bool Equals(SpectatorState other) => BeatmapID == other?.BeatmapID && Mods.SequenceEqual(other?.Mods);
-
-        public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)}";
+        public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 1ca0a378bb..43bc8ff71b 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Replays.Legacy;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
@@ -41,6 +42,9 @@ namespace osu.Game.Online.Spectator
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
 
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
         [Resolved]
         private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
@@ -171,6 +175,7 @@ namespace osu.Game.Online.Spectator
 
             // transfer state at point of beginning play
             currentState.BeatmapID = beatmap.Value.BeatmapInfo.OnlineBeatmapID;
+            currentState.RulesetID = ruleset.Value.ID;
             currentState.Mods = mods.Value.Select(m => new APIMod(m));
 
             beginPlaying();

From c1d03a5baceb23be78f0d55458a9085ad5b652ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Fri, 23 Oct 2020 13:40:13 +0200
Subject: [PATCH 05649/10326] Add SeasonalBackgroundLoader and
 SeasonalBackground

---
 .../Backgrounds/SeasonalBackgroundLoader.cs   | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
new file mode 100644
index 0000000000..af81b25cee
--- /dev/null
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.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 System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Utils;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Graphics.Backgrounds
+{
+    [LongRunningLoad]
+    public class SeasonalBackgroundLoader : Component
+    {
+        private List<APISeasonalBackground> backgrounds = new List<APISeasonalBackground>();
+        private int current;
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            var request = new GetSeasonalBackgroundsRequest();
+            request.Success += response =>
+            {
+                backgrounds = response.Backgrounds ?? backgrounds;
+                current = RNG.Next(0, backgrounds.Count);
+            };
+
+            api.PerformAsync(request);
+        }
+
+        public SeasonalBackground LoadBackground(string fallbackTextureName)
+        {
+            string url = null;
+
+            if (backgrounds.Any())
+            {
+                current = (current + 1) % backgrounds.Count;
+                url = backgrounds[current].Url;
+            }
+
+            return new SeasonalBackground(url, fallbackTextureName);
+        }
+    }
+
+    [LongRunningLoad]
+    public class SeasonalBackground : Background
+    {
+        private readonly string url;
+        private readonly string fallbackTextureName;
+
+        public SeasonalBackground([CanBeNull] string url, string fallbackTextureName = @"Backgrounds/bg1")
+        {
+            this.url = url;
+            this.fallbackTextureName = fallbackTextureName;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(LargeTextureStore textures)
+        {
+            Sprite.Texture = textures.Get(url) ?? textures.Get(fallbackTextureName);
+        }
+    }
+}

From 81ebcd879668eb13cb28aa11bf4edfb8afb0fb99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Fri, 23 Oct 2020 13:41:00 +0200
Subject: [PATCH 05650/10326] Load SeasonalBackgroundLoader asynchronously

---
 .../Backgrounds/BackgroundScreenDefault.cs    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index ef41c5be3d..ec91dcc99f 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Screens.Backgrounds
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
         private Bindable<IntroSequence> introSequence;
+        private readonly SeasonalBackgroundLoader seasonalBackgroundLoader = new SeasonalBackgroundLoader();
 
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
@@ -50,7 +51,7 @@ namespace osu.Game.Screens.Backgrounds
 
             currentDisplay = RNG.Next(0, background_count);
 
-            display(createBackground());
+            LoadComponentAsync(seasonalBackgroundLoader, _ => LoadComponentAsync(createBackground(), display));
         }
 
         private void display(Background newBackground)
@@ -90,6 +91,10 @@ namespace osu.Game.Screens.Backgrounds
             {
                 switch (mode.Value)
                 {
+                    case BackgroundSource.Seasonal:
+                        newBackground = seasonalBackgroundLoader.LoadBackground(backgroundName);
+                        break;
+
                     case BackgroundSource.Beatmap:
                         newBackground = new BeatmapBackground(beatmap.Value, backgroundName);
                         break;
@@ -100,7 +105,18 @@ namespace osu.Game.Screens.Backgrounds
                 }
             }
             else
-                newBackground = new Background(backgroundName);
+            {
+                switch (mode.Value)
+                {
+                    case BackgroundSource.Seasonal:
+                        newBackground = seasonalBackgroundLoader.LoadBackground(backgroundName);
+                        break;
+
+                    default:
+                        newBackground = new Background(backgroundName);
+                        break;
+                }
+            }
 
             newBackground.Depth = currentDisplay;
 

From ae9e60560bc3e00efb4b56692afd387d2a6e1564 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Fri, 23 Oct 2020 14:11:29 +0200
Subject: [PATCH 05651/10326] Fixed gameplay flags being bigger and changed
 values to make more sense

---
 osu.Game.Tournament/Components/DrawableTeamFlag.cs             | 2 +-
 osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs | 1 +
 osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs         | 2 +-
 osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs           | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Components/DrawableTeamFlag.cs b/osu.Game.Tournament/Components/DrawableTeamFlag.cs
index a2e0bf83be..75991a1ab8 100644
--- a/osu.Game.Tournament/Components/DrawableTeamFlag.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamFlag.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tournament.Components
         {
             if (team == null) return;
 
-            Size = new Vector2(70, 47);
+            Size = new Vector2(75, 50);
             Masking = true;
             CornerRadius = 5;
             Child = flagSprite = new Sprite
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 44921f06ad..4ba86dcefc 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -29,6 +29,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             var anchor = flip ? Anchor.TopLeft : Anchor.TopRight;
 
             Flag.RelativeSizeAxes = Axes.None;
+            Flag.Scale = new Vector2(0.8f);
             Flag.Origin = anchor;
             Flag.Anchor = anchor;
 
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index 32830713f6..55fc80dba2 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -288,7 +288,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                     AutoSizeAxes = Axes.Both;
 
                     Flag.RelativeSizeAxes = Axes.None;
-                    Flag.Scale = new Vector2(1.4f);
+                    Flag.Scale = new Vector2(1.2f);
 
                     InternalChild = new FillFlowContainer
                     {
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index 3972c590ea..7ca262a2e8 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Position = new Vector2(-300, 10),
-                    Scale = new Vector2(2.2f)
+                    Scale = new Vector2(2f)
                 },
                 new FillFlowContainer
                 {

From c24a29d1acdde0228ffdd24f7726e0a0100f9e16 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Fri, 23 Oct 2020 14:23:08 +0200
Subject: [PATCH 05652/10326] Update flag scale of drawablematchteam

---
 .../Screens/Ladder/Components/DrawableMatchTeam.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index 030ccb5cb3..ba577888d8 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             this.losers = losers;
             Size = new Vector2(150, 40);
 
-            Flag.Scale = new Vector2(0.6f);
+            Flag.Scale = new Vector2(0.55f);
             Flag.Anchor = Flag.Origin = Anchor.CentreLeft;
 
             AcronymText.Anchor = AcronymText.Origin = Anchor.CentreLeft;

From 73174961f02f01123f1c3cef900bf8a9475d8e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Oct 2020 21:22:47 +0200
Subject: [PATCH 05653/10326] Rework animation sequence for readability

---
 osu.Game/Screens/Play/PlayerLoader.cs | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index fae0bfb295..be3bad1517 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -331,18 +331,11 @@ namespace osu.Game.Screens.Play
                     {
                         const double epilepsy_display_length = 3000;
 
-                        pushSequence.Schedule(() =>
-                        {
-                            epilepsyWarning.State.Value = Visibility.Visible;
-
-                            this.Delay(epilepsy_display_length).Schedule(() =>
-                            {
-                                epilepsyWarning.Hide();
-                                epilepsyWarning.Expire();
-                            });
-                        });
-
-                        pushSequence.Delay(epilepsy_display_length);
+                        pushSequence
+                            .Schedule(() => epilepsyWarning.State.Value = Visibility.Visible)
+                            .Delay(epilepsy_display_length)
+                            .Schedule(() => epilepsyWarning.Hide())
+                            .Delay(EpilepsyWarning.FADE_DURATION);
                     }
 
                     pushSequence.Schedule(() =>

From e101ba5cba4eb63ef287a60d7d1bd121893f741d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Oct 2020 22:58:13 +0200
Subject: [PATCH 05654/10326] Move volume manipulations to player loader

---
 osu.Game/Screens/Play/EpilepsyWarning.cs | 18 ------------------
 osu.Game/Screens/Play/PlayerLoader.cs    | 23 +++++++++++++++++++++--
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Play/EpilepsyWarning.cs b/osu.Game/Screens/Play/EpilepsyWarning.cs
index e3cf0cd227..6121a0c2a3 100644
--- a/osu.Game/Screens/Play/EpilepsyWarning.cs
+++ b/osu.Game/Screens/Play/EpilepsyWarning.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,11 +16,6 @@ namespace osu.Game.Screens.Play
 {
     public class EpilepsyWarning : VisibilityContainer
     {
-        public const double FADE_DURATION = 500;
-
-        private readonly BindableDouble trackVolumeOnEpilepsyWarning = new BindableDouble(1f);
-
-        private Track track;
 
         public EpilepsyWarning()
         {
@@ -77,26 +70,15 @@ namespace osu.Game.Screens.Play
                     }
                 }
             };
-
-            track = beatmap.Value.Track;
-            track.AddAdjustment(AdjustableProperty.Volume, trackVolumeOnEpilepsyWarning);
         }
 
         protected override void PopIn()
         {
-            this.TransformBindableTo(trackVolumeOnEpilepsyWarning, 0.25, FADE_DURATION);
-
             DimmableBackground?.FadeColour(OsuColour.Gray(0.5f), FADE_DURATION, Easing.OutQuint);
 
             this.FadeIn(FADE_DURATION, Easing.OutQuint);
         }
 
         protected override void PopOut() => this.FadeOut(FADE_DURATION);
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            track?.RemoveAdjustment(AdjustableProperty.Volume, trackVolumeOnEpilepsyWarning);
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index be3bad1517..fe774527b8 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -104,6 +104,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private AudioManager audioManager { get; set; }
 
+        [Resolved]
+        private MusicController musicController { get; set; }
+
         public PlayerLoader(Func<Player> createPlayer)
         {
             this.createPlayer = createPlayer;
@@ -332,9 +335,17 @@ namespace osu.Game.Screens.Play
                         const double epilepsy_display_length = 3000;
 
                         pushSequence
-                            .Schedule(() => epilepsyWarning.State.Value = Visibility.Visible)
+                            .Schedule(() =>
+                            {
+                                musicController.CurrentTrack.VolumeTo(0.25, EpilepsyWarning.FADE_DURATION, Easing.OutQuint);
+                                epilepsyWarning.State.Value = Visibility.Visible;
+                            })
                             .Delay(epilepsy_display_length)
-                            .Schedule(() => epilepsyWarning.Hide())
+                            .Schedule(() =>
+                            {
+                                epilepsyWarning.Hide();
+                                epilepsyWarning.Expire();
+                            })
                             .Delay(EpilepsyWarning.FADE_DURATION);
                     }
 
@@ -348,6 +359,10 @@ namespace osu.Game.Screens.Play
                         // Note that this may change if the player we load requested a re-run.
                         ValidForResume = false;
 
+                        // restore full volume immediately - there's a usually a period of silence at start of gameplay anyway.
+                        // note that this is delayed slightly to avoid volume spikes just before push.
+                        musicController.CurrentTrack.Delay(50).VolumeTo(1);
+
                         if (player.LoadedBeatmapSuccessfully)
                             this.Push(player);
                         else
@@ -363,6 +378,10 @@ namespace osu.Game.Screens.Play
 
         private void cancelLoad()
         {
+            // in case the epilepsy warning is being displayed, restore full volume.
+            if (epilepsyWarning?.IsAlive == true)
+                musicController.CurrentTrack.VolumeTo(1, EpilepsyWarning.FADE_DURATION, Easing.OutQuint);
+
             scheduledPushPlayer?.Cancel();
             scheduledPushPlayer = null;
         }

From 85e14f3f0c8b3e194cb51057e4e9b2970dda7a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Oct 2020 22:58:43 +0200
Subject: [PATCH 05655/10326] Shorten fade duration to make fade out snappier

---
 osu.Game/Screens/Play/EpilepsyWarning.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/EpilepsyWarning.cs b/osu.Game/Screens/Play/EpilepsyWarning.cs
index 6121a0c2a3..dc42427fbf 100644
--- a/osu.Game/Screens/Play/EpilepsyWarning.cs
+++ b/osu.Game/Screens/Play/EpilepsyWarning.cs
@@ -16,6 +16,7 @@ namespace osu.Game.Screens.Play
 {
     public class EpilepsyWarning : VisibilityContainer
     {
+        public const double FADE_DURATION = 250;
 
         public EpilepsyWarning()
         {

From 8b04cd2cb0a79a81432bff9f488d12300240ebac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 25 Oct 2020 20:28:24 +0900
Subject: [PATCH 05656/10326] Fix a potential null reference when loading
 carousel difficulties

---
 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 703b91c517..93f95e76cc 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Screens.Select.Carousel
                 LoadComponentAsync(beatmapContainer, loaded =>
                 {
                     // make sure the pooled target hasn't changed.
-                    if (carouselBeatmapSet != Item)
+                    if (beatmapContainer != loaded)
                         return;
 
                     Content.Child = loaded;

From 0542a45c43a14a16eec8a99570c070e642104fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Oct 2020 12:33:35 +0100
Subject: [PATCH 05657/10326] Change to manual adjustment add/remove

---
 osu.Game/Screens/Play/PlayerLoader.cs | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index fe774527b8..42074ac241 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -55,6 +55,8 @@ namespace osu.Game.Screens.Play
 
         private bool backgroundBrightnessReduction;
 
+        private readonly BindableDouble volumeAdjustment = new BindableDouble(1);
+
         protected bool BackgroundBrightnessReduction
         {
             set
@@ -104,9 +106,6 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private AudioManager audioManager { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         public PlayerLoader(Func<Player> createPlayer)
         {
             this.createPlayer = createPlayer;
@@ -172,6 +171,7 @@ namespace osu.Game.Screens.Play
 
             if (epilepsyWarning != null)
                 epilepsyWarning.DimmableBackground = Background;
+            Beatmap.Value.Track.AddAdjustment(AdjustableProperty.Volume, volumeAdjustment);
 
             content.ScaleTo(0.7f);
             Background?.FadeColour(Color4.White, 800, Easing.OutQuint);
@@ -200,6 +200,11 @@ namespace osu.Game.Screens.Play
             cancelLoad();
 
             BackgroundBrightnessReduction = false;
+
+            // we're moving to player, so a period of silence is upcoming.
+            // stop the track before removing adjustment to avoid a volume spike.
+            Beatmap.Value.Track.Stop();
+            Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
         }
 
         public override bool OnExiting(IScreen next)
@@ -211,6 +216,7 @@ namespace osu.Game.Screens.Play
 
             Background.EnableUserDim.Value = false;
             BackgroundBrightnessReduction = false;
+            Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
 
             return base.OnExiting(next);
         }
@@ -335,11 +341,8 @@ namespace osu.Game.Screens.Play
                         const double epilepsy_display_length = 3000;
 
                         pushSequence
-                            .Schedule(() =>
-                            {
-                                musicController.CurrentTrack.VolumeTo(0.25, EpilepsyWarning.FADE_DURATION, Easing.OutQuint);
-                                epilepsyWarning.State.Value = Visibility.Visible;
-                            })
+                            .Schedule(() => epilepsyWarning.State.Value = Visibility.Visible)
+                            .TransformBindableTo(volumeAdjustment, 0.25, EpilepsyWarning.FADE_DURATION, Easing.OutQuint)
                             .Delay(epilepsy_display_length)
                             .Schedule(() =>
                             {
@@ -359,10 +362,6 @@ namespace osu.Game.Screens.Play
                         // Note that this may change if the player we load requested a re-run.
                         ValidForResume = false;
 
-                        // restore full volume immediately - there's a usually a period of silence at start of gameplay anyway.
-                        // note that this is delayed slightly to avoid volume spikes just before push.
-                        musicController.CurrentTrack.Delay(50).VolumeTo(1);
-
                         if (player.LoadedBeatmapSuccessfully)
                             this.Push(player);
                         else
@@ -378,10 +377,6 @@ namespace osu.Game.Screens.Play
 
         private void cancelLoad()
         {
-            // in case the epilepsy warning is being displayed, restore full volume.
-            if (epilepsyWarning?.IsAlive == true)
-                musicController.CurrentTrack.VolumeTo(1, EpilepsyWarning.FADE_DURATION, Easing.OutQuint);
-
             scheduledPushPlayer?.Cancel();
             scheduledPushPlayer = null;
         }

From 0a23e994e2de7a23927928e4a051d6372a7c8dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Oct 2020 23:24:14 +0100
Subject: [PATCH 05658/10326] Hide sliderend & repeat circles in traceable mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index d7582f3196..e1d197fb1d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Bindables;
 using System.Collections.Generic;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -49,9 +50,16 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 case DrawableHitCircle circle:
                     // we only want to see the approach circle
-                    using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
-                        circle.CirclePiece.Hide();
+                    applyCirclePieceState(circle, circle.CirclePiece);
+                    break;
 
+                case DrawableSliderTail sliderTail:
+                    applyCirclePieceState(sliderTail);
+                    break;
+
+                case DrawableSliderRepeat sliderRepeat:
+                    // show only the repeat arrow
+                    applyCirclePieceState(sliderRepeat, sliderRepeat.CirclePiece);
                     break;
 
                 case DrawableSlider slider:
@@ -61,6 +69,13 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
         }
 
+        private void applyCirclePieceState(DrawableOsuHitObject hitObject, IDrawable hitCircle = null)
+        {
+            var h = hitObject.HitObject;
+            using (hitObject.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
+                (hitCircle ?? hitObject).Hide();
+        }
+
         private void applySliderState(DrawableSlider slider)
         {
             ((PlaySliderBody)slider.Body.Drawable).AccentColour = slider.AccentColour.Value.Opacity(0);

From 5ef1b5dcb521a7d75f4f8dd6e7e82c934a3c195c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Oct 2020 23:55:22 +0100
Subject: [PATCH 05659/10326] Remove unused locals

---
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index e1d197fb1d..bb2213aa31 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -39,11 +39,9 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         protected void ApplyTraceableState(DrawableHitObject drawable, ArmedState state)
         {
-            if (!(drawable is DrawableOsuHitObject drawableOsu))
+            if (!(drawable is DrawableOsuHitObject))
                 return;
 
-            var h = drawableOsu.HitObject;
-
             //todo: expose and hide spinner background somehow
 
             switch (drawable)

From 9caa7ff64dc12e6cd6f536ef7cab9a57fa339a55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 13:37:16 +0900
Subject: [PATCH 05660/10326] Remove debug endpoint

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 43bc8ff71b..97901184c7 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -80,11 +80,7 @@ namespace osu.Game.Online.Spectator
             }
         }
 
-#if DEBUG
-        private const string endpoint = "http://localhost:5009/spectator";
-#else
         private const string endpoint = "https://spectator.ppy.sh/spectator";
-#endif
 
         private async Task connect()
         {

From ac13a1d21708b7f54a53d818a7e5ac16f0c35936 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 14:27:55 +0900
Subject: [PATCH 05661/10326] Adjust a couple of flag scales to match previous
 display size

---
 osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs    | 2 +-
 .../Screens/Ladder/Components/DrawableMatchTeam.cs              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs b/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
index 119f71ebfa..cd252392ba 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
             AcronymText.Origin = Anchor.TopCentre;
             AcronymText.Text = team.Acronym.Value.ToUpperInvariant();
             AcronymText.Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 10);
-            Flag.Scale = new Vector2(0.5f);
+            Flag.Scale = new Vector2(0.48f);
 
             InternalChildren = new Drawable[]
             {
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index ba577888d8..bb1e4d2eff 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             this.losers = losers;
             Size = new Vector2(150, 40);
 
-            Flag.Scale = new Vector2(0.55f);
+            Flag.Scale = new Vector2(0.54f);
             Flag.Anchor = Flag.Origin = Anchor.CentreLeft;
 
             AcronymText.Anchor = AcronymText.Origin = Anchor.CentreLeft;

From e941f2fb711d5d57308203c788a9d594e83bae0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 15:24:12 +0900
Subject: [PATCH 05662/10326] Fix playback not being smooth (and event
 unbinding logic)

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 53 +++++++++++++++----
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index f8b5d385a9..4db9d955d4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -12,7 +13,9 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges;
+using osu.Framework.Logging;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Spectator;
@@ -41,6 +44,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private TestReplayRecorder recorder;
 
+        private readonly ManualClock manualClock = new ManualClock();
+
+        private OsuSpriteText latencyDisplay;
+
         [Resolved]
         private SpectatorStreamingClient streamingClient { get; set; }
 
@@ -66,15 +73,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 }
             }, true);
 
-            streamingClient.OnNewFrames += (userId, frames) =>
-            {
-                foreach (var legacyFrame in frames.Frames)
-                {
-                    var frame = new TestReplayFrame();
-                    frame.FromLegacy(legacyFrame, null, null);
-                    replay.Frames.Add(frame);
-                }
-            };
+            streamingClient.OnNewFrames += onNewFrames;
 
             Add(new GridContainer
             {
@@ -115,6 +114,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         playbackManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
+                            Clock = new FramedClock(manualClock),
                             ReplayInputHandler = new TestFramedReplayInputHandler(replay)
                             {
                                 GamefieldToScreenSpace = pos => playbackManager.ToScreenSpace(pos),
@@ -143,8 +143,22 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                 }
             });
+
+            Add(latencyDisplay = new OsuSpriteText());
         });
 
+        private void onNewFrames(int userId, FrameDataBundle frames)
+        {
+            Logger.Log($"Received {frames.Frames.Count()} new frames ({string.Join(',', frames.Frames.Select(f => ((int)f.Time).ToString()))})");
+
+            foreach (var legacyFrame in frames.Frames)
+            {
+                var frame = new TestReplayFrame();
+                frame.FromLegacy(legacyFrame, null, null);
+                replay.Frames.Add(frame);
+            }
+        }
+
         [Test]
         public void TestBasic()
         {
@@ -153,13 +167,30 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected override void Update()
         {
             base.Update();
-            playbackManager?.ReplayInputHandler.SetFrameFromTime(Time.Current - 100);
+
+            double elapsed = Time.Elapsed;
+            double? time = playbackManager?.ReplayInputHandler.SetFrameFromTime(manualClock.CurrentTime + elapsed);
+
+            if (time != null)
+            {
+                manualClock.CurrentTime = time.Value;
+
+                latencyDisplay.Text = $"latency: {Time.Current - time.Value:N1}ms";
+            }
+            else
+            {
+                manualClock.CurrentTime = Time.Current;
+            }
         }
 
         [TearDownSteps]
         public void TearDown()
         {
-            AddStep("stop recorder", () => recorder.Expire());
+            AddStep("stop recorder", () =>
+            {
+                recorder.Expire();
+                streamingClient.OnNewFrames -= onNewFrames;
+            });
         }
 
         public class TestFramedReplayInputHandler : FramedReplayInputHandler<TestReplayFrame>

From 8508d5f8b94d04a373f49b087d739ee4c93bbf62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 15:24:28 +0900
Subject: [PATCH 05663/10326] Rename test scene to match purpose

---
 .../{TestSceneSpectator.cs => TestSceneSpectatorPlayback.cs}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestSceneSpectator.cs => TestSceneSpectatorPlayback.cs} (99%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 4db9d955d4..2656b7929c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -31,7 +31,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSpectator : OsuManualInputManagerTestScene
+    public class TestSceneSpectatorPlayback : OsuManualInputManagerTestScene
     {
         protected override bool UseOnlineAPI => true;
 

From f5dbaa9b0fab2bf2b4b805cec6d914897219ff3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 15:25:09 +0900
Subject: [PATCH 05664/10326] Only watch local user to prevent conflict between
 testers

---
 .../Gameplay/TestSceneSpectatorPlayback.cs       | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 2656b7929c..e7b7950ad2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -18,6 +18,7 @@ using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays;
 using osu.Game.Replays.Legacy;
@@ -48,6 +49,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private OsuSpriteText latencyDisplay;
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         [Resolved]
         private SpectatorStreamingClient streamingClient { get; set; }
 
@@ -63,12 +67,20 @@ namespace osu.Game.Tests.Visual.Gameplay
                 {
                     case NotifyCollectionChangedAction.Add:
                         foreach (int user in args.NewItems)
-                            streamingClient.WatchUser(user);
+                        {
+                            if (user == api.LocalUser.Value.Id)
+                                streamingClient.WatchUser(user);
+                        }
+
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
                         foreach (int user in args.OldItems)
-                            streamingClient.StopWatchingUser(user);
+                        {
+                            if (user == api.LocalUser.Value.Id)
+                                streamingClient.StopWatchingUser(user);
+                        }
+
                         break;
                 }
             }, true);

From dfe07271de741378553f6fc872f0072e5a050979 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 16:31:39 +0900
Subject: [PATCH 05665/10326] Add very basic latency handling to spectator test

---
 .../Gameplay/TestSceneSpectatorPlayback.cs    | 43 ++++++++++++++-----
 .../Spectator/SpectatorStreamingClient.cs     |  9 ++--
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index e7b7950ad2..d27a41acd4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.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.Collections.Specialized;
 using System.Linq;
@@ -18,6 +19,7 @@ using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Handlers;
 using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays;
@@ -49,6 +51,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private OsuSpriteText latencyDisplay;
 
+        private TestFramedReplayInputHandler replayHandler;
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -127,7 +131,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         playbackManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
                             Clock = new FramedClock(manualClock),
-                            ReplayInputHandler = new TestFramedReplayInputHandler(replay)
+                            ReplayInputHandler = replayHandler = new TestFramedReplayInputHandler(replay)
                             {
                                 GamefieldToScreenSpace = pos => playbackManager.ToScreenSpace(pos),
                             },
@@ -176,22 +180,41 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
         }
 
+        private double latency = SpectatorStreamingClient.TIME_BETWEEN_SENDS;
+
         protected override void Update()
         {
             base.Update();
 
-            double elapsed = Time.Elapsed;
-            double? time = playbackManager?.ReplayInputHandler.SetFrameFromTime(manualClock.CurrentTime + elapsed);
+            if (latencyDisplay == null) return;
 
-            if (time != null)
-            {
-                manualClock.CurrentTime = time.Value;
-
-                latencyDisplay.Text = $"latency: {Time.Current - time.Value:N1}ms";
-            }
-            else
+            // propagate initial time value
+            if (manualClock.CurrentTime == 0)
             {
                 manualClock.CurrentTime = Time.Current;
+                return;
+            }
+
+            if (replayHandler.NextFrame != null)
+            {
+                var lastFrame = replay.Frames.LastOrDefault();
+
+                // this isn't perfect as we basically can't be aware of the rate-of-send here (the streamer is not sending data when not being moved).
+                // in gameplay playback, the case where NextFrame is null would pause gameplay and handle this correctly; it's strictly a test limitation / best effort implementation.
+                if (lastFrame != null)
+                    latency = Math.Max(latency, Time.Current - lastFrame.Time);
+
+                latencyDisplay.Text = $"latency: {latency:N1}";
+
+                double proposedTime = Time.Current - latency + Time.Elapsed;
+
+                // this will either advance by one or zero frames.
+                double? time = replayHandler.SetFrameFromTime(proposedTime);
+
+                if (time == null)
+                    return;
+
+                manualClock.CurrentTime = time.Value;
             }
         }
 
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 97901184c7..73a18b03b2 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -24,6 +24,11 @@ namespace osu.Game.Online.Spectator
 {
     public class SpectatorStreamingClient : Component, ISpectatorClient
     {
+        /// <summary>
+        /// The maximum milliseconds between frame bundle sends.
+        /// </summary>
+        public const double TIME_BETWEEN_SENDS = 200;
+
         private HubConnection connection;
 
         private readonly List<int> watchingUsers = new List<int>();
@@ -229,15 +234,13 @@ namespace osu.Game.Online.Spectator
 
         private Task lastSend;
 
-        private const double time_between_sends = 200;
-
         private const int max_pending_frames = 30;
 
         protected override void Update()
         {
             base.Update();
 
-            if (pendingFrames.Count > 0 && Time.Current - lastSendTime > time_between_sends)
+            if (pendingFrames.Count > 0 && Time.Current - lastSendTime > TIME_BETWEEN_SENDS)
                 purgePendingFrames();
         }
 

From b1a88a49935c1c497113e5f4de843b72199130a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 16:34:30 +0900
Subject: [PATCH 05666/10326] Remove extra using

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index d27a41acd4..ad11ac45dd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -19,7 +19,6 @@ using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Input.Handlers;
 using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays;

From 704f8cc4f27b81c92906332a4ac13931cf341c57 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 26 Oct 2020 18:03:04 +0100
Subject: [PATCH 05667/10326] Fix selection box wandering off into the distance

---
 .../Timeline/TimelineBlueprintContainer.cs        | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 84328466c3..b76032709f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -107,7 +108,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             OnDragHandled = handleScrollViaDrag
         };
 
-        protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect);
+        protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect, this);
 
         private void handleScrollViaDrag(DragEvent e)
         {
@@ -138,11 +139,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private class TimelineDragBox : DragBox
         {
             private Vector2 lastMouseDown;
+            private float? lastZoom;
             private float localMouseDown;
 
-            public TimelineDragBox(Action<RectangleF> performSelect)
+            private readonly TimelineBlueprintContainer parent;
+
+            public TimelineDragBox(Action<RectangleF> performSelect, TimelineBlueprintContainer parent)
                 : base(performSelect)
             {
+                this.parent = parent;
             }
 
             protected override Drawable CreateBox() => new Box
@@ -158,8 +163,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 {
                     lastMouseDown = e.ScreenSpaceMouseDownPosition;
                     localMouseDown = e.MouseDownPosition.X;
+                    lastZoom = null;
                 }
 
+                //Zooming the timeline shifts the coordinate system this compensates for this shift
+                float zoomCorrection = lastZoom.HasValue ? (parent.timeline.Zoom / lastZoom.Value) : 1;
+                localMouseDown *= zoomCorrection;
+                lastZoom = parent.timeline.Zoom;
+
                 float selection1 = localMouseDown;
                 float selection2 = e.MousePosition.X;
 

From ead3c195674a73f054dabccf0cfdb0d7f193bd58 Mon Sep 17 00:00:00 2001
From: Charlie <charliegray.dev@gmail.com>
Date: Mon, 26 Oct 2020 13:40:42 -0500
Subject: [PATCH 05668/10326] added function so circle is deleted when
 shift+right click

---
 .../Compose/Components/SelectionHandler.cs    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 4caceedc5a..54e62649e1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
 using osu.Game.Audio;
 using osu.Game.Graphics;
@@ -32,6 +33,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public class SelectionHandler : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
     {
+        private bool shiftPressed;
+
         public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
         private readonly List<SelectionBlueprint> selectedBlueprints;
 
@@ -164,6 +167,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether any <see cref="DrawableHitObject"/>s could be reversed.</returns>
         public virtual bool HandleReverse() => false;
 
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            shiftPressed = e.ShiftPressed;
+            return false;
+        }
+
+        protected override void OnKeyUp(KeyUpEvent e)
+        {
+            shiftPressed = e.ShiftPressed;
+        }
+
         public bool OnPressed(PlatformAction action)
         {
             switch (action.ActionMethod)
@@ -455,6 +469,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             get
             {
+                if (shiftPressed)
+                {
+                    deleteSelected();
+                    return null;
+                }
+
                 if (!selectedBlueprints.Any(b => b.IsHovered))
                     return Array.Empty<MenuItem>();
 

From 123967056693f0f4b34d0eb04dc103ec39a33548 Mon Sep 17 00:00:00 2001
From: Charlie <charliegray.dev@gmail.com>
Date: Mon, 26 Oct 2020 14:28:53 -0500
Subject: [PATCH 05669/10326] moved right click shift delete functionality to
 HandleSelectionRequested + reduced func size

---
 .../Compose/Components/SelectionHandler.cs    | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 54e62649e1..eeeacce4a7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -25,6 +25,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
@@ -33,7 +34,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public class SelectionHandler : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
     {
-        private bool shiftPressed;
 
         public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
         private readonly List<SelectionBlueprint> selectedBlueprints;
@@ -167,17 +167,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether any <see cref="DrawableHitObject"/>s could be reversed.</returns>
         public virtual bool HandleReverse() => false;
 
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            shiftPressed = e.ShiftPressed;
-            return false;
-        }
-
-        protected override void OnKeyUp(KeyUpEvent e)
-        {
-            shiftPressed = e.ShiftPressed;
-        }
-
         public bool OnPressed(PlatformAction action)
         {
             switch (action.ActionMethod)
@@ -237,6 +226,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="state">The input state at the point of selection.</param>
         internal void HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
+        {
+            shiftClickDeleteCheck(blueprint, state);
+            multiSelectionHandler(blueprint, state);
+
+        }
+
+        private void multiSelectionHandler(SelectionBlueprint blueprint, InputState state)
         {
             if (state.Keyboard.ControlPressed)
             {
@@ -255,6 +251,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        private void shiftClickDeleteCheck(SelectionBlueprint blueprint, InputState state)
+        {
+            if (state.Keyboard.ShiftPressed && state.Mouse.IsPressed(MouseButton.Right))
+            {
+                EditorBeatmap.Remove(blueprint.HitObject);
+                return;
+            }
+        }
+
         private void deleteSelected()
         {
             EditorBeatmap.RemoveRange(selectedBlueprints.Select(b => b.HitObject));
@@ -469,12 +474,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             get
             {
-                if (shiftPressed)
-                {
-                    deleteSelected();
-                    return null;
-                }
-
                 if (!selectedBlueprints.Any(b => b.IsHovered))
                     return Array.Empty<MenuItem>();
 

From ccaf6560ec619004ddd67b57dd62674f7b6520db Mon Sep 17 00:00:00 2001
From: Charlie <charliegray.dev@gmail.com>
Date: Mon, 26 Oct 2020 14:30:37 -0500
Subject: [PATCH 05670/10326] formatting

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index eeeacce4a7..f4b98c66b1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -34,7 +34,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public class SelectionHandler : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
     {
-
         public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
         private readonly List<SelectionBlueprint> selectedBlueprints;
 
@@ -229,7 +228,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             shiftClickDeleteCheck(blueprint, state);
             multiSelectionHandler(blueprint, state);
-
         }
 
         private void multiSelectionHandler(SelectionBlueprint blueprint, InputState state)

From 255bb9d10092ede439c0d8c5f71b7ca707880a37 Mon Sep 17 00:00:00 2001
From: Charlie <charliegray.dev@gmail.com>
Date: Mon, 26 Oct 2020 14:52:59 -0500
Subject: [PATCH 05671/10326] fixed issue with returns

---
 .../Edit/Compose/Components/SelectionHandler.cs       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index f4b98c66b1..f0a9e69321 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -226,11 +226,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="state">The input state at the point of selection.</param>
         internal void HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
         {
-            shiftClickDeleteCheck(blueprint, state);
-            multiSelectionHandler(blueprint, state);
+            if (!shiftClickDeleteCheck(blueprint, state))
+                handleMultiSelection(blueprint, state);
         }
 
-        private void multiSelectionHandler(SelectionBlueprint blueprint, InputState state)
+        private void handleMultiSelection(SelectionBlueprint blueprint, InputState state)
         {
             if (state.Keyboard.ControlPressed)
             {
@@ -249,13 +249,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private void shiftClickDeleteCheck(SelectionBlueprint blueprint, InputState state)
+        private bool shiftClickDeleteCheck(SelectionBlueprint blueprint, InputState state)
         {
             if (state.Keyboard.ShiftPressed && state.Mouse.IsPressed(MouseButton.Right))
             {
                 EditorBeatmap.Remove(blueprint.HitObject);
-                return;
+                return true;
             }
+            return false;
         }
 
         private void deleteSelected()

From 3f8c4c57d0682441a69bfed1c5a69bda07ef0979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Oct 2020 22:16:28 +0100
Subject: [PATCH 05672/10326] Fix code style issues & restructure

---
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs  |  5 +++
 .../Compose/Components/SelectionHandler.cs    | 43 ++++++-------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 4abdbfc244..f3816f6218 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -120,6 +120,11 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public void Deselect() => State = SelectionState.NotSelected;
 
+        /// <summary>
+        /// Toggles the selection state of this <see cref="OverlaySelectionBlueprint"/>.
+        /// </summary>
+        public void ToggleSelection() => State = IsSelected ? SelectionState.NotSelected : SelectionState.Selected;
+
         public bool IsSelected => State == SelectionState.Selected;
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index f0a9e69321..9cddb69d0b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
 using osu.Game.Audio;
 using osu.Game.Graphics;
@@ -225,38 +224,22 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="state">The input state at the point of selection.</param>
         internal void HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
-        {
-            if (!shiftClickDeleteCheck(blueprint, state))
-                handleMultiSelection(blueprint, state);
-        }
-
-        private void handleMultiSelection(SelectionBlueprint blueprint, InputState state)
-        {
-            if (state.Keyboard.ControlPressed)
-            {
-                if (blueprint.IsSelected)
-                    blueprint.Deselect();
-                else
-                    blueprint.Select();
-            }
-            else
-            {
-                if (blueprint.IsSelected)
-                    return;
-
-                DeselectAll?.Invoke();
-                blueprint.Select();
-            }
-        }
-
-        private bool shiftClickDeleteCheck(SelectionBlueprint blueprint, InputState state)
         {
             if (state.Keyboard.ShiftPressed && state.Mouse.IsPressed(MouseButton.Right))
-            {
                 EditorBeatmap.Remove(blueprint.HitObject);
-                return true;
-            }
-            return false;
+            else if (state.Keyboard.ControlPressed)
+                blueprint.ToggleSelection();
+            else
+                ensureSelected(blueprint);
+        }
+
+        private void ensureSelected(SelectionBlueprint blueprint)
+        {
+            if (blueprint.IsSelected)
+                return;
+
+            DeselectAll?.Invoke();
+            blueprint.Select();
         }
 
         private void deleteSelected()

From 7392876b5f71a5bfb4b22fcabb0a0e38cef5a368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Oct 2020 00:05:03 +0100
Subject: [PATCH 05673/10326] Fix mania crashing due to spectator client
 handling frames with unconverted beatmap

---
 .../Visual/Gameplay/TestSceneReplayRecorder.cs     |  6 ++++++
 .../Visual/Gameplay/TestSceneReplayRecording.cs    |  6 ++++++
 .../Visual/Gameplay/TestSceneSpectatorPlayback.cs  |  4 ++++
 .../Online/Spectator/SpectatorStreamingClient.cs   | 14 +++++++++-----
 osu.Game/Rulesets/UI/ReplayRecorder.cs             |  7 +++----
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index e964d2a40e..47dd47959d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -4,6 +4,7 @@
 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,11 +13,13 @@ using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 using osuTK.Graphics;
@@ -33,6 +36,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private TestReplayRecorder recorder;
 
+        [Cached]
+        private GameplayBeatmap gameplayBeatmap = new GameplayBeatmap(new Beatmap());
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
index c0f99db85d..6872b6a669 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
@@ -2,17 +2,20 @@
 // 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;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 using osuTK.Graphics;
@@ -25,6 +28,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private readonly TestRulesetInputManager recordingManager;
 
+        [Cached]
+        private GameplayBeatmap gameplayBeatmap = new GameplayBeatmap(new Beatmap());
+
         public TestSceneReplayRecording()
         {
             Replay replay = new Replay();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index ad11ac45dd..1d8231cce7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -27,6 +27,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 using osuTK.Graphics;
@@ -58,6 +59,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private SpectatorStreamingClient streamingClient { get; set; }
 
+        [Cached]
+        private GameplayBeatmap gameplayBeatmap = new GameplayBeatmap(new Beatmap());
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 73a18b03b2..7059818b4e 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
@@ -19,6 +20,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Online.Spectator
 {
@@ -44,8 +46,8 @@ namespace osu.Game.Online.Spectator
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
-        private IBindable<WorkingBeatmap> beatmap { get; set; }
+        [CanBeNull]
+        private IBeatmap currentBeatmap;
 
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
@@ -167,7 +169,7 @@ namespace osu.Game.Online.Spectator
             return Task.CompletedTask;
         }
 
-        public void BeginPlaying()
+        public void BeginPlaying(GameplayBeatmap beatmap)
         {
             if (isPlaying)
                 throw new InvalidOperationException($"Cannot invoke {nameof(BeginPlaying)} when already playing");
@@ -175,10 +177,11 @@ namespace osu.Game.Online.Spectator
             isPlaying = true;
 
             // transfer state at point of beginning play
-            currentState.BeatmapID = beatmap.Value.BeatmapInfo.OnlineBeatmapID;
+            currentState.BeatmapID = beatmap.BeatmapInfo.OnlineBeatmapID;
             currentState.RulesetID = ruleset.Value.ID;
             currentState.Mods = mods.Value.Select(m => new APIMod(m));
 
+            currentBeatmap = beatmap.PlayableBeatmap;
             beginPlaying();
         }
 
@@ -201,6 +204,7 @@ namespace osu.Game.Online.Spectator
         public void EndPlaying()
         {
             isPlaying = false;
+            currentBeatmap = null;
 
             if (!isConnected) return;
 
@@ -247,7 +251,7 @@ namespace osu.Game.Online.Spectator
         public void HandleFrame(ReplayFrame frame)
         {
             if (frame is IConvertibleReplayFrame convertible)
-                pendingFrames.Enqueue(convertible.ToLegacy(beatmap.Value.Beatmap));
+                pendingFrames.Enqueue(convertible.ToLegacy(currentBeatmap));
 
             if (pendingFrames.Count > max_pending_frames)
                 purgePendingFrames();
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index a84b4f4ba8..1438ebd37a 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -5,15 +5,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
+using osu.Game.Screens.Play;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI
@@ -33,7 +32,7 @@ namespace osu.Game.Rulesets.UI
         private SpectatorStreamingClient spectatorStreaming { get; set; }
 
         [Resolved]
-        private IBindable<WorkingBeatmap> beatmap { get; set; }
+        private GameplayBeatmap gameplayBeatmap { get; set; }
 
         protected ReplayRecorder(Replay target)
         {
@@ -50,7 +49,7 @@ namespace osu.Game.Rulesets.UI
 
             inputManager = GetContainingInputManager();
 
-            spectatorStreaming?.BeginPlaying();
+            spectatorStreaming?.BeginPlaying(gameplayBeatmap);
         }
 
         protected override void Dispose(bool isDisposing)

From 68719bb23df43e7d18cd429042f05f240e432495 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 10:59:24 +0900
Subject: [PATCH 05674/10326] Rename other variables to match

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 7059818b4e..5a41316f31 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -50,10 +50,10 @@ namespace osu.Game.Online.Spectator
         private IBeatmap currentBeatmap;
 
         [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
+        private IBindable<RulesetInfo> currentRuleset { get; set; }
 
         [Resolved]
-        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+        private IBindable<IReadOnlyList<Mod>> currentMods { get; set; }
 
         private readonly SpectatorState currentState = new SpectatorState();
 
@@ -178,8 +178,8 @@ namespace osu.Game.Online.Spectator
 
             // transfer state at point of beginning play
             currentState.BeatmapID = beatmap.BeatmapInfo.OnlineBeatmapID;
-            currentState.RulesetID = ruleset.Value.ID;
-            currentState.Mods = mods.Value.Select(m => new APIMod(m));
+            currentState.RulesetID = currentRuleset.Value.ID;
+            currentState.Mods = currentMods.Value.Select(m => new APIMod(m));
 
             currentBeatmap = beatmap.PlayableBeatmap;
             beginPlaying();

From e1f578c590788235640154dd825df2a1ade4e492 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 12:28:10 +0900
Subject: [PATCH 05675/10326] Change editor timing screen seek behaviour to
 only occur on clicking table rows

Previously it would react to any selection changed event, which could in
lude time changes (which is done by removing then adding the
ControlPointGroup).

Closes #10590.
---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs |  9 ++++++++-
 osu.Game/Screens/Edit/Timing/TimingScreen.cs      | 14 --------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index c8982b819a..64f9526816 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -177,6 +177,9 @@ namespace osu.Game.Screens.Edit.Timing
 
             private readonly Box hoveredBackground;
 
+            [Resolved]
+            private EditorClock clock { get; set; }
+
             [Resolved]
             private Bindable<ControlPointGroup> selectedGroup { get; set; }
 
@@ -200,7 +203,11 @@ namespace osu.Game.Screens.Edit.Timing
                     },
                 };
 
-                Action = () => selectedGroup.Value = controlGroup;
+                Action = () =>
+                {
+                    selectedGroup.Value = controlGroup;
+                    clock.SeekTo(controlGroup.Time);
+                };
             }
 
             private Color4 colourHover;
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 0796097186..f511382cde 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -22,9 +22,6 @@ namespace osu.Game.Screens.Edit.Timing
         [Cached]
         private Bindable<ControlPointGroup> selectedGroup = new Bindable<ControlPointGroup>();
 
-        [Resolved]
-        private EditorClock clock { get; set; }
-
         public TimingScreen()
             : base(EditorScreenMode.Timing)
         {
@@ -48,17 +45,6 @@ namespace osu.Game.Screens.Edit.Timing
             }
         };
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            selectedGroup.BindValueChanged(selected =>
-            {
-                if (selected.NewValue != null)
-                    clock.SeekTo(selected.NewValue.Time);
-            });
-        }
-
         protected override void OnTimelineLoaded(TimelineArea timelineArea)
         {
             base.OnTimelineLoaded(timelineArea);

From 27c1a4c4d3693dbc1f22b2c9427646c8ccf01977 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 12:53:54 +0900
Subject: [PATCH 05676/10326] Move right-click deletion logic to be handled at
 a SelectionBlueprint level

---
 .../Sliders/SliderSelectionBlueprint.cs         |  4 ++--
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs    | 17 +++++++++++++++++
 .../Edit/Compose/Components/SelectionHandler.cs |  4 +---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index d3fb5defae..ca9ec886d5 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -107,14 +107,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             {
                 case MouseButton.Right:
                     rightClickPosition = e.MouseDownPosition;
-                    return false; // Allow right click to be handled by context menu
+                    break;
 
                 case MouseButton.Left when e.ControlPressed && IsSelected:
                     placementControlPointIndex = addControlPoint(e.MousePosition);
                     return true; // Stop input from being handled and modifying the selection
             }
 
-            return false;
+            return base.OnMouseDown(e);
         }
 
         private int? placementControlPointIndex;
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index f3816f6218..87ef7e647f 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -8,10 +8,13 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Screens.Edit;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Edit
 {
@@ -52,6 +55,20 @@ namespace osu.Game.Rulesets.Edit
             updateState();
         }
 
+        [Resolved]
+        private EditorBeatmap editorBeatmap { get; set; }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            if (e.CurrentState.Keyboard.ShiftPressed && e.IsPressed(MouseButton.Right))
+            {
+                editorBeatmap.Remove(HitObject);
+                return true;
+            }
+
+            return base.OnMouseDown(e);
+        }
+
         private SelectionState state;
 
         public event Action<SelectionState> StateChanged;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 9cddb69d0b..036edbeb84 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -225,9 +225,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="state">The input state at the point of selection.</param>
         internal void HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
         {
-            if (state.Keyboard.ShiftPressed && state.Mouse.IsPressed(MouseButton.Right))
-                EditorBeatmap.Remove(blueprint.HitObject);
-            else if (state.Keyboard.ControlPressed)
+            if (state.Keyboard.ControlPressed)
                 blueprint.ToggleSelection();
             else
                 ensureSelected(blueprint);

From 3c2e2f29bc8eb190daab56fea86ab00a1925871b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 13:17:44 +0900
Subject: [PATCH 05677/10326] Remove unused using statement

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 036edbeb84..24f88bf36d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -24,7 +24,6 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
-using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {

From 6853da459dde1a1f90a0362113cd3121325d2ed7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 13:54:33 +0900
Subject: [PATCH 05678/10326] Move sample pausing logic out of
 FrameStabilityContainer

---
 .../TestSceneGameplaySamplePlayback.cs        |  2 +-
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  4 +-
 .../Rulesets/UI/FrameStabilityContainer.cs    | 49 +++----------------
 osu.Game/Rulesets/UI/FrameStableClock.cs      | 28 +++++++++++
 osu.Game/Screens/Play/Player.cs               | 14 ++++--
 5 files changed, 47 insertions(+), 50 deletions(-)
 create mode 100644 osu.Game/Rulesets/UI/FrameStableClock.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index 6e505b16c2..e2b867bfb2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("get variables", () =>
             {
-                gameplayClock = Player.ChildrenOfType<FrameStabilityContainer>().First();
+                gameplayClock = Player as ISamplePlaybackDisabler;
                 slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
                 samples = slider.ChildrenOfType<DrawableSample>().ToArray();
             });
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 50e9a93e22..3f967d489b 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.UI
 
         public override Container FrameStableComponents { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
-        public override GameplayClock FrameStableClock => frameStabilityContainer.GameplayClock;
+        public override FrameStableClock FrameStableClock => frameStabilityContainer.FrameStableClock;
 
         private bool frameStablePlayback = true;
 
@@ -404,7 +404,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// The frame-stable clock which is being used for playfield display.
         /// </summary>
-        public abstract GameplayClock FrameStableClock { get; }
+        public abstract FrameStableClock FrameStableClock { get; }
 
         /// <summary>~
         /// The associated ruleset.
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index e4a3a2fe3d..4ea5b514c9 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -2,10 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
@@ -18,11 +15,8 @@ namespace osu.Game.Rulesets.UI
     /// A container which consumes a parent gameplay clock and standardises frame counts for children.
     /// Will ensure a minimum of 50 frames per clock second is maintained, regardless of any system lag or seeks.
     /// </summary>
-    [Cached(typeof(ISamplePlaybackDisabler))]
-    public class FrameStabilityContainer : Container, IHasReplayHandler, ISamplePlaybackDisabler
+    public class FrameStabilityContainer : Container, IHasReplayHandler
     {
-        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
-
         private readonly double gameplayStartTime;
 
         /// <summary>
@@ -35,16 +29,14 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         internal bool FrameStablePlayback = true;
 
-        public GameplayClock GameplayClock => stabilityGameplayClock;
-
         [Cached(typeof(GameplayClock))]
-        private readonly StabilityGameplayClock stabilityGameplayClock;
+        public readonly FrameStableClock FrameStableClock;
 
         public FrameStabilityContainer(double gameplayStartTime = double.MinValue)
         {
             RelativeSizeAxes = Axes.Both;
 
-            stabilityGameplayClock = new StabilityGameplayClock(framedClock = new FramedClock(manualClock = new ManualClock()));
+            FrameStableClock = new FrameStableClock(framedClock = new FramedClock(manualClock = new ManualClock()));
 
             this.gameplayStartTime = gameplayStartTime;
         }
@@ -65,12 +57,9 @@ namespace osu.Game.Rulesets.UI
         {
             if (clock != null)
             {
-                parentGameplayClock = stabilityGameplayClock.ParentGameplayClock = clock;
-                GameplayClock.IsPaused.BindTo(clock.IsPaused);
+                parentGameplayClock = FrameStableClock.ParentGameplayClock = clock;
+                FrameStableClock.IsPaused.BindTo(clock.IsPaused);
             }
-
-            // this is a bit temporary. should really be done inside of GameplayClock (but requires large structural changes).
-            stabilityGameplayClock.ParentSampleDisabler = sampleDisabler;
         }
 
         protected override void LoadComplete()
@@ -102,9 +91,7 @@ namespace osu.Game.Rulesets.UI
         public override bool UpdateSubTree()
         {
             requireMoreUpdateLoops = true;
-            validState = !GameplayClock.IsPaused.Value;
-
-            samplePlaybackDisabled.Value = stabilityGameplayClock.ShouldDisableSamplePlayback;
+            validState = !FrameStableClock.IsPaused.Value;
 
             int loops = 0;
 
@@ -222,32 +209,10 @@ namespace osu.Game.Rulesets.UI
             }
             else
             {
-                Clock = GameplayClock;
+                Clock = FrameStableClock;
             }
         }
 
         public ReplayInputHandler ReplayInputHandler { get; set; }
-
-        IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => samplePlaybackDisabled;
-
-        private class StabilityGameplayClock : GameplayClock
-        {
-            public GameplayClock ParentGameplayClock;
-
-            public ISamplePlaybackDisabler ParentSampleDisabler;
-
-            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => ParentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty<Bindable<double>>();
-
-            public StabilityGameplayClock(FramedClock underlyingClock)
-                : base(underlyingClock)
-            {
-            }
-
-            public override bool ShouldDisableSamplePlayback =>
-                // handle the case where playback is catching up to real-time.
-                base.ShouldDisableSamplePlayback
-                || ParentSampleDisabler?.SamplePlaybackDisabled.Value == true
-                || (ParentGameplayClock != null && Math.Abs(CurrentTime - ParentGameplayClock.CurrentTime) > 200);
-        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/FrameStableClock.cs b/osu.Game/Rulesets/UI/FrameStableClock.cs
new file mode 100644
index 0000000000..5c81ce3093
--- /dev/null
+++ b/osu.Game/Rulesets/UI/FrameStableClock.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 osu.Framework.Bindables;
+using osu.Framework.Timing;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Rulesets.UI
+{
+    public class FrameStableClock : GameplayClock
+    {
+        public GameplayClock ParentGameplayClock;
+
+        public override IEnumerable<Bindable<double>> NonGameplayAdjustments => ParentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty<Bindable<double>>();
+
+        public FrameStableClock(FramedClock underlyingClock)
+            : base(underlyingClock)
+        {
+        }
+
+        public override bool ShouldDisableSamplePlayback =>
+            // handle the case where playback is catching up to real-time.
+            base.ShouldDisableSamplePlayback || (ParentGameplayClock != null && Math.Abs(CurrentTime - ParentGameplayClock.CurrentTime) > 200);
+    }
+}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 6b2d2f40d0..b0923ed4c8 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -238,11 +238,8 @@ namespace osu.Game.Screens.Play
                 skipOverlay.Hide();
             }
 
-            DrawableRuleset.IsPaused.BindValueChanged(paused =>
-            {
-                updateGameplayState();
-                samplePlaybackDisabled.Value = paused.NewValue;
-            });
+            DrawableRuleset.IsPaused.BindValueChanged(_ => updateGameplayState());
+
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateGameplayState());
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
@@ -370,6 +367,13 @@ namespace osu.Game.Screens.Play
             }
         };
 
+        protected override void Update()
+        {
+            base.Update();
+
+            samplePlaybackDisabled.Value = DrawableRuleset.FrameStableClock.ShouldDisableSamplePlayback;
+        }
+
         private void onBreakTimeChanged(ValueChangedEvent<bool> isBreakTime)
         {
             updateGameplayState();

From 9cfb81589e796d7153d380178fd413c7a794810f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 14:10:12 +0900
Subject: [PATCH 05679/10326] Use bindable flow instead

---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs |  2 +-
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  4 +--
 .../Rulesets/UI/FrameStabilityContainer.cs    | 35 +++++++++++++++----
 osu.Game/Rulesets/UI/FrameStableClock.cs      | 19 ++--------
 osu.Game/Screens/Play/GameplayClock.cs        |  5 ---
 osu.Game/Screens/Play/Player.cs               | 20 ++++++-----
 6 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 2263e2b2f4..6e7025847a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private OsuInputManager inputManager;
 
-        private GameplayClock gameplayClock;
+        private IFrameStableClock gameplayClock;
 
         private List<OsuReplayFrame> replayFrames;
 
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 3f967d489b..f6cf836fe7 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.UI
 
         public override Container FrameStableComponents { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
-        public override FrameStableClock FrameStableClock => frameStabilityContainer.FrameStableClock;
+        public override IFrameStableClock FrameStableClock => frameStabilityContainer.FrameStableClock;
 
         private bool frameStablePlayback = true;
 
@@ -404,7 +404,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// The frame-stable clock which is being used for playfield display.
         /// </summary>
-        public abstract FrameStableClock FrameStableClock { get; }
+        public abstract IFrameStableClock FrameStableClock { get; }
 
         /// <summary>~
         /// The associated ruleset.
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 4ea5b514c9..9ffbce991c 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -2,7 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
@@ -29,14 +32,16 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         internal bool FrameStablePlayback = true;
 
+        public IFrameStableClock FrameStableClock => frameStableClock;
+
         [Cached(typeof(GameplayClock))]
-        public readonly FrameStableClock FrameStableClock;
+        private readonly FrameStabilityClock frameStableClock;
 
         public FrameStabilityContainer(double gameplayStartTime = double.MinValue)
         {
             RelativeSizeAxes = Axes.Both;
 
-            FrameStableClock = new FrameStableClock(framedClock = new FramedClock(manualClock = new ManualClock()));
+            frameStableClock = new FrameStabilityClock(framedClock = new FramedClock(manualClock = new ManualClock()));
 
             this.gameplayStartTime = gameplayStartTime;
         }
@@ -57,8 +62,8 @@ namespace osu.Game.Rulesets.UI
         {
             if (clock != null)
             {
-                parentGameplayClock = FrameStableClock.ParentGameplayClock = clock;
-                FrameStableClock.IsPaused.BindTo(clock.IsPaused);
+                parentGameplayClock = frameStableClock.ParentGameplayClock = clock;
+                frameStableClock.IsPaused.BindTo(clock.IsPaused);
             }
         }
 
@@ -91,7 +96,7 @@ namespace osu.Game.Rulesets.UI
         public override bool UpdateSubTree()
         {
             requireMoreUpdateLoops = true;
-            validState = !FrameStableClock.IsPaused.Value;
+            validState = !frameStableClock.IsPaused.Value;
 
             int loops = 0;
 
@@ -194,6 +199,8 @@ namespace osu.Game.Rulesets.UI
 
                 requireMoreUpdateLoops |= manualClock.CurrentTime != parentGameplayClock.CurrentTime;
 
+                frameStableClock.IsCatchingUp.Value = requireMoreUpdateLoops;
+
                 // The manual clock time has changed in the above code. The framed clock now needs to be updated
                 // to ensure that the its time is valid for our children before input is processed
                 framedClock.ProcessFrame();
@@ -209,10 +216,26 @@ namespace osu.Game.Rulesets.UI
             }
             else
             {
-                Clock = FrameStableClock;
+                Clock = frameStableClock;
             }
         }
 
         public ReplayInputHandler ReplayInputHandler { get; set; }
+
+        private class FrameStabilityClock : GameplayClock, IFrameStableClock
+        {
+            public GameplayClock ParentGameplayClock;
+
+            public readonly Bindable<bool> IsCatchingUp = new Bindable<bool>();
+
+            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => ParentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty<Bindable<double>>();
+
+            public FrameStabilityClock(FramedClock underlyingClock)
+                : base(underlyingClock)
+            {
+            }
+
+            IBindable<bool> IFrameStableClock.IsCatchingUp => IsCatchingUp;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/FrameStableClock.cs b/osu.Game/Rulesets/UI/FrameStableClock.cs
index 5c81ce3093..d888eefdc6 100644
--- a/osu.Game/Rulesets/UI/FrameStableClock.cs
+++ b/osu.Game/Rulesets/UI/FrameStableClock.cs
@@ -1,28 +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.Collections.Generic;
-using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.UI
 {
-    public class FrameStableClock : GameplayClock
+    public interface IFrameStableClock : IFrameBasedClock
     {
-        public GameplayClock ParentGameplayClock;
-
-        public override IEnumerable<Bindable<double>> NonGameplayAdjustments => ParentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty<Bindable<double>>();
-
-        public FrameStableClock(FramedClock underlyingClock)
-            : base(underlyingClock)
-        {
-        }
-
-        public override bool ShouldDisableSamplePlayback =>
-            // handle the case where playback is catching up to real-time.
-            base.ShouldDisableSamplePlayback || (ParentGameplayClock != null && Math.Abs(CurrentTime - ParentGameplayClock.CurrentTime) > 200);
+        IBindable<bool> IsCatchingUp { get; }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index 4d0872e5bb..db4b5d300b 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -61,11 +61,6 @@ namespace osu.Game.Screens.Play
 
         public bool IsRunning => underlyingClock.IsRunning;
 
-        /// <summary>
-        /// Whether nested samples supporting the <see cref="ISamplePlaybackDisabler"/> interface should be paused.
-        /// </summary>
-        public virtual bool ShouldDisableSamplePlayback => IsPaused.Value;
-
         public void ProcessFrame()
         {
             // intentionally not updating the underlying clock (handled externally).
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index b0923ed4c8..3c0c643413 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -238,7 +238,13 @@ namespace osu.Game.Screens.Play
                 skipOverlay.Hide();
             }
 
-            DrawableRuleset.IsPaused.BindValueChanged(_ => updateGameplayState());
+            DrawableRuleset.IsPaused.BindValueChanged(paused =>
+            {
+                updateGameplayState();
+                updateSampleDisabledState();
+            });
+
+            DrawableRuleset.FrameStableClock.IsCatchingUp.BindValueChanged(_ => updateSampleDisabledState());
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateGameplayState());
 
@@ -367,13 +373,6 @@ namespace osu.Game.Screens.Play
             }
         };
 
-        protected override void Update()
-        {
-            base.Update();
-
-            samplePlaybackDisabled.Value = DrawableRuleset.FrameStableClock.ShouldDisableSamplePlayback;
-        }
-
         private void onBreakTimeChanged(ValueChangedEvent<bool> isBreakTime)
         {
             updateGameplayState();
@@ -388,6 +387,11 @@ namespace osu.Game.Screens.Play
             LocalUserPlaying.Value = inGameplay;
         }
 
+        private void updateSampleDisabledState()
+        {
+            samplePlaybackDisabled.Value = DrawableRuleset.FrameStableClock.IsCatchingUp.Value || GameplayClockContainer.GameplayClock.IsPaused.Value;
+        }
+
         private void updatePauseOnFocusLostState() =>
             HUDOverlay.HoldToQuit.PauseOnFocusLost = PauseOnFocusLost
                                                      && !DrawableRuleset.HasReplayLoaded.Value

From 09087faf3b78908c912b1384014782705bda1228 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 14:23:24 +0900
Subject: [PATCH 05680/10326] Fix non-matching filename

---
 .../Rulesets/UI/{FrameStableClock.cs => IFrameStableClock.cs}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Rulesets/UI/{FrameStableClock.cs => IFrameStableClock.cs} (100%)

diff --git a/osu.Game/Rulesets/UI/FrameStableClock.cs b/osu.Game/Rulesets/UI/IFrameStableClock.cs
similarity index 100%
rename from osu.Game/Rulesets/UI/FrameStableClock.cs
rename to osu.Game/Rulesets/UI/IFrameStableClock.cs

From 606a4304a85a8c8299a5de5dde08acdd9ac26d06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 14:33:12 +0900
Subject: [PATCH 05681/10326] Remove unused usings

---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs                    | 1 -
 .../Visual/Gameplay/TestSceneGameplaySamplePlayback.cs           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 6e7025847a..8c819c4773 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -11,7 +11,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index e2b867bfb2..af00322cbc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
@@ -9,7 +9,6 @@ using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 

From e0ad005cc1c49cc9e9389d4e10df3a65404d7df7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 14:31:56 +0900
Subject: [PATCH 05682/10326] Move editor sample disabling logic to editor
 class (and support screen switching)

---
 osu.Game/Screens/Edit/Editor.cs      | 78 +++++++++++++++++-----------
 osu.Game/Screens/Edit/EditorClock.cs | 17 +++---
 2 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index c3560dff38..25ebd55f81 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -43,8 +43,9 @@ using osuTK.Input;
 namespace osu.Game.Screens.Edit
 {
     [Cached(typeof(IBeatSnapProvider))]
+    [Cached(typeof(ISamplePlaybackDisabler))]
     [Cached]
-    public class Editor : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>, IKeyBindingHandler<PlatformAction>, IBeatSnapProvider
+    public class Editor : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>, IKeyBindingHandler<PlatformAction>, IBeatSnapProvider, ISamplePlaybackDisabler
     {
         public override float BackgroundParallaxAmount => 0.1f;
 
@@ -64,6 +65,10 @@ namespace osu.Game.Screens.Edit
         [Resolved(canBeNull: true)]
         private DialogOverlay dialogOverlay { get; set; }
 
+        public IBindable<bool> SamplePlaybackDisabled => samplePlaybackDisabled;
+
+        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
         private bool exitConfirmed;
 
         private string lastSavedHash;
@@ -109,9 +114,10 @@ namespace osu.Game.Screens.Edit
             UpdateClockSource();
 
             dependencies.CacheAs(clock);
-            dependencies.CacheAs<ISamplePlaybackDisabler>(clock);
             AddInternal(clock);
 
+            clock.SeekingOrStopped.BindValueChanged(_ => updateSampleDisabledState());
+
             // todo: remove caching of this and consume via editorBeatmap?
             dependencies.Cache(beatDivisor);
 
@@ -557,40 +563,52 @@ namespace osu.Game.Screens.Edit
                 .ScaleTo(0.98f, 200, Easing.OutQuint)
                 .FadeOut(200, Easing.OutQuint);
 
-            if ((currentScreen = screenContainer.SingleOrDefault(s => s.Type == e.NewValue)) != null)
+            try
             {
-                screenContainer.ChangeChildDepth(currentScreen, lastScreen?.Depth + 1 ?? 0);
+                if ((currentScreen = screenContainer.SingleOrDefault(s => s.Type == e.NewValue)) != null)
+                {
+                    screenContainer.ChangeChildDepth(currentScreen, lastScreen?.Depth + 1 ?? 0);
 
-                currentScreen
-                    .ScaleTo(1, 200, Easing.OutQuint)
-                    .FadeIn(200, Easing.OutQuint);
-                return;
+                    currentScreen
+                        .ScaleTo(1, 200, Easing.OutQuint)
+                        .FadeIn(200, Easing.OutQuint);
+                    return;
+                }
+
+                switch (e.NewValue)
+                {
+                    case EditorScreenMode.SongSetup:
+                        currentScreen = new SetupScreen();
+                        break;
+
+                    case EditorScreenMode.Compose:
+                        currentScreen = new ComposeScreen();
+                        break;
+
+                    case EditorScreenMode.Design:
+                        currentScreen = new DesignScreen();
+                        break;
+
+                    case EditorScreenMode.Timing:
+                        currentScreen = new TimingScreen();
+                        break;
+                }
+
+                LoadComponentAsync(currentScreen, newScreen =>
+                {
+                    if (newScreen == currentScreen)
+                        screenContainer.Add(newScreen);
+                });
             }
-
-            switch (e.NewValue)
+            finally
             {
-                case EditorScreenMode.SongSetup:
-                    currentScreen = new SetupScreen();
-                    break;
-
-                case EditorScreenMode.Compose:
-                    currentScreen = new ComposeScreen();
-                    break;
-
-                case EditorScreenMode.Design:
-                    currentScreen = new DesignScreen();
-                    break;
-
-                case EditorScreenMode.Timing:
-                    currentScreen = new TimingScreen();
-                    break;
+                updateSampleDisabledState();
             }
+        }
 
-            LoadComponentAsync(currentScreen, newScreen =>
-            {
-                if (newScreen == currentScreen)
-                    screenContainer.Add(newScreen);
-            });
+        private void updateSampleDisabledState()
+        {
+            samplePlaybackDisabled.Value = clock.SeekingOrStopped.Value || !(currentScreen is ComposeScreen);
         }
 
         private void seek(UIEvent e, int direction)
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 64ed34f5ec..949636f695 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -11,14 +11,13 @@ using osu.Framework.Timing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.Edit
 {
     /// <summary>
     /// A decoupled clock which adds editor-specific functionality, such as snapping to a user-defined beat divisor.
     /// </summary>
-    public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock, ISamplePlaybackDisabler
+    public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock
     {
         public IBindable<Track> Track => track;
 
@@ -32,9 +31,9 @@ namespace osu.Game.Screens.Edit
 
         private readonly DecoupleableInterpolatingFramedClock underlyingClock;
 
-        public IBindable<bool> SamplePlaybackDisabled => samplePlaybackDisabled;
+        public IBindable<bool> SeekingOrStopped => seekingOrStopped;
 
-        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+        private readonly Bindable<bool> seekingOrStopped = new Bindable<bool>(true);
 
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
             : this(beatmap.Beatmap.ControlPointInfo, beatmap.Track.Length, beatDivisor)
@@ -171,13 +170,13 @@ namespace osu.Game.Screens.Edit
 
         public void Stop()
         {
-            samplePlaybackDisabled.Value = true;
+            seekingOrStopped.Value = true;
             underlyingClock.Stop();
         }
 
         public bool Seek(double position)
         {
-            samplePlaybackDisabled.Value = true;
+            seekingOrStopped.Value = true;
 
             ClearTransforms();
             return underlyingClock.Seek(position);
@@ -228,7 +227,7 @@ namespace osu.Game.Screens.Edit
 
         private void updateSeekingState()
         {
-            if (samplePlaybackDisabled.Value)
+            if (seekingOrStopped.Value)
             {
                 if (track.Value?.IsRunning != true)
                 {
@@ -240,13 +239,13 @@ namespace osu.Game.Screens.Edit
                 // we are either running a seek tween or doing an immediate seek.
                 // in the case of an immediate seek the seeking bool will be set to false after one update.
                 // this allows for silencing hit sounds and the likes.
-                samplePlaybackDisabled.Value = Transforms.Any();
+                seekingOrStopped.Value = Transforms.Any();
             }
         }
 
         public void SeekTo(double seekDestination)
         {
-            samplePlaybackDisabled.Value = true;
+            seekingOrStopped.Value = true;
 
             if (IsRunning)
                 Seek(seekDestination);

From 03d566da356cf96199766229d05ab724a0709ac4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 14:35:12 +0900
Subject: [PATCH 05683/10326] Rename test variable and remove unncessary cast

---
 .../Visual/Gameplay/TestSceneGameplaySamplePlayback.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index af00322cbc..b86cb69eb4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
@@ -21,11 +21,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             DrawableSlider slider = null;
             DrawableSample[] samples = null;
-            ISamplePlaybackDisabler gameplayClock = null;
+            ISamplePlaybackDisabler sampleDisabler = null;
 
             AddStep("get variables", () =>
             {
-                gameplayClock = Player as ISamplePlaybackDisabler;
+                sampleDisabler = Player;
                 slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
                 samples = slider.ChildrenOfType<DrawableSample>().ToArray();
             });
@@ -42,16 +42,16 @@ namespace osu.Game.Tests.Visual.Gameplay
                 return true;
             });
 
-            AddAssert("sample playback disabled", () => gameplayClock.SamplePlaybackDisabled.Value);
+            AddAssert("sample playback disabled", () => sampleDisabler.SamplePlaybackDisabled.Value);
 
             // because we are in frame stable context, it's quite likely that not all samples are "played" at this point.
             // the important thing is that at least one started, and that sample has since stopped.
             AddAssert("all looping samples stopped immediately", () => allStopped(allLoopingSounds));
             AddUntilStep("all samples stopped eventually", () => allStopped(allSounds));
 
-            AddAssert("sample playback still disabled", () => gameplayClock.SamplePlaybackDisabled.Value);
+            AddAssert("sample playback still disabled", () => sampleDisabler.SamplePlaybackDisabled.Value);
 
-            AddUntilStep("seek finished, sample playback enabled", () => !gameplayClock.SamplePlaybackDisabled.Value);
+            AddUntilStep("seek finished, sample playback enabled", () => !sampleDisabler.SamplePlaybackDisabled.Value);
             AddUntilStep("any sample is playing", () => Player.ChildrenOfType<PausableSkinnableSound>().Any(s => s.IsPlaying));
         }
 

From b8beac27cee305d5c8003e66af02993dd9a4d956 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 17:14:41 +0900
Subject: [PATCH 05684/10326] Use previous logic for catching-up mode

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 9ffbce991c..28b7975a89 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -197,9 +197,11 @@ namespace osu.Game.Rulesets.UI
                 manualClock.Rate = Math.Abs(parentGameplayClock.Rate) * direction;
                 manualClock.IsRunning = parentGameplayClock.IsRunning;
 
-                requireMoreUpdateLoops |= manualClock.CurrentTime != parentGameplayClock.CurrentTime;
+                double timeBehind = Math.Abs(manualClock.CurrentTime - parentGameplayClock.CurrentTime);
 
-                frameStableClock.IsCatchingUp.Value = requireMoreUpdateLoops;
+                requireMoreUpdateLoops |= timeBehind != 0;
+
+                frameStableClock.IsCatchingUp.Value = timeBehind > 200;
 
                 // The manual clock time has changed in the above code. The framed clock now needs to be updated
                 // to ensure that the its time is valid for our children before input is processed

From 5fd97bd0433048b1370b3c8fbee51476d07af984 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 19:47:39 +0900
Subject: [PATCH 05685/10326] Add basic spectator screen

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 20 +++++++++++
 osu.Game/Screens/Play/Spectator.cs            | 36 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
 create mode 100644 osu.Game/Screens/Play/Spectator.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
new file mode 100644
index 0000000000..25c30dbc5a
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.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 NUnit.Framework;
+using osu.Game.Screens.Play;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSpectator : ScreenTestScene
+    {
+        private readonly User user = new User { Id = 1234, Username = "Test user" };
+
+        [Test]
+        public void TestSpectating()
+        {
+            AddStep("load screen", () => LoadScreen(new Spectator(user)));
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
new file mode 100644
index 0000000000..ceac6c737f
--- /dev/null
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -0,0 +1,36 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Users;
+
+namespace osu.Game.Screens.Play
+{
+    public class Spectator : OsuScreen
+    {
+        private readonly User targetUser;
+
+        public Spectator([NotNull] User targetUser)
+        {
+            this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new OsuSpriteText
+                {
+                    Text = $"Watching {targetUser}",
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+            };
+        }
+    }
+}

From 154ccf1b4996401d97a0cf16b0b3d45c17feab1f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 20:05:11 +0900
Subject: [PATCH 05686/10326] Expose events from streaming client

---
 .../Online/Spectator/SpectatorStreamingClient.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 5a41316f31..9e554d1d43 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -64,6 +64,16 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, FrameDataBundle> OnNewFrames;
 
+        /// <summary>
+        /// Called whenever a user starts a play session.
+        /// </summary>
+        public event Action<int, SpectatorState> OnUserBeganPlaying;
+
+        /// <summary>
+        /// Called whenever a user starts a play session.
+        /// </summary>
+        public event Action<int, SpectatorState> OnUserFinishedPlaying;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -154,18 +164,24 @@ namespace osu.Game.Online.Spectator
             if (!playingUsers.Contains(userId))
                 playingUsers.Add(userId);
 
+            OnUserBeganPlaying?.Invoke(userId, state);
+
             return Task.CompletedTask;
         }
 
         Task ISpectatorClient.UserFinishedPlaying(int userId, SpectatorState state)
         {
             playingUsers.Remove(userId);
+
+            OnUserFinishedPlaying?.Invoke(userId, state);
+
             return Task.CompletedTask;
         }
 
         Task ISpectatorClient.UserSentFrames(int userId, FrameDataBundle data)
         {
             OnNewFrames?.Invoke(userId, data);
+
             return Task.CompletedTask;
         }
 

From ac4671c594744ede35448e9045736899d2137606 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 20:59:46 +0900
Subject: [PATCH 05687/10326] Add basic implementation of spectator screen

---
 osu.Game/Screens/Play/Spectator.cs | 113 +++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index ceac6c737f..d73395cc9e 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -2,10 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Spectator;
+using osu.Game.Replays;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Replays.Types;
+using osu.Game.Scoring;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Play
@@ -14,6 +26,26 @@ namespace osu.Game.Screens.Play
     {
         private readonly User targetUser;
 
+        [Resolved]
+        private Bindable<WorkingBeatmap> beatmap { get; set; }
+
+        [Resolved]
+        private Bindable<RulesetInfo> ruleset { get; set; }
+
+        [Resolved]
+        private Bindable<IReadOnlyList<Mod>> mods { get; set; }
+
+        [Resolved]
+        private SpectatorStreamingClient spectatorStreaming { get; set; }
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        private Replay replay;
+
         public Spectator([NotNull] User targetUser)
         {
             this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
@@ -31,6 +63,87 @@ namespace osu.Game.Screens.Play
                     Origin = Anchor.Centre,
                 },
             };
+
+            spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
+            spectatorStreaming.OnUserFinishedPlaying += userFinishedPlaying;
+            spectatorStreaming.OnNewFrames += userSentFrames;
+
+            spectatorStreaming.WatchUser((int)targetUser.Id);
+        }
+
+        private void userSentFrames(int userId, FrameDataBundle data)
+        {
+            if (userId != targetUser.Id)
+                return;
+
+            var rulesetInstance = ruleset.Value.CreateInstance();
+
+            foreach (var frame in data.Frames)
+            {
+                IConvertibleReplayFrame convertibleFrame = rulesetInstance.CreateConvertibleReplayFrame();
+                convertibleFrame.FromLegacy(frame, beatmap.Value.Beatmap, null);
+
+                var convertedFrame = (ReplayFrame)convertibleFrame;
+                convertedFrame.Time = frame.Time;
+
+                replay.Frames.Add(convertedFrame);
+            }
+        }
+
+        private void userBeganPlaying(int userId, SpectatorState state)
+        {
+            if (userId != targetUser.Id)
+                return;
+
+            replay ??= new Replay();
+
+            var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == state.RulesetID)?.CreateInstance();
+
+            // ruleset not available
+            if (resolvedRuleset == null)
+                return;
+
+            var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == state.BeatmapID);
+
+            if (resolvedBeatmap == null)
+                return;
+
+            var scoreInfo = new ScoreInfo
+            {
+                Beatmap = resolvedBeatmap,
+                Mods = state.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
+                Ruleset = resolvedRuleset.RulesetInfo,
+            };
+
+            this.MakeCurrent();
+
+            ruleset.Value = resolvedRuleset.RulesetInfo;
+            beatmap.Value = beatmaps.GetWorkingBeatmap(resolvedBeatmap);
+
+            this.Push(new ReplayPlayerLoader(new Score
+            {
+                ScoreInfo = scoreInfo,
+                Replay = replay,
+            }));
+        }
+
+        private void userFinishedPlaying(int userId, SpectatorState state)
+        {
+            // todo: handle this in some way?
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (spectatorStreaming != null)
+            {
+                spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
+                spectatorStreaming.OnUserFinishedPlaying -= userFinishedPlaying;
+                spectatorStreaming.OnNewFrames -= userSentFrames;
+
+                spectatorStreaming.StopWatchingUser((int)targetUser.Id);
+            }
         }
     }
 }

From 82a27c73a0077412ee1519c63c0b6d9323810e35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 21:17:12 +0900
Subject: [PATCH 05688/10326] Create basic testing setup

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 25c30dbc5a..75ca970c62 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -2,6 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Game.Online.Spectator;
+using osu.Game.Replays.Legacy;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
 
@@ -9,12 +12,34 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSpectator : ScreenTestScene
     {
-        private readonly User user = new User { Id = 1234, Username = "Test user" };
+        [Cached(typeof(SpectatorStreamingClient))]
+        private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
 
         [Test]
         public void TestSpectating()
         {
-            AddStep("load screen", () => LoadScreen(new Spectator(user)));
+            AddStep("load screen", () => LoadScreen(new Spectator(testSpectatorStreamingClient.StreamingUser)));
+            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
+        }
+
+        internal class TestSpectatorStreamingClient : SpectatorStreamingClient
+        {
+            public readonly User StreamingUser = new User { Id = 1234, Username = "Test user" };
+
+            public void StartPlay()
+            {
+                ((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState());
+            }
+
+            public void SendFrames()
+            {
+                ((ISpectatorClient)this).UserSentFrames((int)StreamingUser.Id, new FrameDataBundle(new[]
+                {
+                    // todo: populate more frames
+                    new LegacyReplayFrame(0, 0, 0, ReplayButtonState.Left1)
+                }));
+            }
         }
     }
 }

From 9bb2cff8a54a30e83a3ca801d47e84fd66e0288d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 21:22:01 +0900
Subject: [PATCH 05689/10326] Convey actual beatmap and ruleset for full
 testing setup

---
 .../Visual/Gameplay/TestSceneSpectator.cs         | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 75ca970c62..1c73427686 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Screens.Play;
@@ -15,9 +17,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(SpectatorStreamingClient))]
         private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
 
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
         [Test]
         public void TestSpectating()
         {
+            AddStep("add streaming client", () => Add(testSpectatorStreamingClient));
             AddStep("load screen", () => LoadScreen(new Spectator(testSpectatorStreamingClient.StreamingUser)));
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
             AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
@@ -25,11 +31,18 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         internal class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
+            [Resolved]
+            private BeatmapManager beatmaps { get; set; }
+
             public readonly User StreamingUser = new User { Id = 1234, Username = "Test user" };
 
             public void StartPlay()
             {
-                ((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState());
+                ((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState
+                {
+                    BeatmapID = beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First().OnlineBeatmapID,
+                    RulesetID = 0,
+                });
             }
 
             public void SendFrames()

From 67f6d52e35a861c97647139dc16b2020fa3c6e38 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 21:27:05 +0900
Subject: [PATCH 05690/10326] Setup tests

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 1c73427686..49fc81752c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private OsuGameBase game { get; set; }
 
         [Test]
-        public void TestSpectating()
+        public void TestBasicSpectatingFlow()
         {
             AddStep("add streaming client", () => Add(testSpectatorStreamingClient));
             AddStep("load screen", () => LoadScreen(new Spectator(testSpectatorStreamingClient.StreamingUser)));
@@ -29,6 +29,30 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
         }
 
+        [Test]
+        public void TestSpectatingDuringGameplay()
+        {
+            // should seek immediately to available frames
+        }
+
+        [Test]
+        public void TestHostStartsPlayingWhileAlreadyWatching()
+        {
+            // should restart either immediately or after running out of frames
+        }
+
+        [Test]
+        public void TestHostFails()
+        {
+            // should replay until running out of frames then fail
+        }
+
+        [Test]
+        public void TestStopWatchingDuringPlay()
+        {
+            // should immediately exit and unbind from streaming client
+        }
+
         internal class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
             [Resolved]

From 593b0a3adafc9b6683e351ab3ce7db6f060aa57b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Oct 2020 21:45:37 +0900
Subject: [PATCH 05691/10326] Setup tests to run headless, add basic pass
 support

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 73 ++++++++++++++++++-
 1 file changed, 70 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 49fc81752c..006d64491a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -4,10 +4,13 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Screens.Play;
+using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -17,14 +20,28 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(SpectatorStreamingClient))]
         private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
 
+        private Spectator spectatorScreen;
+
         [Resolved]
         private OsuGameBase game { get; set; }
 
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).Wait());
+
+            AddStep("add streaming client", () =>
+            {
+                Remove(testSpectatorStreamingClient);
+                Add(testSpectatorStreamingClient);
+            });
+        }
+
         [Test]
         public void TestBasicSpectatingFlow()
         {
-            AddStep("add streaming client", () => Add(testSpectatorStreamingClient));
-            AddStep("load screen", () => LoadScreen(new Spectator(testSpectatorStreamingClient.StreamingUser)));
+            beginSpectating();
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
             AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
         }
@@ -32,27 +49,68 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestSpectatingDuringGameplay()
         {
+            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
+
             // should seek immediately to available frames
+            beginSpectating();
         }
 
         [Test]
         public void TestHostStartsPlayingWhileAlreadyWatching()
         {
+            beginSpectating();
+
+            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
+
+            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
             // should restart either immediately or after running out of frames
         }
 
         [Test]
         public void TestHostFails()
         {
+            beginSpectating();
+
+            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
+            // todo: send fail state
+
             // should replay until running out of frames then fail
         }
 
         [Test]
         public void TestStopWatchingDuringPlay()
         {
+            beginSpectating();
+
+            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
+
+            AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
+
             // should immediately exit and unbind from streaming client
+            AddStep("stop spectating", () => (Stack.CurrentScreen as Player)?.Exit());
+
+            AddUntilStep("spectating stopped", () => spectatorScreen.GetParentScreen() == null);
         }
 
+        [Test]
+        public void TestWatchingBeatmapThatDoesntExistLocally()
+        {
+            beginSpectating();
+
+            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
+
+            // player should never arrive.
+        }
+
+        private void beginSpectating() =>
+            AddStep("load screen", () => LoadScreen(spectatorScreen = new Spectator(testSpectatorStreamingClient.StreamingUser)));
+
         internal class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
             [Resolved]
@@ -64,7 +122,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 ((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState
                 {
-                    BeatmapID = beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First().OnlineBeatmapID,
+                    BeatmapID = beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,
+                    RulesetID = 0,
+                });
+            }
+
+            public void EndPlay()
+            {
+                ((ISpectatorClient)this).UserFinishedPlaying((int)StreamingUser.Id, new SpectatorState
+                {
+                    BeatmapID = beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,
                     RulesetID = 0,
                 });
             }

From 400542bc0ba76826341c549cd18db1f12efa1092 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 14:47:15 +0900
Subject: [PATCH 05692/10326] Ensure frames arrive

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs  | 9 +++++++++
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 006d64491a..533e535bc6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -9,6 +9,8 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Users;
@@ -38,12 +40,19 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
         }
 
+        private OsuFramedReplayInputHandler replayHandler =>
+            (OsuFramedReplayInputHandler)Stack.ChildrenOfType<OsuInputManager>().First().ReplayInputHandler;
+
         [Test]
         public void TestBasicSpectatingFlow()
         {
             beginSpectating();
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
             AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
+
+            AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
+
+            AddAssert("ensure frames arrived", () => replayHandler.HasFrames);
         }
 
         [Test]
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index cf5c88b8fd..62b24f6b55 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Replays
         /// </summary>
         public bool FrameAccuratePlayback = false;
 
-        protected bool HasFrames => Frames.Count > 0;
+        public bool HasFrames => Frames.Count > 0;
 
         private bool inImportantSection
         {

From 9bac8f37922276c7b5808383145436884f845819 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 14:57:00 +0900
Subject: [PATCH 05693/10326] Add null check on replay as safety measure

---
 osu.Game/Screens/Play/Spectator.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index d73395cc9e..24334af8d8 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -63,7 +63,11 @@ namespace osu.Game.Screens.Play
                     Origin = Anchor.Centre,
                 },
             };
+        }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
             spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
             spectatorStreaming.OnUserFinishedPlaying += userFinishedPlaying;
             spectatorStreaming.OnNewFrames += userSentFrames;
@@ -76,6 +80,11 @@ namespace osu.Game.Screens.Play
             if (userId != targetUser.Id)
                 return;
 
+            // this should never happen as the server sends the user's state on watching,
+            // but is here as a safety measure.
+            if (replay == null)
+                return;
+
             var rulesetInstance = ruleset.Value.CreateInstance();
 
             foreach (var frame in data.Frames)

From c1e7cd6e4774cbae012a6bc63f1e73e623427966 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 14:57:23 +0900
Subject: [PATCH 05694/10326] Stop replay playback when frames are starved

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 31 ++++++++++++++-----
 .../Spectator/SpectatorStreamingClient.cs     |  2 +-
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 533e535bc6..8c03de8c13 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -43,6 +43,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         private OsuFramedReplayInputHandler replayHandler =>
             (OsuFramedReplayInputHandler)Stack.ChildrenOfType<OsuInputManager>().First().ReplayInputHandler;
 
+        private Player player => Stack.CurrentScreen as Player;
+
         [Test]
         public void TestBasicSpectatingFlow()
         {
@@ -53,6 +55,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
 
             AddAssert("ensure frames arrived", () => replayHandler.HasFrames);
+
+            AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
+            AddAssert("game is paused", () => !player.ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning);
         }
 
         [Test]
@@ -127,14 +132,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public readonly User StreamingUser = new User { Id = 1234, Username = "Test user" };
 
-            public void StartPlay()
-            {
-                ((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState
-                {
-                    BeatmapID = beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,
-                    RulesetID = 0,
-                });
-            }
+            public void StartPlay() => sendState();
 
             public void EndPlay()
             {
@@ -153,6 +151,23 @@ namespace osu.Game.Tests.Visual.Gameplay
                     new LegacyReplayFrame(0, 0, 0, ReplayButtonState.Left1)
                 }));
             }
+
+            public override void WatchUser(int userId)
+            {
+                // usually the server would do this.
+                sendState();
+
+                base.WatchUser(userId);
+            }
+
+            private void sendState()
+            {
+                ((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState
+                {
+                    BeatmapID = beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,
+                    RulesetID = 0,
+                });
+            }
         }
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 9e554d1d43..481c94e6f3 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -227,7 +227,7 @@ namespace osu.Game.Online.Spectator
             connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), currentState);
         }
 
-        public void WatchUser(int userId)
+        public virtual void WatchUser(int userId)
         {
             if (watchingUsers.Contains(userId))
                 return;

From b737a8bf6e821d7bdc3c1046d406164b83cae893 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 16:27:15 +0900
Subject: [PATCH 05695/10326] Add field to Replay denoting whether the full
 replay have been received or not

---
 osu.Game/Replays/Replay.cs         | 6 ++++++
 osu.Game/Screens/Play/Spectator.cs | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Replays/Replay.cs b/osu.Game/Replays/Replay.cs
index 31d2ed0d70..5430915394 100644
--- a/osu.Game/Replays/Replay.cs
+++ b/osu.Game/Replays/Replay.cs
@@ -8,6 +8,12 @@ namespace osu.Game.Replays
 {
     public class Replay
     {
+        /// <summary>
+        /// Whether all frames for this replay have been received.
+        /// If false, gameplay would be paused to wait for further data, for instance.
+        /// </summary>
+        public bool HasReceivedAllFrames = true;
+
         public List<ReplayFrame> Frames = new List<ReplayFrame>();
     }
 }
diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 24334af8d8..dcfd7e829a 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Play
             if (userId != targetUser.Id)
                 return;
 
-            replay ??= new Replay();
+            replay ??= new Replay { HasReceivedAllFrames = false };
 
             var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == state.RulesetID)?.CreateInstance();
 
@@ -138,7 +138,9 @@ namespace osu.Game.Screens.Play
 
         private void userFinishedPlaying(int userId, SpectatorState state)
         {
-            // todo: handle this in some way?
+            if (replay == null) return;
+
+            replay.HasReceivedAllFrames = true;
         }
 
         protected override void Dispose(bool isDisposing)

From 4dba96e189c2af01d3c947d43d66ddf17c066d34 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 16:28:11 +0900
Subject: [PATCH 05696/10326] Add more useful frame sending logic to tests

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 47 +++++++++++--------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 8c03de8c13..f33a6876dd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -1,16 +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.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Users;
@@ -50,22 +53,25 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             beginSpectating();
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
-            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
-
+            sendFrames();
             AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
 
             AddAssert("ensure frames arrived", () => replayHandler.HasFrames);
 
             AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
-            AddAssert("game is paused", () => !player.ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning);
+            AddAssert("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
+        }
+
+        private void sendFrames(int count = 10)
+        {
+            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames(count));
         }
 
         [Test]
         public void TestSpectatingDuringGameplay()
         {
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
-            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
-
+            sendFrames();
             // should seek immediately to available frames
             beginSpectating();
         }
@@ -76,11 +82,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             beginSpectating();
 
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
-            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
-
+            sendFrames();
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
-            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
-            // should restart either immediately or after running out of frames
+            sendFrames();
         }
 
         [Test]
@@ -89,8 +93,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             beginSpectating();
 
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
-            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
-            // todo: send fail state
+            sendFrames();
 
             // should replay until running out of frames then fail
         }
@@ -101,8 +104,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             beginSpectating();
 
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
-            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
-
+            sendFrames();
             AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
 
             // should immediately exit and unbind from streaming client
@@ -117,8 +119,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             beginSpectating();
 
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
-            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames());
-
+            sendFrames();
             // player should never arrive.
         }
 
@@ -143,13 +144,19 @@ namespace osu.Game.Tests.Visual.Gameplay
                 });
             }
 
-            public void SendFrames()
+            public void SendFrames(int count)
             {
-                ((ISpectatorClient)this).UserSentFrames((int)StreamingUser.Id, new FrameDataBundle(new[]
+                var frames = new List<LegacyReplayFrame>();
+
+                for (int i = 0; i < count; i++)
                 {
-                    // todo: populate more frames
-                    new LegacyReplayFrame(0, 0, 0, ReplayButtonState.Left1)
-                }));
+                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), ReplayButtonState.Left1));
+                }
+
+                frames.Add(new LegacyReplayFrame(count * 100, 0, 0, ReplayButtonState.None));
+
+                var bundle = new FrameDataBundle(frames);
+                ((ISpectatorClient)this).UserSentFrames((int)StreamingUser.Id, bundle);
             }
 
             public override void WatchUser(int userId)

From 63131d46aaeb9794859fc52796bd0420bb5999fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 17:10:48 +0900
Subject: [PATCH 05697/10326] Send initial spectator state more correctly in
 test component

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index f33a6876dd..e95f7a50a4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestBasicSpectatingFlow()
         {
-            beginSpectating();
+            loadSpectatingScreen();
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
             sendFrames();
             AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
@@ -73,13 +73,13 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
             sendFrames();
             // should seek immediately to available frames
-            beginSpectating();
+            loadSpectatingScreen();
         }
 
         [Test]
         public void TestHostStartsPlayingWhileAlreadyWatching()
         {
-            beginSpectating();
+            loadSpectatingScreen();
 
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
             sendFrames();
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestHostFails()
         {
-            beginSpectating();
+            loadSpectatingScreen();
 
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
             sendFrames();
@@ -101,7 +101,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStopWatchingDuringPlay()
         {
-            beginSpectating();
+            loadSpectatingScreen();
 
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
             sendFrames();
@@ -116,14 +116,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestWatchingBeatmapThatDoesntExistLocally()
         {
-            beginSpectating();
+            loadSpectatingScreen();
 
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
             sendFrames();
             // player should never arrive.
         }
 
-        private void beginSpectating() =>
+        private void loadSpectatingScreen() =>
             AddStep("load screen", () => LoadScreen(spectatorScreen = new Spectator(testSpectatorStreamingClient.StreamingUser)));
 
         internal class TestSpectatorStreamingClient : SpectatorStreamingClient
@@ -144,6 +144,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 });
             }
 
+            private bool sentState;
+
             public void SendFrames(int count)
             {
                 var frames = new List<LegacyReplayFrame>();
@@ -157,18 +159,25 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 var bundle = new FrameDataBundle(frames);
                 ((ISpectatorClient)this).UserSentFrames((int)StreamingUser.Id, bundle);
+
+                if (!sentState)
+                    sendState();
             }
 
             public override void WatchUser(int userId)
             {
-                // usually the server would do this.
-                sendState();
+                if (sentState)
+                {
+                    // usually the server would do this.
+                    sendState();
+                }
 
                 base.WatchUser(userId);
             }
 
             private void sendState()
             {
+                sentState = true;
                 ((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState
                 {
                     BeatmapID = beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,

From 3ec3321a3ded49588c927c02dee520a46ffd7852 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 17:11:07 +0900
Subject: [PATCH 05698/10326] Add missing space

---
 osu.Game/Screens/Play/Spectator.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index dcfd7e829a..522a636dfb 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -68,6 +68,7 @@ namespace osu.Game.Screens.Play
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
             spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
             spectatorStreaming.OnUserFinishedPlaying += userFinishedPlaying;
             spectatorStreaming.OnNewFrames += userSentFrames;

From 9e6b0a42ec4795eb3878e47946370d900aa8d453 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 16:28:50 +0900
Subject: [PATCH 05699/10326] Allow FrameStabilityContainer to handle
 waiting-for-data state better (and pause outwards)

---
 .../Replays/FramedReplayInputHandler.cs       | 28 +++++++++++++++++--
 .../Rulesets/UI/FrameStabilityContainer.cs    |  3 +-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 62b24f6b55..ddf85b7300 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -124,20 +124,42 @@ namespace osu.Game.Rulesets.Replays
 
             if (HasFrames)
             {
+                var next = NextFrame;
+
                 // check if the next frame is valid for the current playback direction.
                 // validity is if the next frame is equal or "earlier"
-                var compare = time.CompareTo(NextFrame?.Time);
+                var compare = time.CompareTo(next?.Time);
 
-                if (compare == 0 || compare == currentDirection)
+                if (next != null && (compare == 0 || compare == currentDirection))
                 {
                     if (advanceFrame())
                         return CurrentTime = CurrentFrame.Time;
                 }
                 else
                 {
-                    // if we didn't change frames, we need to ensure we are allowed to run frames in between, else return null.
+                    // this is the case where the frame can't be advanced (in the replay).
+                    // even so, we may be able to move the clock forward due to being at the end of the replay or
+                    // in a section where replay accuracy doesn't matter.
+
+                    // important section is always respected to block the update loop.
                     if (inImportantSection)
                         return null;
+
+                    if (next == null)
+                    {
+                        // in the case we have no more frames and haven't received the full replay, block.
+                        if (!replay.HasReceivedAllFrames)
+                            return null;
+
+                        // else allow play to end.
+                    }
+                    else if (next.Time.CompareTo(time) != currentDirection)
+                    {
+                        // in the case we have more frames, block if the next frame's time is less than the current time.
+                        return null;
+                    }
+
+                    // if we didn't change frames, we need to ensure we are allowed to run frames in between, else return null.
                 }
             }
 
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 28b7975a89..fb6c7d4c17 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -96,6 +96,7 @@ namespace osu.Game.Rulesets.UI
         public override bool UpdateSubTree()
         {
             requireMoreUpdateLoops = true;
+
             validState = !frameStableClock.IsPaused.Value;
 
             int loops = 0;
@@ -191,7 +192,7 @@ namespace osu.Game.Rulesets.UI
             finally
             {
                 if (newProposedTime != manualClock.CurrentTime)
-                    direction = newProposedTime > manualClock.CurrentTime ? 1 : -1;
+                    direction = newProposedTime >= manualClock.CurrentTime ? 1 : -1;
 
                 manualClock.CurrentTime = newProposedTime;
                 manualClock.Rate = Math.Abs(parentGameplayClock.Rate) * direction;

From 851d45d2ebea669f18243e924956a6ab7e0ea695 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 18:13:45 +0900
Subject: [PATCH 05700/10326] Add sane pausing logic

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 12 ++++++++++++
 osu.Game/Rulesets/UI/IFrameStableClock.cs       |  2 ++
 osu.Game/Screens/Play/Player.cs                 |  8 ++++++++
 3 files changed, 22 insertions(+)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index fb6c7d4c17..987dca7073 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -101,6 +101,13 @@ namespace osu.Game.Rulesets.UI
 
             int loops = 0;
 
+            if (frameStableClock.WaitingOnFrames.Value)
+            {
+                // for now, force one update loop to check if frames have arrived
+                // this may have to change in the future where we want stable user pausing during replay playback.
+                validState = true;
+            }
+
             while (validState && requireMoreUpdateLoops && loops++ < MaxCatchUpFrames)
             {
                 updateClock();
@@ -203,6 +210,7 @@ namespace osu.Game.Rulesets.UI
                 requireMoreUpdateLoops |= timeBehind != 0;
 
                 frameStableClock.IsCatchingUp.Value = timeBehind > 200;
+                frameStableClock.WaitingOnFrames.Value = !validState;
 
                 // The manual clock time has changed in the above code. The framed clock now needs to be updated
                 // to ensure that the its time is valid for our children before input is processed
@@ -231,6 +239,8 @@ namespace osu.Game.Rulesets.UI
 
             public readonly Bindable<bool> IsCatchingUp = new Bindable<bool>();
 
+            public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>();
+
             public override IEnumerable<Bindable<double>> NonGameplayAdjustments => ParentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty<Bindable<double>>();
 
             public FrameStabilityClock(FramedClock underlyingClock)
@@ -239,6 +249,8 @@ namespace osu.Game.Rulesets.UI
             }
 
             IBindable<bool> IFrameStableClock.IsCatchingUp => IsCatchingUp;
+
+            IBindable<bool> IFrameStableClock.WaitingOnFrames => WaitingOnFrames;
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/IFrameStableClock.cs b/osu.Game/Rulesets/UI/IFrameStableClock.cs
index d888eefdc6..c1d8733d26 100644
--- a/osu.Game/Rulesets/UI/IFrameStableClock.cs
+++ b/osu.Game/Rulesets/UI/IFrameStableClock.cs
@@ -9,5 +9,7 @@ namespace osu.Game.Rulesets.UI
     public interface IFrameStableClock : IFrameBasedClock
     {
         IBindable<bool> IsCatchingUp { get; }
+
+        IBindable<bool> WaitingOnFrames { get; }
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 3c0c643413..3e79ea0840 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -238,6 +238,14 @@ namespace osu.Game.Screens.Play
                 skipOverlay.Hide();
             }
 
+            DrawableRuleset.FrameStableClock.WaitingOnFrames.BindValueChanged(waiting =>
+            {
+                if (waiting.NewValue)
+                    GameplayClockContainer.Stop();
+                else
+                    GameplayClockContainer.Start();
+            });
+
             DrawableRuleset.IsPaused.BindValueChanged(paused =>
             {
                 updateGameplayState();

From d4467d20a2047020e3c59282e8882d89a05cf48d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 18:13:58 +0900
Subject: [PATCH 05701/10326] Allow tests to continue sending frames from point
 they left off

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index e95f7a50a4..98bd90b3b5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -30,10 +30,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuGameBase game { get; set; }
 
+        private int nextFrame = 0;
+
         public override void SetUpSteps()
         {
             base.SetUpSteps();
 
+            AddStep("reset sent frames", () => nextFrame = 0);
+
             AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).Wait());
 
             AddStep("add streaming client", () =>
@@ -53,18 +57,20 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             loadSpectatingScreen();
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+
             sendFrames();
+
             AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
 
             AddAssert("ensure frames arrived", () => replayHandler.HasFrames);
 
             AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
             AddAssert("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
-        }
+            sendFrames();
+            AddUntilStep("game resumed", () => !player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
 
-        private void sendFrames(int count = 10)
-        {
-            AddStep("send frames", () => testSpectatorStreamingClient.SendFrames(count));
+            AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
+            AddAssert("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
         }
 
         [Test]
@@ -123,6 +129,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             // player should never arrive.
         }
 
+        private void sendFrames(int count = 10)
+        {
+            AddStep("send frames", () =>
+            {
+                testSpectatorStreamingClient.SendFrames(nextFrame, count);
+                nextFrame += count;
+            });
+        }
+
         private void loadSpectatingScreen() =>
             AddStep("load screen", () => LoadScreen(spectatorScreen = new Spectator(testSpectatorStreamingClient.StreamingUser)));
 
@@ -146,16 +161,16 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             private bool sentState;
 
-            public void SendFrames(int count)
+            public void SendFrames(int index, int count)
             {
                 var frames = new List<LegacyReplayFrame>();
 
-                for (int i = 0; i < count; i++)
+                for (int i = index; i < index + count; i++)
                 {
-                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), ReplayButtonState.Left1));
-                }
+                    var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
 
-                frames.Add(new LegacyReplayFrame(count * 100, 0, 0, ReplayButtonState.None));
+                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
+                }
 
                 var bundle = new FrameDataBundle(frames);
                 ((ISpectatorClient)this).UserSentFrames((int)StreamingUser.Id, bundle);

From b3d793a505d919902710673de4e1947e228e43f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 18:28:49 +0900
Subject: [PATCH 05702/10326] Fix gameplay proceeding when no frames have been
 received yet

---
 .../Visual/Gameplay/TestSceneSpectator.cs         | 15 +++++++++++++++
 .../Rulesets/Replays/FramedReplayInputHandler.cs  |  6 ++++++
 2 files changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 98bd90b3b5..14b0ca4d33 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -56,6 +56,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestBasicSpectatingFlow()
         {
             loadSpectatingScreen();
+
+            AddAssert("screen hasn't changed", () => Stack.CurrentScreen is Spectator);
+
             AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
 
             sendFrames();
@@ -73,6 +76,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
         }
 
+        [Test]
+        public void TestPlayStartsWithNoFrames()
+        {
+            loadSpectatingScreen();
+
+            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+
+            AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
+
+            AddUntilStep("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
+        }
+
         [Test]
         public void TestSpectatingDuringGameplay()
         {
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index ddf85b7300..d7be809d34 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -162,6 +162,12 @@ namespace osu.Game.Rulesets.Replays
                     // if we didn't change frames, we need to ensure we are allowed to run frames in between, else return null.
                 }
             }
+            else
+            {
+                // if we never received frames and are expecting to, block.
+                if (!replay.HasReceivedAllFrames)
+                    return null;
+            }
 
             return CurrentTime = time;
         }

From a289b7034f5df01ae442c65af5b8b01fe953a8c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 18:32:05 +0900
Subject: [PATCH 05703/10326] Add test helper functions to promote code share

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 14b0ca4d33..61bcea7bfa 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -59,21 +59,20 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddAssert("screen hasn't changed", () => Stack.CurrentScreen is Spectator);
 
-            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
-
+            start();
             sendFrames();
 
-            AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
-
+            waitForPlayer();
             AddAssert("ensure frames arrived", () => replayHandler.HasFrames);
 
             AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
-            AddAssert("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
-            sendFrames();
-            AddUntilStep("game resumed", () => !player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
+            checkPaused(true);
 
+            sendFrames();
+
+            checkPaused(false);
             AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
-            AddAssert("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
+            checkPaused(true);
         }
 
         [Test]
@@ -81,17 +80,19 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             loadSpectatingScreen();
 
-            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
-
-            AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
-
+            start();
+            waitForPlayer();
             AddUntilStep("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
+
+            sendFrames();
+
+            checkPaused(false);
         }
 
         [Test]
         public void TestSpectatingDuringGameplay()
         {
-            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            start();
             sendFrames();
             // should seek immediately to available frames
             loadSpectatingScreen();
@@ -102,9 +103,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             loadSpectatingScreen();
 
-            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            start();
             sendFrames();
-            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            start();
             sendFrames();
         }
 
@@ -113,10 +114,10 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             loadSpectatingScreen();
 
-            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            start();
             sendFrames();
 
-            // should replay until running out of frames then fail
+            // TODO: should replay until running out of frames then fail
         }
 
         [Test]
@@ -124,10 +125,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             loadSpectatingScreen();
 
-            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            start();
             sendFrames();
-            AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
-
+            waitForPlayer();
             // should immediately exit and unbind from streaming client
             AddStep("stop spectating", () => (Stack.CurrentScreen as Player)?.Exit());
 
@@ -139,11 +139,18 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             loadSpectatingScreen();
 
-            AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+            start();
             sendFrames();
             // player should never arrive.
         }
 
+        private void waitForPlayer() => AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
+
+        private void start() => AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+
+        private void checkPaused(bool state) =>
+            AddAssert($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
+
         private void sendFrames(int count = 10)
         {
             AddStep("send frames", () =>

From 42b3aa335904c97871e7b44fe34384a4e545109e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 18:56:28 +0900
Subject: [PATCH 05704/10326] Fix spectating when starting from a point that
 isn't at the beginning of the beatmap

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 10 ++++--
 .../Screens/Play/GameplayClockContainer.cs    | 25 +++++++++------
 osu.Game/Screens/Play/Player.cs               |  4 ++-
 osu.Game/Screens/Play/ReplayPlayer.cs         | 10 +++---
 osu.Game/Screens/Play/Spectator.cs            |  2 +-
 osu.Game/Screens/Play/SpectatorPlayer.cs      | 28 ++++++++++++++++
 .../Screens/Play/SpectatorPlayerLoader.cs     | 32 +++++++++++++++++++
 7 files changed, 93 insertions(+), 18 deletions(-)
 create mode 100644 osu.Game/Screens/Play/SpectatorPlayer.cs
 create mode 100644 osu.Game/Screens/Play/SpectatorPlayerLoader.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 61bcea7bfa..456fb0b110 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -93,9 +93,15 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestSpectatingDuringGameplay()
         {
             start();
-            sendFrames();
-            // should seek immediately to available frames
+
             loadSpectatingScreen();
+
+            AddStep("advance frame count", () => nextFrame = 300);
+            sendFrames();
+
+            waitForPlayer();
+
+            AddUntilStep("playing from correct point in time", () => player.ChildrenOfType<DrawableRuleset>().First().FrameStableClock.CurrentTime > 30000);
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6679e56871..6154ec67b8 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -37,6 +37,7 @@ namespace osu.Game.Screens.Play
         private readonly DecoupleableInterpolatingFramedClock adjustableClock;
 
         private readonly double gameplayStartTime;
+        private readonly bool startAtGameplayStart;
 
         private readonly double firstHitObjectTime;
 
@@ -62,10 +63,11 @@ namespace osu.Game.Screens.Play
 
         private readonly FramedOffsetClock platformOffsetClock;
 
-        public GameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime)
+        public GameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
         {
             this.beatmap = beatmap;
             this.gameplayStartTime = gameplayStartTime;
+            this.startAtGameplayStart = startAtGameplayStart;
             track = beatmap.Track;
 
             firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
@@ -103,16 +105,21 @@ namespace osu.Game.Screens.Play
             userAudioOffset.BindValueChanged(offset => userOffsetClock.Offset = offset.NewValue, true);
 
             // sane default provided by ruleset.
-            double startTime = Math.Min(0, gameplayStartTime);
+            double startTime = gameplayStartTime;
 
-            // if a storyboard is present, it may dictate the appropriate start time by having events in negative time space.
-            // this is commonly used to display an intro before the audio track start.
-            startTime = Math.Min(startTime, beatmap.Storyboard.FirstEventTime);
+            if (!startAtGameplayStart)
+            {
+                startTime = Math.Min(0, startTime);
 
-            // some beatmaps specify a current lead-in time which should be used instead of the ruleset-provided value when available.
-            // this is not available as an option in the live editor but can still be applied via .osu editing.
-            if (beatmap.BeatmapInfo.AudioLeadIn > 0)
-                startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
+                // if a storyboard is present, it may dictate the appropriate start time by having events in negative time space.
+                // this is commonly used to display an intro before the audio track start.
+                startTime = Math.Min(startTime, beatmap.Storyboard.FirstEventTime);
+
+                // some beatmaps specify a current lead-in time which should be used instead of the ruleset-provided value when available.
+                // this is not available as an option in the live editor but can still be applied via .osu editing.
+                if (beatmap.BeatmapInfo.AudioLeadIn > 0)
+                    startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
+            }
 
             Seek(startTime);
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 3e79ea0840..f9af1818d0 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -199,7 +199,7 @@ namespace osu.Game.Screens.Play
             if (!ScoreProcessor.Mode.Disabled)
                 config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
 
-            InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, DrawableRuleset.GameplayStartTime);
+            InternalChild = GameplayClockContainer = CreateGameplayClockContainer(Beatmap.Value, DrawableRuleset.GameplayStartTime);
 
             AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap));
             AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer));
@@ -288,6 +288,8 @@ namespace osu.Game.Screens.Play
             IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
         }
 
+        protected virtual GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart) => new GameplayClockContainer(beatmap, gameplayStart);
+
         private Drawable createUnderlayComponents() =>
             DimmableStoryboard = new DimmableStoryboard(Beatmap.Value.Storyboard) { RelativeSizeAxes = Axes.Both };
 
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 7f5c17a265..eeb3b509fe 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Screens.Play
 {
     public class ReplayPlayer : Player
     {
-        private readonly Score score;
+        protected readonly Score Score;
 
         // Disallow replays from failing. (see https://github.com/ppy/osu/issues/6108)
         protected override bool CheckModsAllowFailure() => false;
@@ -16,12 +16,12 @@ namespace osu.Game.Screens.Play
         public ReplayPlayer(Score score, bool allowPause = true, bool showResults = true)
             : base(allowPause, showResults)
         {
-            this.score = score;
+            this.Score = score;
         }
 
         protected override void PrepareReplay()
         {
-            DrawableRuleset?.SetReplayScore(score);
+            DrawableRuleset?.SetReplayScore(Score);
         }
 
         protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
@@ -31,9 +31,9 @@ namespace osu.Game.Screens.Play
             var baseScore = base.CreateScore();
 
             // Since the replay score doesn't contain statistics, we'll pass them through here.
-            score.ScoreInfo.HitEvents = baseScore.HitEvents;
+            Score.ScoreInfo.HitEvents = baseScore.HitEvents;
 
-            return score.ScoreInfo;
+            return Score.ScoreInfo;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 522a636dfb..dcbf502fb2 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Play
             ruleset.Value = resolvedRuleset.RulesetInfo;
             beatmap.Value = beatmaps.GetWorkingBeatmap(resolvedBeatmap);
 
-            this.Push(new ReplayPlayerLoader(new Score
+            this.Push(new SpectatorPlayerLoader(new Score
             {
                 ScoreInfo = scoreInfo,
                 Replay = replay,
diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
new file mode 100644
index 0000000000..89e5f8f2dc
--- /dev/null
+++ b/osu.Game/Screens/Play/SpectatorPlayer.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.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Play
+{
+    public class SpectatorPlayer : ReplayPlayer
+    {
+        public SpectatorPlayer(Score score)
+            : base(score)
+        {
+        }
+
+        protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
+        {
+            // if we already have frames, start gameplay at the point in time they exist, should they be too far into the beatmap.
+            double? firstFrameTime = Score.Replay.Frames.FirstOrDefault()?.Time;
+
+            if (firstFrameTime == null || firstFrameTime <= gameplayStart + 5000)
+                return base.CreateGameplayClockContainer(beatmap, gameplayStart);
+
+            return new GameplayClockContainer(beatmap, firstFrameTime.Value, true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/SpectatorPlayerLoader.cs b/osu.Game/Screens/Play/SpectatorPlayerLoader.cs
new file mode 100644
index 0000000000..580af81166
--- /dev/null
+++ b/osu.Game/Screens/Play/SpectatorPlayerLoader.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 System;
+using osu.Framework.Screens;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Play
+{
+    public class SpectatorPlayerLoader : PlayerLoader
+    {
+        public readonly ScoreInfo Score;
+
+        public SpectatorPlayerLoader(Score score)
+            : base(() => new SpectatorPlayer(score))
+        {
+            if (score.Replay == null)
+                throw new ArgumentException($"{nameof(score)} must have a non-null {nameof(score.Replay)}.", nameof(score));
+
+            Score = score.ScoreInfo;
+        }
+
+        public override void OnEntering(IScreen last)
+        {
+            // these will be reverted thanks to PlayerLoader's lease.
+            Mods.Value = Score.Mods;
+            Ruleset.Value = Score.Ruleset;
+
+            base.OnEntering(last);
+        }
+    }
+}

From 2cacdaa11b4c530c425d430a25f613830e112e0a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 19:23:35 +0900
Subject: [PATCH 05705/10326] Add basic beatmap download and play flow

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 18 ++--
 osu.Game/Screens/Play/Spectator.cs            | 89 ++++++++++++++++++-
 2 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 456fb0b110..458fc1e58b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(SpectatorStreamingClient))]
         private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
 
+        // used just to show beatmap card for the time being.
+        protected override bool UseOnlineAPI => true;
+
         private Spectator spectatorScreen;
 
         [Resolved]
@@ -134,9 +137,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             start();
             sendFrames();
             waitForPlayer();
+
             // should immediately exit and unbind from streaming client
             AddStep("stop spectating", () => (Stack.CurrentScreen as Player)?.Exit());
-
             AddUntilStep("spectating stopped", () => spectatorScreen.GetParentScreen() == null);
         }
 
@@ -145,14 +148,15 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             loadSpectatingScreen();
 
-            start();
+            start(88);
             sendFrames();
-            // player should never arrive.
+
+            AddAssert("screen didn't change", () => Stack.CurrentScreen is Spectator);
         }
 
         private void waitForPlayer() => AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
 
-        private void start() => AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
+        private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(beatmapId));
 
         private void checkPaused(bool state) =>
             AddAssert($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
@@ -176,7 +180,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public readonly User StreamingUser = new User { Id = 1234, Username = "Test user" };
 
-            public void StartPlay() => sendState();
+            public void StartPlay(int? beatmapId = null) => sendState(beatmapId);
 
             public void EndPlay()
             {
@@ -218,12 +222,12 @@ namespace osu.Game.Tests.Visual.Gameplay
                 base.WatchUser(userId);
             }
 
-            private void sendState()
+            private void sendState(int? beatmapId = null)
             {
                 sentState = true;
                 ((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState
                 {
-                    BeatmapID = beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,
+                    BeatmapID = beatmapId ?? beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,
                     RulesetID = 0,
                 });
             }
diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index dcbf502fb2..dd6b434889 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -8,10 +8,15 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.Spectator;
+using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -19,6 +24,7 @@ using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Scoring;
 using osu.Game.Users;
+using osuTK;
 
 namespace osu.Game.Screens.Play
 {
@@ -35,6 +41,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; }
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         [Resolved]
         private SpectatorStreamingClient spectatorStreaming { get; set; }
 
@@ -46,6 +55,12 @@ namespace osu.Game.Screens.Play
 
         private Replay replay;
 
+        private Container beatmapPanelContainer;
+
+        private SpectatorState state;
+
+        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
+
         public Spectator([NotNull] User targetUser)
         {
             this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
@@ -56,11 +71,42 @@ namespace osu.Game.Screens.Play
         {
             InternalChildren = new Drawable[]
             {
-                new OsuSpriteText
+                new FillFlowContainer
                 {
-                    Text = $"Watching {targetUser}",
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    Spacing = new Vector2(15),
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Text = "Currently spectating",
+                            Font = OsuFont.Default.With(size: 30),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                        new UserGridPanel(targetUser)
+                        {
+                            Width = 290,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                        new OsuSpriteText
+                        {
+                            Text = "playing",
+                            Font = OsuFont.Default.With(size: 30),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                        beatmapPanelContainer = new Container
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                    }
                 },
             };
         }
@@ -74,6 +120,15 @@ namespace osu.Game.Screens.Play
             spectatorStreaming.OnNewFrames += userSentFrames;
 
             spectatorStreaming.WatchUser((int)targetUser.Id);
+
+            managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
+            managerUpdated.BindValueChanged(beatmapUpdated);
+        }
+
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> beatmap)
+        {
+            if (beatmap.NewValue.TryGetTarget(out var beatmapSet) && beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == state.BeatmapID))
+                attemptStart();
         }
 
         private void userSentFrames(int userId, FrameDataBundle data)
@@ -107,16 +162,31 @@ namespace osu.Game.Screens.Play
 
             replay ??= new Replay { HasReceivedAllFrames = false };
 
+            this.state = state;
+
+            attemptStart();
+        }
+
+        private void attemptStart()
+        {
             var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == state.RulesetID)?.CreateInstance();
 
             // ruleset not available
             if (resolvedRuleset == null)
                 return;
 
+            if (state.BeatmapID == null)
+                return;
+
+            this.MakeCurrent();
+
             var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == state.BeatmapID);
 
             if (resolvedBeatmap == null)
+            {
+                showBeatmapPanel(state.BeatmapID.Value);
                 return;
+            }
 
             var scoreInfo = new ScoreInfo
             {
@@ -125,8 +195,6 @@ namespace osu.Game.Screens.Play
                 Ruleset = resolvedRuleset.RulesetInfo,
             };
 
-            this.MakeCurrent();
-
             ruleset.Value = resolvedRuleset.RulesetInfo;
             beatmap.Value = beatmaps.GetWorkingBeatmap(resolvedBeatmap);
 
@@ -137,6 +205,17 @@ namespace osu.Game.Screens.Play
             }));
         }
 
+        private void showBeatmapPanel(int beatmapId)
+        {
+            var req = new GetBeatmapSetRequest(beatmapId, BeatmapSetLookupType.BeatmapId);
+            req.Success += res => Schedule(() =>
+            {
+                beatmapPanelContainer.Child = new GridBeatmapPanel(res.ToBeatmapSet(rulesets));
+            });
+
+            api.Queue(req);
+        }
+
         private void userFinishedPlaying(int userId, SpectatorState state)
         {
             if (replay == null) return;
@@ -156,6 +235,8 @@ namespace osu.Game.Screens.Play
 
                 spectatorStreaming.StopWatchingUser((int)targetUser.Id);
             }
+
+            managerUpdated.UnbindAll();
         }
     }
 }

From a96c067bead52c21d4950c1d29717b611b077b31 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 27 Oct 2020 13:45:21 +0100
Subject: [PATCH 05706/10326] Remove uncessary async-await state machine level.

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

diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index b7657c73c6..746aa67a55 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -24,14 +24,14 @@ namespace osu.Game.Scoring
         /// </summary>
         /// <param name="score">The score to do the calculation on. </param>
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
-        public async Task<double?> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default)
+        public Task<double?> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default)
         {
             var lookupKey = new PerformanceCacheLookup(score);
 
             if (performanceCache.TryGetValue(lookupKey, out double performance))
-                return performance;
+                return Task.FromResult((double?)performance);
 
-            return await computePerformanceAsync(score, lookupKey, token);
+            return computePerformanceAsync(score, lookupKey, token);
         }
 
         private async Task<double?> computePerformanceAsync(ScoreInfo score, PerformanceCacheLookup lookupKey, CancellationToken token = default)

From d5e0fa322b794f987785063f2b5588d63e9f4a14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 22:30:45 +0900
Subject: [PATCH 05707/10326] Fix a couple of inspections

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs | 2 +-
 osu.Game/Screens/Play/ReplayPlayer.cs                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 458fc1e58b..a716b0c06b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuGameBase game { get; set; }
 
-        private int nextFrame = 0;
+        private int nextFrame;
 
         public override void SetUpSteps()
         {
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index eeb3b509fe..3a4298f22d 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play
         public ReplayPlayer(Score score, bool allowPause = true, bool showResults = true)
             : base(allowPause, showResults)
         {
-            this.Score = score;
+            Score = score;
         }
 
         protected override void PrepareReplay()

From 064c50c3ac8642803c91b6a08a11ea5d64f1d796 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 27 Oct 2020 12:39:50 +0100
Subject: [PATCH 05708/10326] Expose currentZoom to fix selection box wiggle

---
 .../Components/Timeline/TimelineBlueprintContainer.cs  | 10 +++++-----
 .../Components/Timeline/ZoomableScrollContainer.cs     |  8 +++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index b76032709f..008da14a21 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -139,6 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private class TimelineDragBox : DragBox
         {
             private Vector2 lastMouseDown;
+
             private float? lastZoom;
             private float localMouseDown;
 
@@ -166,13 +166,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     lastZoom = null;
                 }
 
-                //Zooming the timeline shifts the coordinate system this compensates for this shift
-                float zoomCorrection = lastZoom.HasValue ? (parent.timeline.Zoom / lastZoom.Value) : 1;
+                //Zooming the timeline shifts the coordinate system. zoomCorrection compensates for that
+                float zoomCorrection = lastZoom.HasValue ? (parent.timeline.CurrentZoom / lastZoom.Value) : 1;
                 localMouseDown *= zoomCorrection;
-                lastZoom = parent.timeline.Zoom;
+                lastZoom = parent.timeline.CurrentZoom;
 
                 float selection1 = localMouseDown;
-                float selection2 = e.MousePosition.X;
+                float selection2 = e.MousePosition.X * zoomCorrection;
 
                 Box.X = Math.Min(selection1, selection2);
                 Box.Width = Math.Abs(selection1 - selection2);
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 227eecf9c7..6a9552a2c4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -29,9 +29,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private readonly Container zoomedContent;
         protected override Container<Drawable> Content => zoomedContent;
-
         private float currentZoom = 1;
 
+        /// <summary>
+        /// The current zoom level of <see cref="ZoomableScrollContainer" />.
+        /// It may differ from <see cref="Zoom" /> during transitions.
+        /// </summary>
+        public float CurrentZoom => currentZoom;
+
+
         [Resolved(canBeNull: true)]
         private IFrameBasedClock editorClock { get; set; }
 

From 983a2774e89c4e973c28c08bba669e9ae25f3096 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 27 Oct 2020 15:09:10 +0100
Subject: [PATCH 05709/10326] Code Formatting

---
 .../Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 6a9552a2c4..f90658e99c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -37,7 +37,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         /// </summary>
         public float CurrentZoom => currentZoom;
 
-
         [Resolved(canBeNull: true)]
         private IFrameBasedClock editorClock { get; set; }
 

From 742a96484befff6d8c137cd749cfd648c7c65992 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 27 Oct 2020 20:13:18 +0300
Subject: [PATCH 05710/10326] Add ability to set extra parameters to
 SearchBeatmapSetsRequest

---
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 28 ++++++++++++++++++-
 .../Overlays/BeatmapListing/SearchExtra.cs    | 13 +++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/SearchExtra.cs

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index dde45b5aeb..f8cf747757 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Online.API.Requests
 
         public SearchLanguage Language { get; }
 
+        public SearchExtra Extra { get; }
+
         private readonly string query;
         private readonly RulesetInfo ruleset;
         private readonly Cursor cursor;
@@ -35,7 +37,8 @@ namespace osu.Game.Online.API.Requests
             SortCriteria sortCriteria = SortCriteria.Ranked,
             SortDirection sortDirection = SortDirection.Descending,
             SearchGenre genre = SearchGenre.Any,
-            SearchLanguage language = SearchLanguage.Any)
+            SearchLanguage language = SearchLanguage.Any,
+            SearchExtra extra = SearchExtra.Any)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
@@ -46,6 +49,7 @@ namespace osu.Game.Online.API.Requests
             SortDirection = sortDirection;
             Genre = genre;
             Language = language;
+            Extra = extra;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -68,6 +72,28 @@ namespace osu.Game.Online.API.Requests
 
             req.AddCursor(cursor);
 
+            if (Extra != SearchExtra.Any)
+            {
+                string extraString = string.Empty;
+
+                switch (Extra)
+                {
+                    case SearchExtra.Both:
+                        extraString = "video.storyboard";
+                        break;
+
+                    case SearchExtra.Storyboard:
+                        extraString = "storyboard";
+                        break;
+
+                    case SearchExtra.Video:
+                        extraString = "video";
+                        break;
+                }
+
+                req.AddParameter("e", extraString);
+            }
+
             return req;
         }
 
diff --git a/osu.Game/Overlays/BeatmapListing/SearchExtra.cs b/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
new file mode 100644
index 0000000000..fd4896c46e
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SearchExtra.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.
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public enum SearchExtra
+    {
+        Video,
+        Storyboard,
+        Both,
+        Any
+    }
+}

From 26a60d898cfd3404275ad59021931bf4a03ec94a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 27 Oct 2020 21:22:20 +0300
Subject: [PATCH 05711/10326] Implement BeatmapSearchExtraFilterRow

---
 .../TestSceneBeatmapListingSearchControl.cs   |   3 +
 .../BeatmapListingFilterControl.cs            |   4 +-
 .../BeatmapListingSearchControl.cs            |   4 +
 .../BeatmapSearchExtraFilterRow.cs            |  97 +++++++++++++
 .../BeatmapListing/BeatmapSearchFilterRow.cs  | 127 +++++++++---------
 .../BeatmapSearchRulesetFilterRow.cs          |   3 +-
 .../Overlays/BeatmapListing/SearchExtra.cs    |   4 +-
 7 files changed, 176 insertions(+), 66 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index a4698a9a32..9a410dd18c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuSpriteText category;
             OsuSpriteText genre;
             OsuSpriteText language;
+            OsuSpriteText extra;
 
             Add(control = new BeatmapListingSearchControl
             {
@@ -46,6 +47,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     category = new OsuSpriteText(),
                     genre = new OsuSpriteText(),
                     language = new OsuSpriteText(),
+                    extra = new OsuSpriteText()
                 }
             });
 
@@ -54,6 +56,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.Category.BindValueChanged(c => category.Text = $"Category: {c.NewValue}", true);
             control.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);
             control.Language.BindValueChanged(l => language.Text = $"Language: {l.NewValue}", true);
+            control.Extra.BindValueChanged(e => extra.Text = $"Extra: {e.NewValue}", true);
         }
 
         [Test]
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 494a0df8f8..37fbfe7093 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -130,6 +130,7 @@ namespace osu.Game.Overlays.BeatmapListing
             searchControl.Category.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Genre.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Language.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.Extra.BindValueChanged(_ => queueUpdateSearch());
 
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
@@ -179,7 +180,8 @@ namespace osu.Game.Overlays.BeatmapListing
                 sortControl.Current.Value,
                 sortControl.SortDirection.Value,
                 searchControl.Genre.Value,
-                searchControl.Language.Value);
+                searchControl.Language.Value,
+                searchControl.Extra.Value);
 
             getSetsRequest.Success += response =>
             {
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 29c4fe0d2e..437c26e36d 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<SearchLanguage> Language => languageFilter.Current;
 
+        public Bindable<SearchExtra> Extra => extraFilter.Current;
+
         public BeatmapSetInfo BeatmapSet
         {
             set
@@ -48,6 +50,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchFilterRow<SearchCategory> categoryFilter;
         private readonly BeatmapSearchFilterRow<SearchGenre> genreFilter;
         private readonly BeatmapSearchFilterRow<SearchLanguage> languageFilter;
+        private readonly BeatmapSearchExtraFilterRow extraFilter;
 
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
@@ -105,6 +108,7 @@ namespace osu.Game.Overlays.BeatmapListing
                                     categoryFilter = new BeatmapSearchFilterRow<SearchCategory>(@"Categories"),
                                     genreFilter = new BeatmapSearchFilterRow<SearchGenre>(@"Genre"),
                                     languageFilter = new BeatmapSearchFilterRow<SearchLanguage>(@"Language"),
+                                    extraFilter = new BeatmapSearchExtraFilterRow()
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs
new file mode 100644
index 0000000000..6e81cd2976
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.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 System;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osuTK;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapSearchExtraFilterRow : BeatmapSearchFilterRow<SearchExtra>
+    {
+        public BeatmapSearchExtraFilterRow()
+            : base("Extra")
+        {
+        }
+
+        protected override Drawable CreateFilter() => new ExtraFilter();
+
+        private class ExtraFilter : FillFlowContainer<ExtraFilterTabItem>, IHasCurrentValue<SearchExtra>
+        {
+            private readonly BindableWithCurrent<SearchExtra> current = new BindableWithCurrent<SearchExtra>();
+
+            public Bindable<SearchExtra> Current
+            {
+                get => current.Current;
+                set => current.Current = value;
+            }
+
+            private readonly ExtraFilterTabItem videoItem;
+            private readonly ExtraFilterTabItem storyboardItem;
+
+            public ExtraFilter()
+            {
+                Anchor = Anchor.BottomLeft;
+                Origin = Anchor.BottomLeft;
+                RelativeSizeAxes = Axes.X;
+                Height = 15;
+                Spacing = new Vector2(10, 0);
+                AddRange(new[]
+                {
+                    videoItem = new ExtraFilterTabItem(SearchExtra.Video),
+                    storyboardItem = new ExtraFilterTabItem(SearchExtra.Storyboard)
+                });
+
+                foreach (var item in Children)
+                    item.StateUpdated += updateBindable;
+            }
+
+            private void updateBindable()
+            {
+                if (videoItem.Active.Value && storyboardItem.Active.Value)
+                {
+                    Current.Value = SearchExtra.Both;
+                    return;
+                }
+
+                if (videoItem.Active.Value)
+                {
+                    Current.Value = SearchExtra.Video;
+                    return;
+                }
+
+                if (storyboardItem.Active.Value)
+                {
+                    Current.Value = SearchExtra.Storyboard;
+                    return;
+                }
+
+                Current.Value = SearchExtra.Any;
+            }
+        }
+
+        private class ExtraFilterTabItem : FilterTabItem
+        {
+            public event Action StateUpdated;
+
+            public ExtraFilterTabItem(SearchExtra value)
+                : base(value)
+            {
+                Active.BindValueChanged(_ => StateUpdated?.Invoke());
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                base.OnClick(e);
+                Active.Value = !Active.Value;
+                return true;
+            }
+
+            protected override string CreateText(SearchExtra value) => $@"Has {value.ToString()}";
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index 45ef793deb..ad32475b25 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public BeatmapSearchFilterRow(string headerName)
         {
+            Drawable filter;
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
             AddInternal(new GridContainer
@@ -49,7 +50,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 },
                 Content = new[]
                 {
-                    new Drawable[]
+                    new[]
                     {
                         new OsuSpriteText
                         {
@@ -58,17 +59,17 @@ namespace osu.Game.Overlays.BeatmapListing
                             Font = OsuFont.GetFont(size: 13),
                             Text = headerName.Titleize()
                         },
-                        CreateFilter().With(f =>
-                        {
-                            f.Current = current;
-                        })
+                        filter = CreateFilter()
                     }
                 }
             });
+
+            if (filter is IHasCurrentValue<T> filterWithValue)
+                filterWithValue.Current = current;
         }
 
         [NotNull]
-        protected virtual BeatmapSearchFilter CreateFilter() => new BeatmapSearchFilter();
+        protected virtual Drawable CreateFilter() => new BeatmapSearchFilter();
 
         protected class BeatmapSearchFilter : TabControl<T>
         {
@@ -99,62 +100,6 @@ namespace osu.Game.Overlays.BeatmapListing
 
             protected override TabItem<T> CreateTabItem(T value) => new FilterTabItem(value);
 
-            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;
-                    Anchor = Anchor.BottomLeft;
-                    Origin = Anchor.BottomLeft;
-                    AddRangeInternal(new Drawable[]
-                    {
-                        text = new OsuSpriteText
-                        {
-                            Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
-                            Text = (value as Enum)?.GetDescription() ?? value.ToString()
-                        },
-                        new HoverClickSounds()
-                    });
-
-                    Enabled.Value = true;
-                }
-
-                [BackgroundDependencyLoader]
-                private void load()
-                {
-                    updateState();
-                }
-
-                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;
-            }
-
             private class FilterDropdown : OsuTabDropdown<T>
             {
                 protected override DropdownHeader CreateHeader() => new FilterHeader
@@ -172,5 +117,63 @@ namespace osu.Game.Overlays.BeatmapListing
                 }
             }
         }
+
+        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;
+                Anchor = Anchor.BottomLeft;
+                Origin = Anchor.BottomLeft;
+                AddRangeInternal(new Drawable[]
+                {
+                    text = new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
+                        Text = CreateText(value)
+                    },
+                    new HoverClickSounds()
+                });
+
+                Enabled.Value = true;
+            }
+
+            protected virtual string CreateText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                updateState();
+            }
+
+            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/BeatmapSearchRulesetFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
index eebd896cf9..a8dc088e52 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.BeatmapListing
@@ -13,7 +14,7 @@ namespace osu.Game.Overlays.BeatmapListing
         {
         }
 
-        protected override BeatmapSearchFilter CreateFilter() => new RulesetFilter();
+        protected override Drawable CreateFilter() => new RulesetFilter();
 
         private class RulesetFilter : BeatmapSearchFilter
         {
diff --git a/osu.Game/Overlays/BeatmapListing/SearchExtra.cs b/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
index fd4896c46e..53900211e1 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
@@ -5,9 +5,9 @@ namespace osu.Game.Overlays.BeatmapListing
 {
     public enum SearchExtra
     {
+        Any,
         Video,
         Storyboard,
-        Both,
-        Any
+        Both
     }
 }

From 1b40b56d41081be1a199bea0889727360e57de1c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 27 Oct 2020 21:30:53 +0300
Subject: [PATCH 05712/10326] Add ability to search by play criteria

---
 .../TestSceneBeatmapListingSearchControl.cs          |  5 ++++-
 .../Online/API/Requests/SearchBeatmapSetsRequest.cs  |  9 ++++++++-
 .../BeatmapListing/BeatmapListingFilterControl.cs    |  4 +++-
 .../BeatmapListing/BeatmapListingSearchControl.cs    |  6 +++++-
 osu.Game/Overlays/BeatmapListing/SearchPlayed.cs     | 12 ++++++++++++
 5 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/SearchPlayed.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index 9a410dd18c..5c9431aad1 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuSpriteText genre;
             OsuSpriteText language;
             OsuSpriteText extra;
+            OsuSpriteText played;
 
             Add(control = new BeatmapListingSearchControl
             {
@@ -47,7 +48,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                     category = new OsuSpriteText(),
                     genre = new OsuSpriteText(),
                     language = new OsuSpriteText(),
-                    extra = new OsuSpriteText()
+                    extra = new OsuSpriteText(),
+                    played = new OsuSpriteText()
                 }
             });
 
@@ -57,6 +59,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);
             control.Language.BindValueChanged(l => language.Text = $"Language: {l.NewValue}", true);
             control.Extra.BindValueChanged(e => extra.Text = $"Extra: {e.NewValue}", true);
+            control.Played.BindValueChanged(p => played.Text = $"Played: {p.NewValue}", true);
         }
 
         [Test]
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index f8cf747757..12383e7457 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Online.API.Requests
 
         public SearchExtra Extra { get; }
 
+        public SearchPlayed Played { get; }
+
         private readonly string query;
         private readonly RulesetInfo ruleset;
         private readonly Cursor cursor;
@@ -38,7 +40,8 @@ namespace osu.Game.Online.API.Requests
             SortDirection sortDirection = SortDirection.Descending,
             SearchGenre genre = SearchGenre.Any,
             SearchLanguage language = SearchLanguage.Any,
-            SearchExtra extra = SearchExtra.Any)
+            SearchExtra extra = SearchExtra.Any,
+            SearchPlayed played = SearchPlayed.Any)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
@@ -50,6 +53,7 @@ namespace osu.Game.Online.API.Requests
             Genre = genre;
             Language = language;
             Extra = extra;
+            Played = played;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -94,6 +98,9 @@ namespace osu.Game.Online.API.Requests
                 req.AddParameter("e", extraString);
             }
 
+            if (Played != SearchPlayed.Any)
+                req.AddParameter("played", Played.ToString().ToLowerInvariant());
+
             return req;
         }
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 37fbfe7093..3f09a7e3d1 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -131,6 +131,7 @@ namespace osu.Game.Overlays.BeatmapListing
             searchControl.Genre.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Language.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Extra.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.Played.BindValueChanged(_ => queueUpdateSearch());
 
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
@@ -181,7 +182,8 @@ namespace osu.Game.Overlays.BeatmapListing
                 sortControl.SortDirection.Value,
                 searchControl.Genre.Value,
                 searchControl.Language.Value,
-                searchControl.Extra.Value);
+                searchControl.Extra.Value,
+                searchControl.Played.Value);
 
             getSetsRequest.Success += response =>
             {
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 437c26e36d..80beed6217 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<SearchExtra> Extra => extraFilter.Current;
 
+        public Bindable<SearchPlayed> Played => playedFilter.Current;
+
         public BeatmapSetInfo BeatmapSet
         {
             set
@@ -51,6 +53,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchFilterRow<SearchGenre> genreFilter;
         private readonly BeatmapSearchFilterRow<SearchLanguage> languageFilter;
         private readonly BeatmapSearchExtraFilterRow extraFilter;
+        private readonly BeatmapSearchFilterRow<SearchPlayed> playedFilter;
 
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
@@ -108,7 +111,8 @@ namespace osu.Game.Overlays.BeatmapListing
                                     categoryFilter = new BeatmapSearchFilterRow<SearchCategory>(@"Categories"),
                                     genreFilter = new BeatmapSearchFilterRow<SearchGenre>(@"Genre"),
                                     languageFilter = new BeatmapSearchFilterRow<SearchLanguage>(@"Language"),
-                                    extraFilter = new BeatmapSearchExtraFilterRow()
+                                    extraFilter = new BeatmapSearchExtraFilterRow(),
+                                    playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played")
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/BeatmapListing/SearchPlayed.cs b/osu.Game/Overlays/BeatmapListing/SearchPlayed.cs
new file mode 100644
index 0000000000..eb7fb46158
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SearchPlayed.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.Overlays.BeatmapListing
+{
+    public enum SearchPlayed
+    {
+        Any,
+        Played,
+        Unplayed
+    }
+}

From 44471b4596bab45dea5ed4350c763d4522cfe35c Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 27 Oct 2020 20:19:15 +0100
Subject: [PATCH 05713/10326] Fix tests not building.

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

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 1c0af19322..9ef9649f77 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -192,7 +192,6 @@ namespace osu.Game.Tests.Visual.Background
 
             AddStep("Transition to Results", () => player.Push(results = new FadeAccessibleResults(new ScoreInfo
             {
-                Ruleset = new OsuRuleset().RulesetInfo,
                 User = new User { Username = "osu!" },
                 Beatmap = new TestBeatmap(Ruleset.Value).BeatmapInfo,
                 Ruleset = Ruleset.Value,

From 1710b396e7195f34b024166d74129701ffc21eac Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 27 Oct 2020 22:27:29 +0300
Subject: [PATCH 05714/10326] Implement BeatmapSearchMultipleSelectionFilterRow

---
 .../TestSceneBeatmapListingSearchControl.cs   |  3 +-
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 33 ++------
 .../BeatmapListingSearchControl.cs            |  3 +-
 .../BeatmapSearchExtraFilterRow.cs            | 79 ++----------------
 .../BeatmapListing/BeatmapSearchFilterRow.cs  | 64 +-------------
 ...BeatmapSearchMultipleSelectionFilterRow.cs | 83 +++++++++++++++++++
 .../Overlays/BeatmapListing/FilterTabItem.cs  | 74 +++++++++++++++++
 .../Overlays/BeatmapListing/SearchExtra.cs    |  4 +-
 8 files changed, 179 insertions(+), 164 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/FilterTabItem.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index 5c9431aad1..9b0ef4d6f2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -58,7 +59,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.Category.BindValueChanged(c => category.Text = $"Category: {c.NewValue}", true);
             control.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);
             control.Language.BindValueChanged(l => language.Text = $"Language: {l.NewValue}", true);
-            control.Extra.BindValueChanged(e => extra.Text = $"Extra: {e.NewValue}", true);
+            control.Extra.BindValueChanged(e => extra.Text = $"Extra: {(e.NewValue == null ? "" : string.Join(".", e.NewValue.Select(i => i.ToString().ToLowerInvariant())))}", true);
             control.Played.BindValueChanged(p => played.Text = $"Played: {p.NewValue}", true);
         }
 
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 12383e7457..20bbd46529 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.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.IO.Network;
 using osu.Game.Extensions;
 using osu.Game.Overlays;
@@ -21,7 +23,7 @@ namespace osu.Game.Online.API.Requests
 
         public SearchLanguage Language { get; }
 
-        public SearchExtra Extra { get; }
+        public List<SearchExtra> Extra { get; }
 
         public SearchPlayed Played { get; }
 
@@ -40,7 +42,7 @@ namespace osu.Game.Online.API.Requests
             SortDirection sortDirection = SortDirection.Descending,
             SearchGenre genre = SearchGenre.Any,
             SearchLanguage language = SearchLanguage.Any,
-            SearchExtra extra = SearchExtra.Any,
+            List<SearchExtra> extra = null,
             SearchPlayed played = SearchPlayed.Any)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
@@ -74,33 +76,14 @@ namespace osu.Game.Online.API.Requests
 
             req.AddParameter("sort", $"{SortCriteria.ToString().ToLowerInvariant()}_{directionString}");
 
-            req.AddCursor(cursor);
-
-            if (Extra != SearchExtra.Any)
-            {
-                string extraString = string.Empty;
-
-                switch (Extra)
-                {
-                    case SearchExtra.Both:
-                        extraString = "video.storyboard";
-                        break;
-
-                    case SearchExtra.Storyboard:
-                        extraString = "storyboard";
-                        break;
-
-                    case SearchExtra.Video:
-                        extraString = "video";
-                        break;
-                }
-
-                req.AddParameter("e", extraString);
-            }
+            if (Extra != null && Extra.Any())
+                req.AddParameter("e", string.Join(".", Extra.Select(e => e.ToString().ToLowerInvariant())));
 
             if (Played != SearchPlayed.Any)
                 req.AddParameter("played", Played.ToString().ToLowerInvariant());
 
+            req.AddCursor(cursor);
+
             return req;
         }
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 80beed6217..f390db3f35 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osuTK.Graphics;
 using osu.Game.Rulesets;
+using System.Collections.Generic;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -28,7 +29,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<SearchLanguage> Language => languageFilter.Current;
 
-        public Bindable<SearchExtra> Extra => extraFilter.Current;
+        public Bindable<List<SearchExtra>> Extra => extraFilter.Current;
 
         public Bindable<SearchPlayed> Played => playedFilter.Current;
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs
index 6e81cd2976..385978096c 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs
@@ -1,94 +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 System;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osuTK;
-
 namespace osu.Game.Overlays.BeatmapListing
 {
-    public class BeatmapSearchExtraFilterRow : BeatmapSearchFilterRow<SearchExtra>
+    public class BeatmapSearchExtraFilterRow : BeatmapSearchMultipleSelectionFilterRow<SearchExtra>
     {
         public BeatmapSearchExtraFilterRow()
             : base("Extra")
         {
         }
 
-        protected override Drawable CreateFilter() => new ExtraFilter();
+        protected override MultipleSelectionFilter CreateMultipleSelectionFilter() => new ExtraFilter();
 
-        private class ExtraFilter : FillFlowContainer<ExtraFilterTabItem>, IHasCurrentValue<SearchExtra>
+        private class ExtraFilter : MultipleSelectionFilter
         {
-            private readonly BindableWithCurrent<SearchExtra> current = new BindableWithCurrent<SearchExtra>();
-
-            public Bindable<SearchExtra> Current
+            protected override MultipleSelectionFilterTabItem[] CreateItems() => new[]
             {
-                get => current.Current;
-                set => current.Current = value;
-            }
-
-            private readonly ExtraFilterTabItem videoItem;
-            private readonly ExtraFilterTabItem storyboardItem;
-
-            public ExtraFilter()
-            {
-                Anchor = Anchor.BottomLeft;
-                Origin = Anchor.BottomLeft;
-                RelativeSizeAxes = Axes.X;
-                Height = 15;
-                Spacing = new Vector2(10, 0);
-                AddRange(new[]
-                {
-                    videoItem = new ExtraFilterTabItem(SearchExtra.Video),
-                    storyboardItem = new ExtraFilterTabItem(SearchExtra.Storyboard)
-                });
-
-                foreach (var item in Children)
-                    item.StateUpdated += updateBindable;
-            }
-
-            private void updateBindable()
-            {
-                if (videoItem.Active.Value && storyboardItem.Active.Value)
-                {
-                    Current.Value = SearchExtra.Both;
-                    return;
-                }
-
-                if (videoItem.Active.Value)
-                {
-                    Current.Value = SearchExtra.Video;
-                    return;
-                }
-
-                if (storyboardItem.Active.Value)
-                {
-                    Current.Value = SearchExtra.Storyboard;
-                    return;
-                }
-
-                Current.Value = SearchExtra.Any;
-            }
+                new ExtraFilterTabItem(SearchExtra.Video),
+                new ExtraFilterTabItem(SearchExtra.Storyboard)
+            };
         }
 
-        private class ExtraFilterTabItem : FilterTabItem
+        private class ExtraFilterTabItem : MultipleSelectionFilterTabItem
         {
-            public event Action StateUpdated;
-
             public ExtraFilterTabItem(SearchExtra value)
                 : base(value)
             {
-                Active.BindValueChanged(_ => StateUpdated?.Invoke());
-            }
-
-            protected override bool OnClick(ClickEvent e)
-            {
-                base.OnClick(e);
-                Active.Value = !Active.Value;
-                return true;
             }
 
             protected override string CreateText(SearchExtra value) => $@"Has {value.ToString()}";
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index ad32475b25..aa0fc0d00e 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -1,20 +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;
 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;
 using Humanizer;
 using osu.Game.Utils;
 
@@ -98,7 +94,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
             protected override Dropdown<T> CreateDropdown() => new FilterDropdown();
 
-            protected override TabItem<T> CreateTabItem(T value) => new FilterTabItem(value);
+            protected override TabItem<T> CreateTabItem(T value) => new FilterTabItem<T>(value);
 
             private class FilterDropdown : OsuTabDropdown<T>
             {
@@ -117,63 +113,5 @@ namespace osu.Game.Overlays.BeatmapListing
                 }
             }
         }
-
-        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;
-                Anchor = Anchor.BottomLeft;
-                Origin = Anchor.BottomLeft;
-                AddRangeInternal(new Drawable[]
-                {
-                    text = new OsuSpriteText
-                    {
-                        Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
-                        Text = CreateText(value)
-                    },
-                    new HoverClickSounds()
-                });
-
-                Enabled.Value = true;
-            }
-
-            protected virtual string CreateText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                updateState();
-            }
-
-            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/BeatmapSearchMultipleSelectionFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
new file mode 100644
index 0000000000..c434e00ff3
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.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 System;
+using System.Collections.Generic;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osuTK;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public abstract class BeatmapSearchMultipleSelectionFilterRow<T> : BeatmapSearchFilterRow<List<T>>
+    {
+        public BeatmapSearchMultipleSelectionFilterRow(string headerName)
+            : base(headerName)
+        {
+        }
+
+        protected override Drawable CreateFilter() => CreateMultipleSelectionFilter();
+
+        protected abstract MultipleSelectionFilter CreateMultipleSelectionFilter();
+
+        protected abstract class MultipleSelectionFilter : FillFlowContainer<MultipleSelectionFilterTabItem>, IHasCurrentValue<List<T>>
+        {
+            private readonly BindableWithCurrent<List<T>> current = new BindableWithCurrent<List<T>>();
+
+            public Bindable<List<T>> Current
+            {
+                get => current.Current;
+                set => current.Current = value;
+            }
+
+            public MultipleSelectionFilter()
+            {
+                Anchor = Anchor.BottomLeft;
+                Origin = Anchor.BottomLeft;
+                RelativeSizeAxes = Axes.X;
+                Height = 15;
+                Spacing = new Vector2(10, 0);
+                AddRange(CreateItems());
+
+                foreach (var item in Children)
+                    item.StateUpdated += updateBindable;
+            }
+
+            protected abstract MultipleSelectionFilterTabItem[] CreateItems();
+
+            private void updateBindable()
+            {
+                var selectedValues = new List<T>();
+
+                foreach (var item in Children)
+                {
+                    if (item.Active.Value)
+                        selectedValues.Add(item.Value);
+                }
+
+                Current.Value = selectedValues;
+            }
+        }
+
+        protected class MultipleSelectionFilterTabItem : FilterTabItem<T>
+        {
+            public event Action StateUpdated;
+
+            public MultipleSelectionFilterTabItem(T value)
+                : base(value)
+            {
+                Active.BindValueChanged(_ => StateUpdated?.Invoke());
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                base.OnClick(e);
+                Active.Value = !Active.Value;
+                return true;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
new file mode 100644
index 0000000000..32b48862e0
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/FilterTabItem.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.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.Graphics;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class FilterTabItem<T> : 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;
+            Anchor = Anchor.BottomLeft;
+            Origin = Anchor.BottomLeft;
+            AddRangeInternal(new Drawable[]
+            {
+                text = new OsuSpriteText
+                {
+                    Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
+                    Text = CreateText(value)
+                },
+                new HoverClickSounds()
+            });
+
+            Enabled.Value = true;
+        }
+
+        protected virtual string CreateText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            updateState();
+        }
+
+        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/SearchExtra.cs b/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
index 53900211e1..e9b3165d97 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
@@ -5,9 +5,7 @@ namespace osu.Game.Overlays.BeatmapListing
 {
     public enum SearchExtra
     {
-        Any,
         Video,
-        Storyboard,
-        Both
+        Storyboard
     }
 }

From 008d1d697cee99eee4e5cf076dcb209f71189a9f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 27 Oct 2020 23:14:48 +0300
Subject: [PATCH 05715/10326] Implement filtering by rank achieved

---
 .../TestSceneBeatmapListingSearchControl.cs   |  3 ++
 .../API/Requests/SearchBeatmapSetsRequest.cs  |  7 ++++
 .../BeatmapListingFilterControl.cs            |  2 ++
 .../BeatmapListingSearchControl.cs            |  4 +++
 .../BeatmapSearchExtraFilterRow.cs            |  2 +-
 ...BeatmapSearchMultipleSelectionFilterRow.cs |  4 +--
 .../BeatmapSearchRankFilterRow.cs             | 35 +++++++++++++++++++
 .../Overlays/BeatmapListing/FilterTabItem.cs  | 10 +++---
 .../Overlays/BeatmapListing/SearchRank.cs     | 24 +++++++++++++
 9 files changed, 84 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchRankFilterRow.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/SearchRank.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index 9b0ef4d6f2..ff8162293b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -29,6 +29,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuSpriteText genre;
             OsuSpriteText language;
             OsuSpriteText extra;
+            OsuSpriteText ranks;
             OsuSpriteText played;
 
             Add(control = new BeatmapListingSearchControl
@@ -50,6 +51,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     genre = new OsuSpriteText(),
                     language = new OsuSpriteText(),
                     extra = new OsuSpriteText(),
+                    ranks = new OsuSpriteText(),
                     played = new OsuSpriteText()
                 }
             });
@@ -60,6 +62,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);
             control.Language.BindValueChanged(l => language.Text = $"Language: {l.NewValue}", true);
             control.Extra.BindValueChanged(e => extra.Text = $"Extra: {(e.NewValue == null ? "" : string.Join(".", e.NewValue.Select(i => i.ToString().ToLowerInvariant())))}", true);
+            control.Ranks.BindValueChanged(r => ranks.Text = $"Ranks: {(r.NewValue == null ? "" : string.Join(".", r.NewValue.Select(i => i.ToString())))}", true);
             control.Played.BindValueChanged(p => played.Text = $"Played: {p.NewValue}", true);
         }
 
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 20bbd46529..f819a5778f 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Online.API.Requests
 
         public SearchPlayed Played { get; }
 
+        public List<SearchRank> Ranks { get; }
+
         private readonly string query;
         private readonly RulesetInfo ruleset;
         private readonly Cursor cursor;
@@ -43,6 +45,7 @@ namespace osu.Game.Online.API.Requests
             SearchGenre genre = SearchGenre.Any,
             SearchLanguage language = SearchLanguage.Any,
             List<SearchExtra> extra = null,
+            List<SearchRank> ranks = null,
             SearchPlayed played = SearchPlayed.Any)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
@@ -55,6 +58,7 @@ namespace osu.Game.Online.API.Requests
             Genre = genre;
             Language = language;
             Extra = extra;
+            Ranks = ranks;
             Played = played;
         }
 
@@ -79,6 +83,9 @@ namespace osu.Game.Online.API.Requests
             if (Extra != null && Extra.Any())
                 req.AddParameter("e", string.Join(".", Extra.Select(e => e.ToString().ToLowerInvariant())));
 
+            if (Ranks != null && Ranks.Any())
+                req.AddParameter("r", string.Join(".", Ranks.Select(r => r.ToString())));
+
             if (Played != SearchPlayed.Any)
                 req.AddParameter("played", Played.ToString().ToLowerInvariant());
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 3f09a7e3d1..86bf3276fe 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -131,6 +131,7 @@ namespace osu.Game.Overlays.BeatmapListing
             searchControl.Genre.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Language.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Extra.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.Ranks.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Played.BindValueChanged(_ => queueUpdateSearch());
 
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
@@ -183,6 +184,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 searchControl.Genre.Value,
                 searchControl.Language.Value,
                 searchControl.Extra.Value,
+                searchControl.Ranks.Value,
                 searchControl.Played.Value);
 
             getSetsRequest.Success += response =>
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index f390db3f35..64bd7065b5 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<List<SearchExtra>> Extra => extraFilter.Current;
 
+        public Bindable<List<SearchRank>> Ranks => ranksFilter.Current;
+
         public Bindable<SearchPlayed> Played => playedFilter.Current;
 
         public BeatmapSetInfo BeatmapSet
@@ -54,6 +56,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchFilterRow<SearchGenre> genreFilter;
         private readonly BeatmapSearchFilterRow<SearchLanguage> languageFilter;
         private readonly BeatmapSearchExtraFilterRow extraFilter;
+        private readonly BeatmapSearchRankFilterRow ranksFilter;
         private readonly BeatmapSearchFilterRow<SearchPlayed> playedFilter;
 
         private readonly Box background;
@@ -113,6 +116,7 @@ namespace osu.Game.Overlays.BeatmapListing
                                     genreFilter = new BeatmapSearchFilterRow<SearchGenre>(@"Genre"),
                                     languageFilter = new BeatmapSearchFilterRow<SearchLanguage>(@"Language"),
                                     extraFilter = new BeatmapSearchExtraFilterRow(),
+                                    ranksFilter = new BeatmapSearchRankFilterRow(),
                                     playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played")
                                 }
                             }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs
index 385978096c..d8bf18fb88 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
         private class ExtraFilter : MultipleSelectionFilter
         {
-            protected override MultipleSelectionFilterTabItem[] CreateItems() => new[]
+            protected override MultipleSelectionFilterTabItem[] CreateItems() => new MultipleSelectionFilterTabItem[]
             {
                 new ExtraFilterTabItem(SearchExtra.Video),
                 new ExtraFilterTabItem(SearchExtra.Storyboard)
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
index c434e00ff3..acf2c62afa 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.BeatmapListing
 {
     public abstract class BeatmapSearchMultipleSelectionFilterRow<T> : BeatmapSearchFilterRow<List<T>>
     {
-        public BeatmapSearchMultipleSelectionFilterRow(string headerName)
+        protected BeatmapSearchMultipleSelectionFilterRow(string headerName)
             : base(headerName)
         {
         }
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 set => current.Current = value;
             }
 
-            public MultipleSelectionFilter()
+            protected MultipleSelectionFilter()
             {
                 Anchor = Anchor.BottomLeft;
                 Origin = Anchor.BottomLeft;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRankFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRankFilterRow.cs
new file mode 100644
index 0000000000..d521e8c90f
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRankFilterRow.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.Linq;
+using osu.Framework.Extensions;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapSearchRankFilterRow : BeatmapSearchMultipleSelectionFilterRow<SearchRank>
+    {
+        public BeatmapSearchRankFilterRow()
+            : base("Rank Achieved")
+        {
+        }
+
+        protected override MultipleSelectionFilter CreateMultipleSelectionFilter() => new RankFilter();
+
+        private class RankFilter : MultipleSelectionFilter
+        {
+            protected override MultipleSelectionFilterTabItem[] CreateItems()
+                => ((SearchRank[])Enum.GetValues(typeof(SearchRank))).Select(v => new RankFilterTabItem(v)).ToArray<MultipleSelectionFilterTabItem>();
+        }
+
+        private class RankFilterTabItem : MultipleSelectionFilterTabItem
+        {
+            public RankFilterTabItem(SearchRank value)
+                : base(value)
+            {
+            }
+
+            protected override string CreateText(SearchRank value) => $@"{value.GetDescription() ?? value.ToString()}";
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
index 32b48862e0..9bdd5b3fad 100644
--- a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
+++ b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Overlays.BeatmapListing
 {
     public class FilterTabItem<T> : TabItem<T>
     {
-        protected virtual float TextSize => 13;
-
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
@@ -33,7 +31,7 @@ namespace osu.Game.Overlays.BeatmapListing
             {
                 text = new OsuSpriteText
                 {
-                    Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
+                    Font = OsuFont.GetFont(size: 13, weight: FontWeight.Regular),
                     Text = CreateText(value)
                 },
                 new HoverClickSounds()
@@ -67,7 +65,11 @@ namespace osu.Game.Overlays.BeatmapListing
 
         protected override void OnDeactivated() => updateState();
 
-        private void updateState() => text.FadeColour(Active.Value ? Color4.White : getStateColour(), 200, Easing.OutQuint);
+        private void updateState()
+        {
+            text.FadeColour(Active.Value ? Color4.White : getStateColour(), 200, Easing.OutQuint);
+            text.Font = text.Font.With(weight: Active.Value ? FontWeight.SemiBold : FontWeight.Regular);
+        }
 
         private Color4 getStateColour() => IsHovered ? colourProvider.Light1 : colourProvider.Light3;
     }
diff --git a/osu.Game/Overlays/BeatmapListing/SearchRank.cs b/osu.Game/Overlays/BeatmapListing/SearchRank.cs
new file mode 100644
index 0000000000..8b1882026c
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SearchRank.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 System.ComponentModel;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public enum SearchRank
+    {
+        [Description(@"Silver SS")]
+        XH,
+
+        [Description(@"SS")]
+        X,
+
+        [Description(@"Silver S")]
+        SH,
+        S,
+        A,
+        B,
+        C,
+        D
+    }
+}

From c4efceceb2a384af3468db13839c6668675038c3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 27 Oct 2020 23:57:11 +0300
Subject: [PATCH 05716/10326] Use char instead of sting for request parameter
 creation

---
 .../UserInterface/TestSceneBeatmapListingSearchControl.cs     | 4 ++--
 osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index ff8162293b..e07aa71b1f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -61,8 +61,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.Category.BindValueChanged(c => category.Text = $"Category: {c.NewValue}", true);
             control.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);
             control.Language.BindValueChanged(l => language.Text = $"Language: {l.NewValue}", true);
-            control.Extra.BindValueChanged(e => extra.Text = $"Extra: {(e.NewValue == null ? "" : string.Join(".", e.NewValue.Select(i => i.ToString().ToLowerInvariant())))}", true);
-            control.Ranks.BindValueChanged(r => ranks.Text = $"Ranks: {(r.NewValue == null ? "" : string.Join(".", r.NewValue.Select(i => i.ToString())))}", true);
+            control.Extra.BindValueChanged(e => extra.Text = $"Extra: {(e.NewValue == null ? "" : string.Join('.', e.NewValue.Select(i => i.ToString().ToLowerInvariant())))}", true);
+            control.Ranks.BindValueChanged(r => ranks.Text = $"Ranks: {(r.NewValue == null ? "" : string.Join('.', r.NewValue.Select(i => i.ToString())))}", true);
             control.Played.BindValueChanged(p => played.Text = $"Played: {p.NewValue}", true);
         }
 
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index f819a5778f..248096d8b3 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -81,10 +81,10 @@ namespace osu.Game.Online.API.Requests
             req.AddParameter("sort", $"{SortCriteria.ToString().ToLowerInvariant()}_{directionString}");
 
             if (Extra != null && Extra.Any())
-                req.AddParameter("e", string.Join(".", Extra.Select(e => e.ToString().ToLowerInvariant())));
+                req.AddParameter("e", string.Join('.', Extra.Select(e => e.ToString().ToLowerInvariant())));
 
             if (Ranks != null && Ranks.Any())
-                req.AddParameter("r", string.Join(".", Ranks.Select(r => r.ToString())));
+                req.AddParameter("r", string.Join('.', Ranks.Select(r => r.ToString())));
 
             if (Played != SearchPlayed.Any)
                 req.AddParameter("played", Played.ToString().ToLowerInvariant());

From 0a7f3dc19bd86057a11d129250b852732af39dc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 07:29:07 +0900
Subject: [PATCH 05717/10326] Avoid null reference on finalization
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/Play/Spectator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index dd6b434889..898d68a7d6 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -236,7 +236,7 @@ namespace osu.Game.Screens.Play
                 spectatorStreaming.StopWatchingUser((int)targetUser.Id);
             }
 
-            managerUpdated.UnbindAll();
+            managerUpdated?.UnbindAll();
         }
     }
 }

From b4ec3b9fefa6206558cf3f3e0ea6541cac0948e6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 28 Oct 2020 01:41:46 +0300
Subject: [PATCH 05718/10326] Simplify MultipleSelectionFilterTabItem state
 changes

---
 .../BeatmapSearchMultipleSelectionFilterRow.cs            | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
index acf2c62afa..35c982d35a 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.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 osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -43,7 +42,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 AddRange(CreateItems());
 
                 foreach (var item in Children)
-                    item.StateUpdated += updateBindable;
+                    item.Active.BindValueChanged(_ => updateBindable());
             }
 
             protected abstract MultipleSelectionFilterTabItem[] CreateItems();
@@ -64,18 +63,15 @@ namespace osu.Game.Overlays.BeatmapListing
 
         protected class MultipleSelectionFilterTabItem : FilterTabItem<T>
         {
-            public event Action StateUpdated;
-
             public MultipleSelectionFilterTabItem(T value)
                 : base(value)
             {
-                Active.BindValueChanged(_ => StateUpdated?.Invoke());
             }
 
             protected override bool OnClick(ClickEvent e)
             {
                 base.OnClick(e);
-                Active.Value = !Active.Value;
+                Active.Toggle();
                 return true;
             }
         }

From fd11346a289e03b0a5f2f1f2cd5d1da3a578fffe Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 28 Oct 2020 01:48:24 +0300
Subject: [PATCH 05719/10326] Update button colours

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

diff --git a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
index 9bdd5b3fad..721a3c839c 100644
--- a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
+++ b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
@@ -67,10 +67,10 @@ namespace osu.Game.Overlays.BeatmapListing
 
         private void updateState()
         {
-            text.FadeColour(Active.Value ? Color4.White : getStateColour(), 200, Easing.OutQuint);
+            text.FadeColour(IsHovered ? colourProvider.Light1 : getStateColour(), 200, Easing.OutQuint);
             text.Font = text.Font.With(weight: Active.Value ? FontWeight.SemiBold : FontWeight.Regular);
         }
 
-        private Color4 getStateColour() => IsHovered ? colourProvider.Light1 : colourProvider.Light3;
+        private Color4 getStateColour() => Active.Value ? colourProvider.Content1 : colourProvider.Light2;
     }
 }

From 03c5057a921d8ddf21666671c76e23bc396b8a60 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 28 Oct 2020 02:28:31 +0300
Subject: [PATCH 05720/10326] Simplify BeatmapSearchMultipleSelectionFilterRow

---
 .../BeatmapListingSearchControl.cs            |  8 ++---
 .../BeatmapSearchExtraFilterRow.cs            | 34 ------------------
 ...BeatmapSearchMultipleSelectionFilterRow.cs | 21 ++++++-----
 .../BeatmapSearchRankFilterRow.cs             | 35 -------------------
 .../Overlays/BeatmapListing/FilterTabItem.cs  |  4 +--
 .../Overlays/BeatmapListing/SearchExtra.cs    |  4 +++
 6 files changed, 19 insertions(+), 87 deletions(-)
 delete mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs
 delete mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchRankFilterRow.cs

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 64bd7065b5..a976890c7c 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -55,8 +55,8 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchFilterRow<SearchCategory> categoryFilter;
         private readonly BeatmapSearchFilterRow<SearchGenre> genreFilter;
         private readonly BeatmapSearchFilterRow<SearchLanguage> languageFilter;
-        private readonly BeatmapSearchExtraFilterRow extraFilter;
-        private readonly BeatmapSearchRankFilterRow ranksFilter;
+        private readonly BeatmapSearchMultipleSelectionFilterRow<SearchExtra> extraFilter;
+        private readonly BeatmapSearchMultipleSelectionFilterRow<SearchRank> ranksFilter;
         private readonly BeatmapSearchFilterRow<SearchPlayed> playedFilter;
 
         private readonly Box background;
@@ -115,8 +115,8 @@ namespace osu.Game.Overlays.BeatmapListing
                                     categoryFilter = new BeatmapSearchFilterRow<SearchCategory>(@"Categories"),
                                     genreFilter = new BeatmapSearchFilterRow<SearchGenre>(@"Genre"),
                                     languageFilter = new BeatmapSearchFilterRow<SearchLanguage>(@"Language"),
-                                    extraFilter = new BeatmapSearchExtraFilterRow(),
-                                    ranksFilter = new BeatmapSearchRankFilterRow(),
+                                    extraFilter = new BeatmapSearchMultipleSelectionFilterRow<SearchExtra>(@"Extra"),
+                                    ranksFilter = new BeatmapSearchMultipleSelectionFilterRow<SearchRank>(@"Rank Achieved"),
                                     playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played")
                                 }
                             }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs
deleted file mode 100644
index d8bf18fb88..0000000000
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs
+++ /dev/null
@@ -1,34 +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.Overlays.BeatmapListing
-{
-    public class BeatmapSearchExtraFilterRow : BeatmapSearchMultipleSelectionFilterRow<SearchExtra>
-    {
-        public BeatmapSearchExtraFilterRow()
-            : base("Extra")
-        {
-        }
-
-        protected override MultipleSelectionFilter CreateMultipleSelectionFilter() => new ExtraFilter();
-
-        private class ExtraFilter : MultipleSelectionFilter
-        {
-            protected override MultipleSelectionFilterTabItem[] CreateItems() => new MultipleSelectionFilterTabItem[]
-            {
-                new ExtraFilterTabItem(SearchExtra.Video),
-                new ExtraFilterTabItem(SearchExtra.Storyboard)
-            };
-        }
-
-        private class ExtraFilterTabItem : MultipleSelectionFilterTabItem
-        {
-            public ExtraFilterTabItem(SearchExtra value)
-                : base(value)
-            {
-            }
-
-            protected override string CreateText(SearchExtra value) => $@"Has {value.ToString()}";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
index 35c982d35a..cb89560e39 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.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 osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
@@ -11,18 +13,16 @@ using osuTK;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
-    public abstract class BeatmapSearchMultipleSelectionFilterRow<T> : BeatmapSearchFilterRow<List<T>>
+    public class BeatmapSearchMultipleSelectionFilterRow<T> : BeatmapSearchFilterRow<List<T>>
     {
-        protected BeatmapSearchMultipleSelectionFilterRow(string headerName)
+        public BeatmapSearchMultipleSelectionFilterRow(string headerName)
             : base(headerName)
         {
         }
 
-        protected override Drawable CreateFilter() => CreateMultipleSelectionFilter();
+        protected override Drawable CreateFilter() => new MultipleSelectionFilter();
 
-        protected abstract MultipleSelectionFilter CreateMultipleSelectionFilter();
-
-        protected abstract class MultipleSelectionFilter : FillFlowContainer<MultipleSelectionFilterTabItem>, IHasCurrentValue<List<T>>
+        private class MultipleSelectionFilter : FillFlowContainer<MultipleSelectionFilterTabItem>, IHasCurrentValue<List<T>>
         {
             private readonly BindableWithCurrent<List<T>> current = new BindableWithCurrent<List<T>>();
 
@@ -32,21 +32,20 @@ namespace osu.Game.Overlays.BeatmapListing
                 set => current.Current = value;
             }
 
-            protected MultipleSelectionFilter()
+            public MultipleSelectionFilter()
             {
                 Anchor = Anchor.BottomLeft;
                 Origin = Anchor.BottomLeft;
                 RelativeSizeAxes = Axes.X;
                 Height = 15;
                 Spacing = new Vector2(10, 0);
-                AddRange(CreateItems());
+
+                ((T[])Enum.GetValues(typeof(T))).ForEach(i => Add(new MultipleSelectionFilterTabItem(i)));
 
                 foreach (var item in Children)
                     item.Active.BindValueChanged(_ => updateBindable());
             }
 
-            protected abstract MultipleSelectionFilterTabItem[] CreateItems();
-
             private void updateBindable()
             {
                 var selectedValues = new List<T>();
@@ -61,7 +60,7 @@ namespace osu.Game.Overlays.BeatmapListing
             }
         }
 
-        protected class MultipleSelectionFilterTabItem : FilterTabItem<T>
+        private class MultipleSelectionFilterTabItem : FilterTabItem<T>
         {
             public MultipleSelectionFilterTabItem(T value)
                 : base(value)
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRankFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRankFilterRow.cs
deleted file mode 100644
index d521e8c90f..0000000000
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRankFilterRow.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.Linq;
-using osu.Framework.Extensions;
-
-namespace osu.Game.Overlays.BeatmapListing
-{
-    public class BeatmapSearchRankFilterRow : BeatmapSearchMultipleSelectionFilterRow<SearchRank>
-    {
-        public BeatmapSearchRankFilterRow()
-            : base("Rank Achieved")
-        {
-        }
-
-        protected override MultipleSelectionFilter CreateMultipleSelectionFilter() => new RankFilter();
-
-        private class RankFilter : MultipleSelectionFilter
-        {
-            protected override MultipleSelectionFilterTabItem[] CreateItems()
-                => ((SearchRank[])Enum.GetValues(typeof(SearchRank))).Select(v => new RankFilterTabItem(v)).ToArray<MultipleSelectionFilterTabItem>();
-        }
-
-        private class RankFilterTabItem : MultipleSelectionFilterTabItem
-        {
-            public RankFilterTabItem(SearchRank value)
-                : base(value)
-            {
-            }
-
-            protected override string CreateText(SearchRank value) => $@"{value.GetDescription() ?? value.ToString()}";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
index 721a3c839c..244ef5a703 100644
--- a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
+++ b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 text = new OsuSpriteText
                 {
                     Font = OsuFont.GetFont(size: 13, weight: FontWeight.Regular),
-                    Text = CreateText(value)
+                    Text = (value as Enum)?.GetDescription() ?? value.ToString()
                 },
                 new HoverClickSounds()
             });
@@ -40,8 +40,6 @@ namespace osu.Game.Overlays.BeatmapListing
             Enabled.Value = true;
         }
 
-        protected virtual string CreateText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Overlays/BeatmapListing/SearchExtra.cs b/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
index e9b3165d97..0ee60c4a95 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
@@ -1,11 +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.ComponentModel;
+
 namespace osu.Game.Overlays.BeatmapListing
 {
     public enum SearchExtra
     {
+        [Description("Has Video")]
         Video,
+        [Description("Has Storyboard")]
         Storyboard
     }
 }

From 6fd3686c4d443ca4c4daad14e1f0885d7747b26f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 28 Oct 2020 02:36:35 +0300
Subject: [PATCH 05721/10326] Use IReadOnlyCollection instead of List in
 SearchBeatmapSetsRequest

---
 osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 248096d8b3..708b58d954 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -23,11 +23,11 @@ namespace osu.Game.Online.API.Requests
 
         public SearchLanguage Language { get; }
 
-        public List<SearchExtra> Extra { get; }
+        public IReadOnlyCollection<SearchExtra> Extra { get; }
 
         public SearchPlayed Played { get; }
 
-        public List<SearchRank> Ranks { get; }
+        public IReadOnlyCollection<SearchRank> Ranks { get; }
 
         private readonly string query;
         private readonly RulesetInfo ruleset;
@@ -44,8 +44,8 @@ namespace osu.Game.Online.API.Requests
             SortDirection sortDirection = SortDirection.Descending,
             SearchGenre genre = SearchGenre.Any,
             SearchLanguage language = SearchLanguage.Any,
-            List<SearchExtra> extra = null,
-            List<SearchRank> ranks = null,
+            IReadOnlyCollection<SearchExtra> extra = null,
+            IReadOnlyCollection<SearchRank> ranks = null,
             SearchPlayed played = SearchPlayed.Any)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);

From 914bd537885c946c8bd5fda14aecde6c8b3bc90d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 28 Oct 2020 02:39:51 +0300
Subject: [PATCH 05722/10326] Add missing blank line

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

diff --git a/osu.Game/Overlays/BeatmapListing/SearchExtra.cs b/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
index 0ee60c4a95..af37e3264f 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
@@ -9,6 +9,7 @@ namespace osu.Game.Overlays.BeatmapListing
     {
         [Description("Has Video")]
         Video,
+
         [Description("Has Storyboard")]
         Storyboard
     }

From 01b576c8611bfca9f3d2ba3bad5974ed06688759 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 13:32:39 +0900
Subject: [PATCH 05723/10326] Fix editor crash on exit when forcing exit twice
 in a row

---
 osu.Game/Screens/Edit/Editor.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index c3560dff38..0aaa551af9 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -444,12 +444,21 @@ namespace osu.Game.Screens.Edit
                 if (dialogOverlay == null || dialogOverlay.CurrentDialog is PromptForSaveDialog)
                 {
                     confirmExit();
-                    return true;
+                    return false;
                 }
 
                 if (isNewBeatmap || HasUnsavedChanges)
                 {
-                    dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave));
+                    dialogOverlay?.Push(new PromptForSaveDialog(() =>
+                    {
+                        confirmExit();
+                        this.Exit();
+                    }, () =>
+                    {
+                        confirmExitWithSave();
+                        this.Exit();
+                    }));
+
                     return true;
                 }
             }
@@ -464,7 +473,6 @@ namespace osu.Game.Screens.Edit
         {
             exitConfirmed = true;
             Save();
-            this.Exit();
         }
 
         private void confirmExit()
@@ -483,7 +491,6 @@ namespace osu.Game.Screens.Edit
             }
 
             exitConfirmed = true;
-            this.Exit();
         }
 
         private readonly Bindable<string> clipboard = new Bindable<string>();

From 3e5322541d9d25c11f26ca0d8c2a13b070b4ae72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 14:35:42 +0900
Subject: [PATCH 05724/10326] Make direction setting more clear

---
 .../Replays/FramedReplayInputHandler.cs       | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index d7be809d34..120d81816f 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
@@ -112,15 +113,9 @@ namespace osu.Game.Rulesets.Replays
         /// <returns>The usable time value. If null, we should not advance time as we do not have enough data.</returns>
         public override double? SetFrameFromTime(double time)
         {
-            if (!CurrentTime.HasValue)
-            {
-                currentDirection = 1;
-            }
-            else
-            {
-                currentDirection = time.CompareTo(CurrentTime);
-                if (currentDirection == 0) currentDirection = 1;
-            }
+            updateDirection(time);
+
+            Debug.Assert(currentDirection != 0);
 
             if (HasFrames)
             {
@@ -171,5 +166,18 @@ namespace osu.Game.Rulesets.Replays
 
             return CurrentTime = time;
         }
+
+        private void updateDirection(double time)
+        {
+            if (!CurrentTime.HasValue)
+            {
+                currentDirection = 1;
+            }
+            else
+            {
+                currentDirection = time.CompareTo(CurrentTime);
+                if (currentDirection == 0) currentDirection = 1;
+            }
+        }
     }
 }

From 9b9a41596f4f651d03321e42eef89609d48954c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 14:42:23 +0900
Subject: [PATCH 05725/10326] Split out frame stability calculation to own
 method

---
 .../Rulesets/UI/FrameStabilityContainer.cs    | 69 +++++++++++--------
 1 file changed, 41 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 28b7975a89..94684f33ed 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -119,35 +119,19 @@ namespace osu.Game.Rulesets.UI
             if (parentGameplayClock == null)
                 setClock(); // LoadComplete may not be run yet, but we still want the clock.
 
+            // each update start with considering things in valid state.
             validState = true;
             requireMoreUpdateLoops = false;
 
-            var newProposedTime = parentGameplayClock.CurrentTime;
+            // our goal is to catch up to the time provided by the parent clock.
+            var proposedTime = parentGameplayClock.CurrentTime;
 
             try
             {
                 if (FrameStablePlayback)
-                {
-                    if (firstConsumption)
-                    {
-                        // On the first update, frame-stability seeking would result in unexpected/unwanted behaviour.
-                        // Instead we perform an initial seek to the proposed time.
-
-                        // process frame (in addition to finally clause) to clear out ElapsedTime
-                        manualClock.CurrentTime = newProposedTime;
-                        framedClock.ProcessFrame();
-
-                        firstConsumption = false;
-                    }
-                    else if (manualClock.CurrentTime < gameplayStartTime)
-                        manualClock.CurrentTime = newProposedTime = Math.Min(gameplayStartTime, newProposedTime);
-                    else if (Math.Abs(manualClock.CurrentTime - newProposedTime) > sixty_frame_time * 1.2f)
-                    {
-                        newProposedTime = newProposedTime > manualClock.CurrentTime
-                            ? Math.Min(newProposedTime, manualClock.CurrentTime + sixty_frame_time)
-                            : Math.Max(newProposedTime, manualClock.CurrentTime - sixty_frame_time);
-                    }
-                }
+                    // if we require frame stability, the proposed time will be adjusted to move at most one known
+                    // frame interval in the current direction.
+                    applyFrameStability(ref proposedTime);
 
                 if (isAttached)
                 {
@@ -156,7 +140,7 @@ namespace osu.Game.Rulesets.UI
                     if (FrameStablePlayback)
                     {
                         // when stability is turned on, we shouldn't execute for time values the replay is unable to satisfy.
-                        if ((newTime = ReplayInputHandler.SetFrameFromTime(newProposedTime)) == null)
+                        if ((newTime = ReplayInputHandler.SetFrameFromTime(proposedTime)) == null)
                         {
                             // setting invalid state here ensures that gameplay will not continue (ie. our child
                             // hierarchy won't be updated).
@@ -173,7 +157,7 @@ namespace osu.Game.Rulesets.UI
                         // when stability is disabled, we don't really care about accuracy.
                         // looping over the replay will allow it to catch up and feed out the required values
                         // for the current time.
-                        while ((newTime = ReplayInputHandler.SetFrameFromTime(newProposedTime)) != newProposedTime)
+                        while ((newTime = ReplayInputHandler.SetFrameFromTime(proposedTime)) != proposedTime)
                         {
                             if (newTime == null)
                             {
@@ -185,15 +169,15 @@ namespace osu.Game.Rulesets.UI
                         }
                     }
 
-                    newProposedTime = newTime.Value;
+                    proposedTime = newTime.Value;
                 }
             }
             finally
             {
-                if (newProposedTime != manualClock.CurrentTime)
-                    direction = newProposedTime > manualClock.CurrentTime ? 1 : -1;
+                if (proposedTime != manualClock.CurrentTime)
+                    direction = proposedTime > manualClock.CurrentTime ? 1 : -1;
 
-                manualClock.CurrentTime = newProposedTime;
+                manualClock.CurrentTime = proposedTime;
                 manualClock.Rate = Math.Abs(parentGameplayClock.Rate) * direction;
                 manualClock.IsRunning = parentGameplayClock.IsRunning;
 
@@ -209,6 +193,35 @@ namespace osu.Game.Rulesets.UI
             }
         }
 
+        /// <summary>
+        /// Apply frame stability modifier to a time.
+        /// </summary>
+        /// <param name="proposedTime">The time which is to be displayed.</param>
+        private void applyFrameStability(ref double proposedTime)
+        {
+            if (firstConsumption)
+            {
+                // On the first update, frame-stability seeking would result in unexpected/unwanted behaviour.
+                // Instead we perform an initial seek to the proposed time.
+
+                // process frame (in addition to finally clause) to clear out ElapsedTime
+                manualClock.CurrentTime = proposedTime;
+                framedClock.ProcessFrame();
+
+                firstConsumption = false;
+                return;
+            }
+
+            if (manualClock.CurrentTime < gameplayStartTime)
+                manualClock.CurrentTime = proposedTime = Math.Min(gameplayStartTime, proposedTime);
+            else if (Math.Abs(manualClock.CurrentTime - proposedTime) > sixty_frame_time * 1.2f)
+            {
+                proposedTime = proposedTime > manualClock.CurrentTime
+                    ? Math.Min(proposedTime, manualClock.CurrentTime + sixty_frame_time)
+                    : Math.Max(proposedTime, manualClock.CurrentTime - sixty_frame_time);
+            }
+        }
+
         private void setClock()
         {
             if (parentGameplayClock == null)

From 8c9bda2ded2a973bd4896aa7795fb30830804af2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 14:53:31 +0900
Subject: [PATCH 05726/10326] Split out replay update method

---
 .../Rulesets/UI/FrameStabilityContainer.cs    | 85 ++++++++++---------
 1 file changed, 46 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 94684f33ed..7f27b283e3 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.UI
 
         protected override bool RequiresChildrenUpdate => base.RequiresChildrenUpdate && validState;
 
-        private bool isAttached => ReplayInputHandler != null;
+        private bool hasReplayAttached => ReplayInputHandler != null;
 
         private const double sixty_frame_time = 1000.0 / 60;
 
@@ -133,44 +133,8 @@ namespace osu.Game.Rulesets.UI
                     // frame interval in the current direction.
                     applyFrameStability(ref proposedTime);
 
-                if (isAttached)
-                {
-                    double? newTime;
-
-                    if (FrameStablePlayback)
-                    {
-                        // when stability is turned on, we shouldn't execute for time values the replay is unable to satisfy.
-                        if ((newTime = ReplayInputHandler.SetFrameFromTime(proposedTime)) == null)
-                        {
-                            // setting invalid state here ensures that gameplay will not continue (ie. our child
-                            // hierarchy won't be updated).
-                            validState = false;
-
-                            // potentially loop to catch-up playback.
-                            requireMoreUpdateLoops = true;
-
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        // when stability is disabled, we don't really care about accuracy.
-                        // looping over the replay will allow it to catch up and feed out the required values
-                        // for the current time.
-                        while ((newTime = ReplayInputHandler.SetFrameFromTime(proposedTime)) != proposedTime)
-                        {
-                            if (newTime == null)
-                            {
-                                // special case for when the replay actually can't arrive at the required time.
-                                // protects from potential endless loop.
-                                validState = false;
-                                return;
-                            }
-                        }
-                    }
-
-                    proposedTime = newTime.Value;
-                }
+                if (hasReplayAttached)
+                    updateReplay(ref proposedTime);
             }
             finally
             {
@@ -193,6 +157,49 @@ namespace osu.Game.Rulesets.UI
             }
         }
 
+        /// <summary>
+        /// Attempt to advance replay playback for a given time.
+        /// </summary>
+        /// <param name="proposedTime">The time which is to be displayed.</param>
+        private bool updateReplay(ref double proposedTime)
+        {
+            double? newTime;
+
+            if (FrameStablePlayback)
+            {
+                // when stability is turned on, we shouldn't execute for time values the replay is unable to satisfy.
+                if ((newTime = ReplayInputHandler.SetFrameFromTime(proposedTime)) == null)
+                {
+                    // setting invalid state here ensures that gameplay will not continue (ie. our child
+                    // hierarchy won't be updated).
+                    validState = false;
+
+                    // potentially loop to catch-up playback.
+                    requireMoreUpdateLoops = true;
+
+                    return false;
+                }
+            }
+            else
+            {
+                // when stability is disabled, we don't really care about accuracy.
+                // looping over the replay will allow it to catch up and feed out the required values
+                // for the current time.
+                while ((newTime = ReplayInputHandler.SetFrameFromTime(proposedTime)) != proposedTime)
+                {
+                    if (newTime == null)
+                    {
+                        // special case for when the replay actually can't arrive at the required time.
+                        // protects from potential endless loop.
+                        return false;
+                    }
+                }
+            }
+
+            proposedTime = newTime.Value;
+            return true;
+        }
+
         /// <summary>
         /// Apply frame stability modifier to a time.
         /// </summary>

From a06516c9004ad7273ace9ce161d9851ec1b055d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 15:11:53 +0900
Subject: [PATCH 05727/10326] Extract out frame stability state into enum for
 (hopefully) better clarity

---
 .../Rulesets/UI/FrameStabilityContainer.cs    | 81 ++++++++++---------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 7f27b283e3..12e4dd8b01 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -73,19 +73,9 @@ namespace osu.Game.Rulesets.UI
             setClock();
         }
 
-        /// <summary>
-        /// Whether we are running up-to-date with our parent clock.
-        /// If not, we will need to keep processing children until we catch up.
-        /// </summary>
-        private bool requireMoreUpdateLoops;
+        private PlaybackState state;
 
-        /// <summary>
-        /// Whether we are in a valid state (ie. should we keep processing children frames).
-        /// This should be set to false when the replay is, for instance, waiting for future frames to arrive.
-        /// </summary>
-        private bool validState;
-
-        protected override bool RequiresChildrenUpdate => base.RequiresChildrenUpdate && validState;
+        protected override bool RequiresChildrenUpdate => base.RequiresChildrenUpdate && state != PlaybackState.NotValid;
 
         private bool hasReplayAttached => ReplayInputHandler != null;
 
@@ -95,20 +85,19 @@ namespace osu.Game.Rulesets.UI
 
         public override bool UpdateSubTree()
         {
-            requireMoreUpdateLoops = true;
-            validState = !frameStableClock.IsPaused.Value;
+            state = frameStableClock.IsPaused.Value ? PlaybackState.NotValid : PlaybackState.Valid;
 
-            int loops = 0;
+            int loops = MaxCatchUpFrames;
 
-            while (validState && requireMoreUpdateLoops && loops++ < MaxCatchUpFrames)
+            while (state != PlaybackState.NotValid && loops-- > 0)
             {
                 updateClock();
 
-                if (validState)
-                {
-                    base.UpdateSubTree();
-                    UpdateSubTreeMasking(this, ScreenSpaceDrawQuad.AABBFloat);
-                }
+                if (state == PlaybackState.NotValid)
+                    break;
+
+                base.UpdateSubTree();
+                UpdateSubTreeMasking(this, ScreenSpaceDrawQuad.AABBFloat);
             }
 
             return true;
@@ -120,8 +109,7 @@ namespace osu.Game.Rulesets.UI
                 setClock(); // LoadComplete may not be run yet, but we still want the clock.
 
             // each update start with considering things in valid state.
-            validState = true;
-            requireMoreUpdateLoops = false;
+            state = PlaybackState.Valid;
 
             // our goal is to catch up to the time provided by the parent clock.
             var proposedTime = parentGameplayClock.CurrentTime;
@@ -134,7 +122,7 @@ namespace osu.Game.Rulesets.UI
                     applyFrameStability(ref proposedTime);
 
                 if (hasReplayAttached)
-                    updateReplay(ref proposedTime);
+                    state = updateReplay(ref proposedTime);
             }
             finally
             {
@@ -147,7 +135,9 @@ namespace osu.Game.Rulesets.UI
 
                 double timeBehind = Math.Abs(manualClock.CurrentTime - parentGameplayClock.CurrentTime);
 
-                requireMoreUpdateLoops |= timeBehind != 0;
+                // determine whether catch-up is required.
+                if (state != PlaybackState.NotValid)
+                    state = timeBehind > 0 ? PlaybackState.RequiresCatchUp : PlaybackState.Valid;
 
                 frameStableClock.IsCatchingUp.Value = timeBehind > 200;
 
@@ -161,24 +151,14 @@ namespace osu.Game.Rulesets.UI
         /// Attempt to advance replay playback for a given time.
         /// </summary>
         /// <param name="proposedTime">The time which is to be displayed.</param>
-        private bool updateReplay(ref double proposedTime)
+        private PlaybackState updateReplay(ref double proposedTime)
         {
             double? newTime;
 
             if (FrameStablePlayback)
             {
                 // when stability is turned on, we shouldn't execute for time values the replay is unable to satisfy.
-                if ((newTime = ReplayInputHandler.SetFrameFromTime(proposedTime)) == null)
-                {
-                    // setting invalid state here ensures that gameplay will not continue (ie. our child
-                    // hierarchy won't be updated).
-                    validState = false;
-
-                    // potentially loop to catch-up playback.
-                    requireMoreUpdateLoops = true;
-
-                    return false;
-                }
+                newTime = ReplayInputHandler.SetFrameFromTime(proposedTime);
             }
             else
             {
@@ -191,13 +171,16 @@ namespace osu.Game.Rulesets.UI
                     {
                         // special case for when the replay actually can't arrive at the required time.
                         // protects from potential endless loop.
-                        return false;
+                        break;
                     }
                 }
             }
 
+            if (newTime == null)
+                return PlaybackState.NotValid;
+
             proposedTime = newTime.Value;
-            return true;
+            return PlaybackState.Valid;
         }
 
         /// <summary>
@@ -244,6 +227,26 @@ namespace osu.Game.Rulesets.UI
 
         public ReplayInputHandler ReplayInputHandler { get; set; }
 
+        private enum PlaybackState
+        {
+            /// <summary>
+            /// Playback is not possible. Child hierarchy should not be processed.
+            /// </summary>
+            NotValid,
+
+            /// <summary>
+            /// Whether we are running up-to-date with our parent clock.
+            /// If not, we will need to keep processing children until we catch up.
+            /// </summary>
+            RequiresCatchUp,
+
+            /// <summary>
+            /// Whether we are in a valid state (ie. should we keep processing children frames).
+            /// This should be set to false when the replay is, for instance, waiting for future frames to arrive.
+            /// </summary>
+            Valid
+        }
+
         private class FrameStabilityClock : GameplayClock, IFrameStableClock
         {
             public GameplayClock ParentGameplayClock;

From 59e9c2639ad503eff93b7d848de21c12abfecfeb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 15:12:39 +0900
Subject: [PATCH 05728/10326] Remove try-finally

---
 .../Rulesets/UI/FrameStabilityContainer.cs    | 45 +++++++++----------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 12e4dd8b01..4386acfcce 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -114,37 +114,32 @@ namespace osu.Game.Rulesets.UI
             // our goal is to catch up to the time provided by the parent clock.
             var proposedTime = parentGameplayClock.CurrentTime;
 
-            try
-            {
-                if (FrameStablePlayback)
-                    // if we require frame stability, the proposed time will be adjusted to move at most one known
-                    // frame interval in the current direction.
-                    applyFrameStability(ref proposedTime);
+            if (FrameStablePlayback)
+                // if we require frame stability, the proposed time will be adjusted to move at most one known
+                // frame interval in the current direction.
+                applyFrameStability(ref proposedTime);
 
-                if (hasReplayAttached)
-                    state = updateReplay(ref proposedTime);
-            }
-            finally
-            {
-                if (proposedTime != manualClock.CurrentTime)
-                    direction = proposedTime > manualClock.CurrentTime ? 1 : -1;
+            if (hasReplayAttached)
+                state = updateReplay(ref proposedTime);
 
-                manualClock.CurrentTime = proposedTime;
-                manualClock.Rate = Math.Abs(parentGameplayClock.Rate) * direction;
-                manualClock.IsRunning = parentGameplayClock.IsRunning;
+            if (proposedTime != manualClock.CurrentTime)
+                direction = proposedTime >= manualClock.CurrentTime ? 1 : -1;
 
-                double timeBehind = Math.Abs(manualClock.CurrentTime - parentGameplayClock.CurrentTime);
+            manualClock.CurrentTime = proposedTime;
+            manualClock.Rate = Math.Abs(parentGameplayClock.Rate) * direction;
+            manualClock.IsRunning = parentGameplayClock.IsRunning;
 
-                // determine whether catch-up is required.
-                if (state != PlaybackState.NotValid)
-                    state = timeBehind > 0 ? PlaybackState.RequiresCatchUp : PlaybackState.Valid;
+            double timeBehind = Math.Abs(manualClock.CurrentTime - parentGameplayClock.CurrentTime);
 
-                frameStableClock.IsCatchingUp.Value = timeBehind > 200;
+            // determine whether catch-up is required.
+            if (state != PlaybackState.NotValid)
+                state = timeBehind > 0 ? PlaybackState.RequiresCatchUp : PlaybackState.Valid;
 
-                // The manual clock time has changed in the above code. The framed clock now needs to be updated
-                // to ensure that the its time is valid for our children before input is processed
-                framedClock.ProcessFrame();
-            }
+            frameStableClock.IsCatchingUp.Value = timeBehind > 200;
+
+            // The manual clock time has changed in the above code. The framed clock now needs to be updated
+            // to ensure that the its time is valid for our children before input is processed
+            framedClock.ProcessFrame();
         }
 
         /// <summary>

From c9515653b303a8fc3ec8753aae6c7114f86f94fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 15:31:57 +0900
Subject: [PATCH 05729/10326] Restore previous directionality logic to avoid
 logic differences

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

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 4386acfcce..7e17c93bed 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Rulesets.UI
                 state = updateReplay(ref proposedTime);
 
             if (proposedTime != manualClock.CurrentTime)
-                direction = proposedTime >= manualClock.CurrentTime ? 1 : -1;
+                direction = proposedTime > manualClock.CurrentTime ? 1 : -1;
 
             manualClock.CurrentTime = proposedTime;
             manualClock.Rate = Math.Abs(parentGameplayClock.Rate) * direction;

From 2b1e79a4e8f324e4d0dcfa66c94b6db8112112d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 15:32:20 +0900
Subject: [PATCH 05730/10326] Simplify state changes further

---
 .../Rulesets/UI/FrameStabilityContainer.cs     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 7e17c93bed..6548bee4ef 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -120,7 +120,12 @@ namespace osu.Game.Rulesets.UI
                 applyFrameStability(ref proposedTime);
 
             if (hasReplayAttached)
-                state = updateReplay(ref proposedTime);
+            {
+                bool valid = updateReplay(ref proposedTime);
+
+                if (!valid)
+                    state = PlaybackState.NotValid;
+            }
 
             if (proposedTime != manualClock.CurrentTime)
                 direction = proposedTime > manualClock.CurrentTime ? 1 : -1;
@@ -132,8 +137,8 @@ namespace osu.Game.Rulesets.UI
             double timeBehind = Math.Abs(manualClock.CurrentTime - parentGameplayClock.CurrentTime);
 
             // determine whether catch-up is required.
-            if (state != PlaybackState.NotValid)
-                state = timeBehind > 0 ? PlaybackState.RequiresCatchUp : PlaybackState.Valid;
+            if (state == PlaybackState.Valid && timeBehind > 0)
+                state = PlaybackState.RequiresCatchUp;
 
             frameStableClock.IsCatchingUp.Value = timeBehind > 200;
 
@@ -146,7 +151,8 @@ namespace osu.Game.Rulesets.UI
         /// Attempt to advance replay playback for a given time.
         /// </summary>
         /// <param name="proposedTime">The time which is to be displayed.</param>
-        private PlaybackState updateReplay(ref double proposedTime)
+        /// <returns>Whether playback is still valid.</returns>
+        private bool updateReplay(ref double proposedTime)
         {
             double? newTime;
 
@@ -172,10 +178,10 @@ namespace osu.Game.Rulesets.UI
             }
 
             if (newTime == null)
-                return PlaybackState.NotValid;
+                return false;
 
             proposedTime = newTime.Value;
-            return PlaybackState.Valid;
+            return true;
         }
 
         /// <summary>

From 6eddd76bdcd3917854d8a2eb3e13cf4fc04094bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 15:54:58 +0900
Subject: [PATCH 05731/10326] Simplify FramedReplayInputHandler's SetFrame
 implementation

---
 .../Replays/FramedReplayInputHandler.cs       | 90 ++++++-------------
 1 file changed, 29 insertions(+), 61 deletions(-)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 120d81816f..8a4451fdca 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -42,40 +42,32 @@ namespace osu.Game.Rulesets.Replays
                 if (!currentFrameIndex.HasValue)
                     return (TFrame)Frames[0];
 
-                if (currentDirection > 0)
-                    return currentFrameIndex == Frames.Count - 1 ? null : (TFrame)Frames[currentFrameIndex.Value + 1];
-                else
-                    return currentFrameIndex == 0 ? null : (TFrame)Frames[nextFrameIndex];
+                int nextFrame = clampedNextFrameIndex;
+
+                if (nextFrame == currentFrameIndex.Value)
+                    return null;
+
+                return (TFrame)Frames[clampedNextFrameIndex];
             }
         }
 
         private int? currentFrameIndex;
 
-        private int nextFrameIndex => currentFrameIndex.HasValue ? Math.Clamp(currentFrameIndex.Value + (currentDirection > 0 ? 1 : -1), 0, Frames.Count - 1) : 0;
+        private int clampedNextFrameIndex =>
+            currentFrameIndex.HasValue ? Math.Clamp(currentFrameIndex.Value + currentDirection, 0, Frames.Count - 1) : 0;
 
         protected FramedReplayInputHandler(Replay replay)
         {
             this.replay = replay;
         }
 
-        private bool advanceFrame()
-        {
-            int newFrame = nextFrameIndex;
-
-            // ensure we aren't at an extent.
-            if (newFrame == currentFrameIndex) return false;
-
-            currentFrameIndex = newFrame;
-            return true;
-        }
-
         private const double sixty_frame_time = 1000.0 / 60;
 
         protected virtual double AllowedImportantTimeSpan => sixty_frame_time * 1.2;
 
         protected double? CurrentTime { get; private set; }
 
-        private int currentDirection;
+        private int currentDirection = 1;
 
         /// <summary>
         /// When set, we will ensure frames executed by nested drawables are frame-accurate to replay data.
@@ -117,53 +109,29 @@ namespace osu.Game.Rulesets.Replays
 
             Debug.Assert(currentDirection != 0);
 
-            if (HasFrames)
+            TFrame next = NextFrame;
+
+            // check if the next frame is valid for the current playback direction.
+            // validity is if the next frame is equal or "earlier" than the current point in time (so we can change to it)
+            int compare = time.CompareTo(next?.Time);
+
+            if (next != null && (compare == 0 || compare == currentDirection))
             {
-                var next = NextFrame;
-
-                // check if the next frame is valid for the current playback direction.
-                // validity is if the next frame is equal or "earlier"
-                var compare = time.CompareTo(next?.Time);
-
-                if (next != null && (compare == 0 || compare == currentDirection))
-                {
-                    if (advanceFrame())
-                        return CurrentTime = CurrentFrame.Time;
-                }
-                else
-                {
-                    // this is the case where the frame can't be advanced (in the replay).
-                    // even so, we may be able to move the clock forward due to being at the end of the replay or
-                    // in a section where replay accuracy doesn't matter.
-
-                    // important section is always respected to block the update loop.
-                    if (inImportantSection)
-                        return null;
-
-                    if (next == null)
-                    {
-                        // in the case we have no more frames and haven't received the full replay, block.
-                        if (!replay.HasReceivedAllFrames)
-                            return null;
-
-                        // else allow play to end.
-                    }
-                    else if (next.Time.CompareTo(time) != currentDirection)
-                    {
-                        // in the case we have more frames, block if the next frame's time is less than the current time.
-                        return null;
-                    }
-
-                    // if we didn't change frames, we need to ensure we are allowed to run frames in between, else return null.
-                }
-            }
-            else
-            {
-                // if we never received frames and are expecting to, block.
-                if (!replay.HasReceivedAllFrames)
-                    return null;
+                currentFrameIndex = clampedNextFrameIndex;
+                return CurrentTime = CurrentFrame.Time;
             }
 
+            // at this point, the frame can't be advanced (in the replay).
+            // even so, we may be able to move the clock forward due to being at the end of the replay or
+            // moving towards the next valid frame.
+
+            // the exception is if currently in an important section, which is respected above all.
+            if (inImportantSection)
+                return null;
+
+            // in the case we have no next frames and haven't received the full replay, block.
+            if (next == null && !replay.HasReceivedAllFrames) return null;
+
             return CurrentTime = time;
         }
 

From 48b0357e7d7daace77365a5507745d589edcda45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 16:11:14 +0900
Subject: [PATCH 05732/10326] Fix "finished playing" events handled for
 potentially incorrect user

---
 osu.Game/Screens/Play/Spectator.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 898d68a7d6..f788dcd8c7 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -167,6 +167,16 @@ namespace osu.Game.Screens.Play
             attemptStart();
         }
 
+        private void userFinishedPlaying(int userId, SpectatorState state)
+        {
+            if (userId != targetUser.Id)
+                return;
+
+            if (replay == null) return;
+
+            replay.HasReceivedAllFrames = true;
+        }
+
         private void attemptStart()
         {
             var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == state.RulesetID)?.CreateInstance();
@@ -216,13 +226,6 @@ namespace osu.Game.Screens.Play
             api.Queue(req);
         }
 
-        private void userFinishedPlaying(int userId, SpectatorState state)
-        {
-            if (replay == null) return;
-
-            replay.HasReceivedAllFrames = true;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 5fcd39a43d521e7829b1fd39769d4dd56eab090e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 16:29:06 +0900
Subject: [PATCH 05733/10326] Ensure spectator screen is loaded before
 continuing

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index a716b0c06b..5a2230dd64 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
@@ -170,8 +171,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
         }
 
-        private void loadSpectatingScreen() =>
+        private void loadSpectatingScreen()
+        {
             AddStep("load screen", () => LoadScreen(spectatorScreen = new Spectator(testSpectatorStreamingClient.StreamingUser)));
+            AddUntilStep("wait for screen load", () => spectatorScreen.LoadState == LoadState.Loaded);
+        }
 
         internal class TestSpectatorStreamingClient : SpectatorStreamingClient
         {

From 730cc645fb134df2a00994d64405dbadb967ca38 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 16:33:52 +0900
Subject: [PATCH 05734/10326] Avoid reconstructing ruleset for each frame
 bundle

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

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index f788dcd8c7..2de6c16c45 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private Bindable<RulesetInfo> ruleset { get; set; }
 
+        private Ruleset rulesetInstance;
+
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; }
 
@@ -141,12 +143,10 @@ namespace osu.Game.Screens.Play
             if (replay == null)
                 return;
 
-            var rulesetInstance = ruleset.Value.CreateInstance();
-
             foreach (var frame in data.Frames)
             {
                 IConvertibleReplayFrame convertibleFrame = rulesetInstance.CreateConvertibleReplayFrame();
-                convertibleFrame.FromLegacy(frame, beatmap.Value.Beatmap, null);
+                convertibleFrame.FromLegacy(frame, beatmap.Value.Beatmap);
 
                 var convertedFrame = (ReplayFrame)convertibleFrame;
                 convertedFrame.Time = frame.Time;
@@ -206,6 +206,8 @@ namespace osu.Game.Screens.Play
             };
 
             ruleset.Value = resolvedRuleset.RulesetInfo;
+            rulesetInstance = resolvedRuleset;
+
             beatmap.Value = beatmaps.GetWorkingBeatmap(resolvedBeatmap);
 
             this.Push(new SpectatorPlayerLoader(new Score

From 6169349f7c26f12365fbe91113aa4e89035b0a05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 17:42:04 +0900
Subject: [PATCH 05735/10326] Fix switching to new beatmap not working
 correctly

---
 osu.Game/Screens/Play/Spectator.cs       |  6 +++---
 osu.Game/Screens/Play/SpectatorPlayer.cs | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 2de6c16c45..51cd5b59aa 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -164,7 +164,7 @@ namespace osu.Game.Screens.Play
 
             this.state = state;
 
-            attemptStart();
+            Schedule(attemptStart);
         }
 
         private void userFinishedPlaying(int userId, SpectatorState state)
@@ -175,6 +175,7 @@ namespace osu.Game.Screens.Play
             if (replay == null) return;
 
             replay.HasReceivedAllFrames = true;
+            replay = null;
         }
 
         private void attemptStart()
@@ -188,8 +189,6 @@ namespace osu.Game.Screens.Play
             if (state.BeatmapID == null)
                 return;
 
-            this.MakeCurrent();
-
             var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == state.BeatmapID);
 
             if (resolvedBeatmap == null)
@@ -201,6 +200,7 @@ namespace osu.Game.Screens.Play
             var scoreInfo = new ScoreInfo
             {
                 Beatmap = resolvedBeatmap,
+                User = targetUser,
                 Mods = state.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
                 Ruleset = resolvedRuleset.RulesetInfo,
             };
diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index 89e5f8f2dc..fbd21b32ba 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -2,18 +2,36 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Online.Spectator;
 using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Play
 {
     public class SpectatorPlayer : ReplayPlayer
     {
+        [Resolved]
+        private SpectatorStreamingClient spectatorStreaming { get; set; }
+
         public SpectatorPlayer(Score score)
             : base(score)
         {
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
+        }
+
+        private void userBeganPlaying(int userId, SpectatorState state)
+        {
+            if (userId == Score.ScoreInfo.UserID)
+                Schedule(this.Exit);
+        }
+
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
         {
             // if we already have frames, start gameplay at the point in time they exist, should they be too far into the beatmap.

From ce9dd0c9203a160b20bd4b90fe2c87f078e55e58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 17:19:01 +0900
Subject: [PATCH 05736/10326] Fix enum descriptions not being displayed in
 OverlayHeaderTabControl

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

diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index 61605d9e9e..7798dfa576 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -1,9 +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 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.Shapes;
@@ -104,7 +106,7 @@ namespace osu.Game.Overlays
                 public OverlayHeaderTabItem(T value)
                     : base(value)
                 {
-                    Text.Text = value.ToString().ToLower();
+                    Text.Text = ((Value as Enum)?.GetDescription() ?? Value.ToString()).ToLower();
                     Text.Font = OsuFont.GetFont(size: 14);
                     Text.Margin = new MarginPadding { Vertical = 16.5f }; // 15px padding + 1.5px line-height difference compensation
                     Bar.Margin = new MarginPadding { Bottom = bar_height };

From 32becb6882bf7a800565499cc70a38019bb563cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 17:19:14 +0900
Subject: [PATCH 05737/10326] Add simple listing of currently playing users

---
 .../Dashboard/CurrentlyPlayingDisplay.cs      | 95 +++++++++++++++++++
 .../Dashboard/DashboardOverlayHeader.cs       |  7 +-
 osu.Game/Overlays/DashboardOverlay.cs         |  4 +
 3 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
new file mode 100644
index 0000000000..8a98614fa0
--- /dev/null
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.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.Collections.Specialized;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Screens;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Spectator;
+using osu.Game.Screens.Play;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Overlays.Dashboard
+{
+    internal class CurrentlyPlayingDisplay : CompositeDrawable
+    {
+        private IBindableList<int> playingUsers;
+
+        private FillFlowContainer<UserPanel> userFlow;
+
+        [Resolved]
+        private SpectatorStreamingClient spectatorStreaming { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            InternalChild = userFlow = new FillFlowContainer<UserPanel>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(10),
+            };
+        }
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            playingUsers = spectatorStreaming.PlayingUsers.GetBoundCopy();
+            playingUsers.BindCollectionChanged((sender, e) => Schedule(() =>
+            {
+                switch (e.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (var u in e.NewItems.OfType<int>())
+                        {
+                            var request = new GetUserRequest(u);
+                            request.Success += user => Schedule(() =>
+                            {
+                                if (playingUsers.Contains((int)user.Id))
+                                    userFlow.Add(createUserPanel(user));
+                            });
+                            api.Queue(request);
+                        }
+
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (var u in e.OldItems.OfType<int>())
+                            userFlow.FirstOrDefault(card => card.User.Id == u)?.Expire();
+                        break;
+
+                    case NotifyCollectionChangedAction.Reset:
+                        userFlow.Clear();
+                        break;
+                }
+            }), true);
+        }
+
+        [Resolved]
+        private OsuGame game { get; set; }
+
+        private UserPanel createUserPanel(User user)
+        {
+            return new UserGridPanel(user).With(panel =>
+            {
+                panel.Anchor = Anchor.TopCentre;
+                panel.Origin = Anchor.TopCentre;
+                panel.Width = 290;
+                panel.Action = () => game.PerformFromScreen(s => s.Push(new Spectator(user)));
+            });
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
index 36bf589877..3314ed957a 100644
--- a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
+++ b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.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.ComponentModel;
+
 namespace osu.Game.Overlays.Dashboard
 {
     public class DashboardOverlayHeader : TabControlOverlayHeader<DashboardOverlayTabs>
@@ -20,6 +22,9 @@ namespace osu.Game.Overlays.Dashboard
 
     public enum DashboardOverlayTabs
     {
-        Friends
+        Friends,
+
+        [Description("Currently Playing")]
+        CurrentlyPlaying
     }
 }
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index a2490365e4..04defce636 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -130,6 +130,10 @@ namespace osu.Game.Overlays
                     loadDisplay(new FriendDisplay());
                     break;
 
+                case DashboardOverlayTabs.CurrentlyPlaying:
+                    loadDisplay(new CurrentlyPlayingDisplay());
+                    break;
+
                 default:
                     throw new NotImplementedException($"Display for {tab.NewValue} tab is not implemented");
             }

From 84d854e23136434dcb5213abdf028f4c6ef63e6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 17:23:38 +0900
Subject: [PATCH 05738/10326] Avoid having the user profile show when clicking
 a spectator panel

---
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs | 1 +
 osu.Game/Users/UserPanel.cs                            | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 8a98614fa0..d71e582c05 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -88,6 +88,7 @@ namespace osu.Game.Overlays.Dashboard
                 panel.Anchor = Anchor.TopCentre;
                 panel.Origin = Anchor.TopCentre;
                 panel.Width = 290;
+                panel.ShowProfileOnClick = false;
                 panel.Action = () => game.PerformFromScreen(s => s.Push(new Spectator(user)));
             });
         }
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 57a87a713d..e97ff4287f 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Users
 
         public new Action Action;
 
+        public bool ShowProfileOnClick = true;
+
         protected Action ViewProfile { get; private set; }
 
         protected Drawable Background { get; private set; }
@@ -68,7 +70,8 @@ namespace osu.Game.Users
             base.Action = ViewProfile = () =>
             {
                 Action?.Invoke();
-                profileOverlay?.ShowUser(User);
+                if (ShowProfileOnClick)
+                    profileOverlay?.ShowUser(User);
             };
         }
 

From 16b0a7b33e2da40c759142fcfb29097c121e4439 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 18:01:55 +0900
Subject: [PATCH 05739/10326] Add button flow to allow resuming watching after
 exiting manually

---
 osu.Game/Screens/Play/Spectator.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 51cd5b59aa..11cdb66087 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -13,6 +13,7 @@ using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 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.Spectator;
@@ -63,6 +64,8 @@ namespace osu.Game.Screens.Play
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
+        private TriangleButton watchButton;
+
         public Spectator([NotNull] User targetUser)
         {
             this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
@@ -108,6 +111,14 @@ namespace osu.Game.Screens.Play
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         },
+                        watchButton = new TriangleButton
+                        {
+                            Text = "Watch",
+                            Width = 250,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Action = attemptStart
+                        }
                     }
                 },
             };
@@ -191,9 +202,11 @@ namespace osu.Game.Screens.Play
 
             var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == state.BeatmapID);
 
+            showBeatmapPanel(state.BeatmapID.Value);
+
             if (resolvedBeatmap == null)
             {
-                showBeatmapPanel(state.BeatmapID.Value);
+                watchButton.Enabled.Value = false;
                 return;
             }
 
@@ -209,6 +222,7 @@ namespace osu.Game.Screens.Play
             rulesetInstance = resolvedRuleset;
 
             beatmap.Value = beatmaps.GetWorkingBeatmap(resolvedBeatmap);
+            watchButton.Enabled.Value = true;
 
             this.Push(new SpectatorPlayerLoader(new Score
             {

From c97feb09bf2872a564d452f89442ed9cd2eaafc4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 18:05:15 +0900
Subject: [PATCH 05740/10326] Allow continuing to automatically spectate user
 from results screen

---
 osu.Game/Screens/Play/SpectatorPlayer.cs      | 20 +++++++--
 .../Screens/Play/SpectatorResultsScreen.cs    | 42 +++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Screens/Play/SpectatorResultsScreen.cs

diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index fbd21b32ba..93e755f30a 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -7,19 +7,25 @@ using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Spectator;
 using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Play
 {
     public class SpectatorPlayer : ReplayPlayer
     {
-        [Resolved]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
-
         public SpectatorPlayer(Score score)
             : base(score)
         {
         }
 
+        protected override ResultsScreen CreateResults(ScoreInfo score)
+        {
+            return new SpectatorResultsScreen(score);
+        }
+
+        [Resolved]
+        private SpectatorStreamingClient spectatorStreaming { get; set; }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -32,6 +38,14 @@ namespace osu.Game.Screens.Play
                 Schedule(this.Exit);
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (spectatorStreaming != null)
+                spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
+        }
+
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
         {
             // if we already have frames, start gameplay at the point in time they exist, should they be too far into the beatmap.
diff --git a/osu.Game/Screens/Play/SpectatorResultsScreen.cs b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
new file mode 100644
index 0000000000..bb1bdee3a9
--- /dev/null
+++ b/osu.Game/Screens/Play/SpectatorResultsScreen.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 osu.Framework.Allocation;
+using osu.Framework.Screens;
+using osu.Game.Online.Spectator;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
+
+namespace osu.Game.Screens.Play
+{
+    public class SpectatorResultsScreen : SoloResultsScreen
+    {
+        public SpectatorResultsScreen(ScoreInfo score)
+            : base(score)
+        {
+        }
+
+        [Resolved]
+        private SpectatorStreamingClient spectatorStreaming { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
+        }
+
+        private void userBeganPlaying(int userId, SpectatorState state)
+        {
+            if (userId == Score.UserID)
+                Schedule(this.Exit);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (spectatorStreaming != null)
+                spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
+        }
+    }
+}

From 2d73dfbe39067052d37310bc7031ad0f3d8681e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 18:16:19 +0900
Subject: [PATCH 05741/10326] Add more safety around beatmap panel and button
 display logic

---
 osu.Game/Screens/Play/Spectator.cs | 32 ++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 11cdb66087..d97883069e 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -183,14 +183,22 @@ namespace osu.Game.Screens.Play
             if (userId != targetUser.Id)
                 return;
 
-            if (replay == null) return;
+            if (replay != null)
+            {
+                replay.HasReceivedAllFrames = true;
+                replay = null;
+            }
 
-            replay.HasReceivedAllFrames = true;
-            replay = null;
+            // not really going to start anything, but will clear the beatmap card out.
+            attemptStart();
         }
 
         private void attemptStart()
         {
+            watchButton.Enabled.Value = false;
+
+            showBeatmapPanel(state);
+
             var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == state.RulesetID)?.CreateInstance();
 
             // ruleset not available
@@ -202,13 +210,8 @@ namespace osu.Game.Screens.Play
 
             var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == state.BeatmapID);
 
-            showBeatmapPanel(state.BeatmapID.Value);
-
             if (resolvedBeatmap == null)
-            {
-                watchButton.Enabled.Value = false;
                 return;
-            }
 
             var scoreInfo = new ScoreInfo
             {
@@ -231,11 +234,20 @@ namespace osu.Game.Screens.Play
             }));
         }
 
-        private void showBeatmapPanel(int beatmapId)
+        private void showBeatmapPanel(SpectatorState state)
         {
-            var req = new GetBeatmapSetRequest(beatmapId, BeatmapSetLookupType.BeatmapId);
+            if (state.BeatmapID == null)
+            {
+                beatmapPanelContainer.Clear();
+                return;
+            }
+
+            var req = new GetBeatmapSetRequest(state.BeatmapID.Value, BeatmapSetLookupType.BeatmapId);
             req.Success += res => Schedule(() =>
             {
+                if (state != this.state)
+                    return;
+
                 beatmapPanelContainer.Child = new GridBeatmapPanel(res.ToBeatmapSet(rulesets));
             });
 

From 344ff8f4bc9bf76c98abe6c690917ce39d2ef55e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 18:35:20 +0900
Subject: [PATCH 05742/10326] "Improve" visuals of spectator screen

---
 osu.Game/Screens/Play/Spectator.cs | 134 ++++++++++++++++++-----------
 1 file changed, 86 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index d97883069e..19409ade93 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -9,6 +9,8 @@ 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.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -24,6 +26,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Scoring;
+using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Users;
 using osuTK;
 
@@ -72,55 +75,83 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
-            InternalChildren = new Drawable[]
+            InternalChild = new Container
             {
-                new FillFlowContainer
+                Masking = true,
+                CornerRadius = 20,
+                AutoSizeAxes = Axes.Both,
+                AutoSizeDuration = 500,
+                AutoSizeEasing = Easing.OutQuint,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new Drawable[]
                 {
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Spacing = new Vector2(15),
-                    Children = new Drawable[]
+                    new Box
                     {
-                        new OsuSpriteText
+                        Colour = colours.GreySeafoamDark,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new FillFlowContainer
+                    {
+                        Margin = new MarginPadding(20),
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Spacing = new Vector2(15),
+                        Children = new Drawable[]
                         {
-                            Text = "Currently spectating",
-                            Font = OsuFont.Default.With(size: 30),
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        },
-                        new UserGridPanel(targetUser)
-                        {
-                            Width = 290,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        },
-                        new OsuSpriteText
-                        {
-                            Text = "playing",
-                            Font = OsuFont.Default.With(size: 30),
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        },
-                        beatmapPanelContainer = new Container
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        },
-                        watchButton = new TriangleButton
-                        {
-                            Text = "Watch",
-                            Width = 250,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Action = attemptStart
+                            new OsuSpriteText
+                            {
+                                Text = "Spectator Mode",
+                                Font = OsuFont.Default.With(size: 30),
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                            },
+                            new FillFlowContainer
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Spacing = new Vector2(15),
+                                Children = new Drawable[]
+                                {
+                                    new UserGridPanel(targetUser)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Height = 145,
+                                        Width = 290,
+                                    },
+                                    new SpriteIcon
+                                    {
+                                        Size = new Vector2(40),
+                                        Icon = FontAwesome.Solid.ArrowRight,
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                    },
+                                    beatmapPanelContainer = new Container
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                    },
+                                }
+                            },
+                            watchButton = new PurpleTriangleButton
+                            {
+                                Text = "Start Watching",
+                                Width = 250,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Action = attemptStart
+                            }
                         }
                     }
-                },
+                }
             };
         }
 
@@ -141,7 +172,7 @@ namespace osu.Game.Screens.Play
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> beatmap)
         {
             if (beatmap.NewValue.TryGetTarget(out var beatmapSet) && beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == state.BeatmapID))
-                attemptStart();
+                Schedule(attemptStart);
         }
 
         private void userSentFrames(int userId, FrameDataBundle data)
@@ -189,14 +220,18 @@ namespace osu.Game.Screens.Play
                 replay = null;
             }
 
-            // not really going to start anything, but will clear the beatmap card out.
-            attemptStart();
+            clearDisplay();
+        }
+
+        private void clearDisplay()
+        {
+            watchButton.Enabled.Value = false;
+            beatmapPanelContainer.Clear();
         }
 
         private void attemptStart()
         {
-            watchButton.Enabled.Value = false;
-
+            clearDisplay();
             showBeatmapPanel(state);
 
             var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == state.RulesetID)?.CreateInstance();
@@ -213,6 +248,9 @@ namespace osu.Game.Screens.Play
             if (resolvedBeatmap == null)
                 return;
 
+            if (replay == null)
+                return;
+
             var scoreInfo = new ScoreInfo
             {
                 Beatmap = resolvedBeatmap,
@@ -236,7 +274,7 @@ namespace osu.Game.Screens.Play
 
         private void showBeatmapPanel(SpectatorState state)
         {
-            if (state.BeatmapID == null)
+            if (state?.BeatmapID == null)
             {
                 beatmapPanelContainer.Clear();
                 return;

From 93e3e1a4dbcc053f6c6a1f7d319a0a99aca0fc46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 18:40:06 +0900
Subject: [PATCH 05743/10326] Don't inherit ReplayPlayer to make results screen
 work correctly

---
 osu.Game/Screens/Play/SpectatorPlayer.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index 93e755f30a..bd05665ae7 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -11,11 +11,16 @@ using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Play
 {
-    public class SpectatorPlayer : ReplayPlayer
+    public class SpectatorPlayer : Player
     {
+        private readonly Score score;
+
+        protected override bool CheckModsAllowFailure() => false; // todo: better support starting mid-way through beatmap
+
         public SpectatorPlayer(Score score)
-            : base(score)
+            : base(true, true)
         {
+            this.score = score;
         }
 
         protected override ResultsScreen CreateResults(ScoreInfo score)
@@ -32,9 +37,14 @@ namespace osu.Game.Screens.Play
             spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
         }
 
+        protected override void PrepareReplay()
+        {
+            DrawableRuleset?.SetReplayScore(score);
+        }
+
         private void userBeganPlaying(int userId, SpectatorState state)
         {
-            if (userId == Score.ScoreInfo.UserID)
+            if (userId == score.ScoreInfo.UserID)
                 Schedule(this.Exit);
         }
 
@@ -49,7 +59,7 @@ namespace osu.Game.Screens.Play
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
         {
             // if we already have frames, start gameplay at the point in time they exist, should they be too far into the beatmap.
-            double? firstFrameTime = Score.Replay.Frames.FirstOrDefault()?.Time;
+            double? firstFrameTime = score.Replay.Frames.FirstOrDefault()?.Time;
 
             if (firstFrameTime == null || firstFrameTime <= gameplayStart + 5000)
                 return base.CreateGameplayClockContainer(beatmap, gameplayStart);

From 4df811985214df8702d772ecb1590eab0947c7fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 18:45:09 +0900
Subject: [PATCH 05744/10326] Add missing schedule

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

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 19409ade93..9b26bd5ba3 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -220,7 +220,7 @@ namespace osu.Game.Screens.Play
                 replay = null;
             }
 
-            clearDisplay();
+            Schedule(clearDisplay);
         }
 
         private void clearDisplay()

From 98070898348848f6e8e7d23bc7de5373fdc46a26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 18:47:15 +0900
Subject: [PATCH 05745/10326] Fix screen exit potentially occuring during
 transition

---
 osu.Game/Screens/Play/SpectatorPlayer.cs        | 7 ++++++-
 osu.Game/Screens/Play/SpectatorResultsScreen.cs | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index bd05665ae7..7c2f8742ba 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -45,7 +45,12 @@ namespace osu.Game.Screens.Play
         private void userBeganPlaying(int userId, SpectatorState state)
         {
             if (userId == score.ScoreInfo.UserID)
-                Schedule(this.Exit);
+            {
+                Schedule(() =>
+                {
+                    if (this.IsCurrentScreen()) this.Exit();
+                });
+            }
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Play/SpectatorResultsScreen.cs b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
index bb1bdee3a9..56ccfd2253 100644
--- a/osu.Game/Screens/Play/SpectatorResultsScreen.cs
+++ b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
@@ -28,7 +28,12 @@ namespace osu.Game.Screens.Play
         private void userBeganPlaying(int userId, SpectatorState state)
         {
             if (userId == Score.UserID)
-                Schedule(this.Exit);
+            {
+                Schedule(() =>
+                {
+                    if (this.IsCurrentScreen()) this.Exit();
+                });
+            }
         }
 
         protected override void Dispose(bool isDisposing)

From 93fd9138762dfcb0a41b07d8f6b04dfe2e2b2129 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 19:03:01 +0900
Subject: [PATCH 05746/10326] Add setting to allow automatically downloading
 during a spectating session

---
 osu.Game/Configuration/OsuConfigManager.cs    |  3 ++
 .../Settings/Sections/Online/WebSettings.cs   |  6 +++
 osu.Game/Screens/Play/Spectator.cs            | 39 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 7d601c0cb9..d22daf697c 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Configuration
             Set(OsuSetting.Username, string.Empty);
             Set(OsuSetting.Token, string.Empty);
 
+            Set(OsuSetting.AutomaticallyDownloadWhenSpectating, false);
+
             Set(OsuSetting.SavePassword, false).ValueChanged += enabled =>
             {
                 if (enabled.NewValue) Set(OsuSetting.SaveUsername, true);
@@ -239,5 +241,6 @@ namespace osu.Game.Configuration
         HitLighting,
         MenuBackgroundSource,
         GameplayDisableWinKey,
+        AutomaticallyDownloadWhenSpectating,
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index 6461bd7b93..8134c350a6 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -27,6 +27,12 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                     Keywords = new[] { "no-video" },
                     Current = config.GetBindable<bool>(OsuSetting.PreferNoVideo)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Automatically download beatmaps when spectating",
+                    Keywords = new[] { "spectator" },
+                    Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
+                },
             };
         }
     }
diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 9b26bd5ba3..33e97bdff3 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -7,12 +7,14 @@ using System.Linq;
 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.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -20,6 +22,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays.BeatmapListing.Panels;
+using osu.Game.Overlays.Settings;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -69,13 +72,17 @@ namespace osu.Game.Screens.Play
 
         private TriangleButton watchButton;
 
+        private SettingsCheckbox automaticDownload;
+
+        private BeatmapSetInfo onlineBeatmap;
+
         public Spectator([NotNull] User targetUser)
         {
             this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, OsuConfigManager config)
         {
             InternalChild = new Container
             {
@@ -141,6 +148,13 @@ namespace osu.Game.Screens.Play
                                     },
                                 }
                             },
+                            automaticDownload = new SettingsCheckbox
+                            {
+                                LabelText = "Automatically download beatmaps",
+                                Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                            },
                             watchButton = new PurpleTriangleButton
                             {
                                 Text = "Start Watching",
@@ -167,6 +181,8 @@ namespace osu.Game.Screens.Play
 
             managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
+
+            automaticDownload.Current.BindValueChanged(_ => checkForAutomaticDownload());
         }
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> beatmap)
@@ -246,7 +262,9 @@ namespace osu.Game.Screens.Play
             var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == state.BeatmapID);
 
             if (resolvedBeatmap == null)
+            {
                 return;
+            }
 
             if (replay == null)
                 return;
@@ -277,6 +295,7 @@ namespace osu.Game.Screens.Play
             if (state?.BeatmapID == null)
             {
                 beatmapPanelContainer.Clear();
+                onlineBeatmap = null;
                 return;
             }
 
@@ -286,12 +305,28 @@ namespace osu.Game.Screens.Play
                 if (state != this.state)
                     return;
 
-                beatmapPanelContainer.Child = new GridBeatmapPanel(res.ToBeatmapSet(rulesets));
+                onlineBeatmap = res.ToBeatmapSet(rulesets);
+                beatmapPanelContainer.Child = new GridBeatmapPanel(onlineBeatmap);
+                checkForAutomaticDownload();
             });
 
             api.Queue(req);
         }
 
+        private void checkForAutomaticDownload()
+        {
+            if (onlineBeatmap == null)
+                return;
+
+            if (!automaticDownload.Current.Value)
+                return;
+
+            if (beatmaps.IsAvailableLocally(onlineBeatmap))
+                return;
+
+            beatmaps.Download(onlineBeatmap);
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From dd2f44f393e6cf16ef4f1a40f6b74ff4174219d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 19:39:38 +0900
Subject: [PATCH 05747/10326] Add basic "currently watching" text to player to
 signify that spectator is active

---
 osu.Game/Screens/Play/SpectatorPlayer.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index 7c2f8742ba..2f98647d3e 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -3,8 +3,11 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Spectator;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
@@ -35,6 +38,15 @@ namespace osu.Game.Screens.Play
         private void load()
         {
             spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
+
+            AddInternal(new OsuSpriteText
+            {
+                Text = $"Watching {score.ScoreInfo.User.Username} playing live!",
+                Font = OsuFont.Default.With(size: 30),
+                Y = 100,
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+            });
         }
 
         protected override void PrepareReplay()

From 25ab3a5feafcd037bc475aeea1c3d8119185e70b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 22:10:37 +0900
Subject: [PATCH 05748/10326] Construct replay after being sure a ruleset is
 available to avoid nullrefs

---
 osu.Game/Screens/Play/Spectator.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 51cd5b59aa..6a11aeb0e9 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -160,8 +160,6 @@ namespace osu.Game.Screens.Play
             if (userId != targetUser.Id)
                 return;
 
-            replay ??= new Replay { HasReceivedAllFrames = false };
-
             this.state = state;
 
             Schedule(attemptStart);
@@ -197,6 +195,8 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
+            replay ??= new Replay { HasReceivedAllFrames = false };
+
             var scoreInfo = new ScoreInfo
             {
                 Beatmap = resolvedBeatmap,

From 5d02de29ca1476a4989ecf74ee6583e32dd12005 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 22:50:45 +0900
Subject: [PATCH 05749/10326] Fix attempt to change ruleset/beatmap bindables
 while screen is not active

---
 osu.Game/Screens/Play/Spectator.cs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 6a11aeb0e9..2f65dc06d0 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -63,6 +63,11 @@ namespace osu.Game.Screens.Play
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
+        /// <summary>
+        /// Becomes true if a new state is waiting to be loaded (while this screen was not active).
+        /// </summary>
+        private bool newStatePending;
+
         public Spectator([NotNull] User targetUser)
         {
             this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
@@ -162,7 +167,21 @@ namespace osu.Game.Screens.Play
 
             this.state = state;
 
-            Schedule(attemptStart);
+            if (this.IsCurrentScreen())
+                Schedule(attemptStart);
+            else
+                newStatePending = true;
+        }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+
+            if (newStatePending)
+            {
+                attemptStart();
+                newStatePending = false;
+            }
         }
 
         private void userFinishedPlaying(int userId, SpectatorState state)

From 8bbcb9be8a7a8bd11b8192f7ee0c0722fe96b62d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 22:50:57 +0900
Subject: [PATCH 05750/10326] Always use imported beatmap in tests

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 5a2230dd64..b4ab22cfad 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -36,13 +36,21 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private int nextFrame;
 
+        private BeatmapSetInfo importedBeatmap;
+
+        private int importedBeatmapId;
+
         public override void SetUpSteps()
         {
             base.SetUpSteps();
 
             AddStep("reset sent frames", () => nextFrame = 0);
 
-            AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).Wait());
+            AddStep("import beatmap", () =>
+            {
+                importedBeatmap = ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).Result;
+                importedBeatmapId = importedBeatmap.Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID ?? -1;
+            });
 
             AddStep("add streaming client", () =>
             {
@@ -115,6 +123,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
             sendFrames();
+
             start();
             sendFrames();
         }
@@ -157,7 +166,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void waitForPlayer() => AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
 
-        private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(beatmapId));
+        private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(beatmapId ?? importedBeatmapId));
 
         private void checkPaused(bool state) =>
             AddAssert($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
@@ -179,18 +188,21 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         internal class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
-            [Resolved]
-            private BeatmapManager beatmaps { get; set; }
-
             public readonly User StreamingUser = new User { Id = 1234, Username = "Test user" };
 
-            public void StartPlay(int? beatmapId = null) => sendState(beatmapId);
+            private int beatmapId;
 
-            public void EndPlay()
+            public void StartPlay(int beatmapId)
+            {
+                this.beatmapId = beatmapId;
+                sendState(beatmapId);
+            }
+
+            public void EndPlay(int beatmapId)
             {
                 ((ISpectatorClient)this).UserFinishedPlaying((int)StreamingUser.Id, new SpectatorState
                 {
-                    BeatmapID = beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,
+                    BeatmapID = beatmapId,
                     RulesetID = 0,
                 });
             }
@@ -212,7 +224,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 ((ISpectatorClient)this).UserSentFrames((int)StreamingUser.Id, bundle);
 
                 if (!sentState)
-                    sendState();
+                    sendState(beatmapId);
             }
 
             public override void WatchUser(int userId)
@@ -220,18 +232,18 @@ namespace osu.Game.Tests.Visual.Gameplay
                 if (sentState)
                 {
                     // usually the server would do this.
-                    sendState();
+                    sendState(beatmapId);
                 }
 
                 base.WatchUser(userId);
             }
 
-            private void sendState(int? beatmapId = null)
+            private void sendState(int beatmapId)
             {
                 sentState = true;
                 ((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState
                 {
-                    BeatmapID = beatmapId ?? beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,
+                    BeatmapID = beatmapId,
                     RulesetID = 0,
                 });
             }

From 1d499ec15d5ce31cd05337f9ead39a33562f267e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 22:51:35 +0900
Subject: [PATCH 05751/10326] Change beatmap not existing test to specify a
 beatmap ID that can't possibly exist

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index b4ab22cfad..0b530a303f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             loadSpectatingScreen();
 
-            start(88);
+            start(-1234);
             sendFrames();
 
             AddAssert("screen didn't change", () => Stack.CurrentScreen is Spectator);

From 7cc4a7cb5cdd419af637f6bcd1e631bc8321f6ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 22:59:54 +0900
Subject: [PATCH 05752/10326] Add more accurate fail scenario test logic

---
 .../Visual/Gameplay/TestSceneSpectator.cs           | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 0b530a303f..7dde493b1a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
             waitForPlayer();
-            AddUntilStep("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
+            checkPaused(true);
 
             sendFrames();
 
@@ -134,8 +134,13 @@ namespace osu.Game.Tests.Visual.Gameplay
             loadSpectatingScreen();
 
             start();
-            sendFrames();
 
+            waitForPlayer();
+            checkPaused(true);
+
+            finish();
+
+            checkPaused(false);
             // TODO: should replay until running out of frames then fail
         }
 
@@ -168,8 +173,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(beatmapId ?? importedBeatmapId));
 
+        private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorStreamingClient.EndPlay(beatmapId ?? importedBeatmapId));
+
         private void checkPaused(bool state) =>
-            AddAssert($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
+            AddUntilStep($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
 
         private void sendFrames(int count = 10)
         {

From 6c2cee7b3fb187348fc099617bbdde37966404a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 23:13:42 +0900
Subject: [PATCH 05753/10326] Avoid cross-pollution between tests of current
 playing state

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 7dde493b1a..6485cbdad3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -57,6 +57,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Remove(testSpectatorStreamingClient);
                 Add(testSpectatorStreamingClient);
             });
+
+            finish();
         }
 
         private OsuFramedReplayInputHandler replayHandler =>
@@ -212,6 +214,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                     BeatmapID = beatmapId,
                     RulesetID = 0,
                 });
+
+                sentState = false;
             }
 
             private bool sentState;

From bca317b1518a2f67dc7592736b36552f1bda600d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Oct 2020 23:43:16 +0900
Subject: [PATCH 05754/10326] Remove excess using statement

---
 osu.Game/Screens/Play/Spectator.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 34e7bb1bda..2c8b5c4cad 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -7,7 +7,6 @@ using System.Linq;
 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.Shapes;

From 4f6081c7f3f48fcedc899665a32e89b4a757e45c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 28 Oct 2020 19:44:13 +0300
Subject: [PATCH 05755/10326] Use BindableList<T>

---
 .../TestSceneBeatmapListingSearchControl.cs   |  4 +--
 .../BeatmapListingFilterControl.cs            |  8 ++---
 .../BeatmapListingSearchControl.cs            |  5 ++-
 .../BeatmapListing/BeatmapSearchFilterRow.cs  |  2 +-
 ...BeatmapSearchMultipleSelectionFilterRow.cs | 35 ++++++++-----------
 5 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index e07aa71b1f..3f757031f8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -61,8 +61,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.Category.BindValueChanged(c => category.Text = $"Category: {c.NewValue}", true);
             control.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);
             control.Language.BindValueChanged(l => language.Text = $"Language: {l.NewValue}", true);
-            control.Extra.BindValueChanged(e => extra.Text = $"Extra: {(e.NewValue == null ? "" : string.Join('.', e.NewValue.Select(i => i.ToString().ToLowerInvariant())))}", true);
-            control.Ranks.BindValueChanged(r => ranks.Text = $"Ranks: {(r.NewValue == null ? "" : string.Join('.', r.NewValue.Select(i => i.ToString())))}", true);
+            control.Extra.BindCollectionChanged((u, v) => extra.Text = $"Extra: {(control.Extra.Any() ? string.Join('.', control.Extra.Select(i => i.ToString().ToLowerInvariant())) : "")}", true);
+            control.Ranks.BindCollectionChanged((u, v) => ranks.Text = $"Ranks: {(control.Ranks.Any() ? string.Join('.', control.Ranks.Select(i => i.ToString())) : "")}", true);
             control.Played.BindValueChanged(p => played.Text = $"Played: {p.NewValue}", true);
         }
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 86bf3276fe..71f0d8c522 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -130,8 +130,8 @@ namespace osu.Game.Overlays.BeatmapListing
             searchControl.Category.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Genre.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Language.BindValueChanged(_ => queueUpdateSearch());
-            searchControl.Extra.BindValueChanged(_ => queueUpdateSearch());
-            searchControl.Ranks.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.Extra.CollectionChanged += (u, v) => queueUpdateSearch();
+            searchControl.Ranks.CollectionChanged += (u, v) => queueUpdateSearch();
             searchControl.Played.BindValueChanged(_ => queueUpdateSearch());
 
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
@@ -183,8 +183,8 @@ namespace osu.Game.Overlays.BeatmapListing
                 sortControl.SortDirection.Value,
                 searchControl.Genre.Value,
                 searchControl.Language.Value,
-                searchControl.Extra.Value,
-                searchControl.Ranks.Value,
+                searchControl.Extra,
+                searchControl.Ranks,
                 searchControl.Played.Value);
 
             getSetsRequest.Success += response =>
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index a976890c7c..4fc5c5315b 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -13,7 +13,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osuTK.Graphics;
 using osu.Game.Rulesets;
-using System.Collections.Generic;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -29,9 +28,9 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<SearchLanguage> Language => languageFilter.Current;
 
-        public Bindable<List<SearchExtra>> Extra => extraFilter.Current;
+        public BindableList<SearchExtra> Extra => extraFilter.Current;
 
-        public Bindable<List<SearchRank>> Ranks => ranksFilter.Current;
+        public BindableList<SearchRank> Ranks => ranksFilter.Current;
 
         public Bindable<SearchPlayed> Played => playedFilter.Current;
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index aa0fc0d00e..b429a5277b 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.BeatmapListing
             });
 
             if (filter is IHasCurrentValue<T> filterWithValue)
-                filterWithValue.Current = current;
+                Current = filterWithValue.Current;
         }
 
         [NotNull]
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
index cb89560e39..993b475f32 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osuTK;
 
@@ -15,22 +14,21 @@ namespace osu.Game.Overlays.BeatmapListing
 {
     public class BeatmapSearchMultipleSelectionFilterRow<T> : BeatmapSearchFilterRow<List<T>>
     {
+        public new readonly BindableList<T> Current = new BindableList<T>();
+
+        private MultipleSelectionFilter filter;
+
         public BeatmapSearchMultipleSelectionFilterRow(string headerName)
             : base(headerName)
         {
+            Current.BindTo(filter.Current);
         }
 
-        protected override Drawable CreateFilter() => new MultipleSelectionFilter();
+        protected override Drawable CreateFilter() => filter = new MultipleSelectionFilter();
 
-        private class MultipleSelectionFilter : FillFlowContainer<MultipleSelectionFilterTabItem>, IHasCurrentValue<List<T>>
+        private class MultipleSelectionFilter : FillFlowContainer<MultipleSelectionFilterTabItem>
         {
-            private readonly BindableWithCurrent<List<T>> current = new BindableWithCurrent<List<T>>();
-
-            public Bindable<List<T>> Current
-            {
-                get => current.Current;
-                set => current.Current = value;
-            }
+            public readonly BindableList<T> Current = new BindableList<T>();
 
             public MultipleSelectionFilter()
             {
@@ -43,20 +41,15 @@ namespace osu.Game.Overlays.BeatmapListing
                 ((T[])Enum.GetValues(typeof(T))).ForEach(i => Add(new MultipleSelectionFilterTabItem(i)));
 
                 foreach (var item in Children)
-                    item.Active.BindValueChanged(_ => updateBindable());
+                    item.Active.BindValueChanged(active => updateBindable(item.Value, active.NewValue));
             }
 
-            private void updateBindable()
+            private void updateBindable(T value, bool active)
             {
-                var selectedValues = new List<T>();
-
-                foreach (var item in Children)
-                {
-                    if (item.Active.Value)
-                        selectedValues.Add(item.Value);
-                }
-
-                Current.Value = selectedValues;
+                if (active)
+                    Current.Add(value);
+                else
+                    Current.Remove(value);
             }
         }
 

From 5c2c5f200075a4f7f19a089a9db3775a11b73668 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 28 Oct 2020 23:35:08 +0300
Subject: [PATCH 05756/10326] Use existing ScoreRank for rank filter

---
 .../API/Requests/SearchBeatmapSetsRequest.cs  |  5 +-
 .../BeatmapListingSearchControl.cs            |  7 +--
 ...BeatmapSearchMultipleSelectionFilterRow.cs | 14 ++++--
 .../BeatmapSearchScoreFilterRow.cs            | 48 +++++++++++++++++++
 .../Overlays/BeatmapListing/FilterTabItem.cs  |  4 +-
 .../Overlays/BeatmapListing/SearchRank.cs     | 24 ----------
 6 files changed, 68 insertions(+), 34 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs
 delete mode 100644 osu.Game/Overlays/BeatmapListing/SearchRank.cs

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 708b58d954..ed67c5f5ca 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -8,6 +8,7 @@ using osu.Game.Extensions;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Rulesets;
+using osu.Game.Scoring;
 
 namespace osu.Game.Online.API.Requests
 {
@@ -27,7 +28,7 @@ namespace osu.Game.Online.API.Requests
 
         public SearchPlayed Played { get; }
 
-        public IReadOnlyCollection<SearchRank> Ranks { get; }
+        public IReadOnlyCollection<ScoreRank> Ranks { get; }
 
         private readonly string query;
         private readonly RulesetInfo ruleset;
@@ -45,7 +46,7 @@ namespace osu.Game.Online.API.Requests
             SearchGenre genre = SearchGenre.Any,
             SearchLanguage language = SearchLanguage.Any,
             IReadOnlyCollection<SearchExtra> extra = null,
-            IReadOnlyCollection<SearchRank> ranks = null,
+            IReadOnlyCollection<ScoreRank> ranks = null,
             SearchPlayed played = SearchPlayed.Any)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 4fc5c5315b..3694c9855e 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osuTK.Graphics;
 using osu.Game.Rulesets;
+using osu.Game.Scoring;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -30,7 +31,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public BindableList<SearchExtra> Extra => extraFilter.Current;
 
-        public BindableList<SearchRank> Ranks => ranksFilter.Current;
+        public BindableList<ScoreRank> Ranks => ranksFilter.Current;
 
         public Bindable<SearchPlayed> Played => playedFilter.Current;
 
@@ -55,7 +56,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchFilterRow<SearchGenre> genreFilter;
         private readonly BeatmapSearchFilterRow<SearchLanguage> languageFilter;
         private readonly BeatmapSearchMultipleSelectionFilterRow<SearchExtra> extraFilter;
-        private readonly BeatmapSearchMultipleSelectionFilterRow<SearchRank> ranksFilter;
+        private readonly BeatmapSearchScoreFilterRow ranksFilter;
         private readonly BeatmapSearchFilterRow<SearchPlayed> playedFilter;
 
         private readonly Box background;
@@ -115,7 +116,7 @@ namespace osu.Game.Overlays.BeatmapListing
                                     genreFilter = new BeatmapSearchFilterRow<SearchGenre>(@"Genre"),
                                     languageFilter = new BeatmapSearchFilterRow<SearchLanguage>(@"Language"),
                                     extraFilter = new BeatmapSearchMultipleSelectionFilterRow<SearchExtra>(@"Extra"),
-                                    ranksFilter = new BeatmapSearchMultipleSelectionFilterRow<SearchRank>(@"Rank Achieved"),
+                                    ranksFilter = new BeatmapSearchScoreFilterRow(),
                                     playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played")
                                 }
                             }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
index 993b475f32..87e60c5bdd 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
@@ -24,9 +24,11 @@ namespace osu.Game.Overlays.BeatmapListing
             Current.BindTo(filter.Current);
         }
 
-        protected override Drawable CreateFilter() => filter = new MultipleSelectionFilter();
+        protected override Drawable CreateFilter() => filter = CreateMultipleSelectionFilter();
 
-        private class MultipleSelectionFilter : FillFlowContainer<MultipleSelectionFilterTabItem>
+        protected virtual MultipleSelectionFilter CreateMultipleSelectionFilter() => new MultipleSelectionFilter();
+
+        protected class MultipleSelectionFilter : FillFlowContainer<MultipleSelectionFilterTabItem>
         {
             public readonly BindableList<T> Current = new BindableList<T>();
 
@@ -38,12 +40,16 @@ namespace osu.Game.Overlays.BeatmapListing
                 Height = 15;
                 Spacing = new Vector2(10, 0);
 
-                ((T[])Enum.GetValues(typeof(T))).ForEach(i => Add(new MultipleSelectionFilterTabItem(i)));
+                GetValues().ForEach(i => Add(CreateTabItem(i)));
 
                 foreach (var item in Children)
                     item.Active.BindValueChanged(active => updateBindable(item.Value, active.NewValue));
             }
 
+            protected virtual T[] GetValues() => (T[])Enum.GetValues(typeof(T));
+
+            protected virtual MultipleSelectionFilterTabItem CreateTabItem(T value) => new MultipleSelectionFilterTabItem(value);
+
             private void updateBindable(T value, bool active)
             {
                 if (active)
@@ -53,7 +59,7 @@ namespace osu.Game.Overlays.BeatmapListing
             }
         }
 
-        private class MultipleSelectionFilterTabItem : FilterTabItem<T>
+        protected class MultipleSelectionFilterTabItem : FilterTabItem<T>
         {
             public MultipleSelectionFilterTabItem(T value)
                 : base(value)
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs
new file mode 100644
index 0000000000..f741850f07
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.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.Linq;
+using osu.Game.Scoring;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapSearchScoreFilterRow : BeatmapSearchMultipleSelectionFilterRow<ScoreRank>
+    {
+        public BeatmapSearchScoreFilterRow()
+            : base(@"Rank Achieved")
+        {
+        }
+
+        protected override MultipleSelectionFilter CreateMultipleSelectionFilter() => new RankFilter();
+
+        private class RankFilter : MultipleSelectionFilter
+        {
+            protected override MultipleSelectionFilterTabItem CreateTabItem(ScoreRank value) => new RankItem(value);
+
+            protected override ScoreRank[] GetValues() => base.GetValues().Reverse().ToArray();
+        }
+
+        private class RankItem : MultipleSelectionFilterTabItem
+        {
+            public RankItem(ScoreRank value)
+                : base(value)
+            {
+            }
+
+            protected override string CreateText(ScoreRank value)
+            {
+                switch (value)
+                {
+                    case ScoreRank.XH:
+                        return @"Silver SS";
+
+                    case ScoreRank.SH:
+                        return @"Silver S";
+
+                    default:
+                        return base.CreateText(value);
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
index 244ef5a703..c45a82bef1 100644
--- a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
+++ b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 text = new OsuSpriteText
                 {
                     Font = OsuFont.GetFont(size: 13, weight: FontWeight.Regular),
-                    Text = (value as Enum)?.GetDescription() ?? value.ToString()
+                    Text = CreateText(value)
                 },
                 new HoverClickSounds()
             });
@@ -63,6 +63,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         protected override void OnDeactivated() => updateState();
 
+        protected virtual string CreateText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
+
         private void updateState()
         {
             text.FadeColour(IsHovered ? colourProvider.Light1 : getStateColour(), 200, Easing.OutQuint);
diff --git a/osu.Game/Overlays/BeatmapListing/SearchRank.cs b/osu.Game/Overlays/BeatmapListing/SearchRank.cs
deleted file mode 100644
index 8b1882026c..0000000000
--- a/osu.Game/Overlays/BeatmapListing/SearchRank.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.ComponentModel;
-
-namespace osu.Game.Overlays.BeatmapListing
-{
-    public enum SearchRank
-    {
-        [Description(@"Silver SS")]
-        XH,
-
-        [Description(@"SS")]
-        X,
-
-        [Description(@"Silver S")]
-        SH,
-        S,
-        A,
-        B,
-        C,
-        D
-    }
-}

From 202fe093065ef46560555d78402fbf3c49f8a762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 28 Oct 2020 22:03:59 +0100
Subject: [PATCH 05757/10326] Group selection actions back up in
 SelectionHandler

---
 .../Sliders/SliderSelectionBlueprint.cs         |  4 ++--
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs    | 17 -----------------
 .../Compose/Components/BlueprintContainer.cs    |  7 -------
 .../Edit/Compose/Components/SelectionHandler.cs |  5 ++++-
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index ca9ec886d5..d3fb5defae 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -107,14 +107,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             {
                 case MouseButton.Right:
                     rightClickPosition = e.MouseDownPosition;
-                    break;
+                    return false; // Allow right click to be handled by context menu
 
                 case MouseButton.Left when e.ControlPressed && IsSelected:
                     placementControlPointIndex = addControlPoint(e.MousePosition);
                     return true; // Stop input from being handled and modifying the selection
             }
 
-            return base.OnMouseDown(e);
+            return false;
         }
 
         private int? placementControlPointIndex;
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 87ef7e647f..f3816f6218 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -8,13 +8,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Screens.Edit;
 using osuTK;
-using osuTK.Input;
 
 namespace osu.Game.Rulesets.Edit
 {
@@ -55,20 +52,6 @@ namespace osu.Game.Rulesets.Edit
             updateState();
         }
 
-        [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; }
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            if (e.CurrentState.Keyboard.ShiftPressed && e.IsPressed(MouseButton.Right))
-            {
-                editorBeatmap.Remove(HitObject);
-                return true;
-            }
-
-            return base.OnMouseDown(e);
-        }
-
         private SelectionState state;
 
         public event Action<SelectionState> StateChanged;
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7751df29cf..5ac360d029 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -298,13 +298,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             Debug.Assert(!clickSelectionBegan);
 
-            // Deselections are only allowed for control + left clicks
-            bool allowDeselection = e.ControlPressed && e.Button == MouseButton.Left;
-
-            // Todo: This is probably incorrectly disallowing multiple selections on stacked objects
-            if (!allowDeselection && SelectionHandler.SelectedBlueprints.Any(s => s.IsHovered))
-                return;
-
             foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
             {
                 if (blueprint.IsHovered)
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 24f88bf36d..01e23bafc5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -24,6 +24,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
@@ -224,7 +225,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="state">The input state at the point of selection.</param>
         internal void HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
         {
-            if (state.Keyboard.ControlPressed)
+            if (state.Keyboard.ShiftPressed && state.Mouse.IsPressed(MouseButton.Right))
+                EditorBeatmap.Remove(blueprint.HitObject);
+            else if (state.Keyboard.ControlPressed && state.Mouse.IsPressed(MouseButton.Left))
                 blueprint.ToggleSelection();
             else
                 ensureSelected(blueprint);

From fa53549ed271a7ff3486ff77835c93baa03ec48d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 28 Oct 2020 22:57:03 +0100
Subject: [PATCH 05758/10326] Mark request fields as possibly-null

---
 osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index ed67c5f5ca..bbaa7e745f 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.IO.Network;
 using osu.Game.Extensions;
 using osu.Game.Overlays;
@@ -24,10 +25,12 @@ namespace osu.Game.Online.API.Requests
 
         public SearchLanguage Language { get; }
 
+        [CanBeNull]
         public IReadOnlyCollection<SearchExtra> Extra { get; }
 
         public SearchPlayed Played { get; }
 
+        [CanBeNull]
         public IReadOnlyCollection<ScoreRank> Ranks { get; }
 
         private readonly string query;

From e77049eae39afb8cf363197079ccd9a4257c07b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 28 Oct 2020 22:58:51 +0100
Subject: [PATCH 05759/10326] Use discard-like lambda parameter names

---
 .../Overlays/BeatmapListing/BeatmapListingFilterControl.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 71f0d8c522..3be38e3c1d 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -130,8 +130,8 @@ namespace osu.Game.Overlays.BeatmapListing
             searchControl.Category.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Genre.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Language.BindValueChanged(_ => queueUpdateSearch());
-            searchControl.Extra.CollectionChanged += (u, v) => queueUpdateSearch();
-            searchControl.Ranks.CollectionChanged += (u, v) => queueUpdateSearch();
+            searchControl.Extra.CollectionChanged += (_, __) => queueUpdateSearch();
+            searchControl.Ranks.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Played.BindValueChanged(_ => queueUpdateSearch());
 
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());

From f5aedc96c4244974750c651a94976f17ed283ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 28 Oct 2020 23:07:54 +0100
Subject: [PATCH 05760/10326] Rework multiple selection filter

---
 ...BeatmapSearchMultipleSelectionFilterRow.cs | 23 ++++++++++++-------
 .../BeatmapSearchScoreFilterRow.cs            |  3 ++-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
index 87e60c5bdd..ae669e91dd 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
@@ -3,8 +3,9 @@
 
 using System;
 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;
@@ -32,7 +33,8 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             public readonly BindableList<T> Current = new BindableList<T>();
 
-            public MultipleSelectionFilter()
+            [BackgroundDependencyLoader]
+            private void load()
             {
                 Anchor = Anchor.BottomLeft;
                 Origin = Anchor.BottomLeft;
@@ -40,17 +42,22 @@ namespace osu.Game.Overlays.BeatmapListing
                 Height = 15;
                 Spacing = new Vector2(10, 0);
 
-                GetValues().ForEach(i => Add(CreateTabItem(i)));
-
-                foreach (var item in Children)
-                    item.Active.BindValueChanged(active => updateBindable(item.Value, active.NewValue));
+                AddRange(GetValues().Select(CreateTabItem));
             }
 
-            protected virtual T[] GetValues() => (T[])Enum.GetValues(typeof(T));
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                foreach (var item in Children)
+                    item.Active.BindValueChanged(active => toggleItem(item.Value, active.NewValue));
+            }
+
+            protected virtual IEnumerable<T> GetValues() => Enum.GetValues(typeof(T)).Cast<T>();
 
             protected virtual MultipleSelectionFilterTabItem CreateTabItem(T value) => new MultipleSelectionFilterTabItem(value);
 
-            private void updateBindable(T value, bool active)
+            private void toggleItem(T value, bool active)
             {
                 if (active)
                     Current.Add(value);
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs
index f741850f07..dc642cb4cd 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.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 System.Linq;
 using osu.Game.Scoring;
 
@@ -19,7 +20,7 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             protected override MultipleSelectionFilterTabItem CreateTabItem(ScoreRank value) => new RankItem(value);
 
-            protected override ScoreRank[] GetValues() => base.GetValues().Reverse().ToArray();
+            protected override IEnumerable<ScoreRank> GetValues() => base.GetValues().Reverse();
         }
 
         private class RankItem : MultipleSelectionFilterTabItem

From a8cefb0d4ce014b5944559188d2faf063fdfcf83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 28 Oct 2020 23:12:28 +0100
Subject: [PATCH 05761/10326] Rename method

---
 .../Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs | 5 +++--
 osu.Game/Overlays/BeatmapListing/FilterTabItem.cs          | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs
index dc642cb4cd..804962adfb 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions;
 using osu.Game.Scoring;
 
 namespace osu.Game.Overlays.BeatmapListing
@@ -30,7 +31,7 @@ namespace osu.Game.Overlays.BeatmapListing
             {
             }
 
-            protected override string CreateText(ScoreRank value)
+            protected override string LabelFor(ScoreRank value)
             {
                 switch (value)
                 {
@@ -41,7 +42,7 @@ namespace osu.Game.Overlays.BeatmapListing
                         return @"Silver S";
 
                     default:
-                        return base.CreateText(value);
+                        return value.GetDescription();
                 }
             }
         }
diff --git a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
index c45a82bef1..43913c7ce2 100644
--- a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
+++ b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 text = new OsuSpriteText
                 {
                     Font = OsuFont.GetFont(size: 13, weight: FontWeight.Regular),
-                    Text = CreateText(value)
+                    Text = LabelFor(value)
                 },
                 new HoverClickSounds()
             });
@@ -63,7 +63,10 @@ namespace osu.Game.Overlays.BeatmapListing
 
         protected override void OnDeactivated() => updateState();
 
-        protected virtual string CreateText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
+        /// <summary>
+        /// Returns the label text to be used for the supplied <paramref name="value"/>.
+        /// </summary>
+        protected virtual string LabelFor(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
 
         private void updateState()
         {

From 016e920aa9fff8a7b4c2aaf4236a70cfff5b3038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 28 Oct 2020 23:14:52 +0100
Subject: [PATCH 05762/10326] Move filter tab item hierarchy construction to
 BDL

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

diff --git a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
index 43913c7ce2..f02b515755 100644
--- a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
+++ b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
@@ -19,10 +19,15 @@ namespace osu.Game.Overlays.BeatmapListing
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        private readonly OsuSpriteText text;
+        private OsuSpriteText text;
 
         public FilterTabItem(T value)
             : base(value)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
             AutoSizeAxes = Axes.Both;
             Anchor = Anchor.BottomLeft;
@@ -32,17 +37,12 @@ namespace osu.Game.Overlays.BeatmapListing
                 text = new OsuSpriteText
                 {
                     Font = OsuFont.GetFont(size: 13, weight: FontWeight.Regular),
-                    Text = LabelFor(value)
+                    Text = LabelFor(Value)
                 },
                 new HoverClickSounds()
             });
 
             Enabled.Value = true;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
             updateState();
         }
 

From 1313ab89e76d0a0f5caaed1274c6a12971a34db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 28 Oct 2020 23:37:21 +0100
Subject: [PATCH 05763/10326] Add xmldoc to multiple selection row

---
 .../BeatmapSearchMultipleSelectionFilterRow.cs        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
index ae669e91dd..5dfa8e6109 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
@@ -25,8 +25,11 @@ namespace osu.Game.Overlays.BeatmapListing
             Current.BindTo(filter.Current);
         }
 
-        protected override Drawable CreateFilter() => filter = CreateMultipleSelectionFilter();
+        protected sealed override Drawable CreateFilter() => filter = CreateMultipleSelectionFilter();
 
+        /// <summary>
+        /// Creates a filter control that can be used to simultaneously select multiple values of type <typeparamref name="T"/>.
+        /// </summary>
         protected virtual MultipleSelectionFilter CreateMultipleSelectionFilter() => new MultipleSelectionFilter();
 
         protected class MultipleSelectionFilter : FillFlowContainer<MultipleSelectionFilterTabItem>
@@ -53,8 +56,14 @@ namespace osu.Game.Overlays.BeatmapListing
                     item.Active.BindValueChanged(active => toggleItem(item.Value, active.NewValue));
             }
 
+            /// <summary>
+            /// Returns all values to be displayed in this filter row.
+            /// </summary>
             protected virtual IEnumerable<T> GetValues() => Enum.GetValues(typeof(T)).Cast<T>();
 
+            /// <summary>
+            /// Creates a <see cref="MultipleSelectionFilterTabItem"/> representing the supplied <paramref name="value"/>.
+            /// </summary>
             protected virtual MultipleSelectionFilterTabItem CreateTabItem(T value) => new MultipleSelectionFilterTabItem(value);
 
             private void toggleItem(T value, bool active)

From 2e5a8b2287ce1b74f316671d9533faf87cb967f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 13:16:27 +0900
Subject: [PATCH 05764/10326] Fix xmldoc to read better in new context

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

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 6548bee4ef..595574115c 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -236,14 +236,13 @@ namespace osu.Game.Rulesets.UI
             NotValid,
 
             /// <summary>
-            /// Whether we are running up-to-date with our parent clock.
-            /// If not, we will need to keep processing children until we catch up.
+            /// Playback is running behind real-time. Catch-up will be attempted by processing more than once per
+            /// game loop (limited to a sane maximum to avoid frame drops).
             /// </summary>
             RequiresCatchUp,
 
             /// <summary>
-            /// Whether we are in a valid state (ie. should we keep processing children frames).
-            /// This should be set to false when the replay is, for instance, waiting for future frames to arrive.
+            /// In a valid state, progressing one child hierarchy loop per game loop.
             /// </summary>
             Valid
         }

From d91456dc2993705d44a30ce74c87bfe1595c973c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 14:25:47 +0900
Subject: [PATCH 05765/10326] Move initial validity check out of loop for
 clarity

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index f8156164c1..8edeaf851d 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -96,7 +96,10 @@ namespace osu.Game.Rulesets.UI
 
             int loops = MaxCatchUpFrames;
 
-            while (state != PlaybackState.NotValid && loops-- > 0)
+            if (state == PlaybackState.NotValid)
+                return true;
+
+            while (loops-- > 0)
             {
                 updateClock();
 

From db2b00068f024589f26b4ab247b824f030a88b2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 14:42:16 +0900
Subject: [PATCH 05766/10326] Avoid sourcing parent clock when in a paused
 state

---
 .../Rulesets/UI/FrameStabilityContainer.cs    | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 8edeaf851d..75f3aa90ee 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -85,23 +85,31 @@ namespace osu.Game.Rulesets.UI
 
         public override bool UpdateSubTree()
         {
-            state = frameStableClock.IsPaused.Value ? PlaybackState.NotValid : PlaybackState.Valid;
+            double proposedTime = manualClock.CurrentTime;
 
             if (frameStableClock.WaitingOnFrames.Value)
             {
-                // for now, force one update loop to check if frames have arrived
-                // this may have to change in the future where we want stable user pausing during replay playback.
+                // when waiting on frames, the update loop still needs to be run (at least once) to check for newly arrived frames.
+                // time should not be sourced from the parent clock in this case.
                 state = PlaybackState.Valid;
             }
+            else if (!frameStableClock.IsPaused.Value)
+            {
+                state = PlaybackState.Valid;
+                proposedTime = parentGameplayClock.CurrentTime;
+            }
+            else
+            {
+                // time should not advance while paused, not should anything run.
+                state = PlaybackState.NotValid;
+                return true;
+            }
 
             int loops = MaxCatchUpFrames;
 
-            if (state == PlaybackState.NotValid)
-                return true;
-
             while (loops-- > 0)
             {
-                updateClock();
+                updateClock(ref proposedTime);
 
                 if (state == PlaybackState.NotValid)
                     break;
@@ -113,7 +121,7 @@ namespace osu.Game.Rulesets.UI
             return true;
         }
 
-        private void updateClock()
+        private void updateClock(ref double proposedTime)
         {
             if (parentGameplayClock == null)
                 setClock(); // LoadComplete may not be run yet, but we still want the clock.
@@ -121,9 +129,6 @@ namespace osu.Game.Rulesets.UI
             // each update start with considering things in valid state.
             state = PlaybackState.Valid;
 
-            // our goal is to catch up to the time provided by the parent clock.
-            var proposedTime = parentGameplayClock.CurrentTime;
-
             if (FrameStablePlayback)
                 // if we require frame stability, the proposed time will be adjusted to move at most one known
                 // frame interval in the current direction.

From c0960e60cb59a50ace68901ae8a71df26ebc0e7b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 14:52:34 +0900
Subject: [PATCH 05767/10326] Add note about testflight link

Sick of getting asked about this.
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7c749f3422..86c42dae12 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,8 @@ 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.AppImage) | [iOS(iOS 10+)](https://osu.ppy.sh/home/testflight) | [Android (5+)](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk)
 | ------------- | ------------- | ------------- | ------------- | ------------- |
 
+- The iOS testflight link may fill up (Apple has a hard limit of 10,000 users). We reset it occasionally when this happens. Please do not ask about this. Check back regularly for link resets or follow [peppy](https://twitter.com/ppy) on twitter for announcements of link resets.
+
 - 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 a59ea987b7811ee6e815d03e3af85e3d9bb27bae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 14:57:36 +0900
Subject: [PATCH 05768/10326] Make tests more resilient under headless
 execution

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 6485cbdad3..6c05049864 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -82,13 +82,21 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
             checkPaused(true);
 
+            double? pausedTime = null;
+
+            AddStep("store time", () => pausedTime = currentFrameStableTime);
+
             sendFrames();
 
-            checkPaused(false);
             AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
             checkPaused(true);
+
+            AddAssert("time advanced", () => currentFrameStableTime > pausedTime);
         }
 
+        private double currentFrameStableTime
+            => player.ChildrenOfType<FrameStabilityContainer>().First().FrameStableClock.CurrentTime;
+
         [Test]
         public void TestPlayStartsWithNoFrames()
         {
@@ -98,7 +106,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             waitForPlayer();
             checkPaused(true);
 
-            sendFrames();
+            sendFrames(1000); // send enough frames to ensure play won't be paused
 
             checkPaused(false);
         }

From 7dd3a748be4b0d7e7514d02f46b2a451a3bb3ae9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 15:03:38 +0900
Subject: [PATCH 05769/10326] Add further test logic to ensure retry / restart
 flow is working correctly

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 6c05049864..2b1bf1810b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -134,8 +134,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             start();
             sendFrames();
 
+            waitForPlayer();
+
+            Player lastPlayer = null;
+            AddStep("store first player", () => lastPlayer = player);
+
             start();
             sendFrames();
+
+            waitForPlayer();
+            AddAssert("player is different", () => lastPlayer != player);
         }
 
         [Test]

From 6a31a313b6236521bb877dced8da5fb394e0dc40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 15:08:06 +0900
Subject: [PATCH 05770/10326] Fix stop watching test to check correct screen
 presence

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 2b1bf1810b..7c62cf47f4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestHostStartsPlayingWhileAlreadyWatching()
+        public void TestHostRetriesWhileWatching()
         {
             loadSpectatingScreen();
 
@@ -171,9 +171,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             sendFrames();
             waitForPlayer();
 
-            // should immediately exit and unbind from streaming client
             AddStep("stop spectating", () => (Stack.CurrentScreen as Player)?.Exit());
-            AddUntilStep("spectating stopped", () => spectatorScreen.GetParentScreen() == null);
+            AddUntilStep("spectating stopped", () => spectatorScreen.GetChildScreen() == null);
         }
 
         [Test]

From ce58bfdc4e845bc7141a7d0123445a3753c60860 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 15:09:12 +0900
Subject: [PATCH 05771/10326] Add test covering host retry after returning to
 spectator screen

---
 .../Visual/Gameplay/TestSceneSpectator.cs       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 7c62cf47f4..864e297eda 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -175,6 +175,23 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("spectating stopped", () => spectatorScreen.GetChildScreen() == null);
         }
 
+        [Test]
+        public void TestStopWatchingThenHostRetries()
+        {
+            loadSpectatingScreen();
+
+            start();
+            sendFrames();
+            waitForPlayer();
+
+            AddStep("stop spectating", () => (Stack.CurrentScreen as Player)?.Exit());
+            AddUntilStep("spectating stopped", () => spectatorScreen.GetChildScreen() == null);
+
+            // host starts playing a new session
+            start();
+            waitForPlayer();
+        }
+
         [Test]
         public void TestWatchingBeatmapThatDoesntExistLocally()
         {

From fe409a55e63db279d4f45c5b91aeb935ac94d658 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 15:10:11 +0900
Subject: [PATCH 05772/10326] Rename starvation test

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 864e297eda..8821067618 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private Player player => Stack.CurrentScreen as Player;
 
         [Test]
-        public void TestBasicSpectatingFlow()
+        public void TestFrameStarvationAndResume()
         {
             loadSpectatingScreen();
 

From fa857514254b32a5b3b6ccc5143c1ad5078ad776 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 15:10:42 +0900
Subject: [PATCH 05773/10326] Move helper functions to bottom of class

---
 .../Visual/Gameplay/TestSceneSpectator.cs        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 8821067618..a4df450db9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -61,11 +61,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             finish();
         }
 
-        private OsuFramedReplayInputHandler replayHandler =>
-            (OsuFramedReplayInputHandler)Stack.ChildrenOfType<OsuInputManager>().First().ReplayInputHandler;
-
-        private Player player => Stack.CurrentScreen as Player;
-
         [Test]
         public void TestFrameStarvationAndResume()
         {
@@ -94,9 +89,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("time advanced", () => currentFrameStableTime > pausedTime);
         }
 
-        private double currentFrameStableTime
-            => player.ChildrenOfType<FrameStabilityContainer>().First().FrameStableClock.CurrentTime;
-
         [Test]
         public void TestPlayStartsWithNoFrames()
         {
@@ -203,6 +195,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("screen didn't change", () => Stack.CurrentScreen is Spectator);
         }
 
+        private OsuFramedReplayInputHandler replayHandler =>
+            (OsuFramedReplayInputHandler)Stack.ChildrenOfType<OsuInputManager>().First().ReplayInputHandler;
+
+        private Player player => Stack.CurrentScreen as Player;
+
+        private double currentFrameStableTime
+            => player.ChildrenOfType<FrameStabilityContainer>().First().FrameStableClock.CurrentTime;
+
         private void waitForPlayer() => AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
 
         private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(beatmapId ?? importedBeatmapId));

From 3751c357a35b82bbc90cefe72eefe1052582f466 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 15:19:05 +0900
Subject: [PATCH 05774/10326] 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 2d531cf01e..27846fdf53 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1019.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1029.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ca588b89d9..609ac0e5f9 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1019.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1029.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 9c22dec330..ebd38bc334 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.Framework.iOS" Version="2020.1019.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1029.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.1019.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1029.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3ea27e23e8b8395b091221a78700f9c4b95aa347 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 15:20:10 +0900
Subject: [PATCH 05775/10326] Update namespace references

---
 osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs | 1 +
 osu.Game/Rulesets/UI/HitObjectContainer.cs         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
index fde42bec04..9bfb6aa839 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Performance;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 9a0217a1eb..4cadfa9ad4 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Performance;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.UI

From 2671d371da4acc2a39c11d8f584a318961a0ac0b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 15:28:39 +0900
Subject: [PATCH 05776/10326] Move clock retrieval to new correct location

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

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 75f3aa90ee..231c5110ea 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -96,6 +96,10 @@ namespace osu.Game.Rulesets.UI
             else if (!frameStableClock.IsPaused.Value)
             {
                 state = PlaybackState.Valid;
+
+                if (parentGameplayClock == null)
+                    setClock(); // LoadComplete may not be run yet, but we still want the clock.
+
                 proposedTime = parentGameplayClock.CurrentTime;
             }
             else
@@ -123,9 +127,6 @@ namespace osu.Game.Rulesets.UI
 
         private void updateClock(ref double proposedTime)
         {
-            if (parentGameplayClock == null)
-                setClock(); // LoadComplete may not be run yet, but we still want the clock.
-
             // each update start with considering things in valid state.
             state = PlaybackState.Valid;
 

From a8e9c62583c8951b4e2f86b449fb1da6f75f3433 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 16:11:25 +0900
Subject: [PATCH 05777/10326] Make results panels aware of whether they are a
 local score that has just been set

---
 osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs  | 2 +-
 osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs      | 2 +-
 .../Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs   | 7 ++++++-
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs        | 8 ++++++--
 osu.Game/Screens/Ranking/ResultsScreen.cs                 | 2 +-
 osu.Game/Screens/Ranking/ScorePanel.cs                    | 7 +++++--
 osu.Game/Screens/Ranking/ScorePanelList.cs                | 5 +++--
 7 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index 1e87893f39..f69ccc1773 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Ranking
                         }
                     }
                 },
-                new AccuracyCircle(score)
+                new AccuracyCircle(score, false)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
index 250fdc5ebd..5af55e99f8 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private void addPanelStep(ScoreInfo score, PanelState state = PanelState.Expanded) => AddStep("add panel", () =>
         {
-            Child = panel = new ScorePanel(score)
+            Child = panel = new ScorePanel(score, true)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 45da23f1f9..9aeb2b60b7 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -73,14 +73,19 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
 
         private readonly ScoreInfo score;
 
+        private readonly bool withFlair;
+
         private SmoothCircularProgress accuracyCircle;
         private SmoothCircularProgress innerMask;
         private Container<RankBadge> badges;
         private RankText rankText;
 
-        public AccuracyCircle(ScoreInfo score)
+        private SampleChannel applauseSound;
+
+        public AccuracyCircle(ScoreInfo score, bool withFlair)
         {
             this.score = score;
+            this.withFlair = withFlair;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 30747438c3..5f8609d190 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Screens.Ranking.Expanded
         private const float padding = 10;
 
         private readonly ScoreInfo score;
+        private readonly bool withFlair;
+
         private readonly List<StatisticDisplay> statisticDisplays = new List<StatisticDisplay>();
 
         private FillFlowContainer starAndModDisplay;
@@ -41,9 +43,11 @@ namespace osu.Game.Screens.Ranking.Expanded
         /// Creates a new <see cref="ExpandedPanelMiddleContent"/>.
         /// </summary>
         /// <param name="score">The score to display.</param>
-        public ExpandedPanelMiddleContent(ScoreInfo score)
+        /// <param name="withFlair">Whether to add flair for a new score being set.</param>
+        public ExpandedPanelMiddleContent(ScoreInfo score, bool withFlair = false)
         {
             this.score = score;
+            this.withFlair = withFlair;
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
@@ -116,7 +120,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     Margin = new MarginPadding { Top = 40 },
                                     RelativeSizeAxes = Axes.X,
                                     Height = 230,
-                                    Child = new AccuracyCircle(score)
+                                    Child = new AccuracyCircle(score, withFlair)
                                     {
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 026ce01857..f8bdf0140c 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Screens.Ranking
             };
 
             if (Score != null)
-                ScorePanelList.AddScore(Score);
+                ScorePanelList.AddScore(Score, true);
 
             if (player != null && allowRetry)
             {
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index ee97ee55eb..6e6227da38 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -85,6 +85,8 @@ namespace osu.Game.Screens.Ranking
 
         public readonly ScoreInfo Score;
 
+        private readonly bool isNewLocalScore;
+
         private Container content;
 
         private Container topLayerContainer;
@@ -97,9 +99,10 @@ namespace osu.Game.Screens.Ranking
         private Container middleLayerContentContainer;
         private Drawable middleLayerContent;
 
-        public ScorePanel(ScoreInfo score)
+        public ScorePanel(ScoreInfo score, bool isNewLocalScore = false)
         {
             Score = score;
+            this.isNewLocalScore = isNewLocalScore;
         }
 
         [BackgroundDependencyLoader]
@@ -209,7 +212,7 @@ namespace osu.Game.Screens.Ranking
                     middleLayerBackground.FadeColour(expanded_middle_layer_colour, resize_duration, Easing.OutQuint);
 
                     topLayerContentContainer.Add(topLayerContent = new ExpandedPanelTopContent(Score.User).With(d => d.Alpha = 0));
-                    middleLayerContentContainer.Add(middleLayerContent = new ExpandedPanelMiddleContent(Score).With(d => d.Alpha = 0));
+                    middleLayerContentContainer.Add(middleLayerContent = new ExpandedPanelMiddleContent(Score, isNewLocalScore).With(d => d.Alpha = 0));
                     break;
 
                 case PanelState.Contracted:
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 0d7d339df0..cc163ba762 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -95,9 +95,10 @@ namespace osu.Game.Screens.Ranking
         /// Adds a <see cref="ScoreInfo"/> to this list.
         /// </summary>
         /// <param name="score">The <see cref="ScoreInfo"/> to add.</param>
-        public ScorePanel AddScore(ScoreInfo score)
+        /// <param name="isNewLocalScore">Whether this is a score that has just been achieved locally. Controls whether flair is added to the display or not.</param>
+        public ScorePanel AddScore(ScoreInfo score, bool isNewLocalScore = false)
         {
-            var panel = new ScorePanel(score)
+            var panel = new ScorePanel(score, isNewLocalScore)
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,

From fb82c043a515cb95c3267eacdd915be43ff4e3c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 16:11:37 +0900
Subject: [PATCH 05778/10326] Add rank appear sound (new default)

---
 .../Ranking/Expanded/Accuracy/AccuracyCircle.cs      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 9aeb2b60b7..0c15aa509f 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Linq;
 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.Colour;
@@ -89,8 +91,11 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
+            if (withFlair)
+                applauseSound = audio.Samples.Get(score.Rank >= ScoreRank.A ? "Results/rankpass" : "Results/rankfail");
+
             InternalChildren = new Drawable[]
             {
                 new SmoothCircularProgress
@@ -239,11 +244,16 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                         continue;
 
                     using (BeginDelayedSequence(inverseEasing(ACCURACY_TRANSFORM_EASING, Math.Min(1 - virtual_ss_percentage, badge.Accuracy) / targetAccuracy) * ACCURACY_TRANSFORM_DURATION, true))
+                    {
                         badge.Appear();
+                    }
                 }
 
                 using (BeginDelayedSequence(TEXT_APPEAR_DELAY, true))
+                {
+                    this.Delay(-1440).Schedule(() => applauseSound?.Play());
                     rankText.Appear();
+                }
             }
         }
 

From b49a57941103145f782810e873b811723e593139 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 16:32:03 +0900
Subject: [PATCH 05779/10326] Allow SampleInfo to specify fallback sample
 lookup names

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

diff --git a/osu.Game/Audio/SampleInfo.cs b/osu.Game/Audio/SampleInfo.cs
index 2406b0bef2..240d70c418 100644
--- a/osu.Game/Audio/SampleInfo.cs
+++ b/osu.Game/Audio/SampleInfo.cs
@@ -10,14 +10,14 @@ namespace osu.Game.Audio
     /// </summary>
     public class SampleInfo : ISampleInfo
     {
-        private readonly string sampleName;
+        private readonly string[] sampleNames;
 
-        public SampleInfo(string sampleName)
+        public SampleInfo(params string[] sampleNames)
         {
-            this.sampleName = sampleName;
+            this.sampleNames = sampleNames;
         }
 
-        public IEnumerable<string> LookupNames => new[] { sampleName };
+        public IEnumerable<string> LookupNames => sampleNames;
 
         public int Volume { get; } = 100;
     }

From c863341ca1e7f1965222cbc0db0471da9c61ca29 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 16:32:20 +0900
Subject: [PATCH 05780/10326] Don't force Gameplay prefix on all skin sample
 lookups

---
 osu.Game/Audio/HitSampleInfo.cs     | 4 ++--
 osu.Game/Skinning/SkinnableSound.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 8b1f5a366a..8efaeb3795 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -50,9 +50,9 @@ namespace osu.Game.Audio
             get
             {
                 if (!string.IsNullOrEmpty(Suffix))
-                    yield return $"{Bank}-{Name}{Suffix}";
+                    yield return $"Gameplay/{Bank}-{Name}{Suffix}";
 
-                yield return $"{Bank}-{Name}";
+                yield return $"Gameplay/{Bank}-{Name}";
             }
         }
 
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index f6e91811dd..ffa0a963ce 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Skinning
                 {
                     foreach (var lookup in s.LookupNames)
                     {
-                        if ((ch = samples.Get($"Gameplay/{lookup}")) != null)
+                        if ((ch = samples.Get(lookup)) != null)
                             break;
                     }
                 }

From 5d5b0221e5199f96e0fda82669862bbe8854ec72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 16:32:29 +0900
Subject: [PATCH 05781/10326] Add skinning support for legacy applause playback

---
 .../Ranking/Expanded/Accuracy/AccuracyCircle.cs    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 0c15aa509f..c6d4b66724 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -11,9 +11,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
+using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded.Accuracy
@@ -82,7 +84,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         private Container<RankBadge> badges;
         private RankText rankText;
 
-        private SampleChannel applauseSound;
+        private SkinnableSound applauseSound;
 
         public AccuracyCircle(ScoreInfo score, bool withFlair)
         {
@@ -93,9 +95,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            if (withFlair)
-                applauseSound = audio.Samples.Get(score.Rank >= ScoreRank.A ? "Results/rankpass" : "Results/rankfail");
-
             InternalChildren = new Drawable[]
             {
                 new SmoothCircularProgress
@@ -213,6 +212,13 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                 },
                 rankText = new RankText(score.Rank)
             };
+
+            if (withFlair)
+            {
+                AddInternal(applauseSound = score.Rank >= ScoreRank.A
+                    ? new SkinnableSound(new SampleInfo("Results/rankpass", "applause"))
+                    : new SkinnableSound(new SampleInfo("Results/rankfail")));
+            }
         }
 
         private ScoreRank getRank(ScoreRank rank)

From f1ce09930eb0fc5ff86b164a01c6edd2b6183894 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 17:03:45 +0900
Subject: [PATCH 05782/10326] Fix panel expanded state being updated multiple
 times unnecessarily

---
 osu.Game/Screens/Ranking/ScorePanelList.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index cc163ba762..e85580a734 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -119,7 +119,10 @@ namespace osu.Game.Screens.Ranking
             }));
 
             if (SelectedScore.Value == score)
-                selectedScoreChanged(new ValueChangedEvent<ScoreInfo>(SelectedScore.Value, SelectedScore.Value));
+            {
+                if (IsLoaded)
+                    SelectedScore.TriggerChange();
+            }
             else
             {
                 // We want the scroll position to remain relative to the expanded panel. When a new panel is added after the expanded panel, nothing needs to be done.
@@ -143,11 +146,15 @@ namespace osu.Game.Screens.Ranking
         /// <param name="score">The <see cref="ScoreInfo"/> to present.</param>
         private void selectedScoreChanged(ValueChangedEvent<ScoreInfo> score)
         {
-            // Contract the old panel.
-            foreach (var t in flow.Where(t => t.Panel.Score == score.OldValue))
+            // avoid contracting panels unnecessarily when TriggerChange is fired manually.
+            if (score.OldValue != score.NewValue)
             {
-                t.Panel.State = PanelState.Contracted;
-                t.Margin = new MarginPadding();
+                // Contract the old panel.
+                foreach (var t in flow.Where(t => t.Panel.Score == score.OldValue))
+                {
+                    t.Panel.State = PanelState.Contracted;
+                    t.Margin = new MarginPadding();
+                }
             }
 
             // Find the panel corresponding to the new score.

From 4a26084df838916ae5cac8124c12d08aba74a106 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 17:04:33 +0900
Subject: [PATCH 05783/10326] Only play results panel animation once (and only
 for the local user)

---
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs    |  3 +++
 osu.Game/Screens/Ranking/ScorePanel.cs                | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 5f8609d190..711763330c 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -270,6 +270,9 @@ namespace osu.Game.Screens.Ranking.Expanded
                         delay += 200;
                     }
                 }
+
+                if (!withFlair)
+                    FinishTransforms(true);
             });
         }
     }
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 6e6227da38..df710e4eb8 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Screens.Ranking
 
         public readonly ScoreInfo Score;
 
-        private readonly bool isNewLocalScore;
+        private bool displayWithFlair;
 
         private Container content;
 
@@ -102,7 +102,7 @@ namespace osu.Game.Screens.Ranking
         public ScorePanel(ScoreInfo score, bool isNewLocalScore = false)
         {
             Score = score;
-            this.isNewLocalScore = isNewLocalScore;
+            displayWithFlair = isNewLocalScore;
         }
 
         [BackgroundDependencyLoader]
@@ -191,7 +191,7 @@ namespace osu.Game.Screens.Ranking
 
                 state = value;
 
-                if (LoadState >= LoadState.Ready)
+                if (IsLoaded)
                     updateState();
 
                 StateChanged?.Invoke(value);
@@ -212,7 +212,10 @@ namespace osu.Game.Screens.Ranking
                     middleLayerBackground.FadeColour(expanded_middle_layer_colour, resize_duration, Easing.OutQuint);
 
                     topLayerContentContainer.Add(topLayerContent = new ExpandedPanelTopContent(Score.User).With(d => d.Alpha = 0));
-                    middleLayerContentContainer.Add(middleLayerContent = new ExpandedPanelMiddleContent(Score, isNewLocalScore).With(d => d.Alpha = 0));
+                    middleLayerContentContainer.Add(middleLayerContent = new ExpandedPanelMiddleContent(Score, displayWithFlair).With(d => d.Alpha = 0));
+
+                    // only the first expanded display should happen with flair.
+                    displayWithFlair = false;
                     break;
 
                 case PanelState.Contracted:

From 71e373ff511de83b10282992570165f087741551 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 16:11:25 +0900
Subject: [PATCH 05784/10326] Make results panels aware of whether they are a
 local score that has just been set

---
 osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs  | 2 +-
 osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs      | 2 +-
 .../Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs   | 2 +-
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs        | 8 ++++++--
 osu.Game/Screens/Ranking/ResultsScreen.cs                 | 2 +-
 osu.Game/Screens/Ranking/ScorePanel.cs                    | 7 +++++--
 osu.Game/Screens/Ranking/ScorePanelList.cs                | 5 +++--
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index 1e87893f39..f69ccc1773 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Ranking
                         }
                     }
                 },
-                new AccuracyCircle(score)
+                new AccuracyCircle(score, false)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
index 250fdc5ebd..5af55e99f8 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private void addPanelStep(ScoreInfo score, PanelState state = PanelState.Expanded) => AddStep("add panel", () =>
         {
-            Child = panel = new ScorePanel(score)
+            Child = panel = new ScorePanel(score, true)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 45da23f1f9..337665b51f 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         private Container<RankBadge> badges;
         private RankText rankText;
 
-        public AccuracyCircle(ScoreInfo score)
+        public AccuracyCircle(ScoreInfo score, bool withFlair)
         {
             this.score = score;
         }
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 30747438c3..5f8609d190 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Screens.Ranking.Expanded
         private const float padding = 10;
 
         private readonly ScoreInfo score;
+        private readonly bool withFlair;
+
         private readonly List<StatisticDisplay> statisticDisplays = new List<StatisticDisplay>();
 
         private FillFlowContainer starAndModDisplay;
@@ -41,9 +43,11 @@ namespace osu.Game.Screens.Ranking.Expanded
         /// Creates a new <see cref="ExpandedPanelMiddleContent"/>.
         /// </summary>
         /// <param name="score">The score to display.</param>
-        public ExpandedPanelMiddleContent(ScoreInfo score)
+        /// <param name="withFlair">Whether to add flair for a new score being set.</param>
+        public ExpandedPanelMiddleContent(ScoreInfo score, bool withFlair = false)
         {
             this.score = score;
+            this.withFlair = withFlair;
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
@@ -116,7 +120,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     Margin = new MarginPadding { Top = 40 },
                                     RelativeSizeAxes = Axes.X,
                                     Height = 230,
-                                    Child = new AccuracyCircle(score)
+                                    Child = new AccuracyCircle(score, withFlair)
                                     {
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 026ce01857..f8bdf0140c 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Screens.Ranking
             };
 
             if (Score != null)
-                ScorePanelList.AddScore(Score);
+                ScorePanelList.AddScore(Score, true);
 
             if (player != null && allowRetry)
             {
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index ee97ee55eb..6e6227da38 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -85,6 +85,8 @@ namespace osu.Game.Screens.Ranking
 
         public readonly ScoreInfo Score;
 
+        private readonly bool isNewLocalScore;
+
         private Container content;
 
         private Container topLayerContainer;
@@ -97,9 +99,10 @@ namespace osu.Game.Screens.Ranking
         private Container middleLayerContentContainer;
         private Drawable middleLayerContent;
 
-        public ScorePanel(ScoreInfo score)
+        public ScorePanel(ScoreInfo score, bool isNewLocalScore = false)
         {
             Score = score;
+            this.isNewLocalScore = isNewLocalScore;
         }
 
         [BackgroundDependencyLoader]
@@ -209,7 +212,7 @@ namespace osu.Game.Screens.Ranking
                     middleLayerBackground.FadeColour(expanded_middle_layer_colour, resize_duration, Easing.OutQuint);
 
                     topLayerContentContainer.Add(topLayerContent = new ExpandedPanelTopContent(Score.User).With(d => d.Alpha = 0));
-                    middleLayerContentContainer.Add(middleLayerContent = new ExpandedPanelMiddleContent(Score).With(d => d.Alpha = 0));
+                    middleLayerContentContainer.Add(middleLayerContent = new ExpandedPanelMiddleContent(Score, isNewLocalScore).With(d => d.Alpha = 0));
                     break;
 
                 case PanelState.Contracted:
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 0d7d339df0..cc163ba762 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -95,9 +95,10 @@ namespace osu.Game.Screens.Ranking
         /// Adds a <see cref="ScoreInfo"/> to this list.
         /// </summary>
         /// <param name="score">The <see cref="ScoreInfo"/> to add.</param>
-        public ScorePanel AddScore(ScoreInfo score)
+        /// <param name="isNewLocalScore">Whether this is a score that has just been achieved locally. Controls whether flair is added to the display or not.</param>
+        public ScorePanel AddScore(ScoreInfo score, bool isNewLocalScore = false)
         {
-            var panel = new ScorePanel(score)
+            var panel = new ScorePanel(score, isNewLocalScore)
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,

From 11f85779d5222f24fa9d0edd8097398417407b6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 17:03:45 +0900
Subject: [PATCH 05785/10326] Fix panel expanded state being updated multiple
 times unnecessarily

---
 osu.Game/Screens/Ranking/ScorePanelList.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index cc163ba762..e85580a734 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -119,7 +119,10 @@ namespace osu.Game.Screens.Ranking
             }));
 
             if (SelectedScore.Value == score)
-                selectedScoreChanged(new ValueChangedEvent<ScoreInfo>(SelectedScore.Value, SelectedScore.Value));
+            {
+                if (IsLoaded)
+                    SelectedScore.TriggerChange();
+            }
             else
             {
                 // We want the scroll position to remain relative to the expanded panel. When a new panel is added after the expanded panel, nothing needs to be done.
@@ -143,11 +146,15 @@ namespace osu.Game.Screens.Ranking
         /// <param name="score">The <see cref="ScoreInfo"/> to present.</param>
         private void selectedScoreChanged(ValueChangedEvent<ScoreInfo> score)
         {
-            // Contract the old panel.
-            foreach (var t in flow.Where(t => t.Panel.Score == score.OldValue))
+            // avoid contracting panels unnecessarily when TriggerChange is fired manually.
+            if (score.OldValue != score.NewValue)
             {
-                t.Panel.State = PanelState.Contracted;
-                t.Margin = new MarginPadding();
+                // Contract the old panel.
+                foreach (var t in flow.Where(t => t.Panel.Score == score.OldValue))
+                {
+                    t.Panel.State = PanelState.Contracted;
+                    t.Margin = new MarginPadding();
+                }
             }
 
             // Find the panel corresponding to the new score.

From 0a0239a7c799b88049f4a4ca524a58d6f6839a2d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 17:04:33 +0900
Subject: [PATCH 05786/10326] Only play results panel animation once (and only
 for the local user)

---
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs    |  3 +++
 osu.Game/Screens/Ranking/ScorePanel.cs                | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 5f8609d190..711763330c 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -270,6 +270,9 @@ namespace osu.Game.Screens.Ranking.Expanded
                         delay += 200;
                     }
                 }
+
+                if (!withFlair)
+                    FinishTransforms(true);
             });
         }
     }
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 6e6227da38..df710e4eb8 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Screens.Ranking
 
         public readonly ScoreInfo Score;
 
-        private readonly bool isNewLocalScore;
+        private bool displayWithFlair;
 
         private Container content;
 
@@ -102,7 +102,7 @@ namespace osu.Game.Screens.Ranking
         public ScorePanel(ScoreInfo score, bool isNewLocalScore = false)
         {
             Score = score;
-            this.isNewLocalScore = isNewLocalScore;
+            displayWithFlair = isNewLocalScore;
         }
 
         [BackgroundDependencyLoader]
@@ -191,7 +191,7 @@ namespace osu.Game.Screens.Ranking
 
                 state = value;
 
-                if (LoadState >= LoadState.Ready)
+                if (IsLoaded)
                     updateState();
 
                 StateChanged?.Invoke(value);
@@ -212,7 +212,10 @@ namespace osu.Game.Screens.Ranking
                     middleLayerBackground.FadeColour(expanded_middle_layer_colour, resize_duration, Easing.OutQuint);
 
                     topLayerContentContainer.Add(topLayerContent = new ExpandedPanelTopContent(Score.User).With(d => d.Alpha = 0));
-                    middleLayerContentContainer.Add(middleLayerContent = new ExpandedPanelMiddleContent(Score, isNewLocalScore).With(d => d.Alpha = 0));
+                    middleLayerContentContainer.Add(middleLayerContent = new ExpandedPanelMiddleContent(Score, displayWithFlair).With(d => d.Alpha = 0));
+
+                    // only the first expanded display should happen with flair.
+                    displayWithFlair = false;
                     break;
 
                 case PanelState.Contracted:

From 4dec46b33e977e8351f916a2c60c71a53a20b08a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 17:52:58 +0900
Subject: [PATCH 05787/10326] Attempt to fix in a less destructive way for now

---
 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 8886188d95..e32ed07863 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -230,7 +230,7 @@ namespace osu.Game.Tests.Visual
 
                 if (beatmap.HitObjects.Count > 0)
                     // add buffer after last hitobject to allow for final replay frames etc.
-                    trackLength = beatmap.HitObjects.Max(h => h.GetEndTime()) + 2000;
+                    trackLength = Math.Max(trackLength, beatmap.HitObjects.Max(h => h.GetEndTime()) + 2000);
 
                 if (referenceClock != null)
                 {

From 335d150a134073aff3488a0476eff2d970e5d185 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 18:11:50 +0900
Subject: [PATCH 05788/10326] Fix aim time being mutated inside update loop

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

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 231c5110ea..e29abfd83e 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Rulesets.UI
 
         public override bool UpdateSubTree()
         {
-            double proposedTime = manualClock.CurrentTime;
+            double aimTime = manualClock.CurrentTime;
 
             if (frameStableClock.WaitingOnFrames.Value)
             {
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.UI
                 if (parentGameplayClock == null)
                     setClock(); // LoadComplete may not be run yet, but we still want the clock.
 
-                proposedTime = parentGameplayClock.CurrentTime;
+                aimTime = parentGameplayClock.CurrentTime;
             }
             else
             {
@@ -113,7 +113,9 @@ namespace osu.Game.Rulesets.UI
 
             while (loops-- > 0)
             {
-                updateClock(ref proposedTime);
+                // update clock is always trying to approach the aim time.
+                // it should be provided as the original value each loop.
+                updateClock(aimTime);
 
                 if (state == PlaybackState.NotValid)
                     break;
@@ -125,7 +127,7 @@ namespace osu.Game.Rulesets.UI
             return true;
         }
 
-        private void updateClock(ref double proposedTime)
+        private void updateClock(double proposedTime)
         {
             // each update start with considering things in valid state.
             state = PlaybackState.Valid;

From f1b8a8f7f56337edd8693ea2cb8bf57c6c6bd5ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 18:16:04 +0900
Subject: [PATCH 05789/10326] Remove unused using

---
 osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index c6d4b66724..bca3a07fa6 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -5,7 +5,6 @@ using System;
 using System.Linq;
 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.Colour;

From d69d78ab5d9278aaf31d20bd2895f664d1e3c2f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 15:20:10 +0900
Subject: [PATCH 05790/10326] Update namespace references

---
 osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs | 1 +
 osu.Game/Rulesets/UI/HitObjectContainer.cs         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
index fde42bec04..9bfb6aa839 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Performance;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 9a0217a1eb..4cadfa9ad4 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Performance;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.UI

From 3491dea9e2aece3ab76f0b931a5c9ef599e6eba4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 18:51:54 +0900
Subject: [PATCH 05791/10326] Fix scroll logic running before children may be
 alive in flow

---
 osu.Game/Screens/Ranking/ScorePanelList.cs | 45 ++++++++++++----------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index e85580a734..4325d317c4 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -118,22 +118,24 @@ namespace osu.Game.Screens.Ranking
                 d.Origin = Anchor.Centre;
             }));
 
-            if (SelectedScore.Value == score)
+            if (IsLoaded)
             {
-                if (IsLoaded)
-                    SelectedScore.TriggerChange();
-            }
-            else
-            {
-                // We want the scroll position to remain relative to the expanded panel. When a new panel is added after the expanded panel, nothing needs to be done.
-                // But when a panel is added before the expanded panel, we need to offset the scroll position by the width of the new panel.
-                if (expandedPanel != null && flow.GetPanelIndex(score) < flow.GetPanelIndex(expandedPanel.Score))
+                if (SelectedScore.Value == score)
                 {
-                    // A somewhat hacky property is used here because we need to:
-                    // 1) Scroll after the scroll container's visible range is updated.
-                    // 2) Scroll before the scroll container's scroll position is updated.
-                    // Without this, we would have a 1-frame positioning error which looks very jarring.
-                    scroll.InstantScrollTarget = (scroll.InstantScrollTarget ?? scroll.Target) + ScorePanel.CONTRACTED_WIDTH + panel_spacing;
+                    SelectedScore.TriggerChange();
+                }
+                else
+                {
+                    // We want the scroll position to remain relative to the expanded panel. When a new panel is added after the expanded panel, nothing needs to be done.
+                    // But when a panel is added before the expanded panel, we need to offset the scroll position by the width of the new panel.
+                    if (expandedPanel != null && flow.GetPanelIndex(score) < flow.GetPanelIndex(expandedPanel.Score))
+                    {
+                        // A somewhat hacky property is used here because we need to:
+                        // 1) Scroll after the scroll container's visible range is updated.
+                        // 2) Scroll before the scroll container's scroll position is updated.
+                        // Without this, we would have a 1-frame positioning error which looks very jarring.
+                        scroll.InstantScrollTarget = (scroll.InstantScrollTarget ?? scroll.Target) + ScorePanel.CONTRACTED_WIDTH + panel_spacing;
+                    }
                 }
             }
 
@@ -170,12 +172,15 @@ namespace osu.Game.Screens.Ranking
             expandedTrackingComponent.Margin = new MarginPadding { Horizontal = expanded_panel_spacing };
             expandedPanel.State = PanelState.Expanded;
 
-            // Scroll to the new panel. This is done manually since we need:
-            // 1) To scroll after the scroll container's visible range is updated.
-            // 2) To account for the centre anchor/origins of panels.
-            // In the end, it's easier to compute the scroll position manually.
-            float scrollOffset = flow.GetPanelIndex(expandedPanel.Score) * (ScorePanel.CONTRACTED_WIDTH + panel_spacing);
-            scroll.ScrollTo(scrollOffset);
+            SchedulerAfterChildren.Add(() =>
+            {
+                // Scroll to the new panel. This is done manually since we need:
+                // 1) To scroll after the scroll container's visible range is updated.
+                // 2) To account for the centre anchor/origins of panels.
+                // In the end, it's easier to compute the scroll position manually.
+                float scrollOffset = flow.GetPanelIndex(expandedPanel.Score) * (ScorePanel.CONTRACTED_WIDTH + panel_spacing);
+                scroll.ScrollTo(scrollOffset);
+            });
         }
 
         protected override void Update()

From 7be4dfabd8d384107b5a21a78ae6fa97f09fbeaa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 20:23:15 +0900
Subject: [PATCH 05792/10326] Revert "Update namespace references"

This reverts commit d69d78ab5d9278aaf31d20bd2895f664d1e3c2f1.
---
 osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs | 1 -
 osu.Game/Rulesets/UI/HitObjectContainer.cs         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
index 9bfb6aa839..fde42bec04 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Performance;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 4cadfa9ad4..9a0217a1eb 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Performance;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.UI

From 1c353b4745f1ea2bf2cb1a754d47478b7221c2b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 20:38:28 +0900
Subject: [PATCH 05793/10326] 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 27846fdf53..a4bcbd289d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1029.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1029.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 609ac0e5f9..9be933c74a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1029.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1029.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ebd38bc334..e26f8cc8b4 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.Framework.iOS" Version="2020.1029.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1029.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.1029.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1029.1" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 0c540537c9f3dde85e4ac74718be9d71a07c19b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 29 Oct 2020 14:30:50 +0100
Subject: [PATCH 05794/10326] Revert "Add BackgroundSource.Seasonal"

This reverts commit 2871001cc294da01f2db8e8c35d84a86ab1503ac.
---
 osu.Game/Configuration/BackgroundSource.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/BackgroundSource.cs b/osu.Game/Configuration/BackgroundSource.cs
index beef9ef1de..5726e96eb1 100644
--- a/osu.Game/Configuration/BackgroundSource.cs
+++ b/osu.Game/Configuration/BackgroundSource.cs
@@ -6,7 +6,6 @@ namespace osu.Game.Configuration
     public enum BackgroundSource
     {
         Skin,
-        Beatmap,
-        Seasonal
+        Beatmap
     }
 }

From 7d523fee2896c71b7bb919cf99f41e88bb3ed2d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 29 Oct 2020 14:31:07 +0100
Subject: [PATCH 05795/10326] Revert "Set BackgroundSource.Seasonal as default
 setting"

This reverts commit cdb2d23578e6de7ca266a23a51b5fac2ed15b8f4.
---
 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 5c5af701bb..7d601c0cb9 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
 
-            Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Seasonal);
+            Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
         }
 
         public OsuConfigManager(Storage storage)

From b189e0b7cfd8e761b313ab3b1c27371ff270a056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 29 Oct 2020 16:01:22 +0100
Subject: [PATCH 05796/10326] Revert "Load SeasonalBackgroundLoader
 asynchronously"

This reverts commit 81ebcd879668eb13cb28aa11bf4edfb8afb0fb99.
---
 .../Backgrounds/BackgroundScreenDefault.cs    | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index ec91dcc99f..ef41c5be3d 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -25,7 +25,6 @@ namespace osu.Game.Screens.Backgrounds
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
         private Bindable<IntroSequence> introSequence;
-        private readonly SeasonalBackgroundLoader seasonalBackgroundLoader = new SeasonalBackgroundLoader();
 
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
@@ -51,7 +50,7 @@ namespace osu.Game.Screens.Backgrounds
 
             currentDisplay = RNG.Next(0, background_count);
 
-            LoadComponentAsync(seasonalBackgroundLoader, _ => LoadComponentAsync(createBackground(), display));
+            display(createBackground());
         }
 
         private void display(Background newBackground)
@@ -91,10 +90,6 @@ namespace osu.Game.Screens.Backgrounds
             {
                 switch (mode.Value)
                 {
-                    case BackgroundSource.Seasonal:
-                        newBackground = seasonalBackgroundLoader.LoadBackground(backgroundName);
-                        break;
-
                     case BackgroundSource.Beatmap:
                         newBackground = new BeatmapBackground(beatmap.Value, backgroundName);
                         break;
@@ -105,18 +100,7 @@ namespace osu.Game.Screens.Backgrounds
                 }
             }
             else
-            {
-                switch (mode.Value)
-                {
-                    case BackgroundSource.Seasonal:
-                        newBackground = seasonalBackgroundLoader.LoadBackground(backgroundName);
-                        break;
-
-                    default:
-                        newBackground = new Background(backgroundName);
-                        break;
-                }
-            }
+                newBackground = new Background(backgroundName);
 
             newBackground.Depth = currentDisplay;
 

From 76c0a790b404ef1afd65e30078473126a8b677c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 29 Oct 2020 17:28:04 +0100
Subject: [PATCH 05797/10326] Add separate Seasonal Backgrounds setting
 (Always, Sometimes, Never)

---
 osu.Game/Configuration/OsuConfigManager.cs           |  2 ++
 osu.Game/Configuration/SeasonalBackgrounds.cs        | 12 ++++++++++++
 .../Settings/Sections/Audio/MainMenuSettings.cs      |  6 ++++++
 3 files changed, 20 insertions(+)
 create mode 100644 osu.Game/Configuration/SeasonalBackgrounds.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 7d601c0cb9..9f7280eef4 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -131,6 +131,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
 
             Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
+            Set(OsuSetting.SeasonalBackgrounds, SeasonalBackgrounds.Sometimes);
         }
 
         public OsuConfigManager(Storage storage)
@@ -239,5 +240,6 @@ namespace osu.Game.Configuration
         HitLighting,
         MenuBackgroundSource,
         GameplayDisableWinKey,
+        SeasonalBackgrounds
     }
 }
diff --git a/osu.Game/Configuration/SeasonalBackgrounds.cs b/osu.Game/Configuration/SeasonalBackgrounds.cs
new file mode 100644
index 0000000000..7708ae584f
--- /dev/null
+++ b/osu.Game/Configuration/SeasonalBackgrounds.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.Configuration
+{
+    public enum SeasonalBackgrounds
+    {
+        Always,
+        Sometimes,
+        Never
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
index d5de32ed05..ee57c0cfa6 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
@@ -39,6 +39,12 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                     LabelText = "Background source",
                     Current = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
                     Items = Enum.GetValues(typeof(BackgroundSource)).Cast<BackgroundSource>()
+                },
+                new SettingsDropdown<SeasonalBackgrounds>
+                {
+                    LabelText = "Seasonal backgrounds",
+                    Current = config.GetBindable<SeasonalBackgrounds>(OsuSetting.SeasonalBackgrounds),
+                    Items = Enum.GetValues(typeof(SeasonalBackgrounds)).Cast<SeasonalBackgrounds>()
                 }
             };
         }

From 907e1921c720fc99cf9d76d135744fdf3d52fbeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 29 Oct 2020 17:31:42 +0100
Subject: [PATCH 05798/10326] Make SeasonalBackgroundLoader read from
 SessionStatics

---
 osu.Game/Configuration/SessionStatics.cs      |  7 ++++++-
 .../Backgrounds/SeasonalBackgroundLoader.cs   | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 40b2adb867..326abed8fe 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -1,6 +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.Game.Online.API.Requests.Responses;
+
 namespace osu.Game.Configuration
 {
     /// <summary>
@@ -12,12 +15,14 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
+            Set(Static.SeasonalBackgrounds, new List<APISeasonalBackground>());
         }
     }
 
     public enum Static
     {
         LoginOverlayDisplayed,
-        MutedAudioNotificationShownOnce
+        MutedAudioNotificationShownOnce,
+        SeasonalBackgrounds
     }
 }
diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index af81b25cee..72785be3b4 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -5,9 +5,11 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -17,17 +19,20 @@ namespace osu.Game.Graphics.Backgrounds
     [LongRunningLoad]
     public class SeasonalBackgroundLoader : Component
     {
-        private List<APISeasonalBackground> backgrounds = new List<APISeasonalBackground>();
+        private Bindable<List<APISeasonalBackground>> backgrounds;
         private int current;
 
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
+        private void load(SessionStatics sessionStatics, IAPIProvider api)
         {
+            backgrounds = sessionStatics.GetBindable<List<APISeasonalBackground>>(Static.SeasonalBackgrounds);
+            if (backgrounds.Value.Any()) return;
+
             var request = new GetSeasonalBackgroundsRequest();
             request.Success += response =>
             {
-                backgrounds = response.Backgrounds ?? backgrounds;
-                current = RNG.Next(0, backgrounds.Count);
+                backgrounds.Value = response.Backgrounds ?? backgrounds.Value;
+                current = RNG.Next(0, backgrounds.Value.Count);
             };
 
             api.PerformAsync(request);
@@ -37,10 +42,10 @@ namespace osu.Game.Graphics.Backgrounds
         {
             string url = null;
 
-            if (backgrounds.Any())
+            if (backgrounds.Value.Any())
             {
-                current = (current + 1) % backgrounds.Count;
-                url = backgrounds[current].Url;
+                current = (current + 1) % backgrounds.Value.Count;
+                url = backgrounds.Value[current].Url;
             }
 
             return new SeasonalBackground(url, fallbackTextureName);

From bf4d99dfe7aa3ad5a4422430ae2079e4ef93d7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 29 Oct 2020 17:43:10 +0100
Subject: [PATCH 05799/10326] Load SeasonalBackgroundLoader asynchronously

---
 osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index ef41c5be3d..98552dda71 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Screens.Backgrounds
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
         private Bindable<IntroSequence> introSequence;
+        private readonly SeasonalBackgroundLoader seasonalBackgroundLoader = new SeasonalBackgroundLoader();
 
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
@@ -50,7 +51,7 @@ namespace osu.Game.Screens.Backgrounds
 
             currentDisplay = RNG.Next(0, background_count);
 
-            display(createBackground());
+            LoadComponentAsync(seasonalBackgroundLoader, _ => LoadComponentAsync(createBackground(), display));
         }
 
         private void display(Background newBackground)

From 34371b8888980ec2de400b16924657449263ea1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 29 Oct 2020 17:44:23 +0100
Subject: [PATCH 05800/10326] Show next Background on
 showSeasonalBackgrounds.ValueChanged

---
 osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 98552dda71..1be19c5854 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Screens.Backgrounds
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
         private Bindable<IntroSequence> introSequence;
+        private Bindable<SeasonalBackgrounds> showSeasonalBackgrounds;
         private readonly SeasonalBackgroundLoader seasonalBackgroundLoader = new SeasonalBackgroundLoader();
 
         [Resolved]
@@ -42,12 +43,14 @@ namespace osu.Game.Screens.Backgrounds
             skin = skinManager.CurrentSkin.GetBoundCopy();
             mode = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource);
             introSequence = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence);
+            showSeasonalBackgrounds = config.GetBindable<SeasonalBackgrounds>(OsuSetting.SeasonalBackgrounds);
 
             user.ValueChanged += _ => Next();
             skin.ValueChanged += _ => Next();
             mode.ValueChanged += _ => Next();
             beatmap.ValueChanged += _ => Next();
             introSequence.ValueChanged += _ => Next();
+            showSeasonalBackgrounds.ValueChanged += _ => Next();
 
             currentDisplay = RNG.Next(0, background_count);
 

From d9846fad37d4d2b9453621c2b225b9a3cf12cc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 29 Oct 2020 18:03:36 +0100
Subject: [PATCH 05801/10326] Remove fallback texture parameter

 When there isn't a seasonal event, we don't want to fall back to the basic background here, but rather to the user selected background source.
---
 .../Backgrounds/SeasonalBackgroundLoader.cs   | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index 72785be3b4..abd9664106 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -38,17 +37,14 @@ namespace osu.Game.Graphics.Backgrounds
             api.PerformAsync(request);
         }
 
-        public SeasonalBackground LoadBackground(string fallbackTextureName)
+        public SeasonalBackground LoadBackground()
         {
-            string url = null;
+            if (!backgrounds.Value.Any()) return null;
 
-            if (backgrounds.Value.Any())
-            {
-                current = (current + 1) % backgrounds.Value.Count;
-                url = backgrounds.Value[current].Url;
-            }
+            current = (current + 1) % backgrounds.Value.Count;
+            string url = backgrounds.Value[current].Url;
 
-            return new SeasonalBackground(url, fallbackTextureName);
+            return new SeasonalBackground(url);
         }
     }
 
@@ -56,18 +52,17 @@ namespace osu.Game.Graphics.Backgrounds
     public class SeasonalBackground : Background
     {
         private readonly string url;
-        private readonly string fallbackTextureName;
+        private const string fallback_texture_name = @"Backgrounds/bg1";
 
-        public SeasonalBackground([CanBeNull] string url, string fallbackTextureName = @"Backgrounds/bg1")
+        public SeasonalBackground(string url)
         {
             this.url = url;
-            this.fallbackTextureName = fallbackTextureName;
         }
 
         [BackgroundDependencyLoader]
         private void load(LargeTextureStore textures)
         {
-            Sprite.Texture = textures.Get(url) ?? textures.Get(fallbackTextureName);
+            Sprite.Texture = textures.Get(url) ?? textures.Get(fallback_texture_name);
         }
     }
 }

From fb1e09b3e793fae71caada4ad754d586ce7f5a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 29 Oct 2020 18:04:48 +0100
Subject: [PATCH 05802/10326] Load seasonal backgrounds according to setting

---
 .../Screens/Backgrounds/BackgroundScreenDefault.cs   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 1be19c5854..70eafd4aff 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -106,6 +106,18 @@ namespace osu.Game.Screens.Backgrounds
             else
                 newBackground = new Background(backgroundName);
 
+            switch (showSeasonalBackgrounds.Value)
+            {
+                case SeasonalBackgrounds.Sometimes:
+                    if (RNG.NextBool())
+                        goto case SeasonalBackgrounds.Always;
+                    break;
+
+                case SeasonalBackgrounds.Always:
+                    newBackground = seasonalBackgroundLoader.LoadBackground() ?? newBackground;
+                    break;
+            }
+
             newBackground.Depth = currentDisplay;
 
             return newBackground;

From 0c1d12460fcc0304ce1889e21c684da5f107f59d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 10:30:11 +0900
Subject: [PATCH 05803/10326] Remove unused parameter

---
 osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs        | 2 +-
 osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs    | 2 +-
 osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index f69ccc1773..1e87893f39 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Ranking
                         }
                     }
                 },
-                new AccuracyCircle(score, false)
+                new AccuracyCircle(score)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 337665b51f..45da23f1f9 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         private Container<RankBadge> badges;
         private RankText rankText;
 
-        public AccuracyCircle(ScoreInfo score, bool withFlair)
+        public AccuracyCircle(ScoreInfo score)
         {
             this.score = score;
         }
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 711763330c..cb4560802b 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     Margin = new MarginPadding { Top = 40 },
                                     RelativeSizeAxes = Axes.X,
                                     Height = 230,
-                                    Child = new AccuracyCircle(score, withFlair)
+                                    Child = new AccuracyCircle(score)
                                     {
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,

From c9a85587fb21be9c1d54e448e26f0b930e664ea0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 16:32:03 +0900
Subject: [PATCH 05804/10326] Allow SampleInfo to specify fallback sample
 lookup names

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

diff --git a/osu.Game/Audio/SampleInfo.cs b/osu.Game/Audio/SampleInfo.cs
index 2406b0bef2..240d70c418 100644
--- a/osu.Game/Audio/SampleInfo.cs
+++ b/osu.Game/Audio/SampleInfo.cs
@@ -10,14 +10,14 @@ namespace osu.Game.Audio
     /// </summary>
     public class SampleInfo : ISampleInfo
     {
-        private readonly string sampleName;
+        private readonly string[] sampleNames;
 
-        public SampleInfo(string sampleName)
+        public SampleInfo(params string[] sampleNames)
         {
-            this.sampleName = sampleName;
+            this.sampleNames = sampleNames;
         }
 
-        public IEnumerable<string> LookupNames => new[] { sampleName };
+        public IEnumerable<string> LookupNames => sampleNames;
 
         public int Volume { get; } = 100;
     }

From 0b28cca7e6b53b7e3be67782f00ea9a12b55cfa9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Oct 2020 16:32:20 +0900
Subject: [PATCH 05805/10326] Don't force Gameplay prefix on all skin sample
 lookups

---
 osu.Game/Audio/HitSampleInfo.cs     | 4 ++--
 osu.Game/Skinning/SkinnableSound.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 8b1f5a366a..8efaeb3795 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -50,9 +50,9 @@ namespace osu.Game.Audio
             get
             {
                 if (!string.IsNullOrEmpty(Suffix))
-                    yield return $"{Bank}-{Name}{Suffix}";
+                    yield return $"Gameplay/{Bank}-{Name}{Suffix}";
 
-                yield return $"{Bank}-{Name}";
+                yield return $"Gameplay/{Bank}-{Name}";
             }
         }
 
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index f6e91811dd..ffa0a963ce 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Skinning
                 {
                     foreach (var lookup in s.LookupNames)
                     {
-                        if ((ch = samples.Get($"Gameplay/{lookup}")) != null)
+                        if ((ch = samples.Get(lookup)) != null)
                             break;
                     }
                 }

From d319b27b3d9b90c8d69e48dcdd137d8ec08be566 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 11:14:08 +0900
Subject: [PATCH 05806/10326] Run sample lookup logic through getFallbackNames

---
 osu.Game/Skinning/LegacySkin.cs | 54 +++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 94b09684d3..d927d54abc 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -417,10 +417,14 @@ namespace osu.Game.Skinning
 
         public override SampleChannel GetSample(ISampleInfo sampleInfo)
         {
-            var lookupNames = sampleInfo.LookupNames;
+            IEnumerable<string> lookupNames = null;
 
             if (sampleInfo is HitSampleInfo hitSample)
                 lookupNames = getLegacyLookupNames(hitSample);
+            else
+            {
+                lookupNames = sampleInfo.LookupNames.SelectMany(getFallbackNames);
+            }
 
             foreach (var lookup in lookupNames)
             {
@@ -433,6 +437,36 @@ namespace osu.Game.Skinning
             return null;
         }
 
+        private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
+        {
+            var lookupNames = hitSample.LookupNames.SelectMany(getFallbackNames);
+
+            if (!UseCustomSampleBanks && !string.IsNullOrEmpty(hitSample.Suffix))
+            {
+                // for compatibility with stable, exclude the lookup names with the custom sample bank suffix, if they are not valid for use in this skin.
+                // using .EndsWith() is intentional as it ensures parity in all edge cases
+                // (see LegacyTaikoSampleInfo for an example of one - prioritising the taiko prefix should still apply, but the sample bank should not).
+                foreach (var l in lookupNames)
+                {
+                    if (!l.EndsWith(hitSample.Suffix, StringComparison.Ordinal))
+                    {
+                        foreach (var n in getFallbackNames(l))
+                            yield return n;
+                    }
+                }
+            }
+            else
+            {
+                foreach (var l in lookupNames)
+                    yield return l;
+            }
+
+            // also for compatibility, try falling back to non-bank samples (so-called "universal" samples) as the last resort.
+            // going forward specifying banks shall always be required, even for elements that wouldn't require it on stable,
+            // which is why this is done locally here.
+            yield return hitSample.Name;
+        }
+
         private IEnumerable<string> getFallbackNames(string componentName)
         {
             // May be something like "Gameplay/osu/approachcircle" from lazer, or "Arrows/note1" from a user skin.
@@ -442,23 +476,5 @@ namespace osu.Game.Skinning
             string lastPiece = componentName.Split('/').Last();
             yield return componentName.StartsWith("Gameplay/taiko/", StringComparison.Ordinal) ? "taiko-" + lastPiece : lastPiece;
         }
-
-        private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
-        {
-            var lookupNames = hitSample.LookupNames;
-
-            if (!UseCustomSampleBanks && !string.IsNullOrEmpty(hitSample.Suffix))
-                // for compatibility with stable, exclude the lookup names with the custom sample bank suffix, if they are not valid for use in this skin.
-                // using .EndsWith() is intentional as it ensures parity in all edge cases
-                // (see LegacyTaikoSampleInfo for an example of one - prioritising the taiko prefix should still apply, but the sample bank should not).
-                lookupNames = hitSample.LookupNames.Where(name => !name.EndsWith(hitSample.Suffix, StringComparison.Ordinal));
-
-            // also for compatibility, try falling back to non-bank samples (so-called "universal" samples) as the last resort.
-            // going forward specifying banks shall always be required, even for elements that wouldn't require it on stable,
-            // which is why this is done locally here.
-            lookupNames = lookupNames.Append(hitSample.Name);
-
-            return lookupNames;
-        }
     }
 }

From 2ea4aa0a37c86b74f67cfb3f493e882e0adbd335 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 11:52:25 +0900
Subject: [PATCH 05807/10326] Fix incorrect specification on some sample
 lookups

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs | 2 +-
 osu.Game/Rulesets/Mods/ModNightcore.cs                    | 8 ++++----
 osu.Game/Screens/Play/ComboEffects.cs                     | 2 +-
 osu.Game/Screens/Play/PauseOverlay.cs                     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 864e88d023..fc0cda2c1f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     skinSource = new TestSkinSourceContainer
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Child = skinnableSound = new PausableSkinnableSound(new SampleInfo("normal-sliderslide"))
+                        Child = skinnableSound = new PausableSkinnableSound(new SampleInfo("Gameplay/normal-sliderslide"))
                     },
                 };
             });
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 282de3a8e1..e8b051b4d9 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -69,10 +69,10 @@ namespace osu.Game.Rulesets.Mods
             {
                 InternalChildren = new Drawable[]
                 {
-                    hatSample = new PausableSkinnableSound(new SampleInfo("nightcore-hat")),
-                    clapSample = new PausableSkinnableSound(new SampleInfo("nightcore-clap")),
-                    kickSample = new PausableSkinnableSound(new SampleInfo("nightcore-kick")),
-                    finishSample = new PausableSkinnableSound(new SampleInfo("nightcore-finish")),
+                    hatSample = new PausableSkinnableSound(new SampleInfo("Gameplay/nightcore-hat")),
+                    clapSample = new PausableSkinnableSound(new SampleInfo("Gameplay/nightcore-clap")),
+                    kickSample = new PausableSkinnableSound(new SampleInfo("Gameplay/nightcore-kick")),
+                    finishSample = new PausableSkinnableSound(new SampleInfo("Gameplay/nightcore-finish")),
                 };
             }
 
diff --git a/osu.Game/Screens/Play/ComboEffects.cs b/osu.Game/Screens/Play/ComboEffects.cs
index 5bcda50399..831b2f593c 100644
--- a/osu.Game/Screens/Play/ComboEffects.cs
+++ b/osu.Game/Screens/Play/ComboEffects.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            InternalChild = comboBreakSample = new SkinnableSound(new SampleInfo("combobreak"));
+            InternalChild = comboBreakSample = new SkinnableSound(new SampleInfo("Gameplay/combobreak"));
             alwaysPlay = config.GetBindable<bool>(OsuSetting.AlwaysPlayFirstComboBreak);
         }
 
diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 65f34aba3e..8778cff535 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play
             AddButton("Retry", colours.YellowDark, () => OnRetry?.Invoke());
             AddButton("Quit", new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
 
-            AddInternal(pauseLoop = new SkinnableSound(new SampleInfo("pause-loop"))
+            AddInternal(pauseLoop = new SkinnableSound(new SampleInfo("Gameplay/pause-loop"))
             {
                 Looping = true,
                 Volume = { Value = 0 }

From 2ec2749cb49aec0683217116904fb1f526ea26a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 11:52:08 +0900
Subject: [PATCH 05808/10326] Fix taiko lookup logic

---
 osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index a804ea5f82..c88480d18f 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 get
                 {
                     foreach (var name in source.LookupNames)
-                        yield return $"taiko-{name}";
+                        yield return name.Insert(name.LastIndexOf('/') + 1, "taiko-");
 
                     foreach (var name in source.LookupNames)
                         yield return name;

From fed4accfeab0100cdbcc3af7e292a1e408cf62c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 12:12:30 +0900
Subject: [PATCH 05809/10326] Update tests to refect new mappings

---
 .../convert-samples-expected-conversion.json   | 16 ++++++++--------
 .../mania-samples-expected-conversion.json     |  8 ++++----
 ...er-convert-samples-expected-conversion.json |  6 +++---
 .../Formats/LegacyBeatmapDecoderTest.cs        | 18 +++++++++---------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
index d49ffa01c5..6f1d45ad8c 100644
--- a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
@@ -6,20 +6,20 @@
       "EndTime": 2750.0,
       "Column": 1,
       "NodeSamples": [
-        ["normal-hitnormal"],
-        ["soft-hitnormal"],
-        ["drum-hitnormal"]
+        ["Gameplay/normal-hitnormal"],
+        ["Gameplay/soft-hitnormal"],
+        ["Gameplay/drum-hitnormal"]
       ],
-      "Samples": ["-hitnormal"]
+      "Samples": ["Gameplay/-hitnormal"]
     }, {
       "StartTime": 1875.0,
       "EndTime": 2750.0,
       "Column": 0,
       "NodeSamples": [
-        ["soft-hitnormal"],
-        ["drum-hitnormal"]
+        ["Gameplay/soft-hitnormal"],
+        ["Gameplay/drum-hitnormal"]
       ],
-      "Samples": ["-hitnormal"]
+      "Samples": ["Gameplay/-hitnormal"]
     }]
   }, {
     "StartTime": 3750.0,
@@ -27,7 +27,7 @@
       "StartTime": 3750.0,
       "EndTime": 3750.0,
       "Column": 3,
-      "Samples": ["normal-hitnormal"]
+      "Samples": ["Gameplay/normal-hitnormal"]
     }]
   }]
 }
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
index 1aca75a796..fd0c0cad60 100644
--- a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
@@ -6,10 +6,10 @@
       "EndTime": 1500.0,
       "Column": 0,
       "NodeSamples": [
-        ["normal-hitnormal"],
+        ["Gameplay/normal-hitnormal"],
         []
       ],
-      "Samples": ["normal-hitnormal"]
+      "Samples": ["Gameplay/normal-hitnormal"]
     }]
   }, {
     "StartTime": 2000.0,
@@ -18,10 +18,10 @@
       "EndTime": 3000.0,
       "Column": 2,
       "NodeSamples": [
-        ["drum-hitnormal"],
+        ["Gameplay/drum-hitnormal"],
         []
       ],
-      "Samples": ["drum-hitnormal"]
+      "Samples": ["Gameplay/drum-hitnormal"]
     }]
   }]
 }
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json
index e3768a90d7..e07bd3c47c 100644
--- a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json
@@ -5,17 +5,17 @@
       "StartTime": 8470.0,
       "EndTime": 8470.0,
       "Column": 0,
-      "Samples": ["normal-hitnormal", "normal-hitclap"]
+      "Samples": ["Gameplay/normal-hitnormal", "Gameplay/normal-hitclap"]
     }, {
       "StartTime": 8626.470587768974,
       "EndTime": 8626.470587768974,
       "Column": 1,
-      "Samples": ["normal-hitnormal"]
+      "Samples": ["Gameplay/normal-hitnormal"]
     }, {
       "StartTime": 8782.941175537948,
       "EndTime": 8782.941175537948,
       "Column": 2,
-      "Samples": ["normal-hitnormal", "normal-hitclap"]
+      "Samples": ["Gameplay/normal-hitnormal", "Gameplay/normal-hitclap"]
     }]
   }]
 }
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index b6e1af57fd..4b9e9dd88c 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -410,13 +410,13 @@ namespace osu.Game.Tests.Beatmaps.Formats
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
-                Assert.AreEqual("normal-hitnormal", getTestableSampleInfo(hitObjects[0]).LookupNames.First());
-                Assert.AreEqual("normal-hitnormal", getTestableSampleInfo(hitObjects[1]).LookupNames.First());
-                Assert.AreEqual("normal-hitnormal2", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
-                Assert.AreEqual("normal-hitnormal", getTestableSampleInfo(hitObjects[3]).LookupNames.First());
+                Assert.AreEqual("Gameplay/normal-hitnormal", getTestableSampleInfo(hitObjects[0]).LookupNames.First());
+                Assert.AreEqual("Gameplay/normal-hitnormal", getTestableSampleInfo(hitObjects[1]).LookupNames.First());
+                Assert.AreEqual("Gameplay/normal-hitnormal2", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
+                Assert.AreEqual("Gameplay/normal-hitnormal", getTestableSampleInfo(hitObjects[3]).LookupNames.First());
 
                 // The control point at the end time of the slider should be applied
-                Assert.AreEqual("soft-hitnormal8", getTestableSampleInfo(hitObjects[4]).LookupNames.First());
+                Assert.AreEqual("Gameplay/soft-hitnormal8", getTestableSampleInfo(hitObjects[4]).LookupNames.First());
             }
 
             static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
@@ -432,9 +432,9 @@ namespace osu.Game.Tests.Beatmaps.Formats
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
-                Assert.AreEqual("normal-hitnormal", getTestableSampleInfo(hitObjects[0]).LookupNames.First());
-                Assert.AreEqual("normal-hitnormal2", getTestableSampleInfo(hitObjects[1]).LookupNames.First());
-                Assert.AreEqual("normal-hitnormal3", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
+                Assert.AreEqual("Gameplay/normal-hitnormal", getTestableSampleInfo(hitObjects[0]).LookupNames.First());
+                Assert.AreEqual("Gameplay/normal-hitnormal2", getTestableSampleInfo(hitObjects[1]).LookupNames.First());
+                Assert.AreEqual("Gameplay/normal-hitnormal3", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
             }
 
             static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
@@ -452,7 +452,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
                 Assert.AreEqual("hit_1.wav", getTestableSampleInfo(hitObjects[0]).LookupNames.First());
                 Assert.AreEqual("hit_2.wav", getTestableSampleInfo(hitObjects[1]).LookupNames.First());
-                Assert.AreEqual("normal-hitnormal2", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
+                Assert.AreEqual("Gameplay/normal-hitnormal2", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
                 Assert.AreEqual("hit_1.wav", getTestableSampleInfo(hitObjects[3]).LookupNames.First());
                 Assert.AreEqual(70, getTestableSampleInfo(hitObjects[3]).Volume);
             }

From b906736b85efdd9bdc739aab9fdeae74a5f43ad5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 12:28:40 +0900
Subject: [PATCH 05810/10326] Remove redundant initialisation

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

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index d927d54abc..4dea42cf92 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -417,7 +417,7 @@ namespace osu.Game.Skinning
 
         public override SampleChannel GetSample(ISampleInfo sampleInfo)
         {
-            IEnumerable<string> lookupNames = null;
+            IEnumerable<string> lookupNames;
 
             if (sampleInfo is HitSampleInfo hitSample)
                 lookupNames = getLegacyLookupNames(hitSample);

From 8e6c803900757b019b8d0db051d445c2b99039c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 12:39:11 +0900
Subject: [PATCH 05811/10326] Avoid running full updateClock loop when waiting
 on frames

---
 .../Rulesets/UI/FrameStabilityContainer.cs    | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 0990a667ec..4d554124ae 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -85,30 +85,29 @@ namespace osu.Game.Rulesets.UI
 
         public override bool UpdateSubTree()
         {
-            double aimTime = manualClock.CurrentTime;
+            if (parentGameplayClock == null)
+                setClock(); // LoadComplete may not be run yet, but we still want the clock.
+
+            double aimTime = parentGameplayClock.CurrentTime;
 
             if (frameStableClock.WaitingOnFrames.Value)
             {
-                // when waiting on frames, the update loop still needs to be run (at least once) to check for newly arrived frames.
-                // time should not be sourced from the parent clock in this case.
-                state = PlaybackState.Valid;
+                // waiting on frames is a special case where we want to avoid doing any update propagation, unless new frame data has arrived.
+                state = ReplayInputHandler.SetFrameFromTime(aimTime) != null ? PlaybackState.Valid : PlaybackState.NotValid;
             }
             else if (!frameStableClock.IsPaused.Value)
             {
                 state = PlaybackState.Valid;
-
-                if (parentGameplayClock == null)
-                    setClock(); // LoadComplete may not be run yet, but we still want the clock.
-
-                aimTime = parentGameplayClock.CurrentTime;
             }
             else
             {
-                // time should not advance while paused, not should anything run.
+                // time should not advance while paused, nor should anything run.
                 state = PlaybackState.NotValid;
-                return true;
             }
 
+            if (state == PlaybackState.NotValid)
+                return true;
+
             int loops = MaxCatchUpFrames;
 
             while (loops-- > 0)

From 46d89d55f4e9b33edc97cb3696cf2a9ebcee7727 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 12:46:48 +0900
Subject: [PATCH 05812/10326] Add note about ScheduleAfterChildren requirement

---
 osu.Game/Screens/Ranking/ScorePanelList.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 4325d317c4..77b3d8fc3b 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -172,7 +172,8 @@ namespace osu.Game.Screens.Ranking
             expandedTrackingComponent.Margin = new MarginPadding { Horizontal = expanded_panel_spacing };
             expandedPanel.State = PanelState.Expanded;
 
-            SchedulerAfterChildren.Add(() =>
+            // requires schedule after children to ensure the flow (and thus ScrollContainer's ScrollableExtent) has been updated.
+            ScheduleAfterChildren(() =>
             {
                 // Scroll to the new panel. This is done manually since we need:
                 // 1) To scroll after the scroll container's visible range is updated.

From 18f92818daed770f18d35fc74cc22c4da392e567 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 13:09:13 +0900
Subject: [PATCH 05813/10326] Show current HUD visibility mode as a tracked
 setting

---
 osu.Game/Configuration/OsuConfigManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 7d601c0cb9..46c5e61784 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -170,6 +170,7 @@ namespace osu.Game.Configuration
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
         {
             new TrackedSetting<bool>(OsuSetting.MouseDisableButtons, v => new SettingDescription(!v, "gameplay mouse buttons", v ? "disabled" : "enabled")),
+            new TrackedSetting<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode, m => new SettingDescription(m, "HUD Visibility", m.GetDescription())),
             new TrackedSetting<ScalingMode>(OsuSetting.Scaling, m => new SettingDescription(m, "scaling", m.GetDescription())),
         };
     }

From 9bb86ccb832d8f838517c5d4ef7af8d018d2ed38 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 13:09:22 +0900
Subject: [PATCH 05814/10326] Change shift-tab to cycle available HUD
 visibility modes

---
 osu.Game/Screens/Play/HUDOverlay.cs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index b047d44f8a..623041d9ca 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -277,9 +277,25 @@ namespace osu.Game.Screens.Play
                 switch (e.Key)
                 {
                     case Key.Tab:
-                        configVisibilityMode.Value = configVisibilityMode.Value != HUDVisibilityMode.Never
-                            ? HUDVisibilityMode.Never
-                            : HUDVisibilityMode.HideDuringGameplay;
+                        switch (configVisibilityMode.Value)
+                        {
+                            case HUDVisibilityMode.Never:
+                                configVisibilityMode.Value = HUDVisibilityMode.HideDuringGameplay;
+                                break;
+
+                            case HUDVisibilityMode.HideDuringGameplay:
+                                configVisibilityMode.Value = HUDVisibilityMode.HideDuringBreaks;
+                                break;
+
+                            case HUDVisibilityMode.HideDuringBreaks:
+                                configVisibilityMode.Value = HUDVisibilityMode.Always;
+                                break;
+
+                            case HUDVisibilityMode.Always:
+                                configVisibilityMode.Value = HUDVisibilityMode.Never;
+                                break;
+                        }
+
                         return true;
                 }
             }

From f58f8e0f93a66d1553e63f151e9e63ddafe0475b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 13:46:54 +0900
Subject: [PATCH 05815/10326] 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 2d531cf01e..b3100d268b 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.1016.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1019.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ca588b89d9..54f86e5839 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -27,7 +27,7 @@
     <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.1019.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 9c22dec330..6100b55334 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1019.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From c72017a7db4ad00ba2b63d976fca20c5ea9ac583 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 13:49:44 +0900
Subject: [PATCH 05816/10326] Remove "hide during breaks" option

Probably wouldn't be used anyway.
---
 osu.Game/Configuration/HUDVisibilityMode.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Configuration/HUDVisibilityMode.cs b/osu.Game/Configuration/HUDVisibilityMode.cs
index b0b55dd811..10f3f65355 100644
--- a/osu.Game/Configuration/HUDVisibilityMode.cs
+++ b/osu.Game/Configuration/HUDVisibilityMode.cs
@@ -12,9 +12,6 @@ namespace osu.Game.Configuration
         [Description("Hide during gameplay")]
         HideDuringGameplay,
 
-        [Description("Hide during breaks")]
-        HideDuringBreaks,
-
         Always
     }
 }

From b4eda65383cf80c56ac4991887836a12bb5a5be8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 13:53:51 +0900
Subject: [PATCH 05817/10326] Commit missing pieces

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

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 623041d9ca..0cfe6effc1 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -223,11 +223,6 @@ namespace osu.Game.Screens.Play
                     ShowHud.Value = false;
                     break;
 
-                case HUDVisibilityMode.HideDuringBreaks:
-                    // always show during replay as we want the seek bar to be visible.
-                    ShowHud.Value = replayLoaded.Value || !IsBreakTime.Value;
-                    break;
-
                 case HUDVisibilityMode.HideDuringGameplay:
                     // always show during replay as we want the seek bar to be visible.
                     ShowHud.Value = replayLoaded.Value || IsBreakTime.Value;
@@ -284,10 +279,6 @@ namespace osu.Game.Screens.Play
                                 break;
 
                             case HUDVisibilityMode.HideDuringGameplay:
-                                configVisibilityMode.Value = HUDVisibilityMode.HideDuringBreaks;
-                                break;
-
-                            case HUDVisibilityMode.HideDuringBreaks:
                                 configVisibilityMode.Value = HUDVisibilityMode.Always;
                                 break;
 

From 53bd31c69e6acada773346e350ffc12430ae651d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 14:00:07 +0900
Subject: [PATCH 05818/10326] Commit missing test pieces

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 6ec673704c..6764501569 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestExternalHideDoesntAffectConfig()
         {
-            HUDVisibilityMode originalConfigValue = HUDVisibilityMode.HideDuringBreaks;
+            HUDVisibilityMode originalConfigValue = HUDVisibilityMode.HideDuringGameplay;
 
             createNew();
 

From 8928aa6d92990ce761c205e80ac3c20b1a4feffe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 14:19:40 +0900
Subject: [PATCH 05819/10326] Add key binding to show HUD while held

---
 .../Input/Bindings/GlobalActionContainer.cs   |  4 +++
 osu.Game/Screens/Play/HUDOverlay.cs           | 36 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 41be4cfcc3..3de4bb1f9d 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -67,6 +67,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.Plus }, GlobalAction.IncreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.Control, InputKey.Minus }, GlobalAction.DecreaseScrollSpeed),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
+            new KeyBinding(InputKey.Control, GlobalAction.HoldForHUD),
         };
 
         public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
@@ -187,5 +188,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Timing Mode")]
         EditorTimingMode,
+
+        [Description("Hold for HUD")]
+        HoldForHUD,
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index b047d44f8a..c38c2ee5f7 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -8,8 +8,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
+using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets.Mods;
@@ -22,7 +24,7 @@ using osuTK.Input;
 namespace osu.Game.Screens.Play
 {
     [Cached]
-    public class HUDOverlay : Container
+    public class HUDOverlay : Container, IKeyBindingHandler<GlobalAction>
     {
         public const float FADE_DURATION = 400;
 
@@ -67,6 +69,8 @@ namespace osu.Game.Screens.Play
 
         internal readonly IBindable<bool> IsBreakTime = new Bindable<bool>();
 
+        private bool holdingForHUD;
+
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
 
         public HUDOverlay(ScoreProcessor scoreProcessor, HealthProcessor healthProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
@@ -217,6 +221,12 @@ namespace osu.Game.Screens.Play
             if (ShowHud.Disabled)
                 return;
 
+            if (holdingForHUD)
+            {
+                ShowHud.Value = true;
+                return;
+            }
+
             switch (configVisibilityMode.Value)
             {
                 case HUDVisibilityMode.Never:
@@ -351,5 +361,29 @@ namespace osu.Game.Screens.Play
             HealthDisplay?.BindHealthProcessor(processor);
             FailingLayer?.BindHealthProcessor(processor);
         }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.HoldForHUD:
+                    holdingForHUD = true;
+                    updateVisibility();
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.HoldForHUD:
+                    holdingForHUD = false;
+                    updateVisibility();
+                    break;
+            }
+        }
     }
 }

From bd7871d9f511b09ddd224759e3b9365f043c27d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 14:20:00 +0900
Subject: [PATCH 05820/10326] Update test scene to be non-skinnable (and add
 test covering momentary display)

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 6ec673704c..136c9e191d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -2,29 +2,23 @@
 // 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;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneHUDOverlay : SkinnableTestScene
+    public class TestSceneHUDOverlay : OsuManualInputManagerTestScene
     {
         private HUDOverlay hudOverlay;
 
-        private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
-
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.KeyCounter;
         private FillFlowContainer<KeyCounter> keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().First();
@@ -37,17 +31,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             createNew();
 
-            AddRepeatStep("increase combo", () =>
-            {
-                foreach (var hud in hudOverlays)
-                    hud.ComboCounter.Current.Value++;
-            }, 10);
+            AddRepeatStep("increase combo", () => { hudOverlay.ComboCounter.Current.Value++; }, 10);
 
-            AddStep("reset combo", () =>
-            {
-                foreach (var hud in hudOverlays)
-                    hud.ComboCounter.Current.Value = 0;
-            });
+            AddStep("reset combo", () => { hudOverlay.ComboCounter.Current.Value = 0; });
         }
 
         [Test]
@@ -77,7 +63,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             createNew();
 
-            AddStep("set showhud false", () => hudOverlays.ForEach(h => h.ShowHud.Value = false));
+            AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
 
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
             AddAssert("pause button is still visible", () => hudOverlay.HoldToQuit.IsPresent);
@@ -86,6 +72,27 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("key counter flow not affected", () => keyCounterFlow.IsPresent);
         }
 
+        [Test]
+        public void TestMomentaryShowHUD()
+        {
+            createNew();
+
+            HUDVisibilityMode originalConfigValue = HUDVisibilityMode.HideDuringBreaks;
+            AddStep("get original config value", () => originalConfigValue = config.Get<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode));
+
+            AddStep("set hud to never show", () => config.Set(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Never));
+
+            AddUntilStep("wait for fade", () => !hideTarget.IsPresent);
+
+            AddStep("trigger momentary show", () => InputManager.PressKey(Key.ControlLeft));
+            AddUntilStep("wait for visible", () => hideTarget.IsPresent);
+
+            AddStep("stop trigering", () => InputManager.ReleaseKey(Key.ControlLeft));
+            AddUntilStep("wait for fade", () => !hideTarget.IsPresent);
+
+            AddStep("set original config value", () => config.Set(OsuSetting.HUDVisibilityMode, originalConfigValue));
+        }
+
         [Test]
         public void TestExternalHideDoesntAffectConfig()
         {
@@ -113,14 +120,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("set keycounter visible false", () =>
             {
                 config.Set<bool>(OsuSetting.KeyOverlay, false);
-                hudOverlays.ForEach(h => h.KeyCounter.AlwaysVisible.Value = false);
+                hudOverlay.KeyCounter.AlwaysVisible.Value = false;
             });
 
-            AddStep("set showhud false", () => hudOverlays.ForEach(h => h.ShowHud.Value = false));
+            AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
             AddAssert("key counters hidden", () => !keyCounterFlow.IsPresent);
 
-            AddStep("set showhud true", () => hudOverlays.ForEach(h => h.ShowHud.Value = true));
+            AddStep("set showhud true", () => hudOverlay.ShowHud.Value = true);
             AddUntilStep("hidetarget is visible", () => hideTarget.IsPresent);
             AddAssert("key counters still hidden", () => !keyCounterFlow.IsPresent);
 
@@ -131,22 +138,17 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create overlay", () =>
             {
-                SetContents(() =>
-                {
-                    hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+                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));
+                // Add any key just to display the key counter visually.
+                hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
 
-                    hudOverlay.ComboCounter.Current.Value = 1;
+                hudOverlay.ComboCounter.Current.Value = 1;
 
-                    action?.Invoke(hudOverlay);
+                action?.Invoke(hudOverlay);
 
-                    return hudOverlay;
-                });
+                Child = hudOverlay;
             });
         }
-
-        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
     }
 }

From 984a243eff796505ee9f2ca6e85ae2a00233e3a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 14:23:24 +0900
Subject: [PATCH 05821/10326] Add skinnable test scene for HUD overlay

---
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
new file mode 100644
index 0000000000..fec1610160
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.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 System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Play;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSkinnableHUDOverlay : SkinnableTestScene
+    {
+        private HUDOverlay hudOverlay;
+
+        private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
+
+        // best way to check without exposing.
+        private Drawable hideTarget => hudOverlay.KeyCounter;
+        private FillFlowContainer<KeyCounter> keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().First();
+
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
+        [Test]
+        public void TestComboCounterIncrementing()
+        {
+            createNew();
+
+            AddRepeatStep("increase combo", () =>
+            {
+                foreach (var hud in hudOverlays)
+                    hud.ComboCounter.Current.Value++;
+            }, 10);
+
+            AddStep("reset combo", () =>
+            {
+                foreach (var hud in hudOverlays)
+                    hud.ComboCounter.Current.Value = 0;
+            });
+        }
+
+        [Test]
+        public void TestFadesInOnLoadComplete()
+        {
+            float? initialAlpha = null;
+
+            createNew(h => h.OnLoadComplete += _ => initialAlpha = hideTarget.Alpha);
+            AddUntilStep("wait for load", () => hudOverlay.IsAlive);
+            AddAssert("initial alpha was less than 1", () => initialAlpha < 1);
+        }
+
+        [Test]
+        public void TestHideExternally()
+        {
+            createNew();
+
+            AddStep("set showhud false", () => hudOverlays.ForEach(h => h.ShowHud.Value = false));
+
+            AddUntilStep("hidetarget is hidden", () => !hideTarget.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", () => keyCounterFlow.IsPresent);
+        }
+
+        private void createNew(Action<HUDOverlay> action = null)
+        {
+            AddStep("create overlay", () =>
+            {
+                SetContents(() =>
+                {
+                    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));
+
+                    hudOverlay.ComboCounter.Current.Value = 1;
+
+                    action?.Invoke(hudOverlay);
+
+                    return hudOverlay;
+                });
+            });
+        }
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+    }
+}

From 326fd0352568770e0cd0c494863ede623a977a73 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 15:25:53 +0900
Subject: [PATCH 05822/10326] Fix loop not exiting after first valid frame

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 4d554124ae..1ff8fc9715 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.UI
 
             int loops = MaxCatchUpFrames;
 
-            while (loops-- > 0)
+            do
             {
                 // update clock is always trying to approach the aim time.
                 // it should be provided as the original value each loop.
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.UI
 
                 base.UpdateSubTree();
                 UpdateSubTreeMasking(this, ScreenSpaceDrawQuad.AABBFloat);
-            }
+            } while (state == PlaybackState.RequiresCatchUp && loops-- > 0);
 
             return true;
         }

From 0f997386aef703dc440d9afb0e1ee6e0227304ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 15:26:21 +0900
Subject: [PATCH 05823/10326] Fix direction and IsRunning not updating on first
 frame after becoming valid

The parent clock will not unpause until WaitingForFrames becomes false,
so I've moved the set of that before we start to propagate its values
across. Doesn't fix any visible issue but should make propagation one
game loop faster.
---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 1ff8fc9715..8a7f8d2739 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -144,22 +144,22 @@ namespace osu.Game.Rulesets.UI
                     state = PlaybackState.NotValid;
             }
 
-            if (proposedTime != manualClock.CurrentTime)
+            if (state == PlaybackState.Valid)
                 direction = proposedTime >= manualClock.CurrentTime ? 1 : -1;
 
+            double timeBehind = Math.Abs(proposedTime - parentGameplayClock.CurrentTime);
+
+            frameStableClock.IsCatchingUp.Value = timeBehind > 200;
+            frameStableClock.WaitingOnFrames.Value = state == PlaybackState.NotValid;
+
             manualClock.CurrentTime = proposedTime;
             manualClock.Rate = Math.Abs(parentGameplayClock.Rate) * direction;
             manualClock.IsRunning = parentGameplayClock.IsRunning;
 
-            double timeBehind = Math.Abs(manualClock.CurrentTime - parentGameplayClock.CurrentTime);
-
             // determine whether catch-up is required.
             if (state == PlaybackState.Valid && timeBehind > 0)
                 state = PlaybackState.RequiresCatchUp;
 
-            frameStableClock.IsCatchingUp.Value = timeBehind > 200;
-            frameStableClock.WaitingOnFrames.Value = state == PlaybackState.NotValid;
-
             // The manual clock time has changed in the above code. The framed clock now needs to be updated
             // to ensure that the its time is valid for our children before input is processed
             framedClock.ProcessFrame();

From 32e68a6a3c16df655a597b1b3f770c77d2dec2cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 16:09:01 +0900
Subject: [PATCH 05824/10326] Fix FramedReplayInputHandler incorrectly blocking
 in streaming mode when time requested is before the first frame

Most of this is just tidying up the logic to (hopefully) be better to
follow, again (again (again)).

The actual fix is that we now allow interpolation/playback when the
incoming time is less than the first frame's time, regardless of
receiving status.
---
 .../Replays/FramedReplayInputHandler.cs       | 56 +++++++++++++------
 1 file changed, 40 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 8a4451fdca..b43324bcfa 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Replays
                     return null;
 
                 if (!currentFrameIndex.HasValue)
-                    return (TFrame)Frames[0];
+                    return currentDirection > 0 ? (TFrame)Frames[0] : null;
 
                 int nextFrame = clampedNextFrameIndex;
 
@@ -109,30 +109,54 @@ namespace osu.Game.Rulesets.Replays
 
             Debug.Assert(currentDirection != 0);
 
-            TFrame next = NextFrame;
-
-            // check if the next frame is valid for the current playback direction.
-            // validity is if the next frame is equal or "earlier" than the current point in time (so we can change to it)
-            int compare = time.CompareTo(next?.Time);
-
-            if (next != null && (compare == 0 || compare == currentDirection))
+            if (!HasFrames)
             {
-                currentFrameIndex = clampedNextFrameIndex;
-                return CurrentTime = CurrentFrame.Time;
+                // in the case all frames are received, allow time to progress regardless.
+                if (replay.HasReceivedAllFrames)
+                    return CurrentTime = time;
+
+                return null;
             }
 
-            // at this point, the frame can't be advanced (in the replay).
-            // even so, we may be able to move the clock forward due to being at the end of the replay or
-            // moving towards the next valid frame.
+            TFrame next = NextFrame;
+
+            // if we have a next frame, check if it is before or at the current time in playback, and advance time to it if so.
+            if (next != null)
+            {
+                int compare = time.CompareTo(next.Time);
+
+                if (compare == 0 || compare == currentDirection)
+                {
+                    currentFrameIndex = clampedNextFrameIndex;
+                    return CurrentTime = CurrentFrame.Time;
+                }
+            }
+
+            // at this point, the frame index can't be advanced.
+            // even so, we may be able to propose the clock progresses forward due to being at an extent of the replay,
+            // or moving towards the next valid frame (ie. interpolating in a non-important section).
 
             // the exception is if currently in an important section, which is respected above all.
             if (inImportantSection)
+            {
+                Debug.Assert(next != null || !replay.HasReceivedAllFrames);
                 return null;
+            }
 
-            // in the case we have no next frames and haven't received the full replay, block.
-            if (next == null && !replay.HasReceivedAllFrames) return null;
+            // if a next frame does exist, allow interpolation.
+            if (next != null)
+                return CurrentTime = time;
 
-            return CurrentTime = time;
+            // if all frames have been received, allow playing beyond extents.
+            if (replay.HasReceivedAllFrames)
+                return CurrentTime = time;
+
+            // if not all frames are received but we are before the first frame, allow playing.
+            if (time < Frames[0].Time)
+                return CurrentTime = time;
+
+            // in the case we have no next frames and haven't received enough frame data, block.
+            return null;
         }
 
         private void updateDirection(double time)

From abaa532766500c71a2dbf5054019dc1b1f7de2be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 16:24:02 +0900
Subject: [PATCH 05825/10326] Add test coverage for streaming replay playback

---
 .../StreamingFramedReplayInputHandlerTest.cs  | 296 ++++++++++++++++++
 1 file changed, 296 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs

diff --git a/osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs
new file mode 100644
index 0000000000..21ec29b10b
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs
@@ -0,0 +1,296 @@
+// Copyright (c) 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.Game.Replays;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class StreamingFramedReplayInputHandlerTest
+    {
+        private Replay replay;
+        private TestInputHandler handler;
+
+        [SetUp]
+        public void SetUp()
+        {
+            handler = new TestInputHandler(replay = new Replay
+            {
+                HasReceivedAllFrames = false,
+                Frames = new List<ReplayFrame>
+                {
+                    new TestReplayFrame(0),
+                    new TestReplayFrame(1000),
+                    new TestReplayFrame(2000),
+                    new TestReplayFrame(3000, true),
+                    new TestReplayFrame(4000, true),
+                    new TestReplayFrame(5000, true),
+                    new TestReplayFrame(7000, true),
+                    new TestReplayFrame(8000),
+                }
+            });
+        }
+
+        [Test]
+        public void TestNormalPlayback()
+        {
+            Assert.IsNull(handler.CurrentFrame);
+
+            confirmCurrentFrame(null);
+            confirmNextFrame(0);
+
+            setTime(0, 0);
+            confirmCurrentFrame(0);
+            confirmNextFrame(1);
+
+            // if we hit the first frame perfectly, time should progress to it.
+            setTime(1000, 1000);
+            confirmCurrentFrame(1);
+            confirmNextFrame(2);
+
+            // in between non-important frames should progress based on input.
+            setTime(1200, 1200);
+            confirmCurrentFrame(1);
+
+            setTime(1400, 1400);
+            confirmCurrentFrame(1);
+
+            // progressing beyond the next frame should force time to that frame once.
+            setTime(2200, 2000);
+            confirmCurrentFrame(2);
+
+            // second attempt should progress to input time
+            setTime(2200, 2200);
+            confirmCurrentFrame(2);
+
+            // entering important section
+            setTime(3000, 3000);
+            confirmCurrentFrame(3);
+
+            // cannot progress within
+            setTime(3500, null);
+            confirmCurrentFrame(3);
+
+            setTime(4000, 4000);
+            confirmCurrentFrame(4);
+
+            // still cannot progress
+            setTime(4500, null);
+            confirmCurrentFrame(4);
+
+            setTime(5200, 5000);
+            confirmCurrentFrame(5);
+
+            // important section AllowedImportantTimeSpan allowance
+            setTime(5200, 5200);
+            confirmCurrentFrame(5);
+
+            setTime(7200, 7000);
+            confirmCurrentFrame(6);
+
+            setTime(7200, null);
+            confirmCurrentFrame(6);
+
+            // exited important section
+            setTime(8200, 8000);
+            confirmCurrentFrame(7);
+            confirmNextFrame(null);
+
+            setTime(8200, null);
+            confirmCurrentFrame(7);
+            confirmNextFrame(null);
+
+            setTime(8400, null);
+            confirmCurrentFrame(7);
+            confirmNextFrame(null);
+        }
+
+        [Test]
+        public void TestIntroTime()
+        {
+            setTime(-1000, -1000);
+            confirmCurrentFrame(null);
+            confirmNextFrame(0);
+
+            setTime(-500, -500);
+            confirmCurrentFrame(null);
+            confirmNextFrame(0);
+
+            setTime(0, 0);
+            confirmCurrentFrame(0);
+            confirmNextFrame(1);
+        }
+
+        [Test]
+        public void TestBasicRewind()
+        {
+            setTime(2800, 0);
+            setTime(2800, 1000);
+            setTime(2800, 2000);
+            setTime(2800, 2800);
+            confirmCurrentFrame(2);
+            confirmNextFrame(3);
+
+            // pivot without crossing a frame boundary
+            setTime(2700, 2700);
+            confirmCurrentFrame(2);
+            confirmNextFrame(1);
+
+            // cross current frame boundary; should not yet update frame
+            setTime(1980, 1980);
+            confirmCurrentFrame(2);
+            confirmNextFrame(1);
+
+            setTime(1200, 1200);
+            confirmCurrentFrame(2);
+            confirmNextFrame(1);
+
+            // ensure each frame plays out until start
+            setTime(-500, 1000);
+            confirmCurrentFrame(1);
+            confirmNextFrame(0);
+
+            setTime(-500, 0);
+            confirmCurrentFrame(0);
+            confirmNextFrame(null);
+
+            setTime(-500, -500);
+            confirmCurrentFrame(0);
+            confirmNextFrame(null);
+        }
+
+        [Test]
+        public void TestRewindInsideImportantSection()
+        {
+            fastForwardToPoint(3000);
+
+            setTime(4000, 4000);
+            confirmCurrentFrame(4);
+            confirmNextFrame(5);
+
+            setTime(3500, null);
+            confirmCurrentFrame(4);
+            confirmNextFrame(3);
+
+            setTime(3000, 3000);
+            confirmCurrentFrame(3);
+            confirmNextFrame(2);
+
+            setTime(3500, null);
+            confirmCurrentFrame(3);
+            confirmNextFrame(4);
+
+            setTime(4000, 4000);
+            confirmCurrentFrame(4);
+            confirmNextFrame(5);
+
+            setTime(4500, null);
+            confirmCurrentFrame(4);
+            confirmNextFrame(5);
+
+            setTime(4000, null);
+            confirmCurrentFrame(4);
+            confirmNextFrame(5);
+
+            setTime(3500, null);
+            confirmCurrentFrame(4);
+            confirmNextFrame(3);
+
+            setTime(3000, 3000);
+            confirmCurrentFrame(3);
+            confirmNextFrame(2);
+        }
+
+        [Test]
+        public void TestRewindOutOfImportantSection()
+        {
+            fastForwardToPoint(3500);
+
+            confirmCurrentFrame(3);
+            confirmNextFrame(4);
+
+            setTime(3200, null);
+            // next frame doesn't change even though direction reversed, because of important section.
+            confirmCurrentFrame(3);
+            confirmNextFrame(4);
+
+            setTime(3000, null);
+            confirmCurrentFrame(3);
+            confirmNextFrame(4);
+
+            setTime(2800, 2800);
+            confirmCurrentFrame(3);
+            confirmNextFrame(2);
+        }
+
+        private void fastForwardToPoint(double destination)
+        {
+            for (int i = 0; i < 1000; i++)
+            {
+                if (handler.SetFrameFromTime(destination) == null)
+                    return;
+            }
+
+            throw new TimeoutException("Seek was never fulfilled");
+        }
+
+        private void setTime(double set, double? expect)
+        {
+            Assert.AreEqual(expect, handler.SetFrameFromTime(set));
+        }
+
+        private void confirmCurrentFrame(int? frame)
+        {
+            if (frame.HasValue)
+            {
+                Assert.IsNotNull(handler.CurrentFrame);
+                Assert.AreEqual(replay.Frames[frame.Value].Time, handler.CurrentFrame.Time);
+            }
+            else
+            {
+                Assert.IsNull(handler.CurrentFrame);
+            }
+        }
+
+        private void confirmNextFrame(int? frame)
+        {
+            if (frame.HasValue)
+            {
+                Assert.IsNotNull(handler.NextFrame);
+                Assert.AreEqual(replay.Frames[frame.Value].Time, handler.NextFrame.Time);
+            }
+            else
+            {
+                Assert.IsNull(handler.NextFrame);
+            }
+        }
+
+        private class TestReplayFrame : ReplayFrame
+        {
+            public readonly bool IsImportant;
+
+            public TestReplayFrame(double time, bool isImportant = false)
+                : base(time)
+            {
+                IsImportant = isImportant;
+            }
+        }
+
+        private class TestInputHandler : FramedReplayInputHandler<TestReplayFrame>
+        {
+            public TestInputHandler(Replay replay)
+                : base(replay)
+            {
+                FrameAccuratePlayback = true;
+            }
+
+            protected override double AllowedImportantTimeSpan => 1000;
+
+            protected override bool IsImportant(TestReplayFrame frame) => frame.IsImportant;
+        }
+    }
+}

From 43f9c1ebead2fb96e7f5994868ce43c93133d3ce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 30 Oct 2020 18:26:38 +0900
Subject: [PATCH 05826/10326] Fix HUD test having out of date value

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 9744575878..f9914e0193 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -77,7 +77,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             createNew();
 
-            HUDVisibilityMode originalConfigValue = HUDVisibilityMode.HideDuringBreaks;
+            HUDVisibilityMode originalConfigValue = HUDVisibilityMode.HideDuringGameplay;
+
             AddStep("get original config value", () => originalConfigValue = config.Get<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode));
 
             AddStep("set hud to never show", () => config.Set(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Never));

From f27ce7521d69295e7af78478118e436db6f400ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Fri, 30 Oct 2020 10:27:43 +0100
Subject: [PATCH 05827/10326] Make "Sometimes" setting depend on season end
 date, rather than chance

---
 osu.Game/Configuration/SessionStatics.cs                  | 5 ++++-
 osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs | 8 ++++++++
 .../API/Requests/Responses/APISeasonalBackgrounds.cs      | 4 ++++
 osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs   | 2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 326abed8fe..8100e0fb12 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.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.Game.Online.API.Requests.Responses;
 
@@ -15,6 +16,7 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
+            Set(Static.SeasonEndDate, DateTimeOffset.MinValue);
             Set(Static.SeasonalBackgrounds, new List<APISeasonalBackground>());
         }
     }
@@ -23,6 +25,7 @@ namespace osu.Game.Configuration
     {
         LoginOverlayDisplayed,
         MutedAudioNotificationShownOnce,
-        SeasonalBackgrounds
+        SeasonEndDate,
+        SeasonalBackgrounds,
     }
 }
diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index abd9664106..d806c62650 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -18,19 +19,24 @@ namespace osu.Game.Graphics.Backgrounds
     [LongRunningLoad]
     public class SeasonalBackgroundLoader : Component
     {
+        private Bindable<DateTimeOffset> endDate;
         private Bindable<List<APISeasonalBackground>> backgrounds;
         private int current;
 
         [BackgroundDependencyLoader]
         private void load(SessionStatics sessionStatics, IAPIProvider api)
         {
+            endDate = sessionStatics.GetBindable<DateTimeOffset>(Static.SeasonEndDate);
             backgrounds = sessionStatics.GetBindable<List<APISeasonalBackground>>(Static.SeasonalBackgrounds);
+
             if (backgrounds.Value.Any()) return;
 
             var request = new GetSeasonalBackgroundsRequest();
             request.Success += response =>
             {
+                endDate.Value = response.EndDate;
                 backgrounds.Value = response.Backgrounds ?? backgrounds.Value;
+
                 current = RNG.Next(0, backgrounds.Value.Count);
             };
 
@@ -46,6 +52,8 @@ namespace osu.Game.Graphics.Backgrounds
 
             return new SeasonalBackground(url);
         }
+
+        public bool IsInSeason() => DateTimeOffset.Now < endDate.Value;
     }
 
     [LongRunningLoad]
diff --git a/osu.Game/Online/API/Requests/Responses/APISeasonalBackgrounds.cs b/osu.Game/Online/API/Requests/Responses/APISeasonalBackgrounds.cs
index 6996ac4d9b..8e395f7397 100644
--- a/osu.Game/Online/API/Requests/Responses/APISeasonalBackgrounds.cs
+++ b/osu.Game/Online/API/Requests/Responses/APISeasonalBackgrounds.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 Newtonsoft.Json;
 
@@ -8,6 +9,9 @@ namespace osu.Game.Online.API.Requests.Responses
 {
     public class APISeasonalBackgrounds
     {
+        [JsonProperty("ends_at")]
+        public DateTimeOffset EndDate;
+
         [JsonProperty("backgrounds")]
         public List<APISeasonalBackground> Backgrounds { get; set; }
     }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 70eafd4aff..de73c82d5c 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.Backgrounds
             switch (showSeasonalBackgrounds.Value)
             {
                 case SeasonalBackgrounds.Sometimes:
-                    if (RNG.NextBool())
+                    if (seasonalBackgroundLoader.IsInSeason())
                         goto case SeasonalBackgrounds.Always;
                     break;
 

From 1bd461f229a69dc139fc7c36e4f10cb5a874243c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 20:20:34 +0900
Subject: [PATCH 05828/10326] Move clock logic back to inside updateClock
 method

---
 .../Rulesets/UI/FrameStabilityContainer.cs    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 8a7f8d2739..c8f37d75a0 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -85,15 +85,10 @@ namespace osu.Game.Rulesets.UI
 
         public override bool UpdateSubTree()
         {
-            if (parentGameplayClock == null)
-                setClock(); // LoadComplete may not be run yet, but we still want the clock.
-
-            double aimTime = parentGameplayClock.CurrentTime;
-
             if (frameStableClock.WaitingOnFrames.Value)
             {
                 // waiting on frames is a special case where we want to avoid doing any update propagation, unless new frame data has arrived.
-                state = ReplayInputHandler.SetFrameFromTime(aimTime) != null ? PlaybackState.Valid : PlaybackState.NotValid;
+                state = PlaybackState.Valid;
             }
             else if (!frameStableClock.IsPaused.Value)
             {
@@ -103,10 +98,8 @@ namespace osu.Game.Rulesets.UI
             {
                 // time should not advance while paused, nor should anything run.
                 state = PlaybackState.NotValid;
-            }
-
-            if (state == PlaybackState.NotValid)
                 return true;
+            }
 
             int loops = MaxCatchUpFrames;
 
@@ -114,7 +107,7 @@ namespace osu.Game.Rulesets.UI
             {
                 // update clock is always trying to approach the aim time.
                 // it should be provided as the original value each loop.
-                updateClock(aimTime);
+                updateClock();
 
                 if (state == PlaybackState.NotValid)
                     break;
@@ -126,8 +119,13 @@ namespace osu.Game.Rulesets.UI
             return true;
         }
 
-        private void updateClock(double proposedTime)
+        private void updateClock()
         {
+            if (parentGameplayClock == null)
+                setClock(); // LoadComplete may not be run yet, but we still want the clock.
+
+            double proposedTime = parentGameplayClock.CurrentTime;
+
             // each update start with considering things in valid state.
             state = PlaybackState.Valid;
 

From b4e53110146b4f7d651cd588d794be0d075e4db1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 20:37:07 +0900
Subject: [PATCH 05829/10326] Move initial state set inside updateClock

---
 .../Rulesets/UI/FrameStabilityContainer.cs    | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index c8f37d75a0..e9865f6c8b 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -85,22 +85,6 @@ namespace osu.Game.Rulesets.UI
 
         public override bool UpdateSubTree()
         {
-            if (frameStableClock.WaitingOnFrames.Value)
-            {
-                // waiting on frames is a special case where we want to avoid doing any update propagation, unless new frame data has arrived.
-                state = PlaybackState.Valid;
-            }
-            else if (!frameStableClock.IsPaused.Value)
-            {
-                state = PlaybackState.Valid;
-            }
-            else
-            {
-                // time should not advance while paused, nor should anything run.
-                state = PlaybackState.NotValid;
-                return true;
-            }
-
             int loops = MaxCatchUpFrames;
 
             do
@@ -121,14 +105,27 @@ namespace osu.Game.Rulesets.UI
 
         private void updateClock()
         {
+            if (frameStableClock.WaitingOnFrames.Value)
+            {
+                // if waiting on frames, run one update loop to determine if frames have arrived.
+                state = PlaybackState.Valid;
+            }
+            else if (frameStableClock.IsPaused.Value)
+            {
+                // time should not advance while paused, nor should anything run.
+                state = PlaybackState.NotValid;
+                return;
+            }
+            else
+            {
+                state = PlaybackState.Valid;
+            }
+
             if (parentGameplayClock == null)
                 setClock(); // LoadComplete may not be run yet, but we still want the clock.
 
             double proposedTime = parentGameplayClock.CurrentTime;
 
-            // each update start with considering things in valid state.
-            state = PlaybackState.Valid;
-
             if (FrameStablePlayback)
                 // if we require frame stability, the proposed time will be adjusted to move at most one known
                 // frame interval in the current direction.

From a1fa6588f6a933c97551f78b98e21734f06e0c10 Mon Sep 17 00:00:00 2001
From: cadon0 <calebdonnellynz@gmail.com>
Date: Sat, 31 Oct 2020 01:03:57 +1300
Subject: [PATCH 05830/10326] Fix "bounce" when metadata container text is
 empty

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

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 0ee52f3e48..71f78c5c95 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -300,6 +300,7 @@ namespace osu.Game.Screens.Select
 
             public MetadataSection(string title)
             {
+                Alpha = 0;
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
 

From bc69ed3870457e25e83b32879e3fc36982f4031d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Oct 2020 22:33:05 +0900
Subject: [PATCH 05831/10326] Simplify sample lookup

---
 osu.Game/Skinning/LegacySkin.cs | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 4dea42cf92..fb020f4e39 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -446,21 +446,12 @@ namespace osu.Game.Skinning
                 // for compatibility with stable, exclude the lookup names with the custom sample bank suffix, if they are not valid for use in this skin.
                 // using .EndsWith() is intentional as it ensures parity in all edge cases
                 // (see LegacyTaikoSampleInfo for an example of one - prioritising the taiko prefix should still apply, but the sample bank should not).
-                foreach (var l in lookupNames)
-                {
-                    if (!l.EndsWith(hitSample.Suffix, StringComparison.Ordinal))
-                    {
-                        foreach (var n in getFallbackNames(l))
-                            yield return n;
-                    }
-                }
-            }
-            else
-            {
-                foreach (var l in lookupNames)
-                    yield return l;
+                lookupNames = lookupNames.Where(name => !name.EndsWith(hitSample.Suffix, StringComparison.Ordinal));
             }
 
+            foreach (var l in lookupNames)
+                yield return l;
+
             // also for compatibility, try falling back to non-bank samples (so-called "universal" samples) as the last resort.
             // going forward specifying banks shall always be required, even for elements that wouldn't require it on stable,
             // which is why this is done locally here.

From 4e3fb615d25c6a2edfbec009401ec73f925840f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Fri, 30 Oct 2020 15:54:10 +0100
Subject: [PATCH 05832/10326] Rename "SeasonalBackgrounds" to
 "SeasonalBackgroundMode"

---
 osu.Game/Configuration/OsuConfigManager.cs         |  4 ++--
 ...nalBackgrounds.cs => SeasonalBackgroundMode.cs} |  2 +-
 .../Settings/Sections/Audio/MainMenuSettings.cs    |  6 +++---
 .../Screens/Backgrounds/BackgroundScreenDefault.cs | 14 +++++++-------
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename osu.Game/Configuration/{SeasonalBackgrounds.cs => SeasonalBackgroundMode.cs} (86%)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index e579898c05..e0971d238a 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
 
             Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
-            Set(OsuSetting.SeasonalBackgrounds, SeasonalBackgrounds.Sometimes);
+            Set(OsuSetting.SeasonalBackgroundMode, SeasonalBackgroundMode.Sometimes);
         }
 
         public OsuConfigManager(Storage storage)
@@ -241,6 +241,6 @@ namespace osu.Game.Configuration
         HitLighting,
         MenuBackgroundSource,
         GameplayDisableWinKey,
-        SeasonalBackgrounds
+        SeasonalBackgroundMode
     }
 }
diff --git a/osu.Game/Configuration/SeasonalBackgrounds.cs b/osu.Game/Configuration/SeasonalBackgroundMode.cs
similarity index 86%
rename from osu.Game/Configuration/SeasonalBackgrounds.cs
rename to osu.Game/Configuration/SeasonalBackgroundMode.cs
index 7708ae584f..406736b2a4 100644
--- a/osu.Game/Configuration/SeasonalBackgrounds.cs
+++ b/osu.Game/Configuration/SeasonalBackgroundMode.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Configuration
 {
-    public enum SeasonalBackgrounds
+    public enum SeasonalBackgroundMode
     {
         Always,
         Sometimes,
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
index ee57c0cfa6..7682967d10 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
@@ -40,11 +40,11 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                     Current = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
                     Items = Enum.GetValues(typeof(BackgroundSource)).Cast<BackgroundSource>()
                 },
-                new SettingsDropdown<SeasonalBackgrounds>
+                new SettingsDropdown<SeasonalBackgroundMode>
                 {
                     LabelText = "Seasonal backgrounds",
-                    Current = config.GetBindable<SeasonalBackgrounds>(OsuSetting.SeasonalBackgrounds),
-                    Items = Enum.GetValues(typeof(SeasonalBackgrounds)).Cast<SeasonalBackgrounds>()
+                    Current = config.GetBindable<SeasonalBackgroundMode>(OsuSetting.SeasonalBackgroundMode),
+                    Items = Enum.GetValues(typeof(SeasonalBackgroundMode)).Cast<SeasonalBackgroundMode>()
                 }
             };
         }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index de73c82d5c..a5bdcee8d4 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Backgrounds
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
         private Bindable<IntroSequence> introSequence;
-        private Bindable<SeasonalBackgrounds> showSeasonalBackgrounds;
+        private Bindable<SeasonalBackgroundMode> seasonalBackgroundMode;
         private readonly SeasonalBackgroundLoader seasonalBackgroundLoader = new SeasonalBackgroundLoader();
 
         [Resolved]
@@ -43,14 +43,14 @@ namespace osu.Game.Screens.Backgrounds
             skin = skinManager.CurrentSkin.GetBoundCopy();
             mode = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource);
             introSequence = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence);
-            showSeasonalBackgrounds = config.GetBindable<SeasonalBackgrounds>(OsuSetting.SeasonalBackgrounds);
+            seasonalBackgroundMode = config.GetBindable<SeasonalBackgroundMode>(OsuSetting.SeasonalBackgroundMode);
 
             user.ValueChanged += _ => Next();
             skin.ValueChanged += _ => Next();
             mode.ValueChanged += _ => Next();
             beatmap.ValueChanged += _ => Next();
             introSequence.ValueChanged += _ => Next();
-            showSeasonalBackgrounds.ValueChanged += _ => Next();
+            seasonalBackgroundMode.ValueChanged += _ => Next();
 
             currentDisplay = RNG.Next(0, background_count);
 
@@ -106,14 +106,14 @@ namespace osu.Game.Screens.Backgrounds
             else
                 newBackground = new Background(backgroundName);
 
-            switch (showSeasonalBackgrounds.Value)
+            switch (seasonalBackgroundMode.Value)
             {
-                case SeasonalBackgrounds.Sometimes:
+                case SeasonalBackgroundMode.Sometimes:
                     if (seasonalBackgroundLoader.IsInSeason())
-                        goto case SeasonalBackgrounds.Always;
+                        goto case SeasonalBackgroundMode.Always;
                     break;
 
-                case SeasonalBackgrounds.Always:
+                case SeasonalBackgroundMode.Always:
                     newBackground = seasonalBackgroundLoader.LoadBackground() ?? newBackground;
                     break;
             }

From d19dd4eef6ba621616f684b5b07d41d154d68f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Fri, 30 Oct 2020 15:56:19 +0100
Subject: [PATCH 05833/10326] IsInSeason() -> IsInSeason

---
 osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs | 2 +-
 osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index d806c62650..ff1a2c9f37 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Graphics.Backgrounds
             return new SeasonalBackground(url);
         }
 
-        public bool IsInSeason() => DateTimeOffset.Now < endDate.Value;
+        public bool IsInSeason => DateTimeOffset.Now < endDate.Value;
     }
 
     [LongRunningLoad]
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index a5bdcee8d4..5fa4ddc041 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.Backgrounds
             switch (seasonalBackgroundMode.Value)
             {
                 case SeasonalBackgroundMode.Sometimes:
-                    if (seasonalBackgroundLoader.IsInSeason())
+                    if (seasonalBackgroundLoader.IsInSeason)
                         goto case SeasonalBackgroundMode.Always;
                     break;
 

From 6f6a8e2a8fe09581630728d0e347b48e91c3f80e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Fri, 30 Oct 2020 16:06:48 +0100
Subject: [PATCH 05834/10326] Convert switch to if

---
 .../Screens/Backgrounds/BackgroundScreenDefault.cs   | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 5fa4ddc041..39ecd70084 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -106,16 +106,10 @@ namespace osu.Game.Screens.Backgrounds
             else
                 newBackground = new Background(backgroundName);
 
-            switch (seasonalBackgroundMode.Value)
+            if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Always
+                || seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && seasonalBackgroundLoader.IsInSeason)
             {
-                case SeasonalBackgroundMode.Sometimes:
-                    if (seasonalBackgroundLoader.IsInSeason)
-                        goto case SeasonalBackgroundMode.Always;
-                    break;
-
-                case SeasonalBackgroundMode.Always:
-                    newBackground = seasonalBackgroundLoader.LoadBackground() ?? newBackground;
-                    break;
+                newBackground = seasonalBackgroundLoader.LoadBackground() ?? newBackground;
             }
 
             newBackground.Depth = currentDisplay;

From f6eb5680ec53626707452cf08c0926713fbf2ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Fri, 30 Oct 2020 16:43:18 +0100
Subject: [PATCH 05835/10326] Save full api response in SessionStatics

---
 osu.Game/Configuration/SessionStatics.cs      |  8 ++-----
 .../Backgrounds/SeasonalBackgroundLoader.cs   | 24 ++++++++-----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 8100e0fb12..199889391b 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.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 osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Configuration
@@ -16,8 +14,7 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
-            Set(Static.SeasonEndDate, DateTimeOffset.MinValue);
-            Set(Static.SeasonalBackgrounds, new List<APISeasonalBackground>());
+            Set<APISeasonalBackgrounds>(Static.SeasonalBackgroundsResponse, null);
         }
     }
 
@@ -25,7 +22,6 @@ namespace osu.Game.Configuration
     {
         LoginOverlayDisplayed,
         MutedAudioNotificationShownOnce,
-        SeasonEndDate,
-        SeasonalBackgrounds,
+        SeasonalBackgroundsResponse,
     }
 }
diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index ff1a2c9f37..c884756c80 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -19,25 +18,21 @@ namespace osu.Game.Graphics.Backgrounds
     [LongRunningLoad]
     public class SeasonalBackgroundLoader : Component
     {
-        private Bindable<DateTimeOffset> endDate;
-        private Bindable<List<APISeasonalBackground>> backgrounds;
+        private Bindable<APISeasonalBackgrounds> cachedResponse;
         private int current;
 
         [BackgroundDependencyLoader]
         private void load(SessionStatics sessionStatics, IAPIProvider api)
         {
-            endDate = sessionStatics.GetBindable<DateTimeOffset>(Static.SeasonEndDate);
-            backgrounds = sessionStatics.GetBindable<List<APISeasonalBackground>>(Static.SeasonalBackgrounds);
+            cachedResponse = sessionStatics.GetBindable<APISeasonalBackgrounds>(Static.SeasonalBackgroundsResponse);
 
-            if (backgrounds.Value.Any()) return;
+            if (cachedResponse.Value != null) return;
 
             var request = new GetSeasonalBackgroundsRequest();
             request.Success += response =>
             {
-                endDate.Value = response.EndDate;
-                backgrounds.Value = response.Backgrounds ?? backgrounds.Value;
-
-                current = RNG.Next(0, backgrounds.Value.Count);
+                cachedResponse.Value = response;
+                current = RNG.Next(0, cachedResponse.Value.Backgrounds.Count);
             };
 
             api.PerformAsync(request);
@@ -45,15 +40,16 @@ namespace osu.Game.Graphics.Backgrounds
 
         public SeasonalBackground LoadBackground()
         {
-            if (!backgrounds.Value.Any()) return null;
+            var backgrounds = cachedResponse.Value.Backgrounds;
+            if (!backgrounds.Any()) return null;
 
-            current = (current + 1) % backgrounds.Value.Count;
-            string url = backgrounds.Value[current].Url;
+            current = (current + 1) % backgrounds.Count;
+            string url = backgrounds[current].Url;
 
             return new SeasonalBackground(url);
         }
 
-        public bool IsInSeason => DateTimeOffset.Now < endDate.Value;
+        public bool IsInSeason => DateTimeOffset.Now < cachedResponse.Value.EndDate;
     }
 
     [LongRunningLoad]

From 0b46c19b23995f42e35b82877b41404200f109ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Fri, 30 Oct 2020 17:16:51 +0100
Subject: [PATCH 05836/10326] Move seasonalBackgroundMode check up and early
 return if available

---
 .../Backgrounds/BackgroundScreenDefault.cs     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 39ecd70084..b65b45060f 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -79,6 +79,18 @@ namespace osu.Game.Screens.Backgrounds
             Background newBackground;
             string backgroundName;
 
+            if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Always
+                || seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && seasonalBackgroundLoader.IsInSeason)
+            {
+                var seasonalBackground = seasonalBackgroundLoader.LoadBackground();
+
+                if (seasonalBackground != null)
+                {
+                    seasonalBackground.Depth = currentDisplay;
+                    return seasonalBackground;
+                }
+            }
+
             switch (introSequence.Value)
             {
                 case IntroSequence.Welcome:
@@ -106,12 +118,6 @@ namespace osu.Game.Screens.Backgrounds
             else
                 newBackground = new Background(backgroundName);
 
-            if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Always
-                || seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && seasonalBackgroundLoader.IsInSeason)
-            {
-                newBackground = seasonalBackgroundLoader.LoadBackground() ?? newBackground;
-            }
-
             newBackground.Depth = currentDisplay;
 
             return newBackground;

From 51a58269add518f7ea68f590fceeff11612cc5c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Fri, 30 Oct 2020 17:57:29 +0100
Subject: [PATCH 05837/10326] Fix nullref in case of successfull request but no
 backgrounds available

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

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index c884756c80..daceb05fd7 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Graphics.Backgrounds
             request.Success += response =>
             {
                 cachedResponse.Value = response;
-                current = RNG.Next(0, cachedResponse.Value.Backgrounds.Count);
+                current = RNG.Next(0, response.Backgrounds?.Count ?? 0);
             };
 
             api.PerformAsync(request);
@@ -41,7 +41,7 @@ namespace osu.Game.Graphics.Backgrounds
         public SeasonalBackground LoadBackground()
         {
             var backgrounds = cachedResponse.Value.Backgrounds;
-            if (!backgrounds.Any()) return null;
+            if (backgrounds == null || !backgrounds.Any()) return null;
 
             current = (current + 1) % backgrounds.Count;
             string url = backgrounds[current].Url;

From d5dfd1dffeee753cb47d70afc87a1b3055e1962e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Fri, 30 Oct 2020 18:07:07 +0100
Subject: [PATCH 05838/10326] Insert optional parentheses

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

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index b65b45060f..45374e1223 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Screens.Backgrounds
             string backgroundName;
 
             if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Always
-                || seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && seasonalBackgroundLoader.IsInSeason)
+                || (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && seasonalBackgroundLoader.IsInSeason))
             {
                 var seasonalBackground = seasonalBackgroundLoader.LoadBackground();
 

From 82ef85569bffe30e64a00414ddb8465348d645d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 30 Oct 2020 19:35:08 +0100
Subject: [PATCH 05839/10326] Fix nullref when querying IsInSeason before
 request completion

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

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index daceb05fd7..2963d57a97 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Graphics.Backgrounds
             return new SeasonalBackground(url);
         }
 
-        public bool IsInSeason => DateTimeOffset.Now < cachedResponse.Value.EndDate;
+        public bool IsInSeason => cachedResponse.Value != null && DateTimeOffset.Now < cachedResponse.Value.EndDate;
     }
 
     [LongRunningLoad]

From 20c27c69431eb680781338c4e0deba1f2a1658ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 30 Oct 2020 19:55:17 +0100
Subject: [PATCH 05840/10326] Rename lookup & field

---
 osu.Game/Configuration/SessionStatics.cs             |  4 ++--
 .../Graphics/Backgrounds/SeasonalBackgroundLoader.cs | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 199889391b..c470058ae8 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
-            Set<APISeasonalBackgrounds>(Static.SeasonalBackgroundsResponse, null);
+            Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
     }
 
@@ -22,6 +22,6 @@ namespace osu.Game.Configuration
     {
         LoginOverlayDisplayed,
         MutedAudioNotificationShownOnce,
-        SeasonalBackgroundsResponse,
+        SeasonalBackgrounds,
     }
 }
diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index 2963d57a97..1c38e67451 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -18,20 +18,20 @@ namespace osu.Game.Graphics.Backgrounds
     [LongRunningLoad]
     public class SeasonalBackgroundLoader : Component
     {
-        private Bindable<APISeasonalBackgrounds> cachedResponse;
+        private Bindable<APISeasonalBackgrounds> seasonalBackgrounds;
         private int current;
 
         [BackgroundDependencyLoader]
         private void load(SessionStatics sessionStatics, IAPIProvider api)
         {
-            cachedResponse = sessionStatics.GetBindable<APISeasonalBackgrounds>(Static.SeasonalBackgroundsResponse);
+            seasonalBackgrounds = sessionStatics.GetBindable<APISeasonalBackgrounds>(Static.SeasonalBackgrounds);
 
-            if (cachedResponse.Value != null) return;
+            if (seasonalBackgrounds.Value != null) return;
 
             var request = new GetSeasonalBackgroundsRequest();
             request.Success += response =>
             {
-                cachedResponse.Value = response;
+                seasonalBackgrounds.Value = response;
                 current = RNG.Next(0, response.Backgrounds?.Count ?? 0);
             };
 
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.Backgrounds
 
         public SeasonalBackground LoadBackground()
         {
-            var backgrounds = cachedResponse.Value.Backgrounds;
+            var backgrounds = seasonalBackgrounds.Value.Backgrounds;
             if (backgrounds == null || !backgrounds.Any()) return null;
 
             current = (current + 1) % backgrounds.Count;
@@ -49,7 +49,7 @@ namespace osu.Game.Graphics.Backgrounds
             return new SeasonalBackground(url);
         }
 
-        public bool IsInSeason => cachedResponse.Value != null && DateTimeOffset.Now < cachedResponse.Value.EndDate;
+        public bool IsInSeason => seasonalBackgrounds.Value != null && DateTimeOffset.Now < seasonalBackgrounds.Value.EndDate;
     }
 
     [LongRunningLoad]

From aeab2be5d1968c7a1a6a712afc2897033891bb6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 30 Oct 2020 19:56:52 +0100
Subject: [PATCH 05841/10326] Add xmldoc to SeasonalBackgroundMode

---
 osu.Game/Configuration/SeasonalBackgroundMode.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Configuration/SeasonalBackgroundMode.cs b/osu.Game/Configuration/SeasonalBackgroundMode.cs
index 406736b2a4..6ef835ce5f 100644
--- a/osu.Game/Configuration/SeasonalBackgroundMode.cs
+++ b/osu.Game/Configuration/SeasonalBackgroundMode.cs
@@ -5,8 +5,19 @@ namespace osu.Game.Configuration
 {
     public enum SeasonalBackgroundMode
     {
+        /// <summary>
+        /// Seasonal backgrounds are shown regardless of season, if at all available.
+        /// </summary>
         Always,
+
+        /// <summary>
+        /// Seasonal backgrounds are shown only during their corresponding season.
+        /// </summary>
         Sometimes,
+
+        /// <summary>
+        /// Seasonal backgrounds are never shown.
+        /// </summary>
         Never
     }
 }

From cf0e8e0a620faaa77ba490ab3e71b9901eabd658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 30 Oct 2020 19:59:52 +0100
Subject: [PATCH 05842/10326] Document nullability of seasonal backgrounds

---
 osu.Game/Configuration/SessionStatics.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index c470058ae8..03bc434aac 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -22,6 +22,11 @@ namespace osu.Game.Configuration
     {
         LoginOverlayDisplayed,
         MutedAudioNotificationShownOnce,
+
+        /// <summary>
+        /// Info about seasonal backgrounds available fetched from API - see <see cref="APISeasonalBackgrounds"/>.
+        /// Value under this lookup can be <c>null</c> if there are no backgrounds available (or API is not reachable).
+        /// </summary>
         SeasonalBackgrounds,
     }
 }

From 67a325f47dd608f625711a4e38b8968ee514716e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 30 Oct 2020 20:32:14 +0100
Subject: [PATCH 05843/10326] Move config setting logic to background loader

---
 .../Backgrounds/SeasonalBackgroundLoader.cs     | 17 +++++++++++++----
 .../Backgrounds/BackgroundScreenDefault.cs      | 14 +++++---------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index 1c38e67451..a9b9929c79 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -18,12 +18,14 @@ namespace osu.Game.Graphics.Backgrounds
     [LongRunningLoad]
     public class SeasonalBackgroundLoader : Component
     {
+        private Bindable<SeasonalBackgroundMode> seasonalBackgroundMode;
         private Bindable<APISeasonalBackgrounds> seasonalBackgrounds;
         private int current;
 
         [BackgroundDependencyLoader]
-        private void load(SessionStatics sessionStatics, IAPIProvider api)
+        private void load(OsuConfigManager config, SessionStatics sessionStatics, IAPIProvider api)
         {
+            seasonalBackgroundMode = config.GetBindable<SeasonalBackgroundMode>(OsuSetting.SeasonalBackgroundMode);
             seasonalBackgrounds = sessionStatics.GetBindable<APISeasonalBackgrounds>(Static.SeasonalBackgrounds);
 
             if (seasonalBackgrounds.Value != null) return;
@@ -38,10 +40,17 @@ namespace osu.Game.Graphics.Backgrounds
             api.PerformAsync(request);
         }
 
-        public SeasonalBackground LoadBackground()
+        public SeasonalBackground LoadNextBackground()
         {
+            if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Never
+                || (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && !isInSeason))
+            {
+                return null;
+            }
+
             var backgrounds = seasonalBackgrounds.Value.Backgrounds;
-            if (backgrounds == null || !backgrounds.Any()) return null;
+            if (backgrounds == null || !backgrounds.Any())
+                return null;
 
             current = (current + 1) % backgrounds.Count;
             string url = backgrounds[current].Url;
@@ -49,7 +58,7 @@ namespace osu.Game.Graphics.Backgrounds
             return new SeasonalBackground(url);
         }
 
-        public bool IsInSeason => seasonalBackgrounds.Value != null && DateTimeOffset.Now < seasonalBackgrounds.Value.EndDate;
+        private bool isInSeason => seasonalBackgrounds.Value != null && DateTimeOffset.Now < seasonalBackgrounds.Value.EndDate;
     }
 
     [LongRunningLoad]
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 45374e1223..cbe0841537 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -79,16 +79,12 @@ namespace osu.Game.Screens.Backgrounds
             Background newBackground;
             string backgroundName;
 
-            if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Always
-                || (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && seasonalBackgroundLoader.IsInSeason))
-            {
-                var seasonalBackground = seasonalBackgroundLoader.LoadBackground();
+            var seasonalBackground = seasonalBackgroundLoader.LoadNextBackground();
 
-                if (seasonalBackground != null)
-                {
-                    seasonalBackground.Depth = currentDisplay;
-                    return seasonalBackground;
-                }
+            if (seasonalBackground != null)
+            {
+                seasonalBackground.Depth = currentDisplay;
+                return seasonalBackground;
             }
 
             switch (introSequence.Value)

From 8632f0d77f18b6fb65aee838bced622aba6bdc84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 30 Oct 2020 21:24:20 +0100
Subject: [PATCH 05844/10326] Add test coverage

---
 .../TestSceneSeasonalBackgroundLoader.cs      | 200 ++++++++++++++++++
 1 file changed, 200 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs

diff --git a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
new file mode 100644
index 0000000000..8f5990aeb1
--- /dev/null
+++ b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
@@ -0,0 +1,200 @@
+// Copyright (c) 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;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Configuration;
+using osu.Game.Graphics.Backgrounds;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Tests.Visual.Background
+{
+    public class TestSceneSeasonalBackgroundLoader : ScreenTestScene
+    {
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
+        [Resolved]
+        private SessionStatics statics { get; set; }
+
+        [Cached(typeof(LargeTextureStore))]
+        private LookupLoggingTextureStore textureStore = new LookupLoggingTextureStore();
+
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+
+        private SeasonalBackgroundLoader backgroundLoader;
+        private Container backgroundContainer;
+
+        // in real usages these would be online URLs, but correct execution of this test
+        // shouldn't be coupled to existence of online assets.
+        private static readonly List<string> seasonal_background_urls = new List<string>
+        {
+            "Backgrounds/bg2",
+            "Backgrounds/bg4",
+            "Backgrounds/bg3"
+        };
+
+        [BackgroundDependencyLoader]
+        private void load(LargeTextureStore wrappedStore)
+        {
+            textureStore.AddStore(wrappedStore);
+
+            Add(backgroundContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both
+            });
+        }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            // reset API response in statics to avoid test crosstalk.
+            statics.Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
+            textureStore.PerformedLookups.Clear();
+            dummyAPI.SetState(APIState.Online);
+
+            backgroundContainer.Clear();
+        });
+
+        [TestCase(-5)]
+        [TestCase(5)]
+        public void TestAlwaysSeasonal(int daysOffset)
+        {
+            registerBackgroundsResponse(DateTimeOffset.Now.AddDays(daysOffset));
+            setSeasonalBackgroundMode(SeasonalBackgroundMode.Always);
+
+            createLoader();
+
+            for (int i = 0; i < 4; ++i)
+                loadNextBackground();
+
+            AddAssert("all backgrounds cycled", () => new HashSet<string>(textureStore.PerformedLookups).SetEquals(seasonal_background_urls));
+        }
+
+        [TestCase(-5)]
+        [TestCase(5)]
+        public void TestNeverSeasonal(int daysOffset)
+        {
+            registerBackgroundsResponse(DateTimeOffset.Now.AddDays(daysOffset));
+            setSeasonalBackgroundMode(SeasonalBackgroundMode.Never);
+
+            createLoader();
+
+            assertNoBackgrounds();
+        }
+
+        [Test]
+        public void TestSometimesInSeason()
+        {
+            registerBackgroundsResponse(DateTimeOffset.Now.AddDays(5));
+            setSeasonalBackgroundMode(SeasonalBackgroundMode.Sometimes);
+
+            createLoader();
+
+            assertAnyBackground();
+        }
+
+        [Test]
+        public void TestSometimesOutOfSeason()
+        {
+            registerBackgroundsResponse(DateTimeOffset.Now.AddDays(-10));
+            setSeasonalBackgroundMode(SeasonalBackgroundMode.Sometimes);
+
+            createLoader();
+
+            assertNoBackgrounds();
+        }
+
+        [Test]
+        public void TestDelayedConnectivity()
+        {
+            registerBackgroundsResponse(DateTimeOffset.Now.AddDays(30));
+            setSeasonalBackgroundMode(SeasonalBackgroundMode.Always);
+            AddStep("go offline", () => dummyAPI.SetState(APIState.Offline));
+
+            createLoader();
+            assertNoBackgrounds();
+
+            AddStep("go online", () => dummyAPI.SetState(APIState.Online));
+
+            assertAnyBackground();
+        }
+
+        private void registerBackgroundsResponse(DateTimeOffset endDate)
+            => AddStep("setup request handler", () =>
+            {
+                dummyAPI.HandleRequest = request =>
+                {
+                    if (dummyAPI.State.Value != APIState.Online || !(request is GetSeasonalBackgroundsRequest backgroundsRequest))
+                        return;
+
+                    backgroundsRequest.TriggerSuccess(new APISeasonalBackgrounds
+                    {
+                        Backgrounds = seasonal_background_urls.Select(url => new APISeasonalBackground { Url = url }).ToList(),
+                        EndDate = endDate
+                    });
+                };
+            });
+
+        private void setSeasonalBackgroundMode(SeasonalBackgroundMode mode)
+            => AddStep($"set seasonal mode to {mode}", () => config.Set(OsuSetting.SeasonalBackgroundMode, mode));
+
+        private void createLoader()
+        {
+            AddStep("create loader", () =>
+            {
+                if (backgroundLoader != null)
+                    Remove(backgroundLoader);
+
+                LoadComponentAsync(backgroundLoader = new SeasonalBackgroundLoader(), Add);
+            });
+
+            AddUntilStep("wait for loaded", () => backgroundLoader.IsLoaded);
+        }
+
+        private void loadNextBackground()
+        {
+            SeasonalBackground background = null;
+
+            AddStep("create next background", () =>
+            {
+                background = backgroundLoader.LoadNextBackground();
+                LoadComponentAsync(background, bg => backgroundContainer.Child = bg);
+            });
+
+            AddUntilStep("background loaded", () => background.IsLoaded);
+        }
+
+        private void assertAnyBackground()
+        {
+            loadNextBackground();
+            AddAssert("background looked up", () => textureStore.PerformedLookups.Any());
+        }
+
+        private void assertNoBackgrounds()
+        {
+            AddAssert("no background available", () => backgroundLoader.LoadNextBackground() == null);
+            AddAssert("no lookups performed", () => !textureStore.PerformedLookups.Any());
+        }
+
+        private class LookupLoggingTextureStore : LargeTextureStore
+        {
+            public List<string> PerformedLookups { get; } = new List<string>();
+
+            public override Texture Get(string name, WrapMode wrapModeS, WrapMode wrapModeT)
+            {
+                PerformedLookups.Add(name);
+                return base.Get(name, wrapModeS, wrapModeT);
+            }
+        }
+    }
+}

From 29ad09990259245b8b828a49add4411a90d5f88a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 30 Oct 2020 21:49:14 +0100
Subject: [PATCH 05845/10326] Allow to fetch if going online after launch

---
 .../Backgrounds/SeasonalBackgroundLoader.cs    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index a9b9929c79..ff290dd99e 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -18,17 +18,29 @@ namespace osu.Game.Graphics.Backgrounds
     [LongRunningLoad]
     public class SeasonalBackgroundLoader : Component
     {
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
         private Bindable<SeasonalBackgroundMode> seasonalBackgroundMode;
         private Bindable<APISeasonalBackgrounds> seasonalBackgrounds;
+
         private int current;
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, SessionStatics sessionStatics, IAPIProvider api)
+        private void load(OsuConfigManager config, SessionStatics sessionStatics)
         {
             seasonalBackgroundMode = config.GetBindable<SeasonalBackgroundMode>(OsuSetting.SeasonalBackgroundMode);
             seasonalBackgrounds = sessionStatics.GetBindable<APISeasonalBackgrounds>(Static.SeasonalBackgrounds);
 
-            if (seasonalBackgrounds.Value != null) return;
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(fetchSeasonalBackgrounds, true);
+        }
+
+        private void fetchSeasonalBackgrounds(ValueChangedEvent<APIState> stateChanged)
+        {
+            if (seasonalBackgrounds.Value != null || stateChanged.NewValue != APIState.Online)
+                return;
 
             var request = new GetSeasonalBackgroundsRequest();
             request.Success += response =>
@@ -48,7 +60,7 @@ namespace osu.Game.Graphics.Backgrounds
                 return null;
             }
 
-            var backgrounds = seasonalBackgrounds.Value.Backgrounds;
+            var backgrounds = seasonalBackgrounds.Value?.Backgrounds;
             if (backgrounds == null || !backgrounds.Any())
                 return null;
 

From 38cf90a69b8734343b68fce3646b618f4d3ad6a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 30 Oct 2020 22:03:26 +0100
Subject: [PATCH 05846/10326] Change background to seasonal right after login

---
 .../Graphics/Backgrounds/SeasonalBackgroundLoader.cs     | 9 +++++++++
 osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs  | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index ff290dd99e..b439d98083 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -18,6 +18,12 @@ namespace osu.Game.Graphics.Backgrounds
     [LongRunningLoad]
     public class SeasonalBackgroundLoader : Component
     {
+        /// <summary>
+        /// Fired when background change should be changed due to receiving backgrounds from API
+        /// or when the user setting is changed (as it might require unloading the seasonal background).
+        /// </summary>
+        public event Action SeasonalBackgroundChanged;
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -31,7 +37,10 @@ namespace osu.Game.Graphics.Backgrounds
         private void load(OsuConfigManager config, SessionStatics sessionStatics)
         {
             seasonalBackgroundMode = config.GetBindable<SeasonalBackgroundMode>(OsuSetting.SeasonalBackgroundMode);
+            seasonalBackgroundMode.BindValueChanged(_ => SeasonalBackgroundChanged?.Invoke());
+
             seasonalBackgrounds = sessionStatics.GetBindable<APISeasonalBackgrounds>(Static.SeasonalBackgrounds);
+            seasonalBackgrounds.BindValueChanged(_ => SeasonalBackgroundChanged?.Invoke());
 
             apiState.BindTo(api.State);
             apiState.BindValueChanged(fetchSeasonalBackgrounds, true);
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index cbe0841537..f392386bf9 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -25,7 +25,6 @@ namespace osu.Game.Screens.Backgrounds
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
         private Bindable<IntroSequence> introSequence;
-        private Bindable<SeasonalBackgroundMode> seasonalBackgroundMode;
         private readonly SeasonalBackgroundLoader seasonalBackgroundLoader = new SeasonalBackgroundLoader();
 
         [Resolved]
@@ -43,14 +42,13 @@ namespace osu.Game.Screens.Backgrounds
             skin = skinManager.CurrentSkin.GetBoundCopy();
             mode = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource);
             introSequence = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence);
-            seasonalBackgroundMode = config.GetBindable<SeasonalBackgroundMode>(OsuSetting.SeasonalBackgroundMode);
 
             user.ValueChanged += _ => Next();
             skin.ValueChanged += _ => Next();
             mode.ValueChanged += _ => Next();
             beatmap.ValueChanged += _ => Next();
             introSequence.ValueChanged += _ => Next();
-            seasonalBackgroundMode.ValueChanged += _ => Next();
+            seasonalBackgroundLoader.SeasonalBackgroundChanged += Next;
 
             currentDisplay = RNG.Next(0, background_count);
 

From 391dd73843b52fcf559b6b23eb56171c89e7c37a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 30 Oct 2020 22:39:34 +0100
Subject: [PATCH 05847/10326] Fix typo in comment

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

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index b439d98083..03b7300011 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Graphics.Backgrounds
     public class SeasonalBackgroundLoader : Component
     {
         /// <summary>
-        /// Fired when background change should be changed due to receiving backgrounds from API
+        /// Fired when background should be changed due to receiving backgrounds from API
         /// or when the user setting is changed (as it might require unloading the seasonal background).
         /// </summary>
         public event Action SeasonalBackgroundChanged;

From 78842ab95ae90862c704ee3c350cd08b8c6126e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 30 Oct 2020 22:40:24 +0100
Subject: [PATCH 05848/10326] Improve look & behaviour of background
 transitions

---
 .../Graphics/Backgrounds/SeasonalBackgroundLoader.cs     | 2 ++
 osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs  | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index 03b7300011..99f3a8a6e8 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -97,6 +97,8 @@ namespace osu.Game.Graphics.Backgrounds
         private void load(LargeTextureStore textures)
         {
             Sprite.Texture = textures.Get(url) ?? textures.Get(fallback_texture_name);
+            // ensure we're not loading in without a transition.
+            this.FadeInFromZero(200, Easing.InOutSine);
         }
     }
 }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index f392386bf9..3f6210310f 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.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.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -52,7 +53,8 @@ namespace osu.Game.Screens.Backgrounds
 
             currentDisplay = RNG.Next(0, background_count);
 
-            LoadComponentAsync(seasonalBackgroundLoader, _ => LoadComponentAsync(createBackground(), display));
+            LoadComponentAsync(seasonalBackgroundLoader);
+            Next();
         }
 
         private void display(Background newBackground)
@@ -65,11 +67,14 @@ namespace osu.Game.Screens.Backgrounds
         }
 
         private ScheduledDelegate nextTask;
+        private CancellationTokenSource cancellationTokenSource;
 
         public void Next()
         {
             nextTask?.Cancel();
-            nextTask = Scheduler.AddDelayed(() => { LoadComponentAsync(createBackground(), display); }, 100);
+            cancellationTokenSource?.Cancel();
+            cancellationTokenSource = new CancellationTokenSource();
+            nextTask = Scheduler.AddDelayed(() => LoadComponentAsync(createBackground(), display, cancellationTokenSource.Token), 100);
         }
 
         private Background createBackground()

From 6a293dd536a9444a52ffd3de7c4992256e04bf64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 31 Oct 2020 18:56:30 +0900
Subject: [PATCH 05849/10326] Add missing ctor parameters back

---
 osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs        | 2 +-
 osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index 1e87893f39..2af15923a0 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Ranking
                         }
                     }
                 },
-                new AccuracyCircle(score)
+                new AccuracyCircle(score, true)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index cb4560802b..711763330c 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     Margin = new MarginPadding { Top = 40 },
                                     RelativeSizeAxes = Axes.X,
                                     Height = 230,
-                                    Child = new AccuracyCircle(score)
+                                    Child = new AccuracyCircle(score, withFlair)
                                     {
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,

From 129b1bc6d3dfcebb51e4e30a7f40d34b6dea9807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 31 Oct 2020 11:35:25 +0100
Subject: [PATCH 05850/10326] Delete all selected objects if shift-clicked on
 one

---
 .../Edit/Compose/Components/SelectionHandler.cs        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 01e23bafc5..92c75eae4f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -226,13 +226,21 @@ namespace osu.Game.Screens.Edit.Compose.Components
         internal void HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
         {
             if (state.Keyboard.ShiftPressed && state.Mouse.IsPressed(MouseButton.Right))
-                EditorBeatmap.Remove(blueprint.HitObject);
+                handleQuickDeletion(blueprint);
             else if (state.Keyboard.ControlPressed && state.Mouse.IsPressed(MouseButton.Left))
                 blueprint.ToggleSelection();
             else
                 ensureSelected(blueprint);
         }
 
+        private void handleQuickDeletion(SelectionBlueprint blueprint)
+        {
+            if (!blueprint.IsSelected)
+                EditorBeatmap.Remove(blueprint.HitObject);
+            else
+                deleteSelected();
+        }
+
         private void ensureSelected(SelectionBlueprint blueprint)
         {
             if (blueprint.IsSelected)

From 003994ab7518cf821204a5ba417c9b9bb4c35ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 31 Oct 2020 12:21:07 +0100
Subject: [PATCH 05851/10326] Bind UpdateVisibility() directly to source of
 truth

---
 .../Edit/Compose/Components/BlueprintContainer.cs    |  9 +--------
 .../Edit/Compose/Components/SelectionHandler.cs      | 12 ++++++------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 5ac360d029..fa98358dbe 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -210,10 +210,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
 
             if (DragBox.State == Visibility.Visible)
-            {
                 DragBox.Hide();
-                SelectionHandler.UpdateVisibility();
-            }
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
@@ -352,11 +349,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Selects all <see cref="SelectionBlueprint"/>s.
         /// </summary>
-        private void selectAll()
-        {
-            SelectionBlueprints.ToList().ForEach(m => m.Select());
-            SelectionHandler.UpdateVisibility();
-        }
+        private void selectAll() => SelectionBlueprints.ToList().ForEach(m => m.Select());
 
         /// <summary>
         /// Deselects all selected <see cref="SelectionBlueprint"/>s.
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 01e23bafc5..07ae283667 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -201,8 +201,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
             if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.HitObject))
                 EditorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
-
-            UpdateVisibility();
         }
 
         /// <summary>
@@ -214,8 +212,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectedBlueprints.Remove(blueprint);
 
             EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
-
-            UpdateVisibility();
         }
 
         /// <summary>
@@ -254,7 +250,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Updates whether this <see cref="SelectionHandler"/> is visible.
         /// </summary>
-        internal void UpdateVisibility()
+        private void updateVisibility()
         {
             int count = selectedBlueprints.Count;
 
@@ -421,7 +417,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // bring in updates from selection changes
             EditorBeatmap.HitObjectUpdated += _ => UpdateTernaryStates();
-            EditorBeatmap.SelectedHitObjects.CollectionChanged += (sender, args) => UpdateTernaryStates();
+            EditorBeatmap.SelectedHitObjects.CollectionChanged += (sender, args) =>
+            {
+                updateVisibility();
+                UpdateTernaryStates();
+            };
         }
 
         /// <summary>

From 3322b8a7ea03d97e3c18acf58965d0c7798d4ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 31 Oct 2020 12:25:02 +0100
Subject: [PATCH 05852/10326] Run OnSelectionChanged() on each change

---
 .../Screens/Edit/Compose/Components/SelectionHandler.cs    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 07ae283667..0547b15e3d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -257,16 +257,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
 
             if (count > 0)
-            {
                 Show();
-                OnSelectionChanged();
-            }
             else
                 Hide();
+
+            OnSelectionChanged();
         }
 
         /// <summary>
-        /// Triggered whenever more than one object is selected, on each change.
+        /// Triggered whenever the set of selected objects changes.
         /// Should update the selection box's state to match supported operations.
         /// </summary>
         protected virtual void OnSelectionChanged()

From d74c19e2d703f6e57139727692a3473ea7bd55fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 31 Oct 2020 12:28:35 +0100
Subject: [PATCH 05853/10326] Shorten show/hide code

---
 .../Screens/Edit/Compose/Components/SelectionHandler.cs     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 0547b15e3d..41098cc84c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -256,11 +256,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
 
-            if (count > 0)
-                Show();
-            else
-                Hide();
-
+            this.FadeTo(count > 0 ? 1 : 0);
             OnSelectionChanged();
         }
 

From 007c27d3ffa987afdfc5c3502c27d4a89f8538fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 31 Oct 2020 14:45:11 +0100
Subject: [PATCH 05854/10326] Schedule visibility update once per frame

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 41098cc84c..5c1b41d848 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -414,7 +414,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             EditorBeatmap.HitObjectUpdated += _ => UpdateTernaryStates();
             EditorBeatmap.SelectedHitObjects.CollectionChanged += (sender, args) =>
             {
-                updateVisibility();
+                Scheduler.AddOnce(updateVisibility);
                 UpdateTernaryStates();
             };
         }

From a9a3489e92b200d99c335cd52aab2c93e4cf3a17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 31 Oct 2020 22:51:31 +0900
Subject: [PATCH 05855/10326] Fix potential null reference when loading
 background

As seen in
https://discordapp.com/channels/188630481301012481/188630652340404224/772094427342569493.
Caused due to async load of the loader, which means it may not be ready
before Next() is called.
---
 osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs | 1 -
 osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs   | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index 99f3a8a6e8..a48da37804 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -15,7 +15,6 @@ using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Graphics.Backgrounds
 {
-    [LongRunningLoad]
     public class SeasonalBackgroundLoader : Component
     {
         /// <summary>
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 3f6210310f..8beb955824 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Screens.Backgrounds
             mode = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource);
             introSequence = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence);
 
+            AddInternal(seasonalBackgroundLoader);
+
             user.ValueChanged += _ => Next();
             skin.ValueChanged += _ => Next();
             mode.ValueChanged += _ => Next();
@@ -53,7 +55,6 @@ namespace osu.Game.Screens.Backgrounds
 
             currentDisplay = RNG.Next(0, background_count);
 
-            LoadComponentAsync(seasonalBackgroundLoader);
             Next();
         }
 

From 941e8525af5c1b26b5aadc6ffd52554b53f2cf4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 31 Oct 2020 16:06:53 +0100
Subject: [PATCH 05856/10326] Add flag parameter to allow non-user-pause via
 music controller

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

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 12caf98021..7e7be31de6 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -182,9 +182,14 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Stop playing the current track and pause at the current position.
         /// </summary>
-        public void Stop()
+        /// <param name="requestedByUser">
+        /// Whether the request to stop was issued by the user rather than internally.
+        /// Specifying <c>true</c> will ensure that other methods like <see cref="EnsurePlayingSomething"/>
+        /// will not resume music playback until the next explicit call to <see cref="Play"/>.
+        /// </param>
+        public void Stop(bool requestedByUser = true)
         {
-            IsUserPaused = true;
+            IsUserPaused |= requestedByUser;
             if (CurrentTrack.IsRunning)
                 CurrentTrack.Stop();
         }

From 19023e7d437037172dee9aafc1b252af02108e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 31 Oct 2020 16:08:15 +0100
Subject: [PATCH 05857/10326] Fix player restart invoking user-level pause

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 3c0c643413..4427bb02e2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -472,7 +472,7 @@ namespace osu.Game.Screens.Play
         {
             // at the point of restarting the track should either already be paused or the volume should be zero.
             // stopping here is to ensure music doesn't become audible after exiting back to PlayerLoader.
-            musicController.Stop();
+            musicController.Stop(false);
 
             sampleRestart?.Play();
             RestartRequested?.Invoke();

From 79f47953a800bcdd35951785ff266919dd39bf03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 31 Oct 2020 16:08:27 +0100
Subject: [PATCH 05858/10326] Migrate existing call to new flag parameter

---
 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 e32ed07863..1c9bdd43ab 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Tests.Visual
             rulesetDependencies?.Dispose();
 
             if (MusicController?.TrackLoaded == true)
-                MusicController.CurrentTrack.Stop();
+                MusicController.Stop(false);
 
             if (contextFactory?.IsValueCreated == true)
                 contextFactory.Value.ResetDatabase();

From 2065680e9d1d12183c5493dfc639fff9b74ee97c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 31 Oct 2020 17:01:45 +0100
Subject: [PATCH 05859/10326] Simplify test case

---
 .../Background/TestSceneSeasonalBackgroundLoader.cs       | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
index 8f5990aeb1..fba0d92d4b 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
@@ -149,18 +149,14 @@ namespace osu.Game.Tests.Visual.Background
             => AddStep($"set seasonal mode to {mode}", () => config.Set(OsuSetting.SeasonalBackgroundMode, mode));
 
         private void createLoader()
-        {
-            AddStep("create loader", () =>
+            => AddStep("create loader", () =>
             {
                 if (backgroundLoader != null)
                     Remove(backgroundLoader);
 
-                LoadComponentAsync(backgroundLoader = new SeasonalBackgroundLoader(), Add);
+                Add(backgroundLoader = new SeasonalBackgroundLoader());
             });
 
-            AddUntilStep("wait for loaded", () => backgroundLoader.IsLoaded);
-        }
-
         private void loadNextBackground()
         {
             SeasonalBackground background = null;

From 6bfff436348cb48de3a2809d4b63b29fe8e0bce1 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 1 Nov 2020 13:25:36 +0100
Subject: [PATCH 05860/10326] Extract StatisticCounter to a separate class and
 use it instead.

---
 .../Expanded/Statistics/CounterStatistic.cs   | 20 +++------------
 .../Statistics/PerformanceStatistic.cs        | 16 +++++++++---
 .../Expanded/Statistics/StatisticCounter.cs   | 25 +++++++++++++++++++
 3 files changed, 41 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Statistics/StatisticCounter.cs

diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index 08a9714fd8..d37f6c5e5f 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -6,7 +6,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Ranking.Expanded.Accuracy;
 using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded.Statistics
@@ -19,7 +18,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         private readonly int count;
         private readonly int? maxCount;
 
-        protected RollingCounter<int> Counter { get; private set; }
+        private RollingCounter<int> counter;
 
         /// <summary>
         /// Creates a new <see cref="CounterStatistic"/>.
@@ -37,7 +36,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         public override void Appear()
         {
             base.Appear();
-            Counter.Current.Value = count;
+            counter.Current.Value = count;
         }
 
         protected override Drawable CreateContent()
@@ -46,7 +45,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             {
                 AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Horizontal,
-                Child = Counter = new StatisticCounter
+                Child = counter = new StatisticCounter
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre
@@ -67,18 +66,5 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
 
             return container;
         }
-
-        private class StatisticCounter : RollingCounter<int>
-        {
-            protected override double RollingDuration => AccuracyCircle.ACCURACY_TRANSFORM_DURATION;
-
-            protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING;
-
-            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
-            {
-                s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
-                s.Spacing = new Vector2(-2, 0);
-            });
-        }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index 1b4edb99d7..cd9d8005c6 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -5,11 +5,13 @@ using System;
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Ranking.Expanded.Statistics
 {
-    public class PerformanceStatistic : CounterStatistic
+    public class PerformanceStatistic : StatisticDisplay
     {
         private readonly ScoreInfo score;
 
@@ -17,8 +19,10 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
 
         private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
 
+        private RollingCounter<int> counter;
+
         public PerformanceStatistic(ScoreInfo score)
-            : base("PP", 0)
+            : base("PP")
         {
             this.score = score;
         }
@@ -46,7 +50,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         public override void Appear()
         {
             base.Appear();
-            Counter.Current.BindTo(performance);
+            counter.Current.BindTo(performance);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -54,5 +58,11 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             cancellationTokenSource?.Cancel();
             base.Dispose(isDisposing);
         }
+
+        protected override Drawable CreateContent() => counter = new StatisticCounter
+        {
+            Anchor = Anchor.TopCentre,
+            Origin = Anchor.TopCentre
+        };
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticCounter.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticCounter.cs
new file mode 100644
index 0000000000..bbcfc43dc8
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticCounter.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.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking.Expanded.Statistics
+{
+    public class StatisticCounter : RollingCounter<int>
+    {
+        protected override double RollingDuration => AccuracyCircle.ACCURACY_TRANSFORM_DURATION;
+
+        protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING;
+
+        protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
+        {
+            s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
+            s.Spacing = new Vector2(-2, 0);
+        });
+    }
+}

From 8a54fdd4e6427b079f8d1f45205270d1f487b007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 1 Nov 2020 14:25:33 +0100
Subject: [PATCH 05861/10326] Ensure LoadOszIntoOsu returns actual imported map

---
 osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 80fbda8e1d..b941313103 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -821,15 +821,13 @@ namespace osu.Game.Tests.Beatmaps.IO
 
             var manager = osu.Dependencies.Get<BeatmapManager>();
 
-            await manager.Import(temp);
-
-            var imported = manager.GetAllUsableBeatmapSets();
+            var importedSet = await manager.Import(temp);
 
             ensureLoaded(osu);
 
             waitForOrAssert(() => !File.Exists(temp), "Temporary file still exists after standard import", 5000);
 
-            return imported.LastOrDefault();
+            return manager.GetAllUsableBeatmapSets().Find(beatmapSet => beatmapSet.ID == importedSet.ID);
         }
 
         private void deleteBeatmapSet(BeatmapSetInfo imported, OsuGameBase osu)

From 5903c3be9066b6fd101abab48f4eebcb7421a50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 1 Nov 2020 14:39:10 +0100
Subject: [PATCH 05862/10326] Fix inaccurate xmldoc

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

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 481c94e6f3..cb170ad298 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Online.Spectator
         public event Action<int, SpectatorState> OnUserBeganPlaying;
 
         /// <summary>
-        /// Called whenever a user starts a play session.
+        /// Called whenever a user finishes a play session.
         /// </summary>
         public event Action<int, SpectatorState> OnUserFinishedPlaying;
 

From b7696c85ad5a42c7c35902579765c4c04c79bffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 1 Nov 2020 15:21:24 +0100
Subject: [PATCH 05863/10326] Add more xmldocs

---
 osu.Game/Rulesets/UI/IFrameStableClock.cs       | 3 +++
 osu.Game/Screens/Play/GameplayClockContainer.cs | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/osu.Game/Rulesets/UI/IFrameStableClock.cs b/osu.Game/Rulesets/UI/IFrameStableClock.cs
index c1d8733d26..569ef5e06c 100644
--- a/osu.Game/Rulesets/UI/IFrameStableClock.cs
+++ b/osu.Game/Rulesets/UI/IFrameStableClock.cs
@@ -10,6 +10,9 @@ namespace osu.Game.Rulesets.UI
     {
         IBindable<bool> IsCatchingUp { get; }
 
+        /// <summary>
+        /// Whether the frame stable clock is waiting on new frames to arrive to be able to progress time.
+        /// </summary>
         IBindable<bool> WaitingOnFrames { get; }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6154ec67b8..2c83161614 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -63,6 +63,14 @@ namespace osu.Game.Screens.Play
 
         private readonly FramedOffsetClock platformOffsetClock;
 
+        /// <summary>
+        /// Creates a new <see cref="GameplayClockContainer"/>.
+        /// </summary>
+        /// <param name="beatmap">The beatmap being played.</param>
+        /// <param name="gameplayStartTime">The suggested time to start gameplay at.</param>
+        /// <param name="startAtGameplayStart">
+        /// Whether <paramref name="gameplayStartTime"/> should be used regardless of when storyboard events and hitobjects are supposed to start.
+        /// </param>
         public GameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
         {
             this.beatmap = beatmap;

From 716458344fa374a7b83cbeb64b448d4dd046961d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 1 Nov 2020 16:03:28 +0100
Subject: [PATCH 05864/10326] Ensure spectator player is unsubscribed to
 prevent leak

---
 osu.Game/Screens/Play/SpectatorPlayer.cs | 26 ++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index fbd21b32ba..6c1e83f236 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -26,12 +26,6 @@ namespace osu.Game.Screens.Play
             spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
         }
 
-        private void userBeganPlaying(int userId, SpectatorState state)
-        {
-            if (userId == Score.ScoreInfo.UserID)
-                Schedule(this.Exit);
-        }
-
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
         {
             // if we already have frames, start gameplay at the point in time they exist, should they be too far into the beatmap.
@@ -42,5 +36,25 @@ namespace osu.Game.Screens.Play
 
             return new GameplayClockContainer(beatmap, firstFrameTime.Value, true);
         }
+
+        public override bool OnExiting(IScreen next)
+        {
+            spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
+            return base.OnExiting(next);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (spectatorStreaming != null)
+                spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
+        }
+
+        private void userBeganPlaying(int userId, SpectatorState state)
+        {
+            if (userId == Score.ScoreInfo.UserID)
+                Schedule(this.Exit);
+        }
     }
 }

From 6ff13e399ad66d7bf898630efafb8851e625c688 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 1 Nov 2020 17:14:13 +0000
Subject: [PATCH 05865/10326] Bump Microsoft.CodeAnalysis.FxCopAnalyzers from
 3.0.0 to 3.3.1

Bumps [Microsoft.CodeAnalysis.FxCopAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.0.0 to 3.3.1.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.0.0...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 2d3478f256..186b2049c6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,7 +18,7 @@
   <ItemGroup Label="Code Analysis">
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.0" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup Label="Code Analysis">
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis\osu.ruleset</CodeAnalysisRuleSet>

From 6e9ed76251ea86fbc6f216953d964ae0ccc61f62 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 1 Nov 2020 17:14:57 +0000
Subject: [PATCH 05866/10326] Bump Microsoft.Build.Traversal from 2.1.1 to
 2.2.3

Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.1.1 to 2.2.3.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.1.1...Microsoft.Build.Traversal.2.2.3)

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

diff --git a/global.json b/global.json
index a9a531f59c..10b61047ac 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,6 @@
     "version": "3.1.100"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "2.1.1"
+    "Microsoft.Build.Traversal": "2.2.3"
   }
 }
\ No newline at end of file

From 79e610d31b9017e9d13e82fd704a32fc72c5e768 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 1 Nov 2020 17:15:23 +0000
Subject: [PATCH 05867/10326] Bump Microsoft.CodeAnalysis.BannedApiAnalyzers
 from 3.3.0 to 3.3.1

Bumps [Microsoft.CodeAnalysis.BannedApiAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.3.0...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 2d3478f256..056216f14b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,7 +16,7 @@
     <EmbeddedResource Include="Resources\**\*.*" />
   </ItemGroup>
   <ItemGroup Label="Code Analysis">
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.1" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" PrivateAssets="All" />
   </ItemGroup>

From 2b0bea535efa58df11a2ac216742a2a8521e3e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 1 Nov 2020 18:47:40 +0100
Subject: [PATCH 05868/10326] Resolve CA1805 inspections

"Member is explicitly initialized to its default value"
---
 osu.Game/Database/DatabaseWriteUsage.cs               | 2 +-
 osu.Game/Graphics/Containers/OsuScrollContainer.cs    | 2 +-
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs | 2 +-
 osu.Game/Tests/Visual/PlayerTestScene.cs              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/DatabaseWriteUsage.cs b/osu.Game/Database/DatabaseWriteUsage.cs
index 1fd2f23d50..ddafd77066 100644
--- a/osu.Game/Database/DatabaseWriteUsage.cs
+++ b/osu.Game/Database/DatabaseWriteUsage.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Database
         /// Whether this write usage will commit a transaction on completion.
         /// If false, there is a parent usage responsible for transaction commit.
         /// </summary>
-        public bool IsTransactionLeader = false;
+        public bool IsTransactionLeader;
 
         protected void Dispose(bool disposing)
         {
diff --git a/osu.Game/Graphics/Containers/OsuScrollContainer.cs b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
index ed5c73bee6..b9122d254d 100644
--- a/osu.Game/Graphics/Containers/OsuScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Graphics.Containers
         /// 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.
         /// </summary>
-        public bool RightMouseScrollbar = false;
+        public bool RightMouseScrollbar;
 
         /// <summary>
         /// Controls the rate with which the target position is approached when performing a relative drag. Default is 0.02.
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index cf5c88b8fd..b671f4c68c 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Replays
         /// When set, we will ensure frames executed by nested drawables are frame-accurate to replay data.
         /// Disabling this can make replay playback smoother (useful for autoplay, currently).
         /// </summary>
-        public bool FrameAccuratePlayback = false;
+        public bool FrameAccuratePlayback;
 
         protected bool HasFrames => Frames.Count > 0;
 
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index aa3bd2e4b7..088e997de9 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual
         /// <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;
+        protected virtual bool HasCustomSteps => false;
 
         protected TestPlayer Player;
 

From ca5de22ca5d8047424958eab6975b17056917055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 1 Nov 2020 18:49:11 +0100
Subject: [PATCH 05869/10326] Resolve CA1834 inspection

"Use `StringBuilder.Append(char)` instead of
`StringBuilder.Append(string)` when the input is a constant unit string"
---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 80a4d6dea4..80fd6c22bb 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -417,7 +417,7 @@ namespace osu.Game.Beatmaps.Formats
                 string sampleFilename = samples.FirstOrDefault(s => string.IsNullOrEmpty(s.Name))?.LookupNames.First() ?? string.Empty;
                 int volume = samples.FirstOrDefault()?.Volume ?? 100;
 
-                sb.Append(":");
+                sb.Append(':');
                 sb.Append(FormattableString.Invariant($"{customSampleBank}:"));
                 sb.Append(FormattableString.Invariant($"{volume}:"));
                 sb.Append(FormattableString.Invariant($"{sampleFilename}"));

From 89bf7b1bd669d83e57b6f299b0489e8cd950b1ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 1 Nov 2020 18:51:39 +0100
Subject: [PATCH 05870/10326] Resolve CA1835 inspection

"Change the `ReadAsync` method call to use the
`Stream.ReadAsync(Memory<byte>, CancellationToken)` overload"
---
 osu.Game/IO/Archives/ArchiveReader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/IO/Archives/ArchiveReader.cs b/osu.Game/IO/Archives/ArchiveReader.cs
index a30f961daf..f74574e60c 100644
--- a/osu.Game/IO/Archives/ArchiveReader.cs
+++ b/osu.Game/IO/Archives/ArchiveReader.cs
@@ -41,7 +41,7 @@ namespace osu.Game.IO.Archives
                     return null;
 
                 byte[] buffer = new byte[input.Length];
-                await input.ReadAsync(buffer, 0, buffer.Length);
+                await input.ReadAsync(buffer);
                 return buffer;
             }
         }

From 3090b6ccb5eed7b77868cf508b2cf48832f6d0ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 1 Nov 2020 18:54:44 +0100
Subject: [PATCH 05871/10326] Resolve CA2249 inspections

"Use `string.Contains` instead of `string.IndexOf` to improve
readability"
---
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs       | 2 +-
 osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs | 2 +-
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs        | 2 +-
 osu.Game/Screens/Select/FilterCriteria.cs                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index e2550d1ca4..8d8ca523d5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -347,7 +347,7 @@ namespace osu.Game.Beatmaps.Formats
         /// <param name="line">The line which may contains variables.</param>
         private void decodeVariables(ref string line)
         {
-            while (line.IndexOf('$') >= 0)
+            while (line.Contains('$'))
             {
                 string origLine = line;
 
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index 60c6aa1d8a..c7c37cbc0d 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                     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);
+                        matchingFilter &= r.FilterTerms.Any(term => term.Contains(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase));
 
                     r.MatchingFilter = matchingFilter;
                 }
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index dce4028f17..1aab50037a 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Select.Carousel
                 var terms = Beatmap.SearchableTerms;
 
                 foreach (var criteriaTerm in criteria.SearchTerms)
-                    match &= terms.Any(term => term.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0);
+                    match &= terms.Any(term => term.Contains(criteriaTerm, StringComparison.InvariantCultureIgnoreCase));
 
                 // if a match wasn't found via text matching of terms, do a second catch-all check matching against online IDs.
                 // this should be done after text matching so we can prioritise matching numbers in metadata.
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index f34f8f6505..7bddb3e51b 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Screens.Select
                 if (string.IsNullOrEmpty(value))
                     return false;
 
-                return value.IndexOf(SearchTerm, StringComparison.InvariantCultureIgnoreCase) >= 0;
+                return value.Contains(SearchTerm, StringComparison.InvariantCultureIgnoreCase);
             }
 
             public string SearchTerm;

From 164370bc7da7ed6dfe08507eec0fbafc32cffd0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 1 Nov 2020 20:51:23 +0100
Subject: [PATCH 05872/10326] Resolve more CA1805 inspections

---
 osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs                 | 7 +++++--
 osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs  | 4 ++--
 .../Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs    | 2 +-
 .../Visual/SongSelect/TestSceneBeatmapInfoWedge.cs         | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
index 937473e824..6841ecd23c 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
@@ -64,8 +64,8 @@ namespace osu.Game.Rulesets.Osu.Mods
             /// </summary>
             private const float target_clamp = 1;
 
-            private readonly float targetBreakMultiplier = 0;
-            private readonly float easing = 1;
+            private readonly float targetBreakMultiplier;
+            private readonly float easing;
 
             private readonly CompositeDrawable restrictTo;
 
@@ -86,6 +86,9 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 this.restrictTo = restrictTo;
                 this.beatmap = beatmap;
+
+                targetBreakMultiplier = 0;
+                easing = 1;
             }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index 58cc324233..de46f9d1cf 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -81,8 +81,8 @@ namespace osu.Game.Tests.Gameplay
 
         private class TestHitObjectWithCombo : ConvertHitObject, IHasComboInformation
         {
-            public bool NewCombo { get; set; } = false;
-            public int ComboOffset { get; } = 0;
+            public bool NewCombo { get; set; }
+            public int ComboOffset => 0;
 
             public Bindable<int> IndexInCurrentComboBindable { get; } = new Bindable<int>();
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index fdc20dc477..07ff56b5c3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
 
-            public IBindableList<Room> Rooms { get; } = null;
+            public IBindableList<Room> Rooms => null;
 
             public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index e02ebf3be1..0b2c0ce63b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -197,8 +197,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestHitObject : ConvertHitObject, IHasPosition
         {
-            public float X { get; } = 0;
-            public float Y { get; } = 0;
+            public float X => 0;
+            public float Y => 0;
             public Vector2 Position { get; } = Vector2.Zero;
         }
     }

From 432282e8de8fb62a50fd2fef4de3f77047889e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 1 Nov 2020 21:22:04 +0100
Subject: [PATCH 05873/10326] Use alternative solution to avoid storing last
 zoom

---
 .../Timeline/TimelineBlueprintContainer.cs    | 58 +++++++++++--------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 008da14a21..10913a8bb9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -9,10 +9,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             OnDragHandled = handleScrollViaDrag
         };
 
-        protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect, this);
+        protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect);
 
         private void handleScrollViaDrag(DragEvent e)
         {
@@ -137,17 +137,18 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private class TimelineDragBox : DragBox
         {
-            private Vector2 lastMouseDown;
+            // the following values hold the start and end X positions of the drag box in the timeline's local space,
+            // but with zoom unapplied in order to be able to compensate for positional changes
+            // while the timeline is being zoomed in/out.
+            private float? selectionStart;
+            private float selectionEnd;
 
-            private float? lastZoom;
-            private float localMouseDown;
+            [Resolved]
+            private Timeline timeline { get; set; }
 
-            private readonly TimelineBlueprintContainer parent;
-
-            public TimelineDragBox(Action<RectangleF> performSelect, TimelineBlueprintContainer parent)
+            public TimelineDragBox(Action<RectangleF> performSelect)
                 : base(performSelect)
             {
-                this.parent = parent;
             }
 
             protected override Drawable CreateBox() => new Box
@@ -158,27 +159,34 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             public override bool HandleDrag(MouseButtonEvent e)
             {
-                // store the original position of the mouse down, as we may be scrolled during selection.
-                if (lastMouseDown != e.ScreenSpaceMouseDownPosition)
-                {
-                    lastMouseDown = e.ScreenSpaceMouseDownPosition;
-                    localMouseDown = e.MouseDownPosition.X;
-                    lastZoom = null;
-                }
+                selectionStart ??= e.MouseDownPosition.X / timeline.CurrentZoom;
 
-                //Zooming the timeline shifts the coordinate system. zoomCorrection compensates for that
-                float zoomCorrection = lastZoom.HasValue ? (parent.timeline.CurrentZoom / lastZoom.Value) : 1;
-                localMouseDown *= zoomCorrection;
-                lastZoom = parent.timeline.CurrentZoom;
+                // only calculate end when a transition is not in progress to avoid bouncing.
+                if (Precision.AlmostEquals(timeline.CurrentZoom, timeline.Zoom))
+                    selectionEnd = e.MousePosition.X / timeline.CurrentZoom;
 
-                float selection1 = localMouseDown;
-                float selection2 = e.MousePosition.X * zoomCorrection;
+                updateDragBoxPosition();
+                return true;
+            }
 
-                Box.X = Math.Min(selection1, selection2);
-                Box.Width = Math.Abs(selection1 - selection2);
+            private void updateDragBoxPosition()
+            {
+                if (selectionStart == null)
+                    return;
+
+                float rescaledStart = selectionStart.Value * timeline.CurrentZoom;
+                float rescaledEnd = selectionEnd * timeline.CurrentZoom;
+
+                Box.X = Math.Min(rescaledStart, rescaledEnd);
+                Box.Width = Math.Abs(rescaledStart - rescaledEnd);
 
                 PerformSelection?.Invoke(Box.ScreenSpaceDrawQuad.AABBFloat);
-                return true;
+            }
+
+            public override void Hide()
+            {
+                base.Hide();
+                selectionStart = null;
             }
         }
 

From 71d55f16f3853f3e9f3cc56bb4cf981d957e9840 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 1 Nov 2020 13:50:38 -0800
Subject: [PATCH 05874/10326] Fix edit beatmap options button not resuming back
 to song select

---
 osu.Game/Screens/Select/PlaySongSelect.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 19769f487d..ee8825640c 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -32,11 +32,7 @@ namespace osu.Game.Screens.Select
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            BeatmapOptions.AddButton(@"Edit", @"beatmap", FontAwesome.Solid.PencilAlt, colours.Yellow, () =>
-            {
-                ValidForResume = false;
-                Edit();
-            });
+            BeatmapOptions.AddButton(@"Edit", @"beatmap", FontAwesome.Solid.PencilAlt, colours.Yellow, () => Edit());
 
             ((PlayBeatmapDetailArea)BeatmapDetails).Leaderboard.ScoreSelected += PresentScore;
         }

From bfa6ae1b66eb38c9c77f4f163c3cb0c3b82a98d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 14:24:17 +0900
Subject: [PATCH 05875/10326] Fix taiko drum not correct handling sample /
 group point changes

Closes https://github.com/ppy/osu/issues/10642
---
 .../Audio/DrumSampleContainer.cs              | 79 ++++++++++++++-----
 1 file changed, 58 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs b/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
index fcf7c529f5..fd6eca3850 100644
--- a/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
@@ -2,6 +2,9 @@
 // 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.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
@@ -18,9 +21,24 @@ namespace osu.Game.Rulesets.Taiko.Audio
         private readonly ControlPointInfo controlPoints;
         private readonly Dictionary<double, DrumSample> mappings = new Dictionary<double, DrumSample>();
 
+        private IBindableList<ControlPointGroup> groups;
+
         public DrumSampleContainer(ControlPointInfo controlPoints)
         {
             this.controlPoints = controlPoints;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            groups = controlPoints.Groups.GetBoundCopy();
+            groups.BindCollectionChanged((_, __) => recreateMappings(), true);
+        }
+
+        private void recreateMappings()
+        {
+            mappings.Clear();
+            ClearInternal();
 
             IReadOnlyList<SampleControlPoint> samplePoints = controlPoints.SamplePoints.Count == 0 ? new[] { controlPoints.SamplePointAt(double.MinValue) } : controlPoints.SamplePoints;
 
@@ -28,37 +46,56 @@ namespace osu.Game.Rulesets.Taiko.Audio
             {
                 var samplePoint = samplePoints[i];
 
-                var centre = samplePoint.GetSampleInfo();
-                var rim = samplePoint.GetSampleInfo(HitSampleInfo.HIT_CLAP);
-
                 var lifetimeStart = i > 0 ? samplePoint.Time : double.MinValue;
                 var lifetimeEnd = i + 1 < samplePoints.Count ? samplePoints[i + 1].Time : double.MaxValue;
 
-                mappings[samplePoint.Time] = new DrumSample
+                AddInternal(mappings[samplePoint.Time] = new DrumSample(samplePoint)
                 {
-                    Centre = addSound(centre, lifetimeStart, lifetimeEnd),
-                    Rim = addSound(rim, lifetimeStart, lifetimeEnd)
-                };
+                    LifetimeStart = lifetimeStart,
+                    LifetimeEnd = lifetimeEnd
+                });
             }
         }
 
-        private PausableSkinnableSound addSound(HitSampleInfo hitSampleInfo, double lifetimeStart, double lifetimeEnd)
-        {
-            var drawable = new PausableSkinnableSound(hitSampleInfo)
-            {
-                LifetimeStart = lifetimeStart,
-                LifetimeEnd = lifetimeEnd
-            };
-            AddInternal(drawable);
-            return drawable;
-        }
-
         public DrumSample SampleAt(double time) => mappings[controlPoints.SamplePointAt(time).Time];
 
-        public class DrumSample
+        public class DrumSample : CompositeDrawable
         {
-            public PausableSkinnableSound Centre;
-            public PausableSkinnableSound Rim;
+            public override bool RemoveWhenNotAlive => false;
+
+            public PausableSkinnableSound Centre { get; private set; }
+            public PausableSkinnableSound Rim { get; private set; }
+
+            private readonly SampleControlPoint samplePoint;
+
+            private Bindable<string> sampleBank;
+            private BindableNumber<int> sampleVolume;
+
+            public DrumSample(SampleControlPoint samplePoint)
+            {
+                this.samplePoint = samplePoint;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                sampleBank = samplePoint.SampleBankBindable.GetBoundCopy();
+                sampleBank.BindValueChanged(_ => recreate());
+
+                sampleVolume = samplePoint.SampleVolumeBindable.GetBoundCopy();
+                sampleVolume.BindValueChanged(_ => recreate());
+
+                recreate();
+            }
+
+            private void recreate()
+            {
+                InternalChildren = new Drawable[]
+                {
+                    Centre = new PausableSkinnableSound(samplePoint.GetSampleInfo()),
+                    Rim = new PausableSkinnableSound(samplePoint.GetSampleInfo(HitSampleInfo.HIT_CLAP))
+                };
+            }
         }
     }
 }

From 3adf451e8277a8862e2221cda8000acc37938b8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 14:39:01 +0900
Subject: [PATCH 05876/10326] Handle changes via SamplePoints list for
 simplicity

---
 .../Audio/DrumSampleContainer.cs                | 17 ++++++++++-------
 .../Beatmaps/ControlPoints/ControlPointInfo.cs  |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs b/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
index fd6eca3850..4a3dc58604 100644
--- a/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
@@ -2,6 +2,7 @@
 // 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.Bindables;
 using osu.Framework.Graphics;
@@ -21,7 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Audio
         private readonly ControlPointInfo controlPoints;
         private readonly Dictionary<double, DrumSample> mappings = new Dictionary<double, DrumSample>();
 
-        private IBindableList<ControlPointGroup> groups;
+        private IBindableList<SampleControlPoint> samplePoints;
 
         public DrumSampleContainer(ControlPointInfo controlPoints)
         {
@@ -31,8 +32,8 @@ namespace osu.Game.Rulesets.Taiko.Audio
         [BackgroundDependencyLoader]
         private void load()
         {
-            groups = controlPoints.Groups.GetBoundCopy();
-            groups.BindCollectionChanged((_, __) => recreateMappings(), true);
+            samplePoints = controlPoints.SamplePoints.GetBoundCopy();
+            samplePoints.BindCollectionChanged((_, __) => recreateMappings(), true);
         }
 
         private void recreateMappings()
@@ -40,14 +41,16 @@ namespace osu.Game.Rulesets.Taiko.Audio
             mappings.Clear();
             ClearInternal();
 
-            IReadOnlyList<SampleControlPoint> samplePoints = controlPoints.SamplePoints.Count == 0 ? new[] { controlPoints.SamplePointAt(double.MinValue) } : controlPoints.SamplePoints;
+            SampleControlPoint[] points = samplePoints.Count == 0
+                ? new[] { controlPoints.SamplePointAt(double.MinValue) }
+                : samplePoints.ToArray();
 
-            for (int i = 0; i < samplePoints.Count; i++)
+            for (int i = 0; i < points.Length; i++)
             {
-                var samplePoint = samplePoints[i];
+                var samplePoint = points[i];
 
                 var lifetimeStart = i > 0 ? samplePoint.Time : double.MinValue;
-                var lifetimeEnd = i + 1 < samplePoints.Count ? samplePoints[i + 1].Time : double.MaxValue;
+                var lifetimeEnd = i + 1 < points.Length ? points[i + 1].Time : double.MaxValue;
 
                 AddInternal(mappings[samplePoint.Time] = new DrumSample(samplePoint)
                 {
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 22314f28c7..b843aad950 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -41,9 +41,9 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// All sound points.
         /// </summary>
         [JsonProperty]
-        public IReadOnlyList<SampleControlPoint> SamplePoints => samplePoints;
+        public IBindableList<SampleControlPoint> SamplePoints => samplePoints;
 
-        private readonly SortedList<SampleControlPoint> samplePoints = new SortedList<SampleControlPoint>(Comparer<SampleControlPoint>.Default);
+        private readonly BindableList<SampleControlPoint> samplePoints = new BindableList<SampleControlPoint>();
 
         /// <summary>
         /// All effect points.

From fb105a1e9c23de90db8c9f5783c79bf4c821b4ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 14:49:25 +0900
Subject: [PATCH 05877/10326] Remove unnecessary field storage

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 4db057dccc..4bc54e7e83 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -59,8 +59,6 @@ namespace osu.Game
 
         protected ScoreManager ScoreManager;
 
-        protected ScorePerformanceManager ScorePerformanceManager;
-
         protected BeatmapDifficultyManager DifficultyManager;
 
         protected SkinManager SkinManager;
@@ -231,8 +229,9 @@ namespace osu.Game
             dependencies.Cache(DifficultyManager = new BeatmapDifficultyManager());
             AddInternal(DifficultyManager);
 
-            dependencies.Cache(ScorePerformanceManager = new ScorePerformanceManager());
-            AddInternal(ScorePerformanceManager);
+            var scorePerformanceManager = new ScorePerformanceManager();
+            dependencies.Cache(scorePerformanceManager);
+            AddInternal(scorePerformanceManager);
 
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));

From d46f7535c949fdd097e66f09860d2a6618770ed9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 14:50:44 +0900
Subject: [PATCH 05878/10326] Add xmldoc for new component

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

diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index 746aa67a55..b63443180f 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -12,6 +12,9 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Scoring
 {
+    /// <summary>
+    /// A global component which calculates and caches results of performance calculations for locally databased scores.
+    /// </summary>
     public class ScorePerformanceManager : Component
     {
         private readonly ConcurrentDictionary<PerformanceCacheLookup, double> performanceCache = new ConcurrentDictionary<PerformanceCacheLookup, double>();

From 7b320a991fd45b24d469ceb904e5c7269abfdfdd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 14:51:19 +0900
Subject: [PATCH 05879/10326] Add note about missing expiration logic

---
 osu.Game/Scoring/ScorePerformanceManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index b63443180f..ddda1b99af 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Scoring
     /// </summary>
     public class ScorePerformanceManager : Component
     {
+        // this cache will grow indefinitely per session and should be considered temporary.
+        // this whole component should likely be replaced with database persistence.
         private readonly ConcurrentDictionary<PerformanceCacheLookup, double> performanceCache = new ConcurrentDictionary<PerformanceCacheLookup, double>();
 
         [Resolved]

From d2f6303988b24991d7b88d7cfe3613df185040da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 14:56:50 +0900
Subject: [PATCH 05880/10326] Change default value of requestedByUser to false

---
 osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs | 2 +-
 osu.Game/Overlays/MusicController.cs                          | 4 ++--
 osu.Game/Screens/Play/Player.cs                               | 2 +-
 osu.Game/Tests/Visual/OsuTestScene.cs                         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index c96952431a..5963f806c6 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
 
             if (withUserPause)
-                AddStep("pause", () => Game.Dependencies.Get<MusicController>().Stop());
+                AddStep("pause", () => Game.Dependencies.Get<MusicController>().Stop(true));
 
             AddStep("press enter", () => pressAndRelease(Key.Enter));
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 7e7be31de6..eafbeebbc9 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -187,7 +187,7 @@ namespace osu.Game.Overlays
         /// Specifying <c>true</c> will ensure that other methods like <see cref="EnsurePlayingSomething"/>
         /// will not resume music playback until the next explicit call to <see cref="Play"/>.
         /// </param>
-        public void Stop(bool requestedByUser = true)
+        public void Stop(bool requestedByUser = false)
         {
             IsUserPaused |= requestedByUser;
             if (CurrentTrack.IsRunning)
@@ -201,7 +201,7 @@ namespace osu.Game.Overlays
         public bool TogglePause()
         {
             if (CurrentTrack.IsRunning)
-                Stop();
+                Stop(true);
             else
                 Play();
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4427bb02e2..3c0c643413 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -472,7 +472,7 @@ namespace osu.Game.Screens.Play
         {
             // at the point of restarting the track should either already be paused or the volume should be zero.
             // stopping here is to ensure music doesn't become audible after exiting back to PlayerLoader.
-            musicController.Stop(false);
+            musicController.Stop();
 
             sampleRestart?.Play();
             RestartRequested?.Invoke();
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 1c9bdd43ab..198d22fedd 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Tests.Visual
             rulesetDependencies?.Dispose();
 
             if (MusicController?.TrackLoaded == true)
-                MusicController.Stop(false);
+                MusicController.Stop();
 
             if (contextFactory?.IsValueCreated == true)
                 contextFactory.Value.ResetDatabase();

From 8f2cd0e8c55178b75315c912d1c4eeb25e1d5f08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 15:01:30 +0900
Subject: [PATCH 05881/10326] Add matching requestedByUser parameter to Play
 method

---
 osu.Game/Overlays/MusicController.cs  | 13 ++++++++++---
 osu.Game/Screens/Select/SongSelect.cs |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index eafbeebbc9..d78f387b30 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -166,10 +166,17 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Start playing the current track (if not already playing).
         /// </summary>
+        /// <param name="restart">Whether to restart the track from the beginning.</param>
+        /// <param name="requestedByUser">
+        /// Whether the request to play was issued by the user rather than internally.
+        /// Specifying <c>true</c> will ensure that other methods like <see cref="EnsurePlayingSomething"/>
+        /// will resume music playback going forward.
+        /// </param>
         /// <returns>Whether the operation was successful.</returns>
-        public bool Play(bool restart = false)
+        public bool Play(bool restart = false, bool requestedByUser = false)
         {
-            IsUserPaused = false;
+            if (requestedByUser)
+                IsUserPaused = false;
 
             if (restart)
                 CurrentTrack.Restart();
@@ -203,7 +210,7 @@ namespace osu.Game.Overlays
             if (CurrentTrack.IsRunning)
                 Stop(true);
             else
-                Play();
+                Play(requestedByUser: true);
 
             return true;
         }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a85e1869be..0473efd404 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -579,7 +579,8 @@ namespace osu.Game.Screens.Select
                 updateComponentFromBeatmap(Beatmap.Value);
 
                 // restart playback on returning to song select, regardless.
-                music.Play();
+                // not sure this should be a permanent thing (we may want to leave a user pause paused even on returning)
+                music.Play(requestedByUser: true);
             }
 
             this.FadeIn(250);

From c9b96a18294b0143a38407951b15072a7cd8f9ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 15:52:57 +0900
Subject: [PATCH 05882/10326] Disable spectator streaming connection logic on
 iOS to avoid startup crash

Due to an [issue](https://github.com/dotnet/runtime/issues/35988) at
xamarin's end (which *should* have been fixed via [this
pr](https://github.com/xamarin/xamarin-macios/pull/8615) but still fails
on latest preview release) we can't support this just yet.
---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index cb170ad298..125831035a 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -10,6 +10,7 @@ using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -101,6 +102,10 @@ namespace osu.Game.Online.Spectator
 
         private async Task connect()
         {
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
+                // disabled for now (see https://github.com/dotnet/runtime/issues/35988)
+                return;
+
             if (connection != null)
                 return;
 

From 6f623d8cca409cc8f2f06e6c1819706bf1e33fe9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Nov 2020 16:08:59 +0900
Subject: [PATCH 05883/10326] Rename IsUserPaused -> UserPauseRequested

---
 .../Visual/Menus/TestSceneMusicActionHandling.cs      |  4 ++--
 osu.Game/Overlays/MusicController.cs                  | 11 +++++++----
 osu.Game/Screens/Select/SongSelect.cs                 |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
index 4cad2b19d5..b34e027e9c 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
@@ -22,9 +22,9 @@ namespace osu.Game.Tests.Visual.Menus
         {
             AddStep("ensure playing something", () => Game.MusicController.EnsurePlayingSomething());
             AddStep("toggle playback", () => globalActionContainer.TriggerPressed(GlobalAction.MusicPlay));
-            AddAssert("music paused", () => !Game.MusicController.IsPlaying && Game.MusicController.IsUserPaused);
+            AddAssert("music paused", () => !Game.MusicController.IsPlaying && Game.MusicController.UserPauseRequested);
             AddStep("toggle playback", () => globalActionContainer.TriggerPressed(GlobalAction.MusicPlay));
-            AddAssert("music resumed", () => Game.MusicController.IsPlaying && !Game.MusicController.IsUserPaused);
+            AddAssert("music resumed", () => Game.MusicController.IsPlaying && !Game.MusicController.UserPauseRequested);
         }
 
         [Test]
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index d78f387b30..3a9a6261ba 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -45,7 +45,10 @@ namespace osu.Game.Overlays
 
         private readonly BindableList<BeatmapSetInfo> beatmapSets = new BindableList<BeatmapSetInfo>();
 
-        public bool IsUserPaused { get; private set; }
+        /// <summary>
+        /// Whether the user has requested the track to be paused. Use <see cref="IsPlaying"/> to determine whether the track is still playing.
+        /// </summary>
+        public bool UserPauseRequested { get; private set; }
 
         /// <summary>
         /// Fired when the global <see cref="WorkingBeatmap"/> has changed.
@@ -148,7 +151,7 @@ namespace osu.Game.Overlays
         /// </summary>
         public void EnsurePlayingSomething()
         {
-            if (IsUserPaused) return;
+            if (UserPauseRequested) return;
 
             if (CurrentTrack.IsDummyDevice || beatmap.Value.BeatmapSetInfo.DeletePending)
             {
@@ -176,7 +179,7 @@ namespace osu.Game.Overlays
         public bool Play(bool restart = false, bool requestedByUser = false)
         {
             if (requestedByUser)
-                IsUserPaused = false;
+                UserPauseRequested = false;
 
             if (restart)
                 CurrentTrack.Restart();
@@ -196,7 +199,7 @@ namespace osu.Game.Overlays
         /// </param>
         public void Stop(bool requestedByUser = false)
         {
-            IsUserPaused |= requestedByUser;
+            UserPauseRequested |= requestedByUser;
             if (CurrentTrack.IsRunning)
                 CurrentTrack.Stop();
         }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 0473efd404..def620462f 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -682,7 +682,7 @@ namespace osu.Game.Screens.Select
 
             track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
 
-            if (!track.IsRunning && (music.IsUserPaused != true || isNewTrack))
+            if (!track.IsRunning && (music.UserPauseRequested != true || isNewTrack))
                 music.Play(true);
 
             lastTrack.SetTarget(track);

From 4e17634ee27ab7dfc33753c1750d8f91e6e2b206 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 17:31:04 +0900
Subject: [PATCH 05884/10326] Add (temporary) local user cache to avoid
 re-querying API each display

---
 .../Dashboard/CurrentlyPlayingDisplay.cs      | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index d71e582c05..b461da4476 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.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 System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -43,6 +44,9 @@ namespace osu.Game.Overlays.Dashboard
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        // temporary, should be game-global but i don't want to add more manager classes for now.
+        private static readonly Dictionary<int, User> user_cache = new Dictionary<int, User>();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -53,15 +57,24 @@ namespace osu.Game.Overlays.Dashboard
                 switch (e.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
-                        foreach (var u in e.NewItems.OfType<int>())
+                        foreach (int userId in e.NewItems.OfType<int>())
                         {
-                            var request = new GetUserRequest(u);
-                            request.Success += user => Schedule(() =>
+                            if (user_cache.TryGetValue(userId, out var user))
                             {
-                                if (playingUsers.Contains((int)user.Id))
-                                    userFlow.Add(createUserPanel(user));
-                            });
+                                addUser(user);
+                                continue;
+                            }
+
+                            var request = new GetUserRequest(userId);
+                            request.Success += u => Schedule(() => addUser(u));
                             api.Queue(request);
+
+                            void addUser(User u)
+                            {
+                                user_cache[userId] = u;
+                                if (playingUsers.Contains(userId))
+                                    userFlow.Add(createUserPanel(u));
+                            }
                         }
 
                         break;

From a89aeaf1cedff164f21eb07d78e0095edc417377 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 17:32:10 +0900
Subject: [PATCH 05885/10326] Add very basic connection status logging for
 spectator streaming client

---
 .../Online/Spectator/SpectatorStreamingClient.cs    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index cb170ad298..2367651e04 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -13,6 +13,7 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Replays.Legacy;
@@ -122,19 +123,26 @@ namespace osu.Game.Online.Spectator
                 isConnected = false;
                 playingUsers.Clear();
 
-                if (ex != null) await tryUntilConnected();
+                if (ex != null)
+                {
+                    Logger.Log($"Spectator client lost connection: {ex}", LoggingTarget.Network);
+                    await tryUntilConnected();
+                }
             };
 
             await tryUntilConnected();
 
             async Task tryUntilConnected()
             {
+                Logger.Log("Spectator client connecting...", LoggingTarget.Network);
+
                 while (api.State.Value == APIState.Online)
                 {
                     try
                     {
                         // reconnect on any failure
                         await connection.StartAsync();
+                        Logger.Log("Spectator client connected!", LoggingTarget.Network);
 
                         // success
                         isConnected = true;
@@ -151,8 +159,9 @@ namespace osu.Game.Online.Spectator
 
                         break;
                     }
-                    catch
+                    catch (Exception e)
                     {
+                        Logger.Log($"Spectator client connection error: {e}", LoggingTarget.Network);
                         await Task.Delay(5000);
                     }
                 }

From 5cbfaf3589413c5be4292f97dd91c78b13059534 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 20:19:38 +0900
Subject: [PATCH 05886/10326] Revert "Add (temporary) local user cache to avoid
 re-querying API each display"

This reverts commit 4e17634ee27ab7dfc33753c1750d8f91e6e2b206.
---
 .../Dashboard/CurrentlyPlayingDisplay.cs      | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index b461da4476..d71e582c05 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.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.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -44,9 +43,6 @@ namespace osu.Game.Overlays.Dashboard
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        // temporary, should be game-global but i don't want to add more manager classes for now.
-        private static readonly Dictionary<int, User> user_cache = new Dictionary<int, User>();
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -57,24 +53,15 @@ namespace osu.Game.Overlays.Dashboard
                 switch (e.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
-                        foreach (int userId in e.NewItems.OfType<int>())
+                        foreach (var u in e.NewItems.OfType<int>())
                         {
-                            if (user_cache.TryGetValue(userId, out var user))
+                            var request = new GetUserRequest(u);
+                            request.Success += user => Schedule(() =>
                             {
-                                addUser(user);
-                                continue;
-                            }
-
-                            var request = new GetUserRequest(userId);
-                            request.Success += u => Schedule(() => addUser(u));
+                                if (playingUsers.Contains((int)user.Id))
+                                    userFlow.Add(createUserPanel(user));
+                            });
                             api.Queue(request);
-
-                            void addUser(User u)
-                            {
-                                user_cache[userId] = u;
-                                if (playingUsers.Contains(userId))
-                                    userFlow.Add(createUserPanel(u));
-                            }
                         }
 
                         break;

From c6de0544d2920440ae7aa2cc9b4f5cfed8f23c11 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 20:21:23 +0900
Subject: [PATCH 05887/10326] Disable display for not

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

diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 04defce636..787a4985d7 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -131,7 +131,8 @@ namespace osu.Game.Overlays
                     break;
 
                 case DashboardOverlayTabs.CurrentlyPlaying:
-                    loadDisplay(new CurrentlyPlayingDisplay());
+                    //todo: enable once caching logic is better
+                    //loadDisplay(new CurrentlyPlayingDisplay());
                     break;
 
                 default:

From ed30756c199989f8547dd3d9350581e417ab66ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 20:41:14 +0900
Subject: [PATCH 05888/10326] Add test coverage for new display (and remove
 live version for now)

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  9 +++
 .../TestSceneCurrentlyPlayingDisplay.cs       | 64 +++++++++++++++++++
 .../Spectator/SpectatorStreamingClient.cs     |  4 +-
 .../Dashboard/CurrentlyPlayingDisplay.cs      |  4 +-
 4 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index a4df450db9..558778c918 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -3,8 +3,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
@@ -231,8 +233,15 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public readonly User StreamingUser = new User { Id = 1234, Username = "Test user" };
 
+            public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
+
             private int beatmapId;
 
+            protected override Task Connect()
+            {
+                return Task.CompletedTask;
+            }
+
             public void StartPlay(int beatmapId)
             {
                 this.beatmapId = beatmapId;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
new file mode 100644
index 0000000000..137d0c20a3
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -0,0 +1,64 @@
+// Copyright (c) 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.Testing;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Spectator;
+using osu.Game.Overlays.Dashboard;
+using osu.Game.Tests.Visual.Gameplay;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneCurrentlyPlayingDisplay : OsuTestScene
+    {
+        [Cached(typeof(SpectatorStreamingClient))]
+        private TestSceneSpectator.TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSceneSpectator.TestSpectatorStreamingClient();
+
+        private CurrentlyPlayingDisplay currentlyPlaying;
+
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("register request handling", () => ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case GetUserRequest cRequest:
+                        cRequest.TriggerSuccess(new User { Username = "peppy", Id = 2 });
+                        break;
+                }
+            });
+
+            AddStep("add streaming client", () =>
+            {
+                Remove(testSpectatorStreamingClient);
+
+                Children = new Drawable[]
+                {
+                    testSpectatorStreamingClient,
+                    currentlyPlaying = new CurrentlyPlayingDisplay
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    }
+                };
+            });
+        }
+
+        [Test]
+        public void TestBasicDisplay()
+        {
+            AddStep("Add playing user", () => testSpectatorStreamingClient.PlayingUsers.Add(2));
+            AddUntilStep("Panel loaded", () => currentlyPlaying.ChildrenOfType<UserGridPanel>()?.FirstOrDefault()?.User.Id == 2);
+            AddStep("Remove playing user", () => testSpectatorStreamingClient.PlayingUsers.Remove(2));
+            AddUntilStep("Panel no longer present", () => !currentlyPlaying.ChildrenOfType<UserGridPanel>().Any());
+        }
+    }
+}
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index cb170ad298..c07c00f3ba 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -92,14 +92,14 @@ namespace osu.Game.Online.Spectator
                     break;
 
                 case APIState.Online:
-                    Task.Run(connect);
+                    Task.Run(Connect);
                     break;
             }
         }
 
         private const string endpoint = "https://spectator.ppy.sh/spectator";
 
-        private async Task connect()
+        protected virtual async Task Connect()
         {
             if (connection != null)
                 return;
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index d71e582c05..cb88065ec6 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Dashboard
             }), true);
         }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
 
         private UserPanel createUserPanel(User user)
@@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Dashboard
                 panel.Origin = Anchor.TopCentre;
                 panel.Width = 290;
                 panel.ShowProfileOnClick = false;
-                panel.Action = () => game.PerformFromScreen(s => s.Push(new Spectator(user)));
+                panel.Action = () => game?.PerformFromScreen(s => s.Push(new Spectator(user)));
             });
         }
     }

From 3956a0669a1cbf6574f6d45bba66c85a03a4b763 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Nov 2020 21:08:58 +0900
Subject: [PATCH 05889/10326] Fix editor seek transform seeking too much

---
 osu.Game/Screens/Edit/EditorClock.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 949636f695..148eef6c93 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -266,8 +266,15 @@ namespace osu.Game.Screens.Edit
         {
             public override string TargetMember => nameof(currentTime);
 
-            protected override void Apply(EditorClock clock, double time) =>
-                clock.currentTime = Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
+            protected override void Apply(EditorClock clock, double time) => clock.currentTime = valueAt(time);
+
+            private double valueAt(double time)
+            {
+                if (time < StartTime) return StartValue;
+                if (time >= EndTime) return EndValue;
+
+                return Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
+            }
 
             protected override void ReadIntoStartValue(EditorClock clock) => StartValue = clock.currentTime;
         }

From c1d9a0c92c1c33a229a4df1a28865b2396a3412d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 21:09:47 +0900
Subject: [PATCH 05890/10326] Move click action out of user panel

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  2 +-
 .../Dashboard/CurrentlyPlayingDisplay.cs      | 57 +++++++++++++++----
 osu.Game/Users/UserPanel.cs                   |  9 +--
 3 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 558778c918..df4b85b37a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for screen load", () => spectatorScreen.LoadState == LoadState.Loaded);
         }
 
-        internal class TestSpectatorStreamingClient : SpectatorStreamingClient
+        public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
             public readonly User StreamingUser = new User { Id = 1234, Username = "Test user" };
 
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index cb88065ec6..8832cb52ea 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -11,6 +11,7 @@ using osu.Framework.Screens;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Spectator;
+using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
 using osuTK;
@@ -21,7 +22,7 @@ namespace osu.Game.Overlays.Dashboard
     {
         private IBindableList<int> playingUsers;
 
-        private FillFlowContainer<UserPanel> userFlow;
+        private FillFlowContainer<PlayingUserPanel> userFlow;
 
         [Resolved]
         private SpectatorStreamingClient spectatorStreaming { get; set; }
@@ -32,7 +33,7 @@ namespace osu.Game.Overlays.Dashboard
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChild = userFlow = new FillFlowContainer<UserPanel>
+            InternalChild = userFlow = new FillFlowContainer<PlayingUserPanel>
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
@@ -78,19 +79,53 @@ namespace osu.Game.Overlays.Dashboard
             }), true);
         }
 
-        [Resolved(canBeNull: true)]
-        private OsuGame game { get; set; }
-
-        private UserPanel createUserPanel(User user)
-        {
-            return new UserGridPanel(user).With(panel =>
+        private PlayingUserPanel createUserPanel(User user) =>
+            new PlayingUserPanel(user).With(panel =>
             {
                 panel.Anchor = Anchor.TopCentre;
                 panel.Origin = Anchor.TopCentre;
-                panel.Width = 290;
-                panel.ShowProfileOnClick = false;
-                panel.Action = () => game?.PerformFromScreen(s => s.Push(new Spectator(user)));
             });
+
+        private class PlayingUserPanel : CompositeDrawable
+        {
+            public readonly User User;
+
+            [Resolved(canBeNull: true)]
+            private OsuGame game { get; set; }
+
+            public PlayingUserPanel(User user)
+            {
+                User = user;
+
+                AutoSizeAxes = Axes.Both;
+
+                InternalChildren = new Drawable[]
+                {
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(2),
+                        Children = new Drawable[]
+                        {
+                            new UserGridPanel(user)
+                            {
+                                Width = 290,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                            },
+                            new PurpleTriangleButton
+                            {
+                                Width = 290,
+                                Text = "Watch",
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Action = () => game?.PerformFromScreen(s => s.Push(new Spectator(user)))
+                            }
+                        }
+                    },
+                };
+            }
         }
     }
 }
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index e97ff4287f..0981136dba 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -20,10 +20,12 @@ namespace osu.Game.Users
     {
         public readonly User User;
 
+        /// <summary>
+        /// Perform an action in addition to showing the user's profile.
+        /// This should be used to perform auxiliary tasks and not as a primary action for clicking a user panel (to maintain a consistent UX).
+        /// </summary>
         public new Action Action;
 
-        public bool ShowProfileOnClick = true;
-
         protected Action ViewProfile { get; private set; }
 
         protected Drawable Background { get; private set; }
@@ -70,8 +72,7 @@ namespace osu.Game.Users
             base.Action = ViewProfile = () =>
             {
                 Action?.Invoke();
-                if (ShowProfileOnClick)
-                    profileOverlay?.ShowUser(User);
+                profileOverlay?.ShowUser(User);
             };
         }
 

From c3d3856a64004bb41cc19065e0d0bf57c9408a67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 23:51:01 +0900
Subject: [PATCH 05891/10326] Fix looping mode not being set on first track
 after entering song select

Closes #10656.
---
 osu.Game/Screens/Select/SongSelect.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index def620462f..82a2cd790a 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -519,6 +519,7 @@ namespace osu.Game.Screens.Select
 
             ModSelect.SelectedMods.BindTo(selectedMods);
 
+            music.CurrentTrack.Looping = true;
             music.TrackChanged += ensureTrackLooping;
         }
 

From d5c95a8b46a21d69d71dbeb4e3b530f023968e49 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 00:45:55 +0900
Subject: [PATCH 05892/10326] Centralise into methods and add assertions for
 safety

---
 osu.Game/Screens/Select/SongSelect.cs | 32 ++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 82a2cd790a..975431fb62 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -37,6 +37,7 @@ using osu.Framework.Input.Bindings;
 using osu.Game.Collections;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
+using System.Diagnostics;
 
 namespace osu.Game.Screens.Select
 {
@@ -519,8 +520,7 @@ namespace osu.Game.Screens.Select
 
             ModSelect.SelectedMods.BindTo(selectedMods);
 
-            music.CurrentTrack.Looping = true;
-            music.TrackChanged += ensureTrackLooping;
+            beginLooping();
         }
 
         private const double logo_transition = 250;
@@ -571,8 +571,7 @@ namespace osu.Game.Screens.Select
 
             BeatmapDetails.Refresh();
 
-            music.CurrentTrack.Looping = true;
-            music.TrackChanged += ensureTrackLooping;
+            beginLooping();
             music.ResetTrackAdjustments();
 
             if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
@@ -598,8 +597,7 @@ namespace osu.Game.Screens.Select
 
             BeatmapOptions.Hide();
 
-            music.CurrentTrack.Looping = false;
-            music.TrackChanged -= ensureTrackLooping;
+            endLooping();
 
             this.ScaleTo(1.1f, 250, Easing.InSine);
 
@@ -620,12 +618,30 @@ namespace osu.Game.Screens.Select
 
             FilterControl.Deactivate();
 
-            music.CurrentTrack.Looping = false;
-            music.TrackChanged -= ensureTrackLooping;
+            endLooping();
 
             return false;
         }
 
+        private bool isHandlingLooping;
+
+        private void beginLooping()
+        {
+            Debug.Assert(!isHandlingLooping);
+
+            music.CurrentTrack.Looping = isHandlingLooping = true;
+
+            music.TrackChanged += ensureTrackLooping;
+        }
+
+        private void endLooping()
+        {
+            Debug.Assert(isHandlingLooping);
+            music.CurrentTrack.Looping = isHandlingLooping = false;
+
+            music.TrackChanged -= ensureTrackLooping;
+        }
+
         private void ensureTrackLooping(WorkingBeatmap beatmap, TrackChangeDirection changeDirection)
             => music.CurrentTrack.Looping = true;
 

From ab308d28d2ae40350e41b974b7772afd8e175865 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 01:08:35 +0900
Subject: [PATCH 05893/10326] Debounce calls to UpdateTernaryStates

Just something I noticed in passing recently which may help with
reducing performance overhead of some batch operations.
---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index e346630235..c2441b31a9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -419,11 +419,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
 
             // bring in updates from selection changes
-            EditorBeatmap.HitObjectUpdated += _ => UpdateTernaryStates();
+            EditorBeatmap.HitObjectUpdated += _ => Scheduler.AddOnce(UpdateTernaryStates);
             EditorBeatmap.SelectedHitObjects.CollectionChanged += (sender, args) =>
             {
                 Scheduler.AddOnce(updateVisibility);
-                UpdateTernaryStates();
+                Scheduler.AddOnce(UpdateTernaryStates);
             };
         }
 

From 71c04472fa99c5760f19ba2dcf71dd2727433081 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 14:21:19 +0900
Subject: [PATCH 05894/10326] Fix osu!catch replay conversion applying left
 movements to wrong frame

---
 osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs b/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
index 7efd832f62..1a80adb584 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Catch.Replays
                 if (Position > lastCatchFrame.Position)
                     lastCatchFrame.Actions.Add(CatchAction.MoveRight);
                 else if (Position < lastCatchFrame.Position)
-                    Actions.Add(CatchAction.MoveLeft);
+                    lastCatchFrame.Actions.Add(CatchAction.MoveLeft);
             }
         }
 

From 34aa59f237a3509d0f9e29394e9497e2d5339801 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 14:58:55 +0900
Subject: [PATCH 05895/10326] Fix editor clock not always remaining stopped
 when dragging timeline

Closes https://github.com/ppy/osu/issues/10461.
---
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 9aff4ddf8f..f6b2f99c55 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -165,6 +165,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (!track.IsLoaded || track.Length == 0)
                 return;
 
+            // covers the case where the user starts playback after a drag is in progress.
+            // we want to ensure the clock is always stopped during drags to avoid weird audio playback.
+            if (handlingDragInput)
+                editorClock.Stop();
+
             ScrollTo((float)(editorClock.CurrentTime / track.Length) * Content.DrawWidth, false);
         }
 

From 6bf35d5767fd880d841d4f387f164f2fc30a373a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 16:00:07 +0900
Subject: [PATCH 05896/10326] Fix editor menu not supporting stateful item
 drawables

---
 .../Edit/Components/Menus/EditorMenuBar.cs    | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
index afd9e3d760..c6787a1fb1 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
@@ -163,30 +163,27 @@ namespace osu.Game.Screens.Edit.Components.Menus
 
             protected override Framework.Graphics.UserInterface.Menu CreateSubMenu() => new SubMenu();
 
-            protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableSubMenuItem(item);
-
-            private class DrawableSubMenuItem : DrawableOsuMenuItem
+            protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item)
             {
-                public DrawableSubMenuItem(MenuItem item)
+                switch (item)
+                {
+                    case EditorMenuItemSpacer spacer:
+                        return new DrawableSpacer(spacer);
+                }
+
+                return base.CreateDrawableMenuItem(item);
+            }
+
+            private class DrawableSpacer : DrawableOsuMenuItem
+            {
+                public DrawableSpacer(MenuItem item)
                     : base(item)
                 {
                 }
 
-                protected override bool OnHover(HoverEvent e)
-                {
-                    if (Item is EditorMenuItemSpacer)
-                        return true;
+                protected override bool OnHover(HoverEvent e) => true;
 
-                    return base.OnHover(e);
-                }
-
-                protected override bool OnClick(ClickEvent e)
-                {
-                    if (Item is EditorMenuItemSpacer)
-                        return true;
-
-                    return base.OnClick(e);
-                }
+                protected override bool OnClick(ClickEvent e) => true;
             }
         }
     }

From 7e4314684bd4be4494eb5204a9fb57afc5fac2c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 16:01:14 +0900
Subject: [PATCH 05897/10326] Add editor waveform opacity selection to menu

---
 osu.Game/Configuration/OsuConfigManager.cs   |  5 ++-
 osu.Game/Screens/Edit/Editor.cs              | 10 ++++-
 osu.Game/Screens/Edit/WaveformOpacityMenu.cs | 46 ++++++++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/WaveformOpacityMenu.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index e0971d238a..26f72d3455 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -132,6 +132,8 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
             Set(OsuSetting.SeasonalBackgroundMode, SeasonalBackgroundMode.Sometimes);
+
+            Set(OsuSetting.EditorWaveformOpacity, 1f);
         }
 
         public OsuConfigManager(Storage storage)
@@ -241,6 +243,7 @@ namespace osu.Game.Configuration
         HitLighting,
         MenuBackgroundSource,
         GameplayDisableWinKey,
-        SeasonalBackgroundMode
+        SeasonalBackgroundMode,
+        EditorWaveformOpacity,
     }
 }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index f95c7fe7a6..13d1f378a6 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -20,6 +20,7 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
@@ -103,7 +104,7 @@ namespace osu.Game.Screens.Edit
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, GameHost host)
+        private void load(OsuColour colours, GameHost host, OsuConfigManager config)
         {
             beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
@@ -208,6 +209,13 @@ namespace osu.Game.Screens.Edit
                                         copyMenuItem = new EditorMenuItem("Copy", MenuItemType.Standard, Copy),
                                         pasteMenuItem = new EditorMenuItem("Paste", MenuItemType.Standard, Paste),
                                     }
+                                },
+                                new MenuItem("View")
+                                {
+                                    Items = new[]
+                                    {
+                                        new WaveformOpacityMenu(config)
+                                    }
                                 }
                             }
                         }
diff --git a/osu.Game/Screens/Edit/WaveformOpacityMenu.cs b/osu.Game/Screens/Edit/WaveformOpacityMenu.cs
new file mode 100644
index 0000000000..5d209ae141
--- /dev/null
+++ b/osu.Game/Screens/Edit/WaveformOpacityMenu.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.Collections.Generic;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Edit
+{
+    internal class WaveformOpacityMenu : MenuItem
+    {
+        private readonly Bindable<float> waveformOpacity;
+
+        private readonly Dictionary<float, ToggleMenuItem> menuItemLookup = new Dictionary<float, ToggleMenuItem>();
+
+        public WaveformOpacityMenu(OsuConfigManager config)
+            : base("Waveform opacity")
+        {
+            Items = new[]
+            {
+                createMenuItem(0.25f),
+                createMenuItem(0.5f),
+                createMenuItem(0.75f),
+                createMenuItem(1f),
+            };
+
+            waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
+            waveformOpacity.BindValueChanged(opacity =>
+            {
+                foreach (var kvp in menuItemLookup)
+                    kvp.Value.State.Value = kvp.Key == opacity.NewValue;
+            }, true);
+        }
+
+        private ToggleMenuItem createMenuItem(float opacity)
+        {
+            var item = new ToggleMenuItem($"{opacity * 100}%", MenuItemType.Standard, _ => updateOpacity(opacity));
+            menuItemLookup[opacity] = item;
+            return item;
+        }
+
+        private void updateOpacity(float opacity) => waveformOpacity.Value = opacity;
+    }
+}

From 0dcb4ea4413066850eaea9089cc9cb16fcd2813e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 16:07:01 +0900
Subject: [PATCH 05898/10326] Add handling of opacity to timeline waveform
 display

---
 .../Edit/Compose/Components/Timeline/Timeline.cs    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 9aff4ddf8f..1e374d3103 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osuTK;
@@ -67,8 +68,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private TimelineControlPointDisplay controlPoints;
 
+        private Bindable<float> waveformOpacity;
+
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours)
+        private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours, OsuConfigManager config)
         {
             AddRange(new Drawable[]
             {
@@ -95,7 +98,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             // We don't want the centre marker to scroll
             AddInternal(new CentreMarker { Depth = float.MaxValue });
 
-            WaveformVisible.ValueChanged += visible => waveform.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
+            waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
+            waveformOpacity.BindValueChanged(_ => updateWaveformOpacity(), true);
+
+            WaveformVisible.ValueChanged += _ => updateWaveformOpacity();
             ControlPointsVisible.ValueChanged += visible => controlPoints.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
             TicksVisible.ValueChanged += visible => ticks.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
 
@@ -115,6 +121,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }, true);
         }
 
+        private void updateWaveformOpacity() =>
+            waveform.FadeTo(WaveformVisible.Value ? waveformOpacity.Value : 0, 200, Easing.OutQuint);
+
         private float getZoomLevelForVisibleMilliseconds(double milliseconds) => Math.Max(1, (float)(track.Length / milliseconds));
 
         protected override void Update()

From c2ffc1837905821157a738ca7a31f19b900a5c8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 16:30:11 +0900
Subject: [PATCH 05899/10326] Change editor timeline mouse wheel handling to
 scroll by default (and zoom with alt held)

---
 .../Timeline/ZoomableScrollContainer.cs       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index f90658e99c..9094b6bc98 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -113,19 +113,18 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool OnScroll(ScrollEvent e)
         {
-            if (e.IsPrecise)
+            if (e.CurrentState.Keyboard.AltPressed)
             {
-                // can't handle scroll correctly while playing.
-                // the editor will handle this case for us.
-                if (editorClock?.IsRunning == true)
-                    return false;
-
-                // for now, we don't support zoom when using a precision scroll device. this needs gesture support.
-                return base.OnScroll(e);
+                // zoom when holding alt.
+                setZoomTarget(zoomTarget + e.ScrollDelta.Y, zoomedContent.ToLocalSpace(e.ScreenSpaceMousePosition).X);
             }
 
-            setZoomTarget(zoomTarget + e.ScrollDelta.Y, zoomedContent.ToLocalSpace(e.ScreenSpaceMousePosition).X);
-            return true;
+            // can't handle scroll correctly while playing.
+            // the editor will handle this case for us.
+            if (editorClock?.IsRunning == true)
+                return false;
+
+            return base.OnScroll(e);
         }
 
         private void updateZoomedContentWidth() => zoomedContent.Width = DrawWidth * currentZoom;

From df9ff76f23871bfaf991adc2fea9f0086ad9ee50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 16:49:13 +0900
Subject: [PATCH 05900/10326] Reduce assert to guard in the outwards direction

---
 osu.Game/Screens/Select/SongSelect.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 975431fb62..b55c0694ef 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -636,7 +636,10 @@ namespace osu.Game.Screens.Select
 
         private void endLooping()
         {
-            Debug.Assert(isHandlingLooping);
+            // may be called multiple times during screen exit process.
+            if (!isHandlingLooping)
+                return;
+
             music.CurrentTrack.Looping = isHandlingLooping = false;
 
             music.TrackChanged -= ensureTrackLooping;

From ff4dcf065a2da691a6b19aaaecd1a2a211487188 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 17:06:33 +0900
Subject: [PATCH 05901/10326] Update tests

---
 .../Visual/Editing/TestSceneZoomableScrollContainer.cs   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
index 082268d824..c8187491b9 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
@@ -7,13 +7,14 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Utils;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editing
 {
@@ -88,6 +89,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             // Scroll in at 0.25
             AddStep("Move mouse to 0.25x", () => InputManager.MoveMouseTo(new Vector2(scrollQuad.TopLeft.X + 0.25f * scrollQuad.Size.X, scrollQuad.Centre.Y)));
+            AddStep("Press alt down", () => InputManager.PressKey(Key.AltLeft));
             AddStep("Scroll by 3", () => InputManager.ScrollBy(new Vector2(0, 3)));
             AddAssert("Box not at 0", () => !Precision.AlmostEquals(boxQuad.TopLeft, scrollQuad.TopLeft));
             AddAssert("Box 1/4 at 1/4", () => Precision.AlmostEquals(boxQuad.TopLeft.X + 0.25f * boxQuad.Size.X, scrollQuad.TopLeft.X + 0.25f * scrollQuad.Size.X));
@@ -96,6 +98,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("Scroll by -3", () => InputManager.ScrollBy(new Vector2(0, -3)));
             AddAssert("Box at 0", () => Precision.AlmostEquals(boxQuad.TopLeft, scrollQuad.TopLeft));
             AddAssert("Box 1/4 at 1/4", () => Precision.AlmostEquals(boxQuad.TopLeft.X + 0.25f * boxQuad.Size.X, scrollQuad.TopLeft.X + 0.25f * scrollQuad.Size.X));
+            AddStep("Release alt", () => InputManager.ReleaseKey(Key.AltLeft));
         }
 
         [Test]
@@ -103,6 +106,8 @@ namespace osu.Game.Tests.Visual.Editing
         {
             reset();
 
+            AddStep("Press alt down", () => InputManager.PressKey(Key.AltLeft));
+
             // Scroll in at 0.25
             AddStep("Move mouse to 0.25x", () => InputManager.MoveMouseTo(new Vector2(scrollQuad.TopLeft.X + 0.25f * scrollQuad.Size.X, scrollQuad.Centre.Y)));
             AddStep("Scroll by 1", () => InputManager.ScrollBy(new Vector2(0, 1)));
@@ -124,6 +129,8 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("Move mouse to 0.25x", () => InputManager.MoveMouseTo(new Vector2(scrollQuad.TopLeft.X + 0.25f * scrollQuad.Size.X, scrollQuad.Centre.Y)));
             AddStep("Scroll by -1", () => InputManager.ScrollBy(new Vector2(0, -1)));
             AddAssert("Box at 0", () => Precision.AlmostEquals(boxQuad.TopLeft, scrollQuad.TopLeft));
+
+            AddStep("Release alt", () => InputManager.ReleaseKey(Key.AltLeft));
         }
 
         private void reset()

From ff2b01fa6f6fa33035de9378d20a8f2187d54571 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 17:22:45 +0900
Subject: [PATCH 05902/10326] Add test coverage of zoom-then-scroll

---
 .../TestSceneZoomableScrollContainer.cs        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
index c8187491b9..95d11d6909 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
@@ -101,6 +101,24 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("Release alt", () => InputManager.ReleaseKey(Key.AltLeft));
         }
 
+        [Test]
+        public void TestMouseZoomInThenScroll()
+        {
+            reset();
+
+            // Scroll in at 0.25
+            AddStep("Move mouse to 0.25x", () => InputManager.MoveMouseTo(new Vector2(scrollQuad.TopLeft.X + 0.25f * scrollQuad.Size.X, scrollQuad.Centre.Y)));
+            AddStep("Press alt down", () => InputManager.PressKey(Key.AltLeft));
+            AddStep("Zoom by 3", () => InputManager.ScrollBy(new Vector2(0, 3)));
+            AddStep("Release alt", () => InputManager.ReleaseKey(Key.AltLeft));
+
+            AddStep("Scroll far left", () => InputManager.ScrollBy(new Vector2(0, 30)));
+            AddUntilStep("Scroll is at start", () => Precision.AlmostEquals(scrollQuad.TopLeft.X, boxQuad.TopLeft.X, 1));
+
+            AddStep("Scroll far right", () => InputManager.ScrollBy(new Vector2(0, -300)));
+            AddUntilStep("Scroll is at end", () => Precision.AlmostEquals(scrollQuad.TopRight.X, boxQuad.TopRight.X, 1));
+        }
+
         [Test]
         public void TestMouseZoomInTwiceOutTwice()
         {

From b069372b2952cf95b0928c87ba3939dba6617967 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 17:49:48 +0900
Subject: [PATCH 05903/10326] Fix skin changes resulting in incorrectly applied
 transforms in MainCirclePiece

---
 .../Drawables/Pieces/MainCirclePiece.cs       | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
index cb3787a493..e2345de886 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
@@ -42,10 +42,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
         private readonly IBindable<int> indexInCurrentCombo = new Bindable<int>();
 
+        [Resolved]
+        private DrawableHitObject drawableObject { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableObject)
+        private void load()
         {
-            OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
+            var osuObject = (OsuHitObject)drawableObject.HitObject;
 
             state.BindTo(drawableObject.State);
             state.BindValueChanged(updateState, true);
@@ -64,32 +67,35 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private void updateState(ValueChangedEvent<ArmedState> state)
         {
-            glow.FadeOut(400);
-
-            switch (state.NewValue)
+            using (BeginAbsoluteSequence(drawableObject.HitObject.StartTime + (drawableObject.Result?.TimeOffset ?? 0), true))
             {
-                case ArmedState.Hit:
-                    const double flash_in = 40;
-                    const double flash_out = 100;
+                glow.FadeOut(400);
 
-                    flash.FadeTo(0.8f, flash_in)
-                         .Then()
-                         .FadeOut(flash_out);
+                switch (state.NewValue)
+                {
+                    case ArmedState.Hit:
+                        const double flash_in = 40;
+                        const double flash_out = 100;
 
-                    explode.FadeIn(flash_in);
-                    this.ScaleTo(1.5f, 400, Easing.OutQuad);
+                        flash.FadeTo(0.8f, flash_in)
+                             .Then()
+                             .FadeOut(flash_out);
 
-                    using (BeginDelayedSequence(flash_in, true))
-                    {
-                        // after the flash, we can hide some elements that were behind it
-                        ring.FadeOut();
-                        circle.FadeOut();
-                        number.FadeOut();
+                        explode.FadeIn(flash_in);
+                        this.ScaleTo(1.5f, 400, Easing.OutQuad);
 
-                        this.FadeOut(800);
-                    }
+                        using (BeginDelayedSequence(flash_in, true))
+                        {
+                            // after the flash, we can hide some elements that were behind it
+                            ring.FadeOut();
+                            circle.FadeOut();
+                            number.FadeOut();
 
-                    break;
+                            this.FadeOut(800);
+                        }
+
+                        break;
+                }
             }
         }
     }

From 9f8ea93068dc0b53c1390084c95e878703a90036 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 18:45:18 +0900
Subject: [PATCH 05904/10326] Fix osu!catch banana animation not playing due to
 incorrect lifetimes

Closes #10117.
---
 .../Objects/Drawables/DrawableCatchHitObject.cs                 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index d03a764bda..ac1f11e09f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -62,6 +62,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
     public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
     {
+        protected override double InitialLifetimeOffset => HitObject.TimePreempt;
+
         public virtual bool StaysOnPlate => HitObject.CanBePlated;
 
         public float DisplayRadius => DrawSize.X / 2 * Scale.X * HitObject.Scale;

From d788931661e6110393f011ca3512582ab168c46c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 19:53:35 +0900
Subject: [PATCH 05905/10326] Fix LoadComponentAsync calls potentially occuring
 after beatmap wedge disposal

As seen in https://ci.appveyor.com/project/peppy/osu/builds/36109658/tests.

Also adds cancellation logic for good measure.
---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index bdfcc2fd96..ad3bce8968 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using JetBrains.Annotations;
 using osuTK;
 using osuTK.Graphics;
@@ -85,6 +86,8 @@ namespace osu.Game.Screens.Select
 
         private WorkingBeatmap beatmap;
 
+        private CancellationTokenSource cancellationSource;
+
         public WorkingBeatmap Beatmap
         {
             get => beatmap;
@@ -93,10 +96,12 @@ namespace osu.Game.Screens.Select
                 if (beatmap == value) return;
 
                 beatmap = value;
+                cancellationSource?.Cancel();
+                cancellationSource = new CancellationTokenSource();
 
                 beatmapDifficulty?.UnbindAll();
-                beatmapDifficulty = difficultyManager.GetBindableDifficulty(beatmap.BeatmapInfo);
-                beatmapDifficulty.BindValueChanged(_ => updateDisplay());
+                beatmapDifficulty = difficultyManager.GetBindableDifficulty(beatmap.BeatmapInfo, cancellationSource.Token);
+                beatmapDifficulty.BindValueChanged(_ => Schedule(updateDisplay));
 
                 updateDisplay();
             }
@@ -137,6 +142,12 @@ namespace osu.Game.Screens.Select
             });
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            cancellationSource?.Cancel();
+        }
+
         public class BufferedWedgeInfo : BufferedContainer
         {
             public OsuSpriteText VersionLabel { get; private set; }

From d4f8c63f9ee1de0cfcfbaa8b6b6206e42e16ee64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 19:59:06 +0900
Subject: [PATCH 05906/10326] Fix reference to dummyAPI not using helper
 property

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 137d0c20a3..f85abeb51a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Online
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("register request handling", () => ((DummyAPIAccess)API).HandleRequest = req =>
+            AddStep("register request handling", () => dummyAPI.HandleRequest = req =>
             {
                 switch (req)
                 {

From aaffd59dfe4a43ebe1d75802355f0ca6453e07f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 20:02:02 +0900
Subject: [PATCH 05907/10326] Add test step to reset players (to better allow
 multiple runs of tests)

---
 .../Visual/Online/TestSceneCurrentlyPlayingDisplay.cs           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index f85abeb51a..d6fd33bce7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -50,6 +50,8 @@ namespace osu.Game.Tests.Visual.Online
                     }
                 };
             });
+
+            AddStep("Reset players", () => testSpectatorStreamingClient.PlayingUsers.Clear());
         }
 
         [Test]

From 3e29e468ea3907bad4af44c08e24ad74c17eeeb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 20:06:42 +0900
Subject: [PATCH 05908/10326] Ensure "start watching" button starts in a
 disabled state

---
 osu.Game/Screens/Play/Spectator.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 2c8b5c4cad..9ed911efd5 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -165,7 +165,8 @@ namespace osu.Game.Screens.Play
                                 Width = 250,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Action = attemptStart
+                                Action = attemptStart,
+                                Enabled = { Value = false }
                             }
                         }
                     }

From 1b2bd6a8c9de4abd0539bd217f5db55f65939ce1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 20:10:13 +0900
Subject: [PATCH 05909/10326] Remove redundant base call

---
 osu.Game/Screens/Play/SpectatorPlayer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index fbed84b820..fdf996150f 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -21,7 +21,6 @@ namespace osu.Game.Screens.Play
         protected override bool CheckModsAllowFailure() => false; // todo: better support starting mid-way through beatmap
 
         public SpectatorPlayer(Score score)
-            : base(true, true)
         {
             this.score = score;
         }

From 9f333ac58a379164ece8af22302cd09d639b8480 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 20:45:48 +0900
Subject: [PATCH 05910/10326] Add the ability to delete slider control points
 using shift+right click

Closes https://github.com/ppy/osu/issues/10672.

In two minds about how this should be implemented but went in this
direction initially. The other way would be to add local handling of
Shift-Right Click inside PathControlPointPiece (which is already doing
mouse handling itself).
---
 .../Components/PathControlPointVisualiser.cs     | 10 +++++++---
 .../Sliders/SliderSelectionBlueprint.cs          | 16 +++++++++++++++-
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs     |  6 ++++++
 .../Compose/Components/BlueprintContainer.cs     | 11 ++++++++---
 .../Edit/Compose/Components/SelectionHandler.cs  | 14 ++++++++++++--
 5 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index f6354bc612..13dc7886ed 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -18,6 +18,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
@@ -105,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             switch (action.ActionMethod)
             {
                 case PlatformActionMethod.Delete:
-                    return deleteSelected();
+                    return DeleteSelected();
             }
 
             return false;
@@ -115,6 +116,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
         }
 
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+            Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos));
+
         private void selectPiece(PathControlPointPiece piece, MouseButtonEvent e)
         {
             if (e.Button == MouseButton.Left && inputManager.CurrentState.Keyboard.ControlPressed)
@@ -126,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
         }
 
-        private bool deleteSelected()
+        public bool DeleteSelected()
         {
             List<PathControlPoint> toRemove = Pieces.Where(p => p.IsSelected.Value).Select(p => p.ControlPoint).ToList();
 
@@ -169,7 +173,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
                 return new MenuItem[]
                 {
-                    new OsuMenuItem($"Delete {"control point".ToQuantity(count, count > 1 ? ShowQuantityAs.Numeric : ShowQuantityAs.None)}", MenuItemType.Destructive, () => deleteSelected()),
+                    new OsuMenuItem($"Delete {"control point".ToQuantity(count, count > 1 ? ShowQuantityAs.Numeric : ShowQuantityAs.None)}", MenuItemType.Destructive, () => DeleteSelected()),
                     new OsuMenuItem("Curve type")
                     {
                         Items = items
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index d3fb5defae..59b087f68f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -72,6 +73,18 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             BodyPiece.UpdateFrom(HitObject);
         }
 
+        public override bool HandleQuickDeletion()
+        {
+            var hoveredControlPoint = ControlPointVisualiser.Pieces.FirstOrDefault(p => p.IsHovered);
+
+            if (hoveredControlPoint == null)
+                return false;
+
+            hoveredControlPoint.IsSelected.Value = true;
+            ControlPointVisualiser.DeleteSelected();
+            return true;
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -216,7 +229,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         public override Vector2 ScreenSpaceSelectionPoint => BodyPiece.ToScreenSpace(BodyPiece.PathStartLocation);
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => BodyPiece.ReceivePositionalInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+            BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.ReceivePositionalInputAt(screenSpacePos) == true;
 
         protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
     }
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index f3816f6218..99cdca045b 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -143,5 +143,11 @@ namespace osu.Game.Rulesets.Edit
         public virtual Quad SelectionQuad => ScreenSpaceDrawQuad;
 
         public virtual Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Parent.ToLocalSpace(screenSpacePosition) - Position;
+
+        /// <summary>
+        /// Handle to perform a partial deletion when the user requests a quick delete (Shift+Right Click).
+        /// </summary>
+        /// <returns>True if the deletion operation was handled by this blueprint. Returning false will delete the full blueprint.</returns>
+        public virtual bool HandleQuickDeletion() => false;
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index fa98358dbe..d8f7137fa6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -116,7 +116,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            beginClickSelection(e);
+            if (beginClickSelection(e)) return true;
+
             prepareSelectionMovement();
 
             return e.Button == MouseButton.Left;
@@ -291,19 +292,23 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Attempts to select any hovered blueprints.
         /// </summary>
         /// <param name="e">The input event that triggered this selection.</param>
-        private void beginClickSelection(MouseButtonEvent e)
+        private bool beginClickSelection(MouseButtonEvent e)
         {
             Debug.Assert(!clickSelectionBegan);
 
+            bool rightClickHandled = false;
+
             foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
             {
                 if (blueprint.IsHovered)
                 {
-                    SelectionHandler.HandleSelectionRequested(blueprint, e.CurrentState);
+                    rightClickHandled |= SelectionHandler.HandleSelectionRequested(blueprint, e.CurrentState);
                     clickSelectionBegan = true;
                     break;
                 }
             }
+
+            return rightClickHandled;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index c2441b31a9..5bf6c52e11 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -219,18 +219,28 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="state">The input state at the point of selection.</param>
-        internal void HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
+        /// <returns>Whether right click was handled.</returns>
+        internal bool HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
         {
             if (state.Keyboard.ShiftPressed && state.Mouse.IsPressed(MouseButton.Right))
+            {
                 handleQuickDeletion(blueprint);
-            else if (state.Keyboard.ControlPressed && state.Mouse.IsPressed(MouseButton.Left))
+                return true;
+            }
+
+            if (state.Keyboard.ControlPressed && state.Mouse.IsPressed(MouseButton.Left))
                 blueprint.ToggleSelection();
             else
                 ensureSelected(blueprint);
+
+            return false;
         }
 
         private void handleQuickDeletion(SelectionBlueprint blueprint)
         {
+            if (blueprint.HandleQuickDeletion())
+                return;
+
             if (!blueprint.IsSelected)
                 EditorBeatmap.Remove(blueprint.HitObject);
             else

From 83c004bbdefa4cc9bf4eb9dcfff7d91bcaf8187c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 21:10:31 +0900
Subject: [PATCH 05911/10326] Add key bindings for flip and reverse patterns

---
 .../Edit/Compose/Components/SelectionBox.cs   | 36 +++++++++++++++----
 .../Compose/Components/SelectionHandler.cs    |  8 ++---
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index b753c45cca..6367dd6b9b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -7,17 +7,19 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     public class SelectionBox : CompositeDrawable
     {
-        public Action<float> OnRotation;
-        public Action<Vector2, Anchor> OnScale;
-        public Action<Direction> OnFlip;
-        public Action OnReverse;
+        public Func<float, bool> OnRotation;
+        public Func<Vector2, Anchor, bool> OnScale;
+        public Func<Direction, bool> OnFlip;
+        public Func<bool> OnReverse;
 
         public Action OperationStarted;
         public Action OperationEnded;
@@ -105,6 +107,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
             recreate();
         }
 
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (e.Repeat || !e.ControlPressed)
+                return false;
+
+            switch (e.Key)
+            {
+                case Key.G:
+                    return OnReverse?.Invoke() == true;
+
+                case Key.H:
+                    return OnFlip?.Invoke(Direction.Horizontal) == true;
+
+                case Key.J:
+                    return OnFlip?.Invoke(Direction.Vertical) == true;
+            }
+
+            return base.OnKeyDown(e);
+        }
+
         private void recreate()
         {
             if (LoadState < LoadState.Loading)
@@ -143,7 +165,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (CanScaleX && CanScaleY) addFullScaleComponents();
             if (CanScaleY) addYScaleComponents();
             if (CanRotate) addRotationComponents();
-            if (CanReverse) addButton(FontAwesome.Solid.Backward, "Reverse pattern", () => OnReverse?.Invoke());
+            if (CanReverse) addButton(FontAwesome.Solid.Backward, "Reverse pattern (Ctrl-G)", () => OnReverse?.Invoke());
         }
 
         private void addRotationComponents()
@@ -178,7 +200,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void addYScaleComponents()
         {
-            addButton(FontAwesome.Solid.ArrowsAltV, "Flip vertically", () => OnFlip?.Invoke(Direction.Vertical));
+            addButton(FontAwesome.Solid.ArrowsAltV, "Flip vertically (Ctrl-J)", () => OnFlip?.Invoke(Direction.Vertical));
 
             addDragHandle(Anchor.TopCentre);
             addDragHandle(Anchor.BottomCentre);
@@ -194,7 +216,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void addXScaleComponents()
         {
-            addButton(FontAwesome.Solid.ArrowsAltH, "Flip horizontally", () => OnFlip?.Invoke(Direction.Horizontal));
+            addButton(FontAwesome.Solid.ArrowsAltH, "Flip horizontally (Ctrl-H)", () => OnFlip?.Invoke(Direction.Horizontal));
 
             addDragHandle(Anchor.CentreLeft);
             addDragHandle(Anchor.CentreRight);
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index c2441b31a9..406ca07185 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -99,10 +99,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 OperationStarted = OnOperationBegan,
                 OperationEnded = OnOperationEnded,
 
-                OnRotation = angle => HandleRotation(angle),
-                OnScale = (amount, anchor) => HandleScale(amount, anchor),
-                OnFlip = direction => HandleFlip(direction),
-                OnReverse = () => HandleReverse(),
+                OnRotation = HandleRotation,
+                OnScale = HandleScale,
+                OnFlip = HandleFlip,
+                OnReverse = HandleReverse,
             };
 
         /// <summary>

From d45520be5eb2a7008a815daefea9474563b9d247 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Nov 2020 21:23:10 +0900
Subject: [PATCH 05912/10326] Fix incorrect return types on test methods

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

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index da98a7a024..cf5f1b8818 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddToggleStep("toggle y", state => selectionBox.CanScaleY = state);
         }
 
-        private void handleScale(Vector2 amount, Anchor reference)
+        private bool handleScale(Vector2 amount, Anchor reference)
         {
             if ((reference & Anchor.y1) == 0)
             {
@@ -58,12 +58,15 @@ namespace osu.Game.Tests.Visual.Editing
                     selectionArea.X += amount.X;
                 selectionArea.Width += directionX * amount.X;
             }
+
+            return true;
         }
 
-        private void handleRotation(float angle)
+        private bool handleRotation(float angle)
         {
             // kinda silly and wrong, but just showing that the drag handles work.
             selectionArea.Rotation += angle;
+            return true;
         }
     }
 }

From 18428dff8ee20a62ec8b720357d4a61e3559a8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 3 Nov 2020 18:01:12 +0100
Subject: [PATCH 05913/10326] Ensure hotkey actions are executable in handler

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 6367dd6b9b..742d433760 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -115,13 +115,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
             switch (e.Key)
             {
                 case Key.G:
-                    return OnReverse?.Invoke() == true;
+                    return CanReverse && OnReverse?.Invoke() == true;
 
                 case Key.H:
-                    return OnFlip?.Invoke(Direction.Horizontal) == true;
+                    return CanScaleX && OnFlip?.Invoke(Direction.Horizontal) == true;
 
                 case Key.J:
-                    return OnFlip?.Invoke(Direction.Vertical) == true;
+                    return CanScaleY && OnFlip?.Invoke(Direction.Vertical) == true;
             }
 
             return base.OnKeyDown(e);

From 86d283ebf4439c940a02f5fd889ff1f27d406447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 3 Nov 2020 19:03:48 +0100
Subject: [PATCH 05914/10326] Adjust layout slightly to avoid specifying width
 twice

---
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 8832cb52ea..79af81cfac 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -103,20 +103,21 @@ namespace osu.Game.Overlays.Dashboard
                 {
                     new FillFlowContainer
                     {
-                        AutoSizeAxes = Axes.Both,
+                        AutoSizeAxes = Axes.Y,
                         Direction = FillDirection.Vertical,
                         Spacing = new Vector2(2),
+                        Width = 290,
                         Children = new Drawable[]
                         {
                             new UserGridPanel(user)
                             {
-                                Width = 290,
+                                RelativeSizeAxes = Axes.X,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
                             },
                             new PurpleTriangleButton
                             {
-                                Width = 290,
+                                RelativeSizeAxes = Axes.X,
                                 Text = "Watch",
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,

From 211510fe9aa0eff1243249cb3aeb4b2cf8519f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 3 Nov 2020 19:12:03 +0100
Subject: [PATCH 05915/10326] Fix undesirable vertical spacing in currently
 playing display

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

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 79af81cfac..34444c2fa5 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -112,15 +112,15 @@ namespace osu.Game.Overlays.Dashboard
                             new UserGridPanel(user)
                             {
                                 RelativeSizeAxes = Axes.X,
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
                             },
                             new PurpleTriangleButton
                             {
                                 RelativeSizeAxes = Axes.X,
                                 Text = "Watch",
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
                                 Action = () => game?.PerformFromScreen(s => s.Push(new Spectator(user)))
                             }
                         }

From 4b528e80d012d96e5e81a693222fc60761af947d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 3 Nov 2020 21:49:04 +0100
Subject: [PATCH 05916/10326] Use AltPressed shorthand

---
 .../Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 9094b6bc98..548bb66198 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool OnScroll(ScrollEvent e)
         {
-            if (e.CurrentState.Keyboard.AltPressed)
+            if (e.AltPressed)
             {
                 // zoom when holding alt.
                 setZoomTarget(zoomTarget + e.ScrollDelta.Y, zoomedContent.ToLocalSpace(e.ScreenSpaceMousePosition).X);

From ddf0d75c38d44bab54db52d69309fe6ca3d7c957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 3 Nov 2020 21:49:21 +0100
Subject: [PATCH 05917/10326] Don't fall through to seek if handling zoom

---
 .../Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 548bb66198..f10eb0d284 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -117,6 +117,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 // zoom when holding alt.
                 setZoomTarget(zoomTarget + e.ScrollDelta.Y, zoomedContent.ToLocalSpace(e.ScreenSpaceMousePosition).X);
+                return true;
             }
 
             // can't handle scroll correctly while playing.

From cfe32182397f79efd8ca30fbd02724c718f16b2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 10:21:42 +0900
Subject: [PATCH 05918/10326] Move scheduler call to inside method itself for
 added safety

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 57 +++++++++++----------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index ad3bce8968..2634f117de 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.Select
 
                 beatmapDifficulty?.UnbindAll();
                 beatmapDifficulty = difficultyManager.GetBindableDifficulty(beatmap.BeatmapInfo, cancellationSource.Token);
-                beatmapDifficulty.BindValueChanged(_ => Schedule(updateDisplay));
+                beatmapDifficulty.BindValueChanged(_ => updateDisplay());
 
                 updateDisplay();
             }
@@ -113,33 +113,38 @@ namespace osu.Game.Screens.Select
 
         private void updateDisplay()
         {
-            void removeOldInfo()
-            {
-                State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
+            Scheduler.AddOnce(perform);
 
-                Info?.FadeOut(250);
-                Info?.Expire();
-                Info = null;
+            void perform()
+            {
+                void removeOldInfo()
+                {
+                    State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
+
+                    Info?.FadeOut(250);
+                    Info?.Expire();
+                    Info = null;
+                }
+
+                if (beatmap == null)
+                {
+                    removeOldInfo();
+                    return;
+                }
+
+                LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, beatmapDifficulty.Value)
+                {
+                    Shear = -Shear,
+                    Depth = Info?.Depth + 1 ?? 0
+                }, loaded =>
+                {
+                    // ensure we are the most recent loaded wedge.
+                    if (loaded != loadingInfo) return;
+
+                    removeOldInfo();
+                    Add(Info = loaded);
+                });
             }
-
-            if (beatmap == null)
-            {
-                removeOldInfo();
-                return;
-            }
-
-            LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, beatmapDifficulty.Value)
-            {
-                Shear = -Shear,
-                Depth = Info?.Depth + 1 ?? 0
-            }, loaded =>
-            {
-                // ensure we are the most recent loaded wedge.
-                if (loaded != loadingInfo) return;
-
-                removeOldInfo();
-                Add(Info = loaded);
-            });
         }
 
         protected override void Dispose(bool isDisposing)

From 1d90f5fc082b636eb4f2a6466deada44bdd16d43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 14:16:51 +0900
Subject: [PATCH 05919/10326] Revert "Disable spectator streaming connection
 logic on iOS to avoid startup crash"

This reverts commit c9b96a18294b0143a38407951b15072a7cd8f9ff.
---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 125831035a..cb170ad298 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -10,7 +10,6 @@ using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -102,10 +101,6 @@ namespace osu.Game.Online.Spectator
 
         private async Task connect()
         {
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
-                // disabled for now (see https://github.com/dotnet/runtime/issues/35988)
-                return;
-
             if (connection != null)
                 return;
 

From 5316d4c3696d7939f47b5364286e3e9c0c463dd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 14:16:34 +0900
Subject: [PATCH 05920/10326] Force using older signalr version for iOS

---
 osu.iOS/osu.iOS.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj
index 1e9a21865d..2c6489a5d3 100644
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@@ -116,5 +116,9 @@
       <Visible>false</Visible>
     </ImageAsset>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>

From 6c4acb4d11c404602085f5e9a4132da44ff37faf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 14:45:13 +0900
Subject: [PATCH 05921/10326] Move to props and ignore downgrade warning

---
 osu.iOS.props | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.iOS.props b/osu.iOS.props
index 76c496cd2d..61bb690225 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -73,6 +73,14 @@
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1029.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
+  <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
+  <PropertyGroup>
+    <NoWarn>NU1605</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
+  </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.3" />

From d1829820e09559791f9436ac6c1c410faf47893c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 14:53:29 +0900
Subject: [PATCH 05922/10326] Remove local changes from csproj

---
 osu.iOS/osu.iOS.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj
index 2c6489a5d3..1e9a21865d 100644
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@@ -116,9 +116,5 @@
       <Visible>false</Visible>
     </ImageAsset>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>

From 7d0a7f170c388e90cf0f4f004fbd260e02499e92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 14:57:47 +0900
Subject: [PATCH 05923/10326] Avoid overwriting inherited nowarns

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.iOS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index 61bb690225..40ecfffcca 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -75,7 +75,7 @@
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>
-    <NoWarn>NU1605</NoWarn>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />

From 8b1dd31bb4b6525ed33973a388423095f87c4b7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 15:20:41 +0900
Subject: [PATCH 05924/10326] Add gitignore ruile for new msbuild generated
 editorconfig file

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 732b171f69..d122d25054 100644
--- a/.gitignore
+++ b/.gitignore
@@ -334,3 +334,5 @@ inspectcode
 
 # BenchmarkDotNet
 /BenchmarkDotNet.Artifacts
+
+*.GeneratedMSBuildEditorConfig.editorconfig

From 9343f84a6881111986abf1835a1d241db0adda96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 15:21:20 +0900
Subject: [PATCH 05925/10326] Add IBindableList.GetBoudCopy to banned symbols
 for now

---
 CodeAnalysis/BannedSymbols.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CodeAnalysis/BannedSymbols.txt b/CodeAnalysis/BannedSymbols.txt
index e34626a59e..47839608c9 100644
--- a/CodeAnalysis/BannedSymbols.txt
+++ b/CodeAnalysis/BannedSymbols.txt
@@ -4,5 +4,6 @@ M:System.ValueType.Equals(System.Object)~System.Boolean;Don't use object.Equals(
 M:System.Nullable`1.Equals(System.Object)~System.Boolean;Use == instead.
 T:System.IComparable;Don't use non-generic IComparable. Use generic version instead.
 M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
+M:osu.Framework.Bindables.IBindableList`1.GetBoundCopy();Fails on iOS. Use manual ctor + BindTo instead. (see https://github.com/mono/mono/issues/19900)
 T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
 T:Microsoft.EntityFrameworkCore.Internal.TypeExtensions;Don't use internal extension methods.

From 487a5ecdba11f6f2f9aee7e89ccf752bd598bb1f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 15:29:14 +0900
Subject: [PATCH 05926/10326] Replace all usage of IBindableList.GetBoundCopy

---
 osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs     | 4 ++--
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs   | 4 ++--
 .../Timelines/Summary/Parts/ControlPointPart.cs          | 4 ++--
 .../Timelines/Summary/Parts/GroupVisualisation.cs        | 4 ++--
 .../Components/Timeline/TimelineControlPointDisplay.cs   | 4 ++--
 .../Components/Timeline/TimelineControlPointGroup.cs     | 4 ++--
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs        | 4 ++--
 osu.Game/Screens/Edit/Timing/TimingScreen.cs             | 9 ++++-----
 8 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs b/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
index 4a3dc58604..e4dc261363 100644
--- a/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Audio
         private readonly ControlPointInfo controlPoints;
         private readonly Dictionary<double, DrumSample> mappings = new Dictionary<double, DrumSample>();
 
-        private IBindableList<SampleControlPoint> samplePoints;
+        private readonly IBindableList<SampleControlPoint> samplePoints = new BindableList<SampleControlPoint>();
 
         public DrumSampleContainer(ControlPointInfo controlPoints)
         {
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.Audio
         [BackgroundDependencyLoader]
         private void load()
         {
-            samplePoints = controlPoints.SamplePoints.GetBoundCopy();
+            samplePoints.BindTo(controlPoints.SamplePoints);
             samplePoints.BindCollectionChanged((_, __) => recreateMappings(), true);
         }
 
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 34444c2fa5..697ceacf0a 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Dashboard
 {
     internal class CurrentlyPlayingDisplay : CompositeDrawable
     {
-        private IBindableList<int> playingUsers;
+        private readonly IBindableList<int> playingUsers = new BindableList<int>();
 
         private FillFlowContainer<PlayingUserPanel> userFlow;
 
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Dashboard
         {
             base.LoadComplete();
 
-            playingUsers = spectatorStreaming.PlayingUsers.GetBoundCopy();
+            playingUsers.BindTo(spectatorStreaming.PlayingUsers);
             playingUsers.BindCollectionChanged((sender, e) => Schedule(() =>
             {
                 switch (e.Action)
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
index 8c0e31c04c..ba3ac9113e 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
@@ -14,13 +14,13 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// </summary>
     public class ControlPointPart : TimelinePart<GroupVisualisation>
     {
-        private IBindableList<ControlPointGroup> controlPointGroups;
+        private readonly IBindableList<ControlPointGroup> controlPointGroups = new BindableList<ControlPointGroup>();
 
         protected override void LoadBeatmap(WorkingBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);
 
-            controlPointGroups = beatmap.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
+            controlPointGroups.BindTo(beatmap.Beatmap.ControlPointInfo.Groups);
             controlPointGroups.BindCollectionChanged((sender, args) =>
             {
                 switch (args.Action)
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
index b9eb53b697..93fe6f9989 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     {
         public readonly ControlPointGroup Group;
 
-        private BindableList<ControlPoint> controlPoints;
+        private readonly IBindableList<ControlPoint> controlPoints = new BindableList<ControlPoint>();
 
         [Resolved]
         private OsuColour colours { get; set; }
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         {
             base.LoadComplete();
 
-            controlPoints = (BindableList<ControlPoint>)Group.ControlPoints.GetBoundCopy();
+            controlPoints.BindTo(Group.ControlPoints);
             controlPoints.BindCollectionChanged((_, __) =>
             {
                 if (controlPoints.Count == 0)
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
index 3f13e8e5d4..0da1b43201 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     /// </summary>
     public class TimelineControlPointDisplay : TimelinePart<TimelineControlPointGroup>
     {
-        private IBindableList<ControlPointGroup> controlPointGroups;
+        private readonly IBindableList<ControlPointGroup> controlPointGroups = new BindableList<ControlPointGroup>();
 
         public TimelineControlPointDisplay()
         {
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.LoadBeatmap(beatmap);
 
-            controlPointGroups = beatmap.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
+            controlPointGroups.BindTo(beatmap.Beatmap.ControlPointInfo.Groups);
             controlPointGroups.BindCollectionChanged((sender, args) =>
             {
                 switch (args.Action)
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
index e32616a574..fb69f16792 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     {
         public readonly ControlPointGroup Group;
 
-        private BindableList<ControlPoint> controlPoints;
+        private readonly IBindableList<ControlPoint> controlPoints = new BindableList<ControlPoint>();
 
         [Resolved]
         private OsuColour colours { get; set; }
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.LoadComplete();
 
-            controlPoints = (BindableList<ControlPoint>)Group.ControlPoints.GetBoundCopy();
+            controlPoints.BindTo(Group.ControlPoints);
             controlPoints.BindCollectionChanged((_, __) =>
             {
                 ClearInternal();
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 64f9526816..89d3c36250 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         private class ControlGroupAttributes : CompositeDrawable
         {
-            private readonly IBindableList<ControlPoint> controlPoints;
+            private readonly IBindableList<ControlPoint> controlPoints = new BindableList<ControlPoint>();
 
             private readonly FillFlowContainer fill;
 
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Edit.Timing
                     Spacing = new Vector2(2)
                 };
 
-                controlPoints = group.ControlPoints.GetBoundCopy();
+                controlPoints.BindTo(group.ControlPoints);
             }
 
             [Resolved]
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index f511382cde..09d861522a 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Edit.Timing
             private OsuButton deleteButton;
             private ControlPointTable table;
 
-            private IBindableList<ControlPointGroup> controlGroups;
+            private readonly IBindableList<ControlPointGroup> controlPointGroups = new BindableList<ControlPointGroup>();
 
             [Resolved]
             private EditorClock clock { get; set; }
@@ -124,11 +124,10 @@ namespace osu.Game.Screens.Edit.Timing
 
                 selectedGroup.BindValueChanged(selected => { deleteButton.Enabled.Value = selected.NewValue != null; }, true);
 
-                controlGroups = Beatmap.Value.Beatmap.ControlPointInfo.Groups.GetBoundCopy();
-
-                controlGroups.BindCollectionChanged((sender, args) =>
+                controlPointGroups.BindTo(Beatmap.Value.Beatmap.ControlPointInfo.Groups);
+                controlPointGroups.BindCollectionChanged((sender, args) =>
                 {
-                    table.ControlGroups = controlGroups;
+                    table.ControlGroups = controlPointGroups;
                     changeHandler.SaveState();
                 }, true);
             }

From ce1743ab283d80fb1868d00d3c7b4169fdf17569 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 15:35:42 +0900
Subject: [PATCH 05927/10326] Fix missed usage in test scene

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 1d8231cce7..35473ee76c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private Replay replay;
 
-        private IBindableList<int> users;
+        private readonly IBindableList<int> users = new BindableList<int>();
 
         private TestReplayRecorder recorder;
 
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             replay = new Replay();
 
-            users = streamingClient.PlayingUsers.GetBoundCopy();
+            users.BindTo(streamingClient.PlayingUsers);
             users.BindCollectionChanged((obj, args) =>
             {
                 switch (args.Action)

From 7f30140b7e40f53ccf8c4a67524344d7f172bcfd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 16:04:15 +0900
Subject: [PATCH 05928/10326] Add new method handling hit state specifically

Until now UpdateStateTransforms was applying results offsets to
StartTime. This didn't cover the case of a HitObject with duration,
where the call would be made with `StartTime + hitOffset` rather than
`EndTime + hitOffset`.

To resolve this, a new method has been added which should be used to
handle hit-specific state transforms.
---
 .../Rulesets/Judgements/JudgementResult.cs    |  6 +++
 .../Objects/Drawables/DrawableHitObject.cs    | 37 +++++++++++++++----
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/JudgementResult.cs b/osu.Game/Rulesets/Judgements/JudgementResult.cs
index 3a35fd4433..e3b2501cdc 100644
--- a/osu.Game/Rulesets/Judgements/JudgementResult.cs
+++ b/osu.Game/Rulesets/Judgements/JudgementResult.cs
@@ -36,6 +36,12 @@ namespace osu.Game.Rulesets.Judgements
         /// </summary>
         public double TimeOffset { get; internal set; }
 
+        /// <summary>
+        /// The absolute time at which this <see cref="JudgementResult"/> occurred.
+        /// Equal to the (end) time of the <see cref="HitObject"/> + <see cref="TimeOffset"/>.
+        /// </summary>
+        public double TimeAbsolute => HitObject.GetEndTime() + TimeOffset;
+
         /// <summary>
         /// The combo prior to this <see cref="JudgementResult"/> occurring.
         /// </summary>
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 1ef6c8c207..5939443cf1 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -255,18 +255,19 @@ namespace osu.Game.Rulesets.Objects.Drawables
             base.ClearTransformsAfter(double.MinValue, true);
 
             using (BeginAbsoluteSequence(transformTime, true))
-            {
                 UpdateInitialTransforms();
 
-                var judgementOffset = Result?.TimeOffset ?? 0;
+            using (BeginAbsoluteSequence(StateUpdateTime, true))
+                UpdateStateTransforms(newState);
 
-                using (BeginDelayedSequence(InitialLifetimeOffset + judgementOffset, true))
-                {
-                    UpdateStateTransforms(newState);
-                    state.Value = newState;
-                }
+            if (newState != ArmedState.Idle)
+            {
+                using (BeginAbsoluteSequence(HitStateUpdateTime, true))
+                    UpdateHitStateTransforms(newState);
             }
 
+            state.Value = newState;
+
             if (LifetimeEnd == double.MaxValue && (state.Value != ArmedState.Idle || HitObject.HitWindows == null))
                 Expire();
 
@@ -301,6 +302,16 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
         }
 
+        /// <summary>
+        /// Apply transforms based on the current <see cref="ArmedState"/>. This call is offset by <see cref="HitStateUpdateTime"/> (HitObject.EndTime + Result.Offset), equivalent to when the user hit the object.
+        /// This method is only called on <see cref="ArmedState.Hit"/> or <see cref="ArmedState.Miss"/>.
+        /// Previous states are automatically cleared.
+        /// </summary>
+        /// <param name="state">The new armed state.</param>
+        protected virtual void UpdateHitStateTransforms(ArmedState state)
+        {
+        }
+
         public override void ClearTransformsAfter(double time, bool propagateChildren = false, string targetMember = null)
         {
             // Parent calls to this should be blocked for safety, as we are manually handling this in updateState.
@@ -454,6 +465,18 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         protected virtual double InitialLifetimeOffset => 10000;
 
+        /// <summary>
+        /// The time at which state transforms should be applied that line up to <see cref="HitObject"/>'s StartTime.
+        /// This is used to offset calls to <see cref="UpdateStateTransforms"/>.
+        /// </summary>
+        public double StateUpdateTime => HitObject.StartTime;
+
+        /// <summary>
+        /// The time at which judgement dependent state transforms should be applied. This is equivalent of the (end) time of the object, in addition to any judgement offset.
+        /// This is used to offset calls to <see cref="UpdateHitStateTransforms"/>.
+        /// </summary>
+        public double HitStateUpdateTime => Result?.TimeAbsolute ?? HitObject.GetEndTime();
+
         /// <summary>
         /// Will be called at least once after this <see cref="DrawableHitObject"/> has become not alive.
         /// </summary>

From 3b6cf95f49781dd8af3840cc7a93308c426e2756 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 16:27:47 +0900
Subject: [PATCH 05929/10326] Remove parameter from StartTime method and add
 obsoleted previous version

---
 .../Objects/Drawables/DrawableHitObject.cs    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 5939443cf1..318bb323aa 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -257,8 +257,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
             using (BeginAbsoluteSequence(transformTime, true))
                 UpdateInitialTransforms();
 
-            using (BeginAbsoluteSequence(StateUpdateTime, true))
+#pragma warning disable 618
+            using (BeginAbsoluteSequence(StateUpdateTime + (Result?.TimeOffset ?? 0), true))
                 UpdateStateTransforms(newState);
+#pragma warning restore 618
+
+            using (BeginAbsoluteSequence(StateUpdateTime, true))
+                UpdateStartTimeStateTransforms();
 
             if (newState != ArmedState.Idle)
             {
@@ -298,13 +303,23 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// In the case of a non-idle <see cref="ArmedState"/>, and if <see cref="Drawable.LifetimeEnd"/> was not set during this call, <see cref="Drawable.Expire"/> will be invoked.
         /// </summary>
         /// <param name="state">The new armed state.</param>
+        [Obsolete("Use UpdateStartTimeStateTransforms and UpdateHitStateTransforms instead")] // Can be removed 20210504
         protected virtual void UpdateStateTransforms(ArmedState state)
         {
         }
 
+        /// <summary>
+        /// Apply passive transforms at the <see cref="HitObject"/>'s StartTime.
+        /// This is called each time <see cref="State"/> changes.
+        /// Previous states are automatically cleared.
+        /// </summary>
+        protected virtual void UpdateStartTimeStateTransforms()
+        {
+        }
+
         /// <summary>
         /// Apply transforms based on the current <see cref="ArmedState"/>. This call is offset by <see cref="HitStateUpdateTime"/> (HitObject.EndTime + Result.Offset), equivalent to when the user hit the object.
-        /// This method is only called on <see cref="ArmedState.Hit"/> or <see cref="ArmedState.Miss"/>.
+        /// This method is only called on <see cref="ArmedState.Hit"/> or <see cref="ArmedState.Miss"/>. If <see cref="Drawable.LifetimeEnd"/> was not set during this call, <see cref="Drawable.Expire"/> will be invoked.
         /// Previous states are automatically cleared.
         /// </summary>
         /// <param name="state">The new armed state.</param>

From 831325978a4ae9c1c4b599d65d6bcc779ee9f012 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 16:39:39 +0900
Subject: [PATCH 05930/10326] Always execute UpdateHitStateTransforms (even for
 idle)

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 318bb323aa..0a7702d971 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -265,11 +265,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             using (BeginAbsoluteSequence(StateUpdateTime, true))
                 UpdateStartTimeStateTransforms();
 
-            if (newState != ArmedState.Idle)
-            {
-                using (BeginAbsoluteSequence(HitStateUpdateTime, true))
-                    UpdateHitStateTransforms(newState);
-            }
+            using (BeginAbsoluteSequence(HitStateUpdateTime, true))
+                UpdateHitStateTransforms(newState);
 
             state.Value = newState;
 
@@ -319,7 +316,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         /// <summary>
         /// Apply transforms based on the current <see cref="ArmedState"/>. This call is offset by <see cref="HitStateUpdateTime"/> (HitObject.EndTime + Result.Offset), equivalent to when the user hit the object.
-        /// This method is only called on <see cref="ArmedState.Hit"/> or <see cref="ArmedState.Miss"/>. If <see cref="Drawable.LifetimeEnd"/> was not set during this call, <see cref="Drawable.Expire"/> will be invoked.
+        /// If <see cref="Drawable.LifetimeEnd"/> was not set during this call, <see cref="Drawable.Expire"/> will be invoked.
         /// Previous states are automatically cleared.
         /// </summary>
         /// <param name="state">The new armed state.</param>

From 68b7efe4d58034e303aba19a61655ca6c1bbfd52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 16:49:34 +0900
Subject: [PATCH 05931/10326] Change order of execution to be chronological

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 0a7702d971..f77953a5c0 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -257,14 +257,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
             using (BeginAbsoluteSequence(transformTime, true))
                 UpdateInitialTransforms();
 
+            using (BeginAbsoluteSequence(StateUpdateTime, true))
+                UpdateStartTimeStateTransforms();
+
 #pragma warning disable 618
             using (BeginAbsoluteSequence(StateUpdateTime + (Result?.TimeOffset ?? 0), true))
                 UpdateStateTransforms(newState);
 #pragma warning restore 618
 
-            using (BeginAbsoluteSequence(StateUpdateTime, true))
-                UpdateStartTimeStateTransforms();
-
             using (BeginAbsoluteSequence(HitStateUpdateTime, true))
                 UpdateHitStateTransforms(newState);
 

From a3dc1d5730cda9e9fa1860befd66435b16144774 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 16:19:07 +0900
Subject: [PATCH 05932/10326] Update existing implementations

---
 .../Drawables/DrawableCatchHitObject.cs       | 24 +++++--------
 .../Edit/ManiaBeatSnapGrid.cs                 |  4 ---
 .../Objects/Drawables/DrawableBarLine.cs      |  5 ++-
 .../Objects/Drawables/DrawableHoldNote.cs     |  6 ----
 .../Objects/Drawables/DrawableHoldNoteHead.cs |  6 ++--
 .../Drawables/DrawableManiaHitObject.cs       |  2 +-
 .../Objects/Drawables/DrawableHitCircle.cs    |  7 +---
 .../Objects/Drawables/DrawableOsuHitObject.cs | 13 +++----
 .../Objects/Drawables/DrawableSlider.cs       | 34 ++++++++++---------
 .../Objects/Drawables/DrawableSliderRepeat.cs |  4 +--
 .../Objects/Drawables/DrawableSliderTail.cs   |  6 ++--
 .../Objects/Drawables/DrawableSliderTick.cs   |  4 +--
 .../Objects/Drawables/DrawableSpinner.cs      |  7 ++--
 .../Objects/Drawables/DrawableBarLine.cs      |  2 +-
 .../Objects/Drawables/DrawableDrumRoll.cs     |  4 +--
 .../Objects/Drawables/DrawableDrumRollTick.cs |  2 +-
 .../Objects/Drawables/DrawableHit.cs          |  2 +-
 .../Objects/Drawables/DrawableSwell.cs        | 16 ++++-----
 18 files changed, 58 insertions(+), 90 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index ac1f11e09f..7922510a49 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -6,9 +6,8 @@ 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.Catch.UI;
+using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
@@ -90,22 +89,17 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 ApplyResult(r => r.Type = CheckPosition.Invoke(HitObject) ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
-            var endTime = HitObject.GetEndTime();
-
-            using (BeginAbsoluteSequence(endTime, true))
+            switch (state)
             {
-                switch (state)
-                {
-                    case ArmedState.Miss:
-                        this.FadeOut(250).RotateTo(Rotation * 2, 250, Easing.Out);
-                        break;
+                case ArmedState.Miss:
+                    this.FadeOut(250).RotateTo(Rotation * 2, 250, Easing.Out);
+                    break;
 
-                    case ArmedState.Hit:
-                        this.FadeOut();
-                        break;
-                }
+                case ArmedState.Hit:
+                    this.FadeOut();
+                    break;
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 2028cae9a5..afc08dcc96 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -204,10 +204,6 @@ namespace osu.Game.Rulesets.Mania.Edit
             protected override void UpdateInitialTransforms()
             {
                 // don't perform any fading – we are handling that ourselves.
-            }
-
-            protected override void UpdateStateTransforms(ArmedState state)
-            {
                 LifetimeEnd = HitObject.StartTime + visible_range;
             }
         }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
index 08b5b75f9c..074cbf6bd6 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
@@ -1,10 +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 osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
@@ -71,6 +70,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
         }
 
-        protected override void UpdateStateTransforms(ArmedState state) => this.FadeOut(150);
+        protected override void UpdateStartTimeStateTransforms() => this.FadeOut(150);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index f6d539c91b..d9d740c145 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -229,12 +229,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             }
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
-        {
-            using (BeginDelayedSequence(HitObject.Duration, true))
-                base.UpdateStateTransforms(state);
-        }
-
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (Tail.AllJudged)
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
index cd56b81e10..75dcf0e55e 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.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.Objects.Drawables;
-
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
     /// <summary>
@@ -19,8 +17,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public void UpdateResult() => base.UpdateResult(true);
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateInitialTransforms()
         {
+            base.UpdateInitialTransforms();
+
             // This hitobject should never expire, so this is just a safe maximum.
             LifetimeEnd = LifetimeStart + 30000;
         }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 27960b3f3a..1550faee50 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             Anchor = Origin = e.NewValue == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
             switch (state)
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index b5ac26c824..f56da65279 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -164,19 +164,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ApproachCircle.Expire(true);
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
-            base.UpdateStateTransforms(state);
-
             Debug.Assert(HitObject.HitWindows != null);
 
             switch (state)
             {
                 case ArmedState.Idle:
                     this.Delay(HitObject.TimePreempt).FadeOut(500);
-
-                    Expire(true);
-
                     HitArea.HitAction = null;
                     break;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 45c664ba3b..3730966fbb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -51,17 +51,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected virtual void Shake(double maximumLength) => shakeContainer.Shake(maximumLength);
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateInitialTransforms()
         {
-            base.UpdateStateTransforms(state);
+            base.UpdateInitialTransforms();
 
-            switch (state)
-            {
-                case ArmedState.Idle:
-                    // Manually set to reduce the number of future alive objects to a bare minimum.
-                    LifetimeStart = HitObject.StartTime - HitObject.TimePreempt;
-                    break;
-            }
+            // Manually set to reduce the number of future alive objects to a bare minimum.
+            LifetimeStart = HitObject.StartTime - HitObject.TimePreempt;
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index b00d12983d..ddf3950689 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -253,29 +253,31 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 base.PlaySamples();
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateStartTimeStateTransforms()
         {
-            base.UpdateStateTransforms(state);
+            base.UpdateStartTimeStateTransforms();
 
             Ball.FadeIn();
             Ball.ScaleTo(HitObject.Scale);
+        }
 
-            using (BeginDelayedSequence(slider.Duration, true))
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            base.UpdateHitStateTransforms(state);
+
+            const float fade_out_time = 450;
+
+            // intentionally pile on an extra FadeOut to make it happen much faster.
+            Ball.FadeOut(fade_out_time / 4, Easing.Out);
+
+            switch (state)
             {
-                const float fade_out_time = 450;
-
-                // intentionally pile on an extra FadeOut to make it happen much faster.
-                Ball.FadeOut(fade_out_time / 4, Easing.Out);
-
-                switch (state)
-                {
-                    case ArmedState.Hit:
-                        Ball.ScaleTo(HitObject.Scale * 1.4f, fade_out_time, Easing.Out);
-                        break;
-                }
-
-                this.FadeOut(fade_out_time, Easing.OutQuint);
+                case ArmedState.Hit:
+                    Ball.ScaleTo(HitObject.Scale * 1.4f, fade_out_time, Easing.Out);
+                    break;
             }
+
+            this.FadeOut(fade_out_time, Easing.OutQuint);
         }
 
         public Drawable ProxiedLayer => HeadCircle.ProxiedLayer;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 2a88f11f69..20159d18c8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -77,9 +77,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             );
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
-            base.UpdateStateTransforms(state);
+            base.UpdateHitStateTransforms(state);
 
             switch (state)
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index f5bcecccdf..3acd3aefaf 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -67,9 +67,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             circlePiece.FadeInFromZero(HitObject.TimeFadeIn);
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
-            base.UpdateStateTransforms(state);
+            base.UpdateHitStateTransforms(state);
 
             Debug.Assert(HitObject.HitWindows != null);
 
@@ -77,8 +77,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 case ArmedState.Idle:
                     this.Delay(HitObject.TimePreempt).FadeOut(500);
-
-                    Expire(true);
                     break;
 
                 case ArmedState.Miss:
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 9b68b446a4..b1450f61b1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -72,9 +72,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             this.ScaleTo(0.5f).ScaleTo(1f, ANIM_DURATION * 4, Easing.OutElasticHalf);
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
-            base.UpdateStateTransforms(state);
+            base.UpdateHitStateTransforms(state);
 
             switch (state)
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 936bfaeb86..e841473cb1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -142,12 +142,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
-            base.UpdateStateTransforms(state);
+            base.UpdateHitStateTransforms(state);
 
-            using (BeginDelayedSequence(Spinner.Duration, true))
-                this.FadeOut(160);
+            this.FadeOut(160);
 
             // skin change does a rewind of transforms, which will stop the spinning sound from playing if it's currently in playback.
             isSpinning?.TriggerChange();
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
index 1e08e921a6..aadcc420df 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
@@ -58,6 +58,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             });
         }
 
-        protected override void UpdateStateTransforms(ArmedState state) => this.FadeOut(150);
+        protected override void UpdateHitStateTransforms(ArmedState state) => this.FadeOut(150);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 8f268dc1c7..c596fa2c7c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -135,13 +135,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 ApplyResult(r => r.Type = r.Judgement.MinResult);
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
             switch (state)
             {
                 case ArmedState.Hit:
                 case ArmedState.Miss:
-                    this.Delay(HitObject.Duration).FadeOut(100);
+                    this.FadeOut(100);
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index 9d7dcc7218..bf44a80037 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
             switch (state)
             {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index bb42240f25..4a3759794b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -193,7 +193,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             pressHandledThisFrame = false;
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
             Debug.Assert(HitObject.HitWindows != null);
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 8ee4a5db71..ff0a27023d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -215,15 +215,15 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override void UpdateInitialTransforms()
+        protected override void UpdateStartTimeStateTransforms()
         {
-            base.UpdateInitialTransforms();
+            base.UpdateStartTimeStateTransforms();
 
-            using (BeginAbsoluteSequence(HitObject.StartTime - ring_appear_offset, true))
+            using (BeginDelayedSequence(-ring_appear_offset, true))
                 targetRing.ScaleTo(target_ring_scale, 400, Easing.OutQuint);
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateHitStateTransforms(ArmedState state)
         {
             const double transition_duration = 300;
 
@@ -235,12 +235,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
                 case ArmedState.Miss:
                 case ArmedState.Hit:
-                    using (BeginDelayedSequence(HitObject.Duration, true))
-                    {
-                        this.FadeOut(transition_duration, Easing.Out);
-                        bodyContainer.ScaleTo(1.4f, transition_duration);
-                    }
-
+                    this.FadeOut(transition_duration, Easing.Out);
+                    bodyContainer.ScaleTo(1.4f, transition_duration);
                     break;
             }
         }

From 65fb8628e0f4f8d41d15e6fc1f2d4cb21a87bcc4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 17:30:11 +0900
Subject: [PATCH 05933/10326] Use HitStateUpdateTime

---
 .../Objects/Drawables/Pieces/MainCirclePiece.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
index e2345de886..bb92f8afb8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private void updateState(ValueChangedEvent<ArmedState> state)
         {
-            using (BeginAbsoluteSequence(drawableObject.HitObject.StartTime + (drawableObject.Result?.TimeOffset ?? 0), true))
+            using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime, true))
             {
                 glow.FadeOut(400);
 

From f9fc58c45c01c2547f410e7b1564464c3cb834ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 17:30:23 +0900
Subject: [PATCH 05934/10326] Apply same fix to LegacyMainCirclePiece

---
 .../Skinning/LegacyMainCirclePiece.cs         | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 382d6e53cc..a2ae6f4021 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -41,11 +41,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
         private readonly IBindable<int> indexInCurrentCombo = new Bindable<int>();
 
+        [Resolved]
+        private DrawableHitObject drawableObject { get; set; }
+
         [Resolved]
         private ISkinSource skin { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableObject)
+        private void load()
         {
             OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
 
@@ -143,28 +146,31 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             const double legacy_fade_duration = 240;
 
-            switch (state.NewValue)
+            using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime, true))
             {
-                case ArmedState.Hit:
-                    circleSprites.FadeOut(legacy_fade_duration, Easing.Out);
-                    circleSprites.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+                switch (state.NewValue)
+                {
+                    case ArmedState.Hit:
+                        circleSprites.FadeOut(legacy_fade_duration, Easing.Out);
+                        circleSprites.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
 
-                    if (hasNumber)
-                    {
-                        var legacyVersion = skin.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value;
-
-                        if (legacyVersion >= 2.0m)
-                            // legacy skins of version 2.0 and newer only apply very short fade out to the number piece.
-                            hitCircleText.FadeOut(legacy_fade_duration / 4, Easing.Out);
-                        else
+                        if (hasNumber)
                         {
-                            // old skins scale and fade it normally along other pieces.
-                            hitCircleText.FadeOut(legacy_fade_duration, Easing.Out);
-                            hitCircleText.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
-                        }
-                    }
+                            var legacyVersion = skin.GetConfig<LegacySetting, decimal>(LegacySetting.Version)?.Value;
 
-                    break;
+                            if (legacyVersion >= 2.0m)
+                                // legacy skins of version 2.0 and newer only apply very short fade out to the number piece.
+                                hitCircleText.FadeOut(legacy_fade_duration / 4, Easing.Out);
+                            else
+                            {
+                                // old skins scale and fade it normally along other pieces.
+                                hitCircleText.FadeOut(legacy_fade_duration, Easing.Out);
+                                hitCircleText.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+                            }
+                        }
+
+                        break;
+                }
             }
         }
     }

From d19b799f44edafd9b04c362a7e00bc65c38c0c69 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 17:53:03 +0900
Subject: [PATCH 05935/10326] Invert boolean logic

---
 .../Edit/Compose/Components/BlueprintContainer.cs        | 9 +++++----
 .../Screens/Edit/Compose/Components/SelectionHandler.cs  | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index d8f7137fa6..e7da220946 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (beginClickSelection(e)) return true;
+            if (!beginClickSelection(e)) return true;
 
             prepareSelectionMovement();
 
@@ -292,23 +292,24 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Attempts to select any hovered blueprints.
         /// </summary>
         /// <param name="e">The input event that triggered this selection.</param>
+        /// <returns>Whether a selection was performed.</returns>
         private bool beginClickSelection(MouseButtonEvent e)
         {
             Debug.Assert(!clickSelectionBegan);
 
-            bool rightClickHandled = false;
+            bool selectedPerformed = true;
 
             foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
             {
                 if (blueprint.IsHovered)
                 {
-                    rightClickHandled |= SelectionHandler.HandleSelectionRequested(blueprint, e.CurrentState);
+                    selectedPerformed &= SelectionHandler.HandleSelectionRequested(blueprint, e.CurrentState);
                     clickSelectionBegan = true;
                     break;
                 }
             }
 
-            return rightClickHandled;
+            return selectedPerformed;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 5bf6c52e11..d5c83576e2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -219,13 +219,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="state">The input state at the point of selection.</param>
-        /// <returns>Whether right click was handled.</returns>
+        /// <returns>Whether a selection was performed.</returns>
         internal bool HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
         {
             if (state.Keyboard.ShiftPressed && state.Mouse.IsPressed(MouseButton.Right))
             {
                 handleQuickDeletion(blueprint);
-                return true;
+                return false;
             }
 
             if (state.Keyboard.ControlPressed && state.Mouse.IsPressed(MouseButton.Left))
@@ -233,7 +233,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             else
                 ensureSelected(blueprint);
 
-            return false;
+            return true;
         }
 
         private void handleQuickDeletion(SelectionBlueprint blueprint)

From 9a7fcadabc60b0383d72d2933de2df4c38c62e4b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 13:51:46 +0900
Subject: [PATCH 05936/10326] Use BDL for top-level osu! DHOs

---
 .../TestSceneSliderPlacementBlueprint.cs      |  2 +-
 .../TestSceneSlider.cs                        | 18 +++---
 .../Sliders/SliderSelectionBlueprint.cs       |  2 +-
 .../Objects/Drawables/DrawableHitCircle.cs    | 39 ++++--------
 .../Objects/Drawables/DrawableOsuHitObject.cs | 22 ++++++-
 .../Objects/Drawables/DrawableSlider.cs       | 60 ++++++++-----------
 .../Objects/Drawables/DrawableSliderHead.cs   |  5 +-
 .../Objects/Drawables/DrawableSliderRepeat.cs | 25 +++-----
 .../Objects/Drawables/DrawableSliderTail.cs   | 23 +++----
 .../Objects/Drawables/DrawableSliderTick.cs   | 17 +++---
 .../Objects/Drawables/DrawableSpinner.cs      | 48 +++++++--------
 .../Drawables/Pieces/DefaultSpinnerDisc.cs    |  2 +-
 .../Skinning/LegacyNewStyleSpinner.cs         |  3 +-
 .../Objects/Drawables/DrawableHitObject.cs    |  4 +-
 14 files changed, 118 insertions(+), 152 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 49d7d9249c..a452f93676 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -295,7 +295,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         private void assertControlPointPosition(int index, Vector2 position) =>
             AddAssert($"control point {index} at {position}", () => Precision.AlmostEquals(position, getSlider().Path.ControlPoints[index].Position.Value, 1));
 
-        private Slider getSlider() => HitObjectContainer.Count > 0 ? (Slider)((DrawableSlider)HitObjectContainer[0]).HitObject : null;
+        private Slider getSlider() => HitObjectContainer.Count > 0 ? ((DrawableSlider)HitObjectContainer[0]).HitObject : null;
 
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableSlider((Slider)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new SliderPlacementBlueprint();
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index c9e112f76d..c400e2f2ea 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -112,10 +112,10 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new HitSampleInfo { Name = HitSampleInfo.HIT_WHISTLE },
             });
 
-            AddAssert("head samples updated", () => assertSamples(((Slider)slider.HitObject).HeadCircle));
-            AddAssert("tick samples not updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderTick>().All(assertTickSamples));
-            AddAssert("repeat samples updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderRepeat>().All(assertSamples));
-            AddAssert("tail has no samples", () => ((Slider)slider.HitObject).TailCircle.Samples.Count == 0);
+            AddAssert("head samples updated", () => assertSamples(slider.HitObject.HeadCircle));
+            AddAssert("tick samples not updated", () => slider.HitObject.NestedHitObjects.OfType<SliderTick>().All(assertTickSamples));
+            AddAssert("repeat samples updated", () => slider.HitObject.NestedHitObjects.OfType<SliderRepeat>().All(assertSamples));
+            AddAssert("tail has no samples", () => slider.HitObject.TailCircle.Samples.Count == 0);
 
             static bool assertTickSamples(SliderTick tick) => tick.Samples.Single().Name == "slidertick";
 
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 slider = (DrawableSlider)createSlider(repeats: 1);
 
                 for (int i = 0; i < 2; i++)
-                    ((Slider)slider.HitObject).NodeSamples.Add(new List<HitSampleInfo> { new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH } });
+                    slider.HitObject.NodeSamples.Add(new List<HitSampleInfo> { new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH } });
 
                 Add(slider);
             });
@@ -147,10 +147,10 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new HitSampleInfo { Name = HitSampleInfo.HIT_WHISTLE },
             });
 
-            AddAssert("head samples not updated", () => assertSamples(((Slider)slider.HitObject).HeadCircle));
-            AddAssert("tick samples not updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderTick>().All(assertTickSamples));
-            AddAssert("repeat samples not updated", () => ((Slider)slider.HitObject).NestedHitObjects.OfType<SliderRepeat>().All(assertSamples));
-            AddAssert("tail has no samples", () => ((Slider)slider.HitObject).TailCircle.Samples.Count == 0);
+            AddAssert("head samples not updated", () => assertSamples(slider.HitObject.HeadCircle));
+            AddAssert("tick samples not updated", () => slider.HitObject.NestedHitObjects.OfType<SliderTick>().All(assertTickSamples));
+            AddAssert("repeat samples not updated", () => slider.HitObject.NestedHitObjects.OfType<SliderRepeat>().All(assertSamples));
+            AddAssert("tail has no samples", () => slider.HitObject.TailCircle.Samples.Count == 0);
 
             static bool assertTickSamples(SliderTick tick) => tick.Samples.Single().Name == "slidertick";
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index d3fb5defae..f851c7bfc9 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         protected override void OnSelected()
         {
-            AddInternal(ControlPointVisualiser = new PathControlPointVisualiser((Slider)slider.HitObject, true)
+            AddInternal(ControlPointVisualiser = new PathControlPointVisualiser(slider.HitObject, true)
             {
                 RemoveControlPointsRequested = removeControlPoints
             });
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index b5ac26c824..0c26e2b52f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
@@ -21,28 +20,25 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableHitCircle : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
     {
-        public ApproachCircle ApproachCircle { get; }
-
-        private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
-        private readonly IBindable<int> stackHeightBindable = new Bindable<int>();
-        private readonly IBindable<float> scaleBindable = new BindableFloat();
-
         public OsuAction? HitAction => HitArea.HitAction;
-
-        public readonly HitReceptor HitArea;
-        public readonly SkinnableDrawable CirclePiece;
-        private readonly Container scaleContainer;
-
         protected virtual OsuSkinComponents CirclePieceComponent => OsuSkinComponents.HitCircle;
 
+        public ApproachCircle ApproachCircle { get; private set; }
+        public HitReceptor HitArea { get; private set; }
+        public SkinnableDrawable CirclePiece { get; private set; }
+
+        private Container scaleContainer;
         private InputManager inputManager;
 
         public DrawableHitCircle(HitCircle h)
             : base(h)
         {
-            Origin = Anchor.Centre;
+        }
 
-            Position = HitObject.StackedPosition;
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Origin = Anchor.Centre;
 
             InternalChildren = new Drawable[]
             {
@@ -75,19 +71,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             };
 
             Size = HitArea.DrawSize;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            positionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
-            stackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
-            scaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
-
-            positionBindable.BindTo(HitObject.PositionBindable);
-            stackHeightBindable.BindTo(HitObject.StackHeightBindable);
-            scaleBindable.BindTo(HitObject.ScaleBindable);
 
+            PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
+            StackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
+            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
             AccentColour.BindValueChanged(accent => ApproachCircle.Colour = accent.NewValue, true);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 45c664ba3b..c83bdf17d5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -2,18 +2,24 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 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 osu.Game.Rulesets.Osu.UI;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableOsuHitObject : DrawableHitObject<OsuHitObject>
     {
-        private readonly ShakeContainer shakeContainer;
+        public readonly IBindable<Vector2> PositionBindable = new Bindable<Vector2>();
+        public readonly IBindable<int> StackHeightBindable = new Bindable<int>();
+        public readonly IBindable<float> ScaleBindable = new BindableFloat();
+        public readonly IBindable<int> IndexInCurrentComboBindable = new Bindable<int>();
 
         // Must be set to update IsHovered as it's used in relax mdo to detect osu hit objects.
         public override bool HandlePositionalInput => true;
@@ -26,16 +32,28 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         public Func<DrawableHitObject, double, bool> CheckHittable;
 
+        private ShakeContainer shakeContainer;
+
         protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
         {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Alpha = 0;
+
             base.AddInternal(shakeContainer = new ShakeContainer
             {
                 ShakeDuration = 30,
                 RelativeSizeAxes = Axes.Both
             });
 
-            Alpha = 0;
+            IndexInCurrentComboBindable.BindTo(HitObject.IndexInCurrentComboBindable);
+            PositionBindable.BindTo(HitObject.PositionBindable);
+            StackHeightBindable.BindTo(HitObject.StackHeightBindable);
+            ScaleBindable.BindTo(HitObject.ScaleBindable);
         }
 
         // Forward all internal management to shakeContainer.
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index b00d12983d..b743d2e4d0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -20,62 +20,50 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSlider : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
     {
+        public new Slider HitObject => (Slider)base.HitObject;
+
         public DrawableSliderHead HeadCircle => headContainer.Child;
         public DrawableSliderTail TailCircle => tailContainer.Child;
 
-        public readonly SliderBall Ball;
-        public readonly SkinnableDrawable Body;
+        public SliderBall Ball { get; private set; }
+        public SkinnableDrawable Body { get; private set; }
 
         public override bool DisplayResult => false;
 
         private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody;
 
-        private readonly Container<DrawableSliderHead> headContainer;
-        private readonly Container<DrawableSliderTail> tailContainer;
-        private readonly Container<DrawableSliderTick> tickContainer;
-        private readonly Container<DrawableSliderRepeat> repeatContainer;
-
-        private readonly Slider slider;
-
-        private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
-        private readonly IBindable<int> stackHeightBindable = new Bindable<int>();
-        private readonly IBindable<float> scaleBindable = new BindableFloat();
+        private Container<DrawableSliderHead> headContainer;
+        private Container<DrawableSliderTail> tailContainer;
+        private Container<DrawableSliderTick> tickContainer;
+        private Container<DrawableSliderRepeat> repeatContainer;
 
         public DrawableSlider(Slider s)
             : base(s)
         {
-            slider = s;
-
-            Position = s.StackedPosition;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             InternalChildren = new Drawable[]
             {
                 Body = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderBody), _ => new DefaultSliderBody(), confineMode: ConfineMode.NoScaling),
                 tailContainer = new Container<DrawableSliderTail> { RelativeSizeAxes = Axes.Both },
                 tickContainer = new Container<DrawableSliderTick> { RelativeSizeAxes = Axes.Both },
                 repeatContainer = new Container<DrawableSliderRepeat> { RelativeSizeAxes = Axes.Both },
-                Ball = new SliderBall(s, this)
+                Ball = new SliderBall(HitObject, this)
                 {
                     GetInitialHitAction = () => HeadCircle.HitAction,
                     BypassAutoSizeAxes = Axes.Both,
-                    Scale = new Vector2(s.Scale),
                     AlwaysPresent = true,
                     Alpha = 0
                 },
                 headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both },
             };
-        }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            positionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
-            stackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
-            scaleBindable.BindValueChanged(scale => Ball.Scale = new Vector2(scale.NewValue));
-
-            positionBindable.BindTo(HitObject.PositionBindable);
-            stackHeightBindable.BindTo(HitObject.StackHeightBindable);
-            scaleBindable.BindTo(HitObject.ScaleBindable);
+            PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
+            StackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
+            ScaleBindable.BindValueChanged(scale => Ball.Scale = new Vector2(scale.NewValue), true);
 
             AccentColour.BindValueChanged(colour =>
             {
@@ -162,20 +150,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             switch (hitObject)
             {
                 case SliderTailCircle tail:
-                    return new DrawableSliderTail(slider, tail);
+                    return new DrawableSliderTail(tail);
 
                 case SliderHeadCircle head:
-                    return new DrawableSliderHead(slider, head)
+                    return new DrawableSliderHead(HitObject, head)
                     {
                         OnShake = Shake,
                         CheckHittable = (d, t) => CheckHittable?.Invoke(d, t) ?? true
                     };
 
                 case SliderTick tick:
-                    return new DrawableSliderTick(tick) { Position = tick.Position - slider.Position };
+                    return new DrawableSliderTick(tick) { Position = tick.Position - HitObject.Position };
 
                 case SliderRepeat repeat:
-                    return new DrawableSliderRepeat(repeat, this) { Position = repeat.Position - slider.Position };
+                    return new DrawableSliderRepeat(repeat, this) { Position = repeat.Position - HitObject.Position };
             }
 
             return base.CreateNestedHitObject(hitObject);
@@ -200,14 +188,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 // keep the sliding sample playing at the current tracking position
                 slidingSample.Balance.Value = CalculateSamplePlaybackBalance(Ball.X / OsuPlayfield.BASE_SIZE.X);
 
-            double completionProgress = Math.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
+            double completionProgress = Math.Clamp((Time.Current - HitObject.StartTime) / HitObject.Duration, 0, 1);
 
             Ball.UpdateProgress(completionProgress);
             sliderBody?.UpdateProgress(completionProgress);
 
             foreach (DrawableHitObject hitObject in NestedHitObjects)
             {
-                if (hitObject is ITrackSnaking s) s.UpdateSnakingPosition(slider.Path.PositionAt(sliderBody?.SnakedStart ?? 0), slider.Path.PositionAt(sliderBody?.SnakedEnd ?? 0));
+                if (hitObject is ITrackSnaking s) s.UpdateSnakingPosition(HitObject.Path.PositionAt(sliderBody?.SnakedStart ?? 0), HitObject.Path.PositionAt(sliderBody?.SnakedEnd ?? 0));
                 if (hitObject is IRequireTracking t) t.Tracking = Ball.Tracking;
             }
 
@@ -239,7 +227,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (userTriggered || Time.Current < slider.EndTime)
+            if (userTriggered || Time.Current < HitObject.EndTime)
                 return;
 
             ApplyResult(r => r.Type = r.Judgement.MaxResult);
@@ -260,7 +248,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Ball.FadeIn();
             Ball.ScaleTo(HitObject.Scale);
 
-            using (BeginDelayedSequence(slider.Duration, true))
+            using (BeginDelayedSequence(HitObject.Duration, true))
             {
                 const float fade_out_time = 450;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 04f563eeec..49ed9f12e3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -5,13 +5,11 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Types;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSliderHead : DrawableHitCircle
     {
-        private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
         protected override OsuSkinComponents CirclePieceComponent => OsuSkinComponents.SliderHeadHitCircle;
@@ -27,10 +25,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            positionBindable.BindTo(HitObject.PositionBindable);
             pathVersion.BindTo(slider.Path.Version);
 
-            positionBindable.BindValueChanged(_ => updatePosition());
+            PositionBindable.BindValueChanged(_ => updatePosition());
             pathVersion.BindValueChanged(_ => updatePosition(), true);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 2a88f11f69..b57bb8dbbf 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -4,7 +4,6 @@
 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.Framework.Utils;
@@ -22,9 +21,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private double animDuration;
 
-        private readonly Drawable scaleContainer;
-
-        public readonly Drawable CirclePiece;
+        public Drawable CirclePiece { get; private set; }
+        private Drawable scaleContainer;
+        private ReverseArrowPiece arrow;
 
         public override bool DisplayResult => false;
 
@@ -33,10 +32,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             this.sliderRepeat = sliderRepeat;
             this.drawableSlider = drawableSlider;
+        }
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
-
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             Origin = Anchor.Centre;
+            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 
             InternalChild = scaleContainer = new Container
             {
@@ -50,15 +52,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     arrow = new ReverseArrowPiece(),
                 }
             };
-        }
 
-        private readonly IBindable<float> scaleBindable = new BindableFloat();
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            scaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
-            scaleBindable.BindTo(HitObject.ScaleBindable);
+            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
@@ -100,8 +95,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private bool hasRotation;
 
-        private readonly ReverseArrowPiece arrow;
-
         public void UpdateSnakingPosition(Vector2 start, Vector2 end)
         {
             // When the repeat is hit, the arrow should fade out on spot rather than following the slider
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index f5bcecccdf..7e30f4e132 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -23,18 +22,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public bool Tracking { get; set; }
 
-        private readonly IBindable<float> scaleBindable = new BindableFloat();
+        private SkinnableDrawable circlePiece;
+        private Container scaleContainer;
 
-        private readonly SkinnableDrawable circlePiece;
-
-        private readonly Container scaleContainer;
-
-        public DrawableSliderTail(Slider slider, SliderTailCircle tailCircle)
+        public DrawableSliderTail(SliderTailCircle tailCircle)
             : base(tailCircle)
         {
             this.tailCircle = tailCircle;
-            Origin = Anchor.Centre;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Origin = Anchor.Centre;
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 
             InternalChildren = new Drawable[]
@@ -51,13 +51,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     }
                 },
             };
-        }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            scaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
-            scaleBindable.BindTo(HitObject.ScaleBindable);
+            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 9b68b446a4..81d12f3432 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -2,7 +2,6 @@
 // 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.Rulesets.Objects.Drawables;
 using osuTK;
@@ -23,10 +22,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => false;
 
-        private readonly SkinnableDrawable scaleContainer;
+        private SkinnableDrawable scaleContainer;
 
         public DrawableSliderTick(SliderTick sliderTick)
             : base(sliderTick)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
             Origin = Anchor.Centre;
@@ -49,15 +53,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
-        }
 
-        private readonly IBindable<float> scaleBindable = new BindableFloat();
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            scaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
-            scaleBindable.BindTo(HitObject.ScaleBindable);
+            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 936bfaeb86..50ea45c378 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -16,34 +16,33 @@ using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSpinner : DrawableOsuHitObject
     {
-        protected readonly Spinner Spinner;
+        public new Spinner HitObject => (Spinner)base.HitObject;
 
-        private readonly Container<DrawableSpinnerTick> ticks;
+        public SpinnerRotationTracker RotationTracker { get; private set; }
+        public SpinnerSpmCounter SpmCounter { get; private set; }
 
-        public readonly SpinnerRotationTracker RotationTracker;
-        public readonly SpinnerSpmCounter SpmCounter;
-        private readonly SpinnerBonusDisplay bonusDisplay;
-
-        private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
+        private Container<DrawableSpinnerTick> ticks;
+        private SpinnerBonusDisplay bonusDisplay;
 
+        private Bindable<bool> isSpinning;
         private bool spinnerFrequencyModulate;
 
         public DrawableSpinner(Spinner s)
             : base(s)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
         {
             Origin = Anchor.Centre;
-            Position = s.Position;
-
             RelativeSizeAxes = Axes.Both;
 
-            Spinner = s;
-
             InternalChildren = new Drawable[]
             {
                 ticks = new Container<DrawableSpinnerTick>(),
@@ -55,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Children = new Drawable[]
                     {
                         new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBody), _ => new DefaultSpinnerDisc()),
-                        RotationTracker = new SpinnerRotationTracker(Spinner)
+                        RotationTracker = new SpinnerRotationTracker(HitObject)
                     }
                 },
                 SpmCounter = new SpinnerSpmCounter
@@ -72,9 +71,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Y = -120,
                 }
             };
-        }
 
-        private Bindable<bool> isSpinning;
+            PositionBindable.BindValueChanged(pos => Position = pos.NewValue, true);
+        }
 
         protected override void LoadComplete()
         {
@@ -146,7 +145,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateStateTransforms(state);
 
-            using (BeginDelayedSequence(Spinner.Duration, true))
+            using (BeginDelayedSequence(HitObject.Duration, true))
                 this.FadeOut(160);
 
             // skin change does a rewind of transforms, which will stop the spinning sound from playing if it's currently in playback.
@@ -173,13 +172,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             return base.CreateNestedHitObject(hitObject);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            positionBindable.BindValueChanged(pos => Position = pos.NewValue);
-            positionBindable.BindTo(HitObject.PositionBindable);
-        }
-
         protected override void ApplySkin(ISkinSource skin, bool allowFallback)
         {
             base.ApplySkin(skin, allowFallback);
@@ -193,12 +185,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             get
             {
-                if (Spinner.SpinsRequired == 0)
+                if (HitObject.SpinsRequired == 0)
                     // some spinners are so short they can't require an integer spin count.
                     // these become implicitly hit.
                     return 1;
 
-                return Math.Clamp(RotationTracker.RateAdjustedRotation / 360 / Spinner.SpinsRequired, 0, 1);
+                return Math.Clamp(RotationTracker.RateAdjustedRotation / 360 / HitObject.SpinsRequired, 0, 1);
             }
         }
 
@@ -208,7 +200,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             RotationTracker.Complete.Value = Progress >= 1;
 
-            if (userTriggered || Time.Current < Spinner.EndTime)
+            if (userTriggered || Time.Current < HitObject.EndTime)
                 return;
 
             // Trigger a miss result for remaining ticks to avoid infinite gameplay.
@@ -223,7 +215,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     r.Type = HitResult.Ok;
                 else if (Progress > .75)
                     r.Type = HitResult.Meh;
-                else if (Time.Current >= Spinner.EndTime)
+                else if (Time.Current >= HitObject.EndTime)
                     r.Type = r.Judgement.MinResult;
             });
         }
@@ -275,7 +267,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 {
                     tick.TriggerResult(true);
                     if (tick is DrawableSpinnerBonusTick)
-                        bonusDisplay.SetBonusCount(spins - Spinner.SpinsRequired);
+                        bonusDisplay.SetBonusCount(spins - HitObject.SpinsRequired);
                 }
 
                 wholeSpins++;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index e855317544..17a734f0f4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         private void load(OsuColour colours, DrawableHitObject drawableHitObject)
         {
             drawableSpinner = (DrawableSpinner)drawableHitObject;
-            spinner = (Spinner)drawableSpinner.HitObject;
+            spinner = drawableSpinner.HitObject;
 
             normalColour = colours.BlueDark;
             completeColour = colours.YellowLight;
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 56b5571ce1..018dc78ddb 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
@@ -79,7 +78,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             if (!(drawableHitObject is DrawableSpinner))
                 return;
 
-            var spinner = (Spinner)drawableSpinner.HitObject;
+            var spinner = drawableSpinner.HitObject;
 
             using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
                 this.FadeOut();
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 1ef6c8c207..cd31e468af 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -125,14 +125,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
             Result = CreateResult(judgement);
             if (Result == null)
                 throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
-
-            LoadSamples();
         }
 
         protected override void LoadAsyncComplete()
         {
             base.LoadAsyncComplete();
 
+            LoadSamples();
+
             HitObject.DefaultsApplied += onDefaultsApplied;
 
             startTimeBindable = HitObject.StartTimeBindable.GetBoundCopy();

From eed9894d3a0bb0d4b68282a171fb286e2d9b176b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 13:58:41 +0900
Subject: [PATCH 05937/10326] Remove usage of case-when (caught me off-gaurd)

---
 .../Blueprints/Sliders/SliderSelectionBlueprint.cs    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 59b087f68f..1644d5aa4b 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -122,9 +122,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     rightClickPosition = e.MouseDownPosition;
                     return false; // Allow right click to be handled by context menu
 
-                case MouseButton.Left when e.ControlPressed && IsSelected:
-                    placementControlPointIndex = addControlPoint(e.MousePosition);
-                    return true; // Stop input from being handled and modifying the selection
+                case MouseButton.Left:
+                    if (e.ControlPressed && IsSelected)
+                    {
+                        placementControlPointIndex = addControlPoint(e.MousePosition);
+                        return true; // Stop input from being handled and modifying the selection
+                    }
+
+                    break;
             }
 
             return false;

From 400fcedf0ff3e7a7de3c73731320124cca8484d1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 14:40:48 +0900
Subject: [PATCH 05938/10326] Remove stored hitobject references from skinnable
 components

---
 .../Objects/Drawables/DrawableSlider.cs       |  6 ++++-
 .../Objects/Drawables/DrawableSpinner.cs      |  2 +-
 .../Objects/Drawables/Pieces/CirclePiece.cs   |  2 +-
 .../Drawables/Pieces/DefaultSpinnerDisc.cs    | 27 +++++++++----------
 .../Drawables/Pieces/MainCirclePiece.cs       |  4 +--
 .../Drawables/Pieces/PlaySliderBody.cs        | 13 +++------
 .../Objects/Drawables/Pieces/SliderBall.cs    | 12 ++++-----
 .../Drawables/Pieces/SnakingSliderBody.cs     | 24 ++++++++++-------
 .../Pieces/SpinnerRotationTracker.cs          | 10 +++----
 .../Skinning/LegacyMainCirclePiece.cs         |  5 ++--
 .../Skinning/LegacyNewStyleSpinner.cs         | 16 +++++------
 .../Skinning/LegacyOldStyleSpinner.cs         | 10 +++----
 .../Skinning/LegacySliderBall.cs              |  3 +--
 13 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index b743d2e4d0..8008d87c6d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody;
 
+        public readonly IBindable<int> PathVersion = new Bindable<int>();
+
         private Container<DrawableSliderHead> headContainer;
         private Container<DrawableSliderTail> tailContainer;
         private Container<DrawableSliderTick> tickContainer;
@@ -51,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 tailContainer = new Container<DrawableSliderTail> { RelativeSizeAxes = Axes.Both },
                 tickContainer = new Container<DrawableSliderTick> { RelativeSizeAxes = Axes.Both },
                 repeatContainer = new Container<DrawableSliderRepeat> { RelativeSizeAxes = Axes.Both },
-                Ball = new SliderBall(HitObject, this)
+                Ball = new SliderBall(this)
                 {
                     GetInitialHitAction = () => HeadCircle.HitAction,
                     BypassAutoSizeAxes = Axes.Both,
@@ -61,6 +63,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both },
             };
 
+            PathVersion.BindTo(HitObject.Path.Version);
+
             PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
             StackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
             ScaleBindable.BindValueChanged(scale => Ball.Scale = new Vector2(scale.NewValue), true);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 50ea45c378..8dd63018e2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Children = new Drawable[]
                     {
                         new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBody), _ => new DefaultSpinnerDisc()),
-                        RotationTracker = new SpinnerRotationTracker(HitObject)
+                        RotationTracker = new SpinnerRotationTracker(this)
                     }
                 },
                 SpmCounter = new SpinnerSpmCounter
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
index e95cdc7ee3..c455c66e8d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     Origin = Anchor.Centre,
                     Texture = textures.Get(@"Gameplay/osu/disc"),
                 },
-                new TrianglesPiece((int)drawableHitObject.HitObject.StartTime)
+                new TrianglesPiece(drawableHitObject.GetHashCode())
                 {
                     RelativeSizeAxes = Axes.Both,
                     Blending = BlendingParameters.Additive,
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 17a734f0f4..4c682d96ce 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -18,8 +18,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
     {
         private DrawableSpinner drawableSpinner;
 
-        private Spinner spinner;
-
         private const float initial_scale = 1.3f;
         private const float idle_alpha = 0.2f;
         private const float tracking_alpha = 0.4f;
@@ -52,7 +50,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         private void load(OsuColour colours, DrawableHitObject drawableHitObject)
         {
             drawableSpinner = (DrawableSpinner)drawableHitObject;
-            spinner = drawableSpinner.HitObject;
 
             normalColour = colours.BlueDark;
             completeColour = colours.YellowLight;
@@ -130,18 +127,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             if (!(drawableHitObject is DrawableSpinner))
                 return;
 
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+            using (BeginAbsoluteSequence(drawableSpinner.HitObject.StartTime - drawableSpinner.HitObject.TimePreempt, true))
             {
                 this.ScaleTo(initial_scale);
                 this.RotateTo(0);
 
-                using (BeginDelayedSequence(spinner.TimePreempt / 2, true))
+                using (BeginDelayedSequence(drawableSpinner.HitObject.TimePreempt / 2, true))
                 {
                     // constant ambient rotation to give the spinner "spinning" character.
-                    this.RotateTo((float)(25 * spinner.Duration / 2000), spinner.TimePreempt + spinner.Duration);
+                    this.RotateTo((float)(25 * drawableSpinner.HitObject.Duration / 2000), drawableSpinner.HitObject.TimePreempt + drawableSpinner.HitObject.Duration);
                 }
 
-                using (BeginDelayedSequence(spinner.TimePreempt + spinner.Duration + drawableHitObject.Result.TimeOffset, true))
+                using (BeginDelayedSequence(drawableSpinner.HitObject.TimePreempt + drawableSpinner.HitObject.Duration + drawableHitObject.Result.TimeOffset, true))
                 {
                     switch (state)
                     {
@@ -157,26 +154,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 }
             }
 
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+            using (BeginAbsoluteSequence(drawableSpinner.HitObject.StartTime - drawableSpinner.HitObject.TimePreempt, true))
             {
                 centre.ScaleTo(0);
                 mainContainer.ScaleTo(0);
 
-                using (BeginDelayedSequence(spinner.TimePreempt / 2, true))
+                using (BeginDelayedSequence(drawableSpinner.HitObject.TimePreempt / 2, true))
                 {
-                    centre.ScaleTo(0.3f, spinner.TimePreempt / 4, Easing.OutQuint);
-                    mainContainer.ScaleTo(0.2f, spinner.TimePreempt / 4, Easing.OutQuint);
+                    centre.ScaleTo(0.3f, drawableSpinner.HitObject.TimePreempt / 4, Easing.OutQuint);
+                    mainContainer.ScaleTo(0.2f, drawableSpinner.HitObject.TimePreempt / 4, Easing.OutQuint);
 
-                    using (BeginDelayedSequence(spinner.TimePreempt / 2, true))
+                    using (BeginDelayedSequence(drawableSpinner.HitObject.TimePreempt / 2, true))
                     {
-                        centre.ScaleTo(0.5f, spinner.TimePreempt / 2, Easing.OutQuint);
-                        mainContainer.ScaleTo(1, spinner.TimePreempt / 2, Easing.OutQuint);
+                        centre.ScaleTo(0.5f, drawableSpinner.HitObject.TimePreempt / 2, Easing.OutQuint);
+                        mainContainer.ScaleTo(1, drawableSpinner.HitObject.TimePreempt / 2, Easing.OutQuint);
                     }
                 }
             }
 
             // transforms we have from completing the spinner will be rolled back, so reapply immediately.
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+            using (BeginAbsoluteSequence(drawableSpinner.HitObject.StartTime - drawableSpinner.HitObject.TimePreempt, true))
                 updateComplete(state == ArmedState.Hit, 0);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
index cb3787a493..d2f4b71f19 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableObject)
         {
-            OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
+            var drawableOsuObject = (DrawableOsuHitObject)drawableObject;
 
             state.BindTo(drawableObject.State);
             state.BindValueChanged(updateState, true);
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 circle.Colour = colour.NewValue;
             }, true);
 
-            indexInCurrentCombo.BindTo(osuObject.IndexInCurrentComboBindable);
+            indexInCurrentCombo.BindTo(drawableOsuObject.IndexInCurrentComboBindable);
             indexInCurrentCombo.BindValueChanged(index => number.Text = (index.NewValue + 1).ToString(), true);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/PlaySliderBody.cs
index cedf2f6e09..29dff53f54 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/PlaySliderBody.cs
@@ -17,23 +17,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         private IBindable<int> pathVersion;
         private IBindable<Color4> accentColour;
 
-        [Resolved]
-        private DrawableHitObject drawableObject { get; set; }
-
         [Resolved(CanBeNull = true)]
         private OsuRulesetConfigManager config { get; set; }
 
-        private Slider slider;
-
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        private void load(ISkinSource skin, DrawableHitObject drawableObject)
         {
-            slider = (Slider)drawableObject.HitObject;
+            var drawableSlider = (DrawableSlider)drawableObject;
 
-            scaleBindable = slider.ScaleBindable.GetBoundCopy();
+            scaleBindable = drawableSlider.ScaleBindable.GetBoundCopy();
             scaleBindable.BindValueChanged(scale => PathRadius = OsuHitObject.OBJECT_RADIUS * scale.NewValue, true);
 
-            pathVersion = slider.Path.Version.GetBoundCopy();
+            pathVersion = drawableSlider.PathVersion.GetBoundCopy();
             pathVersion.BindValueChanged(_ => Refresh());
 
             accentColour = drawableObject.AccentColour.GetBoundCopy();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index 07dc6021c9..c5bf790377 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -30,15 +30,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             set => ball.Colour = value;
         }
 
-        private readonly Slider slider;
         private readonly Drawable followCircle;
         private readonly DrawableSlider drawableSlider;
         private readonly Drawable ball;
 
-        public SliderBall(Slider slider, DrawableSlider drawableSlider = null)
+        public SliderBall(DrawableSlider drawableSlider)
         {
             this.drawableSlider = drawableSlider;
-            this.slider = slider;
 
             Origin = Anchor.Centre;
 
@@ -133,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             if (headCircleHitAction == null)
                 timeToAcceptAnyKeyAfter = null;
 
-            var actions = drawableSlider?.OsuActionInputManager?.PressedActions;
+            var actions = drawableSlider.OsuActionInputManager?.PressedActions;
 
             // if the head circle was hit with a specific key, tracking should only occur while that key is pressed.
             if (headCircleHitAction != null && timeToAcceptAnyKeyAfter == null)
@@ -147,7 +145,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             Tracking =
                 // in valid time range
-                Time.Current >= slider.StartTime && Time.Current < slider.EndTime &&
+                Time.Current >= drawableSlider.HitObject.StartTime && Time.Current < drawableSlider.HitObject.EndTime &&
                 // in valid position range
                 lastScreenSpaceMousePosition.HasValue && followCircle.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action
@@ -172,9 +170,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         public void UpdateProgress(double completionProgress)
         {
-            var newPos = slider.CurvePositionAt(completionProgress);
+            var newPos = drawableSlider.HitObject.CurvePositionAt(completionProgress);
 
-            var diff = lastPosition.HasValue ? lastPosition.Value - newPos : newPos - slider.CurvePositionAt(completionProgress + 0.01f);
+            var diff = lastPosition.HasValue ? lastPosition.Value - newPos : newPos - drawableSlider.HitObject.CurvePositionAt(completionProgress + 0.01f);
             if (diff == Vector2.Zero)
                 return;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
index e24fa865ad..2fefc2e08e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
@@ -51,27 +51,30 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         /// </summary>
         private Vector2 snakedPathOffset;
 
-        private Slider slider;
+        private DrawableSlider drawableSlider;
 
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableObject)
         {
-            slider = (Slider)drawableObject.HitObject;
+            drawableSlider = (DrawableSlider)drawableObject;
 
             Refresh();
         }
 
         public void UpdateProgress(double completionProgress)
         {
-            var span = slider.SpanAt(completionProgress);
-            var spanProgress = slider.ProgressAt(completionProgress);
+            if (drawableSlider == null)
+                return;
+
+            var span = drawableSlider.HitObject.SpanAt(completionProgress);
+            var spanProgress = drawableSlider.HitObject.ProgressAt(completionProgress);
 
             double start = 0;
-            double end = SnakingIn.Value ? Math.Clamp((Time.Current - (slider.StartTime - slider.TimePreempt)) / (slider.TimePreempt / 3), 0, 1) : 1;
+            double end = SnakingIn.Value ? Math.Clamp((Time.Current - (drawableSlider.HitObject.StartTime - drawableSlider.HitObject.TimePreempt)) / (drawableSlider.HitObject.TimePreempt / 3), 0, 1) : 1;
 
-            if (span >= slider.SpanCount() - 1)
+            if (span >= drawableSlider.HitObject.SpanCount() - 1)
             {
-                if (Math.Min(span, slider.SpanCount() - 1) % 2 == 1)
+                if (Math.Min(span, drawableSlider.HitObject.SpanCount() - 1) % 2 == 1)
                 {
                     start = 0;
                     end = SnakingOut.Value ? spanProgress : 1;
@@ -87,8 +90,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         public void Refresh()
         {
+            if (drawableSlider == null)
+                return;
+
             // Generate the entire curve
-            slider.Path.GetPathToProgress(CurrentCurve, 0, 1);
+            drawableSlider.HitObject.Path.GetPathToProgress(CurrentCurve, 0, 1);
             SetVertices(CurrentCurve);
 
             // Force the body to be the final path size to avoid excessive autosize computations
@@ -132,7 +138,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             SnakedStart = p0;
             SnakedEnd = p1;
 
-            slider.Path.GetPathToProgress(CurrentCurve, p0, p1);
+            drawableSlider.HitObject.Path.GetPathToProgress(CurrentCurve, p0, p1);
 
             SetVertices(CurrentCurve);
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
index 05ed38d241..910899c307 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
@@ -15,13 +15,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     public class SpinnerRotationTracker : CircularContainer
     {
-        private readonly Spinner spinner;
-
         public override bool IsPresent => true; // handle input when hidden
 
-        public SpinnerRotationTracker(Spinner s)
+        private readonly DrawableSpinner drawableSpinner;
+
+        public SpinnerRotationTracker(DrawableSpinner drawableSpinner)
         {
-            spinner = s;
+            this.drawableSpinner = drawableSpinner;
 
             RelativeSizeAxes = Axes.Both;
         }
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         /// <summary>
         /// Whether currently in the correct time range to allow spinning.
         /// </summary>
-        private bool isSpinnableTime => spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
+        private bool isSpinnableTime => drawableSpinner.HitObject.StartTime <= Time.Current && drawableSpinner.HitObject.EndTime > Time.Current;
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 382d6e53cc..418bf124ab 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -47,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableObject)
         {
-            OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
+            var drawableOsuObject = (DrawableOsuHitObject)drawableObject;
 
             bool allowFallback = false;
 
@@ -111,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             state.BindTo(drawableObject.State);
             accentColour.BindTo(drawableObject.AccentColour);
-            indexInCurrentCombo.BindTo(osuObject.IndexInCurrentComboBindable);
+            indexInCurrentCombo.BindTo(drawableOsuObject.IndexInCurrentComboBindable);
 
             Texture getTextureWithFallback(string name)
             {
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 018dc78ddb..f07b1038fb 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -75,23 +75,21 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
-            if (!(drawableHitObject is DrawableSpinner))
+            if (!(drawableHitObject is DrawableSpinner spinner))
                 return;
 
-            var spinner = drawableSpinner.HitObject;
-
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+            using (BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimePreempt, true))
                 this.FadeOut();
 
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))
-                this.FadeInFromZero(spinner.TimeFadeIn / 2);
+            using (BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimeFadeIn / 2, true))
+                this.FadeInFromZero(spinner.HitObject.TimeFadeIn / 2);
 
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+            using (BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimePreempt, true))
             {
                 fixedMiddle.FadeColour(Color4.White);
 
-                using (BeginDelayedSequence(spinner.TimePreempt, true))
-                    fixedMiddle.FadeColour(Color4.Red, spinner.Duration);
+                using (BeginDelayedSequence(spinner.HitObject.TimePreempt, true))
+                    fixedMiddle.FadeColour(Color4.Red, spinner.HitObject.Duration);
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 7b0d7acbbc..5fcd8e06b1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -94,16 +94,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
-            if (!(drawableHitObject is DrawableSpinner))
+            if (!(drawableHitObject is DrawableSpinner spinner))
                 return;
 
-            var spinner = drawableSpinner.HitObject;
-
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+            using (BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimePreempt, true))
                 this.FadeOut();
 
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))
-                this.FadeInFromZero(spinner.TimeFadeIn / 2);
+            using (BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimeFadeIn / 2, true))
+                this.FadeInFromZero(spinner.HitObject.TimeFadeIn / 2);
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
index 25ab96445a..836069013d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
@@ -26,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, DrawableHitObject drawableObject)
+        private void load(ISkinSource skin)
         {
             var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
 

From 9ac822beed8432bb5cb00ce9b4fe6aac419bf9a7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 14:49:15 +0900
Subject: [PATCH 05939/10326] Remove AccentColour binding from judgement
 lighting

---
 .../Objects/Drawables/DrawableOsuJudgement.cs | 22 ++-------
 .../Objects/Drawables/SkinnableLighting.cs    | 48 +++++++++++++++++++
 2 files changed, 51 insertions(+), 19 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/SkinnableLighting.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 49535e7fff..98898ce1b4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -2,22 +2,17 @@
 // 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.Configuration;
 using osuTK;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Skinning;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableOsuJudgement : DrawableJudgement
     {
-        protected SkinnableSprite Lighting;
-
-        private Bindable<Color4> lightingColour;
+        protected SkinnableLighting Lighting { get; private set; }
 
         [Resolved]
         private OsuConfigManager config { get; set; }
@@ -34,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(Lighting = new SkinnableSprite("lighting")
+            AddInternal(Lighting = new SkinnableLighting
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -59,19 +54,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.PrepareForUse();
 
-            lightingColour?.UnbindAll();
-
             Lighting.ResetAnimation();
-
-            if (JudgedObject != null)
-            {
-                lightingColour = JudgedObject.AccentColour.GetBoundCopy();
-                lightingColour.BindValueChanged(colour => Lighting.Colour = Result.IsHit ? colour.NewValue : Color4.Transparent, true);
-            }
-            else
-            {
-                Lighting.Colour = Color4.White;
-            }
+            Lighting.SetColourFrom(JudgedObject, Result);
         }
 
         private double fadeOutDelay;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SkinnableLighting.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SkinnableLighting.cs
new file mode 100644
index 0000000000..02dc770285
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SkinnableLighting.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.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
+{
+    public class SkinnableLighting : SkinnableSprite
+    {
+        private DrawableHitObject targetObject;
+        private JudgementResult targetResult;
+
+        public SkinnableLighting()
+            : base("lighting")
+        {
+        }
+
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+            updateColour();
+        }
+
+        /// <summary>
+        /// Updates the lighting colour from a given hitobject and result.
+        /// </summary>
+        /// <param name="targetObject">The <see cref="DrawableHitObject"/> that's been judged.</param>
+        /// <param name="targetResult">The <see cref="JudgementResult"/> that <paramref name="targetObject"/> was judged with.</param>
+        public void SetColourFrom(DrawableHitObject targetObject, JudgementResult targetResult)
+        {
+            this.targetObject = targetObject;
+            this.targetResult = targetResult;
+
+            updateColour();
+        }
+
+        private void updateColour()
+        {
+            if (targetObject == null || targetResult == null)
+                Colour = Color4.White;
+            else
+                Colour = targetResult.IsHit ? targetObject.AccentColour.Value : Color4.Transparent;
+        }
+    }
+}

From 242ec1ca826eb3ed72a52cc686a3cf60f8630289 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 13:58:52 +0900
Subject: [PATCH 05940/10326] Don't override PathControlPointVisualiser's
 positional handling

It turns out it was relying on this to deselect control points on
clicking away from them.
---
 .../Sliders/Components/PathControlPointVisualiser.cs          | 4 ----
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs       | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 13dc7886ed..b4fc9c2fb9 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -18,7 +18,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
@@ -116,9 +115,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
         }
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos));
-
         private void selectPiece(PathControlPointPiece piece, MouseButtonEvent e)
         {
             if (e.Button == MouseButton.Left && inputManager.CurrentState.Keyboard.ControlPressed)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 1644d5aa4b..1ad2eb83bf 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -235,7 +235,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         public override Vector2 ScreenSpaceSelectionPoint => BodyPiece.ToScreenSpace(BodyPiece.PathStartLocation);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.ReceivePositionalInputAt(screenSpacePos) == true;
+            BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
 
         protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
     }

From 9c1c9945af19ea710a995c4febc931813d0be54a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 15:01:45 +0900
Subject: [PATCH 05941/10326] Make FollowPointRenderer use hitobject models

---
 .../TestSceneFollowPoints.cs                  | 10 ++---
 .../Connections/FollowPointConnection.cs      | 44 +++++++++----------
 .../Connections/FollowPointRenderer.cs        | 12 ++---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  5 ++-
 4 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
index 87da7ef417..6c077eb214 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     }
 
                     hitObjectContainer.Add(drawableObject);
-                    followPointRenderer.AddFollowPoints(drawableObject);
+                    followPointRenderer.AddFollowPoints(objects[i]);
                 }
             });
         }
@@ -180,10 +180,10 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("remove hitobject", () =>
             {
-                var drawableObject = getFunc?.Invoke();
+                var drawableObject = getFunc.Invoke();
 
                 hitObjectContainer.Remove(drawableObject);
-                followPointRenderer.RemoveFollowPoints(drawableObject);
+                followPointRenderer.RemoveFollowPoints(drawableObject.HitObject);
             });
         }
 
@@ -215,10 +215,10 @@ namespace osu.Game.Rulesets.Osu.Tests
                     DrawableOsuHitObject expectedStart = getObject(i);
                     DrawableOsuHitObject expectedEnd = i < hitObjectContainer.Count - 1 ? getObject(i + 1) : null;
 
-                    if (getGroup(i).Start != expectedStart)
+                    if (getGroup(i).Start != expectedStart.HitObject)
                         throw new AssertionException($"Object {i} expected to be the start of group {i}.");
 
-                    if (getGroup(i).End != expectedEnd)
+                    if (getGroup(i).End != expectedEnd?.HitObject)
                         throw new AssertionException($"Object {(expectedEnd == null ? "null" : i.ToString())} expected to be the end of group {i}.");
                 }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 2c41e6b0e9..3a9e19b361 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -31,19 +32,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         /// The <see cref="DrawableOsuHitObject"/> which <see cref="FollowPoint"/>s will exit from.
         /// </summary>
         [NotNull]
-        public readonly DrawableOsuHitObject Start;
+        public readonly OsuHitObject Start;
 
         /// <summary>
         /// Creates a new <see cref="FollowPointConnection"/>.
         /// </summary>
         /// <param name="start">The <see cref="DrawableOsuHitObject"/> which <see cref="FollowPoint"/>s will exit from.</param>
-        public FollowPointConnection([NotNull] DrawableOsuHitObject start)
+        public FollowPointConnection([NotNull] OsuHitObject start)
         {
             Start = start;
 
             RelativeSizeAxes = Axes.Both;
 
-            StartTime.BindTo(Start.HitObject.StartTimeBindable);
+            StartTime.BindTo(start.StartTimeBindable);
         }
 
         protected override void LoadComplete()
@@ -52,13 +53,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             bindEvents(Start);
         }
 
-        private DrawableOsuHitObject end;
+        private OsuHitObject end;
 
         /// <summary>
         /// The <see cref="DrawableOsuHitObject"/> which <see cref="FollowPoint"/>s will enter.
         /// </summary>
         [CanBeNull]
-        public DrawableOsuHitObject End
+        public OsuHitObject End
         {
             get => end;
             set
@@ -75,10 +76,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             }
         }
 
-        private void bindEvents(DrawableOsuHitObject drawableObject)
+        private void bindEvents(OsuHitObject obj)
         {
-            drawableObject.HitObject.PositionBindable.BindValueChanged(_ => scheduleRefresh());
-            drawableObject.HitObject.DefaultsApplied += _ => scheduleRefresh();
+            obj.PositionBindable.BindValueChanged(_ => scheduleRefresh());
+            obj.DefaultsApplied += _ => scheduleRefresh();
         }
 
         private void scheduleRefresh()
@@ -88,23 +89,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
         private void refresh()
         {
-            OsuHitObject osuStart = Start.HitObject;
-            double startTime = osuStart.GetEndTime();
+            double startTime = Start.GetEndTime();
 
             LifetimeStart = startTime;
 
-            OsuHitObject osuEnd = End?.HitObject;
-
-            if (osuEnd == null || osuEnd.NewCombo || osuStart is Spinner || osuEnd is Spinner)
+            if (End == null || End.NewCombo || Start is Spinner || End is Spinner)
             {
                 // ensure we always set a lifetime for full LifetimeManagementContainer benefits
                 LifetimeEnd = LifetimeStart;
                 return;
             }
 
-            Vector2 startPosition = osuStart.StackedEndPosition;
-            Vector2 endPosition = osuEnd.StackedPosition;
-            double endTime = osuEnd.StartTime;
+            Vector2 startPosition = Start.StackedEndPosition;
+            Vector2 endPosition = End.StackedPosition;
+            double endTime = End.StartTime;
 
             Vector2 distanceVector = endPosition - startPosition;
             int distance = (int)distanceVector.Length;
@@ -130,10 +128,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
                 AddInternal(fp = new FollowPoint());
 
+                Debug.Assert(End != null);
+
                 fp.Position = pointStartPosition;
                 fp.Rotation = rotation;
                 fp.Alpha = 0;
-                fp.Scale = new Vector2(1.5f * osuEnd.Scale);
+                fp.Scale = new Vector2(1.5f * End.Scale);
 
                 firstTransformStartTime ??= fadeInTime;
 
@@ -141,12 +141,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
                 using (fp.BeginAbsoluteSequence(fadeInTime))
                 {
-                    fp.FadeIn(osuEnd.TimeFadeIn);
-                    fp.ScaleTo(osuEnd.Scale, osuEnd.TimeFadeIn, Easing.Out);
-                    fp.MoveTo(pointEndPosition, osuEnd.TimeFadeIn, Easing.Out);
-                    fp.Delay(fadeOutTime - fadeInTime).FadeOut(osuEnd.TimeFadeIn);
+                    fp.FadeIn(End.TimeFadeIn);
+                    fp.ScaleTo(End.Scale, End.TimeFadeIn, Easing.Out);
+                    fp.MoveTo(pointEndPosition, End.TimeFadeIn, Easing.Out);
+                    fp.Delay(fadeOutTime - fadeInTime).FadeOut(End.TimeFadeIn);
 
-                    finalTransformEndTime = fadeOutTime + osuEnd.TimeFadeIn;
+                    finalTransformEndTime = fadeOutTime + End.TimeFadeIn;
                 }
 
                 point++;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index 11571ea761..be1392d7c3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -24,19 +24,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         public override bool RemoveCompletedTransforms => false;
 
         /// <summary>
-        /// Adds the <see cref="FollowPoint"/>s around a <see cref="DrawableOsuHitObject"/>.
+        /// Adds the <see cref="FollowPoint"/>s around an <see cref="OsuHitObject"/>.
         /// This includes <see cref="FollowPoint"/>s leading into <paramref name="hitObject"/>, and <see cref="FollowPoint"/>s exiting <paramref name="hitObject"/>.
         /// </summary>
-        /// <param name="hitObject">The <see cref="DrawableOsuHitObject"/> to add <see cref="FollowPoint"/>s for.</param>
-        public void AddFollowPoints(DrawableOsuHitObject hitObject)
+        /// <param name="hitObject">The <see cref="OsuHitObject"/> to add <see cref="FollowPoint"/>s for.</param>
+        public void AddFollowPoints(OsuHitObject hitObject)
             => addConnection(new FollowPointConnection(hitObject).With(g => g.StartTime.BindValueChanged(_ => onStartTimeChanged(g))));
 
         /// <summary>
-        /// Removes the <see cref="FollowPoint"/>s around a <see cref="DrawableOsuHitObject"/>.
+        /// Removes the <see cref="FollowPoint"/>s around an <see cref="OsuHitObject"/>.
         /// This includes <see cref="FollowPoint"/>s leading into <paramref name="hitObject"/>, and <see cref="FollowPoint"/>s exiting <paramref name="hitObject"/>.
         /// </summary>
-        /// <param name="hitObject">The <see cref="DrawableOsuHitObject"/> to remove <see cref="FollowPoint"/>s for.</param>
-        public void RemoveFollowPoints(DrawableOsuHitObject hitObject) => removeGroup(connections.Single(g => g.Start == hitObject));
+        /// <param name="hitObject">The <see cref="OsuHitObject"/> to remove <see cref="FollowPoint"/>s for.</param>
+        public void RemoveFollowPoints(OsuHitObject hitObject) => removeGroup(connections.Single(g => g.Start == hitObject));
 
         /// <summary>
         /// Adds a <see cref="FollowPointConnection"/> to this <see cref="FollowPointRenderer"/>.
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 50727d590a..19502369c4 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -20,6 +20,7 @@ using osu.Game.Skinning;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Osu.Configuration;
+using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -110,7 +111,7 @@ namespace osu.Game.Rulesets.Osu.UI
             DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)h;
             osuHitObject.CheckHittable = hitPolicy.IsHittable;
 
-            followPoints.AddFollowPoints(osuHitObject);
+            followPoints.AddFollowPoints((OsuHitObject)h.HitObject);
         }
 
         public override bool Remove(DrawableHitObject h)
@@ -118,7 +119,7 @@ namespace osu.Game.Rulesets.Osu.UI
             bool result = base.Remove(h);
 
             if (result)
-                followPoints.RemoveFollowPoints((DrawableOsuHitObject)h);
+                followPoints.RemoveFollowPoints((OsuHitObject)h.HitObject);
 
             return result;
         }

From 3f24fabb575e9806d8fbecffce35d4c15b47e295 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 15:05:43 +0900
Subject: [PATCH 05942/10326] Add change handler support for contorl point
 deletion

---
 .../Sliders/Components/PathControlPointVisualiser.cs       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index b4fc9c2fb9..17541866ec 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
 using Humanizer;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,6 +19,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
@@ -126,6 +128,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
         }
 
+        [Resolved(CanBeNull = true)]
+        private IEditorChangeHandler changeHandler { get; set; }
+
         public bool DeleteSelected()
         {
             List<PathControlPoint> toRemove = Pieces.Where(p => p.IsSelected.Value).Select(p => p.ControlPoint).ToList();
@@ -134,7 +139,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             if (toRemove.Count == 0)
                 return false;
 
+            changeHandler?.BeginChange();
             RemoveControlPointsRequested?.Invoke(toRemove);
+            changeHandler?.EndChange();
 
             // Since pieces are re-used, they will not point to the deleted control points while remaining selected
             foreach (var piece in Pieces)

From 4457e363d39bfa4f8a6f954ab9dbb280b96dcdc2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 15:18:52 +0900
Subject: [PATCH 05943/10326] Bring back local variables to reduce
 two-level-deep variable access

---
 .../Drawables/Pieces/DefaultSpinnerDisc.cs    | 26 ++++++++++---------
 .../Drawables/Pieces/SnakingSliderBody.cs     | 12 +++++----
 .../Skinning/LegacyNewStyleSpinner.cs         | 17 +++++++-----
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 4c682d96ce..731852c221 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -127,18 +127,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             if (!(drawableHitObject is DrawableSpinner))
                 return;
 
-            using (BeginAbsoluteSequence(drawableSpinner.HitObject.StartTime - drawableSpinner.HitObject.TimePreempt, true))
+            Spinner spinner = drawableSpinner.HitObject;
+
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
             {
                 this.ScaleTo(initial_scale);
                 this.RotateTo(0);
 
-                using (BeginDelayedSequence(drawableSpinner.HitObject.TimePreempt / 2, true))
+                using (BeginDelayedSequence(spinner.TimePreempt / 2, true))
                 {
                     // constant ambient rotation to give the spinner "spinning" character.
-                    this.RotateTo((float)(25 * drawableSpinner.HitObject.Duration / 2000), drawableSpinner.HitObject.TimePreempt + drawableSpinner.HitObject.Duration);
+                    this.RotateTo((float)(25 * spinner.Duration / 2000), spinner.TimePreempt + spinner.Duration);
                 }
 
-                using (BeginDelayedSequence(drawableSpinner.HitObject.TimePreempt + drawableSpinner.HitObject.Duration + drawableHitObject.Result.TimeOffset, true))
+                using (BeginDelayedSequence(spinner.TimePreempt + spinner.Duration + drawableHitObject.Result.TimeOffset, true))
                 {
                     switch (state)
                     {
@@ -154,26 +156,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 }
             }
 
-            using (BeginAbsoluteSequence(drawableSpinner.HitObject.StartTime - drawableSpinner.HitObject.TimePreempt, true))
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
             {
                 centre.ScaleTo(0);
                 mainContainer.ScaleTo(0);
 
-                using (BeginDelayedSequence(drawableSpinner.HitObject.TimePreempt / 2, true))
+                using (BeginDelayedSequence(spinner.TimePreempt / 2, true))
                 {
-                    centre.ScaleTo(0.3f, drawableSpinner.HitObject.TimePreempt / 4, Easing.OutQuint);
-                    mainContainer.ScaleTo(0.2f, drawableSpinner.HitObject.TimePreempt / 4, Easing.OutQuint);
+                    centre.ScaleTo(0.3f, spinner.TimePreempt / 4, Easing.OutQuint);
+                    mainContainer.ScaleTo(0.2f, spinner.TimePreempt / 4, Easing.OutQuint);
 
-                    using (BeginDelayedSequence(drawableSpinner.HitObject.TimePreempt / 2, true))
+                    using (BeginDelayedSequence(spinner.TimePreempt / 2, true))
                     {
-                        centre.ScaleTo(0.5f, drawableSpinner.HitObject.TimePreempt / 2, Easing.OutQuint);
-                        mainContainer.ScaleTo(1, drawableSpinner.HitObject.TimePreempt / 2, Easing.OutQuint);
+                        centre.ScaleTo(0.5f, spinner.TimePreempt / 2, Easing.OutQuint);
+                        mainContainer.ScaleTo(1, spinner.TimePreempt / 2, Easing.OutQuint);
                     }
                 }
             }
 
             // transforms we have from completing the spinner will be rolled back, so reapply immediately.
-            using (BeginAbsoluteSequence(drawableSpinner.HitObject.StartTime - drawableSpinner.HitObject.TimePreempt, true))
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
                 updateComplete(state == ArmedState.Hit, 0);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
index 2fefc2e08e..e63f25b7bc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
@@ -66,15 +66,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             if (drawableSlider == null)
                 return;
 
-            var span = drawableSlider.HitObject.SpanAt(completionProgress);
-            var spanProgress = drawableSlider.HitObject.ProgressAt(completionProgress);
+            Slider slider = drawableSlider.HitObject;
+
+            var span = slider.SpanAt(completionProgress);
+            var spanProgress = slider.ProgressAt(completionProgress);
 
             double start = 0;
-            double end = SnakingIn.Value ? Math.Clamp((Time.Current - (drawableSlider.HitObject.StartTime - drawableSlider.HitObject.TimePreempt)) / (drawableSlider.HitObject.TimePreempt / 3), 0, 1) : 1;
+            double end = SnakingIn.Value ? Math.Clamp((Time.Current - (slider.StartTime - slider.TimePreempt)) / (slider.TimePreempt / 3), 0, 1) : 1;
 
-            if (span >= drawableSlider.HitObject.SpanCount() - 1)
+            if (span >= slider.SpanCount() - 1)
             {
-                if (Math.Min(span, drawableSlider.HitObject.SpanCount() - 1) % 2 == 1)
+                if (Math.Min(span, slider.SpanCount() - 1) % 2 == 1)
                 {
                     start = 0;
                     end = SnakingOut.Value ? spanProgress : 1;
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index f07b1038fb..b65e5a784c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
@@ -75,21 +76,23 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
-            if (!(drawableHitObject is DrawableSpinner spinner))
+            if (!(drawableHitObject is DrawableSpinner d))
                 return;
 
-            using (BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimePreempt, true))
+            Spinner spinner = d.HitObject;
+
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
                 this.FadeOut();
 
-            using (BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimeFadeIn / 2, true))
-                this.FadeInFromZero(spinner.HitObject.TimeFadeIn / 2);
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))
+                this.FadeInFromZero(spinner.TimeFadeIn / 2);
 
-            using (BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimePreempt, true))
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
             {
                 fixedMiddle.FadeColour(Color4.White);
 
-                using (BeginDelayedSequence(spinner.HitObject.TimePreempt, true))
-                    fixedMiddle.FadeColour(Color4.Red, spinner.HitObject.Duration);
+                using (BeginDelayedSequence(spinner.TimePreempt, true))
+                    fixedMiddle.FadeColour(Color4.Red, spinner.Duration);
             }
         }
 

From e2d028908abe2271e1faeb74b9c6f84384ce049c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 15:25:20 +0900
Subject: [PATCH 05944/10326] Fix one more case of local variable preference

---
 .../Skinning/LegacyOldStyleSpinner.cs                 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 5fcd8e06b1..1954ff6e38 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
@@ -94,14 +95,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
-            if (!(drawableHitObject is DrawableSpinner spinner))
+            if (!(drawableHitObject is DrawableSpinner d))
                 return;
 
-            using (BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimePreempt, true))
+            Spinner spinner = d.HitObject;
+
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
                 this.FadeOut();
 
-            using (BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimeFadeIn / 2, true))
-                this.FadeInFromZero(spinner.HitObject.TimeFadeIn / 2);
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))
+                this.FadeInFromZero(spinner.TimeFadeIn / 2);
         }
 
         protected override void Update()

From 628b8be15d8aa79fe67944dc20eced20b9f864c8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 15:36:44 +0900
Subject: [PATCH 05945/10326] Implement ModWithVisibilityAdjustment

---
 .../Mods/CatchModHidden.cs                    |   6 +-
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs    |  14 ++-
 osu.Game/Rulesets/Mods/ModHidden.cs           |  50 ++++----
 .../Mods/ModWithVisibilityAdjustment.cs       | 114 ++++++++++++++++++
 4 files changed, 150 insertions(+), 34 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index ee88edbea1..4b008d2734 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -17,9 +17,11 @@ namespace osu.Game.Rulesets.Catch.Mods
         private const double fade_out_offset_multiplier = 0.6;
         private const double fade_out_duration_multiplier = 0.44;
 
-        protected override void ApplyHiddenState(DrawableHitObject drawable, ArmedState state)
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            if (!(drawable is DrawableCatchHitObject catchDrawable))
+            base.ApplyNormalVisibilityState(hitObject, state);
+
+            if (!(hitObject is DrawableCatchHitObject catchDrawable))
                 return;
 
             if (catchDrawable.NestedHitObjects.Any())
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index f69cacd432..db5fbb0dd6 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         private const double fade_in_duration_multiplier = 0.4;
         private const double fade_out_duration_multiplier = 0.3;
 
-        protected override bool IsFirstHideableObject(DrawableHitObject hitObject) => !(hitObject is DrawableSpinner);
+        protected override bool IsFirstAdjustableObject(HitObject hitObject) => !(hitObject is Spinner);
 
         public override void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
@@ -42,9 +42,17 @@ namespace osu.Game.Rulesets.Osu.Mods
         private double lastSliderHeadFadeOutStartTime;
         private double lastSliderHeadFadeOutDuration;
 
-        protected override void ApplyFirstObjectIncreaseVisibilityState(DrawableHitObject drawable, ArmedState state) => applyState(drawable, true);
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+            base.ApplyIncreasedVisibilityState(hitObject, state);
+            applyState(hitObject, true);
+        }
 
-        protected override void ApplyHiddenState(DrawableHitObject drawable, ArmedState state) => applyState(drawable, false);
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+            base.ApplyNormalVisibilityState(hitObject, state);
+            applyState(hitObject, false);
+        }
 
         private void applyState(DrawableHitObject drawable, bool increaseVisibility)
         {
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index ad01bf036c..f35546d400 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -1,19 +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.Configuration;
+using System;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using System.Collections.Generic;
-using System.Linq;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModHidden : Mod, IReadFromConfig, IApplicableToDrawableHitObjects, IApplicableToScoreProcessor
+    public abstract class ModHidden : ModWithVisibilityAdjustment, IApplicableToScoreProcessor
     {
         public override string Name => "Hidden";
         public override string Acronym => "HD";
@@ -21,37 +18,14 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyIncrease;
         public override bool Ranked => true;
 
-        protected Bindable<bool> IncreaseFirstObjectVisibility = new Bindable<bool>();
-
         /// <summary>
         /// Check whether the provided hitobject should be considered the "first" hideable object.
         /// Can be used to skip spinners, for instance.
         /// </summary>
         /// <param name="hitObject">The hitobject to check.</param>
+        [Obsolete("Use IsFirstAdjustableObject() instead.")]
         protected virtual bool IsFirstHideableObject(DrawableHitObject hitObject) => true;
 
-        public void ReadFromConfig(OsuConfigManager config)
-        {
-            IncreaseFirstObjectVisibility = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility);
-        }
-
-        public virtual void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
-        {
-            if (IncreaseFirstObjectVisibility.Value)
-            {
-                drawables = drawables.SkipWhile(h => !IsFirstHideableObject(h));
-
-                var firstObject = drawables.FirstOrDefault();
-                if (firstObject != null)
-                    firstObject.ApplyCustomUpdateState += ApplyFirstObjectIncreaseVisibilityState;
-
-                drawables = drawables.Skip(1);
-            }
-
-            foreach (var dho in drawables)
-                dho.ApplyCustomUpdateState += ApplyHiddenState;
-        }
-
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
         {
             // Default value of ScoreProcessor's Rank in Hidden Mod should be SS+
@@ -73,11 +47,28 @@ namespace osu.Game.Rulesets.Mods
             }
         }
 
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+            base.ApplyIncreasedVisibilityState(hitObject, state);
+#pragma warning disable 618
+            ApplyFirstObjectIncreaseVisibilityState(hitObject, state);
+#pragma warning restore 618
+        }
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+            base.ApplyNormalVisibilityState(hitObject, state);
+#pragma warning disable 618
+            ApplyHiddenState(hitObject, state);
+#pragma warning restore 618
+        }
+
         /// <summary>
         /// Apply a special visibility state to the first object in a beatmap, if the user chooses to turn on the "increase first object visibility" setting.
         /// </summary>
         /// <param name="hitObject">The hit object to apply the state change to.</param>
         /// <param name="state">The state of the hit object.</param>
+        [Obsolete("Use ApplyIncreasedVisibilityState() instead.")]
         protected virtual void ApplyFirstObjectIncreaseVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
         }
@@ -87,6 +78,7 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         /// <param name="hitObject">The hit object to apply the state change to.</param>
         /// <param name="state">The state of the hit object.</param>
+        [Obsolete("Use ApplyNormalVisibilityState() instead.")]
         protected virtual void ApplyHiddenState(DrawableHitObject hitObject, ArmedState state)
         {
         }
diff --git a/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs b/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs
new file mode 100644
index 0000000000..89d1837348
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.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 System.Collections.Generic;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModWithVisibilityAdjustment : Mod, IReadFromConfig, IApplicableToBeatmap, IApplicableToDrawableHitObjects
+    {
+        /// <summary>
+        /// The first adjustable object.
+        /// </summary>
+        protected HitObject FirstObject { get; private set; }
+
+        /// <summary>
+        /// Whether the visibility of <see cref="FirstObject"/> should be increased.
+        /// </summary>
+        protected readonly Bindable<bool> IncreaseFirstObjectVisibility = new Bindable<bool>();
+
+        /// <summary>
+        /// Check whether the provided hitobject should be considered the "first" adjustable object.
+        /// Can be used to skip spinners, for instance.
+        /// </summary>
+        /// <param name="hitObject">The hitobject to check.</param>
+        protected virtual bool IsFirstAdjustableObject(HitObject hitObject) => true;
+
+        /// <summary>
+        /// Apply a special increased-visibility state to the first adjustable object..
+        /// Only applicable if the user chooses to turn on the "increase first object visibility" setting.
+        /// </summary>
+        /// <param name="hitObject">The hit object to apply the state change to.</param>
+        /// <param name="state">The state of the hit object.</param>
+        protected virtual void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        /// <summary>
+        /// Apply a normal visibility state adjustment to an object.
+        /// </summary>
+        /// <param name="hitObject">The hit object to apply the state change to.</param>
+        /// <param name="state">The state of the hit object.</param>
+        protected virtual void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        public virtual void ReadFromConfig(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.IncreaseFirstObjectVisibility, IncreaseFirstObjectVisibility);
+        }
+
+        public virtual void ApplyToBeatmap(IBeatmap beatmap)
+        {
+            FirstObject = getFirstAdjustableObjectRecursive(beatmap.HitObjects);
+
+            HitObject getFirstAdjustableObjectRecursive(IReadOnlyList<HitObject> hitObjects)
+            {
+                foreach (var h in hitObjects)
+                {
+                    if (IsFirstAdjustableObject(h))
+                        return h;
+
+                    var nestedResult = getFirstAdjustableObjectRecursive(h.NestedHitObjects);
+                    if (nestedResult != null)
+                        return nestedResult;
+                }
+
+                return null;
+            }
+        }
+
+        public virtual void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        {
+            foreach (var dho in drawables)
+            {
+                dho.ApplyCustomUpdateState += (o, state) =>
+                {
+                    // Increased visibility is applied to the entire first object, including all of its nested hitobjects.
+                    if (IncreaseFirstObjectVisibility.Value && isObjectEqualToOrNestedIn(o.HitObject, FirstObject))
+                        ApplyIncreasedVisibilityState(o, state);
+                    else
+                        ApplyNormalVisibilityState(o, state);
+                };
+            }
+        }
+
+        /// <summary>
+        /// Checks whether a given object is nested within a target.
+        /// </summary>
+        /// <param name="toCheck">The <see cref="HitObject"/> to check.</param>
+        /// <param name="target">The <see cref="HitObject"/> which may be equal to or contain <paramref name="toCheck"/> as a nested object.</param>
+        /// <returns>Whether <paramref name="toCheck"/> is equal to or nested within <paramref name="target"/>.</returns>
+        private bool isObjectEqualToOrNestedIn(HitObject toCheck, HitObject target)
+        {
+            if (target == null)
+                return false;
+
+            if (toCheck == target)
+                return true;
+
+            foreach (var h in target.NestedHitObjects)
+            {
+                if (isObjectEqualToOrNestedIn(toCheck, h))
+                    return true;
+            }
+
+            return false;
+        }
+    }
+}

From 54f927ee11e7a114862ad2625f7ca9bc10bfd794 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 15:41:37 +0900
Subject: [PATCH 05946/10326] Move casts to DrawableHitObject instead

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 19502369c4..321eeeab65 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -4,12 +4,15 @@
 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.Pooling;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -17,10 +20,6 @@ using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Game.Rulesets.Osu.Configuration;
-using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -96,6 +95,8 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public override void Add(DrawableHitObject h)
         {
+            DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)h;
+
             h.OnNewResult += onNewResult;
             h.OnLoadComplete += d =>
             {
@@ -108,18 +109,19 @@ namespace osu.Game.Rulesets.Osu.UI
 
             base.Add(h);
 
-            DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)h;
             osuHitObject.CheckHittable = hitPolicy.IsHittable;
 
-            followPoints.AddFollowPoints((OsuHitObject)h.HitObject);
+            followPoints.AddFollowPoints(osuHitObject.HitObject);
         }
 
         public override bool Remove(DrawableHitObject h)
         {
+            DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)h;
+
             bool result = base.Remove(h);
 
             if (result)
-                followPoints.RemoveFollowPoints((OsuHitObject)h.HitObject);
+                followPoints.RemoveFollowPoints(osuHitObject.HitObject);
 
             return result;
         }

From 77a618dd71044d185d69d3e178a5bffcbc0f38ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 15:52:06 +0900
Subject: [PATCH 05947/10326] Use class with other osu! mods

---
 .../Mods/OsuModObjectScaleTween.cs            | 31 ++++--------------
 osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs    | 32 ++++---------------
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs | 20 +++---------
 3 files changed, 19 insertions(+), 64 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs b/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
index 06ba4cde4a..cd2e2e092a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
@@ -2,11 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
@@ -17,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     /// <summary>
     /// Adjusts the size of hit objects during their fade in animation.
     /// </summary>
-    public abstract class OsuModObjectScaleTween : Mod, IReadFromConfig, IApplicableToDrawableHitObjects
+    public abstract class OsuModObjectScaleTween : ModWithVisibilityAdjustment
     {
         public override ModType Type => ModType.Fun;
 
@@ -27,33 +24,19 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         protected virtual float EndScale => 1;
 
-        private Bindable<bool> increaseFirstObjectVisibility = new Bindable<bool>();
-
         public override Type[] IncompatibleMods => new[] { typeof(OsuModSpinIn), typeof(OsuModTraceable) };
 
-        public void ReadFromConfig(OsuConfigManager config)
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            increaseFirstObjectVisibility = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility);
+            base.ApplyNormalVisibilityState(hitObject, state);
+            applyCustomState(hitObject, state);
         }
 
-        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        private void applyCustomState(DrawableHitObject drawable, ArmedState state)
         {
-            foreach (var drawable in drawables.Skip(increaseFirstObjectVisibility.Value ? 1 : 0))
-            {
-                switch (drawable)
-                {
-                    case DrawableSpinner _:
-                        continue;
+            if (drawable is DrawableSpinner)
+                return;
 
-                    default:
-                        drawable.ApplyCustomUpdateState += ApplyCustomState;
-                        break;
-                }
-            }
-        }
-
-        protected virtual void ApplyCustomState(DrawableHitObject drawable, ArmedState state)
-        {
             var h = (OsuHitObject)drawable.HitObject;
 
             // apply grow effect
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
index 940c888f3a..34c94fa7e0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
@@ -2,12 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
@@ -16,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModSpinIn : Mod, IApplicableToDrawableHitObjects, IReadFromConfig
+    public class OsuModSpinIn : ModWithVisibilityAdjustment
     {
         public override string Name => "Spin In";
         public override string Acronym => "SI";
@@ -31,31 +27,17 @@ namespace osu.Game.Rulesets.Osu.Mods
         private const int rotate_offset = 360;
         private const float rotate_starting_width = 2;
 
-        private Bindable<bool> increaseFirstObjectVisibility = new Bindable<bool>();
-
-        public void ReadFromConfig(OsuConfigManager config)
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            increaseFirstObjectVisibility = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility);
-        }
-
-        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
-        {
-            foreach (var drawable in drawables.Skip(increaseFirstObjectVisibility.Value ? 1 : 0))
-            {
-                switch (drawable)
-                {
-                    case DrawableSpinner _:
-                        continue;
-
-                    default:
-                        drawable.ApplyCustomUpdateState += applyZoomState;
-                        break;
-                }
-            }
+            base.ApplyNormalVisibilityState(hitObject, state);
+            applyZoomState(hitObject, state);
         }
 
         private void applyZoomState(DrawableHitObject drawable, ArmedState state)
         {
+            if (drawable is DrawableSpinner)
+                return;
+
             var h = (OsuHitObject)drawable.HitObject;
 
             switch (drawable)
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index bb2213aa31..9349dc6a78 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -2,12 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
-using osu.Framework.Bindables;
-using System.Collections.Generic;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -15,7 +11,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    internal class OsuModTraceable : Mod, IReadFromConfig, IApplicableToDrawableHitObjects
+    internal class OsuModTraceable : ModWithVisibilityAdjustment
     {
         public override string Name => "Traceable";
         public override string Acronym => "TC";
@@ -24,20 +20,14 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override double ScoreMultiplier => 1;
 
         public override Type[] IncompatibleMods => new[] { typeof(OsuModHidden), typeof(OsuModSpinIn), typeof(OsuModObjectScaleTween) };
-        private Bindable<bool> increaseFirstObjectVisibility = new Bindable<bool>();
 
-        public void ReadFromConfig(OsuConfigManager config)
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            increaseFirstObjectVisibility = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility);
+            base.ApplyNormalVisibilityState(hitObject, state);
+            applyTraceableState(hitObject, state);
         }
 
-        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
-        {
-            foreach (var drawable in drawables.Skip(increaseFirstObjectVisibility.Value ? 1 : 0))
-                drawable.ApplyCustomUpdateState += ApplyTraceableState;
-        }
-
-        protected void ApplyTraceableState(DrawableHitObject drawable, ArmedState state)
+        private void applyTraceableState(DrawableHitObject drawable, ArmedState state)
         {
             if (!(drawable is DrawableOsuHitObject))
                 return;

From a219aa7ba272d31b32a6f5f2c86511f365a8da6e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 15:53:35 +0900
Subject: [PATCH 05948/10326] Add xmldoc

---
 osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs b/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs
index 89d1837348..fd563f4261 100644
--- a/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs
+++ b/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs
@@ -10,6 +10,10 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mods
 {
+    /// <summary>
+    /// A <see cref="Mod"/> which applies visibility adjustments to <see cref="DrawableHitObject"/>s
+    /// with an optional increased visibility adjustment depending on the user's "increase first object visibility" setting.
+    /// </summary>
     public abstract class ModWithVisibilityAdjustment : Mod, IReadFromConfig, IApplicableToBeatmap, IApplicableToDrawableHitObjects
     {
         /// <summary>

From cc518feca7718e8ebb1c89bb6d14f08a0d806a39 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 16:03:10 +0900
Subject: [PATCH 05949/10326] Make methods abstract

---
 osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs  | 6 +++---
 osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs            | 6 +++---
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs         | 6 +++---
 osu.Game/Rulesets/Mods/ModHidden.cs                   | 2 --
 osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs | 8 ++------
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs b/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
index cd2e2e092a..d1be162f73 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
@@ -26,12 +26,12 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(OsuModSpinIn), typeof(OsuModTraceable) };
 
-        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyNormalVisibilityState(hitObject, state);
-            applyCustomState(hitObject, state);
         }
 
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyCustomState(hitObject, state);
+
         private void applyCustomState(DrawableHitObject drawable, ArmedState state)
         {
             if (drawable is DrawableSpinner)
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
index 34c94fa7e0..96ba58da23 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
@@ -27,12 +27,12 @@ namespace osu.Game.Rulesets.Osu.Mods
         private const int rotate_offset = 360;
         private const float rotate_starting_width = 2;
 
-        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyNormalVisibilityState(hitObject, state);
-            applyZoomState(hitObject, state);
         }
 
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyZoomState(hitObject, state);
+
         private void applyZoomState(DrawableHitObject drawable, ArmedState state)
         {
             if (drawable is DrawableSpinner)
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index 9349dc6a78..b7e60295cb 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -21,12 +21,12 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(OsuModHidden), typeof(OsuModSpinIn), typeof(OsuModObjectScaleTween) };
 
-        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyNormalVisibilityState(hitObject, state);
-            applyTraceableState(hitObject, state);
         }
 
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyTraceableState(hitObject, state);
+
         private void applyTraceableState(DrawableHitObject drawable, ArmedState state)
         {
             if (!(drawable is DrawableOsuHitObject))
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index f35546d400..b88d785ff1 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -49,7 +49,6 @@ namespace osu.Game.Rulesets.Mods
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyIncreasedVisibilityState(hitObject, state);
 #pragma warning disable 618
             ApplyFirstObjectIncreaseVisibilityState(hitObject, state);
 #pragma warning restore 618
@@ -57,7 +56,6 @@ namespace osu.Game.Rulesets.Mods
 
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyNormalVisibilityState(hitObject, state);
 #pragma warning disable 618
             ApplyHiddenState(hitObject, state);
 #pragma warning restore 618
diff --git a/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs b/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs
index fd563f4261..5bbd02cf6c 100644
--- a/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs
+++ b/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs
@@ -39,18 +39,14 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         /// <param name="hitObject">The hit object to apply the state change to.</param>
         /// <param name="state">The state of the hit object.</param>
-        protected virtual void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
+        protected abstract void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state);
 
         /// <summary>
         /// Apply a normal visibility state adjustment to an object.
         /// </summary>
         /// <param name="hitObject">The hit object to apply the state change to.</param>
         /// <param name="state">The state of the hit object.</param>
-        protected virtual void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
+        protected abstract void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state);
 
         public virtual void ReadFromConfig(OsuConfigManager config)
         {

From f513c95ab215de244a428a233c2063e00f3d9545 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 16:04:42 +0900
Subject: [PATCH 05950/10326] Use class with transform and wiggle mods

---
 osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs | 11 ++++-------
 osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs    | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
index 5e80d08667..b5905d7015 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.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.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
@@ -13,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    internal class OsuModTransform : Mod, IApplicableToDrawableHitObjects
+    internal class OsuModTransform : ModWithVisibilityAdjustment
     {
         public override string Name => "Transform";
         public override string Acronym => "TR";
@@ -25,11 +24,9 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private float theta;
 
-        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
-        {
-            foreach (var drawable in drawables)
-                drawable.ApplyCustomUpdateState += applyTransform;
-        }
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyTransform(hitObject, state);
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyTransform(hitObject, state);
 
         private void applyTransform(DrawableHitObject drawable, ArmedState state)
         {
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
index 3cad52faeb..9c5e41f245 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.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.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
@@ -13,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    internal class OsuModWiggle : Mod, IApplicableToDrawableHitObjects
+    internal class OsuModWiggle : ModWithVisibilityAdjustment
     {
         public override string Name => "Wiggle";
         public override string Acronym => "WG";
@@ -26,11 +25,9 @@ namespace osu.Game.Rulesets.Osu.Mods
         private const int wiggle_duration = 90; // (ms) Higher = fewer wiggles
         private const int wiggle_strength = 10; // Higher = stronger wiggles
 
-        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
-        {
-            foreach (var drawable in drawables)
-                drawable.ApplyCustomUpdateState += drawableOnApplyCustomUpdateState;
-        }
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state) => drawableOnApplyCustomUpdateState(hitObject, state);
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => drawableOnApplyCustomUpdateState(hitObject, state);
 
         private void drawableOnApplyCustomUpdateState(DrawableHitObject drawable, ArmedState state)
         {

From d1fa391d251e0d67a02b2c8eb68e1b777567c257 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 16:12:55 +0900
Subject: [PATCH 05951/10326] Make OsuModHidden apply fadein adjustment on
 custom state update

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index db5fbb0dd6..025e202666 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -27,18 +26,20 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
-            static void adjustFadeIn(OsuHitObject h) => h.TimeFadeIn = h.TimePreempt * fade_in_duration_multiplier;
-
-            foreach (var d in drawables.OfType<DrawableOsuHitObject>())
-            {
-                adjustFadeIn(d.HitObject);
-                foreach (var h in d.HitObject.NestedHitObjects.OfType<OsuHitObject>())
-                    adjustFadeIn(h);
-            }
+            foreach (var d in drawables)
+                d.ApplyCustomUpdateState += applyFadeInAdjustment;
 
             base.ApplyToDrawableHitObjects(drawables);
         }
 
+        private void applyFadeInAdjustment(DrawableHitObject hitObject, ArmedState state)
+        {
+            if (!(hitObject is DrawableOsuHitObject d))
+                return;
+
+            d.HitObject.TimeFadeIn = d.HitObject.TimePreempt * fade_in_duration_multiplier;
+        }
+
         private double lastSliderHeadFadeOutStartTime;
         private double lastSliderHeadFadeOutDuration;
 

From 414daab1dc685ec46ffc7f196d236507a66362bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 16:14:22 +0900
Subject: [PATCH 05952/10326] Fix paused samples potentially getting stuck in a
 playing state in rapid toggling

Closes #10693. Should be obvious why.
---
 osu.Game/Skinning/PausableSkinnableSound.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index d340f67575..4f09aec0b6 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Threading;
 using osu.Game.Audio;
 using osu.Game.Screens.Play;
 
@@ -25,6 +26,8 @@ namespace osu.Game.Skinning
 
         private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
 
+        private ScheduledDelegate scheduledStart;
+
         [BackgroundDependencyLoader(true)]
         private void load(ISamplePlaybackDisabler samplePlaybackDisabler)
         {
@@ -39,12 +42,14 @@ namespace osu.Game.Skinning
                     // let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
                     if (!Looping) return;
 
+                    cancelPendingStart();
+
                     if (disabled.NewValue)
                         base.Stop();
                     else
                     {
                         // schedule so we don't start playing a sample which is no longer alive.
-                        Schedule(() =>
+                        scheduledStart = Schedule(() =>
                         {
                             if (RequestedPlaying)
                                 base.Play();
@@ -56,6 +61,7 @@ namespace osu.Game.Skinning
 
         public override void Play()
         {
+            cancelPendingStart();
             RequestedPlaying = true;
 
             if (samplePlaybackDisabled.Value)
@@ -66,8 +72,15 @@ namespace osu.Game.Skinning
 
         public override void Stop()
         {
+            cancelPendingStart();
             RequestedPlaying = false;
             base.Stop();
         }
+
+        private void cancelPendingStart()
+        {
+            scheduledStart?.Cancel();
+            scheduledStart = null;
+        }
     }
 }

From 2d0c62dce274e1d53c3e3adf11cf560844aa8f89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 16:37:47 +0900
Subject: [PATCH 05953/10326] Fix SkinnableTestScene's autosize propagation

Regressed with recent DrawableHitObject changes (moving of
RelativeSizeAxes specifications out of constructors).
---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 41 +++++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index fe4f735325..07e45f25cf 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -65,17 +65,15 @@ namespace osu.Game.Tests.Visual
         private Drawable createProvider(Skin skin, Func<Drawable> creationFunction, IBeatmap beatmap)
         {
             var created = creationFunction();
+
             createdDrawables.Add(created);
 
-            var autoSize = created.RelativeSizeAxes == Axes.None;
+            SkinProvidingContainer mainProvider;
+            Container childContainer;
+            OutlineBox outlineBox;
+            SkinProvidingContainer skinProvider;
 
-            var mainProvider = new SkinProvidingContainer(skin)
-            {
-                RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,
-                AutoSizeAxes = autoSize ? Axes.Both : Axes.None,
-            };
-
-            return new Container
+            var children = new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 BorderColour = Color4.White,
@@ -96,27 +94,38 @@ namespace osu.Game.Tests.Visual
                         Scale = new Vector2(1.5f),
                         Padding = new MarginPadding(5),
                     },
-                    new Container
+                    childContainer = 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, beatmap))
+                            outlineBox = new OutlineBox(),
+                            (mainProvider = new SkinProvidingContainer(skin)).WithChild(
+                                skinProvider = new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider, beatmap))
                                 {
                                     Child = created,
-                                    RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,
-                                    AutoSizeAxes = autoSize ? Axes.Both : Axes.None,
                                 }
                             )
                         }
                     },
                 }
             };
+
+            Schedule(() =>
+            {
+                var autoSize = created.RelativeSizeAxes == Axes.None;
+
+                foreach (var c in new[] { mainProvider, childContainer, skinProvider })
+                {
+                    c.RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None;
+                    c.AutoSizeAxes = autoSize ? Axes.Both : Axes.None;
+                }
+
+                outlineBox.Alpha = autoSize ? 1 : 0;
+            });
+
+            return children;
         }
 
         /// <summary>

From 9d5b1ec28c0281bed94908f6e2557e8d9169f2cf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 17:03:53 +0900
Subject: [PATCH 05954/10326] Add removal dates

---
 osu.Game/Rulesets/Mods/ModHidden.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index b88d785ff1..df421adbe5 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mods
         /// Can be used to skip spinners, for instance.
         /// </summary>
         /// <param name="hitObject">The hitobject to check.</param>
-        [Obsolete("Use IsFirstAdjustableObject() instead.")]
+        [Obsolete("Use IsFirstAdjustableObject() instead.")] // Can be removed 20210506
         protected virtual bool IsFirstHideableObject(DrawableHitObject hitObject) => true;
 
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         /// <param name="hitObject">The hit object to apply the state change to.</param>
         /// <param name="state">The state of the hit object.</param>
-        [Obsolete("Use ApplyIncreasedVisibilityState() instead.")]
+        [Obsolete("Use ApplyIncreasedVisibilityState() instead.")] // Can be removed 20210506
         protected virtual void ApplyFirstObjectIncreaseVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
         }
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         /// <param name="hitObject">The hit object to apply the state change to.</param>
         /// <param name="state">The state of the hit object.</param>
-        [Obsolete("Use ApplyNormalVisibilityState() instead.")]
+        [Obsolete("Use ApplyNormalVisibilityState() instead.")] // Can be removed 20210506
         protected virtual void ApplyHiddenState(DrawableHitObject hitObject, ArmedState state)
         {
         }

From 9c91f16e3a2425f248a5d040525322737fd639ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 17:24:59 +0900
Subject: [PATCH 05955/10326] Update sizing as early as possible in addition to
 scheduling (to handle any dependent edge cases)

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 07e45f25cf..d5fcf8bae3 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -112,7 +112,15 @@ namespace osu.Game.Tests.Visual
                 }
             };
 
-            Schedule(() =>
+            // run this once initially to bring things into a sane state as early as possible.
+            updateSizing();
+
+            // run this once after construction to handle the case the changes are made in a BDL/LoadComplete call.
+            Schedule(updateSizing);
+
+            return children;
+
+            void updateSizing()
             {
                 var autoSize = created.RelativeSizeAxes == Axes.None;
 
@@ -123,9 +131,7 @@ namespace osu.Game.Tests.Visual
                 }
 
                 outlineBox.Alpha = autoSize ? 1 : 0;
-            });
-
-            return children;
+            }
         }
 
         /// <summary>

From 8aa0a698d986f11a4a054522dee9e81e57937f7d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 17:26:41 +0900
Subject: [PATCH 05956/10326] Avoid errors due to second set

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index d5fcf8bae3..68098f9d3b 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -126,6 +126,9 @@ namespace osu.Game.Tests.Visual
 
                 foreach (var c in new[] { mainProvider, childContainer, skinProvider })
                 {
+                    c.RelativeSizeAxes = Axes.None;
+                    c.AutoSizeAxes = Axes.None;
+
                     c.RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None;
                     c.AutoSizeAxes = autoSize ? Axes.Both : Axes.None;
                 }

From 7d33dc3deae7df07cfa17afd680825788c2df372 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 17:12:18 +0900
Subject: [PATCH 05957/10326] Reorder spinner tests to promote hit being the
 first to display

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 94d1cb8864..496b1b3559 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private TestDrawableSpinner drawableSpinner;
 
-        [TestCase(false)]
         [TestCase(true)]
+        [TestCase(false)]
         public void TestVariousSpinners(bool autoplay)
         {
             string term = autoplay ? "Hit" : "Miss";

From 82d8c1bbea7a37fde1382fd56b6cb6f0acc1f41b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 17:12:35 +0900
Subject: [PATCH 05958/10326] Add support for spinner glow

---
 .../Skinning/LegacyNewStyleSpinner.cs         | 58 ++++++++++++++-----
 1 file changed, 43 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index b65e5a784c..31e2ab1239 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
     /// </summary>
     public class LegacyNewStyleSpinner : CompositeDrawable
     {
+        private Sprite glow;
         private Sprite discBottom;
         private Sprite discTop;
         private Sprite spinningMiddle;
@@ -30,6 +31,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private const float final_scale = 0.625f;
 
+        private readonly Color4 glowColour = new Color4(3, 151, 255, 255);
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
         {
@@ -39,6 +42,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             InternalChildren = new Drawable[]
             {
+                glow = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = source.GetTexture("spinner-glow"),
+                    Blending = BlendingParameters.Additive,
+                    Colour = glowColour,
+                },
                 discBottom = new Sprite
                 {
                     Anchor = Anchor.Centre,
@@ -76,23 +87,38 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
-            if (!(drawableHitObject is DrawableSpinner d))
-                return;
-
-            Spinner spinner = d.HitObject;
-
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
-                this.FadeOut();
-
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))
-                this.FadeInFromZero(spinner.TimeFadeIn / 2);
-
-            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+            switch (drawableHitObject)
             {
-                fixedMiddle.FadeColour(Color4.White);
+                case DrawableSpinner d:
+                    Spinner spinner = d.HitObject;
 
-                using (BeginDelayedSequence(spinner.TimePreempt, true))
-                    fixedMiddle.FadeColour(Color4.Red, spinner.Duration);
+                    using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+                        this.FadeOut();
+
+                    using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true))
+                        this.FadeInFromZero(spinner.TimeFadeIn / 2);
+
+                    using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true))
+                    {
+                        fixedMiddle.FadeColour(Color4.White);
+
+                        using (BeginDelayedSequence(spinner.TimePreempt, true))
+                            fixedMiddle.FadeColour(Color4.Red, spinner.Duration);
+                    }
+
+                    if (state == ArmedState.Hit)
+                    {
+                        using (BeginAbsoluteSequence(d.HitStateUpdateTime))
+                            glow.FadeOut(300);
+                    }
+
+                    break;
+
+                case DrawableSpinnerBonusTick _:
+                    if (state == ArmedState.Hit)
+                        glow.FlashColour(Color4.White, 200);
+
+                    break;
             }
         }
 
@@ -102,6 +128,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
             spinningMiddle.Rotation = discTop.Rotation = drawableSpinner.RotationTracker.Rotation;
             discBottom.Rotation = discTop.Rotation / 3;
 
+            glow.Alpha = drawableSpinner.Progress;
+
             Scale = new Vector2(final_scale * (0.8f + (float)Interpolation.ApplyEasing(Easing.Out, drawableSpinner.Progress) * 0.2f));
         }
 

From 2d50a7b61644d0635da7550457957b61d6855005 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 17:38:02 +0900
Subject: [PATCH 05959/10326] Fix a few xmldoc typos

---
 osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs b/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs
index 5bbd02cf6c..5b119b5e46 100644
--- a/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs
+++ b/osu.Game/Rulesets/Mods/ModWithVisibilityAdjustment.cs
@@ -34,18 +34,18 @@ namespace osu.Game.Rulesets.Mods
         protected virtual bool IsFirstAdjustableObject(HitObject hitObject) => true;
 
         /// <summary>
-        /// Apply a special increased-visibility state to the first adjustable object..
+        /// Apply a special increased-visibility state to the first adjustable object.
         /// Only applicable if the user chooses to turn on the "increase first object visibility" setting.
         /// </summary>
         /// <param name="hitObject">The hit object to apply the state change to.</param>
-        /// <param name="state">The state of the hit object.</param>
+        /// <param name="state">The state of the hitobject.</param>
         protected abstract void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state);
 
         /// <summary>
         /// Apply a normal visibility state adjustment to an object.
         /// </summary>
         /// <param name="hitObject">The hit object to apply the state change to.</param>
-        /// <param name="state">The state of the hit object.</param>
+        /// <param name="state">The state of the hitobject.</param>
         protected abstract void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state);
 
         public virtual void ReadFromConfig(OsuConfigManager config)

From 64e3325b4140bf89e30cb8cb2e7f9fa90dd64716 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 18:00:26 +0900
Subject: [PATCH 05960/10326] Abstract out common part of legacy spinner
 implementations

Some elements going forward will be shared, so it makes sense to have a
common base class to add these shared elements.
---
 .../Skinning/LegacyNewStyleSpinner.cs         | 33 +++-----------
 .../Skinning/LegacyOldStyleSpinner.cs         | 31 +++----------
 .../Skinning/LegacySpinner.cs                 | 44 +++++++++++++++++++
 3 files changed, 57 insertions(+), 51 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 31e2ab1239..5b6aac8f08 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -19,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
     /// Legacy skinned spinner with two main spinning layers, one fixed overlay and one final spinning overlay.
     /// No background layer.
     /// </summary>
-    public class LegacyNewStyleSpinner : CompositeDrawable
+    public class LegacyNewStyleSpinner : LegacySpinner
     {
         private Sprite glow;
         private Sprite discBottom;
@@ -27,17 +26,13 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private Sprite spinningMiddle;
         private Sprite fixedMiddle;
 
-        private DrawableSpinner drawableSpinner;
-
         private const float final_scale = 0.625f;
 
         private readonly Color4 glowColour = new Color4(3, 151, 255, 255);
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource source, DrawableHitObject drawableObject)
+        private void load(ISkinSource source)
         {
-            drawableSpinner = (DrawableSpinner)drawableObject;
-
             Scale = new Vector2(final_scale);
 
             InternalChildren = new Drawable[]
@@ -77,16 +72,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
             };
         }
 
-        protected override void LoadComplete()
+        protected override void UpdateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
-            base.LoadComplete();
+            base.UpdateStateTransforms(drawableHitObject, state);
 
-            drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
-            updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
-        }
-
-        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
-        {
             switch (drawableHitObject)
             {
                 case DrawableSpinner d:
@@ -125,20 +114,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
         protected override void Update()
         {
             base.Update();
-            spinningMiddle.Rotation = discTop.Rotation = drawableSpinner.RotationTracker.Rotation;
+            spinningMiddle.Rotation = discTop.Rotation = DrawableSpinner.RotationTracker.Rotation;
             discBottom.Rotation = discTop.Rotation / 3;
 
-            glow.Alpha = drawableSpinner.Progress;
+            glow.Alpha = DrawableSpinner.Progress;
 
-            Scale = new Vector2(final_scale * (0.8f + (float)Interpolation.ApplyEasing(Easing.Out, drawableSpinner.Progress) * 0.2f));
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (drawableSpinner != null)
-                drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
+            Scale = new Vector2(final_scale * (0.8f + (float)Interpolation.ApplyEasing(Easing.Out, DrawableSpinner.Progress) * 0.2f));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 1954ff6e38..56702e6712 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -18,9 +18,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
     /// <summary>
     /// Legacy skinned spinner with one main spinning layer and a background layer.
     /// </summary>
-    public class LegacyOldStyleSpinner : CompositeDrawable
+    public class LegacyOldStyleSpinner : LegacySpinner
     {
-        private DrawableSpinner drawableSpinner;
         private Sprite disc;
         private Sprite metreSprite;
         private Container metre;
@@ -31,14 +30,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private const float final_metre_height = 692 * sprite_scale;
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource source, DrawableHitObject drawableObject)
+        private void load(ISkinSource source)
         {
             spinnerBlink = source.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerNoBlink)?.Value != true;
 
-            drawableSpinner = (DrawableSpinner)drawableObject;
-
-            RelativeSizeAxes = Axes.Both;
-
             InternalChild = new Container
             {
                 // the old-style spinner relied heavily on absolute screen-space coordinate values.
@@ -85,16 +80,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
             };
         }
 
-        protected override void LoadComplete()
+        protected override void UpdateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
-            base.LoadComplete();
+            base.UpdateStateTransforms(drawableHitObject, state);
 
-            drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
-            updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
-        }
-
-        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
-        {
             if (!(drawableHitObject is DrawableSpinner d))
                 return;
 
@@ -110,11 +99,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
         protected override void Update()
         {
             base.Update();
-            disc.Rotation = drawableSpinner.RotationTracker.Rotation;
+            disc.Rotation = DrawableSpinner.RotationTracker.Rotation;
 
             // careful: need to call this exactly once for all calculations in a frame
             // as the function has a random factor in it
-            var metreHeight = getMetreHeight(drawableSpinner.Progress);
+            var metreHeight = getMetreHeight(DrawableSpinner.Progress);
 
             // hack to make the metre blink up from below than down from above.
             // move down the container to be able to apply masking for the metre,
@@ -140,13 +129,5 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             return (float)barCount / total_bars * final_metre_height;
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (drawableSpinner != null)
-                drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
new file mode 100644
index 0000000000..efbafdc17a
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Skinning
+{
+    public abstract class LegacySpinner : CompositeDrawable
+    {
+        protected DrawableSpinner DrawableSpinner { get; private set; }
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableHitObject)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            DrawableSpinner = (DrawableSpinner)drawableHitObject;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            DrawableSpinner.ApplyCustomUpdateState += UpdateStateTransforms;
+            UpdateStateTransforms(DrawableSpinner, DrawableSpinner.State.Value);
+        }
+
+        protected virtual void UpdateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
+        {
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (DrawableSpinner != null)
+                DrawableSpinner.ApplyCustomUpdateState -= UpdateStateTransforms;
+        }
+    }
+}

From 11c18952e3138c7bd2f85a8a9336e55c888f6c38 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 18:03:24 +0900
Subject: [PATCH 05961/10326] Allow children to be added in base class

---
 osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs | 4 ++--
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 5b6aac8f08..f77a722376 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             Scale = new Vector2(final_scale);
 
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 glow = new Sprite
                 {
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Origin = Anchor.Centre,
                     Texture = source.GetTexture("spinner-middle2")
                 }
-            };
+            });
         }
 
         protected override void UpdateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 56702e6712..dd63879247 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             spinnerBlink = source.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerNoBlink)?.Value != true;
 
-            InternalChild = new Container
+            AddInternal(new Container
             {
                 // the old-style spinner relied heavily on absolute screen-space coordinate values.
                 // wrap everything in a container simulating absolute coords to preserve alignment
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         }
                     }
                 }
-            };
+            });
         }
 
         protected override void UpdateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)

From 5ec6011340cb05ece29f815e60afc6577c05bc2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 18:12:02 +0900
Subject: [PATCH 05962/10326] Apply new style spinner scale to only local
 sprites

---
 .../Skinning/LegacyNewStyleSpinner.cs         | 76 ++++++++++---------
 1 file changed, 42 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index f77a722376..3a60f54d24 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -30,44 +31,51 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private readonly Color4 glowColour = new Color4(3, 151, 255, 255);
 
+        private Container scaleContainer;
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource source)
         {
-            Scale = new Vector2(final_scale);
-
-            AddRangeInternal(new Drawable[]
+            AddInternal(scaleContainer = new Container
             {
-                glow = new Sprite
+                Scale = new Vector2(final_scale),
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Texture = source.GetTexture("spinner-glow"),
-                    Blending = BlendingParameters.Additive,
-                    Colour = glowColour,
-                },
-                discBottom = new Sprite
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Texture = source.GetTexture("spinner-bottom")
-                },
-                discTop = new Sprite
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Texture = source.GetTexture("spinner-top")
-                },
-                fixedMiddle = new Sprite
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Texture = source.GetTexture("spinner-middle")
-                },
-                spinningMiddle = new Sprite
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Texture = source.GetTexture("spinner-middle2")
+                    glow = new Sprite
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-glow"),
+                        Blending = BlendingParameters.Additive,
+                        Colour = glowColour,
+                    },
+                    discBottom = new Sprite
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-bottom")
+                    },
+                    discTop = new Sprite
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-top")
+                    },
+                    fixedMiddle = new Sprite
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-middle")
+                    },
+                    spinningMiddle = new Sprite
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-middle2")
+                    }
                 }
             });
         }
@@ -119,7 +127,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             glow.Alpha = DrawableSpinner.Progress;
 
-            Scale = new Vector2(final_scale * (0.8f + (float)Interpolation.ApplyEasing(Easing.Out, DrawableSpinner.Progress) * 0.2f));
+            scaleContainer.Scale = new Vector2(final_scale * (0.8f + (float)Interpolation.ApplyEasing(Easing.Out, DrawableSpinner.Progress) * 0.2f));
         }
     }
 }

From 3ec813da03c636d3fb936c1da04be597a45f95d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 18:12:13 +0900
Subject: [PATCH 05963/10326] Add "spin" sprite

---
 .../Skinning/LegacySpinner.cs                 | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
index efbafdc17a..62df4989ba 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
@@ -1,11 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -13,12 +16,26 @@ namespace osu.Game.Rulesets.Osu.Skinning
     {
         protected DrawableSpinner DrawableSpinner { get; private set; }
 
+        private Sprite spin;
+
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableHitObject)
+        private void load(DrawableHitObject drawableHitObject, ISkinSource source)
         {
             RelativeSizeAxes = Axes.Both;
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
+
+            AddRangeInternal(new[]
+            {
+                spin = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Depth = float.MinValue,
+                    Texture = source.GetTexture("spinner-spin"),
+                    Y = 120 // todo: make match roughly?
+                },
+            });
         }
 
         protected override void LoadComplete()
@@ -31,6 +48,25 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         protected virtual void UpdateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
+            switch (drawableHitObject)
+            {
+                case DrawableSpinner d:
+                    double fadeOutLength = Math.Min(400, d.HitObject.Duration);
+
+                    using (BeginAbsoluteSequence(drawableHitObject.HitStateUpdateTime - fadeOutLength, true))
+                        spin.FadeOutFromOne(fadeOutLength);
+
+                    break;
+
+                case DrawableSpinnerTick d:
+                    if (state == ArmedState.Hit)
+                    {
+                        using (BeginAbsoluteSequence(d.HitStateUpdateTime, true))
+                            spin.FadeOut(300);
+                    }
+
+                    break;
+            }
         }
 
         protected override void Dispose(bool isDisposing)

From a0b3379909aaaf14fa1bdc5dd31e9d8d380dd5e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 18:58:37 +0900
Subject: [PATCH 05964/10326] Fix judgement offsets being zero when windows are
 empty

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index c7e2e0638c..5c3f57c2d0 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -546,7 +546,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
             // Ensure that the judgement is given a valid time offset, because this may not get set by the caller
             var endTime = HitObject.GetEndTime();
 
-            Result.TimeOffset = Math.Min(HitObject.HitWindows.WindowFor(HitResult.Miss), Time.Current - endTime);
+            Result.TimeOffset = Time.Current - endTime;
+
+            double missWindow = HitObject.HitWindows.WindowFor(HitResult.Miss);
+            if (missWindow > 0)
+                Result.TimeOffset = Math.Min(Result.TimeOffset, missWindow);
 
             if (Result.HasResult)
                 updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss);

From 901102918ee29241406f716e3a2c014a8995c116 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 19:05:59 +0900
Subject: [PATCH 05965/10326] Centralise scale and apply to SPIN text

---
 osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs | 6 ++----
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs | 9 ++++-----
 osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs         | 4 ++++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
index 3a60f54d24..05f4c8e307 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
@@ -27,8 +27,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private Sprite spinningMiddle;
         private Sprite fixedMiddle;
 
-        private const float final_scale = 0.625f;
-
         private readonly Color4 glowColour = new Color4(3, 151, 255, 255);
 
         private Container scaleContainer;
@@ -38,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             AddInternal(scaleContainer = new Container
             {
-                Scale = new Vector2(final_scale),
+                Scale = new Vector2(SPRITE_SCALE),
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
@@ -127,7 +125,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             glow.Alpha = DrawableSpinner.Progress;
 
-            scaleContainer.Scale = new Vector2(final_scale * (0.8f + (float)Interpolation.ApplyEasing(Easing.Out, DrawableSpinner.Progress) * 0.2f));
+            scaleContainer.Scale = new Vector2(SPRITE_SCALE * (0.8f + (float)Interpolation.ApplyEasing(Easing.Out, DrawableSpinner.Progress) * 0.2f));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index dd63879247..fba802f085 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -26,8 +26,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private bool spinnerBlink;
 
-        private const float sprite_scale = 1 / 1.6f;
-        private const float final_metre_height = 692 * sprite_scale;
+        private const float final_metre_height = 692 * SPRITE_SCALE;
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource source)
@@ -50,14 +49,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Texture = source.GetTexture("spinner-background"),
-                        Scale = new Vector2(sprite_scale)
+                        Scale = new Vector2(SPRITE_SCALE)
                     },
                     disc = new Sprite
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Texture = source.GetTexture("spinner-circle"),
-                        Scale = new Vector2(sprite_scale)
+                        Scale = new Vector2(SPRITE_SCALE)
                     },
                     metre = new Container
                     {
@@ -73,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                             Texture = source.GetTexture("spinner-metre"),
                             Anchor = Anchor.TopLeft,
                             Origin = Anchor.TopLeft,
-                            Scale = new Vector2(0.625f)
+                            Scale = new Vector2(SPRITE_SCALE)
                         }
                     }
                 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
index 62df4989ba..2d0d350fce 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
@@ -9,11 +9,14 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
     public abstract class LegacySpinner : CompositeDrawable
     {
+        protected const float SPRITE_SCALE = 0.625f;
+
         protected DrawableSpinner DrawableSpinner { get; private set; }
 
         private Sprite spin;
@@ -33,6 +36,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Origin = Anchor.Centre,
                     Depth = float.MinValue,
                     Texture = source.GetTexture("spinner-spin"),
+                    Scale = new Vector2(SPRITE_SCALE),
                     Y = 120 // todo: make match roughly?
                 },
             });

From 5e387e92cd9e2848c562c0dbc05b72420567de94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 19:16:47 +0900
Subject: [PATCH 05966/10326] Add positional offset to avoid the SPM counter

---
 osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
index 2d0d350fce..31350791e3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Depth = float.MinValue,
                     Texture = source.GetTexture("spinner-spin"),
                     Scale = new Vector2(SPRITE_SCALE),
-                    Y = 120 // todo: make match roughly?
+                    Y = 120 - 45 // offset temporarily to avoid overlapping default spin counter
                 },
             });
         }

From 71253cb5e9aeba420d4d8062f41d80917abeb8db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 19:35:32 +0900
Subject: [PATCH 05967/10326] Add support for spinner "clear" text in legacy
 skins

---
 .../Skinning/LegacySpinner.cs                 | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
index 31350791e3..6c276f951e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.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.Sprites;
@@ -20,6 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         protected DrawableSpinner DrawableSpinner { get; private set; }
 
         private Sprite spin;
+        private Sprite clear;
 
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject, ISkinSource source)
@@ -39,17 +41,50 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Scale = new Vector2(SPRITE_SCALE),
                     Y = 120 - 45 // offset temporarily to avoid overlapping default spin counter
                 },
+                clear = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Depth = float.MinValue,
+                    Alpha = 0,
+                    Texture = source.GetTexture("spinner-clear"),
+                    Scale = new Vector2(SPRITE_SCALE),
+                    Y = -60
+                },
             });
         }
 
+        private readonly Bindable<bool> completed = new Bindable<bool>();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            completed.BindTo(DrawableSpinner.RotationTracker.Complete);
+            completed.BindValueChanged(onCompletedChanged, true);
+
             DrawableSpinner.ApplyCustomUpdateState += UpdateStateTransforms;
             UpdateStateTransforms(DrawableSpinner, DrawableSpinner.State.Value);
         }
 
+        private void onCompletedChanged(ValueChangedEvent<bool> completed)
+        {
+            if (completed.NewValue)
+            {
+                clear.FadeInFromZero(400, Easing.Out);
+                clear.ScaleTo(SPRITE_SCALE * 2).Then().ScaleTo(SPRITE_SCALE, 400, Easing.OutElastic);
+
+                const double fade_out_duration = 50;
+                using (BeginAbsoluteSequence(DrawableSpinner.HitStateUpdateTime - fade_out_duration, true))
+                    clear.FadeOut(fade_out_duration);
+            }
+            else
+            {
+                clear.ClearTransforms();
+                clear.Alpha = 0;
+            }
+        }
+
         protected virtual void UpdateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
             switch (drawableHitObject)
@@ -59,7 +94,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                     using (BeginAbsoluteSequence(drawableHitObject.HitStateUpdateTime - fadeOutLength, true))
                         spin.FadeOutFromOne(fadeOutLength);
-
                     break;
 
                 case DrawableSpinnerTick d:

From d7a912a0d2784b5096e8607388730ee61492af9a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 19:44:34 +0900
Subject: [PATCH 05968/10326] Match stable's transform 1:1

---
 osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
index 6c276f951e..eb9fa85fde 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
@@ -71,8 +71,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             if (completed.NewValue)
             {
-                clear.FadeInFromZero(400, Easing.Out);
-                clear.ScaleTo(SPRITE_SCALE * 2).Then().ScaleTo(SPRITE_SCALE, 400, Easing.OutElastic);
+                double startTime = Math.Min(Time.Current, DrawableSpinner.HitStateUpdateTime - 400);
+
+                using (BeginAbsoluteSequence(startTime, true))
+                {
+                    clear.FadeInFromZero(400, Easing.Out);
+
+                    clear.ScaleTo(SPRITE_SCALE * 2)
+                         .Then().ScaleTo(SPRITE_SCALE * 0.8f, 240, Easing.Out)
+                         .Then().ScaleTo(SPRITE_SCALE, 160);
+                }
 
                 const double fade_out_duration = 50;
                 using (BeginAbsoluteSequence(DrawableSpinner.HitStateUpdateTime - fade_out_duration, true))

From d774afd224de8bd014db5ab892f38dd22eb576e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Nov 2020 22:29:44 +0900
Subject: [PATCH 05969/10326] 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 97812402a3..f56baf4e5f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1029.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1105.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e57807e989..3783ae7d5c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1029.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1105.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 40ecfffcca..ed3ec9e48b 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.Framework.iOS" Version="2020.1029.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1105.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1029.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1105.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1e1569eb5302813472df97ea2e8af0ad11eda1cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 12:40:54 +0900
Subject: [PATCH 05970/10326] Use int instead of long for user_id fields for
 now

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs       | 6 +++---
 osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs    | 2 +-
 osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs    | 2 +-
 osu.Game/Online/API/Requests/Responses/APIChangelogUser.cs | 2 +-
 osu.Game/Online/Chat/Channel.cs                            | 2 +-
 osu.Game/OsuGame.cs                                        | 4 ++--
 osu.Game/Overlays/UserProfileOverlay.cs                    | 2 +-
 osu.Game/Scoring/ScoreInfo.cs                              | 2 +-
 osu.Game/Users/User.cs                                     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index df4b85b37a..72c6fd8d44 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public void EndPlay(int beatmapId)
             {
-                ((ISpectatorClient)this).UserFinishedPlaying((int)StreamingUser.Id, new SpectatorState
+                ((ISpectatorClient)this).UserFinishedPlaying(StreamingUser.Id, new SpectatorState
                 {
                     BeatmapID = beatmapId,
                     RulesetID = 0,
@@ -273,7 +273,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 }
 
                 var bundle = new FrameDataBundle(frames);
-                ((ISpectatorClient)this).UserSentFrames((int)StreamingUser.Id, bundle);
+                ((ISpectatorClient)this).UserSentFrames(StreamingUser.Id, bundle);
 
                 if (!sentState)
                     sendState(beatmapId);
@@ -293,7 +293,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             private void sendState(int beatmapId)
             {
                 sentState = true;
-                ((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState
+                ((ISpectatorClient)this).UserBeganPlaying(StreamingUser.Id, new SpectatorState
                 {
                     BeatmapID = beatmapId,
                     RulesetID = 0,
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 7196f47bd6..582f72429b 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -277,7 +277,7 @@ namespace osu.Game.Tournament.Screens.Editors
                         userId.Value = user.Id.ToString();
                         userId.BindValueChanged(idString =>
                         {
-                            long.TryParse(idString.NewValue, out var parsed);
+                            int.TryParse(idString.NewValue, out var parsed);
 
                             user.Id = parsed;
 
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
index 1ca14256e5..6d0160fbc4 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Online.API.Requests.Responses
         private int[] ratings { get; set; }
 
         [JsonProperty(@"user_id")]
-        private long creatorId
+        private int creatorId
         {
             set => Author.Id = value;
         }
diff --git a/osu.Game/Online/API/Requests/Responses/APIChangelogUser.cs b/osu.Game/Online/API/Requests/Responses/APIChangelogUser.cs
index 5891391e83..024e1ce048 100644
--- a/osu.Game/Online/API/Requests/Responses/APIChangelogUser.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIChangelogUser.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Online.API.Requests.Responses
         public string OsuUsername { get; set; }
 
         [JsonProperty("user_id")]
-        public long? UserId { get; set; }
+        public int? UserId { get; set; }
 
         [JsonProperty("user_url")]
         public string UserUrl { get; set; }
diff --git a/osu.Game/Online/Chat/Channel.cs b/osu.Game/Online/Chat/Channel.cs
index 8c1e1ad128..187a3e5dfc 100644
--- a/osu.Game/Online/Chat/Channel.cs
+++ b/osu.Game/Online/Chat/Channel.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Online.Chat
         public readonly ObservableCollection<User> Users = new ObservableCollection<User>();
 
         [JsonProperty(@"users")]
-        private long[] userIds
+        private int[] userIds
         {
             set
             {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a0ddab702e..64f8d4415b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -278,7 +278,7 @@ namespace osu.Game
                     break;
 
                 case LinkAction.OpenUserProfile:
-                    if (long.TryParse(link.Argument, out long userId))
+                    if (int.TryParse(link.Argument, out int userId))
                         ShowUser(userId);
                     break;
 
@@ -321,7 +321,7 @@ namespace osu.Game
         /// Show a user's profile as an overlay.
         /// </summary>
         /// <param name="userId">The user to display.</param>
-        public void ShowUser(long userId) => waitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
+        public void ShowUser(int userId) => waitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
 
         /// <summary>
         /// Show a beatmap's set as an overlay, displaying the given beatmap.
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index d52ad84592..81027667fa 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays
         {
         }
 
-        public void ShowUser(long userId) => ShowUser(new User { Id = userId });
+        public void ShowUser(int userId) => ShowUser(new User { Id = userId });
 
         public void ShowUser(User user, bool fetchOnline = true)
         {
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 596e98a6bd..f5192f3a40 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Scoring
 
         [JsonIgnore]
         [Column("UserID")]
-        public long? UserID
+        public int? UserID
         {
             get => User?.Id ?? 1;
             set
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 89786e3bd8..1fbc3d06f4 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Users
     public class User : IEquatable<User>
     {
         [JsonProperty(@"id")]
-        public long Id = 1;
+        public int Id = 1;
 
         [JsonProperty(@"join_date")]
         public DateTimeOffset JoinDate;

From 5113d4af8ff12c695e1e6838e387d76763ddee75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 13:14:23 +0900
Subject: [PATCH 05971/10326] Rename BeatmapDifficultyManager to
 BeatmapDifficultyCache

---
 .../Beatmaps/BeatmapDifficultyManagerTest.cs         | 10 +++++-----
 ...ifficultyManager.cs => BeatmapDifficultyCache.cs} | 12 ++++++++----
 osu.Game/Beatmaps/BeatmapInfo.cs                     |  2 +-
 osu.Game/Beatmaps/Drawables/DifficultyIcon.cs        |  6 +++---
 osu.Game/OsuGameBase.cs                              |  8 ++++----
 osu.Game/Scoring/ScoreManager.cs                     | 10 +++++-----
 osu.Game/Scoring/ScorePerformanceManager.cs          |  4 ++--
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs   |  4 ++--
 .../Screens/Ranking/Expanded/StarRatingDisplay.cs    |  2 +-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs          |  4 ++--
 .../Select/Carousel/DrawableCarouselBeatmap.cs       |  4 ++--
 osu.Game/Screens/Select/Details/AdvancedStats.cs     |  6 +++---
 12 files changed, 38 insertions(+), 34 deletions(-)
 rename osu.Game/Beatmaps/{BeatmapDifficultyManager.cs => BeatmapDifficultyCache.cs} (97%)

diff --git a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs b/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
index 7c1ddd757f..ec77f48063 100644
--- a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
+++ b/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestKeyEqualsWithDifferentModInstances()
         {
-            var key1 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
-            var key2 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+            var key1 = new BeatmapDifficultyCache.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+            var key2 = new BeatmapDifficultyCache.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
 
             Assert.That(key1, Is.EqualTo(key2));
         }
@@ -23,8 +23,8 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestKeyEqualsWithDifferentModOrder()
         {
-            var key1 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
-            var key2 = new BeatmapDifficultyManager.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHidden(), new OsuModHardRock() });
+            var key1 = new BeatmapDifficultyCache.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+            var key2 = new BeatmapDifficultyCache.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHidden(), new OsuModHardRock() });
 
             Assert.That(key1, Is.EqualTo(key2));
         }
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Beatmaps
         [TestCase(8.3, DifficultyRating.ExpertPlus)]
         public void TestDifficultyRatingMapping(double starRating, DifficultyRating expectedBracket)
         {
-            var actualBracket = BeatmapDifficultyManager.GetDifficultyRating(starRating);
+            var actualBracket = BeatmapDifficultyCache.GetDifficultyRating(starRating);
 
             Assert.AreEqual(expectedBracket, actualBracket);
         }
diff --git a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
similarity index 97%
rename from osu.Game/Beatmaps/BeatmapDifficultyManager.cs
rename to osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 9e83738e70..dafe7c19e6 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyManager.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 using osu.Framework.Lists;
 using osu.Framework.Logging;
 using osu.Framework.Threading;
@@ -23,10 +23,14 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Beatmaps
 {
-    public class BeatmapDifficultyManager : CompositeDrawable
+    /// <summary>
+    /// A component which performs and acts as a central cache for difficulty calculations of beatmap/ruleset/mod combinations.
+    /// Currently not persisted between game sessions.
+    /// </summary>
+    public class BeatmapDifficultyCache : Component
     {
         // Too many simultaneous updates can lead to stutters. One thread seems to work fine for song select display purposes.
-        private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(1, nameof(BeatmapDifficultyManager));
+        private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(1, nameof(BeatmapDifficultyCache));
 
         // A permanent cache to prevent re-computations.
         private readonly ConcurrentDictionary<DifficultyCacheLookup, StarDifficulty> difficultyCache = new ConcurrentDictionary<DifficultyCacheLookup, StarDifficulty>();
@@ -387,6 +391,6 @@ namespace osu.Game.Beatmaps
             Attributes = null;
         }
 
-        public DifficultyRating DifficultyRating => BeatmapDifficultyManager.GetDifficultyRating(Stars);
+        public DifficultyRating DifficultyRating => BeatmapDifficultyCache.GetDifficultyRating(Stars);
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index ffd8d14048..a898e10e4f 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Beatmaps
         public List<ScoreInfo> Scores { get; set; }
 
         [JsonIgnore]
-        public DifficultyRating DifficultyRating => BeatmapDifficultyManager.GetDifficultyRating(StarDifficulty);
+        public DifficultyRating DifficultyRating => BeatmapDifficultyCache.GetDifficultyRating(StarDifficulty);
 
         public string[] SearchableTerms => new[]
         {
diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index a1d5e33d1e..96e18f120a 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Beatmaps.Drawables
             private CancellationTokenSource difficultyCancellation;
 
             [Resolved]
-            private BeatmapDifficultyManager difficultyManager { get; set; }
+            private BeatmapDifficultyCache difficultyCache { get; set; }
 
             public DifficultyRetriever(BeatmapInfo beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods)
             {
@@ -158,8 +158,8 @@ namespace osu.Game.Beatmaps.Drawables
             {
                 difficultyCancellation = new CancellationTokenSource();
                 localStarDifficulty = ruleset != null
-                    ? difficultyManager.GetBindableDifficulty(beatmap, ruleset, mods, difficultyCancellation.Token)
-                    : difficultyManager.GetBindableDifficulty(beatmap, difficultyCancellation.Token);
+                    ? difficultyCache.GetBindableDifficulty(beatmap, ruleset, mods, difficultyCancellation.Token)
+                    : difficultyCache.GetBindableDifficulty(beatmap, difficultyCancellation.Token);
                 localStarDifficulty.BindValueChanged(difficulty => StarDifficulty.Value = difficulty.NewValue);
             }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 4bc54e7e83..fa183beeb9 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -59,7 +59,7 @@ namespace osu.Game
 
         protected ScoreManager ScoreManager;
 
-        protected BeatmapDifficultyManager DifficultyManager;
+        protected BeatmapDifficultyCache DifficultyCache;
 
         protected SkinManager SkinManager;
 
@@ -202,7 +202,7 @@ namespace osu.Game
             dependencies.Cache(FileStore = new FileStore(contextFactory, Storage));
 
             // ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup()
-            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Host, () => DifficultyManager, LocalConfig));
+            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Host, () => DifficultyCache, LocalConfig));
             dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Host, defaultBeatmap, true));
 
             // this should likely be moved to ArchiveModelManager when another case appers where it is necessary
@@ -226,8 +226,8 @@ namespace osu.Game
                     ScoreManager.Undelete(getBeatmapScores(item), true);
             });
 
-            dependencies.Cache(DifficultyManager = new BeatmapDifficultyManager());
-            AddInternal(DifficultyManager);
+            dependencies.Cache(DifficultyCache = new BeatmapDifficultyCache());
+            AddInternal(DifficultyCache);
 
             var scorePerformanceManager = new ScorePerformanceManager();
             dependencies.Cache(scorePerformanceManager);
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index cce6153953..cf1d123c06 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -37,13 +37,13 @@ namespace osu.Game.Scoring
         private readonly Func<BeatmapManager> beatmaps;
 
         [CanBeNull]
-        private readonly Func<BeatmapDifficultyManager> difficulties;
+        private readonly Func<BeatmapDifficultyCache> difficulties;
 
         [CanBeNull]
         private readonly OsuConfigManager configManager;
 
         public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, IAPIProvider api, IDatabaseContextFactory contextFactory, IIpcHost importHost = null,
-                            Func<BeatmapDifficultyManager> difficulties = null, OsuConfigManager configManager = null)
+                            Func<BeatmapDifficultyCache> difficulties = null, OsuConfigManager configManager = null)
             : base(storage, contextFactory, api, new ScoreStore(contextFactory, storage), importHost)
         {
             this.rulesets = rulesets;
@@ -121,14 +121,14 @@ namespace osu.Game.Scoring
             public readonly Bindable<ScoringMode> ScoringMode = new Bindable<ScoringMode>();
 
             private readonly ScoreInfo score;
-            private readonly Func<BeatmapDifficultyManager> difficulties;
+            private readonly Func<BeatmapDifficultyCache> difficulties;
 
             /// <summary>
             /// Creates a new <see cref="TotalScoreBindable"/>.
             /// </summary>
             /// <param name="score">The <see cref="ScoreInfo"/> to provide the total score of.</param>
-            /// <param name="difficulties">A function to retrieve the <see cref="BeatmapDifficultyManager"/>.</param>
-            public TotalScoreBindable(ScoreInfo score, Func<BeatmapDifficultyManager> difficulties)
+            /// <param name="difficulties">A function to retrieve the <see cref="BeatmapDifficultyCache"/>.</param>
+            public TotalScoreBindable(ScoreInfo score, Func<BeatmapDifficultyCache> difficulties)
             {
                 this.score = score;
                 this.difficulties = difficulties;
diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs
index ddda1b99af..326a2fce7f 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceManager.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Scoring
         private readonly ConcurrentDictionary<PerformanceCacheLookup, double> performanceCache = new ConcurrentDictionary<PerformanceCacheLookup, double>();
 
         [Resolved]
-        private BeatmapDifficultyManager difficultyManager { get; set; }
+        private BeatmapDifficultyCache difficultyCache { get; set; }
 
         /// <summary>
         /// Calculates performance for the given <see cref="ScoreInfo"/>.
@@ -41,7 +41,7 @@ namespace osu.Game.Scoring
 
         private async Task<double?> computePerformanceAsync(ScoreInfo score, PerformanceCacheLookup lookupKey, CancellationToken token = default)
         {
-            var attributes = await difficultyManager.GetDifficultyAsync(score.Beatmap, score.Ruleset, score.Mods, token);
+            var attributes = await difficultyCache.GetDifficultyAsync(score.Beatmap, score.Ruleset, score.Mods, token);
 
             // Performance calculation requires the beatmap and ruleset to be locally available. If not, return a default value.
             if (attributes.Attributes == null)
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index f9b7625913..33ee5d2ee4 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapDifficultyManager beatmapDifficultyManager)
+        private void load(BeatmapDifficultyCache beatmapDifficultyCache)
         {
             var beatmap = score.Beatmap;
             var metadata = beatmap.BeatmapSet?.Metadata ?? beatmap.Metadata;
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     Spacing = new Vector2(5, 0),
                                     Children = new Drawable[]
                                     {
-                                        new StarRatingDisplay(beatmapDifficultyManager.GetDifficulty(beatmap, score.Ruleset, score.Mods))
+                                        new StarRatingDisplay(beatmapDifficultyCache.GetDifficulty(beatmap, score.Ruleset, score.Mods))
                                         {
                                             Anchor = Anchor.CentreLeft,
                                             Origin = Anchor.CentreLeft
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index ffb12d474b..f7e50fdc8a 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, BeatmapDifficultyManager difficultyManager)
+        private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
         {
             AutoSizeAxes = Axes.Both;
 
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 2634f117de..04c1f6efe4 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Select
         private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
         [Resolved]
-        private BeatmapDifficultyManager difficultyManager { get; set; }
+        private BeatmapDifficultyCache difficultyCache { get; set; }
 
         private IBindable<StarDifficulty> beatmapDifficulty;
 
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Select
                 cancellationSource = new CancellationTokenSource();
 
                 beatmapDifficulty?.UnbindAll();
-                beatmapDifficulty = difficultyManager.GetBindableDifficulty(beatmap.BeatmapInfo, cancellationSource.Token);
+                beatmapDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, cancellationSource.Token);
                 beatmapDifficulty.BindValueChanged(_ => updateDisplay());
 
                 updateDisplay();
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 49a370724e..e66469ff8d 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Select.Carousel
         private BeatmapSetOverlay beatmapOverlay { get; set; }
 
         [Resolved]
-        private BeatmapDifficultyManager difficultyManager { get; set; }
+        private BeatmapDifficultyCache difficultyCache { get; set; }
 
         [Resolved(CanBeNull = true)]
         private CollectionManager collectionManager { get; set; }
@@ -216,7 +216,7 @@ namespace osu.Game.Screens.Select.Carousel
             if (Item.State.Value != CarouselItemState.Collapsed)
             {
                 // We've potentially cancelled the computation above so a new bindable is required.
-                starDifficultyBindable = difficultyManager.GetBindableDifficulty(beatmap, (starDifficultyCancellationSource = new CancellationTokenSource()).Token);
+                starDifficultyBindable = difficultyCache.GetBindableDifficulty(beatmap, (starDifficultyCancellationSource = new CancellationTokenSource()).Token);
                 starDifficultyBindable.BindValueChanged(d => starCounter.Current = (float)d.NewValue.Stars, true);
             }
 
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 44c328187f..44d908fc46 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Select.Details
         private IBindable<RulesetInfo> ruleset { get; set; }
 
         [Resolved]
-        private BeatmapDifficultyManager difficultyManager { get; set; }
+        private BeatmapDifficultyCache difficultyCache { get; set; }
 
         protected readonly StatisticRow FirstValue, HpDrain, Accuracy, ApproachRate;
         private readonly StatisticRow starDifficulty;
@@ -161,8 +161,8 @@ namespace osu.Game.Screens.Select.Details
 
             starDifficultyCancellationSource = new CancellationTokenSource();
 
-            normalStarDifficulty = difficultyManager.GetBindableDifficulty(Beatmap, ruleset.Value, null, starDifficultyCancellationSource.Token);
-            moddedStarDifficulty = difficultyManager.GetBindableDifficulty(Beatmap, ruleset.Value, mods.Value, starDifficultyCancellationSource.Token);
+            normalStarDifficulty = difficultyCache.GetBindableDifficulty(Beatmap, ruleset.Value, null, starDifficultyCancellationSource.Token);
+            moddedStarDifficulty = difficultyCache.GetBindableDifficulty(Beatmap, ruleset.Value, mods.Value, starDifficultyCancellationSource.Token);
 
             normalStarDifficulty.BindValueChanged(_ => updateDisplay());
             moddedStarDifficulty.BindValueChanged(_ => updateDisplay(), true);

From 14bb079feb84717965b086e0949f865e2aeac486 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 13:15:33 +0900
Subject: [PATCH 05972/10326] Rename ScorePerformanceManager to
 ScorePerformanceCache

---
 osu.Game/OsuGameBase.cs                                      | 2 +-
 .../{ScorePerformanceManager.cs => ScorePerformanceCache.cs} | 5 +++--
 .../Ranking/Expanded/Statistics/PerformanceStatistic.cs      | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename osu.Game/Scoring/{ScorePerformanceManager.cs => ScorePerformanceCache.cs} (92%)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index fa183beeb9..3da692249d 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -229,7 +229,7 @@ namespace osu.Game
             dependencies.Cache(DifficultyCache = new BeatmapDifficultyCache());
             AddInternal(DifficultyCache);
 
-            var scorePerformanceManager = new ScorePerformanceManager();
+            var scorePerformanceManager = new ScorePerformanceCache();
             dependencies.Cache(scorePerformanceManager);
             AddInternal(scorePerformanceManager);
 
diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceCache.cs
similarity index 92%
rename from osu.Game/Scoring/ScorePerformanceManager.cs
rename to osu.Game/Scoring/ScorePerformanceCache.cs
index 326a2fce7f..8b764c75b7 100644
--- a/osu.Game/Scoring/ScorePerformanceManager.cs
+++ b/osu.Game/Scoring/ScorePerformanceCache.cs
@@ -13,9 +13,10 @@ using osu.Game.Beatmaps;
 namespace osu.Game.Scoring
 {
     /// <summary>
-    /// A global component which calculates and caches results of performance calculations for locally databased scores.
+    /// A component which performs and acts as a central cache for performance calculations of locally databased scores.
+    /// Currently not persisted between game sessions.
     /// </summary>
-    public class ScorePerformanceManager : Component
+    public class ScorePerformanceCache : Component
     {
         // this cache will grow indefinitely per session and should be considered temporary.
         // this whole component should likely be replaced with database persistence.
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index cd9d8005c6..730221cc4b 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         }
 
         [BackgroundDependencyLoader]
-        private void load(ScorePerformanceManager performanceManager)
+        private void load(ScorePerformanceCache performanceCache)
         {
             if (score.PP.HasValue)
             {
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             }
             else
             {
-                performanceManager.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
+                performanceCache.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
                                   .ContinueWith(t => Schedule(() => setPerformanceValue(t.Result)), cancellationTokenSource.Token);
             }
         }

From 0103b1257574df20dcbe73e19eb0daa2b8ac1a57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 13:26:18 +0900
Subject: [PATCH 05973/10326] Add basic base class to begin to standardise
 function across caching components

---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs     | 15 ++++++---------
 osu.Game/Database/MemoryCachingComponent.cs     | 17 +++++++++++++++++
 osu.Game/Scoring/ScorePerformanceCache.cs       | 13 ++++---------
 .../Expanded/Statistics/PerformanceStatistic.cs |  2 +-
 4 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 osu.Game/Database/MemoryCachingComponent.cs

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index dafe7c19e6..3ca0b47121 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -11,11 +11,11 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Framework.Lists;
 using osu.Framework.Logging;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
+using osu.Game.Database;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
@@ -27,14 +27,11 @@ namespace osu.Game.Beatmaps
     /// A component which performs and acts as a central cache for difficulty calculations of beatmap/ruleset/mod combinations.
     /// Currently not persisted between game sessions.
     /// </summary>
-    public class BeatmapDifficultyCache : Component
+    public class BeatmapDifficultyCache : MemoryCachingComponent<BeatmapDifficultyCache.DifficultyCacheLookup, StarDifficulty>
     {
         // Too many simultaneous updates can lead to stutters. One thread seems to work fine for song select display purposes.
         private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(1, nameof(BeatmapDifficultyCache));
 
-        // A permanent cache to prevent re-computations.
-        private readonly ConcurrentDictionary<DifficultyCacheLookup, StarDifficulty> difficultyCache = new ConcurrentDictionary<DifficultyCacheLookup, StarDifficulty>();
-
         // All bindables that should be updated along with the current ruleset + mods.
         private readonly LockedWeakList<BindableStarDifficulty> trackedBindables = new LockedWeakList<BindableStarDifficulty>();
 
@@ -243,7 +240,7 @@ namespace osu.Game.Beatmaps
                 var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(beatmapInfo));
                 var attributes = calculator.Calculate(key.Mods);
 
-                return difficultyCache[key] = new StarDifficulty(attributes);
+                return Cache[key] = new StarDifficulty(attributes);
             }
             catch (BeatmapInvalidForRulesetException e)
             {
@@ -254,7 +251,7 @@ namespace osu.Game.Beatmaps
                 if (rulesetInfo.Equals(beatmapInfo.Ruleset))
                 {
                     Logger.Error(e, $"Failed to convert {beatmapInfo.OnlineBeatmapID} to the beatmap's default ruleset ({beatmapInfo.Ruleset}).");
-                    return difficultyCache[key] = new StarDifficulty();
+                    return Cache[key] = new StarDifficulty();
                 }
 
                 // Check the cache first because this is now a different ruleset than the one previously guarded against.
@@ -265,7 +262,7 @@ namespace osu.Game.Beatmaps
             }
             catch
             {
-                return difficultyCache[key] = new StarDifficulty();
+                return Cache[key] = new StarDifficulty();
             }
         }
 
@@ -294,7 +291,7 @@ namespace osu.Game.Beatmaps
             }
 
             key = new DifficultyCacheLookup(beatmapInfo.ID, rulesetInfo.ID.Value, mods);
-            return difficultyCache.TryGetValue(key, out existingDifficulty);
+            return Cache.TryGetValue(key, out existingDifficulty);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Database/MemoryCachingComponent.cs b/osu.Game/Database/MemoryCachingComponent.cs
new file mode 100644
index 0000000000..85cf3b8af1
--- /dev/null
+++ b/osu.Game/Database/MemoryCachingComponent.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Concurrent;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Database
+{
+    /// <summary>
+    /// A component which performs lookups (or calculations) and caches the results.
+    /// Currently not persisted between game sessions.
+    /// </summary>
+    public abstract class MemoryCachingComponent<TLookup, TValue> : Component
+    {
+        protected readonly ConcurrentDictionary<TLookup, TValue> Cache = new ConcurrentDictionary<TLookup, TValue>();
+    }
+}
diff --git a/osu.Game/Scoring/ScorePerformanceCache.cs b/osu.Game/Scoring/ScorePerformanceCache.cs
index 8b764c75b7..435b93d7af 100644
--- a/osu.Game/Scoring/ScorePerformanceCache.cs
+++ b/osu.Game/Scoring/ScorePerformanceCache.cs
@@ -2,13 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 
 namespace osu.Game.Scoring
 {
@@ -16,12 +15,8 @@ namespace osu.Game.Scoring
     /// A component which performs and acts as a central cache for performance calculations of locally databased scores.
     /// Currently not persisted between game sessions.
     /// </summary>
-    public class ScorePerformanceCache : Component
+    public class ScorePerformanceCache : MemoryCachingComponent<ScorePerformanceCache.PerformanceCacheLookup, double>
     {
-        // this cache will grow indefinitely per session and should be considered temporary.
-        // this whole component should likely be replaced with database persistence.
-        private readonly ConcurrentDictionary<PerformanceCacheLookup, double> performanceCache = new ConcurrentDictionary<PerformanceCacheLookup, double>();
-
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
 
@@ -34,7 +29,7 @@ namespace osu.Game.Scoring
         {
             var lookupKey = new PerformanceCacheLookup(score);
 
-            if (performanceCache.TryGetValue(lookupKey, out double performance))
+            if (Cache.TryGetValue(lookupKey, out double performance))
                 return Task.FromResult((double?)performance);
 
             return computePerformanceAsync(score, lookupKey, token);
@@ -54,7 +49,7 @@ namespace osu.Game.Scoring
             var total = calculator?.Calculate();
 
             if (total.HasValue)
-                performanceCache[lookupKey] = total.Value;
+                Cache[lookupKey] = total.Value;
 
             return total;
         }
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index 730221cc4b..68da4ec724 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             else
             {
                 performanceCache.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
-                                  .ContinueWith(t => Schedule(() => setPerformanceValue(t.Result)), cancellationTokenSource.Token);
+                                .ContinueWith(t => Schedule(() => setPerformanceValue(t.Result)), cancellationTokenSource.Token);
             }
         }
 

From 07166ec819970757a77a6646e3d6198162c9171f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 13:29:47 +0900
Subject: [PATCH 05974/10326] Fix a couple of remaining unnecessary casts

---
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs | 2 +-
 osu.Game/Screens/Play/Spectator.cs                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 697ceacf0a..dae27f35ae 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Dashboard
                             var request = new GetUserRequest(u);
                             request.Success += user => Schedule(() =>
                             {
-                                if (playingUsers.Contains((int)user.Id))
+                                if (playingUsers.Contains(user.Id))
                                     userFlow.Add(createUserPanel(user));
                             });
                             api.Queue(request);
diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 9ed911efd5..0f593db277 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Screens.Play
             spectatorStreaming.OnUserFinishedPlaying += userFinishedPlaying;
             spectatorStreaming.OnNewFrames += userSentFrames;
 
-            spectatorStreaming.WatchUser((int)targetUser.Id);
+            spectatorStreaming.WatchUser(targetUser.Id);
 
             managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
@@ -353,7 +353,7 @@ namespace osu.Game.Screens.Play
                 spectatorStreaming.OnUserFinishedPlaying -= userFinishedPlaying;
                 spectatorStreaming.OnNewFrames -= userSentFrames;
 
-                spectatorStreaming.StopWatchingUser((int)targetUser.Id);
+                spectatorStreaming.StopWatchingUser(targetUser.Id);
             }
 
             managerUpdated?.UnbindAll();

From 74ca2faa31805e8a2aeac5def1170ab7945957d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 13:48:06 +0900
Subject: [PATCH 05975/10326] Remove unused using

---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 3ca0b47121..be278622b5 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;

From 517a65689964581396b85427ab4100eb87ae4cab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 13:51:25 +0900
Subject: [PATCH 05976/10326] Move StarDifficulty to own file

---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs | 46 ------------------
 osu.Game/Beatmaps/StarDifficulty.cs         | 53 +++++++++++++++++++++
 2 files changed, 53 insertions(+), 46 deletions(-)
 create mode 100644 osu.Game/Beatmaps/StarDifficulty.cs

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index be278622b5..af1b1de0c1 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -16,7 +16,6 @@ using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 
@@ -344,49 +343,4 @@ namespace osu.Game.Beatmaps
             }
         }
     }
-
-    public readonly struct StarDifficulty
-    {
-        /// <summary>
-        /// The star difficulty rating for the given beatmap.
-        /// </summary>
-        public readonly double Stars;
-
-        /// <summary>
-        /// The maximum combo achievable on the given beatmap.
-        /// </summary>
-        public readonly int MaxCombo;
-
-        /// <summary>
-        /// The difficulty attributes computed for the given beatmap.
-        /// Might not be available if the star difficulty is associated with a beatmap that's not locally available.
-        /// </summary>
-        [CanBeNull]
-        public readonly DifficultyAttributes Attributes;
-
-        /// <summary>
-        /// Creates a <see cref="StarDifficulty"/> structure based on <see cref="DifficultyAttributes"/> computed
-        /// by a <see cref="DifficultyCalculator"/>.
-        /// </summary>
-        public StarDifficulty([NotNull] DifficultyAttributes attributes)
-        {
-            Stars = attributes.StarRating;
-            MaxCombo = attributes.MaxCombo;
-            Attributes = attributes;
-            // Todo: Add more members (BeatmapInfo.DifficultyRating? Attributes? Etc...)
-        }
-
-        /// <summary>
-        /// Creates a <see cref="StarDifficulty"/> structure with a pre-populated star difficulty and max combo
-        /// in scenarios where computing <see cref="DifficultyAttributes"/> is not feasible (i.e. when working with online sources).
-        /// </summary>
-        public StarDifficulty(double starDifficulty, int maxCombo)
-        {
-            Stars = starDifficulty;
-            MaxCombo = maxCombo;
-            Attributes = null;
-        }
-
-        public DifficultyRating DifficultyRating => BeatmapDifficultyCache.GetDifficultyRating(Stars);
-    }
 }
diff --git a/osu.Game/Beatmaps/StarDifficulty.cs b/osu.Game/Beatmaps/StarDifficulty.cs
new file mode 100644
index 0000000000..f438b6f0bc
--- /dev/null
+++ b/osu.Game/Beatmaps/StarDifficulty.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 JetBrains.Annotations;
+using osu.Game.Rulesets.Difficulty;
+
+namespace osu.Game.Beatmaps
+{
+    public readonly struct StarDifficulty
+    {
+        /// <summary>
+        /// The star difficulty rating for the given beatmap.
+        /// </summary>
+        public readonly double Stars;
+
+        /// <summary>
+        /// The maximum combo achievable on the given beatmap.
+        /// </summary>
+        public readonly int MaxCombo;
+
+        /// <summary>
+        /// The difficulty attributes computed for the given beatmap.
+        /// Might not be available if the star difficulty is associated with a beatmap that's not locally available.
+        /// </summary>
+        [CanBeNull]
+        public readonly DifficultyAttributes Attributes;
+
+        /// <summary>
+        /// Creates a <see cref="StarDifficulty"/> structure based on <see cref="DifficultyAttributes"/> computed
+        /// by a <see cref="DifficultyCalculator"/>.
+        /// </summary>
+        public StarDifficulty([NotNull] DifficultyAttributes attributes)
+        {
+            Stars = attributes.StarRating;
+            MaxCombo = attributes.MaxCombo;
+            Attributes = attributes;
+            // Todo: Add more members (BeatmapInfo.DifficultyRating? Attributes? Etc...)
+        }
+
+        /// <summary>
+        /// Creates a <see cref="StarDifficulty"/> structure with a pre-populated star difficulty and max combo
+        /// in scenarios where computing <see cref="DifficultyAttributes"/> is not feasible (i.e. when working with online sources).
+        /// </summary>
+        public StarDifficulty(double starDifficulty, int maxCombo)
+        {
+            Stars = starDifficulty;
+            MaxCombo = maxCombo;
+            Attributes = null;
+        }
+
+        public DifficultyRating DifficultyRating => BeatmapDifficultyCache.GetDifficultyRating(Stars);
+    }
+}

From a2606d31c791d35e5d183ae6bfa1d0429fa5c55d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 13:50:51 +0900
Subject: [PATCH 05977/10326] Move lookup/storage/compute logic to base class
 (and consume in ScorePerformanceCache)

---
 osu.Game/Database/MemoryCachingComponent.cs | 33 ++++++++++++++++++-
 osu.Game/Scoring/ScorePerformanceCache.cs   | 35 ++++++++-------------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Database/MemoryCachingComponent.cs b/osu.Game/Database/MemoryCachingComponent.cs
index 85cf3b8af1..afdf37fa27 100644
--- a/osu.Game/Database/MemoryCachingComponent.cs
+++ b/osu.Game/Database/MemoryCachingComponent.cs
@@ -2,6 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Concurrent;
+using System.Threading;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 
 namespace osu.Game.Database
@@ -12,6 +15,34 @@ namespace osu.Game.Database
     /// </summary>
     public abstract class MemoryCachingComponent<TLookup, TValue> : Component
     {
-        protected readonly ConcurrentDictionary<TLookup, TValue> Cache = new ConcurrentDictionary<TLookup, TValue>();
+        private readonly ConcurrentDictionary<TLookup, TValue> cache = new ConcurrentDictionary<TLookup, TValue>();
+
+        protected virtual bool CacheNullValues => true;
+
+        /// <summary>
+        /// Retrieve the cached value for the given <see cref="TLookup"/>.
+        /// </summary>
+        /// <param name="lookup">The lookup to retrieve.</param>
+        /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
+        protected async Task<TValue> GetAsync([NotNull] TLookup lookup, CancellationToken token = default)
+        {
+            if (cache.TryGetValue(lookup, out TValue performance))
+                return performance;
+
+            var computed = await ComputeValueAsync(lookup, token);
+
+            if (computed != null || CacheNullValues)
+                cache[lookup] = computed;
+
+            return computed;
+        }
+
+        /// <summary>
+        /// Called on cache miss to compute the value for the specified lookup.
+        /// </summary>
+        /// <param name="lookup">The lookup to retrieve.</param>
+        /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
+        /// <returns>The computed value.</returns>
+        protected abstract Task<TValue> ComputeValueAsync(TLookup lookup, CancellationToken token = default);
     }
 }
diff --git a/osu.Game/Scoring/ScorePerformanceCache.cs b/osu.Game/Scoring/ScorePerformanceCache.cs
index 435b93d7af..5f66c13d2f 100644
--- a/osu.Game/Scoring/ScorePerformanceCache.cs
+++ b/osu.Game/Scoring/ScorePerformanceCache.cs
@@ -15,28 +15,25 @@ namespace osu.Game.Scoring
     /// A component which performs and acts as a central cache for performance calculations of locally databased scores.
     /// Currently not persisted between game sessions.
     /// </summary>
-    public class ScorePerformanceCache : MemoryCachingComponent<ScorePerformanceCache.PerformanceCacheLookup, double>
+    public class ScorePerformanceCache : MemoryCachingComponent<ScorePerformanceCache.PerformanceCacheLookup, double?>
     {
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
 
+        protected override bool CacheNullValues => false;
+
         /// <summary>
         /// Calculates performance for the given <see cref="ScoreInfo"/>.
         /// </summary>
         /// <param name="score">The score to do the calculation on. </param>
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
-        public Task<double?> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default)
+        public Task<double?> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default) =>
+            GetAsync(new PerformanceCacheLookup(score), token);
+
+        protected override async Task<double?> ComputeValueAsync(PerformanceCacheLookup lookup, CancellationToken token = default)
         {
-            var lookupKey = new PerformanceCacheLookup(score);
+            var score = lookup.ScoreInfo;
 
-            if (Cache.TryGetValue(lookupKey, out double performance))
-                return Task.FromResult((double?)performance);
-
-            return computePerformanceAsync(score, lookupKey, token);
-        }
-
-        private async Task<double?> computePerformanceAsync(ScoreInfo score, PerformanceCacheLookup lookupKey, CancellationToken token = default)
-        {
             var attributes = await difficultyCache.GetDifficultyAsync(score.Beatmap, score.Ruleset, score.Mods, token);
 
             // Performance calculation requires the beatmap and ruleset to be locally available. If not, return a default value.
@@ -46,31 +43,25 @@ namespace osu.Game.Scoring
             token.ThrowIfCancellationRequested();
 
             var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(attributes.Attributes, score);
-            var total = calculator?.Calculate();
 
-            if (total.HasValue)
-                Cache[lookupKey] = total.Value;
-
-            return total;
+            return calculator?.Calculate();
         }
 
         public readonly struct PerformanceCacheLookup
         {
-            public readonly string ScoreHash;
-            public readonly int LocalScoreID;
+            public readonly ScoreInfo ScoreInfo;
 
             public PerformanceCacheLookup(ScoreInfo info)
             {
-                ScoreHash = info.Hash;
-                LocalScoreID = info.ID;
+                ScoreInfo = info;
             }
 
             public override int GetHashCode()
             {
                 var hash = new HashCode();
 
-                hash.Add(ScoreHash);
-                hash.Add(LocalScoreID);
+                hash.Add(ScoreInfo.Hash);
+                hash.Add(ScoreInfo.ID);
 
                 return hash.ToHashCode();
             }

From b69ada64e85a00cbe64604139fc32954804cd593 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 14:31:21 +0900
Subject: [PATCH 05978/10326] Update BeatmapDifficultyCache to use base
 implementation logic

---
 .../Beatmaps/BeatmapDifficultyManagerTest.cs  |   9 +-
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs   | 130 ++++++++----------
 osu.Game/Database/MemoryCachingComponent.cs   |   5 +-
 3 files changed, 63 insertions(+), 81 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs b/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
index ec77f48063..70503bec7a 100644
--- a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
+++ b/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
 
@@ -14,8 +15,8 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestKeyEqualsWithDifferentModInstances()
         {
-            var key1 = new BeatmapDifficultyCache.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
-            var key2 = new BeatmapDifficultyCache.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+            var key1 = new BeatmapDifficultyCache.DifficultyCacheLookup(new BeatmapInfo { ID = 1234 }, new RulesetInfo { ID = 0 }, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+            var key2 = new BeatmapDifficultyCache.DifficultyCacheLookup(new BeatmapInfo { ID = 1234 }, new RulesetInfo { ID = 0 }, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
 
             Assert.That(key1, Is.EqualTo(key2));
         }
@@ -23,8 +24,8 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestKeyEqualsWithDifferentModOrder()
         {
-            var key1 = new BeatmapDifficultyCache.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
-            var key2 = new BeatmapDifficultyCache.DifficultyCacheLookup(1234, 0, new Mod[] { new OsuModHidden(), new OsuModHardRock() });
+            var key1 = new BeatmapDifficultyCache.DifficultyCacheLookup(new BeatmapInfo { ID = 1234 }, new RulesetInfo { ID = 0 }, new Mod[] { new OsuModHardRock(), new OsuModHidden() });
+            var key2 = new BeatmapDifficultyCache.DifficultyCacheLookup(new BeatmapInfo { ID = 1234 }, new RulesetInfo { ID = 0 }, new Mod[] { new OsuModHidden(), new OsuModHardRock() });
 
             Assert.That(key1, Is.EqualTo(key2));
         }
diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index af1b1de0c1..126e08a173 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -86,20 +86,30 @@ namespace osu.Game.Beatmaps
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops computing the star difficulty.</param>
         /// <returns>The <see cref="StarDifficulty"/>.</returns>
-        public async Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null,
-                                                             CancellationToken cancellationToken = default)
+        public Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null, CancellationToken cancellationToken = default)
         {
-            if (tryGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
-                return existing;
+            // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
+            rulesetInfo ??= beatmapInfo.Ruleset;
 
-            return await Task.Factory.StartNew(() =>
+            // Difficulty can only be computed if the beatmap and ruleset are locally available.
+            if (beatmapInfo.ID == 0 || rulesetInfo.ID == null)
             {
-                // Computation may have finished in a previous task.
-                if (tryGetExisting(beatmapInfo, rulesetInfo, mods, out existing, out _))
+                // If not, fall back to the existing star difficulty (e.g. from an online source).
+                return Task.FromResult(new StarDifficulty(beatmapInfo.StarDifficulty, beatmapInfo.MaxCombo ?? 0));
+            }
+
+            return GetAsync(new DifficultyCacheLookup(beatmapInfo, rulesetInfo, mods), cancellationToken);
+        }
+
+        protected override Task<StarDifficulty> ComputeValueAsync(DifficultyCacheLookup lookup, CancellationToken token = default)
+        {
+            return Task.Factory.StartNew(() =>
+            {
+                if (CheckExists(lookup, out var existing))
                     return existing;
 
-                return computeDifficulty(key, beatmapInfo, rulesetInfo);
-            }, cancellationToken, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
+                return computeDifficulty(lookup);
+            }, token, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
         }
 
         /// <summary>
@@ -111,10 +121,8 @@ namespace osu.Game.Beatmaps
         /// <returns>The <see cref="StarDifficulty"/>.</returns>
         public StarDifficulty GetDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null)
         {
-            if (tryGetExisting(beatmapInfo, rulesetInfo, mods, out var existing, out var key))
-                return existing;
-
-            return computeDifficulty(key, beatmapInfo, rulesetInfo);
+            // this is safe in this usage because the only asynchronous part is handled by the local scheduler.
+            return GetDifficultyAsync(beatmapInfo, rulesetInfo, mods).Result;
         }
 
         /// <summary>
@@ -207,38 +215,38 @@ namespace osu.Game.Beatmaps
         /// <param name="cancellationToken">A token that may be used to cancel this update.</param>
         private void updateBindable([NotNull] BindableStarDifficulty bindable, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods, CancellationToken cancellationToken = default)
         {
-            GetDifficultyAsync(bindable.Beatmap, rulesetInfo, mods, cancellationToken).ContinueWith(t =>
-            {
-                // We're on a threadpool thread, but we should exit back to the update thread so consumers can safely handle value-changed events.
-                Schedule(() =>
+            GetAsync(new DifficultyCacheLookup(bindable.Beatmap, rulesetInfo, mods), cancellationToken)
+                .ContinueWith(t =>
                 {
-                    if (!cancellationToken.IsCancellationRequested)
-                        bindable.Value = t.Result;
-                });
-            }, cancellationToken);
+                    // We're on a threadpool thread, but we should exit back to the update thread so consumers can safely handle value-changed events.
+                    Schedule(() =>
+                    {
+                        if (!cancellationToken.IsCancellationRequested)
+                            bindable.Value = t.Result;
+                    });
+                }, cancellationToken);
         }
 
         /// <summary>
         /// Computes the difficulty defined by a <see cref="DifficultyCacheLookup"/> key, and stores it to the timed cache.
         /// </summary>
         /// <param name="key">The <see cref="DifficultyCacheLookup"/> that defines the computation parameters.</param>
-        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to compute the difficulty of.</param>
-        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to compute the difficulty with.</param>
         /// <returns>The <see cref="StarDifficulty"/>.</returns>
-        private StarDifficulty computeDifficulty(in DifficultyCacheLookup key, BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo)
+        private StarDifficulty computeDifficulty(in DifficultyCacheLookup key)
         {
             // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
-            rulesetInfo ??= beatmapInfo.Ruleset;
+            var beatmapInfo = key.Beatmap;
+            var rulesetInfo = key.Ruleset;
 
             try
             {
                 var ruleset = rulesetInfo.CreateInstance();
                 Debug.Assert(ruleset != null);
 
-                var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(beatmapInfo));
-                var attributes = calculator.Calculate(key.Mods);
+                var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(key.Beatmap));
+                var attributes = calculator.Calculate(key.OrderedMods);
 
-                return Cache[key] = new StarDifficulty(attributes);
+                return new StarDifficulty(attributes);
             }
             catch (BeatmapInvalidForRulesetException e)
             {
@@ -249,49 +257,17 @@ namespace osu.Game.Beatmaps
                 if (rulesetInfo.Equals(beatmapInfo.Ruleset))
                 {
                     Logger.Error(e, $"Failed to convert {beatmapInfo.OnlineBeatmapID} to the beatmap's default ruleset ({beatmapInfo.Ruleset}).");
-                    return Cache[key] = new StarDifficulty();
+                    return new StarDifficulty();
                 }
 
-                // Check the cache first because this is now a different ruleset than the one previously guarded against.
-                if (tryGetExisting(beatmapInfo, beatmapInfo.Ruleset, Array.Empty<Mod>(), out var existingDefault, out var existingDefaultKey))
-                    return existingDefault;
-
-                return computeDifficulty(existingDefaultKey, beatmapInfo, beatmapInfo.Ruleset);
+                return GetAsync(new DifficultyCacheLookup(key.Beatmap, key.Beatmap.Ruleset, key.OrderedMods)).Result;
             }
             catch
             {
-                return Cache[key] = new StarDifficulty();
+                return new StarDifficulty();
             }
         }
 
-        /// <summary>
-        /// Attempts to retrieve an existing difficulty for the combination.
-        /// </summary>
-        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/>.</param>
-        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/>.</param>
-        /// <param name="mods">The <see cref="Mod"/>s.</param>
-        /// <param name="existingDifficulty">The existing difficulty value, if present.</param>
-        /// <param name="key">The <see cref="DifficultyCacheLookup"/> key that was used to perform this lookup. This can be further used to query <see cref="computeDifficulty"/>.</param>
-        /// <returns>Whether an existing difficulty was found.</returns>
-        private bool tryGetExisting(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo, IEnumerable<Mod> mods, out StarDifficulty existingDifficulty, out DifficultyCacheLookup key)
-        {
-            // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
-            rulesetInfo ??= beatmapInfo.Ruleset;
-
-            // Difficulty can only be computed if the beatmap and ruleset are locally available.
-            if (beatmapInfo.ID == 0 || rulesetInfo.ID == null)
-            {
-                // If not, fall back to the existing star difficulty (e.g. from an online source).
-                existingDifficulty = new StarDifficulty(beatmapInfo.StarDifficulty, beatmapInfo.MaxCombo ?? 0);
-                key = default;
-
-                return true;
-            }
-
-            key = new DifficultyCacheLookup(beatmapInfo.ID, rulesetInfo.ID.Value, mods);
-            return Cache.TryGetValue(key, out existingDifficulty);
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -302,29 +278,31 @@ namespace osu.Game.Beatmaps
 
         public readonly struct DifficultyCacheLookup : IEquatable<DifficultyCacheLookup>
         {
-            public readonly int BeatmapId;
-            public readonly int RulesetId;
-            public readonly Mod[] Mods;
+            public readonly BeatmapInfo Beatmap;
+            public readonly RulesetInfo Ruleset;
 
-            public DifficultyCacheLookup(int beatmapId, int rulesetId, IEnumerable<Mod> mods)
+            public readonly Mod[] OrderedMods;
+
+            public DifficultyCacheLookup([NotNull] BeatmapInfo beatmap, [NotNull] RulesetInfo ruleset, IEnumerable<Mod> mods)
             {
-                BeatmapId = beatmapId;
-                RulesetId = rulesetId;
-                Mods = mods?.OrderBy(m => m.Acronym).ToArray() ?? Array.Empty<Mod>();
+                Beatmap = beatmap;
+                Ruleset = ruleset;
+                OrderedMods = mods?.OrderBy(m => m.Acronym).ToArray() ?? Array.Empty<Mod>();
             }
 
             public bool Equals(DifficultyCacheLookup other)
-                => BeatmapId == other.BeatmapId
-                   && RulesetId == other.RulesetId
-                   && Mods.Select(m => m.Acronym).SequenceEqual(other.Mods.Select(m => m.Acronym));
+                => Beatmap.ID == other.Beatmap.ID
+                   && Ruleset.ID == other.Ruleset.ID
+                   && OrderedMods.Select(m => m.Acronym).SequenceEqual(other.OrderedMods.Select(m => m.Acronym));
 
             public override int GetHashCode()
             {
                 var hashCode = new HashCode();
 
-                hashCode.Add(BeatmapId);
-                hashCode.Add(RulesetId);
-                foreach (var mod in Mods)
+                hashCode.Add(Beatmap.ID);
+                hashCode.Add(Ruleset.ID);
+
+                foreach (var mod in OrderedMods)
                     hashCode.Add(mod.Acronym);
 
                 return hashCode.ToHashCode();
diff --git a/osu.Game/Database/MemoryCachingComponent.cs b/osu.Game/Database/MemoryCachingComponent.cs
index afdf37fa27..efc31f2b46 100644
--- a/osu.Game/Database/MemoryCachingComponent.cs
+++ b/osu.Game/Database/MemoryCachingComponent.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Database
         protected virtual bool CacheNullValues => true;
 
         /// <summary>
-        /// Retrieve the cached value for the given <see cref="TLookup"/>.
+        /// Retrieve the cached value for the given lookup.
         /// </summary>
         /// <param name="lookup">The lookup to retrieve.</param>
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
@@ -37,6 +37,9 @@ namespace osu.Game.Database
             return computed;
         }
 
+        protected bool CheckExists([NotNull] TLookup lookup, out TValue value) =>
+            cache.TryGetValue(lookup, out value);
+
         /// <summary>
         /// Called on cache miss to compute the value for the specified lookup.
         /// </summary>

From c5b172d0dd283f3b494883029728beca8b4fc3a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 14:53:15 +0900
Subject: [PATCH 05979/10326] Remove synchronous lookup path from
 BeatmapDifficultyCache

---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs         | 13 -------------
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs  |  4 +++-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 126e08a173..40de98f0be 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -112,19 +112,6 @@ namespace osu.Game.Beatmaps
             }, token, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
         }
 
-        /// <summary>
-        /// Retrieves the difficulty of a <see cref="BeatmapInfo"/>.
-        /// </summary>
-        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
-        /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with.</param>
-        /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
-        /// <returns>The <see cref="StarDifficulty"/>.</returns>
-        public StarDifficulty GetDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null)
-        {
-            // this is safe in this usage because the only asynchronous part is handled by the local scheduler.
-            return GetDifficultyAsync(beatmapInfo, rulesetInfo, mods).Result;
-        }
-
         /// <summary>
         /// Retrieves the <see cref="DifficultyRating"/> that describes a star rating.
         /// </summary>
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 33ee5d2ee4..ff6203bc25 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -77,6 +77,8 @@ namespace osu.Game.Screens.Ranking.Expanded
             statisticDisplays.AddRange(topStatistics);
             statisticDisplays.AddRange(bottomStatistics);
 
+            var starDifficulty = beatmapDifficultyCache.GetDifficultyAsync(beatmap, score.Ruleset, score.Mods).Result;
+
             InternalChildren = new Drawable[]
             {
                 new FillFlowContainer
@@ -143,7 +145,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     Spacing = new Vector2(5, 0),
                                     Children = new Drawable[]
                                     {
-                                        new StarRatingDisplay(beatmapDifficultyCache.GetDifficulty(beatmap, score.Ruleset, score.Mods))
+                                        new StarRatingDisplay(starDifficulty)
                                         {
                                             Anchor = Anchor.CentreLeft,
                                             Origin = Anchor.CentreLeft

From d3a303e2517e8b8c9d449225d1f9e12083e2a806 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 16:57:09 +0900
Subject: [PATCH 05980/10326] Use CheckExists function

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

diff --git a/osu.Game/Database/MemoryCachingComponent.cs b/osu.Game/Database/MemoryCachingComponent.cs
index efc31f2b46..d913e66428 100644
--- a/osu.Game/Database/MemoryCachingComponent.cs
+++ b/osu.Game/Database/MemoryCachingComponent.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Database
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
         protected async Task<TValue> GetAsync([NotNull] TLookup lookup, CancellationToken token = default)
         {
-            if (cache.TryGetValue(lookup, out TValue performance))
+            if (CheckExists(lookup, out TValue performance))
                 return performance;
 
             var computed = await ComputeValueAsync(lookup, token);

From f51cb0dd14aaf023840ed6904f9646c845e1415b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 16:58:53 +0900
Subject: [PATCH 05981/10326] Add ruleset fallback logic into cache lookup
 class

---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 40de98f0be..e62b2b1ff1 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -273,7 +273,8 @@ namespace osu.Game.Beatmaps
             public DifficultyCacheLookup([NotNull] BeatmapInfo beatmap, [NotNull] RulesetInfo ruleset, IEnumerable<Mod> mods)
             {
                 Beatmap = beatmap;
-                Ruleset = ruleset;
+                // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
+                Ruleset = ruleset ?? Beatmap.Ruleset;
                 OrderedMods = mods?.OrderBy(m => m.Acronym).ToArray() ?? Array.Empty<Mod>();
             }
 

From aa252d562a11e44dbf660213ec38931fce43dd17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 12:42:45 +0900
Subject: [PATCH 05982/10326] Rename top user request to make way for new type

---
 .../API/Requests/{GetUsersRequest.cs => GetTopUsersRequest.cs}  | 2 +-
 .../Requests/{GetUsersResponse.cs => GetTopUsersResponse.cs}    | 2 +-
 osu.Game/Online/API/Requests/GetUserRankingsRequest.cs          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename osu.Game/Online/API/Requests/{GetUsersRequest.cs => GetTopUsersRequest.cs} (80%)
 rename osu.Game/Online/API/Requests/{GetUsersResponse.cs => GetTopUsersResponse.cs} (86%)

diff --git a/osu.Game/Online/API/Requests/GetUsersRequest.cs b/osu.Game/Online/API/Requests/GetTopUsersRequest.cs
similarity index 80%
rename from osu.Game/Online/API/Requests/GetUsersRequest.cs
rename to osu.Game/Online/API/Requests/GetTopUsersRequest.cs
index b75ecd5bd7..dbbd2119db 100644
--- a/osu.Game/Online/API/Requests/GetUsersRequest.cs
+++ b/osu.Game/Online/API/Requests/GetTopUsersRequest.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetUsersRequest : APIRequest<GetUsersResponse>
+    public class GetTopUsersRequest : APIRequest<GetTopUsersResponse>
     {
         protected override string Target => @"rankings/osu/performance";
     }
diff --git a/osu.Game/Online/API/Requests/GetUsersResponse.cs b/osu.Game/Online/API/Requests/GetTopUsersResponse.cs
similarity index 86%
rename from osu.Game/Online/API/Requests/GetUsersResponse.cs
rename to osu.Game/Online/API/Requests/GetTopUsersResponse.cs
index b301f551e3..b37b8b3499 100644
--- a/osu.Game/Online/API/Requests/GetUsersResponse.cs
+++ b/osu.Game/Online/API/Requests/GetTopUsersResponse.cs
@@ -7,7 +7,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetUsersResponse : ResponseWithCursor
+    public class GetTopUsersResponse : ResponseWithCursor
     {
         [JsonProperty("ranking")]
         public List<UserStatistics> Users;
diff --git a/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs b/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
index 143d21e40d..bccc3bc0c3 100644
--- a/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
@@ -6,7 +6,7 @@ using osu.Game.Rulesets;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetUserRankingsRequest : GetRankingsRequest<GetUsersResponse>
+    public class GetUserRankingsRequest : GetRankingsRequest<GetTopUsersResponse>
     {
         public readonly UserRankingsType Type;
 

From db039da668755507f5ba34985601c2e733d6e1b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 12:54:08 +0900
Subject: [PATCH 05983/10326] Add and consume multi-lookup API endpoint

---
 .../Online/API/Requests/GetUsersRequest.cs    | 19 +++++++++++++++++++
 .../Online/API/Requests/GetUsersResponse.cs   | 15 +++++++++++++++
 .../Dashboard/CurrentlyPlayingDisplay.cs      | 13 +++++++------
 osu.Game/Overlays/DashboardOverlay.cs         |  3 +--
 4 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/Online/API/Requests/GetUsersRequest.cs
 create mode 100644 osu.Game/Online/API/Requests/GetUsersResponse.cs

diff --git a/osu.Game/Online/API/Requests/GetUsersRequest.cs b/osu.Game/Online/API/Requests/GetUsersRequest.cs
new file mode 100644
index 0000000000..9a7006f5d6
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetUsersRequest.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.Linq;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetUsersRequest : APIRequest<GetUsersResponse>
+    {
+        private readonly int[] userIds;
+
+        public GetUsersRequest(int[] userIds)
+        {
+            this.userIds = userIds;
+        }
+
+        protected override string Target => $@"users/?{userIds.Select(u => $"ids[]={u}&").Aggregate((a, b) => a + b)}";
+    }
+}
diff --git a/osu.Game/Online/API/Requests/GetUsersResponse.cs b/osu.Game/Online/API/Requests/GetUsersResponse.cs
new file mode 100644
index 0000000000..6f49d5cd53
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetUsersResponse.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 System.Collections.Generic;
+using Newtonsoft.Json;
+using osu.Game.Users;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetUsersResponse : ResponseWithCursor
+    {
+        [JsonProperty("users")]
+        public List<User> Users;
+    }
+}
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index dae27f35ae..9020b317ef 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -54,17 +54,18 @@ namespace osu.Game.Overlays.Dashboard
                 switch (e.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
-                        foreach (var u in e.NewItems.OfType<int>())
+                        var request = new GetUsersRequest(e.NewItems.OfType<int>().ToArray());
+
+                        request.Success += users => Schedule(() =>
                         {
-                            var request = new GetUserRequest(u);
-                            request.Success += user => Schedule(() =>
+                            foreach (var user in users.Users)
                             {
                                 if (playingUsers.Contains(user.Id))
                                     userFlow.Add(createUserPanel(user));
-                            });
-                            api.Queue(request);
-                        }
+                            }
+                        });
 
+                        api.Queue(request);
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 787a4985d7..04defce636 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -131,8 +131,7 @@ namespace osu.Game.Overlays
                     break;
 
                 case DashboardOverlayTabs.CurrentlyPlaying:
-                    //todo: enable once caching logic is better
-                    //loadDisplay(new CurrentlyPlayingDisplay());
+                    loadDisplay(new CurrentlyPlayingDisplay());
                     break;
 
                 default:

From 2457083d8bffda0e1b97c0db609dac0e92331bf8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 13:08:07 +0900
Subject: [PATCH 05984/10326] Add padding to currently playing view

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

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 9020b317ef..e9915df801 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -37,6 +37,7 @@ namespace osu.Game.Overlays.Dashboard
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
+                Padding = new MarginPadding(10),
                 Spacing = new Vector2(10),
             };
         }

From 893979b3deab4b95cc62814c18ba2db2fa3a9d87 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 13:10:18 +0900
Subject: [PATCH 05985/10326] Add exception if attempting to exceed the maximum
 supported lookup size for one request

---
 osu.Game/Online/API/Requests/GetUsersRequest.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/API/Requests/GetUsersRequest.cs b/osu.Game/Online/API/Requests/GetUsersRequest.cs
index 9a7006f5d6..0ec5173fb6 100644
--- a/osu.Game/Online/API/Requests/GetUsersRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUsersRequest.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;
 
 namespace osu.Game.Online.API.Requests
@@ -9,8 +10,13 @@ namespace osu.Game.Online.API.Requests
     {
         private readonly int[] userIds;
 
+        private const int max_ids_per_request = 50;
+
         public GetUsersRequest(int[] userIds)
         {
+            if (userIds.Length > max_ids_per_request)
+                throw new ArgumentException($"{nameof(GetUsersRequest)} calls only support up to {max_ids_per_request} IDs at once");
+
             this.userIds = userIds;
         }
 

From c97c6bbf52046504e31a829435447ddc1f993881 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 16:38:57 +0900
Subject: [PATCH 05986/10326] Add and consume user cache class

---
 osu.Game/Database/UserLookupCache.cs          | 118 ++++++++++++++++++
 osu.Game/OsuGameBase.cs                       |   5 +
 .../Dashboard/CurrentlyPlayingDisplay.cs      |  22 ++--
 3 files changed, 136 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game/Database/UserLookupCache.cs

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
new file mode 100644
index 0000000000..f5c84c9edf
--- /dev/null
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -0,0 +1,118 @@
+// Copyright (c) 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.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Users;
+
+namespace osu.Game.Database
+{
+    public class UserLookupCache : MemoryCachingComponent<int, User>
+    {
+        private readonly ConcurrentBag<int> nextTaskIDs = new ConcurrentBag<int>();
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private readonly object taskAssignmentLock = new object();
+
+        private Task<List<User>> pendingRequest;
+
+        /// <summary>
+        /// Whether <see cref="pendingRequest"/> has already grabbed its IDs.
+        /// </summary>
+        private bool pendingRequestConsumedIDs;
+
+        public Task<User> GetUser(int userId, CancellationToken token = default) => GetAsync(userId, token);
+
+        protected override async Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
+        {
+            var users = await getQueryTaskForUser(lookup);
+            return users.FirstOrDefault(u => u.Id == lookup);
+        }
+
+        /// <summary>
+        /// Return the task responsible for fetching the provided user.
+        /// This may be part of a larger batch lookup to reduce web requests.
+        /// </summary>
+        /// <param name="userId">The user to lookup.</param>
+        /// <returns>The task responsible for the lookup.</returns>
+        private Task<List<User>> getQueryTaskForUser(int userId)
+        {
+            lock (taskAssignmentLock)
+            {
+                nextTaskIDs.Add(userId);
+
+                // if there's a pending request which hasn't been started yet (and is not yet full), we can wait on it.
+                if (pendingRequest != null && !pendingRequestConsumedIDs && nextTaskIDs.Count < 50)
+                    return pendingRequest;
+
+                return queueNextTask(nextLookup);
+            }
+
+            List<User> nextLookup()
+            {
+                int[] lookupItems;
+
+                lock (taskAssignmentLock)
+                {
+                    pendingRequestConsumedIDs = true;
+                    lookupItems = nextTaskIDs.ToArray();
+                    nextTaskIDs.Clear();
+
+                    if (lookupItems.Length == 0)
+                    {
+                        queueNextTask(null);
+                        return new List<User>();
+                    }
+                }
+
+                var request = new GetUsersRequest(lookupItems);
+
+                // rather than queueing, we maintain our own single-threaded request stream.
+                request.Perform(api);
+
+                return request.Result.Users;
+            }
+        }
+
+        /// <summary>
+        /// Queues new work at the end of the current work tasks.
+        /// Ensures the provided work is eventually run.
+        /// </summary>
+        /// <param name="work">The work to run. Can be null to signify the end of available work.</param>
+        /// <returns>The task tracking this work.</returns>
+        private Task<List<User>> queueNextTask(Func<List<User>> work)
+        {
+            lock (taskAssignmentLock)
+            {
+                if (work == null)
+                {
+                    pendingRequest = null;
+                    pendingRequestConsumedIDs = false;
+                }
+                else if (pendingRequest == null)
+                {
+                    // special case for the first request ever.
+                    pendingRequest = Task.Run(work);
+                    pendingRequestConsumedIDs = false;
+                }
+                else
+                {
+                    // append the new request on to the last to be executed.
+                    pendingRequest = pendingRequest.ContinueWith(_ => work());
+                    pendingRequestConsumedIDs = false;
+                }
+
+                return pendingRequest;
+            }
+        }
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 3da692249d..193f6fe61b 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -61,6 +61,8 @@ namespace osu.Game
 
         protected BeatmapDifficultyCache DifficultyCache;
 
+        protected UserLookupCache UserCache;
+
         protected SkinManager SkinManager;
 
         protected RulesetStore RulesetStore;
@@ -229,6 +231,9 @@ namespace osu.Game
             dependencies.Cache(DifficultyCache = new BeatmapDifficultyCache());
             AddInternal(DifficultyCache);
 
+            dependencies.Cache(UserCache = new UserLookupCache());
+            AddInternal(UserCache);
+
             var scorePerformanceManager = new ScorePerformanceCache();
             dependencies.Cache(scorePerformanceManager);
             AddInternal(scorePerformanceManager);
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index e9915df801..a988381f29 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -8,8 +8,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
+using osu.Game.Database;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.Spectator;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Play;
@@ -45,6 +45,9 @@ namespace osu.Game.Overlays.Dashboard
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private UserLookupCache users { get; set; }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -55,18 +58,19 @@ namespace osu.Game.Overlays.Dashboard
                 switch (e.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
-                        var request = new GetUsersRequest(e.NewItems.OfType<int>().ToArray());
 
-                        request.Success += users => Schedule(() =>
+                        foreach (var id in e.NewItems.OfType<int>().ToArray())
                         {
-                            foreach (var user in users.Users)
+                            users.GetUser(id).ContinueWith(u =>
                             {
-                                if (playingUsers.Contains(user.Id))
-                                    userFlow.Add(createUserPanel(user));
-                            }
-                        });
+                                Schedule(() =>
+                                {
+                                    if (playingUsers.Contains(u.Result.Id))
+                                        userFlow.Add(createUserPanel(u.Result));
+                                });
+                            });
+                        }
 
-                        api.Queue(request);
                         break;
 
                     case NotifyCollectionChangedAction.Remove:

From c1c3d377209b97492955cc1682ce3c60cfcede48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 17:24:28 +0900
Subject: [PATCH 05987/10326] Remove non-null assert

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

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index e62b2b1ff1..9820d508dd 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -270,7 +270,7 @@ namespace osu.Game.Beatmaps
 
             public readonly Mod[] OrderedMods;
 
-            public DifficultyCacheLookup([NotNull] BeatmapInfo beatmap, [NotNull] RulesetInfo ruleset, IEnumerable<Mod> mods)
+            public DifficultyCacheLookup([NotNull] BeatmapInfo beatmap, [CanBeNull] RulesetInfo ruleset, IEnumerable<Mod> mods)
             {
                 Beatmap = beatmap;
                 // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.

From 1ca8b03aa5a2ba9be0bd2e813bd5cf01e5677f09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 17:26:23 +0900
Subject: [PATCH 05988/10326] Never disable pause button on now playing overlay

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

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 55adf02a45..9beb859f28 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -308,7 +308,6 @@ namespace osu.Game.Overlays
             if (disabled)
                 playlist.Hide();
 
-            playButton.Enabled.Value = !disabled;
             prevButton.Enabled.Value = !disabled;
             nextButton.Enabled.Value = !disabled;
             playlistButton.Enabled.Value = !disabled;

From c3c288145a81d61bf90c823aa7bbab5e302d76d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 17:55:29 +0900
Subject: [PATCH 05989/10326] Ignore null results for now

---
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index a988381f29..8299619a18 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -63,6 +63,9 @@ namespace osu.Game.Overlays.Dashboard
                         {
                             users.GetUser(id).ContinueWith(u =>
                             {
+                                if (u.Result == null)
+                                    return;
+
                                 Schedule(() =>
                                 {
                                     if (playingUsers.Contains(u.Result.Id))

From 4bbd3fe8864b2e7aea89b971e09913a53a094004 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 18:37:27 +0900
Subject: [PATCH 05990/10326] Handle null result

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

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index f5c84c9edf..b7c6c480a9 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Database
                 // rather than queueing, we maintain our own single-threaded request stream.
                 request.Perform(api);
 
-                return request.Result.Users;
+                return request.Result?.Users;
             }
         }
 

From ee84a9827ee702cc1a66c535ab17a1787b71074e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Nov 2020 18:41:05 +0900
Subject: [PATCH 05991/10326] Fix regressed test

---
 .../TestSceneCurrentlyPlayingDisplay.cs       | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index d6fd33bce7..7eba64f418 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -2,12 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
+using osu.Game.Database;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays.Dashboard;
 using osu.Game.Tests.Visual.Gameplay;
@@ -22,32 +24,34 @@ namespace osu.Game.Tests.Visual.Online
 
         private CurrentlyPlayingDisplay currentlyPlaying;
 
-        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+        [Cached(typeof(UserLookupCache))]
+        private UserLookupCache lookupCache = new TestUserLookupCache();
+
+        private Container nestedContainer;
 
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("register request handling", () => dummyAPI.HandleRequest = req =>
-            {
-                switch (req)
-                {
-                    case GetUserRequest cRequest:
-                        cRequest.TriggerSuccess(new User { Username = "peppy", Id = 2 });
-                        break;
-                }
-            });
-
             AddStep("add streaming client", () =>
             {
-                Remove(testSpectatorStreamingClient);
+                nestedContainer?.Remove(testSpectatorStreamingClient);
+                Remove(lookupCache);
 
                 Children = new Drawable[]
                 {
-                    testSpectatorStreamingClient,
-                    currentlyPlaying = new CurrentlyPlayingDisplay
+                    lookupCache,
+                    nestedContainer = new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                    }
+                        Children = new Drawable[]
+                        {
+                            testSpectatorStreamingClient,
+                            currentlyPlaying = new CurrentlyPlayingDisplay
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                            }
+                        }
+                    },
                 };
             });
 
@@ -62,5 +66,11 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Remove playing user", () => testSpectatorStreamingClient.PlayingUsers.Remove(2));
             AddUntilStep("Panel no longer present", () => !currentlyPlaying.ChildrenOfType<UserGridPanel>().Any());
         }
+
+        internal class TestUserLookupCache : UserLookupCache
+        {
+            protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
+                => Task.FromResult(new User { Username = "peppy", Id = 2 });
+        }
     }
 }

From 2bef9312d9c88f4424ee0896b38b240bb5a3801d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 6 Nov 2020 22:11:49 +0900
Subject: [PATCH 05992/10326] Make SkinReloadableDrawable poolable

---
 osu.Game/Skinning/SkinReloadableDrawable.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinReloadableDrawable.cs b/osu.Game/Skinning/SkinReloadableDrawable.cs
index 4a1aaa62bf..d0531c46c5 100644
--- a/osu.Game/Skinning/SkinReloadableDrawable.cs
+++ b/osu.Game/Skinning/SkinReloadableDrawable.cs
@@ -4,13 +4,14 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 
 namespace osu.Game.Skinning
 {
     /// <summary>
     /// A drawable which has a callback when the skin changes.
     /// </summary>
-    public abstract class SkinReloadableDrawable : CompositeDrawable
+    public abstract class SkinReloadableDrawable : PoolableDrawable
     {
         /// <summary>
         /// Invoked when <see cref="CurrentSkin"/> has changed.

From 248d342a2f0e487c6b5c000aee604b5337c25c57 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 6 Nov 2020 22:15:00 +0900
Subject: [PATCH 05993/10326] Initial Apply()/FreeAfterUse() DHO implementation

---
 .../Objects/Drawables/DrawableHitObject.cs    | 169 ++++++++++++------
 osu.Game/Rulesets/Objects/HitObject.cs        |   6 +
 osu.Game/Rulesets/UI/HitObjectContainer.cs    |  89 ++++-----
 osu.Game/Skinning/SkinReloadableDrawable.cs   |   1 -
 4 files changed, 168 insertions(+), 97 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 5c3f57c2d0..43688a7332 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -27,7 +28,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
     {
         public event Action<DrawableHitObject> DefaultsApplied;
 
-        public readonly HitObject HitObject;
+        /// <summary>
+        /// The <see cref="HitObject"/> currently represented by this <see cref="DrawableHitObject"/>.
+        /// </summary>
+        public HitObject HitObject { get; private set; }
 
         /// <summary>
         /// The colour used for various elements of this DrawableHitObject.
@@ -96,10 +100,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         protected virtual float SamplePlaybackPosition => 0.5f;
 
-        private BindableList<HitSampleInfo> samplesBindable;
-        private Bindable<double> startTimeBindable;
-        private Bindable<bool> userPositionalHitSounds;
-        private Bindable<int> comboIndexBindable;
+        public readonly Bindable<double> StartTimeBindable = new Bindable<double>();
+        private readonly BindableList<HitSampleInfo> samplesBindable = new BindableList<HitSampleInfo>();
+        private readonly Bindable<bool> userPositionalHitSounds = new Bindable<bool>();
+        private readonly Bindable<int> comboIndexBindable = new Bindable<int>();
 
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
@@ -111,52 +115,120 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         public IBindable<ArmedState> State => state;
 
-        protected DrawableHitObject([NotNull] HitObject hitObject)
+        /// <summary>
+        /// Creates a new <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <param name="initialHitObject">
+        /// The <see cref="HitObject"/> to be initially applied to this <see cref="DrawableHitObject"/>.
+        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="Apply"/> (or automatically via pooling).
+        /// </param>
+        protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
         {
-            HitObject = hitObject ?? throw new ArgumentNullException(nameof(hitObject));
+            HitObject = initialHitObject;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            userPositionalHitSounds = config.GetBindable<bool>(OsuSetting.PositionalHitSounds);
-            var judgement = HitObject.CreateJudgement();
-
-            Result = CreateResult(judgement);
-            if (Result == null)
-                throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
+            config.BindWith(OsuSetting.PositionalHitSounds, userPositionalHitSounds);
         }
 
         protected override void LoadAsyncComplete()
         {
             base.LoadAsyncComplete();
 
-            LoadSamples();
-
-            HitObject.DefaultsApplied += onDefaultsApplied;
-
-            startTimeBindable = HitObject.StartTimeBindable.GetBoundCopy();
-            startTimeBindable.BindValueChanged(_ => updateState(State.Value, true));
-
-            if (HitObject is IHasComboInformation combo)
-            {
-                comboIndexBindable = combo.ComboIndexBindable.GetBoundCopy();
-                comboIndexBindable.BindValueChanged(_ => updateComboColour(), true);
-            }
-
-            samplesBindable = HitObject.SamplesBindable.GetBoundCopy();
-            samplesBindable.CollectionChanged += (_, __) => LoadSamples();
-
-            apply(HitObject);
+            if (HitObject != null)
+                Apply(HitObject);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            StartTimeBindable.BindValueChanged(_ => updateState(State.Value, true));
+            comboIndexBindable.BindValueChanged(_ => updateComboColour(), true);
+
             updateState(ArmedState.Idle, true);
         }
 
+        /// <summary>
+        /// Removes the <see cref="HitObject"/> currently applied to this <see cref="DrawableHitObject"/>,
+        /// </summary>
+        protected override void FreeAfterUse()
+        {
+            StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
+            if (HitObject is IHasComboInformation combo)
+                comboIndexBindable.UnbindFrom(combo.ComboIndexBindable);
+
+            samplesBindable.UnbindFrom(HitObject.SamplesBindable);
+
+            // When a new hitobject is applied, the samples will be cleared before re-populating.
+            // In order to stop this needless update, the event is unbound and re-bound as late as possible in Apply().
+            samplesBindable.CollectionChanged -= onSamplesChanged;
+
+            if (nestedHitObjects.IsValueCreated)
+            {
+                foreach (var obj in nestedHitObjects.Value)
+                {
+                    obj.OnNewResult -= onNewResult;
+                    obj.OnRevertResult -= onRevertResult;
+                    obj.ApplyCustomUpdateState -= onApplyCustomUpdateState;
+                }
+
+                nestedHitObjects.Value.Clear();
+                ClearNestedHitObjects();
+            }
+
+            HitObject.DefaultsApplied -= onDefaultsApplied;
+            HitObject = null;
+
+            base.FreeAfterUse();
+        }
+
+        /// <summary>
+        /// Applies a new <see cref="HitObject"/> to be represented by this <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <param name="hitObject"></param>
+        public virtual void Apply(HitObject hitObject)
+        {
+            HitObject = hitObject;
+
+            // Copy any existing result from the hitobject (required for rewind / judgement revert).
+            Result = HitObject.Result;
+
+            // Ensure this DHO has a result.
+            Result ??= CreateResult(HitObject.CreateJudgement())
+                       ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
+
+            // Ensure the hitobject has a result.
+            HitObject.Result = Result;
+
+            foreach (var h in HitObject.NestedHitObjects)
+            {
+                var drawableNested = CreateNestedHitObject(h) ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
+
+                drawableNested.OnNewResult += (d, r) => OnNewResult?.Invoke(d, r);
+                drawableNested.OnRevertResult += (d, r) => OnRevertResult?.Invoke(d, r);
+                drawableNested.ApplyCustomUpdateState += (d, j) => ApplyCustomUpdateState?.Invoke(d, j);
+
+                nestedHitObjects.Value.Add(drawableNested);
+                AddNestedHitObject(drawableNested);
+            }
+
+            StartTimeBindable.BindTo(HitObject.StartTimeBindable);
+            if (HitObject is IHasComboInformation combo)
+                comboIndexBindable.BindTo(combo.ComboIndexBindable);
+
+            samplesBindable.BindTo(HitObject.SamplesBindable);
+            samplesBindable.BindCollectionChanged(onSamplesChanged, true);
+
+            HitObject.DefaultsApplied += onDefaultsApplied;
+
+            // If not loaded, the state update happens in LoadComplete(). Otherwise, the update is scheduled to allow for lifetime updates.
+            if (IsLoaded)
+                Schedule(() => updateState(ArmedState.Idle, true));
+        }
+
         /// <summary>
         /// Invoked by the base <see cref="DrawableHitObject"/> to populate samples, once on initial load and potentially again on any change to the samples collection.
         /// </summary>
@@ -183,34 +255,21 @@ namespace osu.Game.Rulesets.Objects.Drawables
             AddInternal(Samples);
         }
 
+        private void onSamplesChanged(object sender, NotifyCollectionChangedEventArgs e) => LoadSamples();
+
+        private void onNewResult(DrawableHitObject drawableHitObject, JudgementResult result) => OnNewResult?.Invoke(drawableHitObject, result);
+
+        private void onRevertResult(DrawableHitObject drawableHitObject, JudgementResult result) => OnRevertResult?.Invoke(drawableHitObject, result);
+
+        private void onApplyCustomUpdateState(DrawableHitObject drawableHitObject, ArmedState state) => ApplyCustomUpdateState?.Invoke(drawableHitObject, state);
+
         private void onDefaultsApplied(HitObject hitObject)
         {
-            apply(hitObject);
-            updateState(state.Value, true);
+            FreeAfterUse();
+            Apply(hitObject);
             DefaultsApplied?.Invoke(this);
         }
 
-        private void apply(HitObject hitObject)
-        {
-            if (nestedHitObjects.IsValueCreated)
-            {
-                nestedHitObjects.Value.Clear();
-                ClearNestedHitObjects();
-            }
-
-            foreach (var h in hitObject.NestedHitObjects)
-            {
-                var drawableNested = CreateNestedHitObject(h) ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
-
-                drawableNested.OnNewResult += (d, r) => OnNewResult?.Invoke(d, r);
-                drawableNested.OnRevertResult += (d, r) => OnRevertResult?.Invoke(d, r);
-                drawableNested.ApplyCustomUpdateState += (d, j) => ApplyCustomUpdateState?.Invoke(d, j);
-
-                nestedHitObjects.Value.Add(drawableNested);
-                AddNestedHitObject(drawableNested);
-            }
-        }
-
         /// <summary>
         /// Invoked by the base <see cref="DrawableHitObject"/> to add nested <see cref="DrawableHitObject"/>s to the hierarchy.
         /// </summary>
@@ -600,7 +659,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            HitObject.DefaultsApplied -= onDefaultsApplied;
+
+            if (HitObject != null)
+                HitObject.DefaultsApplied -= onDefaultsApplied;
         }
     }
 
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 826d411822..9ef3ff9c4a 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -12,6 +12,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 
@@ -168,6 +169,11 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         [NotNull]
         protected virtual HitWindows CreateHitWindows() => new HitWindows();
+
+        /// <summary>
+        /// The result this <see cref="HitObject"/> was judged with. Used internally for rewinding within <see cref="DrawableHitObject"/>.
+        /// </summary>
+        internal JudgementResult Result;
     }
 
     public static class HitObjectExtensions
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 4cadfa9ad4..4666aa9211 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.UI
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
         public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
-        private readonly Dictionary<DrawableHitObject, (IBindable<double> bindable, double timeAtAdd)> startTimeMap = new Dictionary<DrawableHitObject, (IBindable<double>, double)>();
+        private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
 
         public HitObjectContainer()
         {
@@ -25,10 +25,7 @@ namespace osu.Game.Rulesets.UI
 
         public virtual void Add(DrawableHitObject hitObject)
         {
-            // Added first for the comparer to remain ordered during AddInternal
-            startTimeMap[hitObject] = (hitObject.HitObject.StartTimeBindable.GetBoundCopy(), hitObject.HitObject.StartTime);
-            startTimeMap[hitObject].bindable.BindValueChanged(_ => onStartTimeChanged(hitObject));
-
+            bindStartTime(hitObject);
             AddInternal(hitObject);
         }
 
@@ -37,54 +34,19 @@ namespace osu.Game.Rulesets.UI
             if (!RemoveInternal(hitObject))
                 return false;
 
-            // Removed last for the comparer to remain ordered during RemoveInternal
-            startTimeMap[hitObject].bindable.UnbindAll();
-            startTimeMap.Remove(hitObject);
+            unbindStartTime(hitObject);
 
             return true;
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            unbindStartTimeMap();
-        }
-
         public virtual void Clear(bool disposeChildren = true)
         {
             ClearInternal(disposeChildren);
-            unbindStartTimeMap();
-        }
-
-        private void unbindStartTimeMap()
-        {
-            foreach (var kvp in startTimeMap)
-                kvp.Value.bindable.UnbindAll();
-            startTimeMap.Clear();
+            unbindAllStartTimes();
         }
 
         public int IndexOf(DrawableHitObject hitObject) => IndexOfInternal(hitObject);
 
-        private void onStartTimeChanged(DrawableHitObject hitObject)
-        {
-            if (!RemoveInternal(hitObject))
-                return;
-
-            // Update the stored time, preserving the existing bindable
-            startTimeMap[hitObject] = (startTimeMap[hitObject].bindable, hitObject.HitObject.StartTime);
-            AddInternal(hitObject);
-        }
-
-        protected override int Compare(Drawable x, Drawable y)
-        {
-            if (!(x is DrawableHitObject xObj) || !(y is DrawableHitObject yObj))
-                return base.Compare(x, y);
-
-            // Put earlier hitobjects towards the end of the list, so they handle input first
-            int i = startTimeMap[yObj].timeAtAdd.CompareTo(startTimeMap[xObj].timeAtAdd);
-            return i == 0 ? CompareReverseChildID(x, y) : i;
-        }
-
         protected override void OnChildLifetimeBoundaryCrossed(LifetimeBoundaryCrossedEvent e)
         {
             if (!(e.Child is DrawableHitObject hitObject))
@@ -96,5 +58,48 @@ namespace osu.Game.Rulesets.UI
                 hitObject.OnKilled();
             }
         }
+
+        #region Comparator + StartTime tracking
+
+        private void bindStartTime(DrawableHitObject hitObject)
+        {
+            var bindable = hitObject.StartTimeBindable.GetBoundCopy();
+            bindable.BindValueChanged(_ => onStartTimeChanged(hitObject));
+
+            startTimeMap[hitObject] = bindable;
+        }
+
+        private void unbindStartTime(DrawableHitObject hitObject)
+        {
+            startTimeMap[hitObject].UnbindAll();
+            startTimeMap.Remove(hitObject);
+        }
+
+        private void unbindAllStartTimes()
+        {
+            foreach (var kvp in startTimeMap)
+                kvp.Value.UnbindAll();
+            startTimeMap.Clear();
+        }
+
+        private void onStartTimeChanged(DrawableHitObject hitObject) => SortInternal();
+
+        protected override int Compare(Drawable x, Drawable y)
+        {
+            if (!(x is DrawableHitObject xObj) || !(y is DrawableHitObject yObj))
+                return base.Compare(x, y);
+
+            // Put earlier hitobjects towards the end of the list, so they handle input first
+            int i = yObj.HitObject.StartTime.CompareTo(xObj.HitObject.StartTime);
+            return i == 0 ? CompareReverseChildID(x, y) : i;
+        }
+
+        #endregion
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            unbindAllStartTimes();
+        }
     }
 }
diff --git a/osu.Game/Skinning/SkinReloadableDrawable.cs b/osu.Game/Skinning/SkinReloadableDrawable.cs
index d0531c46c5..cc9cbf7b59 100644
--- a/osu.Game/Skinning/SkinReloadableDrawable.cs
+++ b/osu.Game/Skinning/SkinReloadableDrawable.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 
 namespace osu.Game.Skinning

From 2d892c74079cc5b379ab5aabd750fce127907fe0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 6 Nov 2020 23:03:29 +0900
Subject: [PATCH 05994/10326] Allow Apply() to be called multiple times
 sequentially

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 43688a7332..1e304f3d7d 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -191,6 +191,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <param name="hitObject"></param>
         public virtual void Apply(HitObject hitObject)
         {
+            if (HitObject != null)
+                FreeAfterUse();
+
             HitObject = hitObject;
 
             // Copy any existing result from the hitobject (required for rewind / judgement revert).

From 7eceda242bf40887d340d0388e2886e3fe6082e7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 6 Nov 2020 23:04:28 +0900
Subject: [PATCH 05995/10326] Change derived class to use property

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 1e304f3d7d..6e2967062c 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -671,12 +671,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
     public abstract class DrawableHitObject<TObject> : DrawableHitObject
         where TObject : HitObject
     {
-        public new readonly TObject HitObject;
+        public new TObject HitObject => (TObject)base.HitObject;
 
         protected DrawableHitObject(TObject hitObject)
             : base(hitObject)
         {
-            HitObject = hitObject;
         }
     }
 }

From 33b629a87a86b571d3cc94ffaa02949d13bfd7f1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 6 Nov 2020 23:09:23 +0900
Subject: [PATCH 05996/10326] Make top-level osu! objects use new methods

---
 .../Objects/Drawables/DrawableHitCircle.cs    |  3 ++-
 .../Objects/Drawables/DrawableOsuHitObject.cs | 16 +++++++++++++
 .../Objects/Drawables/DrawableSlider.cs       | 24 +++++++++++++++----
 .../Objects/Drawables/DrawableSpinner.cs      |  3 ++-
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index b0c4e3758d..90a25e9625 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -30,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Container scaleContainer;
         private InputManager inputManager;
 
-        public DrawableHitCircle(HitCircle h)
+        public DrawableHitCircle([CanBeNull] HitCircle h = null)
             : base(h)
         {
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 208f79f165..2d0b939e30 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Graphics.Containers;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.UI;
 using osuTK;
 
@@ -49,6 +50,21 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 ShakeDuration = 30,
                 RelativeSizeAxes = Axes.Both
             });
+        }
+
+        protected override void FreeAfterUse()
+        {
+            IndexInCurrentComboBindable.UnbindFrom(HitObject.IndexInCurrentComboBindable);
+            PositionBindable.UnbindFrom(HitObject.PositionBindable);
+            StackHeightBindable.UnbindFrom(HitObject.StackHeightBindable);
+            ScaleBindable.UnbindFrom(HitObject.ScaleBindable);
+
+            base.FreeAfterUse();
+        }
+
+        public override void Apply(HitObject hitObject)
+        {
+            base.Apply(hitObject);
 
             IndexInCurrentComboBindable.BindTo(HitObject.IndexInCurrentComboBindable);
             PositionBindable.BindTo(HitObject.PositionBindable);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index d8dd0d7471..5a47e3bebe 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -32,14 +33,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody;
 
-        public readonly IBindable<int> PathVersion = new Bindable<int>();
+        public IBindable<int> PathVersion => pathVersion;
+        private readonly Bindable<int> pathVersion = new Bindable<int>();
 
         private Container<DrawableSliderHead> headContainer;
         private Container<DrawableSliderTail> tailContainer;
         private Container<DrawableSliderTick> tickContainer;
         private Container<DrawableSliderRepeat> repeatContainer;
 
-        public DrawableSlider(Slider s)
+        public DrawableSlider([CanBeNull] Slider s = null)
             : base(s)
         {
         }
@@ -63,8 +65,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both },
             };
 
-            PathVersion.BindTo(HitObject.Path.Version);
-
             PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
             StackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
             ScaleBindable.BindValueChanged(scale => Ball.Scale = new Vector2(scale.NewValue), true);
@@ -78,6 +78,22 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Tracking.BindValueChanged(updateSlidingSample);
         }
 
+        protected override void FreeAfterUse()
+        {
+            PathVersion.UnbindFrom(HitObject.Path.Version);
+
+            base.FreeAfterUse();
+        }
+
+        public override void Apply(HitObject hitObject)
+        {
+            base.Apply(hitObject);
+
+            // Ensure that the version will change after the upcoming BindTo().
+            pathVersion.Value = int.MaxValue;
+            PathVersion.BindTo(HitObject.Path.Version);
+        }
+
         private PausableSkinnableSound slidingSample;
 
         protected override void LoadSamples()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 77fbff9c51..d564a76e5e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
@@ -32,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Bindable<bool> isSpinning;
         private bool spinnerFrequencyModulate;
 
-        public DrawableSpinner(Spinner s)
+        public DrawableSpinner([CanBeNull] Spinner s = null)
             : base(s)
         {
         }

From e190afbfed30d6ad0d12b289209d8173f92a5985 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 6 Nov 2020 23:35:47 +0900
Subject: [PATCH 05997/10326] Remove initial value changed invocations

---
 .../Objects/Drawables/DrawableHitCircle.cs                | 8 ++++----
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 6 +++---
 .../Objects/Drawables/DrawableSpinner.cs                  | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 90a25e9625..77d24db084 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -73,10 +73,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Size = HitArea.DrawSize;
 
-            PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
-            StackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
-            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
-            AccentColour.BindValueChanged(accent => ApproachCircle.Colour = accent.NewValue, true);
+            PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
+            StackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
+            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
+            AccentColour.BindValueChanged(accent => ApproachCircle.Colour = accent.NewValue);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 5a47e3bebe..72b932ea36 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -65,9 +65,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both },
             };
 
-            PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
-            StackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition, true);
-            ScaleBindable.BindValueChanged(scale => Ball.Scale = new Vector2(scale.NewValue), true);
+            PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
+            StackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
+            ScaleBindable.BindValueChanged(scale => Ball.Scale = new Vector2(scale.NewValue));
 
             AccentColour.BindValueChanged(colour =>
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index d564a76e5e..eb125969b0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 }
             };
 
-            PositionBindable.BindValueChanged(pos => Position = pos.NewValue, true);
+            PositionBindable.BindValueChanged(pos => Position = pos.NewValue);
         }
 
         protected override void LoadComplete()

From 1c8d68676eeaa0d93eff7bd5a99d573e7a05bc63 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 6 Nov 2020 23:56:02 +0900
Subject: [PATCH 05998/10326] Add tests

---
 .../TestSceneHitCircleApplication.cs          | 44 +++++++++++++
 .../TestSceneSliderApplication.cs             | 61 +++++++++++++++++++
 .../TestSceneSpinnerApplication.cs            | 46 ++++++++++++++
 3 files changed, 151 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs
new file mode 100644
index 0000000000..8b3fead366
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.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 NUnit.Framework;
+using osu.Framework.Timing;
+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.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneHitCircleApplication : OsuTestScene
+    {
+        [Test]
+        public void TestApplyNewCircle()
+        {
+            DrawableHitCircle dho = null;
+
+            AddStep("create circle", () => Child = dho = new DrawableHitCircle(prepareObject(new HitCircle
+            {
+                Position = new Vector2(256, 192),
+                IndexInCurrentCombo = 0
+            }))
+            {
+                Clock = new FramedClock(new StopwatchClock())
+            });
+
+            AddStep("apply new circle", () => dho.Apply(prepareObject(new HitCircle
+            {
+                Position = new Vector2(128, 128),
+                ComboIndex = 1,
+            })));
+        }
+
+        private HitCircle prepareObject(HitCircle circle)
+        {
+            circle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            return circle;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
new file mode 100644
index 0000000000..e0898dc95d
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.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 NUnit.Framework;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneSliderApplication : OsuTestScene
+    {
+        [Test]
+        public void TestApplyNewSlider()
+        {
+            DrawableSlider dho = null;
+
+            AddStep("create slider", () => Child = dho = new DrawableSlider(prepareObject(new Slider
+            {
+                Position = new Vector2(256, 192),
+                IndexInCurrentCombo = 0,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(150, 100),
+                    new Vector2(300, 0),
+                })
+            }))
+            {
+                Clock = new FramedClock(new StopwatchClock(true))
+            });
+
+            AddWaitStep("wait for progression", 1);
+
+            AddStep("apply new slider", () => dho.Apply(prepareObject(new Slider
+            {
+                Position = new Vector2(256, 192),
+                ComboIndex = 1,
+                Path = new SliderPath(PathType.Bezier, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(150, 100),
+                    new Vector2(300, 0),
+                }),
+                RepeatCount = 1
+            })));
+        }
+
+        private Slider prepareObject(Slider slider)
+        {
+            slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            return slider;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
new file mode 100644
index 0000000000..5951574079
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.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 NUnit.Framework;
+using osu.Framework.Timing;
+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.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneSpinnerApplication : OsuTestScene
+    {
+        [Test]
+        public void TestApplyNewCircle()
+        {
+            DrawableSpinner dho = null;
+
+            AddStep("create spinner", () => Child = dho = new DrawableSpinner(prepareObject(new Spinner
+            {
+                Position = new Vector2(256, 192),
+                IndexInCurrentCombo = 0,
+                Duration = 0,
+            }))
+            {
+                Clock = new FramedClock(new StopwatchClock())
+            });
+
+            AddStep("apply new spinner", () => dho.Apply(prepareObject(new Spinner
+            {
+                Position = new Vector2(256, 192),
+                ComboIndex = 1,
+                Duration = 1000,
+            })));
+        }
+
+        private Spinner prepareObject(Spinner circle)
+        {
+            circle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            return circle;
+        }
+    }
+}

From 3a4bd73823c9e884de908591d8784a63eae69bbc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 7 Nov 2020 00:25:26 +0900
Subject: [PATCH 05999/10326] Fix DHOs being freed when not expected

---
 .../Objects/Drawables/DrawableOsuHitObject.cs |  4 +-
 .../Objects/Drawables/DrawableSlider.cs       |  4 +-
 .../Objects/Drawables/DrawableHitObject.cs    | 95 +++++++++++--------
 3 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 2d0b939e30..0326f38439 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -52,14 +52,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             });
         }
 
-        protected override void FreeAfterUse()
+        public override void Free()
         {
             IndexInCurrentComboBindable.UnbindFrom(HitObject.IndexInCurrentComboBindable);
             PositionBindable.UnbindFrom(HitObject.PositionBindable);
             StackHeightBindable.UnbindFrom(HitObject.StackHeightBindable);
             ScaleBindable.UnbindFrom(HitObject.ScaleBindable);
 
-            base.FreeAfterUse();
+            base.Free();
         }
 
         public override void Apply(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 72b932ea36..844e95aa7a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -78,11 +78,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Tracking.BindValueChanged(updateSlidingSample);
         }
 
-        protected override void FreeAfterUse()
+        public override void Free()
         {
             PathVersion.UnbindFrom(HitObject.Path.Version);
 
-            base.FreeAfterUse();
+            base.Free();
         }
 
         public override void Apply(HitObject hitObject)
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 6e2967062c..8e56b07420 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -115,6 +115,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         public IBindable<ArmedState> State => state;
 
+        /// <summary>
+        /// Whether <see cref="HitObject"/> is currently applied.
+        /// </summary>
+        private bool hasHitObjectApplied;
+
         /// <summary>
         /// Creates a new <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -151,50 +156,16 @@ namespace osu.Game.Rulesets.Objects.Drawables
             updateState(ArmedState.Idle, true);
         }
 
-        /// <summary>
-        /// Removes the <see cref="HitObject"/> currently applied to this <see cref="DrawableHitObject"/>,
-        /// </summary>
-        protected override void FreeAfterUse()
-        {
-            StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
-            if (HitObject is IHasComboInformation combo)
-                comboIndexBindable.UnbindFrom(combo.ComboIndexBindable);
-
-            samplesBindable.UnbindFrom(HitObject.SamplesBindable);
-
-            // When a new hitobject is applied, the samples will be cleared before re-populating.
-            // In order to stop this needless update, the event is unbound and re-bound as late as possible in Apply().
-            samplesBindable.CollectionChanged -= onSamplesChanged;
-
-            if (nestedHitObjects.IsValueCreated)
-            {
-                foreach (var obj in nestedHitObjects.Value)
-                {
-                    obj.OnNewResult -= onNewResult;
-                    obj.OnRevertResult -= onRevertResult;
-                    obj.ApplyCustomUpdateState -= onApplyCustomUpdateState;
-                }
-
-                nestedHitObjects.Value.Clear();
-                ClearNestedHitObjects();
-            }
-
-            HitObject.DefaultsApplied -= onDefaultsApplied;
-            HitObject = null;
-
-            base.FreeAfterUse();
-        }
-
         /// <summary>
         /// Applies a new <see cref="HitObject"/> to be represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        /// <param name="hitObject"></param>
+        /// <param name="hitObject">The <see cref="HitObject"/> to apply.</param>
         public virtual void Apply(HitObject hitObject)
         {
-            if (HitObject != null)
-                FreeAfterUse();
+            if (hasHitObjectApplied)
+                Free();
 
-            HitObject = hitObject;
+            HitObject = hitObject ?? throw new InvalidOperationException($"Cannot apply a null {nameof(HitObject)}.");
 
             // Copy any existing result from the hitobject (required for rewind / judgement revert).
             Result = HitObject.Result;
@@ -230,6 +201,52 @@ namespace osu.Game.Rulesets.Objects.Drawables
             // If not loaded, the state update happens in LoadComplete(). Otherwise, the update is scheduled to allow for lifetime updates.
             if (IsLoaded)
                 Schedule(() => updateState(ArmedState.Idle, true));
+
+            hasHitObjectApplied = true;
+        }
+
+        /// <summary>
+        /// Removes the currently applied <see cref="HitObject"/>
+        /// </summary>
+        public virtual void Free()
+        {
+            StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
+            if (HitObject is IHasComboInformation combo)
+                comboIndexBindable.UnbindFrom(combo.ComboIndexBindable);
+
+            samplesBindable.UnbindFrom(HitObject.SamplesBindable);
+
+            // When a new hitobject is applied, the samples will be cleared before re-populating.
+            // In order to stop this needless update, the event is unbound and re-bound as late as possible in Apply().
+            samplesBindable.CollectionChanged -= onSamplesChanged;
+
+            if (nestedHitObjects.IsValueCreated)
+            {
+                foreach (var obj in nestedHitObjects.Value)
+                {
+                    obj.OnNewResult -= onNewResult;
+                    obj.OnRevertResult -= onRevertResult;
+                    obj.ApplyCustomUpdateState -= onApplyCustomUpdateState;
+                }
+
+                nestedHitObjects.Value.Clear();
+                ClearNestedHitObjects();
+            }
+
+            HitObject.DefaultsApplied -= onDefaultsApplied;
+            HitObject = null;
+
+            hasHitObjectApplied = false;
+        }
+
+        protected sealed override void FreeAfterUse()
+        {
+            base.FreeAfterUse();
+
+            if (!IsInPool)
+                return;
+
+            Free();
         }
 
         /// <summary>
@@ -268,7 +285,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void onDefaultsApplied(HitObject hitObject)
         {
-            FreeAfterUse();
+            Free();
             Apply(hitObject);
             DefaultsApplied?.Invoke(this);
         }

From b1e039bcec1c45c66f7e622d20b1dbb8c104fea9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 7 Nov 2020 00:40:26 +0900
Subject: [PATCH 06000/10326] Prevent overrides from messing with
 application/freeing

---
 .../Objects/Drawables/DrawableOsuHitObject.cs | 24 ++++++-------
 .../Objects/Drawables/DrawableSlider.cs       | 18 +++++-----
 .../Objects/Drawables/DrawableHitObject.cs    | 35 +++++++++++++++----
 3 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 0326f38439..d17bf93fa0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -52,19 +52,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             });
         }
 
-        public override void Free()
+        protected override void OnApply(HitObject hitObject)
         {
-            IndexInCurrentComboBindable.UnbindFrom(HitObject.IndexInCurrentComboBindable);
-            PositionBindable.UnbindFrom(HitObject.PositionBindable);
-            StackHeightBindable.UnbindFrom(HitObject.StackHeightBindable);
-            ScaleBindable.UnbindFrom(HitObject.ScaleBindable);
-
-            base.Free();
-        }
-
-        public override void Apply(HitObject hitObject)
-        {
-            base.Apply(hitObject);
+            base.OnApply(hitObject);
 
             IndexInCurrentComboBindable.BindTo(HitObject.IndexInCurrentComboBindable);
             PositionBindable.BindTo(HitObject.PositionBindable);
@@ -72,6 +62,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ScaleBindable.BindTo(HitObject.ScaleBindable);
         }
 
+        protected override void OnFree(HitObject hitObject)
+        {
+            base.OnFree(hitObject);
+
+            IndexInCurrentComboBindable.UnbindFrom(HitObject.IndexInCurrentComboBindable);
+            PositionBindable.UnbindFrom(HitObject.PositionBindable);
+            StackHeightBindable.UnbindFrom(HitObject.StackHeightBindable);
+            ScaleBindable.UnbindFrom(HitObject.ScaleBindable);
+        }
+
         // Forward all internal management to shakeContainer.
         // This is a bit ugly but we don't have the concept of InternalContent so it'll have to do for now. (https://github.com/ppy/osu-framework/issues/1690)
         protected override void AddInternal(Drawable drawable) => shakeContainer.Add(drawable);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 844e95aa7a..3f91a31066 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -78,22 +78,22 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Tracking.BindValueChanged(updateSlidingSample);
         }
 
-        public override void Free()
+        protected override void OnApply(HitObject hitObject)
         {
-            PathVersion.UnbindFrom(HitObject.Path.Version);
-
-            base.Free();
-        }
-
-        public override void Apply(HitObject hitObject)
-        {
-            base.Apply(hitObject);
+            base.OnApply(hitObject);
 
             // Ensure that the version will change after the upcoming BindTo().
             pathVersion.Value = int.MaxValue;
             PathVersion.BindTo(HitObject.Path.Version);
         }
 
+        protected override void OnFree(HitObject hitObject)
+        {
+            base.OnFree(hitObject);
+
+            PathVersion.UnbindFrom(HitObject.Path.Version);
+        }
+
         private PausableSkinnableSound slidingSample;
 
         protected override void LoadSamples()
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 8e56b07420..ecd345f1a9 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -160,10 +160,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Applies a new <see cref="HitObject"/> to be represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to apply.</param>
-        public virtual void Apply(HitObject hitObject)
+        public void Apply(HitObject hitObject)
         {
-            if (hasHitObjectApplied)
-                Free();
+            free();
 
             HitObject = hitObject ?? throw new InvalidOperationException($"Cannot apply a null {nameof(HitObject)}.");
 
@@ -202,14 +201,18 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (IsLoaded)
                 Schedule(() => updateState(ArmedState.Idle, true));
 
+            OnApply(hitObject);
             hasHitObjectApplied = true;
         }
 
         /// <summary>
         /// Removes the currently applied <see cref="HitObject"/>
         /// </summary>
-        public virtual void Free()
+        private void free()
         {
+            if (!hasHitObjectApplied)
+                return;
+
             StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
                 comboIndexBindable.UnbindFrom(combo.ComboIndexBindable);
@@ -234,8 +237,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             HitObject.DefaultsApplied -= onDefaultsApplied;
-            HitObject = null;
 
+            OnFree(HitObject);
+
+            HitObject = null;
             hasHitObjectApplied = false;
         }
 
@@ -243,10 +248,27 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.FreeAfterUse();
 
+            // Freeing while not in a pool would cause the DHO to not be usable elsewhere in the hierarchy without being re-applied.
             if (!IsInPool)
                 return;
 
-            Free();
+            free();
+        }
+
+        /// <summary>
+        /// Invoked for this <see cref="DrawableHitObject"/> to take on any values from a newly-applied <see cref="HitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> being applied.</param>
+        protected virtual void OnApply(HitObject hitObject)
+        {
+        }
+
+        /// <summary>
+        /// Invoked for this <see cref="DrawableHitObject"/> to revert any values previously taken on from the currently-applied <see cref="HitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The currently-applied <see cref="HitObject"/>.</param>
+        protected virtual void OnFree(HitObject hitObject)
+        {
         }
 
         /// <summary>
@@ -285,7 +307,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void onDefaultsApplied(HitObject hitObject)
         {
-            Free();
             Apply(hitObject);
             DefaultsApplied?.Invoke(this);
         }

From 4a07a7e757ce283e2445abe4522cfb80bdad6bc6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 7 Nov 2020 00:40:41 +0900
Subject: [PATCH 06001/10326] Refactor test

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
index e0898dc95d..f76c7e2a3e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
@@ -25,16 +24,14 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 Position = new Vector2(256, 192),
                 IndexInCurrentCombo = 0,
+                StartTime = Time.Current,
                 Path = new SliderPath(PathType.Linear, new[]
                 {
                     Vector2.Zero,
                     new Vector2(150, 100),
                     new Vector2(300, 0),
                 })
-            }))
-            {
-                Clock = new FramedClock(new StopwatchClock(true))
-            });
+            })));
 
             AddWaitStep("wait for progression", 1);
 
@@ -42,6 +39,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 Position = new Vector2(256, 192),
                 ComboIndex = 1,
+                StartTime = dho.HitObject.StartTime,
                 Path = new SliderPath(PathType.Bezier, new[]
                 {
                     Vector2.Zero,

From 91c627c22d2db9001668bfc51a87ae46849db59b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 7 Nov 2020 00:57:33 +0900
Subject: [PATCH 06002/10326] Revert HOC changes

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 89 ++++++++++------------
 1 file changed, 42 insertions(+), 47 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 4666aa9211..4cadfa9ad4 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.UI
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
         public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
-        private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
+        private readonly Dictionary<DrawableHitObject, (IBindable<double> bindable, double timeAtAdd)> startTimeMap = new Dictionary<DrawableHitObject, (IBindable<double>, double)>();
 
         public HitObjectContainer()
         {
@@ -25,7 +25,10 @@ namespace osu.Game.Rulesets.UI
 
         public virtual void Add(DrawableHitObject hitObject)
         {
-            bindStartTime(hitObject);
+            // Added first for the comparer to remain ordered during AddInternal
+            startTimeMap[hitObject] = (hitObject.HitObject.StartTimeBindable.GetBoundCopy(), hitObject.HitObject.StartTime);
+            startTimeMap[hitObject].bindable.BindValueChanged(_ => onStartTimeChanged(hitObject));
+
             AddInternal(hitObject);
         }
 
@@ -34,19 +37,54 @@ namespace osu.Game.Rulesets.UI
             if (!RemoveInternal(hitObject))
                 return false;
 
-            unbindStartTime(hitObject);
+            // Removed last for the comparer to remain ordered during RemoveInternal
+            startTimeMap[hitObject].bindable.UnbindAll();
+            startTimeMap.Remove(hitObject);
 
             return true;
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            unbindStartTimeMap();
+        }
+
         public virtual void Clear(bool disposeChildren = true)
         {
             ClearInternal(disposeChildren);
-            unbindAllStartTimes();
+            unbindStartTimeMap();
+        }
+
+        private void unbindStartTimeMap()
+        {
+            foreach (var kvp in startTimeMap)
+                kvp.Value.bindable.UnbindAll();
+            startTimeMap.Clear();
         }
 
         public int IndexOf(DrawableHitObject hitObject) => IndexOfInternal(hitObject);
 
+        private void onStartTimeChanged(DrawableHitObject hitObject)
+        {
+            if (!RemoveInternal(hitObject))
+                return;
+
+            // Update the stored time, preserving the existing bindable
+            startTimeMap[hitObject] = (startTimeMap[hitObject].bindable, hitObject.HitObject.StartTime);
+            AddInternal(hitObject);
+        }
+
+        protected override int Compare(Drawable x, Drawable y)
+        {
+            if (!(x is DrawableHitObject xObj) || !(y is DrawableHitObject yObj))
+                return base.Compare(x, y);
+
+            // Put earlier hitobjects towards the end of the list, so they handle input first
+            int i = startTimeMap[yObj].timeAtAdd.CompareTo(startTimeMap[xObj].timeAtAdd);
+            return i == 0 ? CompareReverseChildID(x, y) : i;
+        }
+
         protected override void OnChildLifetimeBoundaryCrossed(LifetimeBoundaryCrossedEvent e)
         {
             if (!(e.Child is DrawableHitObject hitObject))
@@ -58,48 +96,5 @@ namespace osu.Game.Rulesets.UI
                 hitObject.OnKilled();
             }
         }
-
-        #region Comparator + StartTime tracking
-
-        private void bindStartTime(DrawableHitObject hitObject)
-        {
-            var bindable = hitObject.StartTimeBindable.GetBoundCopy();
-            bindable.BindValueChanged(_ => onStartTimeChanged(hitObject));
-
-            startTimeMap[hitObject] = bindable;
-        }
-
-        private void unbindStartTime(DrawableHitObject hitObject)
-        {
-            startTimeMap[hitObject].UnbindAll();
-            startTimeMap.Remove(hitObject);
-        }
-
-        private void unbindAllStartTimes()
-        {
-            foreach (var kvp in startTimeMap)
-                kvp.Value.UnbindAll();
-            startTimeMap.Clear();
-        }
-
-        private void onStartTimeChanged(DrawableHitObject hitObject) => SortInternal();
-
-        protected override int Compare(Drawable x, Drawable y)
-        {
-            if (!(x is DrawableHitObject xObj) || !(y is DrawableHitObject yObj))
-                return base.Compare(x, y);
-
-            // Put earlier hitobjects towards the end of the list, so they handle input first
-            int i = yObj.HitObject.StartTime.CompareTo(xObj.HitObject.StartTime);
-            return i == 0 ? CompareReverseChildID(x, y) : i;
-        }
-
-        #endregion
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            unbindAllStartTimes();
-        }
     }
 }

From c8ecf15d716831189b771d40d70f76062569e665 Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Sat, 7 Nov 2020 00:35:26 +0100
Subject: [PATCH 06003/10326] Change VSCode build task args to use - instead of
 /

---
 .vscode/tasks.json | 50 +++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index e638dec767..aa77d4f055 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -11,9 +11,9 @@
                 "build",
                 "--no-restore",
                 "osu.Desktop",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
@@ -26,10 +26,10 @@
                 "build",
                 "--no-restore",
                 "osu.Desktop",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
@@ -42,9 +42,9 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Tests",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
@@ -57,10 +57,10 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Tests",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
@@ -73,9 +73,9 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Tournament.Tests",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
@@ -88,10 +88,10 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Tournament.Tests",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
@@ -104,10 +104,10 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Benchmarks",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"

From ceb17764b18a3655acbce440edb2e4a22bce31b0 Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Sat, 7 Nov 2020 01:09:21 +0100
Subject: [PATCH 06004/10326] Also replace / with - for args in other
 task.jsons

---
 osu.Game.Rulesets.Catch.Tests/.vscode/tasks.json | 14 +++++++-------
 osu.Game.Rulesets.Mania.Tests/.vscode/tasks.json | 14 +++++++-------
 osu.Game.Rulesets.Osu.Tests/.vscode/tasks.json   | 14 +++++++-------
 osu.Game.Rulesets.Taiko.Tests/.vscode/tasks.json | 14 +++++++-------
 osu.Game.Tournament.Tests/.vscode/tasks.json     | 14 +++++++-------
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/.vscode/tasks.json b/osu.Game.Rulesets.Catch.Tests/.vscode/tasks.json
index 18a6f8ca70..2c915a31b7 100644
--- a/osu.Game.Rulesets.Catch.Tests/.vscode/tasks.json
+++ b/osu.Game.Rulesets.Catch.Tests/.vscode/tasks.json
@@ -11,9 +11,9 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Catch.Tests.csproj",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
@@ -26,10 +26,10 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Catch.Tests.csproj",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
diff --git a/osu.Game.Rulesets.Mania.Tests/.vscode/tasks.json b/osu.Game.Rulesets.Mania.Tests/.vscode/tasks.json
index 608c4340ac..ca03924c70 100644
--- a/osu.Game.Rulesets.Mania.Tests/.vscode/tasks.json
+++ b/osu.Game.Rulesets.Mania.Tests/.vscode/tasks.json
@@ -11,9 +11,9 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Mania.Tests.csproj",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
@@ -26,10 +26,10 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Mania.Tests.csproj",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
diff --git a/osu.Game.Rulesets.Osu.Tests/.vscode/tasks.json b/osu.Game.Rulesets.Osu.Tests/.vscode/tasks.json
index ed2a015e11..14ffbfb4ae 100644
--- a/osu.Game.Rulesets.Osu.Tests/.vscode/tasks.json
+++ b/osu.Game.Rulesets.Osu.Tests/.vscode/tasks.json
@@ -11,9 +11,9 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Osu.Tests.csproj",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
@@ -26,10 +26,10 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Osu.Tests.csproj",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
diff --git a/osu.Game.Rulesets.Taiko.Tests/.vscode/tasks.json b/osu.Game.Rulesets.Taiko.Tests/.vscode/tasks.json
index 9b91f2c9b9..09340f6f9f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/.vscode/tasks.json
+++ b/osu.Game.Rulesets.Taiko.Tests/.vscode/tasks.json
@@ -11,9 +11,9 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Taiko.Tests.csproj",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
@@ -26,10 +26,10 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Taiko.Tests.csproj",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
diff --git a/osu.Game.Tournament.Tests/.vscode/tasks.json b/osu.Game.Tournament.Tests/.vscode/tasks.json
index 37f2f32874..c69ac0391a 100644
--- a/osu.Game.Tournament.Tests/.vscode/tasks.json
+++ b/osu.Game.Tournament.Tests/.vscode/tasks.json
@@ -11,9 +11,9 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Tournament.Tests.csproj",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
@@ -26,10 +26,10 @@
                 "build",
                 "--no-restore",
                 "osu.Game.Tournament.Tests.csproj",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"

From b47a2a03d5563e71bec072ee3921221af30e35af Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Sat, 7 Nov 2020 01:53:14 +0100
Subject: [PATCH 06005/10326] Fix nullref when quickdeleting slider that hasn't
 been selected yet

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 9b758ec898..34dc356bc3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         public override bool HandleQuickDeletion()
         {
-            var hoveredControlPoint = ControlPointVisualiser.Pieces.FirstOrDefault(p => p.IsHovered);
+            var hoveredControlPoint = ControlPointVisualiser?.Pieces?.FirstOrDefault(p => p.IsHovered);
 
             if (hoveredControlPoint == null)
                 return false;

From 42c543472de01cfda43b3f4dfaa41698ced8db52 Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Sat, 7 Nov 2020 01:56:41 +0100
Subject: [PATCH 06006/10326] Remove unnecessary null coalesce

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 34dc356bc3..7ae4f387ca 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         public override bool HandleQuickDeletion()
         {
-            var hoveredControlPoint = ControlPointVisualiser?.Pieces?.FirstOrDefault(p => p.IsHovered);
+            var hoveredControlPoint = ControlPointVisualiser?.Pieces.FirstOrDefault(p => p.IsHovered);
 
             if (hoveredControlPoint == null)
                 return false;

From c2a5fd2832b12f7bd259d0646c0d6feded3f0b96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Nov 2020 00:17:09 +0900
Subject: [PATCH 06007/10326] Add test coverage

---
 osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
index afaaafdd26..bb56131b04 100644
--- a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
+++ b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
@@ -37,6 +37,12 @@ namespace osu.Game.Tests.Editing
             }));
         }
 
+        [Test]
+        public void TestPatchNoObjectChanges()
+        {
+            runTest(new OsuBeatmap());
+        }
+
         [Test]
         public void TestAddHitObject()
         {

From c5b6908e71cdeaadad6f52b531a2e30c9b8158b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Nov 2020 00:17:23 +0900
Subject: [PATCH 06008/10326] Always write [HitObjects] to file

I think this is expected. If not, there's an alternative solution.
---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 80fd6c22bb..7ddb0b4caa 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -235,11 +235,11 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleHitObjects(TextWriter writer)
         {
+            writer.WriteLine("[HitObjects]");
+
             if (beatmap.HitObjects.Count == 0)
                 return;
 
-            writer.WriteLine("[HitObjects]");
-
             foreach (var h in beatmap.HitObjects)
                 handleHitObject(writer, h);
         }

From b0052210b6a925d709dff9854b20795702fcfa03 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Nov 2020 00:18:25 +0900
Subject: [PATCH 06009/10326] Add asserts of HitObjects indices

---
 osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index 72d3421755..f2e0320ce3 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Text;
 using DiffPlex;
@@ -35,6 +36,9 @@ namespace osu.Game.Screens.Edit
             int oldHitObjectsIndex = Array.IndexOf(result.PiecesOld, "[HitObjects]");
             int newHitObjectsIndex = Array.IndexOf(result.PiecesNew, "[HitObjects]");
 
+            Debug.Assert(oldHitObjectsIndex >= 0);
+            Debug.Assert(newHitObjectsIndex >= 0);
+
             var toRemove = new List<int>();
             var toAdd = new List<int>();
 

From e078b78dcc6e5a244bf95376859390205d1f74c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 7 Nov 2020 20:31:44 +0100
Subject: [PATCH 06010/10326] Ensure callbacks don't fire when restoring
 default beatmap

---
 osu.Game/Screens/Edit/Editor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 13d1f378a6..85467d3bbb 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -499,6 +499,9 @@ namespace osu.Game.Screens.Edit
                 // confirming exit without save means we should delete the new beatmap completely.
                 beatmapManager.Delete(playableBeatmap.BeatmapInfo.BeatmapSet);
 
+                // eagerly clear contents before restoring default beatmap to prevent value change callbacks from firing.
+                ClearInternal();
+
                 // in theory this shouldn't be required but due to EF core not sharing instance states 100%
                 // MusicController is unaware of the changed DeletePending state.
                 Beatmap.SetDefault();

From ddbd6df24d825750065ec55942d725320ae211d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 7 Nov 2020 20:59:41 +0100
Subject: [PATCH 06011/10326] Unbind bindable lists for general safety

---
 .../Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs  | 1 +
 .../Compose/Components/Timeline/TimelineControlPointDisplay.cs   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
index ba3ac9113e..e76ab71e54 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         {
             base.LoadBeatmap(beatmap);
 
+            controlPointGroups.UnbindAll();
             controlPointGroups.BindTo(beatmap.Beatmap.ControlPointInfo.Groups);
             controlPointGroups.BindCollectionChanged((sender, args) =>
             {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
index 0da1b43201..13191df13c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.LoadBeatmap(beatmap);
 
+            controlPointGroups.UnbindAll();
             controlPointGroups.BindTo(beatmap.Beatmap.ControlPointInfo.Groups);
             controlPointGroups.BindCollectionChanged((sender, args) =>
             {

From 6d4bb4316c4a28f518d6543f28557ad4885cffb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 8 Nov 2020 00:12:25 +0100
Subject: [PATCH 06012/10326] Fix difficulty retrieval for online-sourced
 beatmaps

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

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 9820d508dd..eb83c88318 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -202,7 +202,9 @@ namespace osu.Game.Beatmaps
         /// <param name="cancellationToken">A token that may be used to cancel this update.</param>
         private void updateBindable([NotNull] BindableStarDifficulty bindable, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods, CancellationToken cancellationToken = default)
         {
-            GetAsync(new DifficultyCacheLookup(bindable.Beatmap, rulesetInfo, mods), cancellationToken)
+            // GetDifficultyAsync will fall back to existing data from BeatmapInfo if not locally available
+            // (contrary to GetAsync)
+            GetDifficultyAsync(bindable.Beatmap, rulesetInfo, mods, cancellationToken)
                 .ContinueWith(t =>
                 {
                     // We're on a threadpool thread, but we should exit back to the update thread so consumers can safely handle value-changed events.

From 790a2ca97d506635f6ed0baddb93dd7050808625 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 8 Nov 2020 12:29:52 +0100
Subject: [PATCH 06013/10326] Extract UserActivity logic to OsuGame.

---
 osu.Game/OsuGame.cs            |  5 +++++
 osu.Game/Screens/IOsuScreen.cs |  6 ++++++
 osu.Game/Screens/OsuScreen.cs  | 31 +++++--------------------------
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 64f8d4415b..5119f262d5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -51,6 +51,7 @@ using osu.Game.Screens.Select;
 using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
+using osu.Game.Users;
 
 namespace osu.Game
 {
@@ -961,11 +962,15 @@ namespace osu.Game
             LocalUserPlaying.Value = false;
 
             if (current is IOsuScreen currentOsuScreen)
+            {
                 OverlayActivationMode.UnbindFrom(currentOsuScreen.OverlayActivationMode);
+                API.Activity.UnbindFrom(currentOsuScreen.Activity);
+            }
 
             if (newScreen is IOsuScreen newOsuScreen)
             {
                 OverlayActivationMode.BindTo(newOsuScreen.OverlayActivationMode);
+                ((IBindable<UserActivity>)API.Activity).BindTo(newOsuScreen.Activity);
 
                 MusicController.AllowRateAdjustments = newOsuScreen.AllowRateAdjustments;
 
diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index e19037c2c4..cc8778d9ae 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -6,6 +6,7 @@ using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
+using osu.Game.Users;
 
 namespace osu.Game.Screens
 {
@@ -43,6 +44,11 @@ namespace osu.Game.Screens
         /// </summary>
         IBindable<OverlayActivation> OverlayActivationMode { get; }
 
+        /// <summary>
+        /// The current <see cref="UserActivity"/> for this screen.
+        /// </summary>
+        IBindable<UserActivity> Activity { get; }
+
         /// <summary>
         /// The amount of parallax to be applied while this screen is displayed.
         /// </summary>
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index a44d14fb5c..9b508c0cba 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -14,7 +14,6 @@ using osu.Game.Rulesets;
 using osu.Game.Screens.Menu;
 using osu.Game.Overlays;
 using osu.Game.Users;
-using osu.Game.Online.API;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens
@@ -63,22 +62,12 @@ namespace osu.Game.Screens
         /// </summary>
         protected virtual UserActivity InitialActivity => null;
 
-        private UserActivity activity;
-
         /// <summary>
         /// The current <see cref="UserActivity"/> for this screen.
         /// </summary>
-        protected UserActivity Activity
-        {
-            get => activity;
-            set
-            {
-                if (value == activity) return;
+        protected readonly Bindable<UserActivity> Activity;
 
-                activity = value;
-                updateActivity();
-            }
-        }
+        IBindable<UserActivity> IOsuScreen.Activity => Activity;
 
         /// <summary>
         /// Whether to disallow changes to game-wise Beatmap/Ruleset bindables for this screen (and all children).
@@ -135,15 +124,13 @@ namespace osu.Game.Screens
         [Resolved(canBeNull: true)]
         private OsuLogo logo { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private IAPIProvider api { get; set; }
-
         protected OsuScreen()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
             OverlayActivationMode = new Bindable<OverlayActivation>(InitialOverlayActivationMode);
+            Activity = new Bindable<UserActivity>();
         }
 
         [BackgroundDependencyLoader(true)]
@@ -158,8 +145,6 @@ namespace osu.Game.Screens
                 sampleExit?.Play();
             applyArrivingDefaults(true);
 
-            updateActivity();
-
             base.OnResuming(last);
         }
 
@@ -176,8 +161,8 @@ namespace osu.Game.Screens
 
             backgroundStack?.Push(localBackground = CreateBackground());
 
-            if (activity == null)
-                Activity = InitialActivity;
+            if (Activity.Value == null)
+                Activity.Value = InitialActivity;
 
             base.OnEntering(last);
         }
@@ -196,12 +181,6 @@ namespace osu.Game.Screens
             return false;
         }
 
-        private void updateActivity()
-        {
-            if (api != null)
-                api.Activity.Value = activity;
-        }
-
         /// <summary>
         /// Fired when this screen was entered or resumed and the logo state is required to be adjusted.
         /// </summary>

From 55070556a724b0f91618c953229a815e840fa5ce Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 8 Nov 2020 12:53:19 +0100
Subject: [PATCH 06014/10326] Move activity setup to BDL.

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

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 9b508c0cba..22c8d48606 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -137,6 +137,9 @@ namespace osu.Game.Screens
         private void load(OsuGame osu, AudioManager audio)
         {
             sampleExit = audio.Samples.Get(@"UI/screen-back");
+
+            if (Activity.Value == null)
+                Activity.Value = InitialActivity;
         }
 
         public override void OnResuming(IScreen last)
@@ -161,9 +164,6 @@ namespace osu.Game.Screens
 
             backgroundStack?.Push(localBackground = CreateBackground());
 
-            if (Activity.Value == null)
-                Activity.Value = InitialActivity;
-
             base.OnEntering(last);
         }
 

From 89b98b53883e71efc310af04a7720c3202278249 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 8 Nov 2020 13:16:27 +0100
Subject: [PATCH 06015/10326] Make multiplayer screen handle user activity
 updates from subscreens.

---
 osu.Game/Screens/Multi/Multiplayer.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index e6abde4d43..a323faeea1 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -24,6 +24,7 @@ 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.Users;
 using osuTK;
 
 namespace osu.Game.Screens.Multi
@@ -140,10 +141,10 @@ namespace osu.Game.Screens.Multi
                 }
             };
 
-            screenStack.Push(loungeSubScreen = new LoungeSubScreen());
-
             screenStack.ScreenPushed += screenPushed;
             screenStack.ScreenExited += screenExited;
+
+            screenStack.Push(loungeSubScreen = new LoungeSubScreen());
         }
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
@@ -311,18 +312,18 @@ namespace osu.Game.Screens.Multi
 
         private void screenPushed(IScreen lastScreen, IScreen newScreen)
         {
-            subScreenChanged(newScreen);
+            subScreenChanged(lastScreen, newScreen);
         }
 
         private void screenExited(IScreen lastScreen, IScreen newScreen)
         {
-            subScreenChanged(newScreen);
+            subScreenChanged(lastScreen, newScreen);
 
             if (screenStack.CurrentScreen == null && this.IsCurrentScreen())
                 this.Exit();
         }
 
-        private void subScreenChanged(IScreen newScreen)
+        private void subScreenChanged(IScreen lastScreen, IScreen newScreen)
         {
             switch (newScreen)
             {
@@ -337,6 +338,12 @@ namespace osu.Game.Screens.Multi
                     break;
             }
 
+            if (lastScreen is IOsuScreen lastOsuScreen)
+                Activity.UnbindFrom(lastOsuScreen.Activity);
+
+            if (newScreen is IOsuScreen newOsuScreen)
+                ((IBindable<UserActivity>)Activity).BindTo(newOsuScreen.Activity);
+
             updatePollingRate(isIdle.Value);
             createButton.FadeTo(newScreen is LoungeSubScreen ? 1 : 0, 200);
 

From 48fce8c4b92319e21a4e5bd3bb4d78d550654034 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 8 Nov 2020 13:21:21 +0100
Subject: [PATCH 06016/10326] Add user activities to multi subscreens.

---
 osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs |  3 +++
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs   |  2 ++
 osu.Game/Users/UserActivity.cs                   | 13 +++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index dd40f4adc6..4dc9ba549b 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -14,6 +14,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Multi.Lounge
 {
@@ -24,6 +25,8 @@ namespace osu.Game.Screens.Multi.Lounge
 
         protected FilterControl Filter;
 
+        protected override UserActivity InitialActivity => new UserActivity.SearchingForLobby();
+
         private readonly Bindable<bool> initialRoomsReceived = new Bindable<bool>();
 
         private Container content;
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 0d2adeb27c..2cbe215a39 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -21,6 +21,7 @@ using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
+using osu.Game.Users;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
 namespace osu.Game.Screens.Multi.Match
@@ -60,6 +61,7 @@ namespace osu.Game.Screens.Multi.Match
         public MatchSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
+            Activity.Value = new UserActivity.InLobby(room);
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Users/UserActivity.cs b/osu.Game/Users/UserActivity.cs
index 3c9f201805..0b4fa94942 100644
--- a/osu.Game/Users/UserActivity.cs
+++ b/osu.Game/Users/UserActivity.cs
@@ -3,6 +3,7 @@
 
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 
@@ -61,9 +62,21 @@ namespace osu.Game.Users
             public override string Status => @"Spectating a game";
         }
 
+        public class SearchingForLobby : UserActivity
+        {
+            public override string Status => @"Looking for a lobby";
+        }
+
         public class InLobby : UserActivity
         {
             public override string Status => @"In a multiplayer lobby";
+
+            public readonly Room Room;
+
+            public InLobby(Room room)
+            {
+                Room = room;
+            }
         }
     }
 }

From f1942fdb9cf2ab512976988dc77fc22843073d0e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 8 Nov 2020 14:38:59 +0100
Subject: [PATCH 06017/10326] Fix tests not building.

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
index 9662bd65b4..8e151a987a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestGenericActivity()
         {
-            AddStep("Set activity", () => API.Activity.Value = new UserActivity.InLobby());
+            AddStep("Set activity", () => API.Activity.Value = new UserActivity.InLobby(null));
 
             AddStep("Run command", () => Add(new NowPlayingCommand()));
 
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Online
         [TestCase(false)]
         public void TestLinkPresence(bool hasOnlineId)
         {
-            AddStep("Set activity", () => API.Activity.Value = new UserActivity.InLobby());
+            AddStep("Set activity", () => API.Activity.Value = new UserActivity.InLobby(null));
 
             AddStep("Set beatmap", () => Beatmap.Value = new DummyWorkingBeatmap(Audio, null)
             {

From d8d402211969d2432ed67e696055f85165928fd3 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 8 Nov 2020 14:39:56 +0100
Subject: [PATCH 06018/10326] Precise XMLDoc

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

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 22c8d48606..57b201c57a 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -56,9 +56,9 @@ namespace osu.Game.Screens
         protected new OsuGameBase Game => base.Game as OsuGameBase;
 
         /// <summary>
-        /// The <see cref="UserActivity"/> to set the user's activity automatically to when this screen is entered
-        /// <para>This <see cref="Activity"/> will be automatically set to <see cref="InitialActivity"/> for this screen on entering unless
-        /// <see cref="Activity"/> is manually set before.</para>
+        /// The <see cref="UserActivity"/> to set the user's activity automatically to when this screen is entered.
+        /// <para>This <see cref="Activity"/> will be automatically set to <see cref="InitialActivity"/> for this screen on entering for the first time
+        /// unless <see cref="Activity"/> is manually set before.</para>
         /// </summary>
         protected virtual UserActivity InitialActivity => null;
 

From e44951969f46c0e1e198c827692734e2216ba7b7 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 8 Nov 2020 18:22:19 +0100
Subject: [PATCH 06019/10326] Use ??= operator instead of null check.

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

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 57b201c57a..e7b872a6fb 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -138,8 +138,7 @@ namespace osu.Game.Screens
         {
             sampleExit = audio.Samples.Get(@"UI/screen-back");
 
-            if (Activity.Value == null)
-                Activity.Value = InitialActivity;
+            Activity.Value ??= InitialActivity;
         }
 
         public override void OnResuming(IScreen last)

From e4fb9b4dd3317d32fa623eb82643522cd3c57116 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 8 Nov 2020 18:42:24 +0100
Subject: [PATCH 06020/10326] Display room name on discord rich presence.

---
 osu.Desktop/DiscordRichPresence.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index 08cc0e7f5f..fa33339696 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -135,6 +135,9 @@ namespace osu.Desktop
 
                 case UserActivity.Editing edit:
                     return edit.Beatmap.ToString();
+
+                case UserActivity.InLobby lobby:
+                    return lobby.Room.Name.ToString();
             }
 
             return string.Empty;

From 90ce1bd5f05dae59094aa5ae6921cb056a0ff42e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Nov 2020 10:40:16 +0900
Subject: [PATCH 06021/10326] Add missing async suffix

---
 osu.Game/Database/UserLookupCache.cs                   | 2 +-
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index b7c6c480a9..01231f3f2b 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Database
         /// </summary>
         private bool pendingRequestConsumedIDs;
 
-        public Task<User> GetUser(int userId, CancellationToken token = default) => GetAsync(userId, token);
+        public Task<User> GetUserAsync(int userId, CancellationToken token = default) => GetAsync(userId, token);
 
         protected override async Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
         {
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 8299619a18..f6833385a4 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Dashboard
 
                         foreach (var id in e.NewItems.OfType<int>().ToArray())
                         {
-                            users.GetUser(id).ContinueWith(u =>
+                            users.GetUserAsync(id).ContinueWith(u =>
                             {
                                 if (u.Result == null)
                                     return;

From dc69eefa51490208a965103ca59417f1038a9e7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Nov 2020 11:54:28 +0900
Subject: [PATCH 06022/10326] Use HashSet instead of ConcurentBag

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

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index 01231f3f2b..adf6b4e9f8 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -16,7 +15,7 @@ namespace osu.Game.Database
 {
     public class UserLookupCache : MemoryCachingComponent<int, User>
     {
-        private readonly ConcurrentBag<int> nextTaskIDs = new ConcurrentBag<int>();
+        private readonly HashSet<int> nextTaskIDs = new HashSet<int>();
 
         [Resolved]
         private IAPIProvider api { get; set; }

From 690e69bcc6738cd68013619248b4c6afee912c91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Nov 2020 12:22:54 +0900
Subject: [PATCH 06023/10326] Reforamt for legibility

---
 .../Dashboard/CurrentlyPlayingDisplay.cs      | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index f6833385a4..c3ab9e86d4 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -53,40 +53,43 @@ namespace osu.Game.Overlays.Dashboard
             base.LoadComplete();
 
             playingUsers.BindTo(spectatorStreaming.PlayingUsers);
-            playingUsers.BindCollectionChanged((sender, e) => Schedule(() =>
-            {
-                switch (e.Action)
-                {
-                    case NotifyCollectionChangedAction.Add:
+            playingUsers.BindCollectionChanged(onUsersChanged, true);
+        }
 
-                        foreach (var id in e.NewItems.OfType<int>().ToArray())
+        private void onUsersChanged(object sender, NotifyCollectionChangedEventArgs e) => Schedule(() =>
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (var id in e.NewItems.OfType<int>().ToArray())
+                    {
+                        users.GetUserAsync(id).ContinueWith(u =>
                         {
-                            users.GetUserAsync(id).ContinueWith(u =>
+                            if (u.Result == null) return;
+
+                            Schedule(() =>
                             {
-                                if (u.Result == null)
+                                // user may no longer be playing.
+                                if (!playingUsers.Contains(u.Result.Id))
                                     return;
 
-                                Schedule(() =>
-                                {
-                                    if (playingUsers.Contains(u.Result.Id))
-                                        userFlow.Add(createUserPanel(u.Result));
-                                });
+                                userFlow.Add(createUserPanel(u.Result));
                             });
-                        }
+                        });
+                    }
 
-                        break;
+                    break;
 
-                    case NotifyCollectionChangedAction.Remove:
-                        foreach (var u in e.OldItems.OfType<int>())
-                            userFlow.FirstOrDefault(card => card.User.Id == u)?.Expire();
-                        break;
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (var u in e.OldItems.OfType<int>())
+                        userFlow.FirstOrDefault(card => card.User.Id == u)?.Expire();
+                    break;
 
-                    case NotifyCollectionChangedAction.Reset:
-                        userFlow.Clear();
-                        break;
-                }
-            }), true);
-        }
+                case NotifyCollectionChangedAction.Reset:
+                    userFlow.Clear();
+                    break;
+            }
+        });
 
         private PlayingUserPanel createUserPanel(User user) =>
             new PlayingUserPanel(user).With(panel =>

From cfb42037cff74a3db3dbcf80cb176003f428c7ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Nov 2020 12:23:29 +0900
Subject: [PATCH 06024/10326] Refactor request string logic to avoid linq usage

---
 osu.Game/Online/API/Requests/GetUsersRequest.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/Requests/GetUsersRequest.cs b/osu.Game/Online/API/Requests/GetUsersRequest.cs
index 0ec5173fb6..969d7fdba3 100644
--- a/osu.Game/Online/API/Requests/GetUsersRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUsersRequest.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 
 namespace osu.Game.Online.API.Requests
 {
@@ -20,6 +19,6 @@ namespace osu.Game.Online.API.Requests
             this.userIds = userIds;
         }
 
-        protected override string Target => $@"users/?{userIds.Select(u => $"ids[]={u}&").Aggregate((a, b) => a + b)}";
+        protected override string Target => "users/?ids[]=" + string.Join("&ids[]=", userIds);
     }
 }

From 490fbd1dd8d00b332a2dca9eaa218ad76e996117 Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Mon, 9 Nov 2020 05:54:48 +0100
Subject: [PATCH 06025/10326] Fix ki* textures having an incorrect vertical
 position

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

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 489e23ab7a..1f18647184 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Skinning
                 Math.Clamp(Clock.ElapsedFrameTime, 0, 200),
                 fill.Width, (float)Current.Value * maxFillWidth, 0, 200, Easing.OutQuint);
 
-            marker.Position = fill.Position + new Vector2(fill.DrawWidth, fill.DrawHeight / 2);
+            marker.Position = fill.Position + new Vector2(fill.DrawWidth, 0);
         }
 
         public void Flash(JudgementResult result) => marker.Flash(result);

From 7b0e387dfc1d1b322eada75093bbe9bab063ac9f Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Mon, 9 Nov 2020 08:20:19 +0100
Subject: [PATCH 06026/10326] apply different offset based on whether the
 marker is newStyle or not

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

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 1f18647184..2921d46467 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Skinning
                 Math.Clamp(Clock.ElapsedFrameTime, 0, 200),
                 fill.Width, (float)Current.Value * maxFillWidth, 0, 200, Easing.OutQuint);
 
-            marker.Position = fill.Position + new Vector2(fill.DrawWidth, 0);
+            marker.Position = fill.Position + new Vector2(fill.DrawWidth, isNewStyle ? fill.DrawHeight / 2 : 0);
         }
 
         public void Flash(JudgementResult result) => marker.Flash(result);

From 33c3b07101c4ca61c7496b89bb087b56d161142a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Nov 2020 19:06:48 +0900
Subject: [PATCH 06027/10326] Fix events not being bound correctly
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/Rulesets/Objects/Drawables/DrawableHitObject.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ecd345f1a9..6bb22018ec 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -180,9 +180,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
             {
                 var drawableNested = CreateNestedHitObject(h) ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
 
-                drawableNested.OnNewResult += (d, r) => OnNewResult?.Invoke(d, r);
-                drawableNested.OnRevertResult += (d, r) => OnRevertResult?.Invoke(d, r);
-                drawableNested.ApplyCustomUpdateState += (d, j) => ApplyCustomUpdateState?.Invoke(d, j);
+                drawableNested.OnNewResult += onNewResult;
+                drawableNested.OnRevertResult += onRevertResult;
+                drawableNested.ApplyCustomUpdateState += onApplyCustomUpdateState;
 
                 nestedHitObjects.Value.Add(drawableNested);
                 AddNestedHitObject(drawableNested);

From 4d6f0a8ea743cfa7aa67b58cfb629b514f529dfd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Nov 2020 19:42:00 +0900
Subject: [PATCH 06028/10326] Fix API request error handling

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

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index adf6b4e9f8..c85ad6d651 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Database
                 var request = new GetUsersRequest(lookupItems);
 
                 // rather than queueing, we maintain our own single-threaded request stream.
-                request.Perform(api);
+                api.Perform(request);
 
                 return request.Result?.Users;
             }

From ba137aadc82d979f970c72f29b7dfe14756d0752 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Nov 2020 20:44:12 +0900
Subject: [PATCH 06029/10326] 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 f56baf4e5f..e3285222f8 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1105.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1109.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3783ae7d5c..832722c729 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1105.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1109.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ed3ec9e48b..ad6dd2a0b5 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.Framework.iOS" Version="2020.1105.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1109.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1105.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1109.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 2e3fdf8116a55b1de874066e27d65f0b3345d2a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Nov 2020 20:50:36 +0900
Subject: [PATCH 06030/10326] Update reference to TK game window class

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

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 836b968a67..b17611f23f 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -130,7 +130,7 @@ namespace osu.Desktop
             switch (host.Window)
             {
                 // Legacy osuTK DesktopGameWindow
-                case DesktopGameWindow desktopGameWindow:
+                case OsuTKDesktopWindow desktopGameWindow:
                     desktopGameWindow.CursorState |= CursorState.Hidden;
                     desktopGameWindow.SetIconFromStream(iconStream);
                     desktopGameWindow.Title = Name;

From b8c63e7944335ac8569e7d7209e418caca1a9acb Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 9 Nov 2020 13:39:50 +0100
Subject: [PATCH 06031/10326] Apply review suggestions.

---
 osu.Desktop/DiscordRichPresence.cs | 2 +-
 osu.Game/Screens/OsuScreen.cs      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index fa33339696..26d7402a5b 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -137,7 +137,7 @@ namespace osu.Desktop
                     return edit.Beatmap.ToString();
 
                 case UserActivity.InLobby lobby:
-                    return lobby.Room.Name.ToString();
+                    return lobby.Room.Name.Value;
             }
 
             return string.Empty;
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index e7b872a6fb..851aedd84f 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens
         /// <summary>
         /// The current <see cref="UserActivity"/> for this screen.
         /// </summary>
-        protected readonly Bindable<UserActivity> Activity;
+        protected readonly Bindable<UserActivity> Activity = new Bindable<UserActivity>();
 
         IBindable<UserActivity> IOsuScreen.Activity => Activity;
 
@@ -130,7 +130,6 @@ namespace osu.Game.Screens
             Origin = Anchor.Centre;
 
             OverlayActivationMode = new Bindable<OverlayActivation>(InitialOverlayActivationMode);
-            Activity = new Bindable<UserActivity>();
         }
 
         [BackgroundDependencyLoader(true)]

From ec8b726ea80461024ad3f642b9c4301d00cf8109 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 9 Nov 2020 21:51:58 +0900
Subject: [PATCH 06032/10326] Re-privatise start time bindable

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 6bb22018ec..58b24cb7b2 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         protected virtual float SamplePlaybackPosition => 0.5f;
 
-        public readonly Bindable<double> StartTimeBindable = new Bindable<double>();
+        private readonly Bindable<double> startTimeBindable = new Bindable<double>();
         private readonly BindableList<HitSampleInfo> samplesBindable = new BindableList<HitSampleInfo>();
         private readonly Bindable<bool> userPositionalHitSounds = new Bindable<bool>();
         private readonly Bindable<int> comboIndexBindable = new Bindable<int>();
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.LoadComplete();
 
-            StartTimeBindable.BindValueChanged(_ => updateState(State.Value, true));
+            startTimeBindable.BindValueChanged(_ => updateState(State.Value, true));
             comboIndexBindable.BindValueChanged(_ => updateComboColour(), true);
 
             updateState(ArmedState.Idle, true);
@@ -188,7 +188,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 AddNestedHitObject(drawableNested);
             }
 
-            StartTimeBindable.BindTo(HitObject.StartTimeBindable);
+            startTimeBindable.BindTo(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
                 comboIndexBindable.BindTo(combo.ComboIndexBindable);
 
@@ -213,7 +213,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (!hasHitObjectApplied)
                 return;
 
-            StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
+            startTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
                 comboIndexBindable.UnbindFrom(combo.ComboIndexBindable);
 

From ac47399e6e0c57044d800f464a419f85a656f31d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Nov 2020 00:30:23 +0900
Subject: [PATCH 06033/10326] Update state after OnApply()

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 58b24cb7b2..77c4ea42df 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -197,11 +197,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             HitObject.DefaultsApplied += onDefaultsApplied;
 
+            OnApply(hitObject);
+
             // If not loaded, the state update happens in LoadComplete(). Otherwise, the update is scheduled to allow for lifetime updates.
             if (IsLoaded)
                 Schedule(() => updateState(ArmedState.Idle, true));
 
-            OnApply(hitObject);
             hasHitObjectApplied = true;
         }
 

From 66ea1572c72452824debf726c0703630b26b0f97 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Nov 2020 01:10:00 +0900
Subject: [PATCH 06034/10326] Fix unsafe list manipulation in
 BeatmapDifficultyCache

---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs | 44 +++++++++++++--------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index eb83c88318..eeb6075ef5 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Beatmaps
         private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(1, nameof(BeatmapDifficultyCache));
 
         // All bindables that should be updated along with the current ruleset + mods.
-        private readonly LockedWeakList<BindableStarDifficulty> trackedBindables = new LockedWeakList<BindableStarDifficulty>();
+        private readonly WeakList<BindableStarDifficulty> trackedBindables = new WeakList<BindableStarDifficulty>();
 
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
@@ -59,7 +59,10 @@ namespace osu.Game.Beatmaps
         public IBindable<StarDifficulty> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
         {
             var bindable = createBindable(beatmapInfo, currentRuleset.Value, currentMods.Value, cancellationToken);
-            trackedBindables.Add(bindable);
+
+            lock (trackedBindables)
+                trackedBindables.Add(bindable);
+
             return bindable;
         }
 
@@ -86,7 +89,8 @@ namespace osu.Game.Beatmaps
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops computing the star difficulty.</param>
         /// <returns>The <see cref="StarDifficulty"/>.</returns>
-        public Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null, CancellationToken cancellationToken = default)
+        public Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null,
+                                                       CancellationToken cancellationToken = default)
         {
             // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
             rulesetInfo ??= beatmapInfo.Ruleset;
@@ -148,15 +152,18 @@ namespace osu.Game.Beatmaps
         /// </summary>
         private void updateTrackedBindables()
         {
-            cancelTrackedBindableUpdate();
-            trackedUpdateCancellationSource = new CancellationTokenSource();
-
-            foreach (var b in trackedBindables)
+            lock (trackedBindables)
             {
-                var linkedSource = CancellationTokenSource.CreateLinkedTokenSource(trackedUpdateCancellationSource.Token, b.CancellationToken);
-                linkedCancellationSources.Add(linkedSource);
+                cancelTrackedBindableUpdate();
+                trackedUpdateCancellationSource = new CancellationTokenSource();
 
-                updateBindable(b, currentRuleset.Value, currentMods.Value, linkedSource.Token);
+                foreach (var b in trackedBindables)
+                {
+                    var linkedSource = CancellationTokenSource.CreateLinkedTokenSource(trackedUpdateCancellationSource.Token, b.CancellationToken);
+                    linkedCancellationSources.Add(linkedSource);
+
+                    updateBindable(b, currentRuleset.Value, currentMods.Value, linkedSource.Token);
+                }
             }
         }
 
@@ -165,15 +172,18 @@ namespace osu.Game.Beatmaps
         /// </summary>
         private void cancelTrackedBindableUpdate()
         {
-            trackedUpdateCancellationSource?.Cancel();
-            trackedUpdateCancellationSource = null;
-
-            if (linkedCancellationSources != null)
+            lock (trackedBindables)
             {
-                foreach (var c in linkedCancellationSources)
-                    c.Dispose();
+                trackedUpdateCancellationSource?.Cancel();
+                trackedUpdateCancellationSource = null;
 
-                linkedCancellationSources.Clear();
+                if (linkedCancellationSources != null)
+                {
+                    foreach (var c in linkedCancellationSources)
+                        c.Dispose();
+
+                    linkedCancellationSources.Clear();
+                }
             }
         }
 

From d4d3a6621e6f512ccfbcf378ab6500d8acc07db1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Nov 2020 01:30:25 +0900
Subject: [PATCH 06035/10326] Disable automatic lifetime management

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 77c4ea42df..05ef9b162f 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -109,6 +109,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
         public override bool RemoveCompletedTransforms => false;
         protected override bool RequiresChildrenUpdate => true;
 
+        public override bool ResetLifetimeWhenAssigned => false; // DHOs do their own lifetime management.
+
         public override bool IsPresent => base.IsPresent || (State.Value == ArmedState.Idle && Clock?.CurrentTime >= LifetimeStart);
 
         private readonly Bindable<ArmedState> state = new Bindable<ArmedState>();

From ef3c918a3cb028fee0b7fc47223732b01bfc25e0 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 5 Nov 2020 06:41:56 -0800
Subject: [PATCH 06036/10326] Simplify input buttons/keys in tests

---
 .../TestSceneSliderPlacementBlueprint.cs      |  3 +-
 .../Visual/Gameplay/TestSceneAutoplay.cs      | 10 +----
 .../Gameplay/TestSceneGameplayMenuOverlay.cs  | 34 +++++++----------
 .../Visual/Gameplay/TestSceneKeyBindings.cs   |  6 +--
 .../Visual/Gameplay/TestSceneKeyCounter.cs    |  6 +--
 .../Visual/Gameplay/TestScenePause.cs         |  6 +--
 .../Gameplay/TestSceneReplayRecorder.cs       |  3 +-
 .../Visual/Menus/TestSceneToolbar.cs          |  4 +-
 .../TestSceneLoungeRoomsContainer.cs          |  6 +--
 .../Navigation/TestSceneScreenNavigation.cs   | 22 +++--------
 .../Visual/Online/TestSceneChatOverlay.cs     |  9 +----
 .../Settings/TestSceneKeyBindingPanel.cs      |  3 +-
 .../SongSelect/TestScenePlaySongSelect.cs     | 37 ++++++-------------
 .../UserInterface/TestSceneCommentEditor.cs   | 10 +----
 14 files changed, 46 insertions(+), 113 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index a452f93676..67a2e5a47c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -280,8 +280,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         private void addClickStep(MouseButton button)
         {
-            AddStep($"press {button}", () => InputManager.PressButton(button));
-            AddStep($"release {button}", () => InputManager.ReleaseButton(button));
+            AddStep($"click {button}", () => InputManager.Click(button));
         }
 
         private void assertPlaced(bool expected) => AddAssert($"slider {(expected ? "placed" : "not placed")}", () => (getSlider() != null) == expected);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 4743317fdd..e198a8504b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -41,11 +41,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("store time", () => time = Player.GameplayClockContainer.GameplayClock.CurrentTime);
 
             // test seek via keyboard
-            AddStep("seek with right arrow key", () => press(Key.Right));
+            AddStep("seek with right arrow key", () => InputManager.Key(Key.Right));
             AddAssert("time seeked forward", () => Player.GameplayClockContainer.GameplayClock.CurrentTime > time + 2000);
 
             AddStep("store time", () => time = Player.GameplayClockContainer.GameplayClock.CurrentTime);
-            AddStep("seek with left arrow key", () => press(Key.Left));
+            AddStep("seek with left arrow key", () => InputManager.Key(Key.Left));
             AddAssert("time seeked backward", () => Player.GameplayClockContainer.GameplayClock.CurrentTime < time);
 
             seekToBreak(0);
@@ -67,11 +67,5 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             BreakPeriod destBreak() => Beatmap.Value.Beatmap.Breaks.ElementAt(breakIndex);
         }
-
-        private void press(Key key)
-        {
-            InputManager.PressKey(key);
-            InputManager.ReleaseKey(key);
-        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
index fc9cbb073e..d69ac665cc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             showOverlay();
 
-            AddStep("Up arrow", () => press(Key.Up));
+            AddStep("Up arrow", () => InputManager.Key(Key.Up));
             AddAssert("Last button selected", () => pauseOverlay.Buttons.Last().Selected.Value);
         }
 
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             showOverlay();
 
-            AddStep("Down arrow", () => press(Key.Down));
+            AddStep("Down arrow", () => InputManager.Key(Key.Down));
             AddAssert("First button selected", () => getButton(0).Selected.Value);
         }
 
@@ -110,11 +110,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("Show overlay", () => failOverlay.Show());
 
-            AddStep("Up arrow", () => press(Key.Up));
+            AddStep("Up arrow", () => InputManager.Key(Key.Up));
             AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected.Value);
-            AddStep("Up arrow", () => press(Key.Up));
+            AddStep("Up arrow", () => InputManager.Key(Key.Up));
             AddAssert("First button selected", () => failOverlay.Buttons.First().Selected.Value);
-            AddStep("Up arrow", () => press(Key.Up));
+            AddStep("Up arrow", () => InputManager.Key(Key.Up));
             AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected.Value);
         }
 
@@ -126,11 +126,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("Show overlay", () => failOverlay.Show());
 
-            AddStep("Down arrow", () => press(Key.Down));
+            AddStep("Down arrow", () => InputManager.Key(Key.Down));
             AddAssert("First button selected", () => failOverlay.Buttons.First().Selected.Value);
-            AddStep("Down arrow", () => press(Key.Down));
+            AddStep("Down arrow", () => InputManager.Key(Key.Down));
             AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected.Value);
-            AddStep("Down arrow", () => press(Key.Down));
+            AddStep("Down arrow", () => InputManager.Key(Key.Down));
             AddAssert("First button selected", () => failOverlay.Buttons.First().Selected.Value);
         }
 
@@ -177,7 +177,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             showOverlay();
 
-            AddStep("Down arrow", () => press(Key.Down));
+            AddStep("Down arrow", () => InputManager.Key(Key.Down));
             AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1)));
             AddAssert("First button not selected", () => !getButton(0).Selected.Value);
             AddAssert("Second button selected", () => getButton(1).Selected.Value);
@@ -195,7 +195,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1)));
-            AddStep("Up arrow", () => press(Key.Up));
+            AddStep("Up arrow", () => InputManager.Key(Key.Up));
             AddAssert("Second button not selected", () => !getButton(1).Selected.Value);
             AddAssert("First button selected", () => getButton(0).Selected.Value);
         }
@@ -210,7 +210,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1)));
             AddStep("Unhover second button", () => InputManager.MoveMouseTo(Vector2.Zero));
-            AddStep("Down arrow", () => press(Key.Down));
+            AddStep("Down arrow", () => InputManager.Key(Key.Down));
             AddAssert("First button selected", () => getButton(0).Selected.Value); // Initial state condition
         }
 
@@ -246,8 +246,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("Select second button", () =>
             {
-                press(Key.Down);
-                press(Key.Down);
+                InputManager.Key(Key.Down);
+                InputManager.Key(Key.Down);
             });
 
             bool triggered = false;
@@ -256,7 +256,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 lastAction = pauseOverlay.OnRetry;
                 pauseOverlay.OnRetry = () => triggered = true;
-                press(Key.Enter);
+                InputManager.Key(Key.Enter);
             });
 
             AddAssert("Action was triggered", () =>
@@ -290,12 +290,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private DialogButton getButton(int index) => pauseOverlay.Buttons.Skip(index).First();
 
-        private void press(Key key)
-        {
-            InputManager.PressKey(key);
-            InputManager.ReleaseKey(key);
-        }
-
         private void press(GlobalAction action)
         {
             globalActionContainer.TriggerPressed(action);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.cs
index db65e91d17..6de85499c5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyBindings.cs
@@ -32,11 +32,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestDefaultsWhenNotDatabased()
         {
-            AddStep("fire key", () =>
-            {
-                InputManager.PressKey(Key.A);
-                InputManager.ReleaseKey(Key.A);
-            });
+            AddStep("fire key", () => InputManager.Key(Key.A));
 
             AddAssert("received key", () => receiver.ReceivedAction);
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index d7a3f80256..87ab42fe60 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -40,11 +40,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             void addPressKeyStep()
             {
-                AddStep($"Press {testKey} key", () =>
-                {
-                    InputManager.PressKey(testKey);
-                    InputManager.ReleaseKey(testKey);
-                });
+                AddStep($"Press {testKey} key", () => InputManager.Key(testKey));
             }
 
             addPressKeyStep();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index ac0e8eb0d4..46dd91710a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -59,11 +59,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             confirmClockRunning(false);
             confirmPauseOverlayShown(false);
 
-            AddStep("click to resume", () =>
-            {
-                InputManager.PressButton(MouseButton.Left);
-                InputManager.ReleaseButton(MouseButton.Left);
-            });
+            AddStep("click to resume", () => InputManager.Click(MouseButton.Left));
 
             confirmClockRunning(true);
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index 47dd47959d..b72960931f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -158,8 +158,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("much move with press", () => moveFunction = Scheduler.AddDelayed(() =>
             {
                 InputManager.MoveMouseTo(InputManager.CurrentState.Mouse.Position + new Vector2(-1, 0));
-                InputManager.PressButton(MouseButton.Left);
-                InputManager.ReleaseButton(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
             }, 10, true));
             AddWaitStep("move", 10);
             AddStep("stop move", () => moveFunction.Cancel());
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index 2a4486812c..57d60cea9e 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -65,10 +65,8 @@ namespace osu.Game.Tests.Visual.Menus
                 AddStep($"switch to ruleset {i} via shortcut", () =>
                 {
                     InputManager.PressKey(Key.ControlLeft);
-                    InputManager.PressKey(numberKey);
-
+                    InputManager.Key(numberKey);
                     InputManager.ReleaseKey(Key.ControlLeft);
-                    InputManager.ReleaseKey(numberKey);
                 });
 
                 AddUntilStep("ruleset switched", () => rulesetSelector.Current.Value.Equals(expected));
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index b1f6ee3e3a..e33d15cfff 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -71,11 +71,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void press(Key down)
         {
-            AddStep($"press {down}", () =>
-            {
-                InputManager.PressKey(down);
-                InputManager.ReleaseKey(down);
-            });
+            AddStep($"press {down}", () => InputManager.Key(down));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 5963f806c6..d87854a7ea 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.Navigation
             if (withUserPause)
                 AddStep("pause", () => Game.Dependencies.Get<MusicController>().Stop(true));
 
-            AddStep("press enter", () => pressAndRelease(Key.Enter));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
 
             AddUntilStep("wait for player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
             AddUntilStep("wait for fail", () => player.HasFailed);
@@ -122,11 +122,11 @@ namespace osu.Game.Tests.Visual.Navigation
         public void TestOpenOptionsAndExitWithEscape()
         {
             AddUntilStep("Wait for options to load", () => Game.Settings.IsLoaded);
-            AddStep("Enter menu", () => pressAndRelease(Key.Enter));
+            AddStep("Enter menu", () => InputManager.Key(Key.Enter));
             AddStep("Move mouse to options overlay", () => InputManager.MoveMouseTo(optionsButtonPosition));
             AddStep("Click options overlay", () => InputManager.Click(MouseButton.Left));
             AddAssert("Options overlay was opened", () => Game.Settings.State.Value == Visibility.Visible);
-            AddStep("Hide options overlay using escape", () => pressAndRelease(Key.Escape));
+            AddStep("Hide options overlay using escape", () => InputManager.Key(Key.Escape));
             AddAssert("Options overlay was closed", () => Game.Settings.State.Value == Visibility.Hidden);
         }
 
@@ -158,10 +158,8 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("Change ruleset to osu!taiko", () =>
             {
                 InputManager.PressKey(Key.ControlLeft);
-                InputManager.PressKey(Key.Number2);
-
+                InputManager.Key(Key.Number2);
                 InputManager.ReleaseKey(Key.ControlLeft);
-                InputManager.ReleaseKey(Key.Number2);
             });
 
             AddAssert("Ruleset changed to osu!taiko", () => Game.Toolbar.ChildrenOfType<ToolbarRulesetSelector>().Single().Current.Value.ID == 1);
@@ -181,10 +179,8 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("Change ruleset to osu!taiko", () =>
             {
                 InputManager.PressKey(Key.ControlLeft);
-                InputManager.PressKey(Key.Number2);
-
+                InputManager.Key(Key.Number2);
                 InputManager.ReleaseKey(Key.ControlLeft);
-                InputManager.ReleaseKey(Key.Number2);
             });
 
             AddAssert("Ruleset changed to osu!taiko", () => Game.Toolbar.ChildrenOfType<ToolbarRulesetSelector>().Single().Current.Value.ID == 1);
@@ -193,7 +189,7 @@ namespace osu.Game.Tests.Visual.Navigation
         }
 
         private void pushEscape() =>
-            AddStep("Press escape", () => pressAndRelease(Key.Escape));
+            AddStep("Press escape", () => InputManager.Key(Key.Escape));
 
         private void exitViaEscapeAndConfirm()
         {
@@ -208,12 +204,6 @@ namespace osu.Game.Tests.Visual.Navigation
             ConfirmAtMainMenu();
         }
 
-        private void pressAndRelease(Key key)
-        {
-            InputManager.PressKey(key);
-            InputManager.ReleaseKey(key);
-        }
-
         private class TestSongSelect : PlaySongSelect
         {
             public ModSelectOverlay ModSelectOverlay => ModSelect;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 0025a26baf..fca642ad6c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -103,11 +103,7 @@ namespace osu.Game.Tests.Visual.Online
         public void TestChannelShortcutKeys()
         {
             AddStep("Join channels", () => channels.ForEach(channel => channelManager.JoinChannel(channel)));
-            AddStep("Close channel selector", () =>
-            {
-                InputManager.PressKey(Key.Escape);
-                InputManager.ReleaseKey(Key.Escape);
-            });
+            AddStep("Close channel selector", () => InputManager.Key(Key.Escape));
             AddUntilStep("Wait for close", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
 
             for (int zeroBasedIndex = 0; zeroBasedIndex < 10; ++zeroBasedIndex)
@@ -216,9 +212,8 @@ namespace osu.Game.Tests.Visual.Online
         {
             var channelKey = Key.Number0 + number;
             InputManager.PressKey(Key.AltLeft);
-            InputManager.PressKey(channelKey);
+            InputManager.Key(channelKey);
             InputManager.ReleaseKey(Key.AltLeft);
-            InputManager.ReleaseKey(channelKey);
         }
 
         private void clickDrawable(Drawable d)
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 987a4a67fe..8330b9b360 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -51,8 +51,7 @@ namespace osu.Game.Tests.Visual.Settings
 
                 clickDelegate = Scheduler.AddDelayed(() =>
                 {
-                    InputManager.PressButton(MouseButton.Left);
-                    InputManager.ReleaseButton(MouseButton.Left);
+                    InputManager.Click(MouseButton.Left);
 
                     if (++buttonClicks == 2)
                     {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index cd97ffe9e7..aa531ba106 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -98,10 +98,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("select next and enter", () =>
             {
-                InputManager.PressKey(Key.Down);
-                InputManager.ReleaseKey(Key.Down);
-                InputManager.PressKey(Key.Enter);
-                InputManager.ReleaseKey(Key.Enter);
+                InputManager.Key(Key.Down);
+                InputManager.Key(Key.Enter);
             });
 
             AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
@@ -123,10 +121,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("select next and enter", () =>
             {
-                InputManager.PressKey(Key.Enter);
-                InputManager.ReleaseKey(Key.Enter);
-                InputManager.PressKey(Key.Down);
-                InputManager.ReleaseKey(Key.Down);
+                InputManager.Key(Key.Enter);
+                InputManager.Key(Key.Down);
             });
 
             AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
@@ -151,11 +147,9 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.MoveMouseTo(songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>()
                                                    .First(b => ((CarouselBeatmap)b.Item).Beatmap != songSelect.Carousel.SelectedBeatmap));
 
-                InputManager.PressButton(MouseButton.Left);
-                InputManager.ReleaseButton(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
 
-                InputManager.PressKey(Key.Enter);
-                InputManager.ReleaseKey(Key.Enter);
+                InputManager.Key(Key.Enter);
             });
 
             AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
@@ -182,8 +176,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 InputManager.PressButton(MouseButton.Left);
 
-                InputManager.PressKey(Key.Enter);
-                InputManager.ReleaseKey(Key.Enter);
+                InputManager.Key(Key.Enter);
 
                 InputManager.ReleaseButton(MouseButton.Left);
             });
@@ -567,10 +560,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("press ctrl+enter", () =>
             {
                 InputManager.PressKey(Key.ControlLeft);
-                InputManager.PressKey(Key.Enter);
-
+                InputManager.Key(Key.Enter);
                 InputManager.ReleaseKey(Key.ControlLeft);
-                InputManager.ReleaseKey(Key.Enter);
             });
 
             AddUntilStep("wait for player", () => Stack.CurrentScreen is PlayerLoader);
@@ -617,8 +608,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 InputManager.MoveMouseTo(difficultyIcon);
 
-                InputManager.PressButton(MouseButton.Left);
-                InputManager.ReleaseButton(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
             });
 
             AddAssert("Selected beatmap correct", () => getCurrentBeatmapIndex() == getDifficultyIconIndex(set, difficultyIcon));
@@ -647,8 +637,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 InputManager.MoveMouseTo(filteredIcon);
 
-                InputManager.PressButton(MouseButton.Left);
-                InputManager.ReleaseButton(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
             });
 
             AddAssert("Selected beatmap correct", () => songSelect.Carousel.SelectedBeatmap == filteredBeatmap);
@@ -691,8 +680,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 InputManager.MoveMouseTo(difficultyIcon);
 
-                InputManager.PressButton(MouseButton.Left);
-                InputManager.ReleaseButton(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
             });
 
             AddUntilStep("Check ruleset changed to mania", () => Ruleset.Value.ID == 3);
@@ -738,8 +726,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 InputManager.MoveMouseTo(groupIcon);
 
-                InputManager.PressButton(MouseButton.Left);
-                InputManager.ReleaseButton(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
             });
 
             AddUntilStep("Check ruleset changed to mania", () => Ruleset.Value.ID == 3);
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index d0a2ca83e3..920b437f57 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
             AddStep("enter text", () => commentEditor.Current.Value = "text");
 
-            AddStep("press Enter", () => press(Key.Enter));
+            AddStep("press Enter", () => InputManager.Key(Key.Enter));
 
             AddAssert("text committed", () => commentEditor.CommittedText == "text");
             AddAssert("button is loading", () => commentEditor.IsLoading);
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddStep("press Enter", () => press(Key.Enter));
+            AddStep("press Enter", () => InputManager.Key(Key.Enter));
 
             AddAssert("no text committed", () => commentEditor.CommittedText == null);
             AddAssert("button is not loading", () => !commentEditor.IsLoading);
@@ -101,12 +101,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("cancel action fired", () => cancellableCommentEditor.Cancelled);
         }
 
-        private void press(Key key)
-        {
-            InputManager.PressKey(key);
-            InputManager.ReleaseKey(key);
-        }
-
         private class TestCommentEditor : CommentEditor
         {
             public new Bindable<string> Current => base.Current;

From 1548c0dc25d192b5c3faeb802f4b7f07f68bef9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Nov 2020 07:27:27 +0900
Subject: [PATCH 06037/10326] Ensure graph hover state is updated after data
 changes

---
 .../Overlays/Profile/Header/Components/RankGraph.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index ffc060b3f1..51a13a1231 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -94,13 +94,18 @@ namespace osu.Game.Overlays.Profile.Header.Components
             }
 
             graph.FadeTo(ranks.Length > 1 ? 1 : 0, fade_duration, Easing.Out);
+
+            if (IsHovered)
+                graph.UpdateBallPosition(lastHoverPosition);
         }
 
+        private float lastHoverPosition;
+
         protected override bool OnHover(HoverEvent e)
         {
             if (ranks?.Length > 1)
             {
-                graph.UpdateBallPosition(e.MousePosition.X);
+                graph.UpdateBallPosition(lastHoverPosition = e.MousePosition.X);
                 graph.ShowBar();
             }
 
@@ -117,11 +122,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            if (ranks?.Length > 1)
-            {
-                graph.HideBar();
-            }
-
+            graph.HideBar();
             base.OnHoverLost(e);
         }
 

From 37feedae7a5226c41d2c4cf9ea27d37bce88d3f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Nov 2020 07:27:38 +0900
Subject: [PATCH 06038/10326] Fix potential crash due to stale index

---
 .../Overlays/Profile/Header/Components/RankGraph.cs   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index 51a13a1231..ffa918e4e8 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         private readonly OsuSpriteText placeholder;
 
         private KeyValuePair<int, int>[] ranks;
-        private int dayIndex;
+        private int hoveredIndex = -1;
         public readonly Bindable<UserStatistics> Statistics = new Bindable<UserStatistics>();
 
         public RankGraph()
@@ -55,7 +55,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 }
             };
 
-            graph.OnBallMove += i => dayIndex = i;
+            graph.OnBallMove += i => hoveredIndex = i;
         }
 
         [BackgroundDependencyLoader]
@@ -74,6 +74,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         private void updateStatistics(UserStatistics statistics)
         {
             placeholder.FadeIn(fade_duration, Easing.Out);
+            hoveredIndex = -1;
 
             if (statistics?.Ranks.Global == null)
             {
@@ -201,14 +202,14 @@ namespace osu.Game.Overlays.Profile.Header.Components
         {
             get
             {
-                if (Statistics.Value?.Ranks.Global == null)
+                if (ranks == null || hoveredIndex == -1)
                     return null;
 
-                var days = ranked_days - ranks[dayIndex].Key + 1;
+                var days = ranked_days - ranks[hoveredIndex].Key + 1;
 
                 return new TooltipDisplayContent
                 {
-                    Rank = $"#{ranks[dayIndex].Value:#,##0}",
+                    Rank = $"#{ranks[hoveredIndex].Value:#,##0}",
                     Time = days == 0 ? "now" : $"{days} days ago"
                 };
             }

From 4303a24a6f01c66e92550135a42a467aca861858 Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Tue, 10 Nov 2020 00:53:24 +0100
Subject: [PATCH 06039/10326] Replace rankHistory in JsonProperty with
 rank_history

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

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 1fbc3d06f4..2a76a963e1 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -186,7 +186,7 @@ namespace osu.Game.Users
             }
         }
 
-        [JsonProperty(@"rankHistory")]
+        [JsonProperty(@"rank_history")]
         private RankHistoryData rankHistory
         {
             set => statistics.RankHistory = value;

From c671d97e6f3638b2ceae96986a509eafec0bff99 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 9 Nov 2020 18:39:35 -0800
Subject: [PATCH 06040/10326] Disable watch button on the local user

---
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index c3ab9e86d4..35cb97adbb 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -102,6 +102,8 @@ namespace osu.Game.Overlays.Dashboard
         {
             public readonly User User;
 
+            private PurpleTriangleButton watchButton;
+
             [Resolved(canBeNull: true)]
             private OsuGame game { get; set; }
 
@@ -127,7 +129,7 @@ namespace osu.Game.Overlays.Dashboard
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                             },
-                            new PurpleTriangleButton
+                            watchButton = new PurpleTriangleButton
                             {
                                 RelativeSizeAxes = Axes.X,
                                 Text = "Watch",
@@ -139,6 +141,12 @@ namespace osu.Game.Overlays.Dashboard
                     },
                 };
             }
+
+            [BackgroundDependencyLoader]
+            private void load(IAPIProvider api)
+            {
+                watchButton.Enabled.Value = User.Id != api.LocalUser.Value.Id;
+            }
         }
     }
 }

From 670d6d87198e97b331095d9d6fb156d0f5ba3840 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 9 Nov 2020 18:59:54 -0800
Subject: [PATCH 06041/10326] Make button field readonly

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

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 35cb97adbb..36e2e9ae43 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Overlays.Dashboard
         {
             public readonly User User;
 
-            private PurpleTriangleButton watchButton;
+            private readonly PurpleTriangleButton watchButton;
 
             [Resolved(canBeNull: true)]
             private OsuGame game { get; set; }

From 4af390a1681e4a616989d6483368ffe4d393ec50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Nov 2020 12:33:07 +0900
Subject: [PATCH 06042/10326] Move hierarchy init to load and remove
 unnecessary field storage

---
 .../Dashboard/CurrentlyPlayingDisplay.cs      | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 36e2e9ae43..d39a81f5e8 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -102,8 +102,6 @@ namespace osu.Game.Overlays.Dashboard
         {
             public readonly User User;
 
-            private readonly PurpleTriangleButton watchButton;
-
             [Resolved(canBeNull: true)]
             private OsuGame game { get; set; }
 
@@ -112,7 +110,11 @@ namespace osu.Game.Overlays.Dashboard
                 User = user;
 
                 AutoSizeAxes = Axes.Both;
+            }
 
+            [BackgroundDependencyLoader]
+            private void load(IAPIProvider api)
+            {
                 InternalChildren = new Drawable[]
                 {
                     new FillFlowContainer
@@ -123,30 +125,25 @@ namespace osu.Game.Overlays.Dashboard
                         Width = 290,
                         Children = new Drawable[]
                         {
-                            new UserGridPanel(user)
+                            new UserGridPanel(User)
                             {
                                 RelativeSizeAxes = Axes.X,
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                             },
-                            watchButton = new PurpleTriangleButton
+                            new PurpleTriangleButton
                             {
                                 RelativeSizeAxes = Axes.X,
                                 Text = "Watch",
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
-                                Action = () => game?.PerformFromScreen(s => s.Push(new Spectator(user)))
+                                Action = () => game?.PerformFromScreen(s => s.Push(new Spectator(User))),
+                                Enabled = { Value = User.Id != api.LocalUser.Value.Id }
                             }
                         }
                     },
                 };
             }
-
-            [BackgroundDependencyLoader]
-            private void load(IAPIProvider api)
-            {
-                watchButton.Enabled.Value = User.Id != api.LocalUser.Value.Id;
-            }
         }
     }
 }

From 6cc0bf17a9c06333d35079c46531bbea7fb0fab6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Nov 2020 14:31:27 +0900
Subject: [PATCH 06043/10326] Add explicit lock object and some xmldoc for
 clarity

---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs | 25 +++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index eeb6075ef5..3b58062add 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -30,9 +30,23 @@ namespace osu.Game.Beatmaps
         // Too many simultaneous updates can lead to stutters. One thread seems to work fine for song select display purposes.
         private readonly ThreadedTaskScheduler updateScheduler = new ThreadedTaskScheduler(1, nameof(BeatmapDifficultyCache));
 
-        // All bindables that should be updated along with the current ruleset + mods.
+        /// <summary>
+        /// All bindables that should be updated along with the current ruleset + mods.
+        /// </summary>
         private readonly WeakList<BindableStarDifficulty> trackedBindables = new WeakList<BindableStarDifficulty>();
 
+        /// <summary>
+        /// Cancellation sources used by tracked bindables.
+        /// </summary>
+        private readonly List<CancellationTokenSource> linkedCancellationSources = new List<CancellationTokenSource>();
+
+        /// <summary>
+        /// Lock to be held when operating on <see cref="trackedBindables"/> or <see cref="linkedCancellationSources"/>.
+        /// </summary>
+        private readonly object bindableUpdateLock = new object();
+
+        private CancellationTokenSource trackedUpdateCancellationSource;
+
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -60,7 +74,7 @@ namespace osu.Game.Beatmaps
         {
             var bindable = createBindable(beatmapInfo, currentRuleset.Value, currentMods.Value, cancellationToken);
 
-            lock (trackedBindables)
+            lock (bindableUpdateLock)
                 trackedBindables.Add(bindable);
 
             return bindable;
@@ -144,15 +158,12 @@ namespace osu.Game.Beatmaps
             return DifficultyRating.Easy;
         }
 
-        private CancellationTokenSource trackedUpdateCancellationSource;
-        private readonly List<CancellationTokenSource> linkedCancellationSources = new List<CancellationTokenSource>();
-
         /// <summary>
         /// Updates all tracked <see cref="BindableStarDifficulty"/> using the current ruleset and mods.
         /// </summary>
         private void updateTrackedBindables()
         {
-            lock (trackedBindables)
+            lock (bindableUpdateLock)
             {
                 cancelTrackedBindableUpdate();
                 trackedUpdateCancellationSource = new CancellationTokenSource();
@@ -172,7 +183,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         private void cancelTrackedBindableUpdate()
         {
-            lock (trackedBindables)
+            lock (bindableUpdateLock)
             {
                 trackedUpdateCancellationSource?.Cancel();
                 trackedUpdateCancellationSource = null;

From a2ef3aa21a5aec1565347af57be37e4564acb5f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Nov 2020 16:26:30 +0900
Subject: [PATCH 06044/10326] Force beatmap listing overlay's textbox back on
 screen when a key is pressed

Not the cleanest solution, but works for now. Will eventually be
replaced after the header is updated to reflect the latest designs
(which keeps it on screen in all cases).

Closes https://github.com/ppy/osu/issues/10703.
---
 .../BeatmapListingFilterControl.cs            | 10 +++++++++-
 .../BeatmapListingSearchControl.cs            | 19 +++++++++++++++++++
 osu.Game/Overlays/BeatmapListingOverlay.cs    |  7 +++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 3be38e3c1d..d991dcfcfb 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -32,6 +32,11 @@ namespace osu.Game.Overlays.BeatmapListing
         /// </summary>
         public Action SearchStarted;
 
+        /// <summary>
+        /// Any time the search text box receives key events (even while masked).
+        /// </summary>
+        public Action TypingStarted;
+
         /// <summary>
         /// True when pagination has reached the end of available results.
         /// </summary>
@@ -82,7 +87,10 @@ namespace osu.Game.Overlays.BeatmapListing
                             Radius = 3,
                             Offset = new Vector2(0f, 1f),
                         },
-                        Child = searchControl = new BeatmapListingSearchControl(),
+                        Child = searchControl = new BeatmapListingSearchControl
+                        {
+                            TypingStarted = () => TypingStarted?.Invoke()
+                        }
                     },
                     new Container
                     {
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 3694c9855e..758781bb7d 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -1,12 +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;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osuTK;
 using osu.Framework.Bindables;
+using osu.Framework.Input.Events;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
@@ -19,6 +21,11 @@ namespace osu.Game.Overlays.BeatmapListing
 {
     public class BeatmapListingSearchControl : CompositeDrawable
     {
+        /// <summary>
+        /// Any time the text box receives key events (even while masked).
+        /// </summary>
+        public Action TypingStarted;
+
         public Bindable<string> Query => textBox.Current;
 
         public Bindable<RulesetInfo> Ruleset => modeFilter.Current;
@@ -102,6 +109,7 @@ namespace osu.Game.Overlays.BeatmapListing
                             textBox = new BeatmapSearchTextBox
                             {
                                 RelativeSizeAxes = Axes.X,
+                                TypingStarted = () => TypingStarted?.Invoke(),
                             },
                             new ReverseChildIDFillFlowContainer<Drawable>
                             {
@@ -138,12 +146,23 @@ namespace osu.Game.Overlays.BeatmapListing
 
         private class BeatmapSearchTextBox : SearchTextBox
         {
+            /// <summary>
+            /// Any time the text box receives key events (even while masked).
+            /// </summary>
+            public Action TypingStarted;
+
             protected override Color4 SelectionColour => Color4.Gray;
 
             public BeatmapSearchTextBox()
             {
                 PlaceholderText = @"type in keywords...";
             }
+
+            protected override bool OnKeyDown(KeyDownEvent e)
+            {
+                TypingStarted?.Invoke();
+                return base.OnKeyDown(e);
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 144af91145..1e29e713af 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -68,6 +68,7 @@ namespace osu.Game.Overlays
                             Header,
                             filterControl = new BeatmapListingFilterControl
                             {
+                                TypingStarted = onTypingStarted,
                                 SearchStarted = onSearchStarted,
                                 SearchFinished = onSearchFinished,
                             },
@@ -102,6 +103,12 @@ namespace osu.Game.Overlays
             };
         }
 
+        private void onTypingStarted()
+        {
+            // temporary until the textbox/header is updated to always stay on screen.
+            resultScrollContainer.ScrollToStart();
+        }
+
         protected override void OnFocus(FocusEvent e)
         {
             base.OnFocus(e);

From 5221a34929719a84562ddafe8c24dc304a0cba90 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Nov 2020 16:32:58 +0900
Subject: [PATCH 06045/10326] Only handle keys which create characters

---
 .../Overlays/BeatmapListing/BeatmapListingSearchControl.cs   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 758781bb7d..e232bf045f 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -160,8 +160,11 @@ namespace osu.Game.Overlays.BeatmapListing
 
             protected override bool OnKeyDown(KeyDownEvent e)
             {
+                if (!base.OnKeyDown(e))
+                    return false;
+
                 TypingStarted?.Invoke();
-                return base.OnKeyDown(e);
+                return true;
             }
         }
     }

From 109abc0e2945adfa60c35a78e9ddde27d82066a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 08:27:59 +0100
Subject: [PATCH 06046/10326] Always store standardised score when populating
 ScoreInfo

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

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 33271d9689..499673619f 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -290,7 +290,7 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public virtual void PopulateScore(ScoreInfo score)
         {
-            score.TotalScore = (long)Math.Round(TotalScore.Value);
+            score.TotalScore = (long)Math.Round(GetStandardisedScore());
             score.Combo = Combo.Value;
             score.MaxCombo = HighestCombo.Value;
             score.Accuracy = Math.Round(Accuracy.Value, 4);

From a012105dac4ca9af9f1d7d4548857eaba7c69892 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Nov 2020 16:54:33 +0900
Subject: [PATCH 06047/10326] Fix editor quick delete being triggerable from
 left mouse button

Closes https://github.com/ppy/osu/issues/10629.
---
 .../Edit/Compose/Components/BlueprintContainer.cs      |  2 +-
 .../Edit/Compose/Components/SelectionHandler.cs        | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index e7da220946..d5306c3450 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -303,7 +303,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 if (blueprint.IsHovered)
                 {
-                    selectedPerformed &= SelectionHandler.HandleSelectionRequested(blueprint, e.CurrentState);
+                    selectedPerformed &= SelectionHandler.HandleSelectionRequested(blueprint, e);
                     clickSelectionBegan = true;
                     break;
                 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 0bbbfaf5e8..21810379cc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -14,7 +14,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
-using osu.Framework.Input.States;
+using osu.Framework.Input.Events;
 using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -218,17 +218,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Handle a blueprint requesting selection.
         /// </summary>
         /// <param name="blueprint">The blueprint.</param>
-        /// <param name="state">The input state at the point of selection.</param>
+        /// <param name="e">The mouse event responsible for selection.</param>
         /// <returns>Whether a selection was performed.</returns>
-        internal bool HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
+        internal bool HandleSelectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
         {
-            if (state.Keyboard.ShiftPressed && state.Mouse.IsPressed(MouseButton.Right))
+            if (e.ShiftPressed && e.Button == MouseButton.Right)
             {
                 handleQuickDeletion(blueprint);
                 return false;
             }
 
-            if (state.Keyboard.ControlPressed && state.Mouse.IsPressed(MouseButton.Left))
+            if (e.ControlPressed && e.Button == MouseButton.Left)
                 blueprint.ToggleSelection();
             else
                 ensureSelected(blueprint);

From de6fcd1792c6ed43b3e1e3945a0e244308259986 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Nov 2020 17:16:28 +0900
Subject: [PATCH 06048/10326] Fix BlueprintContainer triggering assert when
 left and right mouse button are pressed together

---
 .../Compose/Components/BlueprintContainer.cs     | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index d5306c3450..b67f6a6ba6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -295,21 +295,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether a selection was performed.</returns>
         private bool beginClickSelection(MouseButtonEvent e)
         {
-            Debug.Assert(!clickSelectionBegan);
-
-            bool selectedPerformed = true;
-
             foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
             {
-                if (blueprint.IsHovered)
-                {
-                    selectedPerformed &= SelectionHandler.HandleSelectionRequested(blueprint, e);
-                    clickSelectionBegan = true;
-                    break;
-                }
+                if (!blueprint.IsHovered) continue;
+
+                if (SelectionHandler.HandleSelectionRequested(blueprint, e))
+                    return clickSelectionBegan = true;
             }
 
-            return selectedPerformed;
+            return false;
         }
 
         /// <summary>

From 28daff17164eef0ad7caa55ad0a479ed8d9e5d75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Nov 2020 17:57:57 +0900
Subject: [PATCH 06049/10326] Stop mod select overlay hotkeys handling input
 when control is pressed

Closes https://github.com/ppy/osu/issues/10766 in about the best way we
can for now.
---
 osu.Game/Overlays/Mods/ModSection.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 3701f9ecab..0107f94dcf 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -85,6 +85,8 @@ namespace osu.Game.Overlays.Mods
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
+            if (e.ControlPressed) return false;
+
             if (ToggleKeys != null)
             {
                 var index = Array.IndexOf(ToggleKeys, e.Key);

From 833c0b223ef0a184314c46f9d756c2c3a6ca43d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Nov 2020 18:08:12 +0900
Subject: [PATCH 06050/10326] Clamp index to valid bounds

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

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index ffa918e4e8..26126bca58 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
             public void HideBar() => bar.FadeOut(fade_duration);
 
-            private int calculateIndex(float mouseXPosition) => (int)MathF.Round(mouseXPosition / DrawWidth * (DefaultValueCount - 1));
+            private int calculateIndex(float mouseXPosition) => (int)Math.Clamp(MathF.Round(mouseXPosition / DrawWidth * (DefaultValueCount - 1)), 0, DefaultValueCount - 1);
 
             private Vector2 calculateBallPosition(int index)
             {

From f5076fe3b8f2e46100c4c13a6e96996523345bc5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Nov 2020 18:15:11 +0900
Subject: [PATCH 06051/10326] Revert unnecessary change

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 05ef9b162f..77c4ea42df 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -109,8 +109,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         public override bool RemoveCompletedTransforms => false;
         protected override bool RequiresChildrenUpdate => true;
 
-        public override bool ResetLifetimeWhenAssigned => false; // DHOs do their own lifetime management.
-
         public override bool IsPresent => base.IsPresent || (State.Value == ArmedState.Idle && Clock?.CurrentTime >= LifetimeStart);
 
         private readonly Bindable<ArmedState> state = new Bindable<ArmedState>();

From 88112801eba65f5602bc8f5fe16d8c61390f3d79 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Nov 2020 18:56:09 +0900
Subject: [PATCH 06052/10326] Remove result storage from hitobject

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 6 ------
 osu.Game/Rulesets/Objects/HitObject.cs                   | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 77c4ea42df..7a4e136553 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -166,16 +166,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             HitObject = hitObject ?? throw new InvalidOperationException($"Cannot apply a null {nameof(HitObject)}.");
 
-            // Copy any existing result from the hitobject (required for rewind / judgement revert).
-            Result = HitObject.Result;
-
             // Ensure this DHO has a result.
             Result ??= CreateResult(HitObject.CreateJudgement())
                        ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
-            // Ensure the hitobject has a result.
-            HitObject.Result = Result;
-
             foreach (var h in HitObject.NestedHitObjects)
             {
                 var drawableNested = CreateNestedHitObject(h) ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 9ef3ff9c4a..826d411822 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -12,7 +12,6 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 
@@ -169,11 +168,6 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         [NotNull]
         protected virtual HitWindows CreateHitWindows() => new HitWindows();
-
-        /// <summary>
-        /// The result this <see cref="HitObject"/> was judged with. Used internally for rewinding within <see cref="DrawableHitObject"/>.
-        /// </summary>
-        internal JudgementResult Result;
     }
 
     public static class HitObjectExtensions

From 757a4b5c319cf0b382e97db6ae5775c5ff5f1105 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Nov 2020 19:47:23 +0900
Subject: [PATCH 06053/10326] Add hitobject lifetime model

---
 .../Objects/HitObjectLifetimeEntry.cs         | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs

diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
new file mode 100644
index 0000000000..f134c66274
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.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.Performance;
+using osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Objects
+{
+    /// <summary>
+    /// A <see cref="LifetimeEntry"/> that stores the lifetime for a <see cref="HitObject"/>.
+    /// </summary>
+    public class HitObjectLifetimeEntry : LifetimeEntry
+    {
+        /// <summary>
+        /// The <see cref="HitObject"/>.
+        /// </summary>
+        public readonly HitObject HitObject;
+
+        /// <summary>
+        /// Creates a new <see cref="HitObjectLifetimeEntry"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to store the lifetime of.</param>
+        public HitObjectLifetimeEntry(HitObject hitObject)
+        {
+            HitObject = hitObject;
+            ResetLifetimeStart();
+        }
+
+        // The lifetime start, as set by the hitobject.
+        private double realLifetimeStart = double.MinValue;
+
+        /// <summary>
+        /// The time at which the <see cref="HitObject"/> should become alive.
+        /// </summary>
+        public new double LifetimeStart
+        {
+            get => realLifetimeStart;
+            set => setLifetime(realLifetimeStart = value, LifetimeEnd);
+        }
+
+        // The lifetime end, as set by the hitobject.
+        private double realLifetimeEnd = double.MaxValue;
+
+        /// <summary>
+        /// The time at which the <see cref="HitObject"/> should become dead.
+        /// </summary>
+        public new double LifetimeEnd
+        {
+            get => realLifetimeEnd;
+            set => setLifetime(LifetimeStart, realLifetimeEnd = value);
+        }
+
+        private void setLifetime(double start, double end)
+        {
+            if (keepAlive)
+            {
+                start = double.MinValue;
+                end = double.MaxValue;
+            }
+
+            base.LifetimeStart = start;
+            base.LifetimeEnd = end;
+        }
+
+        private bool keepAlive;
+
+        /// <summary>
+        /// Whether the <see cref="HitObject"/> should be kept always alive.
+        /// </summary>
+        internal bool KeepAlive
+        {
+            set
+            {
+                if (keepAlive == value)
+                    return;
+
+                keepAlive = value;
+                setLifetime(realLifetimeStart, realLifetimeEnd);
+            }
+        }
+
+        /// <summary>
+        /// A safe offset prior to the start time of <see cref="HitObject"/> at which it may begin displaying contents.
+        /// By default, <see cref="HitObject"/>s are assumed to display their contents within 10 seconds prior to their start time.
+        /// </summary>
+        /// <remarks>
+        /// This is only used as an optimisation to delay the initial update of the <see cref="HitObject"/> and may be tuned more aggressively if required.
+        /// It is indirectly used to decide the automatic transform offset provided to <see cref="DrawableHitObject.UpdateInitialTransforms"/>.
+        /// A more accurate <see cref="LifetimeStart"/> should be set for further optimisation (in <see cref="DrawableHitObject.LoadComplete"/>, for example).
+        /// </remarks>
+        protected virtual double InitialLifetimeOffset => 10000;
+
+        /// <summary>
+        /// Resets <see cref="LifetimeStart"/> according to the start time of the <see cref="HitObject"/>.
+        /// </summary>
+        internal void ResetLifetimeStart() => LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
+    }
+}

From 45e9f16f6b3a3300ce5779c032dbb1e51873a29a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 6 Nov 2020 22:09:54 +0900
Subject: [PATCH 06054/10326] Add initial DrawableRuleset interface

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 77 +++++++++++++++++++++++--
 1 file changed, 72 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index f6cf836fe7..8c6db661b5 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -15,7 +15,9 @@ using System.Linq;
 using System.Threading;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
@@ -92,11 +94,8 @@ namespace osu.Game.Rulesets.UI
 
         protected IRulesetConfigManager Config { get; private set; }
 
-        /// <summary>
-        /// The mods which are to be applied.
-        /// </summary>
         [Cached(typeof(IReadOnlyList<Mod>))]
-        protected readonly IReadOnlyList<Mod> Mods;
+        protected override IReadOnlyList<Mod> Mods { get; }
 
         private FrameStabilityContainer frameStabilityContainer;
 
@@ -284,12 +283,15 @@ namespace osu.Game.Rulesets.UI
             }
         }
 
+        public sealed override DrawableHitObject GetDrawableRepresentation(HitObject hitObject)
+            => base.GetDrawableRepresentation(hitObject) ?? CreateDrawableRepresentation((TObject)hitObject);
+
         /// <summary>
         /// Creates a DrawableHitObject from a HitObject.
         /// </summary>
         /// <param name="h">The HitObject to make drawable.</param>
         /// <returns>The DrawableHitObject.</returns>
-        public abstract DrawableHitObject<TObject> CreateDrawableRepresentation(TObject h);
+        public virtual DrawableHitObject<TObject> CreateDrawableRepresentation(TObject h) => null;
 
         public void Attach(KeyCounterDisplay keyCounter) =>
             (KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(keyCounter);
@@ -406,6 +408,11 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public abstract IFrameStableClock FrameStableClock { get; }
 
+        /// <summary>
+        /// The mods which are to be applied.
+        /// </summary>
+        protected abstract IReadOnlyList<Mod> Mods { get; }
+
         /// <summary>~
         /// The associated ruleset.
         /// </summary>
@@ -500,6 +507,66 @@ namespace osu.Game.Rulesets.UI
         /// Invoked when the user requests to pause while the resume overlay is active.
         /// </summary>
         public abstract void CancelResume();
+
+        /// <summary>
+        /// Whether this <see cref="DrawableRuleset"/> should retrieve pooled <see cref="DrawableHitObject"/>s.
+        /// </summary>
+        /// <remarks>
+        /// Pools must be registered with this <see cref="DrawableRuleset"/> via <see cref="RegisterPool{TObject,TDrawable}"/> in order for <see cref="DrawableHitObject"/>s to be retrieved.
+        /// <para>
+        /// If <c>true</c>, hitobjects will be added to the <see cref="Playfield"/> via <see cref="osu.Game.Rulesets.UI.Playfield.Add(HitObject)"/>.
+        /// If <c>false</c>, <see cref="osu.Game.Rulesets.UI.Playfield.Add(DrawableHitObject)"/> will be used instead.
+        /// </para>
+        /// </remarks>
+        protected virtual bool PoolHitObjects => false;
+
+        private readonly Dictionary<Type, IDrawablePool> pools = new Dictionary<Type, IDrawablePool>();
+
+        protected void RegisterPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
+            where TObject : HitObject
+            where TDrawable : DrawableHitObject, new()
+        {
+            var pool = CreatePool<TDrawable>(initialSize, maximumSize);
+            pools[typeof(TObject)] = pool;
+            AddInternal(pool);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="DrawablePool{T}"/> to retrieve <see cref="DrawableHitObject"/>s of the given type from.
+        /// </summary>
+        /// <param name="initialSize">The number of hitobject to be prepared for initial consumption.</param>
+        /// <param name="maximumSize">An optional maximum size after which the pool will no longer be expanded.</param>
+        /// <typeparam name="TDrawable">The type of <see cref="DrawableHitObject"/> retrievable from this pool.</typeparam>
+        /// <returns>The <see cref="DrawablePool{T}"/>.</returns>
+        protected virtual DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
+            where TDrawable : DrawableHitObject, new()
+            => new DrawablePool<TDrawable>(initialSize, maximumSize);
+
+        /// <summary>
+        /// Retrieves the drawable representation of a <see cref="HitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to retrieve the drawable representation of.</param>
+        /// <returns>The <see cref="DrawableHitObject"/> representing <see cref="HitObject"/>.</returns>
+        public virtual DrawableHitObject GetDrawableRepresentation(HitObject hitObject)
+        {
+            if (!pools.TryGetValue(hitObject.GetType(), out var pool))
+                return null;
+
+            return (DrawableHitObject)pool.Get(d =>
+            {
+                var dho = (DrawableHitObject)d;
+
+                // If this is the first time this DHO is being used (not loaded), then apply the DHO mods.
+                // This is done before Apply() so that the state is updated once when the hitobject is applied.
+                if (!dho.IsLoaded)
+                {
+                    foreach (var m in Mods.OfType<IApplicableToDrawableHitObjects>())
+                        m.ApplyToDrawableHitObjects(dho.Yield());
+                }
+
+                dho.Apply(hitObject);
+            });
+        }
     }
 
     public class BeatmapInvalidForRulesetException : ArgumentException

From 64460749767d4e3a6b3285aec060d3fc01132e44 Mon Sep 17 00:00:00 2001
From: cadon0 <calebdonnellynz@gmail.com>
Date: Tue, 10 Nov 2020 01:52:26 +1300
Subject: [PATCH 06055/10326] Fix paths for storyboard animation sprites

---
 .../Drawables/DrawableStoryboardAnimation.cs   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 97de239e4a..34120f4848 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -118,8 +118,24 @@ namespace osu.Game.Storyboards.Drawables
             for (int frame = 0; frame < Animation.FrameCount; frame++)
             {
                 string framePath = Animation.Path.Replace(".", frame + ".");
+                Drawable sprite = storyboard.CreateSpriteFromResourcePath(framePath, textureStore);
 
-                AddFrame(storyboard.CreateSpriteFromResourcePath(framePath, textureStore), Animation.FrameDelay);
+                if (sprite != null)
+                {
+                    AddFrame(sprite, Animation.FrameDelay);
+                    continue;
+                }
+
+                framePath = Animation.Path.Replace("0.", frame + ".");
+                sprite = storyboard.CreateSpriteFromResourcePath(framePath, textureStore);
+
+                if (sprite != null)
+                {
+                    AddFrame(sprite, Animation.FrameDelay);
+                }
+
+                // todo: handle animation intentionally declared with more frames than sprites to cause a blinking effect
+                // e.g. beatmap 5381's "spr\play-skip.png"
             }
 
             Animation.ApplyTransforms(this);

From 539806e9d6869b95f6b9ca0c3a51f45adc0e139c Mon Sep 17 00:00:00 2001
From: cadon0 <calebdonnellynz@gmail.com>
Date: Tue, 10 Nov 2020 21:57:29 +1300
Subject: [PATCH 06056/10326] Rewrite - Add empty drawable whenever sprite not
 found

---
 .../Drawables/DrawableStoryboardAnimation.cs  | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 34120f4848..a78d0bf4d7 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -118,24 +118,8 @@ namespace osu.Game.Storyboards.Drawables
             for (int frame = 0; frame < Animation.FrameCount; frame++)
             {
                 string framePath = Animation.Path.Replace(".", frame + ".");
-                Drawable sprite = storyboard.CreateSpriteFromResourcePath(framePath, textureStore);
-
-                if (sprite != null)
-                {
-                    AddFrame(sprite, Animation.FrameDelay);
-                    continue;
-                }
-
-                framePath = Animation.Path.Replace("0.", frame + ".");
-                sprite = storyboard.CreateSpriteFromResourcePath(framePath, textureStore);
-
-                if (sprite != null)
-                {
-                    AddFrame(sprite, Animation.FrameDelay);
-                }
-
-                // todo: handle animation intentionally declared with more frames than sprites to cause a blinking effect
-                // e.g. beatmap 5381's "spr\play-skip.png"
+                Drawable sprite = storyboard.CreateSpriteFromResourcePath(framePath, textureStore) ?? Drawable.Empty();
+                AddFrame(sprite, Animation.FrameDelay);
             }
 
             Animation.ApplyTransforms(this);

From 6f3f6dc28b88c2ef5455c80cc6e81ac31423024c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Nov 2020 20:16:52 +0900
Subject: [PATCH 06057/10326] Add hitobject lifetime support

---
 .../TestSceneHitCircleApplication.cs          |  2 +-
 .../TestSceneSliderApplication.cs             |  2 +-
 .../TestSceneSpinnerApplication.cs            |  2 +-
 .../Objects/Drawables/DrawableHitObject.cs    | 53 +++++++++++++++----
 .../Objects/HitObjectLifetimeEntry.cs         | 18 +++++--
 osu.Game/Rulesets/UI/DrawableRuleset.cs       | 25 ++++++++-
 6 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs
index 8b3fead366..5fc1082743 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 Position = new Vector2(128, 128),
                 ComboIndex = 1,
-            })));
+            }), null));
         }
 
         private HitCircle prepareObject(HitCircle circle)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
index f76c7e2a3e..fb1ebbb0d0 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     new Vector2(300, 0),
                 }),
                 RepeatCount = 1
-            })));
+            }), null));
         }
 
         private Slider prepareObject(Slider slider)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
index 5951574079..0558dad30d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Position = new Vector2(256, 192),
                 ComboIndex = 1,
                 Duration = 1000,
-            })));
+            }), null));
         }
 
         private Spinner prepareObject(Spinner circle)
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 7a4e136553..2ac478f640 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -120,6 +120,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         private bool hasHitObjectApplied;
 
+        /// <summary>
+        /// The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the currently-attached <see cref="HitObject"/>.
+        /// </summary>
+        [CanBeNull]
+        private HitObjectLifetimeEntry lifetimeEntry;
+
         /// <summary>
         /// Creates a new <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -143,7 +149,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             base.LoadAsyncComplete();
 
             if (HitObject != null)
-                Apply(HitObject);
+                Apply(HitObject, lifetimeEntry);
         }
 
         protected override void LoadComplete()
@@ -160,16 +166,33 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Applies a new <see cref="HitObject"/> to be represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to apply.</param>
-        public void Apply(HitObject hitObject)
+        /// <param name="lifetimeEntry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of <paramref name="hitObject"/>.</param>
+        public void Apply([NotNull] HitObject hitObject, [CanBeNull] HitObjectLifetimeEntry lifetimeEntry)
         {
             free();
 
             HitObject = hitObject ?? throw new InvalidOperationException($"Cannot apply a null {nameof(HitObject)}.");
 
+            this.lifetimeEntry = lifetimeEntry;
+
+            if (lifetimeEntry != null)
+            {
+                // Transfer lifetime from the entry.
+                LifetimeStart = lifetimeEntry.LifetimeStart;
+                LifetimeEnd = lifetimeEntry.LifetimeEnd;
+
+                // Copy any existing result from the entry (required for rewind / judgement revert).
+                Result = lifetimeEntry.Result;
+            }
+
             // Ensure this DHO has a result.
             Result ??= CreateResult(HitObject.CreateJudgement())
                        ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
+            // Copy back the result to the entry for potential future retrieval.
+            if (lifetimeEntry != null)
+                lifetimeEntry.Result = Result;
+
             foreach (var h in HitObject.NestedHitObjects)
             {
                 var drawableNested = CreateNestedHitObject(h) ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
@@ -302,7 +325,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void onDefaultsApplied(HitObject hitObject)
         {
-            Apply(hitObject);
+            Apply(hitObject, lifetimeEntry);
             DefaultsApplied?.Invoke(this);
         }
 
@@ -549,15 +572,27 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         protected internal new ScheduledDelegate Schedule(Action action) => base.Schedule(action);
 
-        private double? lifetimeStart;
-
         public override double LifetimeStart
         {
-            get => lifetimeStart ?? (HitObject.StartTime - InitialLifetimeOffset);
-            set
+            get => base.LifetimeStart;
+            set => setLifetime(value, LifetimeEnd);
+        }
+
+        public override double LifetimeEnd
+        {
+            get => base.LifetimeEnd;
+            set => setLifetime(LifetimeStart, value);
+        }
+
+        private void setLifetime(double lifetimeStart, double lifetimeEnd)
+        {
+            base.LifetimeStart = lifetimeStart;
+            base.LifetimeEnd = lifetimeEnd;
+
+            if (lifetimeEntry != null)
             {
-                lifetimeStart = value;
-                base.LifetimeStart = value;
+                lifetimeEntry.LifetimeStart = lifetimeStart;
+                lifetimeEntry.LifetimeEnd = lifetimeEnd;
             }
         }
 
diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index f134c66274..1954d7e6d2 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Performance;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Objects
@@ -16,6 +18,14 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public readonly HitObject HitObject;
 
+        /// <summary>
+        /// The result that <see cref="HitObject"/> was judged with.
+        /// This is set by the accompanying <see cref="DrawableHitObject"/>, and reused when required for rewinding.
+        /// </summary>
+        internal JudgementResult Result;
+
+        private readonly IBindable<double> startTimeBindable = new BindableDouble();
+
         /// <summary>
         /// Creates a new <see cref="HitObjectLifetimeEntry"/>.
         /// </summary>
@@ -23,7 +33,9 @@ namespace osu.Game.Rulesets.Objects
         public HitObjectLifetimeEntry(HitObject hitObject)
         {
             HitObject = hitObject;
-            ResetLifetimeStart();
+
+            startTimeBindable.BindTo(HitObject.StartTimeBindable);
+            startTimeBindable.BindValueChanged(onStartTimeChanged, true);
         }
 
         // The lifetime start, as set by the hitobject.
@@ -91,8 +103,8 @@ namespace osu.Game.Rulesets.Objects
         protected virtual double InitialLifetimeOffset => 10000;
 
         /// <summary>
-        /// Resets <see cref="LifetimeStart"/> according to the start time of the <see cref="HitObject"/>.
+        /// Resets <see cref="LifetimeStart"/> according to the change in start time of the <see cref="HitObject"/>.
         /// </summary>
-        internal void ResetLifetimeStart() => LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
+        private void onStartTimeChanged(ValueChangedEvent<double> startTime) => LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
     }
 }
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 8c6db661b5..33c422adb8 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -16,6 +16,7 @@ using System.Threading;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input;
@@ -246,6 +247,16 @@ namespace osu.Game.Rulesets.UI
             Playfield.Add(drawableObject);
         }
 
+        protected sealed override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject)
+        {
+            if (!(hitObject is TObject tHitObject))
+                throw new InvalidOperationException($"Unexpected hitobject type: {hitObject.GetType().ReadableName()}");
+
+            return CreateLifetimeEntry(tHitObject);
+        }
+
+        protected virtual HitObjectLifetimeEntry CreateLifetimeEntry(TObject hitObject) => new HitObjectLifetimeEntry(hitObject);
+
         public override void SetRecordTarget(Replay recordingReplay)
         {
             if (!(KeyBindingInputManager is IHasRecordingHandler recordingInputManager))
@@ -564,9 +575,21 @@ namespace osu.Game.Rulesets.UI
                         m.ApplyToDrawableHitObjects(dho.Yield());
                 }
 
-                dho.Apply(hitObject);
+                dho.Apply(hitObject, GetLifetimeEntry(hitObject));
             });
         }
+
+        protected abstract HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject);
+
+        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntries = new Dictionary<HitObject, HitObjectLifetimeEntry>();
+
+        protected HitObjectLifetimeEntry GetLifetimeEntry(HitObject hitObject)
+        {
+            if (lifetimeEntries.TryGetValue(hitObject, out var entry))
+                return entry;
+
+            return lifetimeEntries[hitObject] = CreateLifetimeEntry(hitObject);
+        }
     }
 
     public class BeatmapInvalidForRulesetException : ArgumentException

From ce837eaba0d6f6dc261614ddb66183b1bf56f4a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 12:20:26 +0100
Subject: [PATCH 06058/10326] Rename variables

---
 .../Storyboards/Drawables/DrawableStoryboardAnimation.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index a78d0bf4d7..644bb28457 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -115,11 +115,11 @@ namespace osu.Game.Storyboards.Drawables
         [BackgroundDependencyLoader]
         private void load(TextureStore textureStore, Storyboard storyboard)
         {
-            for (int frame = 0; frame < Animation.FrameCount; frame++)
+            for (int frameIndex = 0; frameIndex < Animation.FrameCount; frameIndex++)
             {
-                string framePath = Animation.Path.Replace(".", frame + ".");
-                Drawable sprite = storyboard.CreateSpriteFromResourcePath(framePath, textureStore) ?? Drawable.Empty();
-                AddFrame(sprite, Animation.FrameDelay);
+                string framePath = Animation.Path.Replace(".", frameIndex + ".");
+                Drawable frame = storyboard.CreateSpriteFromResourcePath(framePath, textureStore) ?? Drawable.Empty();
+                AddFrame(frame, Animation.FrameDelay);
             }
 
             Animation.ApplyTransforms(this);

From 61093030ee4b66e8d22c58ed0a6cf4917f2b80eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 12:20:49 +0100
Subject: [PATCH 06059/10326] Remove redundant class name qualifier

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

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 644bb28457..7eac994e07 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Storyboards.Drawables
             for (int frameIndex = 0; frameIndex < Animation.FrameCount; frameIndex++)
             {
                 string framePath = Animation.Path.Replace(".", frameIndex + ".");
-                Drawable frame = storyboard.CreateSpriteFromResourcePath(framePath, textureStore) ?? Drawable.Empty();
+                Drawable frame = storyboard.CreateSpriteFromResourcePath(framePath, textureStore) ?? Empty();
                 AddFrame(frame, Animation.FrameDelay);
             }
 

From e1dcac4d8ba4feb73c0fc2088edccc368d2698f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Nov 2020 20:29:29 +0900
Subject: [PATCH 06060/10326] 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 e3285222f8..bbe8426316 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1109.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1110.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 832722c729..8f0cc58594 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1109.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1110.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ad6dd2a0b5..f766e0ec03 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.Framework.iOS" Version="2020.1109.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1110.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1109.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1110.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From f24569694716cbbbd92f2470680c4469f5b326bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 13:24:32 +0100
Subject: [PATCH 06061/10326] Move {-> Default}KiaiHitExplosion

---
 .../UI/{KiaiHitExplosion.cs => DefaultKiaiHitExplosion.cs}  | 4 ++--
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs                | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game.Rulesets.Taiko/UI/{KiaiHitExplosion.cs => DefaultKiaiHitExplosion.cs} (92%)

diff --git a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
similarity index 92%
rename from osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
rename to osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
index 067d390894..32c9f3ec4f 100644
--- a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
@@ -13,14 +13,14 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    public class KiaiHitExplosion : CircularContainer
+    public class DefaultKiaiHitExplosion : CircularContainer
     {
         public override bool RemoveWhenNotAlive => true;
 
         public readonly DrawableHitObject JudgedObject;
         private readonly HitType type;
 
-        public KiaiHitExplosion(DrawableHitObject judgedObject, HitType type)
+        public DefaultKiaiHitExplosion(DrawableHitObject judgedObject, HitType type)
         {
             JudgedObject = judgedObject;
             this.type = type;
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 120cf264c3..03895dfd68 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         public const float DEFAULT_HEIGHT = 178;
 
         private Container<HitExplosion> hitExplosionContainer;
-        private Container<KiaiHitExplosion> kiaiExplosionContainer;
+        private Container<DefaultKiaiHitExplosion> kiaiExplosionContainer;
         private JudgementContainer<DrawableTaikoJudgement> judgementContainer;
         private ScrollingHitObjectContainer drumRollHitContainer;
         internal Drawable HitTarget;
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                                         drumRollHitContainer = new DrumRollHitContainer()
                                     }
                                 },
-                                kiaiExplosionContainer = new Container<KiaiHitExplosion>
+                                kiaiExplosionContainer = new Container<DefaultKiaiHitExplosion>
                                 {
                                     Name = "Kiai hit explosions",
                                     RelativeSizeAxes = Axes.Both,
@@ -219,7 +219,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             hitExplosionContainer.Add(new HitExplosion(drawableObject, result));
             if (drawableObject.HitObject.Kiai)
-                kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
+                kiaiExplosionContainer.Add(new DefaultKiaiHitExplosion(drawableObject, type));
         }
 
         private class ProxyContainer : LifetimeManagementContainer

From 4ea823e4dc85365822fcde88e4d8175ce1a6532d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Nov 2020 22:02:33 +0900
Subject: [PATCH 06062/10326] Fix test failures

---
 osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
index 4eeb4a1475..fb0917341e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.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.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Scoring;
@@ -28,9 +27,10 @@ namespace osu.Game.Rulesets.Taiko.Tests
             // suppress locally to allow hiding the visuals wherever necessary.
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             Result.Type = Type;
         }
 

From ed01d37966a9249bb4f81d81f03a2c01746ec374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 13:35:49 +0100
Subject: [PATCH 06063/10326] Reintroduce KiaiHitExplosion as skinnable

---
 .../TaikoSkinComponents.cs                    |  1 +
 .../UI/DefaultKiaiHitExplosion.cs             |  9 +---
 .../UI/KiaiHitExplosion.cs                    | 47 +++++++++++++++++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |  6 +--
 4 files changed, 52 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs

diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index 132d8f8868..bf48898dd2 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Rulesets.Taiko
         TaikoExplosionMiss,
         TaikoExplosionOk,
         TaikoExplosionGreat,
+        TaikoExplosionKiai,
         Scroller,
         Mascot,
     }
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
index 32c9f3ec4f..7ce8b016d5 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.UI
@@ -17,19 +16,13 @@ namespace osu.Game.Rulesets.Taiko.UI
     {
         public override bool RemoveWhenNotAlive => true;
 
-        public readonly DrawableHitObject JudgedObject;
         private readonly HitType type;
 
-        public DefaultKiaiHitExplosion(DrawableHitObject judgedObject, HitType type)
+        public DefaultKiaiHitExplosion(HitType type)
         {
-            JudgedObject = judgedObject;
             this.type = type;
 
-            Anchor = Anchor.CentreLeft;
-            Origin = Anchor.Centre;
-
             RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(TaikoHitObject.DEFAULT_SIZE, 1);
 
             Blending = BlendingParameters.Additive;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
new file mode 100644
index 0000000000..20900a9352
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public class KiaiHitExplosion : Container
+    {
+        public override bool RemoveWhenNotAlive => true;
+
+        [Cached(typeof(DrawableHitObject))]
+        public readonly DrawableHitObject JudgedObject;
+
+        private readonly HitType hitType;
+
+        private SkinnableDrawable skinnable;
+
+        public override double LifetimeStart => skinnable.Drawable.LifetimeStart;
+
+        public override double LifetimeEnd => skinnable.Drawable.LifetimeEnd;
+
+        public KiaiHitExplosion(DrawableHitObject judgedObject, HitType hitType)
+        {
+            JudgedObject = judgedObject;
+            this.hitType = hitType;
+
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.Centre;
+
+            RelativeSizeAxes = Axes.Both;
+            Size = new Vector2(TaikoHitObject.DEFAULT_SIZE, 1);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoExplosionKiai), _ => new DefaultKiaiHitExplosion(hitType));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 03895dfd68..120cf264c3 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         public const float DEFAULT_HEIGHT = 178;
 
         private Container<HitExplosion> hitExplosionContainer;
-        private Container<DefaultKiaiHitExplosion> kiaiExplosionContainer;
+        private Container<KiaiHitExplosion> kiaiExplosionContainer;
         private JudgementContainer<DrawableTaikoJudgement> judgementContainer;
         private ScrollingHitObjectContainer drumRollHitContainer;
         internal Drawable HitTarget;
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                                         drumRollHitContainer = new DrumRollHitContainer()
                                     }
                                 },
-                                kiaiExplosionContainer = new Container<DefaultKiaiHitExplosion>
+                                kiaiExplosionContainer = new Container<KiaiHitExplosion>
                                 {
                                     Name = "Kiai hit explosions",
                                     RelativeSizeAxes = Axes.Both,
@@ -219,7 +219,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             hitExplosionContainer.Add(new HitExplosion(drawableObject, result));
             if (drawableObject.HitObject.Kiai)
-                kiaiExplosionContainer.Add(new DefaultKiaiHitExplosion(drawableObject, type));
+                kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
         }
 
         private class ProxyContainer : LifetimeManagementContainer

From 35763a74fd75c18897d7236b4f58f2218c80135e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 14:07:39 +0100
Subject: [PATCH 06064/10326] Add test scene

---
 .../Skinning/TestSceneKiaiHitExplosion.cs     | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.cs
new file mode 100644
index 0000000000..b558709592
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.UI;
+
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
+{
+    [TestFixture]
+    public class TestSceneKiaiHitExplosion : TaikoSkinnableTestScene
+    {
+        [Test]
+        public void TestKiaiHits()
+        {
+            AddStep("rim hit", () => SetContents(() => getContentFor(createHit(HitType.Rim))));
+            AddStep("centre hit", () => SetContents(() => getContentFor(createHit(HitType.Centre))));
+        }
+
+        private Drawable getContentFor(DrawableTestHit hit)
+        {
+            return new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new KiaiHitExplosion(hit, hit.HitObject.Type)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            };
+        }
+
+        private DrawableTestHit createHit(HitType type) => new DrawableTestHit(new Hit { StartTime = Time.Current, Type = type });
+    }
+}

From 0387d994bdc6136259d32c3b2181842a6e91f8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 14:08:27 +0100
Subject: [PATCH 06065/10326] Do not lookup default kiai explosion if skin has
 own

---
 .../Skinning/TaikoLegacySkinTransformer.cs                 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index c88480d18f..ddbf20b827 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -114,6 +114,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                     return null;
 
+                case TaikoSkinComponents.TaikoExplosionKiai:
+                    // suppress the default kiai explosion if the skin brings its own sprites.
+                    if (hasExplosion.Value)
+                        return Drawable.Empty();
+
+                    return null;
+
                 case TaikoSkinComponents.Scroller:
                     if (GetTexture("taiko-slider") != null)
                         return new LegacyTaikoScroller();

From 31e4d71852e34f6daa15fbf9d180462ab232f8c3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Nov 2020 22:49:02 +0900
Subject: [PATCH 06066/10326] Rewrite HitObjectContainer with pooling support

---
 .../Objects/Drawables/DrawableHitObject.cs    |   8 +-
 osu.Game/Rulesets/UI/HitObjectContainer.cs    | 213 ++++++++++++++----
 2 files changed, 168 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 2ac478f640..5299e53d5c 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         protected virtual float SamplePlaybackPosition => 0.5f;
 
-        private readonly Bindable<double> startTimeBindable = new Bindable<double>();
+        public readonly Bindable<double> StartTimeBindable = new Bindable<double>();
         private readonly BindableList<HitSampleInfo> samplesBindable = new BindableList<HitSampleInfo>();
         private readonly Bindable<bool> userPositionalHitSounds = new Bindable<bool>();
         private readonly Bindable<int> comboIndexBindable = new Bindable<int>();
@@ -156,7 +156,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.LoadComplete();
 
-            startTimeBindable.BindValueChanged(_ => updateState(State.Value, true));
+            StartTimeBindable.BindValueChanged(_ => updateState(State.Value, true));
             comboIndexBindable.BindValueChanged(_ => updateComboColour(), true);
 
             updateState(ArmedState.Idle, true);
@@ -205,7 +205,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 AddNestedHitObject(drawableNested);
             }
 
-            startTimeBindable.BindTo(HitObject.StartTimeBindable);
+            StartTimeBindable.BindTo(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
                 comboIndexBindable.BindTo(combo.ComboIndexBindable);
 
@@ -231,7 +231,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (!hasHitObjectApplied)
                 return;
 
-            startTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
+            StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
                 comboIndexBindable.UnbindFrom(combo.ComboIndexBindable);
 
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 4cadfa9ad4..97604f62c8 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -1,35 +1,132 @@
 // Copyright (c) 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.Diagnostics;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Performance;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.UI
 {
     public class HitObjectContainer : LifetimeManagementContainer
     {
-        public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
-        public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
+        /// <summary>
+        /// All currently in-use <see cref="DrawableHitObject"/>s.
+        /// </summary>
+        public IEnumerable<DrawableHitObject> Objects => InternalChildren.OfType<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
-        private readonly Dictionary<DrawableHitObject, (IBindable<double> bindable, double timeAtAdd)> startTimeMap = new Dictionary<DrawableHitObject, (IBindable<double>, double)>();
+        /// <summary>
+        /// All currently in-use <see cref="DrawableHitObject"/>s that are alive.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this is equivalent to <see cref="Objects"/>.
+        /// </remarks>
+        public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.OfType<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
+
+        public event Action<DrawableHitObject, JudgementResult> NewResult;
+        public event Action<DrawableHitObject, JudgementResult> RevertResult;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
+        /// </remarks>
+        public event Action<HitObject> HitObjectUsageBegan;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
+        /// </remarks>
+        public event Action<HitObject> HitObjectUsageFinished;
+
+        /// <summary>
+        /// The amount of time prior to the current time within which <see cref="HitObject"/>s should be considered alive.
+        /// </summary>
+        public double PastLifetimeExtension { get; set; }
+
+        /// <summary>
+        /// The amount of time after the current time within which <see cref="HitObject"/>s should be considered alive.
+        /// </summary>
+        public double FutureLifetimeExtension { get; set; }
+
+        private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
+        private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> drawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
+        private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
+
+        [Resolved(CanBeNull = true)]
+        private DrawableRuleset drawableRuleset { get; set; }
 
         public HitObjectContainer()
         {
             RelativeSizeAxes = Axes.Both;
+
+            lifetimeManager.EntryBecameAlive += entryBecameAlive;
+            lifetimeManager.EntryBecameDead += entryBecameDead;
         }
 
+        #region Pooling support
+
+        public void Add(HitObjectLifetimeEntry entry) => lifetimeManager.AddEntry(entry);
+
+        public void Remove(HitObjectLifetimeEntry entry) => lifetimeManager.RemoveEntry(entry);
+
+        private void entryBecameAlive(LifetimeEntry entry) => addDrawable((HitObjectLifetimeEntry)entry);
+
+        private void entryBecameDead(LifetimeEntry entry) => removeDrawable((HitObjectLifetimeEntry)entry);
+
+        private void addDrawable(HitObjectLifetimeEntry entry)
+        {
+            Debug.Assert(!drawableMap.ContainsKey(entry));
+
+            var drawable = drawableRuleset.GetDrawableRepresentation(entry.HitObject);
+            drawable.OnNewResult += onNewResult;
+            drawable.OnRevertResult += onRevertResult;
+
+            bindStartTime(drawable);
+            AddInternal(drawableMap[entry] = drawable, false);
+
+            HitObjectUsageBegan?.Invoke(entry.HitObject);
+        }
+
+        private void removeDrawable(HitObjectLifetimeEntry entry)
+        {
+            Debug.Assert(drawableMap.ContainsKey(entry));
+
+            var drawable = drawableMap[entry];
+            drawable.OnNewResult -= onNewResult;
+            drawable.OnRevertResult -= onRevertResult;
+            drawable.OnKilled();
+
+            drawableMap.Remove(entry);
+
+            unbindStartTime(drawable);
+            RemoveInternal(drawable);
+
+            HitObjectUsageFinished?.Invoke(entry.HitObject);
+        }
+
+        #endregion
+
+        #region Non-pooling support
+
         public virtual void Add(DrawableHitObject hitObject)
         {
-            // Added first for the comparer to remain ordered during AddInternal
-            startTimeMap[hitObject] = (hitObject.HitObject.StartTimeBindable.GetBoundCopy(), hitObject.HitObject.StartTime);
-            startTimeMap[hitObject].bindable.BindValueChanged(_ => onStartTimeChanged(hitObject));
-
+            bindStartTime(hitObject);
             AddInternal(hitObject);
+
+            hitObject.OnNewResult += onNewResult;
+            hitObject.OnRevertResult += onRevertResult;
         }
 
         public virtual bool Remove(DrawableHitObject hitObject)
@@ -37,54 +134,16 @@ namespace osu.Game.Rulesets.UI
             if (!RemoveInternal(hitObject))
                 return false;
 
-            // Removed last for the comparer to remain ordered during RemoveInternal
-            startTimeMap[hitObject].bindable.UnbindAll();
-            startTimeMap.Remove(hitObject);
+            hitObject.OnNewResult -= onNewResult;
+            hitObject.OnRevertResult -= onRevertResult;
+
+            unbindStartTime(hitObject);
 
             return true;
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            unbindStartTimeMap();
-        }
-
-        public virtual void Clear(bool disposeChildren = true)
-        {
-            ClearInternal(disposeChildren);
-            unbindStartTimeMap();
-        }
-
-        private void unbindStartTimeMap()
-        {
-            foreach (var kvp in startTimeMap)
-                kvp.Value.bindable.UnbindAll();
-            startTimeMap.Clear();
-        }
-
         public int IndexOf(DrawableHitObject hitObject) => IndexOfInternal(hitObject);
 
-        private void onStartTimeChanged(DrawableHitObject hitObject)
-        {
-            if (!RemoveInternal(hitObject))
-                return;
-
-            // Update the stored time, preserving the existing bindable
-            startTimeMap[hitObject] = (startTimeMap[hitObject].bindable, hitObject.HitObject.StartTime);
-            AddInternal(hitObject);
-        }
-
-        protected override int Compare(Drawable x, Drawable y)
-        {
-            if (!(x is DrawableHitObject xObj) || !(y is DrawableHitObject yObj))
-                return base.Compare(x, y);
-
-            // Put earlier hitobjects towards the end of the list, so they handle input first
-            int i = startTimeMap[yObj].timeAtAdd.CompareTo(startTimeMap[xObj].timeAtAdd);
-            return i == 0 ? CompareReverseChildID(x, y) : i;
-        }
-
         protected override void OnChildLifetimeBoundaryCrossed(LifetimeBoundaryCrossedEvent e)
         {
             if (!(e.Child is DrawableHitObject hitObject))
@@ -96,5 +155,61 @@ namespace osu.Game.Rulesets.UI
                 hitObject.OnKilled();
             }
         }
+
+        #endregion
+
+        public virtual void Clear(bool disposeChildren = true)
+        {
+            lifetimeManager.ClearEntries();
+
+            ClearInternal(disposeChildren);
+            unbindAllStartTimes();
+        }
+
+        protected override bool CheckChildrenLife() => base.CheckChildrenLife() | lifetimeManager.Update(Time.Current - PastLifetimeExtension, Time.Current + FutureLifetimeExtension);
+
+        private void onNewResult(DrawableHitObject d, JudgementResult r) => NewResult?.Invoke(d, r);
+        private void onRevertResult(DrawableHitObject d, JudgementResult r) => RevertResult?.Invoke(d, r);
+
+        #region Comparator + StartTime tracking
+
+        private void bindStartTime(DrawableHitObject hitObject)
+        {
+            var bindable = hitObject.StartTimeBindable.GetBoundCopy();
+            bindable.BindValueChanged(_ => SortInternal());
+
+            startTimeMap[hitObject] = bindable;
+        }
+
+        private void unbindStartTime(DrawableHitObject hitObject)
+        {
+            startTimeMap[hitObject].UnbindAll();
+            startTimeMap.Remove(hitObject);
+        }
+
+        private void unbindAllStartTimes()
+        {
+            foreach (var kvp in startTimeMap)
+                kvp.Value.UnbindAll();
+            startTimeMap.Clear();
+        }
+
+        protected override int Compare(Drawable x, Drawable y)
+        {
+            if (!(x is DrawableHitObject xObj) || !(y is DrawableHitObject yObj))
+                return base.Compare(x, y);
+
+            // Put earlier hitobjects towards the end of the list, so they handle input first
+            int i = yObj.HitObject.StartTime.CompareTo(xObj.HitObject.StartTime);
+            return i == 0 ? CompareReverseChildID(x, y) : i;
+        }
+
+        #endregion
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            unbindAllStartTimes();
+        }
     }
 }

From be4735cd2ba8f37e853d9a09796d1248cbddc8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 14:50:19 +0100
Subject: [PATCH 06067/10326] Explicitly set lifetime to ensure empty drawables
 are cleaned up

---
 .../Skinning/TaikoLegacySkinTransformer.cs                  | 3 ++-
 osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs              | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index ddbf20b827..880af3fbd8 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -116,8 +116,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                 case TaikoSkinComponents.TaikoExplosionKiai:
                     // suppress the default kiai explosion if the skin brings its own sprites.
+                    // the drawable needs to expire as soon as possible to avoid accumulating empty drawables on the playfield.
                     if (hasExplosion.Value)
-                        return Drawable.Empty();
+                        return KiaiHitExplosion.EmptyExplosion();
 
                     return null;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
index 20900a9352..326cb23897 100644
--- a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
@@ -43,5 +43,11 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoExplosionKiai), _ => new DefaultKiaiHitExplosion(hitType));
         }
+
+        /// <summary>
+        /// Helper function to use when an explosion is not desired.
+        /// Lifetime is set to avoid accumulating empty drawables in the parent container.
+        /// </summary>
+        public static Drawable EmptyExplosion() => Empty().With(d => d.LifetimeEnd = double.MinValue);
     }
 }

From 66213f2ed0903dd21809943a10e04aca3f2bf069 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Nov 2020 23:32:30 +0900
Subject: [PATCH 06068/10326] Add pooling support to DrawableRuleset +
 Playfield

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs    |  58 ++++-----
 osu.Game/Rulesets/UI/HitObjectContainer.cs |   9 +-
 osu.Game/Rulesets/UI/Playfield.cs          | 136 ++++++++++++++++++++-
 osu.Game/Screens/Play/Player.cs            |   4 +-
 4 files changed, 173 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 33c422adb8..87a04312ab 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -41,9 +41,8 @@ namespace osu.Game.Rulesets.UI
     public abstract class DrawableRuleset<TObject> : DrawableRuleset, IProvideCursor, ICanAttachKeyCounter
         where TObject : HitObject
     {
-        public override event Action<JudgementResult> OnNewResult;
-
-        public override event Action<JudgementResult> OnRevertResult;
+        public override event Action<JudgementResult> NewResult;
+        public override event Action<JudgementResult> RevertResult;
 
         /// <summary>
         /// The selected variant.
@@ -125,7 +124,11 @@ namespace osu.Game.Rulesets.UI
             RelativeSizeAxes = Axes.Both;
 
             KeyBindingInputManager = CreateInputManager();
-            playfield = new Lazy<Playfield>(CreatePlayfield);
+            playfield = new Lazy<Playfield>(() => CreatePlayfield().With(p =>
+            {
+                p.NewResult += (_, r) => NewResult?.Invoke(r);
+                p.RevertResult += (_, r) => RevertResult?.Invoke(r);
+            }));
 
             IsPaused.ValueChanged += paused =>
             {
@@ -183,7 +186,7 @@ namespace osu.Game.Rulesets.UI
 
             RegenerateAutoplay();
 
-            loadObjects(cancellationToken);
+            loadObjects(cancellationToken ?? default);
         }
 
         public void RegenerateAutoplay()
@@ -196,15 +199,15 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// Creates and adds drawable representations of hit objects to the play field.
         /// </summary>
-        private void loadObjects(CancellationToken? cancellationToken)
+        private void loadObjects(CancellationToken cancellationToken)
         {
             foreach (TObject h in Beatmap.HitObjects)
             {
-                cancellationToken?.ThrowIfCancellationRequested();
-                addHitObject(h);
+                cancellationToken.ThrowIfCancellationRequested();
+                AddHitObject(h);
             }
 
-            cancellationToken?.ThrowIfCancellationRequested();
+            cancellationToken.ThrowIfCancellationRequested();
 
             Playfield.PostProcess();
 
@@ -230,21 +233,24 @@ namespace osu.Game.Rulesets.UI
             ResumeOverlay?.Hide();
         }
 
-        /// <summary>
-        /// Creates and adds the visual representation of a <typeparamref name="TObject"/> to this <see cref="DrawableRuleset{TObject}"/>.
-        /// </summary>
-        /// <param name="hitObject">The <typeparamref name="TObject"/> to add the visual representation for.</param>
-        private void addHitObject(TObject hitObject)
+        public void AddHitObject(TObject hitObject)
         {
-            var drawableObject = CreateDrawableRepresentation(hitObject);
+            if (PoolHitObjects)
+                Playfield.Add(GetLifetimeEntry(hitObject));
+            else
+                Playfield.Add(CreateDrawableRepresentation(hitObject));
+        }
 
-            if (drawableObject == null)
-                return;
-
-            drawableObject.OnNewResult += (_, r) => OnNewResult?.Invoke(r);
-            drawableObject.OnRevertResult += (_, r) => OnRevertResult?.Invoke(r);
-
-            Playfield.Add(drawableObject);
+        public void RemoveHitObject(TObject hitObject)
+        {
+            if (PoolHitObjects)
+                Playfield.Remove(GetLifetimeEntry(hitObject));
+            else
+            {
+                var drawableObject = Playfield.AllHitObjects.SingleOrDefault(d => d.HitObject == hitObject);
+                if (drawableObject != null)
+                    Playfield.Remove(drawableObject);
+            }
         }
 
         protected sealed override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject)
@@ -382,12 +388,12 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// Invoked when a <see cref="JudgementResult"/> has been applied by a <see cref="DrawableHitObject"/>.
         /// </summary>
-        public abstract event Action<JudgementResult> OnNewResult;
+        public abstract event Action<JudgementResult> NewResult;
 
         /// <summary>
         /// Invoked when a <see cref="JudgementResult"/> is being reverted by a <see cref="DrawableHitObject"/>.
         /// </summary>
-        public abstract event Action<JudgementResult> OnRevertResult;
+        public abstract event Action<JudgementResult> RevertResult;
 
         /// <summary>
         /// Whether a replay is currently loaded.
@@ -524,10 +530,6 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         /// <remarks>
         /// Pools must be registered with this <see cref="DrawableRuleset"/> via <see cref="RegisterPool{TObject,TDrawable}"/> in order for <see cref="DrawableHitObject"/>s to be retrieved.
-        /// <para>
-        /// If <c>true</c>, hitobjects will be added to the <see cref="Playfield"/> via <see cref="osu.Game.Rulesets.UI.Playfield.Add(HitObject)"/>.
-        /// If <c>false</c>, <see cref="osu.Game.Rulesets.UI.Playfield.Add(DrawableHitObject)"/> will be used instead.
-        /// </para>
         /// </remarks>
         protected virtual bool PoolHitObjects => false;
 
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 97604f62c8..3a5e0b64ed 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -31,7 +31,14 @@ namespace osu.Game.Rulesets.UI
         /// </remarks>
         public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.OfType<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
+        /// <summary>
+        /// Invoked when a <see cref="DrawableHitObject"/> is judged.
+        /// </summary>
         public event Action<DrawableHitObject, JudgementResult> NewResult;
+
+        /// <summary>
+        /// Invoked when a <see cref="DrawableHitObject"/> judgement is reverted.
+        /// </summary>
         public event Action<DrawableHitObject, JudgementResult> RevertResult;
 
         /// <summary>
@@ -79,7 +86,7 @@ namespace osu.Game.Rulesets.UI
 
         public void Add(HitObjectLifetimeEntry entry) => lifetimeManager.AddEntry(entry);
 
-        public void Remove(HitObjectLifetimeEntry entry) => lifetimeManager.RemoveEntry(entry);
+        public bool Remove(HitObjectLifetimeEntry entry) => lifetimeManager.RemoveEntry(entry);
 
         private void entryBecameAlive(LifetimeEntry entry) => addDrawable((HitObjectLifetimeEntry)entry);
 
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index d92ba210db..2bd2bb9e06 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -10,13 +10,41 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI
 {
     public abstract class Playfield : CompositeDrawable
     {
+        /// <summary>
+        /// Invoked when a <see cref="DrawableHitObject"/> is judged.
+        /// </summary>
+        public event Action<DrawableHitObject, JudgementResult> NewResult;
+
+        /// <summary>
+        /// Invoked when a <see cref="DrawableHitObject"/> judgement is reverted.
+        /// </summary>
+        public event Action<DrawableHitObject, JudgementResult> RevertResult;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
+        /// </remarks>
+        public event Action<HitObject> HitObjectUsageBegan;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
+        /// </remarks>
+        public event Action<HitObject> HitObjectUsageFinished;
+
         /// <summary>
         /// The <see cref="DrawableHitObject"/> contained in this Playfield.
         /// </summary>
@@ -72,7 +100,13 @@ namespace osu.Game.Rulesets.UI
         {
             RelativeSizeAxes = Axes.Both;
 
-            hitObjectContainerLazy = new Lazy<HitObjectContainer>(CreateHitObjectContainer);
+            hitObjectContainerLazy = new Lazy<HitObjectContainer>(() => CreateHitObjectContainer().With(h =>
+            {
+                h.NewResult += (d, r) => NewResult?.Invoke(d, r);
+                h.RevertResult += (d, r) => RevertResult?.Invoke(d, r);
+                h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
+                h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
+            }));
         }
 
         [Resolved(CanBeNull = true)]
@@ -101,13 +135,103 @@ namespace osu.Game.Rulesets.UI
         /// Adds a DrawableHitObject to this Playfield.
         /// </summary>
         /// <param name="h">The DrawableHitObject to add.</param>
-        public virtual void Add(DrawableHitObject h) => HitObjectContainer.Add(h);
+        public virtual void Add(DrawableHitObject h)
+        {
+            HitObjectContainer.Add(h);
+
+            h.OnNewResult += (d, r) => NewResult?.Invoke(d, r);
+            h.OnRevertResult += (d, r) => RevertResult?.Invoke(d, r);
+
+            OnHitObjectAdded(h.HitObject);
+        }
 
         /// <summary>
         /// Remove a DrawableHitObject from this Playfield.
         /// </summary>
         /// <param name="h">The DrawableHitObject to remove.</param>
-        public virtual bool Remove(DrawableHitObject h) => HitObjectContainer.Remove(h);
+        public virtual bool Remove(DrawableHitObject h)
+        {
+            if (!HitObjectContainer.Remove(h))
+                return false;
+
+            OnHitObjectRemoved(h.HitObject);
+            return false;
+        }
+
+        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
+
+        /// <summary>
+        /// Adds a <see cref="HitObject"/> to this <see cref="Playfield"/>.
+        /// </summary>
+        /// <param name="entry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the <see cref="HitObject"/>.</param>
+        public void Add(HitObjectLifetimeEntry entry)
+        {
+            HitObjectContainer.Add(entry);
+            lifetimeEntryMap[entry.HitObject] = entry;
+            OnHitObjectAdded(entry.HitObject);
+        }
+
+        /// <summary>
+        /// Removes a <see cref="HitObject"/> to this <see cref="Playfield"/>.
+        /// </summary>
+        /// <param name="entry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the <see cref="HitObject"/>.</param>
+        public void Remove(HitObjectLifetimeEntry entry)
+        {
+            if (HitObjectContainer.Remove(entry))
+                OnHitObjectRemoved(entry.HitObject);
+            lifetimeEntryMap.Remove(entry.HitObject);
+        }
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> is added to this <see cref="Playfield"/>.
+        /// </summary>
+        /// <param name="hitObject">The added <see cref="HitObject"/>.</param>
+        protected virtual void OnHitObjectAdded(HitObject hitObject)
+        {
+        }
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> is removed from this <see cref="Playfield"/>.
+        /// </summary>
+        /// <param name="hitObject">The removed <see cref="HitObject"/>.</param>
+        protected virtual void OnHitObjectRemoved(HitObject hitObject)
+        {
+        }
+
+        /// <summary>
+        /// Sets whether to keep a given <see cref="HitObject"/> always alive within this or any nested <see cref="Playfield"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to set.</param>
+        /// <param name="keepAlive">Whether to keep <paramref name="hitObject"/> always alive.</param>
+        public void SetKeepAlive(HitObject hitObject, bool keepAlive)
+        {
+            if (lifetimeEntryMap.TryGetValue(hitObject, out var entry))
+            {
+                entry.KeepAlive = keepAlive;
+                return;
+            }
+
+            if (!nestedPlayfields.IsValueCreated)
+                return;
+
+            foreach (var p in nestedPlayfields.Value)
+                p.SetKeepAlive(hitObject, keepAlive);
+        }
+
+        /// <summary>
+        /// Keeps all <see cref="HitObject"/>s alive within this and all nested <see cref="Playfield"/>s.
+        /// </summary>
+        public void KeepAllAlive()
+        {
+            foreach (var (_, entry) in lifetimeEntryMap)
+                entry.KeepAlive = true;
+
+            if (!nestedPlayfields.IsValueCreated)
+                return;
+
+            foreach (var p in nestedPlayfields.Value)
+                p.KeepAllAlive();
+        }
 
         /// <summary>
         /// The cursor currently being used by this <see cref="Playfield"/>. May be null if no cursor is provided.
@@ -131,6 +255,12 @@ namespace osu.Game.Rulesets.UI
         protected void AddNested(Playfield otherPlayfield)
         {
             otherPlayfield.DisplayJudgements.BindTo(DisplayJudgements);
+
+            otherPlayfield.NewResult += (d, r) => NewResult?.Invoke(d, r);
+            otherPlayfield.RevertResult += (d, r) => RevertResult?.Invoke(d, r);
+            otherPlayfield.HitObjectUsageBegan += h => HitObjectUsageBegan?.Invoke(h);
+            otherPlayfield.HitObjectUsageFinished += h => HitObjectUsageFinished?.Invoke(h);
+
             nestedPlayfields.Value.Add(otherPlayfield);
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index f9af1818d0..ee4f835c6f 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -261,14 +261,14 @@ namespace osu.Game.Screens.Play
             // bind clock into components that require it
             DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);
 
-            DrawableRuleset.OnNewResult += r =>
+            DrawableRuleset.NewResult += r =>
             {
                 HealthProcessor.ApplyResult(r);
                 ScoreProcessor.ApplyResult(r);
                 gameplayBeatmap.ApplyResult(r);
             };
 
-            DrawableRuleset.OnRevertResult += r =>
+            DrawableRuleset.RevertResult += r =>
             {
                 HealthProcessor.RevertResult(r);
                 ScoreProcessor.RevertResult(r);

From 99e5450af3930eba7f9431179c8afafe45686a0d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 00:22:36 +0900
Subject: [PATCH 06069/10326] Cache DrawableRuleset

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 87a04312ab..b78cfe9086 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -383,6 +383,7 @@ namespace osu.Game.Rulesets.UI
     /// Once IDrawable is a thing, this can also become an interface.
     /// </remarks>
     /// </summary>
+    [Cached(typeof(DrawableRuleset))]
     public abstract class DrawableRuleset : CompositeDrawable
     {
         /// <summary>

From e525784cb2deb8287e3727d3ebc6ed2e639a635a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 00:24:14 +0900
Subject: [PATCH 06070/10326] Clear lifetimeEntry after use

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 5299e53d5c..244cf831c3 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -259,6 +259,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             OnFree(HitObject);
 
             HitObject = null;
+            lifetimeEntry = null;
+
             hasHitObjectApplied = false;
         }
 

From b725c9cce9e938063a64ee2a5709ce5859c8e59e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 00:24:28 +0900
Subject: [PATCH 06071/10326] Fix possible nullrefs

---
 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 244cf831c3..bcf1103f39 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -613,13 +613,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// The time at which state transforms should be applied that line up to <see cref="HitObject"/>'s StartTime.
         /// This is used to offset calls to <see cref="UpdateStateTransforms"/>.
         /// </summary>
-        public double StateUpdateTime => HitObject.StartTime;
+        public double StateUpdateTime => HitObject?.StartTime ?? 0;
 
         /// <summary>
         /// The time at which judgement dependent state transforms should be applied. This is equivalent of the (end) time of the object, in addition to any judgement offset.
         /// This is used to offset calls to <see cref="UpdateHitStateTransforms"/>.
         /// </summary>
-        public double HitStateUpdateTime => Result?.TimeAbsolute ?? HitObject.GetEndTime();
+        public double HitStateUpdateTime => Result?.TimeAbsolute ?? HitObject?.GetEndTime() ?? 0;
 
         /// <summary>
         /// Will be called at least once after this <see cref="DrawableHitObject"/> has become not alive.

From 81844878b0e6220a55bd5cf0d496571bda893097 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 00:29:34 +0900
Subject: [PATCH 06072/10326] Fix possible nullref with non-attached hitobjects

---
 .../Objects/Drawables/Pieces/SnakingSliderBody.cs             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
index e63f25b7bc..8835a0d84a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         public void UpdateProgress(double completionProgress)
         {
-            if (drawableSlider == null)
+            if (drawableSlider?.HitObject == null)
                 return;
 
             Slider slider = drawableSlider.HitObject;
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         public void Refresh()
         {
-            if (drawableSlider == null)
+            if (drawableSlider?.HitObject == null)
                 return;
 
             // Generate the entire curve

From 546249b071a21fbea8beee7b92b3f7024585ba87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 21:32:47 +0100
Subject: [PATCH 06073/10326] Temporarily fix crash on deleting control point
 groups

---
 osu.Game/Screens/Edit/Timing/GroupSection.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/GroupSection.cs b/osu.Game/Screens/Edit/Timing/GroupSection.cs
index d76b5e7406..2605ea8b75 100644
--- a/osu.Game/Screens/Edit/Timing/GroupSection.cs
+++ b/osu.Game/Screens/Edit/Timing/GroupSection.cs
@@ -85,12 +85,13 @@ namespace osu.Game.Screens.Edit.Timing
                 {
                     textBox.Text = string.Empty;
 
-                    textBox.Current.Disabled = true;
+                    // cannot use textBox.Current.Disabled due to https://github.com/ppy/osu-framework/issues/3919
+                    textBox.ReadOnly = true;
                     button.Enabled.Value = false;
                     return;
                 }
 
-                textBox.Current.Disabled = false;
+                textBox.ReadOnly = false;
                 button.Enabled.Value = true;
 
                 textBox.Text = $"{group.NewValue.Time:n0}";

From 53c968e137488ba4719f5241d0edb3d32940ece3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 10:19:59 +0900
Subject: [PATCH 06074/10326] Fix user profile best performance weighting being
 out of order

---
 .../Profile/Sections/Ranks/PaginatedScoreContainer.cs      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 3c540d6fbb..1ce3079d52 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -46,6 +46,9 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
 
         protected override void OnItemsReceived(List<APILegacyScoreInfo> items)
         {
+            if (VisiblePages == 0)
+                drawableItemIndex = 0;
+
             base.OnItemsReceived(items);
 
             if (type == ScoreType.Recent)
@@ -55,6 +58,8 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         protected override APIRequest<List<APILegacyScoreInfo>> CreateRequest() =>
             new GetUserScoresRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
 
+        private int drawableItemIndex;
+
         protected override Drawable CreateDrawableItem(APILegacyScoreInfo model)
         {
             switch (type)
@@ -63,7 +68,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                     return new DrawableProfileScore(model.CreateScoreInfo(Rulesets));
 
                 case ScoreType.Best:
-                    return new DrawableProfileWeightedScore(model.CreateScoreInfo(Rulesets), Math.Pow(0.95, ItemsContainer.Count));
+                    return new DrawableProfileWeightedScore(model.CreateScoreInfo(Rulesets), Math.Pow(0.95, drawableItemIndex++));
             }
         }
     }

From 6b548ef5e4a6517e8ac5ae0689d7827c87cbfab4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 11:54:40 +0900
Subject: [PATCH 06075/10326] Split out SkinInfo ID constants and fix random
 logic

---
 .../Overlays/Settings/Sections/SkinSection.cs | 49 ++++++++++---------
 osu.Game/Skinning/DefaultLegacySkin.cs        |  2 +-
 osu.Game/Skinning/SkinInfo.cs                 |  5 ++
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 412103af38..b21de26dde 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -31,9 +31,13 @@ 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 static readonly SkinInfo random_skin_info = new RandomSkinInfo();
+        private static readonly SkinInfo random_skin_info = new SkinInfo
+        {
+            ID = SkinInfo.RANDOM_SKIN,
+            Name = "<Random Skin>",
+        };
 
-        private List<SkinInfo> usableSkins;
+        private List<SkinInfo> skinItems;
 
         [Resolved]
         private SkinManager skins { get; set; }
@@ -98,29 +102,37 @@ namespace osu.Game.Overlays.Settings.Sections
             dropdownBindable.BindValueChanged(skin =>
             {
                 if (skin.NewValue == random_skin_info)
+                {
                     randomizeSkin();
-                else
-                    configBindable.Value = skin.NewValue.ID;
+                    return;
+                }
+
+                configBindable.Value = skin.NewValue.ID;
             });
         }
 
         private void randomizeSkin()
         {
-            int n = usableSkins.Count;
-            if (n > 1)
-                configBindable.Value = (configBindable.Value + RNG.Next(n - 1) + 1) % n; // make sure it's always a different one
-            else
-                configBindable.Value = 0;
+            int count = skinItems.Count - 1; // exclude "random" item.
+
+            if (count <= 1)
+            {
+                configBindable.Value = SkinInfo.Default.ID;
+                return;
+            }
+
+            // ensure the random selection is never the same as the previous.
+            configBindable.Value = skinItems.Where(s => s.ID != configBindable.Value).ElementAt(RNG.Next(0, count)).ID;
         }
 
         private void updateItems()
         {
-            usableSkins = skins.GetAllUsableSkins();
+            skinItems = skins.GetAllUsableSkins();
 
-            if (usableSkins.Count > 1)
-                usableSkins.Add(random_skin_info);
+            if (skinItems.Count > 1)
+                skinItems.Add(random_skin_info);
 
-            skinDropdown.Items = usableSkins;
+            skinDropdown.Items = skinItems;
         }
 
         private void itemUpdated(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
@@ -150,17 +162,6 @@ namespace osu.Game.Overlays.Settings.Sections
             }
         }
 
-        private class RandomSkinInfo : SkinInfo
-        {
-            public RandomSkinInfo()
-            {
-                Name = "<Random Skin>";
-                ID = -1;
-            }
-
-            public override string ToString() => Name;
-        }
-
         private class ExportSkinButton : SettingsButton
         {
             [Resolved]
diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 78d3a37f7c..2758a4cbba 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Skinning
 
         public static SkinInfo Info { get; } = new SkinInfo
         {
-            ID = -1, // this is temporary until database storage is decided upon.
+            ID = SkinInfo.CLASSIC_SKIN, // this is temporary until database storage is decided upon.
             Name = "osu!classic",
             Creator = "team osu!"
         };
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index b9fe44ef3b..aaccbefb3d 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -10,6 +10,10 @@ namespace osu.Game.Skinning
 {
     public class SkinInfo : IHasFiles<SkinFileInfo>, IEquatable<SkinInfo>, IHasPrimaryKey, ISoftDelete
     {
+        internal const int DEFAULT_SKIN = 0;
+        internal const int CLASSIC_SKIN = -1;
+        internal const int RANDOM_SKIN = -2;
+
         public int ID { get; set; }
 
         public string Name { get; set; }
@@ -26,6 +30,7 @@ namespace osu.Game.Skinning
 
         public static SkinInfo Default { get; } = new SkinInfo
         {
+            ID = DEFAULT_SKIN,
             Name = "osu!lazer",
             Creator = "team osu!"
         };

From 6674628bc7383c1ae896afbce945237666a421d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 12:03:38 +0900
Subject: [PATCH 06076/10326] Only include user skins in random choices

---
 .../Overlays/Settings/Sections/SkinSection.cs    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index b21de26dde..8297b56db8 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -113,24 +113,28 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private void randomizeSkin()
         {
-            int count = skinItems.Count - 1; // exclude "random" item.
+            // choose from only user skins, removing the current selection to ensure a new one is chosen.
+            var randomChoices = skinItems.Where(s => s.ID > 0 && s.ID != configBindable.Value).ToArray();
 
-            if (count <= 1)
+            if (randomChoices.Length == 0)
             {
                 configBindable.Value = SkinInfo.Default.ID;
                 return;
             }
 
-            // ensure the random selection is never the same as the previous.
-            configBindable.Value = skinItems.Where(s => s.ID != configBindable.Value).ElementAt(RNG.Next(0, count)).ID;
+            configBindable.Value = randomChoices.ElementAt(RNG.Next(0, randomChoices.Length)).ID;
         }
 
         private void updateItems()
         {
             skinItems = skins.GetAllUsableSkins();
 
-            if (skinItems.Count > 1)
-                skinItems.Add(random_skin_info);
+            // insert after lazer built-in skins
+            int firstNonDefault = skinItems.FindIndex(s => s.ID > 0);
+            if (firstNonDefault < 0)
+                firstNonDefault = skinItems.Count;
+
+            skinItems.Insert(firstNonDefault, random_skin_info);
 
             skinDropdown.Items = skinItems;
         }

From 9caa56c64fcac23824932389327cf9945ff6c098 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 12:19:01 +0900
Subject: [PATCH 06077/10326] Display skin changes via on-screen display
 overlay

---
 osu.Game/Configuration/OsuConfigManager.cs | 8 ++++++++
 osu.Game/OsuGame.cs                        | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 8206a92a54..b79e99781b 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 System;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Configuration.Tracking;
@@ -177,7 +178,14 @@ namespace osu.Game.Configuration
             new TrackedSetting<bool>(OsuSetting.MouseDisableButtons, v => new SettingDescription(!v, "gameplay mouse buttons", v ? "disabled" : "enabled")),
             new TrackedSetting<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode, m => new SettingDescription(m, "HUD Visibility", m.GetDescription())),
             new TrackedSetting<ScalingMode>(OsuSetting.Scaling, m => new SettingDescription(m, "scaling", m.GetDescription())),
+            new TrackedSetting<int>(OsuSetting.Skin, m =>
+            {
+                string skinName = LookupSkinName?.Invoke(m) ?? string.Empty;
+                return new SettingDescription(skinName, "skin", skinName);
+            })
         };
+
+        public Func<int, string> LookupSkinName { get; set; }
     }
 
     public enum OsuSetting
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5119f262d5..a34272f5f0 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -548,6 +548,10 @@ namespace osu.Game
             ScoreManager.GetStableStorage = GetStorageForStableInstall;
             ScoreManager.PresentImport = items => PresentScore(items.First());
 
+            // make config aware of how to lookup skins for on-screen display purposes.
+            // if this becomes a more common thing, tracked settings should be reconsidered to allow local DI.
+            LocalConfig.LookupSkinName = id => SkinManager.GetAllUsableSkins().FirstOrDefault(s => s.ID == id)?.ToString() ?? "Unknown";
+
             Container logoContainer;
             BackButton.Receptor receptor;
 

From 1173ef089099e2468b80cf33eeb8f9bf79bbcc80 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 12:37:00 +0900
Subject: [PATCH 06078/10326] Fix mania notelock crashing with overlapping
 hitwindows

---
 .../TestSceneHoldNoteInput.cs                 |  2 +-
 .../TestSceneOutOfOrderHits.cs                | 23 +++++++++++++++++++
 .../Objects/Drawables/DrawableHoldNote.cs     |  2 +-
 .../UI/OrderedHitPolicy.cs                    |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 5cb1519196..6c9f184c2c 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             assertHeadJudgement(HitResult.Miss);
             assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
-            assertNoteJudgement(HitResult.IgnoreHit);
+            assertNoteJudgement(HitResult.IgnoreMiss);
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index e8c2472c3b..d699921307 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -54,6 +54,29 @@ namespace osu.Game.Rulesets.Mania.Tests
             }
         }
 
+        [Test]
+        public void TestMissAfterNextObjectStartTime()
+        {
+            var objects = new List<ManiaHitObject>
+            {
+                new HoldNote
+                {
+                    StartTime = 1000,
+                    EndTime = 1200,
+                },
+                new HoldNote
+                {
+                    StartTime = 1220,
+                    EndTime = 1420
+                }
+            };
+
+            performTest(objects, new List<ReplayFrame>());
+
+            addJudgementAssert(objects[0], HitResult.IgnoreMiss);
+            addJudgementAssert(objects[1], HitResult.IgnoreMiss);
+        }
+
         private void addJudgementAssert(ManiaHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index d9d740c145..3b3f72157a 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -233,7 +233,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             if (Tail.AllJudged)
             {
-                ApplyResult(r => r.Type = r.Judgement.MaxResult);
+                ApplyResult(r => r.Type = Tail.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
                 endHold();
             }
 
diff --git a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
index 0f9cd48dd8..9bc577a81e 100644
--- a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
         public void HandleHit(DrawableHitObject hitObject)
         {
-            if (!IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
+            if (hitObject.IsHit && !IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
                 throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
 
             foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))

From 626231d90626790a063f9b93256276e2b4d8135e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 12:53:32 +0900
Subject: [PATCH 06079/10326] Completely remove check as it can occur for hits
 too

---
 .../TestSceneOutOfOrderHits.cs                | 51 +++++++++++++++++--
 .../UI/OrderedHitPolicy.cs                    |  4 --
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index d699921307..86a142f2f6 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -55,19 +56,19 @@ namespace osu.Game.Rulesets.Mania.Tests
         }
 
         [Test]
-        public void TestMissAfterNextObjectStartTime()
+        public void TestHoldNoteMissAfterNextObjectStartTime()
         {
             var objects = new List<ManiaHitObject>
             {
                 new HoldNote
                 {
                     StartTime = 1000,
-                    EndTime = 1200,
+                    EndTime = 1010,
                 },
                 new HoldNote
                 {
-                    StartTime = 1220,
-                    EndTime = 1420
+                    StartTime = 1020,
+                    EndTime = 1030
                 }
             };
 
@@ -77,12 +78,54 @@ namespace osu.Game.Rulesets.Mania.Tests
             addJudgementAssert(objects[1], HitResult.IgnoreMiss);
         }
 
+        [Test]
+        public void TestHoldNoteReleasedHitAfterNextObjectStartTime()
+        {
+            var objects = new List<ManiaHitObject>
+            {
+                new HoldNote
+                {
+                    StartTime = 1000,
+                    EndTime = 1010,
+                },
+                new HoldNote
+                {
+                    StartTime = 1020,
+                    EndTime = 1030
+                }
+            };
+
+            var frames = new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(1000, ManiaAction.Key1),
+                new ManiaReplayFrame(1030),
+                new ManiaReplayFrame(1040, ManiaAction.Key1),
+                new ManiaReplayFrame(1050)
+            };
+
+            performTest(objects, frames);
+
+            addJudgementAssert(objects[0], HitResult.IgnoreHit);
+            addJudgementAssert("first head", () => ((HoldNote)objects[0]).Head, HitResult.Perfect);
+            addJudgementAssert("first tail", () => ((HoldNote)objects[0]).Tail, HitResult.Perfect);
+
+            addJudgementAssert(objects[1], HitResult.IgnoreHit);
+            addJudgementAssert("second head", () => ((HoldNote)objects[1]).Head, HitResult.Great);
+            addJudgementAssert("second tail", () => ((HoldNote)objects[1]).Tail, HitResult.Perfect);
+        }
+
         private void addJudgementAssert(ManiaHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
                 () => judgementResults.Single(r => r.HitObject == hitObject).Type == result);
         }
 
+        private void addJudgementAssert(string name, Func<ManiaHitObject> hitObject, HitResult result)
+        {
+            AddAssert($"{name} judgement is {result}",
+                () => judgementResults.Single(r => r.HitObject == hitObject()).Type == result);
+        }
+
         private void addJudgementOffsetAssert(ManiaHitObject hitObject, double offset)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judged at {offset}",
diff --git a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
index 9bc577a81e..961858b62b 100644
--- a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.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 osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -44,9 +43,6 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
         public void HandleHit(DrawableHitObject hitObject)
         {
-            if (hitObject.IsHit && !IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
-                throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
-
             foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))
             {
                 if (obj.Judged)

From 508ae91a978e3d706d654457cbfaff4206aea266 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 12:53:53 +0900
Subject: [PATCH 06080/10326] Revert unnecessary change

---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs       | 2 +-
 osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs      | 4 ++--
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 6c9f184c2c..5cb1519196 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             assertHeadJudgement(HitResult.Miss);
             assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
-            assertNoteJudgement(HitResult.IgnoreMiss);
+            assertNoteJudgement(HitResult.IgnoreHit);
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index 86a142f2f6..cecac38f70 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -74,8 +74,8 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             performTest(objects, new List<ReplayFrame>());
 
-            addJudgementAssert(objects[0], HitResult.IgnoreMiss);
-            addJudgementAssert(objects[1], HitResult.IgnoreMiss);
+            addJudgementAssert(objects[0], HitResult.IgnoreHit);
+            addJudgementAssert(objects[1], HitResult.IgnoreHit);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 3b3f72157a..d9d740c145 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -233,7 +233,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             if (Tail.AllJudged)
             {
-                ApplyResult(r => r.Type = Tail.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+                ApplyResult(r => r.Type = r.Judgement.MaxResult);
                 endHold();
             }
 

From 6014751e29f4cd3835d75af104ddeaa50c68b954 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 12:54:39 +0900
Subject: [PATCH 06081/10326] Add the ability for the game OSD to display user
 bindings

Adds binding display for mouse button toggle / HUD toggle keys.

- [ ] Depends on #10786 for ease-of-merge
---
 osu.Game/Configuration/OsuConfigManager.cs | 33 ++++++++++++++--------
 osu.Game/Input/KeyBindingStore.cs          | 17 +++++++++++
 osu.Game/OsuGame.cs                        | 10 +++++++
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index b79e99781b..795ad96170 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Configuration.Tracking;
@@ -9,6 +10,7 @@ using osu.Framework.Extensions;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Input;
+using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Select;
@@ -173,19 +175,28 @@ namespace osu.Game.Configuration
             }
         }
 
-        public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
+        public override TrackedSettings CreateTrackedSettings()
         {
-            new TrackedSetting<bool>(OsuSetting.MouseDisableButtons, v => new SettingDescription(!v, "gameplay mouse buttons", v ? "disabled" : "enabled")),
-            new TrackedSetting<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode, m => new SettingDescription(m, "HUD Visibility", m.GetDescription())),
-            new TrackedSetting<ScalingMode>(OsuSetting.Scaling, m => new SettingDescription(m, "scaling", m.GetDescription())),
-            new TrackedSetting<int>(OsuSetting.Skin, m =>
-            {
-                string skinName = LookupSkinName?.Invoke(m) ?? string.Empty;
-                return new SettingDescription(skinName, "skin", skinName);
-            })
-        };
+            // these need to be assigned in normal game startup scenarios.
+            Debug.Assert(LookupKeyBindings != null);
+            Debug.Assert(LookupSkinName != null);
 
-        public Func<int, string> LookupSkinName { get; set; }
+            return new TrackedSettings
+            {
+                new TrackedSetting<bool>(OsuSetting.MouseDisableButtons, v => new SettingDescription(!v, "gameplay mouse buttons", v ? "disabled" : "enabled", LookupKeyBindings(GlobalAction.ToggleGameplayMouseButtons))),
+                new TrackedSetting<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode, m => new SettingDescription(m, "HUD Visibility", m.GetDescription(), $"cycle: shift-tab quick view: {LookupKeyBindings(GlobalAction.HoldForHUD)}")),
+                new TrackedSetting<ScalingMode>(OsuSetting.Scaling, m => new SettingDescription(m, "scaling", m.GetDescription())),
+                new TrackedSetting<int>(OsuSetting.Skin, m =>
+                {
+                    string skinName = LookupSkinName(m) ?? string.Empty;
+                    return new SettingDescription(skinName, "skin", skinName);
+                })
+            };
+        }
+
+        public Func<int, string> LookupSkinName { private get; set; }
+
+        public Func<GlobalAction, string> LookupKeyBindings { private get; set; }
     }
 
     public enum OsuSetting
diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index 198ab6883d..bc73d74d74 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -32,6 +32,23 @@ namespace osu.Game.Input
 
         public void Register(KeyBindingContainer manager) => insertDefaults(manager.DefaultKeyBindings);
 
+        /// <summary>
+        /// Retrieve all user-defined key combinations (in a format that can be displayed) for a specific action.
+        /// </summary>
+        /// <param name="globalAction">The action to lookup.</param>
+        /// <returns>A set of display strings for all the user's key configuration for the action.</returns>
+        public IEnumerable<string> GetReadableKeyCombinationsFor(GlobalAction globalAction)
+        {
+            foreach (var action in Query().Where(b => (GlobalAction)b.Action == globalAction))
+            {
+                string str = action.KeyCombination.ReadableString();
+
+                // even if found, the readable string may be empty for an unbound action.
+                if (str.Length > 0)
+                    yield return str;
+            }
+        }
+
         private void insertDefaults(IEnumerable<KeyBinding> defaults, int? rulesetId = null, int? variant = null)
         {
             using (var usage = ContextFactory.GetForWrite())
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a34272f5f0..7f0465604b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -552,6 +552,16 @@ namespace osu.Game
             // if this becomes a more common thing, tracked settings should be reconsidered to allow local DI.
             LocalConfig.LookupSkinName = id => SkinManager.GetAllUsableSkins().FirstOrDefault(s => s.ID == id)?.ToString() ?? "Unknown";
 
+            LocalConfig.LookupKeyBindings = l =>
+            {
+                var combinations = KeyBindingStore.GetReadableKeyCombinationsFor(l).ToArray();
+
+                if (combinations.Length == 0)
+                    return "none";
+
+                return string.Join(" or ", combinations);
+            };
+
             Container logoContainer;
             BackButton.Receptor receptor;
 

From 8d38d9cc93497a0f32d253afc15e14769670b456 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 13:05:03 +0900
Subject: [PATCH 06082/10326] Add hotkey to select random skin

---
 osu.Game/Configuration/OsuConfigManager.cs      |  2 +-
 .../Input/Bindings/GlobalActionContainer.cs     |  5 +++++
 osu.Game/OsuGame.cs                             |  4 ++++
 .../Overlays/Settings/Sections/SkinSection.cs   | 17 +----------------
 osu.Game/Skinning/SkinManager.cs                | 15 +++++++++++++++
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 795ad96170..a4b99bb6e6 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Configuration
                 new TrackedSetting<int>(OsuSetting.Skin, m =>
                 {
                     string skinName = LookupSkinName(m) ?? string.Empty;
-                    return new SettingDescription(skinName, "skin", skinName);
+                    return new SettingDescription(skinName, "skin", skinName, $"random: {LookupKeyBindings(GlobalAction.RandomSkin)}");
                 })
             };
         }
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 3de4bb1f9d..e5d3a89a88 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -48,6 +48,8 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.Space, GlobalAction.Select),
             new KeyBinding(InputKey.Enter, GlobalAction.Select),
             new KeyBinding(InputKey.KeypadEnter, GlobalAction.Select),
+
+            new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.R }, GlobalAction.RandomSkin),
         };
 
         public IEnumerable<KeyBinding> EditorKeyBindings => new[]
@@ -191,5 +193,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Hold for HUD")]
         HoldForHUD,
+
+        [Description("Random Skin")]
+        RandomSkin,
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 7f0465604b..1e94becb98 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -887,6 +887,10 @@ namespace osu.Game
                 case GlobalAction.ToggleGameplayMouseButtons:
                     LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
                     return true;
+
+                case GlobalAction.RandomSkin:
+                    SkinManager.SelectRandomSkin();
+                    return true;
             }
 
             return false;
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 8297b56db8..3e7068f1ff 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -9,7 +9,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Logging;
-using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Skinning;
@@ -103,7 +102,7 @@ namespace osu.Game.Overlays.Settings.Sections
             {
                 if (skin.NewValue == random_skin_info)
                 {
-                    randomizeSkin();
+                    skins.SelectRandomSkin();
                     return;
                 }
 
@@ -111,20 +110,6 @@ namespace osu.Game.Overlays.Settings.Sections
             });
         }
 
-        private void randomizeSkin()
-        {
-            // choose from only user skins, removing the current selection to ensure a new one is chosen.
-            var randomChoices = skinItems.Where(s => s.ID > 0 && s.ID != configBindable.Value).ToArray();
-
-            if (randomChoices.Length == 0)
-            {
-                configBindable.Value = SkinInfo.Default.ID;
-                return;
-            }
-
-            configBindable.Value = randomChoices.ElementAt(RNG.Next(0, randomChoices.Length)).ID;
-        }
-
         private void updateItems()
         {
             skinItems = skins.GetAllUsableSkins();
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 2e4c24a89e..bef3e86a4d 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -19,6 +19,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Database;
 using osu.Game.IO.Archives;
@@ -87,6 +88,20 @@ namespace osu.Game.Skinning
         /// <returns>A newly allocated list of available <see cref="SkinInfo"/>.</returns>
         public List<SkinInfo> GetAllUserSkins() => ModelStore.ConsumableItems.Where(s => !s.DeletePending).ToList();
 
+        public void SelectRandomSkin()
+        {
+            // choose from only user skins, removing the current selection to ensure a new one is chosen.
+            var randomChoices = GetAllUsableSkins().Where(s => s.ID > 0 && s.ID != CurrentSkinInfo.Value.ID).ToArray();
+
+            if (randomChoices.Length == 0)
+            {
+                CurrentSkinInfo.Value = SkinInfo.Default;
+                return;
+            }
+
+            CurrentSkinInfo.Value = randomChoices.ElementAt(RNG.Next(0, randomChoices.Length));
+        }
+
         protected override SkinInfo CreateModel(ArchiveReader archive) => new SkinInfo { Name = archive.Name };
 
         private const string unknown_creator_string = "Unknown";

From 11cf04eed171f3dac856929f917febc62b8d9636 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 13:39:42 +0900
Subject: [PATCH 06083/10326] Fix frames potentially getting added to spectator
 replay in wrong format

The way spectator currently works, the `Spectator` screen is responsible
for adding new frames to the replay, even when it has a child
(`SpectatorPlayer`) present.

There was a possibility that a new play had already started, and on
returning to the Spectator screen (to initialise the new play) there
would be a brief period where the Player instance is still reading from
the replay, the `userBeganPlaying` call had not yet finished
initialising the new target replay, and `userSentFrames` is run
(asynchronously), writing frames to the previous replay using the
incorrect ruleset instance).

To make this work, it doesn't `Schedule` frame addition to the replay
(making things a bit unsafe). Changing this itself isn't such a simple
one to do, so I instead opted to fix this via locking.

Closes https://github.com/ppy/osu/issues/10777.
---
 osu.Game/Screens/Play/Spectator.cs | 80 ++++++++++++++++++------------
 1 file changed, 48 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 0f593db277..6f51771c12 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -61,7 +62,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        private Replay replay;
+        private Score score;
+
+        private readonly object scoreLock = new object();
 
         private Container beatmapPanelContainer;
 
@@ -198,23 +201,32 @@ namespace osu.Game.Screens.Play
 
         private void userSentFrames(int userId, FrameDataBundle data)
         {
+            // this is not scheduled as it handles propagation of frames even when in a child screen (at which point we are not alive).
+            // probably not the safest way to handle this.
+
             if (userId != targetUser.Id)
                 return;
 
-            // this should never happen as the server sends the user's state on watching,
-            // but is here as a safety measure.
-            if (replay == null)
-                return;
-
-            foreach (var frame in data.Frames)
+            lock (scoreLock)
             {
-                IConvertibleReplayFrame convertibleFrame = rulesetInstance.CreateConvertibleReplayFrame();
-                convertibleFrame.FromLegacy(frame, beatmap.Value.Beatmap);
+                // this should never happen as the server sends the user's state on watching,
+                // but is here as a safety measure.
+                if (score == null)
+                    return;
 
-                var convertedFrame = (ReplayFrame)convertibleFrame;
-                convertedFrame.Time = frame.Time;
+                // rulesetInstance should be guaranteed to be in sync with the score via scoreLock.
+                Debug.Assert(rulesetInstance != null && rulesetInstance.RulesetInfo.Equals(score.ScoreInfo.Ruleset));
 
-                replay.Frames.Add(convertedFrame);
+                foreach (var frame in data.Frames)
+                {
+                    IConvertibleReplayFrame convertibleFrame = rulesetInstance.CreateConvertibleReplayFrame();
+                    convertibleFrame.FromLegacy(frame, beatmap.Value.Beatmap);
+
+                    var convertedFrame = (ReplayFrame)convertibleFrame;
+                    convertedFrame.Time = frame.Time;
+
+                    score.Replay.Frames.Add(convertedFrame);
+                }
             }
         }
 
@@ -247,10 +259,13 @@ namespace osu.Game.Screens.Play
             if (userId != targetUser.Id)
                 return;
 
-            if (replay != null)
+            lock (scoreLock)
             {
-                replay.HasReceivedAllFrames = true;
-                replay = null;
+                if (score != null)
+                {
+                    score.Replay.HasReceivedAllFrames = true;
+                    score = null;
+                }
             }
 
             Schedule(clearDisplay);
@@ -283,27 +298,28 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            replay ??= new Replay { HasReceivedAllFrames = false };
-
-            var scoreInfo = new ScoreInfo
+            lock (scoreLock)
             {
-                Beatmap = resolvedBeatmap,
-                User = targetUser,
-                Mods = state.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
-                Ruleset = resolvedRuleset.RulesetInfo,
-            };
+                score = new Score
+                {
+                    ScoreInfo = new ScoreInfo
+                    {
+                        Beatmap = resolvedBeatmap,
+                        User = targetUser,
+                        Mods = state.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
+                        Ruleset = resolvedRuleset.RulesetInfo,
+                    },
+                    Replay = new Replay { HasReceivedAllFrames = false },
+                };
 
-            ruleset.Value = resolvedRuleset.RulesetInfo;
-            rulesetInstance = resolvedRuleset;
+                ruleset.Value = resolvedRuleset.RulesetInfo;
+                rulesetInstance = resolvedRuleset;
 
-            beatmap.Value = beatmaps.GetWorkingBeatmap(resolvedBeatmap);
-            watchButton.Enabled.Value = true;
+                beatmap.Value = beatmaps.GetWorkingBeatmap(resolvedBeatmap);
+                watchButton.Enabled.Value = true;
 
-            this.Push(new SpectatorPlayerLoader(new Score
-            {
-                ScoreInfo = scoreInfo,
-                Replay = replay,
-            }));
+                this.Push(new SpectatorPlayerLoader(score));
+            }
         }
 
         private void showBeatmapPanel(SpectatorState state)

From 324626e0978cb1d401440e516b6c2f74b0408e26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 13:51:20 +0900
Subject: [PATCH 06084/10326] Move default config tracking calls out of
 OnScreenDisplay itself

---
 osu.Game/OsuGame.cs                  |  7 ++++++-
 osu.Game/Overlays/OnScreenDisplay.cs | 11 +----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 7f0465604b..ba856a6e6b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -627,7 +627,12 @@ namespace osu.Game
 
             loadComponentSingleFile(volume = new VolumeOverlay(), leftFloatingOverlayContent.Add, true);
 
-            loadComponentSingleFile(new OnScreenDisplay(), Add, true);
+            var onScreenDisplay = new OnScreenDisplay();
+
+            onScreenDisplay.BeginTracking(this, frameworkConfig);
+            onScreenDisplay.BeginTracking(this, LocalConfig);
+
+            loadComponentSingleFile(onScreenDisplay, Add, true);
 
             loadComponentSingleFile(notifications.With(d =>
             {
diff --git a/osu.Game/Overlays/OnScreenDisplay.cs b/osu.Game/Overlays/OnScreenDisplay.cs
index e6708093c4..af6d24fc65 100644
--- a/osu.Game/Overlays/OnScreenDisplay.cs
+++ b/osu.Game/Overlays/OnScreenDisplay.cs
@@ -3,16 +3,14 @@
 
 using System;
 using System.Collections.Generic;
-using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osuTK;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Threading;
-using osu.Game.Configuration;
 using osu.Game.Overlays.OSD;
+using osuTK;
 
 namespace osu.Game.Overlays
 {
@@ -47,13 +45,6 @@ namespace osu.Game.Overlays
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig, OsuConfigManager osuConfig)
-        {
-            BeginTracking(this, frameworkConfig);
-            BeginTracking(this, osuConfig);
-        }
-
         private readonly Dictionary<(object, IConfigManager), TrackedSettings> trackedConfigManagers = new Dictionary<(object, IConfigManager), TrackedSettings>();
 
         /// <summary>

From c308eb75d991d53cdd28b99968b05e3ee8c3762e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 14:45:50 +0900
Subject: [PATCH 06085/10326] Move logic for performing actions from specific
 screen to its own component

---
 osu.Game/OsuGame.cs               |  31 +------
 osu.Game/PerformFromMenuRunner.cs | 145 ++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+), 29 deletions(-)
 create mode 100644 osu.Game/PerformFromMenuRunner.cs

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5119f262d5..cbf463d3bc 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -463,7 +463,7 @@ namespace osu.Game
 
         #endregion
 
-        private ScheduledDelegate performFromMainMenuTask;
+        private PerformFromMenuRunner performFromMainMenuTask;
 
         /// <summary>
         /// Perform an action only after returning to a specific screen as indicated by <paramref name="validScreens"/>.
@@ -474,34 +474,7 @@ namespace osu.Game
         public void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
         {
             performFromMainMenuTask?.Cancel();
-
-            validScreens ??= Enumerable.Empty<Type>();
-            validScreens = validScreens.Append(typeof(MainMenu));
-
-            CloseAllOverlays(false);
-
-            // we may already be at the target screen type.
-            if (validScreens.Contains(ScreenStack.CurrentScreen?.GetType()) && !Beatmap.Disabled)
-            {
-                action(ScreenStack.CurrentScreen);
-                return;
-            }
-
-            // find closest valid target
-            IScreen screen = ScreenStack.CurrentScreen;
-
-            while (screen != null)
-            {
-                if (validScreens.Contains(screen.GetType()))
-                {
-                    screen.MakeCurrent();
-                    break;
-                }
-
-                screen = screen.GetParentScreen();
-            }
-
-            performFromMainMenuTask = Schedule(() => PerformFromScreen(action, validScreens));
+            Add(performFromMainMenuTask = new PerformFromMenuRunner(action, validScreens, () => ScreenStack.CurrentScreen));
         }
 
         /// <summary>
diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
new file mode 100644
index 0000000000..8fcea7c277
--- /dev/null
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -0,0 +1,145 @@
+// Copyright (c) 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Screens;
+using osu.Framework.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
+using osu.Game.Overlays.Notifications;
+using osu.Game.Screens.Menu;
+
+namespace osu.Game
+{
+    internal class PerformFromMenuRunner : Component
+    {
+        private readonly Action<IScreen> finalAction;
+        private readonly IEnumerable<Type> validScreens;
+        private readonly Func<IScreen> getCurrentScreen;
+
+        [Resolved]
+        private NotificationOverlay notifications { get; set; }
+
+        [Resolved]
+        private DialogOverlay dialogOverlay { get; set; }
+
+        [Resolved]
+        private IBindable<WorkingBeatmap> beatmap { get; set; }
+
+        [Resolved(canBeNull: true)]
+        private OsuGame game { get; set; }
+
+        private readonly ScheduledDelegate task;
+
+        private PopupDialog lastEncounteredDialog;
+        private IScreen lastEncounteredDialogScreen;
+
+        /// <summary>
+        /// 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="finalAction">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>
+        /// <param name="getCurrentScreen">A function to retrieve the currently displayed game screen.</param>
+        public PerformFromMenuRunner(Action<IScreen> finalAction, IEnumerable<Type> validScreens, Func<IScreen> getCurrentScreen)
+        {
+            validScreens ??= Enumerable.Empty<Type>();
+            validScreens = validScreens.Append(typeof(MainMenu));
+
+            this.finalAction = finalAction;
+            this.validScreens = validScreens;
+            this.getCurrentScreen = getCurrentScreen;
+
+            Scheduler.Add(task = new ScheduledDelegate(checkCanComplete, 0, 200));
+        }
+
+        /// <summary>
+        /// Cancel this runner from running.
+        /// </summary>
+        public void Cancel()
+        {
+            task.Cancel();
+            Expire();
+        }
+
+        private void checkCanComplete()
+        {
+            // find closest valid target
+            IScreen current = getCurrentScreen();
+
+            // a dialog may be blocking the execution for now.
+            if (checkForDialog(current)) return;
+
+            // we may already be at the target screen type.
+            if (validScreens.Contains(getCurrentScreen().GetType()) && !beatmap.Disabled)
+            {
+                complete();
+                return;
+            }
+
+            game.CloseAllOverlays(false);
+
+            while (current != null)
+            {
+                if (validScreens.Contains(current.GetType()))
+                {
+                    current.MakeCurrent();
+                    break;
+                }
+
+                current = current.GetParentScreen();
+            }
+        }
+
+        /// <summary>
+        /// Check whether there is currently a dialog requiring user interaction.
+        /// </summary>
+        /// <param name="current"></param>
+        /// <returns>Whether a dialog blocked interaction.</returns>
+        private bool checkForDialog(IScreen current)
+        {
+            var currentDialog = dialogOverlay.CurrentDialog;
+
+            if (lastEncounteredDialog != null)
+            {
+                if (lastEncounteredDialog == currentDialog)
+                    // still waiting on user interaction
+                    return true;
+
+                if (lastEncounteredDialogScreen != current)
+                {
+                    // a dialog was previously encountered but has since been dismissed.
+                    // if the screen changed, the user likely confirmed an exit dialog and we should continue attempting the action.
+                    lastEncounteredDialog = null;
+                    lastEncounteredDialogScreen = null;
+                    return false;
+                }
+
+                // the last dialog encountered has been dismissed but the screen has not changed, abort.
+                Cancel();
+                notifications.Post(new SimpleNotification { Text = @"An action was interrupted due to a dialog being displayed." });
+                return true;
+            }
+
+            if (currentDialog == null)
+                return false;
+
+            // a new dialog was encountered.
+            lastEncounteredDialog = currentDialog;
+            lastEncounteredDialogScreen = current;
+            return true;
+        }
+
+        private void complete()
+        {
+            finalAction(getCurrentScreen());
+            Cancel();
+        }
+    }
+}

From 804450e707300b51abfc13014d354f9a9a1123ce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 15:49:45 +0900
Subject: [PATCH 06086/10326] Remove duplicate instantiation of
 externalLinkOpener

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5119f262d5..a4e7214d32 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -662,7 +662,6 @@ namespace osu.Game
 
             loadComponentSingleFile(new AccountCreationOverlay(), topMostOverlayContent.Add, true);
             loadComponentSingleFile(new DialogOverlay(), topMostOverlayContent.Add, true);
-            loadComponentSingleFile(externalLinkOpener = new ExternalLinkOpener(), topMostOverlayContent.Add);
 
             chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible;
 

From b28a0d5cd50333437de4af21ed05c37466eabe06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 15:58:43 +0900
Subject: [PATCH 06087/10326] Add test coverage

---
 .../Visual/Navigation/OsuGameTestScene.cs     |   2 +-
 .../Navigation/TestScenePerformFromScreen.cs  | 130 ++++++++++++++++--
 2 files changed, 116 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 4c18cfa61c..c5038068ec 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual.Navigation
         }
 
         [SetUpSteps]
-        public void SetUpSteps()
+        public virtual void SetUpSteps()
         {
             AddStep("Create new game instance", () =>
             {
diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
index 75c6a2b733..a4190e0b84 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
@@ -2,23 +2,33 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Screens;
+using osu.Game.Overlays;
+using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Navigation
 {
     public class TestScenePerformFromScreen : OsuGameTestScene
     {
+        private bool actionPerformed;
+
+        public override void SetUpSteps()
+        {
+            AddStep("reset status", () => actionPerformed = false);
+
+            base.SetUpSteps();
+        }
+
         [Test]
         public void TestPerformAtMenu()
         {
-            AddAssert("could perform immediately", () =>
-            {
-                bool actionPerformed = false;
-                Game.PerformFromScreen(_ => actionPerformed = true);
-                return actionPerformed;
-            });
+            AddStep("perform immediately", () => Game.PerformFromScreen(_ => actionPerformed = true));
+            AddAssert("did perform", () => actionPerformed);
         }
 
         [Test]
@@ -26,12 +36,9 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             PushAndConfirm(() => new PlaySongSelect());
 
-            AddAssert("could perform immediately", () =>
-            {
-                bool actionPerformed = false;
-                Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) });
-                return actionPerformed;
-            });
+            AddStep("perform immediately", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) }));
+            AddAssert("did perform", () => actionPerformed);
+            AddAssert("screen didn't change", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
         }
 
         [Test]
@@ -39,7 +46,6 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             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);
@@ -51,7 +57,6 @@ namespace osu.Game.Tests.Visual.Navigation
             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);
@@ -63,10 +68,105 @@ namespace osu.Game.Tests.Visual.Navigation
             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);
         }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestPerformBlockedByDialog(bool confirmed)
+        {
+            DialogBlockingScreen blocker = null;
+
+            PushAndConfirm(() => blocker = new DialogBlockingScreen());
+            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
+
+            AddWaitStep("wait a bit", 10);
+
+            AddAssert("screen didn't change", () => Game.ScreenStack.CurrentScreen is DialogBlockingScreen);
+            AddAssert("did not perform", () => !actionPerformed);
+            AddAssert("only one exit attempt", () => blocker.ExitAttempts == 1);
+
+            AddUntilStep("wait for dialog display", () => Game.Dependencies.Get<DialogOverlay>().IsLoaded);
+
+            if (confirmed)
+            {
+                AddStep("accept dialog", () => InputManager.Key(Key.Number1));
+                AddUntilStep("wait for dialog dismissed", () => Game.Dependencies.Get<DialogOverlay>().CurrentDialog == null);
+                AddUntilStep("did perform", () => actionPerformed);
+            }
+            else
+            {
+                AddStep("cancel dialog", () => InputManager.Key(Key.Number2));
+                AddAssert("screen didn't change", () => Game.ScreenStack.CurrentScreen is DialogBlockingScreen);
+                AddAssert("did not perform", () => !actionPerformed);
+            }
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestPerformBlockedByDialogNested(bool confirmSecond)
+        {
+            DialogBlockingScreen blocker = null;
+            DialogBlockingScreen blocker2 = null;
+
+            PushAndConfirm(() => blocker = new DialogBlockingScreen());
+            PushAndConfirm(() => blocker2 = new DialogBlockingScreen());
+
+            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
+
+            AddUntilStep("wait for dialog", () => blocker2.ExitAttempts == 1);
+
+            AddWaitStep("wait a bit", 10);
+
+            AddUntilStep("wait for dialog display", () => Game.Dependencies.Get<DialogOverlay>().IsLoaded);
+
+            AddAssert("screen didn't change", () => Game.ScreenStack.CurrentScreen == blocker2);
+            AddAssert("did not perform", () => !actionPerformed);
+            AddAssert("only one exit attempt", () => blocker2.ExitAttempts == 1);
+
+            AddStep("accept dialog", () => InputManager.Key(Key.Number1));
+            AddUntilStep("screen changed", () => Game.ScreenStack.CurrentScreen == blocker);
+
+            AddUntilStep("wait for second dialog", () => blocker.ExitAttempts == 1);
+            AddAssert("did not perform", () => !actionPerformed);
+            AddAssert("only one exit attempt", () => blocker.ExitAttempts == 1);
+
+            if (confirmSecond)
+            {
+                AddStep("accept dialog", () => InputManager.Key(Key.Number1));
+                AddUntilStep("did perform", () => actionPerformed);
+            }
+            else
+            {
+                AddStep("cancel dialog", () => InputManager.Key(Key.Number2));
+                AddAssert("screen didn't change", () => Game.ScreenStack.CurrentScreen == blocker);
+                AddAssert("did not perform", () => !actionPerformed);
+            }
+        }
+
+        public class DialogBlockingScreen : OsuScreen
+        {
+            [Resolved]
+            private DialogOverlay dialogOverlay { get; set; }
+
+            private int dialogDisplayCount;
+
+            public int ExitAttempts { get; private set; }
+
+            public override bool OnExiting(IScreen next)
+            {
+                ExitAttempts++;
+
+                if (dialogDisplayCount++ < 1)
+                {
+                    dialogOverlay.Push(new ConfirmExitDialog(this.Exit, () => { }));
+                    return true;
+                }
+
+                return base.OnExiting(next);
+            }
+        }
     }
 }

From 5d55af58182449a73da8aea2c5da743fb86fc589 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 16:35:48 +0900
Subject: [PATCH 06088/10326] Fix hitobjects sometimes not fading in completely
 with HD mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs             | 10 ++++++++--
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs    |  9 +++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 025e202666..cf7faca9b9 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -27,17 +27,23 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
             foreach (var d in drawables)
-                d.ApplyCustomUpdateState += applyFadeInAdjustment;
+            {
+                d.HitObjectApplied += applyFadeInAdjustment;
+                applyFadeInAdjustment(d);
+            }
 
             base.ApplyToDrawableHitObjects(drawables);
         }
 
-        private void applyFadeInAdjustment(DrawableHitObject hitObject, ArmedState state)
+        private void applyFadeInAdjustment(DrawableHitObject hitObject)
         {
             if (!(hitObject is DrawableOsuHitObject d))
                 return;
 
             d.HitObject.TimeFadeIn = d.HitObject.TimePreempt * fade_in_duration_multiplier;
+
+            foreach (var nested in d.NestedHitObjects)
+                applyFadeInAdjustment(nested);
         }
 
         private double lastSliderHeadFadeOutStartTime;
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 7a4e136553..62709b2900 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -26,8 +26,16 @@ namespace osu.Game.Rulesets.Objects.Drawables
     [Cached(typeof(DrawableHitObject))]
     public abstract class DrawableHitObject : SkinReloadableDrawable
     {
+        /// <summary>
+        /// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied.
+        /// </summary>
         public event Action<DrawableHitObject> DefaultsApplied;
 
+        /// <summary>
+        /// Invoked after a <see cref="HitObject"/> has been applied to this <see cref="DrawableHitObject"/>.
+        /// </summary>
+        public event Action<DrawableHitObject> HitObjectApplied;
+
         /// <summary>
         /// The <see cref="HitObject"/> currently represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -192,6 +200,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             HitObject.DefaultsApplied += onDefaultsApplied;
 
             OnApply(hitObject);
+            HitObjectApplied?.Invoke(this);
 
             // If not loaded, the state update happens in LoadComplete(). Otherwise, the update is scheduled to allow for lifetime updates.
             if (IsLoaded)

From 891218ec6b754ef13165c9e95dc88b64d66d9c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Nov 2020 09:11:33 +0100
Subject: [PATCH 06089/10326] Inline empty explosion in legacy transformer

---
 .../Skinning/TaikoLegacySkinTransformer.cs                  | 2 +-
 osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs              | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 880af3fbd8..96fb065e79 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     // suppress the default kiai explosion if the skin brings its own sprites.
                     // the drawable needs to expire as soon as possible to avoid accumulating empty drawables on the playfield.
                     if (hasExplosion.Value)
-                        return KiaiHitExplosion.EmptyExplosion();
+                        return Drawable.Empty().With(d => d.LifetimeEnd = double.MinValue);
 
                     return null;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
index 326cb23897..20900a9352 100644
--- a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
@@ -43,11 +43,5 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoExplosionKiai), _ => new DefaultKiaiHitExplosion(hitType));
         }
-
-        /// <summary>
-        /// Helper function to use when an explosion is not desired.
-        /// Lifetime is set to avoid accumulating empty drawables in the parent container.
-        /// </summary>
-        public static Drawable EmptyExplosion() => Empty().With(d => d.LifetimeEnd = double.MinValue);
     }
 }

From a08833f3b3cd3b7581be8e95a0b56d03611c8567 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 18:03:04 +0900
Subject: [PATCH 06090/10326] 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 bbe8426316..5078fee1cf 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1110.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1111.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8f0cc58594..405fb1a6ca 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1110.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1111.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f766e0ec03..099ecd8319 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.Framework.iOS" Version="2020.1110.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1111.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1110.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1111.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3401b099d4dadbb92ee3471be3ac9f5774684f1e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 18:50:08 +0900
Subject: [PATCH 06091/10326] Add some tests

---
 .../Gameplay/TestScenePoolingRuleset.cs       | 247 ++++++++++++++++++
 1 file changed, 247 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
new file mode 100644
index 0000000000..bb09aec416
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -0,0 +1,247 @@
+// Copyright (c) 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.Threading;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+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.UI;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestScenePoolingRuleset : OsuTestScene
+    {
+        private const double time_between_objects = 1000;
+
+        private TestDrawablePoolingRuleset drawableRuleset;
+
+        [Test]
+        public void TestReusedWithHitObjectsSpacedFarApart()
+        {
+            ManualClock clock = null;
+
+            createTest(new Beatmap
+            {
+                HitObjects =
+                {
+                    new HitObject(),
+                    new HitObject { StartTime = time_between_objects }
+                }
+            }, 1, () => new FramedClock(clock = new ManualClock()));
+
+            DrawableTestHitObject firstObject = null;
+            AddUntilStep("first object shown", () => this.ChildrenOfType<DrawableTestHitObject>().SingleOrDefault()?.HitObject == drawableRuleset.Beatmap.HitObjects[0]);
+            AddStep("get DHO", () => firstObject = this.ChildrenOfType<DrawableTestHitObject>().Single());
+
+            AddStep("fast forward to second object", () => clock.CurrentTime = drawableRuleset.Beatmap.HitObjects[1].StartTime);
+
+            AddUntilStep("second object shown", () => this.ChildrenOfType<DrawableTestHitObject>().SingleOrDefault()?.HitObject == drawableRuleset.Beatmap.HitObjects[1]);
+            AddAssert("DHO reused", () => this.ChildrenOfType<DrawableTestHitObject>().Single() == firstObject);
+        }
+
+        [Test]
+        public void TestNotReusedWithHitObjectsSpacedClose()
+        {
+            ManualClock clock = null;
+
+            createTest(new Beatmap
+            {
+                HitObjects =
+                {
+                    new HitObject(),
+                    new HitObject { StartTime = 250 }
+                }
+            }, 2, () => new FramedClock(clock = new ManualClock()));
+
+            AddStep("fast forward to second object", () => clock.CurrentTime = drawableRuleset.Beatmap.HitObjects[1].StartTime);
+
+            AddUntilStep("two DHOs shown", () => this.ChildrenOfType<DrawableTestHitObject>().Count() == 2);
+            AddAssert("DHOs have different hitobjects",
+                () => this.ChildrenOfType<DrawableTestHitObject>().ElementAt(0).HitObject != this.ChildrenOfType<DrawableTestHitObject>().ElementAt(1).HitObject);
+        }
+
+        [Test]
+        public void TestManyHitObjects()
+        {
+            var beatmap = new Beatmap();
+
+            for (int i = 0; i < 500; i++)
+                beatmap.HitObjects.Add(new HitObject { StartTime = i * 10 });
+
+            createTest(beatmap, 100);
+
+            AddUntilStep("any DHOs shown", () => this.ChildrenOfType<DrawableTestHitObject>().Any());
+            AddUntilStep("no DHOs shown", () => !this.ChildrenOfType<DrawableTestHitObject>().Any());
+        }
+
+        private void createTest(IBeatmap beatmap, int poolSize, Func<IFrameBasedClock> createClock = null) => AddStep("create test", () =>
+        {
+            var ruleset = new TestPoolingRuleset();
+
+            drawableRuleset = (TestDrawablePoolingRuleset)ruleset.CreateDrawableRulesetWith(CreateWorkingBeatmap(beatmap).GetPlayableBeatmap(ruleset.RulesetInfo));
+            drawableRuleset.FrameStablePlayback = true;
+            drawableRuleset.PoolSize = poolSize;
+
+            Child = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Clock = createClock?.Invoke() ?? new FramedOffsetClock(Clock, false) { Offset = -Clock.CurrentTime },
+                Child = drawableRuleset
+            };
+        });
+
+        #region Ruleset
+
+        private class TestPoolingRuleset : Ruleset
+        {
+            public override IEnumerable<Mod> GetModsFor(ModType type) => throw new NotImplementedException();
+
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new TestDrawablePoolingRuleset(this, beatmap, mods);
+
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new TestBeatmapConverter(beatmap, this);
+
+            public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => throw new NotImplementedException();
+
+            public override string Description { get; } = string.Empty;
+
+            public override string ShortName { get; } = string.Empty;
+        }
+
+        private class TestDrawablePoolingRuleset : DrawableRuleset<TestHitObject>
+        {
+            public int PoolSize;
+
+            public TestDrawablePoolingRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+                : base(ruleset, beatmap, mods)
+            {
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                RegisterPool<TestHitObject, DrawableTestHitObject>(PoolSize);
+            }
+
+            protected override bool PoolHitObjects => true;
+
+            protected override HitObjectLifetimeEntry CreateLifetimeEntry(TestHitObject hitObject) => new TestHitObjectLifetimeEntry(hitObject);
+
+            protected override PassThroughInputManager CreateInputManager() => new PassThroughInputManager();
+
+            protected override Playfield CreatePlayfield() => new TestPlayfield();
+
+            private class TestHitObjectLifetimeEntry : HitObjectLifetimeEntry
+            {
+                public TestHitObjectLifetimeEntry(HitObject hitObject)
+                    : base(hitObject)
+                {
+                }
+
+                protected override double InitialLifetimeOffset => 0;
+            }
+        }
+
+        private class TestPlayfield : Playfield
+        {
+            public TestPlayfield()
+            {
+                AddInternal(HitObjectContainer);
+            }
+
+            protected override GameplayCursorContainer CreateCursor() => null;
+        }
+
+        private class TestBeatmapConverter : BeatmapConverter<TestHitObject>
+        {
+            public TestBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
+                : base(beatmap, ruleset)
+            {
+            }
+
+            public override bool CanConvert() => true;
+
+            protected override IEnumerable<TestHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
+            {
+                yield return new TestHitObject
+                {
+                    StartTime = original.StartTime,
+                    Duration = 250
+                };
+            }
+        }
+
+        #endregion
+
+        #region HitObject
+
+        private class TestHitObject : ConvertHitObject
+        {
+            public double EndTime => StartTime + Duration;
+
+            public double Duration { get; set; }
+        }
+
+        private class DrawableTestHitObject : DrawableHitObject<TestHitObject>
+        {
+            public DrawableTestHitObject()
+                : base(null)
+            {
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                Position = new Vector2(RNG.Next(-200, 200), RNG.Next(-200, 200));
+                Size = new Vector2(50, 50);
+
+                Colour = new Color4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1f);
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                AddInternal(new Circle
+                {
+                    RelativeSizeAxes = Axes.Both,
+                });
+            }
+
+            protected override void CheckForResult(bool userTriggered, double timeOffset)
+            {
+                if (timeOffset > HitObject.Duration)
+                    ApplyResult(r => r.Type = r.Judgement.MaxResult);
+            }
+
+            protected override void UpdateHitStateTransforms(ArmedState state)
+            {
+                base.UpdateHitStateTransforms(state);
+
+                switch (state)
+                {
+                    case ArmedState.Hit:
+                    case ArmedState.Miss:
+                        this.FadeOut(250);
+                        break;
+                }
+            }
+        }
+
+        #endregion
+    }
+}

From 90499329bd10e75c81ff946f5195039f196ebdab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 18:50:38 +0900
Subject: [PATCH 06092/10326] Fix frame stable playback not being set correctly

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

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index f6cf836fe7..a36b66d62b 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.UI
             get => frameStablePlayback;
             set
             {
-                frameStablePlayback = false;
+                frameStablePlayback = value;
                 if (frameStabilityContainer != null)
                     frameStabilityContainer.FrameStablePlayback = value;
             }

From 7d020181343f942159ae21df57b3ca8d07aad9f6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 18:54:40 +0900
Subject: [PATCH 06093/10326] Remove some unnecessary implementations for now

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 32 +------------
 osu.Game/Rulesets/UI/Playfield.cs          | 55 ----------------------
 2 files changed, 1 insertion(+), 86 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 3a5e0b64ed..a0c95898be 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -41,32 +41,6 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> RevertResult;
 
-        /// <summary>
-        /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
-        /// </summary>
-        /// <remarks>
-        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
-        /// </remarks>
-        public event Action<HitObject> HitObjectUsageBegan;
-
-        /// <summary>
-        /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
-        /// </summary>
-        /// <remarks>
-        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
-        /// </remarks>
-        public event Action<HitObject> HitObjectUsageFinished;
-
-        /// <summary>
-        /// The amount of time prior to the current time within which <see cref="HitObject"/>s should be considered alive.
-        /// </summary>
-        public double PastLifetimeExtension { get; set; }
-
-        /// <summary>
-        /// The amount of time after the current time within which <see cref="HitObject"/>s should be considered alive.
-        /// </summary>
-        public double FutureLifetimeExtension { get; set; }
-
         private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> drawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
@@ -102,8 +76,6 @@ namespace osu.Game.Rulesets.UI
 
             bindStartTime(drawable);
             AddInternal(drawableMap[entry] = drawable, false);
-
-            HitObjectUsageBegan?.Invoke(entry.HitObject);
         }
 
         private void removeDrawable(HitObjectLifetimeEntry entry)
@@ -119,8 +91,6 @@ namespace osu.Game.Rulesets.UI
 
             unbindStartTime(drawable);
             RemoveInternal(drawable);
-
-            HitObjectUsageFinished?.Invoke(entry.HitObject);
         }
 
         #endregion
@@ -173,7 +143,7 @@ namespace osu.Game.Rulesets.UI
             unbindAllStartTimes();
         }
 
-        protected override bool CheckChildrenLife() => base.CheckChildrenLife() | lifetimeManager.Update(Time.Current - PastLifetimeExtension, Time.Current + FutureLifetimeExtension);
+        protected override bool CheckChildrenLife() => base.CheckChildrenLife() | lifetimeManager.Update(Time.Current, Time.Current);
 
         private void onNewResult(DrawableHitObject d, JudgementResult r) => NewResult?.Invoke(d, r);
         private void onRevertResult(DrawableHitObject d, JudgementResult r) => RevertResult?.Invoke(d, r);
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 2bd2bb9e06..cdaf9364af 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -29,22 +29,6 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> RevertResult;
 
-        /// <summary>
-        /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
-        /// </summary>
-        /// <remarks>
-        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
-        /// </remarks>
-        public event Action<HitObject> HitObjectUsageBegan;
-
-        /// <summary>
-        /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
-        /// </summary>
-        /// <remarks>
-        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
-        /// </remarks>
-        public event Action<HitObject> HitObjectUsageFinished;
-
         /// <summary>
         /// The <see cref="DrawableHitObject"/> contained in this Playfield.
         /// </summary>
@@ -104,8 +88,6 @@ namespace osu.Game.Rulesets.UI
             {
                 h.NewResult += (d, r) => NewResult?.Invoke(d, r);
                 h.RevertResult += (d, r) => RevertResult?.Invoke(d, r);
-                h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
-                h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
             }));
         }
 
@@ -198,41 +180,6 @@ namespace osu.Game.Rulesets.UI
         {
         }
 
-        /// <summary>
-        /// Sets whether to keep a given <see cref="HitObject"/> always alive within this or any nested <see cref="Playfield"/>.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to set.</param>
-        /// <param name="keepAlive">Whether to keep <paramref name="hitObject"/> always alive.</param>
-        public void SetKeepAlive(HitObject hitObject, bool keepAlive)
-        {
-            if (lifetimeEntryMap.TryGetValue(hitObject, out var entry))
-            {
-                entry.KeepAlive = keepAlive;
-                return;
-            }
-
-            if (!nestedPlayfields.IsValueCreated)
-                return;
-
-            foreach (var p in nestedPlayfields.Value)
-                p.SetKeepAlive(hitObject, keepAlive);
-        }
-
-        /// <summary>
-        /// Keeps all <see cref="HitObject"/>s alive within this and all nested <see cref="Playfield"/>s.
-        /// </summary>
-        public void KeepAllAlive()
-        {
-            foreach (var (_, entry) in lifetimeEntryMap)
-                entry.KeepAlive = true;
-
-            if (!nestedPlayfields.IsValueCreated)
-                return;
-
-            foreach (var p in nestedPlayfields.Value)
-                p.KeepAllAlive();
-        }
-
         /// <summary>
         /// The cursor currently being used by this <see cref="Playfield"/>. May be null if no cursor is provided.
         /// </summary>
@@ -258,8 +205,6 @@ namespace osu.Game.Rulesets.UI
 
             otherPlayfield.NewResult += (d, r) => NewResult?.Invoke(d, r);
             otherPlayfield.RevertResult += (d, r) => RevertResult?.Invoke(d, r);
-            otherPlayfield.HitObjectUsageBegan += h => HitObjectUsageBegan?.Invoke(h);
-            otherPlayfield.HitObjectUsageFinished += h => HitObjectUsageFinished?.Invoke(h);
 
             nestedPlayfields.Value.Add(otherPlayfield);
         }

From 606cfacedf959e08727c8e642a35ef83bf8cad96 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 19:01:12 +0900
Subject: [PATCH 06094/10326] Fix state update exception in a better way

---
 .../Objects/Drawables/Pieces/MainCirclePiece.cs       | 11 ++++++++---
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs   |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
index 98432eb4fe..bf2236c945 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
@@ -51,9 +51,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             var drawableOsuObject = (DrawableOsuHitObject)drawableObject;
 
             state.BindTo(drawableObject.State);
-            state.BindValueChanged(updateState, true);
-
             accentColour.BindTo(drawableObject.AccentColour);
+            indexInCurrentCombo.BindTo(drawableOsuObject.IndexInCurrentComboBindable);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            state.BindValueChanged(updateState, true);
             accentColour.BindValueChanged(colour =>
             {
                 explode.Colour = colour.NewValue;
@@ -61,7 +67,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 circle.Colour = colour.NewValue;
             }, true);
 
-            indexInCurrentCombo.BindTo(drawableOsuObject.IndexInCurrentComboBindable);
             indexInCurrentCombo.BindValueChanged(index => number.Text = (index.NewValue + 1).ToString(), true);
         }
 
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index bcf1103f39..244cf831c3 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -613,13 +613,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// The time at which state transforms should be applied that line up to <see cref="HitObject"/>'s StartTime.
         /// This is used to offset calls to <see cref="UpdateStateTransforms"/>.
         /// </summary>
-        public double StateUpdateTime => HitObject?.StartTime ?? 0;
+        public double StateUpdateTime => HitObject.StartTime;
 
         /// <summary>
         /// The time at which judgement dependent state transforms should be applied. This is equivalent of the (end) time of the object, in addition to any judgement offset.
         /// This is used to offset calls to <see cref="UpdateHitStateTransforms"/>.
         /// </summary>
-        public double HitStateUpdateTime => Result?.TimeAbsolute ?? HitObject?.GetEndTime() ?? 0;
+        public double HitStateUpdateTime => Result?.TimeAbsolute ?? HitObject.GetEndTime();
 
         /// <summary>
         /// Will be called at least once after this <see cref="DrawableHitObject"/> has become not alive.

From 7fdaf69903cc8158850c70523054f09551c26a4f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 19:12:12 +0900
Subject: [PATCH 06095/10326] Add some more xmldocs

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 28 +++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 1120f11df2..2c5fce3e86 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -526,6 +526,9 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public abstract void CancelResume();
 
+        private readonly Dictionary<Type, IDrawablePool> pools = new Dictionary<Type, IDrawablePool>();
+        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntries = new Dictionary<HitObject, HitObjectLifetimeEntry>();
+
         /// <summary>
         /// Whether this <see cref="DrawableRuleset"/> should retrieve pooled <see cref="DrawableHitObject"/>s.
         /// </summary>
@@ -534,8 +537,14 @@ namespace osu.Game.Rulesets.UI
         /// </remarks>
         protected virtual bool PoolHitObjects => false;
 
-        private readonly Dictionary<Type, IDrawablePool> pools = new Dictionary<Type, IDrawablePool>();
-
+        /// <summary>
+        /// Registers a <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
+        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetDrawableRepresentation"/>).
+        /// </summary>
+        /// <param name="initialSize">The number of drawables to be prepared for initial consumption.</param>
+        /// <param name="maximumSize">An optional maximum size after which the pool will no longer be expanded.</param>
+        /// <typeparam name="TObject">The <see cref="HitObject"/> type.</typeparam>
+        /// <typeparam name="TDrawable">The <see cref="DrawableHitObject"/> receiver for <typeparamref name="TObject"/>s.</typeparam>
         protected void RegisterPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
             where TObject : HitObject
             where TDrawable : DrawableHitObject, new()
@@ -582,10 +591,21 @@ namespace osu.Game.Rulesets.UI
             });
         }
 
+        /// <summary>
+        /// Creates the <see cref="HitObjectLifetimeEntry"/> for a given <see cref="HitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// This may be overridden to provide custom lifetime control (e.g. via <see cref="HitObjectLifetimeEntry.InitialLifetimeOffset"/>.
+        /// </remarks>
+        /// <param name="hitObject">The <see cref="HitObject"/> to create the entry for.</param>
+        /// <returns>The <see cref="HitObjectLifetimeEntry"/>.</returns>
         protected abstract HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject);
 
-        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntries = new Dictionary<HitObject, HitObjectLifetimeEntry>();
-
+        /// <summary>
+        /// Retrieves or creates the <see cref="HitObjectLifetimeEntry"/> for a given <see cref="HitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to retrieve or create the <see cref="HitObjectLifetimeEntry"/> for.</param>
+        /// <returns>The <see cref="HitObjectLifetimeEntry"/> for <paramref name="hitObject"/>.</returns>
         protected HitObjectLifetimeEntry GetLifetimeEntry(HitObject hitObject)
         {
             if (lifetimeEntries.TryGetValue(hitObject, out var entry))

From a8929b07644ab0c5d07a23c988c8497fb9c17477 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 19:27:07 +0900
Subject: [PATCH 06096/10326] Revert unnecessary change of casting

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index a0c95898be..12d78dac2b 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// All currently in-use <see cref="DrawableHitObject"/>s.
         /// </summary>
-        public IEnumerable<DrawableHitObject> Objects => InternalChildren.OfType<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
+        public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
         /// <summary>
         /// All currently in-use <see cref="DrawableHitObject"/>s that are alive.
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.UI
         /// <remarks>
         /// If this <see cref="HitObjectContainer"/> uses pooled objects, this is equivalent to <see cref="Objects"/>.
         /// </remarks>
-        public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.OfType<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
+        public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
         /// <summary>
         /// Invoked when a <see cref="DrawableHitObject"/> is judged.

From 85017a009428ecf9a3ee881a28b209ea1e07b207 Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Wed, 11 Nov 2020 20:20:29 +0100
Subject: [PATCH 06097/10326] Add test for accuracy heatmap to
 TestCaseStatisticsPanel

---
 .../Ranking/TestSceneStatisticsPanel.cs       | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index 8700fbeb42..6b0ff4b9c9 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -1,19 +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 System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking.Statistics;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneStatisticsPanel : OsuTestScene
     {
         [Test]
-        public void TestScoreWithStatistics()
+        public void TestScoreWithTimeStatistics()
         {
             var score = new TestScoreInfo(new OsuRuleset().RulesetInfo)
             {
@@ -23,6 +28,17 @@ namespace osu.Game.Tests.Visual.Ranking
             loadPanel(score);
         }
 
+        [Test]
+        public void TestScoreWithPositionStatistics()
+        {
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo)
+            {
+                HitEvents = CreatePositionDistributedHitEvents()
+            };
+
+            loadPanel(score);
+        }
+
         [Test]
         public void TestScoreWithoutStatistics()
         {
@@ -44,5 +60,24 @@ namespace osu.Game.Tests.Visual.Ranking
                 Score = { Value = score }
             };
         });
+
+        public static List<HitEvent> CreatePositionDistributedHitEvents()
+        {
+            var hitEvents = new List<HitEvent>();
+            // Use constant seed for reproducibility
+            var random = new Random(0);
+
+            for (int i = 0; i < 500; i++)
+            {
+                float angle = (float) random.NextDouble() * 2 * (float) Math.PI;
+                float radius = (float) random.NextDouble() * 0.5f * HitCircle.OBJECT_RADIUS;
+
+                Vector2 position = new Vector2(radius * (float) Math.Cos(angle), radius * (float) Math.Sin(angle));
+
+                hitEvents.Add(new HitEvent(0, HitResult.Perfect, new HitCircle(), new HitCircle(), position));
+            }
+
+            return hitEvents;
+        }
     }
 }

From 8341d3ad741f0e7e47d86f76c0566981b241d632 Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Wed, 11 Nov 2020 21:52:43 +0100
Subject: [PATCH 06098/10326] Fix formatting

---
 osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index 6b0ff4b9c9..3185b782db 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -69,10 +69,10 @@ namespace osu.Game.Tests.Visual.Ranking
 
             for (int i = 0; i < 500; i++)
             {
-                float angle = (float) random.NextDouble() * 2 * (float) Math.PI;
-                float radius = (float) random.NextDouble() * 0.5f * HitCircle.OBJECT_RADIUS;
+                float angle = (float)random.NextDouble() * 2 * (float)Math.PI;
+                float radius = (float)random.NextDouble() * 0.5f * HitCircle.OBJECT_RADIUS;
 
-                Vector2 position = new Vector2(radius * (float) Math.Cos(angle), radius * (float) Math.Sin(angle));
+                Vector2 position = new Vector2(radius * (float)Math.Cos(angle), radius * (float)Math.Sin(angle));
 
                 hitEvents.Add(new HitEvent(0, HitResult.Perfect, new HitCircle(), new HitCircle(), position));
             }

From 423f0fbda74313fdef0a8c97691111826895bce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Nov 2020 22:37:15 +0100
Subject: [PATCH 06099/10326] Reference constant through base class

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

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index 3185b782db..89a82b01a8 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual.Ranking
             for (int i = 0; i < 500; i++)
             {
                 float angle = (float)random.NextDouble() * 2 * (float)Math.PI;
-                float radius = (float)random.NextDouble() * 0.5f * HitCircle.OBJECT_RADIUS;
+                float radius = (float)random.NextDouble() * 0.5f * OsuHitObject.OBJECT_RADIUS;
 
                 Vector2 position = new Vector2(radius * (float)Math.Cos(angle), radius * (float)Math.Sin(angle));
 

From 1984a9f70d6e6c17f4d547ffac091b74ccddc9e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Nov 2020 22:40:52 +0100
Subject: [PATCH 06100/10326] Reduce amount of casting

---
 osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index 89a82b01a8..e92ae7c538 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -69,10 +69,10 @@ namespace osu.Game.Tests.Visual.Ranking
 
             for (int i = 0; i < 500; i++)
             {
-                float angle = (float)random.NextDouble() * 2 * (float)Math.PI;
-                float radius = (float)random.NextDouble() * 0.5f * OsuHitObject.OBJECT_RADIUS;
+                double angle = random.NextDouble() * 2 * Math.PI;
+                double radius = random.NextDouble() * 0.5f * OsuHitObject.OBJECT_RADIUS;
 
-                Vector2 position = new Vector2(radius * (float)Math.Cos(angle), radius * (float)Math.Sin(angle));
+                var position = new Vector2((float)(radius * Math.Cos(angle)), (float)(radius * Math.Sin(angle)));
 
                 hitEvents.Add(new HitEvent(0, HitResult.Perfect, new HitCircle(), new HitCircle(), position));
             }

From 1426530496bf7b1d9ec35a365a30fdf2839c7356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Nov 2020 22:41:25 +0100
Subject: [PATCH 06101/10326] Make method private

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

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index e92ae7c538..d91aec753c 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             var score = new TestScoreInfo(new OsuRuleset().RulesetInfo)
             {
-                HitEvents = CreatePositionDistributedHitEvents()
+                HitEvents = createPositionDistributedHitEvents()
             };
 
             loadPanel(score);
@@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual.Ranking
             };
         });
 
-        public static List<HitEvent> CreatePositionDistributedHitEvents()
+        private static List<HitEvent> createPositionDistributedHitEvents()
         {
             var hitEvents = new List<HitEvent>();
             // Use constant seed for reproducibility

From f753f138c6bb3df154e109d30ee6bbbaaa841257 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 12 Nov 2020 03:11:29 +0300
Subject: [PATCH 06102/10326] Add counter to most played beatmaps section in
 user overlay

---
 .../Historical/PaginatedMostPlayedBeatmapContainer.cs         | 4 +++-
 osu.Game/Users/User.cs                                        | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index 8f19cd900c..556f3139dd 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     public class PaginatedMostPlayedBeatmapContainer : PaginatedContainer<APIUserMostPlayedBeatmap>
     {
         public PaginatedMostPlayedBeatmapContainer(Bindable<User> user)
-            : base(user, "Most Played Beatmaps", "No records. :(")
+            : base(user, "Most Played Beatmaps", "No records. :(", CounterVisibilityState.AlwaysVisible)
         {
             ItemsPerPage = 5;
         }
@@ -27,6 +27,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             ItemsContainer.Direction = FillDirection.Vertical;
         }
 
+        protected override int GetCount(User user) => user.BeatmapPlaycountsCount;
+
         protected override APIRequest<List<APIUserMostPlayedBeatmap>> CreateRequest() =>
             new GetUserMostPlayedBeatmapsRequest(User.Value.Id, VisiblePages++, ItemsPerPage);
 
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 2a76a963e1..d7e78d5b35 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -144,6 +144,9 @@ namespace osu.Game.Users
         [JsonProperty(@"scores_first_count")]
         public int ScoresFirstCount;
 
+        [JsonProperty(@"beatmap_playcounts_count")]
+        public int BeatmapPlaycountsCount;
+
         [JsonProperty]
         private string[] playstyle
         {

From ad79c2bc6286c377dd2c8757abb7fa18a7f81454 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Nov 2020 10:55:22 +0900
Subject: [PATCH 06103/10326] Avoid multiple enumeration by converting to array
 at construction time

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

diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 8fcea7c277..9afe87f74f 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -20,7 +20,7 @@ namespace osu.Game
     internal class PerformFromMenuRunner : Component
     {
         private readonly Action<IScreen> finalAction;
-        private readonly IEnumerable<Type> validScreens;
+        private readonly Type[] validScreens;
         private readonly Func<IScreen> getCurrentScreen;
 
         [Resolved]
@@ -53,7 +53,7 @@ namespace osu.Game
             validScreens = validScreens.Append(typeof(MainMenu));
 
             this.finalAction = finalAction;
-            this.validScreens = validScreens;
+            this.validScreens = validScreens.ToArray();
             this.getCurrentScreen = getCurrentScreen;
 
             Scheduler.Add(task = new ScheduledDelegate(checkCanComplete, 0, 200));

From d7d77460fb80e8a6d8989297621df505b9b552e7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 12:55:42 +0900
Subject: [PATCH 06104/10326] Small refactorings

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs    | 15 ++++++++++++++-
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 10 ++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 2c5fce3e86..1a00346d6a 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -233,6 +233,13 @@ namespace osu.Game.Rulesets.UI
             ResumeOverlay?.Hide();
         }
 
+        /// <summary>
+        /// Adds a <see cref="HitObject"/> to this <see cref="DrawableRuleset"/>.
+        /// </summary>
+        /// <remarks>
+        /// This does not add the <see cref="HitObject"/> to the beatmap.
+        /// </remarks>
+        /// <param name="hitObject">The <see cref="HitObject"/> to add.</param>
         public void AddHitObject(TObject hitObject)
         {
             if (PoolHitObjects)
@@ -241,6 +248,13 @@ namespace osu.Game.Rulesets.UI
                 Playfield.Add(CreateDrawableRepresentation(hitObject));
         }
 
+        /// <summary>
+        /// Removes a <see cref="HitObject"/> from this <see cref="HitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// This does not remove the <see cref="HitObject"/> from the beatmap.
+        /// </remarks>
+        /// <param name="hitObject">The <see cref="HitObject"/> to remove.</param>
         public void RemoveHitObject(TObject hitObject)
         {
             if (PoolHitObjects)
@@ -380,7 +394,6 @@ namespace osu.Game.Rulesets.UI
     /// Displays an interactive ruleset gameplay instance.
     /// <remarks>
     /// This type is required only for adding non-generic type to the draw hierarchy.
-    /// Once IDrawable is a thing, this can also become an interface.
     /// </remarks>
     /// </summary>
     [Cached(typeof(DrawableRuleset))]
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 12d78dac2b..ff358e2e75 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -100,10 +100,11 @@ namespace osu.Game.Rulesets.UI
         public virtual void Add(DrawableHitObject hitObject)
         {
             bindStartTime(hitObject);
-            AddInternal(hitObject);
 
             hitObject.OnNewResult += onNewResult;
             hitObject.OnRevertResult += onRevertResult;
+
+            AddInternal(hitObject);
         }
 
         public virtual bool Remove(DrawableHitObject hitObject)
@@ -143,7 +144,12 @@ namespace osu.Game.Rulesets.UI
             unbindAllStartTimes();
         }
 
-        protected override bool CheckChildrenLife() => base.CheckChildrenLife() | lifetimeManager.Update(Time.Current, Time.Current);
+        protected override bool CheckChildrenLife()
+        {
+            bool aliveChanged = base.CheckChildrenLife();
+            aliveChanged |= lifetimeManager.Update(Time.Current, Time.Current);
+            return aliveChanged;
+        }
 
         private void onNewResult(DrawableHitObject d, JudgementResult r) => NewResult?.Invoke(d, r);
         private void onRevertResult(DrawableHitObject d, JudgementResult r) => RevertResult?.Invoke(d, r);

From f652eb9982b5047dad23f91ed5fb6098d593ca39 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 13:18:44 +0900
Subject: [PATCH 06105/10326] Remove GetDrawableRepresentation() override, add
 null hinting

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs    | 21 +++++++++++----------
 osu.Game/Rulesets/UI/HitObjectContainer.cs |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 1a00346d6a..357f2d27d9 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -314,9 +314,6 @@ namespace osu.Game.Rulesets.UI
             }
         }
 
-        public sealed override DrawableHitObject GetDrawableRepresentation(HitObject hitObject)
-            => base.GetDrawableRepresentation(hitObject) ?? CreateDrawableRepresentation((TObject)hitObject);
-
         /// <summary>
         /// Creates a DrawableHitObject from a HitObject.
         /// </summary>
@@ -552,7 +549,7 @@ namespace osu.Game.Rulesets.UI
 
         /// <summary>
         /// Registers a <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
-        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetDrawableRepresentation"/>).
+        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetPooledDrawableRepresentation"/>).
         /// </summary>
         /// <param name="initialSize">The number of drawables to be prepared for initial consumption.</param>
         /// <param name="maximumSize">An optional maximum size after which the pool will no longer be expanded.</param>
@@ -574,16 +571,18 @@ namespace osu.Game.Rulesets.UI
         /// <param name="maximumSize">An optional maximum size after which the pool will no longer be expanded.</param>
         /// <typeparam name="TDrawable">The type of <see cref="DrawableHitObject"/> retrievable from this pool.</typeparam>
         /// <returns>The <see cref="DrawablePool{T}"/>.</returns>
+        [NotNull]
         protected virtual DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
             where TDrawable : DrawableHitObject, new()
             => new DrawablePool<TDrawable>(initialSize, maximumSize);
 
         /// <summary>
-        /// Retrieves the drawable representation of a <see cref="HitObject"/>.
+        /// Attempts to retrieve the poolable <see cref="DrawableHitObject"/> representation of a <see cref="HitObject"/>.
         /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to retrieve the drawable representation of.</param>
-        /// <returns>The <see cref="DrawableHitObject"/> representing <see cref="HitObject"/>.</returns>
-        public virtual DrawableHitObject GetDrawableRepresentation(HitObject hitObject)
+        /// <param name="hitObject">The <see cref="HitObject"/> to retrieve the <see cref="DrawableHitObject"/> representation of.</param>
+        /// <returns>The <see cref="DrawableHitObject"/> representing <see cref="HitObject"/>, or <c>null</c> if no poolable representation exists.</returns>
+        [CanBeNull]
+        public DrawableHitObject GetPooledDrawableRepresentation([NotNull] HitObject hitObject)
         {
             if (!pools.TryGetValue(hitObject.GetType(), out var pool))
                 return null;
@@ -612,14 +611,16 @@ namespace osu.Game.Rulesets.UI
         /// </remarks>
         /// <param name="hitObject">The <see cref="HitObject"/> to create the entry for.</param>
         /// <returns>The <see cref="HitObjectLifetimeEntry"/>.</returns>
-        protected abstract HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject);
+        [NotNull]
+        protected abstract HitObjectLifetimeEntry CreateLifetimeEntry([NotNull] HitObject hitObject);
 
         /// <summary>
         /// Retrieves or creates the <see cref="HitObjectLifetimeEntry"/> for a given <see cref="HitObject"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to retrieve or create the <see cref="HitObjectLifetimeEntry"/> for.</param>
         /// <returns>The <see cref="HitObjectLifetimeEntry"/> for <paramref name="hitObject"/>.</returns>
-        protected HitObjectLifetimeEntry GetLifetimeEntry(HitObject hitObject)
+        [NotNull]
+        protected HitObjectLifetimeEntry GetLifetimeEntry([NotNull] HitObject hitObject)
         {
             if (lifetimeEntries.TryGetValue(hitObject, out var entry))
                 return entry;
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index ff358e2e75..d55288b978 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.UI
         {
             Debug.Assert(!drawableMap.ContainsKey(entry));
 
-            var drawable = drawableRuleset.GetDrawableRepresentation(entry.HitObject);
+            var drawable = drawableRuleset.GetPooledDrawableRepresentation(entry.HitObject);
             drawable.OnNewResult += onNewResult;
             drawable.OnRevertResult += onRevertResult;
 

From 5dbbe11fc668b3a54ae2be4a190479ec5aa42126 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 14:04:16 +0900
Subject: [PATCH 06106/10326] Remove PoolHitObjects, use return value of
 CreateDrawableRepresentation() instead

---
 .../Gameplay/TestScenePoolingRuleset.cs       |  2 -
 osu.Game/Rulesets/UI/DrawableRuleset.cs       | 49 +++++++++++--------
 osu.Game/Rulesets/UI/Playfield.cs             | 22 ++++++---
 3 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
index bb09aec416..c3ae753eae 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -140,8 +140,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                 RegisterPool<TestHitObject, DrawableTestHitObject>(PoolSize);
             }
 
-            protected override bool PoolHitObjects => true;
-
             protected override HitObjectLifetimeEntry CreateLifetimeEntry(TestHitObject hitObject) => new TestHitObjectLifetimeEntry(hitObject);
 
             protected override PassThroughInputManager CreateInputManager() => new PassThroughInputManager();
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 357f2d27d9..ce4cef4977 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -242,29 +242,38 @@ namespace osu.Game.Rulesets.UI
         /// <param name="hitObject">The <see cref="HitObject"/> to add.</param>
         public void AddHitObject(TObject hitObject)
         {
-            if (PoolHitObjects)
-                Playfield.Add(GetLifetimeEntry(hitObject));
+            var drawableRepresentation = CreateDrawableRepresentation(hitObject);
+
+            // If a drawable representation exists, use it, otherwise assume the hitobject is being pooled.
+            if (drawableRepresentation != null)
+                Playfield.Add(drawableRepresentation);
             else
-                Playfield.Add(CreateDrawableRepresentation(hitObject));
+                Playfield.Add(GetLifetimeEntry(hitObject));
         }
 
         /// <summary>
-        /// Removes a <see cref="HitObject"/> from this <see cref="HitObject"/>.
+        /// Removes a <see cref="HitObject"/> from this <see cref="DrawableRuleset"/>.
         /// </summary>
         /// <remarks>
         /// This does not remove the <see cref="HitObject"/> from the beatmap.
         /// </remarks>
         /// <param name="hitObject">The <see cref="HitObject"/> to remove.</param>
-        public void RemoveHitObject(TObject hitObject)
+        public bool RemoveHitObject(TObject hitObject)
         {
-            if (PoolHitObjects)
-                Playfield.Remove(GetLifetimeEntry(hitObject));
-            else
-            {
-                var drawableObject = Playfield.AllHitObjects.SingleOrDefault(d => d.HitObject == hitObject);
-                if (drawableObject != null)
-                    Playfield.Remove(drawableObject);
-            }
+            var entry = GetLifetimeEntry(hitObject);
+
+            // May have been newly-created by the above call - remove it anyway.
+            RemoveLifetimeEntry(hitObject);
+
+            if (Playfield.Remove(entry))
+                return true;
+
+            // If the entry was not removed from the playfield, assume the hitobject is not being pooled and attempt a direct removal.
+            var drawableObject = Playfield.AllHitObjects.SingleOrDefault(d => d.HitObject == hitObject);
+            if (drawableObject != null)
+                return Playfield.Remove(drawableObject);
+
+            return false;
         }
 
         protected sealed override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject)
@@ -539,14 +548,6 @@ namespace osu.Game.Rulesets.UI
         private readonly Dictionary<Type, IDrawablePool> pools = new Dictionary<Type, IDrawablePool>();
         private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntries = new Dictionary<HitObject, HitObjectLifetimeEntry>();
 
-        /// <summary>
-        /// Whether this <see cref="DrawableRuleset"/> should retrieve pooled <see cref="DrawableHitObject"/>s.
-        /// </summary>
-        /// <remarks>
-        /// Pools must be registered with this <see cref="DrawableRuleset"/> via <see cref="RegisterPool{TObject,TDrawable}"/> in order for <see cref="DrawableHitObject"/>s to be retrieved.
-        /// </remarks>
-        protected virtual bool PoolHitObjects => false;
-
         /// <summary>
         /// Registers a <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
         /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetPooledDrawableRepresentation"/>).
@@ -627,6 +628,12 @@ namespace osu.Game.Rulesets.UI
 
             return lifetimeEntries[hitObject] = CreateLifetimeEntry(hitObject);
         }
+
+        /// <summary>
+        /// Removes the <see cref="HitObjectLifetimeEntry"/> for a <see cref="HitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to remove the <see cref="HitObjectLifetimeEntry"/> for.</param>
+        internal void RemoveLifetimeEntry([NotNull] HitObject hitObject) => lifetimeEntries.Remove(hitObject);
     }
 
     public class BeatmapInvalidForRulesetException : ArgumentException
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index cdaf9364af..7c47f046dc 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.UI
         private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
 
         /// <summary>
-        /// Adds a <see cref="HitObject"/> to this <see cref="Playfield"/>.
+        /// Adds a <see cref="HitObjectLifetimeEntry"/> for a pooled <see cref="HitObject"/> to this <see cref="Playfield"/>.
         /// </summary>
         /// <param name="entry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the <see cref="HitObject"/>.</param>
         public void Add(HitObjectLifetimeEntry entry)
@@ -154,14 +154,24 @@ namespace osu.Game.Rulesets.UI
         }
 
         /// <summary>
-        /// Removes a <see cref="HitObject"/> to this <see cref="Playfield"/>.
+        /// Removes a <see cref="HitObjectLifetimeEntry"/> for a pooled <see cref="HitObject"/> from this <see cref="Playfield"/>.
         /// </summary>
         /// <param name="entry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the <see cref="HitObject"/>.</param>
-        public void Remove(HitObjectLifetimeEntry entry)
+        /// <returns>Whether the <see cref="HitObject"/> was successfully removed.</returns>
+        public bool Remove(HitObjectLifetimeEntry entry)
         {
-            if (HitObjectContainer.Remove(entry))
-                OnHitObjectRemoved(entry.HitObject);
-            lifetimeEntryMap.Remove(entry.HitObject);
+            if (lifetimeEntryMap.Remove(entry.HitObject))
+            {
+                HitObjectContainer.Remove(entry);
+                return true;
+            }
+
+            bool removedFromNested = false;
+
+            if (nestedPlayfields.IsValueCreated)
+                removedFromNested = nestedPlayfields.Value.Any(p => p.Remove(entry));
+
+            return removedFromNested;
         }
 
         /// <summary>

From 1f8d376b85d28a2dbdc5ff373e1ebecb99307c32 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 14:17:12 +0900
Subject: [PATCH 06107/10326] Replace CreatePool() with non-virtual
 RegisterPool() overload

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index ce4cef4977..983667a4dd 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -559,24 +559,23 @@ namespace osu.Game.Rulesets.UI
         protected void RegisterPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
             where TObject : HitObject
             where TDrawable : DrawableHitObject, new()
+            => RegisterPool<TObject, TDrawable>(new DrawablePool<TDrawable>(initialSize, maximumSize));
+
+        /// <summary>
+        /// Registers a <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
+        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetPooledDrawableRepresentation"/>).
+        /// </summary>
+        /// <param name="pool">The <see cref="DrawablePool{T}"/> to register.</param>
+        /// <typeparam name="TObject">The <see cref="HitObject"/> type.</typeparam>
+        /// <typeparam name="TDrawable">The <see cref="DrawableHitObject"/> receiver for <typeparamref name="TObject"/>s.</typeparam>
+        protected void RegisterPool<TObject, TDrawable>([NotNull] DrawablePool<TDrawable> pool)
+            where TObject : HitObject
+            where TDrawable : DrawableHitObject, new()
         {
-            var pool = CreatePool<TDrawable>(initialSize, maximumSize);
             pools[typeof(TObject)] = pool;
             AddInternal(pool);
         }
 
-        /// <summary>
-        /// Creates the <see cref="DrawablePool{T}"/> to retrieve <see cref="DrawableHitObject"/>s of the given type from.
-        /// </summary>
-        /// <param name="initialSize">The number of hitobject to be prepared for initial consumption.</param>
-        /// <param name="maximumSize">An optional maximum size after which the pool will no longer be expanded.</param>
-        /// <typeparam name="TDrawable">The type of <see cref="DrawableHitObject"/> retrievable from this pool.</typeparam>
-        /// <returns>The <see cref="DrawablePool{T}"/>.</returns>
-        [NotNull]
-        protected virtual DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
-            where TDrawable : DrawableHitObject, new()
-            => new DrawablePool<TDrawable>(initialSize, maximumSize);
-
         /// <summary>
         /// Attempts to retrieve the poolable <see cref="DrawableHitObject"/> representation of a <see cref="HitObject"/>.
         /// </summary>

From 16e4e8d032dc44dc97f606922879114e4299ff43 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 14:54:33 +0900
Subject: [PATCH 06108/10326] Fix possible nullref

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index d55288b978..7315ce61e7 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Performance;
@@ -71,6 +72,9 @@ namespace osu.Game.Rulesets.UI
             Debug.Assert(!drawableMap.ContainsKey(entry));
 
             var drawable = drawableRuleset.GetPooledDrawableRepresentation(entry.HitObject);
+            if (drawable == null)
+                throw new InvalidOperationException($"A drawable representation could not be retrieved for hitobject type: {entry.HitObject.GetType().ReadableName()}.");
+
             drawable.OnNewResult += onNewResult;
             drawable.OnRevertResult += onRevertResult;
 

From 653f5bce676d70ff2ef63e435f618dc039864102 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 15:00:58 +0900
Subject: [PATCH 06109/10326] Reword xmldocs

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 983667a4dd..0429936d8e 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -549,11 +549,15 @@ namespace osu.Game.Rulesets.UI
         private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntries = new Dictionary<HitObject, HitObjectLifetimeEntry>();
 
         /// <summary>
-        /// Registers a <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
+        /// Registers a default <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
         /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetPooledDrawableRepresentation"/>).
         /// </summary>
-        /// <param name="initialSize">The number of drawables to be prepared for initial consumption.</param>
-        /// <param name="maximumSize">An optional maximum size after which the pool will no longer be expanded.</param>
+        /// <param name="initialSize">The number of <see cref="DrawableHitObject"/>s to be initially stored in the pool.</param>
+        /// <param name="maximumSize">
+        /// The maximum number of <see cref="DrawableHitObject"/>s that can be stored in the pool.
+        /// If this limit is exceeded, every subsequent <see cref="DrawableHitObject"/> will be created anew instead of being retrieved from the pool,
+        /// until some of the existing <see cref="DrawableHitObject"/>s are returned to the pool.
+        /// </param>
         /// <typeparam name="TObject">The <see cref="HitObject"/> type.</typeparam>
         /// <typeparam name="TDrawable">The <see cref="DrawableHitObject"/> receiver for <typeparamref name="TObject"/>s.</typeparam>
         protected void RegisterPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
@@ -562,7 +566,7 @@ namespace osu.Game.Rulesets.UI
             => RegisterPool<TObject, TDrawable>(new DrawablePool<TDrawable>(initialSize, maximumSize));
 
         /// <summary>
-        /// Registers a <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
+        /// Registers a custom <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
         /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetPooledDrawableRepresentation"/>).
         /// </summary>
         /// <param name="pool">The <see cref="DrawablePool{T}"/> to register.</param>

From 4e4323595557813493ad09bd2e1175269fe59f0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 15:33:49 +0900
Subject: [PATCH 06110/10326] Fix double bind leading to test failures

---
 osu.Game/Rulesets/UI/Playfield.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 7c47f046dc..9df3bb10ce 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -120,10 +120,6 @@ namespace osu.Game.Rulesets.UI
         public virtual void Add(DrawableHitObject h)
         {
             HitObjectContainer.Add(h);
-
-            h.OnNewResult += (d, r) => NewResult?.Invoke(d, r);
-            h.OnRevertResult += (d, r) => RevertResult?.Invoke(d, r);
-
             OnHitObjectAdded(h.HitObject);
         }
 

From 72a6b756268f4e6218814a706d3dfb84f266b1e8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 15:34:51 +0900
Subject: [PATCH 06111/10326] Add back removed event

---
 osu.Game/Rulesets/UI/Playfield.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 9df3bb10ce..5e5d17a400 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -159,6 +159,7 @@ namespace osu.Game.Rulesets.UI
             if (lifetimeEntryMap.Remove(entry.HitObject))
             {
                 HitObjectContainer.Remove(entry);
+                OnHitObjectRemoved(entry.HitObject);
                 return true;
             }
 

From 974390bda77d551107cb4f08baa63c1a8c8ae1d3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 15:35:58 +0900
Subject: [PATCH 06112/10326] Make Add() + Remove() virtual

---
 osu.Game/Rulesets/UI/Playfield.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 5e5d17a400..d1cb8ecbbd 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Rulesets.UI
         /// Adds a <see cref="HitObjectLifetimeEntry"/> for a pooled <see cref="HitObject"/> to this <see cref="Playfield"/>.
         /// </summary>
         /// <param name="entry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the <see cref="HitObject"/>.</param>
-        public void Add(HitObjectLifetimeEntry entry)
+        public virtual void Add(HitObjectLifetimeEntry entry)
         {
             HitObjectContainer.Add(entry);
             lifetimeEntryMap[entry.HitObject] = entry;
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         /// <param name="entry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the <see cref="HitObject"/>.</param>
         /// <returns>Whether the <see cref="HitObject"/> was successfully removed.</returns>
-        public bool Remove(HitObjectLifetimeEntry entry)
+        public virtual bool Remove(HitObjectLifetimeEntry entry)
         {
             if (lifetimeEntryMap.Remove(entry.HitObject))
             {

From 39d37c4779b82c1069a1cc89b4d0342ceb34b686 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 15:24:45 +0900
Subject: [PATCH 06113/10326] Add support for nested hitobject pooling

---
 .../Objects/Drawables/DrawableHitObject.cs     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 244cf831c3..2dba83f2be 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -19,6 +19,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.UI;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Drawables
@@ -126,6 +127,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         [CanBeNull]
         private HitObjectLifetimeEntry lifetimeEntry;
 
+        [Resolved(CanBeNull = true)]
+        private DrawableRuleset drawableRuleset { get; set; }
+
         /// <summary>
         /// Creates a new <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -195,7 +199,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             foreach (var h in HitObject.NestedHitObjects)
             {
-                var drawableNested = CreateNestedHitObject(h) ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
+                var drawableNested = drawableRuleset?.GetPooledDrawableRepresentation(h)
+                                     ?? CreateNestedHitObject(h)
+                                     ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
 
                 drawableNested.OnNewResult += onNewResult;
                 drawableNested.OnRevertResult += onRevertResult;
@@ -203,6 +209,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
                 nestedHitObjects.Value.Add(drawableNested);
                 AddNestedHitObject(drawableNested);
+
+                drawableNested.OnParentReceived(this);
             }
 
             StartTimeBindable.BindTo(HitObject.StartTimeBindable);
@@ -291,6 +299,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
         }
 
+        /// <summary>
+        /// Invoked when this <see cref="DrawableHitObject"/> receives a new parenting <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <param name="parent">The parenting <see cref="DrawableHitObject"/>.</param>
+        protected virtual void OnParentReceived(DrawableHitObject parent)
+        {
+        }
+
         /// <summary>
         /// Invoked by the base <see cref="DrawableHitObject"/> to populate samples, once on initial load and potentially again on any change to the samples collection.
         /// </summary>

From bf72961959c081ca9254b4183cf19e85a89c845c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 00:22:06 +0900
Subject: [PATCH 06114/10326] Add top-level osu! hitobject pooling

---
 .../Objects/Drawables/DrawableHitCircle.cs    |  5 ++
 .../Objects/Drawables/DrawableSlider.cs       |  5 ++
 .../Objects/Drawables/DrawableSpinner.cs      |  5 ++
 .../UI/DrawableOsuRuleset.cs                  | 48 ++++++++++-------
 osu.Game.Rulesets.Osu/UI/OsuDrawablePool.cs   | 33 ++++++++++++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      | 54 ++++++++++---------
 6 files changed, 108 insertions(+), 42 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/UI/OsuDrawablePool.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 77d24db084..2e63160d36 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -31,6 +31,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Container scaleContainer;
         private InputManager inputManager;
 
+        public DrawableHitCircle()
+            : this(null)
+        {
+        }
+
         public DrawableHitCircle([CanBeNull] HitCircle h = null)
             : base(h)
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 3f91a31066..05e4587307 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -41,6 +41,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Container<DrawableSliderTick> tickContainer;
         private Container<DrawableSliderRepeat> repeatContainer;
 
+        public DrawableSlider()
+            : this(null)
+        {
+        }
+
         public DrawableSlider([CanBeNull] Slider s = null)
             : base(s)
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index eb125969b0..f04a914fe3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -33,6 +33,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Bindable<bool> isSpinning;
         private bool spinnerFrequencyModulate;
 
+        public DrawableSpinner()
+            : this(null)
+        {
+        }
+
         public DrawableSpinner([CanBeNull] Spinner s = null)
             : base(s)
         {
diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index b2299398e1..1c119e2e95 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -4,12 +4,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -24,11 +26,28 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         protected new OsuRulesetConfigManager Config => (OsuRulesetConfigManager)base.Config;
 
+        public new OsuPlayfield Playfield => (OsuPlayfield)base.Playfield;
+
         public DrawableOsuRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)
         {
         }
 
+        protected override bool PoolHitObjects => true;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RegisterPool<HitCircle, DrawableHitCircle>(10, 100);
+            RegisterPool<Slider, DrawableSlider>(10, 100);
+            RegisterPool<Spinner, DrawableSpinner>(2, 20);
+        }
+
+        protected override DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
+            => new OsuDrawablePool<TDrawable>(Playfield.CheckHittable, Playfield.OnHitObjectLoaded, initialSize, maximumSize);
+
+        protected override HitObjectLifetimeEntry CreateLifetimeEntry(OsuHitObject hitObject) => new OsuHitObjectLifetimeEntry(hitObject);
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true; // always show the gameplay cursor
 
         protected override Playfield CreatePlayfield() => new OsuPlayfield();
@@ -39,23 +58,6 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override ResumeOverlay CreateResumeOverlay() => new OsuResumeOverlay();
 
-        public override DrawableHitObject<OsuHitObject> CreateDrawableRepresentation(OsuHitObject h)
-        {
-            switch (h)
-            {
-                case HitCircle circle:
-                    return new DrawableHitCircle(circle);
-
-                case Slider slider:
-                    return new DrawableSlider(slider);
-
-                case Spinner spinner:
-                    return new DrawableSpinner(spinner);
-            }
-
-            return null;
-        }
-
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new OsuFramedReplayInputHandler(replay);
 
         protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new OsuReplayRecorder(replay);
@@ -70,5 +72,15 @@ namespace osu.Game.Rulesets.Osu.UI
                 return 0;
             }
         }
+
+        private class OsuHitObjectLifetimeEntry : HitObjectLifetimeEntry
+        {
+            public OsuHitObjectLifetimeEntry(HitObject hitObject)
+                : base(hitObject)
+            {
+            }
+
+            protected override double InitialLifetimeOffset => ((OsuHitObject)HitObject).TimePreempt;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuDrawablePool.cs b/osu.Game.Rulesets.Osu/UI/OsuDrawablePool.cs
new file mode 100644
index 0000000000..148146f25a
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/OsuDrawablePool.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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Pooling;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    public class OsuDrawablePool<T> : DrawablePool<T>
+        where T : DrawableHitObject, new()
+    {
+        private readonly Func<DrawableHitObject, double, bool> checkHittable;
+        private readonly Action<Drawable> onLoaded;
+
+        public OsuDrawablePool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null)
+            : base(initialSize, maximumSize)
+        {
+            this.checkHittable = checkHittable;
+            this.onLoaded = onLoaded;
+        }
+
+        protected override T CreateNewDrawable() => base.CreateNewDrawable().With(o =>
+        {
+            var osuObject = (DrawableOsuHitObject)(object)o;
+
+            osuObject.CheckHittable = checkHittable;
+            osuObject.OnLoadComplete += onLoaded;
+        });
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 321eeeab65..5d59a6ff38 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Configuration;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -26,6 +27,8 @@ namespace osu.Game.Rulesets.Osu.UI
 {
     public class OsuPlayfield : Playfield
     {
+        public readonly Func<DrawableHitObject, double, bool> CheckHittable;
+
         private readonly PlayfieldBorder playfieldBorder;
         private readonly ProxyContainer approachCircles;
         private readonly ProxyContainer spinnerProxies;
@@ -78,6 +81,7 @@ namespace osu.Game.Rulesets.Osu.UI
             };
 
             hitPolicy = new OrderedHitPolicy(HitObjectContainer);
+            CheckHittable = hitPolicy.IsHittable;
 
             var hitWindows = new OsuHitWindows();
 
@@ -85,6 +89,8 @@ namespace osu.Game.Rulesets.Osu.UI
                 poolDictionary.Add(result, new DrawableJudgementPool(result));
 
             AddRangeInternal(poolDictionary.Values);
+
+            NewResult += onNewResult;
         }
 
         [BackgroundDependencyLoader(true)]
@@ -93,37 +99,37 @@ namespace osu.Game.Rulesets.Osu.UI
             config?.BindWith(OsuRulesetSetting.PlayfieldBorderStyle, playfieldBorder.PlayfieldBorderStyle);
         }
 
-        public override void Add(DrawableHitObject h)
+        protected override void OnHitObjectAdded(HitObject hitObject)
         {
-            DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)h;
-
-            h.OnNewResult += onNewResult;
-            h.OnLoadComplete += d =>
-            {
-                if (d is DrawableSpinner)
-                    spinnerProxies.Add(d.CreateProxy());
-
-                if (d is IDrawableHitObjectWithProxiedApproach c)
-                    approachCircles.Add(c.ProxiedLayer.CreateProxy());
-            };
-
-            base.Add(h);
-
-            osuHitObject.CheckHittable = hitPolicy.IsHittable;
-
-            followPoints.AddFollowPoints(osuHitObject.HitObject);
+            base.OnHitObjectAdded(hitObject);
+            followPoints.AddFollowPoints((OsuHitObject)hitObject);
         }
 
-        public override bool Remove(DrawableHitObject h)
+        protected override void OnHitObjectRemoved(HitObject hitObject)
         {
-            DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)h;
+            base.OnHitObjectRemoved(hitObject);
+            followPoints.RemoveFollowPoints((OsuHitObject)hitObject);
+        }
 
-            bool result = base.Remove(h);
+        public void OnHitObjectLoaded(Drawable drawable)
+        {
+            switch (drawable)
+            {
+                case DrawableSliderHead _:
+                case DrawableSliderTail _:
+                case DrawableSliderTick _:
+                case DrawableSliderRepeat _:
+                case DrawableSpinnerTick _:
+                    break;
 
-            if (result)
-                followPoints.RemoveFollowPoints(osuHitObject.HitObject);
+                case DrawableSpinner _:
+                    spinnerProxies.Add(drawable.CreateProxy());
+                    break;
 
-            return result;
+                case IDrawableHitObjectWithProxiedApproach approach:
+                    approachCircles.Add(approach.ProxiedLayer.CreateProxy());
+                    break;
+            }
         }
 
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)

From 1ea526b5ef72ac020ecc3fd3d589cbd23c2e9ff3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 14:19:26 +0900
Subject: [PATCH 06115/10326] Adjust pooling implementation with branch changes

---
 osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index 1c119e2e95..86c7305439 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -12,6 +12,7 @@ using osu.Game.Input.Handlers;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -33,17 +34,21 @@ namespace osu.Game.Rulesets.Osu.UI
         {
         }
 
-        protected override bool PoolHitObjects => true;
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            RegisterPool<HitCircle, DrawableHitCircle>(10, 100);
-            RegisterPool<Slider, DrawableSlider>(10, 100);
-            RegisterPool<Spinner, DrawableSpinner>(2, 20);
+            registerPool<HitCircle, DrawableHitCircle>(10, 100);
+            registerPool<Slider, DrawableSlider>(10, 100);
+            registerPool<Spinner, DrawableSpinner>(2, 20);
         }
 
-        protected override DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
+        private void registerPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
+            where TObject : HitObject
+            where TDrawable : DrawableHitObject, new()
+            => RegisterPool<TObject, TDrawable>(CreatePool<TDrawable>(initialSize, maximumSize));
+
+        protected virtual DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
+            where TDrawable : DrawableHitObject, new()
             => new OsuDrawablePool<TDrawable>(Playfield.CheckHittable, Playfield.OnHitObjectLoaded, initialSize, maximumSize);
 
         protected override HitObjectLifetimeEntry CreateLifetimeEntry(OsuHitObject hitObject) => new OsuHitObjectLifetimeEntry(hitObject);

From 3f78d81386db5deb57d42f55dcd841ead8d68a4c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 15:59:48 +0900
Subject: [PATCH 06116/10326] Add nested osu! hitobject pooling

---
 .../Objects/Drawables/DrawableOsuHitObject.cs |  2 +-
 .../Objects/Drawables/DrawableSlider.cs       | 18 +++-----
 .../Objects/Drawables/DrawableSliderHead.cs   | 44 +++++++++++++++----
 .../Objects/Drawables/DrawableSliderRepeat.cs | 31 +++++++++----
 .../Objects/Drawables/DrawableSliderTail.cs   | 12 +++--
 .../Objects/Drawables/DrawableSliderTick.cs   | 14 +++++-
 .../Objects/Drawables/DrawableSpinner.cs      |  2 +-
 .../Drawables/DrawableSpinnerBonusTick.cs     |  5 +++
 .../Objects/Drawables/DrawableSpinnerTick.cs  |  5 +++
 .../UI/DrawableOsuRuleset.cs                  |  8 ++++
 10 files changed, 106 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index d17bf93fa0..bcaf73d34f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private OsuInputManager osuActionInputManager;
         internal OsuInputManager OsuActionInputManager => osuActionInputManager ??= GetContainingInputManager() as OsuInputManager;
 
-        protected virtual void Shake(double maximumLength) => shakeContainer.Shake(maximumLength);
+        public virtual void Shake(double maximumLength) => shakeContainer.Shake(maximumLength);
 
         protected override void UpdateInitialTransforms()
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 05e4587307..5bbdc5ee7b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -164,10 +164,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.ClearNestedHitObjects();
 
-            headContainer.Clear();
-            tailContainer.Clear();
-            repeatContainer.Clear();
-            tickContainer.Clear();
+            headContainer.Clear(false);
+            tailContainer.Clear(false);
+            repeatContainer.Clear(false);
+            tickContainer.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
@@ -178,17 +178,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     return new DrawableSliderTail(tail);
 
                 case SliderHeadCircle head:
-                    return new DrawableSliderHead(HitObject, head)
-                    {
-                        OnShake = Shake,
-                        CheckHittable = (d, t) => CheckHittable?.Invoke(d, t) ?? true
-                    };
+                    return new DrawableSliderHead(head);
 
                 case SliderTick tick:
-                    return new DrawableSliderTick(tick) { Position = tick.Position - HitObject.Position };
+                    return new DrawableSliderTick(tick);
 
                 case SliderRepeat repeat:
-                    return new DrawableSliderRepeat(repeat, this) { Position = repeat.Position - HitObject.Position };
+                    return new DrawableSliderRepeat(repeat);
             }
 
             return base.CreateNestedHitObject(hitObject);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 49ed9f12e3..fd0f35d20d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -4,6 +4,8 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
@@ -14,21 +16,43 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override OsuSkinComponents CirclePieceComponent => OsuSkinComponents.SliderHeadHitCircle;
 
-        private readonly Slider slider;
+        private DrawableSlider drawableSlider;
 
-        public DrawableSliderHead(Slider slider, SliderHeadCircle h)
+        private Slider slider => drawableSlider?.HitObject;
+
+        public DrawableSliderHead()
+        {
+        }
+
+        public DrawableSliderHead(SliderHeadCircle h)
             : base(h)
         {
-            this.slider = slider;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            pathVersion.BindTo(slider.Path.Version);
-
             PositionBindable.BindValueChanged(_ => updatePosition());
-            pathVersion.BindValueChanged(_ => updatePosition(), true);
+            pathVersion.BindValueChanged(_ => updatePosition());
+        }
+
+        protected override void OnFree(HitObject hitObject)
+        {
+            base.OnFree(hitObject);
+
+            pathVersion.UnbindFrom(drawableSlider.PathVersion);
+        }
+
+        protected override void OnParentReceived(DrawableHitObject parent)
+        {
+            base.OnParentReceived(parent);
+
+            drawableSlider = (DrawableSlider)parent;
+
+            pathVersion.BindTo(drawableSlider.PathVersion);
+
+            OnShake = drawableSlider.Shake;
+            CheckHittable = (d, t) => drawableSlider.CheckHittable?.Invoke(d, t) ?? true;
         }
 
         protected override void Update()
@@ -44,8 +68,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public Action<double> OnShake;
 
-        protected override void Shake(double maximumLength) => OnShake?.Invoke(maximumLength);
+        public override void Shake(double maximumLength) => OnShake?.Invoke(maximumLength);
 
-        private void updatePosition() => Position = HitObject.Position - slider.Position;
+        private void updatePosition()
+        {
+            if (slider != null)
+                Position = HitObject.Position - slider.Position;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 9c382bd0a7..0735d48ae1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -16,8 +16,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking
     {
-        private readonly SliderRepeat sliderRepeat;
-        private readonly DrawableSlider drawableSlider;
+        public new SliderRepeat HitObject => (SliderRepeat)base.HitObject;
 
         private double animDuration;
 
@@ -27,11 +26,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => false;
 
-        public DrawableSliderRepeat(SliderRepeat sliderRepeat, DrawableSlider drawableSlider)
+        private DrawableSlider drawableSlider;
+
+        public DrawableSliderRepeat()
+            : base(null)
+        {
+        }
+
+        public DrawableSliderRepeat(SliderRepeat sliderRepeat)
             : base(sliderRepeat)
         {
-            this.sliderRepeat = sliderRepeat;
-            this.drawableSlider = drawableSlider;
         }
 
         [BackgroundDependencyLoader]
@@ -53,18 +57,27 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 }
             };
 
-            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
+            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
+        }
+
+        protected override void OnParentReceived(DrawableHitObject parent)
+        {
+            base.OnParentReceived(parent);
+
+            drawableSlider = (DrawableSlider)parent;
+
+            Position = HitObject.Position - drawableSlider.Position;
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (sliderRepeat.StartTime <= Time.Current)
+            if (HitObject.StartTime <= Time.Current)
                 ApplyResult(r => r.Type = drawableSlider.Tracking.Value ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
         protected override void UpdateInitialTransforms()
         {
-            animDuration = Math.Min(300, sliderRepeat.SpanDuration);
+            animDuration = Math.Min(300, HitObject.SpanDuration);
 
             this.Animate(
                 d => d.FadeIn(animDuration),
@@ -100,7 +113,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             // When the repeat is hit, the arrow should fade out on spot rather than following the slider
             if (IsHit) return;
 
-            bool isRepeatAtEnd = sliderRepeat.RepeatIndex % 2 == 0;
+            bool isRepeatAtEnd = HitObject.RepeatIndex % 2 == 0;
             List<Vector2> curve = ((PlaySliderBody)drawableSlider.Body.Drawable).CurrentCurve;
 
             Position = isRepeatAtEnd ? end : start;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 3be5983c57..eff72168ee 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSliderTail : DrawableOsuHitObject, IRequireTracking, ITrackSnaking
     {
-        private readonly SliderTailCircle tailCircle;
+        public new SliderTailCircle HitObject => (SliderTailCircle)base.HitObject;
 
         /// <summary>
         /// The judgement text is provided by the <see cref="DrawableSlider"/>.
@@ -25,10 +25,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private SkinnableDrawable circlePiece;
         private Container scaleContainer;
 
+        public DrawableSliderTail()
+            : base(null)
+        {
+        }
+
         public DrawableSliderTail(SliderTailCircle tailCircle)
             : base(tailCircle)
         {
-            this.tailCircle = tailCircle;
         }
 
         [BackgroundDependencyLoader]
@@ -52,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 },
             };
 
-            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
+            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
         }
 
         protected override void UpdateInitialTransforms()
@@ -92,6 +96,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         }
 
         public void UpdateSnakingPosition(Vector2 start, Vector2 end) =>
-            Position = tailCircle.RepeatIndex % 2 == 0 ? end : start;
+            Position = HitObject.RepeatIndex % 2 == 0 ? end : start;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 2af51ea486..faccf5d4d1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -24,6 +24,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private SkinnableDrawable scaleContainer;
 
+        public DrawableSliderTick()
+            : base(null)
+        {
+        }
+
         public DrawableSliderTick(SliderTick sliderTick)
             : base(sliderTick)
         {
@@ -54,7 +59,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 Origin = Anchor.Centre,
             };
 
-            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
+            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
+        }
+
+        protected override void OnParentReceived(DrawableHitObject parent)
+        {
+            base.OnParentReceived(parent);
+
+            Position = HitObject.Position - ((DrawableSlider)parent).HitObject.Position;
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index f04a914fe3..6b33517c33 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
-            ticks.Clear();
+            ticks.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.cs
index 2e1c07c4c6..ffeb14b0a8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.cs
@@ -5,6 +5,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSpinnerBonusTick : DrawableSpinnerTick
     {
+        public DrawableSpinnerBonusTick()
+            : base(null)
+        {
+        }
+
         public DrawableSpinnerBonusTick(SpinnerBonusTick spinnerTick)
             : base(spinnerTick)
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index e9cede1398..fc9a7c00e6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -7,6 +7,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public override bool DisplayResult => false;
 
+        public DrawableSpinnerTick()
+            : base(null)
+        {
+        }
+
         public DrawableSpinnerTick(SpinnerTick spinnerTick)
             : base(spinnerTick)
         {
diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index 86c7305439..c89f138bcd 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -38,8 +38,16 @@ namespace osu.Game.Rulesets.Osu.UI
         private void load()
         {
             registerPool<HitCircle, DrawableHitCircle>(10, 100);
+
             registerPool<Slider, DrawableSlider>(10, 100);
+            registerPool<SliderHeadCircle, DrawableSliderHead>(10, 100);
+            registerPool<SliderTailCircle, DrawableSliderTail>(10, 100);
+            registerPool<SliderTick, DrawableSliderTick>(10, 100);
+            registerPool<SliderRepeat, DrawableSliderRepeat>(5, 50);
+
             registerPool<Spinner, DrawableSpinner>(2, 20);
+            registerPool<SpinnerTick, DrawableSpinnerTick>(10, 100);
+            registerPool<SpinnerBonusTick, DrawableSpinnerBonusTick>(10, 100);
         }
 
         private void registerPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)

From cf91962865aa659859fb8f73f2f994c8f6027018 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 16:58:40 +0900
Subject: [PATCH 06117/10326] Fix test failures due to on-the-fly starttime
 changes

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 7315ce61e7..1bb1fd4983 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -57,6 +57,14 @@ namespace osu.Game.Rulesets.UI
             lifetimeManager.EntryBecameDead += entryBecameDead;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // Application of hitobject during load() may have changed their start times, so ensure the correct sorting order.
+            SortInternal();
+        }
+
         #region Pooling support
 
         public void Add(HitObjectLifetimeEntry entry) => lifetimeManager.AddEntry(entry);
@@ -163,7 +171,12 @@ namespace osu.Game.Rulesets.UI
         private void bindStartTime(DrawableHitObject hitObject)
         {
             var bindable = hitObject.StartTimeBindable.GetBoundCopy();
-            bindable.BindValueChanged(_ => SortInternal());
+
+            bindable.BindValueChanged(_ =>
+            {
+                if (IsLoaded)
+                    SortInternal();
+            });
 
             startTimeMap[hitObject] = bindable;
         }

From 25af091409142d702041f5a5bd15bea093c78897 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Nov 2020 17:03:42 +0900
Subject: [PATCH 06118/10326] Fix storyboard animations of very old beatmaps
 playing too slow

Closes https://github.com/ppy/osu/issues/10772.
---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs    |  2 --
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs           |  2 ++
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs | 12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 442be6e837..37ab489da5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Beatmaps.Formats
 {
     public class LegacyBeatmapDecoder : LegacyDecoder<Beatmap>
     {
-        public const int LATEST_VERSION = 14;
-
         private Beatmap beatmap;
 
         private ConvertHitObjectParser parser;
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 7b377e481f..de4dc8cdc8 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Beatmaps.Formats
     public abstract class LegacyDecoder<T> : Decoder<T>
         where T : new()
     {
+        public const int LATEST_VERSION = 14;
+
         protected readonly int FormatVersion;
 
         protected LegacyDecoder(int version)
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 8d8ca523d5..9a244c8bb2 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps.Legacy;
@@ -23,15 +24,15 @@ namespace osu.Game.Beatmaps.Formats
 
         private readonly Dictionary<string, string> variables = new Dictionary<string, string>();
 
-        public LegacyStoryboardDecoder()
-            : base(0)
+        public LegacyStoryboardDecoder(int version = LATEST_VERSION)
+            : base(version)
         {
         }
 
         public static void Register()
         {
             // note that this isn't completely correct
-            AddDecoder<Storyboard>(@"osu file format v", m => new LegacyStoryboardDecoder());
+            AddDecoder<Storyboard>(@"osu file format v", m => new LegacyStoryboardDecoder(Parsing.ParseInt(m.Split('v').Last())));
             AddDecoder<Storyboard>(@"[Events]", m => new LegacyStoryboardDecoder());
             SetFallbackDecoder<Storyboard>(() => new LegacyStoryboardDecoder());
         }
@@ -133,6 +134,11 @@ namespace osu.Game.Beatmaps.Formats
                         var y = Parsing.ParseFloat(split[5], Parsing.MAX_COORDINATE_VALUE);
                         var frameCount = Parsing.ParseInt(split[6]);
                         var frameDelay = Parsing.ParseDouble(split[7]);
+
+                        if (FormatVersion < 6)
+                            // this is random as hell but taken straight from osu-stable.
+                            frameDelay = Math.Round(0.015 * frameDelay) * 1.186 * (1000 / 60f);
+
                         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);

From e44a8b3934d769e8455e306e18949be30ee89227 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 17:07:20 +0900
Subject: [PATCH 06119/10326] Resort as early as possible

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 1bb1fd4983..4164681ffc 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -57,11 +57,11 @@ namespace osu.Game.Rulesets.UI
             lifetimeManager.EntryBecameDead += entryBecameDead;
         }
 
-        protected override void LoadComplete()
+        protected override void LoadAsyncComplete()
         {
-            base.LoadComplete();
+            base.LoadAsyncComplete();
 
-            // Application of hitobject during load() may have changed their start times, so ensure the correct sorting order.
+            // Application of hitobjects during load() may have changed their start times, so ensure the correct sorting order.
             SortInternal();
         }
 
@@ -174,7 +174,7 @@ namespace osu.Game.Rulesets.UI
 
             bindable.BindValueChanged(_ =>
             {
-                if (IsLoaded)
+                if (LoadState >= LoadState.Ready)
                     SortInternal();
             });
 

From 0ae6f8229171c215bf441385e6d80287eecf096a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Nov 2020 21:46:58 +0100
Subject: [PATCH 06120/10326] Fix incorrect fade of slider ends after a rewind

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 46 +++++++++++++---------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index cf7faca9b9..84a335750a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -46,9 +47,6 @@ namespace osu.Game.Rulesets.Osu.Mods
                 applyFadeInAdjustment(nested);
         }
 
-        private double lastSliderHeadFadeOutStartTime;
-        private double lastSliderHeadFadeOutDuration;
-
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
             base.ApplyIncreasedVisibilityState(hitObject, state);
@@ -78,33 +76,24 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 case DrawableSliderTail sliderTail:
                     // use stored values from head circle to achieve same fade sequence.
-                    fadeOutDuration = lastSliderHeadFadeOutDuration;
-                    fadeOutStartTime = lastSliderHeadFadeOutStartTime;
+                    var tailFadeOutParameters = getFadeOutParametersFromSliderHead(h);
 
-                    using (drawable.BeginAbsoluteSequence(fadeOutStartTime, true))
-                        sliderTail.FadeOut(fadeOutDuration);
+                    using (drawable.BeginAbsoluteSequence(tailFadeOutParameters.startTime, true))
+                        sliderTail.FadeOut(tailFadeOutParameters.duration);
 
                     break;
 
                 case DrawableSliderRepeat sliderRepeat:
                     // use stored values from head circle to achieve same fade sequence.
-                    fadeOutDuration = lastSliderHeadFadeOutDuration;
-                    fadeOutStartTime = lastSliderHeadFadeOutStartTime;
+                    var repeatFadeOutParameters = getFadeOutParametersFromSliderHead(h);
 
-                    using (drawable.BeginAbsoluteSequence(fadeOutStartTime, true))
+                    using (drawable.BeginAbsoluteSequence(repeatFadeOutParameters.startTime, true))
                         // only apply to circle piece – reverse arrow is not affected by hidden.
-                        sliderRepeat.CirclePiece.FadeOut(fadeOutDuration);
+                        sliderRepeat.CirclePiece.FadeOut(repeatFadeOutParameters.duration);
 
                     break;
 
                 case DrawableHitCircle circle:
-
-                    if (circle is DrawableSliderHead)
-                    {
-                        lastSliderHeadFadeOutDuration = fadeOutDuration;
-                        lastSliderHeadFadeOutStartTime = fadeOutStartTime;
-                    }
-
                     Drawable fadeTarget = circle;
 
                     if (increaseVisibility)
@@ -125,6 +114,8 @@ namespace osu.Game.Rulesets.Osu.Mods
                     break;
 
                 case DrawableSlider slider:
+                    associateNestedSliderCirclesWithHead(slider.HitObject);
+
                     using (slider.BeginAbsoluteSequence(fadeOutStartTime, true))
                         slider.Body.FadeOut(longFadeDuration, Easing.Out);
 
@@ -149,5 +140,24 @@ namespace osu.Game.Rulesets.Osu.Mods
                     break;
             }
         }
+
+        private readonly Dictionary<HitObject, SliderHeadCircle> correspondingSliderHeadForObject = new Dictionary<HitObject, SliderHeadCircle>();
+
+        private void associateNestedSliderCirclesWithHead(Slider slider)
+        {
+            var sliderHead = slider.NestedHitObjects.Single(obj => obj is SliderHeadCircle);
+
+            foreach (var nested in slider.NestedHitObjects)
+            {
+                if ((nested is SliderRepeat || nested is SliderEndCircle) && !correspondingSliderHeadForObject.ContainsKey(nested))
+                    correspondingSliderHeadForObject[nested] = (SliderHeadCircle)sliderHead;
+            }
+        }
+
+        private (double startTime, double duration) getFadeOutParametersFromSliderHead(OsuHitObject h)
+        {
+            var sliderHead = correspondingSliderHeadForObject[h];
+            return (sliderHead.StartTime - sliderHead.TimePreempt + sliderHead.TimeFadeIn, sliderHead.TimePreempt * fade_out_duration_multiplier);
+        }
     }
 }

From a8c2b798ad5c71cc2dcdc3d061e54148297218ef Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 15:24:45 +0900
Subject: [PATCH 06121/10326] Add support for nested hitobject pooling

---
 .../Objects/Drawables/DrawableHitObject.cs     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 244cf831c3..2dba83f2be 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -19,6 +19,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.UI;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Drawables
@@ -126,6 +127,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         [CanBeNull]
         private HitObjectLifetimeEntry lifetimeEntry;
 
+        [Resolved(CanBeNull = true)]
+        private DrawableRuleset drawableRuleset { get; set; }
+
         /// <summary>
         /// Creates a new <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -195,7 +199,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             foreach (var h in HitObject.NestedHitObjects)
             {
-                var drawableNested = CreateNestedHitObject(h) ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
+                var drawableNested = drawableRuleset?.GetPooledDrawableRepresentation(h)
+                                     ?? CreateNestedHitObject(h)
+                                     ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
 
                 drawableNested.OnNewResult += onNewResult;
                 drawableNested.OnRevertResult += onRevertResult;
@@ -203,6 +209,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
                 nestedHitObjects.Value.Add(drawableNested);
                 AddNestedHitObject(drawableNested);
+
+                drawableNested.OnParentReceived(this);
             }
 
             StartTimeBindable.BindTo(HitObject.StartTimeBindable);
@@ -291,6 +299,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
         }
 
+        /// <summary>
+        /// Invoked when this <see cref="DrawableHitObject"/> receives a new parenting <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <param name="parent">The parenting <see cref="DrawableHitObject"/>.</param>
+        protected virtual void OnParentReceived(DrawableHitObject parent)
+        {
+        }
+
         /// <summary>
         /// Invoked by the base <see cref="DrawableHitObject"/> to populate samples, once on initial load and potentially again on any change to the samples collection.
         /// </summary>

From de31c1ea0cd3df825d65fae00dc6b644d3f16a9f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 17:58:39 +0900
Subject: [PATCH 06122/10326] Fix skinfallback test crashing on repeats

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 075bf314bc..856bfd7e80 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -125,6 +125,9 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 if (!enabled) return null;
 
+                if (component is OsuSkinComponent osuComponent && osuComponent.Component == OsuSkinComponents.SliderBody)
+                    return null;
+
                 return new OsuSpriteText
                 {
                     Text = identifier,

From 44aed19e4e0e1e4098e2f7d405ac10f252d77185 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 12:37:00 +0900
Subject: [PATCH 06123/10326] Fix mania notelock crashing with overlapping
 hitwindows

---
 .../TestSceneHoldNoteInput.cs                 |  2 +-
 .../TestSceneOutOfOrderHits.cs                | 23 +++++++++++++++++++
 .../Objects/Drawables/DrawableHoldNote.cs     |  2 +-
 .../UI/OrderedHitPolicy.cs                    |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 5cb1519196..6c9f184c2c 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             assertHeadJudgement(HitResult.Miss);
             assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
-            assertNoteJudgement(HitResult.IgnoreHit);
+            assertNoteJudgement(HitResult.IgnoreMiss);
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index e8c2472c3b..d699921307 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -54,6 +54,29 @@ namespace osu.Game.Rulesets.Mania.Tests
             }
         }
 
+        [Test]
+        public void TestMissAfterNextObjectStartTime()
+        {
+            var objects = new List<ManiaHitObject>
+            {
+                new HoldNote
+                {
+                    StartTime = 1000,
+                    EndTime = 1200,
+                },
+                new HoldNote
+                {
+                    StartTime = 1220,
+                    EndTime = 1420
+                }
+            };
+
+            performTest(objects, new List<ReplayFrame>());
+
+            addJudgementAssert(objects[0], HitResult.IgnoreMiss);
+            addJudgementAssert(objects[1], HitResult.IgnoreMiss);
+        }
+
         private void addJudgementAssert(ManiaHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index d9d740c145..3b3f72157a 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -233,7 +233,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             if (Tail.AllJudged)
             {
-                ApplyResult(r => r.Type = r.Judgement.MaxResult);
+                ApplyResult(r => r.Type = Tail.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
                 endHold();
             }
 
diff --git a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
index 0f9cd48dd8..9bc577a81e 100644
--- a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
         public void HandleHit(DrawableHitObject hitObject)
         {
-            if (!IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
+            if (hitObject.IsHit && !IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
                 throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
 
             foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))

From ad38867b1d977e9a78abb12c5d685e3b1c9831ab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 12:53:32 +0900
Subject: [PATCH 06124/10326] Completely remove check as it can occur for hits
 too

---
 .../TestSceneOutOfOrderHits.cs                | 51 +++++++++++++++++--
 .../UI/OrderedHitPolicy.cs                    |  4 --
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index d699921307..86a142f2f6 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -55,19 +56,19 @@ namespace osu.Game.Rulesets.Mania.Tests
         }
 
         [Test]
-        public void TestMissAfterNextObjectStartTime()
+        public void TestHoldNoteMissAfterNextObjectStartTime()
         {
             var objects = new List<ManiaHitObject>
             {
                 new HoldNote
                 {
                     StartTime = 1000,
-                    EndTime = 1200,
+                    EndTime = 1010,
                 },
                 new HoldNote
                 {
-                    StartTime = 1220,
-                    EndTime = 1420
+                    StartTime = 1020,
+                    EndTime = 1030
                 }
             };
 
@@ -77,12 +78,54 @@ namespace osu.Game.Rulesets.Mania.Tests
             addJudgementAssert(objects[1], HitResult.IgnoreMiss);
         }
 
+        [Test]
+        public void TestHoldNoteReleasedHitAfterNextObjectStartTime()
+        {
+            var objects = new List<ManiaHitObject>
+            {
+                new HoldNote
+                {
+                    StartTime = 1000,
+                    EndTime = 1010,
+                },
+                new HoldNote
+                {
+                    StartTime = 1020,
+                    EndTime = 1030
+                }
+            };
+
+            var frames = new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(1000, ManiaAction.Key1),
+                new ManiaReplayFrame(1030),
+                new ManiaReplayFrame(1040, ManiaAction.Key1),
+                new ManiaReplayFrame(1050)
+            };
+
+            performTest(objects, frames);
+
+            addJudgementAssert(objects[0], HitResult.IgnoreHit);
+            addJudgementAssert("first head", () => ((HoldNote)objects[0]).Head, HitResult.Perfect);
+            addJudgementAssert("first tail", () => ((HoldNote)objects[0]).Tail, HitResult.Perfect);
+
+            addJudgementAssert(objects[1], HitResult.IgnoreHit);
+            addJudgementAssert("second head", () => ((HoldNote)objects[1]).Head, HitResult.Great);
+            addJudgementAssert("second tail", () => ((HoldNote)objects[1]).Tail, HitResult.Perfect);
+        }
+
         private void addJudgementAssert(ManiaHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
                 () => judgementResults.Single(r => r.HitObject == hitObject).Type == result);
         }
 
+        private void addJudgementAssert(string name, Func<ManiaHitObject> hitObject, HitResult result)
+        {
+            AddAssert($"{name} judgement is {result}",
+                () => judgementResults.Single(r => r.HitObject == hitObject()).Type == result);
+        }
+
         private void addJudgementOffsetAssert(ManiaHitObject hitObject, double offset)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judged at {offset}",
diff --git a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
index 9bc577a81e..961858b62b 100644
--- a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.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 osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -44,9 +43,6 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
         public void HandleHit(DrawableHitObject hitObject)
         {
-            if (hitObject.IsHit && !IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
-                throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
-
             foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))
             {
                 if (obj.Judged)

From 60f95e897d9c119e3492a5b9e14d687aaddfa0f4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 12:53:53 +0900
Subject: [PATCH 06125/10326] Revert unnecessary change

---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs       | 2 +-
 osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs      | 4 ++--
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 6c9f184c2c..5cb1519196 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             assertHeadJudgement(HitResult.Miss);
             assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
-            assertNoteJudgement(HitResult.IgnoreMiss);
+            assertNoteJudgement(HitResult.IgnoreHit);
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index 86a142f2f6..cecac38f70 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -74,8 +74,8 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             performTest(objects, new List<ReplayFrame>());
 
-            addJudgementAssert(objects[0], HitResult.IgnoreMiss);
-            addJudgementAssert(objects[1], HitResult.IgnoreMiss);
+            addJudgementAssert(objects[0], HitResult.IgnoreHit);
+            addJudgementAssert(objects[1], HitResult.IgnoreHit);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 3b3f72157a..d9d740c145 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -233,7 +233,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             if (Tail.AllJudged)
             {
-                ApplyResult(r => r.Type = Tail.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+                ApplyResult(r => r.Type = r.Judgement.MaxResult);
                 endHold();
             }
 

From d9750fc043d7dc85151f365363909a855bf9cd33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 15:49:45 +0900
Subject: [PATCH 06126/10326] Remove duplicate instantiation of
 externalLinkOpener

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6b768cc8fc..1a1ebcc2d4 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -681,7 +681,6 @@ namespace osu.Game
 
             loadComponentSingleFile(new AccountCreationOverlay(), topMostOverlayContent.Add, true);
             loadComponentSingleFile(new DialogOverlay(), topMostOverlayContent.Add, true);
-            loadComponentSingleFile(externalLinkOpener = new ExternalLinkOpener(), topMostOverlayContent.Add);
 
             chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible;
 

From 81c9663e763b4d0268bc41e6bfb09ac91e5b2442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 13:24:32 +0100
Subject: [PATCH 06127/10326] Move {-> Default}KiaiHitExplosion

---
 .../UI/{KiaiHitExplosion.cs => DefaultKiaiHitExplosion.cs}  | 4 ++--
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs                | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game.Rulesets.Taiko/UI/{KiaiHitExplosion.cs => DefaultKiaiHitExplosion.cs} (92%)

diff --git a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
similarity index 92%
rename from osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
rename to osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
index 067d390894..32c9f3ec4f 100644
--- a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
@@ -13,14 +13,14 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    public class KiaiHitExplosion : CircularContainer
+    public class DefaultKiaiHitExplosion : CircularContainer
     {
         public override bool RemoveWhenNotAlive => true;
 
         public readonly DrawableHitObject JudgedObject;
         private readonly HitType type;
 
-        public KiaiHitExplosion(DrawableHitObject judgedObject, HitType type)
+        public DefaultKiaiHitExplosion(DrawableHitObject judgedObject, HitType type)
         {
             JudgedObject = judgedObject;
             this.type = type;
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 120cf264c3..03895dfd68 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         public const float DEFAULT_HEIGHT = 178;
 
         private Container<HitExplosion> hitExplosionContainer;
-        private Container<KiaiHitExplosion> kiaiExplosionContainer;
+        private Container<DefaultKiaiHitExplosion> kiaiExplosionContainer;
         private JudgementContainer<DrawableTaikoJudgement> judgementContainer;
         private ScrollingHitObjectContainer drumRollHitContainer;
         internal Drawable HitTarget;
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                                         drumRollHitContainer = new DrumRollHitContainer()
                                     }
                                 },
-                                kiaiExplosionContainer = new Container<KiaiHitExplosion>
+                                kiaiExplosionContainer = new Container<DefaultKiaiHitExplosion>
                                 {
                                     Name = "Kiai hit explosions",
                                     RelativeSizeAxes = Axes.Both,
@@ -219,7 +219,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             hitExplosionContainer.Add(new HitExplosion(drawableObject, result));
             if (drawableObject.HitObject.Kiai)
-                kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
+                kiaiExplosionContainer.Add(new DefaultKiaiHitExplosion(drawableObject, type));
         }
 
         private class ProxyContainer : LifetimeManagementContainer

From 00a486ab516ab6ac65471177c0f2dd3b36758d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 13:35:49 +0100
Subject: [PATCH 06128/10326] Reintroduce KiaiHitExplosion as skinnable

---
 .../TaikoSkinComponents.cs                    |  1 +
 .../UI/DefaultKiaiHitExplosion.cs             |  9 +---
 .../UI/KiaiHitExplosion.cs                    | 47 +++++++++++++++++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |  6 +--
 4 files changed, 52 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs

diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index 132d8f8868..bf48898dd2 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Rulesets.Taiko
         TaikoExplosionMiss,
         TaikoExplosionOk,
         TaikoExplosionGreat,
+        TaikoExplosionKiai,
         Scroller,
         Mascot,
     }
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
index 32c9f3ec4f..7ce8b016d5 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultKiaiHitExplosion.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.UI
@@ -17,19 +16,13 @@ namespace osu.Game.Rulesets.Taiko.UI
     {
         public override bool RemoveWhenNotAlive => true;
 
-        public readonly DrawableHitObject JudgedObject;
         private readonly HitType type;
 
-        public DefaultKiaiHitExplosion(DrawableHitObject judgedObject, HitType type)
+        public DefaultKiaiHitExplosion(HitType type)
         {
-            JudgedObject = judgedObject;
             this.type = type;
 
-            Anchor = Anchor.CentreLeft;
-            Origin = Anchor.Centre;
-
             RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(TaikoHitObject.DEFAULT_SIZE, 1);
 
             Blending = BlendingParameters.Additive;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
new file mode 100644
index 0000000000..20900a9352
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public class KiaiHitExplosion : Container
+    {
+        public override bool RemoveWhenNotAlive => true;
+
+        [Cached(typeof(DrawableHitObject))]
+        public readonly DrawableHitObject JudgedObject;
+
+        private readonly HitType hitType;
+
+        private SkinnableDrawable skinnable;
+
+        public override double LifetimeStart => skinnable.Drawable.LifetimeStart;
+
+        public override double LifetimeEnd => skinnable.Drawable.LifetimeEnd;
+
+        public KiaiHitExplosion(DrawableHitObject judgedObject, HitType hitType)
+        {
+            JudgedObject = judgedObject;
+            this.hitType = hitType;
+
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.Centre;
+
+            RelativeSizeAxes = Axes.Both;
+            Size = new Vector2(TaikoHitObject.DEFAULT_SIZE, 1);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoExplosionKiai), _ => new DefaultKiaiHitExplosion(hitType));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 03895dfd68..120cf264c3 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         public const float DEFAULT_HEIGHT = 178;
 
         private Container<HitExplosion> hitExplosionContainer;
-        private Container<DefaultKiaiHitExplosion> kiaiExplosionContainer;
+        private Container<KiaiHitExplosion> kiaiExplosionContainer;
         private JudgementContainer<DrawableTaikoJudgement> judgementContainer;
         private ScrollingHitObjectContainer drumRollHitContainer;
         internal Drawable HitTarget;
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                                         drumRollHitContainer = new DrumRollHitContainer()
                                     }
                                 },
-                                kiaiExplosionContainer = new Container<DefaultKiaiHitExplosion>
+                                kiaiExplosionContainer = new Container<KiaiHitExplosion>
                                 {
                                     Name = "Kiai hit explosions",
                                     RelativeSizeAxes = Axes.Both,
@@ -219,7 +219,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             hitExplosionContainer.Add(new HitExplosion(drawableObject, result));
             if (drawableObject.HitObject.Kiai)
-                kiaiExplosionContainer.Add(new DefaultKiaiHitExplosion(drawableObject, type));
+                kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
         }
 
         private class ProxyContainer : LifetimeManagementContainer

From 646833a059991206691530888626748ce34e7501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 14:07:39 +0100
Subject: [PATCH 06129/10326] Add test scene

---
 .../Skinning/TestSceneKiaiHitExplosion.cs     | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.cs
new file mode 100644
index 0000000000..b558709592
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.UI;
+
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
+{
+    [TestFixture]
+    public class TestSceneKiaiHitExplosion : TaikoSkinnableTestScene
+    {
+        [Test]
+        public void TestKiaiHits()
+        {
+            AddStep("rim hit", () => SetContents(() => getContentFor(createHit(HitType.Rim))));
+            AddStep("centre hit", () => SetContents(() => getContentFor(createHit(HitType.Centre))));
+        }
+
+        private Drawable getContentFor(DrawableTestHit hit)
+        {
+            return new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new KiaiHitExplosion(hit, hit.HitObject.Type)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            };
+        }
+
+        private DrawableTestHit createHit(HitType type) => new DrawableTestHit(new Hit { StartTime = Time.Current, Type = type });
+    }
+}

From 21709ba4bce68efffe1e1a3dffcc6157ee2b2697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 14:08:27 +0100
Subject: [PATCH 06130/10326] Do not lookup default kiai explosion if skin has
 own

---
 .../Skinning/TaikoLegacySkinTransformer.cs                 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index c88480d18f..ddbf20b827 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -114,6 +114,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                     return null;
 
+                case TaikoSkinComponents.TaikoExplosionKiai:
+                    // suppress the default kiai explosion if the skin brings its own sprites.
+                    if (hasExplosion.Value)
+                        return Drawable.Empty();
+
+                    return null;
+
                 case TaikoSkinComponents.Scroller:
                     if (GetTexture("taiko-slider") != null)
                         return new LegacyTaikoScroller();

From 0d5cac89b3d2f3b6d4de66da1caafa2424935d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Nov 2020 14:50:19 +0100
Subject: [PATCH 06131/10326] Explicitly set lifetime to ensure empty drawables
 are cleaned up

---
 .../Skinning/TaikoLegacySkinTransformer.cs                  | 3 ++-
 osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs              | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index ddbf20b827..880af3fbd8 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -116,8 +116,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                 case TaikoSkinComponents.TaikoExplosionKiai:
                     // suppress the default kiai explosion if the skin brings its own sprites.
+                    // the drawable needs to expire as soon as possible to avoid accumulating empty drawables on the playfield.
                     if (hasExplosion.Value)
-                        return Drawable.Empty();
+                        return KiaiHitExplosion.EmptyExplosion();
 
                     return null;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
index 20900a9352..326cb23897 100644
--- a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
@@ -43,5 +43,11 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoExplosionKiai), _ => new DefaultKiaiHitExplosion(hitType));
         }
+
+        /// <summary>
+        /// Helper function to use when an explosion is not desired.
+        /// Lifetime is set to avoid accumulating empty drawables in the parent container.
+        /// </summary>
+        public static Drawable EmptyExplosion() => Empty().With(d => d.LifetimeEnd = double.MinValue);
     }
 }

From 1f83769bb270b2a1e33d4baf038fa243a460d864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Nov 2020 09:11:33 +0100
Subject: [PATCH 06132/10326] Inline empty explosion in legacy transformer

---
 .../Skinning/TaikoLegacySkinTransformer.cs                  | 2 +-
 osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs              | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
index 880af3fbd8..96fb065e79 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     // suppress the default kiai explosion if the skin brings its own sprites.
                     // the drawable needs to expire as soon as possible to avoid accumulating empty drawables on the playfield.
                     if (hasExplosion.Value)
-                        return KiaiHitExplosion.EmptyExplosion();
+                        return Drawable.Empty().With(d => d.LifetimeEnd = double.MinValue);
 
                     return null;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
index 326cb23897..20900a9352 100644
--- a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
@@ -43,11 +43,5 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.TaikoExplosionKiai), _ => new DefaultKiaiHitExplosion(hitType));
         }
-
-        /// <summary>
-        /// Helper function to use when an explosion is not desired.
-        /// Lifetime is set to avoid accumulating empty drawables in the parent container.
-        /// </summary>
-        public static Drawable EmptyExplosion() => Empty().With(d => d.LifetimeEnd = double.MinValue);
     }
 }

From 8a2addbf3d56bb4aa07b92d3d305e32dd8a037fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Nov 2020 18:03:04 +0900
Subject: [PATCH 06133/10326] 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 bbe8426316..5078fee1cf 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1110.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1111.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8f0cc58594..405fb1a6ca 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1110.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1111.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f766e0ec03..099ecd8319 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.Framework.iOS" Version="2020.1110.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1111.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1110.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1111.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 7177dd5d82f6880255be463b6341fef931d7ad5e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 12 Nov 2020 03:11:29 +0300
Subject: [PATCH 06134/10326] Add counter to most played beatmaps section in
 user overlay

---
 .../Historical/PaginatedMostPlayedBeatmapContainer.cs         | 4 +++-
 osu.Game/Users/User.cs                                        | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index 8f19cd900c..556f3139dd 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     public class PaginatedMostPlayedBeatmapContainer : PaginatedContainer<APIUserMostPlayedBeatmap>
     {
         public PaginatedMostPlayedBeatmapContainer(Bindable<User> user)
-            : base(user, "Most Played Beatmaps", "No records. :(")
+            : base(user, "Most Played Beatmaps", "No records. :(", CounterVisibilityState.AlwaysVisible)
         {
             ItemsPerPage = 5;
         }
@@ -27,6 +27,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             ItemsContainer.Direction = FillDirection.Vertical;
         }
 
+        protected override int GetCount(User user) => user.BeatmapPlaycountsCount;
+
         protected override APIRequest<List<APIUserMostPlayedBeatmap>> CreateRequest() =>
             new GetUserMostPlayedBeatmapsRequest(User.Value.Id, VisiblePages++, ItemsPerPage);
 
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 2a76a963e1..d7e78d5b35 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -144,6 +144,9 @@ namespace osu.Game.Users
         [JsonProperty(@"scores_first_count")]
         public int ScoresFirstCount;
 
+        [JsonProperty(@"beatmap_playcounts_count")]
+        public int BeatmapPlaycountsCount;
+
         [JsonProperty]
         private string[] playstyle
         {

From 7548db7ecc159638e016553844b5e0add7475128 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Nov 2020 16:35:48 +0900
Subject: [PATCH 06135/10326] Fix hitobjects sometimes not fading in completely
 with HD mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs             | 10 ++++++++--
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs    |  9 +++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 025e202666..cf7faca9b9 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -27,17 +27,23 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
             foreach (var d in drawables)
-                d.ApplyCustomUpdateState += applyFadeInAdjustment;
+            {
+                d.HitObjectApplied += applyFadeInAdjustment;
+                applyFadeInAdjustment(d);
+            }
 
             base.ApplyToDrawableHitObjects(drawables);
         }
 
-        private void applyFadeInAdjustment(DrawableHitObject hitObject, ArmedState state)
+        private void applyFadeInAdjustment(DrawableHitObject hitObject)
         {
             if (!(hitObject is DrawableOsuHitObject d))
                 return;
 
             d.HitObject.TimeFadeIn = d.HitObject.TimePreempt * fade_in_duration_multiplier;
+
+            foreach (var nested in d.NestedHitObjects)
+                applyFadeInAdjustment(nested);
         }
 
         private double lastSliderHeadFadeOutStartTime;
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 244cf831c3..6a0e416967 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -26,8 +26,16 @@ namespace osu.Game.Rulesets.Objects.Drawables
     [Cached(typeof(DrawableHitObject))]
     public abstract class DrawableHitObject : SkinReloadableDrawable
     {
+        /// <summary>
+        /// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied.
+        /// </summary>
         public event Action<DrawableHitObject> DefaultsApplied;
 
+        /// <summary>
+        /// Invoked after a <see cref="HitObject"/> has been applied to this <see cref="DrawableHitObject"/>.
+        /// </summary>
+        public event Action<DrawableHitObject> HitObjectApplied;
+
         /// <summary>
         /// The <see cref="HitObject"/> currently represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -215,6 +223,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             HitObject.DefaultsApplied += onDefaultsApplied;
 
             OnApply(hitObject);
+            HitObjectApplied?.Invoke(this);
 
             // If not loaded, the state update happens in LoadComplete(). Otherwise, the update is scheduled to allow for lifetime updates.
             if (IsLoaded)

From fe347c8661839179421ff7e4f7ce75d034d81a43 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 18:30:32 +0900
Subject: [PATCH 06136/10326] Add playfield support for keeping hitobjects
 alive

---
 osu.Game/Rulesets/UI/Playfield.cs | 35 +++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index d1cb8ecbbd..454880c885 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -187,6 +187,41 @@ namespace osu.Game.Rulesets.UI
         {
         }
 
+        /// <summary>
+        /// Sets whether to keep a given <see cref="HitObject"/> always alive within this or any nested <see cref="Playfield"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to set.</param>
+        /// <param name="keepAlive">Whether to keep <paramref name="hitObject"/> always alive.</param>
+        public void SetKeepAlive(HitObject hitObject, bool keepAlive)
+        {
+            if (lifetimeEntryMap.TryGetValue(hitObject, out var entry))
+            {
+                entry.KeepAlive = keepAlive;
+                return;
+            }
+
+            if (!nestedPlayfields.IsValueCreated)
+                return;
+
+            foreach (var p in nestedPlayfields.Value)
+                p.SetKeepAlive(hitObject, keepAlive);
+        }
+
+        /// <summary>
+        /// Keeps all <see cref="HitObject"/>s alive within this and all nested <see cref="Playfield"/>s.
+        /// </summary>
+        public void KeepAllAlive()
+        {
+            foreach (var (_, entry) in lifetimeEntryMap)
+                entry.KeepAlive = true;
+
+            if (!nestedPlayfields.IsValueCreated)
+                return;
+
+            foreach (var p in nestedPlayfields.Value)
+                p.KeepAllAlive();
+        }
+
         /// <summary>
         /// The cursor currently being used by this <see cref="Playfield"/>. May be null if no cursor is provided.
         /// </summary>

From 243e913e4a9129a2f1043d2ca8ba414828b9cedb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 18:32:20 +0900
Subject: [PATCH 06137/10326] Add hitobject usage events

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 20 ++++++++++++++++++++
 osu.Game/Rulesets/UI/Playfield.cs          | 20 ++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 4164681ffc..1797f0acb8 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -42,6 +42,22 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> RevertResult;
 
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
+        /// </remarks>
+        public event Action<HitObject> HitObjectUsageBegan;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
+        /// </remarks>
+        public event Action<HitObject> HitObjectUsageFinished;
+
         private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> drawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
@@ -88,6 +104,8 @@ namespace osu.Game.Rulesets.UI
 
             bindStartTime(drawable);
             AddInternal(drawableMap[entry] = drawable, false);
+
+            HitObjectUsageBegan?.Invoke(entry.HitObject);
         }
 
         private void removeDrawable(HitObjectLifetimeEntry entry)
@@ -103,6 +121,8 @@ namespace osu.Game.Rulesets.UI
 
             unbindStartTime(drawable);
             RemoveInternal(drawable);
+
+            HitObjectUsageFinished?.Invoke(entry.HitObject);
         }
 
         #endregion
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 454880c885..8f2be81c36 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -29,6 +29,22 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> RevertResult;
 
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
+        /// </remarks>
+        public event Action<HitObject> HitObjectUsageBegan;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
+        /// </remarks>
+        public event Action<HitObject> HitObjectUsageFinished;
+
         /// <summary>
         /// The <see cref="DrawableHitObject"/> contained in this Playfield.
         /// </summary>
@@ -88,6 +104,8 @@ namespace osu.Game.Rulesets.UI
             {
                 h.NewResult += (d, r) => NewResult?.Invoke(d, r);
                 h.RevertResult += (d, r) => RevertResult?.Invoke(d, r);
+                h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
+                h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
             }));
         }
 
@@ -247,6 +265,8 @@ namespace osu.Game.Rulesets.UI
 
             otherPlayfield.NewResult += (d, r) => NewResult?.Invoke(d, r);
             otherPlayfield.RevertResult += (d, r) => RevertResult?.Invoke(d, r);
+            otherPlayfield.HitObjectUsageBegan += h => HitObjectUsageBegan?.Invoke(h);
+            otherPlayfield.HitObjectUsageFinished += h => HitObjectUsageFinished?.Invoke(h);
 
             nestedPlayfields.Value.Add(otherPlayfield);
         }

From 8aaa500431b490adfd898fb722c75f3582f6f179 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 18:34:50 +0900
Subject: [PATCH 06138/10326] Add lifetime extensions

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 12 +++++++-
 osu.Game/Rulesets/UI/Playfield.cs          | 36 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 1797f0acb8..bca2466968 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -58,6 +58,16 @@ namespace osu.Game.Rulesets.UI
         /// </remarks>
         public event Action<HitObject> HitObjectUsageFinished;
 
+        /// <summary>
+        /// The amount of time prior to the current time within which <see cref="HitObject"/>s should be considered alive.
+        /// </summary>
+        public double PastLifetimeExtension { get; set; }
+
+        /// <summary>
+        /// The amount of time after the current time within which <see cref="HitObject"/>s should be considered alive.
+        /// </summary>
+        public double FutureLifetimeExtension { get; set; }
+
         private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> drawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
@@ -179,7 +189,7 @@ namespace osu.Game.Rulesets.UI
         protected override bool CheckChildrenLife()
         {
             bool aliveChanged = base.CheckChildrenLife();
-            aliveChanged |= lifetimeManager.Update(Time.Current, Time.Current);
+            aliveChanged |= lifetimeManager.Update(Time.Current - PastLifetimeExtension, Time.Current + FutureLifetimeExtension);
             return aliveChanged;
         }
 
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 8f2be81c36..5794ff348c 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -240,6 +240,42 @@ namespace osu.Game.Rulesets.UI
                 p.KeepAllAlive();
         }
 
+        /// <summary>
+        /// The amount of time prior to the current time within which <see cref="HitObject"/>s should be considered alive.
+        /// </summary>
+        public double PastLifetimeExtension
+        {
+            get => HitObjectContainer.PastLifetimeExtension;
+            set
+            {
+                HitObjectContainer.PastLifetimeExtension = value;
+
+                if (!nestedPlayfields.IsValueCreated)
+                    return;
+
+                foreach (var nested in nestedPlayfields.Value)
+                    nested.PastLifetimeExtension = value;
+            }
+        }
+
+        /// <summary>
+        /// The amount of time after the current time within which <see cref="HitObject"/>s should be considered alive.
+        /// </summary>
+        public double FutureLifetimeExtension
+        {
+            get => HitObjectContainer.FutureLifetimeExtension;
+            set
+            {
+                HitObjectContainer.FutureLifetimeExtension = value;
+
+                if (!nestedPlayfields.IsValueCreated)
+                    return;
+
+                foreach (var nested in nestedPlayfields.Value)
+                    nested.FutureLifetimeExtension = value;
+            }
+        }
+
         /// <summary>
         /// The cursor currently being used by this <see cref="Playfield"/>. May be null if no cursor is provided.
         /// </summary>

From 261ddd2b4a687c12245a963653aea3e76ff6e724 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 18:48:25 +0900
Subject: [PATCH 06139/10326] Fix samples not being disposed

---
 .../Objects/Drawables/DrawableHitObject.cs       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 244cf831c3..6af445939b 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Logging;
 using osu.Framework.Threading;
@@ -126,6 +127,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
         [CanBeNull]
         private HitObjectLifetimeEntry lifetimeEntry;
 
+        private Container<PausableSkinnableSound> samplesContainer;
+
         /// <summary>
         /// Creates a new <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -142,6 +145,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private void load(OsuConfigManager config)
         {
             config.BindWith(OsuSetting.PositionalHitSounds, userPositionalHitSounds);
+
+            // Explicit non-virtual function call.
+            base.AddInternal(samplesContainer = new Container<PausableSkinnableSound> { RelativeSizeAxes = Axes.Both });
         }
 
         protected override void LoadAsyncComplete()
@@ -296,11 +302,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         protected virtual void LoadSamples()
         {
-            if (Samples != null)
-            {
-                RemoveInternal(Samples);
-                Samples = null;
-            }
+            samplesContainer.Clear();
+            Samples = null;
 
             var samples = GetSamples().ToArray();
 
@@ -313,8 +316,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                                                     + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
             }
 
-            Samples = new PausableSkinnableSound(samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)));
-            AddInternal(Samples);
+            samplesContainer.Add(Samples = new PausableSkinnableSound(samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s))));
         }
 
         private void onSamplesChanged(object sender, NotifyCollectionChangedEventArgs e) => LoadSamples();

From 3f0a1271966dd84047f1ddbbbae18b7098d637be Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 18:51:58 +0900
Subject: [PATCH 06140/10326] Fix slider/spinner samples not being disposed

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 6 ++++--
 .../Objects/Drawables/DrawableSpinner.cs                  | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 5bbdc5ee7b..04fc755da5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Container<DrawableSliderTail> tailContainer;
         private Container<DrawableSliderTick> tickContainer;
         private Container<DrawableSliderRepeat> repeatContainer;
+        private Container<PausableSkinnableSound> samplesContainer;
 
         public DrawableSlider()
             : this(null)
@@ -68,6 +69,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Alpha = 0
                 },
                 headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both },
+                samplesContainer = new Container<PausableSkinnableSound> { RelativeSizeAxes = Axes.Both }
             };
 
             PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
@@ -105,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.LoadSamples();
 
-            slidingSample?.Expire();
+            samplesContainer.Clear();
             slidingSample = null;
 
             var firstSample = HitObject.Samples.FirstOrDefault();
@@ -115,7 +117,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
                 clone.Name = "sliderslide";
 
-                AddInternal(slidingSample = new PausableSkinnableSound(clone)
+                samplesContainer.Add(slidingSample = new PausableSkinnableSound(clone)
                 {
                     Looping = true
                 });
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 6b33517c33..824b8806e5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -29,6 +29,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private Container<DrawableSpinnerTick> ticks;
         private SpinnerBonusDisplay bonusDisplay;
+        private Container<PausableSkinnableSound> samplesContainer;
 
         private Bindable<bool> isSpinning;
         private bool spinnerFrequencyModulate;
@@ -75,7 +76,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Y = -120,
-                }
+                },
+                samplesContainer = new Container<PausableSkinnableSound> { RelativeSizeAxes = Axes.Both }
             };
 
             PositionBindable.BindValueChanged(pos => Position = pos.NewValue);
@@ -97,7 +99,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.LoadSamples();
 
-            spinningSample?.Expire();
+            samplesContainer.Clear();
             spinningSample = null;
 
             var firstSample = HitObject.Samples.FirstOrDefault();
@@ -107,7 +109,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
                 clone.Name = "spinnerspin";
 
-                AddInternal(spinningSample = new PausableSkinnableSound(clone)
+                samplesContainer.Add(spinningSample = new PausableSkinnableSound(clone)
                 {
                     Volume = { Value = 0 },
                     Looping = true,

From 1439c0f39289d7d5a3d8848a2fb2f2bd86d78783 Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Thu, 12 Nov 2020 23:19:29 +0100
Subject: [PATCH 06141/10326] Prevent SelectionBox handles from appearing when
 a stack of circles is selected

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index a72dcff1e9..fd7ea050b9 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -21,12 +21,12 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             base.OnSelectionChanged();
 
-            bool canOperate = EditorBeatmap.SelectedHitObjects.Count > 1 || EditorBeatmap.SelectedHitObjects.Any(s => s is Slider);
+            Quad quad = selectedMovableObjects.Length > 0 ? getSurroundingQuad(selectedMovableObjects) : new Quad();
 
-            SelectionBox.CanRotate = canOperate;
-            SelectionBox.CanScaleX = canOperate;
-            SelectionBox.CanScaleY = canOperate;
-            SelectionBox.CanReverse = canOperate;
+            SelectionBox.CanRotate = quad.Width > 0 || quad.Height > 0;
+            SelectionBox.CanScaleX = quad.Width > 0;
+            SelectionBox.CanScaleY = quad.Height > 0;
+            SelectionBox.CanReverse = EditorBeatmap.SelectedHitObjects.Count > 1 || EditorBeatmap.SelectedHitObjects.Any(s => s is Slider);
         }
 
         protected override void OnOperationEnded()

From 45ce6cc82d54e16529e4fd892237e4c892d2608e Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Fri, 13 Nov 2020 00:36:47 +0100
Subject: [PATCH 06142/10326] Allow spinners to be reversed

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index a72dcff1e9..ec0a6a2bcc 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -45,12 +45,12 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         public override bool HandleReverse()
         {
-            var hitObjects = selectedMovableObjects;
+            var hitObjects = EditorBeatmap.SelectedHitObjects;
 
             double endTime = hitObjects.Max(h => h.GetEndTime());
             double startTime = hitObjects.Min(h => h.StartTime);
 
-            bool moreThanOneObject = hitObjects.Length > 1;
+            bool moreThanOneObject = hitObjects.Count > 1;
 
             foreach (var h in hitObjects)
             {

From 43626573df0308b599d32499feb65458dc883277 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Nov 2020 13:15:54 +0900
Subject: [PATCH 06143/10326] Fix combo break sounds playing when seeking

---
 osu.Game/Screens/Play/ComboEffects.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/ComboEffects.cs b/osu.Game/Screens/Play/ComboEffects.cs
index 831b2f593c..f22fd541d0 100644
--- a/osu.Game/Screens/Play/ComboEffects.cs
+++ b/osu.Game/Screens/Play/ComboEffects.cs
@@ -38,12 +38,21 @@ namespace osu.Game.Screens.Play
             processor.Combo.BindValueChanged(onComboChange);
         }
 
+        [Resolved(canBeNull: true)]
+        private ISamplePlaybackDisabler samplePlaybackDisabler { get; set; }
+
         private void onComboChange(ValueChangedEvent<int> combo)
         {
             if (combo.NewValue == 0 && (combo.OldValue > 20 || (alwaysPlay.Value && firstTime)))
             {
-                comboBreakSample?.Play();
                 firstTime = false;
+
+                // combo break isn't a pausable sound itself as we want to let it play out.
+                // we still need to disable during seeks, though.
+                if (samplePlaybackDisabler?.SamplePlaybackDisabled.Value == true)
+                    return;
+
+                comboBreakSample?.Play();
             }
         }
     }

From 4b5743d993c5a8b9a2f279e6c6ef6df02540cb4b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Nov 2020 13:35:01 +0900
Subject: [PATCH 06144/10326] Fix combo break sound not playing after rewind

---
 osu.Game/Screens/Play/ComboEffects.cs | 21 ++++++++++++++++-----
 osu.Game/Screens/Play/Player.cs       |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/ComboEffects.cs b/osu.Game/Screens/Play/ComboEffects.cs
index f22fd541d0..5041d07e5d 100644
--- a/osu.Game/Screens/Play/ComboEffects.cs
+++ b/osu.Game/Screens/Play/ComboEffects.cs
@@ -17,8 +17,9 @@ namespace osu.Game.Screens.Play
 
         private SkinnableSound comboBreakSample;
 
-        private Bindable<bool> alwaysPlay;
-        private bool firstTime = true;
+        private Bindable<bool> alwaysPlayFirst;
+
+        private double? firstBreakTime;
 
         public ComboEffects(ScoreProcessor processor)
         {
@@ -29,7 +30,7 @@ namespace osu.Game.Screens.Play
         private void load(OsuConfigManager config)
         {
             InternalChild = comboBreakSample = new SkinnableSound(new SampleInfo("Gameplay/combobreak"));
-            alwaysPlay = config.GetBindable<bool>(OsuSetting.AlwaysPlayFirstComboBreak);
+            alwaysPlayFirst = config.GetBindable<bool>(OsuSetting.AlwaysPlayFirstComboBreak);
         }
 
         protected override void LoadComplete()
@@ -41,11 +42,21 @@ namespace osu.Game.Screens.Play
         [Resolved(canBeNull: true)]
         private ISamplePlaybackDisabler samplePlaybackDisabler { get; set; }
 
+        [Resolved]
+        private GameplayClock gameplayClock { get; set; }
+
         private void onComboChange(ValueChangedEvent<int> combo)
         {
-            if (combo.NewValue == 0 && (combo.OldValue > 20 || (alwaysPlay.Value && firstTime)))
+            // handle the case of rewinding before the first combo break time.
+            if (gameplayClock.CurrentTime < firstBreakTime)
+                firstBreakTime = null;
+
+            if (gameplayClock.ElapsedFrameTime < 0)
+                return;
+
+            if (combo.NewValue == 0 && (combo.OldValue > 20 || (alwaysPlayFirst.Value && firstBreakTime == null)))
             {
-                firstTime = false;
+                firstBreakTime = gameplayClock.CurrentTime;
 
                 // combo break isn't a pausable sound itself as we want to let it play out.
                 // we still need to disable during seeks, though.
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index f9af1818d0..49cc390775 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -302,12 +302,12 @@ namespace osu.Game.Screens.Play
                     {
                         ScoreProcessor,
                         HealthProcessor,
+                        new ComboEffects(ScoreProcessor),
                         breakTracker = new BreakTracker(DrawableRuleset.GameplayStartTime, ScoreProcessor)
                         {
                             Breaks = working.Beatmap.Breaks
                         }
                     }),
-                new ComboEffects(ScoreProcessor)
             }
         };
 

From a2c81a3a52f8daf0d81aee1626b7e48dbd91c2e4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Nov 2020 13:42:00 +0900
Subject: [PATCH 06145/10326] Add back setting to toggle "always play first
 combo break"

---
 .../Overlays/Settings/Sections/Gameplay/GeneralSettings.cs   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 9cb02ff3b9..be464fa2b7 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -68,6 +68,11 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Positional hitsounds",
                     Current = config.GetBindable<bool>(OsuSetting.PositionalHitSounds)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Always play first combo break sound",
+                    Current = config.GetBindable<bool>(OsuSetting.AlwaysPlayFirstComboBreak)
+                },
                 new SettingsEnumDropdown<ScoreMeterType>
                 {
                     LabelText = "Score meter type",

From 0985cb3327421220f0634d567a07f3a2688ed0a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Nov 2020 14:08:08 +0900
Subject: [PATCH 06146/10326] Fix perform from menu not hiding overlays if
 already on target screen

---
 .../Navigation/TestScenePerformFromScreen.cs  | 19 +++++++++++++++++++
 osu.Game/PerformFromMenuRunner.cs             |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
index a4190e0b84..21d3bdaae3 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Overlays;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
@@ -73,6 +76,22 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("did perform", () => actionPerformed);
         }
 
+        [Test]
+        public void TestOverlaysAlwaysClosed()
+        {
+            ChatOverlay chat = null;
+            AddUntilStep("is at menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
+            AddUntilStep("wait for chat load", () => (chat = Game.ChildrenOfType<ChatOverlay>().SingleOrDefault()) != null);
+
+            AddStep("show chat", () => InputManager.Key(Key.F8));
+
+            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
+
+            AddUntilStep("still at menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
+            AddAssert("did perform", () => actionPerformed);
+            AddAssert("chat closed", () => chat.State.Value == Visibility.Hidden);
+        }
+
         [TestCase(true)]
         [TestCase(false)]
         public void TestPerformBlockedByDialog(bool confirmed)
diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 9afe87f74f..5898c116dd 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -76,6 +76,8 @@ namespace osu.Game
             // a dialog may be blocking the execution for now.
             if (checkForDialog(current)) return;
 
+            game.CloseAllOverlays(false);
+
             // we may already be at the target screen type.
             if (validScreens.Contains(getCurrentScreen().GetType()) && !beatmap.Disabled)
             {
@@ -83,8 +85,6 @@ namespace osu.Game
                 return;
             }
 
-            game.CloseAllOverlays(false);
-
             while (current != null)
             {
                 if (validScreens.Contains(current.GetType()))

From 35329aa976747372fdfaa05079557b3abcfaecf4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 14:33:23 +0900
Subject: [PATCH 06147/10326] Reduce the number of state updates

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 56b725da0e..01f0e42d92 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -170,7 +170,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.LoadComplete();
 
-            StartTimeBindable.BindValueChanged(_ => updateState(State.Value, true));
             comboIndexBindable.BindValueChanged(_ => updateComboColour(), true);
 
             updateState(ArmedState.Idle, true);
@@ -220,6 +219,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             StartTimeBindable.BindTo(HitObject.StartTimeBindable);
+            StartTimeBindable.BindValueChanged(onStartTimeChanged);
+
             if (HitObject is IHasComboInformation combo)
                 comboIndexBindable.BindTo(combo.ComboIndexBindable);
 
@@ -249,9 +250,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
             StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
                 comboIndexBindable.UnbindFrom(combo.ComboIndexBindable);
-
             samplesBindable.UnbindFrom(HitObject.SamplesBindable);
 
+            // Changes in start time trigger state updates. When a new hitobject is applied, OnApply() automatically performs a state update anyway.
+            StartTimeBindable.ValueChanged -= onStartTimeChanged;
+
             // When a new hitobject is applied, the samples will be cleared before re-populating.
             // In order to stop this needless update, the event is unbound and re-bound as late as possible in Apply().
             samplesBindable.CollectionChanged -= onSamplesChanged;
@@ -330,6 +333,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void onSamplesChanged(object sender, NotifyCollectionChangedEventArgs e) => LoadSamples();
 
+        private void onStartTimeChanged(ValueChangedEvent<double> startTime) => updateState(State.Value, true);
+
         private void onNewResult(DrawableHitObject drawableHitObject, JudgementResult result) => OnNewResult?.Invoke(drawableHitObject, result);
 
         private void onRevertResult(DrawableHitObject drawableHitObject, JudgementResult result) => OnRevertResult?.Invoke(drawableHitObject, result);

From a07d4a7915aa262bfdfe64e3ce5ba3465a2da523 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 14:42:41 +0900
Subject: [PATCH 06148/10326] Remove unnecessary dictionary for now

---
 osu.Game/Rulesets/UI/Playfield.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index d1cb8ecbbd..573a57d701 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -136,8 +136,6 @@ namespace osu.Game.Rulesets.UI
             return false;
         }
 
-        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
-
         /// <summary>
         /// Adds a <see cref="HitObjectLifetimeEntry"/> for a pooled <see cref="HitObject"/> to this <see cref="Playfield"/>.
         /// </summary>
@@ -145,7 +143,6 @@ namespace osu.Game.Rulesets.UI
         public virtual void Add(HitObjectLifetimeEntry entry)
         {
             HitObjectContainer.Add(entry);
-            lifetimeEntryMap[entry.HitObject] = entry;
             OnHitObjectAdded(entry.HitObject);
         }
 
@@ -156,9 +153,8 @@ namespace osu.Game.Rulesets.UI
         /// <returns>Whether the <see cref="HitObject"/> was successfully removed.</returns>
         public virtual bool Remove(HitObjectLifetimeEntry entry)
         {
-            if (lifetimeEntryMap.Remove(entry.HitObject))
+            if (HitObjectContainer.Remove(entry))
             {
-                HitObjectContainer.Remove(entry);
                 OnHitObjectRemoved(entry.HitObject);
                 return true;
             }

From 4236dd826d7a834c7dc9056bfbfaf2dfa0d99e6b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 14:57:09 +0900
Subject: [PATCH 06149/10326] Improve documentation and make abstract again

---
 .../Visual/Gameplay/TestScenePoolingRuleset.cs      |  2 ++
 osu.Game/Rulesets/UI/DrawableRuleset.cs             | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
index c3ae753eae..242eaf7b7d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -142,6 +142,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             protected override HitObjectLifetimeEntry CreateLifetimeEntry(TestHitObject hitObject) => new TestHitObjectLifetimeEntry(hitObject);
 
+            public override DrawableHitObject<TestHitObject> CreateDrawableRepresentation(TestHitObject h) => null;
+
             protected override PassThroughInputManager CreateInputManager() => new PassThroughInputManager();
 
             protected override Playfield CreatePlayfield() => new TestPlayfield();
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 0429936d8e..c912348604 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -324,11 +324,16 @@ namespace osu.Game.Rulesets.UI
         }
 
         /// <summary>
-        /// Creates a DrawableHitObject from a HitObject.
+        /// Creates a <see cref="DrawableHitObject{TObject}"/> to represent a <see cref="HitObject"/>.
         /// </summary>
-        /// <param name="h">The HitObject to make drawable.</param>
-        /// <returns>The DrawableHitObject.</returns>
-        public virtual DrawableHitObject<TObject> CreateDrawableRepresentation(TObject h) => null;
+        /// <remarks>
+        /// If this method returns <c>null</c>, then this <see cref="DrawableRuleset"/> will assume the requested <see cref="HitObject"/> type is being pooled,
+        /// and will instead attempt to retrieve the <see cref="DrawableHitObject"/>s at the point they should become alive via pools registered through
+        /// <see cref="DrawableRuleset.RegisterPool{TObject, TDrawable}(int, int?)"/> or  <see cref="DrawableRuleset.RegisterPool{TObject, TDrawable}(DrawablePool{TDrawable})"/>.
+        /// </remarks>
+        /// <param name="h">The <see cref="HitObject"/> to represent.</param>
+        /// <returns>The representing <see cref="DrawableHitObject{TObject}"/>.</returns>
+        public abstract DrawableHitObject<TObject> CreateDrawableRepresentation(TObject h);
 
         public void Attach(KeyCounterDisplay keyCounter) =>
             (KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(keyCounter);

From beb6bbd2a14509f39bd5235bb8a7fb7583e51271 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 14:58:32 +0900
Subject: [PATCH 06150/10326] Implement now abstract method

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

diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index c89f138bcd..1d16c47818 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -59,6 +59,8 @@ namespace osu.Game.Rulesets.Osu.UI
             where TDrawable : DrawableHitObject, new()
             => new OsuDrawablePool<TDrawable>(Playfield.CheckHittable, Playfield.OnHitObjectLoaded, initialSize, maximumSize);
 
+        public override DrawableHitObject<OsuHitObject> CreateDrawableRepresentation(OsuHitObject h) => null;
+
         protected override HitObjectLifetimeEntry CreateLifetimeEntry(OsuHitObject hitObject) => new OsuHitObjectLifetimeEntry(hitObject);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true; // always show the gameplay cursor

From a9fc7572ed6ae0a9061c4d5d9ab8340829d59e5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Nov 2020 15:33:27 +0900
Subject: [PATCH 06151/10326] 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 5078fee1cf..6e3d5eec1f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1111.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1113.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 405fb1a6ca..1850ee3488 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1111.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1113.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 099ecd8319..2ac23f1503 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.Framework.iOS" Version="2020.1111.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1113.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1111.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1113.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 4ef2e9548c01dce805c1ce02d89e40626146531a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Nov 2020 19:52:02 +0900
Subject: [PATCH 06152/10326] Pass HitObjectComposer to BlueprintContainer via
 ctor

---
 .../Edit/ManiaBlueprintContainer.cs           |  5 +-
 .../Edit/ManiaHitObjectComposer.cs            |  5 +-
 .../Edit/OsuBlueprintContainer.cs             |  5 +-
 .../Edit/OsuHitObjectComposer.cs              |  5 +-
 .../Edit/TaikoBlueprintContainer.cs           |  5 +-
 .../Edit/TaikoHitObjectComposer.cs            |  5 +-
 .../TestSceneTimelineBlueprintContainer.cs    |  2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  7 +-
 .../Compose/Components/BlueprintContainer.cs  | 74 +++++++++++++------
 .../Components/ComposeBlueprintContainer.cs   | 26 +++----
 .../Timeline/TimelineBlueprintContainer.cs    |  3 +-
 .../Screens/Edit/Compose/ComposeScreen.cs     |  2 +-
 12 files changed, 83 insertions(+), 61 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
index cea27498c3..2fa3f378ff 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.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 osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -12,8 +11,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public class ManiaBlueprintContainer : ComposeBlueprintContainer
     {
-        public ManiaBlueprintContainer(IEnumerable<DrawableHitObject> drawableHitObjects)
-            : base(drawableHitObjects)
+        public ManiaBlueprintContainer(HitObjectComposer composer)
+            : base(composer)
         {
         }
 
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 7e2469a794..01d572447b 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -13,7 +13,6 @@ using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -89,8 +88,8 @@ namespace osu.Game.Rulesets.Mania.Edit
             return drawableRuleset;
         }
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
-            => new ManiaBlueprintContainer(hitObjects);
+        protected override ComposeBlueprintContainer CreateBlueprintContainer()
+            => new ManiaBlueprintContainer(this);
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
index 330f34b85c..a68ed34e6b 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.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 osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
@@ -14,8 +13,8 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuBlueprintContainer : ComposeBlueprintContainer
     {
-        public OsuBlueprintContainer(IEnumerable<DrawableHitObject> drawableHitObjects)
-            : base(drawableHitObjects)
+        public OsuBlueprintContainer(HitObjectComposer composer)
+            : base(composer)
         {
         }
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index edd684d886..bfa8ab4431 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -16,7 +16,6 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
@@ -80,8 +79,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             updateDistanceSnapGrid();
         }
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
-            => new OsuBlueprintContainer(hitObjects);
+        protected override ComposeBlueprintContainer CreateBlueprintContainer()
+            => new OsuBlueprintContainer(this);
 
         private DistanceSnapGrid distanceSnapGrid;
         private Container distanceSnapGridContainer;
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
index 35227b3c64..8b41448c9d 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.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 osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
@@ -11,8 +10,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
 {
     public class TaikoBlueprintContainer : ComposeBlueprintContainer
     {
-        public TaikoBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
-            : base(hitObjects)
+        public TaikoBlueprintContainer(HitObjectComposer composer)
+            : base(composer)
         {
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index cdc9672a8e..161799c980 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -24,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
             new SwellCompositionTool()
         };
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
-            => new TaikoBlueprintContainer(hitObjects);
+        protected override ComposeBlueprintContainer CreateBlueprintContainer()
+            => new TaikoBlueprintContainer(this);
     }
 }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
index e931be044c..5da63eddf1 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Tests.Visual.Editing
     [TestFixture]
     public class TestSceneTimelineBlueprintContainer : TimelineTestScene
     {
-        public override Drawable CreateTestComponent() => new TimelineBlueprintContainer();
+        public override Drawable CreateTestComponent() => new TimelineBlueprintContainer(null);
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index c9dd061b48..b90aa6863a 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Edit
                         drawableRulesetWrapper,
                         // layers above playfield
                         drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer()
-                                              .WithChild(BlueprintContainer = CreateBlueprintContainer(HitObjects))
+                                              .WithChild(BlueprintContainer = CreateBlueprintContainer())
                     }
                 },
                 new FillFlowContainer
@@ -182,9 +182,8 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
         /// </summary>
-        /// <param name="hitObjects">A live collection of all <see cref="DrawableHitObject"/>s in the editor beatmap.</param>
-        protected virtual ComposeBlueprintContainer CreateBlueprintContainer(IEnumerable<DrawableHitObject> hitObjects)
-            => new ComposeBlueprintContainer(hitObjects);
+        protected virtual ComposeBlueprintContainer CreateBlueprintContainer()
+            => new ComposeBlueprintContainer(this);
 
         /// <summary>
         /// Construct a drawable ruleset for the provided ruleset.
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index b67f6a6ba6..3145616cf7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.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.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
@@ -44,12 +45,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected EditorBeatmap Beatmap { get; private set; }
 
         private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
+        private readonly HitObjectComposer composer;
+        private readonly Dictionary<HitObject, SelectionBlueprint> blueprintMap = new Dictionary<HitObject, SelectionBlueprint>();
 
         [Resolved(canBeNull: true)]
         private IPositionSnapProvider snapProvider { get; set; }
 
-        protected BlueprintContainer()
+        protected BlueprintContainer(HitObjectComposer composer)
         {
+            this.composer = composer;
+
             RelativeSizeAxes = Axes.Both;
         }
 
@@ -68,8 +73,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DragBox.CreateProxy().With(p => p.Depth = float.MinValue)
             });
 
-            foreach (var obj in Beatmap.HitObjects)
-                AddBlueprintFor(obj);
+            // For non-pooled rulesets, hitobjects are already present in the playfield which allows the blueprints to be loaded in the async context.
+            if (composer != null)
+            {
+                foreach (var obj in composer.HitObjects)
+                    addBlueprintFor(obj.HitObject);
+            }
 
             selectedHitObjects.BindTo(Beatmap.SelectedHitObjects);
             selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
@@ -94,7 +103,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.LoadComplete();
 
-            Beatmap.HitObjectAdded += AddBlueprintFor;
+            Beatmap.HitObjectAdded += addBlueprintFor;
             Beatmap.HitObjectRemoved += removeBlueprintFor;
         }
 
@@ -247,29 +256,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #region Blueprint Addition/Removal
 
-        private void removeBlueprintFor(HitObject hitObject)
+        private void addBlueprintFor(HitObject hitObject)
         {
-            var blueprint = SelectionBlueprints.SingleOrDefault(m => m.HitObject == hitObject);
-            if (blueprint == null)
+            if (blueprintMap.ContainsKey(hitObject))
                 return;
 
-            blueprint.Deselect();
-
-            blueprint.Selected -= onBlueprintSelected;
-            blueprint.Deselected -= onBlueprintDeselected;
-
-            SelectionBlueprints.Remove(blueprint);
-
-            if (movementBlueprint == blueprint)
-                finishSelectionMovement();
-        }
-
-        protected virtual void AddBlueprintFor(HitObject hitObject)
-        {
             var blueprint = CreateBlueprintFor(hitObject);
             if (blueprint == null)
                 return;
 
+            blueprintMap[hitObject] = blueprint;
+
             blueprint.Selected += onBlueprintSelected;
             blueprint.Deselected += onBlueprintDeselected;
 
@@ -277,6 +274,41 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 blueprint.Select();
 
             SelectionBlueprints.Add(blueprint);
+
+            OnBlueprintAdded(hitObject);
+        }
+
+        private void removeBlueprintFor(HitObject hitObject)
+        {
+            if (!blueprintMap.Remove(hitObject, out var blueprint))
+                return;
+
+            blueprint.Deselect();
+            blueprint.Selected -= onBlueprintSelected;
+            blueprint.Deselected -= onBlueprintDeselected;
+
+            SelectionBlueprints.Remove(blueprint);
+
+            if (movementBlueprint == blueprint)
+                finishSelectionMovement();
+
+            OnBlueprintRemoved(hitObject);
+        }
+
+        /// <summary>
+        /// Called after a <see cref="HitObject"/> blueprint has been added.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> for which the blueprint has been added.</param>
+        protected virtual void OnBlueprintAdded(HitObject hitObject)
+        {
+        }
+
+        /// <summary>
+        /// Called after a <see cref="HitObject"/> blueprint has been removed.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> for which the blueprint has been removed.</param>
+        protected virtual void OnBlueprintRemoved(HitObject hitObject)
+        {
         }
 
         #endregion
@@ -456,7 +488,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (Beatmap != null)
             {
-                Beatmap.HitObjectAdded -= AddBlueprintFor;
+                Beatmap.HitObjectAdded -= addBlueprintFor;
                 Beatmap.HitObjectRemoved -= removeBlueprintFor;
             }
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 1527d20f54..27190e9aad 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -27,22 +27,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public class ComposeBlueprintContainer : BlueprintContainer
     {
-        [Resolved]
-        private HitObjectComposer composer { get; set; }
-
-        private PlacementBlueprint currentPlacement;
-
-        private readonly Container<PlacementBlueprint> placementBlueprintContainer;
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
+        private readonly HitObjectComposer composer;
+        private readonly Container<PlacementBlueprint> placementBlueprintContainer;
+
+        private PlacementBlueprint currentPlacement;
         private InputManager inputManager;
 
-        private readonly IEnumerable<DrawableHitObject> drawableHitObjects;
-
-        public ComposeBlueprintContainer(IEnumerable<DrawableHitObject> drawableHitObjects)
+        public ComposeBlueprintContainer(HitObjectComposer composer)
+            : base(composer)
         {
-            this.drawableHitObjects = drawableHitObjects;
+            this.composer = composer;
 
             placementBlueprintContainer = new Container<PlacementBlueprint>
             {
@@ -186,7 +182,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
         {
-            var drawable = drawableHitObjects.FirstOrDefault(d => d.HitObject == hitObject);
+            var drawable = composer.HitObjects.FirstOrDefault(d => d.HitObject == hitObject);
 
             if (drawable == null)
                 return null;
@@ -196,11 +192,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public virtual OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
 
-        protected override void AddBlueprintFor(HitObject hitObject)
+        protected override void OnBlueprintAdded(HitObject hitObject)
         {
-            refreshTool();
+            base.OnBlueprintAdded(hitObject);
 
-            base.AddBlueprintFor(hitObject);
+            refreshTool();
 
             // on successful placement, the new combo button should be reset as this is the most common user interaction.
             if (Beatmap.SelectedHitObjects.Count == 0)
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 10913a8bb9..078a158e3d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -31,7 +31,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private SelectionBlueprint placementBlueprint;
 
-        public TimelineBlueprintContainer()
+        public TimelineBlueprintContainer(HitObjectComposer composer)
+            : base(composer)
         {
             RelativeSizeAxes = Axes.Both;
             Anchor = Anchor.Centre;
diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 5282b4d998..d9948aa23c 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -53,6 +53,6 @@ namespace osu.Game.Screens.Edit.Compose
             return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(composer));
         }
 
-        protected override Drawable CreateTimelineContent() => composer == null ? base.CreateTimelineContent() : new TimelineBlueprintContainer();
+        protected override Drawable CreateTimelineContent() => composer == null ? base.CreateTimelineContent() : new TimelineBlueprintContainer(composer);
     }
 }

From 3957697c4840072fc9e0b128d1e7981f91ee2988 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 17:08:20 +0900
Subject: [PATCH 06153/10326] Add pooling support to the editor

---
 .../Edit/DrawableEditRulesetWrapper.cs        |  9 ++----
 .../Compose/Components/BlueprintContainer.cs  | 28 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs b/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
index 8ed7885101..c60d4c7834 100644
--- a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
+++ b/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -65,17 +64,13 @@ namespace osu.Game.Rulesets.Edit
 
         private void addHitObject(HitObject hitObject)
         {
-            var drawableObject = drawableRuleset.CreateDrawableRepresentation((TObject)hitObject);
-
-            drawableRuleset.Playfield.Add(drawableObject);
+            drawableRuleset.AddHitObject((TObject)hitObject);
             drawableRuleset.Playfield.PostProcess();
         }
 
         private void removeHitObject(HitObject hitObject)
         {
-            var drawableObject = Playfield.AllHitObjects.Single(d => d.HitObject == hitObject);
-
-            drawableRuleset.Playfield.Remove(drawableObject);
+            drawableRuleset.RemoveHitObject((TObject)hitObject);
             drawableRuleset.Playfield.PostProcess();
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 3145616cf7..450c42f7fe 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -105,6 +105,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             Beatmap.HitObjectAdded += addBlueprintFor;
             Beatmap.HitObjectRemoved += removeBlueprintFor;
+
+            if (composer != null)
+            {
+                // For pooled rulesets, blueprints must be added for hitobjects already "current" as they would've not been "current" during the async load addition process above.
+                foreach (var obj in composer.HitObjects)
+                    addBlueprintFor(obj.HitObject);
+
+                composer.Playfield.HitObjectUsageBegan += addBlueprintFor;
+                composer.Playfield.HitObjectUsageFinished += removeBlueprintFor;
+            }
         }
 
         protected virtual Container<SelectionBlueprint> CreateSelectionBlueprintContainer() =>
@@ -381,7 +391,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Selects all <see cref="SelectionBlueprint"/>s.
         /// </summary>
-        private void selectAll() => SelectionBlueprints.ToList().ForEach(m => m.Select());
+        private void selectAll()
+        {
+            composer.Playfield.KeepAllAlive();
+
+            // Scheduled to allow the change in lifetime to take place.
+            Schedule(() => SelectionBlueprints.ToList().ForEach(m => m.Select()));
+        }
 
         /// <summary>
         /// Deselects all selected <see cref="SelectionBlueprint"/>s.
@@ -392,12 +408,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             SelectionHandler.HandleSelected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 1);
+
+            composer.Playfield.SetKeepAlive(blueprint.HitObject, true);
         }
 
         private void onBlueprintDeselected(SelectionBlueprint blueprint)
         {
             SelectionHandler.HandleDeselected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 0);
+
+            composer.Playfield.SetKeepAlive(blueprint.HitObject, false);
         }
 
         #endregion
@@ -491,6 +511,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 Beatmap.HitObjectAdded -= addBlueprintFor;
                 Beatmap.HitObjectRemoved -= removeBlueprintFor;
             }
+
+            if (composer != null)
+            {
+                composer.Playfield.HitObjectUsageBegan -= addBlueprintFor;
+                composer.Playfield.HitObjectUsageFinished -= removeBlueprintFor;
+            }
         }
     }
 }

From 0219aff7bc7cbec5f4e41d533b5fbf17fd3a7c9b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 17:10:29 +0900
Subject: [PATCH 06154/10326] Add timeline visible range adjustment

---
 .../Compose/Components/BlueprintContainer.cs  | 29 ++++++++++---------
 .../Components/ComposeBlueprintContainer.cs   |  9 ++----
 .../Compose/Components/Timeline/Timeline.cs   |  5 ++++
 .../Timeline/TimelineBlueprintContainer.cs    |  8 +++--
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 450c42f7fe..3229719d5a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -35,6 +35,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected SelectionHandler SelectionHandler { get; private set; }
 
+        protected readonly HitObjectComposer Composer;
+
         [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }
 
@@ -45,7 +47,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected EditorBeatmap Beatmap { get; private set; }
 
         private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
-        private readonly HitObjectComposer composer;
         private readonly Dictionary<HitObject, SelectionBlueprint> blueprintMap = new Dictionary<HitObject, SelectionBlueprint>();
 
         [Resolved(canBeNull: true)]
@@ -53,7 +54,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected BlueprintContainer(HitObjectComposer composer)
         {
-            this.composer = composer;
+            Composer = composer;
 
             RelativeSizeAxes = Axes.Both;
         }
@@ -74,9 +75,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             });
 
             // For non-pooled rulesets, hitobjects are already present in the playfield which allows the blueprints to be loaded in the async context.
-            if (composer != null)
+            if (Composer != null)
             {
-                foreach (var obj in composer.HitObjects)
+                foreach (var obj in Composer.HitObjects)
                     addBlueprintFor(obj.HitObject);
             }
 
@@ -106,14 +107,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             Beatmap.HitObjectAdded += addBlueprintFor;
             Beatmap.HitObjectRemoved += removeBlueprintFor;
 
-            if (composer != null)
+            if (Composer != null)
             {
                 // For pooled rulesets, blueprints must be added for hitobjects already "current" as they would've not been "current" during the async load addition process above.
-                foreach (var obj in composer.HitObjects)
+                foreach (var obj in Composer.HitObjects)
                     addBlueprintFor(obj.HitObject);
 
-                composer.Playfield.HitObjectUsageBegan += addBlueprintFor;
-                composer.Playfield.HitObjectUsageFinished += removeBlueprintFor;
+                Composer.Playfield.HitObjectUsageBegan += addBlueprintFor;
+                Composer.Playfield.HitObjectUsageFinished += removeBlueprintFor;
             }
         }
 
@@ -393,7 +394,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private void selectAll()
         {
-            composer.Playfield.KeepAllAlive();
+            Composer.Playfield.KeepAllAlive();
 
             // Scheduled to allow the change in lifetime to take place.
             Schedule(() => SelectionBlueprints.ToList().ForEach(m => m.Select()));
@@ -409,7 +410,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             SelectionHandler.HandleSelected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 1);
 
-            composer.Playfield.SetKeepAlive(blueprint.HitObject, true);
+            Composer.Playfield.SetKeepAlive(blueprint.HitObject, true);
         }
 
         private void onBlueprintDeselected(SelectionBlueprint blueprint)
@@ -417,7 +418,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             SelectionHandler.HandleDeselected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 0);
 
-            composer.Playfield.SetKeepAlive(blueprint.HitObject, false);
+            Composer.Playfield.SetKeepAlive(blueprint.HitObject, false);
         }
 
         #endregion
@@ -512,10 +513,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 Beatmap.HitObjectRemoved -= removeBlueprintFor;
             }
 
-            if (composer != null)
+            if (Composer != null)
             {
-                composer.Playfield.HitObjectUsageBegan -= addBlueprintFor;
-                composer.Playfield.HitObjectUsageFinished -= removeBlueprintFor;
+                Composer.Playfield.HitObjectUsageBegan -= addBlueprintFor;
+                Composer.Playfield.HitObjectUsageFinished -= removeBlueprintFor;
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 27190e9aad..0d2e2360b1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -29,7 +29,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
     {
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
-        private readonly HitObjectComposer composer;
         private readonly Container<PlacementBlueprint> placementBlueprintContainer;
 
         private PlacementBlueprint currentPlacement;
@@ -38,8 +37,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public ComposeBlueprintContainer(HitObjectComposer composer)
             : base(composer)
         {
-            this.composer = composer;
-
             placementBlueprintContainer = new Container<PlacementBlueprint>
             {
                 RelativeSizeAxes = Axes.Both
@@ -158,7 +155,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void updatePlacementPosition()
         {
-            var snapResult = composer.SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position);
+            var snapResult = Composer.SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position);
 
             currentPlacement.UpdatePosition(snapResult);
         }
@@ -169,7 +166,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.Update();
 
-            if (composer.CursorInPlacementArea)
+            if (Composer.CursorInPlacementArea)
                 createPlacement();
             else if (currentPlacement?.PlacementActive == false)
                 removePlacement();
@@ -182,7 +179,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
         {
-            var drawable = composer.HitObjects.FirstOrDefault(d => d.HitObject == hitObject);
+            var drawable = Composer.HitObjects.FirstOrDefault(d => d.HitObject == hitObject);
 
             if (drawable == null)
                 return null;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 7233faa955..f6675902fc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -219,6 +219,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private IBeatSnapProvider beatSnapProvider { get; set; }
 
+        /// <summary>
+        /// The total amount of time visible on the timeline.
+        /// </summary>
+        public double VisibleRange => track.Length / Zoom;
+
         public SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) =>
             new SnapResult(screenSpacePosition, beatSnapProvider.SnapTime(getTimeFromPosition(Content.ToLocalSpace(screenSpacePosition))));
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 078a158e3d..0271b2def9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -26,9 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private EditorBeatmap beatmap { get; set; }
 
         private DragEvent lastDragEvent;
-
         private Bindable<HitObject> placement;
-
         private SelectionBlueprint placementBlueprint;
 
         public TimelineBlueprintContainer(HitObjectComposer composer)
@@ -98,6 +96,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (lastDragEvent != null)
                 OnDrag(lastDragEvent);
 
+            if (Composer != null)
+            {
+                Composer.Playfield.PastLifetimeExtension = timeline.VisibleRange / 2;
+                Composer.Playfield.FutureLifetimeExtension = timeline.VisibleRange / 2;
+            }
+
             base.Update();
         }
 

From 688a442fb3fc1bdb895212dce631ef716996a875 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 17:26:46 +0900
Subject: [PATCH 06155/10326] Add missing dictionary

---
 osu.Game/Rulesets/UI/Playfield.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index e27375bd37..f12db57199 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -154,6 +154,8 @@ namespace osu.Game.Rulesets.UI
             return false;
         }
 
+        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
+
         /// <summary>
         /// Adds a <see cref="HitObjectLifetimeEntry"/> for a pooled <see cref="HitObject"/> to this <see cref="Playfield"/>.
         /// </summary>
@@ -161,6 +163,7 @@ namespace osu.Game.Rulesets.UI
         public virtual void Add(HitObjectLifetimeEntry entry)
         {
             HitObjectContainer.Add(entry);
+            lifetimeEntryMap[entry.HitObject] = entry;
             OnHitObjectAdded(entry.HitObject);
         }
 
@@ -173,6 +176,7 @@ namespace osu.Game.Rulesets.UI
         {
             if (HitObjectContainer.Remove(entry))
             {
+                lifetimeEntryMap.Remove(entry.HitObject);
                 OnHitObjectRemoved(entry.HitObject);
                 return true;
             }

From f7f70d41dfb73719b99aadcaa592684621031687 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 17:28:14 +0900
Subject: [PATCH 06156/10326] Add osu! editor pooling support

---
 .../Edit/DrawableOsuEditRuleset.cs            | 51 +--------------
 .../UI/OsuEditDrawablePool.cs                 | 63 +++++++++++++++++++
 2 files changed, 66 insertions(+), 48 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/UI/OsuEditDrawablePool.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index 746ff4ac19..05396ebc8b 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -2,13 +2,9 @@
 // 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.Pooling;
 using osu.Game.Beatmaps;
 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 osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
 using osuTK;
@@ -17,54 +13,13 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class DrawableOsuEditRuleset : DrawableOsuRuleset
     {
-        /// <summary>
-        /// Hit objects are intentionally made to fade out at a constant slower rate than in gameplay.
-        /// This allows a mapper to gain better historical context and use recent hitobjects as reference / snap points.
-        /// </summary>
-        private const double editor_hit_object_fade_out_extension = 700;
-
         public DrawableOsuEditRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(ruleset, beatmap, mods)
         {
         }
 
-        public override DrawableHitObject<OsuHitObject> CreateDrawableRepresentation(OsuHitObject h)
-            => base.CreateDrawableRepresentation(h)?.With(d => d.ApplyCustomUpdateState += updateState);
-
-        private void updateState(DrawableHitObject hitObject, ArmedState state)
-        {
-            if (state == ArmedState.Idle)
-                return;
-
-            // adjust the visuals of certain object types to make them stay on screen for longer than usual.
-            switch (hitObject)
-            {
-                default:
-                    // there are quite a few drawable hit types we don't want to extent (spinners, ticks etc.)
-                    return;
-
-                case DrawableSlider _:
-                    // no specifics to sliders but let them fade slower below.
-                    break;
-
-                case DrawableHitCircle circle: // also handles slider heads
-                    circle.ApproachCircle
-                          .FadeOutFromOne(editor_hit_object_fade_out_extension)
-                          .Expire();
-                    break;
-            }
-
-            // Get the existing fade out transform
-            var existing = hitObject.Transforms.LastOrDefault(t => t.TargetMember == nameof(Alpha));
-
-            if (existing == null)
-                return;
-
-            hitObject.RemoveTransform(existing);
-
-            using (hitObject.BeginAbsoluteSequence(existing.StartTime))
-                hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
-        }
+        protected override DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
+            => new OsuEditDrawablePool<TDrawable>(Playfield.CheckHittable, Playfield.OnHitObjectLoaded, initialSize, maximumSize);
 
         protected override Playfield CreatePlayfield() => new OsuPlayfieldNoCursor();
 
diff --git a/osu.Game.Rulesets.Osu/UI/OsuEditDrawablePool.cs b/osu.Game.Rulesets.Osu/UI/OsuEditDrawablePool.cs
new file mode 100644
index 0000000000..822ff076f5
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/OsuEditDrawablePool.cs
@@ -0,0 +1,63 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    public class OsuEditDrawablePool<T> : OsuDrawablePool<T>
+        where T : DrawableHitObject, new()
+    {
+        /// <summary>
+        /// Hit objects are intentionally made to fade out at a constant slower rate than in gameplay.
+        /// This allows a mapper to gain better historical context and use recent hitobjects as reference / snap points.
+        /// </summary>
+        private const double editor_hit_object_fade_out_extension = 700;
+
+        public OsuEditDrawablePool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null)
+            : base(checkHittable, onLoaded, initialSize, maximumSize)
+        {
+        }
+
+        protected override T CreateNewDrawable() => base.CreateNewDrawable().With(d => d.ApplyCustomUpdateState += updateState);
+
+        private void updateState(DrawableHitObject hitObject, ArmedState state)
+        {
+            if (state == ArmedState.Idle)
+                return;
+
+            // adjust the visuals of certain object types to make them stay on screen for longer than usual.
+            switch (hitObject)
+            {
+                default:
+                    // there are quite a few drawable hit types we don't want to extent (spinners, ticks etc.)
+                    return;
+
+                case DrawableSlider _:
+                    // no specifics to sliders but let them fade slower below.
+                    break;
+
+                case DrawableHitCircle circle: // also handles slider heads
+                    circle.ApproachCircle
+                          .FadeOutFromOne(editor_hit_object_fade_out_extension)
+                          .Expire();
+                    break;
+            }
+
+            // Get the existing fade out transform
+            var existing = hitObject.Transforms.LastOrDefault(t => t.TargetMember == nameof(Alpha));
+
+            if (existing == null)
+                return;
+
+            hitObject.RemoveTransform(existing);
+
+            using (hitObject.BeginAbsoluteSequence(existing.StartTime))
+                hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
+        }
+    }
+}

From 864e4006b96e2f1c2948ebc086e18f9c44d4f0ad Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 17:51:01 +0900
Subject: [PATCH 06157/10326] Fix timeline test

---
 .../TestSceneTimelineBlueprintContainer.cs    |  2 +-
 .../Visual/Editing/TimelineTestScene.cs       |  6 ++++-
 osu.Game.Tests/WaveformTestBeatmap.cs         | 25 +++----------------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
index 5da63eddf1..6b54bcb4f0 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Tests.Visual.Editing
     [TestFixture]
     public class TestSceneTimelineBlueprintContainer : TimelineTestScene
     {
-        public override Drawable CreateTestComponent() => new TimelineBlueprintContainer(null);
+        public override Drawable CreateTestComponent() => new TimelineBlueprintContainer(Composer);
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index fdb8781563..63bb018d6e 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -21,21 +21,25 @@ namespace osu.Game.Tests.Visual.Editing
     {
         protected TimelineArea TimelineArea { get; private set; }
 
+        protected HitObjectComposer Composer { get; private set; }
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
             Beatmap.Value = new WaveformTestBeatmap(audio);
 
             var playable = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
-
             var editorBeatmap = new EditorBeatmap(playable);
 
             Dependencies.Cache(editorBeatmap);
             Dependencies.CacheAs<IBeatSnapProvider>(editorBeatmap);
 
+            Composer = playable.BeatmapInfo.Ruleset.CreateInstance().CreateHitObjectComposer().With(d => d.Alpha = 0);
+
             AddRange(new Drawable[]
             {
                 editorBeatmap,
+                Composer,
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index f9613d9e25..8c8c827404 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -8,10 +8,9 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 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.Rulesets;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
 
@@ -25,8 +24,8 @@ namespace osu.Game.Tests
         private readonly Beatmap beatmap;
         private readonly ITrackStore trackStore;
 
-        public WaveformTestBeatmap(AudioManager audioManager)
-            : this(audioManager, new WaveformBeatmap())
+        public WaveformTestBeatmap(AudioManager audioManager, RulesetInfo rulesetInfo = null)
+            : this(audioManager, new TestBeatmap(rulesetInfo ?? new OsuRuleset().RulesetInfo))
         {
         }
 
@@ -63,21 +62,5 @@ namespace osu.Game.Tests
                     return reader.Filenames.First(f => f.EndsWith(".mp3", StringComparison.Ordinal));
             }
         }
-
-        private class WaveformBeatmap : TestBeatmap
-        {
-            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", StringComparison.Ordinal))))
-                using (var beatmapReader = new LineBufferedReader(beatmapStream))
-                    return Decoder.GetDecoder<Beatmap>(beatmapReader).Decode(beatmapReader);
-            }
-        }
     }
 }

From 832d52a05678b723aed22832bfc31cb5a77e6c8a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 18:19:07 +0900
Subject: [PATCH 06158/10326] Fix hitobject sample tests

---
 osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs |  2 --
 osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs       | 11 +++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index 6b95931b21..64eaafbe75 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.IO.Stores;
-using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Tests.Beatmaps;
@@ -12,7 +11,6 @@ using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Tests.Gameplay
 {
-    [HeadlessTest]
     public class TestSceneHitObjectSamples : HitObjectSampleTest
     {
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index 1e43e5d148..e3557222d5 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -9,11 +9,14 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Visual;
@@ -21,6 +24,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Beatmaps
 {
+    [HeadlessTest]
     public abstract class HitObjectSampleTest : PlayerTestScene
     {
         protected abstract IResourceStore<byte[]> Resources { get; }
@@ -44,7 +48,9 @@ namespace osu.Game.Tests.Beatmaps
         private readonly TestResourceStore beatmapSkinResourceStore = new TestResourceStore();
         private SkinSourceDependencyContainer dependencies;
         private IBeatmap currentTestBeatmap;
+
         protected sealed override bool HasCustomSteps => true;
+        protected override bool Autoplay => true;
 
         protected sealed override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             => new DependencyContainer(dependencies = new SkinSourceDependencyContainer(base.CreateChildDependencies(parent)));
@@ -54,6 +60,8 @@ namespace osu.Game.Tests.Beatmaps
         protected sealed override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
             => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, Audio);
 
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(false);
+
         protected void CreateTestWithBeatmap(string filename)
         {
             CreateTest(() =>
@@ -73,6 +81,9 @@ namespace osu.Game.Tests.Beatmaps
                     currentTestBeatmap.BeatmapInfo.Ruleset = rulesetStore.GetRuleset(currentTestBeatmap.BeatmapInfo.RulesetID);
                 });
             });
+
+            AddStep("seek to completion", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.Objects.Last().GetEndTime()));
+            AddUntilStep("results displayed", () => Stack.CurrentScreen is ResultsScreen);
         }
 
         protected void SetupSkins(string beatmapFile, string userFile)

From feabca860bbbdc603fa391c7f9d19822789d26cc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 18:35:33 +0900
Subject: [PATCH 06159/10326] Fix sample playback test

---
 .../Visual/Gameplay/TestSceneGameplaySamplePlayback.cs    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index b86cb69eb4..7c6a213fe2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
@@ -23,11 +23,13 @@ namespace osu.Game.Tests.Visual.Gameplay
             DrawableSample[] samples = null;
             ISamplePlaybackDisabler sampleDisabler = null;
 
-            AddStep("get variables", () =>
+            AddUntilStep("get variables", () =>
             {
                 sampleDisabler = Player;
-                slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
-                samples = slider.ChildrenOfType<DrawableSample>().ToArray();
+                slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).FirstOrDefault();
+                samples = slider?.ChildrenOfType<DrawableSample>().ToArray();
+
+                return slider != null;
             });
 
             AddUntilStep("wait for slider sliding then seek", () =>

From 92189e35ccb160bb41d6a4a52a9073f1b072bf0d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 18:52:53 +0900
Subject: [PATCH 06160/10326] Make playfield KeepAlive methods internal

---
 osu.Game/Rulesets/UI/Playfield.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index f12db57199..fb2a60399b 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to set.</param>
         /// <param name="keepAlive">Whether to keep <paramref name="hitObject"/> always alive.</param>
-        public void SetKeepAlive(HitObject hitObject, bool keepAlive)
+        internal void SetKeepAlive(HitObject hitObject, bool keepAlive)
         {
             if (lifetimeEntryMap.TryGetValue(hitObject, out var entry))
             {
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// Keeps all <see cref="HitObject"/>s alive within this and all nested <see cref="Playfield"/>s.
         /// </summary>
-        public void KeepAllAlive()
+        internal void KeepAllAlive()
         {
             foreach (var (_, entry) in lifetimeEntryMap)
                 entry.KeepAlive = true;

From 4a4219fd117edb714c9493bd0674ccca78df8c91 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 18:53:37 +0900
Subject: [PATCH 06161/10326] Add region

---
 osu.Game/Rulesets/UI/Playfield.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index fb2a60399b..e2578e9822 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -154,8 +154,6 @@ namespace osu.Game.Rulesets.UI
             return false;
         }
 
-        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
-
         /// <summary>
         /// Adds a <see cref="HitObjectLifetimeEntry"/> for a pooled <see cref="HitObject"/> to this <see cref="Playfield"/>.
         /// </summary>
@@ -205,6 +203,10 @@ namespace osu.Game.Rulesets.UI
         {
         }
 
+        #region Editor logic
+
+        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
+
         /// <summary>
         /// Sets whether to keep a given <see cref="HitObject"/> always alive within this or any nested <see cref="Playfield"/>.
         /// </summary>
@@ -276,6 +278,8 @@ namespace osu.Game.Rulesets.UI
             }
         }
 
+        #endregion
+
         /// <summary>
         /// The cursor currently being used by this <see cref="Playfield"/>. May be null if no cursor is provided.
         /// </summary>

From d83b479c8122a0819f81819ef4967c80cff1b483 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 18:54:49 +0900
Subject: [PATCH 06162/10326] Internalise lifetime extensions and events too

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs |   8 +-
 osu.Game/Rulesets/UI/Playfield.cs          | 186 ++++++++++-----------
 2 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index bca2466968..25fb7ab9f3 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.UI
         /// <remarks>
         /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
         /// </remarks>
-        public event Action<HitObject> HitObjectUsageBegan;
+        internal event Action<HitObject> HitObjectUsageBegan;
 
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
@@ -56,17 +56,17 @@ namespace osu.Game.Rulesets.UI
         /// <remarks>
         /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
         /// </remarks>
-        public event Action<HitObject> HitObjectUsageFinished;
+        internal event Action<HitObject> HitObjectUsageFinished;
 
         /// <summary>
         /// The amount of time prior to the current time within which <see cref="HitObject"/>s should be considered alive.
         /// </summary>
-        public double PastLifetimeExtension { get; set; }
+        internal double PastLifetimeExtension { get; set; }
 
         /// <summary>
         /// The amount of time after the current time within which <see cref="HitObject"/>s should be considered alive.
         /// </summary>
-        public double FutureLifetimeExtension { get; set; }
+        internal double FutureLifetimeExtension { get; set; }
 
         private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> drawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index e2578e9822..6747145d50 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -29,22 +29,6 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> RevertResult;
 
-        /// <summary>
-        /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
-        /// </summary>
-        /// <remarks>
-        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
-        /// </remarks>
-        public event Action<HitObject> HitObjectUsageBegan;
-
-        /// <summary>
-        /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
-        /// </summary>
-        /// <remarks>
-        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
-        /// </remarks>
-        public event Action<HitObject> HitObjectUsageFinished;
-
         /// <summary>
         /// The <see cref="DrawableHitObject"/> contained in this Playfield.
         /// </summary>
@@ -203,83 +187,6 @@ namespace osu.Game.Rulesets.UI
         {
         }
 
-        #region Editor logic
-
-        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
-
-        /// <summary>
-        /// Sets whether to keep a given <see cref="HitObject"/> always alive within this or any nested <see cref="Playfield"/>.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to set.</param>
-        /// <param name="keepAlive">Whether to keep <paramref name="hitObject"/> always alive.</param>
-        internal void SetKeepAlive(HitObject hitObject, bool keepAlive)
-        {
-            if (lifetimeEntryMap.TryGetValue(hitObject, out var entry))
-            {
-                entry.KeepAlive = keepAlive;
-                return;
-            }
-
-            if (!nestedPlayfields.IsValueCreated)
-                return;
-
-            foreach (var p in nestedPlayfields.Value)
-                p.SetKeepAlive(hitObject, keepAlive);
-        }
-
-        /// <summary>
-        /// Keeps all <see cref="HitObject"/>s alive within this and all nested <see cref="Playfield"/>s.
-        /// </summary>
-        internal void KeepAllAlive()
-        {
-            foreach (var (_, entry) in lifetimeEntryMap)
-                entry.KeepAlive = true;
-
-            if (!nestedPlayfields.IsValueCreated)
-                return;
-
-            foreach (var p in nestedPlayfields.Value)
-                p.KeepAllAlive();
-        }
-
-        /// <summary>
-        /// The amount of time prior to the current time within which <see cref="HitObject"/>s should be considered alive.
-        /// </summary>
-        public double PastLifetimeExtension
-        {
-            get => HitObjectContainer.PastLifetimeExtension;
-            set
-            {
-                HitObjectContainer.PastLifetimeExtension = value;
-
-                if (!nestedPlayfields.IsValueCreated)
-                    return;
-
-                foreach (var nested in nestedPlayfields.Value)
-                    nested.PastLifetimeExtension = value;
-            }
-        }
-
-        /// <summary>
-        /// The amount of time after the current time within which <see cref="HitObject"/>s should be considered alive.
-        /// </summary>
-        public double FutureLifetimeExtension
-        {
-            get => HitObjectContainer.FutureLifetimeExtension;
-            set
-            {
-                HitObjectContainer.FutureLifetimeExtension = value;
-
-                if (!nestedPlayfields.IsValueCreated)
-                    return;
-
-                foreach (var nested in nestedPlayfields.Value)
-                    nested.FutureLifetimeExtension = value;
-            }
-        }
-
-        #endregion
-
         /// <summary>
         /// The cursor currently being used by this <see cref="Playfield"/>. May be null if no cursor is provided.
         /// </summary>
@@ -339,6 +246,99 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         protected virtual HitObjectContainer CreateHitObjectContainer() => new HitObjectContainer();
 
+        #region Editor logic
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
+        /// </remarks>
+        internal event Action<HitObject> HitObjectUsageBegan;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
+        /// </remarks>
+        internal event Action<HitObject> HitObjectUsageFinished;
+
+        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
+
+        /// <summary>
+        /// Sets whether to keep a given <see cref="HitObject"/> always alive within this or any nested <see cref="Playfield"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to set.</param>
+        /// <param name="keepAlive">Whether to keep <paramref name="hitObject"/> always alive.</param>
+        internal void SetKeepAlive(HitObject hitObject, bool keepAlive)
+        {
+            if (lifetimeEntryMap.TryGetValue(hitObject, out var entry))
+            {
+                entry.KeepAlive = keepAlive;
+                return;
+            }
+
+            if (!nestedPlayfields.IsValueCreated)
+                return;
+
+            foreach (var p in nestedPlayfields.Value)
+                p.SetKeepAlive(hitObject, keepAlive);
+        }
+
+        /// <summary>
+        /// Keeps all <see cref="HitObject"/>s alive within this and all nested <see cref="Playfield"/>s.
+        /// </summary>
+        internal void KeepAllAlive()
+        {
+            foreach (var (_, entry) in lifetimeEntryMap)
+                entry.KeepAlive = true;
+
+            if (!nestedPlayfields.IsValueCreated)
+                return;
+
+            foreach (var p in nestedPlayfields.Value)
+                p.KeepAllAlive();
+        }
+
+        /// <summary>
+        /// The amount of time prior to the current time within which <see cref="HitObject"/>s should be considered alive.
+        /// </summary>
+        internal double PastLifetimeExtension
+        {
+            get => HitObjectContainer.PastLifetimeExtension;
+            set
+            {
+                HitObjectContainer.PastLifetimeExtension = value;
+
+                if (!nestedPlayfields.IsValueCreated)
+                    return;
+
+                foreach (var nested in nestedPlayfields.Value)
+                    nested.PastLifetimeExtension = value;
+            }
+        }
+
+        /// <summary>
+        /// The amount of time after the current time within which <see cref="HitObject"/>s should be considered alive.
+        /// </summary>
+        internal double FutureLifetimeExtension
+        {
+            get => HitObjectContainer.FutureLifetimeExtension;
+            set
+            {
+                HitObjectContainer.FutureLifetimeExtension = value;
+
+                if (!nestedPlayfields.IsValueCreated)
+                    return;
+
+                foreach (var nested in nestedPlayfields.Value)
+                    nested.FutureLifetimeExtension = value;
+            }
+        }
+
+        #endregion
+
         public class InvisibleCursorContainer : GameplayCursorContainer
         {
             protected override Drawable CreateCursor() => new InvisibleCursor();

From 1e05fd48e239e1f8622935122bb2bfb82e2af467 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 21:43:53 +0900
Subject: [PATCH 06163/10326] Fix hidden mod crash

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 84a335750a..7c1dd46c02 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -28,10 +28,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
             foreach (var d in drawables)
-            {
                 d.HitObjectApplied += applyFadeInAdjustment;
-                applyFadeInAdjustment(d);
-            }
 
             base.ApplyToDrawableHitObjects(drawables);
         }

From 9792d1fc738ffeaad759d3a6826af94de612f763 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Nov 2020 23:03:44 +0900
Subject: [PATCH 06164/10326] Fix slider tests

---
 .../Mods/TestSceneOsuModSpunOut.cs            |  8 ++++++--
 .../TestSceneSliderSnaking.cs                 | 17 ++++++++--------
 osu.Game/Rulesets/UI/DrawableRuleset.cs       | 20 ++++++++++++++++---
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
index d8064d36ea..7b909d2907 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSpunOut(),
             Autoplay = false,
             Beatmap = singleSpinnerBeatmap,
-            PassCondition = () => Player.ChildrenOfType<DrawableSpinner>().Single().Progress >= 1
+            PassCondition = () => Player.ChildrenOfType<DrawableSpinner>().SingleOrDefault()?.Progress >= 1
         });
 
         [TestCase(null)]
@@ -45,7 +45,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 Mods = mods,
                 Autoplay = false,
                 Beatmap = singleSpinnerBeatmap,
-                PassCondition = () => Precision.AlmostEquals(Player.ChildrenOfType<SpinnerSpmCounter>().Single().SpinsPerMinute, 286, 1)
+                PassCondition = () =>
+                {
+                    var counter = Player.ChildrenOfType<SpinnerSpmCounter>().SingleOrDefault();
+                    return counter != null && Precision.AlmostEquals(counter.SpinsPerMinute, 286, 1);
+                }
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 3d100e4b1c..b71400b71d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             config.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
         }
 
-        private DrawableSlider slider;
+        private DrawableSlider drawableSlider;
 
         [SetUpSteps]
         public override void SetUpSteps()
@@ -68,7 +68,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
 
             double startTime = hitObjects[sliderIndex].StartTime;
-            retrieveDrawableSlider(sliderIndex);
+            addSeekStep(startTime);
+            retrieveDrawableSlider((Slider)hitObjects[sliderIndex]);
             setSnaking(true);
 
             ensureSnakingIn(startTime + fade_in_modifier);
@@ -93,7 +94,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
 
             double startTime = hitObjects[sliderIndex].StartTime;
-            retrieveDrawableSlider(sliderIndex);
+            addSeekStep(startTime);
+            retrieveDrawableSlider((Slider)hitObjects[sliderIndex]);
             setSnaking(false);
 
             ensureNoSnakingIn(startTime + fade_in_modifier);
@@ -127,9 +129,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             checkPositionChange(16600, sliderRepeat, positionDecreased);
         }
 
-        private void retrieveDrawableSlider(int index) =>
-            AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
-                slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(index));
+        private void retrieveDrawableSlider(Slider slider) => AddUntilStep($"retrieve slider @ {slider.StartTime}", () =>
+            (drawableSlider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.SingleOrDefault(d => d.HitObject == slider)) != null);
 
         private void ensureSnakingIn(double startTime) => checkPositionChange(startTime, sliderEnd, positionIncreased);
         private void ensureNoSnakingIn(double startTime) => checkPositionChange(startTime, sliderEnd, positionRemainsSame);
@@ -150,13 +151,13 @@ namespace osu.Game.Rulesets.Osu.Tests
         private double timeAtRepeat(double startTime, int repeatIndex) => startTime + 100 + duration_of_span * repeatIndex;
         private Func<Vector2> positionAtRepeat(int repeatIndex) => repeatIndex % 2 == 0 ? (Func<Vector2>)sliderStart : sliderEnd;
 
-        private List<Vector2> sliderCurve => ((PlaySliderBody)slider.Body.Drawable).CurrentCurve;
+        private List<Vector2> sliderCurve => ((PlaySliderBody)drawableSlider.Body.Drawable).CurrentCurve;
         private Vector2 sliderStart() => sliderCurve.First();
         private Vector2 sliderEnd() => sliderCurve.Last();
 
         private Vector2 sliderRepeat()
         {
-            var drawable = Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(1);
+            var drawable = Player.DrawableRuleset.Playfield.AllHitObjects.SingleOrDefault(d => d.HitObject == hitObjects[1]);
             var repeat = drawable.ChildrenOfType<Container<DrawableSliderRepeat>>().First().Children.First();
             return repeat.Position;
         }
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index c912348604..e3c81d0f57 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -593,10 +593,24 @@ namespace osu.Game.Rulesets.UI
         [CanBeNull]
         public DrawableHitObject GetPooledDrawableRepresentation([NotNull] HitObject hitObject)
         {
-            if (!pools.TryGetValue(hitObject.GetType(), out var pool))
-                return null;
+            var lookupType = hitObject.GetType();
 
-            return (DrawableHitObject)pool.Get(d =>
+            IDrawablePool pool;
+
+            // Tests may add derived hitobject instances for which pools don't exist. Try to find any applicable pool and dynamically assign the type if the pool exists.
+            if (!pools.TryGetValue(lookupType, out pool))
+            {
+                foreach (var (t, p) in pools)
+                {
+                    if (!t.IsInstanceOfType(hitObject))
+                        continue;
+
+                    pools[lookupType] = pool = p;
+                    break;
+                }
+            }
+
+            return (DrawableHitObject)pool?.Get(d =>
             {
                 var dho = (DrawableHitObject)d;
 

From 36f1833f6eecbbacbb69d85c01a0d53d07f23241 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 14 Nov 2020 00:41:18 +0900
Subject: [PATCH 06165/10326] Move hitobject pooling to Playfield

---
 .../Gameplay/TestScenePoolingRuleset.cs       |  19 +--
 .../Objects/Drawables/DrawableHitObject.cs    |   4 +-
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  69 +----------
 osu.Game/Rulesets/UI/HitObjectContainer.cs    |   4 +-
 osu.Game/Rulesets/UI/HitObjectPoolProvider.cs | 111 ++++++++++++++++++
 osu.Game/Rulesets/UI/Playfield.cs             |   3 +-
 6 files changed, 130 insertions(+), 80 deletions(-)
 create mode 100644 osu.Game/Rulesets/UI/HitObjectPoolProvider.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
index 242eaf7b7d..2e1e667d0d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -134,19 +134,13 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                RegisterPool<TestHitObject, DrawableTestHitObject>(PoolSize);
-            }
-
             protected override HitObjectLifetimeEntry CreateLifetimeEntry(TestHitObject hitObject) => new TestHitObjectLifetimeEntry(hitObject);
 
             public override DrawableHitObject<TestHitObject> CreateDrawableRepresentation(TestHitObject h) => null;
 
             protected override PassThroughInputManager CreateInputManager() => new PassThroughInputManager();
 
-            protected override Playfield CreatePlayfield() => new TestPlayfield();
+            protected override Playfield CreatePlayfield() => new TestPlayfield(PoolSize);
 
             private class TestHitObjectLifetimeEntry : HitObjectLifetimeEntry
             {
@@ -161,11 +155,20 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class TestPlayfield : Playfield
         {
-            public TestPlayfield()
+            private readonly int poolSize;
+
+            public TestPlayfield(int poolSize)
             {
+                this.poolSize = poolSize;
                 AddInternal(HitObjectContainer);
             }
 
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                RegisterPool<TestHitObject, DrawableTestHitObject>(poolSize);
+            }
+
             protected override GameplayCursorContainer CreateCursor() => null;
         }
 
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 3e3936b45a..c22257e544 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private HitObjectLifetimeEntry lifetimeEntry;
 
         [Resolved(CanBeNull = true)]
-        private DrawableRuleset drawableRuleset { get; set; }
+        private HitObjectPoolProvider poolProvider { get; set; }
 
         private Container<PausableSkinnableSound> samplesContainer;
 
@@ -212,7 +212,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             foreach (var h in HitObject.NestedHitObjects)
             {
-                var drawableNested = drawableRuleset?.GetPooledDrawableRepresentation(h)
+                var drawableNested = poolProvider?.GetPooledDrawableRepresentation(h)
                                      ?? CreateNestedHitObject(h)
                                      ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
 
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index c912348604..5022b571fd 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -15,10 +15,8 @@ using System.Linq;
 using System.Threading;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
@@ -327,9 +325,8 @@ namespace osu.Game.Rulesets.UI
         /// Creates a <see cref="DrawableHitObject{TObject}"/> to represent a <see cref="HitObject"/>.
         /// </summary>
         /// <remarks>
-        /// If this method returns <c>null</c>, then this <see cref="DrawableRuleset"/> will assume the requested <see cref="HitObject"/> type is being pooled,
-        /// and will instead attempt to retrieve the <see cref="DrawableHitObject"/>s at the point they should become alive via pools registered through
-        /// <see cref="DrawableRuleset.RegisterPool{TObject, TDrawable}(int, int?)"/> or  <see cref="DrawableRuleset.RegisterPool{TObject, TDrawable}(DrawablePool{TDrawable})"/>.
+        /// If this method returns <c>null</c>, then this <see cref="DrawableRuleset"/> will assume the requested <see cref="HitObject"/> type is being pooled inside the <see cref="Playfield"/>,
+        /// and will instead attempt to retrieve the <see cref="DrawableHitObject"/>s at the point they should become alive via pools registered in the <see cref="Playfield"/>.
         /// </remarks>
         /// <param name="h">The <see cref="HitObject"/> to represent.</param>
         /// <returns>The representing <see cref="DrawableHitObject{TObject}"/>.</returns>
@@ -550,68 +547,8 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public abstract void CancelResume();
 
-        private readonly Dictionary<Type, IDrawablePool> pools = new Dictionary<Type, IDrawablePool>();
         private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntries = new Dictionary<HitObject, HitObjectLifetimeEntry>();
 
-        /// <summary>
-        /// Registers a default <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
-        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetPooledDrawableRepresentation"/>).
-        /// </summary>
-        /// <param name="initialSize">The number of <see cref="DrawableHitObject"/>s to be initially stored in the pool.</param>
-        /// <param name="maximumSize">
-        /// The maximum number of <see cref="DrawableHitObject"/>s that can be stored in the pool.
-        /// If this limit is exceeded, every subsequent <see cref="DrawableHitObject"/> will be created anew instead of being retrieved from the pool,
-        /// until some of the existing <see cref="DrawableHitObject"/>s are returned to the pool.
-        /// </param>
-        /// <typeparam name="TObject">The <see cref="HitObject"/> type.</typeparam>
-        /// <typeparam name="TDrawable">The <see cref="DrawableHitObject"/> receiver for <typeparamref name="TObject"/>s.</typeparam>
-        protected void RegisterPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
-            where TObject : HitObject
-            where TDrawable : DrawableHitObject, new()
-            => RegisterPool<TObject, TDrawable>(new DrawablePool<TDrawable>(initialSize, maximumSize));
-
-        /// <summary>
-        /// Registers a custom <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
-        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetPooledDrawableRepresentation"/>).
-        /// </summary>
-        /// <param name="pool">The <see cref="DrawablePool{T}"/> to register.</param>
-        /// <typeparam name="TObject">The <see cref="HitObject"/> type.</typeparam>
-        /// <typeparam name="TDrawable">The <see cref="DrawableHitObject"/> receiver for <typeparamref name="TObject"/>s.</typeparam>
-        protected void RegisterPool<TObject, TDrawable>([NotNull] DrawablePool<TDrawable> pool)
-            where TObject : HitObject
-            where TDrawable : DrawableHitObject, new()
-        {
-            pools[typeof(TObject)] = pool;
-            AddInternal(pool);
-        }
-
-        /// <summary>
-        /// Attempts to retrieve the poolable <see cref="DrawableHitObject"/> representation of a <see cref="HitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to retrieve the <see cref="DrawableHitObject"/> representation of.</param>
-        /// <returns>The <see cref="DrawableHitObject"/> representing <see cref="HitObject"/>, or <c>null</c> if no poolable representation exists.</returns>
-        [CanBeNull]
-        public DrawableHitObject GetPooledDrawableRepresentation([NotNull] HitObject hitObject)
-        {
-            if (!pools.TryGetValue(hitObject.GetType(), out var pool))
-                return null;
-
-            return (DrawableHitObject)pool.Get(d =>
-            {
-                var dho = (DrawableHitObject)d;
-
-                // If this is the first time this DHO is being used (not loaded), then apply the DHO mods.
-                // This is done before Apply() so that the state is updated once when the hitobject is applied.
-                if (!dho.IsLoaded)
-                {
-                    foreach (var m in Mods.OfType<IApplicableToDrawableHitObjects>())
-                        m.ApplyToDrawableHitObjects(dho.Yield());
-                }
-
-                dho.Apply(hitObject, GetLifetimeEntry(hitObject));
-            });
-        }
-
         /// <summary>
         /// Creates the <see cref="HitObjectLifetimeEntry"/> for a given <see cref="HitObject"/>.
         /// </summary>
@@ -629,7 +566,7 @@ namespace osu.Game.Rulesets.UI
         /// <param name="hitObject">The <see cref="HitObject"/> to retrieve or create the <see cref="HitObjectLifetimeEntry"/> for.</param>
         /// <returns>The <see cref="HitObjectLifetimeEntry"/> for <paramref name="hitObject"/>.</returns>
         [NotNull]
-        protected HitObjectLifetimeEntry GetLifetimeEntry([NotNull] HitObject hitObject)
+        internal HitObjectLifetimeEntry GetLifetimeEntry([NotNull] HitObject hitObject)
         {
             if (lifetimeEntries.TryGetValue(hitObject, out var entry))
                 return entry;
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 25fb7ab9f3..8de9f41482 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.UI
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
 
         [Resolved(CanBeNull = true)]
-        private DrawableRuleset drawableRuleset { get; set; }
+        private HitObjectPoolProvider poolProvider { get; set; }
 
         public HitObjectContainer()
         {
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.UI
         {
             Debug.Assert(!drawableMap.ContainsKey(entry));
 
-            var drawable = drawableRuleset.GetPooledDrawableRepresentation(entry.HitObject);
+            var drawable = poolProvider.GetPooledDrawableRepresentation(entry.HitObject);
             if (drawable == null)
                 throw new InvalidOperationException($"A drawable representation could not be retrieved for hitobject type: {entry.HitObject.GetType().ReadableName()}.");
 
diff --git a/osu.Game/Rulesets/UI/HitObjectPoolProvider.cs b/osu.Game/Rulesets/UI/HitObjectPoolProvider.cs
new file mode 100644
index 0000000000..ee3aee59b4
--- /dev/null
+++ b/osu.Game/Rulesets/UI/HitObjectPoolProvider.cs
@@ -0,0 +1,111 @@
+// Copyright (c) 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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.UI
+{
+    /// <summary>
+    /// A <see cref="CompositeDrawable"/> that pools <see cref="DrawableHitObject"/>s and allows children to retrieve them via <see cref="GetPooledDrawableRepresentation"/>.
+    /// </summary>
+    [Cached(typeof(HitObjectPoolProvider))]
+    public class HitObjectPoolProvider : CompositeDrawable
+    {
+        [Resolved]
+        private DrawableRuleset drawableRuleset { get; set; }
+
+        [Resolved]
+        private IReadOnlyList<Mod> mods { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private HitObjectPoolProvider parentProvider { get; set; }
+
+        private readonly Dictionary<Type, IDrawablePool> pools = new Dictionary<Type, IDrawablePool>();
+
+        /// <summary>
+        /// Registers a default <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
+        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetPooledDrawableRepresentation"/>).
+        /// </summary>
+        /// <param name="initialSize">The number of <see cref="DrawableHitObject"/>s to be initially stored in the pool.</param>
+        /// <param name="maximumSize">
+        /// The maximum number of <see cref="DrawableHitObject"/>s that can be stored in the pool.
+        /// If this limit is exceeded, every subsequent <see cref="DrawableHitObject"/> will be created anew instead of being retrieved from the pool,
+        /// until some of the existing <see cref="DrawableHitObject"/>s are returned to the pool.
+        /// </param>
+        /// <typeparam name="TObject">The <see cref="HitObject"/> type.</typeparam>
+        /// <typeparam name="TDrawable">The <see cref="DrawableHitObject"/> receiver for <typeparamref name="TObject"/>s.</typeparam>
+        protected void RegisterPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
+            where TObject : HitObject
+            where TDrawable : DrawableHitObject, new()
+            => RegisterPool<TObject, TDrawable>(new DrawablePool<TDrawable>(initialSize, maximumSize));
+
+        /// <summary>
+        /// Registers a custom <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
+        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetPooledDrawableRepresentation"/>).
+        /// </summary>
+        /// <param name="pool">The <see cref="DrawablePool{T}"/> to register.</param>
+        /// <typeparam name="TObject">The <see cref="HitObject"/> type.</typeparam>
+        /// <typeparam name="TDrawable">The <see cref="DrawableHitObject"/> receiver for <typeparamref name="TObject"/>s.</typeparam>
+        protected void RegisterPool<TObject, TDrawable>([NotNull] DrawablePool<TDrawable> pool)
+            where TObject : HitObject
+            where TDrawable : DrawableHitObject, new()
+        {
+            pools[typeof(TObject)] = pool;
+            AddInternal(pool);
+        }
+
+        /// <summary>
+        /// Attempts to retrieve the poolable <see cref="DrawableHitObject"/> representation of a <see cref="HitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to retrieve the <see cref="DrawableHitObject"/> representation of.</param>
+        /// <returns>The <see cref="DrawableHitObject"/> representing <see cref="HitObject"/>, or <c>null</c> if no poolable representation exists.</returns>
+        [CanBeNull]
+        public DrawableHitObject GetPooledDrawableRepresentation([NotNull] HitObject hitObject)
+        {
+            var lookupType = hitObject.GetType();
+
+            IDrawablePool pool;
+
+            // Tests may add derived hitobject instances for which pools don't exist. Try to find any applicable pool and dynamically assign the type if the pool exists.
+            if (!pools.TryGetValue(lookupType, out pool))
+            {
+                foreach (var (t, p) in pools)
+                {
+                    if (!t.IsInstanceOfType(hitObject))
+                        continue;
+
+                    pools[lookupType] = pool = p;
+                    break;
+                }
+            }
+
+            if (pool == null)
+                return parentProvider?.GetPooledDrawableRepresentation(hitObject);
+
+            return (DrawableHitObject)pool.Get(d =>
+            {
+                var dho = (DrawableHitObject)d;
+
+                // If this is the first time this DHO is being used (not loaded), then apply the DHO mods.
+                // This is done before Apply() so that the state is updated once when the hitobject is applied.
+                if (!dho.IsLoaded)
+                {
+                    foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
+                        m.ApplyToDrawableHitObjects(dho.Yield());
+                }
+
+                dho.Apply(hitObject, drawableRuleset.GetLifetimeEntry(hitObject));
+            });
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 6747145d50..1d0196d173 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -9,7 +9,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -17,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.UI
 {
-    public abstract class Playfield : CompositeDrawable
+    public abstract class Playfield : HitObjectPoolProvider
     {
         /// <summary>
         /// Invoked when a <see cref="DrawableHitObject"/> is judged.

From c71b237c4f8d73ce957a23ae4a2c56478725307a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 14 Nov 2020 00:54:57 +0900
Subject: [PATCH 06166/10326] Merge all pooling support into Playfield

---
 .../Gameplay/TestScenePoolingRuleset.cs       |  24 +--
 .../Objects/Drawables/DrawableHitObject.cs    |   4 +-
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  55 +-----
 osu.Game/Rulesets/UI/HitObjectContainer.cs    |   4 +-
 osu.Game/Rulesets/UI/HitObjectPoolProvider.cs | 111 ------------
 .../Rulesets/UI/IPooledHitObjectProvider.cs   |  20 +++
 osu.Game/Rulesets/UI/Playfield.cs             | 167 ++++++++++++++----
 7 files changed, 172 insertions(+), 213 deletions(-)
 delete mode 100644 osu.Game/Rulesets/UI/HitObjectPoolProvider.cs
 create mode 100644 osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
index 2e1e667d0d..d009d805f0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -134,23 +134,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            protected override HitObjectLifetimeEntry CreateLifetimeEntry(TestHitObject hitObject) => new TestHitObjectLifetimeEntry(hitObject);
-
             public override DrawableHitObject<TestHitObject> CreateDrawableRepresentation(TestHitObject h) => null;
 
             protected override PassThroughInputManager CreateInputManager() => new PassThroughInputManager();
 
             protected override Playfield CreatePlayfield() => new TestPlayfield(PoolSize);
-
-            private class TestHitObjectLifetimeEntry : HitObjectLifetimeEntry
-            {
-                public TestHitObjectLifetimeEntry(HitObject hitObject)
-                    : base(hitObject)
-                {
-                }
-
-                protected override double InitialLifetimeOffset => 0;
-            }
         }
 
         private class TestPlayfield : Playfield
@@ -169,9 +157,21 @@ namespace osu.Game.Tests.Visual.Gameplay
                 RegisterPool<TestHitObject, DrawableTestHitObject>(poolSize);
             }
 
+            protected override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject) => new TestHitObjectLifetimeEntry(hitObject);
+
             protected override GameplayCursorContainer CreateCursor() => null;
         }
 
+        private class TestHitObjectLifetimeEntry : HitObjectLifetimeEntry
+        {
+            public TestHitObjectLifetimeEntry(HitObject hitObject)
+                : base(hitObject)
+            {
+            }
+
+            protected override double InitialLifetimeOffset => 0;
+        }
+
         private class TestBeatmapConverter : BeatmapConverter<TestHitObject>
         {
             public TestBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index c22257e544..b400c532c5 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private HitObjectLifetimeEntry lifetimeEntry;
 
         [Resolved(CanBeNull = true)]
-        private HitObjectPoolProvider poolProvider { get; set; }
+        private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
         private Container<PausableSkinnableSound> samplesContainer;
 
@@ -212,7 +212,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             foreach (var h in HitObject.NestedHitObjects)
             {
-                var drawableNested = poolProvider?.GetPooledDrawableRepresentation(h)
+                var drawableNested = pooledObjectProvider?.GetPooledDrawableRepresentation(h)
                                      ?? CreateNestedHitObject(h)
                                      ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
 
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 5022b571fd..c1a601eaae 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -15,7 +15,6 @@ using System.Linq;
 using System.Threading;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
@@ -246,7 +245,7 @@ namespace osu.Game.Rulesets.UI
             if (drawableRepresentation != null)
                 Playfield.Add(drawableRepresentation);
             else
-                Playfield.Add(GetLifetimeEntry(hitObject));
+                Playfield.Add(hitObject);
         }
 
         /// <summary>
@@ -258,15 +257,10 @@ namespace osu.Game.Rulesets.UI
         /// <param name="hitObject">The <see cref="HitObject"/> to remove.</param>
         public bool RemoveHitObject(TObject hitObject)
         {
-            var entry = GetLifetimeEntry(hitObject);
-
-            // May have been newly-created by the above call - remove it anyway.
-            RemoveLifetimeEntry(hitObject);
-
-            if (Playfield.Remove(entry))
+            if (Playfield.Remove(hitObject))
                 return true;
 
-            // If the entry was not removed from the playfield, assume the hitobject is not being pooled and attempt a direct removal.
+            // If the entry was not removed from the playfield, assume the hitobject is not being pooled and attempt a direct drawable removal.
             var drawableObject = Playfield.AllHitObjects.SingleOrDefault(d => d.HitObject == hitObject);
             if (drawableObject != null)
                 return Playfield.Remove(drawableObject);
@@ -274,16 +268,6 @@ namespace osu.Game.Rulesets.UI
             return false;
         }
 
-        protected sealed override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject)
-        {
-            if (!(hitObject is TObject tHitObject))
-                throw new InvalidOperationException($"Unexpected hitobject type: {hitObject.GetType().ReadableName()}");
-
-            return CreateLifetimeEntry(tHitObject);
-        }
-
-        protected virtual HitObjectLifetimeEntry CreateLifetimeEntry(TObject hitObject) => new HitObjectLifetimeEntry(hitObject);
-
         public override void SetRecordTarget(Replay recordingReplay)
         {
             if (!(KeyBindingInputManager is IHasRecordingHandler recordingInputManager))
@@ -546,39 +530,6 @@ namespace osu.Game.Rulesets.UI
         /// Invoked when the user requests to pause while the resume overlay is active.
         /// </summary>
         public abstract void CancelResume();
-
-        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntries = new Dictionary<HitObject, HitObjectLifetimeEntry>();
-
-        /// <summary>
-        /// Creates the <see cref="HitObjectLifetimeEntry"/> for a given <see cref="HitObject"/>.
-        /// </summary>
-        /// <remarks>
-        /// This may be overridden to provide custom lifetime control (e.g. via <see cref="HitObjectLifetimeEntry.InitialLifetimeOffset"/>.
-        /// </remarks>
-        /// <param name="hitObject">The <see cref="HitObject"/> to create the entry for.</param>
-        /// <returns>The <see cref="HitObjectLifetimeEntry"/>.</returns>
-        [NotNull]
-        protected abstract HitObjectLifetimeEntry CreateLifetimeEntry([NotNull] HitObject hitObject);
-
-        /// <summary>
-        /// Retrieves or creates the <see cref="HitObjectLifetimeEntry"/> for a given <see cref="HitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to retrieve or create the <see cref="HitObjectLifetimeEntry"/> for.</param>
-        /// <returns>The <see cref="HitObjectLifetimeEntry"/> for <paramref name="hitObject"/>.</returns>
-        [NotNull]
-        internal HitObjectLifetimeEntry GetLifetimeEntry([NotNull] HitObject hitObject)
-        {
-            if (lifetimeEntries.TryGetValue(hitObject, out var entry))
-                return entry;
-
-            return lifetimeEntries[hitObject] = CreateLifetimeEntry(hitObject);
-        }
-
-        /// <summary>
-        /// Removes the <see cref="HitObjectLifetimeEntry"/> for a <see cref="HitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to remove the <see cref="HitObjectLifetimeEntry"/> for.</param>
-        internal void RemoveLifetimeEntry([NotNull] HitObject hitObject) => lifetimeEntries.Remove(hitObject);
     }
 
     public class BeatmapInvalidForRulesetException : ArgumentException
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 8de9f41482..1dc029506f 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.UI
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
 
         [Resolved(CanBeNull = true)]
-        private HitObjectPoolProvider poolProvider { get; set; }
+        private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
         public HitObjectContainer()
         {
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.UI
         {
             Debug.Assert(!drawableMap.ContainsKey(entry));
 
-            var drawable = poolProvider.GetPooledDrawableRepresentation(entry.HitObject);
+            var drawable = pooledObjectProvider.GetPooledDrawableRepresentation(entry.HitObject);
             if (drawable == null)
                 throw new InvalidOperationException($"A drawable representation could not be retrieved for hitobject type: {entry.HitObject.GetType().ReadableName()}.");
 
diff --git a/osu.Game/Rulesets/UI/HitObjectPoolProvider.cs b/osu.Game/Rulesets/UI/HitObjectPoolProvider.cs
deleted file mode 100644
index ee3aee59b4..0000000000
--- a/osu.Game/Rulesets/UI/HitObjectPoolProvider.cs
+++ /dev/null
@@ -1,111 +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 JetBrains.Annotations;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Pooling;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
-
-namespace osu.Game.Rulesets.UI
-{
-    /// <summary>
-    /// A <see cref="CompositeDrawable"/> that pools <see cref="DrawableHitObject"/>s and allows children to retrieve them via <see cref="GetPooledDrawableRepresentation"/>.
-    /// </summary>
-    [Cached(typeof(HitObjectPoolProvider))]
-    public class HitObjectPoolProvider : CompositeDrawable
-    {
-        [Resolved]
-        private DrawableRuleset drawableRuleset { get; set; }
-
-        [Resolved]
-        private IReadOnlyList<Mod> mods { get; set; }
-
-        [Resolved(CanBeNull = true)]
-        private HitObjectPoolProvider parentProvider { get; set; }
-
-        private readonly Dictionary<Type, IDrawablePool> pools = new Dictionary<Type, IDrawablePool>();
-
-        /// <summary>
-        /// Registers a default <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
-        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetPooledDrawableRepresentation"/>).
-        /// </summary>
-        /// <param name="initialSize">The number of <see cref="DrawableHitObject"/>s to be initially stored in the pool.</param>
-        /// <param name="maximumSize">
-        /// The maximum number of <see cref="DrawableHitObject"/>s that can be stored in the pool.
-        /// If this limit is exceeded, every subsequent <see cref="DrawableHitObject"/> will be created anew instead of being retrieved from the pool,
-        /// until some of the existing <see cref="DrawableHitObject"/>s are returned to the pool.
-        /// </param>
-        /// <typeparam name="TObject">The <see cref="HitObject"/> type.</typeparam>
-        /// <typeparam name="TDrawable">The <see cref="DrawableHitObject"/> receiver for <typeparamref name="TObject"/>s.</typeparam>
-        protected void RegisterPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
-            where TObject : HitObject
-            where TDrawable : DrawableHitObject, new()
-            => RegisterPool<TObject, TDrawable>(new DrawablePool<TDrawable>(initialSize, maximumSize));
-
-        /// <summary>
-        /// Registers a custom <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
-        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type (via <see cref="GetPooledDrawableRepresentation"/>).
-        /// </summary>
-        /// <param name="pool">The <see cref="DrawablePool{T}"/> to register.</param>
-        /// <typeparam name="TObject">The <see cref="HitObject"/> type.</typeparam>
-        /// <typeparam name="TDrawable">The <see cref="DrawableHitObject"/> receiver for <typeparamref name="TObject"/>s.</typeparam>
-        protected void RegisterPool<TObject, TDrawable>([NotNull] DrawablePool<TDrawable> pool)
-            where TObject : HitObject
-            where TDrawable : DrawableHitObject, new()
-        {
-            pools[typeof(TObject)] = pool;
-            AddInternal(pool);
-        }
-
-        /// <summary>
-        /// Attempts to retrieve the poolable <see cref="DrawableHitObject"/> representation of a <see cref="HitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to retrieve the <see cref="DrawableHitObject"/> representation of.</param>
-        /// <returns>The <see cref="DrawableHitObject"/> representing <see cref="HitObject"/>, or <c>null</c> if no poolable representation exists.</returns>
-        [CanBeNull]
-        public DrawableHitObject GetPooledDrawableRepresentation([NotNull] HitObject hitObject)
-        {
-            var lookupType = hitObject.GetType();
-
-            IDrawablePool pool;
-
-            // Tests may add derived hitobject instances for which pools don't exist. Try to find any applicable pool and dynamically assign the type if the pool exists.
-            if (!pools.TryGetValue(lookupType, out pool))
-            {
-                foreach (var (t, p) in pools)
-                {
-                    if (!t.IsInstanceOfType(hitObject))
-                        continue;
-
-                    pools[lookupType] = pool = p;
-                    break;
-                }
-            }
-
-            if (pool == null)
-                return parentProvider?.GetPooledDrawableRepresentation(hitObject);
-
-            return (DrawableHitObject)pool.Get(d =>
-            {
-                var dho = (DrawableHitObject)d;
-
-                // If this is the first time this DHO is being used (not loaded), then apply the DHO mods.
-                // This is done before Apply() so that the state is updated once when the hitobject is applied.
-                if (!dho.IsLoaded)
-                {
-                    foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
-                        m.ApplyToDrawableHitObjects(dho.Yield());
-                }
-
-                dho.Apply(hitObject, drawableRuleset.GetLifetimeEntry(hitObject));
-            });
-        }
-    }
-}
diff --git a/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs b/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
new file mode 100644
index 0000000000..d8240d892f
--- /dev/null
+++ b/osu.Game/Rulesets/UI/IPooledHitObjectProvider.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 JetBrains.Annotations;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.UI
+{
+    internal interface IPooledHitObjectProvider
+    {
+        /// <summary>
+        /// Attempts to retrieve the poolable <see cref="DrawableHitObject"/> representation of a <see cref="HitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to retrieve the <see cref="DrawableHitObject"/> representation of.</param>
+        /// <returns>The <see cref="DrawableHitObject"/> representing <see cref="HitObject"/>, or <c>null</c> if no poolable representation exists.</returns>
+        [CanBeNull]
+        public DrawableHitObject GetPooledDrawableRepresentation([NotNull] HitObject hitObject);
+    }
+}
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 1d0196d173..80e33e0ec5 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -4,11 +4,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -16,7 +19,8 @@ using osuTK;
 
 namespace osu.Game.Rulesets.UI
 {
-    public abstract class Playfield : HitObjectPoolProvider
+    [Cached(typeof(IPooledHitObjectProvider))]
+    public abstract class Playfield : CompositeDrawable, IPooledHitObjectProvider
     {
         /// <summary>
         /// Invoked when a <see cref="DrawableHitObject"/> is judged.
@@ -137,39 +141,6 @@ namespace osu.Game.Rulesets.UI
             return false;
         }
 
-        /// <summary>
-        /// Adds a <see cref="HitObjectLifetimeEntry"/> for a pooled <see cref="HitObject"/> to this <see cref="Playfield"/>.
-        /// </summary>
-        /// <param name="entry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the <see cref="HitObject"/>.</param>
-        public virtual void Add(HitObjectLifetimeEntry entry)
-        {
-            HitObjectContainer.Add(entry);
-            lifetimeEntryMap[entry.HitObject] = entry;
-            OnHitObjectAdded(entry.HitObject);
-        }
-
-        /// <summary>
-        /// Removes a <see cref="HitObjectLifetimeEntry"/> for a pooled <see cref="HitObject"/> from this <see cref="Playfield"/>.
-        /// </summary>
-        /// <param name="entry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the <see cref="HitObject"/>.</param>
-        /// <returns>Whether the <see cref="HitObject"/> was successfully removed.</returns>
-        public virtual bool Remove(HitObjectLifetimeEntry entry)
-        {
-            if (HitObjectContainer.Remove(entry))
-            {
-                lifetimeEntryMap.Remove(entry.HitObject);
-                OnHitObjectRemoved(entry.HitObject);
-                return true;
-            }
-
-            bool removedFromNested = false;
-
-            if (nestedPlayfields.IsValueCreated)
-                removedFromNested = nestedPlayfields.Value.Any(p => p.Remove(entry));
-
-            return removedFromNested;
-        }
-
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> is added to this <see cref="Playfield"/>.
         /// </summary>
@@ -245,6 +216,134 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         protected virtual HitObjectContainer CreateHitObjectContainer() => new HitObjectContainer();
 
+        #region Pooling support
+
+        [Resolved(CanBeNull = true)]
+        private IPooledHitObjectProvider parentPooledObjectProvider { get; set; }
+
+        private readonly Dictionary<Type, IDrawablePool> pools = new Dictionary<Type, IDrawablePool>();
+
+        /// <summary>
+        /// Adds a <see cref="HitObjectLifetimeEntry"/> for a pooled <see cref="HitObject"/> to this <see cref="Playfield"/>.
+        /// </summary>
+        /// <param name="hitObject"></param>
+        public virtual void Add(HitObject hitObject)
+        {
+            var entry = CreateLifetimeEntry(hitObject);
+            lifetimeEntryMap[entry.HitObject] = entry;
+
+            HitObjectContainer.Add(entry);
+            OnHitObjectAdded(entry.HitObject);
+        }
+
+        /// <summary>
+        /// Removes a <see cref="HitObjectLifetimeEntry"/> for a pooled <see cref="HitObject"/> from this <see cref="Playfield"/>.
+        /// </summary>
+        /// <param name="hitObject"></param>
+        /// <returns>Whether the <see cref="HitObject"/> was successfully removed.</returns>
+        public virtual bool Remove(HitObject hitObject)
+        {
+            if (lifetimeEntryMap.Remove(hitObject, out var entry))
+            {
+                HitObjectContainer.Remove(entry);
+                OnHitObjectRemoved(hitObject);
+                return true;
+            }
+
+            bool removedFromNested = false;
+
+            if (nestedPlayfields.IsValueCreated)
+                removedFromNested = nestedPlayfields.Value.Any(p => p.Remove(hitObject));
+
+            return removedFromNested;
+        }
+
+        /// <summary>
+        /// Creates the <see cref="HitObjectLifetimeEntry"/> for a given <see cref="HitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// This may be overridden to provide custom lifetime control (e.g. via <see cref="HitObjectLifetimeEntry.InitialLifetimeOffset"/>.
+        /// </remarks>
+        /// <param name="hitObject">The <see cref="HitObject"/> to create the entry for.</param>
+        /// <returns>The <see cref="HitObjectLifetimeEntry"/>.</returns>
+        [NotNull]
+        protected virtual HitObjectLifetimeEntry CreateLifetimeEntry([NotNull] HitObject hitObject) => new HitObjectLifetimeEntry(hitObject);
+
+        /// <summary>
+        /// Registers a default <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
+        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type.
+        /// </summary>
+        /// <param name="initialSize">The number of <see cref="DrawableHitObject"/>s to be initially stored in the pool.</param>
+        /// <param name="maximumSize">
+        /// The maximum number of <see cref="DrawableHitObject"/>s that can be stored in the pool.
+        /// If this limit is exceeded, every subsequent <see cref="DrawableHitObject"/> will be created anew instead of being retrieved from the pool,
+        /// until some of the existing <see cref="DrawableHitObject"/>s are returned to the pool.
+        /// </param>
+        /// <typeparam name="TObject">The <see cref="HitObject"/> type.</typeparam>
+        /// <typeparam name="TDrawable">The <see cref="DrawableHitObject"/> receiver for <typeparamref name="TObject"/>s.</typeparam>
+        protected void RegisterPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
+            where TObject : HitObject
+            where TDrawable : DrawableHitObject, new()
+            => RegisterPool<TObject, TDrawable>(new DrawablePool<TDrawable>(initialSize, maximumSize));
+
+        /// <summary>
+        /// Registers a custom <see cref="DrawableHitObject"/> pool with this <see cref="DrawableRuleset"/> which is to be used whenever
+        /// <see cref="DrawableHitObject"/> representations are requested for the given <typeparamref name="TObject"/> type.
+        /// </summary>
+        /// <param name="pool">The <see cref="DrawablePool{T}"/> to register.</param>
+        /// <typeparam name="TObject">The <see cref="HitObject"/> type.</typeparam>
+        /// <typeparam name="TDrawable">The <see cref="DrawableHitObject"/> receiver for <typeparamref name="TObject"/>s.</typeparam>
+        protected void RegisterPool<TObject, TDrawable>([NotNull] DrawablePool<TDrawable> pool)
+            where TObject : HitObject
+            where TDrawable : DrawableHitObject, new()
+        {
+            pools[typeof(TObject)] = pool;
+            AddInternal(pool);
+        }
+
+        DrawableHitObject IPooledHitObjectProvider.GetPooledDrawableRepresentation(HitObject hitObject)
+        {
+            var lookupType = hitObject.GetType();
+
+            IDrawablePool pool;
+
+            // Tests may add derived hitobject instances for which pools don't exist. Try to find any applicable pool and dynamically assign the type if the pool exists.
+            if (!pools.TryGetValue(lookupType, out pool))
+            {
+                foreach (var (t, p) in pools)
+                {
+                    if (!t.IsInstanceOfType(hitObject))
+                        continue;
+
+                    pools[lookupType] = pool = p;
+                    break;
+                }
+            }
+
+            if (pool == null)
+                return parentPooledObjectProvider?.GetPooledDrawableRepresentation(hitObject);
+
+            return (DrawableHitObject)pool.Get(d =>
+            {
+                var dho = (DrawableHitObject)d;
+
+                // If this is the first time this DHO is being used (not loaded), then apply the DHO mods.
+                // This is done before Apply() so that the state is updated once when the hitobject is applied.
+                if (!dho.IsLoaded)
+                {
+                    foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
+                        m.ApplyToDrawableHitObjects(dho.Yield());
+                }
+
+                if (!lifetimeEntryMap.TryGetValue(hitObject, out var entry))
+                    lifetimeEntryMap[hitObject] = entry = CreateLifetimeEntry(hitObject);
+
+                dho.Apply(hitObject, entry);
+            });
+        }
+
+        #endregion
+
         #region Editor logic
 
         /// <summary>

From 5b60f32c7f96bc1b17fff30bf875c7e8f6acaf6c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 14 Nov 2020 01:03:23 +0900
Subject: [PATCH 06167/10326] Move implementation into OsuPlayfield

---
 .../Edit/DrawableOsuEditRuleset.cs            | 10 ++---
 .../UI/DrawableOsuRuleset.cs                  | 41 -------------------
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      | 33 +++++++++++++++
 3 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index 05396ebc8b..8af6fd65ce 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -18,16 +18,16 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        protected override DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
-            => new OsuEditDrawablePool<TDrawable>(Playfield.CheckHittable, Playfield.OnHitObjectLoaded, initialSize, maximumSize);
-
-        protected override Playfield CreatePlayfield() => new OsuPlayfieldNoCursor();
+        protected override Playfield CreatePlayfield() => new OsuEditPlayfield();
 
         public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer { Size = Vector2.One };
 
-        private class OsuPlayfieldNoCursor : OsuPlayfield
+        private class OsuEditPlayfield : OsuPlayfield
         {
             protected override GameplayCursorContainer CreateCursor() => null;
+
+            protected override DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
+                => new OsuEditDrawablePool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index 1d16c47818..69179137a6 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -4,18 +4,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
@@ -34,35 +30,8 @@ namespace osu.Game.Rulesets.Osu.UI
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            registerPool<HitCircle, DrawableHitCircle>(10, 100);
-
-            registerPool<Slider, DrawableSlider>(10, 100);
-            registerPool<SliderHeadCircle, DrawableSliderHead>(10, 100);
-            registerPool<SliderTailCircle, DrawableSliderTail>(10, 100);
-            registerPool<SliderTick, DrawableSliderTick>(10, 100);
-            registerPool<SliderRepeat, DrawableSliderRepeat>(5, 50);
-
-            registerPool<Spinner, DrawableSpinner>(2, 20);
-            registerPool<SpinnerTick, DrawableSpinnerTick>(10, 100);
-            registerPool<SpinnerBonusTick, DrawableSpinnerBonusTick>(10, 100);
-        }
-
-        private void registerPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
-            where TObject : HitObject
-            where TDrawable : DrawableHitObject, new()
-            => RegisterPool<TObject, TDrawable>(CreatePool<TDrawable>(initialSize, maximumSize));
-
-        protected virtual DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
-            where TDrawable : DrawableHitObject, new()
-            => new OsuDrawablePool<TDrawable>(Playfield.CheckHittable, Playfield.OnHitObjectLoaded, initialSize, maximumSize);
-
         public override DrawableHitObject<OsuHitObject> CreateDrawableRepresentation(OsuHitObject h) => null;
 
-        protected override HitObjectLifetimeEntry CreateLifetimeEntry(OsuHitObject hitObject) => new OsuHitObjectLifetimeEntry(hitObject);
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true; // always show the gameplay cursor
 
         protected override Playfield CreatePlayfield() => new OsuPlayfield();
@@ -87,15 +56,5 @@ namespace osu.Game.Rulesets.Osu.UI
                 return 0;
             }
         }
-
-        private class OsuHitObjectLifetimeEntry : HitObjectLifetimeEntry
-        {
-            public OsuHitObjectLifetimeEntry(HitObject hitObject)
-                : base(hitObject)
-            {
-            }
-
-            protected override double InitialLifetimeOffset => ((OsuHitObject)HitObject).TimePreempt;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 5d59a6ff38..e8ff6c410f 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -97,8 +97,31 @@ namespace osu.Game.Rulesets.Osu.UI
         private void load(OsuRulesetConfigManager config)
         {
             config?.BindWith(OsuRulesetSetting.PlayfieldBorderStyle, playfieldBorder.PlayfieldBorderStyle);
+
+            registerPool<HitCircle, DrawableHitCircle>(10, 100);
+
+            registerPool<Slider, DrawableSlider>(10, 100);
+            registerPool<SliderHeadCircle, DrawableSliderHead>(10, 100);
+            registerPool<SliderTailCircle, DrawableSliderTail>(10, 100);
+            registerPool<SliderTick, DrawableSliderTick>(10, 100);
+            registerPool<SliderRepeat, DrawableSliderRepeat>(5, 50);
+
+            registerPool<Spinner, DrawableSpinner>(2, 20);
+            registerPool<SpinnerTick, DrawableSpinnerTick>(10, 100);
+            registerPool<SpinnerBonusTick, DrawableSpinnerBonusTick>(10, 100);
         }
 
+        private void registerPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
+            where TObject : HitObject
+            where TDrawable : DrawableHitObject, new()
+            => RegisterPool<TObject, TDrawable>(CreatePool<TDrawable>(initialSize, maximumSize));
+
+        protected virtual DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
+            where TDrawable : DrawableHitObject, new()
+            => new OsuDrawablePool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize);
+
+        protected override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject) => new OsuHitObjectLifetimeEntry(hitObject);
+
         protected override void OnHitObjectAdded(HitObject hitObject)
         {
             base.OnHitObjectAdded(hitObject);
@@ -172,5 +195,15 @@ namespace osu.Game.Rulesets.Osu.UI
                 return judgement;
             }
         }
+
+        private class OsuHitObjectLifetimeEntry : HitObjectLifetimeEntry
+        {
+            public OsuHitObjectLifetimeEntry(HitObject hitObject)
+                : base(hitObject)
+            {
+            }
+
+            protected override double InitialLifetimeOffset => ((OsuHitObject)HitObject).TimePreempt;
+        }
     }
 }

From 21b015d63afffa9b0acdb0027f37d0b228614698 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 14 Nov 2020 01:06:38 +0900
Subject: [PATCH 06168/10326] Remove explicit public

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

diff --git a/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs b/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
index d8240d892f..315926dfc6 100644
--- a/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
+++ b/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
@@ -15,6 +15,6 @@ namespace osu.Game.Rulesets.UI
         /// <param name="hitObject">The <see cref="HitObject"/> to retrieve the <see cref="DrawableHitObject"/> representation of.</param>
         /// <returns>The <see cref="DrawableHitObject"/> representing <see cref="HitObject"/>, or <c>null</c> if no poolable representation exists.</returns>
         [CanBeNull]
-        public DrawableHitObject GetPooledDrawableRepresentation([NotNull] HitObject hitObject);
+        DrawableHitObject GetPooledDrawableRepresentation([NotNull] HitObject hitObject);
     }
 }

From b4d4f5456c762f7867ef5a3db4e814a125348f38 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 14 Nov 2020 01:49:48 +0900
Subject: [PATCH 06169/10326] Fix broken fail judgement test

---
 .../Visual/Gameplay/TestSceneFailJudgement.cs         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
index d80efb2c6e..745932315c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -21,8 +22,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected override void AddCheckSteps()
         {
             AddUntilStep("wait for fail", () => Player.HasFailed);
-            AddUntilStep("wait for multiple judged objects", () => ((FailPlayer)Player).DrawableRuleset.Playfield.AllHitObjects.Count(h => h.AllJudged) > 1);
-            AddAssert("total judgements == 1", () => ((FailPlayer)Player).HealthProcessor.JudgedHits >= 1);
+            AddUntilStep("wait for multiple judgements", () => ((FailPlayer)Player).ScoreProcessor.JudgedHits > 1);
+            AddAssert("total number of results == 1", () =>
+            {
+                var score = new ScoreInfo();
+                ((FailPlayer)Player).ScoreProcessor.PopulateScore(score);
+
+                return score.Statistics.Values.Sum() == 1;
+            });
         }
 
         private class FailPlayer : TestPlayer

From 7a89e58483a998a484a944acd5edf4c61bdcbdcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Nov 2020 20:49:06 +0100
Subject: [PATCH 06170/10326] Disable pressed/released action logic when
 rewinding

---
 .../Objects/Drawables/DrawableHoldNote.cs                 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index d9d740c145..59899637f9 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -249,6 +249,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (action != Action.Value)
                 return false;
 
+            // do not run any of this logic when rewinding, as it inverts order of presses/releases.
+            if (Time.Elapsed < 0)
+                return false;
+
             if (CheckHittable?.Invoke(this, Time.Current) == false)
                 return false;
 
@@ -281,6 +285,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (action != Action.Value)
                 return;
 
+            // do not run any of this logic when rewinding, as it inverts order of presses/releases.
+            if (Time.Elapsed < 0)
+                return;
+
             // Make sure a hold was started
             if (HoldStartTime == null)
                 return;

From 2f33aeac9ff14d075957d7c053dd7b384d2caa37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Nov 2020 14:31:07 +0100
Subject: [PATCH 06171/10326] Move drawable instatiation to [SetUp]

---
 .../Skinning/ManiaHitObjectTestScene.cs                   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
index d24c81dac6..96444fd316 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.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.Allocation;
+using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -15,8 +15,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
     /// </summary>
     public abstract class ManiaHitObjectTestScene : ManiaSkinnableTestScene
     {
-        [BackgroundDependencyLoader]
-        private void load()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
             SetContents(() => new FillFlowContainer
             {
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     },
                 }
             });
-        }
+        });
 
         protected abstract DrawableManiaHitObject CreateHitObject();
     }

From 2ccc81ccc0ca7406d21e6283c60a77f5849bf681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Nov 2020 14:31:24 +0100
Subject: [PATCH 06172/10326] Add test case for fading hold note

---
 .../Skinning/TestSceneHoldNote.cs                   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
index 9c4c2b3d5b..e88ff8e2ac 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.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 System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
@@ -26,6 +27,18 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             });
         }
 
+        [Test]
+        public void TestFadeOnMiss()
+        {
+            AddStep("miss tick", () =>
+            {
+                foreach (var holdNote in holdNotes)
+                    holdNote.ChildrenOfType<DrawableHoldNoteHead>().First().MissForcefully();
+            });
+        }
+
+        private IEnumerable<DrawableHoldNote> holdNotes => CreatedDrawables.SelectMany(d => d.ChildrenOfType<DrawableHoldNote>());
+
         protected override DrawableManiaHitObject CreateHitObject()
         {
             var note = new HoldNote { Duration = 1000 };

From 55a91dbbe031df2bb677a6518cf035961d4faf1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Nov 2020 15:16:33 +0100
Subject: [PATCH 06173/10326] Add fading on hit state change

---
 .../Skinning/LegacyBodyPiece.cs               | 46 +++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index c0f0fcb4af..a9cd7b592f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
 {
     public class LegacyBodyPiece : LegacyManiaColumnElement
     {
+        private DrawableHoldNote holdNote;
+
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
         private readonly IBindable<bool> isHitting = new Bindable<bool>();
 
@@ -38,6 +40,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo, DrawableHitObject drawableObject)
         {
+            holdNote = (DrawableHoldNote)drawableObject;
+
             string imageName = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage)?.Value
                                ?? $"mania-note{FallbackColumnIndex}L";
 
@@ -92,11 +96,44 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 InternalChild = bodySprite;
 
             direction.BindTo(scrollingInfo.Direction);
-            direction.BindValueChanged(onDirectionChanged, true);
-
-            var holdNote = (DrawableHoldNote)drawableObject;
             isHitting.BindTo(holdNote.IsHitting);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            direction.BindValueChanged(onDirectionChanged, true);
             isHitting.BindValueChanged(onIsHittingChanged, true);
+
+            holdNote.ApplyCustomUpdateState += applyCustomUpdateState;
+            applyCustomUpdateState(holdNote, holdNote.State.Value);
+        }
+
+        /// <summary>
+        /// Stores the start time of the fade animation that plays when any of the nested
+        /// hitobjects of the hold note are missed.
+        /// </summary>
+        private double? missFadeTime;
+
+        private void applyCustomUpdateState(DrawableHitObject hitObject, ArmedState state)
+        {
+            switch (state)
+            {
+                case ArmedState.Miss:
+                    missFadeTime ??= hitObject.StateUpdateTime;
+
+                    using (BeginAbsoluteSequence(missFadeTime.Value))
+                    {
+                        // colour and duration matches stable
+                        // transforms not applied to entire hold note in order to not affect hit lighting
+                        holdNote.Head.FadeColour(Colour4.DarkGray, 60);
+                        bodySprite?.FadeColour(Colour4.DarkGray, 60);
+                        holdNote.Tail.FadeColour(Colour4.DarkGray, 60);
+                    }
+
+                    break;
+            }
         }
 
         private void onIsHittingChanged(ValueChangedEvent<bool> isHitting)
@@ -162,6 +199,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
         {
             base.Dispose(isDisposing);
 
+            if (holdNote != null)
+                holdNote.ApplyCustomUpdateState -= applyCustomUpdateState;
+
             lightContainer?.Expire();
         }
     }

From 4777b1be8108462cad86c5b81e2865888a1972e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Nov 2020 15:43:10 +0100
Subject: [PATCH 06174/10326] Fix fade not applying to tails sometimes

---
 .../Skinning/LegacyBodyPiece.cs               | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index a9cd7b592f..a0cbc47df1 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -118,21 +118,22 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         private void applyCustomUpdateState(DrawableHitObject hitObject, ArmedState state)
         {
-            switch (state)
+            if (state == ArmedState.Miss)
+                missFadeTime = hitObject.StateUpdateTime;
+
+            if (missFadeTime == null)
+                return;
+
+            // this state update could come from any nested object of the hold note.
+            // make sure the transforms are consistent across all affected parts
+            // even if they're idle.
+            using (BeginAbsoluteSequence(missFadeTime.Value))
             {
-                case ArmedState.Miss:
-                    missFadeTime ??= hitObject.StateUpdateTime;
-
-                    using (BeginAbsoluteSequence(missFadeTime.Value))
-                    {
-                        // colour and duration matches stable
-                        // transforms not applied to entire hold note in order to not affect hit lighting
-                        holdNote.Head.FadeColour(Colour4.DarkGray, 60);
-                        bodySprite?.FadeColour(Colour4.DarkGray, 60);
-                        holdNote.Tail.FadeColour(Colour4.DarkGray, 60);
-                    }
-
-                    break;
+                // colour and duration matches stable
+                // transforms not applied to entire hold note in order to not affect hit lighting
+                holdNote.Head.FadeColour(Colour4.DarkGray, 60);
+                bodySprite?.FadeColour(Colour4.DarkGray, 60);
+                holdNote.Tail.FadeColour(Colour4.DarkGray, 60);
             }
         }
 

From b62bf5798d40d0df7cd0e8ed63e59215dae6a088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Nov 2020 21:14:34 +0100
Subject: [PATCH 06175/10326] Store time of hold note break

---
 .../Objects/Drawables/DrawableHoldNote.cs                 | 8 ++++----
 .../Objects/Drawables/DrawableHoldNoteTail.cs             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 59899637f9..a64cc6dc67 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -51,9 +51,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         public double? HoldStartTime { get; private set; }
 
         /// <summary>
-        /// Whether the hold note has been released too early and shouldn't give full score for the release.
+        /// Time at which the hold note has been broken, i.e. released too early, resulting in a reduced score.
         /// </summary>
-        public bool HasBroken { get; private set; }
+        public double? HoldBrokenTime { get; private set; }
 
         /// <summary>
         /// Whether the hold note has been released potentially without having caused a break.
@@ -238,7 +238,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             }
 
             if (Tail.Judged && !Tail.IsHit)
-                HasBroken = true;
+                HoldBrokenTime = Time.Current;
         }
 
         public bool OnPressed(ManiaAction action)
@@ -298,7 +298,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             // If the key has been released too early, the user should not receive full score for the release
             if (!Tail.IsHit)
-                HasBroken = true;
+                HoldBrokenTime = Time.Current;
 
             releaseTime = Time.Current;
         }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index c780c0836e..a4029e7893 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             ApplyResult(r =>
             {
                 // If the head wasn't hit or the hold note was broken, cap the max score to Meh.
-                if (result > HitResult.Meh && (!holdNote.Head.IsHit || holdNote.HasBroken))
+                if (result > HitResult.Meh && (!holdNote.Head.IsHit || holdNote.HoldBrokenTime != null))
                     result = HitResult.Meh;
 
                 r.Type = result;

From 2071cba944050ce4da997b1e8111d96650d12c22 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 13 Nov 2020 12:32:23 -0800
Subject: [PATCH 06176/10326] Add music bindings to on screen display

---
 osu.Game/Configuration/OsuConfigManager.cs       |  2 +-
 .../Overlays/Music/MusicKeyBindingHandler.cs     | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index a4b99bb6e6..89a6ee8b07 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Configuration
 
         public Func<int, string> LookupSkinName { private get; set; }
 
-        public Func<GlobalAction, string> LookupKeyBindings { private get; set; }
+        public Func<GlobalAction, string> LookupKeyBindings { get; set; }
     }
 
     public enum OsuSetting
diff --git a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
index e6edfb1e3e..0d6158d46f 100644
--- a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
+++ b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays.OSD;
 
@@ -25,6 +26,9 @@ namespace osu.Game.Overlays.Music
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
         public bool OnPressed(GlobalAction action)
         {
             if (beatmap.Disabled)
@@ -37,11 +41,11 @@ namespace osu.Game.Overlays.Music
                     bool wasPlaying = musicController.IsPlaying;
 
                     if (musicController.TogglePause())
-                        onScreenDisplay?.Display(new MusicActionToast(wasPlaying ? "Pause track" : "Play track"));
+                        onScreenDisplay?.Display(new MusicActionToast(wasPlaying ? "Pause track" : "Play track", config.LookupKeyBindings(action)));
                     return true;
 
                 case GlobalAction.MusicNext:
-                    musicController.NextTrack(() => onScreenDisplay?.Display(new MusicActionToast("Next track")));
+                    musicController.NextTrack(() => onScreenDisplay?.Display(new MusicActionToast("Next track", config.LookupKeyBindings(action))));
 
                     return true;
 
@@ -51,11 +55,11 @@ namespace osu.Game.Overlays.Music
                         switch (res)
                         {
                             case PreviousTrackResult.Restart:
-                                onScreenDisplay?.Display(new MusicActionToast("Restart track"));
+                                onScreenDisplay?.Display(new MusicActionToast("Restart track", config.LookupKeyBindings(action)));
                                 break;
 
                             case PreviousTrackResult.Previous:
-                                onScreenDisplay?.Display(new MusicActionToast("Previous track"));
+                                onScreenDisplay?.Display(new MusicActionToast("Previous track", config.LookupKeyBindings(action)));
                                 break;
                         }
                     });
@@ -72,8 +76,8 @@ namespace osu.Game.Overlays.Music
 
         private class MusicActionToast : Toast
         {
-            public MusicActionToast(string action)
-                : base("Music Playback", action, string.Empty)
+            public MusicActionToast(string action, string shortcut)
+                : base("Music Playback", action, shortcut)
             {
             }
         }

From a199a957cca03746a93b2ebf1e5ffa0a90b43bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Nov 2020 21:47:55 +0100
Subject: [PATCH 06177/10326] Use stored hold note break time to fade upon it

---
 .../Skinning/LegacyBodyPiece.cs               | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index a0cbc47df1..9ed25115d8 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -23,6 +23,12 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
         private readonly IBindable<bool> isHitting = new Bindable<bool>();
 
+        /// <summary>
+        /// Stores the start time of the fade animation that plays when any of the nested
+        /// hitobjects of the hold note are missed.
+        /// </summary>
+        private readonly Bindable<double?> missFadeTime = new Bindable<double?>();
+
         [CanBeNull]
         private Drawable bodySprite;
 
@@ -105,36 +111,16 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             direction.BindValueChanged(onDirectionChanged, true);
             isHitting.BindValueChanged(onIsHittingChanged, true);
+            missFadeTime.BindValueChanged(onMissFadeTimeChanged, true);
 
             holdNote.ApplyCustomUpdateState += applyCustomUpdateState;
             applyCustomUpdateState(holdNote, holdNote.State.Value);
         }
 
-        /// <summary>
-        /// Stores the start time of the fade animation that plays when any of the nested
-        /// hitobjects of the hold note are missed.
-        /// </summary>
-        private double? missFadeTime;
-
         private void applyCustomUpdateState(DrawableHitObject hitObject, ArmedState state)
         {
             if (state == ArmedState.Miss)
-                missFadeTime = hitObject.StateUpdateTime;
-
-            if (missFadeTime == null)
-                return;
-
-            // this state update could come from any nested object of the hold note.
-            // make sure the transforms are consistent across all affected parts
-            // even if they're idle.
-            using (BeginAbsoluteSequence(missFadeTime.Value))
-            {
-                // colour and duration matches stable
-                // transforms not applied to entire hold note in order to not affect hit lighting
-                holdNote.Head.FadeColour(Colour4.DarkGray, 60);
-                bodySprite?.FadeColour(Colour4.DarkGray, 60);
-                holdNote.Tail.FadeColour(Colour4.DarkGray, 60);
-            }
+                missFadeTime.Value ??= hitObject.StateUpdateTime;
         }
 
         private void onIsHittingChanged(ValueChangedEvent<bool> isHitting)
@@ -196,6 +182,29 @@ namespace osu.Game.Rulesets.Mania.Skinning
             }
         }
 
+        private void onMissFadeTimeChanged(ValueChangedEvent<double?> missFadeTimeChange)
+        {
+            if (missFadeTimeChange.NewValue == null)
+                return;
+
+            // this update could come from any nested object of the hold note (or even from an input).
+            // make sure the transforms are consistent across all affected parts.
+            using (BeginAbsoluteSequence(missFadeTimeChange.NewValue.Value))
+            {
+                // colour and duration matches stable
+                // transforms not applied to entire hold note in order to not affect hit lighting
+                holdNote.Head.FadeColour(Colour4.DarkGray, 60);
+                holdNote.Tail.FadeColour(Colour4.DarkGray, 60);
+                bodySprite?.FadeColour(Colour4.DarkGray, 60);
+            }
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            missFadeTime.Value ??= holdNote.HoldBrokenTime;
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From ba30800bf4d242b30f0909bf97a146cced4e6ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Nov 2020 22:21:22 +0100
Subject: [PATCH 06178/10326] Extract constant

---
 osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index 9ed25115d8..f1f72c8618 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -193,9 +193,11 @@ namespace osu.Game.Rulesets.Mania.Skinning
             {
                 // colour and duration matches stable
                 // transforms not applied to entire hold note in order to not affect hit lighting
-                holdNote.Head.FadeColour(Colour4.DarkGray, 60);
-                holdNote.Tail.FadeColour(Colour4.DarkGray, 60);
-                bodySprite?.FadeColour(Colour4.DarkGray, 60);
+                const double fade_duration = 60;
+
+                holdNote.Head.FadeColour(Colour4.DarkGray, fade_duration);
+                holdNote.Tail.FadeColour(Colour4.DarkGray, fade_duration);
+                bodySprite?.FadeColour(Colour4.DarkGray, fade_duration);
             }
         }
 

From 706d7890b4bf93816e8d8b2ebe4d75d15898a7c9 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 5 Nov 2020 06:40:20 -0800
Subject: [PATCH 06179/10326] Make tournaments strings more consistent

---
 osu.Game.Tournament/Screens/SetupScreen.cs    | 8 ++++----
 osu.Game.Tournament/TournamentSceneManager.cs | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 98bc292901..e78d3a9e83 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -83,8 +83,8 @@ namespace osu.Game.Tournament.Screens
                 },
                 new ActionableInfo
                 {
-                    Label = "Current User",
-                    ButtonText = "Change Login",
+                    Label = "Current user",
+                    ButtonText = "Change sign-in",
                     Action = () =>
                     {
                         api.Logout();
@@ -102,12 +102,12 @@ namespace osu.Game.Tournament.Screens
                     },
                     Value = api?.LocalUser.Value.Username,
                     Failing = api?.IsLoggedIn != true,
-                    Description = "In order to access the API and display metadata, a login is required."
+                    Description = "In order to access the API and display metadata, signing in is required."
                 },
                 new LabelledDropdown<RulesetInfo>
                 {
                     Label = "Ruleset",
-                    Description = "Decides what stats are displayed and which ranks are retrieved for players",
+                    Description = "Decides what stats are displayed and which ranks are retrieved for players.",
                     Items = rulesets.AvailableRulesets,
                     Current = LadderInfo.Ruleset,
                 },
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index 2c539cdd43..870ea466cc 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -127,10 +127,10 @@ namespace osu.Game.Tournament
                                 new ScreenButton(typeof(ScheduleScreen)) { Text = "Schedule", RequestSelection = SetScreen },
                                 new ScreenButton(typeof(LadderScreen)) { Text = "Bracket", RequestSelection = SetScreen },
                                 new Separator(),
-                                new ScreenButton(typeof(TeamIntroScreen)) { Text = "TeamIntro", RequestSelection = SetScreen },
+                                new ScreenButton(typeof(TeamIntroScreen)) { Text = "Team Intro", RequestSelection = SetScreen },
                                 new ScreenButton(typeof(SeedingScreen)) { Text = "Seeding", RequestSelection = SetScreen },
                                 new Separator(),
-                                new ScreenButton(typeof(MapPoolScreen)) { Text = "MapPool", RequestSelection = SetScreen },
+                                new ScreenButton(typeof(MapPoolScreen)) { Text = "Map Pool", RequestSelection = SetScreen },
                                 new ScreenButton(typeof(GameplayScreen)) { Text = "Gameplay", RequestSelection = SetScreen },
                                 new Separator(),
                                 new ScreenButton(typeof(TeamWinScreen)) { Text = "Win", RequestSelection = SetScreen },

From 9d8e7e895442c29df40a3ebf2fb0df5cf020bbb1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Nov 2020 04:46:26 +0300
Subject: [PATCH 06180/10326] ProfileLineChart layout implementation

---
 .../Online/TestSceneProfileLineChart.cs       | 39 +++++++++++
 .../Sections/Historical/ProfileLineChart.cs   | 64 +++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs
 create mode 100644 osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs
new file mode 100644
index 0000000000..34359baab5
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.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.Game.Overlays.Profile.Sections.Historical;
+using osu.Framework.Graphics;
+using static osu.Game.Users.User;
+using System;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneProfileLineChart : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
+
+        public TestSceneProfileLineChart()
+        {
+            var values = new[]
+            {
+                new UserHistoryCount { Date = new DateTime(2010, 5, 1), Count = 1000 },
+                new UserHistoryCount { Date = new DateTime(2010, 6, 1), Count = 20 },
+                new UserHistoryCount { Date = new DateTime(2010, 7, 1), Count = 20000 },
+                new UserHistoryCount { Date = new DateTime(2010, 8, 1), Count = 30 },
+                new UserHistoryCount { Date = new DateTime(2010, 9, 1), Count = 50 },
+                new UserHistoryCount { Date = new DateTime(2010, 10, 1), Count = 2000 },
+                new UserHistoryCount { Date = new DateTime(2010, 11, 1), Count = 2100 }
+            };
+
+            Add(new ProfileLineChart
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Values = values
+            });
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
new file mode 100644
index 0000000000..10a03aa012
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -0,0 +1,64 @@
+// Copyright (c) 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 JetBrains.Annotations;
+using static osu.Game.Users.User;
+
+namespace osu.Game.Overlays.Profile.Sections.Historical
+{
+    public class ProfileLineChart : CompositeDrawable
+    {
+        private UserHistoryCount[] values;
+
+        [CanBeNull]
+        public UserHistoryCount[] Values
+        {
+            get => values;
+            set
+            {
+                values = value;
+                graph.Values = values;
+            }
+        }
+
+        private readonly UserHistoryGraph graph;
+
+        public ProfileLineChart()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = 250;
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                ColumnDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize),
+                    new Dimension()
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(),
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        Empty(),
+                        graph = new UserHistoryGraph
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    },
+                    new Drawable[]
+                    {
+                        Empty(),
+                        Empty()
+                    }
+                }
+            };
+        }
+    }
+}

From d98c59f2a4b399da80b5c511f062c60c6d5d536e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Nov 2020 06:38:02 +0300
Subject: [PATCH 06181/10326] Implement horizontal ticks creation

---
 .../Sections/Historical/ProfileLineChart.cs   | 126 +++++++++++++++++-
 1 file changed, 123 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 10a03aa012..a02f869f51 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -5,6 +5,13 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using JetBrains.Annotations;
 using static osu.Game.Users.User;
+using System;
+using System.Linq;
+using osu.Game.Graphics.Sprites;
+using osu.Framework.Utils;
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
@@ -20,10 +27,14 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             {
                 values = value;
                 graph.Values = values;
+
+                createRowTicks();
             }
         }
 
         private readonly UserHistoryGraph graph;
+        private readonly Container<TickText> rowTicksContainer;
+        private readonly Container<TickLine> rowLinesContainer;
 
         public ProfileLineChart()
         {
@@ -46,10 +57,25 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 {
                     new Drawable[]
                     {
-                        Empty(),
-                        graph = new UserHistoryGraph
+                        rowTicksContainer = new Container<TickText>
                         {
-                            RelativeSizeAxes = Axes.Both
+                            RelativeSizeAxes = Axes.Y,
+                            AutoSizeAxes = Axes.X
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
+                            {
+                                rowLinesContainer = new Container<TickLine>
+                                {
+                                    RelativeSizeAxes = Axes.Both
+                                },
+                                graph = new UserHistoryGraph
+                                {
+                                    RelativeSizeAxes = Axes.Both
+                                }
+                            }
                         }
                     },
                     new Drawable[]
@@ -60,5 +86,99 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 }
             };
         }
+
+        private void createRowTicks()
+        {
+            rowTicksContainer.Clear();
+            rowLinesContainer.Clear();
+
+            var min = values.Select(v => v.Count).Min();
+            var max = values.Select(v => v.Count).Max();
+
+            var niceRange = niceNumber(max - min, false);
+            var niceTick = niceNumber(niceRange / (6 - 1), true);
+            var axisStart = Math.Floor(min / niceTick) * niceTick;
+            var axisEnd = Math.Ceiling(max / niceTick) * niceTick;
+
+            var rollingRow = axisStart;
+
+            while (rollingRow <= axisEnd)
+            {
+                var y = -Interpolation.ValueAt(rollingRow, 0, 1f, min, max);
+
+                rowTicksContainer.Add(new TickText
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.CentreRight,
+                    RelativePositionAxes = Axes.Y,
+                    Text = rollingRow.ToString("N0"),
+                    Y = y
+                });
+
+                rowLinesContainer.Add(new TickLine
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.CentreRight,
+                    RelativeSizeAxes = Axes.X,
+                    RelativePositionAxes = Axes.Y,
+                    Height = 1,
+                    Y = y
+                });
+
+                rollingRow += niceTick;
+            }
+        }
+
+        private double niceNumber(double value, bool round)
+        {
+            var exponent = (int)Math.Floor(Math.Log10(value));
+            var fraction = value / Math.Pow(10, exponent);
+
+            double niceFraction;
+
+            if (round)
+            {
+                if (fraction < 1.5)
+                    niceFraction = 1.0;
+                else if (fraction < 3)
+                    niceFraction = 2.0;
+                else if (fraction < 7)
+                    niceFraction = 5.0;
+                else
+                    niceFraction = 10.0;
+            }
+            else
+            {
+                if (fraction <= 1.0)
+                    niceFraction = 1.0;
+                else if (fraction <= 2.0)
+                    niceFraction = 2.0;
+                else if (fraction <= 5.0)
+                    niceFraction = 5.0;
+                else
+                    niceFraction = 10.0;
+            }
+
+            return niceFraction * Math.Pow(10, exponent);
+        }
+
+        private class TickText : OsuSpriteText
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Foreground1;
+                Font = OsuFont.GetFont(size: 12);
+            }
+        }
+
+        private class TickLine : Box
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Background6;
+            }
+        }
     }
 }

From 00e974794076c241779694f6ec988a8ccf204044 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Nov 2020 06:44:29 +0300
Subject: [PATCH 06182/10326] Test scene visual improvements

---
 .../Online/TestSceneProfileLineChart.cs       | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs
index 34359baab5..0be835c07d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs
@@ -7,6 +7,8 @@ using static osu.Game.Users.User;
 using System;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -28,11 +30,25 @@ namespace osu.Game.Tests.Visual.Online
                 new UserHistoryCount { Date = new DateTime(2010, 11, 1), Count = 2100 }
             };
 
-            Add(new ProfileLineChart
+            AddRange(new Drawable[]
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Values = values
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background4
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Padding = new MarginPadding { Horizontal = 50 },
+                    Child = new ProfileLineChart
+                    {
+                        Values = values
+                    }
+                }
             });
         }
     }

From 01f28a35c3269316e5c380d14c8c41c3a65eff6b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Nov 2020 07:28:01 +0300
Subject: [PATCH 06183/10326] Implement vertical ticks creation

---
 .../Sections/Historical/ProfileLineChart.cs   | 70 +++++++++++++++++--
 1 file changed, 65 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index a02f869f51..2908b50a6e 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -29,12 +29,15 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 graph.Values = values;
 
                 createRowTicks();
+                createColumnTicks();
             }
         }
 
         private readonly UserHistoryGraph graph;
         private readonly Container<TickText> rowTicksContainer;
+        private readonly Container<TickText> columnTicksContainer;
         private readonly Container<TickLine> rowLinesContainer;
+        private readonly Container<TickLine> columnLinesContainer;
 
         public ProfileLineChart()
         {
@@ -67,9 +70,20 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                             RelativeSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
-                                rowLinesContainer = new Container<TickLine>
+                                new Container
                                 {
-                                    RelativeSizeAxes = Axes.Both
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new[]
+                                    {
+                                        rowLinesContainer = new Container<TickLine>
+                                        {
+                                            RelativeSizeAxes = Axes.Both
+                                        },
+                                        columnLinesContainer = new Container<TickLine>
+                                        {
+                                            RelativeSizeAxes = Axes.Both
+                                        }
+                                    }
                                 },
                                 graph = new UserHistoryGraph
                                 {
@@ -81,7 +95,12 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                     new Drawable[]
                     {
                         Empty(),
-                        Empty()
+                        columnTicksContainer = new Container<TickText>
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Padding = new MarginPadding { Top = 10 }
+                        }
                     }
                 }
             };
@@ -104,7 +123,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
             while (rollingRow <= axisEnd)
             {
-                var y = -Interpolation.ValueAt(rollingRow, 0, 1f, min, max);
+                var y = -Interpolation.ValueAt(rollingRow, 0, 1f, axisStart, axisEnd);
 
                 rowTicksContainer.Add(new TickText
                 {
@@ -129,9 +148,50 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             }
         }
 
+        private void createColumnTicks()
+        {
+            columnTicksContainer.Clear();
+            columnLinesContainer.Clear();
+
+            var min = values.Select(v => v.Date).Min().Ticks;
+            var max = values.Select(v => v.Date).Max().Ticks;
+
+            var niceRange = niceNumber(max - min, false);
+            var niceTick = niceNumber(niceRange / (Math.Min(values.Length, 15) - 1), true);
+            var axisStart = Math.Floor(min / niceTick) * niceTick;
+            var axisEnd = Math.Ceiling(max / niceTick) * niceTick;
+
+            var rollingRow = axisStart;
+
+            while (rollingRow <= axisEnd)
+            {
+                var x = Interpolation.ValueAt(rollingRow, 0, 1f, axisStart, axisEnd);
+
+                columnTicksContainer.Add(new TickText
+                {
+                    Origin = Anchor.CentreLeft,
+                    RelativePositionAxes = Axes.X,
+                    Text = new DateTime((long)rollingRow).ToString("MMM yyyy"),
+                    Rotation = 45,
+                    X = x
+                });
+
+                columnLinesContainer.Add(new TickLine
+                {
+                    Origin = Anchor.TopCentre,
+                    RelativeSizeAxes = Axes.Y,
+                    RelativePositionAxes = Axes.X,
+                    Width = 1,
+                    X = x
+                });
+
+                rollingRow += niceTick;
+            }
+        }
+
         private double niceNumber(double value, bool round)
         {
-            var exponent = (int)Math.Floor(Math.Log10(value));
+            var exponent = Math.Floor(Math.Log10(value));
             var fraction = value / Math.Pow(10, exponent);
 
             double niceFraction;

From 90f37ff4ab651281059a5f8bdf2bc41cf6c69a1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 14 Nov 2020 18:04:59 +0900
Subject: [PATCH 06184/10326] Rejig namespaces

---
 osu.Game.Rulesets.Osu/{UI => Edit}/OsuEditDrawablePool.cs      | 2 +-
 .../{UI => Objects/Drawables}/OsuDrawablePool.cs               | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename osu.Game.Rulesets.Osu/{UI => Edit}/OsuEditDrawablePool.cs (98%)
 rename osu.Game.Rulesets.Osu/{UI => Objects/Drawables}/OsuDrawablePool.cs (93%)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuEditDrawablePool.cs b/osu.Game.Rulesets.Osu/Edit/OsuEditDrawablePool.cs
similarity index 98%
rename from osu.Game.Rulesets.Osu/UI/OsuEditDrawablePool.cs
rename to osu.Game.Rulesets.Osu/Edit/OsuEditDrawablePool.cs
index 822ff076f5..946181d8a4 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuEditDrawablePool.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuEditDrawablePool.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 
-namespace osu.Game.Rulesets.Osu.UI
+namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuEditDrawablePool<T> : OsuDrawablePool<T>
         where T : DrawableHitObject, new()
diff --git a/osu.Game.Rulesets.Osu/UI/OsuDrawablePool.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/OsuDrawablePool.cs
similarity index 93%
rename from osu.Game.Rulesets.Osu/UI/OsuDrawablePool.cs
rename to osu.Game.Rulesets.Osu/Objects/Drawables/OsuDrawablePool.cs
index 148146f25a..1d9330b962 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuDrawablePool.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/OsuDrawablePool.cs
@@ -5,9 +5,8 @@ using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 
-namespace osu.Game.Rulesets.Osu.UI
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class OsuDrawablePool<T> : DrawablePool<T>
         where T : DrawableHitObject, new()

From 7ac4d2c4be80ffe933bd76ff6c1333e6b3d498fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 14 Nov 2020 18:05:30 +0900
Subject: [PATCH 06185/10326] Move "drawable" to first prefix

---
 .../Edit/{OsuEditDrawablePool.cs => DrawableOsuEditPool.cs}   | 4 ++--
 osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs          | 2 +-
 .../Drawables/{OsuDrawablePool.cs => DrawableOsuPool.cs}      | 4 ++--
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs                      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game.Rulesets.Osu/Edit/{OsuEditDrawablePool.cs => DrawableOsuEditPool.cs} (95%)
 rename osu.Game.Rulesets.Osu/Objects/Drawables/{OsuDrawablePool.cs => DrawableOsuPool.cs} (89%)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuEditDrawablePool.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs
similarity index 95%
rename from osu.Game.Rulesets.Osu/Edit/OsuEditDrawablePool.cs
rename to osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs
index 946181d8a4..569031752e 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuEditDrawablePool.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class OsuEditDrawablePool<T> : OsuDrawablePool<T>
+    public class DrawableOsuEditPool<T> : DrawableOsuPool<T>
         where T : DrawableHitObject, new()
     {
         /// <summary>
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </summary>
         private const double editor_hit_object_fade_out_extension = 700;
 
-        public OsuEditDrawablePool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null)
+        public DrawableOsuEditPool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null)
             : base(checkHittable, onLoaded, initialSize, maximumSize)
         {
         }
diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index 8af6fd65ce..547dff88b5 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             protected override GameplayCursorContainer CreateCursor() => null;
 
             protected override DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
-                => new OsuEditDrawablePool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize);
+                => new DrawableOsuEditPool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/OsuDrawablePool.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuPool.cs
similarity index 89%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/OsuDrawablePool.cs
rename to osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuPool.cs
index 1d9330b962..1b5fd50022 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/OsuDrawablePool.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuPool.cs
@@ -8,13 +8,13 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class OsuDrawablePool<T> : DrawablePool<T>
+    public class DrawableOsuPool<T> : DrawablePool<T>
         where T : DrawableHitObject, new()
     {
         private readonly Func<DrawableHitObject, double, bool> checkHittable;
         private readonly Action<Drawable> onLoaded;
 
-        public OsuDrawablePool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null)
+        public DrawableOsuPool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null)
             : base(initialSize, maximumSize)
         {
             this.checkHittable = checkHittable;
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index e8ff6c410f..c816502d61 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected virtual DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
             where TDrawable : DrawableHitObject, new()
-            => new OsuDrawablePool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize);
+            => new DrawableOsuPool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize);
 
         protected override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject) => new OsuHitObjectLifetimeEntry(hitObject);
 

From deea75b2e9f53f92eff40109adef3e162d76b68c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 14 Nov 2020 18:05:51 +0900
Subject: [PATCH 06186/10326] Fix typo in comment

---
 osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs
index 569031752e..776aacd143 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             switch (hitObject)
             {
                 default:
-                    // there are quite a few drawable hit types we don't want to extent (spinners, ticks etc.)
+                    // there are quite a few drawable hit types we don't want to extend (spinners, ticks etc.)
                     return;
 
                 case DrawableSlider _:

From 4d2bc790fd96b68234b39e623d6147e09a444ffb Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Sat, 14 Nov 2020 13:20:16 +0100
Subject: [PATCH 06187/10326] Fix crash on shift+right-click deleting objects

---
 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 3229719d5a..c9043ccef3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -338,7 +338,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether a selection was performed.</returns>
         private bool beginClickSelection(MouseButtonEvent e)
         {
-            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
+            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren.ToList())
             {
                 if (!blueprint.IsHovered) continue;
 

From 610ed99ae3eba0f9f28cc7ca13b9cd56d94f2cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 14 Nov 2020 14:48:48 +0100
Subject: [PATCH 06188/10326] Add null checks to unguarded resolved-as-null
 fields

---
 .../Screens/Ladder/Components/DrawableTournamentMatch.cs   | 4 ++--
 osu.Game/Online/DownloadTrackingComposite.cs               | 7 +++++--
 osu.Game/Online/Leaderboards/Leaderboard.cs                | 6 ++++--
 osu.Game/Overlays/AccountCreation/ScreenWarning.cs         | 4 ++--
 .../Overlays/Settings/Sections/General/LoginSettings.cs    | 2 +-
 osu.Game/PerformFromMenuRunner.cs                          | 2 +-
 osu.Game/Rulesets/UI/HitObjectContainer.cs                 | 2 +-
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs  | 3 +++
 .../Components/Timeline/TimelineBlueprintContainer.cs      | 2 +-
 osu.Game/Screens/Edit/Timing/TimingScreen.cs               | 2 +-
 osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs  | 3 +++
 11 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index 655beb4bdd..f2065e7e88 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -144,9 +144,9 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                 if (selected)
                 {
                     selectionBox.Show();
-                    if (editor)
+                    if (editor && editorInfo != null)
                         editorInfo.Selected.Value = Match;
-                    else
+                    else if (ladderInfo != null)
                         ladderInfo.CurrentMatch.Value = Match;
                 }
                 else
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 5d9cf612bb..bed95344c6 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -46,12 +46,15 @@ namespace osu.Game.Online
             {
                 if (modelInfo.NewValue == null)
                     attachDownload(null);
-                else if (manager.IsAvailableLocally(modelInfo.NewValue))
+                else if (manager?.IsAvailableLocally(modelInfo.NewValue) == true)
                     State.Value = DownloadState.LocallyAvailable;
                 else
-                    attachDownload(manager.GetExistingDownload(modelInfo.NewValue));
+                    attachDownload(manager?.GetExistingDownload(modelInfo.NewValue));
             }, true);
 
+            if (manager == null)
+                return;
+
             managerDownloadBegan = manager.DownloadBegan.GetBoundCopy();
             managerDownloadBegan.BindValueChanged(downloadBegan);
             managerDownloadFailed = manager.DownloadFailed.GetBoundCopy();
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 3a5c2e181f..d18f189a70 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -248,7 +248,9 @@ namespace osu.Game.Online.Leaderboards
         [BackgroundDependencyLoader]
         private void load()
         {
-            apiState.BindTo(api.State);
+            if (api != null)
+                apiState.BindTo(api.State);
+
             apiState.BindValueChanged(onlineStateChanged, true);
         }
 
@@ -303,7 +305,7 @@ namespace osu.Game.Online.Leaderboards
                     PlaceholderState = PlaceholderState.NetworkFailure;
                 });
 
-                api.Queue(getScoresRequest);
+                api?.Queue(getScoresRequest);
             });
         }
 
diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index 5375476c9e..b2096968fe 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.AccountCreation
 
         public override void OnEntering(IScreen last)
         {
-            if (string.IsNullOrEmpty(api.ProvidedUsername))
+            if (string.IsNullOrEmpty(api?.ProvidedUsername))
             {
                 this.FadeOut();
                 this.Push(new ScreenEntry());
@@ -43,7 +43,7 @@ namespace osu.Game.Overlays.AccountCreation
         [BackgroundDependencyLoader(true)]
         private void load(OsuColour colours, OsuGame game, TextureStore textures)
         {
-            if (string.IsNullOrEmpty(api.ProvidedUsername))
+            if (string.IsNullOrEmpty(api?.ProvidedUsername))
                 return;
 
             InternalChildren = new Drawable[]
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index 873272bf12..8f757f7a36 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -217,7 +217,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
             private void performLogin()
             {
                 if (!string.IsNullOrEmpty(username.Text) && !string.IsNullOrEmpty(password.Text))
-                    api.Login(username.Text, password.Text);
+                    api?.Login(username.Text, password.Text);
                 else
                     shakeSignIn.Shake();
             }
diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 5898c116dd..e2d4fc6051 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -76,7 +76,7 @@ namespace osu.Game
             // a dialog may be blocking the execution for now.
             if (checkForDialog(current)) return;
 
-            game.CloseAllOverlays(false);
+            game?.CloseAllOverlays(false);
 
             // we may already be at the target screen type.
             if (validScreens.Contains(getCurrentScreen().GetType()) && !beatmap.Disabled)
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 1dc029506f..5fbda305c8 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.UI
         {
             Debug.Assert(!drawableMap.ContainsKey(entry));
 
-            var drawable = pooledObjectProvider.GetPooledDrawableRepresentation(entry.HitObject);
+            var drawable = pooledObjectProvider?.GetPooledDrawableRepresentation(entry.HitObject);
             if (drawable == null)
                 throw new InvalidOperationException($"A drawable representation could not be retrieved for hitobject type: {entry.HitObject.GetType().ReadableName()}.");
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 3229719d5a..7fa7ec9fa5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -457,6 +457,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (movementBlueprint == null)
                 return false;
 
+            if (snapProvider == null)
+                return true;
+
             Debug.Assert(movementBlueprintOriginalPosition != null);
 
             HitObject draggedObject = movementBlueprint.HitObject;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 0271b2def9..eef02e61a6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (lastDragEvent != null)
                 OnDrag(lastDragEvent);
 
-            if (Composer != null)
+            if (Composer != null && timeline != null)
             {
                 Composer.Playfield.PastLifetimeExtension = timeline.VisibleRange / 2;
                 Composer.Playfield.FutureLifetimeExtension = timeline.VisibleRange / 2;
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 09d861522a..eab909b798 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Screens.Edit.Timing
                 controlPointGroups.BindCollectionChanged((sender, args) =>
                 {
                     table.ControlGroups = controlPointGroups;
-                    changeHandler.SaveState();
+                    changeHandler?.SaveState();
                 }, true);
             }
 
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index be1083ce8d..3fc1359006 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -59,6 +59,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         {
             scheduledFilterUpdate?.Cancel();
 
+            if (filter == null)
+                return;
+
             filter.Value = new FilterCriteria
             {
                 SearchString = Search.Current.Value ?? string.Empty,

From 8a78d408db6ed6d4a218615459c5a66b4802d6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 14 Nov 2020 15:52:12 +0100
Subject: [PATCH 06189/10326] Add more missed null checks

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 21810379cc..adf22a3370 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         protected virtual void OnOperationBegan()
         {
-            ChangeHandler.BeginChange();
+            ChangeHandler?.BeginChange();
         }
 
         /// <summary>
@@ -118,7 +118,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         protected virtual void OnOperationEnded()
         {
-            ChangeHandler.EndChange();
+            ChangeHandler?.EndChange();
         }
 
         #region User Input Handling

From ae4a2e74faab435156cfebe6f6da131b5b83896b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Nov 2020 18:21:10 +0300
Subject: [PATCH 06190/10326] Implement ProfileSubsection

---
 ...cs => TestSceneProfileSubsectionHeader.cs} |  6 +-
 .../Profile/Sections/PaginatedContainer.cs    | 57 +++-----------
 .../Profile/Sections/ProfileSubsection.cs     | 78 +++++++++++++++++++
 ...erHeader.cs => ProfileSubsectionHeader.cs} |  4 +-
 4 files changed, 95 insertions(+), 50 deletions(-)
 rename osu.Game.Tests/Visual/UserInterface/{TestScenePaginatedContainerHeader.cs => TestSceneProfileSubsectionHeader.cs} (95%)
 create mode 100644 osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
 rename osu.Game/Overlays/Profile/Sections/{PaginatedContainerHeader.cs => ProfileSubsectionHeader.cs} (95%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneProfileSubsectionHeader.cs
similarity index 95%
rename from osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneProfileSubsectionHeader.cs
index 2e9f919cfd..cd226662d7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneProfileSubsectionHeader.cs
@@ -11,12 +11,12 @@ using osu.Framework.Allocation;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestScenePaginatedContainerHeader : OsuTestScene
+    public class TestSceneProfileSubsectionHeader : OsuTestScene
     {
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
 
-        private PaginatedContainerHeader header;
+        private ProfileSubsectionHeader header;
 
         [Test]
         public void TestHiddenCounter()
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         private void createHeader(string text, CounterVisibilityState state, int initialValue = 0)
         {
             Clear();
-            Add(header = new PaginatedContainerHeader(text, state)
+            Add(header = new ProfileSubsectionHeader(text, state)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index c1107ce907..7b66c3f51e 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -6,10 +6,7 @@ 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.Online.API;
-using osu.Game.Rulesets;
 using osu.Game.Users;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,7 +15,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Profile.Sections
 {
-    public abstract class PaginatedContainer<TModel> : FillFlowContainer
+    public abstract class PaginatedContainer<TModel> : ProfileSubsection
     {
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -26,42 +23,25 @@ namespace osu.Game.Overlays.Profile.Sections
         protected int VisiblePages;
         protected int ItemsPerPage;
 
-        protected readonly Bindable<User> User = new Bindable<User>();
         protected FillFlowContainer ItemsContainer;
-        protected RulesetStore Rulesets;
 
         private APIRequest<List<TModel>> retrievalRequest;
         private CancellationTokenSource loadCancellation;
 
-        private readonly string missingText;
         private ShowMoreButton moreButton;
-        private OsuSpriteText missing;
-        private PaginatedContainerHeader header;
-
-        private readonly string headerText;
-        private readonly CounterVisibilityState counterVisibilityState;
 
         protected PaginatedContainer(Bindable<User> user, string headerText = "", string missingText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
+            : base(user, headerText, missingText, counterVisibilityState)
         {
-            this.headerText = headerText;
-            this.missingText = missingText;
-            this.counterVisibilityState = counterVisibilityState;
-            User.BindTo(user);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetStore rulesets)
+        protected override Drawable CreateContent() => new FillFlowContainer
         {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            Direction = FillDirection.Vertical;
-
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Direction = FillDirection.Vertical,
             Children = new Drawable[]
             {
-                header = new PaginatedContainerHeader(headerText, counterVisibilityState)
-                {
-                    Alpha = string.IsNullOrEmpty(headerText) ? 0 : 1
-                },
                 ItemsContainer = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Y,
@@ -76,21 +56,10 @@ namespace osu.Game.Overlays.Profile.Sections
                     Margin = new MarginPadding { Top = 10 },
                     Action = showMore,
                 },
-                missing = new OsuSpriteText
-                {
-                    Font = OsuFont.GetFont(size: 15),
-                    Text = missingText,
-                    Alpha = 0,
-                },
-            };
+            }
+        };
 
-            Rulesets = rulesets;
-
-            User.ValueChanged += onUserChanged;
-            User.TriggerChange();
-        }
-
-        private void onUserChanged(ValueChangedEvent<User> e)
+        protected override void OnUserChanged(ValueChangedEvent<User> e)
         {
             loadCancellation?.Cancel();
             retrievalRequest?.Cancel();
@@ -124,15 +93,15 @@ namespace osu.Game.Overlays.Profile.Sections
                 moreButton.Hide();
                 moreButton.IsLoading = false;
 
-                if (!string.IsNullOrEmpty(missing.Text))
-                    missing.Show();
+                if (!string.IsNullOrEmpty(Missing.Text))
+                    Missing.Show();
 
                 return;
             }
 
             LoadComponentsAsync(items.Select(CreateDrawableItem).Where(d => d != null), drawables =>
             {
-                missing.Hide();
+                Missing.Hide();
                 moreButton.FadeTo(items.Count == ItemsPerPage ? 1 : 0);
                 moreButton.IsLoading = false;
 
@@ -142,8 +111,6 @@ namespace osu.Game.Overlays.Profile.Sections
 
         protected virtual int GetCount(User user) => 0;
 
-        protected void SetCount(int value) => header.Current.Value = value;
-
         protected virtual void OnItemsReceived(List<TModel> items)
         {
         }
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
new file mode 100644
index 0000000000..9583759693
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
@@ -0,0 +1,78 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using 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.Rulesets;
+using osu.Game.Users;
+using JetBrains.Annotations;
+
+namespace osu.Game.Overlays.Profile.Sections
+{
+    public abstract class ProfileSubsection : FillFlowContainer
+    {
+        protected readonly Bindable<User> User = new Bindable<User>();
+
+        protected RulesetStore Rulesets { get; private set; }
+
+        protected OsuSpriteText Missing { get; private set; }
+
+        private readonly string headerText;
+        private readonly string missingText;
+        private readonly CounterVisibilityState counterVisibilityState;
+
+        private ProfileSubsectionHeader header;
+
+        protected ProfileSubsection(Bindable<User> user, string headerText = "", string missingText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
+        {
+            this.headerText = headerText;
+            this.missingText = missingText;
+            this.counterVisibilityState = counterVisibilityState;
+            User.BindTo(user);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+
+            Children = new Drawable[]
+            {
+                header = new ProfileSubsectionHeader(headerText, counterVisibilityState)
+                {
+                    Alpha = string.IsNullOrEmpty(headerText) ? 0 : 1
+                },
+                CreateContent(),
+                Missing = new OsuSpriteText
+                {
+                    Font = OsuFont.GetFont(size: 15),
+                    Text = missingText,
+                    Alpha = 0,
+                },
+            };
+
+            Rulesets = rulesets;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            User.BindValueChanged(OnUserChanged, true);
+        }
+
+        [NotNull]
+        protected abstract Drawable CreateContent();
+
+        protected virtual void OnUserChanged(ValueChangedEvent<User> e)
+        {
+        }
+
+        protected void SetCount(int value) => header.Current.Value = value;
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs b/osu.Game/Overlays/Profile/Sections/ProfileSubsectionHeader.cs
similarity index 95%
rename from osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs
rename to osu.Game/Overlays/Profile/Sections/ProfileSubsectionHeader.cs
index 8c617e5fbd..5858cebe89 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileSubsectionHeader.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Profile.Sections
 {
-    public class PaginatedContainerHeader : CompositeDrawable, IHasCurrentValue<int>
+    public class ProfileSubsectionHeader : CompositeDrawable, IHasCurrentValue<int>
     {
         private readonly BindableWithCurrent<int> current = new BindableWithCurrent<int>();
 
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Profile.Sections
 
         private CounterPill counterPill;
 
-        public PaginatedContainerHeader(string text, CounterVisibilityState counterState)
+        public ProfileSubsectionHeader(string text, CounterVisibilityState counterState)
         {
             this.text = text;
             this.counterState = counterState;

From af174aa653206d3ae3dbb42368b2c4ff5285a488 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Nov 2020 18:48:47 +0300
Subject: [PATCH 06191/10326] Implement chart subsections

---
 .../Historical/ChartProfileSubsection.cs      | 51 +++++++++++++++++++
 .../Historical/PlayHistorySubsection.cs       | 19 +++++++
 .../Sections/Historical/ProfileLineChart.cs   |  4 +-
 .../Sections/Historical/ReplaysSubsection.cs  | 19 +++++++
 .../Profile/Sections/HistoricalSection.cs     |  2 +
 5 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
 create mode 100644 osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
 create mode 100644 osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
new file mode 100644
index 0000000000..24083c9a79
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Users;
+using static osu.Game.Users.User;
+
+namespace osu.Game.Overlays.Profile.Sections.Historical
+{
+    public abstract class ChartProfileSubsection : ProfileSubsection
+    {
+        private ProfileLineChart chart;
+
+        protected ChartProfileSubsection(Bindable<User> user, string headerText)
+            : base(user, headerText)
+        {
+
+        }
+
+        protected override Drawable CreateContent() => new Container
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Padding = new MarginPadding
+            {
+                Top = 10,
+                Left = 20,
+                Right = 40
+            },
+            Child = chart = new ProfileLineChart()
+        };
+
+        protected override void OnUserChanged(ValueChangedEvent<User> e)
+        {
+            var values = GetValues(e.NewValue);
+
+            if (values?.Length > 1)
+            {
+                chart.Values = values;
+                Show();
+                return;
+            }
+
+            Hide();
+        }
+
+        protected abstract UserHistoryCount[] GetValues(User user);
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
new file mode 100644
index 0000000000..3e35f80b49
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.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.Bindables;
+using osu.Game.Users;
+using static osu.Game.Users.User;
+
+namespace osu.Game.Overlays.Profile.Sections.Historical
+{
+    public class PlayHistorySubsection : ChartProfileSubsection
+    {
+        public PlayHistorySubsection(Bindable<User> user)
+            : base(user, "Play History")
+        {
+        }
+
+        protected override UserHistoryCount[] GetValues(User user) => user.MonthlyPlaycounts;
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 2908b50a6e..55fa6c5400 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -130,7 +130,9 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.CentreRight,
                     RelativePositionAxes = Axes.Y,
+                    Margin = new MarginPadding { Right = 3 },
                     Text = rollingRow.ToString("N0"),
+                    Font = OsuFont.GetFont(size: 12),
                     Y = y
                 });
 
@@ -172,6 +174,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                     Origin = Anchor.CentreLeft,
                     RelativePositionAxes = Axes.X,
                     Text = new DateTime((long)rollingRow).ToString("MMM yyyy"),
+                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                     Rotation = 45,
                     X = x
                 });
@@ -228,7 +231,6 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             private void load(OverlayColourProvider colourProvider)
             {
                 Colour = colourProvider.Foreground1;
-                Font = OsuFont.GetFont(size: 12);
             }
         }
 
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
new file mode 100644
index 0000000000..f6abd1c4fc
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.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.Bindables;
+using osu.Game.Users;
+using static osu.Game.Users.User;
+
+namespace osu.Game.Overlays.Profile.Sections.Historical
+{
+    public class ReplaysSubsection : ChartProfileSubsection
+    {
+        public ReplaysSubsection(Bindable<User> user)
+            : base(user, "Replays Watched History")
+        {
+        }
+
+        protected override UserHistoryCount[] GetValues(User user) => user.ReplaysWatchedCounts;
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
index bfc47bd88c..6e2b9873cf 100644
--- a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
@@ -18,8 +18,10 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new Drawable[]
             {
+                new PlayHistorySubsection(User),
                 new PaginatedMostPlayedBeatmapContainer(User),
                 new PaginatedScoreContainer(ScoreType.Recent, User, "Recent Plays (24h)", CounterVisibilityState.VisibleWhenZero),
+                new ReplaysSubsection(User)
             };
         }
     }

From b344a1373472c3eb1b21b4b58f9a017b33b78f05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 14 Nov 2020 17:08:27 +0100
Subject: [PATCH 06192/10326] Add support for previewing tracks on spectator
 screen

---
 osu.Game/Screens/Play/Spectator.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 6f51771c12..71ce157296 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Screens;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -35,7 +36,8 @@ using osuTK;
 
 namespace osu.Game.Screens.Play
 {
-    public class Spectator : OsuScreen
+    [Cached(typeof(IPreviewTrackOwner))]
+    public class Spectator : OsuScreen, IPreviewTrackOwner
     {
         private readonly User targetUser;
 
@@ -62,6 +64,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        [Resolved]
+        private PreviewTrackManager previewTrackManager { get; set; }
+
         private Score score;
 
         private readonly object scoreLock = new object();
@@ -275,6 +280,7 @@ namespace osu.Game.Screens.Play
         {
             watchButton.Enabled.Value = false;
             beatmapPanelContainer.Clear();
+            previewTrackManager.StopAnyPlaying(this);
         }
 
         private void attemptStart()
@@ -326,7 +332,6 @@ namespace osu.Game.Screens.Play
         {
             if (state?.BeatmapID == null)
             {
-                beatmapPanelContainer.Clear();
                 onlineBeatmap = null;
                 return;
             }
@@ -359,6 +364,12 @@ namespace osu.Game.Screens.Play
             beatmaps.Download(onlineBeatmap);
         }
 
+        public override bool OnExiting(IScreen next)
+        {
+            previewTrackManager.StopAnyPlaying(this);
+            return base.OnExiting(next);
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 02168c6c2fb7f31907c5d02797fbc1508075dd87 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Nov 2020 19:17:01 +0300
Subject: [PATCH 06193/10326] Implement dates with zero count fill

---
 .../Historical/ChartProfileSubsection.cs      | 28 ++++++++++++++++++-
 .../Sections/Historical/ProfileLineChart.cs   |  2 +-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
index 24083c9a79..38224dd177 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.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.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -38,7 +39,32 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
             if (values?.Length > 1)
             {
-                chart.Values = values;
+                // Fill dates with 0 count
+
+                var newValues = new List<UserHistoryCount> { values[0] };
+                var newLast = values[0];
+
+                for (int i = 1; i < values.Length; i++)
+                {
+                    while (hasMissingDates(newLast, values[i]))
+                    {
+                        newValues.Add(newLast = new UserHistoryCount
+                        {
+                            Count = 0,
+                            Date = newLast.Date.AddMonths(1)
+                        });
+                    }
+
+                    newValues.Add(newLast = values[i]);
+                }
+
+                static bool hasMissingDates(UserHistoryCount prev, UserHistoryCount current)
+                {
+                    var possibleCurrent = prev.Date.AddMonths(1);
+                    return possibleCurrent != current.Date;
+                }
+
+                chart.Values = newValues.ToArray();
                 Show();
                 return;
             }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 55fa6c5400..7cd529a726 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     {
         private UserHistoryCount[] values;
 
-        [CanBeNull]
+        [NotNull]
         public UserHistoryCount[] Values
         {
             get => values;

From 5354bf1fa593bcbfb1d6cafac3e4143af035e45e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Nov 2020 20:07:52 +0300
Subject: [PATCH 06194/10326] Ticks distribution improvements

---
 .../Sections/Historical/ProfileLineChart.cs   | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 7cd529a726..fe4677037b 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -116,14 +116,12 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
             var niceRange = niceNumber(max - min, false);
             var niceTick = niceNumber(niceRange / (6 - 1), true);
-            var axisStart = Math.Floor(min / niceTick) * niceTick;
-            var axisEnd = Math.Ceiling(max / niceTick) * niceTick;
 
-            var rollingRow = axisStart;
+            double rollingRow = min;
 
-            while (rollingRow <= axisEnd)
+            while (rollingRow <= max)
             {
-                var y = -Interpolation.ValueAt(rollingRow, 0, 1f, axisStart, axisEnd);
+                var y = -Interpolation.ValueAt(rollingRow, 0, 1f, min, max);
 
                 rowTicksContainer.Add(new TickText
                 {
@@ -155,25 +153,23 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             columnTicksContainer.Clear();
             columnLinesContainer.Clear();
 
-            var min = values.Select(v => v.Date).Min().Ticks;
-            var max = values.Select(v => v.Date).Max().Ticks;
+            var min = values.Select(v => v.Date).Min().ToOADate();
+            var max = values.Select(v => v.Date).Max().ToOADate();
 
             var niceRange = niceNumber(max - min, false);
             var niceTick = niceNumber(niceRange / (Math.Min(values.Length, 15) - 1), true);
-            var axisStart = Math.Floor(min / niceTick) * niceTick;
-            var axisEnd = Math.Ceiling(max / niceTick) * niceTick;
 
-            var rollingRow = axisStart;
+            double rollingRow = min;
 
-            while (rollingRow <= axisEnd)
+            while (rollingRow <= max)
             {
-                var x = Interpolation.ValueAt(rollingRow, 0, 1f, axisStart, axisEnd);
+                var x = Interpolation.ValueAt(rollingRow, 0, 1f, min, max);
 
                 columnTicksContainer.Add(new TickText
                 {
                     Origin = Anchor.CentreLeft,
                     RelativePositionAxes = Axes.X,
-                    Text = new DateTime((long)rollingRow).ToString("MMM yyyy"),
+                    Text = DateTime.FromOADate(rollingRow).ToString("MMM yyyy"),
                     Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                     Rotation = 45,
                     X = x

From a94546f905ca8ca42e9b4386c148bf362bf612a4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Nov 2020 20:17:32 +0300
Subject: [PATCH 06195/10326] CI fixes

---
 .../Profile/Sections/Historical/ChartProfileSubsection.cs       | 1 -
 .../Overlays/Profile/Sections/Historical/ProfileLineChart.cs    | 2 +-
 osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
index 38224dd177..4445cdce51 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
@@ -17,7 +17,6 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         protected ChartProfileSubsection(Bindable<User> user, string headerText)
             : base(user, headerText)
         {
-
         }
 
         protected override Drawable CreateContent() => new Container
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index fe4677037b..b7983fd356 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                             }
                         }
                     },
-                    new Drawable[]
+                    new[]
                     {
                         Empty(),
                         columnTicksContainer = new Container<TickText>
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
index 9583759693..751b35e342 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Profile.Sections
             AutoSizeAxes = Axes.Y;
             Direction = FillDirection.Vertical;
 
-            Children = new Drawable[]
+            Children = new[]
             {
                 header = new ProfileSubsectionHeader(headerText, counterVisibilityState)
                 {

From fe9d17fc568cf757991573fb55d12f36875ed908 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Nov 2020 20:31:03 +0300
Subject: [PATCH 06196/10326] Fix CodeFactor issues

---
 osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs       | 2 +-
 .../Overlays/Profile/Sections/Historical/ProfileLineChart.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs
index 0be835c07d..3d342b0d76 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs
@@ -3,12 +3,12 @@
 
 using osu.Game.Overlays.Profile.Sections.Historical;
 using osu.Framework.Graphics;
-using static osu.Game.Users.User;
 using System;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Containers;
+using static osu.Game.Users.User;
 
 namespace osu.Game.Tests.Visual.Online
 {
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index b7983fd356..5a9c42d7e0 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using JetBrains.Annotations;
-using static osu.Game.Users.User;
 using System;
 using System.Linq;
 using osu.Game.Graphics.Sprites;
@@ -12,6 +11,7 @@ using osu.Framework.Utils;
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
 using osu.Framework.Graphics.Shapes;
+using static osu.Game.Users.User;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {

From a52c98b55cc0be3e190610a9214cca09eb8288a0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Nov 2020 21:20:37 +0300
Subject: [PATCH 06197/10326] Fix broken test scene

---
 .../Profile/Sections/Historical/PlayHistorySubsection.cs        | 2 +-
 .../Overlays/Profile/Sections/Historical/ReplaysSubsection.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
index 3e35f80b49..2f15886c3a 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         {
         }
 
-        protected override UserHistoryCount[] GetValues(User user) => user.MonthlyPlaycounts;
+        protected override UserHistoryCount[] GetValues(User user) => user?.MonthlyPlaycounts;
     }
 }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
index f6abd1c4fc..e594e8d020 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         {
         }
 
-        protected override UserHistoryCount[] GetValues(User user) => user.ReplaysWatchedCounts;
+        protected override UserHistoryCount[] GetValues(User user) => user?.ReplaysWatchedCounts;
     }
 }

From 5ae3d6cc74f13a85be1117f717ce9eff4836438a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 14 Nov 2020 20:12:46 +0100
Subject: [PATCH 06198/10326] Add failing asserts

---
 .../TestSceneSpinnerApplication.cs                       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
index 0558dad30d..05fc352a0b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.Tests
     public class TestSceneSpinnerApplication : OsuTestScene
     {
         [Test]
-        public void TestApplyNewCircle()
+        public void TestApplyNewSpinner()
         {
             DrawableSpinner dho = null;
 
@@ -23,18 +23,23 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 Position = new Vector2(256, 192),
                 IndexInCurrentCombo = 0,
-                Duration = 0,
+                Duration = 500,
             }))
             {
                 Clock = new FramedClock(new StopwatchClock())
             });
 
+            AddStep("rotate some", () => dho.RotationTracker.AddRotation(180));
+            AddAssert("rotation is set", () => dho.RotationTracker.RateAdjustedRotation == 180);
+
             AddStep("apply new spinner", () => dho.Apply(prepareObject(new Spinner
             {
                 Position = new Vector2(256, 192),
                 ComboIndex = 1,
                 Duration = 1000,
             }), null));
+
+            AddAssert("rotation is reset", () => dho.RotationTracker.RateAdjustedRotation == 0);
         }
 
         private Spinner prepareObject(Spinner circle)

From f8cabbdd21bc64dc3484ec664c8ce43fb8861f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 14 Nov 2020 21:09:22 +0100
Subject: [PATCH 06199/10326] Clear result when freeing pooled hitobject

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index b400c532c5..9735426ea1 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -285,6 +285,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             OnFree(HitObject);
 
             HitObject = null;
+            Result = null;
             lifetimeEntry = null;
 
             hasHitObjectApplied = false;

From af392e39953ac297b2b56287204958636e91f496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 14 Nov 2020 21:10:12 +0100
Subject: [PATCH 06200/10326] Move rate adjusted spinner rotation into
 judgement result

---
 .../TestSceneSpinnerApplication.cs            |  4 +-
 .../TestSceneSpinnerRotation.cs               | 12 ++---
 .../Judgements/OsuSpinnerJudgementResult.cs   | 46 +++++++++++++++++++
 .../Objects/Drawables/DrawableSpinner.cs      | 12 +++--
 .../Drawables/Pieces/DefaultSpinnerDisc.cs    |  2 +-
 .../Pieces/SpinnerRotationTracker.cs          | 26 +----------
 6 files changed, 65 insertions(+), 37 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
index 05fc352a0b..d7fbc7ac48 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             AddStep("rotate some", () => dho.RotationTracker.AddRotation(180));
-            AddAssert("rotation is set", () => dho.RotationTracker.RateAdjustedRotation == 180);
+            AddAssert("rotation is set", () => dho.Result.RateAdjustedRotation == 180);
 
             AddStep("apply new spinner", () => dho.Apply(prepareObject(new Spinner
             {
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Duration = 1000,
             }), null));
 
-            AddAssert("rotation is reset", () => dho.RotationTracker.RateAdjustedRotation == 0);
+            AddAssert("rotation is reset", () => dho.Result.RateAdjustedRotation == 0);
         }
 
         private Spinner prepareObject(Spinner circle)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 53bf1ea566..ac8d5c81bc 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -62,11 +62,11 @@ namespace osu.Game.Rulesets.Osu.Tests
                 trackerRotationTolerance = Math.Abs(drawableSpinner.RotationTracker.Rotation * 0.1f);
             });
             AddAssert("is disc rotation not almost 0", () => !Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, 0, 100));
-            AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.RotationTracker.RateAdjustedRotation, 0, 100));
+            AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Result.RateAdjustedRotation, 0, 100));
 
             addSeekStep(0);
             AddAssert("is disc rotation almost 0", () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, 0, trackerRotationTolerance));
-            AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.RotationTracker.RateAdjustedRotation, 0, 100));
+            AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.Result.RateAdjustedRotation, 0, 100));
         }
 
         [Test]
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 finalSpinnerSymbolRotation = spinnerSymbol.Rotation;
                 spinnerSymbolRotationTolerance = Math.Abs(finalSpinnerSymbolRotation * 0.05f);
             });
-            AddStep("retrieve cumulative disc rotation", () => finalCumulativeTrackerRotation = drawableSpinner.RotationTracker.RateAdjustedRotation);
+            AddStep("retrieve cumulative disc rotation", () => finalCumulativeTrackerRotation = drawableSpinner.Result.RateAdjustedRotation);
 
             addSeekStep(2500);
             AddAssert("disc rotation rewound",
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation / 2, spinnerSymbolRotationTolerance));
             AddAssert("is cumulative rotation rewound",
                 // cumulative rotation is not damped, so we're treating it as the "ground truth" and allowing a comparatively smaller margin of error.
-                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.RateAdjustedRotation, finalCumulativeTrackerRotation / 2, 100));
+                () => Precision.AlmostEquals(drawableSpinner.Result.RateAdjustedRotation, finalCumulativeTrackerRotation / 2, 100));
 
             addSeekStep(5000);
             AddAssert("is disc rotation almost same",
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("is symbol rotation almost same",
                 () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation, spinnerSymbolRotationTolerance));
             AddAssert("is cumulative rotation almost same",
-                () => Precision.AlmostEquals(drawableSpinner.RotationTracker.RateAdjustedRotation, finalCumulativeTrackerRotation, 100));
+                () => Precision.AlmostEquals(drawableSpinner.Result.RateAdjustedRotation, finalCumulativeTrackerRotation, 100));
         }
 
         [Test]
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
                 var totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value * 2;
-                return totalScore == (int)(drawableSpinner.RotationTracker.RateAdjustedRotation / 360) * new SpinnerTick().CreateJudgement().MaxNumericResult;
+                return totalScore == (int)(drawableSpinner.Result.RateAdjustedRotation / 360) * new SpinnerTick().CreateJudgement().MaxNumericResult;
             });
 
             addSeekStep(0);
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
new file mode 100644
index 0000000000..5ffe4cd004
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.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.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Rulesets.Osu.Judgements
+{
+    public class OsuSpinnerJudgementResult : OsuJudgementResult
+    {
+        /// <summary>
+        /// The <see cref="Spinner"/>.
+        /// </summary>
+        public Spinner Spinner => (Spinner)HitObject;
+
+        /// <summary>
+        /// The total rotation performed on the spinner disc, disregarding the spin direction,
+        /// adjusted for the track's playback rate.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This value is always non-negative and is monotonically increasing with time
+        /// (i.e. will only increase if time is passing forward, but can decrease during rewind).
+        /// </para>
+        /// <para>
+        /// The rotation from each frame is multiplied by the clock's current playback rate.
+        /// The reason this is done is to ensure that spinners give the same score and require the same number of spins
+        /// regardless of whether speed-modifying mods are applied.
+        /// </para>
+        /// </remarks>
+        /// <example>
+        /// Assuming no speed-modifying mods are active,
+        /// if the spinner is spun 360 degrees clockwise and then 360 degrees counter-clockwise,
+        /// this property will return the value of 720 (as opposed to 0).
+        /// If Double Time is active instead (with a speed multiplier of 1.5x),
+        /// in the same scenario the property will return 720 * 1.5 = 1080.
+        /// </example>
+        public float RateAdjustedRotation;
+
+        public OsuSpinnerJudgementResult(HitObject hitObject, Judgement judgement)
+            : base(hitObject, judgement)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 824b8806e5..4d11adad09 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -10,8 +10,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Scoring;
@@ -24,6 +26,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public new Spinner HitObject => (Spinner)base.HitObject;
 
+        public new OsuSpinnerJudgementResult Result => (OsuSpinnerJudgementResult)base.Result;
+
         public SpinnerRotationTracker RotationTracker { get; private set; }
         public SpinnerSpmCounter SpmCounter { get; private set; }
 
@@ -197,10 +201,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     // these become implicitly hit.
                     return 1;
 
-                return Math.Clamp(RotationTracker.RateAdjustedRotation / 360 / HitObject.SpinsRequired, 0, 1);
+                return Math.Clamp(Result.RateAdjustedRotation / 360 / HitObject.SpinsRequired, 0, 1);
             }
         }
 
+        protected override JudgementResult CreateResult(Judgement judgement) => new OsuSpinnerJudgementResult(HitObject, judgement);
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (Time.Current < HitObject.StartTime) return;
@@ -244,7 +250,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (!SpmCounter.IsPresent && RotationTracker.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
-            SpmCounter.SetRotation(RotationTracker.RateAdjustedRotation);
+            SpmCounter.SetRotation(Result.RateAdjustedRotation);
 
             updateBonusScore();
         }
@@ -256,7 +262,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (ticks.Count == 0)
                 return;
 
-            int spins = (int)(RotationTracker.RateAdjustedRotation / 360);
+            int spins = (int)(Result.RateAdjustedRotation / 360);
 
             if (spins < wholeSpins)
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 731852c221..376aa68020 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -194,7 +194,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             get
             {
-                int rotations = (int)(drawableSpinner.RotationTracker.RateAdjustedRotation / 360);
+                int rotations = (int)(drawableSpinner.Result.RateAdjustedRotation / 360);
 
                 if (wholeRotationCount == rotations) return false;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
index 910899c307..0716218420 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
@@ -32,30 +32,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         public readonly BindableBool Complete = new BindableBool();
 
-        /// <summary>
-        /// The total rotation performed on the spinner disc, disregarding the spin direction,
-        /// adjusted for the track's playback rate.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// This value is always non-negative and is monotonically increasing with time
-        /// (i.e. will only increase if time is passing forward, but can decrease during rewind).
-        /// </para>
-        /// <para>
-        /// The rotation from each frame is multiplied by the clock's current playback rate.
-        /// The reason this is done is to ensure that spinners give the same score and require the same number of spins
-        /// regardless of whether speed-modifying mods are applied.
-        /// </para>
-        /// </remarks>
-        /// <example>
-        /// Assuming no speed-modifying mods are active,
-        /// if the spinner is spun 360 degrees clockwise and then 360 degrees counter-clockwise,
-        /// this property will return the value of 720 (as opposed to 0 for <see cref="Drawable.Rotation"/>).
-        /// If Double Time is active instead (with a speed multiplier of 1.5x),
-        /// in the same scenario the property will return 720 * 1.5 = 1080.
-        /// </example>
-        public float RateAdjustedRotation { get; private set; }
-
         /// <summary>
         /// Whether the spinning is spinning at a reasonable speed to be considered visually spinning.
         /// </summary>
@@ -131,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             currentRotation += angle;
             // rate has to be applied each frame, because it's not guaranteed to be constant throughout playback
             // (see: ModTimeRamp)
-            RateAdjustedRotation += (float)(Math.Abs(angle) * (gameplayClock?.TrueGameplayRate ?? Clock.Rate));
+            drawableSpinner.Result.RateAdjustedRotation += (float)(Math.Abs(angle) * (gameplayClock?.TrueGameplayRate ?? Clock.Rate));
         }
     }
 }

From 727a886fb310547ff918e69831121c55754b67f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 14 Nov 2020 22:42:19 +0100
Subject: [PATCH 06201/10326] Move spinner completion info into judgement

---
 .../Judgements/OsuSpinnerJudgementResult.cs               | 6 ++++++
 .../Objects/Drawables/DrawableSpinner.cs                  | 3 ++-
 .../Objects/Drawables/Pieces/DefaultSpinnerDisc.cs        | 8 ++++++--
 .../Objects/Drawables/Pieces/SpinnerRotationTracker.cs    | 2 --
 osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs           | 7 ++++++-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
index 5ffe4cd004..e58aacd86e 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
@@ -38,6 +38,12 @@ namespace osu.Game.Rulesets.Osu.Judgements
         /// </example>
         public float RateAdjustedRotation;
 
+        /// <summary>
+        /// Time instant at which the spinner has been completed (the user has executed all required spins).
+        /// Will be null if all required spins haven't been completed.
+        /// </summary>
+        public double? TimeCompleted;
+
         public OsuSpinnerJudgementResult(HitObject hitObject, Judgement judgement)
             : base(hitObject, judgement)
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 4d11adad09..87c7146a64 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -211,7 +211,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (Time.Current < HitObject.StartTime) return;
 
-            RotationTracker.Complete.Value = Progress >= 1;
+            if (Progress >= 1)
+                Result.TimeCompleted ??= Time.Current;
 
             if (userTriggered || Time.Current < HitObject.EndTime)
                 return;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
index 376aa68020..14ce3b014d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
@@ -3,6 +3,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;
@@ -28,6 +29,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         private SpinnerTicks ticks;
 
         private int wholeRotationCount;
+        private readonly BindableBool complete = new BindableBool();
 
         private SpinnerFill fill;
         private Container mainContainer;
@@ -89,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             base.LoadComplete();
 
-            drawableSpinner.RotationTracker.Complete.BindValueChanged(complete => updateComplete(complete.NewValue, 200));
+            complete.BindValueChanged(complete => updateComplete(complete.NewValue, 200));
             drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
 
             updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
@@ -99,7 +101,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             base.Update();
 
-            if (drawableSpinner.RotationTracker.Complete.Value)
+            complete.Value = Time.Current >= drawableSpinner.Result.TimeCompleted;
+
+            if (complete.Value)
             {
                 if (checkNewRotationCount)
                 {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
index 0716218420..31ab76cc0a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
@@ -30,8 +30,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         public bool Tracking { get; set; }
 
-        public readonly BindableBool Complete = new BindableBool();
-
         /// <summary>
         /// Whether the spinning is spinning at a reasonable speed to be considered visually spinning.
         /// </summary>
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
index eb9fa85fde..5aa136cf7e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
@@ -60,7 +60,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             base.LoadComplete();
 
-            completed.BindTo(DrawableSpinner.RotationTracker.Complete);
             completed.BindValueChanged(onCompletedChanged, true);
 
             DrawableSpinner.ApplyCustomUpdateState += UpdateStateTransforms;
@@ -93,6 +92,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
             }
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            completed.Value = Time.Current >= DrawableSpinner.Result.TimeCompleted;
+        }
+
         protected virtual void UpdateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
         {
             switch (drawableHitObject)

From 532680bb367b1a0cb8ea06e04e6ee945151ccc6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 14 Nov 2020 23:23:11 +0100
Subject: [PATCH 06202/10326] Manually reset rest of rotation tracker state on
 object application

---
 .../Pieces/SpinnerRotationTracker.cs          | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
index 31ab76cc0a..f82003edb8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Screens.Play;
 using osuTK;
 
@@ -22,6 +23,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         public SpinnerRotationTracker(DrawableSpinner drawableSpinner)
         {
             this.drawableSpinner = drawableSpinner;
+            drawableSpinner.HitObjectApplied += resetState;
 
             RelativeSizeAxes = Axes.Both;
         }
@@ -107,5 +109,22 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             // (see: ModTimeRamp)
             drawableSpinner.Result.RateAdjustedRotation += (float)(Math.Abs(angle) * (gameplayClock?.TrueGameplayRate ?? Clock.Rate));
         }
+
+        private void resetState(DrawableHitObject obj)
+        {
+            Tracking = false;
+            IsSpinning.Value = false;
+            mousePosition = default;
+            lastAngle = currentRotation = Rotation = 0;
+            rotationTransferred = false;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (drawableSpinner != null)
+                drawableSpinner.HitObjectApplied -= resetState;
+        }
     }
 }

From 199043f67778ed873903ef2e51aa22b05b7129b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 15 Nov 2020 13:21:09 +0900
Subject: [PATCH 06203/10326] Allow preview tracks to exist without an owner
 (without hard crashing)

---
 osu.Game/Audio/PreviewTrackManager.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Audio/PreviewTrackManager.cs b/osu.Game/Audio/PreviewTrackManager.cs
index 862be41c1a..8d02af6574 100644
--- a/osu.Game/Audio/PreviewTrackManager.cs
+++ b/osu.Game/Audio/PreviewTrackManager.cs
@@ -11,6 +11,7 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.IO.Stores;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Audio
@@ -76,7 +77,7 @@ namespace osu.Game.Audio
         /// <param name="source">The <see cref="IPreviewTrackOwner"/> which may be the owner of the <see cref="PreviewTrack"/>.</param>
         public void StopAnyPlaying(IPreviewTrackOwner source)
         {
-            if (CurrentTrack == null || CurrentTrack.Owner != source)
+            if (CurrentTrack == null || (CurrentTrack.Owner != null && CurrentTrack.Owner != source))
                 return;
 
             CurrentTrack.Stop();
@@ -86,11 +87,12 @@ namespace osu.Game.Audio
         /// <summary>
         /// Creates the <see cref="TrackManagerPreviewTrack"/>.
         /// </summary>
-        protected virtual TrackManagerPreviewTrack CreatePreviewTrack(BeatmapSetInfo beatmapSetInfo, ITrackStore trackStore) => new TrackManagerPreviewTrack(beatmapSetInfo, trackStore);
+        protected virtual TrackManagerPreviewTrack CreatePreviewTrack(BeatmapSetInfo beatmapSetInfo, ITrackStore trackStore) =>
+            new TrackManagerPreviewTrack(beatmapSetInfo, trackStore);
 
         public class TrackManagerPreviewTrack : PreviewTrack
         {
-            [Resolved]
+            [Resolved(canBeNull: true)]
             public IPreviewTrackOwner Owner { get; private set; }
 
             private readonly BeatmapSetInfo beatmapSetInfo;
@@ -102,6 +104,12 @@ namespace osu.Game.Audio
                 this.trackManager = trackManager;
             }
 
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                Logger.Log($"A {nameof(PreviewTrack)} was created without a containing {nameof(IPreviewTrackOwner)}. An owner should be added for correct behaviour.");
+            }
+
             protected override Track GetTrack() => trackManager.Get($"https://b.ppy.sh/preview/{beatmapSetInfo?.OnlineBeatmapSetID}.mp3");
         }
 

From a4b20d211726e0980d55969e2193121cb9b60b75 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 15 Nov 2020 13:00:07 +0800
Subject: [PATCH 06204/10326] Make EZ mod able to fail in Taiko

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs | 36 ++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index c51b47dc6e..7ac01d2aa7 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
@@ -1,12 +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 System;
+using Humanizer;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
-    public class TaikoModEasy : ModEasy
+    public class TaikoModEasy : Mod, IApplicableToDifficulty, IApplicableFailOverride
     {
-        public override string Description => @"Beats move slower, less accuracy required, and three lives!";
+        public override string Name => "Easy";
+        public override string Acronym => "EZ";
+        public override string Description => @"Beats move slower, less accuracy required";
+        public override IconUsage? Icon => OsuIcon.ModEasy;
+        public override ModType Type => ModType.DifficultyReduction;
+        public override double ScoreMultiplier => 0.5;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModHardRock), typeof(ModDifficultyAdjust) };
+
+        public void ReadFromDifficulty(BeatmapDifficulty difficulty)
+        {
+        }
+
+        public void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            const float ratio = 0.5f;
+            difficulty.CircleSize *= ratio;
+            difficulty.ApproachRate *= ratio;
+            difficulty.DrainRate *= ratio;
+            difficulty.OverallDifficulty *= ratio;
+        }
+
+        public bool PerformFail() => true;
+
+        public bool RestartOnFail => false;
+
     }
 }

From cf7ac6d5e38aa036cbea9b14fc618f607dd29de1 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 15 Nov 2020 13:38:21 +0800
Subject: [PATCH 06205/10326] Remove import

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index 7ac01d2aa7..383623ca0a 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
@@ -2,11 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using Humanizer;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 

From 3406b0d74f3de4e56bcea4ef8be2a737671e6e85 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 15 Nov 2020 14:54:04 +0800
Subject: [PATCH 06206/10326] Fix checks

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index 383623ca0a..c3b833fa29 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
@@ -36,6 +36,5 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public bool PerformFail() => true;
 
         public bool RestartOnFail => false;
-
     }
 }

From 9899687bfe27d75a584a582b3a918e2624e7024a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 14:17:41 +0100
Subject: [PATCH 06207/10326] Rename existing method to allow for new one

---
 osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs | 2 +-
 osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs | 2 +-
 osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs     | 2 +-
 osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs | 2 +-
 osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
index 04e6dea376..4102dff37c 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase(LegacyMods.SuddenDeath, new[] { typeof(CatchModSuddenDeath) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(CatchModPerfect) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath | LegacyMods.DoubleTime, new[] { typeof(CatchModDoubleTime), typeof(CatchModPerfect) })]
-        public new void Test(LegacyMods legacyMods, Type[] expectedMods) => base.Test(legacyMods, expectedMods);
+        public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
 
         protected override Ruleset CreateRuleset() => new CatchRuleset();
     }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
index b22687a0a7..221eed3576 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath | LegacyMods.DoubleTime, new[] { typeof(ManiaModDoubleTime), typeof(ManiaModPerfect) })]
         [TestCase(LegacyMods.Random | LegacyMods.SuddenDeath, new[] { typeof(ManiaModRandom), typeof(ManiaModSuddenDeath) })]
         [TestCase(LegacyMods.Flashlight | LegacyMods.Mirror, new[] { typeof(ManiaModFlashlight), typeof(ManiaModMirror) })]
-        public new void Test(LegacyMods legacyMods, Type[] expectedMods) => base.Test(legacyMods, expectedMods);
+        public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
 
         protected override Ruleset CreateRuleset() => new ManiaRuleset();
     }
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
index 495f2738b5..731150a584 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(OsuModPerfect) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath | LegacyMods.DoubleTime, new[] { typeof(OsuModDoubleTime), typeof(OsuModPerfect) })]
         [TestCase(LegacyMods.SpunOut | LegacyMods.Easy, new[] { typeof(OsuModSpunOut), typeof(OsuModEasy) })]
-        public new void Test(LegacyMods legacyMods, Type[] expectedMods) => base.Test(legacyMods, expectedMods);
+        public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
 
         protected override Ruleset CreateRuleset() => new OsuRuleset();
     }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
index a59544386b..b67dc74ab1 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [TestCase(LegacyMods.SuddenDeath, new[] { typeof(TaikoModSuddenDeath) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(TaikoModPerfect) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath | LegacyMods.DoubleTime, new[] { typeof(TaikoModDoubleTime), typeof(TaikoModPerfect) })]
-        public new void Test(LegacyMods legacyMods, Type[] expectedMods) => base.Test(legacyMods, expectedMods);
+        public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
 
         protected override Ruleset CreateRuleset() => new TaikoRuleset();
     }
diff --git a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
index e93bf916c7..5327adc428 100644
--- a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Beatmaps
         /// <returns></returns>
         protected abstract Ruleset CreateRuleset();
 
-        protected void Test(LegacyMods legacyMods, Type[] expectedMods)
+        protected void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods)
         {
             var ruleset = CreateRuleset();
             var mods = ruleset.ConvertFromLegacyMods(legacyMods).ToList();

From 268bbcf77dee56a5ca1f0e4a0fb0b931c4d6f9a5 Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Sun, 15 Nov 2020 14:22:46 +0100
Subject: [PATCH 06208/10326] Clamp selection movement instead of refusing to
 move on borders

---
 .../Edit/OsuSelectionHandler.cs                  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 24bf79f9ae..ec8c68005f 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -207,11 +207,17 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             Quad quad = getSurroundingQuad(hitObjects);
 
-            if (quad.TopLeft.X + delta.X < 0 ||
-                quad.TopLeft.Y + delta.Y < 0 ||
-                quad.BottomRight.X + delta.X > DrawWidth ||
-                quad.BottomRight.Y + delta.Y > DrawHeight)
-                return false;
+            Vector2 newTopLeft = quad.TopLeft + delta;
+            if (newTopLeft.X < 0)
+                delta.X -= newTopLeft.X;
+            if (newTopLeft.Y < 0)
+                delta.Y -= newTopLeft.Y;
+
+            Vector2 newBottomRight = quad.BottomRight + delta;
+            if (newBottomRight.X > DrawWidth)
+                delta.X -= newBottomRight.X - DrawWidth;
+            if (newBottomRight.Y > DrawHeight)
+                delta.Y -= newBottomRight.Y - DrawHeight;
 
             foreach (var h in hitObjects)
                 h.Position += delta;

From 8b7429856791f31dfab695e5fa01edcd20c937dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 14:25:22 +0100
Subject: [PATCH 06209/10326] Add base method for testing conversion in other
 direction

---
 osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
index 5327adc428..76f97db59f 100644
--- a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
@@ -31,5 +31,15 @@ namespace osu.Game.Tests.Beatmaps
                 Assert.IsNotNull(mods.SingleOrDefault(mod => mod.GetType() == modType));
             }
         }
+
+        protected void TestToLegacy(LegacyMods expectedLegacyMods, Type[] providedModTypes)
+        {
+            var ruleset = CreateRuleset();
+            var modInstances = ruleset.GetAllMods()
+                                      .Where(mod => providedModTypes.Contains(mod.GetType()))
+                                      .ToArray();
+            var actualLegacyMods = ruleset.ConvertToLegacyMods(modInstances);
+            Assert.AreEqual(expectedLegacyMods, actualLegacyMods);
+        }
     }
 }

From f9fa7c86eaa169657485dbdaabf975abbedcc65c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 14:53:25 +0100
Subject: [PATCH 06210/10326] Cover mapping fully for catch mods

---
 .../CatchLegacyModConversionTest.cs           | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
index 4102dff37c..eae07daa3d 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
@@ -12,18 +12,33 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class CatchLegacyModConversionTest : LegacyModConversionTest
     {
-        [TestCase(LegacyMods.Easy, new[] { typeof(CatchModEasy) })]
-        [TestCase(LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(CatchModHardRock), typeof(CatchModDoubleTime) })]
-        [TestCase(LegacyMods.DoubleTime, new[] { typeof(CatchModDoubleTime) })]
-        [TestCase(LegacyMods.Nightcore, new[] { typeof(CatchModNightcore) })]
+        private static readonly object[][] catch_mod_mapping =
+        {
+            new object[] { LegacyMods.NoFail, new[] { typeof(CatchModNoFail) } },
+            new object[] { LegacyMods.Easy, new[] { typeof(CatchModEasy) } },
+            new object[] { LegacyMods.Hidden, new[] { typeof(CatchModHidden) } },
+            new object[] { LegacyMods.HardRock, new[] { typeof(CatchModHardRock) } },
+            new object[] { LegacyMods.SuddenDeath, new[] { typeof(CatchModSuddenDeath) } },
+            new object[] { LegacyMods.DoubleTime, new[] { typeof(CatchModDoubleTime) } },
+            new object[] { LegacyMods.Relax, new[] { typeof(CatchModRelax) } },
+            new object[] { LegacyMods.HalfTime, new[] { typeof(CatchModHalfTime) } },
+            new object[] { LegacyMods.Nightcore, new[] { typeof(CatchModNightcore) } },
+            new object[] { LegacyMods.Flashlight, new[] { typeof(CatchModFlashlight) } },
+            new object[] { LegacyMods.Autoplay, new[] { typeof(CatchModAutoplay) } },
+            new object[] { LegacyMods.Perfect, new[] { typeof(CatchModPerfect) } },
+            new object[] { LegacyMods.Cinema, new[] { typeof(CatchModCinema) } },
+            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(CatchModHardRock), typeof(CatchModDoubleTime) } }
+        };
+
+        [TestCaseSource(nameof(catch_mod_mapping))]
+        [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(CatchModCinema) })]
         [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(CatchModNightcore) })]
-        [TestCase(LegacyMods.Flashlight | LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(CatchModFlashlight), typeof(CatchModNightcore) })]
-        [TestCase(LegacyMods.Perfect, new[] { typeof(CatchModPerfect) })]
-        [TestCase(LegacyMods.SuddenDeath, new[] { typeof(CatchModSuddenDeath) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(CatchModPerfect) })]
-        [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath | LegacyMods.DoubleTime, new[] { typeof(CatchModDoubleTime), typeof(CatchModPerfect) })]
         public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
 
+        [TestCaseSource(nameof(catch_mod_mapping))]
+        public new void TestToLegacy(LegacyMods legacyMods, Type[] givenMods) => base.TestToLegacy(legacyMods, givenMods);
+
         protected override Ruleset CreateRuleset() => new CatchRuleset();
     }
 }

From ee5e70135f42df4bc31fa2747413886ee090a131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 15:09:02 +0100
Subject: [PATCH 06211/10326] Cover mapping fully for mania mods

---
 .../ManiaLegacyModConversionTest.cs           | 45 ++++++++++++++-----
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
index 221eed3576..a28c188051 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
@@ -12,20 +12,45 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class ManiaLegacyModConversionTest : LegacyModConversionTest
     {
-        [TestCase(LegacyMods.Easy, new[] { typeof(ManiaModEasy) })]
-        [TestCase(LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(ManiaModHardRock), typeof(ManiaModDoubleTime) })]
-        [TestCase(LegacyMods.DoubleTime, new[] { typeof(ManiaModDoubleTime) })]
-        [TestCase(LegacyMods.Nightcore, new[] { typeof(ManiaModNightcore) })]
+        private static readonly object[][] mania_mod_mapping =
+        {
+            new object[] { LegacyMods.NoFail, new[] { typeof(ManiaModNoFail) } },
+            new object[] { LegacyMods.Easy, new[] { typeof(ManiaModEasy) } },
+            new object[] { LegacyMods.Hidden, new[] { typeof(ManiaModHidden) } },
+            new object[] { LegacyMods.HardRock, new[] { typeof(ManiaModHardRock) } },
+            new object[] { LegacyMods.SuddenDeath, new[] { typeof(ManiaModSuddenDeath) } },
+            new object[] { LegacyMods.DoubleTime, new[] { typeof(ManiaModDoubleTime) } },
+            new object[] { LegacyMods.HalfTime, new[] { typeof(ManiaModHalfTime) } },
+            new object[] { LegacyMods.Nightcore, new[] { typeof(ManiaModNightcore) } },
+            new object[] { LegacyMods.Flashlight, new[] { typeof(ManiaModFlashlight) } },
+            new object[] { LegacyMods.Autoplay, new[] { typeof(ManiaModAutoplay) } },
+            new object[] { LegacyMods.Perfect, new[] { typeof(ManiaModPerfect) } },
+            new object[] { LegacyMods.Key4, new[] { typeof(ManiaModKey4) } },
+            new object[] { LegacyMods.Key5, new[] { typeof(ManiaModKey5) } },
+            new object[] { LegacyMods.Key6, new[] { typeof(ManiaModKey6) } },
+            new object[] { LegacyMods.Key7, new[] { typeof(ManiaModKey7) } },
+            new object[] { LegacyMods.Key8, new[] { typeof(ManiaModKey8) } },
+            new object[] { LegacyMods.FadeIn, new[] { typeof(ManiaModFadeIn) } },
+            new object[] { LegacyMods.Random, new[] { typeof(ManiaModRandom) } },
+            new object[] { LegacyMods.Cinema, new[] { typeof(ManiaModCinema) } },
+            new object[] { LegacyMods.Key9, new[] { typeof(ManiaModKey9) } },
+            new object[] { LegacyMods.KeyCoop, new[] { typeof(ManiaModDualStages) } },
+            new object[] { LegacyMods.Key1, new[] { typeof(ManiaModKey1) } },
+            new object[] { LegacyMods.Key3, new[] { typeof(ManiaModKey3) } },
+            new object[] { LegacyMods.Key2, new[] { typeof(ManiaModKey2) } },
+            new object[] { LegacyMods.Mirror, new[] { typeof(ManiaModMirror) } },
+            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(ManiaModHardRock), typeof(ManiaModDoubleTime) } }
+        };
+
+        [TestCaseSource(nameof(mania_mod_mapping))]
+        [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(ManiaModCinema) })]
         [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(ManiaModNightcore) })]
-        [TestCase(LegacyMods.Flashlight | LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(ManiaModFlashlight), typeof(ManiaModNightcore) })]
-        [TestCase(LegacyMods.Perfect, new[] { typeof(ManiaModPerfect) })]
-        [TestCase(LegacyMods.SuddenDeath, new[] { typeof(ManiaModSuddenDeath) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(ManiaModPerfect) })]
-        [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath | LegacyMods.DoubleTime, new[] { typeof(ManiaModDoubleTime), typeof(ManiaModPerfect) })]
-        [TestCase(LegacyMods.Random | LegacyMods.SuddenDeath, new[] { typeof(ManiaModRandom), typeof(ManiaModSuddenDeath) })]
-        [TestCase(LegacyMods.Flashlight | LegacyMods.Mirror, new[] { typeof(ManiaModFlashlight), typeof(ManiaModMirror) })]
         public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
 
+        [TestCaseSource(nameof(mania_mod_mapping))]
+        public new void TestToLegacy(LegacyMods legacyMods, Type[] givenMods) => base.TestToLegacy(legacyMods, givenMods);
+
         protected override Ruleset CreateRuleset() => new ManiaRuleset();
     }
 }

From 9f27d4a9f45a438c07463d2d5c41b3a6a1d4f26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 15:16:17 +0100
Subject: [PATCH 06212/10326] Cover mapping fully for osu! mods

---
 .../OsuLegacyModConversionTest.cs             | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
index 731150a584..51da5b85cd 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
@@ -12,19 +12,37 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class OsuLegacyModConversionTest : LegacyModConversionTest
     {
-        [TestCase(LegacyMods.Easy, new[] { typeof(OsuModEasy) })]
-        [TestCase(LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(OsuModHardRock), typeof(OsuModDoubleTime) })]
-        [TestCase(LegacyMods.DoubleTime, new[] { typeof(OsuModDoubleTime) })]
-        [TestCase(LegacyMods.Nightcore, new[] { typeof(OsuModNightcore) })]
+        private static readonly object[][] osu_mod_mapping =
+        {
+            new object[] { LegacyMods.NoFail, new[] { typeof(OsuModNoFail) } },
+            new object[] { LegacyMods.Easy, new[] { typeof(OsuModEasy) } },
+            new object[] { LegacyMods.TouchDevice, new[] { typeof(OsuModTouchDevice) } },
+            new object[] { LegacyMods.Hidden, new[] { typeof(OsuModHidden) } },
+            new object[] { LegacyMods.HardRock, new[] { typeof(OsuModHardRock) } },
+            new object[] { LegacyMods.SuddenDeath, new[] { typeof(OsuModSuddenDeath) } },
+            new object[] { LegacyMods.DoubleTime, new[] { typeof(OsuModDoubleTime) } },
+            new object[] { LegacyMods.Relax, new[] { typeof(OsuModRelax) } },
+            new object[] { LegacyMods.HalfTime, new[] { typeof(OsuModHalfTime) } },
+            new object[] { LegacyMods.Nightcore, new[] { typeof(OsuModNightcore) } },
+            new object[] { LegacyMods.Flashlight, new[] { typeof(OsuModFlashlight) } },
+            new object[] { LegacyMods.Autoplay, new[] { typeof(OsuModAutoplay) } },
+            new object[] { LegacyMods.SpunOut, new[] { typeof(OsuModSpunOut) } },
+            new object[] { LegacyMods.Autopilot, new[] { typeof(OsuModAutopilot) } },
+            new object[] { LegacyMods.Perfect, new[] { typeof(OsuModPerfect) } },
+            new object[] { LegacyMods.Cinema, new[] { typeof(OsuModCinema) } },
+            new object[] { LegacyMods.Target, new[] { typeof(OsuModTarget) } },
+            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(OsuModHardRock), typeof(OsuModDoubleTime) } }
+        };
+
+        [TestCaseSource(nameof(osu_mod_mapping))]
+        [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(OsuModCinema) })]
         [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(OsuModNightcore) })]
-        [TestCase(LegacyMods.Flashlight | LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(OsuModFlashlight), typeof(OsuModFlashlight) })]
-        [TestCase(LegacyMods.Perfect, new[] { typeof(OsuModPerfect) })]
-        [TestCase(LegacyMods.SuddenDeath, new[] { typeof(OsuModSuddenDeath) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(OsuModPerfect) })]
-        [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath | LegacyMods.DoubleTime, new[] { typeof(OsuModDoubleTime), typeof(OsuModPerfect) })]
-        [TestCase(LegacyMods.SpunOut | LegacyMods.Easy, new[] { typeof(OsuModSpunOut), typeof(OsuModEasy) })]
         public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
 
+        [TestCaseSource(nameof(osu_mod_mapping))]
+        public new void TestToLegacy(LegacyMods legacyMods, Type[] givenMods) => base.TestToLegacy(legacyMods, givenMods);
+
         protected override Ruleset CreateRuleset() => new OsuRuleset();
     }
 }

From e9b5f54128b8ced841062a40406a21946af888ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 15:24:57 +0100
Subject: [PATCH 06213/10326] Cover mapping fully for taiko mods

---
 .../TaikoLegacyModConversionTest.cs           | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
index b67dc74ab1..a039e84106 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
@@ -12,18 +12,34 @@ namespace osu.Game.Rulesets.Taiko.Tests
     [TestFixture]
     public class TaikoLegacyModConversionTest : LegacyModConversionTest
     {
-        [TestCase(LegacyMods.Easy, new[] { typeof(TaikoModEasy) })]
-        [TestCase(LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(TaikoModHardRock), typeof(TaikoModDoubleTime) })]
-        [TestCase(LegacyMods.DoubleTime, new[] { typeof(TaikoModDoubleTime) })]
-        [TestCase(LegacyMods.Nightcore, new[] { typeof(TaikoModNightcore) })]
+        private static readonly object[][] taiko_mod_mapping =
+        {
+            new object[] { LegacyMods.NoFail, new[] { typeof(TaikoModNoFail) } },
+            new object[] { LegacyMods.Easy, new[] { typeof(TaikoModEasy) } },
+            new object[] { LegacyMods.Hidden, new[] { typeof(TaikoModHidden) } },
+            new object[] { LegacyMods.HardRock, new[] { typeof(TaikoModHardRock) } },
+            new object[] { LegacyMods.SuddenDeath, new[] { typeof(TaikoModSuddenDeath) } },
+            new object[] { LegacyMods.DoubleTime, new[] { typeof(TaikoModDoubleTime) } },
+            new object[] { LegacyMods.Relax, new[] { typeof(TaikoModRelax) } },
+            new object[] { LegacyMods.HalfTime, new[] { typeof(TaikoModHalfTime) } },
+            new object[] { LegacyMods.Nightcore, new[] { typeof(TaikoModNightcore) } },
+            new object[] { LegacyMods.Flashlight, new[] { typeof(TaikoModFlashlight) } },
+            new object[] { LegacyMods.Autoplay, new[] { typeof(TaikoModAutoplay) } },
+            new object[] { LegacyMods.Perfect, new[] { typeof(TaikoModPerfect) } },
+            new object[] { LegacyMods.Random, new[] { typeof(TaikoModRandom) } },
+            new object[] { LegacyMods.Cinema, new[] { typeof(TaikoModCinema) } },
+            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(TaikoModHardRock), typeof(TaikoModDoubleTime) } }
+        };
+
+        [TestCaseSource(nameof(taiko_mod_mapping))]
+        [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(TaikoModCinema) })]
         [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(TaikoModNightcore) })]
-        [TestCase(LegacyMods.Flashlight | LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(TaikoModFlashlight), typeof(TaikoModNightcore) })]
-        [TestCase(LegacyMods.Perfect, new[] { typeof(TaikoModPerfect) })]
-        [TestCase(LegacyMods.SuddenDeath, new[] { typeof(TaikoModSuddenDeath) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(TaikoModPerfect) })]
-        [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath | LegacyMods.DoubleTime, new[] { typeof(TaikoModDoubleTime), typeof(TaikoModPerfect) })]
         public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
 
+        [TestCaseSource(nameof(taiko_mod_mapping))]
+        public new void TestToLegacy(LegacyMods legacyMods, Type[] givenMods) => base.TestToLegacy(legacyMods, givenMods);
+
         protected override Ruleset CreateRuleset() => new TaikoRuleset();
     }
 }

From 5ace7abaa8f49372293ca77ffde1ec8613a4f014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 15:29:50 +0100
Subject: [PATCH 06214/10326] Add abstract non-generic ModNightcore to
 pattern-match over

---
 osu.Game/Rulesets/Mods/ModNightcore.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index e8b051b4d9..a44967c21c 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -18,14 +18,17 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModNightcore<TObject> : ModDoubleTime, IApplicableToDrawableRuleset<TObject>
-        where TObject : HitObject
+    public abstract class ModNightcore : ModDoubleTime
     {
         public override string Name => "Nightcore";
         public override string Acronym => "NC";
         public override IconUsage? Icon => OsuIcon.ModNightcore;
         public override string Description => "Uguuuuuuuu...";
+    }
 
+    public abstract class ModNightcore<TObject> : ModNightcore, IApplicableToDrawableRuleset<TObject>
+        where TObject : HitObject
+    {
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);
         private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
 

From 5d44286d387bd2fe19994bf9682809599f610607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 15:35:06 +0100
Subject: [PATCH 06215/10326] Add missing generic mappings to legacy mods

---
 osu.Game/Rulesets/Ruleset.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 8caadffd1d..b3b3d11ab3 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -81,10 +81,18 @@ namespace osu.Game.Rulesets
                         value |= LegacyMods.HardRock;
                         break;
 
+                    case ModPerfect _:
+                        value |= LegacyMods.Perfect;
+                        break;
+
                     case ModSuddenDeath _:
                         value |= LegacyMods.SuddenDeath;
                         break;
 
+                    case ModNightcore _:
+                        value |= LegacyMods.Nightcore;
+                        break;
+
                     case ModDoubleTime _:
                         value |= LegacyMods.DoubleTime;
                         break;
@@ -100,6 +108,14 @@ namespace osu.Game.Rulesets
                     case ModFlashlight _:
                         value |= LegacyMods.Flashlight;
                         break;
+
+                    case ModCinema _:
+                        value |= LegacyMods.Cinema;
+                        break;
+
+                    case ModAutoplay _:
+                        value |= LegacyMods.Autoplay;
+                        break;
                 }
             }
 

From e5d9cca9de2654b8decdf41708ed6ffda2838230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 15:38:12 +0100
Subject: [PATCH 06216/10326] Fix mania-specific missing cases

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index b92e042686..f70e7b315e 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -119,6 +119,9 @@ namespace osu.Game.Rulesets.Mania
             if (mods.HasFlag(LegacyMods.Key9))
                 yield return new ManiaModKey9();
 
+            if (mods.HasFlag(LegacyMods.KeyCoop))
+                yield return new ManiaModDualStages();
+
             if (mods.HasFlag(LegacyMods.NoFail))
                 yield return new ManiaModNoFail();
 
@@ -173,13 +176,22 @@ namespace osu.Game.Rulesets.Mania
                         value |= LegacyMods.Key9;
                         break;
 
+                    case ManiaModDualStages _:
+                        value |= LegacyMods.KeyCoop;
+                        break;
+
                     case ManiaModFadeIn _:
                         value |= LegacyMods.FadeIn;
+                        value &= ~LegacyMods.Hidden; // due to inheritance
                         break;
 
                     case ManiaModMirror _:
                         value |= LegacyMods.Mirror;
                         break;
+
+                    case ManiaModRandom _:
+                        value |= LegacyMods.Random;
+                        break;
                 }
             }
 

From a17990f2eea290477ad9b0bc740a652202520cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 15:40:31 +0100
Subject: [PATCH 06217/10326] Fix osu!-specific missing cases

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 678fb8aba6..d8180b0e58 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -107,6 +107,35 @@ namespace osu.Game.Rulesets.Osu
                 yield return new OsuModTouchDevice();
         }
 
+        public override LegacyMods ConvertToLegacyMods(Mod[] mods)
+        {
+            var value = base.ConvertToLegacyMods(mods);
+
+            foreach (var mod in mods)
+            {
+                switch (mod)
+                {
+                    case OsuModAutopilot _:
+                        value |= LegacyMods.Autopilot;
+                        break;
+
+                    case OsuModSpunOut _:
+                        value |= LegacyMods.SpunOut;
+                        break;
+
+                    case OsuModTarget _:
+                        value |= LegacyMods.Target;
+                        break;
+
+                    case OsuModTouchDevice _:
+                        value |= LegacyMods.TouchDevice;
+                        break;
+                }
+            }
+
+            return value;
+        }
+
         public override IEnumerable<Mod> GetModsFor(ModType type)
         {
             switch (type)

From 7736d1ae85bfcfd7cfc6343a69e742da59c7423a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 15:41:58 +0100
Subject: [PATCH 06218/10326] Fix taiko-specific missing cases

---
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 73e9c16d07..2a49dd655c 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -92,6 +92,19 @@ namespace osu.Game.Rulesets.Taiko
 
             if (mods.HasFlag(LegacyMods.Relax))
                 yield return new TaikoModRelax();
+
+            if (mods.HasFlag(LegacyMods.Random))
+                yield return new TaikoModRandom();
+        }
+
+        public override LegacyMods ConvertToLegacyMods(Mod[] mods)
+        {
+            var value = base.ConvertToLegacyMods(mods);
+
+            if (mods.OfType<TaikoModRandom>().Any())
+                value |= LegacyMods.Random;
+
+            return value;
         }
 
         public override IEnumerable<Mod> GetModsFor(ModType type)

From 83727a2e85a868d612a80bdc7a65bb0bf7b6befd Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Sun, 15 Nov 2020 16:06:29 +0100
Subject: [PATCH 06219/10326] Add quick-delete tests

---
 .../Editing/TestSceneEditorQuickDelete.cs     | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
new file mode 100644
index 0000000000..cb921fd857
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
@@ -0,0 +1,93 @@
+// Copyright (c) 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.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Screens.Edit.Compose;
+using osu.Game.Screens.Edit.Compose.Components;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneEditorQuickDelete : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
+
+        [Test]
+        public void TestQuickDeleteRemovesObject()
+        {
+            var addedObject = new HitCircle { StartTime = 1000 };
+
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
+
+            AddStep("move mouse to object", () =>
+            {
+                var pos = getBlueprintContainer.SelectionBlueprints
+                            .ChildrenOfType<HitCircleSelectionBlueprint>().First()
+                            .ChildrenOfType<HitCirclePiece>().First().ScreenSpaceDrawQuad.Centre;
+                InputManager.MoveMouseTo(pos);
+            });
+            AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
+            AddStep("rightclick", () => InputManager.Click(MouseButton.Right));
+            AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));
+
+            AddAssert("no hitobjects in beatmap", () => EditorBeatmap.HitObjects.Count == 0);
+        }
+
+        [Test]
+        public void TestQuickDeleteRemovesSliderControlPoint()
+        {
+            Slider slider = new Slider { StartTime = 1000 };
+
+            PathControlPoint[] points = new PathControlPoint[]
+            {
+                new PathControlPoint(),
+                new PathControlPoint(new Vector2(50, 0)),
+                new PathControlPoint(new Vector2(100, 0))
+            };
+
+            AddStep("add slider", () =>
+            {
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+            });
+
+            AddStep("select added slider", () => EditorBeatmap.SelectedHitObjects.Add(slider));
+
+            AddStep("move mouse to controlpoint", () =>
+            {
+                // This doesn't get the HitCirclePiece corresponding to the last control point on consecutive runs,
+                // causing the slider to translate by 50 every time and go off the screen after about 10 runs.
+                var pos = getBlueprintContainer.SelectionBlueprints
+                            .ChildrenOfType<SliderSelectionBlueprint>().First()
+                            .ChildrenOfType<HitCirclePiece>().Last().ScreenSpaceDrawQuad.Centre;
+                InputManager.MoveMouseTo(pos);
+            });
+            AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
+            AddStep("rightclick", () => InputManager.Click(MouseButton.Right));
+            AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));
+
+            AddAssert("slider has 2 points", () => slider.Path.ControlPoints.Count == 2);
+        }
+
+        private BlueprintContainer getBlueprintContainer => Editor.ChildrenOfType<ComposeScreen>().First()
+                                                                  .ChildrenOfType<HitObjectComposer>().First()
+                                                                  .ChildrenOfType<BlueprintContainer>().First();
+    }
+}

From 6b38bb9d76e8da7857ef2e197ba77ce674942285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 16:38:25 +0100
Subject: [PATCH 06220/10326] Add test coverage for new ownerless behaviour

---
 .../TestScenePreviewTrackManager.cs           | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs b/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
index d76905dab8..a3db20ce83 100644
--- a/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
+++ b/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
@@ -167,6 +167,21 @@ namespace osu.Game.Tests.Visual.Components
             AddAssert("game not muted", () => audio.Tracks.AggregateVolume.Value != 0);
         }
 
+        [Test]
+        public void TestOwnerNotRegistered()
+        {
+            PreviewTrack track = null;
+
+            AddStep("get track", () => Add(new TestTrackOwner(track = getTrack(), registerAsOwner: false)));
+            AddUntilStep("wait for loaded", () => track.IsLoaded);
+
+            AddStep("start track", () => track.Start());
+            AddUntilStep("track is running", () => track.IsRunning);
+
+            AddStep("cancel from anyone", () => trackManager.StopAnyPlaying(this));
+            AddAssert("track stopped", () => !track.IsRunning);
+        }
+
         private TestPreviewTrack getTrack() => (TestPreviewTrack)trackManager.Get(null);
 
         private TestPreviewTrack getOwnedTrack()
@@ -181,10 +196,12 @@ namespace osu.Game.Tests.Visual.Components
         private class TestTrackOwner : CompositeDrawable, IPreviewTrackOwner
         {
             private readonly PreviewTrack track;
+            private readonly bool registerAsOwner;
 
-            public TestTrackOwner(PreviewTrack track)
+            public TestTrackOwner(PreviewTrack track, bool registerAsOwner = true)
             {
                 this.track = track;
+                this.registerAsOwner = registerAsOwner;
             }
 
             [BackgroundDependencyLoader]
@@ -196,7 +213,8 @@ namespace osu.Game.Tests.Visual.Components
             protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             {
                 var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-                dependencies.CacheAs<IPreviewTrackOwner>(this);
+                if (registerAsOwner)
+                    dependencies.CacheAs<IPreviewTrackOwner>(this);
                 return dependencies;
             }
         }

From 1db303b15924cba91b828d553a858508c6840b38 Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Sun, 15 Nov 2020 16:54:48 +0100
Subject: [PATCH 06221/10326] Revert beginClickSelection logic

---
 .../Edit/Compose/Components/BlueprintContainer.cs     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index c9043ccef3..4390ed4f10 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -338,15 +338,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether a selection was performed.</returns>
         private bool beginClickSelection(MouseButtonEvent e)
         {
-            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren.ToList())
+            bool selectedPerformed = true;
+
+            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
             {
                 if (!blueprint.IsHovered) continue;
 
-                if (SelectionHandler.HandleSelectionRequested(blueprint, e))
-                    return clickSelectionBegan = true;
+                selectedPerformed &= SelectionHandler.HandleSelectionRequested(blueprint, e);
+                clickSelectionBegan = true;
+                break;
             }
 
-            return false;
+            return selectedPerformed;
         }
 
         /// <summary>

From c77ec3e905adc7ffd5bf2e74001cea184081887d Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Sun, 15 Nov 2020 17:42:52 +0100
Subject: [PATCH 06222/10326] Fix slider control point quickdelete test

---
 osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
index cb921fd857..55daf130a8 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose;
@@ -72,11 +73,10 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("move mouse to controlpoint", () =>
             {
-                // This doesn't get the HitCirclePiece corresponding to the last control point on consecutive runs,
-                // causing the slider to translate by 50 every time and go off the screen after about 10 runs.
                 var pos = getBlueprintContainer.SelectionBlueprints
                             .ChildrenOfType<SliderSelectionBlueprint>().First()
-                            .ChildrenOfType<HitCirclePiece>().Last().ScreenSpaceDrawQuad.Centre;
+                            .ChildrenOfType<PathControlPointVisualiser>().First()
+                            .ChildrenOfType<PathControlPointPiece>().ElementAt(1).ScreenSpaceDrawQuad.Centre;
                 InputManager.MoveMouseTo(pos);
             });
             AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));

From 42de4437ccf3d18271e6c119a8f2d40fd619b4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 19:43:42 +0100
Subject: [PATCH 06223/10326] Add failing test case

---
 .../Gameplay/TestScenePoolingRuleset.cs       | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
index d009d805f0..3e777119c4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -57,6 +57,43 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("DHO reused", () => this.ChildrenOfType<DrawableTestHitObject>().Single() == firstObject);
         }
 
+        [Test]
+        public void TestCustomTransformsClearedBetweenReuses()
+        {
+            ManualClock clock = null;
+
+            createTest(new Beatmap
+            {
+                HitObjects =
+                {
+                    new HitObject(),
+                    new HitObject { StartTime = 2000 }
+                }
+            }, 1, () => new FramedClock(clock = new ManualClock()));
+
+            DrawableTestHitObject firstObject = null;
+            Vector2 position = default;
+
+            AddUntilStep("first object shown", () => this.ChildrenOfType<DrawableTestHitObject>().SingleOrDefault()?.HitObject == drawableRuleset.Beatmap.HitObjects[0]);
+            AddStep("get DHO", () => firstObject = this.ChildrenOfType<DrawableTestHitObject>().Single());
+            AddStep("store position", () => position = firstObject.Position);
+            AddStep("add custom transform", () => firstObject.ApplyCustomUpdateState += onStateUpdate);
+
+            AddStep("fast forward past first object", () => clock.CurrentTime = 1500);
+            AddStep("unapply custom transform", () => firstObject.ApplyCustomUpdateState -= onStateUpdate);
+
+            AddStep("fast forward to second object", () => clock.CurrentTime = drawableRuleset.Beatmap.HitObjects[1].StartTime);
+            AddUntilStep("second object shown", () => this.ChildrenOfType<DrawableTestHitObject>().SingleOrDefault()?.HitObject == drawableRuleset.Beatmap.HitObjects[1]);
+            AddAssert("DHO reused", () => this.ChildrenOfType<DrawableTestHitObject>().Single() == firstObject);
+            AddAssert("object in new position", () => firstObject.Position != position);
+
+            void onStateUpdate(DrawableHitObject hitObject, ArmedState state)
+            {
+                using (hitObject.BeginAbsoluteSequence(hitObject.StateUpdateTime))
+                    hitObject.MoveToOffset(new Vector2(-100, 0));
+            }
+        }
+
         [Test]
         public void TestNotReusedWithHitObjectsSpacedClose()
         {
@@ -210,7 +247,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
 
-                Position = new Vector2(RNG.Next(-200, 200), RNG.Next(-200, 200));
                 Size = new Vector2(50, 50);
 
                 Colour = new Color4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1f);
@@ -225,6 +261,12 @@ namespace osu.Game.Tests.Visual.Gameplay
                 });
             }
 
+            protected override void OnApply(HitObject hitObject)
+            {
+                base.OnApply(hitObject);
+                Position = new Vector2(RNG.Next(-200, 200), RNG.Next(-200, 200));
+            }
+
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
                 if (timeOffset > HitObject.Duration)

From 9c0a0031d671712e96061b534732732af1989776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 19:45:49 +0100
Subject: [PATCH 06224/10326] Clear existing transforms on DHO return to pool

---
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index b400c532c5..930b1471f3 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -287,6 +287,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             HitObject = null;
             lifetimeEntry = null;
 
+            clearExistingStateTransforms();
+
             hasHitObjectApplied = false;
         }
 
@@ -403,8 +405,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             double transformTime = HitObject.StartTime - InitialLifetimeOffset;
 
-            base.ApplyTransformsAt(double.MinValue, true);
-            base.ClearTransformsAfter(double.MinValue, true);
+            clearExistingStateTransforms();
 
             using (BeginAbsoluteSequence(transformTime, true))
                 UpdateInitialTransforms();
@@ -432,6 +433,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 PlaySamples();
         }
 
+        private void clearExistingStateTransforms()
+        {
+            base.ApplyTransformsAt(double.MinValue, true);
+            base.ClearTransformsAfter(double.MinValue, true);
+        }
+
         /// <summary>
         /// Apply (generally fade-in) transforms leading into the <see cref="HitObject"/> start time.
         /// The local drawable hierarchy is recursively delayed to <see cref="LifetimeStart"/> for convenience.

From 4e77800b98aa35758c555d4c690e34d4aa6312aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 20:51:35 +0100
Subject: [PATCH 06225/10326] Rename & simplify property

---
 .../Visual/Editing/TestSceneEditorQuickDelete.cs      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
index 55daf130a8..5bae6ec5f7 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
@@ -28,6 +28,9 @@ namespace osu.Game.Tests.Visual.Editing
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
 
+        private BlueprintContainer blueprintContainer
+            => Editor.ChildrenOfType<BlueprintContainer>().First();
+
         [Test]
         public void TestQuickDeleteRemovesObject()
         {
@@ -39,7 +42,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("move mouse to object", () =>
             {
-                var pos = getBlueprintContainer.SelectionBlueprints
+                var pos = blueprintContainer.SelectionBlueprints
                             .ChildrenOfType<HitCircleSelectionBlueprint>().First()
                             .ChildrenOfType<HitCirclePiece>().First().ScreenSpaceDrawQuad.Centre;
                 InputManager.MoveMouseTo(pos);
@@ -73,7 +76,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("move mouse to controlpoint", () =>
             {
-                var pos = getBlueprintContainer.SelectionBlueprints
+                var pos = blueprintContainer.SelectionBlueprints
                             .ChildrenOfType<SliderSelectionBlueprint>().First()
                             .ChildrenOfType<PathControlPointVisualiser>().First()
                             .ChildrenOfType<PathControlPointPiece>().ElementAt(1).ScreenSpaceDrawQuad.Centre;
@@ -85,9 +88,5 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddAssert("slider has 2 points", () => slider.Path.ControlPoints.Count == 2);
         }
-
-        private BlueprintContainer getBlueprintContainer => Editor.ChildrenOfType<ComposeScreen>().First()
-                                                                  .ChildrenOfType<HitObjectComposer>().First()
-                                                                  .ChildrenOfType<BlueprintContainer>().First();
     }
 }

From 1f0945d4deef4678fcc785a7931bdd6fcf7c9665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 20:52:33 +0100
Subject: [PATCH 06226/10326] Simplify accesses via ChildrenOfType()

---
 .../Visual/Editing/TestSceneEditorQuickDelete.cs    | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
index 5bae6ec5f7..9d35185f7e 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
@@ -9,13 +9,9 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
-using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Tests.Beatmaps;
-using osu.Game.Rulesets.Edit;
-using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 using osuTK.Input;
@@ -42,9 +38,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("move mouse to object", () =>
             {
-                var pos = blueprintContainer.SelectionBlueprints
-                            .ChildrenOfType<HitCircleSelectionBlueprint>().First()
-                            .ChildrenOfType<HitCirclePiece>().First().ScreenSpaceDrawQuad.Centre;
+                var pos = blueprintContainer.ChildrenOfType<HitCirclePiece>().First().ScreenSpaceDrawQuad.Centre;
                 InputManager.MoveMouseTo(pos);
             });
             AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
@@ -76,10 +70,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("move mouse to controlpoint", () =>
             {
-                var pos = blueprintContainer.SelectionBlueprints
-                            .ChildrenOfType<SliderSelectionBlueprint>().First()
-                            .ChildrenOfType<PathControlPointVisualiser>().First()
-                            .ChildrenOfType<PathControlPointPiece>().ElementAt(1).ScreenSpaceDrawQuad.Centre;
+                var pos = blueprintContainer.ChildrenOfType<PathControlPointPiece>().ElementAt(1).ScreenSpaceDrawQuad.Centre;
                 InputManager.MoveMouseTo(pos);
             });
             AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));

From 337311c3236c848c9ead6c885991a227f288a581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 20:52:58 +0100
Subject: [PATCH 06227/10326] Remove redundant type specification

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

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
index 9d35185f7e..9bcb056f25 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.Editing
         {
             Slider slider = new Slider { StartTime = 1000 };
 
-            PathControlPoint[] points = new PathControlPoint[]
+            PathControlPoint[] points =
             {
                 new PathControlPoint(),
                 new PathControlPoint(new Vector2(50, 0)),

From 399a1a16a070d31e36a2076f505dd9111de8f381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Nov 2020 21:06:47 +0100
Subject: [PATCH 06228/10326] Refactor beginClickSelection in a slightly
 different way

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 4390ed4f10..8f3c86b98a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -338,18 +338,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether a selection was performed.</returns>
         private bool beginClickSelection(MouseButtonEvent e)
         {
-            bool selectedPerformed = true;
-
             foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
             {
                 if (!blueprint.IsHovered) continue;
 
-                selectedPerformed &= SelectionHandler.HandleSelectionRequested(blueprint, e);
-                clickSelectionBegan = true;
-                break;
+                return clickSelectionBegan = SelectionHandler.HandleSelectionRequested(blueprint, e);
             }
 
-            return selectedPerformed;
+            return false;
         }
 
         /// <summary>

From 7169dc91735feb4250636432ee7f5a07114cd94a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Nov 2020 14:06:37 +0900
Subject: [PATCH 06229/10326] Add extra step checking slider deletion on second
 click

---
 .../Visual/Editing/TestSceneEditorQuickDelete.cs      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
index 9bcb056f25..9efd299fba 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Editing
                 InputManager.MoveMouseTo(pos);
             });
             AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
-            AddStep("rightclick", () => InputManager.Click(MouseButton.Right));
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
             AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));
 
             AddAssert("no hitobjects in beatmap", () => EditorBeatmap.HitObjects.Count == 0);
@@ -74,10 +74,15 @@ namespace osu.Game.Tests.Visual.Editing
                 InputManager.MoveMouseTo(pos);
             });
             AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
-            AddStep("rightclick", () => InputManager.Click(MouseButton.Right));
-            AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));
 
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
             AddAssert("slider has 2 points", () => slider.Path.ControlPoints.Count == 2);
+
+            // second click should nuke the object completely.
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
+            AddAssert("no hitobjects in beatmap", () => EditorBeatmap.HitObjects.Count == 0);
+
+            AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));
         }
     }
 }

From a4c17906b402781c6041f71585e7bc3a015db0bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Nov 2020 14:52:18 +0900
Subject: [PATCH 06230/10326] Make comment a bit more explicit

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

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index f70e7b315e..906f7382c5 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Rulesets.Mania
 
                     case ManiaModFadeIn _:
                         value |= LegacyMods.FadeIn;
-                        value &= ~LegacyMods.Hidden; // due to inheritance
+                        value &= ~LegacyMods.Hidden; // this is toggled on in the base call due to inheritance, but we don't want that.
                         break;
 
                     case ManiaModMirror _:

From b20898a1ac289e552c2514b995534173d2077b99 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 16 Nov 2020 14:57:52 +0900
Subject: [PATCH 06231/10326] Use `dotnet tool` for InspectCode build script

---
 .config/dotnet-tools.json | 18 ++++++++++++++++++
 build/InspectCode.cake    | 23 ++++++-----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 6ba6ae82c8..dd53eefd23 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -13,6 +13,24 @@
       "commands": [
         "dotnet-format"
       ]
+    },
+    "jetbrains.resharper.globaltools": {
+      "version": "2020.2.4",
+      "commands": [
+        "jb"
+      ]
+    },
+    "nvika": {
+      "version": "2.0.0",
+      "commands": [
+        "nvika"
+      ]
+    },
+    "codefilesanity": {
+      "version": "15.0.0",
+      "commands": [
+        "CodeFileSanity"
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/build/InspectCode.cake b/build/InspectCode.cake
index c8f4f37c94..6836d9071b 100644
--- a/build/InspectCode.cake
+++ b/build/InspectCode.cake
@@ -1,7 +1,4 @@
 #addin "nuget:?package=CodeFileSanity&version=0.0.36"
-#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2020.1.3"
-#tool "nuget:?package=NVika.MSBuild&version=1.0.1"
-var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
 
 ///////////////////////////////////////////////////////////////////////////////
 // ARGUMENTS
@@ -18,23 +15,15 @@ var desktopSlnf = rootDirectory.CombineWithFilePath("osu.Desktop.slnf");
 // TASKS
 ///////////////////////////////////////////////////////////////////////////////
 
-// windows only because both inspectcode and nvika depend on net45
 Task("InspectCode")
-    .WithCriteria(IsRunningOnWindows())
     .Does(() => {
-        InspectCode(desktopSlnf, new InspectCodeSettings {
-            CachesHome = "inspectcode",
-            OutputFile = "inspectcodereport.xml",
-            ArgumentCustomization = arg => {
-                if (AppVeyor.IsRunningOnAppVeyor) // Don't flood CI output
-                    arg.Append("--verbosity:WARN");
-                    return arg;
-            },
-        });
+        var inspectcodereport = "inspectcodereport.xml";
+        var cacheDir = "inspectcode";
+        var verbosity = AppVeyor.IsRunningOnAppVeyor ? "WARN" : "INFO"; // Don't flood CI output
 
-        int returnCode = StartProcess(nVikaToolPath, $@"parsereport ""inspectcodereport.xml"" --treatwarningsaserrors");
-        if (returnCode != 0)
-            throw new Exception($"inspectcode failed with return code {returnCode}");
+        DotNetCoreTool(rootDirectory.FullPath,
+            "jb", $@"inspectcode ""{desktopSlnf}"" --output=""{inspectcodereport}"" --caches-home=""{cacheDir}"" --verbosity={verbosity}");
+        DotNetCoreTool(rootDirectory.FullPath, "nvika", $@"parsereport ""{inspectcodereport}"" --treatwarningsaserrors");
     });
 
 Task("CodeFileSanity")

From 9a7fdb2b7e31e0495c12e5294c89a24042f8254d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Nov 2020 16:43:17 +0900
Subject: [PATCH 06232/10326] Move skin deletion logic to OsuGameBase to
 promote thread safety

`CurrentSkinInfo` is used in multiple places expecting thread safety,
while ItemRemoved events are explicitly mentioning they are not thread
safe. As SkinManager itself doesn't have the ability to schedule to the
update thread, I've just moved the logic to `OsuGameBase`. We may want
to move the current skin bindable out of the manager class in the
future to match things like `BeatmapManager`.

Closes https://github.com/ppy/osu/issues/10837.
---
 osu.Game/OsuGameBase.cs          | 11 +++++++++++
 osu.Game/Skinning/SkinManager.cs | 10 ----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 193f6fe61b..1147f67ad2 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -194,6 +194,17 @@ namespace osu.Game
             dependencies.Cache(SkinManager = new SkinManager(Storage, contextFactory, Host, Audio, new NamespacedResourceStore<byte[]>(Resources, "Skins/Legacy")));
             dependencies.CacheAs<ISkinSource>(SkinManager);
 
+            // needs to be done here rather than inside SkinManager to ensure thread safety of CurrentSkinInfo.
+            SkinManager.ItemRemoved.BindValueChanged(weakRemovedInfo =>
+            {
+                if (weakRemovedInfo.NewValue.TryGetTarget(out var removedInfo))
+                {
+                    // check the removed skin is not the current user choice. if it is, switch back to default.
+                    if (removedInfo.ID == SkinManager.CurrentSkinInfo.Value.ID)
+                        Schedule(() => SkinManager.CurrentSkinInfo.Value = SkinInfo.Default);
+                }
+            });
+
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig));
 
             dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient());
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index bef3e86a4d..9b69a1eecd 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -48,16 +48,6 @@ namespace osu.Game.Skinning
             this.audio = audio;
             this.legacyDefaultResources = legacyDefaultResources;
 
-            ItemRemoved.BindValueChanged(weakRemovedInfo =>
-            {
-                if (weakRemovedInfo.NewValue.TryGetTarget(out var removedInfo))
-                {
-                    // check the removed skin is not the current user choice. if it is, switch back to default.
-                    if (removedInfo.ID == CurrentSkinInfo.Value.ID)
-                        CurrentSkinInfo.Value = SkinInfo.Default;
-                }
-            });
-
             CurrentSkinInfo.ValueChanged += skin => CurrentSkin.Value = GetSkin(skin.NewValue);
             CurrentSkin.ValueChanged += skin =>
             {

From 709370c69b366718596ccb6409a992c1ffacf957 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Nov 2020 16:49:31 +0900
Subject: [PATCH 06233/10326] Move schedule call outwards

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 1147f67ad2..e7b5d3304d 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -199,9 +199,12 @@ namespace osu.Game
             {
                 if (weakRemovedInfo.NewValue.TryGetTarget(out var removedInfo))
                 {
-                    // check the removed skin is not the current user choice. if it is, switch back to default.
-                    if (removedInfo.ID == SkinManager.CurrentSkinInfo.Value.ID)
-                        Schedule(() => SkinManager.CurrentSkinInfo.Value = SkinInfo.Default);
+                    Schedule(() =>
+                    {
+                        // check the removed skin is not the current user choice. if it is, switch back to default.
+                        if (removedInfo.ID == SkinManager.CurrentSkinInfo.Value.ID)
+                            SkinManager.CurrentSkinInfo.Value = SkinInfo.Default;
+                    });
                 }
             });
 

From dc38aeac4392d44b1b99aa3b4a18e47aa5373f21 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Nov 2020 17:23:02 +0900
Subject: [PATCH 06234/10326] Remove unnecessary local definition of colour
 logic from taiko judgement

---
 .../UI/DrawableTaikoJudgement.cs              | 22 ++-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
index cbfc5a8628..b5e35f88b5 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
@@ -1,12 +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.Game.Rulesets.Objects.Drawables;
-using osu.Framework.Allocation;
-using osu.Game.Graphics;
-using osu.Game.Rulesets.Judgements;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -25,21 +22,6 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            switch (Result.Type)
-            {
-                case HitResult.Ok:
-                    JudgementBody.Colour = colours.GreenLight;
-                    break;
-
-                case HitResult.Great:
-                    JudgementBody.Colour = colours.BlueLight;
-                    break;
-            }
-        }
-
         protected override void ApplyHitAnimations()
         {
             this.MoveToY(-100, 500);

From d7acfd5413cb1844b55f3f858a2b97147d8787cc Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Mon, 16 Nov 2020 18:15:15 +0800
Subject: [PATCH 06235/10326] Remove retires from ModEasy

---
 osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs | 42 +++++++++++++++++
 osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs | 47 +++++++++++++++++++
 osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs     | 49 +++++++++++++++++++-
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs | 33 ++-----------
 osu.Game/Rulesets/Mods/ModEasy.cs            | 44 ++----------------
 5 files changed, 144 insertions(+), 71 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs b/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
index a82d0af102..f58a4051de 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
@@ -1,12 +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.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModEasy : ModEasy
     {
         public override string Description => @"Larger fruits, more forgiving HP drain, less accuracy required, and three lives!";
+
+        [SettingSource("Extra Lives", "Number of extra lives")]
+        public Bindable<int> Retries { get; } = new BindableInt(2)
+        {
+            MinValue = 0,
+            MaxValue = 10
+        };
+        public override string SettingDescription => Retries.IsDefault ? string.Empty : $"{"lives".ToQuantity(Retries.Value)}";
+
+        private int retries;
+
+        private BindableNumber<double> health;
+
+        public override void ReadFromDifficulty(BeatmapDifficulty difficulty)
+        {
+        }
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            const float ratio = 0.5f;
+            difficulty.CircleSize *= ratio;
+            difficulty.ApproachRate *= ratio;
+            difficulty.DrainRate *= ratio;
+            difficulty.OverallDifficulty *= ratio;
+
+            retries = Retries.Value;
+        }
+        public bool PerformFail()
+        {
+            if (retries == 0) return true;
+
+            health.Value = health.MaxValue;
+            retries--;
+
+            return false;
+        }
+        public bool RestartOnFail => false;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs
index ff77df0ae0..52c959395f 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs
@@ -1,12 +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 Humanizer;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModEasy : ModEasy
     {
         public override string Description => @"More forgiving HP drain, less accuracy required, and three lives!";
+
+        [SettingSource("Extra Lives", "Number of extra lives")]
+        public Bindable<int> Retries { get; } = new BindableInt(2)
+        {
+            MinValue = 0,
+            MaxValue = 10
+        };
+        public override string SettingDescription => Retries.IsDefault ? string.Empty : $"{"lives".ToQuantity(Retries.Value)}";
+
+        private int retries;
+
+        private BindableNumber<double> health;
+
+        public override void ReadFromDifficulty(BeatmapDifficulty difficulty)
+        {
+        }
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            const float ratio = 0.5f;
+            difficulty.CircleSize *= ratio;
+            difficulty.ApproachRate *= ratio;
+            difficulty.DrainRate *= ratio;
+            difficulty.OverallDifficulty *= ratio;
+
+            retries = Retries.Value;
+        }
+        public bool PerformFail()
+        {
+            if (retries == 0) return true;
+
+            health.Value = health.MaxValue;
+            retries--;
+
+            return false;
+        }
+        public bool RestartOnFail => false;
+
+        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
+        {
+            health = healthProcessor.Health.GetBoundCopy();
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs b/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs
index f13c7d2ff6..df7f7bbce6 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs
@@ -1,12 +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 Humanizer;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModEasy : ModEasy
+    public class OsuModEasy : ModEasy, IApplicableToDifficulty, IApplicableFailOverride, IApplicableToHealthProcessor
     {
         public override string Description => @"Larger circles, more forgiving HP drain, less accuracy required, and three lives!";
+
+        [SettingSource("Extra Lives", "Number of extra lives")]
+        public Bindable<int> Retries { get; } = new BindableInt(2)
+        {
+            MinValue = 0,
+            MaxValue = 10
+        };
+        public override string SettingDescription => Retries.IsDefault ? string.Empty : $"{"lives".ToQuantity(Retries.Value)}";
+
+        private int retries;
+
+        private BindableNumber<double> health;
+
+        public override void ReadFromDifficulty(BeatmapDifficulty difficulty)
+        {
+        }
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            const float ratio = 0.5f;
+            difficulty.CircleSize *= ratio;
+            difficulty.ApproachRate *= ratio;
+            difficulty.DrainRate *= ratio;
+            difficulty.OverallDifficulty *= ratio;
+
+            retries = Retries.Value;
+        }
+        public bool PerformFail()
+        {
+            if (retries == 0) return true;
+
+            health.Value = health.MaxValue;
+            retries--;
+
+            return false;
+        }
+        public bool RestartOnFail => false;
+
+        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
+        {
+            health = healthProcessor.Health.GetBoundCopy();
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index c3b833fa29..9e49c3fa13 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
@@ -1,40 +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 osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
-    public class TaikoModEasy : Mod, IApplicableToDifficulty, IApplicableFailOverride
+    public class TaikoModEasy : ModEasy
     {
-        public override string Name => "Easy";
-        public override string Acronym => "EZ";
-        public override string Description => @"Beats move slower, less accuracy required";
-        public override IconUsage? Icon => OsuIcon.ModEasy;
-        public override ModType Type => ModType.DifficultyReduction;
-        public override double ScoreMultiplier => 0.5;
-        public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModHardRock), typeof(ModDifficultyAdjust) };
-
-        public void ReadFromDifficulty(BeatmapDifficulty difficulty)
-        {
-        }
-
-        public void ApplyToDifficulty(BeatmapDifficulty difficulty)
-        {
-            const float ratio = 0.5f;
-            difficulty.CircleSize *= ratio;
-            difficulty.ApproachRate *= ratio;
-            difficulty.DrainRate *= ratio;
-            difficulty.OverallDifficulty *= ratio;
-        }
-
-        public bool PerformFail() => true;
-
-        public bool RestartOnFail => false;
+        public override string Description => @"Beats move slower, less accuracy required!";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index c6f3930029..cf06091d99 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -2,17 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using Humanizer;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModEasy : Mod, IApplicableToDifficulty, IApplicableFailOverride, IApplicableToHealthProcessor
+    public abstract class ModEasy : Mod, IApplicableToDifficulty
     {
         public override string Name => "Easy";
         public override string Acronym => "EZ";
@@ -22,49 +18,17 @@ namespace osu.Game.Rulesets.Mods
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModHardRock), typeof(ModDifficultyAdjust) };
 
-        [SettingSource("Extra Lives", "Number of extra lives")]
-        public Bindable<int> Retries { get; } = new BindableInt(2)
-        {
-            MinValue = 0,
-            MaxValue = 10
-        };
-
-        public override string SettingDescription => Retries.IsDefault ? string.Empty : $"{"lives".ToQuantity(Retries.Value)}";
-
-        private int retries;
-
-        private BindableNumber<double> health;
-
-        public void ReadFromDifficulty(BeatmapDifficulty difficulty)
+        public virtual void ReadFromDifficulty(BeatmapDifficulty difficulty)
         {
         }
 
-        public void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        public virtual void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
             const float ratio = 0.5f;
             difficulty.CircleSize *= ratio;
             difficulty.ApproachRate *= ratio;
             difficulty.DrainRate *= ratio;
-            difficulty.OverallDifficulty *= ratio;
-
-            retries = Retries.Value;
-        }
-
-        public bool PerformFail()
-        {
-            if (retries == 0) return true;
-
-            health.Value = health.MaxValue;
-            retries--;
-
-            return false;
-        }
-
-        public bool RestartOnFail => false;
-
-        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
-        {
-            health = healthProcessor.Health.GetBoundCopy();
+            difficulty.OverallDifficulty *= ratio;;
         }
     }
 }

From f2ef7bee5d48c2946cebcbcd401d9ed1d6d69288 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Mon, 16 Nov 2020 18:17:50 +0800
Subject: [PATCH 06236/10326] Fix checks

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

diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index cf06091d99..1290e8136c 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mods
             difficulty.CircleSize *= ratio;
             difficulty.ApproachRate *= ratio;
             difficulty.DrainRate *= ratio;
-            difficulty.OverallDifficulty *= ratio;;
+            difficulty.OverallDifficulty *= ratio;
         }
     }
 }

From a53b5ef8b95c2d0f7d3c776025e38f7e845cb4ce Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 16 Nov 2020 19:22:08 +0900
Subject: [PATCH 06237/10326] Remove `--no-restore` from VSCode build tasks

---
 .vscode/tasks.json                              | 17 -----------------
 .../.vscode/tasks.json                          | 11 -----------
 .../.vscode/tasks.json                          | 11 -----------
 osu.Game.Rulesets.Osu.Tests/.vscode/tasks.json  | 11 -----------
 .../.vscode/tasks.json                          | 11 -----------
 osu.Game.Tournament.Tests/.vscode/tasks.json    | 11 -----------
 6 files changed, 72 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index aa77d4f055..a70e5ac3a9 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -9,7 +9,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Desktop",
                 "-p:GenerateFullPaths=true",
                 "-m",
@@ -24,7 +23,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Desktop",
                 "-p:Configuration=Release",
                 "-p:GenerateFullPaths=true",
@@ -40,7 +38,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Tests",
                 "-p:GenerateFullPaths=true",
                 "-m",
@@ -55,7 +52,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Tests",
                 "-p:Configuration=Release",
                 "-p:GenerateFullPaths=true",
@@ -71,7 +67,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Tournament.Tests",
                 "-p:GenerateFullPaths=true",
                 "-m",
@@ -86,7 +81,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Tournament.Tests",
                 "-p:Configuration=Release",
                 "-p:GenerateFullPaths=true",
@@ -102,7 +96,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Benchmarks",
                 "-p:Configuration=Release",
                 "-p:GenerateFullPaths=true",
@@ -111,16 +104,6 @@
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "Restore (netcoreapp3.1)",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "restore",
-                "build/Desktop.proj"
-            ],
-            "problemMatcher": []
         }
     ]
 }
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/.vscode/tasks.json b/osu.Game.Rulesets.Catch.Tests/.vscode/tasks.json
index 2c915a31b7..d8feacc8a7 100644
--- a/osu.Game.Rulesets.Catch.Tests/.vscode/tasks.json
+++ b/osu.Game.Rulesets.Catch.Tests/.vscode/tasks.json
@@ -9,7 +9,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Catch.Tests.csproj",
                 "-p:GenerateFullPaths=true",
                 "-m",
@@ -24,7 +23,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Catch.Tests.csproj",
                 "-p:Configuration=Release",
                 "-p:GenerateFullPaths=true",
@@ -33,15 +31,6 @@
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "Restore",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "restore"
-            ],
-            "problemMatcher": []
         }
     ]
 }
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests/.vscode/tasks.json b/osu.Game.Rulesets.Mania.Tests/.vscode/tasks.json
index ca03924c70..323110b605 100644
--- a/osu.Game.Rulesets.Mania.Tests/.vscode/tasks.json
+++ b/osu.Game.Rulesets.Mania.Tests/.vscode/tasks.json
@@ -9,7 +9,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Mania.Tests.csproj",
                 "-p:GenerateFullPaths=true",
                 "-m",
@@ -24,7 +23,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Mania.Tests.csproj",
                 "-p:Configuration=Release",
                 "-p:GenerateFullPaths=true",
@@ -33,15 +31,6 @@
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "Restore",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "restore"
-            ],
-            "problemMatcher": []
         }
     ]
 }
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests/.vscode/tasks.json b/osu.Game.Rulesets.Osu.Tests/.vscode/tasks.json
index 14ffbfb4ae..590bedb8b2 100644
--- a/osu.Game.Rulesets.Osu.Tests/.vscode/tasks.json
+++ b/osu.Game.Rulesets.Osu.Tests/.vscode/tasks.json
@@ -9,7 +9,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Osu.Tests.csproj",
                 "-p:GenerateFullPaths=true",
                 "-m",
@@ -24,7 +23,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Osu.Tests.csproj",
                 "-p:Configuration=Release",
                 "-p:GenerateFullPaths=true",
@@ -33,15 +31,6 @@
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "Restore",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "restore"
-            ],
-            "problemMatcher": []
         }
     ]
 }
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko.Tests/.vscode/tasks.json b/osu.Game.Rulesets.Taiko.Tests/.vscode/tasks.json
index 09340f6f9f..63f25c2402 100644
--- a/osu.Game.Rulesets.Taiko.Tests/.vscode/tasks.json
+++ b/osu.Game.Rulesets.Taiko.Tests/.vscode/tasks.json
@@ -9,7 +9,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Taiko.Tests.csproj",
                 "-p:GenerateFullPaths=true",
                 "-m",
@@ -24,7 +23,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Taiko.Tests.csproj",
                 "-p:Configuration=Release",
                 "-p:GenerateFullPaths=true",
@@ -33,15 +31,6 @@
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "Restore",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "restore"
-            ],
-            "problemMatcher": []
         }
     ]
 }
\ No newline at end of file
diff --git a/osu.Game.Tournament.Tests/.vscode/tasks.json b/osu.Game.Tournament.Tests/.vscode/tasks.json
index c69ac0391a..04ec7275ac 100644
--- a/osu.Game.Tournament.Tests/.vscode/tasks.json
+++ b/osu.Game.Tournament.Tests/.vscode/tasks.json
@@ -9,7 +9,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Tournament.Tests.csproj",
                 "-p:GenerateFullPaths=true",
                 "-m",
@@ -24,7 +23,6 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "--no-restore",
                 "osu.Game.Tournament.Tests.csproj",
                 "-p:Configuration=Release",
                 "-p:GenerateFullPaths=true",
@@ -33,15 +31,6 @@
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "Restore",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "restore"
-            ],
-            "problemMatcher": []
         }
     ]
 }
\ No newline at end of file

From 017a6b71531f9d4efe35b2d3c97ddfc1f6274a0c Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Mon, 16 Nov 2020 18:22:17 +0800
Subject: [PATCH 06238/10326] Fix checks

---
 osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs | 5 +++++
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs b/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
index f58a4051de..6e154c9202 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
@@ -50,5 +50,10 @@ namespace osu.Game.Rulesets.Catch.Mods
             return false;
         }
         public bool RestartOnFail => false;
+
+        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
+        {
+            health = healthProcessor.Health.GetBoundCopy();
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index 9e49c3fa13..0ec24412e9 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Mods;
-using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {

From 16d25c502204c74eca2e6b21b18ec3ca14e9004b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 16 Nov 2020 19:25:36 +0900
Subject: [PATCH 06239/10326] Adjast readme for the removed VSCode restore task

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 86c42dae12..c9443ba063 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,6 @@ git pull
 Build configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this is provided [below](#contributing).
 
 - Visual Studio / Rider users should load the project via one of the platform-specific `.slnf` files, rather than the main `.sln.` This will allow access to template run configurations.
-- Visual Studio Code users must run the `Restore` task before any build attempt.
 
 You can also build and run *osu!* from the command-line with a single command:
 

From 99ee5e3ad74a50bc21855987fcb7640c8ef21d85 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Mon, 16 Nov 2020 18:28:50 +0800
Subject: [PATCH 06240/10326] Correct inheritance

---
 osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs | 2 +-
 osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs b/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
index 6e154c9202..88d20d15e2 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
-    public class CatchModEasy : ModEasy
+    public class CatchModEasy : ModEasy, IApplicableFailOverride, IApplicableToHealthProcessor
     {
         public override string Description => @"Larger fruits, more forgiving HP drain, less accuracy required, and three lives!";
 
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs
index 52c959395f..79073b26ba 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModEasy : ModEasy
+    public class ManiaModEasy : ModEasy, IApplicableFailOverride, IApplicableToHealthProcessor
     {
         public override string Description => @"More forgiving HP drain, less accuracy required, and three lives!";
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs b/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs
index df7f7bbce6..43ceddd6e1 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModEasy : ModEasy, IApplicableToDifficulty, IApplicableFailOverride, IApplicableToHealthProcessor
+    public class OsuModEasy : ModEasy, IApplicableFailOverride, IApplicableToHealthProcessor
     {
         public override string Description => @"Larger circles, more forgiving HP drain, less accuracy required, and three lives!";
 

From 1b1f4c9c09cf8669b957b07a4888cf47dcd67199 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 16 Nov 2020 20:35:22 +0900
Subject: [PATCH 06241/10326] Refactor user request to fix threadsafety issues

---
 osu.Game/Database/UserLookupCache.cs | 123 ++++++++++-----------------
 1 file changed, 47 insertions(+), 76 deletions(-)

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index c85ad6d651..05ba9c882b 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.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.Linq;
 using System.Threading;
@@ -15,103 +14,75 @@ namespace osu.Game.Database
 {
     public class UserLookupCache : MemoryCachingComponent<int, User>
     {
-        private readonly HashSet<int> nextTaskIDs = new HashSet<int>();
-
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private readonly object taskAssignmentLock = new object();
-
-        private Task<List<User>> pendingRequest;
-
-        /// <summary>
-        /// Whether <see cref="pendingRequest"/> has already grabbed its IDs.
-        /// </summary>
-        private bool pendingRequestConsumedIDs;
-
         public Task<User> GetUserAsync(int userId, CancellationToken token = default) => GetAsync(userId, token);
 
         protected override async Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
-        {
-            var users = await getQueryTaskForUser(lookup);
-            return users.FirstOrDefault(u => u.Id == lookup);
-        }
+            => await queryUser(lookup);
 
-        /// <summary>
-        /// Return the task responsible for fetching the provided user.
-        /// This may be part of a larger batch lookup to reduce web requests.
-        /// </summary>
-        /// <param name="userId">The user to lookup.</param>
-        /// <returns>The task responsible for the lookup.</returns>
-        private Task<List<User>> getQueryTaskForUser(int userId)
+        private readonly List<(int id, TaskCompletionSource<User>)> pendingUserTasks = new List<(int, TaskCompletionSource<User>)>();
+        private Task pendingRequestTask;
+        private readonly object taskAssignmentLock = new object();
+
+        private Task<User> queryUser(int userId)
         {
             lock (taskAssignmentLock)
             {
-                nextTaskIDs.Add(userId);
+                var tcs = new TaskCompletionSource<User>();
 
-                // if there's a pending request which hasn't been started yet (and is not yet full), we can wait on it.
-                if (pendingRequest != null && !pendingRequestConsumedIDs && nextTaskIDs.Count < 50)
-                    return pendingRequest;
+                // Add to the queue.
+                pendingUserTasks.Add((userId, tcs));
 
-                return queueNextTask(nextLookup);
-            }
+                // Create a request task if there's not already one.
+                if (pendingRequestTask == null)
+                    createNewTask();
 
-            List<User> nextLookup()
-            {
-                int[] lookupItems;
-
-                lock (taskAssignmentLock)
-                {
-                    pendingRequestConsumedIDs = true;
-                    lookupItems = nextTaskIDs.ToArray();
-                    nextTaskIDs.Clear();
-
-                    if (lookupItems.Length == 0)
-                    {
-                        queueNextTask(null);
-                        return new List<User>();
-                    }
-                }
-
-                var request = new GetUsersRequest(lookupItems);
-
-                // rather than queueing, we maintain our own single-threaded request stream.
-                api.Perform(request);
-
-                return request.Result?.Users;
+                return tcs.Task;
             }
         }
 
-        /// <summary>
-        /// Queues new work at the end of the current work tasks.
-        /// Ensures the provided work is eventually run.
-        /// </summary>
-        /// <param name="work">The work to run. Can be null to signify the end of available work.</param>
-        /// <returns>The task tracking this work.</returns>
-        private Task<List<User>> queueNextTask(Func<List<User>> work)
+        private void performLookup()
         {
+            var userTasks = new List<(int id, TaskCompletionSource<User> task)>();
+
+            // Grab at most 50 users from the queue.
             lock (taskAssignmentLock)
             {
-                if (work == null)
+                while (pendingUserTasks.Count > 0 && userTasks.Count < 50)
                 {
-                    pendingRequest = null;
-                    pendingRequestConsumedIDs = false;
-                }
-                else if (pendingRequest == null)
-                {
-                    // special case for the first request ever.
-                    pendingRequest = Task.Run(work);
-                    pendingRequestConsumedIDs = false;
-                }
-                else
-                {
-                    // append the new request on to the last to be executed.
-                    pendingRequest = pendingRequest.ContinueWith(_ => work());
-                    pendingRequestConsumedIDs = false;
-                }
+                    (int id, TaskCompletionSource<User> task) next = pendingUserTasks[^1];
 
-                return pendingRequest;
+                    pendingUserTasks.RemoveAt(pendingUserTasks.Count - 1);
+
+                    // Perform a secondary check for existence, in case the user was queried in a previous batch.
+                    if (CheckExists(next.id, out var existing))
+                        next.task.SetResult(existing);
+                    else
+                        userTasks.Add(next);
+                }
             }
+
+            // Query the users.
+            var request = new GetUsersRequest(userTasks.Select(t => t.id).ToArray());
+
+            // rather than queueing, we maintain our own single-threaded request stream.
+            api.Perform(request);
+
+            // Create a new request task if there's still more users to query.
+            lock (taskAssignmentLock)
+            {
+                pendingRequestTask = null;
+                if (pendingUserTasks.Count > 0)
+                    createNewTask();
+            }
+
+            // Notify of completion.
+            foreach (var (id, task) in userTasks)
+                task.SetResult(request.Result?.Users?.FirstOrDefault(u => u.Id == id));
         }
+
+        private void createNewTask() => pendingRequestTask = Task.Run(performLookup);
     }
 }

From 87bf168718bd918fb90cb04306216ceae8d0a688 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 16 Nov 2020 20:52:51 +0900
Subject: [PATCH 06242/10326] Use queue instead of list

---
 osu.Game/Database/UserLookupCache.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index 05ba9c882b..71413d076e 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Database
         protected override async Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
             => await queryUser(lookup);
 
-        private readonly List<(int id, TaskCompletionSource<User>)> pendingUserTasks = new List<(int, TaskCompletionSource<User>)>();
+        private readonly Queue<(int id, TaskCompletionSource<User>)> pendingUserTasks = new Queue<(int, TaskCompletionSource<User>)>();
         private Task pendingRequestTask;
         private readonly object taskAssignmentLock = new object();
 
@@ -33,7 +33,7 @@ namespace osu.Game.Database
                 var tcs = new TaskCompletionSource<User>();
 
                 // Add to the queue.
-                pendingUserTasks.Add((userId, tcs));
+                pendingUserTasks.Enqueue((userId, tcs));
 
                 // Create a request task if there's not already one.
                 if (pendingRequestTask == null)
@@ -52,9 +52,7 @@ namespace osu.Game.Database
             {
                 while (pendingUserTasks.Count > 0 && userTasks.Count < 50)
                 {
-                    (int id, TaskCompletionSource<User> task) next = pendingUserTasks[^1];
-
-                    pendingUserTasks.RemoveAt(pendingUserTasks.Count - 1);
+                    (int id, TaskCompletionSource<User> task) next = pendingUserTasks.Dequeue();
 
                     // Perform a secondary check for existence, in case the user was queried in a previous batch.
                     if (CheckExists(next.id, out var existing))

From 85b0f714670215fc85eec8215f393674ccfd062a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 16 Nov 2020 21:17:43 +0900
Subject: [PATCH 06243/10326] Handle duplicate user IDs within the same batch

---
 osu.Game/Database/UserLookupCache.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index 71413d076e..ba7f2ad98e 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -45,12 +45,15 @@ namespace osu.Game.Database
 
         private void performLookup()
         {
+            // userTasks may exceed 50 elements, indicating the existence of duplicate user IDs. All duplicated user IDs must be fulfilled.
+            // userIds contains at most 50 unique user IDs from userTasks, which is used to perform the lookup.
             var userTasks = new List<(int id, TaskCompletionSource<User> task)>();
+            var userIds = new HashSet<int>();
 
-            // Grab at most 50 users from the queue.
+            // Grab at most 50 unique user IDs from the queue.
             lock (taskAssignmentLock)
             {
-                while (pendingUserTasks.Count > 0 && userTasks.Count < 50)
+                while (pendingUserTasks.Count > 0 && userIds.Count < 50)
                 {
                     (int id, TaskCompletionSource<User> task) next = pendingUserTasks.Dequeue();
 
@@ -58,12 +61,15 @@ namespace osu.Game.Database
                     if (CheckExists(next.id, out var existing))
                         next.task.SetResult(existing);
                     else
+                    {
                         userTasks.Add(next);
+                        userIds.Add(next.id);
+                    }
                 }
             }
 
             // Query the users.
-            var request = new GetUsersRequest(userTasks.Select(t => t.id).ToArray());
+            var request = new GetUsersRequest(userIds.ToArray());
 
             // rather than queueing, we maintain our own single-threaded request stream.
             api.Perform(request);

From cead67d51209a1f3a1869448d15345b9d78577f5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 16 Nov 2020 21:47:33 +0900
Subject: [PATCH 06244/10326] Add back removed InitialLifetimeOffset removal

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 3b7c8bcc2a..ca49ed9e75 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -201,6 +201,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 // Copy any existing result from the entry (required for rewind / judgement revert).
                 Result = lifetimeEntry.Result;
             }
+            else
+                LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
 
             // Ensure this DHO has a result.
             Result ??= CreateResult(HitObject.CreateJudgement())
@@ -646,6 +648,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// This is only used as an optimisation to delay the initial update of this <see cref="DrawableHitObject"/> and may be tuned more aggressively if required.
         /// It is indirectly used to decide the automatic transform offset provided to <see cref="UpdateInitialTransforms"/>.
         /// A more accurate <see cref="LifetimeStart"/> should be set for further optimisation (in <see cref="LoadComplete"/>, for example).
+        /// <para>
+        /// Only has an effect if this <see cref="DrawableHitObject"/> is not being pooled.
+        /// For pooled <see cref="DrawableHitObject"/>s, use <see cref="HitObjectLifetimeEntry.InitialLifetimeOffset"/> instead.
+        /// </para>
         /// </remarks>
         protected virtual double InitialLifetimeOffset => 10000;
 

From 4cf6aca8735c43c36d1a9ed90660b0600a591942 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 16 Nov 2020 22:40:25 +0900
Subject: [PATCH 06245/10326] Fix slider ball tint not working

---
 .../TestSceneSliderApplication.cs             | 45 +++++++++++++++++++
 .../Objects/Drawables/DrawableSlider.cs       | 11 ++++-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
index fb1ebbb0d0..084af7dafe 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
@@ -1,20 +1,30 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneSliderApplication : OsuTestScene
     {
+        [Resolved]
+        private SkinManager skinManager { get; set; }
+
         [Test]
         public void TestApplyNewSlider()
         {
@@ -50,6 +60,41 @@ namespace osu.Game.Rulesets.Osu.Tests
             }), null));
         }
 
+        [Test]
+        public void TestBallTintChangedOnAccentChange()
+        {
+            DrawableSlider dho = null;
+
+            AddStep("create slider", () =>
+            {
+                var tintingSkin = skinManager.GetSkin(DefaultLegacySkin.Info);
+                tintingSkin.Configuration.ConfigDictionary["AllowSliderBallTint"] = "1";
+
+                Child = new SkinProvidingContainer(tintingSkin)
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = dho = new DrawableSlider(prepareObject(new Slider
+                    {
+                        Position = new Vector2(256, 192),
+                        IndexInCurrentCombo = 0,
+                        StartTime = Time.Current,
+                        Path = new SliderPath(PathType.Linear, new[]
+                        {
+                            Vector2.Zero,
+                            new Vector2(150, 100),
+                            new Vector2(300, 0),
+                        })
+                    }))
+                };
+            });
+
+            AddStep("set accent white", () => dho.AccentColour.Value = Color4.White);
+            AddAssert("ball is white", () => dho.ChildrenOfType<SliderBall>().Single().AccentColour == Color4.White);
+
+            AddStep("set accent red", () => dho.AccentColour.Value = Color4.Red);
+            AddAssert("ball is red", () => dho.ChildrenOfType<SliderBall>().Single().AccentColour == Color4.Red);
+        }
+
         private Slider prepareObject(Slider slider)
         {
             slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 04fc755da5..f7b1894058 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -80,6 +80,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 foreach (var drawableHitObject in NestedHitObjects)
                     drawableHitObject.AccentColour.Value = colour.NewValue;
+                updateBallTint();
             }, true);
 
             Tracking.BindValueChanged(updateSlidingSample);
@@ -244,7 +245,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.ApplySkin(skin, allowFallback);
 
-            bool allowBallTint = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.AllowSliderBallTint)?.Value ?? false;
+            updateBallTint();
+        }
+
+        private void updateBallTint()
+        {
+            if (CurrentSkin == null)
+                return;
+
+            bool allowBallTint = CurrentSkin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.AllowSliderBallTint)?.Value ?? false;
             Ball.AccentColour = allowBallTint ? AccentColour.Value : Color4.White;
         }
 

From 84b42f207dc8beefd61122dad234674a196b20a0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 16 Nov 2020 23:14:20 +0900
Subject: [PATCH 06246/10326] Fix triangles disappearing after a while

---
 .../Objects/Drawables/Pieces/TrianglesPiece.cs                  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs
index 6cdb0d3df3..add62192f0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs
@@ -7,8 +7,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     public class TrianglesPiece : Triangles
     {
-        protected override bool ExpireOffScreenTriangles => false;
-        protected override bool CreateNewTriangles => false;
         protected override float SpawnRatio => 0.5f;
 
         public TrianglesPiece(int? seed = null)

From e8dbc190f1ce8584980eb25486c04a786d6e218f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 16 Nov 2020 23:30:24 +0900
Subject: [PATCH 06247/10326] Remove ability to pool DHOs in parent playfields

---
 osu.Game/Rulesets/UI/Playfield.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 80e33e0ec5..82ec653f31 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -218,9 +218,6 @@ namespace osu.Game.Rulesets.UI
 
         #region Pooling support
 
-        [Resolved(CanBeNull = true)]
-        private IPooledHitObjectProvider parentPooledObjectProvider { get; set; }
-
         private readonly Dictionary<Type, IDrawablePool> pools = new Dictionary<Type, IDrawablePool>();
 
         /// <summary>
@@ -320,10 +317,7 @@ namespace osu.Game.Rulesets.UI
                 }
             }
 
-            if (pool == null)
-                return parentPooledObjectProvider?.GetPooledDrawableRepresentation(hitObject);
-
-            return (DrawableHitObject)pool.Get(d =>
+            return (DrawableHitObject)pool?.Get(d =>
             {
                 var dho = (DrawableHitObject)d;
 

From f5e12b9d7c0828efdd527706216fbee7efa02375 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 16 Nov 2020 23:53:54 +0900
Subject: [PATCH 06248/10326] Adjust TestScenePlayerLoader for safety

---
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 127 ++++++++----------
 1 file changed, 53 insertions(+), 74 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 9b31dd045a..88fbf09ef4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -23,17 +23,15 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Screens;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.PlayerSettings;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestScenePlayerLoader : OsuManualInputManagerTestScene
+    public class TestScenePlayerLoader : ScreenTestScene
     {
         private TestPlayerLoader loader;
-        private TestPlayerLoaderContainer container;
         private TestPlayer player;
 
         private bool epilepsyWarning;
@@ -44,21 +42,46 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private SessionStatics sessionStatics { get; set; }
 
+        [Cached]
+        private readonly NotificationOverlay notificationOverlay;
+
+        [Cached]
+        private readonly VolumeOverlay volumeOverlay;
+
+        private readonly ChangelogOverlay changelogOverlay;
+
+        public TestScenePlayerLoader()
+        {
+            AddRange(new Drawable[]
+            {
+                notificationOverlay = new NotificationOverlay
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                },
+                volumeOverlay = new VolumeOverlay
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                },
+                changelogOverlay = new ChangelogOverlay()
+            });
+        }
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            player = null;
+            audioManager.Volume.SetDefault();
+        });
+
         /// <summary>
         /// Sets the input manager child to a new test player loader container instance.
         /// </summary>
         /// <param name="interactive">If the test player should behave like the production one.</param>
         /// <param name="beforeLoadAction">An action to run before player load but after bindable leases are returned.</param>
-        public void ResetPlayer(bool interactive, Action beforeLoadAction = null)
+        private void resetPlayer(bool interactive, Action beforeLoadAction = null)
         {
-            player = null;
-
-            audioManager.Volume.SetDefault();
-
-            InputManager.Clear();
-
-            container = new TestPlayerLoaderContainer(loader = new TestPlayerLoader(() => player = new TestPlayer(interactive, interactive)));
-
             beforeLoadAction?.Invoke();
 
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
@@ -67,13 +90,13 @@ namespace osu.Game.Tests.Visual.Gameplay
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToTrack>())
                 mod.ApplyToTrack(Beatmap.Value.Track);
 
-            InputManager.Child = container;
+            LoadScreen(loader = new TestPlayerLoader(() => player = new TestPlayer(interactive, interactive)));
         }
 
         [Test]
         public void TestEarlyExitBeforePlayerConstruction()
         {
-            AddStep("load dummy beatmap", () => ResetPlayer(false, () => SelectedMods.Value = new[] { new OsuModNightcore() }));
+            AddStep("load dummy beatmap", () => resetPlayer(false, () => SelectedMods.Value = new[] { new OsuModNightcore() }));
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
             AddStep("exit loader", () => loader.Exit());
             AddUntilStep("wait for not current", () => !loader.IsCurrentScreen());
@@ -90,7 +113,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestEarlyExitAfterPlayerConstruction()
         {
-            AddStep("load dummy beatmap", () => ResetPlayer(false, () => SelectedMods.Value = new[] { new OsuModNightcore() }));
+            AddStep("load dummy beatmap", () => resetPlayer(false, () => SelectedMods.Value = new[] { new OsuModNightcore() }));
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
             AddAssert("mod rate applied", () => Beatmap.Value.Track.Rate != 1);
             AddUntilStep("wait for non-null player", () => player != null);
@@ -104,7 +127,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestBlockLoadViaMouseMovement()
         {
-            AddStep("load dummy beatmap", () => ResetPlayer(false));
+            AddStep("load dummy beatmap", () => resetPlayer(false));
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
 
             AddUntilStep("wait for load ready", () =>
@@ -129,20 +152,18 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestBlockLoadViaFocus()
         {
-            OsuFocusedOverlayContainer overlay = null;
-
-            AddStep("load dummy beatmap", () => ResetPlayer(false));
+            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);
+            AddStep("show focused overlay", () => changelogOverlay.Show());
+            AddUntilStep("overlay visible", () => changelogOverlay.IsPresent);
 
-            AddUntilStep("wait for load ready", () => player.LoadState == LoadState.Ready);
+            AddUntilStep("wait for load ready", () => player?.LoadState == LoadState.Ready);
             AddRepeatStep("twiddle thumbs", () => { }, 20);
 
             AddAssert("loader still active", () => loader.IsCurrentScreen());
 
-            AddStep("hide overlay", () => overlay.Hide());
+            AddStep("hide overlay", () => changelogOverlay.Hide());
             AddUntilStep("loads after idle", () => !loader.IsCurrentScreen());
         }
 
@@ -151,15 +172,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             SlowLoadPlayer slowPlayer = null;
 
-            AddStep("load dummy beatmap", () => ResetPlayer(false));
-            AddUntilStep("wait for current", () => loader.IsCurrentScreen());
-            AddStep("mouse in centre", () => InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre));
-            AddUntilStep("wait for player to be current", () => player.IsCurrentScreen());
             AddStep("load slow dummy beatmap", () =>
             {
-                InputManager.Child = container = new TestPlayerLoaderContainer(
-                    loader = new TestPlayerLoader(() => slowPlayer = new SlowLoadPlayer(false, false)));
-
+                LoadScreen(loader = new TestPlayerLoader(() => slowPlayer = new SlowLoadPlayer(false, false)));
                 Scheduler.AddDelayed(() => slowPlayer.AllowLoad.Set(), 5000);
             });
 
@@ -173,7 +188,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             TestMod playerMod1 = null;
             TestMod playerMod2 = null;
 
-            AddStep("load player", () => { ResetPlayer(true, () => SelectedMods.Value = new[] { gameMod = new TestMod() }); });
+            AddStep("load player", () => { resetPlayer(true, () => SelectedMods.Value = new[] { gameMod = new TestMod() }); });
 
             AddUntilStep("wait for loader to become current", () => loader.IsCurrentScreen());
             AddStep("mouse in centre", () => InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre));
@@ -201,7 +216,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var testMod = new TestMod();
 
-            AddStep("load player", () => ResetPlayer(true));
+            AddStep("load player", () => resetPlayer(true));
 
             AddUntilStep("wait for loader to become current", () => loader.IsCurrentScreen());
             AddStep("set test mod in loader", () => loader.Mods.Value = new[] { testMod });
@@ -223,7 +238,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestMutedNotificationMuteButton()
         {
-            addVolumeSteps("mute button", () => container.VolumeOverlay.IsMuted.Value = true, () => !container.VolumeOverlay.IsMuted.Value);
+            addVolumeSteps("mute button", () => volumeOverlay.IsMuted.Value = true, () => !volumeOverlay.IsMuted.Value);
         }
 
         /// <remarks>
@@ -236,13 +251,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce).Value = false);
 
-            AddStep("load player", () => ResetPlayer(false, beforeLoad));
+            AddStep("load player", () => resetPlayer(false, beforeLoad));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
 
-            AddAssert("check for notification", () => container.NotificationOverlay.UnreadCount.Value == 1);
+            AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == 1);
             AddStep("click notification", () =>
             {
-                var scrollContainer = (OsuScrollContainer)container.NotificationOverlay.Children.Last();
+                var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
                 var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
                 var notification = flowContainer.First();
 
@@ -260,7 +275,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestEpilepsyWarning(bool warning)
         {
             AddStep("change epilepsy warning", () => epilepsyWarning = warning);
-            AddStep("load dummy beatmap", () => ResetPlayer(false));
+            AddStep("load dummy beatmap", () => resetPlayer(false));
 
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
 
@@ -277,7 +292,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestEpilepsyWarningEarlyExit()
         {
             AddStep("set epilepsy warning", () => epilepsyWarning = true);
-            AddStep("load dummy beatmap", () => ResetPlayer(false));
+            AddStep("load dummy beatmap", () => resetPlayer(false));
 
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
 
@@ -287,42 +302,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("sound volume restored", () => Beatmap.Value.Track.AggregateVolume.Value == 1);
         }
 
-        private class TestPlayerLoaderContainer : Container
-        {
-            [Cached]
-            public readonly NotificationOverlay NotificationOverlay;
-
-            [Cached]
-            public readonly VolumeOverlay VolumeOverlay;
-
-            public TestPlayerLoaderContainer(IScreen screen)
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                OsuScreenStack stack;
-
-                InternalChildren = new Drawable[]
-                {
-                    stack = new OsuScreenStack
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    NotificationOverlay = new NotificationOverlay
-                    {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                    },
-                    VolumeOverlay = new VolumeOverlay
-                    {
-                        Anchor = Anchor.TopLeft,
-                        Origin = Anchor.TopLeft,
-                    }
-                };
-
-                stack.Push(screen);
-            }
-        }
-
         private class TestPlayerLoader : PlayerLoader
         {
             public new VisualSettings VisualSettings => base.VisualSettings;

From 8da40ce2dc8904b4d9937f6b179eb77cd988a455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Nov 2020 19:42:08 +0100
Subject: [PATCH 06249/10326] Reduce duplication by extracting
 ModEasyWithExtraLives

---
 osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs  | 49 +-----------------
 osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs  | 49 +-----------------
 osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs      | 49 +-----------------
 .../Rulesets/Mods/ModEasyWithExtraLives.cs    | 50 +++++++++++++++++++
 4 files changed, 53 insertions(+), 144 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/ModEasyWithExtraLives.cs

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs b/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
index 88d20d15e2..16ef56d845 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
@@ -1,59 +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 Humanizer;
-using osu.Framework.Bindables;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
-    public class CatchModEasy : ModEasy, IApplicableFailOverride, IApplicableToHealthProcessor
+    public class CatchModEasy : ModEasyWithExtraLives
     {
         public override string Description => @"Larger fruits, more forgiving HP drain, less accuracy required, and three lives!";
-
-        [SettingSource("Extra Lives", "Number of extra lives")]
-        public Bindable<int> Retries { get; } = new BindableInt(2)
-        {
-            MinValue = 0,
-            MaxValue = 10
-        };
-        public override string SettingDescription => Retries.IsDefault ? string.Empty : $"{"lives".ToQuantity(Retries.Value)}";
-
-        private int retries;
-
-        private BindableNumber<double> health;
-
-        public override void ReadFromDifficulty(BeatmapDifficulty difficulty)
-        {
-        }
-
-        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
-        {
-            const float ratio = 0.5f;
-            difficulty.CircleSize *= ratio;
-            difficulty.ApproachRate *= ratio;
-            difficulty.DrainRate *= ratio;
-            difficulty.OverallDifficulty *= ratio;
-
-            retries = Retries.Value;
-        }
-        public bool PerformFail()
-        {
-            if (retries == 0) return true;
-
-            health.Value = health.MaxValue;
-            retries--;
-
-            return false;
-        }
-        public bool RestartOnFail => false;
-
-        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
-        {
-            health = healthProcessor.Health.GetBoundCopy();
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs
index 79073b26ba..4093aeb2a7 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs
@@ -1,59 +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 Humanizer;
-using osu.Framework.Bindables;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModEasy : ModEasy, IApplicableFailOverride, IApplicableToHealthProcessor
+    public class ManiaModEasy : ModEasyWithExtraLives
     {
         public override string Description => @"More forgiving HP drain, less accuracy required, and three lives!";
-
-        [SettingSource("Extra Lives", "Number of extra lives")]
-        public Bindable<int> Retries { get; } = new BindableInt(2)
-        {
-            MinValue = 0,
-            MaxValue = 10
-        };
-        public override string SettingDescription => Retries.IsDefault ? string.Empty : $"{"lives".ToQuantity(Retries.Value)}";
-
-        private int retries;
-
-        private BindableNumber<double> health;
-
-        public override void ReadFromDifficulty(BeatmapDifficulty difficulty)
-        {
-        }
-
-        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
-        {
-            const float ratio = 0.5f;
-            difficulty.CircleSize *= ratio;
-            difficulty.ApproachRate *= ratio;
-            difficulty.DrainRate *= ratio;
-            difficulty.OverallDifficulty *= ratio;
-
-            retries = Retries.Value;
-        }
-        public bool PerformFail()
-        {
-            if (retries == 0) return true;
-
-            health.Value = health.MaxValue;
-            retries--;
-
-            return false;
-        }
-        public bool RestartOnFail => false;
-
-        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
-        {
-            health = healthProcessor.Health.GetBoundCopy();
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs b/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs
index 43ceddd6e1..06b5b6cfb8 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModEasy.cs
@@ -1,59 +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 Humanizer;
-using osu.Framework.Bindables;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModEasy : ModEasy, IApplicableFailOverride, IApplicableToHealthProcessor
+    public class OsuModEasy : ModEasyWithExtraLives
     {
         public override string Description => @"Larger circles, more forgiving HP drain, less accuracy required, and three lives!";
-
-        [SettingSource("Extra Lives", "Number of extra lives")]
-        public Bindable<int> Retries { get; } = new BindableInt(2)
-        {
-            MinValue = 0,
-            MaxValue = 10
-        };
-        public override string SettingDescription => Retries.IsDefault ? string.Empty : $"{"lives".ToQuantity(Retries.Value)}";
-
-        private int retries;
-
-        private BindableNumber<double> health;
-
-        public override void ReadFromDifficulty(BeatmapDifficulty difficulty)
-        {
-        }
-
-        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
-        {
-            const float ratio = 0.5f;
-            difficulty.CircleSize *= ratio;
-            difficulty.ApproachRate *= ratio;
-            difficulty.DrainRate *= ratio;
-            difficulty.OverallDifficulty *= ratio;
-
-            retries = Retries.Value;
-        }
-        public bool PerformFail()
-        {
-            if (retries == 0) return true;
-
-            health.Value = health.MaxValue;
-            retries--;
-
-            return false;
-        }
-        public bool RestartOnFail => false;
-
-        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
-        {
-            health = healthProcessor.Health.GetBoundCopy();
-        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModEasyWithExtraLives.cs b/osu.Game/Rulesets/Mods/ModEasyWithExtraLives.cs
new file mode 100644
index 0000000000..2ac0f59d84
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModEasyWithExtraLives.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 Humanizer;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModEasyWithExtraLives : ModEasy, IApplicableFailOverride, IApplicableToHealthProcessor
+    {
+        [SettingSource("Extra Lives", "Number of extra lives")]
+        public Bindable<int> Retries { get; } = new BindableInt(2)
+        {
+            MinValue = 0,
+            MaxValue = 10
+        };
+
+        public override string SettingDescription => Retries.IsDefault ? string.Empty : $"{"lives".ToQuantity(Retries.Value)}";
+
+        private int retries;
+
+        private BindableNumber<double> health;
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            base.ApplyToDifficulty(difficulty);
+            retries = Retries.Value;
+        }
+
+        public bool PerformFail()
+        {
+            if (retries == 0) return true;
+
+            health.Value = health.MaxValue;
+            retries--;
+
+            return false;
+        }
+
+        public bool RestartOnFail => false;
+
+        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
+        {
+            health = healthProcessor.Health.GetBoundCopy();
+        }
+    }
+}

From e88920442c7f3a2ce09b17d346737018c54bbb8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Nov 2020 20:01:10 +0100
Subject: [PATCH 06250/10326] Use HitStateUpdateTime instead

---
 osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index f1f72c8618..328c4e547b 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private void applyCustomUpdateState(DrawableHitObject hitObject, ArmedState state)
         {
             if (state == ArmedState.Miss)
-                missFadeTime.Value ??= hitObject.StateUpdateTime;
+                missFadeTime.Value ??= hitObject.HitStateUpdateTime;
         }
 
         private void onIsHittingChanged(ValueChangedEvent<bool> isHitting)

From 80d81c30440594e4aa92d62812504086f82a95da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Nov 2020 20:24:04 +0100
Subject: [PATCH 06251/10326] Reword taiko easy mod description to fit others
 better

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index 0ec24412e9..d1ad4c9d8d 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModEasy : ModEasy
     {
-        public override string Description => @"Beats move slower, less accuracy required!";
+        public override string Description => @"Beats move slower, and less accuracy required!";
     }
 }

From 21f29e28e2a11f33b702c3dfbe92d5da32a92b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Nov 2020 20:36:56 +0100
Subject: [PATCH 06252/10326] Add clarification comment

---
 osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
index 328c4e547b..8902d82f33 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
@@ -119,6 +119,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         private void applyCustomUpdateState(DrawableHitObject hitObject, ArmedState state)
         {
+            // ensure that the hold note is also faded out when the head/tail/any tick is missed.
             if (state == ArmedState.Miss)
                 missFadeTime.Value ??= hitObject.HitStateUpdateTime;
         }

From c6618f08aad3b47cc69ef73153966a5f384b580c Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Mon, 16 Nov 2020 21:26:08 +0100
Subject: [PATCH 06253/10326] Fix slider control point connections not being
 updated

---
 .../PathControlPointConnectionPiece.cs        | 12 +++++++++-
 .../Components/PathControlPointVisualiser.cs  | 24 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
index ba1d35c35c..45c4a61ce1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
@@ -20,7 +20,17 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         private readonly Path path;
         private readonly Slider slider;
-        private readonly int controlPointIndex;
+        private int controlPointIndex;
+
+        public int ControlPointIndex
+        {
+            get => controlPointIndex;
+            set
+            {
+                controlPointIndex = value;
+                updateConnectingPath();
+            }
+        }
 
         private IBindable<Vector2> sliderPosition;
         private IBindable<int> pathVersion;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 17541866ec..14ce0e065b 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -66,6 +66,17 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             switch (e.Action)
             {
                 case NotifyCollectionChangedAction.Add:
+                    // If inserting in the the path (not appending),
+                    // update indices of existing connections after insert location
+                    if (e.NewStartingIndex < Pieces.Count)
+                    {
+                        foreach (var connection in Connections)
+                        {
+                            if (connection.ControlPointIndex >= e.NewStartingIndex)
+                                connection.ControlPointIndex += e.NewItems.Count;
+                        }
+                    }
+
                     for (int i = 0; i < e.NewItems.Count; i++)
                     {
                         var point = (PathControlPoint)e.NewItems[i];
@@ -82,12 +93,25 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     break;
 
                 case NotifyCollectionChangedAction.Remove:
+                    int oldSize = Pieces.Count;
+
                     foreach (var point in e.OldItems.Cast<PathControlPoint>())
                     {
                         Pieces.RemoveAll(p => p.ControlPoint == point);
                         Connections.RemoveAll(c => c.ControlPoint == point);
                     }
 
+                    // If removing before the end of the path,
+                    // update indices of connections after remove location
+                    if (e.OldStartingIndex + e.OldItems.Count < oldSize)
+                    {
+                        foreach (var connection in Connections)
+                        {
+                            if (connection.ControlPointIndex >= e.OldStartingIndex)
+                                connection.ControlPointIndex -= e.OldItems.Count;
+                        }
+                    }
+
                     break;
             }
         }

From 009d666241fb7adfd1c1f11d7603478dbd9166b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Nov 2020 10:57:11 +0900
Subject: [PATCH 06254/10326] Use dictionary to avoid linq overhead

---
 osu.Game/Database/UserLookupCache.cs | 36 +++++++++++++++++++---------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index ba7f2ad98e..05d6930992 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -45,15 +45,13 @@ namespace osu.Game.Database
 
         private void performLookup()
         {
-            // userTasks may exceed 50 elements, indicating the existence of duplicate user IDs. All duplicated user IDs must be fulfilled.
-            // userIds contains at most 50 unique user IDs from userTasks, which is used to perform the lookup.
-            var userTasks = new List<(int id, TaskCompletionSource<User> task)>();
-            var userIds = new HashSet<int>();
+            // contains at most 50 unique user IDs from userTasks, which is used to perform the lookup.
+            var userTasks = new Dictionary<int, List<TaskCompletionSource<User>>>();
 
             // Grab at most 50 unique user IDs from the queue.
             lock (taskAssignmentLock)
             {
-                while (pendingUserTasks.Count > 0 && userIds.Count < 50)
+                while (pendingUserTasks.Count > 0 && userTasks.Count < 50)
                 {
                     (int id, TaskCompletionSource<User> task) next = pendingUserTasks.Dequeue();
 
@@ -62,14 +60,16 @@ namespace osu.Game.Database
                         next.task.SetResult(existing);
                     else
                     {
-                        userTasks.Add(next);
-                        userIds.Add(next.id);
+                        if (userTasks.TryGetValue(next.id, out var tasks))
+                            tasks.Add(next.task);
+                        else
+                            userTasks[next.id] = new List<TaskCompletionSource<User>> { next.task };
                     }
                 }
             }
 
             // Query the users.
-            var request = new GetUsersRequest(userIds.ToArray());
+            var request = new GetUsersRequest(userTasks.Keys.ToArray());
 
             // rather than queueing, we maintain our own single-threaded request stream.
             api.Perform(request);
@@ -82,9 +82,23 @@ namespace osu.Game.Database
                     createNewTask();
             }
 
-            // Notify of completion.
-            foreach (var (id, task) in userTasks)
-                task.SetResult(request.Result?.Users?.FirstOrDefault(u => u.Id == id));
+            foreach (var user in request.Result.Users)
+            {
+                if (userTasks.TryGetValue(user.Id, out var tasks))
+                {
+                    foreach (var task in tasks)
+                        task.SetResult(user);
+
+                    userTasks.Remove(user.Id);
+                }
+            }
+
+            // if any tasks remain which were not satisfied, return null.
+            foreach (var tasks in userTasks.Values)
+            {
+                foreach (var task in tasks)
+                    task.SetResult(null);
+            }
         }
 
         private void createNewTask() => pendingRequestTask = Task.Run(performLookup);

From 33c643e36907d0c5830b1a13118c58d0b816ff11 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Nov 2020 12:23:34 +0900
Subject: [PATCH 06255/10326] Add obsoletion for unused property

---
 osu.Game/Graphics/Backgrounds/Triangles.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index 5b0fa44444..a81dbbb64a 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -60,6 +60,7 @@ namespace osu.Game.Graphics.Backgrounds
         /// <summary>
         /// Whether we want to expire triangles as they exit our draw area completely.
         /// </summary>
+        [Obsolete("Unused.")] // Can be removed 20210518
         protected virtual bool ExpireOffScreenTriangles => true;
 
         /// <summary>

From 3bcf9c255a483a9936671b5c4acadc0e7b475d5a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Nov 2020 13:06:30 +0900
Subject: [PATCH 06256/10326] Add Triangles.Reset()

---
 osu.Game/Graphics/Backgrounds/Triangles.cs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index a81dbbb64a..0e9382279a 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -87,12 +87,9 @@ namespace osu.Game.Graphics.Backgrounds
         /// </summary>
         public float Velocity = 1;
 
-        private readonly Random stableRandom;
-
-        private float nextRandom() => (float)(stableRandom?.NextDouble() ?? RNG.NextSingle());
-
         private readonly SortedList<TriangleParticle> parts = new SortedList<TriangleParticle>(Comparer<TriangleParticle>.Default);
 
+        private Random stableRandom;
         private IShader shader;
         private readonly Texture texture;
 
@@ -173,7 +170,20 @@ namespace osu.Game.Graphics.Backgrounds
             }
         }
 
-        protected int AimCount;
+        /// <summary>
+        /// Clears and re-initialises triangles according to a given seed.
+        /// </summary>
+        /// <param name="seed">An optional seed to stabilise random positions / attributes. Note that this does not guarantee stable playback when seeking in time.</param>
+        public void Reset(int? seed = null)
+        {
+            if (seed != null)
+                stableRandom = new Random(seed.Value);
+
+            parts.Clear();
+            addTriangles(true);
+        }
+
+        protected int AimCount { get; private set; }
 
         private void addTriangles(bool randomY)
         {
@@ -227,6 +237,8 @@ namespace osu.Game.Graphics.Backgrounds
             }
         }
 
+        private float nextRandom() => (float)(stableRandom?.NextDouble() ?? RNG.NextSingle());
+
         protected override DrawNode CreateDrawNode() => new TrianglesDrawNode(this);
 
         private class TrianglesDrawNode : DrawNode

From c101f32db8a796f08f21d317ffb5aef8310f8d14 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Nov 2020 13:06:52 +0900
Subject: [PATCH 06257/10326] Reset osu! triangle pieces on hitobject
 application

---
 .../Objects/Drawables/Pieces/CirclePiece.cs   | 28 ++++++++++++++--
 .../Objects/Drawables/Pieces/ExplodePiece.cs  | 32 ++++++++++++++++++-
 .../Drawables/Pieces/TrianglesPiece.cs        |  1 +
 3 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
index c455c66e8d..d0e1055dce 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
@@ -13,6 +13,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     public class CirclePiece : CompositeDrawable
     {
+        [Resolved]
+        private DrawableHitObject drawableObject { get; set; }
+
+        private TrianglesPiece triangles;
+
         public CirclePiece()
         {
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
@@ -26,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         }
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures, DrawableHitObject drawableHitObject)
+        private void load(TextureStore textures)
         {
             InternalChildren = new Drawable[]
             {
@@ -36,13 +41,32 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     Origin = Anchor.Centre,
                     Texture = textures.Get(@"Gameplay/osu/disc"),
                 },
-                new TrianglesPiece(drawableHitObject.GetHashCode())
+                triangles = new TrianglesPiece
                 {
                     RelativeSizeAxes = Axes.Both,
                     Blending = BlendingParameters.Additive,
                     Alpha = 0.5f,
                 }
             };
+
+            drawableObject.HitObjectApplied += onHitObjectApplied;
+            onHitObjectApplied(drawableObject);
+        }
+
+        private void onHitObjectApplied(DrawableHitObject obj)
+        {
+            if (obj.HitObject == null)
+                return;
+
+            triangles.Reset((int)obj.HitObject.StartTime);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (drawableObject != null)
+                drawableObject.HitObjectApplied -= onHitObjectApplied;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ExplodePiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
index 6381ddca69..09299a3622 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
@@ -1,14 +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.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     public class ExplodePiece : Container
     {
+        [Resolved]
+        private DrawableHitObject drawableObject { get; set; }
+
+        private TrianglesPiece triangles;
+
         public ExplodePiece()
         {
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
@@ -18,13 +25,36 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             Blending = BlendingParameters.Additive;
             Alpha = 0;
+        }
 
-            Child = new TrianglesPiece
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = triangles = new TrianglesPiece
             {
                 Blending = BlendingParameters.Additive,
                 RelativeSizeAxes = Axes.Both,
                 Alpha = 0.2f,
             };
+
+            drawableObject.HitObjectApplied += onHitObjectApplied;
+            onHitObjectApplied(drawableObject);
+        }
+
+        private void onHitObjectApplied(DrawableHitObject obj)
+        {
+            if (obj.HitObject == null)
+                return;
+
+            triangles.Reset((int)obj.HitObject.StartTime);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (drawableObject != null)
+                drawableObject.HitObjectApplied -= onHitObjectApplied;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs
index add62192f0..53dc7ecea3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs
@@ -7,6 +7,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     public class TrianglesPiece : Triangles
     {
+        protected override bool CreateNewTriangles => false;
         protected override float SpawnRatio => 0.5f;
 
         public TrianglesPiece(int? seed = null)

From 77942af3a653aa3f8672d44f5370e56236c03df6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Nov 2020 13:37:58 +0900
Subject: [PATCH 06258/10326] Fix hold note judgements displaying incorrectly

---
 .../Objects/Drawables/DrawableHoldNoteTick.cs                 | 2 --
 osu.Game.Rulesets.Mania/UI/Column.cs                          | 2 +-
 osu.Game.Rulesets.Mania/UI/Stage.cs                           | 4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
index f265419aa0..98931dceed 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     /// </summary>
     public class DrawableHoldNoteTick : DrawableManiaHitObject<HoldNoteTick>
     {
-        public override bool DisplayResult => false;
-
         /// <summary>
         /// References the time at which the user started holding the hold note.
         /// </summary>
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index c28a1c13d8..9aabcc6699 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Mania.UI
             if (result.IsHit)
                 hitPolicy.HandleHit(judgedObject);
 
-            if (!result.IsHit || !DisplayJudgements.Value)
+            if (!result.IsHit || !judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
             HitObjectArea.Explosions.Add(hitExplosionPool.Get(e => e.Apply(result)));
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index e7a2de266d..3d7960ffe3 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -167,6 +167,10 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
+            // Tick judgements should not display text.
+            if (judgedObject is DrawableHoldNoteTick)
+                return;
+
             judgements.Clear(false);
             judgements.Add(judgementPool.Get(j =>
             {

From 9dfa4249e059f68a54677625fb05227a401de745 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Nov 2020 14:05:13 +0900
Subject: [PATCH 06259/10326] Make Apply non-virtual

---
 .../Objects/Drawables/DrawableOsuJudgement.cs   | 17 ++++++-----------
 .../Rulesets/Judgements/DrawableJudgement.cs    |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 98898ce1b4..5bf5f89b26 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -39,23 +39,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             });
         }
 
-        public override void Apply(JudgementResult result, DrawableHitObject judgedObject)
-        {
-            base.Apply(result, judgedObject);
-
-            if (judgedObject?.HitObject is OsuHitObject osuObject)
-            {
-                Position = osuObject.StackedPosition;
-                Scale = new Vector2(osuObject.Scale);
-            }
-        }
-
         protected override void PrepareForUse()
         {
             base.PrepareForUse();
 
             Lighting.ResetAnimation();
             Lighting.SetColourFrom(JudgedObject, Result);
+
+            if (JudgedObject?.HitObject is OsuHitObject osuObject)
+            {
+                Position = osuObject.StackedPosition;
+                Scale = new Vector2(osuObject.Scale);
+            }
         }
 
         private double fadeOutDelay;
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index d24c81536e..5c617aaa98 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Judgements
             this.Delay(FadeOutDelay).FadeOut(400);
         }
 
-        public virtual void Apply([NotNull] JudgementResult result, [CanBeNull] DrawableHitObject judgedObject)
+        public void Apply([NotNull] JudgementResult result, [CanBeNull] DrawableHitObject judgedObject)
         {
             Result = result;
             JudgedObject = judgedObject;

From 82c3925a3795345d74d95f48fa4ebd2dd6e23f4f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Nov 2020 14:13:50 +0900
Subject: [PATCH 06260/10326] Remove unused DrawableOsuJudgement constructors

---
 .../Objects/Drawables/DrawableOsuJudgement.cs            | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 5bf5f89b26..d89a613e0f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -17,15 +17,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [Resolved]
         private OsuConfigManager config { get; set; }
 
-        public DrawableOsuJudgement(JudgementResult result, DrawableHitObject judgedObject)
-            : base(result, judgedObject)
-        {
-        }
-
-        public DrawableOsuJudgement()
-        {
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {

From f465dd5a5e6f840169c15129ce9698441c0bd82b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Nov 2020 14:59:34 +0900
Subject: [PATCH 06261/10326] Move all extended animation logic out of
 DrawableJudgement

---
 .../UI/DrawableManiaJudgement.cs              | 21 +++---
 .../Objects/Drawables/DrawableOsuJudgement.cs | 18 ++++-
 .../Judgements/DefaultJudgementPiece.cs       | 65 +++++++++++++++++
 .../Rulesets/Judgements/DrawableJudgement.cs  | 69 ++++++++++---------
 .../Judgements/IAnimatableJudgement.cs        | 15 ++++
 5 files changed, 146 insertions(+), 42 deletions(-)
 create mode 100644 osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
 create mode 100644 osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
index d99f6cb8d3..c53ab4a717 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -19,13 +19,6 @@ namespace osu.Game.Rulesets.Mania.UI
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            if (JudgementText != null)
-                JudgementText.Font = JudgementText.Font.With(size: 25);
-        }
-
         protected override double FadeInDuration => 50;
 
         protected override void ApplyHitAnimations()
@@ -36,5 +29,17 @@ namespace osu.Game.Rulesets.Mania.UI
             JudgementBody.Delay(FadeInDuration).ScaleTo(0.75f, 250);
             this.Delay(FadeInDuration).FadeOut(200);
         }
+
+        protected override Drawable CreateDefaultJudgement(HitResult type)
+            => new ManiaJudgementPiece();
+
+        private class ManiaJudgementPiece : DefaultJudgementPiece
+        {
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                JudgementText.Font = JudgementText.Font.With(size: 25);
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index d89a613e0f..a96ec53e28 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -4,9 +4,9 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
-using osuTK;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -65,8 +65,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             fadeOutDelay = hitLightingEnabled ? 1400 : base.FadeOutDelay;
 
-            JudgementText?.TransformSpacingTo(Vector2.Zero).Then().TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint);
             base.ApplyHitAnimations();
         }
+
+        protected override Drawable CreateDefaultJudgement(HitResult type) => new OsuJudgementPiece();
+
+        private class OsuJudgementPiece : DefaultJudgementPiece
+        {
+            public override void PlayAnimation(HitResult resultType)
+            {
+                base.PlayAnimation(resultType);
+
+                if (resultType != HitResult.Miss)
+                    JudgementText.TransformSpacingTo(Vector2.Zero).Then().TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint);
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
new file mode 100644
index 0000000000..051cd755d6
--- /dev/null
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -0,0 +1,65 @@
+// Copyright (c) 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;
+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.Rulesets.Scoring;
+using osuTK;
+
+namespace osu.Game.Rulesets.Judgements
+{
+    public class DefaultJudgementPiece : CompositeDrawable, IAnimatableJudgement
+    {
+        protected SpriteText JudgementText { get; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public DefaultJudgementPiece()
+        {
+            Origin = Anchor.Centre;
+
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                JudgementText = new OsuSpriteText
+                {
+                    Font = OsuFont.Numeric.With(size: 20),
+                    Scale = new Vector2(0.85f, 1),
+                }
+            };
+        }
+
+        public virtual void PlayAnimation(HitResult result)
+        {
+            JudgementText.Text = result.GetDescription().ToUpperInvariant();
+            JudgementText.Colour = colours.ForHitResult(result);
+
+            this.RotateTo(0);
+            this.MoveTo(Vector2.Zero);
+
+            switch (result)
+            {
+                case HitResult.Miss:
+                    this.ScaleTo(1.6f);
+                    this.ScaleTo(1, 100, Easing.In);
+
+                    this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+
+                    this.RotateTo(40, 800, Easing.InQuint);
+                    break;
+
+                default:
+                    this.ScaleTo(0.9f);
+                    this.ScaleTo(1, 500, Easing.OutElastic);
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 5c617aaa98..a73b422ccf 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -3,18 +3,14 @@
 
 using System.Diagnostics;
 using JetBrains.Annotations;
-using osuTK;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Judgements
 {
@@ -25,16 +21,13 @@ namespace osu.Game.Rulesets.Judgements
     {
         private const float judgement_size = 128;
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         public JudgementResult Result { get; private set; }
+
         public DrawableHitObject JudgedObject { get; private set; }
 
         protected Container JudgementBody { get; private set; }
-        protected SpriteText JudgementText { get; private set; }
 
-        private SkinnableDrawable bodyDrawable;
+        private SkinnableDrawable skinnableJudgement;
 
         /// <summary>
         /// Duration of initial fade in.
@@ -69,14 +62,34 @@ namespace osu.Game.Rulesets.Judgements
             prepareDrawables();
         }
 
+        /// <summary>
+        /// Apply top-level animations to the current judgement when successfully hit.
+        /// Generally used for fading, defaulting to a simple fade out based on <see cref="FadeOutDelay"/>.
+        /// This will be used to calculate the lifetime of the judgement.
+        /// </summary>
+        /// <remarks>
+        /// For animating the actual "default skin" judgement itself, it is recommended to use <see cref="CreateDefaultJudgement"/>.
+        /// This allows applying animations which don't affect custom skins.
+        /// </remarks>
         protected virtual void ApplyHitAnimations()
         {
-            JudgementBody.ScaleTo(0.9f);
-            JudgementBody.ScaleTo(1, 500, Easing.OutElastic);
-
             this.Delay(FadeOutDelay).FadeOut(400);
         }
 
+        /// <summary>
+        /// Apply top-level animations to the current judgement when missed.
+        /// Generally used for fading, defaulting to a simple fade out based on <see cref="FadeOutDelay"/>.
+        /// This will be used to calculate the lifetime of the judgement.
+        /// </summary>
+        /// <remarks>
+        /// For animating the actual "default skin" judgement itself, it is recommended to use <see cref="CreateDefaultJudgement"/>.
+        /// This allows applying animations which don't affect custom skins.
+        /// </remarks>
+        protected virtual void ApplyMissAnimations()
+        {
+            this.Delay(600).FadeOut(200);
+        }
+
         public void Apply([NotNull] JudgementResult result, [CanBeNull] DrawableHitObject judgedObject)
         {
             Result = result;
@@ -91,12 +104,9 @@ namespace osu.Game.Rulesets.Judgements
 
             prepareDrawables();
 
-            bodyDrawable.ResetAnimation();
+            skinnableJudgement.ResetAnimation();
 
             this.FadeInFromZero(FadeInDuration, Easing.OutQuint);
-            JudgementBody.ScaleTo(1);
-            JudgementBody.RotateTo(0);
-            JudgementBody.MoveTo(Vector2.Zero);
 
             switch (Result.Type)
             {
@@ -104,13 +114,7 @@ namespace osu.Game.Rulesets.Judgements
                     break;
 
                 case HitResult.Miss:
-                    JudgementBody.ScaleTo(1.6f);
-                    JudgementBody.ScaleTo(1, 100, Easing.In);
-
-                    JudgementBody.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
-                    JudgementBody.RotateTo(40, 800, Easing.InQuint);
-
-                    this.Delay(600).FadeOut(200);
+                    ApplyMissAnimations();
                     break;
 
                 default:
@@ -118,6 +122,12 @@ namespace osu.Game.Rulesets.Judgements
                     break;
             }
 
+            if (skinnableJudgement.Drawable is IAnimatableJudgement animatable)
+            {
+                using (BeginAbsoluteSequence(Result.TimeAbsolute))
+                    animatable.PlayAnimation(Result.Type);
+            }
+
             Expire(true);
         }
 
@@ -139,16 +149,13 @@ namespace osu.Game.Rulesets.Judgements
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
-                Child = bodyDrawable = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ => JudgementText = new OsuSpriteText
-                {
-                    Text = type.GetDescription().ToUpperInvariant(),
-                    Font = OsuFont.Numeric.With(size: 20),
-                    Colour = colours.ForHitResult(type),
-                    Scale = new Vector2(0.85f, 1),
-                }, confineMode: ConfineMode.NoScaling)
+                Child = skinnableJudgement = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ =>
+                    CreateDefaultJudgement(type), confineMode: ConfineMode.NoScaling)
             });
 
             currentDrawableType = type;
         }
+
+        protected virtual Drawable CreateDefaultJudgement(HitResult type) => new DefaultJudgementPiece();
     }
 }
diff --git a/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs b/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs
new file mode 100644
index 0000000000..3f84e6f83c
--- /dev/null
+++ b/osu.Game/Rulesets/Judgements/IAnimatableJudgement.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.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Judgements
+{
+    /// <summary>
+    /// A skinnable judgement element which supports playing an animation from the current point in time.
+    /// </summary>
+    public interface IAnimatableJudgement
+    {
+        void PlayAnimation(HitResult result);
+    }
+}

From e4f1e52422931ec11939a497b1db2e425be1ebce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Nov 2020 15:03:26 +0900
Subject: [PATCH 06262/10326] Add xmldoc coverage of Apply()

---
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index a73b422ccf..724b4a4d4e 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -90,6 +90,11 @@ namespace osu.Game.Rulesets.Judgements
             this.Delay(600).FadeOut(200);
         }
 
+        /// <summary>
+        /// Associate a new result / object with this judgement. Should be called when retrieving a judgement from a pool.
+        /// </summary>
+        /// <param name="result">The applicable judgement.</param>
+        /// <param name="judgedObject">The drawable object.</param>
         public void Apply([NotNull] JudgementResult result, [CanBeNull] DrawableHitObject judgedObject)
         {
             Result = result;
@@ -104,6 +109,7 @@ namespace osu.Game.Rulesets.Judgements
 
             prepareDrawables();
 
+            // not sure if this should remain going forward.
             skinnableJudgement.ResetAnimation();
 
             this.FadeInFromZero(FadeInDuration, Easing.OutQuint);

From 8247e6ce917053c1e881ef6ce27ce2fcdf3fc456 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Nov 2020 15:43:54 +0900
Subject: [PATCH 06263/10326] Move result type to ctor

---
 .../UI/DrawableManiaJudgement.cs              |  9 +++++++--
 .../Objects/Drawables/DrawableOsuJudgement.cs | 13 ++++++++----
 .../Judgements/DefaultJudgementPiece.cs       | 20 ++++++++++++-------
 .../Rulesets/Judgements/DrawableJudgement.cs  |  5 +++--
 .../Judgements/IAnimatableJudgement.cs        |  4 +---
 5 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
index c53ab4a717..ebce40a785 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
@@ -30,14 +30,19 @@ namespace osu.Game.Rulesets.Mania.UI
             this.Delay(FadeInDuration).FadeOut(200);
         }
 
-        protected override Drawable CreateDefaultJudgement(HitResult type)
-            => new ManiaJudgementPiece();
+        protected override Drawable CreateDefaultJudgement(HitResult result) => new ManiaJudgementPiece(result);
 
         private class ManiaJudgementPiece : DefaultJudgementPiece
         {
+            public ManiaJudgementPiece(HitResult result)
+                : base(result)
+            {
+            }
+
             protected override void LoadComplete()
             {
                 base.LoadComplete();
+
                 JudgementText.Font = JudgementText.Font.With(size: 25);
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index a96ec53e28..47fb53379f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -68,15 +68,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.ApplyHitAnimations();
         }
 
-        protected override Drawable CreateDefaultJudgement(HitResult type) => new OsuJudgementPiece();
+        protected override Drawable CreateDefaultJudgement(HitResult result) => new OsuJudgementPiece(result);
 
         private class OsuJudgementPiece : DefaultJudgementPiece
         {
-            public override void PlayAnimation(HitResult resultType)
+            public OsuJudgementPiece(HitResult result)
+                : base(result)
             {
-                base.PlayAnimation(resultType);
+            }
 
-                if (resultType != HitResult.Miss)
+            public override void PlayAnimation()
+            {
+                base.PlayAnimation();
+
+                if (Result != HitResult.Miss)
                     JudgementText.TransformSpacingTo(Vector2.Zero).Then().TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint);
             }
         }
diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index 051cd755d6..3b9e5e948a 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -15,36 +15,42 @@ namespace osu.Game.Rulesets.Judgements
 {
     public class DefaultJudgementPiece : CompositeDrawable, IAnimatableJudgement
     {
-        protected SpriteText JudgementText { get; }
+        protected readonly HitResult Result;
+
+        protected SpriteText JudgementText { get; private set; }
 
         [Resolved]
         private OsuColour colours { get; set; }
 
-        public DefaultJudgementPiece()
+        public DefaultJudgementPiece(HitResult result)
         {
+            this.Result = result;
             Origin = Anchor.Centre;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             AutoSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
             {
                 JudgementText = new OsuSpriteText
                 {
+                    Text = Result.GetDescription().ToUpperInvariant(),
+                    Colour = colours.ForHitResult(Result),
                     Font = OsuFont.Numeric.With(size: 20),
                     Scale = new Vector2(0.85f, 1),
                 }
             };
         }
 
-        public virtual void PlayAnimation(HitResult result)
+        public virtual void PlayAnimation()
         {
-            JudgementText.Text = result.GetDescription().ToUpperInvariant();
-            JudgementText.Colour = colours.ForHitResult(result);
-
             this.RotateTo(0);
             this.MoveTo(Vector2.Zero);
 
-            switch (result)
+            switch (Result)
             {
                 case HitResult.Miss:
                     this.ScaleTo(1.6f);
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 724b4a4d4e..468b3190b0 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Judgements
             if (skinnableJudgement.Drawable is IAnimatableJudgement animatable)
             {
                 using (BeginAbsoluteSequence(Result.TimeAbsolute))
-                    animatable.PlayAnimation(Result.Type);
+                    animatable.PlayAnimation();
             }
 
             Expire(true);
@@ -143,6 +143,7 @@ namespace osu.Game.Rulesets.Judgements
         {
             var type = Result?.Type ?? HitResult.Perfect; //TODO: better default type from ruleset
 
+            // todo: this should be removed once judgements are always pooled.
             if (type == currentDrawableType)
                 return;
 
@@ -162,6 +163,6 @@ namespace osu.Game.Rulesets.Judgements
             currentDrawableType = type;
         }
 
-        protected virtual Drawable CreateDefaultJudgement(HitResult type) => new DefaultJudgementPiece();
+        protected virtual Drawable CreateDefaultJudgement(HitResult result) => new DefaultJudgementPiece(result);
     }
 }
diff --git a/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs b/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs
index 3f84e6f83c..3d5bbe6dad 100644
--- a/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/IAnimatableJudgement.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.Judgements
 {
     /// <summary>
@@ -10,6 +8,6 @@ namespace osu.Game.Rulesets.Judgements
     /// </summary>
     public interface IAnimatableJudgement
     {
-        void PlayAnimation(HitResult result);
+        void PlayAnimation();
     }
 }

From dd4b69feab226c09c7334f407431add26828832f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Nov 2020 15:44:15 +0900
Subject: [PATCH 06264/10326] Add legacy judgement implementation which doesn't
 transform on animations

---
 osu.Game/Skinning/LegacyJudgementPiece.cs | 58 +++++++++++++++++++++++
 osu.Game/Skinning/LegacySkin.cs           | 37 +++++++++------
 2 files changed, 81 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game/Skinning/LegacyJudgementPiece.cs

diff --git a/osu.Game/Skinning/LegacyJudgementPiece.cs b/osu.Game/Skinning/LegacyJudgementPiece.cs
new file mode 100644
index 0000000000..6c606c638d
--- /dev/null
+++ b/osu.Game/Skinning/LegacyJudgementPiece.cs
@@ -0,0 +1,58 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+
+namespace osu.Game.Skinning
+{
+    public class LegacyJudgementPiece : CompositeDrawable, IAnimatableJudgement
+    {
+        private readonly HitResult result;
+
+        public LegacyJudgementPiece(HitResult result, Drawable texture)
+        {
+            this.result = result;
+
+            AutoSizeAxes = Axes.Both;
+            Origin = Anchor.Centre;
+
+            InternalChild = texture;
+        }
+
+        public virtual void PlayAnimation()
+        {
+            var animation = InternalChild as IFramedAnimation;
+
+            animation?.GotoFrame(0);
+
+            this.RotateTo(0);
+            this.MoveTo(Vector2.Zero);
+
+            // legacy judgements don't play any transforms if they are an animation.
+            if (animation?.FrameCount > 1)
+                return;
+
+            switch (result)
+            {
+                case HitResult.Miss:
+                    this.ScaleTo(1.6f);
+                    this.ScaleTo(1, 100, Easing.In);
+
+                    this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+
+                    this.RotateTo(40, 800, Easing.InQuint);
+                    break;
+
+                default:
+                    this.ScaleTo(0.9f);
+                    this.ScaleTo(1, 500, Easing.OutElastic);
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index fb020f4e39..ca8bb58023 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -371,20 +371,9 @@ namespace osu.Game.Skinning
                 }
 
                 case GameplaySkinComponent<HitResult> resultComponent:
-                    switch (resultComponent.Component)
-                    {
-                        case HitResult.Miss:
-                            return this.GetAnimation("hit0", true, false);
-
-                        case HitResult.Meh:
-                            return this.GetAnimation("hit50", true, false);
-
-                        case HitResult.Ok:
-                            return this.GetAnimation("hit100", true, false);
-
-                        case HitResult.Great:
-                            return this.GetAnimation("hit300", true, false);
-                    }
+                    var drawable = getJudgementAnimation(resultComponent.Component);
+                    if (drawable != null)
+                        return new LegacyJudgementPiece(resultComponent.Component, drawable);
 
                     break;
             }
@@ -392,6 +381,26 @@ namespace osu.Game.Skinning
             return this.GetAnimation(component.LookupName, false, false);
         }
 
+        private Drawable getJudgementAnimation(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.Miss:
+                    return this.GetAnimation("hit0", true, false);
+
+                case HitResult.Meh:
+                    return this.GetAnimation("hit50", true, false);
+
+                case HitResult.Ok:
+                    return this.GetAnimation("hit100", true, false);
+
+                case HitResult.Great:
+                    return this.GetAnimation("hit300", true, false);
+            }
+
+            return null;
+        }
+
         public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
         {
             foreach (var name in getFallbackNames(componentName))

From eebce1f9145813b525400517e170d3931a1f8de9 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 17 Nov 2020 18:13:32 +0900
Subject: [PATCH 06265/10326] Fix TestSceneFruitObjects

---
 .../TestSceneFruitObjects.cs                  | 61 +++++++++++++++----
 1 file changed, 49 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 385d8ed7fa..e9dabd30ed 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Objects;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -36,17 +37,29 @@ namespace osu.Game.Rulesets.Catch.Tests
                 Scale = 1.5f,
             };
 
-            return new DrawableTinyDroplet(droplet)
+            return new TestDrawableTinyDroplet(droplet)
             {
                 Anchor = Anchor.Centre,
                 RelativePositionAxes = Axes.None,
                 Position = Vector2.Zero,
-                Alpha = 1,
-                LifetimeStart = double.NegativeInfinity,
-                LifetimeEnd = double.PositiveInfinity,
             };
         }
 
+        private class TestDrawableTinyDroplet : DrawableTinyDroplet
+        {
+            public TestDrawableTinyDroplet(TinyDroplet tinyDroplet)
+                : base(tinyDroplet)
+            {
+            }
+
+            protected override void OnApply(HitObject hitObject)
+            {
+                base.OnApply(hitObject);
+                LifetimeStart = double.NegativeInfinity;
+                LifetimeEnd = double.PositiveInfinity;
+            }
+        }
+
         private Drawable createDrawableDroplet(bool hyperdash = false)
         {
             var droplet = new TestCatchDroplet
@@ -55,17 +68,29 @@ namespace osu.Game.Rulesets.Catch.Tests
                 HyperDashTarget = hyperdash ? new Banana() : null
             };
 
-            return new DrawableDroplet(droplet)
+            return new TestDrawableDroplet(droplet)
             {
                 Anchor = Anchor.Centre,
                 RelativePositionAxes = Axes.None,
                 Position = Vector2.Zero,
-                Alpha = 1,
-                LifetimeStart = double.NegativeInfinity,
-                LifetimeEnd = double.PositiveInfinity,
             };
         }
 
+        private class TestDrawableDroplet : DrawableDroplet
+        {
+            public TestDrawableDroplet(Droplet droplet)
+                : base(droplet)
+            {
+            }
+
+            protected override void OnApply(HitObject hitObject)
+            {
+                base.OnApply(hitObject);
+                LifetimeStart = double.NegativeInfinity;
+                LifetimeEnd = double.PositiveInfinity;
+            }
+        }
+
         private Drawable createDrawable(FruitVisualRepresentation rep, bool hyperdash = false)
         {
             Fruit fruit = new TestCatchFruit(rep)
@@ -74,17 +99,29 @@ namespace osu.Game.Rulesets.Catch.Tests
                 HyperDashTarget = hyperdash ? new Banana() : null
             };
 
-            return new DrawableFruit(fruit)
+            return new TestDrawableFruit(fruit)
             {
                 Anchor = Anchor.Centre,
                 RelativePositionAxes = Axes.None,
                 Position = Vector2.Zero,
-                Alpha = 1,
-                LifetimeStart = double.NegativeInfinity,
-                LifetimeEnd = double.PositiveInfinity,
             };
         }
 
+        private class TestDrawableFruit : DrawableFruit
+        {
+            public TestDrawableFruit(Fruit fruit)
+                : base(fruit)
+            {
+            }
+
+            protected override void OnApply(HitObject hitObject)
+            {
+                base.OnApply(hitObject);
+                LifetimeStart = double.NegativeInfinity;
+                LifetimeEnd = double.PositiveInfinity;
+            }
+        }
+
         public class TestCatchFruit : Fruit
         {
             public TestCatchFruit(FruitVisualRepresentation rep)

From 809338a28002c1bed4223b890560dd50662f0f37 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 17 Nov 2020 20:19:12 +0800
Subject: [PATCH 06266/10326] Init Import screen

---
 osu.Game/Screens/Import/FileImportScreen.cs | 318 ++++++++++++++++++++
 osu.Game/Screens/Menu/ButtonSystem.cs       |   2 +
 osu.Game/Screens/Menu/MainMenu.cs           |   4 +-
 3 files changed, 323 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Import/FileImportScreen.cs

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
new file mode 100644
index 0000000000..669c26101c
--- /dev/null
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -0,0 +1,318 @@
+using System.IO;
+using System.Threading.Tasks;
+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.Platform;
+using osu.Framework.Screens;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK;
+using osu.Game.Overlays.Settings;
+using osu.Game.Configuration;
+using osu.Game.Overlays;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.Containers;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Import
+{
+    public class FileImportScreen : OsuScreen
+    {
+        private Container contentContainer;
+        private FileSelector fileSelector;
+        private Container fileSelectContainer;
+
+        public override bool HideOverlaysOnEnter => true;
+
+        private string[] fileExtensions = { ".foo" };
+        private string defaultPath;
+
+        private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
+        private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
+        private readonly Bindable<FileFilterType> filterType = new Bindable<FileFilterType>(FileFilterType.All);
+        private TextFlowContainer currentFileText;
+        private OsuScrollContainer fileNameScroll;
+        private readonly OverlayColourProvider overlayColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+        [Resolved]
+        private OsuGameBase gameBase { get; set; }
+
+        [Resolved]
+        private DialogOverlay dialogOverlay { get; set; }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(Storage storage)
+        {
+            storage.GetStorageForDirectory("imports");
+            var originalPath = storage.GetFullPath("imports", true);
+
+            defaultPath = originalPath;
+
+            InternalChild = contentContainer = new Container
+            {
+                Masking = true,
+                CornerRadius = 10,
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(0.9f, 0.8f),
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = overlayColourProvider.Background5,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    fileSelectContainer = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Width = 0.65f,
+                        Anchor = Anchor.TopLeft,
+                        Origin = Anchor.TopLeft,
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Width = 0.35f,
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Masking = true,
+                        CornerRadius = 10,
+                        Children = new Drawable[]
+                        {
+                            new GridContainer
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(),
+                                    new Dimension(GridSizeMode.AutoSize),
+                                },
+                                Content = new[]
+                                {
+                                    new Drawable[]
+                                    {
+                                        new Container
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Anchor = Anchor.TopCentre,
+                                            Origin = Anchor.TopCentre,
+                                            Children = new Drawable[]
+                                            {
+                                                new Box
+                                                {
+                                                    Colour = overlayColourProvider.Background3,
+                                                    RelativeSizeAxes = Axes.Both
+                                                },
+                                                fileNameScroll = new OsuScrollContainer
+                                                {
+                                                    Masking = false,
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Child = currentFileText = new TextFlowContainer(t => t.Font = OsuFont.Default.With(size: 30))
+                                                    {
+                                                        AutoSizeAxes = Axes.Y,
+                                                        RelativeSizeAxes = Axes.X,
+                                                        Anchor = Anchor.Centre,
+                                                        Origin = Anchor.Centre,
+                                                        TextAnchor = Anchor.Centre
+                                                    },
+                                                },
+                                            }
+                                        },
+                                    },
+                                    new Drawable[]
+                                    {
+                                        new Container
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Children = new Drawable[]
+                                            {
+                                                new Box
+                                                {
+                                                    Colour = overlayColourProvider.Background4,
+                                                    RelativeSizeAxes = Axes.Both
+                                                },
+                                                new FillFlowContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Spacing = new Vector2(10),
+                                                    Children = new Drawable[]
+                                                    {
+                                                        new SettingsEnumDropdown<FileFilterType>
+                                                        {
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            LabelText = "File Type",
+                                                            Current = filterType,
+                                                            Margin = new MarginPadding { Bottom = 15 }
+                                                        },
+                                                        new GridContainer
+                                                        {
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            AutoSizeAxes = Axes.Y,
+                                                            RelativeSizeAxes = Axes.X,
+                                                            Margin = new MarginPadding { Top = 15 },
+                                                            RowDimensions = new[]
+                                                            {
+                                                                new Dimension(GridSizeMode.AutoSize)
+                                                            },
+                                                            Content = new[]
+                                                            {
+                                                                new Drawable[]
+                                                                {
+                                                                    new TriangleButton
+                                                                    {
+                                                                        Anchor = Anchor.BottomCentre,
+                                                                        Origin = Anchor.BottomCentre,
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Height = 50,
+                                                                        Width = 0.9f,
+                                                                        Text = "Refresh",
+                                                                        Action = refresh
+                                                                    },
+                                                                    new TriangleButton
+                                                                    {
+                                                                        Text = "Import",
+                                                                        Anchor = Anchor.BottomCentre,
+                                                                        Origin = Anchor.BottomCentre,
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Height = 50,
+                                                                        Width = 0.9f,
+                                                                        Action = () =>
+                                                                        {
+                                                                            var d = currentFile.Value?.FullName;
+                                                                            if (d != null)
+                                                                                startImport(d);
+                                                                            else
+                                                                                currentFileText.FlashColour(Color4.Red, 500);
+                                                                        },
+                                                                    }
+                                                                },
+                                                            }
+                                                        },
+                                                    }
+                                                },
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                        }
+                    }
+                }
+            };
+
+            fileNameScroll.ScrollContent.Anchor = Anchor.Centre;
+            fileNameScroll.ScrollContent.Origin = Anchor.Centre;
+
+            currentFile.BindValueChanged(updateFileSelectionText, true);
+            currentDirectory.BindValueChanged(_ =>
+            {
+                currentFile.Value = null;
+            });
+
+            filterType.BindValueChanged(onFilterTypeChanged, true);
+        }
+
+        private void onFilterTypeChanged(ValueChangedEvent<FileFilterType> v)
+        {
+            switch (v.NewValue)
+            {
+                case FileFilterType.Beatmap:
+                    fileExtensions = new string[] { ".osz" };
+                    break;
+
+                case FileFilterType.Skin:
+                    fileExtensions = new string[] { ".osk" };
+                    break;
+
+                case FileFilterType.Replay:
+                    fileExtensions = new string[] { ".osr" };
+                    break;
+
+                default:
+                case FileFilterType.All:
+                    fileExtensions = new string[] { ".osk", ".osr", ".osz" };
+                    break;
+            }
+
+            refresh();
+        }
+
+        private void refresh()
+        {
+            currentFile.UnbindBindings();
+            currentDirectory.UnbindBindings();
+
+            fileSelector?.Expire();
+
+            var directory = currentDirectory.Value?.FullName ?? defaultPath;
+            fileSelector = new FileSelector(initialPath: directory, validFileExtensions: fileExtensions)
+            {
+                RelativeSizeAxes = Axes.Both
+            };
+
+            currentDirectory.BindTo(fileSelector.CurrentPath);
+            currentFile.BindTo(fileSelector.CurrentFile);
+
+            fileSelectContainer.Add(fileSelector);
+        }
+
+        private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)
+        {
+            currentFileText.Text = v.NewValue?.Name ?? "Select a file";
+        }
+
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            contentContainer.FadeOut().Then().ScaleTo(0.8f).RotateTo(-15).MoveToX(300)
+                            .Then()
+                            .ScaleTo(1, 1500, Easing.OutElastic)
+                            .FadeIn(500)
+                            .MoveToX(0, 500, Easing.OutQuint)
+                            .RotateTo(0, 500, Easing.OutQuint);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            contentContainer.ScaleTo(0.8f, 500, Easing.OutExpo).RotateTo(-15, 500, Easing.OutExpo).MoveToX(300, 500, Easing.OutQuint).FadeOut(500);
+            this.FadeOut(500, Easing.OutExpo);
+
+            return base.OnExiting(next);
+        }
+
+        private void startImport(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                return;
+
+            if (!File.Exists(path))
+            {
+                refresh();
+                currentFileText.Text = "File not exist";
+                currentFileText.FlashColour(Color4.Red, 500);
+                return;
+            }
+
+            string[] paths = { path };
+
+            Task.Factory.StartNew(() => gameBase.Import(paths), TaskCreationOptions.LongRunning);
+        }
+
+        public enum FileFilterType
+        {
+            Skin,
+            Beatmap,
+            Replay,
+            All
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 4becdd58cd..1e0d27ac6a 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Screens.Menu
         public Action OnExit;
         public Action OnBeatmapListing;
         public Action OnSolo;
+        public Action OnImportButton;
         public Action OnSettings;
         public Action OnMulti;
         public Action OnChart;
@@ -131,6 +132,7 @@ namespace osu.Game.Screens.Menu
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
             buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
+            buttonsTopLevel.Add(new Button(@"Import File", @"button-generic-select", FontAwesome.Solid.File, new Color4(0, 86, 73, 255), () => OnImportButton?.Invoke()));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index c3ecd75963..69e4ea487e 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -19,6 +19,7 @@ using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Import;
 
 namespace osu.Game.Screens.Menu
 {
@@ -105,6 +106,7 @@ namespace osu.Game.Screens.Menu
                             },
                             OnSolo = onSolo,
                             OnMulti = delegate { this.Push(new Multiplayer()); },
+                            OnImportButton = onImport,
                             OnExit = confirmAndExit,
                         }
                     }
@@ -144,7 +146,7 @@ namespace osu.Game.Screens.Menu
 
         [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
-
+        private void onImport() => this.Push(new FileImportScreen());
         private void confirmAndExit()
         {
             if (exitConfirmed) return;

From dcaebd2621a34055c4d8a68e27e21c7a0056c04d Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 17 Nov 2020 21:39:29 +0800
Subject: [PATCH 06267/10326] Add license text

---
 osu.Game/Screens/Import/FileImportScreen.cs | 4 +++-
 osu.Game/Screens/Menu/ButtonSystem.cs       | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 669c26101c..bcbc87e8cc 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.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.
+
 using System.IO;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
@@ -11,7 +14,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK;
 using osu.Game.Overlays.Settings;
-using osu.Game.Configuration;
 using osu.Game.Overlays;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.Containers;
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 1e0d27ac6a..1722329c21 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -132,7 +132,10 @@ namespace osu.Game.Screens.Menu
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
             buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
-            buttonsTopLevel.Add(new Button(@"Import File", @"button-generic-select", FontAwesome.Solid.File, new Color4(0, 86, 73, 255), () => OnImportButton?.Invoke()));
+            if(RuntimeInfo.OS == RuntimeInfo.Platform.Android)
+            {
+                buttonsTopLevel.Add(new Button(@"Import File", @"button-generic-select", FontAwesome.Solid.File, new Color4(0, 86, 73, 255), () => OnImportButton?.Invoke()));
+            }        
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));

From 58c8184ad7f7b008d001a048cfcbf998f14e1423 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Nov 2020 22:56:21 +0900
Subject: [PATCH 06268/10326] Define blueprint order similarly to hitobjects

---
 .../Compose/Components/BlueprintContainer.cs  |  6 +-
 .../Components/SelectionBlueprintContainer.cs | 76 +++++++++++++++++++
 .../Timeline/TimelineBlueprintContainer.cs    |  6 +-
 3 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBlueprintContainer.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 53b6e14940..3aaa0c7d89 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -118,8 +118,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        protected virtual Container<SelectionBlueprint> CreateSelectionBlueprintContainer() =>
-            new Container<SelectionBlueprint> { RelativeSizeAxes = Axes.Both };
+        protected virtual SelectionBlueprintContainer CreateSelectionBlueprintContainer() =>
+            new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
 
         /// <summary>
         /// Creates a <see cref="Components.SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
@@ -338,7 +338,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether a selection was performed.</returns>
         private bool beginClickSelection(MouseButtonEvent e)
         {
-            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
+            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren.Reverse())
             {
                 if (!blueprint.IsHovered) continue;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBlueprintContainer.cs
new file mode 100644
index 0000000000..54932f6252
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBlueprintContainer.cs
@@ -0,0 +1,76 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Edit;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class SelectionBlueprintContainer : Container<SelectionBlueprint>
+    {
+        public override void Add(SelectionBlueprint drawable)
+        {
+            base.Add(drawable);
+
+            if (Content == this)
+                bindStartTime(drawable);
+        }
+
+        public override bool Remove(SelectionBlueprint drawable)
+        {
+            if (!base.Remove(drawable))
+                return false;
+
+            if (Content == this)
+                unbindStartTime(drawable);
+            return true;
+        }
+
+        public override void Clear(bool disposeChildren)
+        {
+            base.Clear(disposeChildren);
+            unbindAllStartTimes();
+        }
+
+        private readonly Dictionary<SelectionBlueprint, IBindable> startTimeMap = new Dictionary<SelectionBlueprint, IBindable>();
+
+        private void bindStartTime(SelectionBlueprint blueprint)
+        {
+            var bindable = blueprint.HitObject.StartTimeBindable.GetBoundCopy();
+
+            bindable.BindValueChanged(_ =>
+            {
+                if (LoadState >= LoadState.Ready)
+                    SortInternal();
+            });
+
+            startTimeMap[blueprint] = bindable;
+        }
+
+        private void unbindStartTime(SelectionBlueprint blueprint)
+        {
+            startTimeMap[blueprint].UnbindAll();
+            startTimeMap.Remove(blueprint);
+        }
+
+        private void unbindAllStartTimes()
+        {
+            foreach (var kvp in startTimeMap)
+                kvp.Value.UnbindAll();
+            startTimeMap.Clear();
+        }
+
+        protected override int Compare(Drawable x, Drawable y)
+        {
+            if (!(x is SelectionBlueprint xObj) || !(y is SelectionBlueprint yObj))
+                return base.Compare(x, y);
+
+            // Put earlier blueprints towards the end of the list, so they handle input first
+            int i = yObj.HitObject.StartTime.CompareTo(xObj.HitObject.StartTime);
+            return i == 0 ? CompareReverseChildID(x, y) : i;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index eef02e61a6..2bd4ac2f91 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        protected override Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
+        protected override SelectionBlueprintContainer CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
 
         protected override void OnDrag(DragEvent e)
         {
@@ -195,13 +195,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        protected class TimelineSelectionBlueprintContainer : Container<SelectionBlueprint>
+        protected class TimelineSelectionBlueprintContainer : SelectionBlueprintContainer
         {
             protected override Container<SelectionBlueprint> Content { get; }
 
             public TimelineSelectionBlueprintContainer()
             {
-                AddInternal(new TimelinePart<SelectionBlueprint>(Content = new Container<SelectionBlueprint> { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
+                AddInternal(new TimelinePart<SelectionBlueprint>(Content = new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
             }
         }
     }

From 04805b78c31718a451737bd78b090e96e39a3859 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Nov 2020 23:19:59 +0900
Subject: [PATCH 06269/10326] Tighten osu! ruleset lifetime expiry for past
 hitobjects

---
 .../Objects/Drawables/DrawableHitCircle.cs       |  2 ++
 .../Objects/Drawables/DrawableOsuHitObject.cs    |  5 +++++
 .../Objects/Drawables/DrawableSlider.cs          | 16 ++++++++--------
 .../Objects/Drawables/DrawableSpinner.cs         |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 2e63160d36..d1ceca6d8f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -180,6 +180,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     this.Delay(800).FadeOut();
                     break;
             }
+
+            Expire();
         }
 
         public Drawable ProxiedLayer => ApproachCircle;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index bcaf73d34f..c962d191a6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
@@ -91,6 +92,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             // Manually set to reduce the number of future alive objects to a bare minimum.
             LifetimeStart = HitObject.StartTime - HitObject.TimePreempt;
+
+            // Arbitrary lifetime end to prevent past objects in idle states remaining alive in non-frame-stable contexts.
+            // An extra 1000ms is added to always overestimate the true lifetime, and a more exact value is set by hit transforms and the following expiry.
+            LifetimeEnd = HitObject.GetEndTime() + HitObject.HitWindows.WindowFor(HitResult.Miss) + 1000;
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index f7b1894058..14c494d909 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -193,13 +193,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             return base.CreateNestedHitObject(hitObject);
         }
 
-        protected override void UpdateInitialTransforms()
-        {
-            base.UpdateInitialTransforms();
-
-            Body.FadeInFromZero(HitObject.TimeFadeIn);
-        }
-
         public readonly Bindable<bool> Tracking = new Bindable<bool>();
 
         protected override void Update()
@@ -273,6 +266,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 base.PlaySamples();
         }
 
+        protected override void UpdateInitialTransforms()
+        {
+            base.UpdateInitialTransforms();
+
+            Body.FadeInFromZero(HitObject.TimeFadeIn);
+        }
+
         protected override void UpdateStartTimeStateTransforms()
         {
             base.UpdateStartTimeStateTransforms();
@@ -297,7 +297,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     break;
             }
 
-            this.FadeOut(fade_out_time, Easing.OutQuint);
+            this.FadeOut(fade_out_time, Easing.OutQuint).Expire();
         }
 
         public Drawable ProxiedLayer => HeadCircle.ProxiedLayer;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 87c7146a64..2a14a7c975 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateHitStateTransforms(state);
 
-            this.FadeOut(160);
+            this.FadeOut(160).Expire();
 
             // skin change does a rewind of transforms, which will stop the spinning sound from playing if it's currently in playback.
             isSpinning?.TriggerChange();

From ce4baf328dba51f3f5006bbc69f0ad58b9d91dd6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Nov 2020 23:35:36 +0900
Subject: [PATCH 06270/10326] Move into OnApply() to resolve one-frame issues

---
 .../Objects/Drawables/DrawableOsuHitObject.cs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index c962d191a6..a26db06ede 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -61,6 +61,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             PositionBindable.BindTo(HitObject.PositionBindable);
             StackHeightBindable.BindTo(HitObject.StackHeightBindable);
             ScaleBindable.BindTo(HitObject.ScaleBindable);
+
+            // Manually set to reduce the number of future alive objects to a bare minimum.
+            LifetimeStart = HitObject.StartTime - HitObject.TimePreempt;
+
+            // Arbitrary lifetime end to prevent past objects in idle states remaining alive in non-frame-stable contexts.
+            // An extra 1000ms is added to always overestimate the true lifetime, and a more exact value is set by hit transforms and the following expiry.
+            LifetimeEnd = HitObject.GetEndTime() + HitObject.HitWindows.WindowFor(HitResult.Miss) + 1000;
         }
 
         protected override void OnFree(HitObject hitObject)
@@ -86,18 +93,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public virtual void Shake(double maximumLength) => shakeContainer.Shake(maximumLength);
 
-        protected override void UpdateInitialTransforms()
-        {
-            base.UpdateInitialTransforms();
-
-            // Manually set to reduce the number of future alive objects to a bare minimum.
-            LifetimeStart = HitObject.StartTime - HitObject.TimePreempt;
-
-            // Arbitrary lifetime end to prevent past objects in idle states remaining alive in non-frame-stable contexts.
-            // An extra 1000ms is added to always overestimate the true lifetime, and a more exact value is set by hit transforms and the following expiry.
-            LifetimeEnd = HitObject.GetEndTime() + HitObject.HitWindows.WindowFor(HitResult.Miss) + 1000;
-        }
-
         /// <summary>
         /// Causes this <see cref="DrawableOsuHitObject"/> to get missed, disregarding all conditions in implementations of <see cref="DrawableHitObject.CheckForResult"/>.
         /// </summary>

From c360533e4cce0875dbb5175ef6a27bac869759f1 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 17 Nov 2020 23:40:30 +0900
Subject: [PATCH 06271/10326] Simplify code of TestSceneFruitObjects

---
 .../TestSceneFruitObjects.cs                  | 131 ++++--------------
 1 file changed, 24 insertions(+), 107 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index e9dabd30ed..89063319d6 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -6,7 +6,6 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
-using osu.Game.Rulesets.Objects;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -19,107 +18,42 @@ namespace osu.Game.Rulesets.Catch.Tests
             base.LoadComplete();
 
             foreach (FruitVisualRepresentation rep in Enum.GetValues(typeof(FruitVisualRepresentation)))
-                AddStep($"show {rep}", () => SetContents(() => createDrawable(rep)));
+                AddStep($"show {rep}", () => SetContents(() => createDrawableFruit(rep)));
 
             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)));
+                AddStep($"show hyperdash {rep}", () => SetContents(() => createDrawableFruit(rep, true)));
 
             AddStep("show hyperdash droplet", () => SetContents(() => createDrawableDroplet(true)));
         }
 
-        private Drawable createDrawableTinyDroplet()
+        private Drawable createDrawableFruit(FruitVisualRepresentation rep, bool hyperdash = false) =>
+            setProperties(new DrawableFruit(new TestCatchFruit(rep)), hyperdash);
+
+        private Drawable createDrawableDroplet(bool hyperdash = false) => setProperties(new DrawableDroplet(new Droplet()), hyperdash);
+
+        private Drawable createDrawableTinyDroplet() => setProperties(new DrawableTinyDroplet(new TinyDroplet()));
+
+        private DrawableCatchHitObject setProperties(DrawableCatchHitObject d, bool hyperdash = false)
         {
-            var droplet = new TestCatchTinyDroplet
+            var hitObject = d.HitObject;
+            hitObject.StartTime = 1000000000000;
+            hitObject.Scale = 1.5f;
+
+            if (hyperdash)
+                hitObject.HyperDashTarget = new Banana();
+
+            d.Anchor = Anchor.Centre;
+            d.RelativePositionAxes = Axes.None;
+            d.Position = Vector2.Zero;
+            d.HitObjectApplied += _ =>
             {
-                Scale = 1.5f,
+                d.LifetimeStart = double.NegativeInfinity;
+                d.LifetimeEnd = double.PositiveInfinity;
             };
-
-            return new TestDrawableTinyDroplet(droplet)
-            {
-                Anchor = Anchor.Centre,
-                RelativePositionAxes = Axes.None,
-                Position = Vector2.Zero,
-            };
-        }
-
-        private class TestDrawableTinyDroplet : DrawableTinyDroplet
-        {
-            public TestDrawableTinyDroplet(TinyDroplet tinyDroplet)
-                : base(tinyDroplet)
-            {
-            }
-
-            protected override void OnApply(HitObject hitObject)
-            {
-                base.OnApply(hitObject);
-                LifetimeStart = double.NegativeInfinity;
-                LifetimeEnd = double.PositiveInfinity;
-            }
-        }
-
-        private Drawable createDrawableDroplet(bool hyperdash = false)
-        {
-            var droplet = new TestCatchDroplet
-            {
-                Scale = 1.5f,
-                HyperDashTarget = hyperdash ? new Banana() : null
-            };
-
-            return new TestDrawableDroplet(droplet)
-            {
-                Anchor = Anchor.Centre,
-                RelativePositionAxes = Axes.None,
-                Position = Vector2.Zero,
-            };
-        }
-
-        private class TestDrawableDroplet : DrawableDroplet
-        {
-            public TestDrawableDroplet(Droplet droplet)
-                : base(droplet)
-            {
-            }
-
-            protected override void OnApply(HitObject hitObject)
-            {
-                base.OnApply(hitObject);
-                LifetimeStart = double.NegativeInfinity;
-                LifetimeEnd = double.PositiveInfinity;
-            }
-        }
-
-        private Drawable createDrawable(FruitVisualRepresentation rep, bool hyperdash = false)
-        {
-            Fruit fruit = new TestCatchFruit(rep)
-            {
-                Scale = 1.5f,
-                HyperDashTarget = hyperdash ? new Banana() : null
-            };
-
-            return new TestDrawableFruit(fruit)
-            {
-                Anchor = Anchor.Centre,
-                RelativePositionAxes = Axes.None,
-                Position = Vector2.Zero,
-            };
-        }
-
-        private class TestDrawableFruit : DrawableFruit
-        {
-            public TestDrawableFruit(Fruit fruit)
-                : base(fruit)
-            {
-            }
-
-            protected override void OnApply(HitObject hitObject)
-            {
-                base.OnApply(hitObject);
-                LifetimeStart = double.NegativeInfinity;
-                LifetimeEnd = double.PositiveInfinity;
-            }
+            return d;
         }
 
         public class TestCatchFruit : Fruit
@@ -127,26 +61,9 @@ namespace osu.Game.Rulesets.Catch.Tests
             public TestCatchFruit(FruitVisualRepresentation rep)
             {
                 VisualRepresentation = rep;
-                StartTime = 1000000000000;
             }
 
             public override FruitVisualRepresentation VisualRepresentation { get; }
         }
-
-        public class TestCatchDroplet : Droplet
-        {
-            public TestCatchDroplet()
-            {
-                StartTime = 1000000000000;
-            }
-        }
-
-        public class TestCatchTinyDroplet : TinyDroplet
-        {
-            public TestCatchTinyDroplet()
-            {
-                StartTime = 1000000000000;
-            }
-        }
     }
 }

From 875d7dec7999f96e03c9454ce256d283ff299286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Nov 2020 20:11:13 +0100
Subject: [PATCH 06272/10326] Remove redundant `this.` qualifier

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

diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index 3b9e5e948a..7fe3917893 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Judgements
 
         public DefaultJudgementPiece(HitResult result)
         {
-            this.Result = result;
+            Result = result;
             Origin = Anchor.Centre;
         }
 

From 57eaee27aec1110f869c9ca5f25262bede0e0188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Nov 2020 20:12:04 +0100
Subject: [PATCH 06273/10326] Rename param to match type better

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

diff --git a/osu.Game/Skinning/LegacyJudgementPiece.cs b/osu.Game/Skinning/LegacyJudgementPiece.cs
index 6c606c638d..3def37e22c 100644
--- a/osu.Game/Skinning/LegacyJudgementPiece.cs
+++ b/osu.Game/Skinning/LegacyJudgementPiece.cs
@@ -14,14 +14,14 @@ namespace osu.Game.Skinning
     {
         private readonly HitResult result;
 
-        public LegacyJudgementPiece(HitResult result, Drawable texture)
+        public LegacyJudgementPiece(HitResult result, Drawable drawable)
         {
             this.result = result;
 
             AutoSizeAxes = Axes.Both;
             Origin = Anchor.Centre;
 
-            InternalChild = texture;
+            InternalChild = drawable;
         }
 
         public virtual void PlayAnimation()

From c8fb49d540d4876fb3b7800c4159da6f5239fe24 Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Tue, 17 Nov 2020 22:23:46 +0100
Subject: [PATCH 06274/10326] Apply suggestions and remove redundant
 updateConnectingPath call

---
 .../PathControlPointConnectionPiece.cs           | 16 +++-------------
 .../Components/PathControlPointVisualiser.cs     |  6 ++----
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
index 45c4a61ce1..eb7011e8b0 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
@@ -20,17 +20,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         private readonly Path path;
         private readonly Slider slider;
-        private int controlPointIndex;
-
-        public int ControlPointIndex
-        {
-            get => controlPointIndex;
-            set
-            {
-                controlPointIndex = value;
-                updateConnectingPath();
-            }
-        }
+        public int ControlPointIndex { get; set; }
 
         private IBindable<Vector2> sliderPosition;
         private IBindable<int> pathVersion;
@@ -38,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         public PathControlPointConnectionPiece(Slider slider, int controlPointIndex)
         {
             this.slider = slider;
-            this.controlPointIndex = controlPointIndex;
+            ControlPointIndex = controlPointIndex;
 
             Origin = Anchor.Centre;
             AutoSizeAxes = Axes.Both;
@@ -74,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             path.ClearVertices();
 
-            int nextIndex = controlPointIndex + 1;
+            int nextIndex = ControlPointIndex + 1;
             if (nextIndex == 0 || nextIndex >= slider.Path.ControlPoints.Count)
                 return;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 14ce0e065b..e551be4af3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             switch (e.Action)
             {
                 case NotifyCollectionChangedAction.Add:
-                    // If inserting in the the path (not appending),
+                    // If inserting in the path (not appending),
                     // update indices of existing connections after insert location
                     if (e.NewStartingIndex < Pieces.Count)
                     {
@@ -93,8 +93,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     break;
 
                 case NotifyCollectionChangedAction.Remove:
-                    int oldSize = Pieces.Count;
-
                     foreach (var point in e.OldItems.Cast<PathControlPoint>())
                     {
                         Pieces.RemoveAll(p => p.ControlPoint == point);
@@ -103,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
                     // If removing before the end of the path,
                     // update indices of connections after remove location
-                    if (e.OldStartingIndex + e.OldItems.Count < oldSize)
+                    if (e.OldStartingIndex + e.OldItems.Count < Pieces.Count + e.OldItems.Count)
                     {
                         foreach (var connection in Connections)
                         {

From 2d66423fbdc37cba19f675897297a8efa2131784 Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Tue, 17 Nov 2020 23:04:38 +0100
Subject: [PATCH 06275/10326] Simplify inequality

---
 .../Blueprints/Sliders/Components/PathControlPointVisualiser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index e551be4af3..7375c0e981 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
                     // If removing before the end of the path,
                     // update indices of connections after remove location
-                    if (e.OldStartingIndex + e.OldItems.Count < Pieces.Count + e.OldItems.Count)
+                    if (e.OldStartingIndex < Pieces.Count)
                     {
                         foreach (var connection in Connections)
                         {

From 783c172b5de26e53b1ff0982f8f49a9bcd7bbad1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 18 Nov 2020 13:33:22 +0900
Subject: [PATCH 06276/10326] Make sealed and cleanup comparator

---
 .../Edit/Compose/Components/BlueprintContainer.cs   |  3 +--
 ...ner.cs => HitObjectOrderedSelectionContainer.cs} | 13 +++++--------
 .../Timeline/TimelineBlueprintContainer.cs          |  6 +++---
 3 files changed, 9 insertions(+), 13 deletions(-)
 rename osu.Game/Screens/Edit/Compose/Components/{SelectionBlueprintContainer.cs => HitObjectOrderedSelectionContainer.cs} (85%)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 3aaa0c7d89..4b98d42c7c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -118,8 +118,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        protected virtual SelectionBlueprintContainer CreateSelectionBlueprintContainer() =>
-            new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
+        protected virtual Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both };
 
         /// <summary>
         /// Creates a <see cref="Components.SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
similarity index 85%
rename from osu.Game/Screens/Edit/Compose/Components/SelectionBlueprintContainer.cs
rename to osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
index 54932f6252..ae50b0fd61 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
@@ -9,14 +9,12 @@ using osu.Game.Rulesets.Edit;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
-    public class SelectionBlueprintContainer : Container<SelectionBlueprint>
+    public sealed class HitObjectOrderedSelectionContainer : Container<SelectionBlueprint>
     {
         public override void Add(SelectionBlueprint drawable)
         {
             base.Add(drawable);
-
-            if (Content == this)
-                bindStartTime(drawable);
+            bindStartTime(drawable);
         }
 
         public override bool Remove(SelectionBlueprint drawable)
@@ -24,8 +22,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (!base.Remove(drawable))
                 return false;
 
-            if (Content == this)
-                unbindStartTime(drawable);
+            unbindStartTime(drawable);
             return true;
         }
 
@@ -65,8 +62,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override int Compare(Drawable x, Drawable y)
         {
-            if (!(x is SelectionBlueprint xObj) || !(y is SelectionBlueprint yObj))
-                return base.Compare(x, y);
+            var xObj = (SelectionBlueprint)x;
+            var yObj = (SelectionBlueprint)y;
 
             // Put earlier blueprints towards the end of the list, so they handle input first
             int i = yObj.HitObject.StartTime.CompareTo(xObj.HitObject.StartTime);
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 2bd4ac2f91..2f14c607c2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        protected override SelectionBlueprintContainer CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
+        protected override Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
 
         protected override void OnDrag(DragEvent e)
         {
@@ -195,13 +195,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        protected class TimelineSelectionBlueprintContainer : SelectionBlueprintContainer
+        protected class TimelineSelectionBlueprintContainer : Container<SelectionBlueprint>
         {
             protected override Container<SelectionBlueprint> Content { get; }
 
             public TimelineSelectionBlueprintContainer()
             {
-                AddInternal(new TimelinePart<SelectionBlueprint>(Content = new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
+                AddInternal(new TimelinePart<SelectionBlueprint>(Content = new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
             }
         }
     }

From f00c23b4a07367179d67c7291e1305f1ca01ab3d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 18 Nov 2020 13:37:15 +0900
Subject: [PATCH 06277/10326] Add comment + xmldoc

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs     | 1 +
 .../Compose/Components/HitObjectOrderedSelectionContainer.cs  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 4b98d42c7c..df9cadebfc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -337,6 +337,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether a selection was performed.</returns>
         private bool beginClickSelection(MouseButtonEvent e)
         {
+            // Iterate from the top of the input stack (blueprints closest to the front of the screen first).
             foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren.Reverse())
             {
                 if (!blueprint.IsHovered) continue;
diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
index ae50b0fd61..9e95fe4fa1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
@@ -6,9 +6,13 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
+    /// <summary>
+    /// A container for <see cref="SelectionBlueprint"/> ordered by their <see cref="HitObject"/> start times.
+    /// </summary>
     public sealed class HitObjectOrderedSelectionContainer : Container<SelectionBlueprint>
     {
         public override void Add(SelectionBlueprint drawable)

From efc18887c8182d6414ff2b8efe47c1b4f709525e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 15:51:09 +0900
Subject: [PATCH 06278/10326] Update framework

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

diff --git a/osu.Android.props b/osu.Android.props
index 6e3d5eec1f..4657896fac 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1113.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1118.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index b17611f23f..0feab9a717 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -139,7 +139,7 @@ namespace osu.Desktop
 
                 // SDL2 DesktopWindow
                 case DesktopWindow desktopWindow:
-                    desktopWindow.CursorState.Value |= CursorState.Hidden;
+                    desktopWindow.CursorState |= CursorState.Hidden;
                     desktopWindow.SetIconFromStream(iconStream);
                     desktopWindow.Title = Name;
                     desktopWindow.DragDrop += f => fileDrop(new[] { f });
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1850ee3488..704ac5a611 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1113.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1118.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 2ac23f1503..346bd892b0 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.Framework.iOS" Version="2020.1113.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1118.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1113.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1118.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From bb1aacb360758c2c5e21e172bcb9f1985933a2b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 16:18:27 +0900
Subject: [PATCH 06279/10326] Fix SkinnableSprite initialising a drawable even
 when the texture is not available

---
 osu.Game/Skinning/SkinnableSprite.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinnableSprite.cs b/osu.Game/Skinning/SkinnableSprite.cs
index 5352928ec6..1340d1474c 100644
--- a/osu.Game/Skinning/SkinnableSprite.cs
+++ b/osu.Game/Skinning/SkinnableSprite.cs
@@ -24,7 +24,15 @@ namespace osu.Game.Skinning
         {
         }
 
-        protected override Drawable CreateDefault(ISkinComponent component) => new Sprite { Texture = textures.Get(component.LookupName) };
+        protected override Drawable CreateDefault(ISkinComponent component)
+        {
+            var texture = textures.Get(component.LookupName);
+
+            if (texture == null)
+                return null;
+
+            return new Sprite { Texture = texture };
+        }
 
         private class SpriteComponent : ISkinComponent
         {

From 8be31f4805385708909b4405dd3c2aeb427bda15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Nov 2020 23:55:21 +0900
Subject: [PATCH 06280/10326] Adjust legacy skin judgement transforms to match
 stable

---
 osu.Game/Skinning/LegacyJudgementPiece.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacyJudgementPiece.cs b/osu.Game/Skinning/LegacyJudgementPiece.cs
index 3def37e22c..44aa5106e2 100644
--- a/osu.Game/Skinning/LegacyJudgementPiece.cs
+++ b/osu.Game/Skinning/LegacyJudgementPiece.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Skinning
     {
         private readonly HitResult result;
 
+        private bool hasParticle;
+
         public LegacyJudgementPiece(HitResult result, Drawable drawable)
         {
             this.result = result;
@@ -37,6 +39,8 @@ namespace osu.Game.Skinning
             if (animation?.FrameCount > 1)
                 return;
 
+            const double animation_length = 500;
+
             switch (result)
             {
                 case HitResult.Miss:
@@ -49,8 +53,19 @@ namespace osu.Game.Skinning
                     break;
 
                 default:
-                    this.ScaleTo(0.9f);
-                    this.ScaleTo(1, 500, Easing.OutElastic);
+                    if (!hasParticle)
+                    {
+                        this.ScaleTo(0.6f).Then()
+                            .ScaleTo(1.1f, animation_length * 0.8f).Then()
+                            .ScaleTo(0.9f, animation_length * 0.4f).Then()
+                            .ScaleTo(1f, animation_length * 0.2f);
+                    }
+                    else
+                    {
+                        this.ScaleTo(0.9f);
+                        this.ScaleTo(1.05f, animation_length);
+                    }
+
                     break;
             }
         }

From 5bd4ace37f73cffd0550812e455bb7c3335cf623 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 15:38:26 +0900
Subject: [PATCH 06281/10326] Split out new and old style legacy judgement
 pieces

---
 osu.Game/Skinning/LegacyJudgementPieceNew.cs  | 93 +++++++++++++++++++
 ...entPiece.cs => LegacyJudgementPieceOld.cs} | 31 +++----
 osu.Game/Skinning/LegacySkin.cs               | 30 +++++-
 3 files changed, 133 insertions(+), 21 deletions(-)
 create mode 100644 osu.Game/Skinning/LegacyJudgementPieceNew.cs
 rename osu.Game/Skinning/{LegacyJudgementPiece.cs => LegacyJudgementPieceOld.cs} (61%)

diff --git a/osu.Game/Skinning/LegacyJudgementPieceNew.cs b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
new file mode 100644
index 0000000000..de77df9e10
--- /dev/null
+++ b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
@@ -0,0 +1,93 @@
+// Copyright (c) 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.Animations;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+
+namespace osu.Game.Skinning
+{
+    public class LegacyJudgementPieceNew : CompositeDrawable, IAnimatableJudgement
+    {
+        private readonly HitResult result;
+
+        private readonly LegacyJudgementPieceOld temporaryOldStyle;
+
+        private readonly Drawable mainPiece;
+
+        public LegacyJudgementPieceNew(HitResult result, Func<Drawable> createMainDrawable, Drawable particleDrawable)
+        {
+            this.result = result;
+
+            AutoSizeAxes = Axes.Both;
+            Origin = Anchor.Centre;
+
+            InternalChildren = new[]
+            {
+                mainPiece = createMainDrawable().With(d =>
+                {
+                    d.Anchor = Anchor.Centre;
+                    d.Origin = Anchor.Centre;
+                })
+            };
+
+            if (result != HitResult.Miss)
+            {
+                //new judgement shows old as a temporary effect
+                AddInternal(temporaryOldStyle = new LegacyJudgementPieceOld(result, createMainDrawable, 1.05f)
+                {
+                    Blending = BlendingParameters.Additive,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                });
+            }
+        }
+
+        public void PlayAnimation()
+        {
+            var animation = mainPiece as IFramedAnimation;
+
+            animation?.GotoFrame(0);
+
+            this.RotateTo(0);
+            this.MoveTo(Vector2.Zero);
+
+            if (temporaryOldStyle != null)
+            {
+                temporaryOldStyle.PlayAnimation();
+
+                temporaryOldStyle.Hide();
+                temporaryOldStyle.Delay(-16)
+                                 .FadeTo(0.5f, 56, Easing.Out).Then()
+                                 .FadeOut(300);
+            }
+
+            // legacy judgements don't play any transforms if they are an animation.
+            if (animation?.FrameCount > 1)
+                return;
+
+            switch (result)
+            {
+                case HitResult.Miss:
+                    mainPiece.ScaleTo(1.6f);
+                    mainPiece.ScaleTo(1, 100, Easing.In);
+
+                    mainPiece.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+
+                    mainPiece.RotateTo(40, 800, Easing.InQuint);
+                    break;
+
+                default:
+                    const double animation_length = 1100;
+
+                    mainPiece.ScaleTo(0.9f);
+                    mainPiece.ScaleTo(1.05f, animation_length);
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Skinning/LegacyJudgementPiece.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
similarity index 61%
rename from osu.Game/Skinning/LegacyJudgementPiece.cs
rename to osu.Game/Skinning/LegacyJudgementPieceOld.cs
index 44aa5106e2..63d2c44dd9 100644
--- a/osu.Game/Skinning/LegacyJudgementPiece.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
@@ -10,20 +11,21 @@ using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyJudgementPiece : CompositeDrawable, IAnimatableJudgement
+    public class LegacyJudgementPieceOld : CompositeDrawable, IAnimatableJudgement
     {
         private readonly HitResult result;
 
-        private bool hasParticle;
+        private readonly float finalScale;
 
-        public LegacyJudgementPiece(HitResult result, Drawable drawable)
+        public LegacyJudgementPieceOld(HitResult result, Func<Drawable> createMainDrawable, float finalScale = 1f)
         {
             this.result = result;
+            this.finalScale = finalScale;
 
             AutoSizeAxes = Axes.Both;
             Origin = Anchor.Centre;
 
-            InternalChild = drawable;
+            InternalChild = createMainDrawable();
         }
 
         public virtual void PlayAnimation()
@@ -39,8 +41,6 @@ namespace osu.Game.Skinning
             if (animation?.FrameCount > 1)
                 return;
 
-            const double animation_length = 500;
-
             switch (result)
             {
                 case HitResult.Miss:
@@ -53,19 +53,14 @@ namespace osu.Game.Skinning
                     break;
 
                 default:
-                    if (!hasParticle)
-                    {
-                        this.ScaleTo(0.6f).Then()
-                            .ScaleTo(1.1f, animation_length * 0.8f).Then()
-                            .ScaleTo(0.9f, animation_length * 0.4f).Then()
-                            .ScaleTo(1f, animation_length * 0.2f);
-                    }
-                    else
-                    {
-                        this.ScaleTo(0.9f);
-                        this.ScaleTo(1.05f, animation_length);
-                    }
+                    const double animation_length = 120;
 
+                    this.ScaleTo(0.6f).Then()
+                        .ScaleTo(1.1f, animation_length * 0.8f).Then()
+                        // this is actually correct to match stable; there were overlapping transforms.
+                        .ScaleTo(0.9f).Delay(animation_length * 0.2f)
+                        .ScaleTo(1.1f).ScaleTo(0.9f, animation_length * 0.2f).Then()
+                        .ScaleTo(0.95f).ScaleTo(finalScale, animation_length * 0.2f);
                     break;
             }
         }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index ca8bb58023..ce1a736f0a 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -371,9 +371,16 @@ namespace osu.Game.Skinning
                 }
 
                 case GameplaySkinComponent<HitResult> resultComponent:
-                    var drawable = getJudgementAnimation(resultComponent.Component);
-                    if (drawable != null)
-                        return new LegacyJudgementPiece(resultComponent.Component, drawable);
+                    Func<Drawable> createDrawable = () => getJudgementAnimation(resultComponent.Component);
+
+                    if (createDrawable() != null)
+                    {
+                        var particles = getParticleTexture(resultComponent.Component);
+                        if (particles != null)
+                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, getParticleTexture(resultComponent.Component));
+                        else
+                            return new LegacyJudgementPieceOld(resultComponent.Component, createDrawable);
+                    }
 
                     break;
             }
@@ -381,6 +388,23 @@ namespace osu.Game.Skinning
             return this.GetAnimation(component.LookupName, false, false);
         }
 
+        private Drawable getParticleTexture(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.Meh:
+                    return this.GetAnimation("particle50", false, false);
+
+                case HitResult.Ok:
+                    return this.GetAnimation("particle100", false, false);
+
+                case HitResult.Great:
+                    return this.GetAnimation("particle300", false, false);
+            }
+
+            return null;
+        }
+
         private Drawable getJudgementAnimation(HitResult result)
         {
             switch (result)

From 94886a09b23b2c7d850781eaa20c07b0697a2d3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 15:39:02 +0900
Subject: [PATCH 06282/10326] Remove fades from DrawableJudgement itself

---
 .../UI/DrawableManiaJudgement.cs                   |  7 +++----
 .../Objects/Drawables/DrawableOsuJudgement.cs      | 14 +++-----------
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs  | 11 +++++++----
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
index ebce40a785..a341cdd8ec 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
@@ -19,15 +19,14 @@ namespace osu.Game.Rulesets.Mania.UI
         {
         }
 
-        protected override double FadeInDuration => 50;
-
         protected override void ApplyHitAnimations()
         {
             JudgementBody.ScaleTo(0.8f);
             JudgementBody.ScaleTo(1, 250, Easing.OutElastic);
 
-            JudgementBody.Delay(FadeInDuration).ScaleTo(0.75f, 250);
-            this.Delay(FadeInDuration).FadeOut(200);
+            JudgementBody.Delay(50)
+                         .ScaleTo(0.75f, 250)
+                         .FadeOut(200);
         }
 
         protected override Drawable CreateDefaultJudgement(HitResult result) => new ManiaJudgementPiece(result);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 47fb53379f..90133fb01c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -44,26 +44,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        private double fadeOutDelay;
-        protected override double FadeOutDelay => fadeOutDelay;
-
         protected override void ApplyHitAnimations()
         {
             bool hitLightingEnabled = config.Get<bool>(OsuSetting.HitLighting);
 
             if (hitLightingEnabled)
             {
-                JudgementBody.FadeIn().Delay(FadeInDuration).FadeOut(400);
-
                 Lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
                 Lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
-            }
-            else
-            {
-                JudgementBody.Alpha = 1;
-            }
 
-            fadeOutDelay = hitLightingEnabled ? 1400 : base.FadeOutDelay;
+                // extend the lifetime to cover lighting fade
+                LifetimeEnd = 1400;
+            }
 
             base.ApplyHitAnimations();
         }
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 468b3190b0..09b8353c63 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.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.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -32,11 +33,13 @@ namespace osu.Game.Rulesets.Judgements
         /// <summary>
         /// Duration of initial fade in.
         /// </summary>
+        [Obsolete("Apply any animations manually via ApplyHitAnimations / ApplyMissAnimations. Defaults were moved inside skinned components.")]
         protected virtual double FadeInDuration => 100;
 
         /// <summary>
         /// Duration to wait until fade out begins. Defaults to <see cref="FadeInDuration"/>.
         /// </summary>
+        [Obsolete("Apply any animations manually via ApplyHitAnimations / ApplyMissAnimations. Defaults were moved inside skinned components.")]
         protected virtual double FadeOutDelay => FadeInDuration;
 
         /// <summary>
@@ -73,7 +76,6 @@ namespace osu.Game.Rulesets.Judgements
         /// </remarks>
         protected virtual void ApplyHitAnimations()
         {
-            this.Delay(FadeOutDelay).FadeOut(400);
         }
 
         /// <summary>
@@ -112,8 +114,6 @@ namespace osu.Game.Rulesets.Judgements
             // not sure if this should remain going forward.
             skinnableJudgement.ResetAnimation();
 
-            this.FadeInFromZero(FadeInDuration, Easing.OutQuint);
-
             switch (Result.Type)
             {
                 case HitResult.None:
@@ -134,7 +134,10 @@ namespace osu.Game.Rulesets.Judgements
                     animatable.PlayAnimation();
             }
 
-            Expire(true);
+            JudgementBody.Expire(true);
+
+            LifetimeStart = JudgementBody.LifetimeStart;
+            LifetimeEnd = JudgementBody.LifetimeEnd;
         }
 
         private HitResult? currentDrawableType;

From 25d4511e49d6c7db38eb8e6ab349bbfd2434a56b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 16:09:51 +0900
Subject: [PATCH 06283/10326] Fix judgement test scene always using hitobjects
 at t=0

---
 osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index 646f12f710..7ea2ef3a78 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -89,7 +89,13 @@ namespace osu.Game.Rulesets.Osu.Tests
                         Children = new Drawable[]
                         {
                             pool,
-                            pool.Get(j => j.Apply(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)).With(j =>
+                            pool.Get(j => j.Apply(new JudgementResult(new HitObject
+                            {
+                                StartTime = Time.Current
+                            }, new Judgement())
+                            {
+                                Type = result,
+                            }, null)).With(j =>
                             {
                                 j.Anchor = Anchor.Centre;
                                 j.Origin = Anchor.Centre;

From 72a15ef2dc51f877dd1416128a43af38f2b718fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 15:51:09 +0900
Subject: [PATCH 06284/10326] Handle DrawableJudgement lifetime more flexibly

---
 .../Objects/Drawables/DrawableOsuJudgement.cs |  2 +-
 .../Rulesets/Judgements/DrawableJudgement.cs  | 51 +++++++++++--------
 .../Judgements/IAnimatableJudgement.cs        |  4 +-
 3 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 90133fb01c..b06c55102c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 Lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
 
                 // extend the lifetime to cover lighting fade
-                LifetimeEnd = 1400;
+                LifetimeEnd = Lighting.LatestTransformEndTime;
             }
 
             base.ApplyHitAnimations();
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 09b8353c63..45b3e229f3 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -89,7 +89,6 @@ namespace osu.Game.Rulesets.Judgements
         /// </remarks>
         protected virtual void ApplyMissAnimations()
         {
-            this.Delay(600).FadeOut(200);
         }
 
         /// <summary>
@@ -111,33 +110,43 @@ namespace osu.Game.Rulesets.Judgements
 
             prepareDrawables();
 
-            // not sure if this should remain going forward.
-            skinnableJudgement.ResetAnimation();
+            LifetimeStart = Result.TimeAbsolute;
 
-            switch (Result.Type)
+            using (BeginAbsoluteSequence(Result.TimeAbsolute, true))
             {
-                case HitResult.None:
-                    break;
+                // not sure if this should remain going forward.
+                skinnableJudgement.ResetAnimation();
 
-                case HitResult.Miss:
-                    ApplyMissAnimations();
-                    break;
+                switch (Result.Type)
+                {
+                    case HitResult.None:
+                        break;
 
-                default:
-                    ApplyHitAnimations();
-                    break;
-            }
+                    case HitResult.Miss:
+                        ApplyMissAnimations();
+                        break;
+
+                    default:
+                        ApplyHitAnimations();
+                        break;
+                }
+
+                if (skinnableJudgement.Drawable is IAnimatableJudgement animatable)
+                {
+                    var drawableAnimation = (Drawable)animatable;
+
+                    drawableAnimation.ClearTransforms();
 
-            if (skinnableJudgement.Drawable is IAnimatableJudgement animatable)
-            {
-                using (BeginAbsoluteSequence(Result.TimeAbsolute))
                     animatable.PlayAnimation();
+
+                    drawableAnimation.Expire(true);
+
+                    // a derived version of DrawableJudgement may be adjusting lifetime.
+                    // if not adjusted (or the skinned portion requires greater bounds than calculated) use the skinned source's lifetime.
+                    if (LifetimeEnd == double.MaxValue || drawableAnimation.LifetimeEnd > LifetimeEnd)
+                        LifetimeEnd = drawableAnimation.LifetimeEnd;
+                }
             }
-
-            JudgementBody.Expire(true);
-
-            LifetimeStart = JudgementBody.LifetimeStart;
-            LifetimeEnd = JudgementBody.LifetimeEnd;
         }
 
         private HitResult? currentDrawableType;
diff --git a/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs b/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs
index 3d5bbe6dad..32312f1115 100644
--- a/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs
@@ -1,12 +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;
+
 namespace osu.Game.Rulesets.Judgements
 {
     /// <summary>
     /// A skinnable judgement element which supports playing an animation from the current point in time.
     /// </summary>
-    public interface IAnimatableJudgement
+    public interface IAnimatableJudgement : IDrawable
     {
         void PlayAnimation();
     }

From 9d0a6de26e6039cf87dfd8c64f1f0ffb7f3643d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 16:18:27 +0900
Subject: [PATCH 06285/10326] Fix SkinnableSprite initialising a drawable even
 when the texture is not available

---
 osu.Game/Skinning/SkinnableSprite.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinnableSprite.cs b/osu.Game/Skinning/SkinnableSprite.cs
index 5352928ec6..1340d1474c 100644
--- a/osu.Game/Skinning/SkinnableSprite.cs
+++ b/osu.Game/Skinning/SkinnableSprite.cs
@@ -24,7 +24,15 @@ namespace osu.Game.Skinning
         {
         }
 
-        protected override Drawable CreateDefault(ISkinComponent component) => new Sprite { Texture = textures.Get(component.LookupName) };
+        protected override Drawable CreateDefault(ISkinComponent component)
+        {
+            var texture = textures.Get(component.LookupName);
+
+            if (texture == null)
+                return null;
+
+            return new Sprite { Texture = texture };
+        }
 
         private class SpriteComponent : ISkinComponent
         {

From 9d3de5bca0441ea4b04cab337c9ccdc074b170ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 16:18:58 +0900
Subject: [PATCH 06286/10326] Fix hit lighting dictating lifetime even when not
 present in skin

---
 .../Objects/Drawables/DrawableOsuJudgement.cs          |  2 +-
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs      | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index b06c55102c..c81cfd97dd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             bool hitLightingEnabled = config.Get<bool>(OsuSetting.HitLighting);
 
-            if (hitLightingEnabled)
+            if (hitLightingEnabled && Lighting.Drawable != null)
             {
                 Lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
                 Lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 45b3e229f3..c0fcb1eb3c 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -139,12 +139,14 @@ namespace osu.Game.Rulesets.Judgements
 
                     animatable.PlayAnimation();
 
-                    drawableAnimation.Expire(true);
-
                     // a derived version of DrawableJudgement may be adjusting lifetime.
                     // if not adjusted (or the skinned portion requires greater bounds than calculated) use the skinned source's lifetime.
-                    if (LifetimeEnd == double.MaxValue || drawableAnimation.LifetimeEnd > LifetimeEnd)
-                        LifetimeEnd = drawableAnimation.LifetimeEnd;
+                    double lastTransformTime = drawableAnimation.LatestTransformEndTime;
+
+                    if (LifetimeEnd == double.MaxValue || lastTransformTime > LifetimeEnd)
+                    {
+                        LifetimeEnd = lastTransformTime;
+                    }
                 }
             }
         }

From c47e70da9b4c6ac4ac337221b747f09ce3f5ab9c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 17:15:45 +0900
Subject: [PATCH 06287/10326] Update animations for new/old miss style and add
 fades

---
 .../Judgements/DefaultJudgementPiece.cs       |  8 ++++--
 osu.Game/Skinning/LegacyJudgementPieceNew.cs  | 28 +++++++++++++------
 osu.Game/Skinning/LegacyJudgementPieceOld.cs  | 25 ++++++++++-------
 osu.Game/Skinning/LegacySkin.cs               |  8 +++---
 4 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index 7fe3917893..b89c1f4e4f 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -47,18 +47,18 @@ namespace osu.Game.Rulesets.Judgements
 
         public virtual void PlayAnimation()
         {
-            this.RotateTo(0);
-            this.MoveTo(Vector2.Zero);
-
             switch (Result)
             {
                 case HitResult.Miss:
                     this.ScaleTo(1.6f);
                     this.ScaleTo(1, 100, Easing.In);
 
+                    this.MoveTo(Vector2.Zero);
                     this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
 
+                    this.RotateTo(0);
                     this.RotateTo(40, 800, Easing.InQuint);
+
                     break;
 
                 default:
@@ -66,6 +66,8 @@ namespace osu.Game.Rulesets.Judgements
                     this.ScaleTo(1, 500, Easing.OutElastic);
                     break;
             }
+
+            this.FadeOutFromOne(800);
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacyJudgementPieceNew.cs b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
index de77df9e10..d0a2f1d4eb 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceNew.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
@@ -53,9 +54,14 @@ namespace osu.Game.Skinning
 
             animation?.GotoFrame(0);
 
-            this.RotateTo(0);
-            this.MoveTo(Vector2.Zero);
+            const double fade_in_length = 120;
+            const double fade_out_delay = 500;
+            const double fade_out_length = 600;
 
+            this.FadeInFromZero(fade_in_length);
+            this.Delay(fade_out_delay).FadeOut(fade_out_length);
+
+            // new style non-miss judgements show the original style temporarily, with additive colour.
             if (temporaryOldStyle != null)
             {
                 temporaryOldStyle.PlayAnimation();
@@ -73,19 +79,23 @@ namespace osu.Game.Skinning
             switch (result)
             {
                 case HitResult.Miss:
-                    mainPiece.ScaleTo(1.6f);
-                    mainPiece.ScaleTo(1, 100, Easing.In);
+                    this.ScaleTo(1.6f);
+                    this.ScaleTo(1, 100, Easing.In);
 
-                    mainPiece.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+                    //todo: this only applies to osu! ruleset apparently.
+                    this.MoveTo(new Vector2(0, -2));
+                    this.MoveToOffset(new Vector2(0, 20), fade_out_delay + fade_out_length, Easing.In);
 
-                    mainPiece.RotateTo(40, 800, Easing.InQuint);
+                    float rotation = RNG.NextSingle(-8.6f, 8.6f);
+
+                    this.RotateTo(0);
+                    this.RotateTo(rotation, fade_in_length)
+                        .Then().RotateTo(rotation * 2, fade_out_delay + fade_out_length - fade_in_length, Easing.In);
                     break;
 
                 default:
-                    const double animation_length = 1100;
-
                     mainPiece.ScaleTo(0.9f);
-                    mainPiece.ScaleTo(1.05f, animation_length);
+                    mainPiece.ScaleTo(1.05f, fade_out_delay + fade_out_length);
                     break;
             }
         }
diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index 63d2c44dd9..3486dce081 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -5,9 +5,9 @@ using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -34,8 +34,12 @@ namespace osu.Game.Skinning
 
             animation?.GotoFrame(0);
 
-            this.RotateTo(0);
-            this.MoveTo(Vector2.Zero);
+            const double fade_in_length = 120;
+            const double fade_out_delay = 500;
+            const double fade_out_length = 600;
+
+            this.FadeInFromZero(fade_in_length);
+            this.Delay(fade_out_delay).FadeOut(fade_out_length);
 
             // legacy judgements don't play any transforms if they are an animation.
             if (animation?.FrameCount > 1)
@@ -47,20 +51,21 @@ namespace osu.Game.Skinning
                     this.ScaleTo(1.6f);
                     this.ScaleTo(1, 100, Easing.In);
 
-                    this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+                    float rotation = RNG.NextSingle(-8.6f, 8.6f);
 
-                    this.RotateTo(40, 800, Easing.InQuint);
+                    this.RotateTo(0);
+                    this.RotateTo(rotation, fade_in_length)
+                        .Then().RotateTo(rotation * 2, fade_out_delay + fade_out_length - fade_in_length, Easing.In);
                     break;
 
                 default:
-                    const double animation_length = 120;
 
                     this.ScaleTo(0.6f).Then()
-                        .ScaleTo(1.1f, animation_length * 0.8f).Then()
+                        .ScaleTo(1.1f, fade_in_length * 0.8f).Then()
                         // this is actually correct to match stable; there were overlapping transforms.
-                        .ScaleTo(0.9f).Delay(animation_length * 0.2f)
-                        .ScaleTo(1.1f).ScaleTo(0.9f, animation_length * 0.2f).Then()
-                        .ScaleTo(0.95f).ScaleTo(finalScale, animation_length * 0.2f);
+                        .ScaleTo(0.9f).Delay(fade_in_length * 0.2f)
+                        .ScaleTo(1.1f).ScaleTo(0.9f, fade_in_length * 0.2f).Then()
+                        .ScaleTo(0.95f).ScaleTo(finalScale, fade_in_length * 0.2f);
                     break;
             }
         }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index ce1a736f0a..9fbf3de043 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -373,11 +373,11 @@ namespace osu.Game.Skinning
                 case GameplaySkinComponent<HitResult> resultComponent:
                     Func<Drawable> createDrawable = () => getJudgementAnimation(resultComponent.Component);
 
+                    // kind of wasteful that we throw this away, but should do for now.
                     if (createDrawable() != null)
                     {
-                        var particles = getParticleTexture(resultComponent.Component);
-                        if (particles != null)
-                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, getParticleTexture(resultComponent.Component));
+                        if (Configuration.LegacyVersion > 1)
+                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, getParticleDrawable(resultComponent.Component));
                         else
                             return new LegacyJudgementPieceOld(resultComponent.Component, createDrawable);
                     }
@@ -388,7 +388,7 @@ namespace osu.Game.Skinning
             return this.GetAnimation(component.LookupName, false, false);
         }
 
-        private Drawable getParticleTexture(HitResult result)
+        private Drawable getParticleDrawable(HitResult result)
         {
             switch (result)
             {

From d017e725fb87a1c3b22dfe17809defc002925db7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 17:15:53 +0900
Subject: [PATCH 06288/10326] Add comment for future todo task

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index c81cfd97dd..9699fb72a4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (hitLightingEnabled && Lighting.Drawable != null)
             {
+                // todo: this animation changes slightly based on new/old legacy skin versions.
                 Lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
                 Lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
 

From ee8804b50b86e6d2bb85c18908f715fec0b599f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 17:53:27 +0900
Subject: [PATCH 06289/10326] Fix animation playback not running on skin change

---
 .../Rulesets/Judgements/DrawableJudgement.cs  | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index c0fcb1eb3c..85875e2f2a 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -28,8 +28,13 @@ namespace osu.Game.Rulesets.Judgements
 
         protected Container JudgementBody { get; private set; }
 
+        public override bool RemoveCompletedTransforms => false;
+
         private SkinnableDrawable skinnableJudgement;
 
+        [Resolved]
+        private ISkinSource skinSource { get; set; }
+
         /// <summary>
         /// Duration of initial fade in.
         /// </summary>
@@ -65,6 +70,27 @@ namespace osu.Game.Rulesets.Judgements
             prepareDrawables();
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            skinSource.SourceChanged += onSkinChanged;
+        }
+
+        private void onSkinChanged()
+        {
+            // on a skin change, the child component will update but not get correctly triggered to play its animation.
+            // we need to trigger a reinitialisation to make things right.
+            currentDrawableType = null;
+
+            PrepareForUse();
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            skinSource.SourceChanged -= onSkinChanged;
+        }
+
         /// <summary>
         /// Apply top-level animations to the current judgement when successfully hit.
         /// Generally used for fading, defaulting to a simple fade out based on <see cref="FadeOutDelay"/>.
@@ -110,6 +136,12 @@ namespace osu.Game.Rulesets.Judgements
 
             prepareDrawables();
 
+            runAnimation();
+        }
+
+        private void runAnimation()
+        {
+            ClearTransforms(true);
             LifetimeStart = Result.TimeAbsolute;
 
             using (BeginAbsoluteSequence(Result.TimeAbsolute, true))
@@ -135,18 +167,13 @@ namespace osu.Game.Rulesets.Judgements
                 {
                     var drawableAnimation = (Drawable)animatable;
 
-                    drawableAnimation.ClearTransforms();
-
                     animatable.PlayAnimation();
 
-                    // a derived version of DrawableJudgement may be adjusting lifetime.
+                    // a derived version of DrawableJudgement may be proposing a lifetime.
                     // if not adjusted (or the skinned portion requires greater bounds than calculated) use the skinned source's lifetime.
                     double lastTransformTime = drawableAnimation.LatestTransformEndTime;
-
                     if (LifetimeEnd == double.MaxValue || lastTransformTime > LifetimeEnd)
-                    {
                         LifetimeEnd = lastTransformTime;
-                    }
                 }
             }
         }

From 1fd582d33341c396919d7f23920a18e55a00b982 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 19:12:29 +0900
Subject: [PATCH 06290/10326] Update lighting tests to not require lighting
 (some test skins are missing it)

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index 7ea2ef3a78..b0119edc14 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -43,10 +43,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             showResult(HitResult.Great);
 
             AddUntilStep("judgements shown", () => this.ChildrenOfType<TestDrawableOsuJudgement>().Any());
-            AddAssert("judgement body immediately visible",
-                () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => judgement.JudgementBody.Alpha == 1));
             AddAssert("hit lighting hidden",
-                () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => judgement.Lighting.Alpha == 0));
+                () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => !judgement.Lighting.Transforms.Any()));
         }
 
         [Test]
@@ -57,10 +55,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             showResult(HitResult.Great);
 
             AddUntilStep("judgements shown", () => this.ChildrenOfType<TestDrawableOsuJudgement>().Any());
-            AddAssert("judgement body not immediately visible",
-                () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => judgement.JudgementBody.Alpha > 0 && judgement.JudgementBody.Alpha < 1));
             AddAssert("hit lighting shown",
-                () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => judgement.Lighting.Alpha > 0));
+                () => this.ChildrenOfType<TestDrawableOsuJudgement>().Any(judgement => judgement.Lighting.Transforms.Any()));
         }
 
         private void showResult(HitResult result)

From 9a3dd12f309d2cccb3b50dfc92d2369f62b0f21d Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Wed, 18 Nov 2020 18:15:56 +0800
Subject: [PATCH 06291/10326] Move to debug settings

---
 .../Overlays/Settings/Sections/Debug/GeneralSettings.cs  | 9 ++++++++-
 osu.Game/Screens/Menu/ButtonSystem.cs                    | 5 -----
 osu.Game/Screens/Menu/MainMenu.cs                        | 4 +---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
index f05b876d8f..22674f0879 100644
--- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
@@ -4,6 +4,8 @@
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Screens;
+using osu.Game.Screens.Import;
 
 namespace osu.Game.Overlays.Settings.Sections.Debug
 {
@@ -12,7 +14,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
         protected override string Header => "General";
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, OsuGame game)
         {
             Children = new Drawable[]
             {
@@ -27,6 +29,11 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
                     Current = config.GetBindable<bool>(DebugSetting.BypassFrontToBackPass)
                 }
             };
+            Add(new SettingsButton
+            {
+                Text = "Import files",
+                Action = () => game?.PerformFromScreen(menu => menu.Push(new FileImportScreen()))
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 1722329c21..4becdd58cd 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -41,7 +41,6 @@ namespace osu.Game.Screens.Menu
         public Action OnExit;
         public Action OnBeatmapListing;
         public Action OnSolo;
-        public Action OnImportButton;
         public Action OnSettings;
         public Action OnMulti;
         public Action OnChart;
@@ -132,10 +131,6 @@ namespace osu.Game.Screens.Menu
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
             buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
-            if(RuntimeInfo.OS == RuntimeInfo.Platform.Android)
-            {
-                buttonsTopLevel.Add(new Button(@"Import File", @"button-generic-select", FontAwesome.Solid.File, new Color4(0, 86, 73, 255), () => OnImportButton?.Invoke()));
-            }        
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 69e4ea487e..c3ecd75963 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -19,7 +19,6 @@ using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Select;
-using osu.Game.Screens.Import;
 
 namespace osu.Game.Screens.Menu
 {
@@ -106,7 +105,6 @@ namespace osu.Game.Screens.Menu
                             },
                             OnSolo = onSolo,
                             OnMulti = delegate { this.Push(new Multiplayer()); },
-                            OnImportButton = onImport,
                             OnExit = confirmAndExit,
                         }
                     }
@@ -146,7 +144,7 @@ namespace osu.Game.Screens.Menu
 
         [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
-        private void onImport() => this.Push(new FileImportScreen());
+
         private void confirmAndExit()
         {
             if (exitConfirmed) return;

From 20bb64c627edd4043f6ff72886a2e91de506536c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 19:34:00 +0900
Subject: [PATCH 06292/10326] Fix mania misses not correctly animating
 (temporary solution)

---
 .../Skinning/TestSceneDrawableJudgement.cs    |  5 +++-
 .../UI/DrawableManiaJudgement.cs              | 28 +++++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
index a4d4ec50f8..11536ac8c3 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
@@ -24,7 +24,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                 if (hitWindows.IsHitResultAllowed(result))
                 {
                     AddStep("Show " + result.GetDescription(), () => SetContents(() =>
-                        new DrawableManiaJudgement(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)
+                        new DrawableManiaJudgement(new JudgementResult(new HitObject
+                        {
+                            StartTime = Time.Current
+                        }, new Judgement()) { Type = result }, null)
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
index a341cdd8ec..a3dcd0e57f 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
@@ -5,6 +5,7 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -19,6 +20,27 @@ namespace osu.Game.Rulesets.Mania.UI
         {
         }
 
+        protected override void ApplyMissAnimations()
+        {
+            if (!(JudgementBody.Drawable is DefaultManiaJudgementPiece))
+            {
+                // this is temporary logic until mania's skin transformer returns IAnimatableJudgements
+                JudgementBody.ScaleTo(1.6f);
+                JudgementBody.ScaleTo(1, 100, Easing.In);
+
+                JudgementBody.MoveTo(Vector2.Zero);
+                JudgementBody.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+
+                JudgementBody.RotateTo(0);
+                JudgementBody.RotateTo(40, 800, Easing.InQuint);
+                JudgementBody.FadeOutFromOne(800);
+
+                LifetimeEnd = JudgementBody.LatestTransformEndTime;
+            }
+
+            base.ApplyMissAnimations();
+        }
+
         protected override void ApplyHitAnimations()
         {
             JudgementBody.ScaleTo(0.8f);
@@ -29,11 +51,11 @@ namespace osu.Game.Rulesets.Mania.UI
                          .FadeOut(200);
         }
 
-        protected override Drawable CreateDefaultJudgement(HitResult result) => new ManiaJudgementPiece(result);
+        protected override Drawable CreateDefaultJudgement(HitResult result) => new DefaultManiaJudgementPiece(result);
 
-        private class ManiaJudgementPiece : DefaultJudgementPiece
+        private class DefaultManiaJudgementPiece : DefaultJudgementPiece
         {
-            public ManiaJudgementPiece(HitResult result)
+            public DefaultManiaJudgementPiece(HitResult result)
                 : base(result)
             {
             }

From 8522ddc61e4d9a795feb290a66f1f3be6a948dfb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 19:34:27 +0900
Subject: [PATCH 06293/10326] Reduce nesting of skinned component to reduce
 exposed surface

---
 .../TestSceneDrawableJudgement.cs                 |  2 +-
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index b0119edc14..1339d11ab6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private class TestDrawableOsuJudgement : DrawableOsuJudgement
         {
             public new SkinnableSprite Lighting => base.Lighting;
-            public new Container JudgementBody => base.JudgementBody;
+            public new SkinnableDrawable JudgementBody => base.JudgementBody;
         }
     }
 }
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 85875e2f2a..72ffa3a34b 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -6,7 +6,6 @@ using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
@@ -26,11 +25,9 @@ namespace osu.Game.Rulesets.Judgements
 
         public DrawableHitObject JudgedObject { get; private set; }
 
-        protected Container JudgementBody { get; private set; }
-
         public override bool RemoveCompletedTransforms => false;
 
-        private SkinnableDrawable skinnableJudgement;
+        protected SkinnableDrawable JudgementBody { get; private set; }
 
         [Resolved]
         private ISkinSource skinSource { get; set; }
@@ -147,7 +144,7 @@ namespace osu.Game.Rulesets.Judgements
             using (BeginAbsoluteSequence(Result.TimeAbsolute, true))
             {
                 // not sure if this should remain going forward.
-                skinnableJudgement.ResetAnimation();
+                JudgementBody.ResetAnimation();
 
                 switch (Result.Type)
                 {
@@ -163,7 +160,7 @@ namespace osu.Game.Rulesets.Judgements
                         break;
                 }
 
-                if (skinnableJudgement.Drawable is IAnimatableJudgement animatable)
+                if (JudgementBody.Drawable is IAnimatableJudgement animatable)
                 {
                     var drawableAnimation = (Drawable)animatable;
 
@@ -192,13 +189,11 @@ namespace osu.Game.Rulesets.Judgements
             if (JudgementBody != null)
                 RemoveInternal(JudgementBody);
 
-            AddInternal(JudgementBody = new Container
+            AddInternal(JudgementBody = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ =>
+                CreateDefaultJudgement(type), confineMode: ConfineMode.NoScaling)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                Child = skinnableJudgement = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ =>
-                    CreateDefaultJudgement(type), confineMode: ConfineMode.NoScaling)
             });
 
             currentDrawableType = type;

From b3bec81b79b5fa88edbce4ab7b322b10a9fb0db0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 19:38:38 +0900
Subject: [PATCH 06294/10326] Update xmldoc to match new behaviour

---
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 72ffa3a34b..6407cb40aa 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -90,8 +90,7 @@ namespace osu.Game.Rulesets.Judgements
 
         /// <summary>
         /// Apply top-level animations to the current judgement when successfully hit.
-        /// Generally used for fading, defaulting to a simple fade out based on <see cref="FadeOutDelay"/>.
-        /// This will be used to calculate the lifetime of the judgement.
+        /// If displaying components which require lifetime extensions, manually adjusting <see cref="Drawable.LifetimeEnd"/> is required.
         /// </summary>
         /// <remarks>
         /// For animating the actual "default skin" judgement itself, it is recommended to use <see cref="CreateDefaultJudgement"/>.
@@ -103,8 +102,7 @@ namespace osu.Game.Rulesets.Judgements
 
         /// <summary>
         /// Apply top-level animations to the current judgement when missed.
-        /// Generally used for fading, defaulting to a simple fade out based on <see cref="FadeOutDelay"/>.
-        /// This will be used to calculate the lifetime of the judgement.
+        /// If displaying components which require lifetime extensions, manually adjusting <see cref="Drawable.LifetimeEnd"/> is required.
         /// </summary>
         /// <remarks>
         /// For animating the actual "default skin" judgement itself, it is recommended to use <see cref="CreateDefaultJudgement"/>.

From 191b95810ce519e6b9b3990ae105867b113f753a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 19:47:35 +0900
Subject: [PATCH 06295/10326] Fix whitespace issues

---
 .../Skinning/TestSceneDrawableJudgement.cs                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
index 11536ac8c3..dcb25f21ba 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
@@ -24,10 +24,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                 if (hitWindows.IsHitResultAllowed(result))
                 {
                     AddStep("Show " + result.GetDescription(), () => SetContents(() =>
-                        new DrawableManiaJudgement(new JudgementResult(new HitObject
+                        new DrawableManiaJudgement(new JudgementResult(new HitObject { StartTime = Time.Current }, new Judgement())
                         {
-                            StartTime = Time.Current
-                        }, new Judgement()) { Type = result }, null)
+                            Type = result
+                        }, null)
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,

From cb5d1d0d77f1dbf87a01d113074dcdb1f31e7b57 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 18 Nov 2020 21:26:35 +0900
Subject: [PATCH 06296/10326] Remove obsolete method

---
 osu.Game/Rulesets/Objects/SliderEventGenerator.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
index d8c6da86f9..ba38c7f77d 100644
--- a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
+++ b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
@@ -10,14 +10,6 @@ namespace osu.Game.Rulesets.Objects
 {
     public static class SliderEventGenerator
     {
-        [Obsolete("Use the overload with cancellation support instead.")] // can be removed 20201115
-        // ReSharper disable once RedundantOverload.Global
-        public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
-                                                                  double? legacyLastTickOffset)
-        {
-            return Generate(startTime, spanDuration, velocity, tickDistance, totalDistance, spanCount, legacyLastTickOffset, default);
-        }
-
         // ReSharper disable once MethodOverloadWithOptionalParameter
         public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
                                                                   double? legacyLastTickOffset, CancellationToken cancellationToken = default)

From 85c5c68dfac097bc15c9218853de000816b74f58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 13:20:21 +0900
Subject: [PATCH 06297/10326] Provide particle drawable as a function (for
 future use)

---
 osu.Game/Skinning/LegacyJudgementPieceNew.cs | 2 +-
 osu.Game/Skinning/LegacySkin.cs              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacyJudgementPieceNew.cs b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
index d0a2f1d4eb..b5e1de337a 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceNew.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Skinning
 
         private readonly Drawable mainPiece;
 
-        public LegacyJudgementPieceNew(HitResult result, Func<Drawable> createMainDrawable, Drawable particleDrawable)
+        public LegacyJudgementPieceNew(HitResult result, Func<Drawable> createMainDrawable, Func<Drawable> createParticleDrawable)
         {
             this.result = result;
 
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 9fbf3de043..6faee8c2e7 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -377,7 +377,7 @@ namespace osu.Game.Skinning
                     if (createDrawable() != null)
                     {
                         if (Configuration.LegacyVersion > 1)
-                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, getParticleDrawable(resultComponent.Component));
+                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, () => getParticleDrawable(resultComponent.Component));
                         else
                             return new LegacyJudgementPieceOld(resultComponent.Component, createDrawable);
                     }

From ba735584faac6f0c5ab081cbd1fed06b3b0ec7ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 14:04:43 +0900
Subject: [PATCH 06298/10326] Add null check for disposal safety

---
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 6407cb40aa..4aed38e689 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -85,7 +85,9 @@ namespace osu.Game.Rulesets.Judgements
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            skinSource.SourceChanged -= onSkinChanged;
+
+            if (skinSource != null)
+                skinSource.SourceChanged -= onSkinChanged;
         }
 
         /// <summary>

From 3024ae6d867b4eae0014aaba8d2ed7dbf0470bc5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 14:10:07 +0900
Subject: [PATCH 06299/10326] Add better test coverage of hit lighting (and
 ensure reset after animation reapplication)

---
 osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs  | 7 +++----
 .../Objects/Drawables/DrawableOsuJudgement.cs              | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index 1339d11ab6..e4158d8f07 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -43,8 +43,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             showResult(HitResult.Great);
 
             AddUntilStep("judgements shown", () => this.ChildrenOfType<TestDrawableOsuJudgement>().Any());
-            AddAssert("hit lighting hidden",
-                () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => !judgement.Lighting.Transforms.Any()));
+            AddAssert("hit lighting has no transforms", () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => !judgement.Lighting.Transforms.Any()));
+            AddAssert("hit lighting hidden", () => this.ChildrenOfType<TestDrawableOsuJudgement>().All(judgement => judgement.Lighting.Alpha == 0));
         }
 
         [Test]
@@ -55,8 +55,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             showResult(HitResult.Great);
 
             AddUntilStep("judgements shown", () => this.ChildrenOfType<TestDrawableOsuJudgement>().Any());
-            AddAssert("hit lighting shown",
-                () => this.ChildrenOfType<TestDrawableOsuJudgement>().Any(judgement => judgement.Lighting.Transforms.Any()));
+            AddUntilStep("hit lighting shown", () => this.ChildrenOfType<TestDrawableOsuJudgement>().Any(judgement => judgement.Lighting.Alpha > 0));
         }
 
         private void showResult(HitResult result)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 9699fb72a4..13f5960bd4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -48,6 +48,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             bool hitLightingEnabled = config.Get<bool>(OsuSetting.HitLighting);
 
+            Lighting.Alpha = 0;
+
             if (hitLightingEnabled && Lighting.Drawable != null)
             {
                 // todo: this animation changes slightly based on new/old legacy skin versions.

From 9df93e1f186d4fa592b549ba6b1a15a4112847c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 14:54:31 +0900
Subject: [PATCH 06300/10326] Add basic implementation of particle explosion

Using drawables still, just to get things in place and setup the
structure
---
 .../Gameplay/TestSceneParticleExplosion.cs    | 30 ++++++++++
 osu.Game/Graphics/ParticleExplosion.cs        | 59 +++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.cs
 create mode 100644 osu.Game/Graphics/ParticleExplosion.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.cs
new file mode 100644
index 0000000000..6df4842608
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.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.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    [TestFixture]
+    public class TestSceneParticleExplosion : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            AddStep(@"display", () =>
+            {
+                Child = new ParticleExplosion(textures.Get("Cursor/cursortrail"), 150, 1200)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(200)
+                };
+            });
+        }
+    }
+}
diff --git a/osu.Game/Graphics/ParticleExplosion.cs b/osu.Game/Graphics/ParticleExplosion.cs
new file mode 100644
index 0000000000..6a6f947dd5
--- /dev/null
+++ b/osu.Game/Graphics/ParticleExplosion.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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Utils;
+using osuTK;
+
+namespace osu.Game.Graphics
+{
+    public class ParticleExplosion : CompositeDrawable
+    {
+        public ParticleExplosion(Texture texture, int particleCount, double duration)
+        {
+            for (int i = 0; i < particleCount; i++)
+            {
+                double rDuration = RNG.NextDouble(duration / 3, duration);
+
+                AddInternal(new Particle(rDuration, RNG.NextSingle(0, MathF.PI * 2))
+                {
+                    Texture = texture
+                });
+            }
+        }
+
+        private class Particle : Sprite
+        {
+            private readonly double duration;
+            private readonly float direction;
+
+            private Vector2 positionForOffset(float offset) => new Vector2(
+                (float)(offset * Math.Sin(direction)),
+                (float)(offset * Math.Cos(direction))
+            );
+
+            public Particle(double duration, float direction)
+            {
+                this.duration = duration;
+                this.direction = direction;
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                RelativePositionAxes = Axes.Both;
+                Position = positionForOffset(0);
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                this.MoveTo(positionForOffset(1), duration);
+                this.FadeOut(duration);
+                Expire();
+            }
+        }
+    }
+}

From 9d04ce75ccba4d263a40e961552eed793a8348ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 15:47:02 +0900
Subject: [PATCH 06301/10326] Make particles additive and consume in judgement
 explosions

---
 osu.Game/Graphics/ParticleExplosion.cs       | 24 ++++++++++++++++----
 osu.Game/Skinning/LegacyJudgementPieceNew.cs | 24 +++++++++++++++++++-
 osu.Game/Skinning/LegacySkin.cs              | 10 ++++----
 3 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Graphics/ParticleExplosion.cs b/osu.Game/Graphics/ParticleExplosion.cs
index 6a6f947dd5..4daae34d62 100644
--- a/osu.Game/Graphics/ParticleExplosion.cs
+++ b/osu.Game/Graphics/ParticleExplosion.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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -26,11 +27,19 @@ namespace osu.Game.Graphics
             }
         }
 
+        public void Restart()
+        {
+            foreach (var p in InternalChildren.OfType<Particle>())
+                p.Play();
+        }
+
         private class Particle : Sprite
         {
             private readonly double duration;
             private readonly float direction;
 
+            public override bool RemoveWhenNotAlive => false;
+
             private Vector2 positionForOffset(float offset) => new Vector2(
                 (float)(offset * Math.Sin(direction)),
                 (float)(offset * Math.Cos(direction))
@@ -40,18 +49,25 @@ namespace osu.Game.Graphics
             {
                 this.duration = duration;
                 this.direction = direction;
-                Anchor = Anchor.Centre;
+
                 Origin = Anchor.Centre;
+                Blending = BlendingParameters.Additive;
+
                 RelativePositionAxes = Axes.Both;
-                Position = positionForOffset(0);
             }
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
+                Play();
+            }
 
-                this.MoveTo(positionForOffset(1), duration);
-                this.FadeOut(duration);
+            public void Play()
+            {
+                this.MoveTo(new Vector2(0.5f));
+                this.MoveTo(new Vector2(0.5f) + positionForOffset(0.5f), duration);
+
+                this.FadeOutFromOne(duration);
                 Expire();
             }
         }
diff --git a/osu.Game/Skinning/LegacyJudgementPieceNew.cs b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
index b5e1de337a..2a53820872 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceNew.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
@@ -5,7 +5,9 @@ using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
@@ -20,7 +22,9 @@ namespace osu.Game.Skinning
 
         private readonly Drawable mainPiece;
 
-        public LegacyJudgementPieceNew(HitResult result, Func<Drawable> createMainDrawable, Func<Drawable> createParticleDrawable)
+        private readonly ParticleExplosion particles;
+
+        public LegacyJudgementPieceNew(HitResult result, Func<Drawable> createMainDrawable, Texture particleTexture)
         {
             this.result = result;
 
@@ -36,6 +40,17 @@ namespace osu.Game.Skinning
                 })
             };
 
+            if (particleTexture != null)
+            {
+                AddInternal(particles = new ParticleExplosion(particleTexture, 150, 1600)
+                {
+                    Size = new Vector2(140),
+                    Depth = float.MaxValue,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                });
+            }
+
             if (result != HitResult.Miss)
             {
                 //new judgement shows old as a temporary effect
@@ -54,6 +69,13 @@ namespace osu.Game.Skinning
 
             animation?.GotoFrame(0);
 
+            if (particles != null)
+            {
+                // start the particles already some way into their animation to break cluster away from centre.
+                using (particles.BeginDelayedSequence(-100, true))
+                    particles.Restart();
+            }
+
             const double fade_in_length = 120;
             const double fade_out_delay = 500;
             const double fade_out_length = 600;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 6faee8c2e7..63a22eba62 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -377,7 +377,7 @@ namespace osu.Game.Skinning
                     if (createDrawable() != null)
                     {
                         if (Configuration.LegacyVersion > 1)
-                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, () => getParticleDrawable(resultComponent.Component));
+                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, getParticleTexture(resultComponent.Component));
                         else
                             return new LegacyJudgementPieceOld(resultComponent.Component, createDrawable);
                     }
@@ -388,18 +388,18 @@ namespace osu.Game.Skinning
             return this.GetAnimation(component.LookupName, false, false);
         }
 
-        private Drawable getParticleDrawable(HitResult result)
+        private Texture getParticleTexture(HitResult result)
         {
             switch (result)
             {
                 case HitResult.Meh:
-                    return this.GetAnimation("particle50", false, false);
+                    return GetTexture("particle50");
 
                 case HitResult.Ok:
-                    return this.GetAnimation("particle100", false, false);
+                    return GetTexture("particle100");
 
                 case HitResult.Great:
-                    return this.GetAnimation("particle300", false, false);
+                    return GetTexture("particle300");
             }
 
             return null;

From efd5acb8abb0e73a9e5ba632d592d485dc1f2443 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 15:55:11 +0900
Subject: [PATCH 06302/10326] Randomise direction every animation playback

---
 osu.Game/Graphics/ParticleExplosion.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/ParticleExplosion.cs b/osu.Game/Graphics/ParticleExplosion.cs
index 4daae34d62..200bcc062a 100644
--- a/osu.Game/Graphics/ParticleExplosion.cs
+++ b/osu.Game/Graphics/ParticleExplosion.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Graphics
             {
                 double rDuration = RNG.NextDouble(duration / 3, duration);
 
-                AddInternal(new Particle(rDuration, RNG.NextSingle(0, MathF.PI * 2))
+                AddInternal(new Particle(rDuration)
                 {
                     Texture = texture
                 });
@@ -36,19 +36,12 @@ namespace osu.Game.Graphics
         private class Particle : Sprite
         {
             private readonly double duration;
-            private readonly float direction;
 
             public override bool RemoveWhenNotAlive => false;
 
-            private Vector2 positionForOffset(float offset) => new Vector2(
-                (float)(offset * Math.Sin(direction)),
-                (float)(offset * Math.Cos(direction))
-            );
-
-            public Particle(double duration, float direction)
+            public Particle(double duration)
             {
                 this.duration = duration;
-                this.direction = direction;
 
                 Origin = Anchor.Centre;
                 Blending = BlendingParameters.Additive;
@@ -64,11 +57,18 @@ namespace osu.Game.Graphics
 
             public void Play()
             {
+                double direction = RNG.NextSingle(0, MathF.PI * 2);
+
                 this.MoveTo(new Vector2(0.5f));
                 this.MoveTo(new Vector2(0.5f) + positionForOffset(0.5f), duration);
 
                 this.FadeOutFromOne(duration);
                 Expire();
+
+                Vector2 positionForOffset(float offset) => new Vector2(
+                    (float)(offset * Math.Sin(direction)),
+                    (float)(offset * Math.Cos(direction))
+                );
             }
         }
     }

From 83024f1ec524db962d88645c1e6fe5be9623a594 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 16:00:20 +0900
Subject: [PATCH 06303/10326] Add back positional randomness from stable

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

diff --git a/osu.Game/Graphics/ParticleExplosion.cs b/osu.Game/Graphics/ParticleExplosion.cs
index 200bcc062a..8a3be513be 100644
--- a/osu.Game/Graphics/ParticleExplosion.cs
+++ b/osu.Game/Graphics/ParticleExplosion.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Graphics
                 double direction = RNG.NextSingle(0, MathF.PI * 2);
 
                 this.MoveTo(new Vector2(0.5f));
-                this.MoveTo(new Vector2(0.5f) + positionForOffset(0.5f), duration);
+                this.MoveTo(new Vector2(0.5f) + positionForOffset(RNG.NextSingle(0.5f)), duration);
 
                 this.FadeOutFromOne(duration);
                 Expire();

From fe025043bd59d8164710cce507c16589ad439c98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 17:16:29 +0900
Subject: [PATCH 06304/10326] Make test run multiple times

---
 .../Visual/Gameplay/TestSceneParticleExplosion.cs           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.cs
index 6df4842608..63c8757afd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.cs
@@ -16,15 +16,15 @@ namespace osu.Game.Tests.Visual.Gameplay
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
-            AddStep(@"display", () =>
+            AddRepeatStep(@"display", () =>
             {
                 Child = new ParticleExplosion(textures.Get("Cursor/cursortrail"), 150, 1200)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(200)
+                    Size = new Vector2(400)
                 };
-            });
+            }, 10);
         }
     }
 }

From 476d0256ccc0d7620d84316fc7f3bb2657e4b2d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 17:22:37 +0900
Subject: [PATCH 06305/10326] Replace particle explosion implementation with
 DrawNode version

---
 osu.Game/Graphics/ParticleExplosion.cs | 128 ++++++++++++++++++-------
 1 file changed, 96 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Graphics/ParticleExplosion.cs b/osu.Game/Graphics/ParticleExplosion.cs
index 8a3be513be..ba6d26ec22 100644
--- a/osu.Game/Graphics/ParticleExplosion.cs
+++ b/osu.Game/Graphics/ParticleExplosion.cs
@@ -2,9 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
+using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Vertices;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
@@ -12,64 +13,127 @@ using osuTK;
 
 namespace osu.Game.Graphics
 {
-    public class ParticleExplosion : CompositeDrawable
+    public class ParticleExplosion : Sprite
     {
+        private readonly double duration;
+        private double startTime;
+
+        private readonly List<ParticlePart> parts = new List<ParticlePart>();
+
         public ParticleExplosion(Texture texture, int particleCount, double duration)
         {
-            for (int i = 0; i < particleCount; i++)
-            {
-                double rDuration = RNG.NextDouble(duration / 3, duration);
+            Texture = texture;
+            this.duration = duration;
+            Blending = BlendingParameters.Additive;
 
-                AddInternal(new Particle(rDuration)
-                {
-                    Texture = texture
-                });
-            }
+            for (int i = 0; i < particleCount; i++)
+                parts.Add(new ParticlePart(duration));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Restart();
         }
 
         public void Restart()
         {
-            foreach (var p in InternalChildren.OfType<Particle>())
-                p.Play();
+            startTime = TransformStartTime;
+
+            this.FadeOutFromOne(duration);
+
+            foreach (var p in parts)
+                p.Randomise();
         }
 
-        private class Particle : Sprite
+        protected override void Update()
         {
-            private readonly double duration;
+            base.Update();
 
-            public override bool RemoveWhenNotAlive => false;
+            Invalidate(Invalidation.DrawNode);
+        }
 
-            public Particle(double duration)
+        protected override DrawNode CreateDrawNode() => new ParticleExplosionDrawNode(this);
+
+        private class ParticleExplosionDrawNode : SpriteDrawNode
+        {
+            private List<ParticlePart> parts = new List<ParticlePart>();
+
+            private ParticleExplosion source => (ParticleExplosion)Source;
+
+            private double startTime;
+            private double currentTime;
+            private Vector2 sourceSize;
+
+            public ParticleExplosionDrawNode(Sprite source)
+                : base(source)
             {
-                this.duration = duration;
-
-                Origin = Anchor.Centre;
-                Blending = BlendingParameters.Additive;
-
-                RelativePositionAxes = Axes.Both;
             }
 
-            protected override void LoadComplete()
+            public override void ApplyState()
             {
-                base.LoadComplete();
-                Play();
+                base.ApplyState();
+
+                parts = source.parts;
+                sourceSize = source.Size;
+                startTime = source.startTime;
+                currentTime = source.Time.Current;
             }
 
-            public void Play()
+            protected override void Blit(Action<TexturedVertex2D> vertexAction)
             {
-                double direction = RNG.NextSingle(0, MathF.PI * 2);
+                foreach (var p in parts)
+                {
+                    var pos = p.PositionAtTime(currentTime - startTime);
 
-                this.MoveTo(new Vector2(0.5f));
-                this.MoveTo(new Vector2(0.5f) + positionForOffset(RNG.NextSingle(0.5f)), duration);
+                    // todo: implement per particle.
+                    var rect = new RectangleF(pos.X * sourceSize.X, pos.Y * sourceSize.Y, Texture.DisplayWidth, Texture.DisplayHeight);
 
-                this.FadeOutFromOne(duration);
-                Expire();
+                    var quad = new Quad(
+                        Vector2Extensions.Transform(rect.TopLeft, DrawInfo.Matrix),
+                        Vector2Extensions.Transform(rect.TopRight, DrawInfo.Matrix),
+                        Vector2Extensions.Transform(rect.BottomLeft, DrawInfo.Matrix),
+                        Vector2Extensions.Transform(rect.BottomRight, DrawInfo.Matrix)
+                    );
+
+                    DrawQuad(Texture, quad, DrawColourInfo.Colour, null, vertexAction,
+                        new Vector2(InflationAmount.X / DrawRectangle.Width, InflationAmount.Y / DrawRectangle.Height),
+                        null, TextureCoords);
+                }
+            }
+        }
+
+        private class ParticlePart
+        {
+            private readonly double totalDuration;
+
+            private double duration;
+            private double direction;
+            private float distance;
+
+            public ParticlePart(double totalDuration)
+            {
+                this.totalDuration = totalDuration;
+
+                Randomise();
+            }
+
+            public Vector2 PositionAtTime(double time)
+            {
+                return new Vector2(0.5f) + positionForOffset(distance * (float)(time / duration));
 
                 Vector2 positionForOffset(float offset) => new Vector2(
                     (float)(offset * Math.Sin(direction)),
                     (float)(offset * Math.Cos(direction))
                 );
             }
+
+            public void Randomise()
+            {
+                distance = RNG.NextSingle(0.5f);
+                duration = RNG.NextDouble(totalDuration / 3, totalDuration);
+                direction = RNG.NextSingle(0, MathF.PI * 2);
+            }
         }
     }
 }

From 3a7291c5cf699bfc4e83653a44ced17aa86a3f53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 17:56:11 +0900
Subject: [PATCH 06306/10326] Fix some behavioural regressions

---
 osu.Game/Graphics/ParticleExplosion.cs | 42 +++++++++++++++++---------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Graphics/ParticleExplosion.cs b/osu.Game/Graphics/ParticleExplosion.cs
index ba6d26ec22..68dedf70a0 100644
--- a/osu.Game/Graphics/ParticleExplosion.cs
+++ b/osu.Game/Graphics/ParticleExplosion.cs
@@ -39,7 +39,6 @@ namespace osu.Game.Graphics
         public void Restart()
         {
             startTime = TransformStartTime;
-
             this.FadeOutFromOne(duration);
 
             foreach (var p in parts)
@@ -74,6 +73,8 @@ namespace osu.Game.Graphics
             {
                 base.ApplyState();
 
+                // this is mostly safe as the parts are immutable.
+                // the most that can go wrong is the random state be incorrect
                 parts = source.parts;
                 sourceSize = source.Size;
                 startTime = source.startTime;
@@ -82,13 +83,20 @@ namespace osu.Game.Graphics
 
             protected override void Blit(Action<TexturedVertex2D> vertexAction)
             {
+                var time = currentTime - startTime;
+
                 foreach (var p in parts)
                 {
-                    var pos = p.PositionAtTime(currentTime - startTime);
+                    Vector2 pos = p.PositionAtTime(time);
+                    float alpha = p.AlphaAtTime(time);
 
-                    // todo: implement per particle.
-                    var rect = new RectangleF(pos.X * sourceSize.X, pos.Y * sourceSize.Y, Texture.DisplayWidth, Texture.DisplayHeight);
+                    var rect = new RectangleF(
+                        pos.X * sourceSize.X - Texture.DisplayWidth / 2,
+                        pos.Y * sourceSize.Y - Texture.DisplayHeight / 2,
+                        Texture.DisplayWidth,
+                        Texture.DisplayHeight);
 
+                    // convert to screen space.
                     var quad = new Quad(
                         Vector2Extensions.Transform(rect.TopLeft, DrawInfo.Matrix),
                         Vector2Extensions.Transform(rect.TopRight, DrawInfo.Matrix),
@@ -96,7 +104,7 @@ namespace osu.Game.Graphics
                         Vector2Extensions.Transform(rect.BottomRight, DrawInfo.Matrix)
                     );
 
-                    DrawQuad(Texture, quad, DrawColourInfo.Colour, null, vertexAction,
+                    DrawQuad(Texture, quad, DrawColourInfo.Colour.MultiplyAlpha(alpha), null, vertexAction,
                         new Vector2(InflationAmount.X / DrawRectangle.Width, InflationAmount.Y / DrawRectangle.Height),
                         null, TextureCoords);
                 }
@@ -105,22 +113,31 @@ namespace osu.Game.Graphics
 
         private class ParticlePart
         {
-            private readonly double totalDuration;
+            private readonly double availableDuration;
 
             private double duration;
             private double direction;
             private float distance;
 
-            public ParticlePart(double totalDuration)
+            public ParticlePart(double availableDuration)
             {
-                this.totalDuration = totalDuration;
+                this.availableDuration = availableDuration;
 
                 Randomise();
             }
 
+            public void Randomise()
+            {
+                distance = RNG.NextSingle(0.5f);
+                duration = RNG.NextDouble(availableDuration / 3, availableDuration);
+                direction = RNG.NextSingle(0, MathF.PI * 2);
+            }
+
+            public float AlphaAtTime(double time) => 1 - progressAtTime(time);
+
             public Vector2 PositionAtTime(double time)
             {
-                return new Vector2(0.5f) + positionForOffset(distance * (float)(time / duration));
+                return new Vector2(0.5f) + positionForOffset(distance * progressAtTime(time));
 
                 Vector2 positionForOffset(float offset) => new Vector2(
                     (float)(offset * Math.Sin(direction)),
@@ -128,12 +145,7 @@ namespace osu.Game.Graphics
                 );
             }
 
-            public void Randomise()
-            {
-                distance = RNG.NextSingle(0.5f);
-                duration = RNG.NextDouble(totalDuration / 3, totalDuration);
-                direction = RNG.NextSingle(0, MathF.PI * 2);
-            }
+            private float progressAtTime(double time) => (float)Math.Clamp(time / duration, 0, 1);
         }
     }
 }

From 84e73e88d57c3359be76e905860e20f31122291d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 18:05:41 +0900
Subject: [PATCH 06307/10326] Use structs for parts for added safety

---
 osu.Game/Graphics/ParticleExplosion.cs | 51 +++++++++++---------------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Graphics/ParticleExplosion.cs b/osu.Game/Graphics/ParticleExplosion.cs
index 68dedf70a0..fa55260f53 100644
--- a/osu.Game/Graphics/ParticleExplosion.cs
+++ b/osu.Game/Graphics/ParticleExplosion.cs
@@ -13,8 +13,12 @@ using osuTK;
 
 namespace osu.Game.Graphics
 {
+    /// <summary>
+    /// An explosion of textured particles based on how osu-stable randomises the explosion pattern.
+    /// </summary>
     public class ParticleExplosion : Sprite
     {
+        private readonly int particleCount;
         private readonly double duration;
         private double startTime;
 
@@ -23,11 +27,9 @@ namespace osu.Game.Graphics
         public ParticleExplosion(Texture texture, int particleCount, double duration)
         {
             Texture = texture;
+            this.particleCount = particleCount;
             this.duration = duration;
             Blending = BlendingParameters.Additive;
-
-            for (int i = 0; i < particleCount; i++)
-                parts.Add(new ParticlePart(duration));
         }
 
         protected override void LoadComplete()
@@ -36,19 +38,23 @@ namespace osu.Game.Graphics
             Restart();
         }
 
+        /// <summary>
+        /// Restart the animation from the current point in time.
+        /// Supports transform time offset chaining.
+        /// </summary>
         public void Restart()
         {
             startTime = TransformStartTime;
             this.FadeOutFromOne(duration);
 
-            foreach (var p in parts)
-                p.Randomise();
+            parts.Clear();
+            for (int i = 0; i < particleCount; i++)
+                parts.Add(new ParticlePart(duration));
         }
 
         protected override void Update()
         {
             base.Update();
-
             Invalidate(Invalidation.DrawNode);
         }
 
@@ -56,7 +62,7 @@ namespace osu.Game.Graphics
 
         private class ParticleExplosionDrawNode : SpriteDrawNode
         {
-            private List<ParticlePart> parts = new List<ParticlePart>();
+            private readonly List<ParticlePart> parts = new List<ParticlePart>();
 
             private ParticleExplosion source => (ParticleExplosion)Source;
 
@@ -73,9 +79,9 @@ namespace osu.Game.Graphics
             {
                 base.ApplyState();
 
-                // this is mostly safe as the parts are immutable.
-                // the most that can go wrong is the random state be incorrect
-                parts = source.parts;
+                parts.Clear();
+                parts.AddRange(source.parts);
+
                 sourceSize = source.Size;
                 startTime = source.startTime;
                 currentTime = source.Time.Current;
@@ -111,22 +117,13 @@ namespace osu.Game.Graphics
             }
         }
 
-        private class ParticlePart
+        private readonly struct ParticlePart
         {
-            private readonly double availableDuration;
-
-            private double duration;
-            private double direction;
-            private float distance;
+            private readonly double duration;
+            private readonly double direction;
+            private readonly float distance;
 
             public ParticlePart(double availableDuration)
-            {
-                this.availableDuration = availableDuration;
-
-                Randomise();
-            }
-
-            public void Randomise()
             {
                 distance = RNG.NextSingle(0.5f);
                 duration = RNG.NextDouble(availableDuration / 3, availableDuration);
@@ -137,12 +134,8 @@ namespace osu.Game.Graphics
 
             public Vector2 PositionAtTime(double time)
             {
-                return new Vector2(0.5f) + positionForOffset(distance * progressAtTime(time));
-
-                Vector2 positionForOffset(float offset) => new Vector2(
-                    (float)(offset * Math.Sin(direction)),
-                    (float)(offset * Math.Cos(direction))
-                );
+                var travelledDistance = distance * progressAtTime(time);
+                return new Vector2(0.5f) + travelledDistance * new Vector2((float)Math.Sin(direction), (float)Math.Cos(direction));
             }
 
             private float progressAtTime(double time) => (float)Math.Clamp(time / duration, 0, 1);

From dd5b90cf6cde83e0b59f282f0bdb1aa75e30a6d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 18:07:41 +0900
Subject: [PATCH 06308/10326] Add test coverage of animation restarting

---
 .../Visual/Gameplay/TestSceneParticleExplosion.cs   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.cs
index 63c8757afd..82095cb809 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleExplosion.cs
@@ -13,17 +13,26 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneParticleExplosion : OsuTestScene
     {
+        private ParticleExplosion explosion;
+
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
-            AddRepeatStep(@"display", () =>
+            AddStep("create initial", () =>
             {
-                Child = new ParticleExplosion(textures.Get("Cursor/cursortrail"), 150, 1200)
+                Child = explosion = new ParticleExplosion(textures.Get("Cursor/cursortrail"), 150, 1200)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Size = new Vector2(400)
                 };
+            });
+
+            AddWaitStep("wait for playback", 5);
+
+            AddRepeatStep(@"restart animation", () =>
+            {
+                explosion.Restart();
             }, 10);
         }
     }

From 1c7ee2ca5fdaa87f2ec487bbe92466dce16560b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Nov 2020 18:46:19 +0900
Subject: [PATCH 06309/10326] Simplify math by making direction a float

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

diff --git a/osu.Game/Graphics/ParticleExplosion.cs b/osu.Game/Graphics/ParticleExplosion.cs
index fa55260f53..e0d2b50c55 100644
--- a/osu.Game/Graphics/ParticleExplosion.cs
+++ b/osu.Game/Graphics/ParticleExplosion.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Graphics
         private readonly struct ParticlePart
         {
             private readonly double duration;
-            private readonly double direction;
+            private readonly float direction;
             private readonly float distance;
 
             public ParticlePart(double availableDuration)
@@ -135,7 +135,7 @@ namespace osu.Game.Graphics
             public Vector2 PositionAtTime(double time)
             {
                 var travelledDistance = distance * progressAtTime(time);
-                return new Vector2(0.5f) + travelledDistance * new Vector2((float)Math.Sin(direction), (float)Math.Cos(direction));
+                return new Vector2(0.5f) + travelledDistance * new Vector2(MathF.Sin(direction), MathF.Cos(direction));
             }
 
             private float progressAtTime(double time) => (float)Math.Clamp(time / duration, 0, 1);

From 730b14b5bb102572c742b769e168c48febd9791c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 19:51:09 +0900
Subject: [PATCH 06310/10326] Add initial hit sample pooling

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs     |  13 +-
 osu.Game/Audio/HitSampleInfo.cs               |  15 +-
 osu.Game/Audio/SampleInfo.cs                  |  15 +-
 .../Objects/Drawables/DrawableHitObject.cs    |  12 +-
 .../Objects/Legacy/ConvertHitObjectParser.cs  |  29 ++-
 osu.Game/Rulesets/UI/Playfield.cs             |  38 +++-
 osu.Game/Skinning/PausableSkinnableSound.cs   |   8 +-
 osu.Game/Skinning/SkinReloadableDrawable.cs   |   4 +-
 osu.Game/Skinning/SkinnableSound.cs           | 203 +++++++++++++++---
 .../Drawables/DrawableStoryboardSample.cs     |   4 +-
 10 files changed, 283 insertions(+), 58 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index 4ecfb7b16d..d61a88b7df 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.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.Game.Audio;
 using osu.Game.Rulesets.Catch.Judgements;
@@ -26,11 +27,17 @@ namespace osu.Game.Rulesets.Catch.Objects
             Samples = samples;
         }
 
-        private class BananaHitSampleInfo : HitSampleInfo
+        private class BananaHitSampleInfo : HitSampleInfo, IEquatable<BananaHitSampleInfo>
         {
-            private static string[] lookupNames { get; } = { "metronomelow", "catch-banana" };
+            private static readonly string[] lookup_names = { "metronomelow", "catch-banana" };
 
-            public override IEnumerable<string> LookupNames => lookupNames;
+            public override IEnumerable<string> LookupNames => lookup_names;
+
+            public bool Equals(BananaHitSampleInfo other) => true;
+
+            public override bool Equals(object obj) => obj is BananaHitSampleInfo other && Equals(other);
+
+            public override int GetHashCode() => lookup_names.GetHashCode();
         }
     }
 }
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 8efaeb3795..46f0abd7b7 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace osu.Game.Audio
 {
@@ -10,7 +11,7 @@ namespace osu.Game.Audio
     /// Describes a gameplay hit sample.
     /// </summary>
     [Serializable]
-    public class HitSampleInfo : ISampleInfo
+    public class HitSampleInfo : ISampleInfo, IEquatable<HitSampleInfo>
     {
         public const string HIT_WHISTLE = @"hitwhistle";
         public const string HIT_FINISH = @"hitfinish";
@@ -57,5 +58,17 @@ namespace osu.Game.Audio
         }
 
         public HitSampleInfo Clone() => (HitSampleInfo)MemberwiseClone();
+
+        public bool Equals(HitSampleInfo other)
+            => other != null && Bank == other.Bank && Name == other.Name && Suffix == other.Suffix;
+
+        public override bool Equals(object obj)
+            => obj is HitSampleInfo other && Equals(other);
+
+        [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")] // This will have to be addressed eventually
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(Bank, Name, Suffix);
+        }
     }
 }
diff --git a/osu.Game/Audio/SampleInfo.cs b/osu.Game/Audio/SampleInfo.cs
index 240d70c418..221bc31639 100644
--- a/osu.Game/Audio/SampleInfo.cs
+++ b/osu.Game/Audio/SampleInfo.cs
@@ -1,14 +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;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Audio
 {
     /// <summary>
     /// Describes a gameplay sample.
     /// </summary>
-    public class SampleInfo : ISampleInfo
+    public class SampleInfo : ISampleInfo, IEquatable<SampleInfo>
     {
         private readonly string[] sampleNames;
 
@@ -20,5 +22,16 @@ namespace osu.Game.Audio
         public IEnumerable<string> LookupNames => sampleNames;
 
         public int Volume { get; } = 100;
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(sampleNames, Volume);
+        }
+
+        public bool Equals(SampleInfo other)
+            => other != null && sampleNames.SequenceEqual(other.sampleNames);
+
+        public override bool Equals(object obj)
+            => obj is SampleInfo other && Equals(other);
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ca49ed9e75..0d97066b35 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -10,7 +10,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Logging;
 using osu.Framework.Threading;
@@ -139,8 +138,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
-        private Container<PausableSkinnableSound> samplesContainer;
-
         /// <summary>
         /// Creates a new <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -159,7 +156,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             config.BindWith(OsuSetting.PositionalHitSounds, userPositionalHitSounds);
 
             // Explicit non-virtual function call.
-            base.AddInternal(samplesContainer = new Container<PausableSkinnableSound> { RelativeSizeAxes = Axes.Both });
+            base.AddInternal(Samples = new PausableSkinnableSound(Array.Empty<ISampleInfo>()));
         }
 
         protected override void LoadAsyncComplete()
@@ -269,6 +266,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             // In order to stop this needless update, the event is unbound and re-bound as late as possible in Apply().
             samplesBindable.CollectionChanged -= onSamplesChanged;
 
+            Samples.Samples = Array.Empty<ISampleInfo>();
+
             if (nestedHitObjects.IsValueCreated)
             {
                 foreach (var obj in nestedHitObjects.Value)
@@ -335,8 +334,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         protected virtual void LoadSamples()
         {
-            samplesContainer.Clear();
-            Samples = null;
+            Samples.Samples = Array.Empty<ISampleInfo>();
 
             var samples = GetSamples().ToArray();
 
@@ -349,7 +347,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                                                     + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
             }
 
-            samplesContainer.Add(Samples = new PausableSkinnableSound(samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s))));
+            Samples.Samples = samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
         }
 
         private void onSamplesChanged(object sender, NotifyCollectionChangedEventArgs e) => LoadSamples();
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 44b22033dc..19d573a55a 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -5,6 +5,7 @@ using osuTK;
 using osu.Game.Rulesets.Objects.Types;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Audio;
@@ -500,7 +501,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             public SampleBankInfo Clone() => (SampleBankInfo)MemberwiseClone();
         }
 
-        public class LegacyHitSampleInfo : HitSampleInfo
+        public class LegacyHitSampleInfo : HitSampleInfo, IEquatable<LegacyHitSampleInfo>
         {
             private int customSampleBank;
 
@@ -524,9 +525,21 @@ namespace osu.Game.Rulesets.Objects.Legacy
             /// using the <see cref="LegacySkinConfiguration.LegacySetting.LayeredHitSounds"/> skin config option.
             /// </remarks>
             public bool IsLayered { get; set; }
+
+            public bool Equals(LegacyHitSampleInfo other)
+                => other != null && base.Equals(other) && CustomSampleBank == other.CustomSampleBank;
+
+            public override bool Equals(object obj)
+                => obj is LegacyHitSampleInfo other && Equals(other);
+
+            [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")] // This will have to be addressed eventually
+            public override int GetHashCode()
+            {
+                return HashCode.Combine(base.GetHashCode(), customSampleBank);
+            }
         }
 
-        private class FileHitSampleInfo : LegacyHitSampleInfo
+        private class FileHitSampleInfo : LegacyHitSampleInfo, IEquatable<FileHitSampleInfo>
         {
             public string Filename;
 
@@ -542,6 +555,18 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 Filename,
                 Path.ChangeExtension(Filename, null)
             };
+
+            public bool Equals(FileHitSampleInfo other)
+                => other != null && Filename == other.Filename;
+
+            public override bool Equals(object obj)
+                => obj is FileHitSampleInfo other && Equals(other);
+
+            [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")] // This will have to be addressed eventually
+            public override int GetHashCode()
+            {
+                return HashCode.Combine(Filename);
+            }
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 82ec653f31..9f3a4c508f 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -8,19 +8,23 @@ using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
+using osu.Game.Audio;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI
 {
     [Cached(typeof(IPooledHitObjectProvider))]
-    public abstract class Playfield : CompositeDrawable, IPooledHitObjectProvider
+    [Cached(typeof(IPooledSampleProvider))]
+    public abstract class Playfield : CompositeDrawable, IPooledHitObjectProvider, IPooledSampleProvider
     {
         /// <summary>
         /// Invoked when a <see cref="DrawableHitObject"/> is judged.
@@ -80,6 +84,12 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public readonly BindableBool DisplayJudgements = new BindableBool(true);
 
+        [Resolved(CanBeNull = true)]
+        private IReadOnlyList<Mod> mods { get; set; }
+
+        [Resolved]
+        private ISampleStore sampleStore { get; set; }
+
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
         /// </summary>
@@ -96,9 +106,6 @@ namespace osu.Game.Rulesets.UI
             }));
         }
 
-        [Resolved(CanBeNull = true)]
-        private IReadOnlyList<Mod> mods { get; set; }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -336,6 +343,29 @@ namespace osu.Game.Rulesets.UI
             });
         }
 
+        private readonly Dictionary<ISampleInfo, DrawablePool<PoolableSkinnableSample>> samplePools = new Dictionary<ISampleInfo, DrawablePool<PoolableSkinnableSample>>();
+
+        public PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo)
+        {
+            if (!samplePools.TryGetValue(sampleInfo, out var existingPool))
+                samplePools[sampleInfo] = existingPool = new DrawableSamplePool(sampleInfo, 5);
+
+            return existingPool.Get();
+        }
+
+        private class DrawableSamplePool : DrawablePool<PoolableSkinnableSample>
+        {
+            private readonly ISampleInfo sampleInfo;
+
+            public DrawableSamplePool(ISampleInfo sampleInfo, int initialSize, int? maximumSize = null)
+                : base(initialSize, maximumSize)
+            {
+                this.sampleInfo = sampleInfo;
+            }
+
+            protected override PoolableSkinnableSample CreateNewDrawable() => base.CreateNewDrawable().With(d => d.Apply(sampleInfo));
+        }
+
         #endregion
 
         #region Editor logic
diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 4f09aec0b6..758b784649 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -14,13 +14,13 @@ namespace osu.Game.Skinning
     {
         protected bool RequestedPlaying { get; private set; }
 
-        public PausableSkinnableSound(ISampleInfo hitSamples)
-            : base(hitSamples)
+        public PausableSkinnableSound(ISampleInfo sample)
+            : base(sample)
         {
         }
 
-        public PausableSkinnableSound(IEnumerable<ISampleInfo> hitSamples)
-            : base(hitSamples)
+        public PausableSkinnableSound(IEnumerable<ISampleInfo> samples)
+            : base(samples)
         {
         }
 
diff --git a/osu.Game/Skinning/SkinReloadableDrawable.cs b/osu.Game/Skinning/SkinReloadableDrawable.cs
index cc9cbf7b59..50b4143375 100644
--- a/osu.Game/Skinning/SkinReloadableDrawable.cs
+++ b/osu.Game/Skinning/SkinReloadableDrawable.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Whether fallback to default skin should be allowed if the custom skin is missing this resource.
         /// </summary>
-        private bool allowDefaultFallback => allowFallback == null || allowFallback.Invoke(CurrentSkin);
+        protected bool AllowDefaultFallback => allowFallback == null || allowFallback.Invoke(CurrentSkin);
 
         /// <summary>
         /// Create a new <see cref="SkinReloadableDrawable"/>
@@ -58,7 +58,7 @@ namespace osu.Game.Skinning
 
         private void skinChanged()
         {
-            SkinChanged(CurrentSkin, allowDefaultFallback);
+            SkinChanged(CurrentSkin, AllowDefaultFallback);
             OnSkinChanged?.Invoke();
         }
 
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index ffa0a963ce..8410b7eeae 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -1,26 +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 System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 
 namespace osu.Game.Skinning
 {
-    public class SkinnableSound : SkinReloadableDrawable, IAdjustableAudioComponent
+    public interface IPooledSampleProvider
     {
-        private readonly ISampleInfo[] hitSamples;
+        [CanBeNull]
+        PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo);
+    }
+
+    public class PoolableSkinnableSample : SkinReloadableDrawable, IAggregateAudioAdjustment, IAdjustableAudioComponent
+    {
+        private ISampleInfo sampleInfo;
+        private DrawableSample sample;
 
         [Resolved]
-        private ISampleStore samples { get; set; }
+        private ISampleStore sampleStore { get; set; }
 
+        [Cached]
+        private readonly AudioAdjustments adjustments = new AudioAdjustments();
+
+        public PoolableSkinnableSample()
+        {
+        }
+
+        public PoolableSkinnableSample(ISampleInfo sampleInfo)
+        {
+            Apply(sampleInfo);
+        }
+
+        public void Apply(ISampleInfo sampleInfo)
+        {
+            if (this.sampleInfo != null)
+                throw new InvalidOperationException($"A {nameof(PoolableSkinnableSample)} cannot be applied multiple {nameof(ISampleInfo)}s.");
+
+            this.sampleInfo = sampleInfo;
+
+            if (LoadState >= LoadState.Ready)
+                updateSample();
+        }
+
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+            updateSample();
+        }
+
+        private void updateSample()
+        {
+            ClearInternal();
+
+            var ch = CurrentSkin.GetSample(sampleInfo);
+
+            if (ch == null && AllowDefaultFallback)
+            {
+                foreach (var lookup in sampleInfo.LookupNames)
+                {
+                    if ((ch = sampleStore.Get(lookup)) != null)
+                        break;
+                }
+            }
+
+            if (ch == null)
+                return;
+
+            AddInternal(sample = new DrawableSample(ch)
+            {
+                Looping = Looping,
+                Volume = { Value = sampleInfo.Volume / 100.0 }
+            });
+        }
+
+        public void Play(bool restart = true) => sample?.Play(restart);
+
+        public void Stop() => sample?.Stop();
+
+        public bool Playing => sample?.Playing ?? false;
+
+        private bool looping;
+
+        public bool Looping
+        {
+            get => looping;
+            set
+            {
+                looping = value;
+
+                if (sample != null)
+                    sample.Looping = value;
+            }
+        }
+
+        /// <summary>
+        /// The volume of this component.
+        /// </summary>
+        public BindableNumber<double> Volume => adjustments.Volume;
+
+        /// <summary>
+        /// The playback balance of this sample (-1 .. 1 where 0 is centered)
+        /// </summary>
+        public BindableNumber<double> Balance => adjustments.Balance;
+
+        /// <summary>
+        /// Rate at which the component is played back (affects pitch). 1 is 100% playback speed, or default frequency.
+        /// </summary>
+        public BindableNumber<double> Frequency => adjustments.Frequency;
+
+        /// <summary>
+        /// Rate at which the component is played back (does not affect pitch). 1 is 100% playback speed.
+        /// </summary>
+        public BindableNumber<double> Tempo => adjustments.Tempo;
+
+        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+            => adjustments.AddAdjustment(type, adjustBindable);
+
+        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+            => adjustments.RemoveAdjustment(type, adjustBindable);
+
+        public void RemoveAllAdjustments(AdjustableProperty type) => adjustments.RemoveAllAdjustments(type);
+
+        public IBindable<double> AggregateVolume => adjustments.AggregateVolume;
+
+        public IBindable<double> AggregateBalance => adjustments.AggregateBalance;
+
+        public IBindable<double> AggregateFrequency => adjustments.AggregateFrequency;
+
+        public IBindable<double> AggregateTempo => adjustments.AggregateTempo;
+    }
+
+    public class SkinnableSound : SkinReloadableDrawable, IAdjustableAudioComponent
+    {
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
 
@@ -34,17 +157,44 @@ namespace osu.Game.Skinning
         /// </remarks>
         protected bool PlayWhenZeroVolume => Looping;
 
-        protected readonly AudioContainer<DrawableSample> SamplesContainer;
+        protected readonly AudioContainer<PoolableSkinnableSample> SamplesContainer;
 
-        public SkinnableSound(ISampleInfo hitSamples)
-            : this(new[] { hitSamples })
+        [Resolved]
+        private ISampleStore sampleStore { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private IPooledSampleProvider pooledProvider { get; set; }
+
+        public SkinnableSound(ISampleInfo sample)
+            : this(new[] { sample })
         {
         }
 
-        public SkinnableSound(IEnumerable<ISampleInfo> hitSamples)
+        public SkinnableSound(IEnumerable<ISampleInfo> samples)
         {
-            this.hitSamples = hitSamples.ToArray();
-            InternalChild = SamplesContainer = new AudioContainer<DrawableSample>();
+            this.samples = samples.ToArray();
+
+            InternalChild = SamplesContainer = new AudioContainer<PoolableSkinnableSample>();
+        }
+
+        private ISampleInfo[] samples;
+
+        public ISampleInfo[] Samples
+        {
+            get => samples;
+            set
+            {
+                if (value == null)
+                    throw new ArgumentNullException(nameof(value));
+
+                if (samples == value)
+                    return;
+
+                samples = value;
+
+                if (LoadState >= LoadState.Ready)
+                    updateSamples();
+            }
         }
 
         private bool looping;
@@ -77,34 +227,23 @@ namespace osu.Game.Skinning
         }
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            // Start playback internally for the new samples if the previous ones were playing beforehand.
+            if (IsPlaying)
+                Play();
+        }
+
+        private void updateSamples()
         {
             bool wasPlaying = IsPlaying;
 
-            var channels = hitSamples.Select(s =>
-            {
-                var ch = skin.GetSample(s);
+            // Remove all pooled samples (return them to the pool), and dispose the rest.
+            SamplesContainer.RemoveAll(s => s.IsInPool);
+            SamplesContainer.Clear();
 
-                if (ch == null && allowFallback)
-                {
-                    foreach (var lookup in s.LookupNames)
-                    {
-                        if ((ch = samples.Get(lookup)) != null)
-                            break;
-                    }
-                }
+            foreach (var s in samples)
+                SamplesContainer.Add(pooledProvider?.GetPooledSample(s) ?? new PoolableSkinnableSample(s));
 
-                if (ch != null)
-                {
-                    ch.Looping = looping;
-                    ch.Volume.Value = s.Volume / 100.0;
-                }
-
-                return ch;
-            }).Where(c => c != null);
-
-            SamplesContainer.ChildrenEnumerable = channels.Select(c => new DrawableSample(c));
-
-            // Start playback internally for the new samples if the previous ones were playing beforehand.
             if (wasPlaying)
                 Play();
         }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 08811b9b8c..b8d212d3c9 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Storyboards.Drawables
 
             foreach (var mod in mods.Value.OfType<IApplicableToSample>())
             {
-                foreach (var sample in SamplesContainer)
-                    mod.ApplyToSample(sample);
+                // foreach (var sample in SamplesContainer)
+                //     mod.ApplyToSample(sample.Sample);
             }
         }
 

From 003fed857c9f35c258f6ad1499d8e5bc4e624827 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 19:52:34 +0900
Subject: [PATCH 06311/10326] Separate files

---
 osu.Game/Skinning/IPooledSampleProvider.cs   |  14 ++
 osu.Game/Skinning/PoolableSkinnableSample.cs | 133 +++++++++++++++++++
 osu.Game/Skinning/SkinnableSound.cs          | 127 ------------------
 3 files changed, 147 insertions(+), 127 deletions(-)
 create mode 100644 osu.Game/Skinning/IPooledSampleProvider.cs
 create mode 100644 osu.Game/Skinning/PoolableSkinnableSample.cs

diff --git a/osu.Game/Skinning/IPooledSampleProvider.cs b/osu.Game/Skinning/IPooledSampleProvider.cs
new file mode 100644
index 0000000000..3dc0b5375d
--- /dev/null
+++ b/osu.Game/Skinning/IPooledSampleProvider.cs
@@ -0,0 +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 JetBrains.Annotations;
+using osu.Game.Audio;
+
+namespace osu.Game.Skinning
+{
+    public interface IPooledSampleProvider
+    {
+        [CanBeNull]
+        PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo);
+    }
+}
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
new file mode 100644
index 0000000000..6ad7345954
--- /dev/null
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -0,0 +1,133 @@
+// Copyright (c) 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.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Audio;
+using osu.Game.Audio;
+
+namespace osu.Game.Skinning
+{
+    public class PoolableSkinnableSample : SkinReloadableDrawable, IAggregateAudioAdjustment, IAdjustableAudioComponent
+    {
+        private ISampleInfo sampleInfo;
+        private DrawableSample sample;
+
+        [Resolved]
+        private ISampleStore sampleStore { get; set; }
+
+        [Cached]
+        private readonly AudioAdjustments adjustments = new AudioAdjustments();
+
+        public PoolableSkinnableSample()
+        {
+        }
+
+        public PoolableSkinnableSample(ISampleInfo sampleInfo)
+        {
+            Apply(sampleInfo);
+        }
+
+        public void Apply(ISampleInfo sampleInfo)
+        {
+            if (this.sampleInfo != null)
+                throw new InvalidOperationException($"A {nameof(PoolableSkinnableSample)} cannot be applied multiple {nameof(ISampleInfo)}s.");
+
+            this.sampleInfo = sampleInfo;
+
+            if (LoadState >= LoadState.Ready)
+                updateSample();
+        }
+
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+            updateSample();
+        }
+
+        private void updateSample()
+        {
+            ClearInternal();
+
+            var ch = CurrentSkin.GetSample(sampleInfo);
+
+            if (ch == null && AllowDefaultFallback)
+            {
+                foreach (var lookup in sampleInfo.LookupNames)
+                {
+                    if ((ch = sampleStore.Get(lookup)) != null)
+                        break;
+                }
+            }
+
+            if (ch == null)
+                return;
+
+            AddInternal(sample = new DrawableSample(ch)
+            {
+                Looping = Looping,
+                Volume = { Value = sampleInfo.Volume / 100.0 }
+            });
+        }
+
+        public void Play(bool restart = true) => sample?.Play(restart);
+
+        public void Stop() => sample?.Stop();
+
+        public bool Playing => sample?.Playing ?? false;
+
+        private bool looping;
+
+        public bool Looping
+        {
+            get => looping;
+            set
+            {
+                looping = value;
+
+                if (sample != null)
+                    sample.Looping = value;
+            }
+        }
+
+        /// <summary>
+        /// The volume of this component.
+        /// </summary>
+        public BindableNumber<double> Volume => adjustments.Volume;
+
+        /// <summary>
+        /// The playback balance of this sample (-1 .. 1 where 0 is centered)
+        /// </summary>
+        public BindableNumber<double> Balance => adjustments.Balance;
+
+        /// <summary>
+        /// Rate at which the component is played back (affects pitch). 1 is 100% playback speed, or default frequency.
+        /// </summary>
+        public BindableNumber<double> Frequency => adjustments.Frequency;
+
+        /// <summary>
+        /// Rate at which the component is played back (does not affect pitch). 1 is 100% playback speed.
+        /// </summary>
+        public BindableNumber<double> Tempo => adjustments.Tempo;
+
+        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+            => adjustments.AddAdjustment(type, adjustBindable);
+
+        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+            => adjustments.RemoveAdjustment(type, adjustBindable);
+
+        public void RemoveAllAdjustments(AdjustableProperty type) => adjustments.RemoveAllAdjustments(type);
+
+        public IBindable<double> AggregateVolume => adjustments.AggregateVolume;
+
+        public IBindable<double> AggregateBalance => adjustments.AggregateBalance;
+
+        public IBindable<double> AggregateFrequency => adjustments.AggregateFrequency;
+
+        public IBindable<double> AggregateTempo => adjustments.AggregateTempo;
+    }
+}
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 8410b7eeae..77ae8f1e16 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -4,144 +4,17 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 
 namespace osu.Game.Skinning
 {
-    public interface IPooledSampleProvider
-    {
-        [CanBeNull]
-        PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo);
-    }
-
-    public class PoolableSkinnableSample : SkinReloadableDrawable, IAggregateAudioAdjustment, IAdjustableAudioComponent
-    {
-        private ISampleInfo sampleInfo;
-        private DrawableSample sample;
-
-        [Resolved]
-        private ISampleStore sampleStore { get; set; }
-
-        [Cached]
-        private readonly AudioAdjustments adjustments = new AudioAdjustments();
-
-        public PoolableSkinnableSample()
-        {
-        }
-
-        public PoolableSkinnableSample(ISampleInfo sampleInfo)
-        {
-            Apply(sampleInfo);
-        }
-
-        public void Apply(ISampleInfo sampleInfo)
-        {
-            if (this.sampleInfo != null)
-                throw new InvalidOperationException($"A {nameof(PoolableSkinnableSample)} cannot be applied multiple {nameof(ISampleInfo)}s.");
-
-            this.sampleInfo = sampleInfo;
-
-            if (LoadState >= LoadState.Ready)
-                updateSample();
-        }
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-            updateSample();
-        }
-
-        private void updateSample()
-        {
-            ClearInternal();
-
-            var ch = CurrentSkin.GetSample(sampleInfo);
-
-            if (ch == null && AllowDefaultFallback)
-            {
-                foreach (var lookup in sampleInfo.LookupNames)
-                {
-                    if ((ch = sampleStore.Get(lookup)) != null)
-                        break;
-                }
-            }
-
-            if (ch == null)
-                return;
-
-            AddInternal(sample = new DrawableSample(ch)
-            {
-                Looping = Looping,
-                Volume = { Value = sampleInfo.Volume / 100.0 }
-            });
-        }
-
-        public void Play(bool restart = true) => sample?.Play(restart);
-
-        public void Stop() => sample?.Stop();
-
-        public bool Playing => sample?.Playing ?? false;
-
-        private bool looping;
-
-        public bool Looping
-        {
-            get => looping;
-            set
-            {
-                looping = value;
-
-                if (sample != null)
-                    sample.Looping = value;
-            }
-        }
-
-        /// <summary>
-        /// The volume of this component.
-        /// </summary>
-        public BindableNumber<double> Volume => adjustments.Volume;
-
-        /// <summary>
-        /// The playback balance of this sample (-1 .. 1 where 0 is centered)
-        /// </summary>
-        public BindableNumber<double> Balance => adjustments.Balance;
-
-        /// <summary>
-        /// Rate at which the component is played back (affects pitch). 1 is 100% playback speed, or default frequency.
-        /// </summary>
-        public BindableNumber<double> Frequency => adjustments.Frequency;
-
-        /// <summary>
-        /// Rate at which the component is played back (does not affect pitch). 1 is 100% playback speed.
-        /// </summary>
-        public BindableNumber<double> Tempo => adjustments.Tempo;
-
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => adjustments.AddAdjustment(type, adjustBindable);
-
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => adjustments.RemoveAdjustment(type, adjustBindable);
-
-        public void RemoveAllAdjustments(AdjustableProperty type) => adjustments.RemoveAllAdjustments(type);
-
-        public IBindable<double> AggregateVolume => adjustments.AggregateVolume;
-
-        public IBindable<double> AggregateBalance => adjustments.AggregateBalance;
-
-        public IBindable<double> AggregateFrequency => adjustments.AggregateFrequency;
-
-        public IBindable<double> AggregateTempo => adjustments.AggregateTempo;
-    }
-
     public class SkinnableSound : SkinReloadableDrawable, IAdjustableAudioComponent
     {
         public override bool RemoveWhenNotAlive => false;

From 8920534a255fe7c182a33d3200a8c23dd177e299 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 20:24:03 +0900
Subject: [PATCH 06312/10326] Fix pools not being added to hierarchy

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

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 9f3a4c508f..5383c4b2ce 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -348,7 +348,7 @@ namespace osu.Game.Rulesets.UI
         public PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo)
         {
             if (!samplePools.TryGetValue(sampleInfo, out var existingPool))
-                samplePools[sampleInfo] = existingPool = new DrawableSamplePool(sampleInfo, 5);
+                AddInternal(samplePools[sampleInfo] = existingPool = new DrawableSamplePool(sampleInfo, 5));
 
             return existingPool.Get();
         }

From 812d5d59b1ac12757a86cb44bd6447b9f7d60846 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 20:29:09 +0900
Subject: [PATCH 06313/10326] Fix looping not being propagated

---
 osu.Game/Skinning/SkinnableSound.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 77ae8f1e16..eca1b9b03f 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -115,7 +115,12 @@ namespace osu.Game.Skinning
             SamplesContainer.Clear();
 
             foreach (var s in samples)
-                SamplesContainer.Add(pooledProvider?.GetPooledSample(s) ?? new PoolableSkinnableSample(s));
+            {
+                var sample = pooledProvider?.GetPooledSample(s) ?? new PoolableSkinnableSample(s);
+                sample.Looping = Looping;
+
+                SamplesContainer.Add(sample);
+            }
 
             if (wasPlaying)
                 Play();

From 70cb1979578e51fda79a41b12f2767777d64cf08 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 20:38:36 +0900
Subject: [PATCH 06314/10326] Cleanups

---
 .../Objects/Drawables/DrawableHitObject.cs        |  7 +++----
 osu.Game/Skinning/PausableSkinnableSound.cs       | 11 ++++++++---
 osu.Game/Skinning/SkinnableSound.cs               | 15 ++++++++++-----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 0d97066b35..26d2ffe3ce 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             config.BindWith(OsuSetting.PositionalHitSounds, userPositionalHitSounds);
 
             // Explicit non-virtual function call.
-            base.AddInternal(Samples = new PausableSkinnableSound(Array.Empty<ISampleInfo>()));
+            base.AddInternal(Samples = new PausableSkinnableSound());
         }
 
         protected override void LoadAsyncComplete()
@@ -266,7 +266,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             // In order to stop this needless update, the event is unbound and re-bound as late as possible in Apply().
             samplesBindable.CollectionChanged -= onSamplesChanged;
 
-            Samples.Samples = Array.Empty<ISampleInfo>();
+            // Release the samples for other hitobjects to use.
+            Samples.Samples = null;
 
             if (nestedHitObjects.IsValueCreated)
             {
@@ -334,8 +335,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         protected virtual void LoadSamples()
         {
-            Samples.Samples = Array.Empty<ISampleInfo>();
-
             var samples = GetSamples().ToArray();
 
             if (samples.Length <= 0)
diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 758b784649..be4664356d 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Threading;
@@ -14,16 +15,20 @@ namespace osu.Game.Skinning
     {
         protected bool RequestedPlaying { get; private set; }
 
-        public PausableSkinnableSound(ISampleInfo sample)
-            : base(sample)
+        public PausableSkinnableSound()
         {
         }
 
-        public PausableSkinnableSound(IEnumerable<ISampleInfo> samples)
+        public PausableSkinnableSound([NotNull] IEnumerable<ISampleInfo> samples)
             : base(samples)
         {
         }
 
+        public PausableSkinnableSound([NotNull] ISampleInfo sample)
+            : base(sample)
+        {
+        }
+
         private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
 
         private ScheduledDelegate scheduledStart;
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index eca1b9b03f..67d13118d9 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
@@ -38,18 +39,23 @@ namespace osu.Game.Skinning
         [Resolved(CanBeNull = true)]
         private IPooledSampleProvider pooledProvider { get; set; }
 
-        public SkinnableSound(ISampleInfo sample)
-            : this(new[] { sample })
+        public SkinnableSound()
         {
         }
 
-        public SkinnableSound(IEnumerable<ISampleInfo> samples)
+        public SkinnableSound([NotNull] IEnumerable<ISampleInfo> samples)
+            : this()
         {
             this.samples = samples.ToArray();
 
             InternalChild = SamplesContainer = new AudioContainer<PoolableSkinnableSample>();
         }
 
+        public SkinnableSound([NotNull] ISampleInfo sample)
+            : this(new[] { sample })
+        {
+        }
+
         private ISampleInfo[] samples;
 
         public ISampleInfo[] Samples
@@ -57,8 +63,7 @@ namespace osu.Game.Skinning
             get => samples;
             set
             {
-                if (value == null)
-                    throw new ArgumentNullException(nameof(value));
+                value ??= Array.Empty<ISampleInfo>();
 
                 if (samples == value)
                     return;

From f013928fa3dd7c0293cef09c8c2b651ea2e8e314 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 20:40:01 +0900
Subject: [PATCH 06315/10326] Set maximum pool size

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

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 5383c4b2ce..6e89f20246 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -348,7 +348,7 @@ namespace osu.Game.Rulesets.UI
         public PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo)
         {
             if (!samplePools.TryGetValue(sampleInfo, out var existingPool))
-                AddInternal(samplePools[sampleInfo] = existingPool = new DrawableSamplePool(sampleInfo, 5));
+                AddInternal(samplePools[sampleInfo] = existingPool = new DrawableSamplePool(sampleInfo, 1, 30));
 
             return existingPool.Get();
         }

From 688a04c2ff8e6a931b67ed4a36337508f5555d22 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 20:40:30 +0900
Subject: [PATCH 06316/10326] Make slider/spinner use pooled samples

---
 .../Objects/Drawables/DrawableSlider.cs       | 17 ++++-------
 .../Objects/Drawables/DrawableSpinner.cs      | 29 +++++++++++--------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 14c494d909..b62c04eed9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Audio;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.UI;
@@ -40,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Container<DrawableSliderTail> tailContainer;
         private Container<DrawableSliderTick> tickContainer;
         private Container<DrawableSliderRepeat> repeatContainer;
-        private Container<PausableSkinnableSound> samplesContainer;
+        private PausableSkinnableSound slidingSample;
 
         public DrawableSlider()
             : this(null)
@@ -69,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Alpha = 0
                 },
                 headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both },
-                samplesContainer = new Container<PausableSkinnableSound> { RelativeSizeAxes = Axes.Both }
+                slidingSample = new PausableSkinnableSound { Looping = true }
             };
 
             PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
@@ -100,17 +101,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.OnFree(hitObject);
 
             PathVersion.UnbindFrom(HitObject.Path.Version);
-        }
 
-        private PausableSkinnableSound slidingSample;
+            slidingSample.Samples = null;
+        }
 
         protected override void LoadSamples()
         {
             base.LoadSamples();
 
-            samplesContainer.Clear();
-            slidingSample = null;
-
             var firstSample = HitObject.Samples.FirstOrDefault();
 
             if (firstSample != null)
@@ -118,10 +116,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
                 clone.Name = "sliderslide";
 
-                samplesContainer.Add(slidingSample = new PausableSkinnableSound(clone)
-                {
-                    Looping = true
-                });
+                slidingSample.Samples = new ISampleInfo[] { clone };
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 2a14a7c975..e5fc717504 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -9,6 +9,7 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -33,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private Container<DrawableSpinnerTick> ticks;
         private SpinnerBonusDisplay bonusDisplay;
-        private Container<PausableSkinnableSound> samplesContainer;
+        private PausableSkinnableSound spinningSample;
 
         private Bindable<bool> isSpinning;
         private bool spinnerFrequencyModulate;
@@ -81,7 +82,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Origin = Anchor.Centre,
                     Y = -120,
                 },
-                samplesContainer = new Container<PausableSkinnableSound> { RelativeSizeAxes = Axes.Both }
+                spinningSample = new PausableSkinnableSound
+                {
+                    Volume = { Value = 0 },
+                    Looping = true,
+                    Frequency = { Value = spinning_sample_initial_frequency }
+                }
             };
 
             PositionBindable.BindValueChanged(pos => Position = pos.NewValue);
@@ -95,17 +101,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             isSpinning.BindValueChanged(updateSpinningSample);
         }
 
-        private PausableSkinnableSound spinningSample;
         private const float spinning_sample_initial_frequency = 1.0f;
         private const float spinning_sample_modulated_base_frequency = 0.5f;
 
+        protected override void OnFree(HitObject hitObject)
+        {
+            base.OnFree(hitObject);
+
+            spinningSample.Samples = null;
+        }
+
         protected override void LoadSamples()
         {
             base.LoadSamples();
 
-            samplesContainer.Clear();
-            spinningSample = null;
-
             var firstSample = HitObject.Samples.FirstOrDefault();
 
             if (firstSample != null)
@@ -113,12 +122,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
                 clone.Name = "spinnerspin";
 
-                samplesContainer.Add(spinningSample = new PausableSkinnableSound(clone)
-                {
-                    Volume = { Value = 0 },
-                    Looping = true,
-                    Frequency = { Value = spinning_sample_initial_frequency }
-                });
+                spinningSample.Samples = new ISampleInfo[] { clone };
+                spinningSample.Frequency.Value = spinning_sample_initial_frequency;
             }
         }
 

From 0287269b2fed663d910f9571042accfe3a11d185 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 21:01:38 +0900
Subject: [PATCH 06317/10326] Fix volume discrepancies

---
 osu.Game/Skinning/PoolableSkinnableSample.cs | 42 ++++++++++----------
 osu.Game/Skinning/SkinnableSound.cs          |  4 +-
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 6ad7345954..ad799dd32e 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -8,26 +8,28 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 
 namespace osu.Game.Skinning
 {
     public class PoolableSkinnableSample : SkinReloadableDrawable, IAggregateAudioAdjustment, IAdjustableAudioComponent
     {
+        private readonly AudioContainer<DrawableSample> sampleContainer;
+
         private ISampleInfo sampleInfo;
         private DrawableSample sample;
 
         [Resolved]
         private ISampleStore sampleStore { get; set; }
 
-        [Cached]
-        private readonly AudioAdjustments adjustments = new AudioAdjustments();
-
         public PoolableSkinnableSample()
         {
+            InternalChild = sampleContainer = new AudioContainer<DrawableSample> { RelativeSizeAxes = Axes.Both };
         }
 
         public PoolableSkinnableSample(ISampleInfo sampleInfo)
+            : this()
         {
             Apply(sampleInfo);
         }
@@ -39,6 +41,8 @@ namespace osu.Game.Skinning
 
             this.sampleInfo = sampleInfo;
 
+            Volume.Value = sampleInfo.Volume / 100.0;
+
             if (LoadState >= LoadState.Ready)
                 updateSample();
         }
@@ -51,7 +55,7 @@ namespace osu.Game.Skinning
 
         private void updateSample()
         {
-            ClearInternal();
+            sampleContainer.Clear();
 
             var ch = CurrentSkin.GetSample(sampleInfo);
 
@@ -67,11 +71,7 @@ namespace osu.Game.Skinning
             if (ch == null)
                 return;
 
-            AddInternal(sample = new DrawableSample(ch)
-            {
-                Looping = Looping,
-                Volume = { Value = sampleInfo.Volume / 100.0 }
-            });
+            sampleContainer.Add(sample = new DrawableSample(ch) { Looping = Looping });
         }
 
         public void Play(bool restart = true) => sample?.Play(restart);
@@ -97,37 +97,35 @@ namespace osu.Game.Skinning
         /// <summary>
         /// The volume of this component.
         /// </summary>
-        public BindableNumber<double> Volume => adjustments.Volume;
+        public BindableNumber<double> Volume => sampleContainer.Volume;
 
         /// <summary>
         /// The playback balance of this sample (-1 .. 1 where 0 is centered)
         /// </summary>
-        public BindableNumber<double> Balance => adjustments.Balance;
+        public BindableNumber<double> Balance => sampleContainer.Balance;
 
         /// <summary>
         /// Rate at which the component is played back (affects pitch). 1 is 100% playback speed, or default frequency.
         /// </summary>
-        public BindableNumber<double> Frequency => adjustments.Frequency;
+        public BindableNumber<double> Frequency => sampleContainer.Frequency;
 
         /// <summary>
         /// Rate at which the component is played back (does not affect pitch). 1 is 100% playback speed.
         /// </summary>
-        public BindableNumber<double> Tempo => adjustments.Tempo;
+        public BindableNumber<double> Tempo => sampleContainer.Tempo;
 
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => adjustments.AddAdjustment(type, adjustBindable);
+        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
 
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => adjustments.RemoveAdjustment(type, adjustBindable);
+        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => sampleContainer.RemoveAdjustment(type, adjustBindable);
 
-        public void RemoveAllAdjustments(AdjustableProperty type) => adjustments.RemoveAllAdjustments(type);
+        public void RemoveAllAdjustments(AdjustableProperty type) => sampleContainer.RemoveAllAdjustments(type);
 
-        public IBindable<double> AggregateVolume => adjustments.AggregateVolume;
+        public IBindable<double> AggregateVolume => sampleContainer.AggregateVolume;
 
-        public IBindable<double> AggregateBalance => adjustments.AggregateBalance;
+        public IBindable<double> AggregateBalance => sampleContainer.AggregateBalance;
 
-        public IBindable<double> AggregateFrequency => adjustments.AggregateFrequency;
+        public IBindable<double> AggregateFrequency => sampleContainer.AggregateFrequency;
 
-        public IBindable<double> AggregateTempo => adjustments.AggregateTempo;
+        public IBindable<double> AggregateTempo => sampleContainer.AggregateTempo;
     }
 }
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 67d13118d9..8dc3337525 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -41,14 +41,13 @@ namespace osu.Game.Skinning
 
         public SkinnableSound()
         {
+            InternalChild = SamplesContainer = new AudioContainer<PoolableSkinnableSample>();
         }
 
         public SkinnableSound([NotNull] IEnumerable<ISampleInfo> samples)
             : this()
         {
             this.samples = samples.ToArray();
-
-            InternalChild = SamplesContainer = new AudioContainer<PoolableSkinnableSample>();
         }
 
         public SkinnableSound([NotNull] ISampleInfo sample)
@@ -123,6 +122,7 @@ namespace osu.Game.Skinning
             {
                 var sample = pooledProvider?.GetPooledSample(s) ?? new PoolableSkinnableSample(s);
                 sample.Looping = Looping;
+                sample.Volume.Value = s.Volume / 100.0;
 
                 SamplesContainer.Add(sample);
             }

From 7180bfe4ba904507fd944d42bad39296a559dabc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 21:21:57 +0900
Subject: [PATCH 06318/10326] Unlimit number of samples per pool

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

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 6e89f20246..460251e595 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -348,7 +348,7 @@ namespace osu.Game.Rulesets.UI
         public PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo)
         {
             if (!samplePools.TryGetValue(sampleInfo, out var existingPool))
-                AddInternal(samplePools[sampleInfo] = existingPool = new DrawableSamplePool(sampleInfo, 1, 30));
+                AddInternal(samplePools[sampleInfo] = existingPool = new DrawableSamplePool(sampleInfo, 1));
 
             return existingPool.Get();
         }

From d388c44428c74f2ce32cb48b0a83f900497f46b7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 22:30:21 +0900
Subject: [PATCH 06319/10326] Cleanup, refactoring, and restart sample on skin
 change

---
 osu.Game/Skinning/PoolableSkinnableSample.cs | 72 ++++++++++++++------
 osu.Game/Skinning/SkinnableSound.cs          |  7 --
 2 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index ad799dd32e..e38b309efb 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
@@ -13,27 +14,48 @@ using osu.Game.Audio;
 
 namespace osu.Game.Skinning
 {
+    /// <summary>
+    /// A sample corresponding to an <see cref="ISampleInfo"/> that supports being pooled and responding to skin changes.
+    /// </summary>
     public class PoolableSkinnableSample : SkinReloadableDrawable, IAggregateAudioAdjustment, IAdjustableAudioComponent
     {
-        private readonly AudioContainer<DrawableSample> sampleContainer;
+        /// <summary>
+        /// The currently-loaded <see cref="DrawableSample"/>.
+        /// </summary>
+        [CanBeNull]
+        public DrawableSample Sample { get; private set; }
 
+        private readonly AudioContainer<DrawableSample> sampleContainer;
         private ISampleInfo sampleInfo;
-        private DrawableSample sample;
 
         [Resolved]
         private ISampleStore sampleStore { get; set; }
 
+        /// <summary>
+        /// Creates a new <see cref="PoolableSkinnableSample"/> with no applied <see cref="ISampleInfo"/>.
+        /// An <see cref="ISampleInfo"/> can be applied later via <see cref="Apply"/>.
+        /// </summary>
         public PoolableSkinnableSample()
         {
             InternalChild = sampleContainer = new AudioContainer<DrawableSample> { RelativeSizeAxes = Axes.Both };
         }
 
+        /// <summary>
+        /// Creates a new <see cref="PoolableSkinnableSample"/> with an applied <see cref="ISampleInfo"/>.
+        /// </summary>
+        /// <param name="sampleInfo">The <see cref="ISampleInfo"/> to attach.</param>
         public PoolableSkinnableSample(ISampleInfo sampleInfo)
             : this()
         {
             Apply(sampleInfo);
         }
 
+        /// <summary>
+        /// Applies an <see cref="ISampleInfo"/> that describes the sample to retrieve.
+        /// Only one <see cref="ISampleInfo"/> can ever be applied to a <see cref="PoolableSkinnableSample"/>.
+        /// </summary>
+        /// <param name="sampleInfo">The <see cref="ISampleInfo"/> to apply.</param>
+        /// <exception cref="InvalidOperationException">If an <see cref="ISampleInfo"/> has already been applied to this <see cref="PoolableSkinnableSample"/>.</exception>
         public void Apply(ISampleInfo sampleInfo)
         {
             if (this.sampleInfo != null)
@@ -55,6 +77,11 @@ namespace osu.Game.Skinning
 
         private void updateSample()
         {
+            if (sampleInfo == null)
+                return;
+
+            bool wasPlaying = Playing;
+
             sampleContainer.Clear();
 
             var ch = CurrentSkin.GetSample(sampleInfo);
@@ -71,17 +98,34 @@ namespace osu.Game.Skinning
             if (ch == null)
                 return;
 
-            sampleContainer.Add(sample = new DrawableSample(ch) { Looping = Looping });
+            sampleContainer.Add(Sample = new DrawableSample(ch) { Looping = Looping });
+
+            // Start playback internally for the new sample if the previous one was playing beforehand.
+            if (wasPlaying)
+                Play();
         }
 
-        public void Play(bool restart = true) => sample?.Play(restart);
+        /// <summary>
+        /// Plays the sample.
+        /// </summary>
+        /// <param name="restart">Whether to play the sample from the beginning.</param>
+        public void Play(bool restart = true) => Sample?.Play(restart);
 
-        public void Stop() => sample?.Stop();
+        /// <summary>
+        /// Stops the sample.
+        /// </summary>
+        public void Stop() => Sample?.Stop();
 
-        public bool Playing => sample?.Playing ?? false;
+        /// <summary>
+        /// Whether the sample is currently playing.
+        /// </summary>
+        public bool Playing => Sample?.Playing ?? false;
 
         private bool looping;
 
+        /// <summary>
+        /// Gets or sets whether the sample should loop on completion.
+        /// </summary>
         public bool Looping
         {
             get => looping;
@@ -89,29 +133,17 @@ namespace osu.Game.Skinning
             {
                 looping = value;
 
-                if (sample != null)
-                    sample.Looping = value;
+                if (Sample != null)
+                    Sample.Looping = value;
             }
         }
 
-        /// <summary>
-        /// The volume of this component.
-        /// </summary>
         public BindableNumber<double> Volume => sampleContainer.Volume;
 
-        /// <summary>
-        /// The playback balance of this sample (-1 .. 1 where 0 is centered)
-        /// </summary>
         public BindableNumber<double> Balance => sampleContainer.Balance;
 
-        /// <summary>
-        /// Rate at which the component is played back (affects pitch). 1 is 100% playback speed, or default frequency.
-        /// </summary>
         public BindableNumber<double> Frequency => sampleContainer.Frequency;
 
-        /// <summary>
-        /// Rate at which the component is played back (does not affect pitch). 1 is 100% playback speed.
-        /// </summary>
         public BindableNumber<double> Tempo => sampleContainer.Tempo;
 
         public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 8dc3337525..0f39784138 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -103,13 +103,6 @@ namespace osu.Game.Skinning
             SamplesContainer.ForEach(c => c.Stop());
         }
 
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            // Start playback internally for the new samples if the previous ones were playing beforehand.
-            if (IsPlaying)
-                Play();
-        }
-
         private void updateSamples()
         {
             bool wasPlaying = IsPlaying;

From a53848ef9bbc09b8c4c75a044c3db6a543f85dc0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 22:30:41 +0900
Subject: [PATCH 06320/10326] Fix storyboard imlpementation

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index b8d212d3c9..904af730de 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Storyboards.Drawables
 
             foreach (var mod in mods.Value.OfType<IApplicableToSample>())
             {
-                // foreach (var sample in SamplesContainer)
-                //     mod.ApplyToSample(sample.Sample);
+                foreach (var sample in SamplesContainer)
+                    mod.ApplyToSample(sample.Sample);
             }
         }
 

From 8a656f7cee1ac51578420e9e9576c8055a8fde67 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 22:42:44 +0900
Subject: [PATCH 06321/10326] Fix missing SkinChanged event + safety

---
 osu.Game/Skinning/SkinnableSound.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 0f39784138..bb747a2176 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Skinning
         {
         }
 
-        private ISampleInfo[] samples;
+        private ISampleInfo[] samples = Array.Empty<ISampleInfo>();
 
         public ISampleInfo[] Samples
         {
@@ -103,6 +103,12 @@ namespace osu.Game.Skinning
             SamplesContainer.ForEach(c => c.Stop());
         }
 
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+            updateSamples();
+        }
+
         private void updateSamples()
         {
             bool wasPlaying = IsPlaying;

From 7c83a27002a033a114b42a6b933c998d8858f5fa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Nov 2020 22:47:11 +0900
Subject: [PATCH 06322/10326] Add more xmldocs

---
 osu.Game/Skinning/PoolableSkinnableSample.cs |  2 +-
 osu.Game/Skinning/SkinnableSound.cs          | 29 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index e38b309efb..adc58ee94e 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Skinning
         private bool looping;
 
         /// <summary>
-        /// Gets or sets whether the sample should loop on completion.
+        /// Whether the sample should loop on completion.
         /// </summary>
         public bool Looping
         {
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index bb747a2176..24dddaf758 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -16,6 +16,9 @@ using osu.Game.Audio;
 
 namespace osu.Game.Skinning
 {
+    /// <summary>
+    /// A sound consisting of one or more samples to be played.
+    /// </summary>
     public class SkinnableSound : SkinReloadableDrawable, IAdjustableAudioComponent
     {
         public override bool RemoveWhenNotAlive => false;
@@ -39,17 +42,28 @@ namespace osu.Game.Skinning
         [Resolved(CanBeNull = true)]
         private IPooledSampleProvider pooledProvider { get; set; }
 
+        /// <summary>
+        /// Creates a new <see cref="SkinnableSound"/>.
+        /// </summary>
         public SkinnableSound()
         {
             InternalChild = SamplesContainer = new AudioContainer<PoolableSkinnableSample>();
         }
 
+        /// <summary>
+        /// Creates a new <see cref="SkinnableSound"/> with some initial samples.
+        /// </summary>
+        /// <param name="samples">The initial samples.</param>
         public SkinnableSound([NotNull] IEnumerable<ISampleInfo> samples)
             : this()
         {
             this.samples = samples.ToArray();
         }
 
+        /// <summary>
+        /// Creates a new <see cref="SkinnableSound"/> with an initial sample.
+        /// </summary>
+        /// <param name="sample">The initial sample.</param>
         public SkinnableSound([NotNull] ISampleInfo sample)
             : this(new[] { sample })
         {
@@ -57,6 +71,9 @@ namespace osu.Game.Skinning
 
         private ISampleInfo[] samples = Array.Empty<ISampleInfo>();
 
+        /// <summary>
+        /// The samples that should be played.
+        /// </summary>
         public ISampleInfo[] Samples
         {
             get => samples;
@@ -76,6 +93,9 @@ namespace osu.Game.Skinning
 
         private bool looping;
 
+        /// <summary>
+        /// Whether the samples should loop on completion.
+        /// </summary>
         public bool Looping
         {
             get => looping;
@@ -89,6 +109,9 @@ namespace osu.Game.Skinning
             }
         }
 
+        /// <summary>
+        /// Plays the samples.
+        /// </summary>
         public virtual void Play()
         {
             SamplesContainer.ForEach(c =>
@@ -98,6 +121,9 @@ namespace osu.Game.Skinning
             });
         }
 
+        /// <summary>
+        /// Stops the samples.
+        /// </summary>
         public virtual void Stop()
         {
             SamplesContainer.ForEach(c => c.Stop());
@@ -149,6 +175,9 @@ namespace osu.Game.Skinning
         public void RemoveAllAdjustments(AdjustableProperty type)
             => SamplesContainer.RemoveAllAdjustments(type);
 
+        /// <summary>
+        /// Whether any samples currently playing.
+        /// </summary>
         public bool IsPlaying => SamplesContainer.Any(s => s.Playing);
 
         #endregion

From d467a00eeac6f04e6b192c7513538b22e3d1f0d1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 00:11:31 +0900
Subject: [PATCH 06323/10326] Add initial followpoint pooling implementation

---
 .../TestSceneFollowPoints.cs                  | 552 +++++++++---------
 .../Drawables/Connections/FollowPoint.cs      |   5 +-
 .../Connections/FollowPointConnection.cs      | 134 +----
 .../Connections/FollowPointRenderer.cs        | 167 ++++--
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |   4 +-
 5 files changed, 423 insertions(+), 439 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
index 6c077eb214..3ebb747a21 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
@@ -1,276 +1,276 @@
-// Copyright (c) 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.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;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
-using osu.Game.Tests.Visual;
-using osuTK;
-
-namespace osu.Game.Rulesets.Osu.Tests
-{
-    public class TestSceneFollowPoints : OsuTestScene
-    {
-        private Container<DrawableOsuHitObject> hitObjectContainer;
-        private FollowPointRenderer followPointRenderer;
-
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            Children = new Drawable[]
-            {
-                hitObjectContainer = new TestHitObjectContainer { RelativeSizeAxes = Axes.Both },
-                followPointRenderer = new FollowPointRenderer { RelativeSizeAxes = Axes.Both }
-            };
-        });
-
-        [Test]
-        public void TestAddObject()
-        {
-            addObjectsStep(() => new OsuHitObject[] { new HitCircle { Position = new Vector2(100, 100) } });
-
-            assertGroups();
-        }
-
-        [Test]
-        public void TestRemoveObject()
-        {
-            addObjectsStep(() => new OsuHitObject[] { new HitCircle { Position = new Vector2(100, 100) } });
-
-            removeObjectStep(() => getObject(0));
-
-            assertGroups();
-        }
-
-        [Test]
-        public void TestAddMultipleObjects()
-        {
-            addMultipleObjectsStep();
-
-            assertGroups();
-        }
-
-        [Test]
-        public void TestRemoveEndObject()
-        {
-            addMultipleObjectsStep();
-
-            removeObjectStep(() => getObject(4));
-
-            assertGroups();
-        }
-
-        [Test]
-        public void TestRemoveStartObject()
-        {
-            addMultipleObjectsStep();
-
-            removeObjectStep(() => getObject(0));
-
-            assertGroups();
-        }
-
-        [Test]
-        public void TestRemoveMiddleObject()
-        {
-            addMultipleObjectsStep();
-
-            removeObjectStep(() => getObject(2));
-
-            assertGroups();
-        }
-
-        [Test]
-        public void TestMoveObject()
-        {
-            addMultipleObjectsStep();
-
-            AddStep("move hitobject", () => getObject(2).HitObject.Position = new Vector2(300, 100));
-
-            assertGroups();
-        }
-
-        [TestCase(0, 0)] // Start -> Start
-        [TestCase(0, 2)] // Start -> Middle
-        [TestCase(0, 5)] // Start -> End
-        [TestCase(2, 0)] // Middle -> Start
-        [TestCase(1, 3)] // Middle -> Middle (forwards)
-        [TestCase(3, 1)] // Middle -> Middle (backwards)
-        [TestCase(4, 0)] // End -> Start
-        [TestCase(4, 2)] // End -> Middle
-        [TestCase(4, 4)] // End -> End
-        public void TestReorderObjects(int startIndex, int endIndex)
-        {
-            addMultipleObjectsStep();
-
-            reorderObjectStep(startIndex, endIndex);
-
-            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) },
-            new HitCircle { Position = new Vector2(200, 200) },
-            new HitCircle { Position = new Vector2(300, 300) },
-            new HitCircle { Position = new Vector2(400, 400) },
-            new HitCircle { Position = new Vector2(500, 500) },
-        });
-
-        private void addObjectsStep(Func<OsuHitObject[]> ctorFunc)
-        {
-            AddStep("add hitobjects", () =>
-            {
-                var objects = ctorFunc();
-
-                for (int i = 0; i < objects.Length; i++)
-                {
-                    objects[i].StartTime = Time.Current + 1000 + 500 * (i + 1);
-                    objects[i].ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-                    DrawableOsuHitObject drawableObject = null;
-
-                    switch (objects[i])
-                    {
-                        case HitCircle circle:
-                            drawableObject = new DrawableHitCircle(circle);
-                            break;
-
-                        case Slider slider:
-                            drawableObject = new DrawableSlider(slider);
-                            break;
-
-                        case Spinner spinner:
-                            drawableObject = new DrawableSpinner(spinner);
-                            break;
-                    }
-
-                    hitObjectContainer.Add(drawableObject);
-                    followPointRenderer.AddFollowPoints(objects[i]);
-                }
-            });
-        }
-
-        private void removeObjectStep(Func<DrawableOsuHitObject> getFunc)
-        {
-            AddStep("remove hitobject", () =>
-            {
-                var drawableObject = getFunc.Invoke();
-
-                hitObjectContainer.Remove(drawableObject);
-                followPointRenderer.RemoveFollowPoints(drawableObject.HitObject);
-            });
-        }
-
-        private void reorderObjectStep(int startIndex, int endIndex)
-        {
-            AddStep($"move object {startIndex} to {endIndex}", () =>
-            {
-                DrawableOsuHitObject toReorder = getObject(startIndex);
-
-                double targetTime;
-                if (endIndex < hitObjectContainer.Count)
-                    targetTime = getObject(endIndex).HitObject.StartTime - 1;
-                else
-                    targetTime = getObject(hitObjectContainer.Count - 1).HitObject.StartTime + 1;
-
-                hitObjectContainer.Remove(toReorder);
-                toReorder.HitObject.StartTime = targetTime;
-                hitObjectContainer.Add(toReorder);
-            });
-        }
-
-        private void assertGroups()
-        {
-            AddAssert("has correct group count", () => followPointRenderer.Connections.Count == hitObjectContainer.Count);
-            AddAssert("group endpoints 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 (getGroup(i).Start != expectedStart.HitObject)
-                        throw new AssertionException($"Object {i} expected to be the start of group {i}.");
-
-                    if (getGroup(i).End != expectedEnd?.HitObject)
-                        throw new AssertionException($"Object {(expectedEnd == null ? "null" : i.ToString())} expected to be the end of group {i}.");
-                }
-
-                return true;
-            });
-        }
-
-        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];
-
-        private class TestHitObjectContainer : Container<DrawableOsuHitObject>
-        {
-            protected override int Compare(Drawable x, Drawable y)
-            {
-                var osuX = (DrawableOsuHitObject)x;
-                var osuY = (DrawableOsuHitObject)y;
-
-                int compare = osuX.HitObject.StartTime.CompareTo(osuY.HitObject.StartTime);
-
-                if (compare == 0)
-                    return base.Compare(x, y);
-
-                return compare;
-            }
-        }
-    }
-}
+// // Copyright (c) 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.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;
+// using osu.Game.Rulesets.Osu.Objects.Drawables;
+// using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
+// using osu.Game.Tests.Visual;
+// using osuTK;
+//
+// namespace osu.Game.Rulesets.Osu.Tests
+// {
+//     public class TestSceneFollowPoints : OsuTestScene
+//     {
+//         private Container<DrawableOsuHitObject> hitObjectContainer;
+//         private FollowPointRenderer followPointRenderer;
+//
+//         [SetUp]
+//         public void Setup() => Schedule(() =>
+//         {
+//             Children = new Drawable[]
+//             {
+//                 hitObjectContainer = new TestHitObjectContainer { RelativeSizeAxes = Axes.Both },
+//                 followPointRenderer = new FollowPointRenderer { RelativeSizeAxes = Axes.Both }
+//             };
+//         });
+//
+//         [Test]
+//         public void TestAddObject()
+//         {
+//             addObjectsStep(() => new OsuHitObject[] { new HitCircle { Position = new Vector2(100, 100) } });
+//
+//             assertGroups();
+//         }
+//
+//         [Test]
+//         public void TestRemoveObject()
+//         {
+//             addObjectsStep(() => new OsuHitObject[] { new HitCircle { Position = new Vector2(100, 100) } });
+//
+//             removeObjectStep(() => getObject(0));
+//
+//             assertGroups();
+//         }
+//
+//         [Test]
+//         public void TestAddMultipleObjects()
+//         {
+//             addMultipleObjectsStep();
+//
+//             assertGroups();
+//         }
+//
+//         [Test]
+//         public void TestRemoveEndObject()
+//         {
+//             addMultipleObjectsStep();
+//
+//             removeObjectStep(() => getObject(4));
+//
+//             assertGroups();
+//         }
+//
+//         [Test]
+//         public void TestRemoveStartObject()
+//         {
+//             addMultipleObjectsStep();
+//
+//             removeObjectStep(() => getObject(0));
+//
+//             assertGroups();
+//         }
+//
+//         [Test]
+//         public void TestRemoveMiddleObject()
+//         {
+//             addMultipleObjectsStep();
+//
+//             removeObjectStep(() => getObject(2));
+//
+//             assertGroups();
+//         }
+//
+//         [Test]
+//         public void TestMoveObject()
+//         {
+//             addMultipleObjectsStep();
+//
+//             AddStep("move hitobject", () => getObject(2).HitObject.Position = new Vector2(300, 100));
+//
+//             assertGroups();
+//         }
+//
+//         [TestCase(0, 0)] // Start -> Start
+//         [TestCase(0, 2)] // Start -> Middle
+//         [TestCase(0, 5)] // Start -> End
+//         [TestCase(2, 0)] // Middle -> Start
+//         [TestCase(1, 3)] // Middle -> Middle (forwards)
+//         [TestCase(3, 1)] // Middle -> Middle (backwards)
+//         [TestCase(4, 0)] // End -> Start
+//         [TestCase(4, 2)] // End -> Middle
+//         [TestCase(4, 4)] // End -> End
+//         public void TestReorderObjects(int startIndex, int endIndex)
+//         {
+//             addMultipleObjectsStep();
+//
+//             reorderObjectStep(startIndex, endIndex);
+//
+//             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) },
+//             new HitCircle { Position = new Vector2(200, 200) },
+//             new HitCircle { Position = new Vector2(300, 300) },
+//             new HitCircle { Position = new Vector2(400, 400) },
+//             new HitCircle { Position = new Vector2(500, 500) },
+//         });
+//
+//         private void addObjectsStep(Func<OsuHitObject[]> ctorFunc)
+//         {
+//             AddStep("add hitobjects", () =>
+//             {
+//                 var objects = ctorFunc();
+//
+//                 for (int i = 0; i < objects.Length; i++)
+//                 {
+//                     objects[i].StartTime = Time.Current + 1000 + 500 * (i + 1);
+//                     objects[i].ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+//
+//                     DrawableOsuHitObject drawableObject = null;
+//
+//                     switch (objects[i])
+//                     {
+//                         case HitCircle circle:
+//                             drawableObject = new DrawableHitCircle(circle);
+//                             break;
+//
+//                         case Slider slider:
+//                             drawableObject = new DrawableSlider(slider);
+//                             break;
+//
+//                         case Spinner spinner:
+//                             drawableObject = new DrawableSpinner(spinner);
+//                             break;
+//                     }
+//
+//                     hitObjectContainer.Add(drawableObject);
+//                     followPointRenderer.AddFollowPoints(objects[i]);
+//                 }
+//             });
+//         }
+//
+//         private void removeObjectStep(Func<DrawableOsuHitObject> getFunc)
+//         {
+//             AddStep("remove hitobject", () =>
+//             {
+//                 var drawableObject = getFunc.Invoke();
+//
+//                 hitObjectContainer.Remove(drawableObject);
+//                 followPointRenderer.RemoveFollowPoints(drawableObject.HitObject);
+//             });
+//         }
+//
+//         private void reorderObjectStep(int startIndex, int endIndex)
+//         {
+//             AddStep($"move object {startIndex} to {endIndex}", () =>
+//             {
+//                 DrawableOsuHitObject toReorder = getObject(startIndex);
+//
+//                 double targetTime;
+//                 if (endIndex < hitObjectContainer.Count)
+//                     targetTime = getObject(endIndex).HitObject.StartTime - 1;
+//                 else
+//                     targetTime = getObject(hitObjectContainer.Count - 1).HitObject.StartTime + 1;
+//
+//                 hitObjectContainer.Remove(toReorder);
+//                 toReorder.HitObject.StartTime = targetTime;
+//                 hitObjectContainer.Add(toReorder);
+//             });
+//         }
+//
+//         private void assertGroups()
+//         {
+//             AddAssert("has correct group count", () => followPointRenderer.Connections.Count == hitObjectContainer.Count);
+//             AddAssert("group endpoints 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 (getGroup(i).Start != expectedStart.HitObject)
+//                         throw new AssertionException($"Object {i} expected to be the start of group {i}.");
+//
+//                     if (getGroup(i).End != expectedEnd?.HitObject)
+//                         throw new AssertionException($"Object {(expectedEnd == null ? "null" : i.ToString())} expected to be the end of group {i}.");
+//                 }
+//
+//                 return true;
+//             });
+//         }
+//
+//         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];
+//
+//         private class TestHitObjectContainer : Container<DrawableOsuHitObject>
+//         {
+//             protected override int Compare(Drawable x, Drawable y)
+//             {
+//                 var osuX = (DrawableOsuHitObject)x;
+//                 var osuY = (DrawableOsuHitObject)y;
+//
+//                 int compare = osuX.HitObject.StartTime.CompareTo(osuY.HitObject.StartTime);
+//
+//                 if (compare == 0)
+//                     return base.Compare(x, y);
+//
+//                 return compare;
+//             }
+//         }
+//     }
+// }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
index a981648444..3e2ab65bb2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
@@ -7,6 +7,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Skinning;
 
@@ -15,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
     /// <summary>
     /// A single follow point positioned between two adjacent <see cref="DrawableOsuHitObject"/>s.
     /// </summary>
-    public class FollowPoint : Container, IAnimationTimeReference
+    public class FollowPoint : PoolableDrawable, IAnimationTimeReference
     {
         private const float width = 8;
 
@@ -25,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         {
             Origin = Anchor.Centre;
 
-            Child = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.FollowPoint), _ => new CircularContainer
+            InternalChild = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.FollowPoint), _ => new CircularContainer
             {
                 Masking = true,
                 AutoSizeAxes = Axes.Both,
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 3a9e19b361..1d82e91c0e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -2,11 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
-using JetBrains.Annotations;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Objects;
 using osuTK;
 
@@ -15,150 +12,77 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
     /// <summary>
     /// Visualises the <see cref="FollowPoint"/>s between two <see cref="DrawableOsuHitObject"/>s.
     /// </summary>
-    public class FollowPointConnection : CompositeDrawable
+    public class FollowPointConnection : PoolableDrawable
     {
         // Todo: These shouldn't be constants
-        private const int spacing = 32;
-        private const double preempt = 800;
+        public const int SPACING = 32;
+        public const double PREEMPT = 800;
 
-        public override bool RemoveWhenNotAlive => false;
+        public FollowPointRenderer.FollowPointLifetimeEntry Entry;
+        public DrawablePool<FollowPoint> Pool;
 
-        /// <summary>
-        /// The start time of <see cref="Start"/>.
-        /// </summary>
-        public readonly Bindable<double> StartTime = new BindableDouble();
-
-        /// <summary>
-        /// The <see cref="DrawableOsuHitObject"/> which <see cref="FollowPoint"/>s will exit from.
-        /// </summary>
-        [NotNull]
-        public readonly OsuHitObject Start;
-
-        /// <summary>
-        /// Creates a new <see cref="FollowPointConnection"/>.
-        /// </summary>
-        /// <param name="start">The <see cref="DrawableOsuHitObject"/> which <see cref="FollowPoint"/>s will exit from.</param>
-        public FollowPointConnection([NotNull] OsuHitObject start)
+        protected override void FreeAfterUse()
         {
-            Start = start;
-
-            RelativeSizeAxes = Axes.Both;
-
-            StartTime.BindTo(start.StartTimeBindable);
+            base.FreeAfterUse();
+            ClearInternal(false);
         }
 
-        protected override void LoadComplete()
+        protected override void PrepareForUse()
         {
-            base.LoadComplete();
-            bindEvents(Start);
-        }
+            base.PrepareForUse();
 
-        private OsuHitObject end;
+            OsuHitObject start = Entry.Start;
+            OsuHitObject end = Entry.End;
 
-        /// <summary>
-        /// The <see cref="DrawableOsuHitObject"/> which <see cref="FollowPoint"/>s will enter.
-        /// </summary>
-        [CanBeNull]
-        public OsuHitObject End
-        {
-            get => end;
-            set
-            {
-                end = value;
+            double startTime = start.GetEndTime();
 
-                if (end != null)
-                    bindEvents(end);
-
-                if (IsLoaded)
-                    scheduleRefresh();
-                else
-                    refresh();
-            }
-        }
-
-        private void bindEvents(OsuHitObject obj)
-        {
-            obj.PositionBindable.BindValueChanged(_ => scheduleRefresh());
-            obj.DefaultsApplied += _ => scheduleRefresh();
-        }
-
-        private void scheduleRefresh()
-        {
-            Scheduler.AddOnce(refresh);
-        }
-
-        private void refresh()
-        {
-            double startTime = Start.GetEndTime();
-
-            LifetimeStart = startTime;
-
-            if (End == null || End.NewCombo || Start is Spinner || End is Spinner)
-            {
-                // ensure we always set a lifetime for full LifetimeManagementContainer benefits
-                LifetimeEnd = LifetimeStart;
+            if (end == null || end.NewCombo || start is Spinner || end is Spinner)
                 return;
-            }
 
-            Vector2 startPosition = Start.StackedEndPosition;
-            Vector2 endPosition = End.StackedPosition;
-            double endTime = End.StartTime;
+            Vector2 startPosition = start.StackedEndPosition;
+            Vector2 endPosition = end.StackedPosition;
+            double endTime = end.StartTime;
 
             Vector2 distanceVector = endPosition - startPosition;
             int distance = (int)distanceVector.Length;
             float rotation = (float)(Math.Atan2(distanceVector.Y, distanceVector.X) * (180 / Math.PI));
             double duration = endTime - startTime;
 
-            double? firstTransformStartTime = null;
             double finalTransformEndTime = startTime;
 
-            int point = 0;
-
-            ClearInternal();
-
-            for (int d = (int)(spacing * 1.5); d < distance - spacing; d += spacing)
+            for (int d = (int)(SPACING * 1.5); d < distance - SPACING; d += SPACING)
             {
                 float fraction = (float)d / distance;
                 Vector2 pointStartPosition = startPosition + (fraction - 0.1f) * distanceVector;
                 Vector2 pointEndPosition = startPosition + fraction * distanceVector;
                 double fadeOutTime = startTime + fraction * duration;
-                double fadeInTime = fadeOutTime - preempt;
+                double fadeInTime = fadeOutTime - PREEMPT;
 
                 FollowPoint fp;
 
-                AddInternal(fp = new FollowPoint());
-
-                Debug.Assert(End != null);
+                AddInternal(fp = Pool.Get());
 
+                fp.ClearTransforms();
                 fp.Position = pointStartPosition;
                 fp.Rotation = rotation;
                 fp.Alpha = 0;
-                fp.Scale = new Vector2(1.5f * End.Scale);
-
-                firstTransformStartTime ??= fadeInTime;
+                fp.Scale = new Vector2(1.5f * end.Scale);
 
                 fp.AnimationStartTime = fadeInTime;
 
                 using (fp.BeginAbsoluteSequence(fadeInTime))
                 {
-                    fp.FadeIn(End.TimeFadeIn);
-                    fp.ScaleTo(End.Scale, End.TimeFadeIn, Easing.Out);
-                    fp.MoveTo(pointEndPosition, End.TimeFadeIn, Easing.Out);
-                    fp.Delay(fadeOutTime - fadeInTime).FadeOut(End.TimeFadeIn);
+                    fp.FadeIn(end.TimeFadeIn);
+                    fp.ScaleTo(end.Scale, end.TimeFadeIn, Easing.Out);
+                    fp.MoveTo(pointEndPosition, end.TimeFadeIn, Easing.Out);
+                    fp.Delay(fadeOutTime - fadeInTime).FadeOut(end.TimeFadeIn);
 
-                    finalTransformEndTime = fadeOutTime + End.TimeFadeIn;
+                    finalTransformEndTime = fadeOutTime + end.TimeFadeIn;
                 }
-
-                point++;
             }
 
-            int excessPoints = InternalChildren.Count - point;
-            for (int i = 0; i < excessPoints; i++)
-                RemoveInternal(InternalChildren[^1]);
-
             // 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;
+            Entry.LifetimeEnd = finalTransformEndTime;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index be1392d7c3..ac7b78a25b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -2,53 +2,57 @@
 // 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.Graphics.Performance;
+using osu.Framework.Graphics.Pooling;
+using osu.Game.Rulesets.Objects;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 {
     /// <summary>
     /// Visualises connections between <see cref="DrawableOsuHitObject"/>s.
     /// </summary>
-    public class FollowPointRenderer : LifetimeManagementContainer
+    public class FollowPointRenderer : CompositeDrawable
     {
-        /// <summary>
-        /// All the <see cref="FollowPointConnection"/>s contained by this <see cref="FollowPointRenderer"/>.
-        /// </summary>
-        internal IReadOnlyList<FollowPointConnection> Connections => connections;
-
-        private readonly List<FollowPointConnection> connections = new List<FollowPointConnection>();
-
         public override bool RemoveCompletedTransforms => false;
 
-        /// <summary>
-        /// Adds the <see cref="FollowPoint"/>s around an <see cref="OsuHitObject"/>.
-        /// This includes <see cref="FollowPoint"/>s leading into <paramref name="hitObject"/>, and <see cref="FollowPoint"/>s exiting <paramref name="hitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="OsuHitObject"/> to add <see cref="FollowPoint"/>s for.</param>
-        public void AddFollowPoints(OsuHitObject hitObject)
-            => addConnection(new FollowPointConnection(hitObject).With(g => g.StartTime.BindValueChanged(_ => onStartTimeChanged(g))));
+        private DrawablePool<FollowPointConnection> connectionPool;
+        private DrawablePool<FollowPoint> pointPool;
 
-        /// <summary>
-        /// Removes the <see cref="FollowPoint"/>s around an <see cref="OsuHitObject"/>.
-        /// This includes <see cref="FollowPoint"/>s leading into <paramref name="hitObject"/>, and <see cref="FollowPoint"/>s exiting <paramref name="hitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="OsuHitObject"/> to remove <see cref="FollowPoint"/>s for.</param>
-        public void RemoveFollowPoints(OsuHitObject hitObject) => removeGroup(connections.Single(g => g.Start == hitObject));
+        private readonly List<FollowPointLifetimeEntry> lifetimeEntries = new List<FollowPointLifetimeEntry>();
+        private readonly Dictionary<LifetimeEntry, FollowPointConnection> connectionsInUse = new Dictionary<LifetimeEntry, FollowPointConnection>();
+        private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
 
-        /// <summary>
-        /// Adds a <see cref="FollowPointConnection"/> to this <see cref="FollowPointRenderer"/>.
-        /// </summary>
-        /// <param name="connection">The <see cref="FollowPointConnection"/> to add.</param>
-        /// <returns>The index of <paramref name="connection"/> in <see cref="connections"/>.</returns>
-        private void addConnection(FollowPointConnection connection)
+        public FollowPointRenderer()
         {
-            // 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) =>
+            lifetimeManager.EntryBecameAlive += onEntryBecameAlive;
+            lifetimeManager.EntryBecameDead += onEntryBecameDead;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new Drawable[]
             {
-                int comp = g1.StartTime.Value.CompareTo(g2.StartTime.Value);
+                connectionPool = new DrawablePool<FollowPointConnection>(1, 200),
+                pointPool = new DrawablePool<FollowPoint>(50, 1000)
+            };
+
+            MakeChildAlive(connectionPool);
+            MakeChildAlive(pointPool);
+        }
+
+        public void AddFollowPoints2(OsuHitObject hitObject)
+        {
+            var newEntry = new FollowPointLifetimeEntry(hitObject);
+
+            var index = lifetimeEntries.AddInPlace(newEntry, Comparer<FollowPointLifetimeEntry>.Create((e1, e2) =>
+            {
+                int comp = e1.Start.StartTime.CompareTo(e2.Start.StartTime);
 
                 if (comp != 0)
                     return comp;
@@ -61,19 +65,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 return -1;
             }));
 
-            if (index < connections.Count - 1)
+            if (index < lifetimeEntries.Count - 1)
             {
                 // Update the connection's end point to the next connection's start point
                 //     h1 -> -> -> h2
                 //    connection    nextGroup
 
-                FollowPointConnection nextConnection = connections[index + 1];
-                connection.End = nextConnection.Start;
+                FollowPointLifetimeEntry nextEntry = lifetimeEntries[index + 1];
+                newEntry.End = nextEntry.Start;
             }
             else
             {
                 // The end point may be non-null during re-ordering
-                connection.End = null;
+                newEntry.End = null;
             }
 
             if (index > 0)
@@ -82,23 +86,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 //     h1 -> -> -> h2
                 //  prevGroup    connection
 
-                FollowPointConnection previousConnection = connections[index - 1];
-                previousConnection.End = connection.Start;
+                FollowPointLifetimeEntry previousEntry = lifetimeEntries[index - 1];
+                previousEntry.End = newEntry.Start;
             }
 
-            AddInternal(connection);
+            lifetimeManager.AddEntry(newEntry);
         }
 
-        /// <summary>
-        /// Removes a <see cref="FollowPointConnection"/> from this <see cref="FollowPointRenderer"/>.
-        /// </summary>
-        /// <param name="connection">The <see cref="FollowPointConnection"/> to remove.</param>
-        /// <returns>Whether <paramref name="connection"/> was removed.</returns>
-        private void removeGroup(FollowPointConnection connection)
+        public void RemoveFollowPoints2(OsuHitObject hitObject)
         {
-            RemoveInternal(connection);
+            int index = lifetimeEntries.FindIndex(e => e.Start == hitObject);
+            var entry = lifetimeEntries[index];
 
-            int index = connections.IndexOf(connection);
+            lifetimeEntries.RemoveAt(index);
+            lifetimeManager.RemoveEntry(entry);
 
             if (index > 0)
             {
@@ -106,18 +107,76 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 //     h1 -> -> -> h2 -> -> -> h3
                 //  prevGroup    connection       nextGroup
                 // The current connection's end point is used since there may not be a next connection
-                FollowPointConnection previousConnection = connections[index - 1];
-                previousConnection.End = connection.End;
+                FollowPointLifetimeEntry previousEntry = lifetimeEntries[index - 1];
+                previousEntry.End = entry.End;
             }
-
-            connections.Remove(connection);
         }
 
-        private void onStartTimeChanged(FollowPointConnection connection)
+        protected override bool CheckChildrenLife() => lifetimeManager.Update(Time.Current);
+
+        private void onEntryBecameAlive(LifetimeEntry entry)
         {
-            // Naive but can be improved if performance becomes an issue
-            removeGroup(connection);
-            addConnection(connection);
+            var connection = connectionPool.Get(c =>
+            {
+                c.Entry = (FollowPointLifetimeEntry)entry;
+                c.Pool = pointPool;
+            });
+
+            connectionsInUse[entry] = connection;
+
+            AddInternal(connection);
+            MakeChildAlive(connection);
+        }
+
+        private void onEntryBecameDead(LifetimeEntry entry)
+        {
+            RemoveInternal(connectionsInUse[entry]);
+            connectionsInUse.Remove(entry);
+        }
+
+        public class FollowPointLifetimeEntry : LifetimeEntry
+        {
+            public readonly OsuHitObject Start;
+
+            public FollowPointLifetimeEntry(OsuHitObject start)
+            {
+                Start = start;
+
+                LifetimeStart = LifetimeEnd = Start.StartTime;
+            }
+
+            private OsuHitObject end;
+
+            public OsuHitObject End
+            {
+                get => end;
+                set
+                {
+                    end = value;
+                    computeLifetimes();
+                }
+            }
+
+            private void computeLifetimes()
+            {
+                if (end == null)
+                {
+                    LifetimeEnd = LifetimeStart;
+                    return;
+                }
+
+                Vector2 startPosition = Start.StackedEndPosition;
+                Vector2 endPosition = End.StackedPosition;
+                Vector2 distanceVector = endPosition - startPosition;
+                float fraction = (int)(FollowPointConnection.SPACING * 1.5) / distanceVector.Length;
+
+                double duration = End.StartTime - Start.GetEndTime();
+
+                double fadeOutTime = Start.StartTime + fraction * duration;
+                double fadeInTime = fadeOutTime - FollowPointConnection.PREEMPT;
+
+                LifetimeStart = fadeInTime;
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index c816502d61..a8d9423bf6 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -125,13 +125,13 @@ namespace osu.Game.Rulesets.Osu.UI
         protected override void OnHitObjectAdded(HitObject hitObject)
         {
             base.OnHitObjectAdded(hitObject);
-            followPoints.AddFollowPoints((OsuHitObject)hitObject);
+            followPoints.AddFollowPoints2((OsuHitObject)hitObject);
         }
 
         protected override void OnHitObjectRemoved(HitObject hitObject)
         {
             base.OnHitObjectRemoved(hitObject);
-            followPoints.RemoveFollowPoints((OsuHitObject)hitObject);
+            followPoints.RemoveFollowPoints2((OsuHitObject)hitObject);
         }
 
         public void OnHitObjectLoaded(Drawable drawable)

From 6356b2dde93c72b8fe4ee891b7cc649f3cca96ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Nov 2020 22:11:52 +0100
Subject: [PATCH 06324/10326] Prevent editor from crashing for rulesets with no
 compose screen implementation

---
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index d9948aa23c..46d5eb40b4 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -32,7 +32,8 @@ namespace osu.Game.Screens.Edit.Compose
             composer = ruleset?.CreateHitObjectComposer();
 
             // make the composer available to the timeline and other components in this screen.
-            dependencies.CacheAs(composer);
+            if (composer != null)
+                dependencies.CacheAs(composer);
 
             return dependencies;
         }

From 1df3f88fc44275ee1ae1bfe3404259557c5d6b60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 12:32:17 +0900
Subject: [PATCH 06325/10326] 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 4657896fac..6dab6edc5e 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1118.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1120.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 704ac5a611..54f3fcede6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1118.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1120.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 346bd892b0..692dac909a 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.Framework.iOS" Version="2020.1118.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1120.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1118.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1120.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From b547abafb2f4bd702b7448d7556485ba76e536b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 13:46:21 +0900
Subject: [PATCH 06326/10326] Fix slider right click context menus not being
 shown outside the valid playfield area

Closes #10816.
---
 .../Sliders/Components/PathControlPointVisualiser.cs           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 7375c0e981..ce5dc4855e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -20,12 +20,15 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
+using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 {
     public class PathControlPointVisualiser : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
     {
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true; // allow context menu to appear outside of the playfield.
+
         internal readonly Container<PathControlPointPiece> Pieces;
         internal readonly Container<PathControlPointConnectionPiece> Connections;
 

From a3145ed96dfbd45ff58fdd744e3490528ce00946 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 13:54:41 +0900
Subject: [PATCH 06327/10326] Fix test compile errors

---
 .../TestSceneFollowPoints.cs                  | 561 +++++++++---------
 .../Connections/FollowPointRenderer.cs        |   2 +
 2 files changed, 287 insertions(+), 276 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
index 3ebb747a21..ef6275a7e7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
@@ -1,276 +1,285 @@
-// // Copyright (c) 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.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;
-// using osu.Game.Rulesets.Osu.Objects.Drawables;
-// using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
-// using osu.Game.Tests.Visual;
-// using osuTK;
-//
-// namespace osu.Game.Rulesets.Osu.Tests
-// {
-//     public class TestSceneFollowPoints : OsuTestScene
-//     {
-//         private Container<DrawableOsuHitObject> hitObjectContainer;
-//         private FollowPointRenderer followPointRenderer;
-//
-//         [SetUp]
-//         public void Setup() => Schedule(() =>
-//         {
-//             Children = new Drawable[]
-//             {
-//                 hitObjectContainer = new TestHitObjectContainer { RelativeSizeAxes = Axes.Both },
-//                 followPointRenderer = new FollowPointRenderer { RelativeSizeAxes = Axes.Both }
-//             };
-//         });
-//
-//         [Test]
-//         public void TestAddObject()
-//         {
-//             addObjectsStep(() => new OsuHitObject[] { new HitCircle { Position = new Vector2(100, 100) } });
-//
-//             assertGroups();
-//         }
-//
-//         [Test]
-//         public void TestRemoveObject()
-//         {
-//             addObjectsStep(() => new OsuHitObject[] { new HitCircle { Position = new Vector2(100, 100) } });
-//
-//             removeObjectStep(() => getObject(0));
-//
-//             assertGroups();
-//         }
-//
-//         [Test]
-//         public void TestAddMultipleObjects()
-//         {
-//             addMultipleObjectsStep();
-//
-//             assertGroups();
-//         }
-//
-//         [Test]
-//         public void TestRemoveEndObject()
-//         {
-//             addMultipleObjectsStep();
-//
-//             removeObjectStep(() => getObject(4));
-//
-//             assertGroups();
-//         }
-//
-//         [Test]
-//         public void TestRemoveStartObject()
-//         {
-//             addMultipleObjectsStep();
-//
-//             removeObjectStep(() => getObject(0));
-//
-//             assertGroups();
-//         }
-//
-//         [Test]
-//         public void TestRemoveMiddleObject()
-//         {
-//             addMultipleObjectsStep();
-//
-//             removeObjectStep(() => getObject(2));
-//
-//             assertGroups();
-//         }
-//
-//         [Test]
-//         public void TestMoveObject()
-//         {
-//             addMultipleObjectsStep();
-//
-//             AddStep("move hitobject", () => getObject(2).HitObject.Position = new Vector2(300, 100));
-//
-//             assertGroups();
-//         }
-//
-//         [TestCase(0, 0)] // Start -> Start
-//         [TestCase(0, 2)] // Start -> Middle
-//         [TestCase(0, 5)] // Start -> End
-//         [TestCase(2, 0)] // Middle -> Start
-//         [TestCase(1, 3)] // Middle -> Middle (forwards)
-//         [TestCase(3, 1)] // Middle -> Middle (backwards)
-//         [TestCase(4, 0)] // End -> Start
-//         [TestCase(4, 2)] // End -> Middle
-//         [TestCase(4, 4)] // End -> End
-//         public void TestReorderObjects(int startIndex, int endIndex)
-//         {
-//             addMultipleObjectsStep();
-//
-//             reorderObjectStep(startIndex, endIndex);
-//
-//             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) },
-//             new HitCircle { Position = new Vector2(200, 200) },
-//             new HitCircle { Position = new Vector2(300, 300) },
-//             new HitCircle { Position = new Vector2(400, 400) },
-//             new HitCircle { Position = new Vector2(500, 500) },
-//         });
-//
-//         private void addObjectsStep(Func<OsuHitObject[]> ctorFunc)
-//         {
-//             AddStep("add hitobjects", () =>
-//             {
-//                 var objects = ctorFunc();
-//
-//                 for (int i = 0; i < objects.Length; i++)
-//                 {
-//                     objects[i].StartTime = Time.Current + 1000 + 500 * (i + 1);
-//                     objects[i].ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-//
-//                     DrawableOsuHitObject drawableObject = null;
-//
-//                     switch (objects[i])
-//                     {
-//                         case HitCircle circle:
-//                             drawableObject = new DrawableHitCircle(circle);
-//                             break;
-//
-//                         case Slider slider:
-//                             drawableObject = new DrawableSlider(slider);
-//                             break;
-//
-//                         case Spinner spinner:
-//                             drawableObject = new DrawableSpinner(spinner);
-//                             break;
-//                     }
-//
-//                     hitObjectContainer.Add(drawableObject);
-//                     followPointRenderer.AddFollowPoints(objects[i]);
-//                 }
-//             });
-//         }
-//
-//         private void removeObjectStep(Func<DrawableOsuHitObject> getFunc)
-//         {
-//             AddStep("remove hitobject", () =>
-//             {
-//                 var drawableObject = getFunc.Invoke();
-//
-//                 hitObjectContainer.Remove(drawableObject);
-//                 followPointRenderer.RemoveFollowPoints(drawableObject.HitObject);
-//             });
-//         }
-//
-//         private void reorderObjectStep(int startIndex, int endIndex)
-//         {
-//             AddStep($"move object {startIndex} to {endIndex}", () =>
-//             {
-//                 DrawableOsuHitObject toReorder = getObject(startIndex);
-//
-//                 double targetTime;
-//                 if (endIndex < hitObjectContainer.Count)
-//                     targetTime = getObject(endIndex).HitObject.StartTime - 1;
-//                 else
-//                     targetTime = getObject(hitObjectContainer.Count - 1).HitObject.StartTime + 1;
-//
-//                 hitObjectContainer.Remove(toReorder);
-//                 toReorder.HitObject.StartTime = targetTime;
-//                 hitObjectContainer.Add(toReorder);
-//             });
-//         }
-//
-//         private void assertGroups()
-//         {
-//             AddAssert("has correct group count", () => followPointRenderer.Connections.Count == hitObjectContainer.Count);
-//             AddAssert("group endpoints 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 (getGroup(i).Start != expectedStart.HitObject)
-//                         throw new AssertionException($"Object {i} expected to be the start of group {i}.");
-//
-//                     if (getGroup(i).End != expectedEnd?.HitObject)
-//                         throw new AssertionException($"Object {(expectedEnd == null ? "null" : i.ToString())} expected to be the end of group {i}.");
-//                 }
-//
-//                 return true;
-//             });
-//         }
-//
-//         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];
-//
-//         private class TestHitObjectContainer : Container<DrawableOsuHitObject>
-//         {
-//             protected override int Compare(Drawable x, Drawable y)
-//             {
-//                 var osuX = (DrawableOsuHitObject)x;
-//                 var osuY = (DrawableOsuHitObject)y;
-//
-//                 int compare = osuX.HitObject.StartTime.CompareTo(osuY.HitObject.StartTime);
-//
-//                 if (compare == 0)
-//                     return base.Compare(x, y);
-//
-//                 return compare;
-//             }
-//         }
-//     }
-// }
+// Copyright (c) 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Framework.Utils;
+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.Osu.Objects.Drawables.Connections;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneFollowPoints : OsuTestScene
+    {
+        private Container<DrawableOsuHitObject> hitObjectContainer;
+        private FollowPointRenderer followPointRenderer;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Children = new Drawable[]
+            {
+                hitObjectContainer = new TestHitObjectContainer { RelativeSizeAxes = Axes.Both },
+                followPointRenderer = new FollowPointRenderer { RelativeSizeAxes = Axes.Both }
+            };
+        });
+
+        [Test]
+        public void TestAddObject()
+        {
+            addObjectsStep(() => new OsuHitObject[] { new HitCircle { Position = new Vector2(100, 100) } });
+
+            assertGroups();
+        }
+
+        [Test]
+        public void TestRemoveObject()
+        {
+            addObjectsStep(() => new OsuHitObject[] { new HitCircle { Position = new Vector2(100, 100) } });
+
+            removeObjectStep(() => getObject(0));
+
+            assertGroups();
+        }
+
+        [Test]
+        public void TestAddMultipleObjects()
+        {
+            addMultipleObjectsStep();
+
+            assertGroups();
+        }
+
+        [Test]
+        public void TestRemoveEndObject()
+        {
+            addMultipleObjectsStep();
+
+            removeObjectStep(() => getObject(4));
+
+            assertGroups();
+        }
+
+        [Test]
+        public void TestRemoveStartObject()
+        {
+            addMultipleObjectsStep();
+
+            removeObjectStep(() => getObject(0));
+
+            assertGroups();
+        }
+
+        [Test]
+        public void TestRemoveMiddleObject()
+        {
+            addMultipleObjectsStep();
+
+            removeObjectStep(() => getObject(2));
+
+            assertGroups();
+        }
+
+        [Test]
+        public void TestMoveObject()
+        {
+            addMultipleObjectsStep();
+
+            AddStep("move hitobject", () => getObject(2).HitObject.Position = new Vector2(300, 100));
+
+            assertGroups();
+        }
+
+        [TestCase(0, 0)] // Start -> Start
+        [TestCase(0, 2)] // Start -> Middle
+        [TestCase(0, 5)] // Start -> End
+        [TestCase(2, 0)] // Middle -> Start
+        [TestCase(1, 3)] // Middle -> Middle (forwards)
+        [TestCase(3, 1)] // Middle -> Middle (backwards)
+        [TestCase(4, 0)] // End -> Start
+        [TestCase(4, 2)] // End -> Middle
+        [TestCase(4, 4)] // End -> End
+        public void TestReorderObjects(int startIndex, int endIndex)
+        {
+            addMultipleObjectsStep();
+
+            reorderObjectStep(startIndex, endIndex);
+
+            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) },
+            new HitCircle { Position = new Vector2(200, 200) },
+            new HitCircle { Position = new Vector2(300, 300) },
+            new HitCircle { Position = new Vector2(400, 400) },
+            new HitCircle { Position = new Vector2(500, 500) },
+        });
+
+        private void addObjectsStep(Func<OsuHitObject[]> ctorFunc)
+        {
+            AddStep("add hitobjects", () =>
+            {
+                var objects = ctorFunc();
+
+                for (int i = 0; i < objects.Length; i++)
+                {
+                    objects[i].StartTime = Time.Current + 1000 + 500 * (i + 1);
+                    objects[i].ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                    DrawableOsuHitObject drawableObject = null;
+
+                    switch (objects[i])
+                    {
+                        case HitCircle circle:
+                            drawableObject = new DrawableHitCircle(circle);
+                            break;
+
+                        case Slider slider:
+                            drawableObject = new DrawableSlider(slider);
+                            break;
+
+                        case Spinner spinner:
+                            drawableObject = new DrawableSpinner(spinner);
+                            break;
+                    }
+
+                    hitObjectContainer.Add(drawableObject);
+                    followPointRenderer.AddFollowPoints2(objects[i]);
+                }
+            });
+        }
+
+        private void removeObjectStep(Func<DrawableOsuHitObject> getFunc)
+        {
+            AddStep("remove hitobject", () =>
+            {
+                var drawableObject = getFunc.Invoke();
+
+                hitObjectContainer.Remove(drawableObject);
+                followPointRenderer.RemoveFollowPoints2(drawableObject.HitObject);
+            });
+        }
+
+        private void reorderObjectStep(int startIndex, int endIndex)
+        {
+            AddStep($"move object {startIndex} to {endIndex}", () =>
+            {
+                DrawableOsuHitObject toReorder = getObject(startIndex);
+
+                double targetTime;
+                if (endIndex < hitObjectContainer.Count)
+                    targetTime = getObject(endIndex).HitObject.StartTime - 1;
+                else
+                    targetTime = getObject(hitObjectContainer.Count - 1).HitObject.StartTime + 1;
+
+                hitObjectContainer.Remove(toReorder);
+                toReorder.HitObject.StartTime = targetTime;
+                hitObjectContainer.Add(toReorder);
+            });
+        }
+
+        private void assertGroups()
+        {
+            AddAssert("has correct group count", () => followPointRenderer.Entries.Count == hitObjectContainer.Count);
+            AddAssert("group endpoints 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 (getEntry(i).Start != expectedStart.HitObject)
+                        throw new AssertionException($"Object {i} expected to be the start of group {i}.");
+
+                    if (getEntry(i).End != expectedEnd?.HitObject)
+                        throw new AssertionException($"Object {(expectedEnd == null ? "null" : i.ToString())} expected to be the end of group {i}.");
+                }
+
+                return true;
+            });
+        }
+
+        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 manualClock = new ManualClock();
+                    followPointRenderer.Clock = new FramedClock(manualClock);
+
+                    manualClock.CurrentTime = expectedStart.HitObject.StartTime;
+                    followPointRenderer.UpdateSubTree();
+
+                    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 FollowPointRenderer.FollowPointLifetimeEntry getEntry(int index) => followPointRenderer.Entries[index];
+
+        private FollowPointConnection getGroup(int index) => followPointRenderer.ChildrenOfType<FollowPointConnection>().Single(c => c.Entry == getEntry(index));
+
+        private class TestHitObjectContainer : Container<DrawableOsuHitObject>
+        {
+            protected override int Compare(Drawable x, Drawable y)
+            {
+                var osuX = (DrawableOsuHitObject)x;
+                var osuY = (DrawableOsuHitObject)y;
+
+                int compare = osuX.HitObject.StartTime.CompareTo(osuY.HitObject.StartTime);
+
+                if (compare == 0)
+                    return base.Compare(x, y);
+
+                return compare;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index ac7b78a25b..702983b74a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
     {
         public override bool RemoveCompletedTransforms => false;
 
+        public IReadOnlyList<FollowPointLifetimeEntry> Entries => lifetimeEntries;
+
         private DrawablePool<FollowPointConnection> connectionPool;
         private DrawablePool<FollowPoint> pointPool;
 

From 17ff7fe163499324d044cac56267c4b852c56261 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 13:55:01 +0900
Subject: [PATCH 06328/10326] Fix failing test due to early lifetime end

---
 .../Objects/Drawables/Connections/FollowPointRenderer.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index 702983b74a..6751585def 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -143,8 +143,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             public FollowPointLifetimeEntry(OsuHitObject start)
             {
                 Start = start;
-
-                LifetimeStart = LifetimeEnd = Start.StartTime;
+                LifetimeStart = Start.StartTime;
             }
 
             private OsuHitObject end;
@@ -178,6 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 double fadeInTime = fadeOutTime - FollowPointConnection.PREEMPT;
 
                 LifetimeStart = fadeInTime;
+                LifetimeEnd = double.MaxValue; // This will be set by the connection.
             }
         }
     }

From 2fc53a278daa7ffd27b8ba8affdb6ed1d71f226d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 14:10:28 +0900
Subject: [PATCH 06329/10326] Add back reorder support

---
 .../Connections/FollowPointRenderer.cs        | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index 6751585def..6bb32238bd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -27,6 +28,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
         private readonly List<FollowPointLifetimeEntry> lifetimeEntries = new List<FollowPointLifetimeEntry>();
         private readonly Dictionary<LifetimeEntry, FollowPointConnection> connectionsInUse = new Dictionary<LifetimeEntry, FollowPointConnection>();
+        private readonly Dictionary<HitObject, IBindable> startTimeMap = new Dictionary<HitObject, IBindable>();
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
 
         public FollowPointRenderer()
@@ -49,6 +51,23 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         }
 
         public void AddFollowPoints2(OsuHitObject hitObject)
+        {
+            addEntry(hitObject);
+
+            var startTimeBindable = hitObject.StartTimeBindable.GetBoundCopy();
+            startTimeBindable.ValueChanged += _ => onStartTimeChanged(hitObject);
+            startTimeMap[hitObject] = startTimeBindable;
+        }
+
+        public void RemoveFollowPoints2(OsuHitObject hitObject)
+        {
+            removeEntry(hitObject);
+
+            startTimeMap[hitObject].UnbindAll();
+            startTimeMap.Remove(hitObject);
+        }
+
+        private void addEntry(OsuHitObject hitObject)
         {
             var newEntry = new FollowPointLifetimeEntry(hitObject);
 
@@ -95,7 +114,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             lifetimeManager.AddEntry(newEntry);
         }
 
-        public void RemoveFollowPoints2(OsuHitObject hitObject)
+        private void removeEntry(OsuHitObject hitObject)
         {
             int index = lifetimeEntries.FindIndex(e => e.Start == hitObject);
             var entry = lifetimeEntries[index];
@@ -136,6 +155,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             connectionsInUse.Remove(entry);
         }
 
+        private void onStartTimeChanged(OsuHitObject hitObject)
+        {
+            removeEntry(hitObject);
+            addEntry(hitObject);
+        }
+
         public class FollowPointLifetimeEntry : LifetimeEntry
         {
             public readonly OsuHitObject Start;

From c53a8fafe6d648c1dfdc4be449e35a3d2c11bc88 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 14:25:07 +0900
Subject: [PATCH 06330/10326] Make test fail as expected

---
 osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
index ef6275a7e7..a6a7f54886 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
@@ -95,9 +95,19 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             addMultipleObjectsStep();
 
-            AddStep("move hitobject", () => getObject(2).HitObject.Position = new Vector2(300, 100));
+            AddStep("move hitobject", () =>
+            {
+                var manualClock = new ManualClock();
+                followPointRenderer.Clock = new FramedClock(manualClock);
+
+                manualClock.CurrentTime = getObject(1).HitObject.StartTime;
+                followPointRenderer.UpdateSubTree();
+
+                getObject(2).HitObject.Position = new Vector2(300, 100);
+            });
 
             assertGroups();
+            assertDirections();
         }
 
         [TestCase(0, 0)] // Start -> Start

From 8c32d3f78194b75deb5d28b390a9f14272f557c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 14:32:23 +0900
Subject: [PATCH 06331/10326] Don't play flair animations / sounds when
 watching autoplay or viewing a result directly

I think this is a pretty good place to be for now. The flair will play
if you just watched a play (local, replay or spectator) but will not
play if you are coming from song select (viewing a replay's result
screen from the leaderboard) or in the case of autoplay.

Closes #10762.
---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index f8bdf0140c..ce3e618889 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.API;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Play;
@@ -149,7 +150,12 @@ namespace osu.Game.Screens.Ranking
             };
 
             if (Score != null)
-                ScorePanelList.AddScore(Score, true);
+            {
+                // only show flair / animation when arriving after watching a play that isn't autoplay.
+                bool shouldFlair = player != null && !Score.Mods.Any(m => m is ModAutoplay);
+
+                ScorePanelList.AddScore(Score, shouldFlair);
+            }
 
             if (player != null && allowRetry)
             {

From 2db42f8e6780eb2fd67854b54413ce8506a2895a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 14:35:44 +0900
Subject: [PATCH 06332/10326] Remove default allowRetry parameter value from
 ResultsScreen

---
 osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs  | 2 +-
 osu.Game/OsuGame.cs                                      | 2 +-
 osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs           | 2 +-
 osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs | 2 +-
 osu.Game/Screens/Play/Player.cs                          | 2 +-
 osu.Game/Screens/Play/SpectatorResultsScreen.cs          | 2 +-
 osu.Game/Screens/Ranking/SoloResultsScreen.cs            | 2 +-
 osu.Game/Screens/Select/PlaySongSelect.cs                | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index ff96a999ec..44a2056732 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -326,7 +326,7 @@ namespace osu.Game.Tests.Visual.Ranking
             public HotkeyRetryOverlay RetryOverlay;
 
             public UnrankedSoloResultsScreen(ScoreInfo score)
-                : base(score)
+                : base(score, false)
             {
                 Score.Beatmap.OnlineBeatmapID = 0;
                 Score.Beatmap.Status = BeatmapSetOnlineStatus.Pending;
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index cb0e2cfa8e..bb638bcf3a 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -420,7 +420,7 @@ namespace osu.Game
                         break;
 
                     case ScorePresentType.Results:
-                        screen.Push(new SoloResultsScreen(databasedScore.ScoreInfo));
+                        screen.Push(new SoloResultsScreen(databasedScore.ScoreInfo, false));
                         break;
                 }
             }, validScreens: new[] { typeof(PlaySongSelect) });
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 04da943a10..0efa9c5196 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Screens.Multi.Play
         protected override ResultsScreen CreateResults(ScoreInfo score)
         {
             Debug.Assert(roomId.Value != null);
-            return new TimeshiftResultsScreen(score, roomId.Value.Value, playlistItem);
+            return new TimeshiftResultsScreen(score, roomId.Value.Value, playlistItem, true);
         }
 
         protected override ScoreInfo CreateScore()
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 8da6a530a8..3623208fa7 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry = true)
+        public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry)
             : base(score, allowRetry)
         {
             this.roomId = roomId;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index b94f0a5062..d0a83e3c22 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -545,7 +545,7 @@ namespace osu.Game.Screens.Play
 
         protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
 
-        protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score);
+        protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, true);
 
         #region Fail Logic
 
diff --git a/osu.Game/Screens/Play/SpectatorResultsScreen.cs b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
index 56ccfd2253..dabdf0a139 100644
--- a/osu.Game/Screens/Play/SpectatorResultsScreen.cs
+++ b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Play
     public class SpectatorResultsScreen : SoloResultsScreen
     {
         public SpectatorResultsScreen(ScoreInfo score)
-            : base(score)
+            : base(score, false)
         {
         }
 
diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index 9cf2e6757a..76b549da1a 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Ranking
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        public SoloResultsScreen(ScoreInfo score, bool allowRetry = true)
+        public SoloResultsScreen(ScoreInfo score, bool allowRetry)
             : base(score, allowRetry)
         {
         }
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index ee8825640c..50a61ed4c2 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Select
         }
 
         protected void PresentScore(ScoreInfo score) =>
-            FinaliseSelection(score.Beatmap, score.Ruleset, () => this.Push(new SoloResultsScreen(score)));
+            FinaliseSelection(score.Beatmap, score.Ruleset, () => this.Push(new SoloResultsScreen(score, false)));
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 

From af67b4a346a7147a6132415955b3f25cc99accf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 14:57:08 +0900
Subject: [PATCH 06333/10326] Remove no longer necessary code from OsuPlayfield

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index c816502d61..ab77be488e 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -5,7 +5,6 @@ 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.Pooling;
@@ -40,8 +39,6 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
 
-        private readonly Bindable<bool> playfieldBorderStyle = new BindableBool();
-
         private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>();
 
         public OsuPlayfield()
@@ -67,12 +64,7 @@ namespace osu.Game.Rulesets.Osu.UI
                     RelativeSizeAxes = Axes.Both,
                     Depth = 1,
                 },
-                // Todo: This should not exist, but currently helps to reduce LOH allocations due to unbinding skin source events on judgement disposal
-                // Todo: Remove when hitobjects are properly pooled
-                new SkinProvidingContainer(null)
-                {
-                    Child = HitObjectContainer,
-                },
+                HitObjectContainer,
                 approachCircles = new ProxyContainer
                 {
                     RelativeSizeAxes = Axes.Both,

From 45b1fcf26fcbc3ff9befe6637a538978a3e5d01d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 15:01:37 +0900
Subject: [PATCH 06334/10326] Remove unnecessary using statement

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

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index ab77be488e..6a59cdf112 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -19,7 +19,6 @@ using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI

From 185653b1d8b65ac4d0ce7b0ab4fe25a91b00d22b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 15:11:24 +0900
Subject: [PATCH 06335/10326] Remove depth specifications

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 29 ++++--------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 6a59cdf112..0e98a1d439 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -44,31 +44,12 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             InternalChildren = new Drawable[]
             {
-                playfieldBorder = new PlayfieldBorder
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Depth = 3
-                },
-                spinnerProxies = new ProxyContainer
-                {
-                    RelativeSizeAxes = Axes.Both
-                },
-                followPoints = new FollowPointRenderer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Depth = 2,
-                },
-                judgementLayer = new JudgementContainer<DrawableOsuJudgement>
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Depth = 1,
-                },
+                playfieldBorder = new PlayfieldBorder { RelativeSizeAxes = Axes.Both },
+                spinnerProxies = new ProxyContainer { RelativeSizeAxes = Axes.Both },
+                followPoints = new FollowPointRenderer { RelativeSizeAxes = Axes.Both },
+                judgementLayer = new JudgementContainer<DrawableOsuJudgement> { RelativeSizeAxes = Axes.Both },
                 HitObjectContainer,
-                approachCircles = new ProxyContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Depth = -1,
-                },
+                approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
             hitPolicy = new OrderedHitPolicy(HitObjectContainer);

From 33eea64cfc584bcd691ca3e200ad4c79f06a5956 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 15:31:04 +0900
Subject: [PATCH 06336/10326] Fix follow points not updating on positional
 changes

---
 .../Connections/FollowPointConnection.cs      | 29 +++++++--
 .../Connections/FollowPointRenderer.cs        | 60 ++++++++++++++++++-
 2 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 1d82e91c0e..fe35cd02dc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -21,16 +21,33 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         public FollowPointRenderer.FollowPointLifetimeEntry Entry;
         public DrawablePool<FollowPoint> Pool;
 
-        protected override void FreeAfterUse()
-        {
-            base.FreeAfterUse();
-            ClearInternal(false);
-        }
-
         protected override void PrepareForUse()
         {
             base.PrepareForUse();
 
+            Entry.Invalidated += onEntryInvalidated;
+
+            refreshPoints();
+        }
+
+        protected override void FreeAfterUse()
+        {
+            base.FreeAfterUse();
+
+            Entry.Invalidated -= onEntryInvalidated;
+
+            // Return points to the pool.
+            ClearInternal(false);
+
+            Entry = null;
+        }
+
+        private void onEntryInvalidated() => refreshPoints();
+
+        private void refreshPoints()
+        {
+            ClearInternal(false);
+
             OsuHitObject start = Entry.Start;
             OsuHitObject end = Entry.End;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index 6bb32238bd..205c5c0d05 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.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.Allocation;
 using osu.Framework.Bindables;
@@ -117,7 +118,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         private void removeEntry(OsuHitObject hitObject)
         {
             int index = lifetimeEntries.FindIndex(e => e.Start == hitObject);
+
             var entry = lifetimeEntries[index];
+            entry.UnbindEvents();
 
             lifetimeEntries.RemoveAt(index);
             lifetimeManager.RemoveEntry(entry);
@@ -161,14 +164,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             addEntry(hitObject);
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            foreach (var entry in lifetimeEntries)
+                entry.UnbindEvents();
+            lifetimeEntries.Clear();
+        }
+
         public class FollowPointLifetimeEntry : LifetimeEntry
         {
+            public event Action Invalidated;
             public readonly OsuHitObject Start;
 
             public FollowPointLifetimeEntry(OsuHitObject start)
             {
                 Start = start;
                 LifetimeStart = Start.StartTime;
+
+                bindEvents();
             }
 
             private OsuHitObject end;
@@ -178,12 +193,51 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 get => end;
                 set
                 {
+                    UnbindEvents();
+
                     end = value;
-                    computeLifetimes();
+
+                    bindEvents();
+
+                    refreshLifetimes();
                 }
             }
 
-            private void computeLifetimes()
+            private void bindEvents()
+            {
+                UnbindEvents();
+
+                // Note: Positions are bound for instantaneous feedback from positional changes from the editor, before ApplyDefaults() is called on hitobjects.
+                Start.DefaultsApplied += onDefaultsApplied;
+                Start.PositionBindable.ValueChanged += onPositionChanged;
+
+                if (End != null)
+                {
+                    End.DefaultsApplied += onDefaultsApplied;
+                    End.PositionBindable.ValueChanged += onPositionChanged;
+                }
+            }
+
+            public void UnbindEvents()
+            {
+                if (Start != null)
+                {
+                    Start.DefaultsApplied -= onDefaultsApplied;
+                    Start.PositionBindable.ValueChanged -= onPositionChanged;
+                }
+
+                if (End != null)
+                {
+                    End.DefaultsApplied -= onDefaultsApplied;
+                    End.PositionBindable.ValueChanged -= onPositionChanged;
+                }
+            }
+
+            private void onDefaultsApplied(HitObject obj) => refreshLifetimes();
+
+            private void onPositionChanged(ValueChangedEvent<Vector2> obj) => refreshLifetimes();
+
+            private void refreshLifetimes()
             {
                 if (end == null)
                 {
@@ -203,6 +257,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
                 LifetimeStart = fadeInTime;
                 LifetimeEnd = double.MaxValue; // This will be set by the connection.
+
+                Invalidated?.Invoke();
             }
         }
     }

From 2ed2ddfe8a05f24bcc60f84f0e6eb9b96aaf0bd7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 15:39:25 +0900
Subject: [PATCH 06337/10326] Rename methods

---
 osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs          | 4 ++--
 .../Objects/Drawables/Connections/FollowPointRenderer.cs      | 4 ++--
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs                      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
index a6a7f54886..e7c73b941d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     }
 
                     hitObjectContainer.Add(drawableObject);
-                    followPointRenderer.AddFollowPoints2(objects[i]);
+                    followPointRenderer.AddFollowPoints(objects[i]);
                 }
             });
         }
@@ -194,7 +194,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 var drawableObject = getFunc.Invoke();
 
                 hitObjectContainer.Remove(drawableObject);
-                followPointRenderer.RemoveFollowPoints2(drawableObject.HitObject);
+                followPointRenderer.RemoveFollowPoints(drawableObject.HitObject);
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index 205c5c0d05..6dea16d01f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             MakeChildAlive(pointPool);
         }
 
-        public void AddFollowPoints2(OsuHitObject hitObject)
+        public void AddFollowPoints(OsuHitObject hitObject)
         {
             addEntry(hitObject);
 
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             startTimeMap[hitObject] = startTimeBindable;
         }
 
-        public void RemoveFollowPoints2(OsuHitObject hitObject)
+        public void RemoveFollowPoints(OsuHitObject hitObject)
         {
             removeEntry(hitObject);
 
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index a8d9423bf6..c816502d61 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -125,13 +125,13 @@ namespace osu.Game.Rulesets.Osu.UI
         protected override void OnHitObjectAdded(HitObject hitObject)
         {
             base.OnHitObjectAdded(hitObject);
-            followPoints.AddFollowPoints2((OsuHitObject)hitObject);
+            followPoints.AddFollowPoints((OsuHitObject)hitObject);
         }
 
         protected override void OnHitObjectRemoved(HitObject hitObject)
         {
             base.OnHitObjectRemoved(hitObject);
-            followPoints.RemoveFollowPoints2((OsuHitObject)hitObject);
+            followPoints.RemoveFollowPoints((OsuHitObject)hitObject);
         }
 
         public void OnHitObjectLoaded(Drawable drawable)

From 2418f17b0cd11ea01bf59a1fba1eae70e81f4ee0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 16:19:02 +0900
Subject: [PATCH 06338/10326] Fix lifetime not being set correctly in some
 cases

---
 .../Objects/Drawables/Connections/FollowPointConnection.cs     | 3 ---
 .../Objects/Drawables/Connections/FollowPointRenderer.cs       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index fe35cd02dc..3f6854786b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -53,9 +53,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
             double startTime = start.GetEndTime();
 
-            if (end == null || end.NewCombo || start is Spinner || end is Spinner)
-                return;
-
             Vector2 startPosition = start.StackedEndPosition;
             Vector2 endPosition = end.StackedPosition;
             double endTime = end.StartTime;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index 6dea16d01f..7067cf2728 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
             private void refreshLifetimes()
             {
-                if (end == null)
+                if (End == null || End.NewCombo || Start is Spinner || End is Spinner)
                 {
                     LifetimeEnd = LifetimeStart;
                     return;

From d4054c87d3d86bcc54e1e8024d6182956f21e895 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 16:15:17 +0900
Subject: [PATCH 06339/10326] Refactor TestSceneHitCircle to show judgements

---
 .../TestSceneHitCircle.cs                     | 67 ++++++++++++-------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index 596bc06c68..1278a0ff2d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osuTK;
-using osu.Game.Rulesets.Mods;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -38,13 +38,37 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         private Drawable testSingle(float circleSize, bool auto = false, double timeOffset = 0, Vector2? positionOffset = null)
+        {
+            var drawable = createSingle(circleSize, auto, timeOffset, positionOffset);
+
+            var playfield = new TestOsuPlayfield();
+            playfield.Add(drawable);
+            return playfield;
+        }
+
+        private Drawable testStream(float circleSize, bool auto = false)
+        {
+            var playfield = new TestOsuPlayfield();
+
+            Vector2 pos = new Vector2(-250, 0);
+
+            for (int i = 0; i <= 1000; i += 100)
+            {
+                playfield.Add(createSingle(circleSize, auto, i, pos));
+                pos.X += 50;
+            }
+
+            return playfield;
+        }
+
+        private TestDrawableHitCircle createSingle(float circleSize, bool auto, double timeOffset, Vector2? positionOffset)
         {
             positionOffset ??= Vector2.Zero;
 
             var circle = new HitCircle
             {
                 StartTime = Time.Current + 1000 + timeOffset,
-                Position = positionOffset.Value,
+                Position = OsuPlayfield.BASE_SIZE / 4 + positionOffset.Value,
             };
 
             circle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = circleSize });
@@ -53,31 +77,14 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObjects>())
                 mod.ApplyToDrawableHitObjects(new[] { drawable });
-
             return drawable;
         }
 
         protected virtual TestDrawableHitCircle CreateDrawableHitCircle(HitCircle circle, bool auto) => new TestDrawableHitCircle(circle, auto)
         {
-            Anchor = Anchor.Centre,
             Depth = depthIndex++
         };
 
-        private Drawable testStream(float circleSize, bool auto = false)
-        {
-            var container = new Container { RelativeSizeAxes = Axes.Both };
-
-            Vector2 pos = new Vector2(-250, 0);
-
-            for (int i = 0; i <= 1000; i += 100)
-            {
-                container.Add(testSingle(circleSize, auto, i, pos));
-                pos.X += 50;
-            }
-
-            return container;
-        }
-
         protected class TestDrawableHitCircle : DrawableHitCircle
         {
             private readonly bool auto;
@@ -101,5 +108,13 @@ namespace osu.Game.Rulesets.Osu.Tests
                     base.CheckForResult(userTriggered, timeOffset);
             }
         }
+
+        protected class TestOsuPlayfield : OsuPlayfield
+        {
+            public TestOsuPlayfield()
+            {
+                RelativeSizeAxes = Axes.Both;
+            }
+        }
     }
 }

From 7fe0923fcfbbabd2befa0eda3fe07693dc7c70be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 16:14:38 +0900
Subject: [PATCH 06340/10326] Show main judgement content above hitobjects

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      | 16 ++++++++++++++--
 .../Judgements/DefaultJudgementPiece.cs       |  2 ++
 .../Rulesets/Judgements/DrawableJudgement.cs  | 19 +++++++++++++++++++
 .../Judgements/IAnimatableJudgement.cs        |  8 ++++++++
 osu.Game/Skinning/LegacyJudgementPieceNew.cs  |  4 ++++
 osu.Game/Skinning/LegacyJudgementPieceOld.cs  |  2 ++
 6 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 0e98a1d439..3bd150c4d3 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>();
 
+        private readonly Container judgementAboveHitObjectLayer;
+
         public OsuPlayfield()
         {
             InternalChildren = new Drawable[]
@@ -49,6 +51,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 followPoints = new FollowPointRenderer { RelativeSizeAxes = Axes.Both },
                 judgementLayer = new JudgementContainer<DrawableOsuJudgement> { RelativeSizeAxes = Axes.Both },
                 HitObjectContainer,
+                judgementAboveHitObjectLayer = new Container { RelativeSizeAxes = Axes.Both },
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
@@ -58,13 +61,18 @@ namespace osu.Game.Rulesets.Osu.UI
             var hitWindows = new OsuHitWindows();
 
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
-                poolDictionary.Add(result, new DrawableJudgementPool(result));
+                poolDictionary.Add(result, new DrawableJudgementPool(result, onJudgmentLoaded));
 
             AddRangeInternal(poolDictionary.Values);
 
             NewResult += onNewResult;
         }
 
+        private void onJudgmentLoaded(DrawableOsuJudgement judgement)
+        {
+            judgementAboveHitObjectLayer.Add(judgement.GetProxyAboveHitObjectsContent());
+        }
+
         [BackgroundDependencyLoader(true)]
         private void load(OsuRulesetConfigManager config)
         {
@@ -150,11 +158,13 @@ namespace osu.Game.Rulesets.Osu.UI
         private class DrawableJudgementPool : DrawablePool<DrawableOsuJudgement>
         {
             private readonly HitResult result;
+            private readonly Action<DrawableOsuJudgement> onLoaded;
 
-            public DrawableJudgementPool(HitResult result)
+            public DrawableJudgementPool(HitResult result, Action<DrawableOsuJudgement> onLoaded)
                 : base(10)
             {
                 this.result = result;
+                this.onLoaded = onLoaded;
             }
 
             protected override DrawableOsuJudgement CreateNewDrawable()
@@ -164,6 +174,8 @@ namespace osu.Game.Rulesets.Osu.UI
                 // just a placeholder to initialise the correct drawable hierarchy for this pool.
                 judgement.Apply(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null);
 
+                onLoaded?.Invoke(judgement);
+
                 return judgement;
             }
         }
diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index b89c1f4e4f..c26dee119d 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -69,5 +69,7 @@ namespace osu.Game.Rulesets.Judgements
 
             this.FadeOutFromOne(800);
         }
+
+        public Drawable GetAboveHitObjectsProxiedContent() => this.CreateProxy();
     }
 }
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 4aed38e689..3063656aaf 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -6,6 +6,7 @@ using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
@@ -29,6 +30,8 @@ namespace osu.Game.Rulesets.Judgements
 
         protected SkinnableDrawable JudgementBody { get; private set; }
 
+        private readonly Container aboveHitObjectsContent;
+
         [Resolved]
         private ISkinSource skinSource { get; set; }
 
@@ -59,6 +62,12 @@ namespace osu.Game.Rulesets.Judgements
         {
             Size = new Vector2(judgement_size);
             Origin = Anchor.Centre;
+
+            AddInternal(aboveHitObjectsContent = new Container
+            {
+                Depth = float.MinValue,
+                RelativeSizeAxes = Axes.Both
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -67,6 +76,8 @@ namespace osu.Game.Rulesets.Judgements
             prepareDrawables();
         }
 
+        public Drawable GetProxyAboveHitObjectsContent() => aboveHitObjectsContent.CreateProxy();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -189,6 +200,7 @@ namespace osu.Game.Rulesets.Judgements
             if (JudgementBody != null)
                 RemoveInternal(JudgementBody);
 
+            aboveHitObjectsContent.Clear();
             AddInternal(JudgementBody = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ =>
                 CreateDefaultJudgement(type), confineMode: ConfineMode.NoScaling)
             {
@@ -196,6 +208,13 @@ namespace osu.Game.Rulesets.Judgements
                 Origin = Anchor.Centre,
             });
 
+            if (JudgementBody.Drawable is IAnimatableJudgement animatable)
+            {
+                var proxiedContent = animatable.GetAboveHitObjectsProxiedContent();
+                if (proxiedContent != null)
+                    aboveHitObjectsContent.Add(proxiedContent);
+            }
+
             currentDrawableType = type;
         }
 
diff --git a/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs b/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs
index 32312f1115..d37a270a20 100644
--- a/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs
@@ -10,6 +10,14 @@ namespace osu.Game.Rulesets.Judgements
     /// </summary>
     public interface IAnimatableJudgement : IDrawable
     {
+        /// <summary>
+        /// Start the animation for this judgement from the current point in time.
+        /// </summary>
         void PlayAnimation();
+
+        /// <summary>
+        /// Get proxied content which should be displayed above all hitobjects.
+        /// </summary>
+        Drawable GetAboveHitObjectsProxiedContent();
     }
 }
diff --git a/osu.Game/Skinning/LegacyJudgementPieceNew.cs b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
index 2a53820872..290571f46c 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceNew.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
@@ -121,5 +122,8 @@ namespace osu.Game.Skinning
                     break;
             }
         }
+
+        [CanBeNull]
+        public Drawable GetAboveHitObjectsProxiedContent() => temporaryOldStyle?.CreateProxy(); // for new style judgements, only the old style temporary display is in front of objects.
     }
 }
diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index 3486dce081..5d74ab9ae3 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -69,5 +69,7 @@ namespace osu.Game.Skinning
                     break;
             }
         }
+
+        public Drawable GetAboveHitObjectsProxiedContent() => CreateProxy();
     }
 }

From a00e0d72793fc97724d3d94e313a9cfaa6f0438b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 16:30:48 +0900
Subject: [PATCH 06341/10326] Move CanBeNull specification to the interface

---
 osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs | 2 ++
 osu.Game/Skinning/LegacyJudgementPieceNew.cs         | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs b/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs
index d37a270a20..b38b83b534 100644
--- a/osu.Game/Rulesets/Judgements/IAnimatableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/IAnimatableJudgement.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 JetBrains.Annotations;
 using osu.Framework.Graphics;
 
 namespace osu.Game.Rulesets.Judgements
@@ -18,6 +19,7 @@ namespace osu.Game.Rulesets.Judgements
         /// <summary>
         /// Get proxied content which should be displayed above all hitobjects.
         /// </summary>
+        [CanBeNull]
         Drawable GetAboveHitObjectsProxiedContent();
     }
 }
diff --git a/osu.Game/Skinning/LegacyJudgementPieceNew.cs b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
index 290571f46c..ca25efaa01 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceNew.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
@@ -123,7 +122,6 @@ namespace osu.Game.Skinning
             }
         }
 
-        [CanBeNull]
         public Drawable GetAboveHitObjectsProxiedContent() => temporaryOldStyle?.CreateProxy(); // for new style judgements, only the old style temporary display is in front of objects.
     }
 }

From 53b6d90ab4822e79b3c0569082580eaf2e5339df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 16:30:58 +0900
Subject: [PATCH 06342/10326] Don't show default judgements in front of objects
 for now

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

diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index c26dee119d..d94346cb72 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -70,6 +70,6 @@ namespace osu.Game.Rulesets.Judgements
             this.FadeOutFromOne(800);
         }
 
-        public Drawable GetAboveHitObjectsProxiedContent() => this.CreateProxy();
+        public Drawable GetAboveHitObjectsProxiedContent() => null;
     }
 }

From 85eb98a7ec631531e545f896c2233445733db0af Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 16:43:07 +0900
Subject: [PATCH 06343/10326] Clean up some code reuse

---
 .../Connections/FollowPointConnection.cs      | 23 +++++++++++++++----
 .../Connections/FollowPointRenderer.cs        |  8 +++----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 3f6854786b..f9a594a3cb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -55,12 +55,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
             Vector2 startPosition = start.StackedEndPosition;
             Vector2 endPosition = end.StackedPosition;
-            double endTime = end.StartTime;
 
             Vector2 distanceVector = endPosition - startPosition;
             int distance = (int)distanceVector.Length;
             float rotation = (float)(Math.Atan2(distanceVector.Y, distanceVector.X) * (180 / Math.PI));
-            double duration = endTime - startTime;
 
             double finalTransformEndTime = startTime;
 
@@ -69,8 +67,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 float fraction = (float)d / distance;
                 Vector2 pointStartPosition = startPosition + (fraction - 0.1f) * distanceVector;
                 Vector2 pointEndPosition = startPosition + fraction * distanceVector;
-                double fadeOutTime = startTime + fraction * duration;
-                double fadeInTime = fadeOutTime - PREEMPT;
+
+                GetFadeTimes(start, end, (float)d / distance, out var fadeInTime, out var fadeOutTime);
 
                 FollowPoint fp;
 
@@ -98,5 +96,22 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             // todo: use Expire() on FollowPoints and take lifetime from them when https://github.com/ppy/osu-framework/issues/3300 is fixed.
             Entry.LifetimeEnd = finalTransformEndTime;
         }
+
+        /// <summary>
+        /// Computes the fade time of follow point positioned between two hitobjects.
+        /// </summary>
+        /// <param name="start">The first <see cref="OsuHitObject"/>, where follow points should originate from.</param>
+        /// <param name="end">The second <see cref="OsuHitObject"/>, which follow points should target.</param>
+        /// <param name="fraction">The fractional distance along <paramref name="start"/> and <paramref name="end"/> at which the follow point is to be located.</param>
+        /// <param name="fadeInTime">The fade-in time of the follow point/</param>
+        /// <param name="fadeOutTime">The fade-out time of the follow point.</param>
+        public static void GetFadeTimes(OsuHitObject start, OsuHitObject end, float fraction, out double fadeInTime, out double fadeOutTime)
+        {
+            double startTime = start.GetEndTime();
+            double duration = end.StartTime - startTime;
+
+            fadeOutTime = startTime + fraction * duration;
+            fadeInTime = fadeOutTime - PREEMPT;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index 7067cf2728..b1914fde85 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -248,12 +248,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 Vector2 startPosition = Start.StackedEndPosition;
                 Vector2 endPosition = End.StackedPosition;
                 Vector2 distanceVector = endPosition - startPosition;
+
+                // The lifetime start will match the fade-in time of the first follow point.
                 float fraction = (int)(FollowPointConnection.SPACING * 1.5) / distanceVector.Length;
-
-                double duration = End.StartTime - Start.GetEndTime();
-
-                double fadeOutTime = Start.StartTime + fraction * duration;
-                double fadeInTime = fadeOutTime - FollowPointConnection.PREEMPT;
+                FollowPointConnection.GetFadeTimes(Start, End, fraction, out var fadeInTime, out _);
 
                 LifetimeStart = fadeInTime;
                 LifetimeEnd = double.MaxValue; // This will be set by the connection.

From 3b600f0a7b2dda8fa17ba85ee1563526bad44ece Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 10:45:19 +0300
Subject: [PATCH 06344/10326] Target net5.0 instead of netcoreapp3

---
 global.json                                                     | 2 +-
 osu.Desktop/osu.Desktop.csproj                                  | 2 +-
 osu.Game.Benchmarks/osu.Game.Benchmarks.csproj                  | 2 +-
 .../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 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/global.json b/global.json
index 10b61047ac..2cb4c02970 100644
--- a/global.json
+++ b/global.json
@@ -2,7 +2,7 @@
   "sdk": {
     "allowPrerelease": false,
     "rollForward": "minor",
-    "version": "3.1.100"
+    "version": "5.0.100"
   },
   "msbuild-sdks": {
     "Microsoft.Build.Traversal": "2.2.3"
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 62e8f7c518..7f5154f456 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>A free-to-win rhythm game. Rhythm is just a *click* away!</Description>
diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index ff26f4afaa..7805bfcefc 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
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 dfe3bf8af4..a51b9830be 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
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
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 892f27d27f..d314671bce 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
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj" />
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 3639c3616f..b0799bd3f5 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
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
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 b59f3a4344..d3dbba4bfc 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
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index c692bcd5e4..34de54411b 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index 5d55196dcf..d820794980 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />

From ca0e1c8cee1ffd03b2bb5fe773741012b90bb654 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 10:47:57 +0300
Subject: [PATCH 06345/10326] Update NuGet packages

---
 osu.Desktop/osu.Desktop.csproj                 | 4 ++--
 osu.Game.Tournament/osu.Game.Tournament.csproj | 2 +-
 osu.Game/osu.Game.csproj                       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 7f5154f456..2052c4bc25 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -24,11 +24,11 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="System.IO.Packaging" Version="4.7.0" />
+    <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
     <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="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.150" />
     <!-- .NET 3.1 SDK seems to cause issues with a runtime specification. This will likely be resolved in .NET 5. -->
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
diff --git a/osu.Game.Tournament/osu.Game.Tournament.csproj b/osu.Game.Tournament/osu.Game.Tournament.csproj
index 9cce40c9d3..b049542bb0 100644
--- a/osu.Game.Tournament/osu.Game.Tournament.csproj
+++ b/osu.Game.Tournament/osu.Game.Tournament.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 54f3fcede6..1670bf5b11 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="Dapper" Version="2.0.35" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.9" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.0" />
     <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" />
@@ -31,6 +31,6 @@
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 </Project>

From c1f56cd0ba5d2deb9b7187e9915d8b74b26ee1c1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 16:49:22 +0900
Subject: [PATCH 06346/10326] Remove aliveness hackery

---
 .../Connections/FollowPointRenderer.cs        | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index b1914fde85..43914c4d57 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -43,12 +43,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         {
             InternalChildren = new Drawable[]
             {
-                connectionPool = new DrawablePool<FollowPointConnection>(1, 200),
-                pointPool = new DrawablePool<FollowPoint>(50, 1000)
+                connectionPool = new DrawablePoolNoLifetime<FollowPointConnection>(1, 200),
+                pointPool = new DrawablePoolNoLifetime<FollowPoint>(50, 1000)
             };
-
-            MakeChildAlive(connectionPool);
-            MakeChildAlive(pointPool);
         }
 
         public void AddFollowPoints(OsuHitObject hitObject)
@@ -136,7 +133,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             }
         }
 
-        protected override bool CheckChildrenLife() => lifetimeManager.Update(Time.Current);
+        protected override bool CheckChildrenLife()
+        {
+            bool anyAliveChanged = base.CheckChildrenLife();
+            anyAliveChanged |= lifetimeManager.Update(Time.Current);
+            return anyAliveChanged;
+        }
 
         private void onEntryBecameAlive(LifetimeEntry entry)
         {
@@ -149,7 +151,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             connectionsInUse[entry] = connection;
 
             AddInternal(connection);
-            MakeChildAlive(connection);
         }
 
         private void onEntryBecameDead(LifetimeEntry entry)
@@ -173,6 +174,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             lifetimeEntries.Clear();
         }
 
+        private class DrawablePoolNoLifetime<T> : DrawablePool<T>
+            where T : PoolableDrawable, new()
+        {
+            public override bool RemoveWhenNotAlive => false;
+
+            public DrawablePoolNoLifetime(int initialSize, int? maximumSize = null)
+                : base(initialSize, maximumSize)
+            {
+            }
+        }
+
         public class FollowPointLifetimeEntry : LifetimeEntry
         {
             public event Action Invalidated;

From 7bd75eca816adada1857bbb1445b0f469eeb1aab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 16:53:08 +0900
Subject: [PATCH 06347/10326] Separate classes

---
 .../TestSceneFollowPoints.cs                  |  2 +-
 .../Connections/FollowPointConnection.cs      |  2 +-
 .../Connections/FollowPointLifetimeEntry.cs   | 98 +++++++++++++++++++
 .../Connections/FollowPointRenderer.cs        | 89 -----------------
 4 files changed, 100 insertions(+), 91 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointLifetimeEntry.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
index e7c73b941d..fe67b63252 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
@@ -272,7 +272,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private DrawableOsuHitObject getObject(int index) => hitObjectContainer[index];
 
-        private FollowPointRenderer.FollowPointLifetimeEntry getEntry(int index) => followPointRenderer.Entries[index];
+        private FollowPointLifetimeEntry getEntry(int index) => followPointRenderer.Entries[index];
 
         private FollowPointConnection getGroup(int index) => followPointRenderer.ChildrenOfType<FollowPointConnection>().Single(c => c.Entry == getEntry(index));
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index f9a594a3cb..700d96eff3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         public const int SPACING = 32;
         public const double PREEMPT = 800;
 
-        public FollowPointRenderer.FollowPointLifetimeEntry Entry;
+        public FollowPointLifetimeEntry Entry;
         public DrawablePool<FollowPoint> Pool;
 
         protected override void PrepareForUse()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointLifetimeEntry.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointLifetimeEntry.cs
new file mode 100644
index 0000000000..a167cb2f0f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointLifetimeEntry.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 osu.Framework.Bindables;
+using osu.Framework.Graphics.Performance;
+using osu.Game.Rulesets.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
+{
+    public class FollowPointLifetimeEntry : LifetimeEntry
+    {
+        public event Action Invalidated;
+        public readonly OsuHitObject Start;
+
+        public FollowPointLifetimeEntry(OsuHitObject start)
+        {
+            Start = start;
+            LifetimeStart = Start.StartTime;
+
+            bindEvents();
+        }
+
+        private OsuHitObject end;
+
+        public OsuHitObject End
+        {
+            get => end;
+            set
+            {
+                UnbindEvents();
+
+                end = value;
+
+                bindEvents();
+
+                refreshLifetimes();
+            }
+        }
+
+        private void bindEvents()
+        {
+            UnbindEvents();
+
+            // Note: Positions are bound for instantaneous feedback from positional changes from the editor, before ApplyDefaults() is called on hitobjects.
+            Start.DefaultsApplied += onDefaultsApplied;
+            Start.PositionBindable.ValueChanged += onPositionChanged;
+
+            if (End != null)
+            {
+                End.DefaultsApplied += onDefaultsApplied;
+                End.PositionBindable.ValueChanged += onPositionChanged;
+            }
+        }
+
+        public void UnbindEvents()
+        {
+            if (Start != null)
+            {
+                Start.DefaultsApplied -= onDefaultsApplied;
+                Start.PositionBindable.ValueChanged -= onPositionChanged;
+            }
+
+            if (End != null)
+            {
+                End.DefaultsApplied -= onDefaultsApplied;
+                End.PositionBindable.ValueChanged -= onPositionChanged;
+            }
+        }
+
+        private void onDefaultsApplied(HitObject obj) => refreshLifetimes();
+
+        private void onPositionChanged(ValueChangedEvent<Vector2> obj) => refreshLifetimes();
+
+        private void refreshLifetimes()
+        {
+            if (End == null || End.NewCombo || Start is Spinner || End is Spinner)
+            {
+                LifetimeEnd = LifetimeStart;
+                return;
+            }
+
+            Vector2 startPosition = Start.StackedEndPosition;
+            Vector2 endPosition = End.StackedPosition;
+            Vector2 distanceVector = endPosition - startPosition;
+
+            // The lifetime start will match the fade-in time of the first follow point.
+            float fraction = (int)(FollowPointConnection.SPACING * 1.5) / distanceVector.Length;
+            FollowPointConnection.GetFadeTimes(Start, End, fraction, out var fadeInTime, out _);
+
+            LifetimeStart = fadeInTime;
+            LifetimeEnd = double.MaxValue; // This will be set by the connection.
+
+            Invalidated?.Invoke();
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index 43914c4d57..3e85e528e8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 {
@@ -184,92 +182,5 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             {
             }
         }
-
-        public class FollowPointLifetimeEntry : LifetimeEntry
-        {
-            public event Action Invalidated;
-            public readonly OsuHitObject Start;
-
-            public FollowPointLifetimeEntry(OsuHitObject start)
-            {
-                Start = start;
-                LifetimeStart = Start.StartTime;
-
-                bindEvents();
-            }
-
-            private OsuHitObject end;
-
-            public OsuHitObject End
-            {
-                get => end;
-                set
-                {
-                    UnbindEvents();
-
-                    end = value;
-
-                    bindEvents();
-
-                    refreshLifetimes();
-                }
-            }
-
-            private void bindEvents()
-            {
-                UnbindEvents();
-
-                // Note: Positions are bound for instantaneous feedback from positional changes from the editor, before ApplyDefaults() is called on hitobjects.
-                Start.DefaultsApplied += onDefaultsApplied;
-                Start.PositionBindable.ValueChanged += onPositionChanged;
-
-                if (End != null)
-                {
-                    End.DefaultsApplied += onDefaultsApplied;
-                    End.PositionBindable.ValueChanged += onPositionChanged;
-                }
-            }
-
-            public void UnbindEvents()
-            {
-                if (Start != null)
-                {
-                    Start.DefaultsApplied -= onDefaultsApplied;
-                    Start.PositionBindable.ValueChanged -= onPositionChanged;
-                }
-
-                if (End != null)
-                {
-                    End.DefaultsApplied -= onDefaultsApplied;
-                    End.PositionBindable.ValueChanged -= onPositionChanged;
-                }
-            }
-
-            private void onDefaultsApplied(HitObject obj) => refreshLifetimes();
-
-            private void onPositionChanged(ValueChangedEvent<Vector2> obj) => refreshLifetimes();
-
-            private void refreshLifetimes()
-            {
-                if (End == null || End.NewCombo || Start is Spinner || End is Spinner)
-                {
-                    LifetimeEnd = LifetimeStart;
-                    return;
-                }
-
-                Vector2 startPosition = Start.StackedEndPosition;
-                Vector2 endPosition = End.StackedPosition;
-                Vector2 distanceVector = endPosition - startPosition;
-
-                // The lifetime start will match the fade-in time of the first follow point.
-                float fraction = (int)(FollowPointConnection.SPACING * 1.5) / distanceVector.Length;
-                FollowPointConnection.GetFadeTimes(Start, End, fraction, out var fadeInTime, out _);
-
-                LifetimeStart = fadeInTime;
-                LifetimeEnd = double.MaxValue; // This will be set by the connection.
-
-                Invalidated?.Invoke();
-            }
-        }
     }
 }

From f562a7ea0df68baee20551108bb4bd9fd13d5747 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 11:52:17 +0300
Subject: [PATCH 06348/10326] Fix FileNotFoundException on startup

---
 osu.Desktop/osu.Desktop.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 2052c4bc25..53b9cdcf92 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -24,6 +24,8 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
+	  <!-- WorkaroundWorkaround for a System.IO.FileNotFoundException on startup. Required because of old EF Core version. -->
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />

From 044622036cbc94adae124f68ec5fbff18befb2b4 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 11:53:17 +0300
Subject: [PATCH 06349/10326] Disable CA1416

---
 osu.Desktop/OsuGameDesktop.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 0feab9a717..e2a06d7877 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -58,8 +58,10 @@ namespace osu.Desktop
 
             try
             {
+#pragma warning disable CA1416 // Validate platform compatibility
                 using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
                     stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString()?.Split('"')[1].Replace("osu!.exe", "");
+#pragma warning restore CA1416 // Validate platform compatibility
 
                 if (checkExists(stableInstallPath))
                     return stableInstallPath;

From c013cd11c9ac330aa18217ce3480e7994d78c3fe Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 20 Nov 2020 17:24:09 +0900
Subject: [PATCH 06350/10326] Add DrawableHitObjectAdded event

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 17 +++++++++++++++++
 osu.Game/Rulesets/UI/Playfield.cs          |  6 ++++++
 2 files changed, 23 insertions(+)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 5fbda305c8..5dc653395b 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -42,6 +42,11 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> RevertResult;
 
+        /// <summary>
+        /// Invoked when a <see cref="DrawableHitObject"/> is added.
+        /// </summary>
+        public event Action<DrawableHitObject> DrawableHitObjectAdded;
+
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -115,6 +120,8 @@ namespace osu.Game.Rulesets.UI
             bindStartTime(drawable);
             AddInternal(drawableMap[entry] = drawable, false);
 
+            DrawableHitObjectAdded?.Invoke(drawable);
+
             HitObjectUsageBegan?.Invoke(entry.HitObject);
         }
 
@@ -147,6 +154,16 @@ namespace osu.Game.Rulesets.UI
             hitObject.OnRevertResult += onRevertResult;
 
             AddInternal(hitObject);
+
+            onDrawableHitObjectAddedRecursive(hitObject);
+        }
+
+        private void onDrawableHitObjectAddedRecursive(DrawableHitObject hitObject)
+        {
+            DrawableHitObjectAdded?.Invoke(hitObject);
+
+            foreach (var nested in hitObject.NestedHitObjects)
+                onDrawableHitObjectAddedRecursive(nested);
         }
 
         public virtual bool Remove(DrawableHitObject hitObject)
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 82ec653f31..245fdd59e5 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -32,6 +32,11 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> RevertResult;
 
+        /// <summary>
+        /// Invoked when a <see cref="DrawableHitObject"/> is added.
+        /// </summary>
+        public event Action<DrawableHitObject> DrawableHitObjectAdded;
+
         /// <summary>
         /// The <see cref="DrawableHitObject"/> contained in this Playfield.
         /// </summary>
@@ -91,6 +96,7 @@ namespace osu.Game.Rulesets.UI
             {
                 h.NewResult += (d, r) => NewResult?.Invoke(d, r);
                 h.RevertResult += (d, r) => RevertResult?.Invoke(d, r);
+                h.DrawableHitObjectAdded += d => DrawableHitObjectAdded?.Invoke(d);
                 h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
                 h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
             }));

From 468b2a97cbcf40f71a8df3e3c067617c7a197cff Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 20 Nov 2020 17:25:57 +0900
Subject: [PATCH 06351/10326] Use events instead of overriding Add (catch)

---
 .../Objects/Drawables/DrawableBananaShower.cs     |  2 +-
 .../Objects/Drawables/DrawableJuiceStream.cs      |  3 +--
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs      | 15 ++++-----------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
index 4ce80aceb8..b46933d0c2 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             switch (hitObject)
             {
                 case Banana banana:
-                    return createDrawableRepresentation?.Invoke(banana)?.With(o => ((DrawableCatchHitObject)o).CheckPosition = p => CheckPosition?.Invoke(p) ?? false);
+                    return createDrawableRepresentation?.Invoke(banana);
             }
 
             return base.CreateNestedHitObject(hitObject);
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
index 7bc016d94f..cc8accbb2b 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
@@ -47,8 +47,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             switch (hitObject)
             {
                 case CatchHitObject catchObject:
-                    return createDrawableRepresentation?.Invoke(catchObject)?.With(o =>
-                        ((DrawableCatchHitObject)o).CheckPosition = p => CheckPosition?.Invoke(p) ?? false);
+                    return createDrawableRepresentation?.Invoke(catchObject);
             }
 
             throw new ArgumentException($"{nameof(hitObject)} must be of type {nameof(CatchHitObject)}.");
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 735d7fc300..0b379bbe95 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -55,21 +55,14 @@ namespace osu.Game.Rulesets.Catch.UI
                 HitObjectContainer,
                 CatcherArea,
             };
+
+            NewResult += onNewResult;
+            RevertResult += onRevertResult;
+            DrawableHitObjectAdded += d => ((DrawableCatchHitObject)d).CheckPosition = CheckIfWeCanCatch;
         }
 
         public bool CheckIfWeCanCatch(CatchHitObject obj) => CatcherArea.AttemptCatch(obj);
 
-        public override void Add(DrawableHitObject h)
-        {
-            h.OnNewResult += onNewResult;
-            h.OnRevertResult += onRevertResult;
-
-            base.Add(h);
-
-            var fruit = (DrawableCatchHitObject)h;
-            fruit.CheckPosition = CheckIfWeCanCatch;
-        }
-
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
             => CatcherArea.OnNewResult((DrawableCatchHitObject)judgedObject, result);
 

From cd16a3fa614443cc150c74d407081447942ea58b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 20 Nov 2020 17:28:06 +0900
Subject: [PATCH 06352/10326] Use event instead of using custom pools (osu)

---
 .../Edit/DrawableOsuEditPool.cs               | 63 -------------------
 .../Edit/DrawableOsuEditRuleset.cs            | 48 +++++++++++++-
 .../Objects/Drawables/DrawableOsuPool.cs      | 32 ----------
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      | 38 +++++------
 4 files changed, 64 insertions(+), 117 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs
 delete mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuPool.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs
deleted file mode 100644
index 776aacd143..0000000000
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs
+++ /dev/null
@@ -1,63 +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.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
-
-namespace osu.Game.Rulesets.Osu.Edit
-{
-    public class DrawableOsuEditPool<T> : DrawableOsuPool<T>
-        where T : DrawableHitObject, new()
-    {
-        /// <summary>
-        /// Hit objects are intentionally made to fade out at a constant slower rate than in gameplay.
-        /// This allows a mapper to gain better historical context and use recent hitobjects as reference / snap points.
-        /// </summary>
-        private const double editor_hit_object_fade_out_extension = 700;
-
-        public DrawableOsuEditPool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null)
-            : base(checkHittable, onLoaded, initialSize, maximumSize)
-        {
-        }
-
-        protected override T CreateNewDrawable() => base.CreateNewDrawable().With(d => d.ApplyCustomUpdateState += updateState);
-
-        private void updateState(DrawableHitObject hitObject, ArmedState state)
-        {
-            if (state == ArmedState.Idle)
-                return;
-
-            // adjust the visuals of certain object types to make them stay on screen for longer than usual.
-            switch (hitObject)
-            {
-                default:
-                    // there are quite a few drawable hit types we don't want to extend (spinners, ticks etc.)
-                    return;
-
-                case DrawableSlider _:
-                    // no specifics to sliders but let them fade slower below.
-                    break;
-
-                case DrawableHitCircle circle: // also handles slider heads
-                    circle.ApproachCircle
-                          .FadeOutFromOne(editor_hit_object_fade_out_extension)
-                          .Expire();
-                    break;
-            }
-
-            // Get the existing fade out transform
-            var existing = hitObject.Transforms.LastOrDefault(t => t.TargetMember == nameof(Alpha));
-
-            if (existing == null)
-                return;
-
-            hitObject.RemoveTransform(existing);
-
-            using (hitObject.BeginAbsoluteSequence(existing.StartTime))
-                hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index 547dff88b5..a03389bfe9 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -2,9 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Framework.Graphics.Pooling;
+using System.Linq;
+using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
 using osuTK;
@@ -26,8 +29,47 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             protected override GameplayCursorContainer CreateCursor() => null;
 
-            protected override DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
-                => new DrawableOsuEditPool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize);
+            public OsuEditPlayfield()
+            {
+                DrawableHitObjectAdded += d => d.ApplyCustomUpdateState += updateState;
+            }
+
+            private const double editor_hit_object_fade_out_extension = 700;
+
+            private void updateState(DrawableHitObject hitObject, ArmedState state)
+            {
+                if (state == ArmedState.Idle)
+                    return;
+
+                // adjust the visuals of certain object types to make them stay on screen for longer than usual.
+                switch (hitObject)
+                {
+                    default:
+                        // there are quite a few drawable hit types we don't want to extend (spinners, ticks etc.)
+                        return;
+
+                    case DrawableSlider _:
+                        // no specifics to sliders but let them fade slower below.
+                        break;
+
+                    case DrawableHitCircle circle: // also handles slider heads
+                        circle.ApproachCircle
+                              .FadeOutFromOne(editor_hit_object_fade_out_extension)
+                              .Expire();
+                        break;
+                }
+
+                // Get the existing fade out transform
+                var existing = hitObject.Transforms.LastOrDefault(t => t.TargetMember == nameof(Alpha));
+
+                if (existing == null)
+                    return;
+
+                hitObject.RemoveTransform(existing);
+
+                using (hitObject.BeginAbsoluteSequence(existing.StartTime))
+                    hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuPool.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuPool.cs
deleted file mode 100644
index 1b5fd50022..0000000000
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuPool.cs
+++ /dev/null
@@ -1,32 +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.Graphics;
-using osu.Framework.Graphics.Pooling;
-using osu.Game.Rulesets.Objects.Drawables;
-
-namespace osu.Game.Rulesets.Osu.Objects.Drawables
-{
-    public class DrawableOsuPool<T> : DrawablePool<T>
-        where T : DrawableHitObject, new()
-    {
-        private readonly Func<DrawableHitObject, double, bool> checkHittable;
-        private readonly Action<Drawable> onLoaded;
-
-        public DrawableOsuPool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null)
-            : base(initialSize, maximumSize)
-        {
-            this.checkHittable = checkHittable;
-            this.onLoaded = onLoaded;
-        }
-
-        protected override T CreateNewDrawable() => base.CreateNewDrawable().With(o =>
-        {
-            var osuObject = (DrawableOsuHitObject)(object)o;
-
-            osuObject.CheckHittable = checkHittable;
-            osuObject.OnLoadComplete += onLoaded;
-        });
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index c816502d61..1b0d50b4f3 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -91,6 +91,15 @@ namespace osu.Game.Rulesets.Osu.UI
             AddRangeInternal(poolDictionary.Values);
 
             NewResult += onNewResult;
+            DrawableHitObjectAdded += onDrawableHitObjectAdded;
+        }
+
+        private void onDrawableHitObjectAdded(DrawableHitObject drawable)
+        {
+            if (!drawable.IsLoaded)
+                drawable.OnLoadComplete += onDrawableHitObjectLoaded;
+
+            ((DrawableOsuHitObject)drawable).CheckHittable = CheckHittable;
         }
 
         [BackgroundDependencyLoader(true)]
@@ -98,28 +107,19 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             config?.BindWith(OsuRulesetSetting.PlayfieldBorderStyle, playfieldBorder.PlayfieldBorderStyle);
 
-            registerPool<HitCircle, DrawableHitCircle>(10, 100);
+            RegisterPool<HitCircle, DrawableHitCircle>(10, 100);
 
-            registerPool<Slider, DrawableSlider>(10, 100);
-            registerPool<SliderHeadCircle, DrawableSliderHead>(10, 100);
-            registerPool<SliderTailCircle, DrawableSliderTail>(10, 100);
-            registerPool<SliderTick, DrawableSliderTick>(10, 100);
-            registerPool<SliderRepeat, DrawableSliderRepeat>(5, 50);
+            RegisterPool<Slider, DrawableSlider>(10, 100);
+            RegisterPool<SliderHeadCircle, DrawableSliderHead>(10, 100);
+            RegisterPool<SliderTailCircle, DrawableSliderTail>(10, 100);
+            RegisterPool<SliderTick, DrawableSliderTick>(10, 100);
+            RegisterPool<SliderRepeat, DrawableSliderRepeat>(5, 50);
 
-            registerPool<Spinner, DrawableSpinner>(2, 20);
-            registerPool<SpinnerTick, DrawableSpinnerTick>(10, 100);
-            registerPool<SpinnerBonusTick, DrawableSpinnerBonusTick>(10, 100);
+            RegisterPool<Spinner, DrawableSpinner>(2, 20);
+            RegisterPool<SpinnerTick, DrawableSpinnerTick>(10, 100);
+            RegisterPool<SpinnerBonusTick, DrawableSpinnerBonusTick>(10, 100);
         }
 
-        private void registerPool<TObject, TDrawable>(int initialSize, int? maximumSize = null)
-            where TObject : HitObject
-            where TDrawable : DrawableHitObject, new()
-            => RegisterPool<TObject, TDrawable>(CreatePool<TDrawable>(initialSize, maximumSize));
-
-        protected virtual DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
-            where TDrawable : DrawableHitObject, new()
-            => new DrawableOsuPool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize);
-
         protected override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject) => new OsuHitObjectLifetimeEntry(hitObject);
 
         protected override void OnHitObjectAdded(HitObject hitObject)
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Osu.UI
             followPoints.RemoveFollowPoints((OsuHitObject)hitObject);
         }
 
-        public void OnHitObjectLoaded(Drawable drawable)
+        private void onDrawableHitObjectLoaded(Drawable drawable)
         {
             switch (drawable)
             {

From 772f6df668e7d95c14bb5ba9e6e84a69ba693ba3 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 20 Nov 2020 18:00:00 +0900
Subject: [PATCH 06353/10326] Add a remark for DrawableHitObjectAdded

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 3 +++
 osu.Game/Rulesets/UI/Playfield.cs          | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 5dc653395b..da7f5a0ee5 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -45,6 +45,9 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// Invoked when a <see cref="DrawableHitObject"/> is added.
         /// </summary>
+        /// <remarks>
+        /// This event is also called for nested <see cref="DrawableHitObject"/>s.
+        /// </remarks>
         public event Action<DrawableHitObject> DrawableHitObjectAdded;
 
         /// <summary>
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 245fdd59e5..be56be91d5 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -35,6 +35,9 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// Invoked when a <see cref="DrawableHitObject"/> is added.
         /// </summary>
+        /// <remarks>
+        /// This event is also called for nested <see cref="DrawableHitObject"/>s.
+        /// </remarks>
         public event Action<DrawableHitObject> DrawableHitObjectAdded;
 
         /// <summary>

From 1a676ef0d82c4d4cfd0d7fbac2338da3a763272f Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 12:06:08 +0300
Subject: [PATCH 06354/10326] Resolve CA1416 properly using new API

---
 osu.Desktop/OsuGameDesktop.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index e2a06d7877..f9c932b260 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using Microsoft.Win32;
 using osu.Desktop.Overlays;
@@ -56,19 +57,12 @@ namespace osu.Desktop
 
             string stableInstallPath;
 
-            try
+            if (OperatingSystem.IsWindows())
             {
-#pragma warning disable CA1416 // Validate platform compatibility
-                using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString()?.Split('"')[1].Replace("osu!.exe", "");
-#pragma warning restore CA1416 // Validate platform compatibility
-
+                stableInstallPath = getStableInstallPathFromRegistry();
                 if (checkExists(stableInstallPath))
                     return stableInstallPath;
             }
-            catch
-            {
-            }
 
             stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
             if (checkExists(stableInstallPath))
@@ -81,6 +75,13 @@ namespace osu.Desktop
             return null;
         }
 
+        [SupportedOSPlatform("windows")]
+        private string getStableInstallPathFromRegistry()
+        {
+            using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                return key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString()?.Split('"')[1].Replace("osu!.exe", "");
+        }
+
         protected override UpdateManager CreateUpdateManager()
         {
             switch (RuntimeInfo.OS)

From 27f5a99726c238effb4311e0324dc589f30a1d08 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 20 Nov 2020 18:42:48 +0900
Subject: [PATCH 06355/10326] Fix more than one proxy is created

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 37 +++++++++---------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 1b0d50b4f3..d453b9cd53 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -96,10 +96,20 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private void onDrawableHitObjectAdded(DrawableHitObject drawable)
         {
-            if (!drawable.IsLoaded)
-                drawable.OnLoadComplete += onDrawableHitObjectLoaded;
-
             ((DrawableOsuHitObject)drawable).CheckHittable = CheckHittable;
+
+            switch (drawable)
+            {
+                case DrawableSpinner _:
+                    if (!drawable.HasProxy)
+                        spinnerProxies.Add(drawable.CreateProxy());
+                    break;
+
+                case IDrawableHitObjectWithProxiedApproach approach:
+                    if (!approach.ProxiedLayer.HasProxy)
+                        approachCircles.Add(approach.ProxiedLayer.CreateProxy());
+                    break;
+            }
         }
 
         [BackgroundDependencyLoader(true)]
@@ -134,27 +144,6 @@ namespace osu.Game.Rulesets.Osu.UI
             followPoints.RemoveFollowPoints((OsuHitObject)hitObject);
         }
 
-        private void onDrawableHitObjectLoaded(Drawable drawable)
-        {
-            switch (drawable)
-            {
-                case DrawableSliderHead _:
-                case DrawableSliderTail _:
-                case DrawableSliderTick _:
-                case DrawableSliderRepeat _:
-                case DrawableSpinnerTick _:
-                    break;
-
-                case DrawableSpinner _:
-                    spinnerProxies.Add(drawable.CreateProxy());
-                    break;
-
-                case IDrawableHitObjectWithProxiedApproach approach:
-                    approachCircles.Add(approach.ProxiedLayer.CreateProxy());
-                    break;
-            }
-        }
-
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             // Hitobjects that block future hits should miss previous hitobjects if they're hit out-of-order.

From a26b0915b4047d61032dc7c0e9fc893502ac70ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 20:08:05 +0900
Subject: [PATCH 06356/10326] Fix scheduled tasks not being cleaned up between
 test steps

---
 .../TestSceneShaking.cs                        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneShaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneShaking.cs
index d692be89b2..7e973d0971 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneShaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneShaking.cs
@@ -1,8 +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 System.Diagnostics;
+using osu.Framework.Threading;
 using osu.Framework.Utils;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 
@@ -10,6 +13,19 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneShaking : TestSceneHitCircle
     {
+        private readonly List<ScheduledDelegate> scheduledTasks = new List<ScheduledDelegate>();
+
+        protected override IBeatmap CreateBeatmapForSkinProvider()
+        {
+            // best way to run cleanup before a new step is run
+            foreach (var task in scheduledTasks)
+                task.Cancel();
+
+            scheduledTasks.Clear();
+
+            return base.CreateBeatmapForSkinProvider();
+        }
+
         protected override TestDrawableHitCircle CreateDrawableHitCircle(HitCircle circle, bool auto)
         {
             var drawableHitObject = base.CreateDrawableHitCircle(circle, auto);
@@ -17,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             Debug.Assert(drawableHitObject.HitObject.HitWindows != null);
 
             double delay = drawableHitObject.HitObject.StartTime - (drawableHitObject.HitObject.HitWindows.WindowFor(HitResult.Miss) + RNG.Next(0, 300)) - Time.Current;
-            Scheduler.AddDelayed(() => drawableHitObject.TriggerJudgement(), delay);
+            scheduledTasks.Add(Scheduler.AddDelayed(() => drawableHitObject.TriggerJudgement(), delay));
 
             return drawableHitObject;
         }

From 743541649706d9b9165197421860dfd0b3cf264d Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 14:13:16 +0300
Subject: [PATCH 06357/10326] Workaround FileNotFoundException in a test
 projects

---
 osu.Desktop/osu.Desktop.csproj | 2 --
 osu.Game/osu.Game.csproj       | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 53b9cdcf92..2052c4bc25 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -24,8 +24,6 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-	  <!-- WorkaroundWorkaround for a System.IO.FileNotFoundException on startup. Required because of old EF Core version. -->
-	  <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1670bf5b11..1c6139b519 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,6 +18,8 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
+    <!-- WorkaroundWorkaround for a System.IO.FileNotFoundException on startup. Required because of old EF Core version. -->
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Dapper" Version="2.0.35" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />

From 8080fe942cc19c6c2ea0db0cdcc92e7b0a329881 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Nov 2020 20:38:26 +0900
Subject: [PATCH 06358/10326] Fix samples being played more than once on skin
 change

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

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 24dddaf758..a6347fe05a 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Skinning
                 SamplesContainer.Add(sample);
             }
 
-            if (wasPlaying)
+            if (wasPlaying && !Looping)
                 Play();
         }
 

From 96abee3fde991e91f1fe14663a9e130c4b4a7005 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 22:43:10 +0900
Subject: [PATCH 06359/10326] Fix silent NRE in slider selection blueprint

---
 .../Blueprints/Sliders/SliderSelectionBlueprint.cs    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 7ae4f387ca..d592e129d9 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -44,6 +44,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }
 
+        private readonly BindableList<PathControlPoint> controlPoints = new BindableList<PathControlPoint>();
+        private readonly IBindable<int> pathVersion = new Bindable<int>();
+
         public SliderSelectionBlueprint(DrawableSlider slider)
             : base(slider)
         {
@@ -61,13 +64,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             };
         }
 
-        private IBindable<int> pathVersion;
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            pathVersion = HitObject.Path.Version.GetBoundCopy();
+            controlPoints.BindTo(HitObject.Path.ControlPoints);
+
+            pathVersion.BindTo(HitObject.Path.Version);
             pathVersion.BindValueChanged(_ => updatePath());
 
             BodyPiece.UpdateFrom(HitObject);
@@ -164,8 +167,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             }
         }
 
-        private BindableList<PathControlPoint> controlPoints => HitObject.Path.ControlPoints;
-
         private int addControlPoint(Vector2 position)
         {
             position -= HitObject.Position;

From 82aefa3868030e0fd323710a1153b30e890899ab Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Sat, 21 Nov 2020 00:27:19 +0900
Subject: [PATCH 06360/10326] Rework and rename to OnNewDrawableHitObject. The
 semantics is changed and hopefully more clear.

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs  |  2 +-
 .../Edit/DrawableOsuEditRuleset.cs            |  2 +-
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      | 18 +++++++++++------
 .../Objects/Drawables/DrawableHitObject.cs    | 12 ++++++++++-
 osu.Game/Rulesets/UI/HitObjectContainer.cs    | 20 -------------------
 osu.Game/Rulesets/UI/Playfield.cs             | 14 ++++++++++---
 6 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 0b379bbe95..cd246e78d5 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             NewResult += onNewResult;
             RevertResult += onRevertResult;
-            DrawableHitObjectAdded += d => ((DrawableCatchHitObject)d).CheckPosition = CheckIfWeCanCatch;
+            OnNewDrawableHitObject += d => ((DrawableCatchHitObject)d).CheckPosition = CheckIfWeCanCatch;
         }
 
         public bool CheckIfWeCanCatch(CatchHitObject obj) => CatcherArea.AttemptCatch(obj);
diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index a03389bfe9..1a71a88c71 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             public OsuEditPlayfield()
             {
-                DrawableHitObjectAdded += d => d.ApplyCustomUpdateState += updateState;
+                OnNewDrawableHitObject += d => d.ApplyCustomUpdateState += updateState;
             }
 
             private const double editor_hit_object_fade_out_extension = 700;
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index d453b9cd53..d7336050eb 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -91,23 +92,28 @@ namespace osu.Game.Rulesets.Osu.UI
             AddRangeInternal(poolDictionary.Values);
 
             NewResult += onNewResult;
-            DrawableHitObjectAdded += onDrawableHitObjectAdded;
+            OnNewDrawableHitObject += onDrawableHitObjectAdded;
         }
 
         private void onDrawableHitObjectAdded(DrawableHitObject drawable)
         {
             ((DrawableOsuHitObject)drawable).CheckHittable = CheckHittable;
 
+            Debug.Assert(!drawable.IsLoaded, $"Already loaded {nameof(DrawableHitObject)} is added to {nameof(OsuPlayfield)}");
+            drawable.OnLoadComplete += onDrawableHitObjectLoaded;
+        }
+
+        private void onDrawableHitObjectLoaded(Drawable drawable)
+        {
+            // note: `Slider`'s `ProxiedLayer` is added when its nested `DrawableHitCircle` is loaded.
             switch (drawable)
             {
                 case DrawableSpinner _:
-                    if (!drawable.HasProxy)
-                        spinnerProxies.Add(drawable.CreateProxy());
+                    spinnerProxies.Add(drawable.CreateProxy());
                     break;
 
-                case IDrawableHitObjectWithProxiedApproach approach:
-                    if (!approach.ProxiedLayer.HasProxy)
-                        approachCircles.Add(approach.ProxiedLayer.CreateProxy());
+                case DrawableHitCircle hitCircle:
+                    approachCircles.Add(hitCircle.ProxiedLayer.CreateProxy());
                     break;
             }
         }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ca49ed9e75..312fbaa2d1 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -74,6 +74,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> OnRevertResult;
 
+        /// <summary>
+        /// Invoked when a new nested hit object is created by <see cref="CreateNestedHitObject" />.
+        /// </summary>
+        internal event Action<DrawableHitObject> OnNestedDrawableCreated;
+
         /// <summary>
         /// Whether a visual indicator should be displayed when a scoring result occurs.
         /// </summary>
@@ -214,10 +219,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             foreach (var h in HitObject.NestedHitObjects)
             {
-                var drawableNested = pooledObjectProvider?.GetPooledDrawableRepresentation(h)
+                var pooledDrawableNested = pooledObjectProvider?.GetPooledDrawableRepresentation(h);
+                var drawableNested = pooledDrawableNested
                                      ?? CreateNestedHitObject(h)
                                      ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
 
+                // Invoke the event only if this nested object is just created by `CreateNestedHitObject`.
+                if (pooledDrawableNested == null)
+                    OnNestedDrawableCreated?.Invoke(drawableNested);
+
                 drawableNested.OnNewResult += onNewResult;
                 drawableNested.OnRevertResult += onRevertResult;
                 drawableNested.ApplyCustomUpdateState += onApplyCustomUpdateState;
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index da7f5a0ee5..5fbda305c8 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -42,14 +42,6 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> RevertResult;
 
-        /// <summary>
-        /// Invoked when a <see cref="DrawableHitObject"/> is added.
-        /// </summary>
-        /// <remarks>
-        /// This event is also called for nested <see cref="DrawableHitObject"/>s.
-        /// </remarks>
-        public event Action<DrawableHitObject> DrawableHitObjectAdded;
-
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -123,8 +115,6 @@ namespace osu.Game.Rulesets.UI
             bindStartTime(drawable);
             AddInternal(drawableMap[entry] = drawable, false);
 
-            DrawableHitObjectAdded?.Invoke(drawable);
-
             HitObjectUsageBegan?.Invoke(entry.HitObject);
         }
 
@@ -157,16 +147,6 @@ namespace osu.Game.Rulesets.UI
             hitObject.OnRevertResult += onRevertResult;
 
             AddInternal(hitObject);
-
-            onDrawableHitObjectAddedRecursive(hitObject);
-        }
-
-        private void onDrawableHitObjectAddedRecursive(DrawableHitObject hitObject)
-        {
-            DrawableHitObjectAdded?.Invoke(hitObject);
-
-            foreach (var nested in hitObject.NestedHitObjects)
-                onDrawableHitObjectAddedRecursive(nested);
         }
 
         public virtual bool Remove(DrawableHitObject hitObject)
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index be56be91d5..8723a8c531 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -33,12 +33,14 @@ namespace osu.Game.Rulesets.UI
         public event Action<DrawableHitObject, JudgementResult> RevertResult;
 
         /// <summary>
-        /// Invoked when a <see cref="DrawableHitObject"/> is added.
+        /// Invoked before a new <see cref="DrawableHitObject"/> is added.
+        /// This event is invoked only once for each <see cref="DrawableHitObject"/>
+        /// even the drawable is pooled and used multiple times for different <see cref="HitObject"/>s.
         /// </summary>
         /// <remarks>
         /// This event is also called for nested <see cref="DrawableHitObject"/>s.
         /// </remarks>
-        public event Action<DrawableHitObject> DrawableHitObjectAdded;
+        public event Action<DrawableHitObject> OnNewDrawableHitObject;
 
         /// <summary>
         /// The <see cref="DrawableHitObject"/> contained in this Playfield.
@@ -93,13 +95,15 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         protected Playfield()
         {
+            OnNewDrawableHitObject += d =>
+                d.OnNestedDrawableCreated += nested => OnNewDrawableHitObject?.Invoke(nested);
+
             RelativeSizeAxes = Axes.Both;
 
             hitObjectContainerLazy = new Lazy<HitObjectContainer>(() => CreateHitObjectContainer().With(h =>
             {
                 h.NewResult += (d, r) => NewResult?.Invoke(d, r);
                 h.RevertResult += (d, r) => RevertResult?.Invoke(d, r);
-                h.DrawableHitObjectAdded += d => DrawableHitObjectAdded?.Invoke(d);
                 h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
                 h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
             }));
@@ -133,6 +137,8 @@ namespace osu.Game.Rulesets.UI
         /// <param name="h">The DrawableHitObject to add.</param>
         public virtual void Add(DrawableHitObject h)
         {
+            OnNewDrawableHitObject?.Invoke(h);
+
             HitObjectContainer.Add(h);
             OnHitObjectAdded(h.HitObject);
         }
@@ -334,6 +340,8 @@ namespace osu.Game.Rulesets.UI
                 // This is done before Apply() so that the state is updated once when the hitobject is applied.
                 if (!dho.IsLoaded)
                 {
+                    OnNewDrawableHitObject?.Invoke(dho);
+
                     foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
                         m.ApplyToDrawableHitObjects(dho.Yield());
                 }

From 1feda1152da0b15835af3ce83bed31faf5fbed65 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Sat, 21 Nov 2020 02:06:20 +0300
Subject: [PATCH 06361/10326] Fix InspectCode warnings

---
 osu.Desktop/OsuGameDesktop.cs                                | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs | 5 +++++
 osu.Game.Tournament/IPC/FileBasedIPC.cs                      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index f9c932b260..dbbf6d048b 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -79,7 +79,7 @@ namespace osu.Desktop
         private string getStableInstallPathFromRegistry()
         {
             using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                return key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString()?.Split('"')[1].Replace("osu!.exe", "");
+                return key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString()?.Split('"')[1].Replace("osu!.exe", "");
         }
 
         protected override UpdateManager CreateUpdateManager()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 35473ee76c..58992366ff 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -73,6 +74,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
+                        Debug.Assert(args.NewItems != null, "args.NewItems != null");
+
                         foreach (int user in args.NewItems)
                         {
                             if (user == api.LocalUser.Value.Id)
@@ -82,6 +85,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
+                        Debug.Assert(args.OldItems != null, "args.OldItems != null");
+
                         foreach (int user in args.OldItems)
                         {
                             if (user == api.LocalUser.Value.Id)
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 999ce61ac8..99147951b2 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -243,7 +243,7 @@ namespace osu.Game.Tournament.IPC
                 string stableInstallPath;
 
                 using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString().Split('"')[1].Replace("osu!.exe", "");
 
                 if (ipcFileExistsInDirectory(stableInstallPath))
                     return stableInstallPath;

From c4cb1440ab0a02701f3501b04aa73ef3e8e3cdc3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Nov 2020 02:59:01 +0300
Subject: [PATCH 06362/10326] Rename PaginatedContainerHeader to
 ProfileSubsectionHeader

---
 ...ntainerHeader.cs => TestSceneProfileSubsectionHeader.cs} | 6 +++---
 osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs    | 4 ++--
 ...ginatedContainerHeader.cs => ProfileSubsectionHeader.cs} | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game.Tests/Visual/UserInterface/{TestScenePaginatedContainerHeader.cs => TestSceneProfileSubsectionHeader.cs} (95%)
 rename osu.Game/Overlays/Profile/Sections/{PaginatedContainerHeader.cs => ProfileSubsectionHeader.cs} (95%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneProfileSubsectionHeader.cs
similarity index 95%
rename from osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneProfileSubsectionHeader.cs
index 2e9f919cfd..cd226662d7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePaginatedContainerHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneProfileSubsectionHeader.cs
@@ -11,12 +11,12 @@ using osu.Framework.Allocation;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestScenePaginatedContainerHeader : OsuTestScene
+    public class TestSceneProfileSubsectionHeader : OsuTestScene
     {
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
 
-        private PaginatedContainerHeader header;
+        private ProfileSubsectionHeader header;
 
         [Test]
         public void TestHiddenCounter()
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         private void createHeader(string text, CounterVisibilityState state, int initialValue = 0)
         {
             Clear();
-            Add(header = new PaginatedContainerHeader(text, state)
+            Add(header = new ProfileSubsectionHeader(text, state)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index c1107ce907..5bcd7d34c2 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Profile.Sections
         private readonly string missingText;
         private ShowMoreButton moreButton;
         private OsuSpriteText missing;
-        private PaginatedContainerHeader header;
+        private ProfileSubsectionHeader header;
 
         private readonly string headerText;
         private readonly CounterVisibilityState counterVisibilityState;
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Profile.Sections
 
             Children = new Drawable[]
             {
-                header = new PaginatedContainerHeader(headerText, counterVisibilityState)
+                header = new ProfileSubsectionHeader(headerText, counterVisibilityState)
                 {
                     Alpha = string.IsNullOrEmpty(headerText) ? 0 : 1
                 },
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs b/osu.Game/Overlays/Profile/Sections/ProfileSubsectionHeader.cs
similarity index 95%
rename from osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs
rename to osu.Game/Overlays/Profile/Sections/ProfileSubsectionHeader.cs
index 8c617e5fbd..5858cebe89 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainerHeader.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileSubsectionHeader.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Profile.Sections
 {
-    public class PaginatedContainerHeader : CompositeDrawable, IHasCurrentValue<int>
+    public class ProfileSubsectionHeader : CompositeDrawable, IHasCurrentValue<int>
     {
         private readonly BindableWithCurrent<int> current = new BindableWithCurrent<int>();
 
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Profile.Sections
 
         private CounterPill counterPill;
 
-        public PaginatedContainerHeader(string text, CounterVisibilityState counterState)
+        public ProfileSubsectionHeader(string text, CounterVisibilityState counterState)
         {
             this.text = text;
             this.counterState = counterState;

From 718ba9253bce4351e2dc07aaa495c943b70b9803 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Nov 2020 03:18:24 +0300
Subject: [PATCH 06363/10326] Implement ProfileSubsection component

---
 .../Beatmaps/PaginatedBeatmapContainer.cs     |  2 +-
 .../PaginatedMostPlayedBeatmapContainer.cs    |  2 +-
 .../Kudosu/PaginatedKudosuHistoryContainer.cs |  2 +-
 ...ainer.cs => PaginatedProfileSubsection.cs} | 66 ++++------------
 .../Profile/Sections/ProfileSubsection.cs     | 78 +++++++++++++++++++
 .../Sections/Ranks/PaginatedScoreContainer.cs |  2 +-
 .../PaginatedRecentActivityContainer.cs       |  2 +-
 7 files changed, 100 insertions(+), 54 deletions(-)
 rename osu.Game/Overlays/Profile/Sections/{PaginatedContainer.cs => PaginatedProfileSubsection.cs} (61%)
 create mode 100644 osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs

diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index 4b7de8de90..780d7ea986 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Profile.Sections.Beatmaps
 {
-    public class PaginatedBeatmapContainer : PaginatedContainer<APIBeatmapSet>
+    public class PaginatedBeatmapContainer : PaginatedProfileSubsection<APIBeatmapSet>
     {
         private const float panel_padding = 10f;
         private readonly BeatmapSetType type;
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index 556f3139dd..e5bb1f8008 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -13,7 +13,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
-    public class PaginatedMostPlayedBeatmapContainer : PaginatedContainer<APIUserMostPlayedBeatmap>
+    public class PaginatedMostPlayedBeatmapContainer : PaginatedProfileSubsection<APIUserMostPlayedBeatmap>
     {
         public PaginatedMostPlayedBeatmapContainer(Bindable<User> user)
             : base(user, "Most Played Beatmaps", "No records. :(", CounterVisibilityState.AlwaysVisible)
diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
index 1b8bd23eb4..008d89d881 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 
 namespace osu.Game.Overlays.Profile.Sections.Kudosu
 {
-    public class PaginatedKudosuHistoryContainer : PaginatedContainer<APIKudosuHistory>
+    public class PaginatedKudosuHistoryContainer : PaginatedProfileSubsection<APIKudosuHistory>
     {
         public PaginatedKudosuHistoryContainer(Bindable<User> user)
             : base(user, missingText: "This user hasn't received any kudosu!")
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
similarity index 61%
rename from osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
rename to osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
index 5bcd7d34c2..1f897d704a 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
@@ -6,10 +6,7 @@ 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.Online.API;
-using osu.Game.Rulesets;
 using osu.Game.Users;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,7 +15,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Profile.Sections
 {
-    public abstract class PaginatedContainer<TModel> : FillFlowContainer
+    public abstract class PaginatedProfileSubsection<TModel> : ProfileSubsection
     {
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -26,42 +23,25 @@ namespace osu.Game.Overlays.Profile.Sections
         protected int VisiblePages;
         protected int ItemsPerPage;
 
-        protected readonly Bindable<User> User = new Bindable<User>();
-        protected FillFlowContainer ItemsContainer;
-        protected RulesetStore Rulesets;
+        protected FillFlowContainer ItemsContainer { get; private set; }
 
         private APIRequest<List<TModel>> retrievalRequest;
         private CancellationTokenSource loadCancellation;
 
-        private readonly string missingText;
         private ShowMoreButton moreButton;
-        private OsuSpriteText missing;
-        private ProfileSubsectionHeader header;
 
-        private readonly string headerText;
-        private readonly CounterVisibilityState counterVisibilityState;
-
-        protected PaginatedContainer(Bindable<User> user, string headerText = "", string missingText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
+        protected PaginatedProfileSubsection(Bindable<User> user, string headerText = "", string missingText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
+            : base(user, headerText, missingText, counterVisibilityState)
         {
-            this.headerText = headerText;
-            this.missingText = missingText;
-            this.counterVisibilityState = counterVisibilityState;
-            User.BindTo(user);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetStore rulesets)
+        protected override Drawable CreateContent() => new FillFlowContainer
         {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            Direction = FillDirection.Vertical;
-
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Direction = FillDirection.Vertical,
             Children = new Drawable[]
             {
-                header = new ProfileSubsectionHeader(headerText, counterVisibilityState)
-                {
-                    Alpha = string.IsNullOrEmpty(headerText) ? 0 : 1
-                },
                 ItemsContainer = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Y,
@@ -75,22 +55,11 @@ namespace osu.Game.Overlays.Profile.Sections
                     Alpha = 0,
                     Margin = new MarginPadding { Top = 10 },
                     Action = showMore,
-                },
-                missing = new OsuSpriteText
-                {
-                    Font = OsuFont.GetFont(size: 15),
-                    Text = missingText,
-                    Alpha = 0,
-                },
-            };
+                }
+            }
+        };
 
-            Rulesets = rulesets;
-
-            User.ValueChanged += onUserChanged;
-            User.TriggerChange();
-        }
-
-        private void onUserChanged(ValueChangedEvent<User> e)
+        protected override void OnUserChanged(ValueChangedEvent<User> e)
         {
             loadCancellation?.Cancel();
             retrievalRequest?.Cancel();
@@ -124,15 +93,15 @@ namespace osu.Game.Overlays.Profile.Sections
                 moreButton.Hide();
                 moreButton.IsLoading = false;
 
-                if (!string.IsNullOrEmpty(missing.Text))
-                    missing.Show();
+                if (!string.IsNullOrEmpty(Missing.Text))
+                    Missing.Show();
 
                 return;
             }
 
             LoadComponentsAsync(items.Select(CreateDrawableItem).Where(d => d != null), drawables =>
             {
-                missing.Hide();
+                Missing.Hide();
                 moreButton.FadeTo(items.Count == ItemsPerPage ? 1 : 0);
                 moreButton.IsLoading = false;
 
@@ -142,8 +111,6 @@ namespace osu.Game.Overlays.Profile.Sections
 
         protected virtual int GetCount(User user) => 0;
 
-        protected void SetCount(int value) => header.Current.Value = value;
-
         protected virtual void OnItemsReceived(List<TModel> items)
         {
         }
@@ -154,8 +121,9 @@ namespace osu.Game.Overlays.Profile.Sections
 
         protected override void Dispose(bool isDisposing)
         {
-            base.Dispose(isDisposing);
             retrievalRequest?.Cancel();
+            loadCancellation?.Cancel();
+            base.Dispose(isDisposing);
         }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
new file mode 100644
index 0000000000..751b35e342
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
@@ -0,0 +1,78 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using 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.Rulesets;
+using osu.Game.Users;
+using JetBrains.Annotations;
+
+namespace osu.Game.Overlays.Profile.Sections
+{
+    public abstract class ProfileSubsection : FillFlowContainer
+    {
+        protected readonly Bindable<User> User = new Bindable<User>();
+
+        protected RulesetStore Rulesets { get; private set; }
+
+        protected OsuSpriteText Missing { get; private set; }
+
+        private readonly string headerText;
+        private readonly string missingText;
+        private readonly CounterVisibilityState counterVisibilityState;
+
+        private ProfileSubsectionHeader header;
+
+        protected ProfileSubsection(Bindable<User> user, string headerText = "", string missingText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
+        {
+            this.headerText = headerText;
+            this.missingText = missingText;
+            this.counterVisibilityState = counterVisibilityState;
+            User.BindTo(user);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+
+            Children = new[]
+            {
+                header = new ProfileSubsectionHeader(headerText, counterVisibilityState)
+                {
+                    Alpha = string.IsNullOrEmpty(headerText) ? 0 : 1
+                },
+                CreateContent(),
+                Missing = new OsuSpriteText
+                {
+                    Font = OsuFont.GetFont(size: 15),
+                    Text = missingText,
+                    Alpha = 0,
+                },
+            };
+
+            Rulesets = rulesets;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            User.BindValueChanged(OnUserChanged, true);
+        }
+
+        [NotNull]
+        protected abstract Drawable CreateContent();
+
+        protected virtual void OnUserChanged(ValueChangedEvent<User> e)
+        {
+        }
+
+        protected void SetCount(int value) => header.Current.Value = value;
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 1ce3079d52..53f6d375ca 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -14,7 +14,7 @@ using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
-    public class PaginatedScoreContainer : PaginatedContainer<APILegacyScoreInfo>
+    public class PaginatedScoreContainer : PaginatedProfileSubsection<APILegacyScoreInfo>
     {
         private readonly ScoreType type;
 
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index 08f39c6272..d7101a8147 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -13,7 +13,7 @@ using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Profile.Sections.Recent
 {
-    public class PaginatedRecentActivityContainer : PaginatedContainer<APIRecentActivity>
+    public class PaginatedRecentActivityContainer : PaginatedProfileSubsection<APIRecentActivity>
     {
         public PaginatedRecentActivityContainer(Bindable<User> user)
             : base(user, missingText: "This user hasn't done anything notable recently!")

From 281ed49332c3a4f795eac9619bab786a5c1ee977 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Sat, 21 Nov 2020 11:19:52 +0900
Subject: [PATCH 06364/10326] Add `HasInitialized` to DHO As it turned out,
 `IsLoaded` is not a reliable way.

---
 .../Objects/Drawables/DrawableHitObject.cs    |  5 ++++
 osu.Game/Rulesets/UI/Playfield.cs             | 27 +++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 312fbaa2d1..84b2dd7957 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -146,6 +146,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private Container<PausableSkinnableSound> samplesContainer;
 
+        /// <summary>
+        /// Whether the initialization logic in <see cref="Playfield" /> has applied.
+        /// </summary>
+        internal bool HasInitialized;
+
         /// <summary>
         /// Creates a new <see cref="DrawableHitObject"/>.
         /// </summary>
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 8723a8c531..f0b63fd347 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osuTK;
+using System.Diagnostics;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -95,9 +96,6 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         protected Playfield()
         {
-            OnNewDrawableHitObject += d =>
-                d.OnNestedDrawableCreated += nested => OnNewDrawableHitObject?.Invoke(nested);
-
             RelativeSizeAxes = Axes.Both;
 
             hitObjectContainerLazy = new Lazy<HitObjectContainer>(() => CreateHitObjectContainer().With(h =>
@@ -126,6 +124,16 @@ namespace osu.Game.Rulesets.UI
             }
         }
 
+        private void onNewDrawableHitObject(DrawableHitObject d)
+        {
+            d.OnNestedDrawableCreated += onNewDrawableHitObject;
+
+            OnNewDrawableHitObject?.Invoke(d);
+
+            Debug.Assert(!d.HasInitialized);
+            d.HasInitialized = true;
+        }
+
         /// <summary>
         /// Performs post-processing tasks (if any) after all DrawableHitObjects are loaded into this Playfield.
         /// </summary>
@@ -137,7 +145,10 @@ namespace osu.Game.Rulesets.UI
         /// <param name="h">The DrawableHitObject to add.</param>
         public virtual void Add(DrawableHitObject h)
         {
-            OnNewDrawableHitObject?.Invoke(h);
+            if (h.HasInitialized)
+                throw new InvalidOperationException($"{nameof(Playfield.Add)} doesn't support {nameof(DrawableHitObject)} reuse. Use pooling instead.");
+
+            onNewDrawableHitObject(h);
 
             HitObjectContainer.Add(h);
             OnHitObjectAdded(h.HitObject);
@@ -336,12 +347,12 @@ namespace osu.Game.Rulesets.UI
             {
                 var dho = (DrawableHitObject)d;
 
-                // If this is the first time this DHO is being used (not loaded), then apply the DHO mods.
-                // This is done before Apply() so that the state is updated once when the hitobject is applied.
-                if (!dho.IsLoaded)
+                if (!dho.HasInitialized)
                 {
-                    OnNewDrawableHitObject?.Invoke(dho);
+                    onNewDrawableHitObject(dho);
 
+                    // If this is the first time this DHO is being used, then apply the DHO mods.
+                    // This is done before Apply() so that the state is updated once when the hitobject is applied.
                     foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
                         m.ApplyToDrawableHitObjects(dho.Yield());
                 }

From 4345d8dcb641f5838c707e0556dfbaa49dcd821a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Sat, 21 Nov 2020 15:20:33 +0900
Subject: [PATCH 06365/10326] Event -> virtual method

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs  |  6 ++++-
 .../Edit/DrawableOsuEditRuleset.cs            |  4 ++--
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  3 +--
 osu.Game/Rulesets/UI/Playfield.cs             | 23 ++++++++++---------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index cd246e78d5..7d8f18ee0b 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -58,7 +58,11 @@ namespace osu.Game.Rulesets.Catch.UI
 
             NewResult += onNewResult;
             RevertResult += onRevertResult;
-            OnNewDrawableHitObject += d => ((DrawableCatchHitObject)d).CheckPosition = CheckIfWeCanCatch;
+        }
+
+        protected override void OnNewDrawableHitObject(DrawableHitObject d)
+        {
+            ((DrawableCatchHitObject)d).CheckPosition = CheckIfWeCanCatch;
         }
 
         public bool CheckIfWeCanCatch(CatchHitObject obj) => CatcherArea.AttemptCatch(obj);
diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index 1a71a88c71..dafde0b927 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -29,9 +29,9 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             protected override GameplayCursorContainer CreateCursor() => null;
 
-            public OsuEditPlayfield()
+            protected override void OnNewDrawableHitObject(DrawableHitObject d)
             {
-                OnNewDrawableHitObject += d => d.ApplyCustomUpdateState += updateState;
+                d.ApplyCustomUpdateState += updateState;
             }
 
             private const double editor_hit_object_fade_out_extension = 700;
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index d7336050eb..f70229fc1b 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -92,10 +92,9 @@ namespace osu.Game.Rulesets.Osu.UI
             AddRangeInternal(poolDictionary.Values);
 
             NewResult += onNewResult;
-            OnNewDrawableHitObject += onDrawableHitObjectAdded;
         }
 
-        private void onDrawableHitObjectAdded(DrawableHitObject drawable)
+        protected override void OnNewDrawableHitObject(DrawableHitObject drawable)
         {
             ((DrawableOsuHitObject)drawable).CheckHittable = CheckHittable;
 
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index f0b63fd347..fcdd5ff53d 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -33,16 +33,6 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public event Action<DrawableHitObject, JudgementResult> RevertResult;
 
-        /// <summary>
-        /// Invoked before a new <see cref="DrawableHitObject"/> is added.
-        /// This event is invoked only once for each <see cref="DrawableHitObject"/>
-        /// even the drawable is pooled and used multiple times for different <see cref="HitObject"/>s.
-        /// </summary>
-        /// <remarks>
-        /// This event is also called for nested <see cref="DrawableHitObject"/>s.
-        /// </remarks>
-        public event Action<DrawableHitObject> OnNewDrawableHitObject;
-
         /// <summary>
         /// The <see cref="DrawableHitObject"/> contained in this Playfield.
         /// </summary>
@@ -128,7 +118,7 @@ namespace osu.Game.Rulesets.UI
         {
             d.OnNestedDrawableCreated += onNewDrawableHitObject;
 
-            OnNewDrawableHitObject?.Invoke(d);
+            OnNewDrawableHitObject(d);
 
             Debug.Assert(!d.HasInitialized);
             d.HasInitialized = true;
@@ -183,6 +173,17 @@ namespace osu.Game.Rulesets.UI
         {
         }
 
+        /// <summary>
+        /// Invoked before a new <see cref="DrawableHitObject"/> is added to this <see cref="Playfield"/>.
+        /// It is invoked only once even the drawable is pooled and used multiple times for different <see cref="HitObject"/>s.
+        /// </summary>
+        /// <remarks>
+        /// This is also invoked for nested <see cref="DrawableHitObject"/>s.
+        /// </remarks>
+        protected virtual void OnNewDrawableHitObject(DrawableHitObject drawableHitObject)
+        {
+        }
+
         /// <summary>
         /// The cursor currently being used by this <see cref="Playfield"/>. May be null if no cursor is provided.
         /// </summary>

From 6c5a6b42e59b53825fa73f29fb8de2a7eda42f08 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Sat, 21 Nov 2020 14:09:32 +0200
Subject: [PATCH 06366/10326] Only calculate recommended SR once

---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 2baabebdad..0e02b45650 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -69,8 +69,11 @@ namespace osu.Game.Screens.Select
             return beatmap;
         }
 
-        private void calculateRecommendedDifficulties()
+        private void calculateRecommendedDifficulties(bool onlyIfNoPreviousValues = false)
         {
+            if (recommendedStarDifficulty.Any() && onlyIfNoPreviousValues)
+                return;
+
             // only query API for built-in rulesets
             rulesets.AvailableRulesets.Where(ruleset => ruleset.ID <= 3).ForEach(rulesetInfo =>
             {
@@ -122,7 +125,7 @@ namespace osu.Game.Screens.Select
             switch (state.NewValue)
             {
                 case APIState.Online:
-                    calculateRecommendedDifficulties();
+                    calculateRecommendedDifficulties(true);
                     break;
             }
         });

From 72d9da5fac22583df2f275b1d5af65b1deb6e505 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Sat, 21 Nov 2020 14:26:09 +0200
Subject: [PATCH 06367/10326] Apply review suggestions

---
 osu.Game/OsuGame.cs                           | 25 +++++++++++--------
 .../Screens/Select/DifficultyRecommender.cs   | 14 +++--------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e5a299d4b0..acc42bb660 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -335,11 +335,15 @@ namespace osu.Game
         /// The user should have already requested this interactively.
         /// </summary>
         /// <param name="beatmap">The beatmap to select.</param>
-        /// <param name="difficultyCriteria">
-        /// Optional predicate used to filter which difficulties to select.
-        /// If omitted, this will try to present a recommended beatmap from the current ruleset.
-        /// In case of failure the first difficulty of the set will be presented, ignoring the predicate.
-        /// </param>
+        /// <param name="difficultyCriteria">Optional predicate used to narrow the set of difficulties to select from when presenting.</param>
+        /// <remarks>
+        /// Among items satisfying the predicate, the order of preference is:
+        /// <list type="bullet">
+        /// <item>beatmap with recommended difficulty, as provided by <see cref="DifficultyRecommender"/>,</item>
+        /// <item>first beatmap from the current ruleset,</item>
+        /// <item>first beatmap from any ruleset.</item>
+        /// </list>
+        /// </remarks>
         public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> difficultyCriteria = null)
         {
             var databasedSet = beatmap.OnlineBeatmapSetID != null
@@ -373,11 +377,12 @@ namespace osu.Game
 
                 // Try to select recommended beatmap
                 // This should give us a beatmap from current ruleset if there are any in our matched beatmaps
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps) ?? (
-                    // Fallback if a difficulty can't be recommended, maybe we are offline
-                    // First try to find a beatmap in current ruleset, otherwise use first beatmap
-                    beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value)) ?? beatmaps.First()
-                );
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
+                // Fallback if a difficulty can't be recommended, maybe we are offline
+                // First try to find a beatmap in current ruleset
+                selection ??= beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value));
+                // Otherwise use first beatmap
+                selection ??= beatmaps.First();
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 0e02b45650..ab64513ecb 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -81,7 +81,6 @@ namespace osu.Game.Screens.Select
 
                 req.Success += result =>
                 {
-                    bestRulesetOrder = null;
                     // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
                     recommendedStarDifficulty[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
                 };
@@ -90,19 +89,12 @@ namespace osu.Game.Screens.Select
             });
         }
 
-        private IEnumerable<RulesetInfo> bestRulesetOrder;
-
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
-            bestRulesetOrder ??= recommendedStarDifficulty.OrderByDescending(pair => pair.Value)
-                                                          .Select(pair => pair.Key)
-                                                          .ToList();
+            IEnumerable<RulesetInfo> bestRulesetOrder = recommendedStarDifficulty.OrderByDescending(pair => pair.Value)
+                                                                                 .Select(pair => pair.Key)
+                                                                                 .ToList();
 
-            return moveCurrentRulesetToFirst();
-        }
-
-        private IEnumerable<RulesetInfo> moveCurrentRulesetToFirst()
-        {
             List<RulesetInfo> orderedRulesets;
 
             if (bestRulesetOrder.Contains(ruleset.Value))

From 07db977af5a61d0f45f80352f183f8db50f616c4 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Sat, 21 Nov 2020 14:36:43 +0200
Subject: [PATCH 06368/10326] Remove no longer necessary force calculation

Is no longer necessary because recommender uses bindable state value changes, compared to when the test was written, and runs the state change once on load
---
 .../Visual/SongSelect/TestSceneBeatmapRecommendations.cs       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index fc14af3ab5..8a4914a31b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -46,9 +46,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             base.SetUpSteps();
 
-            // Force recommender to calculate its star ratings again
-            AddStep("calculate recommended SRs", () => recommender.APIStateChanged(API, APIState.Online));
-
             User getUser(int? rulesetID)
             {
                 return new User

From 99a95790c3ac901b83d34c67f3dc485920437b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 21 Nov 2020 14:36:59 +0100
Subject: [PATCH 06369/10326] Resolve test failure

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

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 44a2056732..192d65f3fe 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -326,7 +326,7 @@ namespace osu.Game.Tests.Visual.Ranking
             public HotkeyRetryOverlay RetryOverlay;
 
             public UnrankedSoloResultsScreen(ScoreInfo score)
-                : base(score, false)
+                : base(score, true)
             {
                 Score.Beatmap.OnlineBeatmapID = 0;
                 Score.Beatmap.Status = BeatmapSetOnlineStatus.Pending;

From 875f986979b22832eeff88a96bf0448241325730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 21 Nov 2020 14:38:38 +0100
Subject: [PATCH 06370/10326] Remove default from base ResultsScreen too

---
 osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs | 2 +-
 osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs         | 2 +-
 osu.Game/Screens/Ranking/ResultsScreen.cs                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 9ef9649f77..5323f58a66 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -318,7 +318,7 @@ namespace osu.Game.Tests.Visual.Background
         private class FadeAccessibleResults : ResultsScreen
         {
             public FadeAccessibleResults(ScoreInfo score)
-                : base(score)
+                : base(score, true)
             {
             }
 
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 192d65f3fe..b2be7cdf88 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -256,7 +256,7 @@ namespace osu.Game.Tests.Visual.Ranking
             public HotkeyRetryOverlay RetryOverlay;
 
             public TestResultsScreen(ScoreInfo score)
-                : base(score)
+                : base(score, true)
             {
             }
 
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index f8bdf0140c..626db9baa6 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Ranking
 
         private readonly bool allowRetry;
 
-        protected ResultsScreen(ScoreInfo score, bool allowRetry = true)
+        protected ResultsScreen(ScoreInfo score, bool allowRetry)
         {
             Score = score;
             this.allowRetry = allowRetry;

From 9f997db9587ec142977b7333c1e0176f4b994a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 21 Nov 2020 17:55:56 +0100
Subject: [PATCH 06371/10326] Rewind judgement transforms before clearing

---
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 3063656aaf..cd6c001172 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -149,6 +149,7 @@ namespace osu.Game.Rulesets.Judgements
 
         private void runAnimation()
         {
+            ApplyTransformsAt(double.MinValue, true);
             ClearTransforms(true);
             LifetimeStart = Result.TimeAbsolute;
 

From 81d0b42930426bddb6793411ae9dce234fbd9c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 21 Nov 2020 19:51:27 +0100
Subject: [PATCH 06372/10326] Add failing test case

---
 .../Skinning/LegacySkinAnimationTest.cs       | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs

diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
new file mode 100644
index 0000000000..509e2fe8ca
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
@@ -0,0 +1,79 @@
+// Copyright (c) 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.Sample;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.OpenGL.Textures;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Audio;
+using osu.Game.Skinning;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.NonVisual.Skinning
+{
+    [HeadlessTest]
+    public class LegacySkinAnimationTest : OsuTestScene
+    {
+        private const string animation_name = "animation";
+        private const int frame_count = 6;
+
+        [Cached(typeof(IAnimationTimeReference))]
+        private TestAnimationTimeReference animationTimeReference = new TestAnimationTimeReference();
+
+        private TextureAnimation animation;
+
+        [Test]
+        public void TestAnimationTimeReferenceChange()
+        {
+            ISkin skin = new TestSkin();
+
+            AddStep("get animation", () => Add(animation = (TextureAnimation)skin.GetAnimation(animation_name, true, false)));
+            AddAssert("frame count correct", () => animation.FrameCount == frame_count);
+            assertPlaybackPosition(0);
+
+            AddStep("set start time to 1000", () => animationTimeReference.AnimationStartTime = 1000);
+            assertPlaybackPosition(-1000);
+
+            AddStep("set current time to 500", () => animationTimeReference.ManualClock.CurrentTime = 500);
+            assertPlaybackPosition(-500);
+        }
+
+        private void assertPlaybackPosition(double expectedPosition)
+            => AddAssert($"playback position is {expectedPosition}", () => animation.PlaybackPosition == expectedPosition);
+
+        private class TestSkin : ISkin
+        {
+            private static readonly string[] lookup_names = Enumerable.Range(0, frame_count).Select(frame => $"{animation_name}-{frame}").ToArray();
+
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            {
+                return lookup_names.Contains(componentName) ? Texture.WhitePixel : null;
+            }
+
+            public Drawable GetDrawableComponent(ISkinComponent component) => throw new NotSupportedException();
+            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotSupportedException();
+            public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotSupportedException();
+        }
+
+        private class TestAnimationTimeReference : IAnimationTimeReference
+        {
+            public ManualClock ManualClock { get; }
+            public IFrameBasedClock Clock { get; }
+            public double AnimationStartTime { get; set; }
+
+            public TestAnimationTimeReference()
+            {
+                ManualClock = new ManualClock();
+                Clock = new FramedClock(ManualClock);
+            }
+        }
+    }
+}

From 240c1b0aef9b24162acb488bece8b5bc988c2fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 21 Nov 2020 20:06:30 +0100
Subject: [PATCH 06373/10326] Add support for changing animation start time
 after load

---
 .../Objects/Drawables/Connections/FollowPoint.cs  |  4 +++-
 .../Connections/FollowPointConnection.cs          |  2 +-
 .../NonVisual/Skinning/LegacySkinAnimationTest.cs |  5 +++--
 osu.Game/Skinning/IAnimationTimeReference.cs      |  3 ++-
 osu.Game/Skinning/LegacySkinExtensions.cs         | 15 ++++++++++++++-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
index 3e2ab65bb2..be274131c0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.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 osuTK;
 using osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
@@ -47,6 +48,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             });
         }
 
-        public double AnimationStartTime { get; set; }
+        public Bindable<double> AnimationStartTime { get; } = new BindableDouble();
+        IBindable<double> IAnimationTimeReference.AnimationStartTime => AnimationStartTime;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 700d96eff3..6e7b1050cb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 fp.Alpha = 0;
                 fp.Scale = new Vector2(1.5f * end.Scale);
 
-                fp.AnimationStartTime = fadeInTime;
+                fp.AnimationStartTime.Value = fadeInTime;
 
                 using (fp.BeginAbsoluteSequence(fadeInTime))
                 {
diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
index 509e2fe8ca..f05938cb39 100644
--- a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
             AddAssert("frame count correct", () => animation.FrameCount == frame_count);
             assertPlaybackPosition(0);
 
-            AddStep("set start time to 1000", () => animationTimeReference.AnimationStartTime = 1000);
+            AddStep("set start time to 1000", () => animationTimeReference.AnimationStartTime.Value = 1000);
             assertPlaybackPosition(-1000);
 
             AddStep("set current time to 500", () => animationTimeReference.ManualClock.CurrentTime = 500);
@@ -67,7 +67,8 @@ namespace osu.Game.Tests.NonVisual.Skinning
         {
             public ManualClock ManualClock { get; }
             public IFrameBasedClock Clock { get; }
-            public double AnimationStartTime { get; set; }
+            public Bindable<double> AnimationStartTime { get; } = new BindableDouble();
+            IBindable<double> IAnimationTimeReference.AnimationStartTime => AnimationStartTime;
 
             public TestAnimationTimeReference()
             {
diff --git a/osu.Game/Skinning/IAnimationTimeReference.cs b/osu.Game/Skinning/IAnimationTimeReference.cs
index 7e52bb8176..c987372f4b 100644
--- a/osu.Game/Skinning/IAnimationTimeReference.cs
+++ b/osu.Game/Skinning/IAnimationTimeReference.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Timing;
 
@@ -25,6 +26,6 @@ namespace osu.Game.Skinning
         /// <summary>
         /// The time which animations should be started from, relative to <see cref="Clock"/>.
         /// </summary>
-        double AnimationStartTime { get; }
+        IBindable<double> AnimationStartTime { get; }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 0ee02a2442..b57852847c 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.OpenGL.Textures;
@@ -70,6 +71,8 @@ namespace osu.Game.Skinning
             [Resolved(canBeNull: true)]
             private IAnimationTimeReference timeReference { get; set; }
 
+            private readonly Bindable<double> animationStartTime = new BindableDouble();
+
             public SkinnableTextureAnimation(bool startAtCurrentTime = true)
                 : base(startAtCurrentTime)
             {
@@ -82,8 +85,18 @@ namespace osu.Game.Skinning
                 if (timeReference != null)
                 {
                     Clock = timeReference.Clock;
-                    PlaybackPosition = timeReference.Clock.CurrentTime - timeReference.AnimationStartTime;
+                    ((IBindable<double>)animationStartTime).BindTo(timeReference.AnimationStartTime);
                 }
+
+                animationStartTime.BindValueChanged(_ => updatePlaybackPosition(), true);
+            }
+
+            private void updatePlaybackPosition()
+            {
+                if (timeReference == null)
+                    return;
+
+                PlaybackPosition = timeReference.Clock.CurrentTime - timeReference.AnimationStartTime.Value;
             }
         }
 

From 11c3ccfcaa4a4a2adb130e3bbbcda97a0ead8c78 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Nov 2020 22:49:56 +0300
Subject: [PATCH 06374/10326] Move rulesets property to
 PaginatedProfileSubsection

---
 .../Profile/Sections/PaginatedProfileSubsection.cs         | 4 ++++
 osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs    | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
index 1f897d704a..3e6b20bf14 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.Profile.Sections
 {
@@ -20,6 +21,9 @@ namespace osu.Game.Overlays.Profile.Sections
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        protected RulesetStore Rulesets { get; private set; }
+
         protected int VisiblePages;
         protected int ItemsPerPage;
 
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
index 751b35e342..6f68804827 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets;
 using osu.Game.Users;
 using JetBrains.Annotations;
 
@@ -17,8 +16,6 @@ namespace osu.Game.Overlays.Profile.Sections
     {
         protected readonly Bindable<User> User = new Bindable<User>();
 
-        protected RulesetStore Rulesets { get; private set; }
-
         protected OsuSpriteText Missing { get; private set; }
 
         private readonly string headerText;
@@ -36,7 +33,7 @@ namespace osu.Game.Overlays.Profile.Sections
         }
 
         [BackgroundDependencyLoader]
-        private void load(RulesetStore rulesets)
+        private void load()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -56,8 +53,6 @@ namespace osu.Game.Overlays.Profile.Sections
                     Alpha = 0,
                 },
             };
-
-            Rulesets = rulesets;
         }
 
         protected override void LoadComplete()

From dbfc839df379c65b09279704036347384ce6ef90 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Nov 2020 23:03:54 +0300
Subject: [PATCH 06375/10326] Move missing text to PaginatedProfileSubsection

---
 .../Sections/PaginatedProfileSubsection.cs    | 19 +++++++++++++++----
 .../Profile/Sections/ProfileSubsection.cs     | 16 ++--------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
index 3e6b20bf14..b5ae949105 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
@@ -13,6 +13,8 @@ using System.Linq;
 using System.Threading;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Profile.Sections
 {
@@ -33,10 +35,13 @@ namespace osu.Game.Overlays.Profile.Sections
         private CancellationTokenSource loadCancellation;
 
         private ShowMoreButton moreButton;
+        private OsuSpriteText missing;
+        private readonly string missingText;
 
         protected PaginatedProfileSubsection(Bindable<User> user, string headerText = "", string missingText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
-            : base(user, headerText, missingText, counterVisibilityState)
+            : base(user, headerText, counterVisibilityState)
         {
+            this.missingText = missingText;
         }
 
         protected override Drawable CreateContent() => new FillFlowContainer
@@ -59,6 +64,12 @@ namespace osu.Game.Overlays.Profile.Sections
                     Alpha = 0,
                     Margin = new MarginPadding { Top = 10 },
                     Action = showMore,
+                },
+                missing = new OsuSpriteText
+                {
+                    Font = OsuFont.GetFont(size: 15),
+                    Text = missingText,
+                    Alpha = 0,
                 }
             }
         };
@@ -97,15 +108,15 @@ namespace osu.Game.Overlays.Profile.Sections
                 moreButton.Hide();
                 moreButton.IsLoading = false;
 
-                if (!string.IsNullOrEmpty(Missing.Text))
-                    Missing.Show();
+                if (!string.IsNullOrEmpty(missingText))
+                    missing.Show();
 
                 return;
             }
 
             LoadComponentsAsync(items.Select(CreateDrawableItem).Where(d => d != null), drawables =>
             {
-                Missing.Hide();
+                missing.Hide();
                 moreButton.FadeTo(items.Count == ItemsPerPage ? 1 : 0);
                 moreButton.IsLoading = false;
 
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
index 6f68804827..0743823113 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
@@ -5,8 +5,6 @@ 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.Users;
 using JetBrains.Annotations;
 
@@ -16,18 +14,14 @@ namespace osu.Game.Overlays.Profile.Sections
     {
         protected readonly Bindable<User> User = new Bindable<User>();
 
-        protected OsuSpriteText Missing { get; private set; }
-
         private readonly string headerText;
-        private readonly string missingText;
         private readonly CounterVisibilityState counterVisibilityState;
 
         private ProfileSubsectionHeader header;
 
-        protected ProfileSubsection(Bindable<User> user, string headerText = "", string missingText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
+        protected ProfileSubsection(Bindable<User> user, string headerText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
         {
             this.headerText = headerText;
-            this.missingText = missingText;
             this.counterVisibilityState = counterVisibilityState;
             User.BindTo(user);
         }
@@ -45,13 +39,7 @@ namespace osu.Game.Overlays.Profile.Sections
                 {
                     Alpha = string.IsNullOrEmpty(headerText) ? 0 : 1
                 },
-                CreateContent(),
-                Missing = new OsuSpriteText
-                {
-                    Font = OsuFont.GetFont(size: 15),
-                    Text = missingText,
-                    Alpha = 0,
-                },
+                CreateContent()
             };
         }
 

From fe4c6220418b1f8560f6e6bcdc9c8994e9912efd Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 21 Nov 2020 23:13:46 +0300
Subject: [PATCH 06376/10326] Make OnUserChanged private

---
 .../Profile/Sections/PaginatedProfileSubsection.cs     |  8 +++++++-
 .../Overlays/Profile/Sections/ProfileSubsection.cs     | 10 ----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
index b5ae949105..51e5622f68 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
@@ -74,7 +74,13 @@ namespace osu.Game.Overlays.Profile.Sections
             }
         };
 
-        protected override void OnUserChanged(ValueChangedEvent<User> e)
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            User.BindValueChanged(onUserChanged, true);
+        }
+
+        private void onUserChanged(ValueChangedEvent<User> e)
         {
             loadCancellation?.Cancel();
             retrievalRequest?.Cancel();
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
index 0743823113..3e331f85e9 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
@@ -43,19 +43,9 @@ namespace osu.Game.Overlays.Profile.Sections
             };
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            User.BindValueChanged(OnUserChanged, true);
-        }
-
         [NotNull]
         protected abstract Drawable CreateContent();
 
-        protected virtual void OnUserChanged(ValueChangedEvent<User> e)
-        {
-        }
-
         protected void SetCount(int value) => header.Current.Value = value;
     }
 }

From d4b56aac8403565e2c5f5629c0abe550f76500ad Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Nov 2020 02:17:54 +0300
Subject: [PATCH 06377/10326] Add missing whitespace

---
 osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
index 75c3ee8290..51e5622f68 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Overlays.Profile.Sections
 
         protected int VisiblePages;
         protected int ItemsPerPage;
+
         protected FillFlowContainer ItemsContainer { get; private set; }
 
         private APIRequest<List<TModel>> retrievalRequest;

From 3cb1d0466734b0b2c07554f14a4c6f7e59f242c9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Nov 2020 02:25:12 +0300
Subject: [PATCH 06378/10326] Move dates fill into it's own method

---
 .../Historical/ChartProfileSubsection.cs      | 55 ++++++++++---------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
index 9413d241fa..783ecec190 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
@@ -44,32 +44,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
             if (values?.Length > 1)
             {
-                // Fill dates with 0 count
-
-                var newValues = new List<UserHistoryCount> { values[0] };
-                var newLast = values[0];
-
-                for (int i = 1; i < values.Length; i++)
-                {
-                    while (hasMissingDates(newLast, values[i]))
-                    {
-                        newValues.Add(newLast = new UserHistoryCount
-                        {
-                            Count = 0,
-                            Date = newLast.Date.AddMonths(1)
-                        });
-                    }
-
-                    newValues.Add(newLast = values[i]);
-                }
-
-                static bool hasMissingDates(UserHistoryCount prev, UserHistoryCount current)
-                {
-                    var possibleCurrent = prev.Date.AddMonths(1);
-                    return possibleCurrent != current.Date;
-                }
-
-                chart.Values = newValues.ToArray();
+                chart.Values = fillZeroValues(values);
                 Show();
                 return;
             }
@@ -77,6 +52,34 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             Hide();
         }
 
+        private UserHistoryCount[] fillZeroValues(UserHistoryCount[] values)
+        {
+            var newValues = new List<UserHistoryCount> { values[0] };
+            var newLast = values[0];
+
+            for (int i = 1; i < values.Length; i++)
+            {
+                while (hasMissingDates(newLast, values[i]))
+                {
+                    newValues.Add(newLast = new UserHistoryCount
+                    {
+                        Count = 0,
+                        Date = newLast.Date.AddMonths(1)
+                    });
+                }
+
+                newValues.Add(newLast = values[i]);
+            }
+
+            return newValues.ToArray();
+
+            static bool hasMissingDates(UserHistoryCount prev, UserHistoryCount current)
+            {
+                var possibleCurrent = prev.Date.AddMonths(1);
+                return possibleCurrent != current.Date;
+            }
+        }
+
         protected abstract UserHistoryCount[] GetValues(User user);
     }
 }

From 453f0ba675de81682ba13a72225e9ad0211b5e2e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Nov 2020 02:34:29 +0300
Subject: [PATCH 06379/10326] Make tick lines thicker

---
 .../Profile/Sections/Historical/ProfileLineChart.cs        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 5a9c42d7e0..c658ac1aa7 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -12,6 +12,7 @@ using osu.Framework.Allocation;
 using osu.Game.Graphics;
 using osu.Framework.Graphics.Shapes;
 using static osu.Game.Users.User;
+using osuTK;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
@@ -140,7 +141,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                     Origin = Anchor.CentreRight,
                     RelativeSizeAxes = Axes.X,
                     RelativePositionAxes = Axes.Y,
-                    Height = 1,
+                    Height = 0.1f,
+                    EdgeSmoothness = Vector2.One,
                     Y = y
                 });
 
@@ -180,7 +182,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                     Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.Y,
                     RelativePositionAxes = Axes.X,
-                    Width = 1,
+                    Width = 0.1f,
+                    EdgeSmoothness = Vector2.One,
                     X = x
                 });
 

From 6e581902cdd49c05b513518df1b4f84bfc5b71b2 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Nov 2020 03:11:38 +0300
Subject: [PATCH 06380/10326] Simplify column ticks creation

---
 .../Sections/Historical/ProfileLineChart.cs   | 109 ++++++++++--------
 1 file changed, 58 insertions(+), 51 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index c658ac1aa7..31c14d3b19 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -123,28 +123,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             while (rollingRow <= max)
             {
                 var y = -Interpolation.ValueAt(rollingRow, 0, 1f, min, max);
-
-                rowTicksContainer.Add(new TickText
-                {
-                    Anchor = Anchor.BottomRight,
-                    Origin = Anchor.CentreRight,
-                    RelativePositionAxes = Axes.Y,
-                    Margin = new MarginPadding { Right = 3 },
-                    Text = rollingRow.ToString("N0"),
-                    Font = OsuFont.GetFont(size: 12),
-                    Y = y
-                });
-
-                rowLinesContainer.Add(new TickLine
-                {
-                    Anchor = Anchor.BottomRight,
-                    Origin = Anchor.CentreRight,
-                    RelativeSizeAxes = Axes.X,
-                    RelativePositionAxes = Axes.Y,
-                    Height = 0.1f,
-                    EdgeSmoothness = Vector2.One,
-                    Y = y
-                });
+                addRowTick(y, (long)rollingRow);
 
                 rollingRow += niceTick;
             }
@@ -155,42 +134,70 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             columnTicksContainer.Clear();
             columnLinesContainer.Clear();
 
-            var min = values.Select(v => v.Date).Min().ToOADate();
-            var max = values.Select(v => v.Date).Max().ToOADate();
+            var totalMonths = values.Length - 1;
 
-            var niceRange = niceNumber(max - min, false);
-            var niceTick = niceNumber(niceRange / (Math.Min(values.Length, 15) - 1), true);
+            int monthsPerTick = 1;
 
-            double rollingRow = min;
+            if (totalMonths >= 45)
+                monthsPerTick = 3;
+            else if (totalMonths >= 20)
+                monthsPerTick = 2;
 
-            while (rollingRow <= max)
+            for (int i = 0; i < totalMonths; i += monthsPerTick)
             {
-                var x = Interpolation.ValueAt(rollingRow, 0, 1f, min, max);
-
-                columnTicksContainer.Add(new TickText
-                {
-                    Origin = Anchor.CentreLeft,
-                    RelativePositionAxes = Axes.X,
-                    Text = DateTime.FromOADate(rollingRow).ToString("MMM yyyy"),
-                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
-                    Rotation = 45,
-                    X = x
-                });
-
-                columnLinesContainer.Add(new TickLine
-                {
-                    Origin = Anchor.TopCentre,
-                    RelativeSizeAxes = Axes.Y,
-                    RelativePositionAxes = Axes.X,
-                    Width = 0.1f,
-                    EdgeSmoothness = Vector2.One,
-                    X = x
-                });
-
-                rollingRow += niceTick;
+                var x = (float)i / totalMonths;
+                addColumnTick(x, values[i].Date);
             }
         }
 
+        private void addRowTick(float y, long value)
+        {
+            rowTicksContainer.Add(new TickText
+            {
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.CentreRight,
+                RelativePositionAxes = Axes.Y,
+                Margin = new MarginPadding { Right = 3 },
+                Text = value.ToString("N0"),
+                Font = OsuFont.GetFont(size: 12),
+                Y = y
+            });
+
+            rowLinesContainer.Add(new TickLine
+            {
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.CentreRight,
+                RelativeSizeAxes = Axes.X,
+                RelativePositionAxes = Axes.Y,
+                Height = 0.1f,
+                EdgeSmoothness = Vector2.One,
+                Y = y
+            });
+        }
+
+        private void addColumnTick(float x, DateTime value)
+        {
+            columnTicksContainer.Add(new TickText
+            {
+                Origin = Anchor.CentreLeft,
+                RelativePositionAxes = Axes.X,
+                Text = value.ToString("MMM yyyy"),
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                Rotation = 45,
+                X = x
+            });
+
+            columnLinesContainer.Add(new TickLine
+            {
+                Origin = Anchor.TopCentre,
+                RelativeSizeAxes = Axes.Y,
+                RelativePositionAxes = Axes.X,
+                Width = 0.1f,
+                EdgeSmoothness = Vector2.One,
+                X = x
+            });
+        }
+
         private double niceNumber(double value, bool round)
         {
             var exponent = Math.Floor(Math.Log10(value));

From e6c116f0ab35b181e1d353a0640ec1cd1bcb23c5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Nov 2020 03:49:00 +0300
Subject: [PATCH 06381/10326] Rework horizontal ticks creation

---
 .../Sections/Historical/ProfileLineChart.cs   | 73 ++++++++++---------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 31c14d3b19..770da21657 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -115,17 +115,19 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             var min = values.Select(v => v.Count).Min();
             var max = values.Select(v => v.Count).Max();
 
-            var niceRange = niceNumber(max - min, false);
-            var niceTick = niceNumber(niceRange / (6 - 1), true);
+            var tick = getTick(getRange(max - min), 6);
 
-            double rollingRow = min;
+            double rollingRow = 0;
 
             while (rollingRow <= max)
             {
-                var y = -Interpolation.ValueAt(rollingRow, 0, 1f, min, max);
-                addRowTick(y, (long)rollingRow);
+                if (rollingRow >= min)
+                {
+                    var y = -Interpolation.ValueAt(rollingRow, 0, 1f, min, max);
+                    addRowTick(y, (long)rollingRow);
+                }
 
-                rollingRow += niceTick;
+                rollingRow += tick;
             }
         }
 
@@ -138,10 +140,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
             int monthsPerTick = 1;
 
-            if (totalMonths >= 45)
-                monthsPerTick = 3;
-            else if (totalMonths >= 20)
-                monthsPerTick = 2;
+            if (totalMonths > 20)
+                monthsPerTick = totalMonths / 10;
 
             for (int i = 0; i < totalMonths; i += monthsPerTick)
             {
@@ -198,37 +198,44 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             });
         }
 
-        private double niceNumber(double value, bool round)
+        private long getRange(double initialRange)
         {
+            var exponent = Math.Floor(Math.Log10(initialRange));
+            var fraction = initialRange / Math.Pow(10, exponent);
+
+            double niceFraction;
+
+            if (fraction <= 1.0)
+                niceFraction = 1.0;
+            else if (fraction <= 2.0)
+                niceFraction = 2.0;
+            else if (fraction <= 5.0)
+                niceFraction = 5.0;
+            else
+                niceFraction = 10.0;
+
+            return (long)(niceFraction * Math.Pow(10, exponent));
+        }
+
+        private long getTick(long range, int maxTicksCount)
+        {
+            var value = range / (maxTicksCount - 1);
+
             var exponent = Math.Floor(Math.Log10(value));
             var fraction = value / Math.Pow(10, exponent);
 
             double niceFraction;
 
-            if (round)
-            {
-                if (fraction < 1.5)
-                    niceFraction = 1.0;
-                else if (fraction < 3)
-                    niceFraction = 2.0;
-                else if (fraction < 7)
-                    niceFraction = 5.0;
-                else
-                    niceFraction = 10.0;
-            }
+            if (fraction < 1.5)
+                niceFraction = 1.0;
+            else if (fraction < 3)
+                niceFraction = 2.0;
+            else if (fraction < 7)
+                niceFraction = 5.0;
             else
-            {
-                if (fraction <= 1.0)
-                    niceFraction = 1.0;
-                else if (fraction <= 2.0)
-                    niceFraction = 2.0;
-                else if (fraction <= 5.0)
-                    niceFraction = 5.0;
-                else
-                    niceFraction = 10.0;
-            }
+                niceFraction = 10.0;
 
-            return niceFraction * Math.Pow(10, exponent);
+            return (long)(niceFraction * Math.Pow(10, exponent));
         }
 
         private class TickText : OsuSpriteText

From f07f8089d69062f44077349945a7680a2ea20c21 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Nov 2020 03:58:56 +0300
Subject: [PATCH 06382/10326] Adjust monthsPerTick value

---
 .../Profile/Sections/Historical/ProfileLineChart.cs       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 770da21657..932005a52f 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -140,8 +140,12 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
             int monthsPerTick = 1;
 
-            if (totalMonths > 20)
-                monthsPerTick = totalMonths / 10;
+            if (totalMonths > 80)
+                monthsPerTick = 12;
+            else if (totalMonths >= 45)
+                monthsPerTick = 3;
+            else if (totalMonths > 20)
+                monthsPerTick = 2;
 
             for (int i = 0; i < totalMonths; i += monthsPerTick)
             {

From 48871329471daf2a5c531460f5490250492529cb Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Nov 2020 04:28:17 +0300
Subject: [PATCH 06383/10326] Adjustments for edge cases support

---
 .../Sections/Historical/ProfileLineChart.cs   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 932005a52f..688930d76a 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -117,6 +117,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
             var tick = getTick(getRange(max - min), 6);
 
+            bool tickIsDecimal = tick < 1.0;
+
             double rollingRow = 0;
 
             while (rollingRow <= max)
@@ -124,7 +126,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 if (rollingRow >= min)
                 {
                     var y = -Interpolation.ValueAt(rollingRow, 0, 1f, min, max);
-                    addRowTick(y, (long)rollingRow);
+                    addRowTick(y, rollingRow, tickIsDecimal);
                 }
 
                 rollingRow += tick;
@@ -136,7 +138,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             columnTicksContainer.Clear();
             columnLinesContainer.Clear();
 
-            var totalMonths = values.Length - 1;
+            var totalMonths = values.Length;
 
             int monthsPerTick = 1;
 
@@ -149,12 +151,12 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
             for (int i = 0; i < totalMonths; i += monthsPerTick)
             {
-                var x = (float)i / totalMonths;
+                var x = (float)i / (totalMonths - 1);
                 addColumnTick(x, values[i].Date);
             }
         }
 
-        private void addRowTick(float y, long value)
+        private void addRowTick(float y, double value, bool tickIsDecimal)
         {
             rowTicksContainer.Add(new TickText
             {
@@ -162,7 +164,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 Origin = Anchor.CentreRight,
                 RelativePositionAxes = Axes.Y,
                 Margin = new MarginPadding { Right = 3 },
-                Text = value.ToString("N0"),
+                Text = tickIsDecimal ? value.ToString("F1") : value.ToString("N0"),
                 Font = OsuFont.GetFont(size: 12),
                 Y = y
             });
@@ -202,7 +204,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             });
         }
 
-        private long getRange(double initialRange)
+        private double getRange(double initialRange)
         {
             var exponent = Math.Floor(Math.Log10(initialRange));
             var fraction = initialRange / Math.Pow(10, exponent);
@@ -218,10 +220,10 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             else
                 niceFraction = 10.0;
 
-            return (long)(niceFraction * Math.Pow(10, exponent));
+            return niceFraction * Math.Pow(10, exponent);
         }
 
-        private long getTick(long range, int maxTicksCount)
+        private double getTick(double range, int maxTicksCount)
         {
             var value = range / (maxTicksCount - 1);
 
@@ -239,7 +241,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             else
                 niceFraction = 10.0;
 
-            return (long)(niceFraction * Math.Pow(10, exponent));
+            return niceFraction * Math.Pow(10, exponent);
         }
 
         private class TickText : OsuSpriteText

From b745fb681a8bfba02e01317f684fa1a3a8b699f0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Nov 2020 04:40:55 +0300
Subject: [PATCH 06384/10326] Fix incorrect static using placement

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

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 688930d76a..1ce14fa245 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -11,8 +11,8 @@ using osu.Framework.Utils;
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
 using osu.Framework.Graphics.Shapes;
-using static osu.Game.Users.User;
 using osuTK;
+using static osu.Game.Users.User;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {

From a3b1d14f178620fd9556efad890a7a4874f4230c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 22 Nov 2020 14:44:39 +0900
Subject: [PATCH 06385/10326] Apply similar fix to PoolableSkinnableSound

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

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index adc58ee94e..65f97ff909 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Skinning
             sampleContainer.Add(Sample = new DrawableSample(ch) { Looping = Looping });
 
             // Start playback internally for the new sample if the previous one was playing beforehand.
-            if (wasPlaying)
+            if (wasPlaying && !Looping)
                 Play();
         }
 

From 5247ebaf53d32a830dc652915d2f6641afe60399 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Sun, 22 Nov 2020 18:30:51 +0900
Subject: [PATCH 06386/10326] Restore accidently removed comment

---
 osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index dafde0b927..5fdb79cbbd 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -34,6 +34,10 @@ namespace osu.Game.Rulesets.Osu.Edit
                 d.ApplyCustomUpdateState += updateState;
             }
 
+            /// <summary>
+            /// Hit objects are intentionally made to fade out at a constant slower rate than in gameplay.
+            /// This allows a mapper to gain better historical context and use recent hitobjects as reference / snap points.
+            /// </summary>
             private const double editor_hit_object_fade_out_extension = 700;
 
             private void updateState(DrawableHitObject hitObject, ArmedState state)

From c506b438bf465947fe0cff2f9bb25044f6bd35f9 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Sun, 22 Nov 2020 18:36:10 +0900
Subject: [PATCH 06387/10326] Remove more code and make some methods private

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs         |  4 ++--
 .../Objects/Drawables/DrawableHitCircle.cs           |  2 +-
 .../Objects/Drawables/DrawableSlider.cs              |  2 +-
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs             |  5 +----
 .../IDrawableHitObjectWithProxiedApproach.cs         | 12 ------------
 5 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Objects/Drawables/IDrawableHitObjectWithProxiedApproach.cs

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 7d8f18ee0b..abbdeacd9a 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -62,10 +62,10 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override void OnNewDrawableHitObject(DrawableHitObject d)
         {
-            ((DrawableCatchHitObject)d).CheckPosition = CheckIfWeCanCatch;
+            ((DrawableCatchHitObject)d).CheckPosition = checkIfWeCanCatch;
         }
 
-        public bool CheckIfWeCanCatch(CatchHitObject obj) => CatcherArea.AttemptCatch(obj);
+        private bool checkIfWeCanCatch(CatchHitObject obj) => CatcherArea.AttemptCatch(obj);
 
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
             => CatcherArea.OnNewResult((DrawableCatchHitObject)judgedObject, result);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index d1ceca6d8f..abb51ae420 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableHitCircle : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
+    public class DrawableHitCircle : DrawableOsuHitObject
     {
         public OsuAction? HitAction => HitArea.HitAction;
         protected virtual OsuSkinComponents CirclePieceComponent => OsuSkinComponents.HitCircle;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 14c494d909..6340367593 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -19,7 +19,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableSlider : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
+    public class DrawableSlider : DrawableOsuHitObject
     {
         public new Slider HitObject => (Slider)base.HitObject;
 
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 93302c6046..8ff752952c 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -26,8 +26,6 @@ namespace osu.Game.Rulesets.Osu.UI
 {
     public class OsuPlayfield : Playfield
     {
-        public readonly Func<DrawableHitObject, double, bool> CheckHittable;
-
         private readonly PlayfieldBorder playfieldBorder;
         private readonly ProxyContainer approachCircles;
         private readonly ProxyContainer spinnerProxies;
@@ -57,7 +55,6 @@ namespace osu.Game.Rulesets.Osu.UI
             };
 
             hitPolicy = new OrderedHitPolicy(HitObjectContainer);
-            CheckHittable = hitPolicy.IsHittable;
 
             var hitWindows = new OsuHitWindows();
 
@@ -71,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override void OnNewDrawableHitObject(DrawableHitObject drawable)
         {
-            ((DrawableOsuHitObject)drawable).CheckHittable = CheckHittable;
+            ((DrawableOsuHitObject)drawable).CheckHittable = hitPolicy.IsHittable;
 
             Debug.Assert(!drawable.IsLoaded, $"Already loaded {nameof(DrawableHitObject)} is added to {nameof(OsuPlayfield)}");
             drawable.OnLoadComplete += onDrawableHitObjectLoaded;
diff --git a/osu.Game/Rulesets/Objects/Drawables/IDrawableHitObjectWithProxiedApproach.cs b/osu.Game/Rulesets/Objects/Drawables/IDrawableHitObjectWithProxiedApproach.cs
deleted file mode 100644
index 8f4c95c634..0000000000
--- a/osu.Game/Rulesets/Objects/Drawables/IDrawableHitObjectWithProxiedApproach.cs
+++ /dev/null
@@ -1,12 +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;
-
-namespace osu.Game.Rulesets.Objects.Drawables
-{
-    public interface IDrawableHitObjectWithProxiedApproach
-    {
-        Drawable ProxiedLayer { get; }
-    }
-}

From 666112cb5a7faa7060c8131f9a20e87a4f24dd07 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Sun, 22 Nov 2020 18:47:35 +0900
Subject: [PATCH 06388/10326] Address @bdach's minor suggestions

---
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs  |  2 +-
 osu.Game/Rulesets/UI/Playfield.cs                    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 84b2dd7957..6ed6c6412e 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// Whether the initialization logic in <see cref="Playfield" /> has applied.
         /// </summary>
-        internal bool HasInitialized;
+        internal bool IsInitialized;
 
         /// <summary>
         /// Creates a new <see cref="DrawableHitObject"/>.
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index fcdd5ff53d..2f589f4ce9 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -120,8 +120,8 @@ namespace osu.Game.Rulesets.UI
 
             OnNewDrawableHitObject(d);
 
-            Debug.Assert(!d.HasInitialized);
-            d.HasInitialized = true;
+            Debug.Assert(!d.IsInitialized);
+            d.IsInitialized = true;
         }
 
         /// <summary>
@@ -135,8 +135,8 @@ namespace osu.Game.Rulesets.UI
         /// <param name="h">The DrawableHitObject to add.</param>
         public virtual void Add(DrawableHitObject h)
         {
-            if (h.HasInitialized)
-                throw new InvalidOperationException($"{nameof(Playfield.Add)} doesn't support {nameof(DrawableHitObject)} reuse. Use pooling instead.");
+            if (h.IsInitialized)
+                throw new InvalidOperationException($"{nameof(Add)} doesn't support {nameof(DrawableHitObject)} reuse. Use pooling instead.");
 
             onNewDrawableHitObject(h);
 
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.UI
 
         /// <summary>
         /// Invoked before a new <see cref="DrawableHitObject"/> is added to this <see cref="Playfield"/>.
-        /// It is invoked only once even the drawable is pooled and used multiple times for different <see cref="HitObject"/>s.
+        /// It is invoked only once even if the drawable is pooled and used multiple times for different <see cref="HitObject"/>s.
         /// </summary>
         /// <remarks>
         /// This is also invoked for nested <see cref="DrawableHitObject"/>s.
@@ -348,7 +348,7 @@ namespace osu.Game.Rulesets.UI
             {
                 var dho = (DrawableHitObject)d;
 
-                if (!dho.HasInitialized)
+                if (!dho.IsInitialized)
                 {
                     onNewDrawableHitObject(dho);
 

From 1c31a4a6b6513a97ad91ae47a094be35aea41f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 22 Nov 2020 13:11:22 +0100
Subject: [PATCH 06389/10326] Expose animation start time as mutable in
 interface

---
 .../Objects/Drawables/Connections/FollowPoint.cs                | 1 -
 osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs    | 1 -
 osu.Game/Skinning/IAnimationTimeReference.cs                    | 2 +-
 osu.Game/Skinning/LegacySkinExtensions.cs                       | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
index be274131c0..b989500066 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
@@ -49,6 +49,5 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         }
 
         public Bindable<double> AnimationStartTime { get; } = new BindableDouble();
-        IBindable<double> IAnimationTimeReference.AnimationStartTime => AnimationStartTime;
     }
 }
diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
index f05938cb39..a5c937119e 100644
--- a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
@@ -68,7 +68,6 @@ namespace osu.Game.Tests.NonVisual.Skinning
             public ManualClock ManualClock { get; }
             public IFrameBasedClock Clock { get; }
             public Bindable<double> AnimationStartTime { get; } = new BindableDouble();
-            IBindable<double> IAnimationTimeReference.AnimationStartTime => AnimationStartTime;
 
             public TestAnimationTimeReference()
             {
diff --git a/osu.Game/Skinning/IAnimationTimeReference.cs b/osu.Game/Skinning/IAnimationTimeReference.cs
index c987372f4b..f627379a57 100644
--- a/osu.Game/Skinning/IAnimationTimeReference.cs
+++ b/osu.Game/Skinning/IAnimationTimeReference.cs
@@ -26,6 +26,6 @@ namespace osu.Game.Skinning
         /// <summary>
         /// The time which animations should be started from, relative to <see cref="Clock"/>.
         /// </summary>
-        IBindable<double> AnimationStartTime { get; }
+        Bindable<double> AnimationStartTime { get; }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index b57852847c..a7c084998d 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Skinning
                 if (timeReference != null)
                 {
                     Clock = timeReference.Clock;
-                    ((IBindable<double>)animationStartTime).BindTo(timeReference.AnimationStartTime);
+                    animationStartTime.BindTo(timeReference.AnimationStartTime);
                 }
 
                 animationStartTime.BindValueChanged(_ => updatePlaybackPosition(), true);

From cc33b0f2c633634e4b0a21f17560ee1b9cc21138 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Sun, 22 Nov 2020 16:53:27 +0100
Subject: [PATCH 06390/10326] Apply MenuGlow to Visualisation Colour instead of
 AccentColour

---
 osu.Game/Screens/Menu/LogoVisualisation.cs     | 3 ++-
 osu.Game/Screens/Menu/MenuLogoVisualisation.cs | 6 +++---
 osu.Game/Screens/Menu/OsuLogo.cs               | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index ebbb19636c..1f7ea3df31 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -20,6 +20,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Utils;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Screens.Menu
 {
@@ -67,7 +68,7 @@ namespace osu.Game.Screens.Menu
 
         private int indexOffset;
 
-        public Color4 AccentColour { get; set; }
+        public Color4 AccentColour { get; set; } = Color4.White.Opacity(.2f);
 
         /// <summary>
         /// The relative movement of bars based on input amplification. Defaults to 1.
diff --git a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
index 5eb3f1efa0..bc7c25a26f 100644
--- a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
@@ -28,12 +28,12 @@ namespace osu.Game.Screens.Menu
 
         private void updateColour()
         {
-            Color4 defaultColour = Color4.White.Opacity(0.2f);
+            Color4 defaultColour = Color4.White;
 
             if (user.Value?.IsSupporter ?? false)
-                AccentColour = skin.Value.GetConfig<GlobalSkinColours, Color4>(GlobalSkinColours.MenuGlow)?.Value ?? defaultColour;
+                Colour = skin.Value.GetConfig<GlobalSkinColours, Color4>(GlobalSkinColours.MenuGlow)?.Value ?? defaultColour;
             else
-                AccentColour = defaultColour;
+                Colour = defaultColour;
         }
     }
 }
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 4515ee8ed0..8fa9d6e933 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -144,7 +144,6 @@ namespace osu.Game.Screens.Menu
                                                     RelativeSizeAxes = Axes.Both,
                                                     Origin = Anchor.Centre,
                                                     Anchor = Anchor.Centre,
-                                                    Alpha = 0.5f,
                                                     Size = new Vector2(0.96f)
                                                 },
                                                 new Container

From b468f061f176ce4103f4f11680a91957b0d791e2 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Sun, 22 Nov 2020 17:20:00 +0100
Subject: [PATCH 06391/10326] Remove unused using

---
 osu.Game/Screens/Menu/MenuLogoVisualisation.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
index bc7c25a26f..31a3c2dffd 100644
--- a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
@@ -7,7 +7,6 @@ using osu.Game.Online.API;
 using osu.Game.Users;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Screens.Menu
 {

From 1551402a8d2e812b87e270892a2252c21a3bc8ca Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Sun, 22 Nov 2020 17:33:25 +0100
Subject: [PATCH 06392/10326] Change IntroWelcome visualiser to use Colour
 instead of AccentColour

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index e81646456f..abb83f894a 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -113,8 +113,7 @@ namespace osu.Game.Screens.Menu
                                 RelativeSizeAxes = Axes.Both,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Alpha = 0.5f,
-                                AccentColour = Color4.DarkBlue,
+                                Colour = Color4.DarkBlue,
                                 Size = new Vector2(0.96f)
                             },
                             new Circle

From 458016d17da024f0165ce977b0472eee7b7edd0b Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Sun, 22 Nov 2020 17:34:56 +0100
Subject: [PATCH 06393/10326] Remove AccentColour member variable from
 LogoVisualisation

---
 osu.Game/Screens/Menu/LogoVisualisation.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 1f7ea3df31..5eb14a8dc1 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
@@ -27,7 +26,7 @@ namespace osu.Game.Screens.Menu
     /// <summary>
     /// A visualiser that reacts to music coming from beatmaps.
     /// </summary>
-    public class LogoVisualisation : Drawable, IHasAccentColour
+    public class LogoVisualisation : Drawable
     {
         private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 
@@ -68,8 +67,6 @@ namespace osu.Game.Screens.Menu
 
         private int indexOffset;
 
-        public Color4 AccentColour { get; set; } = Color4.White.Opacity(.2f);
-
         /// <summary>
         /// The relative movement of bars based on input amplification. Defaults to 1.
         /// </summary>
@@ -177,7 +174,7 @@ namespace osu.Game.Screens.Menu
             // Assuming the logo is a circle, we don't need a second dimension.
             private float size;
 
-            private Color4 colour;
+            private Color4 colour = Color4.White.Opacity(.2f);
             private float[] audioData;
 
             private readonly QuadBatch<TexturedVertex2D> vertexBatch = new QuadBatch<TexturedVertex2D>(100, 10);
@@ -194,7 +191,6 @@ namespace osu.Game.Screens.Menu
                 shader = Source.shader;
                 texture = Source.texture;
                 size = Source.DrawSize.X;
-                colour = Source.AccentColour;
                 audioData = Source.frequencyAmplitudes;
             }
 

From ba7ce4c93363cd19791527d21f9d7de01129e8f3 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Sun, 22 Nov 2020 18:37:49 +0100
Subject: [PATCH 06394/10326] Make colour readonly

---
 osu.Game/Screens/Menu/LogoVisualisation.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 5eb14a8dc1..1d62305059 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -174,7 +174,8 @@ namespace osu.Game.Screens.Menu
             // Assuming the logo is a circle, we don't need a second dimension.
             private float size;
 
-            private Color4 colour = Color4.White.Opacity(.2f);
+            private readonly Color4 colour = Color4.White.Opacity(.2f);
+
             private float[] audioData;
 
             private readonly QuadBatch<TexturedVertex2D> vertexBatch = new QuadBatch<TexturedVertex2D>(100, 10);

From 61078e9ae1649426efb3cd43c2b0a51ef1c10a09 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Sun, 22 Nov 2020 18:59:16 +0100
Subject: [PATCH 06395/10326] Use 0.2f instead of .2f

---
 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 1d62305059..f6e011509c 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Screens.Menu
             // Assuming the logo is a circle, we don't need a second dimension.
             private float size;
 
-            private readonly Color4 colour = Color4.White.Opacity(.2f);
+            private readonly Color4 colour = Color4.White.Opacity(0.2f);
 
             private float[] audioData;
 

From 2ae5a95d77d822cad544dc654c12751472b37ca6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Nov 2020 13:35:02 +0900
Subject: [PATCH 06396/10326] Change opacity value to match master
 implementation

---
 osu.Game/Screens/Menu/LogoVisualisation.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index f6e011509c..c96b08902c 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Screens.Menu
             // Assuming the logo is a circle, we don't need a second dimension.
             private float size;
 
-            private readonly Color4 colour = Color4.White.Opacity(0.2f);
+            private static readonly Color4 transparent_white = Color4.White.Opacity(0.1f);
 
             private float[] audioData;
 
@@ -204,7 +204,7 @@ namespace osu.Game.Screens.Menu
                 Vector2 inflation = DrawInfo.MatrixInverse.ExtractScale().Xy;
 
                 ColourInfo colourInfo = DrawColourInfo.Colour;
-                colourInfo.ApplyChild(colour);
+                colourInfo.ApplyChild(transparent_white);
 
                 if (audioData != null)
                 {

From ae609b9d48c50ae6f7ad291f191ee76309fda123 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Nov 2020 13:35:13 +0900
Subject: [PATCH 06397/10326] Remove unnecessary local variable

---
 osu.Game/Screens/Menu/MenuLogoVisualisation.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
index 31a3c2dffd..92add458f9 100644
--- a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
@@ -27,12 +27,10 @@ namespace osu.Game.Screens.Menu
 
         private void updateColour()
         {
-            Color4 defaultColour = Color4.White;
-
             if (user.Value?.IsSupporter ?? false)
-                Colour = skin.Value.GetConfig<GlobalSkinColours, Color4>(GlobalSkinColours.MenuGlow)?.Value ?? defaultColour;
+                Colour = skin.Value.GetConfig<GlobalSkinColours, Color4>(GlobalSkinColours.MenuGlow)?.Value ?? Color4.White;
             else
-                Colour = defaultColour;
+                Colour = Color4.White;
         }
     }
 }

From 3ed78688012d711fd374f5350b742625cda6f192 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Nov 2020 13:49:14 +0900
Subject: [PATCH 06398/10326] Scroll editor setup screen to file selector on
 display

Previously the file selector would potentially display off-screen,
making for confusing UX.

Closes #10942.
---
 osu.Game/Graphics/Containers/SectionsContainer.cs   |  2 ++
 .../Edit/Setup/FileChooserLabelledTextBox.cs        | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index f32f8e0c67..81968de304 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using JetBrains.Annotations;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -14,6 +15,7 @@ namespace osu.Game.Graphics.Containers
     /// <summary>
     /// A container that can scroll to each section inside it.
     /// </summary>
+    [Cached]
     public class SectionsContainer<T> : Container<T>
         where T : Drawable
     {
diff --git a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
index b802b3405a..5de6842b50 100644
--- a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
+++ b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
@@ -3,10 +3,12 @@
 
 using System;
 using System.IO;
+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.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 
@@ -21,6 +23,9 @@ namespace osu.Game.Screens.Edit.Setup
 
         private readonly IBindable<FileInfo> currentFile = new Bindable<FileInfo>();
 
+        [Resolved]
+        private SectionsContainer<SetupSection> sectionsContainer { get; set; }
+
         public FileChooserLabelledTextBox()
         {
             currentFile.BindValueChanged(onFileSelected);
@@ -47,14 +52,16 @@ namespace osu.Game.Screens.Edit.Setup
 
         public void DisplayFileChooser()
         {
-            Target.Child = new FileSelector(validFileExtensions: ResourcesSection.AudioExtensions)
+            FileSelector fileSelector;
+
+            Target.Child = fileSelector = new FileSelector(validFileExtensions: ResourcesSection.AudioExtensions)
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 400,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
                 CurrentFile = { BindTarget = currentFile }
             };
+
+            sectionsContainer?.ScrollTo(fileSelector);
         }
 
         internal class FileChooserOsuTextBox : OsuTextBox

From 898e2dae27f3f9badc0407ff745375803cec7345 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Nov 2020 14:27:02 +0900
Subject: [PATCH 06399/10326] Restore kiai time flashing behaviour

---
 osu.Game/Screens/Menu/LogoVisualisation.cs |  2 +-
 osu.Game/Screens/Menu/OsuLogo.cs           | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index c96b08902c..01b2a98c6e 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Screens.Menu
             // Assuming the logo is a circle, we don't need a second dimension.
             private float size;
 
-            private static readonly Color4 transparent_white = Color4.White.Opacity(0.1f);
+            private static readonly Color4 transparent_white = Color4.White.Opacity(0.2f);
 
             private float[] audioData;
 
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 8fa9d6e933..68d23e1a32 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -81,6 +81,8 @@ namespace osu.Game.Screens.Menu
             set => rippleContainer.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint);
         }
 
+        private const float visualizer_default_alpha = 0.5f;
+
         private readonly Box flashLayer;
 
         private readonly Container impactContainer;
@@ -144,6 +146,7 @@ namespace osu.Game.Screens.Menu
                                                     RelativeSizeAxes = Axes.Both,
                                                     Origin = Anchor.Centre,
                                                     Anchor = Anchor.Centre,
+                                                    Alpha = visualizer_default_alpha,
                                                     Size = new Vector2(0.96f)
                                                 },
                                                 new Container
@@ -281,8 +284,7 @@ namespace osu.Game.Screens.Menu
                 this.Delay(early_activation).Schedule(() => sampleBeat.Play());
 
             logoBeatContainer
-                .ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, Easing.Out)
-                .Then()
+                .ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, Easing.Out).Then()
                 .ScaleTo(1, beatLength * 2, Easing.OutQuint);
 
             ripple.ClearTransforms();
@@ -295,15 +297,13 @@ namespace osu.Game.Screens.Menu
             {
                 flashLayer.ClearTransforms();
                 flashLayer
-                    .FadeTo(0.2f * amplitudeAdjust, early_activation, Easing.Out)
-                    .Then()
+                    .FadeTo(0.2f * amplitudeAdjust, early_activation, Easing.Out).Then()
                     .FadeOut(beatLength);
 
                 visualizer.ClearTransforms();
                 visualizer
-                    .FadeTo(0.9f * amplitudeAdjust, early_activation, Easing.Out)
-                    .Then()
-                    .FadeTo(0.5f, beatLength);
+                    .FadeTo(visualizer_default_alpha * 1.8f * amplitudeAdjust, early_activation, Easing.Out).Then()
+                    .FadeTo(visualizer_default_alpha, beatLength);
             }
         }
 

From 1b33d3003924daed2d2995a4889725728fce4d46 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 23 Nov 2020 08:52:29 +0300
Subject: [PATCH 06400/10326] Simplify horizontal ticks creation

---
 .../Sections/Historical/ProfileLineChart.cs   | 37 +++++--------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 1ce14fa245..7dbcb9ba16 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -115,9 +115,11 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             var min = values.Select(v => v.Count).Min();
             var max = values.Select(v => v.Count).Max();
 
-            var tick = getTick(getRange(max - min), 6);
+            var tick = getTick(max - min, 6);
 
-            bool tickIsDecimal = tick < 1.0;
+            // Prevent infinite loop in case if tick is zero
+            if (tick == 0)
+                tick = 1;
 
             double rollingRow = 0;
 
@@ -126,7 +128,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 if (rollingRow >= min)
                 {
                     var y = -Interpolation.ValueAt(rollingRow, 0, 1f, min, max);
-                    addRowTick(y, rollingRow, tickIsDecimal);
+                    addRowTick(y, rollingRow);
                 }
 
                 rollingRow += tick;
@@ -156,7 +158,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             }
         }
 
-        private void addRowTick(float y, double value, bool tickIsDecimal)
+        private void addRowTick(float y, double value)
         {
             rowTicksContainer.Add(new TickText
             {
@@ -164,7 +166,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 Origin = Anchor.CentreRight,
                 RelativePositionAxes = Axes.Y,
                 Margin = new MarginPadding { Right = 3 },
-                Text = tickIsDecimal ? value.ToString("F1") : value.ToString("N0"),
+                Text = value.ToString("N0"),
                 Font = OsuFont.GetFont(size: 12),
                 Y = y
             });
@@ -204,28 +206,9 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             });
         }
 
-        private double getRange(double initialRange)
+        private long getTick(long range, int maxTicksCount)
         {
-            var exponent = Math.Floor(Math.Log10(initialRange));
-            var fraction = initialRange / Math.Pow(10, exponent);
-
-            double niceFraction;
-
-            if (fraction <= 1.0)
-                niceFraction = 1.0;
-            else if (fraction <= 2.0)
-                niceFraction = 2.0;
-            else if (fraction <= 5.0)
-                niceFraction = 5.0;
-            else
-                niceFraction = 10.0;
-
-            return niceFraction * Math.Pow(10, exponent);
-        }
-
-        private double getTick(double range, int maxTicksCount)
-        {
-            var value = range / (maxTicksCount - 1);
+            var value = (float)range / (maxTicksCount - 1);
 
             var exponent = Math.Floor(Math.Log10(value));
             var fraction = value / Math.Pow(10, exponent);
@@ -241,7 +224,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             else
                 niceFraction = 10.0;
 
-            return niceFraction * Math.Pow(10, exponent);
+            return (long)(niceFraction * Math.Pow(10, exponent));
         }
 
         private class TickText : OsuSpriteText

From 19faa2b9bbbcc2835e251a69ffbc2c6b8df6249d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Nov 2020 15:18:54 +0900
Subject: [PATCH 06401/10326] Add comment covering intentional call to
 ClearTransformsAfter

---
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs        | 2 ++
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index cd6c001172..889e748a4a 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -149,8 +149,10 @@ namespace osu.Game.Rulesets.Judgements
 
         private void runAnimation()
         {
+            // undo any transforms applies in ApplyMissAnimations/ApplyHitAnimations to get a sane initial state.
             ApplyTransformsAt(double.MinValue, true);
             ClearTransforms(true);
+
             LifetimeStart = Result.TimeAbsolute;
 
             using (BeginAbsoluteSequence(Result.TimeAbsolute, true))
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ca49ed9e75..0fa76a733f 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -439,6 +439,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private void clearExistingStateTransforms()
         {
             base.ApplyTransformsAt(double.MinValue, true);
+
+            // has to call this method directly (not ClearTransforms) to bypass the local ClearTransformsAfter override.
             base.ClearTransformsAfter(double.MinValue, true);
         }
 

From 3c0ee7de9b12f17924e1b94e3bdc9d58f9e6850d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 23 Nov 2020 09:51:50 +0300
Subject: [PATCH 06402/10326] Add proper tests

---
 .../Online/TestSceneChartProfileSubsection.cs | 145 ++++++++++++++++++
 .../Online/TestSceneProfileLineChart.cs       |  55 -------
 2 files changed, 145 insertions(+), 55 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneChartProfileSubsection.cs
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChartProfileSubsection.cs b/osu.Game.Tests/Visual/Online/TestSceneChartProfileSubsection.cs
new file mode 100644
index 0000000000..4983dfba12
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneChartProfileSubsection.cs
@@ -0,0 +1,145 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Overlays.Profile.Sections.Historical;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Users;
+using NUnit.Framework;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
+using System;
+using System.Linq;
+using osu.Framework.Testing;
+using osu.Framework.Graphics.Shapes;
+using static osu.Game.Users.User;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneChartProfileSubsection : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
+
+        private readonly Bindable<User> user = new Bindable<User>();
+        private readonly PlayHistorySubsection section;
+
+        public TestSceneChartProfileSubsection()
+        {
+            AddRange(new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background4
+                },
+                section = new PlayHistorySubsection(user)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                }
+            });
+        }
+
+        [Test]
+        public void TestNullValues()
+        {
+            AddStep("Load user", () => user.Value = user_with_null_values);
+            AddAssert("Section is hidden", () => section.Alpha == 0);
+        }
+
+        [Test]
+        public void TestEmptyValues()
+        {
+            AddStep("Load user", () => user.Value = user_with_empty_values);
+            AddAssert("Section is hidden", () => section.Alpha == 0);
+        }
+
+        [Test]
+        public void TestOveValue()
+        {
+            AddStep("Load user", () => user.Value = user_with_one_value);
+            AddAssert("Section is hidden", () => section.Alpha == 0);
+        }
+
+        [Test]
+        public void TestTwoValues()
+        {
+            AddStep("Load user", () => user.Value = user_with_two_values);
+            AddAssert("Section is visible", () => section.Alpha == 1);
+        }
+
+        [Test]
+        public void TestFilledValues()
+        {
+            AddStep("Load user", () => user.Value = user_with_filled_values);
+            AddAssert("Section is visible", () => section.Alpha == 1);
+            AddAssert("Array length is the same", () => user_with_filled_values.MonthlyPlaycounts.Length == getChartValuesLength());
+        }
+
+        [Test]
+        public void TestMissingValues()
+        {
+            AddStep("Load user", () => user.Value = user_with_missing_values);
+            AddAssert("Section is visible", () => section.Alpha == 1);
+            AddAssert("Array length is 7", () => getChartValuesLength() == 7);
+        }
+
+        private int getChartValuesLength() => this.ChildrenOfType<ProfileLineChart>().Single().Values.Length;
+
+        private static readonly User user_with_null_values = new User
+        {
+            Id = 1
+        };
+
+        private static readonly User user_with_empty_values = new User
+        {
+            Id = 2,
+            MonthlyPlaycounts = Array.Empty<UserHistoryCount>()
+        };
+
+        private static readonly User user_with_one_value = new User
+        {
+            Id = 3,
+            MonthlyPlaycounts = new[]
+            {
+                new UserHistoryCount { Date = new DateTime(2010, 5, 1), Count = 100 }
+            }
+        };
+
+        private static readonly User user_with_two_values = new User
+        {
+            Id = 4,
+            MonthlyPlaycounts = new[]
+            {
+                new UserHistoryCount { Date = new DateTime(2010, 5, 1), Count = 1 },
+                new UserHistoryCount { Date = new DateTime(2010, 6, 1), Count = 2 }
+            }
+        };
+
+        private static readonly User user_with_filled_values = new User
+        {
+            Id = 5,
+            MonthlyPlaycounts = new[]
+            {
+                new UserHistoryCount { Date = new DateTime(2010, 5, 1), Count = 1000 },
+                new UserHistoryCount { Date = new DateTime(2010, 6, 1), Count = 20 },
+                new UserHistoryCount { Date = new DateTime(2010, 7, 1), Count = 20000 },
+                new UserHistoryCount { Date = new DateTime(2010, 8, 1), Count = 30 },
+                new UserHistoryCount { Date = new DateTime(2010, 9, 1), Count = 50 },
+                new UserHistoryCount { Date = new DateTime(2010, 10, 1), Count = 2000 },
+                new UserHistoryCount { Date = new DateTime(2010, 11, 1), Count = 2100 }
+            }
+        };
+
+        private static readonly User user_with_missing_values = new User
+        {
+            Id = 6,
+            MonthlyPlaycounts = new[]
+            {
+                new UserHistoryCount { Date = new DateTime(2020, 1, 1), Count = 100 },
+                new UserHistoryCount { Date = new DateTime(2020, 7, 1), Count = 200 }
+            }
+        };
+    }
+}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.cs
deleted file mode 100644
index 3d342b0d76..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileLineChart.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.Game.Overlays.Profile.Sections.Historical;
-using osu.Framework.Graphics;
-using System;
-using osu.Game.Overlays;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Containers;
-using static osu.Game.Users.User;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneProfileLineChart : OsuTestScene
-    {
-        [Cached]
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
-
-        public TestSceneProfileLineChart()
-        {
-            var values = new[]
-            {
-                new UserHistoryCount { Date = new DateTime(2010, 5, 1), Count = 1000 },
-                new UserHistoryCount { Date = new DateTime(2010, 6, 1), Count = 20 },
-                new UserHistoryCount { Date = new DateTime(2010, 7, 1), Count = 20000 },
-                new UserHistoryCount { Date = new DateTime(2010, 8, 1), Count = 30 },
-                new UserHistoryCount { Date = new DateTime(2010, 9, 1), Count = 50 },
-                new UserHistoryCount { Date = new DateTime(2010, 10, 1), Count = 2000 },
-                new UserHistoryCount { Date = new DateTime(2010, 11, 1), Count = 2100 }
-            };
-
-            AddRange(new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background4
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Padding = new MarginPadding { Horizontal = 50 },
-                    Child = new ProfileLineChart
-                    {
-                        Values = values
-                    }
-                }
-            });
-        }
-    }
-}

From 087ea9c9a5366c3848a56ea479259065913929d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 23 Nov 2020 20:51:38 +0100
Subject: [PATCH 06403/10326] Fix typo in test name

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChartProfileSubsection.cs b/osu.Game.Tests/Visual/Online/TestSceneChartProfileSubsection.cs
index 4983dfba12..0c8ee5e0c5 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChartProfileSubsection.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChartProfileSubsection.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [Test]
-        public void TestOveValue()
+        public void TestOneValue()
         {
             AddStep("Load user", () => user.Value = user_with_one_value);
             AddAssert("Section is hidden", () => section.Alpha == 0);

From 20f1775ddb11ff2e88c22475788b5784892f0621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 23 Nov 2020 20:59:04 +0100
Subject: [PATCH 06404/10326] Rename test scene to match tested class

---
 ...ProfileSubsection.cs => TestScenePlayHistorySubsection.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Online/{TestSceneChartProfileSubsection.cs => TestScenePlayHistorySubsection.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChartProfileSubsection.cs b/osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs
similarity index 97%
rename from osu.Game.Tests/Visual/Online/TestSceneChartProfileSubsection.cs
rename to osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs
index 0c8ee5e0c5..c9dbc9dc24 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChartProfileSubsection.cs
+++ b/osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs
@@ -16,7 +16,7 @@ using static osu.Game.Users.User;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneChartProfileSubsection : OsuTestScene
+    public class TestScenePlayHistorySubsection : OsuTestScene
     {
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
         private readonly Bindable<User> user = new Bindable<User>();
         private readonly PlayHistorySubsection section;
 
-        public TestSceneChartProfileSubsection()
+        public TestScenePlayHistorySubsection()
         {
             AddRange(new Drawable[]
             {

From e9ffeb8b5d1471e59e91cce116e316e54ffe3db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 23 Nov 2020 21:09:42 +0100
Subject: [PATCH 06405/10326] Make missing date check more robust

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

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
index 783ecec190..3fd334005f 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             static bool hasMissingDates(UserHistoryCount prev, UserHistoryCount current)
             {
                 var possibleCurrent = prev.Date.AddMonths(1);
-                return possibleCurrent != current.Date;
+                return possibleCurrent < current.Date;
             }
         }
 

From bb5aa9a9c914d2fa0bd57431dfa7d737b00831ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 23 Nov 2020 21:24:37 +0100
Subject: [PATCH 06406/10326] Guard against empty values early

---
 .../Profile/Sections/Historical/ProfileLineChart.cs         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 7dbcb9ba16..af2ef5a75c 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -26,8 +26,10 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             get => values;
             set
             {
-                values = value;
-                graph.Values = values;
+                if (value.Length == 0)
+                    throw new ArgumentException("At least one value expected!", nameof(value));
+
+                graph.Values = values = value;
 
                 createRowTicks();
                 createColumnTicks();

From 7b0d3dfe0cee8696f7251465ba63a7755d161ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 23 Nov 2020 21:38:04 +0100
Subject: [PATCH 06407/10326] Refactor tick calculation code for readability

---
 .../Sections/Historical/ProfileLineChart.cs   | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index af2ef5a75c..ecc85fb48d 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             var min = values.Select(v => v.Count).Min();
             var max = values.Select(v => v.Count).Max();
 
-            var tick = getTick(max - min, 6);
+            var tick = getTickInterval(max - min, 6);
 
             // Prevent infinite loop in case if tick is zero
             if (tick == 0)
@@ -208,25 +208,32 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             });
         }
 
-        private long getTick(long range, int maxTicksCount)
+        private long getTickInterval(long range, int maxTicksCount)
         {
-            var value = (float)range / (maxTicksCount - 1);
+            // this interval is what would be achieved if the interval was divided perfectly evenly into maxTicksCount ticks.
+            // can contain ugly fractional parts.
+            var exactTickInterval = (float)range / (maxTicksCount - 1);
 
-            var exponent = Math.Floor(Math.Log10(value));
-            var fraction = value / Math.Pow(10, exponent);
+            // the ideal ticks start with a 1, 2 or 5, and are multipliers of powers of 10.
+            // first off, use log10 to calculate the number of digits in the "exact" interval.
+            var numberOfDigits = Math.Floor(Math.Log10(exactTickInterval));
+            var tickBase = Math.Pow(10, numberOfDigits);
+            // then see how the exact tick relates to the power of 10.
+            var exactTickMultiplier = exactTickInterval / tickBase;
 
-            double niceFraction;
+            double tickMultiplier;
 
-            if (fraction < 1.5)
-                niceFraction = 1.0;
-            else if (fraction < 3)
-                niceFraction = 2.0;
-            else if (fraction < 7)
-                niceFraction = 5.0;
+            // round up the fraction to start with a 1, 2 or 5. closest match wins.
+            if (exactTickMultiplier < 1.5)
+                tickMultiplier = 1.0;
+            else if (exactTickMultiplier < 3)
+                tickMultiplier = 2.0;
+            else if (exactTickMultiplier < 7)
+                tickMultiplier = 5.0;
             else
-                niceFraction = 10.0;
+                tickMultiplier = 10.0;
 
-            return (long)(niceFraction * Math.Pow(10, exponent));
+            return Math.Max((long)(tickMultiplier * tickBase), 1);
         }
 
         private class TickText : OsuSpriteText

From 8347ecf494f6824d1fe0ee36b6094e434cc31196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 23 Nov 2020 21:52:47 +0100
Subject: [PATCH 06408/10326] Simplify row tick creation code

---
 .../Sections/Historical/ProfileLineChart.cs   | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index ecc85fb48d..c1eb0811fb 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -117,23 +117,15 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             var min = values.Select(v => v.Count).Min();
             var max = values.Select(v => v.Count).Max();
 
-            var tick = getTickInterval(max - min, 6);
+            var tickInterval = getTickInterval(max - min, 6);
 
-            // Prevent infinite loop in case if tick is zero
-            if (tick == 0)
-                tick = 1;
-
-            double rollingRow = 0;
-
-            while (rollingRow <= max)
+            for (long currentTick = 0; currentTick <= max; currentTick += tickInterval)
             {
-                if (rollingRow >= min)
-                {
-                    var y = -Interpolation.ValueAt(rollingRow, 0, 1f, min, max);
-                    addRowTick(y, rollingRow);
-                }
+                if (currentTick < min)
+                    continue;
 
-                rollingRow += tick;
+                float y = -Interpolation.ValueAt(currentTick, 0, 1f, min, max);
+                addRowTick(y, currentTick);
             }
         }
 

From 5701b32bae6c6d7dd5e4f7d5cf450415d2d5cc40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 23 Nov 2020 22:12:32 +0100
Subject: [PATCH 06409/10326] Handle constant graphs better

---
 .../Online/TestScenePlayHistorySubsection.cs  | 40 ++++++++++++++++++-
 osu.Game/Graphics/UserInterface/LineGraph.cs  |  6 ++-
 .../Sections/Historical/ProfileLineChart.cs   | 12 +++++-
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs b/osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs
index c9dbc9dc24..cf5ecf5bf2 100644
--- a/osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs
+++ b/osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs
@@ -69,6 +69,20 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("Section is visible", () => section.Alpha == 1);
         }
 
+        [Test]
+        public void TestConstantValues()
+        {
+            AddStep("Load user", () => user.Value = user_with_constant_values);
+            AddAssert("Section is visible", () => section.Alpha == 1);
+        }
+
+        [Test]
+        public void TestConstantZeroValues()
+        {
+            AddStep("Load user", () => user.Value = user_with_zero_values);
+            AddAssert("Section is visible", () => section.Alpha == 1);
+        }
+
         [Test]
         public void TestFilledValues()
         {
@@ -117,10 +131,32 @@ namespace osu.Game.Tests.Visual.Online
             }
         };
 
-        private static readonly User user_with_filled_values = new User
+        private static readonly User user_with_constant_values = new User
         {
             Id = 5,
             MonthlyPlaycounts = new[]
+            {
+                new UserHistoryCount { Date = new DateTime(2010, 5, 1), Count = 5 },
+                new UserHistoryCount { Date = new DateTime(2010, 6, 1), Count = 5 },
+                new UserHistoryCount { Date = new DateTime(2010, 7, 1), Count = 5 }
+            }
+        };
+
+        private static readonly User user_with_zero_values = new User
+        {
+            Id = 6,
+            MonthlyPlaycounts = new[]
+            {
+                new UserHistoryCount { Date = new DateTime(2010, 5, 1), Count = 0 },
+                new UserHistoryCount { Date = new DateTime(2010, 6, 1), Count = 0 },
+                new UserHistoryCount { Date = new DateTime(2010, 7, 1), Count = 0 }
+            }
+        };
+
+        private static readonly User user_with_filled_values = new User
+        {
+            Id = 7,
+            MonthlyPlaycounts = new[]
             {
                 new UserHistoryCount { Date = new DateTime(2010, 5, 1), Count = 1000 },
                 new UserHistoryCount { Date = new DateTime(2010, 6, 1), Count = 20 },
@@ -134,7 +170,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private static readonly User user_with_missing_values = new User
         {
-            Id = 6,
+            Id = 8,
             MonthlyPlaycounts = new[]
             {
                 new UserHistoryCount { Date = new DateTime(2020, 1, 1), Count = 100 },
diff --git a/osu.Game/Graphics/UserInterface/LineGraph.cs b/osu.Game/Graphics/UserInterface/LineGraph.cs
index 42b523fc5c..70db26c817 100644
--- a/osu.Game/Graphics/UserInterface/LineGraph.cs
+++ b/osu.Game/Graphics/UserInterface/LineGraph.cs
@@ -119,7 +119,11 @@ namespace osu.Game.Graphics.UserInterface
 
         protected float GetYPosition(float value)
         {
-            if (ActualMaxValue == ActualMinValue) return 0;
+            if (ActualMaxValue == ActualMinValue)
+                // show line at top if the only value on the graph is positive,
+                // and at bottom if the only value on the graph is zero or negative.
+                // just kind of makes most sense intuitively.
+                return value > 1 ? 0 : 1;
 
             return (ActualMaxValue - value) / (ActualMaxValue - ActualMinValue);
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index c1eb0811fb..989871745d 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -124,8 +124,16 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 if (currentTick < min)
                     continue;
 
-                float y = -Interpolation.ValueAt(currentTick, 0, 1f, min, max);
-                addRowTick(y, currentTick);
+                float y;
+                // special-case the min == max case to match LineGraph.
+                // lerp isn't really well-defined over a zero interval anyway.
+                if (min == max)
+                    y = currentTick > 1 ? 1 : 0;
+                else
+                    y = Interpolation.ValueAt(currentTick, 0, 1f, min, max);
+
+                // y axis is inverted in graph-like coordinates.
+                addRowTick(-y, currentTick);
             }
         }
 

From 52f5473cc043eb4ed12f3e9e395c51eff9a1a57a Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 23 Nov 2020 15:13:58 -0800
Subject: [PATCH 06410/10326] Set global action as a parameter in toast

---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 +-
 osu.Game/Input/KeyBindingStore.cs             |  2 +-
 .../Overlays/Music/MusicKeyBindingHandler.cs  | 16 ++++-----
 osu.Game/Overlays/OSD/Toast.cs                | 33 +++++++++++++++++--
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 89a6ee8b07..44ac48d83a 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Configuration
 
         public Func<int, string> LookupSkinName { private get; set; }
 
-        public Func<GlobalAction, string> LookupKeyBindings { get; set; }
+        public Func<GlobalAction?, string> LookupKeyBindings { get; set; }
     }
 
     public enum OsuSetting
diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index bc73d74d74..f4b7c873d5 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Input
         /// </summary>
         /// <param name="globalAction">The action to lookup.</param>
         /// <returns>A set of display strings for all the user's key configuration for the action.</returns>
-        public IEnumerable<string> GetReadableKeyCombinationsFor(GlobalAction globalAction)
+        public IEnumerable<string> GetReadableKeyCombinationsFor(GlobalAction? globalAction)
         {
             foreach (var action in Query().Where(b => (GlobalAction)b.Action == globalAction))
             {
diff --git a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
index 0d6158d46f..fa8180b7c0 100644
--- a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
+++ b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays.OSD;
 
@@ -26,9 +25,6 @@ namespace osu.Game.Overlays.Music
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
-        [Resolved]
-        private OsuConfigManager config { get; set; }
-
         public bool OnPressed(GlobalAction action)
         {
             if (beatmap.Disabled)
@@ -41,11 +37,11 @@ namespace osu.Game.Overlays.Music
                     bool wasPlaying = musicController.IsPlaying;
 
                     if (musicController.TogglePause())
-                        onScreenDisplay?.Display(new MusicActionToast(wasPlaying ? "Pause track" : "Play track", config.LookupKeyBindings(action)));
+                        onScreenDisplay?.Display(new MusicActionToast(wasPlaying ? "Pause track" : "Play track", action));
                     return true;
 
                 case GlobalAction.MusicNext:
-                    musicController.NextTrack(() => onScreenDisplay?.Display(new MusicActionToast("Next track", config.LookupKeyBindings(action))));
+                    musicController.NextTrack(() => onScreenDisplay?.Display(new MusicActionToast("Next track", action)));
 
                     return true;
 
@@ -55,11 +51,11 @@ namespace osu.Game.Overlays.Music
                         switch (res)
                         {
                             case PreviousTrackResult.Restart:
-                                onScreenDisplay?.Display(new MusicActionToast("Restart track", config.LookupKeyBindings(action)));
+                                onScreenDisplay?.Display(new MusicActionToast("Restart track", action));
                                 break;
 
                             case PreviousTrackResult.Previous:
-                                onScreenDisplay?.Display(new MusicActionToast("Previous track", config.LookupKeyBindings(action)));
+                                onScreenDisplay?.Display(new MusicActionToast("Previous track", action));
                                 break;
                         }
                     });
@@ -76,8 +72,8 @@ namespace osu.Game.Overlays.Music
 
         private class MusicActionToast : Toast
         {
-            public MusicActionToast(string action, string shortcut)
-                : base("Music Playback", action, shortcut)
+            public MusicActionToast(string value, GlobalAction action)
+                : base("Music Playback", value, action: action)
             {
             }
         }
diff --git a/osu.Game/Overlays/OSD/Toast.cs b/osu.Game/Overlays/OSD/Toast.cs
index 1497ca8fa8..d32d63055f 100644
--- a/osu.Game/Overlays/OSD/Toast.cs
+++ b/osu.Game/Overlays/OSD/Toast.cs
@@ -1,11 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 using osuTK;
 using osuTK.Graphics;
 
@@ -16,12 +19,22 @@ namespace osu.Game.Overlays.OSD
         private const int toast_minimum_width = 240;
 
         private readonly Container content;
+
+        private readonly OsuSpriteText spriteText;
+
+        private readonly string shortcut;
+
+        private readonly GlobalAction? action;
+
         protected override Container<Drawable> Content => content;
 
         protected readonly OsuSpriteText ValueText;
 
-        protected Toast(string description, string value, string shortcut)
+        protected Toast(string description, string value, string shortcut = null, GlobalAction? action = null)
         {
+            this.shortcut = shortcut;
+            this.action = action;
+
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
@@ -68,7 +81,7 @@ namespace osu.Game.Overlays.OSD
                     Origin = Anchor.Centre,
                     Text = value
                 },
-                new OsuSpriteText
+                spriteText = new OsuSpriteText
                 {
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
@@ -76,9 +89,23 @@ namespace osu.Game.Overlays.OSD
                     Alpha = 0.3f,
                     Margin = new MarginPadding { Bottom = 15 },
                     Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
-                    Text = string.IsNullOrEmpty(shortcut) ? "NO KEY BOUND" : shortcut.ToUpperInvariant()
                 },
             };
         }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            string text;
+
+            if (action != null)
+                text = config.LookupKeyBindings(action);
+            else if (!string.IsNullOrEmpty(shortcut))
+                text = shortcut;
+            else
+                text = "no key bound";
+
+            spriteText.Text = text.ToUpperInvariant();
+        }
     }
 }

From 44ca67c534ab40635f632e8b4fb6b2b1e124f4bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 13:10:11 +0900
Subject: [PATCH 06411/10326] Simplify fill logic and add xmldoc

---
 .../Historical/ChartProfileSubsection.cs      | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
index 3fd334005f..885b12ca6d 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -52,32 +53,30 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             Hide();
         }
 
-        private UserHistoryCount[] fillZeroValues(UserHistoryCount[] values)
+        /// <summary>
+        /// Add entries for any missing months (filled with zero values).
+        /// </summary>
+        private UserHistoryCount[] fillZeroValues(UserHistoryCount[] historyEntries)
         {
-            var newValues = new List<UserHistoryCount> { values[0] };
-            var newLast = values[0];
+            var filledHistoryEntries = new List<UserHistoryCount>();
 
-            for (int i = 1; i < values.Length; i++)
+            foreach (var entry in historyEntries)
             {
-                while (hasMissingDates(newLast, values[i]))
+                var lastFilled = filledHistoryEntries.LastOrDefault();
+
+                while (lastFilled?.Date.AddMonths(1) < entry.Date)
                 {
-                    newValues.Add(newLast = new UserHistoryCount
+                    filledHistoryEntries.Add(lastFilled = new UserHistoryCount
                     {
                         Count = 0,
-                        Date = newLast.Date.AddMonths(1)
+                        Date = lastFilled.Date.AddMonths(1)
                     });
                 }
 
-                newValues.Add(newLast = values[i]);
+                filledHistoryEntries.Add(entry);
             }
 
-            return newValues.ToArray();
-
-            static bool hasMissingDates(UserHistoryCount prev, UserHistoryCount current)
-            {
-                var possibleCurrent = prev.Date.AddMonths(1);
-                return possibleCurrent < current.Date;
-            }
+            return filledHistoryEntries.ToArray();
         }
 
         protected abstract UserHistoryCount[] GetValues(User user);

From 82640418ba1e140d7d4d4d109a15a29e155fe24f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 13:12:04 +0900
Subject: [PATCH 06412/10326] Invert hide logic for readability

---
 .../Profile/Sections/Historical/ChartProfileSubsection.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
index 885b12ca6d..b82773155d 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
@@ -43,14 +43,14 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         {
             var values = GetValues(e.NewValue);
 
-            if (values?.Length > 1)
+            if (values == null || values.Length <= 1)
             {
-                chart.Values = fillZeroValues(values);
-                Show();
+                Hide();
                 return;
             }
 
-            Hide();
+            chart.Values = fillZeroValues(values);
+            Show();
         }
 
         /// <summary>

From e36b1051c18ba0fc4d2210cea84b269c4547e2b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 13:15:59 +0900
Subject: [PATCH 06413/10326] Add spacing between inline comments

---
 .../Overlays/Profile/Sections/Historical/ProfileLineChart.cs    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index 989871745d..f02aa36b6c 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -125,6 +125,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                     continue;
 
                 float y;
+
                 // special-case the min == max case to match LineGraph.
                 // lerp isn't really well-defined over a zero interval anyway.
                 if (min == max)
@@ -218,6 +219,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             // first off, use log10 to calculate the number of digits in the "exact" interval.
             var numberOfDigits = Math.Floor(Math.Log10(exactTickInterval));
             var tickBase = Math.Pow(10, numberOfDigits);
+
             // then see how the exact tick relates to the power of 10.
             var exactTickMultiplier = exactTickInterval / tickBase;
 

From 1fd4b04767bffde0750165ac1064ef13376bfacb Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 23 Nov 2020 20:43:46 -0800
Subject: [PATCH 06414/10326] Just set music shortcut text locally

---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 +-
 osu.Game/Input/KeyBindingStore.cs             |  2 +-
 .../Overlays/Music/MusicKeyBindingHandler.cs  | 12 ++++++-
 osu.Game/Overlays/OSD/Toast.cs                | 34 +++----------------
 4 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 44ac48d83a..89a6ee8b07 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Configuration
 
         public Func<int, string> LookupSkinName { private get; set; }
 
-        public Func<GlobalAction?, string> LookupKeyBindings { get; set; }
+        public Func<GlobalAction, string> LookupKeyBindings { get; set; }
     }
 
     public enum OsuSetting
diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index f4b7c873d5..bc73d74d74 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Input
         /// </summary>
         /// <param name="globalAction">The action to lookup.</param>
         /// <returns>A set of display strings for all the user's key configuration for the action.</returns>
-        public IEnumerable<string> GetReadableKeyCombinationsFor(GlobalAction? globalAction)
+        public IEnumerable<string> GetReadableKeyCombinationsFor(GlobalAction globalAction)
         {
             foreach (var action in Query().Where(b => (GlobalAction)b.Action == globalAction))
             {
diff --git a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
index fa8180b7c0..f06e02e5e1 100644
--- a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
+++ b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays.OSD;
 
@@ -72,9 +73,18 @@ namespace osu.Game.Overlays.Music
 
         private class MusicActionToast : Toast
         {
+            private readonly GlobalAction action;
+
             public MusicActionToast(string value, GlobalAction action)
-                : base("Music Playback", value, action: action)
+                : base("Music Playback", value, string.Empty)
             {
+                this.action = action;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuConfigManager config)
+            {
+                ShortcutText.Text = config.LookupKeyBindings(action).ToUpperInvariant();
             }
         }
     }
diff --git a/osu.Game/Overlays/OSD/Toast.cs b/osu.Game/Overlays/OSD/Toast.cs
index d32d63055f..4a6316df3f 100644
--- a/osu.Game/Overlays/OSD/Toast.cs
+++ b/osu.Game/Overlays/OSD/Toast.cs
@@ -1,14 +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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Input.Bindings;
 using osuTK;
 using osuTK.Graphics;
 
@@ -20,21 +17,14 @@ namespace osu.Game.Overlays.OSD
 
         private readonly Container content;
 
-        private readonly OsuSpriteText spriteText;
-
-        private readonly string shortcut;
-
-        private readonly GlobalAction? action;
-
         protected override Container<Drawable> Content => content;
 
         protected readonly OsuSpriteText ValueText;
 
-        protected Toast(string description, string value, string shortcut = null, GlobalAction? action = null)
-        {
-            this.shortcut = shortcut;
-            this.action = action;
+        protected readonly OsuSpriteText ShortcutText;
 
+        protected Toast(string description, string value, string shortcut)
+        {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
@@ -81,7 +71,7 @@ namespace osu.Game.Overlays.OSD
                     Origin = Anchor.Centre,
                     Text = value
                 },
-                spriteText = new OsuSpriteText
+                ShortcutText = new OsuSpriteText
                 {
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
@@ -89,23 +79,9 @@ namespace osu.Game.Overlays.OSD
                     Alpha = 0.3f,
                     Margin = new MarginPadding { Bottom = 15 },
                     Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                    Text = string.IsNullOrEmpty(shortcut) ? "NO KEY BOUND" : shortcut.ToUpperInvariant()
                 },
             };
         }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            string text;
-
-            if (action != null)
-                text = config.LookupKeyBindings(action);
-            else if (!string.IsNullOrEmpty(shortcut))
-                text = shortcut;
-            else
-                text = "no key bound";
-
-            spriteText.Text = text.ToUpperInvariant();
-        }
     }
 }

From ee33f62809067247049f03d6900eb7e7077bf55f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 15:19:51 +0900
Subject: [PATCH 06415/10326] Fix DrawableJudgement not always animating
 correctly on skin change

If the skin is changed before gameplay has started (at the loading
screen) it is possible for a sequence of events to occur which results
in the animation not being played:

- `SkinReloadableDrawable` runs its BDL load (and calls `OnSkinChanged`
  once)
- User changes skin, triggering `DrawableJudgement`'s skin change
  handling (binding directly on the `SkinSource` locally)
- This will call `PrepareDrawables` and reinitialise the
  `SkinnableDrawable` child hierarchy, then immediately apply the
animations to it.
- The new `SkinnableDrawable` will then get the `SkinChanged` event and
  schedule a handler for it, which will run on its first Update call.
- Any added animations will be lost as a result.

Fixed by binding directly to the `SkinnableDrawable`'s `OnSkinChanged`.
This has the added bonus of not needing to reinitialise the child
hierarchy on skin change (which felt a bit weird in the first place).
---
 .../Rulesets/Judgements/DrawableJudgement.cs  | 63 ++++++++-----------
 1 file changed, 27 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 889e748a4a..45129c17ea 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -32,9 +32,6 @@ namespace osu.Game.Rulesets.Judgements
 
         private readonly Container aboveHitObjectsContent;
 
-        [Resolved]
-        private ISkinSource skinSource { get; set; }
-
         /// <summary>
         /// Duration of initial fade in.
         /// </summary>
@@ -78,29 +75,6 @@ namespace osu.Game.Rulesets.Judgements
 
         public Drawable GetProxyAboveHitObjectsContent() => aboveHitObjectsContent.CreateProxy();
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            skinSource.SourceChanged += onSkinChanged;
-        }
-
-        private void onSkinChanged()
-        {
-            // on a skin change, the child component will update but not get correctly triggered to play its animation.
-            // we need to trigger a reinitialisation to make things right.
-            currentDrawableType = null;
-
-            PrepareForUse();
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (skinSource != null)
-                skinSource.SourceChanged -= onSkinChanged;
-        }
-
         /// <summary>
         /// Apply top-level animations to the current judgement when successfully hit.
         /// If displaying components which require lifetime extensions, manually adjusting <see cref="Drawable.LifetimeEnd"/> is required.
@@ -142,16 +116,17 @@ namespace osu.Game.Rulesets.Judgements
 
             Debug.Assert(Result != null);
 
-            prepareDrawables();
-
             runAnimation();
         }
 
         private void runAnimation()
         {
+            // is a no-op if the drawables are already in a correct state.
+            prepareDrawables();
+
             // undo any transforms applies in ApplyMissAnimations/ApplyHitAnimations to get a sane initial state.
-            ApplyTransformsAt(double.MinValue, true);
-            ClearTransforms(true);
+            // ApplyTransformsAt(double.MinValue, true);
+            // ClearTransforms(true);
 
             LifetimeStart = Result.TimeAbsolute;
 
@@ -193,6 +168,8 @@ namespace osu.Game.Rulesets.Judgements
 
         private void prepareDrawables()
         {
+            Logger.Log("prepareDrawables on DrawableJudgement");
+
             var type = Result?.Type ?? HitResult.Perfect; //TODO: better default type from ruleset
 
             // todo: this should be removed once judgements are always pooled.
@@ -203,7 +180,6 @@ namespace osu.Game.Rulesets.Judgements
             if (JudgementBody != null)
                 RemoveInternal(JudgementBody);
 
-            aboveHitObjectsContent.Clear();
             AddInternal(JudgementBody = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ =>
                 CreateDefaultJudgement(type), confineMode: ConfineMode.NoScaling)
             {
@@ -211,14 +187,29 @@ namespace osu.Game.Rulesets.Judgements
                 Origin = Anchor.Centre,
             });
 
-            if (JudgementBody.Drawable is IAnimatableJudgement animatable)
+            JudgementBody.OnSkinChanged += () =>
             {
-                var proxiedContent = animatable.GetAboveHitObjectsProxiedContent();
-                if (proxiedContent != null)
-                    aboveHitObjectsContent.Add(proxiedContent);
-            }
+                // on a skin change, the child component will update but not get correctly triggered to play its animation (or proxy the newly created content).
+                // we need to trigger a reinitialisation to make things right.
+                proxyContent();
+                runAnimation();
+            };
+
+            proxyContent();
 
             currentDrawableType = type;
+
+            void proxyContent()
+            {
+                aboveHitObjectsContent.Clear();
+
+                if (JudgementBody.Drawable is IAnimatableJudgement animatable)
+                {
+                    var proxiedContent = animatable.GetAboveHitObjectsProxiedContent();
+                    if (proxiedContent != null)
+                        aboveHitObjectsContent.Add(proxiedContent);
+                }
+            }
         }
 
         protected virtual Drawable CreateDefaultJudgement(HitResult result) => new DefaultJudgementPiece(result);

From 168226067750b572272903939f59bd4cbf5061cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 15:28:03 +0900
Subject: [PATCH 06416/10326] Remove left over logging line

---
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 45129c17ea..4ed3b75f2e 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -168,8 +168,6 @@ namespace osu.Game.Rulesets.Judgements
 
         private void prepareDrawables()
         {
-            Logger.Log("prepareDrawables on DrawableJudgement");
-
             var type = Result?.Type ?? HitResult.Perfect; //TODO: better default type from ruleset
 
             // todo: this should be removed once judgements are always pooled.

From 72b8eef36e514c430be84abb82d5eabe1288af20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 15:41:56 +0900
Subject: [PATCH 06417/10326] Add ability to pause/resume replay playback

---
 .../Input/Bindings/GlobalActionContainer.cs   |  6 ++++-
 osu.Game/Screens/Play/Player.cs               |  6 ++++-
 osu.Game/Screens/Play/ReplayPlayer.cs         | 23 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index e5d3a89a88..77f57bd637 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -69,6 +69,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.Plus }, GlobalAction.IncreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.Control, InputKey.Minus }, GlobalAction.DecreaseScrollSpeed),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
+            new KeyBinding(InputKey.Space, GlobalAction.PauseReplay),
             new KeyBinding(InputKey.Control, GlobalAction.HoldForHUD),
         };
 
@@ -175,7 +176,7 @@ namespace osu.Game.Input.Bindings
         [Description("Toggle notifications")]
         ToggleNotifications,
 
-        [Description("Pause")]
+        [Description("Pause Gameplay")]
         PauseGameplay,
 
         // Editor
@@ -196,5 +197,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Random Skin")]
         RandomSkin,
+
+        [Description("Pause Replay")]
+        PauseReplay,
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index d0a83e3c22..7979b635aa 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -339,7 +339,11 @@ namespace osu.Game.Screens.Play
                         AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded },
                         IsCounting = false
                     },
-                    RequestSeek = GameplayClockContainer.Seek,
+                    RequestSeek = time =>
+                    {
+                        GameplayClockContainer.Seek(time);
+                        GameplayClockContainer.Start();
+                    },
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre
                 },
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 3a4298f22d..2c0b766a17 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -1,12 +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.Input.Bindings;
+using osu.Game.Input.Bindings;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Play
 {
-    public class ReplayPlayer : Player
+    public class ReplayPlayer : Player, IKeyBindingHandler<GlobalAction>
     {
         protected readonly Score Score;
 
@@ -35,5 +37,24 @@ namespace osu.Game.Screens.Play
 
             return Score.ScoreInfo;
         }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.PauseReplay:
+                    if (GameplayClockContainer.IsPaused.Value)
+                        GameplayClockContainer.Start();
+                    else
+                        GameplayClockContainer.Stop();
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
     }
 }

From 1d82557d9f5158006d4c29af41d8ce583e6758f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 15:42:14 +0900
Subject: [PATCH 06418/10326] Avoid blocking global actions when skip overlay
 is not actually active

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

diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index b123757ded..92b304de91 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -133,6 +133,9 @@ namespace osu.Game.Screens.Play
             switch (action)
             {
                 case GlobalAction.SkipCutscene:
+                    if (!button.Enabled.Value)
+                        return false;
+
                     button.Click();
                     return true;
             }

From bd1dad5477f46c041b176d6644714e5f7f126291 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 15:54:27 +0900
Subject: [PATCH 06419/10326] Remove null allowance for now

---
 osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
index 5de6842b50..6e2737256a 100644
--- a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
+++ b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Edit.Setup
                 CurrentFile = { BindTarget = currentFile }
             };
 
-            sectionsContainer?.ScrollTo(fileSelector);
+            sectionsContainer.ScrollTo(fileSelector);
         }
 
         internal class FileChooserOsuTextBox : OsuTextBox

From b9c1f782fa00b52beb0b29772ec9767d45b3e2db Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 17:03:26 +0900
Subject: [PATCH 06420/10326] Remove type parameter from DrawableCatchHitObject

---
 .../Objects/Drawables/DrawableBananaShower.cs |  2 +-
 .../Drawables/DrawableCatchHitObject.cs       | 19 +++----------------
 .../Objects/Drawables/DrawableDroplet.cs      |  4 ++--
 .../Objects/Drawables/DrawableFruit.cs        |  4 ++--
 .../Objects/Drawables/DrawableJuiceStream.cs  |  2 +-
 5 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
index 4ce80aceb8..2215e1d983 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableBananaShower : DrawableCatchHitObject<BananaShower>
+    public class DrawableBananaShower : DrawableCatchHitObject
     {
         private readonly Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation;
         private readonly Container bananaContainer;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 7922510a49..07f1f79243 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -13,12 +13,11 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public abstract class PalpableDrawableCatchHitObject<TObject> : DrawableCatchHitObject<TObject>
-        where TObject : PalpableCatchHitObject
+    public abstract class PalpableDrawableCatchHitObject : DrawableCatchHitObject
     {
         protected Container ScaleContainer { get; private set; }
 
-        protected PalpableDrawableCatchHitObject(TObject hitObject)
+        protected PalpableDrawableCatchHitObject(CatchHitObject hitObject)
             : base(hitObject)
         {
             Origin = Anchor.Centre;
@@ -46,19 +45,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
     }
 
-    public abstract class DrawableCatchHitObject<TObject> : DrawableCatchHitObject
-        where TObject : CatchHitObject
-    {
-        public new TObject HitObject;
-
-        protected DrawableCatchHitObject(TObject hitObject)
-            : base(hitObject)
-        {
-            HitObject = hitObject;
-            Anchor = Anchor.BottomLeft;
-        }
-    }
-
     public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
     {
         protected override double InitialLifetimeOffset => HitObject.TimePreempt;
@@ -73,6 +59,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             : base(hitObject)
         {
             X = hitObject.X;
+            Anchor = Anchor.BottomLeft;
         }
 
         public Func<CatchHitObject, bool> CheckPosition;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index 688240fd86..9db64eba6e 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -8,11 +8,11 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableDroplet : PalpableDrawableCatchHitObject<Droplet>
+    public class DrawableDroplet : PalpableDrawableCatchHitObject
     {
         public override bool StaysOnPlate => false;
 
-        public DrawableDroplet(Droplet h)
+        public DrawableDroplet(CatchHitObject h)
             : base(h)
         {
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index c1c34e4157..f87c8866b1 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -8,9 +8,9 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableFruit : PalpableDrawableCatchHitObject<Fruit>
+    public class DrawableFruit : PalpableDrawableCatchHitObject
     {
-        public DrawableFruit(Fruit h)
+        public DrawableFruit(CatchHitObject h)
             : base(h)
         {
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
index 7bc016d94f..af4a269404 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
@@ -10,7 +10,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableJuiceStream : DrawableCatchHitObject<JuiceStream>
+    public class DrawableJuiceStream : DrawableCatchHitObject
     {
         private readonly Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation;
         private readonly Container dropletContainer;

From c9a41f9dae9ece4d7de354f1137b521d02d8add0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 17:14:39 +0900
Subject: [PATCH 06421/10326] Make all objects in selection candidates for
 spatial snapping

Closes #10898.
---
 .../Editor/TestSceneManiaBeatSnapGrid.cs      |  5 +++
 .../Editor/TestSceneOsuDistanceSnapGrid.cs    |  3 ++
 .../Edit/OsuHitObjectComposer.cs              | 11 +++++-
 .../Editing/TestSceneDistanceSnapGrid.cs      |  3 ++
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  3 ++
 .../Rulesets/Edit/IPositionSnapProvider.cs    | 12 ++++++-
 .../Compose/Components/BlueprintContainer.cs  | 34 ++++++++++++++-----
 .../Compose/Components/Timeline/Timeline.cs   |  3 ++
 8 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
index 654b752001..538a51db5f 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
@@ -96,6 +96,11 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             throw new System.NotImplementedException();
         }
 
+        public override SnapResult SnapScreenSpacePositionToValidPosition(Vector2 screenSpacePosition)
+        {
+            throw new System.NotImplementedException();
+        }
+
         public override float GetBeatSnapDistanceAt(double referenceTime)
         {
             throw new System.NotImplementedException();
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
index 1232369a0b..9af2a99470 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
@@ -174,6 +174,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         private class SnapProvider : IPositionSnapProvider
         {
+            public SnapResult SnapScreenSpacePositionToValidPosition(Vector2 screenSpacePosition) =>
+                new SnapResult(screenSpacePosition, null);
+
             public SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) => new SnapResult(screenSpacePosition, 0);
 
             public float GetBeatSnapDistanceAt(double referenceTime) => (float)beat_length;
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index bfa8ab4431..0490e8b8ce 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -105,11 +105,20 @@ namespace osu.Game.Rulesets.Osu.Edit
             }
         }
 
-        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
+        public override SnapResult SnapScreenSpacePositionToValidPosition(Vector2 screenSpacePosition)
         {
             if (snapToVisibleBlueprints(screenSpacePosition, out var snapResult))
                 return snapResult;
 
+            return new SnapResult(screenSpacePosition, null);
+        }
+
+        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
+        {
+            var positionSnap = SnapScreenSpacePositionToValidPosition(screenSpacePosition);
+            if (positionSnap.ScreenSpacePosition != screenSpacePosition)
+                return positionSnap;
+
             // will be null if distance snap is disabled or not feasible for the current time value.
             if (distanceSnapGrid == null)
                 return base.SnapScreenSpacePositionToValidTime(screenSpacePosition);
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index 8190cf5f89..11830ebe35 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -153,6 +153,9 @@ namespace osu.Game.Tests.Visual.Editing
 
         private class SnapProvider : IPositionSnapProvider
         {
+            public SnapResult SnapScreenSpacePositionToValidPosition(Vector2 screenSpacePosition) =>
+                new SnapResult(screenSpacePosition, null);
+
             public SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) => new SnapResult(screenSpacePosition, 0);
 
             public float GetBeatSnapDistanceAt(double referenceTime) => 10;
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index b90aa6863a..35852f60ea 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -442,6 +442,9 @@ namespace osu.Game.Rulesets.Edit
 
         public abstract SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
 
+        public virtual SnapResult SnapScreenSpacePositionToValidPosition(Vector2 screenSpacePosition) =>
+            new SnapResult(screenSpacePosition, null);
+
         public abstract float GetBeatSnapDistanceAt(double referenceTime);
 
         public abstract float DurationToDistance(double referenceTime, double duration);
diff --git a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
index cce631464f..4664f3808c 100644
--- a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
@@ -8,12 +8,22 @@ namespace osu.Game.Rulesets.Edit
     public interface IPositionSnapProvider
     {
         /// <summary>
-        /// Given a position, find a valid time snap.
+        /// Given a position, find a valid time and position snap.
         /// </summary>
+        /// <remarks>
+        /// This call should be equivalent to running <see cref="SnapScreenSpacePositionToValidPosition"/> with any additional logic that can be performed without the time immutability restriction.
+        /// </remarks>
         /// <param name="screenSpacePosition">The screen-space position to be snapped.</param>
         /// <returns>The time and position post-snapping.</returns>
         SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
 
+        /// <summary>
+        /// Given a position, find a value position snap, restricting time to its input value.
+        /// </summary>
+        /// <param name="screenSpacePosition">The screen-space position to be snapped.</param>
+        /// <returns>The position post-snapping. Time will always be null.</returns>
+        SnapResult SnapScreenSpacePositionToValidPosition(Vector2 screenSpacePosition);
+
         /// <summary>
         /// Retrieves the distance between two points within a timing point that are one beat length apart.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index df9cadebfc..e9f5238980 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -424,7 +424,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #region Selection Movement
 
-        private Vector2? movementBlueprintOriginalPosition;
+        private Vector2[] movementBlueprintOriginalPositions;
         private SelectionBlueprint movementBlueprint;
         private bool isDraggingBlueprint;
 
@@ -442,8 +442,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return;
 
             // Movement is tracked from the blueprint of the earliest hitobject, since it only makes sense to distance snap from that hitobject
-            movementBlueprint = SelectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime).First();
-            movementBlueprintOriginalPosition = movementBlueprint.ScreenSpaceSelectionPoint; // todo: unsure if correct
+            var orderedSelection = SelectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime);
+            movementBlueprint = orderedSelection.First();
+            movementBlueprintOriginalPositions = orderedSelection.Select(m => m.ScreenSpaceSelectionPoint).ToArray();
         }
 
         /// <summary>
@@ -459,12 +460,29 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (snapProvider == null)
                 return true;
 
-            Debug.Assert(movementBlueprintOriginalPosition != null);
+            Debug.Assert(movementBlueprintOriginalPositions != null);
 
-            HitObject draggedObject = movementBlueprint.HitObject;
+            Vector2 distanceTravelled = e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
+
+            // check for positional snap for every object in selection (for things like object-object snapping)
+            for (var i = 0; i < movementBlueprintOriginalPositions.Length; i++)
+            {
+                var testPosition = movementBlueprintOriginalPositions[i] + distanceTravelled;
+
+                var positionalResult = snapProvider.SnapScreenSpacePositionToValidPosition(testPosition);
+
+                if (positionalResult.ScreenSpacePosition == testPosition) continue;
+
+                // attempt to move the objects, and abort any time based snapping if we can.
+                if (SelectionHandler.HandleMovement(new MoveSelectionEvent(SelectionHandler.SelectedBlueprints.ElementAt(i), positionalResult.ScreenSpacePosition)))
+                    return true;
+            }
+
+            // if no positional snapping could be performed, try unrestricted snapping from the earliest
+            // hitobject in the selection.
 
             // The final movement position, relative to movementBlueprintOriginalPosition.
-            Vector2 movePosition = movementBlueprintOriginalPosition.Value + e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
+            Vector2 movePosition = movementBlueprintOriginalPositions.First() + distanceTravelled;
 
             // Retrieve a snapped position.
             var result = snapProvider.SnapScreenSpacePositionToValidTime(movePosition);
@@ -476,7 +494,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (result.Time.HasValue)
             {
                 // Apply the start time at the newly snapped-to position
-                double offset = result.Time.Value - draggedObject.StartTime;
+                double offset = result.Time.Value - movementBlueprint.HitObject.StartTime;
 
                 foreach (HitObject obj in Beatmap.SelectedHitObjects)
                 {
@@ -497,7 +515,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (movementBlueprint == null)
                 return false;
 
-            movementBlueprintOriginalPosition = null;
+            movementBlueprintOriginalPositions = null;
             movementBlueprint = null;
 
             return true;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index f6675902fc..20836c0e68 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -224,6 +224,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         /// </summary>
         public double VisibleRange => track.Length / Zoom;
 
+        public SnapResult SnapScreenSpacePositionToValidPosition(Vector2 screenSpacePosition) =>
+            new SnapResult(screenSpacePosition, null);
+
         public SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) =>
             new SnapResult(screenSpacePosition, beatSnapProvider.SnapTime(getTimeFromPosition(Content.ToLocalSpace(screenSpacePosition))));
 

From 09f2a85d71bcca9753e6ed622574ac6ff29cd663 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 17:40:00 +0900
Subject: [PATCH 06422/10326] Fix potential test failure due to precision check
 missing

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
index 1ca94df26b..8212a16540 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 var first = (OsuHitObject)objects.First();
                 var second = (OsuHitObject)objects.Last();
 
-                return first.Position == second.Position;
+                return Precision.AlmostEquals(first.EndPosition, second.Position);
             });
         }
 

From 4eef6c0d4072ef8a2670b0a40b4fcfd07fad1303 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 17:59:18 +0900
Subject: [PATCH 06423/10326] Add test coverage

---
 .../Editor/TestSceneObjectObjectSnap.cs       | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
index 8212a16540..d20be90001 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
@@ -86,5 +86,55 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 return Precision.AlmostEquals(first.EndPosition, second.Position);
             });
         }
+
+        [Test]
+        public void TestSecondCircleInSelectionAlsoSnaps()
+        {
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre));
+
+            AddStep("disable distance snap", () => InputManager.Key(Key.Q));
+
+            AddStep("enter placement mode", () => InputManager.Key(Key.Number2));
+
+            AddStep("place first object", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("move mouse right", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.2f, 0)));
+            AddStep("place second object", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("move mouse down", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(0, playfield.ScreenSpaceDrawQuad.Width * 0.2f)));
+            AddStep("place third object", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("enter selection mode", () => InputManager.Key(Key.Number1));
+
+            AddStep("select objects 2 and 3", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects.Skip(1)));
+
+            AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
+
+            AddStep("move mouse slightly off centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.02f, 0)));
+
+            AddAssert("object 3 snapped to 1", () =>
+            {
+                var objects = EditorBeatmap.HitObjects;
+
+                var first = (OsuHitObject)objects.First();
+                var third = (OsuHitObject)objects.Last();
+
+                return Precision.AlmostEquals(first.EndPosition, third.Position);
+            });
+
+            AddStep("move mouse slightly off centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * -0.22f, playfield.ScreenSpaceDrawQuad.Width * 0.21f)));
+
+            AddAssert("object 2 snapped to 1", () =>
+            {
+                var objects = EditorBeatmap.HitObjects;
+
+                var first = (OsuHitObject)objects.First();
+                var second = (OsuHitObject)objects.ElementAt(1);
+
+                return Precision.AlmostEquals(first.EndPosition, second.Position);
+            });
+
+            AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+        }
     }
 }

From 07ee36a4ef2dde5ae2b524f672a124d3a8942efa Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 24 Nov 2020 17:18:19 +0800
Subject: [PATCH 06424/10326] Simplify code

---
 osu.Game/Screens/Import/FileImportScreen.cs | 118 ++++----------------
 1 file changed, 19 insertions(+), 99 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index bcbc87e8cc..2f2548c15a 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -13,7 +13,6 @@ using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK;
-using osu.Game.Overlays.Settings;
 using osu.Game.Overlays;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.Containers;
@@ -29,12 +28,11 @@ namespace osu.Game.Screens.Import
 
         public override bool HideOverlaysOnEnter => true;
 
-        private string[] fileExtensions = { ".foo" };
+        private string[] fileExtensions;
         private string defaultPath;
 
         private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
         private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
-        private readonly Bindable<FileFilterType> filterType = new Bindable<FileFilterType>(FileFilterType.All);
         private TextFlowContainer currentFileText;
         private OsuScrollContainer fileNameScroll;
         private readonly OverlayColourProvider overlayColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
@@ -42,15 +40,12 @@ namespace osu.Game.Screens.Import
         [Resolved]
         private OsuGameBase gameBase { get; set; }
 
-        [Resolved]
-        private DialogOverlay dialogOverlay { get; set; }
-
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage)
         {
             storage.GetStorageForDirectory("imports");
             var originalPath = storage.GetFullPath("imports", true);
-
+            fileExtensions = new string[] { ".osk", ".osr", ".osz" };
             defaultPath = originalPath;
 
             InternalChild = contentContainer = new Container
@@ -131,85 +126,43 @@ namespace osu.Game.Screens.Import
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
+                                            Margin = new MarginPadding { Bottom = 15, Top =15 },
                                             Children = new Drawable[]
                                             {
-                                                new Box
-                                                {
-                                                    Colour = overlayColourProvider.Background4,
-                                                    RelativeSizeAxes = Axes.Both
-                                                },
                                                 new FillFlowContainer
                                                 {
                                                     RelativeSizeAxes = Axes.X,
                                                     AutoSizeAxes = Axes.Y,
-                                                    Spacing = new Vector2(10),
                                                     Children = new Drawable[]
                                                     {
-                                                        new SettingsEnumDropdown<FileFilterType>
-                                                        {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            LabelText = "File Type",
-                                                            Current = filterType,
-                                                            Margin = new MarginPadding { Bottom = 15 }
-                                                        },
-                                                        new GridContainer
-                                                        {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            AutoSizeAxes = Axes.Y,
-                                                            RelativeSizeAxes = Axes.X,
-                                                            Margin = new MarginPadding { Top = 15 },
-                                                            RowDimensions = new[]
+                                                            new TriangleButton
                                                             {
-                                                                new Dimension(GridSizeMode.AutoSize)
-                                                            },
-                                                            Content = new[]
-                                                            {
-                                                                new Drawable[]
+                                                                Text = "Import",
+                                                                Anchor = Anchor.BottomCentre,
+                                                                Origin = Anchor.BottomCentre,
+                                                                RelativeSizeAxes = Axes.X,
+                                                                Height = 50,
+                                                                Width = 0.9f,
+                                                                Action = () =>
                                                                 {
-                                                                    new TriangleButton
-                                                                    {
-                                                                        Anchor = Anchor.BottomCentre,
-                                                                        Origin = Anchor.BottomCentre,
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        Height = 50,
-                                                                        Width = 0.9f,
-                                                                        Text = "Refresh",
-                                                                        Action = refresh
-                                                                    },
-                                                                    new TriangleButton
-                                                                    {
-                                                                        Text = "Import",
-                                                                        Anchor = Anchor.BottomCentre,
-                                                                        Origin = Anchor.BottomCentre,
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        Height = 50,
-                                                                        Width = 0.9f,
-                                                                        Action = () =>
-                                                                        {
-                                                                            var d = currentFile.Value?.FullName;
-                                                                            if (d != null)
-                                                                                startImport(d);
-                                                                            else
-                                                                                currentFileText.FlashColour(Color4.Red, 500);
-                                                                        },
-                                                                    }
-                                                                },
+                                                                    var d = currentFile.Value?.FullName;
+                                                                    if (d != null)
+                                                                        startImport(d);
+                                                                    else
+                                                                        currentFileText.FlashColour(Color4.Red, 500);
+                                                                }
                                                             }
-                                                        },
                                                     }
-                                                },
+                                                }
                                             }
                                         }
                                     }
                                 }
-                            },
+                            }
                         }
                     }
                 }
             };
-
             fileNameScroll.ScrollContent.Anchor = Anchor.Centre;
             fileNameScroll.ScrollContent.Origin = Anchor.Centre;
 
@@ -218,37 +171,6 @@ namespace osu.Game.Screens.Import
             {
                 currentFile.Value = null;
             });
-
-            filterType.BindValueChanged(onFilterTypeChanged, true);
-        }
-
-        private void onFilterTypeChanged(ValueChangedEvent<FileFilterType> v)
-        {
-            switch (v.NewValue)
-            {
-                case FileFilterType.Beatmap:
-                    fileExtensions = new string[] { ".osz" };
-                    break;
-
-                case FileFilterType.Skin:
-                    fileExtensions = new string[] { ".osk" };
-                    break;
-
-                case FileFilterType.Replay:
-                    fileExtensions = new string[] { ".osr" };
-                    break;
-
-                default:
-                case FileFilterType.All:
-                    fileExtensions = new string[] { ".osk", ".osr", ".osz" };
-                    break;
-            }
-
-            refresh();
-        }
-
-        private void refresh()
-        {
             currentFile.UnbindBindings();
             currentDirectory.UnbindBindings();
 
@@ -265,7 +187,6 @@ namespace osu.Game.Screens.Import
 
             fileSelectContainer.Add(fileSelector);
         }
-
         private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)
         {
             currentFileText.Text = v.NewValue?.Name ?? "Select a file";
@@ -298,7 +219,6 @@ namespace osu.Game.Screens.Import
 
             if (!File.Exists(path))
             {
-                refresh();
                 currentFileText.Text = "File not exist";
                 currentFileText.FlashColour(Color4.Red, 500);
                 return;

From 0b735b84cf205bb96f0e4d5308a64abf92ee9e63 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 24 Nov 2020 17:23:53 +0800
Subject: [PATCH 06425/10326] Remove unused enum

---
 osu.Game/Screens/Import/FileImportScreen.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 2f2548c15a..f53ea70f45 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -228,13 +228,5 @@ namespace osu.Game.Screens.Import
 
             Task.Factory.StartNew(() => gameBase.Import(paths), TaskCreationOptions.LongRunning);
         }
-
-        public enum FileFilterType
-        {
-            Skin,
-            Beatmap,
-            Replay,
-            All
-        }
     }
 }

From df3844cdbb833efc609355f1104c5983b1d00d7b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 12:50:37 +0900
Subject: [PATCH 06426/10326] Add failing tests for pooling scrolling playfield

---
 .../TestSceneDrawableScrollingRuleset.cs      | 182 ++++++++++++++++--
 1 file changed, 165 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 1a1babb4a8..ff3d152090 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -21,13 +21,13 @@ 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;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Graphics;
+using JetBrains.Annotations;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -46,6 +46,65 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUp]
         public void Setup() => Schedule(() => testClock.CurrentTime = 0);
 
+        [Test]
+        public void TestHitObjectPooling()
+        {
+            var beatmap = createBeatmap(_ => new TestPooledHitObject());
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
+            createTest(beatmap);
+
+            assertPosition(0, 0f);
+            assertDead(3);
+
+            setTime(3 * time_range);
+            assertPosition(3, 0f);
+            assertDead(0);
+
+            setTime(0 * time_range);
+            assertPosition(0, 0f);
+            assertDead(3);
+        }
+
+        [TestCase("pooled")]
+        [TestCase("non-pooled")]
+        public void TestNestedHitObject(string pooled)
+        {
+            var beatmap = createBeatmap(i =>
+            {
+                var h = pooled == "pooled" ? new TestPooledParentHitObject() : new TestParentHitObject();
+                h.Duration = 300;
+                h.ChildTimeOffset = i % 3 * 100;
+                return h;
+            });
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
+            createTest(beatmap);
+
+            assertPosition(0, 0f);
+            assertHeight(0);
+            assertChildPosition(0);
+
+            setTime(5 * time_range);
+            assertPosition(5, 0f);
+            assertHeight(5);
+            assertChildPosition(5);
+        }
+
+        private void assertDead(int index) => AddAssert($"hitobject {index} is dead", () => getDrawableHitObject(index) == null);
+
+        private void assertHeight(int index) => AddAssert($"hitobject {index} height", () =>
+        {
+            var d = getDrawableHitObject(index);
+            return d != null && Precision.AlmostEquals(d.DrawHeight, yScale * (float)(d.HitObject.Duration / time_range), 0.1f);
+        });
+
+        private void assertChildPosition(int index) => AddAssert($"hitobject {index} child position", () =>
+        {
+            var d = getDrawableHitObject(index);
+            return d is DrawableTestParentHitObject && Precision.AlmostEquals(
+                d.NestedHitObjects.First().DrawPosition.Y,
+                yScale * (float)((TestParentHitObject)d.HitObject).ChildTimeOffset / time_range, 0.1f);
+        });
+
         [Test]
         public void TestRelativeBeatLengthScaleSingleTimingPoint()
         {
@@ -147,8 +206,21 @@ namespace osu.Game.Tests.Visual.Gameplay
             assertPosition(1, 1);
         }
 
+        /// <summary>
+        /// Get a <see cref="DrawableTestHitObject" /> corresponding to the <paramref name="index"/>'th <see cref="TestHitObject"/>.
+        /// When a pooling is used and the hit object is not alive, `null` is returned.
+        /// </summary>
+        [CanBeNull]
+        private DrawableTestHitObject getDrawableHitObject(int index)
+        {
+            var hitObject = drawableRuleset.Beatmap.HitObjects.ElementAt(index);
+            return (DrawableTestHitObject)drawableRuleset.Playfield.HitObjectContainer.Objects.FirstOrDefault(obj => obj.HitObject == hitObject);
+        }
+
+        private float yScale => drawableRuleset.Playfield.HitObjectContainer.DrawHeight;
+
         private void assertPosition(int index, float relativeY) => AddAssert($"hitobject {index} at {relativeY}",
-            () => Precision.AlmostEquals(drawableRuleset.Playfield.AllHitObjects.ElementAt(index).DrawPosition.Y, drawableRuleset.Playfield.HitObjectContainer.DrawHeight * relativeY));
+            () => Precision.AlmostEquals(getDrawableHitObject(index)?.DrawPosition.Y ?? -1, yScale * relativeY));
 
         private void setTime(double time)
         {
@@ -160,12 +232,16 @@ namespace osu.Game.Tests.Visual.Gameplay
         /// The hitobjects are spaced <see cref="time_range"/> milliseconds apart.
         /// </summary>
         /// <returns>The <see cref="IBeatmap"/>.</returns>
-        private IBeatmap createBeatmap()
+        private IBeatmap createBeatmap(Func<int, TestHitObject> createAction = null)
         {
-            var beatmap = new Beatmap<HitObject> { BeatmapInfo = { Ruleset = new OsuRuleset().RulesetInfo } };
+            var beatmap = new Beatmap<TestHitObject> { BeatmapInfo = { Ruleset = new OsuRuleset().RulesetInfo } };
 
             for (int i = 0; i < 10; i++)
-                beatmap.HitObjects.Add(new HitObject { StartTime = i * time_range });
+            {
+                var h = createAction?.Invoke(i) ?? new TestHitObject();
+                h.StartTime = i * time_range;
+                beatmap.HitObjects.Add(h);
+            }
 
             return beatmap;
         }
@@ -225,7 +301,14 @@ namespace osu.Game.Tests.Visual.Gameplay
                 TimeRange.Value = time_range;
             }
 
-            public override DrawableHitObject<TestHitObject> CreateDrawableRepresentation(TestHitObject h) => new DrawableTestHitObject(h);
+            public override DrawableHitObject<TestHitObject> CreateDrawableRepresentation(TestHitObject h) =>
+                h switch
+                {
+                    TestPooledHitObject _ => null,
+                    TestPooledParentHitObject _ => null,
+                    TestParentHitObject p => new DrawableTestParentHitObject(p),
+                    _ => new DrawableTestHitObject(h),
+                };
 
             protected override PassThroughInputManager CreateInputManager() => new PassThroughInputManager();
 
@@ -265,6 +348,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                         }
                     }
                 });
+
+                RegisterPool<TestPooledHitObject, DrawableTestPooledHitObject>(1);
+                RegisterPool<TestPooledParentHitObject, DrawableTestPooledParentHitObject>(1);
             }
         }
 
@@ -277,30 +363,46 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public override bool CanConvert() => true;
 
-            protected override IEnumerable<TestHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
-            {
-                yield return new TestHitObject
-                {
-                    StartTime = original.StartTime,
-                    Duration = (original as IHasDuration)?.Duration ?? 100
-                };
-            }
+            protected override IEnumerable<TestHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken) =>
+                throw new NotImplementedException();
         }
 
         #endregion
 
         #region HitObject
 
-        private class TestHitObject : ConvertHitObject, IHasDuration
+        private class TestHitObject : HitObject, IHasDuration
         {
             public double EndTime => StartTime + Duration;
 
-            public double Duration { get; set; }
+            public double Duration { get; set; } = 100;
+        }
+
+        private class TestPooledHitObject : TestHitObject
+        {
+        }
+
+        private class TestParentHitObject : TestHitObject
+        {
+            public double ChildTimeOffset;
+
+            protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
+            {
+                AddNested(new TestHitObject { StartTime = StartTime + ChildTimeOffset });
+            }
+        }
+
+        private class TestPooledParentHitObject : TestParentHitObject
+        {
+            protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
+            {
+                AddNested(new TestPooledHitObject { StartTime = StartTime + ChildTimeOffset });
+            }
         }
 
         private class DrawableTestHitObject : DrawableHitObject<TestHitObject>
         {
-            public DrawableTestHitObject(TestHitObject hitObject)
+            public DrawableTestHitObject([CanBeNull] TestHitObject hitObject)
                 : base(hitObject)
             {
                 Anchor = Anchor.TopCentre;
@@ -326,6 +428,52 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
+        private class DrawableTestPooledHitObject : DrawableTestHitObject
+        {
+            public DrawableTestPooledHitObject()
+                : base(null)
+            {
+                InternalChildren[0].Colour = Color4.LightSkyBlue;
+                InternalChildren[1].Colour = Color4.Blue;
+            }
+
+            protected override void Update() => LifetimeEnd = HitObject.EndTime;
+        }
+
+        private class DrawableTestParentHitObject : DrawableTestHitObject
+        {
+            private readonly Container<DrawableHitObject> container;
+
+            public DrawableTestParentHitObject([CanBeNull] TestHitObject hitObject)
+            : base(hitObject)
+            {
+                InternalChildren[0].Colour = Color4.LightYellow;
+                InternalChildren[1].Colour = Color4.Yellow;
+
+                AddInternal(container = new Container<DrawableHitObject>
+                {
+                    RelativeSizeAxes = Axes.Both,
+                });
+            }
+
+            protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject) =>
+                new DrawableTestHitObject((TestHitObject)hitObject);
+
+            protected override void AddNestedHitObject(DrawableHitObject hitObject) => container.Add(hitObject);
+
+            protected override void ClearNestedHitObjects() => container.Clear(false);
+        }
+
+        private class DrawableTestPooledParentHitObject : DrawableTestParentHitObject
+        {
+            public DrawableTestPooledParentHitObject()
+                : base(null)
+            {
+                InternalChildren[0].Colour = Color4.LightSeaGreen;
+                InternalChildren[1].Colour = Color4.Green;
+            }
+        }
+
         #endregion
     }
 }

From 5c743adbae77f5447d35be352aa1c87834f18f93 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 12:57:39 +0900
Subject: [PATCH 06427/10326] Support hit object pooling scrolling playfield

---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 40 ++++---------------
 .../UI/Scrolling/ScrollingPlayfield.cs        |  6 +++
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index bf64175468..802204900b 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -48,33 +48,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
             timeRange.ValueChanged += _ => layoutCache.Invalidate();
         }
 
-        public override void Add(DrawableHitObject hitObject)
-        {
-            combinedObjCache.Invalidate();
-            hitObject.DefaultsApplied += onDefaultsApplied;
-            base.Add(hitObject);
-        }
-
-        public override bool Remove(DrawableHitObject hitObject)
-        {
-            var result = base.Remove(hitObject);
-
-            if (result)
-            {
-                combinedObjCache.Invalidate();
-                hitObjectInitialStateCache.Remove(hitObject);
-
-                hitObject.DefaultsApplied -= onDefaultsApplied;
-            }
-
-            return result;
-        }
-
         public override void Clear(bool disposeChildren = true)
         {
-            foreach (var h in Objects)
-                h.DefaultsApplied -= onDefaultsApplied;
-
             base.Clear(disposeChildren);
 
             combinedObjCache.Invalidate();
@@ -173,18 +148,19 @@ namespace osu.Game.Rulesets.UI.Scrolling
             }
         }
 
-        private void onDefaultsApplied(DrawableHitObject drawableObject)
+        /// <summary>
+        /// Invalidate the cache of the layout of this hit object.
+        /// </summary>
+        public void InvalidateDrawableHitObject(DrawableHitObject drawableObject)
         {
-            // The cache may not exist if the hitobject state hasn't been computed yet (e.g. if the hitobject was added + defaults applied in the same frame).
-            // In such a case, combinedObjCache will take care of updating the hitobject.
             if (hitObjectInitialStateCache.TryGetValue(drawableObject, out var state))
-            {
-                combinedObjCache.Invalidate();
                 state.Cache.Invalidate();
-            }
+
+            combinedObjCache.Invalidate();
         }
 
-        private float scrollLength;
+        // Use a nonzero value to prevent infinite results
+        private float scrollLength = 1;
 
         protected override void Update()
         {
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 9dac3f4de1..9b21a3f0a9 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -24,6 +24,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
             Direction.BindTo(ScrollingInfo.Direction);
         }
 
+        protected override void OnNewDrawableHitObject(DrawableHitObject drawableHitObject)
+        {
+            drawableHitObject.HitObjectApplied +=
+                ((ScrollingHitObjectContainer)HitObjectContainer).InvalidateDrawableHitObject;
+        }
+
         /// <summary>
         /// Given a position in screen space, return the time within this column.
         /// </summary>

From 8f39b54e58dbd673a124875da57935acd6a7a7c0 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 13:34:09 +0900
Subject: [PATCH 06428/10326] Simplify ScrollingHitObjectContainer logic

---
 .../TestSceneDrawableScrollingRuleset.cs      |  2 +-
 .../Scrolling/ScrollingHitObjectContainer.cs  | 76 +++++--------------
 2 files changed, 22 insertions(+), 56 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index ff3d152090..cebe0394c7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -445,7 +445,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             private readonly Container<DrawableHitObject> container;
 
             public DrawableTestParentHitObject([CanBeNull] TestHitObject hitObject)
-            : base(hitObject)
+                : base(hitObject)
             {
                 InternalChildren[0].Colour = Color4.LightYellow;
                 InternalChildren[1].Colour = Color4.Yellow;
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 802204900b..11a7665f0f 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -2,13 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Layout;
-using osu.Framework.Threading;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -19,7 +16,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
     {
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-        private readonly Dictionary<DrawableHitObject, InitialState> hitObjectInitialStateCache = new Dictionary<DrawableHitObject, InitialState>();
 
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
@@ -27,9 +23,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         // Responds to changes in the layout. When the layout changes, all hit object states must be recomputed.
         private readonly LayoutValue layoutCache = new LayoutValue(Invalidation.RequiredParentSizeToFit | Invalidation.DrawInfo);
 
-        // A combined cache across all hit object states to reduce per-update iterations.
-        // When invalidated, one or more (but not necessarily all) hitobject states must be re-validated.
-        private readonly Cached combinedObjCache = new Cached();
+        private readonly HashSet<DrawableHitObject> invalidHitObjects = new HashSet<DrawableHitObject>();
 
         public ScrollingHitObjectContainer()
         {
@@ -52,8 +46,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             base.Clear(disposeChildren);
 
-            combinedObjCache.Invalidate();
-            hitObjectInitialStateCache.Clear();
+            invalidHitObjects.Clear();
         }
 
         /// <summary>
@@ -150,17 +143,18 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         /// <summary>
         /// Invalidate the cache of the layout of this hit object.
+        /// A hit object should be invalidated after all its nested hit objects are invalidated.
         /// </summary>
         public void InvalidateDrawableHitObject(DrawableHitObject drawableObject)
         {
-            if (hitObjectInitialStateCache.TryGetValue(drawableObject, out var state))
-                state.Cache.Invalidate();
+            invalidHitObjects.Add(drawableObject);
 
-            combinedObjCache.Invalidate();
+            // Remove children as nested hit objects will be recursively updated.
+            foreach (var nested in drawableObject.NestedHitObjects)
+                invalidHitObjects.Remove(nested);
         }
 
-        // Use a nonzero value to prevent infinite results
-        private float scrollLength = 1;
+        private float scrollLength;
 
         protected override void Update()
         {
@@ -168,17 +162,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (!layoutCache.IsValid)
             {
-                foreach (var state in hitObjectInitialStateCache.Values)
-                    state.Cache.Invalidate();
-                combinedObjCache.Invalidate();
+                foreach (var obj in Objects)
+                    invalidHitObjects.Add(obj);
 
                 scrollingInfo.Algorithm.Reset();
 
-                layoutCache.Validate();
-            }
-
-            if (!combinedObjCache.IsValid)
-            {
                 switch (direction.Value)
                 {
                     case ScrollingDirection.Up:
@@ -191,24 +179,16 @@ namespace osu.Game.Rulesets.UI.Scrolling
                         break;
                 }
 
-                foreach (var obj in Objects)
-                {
-                    if (!hitObjectInitialStateCache.TryGetValue(obj, out var state))
-                        state = hitObjectInitialStateCache[obj] = new InitialState(new Cached());
-
-                    if (state.Cache.IsValid)
-                        continue;
-
-                    state.ScheduledComputation?.Cancel();
-                    state.ScheduledComputation = computeInitialStateRecursive(obj);
-
-                    computeLifetimeStartRecursive(obj);
-
-                    state.Cache.Validate();
-                }
-
-                combinedObjCache.Validate();
+                layoutCache.Validate();
             }
+
+            foreach (var obj in invalidHitObjects)
+            {
+                computeInitialStateRecursive(obj);
+                computeLifetimeStartRecursive(obj);
+            }
+
+            invalidHitObjects.Clear();
         }
 
         private void computeLifetimeStartRecursive(DrawableHitObject hitObject)
@@ -247,7 +227,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
             return scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
         }
 
-        private ScheduledDelegate computeInitialStateRecursive(DrawableHitObject hitObject) => hitObject.Schedule(() =>
+        private void computeInitialStateRecursive(DrawableHitObject hitObject)
         {
             if (hitObject.HitObject is IHasDuration e)
             {
@@ -272,7 +252,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 // Nested hitobjects don't need to scroll, but they do need accurate positions
                 updatePosition(obj, hitObject.HitObject.StartTime);
             }
-        });
+        }
 
         protected override void UpdateAfterChildrenLife()
         {
@@ -304,19 +284,5 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
         }
-
-        private class InitialState
-        {
-            [NotNull]
-            public readonly Cached Cache;
-
-            [CanBeNull]
-            public ScheduledDelegate ScheduledComputation;
-
-            public InitialState(Cached cache)
-            {
-                Cache = cache;
-            }
-        }
     }
 }

From cabc8aa63b4b3e3cb7f59046054f8b87071b651a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 13:57:20 +0900
Subject: [PATCH 06429/10326] Revert "Simplify ScrollingHitObjectContainer
 logic"

This reverts commit b4cc39149c117e6a0e95ee917a67cec8ba723d06.
---
 .../TestSceneDrawableScrollingRuleset.cs      |  2 +-
 .../Scrolling/ScrollingHitObjectContainer.cs  | 74 ++++++++++++++-----
 2 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index cebe0394c7..ff3d152090 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -445,7 +445,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             private readonly Container<DrawableHitObject> container;
 
             public DrawableTestParentHitObject([CanBeNull] TestHitObject hitObject)
-                : base(hitObject)
+            : base(hitObject)
             {
                 InternalChildren[0].Colour = Color4.LightYellow;
                 InternalChildren[1].Colour = Color4.Yellow;
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 11a7665f0f..802204900b 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -2,10 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Layout;
+using osu.Framework.Threading;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -16,6 +19,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
     {
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+        private readonly Dictionary<DrawableHitObject, InitialState> hitObjectInitialStateCache = new Dictionary<DrawableHitObject, InitialState>();
 
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
@@ -23,7 +27,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
         // Responds to changes in the layout. When the layout changes, all hit object states must be recomputed.
         private readonly LayoutValue layoutCache = new LayoutValue(Invalidation.RequiredParentSizeToFit | Invalidation.DrawInfo);
 
-        private readonly HashSet<DrawableHitObject> invalidHitObjects = new HashSet<DrawableHitObject>();
+        // A combined cache across all hit object states to reduce per-update iterations.
+        // When invalidated, one or more (but not necessarily all) hitobject states must be re-validated.
+        private readonly Cached combinedObjCache = new Cached();
 
         public ScrollingHitObjectContainer()
         {
@@ -46,7 +52,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             base.Clear(disposeChildren);
 
-            invalidHitObjects.Clear();
+            combinedObjCache.Invalidate();
+            hitObjectInitialStateCache.Clear();
         }
 
         /// <summary>
@@ -143,18 +150,17 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         /// <summary>
         /// Invalidate the cache of the layout of this hit object.
-        /// A hit object should be invalidated after all its nested hit objects are invalidated.
         /// </summary>
         public void InvalidateDrawableHitObject(DrawableHitObject drawableObject)
         {
-            invalidHitObjects.Add(drawableObject);
+            if (hitObjectInitialStateCache.TryGetValue(drawableObject, out var state))
+                state.Cache.Invalidate();
 
-            // Remove children as nested hit objects will be recursively updated.
-            foreach (var nested in drawableObject.NestedHitObjects)
-                invalidHitObjects.Remove(nested);
+            combinedObjCache.Invalidate();
         }
 
-        private float scrollLength;
+        // Use a nonzero value to prevent infinite results
+        private float scrollLength = 1;
 
         protected override void Update()
         {
@@ -162,11 +168,17 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (!layoutCache.IsValid)
             {
-                foreach (var obj in Objects)
-                    invalidHitObjects.Add(obj);
+                foreach (var state in hitObjectInitialStateCache.Values)
+                    state.Cache.Invalidate();
+                combinedObjCache.Invalidate();
 
                 scrollingInfo.Algorithm.Reset();
 
+                layoutCache.Validate();
+            }
+
+            if (!combinedObjCache.IsValid)
+            {
                 switch (direction.Value)
                 {
                     case ScrollingDirection.Up:
@@ -179,16 +191,24 @@ namespace osu.Game.Rulesets.UI.Scrolling
                         break;
                 }
 
-                layoutCache.Validate();
-            }
+                foreach (var obj in Objects)
+                {
+                    if (!hitObjectInitialStateCache.TryGetValue(obj, out var state))
+                        state = hitObjectInitialStateCache[obj] = new InitialState(new Cached());
 
-            foreach (var obj in invalidHitObjects)
-            {
-                computeInitialStateRecursive(obj);
-                computeLifetimeStartRecursive(obj);
-            }
+                    if (state.Cache.IsValid)
+                        continue;
 
-            invalidHitObjects.Clear();
+                    state.ScheduledComputation?.Cancel();
+                    state.ScheduledComputation = computeInitialStateRecursive(obj);
+
+                    computeLifetimeStartRecursive(obj);
+
+                    state.Cache.Validate();
+                }
+
+                combinedObjCache.Validate();
+            }
         }
 
         private void computeLifetimeStartRecursive(DrawableHitObject hitObject)
@@ -227,7 +247,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
             return scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
         }
 
-        private void computeInitialStateRecursive(DrawableHitObject hitObject)
+        private ScheduledDelegate computeInitialStateRecursive(DrawableHitObject hitObject) => hitObject.Schedule(() =>
         {
             if (hitObject.HitObject is IHasDuration e)
             {
@@ -252,7 +272,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 // Nested hitobjects don't need to scroll, but they do need accurate positions
                 updatePosition(obj, hitObject.HitObject.StartTime);
             }
-        }
+        });
 
         protected override void UpdateAfterChildrenLife()
         {
@@ -284,5 +304,19 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
         }
+
+        private class InitialState
+        {
+            [NotNull]
+            public readonly Cached Cache;
+
+            [CanBeNull]
+            public ScheduledDelegate ScheduledComputation;
+
+            public InitialState(Cached cache)
+            {
+                Cache = cache;
+            }
+        }
     }
 }

From ec92545d7a4a2270d90682a3108c1936164d8e45 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 14:13:57 +0900
Subject: [PATCH 06430/10326] fix indent

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index ff3d152090..cebe0394c7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -445,7 +445,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             private readonly Container<DrawableHitObject> container;
 
             public DrawableTestParentHitObject([CanBeNull] TestHitObject hitObject)
-            : base(hitObject)
+                : base(hitObject)
             {
                 InternalChildren[0].Colour = Color4.LightYellow;
                 InternalChildren[1].Colour = Color4.Yellow;

From ce57e8ddfb883e16dc99bfea54145c48b22a71a7 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 16:06:01 +0900
Subject: [PATCH 06431/10326] Separate Lifetime computation and layout update

---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 92 ++++++-------------
 1 file changed, 30 insertions(+), 62 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 802204900b..1845094c44 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -2,13 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Layout;
-using osu.Framework.Threading;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -19,7 +16,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
     {
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-        private readonly Dictionary<DrawableHitObject, InitialState> hitObjectInitialStateCache = new Dictionary<DrawableHitObject, InitialState>();
+
+        // If a hit object is not in this set, the position and the size should be updated when the hit object becomes alive.
+        private readonly HashSet<DrawableHitObject> layoutComputedHitObjects = new HashSet<DrawableHitObject>();
+
+        // Used to recompute all lifetime when `layoutCache` becomes invalid
+        private readonly HashSet<DrawableHitObject> lifetimeComputedHitObjects = new HashSet<DrawableHitObject>();
 
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
@@ -27,10 +29,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
         // Responds to changes in the layout. When the layout changes, all hit object states must be recomputed.
         private readonly LayoutValue layoutCache = new LayoutValue(Invalidation.RequiredParentSizeToFit | Invalidation.DrawInfo);
 
-        // A combined cache across all hit object states to reduce per-update iterations.
-        // When invalidated, one or more (but not necessarily all) hitobject states must be re-validated.
-        private readonly Cached combinedObjCache = new Cached();
-
         public ScrollingHitObjectContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -52,8 +50,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             base.Clear(disposeChildren);
 
-            combinedObjCache.Invalidate();
-            hitObjectInitialStateCache.Clear();
+            layoutComputedHitObjects.Clear();
         }
 
         /// <summary>
@@ -150,13 +147,15 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         /// <summary>
         /// Invalidate the cache of the layout of this hit object.
+        /// A hit object should be invalidated after all its nested hit objects are invalidated.
         /// </summary>
-        public void InvalidateDrawableHitObject(DrawableHitObject drawableObject)
+        public void InvalidateDrawableHitObject(DrawableHitObject hitObject)
         {
-            if (hitObjectInitialStateCache.TryGetValue(drawableObject, out var state))
-                state.Cache.Invalidate();
+            // lifetime is computed before update
+            hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
 
-            combinedObjCache.Invalidate();
+            lifetimeComputedHitObjects.Add(hitObject);
+            layoutComputedHitObjects.Remove(hitObject);
         }
 
         // Use a nonzero value to prevent infinite results
@@ -168,17 +167,14 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (!layoutCache.IsValid)
             {
-                foreach (var state in hitObjectInitialStateCache.Values)
-                    state.Cache.Invalidate();
-                combinedObjCache.Invalidate();
+                // this.Objects cannot be used as it doesn't contain nested objects
+                foreach (var hitObject in lifetimeComputedHitObjects)
+                    hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
+
+                layoutComputedHitObjects.Clear();
 
                 scrollingInfo.Algorithm.Reset();
 
-                layoutCache.Validate();
-            }
-
-            if (!combinedObjCache.IsValid)
-            {
                 switch (direction.Value)
                 {
                     case ScrollingDirection.Up:
@@ -191,32 +187,18 @@ namespace osu.Game.Rulesets.UI.Scrolling
                         break;
                 }
 
-                foreach (var obj in Objects)
-                {
-                    if (!hitObjectInitialStateCache.TryGetValue(obj, out var state))
-                        state = hitObjectInitialStateCache[obj] = new InitialState(new Cached());
-
-                    if (state.Cache.IsValid)
-                        continue;
-
-                    state.ScheduledComputation?.Cancel();
-                    state.ScheduledComputation = computeInitialStateRecursive(obj);
-
-                    computeLifetimeStartRecursive(obj);
-
-                    state.Cache.Validate();
-                }
-
-                combinedObjCache.Validate();
+                layoutCache.Validate();
             }
-        }
 
-        private void computeLifetimeStartRecursive(DrawableHitObject hitObject)
-        {
-            hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
+            foreach (var obj in AliveObjects)
+            {
+                if (layoutComputedHitObjects.Contains(obj))
+                    continue;
 
-            foreach (var obj in hitObject.NestedHitObjects)
-                computeLifetimeStartRecursive(obj);
+                updateLayoutRecursive(obj);
+
+                layoutComputedHitObjects.Add(obj);
+            }
         }
 
         private double computeOriginAdjustedLifetimeStart(DrawableHitObject hitObject)
@@ -247,7 +229,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
             return scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
         }
 
-        private ScheduledDelegate computeInitialStateRecursive(DrawableHitObject hitObject) => hitObject.Schedule(() =>
+        private void updateLayoutRecursive(DrawableHitObject hitObject)
         {
             if (hitObject.HitObject is IHasDuration e)
             {
@@ -267,12 +249,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             foreach (var obj in hitObject.NestedHitObjects)
             {
-                computeInitialStateRecursive(obj);
+                updateLayoutRecursive(obj);
 
                 // Nested hitobjects don't need to scroll, but they do need accurate positions
                 updatePosition(obj, hitObject.HitObject.StartTime);
             }
-        });
+        }
 
         protected override void UpdateAfterChildrenLife()
         {
@@ -304,19 +286,5 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
         }
-
-        private class InitialState
-        {
-            [NotNull]
-            public readonly Cached Cache;
-
-            [CanBeNull]
-            public ScheduledDelegate ScheduledComputation;
-
-            public InitialState(Cached cache)
-            {
-                Cache = cache;
-            }
-        }
     }
 }

From d5f082e5fb2cfa609d4e9f384d29812229c0914b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 16:25:22 +0900
Subject: [PATCH 06432/10326] Comment about lifetime assumption

---
 .../Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 1845094c44..e750727764 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -147,11 +147,13 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         /// <summary>
         /// Invalidate the cache of the layout of this hit object.
-        /// A hit object should be invalidated after all its nested hit objects are invalidated.
         /// </summary>
         public void InvalidateDrawableHitObject(DrawableHitObject hitObject)
         {
-            // lifetime is computed before update
+            // Lifetime is computed once early and
+            // layout (Width/Height if `IHasDuration`, and nested object positions) will be computed when the object becomes alive.
+            // An assumption is that a hit object layout update (setting `Height` or `Width`) won't affect its lifetime.
+            // This is satisfied in practice because otherwise the hit object won't be aligned to its `StartTime`.
             hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
 
             lifetimeComputedHitObjects.Add(hitObject);

From 7f6e4d5b217ae563b64893f9e194b7e5c2733d5e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 16:46:10 +0900
Subject: [PATCH 06433/10326] Delay lifetime computation until loaded

---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index e750727764..150ed16bab 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         private readonly HashSet<DrawableHitObject> layoutComputedHitObjects = new HashSet<DrawableHitObject>();
 
         // Used to recompute all lifetime when `layoutCache` becomes invalid
-        private readonly HashSet<DrawableHitObject> lifetimeComputedHitObjects = new HashSet<DrawableHitObject>();
+        private readonly HashSet<DrawableHitObject> allHitObjects = new HashSet<DrawableHitObject>();
 
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
@@ -150,18 +150,19 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// </summary>
         public void InvalidateDrawableHitObject(DrawableHitObject hitObject)
         {
-            // Lifetime is computed once early and
-            // layout (Width/Height if `IHasDuration`, and nested object positions) will be computed when the object becomes alive.
-            // An assumption is that a hit object layout update (setting `Height` or `Width`) won't affect its lifetime.
-            // This is satisfied in practice because otherwise the hit object won't be aligned to its `StartTime`.
-            hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
+            // Lifetime computation is delayed to the next update because `scrollLength` may not be valid here.
+            // Layout computation will be delayed to when the object becomes alive.
+            // An assumption is that a hit object layout update (setting `Height` or `Width`) won't affect its lifetime but
+            // this is satisfied in practice because otherwise the hit object won't be aligned to its `StartTime`.
+
+            layoutCache.Invalidate();
+
+            allHitObjects.Add(hitObject);
 
-            lifetimeComputedHitObjects.Add(hitObject);
             layoutComputedHitObjects.Remove(hitObject);
         }
 
-        // Use a nonzero value to prevent infinite results
-        private float scrollLength = 1;
+        private float scrollLength;
 
         protected override void Update()
         {
@@ -170,7 +171,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
             if (!layoutCache.IsValid)
             {
                 // this.Objects cannot be used as it doesn't contain nested objects
-                foreach (var hitObject in lifetimeComputedHitObjects)
+                foreach (var hitObject in allHitObjects)
                     hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
 
                 layoutComputedHitObjects.Clear();

From e34a2051044d2901df39328051a4dbdadd094802 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 18:52:15 +0900
Subject: [PATCH 06434/10326] Rewrite hit object management, take three

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs    |  8 +--
 osu.Game/Rulesets/UI/Playfield.cs             |  4 +-
 .../Scrolling/ScrollingHitObjectContainer.cs  | 63 ++++++++++++-------
 .../UI/Scrolling/ScrollingPlayfield.cs        |  6 --
 4 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 5fbda305c8..b10a6efaf2 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.UI
         /// <remarks>
         /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
         /// </remarks>
-        internal event Action<HitObject> HitObjectUsageBegan;
+        internal event Action<DrawableHitObject> HitObjectUsageBegan;
 
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.UI
         /// <remarks>
         /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
         /// </remarks>
-        internal event Action<HitObject> HitObjectUsageFinished;
+        internal event Action<DrawableHitObject> HitObjectUsageFinished;
 
         /// <summary>
         /// The amount of time prior to the current time within which <see cref="HitObject"/>s should be considered alive.
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.UI
             bindStartTime(drawable);
             AddInternal(drawableMap[entry] = drawable, false);
 
-            HitObjectUsageBegan?.Invoke(entry.HitObject);
+            HitObjectUsageBegan?.Invoke(drawable);
         }
 
         private void removeDrawable(HitObjectLifetimeEntry entry)
@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.UI
             unbindStartTime(drawable);
             RemoveInternal(drawable);
 
-            HitObjectUsageFinished?.Invoke(entry.HitObject);
+            HitObjectUsageFinished?.Invoke(drawable);
         }
 
         #endregion
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 82ec653f31..e27ab7fda5 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -91,8 +91,8 @@ namespace osu.Game.Rulesets.UI
             {
                 h.NewResult += (d, r) => NewResult?.Invoke(d, r);
                 h.RevertResult += (d, r) => RevertResult?.Invoke(d, r);
-                h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
-                h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
+                h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o.HitObject);
+                h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o.HitObject);
             }));
         }
 
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 150ed16bab..c8afe76f19 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -17,11 +17,16 @@ namespace osu.Game.Rulesets.UI.Scrolling
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-        // If a hit object is not in this set, the position and the size should be updated when the hit object becomes alive.
-        private readonly HashSet<DrawableHitObject> layoutComputedHitObjects = new HashSet<DrawableHitObject>();
+        // Tracks all `DrawableHitObject` (nested or not) applied a `HitObject`.
+        // It dynamically changes based on approximate lifetime when a pooling is used.
+        private readonly HashSet<DrawableHitObject> hitObjectApplied = new HashSet<DrawableHitObject>();
 
-        // Used to recompute all lifetime when `layoutCache` becomes invalid
-        private readonly HashSet<DrawableHitObject> allHitObjects = new HashSet<DrawableHitObject>();
+        // The lifetime of a hit object in this will be computed in next update.
+        private readonly HashSet<DrawableHitObject> toComputeLifetime = new HashSet<DrawableHitObject>();
+
+        // The layout (length if IHasDuration, and nested object positions) of a hit object *not* in this set will be computed in next updated.
+        // Only objects in `AliveObjects` are considered, to prevent a massive recomputation when scrolling speed or something changes.
+        private readonly HashSet<DrawableHitObject> layoutComputed = new HashSet<DrawableHitObject>();
 
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
@@ -34,6 +39,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
             RelativeSizeAxes = Axes.Both;
 
             AddLayout(layoutCache);
+
+            HitObjectUsageBegan += onHitObjectUsageBegin;
+            HitObjectUsageFinished += onHitObjectUsageFinished;
         }
 
         [BackgroundDependencyLoader]
@@ -50,7 +58,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             base.Clear(disposeChildren);
 
-            layoutComputedHitObjects.Clear();
+            hitObjectApplied.Clear();
+            toComputeLifetime.Clear();
+            layoutComputed.Clear();
         }
 
         /// <summary>
@@ -145,21 +155,20 @@ namespace osu.Game.Rulesets.UI.Scrolling
             }
         }
 
-        /// <summary>
-        /// Invalidate the cache of the layout of this hit object.
-        /// </summary>
-        public void InvalidateDrawableHitObject(DrawableHitObject hitObject)
+        private void onHitObjectUsageBegin(DrawableHitObject hitObject)
         {
-            // Lifetime computation is delayed to the next update because `scrollLength` may not be valid here.
-            // Layout computation will be delayed to when the object becomes alive.
-            // An assumption is that a hit object layout update (setting `Height` or `Width`) won't affect its lifetime but
-            // this is satisfied in practice because otherwise the hit object won't be aligned to its `StartTime`.
+            // Lifetime computation is delayed until next update because
+            // when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed.
+            hitObjectApplied.Add(hitObject);
+            toComputeLifetime.Add(hitObject);
+            layoutComputed.Remove(hitObject);
+        }
 
-            layoutCache.Invalidate();
-
-            allHitObjects.Add(hitObject);
-
-            layoutComputedHitObjects.Remove(hitObject);
+        private void onHitObjectUsageFinished(DrawableHitObject hitObject)
+        {
+            hitObjectApplied.Remove(hitObject);
+            toComputeLifetime.Remove(hitObject);
+            layoutComputed.Remove(hitObject);
         }
 
         private float scrollLength;
@@ -170,11 +179,10 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (!layoutCache.IsValid)
             {
-                // this.Objects cannot be used as it doesn't contain nested objects
-                foreach (var hitObject in allHitObjects)
-                    hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
+                foreach (var hitObject in hitObjectApplied)
+                    toComputeLifetime.Add(hitObject);
 
-                layoutComputedHitObjects.Clear();
+                layoutComputed.Clear();
 
                 scrollingInfo.Algorithm.Reset();
 
@@ -193,14 +201,21 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 layoutCache.Validate();
             }
 
+            foreach (var hitObject in toComputeLifetime)
+                hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
+
+            toComputeLifetime.Clear();
+
+            // An assumption is that this update won't affect lifetime,
+            // but this is satisfied in practice because otherwise the hit object won't be aligned to its `StartTime`.
             foreach (var obj in AliveObjects)
             {
-                if (layoutComputedHitObjects.Contains(obj))
+                if (layoutComputed.Contains(obj))
                     continue;
 
                 updateLayoutRecursive(obj);
 
-                layoutComputedHitObjects.Add(obj);
+                layoutComputed.Add(obj);
             }
         }
 
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 9b21a3f0a9..9dac3f4de1 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -24,12 +24,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
             Direction.BindTo(ScrollingInfo.Direction);
         }
 
-        protected override void OnNewDrawableHitObject(DrawableHitObject drawableHitObject)
-        {
-            drawableHitObject.HitObjectApplied +=
-                ((ScrollingHitObjectContainer)HitObjectContainer).InvalidateDrawableHitObject;
-        }
-
         /// <summary>
         /// Given a position in screen space, return the time within this column.
         /// </summary>

From 7ab27399bf148eda81aba3e30c7e88d3d0aa7143 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 24 Nov 2020 18:04:34 +0800
Subject: [PATCH 06435/10326] Fix CI errors

---
 osu.Game/Screens/Import/FileImportScreen.cs | 37 ++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index f53ea70f45..88dcd6623f 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -28,9 +28,7 @@ namespace osu.Game.Screens.Import
 
         public override bool HideOverlaysOnEnter => true;
 
-        private string[] fileExtensions;
         private string defaultPath;
-
         private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
         private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
         private TextFlowContainer currentFileText;
@@ -45,7 +43,7 @@ namespace osu.Game.Screens.Import
         {
             storage.GetStorageForDirectory("imports");
             var originalPath = storage.GetFullPath("imports", true);
-            fileExtensions = new string[] { ".osk", ".osr", ".osz" };
+            string[] fileExtensions = { ".osk", ".osr", ".osz" };
             defaultPath = originalPath;
 
             InternalChild = contentContainer = new Container
@@ -126,7 +124,7 @@ namespace osu.Game.Screens.Import
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
-                                            Margin = new MarginPadding { Bottom = 15, Top =15 },
+                                            Margin = new MarginPadding { Bottom = 15, Top =15 } ,
                                             Children = new Drawable[]
                                             {
                                                 new FillFlowContainer
@@ -135,21 +133,21 @@ namespace osu.Game.Screens.Import
                                                     AutoSizeAxes = Axes.Y,
                                                     Children = new Drawable[]
                                                     {
-                                                            new TriangleButton
-                                                            {
-                                                                Text = "Import",
-                                                                Anchor = Anchor.BottomCentre,
-                                                                Origin = Anchor.BottomCentre,
-                                                                RelativeSizeAxes = Axes.X,
-                                                                Height = 50,
-                                                                Width = 0.9f,
-                                                                Action = () =>
-                                                                {
-                                                                    var d = currentFile.Value?.FullName;
-                                                                    if (d != null)
-                                                                        startImport(d);
-                                                                    else
-                                                                        currentFileText.FlashColour(Color4.Red, 500);
+                                                        new TriangleButton
+                                                        {
+															Text = "Import",
+															Anchor = Anchor.BottomCentre,
+															Origin = Anchor.BottomCentre,
+															RelativeSizeAxes = Axes.X,
+															Height = 50,
+															Width = 0.9f,
+															Action = () =>
+															{
+                                                                var d = currentFile.Value?.FullName;
+                                                                if (d != null)
+                                                                    startImport(d);
+                                                                else
+                                                                    currentFileText.FlashColour(Color4.Red, 500);
                                                                 }
                                                             }
                                                     }
@@ -187,6 +185,7 @@ namespace osu.Game.Screens.Import
 
             fileSelectContainer.Add(fileSelector);
         }
+
         private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)
         {
             currentFileText.Text = v.NewValue?.Name ?? "Select a file";

From 739c18a34d20eca3b542bbe2aad8e15d793e05e8 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 24 Nov 2020 18:25:38 +0800
Subject: [PATCH 06436/10326] dotnet format

---
 osu.Game/Screens/Import/FileImportScreen.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 88dcd6623f..39fd67c4e1 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -135,14 +135,14 @@ namespace osu.Game.Screens.Import
                                                     {
                                                         new TriangleButton
                                                         {
-															Text = "Import",
-															Anchor = Anchor.BottomCentre,
-															Origin = Anchor.BottomCentre,
-															RelativeSizeAxes = Axes.X,
-															Height = 50,
-															Width = 0.9f,
-															Action = () =>
-															{
+                                                            Text = "Import",
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            RelativeSizeAxes = Axes.X,
+                                                            Height = 50,
+                                                            Width = 0.9f,
+                                                            Action = () =>
+                                                            {
                                                                 var d = currentFile.Value?.FullName;
                                                                 if (d != null)
                                                                     startImport(d);

From b8a5cd94f741f98453bdd8118e95dc40369012f4 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 19:46:57 +0900
Subject: [PATCH 06437/10326] Invoke HitObjectUsageFinished before removal

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index b10a6efaf2..fb91108605 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -129,10 +129,10 @@ namespace osu.Game.Rulesets.UI
 
             drawableMap.Remove(entry);
 
+            HitObjectUsageFinished?.Invoke(drawable);
+
             unbindStartTime(drawable);
             RemoveInternal(drawable);
-
-            HitObjectUsageFinished?.Invoke(drawable);
         }
 
         #endregion

From 916a313f1965ae52872001bd6b3e511854d3368d Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 19:13:46 +0900
Subject: [PATCH 06438/10326] Rename PalpableDrawable -> DrawablePalpable

---
 .../Objects/Drawables/DrawableCatchHitObject.cs               | 4 ++--
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs  | 2 +-
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 07f1f79243..7fbc79e4b5 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -13,11 +13,11 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public abstract class PalpableDrawableCatchHitObject : DrawableCatchHitObject
+    public abstract class DrawablePalpableCatchHitObject : DrawableCatchHitObject
     {
         protected Container ScaleContainer { get; private set; }
 
-        protected PalpableDrawableCatchHitObject(CatchHitObject hitObject)
+        protected DrawablePalpableCatchHitObject(CatchHitObject hitObject)
             : base(hitObject)
         {
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index 9db64eba6e..37a05b5d76 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -8,7 +8,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableDroplet : PalpableDrawableCatchHitObject
+    public class DrawableDroplet : DrawablePalpableCatchHitObject
     {
         public override bool StaysOnPlate => false;
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index f87c8866b1..b000a728c1 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -8,7 +8,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableFruit : PalpableDrawableCatchHitObject
+    public class DrawableFruit : DrawablePalpableCatchHitObject
     {
         public DrawableFruit(CatchHitObject h)
             : base(h)

From 4f7aa7e54187fa5b6371499b7d963862a37fb678 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 19:16:03 +0900
Subject: [PATCH 06439/10326] Move Palpable* to separate files

---
 .../Objects/CatchHitObject.cs                 |  8 ----
 .../Drawables/DrawableCatchHitObject.cs       | 37 ----------------
 .../DrawablePalpableCatchHitObject.cs         | 44 +++++++++++++++++++
 .../Objects/PalpableCatchHitObject.cs         | 13 ++++++
 4 files changed, 57 insertions(+), 45 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 5985ec9b68..21bb026bae 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -105,14 +105,6 @@ namespace osu.Game.Rulesets.Catch.Objects
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 
-    /// <summary>
-    /// Represents a single object that can be caught by the catcher.
-    /// </summary>
-    public abstract class PalpableCatchHitObject : CatchHitObject
-    {
-        public override bool CanBePlated => true;
-    }
-
     public enum FruitVisualRepresentation
     {
         Pear,
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 7fbc79e4b5..4cbc998447 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -2,49 +2,12 @@
 // 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.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
-using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public abstract class DrawablePalpableCatchHitObject : DrawableCatchHitObject
-    {
-        protected Container ScaleContainer { get; private set; }
-
-        protected DrawablePalpableCatchHitObject(CatchHitObject hitObject)
-            : base(hitObject)
-        {
-            Origin = Anchor.Centre;
-            Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
-            Masking = false;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AddRangeInternal(new Drawable[]
-            {
-                ScaleContainer = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                }
-            });
-
-            ScaleContainer.Scale = new Vector2(HitObject.Scale);
-        }
-
-        protected override Color4 GetComboColour(IReadOnlyList<Color4> comboColours) =>
-            comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
-    }
-
     public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
     {
         protected override double InitialLifetimeOffset => HitObject.TimePreempt;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
new file mode 100644
index 0000000000..3e843d60c1
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.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 System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    public abstract class DrawablePalpableCatchHitObject : DrawableCatchHitObject
+    {
+        protected Container ScaleContainer { get; private set; }
+
+        protected DrawablePalpableCatchHitObject(CatchHitObject hitObject)
+            : base(hitObject)
+        {
+            Origin = Anchor.Centre;
+            Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
+            Masking = false;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRangeInternal(new Drawable[]
+            {
+                ScaleContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                }
+            });
+
+            ScaleContainer.Scale = new Vector2(HitObject.Scale);
+        }
+
+        protected override Color4 GetComboColour(IReadOnlyList<Color4> comboColours) =>
+            comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
new file mode 100644
index 0000000000..3a0cbe3ecd
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.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.
+
+namespace osu.Game.Rulesets.Catch.Objects
+{
+    /// <summary>
+    /// Represents a single object that can be caught by the catcher.
+    /// </summary>
+    public abstract class PalpableCatchHitObject : CatchHitObject
+    {
+        public override bool CanBePlated => true;
+    }
+}

From 0009724c1a36914287df4c7b835078101b85520c Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 24 Nov 2020 18:48:32 +0800
Subject: [PATCH 06440/10326] Fix CI

---
 osu.Game/Screens/Import/FileImportScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 39fd67c4e1..a59688a2a9 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Screens.Import
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
-                                            Margin = new MarginPadding { Bottom = 15, Top =15 } ,
+                                            Margin = new MarginPadding { Bottom = 15, Top = 15 },
                                             Children = new Drawable[]
                                             {
                                                 new FillFlowContainer
@@ -148,8 +148,8 @@ namespace osu.Game.Screens.Import
                                                                     startImport(d);
                                                                 else
                                                                     currentFileText.FlashColour(Color4.Red, 500);
-                                                                }
                                                             }
+                                                        }
                                                     }
                                                 }
                                             }

From ab7251d742ec03ae9a9feb082ae2867209e0b955 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 24 Nov 2020 19:57:37 +0900
Subject: [PATCH 06441/10326] Move members to `PalpableCatchHitObject`

---
 .../TestSceneFruitObjects.cs                  |  2 +-
 .../Beatmaps/CatchBeatmapProcessor.cs         | 22 ++++++++--------
 .../Preprocessing/CatchDifficultyHitObject.cs |  4 +--
 .../Objects/CatchHitObject.cs                 | 22 ----------------
 .../Drawables/DrawableCatchHitObject.cs       |  2 --
 .../Objects/Drawables/DrawableFruit.cs        |  2 ++
 .../DrawablePalpableCatchHitObject.cs         | 26 +++++++++----------
 .../Objects/Drawables/DropletPiece.cs         |  2 +-
 .../Objects/Drawables/FruitPiece.cs           |  4 +--
 .../Objects/PalpableCatchHitObject.cs         | 20 +++++++++++++-
 .../Replays/CatchAutoGenerator.cs             | 17 ++++--------
 .../Skinning/LegacyFruitPiece.cs              |  3 ++-
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |  6 ++---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     | 12 ++++-----
 14 files changed, 66 insertions(+), 78 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 89063319d6..e8ecd2ca1b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             hitObject.Scale = 1.5f;
 
             if (hyperdash)
-                hitObject.HyperDashTarget = new Banana();
+                ((PalpableCatchHitObject)hitObject).HyperDashTarget = new Banana();
 
             d.Anchor = Anchor.Centre;
             d.RelativePositionAxes = Axes.None;
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index a08c5b6fb1..00ce9ea8c2 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -5,11 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.MathUtils;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Catch.MathUtils;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Catch.Beatmaps
 {
@@ -192,24 +192,24 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
         private static void initialiseHyperDash(IBeatmap beatmap)
         {
-            List<CatchHitObject> objectWithDroplets = new List<CatchHitObject>();
+            List<PalpableCatchHitObject> palpableObjects = new List<PalpableCatchHitObject>();
 
             foreach (var currentObject in beatmap.HitObjects)
             {
                 if (currentObject is Fruit fruitObject)
-                    objectWithDroplets.Add(fruitObject);
+                    palpableObjects.Add(fruitObject);
 
                 if (currentObject is JuiceStream)
                 {
-                    foreach (var currentJuiceElement in currentObject.NestedHitObjects)
+                    foreach (var juice in currentObject.NestedHitObjects)
                     {
-                        if (!(currentJuiceElement is TinyDroplet))
-                            objectWithDroplets.Add((CatchHitObject)currentJuiceElement);
+                        if (juice is PalpableCatchHitObject palpableObject && !(juice is TinyDroplet))
+                            palpableObjects.Add(palpableObject);
                     }
                 }
             }
 
-            objectWithDroplets.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime));
+            palpableObjects.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime));
 
             double halfCatcherWidth = Catcher.CalculateCatchWidth(beatmap.BeatmapInfo.BaseDifficulty) / 2;
 
@@ -221,10 +221,10 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             int lastDirection = 0;
             double lastExcess = halfCatcherWidth;
 
-            for (int i = 0; i < objectWithDroplets.Count - 1; i++)
+            for (int i = 0; i < palpableObjects.Count - 1; i++)
             {
-                CatchHitObject currentObject = objectWithDroplets[i];
-                CatchHitObject nextObject = objectWithDroplets[i + 1];
+                var currentObject = palpableObjects[i];
+                var nextObject = palpableObjects[i + 1];
 
                 // Reset variables in-case values have changed (e.g. after applying HR)
                 currentObject.HyperDashTarget = null;
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
index 3e21b8fbaf..dcd410e08f 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
@@ -12,9 +12,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
     {
         private const float normalized_hitobject_radius = 41.0f;
 
-        public new CatchHitObject BaseObject => (CatchHitObject)base.BaseObject;
+        public new PalpableCatchHitObject BaseObject => (PalpableCatchHitObject)base.BaseObject;
 
-        public new CatchHitObject LastObject => (CatchHitObject)base.LastObject;
+        public new PalpableCatchHitObject LastObject => (PalpableCatchHitObject)base.LastObject;
 
         public readonly float NormalizedPosition;
         public readonly float LastNormalizedPosition;
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 21bb026bae..ccd2422381 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -27,11 +27,6 @@ namespace osu.Game.Rulesets.Catch.Objects
             set => x = value;
         }
 
-        /// <summary>
-        /// Whether this object can be placed on the catcher's plate.
-        /// </summary>
-        public virtual bool CanBePlated => false;
-
         /// <summary>
         /// A random offset applied to <see cref="X"/>, set by the <see cref="CatchBeatmapProcessor"/>.
         /// </summary>
@@ -63,13 +58,6 @@ namespace osu.Game.Rulesets.Catch.Objects
             set => ComboIndexBindable.Value = value;
         }
 
-        /// <summary>
-        /// Difference between the distance to the next object
-        /// and the distance that would have triggered a hyper dash.
-        /// A value close to 0 indicates a difficult jump (for difficulty calculation).
-        /// </summary>
-        public float DistanceToHyperDash { get; set; }
-
         public Bindable<bool> LastInComboBindable { get; } = new Bindable<bool>();
 
         /// <summary>
@@ -83,16 +71,6 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public float Scale { get; set; } = 1;
 
-        /// <summary>
-        /// Whether this fruit can initiate a hyperdash.
-        /// </summary>
-        public bool HyperDash => HyperDashTarget != null;
-
-        /// <summary>
-        /// The target fruit if we are to initiate a hyperdash.
-        /// </summary>
-        public CatchHitObject HyperDashTarget;
-
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 4cbc998447..f9f534f9ab 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -12,8 +12,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
     {
         protected override double InitialLifetimeOffset => HitObject.TimePreempt;
 
-        public virtual bool StaysOnPlate => HitObject.CanBePlated;
-
         public float DisplayRadius => DrawSize.X / 2 * Scale.X * HitObject.Scale;
 
         protected override float SamplePlaybackPosition => HitObject.X / CatchPlayfield.WIDTH;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index b000a728c1..a2fa79965f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -10,6 +10,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableFruit : DrawablePalpableCatchHitObject
     {
+        public override bool StaysOnPlate => true;
+
         public DrawableFruit(CatchHitObject h)
             : base(h)
         {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 3e843d60c1..539dbb52d1 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -12,29 +12,27 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public abstract class DrawablePalpableCatchHitObject : DrawableCatchHitObject
     {
-        protected Container ScaleContainer { get; private set; }
+        public virtual bool StaysOnPlate => true;
 
-        protected DrawablePalpableCatchHitObject(CatchHitObject hitObject)
-            : base(hitObject)
+        protected readonly Container ScaleContainer;
+
+        protected DrawablePalpableCatchHitObject(CatchHitObject h)
+            : base(h)
         {
             Origin = Anchor.Centre;
             Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
-            Masking = false;
+
+            AddInternal(ScaleContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+            });
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddRangeInternal(new Drawable[]
-            {
-                ScaleContainer = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                }
-            });
-
             ScaleContainer.Scale = new Vector2(HitObject.Scale);
         }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
index c2499446fa..61e6187611 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         private void load(DrawableHitObject drawableObject)
         {
             DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
-            var hitObject = drawableCatchObject.HitObject;
+            var hitObject = (PalpableCatchHitObject)drawableCatchObject.HitObject;
 
             InternalChild = new Pulp
             {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
index 4bffdab3d8..b14e37d138 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         public const float RADIUS_ADJUST = 1.1f;
 
         private Circle border;
-        private CatchHitObject hitObject;
+        private PalpableCatchHitObject hitObject;
 
         public FruitPiece()
         {
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         private void load(DrawableHitObject drawableObject)
         {
             DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
-            hitObject = drawableCatchObject.HitObject;
+            hitObject = (PalpableCatchHitObject)drawableCatchObject.HitObject;
 
             AddRangeInternal(new[]
             {
diff --git a/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
index 3a0cbe3ecd..5e35b9ea12 100644
--- a/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
@@ -5,9 +5,27 @@ namespace osu.Game.Rulesets.Catch.Objects
 {
     /// <summary>
     /// Represents a single object that can be caught by the catcher.
+    /// This includes normal fruits, droplets, and bananas but excludes objects that acts only as a container of nested hit objects.
     /// </summary>
     public abstract class PalpableCatchHitObject : CatchHitObject
     {
-        public override bool CanBePlated => true;
+        /// <summary>
+        /// Difference between the distance to the next object
+        /// and the distance that would have triggered a hyper dash.
+        /// A value close to 0 indicates a difficult jump (for difficulty calculation).
+        /// </summary>
+        public float DistanceToHyperDash { get; set; }
+
+        /// <summary>
+        /// Whether this fruit can initiate a hyperdash.
+        /// </summary>
+        public bool HyperDash => HyperDashTarget != null;
+
+        /// <summary>
+        /// The target fruit if we are to initiate a hyperdash.
+        /// </summary>
+        public CatchHitObject HyperDashTarget;
+
+        public virtual bool StaysOnPlate => true;
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index a4f54bfe82..dfc81ee8d9 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Catch.Replays
             float lastPosition = CatchPlayfield.CENTER_X;
             double lastTime = 0;
 
-            void moveToNext(CatchHitObject h)
+            void moveToNext(PalpableCatchHitObject h)
             {
                 float positionChange = Math.Abs(lastPosition - h.X);
                 double timeAvailable = h.StartTime - lastTime;
@@ -101,23 +101,16 @@ namespace osu.Game.Rulesets.Catch.Replays
 
             foreach (var obj in Beatmap.HitObjects)
             {
-                switch (obj)
+                if (obj is PalpableCatchHitObject palpableObject)
                 {
-                    case Fruit _:
-                        moveToNext(obj);
-                        break;
+                    moveToNext(palpableObject);
                 }
 
                 foreach (var nestedObj in obj.NestedHitObjects.Cast<CatchHitObject>())
                 {
-                    switch (nestedObj)
+                    if (nestedObj is PalpableCatchHitObject palpableNestedObject)
                     {
-                        case Banana _:
-                        case TinyDroplet _:
-                        case Droplet _:
-                        case Fruit _:
-                            moveToNext(nestedObj);
-                            break;
+                        moveToNext(palpableNestedObject);
                     }
                 }
             }
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 381d066750..00ab20152a 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -6,6 +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;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -51,7 +52,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 },
             };
 
-            if (drawableCatchObject.HitObject.HyperDash)
+            if (((PalpableCatchHitObject)drawableCatchObject.HitObject).HyperDash)
             {
                 var hyperDash = new Sprite
                 {
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index a221ca7966..0f0b9df76e 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -220,11 +220,11 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// Let the catcher attempt to catch a fruit.
         /// </summary>
-        /// <param name="fruit">The fruit to catch.</param>
+        /// <param name="hitObject">The fruit to catch.</param>
         /// <returns>Whether the catch is possible.</returns>
-        public bool AttemptCatch(CatchHitObject fruit)
+        public bool AttemptCatch(CatchHitObject hitObject)
         {
-            if (!fruit.CanBePlated)
+            if (!(hitObject is PalpableCatchHitObject fruit))
                 return false;
 
             var halfCatchWidth = catchWidth * 0.5f;
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 5e794a76aa..70739673a9 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.UI
             };
         }
 
-        public void OnNewResult(DrawableCatchHitObject fruit, JudgementResult result)
+        public void OnNewResult(DrawableCatchHitObject hitObject, JudgementResult result)
         {
             if (!result.Type.IsScorable())
                 return;
@@ -69,15 +69,15 @@ namespace osu.Game.Rulesets.Catch.UI
                     lastPlateableFruit.OnLoadComplete += _ => action();
             }
 
-            if (result.IsHit && fruit.HitObject.CanBePlated)
+            if (result.IsHit && hitObject.HitObject is PalpableCatchHitObject fruit)
             {
                 // create a new (cloned) fruit to stay on the plate. the original is faded out immediately.
-                var caughtFruit = (DrawableCatchHitObject)CreateDrawableRepresentation?.Invoke(fruit.HitObject);
+                var caughtFruit = (DrawableCatchHitObject)CreateDrawableRepresentation?.Invoke(fruit);
 
                 if (caughtFruit == null) return;
 
                 caughtFruit.RelativePositionAxes = Axes.None;
-                caughtFruit.Position = new Vector2(MovableCatcher.ToLocalSpace(fruit.ScreenSpaceDrawQuad.Centre).X - MovableCatcher.DrawSize.X / 2, 0);
+                caughtFruit.Position = new Vector2(MovableCatcher.ToLocalSpace(hitObject.ScreenSpaceDrawQuad.Centre).X - MovableCatcher.DrawSize.X / 2, 0);
                 caughtFruit.IsOnPlate = true;
 
                 caughtFruit.Anchor = Anchor.TopCentre;
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     runAfterLoaded(() => MovableCatcher.Explode(caughtFruit));
             }
 
-            if (fruit.HitObject.LastInCombo)
+            if (hitObject.HitObject.LastInCombo)
             {
                 if (result.Judgement is CatchJudgement catchJudgement && catchJudgement.ShouldExplodeFor(result))
                     runAfterLoaded(() => MovableCatcher.Explode());
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     MovableCatcher.Drop();
             }
 
-            comboDisplay.OnNewResult(fruit, result);
+            comboDisplay.OnNewResult(hitObject, result);
         }
 
         public void OnRevertResult(DrawableCatchHitObject fruit, JudgementResult result)

From 3c3229ac4b262ec4856d8ae0c43ed561f2b77a6a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 25 Nov 2020 07:59:45 +0900
Subject: [PATCH 06442/10326] Remove redundant `StaysOnPlate`

---
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs | 2 --
 osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs  | 4 +---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs                  | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index a2fa79965f..b000a728c1 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -10,8 +10,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableFruit : DrawablePalpableCatchHitObject
     {
-        public override bool StaysOnPlate => true;
-
         public DrawableFruit(CatchHitObject h)
             : base(h)
         {
diff --git a/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
index 5e35b9ea12..bdc7dcc1fe 100644
--- a/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.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.
 
 namespace osu.Game.Rulesets.Catch.Objects
@@ -25,7 +25,5 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// The target fruit if we are to initiate a hyperdash.
         /// </summary>
         public CatchHitObject HyperDashTarget;
-
-        public virtual bool StaysOnPlate => true;
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 70739673a9..ad79a23279 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -69,10 +69,10 @@ namespace osu.Game.Rulesets.Catch.UI
                     lastPlateableFruit.OnLoadComplete += _ => action();
             }
 
-            if (result.IsHit && hitObject.HitObject is PalpableCatchHitObject fruit)
+            if (result.IsHit && hitObject is DrawablePalpableCatchHitObject fruit)
             {
                 // create a new (cloned) fruit to stay on the plate. the original is faded out immediately.
-                var caughtFruit = (DrawableCatchHitObject)CreateDrawableRepresentation?.Invoke(fruit);
+                var caughtFruit = (DrawableCatchHitObject)CreateDrawableRepresentation?.Invoke(fruit.HitObject);
 
                 if (caughtFruit == null) return;
 

From 6e55eb2090c82bd8f1efce579aeebeb17eaadfe0 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 25 Nov 2020 08:00:11 +0900
Subject: [PATCH 06443/10326] Fix and add comments

---
 .../Objects/Drawables/DrawablePalpableCatchHitObject.cs       | 3 +++
 osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 539dbb52d1..c096ea2814 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -12,6 +12,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public abstract class DrawablePalpableCatchHitObject : DrawableCatchHitObject
     {
+        /// <summary>
+        /// Whether this hit object should stay on the catcher plate when the object is caught by the catcher.
+        /// </summary>
         public virtual bool StaysOnPlate => true;
 
         protected readonly Container ScaleContainer;
diff --git a/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
index bdc7dcc1fe..361b338b2c 100644
--- a/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.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.
 
 namespace osu.Game.Rulesets.Catch.Objects
 {
     /// <summary>
     /// Represents a single object that can be caught by the catcher.
-    /// This includes normal fruits, droplets, and bananas but excludes objects that acts only as a container of nested hit objects.
+    /// This includes normal fruits, droplets, and bananas but excludes objects that act only as a container of nested hit objects.
     /// </summary>
     public abstract class PalpableCatchHitObject : CatchHitObject
     {

From 323533d94574451fb801645b3f2535c89b94ed3d Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 25 Nov 2020 08:07:59 +0900
Subject: [PATCH 06444/10326] Add hiding Palpable HitObject property

---
 .../Objects/Drawables/DrawablePalpableCatchHitObject.cs     | 2 ++
 osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs   | 5 ++---
 osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs     | 6 +++---
 osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs        | 5 ++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index c096ea2814..935aad914e 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public abstract class DrawablePalpableCatchHitObject : DrawableCatchHitObject
     {
+        public new PalpableCatchHitObject HitObject => (PalpableCatchHitObject)base.HitObject;
+
         /// <summary>
         /// Whether this hit object should stay on the catcher plate when the object is caught by the catcher.
         /// </summary>
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
index 61e6187611..dd0723c744 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
@@ -22,8 +22,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableObject)
         {
-            DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
-            var hitObject = (PalpableCatchHitObject)drawableCatchObject.HitObject;
+            var drawableCatchObject = (DrawablePalpableCatchHitObject)drawableObject;
 
             InternalChild = new Pulp
             {
@@ -31,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 AccentColour = { BindTarget = drawableObject.AccentColour }
             };
 
-            if (hitObject.HyperDash)
+            if (drawableCatchObject.HitObject.HyperDash)
             {
                 AddInternal(new Container
                 {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
index b14e37d138..f98050ae91 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
@@ -30,12 +30,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableObject)
         {
-            DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
-            hitObject = (PalpableCatchHitObject)drawableCatchObject.HitObject;
+            var drawableCatchObject = (DrawablePalpableCatchHitObject)drawableObject;
+            hitObject = drawableCatchObject.HitObject;
 
             AddRangeInternal(new[]
             {
-                getFruitFor(drawableCatchObject.HitObject.VisualRepresentation),
+                getFruitFor(hitObject.VisualRepresentation),
                 border = new Circle
                 {
                     RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 00ab20152a..1494ef3888 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -32,7 +31,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableObject, ISkinSource skin)
         {
-            DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
+            var drawableCatchObject = (DrawablePalpableCatchHitObject)drawableObject;
 
             accentColour.BindTo(drawableCatchObject.AccentColour);
 
@@ -52,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 },
             };
 
-            if (((PalpableCatchHitObject)drawableCatchObject.HitObject).HyperDash)
+            if (drawableCatchObject.HitObject.HyperDash)
             {
                 var hyperDash = new Sprite
                 {

From c46d655832b6b21bc4c7c706ecbcb49d0ea6bb88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Nov 2020 12:11:44 +0900
Subject: [PATCH 06445/10326] Uncomment incorrectly commented lines

---
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 4ed3b75f2e..da9bb8a09d 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -125,8 +125,8 @@ namespace osu.Game.Rulesets.Judgements
             prepareDrawables();
 
             // undo any transforms applies in ApplyMissAnimations/ApplyHitAnimations to get a sane initial state.
-            // ApplyTransformsAt(double.MinValue, true);
-            // ClearTransforms(true);
+            ApplyTransformsAt(double.MinValue, true);
+            ClearTransforms(true);
 
             LifetimeStart = Result.TimeAbsolute;
 

From d4c6d6275e4197d81d91531d9f41e26085b8df0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Nov 2020 16:46:19 +0900
Subject: [PATCH 06446/10326] Fix volume not being adjustable in the editor
 using alt-scroll

We do this in other places so I think it's fine to handle like this for
now (until we come up with a better global solution).

Closes #10958.
---
 osu.Game/Screens/Edit/Editor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 85467d3bbb..3d5c0ddad4 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -375,6 +375,9 @@ namespace osu.Game.Screens.Edit
 
         protected override bool OnScroll(ScrollEvent e)
         {
+            if (e.ControlPressed || e.AltPressed || e.SuperPressed)
+                return false;
+
             const double precision = 1;
 
             double scrollComponent = e.ScrollDelta.X + e.ScrollDelta.Y;

From 0ddeff648d2581a64613346543ce1c5dcb202f8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Nov 2020 17:25:54 +0900
Subject: [PATCH 06447/10326] Fix incorrect index lookup on non-ordered
 selections

---
 .../Compose/Components/BlueprintContainer.cs  | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index e9f5238980..def5f396f1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -187,7 +187,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (e.Button == MouseButton.Right)
                 return false;
 
-            if (movementBlueprint != null)
+            if (movementBlueprints != null)
             {
                 isDraggingBlueprint = true;
                 changeHandler?.BeginChange();
@@ -299,7 +299,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             SelectionBlueprints.Remove(blueprint);
 
-            if (movementBlueprint == blueprint)
+            if (movementBlueprints?.Contains(blueprint) == true)
                 finishSelectionMovement();
 
             OnBlueprintRemoved(hitObject);
@@ -425,7 +425,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         #region Selection Movement
 
         private Vector2[] movementBlueprintOriginalPositions;
-        private SelectionBlueprint movementBlueprint;
+        private SelectionBlueprint[] movementBlueprints;
         private bool isDraggingBlueprint;
 
         /// <summary>
@@ -442,9 +442,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return;
 
             // Movement is tracked from the blueprint of the earliest hitobject, since it only makes sense to distance snap from that hitobject
-            var orderedSelection = SelectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime);
-            movementBlueprint = orderedSelection.First();
-            movementBlueprintOriginalPositions = orderedSelection.Select(m => m.ScreenSpaceSelectionPoint).ToArray();
+            movementBlueprints = SelectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime).ToArray();
+            movementBlueprintOriginalPositions = movementBlueprints.Select(m => m.ScreenSpaceSelectionPoint).ToArray();
         }
 
         /// <summary>
@@ -454,7 +453,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether a movement was active.</returns>
         private bool moveCurrentSelection(DragEvent e)
         {
-            if (movementBlueprint == null)
+            if (movementBlueprints == null)
                 return false;
 
             if (snapProvider == null)
@@ -474,7 +473,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 if (positionalResult.ScreenSpacePosition == testPosition) continue;
 
                 // attempt to move the objects, and abort any time based snapping if we can.
-                if (SelectionHandler.HandleMovement(new MoveSelectionEvent(SelectionHandler.SelectedBlueprints.ElementAt(i), positionalResult.ScreenSpacePosition)))
+                if (SelectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprints[i], positionalResult.ScreenSpacePosition)))
                     return true;
             }
 
@@ -488,13 +487,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
             var result = snapProvider.SnapScreenSpacePositionToValidTime(movePosition);
 
             // Move the hitobjects.
-            if (!SelectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprint, result.ScreenSpacePosition)))
+            if (!SelectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprints.First(), result.ScreenSpacePosition)))
                 return true;
 
             if (result.Time.HasValue)
             {
                 // Apply the start time at the newly snapped-to position
-                double offset = result.Time.Value - movementBlueprint.HitObject.StartTime;
+                double offset = result.Time.Value - movementBlueprints.First().HitObject.StartTime;
 
                 foreach (HitObject obj in Beatmap.SelectedHitObjects)
                 {
@@ -512,11 +511,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether a movement was active.</returns>
         private bool finishSelectionMovement()
         {
-            if (movementBlueprint == null)
+            if (movementBlueprints == null)
                 return false;
 
             movementBlueprintOriginalPositions = null;
-            movementBlueprint = null;
+            movementBlueprints = null;
 
             return true;
         }

From 740b9fb3a08bdffc40a74a1b963ac8864f7d6a75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Nov 2020 17:33:21 +0900
Subject: [PATCH 06448/10326] Update test to cover non-ordered selection

---
 .../Editor/TestSceneObjectObjectSnap.cs               | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
index d20be90001..6b532e5014 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
@@ -98,15 +98,24 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("place first object", () => InputManager.Click(MouseButton.Left));
 
+            AddStep("increment time", () => EditorClock.SeekForward(true));
+
             AddStep("move mouse right", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.2f, 0)));
             AddStep("place second object", () => InputManager.Click(MouseButton.Left));
 
+            AddStep("increment time", () => EditorClock.SeekForward(true));
+
             AddStep("move mouse down", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(0, playfield.ScreenSpaceDrawQuad.Width * 0.2f)));
             AddStep("place third object", () => InputManager.Click(MouseButton.Left));
 
             AddStep("enter selection mode", () => InputManager.Key(Key.Number1));
 
-            AddStep("select objects 2 and 3", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects.Skip(1)));
+            AddStep("select objects 2 and 3", () =>
+            {
+                // add selection backwards to test non-sequential time ordering
+                EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects[2]);
+                EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects[1]);
+            });
 
             AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
 

From c744db1b571873d05e9411c3a7fd0053fe3e2fa8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 25 Nov 2020 17:54:03 +0900
Subject: [PATCH 06449/10326] Rewind pooled DHOs into better states

---
 .../Objects/Drawables/Pieces/MainCirclePiece.cs      | 10 +++++-----
 .../Skinning/LegacyMainCirclePiece.cs                | 10 +++++-----
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs  | 12 +++++++++++-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
index bf2236c945..102166f8dd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
@@ -38,7 +38,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             };
         }
 
-        private readonly IBindable<ArmedState> state = new Bindable<ArmedState>();
         private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
         private readonly IBindable<int> indexInCurrentCombo = new Bindable<int>();
 
@@ -50,7 +49,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             var drawableOsuObject = (DrawableOsuHitObject)drawableObject;
 
-            state.BindTo(drawableObject.State);
             accentColour.BindTo(drawableObject.AccentColour);
             indexInCurrentCombo.BindTo(drawableOsuObject.IndexInCurrentComboBindable);
         }
@@ -59,7 +57,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             base.LoadComplete();
 
-            state.BindValueChanged(updateState, true);
             accentColour.BindValueChanged(colour =>
             {
                 explode.Colour = colour.NewValue;
@@ -68,15 +65,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }, true);
 
             indexInCurrentCombo.BindValueChanged(index => number.Text = (index.NewValue + 1).ToString(), true);
+
+            drawableObject.ApplyCustomUpdateState += updateState;
+            updateState(drawableObject, drawableObject.State.Value);
         }
 
-        private void updateState(ValueChangedEvent<ArmedState> state)
+        private void updateState(DrawableHitObject drawableObject, ArmedState state)
         {
             using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime, true))
             {
                 glow.FadeOut(400);
 
-                switch (state.NewValue)
+                switch (state)
                 {
                     case ArmedState.Hit:
                         const double flash_in = 40;
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 1551d1c149..21af9a479e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -38,7 +38,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private SkinnableSpriteText hitCircleText;
 
-        private readonly IBindable<ArmedState> state = new Bindable<ArmedState>();
         private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
         private readonly IBindable<int> indexInCurrentCombo = new Bindable<int>();
 
@@ -113,7 +112,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             if (overlayAboveNumber)
                 AddInternal(hitCircleOverlay.CreateProxy());
 
-            state.BindTo(drawableObject.State);
             accentColour.BindTo(drawableObject.AccentColour);
             indexInCurrentCombo.BindTo(drawableOsuObject.IndexInCurrentComboBindable);
 
@@ -137,19 +135,21 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             base.LoadComplete();
 
-            state.BindValueChanged(updateState, true);
             accentColour.BindValueChanged(colour => hitCircleSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue), true);
             if (hasNumber)
                 indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
+
+            drawableObject.ApplyCustomUpdateState += updateState;
+            updateState(drawableObject, drawableObject.State.Value);
         }
 
-        private void updateState(ValueChangedEvent<ArmedState> state)
+        private void updateState(DrawableHitObject drawableObject, ArmedState state)
         {
             const double legacy_fade_duration = 240;
 
             using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime, true))
             {
-                switch (state.NewValue)
+                switch (state)
                 {
                     case ArmedState.Hit:
                         circleSprites.FadeOut(legacy_fade_duration, Easing.Out);
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 537da24e01..4c55938e49 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -259,7 +259,17 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             // If not loaded, the state update happens in LoadComplete(). Otherwise, the update is scheduled to allow for lifetime updates.
             if (IsLoaded)
-                Schedule(() => updateState(ArmedState.Idle, true));
+            {
+                Scheduler.Add(() =>
+                {
+                    if (Result.IsHit)
+                        updateState(ArmedState.Hit, true);
+                    else if (Result.HasResult)
+                        updateState(ArmedState.Miss, true);
+                    else
+                        updateState(ArmedState.Idle, true);
+                });
+            }
 
             hasHitObjectApplied = true;
         }

From 0414e5c5502effefb56416d58d26645683179805 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 25 Nov 2020 23:38:47 +0900
Subject: [PATCH 06450/10326] Add MaximumJudgementOffset to DrawableHitObject,
 use in more places

---
 .../Objects/Drawables/DrawableHoldNoteTail.cs |  2 ++
 .../Objects/Drawables/DrawableOsuHitObject.cs |  8 -------
 .../Objects/Drawables/DrawableSpinnerTick.cs  | 12 ++++++++++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  2 ++
 .../Objects/Drawables/DrawableDrumRollTick.cs |  2 ++
 .../Objects/Drawables/DrawableHitObject.cs    | 24 +++++++++++--------
 6 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index a4029e7893..3a00933e4d 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public void UpdateResult() => base.UpdateResult(true);
 
+        protected override double MaximumJudgementOffset => base.MaximumJudgementOffset * release_window_lenience;
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             Debug.Assert(HitObject.HitWindows != null);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index a26db06ede..94bce53b12 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -11,7 +11,6 @@ using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.UI;
-using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
@@ -61,13 +60,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             PositionBindable.BindTo(HitObject.PositionBindable);
             StackHeightBindable.BindTo(HitObject.StackHeightBindable);
             ScaleBindable.BindTo(HitObject.ScaleBindable);
-
-            // Manually set to reduce the number of future alive objects to a bare minimum.
-            LifetimeStart = HitObject.StartTime - HitObject.TimePreempt;
-
-            // Arbitrary lifetime end to prevent past objects in idle states remaining alive in non-frame-stable contexts.
-            // An extra 1000ms is added to always overestimate the true lifetime, and a more exact value is set by hit transforms and the following expiry.
-            LifetimeEnd = HitObject.GetEndTime() + HitObject.HitWindows.WindowFor(HitResult.Miss) + 1000;
         }
 
         protected override void OnFree(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index fc9a7c00e6..f37d933e11 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.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.Objects.Drawables;
+
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSpinnerTick : DrawableOsuHitObject
@@ -17,6 +19,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
         }
 
+        private DrawableSpinner drawableSpinner;
+
+        protected override void OnParentReceived(DrawableHitObject parent)
+        {
+            base.OnParentReceived(parent);
+            drawableSpinner = (DrawableSpinner)parent;
+        }
+
+        protected override double MaximumJudgementOffset => drawableSpinner.HitObject.Duration;
+
         /// <summary>
         /// Apply a judgement result.
         /// </summary>
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 8ff752952c..243092d067 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -176,6 +176,8 @@ namespace osu.Game.Rulesets.Osu.UI
             public OsuHitObjectLifetimeEntry(HitObject hitObject)
                 : base(hitObject)
             {
+                // Arbitrary lifetime end to prevent past objects in idle states remaining alive in non-frame-stable contexts.
+                LifetimeEnd = HitObject.GetEndTime() + HitObject.HitWindows.WindowFor(HitResult.Miss) + 1000;
             }
 
             protected override double InitialLifetimeOffset => ((OsuHitObject)HitObject).TimePreempt;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index bf44a80037..be659f6ca5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 Filled = HitObject.FirstTick
             });
 
+        protected override double MaximumJudgementOffset => HitObject.HitWindow;
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (!userTriggered)
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 537da24e01..eeaac0d77b 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -699,6 +699,18 @@ namespace osu.Game.Rulesets.Objects.Drawables
             UpdateResult(false);
         }
 
+        /// <summary>
+        /// The maximum offset from the end time of <see cref="HitObject"/> at which this <see cref="DrawableHitObject"/> can be judged.
+        /// The time offset of <see cref="Result"/> will be clamped to this value during <see cref="ApplyResult"/>.
+        /// <para>
+        /// Defaults to the miss window of <see cref="HitObject"/>.
+        /// </para>
+        /// </summary>
+        /// <remarks>
+        /// This does not affect the time offset provided to invocations of <see cref="CheckForResult"/>.
+        /// </remarks>
+        protected virtual double MaximumJudgementOffset => HitObject.HitWindows?.WindowFor(HitResult.Miss) ?? 0;
+
         /// <summary>
         /// Applies the <see cref="Result"/> of this <see cref="DrawableHitObject"/>, notifying responders such as
         /// the <see cref="ScoreProcessor"/> of the <see cref="JudgementResult"/>.
@@ -738,14 +750,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                     $"{GetType().ReadableName()} applied an invalid hit result (was: {Result.Type}, expected: [{Result.Judgement.MinResult} ... {Result.Judgement.MaxResult}]).");
             }
 
-            // Ensure that the judgement is given a valid time offset, because this may not get set by the caller
-            var endTime = HitObject.GetEndTime();
-
-            Result.TimeOffset = Time.Current - endTime;
-
-            double missWindow = HitObject.HitWindows.WindowFor(HitResult.Miss);
-            if (missWindow > 0)
-                Result.TimeOffset = Math.Min(Result.TimeOffset, missWindow);
+            Result.TimeOffset = Math.Min(MaximumJudgementOffset, Time.Current - HitObject.GetEndTime());
 
             if (Result.HasResult)
                 updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss);
@@ -767,8 +772,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (Judged)
                 return false;
 
-            var endTime = HitObject.GetEndTime();
-            CheckForResult(userTriggered, Time.Current - endTime);
+            CheckForResult(userTriggered, Time.Current - HitObject.GetEndTime());
 
             return Judged;
         }

From 0817dae86c14d5b7d158cb9920278e46407118ac Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 26 Nov 2020 12:35:49 +0900
Subject: [PATCH 06451/10326] Add failing test to check non-pooled lifetime

---
 .../Gameplay/TestSceneDrawableScrollingRuleset.cs  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index cebe0394c7..7425c2b7c4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -46,10 +46,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUp]
         public void Setup() => Schedule(() => testClock.CurrentTime = 0);
 
-        [Test]
-        public void TestHitObjectPooling()
+        [TestCase("pooled")]
+        [TestCase("non-pooled")]
+        public void TestHitObjectLifetime(string pooled)
         {
-            var beatmap = createBeatmap(_ => new TestPooledHitObject());
+            var beatmap = createBeatmap(_ => pooled == "pooled" ? new TestPooledHitObject() : new TestHitObject());
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
             createTest(beatmap);
 
@@ -208,13 +209,13 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         /// <summary>
         /// Get a <see cref="DrawableTestHitObject" /> corresponding to the <paramref name="index"/>'th <see cref="TestHitObject"/>.
-        /// When a pooling is used and the hit object is not alive, `null` is returned.
+        /// When the hit object is not alive, `null` is returned.
         /// </summary>
         [CanBeNull]
         private DrawableTestHitObject getDrawableHitObject(int index)
         {
             var hitObject = drawableRuleset.Beatmap.HitObjects.ElementAt(index);
-            return (DrawableTestHitObject)drawableRuleset.Playfield.HitObjectContainer.Objects.FirstOrDefault(obj => obj.HitObject == hitObject);
+            return (DrawableTestHitObject)drawableRuleset.Playfield.HitObjectContainer.AliveObjects.FirstOrDefault(obj => obj.HitObject == hitObject);
         }
 
         private float yScale => drawableRuleset.Playfield.HitObjectContainer.DrawHeight;
@@ -426,6 +427,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                 });
             }
+            protected override void Update() => LifetimeEnd = HitObject.EndTime;
         }
 
         private class DrawableTestPooledHitObject : DrawableTestHitObject
@@ -436,8 +438,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                 InternalChildren[0].Colour = Color4.LightSkyBlue;
                 InternalChildren[1].Colour = Color4.Blue;
             }
-
-            protected override void Update() => LifetimeEnd = HitObject.EndTime;
         }
 
         private class DrawableTestParentHitObject : DrawableTestHitObject

From 9131546876b33e7a6cf56e18daddea2bbfca089e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 26 Nov 2020 13:04:19 +0900
Subject: [PATCH 06452/10326] Workaround TestSceneCatchModRelax failure

---
 .../Mods/TestSceneCatchModRelax.cs                          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
index 1eb0975010..c01aff0aa0 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -38,17 +38,17 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                     new Fruit
                     {
                         X = 0,
-                        StartTime = 250
+                        StartTime = 1000
                     },
                     new Fruit
                     {
                         X = CatchPlayfield.WIDTH,
-                        StartTime = 500
+                        StartTime = 2000
                     },
                     new JuiceStream
                     {
                         X = CatchPlayfield.CENTER_X,
-                        StartTime = 750,
+                        StartTime = 3000,
                         Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 })
                     }
                 }

From f6faf95e339960d83aa227d36b37e3b8fee1170e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 26 Nov 2020 14:01:46 +0900
Subject: [PATCH 06453/10326] Revert changes to HitObjectUsageBegan, not use
 it.

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs    | 10 ++++----
 osu.Game/Rulesets/UI/Playfield.cs             |  4 ++--
 .../Scrolling/ScrollingHitObjectContainer.cs  | 24 +++++--------------
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index fb91108605..5fbda305c8 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.UI
         /// <remarks>
         /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
         /// </remarks>
-        internal event Action<DrawableHitObject> HitObjectUsageBegan;
+        internal event Action<HitObject> HitObjectUsageBegan;
 
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.UI
         /// <remarks>
         /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
         /// </remarks>
-        internal event Action<DrawableHitObject> HitObjectUsageFinished;
+        internal event Action<HitObject> HitObjectUsageFinished;
 
         /// <summary>
         /// The amount of time prior to the current time within which <see cref="HitObject"/>s should be considered alive.
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.UI
             bindStartTime(drawable);
             AddInternal(drawableMap[entry] = drawable, false);
 
-            HitObjectUsageBegan?.Invoke(drawable);
+            HitObjectUsageBegan?.Invoke(entry.HitObject);
         }
 
         private void removeDrawable(HitObjectLifetimeEntry entry)
@@ -129,10 +129,10 @@ namespace osu.Game.Rulesets.UI
 
             drawableMap.Remove(entry);
 
-            HitObjectUsageFinished?.Invoke(drawable);
-
             unbindStartTime(drawable);
             RemoveInternal(drawable);
+
+            HitObjectUsageFinished?.Invoke(entry.HitObject);
         }
 
         #endregion
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 411bda77b8..2f589f4ce9 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -92,8 +92,8 @@ namespace osu.Game.Rulesets.UI
             {
                 h.NewResult += (d, r) => NewResult?.Invoke(d, r);
                 h.RevertResult += (d, r) => RevertResult?.Invoke(d, r);
-                h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o.HitObject);
-                h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o.HitObject);
+                h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
+                h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
             }));
         }
 
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index c8afe76f19..44732f490b 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -17,10 +17,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-        // Tracks all `DrawableHitObject` (nested or not) applied a `HitObject`.
-        // It dynamically changes based on approximate lifetime when a pooling is used.
-        private readonly HashSet<DrawableHitObject> hitObjectApplied = new HashSet<DrawableHitObject>();
-
         // The lifetime of a hit object in this will be computed in next update.
         private readonly HashSet<DrawableHitObject> toComputeLifetime = new HashSet<DrawableHitObject>();
 
@@ -39,9 +35,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
             RelativeSizeAxes = Axes.Both;
 
             AddLayout(layoutCache);
-
-            HitObjectUsageBegan += onHitObjectUsageBegin;
-            HitObjectUsageFinished += onHitObjectUsageFinished;
         }
 
         [BackgroundDependencyLoader]
@@ -58,7 +51,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             base.Clear(disposeChildren);
 
-            hitObjectApplied.Clear();
             toComputeLifetime.Clear();
             layoutComputed.Clear();
         }
@@ -159,18 +151,10 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             // Lifetime computation is delayed until next update because
             // when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed.
-            hitObjectApplied.Add(hitObject);
             toComputeLifetime.Add(hitObject);
             layoutComputed.Remove(hitObject);
         }
 
-        private void onHitObjectUsageFinished(DrawableHitObject hitObject)
-        {
-            hitObjectApplied.Remove(hitObject);
-            toComputeLifetime.Remove(hitObject);
-            layoutComputed.Remove(hitObject);
-        }
-
         private float scrollLength;
 
         protected override void Update()
@@ -179,8 +163,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (!layoutCache.IsValid)
             {
-                foreach (var hitObject in hitObjectApplied)
-                    toComputeLifetime.Add(hitObject);
+                toComputeLifetime.Clear();
+                foreach (var hitObject in Objects)
+                {
+                    if (hitObject.HitObject != null)
+                        toComputeLifetime.Add(hitObject);
+                }
 
                 layoutComputed.Clear();
 

From e43f9285889ab3f649418f7fe74fb40979c33772 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 26 Nov 2020 14:07:40 +0900
Subject: [PATCH 06454/10326] Use DHO.HitObjectApplied to invalidate
 computation

---
 .../UI/Scrolling/ScrollingHitObjectContainer.cs     |  5 ++++-
 .../Rulesets/UI/Scrolling/ScrollingPlayfield.cs     | 13 +++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 44732f490b..6740fcf03d 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -147,7 +147,10 @@ namespace osu.Game.Rulesets.UI.Scrolling
             }
         }
 
-        private void onHitObjectUsageBegin(DrawableHitObject hitObject)
+        /// <summary>
+        /// Make this <see cref="DrawableHitObject"/> lifetime and layout computed in next update.
+        /// </summary>
+        internal void InvalidateHitObject(DrawableHitObject hitObject)
         {
             // Lifetime computation is delayed until next update because
             // when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed.
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 9dac3f4de1..8aba896b34 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
     {
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
 
+        public new ScrollingHitObjectContainer HitObjectContainer => (ScrollingHitObjectContainer)base.HitObjectContainer;
+
         [Resolved]
         protected IScrollingInfo ScrollingInfo { get; private set; }
 
@@ -24,17 +26,20 @@ namespace osu.Game.Rulesets.UI.Scrolling
             Direction.BindTo(ScrollingInfo.Direction);
         }
 
+        protected override void OnNewDrawableHitObject(DrawableHitObject drawableHitObject)
+        {
+            drawableHitObject.HitObjectApplied += d => HitObjectContainer.InvalidateHitObject(d);
+        }
+
         /// <summary>
         /// Given a position in screen space, return the time within this column.
         /// </summary>
-        public virtual double TimeAtScreenSpacePosition(Vector2 screenSpacePosition) =>
-            ((ScrollingHitObjectContainer)HitObjectContainer).TimeAtScreenSpacePosition(screenSpacePosition);
+        public virtual double TimeAtScreenSpacePosition(Vector2 screenSpacePosition) => HitObjectContainer.TimeAtScreenSpacePosition(screenSpacePosition);
 
         /// <summary>
         /// Given a time, return the screen space position within this column.
         /// </summary>
-        public virtual Vector2 ScreenSpacePositionAtTime(double time)
-            => ((ScrollingHitObjectContainer)HitObjectContainer).ScreenSpacePositionAtTime(time);
+        public virtual Vector2 ScreenSpacePositionAtTime(double time) => HitObjectContainer.ScreenSpacePositionAtTime(time);
 
         protected sealed override HitObjectContainer CreateHitObjectContainer() => new ScrollingHitObjectContainer();
     }

From eae33fe74a56e7d8d8b8f7dce7b29172e57de8ce Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 26 Nov 2020 14:16:33 +0900
Subject: [PATCH 06455/10326] Fix format

---
 .../Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs         | 1 +
 osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 7425c2b7c4..257ae10d82 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -427,6 +427,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                 });
             }
+
             protected override void Update() => LifetimeEnd = HitObject.EndTime;
         }
 
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 6740fcf03d..02ee39e1b8 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -167,6 +167,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
             if (!layoutCache.IsValid)
             {
                 toComputeLifetime.Clear();
+
                 foreach (var hitObject in Objects)
                 {
                     if (hitObject.HitObject != null)

From 8a73b335f3b59bf84e2b71c7d82ba673a4e78375 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 26 Nov 2020 14:26:38 +0900
Subject: [PATCH 06456/10326] Move catch piece files

---
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs   | 1 +
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs     | 1 +
 .../Objects/Drawables/{ => Pieces}/BananaPiece.cs              | 3 +--
 .../Objects/Drawables/{ => Pieces}/DropletPiece.cs             | 3 +--
 .../Objects/Drawables/{ => Pieces}/FruitPiece.cs               | 2 +-
 .../Objects/Drawables/{ => Pieces}/GrapePiece.cs               | 3 +--
 .../Objects/Drawables/{ => Pieces}/PearPiece.cs                | 3 +--
 .../Objects/Drawables/{ => Pieces}/PineapplePiece.cs           | 3 +--
 .../Objects/Drawables/{ => Pieces}/PulpFormation.cs            | 2 +-
 .../Objects/Drawables/{ => Pieces}/RaspberryPiece.cs           | 3 +--
 10 files changed, 10 insertions(+), 14 deletions(-)
 rename osu.Game.Rulesets.Catch/Objects/Drawables/{ => Pieces}/BananaPiece.cs (88%)
 rename osu.Game.Rulesets.Catch/Objects/Drawables/{ => Pieces}/DropletPiece.cs (95%)
 rename osu.Game.Rulesets.Catch/Objects/Drawables/{ => Pieces}/FruitPiece.cs (98%)
 rename osu.Game.Rulesets.Catch/Objects/Drawables/{ => Pieces}/GrapePiece.cs (92%)
 rename osu.Game.Rulesets.Catch/Objects/Drawables/{ => Pieces}/PearPiece.cs (92%)
 rename osu.Game.Rulesets.Catch/Objects/Drawables/{ => Pieces}/PineapplePiece.cs (93%)
 rename osu.Game.Rulesets.Catch/Objects/Drawables/{ => Pieces}/PulpFormation.cs (96%)
 rename osu.Game.Rulesets.Catch/Objects/Drawables/{ => Pieces}/RaspberryPiece.cs (93%)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index 37a05b5d76..74cd240aa3 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index b000a728c1..96e24bf76c 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Utils;
+using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/BananaPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs
similarity index 88%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/BananaPiece.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs
index ebb0bf0f2c..fa8837dec5 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/BananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs
@@ -2,10 +2,9 @@
 // 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
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     public class BananaPiece : PulpFormation
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
similarity index 95%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
index dd0723c744..6de3167958 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
@@ -5,12 +5,11 @@ using osu.Framework.Allocation;
 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.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     public class DropletPiece : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
similarity index 98%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
index f98050ae91..632c8e6f3a 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     internal class FruitPiece : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/GrapePiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/GrapePiece.cs
similarity index 92%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/GrapePiece.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/GrapePiece.cs
index 1d1faf893b..15349c18d5 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/GrapePiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/GrapePiece.cs
@@ -2,10 +2,9 @@
 // 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
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     public class GrapePiece : PulpFormation
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/PearPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PearPiece.cs
similarity index 92%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/PearPiece.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PearPiece.cs
index 7f14217cda..3372a06996 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/PearPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PearPiece.cs
@@ -2,10 +2,9 @@
 // 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
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     public class PearPiece : PulpFormation
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/PineapplePiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PineapplePiece.cs
similarity index 93%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/PineapplePiece.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PineapplePiece.cs
index c328ba1837..7f80c58178 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/PineapplePiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PineapplePiece.cs
@@ -2,10 +2,9 @@
 // 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
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     public class PineapplePiece : PulpFormation
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/PulpFormation.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PulpFormation.cs
similarity index 96%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/PulpFormation.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PulpFormation.cs
index be70c3400c..1df548e70a 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/PulpFormation.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PulpFormation.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     public abstract class PulpFormation : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/RaspberryPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/RaspberryPiece.cs
similarity index 93%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/RaspberryPiece.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/RaspberryPiece.cs
index 22ce3ba5b3..288ece95b2 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/RaspberryPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/RaspberryPiece.cs
@@ -2,10 +2,9 @@
 // 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
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     public class RaspberryPiece : PulpFormation
     {

From cafe8cf7fad552ed741afacd751f39147ee2da51 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 26 Nov 2020 14:36:42 +0900
Subject: [PATCH 06457/10326] Refactor border of fruits to classes

---
 .../Objects/Drawables/Pieces/BorderPiece.cs   | 31 +++++++++++++
 .../Objects/Drawables/Pieces/DropletPiece.cs  | 33 +-------------
 .../Objects/Drawables/Pieces/FruitPiece.cs    | 43 ++-----------------
 .../Drawables/Pieces/HyperBorderPiece.cs      | 22 ++++++++++
 .../Pieces/HyperDropletBorderPiece.cs         | 14 ++++++
 5 files changed, 71 insertions(+), 72 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BorderPiece.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperBorderPiece.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperDropletBorderPiece.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BorderPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BorderPiece.cs
new file mode 100644
index 0000000000..1e7a0b0685
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BorderPiece.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.Framework.Graphics.Shapes;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+{
+    public class BorderPiece : Circle
+    {
+        public BorderPiece()
+        {
+            Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+            BorderColour = Color4.White;
+            BorderThickness = 6f * FruitPiece.RADIUS_ADJUST;
+
+            // Border is drawn only when there is a child drawable.
+            Child = new Box
+            {
+                AlwaysPresent = true,
+                Alpha = 0,
+                RelativeSizeAxes = Axes.Both,
+            };
+        }
+    }
+}
+
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
index 6de3167958..bcef30fda8 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
@@ -4,8 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
@@ -31,36 +29,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 
             if (drawableCatchObject.HitObject.HyperDash)
             {
-                AddInternal(new Container
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(2f),
-                    Depth = 1,
-                    Children = new Drawable[]
-                    {
-                        new Circle
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            BorderColour = Catcher.DEFAULT_HYPER_DASH_COLOUR,
-                            BorderThickness = 6,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    AlwaysPresent = true,
-                                    Alpha = 0.3f,
-                                    Blending = BlendingParameters.Additive,
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR,
-                                }
-                            }
-                        }
-                    }
-                });
+                AddInternal(new HyperDropletBorderPiece());
             }
         }
     }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
index 632c8e6f3a..208c9f8316 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
@@ -5,10 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
@@ -19,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
         /// </summary>
         public const float RADIUS_ADJUST = 1.1f;
 
-        private Circle border;
+        private BorderPiece border;
         private PalpableCatchHitObject hitObject;
 
         public FruitPiece()
@@ -36,46 +33,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
             AddRangeInternal(new[]
             {
                 getFruitFor(hitObject.VisualRepresentation),
-                border = new Circle
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    BorderColour = Color4.White,
-                    BorderThickness = 6f * RADIUS_ADJUST,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            AlwaysPresent = true,
-                            Alpha = 0,
-                            RelativeSizeAxes = Axes.Both
-                        }
-                    }
-                },
+                border = new BorderPiece(),
             });
 
             if (hitObject.HyperDash)
             {
-                AddInternal(new Circle
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    BorderColour = Catcher.DEFAULT_HYPER_DASH_COLOUR,
-                    BorderThickness = 12f * RADIUS_ADJUST,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            AlwaysPresent = true,
-                            Alpha = 0.3f,
-                            Blending = BlendingParameters.Additive,
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR,
-                        }
-                    }
-                });
+                AddInternal(new HyperBorderPiece());
             }
         }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperBorderPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperBorderPiece.cs
new file mode 100644
index 0000000000..60bb07e89d
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperBorderPiece.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;
+using osu.Game.Rulesets.Catch.UI;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+{
+    public class HyperBorderPiece : BorderPiece
+    {
+        public HyperBorderPiece()
+        {
+            BorderColour = Catcher.DEFAULT_HYPER_DASH_COLOUR;
+            BorderThickness = 12f * FruitPiece.RADIUS_ADJUST;
+
+            Child.Alpha = 0.3f;
+            Child.Blending = BlendingParameters.Additive;
+            Child.Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR;
+        }
+    }
+}
+
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperDropletBorderPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperDropletBorderPiece.cs
new file mode 100644
index 0000000000..1bd9fd6bb2
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperDropletBorderPiece.cs
@@ -0,0 +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.
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+{
+    public class HyperDropletBorderPiece : HyperBorderPiece
+    {
+        public HyperDropletBorderPiece()
+        {
+            Size /= 2;
+            BorderThickness = 6f;
+        }
+    }
+}

From f562854feb72d51a4b198db2b69e5ea5132c6131 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 26 Nov 2020 17:22:22 +0900
Subject: [PATCH 06458/10326] Fix timeline objects sometimes not receiving
 combo colours

---
 .../Timeline/TimelineHitObjectBlueprint.cs          | 13 ++++++-------
 1 file changed, 6 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 975433d407..d534fb3e13 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -55,6 +55,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private const float circle_size = 24;
 
+        [Resolved(CanBeNull = true)]
+        private HitObjectComposer composer { get; set; }
+
         public TimelineHitObjectBlueprint(HitObject hitObject)
             : base(hitObject)
         {
@@ -152,19 +155,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             updateShadows();
         }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(HitObjectComposer composer)
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             if (composer != null)
             {
                 // best effort to get the drawable representation for grabbing colour and what not.
                 drawableHitObject = composer.HitObjects.FirstOrDefault(d => d.HitObject == HitObject);
             }
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
 
             if (HitObject is IHasComboInformation comboInfo)
             {

From f3f5ec766535b8ba201b34ed343bda7e5b8012b3 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 26 Nov 2020 18:08:40 +0900
Subject: [PATCH 06459/10326] Fix `Column` not calling `base.Add`

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 9aabcc6699..d2a9b69b60 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Mania.UI
             DrawableManiaHitObject maniaObject = (DrawableManiaHitObject)hitObject;
             maniaObject.CheckHittable = hitPolicy.IsHittable;
 
-            HitObjectContainer.Add(hitObject);
+            base.Add(hitObject);
         }
 
         public override bool Remove(DrawableHitObject h)

From e53f849aa056ac40f5dc9d745a0ad1bc94541e87 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 26 Nov 2020 18:14:25 +0900
Subject: [PATCH 06460/10326] Completely separate combo colours from DHOs

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs     | 28 ++++++-
 .../Objects/Drawables/DrawableBanana.cs       | 25 ------
 .../DrawablePalpableCatchHitObject.cs         |  5 --
 .../Objects/PalpableCatchHitObject.cs         |  8 +-
 .../Objects/Drawables/DrawableHitObject.cs    |  8 +-
 .../Objects/Types/IHasComboInformation.cs     | 11 +++
 .../Timeline/TimelineHitObjectBlueprint.cs    | 84 ++++++++-----------
 .../Screens/Edit/Compose/ComposeScreen.cs     | 20 ++++-
 8 files changed, 103 insertions(+), 86 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index 4ecfb7b16d..d1033f7801 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -2,13 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects
 {
-    public class Banana : Fruit
+    public class Banana : Fruit, IHasComboInformation
     {
         /// <summary>
         /// Index of banana in current shower.
@@ -26,6 +29,29 @@ namespace osu.Game.Rulesets.Catch.Objects
             Samples = samples;
         }
 
+        private Color4? colour;
+
+        Color4 IHasComboInformation.GetComboColour(IReadOnlyList<Color4> comboColours)
+        {
+            // override any external colour changes with banananana
+            return 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);
+            }
+        }
+
         private class BananaHitSampleInfo : HitSampleInfo
         {
             private static string[] lookupNames { get; } = { "metronomelow", "catch-banana" };
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index a865984d45..7748b1c565 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -1,10 +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 osu.Framework.Graphics;
 using osu.Framework.Utils;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
@@ -15,14 +13,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
         }
 
-        private Color4? colour;
-
-        protected override Color4 GetComboColour(IReadOnlyList<Color4> comboColours)
-        {
-            // override any external colour changes with banananana
-            return colour ??= getBananaColour();
-        }
-
         protected override void UpdateInitialTransforms()
         {
             base.UpdateInitialTransforms();
@@ -46,20 +36,5 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             if (Samples != null)
                 Samples.Frequency.Value = 0.77f + ((Banana)HitObject).BananaIndex * 0.006f;
         }
-
-        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/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 935aad914e..9339a1c420 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -1,12 +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.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
@@ -40,8 +38,5 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             ScaleContainer.Scale = new Vector2(HitObject.Scale);
         }
-
-        protected override Color4 GetComboColour(IReadOnlyList<Color4> comboColours) =>
-            comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
index 361b338b2c..995f61c386 100644
--- a/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
@@ -1,13 +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 System.Collections.Generic;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK.Graphics;
+
 namespace osu.Game.Rulesets.Catch.Objects
 {
     /// <summary>
     /// Represents a single object that can be caught by the catcher.
     /// This includes normal fruits, droplets, and bananas but excludes objects that act only as a container of nested hit objects.
     /// </summary>
-    public abstract class PalpableCatchHitObject : CatchHitObject
+    public abstract class PalpableCatchHitObject : CatchHitObject, IHasComboInformation
     {
         /// <summary>
         /// Difference between the distance to the next object
@@ -25,5 +29,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// The target fruit if we are to initiate a hyperdash.
         /// </summary>
         public CatchHitObject HyperDashTarget;
+
+        Color4 IHasComboInformation.GetComboColour(IReadOnlyList<Color4> comboColours) => comboColours[(IndexInBeatmap + 1) % comboColours.Count];
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 537da24e01..571b05cc05 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -529,11 +529,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void updateComboColour()
         {
-            if (!(HitObject is IHasComboInformation)) return;
+            if (!(HitObject is IHasComboInformation combo)) return;
 
-            var comboColours = CurrentSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
-
-            AccentColour.Value = GetComboColour(comboColours);
+            var comboColours = CurrentSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value ?? Array.Empty<Color4>();
+            AccentColour.Value = combo.GetComboColour(comboColours);
         }
 
         /// <summary>
@@ -544,6 +543,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// 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>
+        [Obsolete("Unused. Implement IHasComboInformation and IHasComboInformation.GetComboColour() on the HitObject model instead.")] // Can be removed 20210527
         protected virtual Color4 GetComboColour(IReadOnlyList<Color4> comboColours)
         {
             if (!(HitObject is IHasComboInformation combo))
diff --git a/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs b/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
index 211c077d4f..4f66802079 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
@@ -1,7 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Bindables;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Types
 {
@@ -35,5 +38,13 @@ namespace osu.Game.Rulesets.Objects.Types
         /// Whether this is the last object in the current combo.
         /// </summary>
         bool LastInCombo { get; set; }
+
+        /// <summary>
+        /// Retrieves the colour of the combo described by this <see cref="IHasComboInformation"/> object from a set of possible combo colours.
+        /// Defaults to using <see cref="ComboIndex"/> to decide the colour.
+        /// </summary>
+        /// <param name="comboColours">A list of possible combo colours provided by the beatmap or skin.</param>
+        /// <returns>The colour of the combo described by this <see cref="IHasComboInformation"/> object.</returns>
+        Color4 GetComboColour([NotNull] IReadOnlyList<Color4> comboColours) => comboColours.Count > 0 ? comboColours[ComboIndex % comboColours.Count] : Color4.White;
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index d534fb3e13..657c5834b2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -19,8 +18,8 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
@@ -28,35 +27,26 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class TimelineHitObjectBlueprint : SelectionBlueprint
     {
-        private readonly Circle circle;
+        private const float thickness = 5;
+        private const float shadow_radius = 5;
+        private const float circle_size = 24;
+
+        public Action<DragEvent> OnDragHandled;
 
         [UsedImplicitly]
         private readonly Bindable<double> startTime;
 
-        public Action<DragEvent> OnDragHandled;
+        private Bindable<int> indexInCurrentComboBindable;
+        private Bindable<int> comboIndexBindable;
 
+        private readonly Circle circle;
         private readonly DragBar dragBar;
-
         private readonly List<Container> shadowComponents = new List<Container>();
-
-        private DrawableHitObject drawableHitObject;
-
-        private Bindable<Color4> comboColour;
-
         private readonly Container mainComponents;
-
         private readonly OsuSpriteText comboIndexText;
 
-        private Bindable<int> comboIndex;
-
-        private const float thickness = 5;
-
-        private const float shadow_radius = 5;
-
-        private const float circle_size = 24;
-
-        [Resolved(CanBeNull = true)]
-        private HitObjectComposer composer { get; set; }
+        [Resolved]
+        private ISkinSource skin { get; set; }
 
         public TimelineHitObjectBlueprint(HitObject hitObject)
             : base(hitObject)
@@ -159,38 +149,38 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.LoadComplete();
 
-            if (composer != null)
-            {
-                // best effort to get the drawable representation for grabbing colour and what not.
-                drawableHitObject = composer.HitObjects.FirstOrDefault(d => d.HitObject == HitObject);
-            }
-
             if (HitObject is IHasComboInformation comboInfo)
             {
-                comboIndex = comboInfo.IndexInCurrentComboBindable.GetBoundCopy();
-                comboIndex.BindValueChanged(combo =>
-                {
-                    comboIndexText.Text = (combo.NewValue + 1).ToString();
-                }, true);
+                indexInCurrentComboBindable = comboInfo.IndexInCurrentComboBindable.GetBoundCopy();
+                indexInCurrentComboBindable.BindValueChanged(_ => updateComboIndex(), true);
+
+                comboIndexBindable = comboInfo.ComboIndexBindable.GetBoundCopy();
+                comboIndexBindable.BindValueChanged(_ => updateComboColour(), true);
+
+                skin.SourceChanged += updateComboColour;
             }
+        }
 
-            if (drawableHitObject != null)
-            {
-                comboColour = drawableHitObject.AccentColour.GetBoundCopy();
-                comboColour.BindValueChanged(colour =>
-                {
-                    if (HitObject is IHasDuration)
-                        mainComponents.Colour = ColourInfo.GradientHorizontal(drawableHitObject.AccentColour.Value, Color4.White);
-                    else
-                        mainComponents.Colour = drawableHitObject.AccentColour.Value;
+        private void updateComboIndex() => comboIndexText.Text = (indexInCurrentComboBindable.Value + 1).ToString();
 
-                    var col = mainComponents.Colour.TopLeft.Linear;
-                    float brightness = col.R + col.G + col.B;
+        private void updateComboColour()
+        {
+            if (!(HitObject is IHasComboInformation combo))
+                return;
 
-                    // decide the combo index colour based on brightness?
-                    comboIndexText.Colour = brightness > 0.5f ? Color4.Black : Color4.White;
-                }, true);
-            }
+            var comboColours = skin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value ?? Array.Empty<Color4>();
+            var comboColour = combo.GetComboColour(comboColours);
+
+            if (HitObject is IHasDuration)
+                mainComponents.Colour = ColourInfo.GradientHorizontal(comboColour, Color4.White);
+            else
+                mainComponents.Colour = comboColour;
+
+            var col = mainComponents.Colour.TopLeft.Linear;
+            float brightness = col.R + col.G + col.B;
+
+            // decide the combo index colour based on brightness?
+            comboIndexText.Colour = brightness > 0.5f ? Color4.Black : Color4.White;
         }
 
         protected override void Update()
diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 46d5eb40b4..c297a03dbf 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.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.Bindables;
 using osu.Framework.Graphics;
@@ -43,6 +44,21 @@ namespace osu.Game.Screens.Edit.Compose
             if (ruleset == null || composer == null)
                 return new ScreenWhiteBox.UnderConstructionMessage(ruleset == null ? "This beatmap" : $"{ruleset.Description}'s composer");
 
+            return wrapSkinnableContent(composer);
+        }
+
+        protected override Drawable CreateTimelineContent()
+        {
+            if (ruleset == null || composer == null)
+                return base.CreateTimelineContent();
+
+            return wrapSkinnableContent(new TimelineBlueprintContainer(composer));
+        }
+
+        private Drawable wrapSkinnableContent(Drawable content)
+        {
+            Debug.Assert(ruleset != null);
+
             var beatmapSkinProvider = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
 
             // the beatmapSkinProvider is used as the fallback source here to allow the ruleset-specific skin implementation
@@ -51,9 +67,7 @@ namespace osu.Game.Screens.Edit.Compose
 
             // load the skinning hierarchy first.
             // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
-            return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(composer));
+            return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(content));
         }
-
-        protected override Drawable CreateTimelineContent() => composer == null ? base.CreateTimelineContent() : new TimelineBlueprintContainer(composer);
     }
 }

From 02d5b1352b6c9971ea83a131c0d2637e167b56b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 18:25:56 +0900
Subject: [PATCH 06461/10326] Expose generic version of OsuScrollContainer

---
 osu.Game/Graphics/Containers/OsuScrollContainer.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/OsuScrollContainer.cs b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
index b9122d254d..aaad72f65c 100644
--- a/osu.Game/Graphics/Containers/OsuScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
@@ -12,7 +12,19 @@ using osuTK.Input;
 
 namespace osu.Game.Graphics.Containers
 {
-    public class OsuScrollContainer : ScrollContainer<Drawable>
+    public class OsuScrollContainer : OsuScrollContainer<Drawable>
+    {
+        public OsuScrollContainer()
+        {
+        }
+
+        public OsuScrollContainer(Direction direction)
+            : base(direction)
+        {
+        }
+    }
+
+    public class OsuScrollContainer<T> : ScrollContainer<T> where T : Drawable
     {
         public const float SCROLL_BAR_HEIGHT = 10;
         public const float SCROLL_BAR_PADDING = 3;

From f8db7a990283b813278f69a53d3de5863db29eb6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 18:28:52 +0900
Subject: [PATCH 06462/10326] Remove ScrollableContent container from carousel

This was causing multiple issues with masking and sizing and really
didn't need to exist in the first place. Also not sure why the pool was
nested inside the scroll container, but it isn't any more. Probably for
the best.
---
 .../SongSelect/TestSceneBeatmapCarousel.cs    |  2 +-
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 48 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 4699784327..44c9361ff8 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -917,7 +917,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 get
                 {
-                    foreach (var item in ScrollableContent)
+                    foreach (var item in Scroll.Children)
                     {
                         yield return item;
 
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 83631fd383..164802fc28 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Select
         /// </summary>
         public bool BeatmapSetsLoaded { get; private set; }
 
-        private readonly CarouselScrollContainer scroll;
+        protected readonly CarouselScrollContainer Scroll;
 
         private IEnumerable<CarouselBeatmapSet> beatmapSets => root.Children.OfType<CarouselBeatmapSet>();
 
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Select
             if (selectedBeatmapSet != null && !beatmapSets.Contains(selectedBeatmapSet.BeatmapSet))
                 selectedBeatmapSet = null;
 
-            ScrollableContent.Clear(false);
+            Scroll.Clear(false);
             itemsCache.Invalidate();
             scrollPositionCache.Invalidate();
 
@@ -132,8 +132,6 @@ namespace osu.Game.Screens.Select
         private readonly Cached itemsCache = new Cached();
         private readonly Cached scrollPositionCache = new Cached();
 
-        protected readonly Container<DrawableCarouselItem> ScrollableContent;
-
         public Bindable<bool> RightClickScrollingEnabled = new Bindable<bool>();
 
         public Bindable<RandomSelectAlgorithm> RandomAlgorithm = new Bindable<RandomSelectAlgorithm>();
@@ -155,17 +153,12 @@ namespace osu.Game.Screens.Select
             InternalChild = new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = scroll = new CarouselScrollContainer
+                Children = new Drawable[]
                 {
-                    Masking = false,
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    setPool,
+                    Scroll = new CarouselScrollContainer
                     {
-                        setPool,
-                        ScrollableContent = new Container<DrawableCarouselItem>
-                        {
-                            RelativeSizeAxes = Axes.X,
-                        }
+                        RelativeSizeAxes = Axes.Both,
                     }
                 }
             };
@@ -180,7 +173,7 @@ namespace osu.Game.Screens.Select
             config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
             config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
 
-            RightClickScrollingEnabled.ValueChanged += enabled => scroll.RightMouseScrollbar = enabled.NewValue;
+            RightClickScrollingEnabled.ValueChanged += enabled => Scroll.RightMouseScrollbar = enabled.NewValue;
             RightClickScrollingEnabled.TriggerChange();
 
             itemUpdated = beatmaps.ItemUpdated.GetBoundCopy();
@@ -421,12 +414,12 @@ namespace osu.Game.Screens.Select
         /// <summary>
         /// The position of the lower visible bound with respect to the current scroll position.
         /// </summary>
-        private float visibleBottomBound => scroll.Current + DrawHeight + BleedBottom;
+        private float visibleBottomBound => Scroll.Current + DrawHeight + BleedBottom;
 
         /// <summary>
         /// The position of the upper visible bound with respect to the current scroll position.
         /// </summary>
-        private float visibleUpperBound => scroll.Current - BleedTop;
+        private float visibleUpperBound => Scroll.Current - BleedTop;
 
         public void FlushPendingFilterOperations()
         {
@@ -468,7 +461,7 @@ namespace osu.Game.Screens.Select
                 root.Filter(activeCriteria);
                 itemsCache.Invalidate();
 
-                if (alwaysResetScrollPosition || !scroll.UserScrolling)
+                if (alwaysResetScrollPosition || !Scroll.UserScrolling)
                     ScrollToSelected();
             }
         }
@@ -594,7 +587,7 @@ namespace osu.Game.Screens.Select
                 {
                     var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first + 1);
 
-                    foreach (var panel in ScrollableContent.Children)
+                    foreach (var panel in Scroll.Children)
                     {
                         if (toDisplay.Remove(panel.Item))
                         {
@@ -620,7 +613,7 @@ namespace osu.Game.Screens.Select
                         panel.Depth = item.CarouselYPosition;
                         panel.Y = item.CarouselYPosition;
 
-                        ScrollableContent.Add(panel);
+                        Scroll.Add(panel);
                     }
                 }
             }
@@ -637,7 +630,7 @@ namespace osu.Game.Screens.Select
 
             // Update externally controlled state of currently visible items (e.g. x-offset and opacity).
             // This is a per-frame update on all drawable panels.
-            foreach (DrawableCarouselItem item in ScrollableContent.Children)
+            foreach (DrawableCarouselItem item in Scroll.Children)
             {
                 updateItem(item);
 
@@ -789,7 +782,8 @@ namespace osu.Game.Screens.Select
             }
 
             currentY += visibleHalfHeight;
-            ScrollableContent.Height = currentY;
+
+            Scroll.ScrollContent.Height = currentY;
 
             if (BeatmapSetsLoaded && (selectedBeatmapSet == null || selectedBeatmap == null || selectedBeatmapSet.State.Value != CarouselItemState.Selected))
             {
@@ -809,7 +803,7 @@ namespace osu.Game.Screens.Select
                 if (firstScroll)
                 {
                     // reduce movement when first displaying the carousel.
-                    scroll.ScrollTo(scrollTarget.Value - 200, false);
+                    Scroll.ScrollTo(scrollTarget.Value - 200, false);
                     firstScroll = false;
                 }
 
@@ -844,7 +838,7 @@ namespace osu.Game.Screens.Select
         /// <param name="parent">For nested items, the parent of the item to be updated.</param>
         private void updateItem(DrawableCarouselItem item, DrawableCarouselItem parent = null)
         {
-            Vector2 posInScroll = ScrollableContent.ToLocalSpace(item.Header.ScreenSpaceDrawQuad.Centre);
+            Vector2 posInScroll = Scroll.ScrollContent.ToLocalSpace(item.Header.ScreenSpaceDrawQuad.Centre);
             float itemDrawY = posInScroll.Y - visibleUpperBound;
             float dist = Math.Abs(1f - itemDrawY / visibleHalfHeight);
 
@@ -889,7 +883,7 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private class CarouselScrollContainer : OsuScrollContainer
+        protected class CarouselScrollContainer : OsuScrollContainer<DrawableCarouselItem>
         {
             private bool rightMouseScrollBlocked;
 
@@ -898,6 +892,12 @@ namespace osu.Game.Screens.Select
             /// </summary>
             public bool UserScrolling { get; private set; }
 
+            public CarouselScrollContainer()
+            {
+                // size is determined by the carousel itself, due to not all content necessarily being loaded.
+                ScrollContent.AutoSizeAxes = Axes.None;
+            }
+
             // ReSharper disable once OptionalParameterHierarchyMismatch 2020.3 EAP4 bug. (https://youtrack.jetbrains.com/issue/RSRP-481535?p=RIDER-51910)
             protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
             {

From 6058c66edb0a0e2ce4150bf8fc530f36b708e9ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 18:32:43 +0900
Subject: [PATCH 06463/10326] Move drawable carousel set movement logic into
 panels themselves

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 10 ----------
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 164802fc28..b6ed0468dd 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -618,16 +618,6 @@ namespace osu.Game.Screens.Select
                 }
             }
 
-            // Finally, if the filtered items have changed, animate drawables to their new locations.
-            // This is common if a selected/collapsed state has changed.
-            if (revalidateItems)
-            {
-                foreach (DrawableCarouselItem panel in ScrollableContent.Children)
-                {
-                    panel.MoveToY(panel.Item.CarouselYPosition, 800, Easing.OutQuint);
-                }
-            }
-
             // Update externally controlled state of currently visible items (e.g. x-offset and opacity).
             // This is a per-frame update on all drawable panels.
             foreach (DrawableCarouselItem item in Scroll.Children)
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 93f95e76cc..e25c6932cf 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Graphics.UserInterface;
@@ -60,6 +61,25 @@ namespace osu.Game.Screens.Select.Carousel
                 viewDetails = beatmapOverlay.FetchAndShowBeatmapSet;
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            // position updates should not occur if the item is filtered away.
+            // this avoids panels flying across the screen only to be eventually off-screen or faded out.
+            if (!Item.Visible)
+                return;
+
+            float targetY = Item.CarouselYPosition;
+
+            if (Precision.AlmostEquals(targetY, Y))
+                Y = targetY;
+            else
+                // algorithm for this is taken from ScrollContainer.
+                // while it doesn't necessarily need to match 1:1, as we are emulating scroll in some cases this feels most correct.
+                Y = (float)Interpolation.Lerp(targetY, Y, Math.Exp(-0.01 * Time.Elapsed));
+        }
+
         protected override void UpdateItem()
         {
             base.UpdateItem();

From ad258e2e52ac387dd50b35f93022fd62217e6f30 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 18:33:37 +0900
Subject: [PATCH 06464/10326] Update scroll position before applying any panel
 animations

In the case of automatic scroll requirements (ie. scroll to selected) we
are delegating the animation logic to the panels themselves. In order to
make this work correctly, the scroll operation needs to take effect
before any animation updates are run.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index b6ed0468dd..3eddba0532 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -573,6 +573,9 @@ namespace osu.Game.Screens.Select
             if (revalidateItems)
                 updateYPositions();
 
+            if (!scrollPositionCache.IsValid)
+                updateScrollPosition();
+
             // This data is consumed to find the currently displayable range.
             // This is the range we want to keep drawables for, and should exceed the visible range slightly to avoid drawable churn.
             var newDisplayRange = getDisplayRange();
@@ -653,14 +656,6 @@ namespace osu.Game.Screens.Select
             return (firstIndex, lastIndex);
         }
 
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            if (!scrollPositionCache.IsValid)
-                updateScrollPosition();
-        }
-
         private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))

From 0a48dd8f764bb56cba9d53c907fc83a174f7e1b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 18:42:51 +0900
Subject: [PATCH 06465/10326] Delegate scroll animation to panels themselves

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 3eddba0532..2012d47fd3 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -573,6 +573,9 @@ namespace osu.Game.Screens.Select
             if (revalidateItems)
                 updateYPositions();
 
+            // if there is a pending scroll action we apply it without animation and transfer the difference in position to the panels.
+            // due to this, scroll application needs to be run immediately after y position updates.
+            // if this isn't the case, the on-screen pooling / display logic following will fail briefly.
             if (!scrollPositionCache.IsValid)
                 updateScrollPosition();
 
@@ -792,8 +795,17 @@ namespace osu.Game.Screens.Select
                     firstScroll = false;
                 }
 
-                scroll.ScrollTo(scrollTarget.Value);
+                // in order to simplify animation logic, rather than using the animated version of ScrollTo,
+                // we take the difference in scroll height and apply to all visible panels.
+                // this avoids edge cases like when the visible panels is reduced suddenly, causing ScrollContainer
+                // to enter clamp-special-case mode where it animates completely differently to normal.
+                float scrollChange = scrollTarget.Value - Scroll.Current;
+
+                Scroll.ScrollTo(scrollTarget.Value, false);
                 scrollPositionCache.Validate();
+
+                foreach (var i in Scroll.Children)
+                    i.Y += scrollChange;
             }
         }
 

From 05e245d4454987b27fdca0200b798eb131c73f26 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 26 Nov 2020 19:07:09 +0900
Subject: [PATCH 06466/10326] Allow non-pooled DHO to be reused

---
 osu.Game/Rulesets/UI/Playfield.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 2f589f4ce9..a2ac234471 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -135,10 +135,8 @@ namespace osu.Game.Rulesets.UI
         /// <param name="h">The DrawableHitObject to add.</param>
         public virtual void Add(DrawableHitObject h)
         {
-            if (h.IsInitialized)
-                throw new InvalidOperationException($"{nameof(Add)} doesn't support {nameof(DrawableHitObject)} reuse. Use pooling instead.");
-
-            onNewDrawableHitObject(h);
+            if (!h.IsInitialized)
+                onNewDrawableHitObject(h);
 
             HitObjectContainer.Add(h);
             OnHitObjectAdded(h.HitObject);

From 9811c46e3573e8299fed6a326422704fd3aa3e53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 19:16:18 +0900
Subject: [PATCH 06467/10326] Rename application method to better describe what
 it actually does

---
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs             | 4 ++--
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs                | 4 ++--
 .../Edit/Blueprints/NotePlacementBlueprint.cs                 | 4 ++--
 .../Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs | 4 ++--
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs       | 4 ++--
 .../Edit/Blueprints/HitPlacementBlueprint.cs                  | 4 ++--
 .../Edit/Blueprints/TaikoSpanPlacementBlueprint.cs            | 4 ++--
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs                  | 2 +-
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs      | 2 +-
 osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs          | 4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index b5ec1e1a2a..1f92929392 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -78,9 +78,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         private double originalStartTime;
 
-        public override void UpdatePosition(SnapResult result)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            base.UpdatePosition(result);
+            base.UpdateTimeAndPosition(result);
 
             if (PlacementActive)
             {
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 27a279e044..5e09054667 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -48,9 +48,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             return true;
         }
 
-        public override void UpdatePosition(SnapResult result)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            base.UpdatePosition(result);
+            base.UpdateTimeAndPosition(result);
 
             if (!PlacementActive)
                 Column = result.Playfield as Column;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index 684004b558..3db89c8ae6 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -22,9 +22,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             InternalChild = piece = new EditNotePiece { Origin = Anchor.Centre };
         }
 
-        public override void UpdatePosition(SnapResult result)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            base.UpdatePosition(result);
+            base.UpdateTimeAndPosition(result);
 
             if (result.Playfield != null)
             {
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index e14d6647d2..c45a04053f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -45,9 +45,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
             return base.OnMouseDown(e);
         }
 
-        public override void UpdatePosition(SnapResult result)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            base.UpdatePosition(result);
+            base.UpdateTimeAndPosition(result);
             HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 4b99cc23ed..b71e1914f7 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -67,9 +67,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             inputManager = GetContainingInputManager();
         }
 
-        public override void UpdatePosition(SnapResult result)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            base.UpdatePosition(result);
+            base.UpdateTimeAndPosition(result);
 
             switch (state)
             {
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
index c5191ab241..17e7fb81f6 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
@@ -43,10 +43,10 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
             return false;
         }
 
-        public override void UpdatePosition(SnapResult result)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
             piece.Position = ToLocalSpace(result.ScreenSpacePosition);
-            base.UpdatePosition(result);
+            base.UpdateTimeAndPosition(result);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
index 468d980b23..e53b331f46 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
@@ -68,9 +68,9 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
             EndPlacement(true);
         }
 
-        public override void UpdatePosition(SnapResult result)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            base.UpdatePosition(result);
+            base.UpdateTimeAndPosition(result);
 
             if (PlacementActive)
             {
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index d986b71380..9d7dc7b8f7 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Edit
         /// Updates the position of this <see cref="PlacementBlueprint"/> to a new screen-space position.
         /// </summary>
         /// <param name="result">The snap result information.</param>
-        public virtual void UpdatePosition(SnapResult result)
+        public virtual void UpdateTimeAndPosition(SnapResult result)
         {
             if (!PlacementActive)
                 HitObject.StartTime = result.Time ?? EditorClock?.CurrentTime ?? Time.Current;
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 0d2e2360b1..dddfd763d5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             var snapResult = Composer.SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position);
 
-            currentPlacement.UpdatePosition(snapResult);
+            currentPlacement.UpdateTimeAndPosition(snapResult);
         }
 
         #endregion
diff --git a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
index c3d74f21aa..78a6bcc3db 100644
--- a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Visual
         {
             base.Update();
 
-            currentBlueprint.UpdatePosition(SnapForBlueprint(currentBlueprint));
+            currentBlueprint.UpdateTimeAndPosition(SnapForBlueprint(currentBlueprint));
         }
 
         protected virtual SnapResult SnapForBlueprint(PlacementBlueprint blueprint) =>
@@ -85,7 +85,7 @@ namespace osu.Game.Tests.Visual
             if (drawable is PlacementBlueprint blueprint)
             {
                 blueprint.Show();
-                blueprint.UpdatePosition(SnapForBlueprint(blueprint));
+                blueprint.UpdateTimeAndPosition(SnapForBlueprint(blueprint));
             }
         }
 

From 91592cf32d387d332610a03f46175105ac78ccd0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 19:20:39 +0900
Subject: [PATCH 06468/10326] Expose EditorClock for consumption

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index def5f396f1..5c5f203667 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private IEditorChangeHandler changeHandler { get; set; }
 
         [Resolved]
-        private EditorClock editorClock { get; set; }
+        protected EditorClock EditorClock { get; private set; }
 
         [Resolved]
         protected EditorBeatmap Beatmap { get; private set; }
@@ -170,7 +170,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (clickedBlueprint == null || SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != clickedBlueprint)
                 return false;
 
-            editorClock?.SeekTo(clickedBlueprint.HitObject.StartTime);
+            EditorClock?.SeekTo(clickedBlueprint.HitObject.StartTime);
             return true;
         }
 
@@ -381,7 +381,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                     case SelectionState.Selected:
                         // if the editor is playing, we generally don't want to deselect objects even if outside the selection area.
-                        if (!editorClock.IsRunning && !isValidForSelection())
+                        if (!EditorClock.IsRunning && !isValidForSelection())
                             blueprint.Deselect();
                         break;
                 }

From da6bccc8125725a06bc7d82fb1d34ae0886e0456 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 19:20:51 +0900
Subject: [PATCH 06469/10326] Apply beat snap if positional snap doesn't give a
 time result

---
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index dddfd763d5..1893366d90 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -157,6 +157,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             var snapResult = Composer.SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position);
 
+            // if no time was found from positional snapping, we should still quantize to the beat.
+            snapResult.Time ??= Beatmap.SnapTime(EditorClock.CurrentTime, null);
+
             currentPlacement.UpdateTimeAndPosition(snapResult);
         }
 

From ab1ad99c88f556afb8c1daeb2ffa849c2597e451 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 19:33:51 +0900
Subject: [PATCH 06470/10326] Fix failing test scene (was previously not
 snapped properly)

---
 .../Editor/TestSceneObjectObjectSnap.cs                      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
index 6b532e5014..7bdf131e0d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             base.SetUpSteps();
             AddStep("get playfield", () => playfield = Editor.ChildrenOfType<OsuPlayfield>().First());
+            AddStep("seek to first control point", () => EditorClock.Seek(Beatmap.Value.Beatmap.ControlPointInfo.TimingPoints.First().Time));
         }
 
         [TestCase(true)]
@@ -66,13 +67,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("start slider placement", () => InputManager.Click(MouseButton.Left));
 
-            AddStep("move to place end", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.185f, 0)));
+            AddStep("move to place end", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.225f, 0)));
 
             AddStep("end slider placement", () => InputManager.Click(MouseButton.Right));
 
             AddStep("enter circle placement mode", () => InputManager.Key(Key.Number2));
 
-            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.20f, 0)));
+            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.235f, 0)));
 
             AddStep("place second object", () => InputManager.Click(MouseButton.Left));
 

From 9a08cc8c04d8a45747736bcea22db930e53e3096 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 19:40:10 +0900
Subject: [PATCH 06471/10326] Add test coverage of beat snapping hit circles

---
 .../Editor/TestSceneBeatSnap.cs               | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestSceneBeatSnap.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneBeatSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneBeatSnap.cs
new file mode 100644
index 0000000000..a652fb32f4
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneBeatSnap.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Tests.Beatmaps;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    [TestFixture]
+    public class TestSceneObjectBeatSnap : TestSceneOsuEditor
+    {
+        private OsuPlayfield playfield;
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(Ruleset.Value, false);
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("get playfield", () => playfield = Editor.ChildrenOfType<OsuPlayfield>().First());
+        }
+
+        [Test]
+        public void TestBeatSnapHitCircle()
+        {
+            double firstTimingPointTime() => Beatmap.Value.Beatmap.ControlPointInfo.TimingPoints.First().Time;
+
+            AddStep("seek some milliseconds forward", () => EditorClock.Seek(firstTimingPointTime() + 10));
+
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre));
+            AddStep("enter placement mode", () => InputManager.Key(Key.Number2));
+            AddStep("place first object", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("ensure object snapped back to correct time", () => EditorBeatmap.HitObjects.First().StartTime == firstTimingPointTime());
+        }
+    }
+}

From 203c36f7202f4fb869c548fc1d71b5d89d4e4fbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 19:46:54 +0900
Subject: [PATCH 06472/10326] Rename file to match test name

---
 .../Editor/{TestSceneBeatSnap.cs => TestSceneObjectBeatSnap.cs}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Osu.Tests/Editor/{TestSceneBeatSnap.cs => TestSceneObjectBeatSnap.cs} (100%)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneBeatSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectBeatSnap.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu.Tests/Editor/TestSceneBeatSnap.cs
rename to osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectBeatSnap.cs

From 3346c06aca2469288f1aa2a4ed48fc7595c97122 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 20:04:44 +0900
Subject: [PATCH 06473/10326] Rename variable/text to be more verbose as to
 toggle purpose

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 6 +++---
 osu.Game/Screens/Play/ReplayPlayer.cs            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 77f57bd637..2736c20da9 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.Plus }, GlobalAction.IncreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.Control, InputKey.Minus }, GlobalAction.DecreaseScrollSpeed),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
-            new KeyBinding(InputKey.Space, GlobalAction.PauseReplay),
+            new KeyBinding(InputKey.Space, GlobalAction.TogglePauseReplay),
             new KeyBinding(InputKey.Control, GlobalAction.HoldForHUD),
         };
 
@@ -198,7 +198,7 @@ namespace osu.Game.Input.Bindings
         [Description("Random Skin")]
         RandomSkin,
 
-        [Description("Pause Replay")]
-        PauseReplay,
+        [Description("Pause / resume replay")]
+        TogglePauseReplay,
     }
 }
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 2c0b766a17..294d116f51 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Play
         {
             switch (action)
             {
-                case GlobalAction.PauseReplay:
+                case GlobalAction.TogglePauseReplay:
                     if (GameplayClockContainer.IsPaused.Value)
                         GameplayClockContainer.Start();
                     else

From 1e79cb498b8454d2a6349bae36d7ff0fe788f484 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Nov 2020 20:07:16 +0900
Subject: [PATCH 06474/10326] Standardise binding description case to sentence
 casing

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index e5d3a89a88..9af1b49ef9 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -163,10 +163,10 @@ namespace osu.Game.Input.Bindings
         [Description("Toggle now playing overlay")]
         ToggleNowPlaying,
 
-        [Description("Previous Selection")]
+        [Description("Previous selection")]
         SelectPrevious,
 
-        [Description("Next Selection")]
+        [Description("Next selection")]
         SelectNext,
 
         [Description("Home")]
@@ -175,26 +175,26 @@ namespace osu.Game.Input.Bindings
         [Description("Toggle notifications")]
         ToggleNotifications,
 
-        [Description("Pause")]
+        [Description("Pause gameplay")]
         PauseGameplay,
 
         // Editor
-        [Description("Setup Mode")]
+        [Description("Setup mode")]
         EditorSetupMode,
 
-        [Description("Compose Mode")]
+        [Description("Compose mode")]
         EditorComposeMode,
 
-        [Description("Design Mode")]
+        [Description("Design mode")]
         EditorDesignMode,
 
-        [Description("Timing Mode")]
+        [Description("Timing mode")]
         EditorTimingMode,
 
         [Description("Hold for HUD")]
         HoldForHUD,
 
-        [Description("Random Skin")]
+        [Description("Random skin")]
         RandomSkin,
     }
 }

From aa4da2a5f82af9141e1efeee7a547313822165c0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 26 Nov 2020 23:42:05 +0900
Subject: [PATCH 06475/10326] Add xmldoc on State

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 4c55938e49..1427453c5f 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -128,6 +128,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private readonly Bindable<ArmedState> state = new Bindable<ArmedState>();
 
+        /// <summary>
+        /// The state of this <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// For pooled hitobjects, <see cref="ApplyCustomUpdateState"/> is recommended to be used instead for better editor/rewinding support.
+        /// </remarks>
         public IBindable<ArmedState> State => state;
 
         /// <summary>

From 57454bbb1c50d0af8bf9e1d2a9da5db9993e354f Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 10:13:05 +0900
Subject: [PATCH 06476/10326] Remove hitObject argument from OnApply and OnFree

---
 .../Objects/Drawables/DrawableOsuHitObject.cs          |  8 ++++----
 .../Objects/Drawables/DrawableSlider.cs                |  8 ++++----
 .../Objects/Drawables/DrawableSliderHead.cs            |  4 ++--
 .../Visual/Gameplay/TestScenePoolingRuleset.cs         |  4 ++--
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs    | 10 ++++------
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index a26db06ede..4b7f048c1b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -53,9 +53,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             });
         }
 
-        protected override void OnApply(HitObject hitObject)
+        protected override void OnApply()
         {
-            base.OnApply(hitObject);
+            base.OnApply();
 
             IndexInCurrentComboBindable.BindTo(HitObject.IndexInCurrentComboBindable);
             PositionBindable.BindTo(HitObject.PositionBindable);
@@ -70,9 +70,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             LifetimeEnd = HitObject.GetEndTime() + HitObject.HitWindows.WindowFor(HitResult.Miss) + 1000;
         }
 
-        protected override void OnFree(HitObject hitObject)
+        protected override void OnFree()
         {
-            base.OnFree(hitObject);
+            base.OnFree();
 
             IndexInCurrentComboBindable.UnbindFrom(HitObject.IndexInCurrentComboBindable);
             PositionBindable.UnbindFrom(HitObject.PositionBindable);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 6340367593..dd27ac990e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -86,18 +86,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Tracking.BindValueChanged(updateSlidingSample);
         }
 
-        protected override void OnApply(HitObject hitObject)
+        protected override void OnApply()
         {
-            base.OnApply(hitObject);
+            base.OnApply();
 
             // Ensure that the version will change after the upcoming BindTo().
             pathVersion.Value = int.MaxValue;
             PathVersion.BindTo(HitObject.Path.Version);
         }
 
-        protected override void OnFree(HitObject hitObject)
+        protected override void OnFree()
         {
-            base.OnFree(hitObject);
+            base.OnFree();
 
             PathVersion.UnbindFrom(HitObject.Path.Version);
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index fd0f35d20d..b5c33c0924 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -36,9 +36,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             pathVersion.BindValueChanged(_ => updatePosition());
         }
 
-        protected override void OnFree(HitObject hitObject)
+        protected override void OnFree()
         {
-            base.OnFree(hitObject);
+            base.OnFree();
 
             pathVersion.UnbindFrom(drawableSlider.PathVersion);
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
index 3e777119c4..cd7d692b0a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -261,9 +261,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                 });
             }
 
-            protected override void OnApply(HitObject hitObject)
+            protected override void OnApply()
             {
-                base.OnApply(hitObject);
+                base.OnApply();
                 Position = new Vector2(RNG.Next(-200, 200), RNG.Next(-200, 200));
             }
 
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 2e37e8977a..9c799bcf32 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -260,7 +260,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             HitObject.DefaultsApplied += onDefaultsApplied;
 
-            OnApply(hitObject);
+            OnApply();
             HitObjectApplied?.Invoke(this);
 
             // If not loaded, the state update happens in LoadComplete(). Otherwise, the update is scheduled to allow for lifetime updates.
@@ -315,7 +315,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             HitObject.DefaultsApplied -= onDefaultsApplied;
 
-            OnFree(HitObject);
+            OnFree();
 
             HitObject = null;
             Result = null;
@@ -340,16 +340,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// Invoked for this <see cref="DrawableHitObject"/> to take on any values from a newly-applied <see cref="HitObject"/>.
         /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> being applied.</param>
-        protected virtual void OnApply(HitObject hitObject)
+        protected virtual void OnApply()
         {
         }
 
         /// <summary>
         /// Invoked for this <see cref="DrawableHitObject"/> to revert any values previously taken on from the currently-applied <see cref="HitObject"/>.
         /// </summary>
-        /// <param name="hitObject">The currently-applied <see cref="HitObject"/>.</param>
-        protected virtual void OnFree(HitObject hitObject)
+        protected virtual void OnFree()
         {
         }
 

From fe85b7d482a0aabb076387f174fbbc9ab7835e77 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 10:18:00 +0900
Subject: [PATCH 06477/10326] Remove unused import

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index b5c33c0924..3a92938d75 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -4,7 +4,6 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 

From c272fda41628b34e5a3d4ec7f4eb80ddf7ee2fa7 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 10:31:18 +0900
Subject: [PATCH 06478/10326] Add bindables to catch hit objects

---
 .../Objects/CatchHitObject.cs                 | 45 ++++++++++++++++---
 .../Objects/PalpableCatchHitObject.cs         | 17 ++++++-
 2 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index ccd2422381..05b2a21794 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -16,25 +16,47 @@ namespace osu.Game.Rulesets.Catch.Objects
     {
         public const float OBJECT_RADIUS = 64;
 
-        private float x;
+        // This value is after XOffset applied.
+        public readonly Bindable<float> XBindable = new Bindable<float>();
+
+        // This value is before XOffset applied.
+        private float originalX;
 
         /// <summary>
         /// The horizontal position of the fruit between 0 and <see cref="CatchPlayfield.WIDTH"/>.
         /// </summary>
         public float X
         {
-            get => x + XOffset;
-            set => x = value;
+            // TODO: I don't like this asymmetry.
+            get => XBindable.Value;
+            // originalX is set by `XBindable.BindValueChanged`
+            set => XBindable.Value = value + xOffset;
         }
 
+        private float xOffset;
+
         /// <summary>
         /// A random offset applied to <see cref="X"/>, set by the <see cref="CatchBeatmapProcessor"/>.
         /// </summary>
-        internal float XOffset { get; set; }
+        internal float XOffset
+        {
+            get => xOffset;
+            set
+            {
+                xOffset = value;
+                XBindable.Value = originalX + xOffset;
+            }
+        }
 
         public double TimePreempt = 1000;
 
-        public int IndexInBeatmap { get; set; }
+        public readonly Bindable<int> IndexInBeatmapBindable = new Bindable<int>();
+
+        public int IndexInBeatmap
+        {
+            get => IndexInBeatmapBindable.Value;
+            set => IndexInBeatmapBindable.Value = value;
+        }
 
         public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(IndexInBeatmap % 4);
 
@@ -69,7 +91,13 @@ namespace osu.Game.Rulesets.Catch.Objects
             set => LastInComboBindable.Value = value;
         }
 
-        public float Scale { get; set; } = 1;
+        public readonly Bindable<float> ScaleBindable = new Bindable<float>(1);
+
+        public float Scale
+        {
+            get => ScaleBindable.Value;
+            set => ScaleBindable.Value = value;
+        }
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
@@ -81,6 +109,11 @@ namespace osu.Game.Rulesets.Catch.Objects
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        protected CatchHitObject()
+        {
+            XBindable.BindValueChanged(x => originalX = x.NewValue - xOffset);
+        }
     }
 
     public enum FruitVisualRepresentation
diff --git a/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
index 995f61c386..0cd3af01df 100644
--- a/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/PalpableCatchHitObject.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK.Graphics;
 
@@ -20,15 +21,27 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// </summary>
         public float DistanceToHyperDash { get; set; }
 
+        public readonly Bindable<bool> HyperDashBindable = new Bindable<bool>();
+
         /// <summary>
         /// Whether this fruit can initiate a hyperdash.
         /// </summary>
-        public bool HyperDash => HyperDashTarget != null;
+        public bool HyperDash => HyperDashBindable.Value;
+
+        private CatchHitObject hyperDashTarget;
 
         /// <summary>
         /// The target fruit if we are to initiate a hyperdash.
         /// </summary>
-        public CatchHitObject HyperDashTarget;
+        public CatchHitObject HyperDashTarget
+        {
+            get => hyperDashTarget;
+            set
+            {
+                hyperDashTarget = value;
+                HyperDashBindable.Value = value != null;
+            }
+        }
 
         Color4 IHasComboInformation.GetComboColour(IReadOnlyList<Color4> comboColours) => comboColours[(IndexInBeatmap + 1) % comboColours.Count];
     }

From 5e36fb322af95b47e31530e961c9a6fe8879528b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 10:10:05 +0900
Subject: [PATCH 06479/10326] Move fruit visual logic from CHO to DrawableFruit

---
 .../TestSceneFruitObjects.cs                  | 17 +++---
 osu.Game.Rulesets.Catch/Objects/Banana.cs     |  2 -
 .../Objects/BananaShower.cs                   |  2 -
 .../Objects/CatchHitObject.cs                 | 11 ----
 .../Objects/Drawables/DrawableBanana.cs       |  2 +
 .../Objects/Drawables/DrawableFruit.cs        | 59 ++++++++++++++++++-
 .../Objects/Drawables/Pieces/FruitPiece.cs    | 26 +++-----
 7 files changed, 77 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index e8ecd2ca1b..93ffb947e1 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         }
 
         private Drawable createDrawableFruit(FruitVisualRepresentation rep, bool hyperdash = false) =>
-            setProperties(new DrawableFruit(new TestCatchFruit(rep)), hyperdash);
+            setProperties(new TestDrawableFruit(new Fruit(), rep), hyperdash);
 
         private Drawable createDrawableDroplet(bool hyperdash = false) => setProperties(new DrawableDroplet(new Droplet()), hyperdash);
 
@@ -56,14 +56,17 @@ namespace osu.Game.Rulesets.Catch.Tests
             return d;
         }
 
-        public class TestCatchFruit : Fruit
+        public class TestDrawableFruit : DrawableFruit
         {
-            public TestCatchFruit(FruitVisualRepresentation rep)
-            {
-                VisualRepresentation = rep;
-            }
+            private readonly FruitVisualRepresentation visualRepresentation;
 
-            public override FruitVisualRepresentation VisualRepresentation { get; }
+            protected override FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => visualRepresentation;
+
+            public TestDrawableFruit(Fruit fruit, FruitVisualRepresentation rep)
+                : base(fruit)
+            {
+                visualRepresentation = rep;
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index d1033f7801..ccb1fff15b 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -18,8 +18,6 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// </summary>
         public int BananaIndex;
 
-        public override FruitVisualRepresentation VisualRepresentation => FruitVisualRepresentation.Banana;
-
         public override Judgement CreateJudgement() => new CatchBananaJudgement();
 
         private static readonly List<HitSampleInfo> samples = new List<HitSampleInfo> { new BananaHitSampleInfo() };
diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index 89c51459a6..b45f95a8e6 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -9,8 +9,6 @@ namespace osu.Game.Rulesets.Catch.Objects
 {
     public class BananaShower : CatchHitObject, IHasDuration
     {
-        public override FruitVisualRepresentation VisualRepresentation => FruitVisualRepresentation.Banana;
-
         public override bool LastInCombo => true;
 
         public override Judgement CreateJudgement() => new IgnoreJudgement();
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 05b2a21794..a74055bff9 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -58,8 +58,6 @@ namespace osu.Game.Rulesets.Catch.Objects
             set => IndexInBeatmapBindable.Value = value;
         }
 
-        public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(IndexInBeatmap % 4);
-
         public virtual bool NewCombo { get; set; }
 
         public int ComboOffset { get; set; }
@@ -115,13 +113,4 @@ namespace osu.Game.Rulesets.Catch.Objects
             XBindable.BindValueChanged(x => originalX = x.NewValue - xOffset);
         }
     }
-
-    public enum FruitVisualRepresentation
-    {
-        Pear,
-        Grape,
-        Pineapple,
-        Raspberry,
-        Banana // banananananannaanana
-    }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index 7748b1c565..efb0958a3a 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -8,6 +8,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableBanana : DrawableFruit
     {
+        protected override FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => FruitVisualRepresentation.Banana;
+
         public DrawableBanana(Banana h)
             : base(h)
         {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index 96e24bf76c..f4adabdbcb 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
@@ -11,18 +12,61 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableFruit : DrawablePalpableCatchHitObject
     {
+        public readonly Bindable<int> IndexInBeatmap = new Bindable<int>();
+
+        public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
+
+        protected virtual FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => (FruitVisualRepresentation)(indexInBeatmap % 4);
+
+        private FruitPiece fruitPiece;
+
         public DrawableFruit(CatchHitObject h)
             : base(h)
         {
+            IndexInBeatmap.Value = h.IndexInBeatmap;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            ScaleContainer.Child = new SkinnableDrawable(
-                new CatchSkinComponent(getComponent(HitObject.VisualRepresentation)), _ => new FruitPiece());
-
             ScaleContainer.Rotation = (float)(RNG.NextDouble() - 0.5f) * 40;
+
+            IndexInBeatmap.BindValueChanged(change =>
+            {
+                VisualRepresentation.Value = GetVisualRepresentation(change.NewValue);
+            }, true);
+
+            VisualRepresentation.BindValueChanged(change =>
+            {
+                ScaleContainer.Child = new SkinnableDrawable(
+                    new CatchSkinComponent(getComponent(change.NewValue)),
+                    _ => fruitPiece = new FruitPiece
+                    {
+                        VisualRepresentation = { BindTarget = VisualRepresentation },
+                    });
+            }, true);
+        }
+
+        protected override void OnApply()
+        {
+            base.OnApply();
+
+            IndexInBeatmap.BindTo(HitObject.IndexInBeatmapBindable);
+        }
+
+        protected override void OnFree()
+        {
+            IndexInBeatmap.UnbindFrom(HitObject.IndexInBeatmapBindable);
+
+            base.OnFree();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (fruitPiece != null)
+                fruitPiece.Border.Alpha = (float)Math.Clamp((StartTimeBindable.Value - Time.Current) / 500, 0, 1);
         }
 
         private CatchSkinComponents getComponent(FruitVisualRepresentation hitObjectVisualRepresentation)
@@ -49,4 +93,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             }
         }
     }
+
+    public enum FruitVisualRepresentation
+    {
+        Pear,
+        Grape,
+        Pineapple,
+        Raspberry,
+        Banana // banananananannaanana
+    }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
index 208c9f8316..a9a8f551ce 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
@@ -1,11 +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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
@@ -16,8 +15,10 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
         /// </summary>
         public const float RADIUS_ADJUST = 1.1f;
 
-        private BorderPiece border;
-        private PalpableCatchHitObject hitObject;
+        public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
+        public readonly Bindable<bool> HyperDash = new Bindable<bool>();
+
+        public BorderPiece Border;
 
         public FruitPiece()
         {
@@ -25,29 +26,20 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
         }
 
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableObject)
+        private void load()
         {
-            var drawableCatchObject = (DrawablePalpableCatchHitObject)drawableObject;
-            hitObject = drawableCatchObject.HitObject;
-
             AddRangeInternal(new[]
             {
-                getFruitFor(hitObject.VisualRepresentation),
-                border = new BorderPiece(),
+                getFruitFor(VisualRepresentation.Value),
+                Border = new BorderPiece(),
             });
 
-            if (hitObject.HyperDash)
+            if (HyperDash.Value)
             {
                 AddInternal(new HyperBorderPiece());
             }
         }
 
-        protected override void Update()
-        {
-            base.Update();
-            border.Alpha = (float)Math.Clamp((hitObject.StartTime - Time.Current) / 500, 0, 1);
-        }
-
         private Drawable getFruitFor(FruitVisualRepresentation representation)
         {
             switch (representation)

From 23109f5bbced8d8725ff9fd9979e0178f3ee15cb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 10:55:33 +0900
Subject: [PATCH 06480/10326] Add bindable to drawable catch hit obejcts

---
 .../Drawables/DrawableCatchHitObject.cs       | 21 ++++++++++-
 .../Objects/Drawables/DrawableFruit.cs        | 22 +++++++-----
 .../DrawablePalpableCatchHitObject.cs         | 36 ++++++++++++++++++-
 3 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index f9f534f9ab..92b4f7cae2 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -10,6 +11,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
     {
+        public readonly Bindable<float> XBindable = new Bindable<float>();
+
         protected override double InitialLifetimeOffset => HitObject.TimePreempt;
 
         public float DisplayRadius => DrawSize.X / 2 * Scale.X * HitObject.Scale;
@@ -19,10 +22,26 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         protected DrawableCatchHitObject(CatchHitObject hitObject)
             : base(hitObject)
         {
-            X = hitObject.X;
+            if (hitObject != null)
+                XBindable.Value = hitObject.X;
+
             Anchor = Anchor.BottomLeft;
         }
 
+        protected override void OnApply()
+        {
+            base.OnApply();
+
+            XBindable.BindTo(HitObject.XBindable);
+        }
+
+        protected override void OnFree()
+        {
+            base.OnFree();
+
+            XBindable.UnbindFrom(HitObject.XBindable);
+        }
+
         public Func<CatchHitObject, bool> CheckPosition;
 
         public bool IsOnPlate;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index f4adabdbcb..d53bcd3a6f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -36,15 +36,19 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 VisualRepresentation.Value = GetVisualRepresentation(change.NewValue);
             }, true);
 
-            VisualRepresentation.BindValueChanged(change =>
-            {
-                ScaleContainer.Child = new SkinnableDrawable(
-                    new CatchSkinComponent(getComponent(change.NewValue)),
-                    _ => fruitPiece = new FruitPiece
-                    {
-                        VisualRepresentation = { BindTarget = VisualRepresentation },
-                    });
-            }, true);
+            VisualRepresentation.BindValueChanged(_ => updatePiece());
+            HyperDash.BindValueChanged(_ => updatePiece(), true);
+        }
+
+        private void updatePiece()
+        {
+            ScaleContainer.Child = new SkinnableDrawable(
+                new CatchSkinComponent(getComponent(VisualRepresentation.Value)),
+                _ => fruitPiece = new FruitPiece
+                {
+                    VisualRepresentation = { BindTarget = VisualRepresentation },
+                    HyperDash = { BindTarget = HyperDash },
+                });
         }
 
         protected override void OnApply()
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 9339a1c420..95f90a3eee 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -2,6 +2,7 @@
 // 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 osuTK;
@@ -12,6 +13,15 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
     {
         public new PalpableCatchHitObject HitObject => (PalpableCatchHitObject)base.HitObject;
 
+        public Bindable<bool> HyperDash { get; } = new Bindable<bool>();
+
+        public Bindable<float> ScaleBindable { get; } = new Bindable<float>(1);
+
+        /// <summary>
+        /// The multiplicative factor applied to <see cref="ScaleContainer"/> scale relative to <see cref="HitObject"/> scale.
+        /// </summary>
+        protected virtual float ScaleFactor => 1;
+
         /// <summary>
         /// Whether this hit object should stay on the catcher plate when the object is caught by the catcher.
         /// </summary>
@@ -36,7 +46,31 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            ScaleContainer.Scale = new Vector2(HitObject.Scale);
+            XBindable.BindValueChanged(x =>
+            {
+                if (!IsOnPlate) X = x.NewValue;
+            }, true);
+
+            ScaleBindable.BindValueChanged(scale =>
+            {
+                ScaleContainer.Scale = new Vector2(scale.NewValue * ScaleFactor);
+            }, true);
+        }
+
+        protected override void OnApply()
+        {
+            base.OnApply();
+
+            HyperDash.BindTo(HitObject.HyperDashBindable);
+            ScaleBindable.BindTo(HitObject.ScaleBindable);
+        }
+
+        protected override void OnFree()
+        {
+            HyperDash.UnbindFrom(HitObject.HyperDashBindable);
+            ScaleBindable.UnbindFrom(HitObject.ScaleBindable);
+
+            base.OnFree();
         }
     }
 }

From dbf67f82c009d9bdea881424869c051783db5e3d Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 11:40:38 +0900
Subject: [PATCH 06481/10326] Use bindable for DrawableDroplet HyperDash state

---
 .../Objects/Drawables/DrawableDroplet.cs             | 12 +++++++++++-
 .../Objects/Drawables/Pieces/DropletPiece.cs         |  7 ++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index 74cd240aa3..9e76265394 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -21,7 +21,17 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            ScaleContainer.Child = new SkinnableDrawable(new CatchSkinComponent(CatchSkinComponents.Droplet), _ => new DropletPiece());
+            HyperDash.BindValueChanged(_ => updatePiece(), true);
+        }
+
+        private void updatePiece()
+        {
+            ScaleContainer.Child = new SkinnableDrawable(
+                new CatchSkinComponent(CatchSkinComponents.Droplet),
+                _ => new DropletPiece
+                {
+                    HyperDash = { BindTarget = HyperDash }
+                });
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
index bcef30fda8..c90407ae15 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
@@ -2,6 +2,7 @@
 // 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.Game.Rulesets.Objects.Drawables;
@@ -11,6 +12,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     public class DropletPiece : CompositeDrawable
     {
+        public readonly Bindable<bool> HyperDash = new Bindable<bool>();
+
         public DropletPiece()
         {
             Size = new Vector2(CatchHitObject.OBJECT_RADIUS / 2);
@@ -19,15 +22,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableObject)
         {
-            var drawableCatchObject = (DrawablePalpableCatchHitObject)drawableObject;
-
             InternalChild = new Pulp
             {
                 RelativeSizeAxes = Axes.Both,
                 AccentColour = { BindTarget = drawableObject.AccentColour }
             };
 
-            if (drawableCatchObject.HitObject.HyperDash)
+            if (HyperDash.Value)
             {
                 AddInternal(new HyperDropletBorderPiece());
             }

From e36bb7631d0bc5abcd4ea82e4b90882afb322327 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 11:41:39 +0900
Subject: [PATCH 06482/10326] Fix colour not updated when index changes

---
 .../Objects/Drawables/DrawableFruit.cs          | 17 -----------------
 .../Drawables/DrawablePalpableCatchHitObject.cs |  8 ++++++++
 .../Objects/Drawables/DrawableHitObject.cs      |  6 +++---
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index d53bcd3a6f..e98f410724 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -12,8 +12,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableFruit : DrawablePalpableCatchHitObject
     {
-        public readonly Bindable<int> IndexInBeatmap = new Bindable<int>();
-
         public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
 
         protected virtual FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => (FruitVisualRepresentation)(indexInBeatmap % 4);
@@ -23,7 +21,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         public DrawableFruit(CatchHitObject h)
             : base(h)
         {
-            IndexInBeatmap.Value = h.IndexInBeatmap;
         }
 
         [BackgroundDependencyLoader]
@@ -51,20 +48,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 });
         }
 
-        protected override void OnApply()
-        {
-            base.OnApply();
-
-            IndexInBeatmap.BindTo(HitObject.IndexInBeatmapBindable);
-        }
-
-        protected override void OnFree()
-        {
-            IndexInBeatmap.UnbindFrom(HitObject.IndexInBeatmapBindable);
-
-            base.OnFree();
-        }
-
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 95f90a3eee..f44e290627 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         public Bindable<float> ScaleBindable { get; } = new Bindable<float>(1);
 
+        public readonly Bindable<int> IndexInBeatmap = new Bindable<int>();
+
         /// <summary>
         /// The multiplicative factor applied to <see cref="ScaleContainer"/> scale relative to <see cref="HitObject"/> scale.
         /// </summary>
@@ -41,6 +43,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
             });
+
+            IndexInBeatmap.Value = h.IndexInBeatmap;
         }
 
         [BackgroundDependencyLoader]
@@ -55,6 +59,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             {
                 ScaleContainer.Scale = new Vector2(scale.NewValue * ScaleFactor);
             }, true);
+
+            IndexInBeatmap.BindValueChanged(_ => UpdateComboColour());
         }
 
         protected override void OnApply()
@@ -63,12 +69,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
             HyperDash.BindTo(HitObject.HyperDashBindable);
             ScaleBindable.BindTo(HitObject.ScaleBindable);
+            IndexInBeatmap.BindTo(HitObject.IndexInBeatmapBindable);
         }
 
         protected override void OnFree()
         {
             HyperDash.UnbindFrom(HitObject.HyperDashBindable);
             ScaleBindable.UnbindFrom(HitObject.ScaleBindable);
+            IndexInBeatmap.UnbindFrom(HitObject.IndexInBeatmapBindable);
 
             base.OnFree();
         }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 9c799bcf32..182aa1dbe3 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -190,7 +190,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.LoadComplete();
 
-            comboIndexBindable.BindValueChanged(_ => updateComboColour(), true);
+            comboIndexBindable.BindValueChanged(_ => UpdateComboColour(), true);
 
             updateState(ArmedState.Idle, true);
         }
@@ -533,7 +533,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.SkinChanged(skin, allowFallback);
 
-            updateComboColour();
+            UpdateComboColour();
 
             ApplySkin(skin, allowFallback);
 
@@ -541,7 +541,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 updateState(State.Value, true);
         }
 
-        private void updateComboColour()
+        protected void UpdateComboColour()
         {
             if (!(HitObject is IHasComboInformation combo)) return;
 

From de471a7e8459334d4105797b51f2cbcf130e049f Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 11:42:14 +0900
Subject: [PATCH 06483/10326] Add test for dynamically changing catch fruits

---
 .../TestSceneFruitObjects.cs                  |  8 ++---
 .../TestSceneFruitVisualChange.cs             | 32 +++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 93ffb947e1..ee7ab27eed 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -30,13 +30,13 @@ namespace osu.Game.Rulesets.Catch.Tests
         }
 
         private Drawable createDrawableFruit(FruitVisualRepresentation rep, bool hyperdash = false) =>
-            setProperties(new TestDrawableFruit(new Fruit(), rep), hyperdash);
+            SetProperties(new TestDrawableFruit(new Fruit(), rep), hyperdash);
 
-        private Drawable createDrawableDroplet(bool hyperdash = false) => setProperties(new DrawableDroplet(new Droplet()), hyperdash);
+        private Drawable createDrawableDroplet(bool hyperdash = false) => SetProperties(new DrawableDroplet(new Droplet()), hyperdash);
 
-        private Drawable createDrawableTinyDroplet() => setProperties(new DrawableTinyDroplet(new TinyDroplet()));
+        private Drawable createDrawableTinyDroplet() => SetProperties(new DrawableTinyDroplet(new TinyDroplet()));
 
-        private DrawableCatchHitObject setProperties(DrawableCatchHitObject d, bool hyperdash = false)
+        protected virtual DrawableCatchHitObject SetProperties(DrawableCatchHitObject d, bool hyperdash = false)
         {
             var hitObject = d.HitObject;
             hitObject.StartTime = 1000000000000;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs
new file mode 100644
index 0000000000..4448e828e7
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.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.Bindables;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public class TestSceneFruitVisualChange : TestSceneFruitObjects
+    {
+        private readonly Bindable<int> indexInBeatmap = new Bindable<int>();
+        private readonly Bindable<bool> hyperDash = new Bindable<bool>();
+
+        protected override void LoadComplete()
+        {
+            AddStep("fruit changes visual and hyper", () => SetContents(() => SetProperties(new DrawableFruit(new Fruit
+            {
+                IndexInBeatmapBindable = { BindTarget = indexInBeatmap },
+                HyperDashBindable = { BindTarget = hyperDash },
+            }))));
+
+            AddStep("droplet changes hyper", () => SetContents(() => SetProperties(new DrawableDroplet(new Droplet
+            {
+                HyperDashBindable = { BindTarget = hyperDash },
+            }))));
+
+            Scheduler.AddDelayed(() => indexInBeatmap.Value++, 250, true);
+            Scheduler.AddDelayed(() => hyperDash.Value = !hyperDash.Value, 1000, true);
+        }
+    }
+}

From 35cd6674f62453170861d6dab2f738fbb66932ba Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 11:56:57 +0900
Subject: [PATCH 06484/10326] Fix tiny droplet scale factor

---
 .../Objects/Drawables/DrawableTinyDroplet.cs           | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableTinyDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableTinyDroplet.cs
index ae775684d8..8c4d821b4a 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableTinyDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableTinyDroplet.cs
@@ -1,21 +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.Allocation;
-
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableTinyDroplet : DrawableDroplet
     {
+        protected override float ScaleFactor => base.ScaleFactor / 2;
+
         public DrawableTinyDroplet(TinyDroplet h)
             : base(h)
         {
         }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            ScaleContainer.Scale /= 2;
-        }
     }
 }

From 7ce752391db81112da5ce10eec6b3c66de2d692b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 12:02:07 +0900
Subject: [PATCH 06485/10326] Make TestSceneFruitObjects show correct color

---
 .../TestSceneFruitObjects.cs                  | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index ee7ab27eed..c661977b03 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Objects;
@@ -17,33 +16,48 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             base.LoadComplete();
 
-            foreach (FruitVisualRepresentation rep in Enum.GetValues(typeof(FruitVisualRepresentation)))
-                AddStep($"show {rep}", () => SetContents(() => createDrawableFruit(rep)));
+            AddStep("show pear", () => SetContents(() => createDrawableFruit(0)));
+            AddStep("show grape", () => SetContents(() => createDrawableFruit(1)));
+            AddStep("show pineapple / apple", () => SetContents(() => createDrawableFruit(2)));
+            AddStep("show raspberry / orange", () => SetContents(() => createDrawableFruit(3)));
+
+            AddStep("show banana", () => SetContents(createDrawableBanana));
 
             AddStep("show droplet", () => SetContents(() => createDrawableDroplet()));
             AddStep("show tiny droplet", () => SetContents(createDrawableTinyDroplet));
 
-            foreach (FruitVisualRepresentation rep in Enum.GetValues(typeof(FruitVisualRepresentation)))
-                AddStep($"show hyperdash {rep}", () => SetContents(() => createDrawableFruit(rep, true)));
+            AddStep("show hyperdash pear", () => SetContents(() => createDrawableFruit(0, true)));
+            AddStep("show hyperdash grape", () => SetContents(() => createDrawableFruit(1, true)));
+            AddStep("show hyperdash pineapple / apple", () => SetContents(() => createDrawableFruit(2, true)));
+            AddStep("show hyperdash raspberry / orange", () => SetContents(() => createDrawableFruit(3, true)));
 
             AddStep("show hyperdash droplet", () => SetContents(() => createDrawableDroplet(true)));
         }
 
-        private Drawable createDrawableFruit(FruitVisualRepresentation rep, bool hyperdash = false) =>
-            SetProperties(new TestDrawableFruit(new Fruit(), rep), hyperdash);
+        private Drawable createDrawableFruit(int indexInBeatmap, bool hyperdash = false) =>
+            SetProperties(new DrawableFruit(new Fruit
+            {
+                IndexInBeatmap = indexInBeatmap,
+                HyperDashBindable = { Value = hyperdash }
+            }));
 
-        private Drawable createDrawableDroplet(bool hyperdash = false) => SetProperties(new DrawableDroplet(new Droplet()), hyperdash);
+        private Drawable createDrawableBanana() =>
+            SetProperties(new DrawableBanana(new Banana()));
+
+        private Drawable createDrawableDroplet(bool hyperdash = false) =>
+            SetProperties(new DrawableDroplet(new Droplet
+            {
+                HyperDashBindable = { Value = hyperdash }
+            }));
 
         private Drawable createDrawableTinyDroplet() => SetProperties(new DrawableTinyDroplet(new TinyDroplet()));
 
-        protected virtual DrawableCatchHitObject SetProperties(DrawableCatchHitObject d, bool hyperdash = false)
+        protected virtual DrawableCatchHitObject SetProperties(DrawableCatchHitObject d)
         {
             var hitObject = d.HitObject;
             hitObject.StartTime = 1000000000000;
             hitObject.Scale = 1.5f;
-
-            if (hyperdash)
-                ((PalpableCatchHitObject)hitObject).HyperDashTarget = new Banana();
+            hitObject.Samples.Clear(); // otherwise crash due to samples not loaded
 
             d.Anchor = Anchor.Centre;
             d.RelativePositionAxes = Axes.None;
@@ -55,18 +69,5 @@ namespace osu.Game.Rulesets.Catch.Tests
             };
             return d;
         }
-
-        public class TestDrawableFruit : DrawableFruit
-        {
-            private readonly FruitVisualRepresentation visualRepresentation;
-
-            protected override FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => visualRepresentation;
-
-            public TestDrawableFruit(Fruit fruit, FruitVisualRepresentation rep)
-                : base(fruit)
-            {
-                visualRepresentation = rep;
-            }
-        }
     }
 }

From 6e40de58e9a17aa3374ff3722e43543c975f4a9f Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 13:36:40 +0900
Subject: [PATCH 06486/10326] Use new OnAdd and OnRemove to invalidate DHO

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs    | 24 +++++++++++++++++
 .../Scrolling/ScrollingHitObjectContainer.cs  | 27 ++++++++++++++++++-
 .../UI/Scrolling/ScrollingPlayfield.cs        |  5 ----
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 5fbda305c8..ac5d281ddc 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -114,6 +114,7 @@ namespace osu.Game.Rulesets.UI
 
             bindStartTime(drawable);
             AddInternal(drawableMap[entry] = drawable, false);
+            OnAdd(drawable);
 
             HitObjectUsageBegan?.Invoke(entry.HitObject);
         }
@@ -129,6 +130,7 @@ namespace osu.Game.Rulesets.UI
 
             drawableMap.Remove(entry);
 
+            OnRemove(drawable);
             unbindStartTime(drawable);
             RemoveInternal(drawable);
 
@@ -147,10 +149,12 @@ namespace osu.Game.Rulesets.UI
             hitObject.OnRevertResult += onRevertResult;
 
             AddInternal(hitObject);
+            OnAdd(hitObject);
         }
 
         public virtual bool Remove(DrawableHitObject hitObject)
         {
+            OnRemove(hitObject);
             if (!RemoveInternal(hitObject))
                 return false;
 
@@ -178,6 +182,26 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
+        /// <summary>
+        /// Invoked when a <see cref="DrawableHitObject"/> is added to this container.
+        /// </summary>
+        /// <remarks>
+        /// This method is not invoked for nested <see cref="DrawableHitObject"/>s.
+        /// </remarks>
+        protected virtual void OnAdd(DrawableHitObject drawableHitObject)
+        {
+        }
+
+        /// <summary>
+        /// Invoked when a <see cref="DrawableHitObject"/> is removed from this container.
+        /// </summary>
+        /// <remarks>
+        /// This method is not invoked for nested <see cref="DrawableHitObject"/>s.
+        /// </remarks>
+        protected virtual void OnRemove(DrawableHitObject drawableHitObject)
+        {
+        }
+
         public virtual void Clear(bool disposeChildren = true)
         {
             lifetimeManager.ClearEntries();
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 02ee39e1b8..71f8f95300 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// <summary>
         /// Make this <see cref="DrawableHitObject"/> lifetime and layout computed in next update.
         /// </summary>
-        internal void InvalidateHitObject(DrawableHitObject hitObject)
+        private void invalidateHitObject(DrawableHitObject hitObject)
         {
             // Lifetime computation is delayed until next update because
             // when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed.
@@ -158,6 +158,31 @@ namespace osu.Game.Rulesets.UI.Scrolling
             layoutComputed.Remove(hitObject);
         }
 
+        private void onAddRecursive(DrawableHitObject hitObject)
+        {
+            invalidateHitObject(hitObject);
+
+            hitObject.DefaultsApplied += invalidateHitObject;
+
+            foreach (var nested in hitObject.NestedHitObjects)
+                onAddRecursive(nested);
+        }
+
+        protected override void OnAdd(DrawableHitObject drawableHitObject) => onAddRecursive(drawableHitObject);
+
+        private void onRemoveRecursive(DrawableHitObject hitObject)
+        {
+            toComputeLifetime.Remove(hitObject);
+            layoutComputed.Remove(hitObject);
+
+            hitObject.DefaultsApplied -= invalidateHitObject;
+
+            foreach (var nested in hitObject.NestedHitObjects)
+                onRemoveRecursive(nested);
+        }
+
+        protected override void OnRemove(DrawableHitObject drawableHitObject) => onRemoveRecursive(drawableHitObject);
+
         private float scrollLength;
 
         protected override void Update()
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 8aba896b34..2b75f93f9e 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -26,11 +26,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
             Direction.BindTo(ScrollingInfo.Direction);
         }
 
-        protected override void OnNewDrawableHitObject(DrawableHitObject drawableHitObject)
-        {
-            drawableHitObject.HitObjectApplied += d => HitObjectContainer.InvalidateHitObject(d);
-        }
-
         /// <summary>
         /// Given a position in screen space, return the time within this column.
         /// </summary>

From 792934f2c4ee5617c8a7ca68e8840d3c14400fb7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Nov 2020 13:54:36 +0900
Subject: [PATCH 06487/10326] Allow scroll type to be specified

This brings back the ability for the carousel to scroll in a classic
way. It turns out this is generally what we want for "seek" operations
like "random", else it's quite hard to get the expected animation.

I did experiment with applying the animation after the pooled panels are
retrieved, but in a best-case scenario there is still a gap where no
panels are displayed during the random seek operation.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 57 +++++++++++++++-------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 2012d47fd3..4ce87927a1 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Select
 
             Scroll.Clear(false);
             itemsCache.Invalidate();
-            scrollPositionCache.Invalidate();
+            ScrollToSelected();
 
             // apply any pending filter operation that may have been delayed (see applyActiveCriteria's scheduling behaviour when BeatmapSetsLoaded is false).
             FlushPendingFilterOperations();
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Select
         private readonly List<CarouselItem> visibleItems = new List<CarouselItem>();
 
         private readonly Cached itemsCache = new Cached();
-        private readonly Cached scrollPositionCache = new Cached();
+        private PendingScrollOperation pendingScrollOperation = PendingScrollOperation.None;
 
         public Bindable<bool> RightClickScrollingEnabled = new Bindable<bool>();
 
@@ -462,7 +462,7 @@ namespace osu.Game.Screens.Select
                 itemsCache.Invalidate();
 
                 if (alwaysResetScrollPosition || !Scroll.UserScrolling)
-                    ScrollToSelected();
+                    ScrollToSelected(true);
             }
         }
 
@@ -471,7 +471,12 @@ namespace osu.Game.Screens.Select
         /// <summary>
         /// Scroll to the current <see cref="SelectedBeatmap"/>.
         /// </summary>
-        public void ScrollToSelected() => scrollPositionCache.Invalidate();
+        /// <param name="immediate">
+        /// Whether the scroll position should immediately be shifted to the target, delegating animation to visible panels.
+        /// This should be true for operations like filtering - where panels are changing visibility state - to avoid large jumps in animation.
+        /// </param>
+        public void ScrollToSelected(bool immediate = false) =>
+            pendingScrollOperation = immediate ? PendingScrollOperation.Immediate : PendingScrollOperation.Standard;
 
         #region Key / button selection logic
 
@@ -481,12 +486,12 @@ namespace osu.Game.Screens.Select
             {
                 case Key.Left:
                     if (!e.Repeat)
-                        beginRepeatSelection(() => SelectNext(-1, true), e.Key);
+                        beginRepeatSelection(() => SelectNext(-1), e.Key);
                     return true;
 
                 case Key.Right:
                     if (!e.Repeat)
-                        beginRepeatSelection(() => SelectNext(1, true), e.Key);
+                        beginRepeatSelection(() => SelectNext(), e.Key);
                     return true;
             }
 
@@ -574,9 +579,8 @@ namespace osu.Game.Screens.Select
                 updateYPositions();
 
             // if there is a pending scroll action we apply it without animation and transfer the difference in position to the panels.
-            // due to this, scroll application needs to be run immediately after y position updates.
-            // if this isn't the case, the on-screen pooling / display logic following will fail briefly.
-            if (!scrollPositionCache.IsValid)
+            // this is intentionally applied before updating the visible range below, to avoid animating new items (sourced from pool) from locations off-screen, as it looks bad.
+            if (pendingScrollOperation != PendingScrollOperation.None)
                 updateScrollPosition();
 
             // This data is consumed to find the currently displayable range.
@@ -795,17 +799,27 @@ namespace osu.Game.Screens.Select
                     firstScroll = false;
                 }
 
-                // in order to simplify animation logic, rather than using the animated version of ScrollTo,
-                // we take the difference in scroll height and apply to all visible panels.
-                // this avoids edge cases like when the visible panels is reduced suddenly, causing ScrollContainer
-                // to enter clamp-special-case mode where it animates completely differently to normal.
-                float scrollChange = scrollTarget.Value - Scroll.Current;
+                switch (pendingScrollOperation)
+                {
+                    case PendingScrollOperation.Standard:
+                        Scroll.ScrollTo(scrollTarget.Value);
+                        break;
 
-                Scroll.ScrollTo(scrollTarget.Value, false);
-                scrollPositionCache.Validate();
+                    case PendingScrollOperation.Immediate:
+                        // in order to simplify animation logic, rather than using the animated version of ScrollTo,
+                        // we take the difference in scroll height and apply to all visible panels.
+                        // this avoids edge cases like when the visible panels is reduced suddenly, causing ScrollContainer
+                        // to enter clamp-special-case mode where it animates completely differently to normal.
+                        float scrollChange = scrollTarget.Value - Scroll.Current;
 
-                foreach (var i in Scroll.Children)
-                    i.Y += scrollChange;
+                        Scroll.ScrollTo(scrollTarget.Value, false);
+
+                        foreach (var i in Scroll.Children)
+                            i.Y += scrollChange;
+                        break;
+                }
+
+                pendingScrollOperation = PendingScrollOperation.None;
             }
         }
 
@@ -849,6 +863,13 @@ namespace osu.Game.Screens.Select
             item.SetMultiplicativeAlpha(Math.Clamp(1.75f - 1.5f * dist, 0, 1));
         }
 
+        private enum PendingScrollOperation
+        {
+            None,
+            Standard,
+            Immediate,
+        }
+
         /// <summary>
         /// A carousel item strictly used for binary search purposes.
         /// </summary>

From f29aa9c4fca5d157a6b610ddab4811b7734beee3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Nov 2020 14:34:12 +0900
Subject: [PATCH 06488/10326] Move taiko barlines to their own
 ScrollingHitObjectContainer to avoid being considered as a selectable object

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 35 +++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 120cf264c3..370760f03e 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.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.Graphics;
@@ -37,7 +38,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private SkinnableDrawable mascot;
 
         private ProxyContainer topLevelHitContainer;
-        private ProxyContainer barlineContainer;
+        private ScrollingHitObjectContainer barlineContainer;
         private Container rightArea;
         private Container leftArea;
 
@@ -83,10 +84,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                             RelativeSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
-                                barlineContainer = new ProxyContainer
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                },
+                                barlineContainer = new ScrollingHitObjectContainer(),
                                 new Container
                                 {
                                     Name = "Hit objects",
@@ -159,18 +157,37 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public override void Add(DrawableHitObject h)
         {
-            h.OnNewResult += OnNewResult;
-            base.Add(h);
-
             switch (h)
             {
                 case DrawableBarLine barline:
-                    barlineContainer.Add(barline.CreateProxy());
+                    barlineContainer.Add(barline);
                     break;
 
                 case DrawableTaikoHitObject taikoObject:
+                    h.OnNewResult += OnNewResult;
                     topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
+                    base.Add(h);
                     break;
+
+                default:
+                    throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type");
+            }
+        }
+
+        public override bool Remove(DrawableHitObject h)
+        {
+            switch (h)
+            {
+                case DrawableBarLine barline:
+                    return barlineContainer.Remove(barline);
+
+                case DrawableTaikoHitObject _:
+                    h.OnNewResult -= OnNewResult;
+                    // todo: consider tidying of proxied content if required.
+                    return base.Remove(h);
+
+                default:
+                    throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type");
             }
         }
 

From b9b885798801e8737498704e2186bec8fe985d58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Nov 2020 15:11:07 +0900
Subject: [PATCH 06489/10326] 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 6dab6edc5e..0b43fd73f5 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1120.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1127.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 54f3fcede6..e201383d51 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1120.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1127.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 692dac909a..e5f7581404 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.Framework.iOS" Version="2020.1120.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1127.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1120.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1127.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1246c8ba5f9b15bef09ff8c6b0a1fd208ddbb8d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Nov 2020 15:22:28 +0900
Subject: [PATCH 06490/10326] Reduce the opacity of the default skin slider
 ball

Previous value was [hitting pure white on some brighter combo
colours](https://github.com/ppy/osu/issues/10910#issuecomment-734354812).
---
 osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs | 2 +-
 1 file changed, 1 insertion(+), 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 c5bf790377..ca5ca7ac59 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
 
             private void trackingChanged(ValueChangedEvent<bool> tracking) =>
-                box.FadeTo(tracking.NewValue ? 0.6f : 0.05f, 200, Easing.OutQuint);
+                box.FadeTo(tracking.NewValue ? 0.3f : 0.05f, 200, Easing.OutQuint);
         }
     }
 }

From a7194e1bc347a204661c939517067cf931c997b6 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 15:41:35 +0900
Subject: [PATCH 06491/10326] add stateless RNG

---
 osu.Game/Utils/StatelessRNG.cs | 44 ++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 osu.Game/Utils/StatelessRNG.cs

diff --git a/osu.Game/Utils/StatelessRNG.cs b/osu.Game/Utils/StatelessRNG.cs
new file mode 100644
index 0000000000..8d08b26ca4
--- /dev/null
+++ b/osu.Game/Utils/StatelessRNG.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.
+
+namespace osu.Game.Utils
+{
+    /// Provides a fast stateless function that can be used in randomly-looking visual elements.
+    public static class StatelessRNG
+    {
+        private static ulong mix(ulong x)
+        {
+            unchecked
+            {
+                x ^= x >> 33;
+                x *= 0xff51afd7ed558ccd;
+                x ^= x >> 33;
+                x *= 0xc4ceb9fe1a85ec53;
+                x ^= x >> 33;
+                return x;
+            }
+        }
+
+        /// Compute an integer from given seed and series number.
+        /// <param name="seed">
+        /// The seed value of this random number generator.
+        /// </param>
+        /// <param name="series">
+        /// The series number.
+        /// Different values are computed for the same seed in different series.
+        /// </param>
+        public static ulong Get(int seed, int series = 0) =>
+            unchecked(mix(((ulong)(uint)series << 32) | ((uint)seed ^ 0x12345678)));
+
+        /// Compute a floating point value between 0 and 1 (excluding 1) from given seed and series number.
+        /// <param name="seed">
+        /// The seed value of this random number generator.
+        /// </param>
+        /// <param name="series">
+        /// The series number.
+        /// Different values are computed for the same seed in different series.
+        /// </param>
+        public static float GetSingle(int seed, int series = 0) =>
+            (float)(Get(seed, series) & ((1 << 24) - 1)) / (1 << 24); // float has 24-bit precision
+    }
+}

From 7edbba58f70d8d61ddfcb6e90d57db0424751f2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Nov 2020 16:28:29 +0900
Subject: [PATCH 06492/10326] Avoid updating hitobjects unnecessarily for start
 time changes

This was firing regardless of whether the start time was changed, such
as where beat snap provided the same time the object already has.

The case where a change actually occurs is already handled by
EditorBeatmap (see `startTimeBindables`), so it turns out this local
handling is not required at all.
---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index def5f396f1..57f9a7f221 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -496,10 +496,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 double offset = result.Time.Value - movementBlueprints.First().HitObject.StartTime;
 
                 foreach (HitObject obj in Beatmap.SelectedHitObjects)
-                {
                     obj.StartTime += offset;
-                    Beatmap.Update(obj);
-                }
             }
 
             return true;

From 18bb0cb45b944dbcb2afee1673ec1601702d6249 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Nov 2020 16:31:59 +0900
Subject: [PATCH 06493/10326] Remove unnecessary schedule logic from Apply's
 local updateState call

There were cases in the editor where rewinding of transforms would
leave the `DrawableHitObject` in a non-`IsPresent` state, resulting in
this scheduled logic never running.

This would in turn cause ghost hitobjects, which disappear under certain
circumstances.

Reproduction:

- Open editor to empty beatmap
- Place single hitcircle at current point in time
- Drag editor timeline backwards to seek before zero, and wait for
  return to zero
- Select hitcircle in playfield
- Drag hitcircle to right in timeline, triggering a start time change
---
 .../Objects/Drawables/DrawableHitObject.cs      | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 9c799bcf32..95bc72edf6 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -263,18 +263,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
             OnApply();
             HitObjectApplied?.Invoke(this);
 
-            // If not loaded, the state update happens in LoadComplete(). Otherwise, the update is scheduled to allow for lifetime updates.
+            // If not loaded, the state update happens in LoadComplete().
             if (IsLoaded)
             {
-                Scheduler.Add(() =>
-                {
-                    if (Result.IsHit)
-                        updateState(ArmedState.Hit, true);
-                    else if (Result.HasResult)
-                        updateState(ArmedState.Miss, true);
-                    else
-                        updateState(ArmedState.Idle, true);
-                });
+                if (Result.IsHit)
+                    updateState(ArmedState.Hit, true);
+                else if (Result.HasResult)
+                    updateState(ArmedState.Miss, true);
+                else
+                    updateState(ArmedState.Idle, true);
             }
 
             hasHitObjectApplied = true;

From a9c59eed02edba7a43c5d2bebaf21c8a25f7e3cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Nov 2020 16:56:26 +0900
Subject: [PATCH 06494/10326] Add test coverage of fail scenario

---
 .../Editing/EditorChangeHandlerTest.cs        | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
index b7a41ffd1c..5064b0fd22 100644
--- a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
+++ b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
@@ -44,6 +43,36 @@ namespace osu.Game.Tests.Editing
             Assert.That(stateChangedFired, Is.EqualTo(2));
         }
 
+        [Test]
+        public void TestApplyThenUndoThenApplySameChange()
+        {
+            var (handler, beatmap) = createChangeHandler();
+
+            Assert.That(handler.CanUndo.Value, Is.False);
+            Assert.That(handler.CanRedo.Value, Is.False);
+
+            string originalHash = handler.CurrentStateHash;
+
+            addArbitraryChange(beatmap);
+            handler.SaveState();
+
+            Assert.That(handler.CanUndo.Value, Is.True);
+            Assert.That(handler.CanRedo.Value, Is.False);
+            Assert.That(stateChangedFired, Is.EqualTo(1));
+
+            string hash = handler.CurrentStateHash;
+
+            // save a save without making any changes
+            handler.RestoreState(-1);
+
+            Assert.That(originalHash, Is.EqualTo(handler.CurrentStateHash));
+            Assert.That(stateChangedFired, Is.EqualTo(2));
+
+            addArbitraryChange(beatmap);
+            handler.SaveState();
+            Assert.That(hash, Is.EqualTo(handler.CurrentStateHash));
+        }
+
         [Test]
         public void TestSaveSameStateDoesNotSave()
         {
@@ -139,7 +168,7 @@ namespace osu.Game.Tests.Editing
 
         private void addArbitraryChange(EditorBeatmap beatmap)
         {
-            beatmap.Add(new HitCircle { StartTime = RNG.Next(0, 100000) });
+            beatmap.Add(new HitCircle { StartTime = 2760 });
         }
     }
 }

From 7e34c5e239e2e9fed537ce99cde4f7b3311a6469 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Nov 2020 16:57:11 +0900
Subject: [PATCH 06495/10326] Fix state application always checking newest
 state for early abort, rather than current

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

diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 62187aed24..2dcb416a03 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Screens.Edit
                 var newState = stream.ToArray();
 
                 // if the previous state is binary equal we don't need to push a new one, unless this is the initial state.
-                if (savedStates.Count > 0 && newState.SequenceEqual(savedStates.Last())) return;
+                if (savedStates.Count > 0 && newState.SequenceEqual(savedStates[currentState])) return;
 
                 if (currentState < savedStates.Count - 1)
                     savedStates.RemoveRange(currentState + 1, savedStates.Count - currentState - 1);

From 5bc76cac58a1e0690e9df0d6cd165841f9a3e736 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Nov 2020 17:01:07 +0900
Subject: [PATCH 06496/10326] Remove unused using statement

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index cf9908decd..628d95dff4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Graphics.Containers;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.UI;
 using osuTK;
 

From 579e61eab9502a205ed0a85a678e5d980d647bd2 Mon Sep 17 00:00:00 2001
From: PercyDan <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 28 Nov 2020 16:31:24 +0800
Subject: [PATCH 06497/10326] Allow null

---
 osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
index 22674f0879..4a9c9bd8a2 100644
--- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
     {
         protected override string Header => "General";
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, OsuGame game)
         {
             Children = new Drawable[]

From 8ad4cf73f5c17fca110486de442a83cf11074473 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Sat, 28 Nov 2020 17:07:29 +0200
Subject: [PATCH 06498/10326] Scale stars from 0.4 to 1

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

diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index b13d6485ac..f249156a59 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Graphics.UserInterface
 
             public override void DisplayAt(float scale)
             {
-                scale = Math.Clamp(scale, min_star_scale, 1);
+                scale = Math.Clamp(scale * (1 - min_star_scale) + min_star_scale, min_star_scale, 1);
 
                 this.FadeTo(scale, fading_duration);
                 Icon.ScaleTo(scale, scaling_duration, scaling_easing);

From 8e0f525588a5d0e997b5a15da50045ebbb719434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 28 Nov 2020 20:29:35 +0100
Subject: [PATCH 06499/10326] Rewrite existing test scene somewhat

---
 .../Visual/Gameplay/TestSceneStarCounter.cs   | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
index 709e71d195..d6a6ef712a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
@@ -3,7 +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;
@@ -14,44 +13,40 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneStarCounter : OsuTestScene
     {
+        private readonly StarCounter starCounter;
+        private readonly OsuSpriteText starsLabel;
+
         public TestSceneStarCounter()
         {
-            StarCounter stars = new StarCounter
+            starCounter = new StarCounter
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
-                Current = 5,
             };
 
-            Add(stars);
+            Add(starCounter);
 
-            SpriteText starsLabel = new OsuSpriteText
+            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);
+            setStars(5);
 
-            AddStep(@"Stop animation", delegate
-            {
-                stars.StopAnimation();
-            });
+            AddRepeatStep("random value", () => setStars(RNG.NextSingle() * (starCounter.StarCount + 1)), 10);
+            AddStep("stop animation", () => starCounter.StopAnimation());
+            AddStep("reset", () => setStars(0));
+        }
 
-            AddStep(@"Reset", delegate
-            {
-                stars.Current = 0;
-                starsLabel.Text = stars.Current.ToString("0.00");
-            });
+        private void setStars(float stars)
+        {
+            starCounter.Current = stars;
+            starsLabel.Text = starCounter.Current.ToString("0.00");
         }
     }
 }

From 9bf70e4e97ed84c95bb5d19eb4e7cf59391f7e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 28 Nov 2020 20:32:08 +0100
Subject: [PATCH 06500/10326] Add slider test step for visual inspection
 purposes

---
 osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
index d6a6ef712a..717485bcc1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             setStars(5);
 
             AddRepeatStep("random value", () => setStars(RNG.NextSingle() * (starCounter.StarCount + 1)), 10);
+            AddSliderStep("exact value", 0f, 10f, 5f, setStars);
             AddStep("stop animation", () => starCounter.StopAnimation());
             AddStep("reset", () => setStars(0));
         }

From a3afd88387b0d4cb939adf2ff69cd3031672d06a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 28 Nov 2020 20:35:03 +0100
Subject: [PATCH 06501/10326] Use Interpolation.Lerp

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

diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index f249156a59..894a21fcf3 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Graphics.UserInterface
 
             public override void DisplayAt(float scale)
             {
-                scale = Math.Clamp(scale * (1 - min_star_scale) + min_star_scale, min_star_scale, 1);
+                scale = (float)Interpolation.Lerp(min_star_scale, 1, Math.Clamp(scale, 0, 1));
 
                 this.FadeTo(scale, fading_duration);
                 Icon.ScaleTo(scale, scaling_duration, scaling_easing);

From a5c4a8d2e9ae59d133547c9f1748c135ec87eb5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 29 Nov 2020 22:00:15 +0100
Subject: [PATCH 06502/10326] Create "User Interface" settings section

---
 .../Settings/Sections/AudioSection.cs         |  1 -
 .../Settings/Sections/GameplaySection.cs      |  1 -
 .../Settings/Sections/GraphicsSection.cs      |  1 -
 .../GeneralSettings.cs}                       |  6 ++--
 .../MainMenuSettings.cs                       |  2 +-
 .../SongSelectSettings.cs                     |  2 +-
 .../Settings/Sections/UserInterfaceSection.cs | 29 +++++++++++++++++++
 osu.Game/Overlays/SettingsOverlay.cs          |  1 +
 8 files changed, 35 insertions(+), 8 deletions(-)
 rename osu.Game/Overlays/Settings/Sections/{Graphics/UserInterfaceSettings.cs => UserInterface/GeneralSettings.cs} (88%)
 rename osu.Game/Overlays/Settings/Sections/{Audio => UserInterface}/MainMenuSettings.cs (97%)
 rename osu.Game/Overlays/Settings/Sections/{Gameplay => UserInterface}/SongSelectSettings.cs (97%)
 create mode 100644 osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs

diff --git a/osu.Game/Overlays/Settings/Sections/AudioSection.cs b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
index 69538358f1..7072d8e63d 100644
--- a/osu.Game/Overlays/Settings/Sections/AudioSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
@@ -27,7 +27,6 @@ namespace osu.Game.Overlays.Settings.Sections
                 new AudioDevicesSettings(),
                 new VolumeSettings(),
                 new OffsetSettings(),
-                new MainMenuSettings()
             };
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index e5cebd28e2..acb94a6a01 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -26,7 +26,6 @@ namespace osu.Game.Overlays.Settings.Sections
             Children = new Drawable[]
             {
                 new GeneralSettings(),
-                new SongSelectSettings(),
                 new ModsSettings(),
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
index c1b4b0bbcb..4ade48031f 100644
--- a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Overlays.Settings.Sections
                 new RendererSettings(),
                 new LayoutSettings(),
                 new DetailSettings(),
-                new UserInterfaceSettings(),
             };
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
similarity index 88%
rename from osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
rename to osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
index 38c30ddd64..419d2e83ad 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
@@ -6,11 +6,11 @@ using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Settings.Sections.Graphics
+namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
-    public class UserInterfaceSettings : SettingsSubsection
+    public class GeneralSettings : SettingsSubsection
     {
-        protected override string Header => "User Interface";
+        protected override string Header => "General";
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
similarity index 97%
rename from osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
rename to osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 7682967d10..598b666642 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -7,7 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 
-namespace osu.Game.Overlays.Settings.Sections.Audio
+namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
     public class MainMenuSettings : SettingsSubsection
     {
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
similarity index 97%
rename from osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
rename to osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
index b26876556e..c73a783d37 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Settings.Sections.Gameplay
+namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
     public class SongSelectSettings : SettingsSubsection
     {
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs b/osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs
new file mode 100644
index 0000000000..718fea5f2b
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/UserInterfaceSection.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.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays.Settings.Sections.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class UserInterfaceSection : SettingsSection
+    {
+        public override string Header => "User Interface";
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Solid.LayerGroup
+        };
+
+        public UserInterfaceSection()
+        {
+            Children = new Drawable[]
+            {
+                new GeneralSettings(),
+                new MainMenuSettings(),
+                new SongSelectSettings()
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index e1bcdbbaf0..f05d82cb6c 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Overlays
         {
             new GeneralSection(),
             new GraphicsSection(),
+            new UserInterfaceSection(),
             new GameplaySection(),
             new AudioSection(),
             new SkinSection(),

From e0a84ff1dc174ec206ff12d094639bc670c5b6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 29 Nov 2020 22:03:56 +0100
Subject: [PATCH 06503/10326] Move hold-to-confirm setting back to gameplay
 section

---
 .../Settings/Sections/Gameplay/GeneralSettings.cs    | 12 ++++++++++++
 .../Sections/UserInterface/GeneralSettings.cs        | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index be464fa2b7..53f1a0b4ba 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -5,6 +5,7 @@ using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Overlays.Settings.Sections.Gameplay
@@ -63,6 +64,12 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Always show key overlay",
                     Current = config.GetBindable<bool>(OsuSetting.KeyOverlay)
                 },
+                new SettingsSlider<float, TimeSlider>
+                {
+                    LabelText = "Hold-to-confirm activation time",
+                    Current = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
+                    KeyboardStep = 50
+                },
                 new SettingsCheckbox
                 {
                     LabelText = "Positional hitsounds",
@@ -95,5 +102,10 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 });
             }
         }
+
+        private class TimeSlider : OsuSliderBar<float>
+        {
+            public override string TooltipText => Current.Value.ToString("N0") + "ms";
+        }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
index 419d2e83ad..797e00a147 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
@@ -27,18 +26,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
                     LabelText = "Parallax",
                     Current = config.GetBindable<bool>(OsuSetting.MenuParallax)
                 },
-                new SettingsSlider<float, TimeSlider>
-                {
-                    LabelText = "Hold-to-confirm activation time",
-                    Current = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
-                    KeyboardStep = 50
-                },
             };
         }
-
-        private class TimeSlider : OsuSliderBar<float>
-        {
-            public override string TooltipText => Current.Value.ToString("N0") + "ms";
-        }
     }
 }

From 3994cf082d835f9cb61dc687c2270bd800af2514 Mon Sep 17 00:00:00 2001
From: Ryan Zmuda <ryanzmuda@gmail.com>
Date: Sun, 29 Nov 2020 20:59:02 -0500
Subject: [PATCH 06504/10326] add keybind for in game overlay

---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 +-
 .../Input/Bindings/GlobalActionContainer.cs   |  4 +++
 osu.Game/Screens/Play/HUDOverlay.cs           | 31 +++++++++++--------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 89a6ee8b07..a07e446d2e 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Configuration
             return new TrackedSettings
             {
                 new TrackedSetting<bool>(OsuSetting.MouseDisableButtons, v => new SettingDescription(!v, "gameplay mouse buttons", v ? "disabled" : "enabled", LookupKeyBindings(GlobalAction.ToggleGameplayMouseButtons))),
-                new TrackedSetting<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode, m => new SettingDescription(m, "HUD Visibility", m.GetDescription(), $"cycle: shift-tab quick view: {LookupKeyBindings(GlobalAction.HoldForHUD)}")),
+                new TrackedSetting<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode, m => new SettingDescription(m, "HUD Visibility", m.GetDescription(), $"cycle: {LookupKeyBindings(GlobalAction.ToggleInGameInterface)} quick view: {LookupKeyBindings(GlobalAction.HoldForHUD)}")),
                 new TrackedSetting<ScalingMode>(OsuSetting.Scaling, m => new SettingDescription(m, "scaling", m.GetDescription())),
                 new TrackedSetting<int>(OsuSetting.Skin, m =>
                 {
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 74eb2b0126..a59d69e5b5 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -68,6 +68,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.Tilde }, GlobalAction.QuickExit),
             new KeyBinding(new[] { InputKey.Control, InputKey.Plus }, GlobalAction.IncreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.Control, InputKey.Minus }, GlobalAction.DecreaseScrollSpeed),
+            new KeyBinding(InputKey.I, GlobalAction.ToggleInGameInterface),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
             new KeyBinding(InputKey.Space, GlobalAction.TogglePauseReplay),
             new KeyBinding(InputKey.Control, GlobalAction.HoldForHUD),
@@ -145,6 +146,9 @@ namespace osu.Game.Input.Bindings
         [Description("Decrease scroll speed")]
         DecreaseScrollSpeed,
 
+        [Description("Toggle in-game interface")]
+        ToggleInGameInterface,
+
         [Description("Select")]
         Select,
 
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index e83dded075..964e0d0536 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -282,20 +282,7 @@ namespace osu.Game.Screens.Play
                 switch (e.Key)
                 {
                     case Key.Tab:
-                        switch (configVisibilityMode.Value)
-                        {
-                            case HUDVisibilityMode.Never:
-                                configVisibilityMode.Value = HUDVisibilityMode.HideDuringGameplay;
-                                break;
 
-                            case HUDVisibilityMode.HideDuringGameplay:
-                                configVisibilityMode.Value = HUDVisibilityMode.Always;
-                                break;
-
-                            case HUDVisibilityMode.Always:
-                                configVisibilityMode.Value = HUDVisibilityMode.Never;
-                                break;
-                        }
 
                         return true;
                 }
@@ -377,6 +364,24 @@ namespace osu.Game.Screens.Play
                     holdingForHUD = true;
                     updateVisibility();
                     return true;
+
+                case GlobalAction.ToggleInGameInterface:
+                    switch (configVisibilityMode.Value)
+                    {
+                        case HUDVisibilityMode.Never:
+                            configVisibilityMode.Value = HUDVisibilityMode.HideDuringGameplay;
+                            break;
+
+                        case HUDVisibilityMode.HideDuringGameplay:
+                            configVisibilityMode.Value = HUDVisibilityMode.Always;
+                            break;
+
+                        case HUDVisibilityMode.Always:
+                            configVisibilityMode.Value = HUDVisibilityMode.Never;
+                            break;
+                    }
+                    updateVisibility();
+                    return true;
             }
 
             return false;

From a780a8bbd8db3e3e8bd8737480de1503df6f81b8 Mon Sep 17 00:00:00 2001
From: Ryan Zmuda <ryanzmuda@gmail.com>
Date: Sun, 29 Nov 2020 21:52:58 -0500
Subject: [PATCH 06505/10326] forgot to remove something... sorry

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

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 964e0d0536..457706b8f5 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -273,24 +273,6 @@ namespace osu.Game.Screens.Play
             Progress.BindDrawableRuleset(drawableRuleset);
         }
 
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            if (e.Repeat) return false;
-
-            if (e.ShiftPressed)
-            {
-                switch (e.Key)
-                {
-                    case Key.Tab:
-
-
-                        return true;
-                }
-            }
-
-            return base.OnKeyDown(e);
-        }
-
         protected virtual SkinnableAccuracyCounter CreateAccuracyCounter() => new SkinnableAccuracyCounter();
 
         protected virtual SkinnableScoreCounter CreateScoreCounter() => new SkinnableScoreCounter();

From 5d3a5081a0548f98d485c4dfe8d879e70536159d Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 12:52:58 +0900
Subject: [PATCH 06506/10326] Remove use of HitObject in DHO constructors.

---
 .../Objects/Drawables/DrawableCatchHitObject.cs             | 6 ++----
 .../Objects/Drawables/DrawablePalpableCatchHitObject.cs     | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 92b4f7cae2..1faa6a5b0f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.UI;
@@ -19,12 +20,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected override float SamplePlaybackPosition => HitObject.X / CatchPlayfield.WIDTH;
 
-        protected DrawableCatchHitObject(CatchHitObject hitObject)
+        protected DrawableCatchHitObject([CanBeNull] CatchHitObject hitObject)
             : base(hitObject)
         {
-            if (hitObject != null)
-                XBindable.Value = hitObject.X;
-
             Anchor = Anchor.BottomLeft;
         }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index f44e290627..128d81aca4 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -31,7 +32,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected readonly Container ScaleContainer;
 
-        protected DrawablePalpableCatchHitObject(CatchHitObject h)
+        protected DrawablePalpableCatchHitObject([CanBeNull] CatchHitObject h)
             : base(h)
         {
             Origin = Anchor.Centre;
@@ -43,8 +44,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
             });
-
-            IndexInBeatmap.Value = h.IndexInBeatmap;
         }
 
         [BackgroundDependencyLoader]

From 7986d7802df3d39f976f9ff71cef2dea6fcedf60 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 12:58:14 +0900
Subject: [PATCH 06507/10326] Use `ApplyDefaults` in `TestSceneFruitObjects`.

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

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index c661977b03..160da75aa9 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -3,6 +3,8 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osuTK;
@@ -55,9 +57,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         protected virtual DrawableCatchHitObject SetProperties(DrawableCatchHitObject d)
         {
             var hitObject = d.HitObject;
+            hitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 0 });
             hitObject.StartTime = 1000000000000;
             hitObject.Scale = 1.5f;
-            hitObject.Samples.Clear(); // otherwise crash due to samples not loaded
 
             d.Anchor = Anchor.Centre;
             d.RelativePositionAxes = Axes.None;

From 09b7ba41d6632da36896b2b79371aa54e601961e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 13:00:01 +0900
Subject: [PATCH 06508/10326] Consistently use readonly field for bindables.

---
 .../Objects/Drawables/DrawablePalpableCatchHitObject.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 128d81aca4..a3908f94b6 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -14,9 +14,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
     {
         public new PalpableCatchHitObject HitObject => (PalpableCatchHitObject)base.HitObject;
 
-        public Bindable<bool> HyperDash { get; } = new Bindable<bool>();
+        public readonly Bindable<bool> HyperDash = new Bindable<bool>();
 
-        public Bindable<float> ScaleBindable { get; } = new Bindable<float>(1);
+        public readonly Bindable<float> ScaleBindable = new Bindable<float>(1);
 
         public readonly Bindable<int> IndexInBeatmap = new Bindable<int>();
 

From 5e0e4e9db793af739f78794dfd9cab7268bdd8fc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 13:06:04 +0900
Subject: [PATCH 06509/10326] Use private access modifier for `Border` field.

---
 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
index a9a8f551ce..f7d931ad5b 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
         public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
         public readonly Bindable<bool> HyperDash = new Bindable<bool>();
 
-        public BorderPiece Border;
+        public BorderPiece Border { get; private set; }
 
         public FruitPiece()
         {

From 6478bed431ec467b5c3579a3d264b8719a6b1f81 Mon Sep 17 00:00:00 2001
From: Ryan Zmuda <ryanzmuda@gmail.com>
Date: Sun, 29 Nov 2020 23:14:43 -0500
Subject: [PATCH 06510/10326] Revert "forgot to remove something... sorry"

This reverts commit a780a8bbd8db3e3e8bd8737480de1503df6f81b8.
---
 osu.Game/Screens/Play/HUDOverlay.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 457706b8f5..964e0d0536 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -273,6 +273,24 @@ namespace osu.Game.Screens.Play
             Progress.BindDrawableRuleset(drawableRuleset);
         }
 
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (e.Repeat) return false;
+
+            if (e.ShiftPressed)
+            {
+                switch (e.Key)
+                {
+                    case Key.Tab:
+
+
+                        return true;
+                }
+            }
+
+            return base.OnKeyDown(e);
+        }
+
         protected virtual SkinnableAccuracyCounter CreateAccuracyCounter() => new SkinnableAccuracyCounter();
 
         protected virtual SkinnableScoreCounter CreateScoreCounter() => new SkinnableScoreCounter();

From 9145557522e94e53aa4a0c74f0cc534d23329847 Mon Sep 17 00:00:00 2001
From: Ryan Zmuda <ryanzmuda@gmail.com>
Date: Sun, 29 Nov 2020 23:15:12 -0500
Subject: [PATCH 06511/10326] Revert "Revert "forgot to remove something...
 sorry""

This reverts commit 6478bed431ec467b5c3579a3d264b8719a6b1f81.
---
 osu.Game/Screens/Play/HUDOverlay.cs | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 964e0d0536..457706b8f5 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -273,24 +273,6 @@ namespace osu.Game.Screens.Play
             Progress.BindDrawableRuleset(drawableRuleset);
         }
 
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            if (e.Repeat) return false;
-
-            if (e.ShiftPressed)
-            {
-                switch (e.Key)
-                {
-                    case Key.Tab:
-
-
-                        return true;
-                }
-            }
-
-            return base.OnKeyDown(e);
-        }
-
         protected virtual SkinnableAccuracyCounter CreateAccuracyCounter() => new SkinnableAccuracyCounter();
 
         protected virtual SkinnableScoreCounter CreateScoreCounter() => new SkinnableScoreCounter();

From 6bea78619a9c59aefcbd47d935233fc61496031e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 30 Nov 2020 13:33:29 +0900
Subject: [PATCH 06512/10326] Update 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.Tests/Editing/EditorChangeHandlerTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
index 5064b0fd22..481cb3230e 100644
--- a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
+++ b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Tests.Editing
 
             string hash = handler.CurrentStateHash;
 
-            // save a save without making any changes
+            // undo a change without saving
             handler.RestoreState(-1);
 
             Assert.That(originalHash, Is.EqualTo(handler.CurrentStateHash));

From 4228977c866becfb4710349cf86c654d166a4817 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 13:46:02 +0900
Subject: [PATCH 06513/10326] Store a DHO in `FruitPiece` to animate itself.

---
 .../Objects/Drawables/DrawableFruit.cs        | 12 +------
 .../Objects/Drawables/Pieces/FruitPiece.cs    | 33 +++++++++++++------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index e98f410724..4338d80345 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected virtual FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => (FruitVisualRepresentation)(indexInBeatmap % 4);
 
-        private FruitPiece fruitPiece;
-
         public DrawableFruit(CatchHitObject h)
             : base(h)
         {
@@ -41,21 +39,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             ScaleContainer.Child = new SkinnableDrawable(
                 new CatchSkinComponent(getComponent(VisualRepresentation.Value)),
-                _ => fruitPiece = new FruitPiece
+                _ => new FruitPiece
                 {
                     VisualRepresentation = { BindTarget = VisualRepresentation },
                     HyperDash = { BindTarget = HyperDash },
                 });
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            if (fruitPiece != null)
-                fruitPiece.Border.Alpha = (float)Math.Clamp((StartTimeBindable.Value - Time.Current) / 500, 0, 1);
-        }
-
         private CatchSkinComponents getComponent(FruitVisualRepresentation hitObjectVisualRepresentation)
         {
             switch (hitObjectVisualRepresentation)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
index f7d931ad5b..25fc53ce21 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
@@ -1,10 +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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
@@ -18,26 +21,36 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
         public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
         public readonly Bindable<bool> HyperDash = new Bindable<bool>();
 
-        public BorderPiece Border { get; private set; }
+        [CanBeNull]
+        private DrawableCatchHitObject drawableHitObject;
+
+        [CanBeNull]
+        private BorderPiece borderPiece;
 
         public FruitPiece()
         {
             RelativeSizeAxes = Axes.Both;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load([CanBeNull] DrawableHitObject drawable)
         {
-            AddRangeInternal(new[]
-            {
-                getFruitFor(VisualRepresentation.Value),
-                Border = new BorderPiece(),
-            });
+            drawableHitObject = (DrawableCatchHitObject)drawable;
+
+            AddInternal(getFruitFor(VisualRepresentation.Value));
+
+            // if it is not part of a DHO, the border is always invisible.
+            if (drawableHitObject != null)
+                AddInternal(borderPiece = new BorderPiece());
 
             if (HyperDash.Value)
-            {
                 AddInternal(new HyperBorderPiece());
-            }
+        }
+
+        protected override void Update()
+        {
+            if (borderPiece != null && drawableHitObject.HitObject != null)
+                borderPiece.Alpha = (float)Math.Clamp((drawableHitObject.HitObject.StartTime - Time.Current) / 500, 0, 1);
         }
 
         private Drawable getFruitFor(FruitVisualRepresentation representation)

From 8528b2687f922d6013c720bf8ca6cb4990e95ea8 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 14:24:50 +0900
Subject: [PATCH 06514/10326] Fix possible null reference.

---
 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
index 25fc53ce21..31487ee407 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 
         protected override void Update()
         {
-            if (borderPiece != null && drawableHitObject.HitObject != null)
+            if (borderPiece != null && drawableHitObject?.HitObject != null)
                 borderPiece.Alpha = (float)Math.Clamp((drawableHitObject.HitObject.StartTime - Time.Current) / 500, 0, 1);
         }
 

From 73990a6674a4d4037574bf569c3b361b857d9dc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 15:20:52 +0900
Subject: [PATCH 06515/10326] Fix osu!catch combo counter not showing after 1
 combo

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

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index abbdeacd9a..f2f783a11c 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -55,6 +55,11 @@ namespace osu.Game.Rulesets.Catch.UI
                 HitObjectContainer,
                 CatcherArea,
             };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             NewResult += onNewResult;
             RevertResult += onRevertResult;

From 9fbfb1aa9fd2fd766c066c0b987ee4089b5c2066 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 15:22:55 +0900
Subject: [PATCH 06516/10326] Add comment explaining requirement

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index f2f783a11c..9df32d8d36 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -61,6 +61,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             base.LoadComplete();
 
+            // these subscriptions need to be done post constructor to ensure externally bound components have a chance to populate required fields (ScoreProcessor / ComboAtJudgement in this case).
             NewResult += onNewResult;
             RevertResult += onRevertResult;
         }

From 809caaa44c72f72f5b64bf67a537ff6303d0a16a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 15:39:08 +0900
Subject: [PATCH 06517/10326] Use standard switch syntax (preferred for now)

---
 .../TestSceneDrawableScrollingRuleset.cs      | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 257ae10d82..8da2b58c1e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -302,14 +302,21 @@ namespace osu.Game.Tests.Visual.Gameplay
                 TimeRange.Value = time_range;
             }
 
-            public override DrawableHitObject<TestHitObject> CreateDrawableRepresentation(TestHitObject h) =>
-                h switch
+            public override DrawableHitObject<TestHitObject> CreateDrawableRepresentation(TestHitObject h)
+            {
+                switch (h)
                 {
-                    TestPooledHitObject _ => null,
-                    TestPooledParentHitObject _ => null,
-                    TestParentHitObject p => new DrawableTestParentHitObject(p),
-                    _ => new DrawableTestHitObject(h),
-                };
+                    case TestPooledHitObject _:
+                    case TestPooledParentHitObject _:
+                        return null;
+
+                    case TestParentHitObject p:
+                        return new DrawableTestParentHitObject(p);
+
+                    default:
+                        return new DrawableTestHitObject(h);
+                }
+            }
 
             protected override PassThroughInputManager CreateInputManager() => new PassThroughInputManager();
 

From 31cfaefdeb57bb967555c225804db5309e979592 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 15:39:43 +0900
Subject: [PATCH 06518/10326] Move private functions in line with others

---
 .../TestSceneDrawableScrollingRuleset.cs      | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 8da2b58c1e..9931ee4a45 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -90,22 +90,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             assertChildPosition(5);
         }
 
-        private void assertDead(int index) => AddAssert($"hitobject {index} is dead", () => getDrawableHitObject(index) == null);
-
-        private void assertHeight(int index) => AddAssert($"hitobject {index} height", () =>
-        {
-            var d = getDrawableHitObject(index);
-            return d != null && Precision.AlmostEquals(d.DrawHeight, yScale * (float)(d.HitObject.Duration / time_range), 0.1f);
-        });
-
-        private void assertChildPosition(int index) => AddAssert($"hitobject {index} child position", () =>
-        {
-            var d = getDrawableHitObject(index);
-            return d is DrawableTestParentHitObject && Precision.AlmostEquals(
-                d.NestedHitObjects.First().DrawPosition.Y,
-                yScale * (float)((TestParentHitObject)d.HitObject).ChildTimeOffset / time_range, 0.1f);
-        });
-
         [Test]
         public void TestRelativeBeatLengthScaleSingleTimingPoint()
         {
@@ -220,6 +204,22 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private float yScale => drawableRuleset.Playfield.HitObjectContainer.DrawHeight;
 
+        private void assertDead(int index) => AddAssert($"hitobject {index} is dead", () => getDrawableHitObject(index) == null);
+
+        private void assertHeight(int index) => AddAssert($"hitobject {index} height", () =>
+        {
+            var d = getDrawableHitObject(index);
+            return d != null && Precision.AlmostEquals(d.DrawHeight, yScale * (float)(d.HitObject.Duration / time_range), 0.1f);
+        });
+
+        private void assertChildPosition(int index) => AddAssert($"hitobject {index} child position", () =>
+        {
+            var d = getDrawableHitObject(index);
+            return d is DrawableTestParentHitObject && Precision.AlmostEquals(
+                d.NestedHitObjects.First().DrawPosition.Y,
+                yScale * (float)((TestParentHitObject)d.HitObject).ChildTimeOffset / time_range, 0.1f);
+        });
+
         private void assertPosition(int index, float relativeY) => AddAssert($"hitobject {index} at {relativeY}",
             () => Precision.AlmostEquals(getDrawableHitObject(index)?.DrawPosition.Y ?? -1, yScale * relativeY));
 

From 274565998653284abcdef19fc4be19f8e9dc937b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 15:54:20 +0900
Subject: [PATCH 06519/10326] Reword and xmldoc some comments

---
 .../UI/Scrolling/ScrollingHitObjectContainer.cs      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 71f8f95300..6a77597916 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -17,11 +17,14 @@ namespace osu.Game.Rulesets.UI.Scrolling
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-        // The lifetime of a hit object in this will be computed in next update.
+        /// <summary>
+        /// Hit objects which require lifetime computation in the next update call.
+        /// </summary>
         private readonly HashSet<DrawableHitObject> toComputeLifetime = new HashSet<DrawableHitObject>();
 
-        // The layout (length if IHasDuration, and nested object positions) of a hit object *not* in this set will be computed in next updated.
-        // Only objects in `AliveObjects` are considered, to prevent a massive recomputation when scrolling speed or something changes.
+        /// <summary>
+        /// A set containing all <see cref="HitObjectContainer.AliveObjects"/> which have an up-to-date layout.
+        /// </summary>
         private readonly HashSet<DrawableHitObject> layoutComputed = new HashSet<DrawableHitObject>();
 
         [Resolved]
@@ -223,8 +226,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             toComputeLifetime.Clear();
 
-            // An assumption is that this update won't affect lifetime,
-            // but this is satisfied in practice because otherwise the hit object won't be aligned to its `StartTime`.
+            // only AliveObjects need to be considered for layout (reduces overhead in the case of scroll speed changes).
             foreach (var obj in AliveObjects)
             {
                 if (layoutComputed.Contains(obj))

From e14db45374a2a60424aad8586edd1851cb0a9040 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 16:09:38 +0900
Subject: [PATCH 06520/10326] Reorder settings to (probably) feel more correct

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

diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index f05d82cb6c..31d188b545 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -23,11 +23,11 @@ namespace osu.Game.Overlays
         {
             new GeneralSection(),
             new GraphicsSection(),
+            new AudioSection(),
+            new InputSection(createSubPanel(new KeyBindingPanel())),
             new UserInterfaceSection(),
             new GameplaySection(),
-            new AudioSection(),
             new SkinSection(),
-            new InputSection(createSubPanel(new KeyBindingPanel())),
             new OnlineSection(),
             new MaintenanceSection(),
             new DebugSection(),

From 55c8aa5d5f7a3ccd83dcc6f0cf574f82f0f0e6e4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 16:14:15 +0900
Subject: [PATCH 06521/10326] Move menu cursor size to UI section

---
 osu.Game/Overlays/Settings/Sections/SizeSlider.cs | 15 +++++++++++++++
 .../Overlays/Settings/Sections/SkinSection.cs     | 11 -----------
 .../Sections/UserInterface/GeneralSettings.cs     |  6 ++++++
 3 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/SizeSlider.cs

diff --git a/osu.Game/Overlays/Settings/Sections/SizeSlider.cs b/osu.Game/Overlays/Settings/Sections/SizeSlider.cs
new file mode 100644
index 0000000000..101d8f43f7
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/SizeSlider.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.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    /// <summary>
+    /// A slider intended to show a "size" multiplier number, where 1x is 1.0.
+    /// </summary>
+    internal class SizeSlider : OsuSliderBar<float>
+    {
+        public override string TooltipText => Current.Value.ToString(@"0.##x");
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 3e7068f1ff..5898482e4a 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -54,12 +54,6 @@ namespace osu.Game.Overlays.Settings.Sections
                 skinDropdown = new SkinSettingsDropdown(),
                 new ExportSkinButton(),
                 new SettingsSlider<float, SizeSlider>
-                {
-                    LabelText = "Menu cursor size",
-                    Current = config.GetBindable<float>(OsuSetting.MenuCursorSize),
-                    KeyboardStep = 0.01f
-                },
-                new SettingsSlider<float, SizeSlider>
                 {
                     LabelText = "Gameplay cursor size",
                     Current = config.GetBindable<float>(OsuSetting.GameplayCursorSize),
@@ -136,11 +130,6 @@ namespace osu.Game.Overlays.Settings.Sections
                 Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != item.ID).ToArray());
         }
 
-        private class SizeSlider : OsuSliderBar<float>
-        {
-            public override string TooltipText => Current.Value.ToString(@"0.##x");
-        }
-
         private class SkinSettingsDropdown : SettingsDropdown<SkinInfo>
         {
             protected override OsuDropdown<SkinInfo> CreateDropdown() => new SkinDropdownControl();
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
index 797e00a147..da50f67d5f 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
@@ -21,6 +21,12 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
                     LabelText = "Rotate cursor when dragging",
                     Current = config.GetBindable<bool>(OsuSetting.CursorRotation)
                 },
+                new SettingsSlider<float, SizeSlider>
+                {
+                    LabelText = "Menu cursor size",
+                    Current = config.GetBindable<float>(OsuSetting.MenuCursorSize),
+                    KeyboardStep = 0.01f
+                },
                 new SettingsCheckbox
                 {
                     LabelText = "Parallax",

From 4e1e45f3e71ed3353489d3f7ec5e64619814e225 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 16:15:35 +0900
Subject: [PATCH 06522/10326] Move hold-to-confirm back to UI section

---
 .../Settings/Sections/Gameplay/GeneralSettings.cs    | 12 ------------
 .../Sections/UserInterface/GeneralSettings.cs        | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 53f1a0b4ba..be464fa2b7 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -5,7 +5,6 @@ using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Overlays.Settings.Sections.Gameplay
@@ -64,12 +63,6 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Always show key overlay",
                     Current = config.GetBindable<bool>(OsuSetting.KeyOverlay)
                 },
-                new SettingsSlider<float, TimeSlider>
-                {
-                    LabelText = "Hold-to-confirm activation time",
-                    Current = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
-                    KeyboardStep = 50
-                },
                 new SettingsCheckbox
                 {
                     LabelText = "Positional hitsounds",
@@ -102,10 +95,5 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 });
             }
         }
-
-        private class TimeSlider : OsuSliderBar<float>
-        {
-            public override string TooltipText => Current.Value.ToString("N0") + "ms";
-        }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
index da50f67d5f..19adfc5dd9 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
@@ -32,7 +33,18 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
                     LabelText = "Parallax",
                     Current = config.GetBindable<bool>(OsuSetting.MenuParallax)
                 },
+                new SettingsSlider<float, TimeSlider>
+                {
+                    LabelText = "Hold-to-confirm activation time",
+                    Current = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
+                    KeyboardStep = 50
+                },
             };
         }
+
+        private class TimeSlider : OsuSliderBar<float>
+        {
+            public override string TooltipText => Current.Value.ToString("N0") + "ms";
+        }
     }
 }

From a4e061cb11eeaca6644abca2e3bfee55eacd2c96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 17:18:29 +0900
Subject: [PATCH 06523/10326] Remove semi-transparent backgrounds from settings
 and notifications overlays

I tried also updating the colours to the "new" versions from designs but
they don't match due to colour profile differences (so I'm not yet sure
if they are correct or not) and also don't look great without all the UI
elements also being updated.
---
 osu.Game/Overlays/NotificationOverlay.cs | 4 ++--
 osu.Game/Overlays/Settings/Sidebar.cs    | 3 ++-
 osu.Game/Overlays/SettingsOverlay.cs     | 2 --
 osu.Game/Overlays/SettingsPanel.cs       | 7 ++++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index b5714fbcae..774b001224 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -13,6 +13,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Threading;
+using osu.Game.Graphics;
 
 namespace osu.Game.Overlays
 {
@@ -44,8 +45,7 @@ namespace osu.Game.Overlays
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black,
-                    Alpha = 0.6f
+                    Colour = OsuColour.Gray(0.05f),
                 },
                 new OsuScrollContainer
                 {
diff --git a/osu.Game/Overlays/Settings/Sidebar.cs b/osu.Game/Overlays/Settings/Sidebar.cs
index 031ecaae46..f548f933e2 100644
--- a/osu.Game/Overlays/Settings/Sidebar.cs
+++ b/osu.Game/Overlays/Settings/Sidebar.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osuTK;
 using osuTK.Graphics;
@@ -32,7 +33,7 @@ namespace osu.Game.Overlays.Settings
             {
                 new Box
                 {
-                    Colour = Color4.Black,
+                    Colour = OsuColour.Gray(0.02f),
                     RelativeSizeAxes = Axes.Both,
                 },
                 new SidebarScrollContainer
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index e1bcdbbaf0..e49885cdf8 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -61,7 +61,6 @@ namespace osu.Game.Overlays
             switch (state.NewValue)
             {
                 case Visibility.Visible:
-                    Background.FadeTo(0.9f, 300, Easing.OutQuint);
                     Sidebar?.FadeColour(Color4.DarkGray, 300, Easing.OutQuint);
 
                     SectionsContainer.FadeOut(300, Easing.OutQuint);
@@ -69,7 +68,6 @@ namespace osu.Game.Overlays
                     break;
 
                 case Visibility.Hidden:
-                    Background.FadeTo(0.6f, 500, Easing.OutQuint);
                     Sidebar?.FadeColour(Color4.White, 300, Easing.OutQuint);
 
                     SectionsContainer.FadeIn(500, Easing.OutQuint);
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 2948231c4b..fea4b0738d 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -12,6 +12,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.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
@@ -72,8 +73,8 @@ namespace osu.Game.Overlays
                         Origin = Anchor.TopRight,
                         Scale = new Vector2(2, 1), // over-extend to the left for transitions
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
-                        Alpha = 0.6f,
+                        Colour = OsuColour.Gray(0.05f),
+                        Alpha = 1,
                     },
                     SectionsContainer = new SettingsSectionsContainer
                     {
@@ -214,7 +215,7 @@ namespace osu.Game.Overlays
                 base.UpdateAfterChildren();
 
                 // no null check because the usage of this class is strict
-                HeaderBackground.Alpha = -ExpandableHeader.Y / ExpandableHeader.LayoutSize.Y * 0.5f;
+                HeaderBackground.Alpha = -ExpandableHeader.Y / ExpandableHeader.LayoutSize.Y * 1;
             }
         }
     }

From 7ac2fba1273e8d6d495e76ba9f6e4c3332724c68 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Nov 2020 17:44:58 +0900
Subject: [PATCH 06524/10326] More reordering of public vs private methods

---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 6a77597916..3a5e3c098f 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -150,16 +150,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
             }
         }
 
-        /// <summary>
-        /// Make this <see cref="DrawableHitObject"/> lifetime and layout computed in next update.
-        /// </summary>
-        private void invalidateHitObject(DrawableHitObject hitObject)
-        {
-            // Lifetime computation is delayed until next update because
-            // when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed.
-            toComputeLifetime.Add(hitObject);
-            layoutComputed.Remove(hitObject);
-        }
+        protected override void OnAdd(DrawableHitObject drawableHitObject) => onAddRecursive(drawableHitObject);
+
+        protected override void OnRemove(DrawableHitObject drawableHitObject) => onRemoveRecursive(drawableHitObject);
 
         private void onAddRecursive(DrawableHitObject hitObject)
         {
@@ -171,8 +164,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 onAddRecursive(nested);
         }
 
-        protected override void OnAdd(DrawableHitObject drawableHitObject) => onAddRecursive(drawableHitObject);
-
         private void onRemoveRecursive(DrawableHitObject hitObject)
         {
             toComputeLifetime.Remove(hitObject);
@@ -184,7 +175,16 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 onRemoveRecursive(nested);
         }
 
-        protected override void OnRemove(DrawableHitObject drawableHitObject) => onRemoveRecursive(drawableHitObject);
+        /// <summary>
+        /// Make this <see cref="DrawableHitObject"/> lifetime and layout computed in next update.
+        /// </summary>
+        private void invalidateHitObject(DrawableHitObject hitObject)
+        {
+            // Lifetime computation is delayed until next update because
+            // when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed.
+            toComputeLifetime.Add(hitObject);
+            layoutComputed.Remove(hitObject);
+        }
 
         private float scrollLength;
 

From bf2c6dc241d561c545dae3dbff0aa35cd8e306ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 17:49:55 +0900
Subject: [PATCH 06525/10326] Remove unused usings rider couldn't see

---
 osu.Game/Overlays/NotificationOverlay.cs | 1 -
 osu.Game/Overlays/Settings/Sidebar.cs    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 774b001224..d51d964fc4 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -6,7 +6,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Notifications;
-using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Containers;
 using System;
diff --git a/osu.Game/Overlays/Settings/Sidebar.cs b/osu.Game/Overlays/Settings/Sidebar.cs
index f548f933e2..4ca6e2ec42 100644
--- a/osu.Game/Overlays/Settings/Sidebar.cs
+++ b/osu.Game/Overlays/Settings/Sidebar.cs
@@ -12,7 +12,6 @@ using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Settings
 {

From fe48b2279c39dee39de905c63e052bc88c6134d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 17:43:53 +0900
Subject: [PATCH 06526/10326] Adjust various paddings and spacings in settings
 to make them easier to visually parse

---
 osu.Game/Overlays/Settings/SettingsSection.cs    | 15 +++++++++------
 osu.Game/Overlays/Settings/SettingsSubsection.cs |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsSection.cs b/osu.Game/Overlays/Settings/SettingsSection.cs
index 97e4ba9da7..8b4821398f 100644
--- a/osu.Game/Overlays/Settings/SettingsSection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSection.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Settings
         public virtual IEnumerable<string> FilterTerms => new[] { Header };
 
         private const int header_size = 26;
-        private const int header_margin = 25;
+        private const int margin = 20;
         private const int border_size = 2;
 
         public bool MatchingFilter
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Settings
 
         protected SettingsSection()
         {
-            Margin = new MarginPadding { Top = 20 };
+            Margin = new MarginPadding { Top = margin };
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
 
@@ -46,10 +46,9 @@ namespace osu.Game.Overlays.Settings
             {
                 Margin = new MarginPadding
                 {
-                    Top = header_size + header_margin
+                    Top = header_size
                 },
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 30),
                 AutoSizeAxes = Axes.Y,
                 RelativeSizeAxes = Axes.X,
             };
@@ -70,7 +69,7 @@ namespace osu.Game.Overlays.Settings
                 {
                     Padding = new MarginPadding
                     {
-                        Top = 20 + border_size,
+                        Top = margin + border_size,
                         Bottom = 10,
                     },
                     RelativeSizeAxes = Axes.X,
@@ -82,7 +81,11 @@ namespace osu.Game.Overlays.Settings
                             Font = OsuFont.GetFont(size: header_size),
                             Text = Header,
                             Colour = colours.Yellow,
-                            Margin = new MarginPadding { Left = SettingsPanel.CONTENT_MARGINS, Right = SettingsPanel.CONTENT_MARGINS }
+                            Margin = new MarginPadding
+                            {
+                                Left = SettingsPanel.CONTENT_MARGINS,
+                                Right = SettingsPanel.CONTENT_MARGINS
+                            }
                         },
                         FlowContent
                     }
diff --git a/osu.Game/Overlays/Settings/SettingsSubsection.cs b/osu.Game/Overlays/Settings/SettingsSubsection.cs
index b096c146a6..1b82d973e9 100644
--- a/osu.Game/Overlays/Settings/SettingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSubsection.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Settings
             FlowContent = new FillFlowContainer
             {
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 5),
+                Spacing = new Vector2(0, 8),
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
             };
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.Settings
                 new OsuSpriteText
                 {
                     Text = Header.ToUpperInvariant(),
-                    Margin = new MarginPadding { Bottom = 10, Left = SettingsPanel.CONTENT_MARGINS, Right = SettingsPanel.CONTENT_MARGINS },
+                    Margin = new MarginPadding { Vertical = 30, Left = SettingsPanel.CONTENT_MARGINS, Right = SettingsPanel.CONTENT_MARGINS },
                     Font = OsuFont.GetFont(weight: FontWeight.Bold),
                 },
                 FlowContent

From a3ef858f3a03f7c694348d7674a72d963f3dd162 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 30 Nov 2020 17:56:04 +0900
Subject: [PATCH 06527/10326] Remove unnecessary multiplication

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

diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index fea4b0738d..7a5a586f67 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Overlays
                 base.UpdateAfterChildren();
 
                 // no null check because the usage of this class is strict
-                HeaderBackground.Alpha = -ExpandableHeader.Y / ExpandableHeader.LayoutSize.Y * 1;
+                HeaderBackground.Alpha = -ExpandableHeader.Y / ExpandableHeader.LayoutSize.Y;
             }
         }
     }

From 965cc1f511568b07231c1b189ebd9066d339568e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 17:57:25 +0900
Subject: [PATCH 06528/10326] Remove unnecessary usings #2

---
 osu.Game/Overlays/Settings/SettingsSection.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsSection.cs b/osu.Game/Overlays/Settings/SettingsSection.cs
index 8b4821398f..4143605c28 100644
--- a/osu.Game/Overlays/Settings/SettingsSection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSection.cs
@@ -1,16 +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 osuTK;
-using osuTK.Graphics;
+using System.Collections.Generic;
+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 System.Collections.Generic;
-using System.Linq;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Settings
 {

From 731e689f2da41dcaa040b5dde209f02b1306754d Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 18:07:37 +0900
Subject: [PATCH 06529/10326] Add summary tags to the doc comments

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

diff --git a/osu.Game/Utils/StatelessRNG.cs b/osu.Game/Utils/StatelessRNG.cs
index 8d08b26ca4..d78d55cc09 100644
--- a/osu.Game/Utils/StatelessRNG.cs
+++ b/osu.Game/Utils/StatelessRNG.cs
@@ -3,7 +3,9 @@
 
 namespace osu.Game.Utils
 {
+    /// <summary>
     /// Provides a fast stateless function that can be used in randomly-looking visual elements.
+    /// </summary>
     public static class StatelessRNG
     {
         private static ulong mix(ulong x)
@@ -19,7 +21,9 @@ namespace osu.Game.Utils
             }
         }
 
+        /// <summary>
         /// Compute an integer from given seed and series number.
+        /// </summary>
         /// <param name="seed">
         /// The seed value of this random number generator.
         /// </param>
@@ -30,7 +34,9 @@ namespace osu.Game.Utils
         public static ulong Get(int seed, int series = 0) =>
             unchecked(mix(((ulong)(uint)series << 32) | ((uint)seed ^ 0x12345678)));
 
+        /// <summary>
         /// Compute a floating point value between 0 and 1 (excluding 1) from given seed and series number.
+        /// </summary>
         /// <param name="seed">
         /// The seed value of this random number generator.
         /// </param>

From fdef6e479c750b253c619e8c8e202bc7ba392a0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Nov 2020 18:28:04 +0900
Subject: [PATCH 06530/10326] Remove 1000ms offset and adjust comment

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

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 243092d067..975b444699 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -176,8 +176,8 @@ namespace osu.Game.Rulesets.Osu.UI
             public OsuHitObjectLifetimeEntry(HitObject hitObject)
                 : base(hitObject)
             {
-                // Arbitrary lifetime end to prevent past objects in idle states remaining alive in non-frame-stable contexts.
-                LifetimeEnd = HitObject.GetEndTime() + HitObject.HitWindows.WindowFor(HitResult.Miss) + 1000;
+                // Prevent past objects in idles states from remaining alive as their end times are skipped in non-frame-stable contexts.
+                LifetimeEnd = HitObject.GetEndTime() + HitObject.HitWindows.WindowFor(HitResult.Miss);
             }
 
             protected override double InitialLifetimeOffset => ((OsuHitObject)HitObject).TimePreempt;

From 3ad2eeaff551b279e5db2b33ac0d0a0087544d1f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 18:35:30 +0900
Subject: [PATCH 06531/10326] Fix outdated xmldoc

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

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 9d7dc7b8f7..c0eb891f5e 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Rulesets.Edit
         }
 
         /// <summary>
-        /// Updates the position of this <see cref="PlacementBlueprint"/> to a new screen-space position.
+        /// Updates the time and position of this <see cref="PlacementBlueprint"/> based on the provided snap information.
         /// </summary>
         /// <param name="result">The snap result information.</param>
         public virtual void UpdateTimeAndPosition(SnapResult result)

From afb8eb636ddc4cd589755f796f1b8bad9e5adb30 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Nov 2020 18:40:22 +0900
Subject: [PATCH 06532/10326] Apply simple PR reviews

---
 osu.Game/Skinning/IPooledSampleProvider.cs   | 10 +++++++++-
 osu.Game/Skinning/PoolableSkinnableSample.cs |  4 ++++
 osu.Game/Skinning/SkinnableSound.cs          |  6 +++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/IPooledSampleProvider.cs b/osu.Game/Skinning/IPooledSampleProvider.cs
index 3dc0b5375d..5dbbadcc8a 100644
--- a/osu.Game/Skinning/IPooledSampleProvider.cs
+++ b/osu.Game/Skinning/IPooledSampleProvider.cs
@@ -6,8 +6,16 @@ using osu.Game.Audio;
 
 namespace osu.Game.Skinning
 {
-    public interface IPooledSampleProvider
+    /// <summary>
+    /// Provides pooled samples to be used by <see cref="SkinnableSound"/>s.
+    /// </summary>
+    internal interface IPooledSampleProvider
     {
+        /// <summary>
+        /// Retrieves a <see cref="PoolableSkinnableSample"/> from a pool.
+        /// </summary>
+        /// <param name="sampleInfo">The <see cref="SampleInfo"/> describing the sample to retrieve..</param>
+        /// <returns>The <see cref="PoolableSkinnableSample"/>.</returns>
         [CanBeNull]
         PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo);
     }
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index adc58ee94e..7e885b20d1 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -138,6 +138,8 @@ namespace osu.Game.Skinning
             }
         }
 
+        #region Re-expose AudioContainer
+
         public BindableNumber<double> Volume => sampleContainer.Volume;
 
         public BindableNumber<double> Balance => sampleContainer.Balance;
@@ -159,5 +161,7 @@ namespace osu.Game.Skinning
         public IBindable<double> AggregateFrequency => sampleContainer.AggregateFrequency;
 
         public IBindable<double> AggregateTempo => sampleContainer.AggregateTempo;
+
+        #endregion
     }
 }
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 24dddaf758..46c2e4b749 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Skinning
         private ISampleStore sampleStore { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private IPooledSampleProvider pooledProvider { get; set; }
+        private IPooledSampleProvider samplePool { get; set; }
 
         /// <summary>
         /// Creates a new <see cref="SkinnableSound"/>.
@@ -145,7 +145,7 @@ namespace osu.Game.Skinning
 
             foreach (var s in samples)
             {
-                var sample = pooledProvider?.GetPooledSample(s) ?? new PoolableSkinnableSample(s);
+                var sample = samplePool?.GetPooledSample(s) ?? new PoolableSkinnableSample(s);
                 sample.Looping = Looping;
                 sample.Volume.Value = s.Volume / 100.0;
 
@@ -176,7 +176,7 @@ namespace osu.Game.Skinning
             => SamplesContainer.RemoveAllAdjustments(type);
 
         /// <summary>
-        /// Whether any samples currently playing.
+        /// Whether any samples are currently playing.
         /// </summary>
         public bool IsPlaying => SamplesContainer.Any(s => s.Playing);
 

From 51bddd4a0ff00fce883583852a2d225d5b41117c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 18:46:28 +0900
Subject: [PATCH 06533/10326] Rename functions, and add NextInt.

---
 osu.Game/Utils/StatelessRNG.cs | 42 +++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Utils/StatelessRNG.cs b/osu.Game/Utils/StatelessRNG.cs
index d78d55cc09..d316f718e3 100644
--- a/osu.Game/Utils/StatelessRNG.cs
+++ b/osu.Game/Utils/StatelessRNG.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;
+
 namespace osu.Game.Utils
 {
     /// <summary>
@@ -22,7 +24,7 @@ namespace osu.Game.Utils
         }
 
         /// <summary>
-        /// Compute an integer from given seed and series number.
+        /// Generate a random 64-bit unsigned integer from given seed.
         /// </summary>
         /// <param name="seed">
         /// The seed value of this random number generator.
@@ -31,11 +33,39 @@ namespace osu.Game.Utils
         /// The series number.
         /// Different values are computed for the same seed in different series.
         /// </param>
-        public static ulong Get(int seed, int series = 0) =>
-            unchecked(mix(((ulong)(uint)series << 32) | ((uint)seed ^ 0x12345678)));
+        public static ulong NextUlong(int seed, int series = 0)
+        {
+            unchecked
+            {
+                //
+                var combined = ((ulong)(uint)series << 32) | (uint)seed;
+                // The xor operation is to not map (0, 0) to 0.
+                return mix(combined ^ 0x12345678);
+            }
+        }
 
         /// <summary>
-        /// Compute a floating point value between 0 and 1 (excluding 1) from given seed and series number.
+        /// Generate a random integer in range [0, maxValue) from given seed.
+        /// </summary>
+        /// <param name="maxValue">
+        /// The number of possible results.
+        /// </param>
+        /// <param name="seed">
+        /// The seed value of this random number generator.
+        /// </param>
+        /// <param name="series">
+        /// The series number.
+        /// Different values are computed for the same seed in different series.
+        /// </param>
+        public static int NextInt(int maxValue, int seed, int series = 0)
+        {
+            if (maxValue <= 0) throw new ArgumentOutOfRangeException(nameof(maxValue));
+
+            return (int)(NextUlong(seed, series) % (ulong)maxValue);
+        }
+
+        /// <summary>
+        /// Compute a random floating point value between 0 and 1 (excluding 1) from given seed and series number.
         /// </summary>
         /// <param name="seed">
         /// The seed value of this random number generator.
@@ -44,7 +74,7 @@ namespace osu.Game.Utils
         /// The series number.
         /// Different values are computed for the same seed in different series.
         /// </param>
-        public static float GetSingle(int seed, int series = 0) =>
-            (float)(Get(seed, series) & ((1 << 24) - 1)) / (1 << 24); // float has 24-bit precision
+        public static float NextSingle(int seed, int series = 0) =>
+            (float)(NextUlong(seed, series) & ((1 << 24) - 1)) / (1 << 24); // float has 24-bit precision
     }
 }

From 05aaa377e74078c0e4aa3f591066a0e3644e4e51 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 19:02:49 +0900
Subject: [PATCH 06534/10326] Don't use CreateDrawableRepresentation in
 CatcherArea

---
 .../TestSceneCatcherArea.cs                     |  1 -
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs    |  1 -
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs       | 17 +++++++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index e055f08dc2..2d46cbdbbd 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -103,7 +103,6 @@ namespace osu.Game.Rulesets.Catch.Tests
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.TopCentre,
-                    CreateDrawableRepresentation = ((DrawableRuleset<CatchHitObject>)catchRuleset.CreateInstance().CreateDrawableRulesetWith(new CatchBeatmap())).CreateDrawableRepresentation
                 },
             });
         }
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 9df32d8d36..bab8356ac4 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -42,7 +42,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
             CatcherArea = new CatcherArea(difficulty)
             {
-                CreateDrawableRepresentation = createDrawableRepresentation,
                 ExplodingFruitTarget = explodingFruitContainer,
                 Anchor = Anchor.BottomLeft,
                 Origin = Anchor.TopLeft,
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index ad79a23279..085af79689 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osuTK;
@@ -21,8 +20,6 @@ namespace osu.Game.Rulesets.Catch.UI
     {
         public const float CATCHER_SIZE = 106.75f;
 
-        public Func<CatchHitObject, DrawableHitObject<CatchHitObject>> CreateDrawableRepresentation;
-
         public readonly Catcher MovableCatcher;
         private readonly CatchComboDisplay comboDisplay;
 
@@ -72,7 +69,7 @@ namespace osu.Game.Rulesets.Catch.UI
             if (result.IsHit && hitObject is DrawablePalpableCatchHitObject fruit)
             {
                 // create a new (cloned) fruit to stay on the plate. the original is faded out immediately.
-                var caughtFruit = (DrawableCatchHitObject)CreateDrawableRepresentation?.Invoke(fruit.HitObject);
+                var caughtFruit = createCaughtFruit(fruit);
 
                 if (caughtFruit == null) return;
 
@@ -127,5 +124,17 @@ namespace osu.Game.Rulesets.Catch.UI
 
             comboDisplay.X = MovableCatcher.X;
         }
+
+        private DrawableCatchHitObject createCaughtFruit(DrawablePalpableCatchHitObject hitObject)
+        {
+            return hitObject.HitObject switch
+            {
+                Banana banana => new DrawableBanana(banana),
+                Fruit fruit => new DrawableFruit(fruit),
+                TinyDroplet tiny => new DrawableTinyDroplet(tiny),
+                Droplet droplet => new DrawableDroplet(droplet),
+                _ => null
+            };
+        }
     }
 }

From 94fd607a7c548289147008dad8b43a14b1e3a62c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 19:04:09 +0900
Subject: [PATCH 06535/10326] Use hit object pooling for `Droplet` and
 `TinyDroplet`.

---
 .../Objects/Drawables/DrawableDroplet.cs                 | 8 +++++++-
 .../Objects/Drawables/DrawableTinyDroplet.cs             | 9 ++++++++-
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs             | 8 ++++++++
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs       | 6 ------
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index 9e76265394..06ecd44488 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
@@ -13,7 +14,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
     {
         public override bool StaysOnPlate => false;
 
-        public DrawableDroplet(CatchHitObject h)
+        public DrawableDroplet()
+            : this(null)
+        {
+        }
+
+        public DrawableDroplet([CanBeNull] CatchHitObject h)
             : base(h)
         {
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableTinyDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableTinyDroplet.cs
index 8c4d821b4a..8f5a04dfda 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableTinyDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableTinyDroplet.cs
@@ -1,13 +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 JetBrains.Annotations;
+
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableTinyDroplet : DrawableDroplet
     {
         protected override float ScaleFactor => base.ScaleFactor / 2;
 
-        public DrawableTinyDroplet(TinyDroplet h)
+        public DrawableTinyDroplet()
+            : this(null)
+        {
+        }
+
+        public DrawableTinyDroplet([CanBeNull] TinyDroplet h)
             : base(h)
         {
         }
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index bab8356ac4..da909b49c9 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -2,6 +2,7 @@
 // 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.Game.Beatmaps;
@@ -56,6 +57,13 @@ namespace osu.Game.Rulesets.Catch.UI
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RegisterPool<Droplet, DrawableDroplet>(1);
+            RegisterPool<TinyDroplet, DrawableTinyDroplet>(1);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index ebe45aa3ab..8534645947 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -55,12 +55,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 case BananaShower shower:
                     return new DrawableBananaShower(shower, CreateDrawableRepresentation);
-
-                case TinyDroplet tiny:
-                    return new DrawableTinyDroplet(tiny);
-
-                case Droplet droplet:
-                    return new DrawableDroplet(droplet);
             }
 
             return null;

From b76ae525b27d5cf0173a3714f170fbf0844b98c0 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 19:07:50 +0900
Subject: [PATCH 06536/10326] Use hit object pooling for `Fruit` and `Banana`.

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs     | 2 --
 .../Objects/Drawables/DrawableBanana.cs                   | 8 +++++++-
 .../Objects/Drawables/DrawableFruit.cs                    | 8 +++++++-
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs              | 2 ++
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs        | 6 ------
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 2d46cbdbbd..c12f38723b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -10,14 +10,12 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
-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;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index efb0958a3a..fb982bbdab 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.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 JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 
@@ -10,7 +11,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
     {
         protected override FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => FruitVisualRepresentation.Banana;
 
-        public DrawableBanana(Banana h)
+        public DrawableBanana()
+            : this(null)
+        {
+        }
+
+        public DrawableBanana([CanBeNull] Banana h)
             : base(h)
         {
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index 4338d80345..68cb649b66 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -2,6 +2,7 @@
 // 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.Utils;
@@ -16,7 +17,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected virtual FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => (FruitVisualRepresentation)(indexInBeatmap % 4);
 
-        public DrawableFruit(CatchHitObject h)
+        public DrawableFruit()
+            : this(null)
+        {
+        }
+
+        public DrawableFruit([CanBeNull] Fruit h)
             : base(h)
         {
         }
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index da909b49c9..7cddec100f 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -62,6 +62,8 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             RegisterPool<Droplet, DrawableDroplet>(1);
             RegisterPool<TinyDroplet, DrawableTinyDroplet>(1);
+            RegisterPool<Fruit, DrawableFruit>(1);
+            RegisterPool<Banana, DrawableBanana>(1);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index 8534645947..ecc37549bf 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -44,12 +44,6 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             switch (h)
             {
-                case Banana banana:
-                    return new DrawableBanana(banana);
-
-                case Fruit fruit:
-                    return new DrawableFruit(fruit);
-
                 case JuiceStream stream:
                     return new DrawableJuiceStream(stream, CreateDrawableRepresentation);
 

From 9611aaf09eb0c9653b2c79d65a062fa2dfe572d4 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 19:19:14 +0900
Subject: [PATCH 06537/10326] Use hit object pooling for `JuiceStream`.

- Use `Clear(false)` to not dispose pooled children.
- Don't set nested DHO `Origin`.
- Simplify the layout (remove custom `Origin`).
---
 .../TestSceneDrawableHitObjects.cs            |  2 +-
 .../Objects/Drawables/DrawableJuiceStream.cs  | 29 +++++--------------
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs  |  1 +
 .../UI/DrawableCatchRuleset.cs                |  3 --
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
index d35f828e28..3e4995482d 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             if (juice.NestedHitObjects.Last() is CatchHitObject tail)
                 tail.LastInCombo = true; // usually the (Catch)BeatmapProcessor would do this for us when necessary
 
-            addToPlayfield(new DrawableJuiceStream(juice, drawableRuleset.CreateDrawableRepresentation));
+            addToPlayfield(new DrawableJuiceStream(juice));
         }
 
         private void spawnBananas(bool hit = false)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
index a7a5bfa5ad..a496a35842 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
@@ -1,37 +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 JetBrains.Annotations;
 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
 {
     public class DrawableJuiceStream : DrawableCatchHitObject
     {
-        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()
+            : this(null)
+        {
+        }
 
-        public DrawableJuiceStream(JuiceStream s, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation = null)
+        public DrawableJuiceStream([CanBeNull] JuiceStream s)
             : base(s)
         {
-            this.createDrawableRepresentation = createDrawableRepresentation;
             RelativeSizeAxes = Axes.X;
             Origin = Anchor.BottomLeft;
-            X = 0;
 
             AddInternal(dropletContainer = new Container { RelativeSizeAxes = Axes.Both, });
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
         {
-            hitObject.Origin = Anchor.BottomCentre;
-
             base.AddNestedHitObject(hitObject);
             dropletContainer.Add(hitObject);
         }
@@ -39,18 +35,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
-            dropletContainer.Clear();
-        }
-
-        protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
-        {
-            switch (hitObject)
-            {
-                case CatchHitObject catchObject:
-                    return createDrawableRepresentation?.Invoke(catchObject);
-            }
-
-            throw new ArgumentException($"{nameof(hitObject)} must be of type {nameof(CatchHitObject)}.");
+            dropletContainer.Clear(false);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 7cddec100f..b4d97fdd2b 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -64,6 +64,7 @@ namespace osu.Game.Rulesets.Catch.UI
             RegisterPool<TinyDroplet, DrawableTinyDroplet>(1);
             RegisterPool<Fruit, DrawableFruit>(1);
             RegisterPool<Banana, DrawableBanana>(1);
+            RegisterPool<JuiceStream, DrawableJuiceStream>(1);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index ecc37549bf..beea7980c9 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -44,9 +44,6 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             switch (h)
             {
-                case JuiceStream stream:
-                    return new DrawableJuiceStream(stream, CreateDrawableRepresentation);
-
                 case BananaShower shower:
                     return new DrawableBananaShower(shower, CreateDrawableRepresentation);
             }

From f5e8d1d14d47934976b930df6cca83831ce07a6b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Nov 2020 19:19:24 +0900
Subject: [PATCH 06538/10326] Lose old reference immediately on updateSample()

---
 osu.Game/Skinning/PoolableSkinnableSample.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 7e885b20d1..19b96d6c60 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -83,6 +83,7 @@ namespace osu.Game.Skinning
             bool wasPlaying = Playing;
 
             sampleContainer.Clear();
+            Sample = null;
 
             var ch = CurrentSkin.GetSample(sampleInfo);
 

From 70628235e36ec7d22e84a885b5ee475cfb88eb6a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 19:22:40 +0900
Subject: [PATCH 06539/10326] Use hit object pooling for `BananaShower`.

---
 .../Objects/Drawables/DrawableBananaShower.cs | 26 ++++++-------------
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs  |  1 +
 .../UI/DrawableCatchRuleset.cs                | 12 +--------
 3 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
index bf771f690e..9b2f95e221 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
@@ -1,26 +1,27 @@
 // Copyright (c) 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.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableBananaShower : DrawableCatchHitObject
     {
-        private readonly Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation;
         private readonly Container bananaContainer;
 
-        public DrawableBananaShower(BananaShower s, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation = null)
+        public DrawableBananaShower()
+            : this(null)
+        {
+        }
+
+        public DrawableBananaShower([CanBeNull] BananaShower s)
             : base(s)
         {
-            this.createDrawableRepresentation = createDrawableRepresentation;
             RelativeSizeAxes = Axes.X;
             Origin = Anchor.BottomLeft;
-            X = 0;
 
             AddInternal(bananaContainer = new Container { RelativeSizeAxes = Axes.Both });
         }
@@ -34,18 +35,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
-            bananaContainer.Clear();
-        }
-
-        protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
-        {
-            switch (hitObject)
-            {
-                case Banana banana:
-                    return createDrawableRepresentation?.Invoke(banana);
-            }
-
-            return base.CreateNestedHitObject(hitObject);
+            bananaContainer.Clear(false);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index b4d97fdd2b..97f33007fe 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -65,6 +65,7 @@ namespace osu.Game.Rulesets.Catch.UI
             RegisterPool<Fruit, DrawableFruit>(1);
             RegisterPool<Banana, DrawableBanana>(1);
             RegisterPool<JuiceStream, DrawableJuiceStream>(1);
+            RegisterPool<BananaShower, DrawableBananaShower>(1);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index beea7980c9..46733181e3 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -8,7 +8,6 @@ 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.Drawables;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -40,15 +39,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override PassThroughInputManager CreateInputManager() => new CatchInputManager(Ruleset.RulesetInfo);
 
-        public override DrawableHitObject<CatchHitObject> CreateDrawableRepresentation(CatchHitObject h)
-        {
-            switch (h)
-            {
-                case BananaShower shower:
-                    return new DrawableBananaShower(shower, CreateDrawableRepresentation);
-            }
-
-            return null;
-        }
+        public override DrawableHitObject<CatchHitObject> CreateDrawableRepresentation(CatchHitObject h) => null;
     }
 }

From f589da43177a1df974bbfc8e59e4596459c22672 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Nov 2020 19:24:38 +0900
Subject: [PATCH 06540/10326] Fix compilation error

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index e5fc717504..1ba17d9e17 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -104,9 +104,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private const float spinning_sample_initial_frequency = 1.0f;
         private const float spinning_sample_modulated_base_frequency = 0.5f;
 
-        protected override void OnFree(HitObject hitObject)
+        protected override void OnFree()
         {
-            base.OnFree(hitObject);
+            base.OnFree();
 
             spinningSample.Samples = null;
         }

From c29ad8edf8731bbaf0d3189a2917b00b7f7cde33 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 30 Nov 2020 19:26:25 +0900
Subject: [PATCH 06541/10326] Better API for dealing with the contained
 drawable samples

---
 osu.Game/Skinning/SkinnableSound.cs           | 39 +++++++++++--------
 .../Drawables/DrawableStoryboardSample.cs     |  4 +-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 46c2e4b749..23159e4fe1 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -11,6 +11,7 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 
@@ -34,7 +35,13 @@ namespace osu.Game.Skinning
         /// </remarks>
         protected bool PlayWhenZeroVolume => Looping;
 
-        protected readonly AudioContainer<PoolableSkinnableSample> SamplesContainer;
+        /// <summary>
+        /// All raw <see cref="DrawableSamples"/>s contained in this <see cref="SkinnableSound"/>.
+        /// </summary>
+        [NotNull, ItemNotNull]
+        protected IEnumerable<DrawableSample> DrawableSamples => samplesContainer.Select(c => c.Sample).Where(s => s != null);
+
+        private readonly AudioContainer<PoolableSkinnableSample> samplesContainer;
 
         [Resolved]
         private ISampleStore sampleStore { get; set; }
@@ -47,7 +54,7 @@ namespace osu.Game.Skinning
         /// </summary>
         public SkinnableSound()
         {
-            InternalChild = SamplesContainer = new AudioContainer<PoolableSkinnableSample>();
+            InternalChild = samplesContainer = new AudioContainer<PoolableSkinnableSample>();
         }
 
         /// <summary>
@@ -105,7 +112,7 @@ namespace osu.Game.Skinning
 
                 looping = value;
 
-                SamplesContainer.ForEach(c => c.Looping = looping);
+                samplesContainer.ForEach(c => c.Looping = looping);
             }
         }
 
@@ -114,7 +121,7 @@ namespace osu.Game.Skinning
         /// </summary>
         public virtual void Play()
         {
-            SamplesContainer.ForEach(c =>
+            samplesContainer.ForEach(c =>
             {
                 if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
                     c.Play();
@@ -126,7 +133,7 @@ namespace osu.Game.Skinning
         /// </summary>
         public virtual void Stop()
         {
-            SamplesContainer.ForEach(c => c.Stop());
+            samplesContainer.ForEach(c => c.Stop());
         }
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
@@ -140,8 +147,8 @@ namespace osu.Game.Skinning
             bool wasPlaying = IsPlaying;
 
             // Remove all pooled samples (return them to the pool), and dispose the rest.
-            SamplesContainer.RemoveAll(s => s.IsInPool);
-            SamplesContainer.Clear();
+            samplesContainer.RemoveAll(s => s.IsInPool);
+            samplesContainer.Clear();
 
             foreach (var s in samples)
             {
@@ -149,7 +156,7 @@ namespace osu.Game.Skinning
                 sample.Looping = Looping;
                 sample.Volume.Value = s.Volume / 100.0;
 
-                SamplesContainer.Add(sample);
+                samplesContainer.Add(sample);
             }
 
             if (wasPlaying)
@@ -158,27 +165,27 @@ namespace osu.Game.Skinning
 
         #region Re-expose AudioContainer
 
-        public BindableNumber<double> Volume => SamplesContainer.Volume;
+        public BindableNumber<double> Volume => samplesContainer.Volume;
 
-        public BindableNumber<double> Balance => SamplesContainer.Balance;
+        public BindableNumber<double> Balance => samplesContainer.Balance;
 
-        public BindableNumber<double> Frequency => SamplesContainer.Frequency;
+        public BindableNumber<double> Frequency => samplesContainer.Frequency;
 
-        public BindableNumber<double> Tempo => SamplesContainer.Tempo;
+        public BindableNumber<double> Tempo => samplesContainer.Tempo;
 
         public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => SamplesContainer.AddAdjustment(type, adjustBindable);
+            => samplesContainer.AddAdjustment(type, adjustBindable);
 
         public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => SamplesContainer.RemoveAdjustment(type, adjustBindable);
+            => samplesContainer.RemoveAdjustment(type, adjustBindable);
 
         public void RemoveAllAdjustments(AdjustableProperty type)
-            => SamplesContainer.RemoveAllAdjustments(type);
+            => samplesContainer.RemoveAllAdjustments(type);
 
         /// <summary>
         /// Whether any samples are currently playing.
         /// </summary>
-        public bool IsPlaying => SamplesContainer.Any(s => s.Playing);
+        public bool IsPlaying => samplesContainer.Any(s => s.Playing);
 
         #endregion
     }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 904af730de..218f051bf0 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Storyboards.Drawables
 
             foreach (var mod in mods.Value.OfType<IApplicableToSample>())
             {
-                foreach (var sample in SamplesContainer)
-                    mod.ApplyToSample(sample.Sample);
+                foreach (var sample in DrawableSamples)
+                    mod.ApplyToSample(sample);
             }
         }
 

From a852a27dfb04540e3c43163684cb296d46424179 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Nov 2020 19:36:30 +0900
Subject: [PATCH 06542/10326] Fix current beatmap temporarily becoming empty
 during ruleset change

When changing the ruleset at song select, there was a scenario where it
would be set to default (empty) for one debounce length where this was
not actually required. This occurs when the currently selected beatmap
set has other difficulties which match the target ruleset, specifically.
---
 osu.Game/Screens/Select/SongSelect.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index b55c0694ef..f32011a27a 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -376,7 +376,7 @@ namespace osu.Game.Screens.Select
             if (selectionChangedDebounce?.Completed == false)
             {
                 selectionChangedDebounce.RunTask();
-                selectionChangedDebounce.Cancel(); // cancel the already scheduled task.
+                selectionChangedDebounce?.Cancel(); // cancel the already scheduled task.
                 selectionChangedDebounce = null;
             }
 
@@ -465,19 +465,30 @@ namespace osu.Game.Screens.Select
 
             void run()
             {
+                // clear pending task immediately to track any potential nested debounce operation.
+                selectionChangedDebounce = null;
+
                 Logger.Log($"updating selection with beatmap:{beatmap?.ID.ToString() ?? "null"} ruleset:{ruleset?.ID.ToString() ?? "null"}");
 
                 if (transferRulesetValue())
                 {
                     Mods.Value = Array.Empty<Mod>();
 
-                    // transferRulesetValue() may trigger a refilter. If the current selection does not match the new ruleset, we want to switch away from it.
+                    // transferRulesetValue() may trigger a re-filter. If the current selection does not match the new ruleset, we want to switch away from it.
                     // The default logic on WorkingBeatmap change is to switch to a matching ruleset (see workingBeatmapChanged()), but we don't want that here.
                     // We perform an early selection attempt and clear out the beatmap selection to avoid a second ruleset change (revert).
                     if (beatmap != null && !Carousel.SelectBeatmap(beatmap, false))
                         beatmap = null;
                 }
 
+                if (selectionChangedDebounce != null)
+                {
+                    // a new nested operation was started; switch to it for further selection.
+                    // this avoids having two separate debounces trigger from the same source.
+                    selectionChangedDebounce.RunTask();
+                    return;
+                }
+
                 // We may be arriving here due to another component changing the bindable Beatmap.
                 // In these cases, the other component has already loaded the beatmap, so we don't need to do so again.
                 if (!EqualityComparer<BeatmapInfo>.Default.Equals(beatmap, Beatmap.Value.BeatmapInfo))

From 4cd234ea05bb47e6600be35d69a637571d70f315 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 19:56:12 +0900
Subject: [PATCH 06543/10326] Fix null reference of LegacyFruitPiece

---
 osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 1494ef3888..b8648f46f0 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -19,7 +19,8 @@ namespace osu.Game.Rulesets.Catch.Skinning
     {
         private readonly string lookupName;
 
-        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
+        private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
+        private readonly Bindable<bool> hyperDash = new Bindable<bool>();
         private Sprite colouredSprite;
 
         public LegacyFruitPiece(string lookupName)
@@ -34,6 +35,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
             var drawableCatchObject = (DrawablePalpableCatchHitObject)drawableObject;
 
             accentColour.BindTo(drawableCatchObject.AccentColour);
+            hyperDash.BindTo(drawableCatchObject.HyperDash);
 
             InternalChildren = new Drawable[]
             {
@@ -51,9 +53,9 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 },
             };
 
-            if (drawableCatchObject.HitObject.HyperDash)
+            if (hyperDash.Value)
             {
-                var hyperDash = new Sprite
+                var hyperDashOverlay = new Sprite
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -67,7 +69,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
                              Catcher.DEFAULT_HYPER_DASH_COLOUR,
                 };
 
-                AddInternal(hyperDash);
+                AddInternal(hyperDashOverlay);
             }
         }
 

From b5e43144a9be23ee4f2435981ab7f25ea8fcdef0 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 19:56:32 +0900
Subject: [PATCH 06544/10326] Add a Player test scene that uses a legacy skin

---
 .../TestSceneCatchPlayerLegacySkin.cs         | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs
new file mode 100644
index 0000000000..47c542374a
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.IO.Stores;
+using osu.Game.Skinning;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class TestSceneCatchPlayerLegacySkin : PlayerTestScene
+    {
+        private ISkinSource legacySkinSource;
+
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new SkinProvidingPlayer(legacySkinSource);
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, OsuGameBase game)
+        {
+            var legacySkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), audio);
+            legacySkinSource = new SkinProvidingContainer(legacySkin);
+        }
+
+        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
+
+        public class SkinProvidingPlayer : TestPlayer
+        {
+            private readonly ISkinSource skinSource;
+
+            public SkinProvidingPlayer(ISkinSource skinSource)
+            {
+                this.skinSource = skinSource;
+            }
+
+            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            {
+                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+                dependencies.CacheAs(skinSource);
+                return dependencies;
+            }
+        }
+    }
+}

From b401259f8432c144e96f030e098491996f827240 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 01:19:36 +0900
Subject: [PATCH 06545/10326] Add test coverage

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index aa531ba106..a825e2d6fa 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -643,6 +643,54 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selected beatmap correct", () => songSelect.Carousel.SelectedBeatmap == filteredBeatmap);
         }
 
+        [Test]
+        public void TestChangingRulesetOnMultiRulesetBeatmap()
+        {
+            int changeCount = 0;
+
+            AddStep("change convert setting", () => config.Set(OsuSetting.ShowConvertedBeatmaps, false));
+            AddStep("bind beatmap changed", () =>
+            {
+                Beatmap.ValueChanged += onChange;
+                changeCount = 0;
+            });
+
+            changeRuleset(0);
+
+            createSongSelect();
+
+            AddStep("import multi-ruleset map", () =>
+            {
+                var usableRulesets = rulesets.AvailableRulesets.Where(r => r.ID != 2).ToArray();
+                manager.Import(createTestBeatmapSet(usableRulesets)).Wait();
+            });
+
+            int previousSetID = 0;
+
+            AddUntilStep("wait for selection", () => !Beatmap.IsDefault);
+
+            AddStep("record set ID", () => previousSetID = Beatmap.Value.BeatmapSetInfo.ID);
+            AddAssert("selection changed once", () => changeCount == 1);
+
+            AddAssert("Check ruleset is osu!", () => Ruleset.Value.ID == 0);
+
+            changeRuleset(3);
+
+            AddUntilStep("Check ruleset changed to mania", () => Ruleset.Value.ID == 3);
+
+            AddUntilStep("selection changed", () => changeCount > 1);
+
+            AddAssert("Selected beatmap still same set", () => Beatmap.Value.BeatmapSetInfo.ID == previousSetID);
+            AddAssert("Selected beatmap is mania", () => Beatmap.Value.BeatmapInfo.Ruleset.ID == 3);
+
+            AddAssert("selection changed only fired twice", () => changeCount == 2);
+
+            AddStep("unbind beatmap changed", () => Beatmap.ValueChanged -= onChange);
+            AddStep("change convert setting", () => config.Set(OsuSetting.ShowConvertedBeatmaps, true));
+
+            void onChange(ValueChangedEvent<WorkingBeatmap> valueChangedEvent) => changeCount++;
+        }
+
         [Test]
         public void TestDifficultyIconSelectingForDifferentRuleset()
         {

From 07e14b126786d766d2c0cde8f185888c28e06c45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 01:37:53 +0900
Subject: [PATCH 06546/10326] Disable unnecessary inspection

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index a825e2d6fa..35c6d62cb7 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -688,6 +688,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("unbind beatmap changed", () => Beatmap.ValueChanged -= onChange);
             AddStep("change convert setting", () => config.Set(OsuSetting.ShowConvertedBeatmaps, true));
 
+            // ReSharper disable once AccessToModifiedClosure
             void onChange(ValueChangedEvent<WorkingBeatmap> valueChangedEvent) => changeCount++;
         }
 

From 2c57deea2bd2724a0a333146f58c2002c18e0c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Nov 2020 19:43:20 +0100
Subject: [PATCH 06547/10326] Trim double full-stop in xmldoc

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

diff --git a/osu.Game/Skinning/IPooledSampleProvider.cs b/osu.Game/Skinning/IPooledSampleProvider.cs
index 5dbbadcc8a..40193d1a1a 100644
--- a/osu.Game/Skinning/IPooledSampleProvider.cs
+++ b/osu.Game/Skinning/IPooledSampleProvider.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Retrieves a <see cref="PoolableSkinnableSample"/> from a pool.
         /// </summary>
-        /// <param name="sampleInfo">The <see cref="SampleInfo"/> describing the sample to retrieve..</param>
+        /// <param name="sampleInfo">The <see cref="SampleInfo"/> describing the sample to retrieve.</param>
         /// <returns>The <see cref="PoolableSkinnableSample"/>.</returns>
         [CanBeNull]
         PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo);

From 588a5c2aff768e7139d522b9e3acfe81d111afcf Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 1 Dec 2020 09:35:28 +0900
Subject: [PATCH 06548/10326] Remove empty comment

---
 osu.Game/Utils/StatelessRNG.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Utils/StatelessRNG.cs b/osu.Game/Utils/StatelessRNG.cs
index d316f718e3..11d079498a 100644
--- a/osu.Game/Utils/StatelessRNG.cs
+++ b/osu.Game/Utils/StatelessRNG.cs
@@ -37,7 +37,6 @@ namespace osu.Game.Utils
         {
             unchecked
             {
-                //
                 var combined = ((ulong)(uint)series << 32) | (uint)seed;
                 // The xor operation is to not map (0, 0) to 0.
                 return mix(combined ^ 0x12345678);

From 4f17e3520e3dfef916a194d10fb9c46e4abcf9af Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 1 Dec 2020 09:38:19 +0900
Subject: [PATCH 06549/10326] Use Cached attribute

---
 .../TestSceneCatchPlayerLegacySkin.cs                     | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs
index 47c542374a..f9f51ef54a 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs
@@ -28,19 +28,13 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         public class SkinProvidingPlayer : TestPlayer
         {
+            [Cached(typeof(ISkinSource))]
             private readonly ISkinSource skinSource;
 
             public SkinProvidingPlayer(ISkinSource skinSource)
             {
                 this.skinSource = skinSource;
             }
-
-            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-            {
-                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-                dependencies.CacheAs(skinSource);
-                return dependencies;
-            }
         }
     }
 }

From 604619ba47c41537cac4e49c9aeb67f2dd3320bb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 1 Dec 2020 09:49:04 +0900
Subject: [PATCH 06550/10326] Generalize legacy skin player test.

---
 .../TestSceneCatchPlayerLegacySkin.cs         | 28 +-------------
 .../Tests/Visual/LegacySkinPlayerTestScene.cs | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 27 deletions(-)
 create mode 100644 osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs
index f9f51ef54a..64695153b5 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs
@@ -2,39 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.IO.Stores;
-using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatchPlayerLegacySkin : PlayerTestScene
+    public class TestSceneCatchPlayerLegacySkin : LegacySkinPlayerTestScene
     {
-        private ISkinSource legacySkinSource;
-
-        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new SkinProvidingPlayer(legacySkinSource);
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuGameBase game)
-        {
-            var legacySkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), audio);
-            legacySkinSource = new SkinProvidingContainer(legacySkin);
-        }
-
         protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
-
-        public class SkinProvidingPlayer : TestPlayer
-        {
-            [Cached(typeof(ISkinSource))]
-            private readonly ISkinSource skinSource;
-
-            public SkinProvidingPlayer(ISkinSource skinSource)
-            {
-                this.skinSource = skinSource;
-            }
-        }
     }
 }
diff --git a/osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs b/osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs
new file mode 100644
index 0000000000..054f72400e
--- /dev/null
+++ b/osu.Game/Tests/Visual/LegacySkinPlayerTestScene.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.IO.Stores;
+using osu.Game.Rulesets;
+using osu.Game.Skinning;
+
+namespace osu.Game.Tests.Visual
+{
+    [TestFixture]
+    public abstract class LegacySkinPlayerTestScene : PlayerTestScene
+    {
+        private ISkinSource legacySkinSource;
+
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new SkinProvidingPlayer(legacySkinSource);
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, OsuGameBase game)
+        {
+            var legacySkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), audio);
+            legacySkinSource = new SkinProvidingContainer(legacySkin);
+        }
+
+        public class SkinProvidingPlayer : TestPlayer
+        {
+            [Cached(typeof(ISkinSource))]
+            private readonly ISkinSource skinSource;
+
+            public SkinProvidingPlayer(ISkinSource skinSource)
+            {
+                this.skinSource = skinSource;
+            }
+        }
+    }
+}

From d1076778fd3749a25b1d1eb2277255bdaee0aab1 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 1 Dec 2020 09:50:52 +0900
Subject: [PATCH 06551/10326] Convert switch expression to switch statement

---
 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 085af79689..26077aeba4 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -127,14 +127,23 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private DrawableCatchHitObject createCaughtFruit(DrawablePalpableCatchHitObject hitObject)
         {
-            return hitObject.HitObject switch
+            switch (hitObject.HitObject)
             {
-                Banana banana => new DrawableBanana(banana),
-                Fruit fruit => new DrawableFruit(fruit),
-                TinyDroplet tiny => new DrawableTinyDroplet(tiny),
-                Droplet droplet => new DrawableDroplet(droplet),
-                _ => null
-            };
+                case Banana banana:
+                    return new DrawableBanana(banana);
+
+                case Fruit fruit:
+                    return new DrawableFruit(fruit);
+
+                case TinyDroplet tiny:
+                    return new DrawableTinyDroplet(tiny);
+
+                case Droplet droplet:
+                    return new DrawableDroplet(droplet);
+
+                default:
+                    return null;
+            }
         }
     }
 }

From 08cb84b325e0d11f7cf97f0cb665dbbf6fa3c5bb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 1 Dec 2020 11:32:20 +0900
Subject: [PATCH 06552/10326] Pool osu!catch hit explosion

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs      |  22 ++--
 osu.Game.Rulesets.Catch/UI/HitExplosion.cs | 116 ++++++++++++---------
 2 files changed, 82 insertions(+), 56 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 0f0b9df76e..ae374a7cde 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -107,6 +108,9 @@ namespace osu.Game.Rulesets.Catch.UI
         private float hyperDashTargetPosition;
         private Bindable<bool> hitLighting;
 
+        private DrawablePool<HitExplosion> hitExplosionPool;
+        private Container<HitExplosion> hitExplosionContainer;
+
         public Catcher([NotNull] Container trailsTarget, BeatmapDifficulty difficulty = null)
         {
             this.trailsTarget = trailsTarget;
@@ -127,6 +131,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             InternalChildren = new Drawable[]
             {
+                hitExplosionPool = new DrawablePool<HitExplosion>(10),
                 caughtFruitContainer,
                 catcherIdle = new CatcherSprite(CatcherAnimationState.Idle)
                 {
@@ -142,7 +147,12 @@ namespace osu.Game.Rulesets.Catch.UI
                 {
                     Anchor = Anchor.TopCentre,
                     Alpha = 0,
-                }
+                },
+                hitExplosionContainer = new Container<HitExplosion>
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.BottomCentre,
+                },
             };
 
             trails = new CatcherTrailDisplay(this);
@@ -209,11 +219,11 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (hitLighting.Value)
             {
-                AddInternal(new HitExplosion(fruit)
-                {
-                    X = fruit.X,
-                    Scale = new Vector2(fruit.HitObject.Scale)
-                });
+                var hitExplosion = hitExplosionPool.Get();
+                hitExplosion.X = fruit.X;
+                hitExplosion.Scale = new Vector2(fruit.HitObject.Scale);
+                hitExplosion.ObjectColour = fruit.AccentColour.Value;
+                hitExplosionContainer.Add(hitExplosion);
             }
         }
 
diff --git a/osu.Game.Rulesets.Catch/UI/HitExplosion.cs b/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
index 04a86f83be..9716c1ed09 100644
--- a/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
@@ -5,35 +5,40 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Pooling;
 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
+    public class HitExplosion : PoolableDrawable
     {
-        private readonly CircularContainer largeFaint;
+        private Color4 objectColour;
 
-        public HitExplosion(DrawableCatchHitObject fruit)
+        public Color4 ObjectColour
+        {
+            get => objectColour;
+            set
+            {
+                if (objectColour == value) return;
+
+                objectColour = value;
+                onColourChanged();
+            }
+        }
+
+        private readonly CircularContainer largeFaint, smallFaint, directionalGrow1, directionalGrow2;
+
+        public HitExplosion()
         {
             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
@@ -42,33 +47,17 @@ namespace osu.Game.Rulesets.Catch.UI
                     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
+                smallFaint = 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
+                directionalGrow1 = new CircularContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -76,16 +65,8 @@ namespace osu.Game.Rulesets.Catch.UI
                     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
+                directionalGrow2 = new CircularContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -93,30 +74,65 @@ namespace osu.Game.Rulesets.Catch.UI
                     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()
+        protected override void PrepareForUse()
         {
-            base.LoadComplete();
+            base.PrepareForUse();
 
             const double duration = 400;
 
+            // we want our size to be very small so the glow dominates it.
+            largeFaint.Size = new Vector2(0.8f);
             largeFaint
                 .ResizeTo(largeFaint.Size * new Vector2(5, 1), duration, Easing.OutQuint)
                 .FadeOut(duration * 2);
 
+            const float angle_variangle = 15; // should be less than 45
+            directionalGrow1.Rotation = RNG.NextSingle(-angle_variangle, angle_variangle);
+            directionalGrow2.Rotation = RNG.NextSingle(-angle_variangle, angle_variangle);
+
             this.FadeInFromZero(50).Then().FadeOut(duration, Easing.Out);
             Expire(true);
         }
+
+        private void onColourChanged()
+        {
+            const float roundness = 100;
+
+            largeFaint.EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = Interpolation.ValueAt(0.1f, objectColour, Color4.White, 0, 1).Opacity(0.3f),
+                Roundness = 160,
+                Radius = 200,
+            };
+
+            smallFaint.EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = Interpolation.ValueAt(0.6f, objectColour, Color4.White, 0, 1),
+                Roundness = 20,
+                Radius = 50,
+            };
+
+            directionalGrow1.EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1),
+                Roundness = roundness,
+                Radius = 40,
+            };
+
+            directionalGrow2.EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1),
+                Roundness = roundness,
+                Radius = 40,
+            };
+        }
     }
 }

From e102f2e8fa390853210038a5b3dd3552997e9cdb Mon Sep 17 00:00:00 2001
From: Ryan Zmuda <ryanzmuda@gmail.com>
Date: Mon, 30 Nov 2020 21:38:16 -0500
Subject: [PATCH 06553/10326] Moved enum to bottom, change defualt bind to
 Shift-Tab, Fixed Notification

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 8 ++++----
 osu.Game/Screens/Play/HUDOverlay.cs              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index a59d69e5b5..f4a4813b94 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.Tilde }, GlobalAction.QuickExit),
             new KeyBinding(new[] { InputKey.Control, InputKey.Plus }, GlobalAction.IncreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.Control, InputKey.Minus }, GlobalAction.DecreaseScrollSpeed),
-            new KeyBinding(InputKey.I, GlobalAction.ToggleInGameInterface),
+            new KeyBinding(new[] { InputKey.Shift, InputKey.Tab }, GlobalAction.ToggleInGameInterface),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
             new KeyBinding(InputKey.Space, GlobalAction.TogglePauseReplay),
             new KeyBinding(InputKey.Control, GlobalAction.HoldForHUD),
@@ -146,9 +146,6 @@ namespace osu.Game.Input.Bindings
         [Description("Decrease scroll speed")]
         DecreaseScrollSpeed,
 
-        [Description("Toggle in-game interface")]
-        ToggleInGameInterface,
-
         [Description("Select")]
         Select,
 
@@ -204,5 +201,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Pause / resume replay")]
         TogglePauseReplay,
+
+        [Description("Toggle in-game interface")]
+        ToggleInGameInterface,
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 457706b8f5..96d1e211fd 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Screens.Play
 
                 notificationOverlay?.Post(new SimpleNotification
                 {
-                    Text = @"The score overlay is currently disabled. You can toggle this by pressing Shift+Tab."
+                    Text = $"The score overlay is currently disabled. You can toggle this by pressing {config.LookupKeyBindings(GlobalAction.ToggleInGameInterface)}."
                 });
             }
 

From 5945c088cbacc0c0240c65d63031562d65126d49 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Dec 2020 12:57:37 +0900
Subject: [PATCH 06554/10326] A few code standard cleanups

---
 osu.Game.Rulesets.Catch/UI/HitExplosion.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/HitExplosion.cs b/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
index 9716c1ed09..ce337c45b4 100644
--- a/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
@@ -28,7 +28,10 @@ namespace osu.Game.Rulesets.Catch.UI
             }
         }
 
-        private readonly CircularContainer largeFaint, smallFaint, directionalGrow1, directionalGrow2;
+        private readonly CircularContainer largeFaint;
+        private readonly CircularContainer smallFaint;
+        private readonly CircularContainer directionalGlow1;
+        private readonly CircularContainer directionalGlow2;
 
         public HitExplosion()
         {
@@ -57,7 +60,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     Masking = true,
                     Blending = BlendingParameters.Additive,
                 },
-                directionalGrow1 = new CircularContainer
+                directionalGlow1 = new CircularContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -66,7 +69,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     Size = new Vector2(0.01f, initial_height),
                     Blending = BlendingParameters.Additive,
                 },
-                directionalGrow2 = new CircularContainer
+                directionalGlow2 = new CircularContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -91,8 +94,8 @@ namespace osu.Game.Rulesets.Catch.UI
                 .FadeOut(duration * 2);
 
             const float angle_variangle = 15; // should be less than 45
-            directionalGrow1.Rotation = RNG.NextSingle(-angle_variangle, angle_variangle);
-            directionalGrow2.Rotation = RNG.NextSingle(-angle_variangle, angle_variangle);
+            directionalGlow1.Rotation = RNG.NextSingle(-angle_variangle, angle_variangle);
+            directionalGlow2.Rotation = RNG.NextSingle(-angle_variangle, angle_variangle);
 
             this.FadeInFromZero(50).Then().FadeOut(duration, Easing.Out);
             Expire(true);
@@ -118,7 +121,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 Radius = 50,
             };
 
-            directionalGrow1.EdgeEffect = new EdgeEffectParameters
+            directionalGlow1.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1),
@@ -126,7 +129,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 Radius = 40,
             };
 
-            directionalGrow2.EdgeEffect = new EdgeEffectParameters
+            directionalGlow2.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1),

From c8c1848bb8f554c022ddfd9b039d9848e1bb0ef9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 13:46:30 +0900
Subject: [PATCH 06555/10326] Fix slider control point dragging not correctly
 accounting for drag deadzone

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index c06904c0c2..c302e8fe99 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -143,6 +143,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override bool OnClick(ClickEvent e) => RequestSelection != null;
 
+        private Vector2 dragStartPosition;
+
         protected override bool OnDragStart(DragStartEvent e)
         {
             if (RequestSelection == null)
@@ -150,6 +152,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             if (e.Button == MouseButton.Left)
             {
+                dragStartPosition = ControlPoint.Position.Value;
                 changeHandler?.BeginChange();
                 return true;
             }
@@ -174,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     slider.Path.ControlPoints[i].Position.Value -= movementDelta;
             }
             else
-                ControlPoint.Position.Value += e.Delta;
+                ControlPoint.Position.Value = dragStartPosition + (e.MousePosition - e.MouseDownPosition);
         }
 
         protected override void OnDragEnd(DragEndEvent e) => changeHandler?.EndChange();

From 63ff722963bf9762dc3938228e0832ae0a92ad00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 14:00:54 +0900
Subject: [PATCH 06556/10326] Fix code formatting

---
 osu.Game/Screens/Play/HUDOverlay.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 96d1e211fd..7ab04cf9f9 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -9,7 +9,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
@@ -19,7 +18,6 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
-using osuTK.Input;
 
 namespace osu.Game.Screens.Play
 {
@@ -362,6 +360,7 @@ namespace osu.Game.Screens.Play
                             configVisibilityMode.Value = HUDVisibilityMode.Never;
                             break;
                     }
+
                     updateVisibility();
                     return true;
             }

From a147b7186d28cbf1299a019b3cc37f99714a4b6b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 14:01:34 +0900
Subject: [PATCH 06557/10326] Remove unnecessary call to updateVisibility

---
 osu.Game/Screens/Play/HUDOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 7ab04cf9f9..50195d571c 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -361,7 +361,6 @@ namespace osu.Game.Screens.Play
                             break;
                     }
 
-                    updateVisibility();
                     return true;
             }
 

From b256c546198b159aae054f79ba585146fe1b5e7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 14:17:36 +0900
Subject: [PATCH 06558/10326] Scale slider control point display in line with
 circle size

---
 .../Sliders/Components/PathControlPointPiece.cs          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index c06904c0c2..41d4d10568 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -44,6 +44,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         private OsuColour colours { get; set; }
 
         private IBindable<Vector2> sliderPosition;
+        private IBindable<float> sliderScale;
         private IBindable<Vector2> controlPointPosition;
 
         public PathControlPointPiece(Slider slider, PathControlPoint controlPoint)
@@ -69,13 +70,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Size = new Vector2(10),
+                            Size = new Vector2(20),
                         },
                         markerRing = new CircularContainer
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Size = new Vector2(14),
+                            Size = new Vector2(28),
                             Masking = true,
                             BorderThickness = 2,
                             BorderColour = Color4.White,
@@ -102,6 +103,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             controlPointPosition = ControlPoint.Position.GetBoundCopy();
             controlPointPosition.BindValueChanged(_ => updateMarkerDisplay());
 
+            sliderScale = slider.ScaleBindable.GetBoundCopy();
+            sliderScale.BindValueChanged(_ => updateMarkerDisplay());
+
             IsSelected.BindValueChanged(_ => updateMarkerDisplay());
 
             updateMarkerDisplay();
@@ -194,6 +198,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 colour = colour.Lighten(1);
 
             marker.Colour = colour;
+            marker.Scale = new Vector2(slider.Scale);
         }
     }
 }

From a16b265090942f7c5fa06234978005776586ff5b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 1 Dec 2020 14:46:04 +0900
Subject: [PATCH 06559/10326] Apply suggested styling changes

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs      |  2 +-
 osu.Game.Rulesets.Catch/UI/HitExplosion.cs | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index ae374a7cde..11b6916a4c 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (hitLighting.Value)
             {
-                var hitExplosion = hitExplosionPool.Get();
+                HitExplosion hitExplosion = hitExplosionPool.Get();
                 hitExplosion.X = fruit.X;
                 hitExplosion.Scale = new Vector2(fruit.HitObject.Scale);
                 hitExplosion.ObjectColour = fruit.AccentColour.Value;
diff --git a/osu.Game.Rulesets.Catch/UI/HitExplosion.cs b/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
index ce337c45b4..24ca778248 100644
--- a/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
@@ -121,15 +121,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 Radius = 50,
             };
 
-            directionalGlow1.EdgeEffect = new EdgeEffectParameters
-            {
-                Type = EdgeEffectType.Glow,
-                Colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1),
-                Roundness = roundness,
-                Radius = 40,
-            };
-
-            directionalGlow2.EdgeEffect = new EdgeEffectParameters
+            directionalGlow1.EdgeEffect = directionalGlow2.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1),

From e8842eed814cec5c1d889515a2075bbbd7ea23d1 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 1 Dec 2020 14:50:42 +0900
Subject: [PATCH 06560/10326] Use bigger initial capacity for catch hit object
 pool

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 97f33007fe..820f08d439 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -60,12 +60,12 @@ namespace osu.Game.Rulesets.Catch.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            RegisterPool<Droplet, DrawableDroplet>(1);
-            RegisterPool<TinyDroplet, DrawableTinyDroplet>(1);
-            RegisterPool<Fruit, DrawableFruit>(1);
-            RegisterPool<Banana, DrawableBanana>(1);
-            RegisterPool<JuiceStream, DrawableJuiceStream>(1);
-            RegisterPool<BananaShower, DrawableBananaShower>(1);
+            RegisterPool<Droplet, DrawableDroplet>(50);
+            RegisterPool<TinyDroplet, DrawableTinyDroplet>(50);
+            RegisterPool<Fruit, DrawableFruit>(100);
+            RegisterPool<Banana, DrawableBanana>(100);
+            RegisterPool<JuiceStream, DrawableJuiceStream>(10);
+            RegisterPool<BananaShower, DrawableBananaShower>(2);
         }
 
         protected override void LoadComplete()

From 8d101efb24f53f2f4f0549bc1fe734dee18b4815 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 14:56:14 +0900
Subject: [PATCH 06561/10326] Remove unused proxy layer

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index dd27ac990e..986deccd51 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -300,8 +300,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             this.FadeOut(fade_out_time, Easing.OutQuint).Expire();
         }
 
-        public Drawable ProxiedLayer => HeadCircle.ProxiedLayer;
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => sliderBody?.ReceivePositionalInputAt(screenSpacePos) ?? base.ReceivePositionalInputAt(screenSpacePos);
 
         private class DefaultSliderBody : PlaySliderBody

From d0852d7f4adcd63a16cce7b7a281f69a305b4f28 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 14:56:41 +0900
Subject: [PATCH 06562/10326] Hide slider body immediately on successful hit
 when snaking is enabled

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 986deccd51..ec653264d0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -294,6 +294,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 case ArmedState.Hit:
                     Ball.ScaleTo(HitObject.Scale * 1.4f, fade_out_time, Easing.Out);
+                    if (sliderBody?.SnakingOut.Value == true)
+                        Body.FadeOut();
                     break;
             }
 

From f8ef822e73960ab5e80e5747f312c459db058d20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 15:21:32 +0900
Subject: [PATCH 06563/10326] Add short fade to better hide transition on
 default skin

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index ec653264d0..14bcefde0a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -295,7 +295,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 case ArmedState.Hit:
                     Ball.ScaleTo(HitObject.Scale * 1.4f, fade_out_time, Easing.Out);
                     if (sliderBody?.SnakingOut.Value == true)
-                        Body.FadeOut();
+                        Body.FadeOut(40); // short fade to allow for any body colour to smoothly disappear.
                     break;
             }
 

From dd05c56a08d778d051eadcf4eda7f241336d87c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 15:34:19 +0900
Subject: [PATCH 06564/10326] Fix sliders playing hit animations when
 completely missed

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index dd27ac990e..b65463f438 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -255,7 +255,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || Time.Current < HitObject.EndTime)
                 return;
 
-            ApplyResult(r => r.Type = r.Judgement.MaxResult);
+            ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
         public override void PlaySamples()

From 5760e1c1fca35e580b459ad6a05431efc50a975f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Dec 2020 15:37:51 +0900
Subject: [PATCH 06565/10326] Make HitSampleInfo immutable

---
 .../TestSceneAutoJuiceStream.cs               |   2 +-
 osu.Game.Rulesets.Catch/Objects/Banana.cs     |   5 +
 .../Objects/JuiceStream.cs                    |   7 +-
 .../TestSceneSlider.cs                        |  10 +-
 .../Objects/Drawables/DrawableSlider.cs       |   3 +-
 .../Objects/Drawables/DrawableSpinner.cs      |   3 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |   9 +-
 .../Objects/SpinnerBonusTick.cs               |   2 +-
 .../Objects/Drawables/DrawableHit.cs          |   6 +-
 .../Drawables/DrawableTaikoHitObject.cs       |   2 +-
 .../Editing/LegacyEditorBeatmapPatcherTest.cs |   8 +-
 osu.Game/Audio/HitSampleInfo.cs               |  38 +++++--
 .../ControlPoints/SampleControlPoint.cs       |  14 +--
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  |   2 +-
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    |   7 +-
 .../Objects/Legacy/ConvertHitObjectParser.cs  | 101 +++++++-----------
 .../Components/ComposeBlueprintContainer.cs   |   4 +-
 .../Compose/Components/SelectionHandler.cs    |   2 +-
 osu.Game/Utils/Optional.cs                    |  45 ++++++++
 19 files changed, 144 insertions(+), 126 deletions(-)
 create mode 100644 osu.Game/Utils/Optional.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 3c636a5b97..0d57fb7029 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     NewCombo = i % 8 == 0,
                     Samples = new List<HitSampleInfo>(new[]
                     {
-                        new HitSampleInfo { Bank = "normal", Name = "hitnormal", Volume = 100 }
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "normal")
                     })
                 });
             }
diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index ccb1fff15b..822db890e2 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -55,6 +55,11 @@ namespace osu.Game.Rulesets.Catch.Objects
             private static string[] lookupNames { get; } = { "metronomelow", "catch-banana" };
 
             public override IEnumerable<string> LookupNames => lookupNames;
+
+            public BananaHitSampleInfo()
+                : base(string.Empty)
+            {
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index e209d012fa..d5819935ad 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -50,12 +50,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         {
             base.CreateNestedHitObjects(cancellationToken);
 
-            var dropletSamples = Samples.Select(s => new HitSampleInfo
-            {
-                Bank = s.Bank,
-                Name = @"slidertick",
-                Volume = s.Volume
-            }).ToList();
+            var dropletSamples = Samples.Select(s => s.With(@"slidertick")).ToList();
 
             int nodeIndex = 0;
             SliderEventDescriptor? lastEvent = null;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index c400e2f2ea..d40484f5ed 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -108,8 +108,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddStep("change samples", () => slider.HitObject.Samples = new[]
             {
-                new HitSampleInfo { Name = HitSampleInfo.HIT_CLAP },
-                new HitSampleInfo { Name = HitSampleInfo.HIT_WHISTLE },
+                new HitSampleInfo(HitSampleInfo.HIT_CLAP),
+                new HitSampleInfo(HitSampleInfo.HIT_WHISTLE),
             });
 
             AddAssert("head samples updated", () => assertSamples(slider.HitObject.HeadCircle));
@@ -136,15 +136,15 @@ namespace osu.Game.Rulesets.Osu.Tests
                 slider = (DrawableSlider)createSlider(repeats: 1);
 
                 for (int i = 0; i < 2; i++)
-                    slider.HitObject.NodeSamples.Add(new List<HitSampleInfo> { new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH } });
+                    slider.HitObject.NodeSamples.Add(new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_FINISH) });
 
                 Add(slider);
             });
 
             AddStep("change samples", () => slider.HitObject.Samples = new[]
             {
-                new HitSampleInfo { Name = HitSampleInfo.HIT_CLAP },
-                new HitSampleInfo { Name = HitSampleInfo.HIT_WHISTLE },
+                new HitSampleInfo(HitSampleInfo.HIT_CLAP),
+                new HitSampleInfo(HitSampleInfo.HIT_WHISTLE),
             });
 
             AddAssert("head samples not updated", () => assertSamples(slider.HitObject.HeadCircle));
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index dd27ac990e..3aa0c9ccb5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -115,8 +115,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (firstSample != null)
             {
-                var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
-                clone.Name = "sliderslide";
+                var clone = HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderslide");
 
                 samplesContainer.Add(slidingSample = new PausableSkinnableSound(clone)
                 {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 2a14a7c975..5a11265a47 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -110,8 +110,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (firstSample != null)
             {
-                var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
-                clone.Name = "spinnerspin";
+                var clone = HitObject.SampleControlPoint.ApplyTo(firstSample).With("spinnerspin");
 
                 samplesContainer.Add(spinningSample = new PausableSkinnableSound(clone)
                 {
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 755ce0866a..1670df24a8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -221,14 +221,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             var sampleList = new List<HitSampleInfo>();
 
             if (firstSample != null)
-            {
-                sampleList.Add(new HitSampleInfo
-                {
-                    Bank = firstSample.Bank,
-                    Volume = firstSample.Volume,
-                    Name = @"slidertick",
-                });
-            }
+                sampleList.Add(firstSample.With("slidertick"));
 
             foreach (var tick in NestedHitObjects.OfType<SliderTick>())
                 tick.Samples = sampleList;
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
index 235dc8710a..2c443cb96b 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Osu.Objects
     {
         public SpinnerBonusTick()
         {
-            Samples.Add(new HitSampleInfo { Name = "spinnerbonus" });
+            Samples.Add(new HitSampleInfo("spinnerbonus"));
         }
 
         public override Judgement CreateJudgement() => new OsuSpinnerBonusTickJudgement();
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 4a3759794b..29a96a7a40 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             if (isRimType != rimSamples.Any())
             {
                 if (isRimType)
-                    HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_CLAP });
+                    HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_CLAP));
                 else
                 {
                     foreach (var sample in rimSamples)
@@ -125,9 +125,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     if (s.Name != HitSampleInfo.HIT_FINISH)
                         continue;
 
-                    var sClone = s.Clone();
-                    sClone.Name = HitSampleInfo.HIT_WHISTLE;
-                    corrected[i] = sClone;
+                    corrected[i] = s.With(HitSampleInfo.HIT_WHISTLE);
                 }
 
                 return corrected;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index d8d75a7614..ff5b221273 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             if (isStrong.Value != strongSamples.Any())
             {
                 if (isStrong.Value)
-                    HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH });
+                    HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
                 else
                 {
                     foreach (var sample in strongSamples)
diff --git a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
index bb56131b04..44a908b756 100644
--- a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
+++ b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Tests.Editing
                 HitObjects =
                 {
                     (OsuHitObject)current.HitObjects[0],
-                    new HitCircle { StartTime = 2000, Samples = { new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH } } },
+                    new HitCircle { StartTime = 2000, Samples = { new HitSampleInfo(HitSampleInfo.HIT_FINISH) } },
                     (OsuHitObject)current.HitObjects[2],
                 }
             };
@@ -268,12 +268,12 @@ namespace osu.Game.Tests.Editing
                 HitObjects =
                 {
                     (OsuHitObject)current.HitObjects[0],
-                    new HitCircle { StartTime = 1000, Samples = { new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH } } },
+                    new HitCircle { StartTime = 1000, Samples = { new HitSampleInfo(HitSampleInfo.HIT_FINISH) } },
                     (OsuHitObject)current.HitObjects[2],
                     (OsuHitObject)current.HitObjects[3],
-                    new HitCircle { StartTime = 2250, Samples = { new HitSampleInfo { Name = HitSampleInfo.HIT_WHISTLE } } },
+                    new HitCircle { StartTime = 2250, Samples = { new HitSampleInfo(HitSampleInfo.HIT_WHISTLE) } },
                     (OsuHitObject)current.HitObjects[5],
-                    new HitCircle { StartTime = 3000, Samples = { new HitSampleInfo { Name = HitSampleInfo.HIT_CLAP } } },
+                    new HitCircle { StartTime = 3000, Samples = { new HitSampleInfo(HitSampleInfo.HIT_CLAP) } },
                     (OsuHitObject)current.HitObjects[7],
                 }
             };
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 8efaeb3795..bf4a83e5d7 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -1,8 +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.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
+using osu.Game.Utils;
 
 namespace osu.Game.Audio
 {
@@ -22,25 +25,33 @@ namespace osu.Game.Audio
         /// </summary>
         public static IEnumerable<string> AllAdditions => new[] { HIT_WHISTLE, HIT_CLAP, HIT_FINISH };
 
-        /// <summary>
-        /// The bank to load the sample from.
-        /// </summary>
-        public string Bank;
-
         /// <summary>
         /// The name of the sample to load.
         /// </summary>
-        public string Name;
+        public readonly string Name;
+
+        /// <summary>
+        /// The bank to load the sample from.
+        /// </summary>
+        public readonly string? Bank;
 
         /// <summary>
         /// An optional suffix to provide priority lookup. Falls back to non-suffixed <see cref="Name"/>.
         /// </summary>
-        public string Suffix;
+        public readonly string? Suffix;
 
         /// <summary>
         /// The sample volume.
         /// </summary>
-        public int Volume { get; set; }
+        public int Volume { get; }
+
+        public HitSampleInfo(string name, string? bank = null, string? suffix = null, int volume = 100)
+        {
+            Name = name;
+            Bank = bank;
+            Suffix = suffix;
+            Volume = volume;
+        }
 
         /// <summary>
         /// Retrieve all possible filenames that can be used as a source, returned in order of preference (highest first).
@@ -56,6 +67,15 @@ namespace osu.Game.Audio
             }
         }
 
-        public HitSampleInfo Clone() => (HitSampleInfo)MemberwiseClone();
+        /// <summary>
+        /// Creates a new <see cref="HitSampleInfo"/> with overridden values.
+        /// </summary>
+        /// <param name="name">An optional new sample name.</param>
+        /// <param name="bank">An optional new sample bank.</param>
+        /// <param name="suffix">An optional new lookup suffix.</param>
+        /// <param name="volume">An optional new volume.</param>
+        /// <returns>The new <see cref="HitSampleInfo"/>.</returns>
+        public virtual HitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<string?> suffix = default, Optional<int> volume = default)
+            => new HitSampleInfo(name.GetOr(Name), bank.GetOr(Bank), suffix.GetOr(Suffix), volume.GetOr(Volume));
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index f57ecfb9e3..8064da1543 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -58,12 +58,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         /// <param name="sampleName">The name of the same.</param>
         /// <returns>A populated <see cref="HitSampleInfo"/>.</returns>
-        public HitSampleInfo GetSampleInfo(string sampleName = HitSampleInfo.HIT_NORMAL) => new HitSampleInfo
-        {
-            Bank = SampleBank,
-            Name = sampleName,
-            Volume = SampleVolume,
-        };
+        public HitSampleInfo GetSampleInfo(string sampleName = HitSampleInfo.HIT_NORMAL) => new HitSampleInfo(sampleName, SampleBank, volume: SampleVolume);
 
         /// <summary>
         /// Applies <see cref="SampleBank"/> and <see cref="SampleVolume"/> to a <see cref="HitSampleInfo"/> if necessary, returning the modified <see cref="HitSampleInfo"/>.
@@ -71,12 +66,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="hitSampleInfo">The <see cref="HitSampleInfo"/>. This will not be modified.</param>
         /// <returns>The modified <see cref="HitSampleInfo"/>. This does not share a reference with <paramref name="hitSampleInfo"/>.</returns>
         public virtual HitSampleInfo ApplyTo(HitSampleInfo hitSampleInfo)
-        {
-            var newSampleInfo = hitSampleInfo.Clone();
-            newSampleInfo.Bank = hitSampleInfo.Bank ?? SampleBank;
-            newSampleInfo.Volume = hitSampleInfo.Volume > 0 ? hitSampleInfo.Volume : SampleVolume;
-            return newSampleInfo;
-        }
+            => hitSampleInfo.With(bank: hitSampleInfo.Bank ?? SampleBank, volume: hitSampleInfo.Volume > 0 ? hitSampleInfo.Volume : SampleVolume);
 
         public override bool IsRedundant(ControlPoint existing)
             => existing is SampleControlPoint existingSample
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 7ddb0b4caa..df940e8c8e 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -192,7 +192,7 @@ namespace osu.Game.Beatmaps.Formats
                 var effectPoint = beatmap.ControlPointInfo.EffectPointAt(time);
 
                 // Apply the control point to a hit sample to uncover legacy properties (e.g. suffix)
-                HitSampleInfo tempHitSample = samplePoint.ApplyTo(new ConvertHitObjectParser.LegacyHitSampleInfo());
+                HitSampleInfo tempHitSample = samplePoint.ApplyTo(new ConvertHitObjectParser.LegacyHitSampleInfo(string.Empty));
 
                 // Convert effect flags to the legacy format
                 LegacyEffectFlags effectFlags = LegacyEffectFlags.None;
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index de4dc8cdc8..9f16180e77 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -182,11 +182,8 @@ namespace osu.Game.Beatmaps.Formats
             {
                 var baseInfo = base.ApplyTo(hitSampleInfo);
 
-                if (baseInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy
-                    && legacy.CustomSampleBank == 0)
-                {
-                    legacy.CustomSampleBank = CustomSampleBank;
-                }
+                if (baseInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy && legacy.CustomSampleBank == 0)
+                    return legacy.With(customSampleBank: CustomSampleBank);
 
                 return baseInfo;
             }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 44b22033dc..9b38266400 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -13,6 +13,7 @@ using JetBrains.Annotations;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Skinning;
+using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {
@@ -427,62 +428,25 @@ namespace osu.Game.Rulesets.Objects.Legacy
             // Todo: This should return the normal SampleInfos if the specified sample file isn't found, but that's a pretty edge-case scenario
             if (!string.IsNullOrEmpty(bankInfo.Filename))
             {
-                return new List<HitSampleInfo>
-                {
-                    new FileHitSampleInfo
-                    {
-                        Filename = bankInfo.Filename,
-                        Volume = bankInfo.Volume
-                    }
-                };
+                return new List<HitSampleInfo> { new FileHitSampleInfo(bankInfo.Filename, bankInfo.Volume) };
             }
 
             var soundTypes = new List<HitSampleInfo>
             {
-                new LegacyHitSampleInfo
-                {
-                    Bank = bankInfo.Normal,
-                    Name = HitSampleInfo.HIT_NORMAL,
-                    Volume = bankInfo.Volume,
-                    CustomSampleBank = bankInfo.CustomSampleBank,
+                new LegacyHitSampleInfo(HitSampleInfo.HIT_NORMAL, bankInfo.Normal, bankInfo.Volume, bankInfo.CustomSampleBank,
                     // if the sound type doesn't have the Normal flag set, attach it anyway as a layered sample.
                     // None also counts as a normal non-layered sample: https://osu.ppy.sh/help/wiki/osu!_File_Formats/Osu_(file_format)#hitsounds
-                    IsLayered = type != LegacyHitSoundType.None && !type.HasFlag(LegacyHitSoundType.Normal)
-                }
+                    type != LegacyHitSoundType.None && !type.HasFlag(LegacyHitSoundType.Normal))
             };
 
             if (type.HasFlag(LegacyHitSoundType.Finish))
-            {
-                soundTypes.Add(new LegacyHitSampleInfo
-                {
-                    Bank = bankInfo.Add,
-                    Name = HitSampleInfo.HIT_FINISH,
-                    Volume = bankInfo.Volume,
-                    CustomSampleBank = bankInfo.CustomSampleBank
-                });
-            }
+                soundTypes.Add(new LegacyHitSampleInfo(HitSampleInfo.HIT_FINISH, bankInfo.Add, bankInfo.Volume, bankInfo.CustomSampleBank));
 
             if (type.HasFlag(LegacyHitSoundType.Whistle))
-            {
-                soundTypes.Add(new LegacyHitSampleInfo
-                {
-                    Bank = bankInfo.Add,
-                    Name = HitSampleInfo.HIT_WHISTLE,
-                    Volume = bankInfo.Volume,
-                    CustomSampleBank = bankInfo.CustomSampleBank
-                });
-            }
+                soundTypes.Add(new LegacyHitSampleInfo(HitSampleInfo.HIT_WHISTLE, bankInfo.Add, bankInfo.Volume, bankInfo.CustomSampleBank));
 
             if (type.HasFlag(LegacyHitSoundType.Clap))
-            {
-                soundTypes.Add(new LegacyHitSampleInfo
-                {
-                    Bank = bankInfo.Add,
-                    Name = HitSampleInfo.HIT_CLAP,
-                    Volume = bankInfo.Volume,
-                    CustomSampleBank = bankInfo.CustomSampleBank
-                });
-            }
+                soundTypes.Add(new LegacyHitSampleInfo(HitSampleInfo.HIT_CLAP, bankInfo.Add, bankInfo.Volume, bankInfo.CustomSampleBank));
 
             return soundTypes;
         }
@@ -500,21 +464,11 @@ namespace osu.Game.Rulesets.Objects.Legacy
             public SampleBankInfo Clone() => (SampleBankInfo)MemberwiseClone();
         }
 
+#nullable enable
+
         public class LegacyHitSampleInfo : HitSampleInfo
         {
-            private int customSampleBank;
-
-            public int CustomSampleBank
-            {
-                get => customSampleBank;
-                set
-                {
-                    customSampleBank = value;
-
-                    if (value >= 2)
-                        Suffix = value.ToString();
-                }
-            }
+            public readonly int CustomSampleBank;
 
             /// <summary>
             /// Whether this hit sample is layered.
@@ -523,18 +477,33 @@ namespace osu.Game.Rulesets.Objects.Legacy
             /// Layered hit samples are automatically added in all modes (except osu!mania), but can be disabled
             /// using the <see cref="LegacySkinConfiguration.LegacySetting.LayeredHitSounds"/> skin config option.
             /// </remarks>
-            public bool IsLayered { get; set; }
+            public readonly bool IsLayered;
+
+            public LegacyHitSampleInfo([NotNull] string name, string? bank = null, int volume = 100, int customSampleBank = 0, bool isLayered = false)
+                : base(name, bank, customSampleBank >= 2 ? customSampleBank.ToString() : null, volume)
+            {
+                CustomSampleBank = customSampleBank;
+                IsLayered = isLayered;
+            }
+
+            public override HitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<string?> suffix = default, Optional<int> volume = default)
+                => With(name, bank, volume);
+
+            public LegacyHitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<int> volume = default, Optional<int> customSampleBank = default,
+                                            Optional<bool> isLayered = default)
+                => new LegacyHitSampleInfo(name.GetOr(Name), bank.GetOr(Bank), volume.GetOr(Volume), customSampleBank.GetOr(CustomSampleBank), isLayered.GetOr(IsLayered));
         }
 
         private class FileHitSampleInfo : LegacyHitSampleInfo
         {
-            public string Filename;
+            public readonly string Filename;
 
-            public FileHitSampleInfo()
-            {
-                // Make sure that the LegacyBeatmapSkin does not fall back to the user skin.
+            public FileHitSampleInfo(string filename, int volume)
+                // Force CSS=1 to make sure that the LegacyBeatmapSkin does not fall back to the user skin.
                 // Note that this does not change the lookup names, as they are overridden locally.
-                CustomSampleBank = 1;
+                : base(string.Empty, customSampleBank: 1, volume: volume)
+            {
+                Filename = filename;
             }
 
             public override IEnumerable<string> LookupNames => new[]
@@ -542,6 +511,14 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 Filename,
                 Path.ChangeExtension(Filename, null)
             };
+
+            public override HitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<string?> suffix = default, Optional<int> volume = default)
+                => With(volume: volume);
+
+            public FileHitSampleInfo With(Optional<string> filename = default, Optional<int> volume = default)
+                => new FileHitSampleInfo(filename.GetOr(Filename), volume.GetOr(Volume));
         }
+
+#nullable disable
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 1893366d90..c09b935f28 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                 case TernaryState.True:
                     if (existingSample == null)
-                        samples.Add(new HitSampleInfo { Name = sampleName });
+                        samples.Add(new HitSampleInfo(sampleName));
                     break;
             }
         }
@@ -212,7 +212,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (blueprint != null)
             {
                 // doing this post-creations as adding the default hit sample should be the case regardless of the ruleset.
-                blueprint.HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_NORMAL });
+                blueprint.HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_NORMAL));
 
                 placementBlueprintContainer.Child = currentPlacement = blueprint;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index adf22a3370..788b485449 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -328,7 +328,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 if (h.Samples.Any(s => s.Name == sampleName))
                     continue;
 
-                h.Samples.Add(new HitSampleInfo { Name = sampleName });
+                h.Samples.Add(new HitSampleInfo(sampleName));
             }
 
             EditorBeatmap.EndChange();
diff --git a/osu.Game/Utils/Optional.cs b/osu.Game/Utils/Optional.cs
new file mode 100644
index 0000000000..9f8a1c2e62
--- /dev/null
+++ b/osu.Game/Utils/Optional.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.
+
+#nullable enable
+
+namespace osu.Game.Utils
+{
+    /// <summary>
+    /// A wrapper over a value and a boolean denoting whether the value is valid.
+    /// </summary>
+    /// <typeparam name="T">The type of value stored.</typeparam>
+    public readonly ref struct Optional<T>
+    {
+        /// <summary>
+        /// The stored value.
+        /// </summary>
+        public readonly T Value;
+
+        /// <summary>
+        /// Whether <see cref="Value"/> is valid.
+        /// </summary>
+        /// <remarks>
+        /// If <typeparamref name="T"/> is a reference type, <c>null</c> may be valid for <see cref="Value"/>.
+        /// </remarks>
+        public readonly bool HasValue;
+
+        private Optional(T value)
+        {
+            Value = value;
+            HasValue = true;
+        }
+
+        /// <summary>
+        /// Returns <see cref="Value"/> if it's valid, or a given fallback value otherwise.
+        /// </summary>
+        /// <remarks>
+        /// Shortcase for: <c>optional.HasValue ? optional.Value : fallback</c>.
+        /// </remarks>
+        /// <param name="fallback">The fallback value to return if <see cref="HasValue"/> is <c>false</c>.</param>
+        /// <returns></returns>
+        public T GetOr(T fallback) => HasValue ? Value : fallback;
+
+        public static implicit operator Optional<T>(T value) => new Optional<T>(value);
+    }
+}

From 199710b941a396cfed43b989a127c5a355522dfa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Dec 2020 15:44:16 +0900
Subject: [PATCH 06566/10326] Implement equality comparers for HitSampleInfo

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs     | 15 ++++++++++++---
 osu.Game/Audio/HitSampleInfo.cs               | 10 +++++++++-
 .../Objects/Legacy/ConvertHitObjectParser.cs  | 19 +++++++++++++++++--
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index 822db890e2..ec4b67f341 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.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.Utils;
 using osu.Game.Audio;
@@ -50,16 +51,24 @@ namespace osu.Game.Rulesets.Catch.Objects
             }
         }
 
-        private class BananaHitSampleInfo : HitSampleInfo
+        private class BananaHitSampleInfo : HitSampleInfo, IEquatable<BananaHitSampleInfo>
         {
-            private static string[] lookupNames { get; } = { "metronomelow", "catch-banana" };
+            private static readonly string[] lookup_names = { "metronomelow", "catch-banana" };
 
-            public override IEnumerable<string> LookupNames => lookupNames;
+            public override IEnumerable<string> LookupNames => lookup_names;
 
             public BananaHitSampleInfo()
                 : base(string.Empty)
             {
             }
+
+            public bool Equals(BananaHitSampleInfo other)
+                => other != null;
+
+            public override bool Equals(object obj)
+                => Equals((BananaHitSampleInfo)obj);
+
+            public override int GetHashCode() => lookup_names.GetHashCode();
         }
     }
 }
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index bf4a83e5d7..4a0e48749a 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Audio
     /// Describes a gameplay hit sample.
     /// </summary>
     [Serializable]
-    public class HitSampleInfo : ISampleInfo
+    public class HitSampleInfo : ISampleInfo, IEquatable<HitSampleInfo>
     {
         public const string HIT_WHISTLE = @"hitwhistle";
         public const string HIT_FINISH = @"hitfinish";
@@ -77,5 +77,13 @@ namespace osu.Game.Audio
         /// <returns>The new <see cref="HitSampleInfo"/>.</returns>
         public virtual HitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<string?> suffix = default, Optional<int> volume = default)
             => new HitSampleInfo(name.GetOr(Name), bank.GetOr(Bank), suffix.GetOr(Suffix), volume.GetOr(Volume));
+
+        public bool Equals(HitSampleInfo? other)
+            => other != null && Name == other.Name && Bank == other.Bank && Suffix == other.Suffix;
+
+        public override bool Equals(object? obj)
+            => Equals((HitSampleInfo?)obj);
+
+        public override int GetHashCode() => HashCode.Combine(Name, Bank, Suffix);
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 9b38266400..931bdb3db7 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -466,7 +466,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
 #nullable enable
 
-        public class LegacyHitSampleInfo : HitSampleInfo
+        public class LegacyHitSampleInfo : HitSampleInfo, IEquatable<LegacyHitSampleInfo>
         {
             public readonly int CustomSampleBank;
 
@@ -492,9 +492,16 @@ namespace osu.Game.Rulesets.Objects.Legacy
             public LegacyHitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<int> volume = default, Optional<int> customSampleBank = default,
                                             Optional<bool> isLayered = default)
                 => new LegacyHitSampleInfo(name.GetOr(Name), bank.GetOr(Bank), volume.GetOr(Volume), customSampleBank.GetOr(CustomSampleBank), isLayered.GetOr(IsLayered));
+
+            public bool Equals(LegacyHitSampleInfo? other)
+                => base.Equals(other) && CustomSampleBank == other.CustomSampleBank && IsLayered == other.IsLayered;
+
+            public override bool Equals(object? obj) => Equals((LegacyHitSampleInfo?)obj);
+
+            public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), CustomSampleBank, IsLayered);
         }
 
-        private class FileHitSampleInfo : LegacyHitSampleInfo
+        private class FileHitSampleInfo : LegacyHitSampleInfo, IEquatable<FileHitSampleInfo>
         {
             public readonly string Filename;
 
@@ -517,6 +524,14 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             public FileHitSampleInfo With(Optional<string> filename = default, Optional<int> volume = default)
                 => new FileHitSampleInfo(filename.GetOr(Filename), volume.GetOr(Volume));
+
+            public bool Equals(FileHitSampleInfo? other)
+                => base.Equals(other) && Filename == other.Filename;
+
+            public override bool Equals(object? obj)
+                => Equals((FileHitSampleInfo?)obj);
+
+            public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Filename);
         }
 
 #nullable disable

From 2b268ee012f5b4ae9d151d3a2b1fb64e07d488b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 16:16:26 +0900
Subject: [PATCH 06567/10326] Fix editor beat snapping not working correctly
 when starting with a new beatmap

---
 osu.Game/Screens/Edit/Editor.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 3d5c0ddad4..8f1cd8e28e 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -109,6 +109,12 @@ namespace osu.Game.Screens.Edit
             beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
+            if (Beatmap.Value is DummyWorkingBeatmap)
+            {
+                isNewBeatmap = true;
+                Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
+            }
+
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
 
@@ -122,12 +128,6 @@ namespace osu.Game.Screens.Edit
             // todo: remove caching of this and consume via editorBeatmap?
             dependencies.Cache(beatDivisor);
 
-            if (Beatmap.Value is DummyWorkingBeatmap)
-            {
-                isNewBeatmap = true;
-                Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
-            }
-
             try
             {
                 playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);

From 190c6ef45e3fd0cee9581596d85d8ea531160d2a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 16:44:08 +0900
Subject: [PATCH 06568/10326] Fix timeline not updating ticks correctly after
 arbitrary timing control point changes

---
 .../Timeline/TimelineTickDisplay.cs           | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 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 724256af8b..71268a1e69 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private BindableBeatDivisor beatDivisor { get; set; }
 
+        [Resolved]
+        private IEditorChangeHandler changeHandler { get; set; }
+
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -38,7 +41,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load()
         {
-            beatDivisor.BindValueChanged(_ => tickCache.Invalidate());
+            beatDivisor.BindValueChanged(_ => invalidateTicks());
+
+            // currently this is the best way to handle any kind of timing changes.
+            changeHandler.OnStateChange += invalidateTicks;
+        }
+
+        private void invalidateTicks()
+        {
+            tickCache.Invalidate();
         }
 
         /// <summary>
@@ -165,5 +176,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 return point;
             }
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (changeHandler != null)
+                changeHandler.OnStateChange -= invalidateTicks;
+        }
     }
 }

From 4900589af4d958c88a0df65a94d647bc06222032 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Dec 2020 17:02:45 +0900
Subject: [PATCH 06569/10326] Remove unused method

---
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 931bdb3db7..5895059df5 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -520,10 +520,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             };
 
             public override HitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<string?> suffix = default, Optional<int> volume = default)
-                => With(volume: volume);
-
-            public FileHitSampleInfo With(Optional<string> filename = default, Optional<int> volume = default)
-                => new FileHitSampleInfo(filename.GetOr(Filename), volume.GetOr(Volume));
+                => new FileHitSampleInfo(Filename, volume.GetOr(Volume));
 
             public bool Equals(FileHitSampleInfo? other)
                 => base.Equals(other) && Filename == other.Filename;

From d5a60ed335c012e6ba7af05c39fd08e65eeb8f20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 17:30:42 +0900
Subject: [PATCH 06570/10326] 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 0b43fd73f5..aa4d9fa4ee 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1127.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1201.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e201383d51..88af0e2138 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1127.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1201.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index e5f7581404..06b0ec8a13 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.Framework.iOS" Version="2020.1127.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1201.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1127.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1201.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 285e62be9a86369c6bcea7105387864b9e9e58af Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Dec 2020 17:47:07 +0900
Subject: [PATCH 06571/10326] Bring code in line with SDL2 defaults

---
 osu.Desktop/OsuGameDesktop.cs                                 | 2 +-
 osu.Desktop/Program.cs                                        | 4 ++--
 .../Overlays/Settings/Sections/Graphics/LayoutSettings.cs     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 0feab9a717..c62d2ee99f 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -138,7 +138,7 @@ namespace osu.Desktop
                     break;
 
                 // SDL2 DesktopWindow
-                case DesktopWindow desktopWindow:
+                case SDL2DesktopWindow desktopWindow:
                     desktopWindow.CursorState |= CursorState.Hidden;
                     desktopWindow.SetIconFromStream(iconStream);
                     desktopWindow.Title = Name;
diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index 285a813d97..6ca7079654 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -22,9 +22,9 @@ namespace osu.Desktop
         {
             // Back up the cwd before DesktopGameHost changes it
             var cwd = Environment.CurrentDirectory;
-            bool useSdl = args.Contains("--sdl");
+            bool useOsuTK = args.Contains("--tk");
 
-            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true, useSdl: useSdl))
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true, useOsuTK: useOsuTK))
             {
                 host.ExceptionThrown += handleException;
 
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 14b8dbfac0..62dc1dc806 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
         private IReadOnlyList<Size> getResolutions()
         {
             var resolutions = new List<Size> { new Size(9999, 9999) };
-            var currentDisplay = game.Window?.CurrentDisplay.Value;
+            var currentDisplay = game.Window?.CurrentDisplayBindable.Value;
 
             if (currentDisplay != null)
             {

From b780fdbe4c24efce455c6ebc1b0d53dcc3826eb3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Dec 2020 18:08:59 +0900
Subject: [PATCH 06572/10326] Ignore lookup types for JSON serialisation

---
 osu.Game/Audio/HitSampleInfo.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 4a0e48749a..27fb5d2f8e 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Audio
         /// <summary>
         /// Retrieve all possible filenames that can be used as a source, returned in order of preference (highest first).
         /// </summary>
+        [JsonIgnore]
         public virtual IEnumerable<string> LookupNames
         {
             get

From dda4d76d726592aa3fa7c23639611b3e6694b56d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Dec 2020 18:09:21 +0900
Subject: [PATCH 06573/10326] Fix bad equality comparer implementations

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs                  | 2 +-
 osu.Game/Audio/HitSampleInfo.cs                            | 2 +-
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index ec4b67f341..7734ebed12 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                 => other != null;
 
             public override bool Equals(object obj)
-                => Equals((BananaHitSampleInfo)obj);
+                => obj is BananaHitSampleInfo other && Equals(other);
 
             public override int GetHashCode() => lookup_names.GetHashCode();
         }
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 27fb5d2f8e..9bd34c009b 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Audio
             => other != null && Name == other.Name && Bank == other.Bank && Suffix == other.Suffix;
 
         public override bool Equals(object? obj)
-            => Equals((HitSampleInfo?)obj);
+            => obj is HitSampleInfo other && Equals(other);
 
         public override int GetHashCode() => HashCode.Combine(Name, Bank, Suffix);
     }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 64694fb12e..015d6a3dd6 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -496,7 +496,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
             public bool Equals(LegacyHitSampleInfo? other)
                 => base.Equals(other) && CustomSampleBank == other.CustomSampleBank && IsLayered == other.IsLayered;
 
-            public override bool Equals(object? obj) => Equals((LegacyHitSampleInfo?)obj);
+            public override bool Equals(object? obj)
+                => obj is LegacyHitSampleInfo other && Equals(other);
 
             public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), CustomSampleBank, IsLayered);
         }
@@ -529,7 +530,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 => base.Equals(other) && Filename == other.Filename;
 
             public override bool Equals(object? obj)
-                => Equals((FileHitSampleInfo?)obj);
+                => obj is FileHitSampleInfo other && Equals(other);
 
             public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Filename);
         }

From 17560aeeea75adb03347d31e02a85f2b930b0954 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Dec 2020 18:09:28 +0900
Subject: [PATCH 06574/10326] Volume should be 0 by default

---
 osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs  | 2 +-
 osu.Game/Audio/HitSampleInfo.cs                            | 3 ++-
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 0d57fb7029..f552c3c27b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     NewCombo = i % 8 == 0,
                     Samples = new List<HitSampleInfo>(new[]
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "normal")
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "normal", volume: 100)
                     })
                 });
             }
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 9bd34c009b..58b078db71 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Utils;
 
 namespace osu.Game.Audio
@@ -45,7 +46,7 @@ namespace osu.Game.Audio
         /// </summary>
         public int Volume { get; }
 
-        public HitSampleInfo(string name, string? bank = null, string? suffix = null, int volume = 100)
+        public HitSampleInfo(string name, string? bank = null, string? suffix = null, int volume = 0)
         {
             Name = name;
             Bank = bank;
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 015d6a3dd6..762edf5a13 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -479,7 +479,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             /// </remarks>
             public readonly bool IsLayered;
 
-            public LegacyHitSampleInfo(string name, string? bank = null, int volume = 100, int customSampleBank = 0, bool isLayered = false)
+            public LegacyHitSampleInfo(string name, string? bank = null, int volume = 0, int customSampleBank = 0, bool isLayered = false)
                 : base(name, bank, customSampleBank >= 2 ? customSampleBank.ToString() : null, volume)
             {
                 CustomSampleBank = customSampleBank;

From c61f00525dfe57252b43df938671ab75ba29be96 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Dec 2020 18:08:59 +0900
Subject: [PATCH 06575/10326] Ignore lookup types for JSON serialisation

---
 osu.Game/Audio/HitSampleInfo.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 4a0e48749a..27fb5d2f8e 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Audio
         /// <summary>
         /// Retrieve all possible filenames that can be used as a source, returned in order of preference (highest first).
         /// </summary>
+        [JsonIgnore]
         public virtual IEnumerable<string> LookupNames
         {
             get

From 6b4a6c12c81a8f22a8b1b0cb012b011d1c9f5275 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Dec 2020 18:09:21 +0900
Subject: [PATCH 06576/10326] Fix bad equality comparer implementations

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs                  | 2 +-
 osu.Game/Audio/HitSampleInfo.cs                            | 2 +-
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index ec4b67f341..7734ebed12 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                 => other != null;
 
             public override bool Equals(object obj)
-                => Equals((BananaHitSampleInfo)obj);
+                => obj is BananaHitSampleInfo other && Equals(other);
 
             public override int GetHashCode() => lookup_names.GetHashCode();
         }
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 27fb5d2f8e..9bd34c009b 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Audio
             => other != null && Name == other.Name && Bank == other.Bank && Suffix == other.Suffix;
 
         public override bool Equals(object? obj)
-            => Equals((HitSampleInfo?)obj);
+            => obj is HitSampleInfo other && Equals(other);
 
         public override int GetHashCode() => HashCode.Combine(Name, Bank, Suffix);
     }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 5895059df5..a7290401bc 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -496,7 +496,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
             public bool Equals(LegacyHitSampleInfo? other)
                 => base.Equals(other) && CustomSampleBank == other.CustomSampleBank && IsLayered == other.IsLayered;
 
-            public override bool Equals(object? obj) => Equals((LegacyHitSampleInfo?)obj);
+            public override bool Equals(object? obj)
+                => obj is LegacyHitSampleInfo other && Equals(other);
 
             public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), CustomSampleBank, IsLayered);
         }
@@ -526,7 +527,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 => base.Equals(other) && Filename == other.Filename;
 
             public override bool Equals(object? obj)
-                => Equals((FileHitSampleInfo?)obj);
+                => obj is FileHitSampleInfo other && Equals(other);
 
             public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Filename);
         }

From 284040511289654bf38d18567426edc285f393c5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Dec 2020 18:09:28 +0900
Subject: [PATCH 06577/10326] Volume should be 0 by default

---
 osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs  | 2 +-
 osu.Game/Audio/HitSampleInfo.cs                            | 3 ++-
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 0d57fb7029..f552c3c27b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     NewCombo = i % 8 == 0,
                     Samples = new List<HitSampleInfo>(new[]
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "normal")
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "normal", volume: 100)
                     })
                 });
             }
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 9bd34c009b..58b078db71 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Utils;
 
 namespace osu.Game.Audio
@@ -45,7 +46,7 @@ namespace osu.Game.Audio
         /// </summary>
         public int Volume { get; }
 
-        public HitSampleInfo(string name, string? bank = null, string? suffix = null, int volume = 100)
+        public HitSampleInfo(string name, string? bank = null, string? suffix = null, int volume = 0)
         {
             Name = name;
             Bank = bank;
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index a7290401bc..2cb72e9e80 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -479,7 +479,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             /// </remarks>
             public readonly bool IsLayered;
 
-            public LegacyHitSampleInfo([NotNull] string name, string? bank = null, int volume = 100, int customSampleBank = 0, bool isLayered = false)
+            public LegacyHitSampleInfo(string name, string? bank = null, int volume = 0, int customSampleBank = 0, bool isLayered = false)
                 : base(name, bank, customSampleBank >= 2 ? customSampleBank.ToString() : null, volume)
             {
                 CustomSampleBank = customSampleBank;

From 598572195c0f04acdc5c6785a88668464107f108 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Dec 2020 19:57:25 +0900
Subject: [PATCH 06578/10326] Add playlist length to match settings overlay

---
 .../Match/Components/MatchSettingsOverlay.cs  | 21 +++++++++++++++++++
 osu.Game/Tests/Beatmaps/TestBeatmap.cs        |  1 +
 2 files changed, 22 insertions(+)

diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index caefc194b1..8bf66b084c 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -2,7 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Specialized;
+using System.Linq;
 using Humanizer;
+using Humanizer.Localisation;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -69,6 +72,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             private OsuSpriteText typeLabel;
             private LoadingLayer loadingLayer;
             private DrawableRoomPlaylist playlist;
+            private OsuSpriteText playlistLength;
 
             [Resolved(CanBeNull = true)]
             private IRoomManager manager { get; set; }
@@ -229,6 +233,15 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                                                 playlist = new DrawableRoomPlaylist(true, true) { RelativeSizeAxes = Axes.Both }
                                                                             },
                                                                             new Drawable[]
+                                                                            {
+                                                                                playlistLength = new OsuSpriteText
+                                                                                {
+                                                                                    Margin = new MarginPadding { Vertical = 5 },
+                                                                                    Colour = colours.Yellow,
+                                                                                    Font = OsuFont.GetFont(size: 12),
+                                                                                }
+                                                                            },
+                                                                            new Drawable[]
                                                                             {
                                                                                 new PurpleTriangleButton
                                                                                 {
@@ -243,6 +256,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                                         {
                                                                             new Dimension(),
                                                                             new Dimension(GridSizeMode.AutoSize),
+                                                                            new Dimension(GridSizeMode.AutoSize),
                                                                         }
                                                                     }
                                                                 },
@@ -315,6 +329,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                 Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue, true);
 
                 playlist.Items.BindTo(Playlist);
+                Playlist.BindCollectionChanged(onPlaylistChanged, true);
             }
 
             protected override void Update()
@@ -324,6 +339,12 @@ namespace osu.Game.Screens.Multi.Match.Components
                 ApplyButton.Enabled.Value = hasValidSettings;
             }
 
+            private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
+            {
+                double totalLength = Playlist.Select(p => p.Beatmap.Value.Length).Sum();
+                playlistLength.Text = $"Length: {totalLength.Milliseconds().Humanize(minUnit: TimeUnit.Second, maxUnit: TimeUnit.Hour, precision: 2)}";
+            }
+
             private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0;
 
             private void apply()
diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index 87b77f4616..035cb64099 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Tests.Beatmaps
             BeatmapInfo.BeatmapSet.Metadata = BeatmapInfo.Metadata;
             BeatmapInfo.BeatmapSet.Files = new List<BeatmapSetFileInfo>();
             BeatmapInfo.BeatmapSet.Beatmaps = new List<BeatmapInfo> { BeatmapInfo };
+            BeatmapInfo.Length = 75000;
             BeatmapInfo.BeatmapSet.OnlineInfo = new BeatmapSetOnlineInfo
             {
                 Status = BeatmapSetOnlineStatus.Ranked,

From b236c75ac829f2cf76dcfd2f41da6c7f22c89f45 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 1 Dec 2020 17:32:24 +0000
Subject: [PATCH 06579/10326] Bump Microsoft.Win32.Registry from 4.7.0 to 5.0.0

Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/runtime) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Desktop/osu.Desktop.csproj                 | 2 +-
 osu.Game.Tournament/osu.Game.Tournament.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 62e8f7c518..7b80ca64d0 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
     <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="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.150" />
     <!-- .NET 3.1 SDK seems to cause issues with a runtime specification. This will likely be resolved in .NET 5. -->
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
diff --git a/osu.Game.Tournament/osu.Game.Tournament.csproj b/osu.Game.Tournament/osu.Game.Tournament.csproj
index 9cce40c9d3..b049542bb0 100644
--- a/osu.Game.Tournament/osu.Game.Tournament.csproj
+++ b/osu.Game.Tournament/osu.Game.Tournament.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 94a8784e04e2bd1157e0bb404fbf616148d82672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Dec 2020 20:08:31 +0100
Subject: [PATCH 06580/10326] Allow editor change handler to be null

---
 .../Compose/Components/Timeline/TimelineTickDisplay.cs     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 71268a1e69..fb11b859a7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private BindableBeatDivisor beatDivisor { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }
 
         [Resolved]
@@ -43,8 +43,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             beatDivisor.BindValueChanged(_ => invalidateTicks());
 
-            // currently this is the best way to handle any kind of timing changes.
-            changeHandler.OnStateChange += invalidateTicks;
+            if (changeHandler != null)
+                // currently this is the best way to handle any kind of timing changes.
+                changeHandler.OnStateChange += invalidateTicks;
         }
 
         private void invalidateTicks()

From 2e5a40eddf839b6ce4cfbca727db92828e504562 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 1 Dec 2020 20:12:09 +0100
Subject: [PATCH 06581/10326] Add an IntentFilter to handle osu! files.

---
 osu.Android/OsuGameActivity.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 7e250dce0e..b6e5742332 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Android.App;
+using Android.Content;
 using Android.Content.PM;
 using Android.OS;
 using Android.Views;
@@ -9,7 +10,9 @@ using osu.Framework.Android;
 
 namespace osu.Android
 {
+
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
+    [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable, Intent.CategoryAppFiles }, DataSchemes = new[] { "content" }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
         protected override Framework.Game CreateGame() => new OsuGameAndroid(this);

From 005fa3a7eed9230828d7337cc200a405984bab6a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 1 Dec 2020 20:28:15 +0100
Subject: [PATCH 06582/10326] Add ability to import files from a stream.

---
 osu.Game/Database/ArchiveModelManager.cs        |  8 ++++++++
 osu.Game/Database/ICanAcceptFiles.cs            |  9 +++++++++
 osu.Game/OsuGameBase.cs                         | 11 +++++++++++
 osu.Game/Screens/Edit/Setup/ResourcesSection.cs |  2 ++
 4 files changed, 30 insertions(+)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 8bdc804311..9a7aa7b039 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -212,6 +212,14 @@ namespace osu.Game.Database
             return import;
         }
 
+        /// <summary>
+        /// Import one <typeparamref name="TModel"/> from a <see cref="Stream"/>.
+        /// </summary>
+        /// <param name="stream">The stream to import files from.</param>
+        /// <param name="filename">The filename of the archive being imported.</param>
+        public async Task Import(Stream stream, string filename)
+            => await Import(new ZipArchiveReader(stream, filename)); // we need to keep around the filename as some model managers (namely SkinManager) use the archive name to populate skin info
+
         /// <summary>
         /// Fired when the user requests to view the resulting import.
         /// </summary>
diff --git a/osu.Game/Database/ICanAcceptFiles.cs b/osu.Game/Database/ICanAcceptFiles.cs
index e4d92d957c..111701f0a4 100644
--- a/osu.Game/Database/ICanAcceptFiles.cs
+++ b/osu.Game/Database/ICanAcceptFiles.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace osu.Game.Database
@@ -17,6 +18,14 @@ namespace osu.Game.Database
         /// <param name="paths">The files which should be imported.</param>
         Task Import(params string[] paths);
 
+        /// <summary>
+        /// Import the specified stream.
+        /// </summary>
+        /// <param name="stream">The stream to import files from.</param>
+        /// <param name="filename">The filename of the archive being imported.</param>
+        /// <returns></returns>
+        Task Import(Stream stream, string filename);
+
         /// <summary>
         /// An array of accepted file extensions (in the standard format of ".abc").
         /// </summary>
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e7b5d3304d..0fc2b8d1d7 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -395,6 +395,17 @@ namespace osu.Game
             }
         }
 
+        public async Task Import(Stream stream, string filename)
+        {
+            var extension = Path.GetExtension(filename)?.ToLowerInvariant();
+
+            foreach (var importer in fileImporters)
+            {
+                if (importer.HandledExtensions.Contains(extension))
+                    await importer.Import(stream, Path.GetFileNameWithoutExtension(filename));
+            }
+        }
+
         public IEnumerable<string> HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions);
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 17ecfdd52e..1527f240cb 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -99,6 +99,8 @@ namespace osu.Game.Screens.Edit.Setup
             return Task.CompletedTask;
         }
 
+        Task ICanAcceptFiles.Import(Stream stream, string filename) => Task.CompletedTask;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 03f5460dd2e269c28ae116df0ebd7317f7df9137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Dec 2020 21:57:16 +0100
Subject: [PATCH 06583/10326] Mark OsuModTestScene as abstract

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/OsuModTestScene.cs b/osu.Game.Rulesets.Osu.Tests/Mods/OsuModTestScene.cs
index 7697f46160..d3cb3bcf59 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/OsuModTestScene.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/OsuModTestScene.cs
@@ -5,7 +5,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public class OsuModTestScene : ModTestScene
+    public abstract class OsuModTestScene : ModTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
     }

From c9429632f484516b874a91215213cb0fca970a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Dec 2020 22:39:04 +0100
Subject: [PATCH 06584/10326] Resolve new NRE inspections

---
 osu.Desktop/OsuGameDesktop.cs           | 2 +-
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index c62d2ee99f..62d8c17058 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -59,7 +59,7 @@ namespace osu.Desktop
             try
             {
                 using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString()?.Split('"')[1].Replace("osu!.exe", "");
+                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString()?.Split('"')[1].Replace("osu!.exe", "");
 
                 if (checkExists(stableInstallPath))
                     return stableInstallPath;
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 999ce61ac8..71417d1cc6 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -243,7 +243,7 @@ namespace osu.Game.Tournament.IPC
                 string stableInstallPath;
 
                 using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString()?.Split('"')[1].Replace("osu!.exe", "");
 
                 if (ipcFileExistsInDirectory(stableInstallPath))
                     return stableInstallPath;

From 477de1bab0483a6b3e22b82a7fc30eaf4c9610aa Mon Sep 17 00:00:00 2001
From: Pennek <20502902+Pennek@users.noreply.github.com>
Date: Wed, 2 Dec 2020 01:11:24 +0100
Subject: [PATCH 06585/10326] change min/max values

---
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index aa1d57db31..897ddc6955 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Screens.Edit.Setup
                     Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
-                        MinValue = 2,
-                        MaxValue = 7,
+                        MinValue = 0,
+                        MaxValue = 10,
                         Precision = 0.1f,
                     }
                 },

From a9003466e301abe093880aa36ff97e27d0048e9f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Dec 2020 00:56:05 +0000
Subject: [PATCH 06586/10326] Bump Microsoft.Build.Traversal from 2.2.3 to
 3.0.2

Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.2.3 to 3.0.2.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.2.3...Microsoft.Build.Traversal.3.0.2)

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

diff --git a/global.json b/global.json
index 10b61047ac..2c93a533e4 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,6 @@
     "version": "3.1.100"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "2.2.3"
+    "Microsoft.Build.Traversal": "3.0.2"
   }
 }
\ No newline at end of file

From aac20eef441091e6f91000b7c76951d71ced3827 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Dec 2020 00:56:05 +0000
Subject: [PATCH 06587/10326] Bump System.IO.Packaging from 4.7.0 to 5.0.0

Bumps [System.IO.Packaging](https://github.com/dotnet/runtime) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/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 7b80ca64d0..47c0d805b5 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -24,7 +24,7 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="System.IO.Packaging" Version="4.7.0" />
+    <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />

From 64dfa9f9285affbb68d027782ec9cd69dad6068e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Dec 2020 00:56:06 +0000
Subject: [PATCH 06588/10326] Bump Dapper from 2.0.35 to 2.0.78

Bumps [Dapper](https://github.com/StackExchange/Dapper) from 2.0.35 to 2.0.78.
- [Release notes](https://github.com/StackExchange/Dapper/releases)
- [Commits](https://github.com/StackExchange/Dapper/commits)

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 88af0e2138..4de711eb8b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,7 +18,7 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Dapper" Version="2.0.35" />
+    <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.9" />

From 8a65328a6d5914abe07de7eddf0e2a7f234a5113 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Dec 2020 00:56:08 +0000
Subject: [PATCH 06589/10326] Bump DiscordRichPresence from 1.0.150 to 1.0.166

Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.150 to 1.0.166.
- [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 7b80ca64d0..51300dcef8 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="5.0.0" />
-    <PackageReference Include="DiscordRichPresence" Version="1.0.150" />
+    <PackageReference Include="DiscordRichPresence" Version="1.0.166" />
     <!-- .NET 3.1 SDK seems to cause issues with a runtime specification. This will likely be resolved in .NET 5. -->
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />

From 5772a0811c69d8b232a03d712b839a1dd1e870bf Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Dec 2020 00:56:09 +0000
Subject: [PATCH 06590/10326] Bump Microsoft.NET.Test.Sdk from 16.7.1 to 16.8.0

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.1 to 16.8.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.7.1...v16.8.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 dfe3bf8af4..61ecd79e3d 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.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 892f27d27f..fa7bfd7169 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.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 3639c3616f..d6a03da807 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.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 b59f3a4344..a89645d881 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.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 c692bcd5e4..83d7b4135a 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.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 5d55196dcf..bc6b994988 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.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>

From 249793d10a3cf8ab5f3ed5242d295097e637aedd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Dec 2020 00:56:09 +0000
Subject: [PATCH 06591/10326] Bump Sentry from 2.1.6 to 2.1.8

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.6 to 2.1.8.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.6...2.1.8)

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 88af0e2138..3fa703cf8f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.1201.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
-    <PackageReference Include="Sentry" Version="2.1.6" />
+    <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From 989ddd40b42a0766c773eba11ad8ec7f67ea2c44 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Dec 2020 00:56:13 +0000
Subject: [PATCH 06592/10326] Bump System.ComponentModel.Annotations from 4.7.0
 to 5.0.0

Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/runtime) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 88af0e2138..923f8f7866 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -31,6 +31,6 @@
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.iOS.props b/osu.iOS.props
index 06b0ec8a13..b32d3f900a 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -92,7 +92,7 @@
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <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="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2020.923.0" ExcludeAssets="all" />
   </ItemGroup>
 </Project>

From e19ef9627a1b0f75b68d184ea5fe5b8d0576dc4d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Dec 2020 10:54:26 +0900
Subject: [PATCH 06593/10326] Fix potentially incorrect override

---
 .../Rulesets/Objects/Legacy/ConvertHitObjectParser.cs    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 2cb72e9e80..119c9ccd7c 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -486,11 +486,11 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 IsLayered = isLayered;
             }
 
-            public override HitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<string?> suffix = default, Optional<int> volume = default)
+            public sealed override HitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<string?> suffix = default, Optional<int> volume = default)
                 => With(name, bank, volume);
 
-            public LegacyHitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<int> volume = default, Optional<int> customSampleBank = default,
-                                            Optional<bool> isLayered = default)
+            public virtual LegacyHitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<int> volume = default, Optional<int> customSampleBank = default,
+                                                    Optional<bool> isLayered = default)
                 => new LegacyHitSampleInfo(name.GetOr(Name), bank.GetOr(Bank), volume.GetOr(Volume), customSampleBank.GetOr(CustomSampleBank), isLayered.GetOr(IsLayered));
 
             public bool Equals(LegacyHitSampleInfo? other)
@@ -520,7 +520,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 Path.ChangeExtension(Filename, null)
             };
 
-            public override HitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<string?> suffix = default, Optional<int> volume = default)
+            public sealed override LegacyHitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<int> volume = default, Optional<int> customSampleBank = default,
+                                                            Optional<bool> isLayered = default)
                 => new FileHitSampleInfo(Filename, volume.GetOr(Volume));
 
             public bool Equals(FileHitSampleInfo? other)

From 2150cf1c52336cc624e7bc13fb4eb78ae18d1bd9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Dec 2020 10:55:48 +0900
Subject: [PATCH 06594/10326] Rename parameters

---
 osu.Game/Audio/HitSampleInfo.cs                  | 12 ++++++------
 .../Beatmaps/ControlPoints/SampleControlPoint.cs |  2 +-
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs       |  2 +-
 .../Objects/Legacy/ConvertHitObjectParser.cs     | 16 ++++++++--------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 58b078db71..3d90dd0189 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -72,13 +72,13 @@ namespace osu.Game.Audio
         /// <summary>
         /// Creates a new <see cref="HitSampleInfo"/> with overridden values.
         /// </summary>
-        /// <param name="name">An optional new sample name.</param>
-        /// <param name="bank">An optional new sample bank.</param>
-        /// <param name="suffix">An optional new lookup suffix.</param>
-        /// <param name="volume">An optional new volume.</param>
+        /// <param name="newName">An optional new sample name.</param>
+        /// <param name="newBank">An optional new sample bank.</param>
+        /// <param name="newSuffix">An optional new lookup suffix.</param>
+        /// <param name="newVolume">An optional new volume.</param>
         /// <returns>The new <see cref="HitSampleInfo"/>.</returns>
-        public virtual HitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<string?> suffix = default, Optional<int> volume = default)
-            => new HitSampleInfo(name.GetOr(Name), bank.GetOr(Bank), suffix.GetOr(Suffix), volume.GetOr(Volume));
+        public virtual HitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
+            => new HitSampleInfo(newName.GetOr(Name), newBank.GetOr(Bank), newSuffix.GetOr(Suffix), newVolume.GetOr(Volume));
 
         public bool Equals(HitSampleInfo? other)
             => other != null && Name == other.Name && Bank == other.Bank && Suffix == other.Suffix;
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index 8064da1543..fd0b496335 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="hitSampleInfo">The <see cref="HitSampleInfo"/>. This will not be modified.</param>
         /// <returns>The modified <see cref="HitSampleInfo"/>. This does not share a reference with <paramref name="hitSampleInfo"/>.</returns>
         public virtual HitSampleInfo ApplyTo(HitSampleInfo hitSampleInfo)
-            => hitSampleInfo.With(bank: hitSampleInfo.Bank ?? SampleBank, volume: hitSampleInfo.Volume > 0 ? hitSampleInfo.Volume : SampleVolume);
+            => hitSampleInfo.With(newBank: hitSampleInfo.Bank ?? SampleBank, newVolume: hitSampleInfo.Volume > 0 ? hitSampleInfo.Volume : SampleVolume);
 
         public override bool IsRedundant(ControlPoint existing)
             => existing is SampleControlPoint existingSample
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 9f16180e77..c9d139bdd0 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -183,7 +183,7 @@ namespace osu.Game.Beatmaps.Formats
                 var baseInfo = base.ApplyTo(hitSampleInfo);
 
                 if (baseInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy && legacy.CustomSampleBank == 0)
-                    return legacy.With(customSampleBank: CustomSampleBank);
+                    return legacy.With(newCustomSampleBank: CustomSampleBank);
 
                 return baseInfo;
             }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 119c9ccd7c..72025de131 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -486,12 +486,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 IsLayered = isLayered;
             }
 
-            public sealed override HitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<string?> suffix = default, Optional<int> volume = default)
-                => With(name, bank, volume);
+            public sealed override HitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
+                => With(newName, newBank, newVolume);
 
-            public virtual LegacyHitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<int> volume = default, Optional<int> customSampleBank = default,
-                                                    Optional<bool> isLayered = default)
-                => new LegacyHitSampleInfo(name.GetOr(Name), bank.GetOr(Bank), volume.GetOr(Volume), customSampleBank.GetOr(CustomSampleBank), isLayered.GetOr(IsLayered));
+            public virtual LegacyHitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<int> newVolume = default, Optional<int> newCustomSampleBank = default,
+                                                    Optional<bool> newIsLayered = default)
+                => new LegacyHitSampleInfo(newName.GetOr(Name), newBank.GetOr(Bank), newVolume.GetOr(Volume), newCustomSampleBank.GetOr(CustomSampleBank), newIsLayered.GetOr(IsLayered));
 
             public bool Equals(LegacyHitSampleInfo? other)
                 => base.Equals(other) && CustomSampleBank == other.CustomSampleBank && IsLayered == other.IsLayered;
@@ -520,9 +520,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 Path.ChangeExtension(Filename, null)
             };
 
-            public sealed override LegacyHitSampleInfo With(Optional<string> name = default, Optional<string?> bank = default, Optional<int> volume = default, Optional<int> customSampleBank = default,
-                                                            Optional<bool> isLayered = default)
-                => new FileHitSampleInfo(Filename, volume.GetOr(Volume));
+            public sealed override LegacyHitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<int> newVolume = default, Optional<int> newCustomSampleBank = default,
+                                                            Optional<bool> newIsLayered = default)
+                => new FileHitSampleInfo(Filename, newVolume.GetOr(Volume));
 
             public bool Equals(FileHitSampleInfo? other)
                 => base.Equals(other) && Filename == other.Filename;

From 2de3e655e07ad95dfdd9b25ee5d0a440567d7cb8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Dec 2020 12:59:45 +0900
Subject: [PATCH 06595/10326] Rename NextUlong -> NextULong

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

diff --git a/osu.Game/Utils/StatelessRNG.cs b/osu.Game/Utils/StatelessRNG.cs
index 11d079498a..118b08fe30 100644
--- a/osu.Game/Utils/StatelessRNG.cs
+++ b/osu.Game/Utils/StatelessRNG.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Utils
         /// The series number.
         /// Different values are computed for the same seed in different series.
         /// </param>
-        public static ulong NextUlong(int seed, int series = 0)
+        public static ulong NextULong(int seed, int series = 0)
         {
             unchecked
             {
@@ -60,7 +60,7 @@ namespace osu.Game.Utils
         {
             if (maxValue <= 0) throw new ArgumentOutOfRangeException(nameof(maxValue));
 
-            return (int)(NextUlong(seed, series) % (ulong)maxValue);
+            return (int)(NextULong(seed, series) % (ulong)maxValue);
         }
 
         /// <summary>
@@ -74,6 +74,6 @@ namespace osu.Game.Utils
         /// Different values are computed for the same seed in different series.
         /// </param>
         public static float NextSingle(int seed, int series = 0) =>
-            (float)(NextUlong(seed, series) & ((1 << 24) - 1)) / (1 << 24); // float has 24-bit precision
+            (float)(NextULong(seed, series) & ((1 << 24) - 1)) / (1 << 24); // float has 24-bit precision
     }
 }

From e84dab858991fdf0363a93b9269789df4208ce00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Dec 2020 14:36:52 +0900
Subject: [PATCH 06596/10326] Move new beatmap construction above beat divisor
 binding

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 8f1cd8e28e..ca7e5fbf20 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -106,15 +106,15 @@ namespace osu.Game.Screens.Edit
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, GameHost host, OsuConfigManager config)
         {
-            beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;
-            beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
-
             if (Beatmap.Value is DummyWorkingBeatmap)
             {
                 isNewBeatmap = true;
                 Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
             }
 
+            beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;
+            beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
+
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
 

From 946613e803f27025103eb8b0232a4562939877b3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Dec 2020 15:22:45 +0900
Subject: [PATCH 06597/10326] Fix bananas not playing sounds

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index 7734ebed12..a274f25200 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.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.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using osu.Framework.Utils;
@@ -8,6 +10,7 @@ using osu.Game.Audio;
 using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Utils;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects
@@ -53,19 +56,22 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         private class BananaHitSampleInfo : HitSampleInfo, IEquatable<BananaHitSampleInfo>
         {
-            private static readonly string[] lookup_names = { "metronomelow", "catch-banana" };
+            private static readonly string[] lookup_names = { "Gameplay/metronomelow", "Gameplay/catch-banana" };
 
             public override IEnumerable<string> LookupNames => lookup_names;
 
-            public BananaHitSampleInfo()
-                : base(string.Empty)
+            public BananaHitSampleInfo(int volume = 0)
+                : base(string.Empty, volume: volume)
             {
             }
 
-            public bool Equals(BananaHitSampleInfo other)
+            public sealed override HitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
+                => new BananaHitSampleInfo(newVolume.GetOr(Volume));
+
+            public bool Equals(BananaHitSampleInfo? other)
                 => other != null;
 
-            public override bool Equals(object obj)
+            public override bool Equals(object? obj)
                 => obj is BananaHitSampleInfo other && Equals(other);
 
             public override int GetHashCode() => lookup_names.GetHashCode();

From 32188418f446f4624b7ecb90e1144bfa57923ae4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Dec 2020 15:28:39 +0900
Subject: [PATCH 06598/10326] 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 aa4d9fa4ee..9d99218f88 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.1030.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1201.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 53b854caa3..4b931726e0 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -27,7 +27,7 @@
     <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.1201.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index b32d3f900a..3a47b77820 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1201.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From e7c0e9834f41f5f52fb3b331a02c4742c84bf342 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 16:53:01 +0900
Subject: [PATCH 06599/10326] Introduce RandomSeed in catch DHO

---
 .../Drawables/DrawableCatchHitObject.cs       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 1faa6a5b0f..eb5f9451b1 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -3,10 +3,13 @@
 
 using System;
 using JetBrains.Annotations;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
@@ -20,12 +23,32 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected override float SamplePlaybackPosition => HitObject.X / CatchPlayfield.WIDTH;
 
+        /// <summary>
+        /// The seed value used for visual randomness such as fruit rotation.
+        /// By default, <see cref="HitObject.StartTime"/> truncated to an integer is used.
+        /// </summary>
+        public Bindable<int> RandomSeed = new Bindable<int>();
+
         protected DrawableCatchHitObject([CanBeNull] CatchHitObject hitObject)
             : base(hitObject)
         {
             Anchor = Anchor.BottomLeft;
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            StartTimeBindable.BindValueChanged(change =>
+            {
+                RandomSeed.Value = (int)change.NewValue;
+            }, true);
+        }
+
+        /// <summary>
+        /// Get a random number in range [0,1) based on seed <see cref="RandomSeed"/>.
+        /// </summary>
+        public float RandomSingle(int series) => StatelessRNG.NextSingle(RandomSeed.Value, series);
+
         protected override void OnApply()
         {
             base.OnApply();

From 8b6161a51c27fce87f51a171a2a6f4c2e402e212 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 16:54:18 +0900
Subject: [PATCH 06600/10326] Use deterministic randomness in catch hit object

---
 .../Objects/Drawables/DrawableBanana.cs       | 20 ++++++++++++++-----
 .../Objects/Drawables/DrawableDroplet.cs      |  3 +--
 .../Objects/Drawables/DrawableFruit.cs        |  8 +++++---
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index fb982bbdab..4e34dd2b90 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -3,7 +3,6 @@
 
 using JetBrains.Annotations;
 using osu.Framework.Graphics;
-using osu.Framework.Utils;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
@@ -21,6 +20,17 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            RandomSeed.BindValueChanged(_ =>
+            {
+                UpdateComboColour();
+                UpdateInitialTransforms();
+            });
+        }
+
         protected override void UpdateInitialTransforms()
         {
             base.UpdateInitialTransforms();
@@ -28,14 +38,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             const float end_scale = 0.6f;
             const float random_scale_range = 1.6f;
 
-            ScaleContainer.ScaleTo(HitObject.Scale * (end_scale + random_scale_range * RNG.NextSingle()))
+            ScaleContainer.ScaleTo(HitObject.Scale * (end_scale + random_scale_range * RandomSingle(3)))
                           .Then().ScaleTo(HitObject.Scale * end_scale, HitObject.TimePreempt);
 
-            ScaleContainer.RotateTo(getRandomAngle())
+            ScaleContainer.RotateTo(getRandomAngle(1))
                           .Then()
-                          .RotateTo(getRandomAngle(), HitObject.TimePreempt);
+                          .RotateTo(getRandomAngle(2), HitObject.TimePreempt);
 
-            float getRandomAngle() => 180 * (RNG.NextSingle() * 2 - 1);
+            float getRandomAngle(int series) => 180 * (RandomSingle(series) * 2 - 1);
         }
 
         public override void PlaySamples()
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index 06ecd44488..b8acea625b 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -4,7 +4,6 @@
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 
@@ -45,7 +44,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             base.UpdateInitialTransforms();
 
             // roughly matches osu-stable
-            float startRotation = RNG.NextSingle() * 20;
+            float startRotation = RandomSingle(1) * 20;
             double duration = HitObject.TimePreempt + 2000;
 
             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 68cb649b66..010a3ee08c 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -5,7 +5,6 @@ using System;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 
@@ -30,8 +29,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            ScaleContainer.Rotation = (float)(RNG.NextDouble() - 0.5f) * 40;
-
             IndexInBeatmap.BindValueChanged(change =>
             {
                 VisualRepresentation.Value = GetVisualRepresentation(change.NewValue);
@@ -39,6 +36,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
             VisualRepresentation.BindValueChanged(_ => updatePiece());
             HyperDash.BindValueChanged(_ => updatePiece(), true);
+
+            RandomSeed.BindValueChanged(_ =>
+            {
+                ScaleContainer.Rotation = (RandomSingle(1) - 0.5f) * 40;
+            }, true);
         }
 
         private void updatePiece()

From 8a78c495f22416e533249ae4173bb2e81b6411c4 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 16:55:37 +0900
Subject: [PATCH 06601/10326] Refactor DHO testing logic to the "specimen"
 class

---
 .../TestSceneFruitObjects.cs                  | 34 +++++++++++++------
 .../TestSceneFruitVisualChange.cs             |  4 +--
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 160da75aa9..3a651605d3 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -3,11 +3,12 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -37,39 +38,50 @@ namespace osu.Game.Rulesets.Catch.Tests
         }
 
         private Drawable createDrawableFruit(int indexInBeatmap, bool hyperdash = false) =>
-            SetProperties(new DrawableFruit(new Fruit
+            new TestDrawableCatchHitObjectSpecimen(new DrawableFruit(new Fruit
             {
                 IndexInBeatmap = indexInBeatmap,
                 HyperDashBindable = { Value = hyperdash }
             }));
 
         private Drawable createDrawableBanana() =>
-            SetProperties(new DrawableBanana(new Banana()));
+            new TestDrawableCatchHitObjectSpecimen(new DrawableBanana(new Banana()));
 
         private Drawable createDrawableDroplet(bool hyperdash = false) =>
-            SetProperties(new DrawableDroplet(new Droplet
+            new TestDrawableCatchHitObjectSpecimen(new DrawableDroplet(new Droplet
             {
                 HyperDashBindable = { Value = hyperdash }
             }));
 
-        private Drawable createDrawableTinyDroplet() => SetProperties(new DrawableTinyDroplet(new TinyDroplet()));
+        private Drawable createDrawableTinyDroplet() => new TestDrawableCatchHitObjectSpecimen(new DrawableTinyDroplet(new TinyDroplet()));
+    }
 
-        protected virtual DrawableCatchHitObject SetProperties(DrawableCatchHitObject d)
+    public class TestDrawableCatchHitObjectSpecimen : CompositeDrawable
+    {
+        public readonly ManualClock ManualClock;
+
+        public TestDrawableCatchHitObjectSpecimen(DrawableCatchHitObject d)
         {
+            AutoSizeAxes = Axes.Both;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            ManualClock = new ManualClock();
+            Clock = new FramedClock(ManualClock);
+
             var hitObject = d.HitObject;
-            hitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 0 });
-            hitObject.StartTime = 1000000000000;
+            hitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
             hitObject.Scale = 1.5f;
+            hitObject.StartTime = 500;
 
             d.Anchor = Anchor.Centre;
-            d.RelativePositionAxes = Axes.None;
-            d.Position = Vector2.Zero;
             d.HitObjectApplied += _ =>
             {
                 d.LifetimeStart = double.NegativeInfinity;
                 d.LifetimeEnd = double.PositiveInfinity;
             };
-            return d;
+
+            InternalChild = d;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs
index 4448e828e7..125e0c674c 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs
@@ -14,13 +14,13 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         protected override void LoadComplete()
         {
-            AddStep("fruit changes visual and hyper", () => SetContents(() => SetProperties(new DrawableFruit(new Fruit
+            AddStep("fruit changes visual and hyper", () => SetContents(() => new TestDrawableCatchHitObjectSpecimen(new DrawableFruit(new Fruit
             {
                 IndexInBeatmapBindable = { BindTarget = indexInBeatmap },
                 HyperDashBindable = { BindTarget = hyperDash },
             }))));
 
-            AddStep("droplet changes hyper", () => SetContents(() => SetProperties(new DrawableDroplet(new Droplet
+            AddStep("droplet changes hyper", () => SetContents(() => new TestDrawableCatchHitObjectSpecimen(new DrawableDroplet(new Droplet
             {
                 HyperDashBindable = { BindTarget = hyperDash },
             }))));

From beda6961e433b7df28f69b898c975035e8ce24ee Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 16:55:58 +0900
Subject: [PATCH 06602/10326] Add a test for fruit randomness

---
 .../TestSceneFruitRandomness.cs               | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
new file mode 100644
index 0000000000..449cfac2db
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.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 NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public class TestSceneFruitRandomness : OsuTestScene
+    {
+        [Test]
+        public void TestFruitRandomness()
+        {
+            Bindable<int> randomSeed = new Bindable<int>();
+
+            TestDrawableFruit drawableFruit;
+            TestDrawableBanana drawableBanana;
+
+            Add(new TestDrawableCatchHitObjectSpecimen(drawableFruit = new TestDrawableFruit(new Fruit())
+            {
+                RandomSeed = { BindTarget = randomSeed }
+            }) { X = -200 });
+            Add(new TestDrawableCatchHitObjectSpecimen(drawableBanana = new TestDrawableBanana(new Banana())
+            {
+                RandomSeed = { BindTarget = randomSeed }
+            }));
+
+            float fruitRotation = 0;
+            float bananaRotation = 0;
+            float bananaScale = 0;
+
+            AddStep("set random seed to 0", () =>
+            {
+                drawableFruit.HitObject.StartTime = 500;
+                randomSeed.Value = 0;
+
+                fruitRotation = drawableFruit.InnerRotation;
+                bananaRotation = drawableBanana.InnerRotation;
+                bananaScale = drawableBanana.InnerScale;
+            });
+
+            AddStep("change random seed", () =>
+            {
+                randomSeed.Value = 10;
+            });
+
+            AddAssert("fruit rotation is changed", () => drawableFruit.InnerRotation != fruitRotation);
+            AddAssert("banana rotation is changed", () => drawableBanana.InnerRotation != bananaRotation);
+            AddAssert("banana scale is changed", () => drawableBanana.InnerScale != bananaScale);
+
+            AddStep("reset random seed", () =>
+            {
+                randomSeed.Value = 0;
+            });
+
+            AddAssert("rotation and scale restored", () =>
+                drawableFruit.InnerRotation == fruitRotation &&
+                drawableBanana.InnerRotation == bananaRotation &&
+                drawableBanana.InnerScale == bananaScale);
+
+            AddStep("change start time", () =>
+            {
+                drawableFruit.HitObject.StartTime = 1000;
+            });
+
+            AddAssert("random seed is changed", () => randomSeed.Value == 1000);
+
+            AddSliderStep("random seed", 0, 100, 0, x => randomSeed.Value = x);
+        }
+
+        private class TestDrawableFruit : DrawableFruit
+        {
+            public float InnerRotation => ScaleContainer.Rotation;
+
+            public TestDrawableFruit(Fruit h)
+                : base(h)
+            {
+            }
+        }
+
+        private class TestDrawableBanana : DrawableBanana
+        {
+            public float InnerRotation => ScaleContainer.Rotation;
+            public float InnerScale => ScaleContainer.Scale.X;
+
+            public TestDrawableBanana(Banana h)
+                : base(h)
+            {
+            }
+        }
+    }
+}

From 08848e49de025022e9ae8ec0338e067987a53b03 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 17:12:30 +0900
Subject: [PATCH 06603/10326] Set banana combo colour using random seed

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs       | 13 ++++---------
 .../Objects/CatchHitObject.cs                   | 10 ++++++++++
 .../Objects/Drawables/DrawableCatchHitObject.cs | 17 ++---------------
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index 7734ebed12..9fd01b3717 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Collections.Generic;
-using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Utils;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects
@@ -28,17 +28,12 @@ namespace osu.Game.Rulesets.Catch.Objects
             Samples = samples;
         }
 
-        private Color4? colour;
-
-        Color4 IHasComboInformation.GetComboColour(IReadOnlyList<Color4> comboColours)
-        {
-            // override any external colour changes with banananana
-            return colour ??= getBananaColour();
-        }
+        // override any external colour changes with banananana
+        Color4 IHasComboInformation.GetComboColour(IReadOnlyList<Color4> comboColours) => getBananaColour();
 
         private Color4 getBananaColour()
         {
-            switch (RNG.Next(0, 3))
+            switch (StatelessRNG.NextInt(3, RandomSeed.Value))
             {
                 default:
                     return new Color4(255, 240, 0, 255);
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index a74055bff9..b9c5e42777 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -97,6 +97,12 @@ namespace osu.Game.Rulesets.Catch.Objects
             set => ScaleBindable.Value = value;
         }
 
+        /// <summary>
+        /// The seed value used for visual randomness such as fruit rotation.
+        /// By default, <see cref="HitObject.StartTime"/> truncated to an integer is used.
+        /// </summary>
+        public Bindable<int> RandomSeed = new Bindable<int>();
+
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
@@ -111,6 +117,10 @@ namespace osu.Game.Rulesets.Catch.Objects
         protected CatchHitObject()
         {
             XBindable.BindValueChanged(x => originalX = x.NewValue - xOffset);
+            StartTimeBindable.BindValueChanged(change =>
+            {
+                RandomSeed.Value = (int)change.NewValue;
+            }, true);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index eb5f9451b1..510431ff69 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -3,11 +3,9 @@
 
 using System;
 using JetBrains.Annotations;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Utils;
 
@@ -23,10 +21,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected override float SamplePlaybackPosition => HitObject.X / CatchPlayfield.WIDTH;
 
-        /// <summary>
-        /// The seed value used for visual randomness such as fruit rotation.
-        /// By default, <see cref="HitObject.StartTime"/> truncated to an integer is used.
-        /// </summary>
         public Bindable<int> RandomSeed = new Bindable<int>();
 
         protected DrawableCatchHitObject([CanBeNull] CatchHitObject hitObject)
@@ -35,15 +29,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             Anchor = Anchor.BottomLeft;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            StartTimeBindable.BindValueChanged(change =>
-            {
-                RandomSeed.Value = (int)change.NewValue;
-            }, true);
-        }
-
         /// <summary>
         /// Get a random number in range [0,1) based on seed <see cref="RandomSeed"/>.
         /// </summary>
@@ -54,6 +39,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             base.OnApply();
 
             XBindable.BindTo(HitObject.XBindable);
+            RandomSeed.BindTo(HitObject.RandomSeed);
         }
 
         protected override void OnFree()
@@ -61,6 +47,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             base.OnFree();
 
             XBindable.UnbindFrom(HitObject.XBindable);
+            RandomSeed.UnbindFrom(HitObject.RandomSeed);
         }
 
         public Func<CatchHitObject, bool> CheckPosition;

From ef741a1471170e62edbd34277a17e9966fcf97cf Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 17:16:36 +0900
Subject: [PATCH 06604/10326] Test banana colour change based on random seed

---
 osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index 449cfac2db..244e2f14f4 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Tests.Visual;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -31,6 +32,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             float fruitRotation = 0;
             float bananaRotation = 0;
             float bananaScale = 0;
+            Color4 bananaColour = new Color4();
 
             AddStep("set random seed to 0", () =>
             {
@@ -40,16 +42,19 @@ namespace osu.Game.Rulesets.Catch.Tests
                 fruitRotation = drawableFruit.InnerRotation;
                 bananaRotation = drawableBanana.InnerRotation;
                 bananaScale = drawableBanana.InnerScale;
+                bananaColour = drawableBanana.AccentColour.Value;
             });
 
             AddStep("change random seed", () =>
             {
+                // Use a seed value such that the banana colour is different (2/3 of the seed values are okay).
                 randomSeed.Value = 10;
             });
 
             AddAssert("fruit rotation is changed", () => drawableFruit.InnerRotation != fruitRotation);
             AddAssert("banana rotation is changed", () => drawableBanana.InnerRotation != bananaRotation);
             AddAssert("banana scale is changed", () => drawableBanana.InnerScale != bananaScale);
+            AddAssert("banana colour is changed", () => drawableBanana.AccentColour.Value != bananaColour);
 
             AddStep("reset random seed", () =>
             {
@@ -59,7 +64,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddAssert("rotation and scale restored", () =>
                 drawableFruit.InnerRotation == fruitRotation &&
                 drawableBanana.InnerRotation == bananaRotation &&
-                drawableBanana.InnerScale == bananaScale);
+                drawableBanana.InnerScale == bananaScale &&
+                drawableBanana.AccentColour.Value == bananaColour);
 
             AddStep("change start time", () =>
             {

From 1a6b8e022cba52b12289b2b541effaad186a360e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 17:20:52 +0900
Subject: [PATCH 06605/10326] Fix formatting

---
 .../TestSceneFruitRandomness.cs                 | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index 244e2f14f4..38efcd85b8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -17,17 +17,14 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             Bindable<int> randomSeed = new Bindable<int>();
 
-            TestDrawableFruit drawableFruit;
-            TestDrawableBanana drawableBanana;
+            var drawableFruit = new TestDrawableFruit(new Fruit());
+            var drawableBanana = new TestDrawableBanana(new Banana());
 
-            Add(new TestDrawableCatchHitObjectSpecimen(drawableFruit = new TestDrawableFruit(new Fruit())
-            {
-                RandomSeed = { BindTarget = randomSeed }
-            }) { X = -200 });
-            Add(new TestDrawableCatchHitObjectSpecimen(drawableBanana = new TestDrawableBanana(new Banana())
-            {
-                RandomSeed = { BindTarget = randomSeed }
-            }));
+            drawableFruit.RandomSeed.BindTo(randomSeed);
+            drawableBanana.RandomSeed.BindTo(randomSeed);
+
+            Add(new TestDrawableCatchHitObjectSpecimen(drawableFruit) { X = -200 });
+            Add(new TestDrawableCatchHitObjectSpecimen(drawableBanana));
 
             float fruitRotation = 0;
             float bananaRotation = 0;

From 5936a8ffb4a1ea87720b7436bfdddb31ce47d49d Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 18:06:14 +0900
Subject: [PATCH 06606/10326] Fix drawables are added multiple times in a test
 scene

---
 .../TestSceneFruitRandomness.cs               | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index 38efcd85b8..5f7447323f 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -12,13 +12,14 @@ namespace osu.Game.Rulesets.Catch.Tests
 {
     public class TestSceneFruitRandomness : OsuTestScene
     {
-        [Test]
-        public void TestFruitRandomness()
-        {
-            Bindable<int> randomSeed = new Bindable<int>();
+        private readonly Bindable<int> randomSeed = new Bindable<int>();
+        private readonly TestDrawableFruit drawableFruit;
+        private readonly TestDrawableBanana drawableBanana;
 
-            var drawableFruit = new TestDrawableFruit(new Fruit());
-            var drawableBanana = new TestDrawableBanana(new Banana());
+        public TestSceneFruitRandomness()
+        {
+            drawableFruit = new TestDrawableFruit(new Fruit());
+            drawableBanana = new TestDrawableBanana(new Banana());
 
             drawableFruit.RandomSeed.BindTo(randomSeed);
             drawableBanana.RandomSeed.BindTo(randomSeed);
@@ -26,6 +27,12 @@ namespace osu.Game.Rulesets.Catch.Tests
             Add(new TestDrawableCatchHitObjectSpecimen(drawableFruit) { X = -200 });
             Add(new TestDrawableCatchHitObjectSpecimen(drawableBanana));
 
+            AddSliderStep("random seed", 0, 100, 0, x => randomSeed.Value = x);
+        }
+
+        [Test]
+        public void TestFruitRandomness()
+        {
             float fruitRotation = 0;
             float bananaRotation = 0;
             float bananaScale = 0;
@@ -70,8 +77,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             });
 
             AddAssert("random seed is changed", () => randomSeed.Value == 1000);
-
-            AddSliderStep("random seed", 0, 100, 0, x => randomSeed.Value = x);
         }
 
         private class TestDrawableFruit : DrawableFruit

From d5dccbc3d783c5cc5cb7389fcc970a175ea133e6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Dec 2020 19:02:49 +0900
Subject: [PATCH 06607/10326] Fix spectator not being thread-safe

---
 .../Spectator/SpectatorStreamingClient.cs     | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 9ba81720d8..08b524087a 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -36,6 +36,8 @@ namespace osu.Game.Online.Spectator
 
         private readonly List<int> watchingUsers = new List<int>();
 
+        private readonly object userLock = new object();
+
         public IBindableList<int> PlayingUsers => playingUsers;
 
         private readonly BindableList<int> playingUsers = new BindableList<int>();
@@ -144,12 +146,19 @@ namespace osu.Game.Online.Spectator
                         await connection.StartAsync();
                         Logger.Log("Spectator client connected!", LoggingTarget.Network);
 
+                        // get all the users that were previously being watched
+                        int[] users;
+
+                        lock (userLock)
+                        {
+                            users = watchingUsers.ToArray();
+                            watchingUsers.Clear();
+                        }
+
                         // success
                         isConnected = true;
 
                         // resubscribe to watched users
-                        var users = watchingUsers.ToArray();
-                        watchingUsers.Clear();
                         foreach (var userId in users)
                             WatchUser(userId);
 
@@ -238,21 +247,29 @@ namespace osu.Game.Online.Spectator
 
         public virtual void WatchUser(int userId)
         {
-            if (watchingUsers.Contains(userId))
-                return;
+            lock (userLock)
+            {
+                if (watchingUsers.Contains(userId))
+                    return;
 
-            watchingUsers.Add(userId);
+                watchingUsers.Add(userId);
 
-            if (!isConnected) return;
+                if (!isConnected)
+                    return;
+            }
 
             connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
         }
 
         public void StopWatchingUser(int userId)
         {
-            watchingUsers.Remove(userId);
+            lock (userLock)
+            {
+                watchingUsers.Remove(userId);
 
-            if (!isConnected) return;
+                if (!isConnected)
+                    return;
+            }
 
             connection.SendAsync(nameof(ISpectatorServer.EndWatchingUser), userId);
         }

From fdcfa81e4627c129f7bbcfe32280b09556c96914 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 20:53:47 +0900
Subject: [PATCH 06608/10326] Make RandomSeed a property, not a bindable

---
 .../TestSceneFruitRandomness.cs               | 35 ++++++++-----------
 osu.Game.Rulesets.Catch/Objects/Banana.cs     |  2 +-
 .../Objects/CatchHitObject.cs                 |  8 ++---
 .../Objects/Drawables/DrawableBanana.cs       |  7 ++--
 .../Drawables/DrawableCatchHitObject.cs       |  6 ++--
 .../Objects/Drawables/DrawableFruit.cs        | 10 +++---
 6 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index 5f7447323f..2ffebb7de1 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Bindables;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Tests.Visual;
@@ -12,7 +11,6 @@ namespace osu.Game.Rulesets.Catch.Tests
 {
     public class TestSceneFruitRandomness : OsuTestScene
     {
-        private readonly Bindable<int> randomSeed = new Bindable<int>();
         private readonly TestDrawableFruit drawableFruit;
         private readonly TestDrawableBanana drawableBanana;
 
@@ -21,27 +19,30 @@ namespace osu.Game.Rulesets.Catch.Tests
             drawableFruit = new TestDrawableFruit(new Fruit());
             drawableBanana = new TestDrawableBanana(new Banana());
 
-            drawableFruit.RandomSeed.BindTo(randomSeed);
-            drawableBanana.RandomSeed.BindTo(randomSeed);
-
             Add(new TestDrawableCatchHitObjectSpecimen(drawableFruit) { X = -200 });
             Add(new TestDrawableCatchHitObjectSpecimen(drawableBanana));
 
-            AddSliderStep("random seed", 0, 100, 0, x => randomSeed.Value = x);
+            AddSliderStep("start time", 500, 600, 0, x =>
+            {
+                drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = x;
+            });
         }
 
         [Test]
         public void TestFruitRandomness()
         {
+            // Use values such that the banana colour changes (2/3 of the integers are okay)
+            const int initial_start_time = 500;
+            const int another_start_time = 501;
+
             float fruitRotation = 0;
             float bananaRotation = 0;
             float bananaScale = 0;
             Color4 bananaColour = new Color4();
 
-            AddStep("set random seed to 0", () =>
+            AddStep("Initialize start time", () =>
             {
-                drawableFruit.HitObject.StartTime = 500;
-                randomSeed.Value = 0;
+                drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
 
                 fruitRotation = drawableFruit.InnerRotation;
                 bananaRotation = drawableBanana.InnerRotation;
@@ -49,10 +50,9 @@ namespace osu.Game.Rulesets.Catch.Tests
                 bananaColour = drawableBanana.AccentColour.Value;
             });
 
-            AddStep("change random seed", () =>
+            AddStep("change start time", () =>
             {
-                // Use a seed value such that the banana colour is different (2/3 of the seed values are okay).
-                randomSeed.Value = 10;
+                drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = another_start_time;
             });
 
             AddAssert("fruit rotation is changed", () => drawableFruit.InnerRotation != fruitRotation);
@@ -60,9 +60,9 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddAssert("banana scale is changed", () => drawableBanana.InnerScale != bananaScale);
             AddAssert("banana colour is changed", () => drawableBanana.AccentColour.Value != bananaColour);
 
-            AddStep("reset random seed", () =>
+            AddStep("reset start time", () =>
             {
-                randomSeed.Value = 0;
+                drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
             });
 
             AddAssert("rotation and scale restored", () =>
@@ -70,13 +70,6 @@ namespace osu.Game.Rulesets.Catch.Tests
                 drawableBanana.InnerRotation == bananaRotation &&
                 drawableBanana.InnerScale == bananaScale &&
                 drawableBanana.AccentColour.Value == bananaColour);
-
-            AddStep("change start time", () =>
-            {
-                drawableFruit.HitObject.StartTime = 1000;
-            });
-
-            AddAssert("random seed is changed", () => randomSeed.Value == 1000);
         }
 
         private class TestDrawableFruit : DrawableFruit
diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index 9fd01b3717..3a5e08b3c3 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         private Color4 getBananaColour()
         {
-            switch (StatelessRNG.NextInt(3, RandomSeed.Value))
+            switch (StatelessRNG.NextInt(3, RandomSeed))
             {
                 default:
                     return new Color4(255, 240, 0, 255);
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index b9c5e42777..b86b3a7496 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -99,9 +99,9 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         /// <summary>
         /// The seed value used for visual randomness such as fruit rotation.
-        /// By default, <see cref="HitObject.StartTime"/> truncated to an integer is used.
+        /// The value is <see cref="HitObject.StartTime"/> truncated to an integer.
         /// </summary>
-        public Bindable<int> RandomSeed = new Bindable<int>();
+        public int RandomSeed => (int)StartTime;
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
@@ -117,10 +117,6 @@ namespace osu.Game.Rulesets.Catch.Objects
         protected CatchHitObject()
         {
             XBindable.BindValueChanged(x => originalX = x.NewValue - xOffset);
-            StartTimeBindable.BindValueChanged(change =>
-            {
-                RandomSeed.Value = (int)change.NewValue;
-            }, true);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index 4e34dd2b90..8e9d80106b 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -24,11 +24,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             base.LoadComplete();
 
-            RandomSeed.BindValueChanged(_ =>
-            {
-                UpdateComboColour();
-                UpdateInitialTransforms();
-            });
+            // start time affects the random seed which is used to determine the banana colour
+            StartTimeBindable.BindValueChanged(_ => UpdateComboColour());
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 510431ff69..86c1c7d0cd 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected override float SamplePlaybackPosition => HitObject.X / CatchPlayfield.WIDTH;
 
-        public Bindable<int> RandomSeed = new Bindable<int>();
+        public int RandomSeed => HitObject?.RandomSeed ?? 0;
 
         protected DrawableCatchHitObject([CanBeNull] CatchHitObject hitObject)
             : base(hitObject)
@@ -32,14 +32,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         /// <summary>
         /// Get a random number in range [0,1) based on seed <see cref="RandomSeed"/>.
         /// </summary>
-        public float RandomSingle(int series) => StatelessRNG.NextSingle(RandomSeed.Value, series);
+        public float RandomSingle(int series) => StatelessRNG.NextSingle(RandomSeed, series);
 
         protected override void OnApply()
         {
             base.OnApply();
 
             XBindable.BindTo(HitObject.XBindable);
-            RandomSeed.BindTo(HitObject.RandomSeed);
         }
 
         protected override void OnFree()
@@ -47,7 +46,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             base.OnFree();
 
             XBindable.UnbindFrom(HitObject.XBindable);
-            RandomSeed.UnbindFrom(HitObject.RandomSeed);
         }
 
         public Func<CatchHitObject, bool> CheckPosition;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index 010a3ee08c..56b9b56372 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -36,11 +36,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
             VisualRepresentation.BindValueChanged(_ => updatePiece());
             HyperDash.BindValueChanged(_ => updatePiece(), true);
+        }
 
-            RandomSeed.BindValueChanged(_ =>
-            {
-                ScaleContainer.Rotation = (RandomSingle(1) - 0.5f) * 40;
-            }, true);
+        protected override void UpdateInitialTransforms()
+        {
+            base.UpdateInitialTransforms();
+
+            ScaleContainer.Rotation = (RandomSingle(1) - 0.5f) * 40;
         }
 
         private void updatePiece()

From 827e957568d6efc53564193ae9196bbb13cc29bc Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 2 Dec 2020 18:03:49 +0100
Subject: [PATCH 06609/10326] Allow importing osz files / osk files from
 Downloads directory.

---
 osu.Android/OsuGameActivity.cs | 23 +++++++++++++++++++++--
 osu.Game/OsuGame.cs            | 16 ++++++++--------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index b6e5742332..c41323b97f 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.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.Linq;
+using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
@@ -12,10 +14,12 @@ namespace osu.Android
 {
 
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
-    [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable, Intent.CategoryAppFiles }, DataSchemes = new[] { "content" }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
-        protected override Framework.Game CreateGame() => new OsuGameAndroid(this);
+        private OsuGameAndroid game;
+
+        protected override Framework.Game CreateGame() => game = new OsuGameAndroid(this);
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
@@ -26,8 +30,23 @@ namespace osu.Android
 
             base.OnCreate(savedInstanceState);
 
+            OnNewIntent(Intent);
+
             Window.AddFlags(WindowManagerFlags.Fullscreen);
             Window.AddFlags(WindowManagerFlags.KeepScreenOn);
         }
+
+        protected override void OnNewIntent(Intent intent)
+        {
+            if (intent.Action == Intent.ActionView)
+            {
+                var filename = intent.Data.Path.Split('/').Last();
+                var stream = ContentResolver.OpenInputStream(intent.Data);
+                if (stream != null)
+                    // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
+                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, filename))); 
+            }
+            base.OnNewIntent(intent);
+        }
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index bb638bcf3a..5b6b90fba5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -267,7 +267,7 @@ namespace osu.Game
                 case LinkAction.OpenEditorTimestamp:
                 case LinkAction.JoinMultiplayerMatch:
                 case LinkAction.Spectate:
-                    waitForReady(() => notifications, _ => notifications.Post(new SimpleNotification
+                    WaitForReady(() => notifications, _ => notifications.Post(new SimpleNotification
                     {
                         Text = @"This link type is not yet supported!",
                         Icon = FontAwesome.Solid.LifeRing,
@@ -288,7 +288,7 @@ namespace osu.Game
             }
         });
 
-        public void OpenUrlExternally(string url) => waitForReady(() => externalLinkOpener, _ =>
+        public void OpenUrlExternally(string url) => WaitForReady(() => externalLinkOpener, _ =>
         {
             if (url.StartsWith('/'))
                 url = $"{API.Endpoint}{url}";
@@ -300,7 +300,7 @@ namespace osu.Game
         /// Open a specific channel in chat.
         /// </summary>
         /// <param name="channel">The channel to display.</param>
-        public void ShowChannel(string channel) => waitForReady(() => channelManager, _ =>
+        public void ShowChannel(string channel) => WaitForReady(() => channelManager, _ =>
         {
             try
             {
@@ -316,19 +316,19 @@ namespace osu.Game
         /// Show a beatmap set as an overlay.
         /// </summary>
         /// <param name="setId">The set to display.</param>
-        public void ShowBeatmapSet(int setId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmapSet(setId));
+        public void ShowBeatmapSet(int setId) => WaitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmapSet(setId));
 
         /// <summary>
         /// Show a user's profile as an overlay.
         /// </summary>
         /// <param name="userId">The user to display.</param>
-        public void ShowUser(int userId) => waitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
+        public void ShowUser(int userId) => WaitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
 
         /// <summary>
         /// Show a beatmap's set as an overlay, displaying the given beatmap.
         /// </summary>
         /// <param name="beatmapId">The beatmap to show.</param>
-        public void ShowBeatmap(int beatmapId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
+        public void ShowBeatmap(int beatmapId) => WaitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
 
         /// <summary>
         /// Present a beatmap at song select immediately.
@@ -483,13 +483,13 @@ namespace osu.Game
         /// <param name="retrieveInstance">A function to retrieve a (potentially not-yet-constructed) target instance.</param>
         /// <param name="action">The action to perform on the instance when load is confirmed.</param>
         /// <typeparam name="T">The type of the target instance.</typeparam>
-        private void waitForReady<T>(Func<T> retrieveInstance, Action<T> action)
+        public void WaitForReady<T>(Func<T> retrieveInstance, Action<T> action)
             where T : Drawable
         {
             var instance = retrieveInstance();
 
             if (ScreenStack == null || ScreenStack.CurrentScreen is StartupScreen || instance?.IsLoaded != true)
-                Schedule(() => waitForReady(retrieveInstance, action));
+                Schedule(() => WaitForReady(retrieveInstance, action));
             else
                 action(instance);
         }

From bbde1f6b9c755df552ec02c8194866b51f17dbf2 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 1 Dec 2020 22:26:17 +0100
Subject: [PATCH 06610/10326] Fix MouseHandler not being ignored when raw input
 is enabled

---
 .../Settings/Sections/Input/MouseSettings.cs       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index f0d51a0d37..b9e9de1200 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Handlers.Mouse;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
@@ -18,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private readonly BindableBool rawInputToggle = new BindableBool();
         private Bindable<double> sensitivityBindable = new BindableDouble();
-        private Bindable<string> ignoredInputHandler;
+        private Bindable<string> ignoredInputHandlers;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
@@ -75,20 +76,21 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 {
                     // this is temporary until we support per-handler settings.
                     const string raw_mouse_handler = @"OsuTKRawMouseHandler";
-                    const string standard_mouse_handler = @"OsuTKMouseHandler";
+                    const string osutk_standard_mouse_handler = @"OsuTKMouseHandler";
+                    string standardMouseHandlers = $"{osutk_standard_mouse_handler} {nameof(MouseHandler)}";
 
-                    ignoredInputHandler.Value = enabled.NewValue ? standard_mouse_handler : raw_mouse_handler;
+                    ignoredInputHandlers.Value = enabled.NewValue ? standardMouseHandlers : raw_mouse_handler;
                 };
 
-                ignoredInputHandler = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
-                ignoredInputHandler.ValueChanged += handler =>
+                ignoredInputHandlers = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
+                ignoredInputHandlers.ValueChanged += handler =>
                 {
                     bool raw = !handler.NewValue.Contains("Raw");
                     rawInputToggle.Value = raw;
                     sensitivityBindable.Disabled = !raw;
                 };
 
-                ignoredInputHandler.TriggerChange();
+                ignoredInputHandlers.TriggerChange();
             }
         }
 

From a2a10d4e131e3ecbedcec977f86e4ac8a426db79 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Wed, 2 Dec 2020 19:45:59 +0100
Subject: [PATCH 06611/10326] Don't use nameof(MouseHandler)

---
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index b9e9de1200..b5d7a1ac0e 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -76,10 +76,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 {
                     // this is temporary until we support per-handler settings.
                     const string raw_mouse_handler = @"OsuTKRawMouseHandler";
-                    const string osutk_standard_mouse_handler = @"OsuTKMouseHandler";
-                    string standardMouseHandlers = $"{osutk_standard_mouse_handler} {nameof(MouseHandler)}";
+                    const string standard_mouse_handlers = @"OsuTKMouseHandler MouseHandler";
 
-                    ignoredInputHandlers.Value = enabled.NewValue ? standardMouseHandlers : raw_mouse_handler;
+                    ignoredInputHandlers.Value = enabled.NewValue ? standard_mouse_handlers : raw_mouse_handler;
                 };
 
                 ignoredInputHandlers = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);

From 7fd385efe60cb117f881be9afa7d4377c2f13aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 2 Dec 2020 20:01:56 +0100
Subject: [PATCH 06612/10326] Remove unused using directive

---
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index b5d7a1ac0e..b54ad9a641 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
-using osu.Framework.Input.Handlers.Mouse;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;

From 2e8195e059d8cd2f17d5477460797c4279eef86c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 3 Dec 2020 12:13:14 +0900
Subject: [PATCH 06613/10326] Use transformation to set fruit rotation

---
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index 56b9b56372..ef9df02a68 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -5,6 +5,7 @@ using System;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 
@@ -42,7 +43,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             base.UpdateInitialTransforms();
 
-            ScaleContainer.Rotation = (RandomSingle(1) - 0.5f) * 40;
+            ScaleContainer.RotateTo((RandomSingle(1) - 0.5f) * 40);
         }
 
         private void updatePiece()

From 6c46046c2426ef38fc6589f737e180adecea7829 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 3 Dec 2020 12:32:49 +0900
Subject: [PATCH 06614/10326] Fix DHO expires while hit sound is playing

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 +-
 osu.Game/Skinning/PausableSkinnableSound.cs              | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index a922da0aa9..ad96b1caef 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -453,7 +453,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             state.Value = newState;
 
             if (LifetimeEnd == double.MaxValue && (state.Value != ArmedState.Idle || HitObject.HitWindows == null))
-                Expire();
+                LifetimeEnd = Math.Max(LatestTransformEndTime, HitStateUpdateTime + (Samples?.Length ?? 0));
 
             // apply any custom state overrides
             ApplyCustomUpdateState?.Invoke(this, newState);
diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 4f09aec0b6..7056b2b2ad 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -2,6 +2,7 @@
 // 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.Bindables;
 using osu.Framework.Threading;
@@ -12,6 +13,8 @@ namespace osu.Game.Skinning
 {
     public class PausableSkinnableSound : SkinnableSound
     {
+        public double Length => SamplesContainer.Children.Count == 0 ? 0 : SamplesContainer.Children.Max(sample => sample.Length);
+
         protected bool RequestedPlaying { get; private set; }
 
         public PausableSkinnableSound(ISampleInfo hitSamples)

From 897f593b379b10c2765b54ff22618b821c3ad77e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Dec 2020 13:26:28 +0900
Subject: [PATCH 06615/10326] Fix beatmap carousel panels getting masked away
 when out of scroll bounds

Regressed in https://github.com/ppy/osu/pull/10973 due to removed masking specification.

Closes #11067.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 4ce87927a1..d76f0abb9e 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -914,6 +914,9 @@ namespace osu.Game.Screens.Select
             {
                 // size is determined by the carousel itself, due to not all content necessarily being loaded.
                 ScrollContent.AutoSizeAxes = Axes.None;
+
+                // the scroll container may get pushed off-screen by global screen changes, but we still want panels to display outside of the bounds.
+                Masking = false;
             }
 
             // ReSharper disable once OptionalParameterHierarchyMismatch 2020.3 EAP4 bug. (https://youtrack.jetbrains.com/issue/RSRP-481535?p=RIDER-51910)

From e3bbc2b1284ab2b7bdeff55843146ab86b4321b1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Dec 2020 14:28:37 +0900
Subject: [PATCH 06616/10326] Rework osu! hidden mod to avoid storing
 hitobjects

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs    | 134 +++++++++---------
 .../Objects/Drawables/DrawableSliderHead.cs   |  17 ++-
 .../Objects/Drawables/DrawableSliderRepeat.cs |   4 +
 .../Objects/Drawables/DrawableSliderTail.cs   |  12 ++
 4 files changed, 97 insertions(+), 70 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 7c1dd46c02..78e759f0e0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -2,9 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -25,23 +26,19 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         protected override bool IsFirstAdjustableObject(HitObject hitObject) => !(hitObject is Spinner);
 
-        public override void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        public override void ApplyToBeatmap(IBeatmap beatmap)
         {
-            foreach (var d in drawables)
-                d.HitObjectApplied += applyFadeInAdjustment;
+            base.ApplyToBeatmap(beatmap);
 
-            base.ApplyToDrawableHitObjects(drawables);
-        }
+            foreach (var obj in beatmap.HitObjects.OfType<OsuHitObject>())
+                applyFadeInAdjustment(obj);
 
-        private void applyFadeInAdjustment(DrawableHitObject hitObject)
-        {
-            if (!(hitObject is DrawableOsuHitObject d))
-                return;
-
-            d.HitObject.TimeFadeIn = d.HitObject.TimePreempt * fade_in_duration_multiplier;
-
-            foreach (var nested in d.NestedHitObjects)
-                applyFadeInAdjustment(nested);
+            static void applyFadeInAdjustment(OsuHitObject osuObject)
+            {
+                osuObject.TimeFadeIn = osuObject.TimePreempt * fade_in_duration_multiplier;
+                foreach (var nested in osuObject.NestedHitObjects.OfType<OsuHitObject>())
+                    applyFadeInAdjustment(nested);
+            }
         }
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
@@ -56,37 +53,27 @@ namespace osu.Game.Rulesets.Osu.Mods
             applyState(hitObject, false);
         }
 
-        private void applyState(DrawableHitObject drawable, bool increaseVisibility)
+        private void applyState(DrawableHitObject drawableObject, bool increaseVisibility)
         {
-            if (!(drawable is DrawableOsuHitObject d))
+            if (!(drawableObject is DrawableOsuHitObject drawableOsuObject))
                 return;
 
-            var h = d.HitObject;
+            OsuHitObject hitObject = drawableOsuObject.HitObject;
 
-            var fadeOutStartTime = h.StartTime - h.TimePreempt + h.TimeFadeIn;
-            var fadeOutDuration = h.TimePreempt * fade_out_duration_multiplier;
+            (double startTime, double duration) fadeOut = getFadeOutParameters(drawableOsuObject);
 
-            // new duration from completed fade in to end (before fading out)
-            var longFadeDuration = h.GetEndTime() - fadeOutStartTime;
-
-            switch (drawable)
+            switch (drawableObject)
             {
-                case DrawableSliderTail sliderTail:
-                    // use stored values from head circle to achieve same fade sequence.
-                    var tailFadeOutParameters = getFadeOutParametersFromSliderHead(h);
-
-                    using (drawable.BeginAbsoluteSequence(tailFadeOutParameters.startTime, true))
-                        sliderTail.FadeOut(tailFadeOutParameters.duration);
+                case DrawableSliderTail _:
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
+                        drawableObject.FadeOut(fadeOut.duration);
 
                     break;
 
                 case DrawableSliderRepeat sliderRepeat:
-                    // use stored values from head circle to achieve same fade sequence.
-                    var repeatFadeOutParameters = getFadeOutParametersFromSliderHead(h);
-
-                    using (drawable.BeginAbsoluteSequence(repeatFadeOutParameters.startTime, true))
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
                         // only apply to circle piece – reverse arrow is not affected by hidden.
-                        sliderRepeat.CirclePiece.FadeOut(repeatFadeOutParameters.duration);
+                        sliderRepeat.CirclePiece.FadeOut(fadeOut.duration);
 
                     break;
 
@@ -101,29 +88,23 @@ namespace osu.Game.Rulesets.Osu.Mods
                     else
                     {
                         // we don't want to see the approach circle
-                        using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
+                        using (circle.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimePreempt, true))
                             circle.ApproachCircle.Hide();
                     }
 
-                    // fade out immediately after fade in.
-                    using (drawable.BeginAbsoluteSequence(fadeOutStartTime, true))
-                        fadeTarget.FadeOut(fadeOutDuration);
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
+                        fadeTarget.FadeOut(fadeOut.duration);
                     break;
 
                 case DrawableSlider slider:
-                    associateNestedSliderCirclesWithHead(slider.HitObject);
-
-                    using (slider.BeginAbsoluteSequence(fadeOutStartTime, true))
-                        slider.Body.FadeOut(longFadeDuration, Easing.Out);
+                    using (slider.BeginAbsoluteSequence(fadeOut.startTime, true))
+                        slider.Body.FadeOut(fadeOut.duration, Easing.Out);
 
                     break;
 
                 case DrawableSliderTick sliderTick:
-                    // slider ticks fade out over up to one second
-                    var tickFadeOutDuration = Math.Min(sliderTick.HitObject.TimePreempt - DrawableSliderTick.ANIM_DURATION, 1000);
-
-                    using (sliderTick.BeginAbsoluteSequence(sliderTick.HitObject.StartTime - tickFadeOutDuration, true))
-                        sliderTick.FadeOut(tickFadeOutDuration);
+                    using (sliderTick.BeginAbsoluteSequence(fadeOut.startTime, true))
+                        sliderTick.FadeOut(fadeOut.duration);
 
                     break;
 
@@ -131,30 +112,55 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // hide elements we don't care about.
                     // todo: hide background
 
-                    using (spinner.BeginAbsoluteSequence(fadeOutStartTime + longFadeDuration, true))
-                        spinner.FadeOut(fadeOutDuration);
+                    using (spinner.BeginAbsoluteSequence(fadeOut.startTime, true))
+                        spinner.FadeOut(fadeOut.duration);
 
                     break;
             }
         }
 
-        private readonly Dictionary<HitObject, SliderHeadCircle> correspondingSliderHeadForObject = new Dictionary<HitObject, SliderHeadCircle>();
-
-        private void associateNestedSliderCirclesWithHead(Slider slider)
+        private (double startTime, double duration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
         {
-            var sliderHead = slider.NestedHitObjects.Single(obj => obj is SliderHeadCircle);
-
-            foreach (var nested in slider.NestedHitObjects)
+            switch (drawableObject)
             {
-                if ((nested is SliderRepeat || nested is SliderEndCircle) && !correspondingSliderHeadForObject.ContainsKey(nested))
-                    correspondingSliderHeadForObject[nested] = (SliderHeadCircle)sliderHead;
-            }
-        }
+                case DrawableSliderTail tail:
+                    // Use the same fade sequence as the slider head.
+                    Debug.Assert(tail.Slider != null);
+                    return getParameters(tail.Slider.HeadCircle);
 
-        private (double startTime, double duration) getFadeOutParametersFromSliderHead(OsuHitObject h)
-        {
-            var sliderHead = correspondingSliderHeadForObject[h];
-            return (sliderHead.StartTime - sliderHead.TimePreempt + sliderHead.TimeFadeIn, sliderHead.TimePreempt * fade_out_duration_multiplier);
+                case DrawableSliderRepeat repeat:
+                    // Use the same fade sequence as the slider head.
+                    Debug.Assert(repeat.Slider != null);
+                    return getParameters(repeat.Slider.HeadCircle);
+
+                default:
+                    return getParameters(drawableObject.HitObject);
+            }
+
+            static (double startTime, double duration) getParameters(OsuHitObject hitObject)
+            {
+                var fadeOutStartTime = hitObject.StartTime - hitObject.TimePreempt + hitObject.TimeFadeIn;
+                var fadeOutDuration = hitObject.TimePreempt * fade_out_duration_multiplier;
+
+                // new duration from completed fade in to end (before fading out)
+                var longFadeDuration = hitObject.GetEndTime() - fadeOutStartTime;
+
+                switch (hitObject)
+                {
+                    case Slider _:
+                        return (fadeOutStartTime, longFadeDuration);
+
+                    case SliderTick _:
+                        var tickFadeOutDuration = Math.Min(hitObject.TimePreempt - DrawableSliderTick.ANIM_DURATION, 1000);
+                        return (hitObject.StartTime - tickFadeOutDuration, tickFadeOutDuration);
+
+                    case Spinner _:
+                        return (fadeOutStartTime + longFadeDuration, fadeOutDuration);
+
+                    default:
+                        return (fadeOutStartTime, fadeOutDuration);
+                }
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 3a92938d75..e878d61eec 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -11,14 +13,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSliderHead : DrawableHitCircle
     {
+        [CanBeNull]
+        public Slider Slider => drawableSlider?.HitObject;
+
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
         protected override OsuSkinComponents CirclePieceComponent => OsuSkinComponents.SliderHeadHitCircle;
 
         private DrawableSlider drawableSlider;
 
-        private Slider slider => drawableSlider?.HitObject;
-
         public DrawableSliderHead()
         {
         }
@@ -58,11 +61,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
-            double completionProgress = Math.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
+            Debug.Assert(Slider != null);
+
+            double completionProgress = Math.Clamp((Time.Current - Slider.StartTime) / Slider.Duration, 0, 1);
 
             //todo: we probably want to reconsider this before adding scoring, but it looks and feels nice.
             if (!IsHit)
-                Position = slider.CurvePositionAt(completionProgress);
+                Position = Slider.CurvePositionAt(completionProgress);
         }
 
         public Action<double> OnShake;
@@ -71,8 +76,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private void updatePosition()
         {
-            if (slider != null)
-                Position = HitObject.Position - slider.Position;
+            if (Slider != null)
+                Position = HitObject.Position - Slider.Position;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 0735d48ae1..ba503cca6a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,6 +19,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public new SliderRepeat HitObject => (SliderRepeat)base.HitObject;
 
+        [CanBeNull]
+        public Slider Slider => drawableSlider?.HitObject;
+
         private double animDuration;
 
         public Drawable CirclePiece { get; private set; }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index eff72168ee..3deff55538 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -15,6 +16,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public new SliderTailCircle HitObject => (SliderTailCircle)base.HitObject;
 
+        [CanBeNull]
+        public Slider Slider => drawableSlider?.HitObject;
+
         /// <summary>
         /// The judgement text is provided by the <see cref="DrawableSlider"/>.
         /// </summary>
@@ -22,6 +26,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public bool Tracking { get; set; }
 
+        private DrawableSlider drawableSlider;
         private SkinnableDrawable circlePiece;
         private Container scaleContainer;
 
@@ -59,6 +64,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
         }
 
+        protected override void OnParentReceived(DrawableHitObject parent)
+        {
+            base.OnParentReceived(parent);
+
+            drawableSlider = (DrawableSlider)parent;
+        }
+
         protected override void UpdateInitialTransforms()
         {
             base.UpdateInitialTransforms();

From db7e82c5603b8df224a0c933ced3ae255aeac340 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Dec 2020 14:54:02 +0900
Subject: [PATCH 06617/10326] Add test

---
 .../Mods/TestSceneOsuModHidden.cs             | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
index 40f1c4a52f..ff308f389f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
@@ -92,6 +92,30 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             PassCondition = checkSomeHit
         });
 
+        [Test]
+        public void TestWithSliderReuse() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModHidden(),
+            Autoplay = true,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 1000,
+                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+                    },
+                    new Slider
+                    {
+                        StartTime = 4000,
+                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+                    },
+                }
+            },
+            PassCondition = checkSomeHit
+        });
+
         private bool checkSomeHit()
         {
             return Player.ScoreProcessor.JudgedHits >= 4;

From 31f7f7072deb281f1bcf4fc0e3cf6208e8e27d24 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Dec 2020 15:13:20 +0900
Subject: [PATCH 06618/10326] Fix song select panels not loading if partially
 offscreen

---
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index e25c6932cf..b3c5d458d6 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -100,8 +100,14 @@ namespace osu.Game.Screens.Select.Carousel
                 background = new DelayedLoadWrapper(() => new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
                 {
                     RelativeSizeAxes = Axes.Both,
-                }, 300),
-                mainFlow = new DelayedLoadWrapper(() => new SetPanelContent((CarouselBeatmapSet)Item), 100),
+                }, 300)
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                mainFlow = new DelayedLoadWrapper(() => new SetPanelContent((CarouselBeatmapSet)Item), 100)
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
             };
 
             background.DelayedLoadComplete += fadeContentIn;

From 3550e5b30f93d965265bbf4ab611a588753a23b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Dec 2020 16:42:06 +0900
Subject: [PATCH 06619/10326] Add length display to room screen as well

---
 .../Online/API/Requests/Responses/APIBeatmap.cs  |  1 +
 .../Online/Multiplayer/PlaylistExtensions.cs     | 16 ++++++++++++++++
 .../Match/Components/MatchSettingsOverlay.cs     |  9 ++-------
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs   |  5 ++++-
 4 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/PlaylistExtensions.cs

diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index ae65ac09b2..7343870dbc 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -75,6 +75,7 @@ namespace osu.Game.Online.API.Requests.Responses
                 StarDifficulty = starDifficulty,
                 OnlineBeatmapID = OnlineBeatmapID,
                 Version = version,
+                // this is actually an incorrect mapping (Length is calculated as drain length in lazer's import process, see BeatmapManager.calculateLength).
                 Length = TimeSpan.FromSeconds(length).TotalMilliseconds,
                 Status = Status,
                 BeatmapSet = set,
diff --git a/osu.Game/Online/Multiplayer/PlaylistExtensions.cs b/osu.Game/Online/Multiplayer/PlaylistExtensions.cs
new file mode 100644
index 0000000000..fe3d96e295
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/PlaylistExtensions.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 System.Linq;
+using Humanizer;
+using Humanizer.Localisation;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Online.Multiplayer
+{
+    public static class PlaylistExtensions
+    {
+        public static string GetTotalDuration(this BindableList<PlaylistItem> playlist) =>
+            playlist.Select(p => p.Beatmap.Value.Length).Sum().Milliseconds().Humanize(minUnit: TimeUnit.Second, maxUnit: TimeUnit.Hour, precision: 2);
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 8bf66b084c..668a373d80 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Collections.Specialized;
-using System.Linq;
 using Humanizer;
-using Humanizer.Localisation;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -339,11 +337,8 @@ namespace osu.Game.Screens.Multi.Match.Components
                 ApplyButton.Enabled.Value = hasValidSettings;
             }
 
-            private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
-            {
-                double totalLength = Playlist.Select(p => p.Beatmap.Value.Length).Sum();
-                playlistLength.Text = $"Length: {totalLength.Milliseconds().Humanize(minUnit: TimeUnit.Second, maxUnit: TimeUnit.Hour, precision: 2)}";
-            }
+            private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) =>
+                playlistLength.Text = $"Length: {Playlist.GetTotalDuration()}";
 
             private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0;
 
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 2cbe215a39..13a5d89a12 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -57,6 +57,7 @@ namespace osu.Game.Screens.Multi.Match
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private OverlinedHeader participantsHeader;
+        private OverlinedHeader playlistHeader;
 
         public MatchSubScreen(Room room)
         {
@@ -135,7 +136,7 @@ namespace osu.Game.Screens.Multi.Match
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 Content = new[]
                                                                 {
-                                                                    new Drawable[] { new OverlinedHeader("Playlist"), },
+                                                                    new Drawable[] { playlistHeader = new OverlinedHeader("Playlist"), },
                                                                     new Drawable[]
                                                                     {
                                                                         new DrawableRoomPlaylistWithResults
@@ -243,6 +244,8 @@ namespace osu.Game.Screens.Multi.Match
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
+
+            playlist.BindCollectionChanged((_, __) => playlistHeader.Details.Value = playlist.GetTotalDuration(), true);
         }
 
         public override bool OnExiting(IScreen next)

From e5c8e06c4bd44ace592b8a0549d524bc582e41d2 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 19:28:47 +0900
Subject: [PATCH 06620/10326] Create children in the constructor

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 33 +++++++++++++--------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 11b6916a4c..d164d2e0ca 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -49,11 +49,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public Container ExplodingFruitTarget;
 
-        private Container<DrawableHitObject> caughtFruitContainer { get; } = new Container<DrawableHitObject>
-        {
-            Anchor = Anchor.TopCentre,
-            Origin = Anchor.BottomCentre,
-        };
+        private readonly Container<DrawableHitObject> caughtFruitContainer;
 
         [NotNull]
         private readonly Container trailsTarget;
@@ -92,9 +88,9 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         private readonly float catchWidth;
 
-        private CatcherSprite catcherIdle;
-        private CatcherSprite catcherKiai;
-        private CatcherSprite catcherFail;
+        private readonly CatcherSprite catcherIdle;
+        private readonly CatcherSprite catcherKiai;
+        private readonly CatcherSprite catcherFail;
 
         private CatcherSprite currentCatcher;
 
@@ -108,8 +104,8 @@ namespace osu.Game.Rulesets.Catch.UI
         private float hyperDashTargetPosition;
         private Bindable<bool> hitLighting;
 
-        private DrawablePool<HitExplosion> hitExplosionPool;
-        private Container<HitExplosion> hitExplosionContainer;
+        private readonly DrawablePool<HitExplosion> hitExplosionPool;
+        private readonly Container<HitExplosion> hitExplosionContainer;
 
         public Catcher([NotNull] Container trailsTarget, BeatmapDifficulty difficulty = null)
         {
@@ -122,17 +118,15 @@ namespace osu.Game.Rulesets.Catch.UI
                 Scale = calculateScale(difficulty);
 
             catchWidth = CalculateCatchWidth(Scale);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            hitLighting = config.GetBindable<bool>(OsuSetting.HitLighting);
 
             InternalChildren = new Drawable[]
             {
                 hitExplosionPool = new DrawablePool<HitExplosion>(10),
-                caughtFruitContainer,
+                caughtFruitContainer = new Container<DrawableHitObject>
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.BottomCentre,
+                },
                 catcherIdle = new CatcherSprite(CatcherAnimationState.Idle)
                 {
                     Anchor = Anchor.TopCentre,
@@ -154,7 +148,12 @@ namespace osu.Game.Rulesets.Catch.UI
                     Origin = Anchor.BottomCentre,
                 },
             };
+        }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            hitLighting = config.GetBindable<bool>(OsuSetting.HitLighting);
             trails = new CatcherTrailDisplay(this);
 
             updateCatcher();

From af45e8d97b2ff17b05917e6230a3e5353a43e6b4 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 19:45:34 +0900
Subject: [PATCH 06621/10326] Don't delay caught fruit loading

It is not needed anymore because
some code in DCHO is moved from `load` to constructor.
---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 26077aeba4..467dc4283d 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
@@ -28,8 +27,6 @@ namespace osu.Game.Rulesets.Catch.UI
             set => MovableCatcher.ExplodingFruitTarget = value;
         }
 
-        private DrawableCatchHitObject lastPlateableFruit;
-
         public CatcherArea(BeatmapDifficulty difficulty = null)
         {
             Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
@@ -53,19 +50,6 @@ namespace osu.Game.Rulesets.Catch.UI
             if (!result.Type.IsScorable())
                 return;
 
-            void runAfterLoaded(Action action)
-            {
-                if (lastPlateableFruit == null)
-                    return;
-
-                // this is required to make this run after the last caught fruit runs updateState() at least once.
-                // TODO: find a better alternative
-                if (lastPlateableFruit.IsLoaded)
-                    action();
-                else
-                    lastPlateableFruit.OnLoadComplete += _ => action();
-            }
-
             if (result.IsHit && hitObject is DrawablePalpableCatchHitObject fruit)
             {
                 // create a new (cloned) fruit to stay on the plate. the original is faded out immediately.
@@ -84,16 +68,15 @@ namespace osu.Game.Rulesets.Catch.UI
                 caughtFruit.LifetimeEnd = double.MaxValue;
 
                 MovableCatcher.PlaceOnPlate(caughtFruit);
-                lastPlateableFruit = caughtFruit;
 
                 if (!fruit.StaysOnPlate)
-                    runAfterLoaded(() => MovableCatcher.Explode(caughtFruit));
+                    MovableCatcher.Explode(caughtFruit);
             }
 
             if (hitObject.HitObject.LastInCombo)
             {
                 if (result.Judgement is CatchJudgement catchJudgement && catchJudgement.ShouldExplodeFor(result))
-                    runAfterLoaded(() => MovableCatcher.Explode());
+                    MovableCatcher.Explode();
                 else
                     MovableCatcher.Drop();
             }

From a231a4aa6d127c2ebad93b562c45370458837834 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 19:46:30 +0900
Subject: [PATCH 06622/10326] Remove unused method

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 467dc4283d..a2a4bd5304 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -87,10 +87,6 @@ namespace osu.Game.Rulesets.Catch.UI
         public void OnRevertResult(DrawableCatchHitObject fruit, JudgementResult result)
             => comboDisplay.OnRevertResult(fruit, result);
 
-        public void OnReleased(CatchAction action)
-        {
-        }
-
         public bool AttemptCatch(CatchHitObject obj)
         {
             return MovableCatcher.AttemptCatch(obj);

From 8d32cca5d69d7d12ebbbce28b6d9cfc1e8259d04 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 20:03:13 +0900
Subject: [PATCH 06623/10326] Use more specific type for caught object

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs     | 12 ++++++------
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index d164d2e0ca..da71145004 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public Container ExplodingFruitTarget;
 
-        private readonly Container<DrawableHitObject> caughtFruitContainer;
+        private readonly Container<DrawablePalpableCatchHitObject> caughtFruitContainer;
 
         [NotNull]
         private readonly Container trailsTarget;
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Catch.UI
             InternalChildren = new Drawable[]
             {
                 hitExplosionPool = new DrawablePool<HitExplosion>(10),
-                caughtFruitContainer = new Container<DrawableHitObject>
+                caughtFruitContainer = new Container<DrawablePalpableCatchHitObject>
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.BottomCentre,
@@ -196,7 +196,7 @@ 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(DrawableCatchHitObject fruit)
+        public void PlaceOnPlate(DrawablePalpableCatchHitObject fruit)
         {
             var ourRadius = fruit.DisplayRadius;
             float theirRadius = 0;
@@ -385,7 +385,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 Explode(f);
         }
 
-        public void Drop(DrawableHitObject fruit)
+        public void Drop(DrawablePalpableCatchHitObject fruit)
         {
             removeFromPlateWithTransform(fruit, f =>
             {
@@ -394,7 +394,7 @@ namespace osu.Game.Rulesets.Catch.UI
             });
         }
 
-        public void Explode(DrawableHitObject fruit)
+        public void Explode(DrawablePalpableCatchHitObject fruit)
         {
             var originalX = fruit.X * Scale.X;
 
@@ -478,7 +478,7 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
-        private void removeFromPlateWithTransform(DrawableHitObject fruit, Action<DrawableHitObject> action)
+        private void removeFromPlateWithTransform(DrawablePalpableCatchHitObject fruit, Action<DrawablePalpableCatchHitObject> action)
         {
             if (ExplodingFruitTarget != null)
             {
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index a2a4bd5304..bb5eaaa438 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Catch.UI
             comboDisplay.X = MovableCatcher.X;
         }
 
-        private DrawableCatchHitObject createCaughtFruit(DrawablePalpableCatchHitObject hitObject)
+        private DrawablePalpableCatchHitObject createCaughtFruit(DrawablePalpableCatchHitObject hitObject)
         {
             switch (hitObject.HitObject)
             {

From 873f2363c1f757e662845c33b015bd096f5de68c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 20:05:01 +0900
Subject: [PATCH 06624/10326] Simplify the fruit stacking code

It is now more clear that
the expression of distance checking is probably unintended (a bug)
---
 .../Objects/Drawables/DrawableCatchHitObject.cs                | 2 --
 .../Objects/Drawables/DrawablePalpableCatchHitObject.cs        | 2 ++
 osu.Game.Rulesets.Catch/UI/Catcher.cs                          | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 1faa6a5b0f..c3dbfc325f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected override double InitialLifetimeOffset => HitObject.TimePreempt;
 
-        public float DisplayRadius => DrawSize.X / 2 * Scale.X * HitObject.Scale;
-
         protected override float SamplePlaybackPosition => HitObject.X / CatchPlayfield.WIDTH;
 
         protected DrawableCatchHitObject([CanBeNull] CatchHitObject hitObject)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index a3908f94b6..0877b5e248 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         /// </summary>
         public virtual bool StaysOnPlate => true;
 
+        public float DisplayRadius => CatchHitObject.OBJECT_RADIUS * HitObject.Scale * ScaleFactor;
+
         protected readonly Container ScaleContainer;
 
         protected DrawablePalpableCatchHitObject([CanBeNull] CatchHitObject h)
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index da71145004..94383516bd 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -204,8 +204,7 @@ namespace osu.Game.Rulesets.Catch.UI
             const float allowance = 10;
 
             while (caughtFruitContainer.Any(f =>
-                f.LifetimeEnd == double.MaxValue &&
-                Vector2Extensions.Distance(f.Position, fruit.Position) < (ourRadius + (theirRadius = f.DrawSize.X / 2 * f.Scale.X)) / (allowance / 2)))
+                Vector2Extensions.Distance(f.Position, fruit.Position) < (ourRadius + (theirRadius = CatchHitObject.OBJECT_RADIUS / 2)) / (allowance / 2)))
             {
                 var diff = (ourRadius + theirRadius) / allowance;
                 fruit.X += (RNG.NextSingle() - 0.5f) * diff * 2;

From 2eb2c934ccbd3360c393403dcdbb2cb87c8a0dcb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 2 Dec 2020 21:23:34 +0900
Subject: [PATCH 06625/10326] Refactor fruit dropping code

- The repeated `Remove` call was quadratic complexity.
  Now it is linear time.
---
 .../TestSceneCatcher.cs                       |   2 +-
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs  |   1 -
 osu.Game.Rulesets.Catch/UI/Catcher.cs         | 119 +++++++++---------
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     |   7 +-
 4 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 6eeda2c731..cb4aaefa46 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new Catcher(new Container())
+            SetContents(() => new Catcher(new Container(), new Container())
             {
                 RelativePositionAxes = Axes.None,
                 Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 820f08d439..6934dcc1f9 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -43,7 +43,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
             CatcherArea = new CatcherArea(difficulty)
             {
-                ExplodingFruitTarget = explodingFruitContainer,
                 Anchor = Anchor.BottomLeft,
                 Origin = Anchor.TopLeft,
             };
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 94383516bd..f8ed51bd6f 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -17,7 +17,6 @@ using osu.Game.Configuration;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Skinning;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -47,15 +46,15 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public const double BASE_SPEED = 1.0;
 
-        public Container ExplodingFruitTarget;
-
-        private readonly Container<DrawablePalpableCatchHitObject> caughtFruitContainer;
-
         [NotNull]
         private readonly Container trailsTarget;
 
         private CatcherTrailDisplay trails;
 
+        private readonly Container droppedObjectTarget;
+
+        private readonly Container<DrawablePalpableCatchHitObject> caughtFruitContainer;
+
         public CatcherAnimationState CurrentState { get; private set; }
 
         /// <summary>
@@ -107,9 +106,10 @@ namespace osu.Game.Rulesets.Catch.UI
         private readonly DrawablePool<HitExplosion> hitExplosionPool;
         private readonly Container<HitExplosion> hitExplosionContainer;
 
-        public Catcher([NotNull] Container trailsTarget, BeatmapDifficulty difficulty = null)
+        public Catcher([NotNull] Container trailsTarget, [NotNull] Container droppedObjectTarget, BeatmapDifficulty difficulty = null)
         {
             this.trailsTarget = trailsTarget;
+            this.droppedObjectTarget = droppedObjectTarget;
 
             Origin = Anchor.TopCentre;
 
@@ -369,41 +369,14 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// Drop any fruit off the plate.
         /// </summary>
-        public void Drop()
-        {
-            foreach (var f in caughtFruitContainer.ToArray())
-                Drop(f);
-        }
+        public void Drop() => clearPlate(DroppedObjectAnimation.Drop);
 
         /// <summary>
         /// Explode any fruit off the plate.
         /// </summary>
-        public void Explode()
-        {
-            foreach (var f in caughtFruitContainer.ToArray())
-                Explode(f);
-        }
+        public void Explode() => clearPlate(DroppedObjectAnimation.Explode);
 
-        public void Drop(DrawablePalpableCatchHitObject fruit)
-        {
-            removeFromPlateWithTransform(fruit, f =>
-            {
-                f.MoveToY(f.Y + 75, 750, Easing.InSine);
-                f.FadeOut(750);
-            });
-        }
-
-        public void Explode(DrawablePalpableCatchHitObject 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);
-            });
-        }
+        public void Explode(DrawablePalpableCatchHitObject caughtObject) => removeFromPlate(caughtObject, DroppedObjectAnimation.Explode);
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
@@ -477,33 +450,67 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
-        private void removeFromPlateWithTransform(DrawablePalpableCatchHitObject fruit, Action<DrawablePalpableCatchHitObject> action)
+        private void clearPlate(DroppedObjectAnimation animation)
         {
-            if (ExplodingFruitTarget != null)
+            var caughtObjects = caughtFruitContainer.Children.ToArray();
+            caughtFruitContainer.Clear(false);
+
+            droppedObjectTarget.AddRange(caughtObjects);
+
+            foreach (var caughtObject in caughtObjects)
+                drop(caughtObject, animation);
+        }
+
+        private void removeFromPlate(DrawablePalpableCatchHitObject caughtObject, DroppedObjectAnimation animation)
+        {
+            if (!caughtFruitContainer.Remove(caughtObject))
+                throw new InvalidOperationException("Can only drop a caught object on the plate");
+
+            droppedObjectTarget.Add(caughtObject);
+
+            drop(caughtObject, animation);
+        }
+
+        private void drop(Drawable d, DroppedObjectAnimation animation)
+        {
+            var originalX = d.X * Scale.X;
+
+            d.Anchor = Anchor.TopLeft;
+            d.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(d.DrawPosition, droppedObjectTarget);
+
+            animate(d, animation, originalX);
+        }
+
+        private void animate(Drawable d, DroppedObjectAnimation animation, float originalX)
+        {
+            // temporary hack to make sure transforms are not cleared by DHO state update
+            if (!d.IsLoaded)
             {
-                fruit.Anchor = Anchor.TopLeft;
-                fruit.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(fruit.DrawPosition, ExplodingFruitTarget);
-
-                if (!caughtFruitContainer.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);
+                d.OnLoadComplete += _ => animate(d, animation, originalX);
+                return;
             }
 
-            var actionTime = Clock.CurrentTime;
-
-            fruit.ApplyCustomUpdateState += onFruitOnApplyCustomUpdateState;
-            onFruitOnApplyCustomUpdateState(fruit, fruit.State.Value);
-
-            void onFruitOnApplyCustomUpdateState(DrawableHitObject o, ArmedState state)
+            switch (animation)
             {
-                using (fruit.BeginAbsoluteSequence(actionTime))
-                    action(fruit);
+                case DroppedObjectAnimation.Drop:
+                    d.MoveToY(d.Y + 75, 750, Easing.InSine);
+                    d.FadeOut(750);
+                    break;
 
-                fruit.Expire();
+                case DroppedObjectAnimation.Explode:
+                    d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine);
+                    d.MoveToX(d.X + originalX * 6, 1000);
+                    d.FadeOut(750);
+                    break;
             }
+
+            d.Expire();
         }
     }
+
+    public enum DroppedObjectAnimation
+    {
+        Drop,
+        Explode
+    }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index bb5eaaa438..077137a3cb 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -22,11 +22,6 @@ namespace osu.Game.Rulesets.Catch.UI
         public readonly Catcher MovableCatcher;
         private readonly CatchComboDisplay comboDisplay;
 
-        public Container ExplodingFruitTarget
-        {
-            set => MovableCatcher.ExplodingFruitTarget = value;
-        }
-
         public CatcherArea(BeatmapDifficulty difficulty = null)
         {
             Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
@@ -41,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     Margin = new MarginPadding { Bottom = 350f },
                     X = CatchPlayfield.CENTER_X
                 },
-                MovableCatcher = new Catcher(this, difficulty) { X = CatchPlayfield.CENTER_X },
+                MovableCatcher = new Catcher(this, this, difficulty) { X = CatchPlayfield.CENTER_X },
             };
         }
 

From 5a5c956cedfda99b3280c9d7bb7933f267fea821 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 3 Dec 2020 14:44:35 +0900
Subject: [PATCH 06626/10326] Move more logic to Catcher from CatcherArea

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs     | 74 ++++++++++++++++++-----
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 44 --------------
 2 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index f8ed51bd6f..6d5d25243d 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -245,25 +245,29 @@ namespace osu.Game.Rulesets.Catch.UI
                 catchObjectPosition >= catcherPosition - halfCatchWidth &&
                 catchObjectPosition <= catcherPosition + halfCatchWidth;
 
-            // only update hyperdash state if we are not catching a tiny droplet.
-            if (fruit is TinyDroplet) return validCatch;
-
-            if (validCatch && fruit.HyperDash)
+            // droplet doesn't affect the catcher state
+            if (!(fruit is TinyDroplet))
             {
-                var target = fruit.HyperDashTarget;
-                var timeDifference = target.StartTime - fruit.StartTime;
-                double positionDifference = target.X - catcherPosition;
-                var velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
+                if (validCatch && fruit.HyperDash)
+                {
+                    var target = fruit.HyperDashTarget;
+                    var timeDifference = target.StartTime - fruit.StartTime;
+                    double positionDifference = target.X - catcherPosition;
+                    var velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
 
-                SetHyperDashState(Math.Abs(velocity), target.X);
+                    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);
             }
-            else
-                SetHyperDashState();
 
             if (validCatch)
-                updateState(fruit.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle);
-            else if (!(fruit is Banana))
-                updateState(CatcherAnimationState.Fail);
+                placeCaughtObject(fruit);
 
             return validCatch;
         }
@@ -450,6 +454,48 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
+        private void placeCaughtObject(PalpableCatchHitObject source)
+        {
+            var caughtObject = createCaughtObject(source);
+            if (caughtObject == null) return;
+
+            caughtObject.RelativePositionAxes = Axes.None;
+            caughtObject.X = source.X - X;
+            caughtObject.IsOnPlate = true;
+
+            caughtObject.Anchor = Anchor.TopCentre;
+            caughtObject.Origin = Anchor.Centre;
+            caughtObject.Scale *= 0.5f;
+            caughtObject.LifetimeStart = source.StartTime;
+            caughtObject.LifetimeEnd = double.MaxValue;
+
+            PlaceOnPlate(caughtObject);
+
+            if (!caughtObject.StaysOnPlate)
+                Explode(caughtObject);
+        }
+
+        private DrawablePalpableCatchHitObject createCaughtObject(PalpableCatchHitObject source)
+        {
+            switch (source)
+            {
+                case Banana banana:
+                    return new DrawableBanana(banana);
+
+                case Fruit fruit:
+                    return new DrawableFruit(fruit);
+
+                case TinyDroplet tiny:
+                    return new DrawableTinyDroplet(tiny);
+
+                case Droplet droplet:
+                    return new DrawableDroplet(droplet);
+
+                default:
+                    return null;
+            }
+        }
+
         private void clearPlate(DroppedObjectAnimation animation)
         {
             var caughtObjects = caughtFruitContainer.Children.ToArray();
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 077137a3cb..9cd0785b85 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -45,29 +45,6 @@ namespace osu.Game.Rulesets.Catch.UI
             if (!result.Type.IsScorable())
                 return;
 
-            if (result.IsHit && hitObject is DrawablePalpableCatchHitObject fruit)
-            {
-                // create a new (cloned) fruit to stay on the plate. the original is faded out immediately.
-                var caughtFruit = createCaughtFruit(fruit);
-
-                if (caughtFruit == null) return;
-
-                caughtFruit.RelativePositionAxes = Axes.None;
-                caughtFruit.Position = new Vector2(MovableCatcher.ToLocalSpace(hitObject.ScreenSpaceDrawQuad.Centre).X - MovableCatcher.DrawSize.X / 2, 0);
-                caughtFruit.IsOnPlate = true;
-
-                caughtFruit.Anchor = Anchor.TopCentre;
-                caughtFruit.Origin = Anchor.Centre;
-                caughtFruit.Scale *= 0.5f;
-                caughtFruit.LifetimeStart = caughtFruit.HitObject.StartTime;
-                caughtFruit.LifetimeEnd = double.MaxValue;
-
-                MovableCatcher.PlaceOnPlate(caughtFruit);
-
-                if (!fruit.StaysOnPlate)
-                    MovableCatcher.Explode(caughtFruit);
-            }
-
             if (hitObject.HitObject.LastInCombo)
             {
                 if (result.Judgement is CatchJudgement catchJudgement && catchJudgement.ShouldExplodeFor(result))
@@ -98,26 +75,5 @@ namespace osu.Game.Rulesets.Catch.UI
 
             comboDisplay.X = MovableCatcher.X;
         }
-
-        private DrawablePalpableCatchHitObject createCaughtFruit(DrawablePalpableCatchHitObject hitObject)
-        {
-            switch (hitObject.HitObject)
-            {
-                case Banana banana:
-                    return new DrawableBanana(banana);
-
-                case Fruit fruit:
-                    return new DrawableFruit(fruit);
-
-                case TinyDroplet tiny:
-                    return new DrawableTinyDroplet(tiny);
-
-                case Droplet droplet:
-                    return new DrawableDroplet(droplet);
-
-                default:
-                    return null;
-            }
-        }
     }
 }

From 1d669cf65ed5c9ee5e398a3cac7e5bc386b5f49a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 3 Dec 2020 16:40:14 +0900
Subject: [PATCH 06627/10326] Add more TestSceneCatcher tests

Some tests are moved from TestSceneCatcherArea
---
 .../TestSceneCatcher.cs                       | 178 +++++++++++++++++-
 .../TestSceneCatcherArea.cs                   |  81 +++-----
 2 files changed, 195 insertions(+), 64 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index cb4aaefa46..f41a16026a 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -1,26 +1,192 @@
 // Copyright (c) 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.Rulesets.Catch.UI;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatcher : CatchSkinnableTestScene
+    public class TestSceneCatcher : OsuTestScene
     {
-        [BackgroundDependencyLoader]
-        private void load()
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
+        private Container droppedObjectContainer;
+
+        private TestCatcher catcher;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
-            SetContents(() => new Catcher(new Container(), new Container())
+            var difficulty = new BeatmapDifficulty
+            {
+                CircleSize = 0,
+            };
+
+            var trailContainer = new Container();
+            droppedObjectContainer = new Container();
+            catcher = new TestCatcher(trailContainer, droppedObjectContainer, difficulty);
+
+            Child = new Container
             {
-                RelativePositionAxes = Axes.None,
                 Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
+                Children = new Drawable[]
+                {
+                    trailContainer,
+                    droppedObjectContainer,
+                    catcher
+                }
+            };
+        });
+
+        [Test]
+        public void TestCatcherCatchWidth()
+        {
+            var halfWidth = Catcher.CalculateCatchWidth(new BeatmapDifficulty { CircleSize = 0 }) / 2;
+            AddStep("catch fruit", () =>
+            {
+                attemptCatch(new Fruit { X = -halfWidth + 1 });
+                attemptCatch(new Fruit { X = halfWidth - 1 });
             });
+            checkPlate(2);
+            AddStep("miss fruit", () =>
+            {
+                attemptCatch(new Fruit { X = -halfWidth - 1 });
+                attemptCatch(new Fruit { X = halfWidth + 1 });
+            });
+            checkPlate(2);
+        }
+
+        [Test]
+        public void TestCatcherStateFruit()
+        {
+            AddStep("miss fruit", () => attemptCatch(new Fruit { X = 100 }));
+            checkState(CatcherAnimationState.Fail);
+            AddStep("catch fruit", () => attemptCatch(new Fruit()));
+            checkState(CatcherAnimationState.Idle);
+            AddStep("catch kiai fruit", () => attemptCatch(new TestKiaiFruit()));
+            checkState(CatcherAnimationState.Kiai);
+        }
+
+        [Test]
+        public void TestCatcherStateTinyDroplet()
+        {
+            AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
+            {
+                HyperDashTarget = new Fruit { X = 100 }
+            }));
+            AddStep("catch tiny droplet", () => attemptCatch(new TinyDroplet()));
+            AddStep("miss tiny droplet", () => attemptCatch(new TinyDroplet { X = 100 }));
+            checkState(CatcherAnimationState.Kiai);
+            checkHyperDash(true);
+        }
+
+        [Test]
+        public void TestCatcherStateBanana()
+        {
+            AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
+            {
+                HyperDashTarget = new Fruit { X = 100 }
+            }));
+            AddStep("miss banana", () => attemptCatch(new Banana()));
+            checkState(CatcherAnimationState.Idle);
+            checkHyperDash(false);
+        }
+
+        [Test]
+        public void TestCatcherStacking()
+        {
+            AddStep("catch fruit", () => attemptCatch(new Fruit()));
+            checkPlate(1);
+            AddStep("catch more fruits", () => attemptCatch(new Fruit(), 9));
+            checkPlate(10);
+            AddAssert("caught objects are stacked", () =>
+                catcher.CaughtObjects.All(obj => obj.Y <= 0) &&
+                catcher.CaughtObjects.Any(obj => obj.Y == 0) &&
+                catcher.CaughtObjects.Any(obj => obj.Y < -20));
+        }
+
+        [Test]
+        public void TestCatcherExplosionAndDropping()
+        {
+            AddStep("catch fruit", () => attemptCatch(new Fruit()));
+            AddStep("catch tiny droplet", () => attemptCatch(new TinyDroplet()));
+            AddAssert("tiny droplet is exploded", () => catcher.CaughtObjects.Count() == 1 && droppedObjectContainer.Count == 1);
+            AddUntilStep("wait explosion", () => !droppedObjectContainer.Any());
+            AddStep("catch more fruits", () => attemptCatch(new Fruit(), 9));
+            AddStep("explode", () => catcher.Explode());
+            AddAssert("fruits are exploded", () => !catcher.CaughtObjects.Any() && droppedObjectContainer.Count == 10);
+            AddUntilStep("wait explosion", () => !droppedObjectContainer.Any());
+            AddStep("catch fruits", () => attemptCatch(new Fruit(), 10));
+            AddStep("drop", () => catcher.Drop());
+            AddAssert("fruits are dropped", () => !catcher.CaughtObjects.Any() && droppedObjectContainer.Count == 10);
+        }
+
+        [Test]
+        public void TestHyperFruitHyperDash()
+        {
+            AddStep("catch hyper fruit", () => attemptCatch(new Fruit
+            {
+                HyperDashTarget = new Fruit { X = 100 }
+            }));
+            checkHyperDash(true);
+            AddStep("catch normal fruit", () => attemptCatch(new Fruit()));
+            checkHyperDash(false);
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestHitLighting(bool enabled)
+        {
+            AddStep($"{(enabled ? "enable" : "disable")} hit lighting", () => config.Set(OsuSetting.HitLighting, enabled));
+            AddStep("catch fruit", () => attemptCatch(new Fruit()));
+            AddAssert("check hit lighting", () => catcher.ChildrenOfType<HitExplosion>().Any() == enabled);
+        }
+
+        private void checkPlate(int count) => AddAssert($"{count} objects on the plate", () => catcher.CaughtObjects.Count() == count);
+
+        private void checkState(CatcherAnimationState state) => AddAssert($"catcher state is {state}", () => catcher.CurrentState == state);
+
+        private void checkHyperDash(bool state) => AddAssert($"catcher is {(state ? "" : "not ")}hyper dashing", () => catcher.HyperDashing == state);
+
+        private void attemptCatch(CatchHitObject hitObject, int count = 1)
+        {
+            hitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            for (var i = 0; i < count; i++)
+                catcher.AttemptCatch(hitObject);
+        }
+
+        public class TestCatcher : Catcher
+        {
+            public IEnumerable<DrawablePalpableCatchHitObject> CaughtObjects => this.ChildrenOfType<DrawablePalpableCatchHitObject>();
+
+            public TestCatcher(Container trailsTarget, Container droppedObjectTarget, BeatmapDifficulty difficulty)
+                : base(trailsTarget, droppedObjectTarget, difficulty)
+            {
+            }
+        }
+
+        public class TestKiaiFruit : Fruit
+        {
+            protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
+            {
+                controlPointInfo.Add(0, new EffectControlPoint { KiaiMode = true });
+                base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index c12f38723b..7be6fc92ac 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -27,73 +27,51 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Resolved]
         private OsuConfigManager config { get; set; }
 
-        private Catcher catcher => this.ChildrenOfType<CatcherArea>().First().MovableCatcher;
+        private Catcher catcher => this.ChildrenOfType<Catcher>().First();
+
+        private float circleSize;
 
         public TestSceneCatcherArea()
         {
-            AddSliderStep<float>("CircleSize", 0, 8, 5, createCatcher);
-            AddToggleStep("Hyperdash", t =>
-                CreatedDrawables.OfType<CatchInputManager>().Select(i => i.Child)
-                                .OfType<TestCatcherArea>().ForEach(c => c.ToggleHyperDash(t)));
+            AddSliderStep<float>("circle size", 0, 8, 5, createCatcher);
+            AddToggleStep("hyper dash", t => this.ChildrenOfType<TestCatcherArea>().ForEach(area => area.ToggleHyperDash(t)));
 
-            AddRepeatStep("catch fruit", () => catchFruit(new TestFruit(false)
-            {
-                X = catcher.X
-            }), 20);
-            AddRepeatStep("catch fruit last in combo", () => catchFruit(new TestFruit(false)
-            {
-                X = catcher.X,
-                LastInCombo = true,
-            }), 20);
-            AddRepeatStep("catch kiai fruit", () => catchFruit(new TestFruit(true)
-            {
-                X = catcher.X
-            }), 20);
-            AddRepeatStep("miss fruit", () => catchFruit(new Fruit
-            {
-                X = catcher.X + 100,
-                LastInCombo = true,
-            }, true), 20);
+            AddStep("catch fruit", () => attemptCatch(new Fruit()));
+            AddStep("catch fruit last in combo", () => attemptCatch(new Fruit { LastInCombo = true }));
+            AddStep("catch kiai fruit", () => attemptCatch(new TestSceneCatcher.TestKiaiFruit()));
+            AddStep("miss last in combo", () => attemptCatch(new Fruit { X = 100, LastInCombo = true }));
         }
 
-        [TestCase(true)]
-        [TestCase(false)]
-        public void TestHitLighting(bool enable)
+        private void attemptCatch(Fruit fruit)
         {
-            AddStep("create catcher", () => createCatcher(5));
-
-            AddStep("toggle hit lighting", () => config.Set(OsuSetting.HitLighting, enable));
-            AddStep("catch fruit", () => catchFruit(new TestFruit(false)
+            fruit.X += catcher.X;
+            fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty
             {
-                X = catcher.X
-            }));
-            AddStep("catch fruit last in combo", () => catchFruit(new TestFruit(false)
-            {
-                X = catcher.X,
-                LastInCombo = true
-            }));
-            AddAssert("check hit explosion", () => catcher.ChildrenOfType<HitExplosion>().Any() == enable);
-        }
+                CircleSize = circleSize
+            });
 
-        private void catchFruit(Fruit fruit, bool miss = false)
-        {
-            this.ChildrenOfType<CatcherArea>().ForEach(area =>
+            foreach (var area in this.ChildrenOfType<CatcherArea>())
             {
                 DrawableFruit drawable = new DrawableFruit(fruit);
                 area.Add(drawable);
 
                 Schedule(() =>
                 {
-                    area.AttemptCatch(fruit);
-                    area.OnNewResult(drawable, new JudgementResult(fruit, new CatchJudgement()) { Type = miss ? HitResult.Miss : HitResult.Great });
+                    bool caught = area.AttemptCatch(fruit);
+                    area.OnNewResult(drawable, new JudgementResult(fruit, new CatchJudgement())
+                    {
+                        Type = caught ? HitResult.Great : HitResult.Miss
+                    });
 
                     drawable.Expire();
                 });
-            });
+            }
         }
 
         private void createCatcher(float size)
         {
+            circleSize = size;
+
             SetContents(() => new CatchInputManager(catchRuleset)
             {
                 RelativeSizeAxes = Axes.Both,
@@ -111,17 +89,6 @@ 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)
@@ -129,8 +96,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
             }
 
-            public new Catcher MovableCatcher => base.MovableCatcher;
-
             public void ToggleHyperDash(bool status) => MovableCatcher.SetHyperDashState(status ? 2 : 1);
         }
     }

From c64343c7d719ed8c5c3dc1bfa35934145ab2ffad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Dec 2020 17:42:41 +0900
Subject: [PATCH 06628/10326] 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 9d99218f88..9a3d42d6b7 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1201.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1203.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4b931726e0..9d37ceee6c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1201.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1203.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 3a47b77820..ab03393836 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.Framework.iOS" Version="2020.1201.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1203.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1201.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1203.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 78c43641d1c6022e1143280843543fec65b678f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Dec 2020 17:43:09 +0900
Subject: [PATCH 06629/10326] Update imagesharp namespaces (and consume
 System.Drawing types instead)

---
 osu.Game.Tournament/Models/TournamentMatch.cs                   | 2 +-
 osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs       | 2 +-
 .../Screens/Ladder/Components/DrawableTournamentMatch.cs        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Models/TournamentMatch.cs b/osu.Game.Tournament/Models/TournamentMatch.cs
index 8ebcbf4e15..bdfb1728f3 100644
--- a/osu.Game.Tournament/Models/TournamentMatch.cs
+++ b/osu.Game.Tournament/Models/TournamentMatch.cs
@@ -4,10 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Drawing;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Game.Tournament.Screens.Ladder.Components;
-using SixLabors.Primitives;
 
 namespace osu.Game.Tournament.Models
 {
diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index efec4cffdd..ca46c3b050 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Drawing;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -16,7 +17,6 @@ using osu.Game.Tournament.Screens.Ladder;
 using osu.Game.Tournament.Screens.Ladder.Components;
 using osuTK;
 using osuTK.Graphics;
-using SixLabors.Primitives;
 
 namespace osu.Game.Tournament.Screens.Editors
 {
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index f2065e7e88..1c805bb42e 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -13,7 +14,6 @@ using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
-using SixLabors.Primitives;
 
 namespace osu.Game.Tournament.Screens.Ladder.Components
 {

From 3e62da119eca2d34c3e24b1bf61ec68a6eeaddf9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Dec 2020 17:59:39 +0900
Subject: [PATCH 06630/10326] Add to inspector also

---
 .../Components/OverlinedPlaylistHeader.cs     | 22 +++++++++++++++++++
 .../Multi/Lounge/Components/RoomInspector.cs  |  2 +-
 .../Screens/Multi/Match/MatchSubScreen.cs     |  5 +----
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs

diff --git a/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs b/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs
new file mode 100644
index 0000000000..02dbe501b1
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.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.Game.Online.Multiplayer;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    public class OverlinedPlaylistHeader : OverlinedHeader
+    {
+        public OverlinedPlaylistHeader()
+            : base("Playlist")
+        {
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Playlist.BindCollectionChanged((_, __) => Details.Value = Playlist.GetTotalDuration());
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
index 77fbd606f4..dfee278e87 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                                     }
                                 }
                             },
-                            new Drawable[] { new OverlinedHeader("Playlist"), },
+                            new Drawable[] { new OverlinedPlaylistHeader(), },
                             new Drawable[]
                             {
                                 new DrawableRoomPlaylist(false, false)
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 13a5d89a12..2f8aad4e65 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -57,7 +57,6 @@ namespace osu.Game.Screens.Multi.Match
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private OverlinedHeader participantsHeader;
-        private OverlinedHeader playlistHeader;
 
         public MatchSubScreen(Room room)
         {
@@ -136,7 +135,7 @@ namespace osu.Game.Screens.Multi.Match
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 Content = new[]
                                                                 {
-                                                                    new Drawable[] { playlistHeader = new OverlinedHeader("Playlist"), },
+                                                                    new Drawable[] { new OverlinedPlaylistHeader(), },
                                                                     new Drawable[]
                                                                     {
                                                                         new DrawableRoomPlaylistWithResults
@@ -244,8 +243,6 @@ namespace osu.Game.Screens.Multi.Match
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
-
-            playlist.BindCollectionChanged((_, __) => playlistHeader.Details.Value = playlist.GetTotalDuration(), true);
         }
 
         public override bool OnExiting(IScreen next)

From 62b1e37f73701a71992d23b4d987f6f5854a7fae Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Dec 2020 18:04:53 +0900
Subject: [PATCH 06631/10326] Use async overloads

---
 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 d1f6fd445e..53ee711626 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -116,13 +116,13 @@ namespace osu.Game.Graphics
                 switch (screenshotFormat.Value)
                 {
                     case ScreenshotFormat.Png:
-                        image.SaveAsPng(stream);
+                        await image.SaveAsPngAsync(stream);
                         break;
 
                     case ScreenshotFormat.Jpg:
                         const int jpeg_quality = 92;
 
-                        image.SaveAsJpeg(stream, new JpegEncoder { Quality = jpeg_quality });
+                        await image.SaveAsJpegAsync(stream, new JpegEncoder { Quality = jpeg_quality });
                         break;
 
                     default:

From 8245bb85dc93970e584d8b821769fb8eda7b7c5f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Dec 2020 18:06:55 +0900
Subject: [PATCH 06632/10326] Invoke on initial bind

---
 osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs b/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs
index 02dbe501b1..5552c1cb72 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Multi.Components
         {
             base.LoadComplete();
 
-            Playlist.BindCollectionChanged((_, __) => Details.Value = Playlist.GetTotalDuration());
+            Playlist.BindCollectionChanged((_, __) => Details.Value = Playlist.GetTotalDuration(), true);
         }
     }
 }

From be456f9c6be31ea98077263f63d84589009429d0 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 3 Dec 2020 18:45:38 +0900
Subject: [PATCH 06633/10326] Make DroppedObjectAnimation private

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 6d5d25243d..de2782fa35 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -552,11 +552,11 @@ namespace osu.Game.Rulesets.Catch.UI
 
             d.Expire();
         }
-    }
 
-    public enum DroppedObjectAnimation
-    {
-        Drop,
-        Explode
+        private enum DroppedObjectAnimation
+        {
+            Drop,
+            Explode
+        }
     }
 }

From 7e66714c2fb50c7dd7527d55e5396fe496809139 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 3 Dec 2020 18:45:10 +0900
Subject: [PATCH 06634/10326] Use ApplyCustomUpdateState for dropping
 transformation

We cannot just apply the transforms because DHO clears transforms when state is updated
---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 46 +++++++++++++--------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index de2782fa35..1101e5b6b4 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -517,40 +517,40 @@ namespace osu.Game.Rulesets.Catch.UI
             drop(caughtObject, animation);
         }
 
-        private void drop(Drawable d, DroppedObjectAnimation animation)
+        private void drop(DrawablePalpableCatchHitObject d, DroppedObjectAnimation animation)
         {
             var originalX = d.X * Scale.X;
+            var startTime = Clock.CurrentTime;
 
             d.Anchor = Anchor.TopLeft;
             d.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(d.DrawPosition, droppedObjectTarget);
 
-            animate(d, animation, originalX);
+            // we cannot just apply the transforms because DHO clears transforms when state is updated
+            d.ApplyCustomUpdateState += (o, state) => animate(o, animation, originalX, startTime);
+            if (d.IsLoaded)
+                animate(d, animation, originalX, startTime);
         }
 
-        private void animate(Drawable d, DroppedObjectAnimation animation, float originalX)
+        private void animate(Drawable d, DroppedObjectAnimation animation, float originalX, double startTime)
         {
-            // temporary hack to make sure transforms are not cleared by DHO state update
-            if (!d.IsLoaded)
+            using (d.BeginAbsoluteSequence(startTime))
             {
-                d.OnLoadComplete += _ => animate(d, animation, originalX);
-                return;
+                switch (animation)
+                {
+                    case DroppedObjectAnimation.Drop:
+                        d.MoveToY(d.Y + 75, 750, Easing.InSine);
+                        d.FadeOut(750);
+                        break;
+
+                    case DroppedObjectAnimation.Explode:
+                        d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine);
+                        d.MoveToX(d.X + originalX * 6, 1000);
+                        d.FadeOut(750);
+                        break;
+                }
+
+                d.Expire();
             }
-
-            switch (animation)
-            {
-                case DroppedObjectAnimation.Drop:
-                    d.MoveToY(d.Y + 75, 750, Easing.InSine);
-                    d.FadeOut(750);
-                    break;
-
-                case DroppedObjectAnimation.Explode:
-                    d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine);
-                    d.MoveToX(d.X + originalX * 6, 1000);
-                    d.FadeOut(750);
-                    break;
-            }
-
-            d.Expire();
         }
 
         private enum DroppedObjectAnimation

From 73e99718bc23f52854bbc0eb467dcb63bae10a97 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Dec 2020 19:46:42 +0900
Subject: [PATCH 06635/10326] Change order of OnParentReceived()

---
 .../Objects/Drawables/DrawableSliderHead.cs      |  5 +++++
 .../Objects/Drawables/DrawableSliderRepeat.cs    |  5 +++++
 .../Objects/Drawables/DrawableSliderTick.cs      | 10 +++++++++-
 .../Objects/Drawables/DrawableSpinnerTick.cs     |  1 +
 .../Objects/Drawables/DrawableHitObject.cs       | 16 ++++++++++++----
 osu.Game/Rulesets/UI/HitObjectContainer.cs       |  2 +-
 osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs |  3 ++-
 osu.Game/Rulesets/UI/Playfield.cs                |  4 +++-
 8 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 3a92938d75..d1928bd4bb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -47,6 +47,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.OnParentReceived(parent);
 
             drawableSlider = (DrawableSlider)parent;
+        }
+
+        protected override void OnApply()
+        {
+            base.OnApply();
 
             pathVersion.BindTo(drawableSlider.PathVersion);
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 0735d48ae1..f368615e77 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -65,6 +65,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.OnParentReceived(parent);
 
             drawableSlider = (DrawableSlider)parent;
+        }
+
+        protected override void OnApply()
+        {
+            base.OnApply();
 
             Position = HitObject.Position - drawableSlider.Position;
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index faccf5d4d1..d40b6aea6e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public override bool DisplayResult => false;
 
         private SkinnableDrawable scaleContainer;
+        private DrawableSlider drawableSlider;
 
         public DrawableSliderTick()
             : base(null)
@@ -66,7 +67,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.OnParentReceived(parent);
 
-            Position = HitObject.Position - ((DrawableSlider)parent).HitObject.Position;
+            drawableSlider = (DrawableSlider)parent;
+        }
+
+        protected override void OnApply()
+        {
+            base.OnApply();
+
+            Position = HitObject.Position - drawableSlider.HitObject.Position;
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index f37d933e11..d10c4f7511 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void OnParentReceived(DrawableHitObject parent)
         {
             base.OnParentReceived(parent);
+
             drawableSpinner = (DrawableSpinner)parent;
         }
 
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index a922da0aa9..37c36ace7b 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -230,12 +230,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             foreach (var h in HitObject.NestedHitObjects)
             {
-                var pooledDrawableNested = pooledObjectProvider?.GetPooledDrawableRepresentation(h);
+                var pooledDrawableNested = pooledObjectProvider?.GetPooledDrawableRepresentation(h, this);
                 var drawableNested = pooledDrawableNested
                                      ?? CreateNestedHitObject(h)
                                      ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}.");
 
-                // Invoke the event only if this nested object is just created by `CreateNestedHitObject`.
+                // Only invoke the event for non-pooled DHOs, otherwise the event will be fired by the playfield.
                 if (pooledDrawableNested == null)
                     OnNestedDrawableCreated?.Invoke(drawableNested);
 
@@ -243,10 +243,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 drawableNested.OnRevertResult += onRevertResult;
                 drawableNested.ApplyCustomUpdateState += onApplyCustomUpdateState;
 
+                // ApplyParent() should occur before Apply() in all cases, so it's invoked before the nested DHO is added to the hierarchy below, but after its events are initialised.
+                if (pooledDrawableNested == null)
+                    drawableNested.ApplyParent(this);
+
                 nestedHitObjects.Value.Add(drawableNested);
                 AddNestedHitObject(drawableNested);
-
-                drawableNested.OnParentReceived(this);
             }
 
             StartTimeBindable.BindTo(HitObject.StartTimeBindable);
@@ -348,6 +350,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
         }
 
+        /// <summary>
+        /// Applies a parenting <see cref="DrawableHitObject"/> to this <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <param name="parent">The parenting <see cref="DrawableHitObject"/>.</param>
+        public void ApplyParent(DrawableHitObject parent) => OnParentReceived(parent);
+
         /// <summary>
         /// Invoked when this <see cref="DrawableHitObject"/> receives a new parenting <see cref="DrawableHitObject"/>.
         /// </summary>
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index ac5d281ddc..12e39d4fbf 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.UI
         {
             Debug.Assert(!drawableMap.ContainsKey(entry));
 
-            var drawable = pooledObjectProvider?.GetPooledDrawableRepresentation(entry.HitObject);
+            var drawable = pooledObjectProvider?.GetPooledDrawableRepresentation(entry.HitObject, null);
             if (drawable == null)
                 throw new InvalidOperationException($"A drawable representation could not be retrieved for hitobject type: {entry.HitObject.GetType().ReadableName()}.");
 
diff --git a/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs b/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
index 315926dfc6..2d700076d6 100644
--- a/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
+++ b/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
@@ -13,8 +13,9 @@ namespace osu.Game.Rulesets.UI
         /// Attempts to retrieve the poolable <see cref="DrawableHitObject"/> representation of a <see cref="HitObject"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to retrieve the <see cref="DrawableHitObject"/> representation of.</param>
+        /// <param name="parent">The parenting <see cref="DrawableHitObject"/>, if any.</param>
         /// <returns>The <see cref="DrawableHitObject"/> representing <see cref="HitObject"/>, or <c>null</c> if no poolable representation exists.</returns>
         [CanBeNull]
-        DrawableHitObject GetPooledDrawableRepresentation([NotNull] HitObject hitObject);
+        DrawableHitObject GetPooledDrawableRepresentation([NotNull] HitObject hitObject, [CanBeNull] DrawableHitObject parent);
     }
 }
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index a2ac234471..01b25c9717 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -323,7 +323,7 @@ namespace osu.Game.Rulesets.UI
             AddInternal(pool);
         }
 
-        DrawableHitObject IPooledHitObjectProvider.GetPooledDrawableRepresentation(HitObject hitObject)
+        DrawableHitObject IPooledHitObjectProvider.GetPooledDrawableRepresentation(HitObject hitObject, DrawableHitObject parent)
         {
             var lookupType = hitObject.GetType();
 
@@ -359,6 +359,8 @@ namespace osu.Game.Rulesets.UI
                 if (!lifetimeEntryMap.TryGetValue(hitObject, out var entry))
                     lifetimeEntryMap[hitObject] = entry = CreateLifetimeEntry(hitObject);
 
+                if (parent != null)
+                    dho.ApplyParent(parent);
                 dho.Apply(hitObject, entry);
             });
         }

From 0bdf99b97a960cd9a5c58e72b4bf3bb0af984ea3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Dec 2020 20:03:39 +0900
Subject: [PATCH 06636/10326] Remove OnParentReceived()

---
 .../Objects/Drawables/DrawableSliderHead.cs   | 22 +++++----------
 .../Objects/Drawables/DrawableSliderRepeat.cs | 17 ++++--------
 .../Objects/Drawables/DrawableSliderTick.cs   | 12 +++------
 .../Objects/Drawables/DrawableSpinnerTick.cs  | 15 +++--------
 .../Objects/Drawables/DrawableHitObject.cs    | 27 +++++++------------
 osu.Game/Rulesets/UI/Playfield.cs             |  3 +--
 6 files changed, 29 insertions(+), 67 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index d1928bd4bb..f584c9c2d3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -4,20 +4,19 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSliderHead : DrawableHitCircle
     {
+        protected DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
+
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
         protected override OsuSkinComponents CirclePieceComponent => OsuSkinComponents.SliderHeadHitCircle;
 
-        private DrawableSlider drawableSlider;
-
-        private Slider slider => drawableSlider?.HitObject;
+        private Slider slider => DrawableSlider?.HitObject;
 
         public DrawableSliderHead()
         {
@@ -39,24 +38,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.OnFree();
 
-            pathVersion.UnbindFrom(drawableSlider.PathVersion);
-        }
-
-        protected override void OnParentReceived(DrawableHitObject parent)
-        {
-            base.OnParentReceived(parent);
-
-            drawableSlider = (DrawableSlider)parent;
+            pathVersion.UnbindFrom(DrawableSlider.PathVersion);
         }
 
         protected override void OnApply()
         {
             base.OnApply();
 
-            pathVersion.BindTo(drawableSlider.PathVersion);
+            pathVersion.BindTo(DrawableSlider.PathVersion);
 
-            OnShake = drawableSlider.Shake;
-            CheckHittable = (d, t) => drawableSlider.CheckHittable?.Invoke(d, t) ?? true;
+            OnShake = DrawableSlider.Shake;
+            CheckHittable = (d, t) => DrawableSlider.CheckHittable?.Invoke(d, t) ?? true;
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index f368615e77..2fd9af894d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public new SliderRepeat HitObject => (SliderRepeat)base.HitObject;
 
+        protected DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
+
         private double animDuration;
 
         public Drawable CirclePiece { get; private set; }
@@ -26,8 +28,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => false;
 
-        private DrawableSlider drawableSlider;
-
         public DrawableSliderRepeat()
             : base(null)
         {
@@ -60,24 +60,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
         }
 
-        protected override void OnParentReceived(DrawableHitObject parent)
-        {
-            base.OnParentReceived(parent);
-
-            drawableSlider = (DrawableSlider)parent;
-        }
-
         protected override void OnApply()
         {
             base.OnApply();
 
-            Position = HitObject.Position - drawableSlider.Position;
+            Position = HitObject.Position - DrawableSlider.Position;
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (HitObject.StartTime <= Time.Current)
-                ApplyResult(r => r.Type = drawableSlider.Tracking.Value ? r.Judgement.MaxResult : r.Judgement.MinResult);
+                ApplyResult(r => r.Type = DrawableSlider.Tracking.Value ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
         protected override void UpdateInitialTransforms()
@@ -119,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (IsHit) return;
 
             bool isRepeatAtEnd = HitObject.RepeatIndex % 2 == 0;
-            List<Vector2> curve = ((PlaySliderBody)drawableSlider.Body.Drawable).CurrentCurve;
+            List<Vector2> curve = ((PlaySliderBody)DrawableSlider.Body.Drawable).CurrentCurve;
 
             Position = isRepeatAtEnd ? end : start;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index d40b6aea6e..c7bfdb02fb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -22,8 +22,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => false;
 
+        protected DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
+
         private SkinnableDrawable scaleContainer;
-        private DrawableSlider drawableSlider;
 
         public DrawableSliderTick()
             : base(null)
@@ -63,18 +64,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
         }
 
-        protected override void OnParentReceived(DrawableHitObject parent)
-        {
-            base.OnParentReceived(parent);
-
-            drawableSlider = (DrawableSlider)parent;
-        }
-
         protected override void OnApply()
         {
             base.OnApply();
 
-            Position = HitObject.Position - drawableSlider.HitObject.Position;
+            Position = HitObject.Position - DrawableSlider.HitObject.Position;
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index d10c4f7511..726fbd3ea6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -1,14 +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.Game.Rulesets.Objects.Drawables;
-
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSpinnerTick : DrawableOsuHitObject
     {
         public override bool DisplayResult => false;
 
+        protected DrawableSpinner DrawableSpinner => (DrawableSpinner)ParentHitObject;
+
         public DrawableSpinnerTick()
             : base(null)
         {
@@ -19,16 +19,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
         }
 
-        private DrawableSpinner drawableSpinner;
-
-        protected override void OnParentReceived(DrawableHitObject parent)
-        {
-            base.OnParentReceived(parent);
-
-            drawableSpinner = (DrawableSpinner)parent;
-        }
-
-        protected override double MaximumJudgementOffset => drawableSpinner.HitObject.Duration;
+        protected override double MaximumJudgementOffset => DrawableSpinner.HitObject.Duration;
 
         /// <summary>
         /// Apply a judgement result.
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 37c36ace7b..94d63e4e68 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -43,6 +43,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public HitObject HitObject { get; private set; }
 
+        /// <summary>
+        /// The parenting <see cref="DrawableHitObject"/>, if any.
+        /// </summary>
+        [CanBeNull]
+        protected internal DrawableHitObject ParentHitObject { get; internal set; }
+
         /// <summary>
         /// The colour used for various elements of this DrawableHitObject.
         /// </summary>
@@ -243,9 +249,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 drawableNested.OnRevertResult += onRevertResult;
                 drawableNested.ApplyCustomUpdateState += onApplyCustomUpdateState;
 
-                // ApplyParent() should occur before Apply() in all cases, so it's invoked before the nested DHO is added to the hierarchy below, but after its events are initialised.
-                if (pooledDrawableNested == null)
-                    drawableNested.ApplyParent(this);
+                // This is only necessary for non-pooled DHOs. For pooled DHOs, this is handled inside GetPooledDrawableRepresentation().
+                // Must be done before the nested DHO is added to occur before the nested Apply()!
+                drawableNested.ParentHitObject = this;
 
                 nestedHitObjects.Value.Add(drawableNested);
                 AddNestedHitObject(drawableNested);
@@ -317,6 +323,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             OnFree();
 
             HitObject = null;
+            ParentHitObject = null;
             Result = null;
             lifetimeEntry = null;
 
@@ -350,20 +357,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
         }
 
-        /// <summary>
-        /// Applies a parenting <see cref="DrawableHitObject"/> to this <see cref="DrawableHitObject"/>.
-        /// </summary>
-        /// <param name="parent">The parenting <see cref="DrawableHitObject"/>.</param>
-        public void ApplyParent(DrawableHitObject parent) => OnParentReceived(parent);
-
-        /// <summary>
-        /// Invoked when this <see cref="DrawableHitObject"/> receives a new parenting <see cref="DrawableHitObject"/>.
-        /// </summary>
-        /// <param name="parent">The parenting <see cref="DrawableHitObject"/>.</param>
-        protected virtual void OnParentReceived(DrawableHitObject parent)
-        {
-        }
-
         /// <summary>
         /// Invoked by the base <see cref="DrawableHitObject"/> to populate samples, once on initial load and potentially again on any change to the samples collection.
         /// </summary>
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 01b25c9717..cbf3362ea7 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -359,8 +359,7 @@ namespace osu.Game.Rulesets.UI
                 if (!lifetimeEntryMap.TryGetValue(hitObject, out var entry))
                     lifetimeEntryMap[hitObject] = entry = CreateLifetimeEntry(hitObject);
 
-                if (parent != null)
-                    dho.ApplyParent(parent);
+                dho.ParentHitObject = parent;
                 dho.Apply(hitObject, entry);
             });
         }

From 48dad61a46494a588da1078e39295648b3c84dc0 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 3 Dec 2020 19:38:45 +0200
Subject: [PATCH 06637/10326] Apply review suggestions

---
 .../SongSelect/TestSceneBeatmapRecommendations.cs    |  2 --
 osu.Game/Rulesets/ILegacyRuleset.cs                  |  2 ++
 osu.Game/Screens/Select/DifficultyRecommender.cs     | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 8a4914a31b..6c19206802 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -23,8 +23,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public class TestSceneBeatmapRecommendations : OsuGameTestScene
     {
-        protected override bool UseOnlineAPI => false;
-
         [Resolved]
         private DifficultyRecommender recommender { get; set; }
 
diff --git a/osu.Game/Rulesets/ILegacyRuleset.cs b/osu.Game/Rulesets/ILegacyRuleset.cs
index 06a85b5261..f4b03baccd 100644
--- a/osu.Game/Rulesets/ILegacyRuleset.cs
+++ b/osu.Game/Rulesets/ILegacyRuleset.cs
@@ -5,6 +5,8 @@ namespace osu.Game.Rulesets
 {
     public interface ILegacyRuleset
     {
+        const int MAX_LEGACY_RULESET_ID = 3;
+
         /// <summary>
         /// Identifies the server-side ID of a legacy ruleset.
         /// </summary>
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index ab64513ecb..f8aaf5c0fd 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private Bindable<RulesetInfo> ruleset { get; set; }
 
+        private int storedUserId;
+
         private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
@@ -69,13 +71,15 @@ namespace osu.Game.Screens.Select
             return beatmap;
         }
 
-        private void calculateRecommendedDifficulties(bool onlyIfNoPreviousValues = false)
+        private void calculateRecommendedDifficulties()
         {
-            if (recommendedStarDifficulty.Any() && onlyIfNoPreviousValues)
+            if (recommendedStarDifficulty.Any() && api.LocalUser.Value.Id == storedUserId)
                 return;
 
+            storedUserId = api.LocalUser.Value.Id;
+
             // only query API for built-in rulesets
-            rulesets.AvailableRulesets.Where(ruleset => ruleset.ID <= 3).ForEach(rulesetInfo =>
+            rulesets.AvailableRulesets.Where(ruleset => ruleset.ID <= ILegacyRuleset.MAX_LEGACY_RULESET_ID).ForEach(rulesetInfo =>
             {
                 var req = new GetUserRequest(api.LocalUser.Value.Id, rulesetInfo);
 
@@ -117,7 +121,7 @@ namespace osu.Game.Screens.Select
             switch (state.NewValue)
             {
                 case APIState.Online:
-                    calculateRecommendedDifficulties(true);
+                    calculateRecommendedDifficulties();
                     break;
             }
         });

From 4cd2e207ac8b8353fd46019d0f446e8e258faf54 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 3 Dec 2020 19:53:06 +0200
Subject: [PATCH 06638/10326] Document getBestRulesetOrder

---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index f8aaf5c0fd..21e6629add 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -93,6 +93,9 @@ namespace osu.Game.Screens.Select
             });
         }
 
+        /// <returns>
+        /// Rulesets ordered by highest recommended star difficulty, except currently selected ruleset first
+        /// </returns>
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
             IEnumerable<RulesetInfo> bestRulesetOrder = recommendedStarDifficulty.OrderByDescending(pair => pair.Value)

From 49be4978bd400fc4ffb1036eb4f9cc23cfd79a07 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 3 Dec 2020 19:53:41 +0200
Subject: [PATCH 06639/10326] Avoid calling ToList twice

---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 21e6629add..fa48316e9d 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -99,8 +99,7 @@ namespace osu.Game.Screens.Select
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
             IEnumerable<RulesetInfo> bestRulesetOrder = recommendedStarDifficulty.OrderByDescending(pair => pair.Value)
-                                                                                 .Select(pair => pair.Key)
-                                                                                 .ToList();
+                                                                                 .Select(pair => pair.Key);
 
             List<RulesetInfo> orderedRulesets;
 

From e792f070840bc3857467a3a3a74b00e0e7a075d3 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 3 Dec 2020 20:07:42 +0200
Subject: [PATCH 06640/10326] Add test for recommending current ruleset

---
 .../TestSceneBeatmapRecommendations.cs         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 6c19206802..75a33af247 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -100,6 +100,24 @@ namespace osu.Game.Tests.Visual.SongSelect
             presentAndConfirm(() => beatmapSets[3], 2);
         }
 
+        [Test]
+        public void TestCurrentRulesetIsRecommended()
+        {
+            BeatmapSetInfo catchSet = null, mixedSet = null;
+
+            AddStep("create catch beatmapset", () => catchSet = importBeatmapSet(0, new[] { new CatchRuleset().RulesetInfo }));
+            AddStep("create mixed beatmapset", () => mixedSet = importBeatmapSet(1,
+                new[] { new TaikoRuleset().RulesetInfo, new CatchRuleset().RulesetInfo, new ManiaRuleset().RulesetInfo }));
+
+            AddAssert("all sets imported", () => ensureAllBeatmapSetsImported(new[] { catchSet, mixedSet }));
+
+            // Switch to catch
+            presentAndConfirm(() => catchSet, 1);
+
+            // Present mixed difficulty set, expect current ruleset to be selected
+            presentAndConfirm(() => mixedSet, 2);
+        }
+
         [Test]
         public void TestBestRulesetIsRecommended()
         {

From abe5a67bc5329702dd7b0176655b8796c1419c0b Mon Sep 17 00:00:00 2001
From: MATRIX-feather <midnightcarnival@outlook.com>
Date: Fri, 4 Dec 2020 03:14:07 +0800
Subject: [PATCH 06641/10326] Simplify implementation

---
 osu.Game/Screens/Import/FileImportScreen.cs | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index a59688a2a9..211605e5c9 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Screens.Import
             var originalPath = storage.GetFullPath("imports", true);
             string[] fileExtensions = { ".osk", ".osr", ".osz" };
             defaultPath = originalPath;
+            var directory = currentDirectory.Value?.FullName ?? defaultPath;
 
             InternalChild = contentContainer = new Container
             {
@@ -67,6 +68,10 @@ namespace osu.Game.Screens.Import
                         Width = 0.65f,
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.TopLeft,
+                        Child = fileSelector = new FileSelector(initialPath: directory, validFileExtensions: fileExtensions)
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
                     },
                     new Container
                     {
@@ -169,21 +174,9 @@ namespace osu.Game.Screens.Import
             {
                 currentFile.Value = null;
             });
-            currentFile.UnbindBindings();
-            currentDirectory.UnbindBindings();
-
-            fileSelector?.Expire();
-
-            var directory = currentDirectory.Value?.FullName ?? defaultPath;
-            fileSelector = new FileSelector(initialPath: directory, validFileExtensions: fileExtensions)
-            {
-                RelativeSizeAxes = Axes.Both
-            };
 
             currentDirectory.BindTo(fileSelector.CurrentPath);
             currentFile.BindTo(fileSelector.CurrentFile);
-
-            fileSelectContainer.Add(fileSelector);
         }
 
         private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)

From 85de1a1d20cc5299a3c9443ff422da320d92d384 Mon Sep 17 00:00:00 2001
From: MATRIX-feather <midnightcarnival@outlook.com>
Date: Fri, 4 Dec 2020 03:19:20 +0800
Subject: [PATCH 06642/10326] Animation changes

---
 osu.Game/Screens/Import/FileImportScreen.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 211605e5c9..9fb8e22977 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -188,17 +188,16 @@ namespace osu.Game.Screens.Import
         {
             base.OnEntering(last);
 
-            contentContainer.FadeOut().Then().ScaleTo(0.8f).RotateTo(-15).MoveToX(300)
+            contentContainer.FadeOut().Then().ScaleTo(0.95f)
                             .Then()
-                            .ScaleTo(1, 1500, Easing.OutElastic)
-                            .FadeIn(500)
-                            .MoveToX(0, 500, Easing.OutQuint)
-                            .RotateTo(0, 500, Easing.OutQuint);
+                            .ScaleTo(1, 300, Easing.OutQuint)
+                            .FadeIn(300);
         }
 
         public override bool OnExiting(IScreen next)
         {
-            contentContainer.ScaleTo(0.8f, 500, Easing.OutExpo).RotateTo(-15, 500, Easing.OutExpo).MoveToX(300, 500, Easing.OutQuint).FadeOut(500);
+            contentContainer.ScaleTo(0.95f, 300, Easing.OutQuint)
+                            .FadeOut(300);
             this.FadeOut(500, Easing.OutExpo);
 
             return base.OnExiting(next);

From fb080284d2a03c3861d8c2430436c8a30c48d9a2 Mon Sep 17 00:00:00 2001
From: MATRIX-feather <midnightcarnival@outlook.com>
Date: Fri, 4 Dec 2020 04:10:08 +0800
Subject: [PATCH 06643/10326] Simplify UI implementation

---
 osu.Game/Screens/Import/FileImportScreen.cs | 153 +++++++-------------
 1 file changed, 54 insertions(+), 99 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 9fb8e22977..9af87887b2 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -13,7 +13,6 @@ using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK;
-using osu.Game.Overlays;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.Containers;
 using osuTK.Graphics;
@@ -22,30 +21,32 @@ namespace osu.Game.Screens.Import
 {
     public class FileImportScreen : OsuScreen
     {
-        private Container contentContainer;
-        private FileSelector fileSelector;
-        private Container fileSelectContainer;
-
         public override bool HideOverlaysOnEnter => true;
 
-        private string defaultPath;
         private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
         private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
+
+        private FileSelector fileSelector;
+        private Container contentContainer;
         private TextFlowContainer currentFileText;
         private OsuScrollContainer fileNameScroll;
-        private readonly OverlayColourProvider overlayColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+        private const float duration = 300;
+        private const float button_height = 50;
+        private const float button_vertical_margin = 15;
 
         [Resolved]
         private OsuGameBase gameBase { get; set; }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage)
         {
             storage.GetStorageForDirectory("imports");
             var originalPath = storage.GetFullPath("imports", true);
             string[] fileExtensions = { ".osk", ".osr", ".osz" };
-            defaultPath = originalPath;
-            var directory = currentDirectory.Value?.FullName ?? defaultPath;
 
             InternalChild = contentContainer = new Container
             {
@@ -59,19 +60,13 @@ namespace osu.Game.Screens.Import
                 {
                     new Box
                     {
-                        Colour = overlayColourProvider.Background5,
+                        Colour = colours.GreySeafoamDark,
                         RelativeSizeAxes = Axes.Both,
                     },
-                    fileSelectContainer = new Container
+                    fileSelector = new FileSelector(initialPath: originalPath, validFileExtensions: fileExtensions)
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Width = 0.65f,
-                        Anchor = Anchor.TopLeft,
-                        Origin = Anchor.TopLeft,
-                        Child = fileSelector = new FileSelector(initialPath: directory, validFileExtensions: fileExtensions)
-                        {
-                            RelativeSizeAxes = Axes.Both
-                        }
+                        Width = 0.65f
                     },
                     new Container
                     {
@@ -79,87 +74,48 @@ namespace osu.Game.Screens.Import
                         Width = 0.35f,
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
-                        Masking = true,
-                        CornerRadius = 10,
                         Children = new Drawable[]
                         {
-                            new GridContainer
+                            new Box
+                            {
+                                Colour = colours.GreySeafoamDarker,
+                                RelativeSizeAxes = Axes.Both
+                            },
+                            new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                RowDimensions = new[]
+                                Padding = new MarginPadding { Bottom = button_height + button_vertical_margin * 2 },
+                                Child = fileNameScroll = new OsuScrollContainer
                                 {
-                                    new Dimension(),
-                                    new Dimension(GridSizeMode.AutoSize),
-                                },
-                                Content = new[]
-                                {
-                                    new Drawable[]
+                                    RelativeSizeAxes = Axes.Both,
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    Child = currentFileText = new TextFlowContainer(t => t.Font = OsuFont.Default.With(size: 30))
                                     {
-                                        new Container
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Anchor = Anchor.TopCentre,
-                                            Origin = Anchor.TopCentre,
-                                            Children = new Drawable[]
-                                            {
-                                                new Box
-                                                {
-                                                    Colour = overlayColourProvider.Background3,
-                                                    RelativeSizeAxes = Axes.Both
-                                                },
-                                                fileNameScroll = new OsuScrollContainer
-                                                {
-                                                    Masking = false,
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Child = currentFileText = new TextFlowContainer(t => t.Font = OsuFont.Default.With(size: 30))
-                                                    {
-                                                        AutoSizeAxes = Axes.Y,
-                                                        RelativeSizeAxes = Axes.X,
-                                                        Anchor = Anchor.Centre,
-                                                        Origin = Anchor.Centre,
-                                                        TextAnchor = Anchor.Centre
-                                                    },
-                                                },
-                                            }
-                                        },
+                                        AutoSizeAxes = Axes.Y,
+                                        RelativeSizeAxes = Axes.X,
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        TextAnchor = Anchor.Centre
                                     },
-                                    new Drawable[]
-                                    {
-                                        new Container
-                                        {
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Margin = new MarginPadding { Bottom = 15, Top = 15 },
-                                            Children = new Drawable[]
-                                            {
-                                                new FillFlowContainer
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Children = new Drawable[]
-                                                    {
-                                                        new TriangleButton
-                                                        {
-                                                            Text = "Import",
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            RelativeSizeAxes = Axes.X,
-                                                            Height = 50,
-                                                            Width = 0.9f,
-                                                            Action = () =>
-                                                            {
-                                                                var d = currentFile.Value?.FullName;
-                                                                if (d != null)
-                                                                    startImport(d);
-                                                                else
-                                                                    currentFileText.FlashColour(Color4.Red, 500);
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
+                                },
+                            },
+                            new TriangleButton
+                            {
+                                Text = "Import",
+                                Anchor = Anchor.BottomCentre,
+                                Origin = Anchor.BottomCentre,
+                                RelativeSizeAxes = Axes.X,
+                                Height = button_height,
+                                Width = 0.9f,
+                                Margin = new MarginPadding { Vertical = button_vertical_margin },
+                                Action = () =>
+                                {
+                                    var d = currentFile.Value?.FullName;
+                                    if (d != null)
+                                        startImport(d);
+                                    else
+                                        currentFileText.FlashColour(Color4.Red, 500);
                                 }
                             }
                         }
@@ -190,15 +146,14 @@ namespace osu.Game.Screens.Import
 
             contentContainer.FadeOut().Then().ScaleTo(0.95f)
                             .Then()
-                            .ScaleTo(1, 300, Easing.OutQuint)
-                            .FadeIn(300);
+                            .ScaleTo(1, duration, Easing.OutQuint)
+                            .FadeIn(duration);
         }
 
         public override bool OnExiting(IScreen next)
         {
-            contentContainer.ScaleTo(0.95f, 300, Easing.OutQuint)
-                            .FadeOut(300);
-            this.FadeOut(500, Easing.OutExpo);
+            contentContainer.ScaleTo(0.95f, duration, Easing.OutQuint);
+            this.FadeOut(duration, Easing.OutQuint);
 
             return base.OnExiting(next);
         }
@@ -210,8 +165,8 @@ namespace osu.Game.Screens.Import
 
             if (!File.Exists(path))
             {
-                currentFileText.Text = "File not exist";
-                currentFileText.FlashColour(Color4.Red, 500);
+                currentFileText.Text = "No such file";
+                currentFileText.FlashColour(colours.Red, duration);
                 return;
             }
 

From c25e2c3dd577e7d5dc1ce3765ac0d6bec40aca21 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 3 Dec 2020 23:13:14 +0200
Subject: [PATCH 06644/10326] Select recommended beatmap if last selection is
 filtered

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

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 7935debac7..bf045ed612 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Select.Carousel
 
         protected override CarouselItem GetNextToSelect()
         {
-            if (LastSelected == null)
+            if (LastSelected == null || LastSelected.Filtered.Value)
             {
                 if (GetRecommendedBeatmap?.Invoke(Children.OfType<CarouselBeatmap>().Where(b => !b.Filtered.Value).Select(b => b.Beatmap)) is BeatmapInfo recommended)
                     return Children.OfType<CarouselBeatmap>().First(b => b.Beatmap == recommended);

From 0bc591fef2dc5ee21680b0f361bb3388af35a825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 3 Dec 2020 22:38:51 +0100
Subject: [PATCH 06645/10326] Add failing assertions

`GameplayBeatmap` has to be used instead of the normal bindable
`Beatmap`, beecause the former uses osu!-specific hitobjects, while
the latter returns convert objects (i.e. `ConvertSlider`s).

Similarly, the mod has to be fetched from the player instead of the
global bindable, as `Player` has its own cloned instance of the mod, to
which the beatmap is applied. The global bindable instance does not have
`FirstObject` set.
---
 .../Mods/TestSceneOsuModHidden.cs             | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
index ff308f389f..1ac3ad9194 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
@@ -2,12 +2,15 @@
 // 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.Testing;
 using osu.Game.Beatmaps;
 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.Screens.Play;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
@@ -17,15 +20,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         [Test]
         public void TestDefaultBeatmapTest() => CreateModTest(new ModTestData
         {
-            Mod = new OsuModHidden(),
+            Mod = new TestOsuModHidden(),
             Autoplay = true,
-            PassCondition = checkSomeHit
+            PassCondition = () => checkSomeHit() && objectWithIncreasedVisibilityHasIndex(0)
         });
 
         [Test]
         public void FirstCircleAfterTwoSpinners() => CreateModTest(new ModTestData
         {
-            Mod = new OsuModHidden(),
+            Mod = new TestOsuModHidden(),
             Autoplay = true,
             Beatmap = new Beatmap
             {
@@ -54,13 +57,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                     }
                 }
             },
-            PassCondition = checkSomeHit
+            PassCondition = () => checkSomeHit() && objectWithIncreasedVisibilityHasIndex(2)
         });
 
         [Test]
         public void FirstSliderAfterTwoSpinners() => CreateModTest(new ModTestData
         {
-            Mod = new OsuModHidden(),
+            Mod = new TestOsuModHidden(),
             Autoplay = true,
             Beatmap = new Beatmap
             {
@@ -89,13 +92,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                     }
                 }
             },
-            PassCondition = checkSomeHit
+            PassCondition = () => checkSomeHit() && objectWithIncreasedVisibilityHasIndex(2)
         });
 
         [Test]
         public void TestWithSliderReuse() => CreateModTest(new ModTestData
         {
-            Mod = new OsuModHidden(),
+            Mod = new TestOsuModHidden(),
             Autoplay = true,
             Beatmap = new Beatmap
             {
@@ -116,9 +119,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             PassCondition = checkSomeHit
         });
 
-        private bool checkSomeHit()
+        private bool checkSomeHit() => Player.ScoreProcessor.JudgedHits >= 4;
+
+        private bool objectWithIncreasedVisibilityHasIndex(int index)
+            => Player.Mods.Value.OfType<TestOsuModHidden>().Single().FirstObject == Player.ChildrenOfType<GameplayBeatmap>().Single().HitObjects[index];
+
+        private class TestOsuModHidden : OsuModHidden
         {
-            return Player.ScoreProcessor.JudgedHits >= 4;
+            public new HitObject FirstObject => base.FirstObject;
         }
     }
 }

From 4d739f11a8352ed16cd7dbb2f499cee9ad6d6240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 3 Dec 2020 22:40:30 +0100
Subject: [PATCH 06646/10326] Fix spinner ticks getting increased visibility
 state

Regressed in #10696. The old `IsFirstHideableObject()` method did not
consider nested hitobjects, while its replacement -
`IsFirstAdjustableObject()` - did. Therefore, spinner ticks could be
considered first adjustable objects, breaking the old logic.

There is no need to match over `SpinnerBonusTick`, as it inherits from
`SpinnerTick`.
---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 78e759f0e0..45f314af7b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         private const double fade_in_duration_multiplier = 0.4;
         private const double fade_out_duration_multiplier = 0.3;
 
-        protected override bool IsFirstAdjustableObject(HitObject hitObject) => !(hitObject is Spinner);
+        protected override bool IsFirstAdjustableObject(HitObject hitObject) => !(hitObject is Spinner || hitObject is SpinnerTick);
 
         public override void ApplyToBeatmap(IBeatmap beatmap)
         {

From 71fa0da7f4dc1b57700e68277e4fed251b22df71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 3 Dec 2020 23:13:48 +0100
Subject: [PATCH 06647/10326] Add failing test cases

---
 .../Audio/SampleInfoEqualityTest.cs           | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 osu.Game.Tests/Audio/SampleInfoEqualityTest.cs

diff --git a/osu.Game.Tests/Audio/SampleInfoEqualityTest.cs b/osu.Game.Tests/Audio/SampleInfoEqualityTest.cs
new file mode 100644
index 0000000000..149096608f
--- /dev/null
+++ b/osu.Game.Tests/Audio/SampleInfoEqualityTest.cs
@@ -0,0 +1,78 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Game.Audio;
+
+namespace osu.Game.Tests.Audio
+{
+    [TestFixture]
+    public class SampleInfoEqualityTest
+    {
+        [Test]
+        public void TestSameSingleSamplesAreEqual()
+        {
+            var first = new SampleInfo("sample");
+            var second = new SampleInfo("sample");
+
+            assertEquality(first, second);
+        }
+
+        [Test]
+        public void TestDifferentSingleSamplesAreNotEqual()
+        {
+            var first = new SampleInfo("first");
+            var second = new SampleInfo("second");
+
+            assertNonEquality(first, second);
+        }
+
+        [Test]
+        public void TestDifferentCountSampleSetsAreNotEqual()
+        {
+            var first = new SampleInfo("sample", "extra");
+            var second = new SampleInfo("sample");
+
+            assertNonEquality(first, second);
+        }
+
+        [Test]
+        public void TestDifferentSampleSetsOfSameCountAreNotEqual()
+        {
+            var first = new SampleInfo("first", "common");
+            var second = new SampleInfo("common", "second");
+
+            assertNonEquality(first, second);
+        }
+
+        [Test]
+        public void TestSameOrderSameSampleSetsAreEqual()
+        {
+            var first = new SampleInfo("first", "second");
+            var second = new SampleInfo("first", "second");
+
+            assertEquality(first, second);
+        }
+
+        [Test]
+        public void TestDifferentOrderSameSampleSetsAreEqual()
+        {
+            var first = new SampleInfo("first", "second");
+            var second = new SampleInfo("second", "first");
+
+            assertEquality(first, second);
+        }
+
+        private void assertEquality(SampleInfo first, SampleInfo second)
+        {
+            Assert.That(first.Equals(second), Is.True);
+            Assert.That(first.GetHashCode(), Is.EqualTo(second.GetHashCode()));
+        }
+
+        private void assertNonEquality(SampleInfo first, SampleInfo second)
+        {
+            Assert.That(first.Equals(second), Is.False);
+            Assert.That(first.GetHashCode(), Is.Not.EqualTo(second.GetHashCode()));
+        }
+    }
+}

From 15d9147eddb9a39a4569d53042fcc05f1d5cf62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 3 Dec 2020 23:19:26 +0100
Subject: [PATCH 06648/10326] Ensure equality member consistency for SampleInfo

The previous implementation of `SampleInfo`'s equality members was not
completely correct in its treatment of the `sampleNames` array. While
`Equals()` compared the values of `sampleNames` using `SequenceEqual()`,
therefore performing a structural check that inspects the contents of
both arrays, `GetHashCode()` used `HashCode.Combine()` directly on the
arrays, therefore operating on reference equality. This could cause the
pooling mechanism of samples to fail, as pointed out in #11079.

To resolve, change the `GetHashCode()` implementation such that it also
considers the contents of the array rather than just the reference to
the array itself. This is achieved by leveraging
`StructuralEqualityComparer`.

Additionally, as a bonus, an array sort was added to the constructor of
`SampleInfo`. This is intended to be a "canonicalisation" processing
step for the array of sample names. Thanks to that sort, two instances
of `SampleInfo` that have the same sample names but permutated will also
turn out to be equal and have the same hash codes, given the
implementation of both equality members. This gives `SampleInfo`
set-like semantics.
---
 osu.Game/Audio/SampleInfo.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Audio/SampleInfo.cs b/osu.Game/Audio/SampleInfo.cs
index 221bc31639..5d8240204e 100644
--- a/osu.Game/Audio/SampleInfo.cs
+++ b/osu.Game/Audio/SampleInfo.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -17,6 +18,7 @@ namespace osu.Game.Audio
         public SampleInfo(params string[] sampleNames)
         {
             this.sampleNames = sampleNames;
+            Array.Sort(sampleNames);
         }
 
         public IEnumerable<string> LookupNames => sampleNames;
@@ -25,7 +27,9 @@ namespace osu.Game.Audio
 
         public override int GetHashCode()
         {
-            return HashCode.Combine(sampleNames, Volume);
+            return HashCode.Combine(
+                StructuralComparisons.StructuralEqualityComparer.GetHashCode(sampleNames),
+                Volume);
         }
 
         public bool Equals(SampleInfo other)

From 3de46d0a3be4309fb45b58fa1b9d734d8d6a0b55 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 4 Dec 2020 10:09:07 +0900
Subject: [PATCH 06649/10326] Fix & clarify catcher tests

---
 .../TestSceneCatcher.cs                       | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index f41a16026a..194a12a9b7 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         }
 
         [Test]
-        public void TestCatcherStateFruit()
+        public void TestFruitChangesCatcherState()
         {
             AddStep("miss fruit", () => attemptCatch(new Fruit { X = 100 }));
             checkState(CatcherAnimationState.Fail);
@@ -82,7 +82,19 @@ namespace osu.Game.Rulesets.Catch.Tests
         }
 
         [Test]
-        public void TestCatcherStateTinyDroplet()
+        public void TestNormalFruitResetsHyperDashState()
+        {
+            AddStep("catch hyper fruit", () => attemptCatch(new Fruit
+            {
+                HyperDashTarget = new Fruit { X = 100 }
+            }));
+            checkHyperDash(true);
+            AddStep("catch normal fruit", () => attemptCatch(new Fruit()));
+            checkHyperDash(false);
+        }
+
+        [Test]
+        public void TestTinyDropletMissPreservesCatcherState()
         {
             AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
             {
@@ -90,19 +102,21 @@ namespace osu.Game.Rulesets.Catch.Tests
             }));
             AddStep("catch tiny droplet", () => attemptCatch(new TinyDroplet()));
             AddStep("miss tiny droplet", () => attemptCatch(new TinyDroplet { X = 100 }));
+            // catcher state and hyper dash state is preserved
             checkState(CatcherAnimationState.Kiai);
             checkHyperDash(true);
         }
 
         [Test]
-        public void TestCatcherStateBanana()
+        public void TestBananaMissPreservesCatcherState()
         {
             AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
             {
                 HyperDashTarget = new Fruit { X = 100 }
             }));
-            AddStep("miss banana", () => attemptCatch(new Banana()));
-            checkState(CatcherAnimationState.Idle);
+            AddStep("miss banana", () => attemptCatch(new Banana { X = 100 }));
+            // catcher state is preserved but hyper dash state is reset
+            checkState(CatcherAnimationState.Kiai);
             checkHyperDash(false);
         }
 
@@ -135,18 +149,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddAssert("fruits are dropped", () => !catcher.CaughtObjects.Any() && droppedObjectContainer.Count == 10);
         }
 
-        [Test]
-        public void TestHyperFruitHyperDash()
-        {
-            AddStep("catch hyper fruit", () => attemptCatch(new Fruit
-            {
-                HyperDashTarget = new Fruit { X = 100 }
-            }));
-            checkHyperDash(true);
-            AddStep("catch normal fruit", () => attemptCatch(new Fruit()));
-            checkHyperDash(false);
-        }
-
         [TestCase(true)]
         [TestCase(false)]
         public void TestHitLighting(bool enabled)

From e82ca66d3ee144b5569e646d25a22e246458aac8 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 4 Dec 2020 10:21:54 +0900
Subject: [PATCH 06650/10326] Fix depth of dropped objects

---
 .../TestSceneCatcherArea.cs                   | 26 +++++++++++++------
 .../TestSceneHyperDashColouring.cs            |  2 +-
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs  |  6 ++---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     |  4 +--
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 7be6fc92ac..281ddc7eaa 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -72,14 +73,23 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             circleSize = size;
 
-            SetContents(() => new CatchInputManager(catchRuleset)
+            SetContents(() =>
             {
-                RelativeSizeAxes = Axes.Both,
-                Child = new TestCatcherArea(new BeatmapDifficulty { CircleSize = size })
+                var droppedObjectContainer = new Container();
+
+                return new CatchInputManager(catchRuleset)
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.TopCentre,
-                },
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        droppedObjectContainer,
+                        new TestCatcherArea(droppedObjectContainer, new BeatmapDifficulty { CircleSize = size })
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.TopCentre,
+                        }
+                    }
+                };
             });
         }
 
@@ -91,8 +101,8 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private class TestCatcherArea : CatcherArea
         {
-            public TestCatcherArea(BeatmapDifficulty beatmapDifficulty)
-                : base(beatmapDifficulty)
+            public TestCatcherArea(Container droppedObjectContainer, BeatmapDifficulty beatmapDifficulty)
+                : base(droppedObjectContainer, beatmapDifficulty)
             {
             }
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 1b8368794c..07cb73e5ff 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             AddStep("create hyper-dashing catcher", () =>
             {
-                Child = setupSkinHierarchy(catcherArea = new CatcherArea
+                Child = setupSkinHierarchy(catcherArea = new CatcherArea(new Container())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 6934dcc1f9..df87359ed6 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -36,12 +36,12 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatchPlayfield(BeatmapDifficulty difficulty, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation)
         {
-            var explodingFruitContainer = new Container
+            var droppedObjectContainer = new Container
             {
                 RelativeSizeAxes = Axes.Both,
             };
 
-            CatcherArea = new CatcherArea(difficulty)
+            CatcherArea = new CatcherArea(droppedObjectContainer, difficulty)
             {
                 Anchor = Anchor.BottomLeft,
                 Origin = Anchor.TopLeft,
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             InternalChildren = new[]
             {
-                explodingFruitContainer,
+                droppedObjectContainer,
                 CatcherArea.MovableCatcher.CreateProxiedContent(),
                 HitObjectContainer,
                 CatcherArea,
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 9cd0785b85..539776354c 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.UI
         public readonly Catcher MovableCatcher;
         private readonly CatchComboDisplay comboDisplay;
 
-        public CatcherArea(BeatmapDifficulty difficulty = null)
+        public CatcherArea(Container droppedObjectContainer, BeatmapDifficulty difficulty = null)
         {
             Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
             Children = new Drawable[]
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     Margin = new MarginPadding { Bottom = 350f },
                     X = CatchPlayfield.CENTER_X
                 },
-                MovableCatcher = new Catcher(this, this, difficulty) { X = CatchPlayfield.CENTER_X },
+                MovableCatcher = new Catcher(this, droppedObjectContainer, difficulty) { X = CatchPlayfield.CENTER_X },
             };
         }
 

From 23af70dd328c9216dde5540fa8f6c9e6e30c6f8a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 4 Dec 2020 10:24:25 +0900
Subject: [PATCH 06651/10326] Invert `if`

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 41 +++++++++++++--------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 1101e5b6b4..1037678734 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -245,30 +245,29 @@ namespace osu.Game.Rulesets.Catch.UI
                 catchObjectPosition >= catcherPosition - halfCatchWidth &&
                 catchObjectPosition <= catcherPosition + halfCatchWidth;
 
-            // droplet doesn't affect the catcher state
-            if (!(fruit is TinyDroplet))
-            {
-                if (validCatch && fruit.HyperDash)
-                {
-                    var target = fruit.HyperDashTarget;
-                    var timeDifference = target.StartTime - fruit.StartTime;
-                    double positionDifference = target.X - 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);
-            }
-
             if (validCatch)
                 placeCaughtObject(fruit);
 
+            // droplet doesn't affect the catcher state
+            if (fruit is TinyDroplet) return validCatch;
+
+            if (validCatch && fruit.HyperDash)
+            {
+                var target = fruit.HyperDashTarget;
+                var timeDifference = target.StartTime - fruit.StartTime;
+                double positionDifference = target.X - 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;
         }
 

From 898802340787ec59b212d8d0e7aa955ed797da88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Dec 2020 14:35:56 +0900
Subject: [PATCH 06652/10326] Tidy up code formatting and remove unnecessarily
 publicly exposed methods

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 84 +++++++++++++--------------
 1 file changed, 40 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 1037678734..2b88f24348 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -175,55 +175,19 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// Calculates the scale of the catcher based off the provided beatmap difficulty.
         /// </summary>
-        private static Vector2 calculateScale(BeatmapDifficulty difficulty)
-            => new Vector2(1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
+        private static Vector2 calculateScale(BeatmapDifficulty difficulty) => new Vector2(1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
 
         /// <summary>
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
         /// <param name="scale">The scale of the catcher.</param>
-        internal static float CalculateCatchWidth(Vector2 scale)
-            => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * ALLOWED_CATCH_RANGE;
+        internal static float CalculateCatchWidth(Vector2 scale) => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * ALLOWED_CATCH_RANGE;
 
         /// <summary>
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
         /// <param name="difficulty">The beatmap difficulty.</param>
-        internal static float CalculateCatchWidth(BeatmapDifficulty difficulty)
-            => CalculateCatchWidth(calculateScale(difficulty));
-
-        /// <summary>
-        /// Add a caught fruit to the catcher's stack.
-        /// </summary>
-        /// <param name="fruit">The fruit that was caught.</param>
-        public void PlaceOnPlate(DrawablePalpableCatchHitObject fruit)
-        {
-            var ourRadius = fruit.DisplayRadius;
-            float theirRadius = 0;
-
-            const float allowance = 10;
-
-            while (caughtFruitContainer.Any(f =>
-                Vector2Extensions.Distance(f.Position, fruit.Position) < (ourRadius + (theirRadius = CatchHitObject.OBJECT_RADIUS / 2)) / (allowance / 2)))
-            {
-                var diff = (ourRadius + theirRadius) / allowance;
-                fruit.X += (RNG.NextSingle() - 0.5f) * diff * 2;
-                fruit.Y -= RNG.NextSingle() * diff;
-            }
-
-            fruit.X = Math.Clamp(fruit.X, -CatcherArea.CATCHER_SIZE / 2, CatcherArea.CATCHER_SIZE / 2);
-
-            caughtFruitContainer.Add(fruit);
-
-            if (hitLighting.Value)
-            {
-                HitExplosion hitExplosion = hitExplosionPool.Get();
-                hitExplosion.X = fruit.X;
-                hitExplosion.Scale = new Vector2(fruit.HitObject.Scale);
-                hitExplosion.ObjectColour = fruit.AccentColour.Value;
-                hitExplosionContainer.Add(hitExplosion);
-            }
-        }
+        internal static float CalculateCatchWidth(BeatmapDifficulty difficulty) => CalculateCatchWidth(calculateScale(difficulty));
 
         /// <summary>
         /// Let the catcher attempt to catch a fruit.
@@ -375,12 +339,10 @@ namespace osu.Game.Rulesets.Catch.UI
         public void Drop() => clearPlate(DroppedObjectAnimation.Drop);
 
         /// <summary>
-        /// Explode any fruit off the plate.
+        /// Explode all fruit off the plate.
         /// </summary>
         public void Explode() => clearPlate(DroppedObjectAnimation.Explode);
 
-        public void Explode(DrawablePalpableCatchHitObject caughtObject) => removeFromPlate(caughtObject, DroppedObjectAnimation.Explode);
-
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);
@@ -456,6 +418,7 @@ namespace osu.Game.Rulesets.Catch.UI
         private void placeCaughtObject(PalpableCatchHitObject source)
         {
             var caughtObject = createCaughtObject(source);
+
             if (caughtObject == null) return;
 
             caughtObject.RelativePositionAxes = Axes.None;
@@ -468,10 +431,43 @@ namespace osu.Game.Rulesets.Catch.UI
             caughtObject.LifetimeStart = source.StartTime;
             caughtObject.LifetimeEnd = double.MaxValue;
 
-            PlaceOnPlate(caughtObject);
+            adjustPositionInStack(caughtObject);
+
+            caughtFruitContainer.Add(caughtObject);
+
+            addLighting(caughtObject);
 
             if (!caughtObject.StaysOnPlate)
-                Explode(caughtObject);
+                removeFromPlate(caughtObject, DroppedObjectAnimation.Explode);
+        }
+
+        private void adjustPositionInStack(DrawablePalpableCatchHitObject caughtObject)
+        {
+            const float radius_div_2 = CatchHitObject.OBJECT_RADIUS / 2;
+            const float allowance = 10;
+
+            float caughtObjectRadius = caughtObject.DisplayRadius;
+
+            while (caughtFruitContainer.Any(f => Vector2Extensions.Distance(f.Position, caughtObject.Position) < (caughtObjectRadius + radius_div_2) / (allowance / 2)))
+            {
+                float diff = (caughtObjectRadius + radius_div_2) / allowance;
+
+                caughtObject.X += (RNG.NextSingle() - 0.5f) * diff * 2;
+                caughtObject.Y -= RNG.NextSingle() * diff;
+            }
+
+            caughtObject.X = Math.Clamp(caughtObject.X, -CatcherArea.CATCHER_SIZE / 2, CatcherArea.CATCHER_SIZE / 2);
+        }
+
+        private void addLighting(DrawablePalpableCatchHitObject caughtObject)
+        {
+            if (!hitLighting.Value) return;
+
+            HitExplosion hitExplosion = hitExplosionPool.Get();
+            hitExplosion.X = caughtObject.X;
+            hitExplosion.Scale = new Vector2(caughtObject.HitObject.Scale);
+            hitExplosion.ObjectColour = caughtObject.AccentColour.Value;
+            hitExplosionContainer.Add(hitExplosion);
         }
 
         private DrawablePalpableCatchHitObject createCaughtObject(PalpableCatchHitObject source)

From d3a17b65d52f1eabb6351a9036e983d1970ac5bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Dec 2020 14:36:40 +0900
Subject: [PATCH 06653/10326] Move public methods upwards

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 50 +++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 2b88f24348..2a3447c80a 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -266,24 +266,17 @@ namespace osu.Game.Rulesets.Catch.UI
             }
         }
 
-        private void runHyperDashStateTransition(bool hyperDashing)
+        public void UpdatePosition(float position)
         {
-            updateTrailVisibility();
+            position = Math.Clamp(position, 0, CatchPlayfield.WIDTH);
 
-            if (hyperDashing)
-            {
-                this.FadeColour(hyperDashColour, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-                this.FadeTo(0.2f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-            }
-            else
-            {
-                this.FadeColour(Color4.White, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-                this.FadeTo(1f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-            }
+            if (position == X)
+                return;
+
+            Scale = new Vector2(Math.Abs(Scale.X) * (position > X ? 1 : -1), Scale.Y);
+            X = position;
         }
 
-        private void updateTrailVisibility() => trails.DisplayTrail = Dashing || HyperDashing;
-
         public bool OnPressed(CatchAction action)
         {
             switch (action)
@@ -322,17 +315,6 @@ namespace osu.Game.Rulesets.Catch.UI
             }
         }
 
-        public void UpdatePosition(float position)
-        {
-            position = Math.Clamp(position, 0, CatchPlayfield.WIDTH);
-
-            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>
@@ -343,6 +325,24 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public void Explode() => clearPlate(DroppedObjectAnimation.Explode);
 
+        private void runHyperDashStateTransition(bool hyperDashing)
+        {
+            updateTrailVisibility();
+
+            if (hyperDashing)
+            {
+                this.FadeColour(hyperDashColour, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+                this.FadeTo(0.2f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+            }
+            else
+            {
+                this.FadeColour(Color4.White, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+                this.FadeTo(1f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
+            }
+        }
+
+        private void updateTrailVisibility() => trails.DisplayTrail = Dashing || HyperDashing;
+
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);

From b8c284b34fcfd754451382ab66612c3de5c5f37e Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 4 Dec 2020 00:51:46 -0800
Subject: [PATCH 06654/10326] Fix one more key binding string not being
 sentence cased

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

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index f4a4813b94..1270df5374 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Input.Bindings
         [Description("Select")]
         Select,
 
-        [Description("Quick exit (Hold)")]
+        [Description("Quick exit (hold)")]
         QuickExit,
 
         // Game-wide beatmap music controller keybindings

From a12b04915447d11f43598a81df468e3eba9e8aaa Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 4 Dec 2020 20:11:35 +0900
Subject: [PATCH 06655/10326] Move piece files in Osu ruleset

---
 .../Drawables/Pieces => Skinning/Default}/ApproachCircle.cs       | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/CirclePiece.cs | 0
 .../Drawables/Pieces => Skinning/Default}/DefaultSpinnerDisc.cs   | 0
 .../Drawables/Pieces => Skinning/Default}/DrawableSliderPath.cs   | 0
 .../Drawables/Pieces => Skinning/Default}/ExplodePiece.cs         | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/FlashPiece.cs  | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/GlowPiece.cs   | 0
 .../Drawables/Pieces => Skinning/Default}/MainCirclePiece.cs      | 0
 .../Drawables/Pieces => Skinning/Default}/ManualSliderBody.cs     | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/NumberPiece.cs | 0
 .../Drawables/Pieces => Skinning/Default}/PlaySliderBody.cs       | 0
 .../Drawables/Pieces => Skinning/Default}/ReverseArrowPiece.cs    | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/RingPiece.cs   | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/SliderBall.cs  | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/SliderBody.cs  | 0
 .../Drawables/Pieces => Skinning/Default}/SnakingSliderBody.cs    | 0
 .../Drawables/Pieces => Skinning/Default}/SpinnerBonusDisplay.cs  | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/SpinnerFill.cs | 0
 .../Pieces => Skinning/Default}/SpinnerRotationTracker.cs         | 0
 .../Drawables/Pieces => Skinning/Default}/SpinnerSpmCounter.cs    | 0
 .../Drawables/Pieces => Skinning/Default}/SpinnerTicks.cs         | 0
 .../Drawables/Pieces => Skinning/Default}/TrianglesPiece.cs       | 0
 osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacyCursor.cs       | 0
 osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacyCursorTrail.cs  | 0
 .../Skinning/{ => Legacy}/LegacyMainCirclePiece.cs                | 0
 .../Skinning/{ => Legacy}/LegacyNewStyleSpinner.cs                | 0
 .../Skinning/{ => Legacy}/LegacyOldStyleSpinner.cs                | 0
 osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacySliderBall.cs   | 0
 osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacySliderBody.cs   | 0
 osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacySpinner.cs      | 0
 30 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/ApproachCircle.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/CirclePiece.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/DefaultSpinnerDisc.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/DrawableSliderPath.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/ExplodePiece.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/FlashPiece.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/GlowPiece.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/MainCirclePiece.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/ManualSliderBody.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/NumberPiece.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/PlaySliderBody.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/ReverseArrowPiece.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/RingPiece.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/SliderBall.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/SliderBody.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/SnakingSliderBody.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/SpinnerBonusDisplay.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/SpinnerFill.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/SpinnerRotationTracker.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/SpinnerSpmCounter.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/SpinnerTicks.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables/Pieces => Skinning/Default}/TrianglesPiece.cs (100%)
 rename osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacyCursor.cs (100%)
 rename osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacyCursorTrail.cs (100%)
 rename osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacyMainCirclePiece.cs (100%)
 rename osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacyNewStyleSpinner.cs (100%)
 rename osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacyOldStyleSpinner.cs (100%)
 rename osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacySliderBall.cs (100%)
 rename osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacySliderBody.cs (100%)
 rename osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/LegacySpinner.cs (100%)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ApproachCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ApproachCircle.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ApproachCircle.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/ApproachCircle.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultSpinnerDisc.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DrawableSliderPath.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DrawableSliderPath.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DrawableSliderPath.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/DrawableSliderPath.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ExplodePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/FlashPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/FlashPiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/GlowPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/GlowPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/GlowPiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/GlowPiece.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/MainCirclePiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ManualSliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ManualSliderBody.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ManualSliderBody.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/ManualSliderBody.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/NumberPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/NumberPiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/PlaySliderBody.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ReverseArrowPiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBody.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBody.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SliderBody.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SnakingSliderBody.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SnakingSliderBody.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBonusDisplay.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerFill.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerFill.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerFill.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SpinnerFill.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerRotationTracker.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerTicks.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SpinnerTicks.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/TrianglesPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/TrianglesPiece.cs
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyCursor.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Skinning/LegacyCursor.cs
rename to osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Skinning/LegacyCursorTrail.cs
rename to osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Skinning/LegacyNewStyleSpinner.cs
rename to osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
rename to osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
rename to osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBody.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs
rename to osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBody.cs
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Skinning/LegacySpinner.cs
rename to osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs

From 245be2c5ed0274a25f331b8027f35001171be7b7 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 4 Dec 2020 20:21:53 +0900
Subject: [PATCH 06656/10326] Adjust namespace

---
 .../Mods/TestSceneOsuModSpunOut.cs                       | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs      | 2 +-
 .../TestSceneSliderApplication.cs                        | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs    | 2 +-
 .../Blueprints/HitCircles/Components/HitCirclePiece.cs   | 2 +-
 .../Blueprints/Sliders/Components/SliderBodyPiece.cs     | 2 +-
 .../Edit/Blueprints/Spinners/Components/SpinnerPiece.cs  | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs            | 2 +-
 .../Objects/Drawables/DrawableHitCircle.cs               | 2 +-
 .../Objects/Drawables/DrawableSlider.cs                  | 2 +-
 .../Objects/Drawables/DrawableSliderRepeat.cs            | 2 +-
 .../Objects/Drawables/DrawableSpinner.cs                 | 2 +-
 .../Objects/Drawables/SpinnerBackgroundLayer.cs          | 2 +-
 .../Objects/Drawables/SpinnerCentreLayer.cs              | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Default/ApproachCircle.cs | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs    | 3 ++-
 .../Skinning/Default/DefaultSpinnerDisc.cs               | 4 +++-
 .../Skinning/Default/DrawableSliderPath.cs               | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs   | 3 ++-
 osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs     | 5 +++--
 osu.Game.Rulesets.Osu/Skinning/Default/GlowPiece.cs      | 2 +-
 .../Skinning/Default/MainCirclePiece.cs                  | 4 +++-
 .../Skinning/Default/ManualSliderBody.cs                 | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs    | 6 +++---
 osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs | 5 +++--
 .../Skinning/Default/ReverseArrowPiece.cs                | 9 +++++----
 osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs      | 5 +++--
 osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs     | 9 +++++----
 osu.Game.Rulesets.Osu/Skinning/Default/SliderBody.cs     | 2 +-
 .../Skinning/Default/SnakingSliderBody.cs                | 4 +++-
 .../Skinning/Default/SpinnerBonusDisplay.cs              | 3 ++-
 osu.Game.Rulesets.Osu/Skinning/Default/SpinnerFill.cs    | 2 +-
 .../Skinning/Default/SpinnerRotationTracker.cs           | 3 ++-
 .../Skinning/Default/SpinnerSpmCounter.cs                | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Default/SpinnerTicks.cs   | 6 +++---
 osu.Game.Rulesets.Osu/Skinning/Default/TrianglesPiece.cs | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs    | 4 ++--
 .../Skinning/Legacy/LegacyCursorTrail.cs                 | 2 +-
 .../Skinning/Legacy/LegacyMainCirclePiece.cs             | 2 +-
 .../Skinning/Legacy/LegacyNewStyleSpinner.cs             | 2 +-
 .../Skinning/Legacy/LegacyOldStyleSpinner.cs             | 2 +-
 .../Skinning/Legacy/LegacySliderBall.cs                  | 2 +-
 .../Skinning/Legacy/LegacySliderBody.cs                  | 4 ++--
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs   | 2 +-
 .../Skinning/OsuLegacySkinTransformer.cs                 | 1 +
 45 files changed, 75 insertions(+), 59 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
index 7b909d2907..7df5ca0f7c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index dde02e873b..fefe983f97 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -12,7 +12,7 @@ using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing.Input;
 using osu.Game.Audio;
-using osu.Game.Rulesets.Osu.Skinning;
+using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
index 084af7dafe..aac6db60fe 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
@@ -12,7 +12,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
 using osuTK;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index b71400b71d..e111bb1054 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -19,7 +19,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Storyboards;
 using osuTK;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
index 2868ddeaa4..0cfc67cedb 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
index 5581ce4bfd..1c3d270c95 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osuTK;
 using osuTK.Graphics;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
index 2347d8a34c..92961b40bc 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index b7e60295cb..df0a41455f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index abb51ae420..3c0260f5f5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -12,7 +12,7 @@ using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osuTK;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index af5b609ec8..511cbc2347 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -7,13 +7,13 @@ using JetBrains.Annotations;
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Skinning;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Osu.UI;
 using osuTK.Graphics;
 using osu.Game.Skinning;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index a684df98cb..76490e0de1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index aea37acf6f..1f3bcece0c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -15,8 +15,8 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Osu.Skinning;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerBackgroundLayer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerBackgroundLayer.cs
index 3cd2454706..10a7d33073 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerBackgroundLayer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerBackgroundLayer.cs
@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs
index b62ce822f0..0c38c3a855 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osuTK;
 using osuTK.Graphics;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/ApproachCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ApproachCircle.cs
index 1b474f265c..62f00a2b49 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/ApproachCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/ApproachCircle.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class ApproachCircle : Container
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs
index d0e1055dce..ba41ebd445 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs
@@ -7,9 +7,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class CirclePiece : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
index 14ce3b014d..667fee1495 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
@@ -10,10 +10,12 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class DefaultSpinnerDisc : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DrawableSliderPath.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DrawableSliderPath.cs
index c31d6beb01..db077f009d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DrawableSliderPath.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DrawableSliderPath.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics.Lines;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public abstract class DrawableSliderPath : SmoothPath
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs
index 09299a3622..510ed225a8 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs
@@ -5,9 +5,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class ExplodePiece : Container
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs
index 038a2299e9..06ee64d8b3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs
@@ -3,10 +3,11 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osuTK;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class FlashPiece : Container
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/GlowPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/GlowPiece.cs
index 30937313fd..f5e01b802e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/GlowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/GlowPiece.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class GlowPiece : Container
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
index 102166f8dd..fcbe4c1b28 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
@@ -6,10 +6,12 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class MainCirclePiece : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/ManualSliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ManualSliderBody.cs
index d69df1d5c2..d73c94eb9b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/ManualSliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/ManualSliderBody.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     /// <summary>
     /// A <see cref="SliderBody"/> with the ability to set the drawn vertices manually.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs
index 7c94568835..bea6186501 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs
@@ -5,12 +5,12 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
-using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Skinning;
+using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class NumberPiece : Container
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index 29dff53f54..e77c93c721 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -5,11 +5,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Configuration;
-using osu.Game.Rulesets.Osu.Skinning;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public abstract class PlaySliderBody : SnakingSliderBody
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
index ae43006e76..0009ffc586 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
@@ -1,17 +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.Audio.Track;
 using osu.Framework.Graphics;
-using osuTK;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
-using osu.Game.Skinning;
-using osu.Framework.Allocation;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Skinning;
+using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class ReverseArrowPiece : BeatSyncedContainer
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
index 619fea73bc..7f10a7bf56 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
@@ -3,11 +3,12 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Graphics.Shapes;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class RingPiece : CircularContainer
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
index ca5ca7ac59..a96beb66d4 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
@@ -10,15 +10,16 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Osu.Skinning;
-using osuTK.Graphics;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
-using osu.Game.Graphics;
+using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class SliderBall : CircularContainer, ISliderProgress, IRequireHighFrequencyMousePosition, IHasAccentColour
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBody.cs
index 8758a4a066..7e6df759f8 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBody.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics.Lines;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public abstract class SliderBody : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SnakingSliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SnakingSliderBody.cs
index 8835a0d84a..ed4e04184b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SnakingSliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SnakingSliderBody.cs
@@ -8,9 +8,11 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     /// <summary>
     /// A <see cref="SliderBody"/> which changes its curve depending on the snaking progress.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs
index f483bb1b26..c0db6228ef 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs
@@ -5,8 +5,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Osu.Objects;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     /// <summary>
     /// Shows incremental bonus score achieved for a spinner.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerFill.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerFill.cs
index 043bc5618c..f574ae589e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerFill.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerFill.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class SpinnerFill : CircularContainer, IHasAccentColour
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index f82003edb8..9393a589eb 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -9,10 +9,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Screens.Play;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class SpinnerRotationTracker : CircularContainer
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
index 80ab03c45c..e5952ecf97 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
@@ -10,7 +10,7 @@ using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class SpinnerSpmCounter : Container
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerTicks.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerTicks.cs
index ba7e8eae6f..e518ae1da8 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerTicks.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerTicks.cs
@@ -7,12 +7,12 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
-using osuTK;
-using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osuTK;
+using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class SpinnerTicks : Container, IHasAccentColour
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/TrianglesPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/TrianglesPiece.cs
index 53dc7ecea3..fa23c60d57 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/TrianglesPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/TrianglesPiece.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Graphics.Backgrounds;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class TrianglesPiece : Triangles
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
index e96bd29ad5..314139d02a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
@@ -3,11 +3,11 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Skinning;
 using osu.Game.Rulesets.Osu.UI.Cursor;
+using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Skinning
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public class LegacyCursor : OsuCursorSprite
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
index e6cd7bc59d..f18d3191ca 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
@@ -10,7 +10,7 @@ using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Skinning;
 
-namespace osu.Game.Rulesets.Osu.Skinning
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public class LegacyCursorTrail : CursorTrail
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 21af9a479e..545e80a709 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -17,7 +17,7 @@ using osuTK;
 using osuTK.Graphics;
 using static osu.Game.Skinning.LegacySkinConfiguration;
 
-namespace osu.Game.Rulesets.Osu.Skinning
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public class LegacyMainCirclePiece : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
index 05f4c8e307..efeca53969 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
@@ -13,7 +13,7 @@ using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Skinning
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     /// <summary>
     /// Legacy skinned spinner with two main spinning layers, one fixed overlay and one final spinning overlay.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
index fba802f085..4e07cb60b3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Skinning
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     /// <summary>
     /// Legacy skinned spinner with one main spinning layer and a background layer.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 836069013d..1a8c5ada1b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Skinning
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public class LegacySliderBall : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBody.cs
index aad8b189d9..744ded37c9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBody.cs
@@ -5,10 +5,10 @@ using System;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Skinning
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public class LegacySliderBody : PlaySliderBody
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 5aa136cf7e..ec7ecb0d28 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -12,7 +12,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Skinning
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public abstract class LegacySpinner : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 78bc26eff7..70abfa1ac9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Skinning;
 using osuTK;
 

From 626956febdeb3505b91b4aab168f013c1f15060e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 4 Dec 2020 20:25:12 +0900
Subject: [PATCH 06657/10326] Move some files from Drawables to
 Skinning.Default namespace

---
 .../Drawables => Skinning/Default}/SpinnerBackgroundLayer.cs      | 0
 .../{Objects/Drawables => Skinning/Default}/SpinnerCentreLayer.cs | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables => Skinning/Default}/SpinnerBackgroundLayer.cs (100%)
 rename osu.Game.Rulesets.Osu/{Objects/Drawables => Skinning/Default}/SpinnerCentreLayer.cs (100%)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerBackgroundLayer.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBackgroundLayer.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerBackgroundLayer.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBackgroundLayer.cs
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerCentreLayer.cs
similarity index 100%
rename from osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerCentreLayer.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SpinnerCentreLayer.cs

From 0ed9989a8203bde71733773bb43e79399b28cd03 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 4 Dec 2020 20:25:49 +0900
Subject: [PATCH 06658/10326] Adjust namespace

---
 .../Skinning/Default/SpinnerBackgroundLayer.cs                | 3 +--
 osu.Game.Rulesets.Osu/Skinning/Default/SpinnerCentreLayer.cs  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBackgroundLayer.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBackgroundLayer.cs
index 10a7d33073..f8a6e1d3c9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBackgroundLayer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBackgroundLayer.cs
@@ -5,9 +5,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Skinning.Default;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class SpinnerBackgroundLayer : SpinnerFill
     {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerCentreLayer.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerCentreLayer.cs
index 0c38c3a855..67b5ed5410 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerCentreLayer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerCentreLayer.cs
@@ -9,11 +9,11 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Skinning.Default;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Objects.Drawables
+namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class SpinnerCentreLayer : CompositeDrawable, IHasAccentColour
     {

From 7c0edb796ee352cbc96950e152d7308dade7e1f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Dec 2020 20:49:18 +0900
Subject: [PATCH 06659/10326] Always confine mouse to screen when running
 fullscreen

---
 osu.Game/Input/ConfineMouseTracker.cs | 15 +++++++++++----
 osu.Game/Input/OsuConfineMouseMode.cs |  5 -----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Input/ConfineMouseTracker.cs b/osu.Game/Input/ConfineMouseTracker.cs
index 3dadae6317..75d9c8debb 100644
--- a/osu.Game/Input/ConfineMouseTracker.cs
+++ b/osu.Game/Input/ConfineMouseTracker.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Input
     public class ConfineMouseTracker : Component
     {
         private Bindable<ConfineMouseMode> frameworkConfineMode;
+        private Bindable<WindowMode> frameworkWindowMode;
+
         private Bindable<OsuConfineMouseMode> osuConfineMode;
         private IBindable<bool> localUserPlaying;
 
@@ -25,6 +27,9 @@ namespace osu.Game.Input
         private void load(OsuGame game, FrameworkConfigManager frameworkConfigManager, OsuConfigManager osuConfigManager)
         {
             frameworkConfineMode = frameworkConfigManager.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode);
+            frameworkWindowMode = frameworkConfigManager.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            frameworkWindowMode.BindValueChanged(_ => updateConfineMode());
+
             osuConfineMode = osuConfigManager.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode);
             localUserPlaying = game.LocalUserPlaying.GetBoundCopy();
 
@@ -38,16 +43,18 @@ namespace osu.Game.Input
             if (frameworkConfineMode.Disabled)
                 return;
 
+            if (frameworkWindowMode.Value == WindowMode.Fullscreen)
+            {
+                frameworkConfineMode.Value = ConfineMouseMode.Fullscreen;
+                return;
+            }
+
             switch (osuConfineMode.Value)
             {
                 case OsuConfineMouseMode.Never:
                     frameworkConfineMode.Value = ConfineMouseMode.Never;
                     break;
 
-                case OsuConfineMouseMode.Fullscreen:
-                    frameworkConfineMode.Value = ConfineMouseMode.Fullscreen;
-                    break;
-
                 case OsuConfineMouseMode.DuringGameplay:
                     frameworkConfineMode.Value = localUserPlaying.Value ? ConfineMouseMode.Always : ConfineMouseMode.Never;
                     break;
diff --git a/osu.Game/Input/OsuConfineMouseMode.cs b/osu.Game/Input/OsuConfineMouseMode.cs
index 32b456395c..a4a1c9eb46 100644
--- a/osu.Game/Input/OsuConfineMouseMode.cs
+++ b/osu.Game/Input/OsuConfineMouseMode.cs
@@ -17,11 +17,6 @@ namespace osu.Game.Input
         /// </summary>
         Never,
 
-        /// <summary>
-        /// The mouse cursor will be locked to the window bounds while in fullscreen mode.
-        /// </summary>
-        Fullscreen,
-
         /// <summary>
         /// The mouse cursor will be locked to the window bounds during gameplay,
         /// but may otherwise move freely.

From 7104230ae3645392e051e1b998fb6c4bb809aabb Mon Sep 17 00:00:00 2001
From: MATRIX-feather <midnightcarnival@outlook.com>
Date: Fri, 4 Dec 2020 19:52:25 +0800
Subject: [PATCH 06660/10326] Add "onCurrentDirectoryChanged"

---
 osu.Game/Screens/Import/FileImportScreen.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 9af87887b2..e2e2b699f5 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -126,15 +126,17 @@ namespace osu.Game.Screens.Import
             fileNameScroll.ScrollContent.Origin = Anchor.Centre;
 
             currentFile.BindValueChanged(updateFileSelectionText, true);
-            currentDirectory.BindValueChanged(_ =>
-            {
-                currentFile.Value = null;
-            });
+            currentDirectory.BindValueChanged(onCurrentDirectoryChanged);
 
             currentDirectory.BindTo(fileSelector.CurrentPath);
             currentFile.BindTo(fileSelector.CurrentFile);
         }
 
+        private void onCurrentDirectoryChanged(ValueChangedEvent<DirectoryInfo> v)
+        {
+            currentFile.Value = null;
+        }
+
         private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)
         {
             currentFileText.Text = v.NewValue?.Name ?? "Select a file";

From 825120fed3b3111b3dcd836a7ef18e4716160515 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 4 Dec 2020 18:49:01 +0100
Subject: [PATCH 06661/10326] Display import state in a notification.

---
 osu.Game/Database/ArchiveModelManager.cs | 37 +++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 9a7aa7b039..7b59726cd0 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -218,7 +218,42 @@ namespace osu.Game.Database
         /// <param name="stream">The stream to import files from.</param>
         /// <param name="filename">The filename of the archive being imported.</param>
         public async Task Import(Stream stream, string filename)
-            => await Import(new ZipArchiveReader(stream, filename)); // we need to keep around the filename as some model managers (namely SkinManager) use the archive name to populate skin info
+        {
+            var notification = new ProgressNotification
+            {
+                Progress = 0,
+                State = ProgressNotificationState.Active,
+                Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import is initialising...",
+            };
+
+            PostNotification.Invoke(notification);
+
+            try
+            {
+                // we need to keep around the filename as some model managers (namely SkinManager) use the archive name to populate skin info
+                var imported = await Import(new ZipArchiveReader(stream, filename), notification.CancellationToken);
+
+                notification.CompletionText = $"Imported {imported}! Click to view.";
+                notification.CompletionClickAction += () =>
+                {
+                    PresentImport?.Invoke(new[] { imported });
+                    return true;
+                };
+                notification.State = ProgressNotificationState.Completed;
+            }
+            catch (TaskCanceledException)
+            {
+                throw;
+            }
+            catch (Exception e)
+            {
+                notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import failed!";
+                notification.State = ProgressNotificationState.Cancelled;
+                Logger.Error(e, $@"Could not import ({filename})", LoggingTarget.Database);
+            }
+
+            return;
+        }
 
         /// <summary>
         /// Fired when the user requests to view the resulting import.

From dd21de0cd526fb81c4d80beea034e343744a740a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 4 Dec 2020 22:07:45 +0100
Subject: [PATCH 06662/10326] Fix code inspections.

---
 osu.Android/OsuGameActivity.cs           | 4 ++--
 osu.Game/Database/ArchiveModelManager.cs | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index c41323b97f..2b25c37d58 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -12,7 +12,6 @@ using osu.Framework.Android;
 
 namespace osu.Android
 {
-
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
     [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
@@ -44,8 +43,9 @@ namespace osu.Android
                 var stream = ContentResolver.OpenInputStream(intent.Data);
                 if (stream != null)
                     // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
-                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, filename))); 
+                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, filename)));
             }
+
             base.OnNewIntent(intent);
         }
     }
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 7b59726cd0..f4208671d7 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -251,8 +251,6 @@ namespace osu.Game.Database
                 notification.State = ProgressNotificationState.Cancelled;
                 Logger.Error(e, $@"Could not import ({filename})", LoggingTarget.Database);
             }
-
-            return;
         }
 
         /// <summary>

From 280abdc473e8bd5e512c1456b906d757e98d6345 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 5 Dec 2020 11:50:08 +0100
Subject: [PATCH 06663/10326] Use ContentResolver for getting filename.

---
 osu.Android/OsuGameActivity.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 2b25c37d58..917a39148d 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Linq;
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
 using Android.OS;
+using Android.Provider;
 using Android.Views;
 using osu.Framework.Android;
 
@@ -39,11 +39,14 @@ namespace osu.Android
         {
             if (intent.Action == Intent.ActionView)
             {
-                var filename = intent.Data.Path.Split('/').Last();
+                var cursor = ContentResolver.Query(intent.Data, null, null, null);
+                var filename_column = cursor.GetColumnIndex(OpenableColumns.DisplayName);
+                cursor.MoveToFirst();
+
                 var stream = ContentResolver.OpenInputStream(intent.Data);
                 if (stream != null)
                     // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
-                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, filename)));
+                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, cursor.GetString(filename_column))));
             }
 
             base.OnNewIntent(intent);

From 0a745144e398c897d31293e12b0e0cc1befd9545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 5 Dec 2020 13:11:52 +0100
Subject: [PATCH 06664/10326] Disable confine mode dropdown when full-screen

After hard-locking the mouse confine mode to `Always` in full-screen to
prevent confine issues from popping up, the confine mode dropdown in
settings had confusing UX due to seemingly having no effect when
full-screen.
---
 osu.Game/Input/ConfineMouseTracker.cs | 31 ++++++++++++++++++---------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Input/ConfineMouseTracker.cs b/osu.Game/Input/ConfineMouseTracker.cs
index 75d9c8debb..739bfaadab 100644
--- a/osu.Game/Input/ConfineMouseTracker.cs
+++ b/osu.Game/Input/ConfineMouseTracker.cs
@@ -28,27 +28,38 @@ namespace osu.Game.Input
         {
             frameworkConfineMode = frameworkConfigManager.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode);
             frameworkWindowMode = frameworkConfigManager.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            frameworkWindowMode.BindValueChanged(_ => updateConfineMode());
+            frameworkWindowMode.BindValueChanged(_ => updateGameConfineMode());
 
             osuConfineMode = osuConfigManager.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode);
             localUserPlaying = game.LocalUserPlaying.GetBoundCopy();
 
-            osuConfineMode.ValueChanged += _ => updateConfineMode();
-            localUserPlaying.BindValueChanged(_ => updateConfineMode(), true);
+            osuConfineMode.ValueChanged += _ => updateFrameworkConfineMode();
+            localUserPlaying.BindValueChanged(_ => updateFrameworkConfineMode(), true);
         }
 
-        private void updateConfineMode()
+        private LeasedBindable<OsuConfineMouseMode> leasedOsuConfineMode;
+
+        private void updateGameConfineMode()
+        {
+            if (frameworkWindowMode.Value == WindowMode.Fullscreen && leasedOsuConfineMode == null)
+            {
+                leasedOsuConfineMode = osuConfineMode.BeginLease(true);
+                leasedOsuConfineMode.Value = OsuConfineMouseMode.Always;
+            }
+
+            if (frameworkWindowMode.Value != WindowMode.Fullscreen && leasedOsuConfineMode != null)
+            {
+                leasedOsuConfineMode.Return();
+                leasedOsuConfineMode = null;
+            }
+        }
+
+        private void updateFrameworkConfineMode()
         {
             // confine mode is unavailable on some platforms
             if (frameworkConfineMode.Disabled)
                 return;
 
-            if (frameworkWindowMode.Value == WindowMode.Fullscreen)
-            {
-                frameworkConfineMode.Value = ConfineMouseMode.Fullscreen;
-                return;
-            }
-
             switch (osuConfineMode.Value)
             {
                 case OsuConfineMouseMode.Never:

From 15ce7bacf1fcc319916f9365643f5ef1e73f26d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 5 Dec 2020 14:12:15 +0100
Subject: [PATCH 06665/10326] Add test coverage for confine functionality

Due to growing levels of complexity around confine logic.
---
 .../Input/ConfineMouseTrackerTest.cs          | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 osu.Game.Tests/Input/ConfineMouseTrackerTest.cs

diff --git a/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs b/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
new file mode 100644
index 0000000000..42f5209643
--- /dev/null
+++ b/osu.Game.Tests/Input/ConfineMouseTrackerTest.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Input;
+using osu.Framework.Testing;
+using osu.Game.Configuration;
+using osu.Game.Input;
+using osu.Game.Tests.Visual.Navigation;
+
+namespace osu.Game.Tests.Input
+{
+    [HeadlessTest]
+    public class ConfineMouseTrackerTest : OsuGameTestScene
+    {
+        [Resolved]
+        private FrameworkConfigManager frameworkConfigManager { get; set; }
+
+        [Resolved]
+        private OsuConfigManager osuConfigManager { get; set; }
+
+        [TestCase(WindowMode.Windowed)]
+        [TestCase(WindowMode.Borderless)]
+        public void TestDisableConfining(WindowMode windowMode)
+        {
+            setWindowModeTo(windowMode);
+            setGameSideModeTo(OsuConfineMouseMode.Never);
+
+            gameSideConfineModeDisabled(false);
+
+            setLocalUserPlayingTo(false);
+            frameworkSideModeIs(ConfineMouseMode.Never);
+
+            setLocalUserPlayingTo(true);
+            frameworkSideModeIs(ConfineMouseMode.Never);
+        }
+
+        [TestCase(WindowMode.Windowed)]
+        [TestCase(WindowMode.Borderless)]
+        public void TestConfiningDuringGameplay(WindowMode windowMode)
+        {
+            setWindowModeTo(windowMode);
+            setGameSideModeTo(OsuConfineMouseMode.DuringGameplay);
+
+            gameSideConfineModeDisabled(false);
+
+            setLocalUserPlayingTo(false);
+            frameworkSideModeIs(ConfineMouseMode.Never);
+
+            setLocalUserPlayingTo(true);
+            frameworkSideModeIs(ConfineMouseMode.Always);
+        }
+
+        [TestCase(WindowMode.Windowed)]
+        [TestCase(WindowMode.Borderless)]
+        public void TestConfineAlwaysUserSetting(WindowMode windowMode)
+        {
+            setWindowModeTo(windowMode);
+            setGameSideModeTo(OsuConfineMouseMode.Always);
+
+            gameSideConfineModeDisabled(false);
+
+            setLocalUserPlayingTo(false);
+            frameworkSideModeIs(ConfineMouseMode.Always);
+
+            setLocalUserPlayingTo(true);
+            frameworkSideModeIs(ConfineMouseMode.Always);
+        }
+
+        [Test]
+        public void TestConfineAlwaysInFullscreen()
+        {
+            setGameSideModeTo(OsuConfineMouseMode.Never);
+
+            setWindowModeTo(WindowMode.Fullscreen);
+            gameSideConfineModeDisabled(true);
+
+            setLocalUserPlayingTo(false);
+            frameworkSideModeIs(ConfineMouseMode.Always);
+
+            setLocalUserPlayingTo(true);
+            frameworkSideModeIs(ConfineMouseMode.Always);
+
+            setWindowModeTo(WindowMode.Windowed);
+
+            // old state is restored
+            gameSideModeIs(OsuConfineMouseMode.Never);
+            frameworkSideModeIs(ConfineMouseMode.Never);
+            gameSideConfineModeDisabled(false);
+        }
+
+        private void setWindowModeTo(WindowMode mode)
+            // needs to go through .GetBindable().Value instead of .Set() due to default overrides
+            => AddStep($"make window {mode}", () => frameworkConfigManager.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = mode);
+
+        private void setGameSideModeTo(OsuConfineMouseMode mode)
+            => AddStep($"set {mode} game-side", () => Game.LocalConfig.Set(OsuSetting.ConfineMouseMode, mode));
+
+        private void setLocalUserPlayingTo(bool playing)
+            => AddStep($"local user {(playing ? "playing" : "not playing")}", () => Game.LocalUserPlaying.Value = playing);
+
+        private void gameSideModeIs(OsuConfineMouseMode mode)
+            => AddAssert($"mode is {mode} game-side", () => Game.LocalConfig.Get<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode) == mode);
+
+        private void frameworkSideModeIs(ConfineMouseMode mode)
+            => AddAssert($"mode is {mode} framework-side", () => frameworkConfigManager.Get<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode) == mode);
+
+        private void gameSideConfineModeDisabled(bool disabled)
+            => AddAssert($"game-side confine mode {(disabled ? "disabled" : "enabled")}",
+                () => Game.LocalConfig.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode).Disabled == disabled);
+    }
+}

From 0266410368a9ed8c62265ac67a21f8ef7e7d6593 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 5 Dec 2020 18:30:40 +0100
Subject: [PATCH 06666/10326] Allow importing files through the android share
 sheet.

---
 osu.Android/OsuGameActivity.cs | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 917a39148d..b331f3d734 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
+using Android.Net;
 using Android.OS;
 using Android.Provider;
 using Android.Views;
@@ -13,7 +14,7 @@ using osu.Framework.Android;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
-    [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
         private OsuGameAndroid game;
@@ -37,19 +38,29 @@ namespace osu.Android
 
         protected override void OnNewIntent(Intent intent)
         {
-            if (intent.Action == Intent.ActionView)
+            if (intent.Action == Intent.ActionDefault)
             {
-                var cursor = ContentResolver.Query(intent.Data, null, null, null);
-                var filename_column = cursor.GetColumnIndex(OpenableColumns.DisplayName);
-                cursor.MoveToFirst();
-
-                var stream = ContentResolver.OpenInputStream(intent.Data);
-                if (stream != null)
-                    // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
-                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, cursor.GetString(filename_column))));
+                if (intent.Scheme == ContentResolver.SchemeContent)
+                        handleImportFromUri(intent.Data);
             }
 
-            base.OnNewIntent(intent);
+            if (intent.Action == Intent.ActionSend)
+            {
+                var content = intent.ClipData.GetItemAt(0);
+                handleImportFromUri(content.Uri);
+            }
+        }
+
+        private void handleImportFromUri(Uri uri)
+        {
+            var cursor = ContentResolver.Query(uri, null, null, null);
+            var filename_column = cursor.GetColumnIndex(OpenableColumns.DisplayName);
+            cursor.MoveToFirst();
+
+            var stream = ContentResolver.OpenInputStream(uri);
+            if (stream != null)
+                // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
+                game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, cursor.GetString(filename_column))));
         }
     }
 }

From 08f23cc4249694f0a86aecf6eac545b5027e1796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 5 Dec 2020 22:07:39 +0100
Subject: [PATCH 06667/10326] Revert leasing logic

---
 .../Input/ConfineMouseTrackerTest.cs          | 16 ++--------
 osu.Game/Input/ConfineMouseTracker.cs         | 31 ++++++-------------
 2 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs b/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
index 42f5209643..b90382488f 100644
--- a/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
+++ b/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
@@ -28,8 +28,6 @@ namespace osu.Game.Tests.Input
             setWindowModeTo(windowMode);
             setGameSideModeTo(OsuConfineMouseMode.Never);
 
-            gameSideConfineModeDisabled(false);
-
             setLocalUserPlayingTo(false);
             frameworkSideModeIs(ConfineMouseMode.Never);
 
@@ -44,8 +42,6 @@ namespace osu.Game.Tests.Input
             setWindowModeTo(windowMode);
             setGameSideModeTo(OsuConfineMouseMode.DuringGameplay);
 
-            gameSideConfineModeDisabled(false);
-
             setLocalUserPlayingTo(false);
             frameworkSideModeIs(ConfineMouseMode.Never);
 
@@ -60,8 +56,6 @@ namespace osu.Game.Tests.Input
             setWindowModeTo(windowMode);
             setGameSideModeTo(OsuConfineMouseMode.Always);
 
-            gameSideConfineModeDisabled(false);
-
             setLocalUserPlayingTo(false);
             frameworkSideModeIs(ConfineMouseMode.Always);
 
@@ -75,20 +69,18 @@ namespace osu.Game.Tests.Input
             setGameSideModeTo(OsuConfineMouseMode.Never);
 
             setWindowModeTo(WindowMode.Fullscreen);
-            gameSideConfineModeDisabled(true);
 
             setLocalUserPlayingTo(false);
-            frameworkSideModeIs(ConfineMouseMode.Always);
+            frameworkSideModeIs(ConfineMouseMode.Fullscreen);
 
             setLocalUserPlayingTo(true);
-            frameworkSideModeIs(ConfineMouseMode.Always);
+            frameworkSideModeIs(ConfineMouseMode.Fullscreen);
 
             setWindowModeTo(WindowMode.Windowed);
 
             // old state is restored
             gameSideModeIs(OsuConfineMouseMode.Never);
             frameworkSideModeIs(ConfineMouseMode.Never);
-            gameSideConfineModeDisabled(false);
         }
 
         private void setWindowModeTo(WindowMode mode)
@@ -106,9 +98,5 @@ namespace osu.Game.Tests.Input
 
         private void frameworkSideModeIs(ConfineMouseMode mode)
             => AddAssert($"mode is {mode} framework-side", () => frameworkConfigManager.Get<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode) == mode);
-
-        private void gameSideConfineModeDisabled(bool disabled)
-            => AddAssert($"game-side confine mode {(disabled ? "disabled" : "enabled")}",
-                () => Game.LocalConfig.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode).Disabled == disabled);
     }
 }
diff --git a/osu.Game/Input/ConfineMouseTracker.cs b/osu.Game/Input/ConfineMouseTracker.cs
index 739bfaadab..75d9c8debb 100644
--- a/osu.Game/Input/ConfineMouseTracker.cs
+++ b/osu.Game/Input/ConfineMouseTracker.cs
@@ -28,38 +28,27 @@ namespace osu.Game.Input
         {
             frameworkConfineMode = frameworkConfigManager.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode);
             frameworkWindowMode = frameworkConfigManager.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            frameworkWindowMode.BindValueChanged(_ => updateGameConfineMode());
+            frameworkWindowMode.BindValueChanged(_ => updateConfineMode());
 
             osuConfineMode = osuConfigManager.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode);
             localUserPlaying = game.LocalUserPlaying.GetBoundCopy();
 
-            osuConfineMode.ValueChanged += _ => updateFrameworkConfineMode();
-            localUserPlaying.BindValueChanged(_ => updateFrameworkConfineMode(), true);
+            osuConfineMode.ValueChanged += _ => updateConfineMode();
+            localUserPlaying.BindValueChanged(_ => updateConfineMode(), true);
         }
 
-        private LeasedBindable<OsuConfineMouseMode> leasedOsuConfineMode;
-
-        private void updateGameConfineMode()
-        {
-            if (frameworkWindowMode.Value == WindowMode.Fullscreen && leasedOsuConfineMode == null)
-            {
-                leasedOsuConfineMode = osuConfineMode.BeginLease(true);
-                leasedOsuConfineMode.Value = OsuConfineMouseMode.Always;
-            }
-
-            if (frameworkWindowMode.Value != WindowMode.Fullscreen && leasedOsuConfineMode != null)
-            {
-                leasedOsuConfineMode.Return();
-                leasedOsuConfineMode = null;
-            }
-        }
-
-        private void updateFrameworkConfineMode()
+        private void updateConfineMode()
         {
             // confine mode is unavailable on some platforms
             if (frameworkConfineMode.Disabled)
                 return;
 
+            if (frameworkWindowMode.Value == WindowMode.Fullscreen)
+            {
+                frameworkConfineMode.Value = ConfineMouseMode.Fullscreen;
+                return;
+            }
+
             switch (osuConfineMode.Value)
             {
                 case OsuConfineMouseMode.Never:

From 71edada623d017be357d397f495d87ca6babd933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 5 Dec 2020 22:13:51 +0100
Subject: [PATCH 06668/10326] Hide confine setting entirely in fullscreen

---
 .../Overlays/Settings/Sections/Input/MouseSettings.cs     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index b54ad9a641..ec0ce08004 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -20,6 +20,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private Bindable<double> sensitivityBindable = new BindableDouble();
         private Bindable<string> ignoredInputHandlers;
 
+        private Bindable<WindowMode> windowMode;
+        private SettingsEnumDropdown<OsuConfineMouseMode> confineMouseModeSetting;
+
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
         {
@@ -30,6 +33,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             configSensitivity.BindValueChanged(val => sensitivityBindable.Value = val.NewValue);
             sensitivityBindable.BindValueChanged(val => configSensitivity.Value = val.NewValue);
 
+            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            windowMode.BindValueChanged(mode => confineMouseModeSetting.Alpha = mode.NewValue == WindowMode.Fullscreen ? 0 : 1);
+
             Children = new Drawable[]
             {
                 new SettingsCheckbox
@@ -47,7 +53,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     LabelText = "Map absolute input to window",
                     Current = config.GetBindable<bool>(FrameworkSetting.MapAbsoluteInputToWindow)
                 },
-                new SettingsEnumDropdown<OsuConfineMouseMode>
+                confineMouseModeSetting = new SettingsEnumDropdown<OsuConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor to window",
                     Current = osuConfig.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode)

From 2ea8b105d51a42491b7663c2f5b6c01d6a467843 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 5 Dec 2020 20:42:07 +0100
Subject: [PATCH 06669/10326] Apply review suggestions

---
 osu.Android/OsuGameActivity.cs | 11 ++++-------
 osu.Android/OsuGameAndroid.cs  |  9 +++++++++
 osu.Game/OsuGame.cs            |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index b331f3d734..a56206c969 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.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.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
@@ -38,10 +37,9 @@ namespace osu.Android
 
         protected override void OnNewIntent(Intent intent)
         {
-            if (intent.Action == Intent.ActionDefault)
+            if (intent.Action == Intent.ActionDefault && intent.Scheme == ContentResolver.SchemeContent)
             {
-                if (intent.Scheme == ContentResolver.SchemeContent)
-                        handleImportFromUri(intent.Data);
+                handleImportFromUri(intent.Data);
             }
 
             if (intent.Action == Intent.ActionSend)
@@ -53,14 +51,13 @@ namespace osu.Android
 
         private void handleImportFromUri(Uri uri)
         {
-            var cursor = ContentResolver.Query(uri, null, null, null);
+            var cursor = ContentResolver.Query(uri, new[] { OpenableColumns.DisplayName }, null, null);
             var filename_column = cursor.GetColumnIndex(OpenableColumns.DisplayName);
             cursor.MoveToFirst();
 
             var stream = ContentResolver.OpenInputStream(uri);
             if (stream != null)
-                // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
-                game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, cursor.GetString(filename_column))));
+                game.ScheduleImport(stream, cursor.GetString(filename_column));
         }
     }
 }
diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 21d6336b2c..81945ee083 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.IO;
+using System.Threading.Tasks;
 using Android.App;
 using Android.OS;
 using osu.Framework.Allocation;
@@ -65,6 +67,13 @@ namespace osu.Android
             }
         }
 
+        /// <summary>
+        /// Schedules a file to be imported once the game is loaded.
+        /// </summary>
+        /// <param name="stream">A stream to the file to import.</param>
+        /// <param name="filename">The filename of the file to import.</param>
+        public void ScheduleImport(Stream stream, string filename) => WaitForReady(() => this, _ => Task.Run(() => Import(stream, filename)));
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5b6b90fba5..2c1db67d24 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -483,7 +483,7 @@ namespace osu.Game
         /// <param name="retrieveInstance">A function to retrieve a (potentially not-yet-constructed) target instance.</param>
         /// <param name="action">The action to perform on the instance when load is confirmed.</param>
         /// <typeparam name="T">The type of the target instance.</typeparam>
-        public void WaitForReady<T>(Func<T> retrieveInstance, Action<T> action)
+        protected void WaitForReady<T>(Func<T> retrieveInstance, Action<T> action)
             where T : Drawable
         {
             var instance = retrieveInstance();

From f6d15b975704c8358fa4eda4c8cbec19597aa252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 6 Dec 2020 18:59:38 +0100
Subject: [PATCH 06670/10326] Invert back-to-front logic

---
 osu.Game/Skinning/PoolableSkinnableSample.cs | 2 +-
 osu.Game/Skinning/SkinnableSound.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index a59fcfea27..cc6b85a13e 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Skinning
             sampleContainer.Add(Sample = new DrawableSample(ch) { Looping = Looping });
 
             // Start playback internally for the new sample if the previous one was playing beforehand.
-            if (wasPlaying && !Looping)
+            if (wasPlaying && Looping)
                 Play();
         }
 
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 166f005473..645c08cd00 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Skinning
                 samplesContainer.Add(sample);
             }
 
-            if (wasPlaying && !Looping)
+            if (wasPlaying && Looping)
                 Play();
         }
 

From 0f9b38da081bc95eb7bdcc393df928f19457f036 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 6 Dec 2020 11:35:14 -0800
Subject: [PATCH 06671/10326] Add fade in/out animations to mod settings
 container

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs     |  4 ++--
 osu.Game/Overlays/Mods/ModSettingsContainer.cs | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 31adf47456..12da718ab2 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -237,7 +237,7 @@ namespace osu.Game.Overlays.Mods
                                             {
                                                 Width = 180,
                                                 Text = "Customisation",
-                                                Action = () => ModSettingsContainer.Alpha = ModSettingsContainer.Alpha == 1 ? 0 : 1,
+                                                Action = () => ModSettingsContainer.ToggleVisibility(),
                                                 Enabled = { Value = false },
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
@@ -430,7 +430,7 @@ namespace osu.Game.Overlays.Mods
 
                 DeselectTypes(selectedMod.IncompatibleMods, true);
 
-                if (selectedMod.RequiresConfiguration) ModSettingsContainer.Alpha = 1;
+                if (selectedMod.RequiresConfiguration) ModSettingsContainer.Show();
             }
             else
             {
diff --git a/osu.Game/Overlays/Mods/ModSettingsContainer.cs b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
index b185b56ecd..a1d00f91b4 100644
--- a/osu.Game/Overlays/Mods/ModSettingsContainer.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class ModSettingsContainer : Container
+    public class ModSettingsContainer : VisibilityContainer
     {
         public readonly IBindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
@@ -27,6 +27,8 @@ namespace osu.Game.Overlays.Mods
 
         private readonly FillFlowContainer<ModControlSection> modSettingsContent;
 
+        private const double transition_duration = 200;
+
         public ModSettingsContainer()
         {
             Children = new Drawable[]
@@ -80,5 +82,15 @@ namespace osu.Game.Overlays.Mods
 
         protected override bool OnMouseDown(MouseDownEvent e) => true;
         protected override bool OnHover(HoverEvent e) => true;
+
+        protected override void PopIn()
+        {
+            this.FadeIn(transition_duration, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            this.FadeOut(transition_duration, Easing.OutQuint);
+        }
     }
 }

From 15e0ea332b85ddd23823909f1fba32d5e21829a6 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 6 Dec 2020 13:18:19 -0800
Subject: [PATCH 06672/10326] Check state instead of alpha in tests

---
 .../Visual/UserInterface/TestSceneModSettings.cs     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 645b83758c..8614700b15 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("button enabled", () => modSelect.CustomiseButton.Enabled.Value);
             AddStep("open Customisation", () => modSelect.CustomiseButton.Click());
             AddStep("deselect mod", () => modSelect.SelectMod(testCustomisableMod));
-            AddAssert("controls hidden", () => modSelect.ModSettingsContainer.Alpha == 0);
+            AddAssert("controls hidden", () => modSelect.ModSettingsContainer.State.Value == Visibility.Hidden);
         }
 
         [Test]
@@ -72,11 +72,11 @@ namespace osu.Game.Tests.Visual.UserInterface
             createModSelect();
             openModSelect();
 
-            AddAssert("Customisation closed", () => modSelect.ModSettingsContainer.Alpha == 0);
+            AddAssert("Customisation closed", () => modSelect.ModSettingsContainer.State.Value == Visibility.Hidden);
             AddStep("select mod", () => modSelect.SelectMod(testCustomisableAutoOpenMod));
-            AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.Alpha == 1);
+            AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.State.Value == Visibility.Visible);
             AddStep("deselect mod", () => modSelect.SelectMod(testCustomisableAutoOpenMod));
-            AddAssert("Customisation closed", () => modSelect.ModSettingsContainer.Alpha == 0);
+            AddAssert("Customisation closed", () => modSelect.ModSettingsContainer.State.Value == Visibility.Hidden);
         }
 
         [Test]
@@ -123,7 +123,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("change mod settings menu width to full screen", () => modSelect.SetModSettingsWidth(1.0f));
             AddStep("select cm2", () => modSelect.SelectMod(testCustomisableAutoOpenMod));
-            AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.Alpha == 1);
+            AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.State.Value == Visibility.Visible);
             AddStep("hover over mod behind settings menu", () => InputManager.MoveMouseTo(modSelect.GetModButton(testCustomisableMod)));
             AddAssert("Mod is not considered hovered over", () => !modSelect.GetModButton(testCustomisableMod).IsHovered);
             AddStep("left click mod", () => InputManager.Click(MouseButton.Left));
@@ -153,7 +153,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestModSelectOverlay : ModSelectOverlay
         {
-            public new Container ModSettingsContainer => base.ModSettingsContainer;
+            public new VisibilityContainer ModSettingsContainer => base.ModSettingsContainer;
             public new TriangleButton CustomiseButton => base.CustomiseButton;
 
             public bool ButtonsLoaded => ModSectionsContainer.Children.All(c => c.ModIconsLoaded);

From cf3fbe0b0b832ef2476e46eb600f086b385005b9 Mon Sep 17 00:00:00 2001
From: Xexxar <xexxar.xexxar@gmail.com>
Date: Sun, 6 Dec 2020 18:06:36 -0600
Subject: [PATCH 06673/10326] osuDifficulty ar11 nerf

---
 .../Difficulty/OsuPerformanceCalculator.cs    | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 063cde8747..3f0b0dcc71 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -99,16 +99,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (Attributes.MaxCombo > 0)
                 aimValue *= Math.Min(Math.Pow(scoreMaxCombo, 0.8) / Math.Pow(Attributes.MaxCombo, 0.8), 1.0);
 
-            double approachRateFactor = 1.0;
-
+            double approachRateFactor = 0.0;
             if (Attributes.ApproachRate > 10.33)
-                approachRateFactor += 0.3 * (Attributes.ApproachRate - 10.33);
+              approachRateFactor += 0.4 * (Attributes.ApproachRate - 10.33);
             else if (Attributes.ApproachRate < 8.0)
-            {
-                approachRateFactor += 0.01 * (8.0 - Attributes.ApproachRate);
-            }
+              approachRateFactor += 0.1 * (8.0 - Attributes.ApproachRate);
 
-            aimValue *= approachRateFactor;
+            aimValue *= 1.0 + Math.Min(approachRateFactor, approachRateFactor * (totalHits / 1000.0));
 
             // We want to give more reward for lower AR when it comes to aim and HD. This nerfs high AR and buffs lower AR.
             if (mods.Any(h => h is OsuModHidden))
@@ -137,8 +134,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             double speedValue = Math.Pow(5.0 * Math.Max(1.0, Attributes.SpeedStrain / 0.0675) - 4.0, 3.0) / 100000.0;
 
             // Longer maps are worth more
-            speedValue *= 0.95 + 0.4 * Math.Min(1.0, totalHits / 2000.0) +
-                          (totalHits > 2000 ? Math.Log10(totalHits / 2000.0) * 0.5 : 0.0);
+            double lengthBonus = 0.95 + 0.4 * Math.Min(1.0, totalHits / 2000.0) +
+                                 (totalHits > 2000 ? Math.Log10(totalHits / 2000.0) * 0.5 : 0.0);
+            speedValue *= lengthBonus;
 
             // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
             speedValue *= Math.Pow(0.97, countMiss);
@@ -147,11 +145,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (Attributes.MaxCombo > 0)
                 speedValue *= Math.Min(Math.Pow(scoreMaxCombo, 0.8) / Math.Pow(Attributes.MaxCombo, 0.8), 1.0);
 
-            double approachRateFactor = 1.0;
+            double approachRateFactor = 0.0;
             if (Attributes.ApproachRate > 10.33)
-                approachRateFactor += 0.3 * (Attributes.ApproachRate - 10.33);
+                approachRateFactor += 0.4 * (Attributes.ApproachRate - 10.33);
 
-            speedValue *= approachRateFactor;
+            speedValue *= 1.0 + Math.Min(approachRateFactor, approachRateFactor * (totalHits / 1000.0));
 
             if (mods.Any(m => m is OsuModHidden))
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);

From c905df8a770a72294401952b5120680ec004b92c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 12:26:58 +0900
Subject: [PATCH 06674/10326] Move LegacySkinTransformer

---
 .../Skinning/{ => Legacy}/OsuLegacySkinTransformer.cs            | 1 -
 1 file changed, 1 deletion(-)
 rename osu.Game.Rulesets.Osu/Skinning/{ => Legacy}/OsuLegacySkinTransformer.cs (99%)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
similarity index 99%
rename from osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
rename to osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 70abfa1ac9..78bc26eff7 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -4,7 +4,6 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Skinning;
 using osuTK;
 

From 0d88ff340489ef14e1ecc8dc6c52dd0c92848770 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 12:27:12 +0900
Subject: [PATCH 06675/10326] Adjust namespace

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs                             | 2 +-
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index d8180b0e58..cba0c5be14 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -24,13 +24,13 @@ using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Difficulty;
 using osu.Game.Rulesets.Osu.Scoring;
-using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
 using System.Linq;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Screens.Ranking.Statistics;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 78bc26eff7..d74f885573 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Skinning
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public class OsuLegacySkinTransformer : LegacySkinTransformer
     {

From f78bd7c7399435d12d47b672ec444979b3c376e4 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 12:29:14 +0900
Subject: [PATCH 06676/10326] Move piece files of Taiko ruleset

---
 .../Drawables/Pieces => Skinning/Default}/CentreHitCirclePiece.cs | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/CirclePiece.cs | 0
 .../Drawables/Pieces => Skinning/Default}/ElongatedCirclePiece.cs | 0
 .../Drawables/Pieces => Skinning/Default}/RimHitCirclePiece.cs    | 0
 .../Drawables/Pieces => Skinning/Default}/SwellSymbolPiece.cs     | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/TickPiece.cs   | 0
 osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/LegacyBarLine.cs    | 0
 .../Skinning/{ => Legacy}/LegacyCirclePiece.cs                    | 0
 osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/LegacyDrumRoll.cs   | 0
 osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/LegacyHit.cs        | 0
 .../Skinning/{ => Legacy}/LegacyHitExplosion.cs                   | 0
 osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/LegacyInputDrum.cs  | 0
 .../Skinning/{ => Legacy}/LegacyTaikoScroller.cs                  | 0
 .../Skinning/{ => Legacy}/TaikoLegacyHitTarget.cs                 | 0
 .../Skinning/{ => Legacy}/TaikoLegacyPlayfieldBackgroundRight.cs  | 0
 .../Skinning/{ => Legacy}/TaikoLegacySkinTransformer.cs           | 0
 16 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Taiko/{Objects/Drawables/Pieces => Skinning/Default}/CentreHitCirclePiece.cs (100%)
 rename osu.Game.Rulesets.Taiko/{Objects/Drawables/Pieces => Skinning/Default}/CirclePiece.cs (100%)
 rename osu.Game.Rulesets.Taiko/{Objects/Drawables/Pieces => Skinning/Default}/ElongatedCirclePiece.cs (100%)
 rename osu.Game.Rulesets.Taiko/{Objects/Drawables/Pieces => Skinning/Default}/RimHitCirclePiece.cs (100%)
 rename osu.Game.Rulesets.Taiko/{Objects/Drawables/Pieces => Skinning/Default}/SwellSymbolPiece.cs (100%)
 rename osu.Game.Rulesets.Taiko/{Objects/Drawables/Pieces => Skinning/Default}/TickPiece.cs (100%)
 rename osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/LegacyBarLine.cs (100%)
 rename osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/LegacyCirclePiece.cs (100%)
 rename osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/LegacyDrumRoll.cs (100%)
 rename osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/LegacyHit.cs (100%)
 rename osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/LegacyHitExplosion.cs (100%)
 rename osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/LegacyInputDrum.cs (100%)
 rename osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/LegacyTaikoScroller.cs (100%)
 rename osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/TaikoLegacyHitTarget.cs (100%)
 rename osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/TaikoLegacyPlayfieldBackgroundRight.cs (100%)
 rename osu.Game.Rulesets.Taiko/Skinning/{ => Legacy}/TaikoLegacySkinTransformer.cs (100%)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CentreHitCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/CentreHitCirclePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CentreHitCirclePiece.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Default/CentreHitCirclePiece.cs
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/RimHitCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/RimHitCirclePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/RimHitCirclePiece.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Default/RimHitCirclePiece.cs
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/SwellSymbolPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Default/SwellSymbolPiece.cs
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TickPiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/TickPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TickPiece.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Default/TickPiece.cs
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyBarLine.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyBarLine.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Skinning/LegacyBarLine.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyBarLine.cs
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHit.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHit.cs
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyInputDrum.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Skinning/LegacyInputDrum.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyInputDrum.cs
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyHitTarget.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyHitTarget.cs
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyPlayfieldBackgroundRight.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyPlayfieldBackgroundRight.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyPlayfieldBackgroundRight.cs
diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
similarity index 100%
rename from osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
rename to osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs

From c70b13ecc2f0a0438d26853a09b138b0dc34e76c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 12:30:25 +0900
Subject: [PATCH 06677/10326] Adjust namespace

---
 .../Skinning/TestSceneTaikoScroller.cs                 |  2 +-
 .../Objects/Drawables/DrawableDrumRoll.cs              |  2 +-
 .../Objects/Drawables/DrawableDrumRollTick.cs          |  2 +-
 .../Objects/Drawables/DrawableHit.cs                   |  2 +-
 .../Objects/Drawables/DrawableSwell.cs                 |  2 +-
 .../Objects/Drawables/DrawableSwellTick.cs             |  2 +-
 .../Skinning/Default/CentreHitCirclePiece.cs           |  4 ++--
 .../Skinning/Default/CirclePiece.cs                    | 10 +++++-----
 .../Skinning/Default/ElongatedCirclePiece.cs           |  2 +-
 .../Skinning/Default/RimHitCirclePiece.cs              |  2 +-
 .../Skinning/Default/SwellSymbolPiece.cs               |  4 ++--
 osu.Game.Rulesets.Taiko/Skinning/Default/TickPiece.cs  |  4 ++--
 .../Skinning/Legacy/LegacyBarLine.cs                   |  2 +-
 .../Skinning/Legacy/LegacyCirclePiece.cs               |  2 +-
 .../Skinning/Legacy/LegacyDrumRoll.cs                  |  2 +-
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHit.cs   |  2 +-
 .../Skinning/Legacy/LegacyHitExplosion.cs              |  2 +-
 .../Skinning/Legacy/LegacyInputDrum.cs                 |  2 +-
 .../Skinning/Legacy/LegacyTaikoScroller.cs             |  2 +-
 .../Skinning/Legacy/TaikoLegacyHitTarget.cs            |  2 +-
 .../Legacy/TaikoLegacyPlayfieldBackgroundRight.cs      |  2 +-
 .../Skinning/Legacy/TaikoLegacySkinTransformer.cs      |  2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs                |  2 +-
 23 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
index 114038b81c..4ae3cbd418 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
@@ -6,7 +6,7 @@ using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Taiko.Skinning;
+using osu.Game.Rulesets.Taiko.Skinning.Legacy;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Skinning
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index c596fa2c7c..4ead4982a1 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -8,12 +8,12 @@ using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK.Graphics;
-using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index be659f6ca5..e68e40ae1c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -4,7 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Taiko.Skinning.Default;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 29a96a7a40..d1751d8a75 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -11,7 +11,7 @@ using osu.Framework.Graphics;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Taiko.Skinning.Default;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index ff0a27023d..5c6278ed08 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -13,7 +13,7 @@ using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Taiko.Skinning.Default;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
index 6202583494..14c86d151f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Taiko.Skinning.Default;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/CentreHitCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/CentreHitCirclePiece.cs
index 0509841ba8..f65bb54726 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/CentreHitCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/CentreHitCirclePiece.cs
@@ -4,11 +4,11 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osuTK;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osuTK;
 
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Taiko.Skinning.Default
 {
     public class CentreHitCirclePiece : CirclePiece
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
index f515a35c18..8ca996159b 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
@@ -5,15 +5,15 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics.Backgrounds;
-using osuTK.Graphics;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
+using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Taiko.Skinning.Default
 {
     /// <summary>
     /// A circle piece which is used uniformly through osu!taiko to visualise hitobjects.
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs
index 034ab6dd21..210841bca0 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs
@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Taiko.Skinning.Default
 {
     public class ElongatedCirclePiece : CirclePiece
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/RimHitCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/RimHitCirclePiece.cs
index 3273ab7fa7..ca2ab301be 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/RimHitCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/RimHitCirclePiece.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Taiko.Skinning.Default
 {
     public class RimHitCirclePiece : CirclePiece
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/SwellSymbolPiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/SwellSymbolPiece.cs
index a8f9f0b94d..2f59cac3ff 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/SwellSymbolPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/SwellSymbolPiece.cs
@@ -2,13 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
+using osuTK;
 
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Taiko.Skinning.Default
 {
     public class SwellCirclePiece : CirclePiece
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/TickPiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/TickPiece.cs
index 0648bcebcd..09c8243aac 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/TickPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/TickPiece.cs
@@ -3,11 +3,11 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Graphics.Shapes;
 
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Taiko.Skinning.Default
 {
     public class TickPiece : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyBarLine.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyBarLine.cs
index 7d08a21ab1..2b528ae8ce 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyBarLine.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Taiko.Skinning
+namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyBarLine : Sprite
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index 9b73ccd248..821ddc3c04 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -12,7 +12,7 @@ using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Taiko.Skinning
+namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyCirclePiece : CompositeDrawable, IHasAccentColour
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
index 5ab8e3a8c8..ea6f813be8 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Taiko.Skinning
+namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyDrumRoll : CompositeDrawable, IHasAccentColour
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHit.cs
index b11b64c22c..d93317f0e2 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHit.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHit.cs
@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Taiko.Skinning
+namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyHit : LegacyCirclePiece
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
index 19493271be..651cdd6438 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 
-namespace osu.Game.Rulesets.Taiko.Skinning
+namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyHitExplosion : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyInputDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyInputDrum.cs
index b7b55b9ae0..795885d4b9 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyInputDrum.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Taiko.Audio;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Taiko.Skinning
+namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     /// <summary>
     /// A component of the playfield that captures input and displays input as a drum.
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs
index e029040ef3..eb92097204 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Taiko.Skinning
+namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyTaikoScroller : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyHitTarget.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyHitTarget.cs
index e522fb7c10..9feb2054da 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyHitTarget.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Taiko.Skinning
+namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class TaikoLegacyHitTarget : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyPlayfieldBackgroundRight.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyPlayfieldBackgroundRight.cs
index 4bbb6be6b1..02756d57a4 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyPlayfieldBackgroundRight.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyPlayfieldBackgroundRight.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Taiko.Skinning
+namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class TaikoLegacyPlayfieldBackgroundRight : BeatSyncedContainer
     {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index 96fb065e79..d8e3100048 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Skinning;
 
-namespace osu.Game.Rulesets.Taiko.Skinning
+namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class TaikoLegacySkinTransformer : LegacySkinTransformer
     {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 2a49dd655c..f2b5d195b4 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -25,7 +25,7 @@ using System.Linq;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Taiko.Edit;
 using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Rulesets.Taiko.Skinning;
+using osu.Game.Rulesets.Taiko.Skinning.Legacy;
 using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
 

From 40da799103b049070a18c5dccaa9f9f58da53ab1 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 12:31:56 +0900
Subject: [PATCH 06678/10326] Move piece files of Mania ruleset

---
 .../Drawables/Pieces => Skinning/Default}/DefaultBodyPiece.cs     | 0
 .../Drawables/Pieces => Skinning/Default}/DefaultNotePiece.cs     | 0
 .../Drawables/Pieces => Skinning/Default}/IHoldNoteBody.cs        | 0
 .../Skinning/{ => Legacy}/HitTargetInsetContainer.cs              | 0
 osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyBodyPiece.cs  | 0
 .../Skinning/{ => Legacy}/LegacyColumnBackground.cs               | 0
 .../Skinning/{ => Legacy}/LegacyHitExplosion.cs                   | 0
 osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyHitTarget.cs  | 0
 .../Skinning/{ => Legacy}/LegacyHoldNoteHeadPiece.cs              | 0
 .../Skinning/{ => Legacy}/LegacyHoldNoteTailPiece.cs              | 0
 osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyKeyArea.cs    | 0
 .../Skinning/{ => Legacy}/LegacyManiaColumnElement.cs             | 0
 osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyNotePiece.cs  | 0
 .../Skinning/{ => Legacy}/LegacyStageBackground.cs                | 0
 .../Skinning/{ => Legacy}/LegacyStageForeground.cs                | 0
 .../Skinning/{ => Legacy}/ManiaLegacySkinTransformer.cs           | 0
 16 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Mania/{Objects/Drawables/Pieces => Skinning/Default}/DefaultBodyPiece.cs (100%)
 rename osu.Game.Rulesets.Mania/{Objects/Drawables/Pieces => Skinning/Default}/DefaultNotePiece.cs (100%)
 rename osu.Game.Rulesets.Mania/{Objects/Drawables/Pieces => Skinning/Default}/IHoldNoteBody.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/HitTargetInsetContainer.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyBodyPiece.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyColumnBackground.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyHitExplosion.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyHitTarget.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyHoldNoteHeadPiece.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyHoldNoteTailPiece.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyKeyArea.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyManiaColumnElement.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyNotePiece.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyStageBackground.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/LegacyStageForeground.cs (100%)
 rename osu.Game.Rulesets.Mania/Skinning/{ => Legacy}/ManiaLegacySkinTransformer.cs (100%)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBodyPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Default/DefaultBodyPiece.cs
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultNotePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultNotePiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Default/DefaultNotePiece.cs
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/IHoldNoteBody.cs b/osu.Game.Rulesets.Mania/Skinning/Default/IHoldNoteBody.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/IHoldNoteBody.cs
rename to osu.Game.Rulesets.Mania/Skinning/Default/IHoldNoteBody.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteHeadPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteHeadPiece.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteTailPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteTailPiece.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs

From e3c035fe9c651ac1eec750dd8197bbc037e9e994 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 12:32:52 +0900
Subject: [PATCH 06679/10326] Adjust namespace

---
 .../Editor/TestSceneManiaHitObjectComposer.cs      |  2 +-
 .../Skinning/TestSceneHitExplosion.cs              |  2 +-
 .../Edit/Blueprints/Components/EditBodyPiece.cs    |  2 +-
 .../Edit/Blueprints/Components/EditNotePiece.cs    |  2 +-
 .../Edit/ManiaHitObjectComposer.cs                 |  2 +-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs            |  2 +-
 .../Objects/Drawables/DrawableHoldNote.cs          |  2 +-
 .../Objects/Drawables/DrawableNote.cs              |  2 +-
 .../Skinning/Default/DefaultBodyPiece.cs           |  5 +++--
 .../Skinning/Default/DefaultNotePiece.cs           |  4 ++--
 .../Skinning/Default/IHoldNoteBody.cs              |  2 +-
 .../Skinning/Legacy/HitTargetInsetContainer.cs     |  2 +-
 .../Skinning/Legacy/LegacyBodyPiece.cs             |  2 +-
 .../Skinning/Legacy/LegacyColumnBackground.cs      |  2 +-
 .../Skinning/Legacy/LegacyHitExplosion.cs          |  2 +-
 .../Skinning/Legacy/LegacyHitTarget.cs             |  2 +-
 .../Skinning/Legacy/LegacyHoldNoteHeadPiece.cs     |  2 +-
 .../Skinning/Legacy/LegacyHoldNoteTailPiece.cs     |  2 +-
 .../Skinning/Legacy/LegacyKeyArea.cs               |  2 +-
 .../Skinning/Legacy/LegacyManiaColumnElement.cs    |  2 +-
 .../Skinning/Legacy/LegacyNotePiece.cs             |  2 +-
 .../Skinning/Legacy/LegacyStageBackground.cs       |  2 +-
 .../Skinning/Legacy/LegacyStageForeground.cs       |  2 +-
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs  | 14 +++++++-------
 .../UI/Components/DefaultHitTarget.cs              |  2 +-
 osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs  |  2 +-
 26 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
index c9551ee79e..aaf96c63a6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
@@ -15,7 +15,7 @@ using osu.Game.Rulesets.Mania.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
index 0c56f7bcf4..4dc6700786 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects;
 using osuTK;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
index 5fa687298a..f5067ea366 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints.Components
 {
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs
index 8773a39939..9c9273de3a 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints.Components
 {
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 01d572447b..324670c4b2 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Input;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 906f7382c5..59c766fd84 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -26,7 +26,7 @@ using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Difficulty;
 using osu.Game.Rulesets.Mania.Edit;
 using osu.Game.Rulesets.Mania.Scoring;
-using osu.Game.Rulesets.Mania.Skinning;
+using osu.Game.Rulesets.Mania.Skinning.Legacy;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Scoring;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index a64cc6dc67..4f062753a6 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -4,9 +4,9 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index b3402d13e4..b512986ccb 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -5,7 +5,7 @@ using System.Diagnostics;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBodyPiece.cs
index 9999983af5..db1ac6da88 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBodyPiece.cs
@@ -5,16 +5,17 @@ using System;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-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.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
+using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Mania.Skinning.Default
 {
     /// <summary>
     /// Represents length-wise portion of a hold note.
diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultNotePiece.cs
index 29f5217fd8..c9c3cff799 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultNotePiece.cs
@@ -4,7 +4,6 @@
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,8 +11,9 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Mania.Skinning.Default
 {
     /// <summary>
     /// Represents the static hit markers of notes.
diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/IHoldNoteBody.cs b/osu.Game.Rulesets.Mania/Skinning/Default/IHoldNoteBody.cs
index ac3792c01d..1f290f1f1c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Default/IHoldNoteBody.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/IHoldNoteBody.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.
 
-namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Mania.Skinning.Default
 {
     /// <summary>
     /// Interface for mania hold note bodies.
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
index c8b05ed2f8..3c89e2c04a 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class HitTargetInsetContainer : Container
     {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index 8902d82f33..31db08ce2f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyBodyPiece : LegacyManiaColumnElement
     {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
index 3bf51b3073..661e7f66f4 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
@@ -12,7 +12,7 @@ using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyColumnBackground : LegacyManiaColumnElement, IKeyBindingHandler<ManiaAction>
     {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
index 7c5d41efcf..73aece1ed4 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyHitExplosion : LegacyManiaColumnElement, IHitExplosion
     {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
index 6eced571d2..490a03d11a 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
@@ -12,7 +12,7 @@ using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyHitTarget : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteHeadPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteHeadPiece.cs
index c5aa062d0f..21e5bdd5d6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteHeadPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteHeadPiece.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Game.Skinning;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyHoldNoteHeadPiece : LegacyNotePiece
     {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteTailPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteTailPiece.cs
index 2e8259f10a..232b47ae27 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteTailPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteTailPiece.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyHoldNoteTailPiece : LegacyNotePiece
     {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
index b269ea25d4..78ccb83a8c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
@@ -12,7 +12,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyKeyArea : LegacyManiaColumnElement, IKeyBindingHandler<ManiaAction>
     {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
index 3c0c632c14..eb5514ba43 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     /// <summary>
     /// A <see cref="CompositeDrawable"/> which is placed somewhere within a <see cref="Column"/>.
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
index 283b04373b..31279796ce 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
@@ -12,7 +12,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyNotePiece : LegacyManiaColumnElement
     {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
index b0bab8e760..fec3e9493e 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
@@ -12,7 +12,7 @@ using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyStageBackground : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
index 4609fcc849..4e1952a670 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyStageForeground : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 3724269f4d..89f639e2fe 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -2,19 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Graphics;
-using osu.Framework.Bindables;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Skinning;
 using System.Collections.Generic;
 using System.Diagnostics;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Objects.Legacy;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
 
-namespace osu.Game.Rulesets.Mania.Skinning
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class ManiaLegacySkinTransformer : LegacySkinTransformer
     {
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs
index e0b099ab9b..ec6c377a2e 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK.Graphics;
 
diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index 225269cf48..69b81d6d5c 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Graphics;

From b4b9312e0f9ad08ae3c9fda7f8d55450d3cbffdf Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 12:34:38 +0900
Subject: [PATCH 06680/10326] Move piece files of Catch ruleset

---
 .../{Objects/Drawables/Pieces => Skinning/Default}/BananaPiece.cs | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/BorderPiece.cs | 0
 .../Drawables/Pieces => Skinning/Default}/DropletPiece.cs         | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/FruitPiece.cs  | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/GrapePiece.cs  | 0
 .../Drawables/Pieces => Skinning/Default}/HyperBorderPiece.cs     | 0
 .../Pieces => Skinning/Default}/HyperDropletBorderPiece.cs        | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/PearPiece.cs   | 0
 .../Drawables/Pieces => Skinning/Default}/PineapplePiece.cs       | 0
 .../{Objects/Drawables/Pieces => Skinning/Default}/Pulp.cs        | 0
 .../Drawables/Pieces => Skinning/Default}/PulpFormation.cs        | 0
 .../Drawables/Pieces => Skinning/Default}/RaspberryPiece.cs       | 0
 .../Skinning/{ => Legacy}/CatchLegacySkinTransformer.cs           | 0
 .../Skinning/{ => Legacy}/LegacyCatchComboCounter.cs              | 0
 osu.Game.Rulesets.Catch/Skinning/{ => Legacy}/LegacyFruitPiece.cs | 0
 15 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/BananaPiece.cs (100%)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/BorderPiece.cs (100%)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/DropletPiece.cs (100%)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/FruitPiece.cs (100%)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/GrapePiece.cs (100%)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/HyperBorderPiece.cs (100%)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/HyperDropletBorderPiece.cs (100%)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/PearPiece.cs (100%)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/PineapplePiece.cs (100%)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/Pulp.cs (100%)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/PulpFormation.cs (100%)
 rename osu.Game.Rulesets.Catch/{Objects/Drawables/Pieces => Skinning/Default}/RaspberryPiece.cs (100%)
 rename osu.Game.Rulesets.Catch/Skinning/{ => Legacy}/CatchLegacySkinTransformer.cs (100%)
 rename osu.Game.Rulesets.Catch/Skinning/{ => Legacy}/LegacyCatchComboCounter.cs (100%)
 rename osu.Game.Rulesets.Catch/Skinning/{ => Legacy}/LegacyFruitPiece.cs (100%)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BorderPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/GrapePiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/GrapePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/GrapePiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/GrapePiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperBorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperBorderPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperDropletBorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/HyperDropletBorderPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperDropletBorderPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/HyperDropletBorderPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PearPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/PearPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PearPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/PearPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PineapplePiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/PineapplePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PineapplePiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/PineapplePiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs b/osu.Game.Rulesets.Catch/Skinning/Default/Pulp.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/Pulp.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PulpFormation.cs b/osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PulpFormation.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/RaspberryPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/RaspberryPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/RaspberryPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/RaspberryPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
rename to osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyCatchComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Skinning/LegacyCatchComboCounter.cs
rename to osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs

From d18397acad71b87231ee5b15e5751426428f81cb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 12:35:24 +0900
Subject: [PATCH 06681/10326] Adjust namespace

---
 osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs   | 1 +
 osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs   | 1 +
 osu.Game.Rulesets.Catch/CatchRuleset.cs                        | 2 +-
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs   | 2 +-
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs     | 2 +-
 osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs        | 2 +-
 osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs        | 3 ++-
 osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs       | 3 ++-
 osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs         | 3 ++-
 osu.Game.Rulesets.Catch/Skinning/Default/GrapePiece.cs         | 2 +-
 osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs   | 2 +-
 .../Skinning/Default/HyperDropletBorderPiece.cs                | 2 +-
 osu.Game.Rulesets.Catch/Skinning/Default/PearPiece.cs          | 2 +-
 osu.Game.Rulesets.Catch/Skinning/Default/PineapplePiece.cs     | 2 +-
 osu.Game.Rulesets.Catch/Skinning/Default/Pulp.cs               | 2 +-
 osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs      | 3 ++-
 osu.Game.Rulesets.Catch/Skinning/Default/RaspberryPiece.cs     | 2 +-
 .../Skinning/Legacy/CatchLegacySkinTransformer.cs              | 2 +-
 .../Skinning/Legacy/LegacyCatchComboCounter.cs                 | 2 +-
 osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs    | 2 +-
 20 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
index b570f090ca..e70def7f8b 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.IO.Stores;
 using osu.Game.Rulesets.Catch.Skinning;
+using osu.Game.Rulesets.Catch.Skinning.Legacy;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 07cb73e5ff..d78dc2d2b5 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Skinning;
+using osu.Game.Rulesets.Catch.Skinning.Legacy;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index ad584d3f48..0a817eca0d 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -21,7 +21,7 @@ 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.Rulesets.Catch.Skinning.Legacy;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index b8acea625b..e87d862fa5 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -4,7 +4,7 @@
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Catch.Skinning.Default;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index ef9df02a68..da2529615e 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -6,7 +6,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Catch.Skinning.Default;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs
index fa8837dec5..815855dbcf 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osuTK;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class BananaPiece : PulpFormation
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
index 1e7a0b0685..7308d6b499 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
@@ -3,10 +3,11 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Catch.Objects;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class BorderPiece : Circle
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs
index c90407ae15..0d305dbca5 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs
@@ -5,10 +5,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class DropletPiece : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
index 31487ee407..81667315a0 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
@@ -7,9 +7,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     internal class FruitPiece : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/GrapePiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/GrapePiece.cs
index 15349c18d5..bb6a787c21 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/GrapePiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/GrapePiece.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osuTK;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class GrapePiece : PulpFormation
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
index 60bb07e89d..d160956a6e 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.UI;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class HyperBorderPiece : BorderPiece
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/HyperDropletBorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/HyperDropletBorderPiece.cs
index 1bd9fd6bb2..53a487b97f 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/HyperDropletBorderPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/HyperDropletBorderPiece.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.
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class HyperDropletBorderPiece : HyperBorderPiece
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/PearPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/PearPiece.cs
index 3372a06996..a99a4034ed 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/PearPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/PearPiece.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osuTK;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class PearPiece : PulpFormation
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/PineapplePiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/PineapplePiece.cs
index 7f80c58178..8d7dce6fc4 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/PineapplePiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/PineapplePiece.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osuTK;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class PineapplePiece : PulpFormation
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/Pulp.cs b/osu.Game.Rulesets.Catch/Skinning/Default/Pulp.cs
index d3e4945611..37a8334068 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/Pulp.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/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.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class Pulp : Circle
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs b/osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs
index 1df548e70a..837bc74540 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs
@@ -6,11 +6,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public abstract class PulpFormation : CompositeDrawable
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/RaspberryPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/RaspberryPiece.cs
index 288ece95b2..f35d64f593 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/RaspberryPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/RaspberryPiece.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osuTK;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class RaspberryPiece : PulpFormation
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
index 22db147e32..d597d439c2 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
@@ -9,7 +9,7 @@ using osuTK;
 using osuTK.Graphics;
 using static osu.Game.Skinning.LegacySkinConfiguration;
 
-namespace osu.Game.Rulesets.Catch.Skinning
+namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     public class CatchLegacySkinTransformer : LegacySkinTransformer
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
index 34608b07ff..f797ae75c2 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
@@ -9,7 +9,7 @@ using osuTK;
 using osuTK.Graphics;
 using static osu.Game.Skinning.LegacySkinConfiguration;
 
-namespace osu.Game.Rulesets.Catch.Skinning
+namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     /// <summary>
     /// A combo counter implementation that visually behaves almost similar to stable's osu!catch combo counter.
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index b8648f46f0..2db95a11a1 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -13,7 +13,7 @@ using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Catch.Skinning
+namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     internal class LegacyFruitPiece : CompositeDrawable
     {

From 87189452d1a7d53c1167eb94fc291a74b27ded16 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 12:57:24 +0900
Subject: [PATCH 06682/10326] Refactor legacy skin piece to allow texture
 update

---
 .../Skinning/LegacyCatchHitObjectPiece.cs     | 100 ++++++++++++++++++
 .../Skinning/LegacyDropletPiece.cs            |  20 ++++
 .../Skinning/LegacyFruitPiece.cs              |  84 ++++-----------
 3 files changed, 140 insertions(+), 64 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
 create mode 100644 osu.Game.Rulesets.Catch/Skinning/LegacyDropletPiece.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
new file mode 100644
index 0000000000..4bcb92b9be
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Pooling;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Skinning
+{
+    public abstract class LegacyCatchHitObjectPiece : PoolableDrawable
+    {
+        public readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
+        public readonly Bindable<bool> HyperDash = new Bindable<bool>();
+
+        private readonly Sprite colouredSprite;
+        private readonly Sprite overlaySprite;
+        private readonly Sprite hyperSprite;
+
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
+        protected ISkinSource Skin => skin;
+
+        [Resolved(canBeNull: true)]
+        private DrawableHitObject drawableHitObject { get; set; }
+
+        [CanBeNull]
+        protected DrawablePalpableCatchHitObject DrawableHitObject => (DrawablePalpableCatchHitObject)drawableHitObject;
+
+        protected LegacyCatchHitObjectPiece()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                colouredSprite = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                overlaySprite = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                hyperSprite = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Blending = BlendingParameters.Additive,
+                    Depth = 1,
+                    Alpha = 0,
+                    Scale = new Vector2(1.2f),
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (DrawableHitObject != null)
+            {
+                AccentColour.BindTo(DrawableHitObject.AccentColour);
+                HyperDash.BindTo(DrawableHitObject.HyperDash);
+            }
+
+            hyperSprite.Colour = Skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??
+                                 Skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
+                                 Catcher.DEFAULT_HYPER_DASH_COLOUR;
+
+            AccentColour.BindValueChanged(colour =>
+            {
+                colouredSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue);
+            }, true);
+
+            HyperDash.BindValueChanged(hyper =>
+            {
+                hyperSprite.Alpha = hyper.NewValue ? 0.7f : 0;
+            }, true);
+        }
+
+        protected void SetTexture(Texture texture, Texture overlayTexture)
+        {
+            colouredSprite.Texture = texture;
+            overlaySprite.Texture = overlayTexture;
+            hyperSprite.Texture = texture;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyDropletPiece.cs
new file mode 100644
index 0000000000..cc8886f631
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyDropletPiece.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.Textures;
+
+namespace osu.Game.Rulesets.Catch.Skinning
+{
+    public class LegacyDropletPiece : LegacyCatchHitObjectPiece
+    {
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Texture texture = Skin.GetTexture("fruit-drop");
+            Texture overlayTexture = Skin.GetTexture("fruit-drop-overlay");
+
+            SetTexture(texture, overlayTexture);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index b8648f46f0..7008234e99 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -1,83 +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.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Skinning;
-using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
-    internal class LegacyFruitPiece : CompositeDrawable
+    internal class LegacyFruitPiece : LegacyCatchHitObjectPiece
     {
-        private readonly string lookupName;
+        public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
 
-        private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
-        private readonly Bindable<bool> hyperDash = new Bindable<bool>();
-        private Sprite colouredSprite;
-
-        public LegacyFruitPiece(string lookupName)
+        private readonly string[] lookupNames =
         {
-            this.lookupName = lookupName;
-            RelativeSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableObject, ISkinSource skin)
-        {
-            var drawableCatchObject = (DrawablePalpableCatchHitObject)drawableObject;
-
-            accentColour.BindTo(drawableCatchObject.AccentColour);
-            hyperDash.BindTo(drawableCatchObject.HyperDash);
-
-            InternalChildren = new Drawable[]
-            {
-                colouredSprite = new Sprite
-                {
-                    Texture = skin.GetTexture(lookupName),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
-                new Sprite
-                {
-                    Texture = skin.GetTexture($"{lookupName}-overlay"),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
-            };
-
-            if (hyperDash.Value)
-            {
-                var hyperDashOverlay = new Sprite
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Blending = BlendingParameters.Additive,
-                    Depth = 1,
-                    Alpha = 0.7f,
-                    Scale = new Vector2(1.2f),
-                    Texture = skin.GetTexture(lookupName),
-                    Colour = skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??
-                             skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
-                             Catcher.DEFAULT_HYPER_DASH_COLOUR,
-                };
-
-                AddInternal(hyperDashOverlay);
-            }
-        }
+            "fruit-pear", "fruit-grapes", "fruit-apple", "fruit-orange", "fruit-bananas"
+        };
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            accentColour.BindValueChanged(colour => colouredSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue), true);
+            var fruit = (DrawableFruit)DrawableHitObject;
+
+            if (fruit != null)
+                VisualRepresentation.BindTo(fruit.VisualRepresentation);
+
+            VisualRepresentation.BindValueChanged(visual => setTexture(visual.NewValue), true);
+        }
+
+        private void setTexture(FruitVisualRepresentation visualRepresentation)
+        {
+            Texture texture = Skin.GetTexture(lookupNames[(int)visualRepresentation]);
+            Texture overlayTexture = Skin.GetTexture(lookupNames[(int)visualRepresentation] + "-overlay");
+
+            SetTexture(texture, overlayTexture);
         }
     }
 }

From d51d2c533155d292c454780a9597bfc866f83556 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 12:59:03 +0900
Subject: [PATCH 06683/10326] Don't recreate pieces when catch DHO is reused

---
 .../CatchSkinComponents.cs                    |  7 +---
 .../Objects/Drawables/DrawableDroplet.cs      |  7 +---
 .../Objects/Drawables/DrawableFruit.cs        | 39 ++-----------------
 .../Skinning/CatchLegacySkinTransformer.cs    | 21 +++++-----
 4 files changed, 17 insertions(+), 57 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
index 23d8428fec..668f7197be 100644
--- a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
+++ b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
@@ -5,11 +5,8 @@ namespace osu.Game.Rulesets.Catch
 {
     public enum CatchSkinComponents
     {
-        FruitBananas,
-        FruitApple,
-        FruitGrapes,
-        FruitOrange,
-        FruitPear,
+        Fruit,
+        Banana,
         Droplet,
         CatcherIdle,
         CatcherFail,
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index b8acea625b..4c49bfe6c9 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -25,17 +25,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         [BackgroundDependencyLoader]
         private void load()
-        {
-            HyperDash.BindValueChanged(_ => updatePiece(), true);
-        }
-
-        private void updatePiece()
         {
             ScaleContainer.Child = new SkinnableDrawable(
                 new CatchSkinComponent(CatchSkinComponents.Droplet),
                 _ => new DropletPiece
                 {
-                    HyperDash = { BindTarget = HyperDash }
+                    HyperDash = { BindTarget = HyperDash },
                 });
         }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index ef9df02a68..2998d2cc6f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -35,21 +34,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 VisualRepresentation.Value = GetVisualRepresentation(change.NewValue);
             }, true);
 
-            VisualRepresentation.BindValueChanged(_ => updatePiece());
-            HyperDash.BindValueChanged(_ => updatePiece(), true);
-        }
-
-        protected override void UpdateInitialTransforms()
-        {
-            base.UpdateInitialTransforms();
-
-            ScaleContainer.RotateTo((RandomSingle(1) - 0.5f) * 40);
-        }
-
-        private void updatePiece()
-        {
             ScaleContainer.Child = new SkinnableDrawable(
-                new CatchSkinComponent(getComponent(VisualRepresentation.Value)),
+                new CatchSkinComponent(this is DrawableBanana ? CatchSkinComponents.Banana : CatchSkinComponents.Fruit),
                 _ => new FruitPiece
                 {
                     VisualRepresentation = { BindTarget = VisualRepresentation },
@@ -57,28 +43,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 });
         }
 
-        private CatchSkinComponents getComponent(FruitVisualRepresentation hitObjectVisualRepresentation)
+        protected override void UpdateInitialTransforms()
         {
-            switch (hitObjectVisualRepresentation)
-            {
-                case FruitVisualRepresentation.Pear:
-                    return CatchSkinComponents.FruitPear;
+            base.UpdateInitialTransforms();
 
-                case FruitVisualRepresentation.Grape:
-                    return CatchSkinComponents.FruitGrapes;
-
-                case FruitVisualRepresentation.Pineapple:
-                    return CatchSkinComponents.FruitApple;
-
-                case FruitVisualRepresentation.Raspberry:
-                    return CatchSkinComponents.FruitOrange;
-
-                case FruitVisualRepresentation.Banana:
-                    return CatchSkinComponents.FruitBananas;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(hitObjectVisualRepresentation), hitObjectVisualRepresentation, null);
-            }
+            ScaleContainer.RotateTo((RandomSingle(1) - 0.5f) * 40);
         }
     }
 
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 22db147e32..1889b230a7 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -1,11 +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 Humanizer;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 using static osu.Game.Skinning.LegacySkinConfiguration;
 
@@ -40,20 +38,21 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
             switch (catchSkinComponent.Component)
             {
-                case CatchSkinComponents.FruitApple:
-                case CatchSkinComponents.FruitBananas:
-                case CatchSkinComponents.FruitOrange:
-                case CatchSkinComponents.FruitGrapes:
-                case CatchSkinComponents.FruitPear:
-                    var lookupName = catchSkinComponent.Component.ToString().Kebaberize();
-                    if (GetTexture(lookupName) != null)
-                        return new LegacyFruitPiece(lookupName);
+                case CatchSkinComponents.Fruit:
+                    if (GetTexture("fruit-pear") != null)
+                        return new LegacyFruitPiece();
+
+                    break;
+
+                case CatchSkinComponents.Banana:
+                    if (GetTexture("fruit-bananas") != null)
+                        return new LegacyFruitPiece();
 
                     break;
 
                 case CatchSkinComponents.Droplet:
                     if (GetTexture("fruit-drop") != null)
-                        return new LegacyFruitPiece("fruit-drop") { Scale = new Vector2(0.8f) };
+                        return new LegacyDropletPiece();
 
                     break;
 

From 42b810d0c84ebb1ed7f5701b0d5f1fb99a57c139 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Dec 2020 13:03:34 +0900
Subject: [PATCH 06684/10326] Update DiscordRichPresence with fix for startup
 crashes

---
 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 adf9c452f6..8b8ad9f8af 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="5.0.0" />
-    <PackageReference Include="DiscordRichPresence" Version="1.0.166" />
+    <PackageReference Include="DiscordRichPresence" Version="1.0.169" />
     <!-- .NET 3.1 SDK seems to cause issues with a runtime specification. This will likely be resolved in .NET 5. -->
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />

From 0d73bf84888b655ef1b233464bf1a9239c70b9f3 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 13:14:00 +0900
Subject: [PATCH 06685/10326] Refactor catch default piece to allow reuse

But Fruit in-place update is still incomplete,
as child drawables are recreated when reused.
---
 .../Objects/Drawables/DrawableDroplet.cs      |  5 +-
 .../Objects/Drawables/DrawableFruit.cs        |  6 +--
 .../Drawables/Pieces/CatchHitObjectPiece.cs   | 54 +++++++++++++++++++
 .../Objects/Drawables/Pieces/DropletPiece.cs  | 27 +++-------
 .../Objects/Drawables/Pieces/FruitPiece.cs    | 48 +++++++----------
 5 files changed, 83 insertions(+), 57 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/CatchHitObjectPiece.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index 4c49bfe6c9..dea19a2446 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -28,10 +28,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             ScaleContainer.Child = new SkinnableDrawable(
                 new CatchSkinComponent(CatchSkinComponents.Droplet),
-                _ => new DropletPiece
-                {
-                    HyperDash = { BindTarget = HyperDash },
-                });
+                _ => new DropletPiece());
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index 2998d2cc6f..8db8f5ec82 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -36,11 +36,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
             ScaleContainer.Child = new SkinnableDrawable(
                 new CatchSkinComponent(this is DrawableBanana ? CatchSkinComponents.Banana : CatchSkinComponents.Fruit),
-                _ => new FruitPiece
-                {
-                    VisualRepresentation = { BindTarget = VisualRepresentation },
-                    HyperDash = { BindTarget = HyperDash },
-                });
+                _ => new FruitPiece());
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/CatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/CatchHitObjectPiece.cs
new file mode 100644
index 0000000000..ec5f66a945
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/CatchHitObjectPiece.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 System;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+{
+    public class CatchHitObjectPiece : CompositeDrawable
+    {
+        public readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
+        public readonly Bindable<bool> HyperDash = new Bindable<bool>();
+
+        [Resolved(canBeNull: true)]
+        private DrawableHitObject drawableHitObject { get; set; }
+
+        [CanBeNull]
+        protected DrawablePalpableCatchHitObject DrawableHitObject => (DrawablePalpableCatchHitObject)drawableHitObject;
+
+        [CanBeNull]
+        protected BorderPiece BorderPiece;
+
+        [CanBeNull]
+        protected HyperBorderPiece HyperBorderPiece;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (DrawableHitObject != null)
+            {
+                AccentColour.BindTo(DrawableHitObject.AccentColour);
+                HyperDash.BindTo(DrawableHitObject.HyperDash);
+            }
+
+            HyperDash.BindValueChanged(hyper =>
+            {
+                if (HyperBorderPiece != null)
+                    HyperBorderPiece.Alpha = hyper.NewValue ? 1 : 0;
+            }, true);
+        }
+
+        protected override void Update()
+        {
+            if (BorderPiece != null && DrawableHitObject?.HitObject != null)
+                BorderPiece.Alpha = (float)Math.Clamp((DrawableHitObject.HitObject.StartTime - Time.Current) / 500, 0, 1);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
index c90407ae15..f92c92160a 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
@@ -1,37 +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.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
-    public class DropletPiece : CompositeDrawable
+    public class DropletPiece : CatchHitObjectPiece
     {
-        public readonly Bindable<bool> HyperDash = new Bindable<bool>();
-
         public DropletPiece()
         {
             Size = new Vector2(CatchHitObject.OBJECT_RADIUS / 2);
-        }
 
-        [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableObject)
-        {
-            InternalChild = new Pulp
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                AccentColour = { BindTarget = drawableObject.AccentColour }
+                new Pulp
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    AccentColour = { BindTarget = AccentColour }
+                },
+                HyperBorderPiece = new HyperDropletBorderPiece()
             };
-
-            if (HyperDash.Value)
-            {
-                AddInternal(new HyperDropletBorderPiece());
-            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
index 31487ee407..9b5c00b2bf 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
@@ -1,17 +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 JetBrains.Annotations;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
-    internal class FruitPiece : CompositeDrawable
+    internal class FruitPiece : CatchHitObjectPiece
     {
         /// <summary>
         /// Because we're adding a border around the fruit, we need to scale down some.
@@ -19,38 +14,36 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
         public const float RADIUS_ADJUST = 1.1f;
 
         public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
-        public readonly Bindable<bool> HyperDash = new Bindable<bool>();
-
-        [CanBeNull]
-        private DrawableCatchHitObject drawableHitObject;
-
-        [CanBeNull]
-        private BorderPiece borderPiece;
 
         public FruitPiece()
         {
             RelativeSizeAxes = Axes.Both;
         }
 
-        [BackgroundDependencyLoader(permitNulls: true)]
-        private void load([CanBeNull] DrawableHitObject drawable)
+        protected override void LoadComplete()
         {
-            drawableHitObject = (DrawableCatchHitObject)drawable;
+            base.LoadComplete();
+
+            if (DrawableHitObject != null)
+            {
+                var fruit = (DrawableFruit)DrawableHitObject;
+                VisualRepresentation.BindTo(fruit.VisualRepresentation);
+            }
+
+            VisualRepresentation.BindValueChanged(_ => recreateChildren(), true);
+        }
+
+        private void recreateChildren()
+        {
+            ClearInternal();
 
             AddInternal(getFruitFor(VisualRepresentation.Value));
 
-            // if it is not part of a DHO, the border is always invisible.
-            if (drawableHitObject != null)
-                AddInternal(borderPiece = new BorderPiece());
+            if (DrawableHitObject != null)
+                AddInternal(BorderPiece = new BorderPiece());
 
             if (HyperDash.Value)
-                AddInternal(new HyperBorderPiece());
-        }
-
-        protected override void Update()
-        {
-            if (borderPiece != null && drawableHitObject?.HitObject != null)
-                borderPiece.Alpha = (float)Math.Clamp((drawableHitObject.HitObject.StartTime - Time.Current) / 500, 0, 1);
+                AddInternal(HyperBorderPiece = new HyperBorderPiece());
         }
 
         private Drawable getFruitFor(FruitVisualRepresentation representation)
@@ -66,9 +59,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
                 case FruitVisualRepresentation.Pineapple:
                     return new PineapplePiece();
 
-                case FruitVisualRepresentation.Banana:
-                    return new BananaPiece();
-
                 case FruitVisualRepresentation.Raspberry:
                     return new RaspberryPiece();
             }

From b8f1c499a45f6dd71b925b2963ba7f5f7858d05c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 13:56:22 +0900
Subject: [PATCH 06686/10326] Allow PulpFormation to update formation
 dynamically

Pulps are lazily allocated but never deallocated for a DrawableFruit
---
 .../Objects/Drawables/Pieces/BananaPiece.cs   | 30 ---------
 .../Objects/Drawables/Pieces/FruitPiece.cs    | 46 ++++----------
 .../Drawables/Pieces/FruitPulpFormation.cs    | 63 +++++++++++++++++++
 .../Objects/Drawables/Pieces/GrapePiece.cs    | 42 -------------
 .../Objects/Drawables/Pieces/PearPiece.cs     | 42 -------------
 .../Drawables/Pieces/PineapplePiece.cs        | 48 --------------
 .../Objects/Drawables/Pieces/Pulp.cs          |  4 +-
 .../Objects/Drawables/Pieces/PulpFormation.cs | 26 +++++---
 .../Drawables/Pieces/RaspberryPiece.cs        | 48 --------------
 9 files changed, 95 insertions(+), 254 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPulpFormation.cs
 delete mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/GrapePiece.cs
 delete mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PearPiece.cs
 delete mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PineapplePiece.cs
 delete mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/RaspberryPiece.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs
deleted file mode 100644
index fa8837dec5..0000000000
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.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 osuTK;
-
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
-{
-    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/Pieces/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
index 9b5c00b2bf..e915253ff7 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
@@ -18,6 +18,17 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
         public FruitPiece()
         {
             RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new FruitPulpFormation
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    VisualRepresentation = { BindTarget = VisualRepresentation }
+                },
+                BorderPiece = new BorderPiece(),
+                HyperBorderPiece = new HyperBorderPiece()
+            };
         }
 
         protected override void LoadComplete()
@@ -29,41 +40,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
                 var fruit = (DrawableFruit)DrawableHitObject;
                 VisualRepresentation.BindTo(fruit.VisualRepresentation);
             }
-
-            VisualRepresentation.BindValueChanged(_ => recreateChildren(), true);
-        }
-
-        private void recreateChildren()
-        {
-            ClearInternal();
-
-            AddInternal(getFruitFor(VisualRepresentation.Value));
-
-            if (DrawableHitObject != null)
-                AddInternal(BorderPiece = new BorderPiece());
-
-            if (HyperDash.Value)
-                AddInternal(HyperBorderPiece = new HyperBorderPiece());
-        }
-
-        private Drawable getFruitFor(FruitVisualRepresentation representation)
-        {
-            switch (representation)
-            {
-                case FruitVisualRepresentation.Pear:
-                    return new PearPiece();
-
-                case FruitVisualRepresentation.Grape:
-                    return new GrapePiece();
-
-                case FruitVisualRepresentation.Pineapple:
-                    return new PineapplePiece();
-
-                case FruitVisualRepresentation.Raspberry:
-                    return new RaspberryPiece();
-            }
-
-            return Empty();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPulpFormation.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPulpFormation.cs
new file mode 100644
index 0000000000..cd870b1f98
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPulpFormation.cs
@@ -0,0 +1,63 @@
+// Copyright (c) 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 osuTK;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+{
+    public class FruitPulpFormation : PulpFormation
+    {
+        public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            VisualRepresentation.BindValueChanged(setFormation, true);
+        }
+
+        private void setFormation(ValueChangedEvent<FruitVisualRepresentation> visualRepresentation)
+        {
+            Clear();
+
+            switch (visualRepresentation.NewValue)
+            {
+                case FruitVisualRepresentation.Pear:
+                    Add(new Vector2(0, -0.33f), new Vector2(SMALL_PULP));
+                    Add(PositionAt(60, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    Add(PositionAt(180, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    Add(PositionAt(300, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    break;
+
+                case FruitVisualRepresentation.Grape:
+                    Add(new Vector2(0, -0.25f), new Vector2(SMALL_PULP));
+                    Add(PositionAt(0, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    Add(PositionAt(120, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    Add(PositionAt(240, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    break;
+
+                case FruitVisualRepresentation.Pineapple:
+                    Add(new Vector2(0, -0.3f), new Vector2(SMALL_PULP));
+                    Add(PositionAt(45, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    Add(PositionAt(135, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    Add(PositionAt(225, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    Add(PositionAt(315, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    break;
+
+                case FruitVisualRepresentation.Raspberry:
+                    Add(new Vector2(0, -0.34f), new Vector2(SMALL_PULP));
+                    Add(PositionAt(0, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    Add(PositionAt(90, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    Add(PositionAt(180, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    Add(PositionAt(270, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    break;
+
+                case FruitVisualRepresentation.Banana:
+                    Add(new Vector2(0, -0.3f), new Vector2(SMALL_PULP));
+                    Add(new Vector2(0, 0.05f), new Vector2(LARGE_PULP_4 * 0.8f, LARGE_PULP_4 * 2.5f));
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/GrapePiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/GrapePiece.cs
deleted file mode 100644
index 15349c18d5..0000000000
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/GrapePiece.cs
+++ /dev/null
@@ -1,42 +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 osuTK;
-
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
-{
-    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/Pieces/PearPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PearPiece.cs
deleted file mode 100644
index 3372a06996..0000000000
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PearPiece.cs
+++ /dev/null
@@ -1,42 +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 osuTK;
-
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
-{
-    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/Pieces/PineapplePiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PineapplePiece.cs
deleted file mode 100644
index 7f80c58178..0000000000
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PineapplePiece.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Graphics;
-using osuTK;
-
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
-{
-    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/Pieces/Pulp.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs
index d3e4945611..3113cf0ceb 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     public class Pulp : Circle
     {
+        public readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
+
         public Pulp()
         {
             RelativePositionAxes = Axes.Both;
@@ -22,8 +24,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
             Colour = Color4.White.Opacity(0.9f);
         }
 
-        public readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PulpFormation.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PulpFormation.cs
index 1df548e70a..412750019f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PulpFormation.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PulpFormation.cs
@@ -2,11 +2,9 @@
 // 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;
 
@@ -14,7 +12,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     public abstract class PulpFormation : CompositeDrawable
     {
-        protected readonly IBindable<Color4> AccentColour = new Bindable<Color4>();
+        public readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
 
         protected const float LARGE_PULP_3 = 16f * FruitPiece.RADIUS_ADJUST;
         protected const float DISTANCE_FROM_CENTRE_3 = 0.15f;
@@ -24,6 +22,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 
         protected const float SMALL_PULP = LARGE_PULP_3 / 2;
 
+        private int numPulps;
+
         protected PulpFormation()
         {
             RelativeSizeAxes = Axes.Both;
@@ -33,11 +33,23 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
             distance * MathF.Sin(angle * MathF.PI / 180),
             distance * MathF.Cos(angle * MathF.PI / 180));
 
-        [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableObject)
+        protected void Clear()
         {
-            DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
-            AccentColour.BindTo(drawableCatchObject.AccentColour);
+            for (; numPulps > 0; numPulps--)
+                InternalChildren[numPulps - 1].Alpha = 0;
+        }
+
+        protected void Add(Vector2 position, Vector2 size)
+        {
+            if (numPulps == InternalChildren.Count)
+                AddInternal(new Pulp { AccentColour = { BindTarget = AccentColour } });
+
+            var pulp = InternalChildren[numPulps];
+            pulp.Position = position;
+            pulp.Size = size;
+            pulp.Alpha = 1;
+
+            numPulps++;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/RaspberryPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/RaspberryPiece.cs
deleted file mode 100644
index 288ece95b2..0000000000
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/RaspberryPiece.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Graphics;
-using osuTK;
-
-namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
-{
-    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 c0f39514b9aba1295ba168ad29b541ba92d4b1a7 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 14:00:22 +0900
Subject: [PATCH 06687/10326] Fix legacy droplet scale

---
 osu.Game.Rulesets.Catch/Skinning/LegacyDropletPiece.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyDropletPiece.cs
index cc8886f631..8f4331d2a3 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyDropletPiece.cs
@@ -2,11 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
     public class LegacyDropletPiece : LegacyCatchHitObjectPiece
     {
+        public LegacyDropletPiece()
+        {
+            Scale = new Vector2(0.8f);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 7f1ad1040d3fef6def87abcd4144014b3952148b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 14:08:50 +0900
Subject: [PATCH 06688/10326] Don't inherit DrawableFruit from DrawableBanana

- A banana cannot be hyper
---
 .../Objects/Drawables/DrawableBanana.cs       | 15 +++++++++---
 .../Objects/Drawables/DrawableFruit.cs        |  7 ++----
 .../Objects/Drawables/Pieces/BananaPiece.cs   | 24 +++++++++++++++++++
 .../Drawables/Pieces/BananaPulpFormation.cs   | 16 +++++++++++++
 .../Drawables/Pieces/FruitPulpFormation.cs    |  5 ----
 .../Skinning/CatchLegacySkinTransformer.cs    |  2 +-
 .../Skinning/LegacyBananaPiece.cs             | 20 ++++++++++++++++
 .../Skinning/LegacyFruitPiece.cs              |  2 +-
 8 files changed, 76 insertions(+), 15 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPulpFormation.cs
 create mode 100644 osu.Game.Rulesets.Catch/Skinning/LegacyBananaPiece.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index 8e9d80106b..bdf257a13f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -2,14 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using JetBrains.Annotations;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableBanana : DrawableFruit
+    public class DrawableBanana : DrawablePalpableCatchHitObject
     {
-        protected override FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => FruitVisualRepresentation.Banana;
-
         public DrawableBanana()
             : this(null)
         {
@@ -20,6 +21,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            ScaleContainer.Child = new SkinnableDrawable(
+                new CatchSkinComponent(CatchSkinComponents.Banana),
+                _ => new BananaPiece());
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index 8db8f5ec82..63b48ea99f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -14,8 +14,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
     {
         public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
 
-        protected virtual FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => (FruitVisualRepresentation)(indexInBeatmap % 4);
-
         public DrawableFruit()
             : this(null)
         {
@@ -31,11 +29,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             IndexInBeatmap.BindValueChanged(change =>
             {
-                VisualRepresentation.Value = GetVisualRepresentation(change.NewValue);
+                VisualRepresentation.Value = (FruitVisualRepresentation)(change.NewValue % 4);
             }, true);
 
             ScaleContainer.Child = new SkinnableDrawable(
-                new CatchSkinComponent(this is DrawableBanana ? CatchSkinComponents.Banana : CatchSkinComponents.Fruit),
+                new CatchSkinComponent(CatchSkinComponents.Fruit),
                 _ => new FruitPiece());
         }
 
@@ -53,6 +51,5 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         Grape,
         Pineapple,
         Raspberry,
-        Banana // banananananannaanana
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs
new file mode 100644
index 0000000000..9f5d3f36df
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.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;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+{
+    public class BananaPiece : CatchHitObjectPiece
+    {
+        public BananaPiece()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new BananaPulpFormation
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                },
+                BorderPiece = new BorderPiece(),
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPulpFormation.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPulpFormation.cs
new file mode 100644
index 0000000000..b22d7fb413
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPulpFormation.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 osuTK;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
+{
+    public class BananaPulpFormation : PulpFormation
+    {
+        public BananaPulpFormation()
+        {
+            Add(new Vector2(0, -0.3f), new Vector2(SMALL_PULP));
+            Add(new Vector2(0, 0.05f), new Vector2(LARGE_PULP_4 * 0.8f, LARGE_PULP_4 * 2.5f));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPulpFormation.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPulpFormation.cs
index cd870b1f98..c0b1f588f5 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPulpFormation.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPulpFormation.cs
@@ -52,11 +52,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
                     Add(PositionAt(180, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
                     Add(PositionAt(270, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
                     break;
-
-                case FruitVisualRepresentation.Banana:
-                    Add(new Vector2(0, -0.3f), new Vector2(SMALL_PULP));
-                    Add(new Vector2(0, 0.05f), new Vector2(LARGE_PULP_4 * 0.8f, LARGE_PULP_4 * 2.5f));
-                    break;
             }
         }
     }
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 1889b230a7..b4bee8adc6 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
                 case CatchSkinComponents.Banana:
                     if (GetTexture("fruit-bananas") != null)
-                        return new LegacyFruitPiece();
+                        return new LegacyBananaPiece();
 
                     break;
 
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyBananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyBananaPiece.cs
new file mode 100644
index 0000000000..f80e50c8c0
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyBananaPiece.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.Textures;
+
+namespace osu.Game.Rulesets.Catch.Skinning
+{
+    public class LegacyBananaPiece : LegacyCatchHitObjectPiece
+    {
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Texture texture = Skin.GetTexture("fruit-bananas");
+            Texture overlayTexture = Skin.GetTexture("fruit-bananas-overlay");
+
+            SetTexture(texture, overlayTexture);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 7008234e99..9b3003f1d6 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
         private readonly string[] lookupNames =
         {
-            "fruit-pear", "fruit-grapes", "fruit-apple", "fruit-orange", "fruit-bananas"
+            "fruit-pear", "fruit-grapes", "fruit-apple", "fruit-orange"
         };
 
         protected override void LoadComplete()

From c1d39b64010652f194df448b74f9ccedc04fea0a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 14:10:17 +0900
Subject: [PATCH 06689/10326] Don't inherit Fruit from Banana

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index 3f71da713e..178306b3bc 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -14,7 +14,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects
 {
-    public class Banana : Fruit, IHasComboInformation
+    public class Banana : PalpableCatchHitObject, IHasComboInformation
     {
         /// <summary>
         /// Index of banana in current shower.

From 2469608c1004d73dcf6a71704acdf8fabe96f53d Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 15:19:18 +0900
Subject: [PATCH 06690/10326] Fix possible null reference due to bindable
 change before variable is initialized

---
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index ec0ce08004..ebdf23e5bd 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -33,9 +33,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             configSensitivity.BindValueChanged(val => sensitivityBindable.Value = val.NewValue);
             sensitivityBindable.BindValueChanged(val => configSensitivity.Value = val.NewValue);
 
-            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            windowMode.BindValueChanged(mode => confineMouseModeSetting.Alpha = mode.NewValue == WindowMode.Fullscreen ? 0 : 1);
-
             Children = new Drawable[]
             {
                 new SettingsCheckbox
@@ -70,6 +67,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 },
             };
 
+            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            windowMode.BindValueChanged(mode => confineMouseModeSetting.Alpha = mode.NewValue == WindowMode.Fullscreen ? 0 : 1);
+
             if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
             {
                 rawInputToggle.Disabled = true;

From f4eb17d398b5c98e711986fe02a1c4c30ca1b0a5 Mon Sep 17 00:00:00 2001
From: ekrctb <32995012+ekrctb@users.noreply.github.com>
Date: Mon, 7 Dec 2020 16:09:14 +0900
Subject: [PATCH 06691/10326] Update
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs

Set mouse confine mode at initialization

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index ebdf23e5bd..455e13711d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             };
 
             windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            windowMode.BindValueChanged(mode => confineMouseModeSetting.Alpha = mode.NewValue == WindowMode.Fullscreen ? 0 : 1);
+            windowMode.BindValueChanged(mode => confineMouseModeSetting.Alpha = mode.NewValue == WindowMode.Fullscreen ? 0 : 1, true);
 
             if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
             {

From 7253866e1790c7009304a1ebfb2f1ecb5cca1258 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Dec 2020 16:42:55 +0900
Subject: [PATCH 06692/10326] Move customisation panel to be in same area as
 main content

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 84 ++++++++++++----------
 1 file changed, 47 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 12da718ab2..34f5c70adb 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -158,37 +158,57 @@ namespace osu.Game.Overlays.Mods
                         },
                         new Drawable[]
                         {
-                            // Body
-                            new OsuScrollContainer
+                            new Container
                             {
-                                ScrollbarVisible = false,
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
                                 RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding
+                                Children = new Drawable[]
                                 {
-                                    Vertical = 10,
-                                    Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING
-                                },
-                                Child = ModSectionsContainer = new FillFlowContainer<ModSection>
-                                {
-                                    Origin = Anchor.TopCentre,
-                                    Anchor = Anchor.TopCentre,
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Spacing = new Vector2(0f, 10f),
-                                    Width = content_width,
-                                    LayoutDuration = 200,
-                                    LayoutEasing = Easing.OutQuint,
-                                    Children = new ModSection[]
+                                    // Body
+                                    new OsuScrollContainer
                                     {
-                                        new DifficultyReductionSection { Action = modButtonPressed },
-                                        new DifficultyIncreaseSection { Action = modButtonPressed },
-                                        new AutomationSection { Action = modButtonPressed },
-                                        new ConversionSection { Action = modButtonPressed },
-                                        new FunSection { Action = modButtonPressed },
-                                    }
-                                },
+                                        ScrollbarVisible = false,
+                                        Origin = Anchor.TopCentre,
+                                        Anchor = Anchor.TopCentre,
+                                        RelativeSizeAxes = Axes.Both,
+                                        Padding = new MarginPadding
+                                        {
+                                            Vertical = 10,
+                                            Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING
+                                        },
+                                        Children = new Drawable[]
+                                        {
+                                            ModSectionsContainer = new FillFlowContainer<ModSection>
+                                            {
+                                                Origin = Anchor.TopCentre,
+                                                Anchor = Anchor.TopCentre,
+                                                RelativeSizeAxes = Axes.X,
+                                                AutoSizeAxes = Axes.Y,
+                                                Spacing = new Vector2(0f, 10f),
+                                                Width = content_width,
+                                                LayoutDuration = 200,
+                                                LayoutEasing = Easing.OutQuint,
+                                                Children = new ModSection[]
+                                                {
+                                                    new DifficultyReductionSection { Action = modButtonPressed },
+                                                    new DifficultyIncreaseSection { Action = modButtonPressed },
+                                                    new AutomationSection { Action = modButtonPressed },
+                                                    new ConversionSection { Action = modButtonPressed },
+                                                    new FunSection { Action = modButtonPressed },
+                                                }
+                                            },
+                                        }
+                                    },
+                                    ModSettingsContainer = new ModSettingsContainer
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Anchor = Anchor.BottomRight,
+                                        Origin = Anchor.BottomRight,
+                                        Width = 0.3f,
+                                        Alpha = 0,
+                                        Padding = new MarginPadding(30),
+                                        SelectedMods = { BindTarget = SelectedMods },
+                                    },
+                                }
                             },
                         },
                         new Drawable[]
@@ -281,16 +301,6 @@ namespace osu.Game.Overlays.Mods
                         },
                     },
                 },
-                ModSettingsContainer = new ModSettingsContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.BottomRight,
-                    Origin = Anchor.BottomRight,
-                    Width = 0.25f,
-                    Alpha = 0,
-                    X = -100,
-                    SelectedMods = { BindTarget = SelectedMods },
-                }
             };
 
             ((IBindable<bool>)CustomiseButton.Enabled).BindTo(ModSettingsContainer.HasSettingsForSelection);

From 454e94574c5c8a7a3c4989c4a1b79b1c47f5967a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Dec 2020 16:43:07 +0900
Subject: [PATCH 06693/10326] Add corner rounding and positional transform

---
 .../Overlays/Mods/ModSettingsContainer.cs     | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSettingsContainer.cs b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
index a1d00f91b4..1c57ff54ad 100644
--- a/osu.Game/Overlays/Mods/ModSettingsContainer.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
@@ -27,28 +27,40 @@ namespace osu.Game.Overlays.Mods
 
         private readonly FillFlowContainer<ModControlSection> modSettingsContent;
 
-        private const double transition_duration = 200;
+        private readonly Container content;
+
+        private const double transition_duration = 400;
 
         public ModSettingsContainer()
         {
-            Children = new Drawable[]
+            RelativeSizeAxes = Axes.Both;
+
+            Child = content = new Container
             {
-                new Box
+                Masking = true,
+                CornerRadius = 10,
+                RelativeSizeAxes = Axes.Both,
+                RelativePositionAxes = Axes.Both,
+                X = 1,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = new Color4(0, 0, 0, 192)
-                },
-                new OsuScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = modSettingsContent = new FillFlowContainer<ModControlSection>
+                    new Box
                     {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Spacing = new Vector2(0f, 10f),
-                        Padding = new MarginPadding(20),
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = new Color4(0, 0, 0, 192)
+                    },
+                    new OsuScrollContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Child = modSettingsContent = new FillFlowContainer<ModControlSection>
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Spacing = new Vector2(0f, 10f),
+                            Padding = new MarginPadding(20),
+                        }
                     }
                 }
             };
@@ -86,11 +98,13 @@ namespace osu.Game.Overlays.Mods
         protected override void PopIn()
         {
             this.FadeIn(transition_duration, Easing.OutQuint);
+            content.MoveToX(0, transition_duration, Easing.OutQuint);
         }
 
         protected override void PopOut()
         {
             this.FadeOut(transition_duration, Easing.OutQuint);
+            content.MoveToX(1, transition_duration, Easing.OutQuint);
         }
     }
 }

From a548269c341296145d5381ca6d1365640be50991 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 17:26:12 +0900
Subject: [PATCH 06694/10326] Fix scrolling hit object displayed in wrong
 position for one frame

---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 3a5e3c098f..289578f3d8 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -225,10 +225,19 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
 
             toComputeLifetime.Clear();
+        }
 
-            // only AliveObjects need to be considered for layout (reduces overhead in the case of scroll speed changes).
+        protected override void UpdateAfterChildrenLife()
+        {
+            base.UpdateAfterChildrenLife();
+
+            // We need to calculate hit object positions (including nested hit objects) as soon as possible after lifetimes
+            // to prevent hit objects displayed in a wrong position for one frame.
+            // Only AliveObjects need to be considered for layout (reduces overhead in the case of scroll speed changes).
             foreach (var obj in AliveObjects)
             {
+                updatePosition(obj, Time.Current);
+
                 if (layoutComputed.Contains(obj))
                     continue;
 
@@ -293,15 +302,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
             }
         }
 
-        protected override void UpdateAfterChildrenLife()
-        {
-            base.UpdateAfterChildrenLife();
-
-            // We need to calculate hitobject positions as soon as possible after lifetimes so that hitobjects get the final say in their positions
-            foreach (var obj in AliveObjects)
-                updatePosition(obj, Time.Current);
-        }
-
         private void updatePosition(DrawableHitObject hitObject, double currentTime)
         {
             switch (direction.Value)

From eb38bc4b4c755f0e7612cf9b9e10063341c4f318 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Dec 2020 18:00:45 +0900
Subject: [PATCH 06695/10326] Add the ability to import into
 ArchiveModelManagers from a stream

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 15 ++--
 .../Menus/TestSceneMusicActionHandling.cs     |  3 +-
 .../Online/TestSceneDirectDownloadButton.cs   |  2 +-
 .../TestSceneDeleteLocalScore.cs              |  3 +-
 osu.Game/Database/ArchiveModelManager.cs      | 55 ++++++--------
 .../DownloadableArchiveModelManager.cs        |  2 +-
 osu.Game/Database/ICanAcceptFiles.cs          |  8 ++
 osu.Game/Database/ImportTask.cs               | 73 +++++++++++++++++++
 osu.Game/OsuGameBase.cs                       | 11 +++
 .../Screens/Edit/Setup/ResourcesSection.cs    |  3 +
 10 files changed, 132 insertions(+), 43 deletions(-)
 create mode 100644 osu.Game/Database/ImportTask.cs

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index b941313103..6e16058360 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -14,6 +14,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.IO;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
@@ -127,7 +128,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                         // zip files differ because different compression or encoder.
                         Assert.AreNotEqual(hashBefore, hashFile(temp));
 
-                        var importedSecondTime = await osu.Dependencies.Get<BeatmapManager>().Import(temp);
+                        var importedSecondTime = await osu.Dependencies.Get<BeatmapManager>().Import(new ImportTask(temp));
 
                         ensureLoaded(osu);
 
@@ -184,7 +185,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                             zip.SaveTo(temp, new ZipWriterOptions(CompressionType.Deflate));
                         }
 
-                        var importedSecondTime = await osu.Dependencies.Get<BeatmapManager>().Import(temp);
+                        var importedSecondTime = await osu.Dependencies.Get<BeatmapManager>().Import(new ImportTask(temp));
 
                         ensureLoaded(osu);
 
@@ -235,7 +236,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                             zip.SaveTo(temp, new ZipWriterOptions(CompressionType.Deflate));
                         }
 
-                        var importedSecondTime = await osu.Dependencies.Get<BeatmapManager>().Import(temp);
+                        var importedSecondTime = await osu.Dependencies.Get<BeatmapManager>().Import(new ImportTask(temp));
 
                         ensureLoaded(osu);
 
@@ -351,7 +352,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     // this will trigger purging of the existing beatmap (online set id match) but should rollback due to broken osu.
                     try
                     {
-                        await manager.Import(breakTemp);
+                        await manager.Import(new ImportTask(breakTemp));
                     }
                     catch
                     {
@@ -614,7 +615,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                             zip.SaveTo(temp, new ZipWriterOptions(CompressionType.Deflate));
                         }
 
-                        var imported = await osu.Dependencies.Get<BeatmapManager>().Import(temp);
+                        var imported = await osu.Dependencies.Get<BeatmapManager>().Import(new ImportTask(temp));
 
                         ensureLoaded(osu);
 
@@ -667,7 +668,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                             zip.SaveTo(temp, new ZipWriterOptions(CompressionType.Deflate));
                         }
 
-                        var imported = await osu.Dependencies.Get<BeatmapManager>().Import(temp);
+                        var imported = await osu.Dependencies.Get<BeatmapManager>().Import(new ImportTask(temp));
 
                         ensureLoaded(osu);
 
@@ -821,7 +822,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
             var manager = osu.Dependencies.Get<BeatmapManager>();
 
-            var importedSet = await manager.Import(temp);
+            var importedSet = await manager.Import(new ImportTask(temp));
 
             ensureLoaded(osu);
 
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
index b34e027e9c..aaf3323432 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
 using osu.Game.Tests.Resources;
@@ -52,7 +53,7 @@ namespace osu.Game.Tests.Visual.Menus
 
             AddStep("import beatmap with track", () =>
             {
-                var setWithTrack = Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).Result;
+                var setWithTrack = Game.BeatmapManager.Import(new ImportTask(TestResources.GetTestBeatmapForImport())).Result;
                 Beatmap.Value = Game.BeatmapManager.GetWorkingBeatmap(setWithTrack.Beatmaps.First());
             });
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
index 684ce10820..63bda08c88 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Online
             ensureSoleilyRemoved();
             createButtonWithBeatmap(createSoleily());
             AddAssert("button state not downloaded", () => downloadButton.DownloadState == DownloadState.NotDownloaded);
-            AddStep("import soleily", () => beatmaps.Import(new[] { TestResources.GetTestBeatmapForImport() }));
+            AddStep("import soleily", () => beatmaps.Import(TestResources.GetTestBeatmapForImport()));
             AddUntilStep("wait for beatmap import", () => beatmaps.GetAllUsableBeatmapSets().Any(b => b.OnlineBeatmapSetID == 241526));
             createButtonWithBeatmap(createSoleily());
             AddAssert("button state downloaded", () => downloadButton.DownloadState == DownloadState.LocallyAvailable);
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index e54292f7cc..81862448a8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -12,6 +12,7 @@ using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Leaderboards;
@@ -83,7 +84,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesetStore, null, dependencies.Get<AudioManager>(), dependencies.Get<GameHost>(), Beatmap.Default));
             dependencies.Cache(scoreManager = new ScoreManager(rulesetStore, () => beatmapManager, LocalStorage, null, ContextFactory));
 
-            beatmap = beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Result.Beatmaps[0];
+            beatmap = beatmapManager.Import(new ImportTask(TestResources.GetTestBeatmapForImport())).Result.Beatmaps[0];
 
             for (int i = 0; i < 50; i++)
             {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 8bdc804311..e18dc7f7eb 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -21,9 +21,7 @@ using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.IPC;
 using osu.Game.Overlays.Notifications;
-using osu.Game.Utils;
 using SharpCompress.Archives.Zip;
-using SharpCompress.Common;
 using FileInfo = osu.Game.IO.FileInfo;
 
 namespace osu.Game.Database
@@ -114,10 +112,19 @@ namespace osu.Game.Database
 
             PostNotification?.Invoke(notification);
 
-            return Import(notification, paths);
+            return Import(notification, paths.Select(p => new ImportTask(p)).ToArray());
         }
 
-        protected async Task<IEnumerable<TModel>> Import(ProgressNotification notification, params string[] paths)
+        public Task Import(Stream stream, string filename)
+        {
+            var notification = new ProgressNotification { State = ProgressNotificationState.Active };
+
+            PostNotification?.Invoke(notification);
+
+            return Import(notification, new ImportTask(stream, filename));
+        }
+
+        protected async Task<IEnumerable<TModel>> Import(ProgressNotification notification, params ImportTask[] tasks)
         {
             notification.Progress = 0;
             notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import is initialising...";
@@ -126,13 +133,13 @@ namespace osu.Game.Database
 
             var imported = new List<TModel>();
 
-            await Task.WhenAll(paths.Select(async path =>
+            await Task.WhenAll(tasks.Select(async task =>
             {
                 notification.CancellationToken.ThrowIfCancellationRequested();
 
                 try
                 {
-                    var model = await Import(path, notification.CancellationToken);
+                    var model = await Import(task, notification.CancellationToken);
 
                     lock (imported)
                     {
@@ -140,8 +147,8 @@ namespace osu.Game.Database
                             imported.Add(model);
                         current++;
 
-                        notification.Text = $"Imported {current} of {paths.Length} {HumanisedModelName}s";
-                        notification.Progress = (float)current / paths.Length;
+                        notification.Text = $"Imported {current} of {tasks.Length} {HumanisedModelName}s";
+                        notification.Progress = (float)current / tasks.Length;
                     }
                 }
                 catch (TaskCanceledException)
@@ -150,7 +157,7 @@ namespace osu.Game.Database
                 }
                 catch (Exception e)
                 {
-                    Logger.Error(e, $@"Could not import ({Path.GetFileName(path)})", LoggingTarget.Database);
+                    Logger.Error(e, $@"Could not import ({task})", LoggingTarget.Database);
                 }
             }));
 
@@ -183,16 +190,17 @@ namespace osu.Game.Database
 
         /// <summary>
         /// Import one <typeparamref name="TModel"/> from the filesystem and delete the file on success.
+        /// Note that this bypasses the UI flow and should only be used for special cases or testing.
         /// </summary>
-        /// <param name="path">The archive location on disk.</param>
+        /// <param name="task">The archive location on disk.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
         /// <returns>The imported model, if successful.</returns>
-        public async Task<TModel> Import(string path, CancellationToken cancellationToken = default)
+        internal async Task<TModel> Import(ImportTask task, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
             TModel import;
-            using (ArchiveReader reader = getReaderFrom(path))
+            using (ArchiveReader reader = task.GetReader())
                 import = await Import(reader, cancellationToken);
 
             // We may or may not want to delete the file depending on where it is stored.
@@ -201,12 +209,12 @@ namespace osu.Game.Database
             // TODO: Add a check to prevent files from storage to be deleted.
             try
             {
-                if (import != null && File.Exists(path) && ShouldDeleteArchive(path))
-                    File.Delete(path);
+                if (import != null && File.Exists(task.Path) && ShouldDeleteArchive(task.Path))
+                    File.Delete(task.Path);
             }
             catch (Exception e)
             {
-                LogForModel(import, $@"Could not delete original file after import ({Path.GetFileName(path)})", e);
+                LogForModel(import, $@"Could not delete original file after import ({task})", e);
             }
 
             return import;
@@ -727,23 +735,6 @@ namespace osu.Game.Database
 
         protected virtual string HumanisedModelName => $"{typeof(TModel).Name.Replace("Info", "").ToLower()}";
 
-        /// <summary>
-        /// Creates an <see cref="ArchiveReader"/> from a valid storage path.
-        /// </summary>
-        /// <param name="path">A file or folder path resolving the archive content.</param>
-        /// <returns>A reader giving access to the archive's content.</returns>
-        private ArchiveReader getReaderFrom(string path)
-        {
-            if (ZipUtils.IsZipArchive(path))
-                return new ZipArchiveReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read), Path.GetFileName(path));
-            if (Directory.Exists(path))
-                return new LegacyDirectoryArchiveReader(path);
-            if (File.Exists(path))
-                return new LegacyFileArchiveReader(path);
-
-            throw new InvalidFormatException($"{path} is not a valid archive");
-        }
-
         #region Event handling / delaying
 
         private readonly List<Action> queuedEvents = new List<Action>();
diff --git a/osu.Game/Database/DownloadableArchiveModelManager.cs b/osu.Game/Database/DownloadableArchiveModelManager.cs
index 8f469ca590..50b022f9ff 100644
--- a/osu.Game/Database/DownloadableArchiveModelManager.cs
+++ b/osu.Game/Database/DownloadableArchiveModelManager.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Database
                 Task.Factory.StartNew(async () =>
                 {
                     // This gets scheduled back to the update thread, but we want the import to run in the background.
-                    var imported = await Import(notification, filename);
+                    var imported = await Import(notification, new ImportTask(filename));
 
                     // for now a failed import will be marked as a failed download for simplicity.
                     if (!imported.Any())
diff --git a/osu.Game/Database/ICanAcceptFiles.cs b/osu.Game/Database/ICanAcceptFiles.cs
index e4d92d957c..276c284c9f 100644
--- a/osu.Game/Database/ICanAcceptFiles.cs
+++ b/osu.Game/Database/ICanAcceptFiles.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace osu.Game.Database
@@ -17,6 +18,13 @@ namespace osu.Game.Database
         /// <param name="paths">The files which should be imported.</param>
         Task Import(params string[] paths);
 
+        /// <summary>
+        /// Import the provided stream as a simple item.
+        /// </summary>
+        /// <param name="stream">The stream to import files from. Should be in a supported archive format.</param>
+        /// <param name="filename">The filename of the archive being imported.</param>
+        Task Import(Stream stream, string filename);
+
         /// <summary>
         /// An array of accepted file extensions (in the standard format of ".abc").
         /// </summary>
diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
new file mode 100644
index 0000000000..89eb347df0
--- /dev/null
+++ b/osu.Game/Database/ImportTask.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.IO;
+using osu.Game.IO.Archives;
+using osu.Game.Utils;
+using SharpCompress.Common;
+
+namespace osu.Game.Database
+{
+    /// <summary>
+    /// An encapsulated import task to be imported to an <see cref="ArchiveModelManager{TModel,TFileModel}"/>.
+    /// </summary>
+    public class ImportTask
+    {
+        /// <summary>
+        /// The path to the file (or filename in the case a stream is provided).
+        /// </summary>
+        public string Path { get; }
+
+        /// <summary>
+        /// An optional stream which provides the file content.
+        /// </summary>
+        public Stream Stream { get; }
+
+        /// <summary>
+        /// Construct a new import task from a path (on a local filesystem).
+        /// </summary>
+        public ImportTask(string path)
+        {
+            Path = path;
+        }
+
+        /// <summary>
+        /// Construct a new import task from a stream.
+        /// </summary>
+        public ImportTask(Stream stream, string filename)
+        {
+            Path = filename;
+            Stream = stream;
+        }
+
+        /// <summary>
+        /// Retrieve an archive reader from this task.
+        /// </summary>
+        public ArchiveReader GetReader()
+        {
+            if (Stream != null)
+                return new ZipArchiveReader(Stream, Path);
+
+            return getReaderFrom(Path);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="ArchiveReader"/> from a valid storage path.
+        /// </summary>
+        /// <param name="path">A file or folder path resolving the archive content.</param>
+        /// <returns>A reader giving access to the archive's content.</returns>
+        private ArchiveReader getReaderFrom(string path)
+        {
+            if (ZipUtils.IsZipArchive(path))
+                return new ZipArchiveReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read), System.IO.Path.GetFileName(path));
+            if (Directory.Exists(path))
+                return new LegacyDirectoryArchiveReader(path);
+            if (File.Exists(path))
+                return new LegacyFileArchiveReader(path);
+
+            throw new InvalidFormatException($"{path} is not a valid archive");
+        }
+
+        public override string ToString() => System.IO.Path.GetFileName(Path);
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e7b5d3304d..0fc2b8d1d7 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -395,6 +395,17 @@ namespace osu.Game
             }
         }
 
+        public async Task Import(Stream stream, string filename)
+        {
+            var extension = Path.GetExtension(filename)?.ToLowerInvariant();
+
+            foreach (var importer in fileImporters)
+            {
+                if (importer.HandledExtensions.Contains(extension))
+                    await importer.Import(stream, Path.GetFileNameWithoutExtension(filename));
+            }
+        }
+
         public IEnumerable<string> HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions);
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 17ecfdd52e..0c957b80af 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.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;
@@ -99,6 +100,8 @@ namespace osu.Game.Screens.Edit.Setup
             return Task.CompletedTask;
         }
 
+        Task ICanAcceptFiles.Import(Stream stream, string filename) => throw new NotImplementedException();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 12c6b3c1fb8df3431cc7b64db5aeda623c0a2687 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 7 Dec 2020 18:12:55 +0900
Subject: [PATCH 06696/10326] Pool catcher trail sprite

---
 .../UI/CatcherTrailDisplay.cs                 | 22 +++++++++++--------
 .../UI/CatcherTrailSprite.cs                  | 18 ++++++++++++---
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
index f7e9fd19a7..fa65190032 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
@@ -6,6 +6,7 @@ using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
@@ -20,6 +21,8 @@ namespace osu.Game.Rulesets.Catch.UI
     {
         private readonly Catcher catcher;
 
+        private readonly DrawablePool<CatcherTrailSprite> trailPool;
+
         private readonly Container<CatcherTrailSprite> dashTrails;
         private readonly Container<CatcherTrailSprite> hyperDashTrails;
         private readonly Container<CatcherTrailSprite> endGlowSprites;
@@ -80,8 +83,9 @@ namespace osu.Game.Rulesets.Catch.UI
 
             RelativeSizeAxes = Axes.Both;
 
-            InternalChildren = new[]
+            InternalChildren = new Drawable[]
             {
+                trailPool = new DrawablePool<CatcherTrailSprite>(30),
                 dashTrails = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both },
                 hyperDashTrails = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR },
                 endGlowSprites = new Container<CatcherTrailSprite> { RelativeSizeAxes = Axes.Both, Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR },
@@ -118,14 +122,14 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             var texture = (catcher.CurrentDrawableCatcher as TextureAnimation)?.CurrentFrame ?? ((Sprite)catcher.CurrentDrawableCatcher).Texture;
 
-            var sprite = new CatcherTrailSprite(texture)
-            {
-                Anchor = catcher.Anchor,
-                Scale = catcher.Scale,
-                Blending = BlendingParameters.Additive,
-                RelativePositionAxes = catcher.RelativePositionAxes,
-                Position = catcher.Position
-            };
+            CatcherTrailSprite sprite = trailPool.Get();
+
+            sprite.Texture = texture;
+            sprite.Anchor = catcher.Anchor;
+            sprite.Scale = catcher.Scale;
+            sprite.Blending = BlendingParameters.Additive;
+            sprite.RelativePositionAxes = catcher.RelativePositionAxes;
+            sprite.Position = catcher.Position;
 
             target.Add(sprite);
 
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs b/osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs
index 56cb7dbfda..b3be18d46b 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs
@@ -1,17 +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.Graphics;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
-    public class CatcherTrailSprite : Sprite
+    public class CatcherTrailSprite : PoolableDrawable
     {
-        public CatcherTrailSprite(Texture texture)
+        public Texture Texture
         {
-            Texture = texture;
+            set => sprite.Texture = value;
+        }
+
+        private readonly Sprite sprite;
+
+        public CatcherTrailSprite()
+        {
+            InternalChild = sprite = new Sprite
+            {
+                RelativeSizeAxes = Axes.Both
+            };
 
             Size = new Vector2(CatcherArea.CATCHER_SIZE);
 

From 8eb1076fd7e276a74415ff98d9011703dcb6e0f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Dec 2020 18:18:14 +0900
Subject: [PATCH 06697/10326] Add test coverage

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 6e16058360..c32e359de6 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -69,6 +69,42 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
+        [Test]
+        public async Task TestImportThenDeleteFromStream()
+        {
+            // unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host);
+
+                    var tempPath = TestResources.GetTestBeatmapForImport();
+
+                    var manager = osu.Dependencies.Get<BeatmapManager>();
+
+                    BeatmapSetInfo importedSet;
+
+                    using (var stream = File.OpenRead(tempPath))
+                    {
+                        importedSet = await manager.Import(new ImportTask(stream, Path.GetFileName(tempPath)));
+                        ensureLoaded(osu);
+                    }
+
+                    Assert.IsTrue(File.Exists(tempPath), "Stream source file somehow went missing");
+                    File.Delete(tempPath);
+
+                    var imported = manager.GetAllUsableBeatmapSets().Find(beatmapSet => beatmapSet.ID == importedSet.ID);
+
+                    deleteBeatmapSet(imported, osu);
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         [Test]
         public async Task TestImportThenImport()
         {

From fa658747631ab6c4f7176da1a2b5ea1f2cff125a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Dec 2020 21:09:38 +0900
Subject: [PATCH 06698/10326] Limit room name to 100 characters

---
 osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 668a373d80..b8003b9774 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -135,6 +135,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                                     {
                                                                         RelativeSizeAxes = Axes.X,
                                                                         TabbableContentContainer = this,
+                                                                        LengthLimit = 100
                                                                     },
                                                                 },
                                                                 new Section("Duration")

From eda6e1fbddb46b9eec3a33a1417581154645ff8a Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 7 Dec 2020 13:11:13 +0100
Subject: [PATCH 06699/10326] Add tournament switching in the UI

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 18 ++++++++++++++++++
 osu.Game.Tournament/Screens/SetupScreen.cs  | 13 +++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 2e8a6ce667..66e27ddbb5 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -1,10 +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.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.IO;
 using System.IO;
+using System.Collections.Generic;
 using osu.Game.Tournament.Configuration;
 
 namespace osu.Game.Tournament.IO
@@ -13,12 +15,15 @@ namespace osu.Game.Tournament.IO
     {
         private const string default_tournament = "default";
         private readonly Storage storage;
+        private readonly Storage allTournaments;
         private readonly TournamentStorageManager storageConfig;
+        public readonly Bindable<string> CurrentTournament;
 
         public TournamentStorage(Storage storage)
             : base(storage.GetStorageForDirectory("tournaments"), string.Empty)
         {
             this.storage = storage;
+            allTournaments = UnderlyingStorage;
 
             storageConfig = new TournamentStorageManager(storage);
 
@@ -29,9 +34,22 @@ namespace osu.Game.Tournament.IO
             else
                 Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
 
+            CurrentTournament = new Bindable<string>(storageConfig.Get<string>(StorageConfig.CurrentTournament));
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
+
+            CurrentTournament.BindValueChanged(updateTournament, false);
         }
 
+        private void updateTournament(ValueChangedEvent<string> newTournament)
+        {
+            ChangeTargetStorage(allTournaments.GetStorageForDirectory(newTournament.NewValue));
+            Logger.Log("Changing tournament storage: " + GetFullPath(string.Empty));
+            storageConfig.Set(StorageConfig.CurrentTournament, newTournament.NewValue);
+            storageConfig.Save();
+        }
+
+        public IEnumerable<string> ListTournaments() => allTournaments.GetDirectories(string.Empty);
+
         public override void Migrate(Storage newStorage)
         {
             // this migration only happens once on moving to the per-tournament storage system.
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index e78d3a9e83..9f34c36e64 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -9,8 +9,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Platform;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Tournament.IO;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
@@ -40,6 +42,9 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        [Resolved]
+        private Storage storage { get; set; }
+
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
@@ -70,6 +75,7 @@ namespace osu.Game.Tournament.Screens
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
+            var tourneyStorage = storage as TournamentStorage;
             fillFlow.Children = new Drawable[]
             {
                 new ActionableInfo
@@ -111,6 +117,13 @@ namespace osu.Game.Tournament.Screens
                     Items = rulesets.AvailableRulesets,
                     Current = LadderInfo.Ruleset,
                 },
+                new LabelledDropdown<string>
+                {
+                    Label = "Current tournament",
+                    Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart after selecting to apply changes.",
+                    Items = tourneyStorage?.ListTournaments(),
+                    Current = tourneyStorage?.CurrentTournament,
+                },
                 resolution = new ResolutionSelector
                 {
                     Label = "Stream area resolution",

From 191f863a494dcbdab5aabb92c0686ddded29fabf Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 7 Dec 2020 13:14:59 +0100
Subject: [PATCH 06700/10326] Remove unncessary words from the description

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

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 9f34c36e64..f22cd13cea 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tournament.Screens
                 new LabelledDropdown<string>
                 {
                     Label = "Current tournament",
-                    Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart after selecting to apply changes.",
+                    Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart to apply changes.",
                     Items = tourneyStorage?.ListTournaments(),
                     Current = tourneyStorage?.CurrentTournament,
                 },

From 5be0672fe91eec0f766f8fd88f1434f41d22b7a3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Dec 2020 21:54:42 +0900
Subject: [PATCH 06701/10326] Split out enums

---
 .../Multi/Lounge/Components/FilterControl.cs   | 18 ------------------
 .../Lounge/Components/RoomCategoryFilter.cs    | 12 ++++++++++++
 .../Lounge/Components/RoomStatusFilter.cs      | 17 +++++++++++++++++
 3 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/Lounge/Components/RoomCategoryFilter.cs
 create mode 100644 osu.Game/Screens/Multi/Lounge/Components/RoomStatusFilter.cs

diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 3fc1359006..2afadc6536 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.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.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -71,21 +70,4 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             };
         }
     }
-
-    public enum RoomStatusFilter
-    {
-        Open,
-
-        [Description("Recently Ended")]
-        Ended,
-        Participated,
-        Owned,
-    }
-
-    public enum RoomCategoryFilter
-    {
-        Any,
-        Normal,
-        Spotlight
-    }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomCategoryFilter.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomCategoryFilter.cs
new file mode 100644
index 0000000000..c076905174
--- /dev/null
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomCategoryFilter.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.Screens.Multi.Lounge.Components
+{
+    public enum RoomCategoryFilter
+    {
+        Any,
+        Normal,
+        Spotlight
+    }
+}
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomStatusFilter.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomStatusFilter.cs
new file mode 100644
index 0000000000..9da938ac8b
--- /dev/null
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomStatusFilter.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.ComponentModel;
+
+namespace osu.Game.Screens.Multi.Lounge.Components
+{
+    public enum RoomStatusFilter
+    {
+        Open,
+
+        [Description("Recently Ended")]
+        Ended,
+        Participated,
+        Owned,
+    }
+}

From 1b3836aeef6c531f59035a3ff98d5bf1ad9273aa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Dec 2020 21:59:26 +0900
Subject: [PATCH 06702/10326] Re-implement multiplayer FilterControl

---
 .../Multi/Lounge/Components/FilterControl.cs  | 110 ++++++++++++++----
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |   8 +-
 2 files changed, 89 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 2afadc6536..032c50aa73 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -3,21 +3,21 @@
 
 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.Threading;
-using osu.Game.Overlays.SearchableList;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
-    public class FilterControl : SearchableListFilterControl<RoomStatusFilter, RoomCategoryFilter>
+    public abstract class FilterControl : CompositeDrawable
     {
-        protected override Color4 BackgroundColour => Color4.Black.Opacity(0.5f);
-        protected override RoomStatusFilter DefaultTab => RoomStatusFilter.Open;
-        protected override RoomCategoryFilter DefaultCategory => RoomCategoryFilter.Any;
-
-        protected override float ContentHorizontalPadding => base.ContentHorizontalPadding + OsuScreen.HORIZONTAL_OVERFLOW_PADDING;
+        protected const float VERTICAL_PADDING = 10;
+        protected const float HORIZONTAL_PADDING = 80;
 
         [Resolved(CanBeNull = true)]
         private Bindable<FilterCriteria> filter { get; set; }
@@ -25,49 +25,109 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
+        private readonly Box tabStrip;
+        private readonly SearchTextBox search;
+        private readonly PageTabControl<RoomStatusFilter> tabs;
+
         public FilterControl()
         {
-            DisplayStyleControl.Hide();
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                    Alpha = 0.25f,
+                },
+                tabStrip = new Box
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.X,
+                    Height = 1,
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding
+                    {
+                        Top = VERTICAL_PADDING,
+                        Horizontal = HORIZONTAL_PADDING
+                    },
+                    Children = new Drawable[]
+                    {
+                        search = new FilterSearchTextBox
+                        {
+                            RelativeSizeAxes = Axes.X,
+                        },
+                        tabs = new PageTabControl<RoomStatusFilter>
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            RelativeSizeAxes = Axes.X,
+                        },
+                    }
+                }
+            };
+
+            tabs.Current.Value = RoomStatusFilter.Open;
+            tabs.Current.TriggerChange();
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
             filter ??= new Bindable<FilterCriteria>();
+            tabStrip.Colour = colours.Yellow;
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            ruleset.BindValueChanged(_ => updateFilter());
-            Search.Current.BindValueChanged(_ => scheduleUpdateFilter());
-            Dropdown.Current.BindValueChanged(_ => updateFilter());
-            Tabs.Current.BindValueChanged(_ => updateFilter(), true);
+            search.Current.BindValueChanged(_ => updateFilterDebounced());
+            ruleset.BindValueChanged(_ => UpdateFilter());
+            tabs.Current.BindValueChanged(_ => UpdateFilter(), true);
         }
 
         private ScheduledDelegate scheduledFilterUpdate;
 
-        private void scheduleUpdateFilter()
+        private void updateFilterDebounced()
         {
             scheduledFilterUpdate?.Cancel();
-            scheduledFilterUpdate = Scheduler.AddDelayed(updateFilter, 200);
+            scheduledFilterUpdate = Scheduler.AddDelayed(UpdateFilter, 200);
         }
 
-        private void updateFilter()
+        protected void UpdateFilter()
         {
             scheduledFilterUpdate?.Cancel();
 
-            if (filter == null)
-                return;
+            var criteria = CreateCriteria();
+            criteria.SearchString = search.Current.Value;
+            criteria.Status = tabs.Current.Value;
+            criteria.Ruleset = ruleset.Value;
 
-            filter.Value = new FilterCriteria
+            filter.Value = criteria;
+        }
+
+        protected virtual FilterCriteria CreateCriteria() => new FilterCriteria();
+
+        public bool HoldFocus
+        {
+            get => search.HoldFocus;
+            set => search.HoldFocus = value;
+        }
+
+        public void TakeFocus() => search.TakeFocus();
+
+        private class FilterSearchTextBox : SearchTextBox
+        {
+            [BackgroundDependencyLoader]
+            private void load()
             {
-                SearchString = Search.Current.Value ?? string.Empty,
-                StatusFilter = Tabs.Current.Value,
-                RoomCategoryFilter = Dropdown.Current.Value,
-                Ruleset = ruleset.Value
-            };
+                BackgroundUnfocused = OsuColour.Gray(0.06f);
+                BackgroundFocused = OsuColour.Gray(0.12f);
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 4dc9ba549b..b33a79772e 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
         protected override void OnFocus(FocusEvent e)
         {
-            Filter.Search.TakeFocus();
+            Filter.TakeFocus();
         }
 
         public override void OnEntering(IScreen last)
@@ -136,19 +136,19 @@ namespace osu.Game.Screens.Multi.Lounge
 
         private void onReturning()
         {
-            Filter.Search.HoldFocus = true;
+            Filter.HoldFocus = true;
         }
 
         public override bool OnExiting(IScreen next)
         {
-            Filter.Search.HoldFocus = false;
+            Filter.HoldFocus = false;
             return base.OnExiting(next);
         }
 
         public override void OnSuspending(IScreen next)
         {
             base.OnSuspending(next);
-            Filter.Search.HoldFocus = false;
+            Filter.HoldFocus = false;
         }
 
         private void joinRequested(Room room)

From f599427080ed04c6968134a2e78c6239c1d86010 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Dec 2020 21:59:38 +0900
Subject: [PATCH 06703/10326] Implement TimeshiftFilterControl

---
 ....cs => TestSceneTimeshiftFilterControl.cs} | 11 ++--
 .../Online/Multiplayer/GetRoomsRequest.cs     | 18 +++---
 .../Multi/Lounge/Components/FilterCriteria.cs |  4 +-
 .../Lounge/Components/RoomCategoryFilter.cs   | 12 ----
 .../Components/TimeshiftFilterControl.cs      | 59 +++++++++++++++++++
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |  6 +-
 osu.Game/Screens/Multi/RoomManager.cs         |  2 +-
 7 files changed, 83 insertions(+), 29 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneLoungeFilterControl.cs => TestSceneTimeshiftFilterControl.cs} (55%)
 delete mode 100644 osu.Game/Screens/Multi/Lounge/Components/RoomCategoryFilter.cs
 create mode 100644 osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeFilterControl.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftFilterControl.cs
similarity index 55%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeFilterControl.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftFilterControl.cs
index 7c0c2797f5..f635a28b5c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeFilterControl.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftFilterControl.cs
@@ -6,14 +6,17 @@ using osu.Game.Screens.Multi.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneLoungeFilterControl : OsuTestScene
+    public class TestSceneTimeshiftFilterControl : OsuTestScene
     {
-        public TestSceneLoungeFilterControl()
+        public TestSceneTimeshiftFilterControl()
         {
-            Child = new FilterControl
+            Child = new TimeshiftFilterControl
             {
                 Anchor = Anchor.Centre,
-                Origin = Anchor.Centre
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.X,
+                Width = 0.7f,
+                Height = 80,
             };
         }
     }
diff --git a/osu.Game/Online/Multiplayer/GetRoomsRequest.cs b/osu.Game/Online/Multiplayer/GetRoomsRequest.cs
index 64e0386f77..a0609f77dd 100644
--- a/osu.Game/Online/Multiplayer/GetRoomsRequest.cs
+++ b/osu.Game/Online/Multiplayer/GetRoomsRequest.cs
@@ -11,24 +11,24 @@ namespace osu.Game.Online.Multiplayer
 {
     public class GetRoomsRequest : APIRequest<List<Room>>
     {
-        private readonly RoomStatusFilter statusFilter;
-        private readonly RoomCategoryFilter categoryFilter;
+        private readonly RoomStatusFilter status;
+        private readonly string category;
 
-        public GetRoomsRequest(RoomStatusFilter statusFilter, RoomCategoryFilter categoryFilter)
+        public GetRoomsRequest(RoomStatusFilter status, string category)
         {
-            this.statusFilter = statusFilter;
-            this.categoryFilter = categoryFilter;
+            this.status = status;
+            this.category = category;
         }
 
         protected override WebRequest CreateWebRequest()
         {
             var req = base.CreateWebRequest();
 
-            if (statusFilter != RoomStatusFilter.Open)
-                req.AddParameter("mode", statusFilter.ToString().Underscore().ToLowerInvariant());
+            if (status != RoomStatusFilter.Open)
+                req.AddParameter("mode", status.ToString().Underscore().ToLowerInvariant());
 
-            if (categoryFilter != RoomCategoryFilter.Any)
-                req.AddParameter("category", categoryFilter.ToString().Underscore().ToLowerInvariant());
+            if (!string.IsNullOrEmpty(category))
+                req.AddParameter("category", category);
 
             return req;
         }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
index 6d70225eec..7b04be86b1 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
@@ -8,8 +8,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components
     public class FilterCriteria
     {
         public string SearchString;
-        public RoomStatusFilter StatusFilter;
-        public RoomCategoryFilter RoomCategoryFilter;
+        public RoomStatusFilter Status;
+        public string Category;
         public RulesetInfo Ruleset;
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomCategoryFilter.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomCategoryFilter.cs
deleted file mode 100644
index c076905174..0000000000
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomCategoryFilter.cs
+++ /dev/null
@@ -1,12 +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.Multi.Lounge.Components
-{
-    public enum RoomCategoryFilter
-    {
-        Any,
-        Normal,
-        Spotlight
-    }
-}
diff --git a/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
new file mode 100644
index 0000000000..a2ea104c74
--- /dev/null
+++ b/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.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.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Overlays.SearchableList;
+
+namespace osu.Game.Screens.Multi.Lounge.Components
+{
+    public class TimeshiftFilterControl : FilterControl
+    {
+        private readonly Dropdown<TimeshiftCategory> dropdown;
+
+        public TimeshiftFilterControl()
+        {
+            AddInternal(dropdown = new SlimEnumDropdown<TimeshiftCategory>
+            {
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.TopRight,
+                RelativeSizeAxes = Axes.None,
+                Width = 160,
+                X = -HORIZONTAL_PADDING,
+                Y = -30
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            dropdown.Current.BindValueChanged(_ => UpdateFilter());
+        }
+
+        protected override FilterCriteria CreateCriteria()
+        {
+            var criteria = base.CreateCriteria();
+
+            switch (dropdown.Current.Value)
+            {
+                case TimeshiftCategory.Normal:
+                    criteria.Category = "normal";
+                    break;
+
+                case TimeshiftCategory.Spotlight:
+                    criteria.Category = "spotlight";
+                    break;
+            }
+
+            return criteria;
+        }
+
+        private enum TimeshiftCategory
+        {
+            Any,
+            Normal,
+            Spotlight
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index b33a79772e..a26a64d86d 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -48,7 +48,6 @@ namespace osu.Game.Screens.Multi.Lounge
 
             InternalChildren = new Drawable[]
             {
-                Filter = new FilterControl { Depth = -1 },
                 content = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -79,6 +78,11 @@ namespace osu.Game.Screens.Multi.Lounge
                         },
                     },
                 },
+                Filter = new TimeshiftFilterControl
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 80,
+                },
             };
 
             // scroll selected room into view on selection.
diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index 2a96fa536d..fb0cf73bb9 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -317,7 +317,7 @@ namespace osu.Game.Screens.Multi
                 var tcs = new TaskCompletionSource<bool>();
 
                 pollReq?.Cancel();
-                pollReq = new GetRoomsRequest(currentFilter.Value.StatusFilter, currentFilter.Value.RoomCategoryFilter);
+                pollReq = new GetRoomsRequest(currentFilter.Value.Status, currentFilter.Value.Category);
 
                 pollReq.Success += result =>
                 {

From 34f36727509e6b108564c06714f2252505a5bf3a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Dec 2020 22:04:41 +0900
Subject: [PATCH 06704/10326] Make ctor protected

---
 osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 032c50aa73..896c215c42 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         private readonly SearchTextBox search;
         private readonly PageTabControl<RoomStatusFilter> tabs;
 
-        public FilterControl()
+        protected FilterControl()
         {
             InternalChildren = new Drawable[]
             {

From 10c1823534cd9e873997965f81fbb72e5dc1b6fa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Dec 2020 22:07:11 +0900
Subject: [PATCH 06705/10326] Remove now unused files

---
 .../UserInterface}/SlimEnumDropdown.cs        |   5 +-
 .../SearchableList/DisplayStyleControl.cs     |  84 ---------
 .../SearchableList/HeaderTabControl.cs        |  29 ---
 .../SearchableListFilterControl.cs            | 165 ------------------
 .../Components/TimeshiftFilterControl.cs      |   2 +-
 5 files changed, 3 insertions(+), 282 deletions(-)
 rename osu.Game/{Overlays/SearchableList => Graphics/UserInterface}/SlimEnumDropdown.cs (94%)
 delete mode 100644 osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
 delete mode 100644 osu.Game/Overlays/SearchableList/HeaderTabControl.cs
 delete mode 100644 osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs

diff --git a/osu.Game/Overlays/SearchableList/SlimEnumDropdown.cs b/osu.Game/Graphics/UserInterface/SlimEnumDropdown.cs
similarity index 94%
rename from osu.Game/Overlays/SearchableList/SlimEnumDropdown.cs
rename to osu.Game/Graphics/UserInterface/SlimEnumDropdown.cs
index 9e7ff1205f..965734792c 100644
--- a/osu.Game/Overlays/SearchableList/SlimEnumDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/SlimEnumDropdown.cs
@@ -2,14 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.UserInterface;
 using osuTK;
+using osuTK.Graphics;
 
-namespace osu.Game.Overlays.SearchableList
+namespace osu.Game.Graphics.UserInterface
 {
     public class SlimEnumDropdown<T> : OsuEnumDropdown<T>
         where T : struct, Enum
diff --git a/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs b/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
deleted file mode 100644
index ffbc1c9586..0000000000
--- a/osu.Game/Overlays/SearchableList/DisplayStyleControl.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 osu.Framework.Bindables;
-using osuTK;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Containers;
-
-namespace osu.Game.Overlays.SearchableList
-{
-    public class DisplayStyleControl : CompositeDrawable
-    {
-        public readonly Bindable<PanelDisplayStyle> DisplayStyle = new Bindable<PanelDisplayStyle>();
-
-        public DisplayStyleControl()
-        {
-            AutoSizeAxes = Axes.Both;
-
-            InternalChild = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Spacing = new Vector2(5f, 0f),
-                Direction = FillDirection.Horizontal,
-                Children = new[]
-                {
-                    new DisplayStyleToggleButton(FontAwesome.Solid.ThLarge, PanelDisplayStyle.Grid, DisplayStyle),
-                    new DisplayStyleToggleButton(FontAwesome.Solid.ListUl, PanelDisplayStyle.List, DisplayStyle),
-                },
-            };
-
-            DisplayStyle.Value = PanelDisplayStyle.Grid;
-        }
-
-        private class DisplayStyleToggleButton : OsuClickableContainer
-        {
-            private readonly SpriteIcon icon;
-            private readonly PanelDisplayStyle style;
-            private readonly Bindable<PanelDisplayStyle> bindable;
-
-            public DisplayStyleToggleButton(IconUsage icon, PanelDisplayStyle style, Bindable<PanelDisplayStyle> bindable)
-            {
-                this.bindable = bindable;
-                this.style = style;
-                Size = new Vector2(25f);
-
-                Children = new Drawable[]
-                {
-                    this.icon = new SpriteIcon
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Icon = icon,
-                        Size = new Vector2(18),
-                        Alpha = 0.5f,
-                    },
-                };
-
-                bindable.ValueChanged += Bindable_ValueChanged;
-                Bindable_ValueChanged(new ValueChangedEvent<PanelDisplayStyle>(bindable.Value, bindable.Value));
-                Action = () => bindable.Value = this.style;
-            }
-
-            private void Bindable_ValueChanged(ValueChangedEvent<PanelDisplayStyle> e)
-            {
-                icon.FadeTo(e.NewValue == style ? 1.0f : 0.5f, 100);
-            }
-
-            protected override void Dispose(bool isDisposing)
-            {
-                base.Dispose(isDisposing);
-
-                bindable.ValueChanged -= Bindable_ValueChanged;
-            }
-        }
-    }
-
-    public enum PanelDisplayStyle
-    {
-        Grid,
-        List,
-    }
-}
diff --git a/osu.Game/Overlays/SearchableList/HeaderTabControl.cs b/osu.Game/Overlays/SearchableList/HeaderTabControl.cs
deleted file mode 100644
index 2087a72c54..0000000000
--- a/osu.Game/Overlays/SearchableList/HeaderTabControl.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 osuTK.Graphics;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Overlays.SearchableList
-{
-    public class HeaderTabControl<T> : OsuTabControl<T>
-    {
-        protected override TabItem<T> CreateTabItem(T value) => new HeaderTabItem(value);
-
-        public HeaderTabControl()
-        {
-            Height = 26;
-            AccentColour = Color4.White;
-        }
-
-        private class HeaderTabItem : OsuTabItem
-        {
-            public HeaderTabItem(T value)
-                : base(value)
-            {
-                Text.Font = Text.Font.With(size: 16);
-            }
-        }
-    }
-}
diff --git a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
deleted file mode 100644
index 1990674aa9..0000000000
--- a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
+++ /dev/null
@@ -1,165 +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 osuTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
-using osu.Framework.Graphics.Shapes;
-
-namespace osu.Game.Overlays.SearchableList
-{
-    public abstract class SearchableListFilterControl<TTab, TCategory> : Container
-        where TTab : struct, Enum
-        where TCategory : struct, Enum
-    {
-        private const float padding = 10;
-
-        private readonly Drawable filterContainer;
-        private readonly Drawable rightFilterContainer;
-        private readonly Box tabStrip;
-
-        public readonly SearchTextBox Search;
-        public readonly PageTabControl<TTab> Tabs;
-        public readonly SlimEnumDropdown<TCategory> Dropdown;
-        public readonly DisplayStyleControl DisplayStyleControl;
-
-        protected abstract Color4 BackgroundColour { get; }
-        protected abstract TTab DefaultTab { get; }
-        protected abstract TCategory DefaultCategory { get; }
-        protected virtual Drawable CreateSupplementaryControls() => null;
-
-        /// <summary>
-        /// The amount of padding added to content (does not affect background or tab control strip).
-        /// </summary>
-        protected virtual float ContentHorizontalPadding => WaveOverlayContainer.WIDTH_PADDING;
-
-        protected SearchableListFilterControl()
-        {
-            RelativeSizeAxes = Axes.X;
-
-            var controls = CreateSupplementaryControls();
-            Container controlsContainer;
-            Children = new[]
-            {
-                filterContainer = new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = BackgroundColour,
-                            Alpha = 0.9f,
-                        },
-                        tabStrip = new Box
-                        {
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            RelativeSizeAxes = Axes.X,
-                            Height = 1,
-                        },
-                        new FillFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Padding = new MarginPadding
-                            {
-                                Top = padding,
-                                Horizontal = ContentHorizontalPadding
-                            },
-                            Children = new Drawable[]
-                            {
-                                Search = new FilterSearchTextBox
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                },
-                                controlsContainer = new Container
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Margin = new MarginPadding { Top = controls != null ? padding : 0 },
-                                },
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Padding = new MarginPadding { Right = 225 },
-                                    Child = Tabs = new PageTabControl<TTab>
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                    },
-                                },
-                                new Box // keep the tab strip part of autosize, but don't put it in the flow container
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    Height = 1,
-                                    Colour = Color4.White.Opacity(0),
-                                },
-                            },
-                        },
-                    },
-                },
-                rightFilterContainer = new FillFlowContainer
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    AutoSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        Dropdown = new SlimEnumDropdown<TCategory>
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            RelativeSizeAxes = Axes.None,
-                            Width = 160f,
-                        },
-                        DisplayStyleControl = new DisplayStyleControl
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                        },
-                    }
-                }
-            };
-
-            if (controls != null) controlsContainer.Children = new[] { controls };
-
-            Tabs.Current.Value = DefaultTab;
-            Tabs.Current.TriggerChange();
-
-            Dropdown.Current.Value = DefaultCategory;
-            Dropdown.Current.TriggerChange();
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            tabStrip.Colour = colours.Yellow;
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            Height = filterContainer.Height;
-            rightFilterContainer.Margin = new MarginPadding { Top = filterContainer.Height - 30, Right = ContentHorizontalPadding };
-        }
-
-        private class FilterSearchTextBox : SearchTextBox
-        {
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                BackgroundUnfocused = OsuColour.Gray(0.06f);
-                BackgroundFocused = OsuColour.Gray(0.12f);
-            }
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
index a2ea104c74..68cab283a0 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Overlays.SearchableList;
+using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {

From c778646f101d9f73709c5b76ae339b4ffeaef7c2 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 7 Dec 2020 18:01:57 +0100
Subject: [PATCH 06706/10326] Add support for importing replay files.

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index a56206c969..541455277d 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -13,7 +13,7 @@ using osu.Framework.Android;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk", ".*\\.osr" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
         private OsuGameAndroid game;

From f980f413244c3252890868df1f32c2f1c88d3f81 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 7 Dec 2020 21:38:15 +0100
Subject: [PATCH 06707/10326] Address review

---
 osu.Game.Tournament/IO/TournamentStorage.cs |  6 ++----
 osu.Game.Tournament/Screens/SetupScreen.cs  | 12 +++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 66e27ddbb5..cf54c1f5ef 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -34,18 +34,16 @@ namespace osu.Game.Tournament.IO
             else
                 Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
 
-            CurrentTournament = new Bindable<string>(storageConfig.Get<string>(StorageConfig.CurrentTournament));
+            CurrentTournament = storageConfig.GetBindable<string>(StorageConfig.CurrentTournament);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
 
-            CurrentTournament.BindValueChanged(updateTournament, false);
+            CurrentTournament.BindValueChanged(updateTournament);
         }
 
         private void updateTournament(ValueChangedEvent<string> newTournament)
         {
             ChangeTargetStorage(allTournaments.GetStorageForDirectory(newTournament.NewValue));
             Logger.Log("Changing tournament storage: " + GetFullPath(string.Empty));
-            storageConfig.Set(StorageConfig.CurrentTournament, newTournament.NewValue);
-            storageConfig.Save();
         }
 
         public IEnumerable<string> ListTournaments() => allTournaments.GetDirectories(string.Empty);
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index f22cd13cea..3c9d3c949b 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -42,16 +42,14 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        [Resolved]
-        private Storage storage { get; set; }
-
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
         private Bindable<Size> windowSize;
+        private TournamentStorage storage;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkConfigManager frameworkConfig, Storage storage)
         {
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
 
@@ -66,6 +64,7 @@ namespace osu.Game.Tournament.Screens
 
             api.LocalUser.BindValueChanged(_ => Schedule(reload));
             stableInfo.OnStableInfoSaved += () => Schedule(reload);
+            this.storage = (TournamentStorage)storage;
             reload();
         }
 
@@ -75,7 +74,6 @@ namespace osu.Game.Tournament.Screens
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
-            var tourneyStorage = storage as TournamentStorage;
             fillFlow.Children = new Drawable[]
             {
                 new ActionableInfo
@@ -121,8 +119,8 @@ namespace osu.Game.Tournament.Screens
                 {
                     Label = "Current tournament",
                     Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart to apply changes.",
-                    Items = tourneyStorage?.ListTournaments(),
-                    Current = tourneyStorage?.CurrentTournament,
+                    Items = storage.ListTournaments(),
+                    Current = storage.CurrentTournament,
                 },
                 resolution = new ResolutionSelector
                 {

From 6002014f952ee71992f54c267ed4c9967e5d5639 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 7 Dec 2020 22:07:54 +0100
Subject: [PATCH 06708/10326] Change underlyingstorage to alltournaments for
 clarity

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index cf54c1f5ef..2ba1b6be8f 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -29,10 +29,10 @@ namespace osu.Game.Tournament.IO
 
             if (storage.Exists("tournament.ini"))
             {
-                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
+                ChangeTargetStorage(allTournaments.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
             }
             else
-                Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
+                Migrate(allTournaments.GetStorageForDirectory(default_tournament));
 
             CurrentTournament = storageConfig.GetBindable<string>(StorageConfig.CurrentTournament);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));

From 3cbdaf5960a992e21b4fff30ad8660987edf005a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 10:30:23 +0900
Subject: [PATCH 06709/10326] Make resolved properties protected

---
 .../Skinning/Default/CatchHitObjectPiece.cs      | 12 ++++++------
 .../Skinning/Default/FruitPiece.cs               |  7 +++----
 .../Skinning/LegacyCatchHitObjectPiece.cs        | 16 +++++++---------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
index 3c3cb5b0ee..be6cf0fc05 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
@@ -18,10 +18,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         public readonly Bindable<bool> HyperDash = new Bindable<bool>();
 
         [Resolved(canBeNull: true)]
-        private DrawableHitObject drawableHitObject { get; set; }
-
         [CanBeNull]
-        protected DrawablePalpableCatchHitObject DrawableHitObject => (DrawablePalpableCatchHitObject)drawableHitObject;
+        protected DrawableHitObject DrawableHitObject { get; private set; }
 
         [CanBeNull]
         protected BorderPiece BorderPiece;
@@ -33,10 +31,12 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         {
             base.LoadComplete();
 
-            if (DrawableHitObject != null)
+            var hitObject = (DrawablePalpableCatchHitObject)DrawableHitObject;
+
+            if (hitObject != null)
             {
-                AccentColour.BindTo(DrawableHitObject.AccentColour);
-                HyperDash.BindTo(DrawableHitObject.HyperDash);
+                AccentColour.BindTo(hitObject.AccentColour);
+                HyperDash.BindTo(hitObject.HyperDash);
             }
 
             HyperDash.BindValueChanged(hyper =>
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
index 05b924eb75..45d688c4e5 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
@@ -36,11 +36,10 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         {
             base.LoadComplete();
 
-            if (DrawableHitObject != null)
-            {
-                var fruit = (DrawableFruit)DrawableHitObject;
+            var fruit = (DrawableFruit)DrawableHitObject;
+
+            if (fruit != null)
                 VisualRepresentation.BindTo(fruit.VisualRepresentation);
-            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
index 4bcb92b9be..1e68439402 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
@@ -27,15 +27,11 @@ namespace osu.Game.Rulesets.Catch.Skinning
         private readonly Sprite hyperSprite;
 
         [Resolved]
-        private ISkinSource skin { get; set; }
-
-        protected ISkinSource Skin => skin;
+        protected ISkinSource Skin { get; private set; }
 
         [Resolved(canBeNull: true)]
-        private DrawableHitObject drawableHitObject { get; set; }
-
         [CanBeNull]
-        protected DrawablePalpableCatchHitObject DrawableHitObject => (DrawablePalpableCatchHitObject)drawableHitObject;
+        protected DrawableHitObject DrawableHitObject { get; private set; }
 
         protected LegacyCatchHitObjectPiece()
         {
@@ -69,10 +65,12 @@ namespace osu.Game.Rulesets.Catch.Skinning
         {
             base.LoadComplete();
 
-            if (DrawableHitObject != null)
+            var hitObject = (DrawablePalpableCatchHitObject)DrawableHitObject;
+
+            if (hitObject != null)
             {
-                AccentColour.BindTo(DrawableHitObject.AccentColour);
-                HyperDash.BindTo(DrawableHitObject.HyperDash);
+                AccentColour.BindTo(hitObject.AccentColour);
+                HyperDash.BindTo(hitObject.HyperDash);
             }
 
             hyperSprite.Colour = Skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??

From 4da6717d0e3ececba5dc73a36326a1bb92e4ea26 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 10:32:46 +0900
Subject: [PATCH 06710/10326] Rename things in PulpFormation

---
 .../Skinning/Default/BananaPulpFormation.cs   |  4 +--
 .../Skinning/Default/FruitPulpFormation.cs    | 36 +++++++++----------
 .../Skinning/Default/PulpFormation.cs         | 15 ++++----
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/BananaPulpFormation.cs b/osu.Game.Rulesets.Catch/Skinning/Default/BananaPulpFormation.cs
index cabea46083..ee1cc68f7d 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/BananaPulpFormation.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/BananaPulpFormation.cs
@@ -9,8 +9,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
     {
         public BananaPulpFormation()
         {
-            Add(new Vector2(0, -0.3f), new Vector2(SMALL_PULP));
-            Add(new Vector2(0, 0.05f), new Vector2(LARGE_PULP_4 * 0.8f, LARGE_PULP_4 * 2.5f));
+            AddPulp(new Vector2(0, -0.3f), new Vector2(SMALL_PULP));
+            AddPulp(new Vector2(0, 0.05f), new Vector2(LARGE_PULP_4 * 0.8f, LARGE_PULP_4 * 2.5f));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPulpFormation.cs b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPulpFormation.cs
index 8696854f23..88e0b5133a 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPulpFormation.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPulpFormation.cs
@@ -25,33 +25,33 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
             switch (visualRepresentation.NewValue)
             {
                 case FruitVisualRepresentation.Pear:
-                    Add(new Vector2(0, -0.33f), new Vector2(SMALL_PULP));
-                    Add(PositionAt(60, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
-                    Add(PositionAt(180, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
-                    Add(PositionAt(300, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    AddPulp(new Vector2(0, -0.33f), new Vector2(SMALL_PULP));
+                    AddPulp(PositionAt(60, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    AddPulp(PositionAt(180, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    AddPulp(PositionAt(300, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
                     break;
 
                 case FruitVisualRepresentation.Grape:
-                    Add(new Vector2(0, -0.25f), new Vector2(SMALL_PULP));
-                    Add(PositionAt(0, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
-                    Add(PositionAt(120, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
-                    Add(PositionAt(240, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    AddPulp(new Vector2(0, -0.25f), new Vector2(SMALL_PULP));
+                    AddPulp(PositionAt(0, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    AddPulp(PositionAt(120, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
+                    AddPulp(PositionAt(240, DISTANCE_FROM_CENTRE_3), new Vector2(LARGE_PULP_3));
                     break;
 
                 case FruitVisualRepresentation.Pineapple:
-                    Add(new Vector2(0, -0.3f), new Vector2(SMALL_PULP));
-                    Add(PositionAt(45, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
-                    Add(PositionAt(135, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
-                    Add(PositionAt(225, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
-                    Add(PositionAt(315, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    AddPulp(new Vector2(0, -0.3f), new Vector2(SMALL_PULP));
+                    AddPulp(PositionAt(45, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    AddPulp(PositionAt(135, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    AddPulp(PositionAt(225, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    AddPulp(PositionAt(315, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
                     break;
 
                 case FruitVisualRepresentation.Raspberry:
-                    Add(new Vector2(0, -0.34f), new Vector2(SMALL_PULP));
-                    Add(PositionAt(0, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
-                    Add(PositionAt(90, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
-                    Add(PositionAt(180, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
-                    Add(PositionAt(270, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    AddPulp(new Vector2(0, -0.34f), new Vector2(SMALL_PULP));
+                    AddPulp(PositionAt(0, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    AddPulp(PositionAt(90, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    AddPulp(PositionAt(180, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
+                    AddPulp(PositionAt(270, DISTANCE_FROM_CENTRE_4), new Vector2(LARGE_PULP_4));
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs b/osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs
index c0e3d0e724..8753aa4077 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 
         protected const float SMALL_PULP = LARGE_PULP_3 / 2;
 
-        private int numPulps;
+        private int pulpsInUse;
 
         protected PulpFormation()
         {
@@ -35,21 +35,22 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 
         protected void Clear()
         {
-            for (; numPulps > 0; numPulps--)
-                InternalChildren[numPulps - 1].Alpha = 0;
+            for (int i = 0; i < pulpsInUse; i++)
+                InternalChildren[i].Alpha = 0;
+            pulpsInUse = 0;
         }
 
-        protected void Add(Vector2 position, Vector2 size)
+        protected void AddPulp(Vector2 position, Vector2 size)
         {
-            if (numPulps == InternalChildren.Count)
+            if (pulpsInUse == InternalChildren.Count)
                 AddInternal(new Pulp { AccentColour = { BindTarget = AccentColour } });
 
-            var pulp = InternalChildren[numPulps];
+            var pulp = InternalChildren[pulpsInUse];
             pulp.Position = position;
             pulp.Size = size;
             pulp.Alpha = 1;
 
-            numPulps++;
+            pulpsInUse++;
         }
     }
 }

From 57b7ef88e2f85e7e9e5073a7ece9acc043b7c246 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Dec 2020 12:12:53 +0900
Subject: [PATCH 06711/10326] Fix spacing

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 3f0b0dcc71..0ebe0ddc2d 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -101,9 +101,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             double approachRateFactor = 0.0;
             if (Attributes.ApproachRate > 10.33)
-              approachRateFactor += 0.4 * (Attributes.ApproachRate - 10.33);
+                approachRateFactor += 0.4 * (Attributes.ApproachRate - 10.33);
             else if (Attributes.ApproachRate < 8.0)
-              approachRateFactor += 0.1 * (8.0 - Attributes.ApproachRate);
+                approachRateFactor += 0.1 * (8.0 - Attributes.ApproachRate);
 
             aimValue *= 1.0 + Math.Min(approachRateFactor, approachRateFactor * (totalHits / 1000.0));
 

From 77279a7e56154ae3796444403b561e4023a3183c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 12:48:59 +0900
Subject: [PATCH 06712/10326] Update stale xmldoc on import method
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/Database/ArchiveModelManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index e18dc7f7eb..36cc4cce39 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -192,7 +192,7 @@ namespace osu.Game.Database
         /// Import one <typeparamref name="TModel"/> from the filesystem and delete the file on success.
         /// Note that this bypasses the UI flow and should only be used for special cases or testing.
         /// </summary>
-        /// <param name="task">The archive location on disk.</param>
+        /// <param name="task">The <see cref="ImportTask"/> containing data about the <typeparamref name="TModel"/> to import.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
         /// <returns>The imported model, if successful.</returns>
         internal async Task<TModel> Import(ImportTask task, CancellationToken cancellationToken = default)

From 58d7e4197809c986c62389e52b90e3465bf8b225 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 12:52:34 +0900
Subject: [PATCH 06713/10326] Enable nullable on ImportTask

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

diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index 89eb347df0..1433a567a9 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.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.
 
+#nullable enable
+
 using System.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Utils;
@@ -21,7 +23,7 @@ namespace osu.Game.Database
         /// <summary>
         /// An optional stream which provides the file content.
         /// </summary>
-        public Stream Stream { get; }
+        public Stream? Stream { get; }
 
         /// <summary>
         /// Construct a new import task from a path (on a local filesystem).

From 0213f77b4b4c43e09c5c5e7e4229f0dd4af500f5 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 14:28:30 +0900
Subject: [PATCH 06714/10326] Move catcher state changing logic to OnNewResult
 method

---
 .../TestSceneCatcher.cs                       | 31 +++++++++++++-
 .../TestSceneCatcherArea.cs                   |  3 +-
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs  |  2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs         | 41 +++++++++++--------
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     | 11 +++--
 5 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 194a12a9b7..d97c56164e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -12,8 +13,11 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -169,7 +173,32 @@ namespace osu.Game.Rulesets.Catch.Tests
             hitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             for (var i = 0; i < count; i++)
-                catcher.AttemptCatch(hitObject);
+            {
+                var drawableObject = createDrawableObject(hitObject);
+                var result = new JudgementResult(hitObject, new CatchJudgement())
+                {
+                    Type = catcher.CanCatch(hitObject) ? HitResult.Great : HitResult.Miss
+                };
+                catcher.OnNewResult(drawableObject, result);
+            }
+        }
+
+        private DrawableCatchHitObject createDrawableObject(CatchHitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case Banana banana:
+                    return new DrawableBanana(banana);
+
+                case Droplet droplet:
+                    return new DrawableDroplet(droplet);
+
+                case Fruit fruit:
+                    return new DrawableFruit(fruit);
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(hitObject));
+            }
         }
 
         public class TestCatcher : Catcher
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 281ddc7eaa..c8826aa174 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -58,10 +58,9 @@ namespace osu.Game.Rulesets.Catch.Tests
 
                 Schedule(() =>
                 {
-                    bool caught = area.AttemptCatch(fruit);
                     area.OnNewResult(drawable, new JudgementResult(fruit, new CatchJudgement())
                     {
-                        Type = caught ? HitResult.Great : HitResult.Miss
+                        Type = area.MovableCatcher.CanCatch(fruit) ? HitResult.Great : HitResult.Miss
                     });
 
                     drawable.Expire();
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index df87359ed6..fdc12bf088 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Rulesets.Catch.UI
             ((DrawableCatchHitObject)d).CheckPosition = checkIfWeCanCatch;
         }
 
-        private bool checkIfWeCanCatch(CatchHitObject obj) => CatcherArea.AttemptCatch(obj);
+        private bool checkIfWeCanCatch(CatchHitObject obj) => CatcherArea.MovableCatcher.CanCatch(obj);
 
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
             => CatcherArea.OnNewResult((DrawableCatchHitObject)judgedObject, result);
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 2a3447c80a..8998dbf488 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -17,6 +17,7 @@ using osu.Game.Configuration;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Skinning;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -190,11 +191,9 @@ namespace osu.Game.Rulesets.Catch.UI
         internal static float CalculateCatchWidth(BeatmapDifficulty difficulty) => CalculateCatchWidth(calculateScale(difficulty));
 
         /// <summary>
-        /// Let the catcher attempt to catch a fruit.
+        /// Determine if this catcher can catch a <see cref="CatchHitObject"/> in the current position.
         /// </summary>
-        /// <param name="hitObject">The fruit to catch.</param>
-        /// <returns>Whether the catch is possible.</returns>
-        public bool AttemptCatch(CatchHitObject hitObject)
+        public bool CanCatch(CatchHitObject hitObject)
         {
             if (!(hitObject is PalpableCatchHitObject fruit))
                 return false;
@@ -205,21 +204,25 @@ namespace osu.Game.Rulesets.Catch.UI
             var catchObjectPosition = fruit.X;
             var catcherPosition = Position.X;
 
-            var validCatch =
-                catchObjectPosition >= catcherPosition - halfCatchWidth &&
-                catchObjectPosition <= catcherPosition + halfCatchWidth;
+            return catchObjectPosition >= catcherPosition - halfCatchWidth &&
+                   catchObjectPosition <= catcherPosition + halfCatchWidth;
+        }
 
-            if (validCatch)
-                placeCaughtObject(fruit);
+        public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result)
+        {
+            if (!(drawableObject.HitObject is PalpableCatchHitObject hitObject)) return;
+
+            if (result.IsHit)
+                placeCaughtObject(hitObject);
 
             // droplet doesn't affect the catcher state
-            if (fruit is TinyDroplet) return validCatch;
+            if (hitObject is TinyDroplet) return;
 
-            if (validCatch && fruit.HyperDash)
+            if (result.IsHit && hitObject.HyperDash)
             {
-                var target = fruit.HyperDashTarget;
-                var timeDifference = target.StartTime - fruit.StartTime;
-                double positionDifference = target.X - catcherPosition;
+                var target = hitObject.HyperDashTarget;
+                var timeDifference = target.StartTime - hitObject.StartTime;
+                double positionDifference = target.X - X;
                 var velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
 
                 SetHyperDashState(Math.Abs(velocity), target.X);
@@ -227,12 +230,14 @@ namespace osu.Game.Rulesets.Catch.UI
             else
                 SetHyperDashState();
 
-            if (validCatch)
-                updateState(fruit.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle);
-            else if (!(fruit is Banana))
+            if (result.IsHit)
+                updateState(hitObject.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle);
+            else if (!(hitObject is Banana))
                 updateState(CatcherAnimationState.Fail);
+        }
 
-            return validCatch;
+        public void OnRevertResult(DrawableCatchHitObject fruit, JudgementResult result)
+        {
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 539776354c..857d9141c9 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.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.Replays;
 using osu.Game.Rulesets.Judgements;
@@ -42,6 +41,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void OnNewResult(DrawableCatchHitObject hitObject, JudgementResult result)
         {
+            MovableCatcher.OnNewResult(hitObject, result);
+
             if (!result.Type.IsScorable())
                 return;
 
@@ -56,12 +57,10 @@ namespace osu.Game.Rulesets.Catch.UI
             comboDisplay.OnNewResult(hitObject, result);
         }
 
-        public void OnRevertResult(DrawableCatchHitObject fruit, JudgementResult result)
-            => comboDisplay.OnRevertResult(fruit, result);
-
-        public bool AttemptCatch(CatchHitObject obj)
+        public void OnRevertResult(DrawableCatchHitObject hitObject, JudgementResult result)
         {
-            return MovableCatcher.AttemptCatch(obj);
+            comboDisplay.OnRevertResult(hitObject, result);
+            MovableCatcher.OnRevertResult(hitObject, result);
         }
 
         protected override void UpdateAfterChildren()

From cb76a2d7b549072aed1ad4ac3beae16fbcbb6c35 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 15:02:55 +0900
Subject: [PATCH 06715/10326] Restore catcher state on revert judgement result

---
 .../TestSceneCatcher.cs                       | 38 ++++++++++++++-----
 .../Judgements/CatchJudgementResult.cs        | 23 +++++++++++
 .../Drawables/DrawableCatchHitObject.cs       |  4 ++
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |  6 +++
 4 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Judgements/CatchJudgementResult.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index d97c56164e..62149620d2 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -56,6 +56,24 @@ namespace osu.Game.Rulesets.Catch.Tests
             };
         });
 
+        [Test]
+        public void TestCatcherStateRevert()
+        {
+            DrawableCatchHitObject drawableObject = null;
+            JudgementResult result = null;
+            AddStep("catch kiai fruit", () =>
+            {
+                drawableObject = createDrawableObject(new TestKiaiFruit());
+                result = attemptCatch(drawableObject);
+            });
+            checkState(CatcherAnimationState.Kiai);
+            AddStep("revert result", () =>
+            {
+                catcher.OnRevertResult(drawableObject, result);
+            });
+            checkState(CatcherAnimationState.Idle);
+        }
+
         [Test]
         public void TestCatcherCatchWidth()
         {
@@ -170,17 +188,19 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private void attemptCatch(CatchHitObject hitObject, int count = 1)
         {
-            hitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
             for (var i = 0; i < count; i++)
+                attemptCatch(createDrawableObject(hitObject));
+        }
+
+        private JudgementResult attemptCatch(DrawableCatchHitObject drawableObject)
+        {
+            drawableObject.HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            var result = new CatchJudgementResult(drawableObject.HitObject, drawableObject.HitObject.CreateJudgement())
             {
-                var drawableObject = createDrawableObject(hitObject);
-                var result = new JudgementResult(hitObject, new CatchJudgement())
-                {
-                    Type = catcher.CanCatch(hitObject) ? HitResult.Great : HitResult.Miss
-                };
-                catcher.OnNewResult(drawableObject, result);
-            }
+                Type = catcher.CanCatch(drawableObject.HitObject) ? HitResult.Great : HitResult.Miss
+            };
+            catcher.OnNewResult(drawableObject, result);
+            return result;
         }
 
         private DrawableCatchHitObject createDrawableObject(CatchHitObject hitObject)
diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchJudgementResult.cs b/osu.Game.Rulesets.Catch/Judgements/CatchJudgementResult.cs
new file mode 100644
index 0000000000..4b375e641b
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Judgements/CatchJudgementResult.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 JetBrains.Annotations;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Catch.Judgements
+{
+    public class CatchJudgementResult : JudgementResult
+    {
+        /// <summary>
+        /// The catcher animation state prior to this judgement.
+        /// </summary>
+        public CatcherAnimationState CatcherAnimationState;
+
+        public CatchJudgementResult([NotNull] HitObject hitObject, [NotNull] Judgement judgement)
+            : base(hitObject, judgement)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 6aa8ff439e..70efe9cf29 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -5,7 +5,9 @@ using System;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Utils;
 
@@ -52,6 +54,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         public override bool RemoveWhenNotAlive => IsOnPlate;
 
+        protected override JudgementResult CreateResult(Judgement judgement) => new CatchJudgementResult(HitObject, judgement);
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (CheckPosition == null) return;
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 8998dbf488..33068f95eb 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -14,6 +14,7 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Skinning;
@@ -210,6 +211,9 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result)
         {
+            var catchResult = (CatchJudgementResult)result;
+            catchResult.CatcherAnimationState = CurrentState;
+
             if (!(drawableObject.HitObject is PalpableCatchHitObject hitObject)) return;
 
             if (result.IsHit)
@@ -238,6 +242,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void OnRevertResult(DrawableCatchHitObject fruit, JudgementResult result)
         {
+            var catchResult = (CatchJudgementResult)result;
+            updateState(catchResult.CatcherAnimationState);
         }
 
         /// <summary>

From 100b365c98977011702d0c6ffaa8a343250067bb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 15:21:47 +0900
Subject: [PATCH 06716/10326] Restore hyper dash state on revert judgement
 result

---
 .../TestSceneCatcher.cs                       | 31 ++++++++++++++++++-
 .../Judgements/CatchJudgementResult.cs        |  5 +++
 osu.Game.Rulesets.Catch/UI/Catcher.cs         | 13 +++++++-
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 62149620d2..cf6011d721 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -57,7 +57,36 @@ namespace osu.Game.Rulesets.Catch.Tests
         });
 
         [Test]
-        public void TestCatcherStateRevert()
+        public void TestCatcherHyperStateReverted()
+        {
+            DrawableCatchHitObject drawableObject1 = null;
+            DrawableCatchHitObject drawableObject2 = null;
+            JudgementResult result1 = null;
+            JudgementResult result2 = null;
+            AddStep("catch hyper fruit", () =>
+            {
+                drawableObject1 = createDrawableObject(new Fruit { HyperDashTarget = new Fruit { X = 100 } });
+                result1 = attemptCatch(drawableObject1);
+            });
+            AddStep("catch normal fruit", () =>
+            {
+                drawableObject2 = createDrawableObject(new Fruit());
+                result2 = attemptCatch(drawableObject2);
+            });
+            AddStep("revert second result", () =>
+            {
+                catcher.OnRevertResult(drawableObject2, result2);
+            });
+            checkHyperDash(true);
+            AddStep("revert first result", () =>
+            {
+                catcher.OnRevertResult(drawableObject1, result1);
+            });
+            checkHyperDash(false);
+        }
+
+        [Test]
+        public void TestCatcherAnimationStateReverted()
         {
             DrawableCatchHitObject drawableObject = null;
             JudgementResult result = null;
diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchJudgementResult.cs b/osu.Game.Rulesets.Catch/Judgements/CatchJudgementResult.cs
index 4b375e641b..c09355d59c 100644
--- a/osu.Game.Rulesets.Catch/Judgements/CatchJudgementResult.cs
+++ b/osu.Game.Rulesets.Catch/Judgements/CatchJudgementResult.cs
@@ -15,6 +15,11 @@ namespace osu.Game.Rulesets.Catch.Judgements
         /// </summary>
         public CatcherAnimationState CatcherAnimationState;
 
+        /// <summary>
+        /// Whether the catcher was hyper dashing prior to this judgement.
+        /// </summary>
+        public bool CatcherHyperDash;
+
         public CatchJudgementResult([NotNull] HitObject hitObject, [NotNull] Judgement judgement)
             : base(hitObject, judgement)
         {
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 33068f95eb..da80fa2bd5 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -213,6 +213,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             var catchResult = (CatchJudgementResult)result;
             catchResult.CatcherAnimationState = CurrentState;
+            catchResult.CatcherHyperDash = HyperDashing;
 
             if (!(drawableObject.HitObject is PalpableCatchHitObject hitObject)) return;
 
@@ -243,7 +244,17 @@ namespace osu.Game.Rulesets.Catch.UI
         public void OnRevertResult(DrawableCatchHitObject fruit, JudgementResult result)
         {
             var catchResult = (CatchJudgementResult)result;
-            updateState(catchResult.CatcherAnimationState);
+
+            if (CurrentState != catchResult.CatcherAnimationState)
+                updateState(catchResult.CatcherAnimationState);
+
+            if (HyperDashing != catchResult.CatcherHyperDash)
+            {
+                if (catchResult.CatcherHyperDash)
+                    SetHyperDashState(2);
+                else
+                    SetHyperDashState();
+            }
         }
 
         /// <summary>

From 1a66d8f2bc7ae8ae423b2da010965ad22dc4ff60 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 15:24:39 +0900
Subject: [PATCH 06717/10326] Remove caught objects on revert result

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

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index da80fa2bd5..2bf085312f 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -241,7 +241,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 updateState(CatcherAnimationState.Fail);
         }
 
-        public void OnRevertResult(DrawableCatchHitObject fruit, JudgementResult result)
+        public void OnRevertResult(DrawableCatchHitObject drawableObject, JudgementResult result)
         {
             var catchResult = (CatchJudgementResult)result;
 
@@ -255,6 +255,9 @@ namespace osu.Game.Rulesets.Catch.UI
                 else
                     SetHyperDashState();
             }
+
+            caughtFruitContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
+            droppedObjectTarget.RemoveAll(d => (d as DrawableCatchHitObject)?.HitObject == drawableObject.HitObject);
         }
 
         /// <summary>

From 02571ec7ae3f45df77db3d162d1bd3cc4afe640c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 15:43:17 +0900
Subject: [PATCH 06718/10326] Remove hit explosion on revert result

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs      | 2 ++
 osu.Game.Rulesets.Catch/UI/HitExplosion.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 2bf085312f..a806e623af 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -258,6 +258,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             caughtFruitContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
             droppedObjectTarget.RemoveAll(d => (d as DrawableCatchHitObject)?.HitObject == drawableObject.HitObject);
+            hitExplosionContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
         }
 
         /// <summary>
@@ -489,6 +490,7 @@ namespace osu.Game.Rulesets.Catch.UI
             if (!hitLighting.Value) return;
 
             HitExplosion hitExplosion = hitExplosionPool.Get();
+            hitExplosion.HitObject = caughtObject.HitObject;
             hitExplosion.X = caughtObject.X;
             hitExplosion.Scale = new Vector2(caughtObject.HitObject.Scale);
             hitExplosion.ObjectColour = caughtObject.AccentColour.Value;
diff --git a/osu.Game.Rulesets.Catch/UI/HitExplosion.cs b/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
index 24ca778248..26627422e1 100644
--- a/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Utils;
+using osu.Game.Rulesets.Catch.Objects;
 using osuTK;
 using osuTK.Graphics;
 
@@ -15,6 +16,7 @@ namespace osu.Game.Rulesets.Catch.UI
     public class HitExplosion : PoolableDrawable
     {
         private Color4 objectColour;
+        public CatchHitObject HitObject;
 
         public Color4 ObjectColour
         {

From 17d48c82f6f4d8ed22981b2ed4e749012709db55 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 16:59:06 +0900
Subject: [PATCH 06719/10326] Use switch statement instead of an array

---
 .../Skinning/Legacy/LegacyFruitPiece.cs       | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index e45f00c6aa..6f93e68594 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -11,11 +10,6 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
     {
         public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
 
-        private readonly string[] lookupNames =
-        {
-            "fruit-pear", "fruit-grapes", "fruit-apple", "fruit-orange"
-        };
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -30,10 +24,24 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
         private void setTexture(FruitVisualRepresentation visualRepresentation)
         {
-            Texture texture = Skin.GetTexture(lookupNames[(int)visualRepresentation]);
-            Texture overlayTexture = Skin.GetTexture(lookupNames[(int)visualRepresentation] + "-overlay");
+            switch (visualRepresentation)
+            {
+                case FruitVisualRepresentation.Pear:
+                    SetTexture(Skin.GetTexture("fruit-pear"), Skin.GetTexture("fruit-pear-overlay"));
+                    break;
 
-            SetTexture(texture, overlayTexture);
+                case FruitVisualRepresentation.Grape:
+                    SetTexture(Skin.GetTexture("fruit-grapes"), Skin.GetTexture("fruit-grapes-overlay"));
+                    break;
+
+                case FruitVisualRepresentation.Pineapple:
+                    SetTexture(Skin.GetTexture("fruit-apple"), Skin.GetTexture("fruit-apple-overlay"));
+                    break;
+
+                case FruitVisualRepresentation.Raspberry:
+                    SetTexture(Skin.GetTexture("fruit-orange"), Skin.GetTexture("fruit-orange-overlay"));
+                    break;
+            }
         }
     }
 }

From 603cecb2ebbf2241f605ed86daf18d1139013140 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 17:02:57 +0900
Subject: [PATCH 06720/10326] Make CatchHitObjectPiece abstract class

---
 osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
index be6cf0fc05..0d4a4e8e78 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
@@ -12,7 +12,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
-    public class CatchHitObjectPiece : CompositeDrawable
+    public abstract class CatchHitObjectPiece : CompositeDrawable
     {
         public readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
         public readonly Bindable<bool> HyperDash = new Bindable<bool>();

From 9d926de9443143f7a7b75860c4b05ac973e0d9ee Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Dec 2020 17:04:26 +0900
Subject: [PATCH 06721/10326] Fix test failure

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index c8826aa174..8602c7aad1 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -15,7 +15,6 @@ 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;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -58,7 +57,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
                 Schedule(() =>
                 {
-                    area.OnNewResult(drawable, new JudgementResult(fruit, new CatchJudgement())
+                    area.OnNewResult(drawable, new CatchJudgementResult(fruit, new CatchJudgement())
                     {
                         Type = area.MovableCatcher.CanCatch(fruit) ? HitResult.Great : HitResult.Miss
                     });

From 4d5c242d35e0603282bee8d157a92fb4239c9e22 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 17:15:40 +0900
Subject: [PATCH 06722/10326] Use virtual property instead of a field for
 optional pieces

---
 .../Skinning/Default/BananaPiece.cs                    |  2 ++
 .../Skinning/Default/CatchHitObjectPiece.cs            | 10 ++++++++--
 .../Skinning/Default/DropletPiece.cs                   |  2 ++
 osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs |  3 +++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs
index f81c1063b9..8da18a668a 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs
@@ -7,6 +7,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class BananaPiece : CatchHitObjectPiece
     {
+        protected override BorderPiece BorderPiece { get; }
+
         public BananaPiece()
         {
             RelativeSizeAxes = Axes.Both;
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
index 0d4a4e8e78..d59b6cc0de 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
@@ -21,11 +21,17 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         [CanBeNull]
         protected DrawableHitObject DrawableHitObject { get; private set; }
 
+        /// <summary>
+        /// A part of this piece that will be faded out while falling in the playfield.
+        /// </summary>
         [CanBeNull]
-        protected BorderPiece BorderPiece;
+        protected virtual BorderPiece BorderPiece => null;
 
+        /// <summary>
+        /// A part of this piece that will be only visible when <see cref="HyperDash"/> is true.
+        /// </summary>
         [CanBeNull]
-        protected HyperBorderPiece HyperBorderPiece;
+        protected virtual HyperBorderPiece HyperBorderPiece => null;
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs
index c149f7769f..8b1052dfe2 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class DropletPiece : CatchHitObjectPiece
     {
+        protected override HyperBorderPiece HyperBorderPiece { get; }
+
         public DropletPiece()
         {
             Size = new Vector2(CatchHitObject.OBJECT_RADIUS / 2);
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
index 45d688c4e5..2e3803a31a 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
@@ -16,6 +16,9 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 
         public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
 
+        protected override BorderPiece BorderPiece { get; }
+        protected override HyperBorderPiece HyperBorderPiece { get; }
+
         public FruitPiece()
         {
             RelativeSizeAxes = Axes.Both;

From 22a5df6309aad3ab7f075c38e7617eee64c4c12c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 17:31:00 +0900
Subject: [PATCH 06723/10326] Clear all transforms of catcher trail sprite
 before returned to pool

---
 osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs b/osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs
index b3be18d46b..0e3e409fac 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs
@@ -30,5 +30,11 @@ namespace osu.Game.Rulesets.Catch.UI
             // 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;
         }
+
+        protected override void FreeAfterUse()
+        {
+            ClearTransforms();
+            base.FreeAfterUse();
+        }
     }
 }

From 56721a6fa9aec7d9ae55091931e474186862d6b7 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 12:48:13 +0900
Subject: [PATCH 06724/10326] Compute object position in stack via a pure
 function

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index a806e623af..76c5afeda7 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -447,8 +447,10 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (caughtObject == null) return;
 
+            var positionInStack = computePositionInStack(new Vector2(source.X - X, 0), caughtObject.DisplayRadius);
+
             caughtObject.RelativePositionAxes = Axes.None;
-            caughtObject.X = source.X - X;
+            caughtObject.Position = positionInStack;
             caughtObject.IsOnPlate = true;
 
             caughtObject.Anchor = Anchor.TopCentre;
@@ -457,8 +459,6 @@ namespace osu.Game.Rulesets.Catch.UI
             caughtObject.LifetimeStart = source.StartTime;
             caughtObject.LifetimeEnd = double.MaxValue;
 
-            adjustPositionInStack(caughtObject);
-
             caughtFruitContainer.Add(caughtObject);
 
             addLighting(caughtObject);
@@ -467,22 +467,22 @@ namespace osu.Game.Rulesets.Catch.UI
                 removeFromPlate(caughtObject, DroppedObjectAnimation.Explode);
         }
 
-        private void adjustPositionInStack(DrawablePalpableCatchHitObject caughtObject)
+        private Vector2 computePositionInStack(Vector2 position, float displayRadius)
         {
             const float radius_div_2 = CatchHitObject.OBJECT_RADIUS / 2;
             const float allowance = 10;
 
-            float caughtObjectRadius = caughtObject.DisplayRadius;
-
-            while (caughtFruitContainer.Any(f => Vector2Extensions.Distance(f.Position, caughtObject.Position) < (caughtObjectRadius + radius_div_2) / (allowance / 2)))
+            while (caughtFruitContainer.Any(f => Vector2Extensions.Distance(f.Position, position) < (displayRadius + radius_div_2) / (allowance / 2)))
             {
-                float diff = (caughtObjectRadius + radius_div_2) / allowance;
+                float diff = (displayRadius + radius_div_2) / allowance;
 
-                caughtObject.X += (RNG.NextSingle() - 0.5f) * diff * 2;
-                caughtObject.Y -= RNG.NextSingle() * diff;
+                position.X += (RNG.NextSingle() - 0.5f) * diff * 2;
+                position.Y -= RNG.NextSingle() * diff;
             }
 
-            caughtObject.X = Math.Clamp(caughtObject.X, -CatcherArea.CATCHER_SIZE / 2, CatcherArea.CATCHER_SIZE / 2);
+            position.X = Math.Clamp(position.X, -CatcherArea.CATCHER_SIZE / 2, CatcherArea.CATCHER_SIZE / 2);
+
+            return position;
         }
 
         private void addLighting(DrawablePalpableCatchHitObject caughtObject)

From 004c705aa9da1024078af02f8ef6c87c8468d804 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 20:05:18 +0900
Subject: [PATCH 06725/10326] Remove ScaleContainer and flatten the Drawable
 tree of catch DHO

---
 .../TestSceneFruitRandomness.cs               | 47 +++++--------------
 .../Objects/Drawables/DrawableBanana.cs       | 14 +++---
 .../Objects/Drawables/DrawableDroplet.cs      |  6 +--
 .../Objects/Drawables/DrawableFruit.cs        |  6 +--
 .../DrawablePalpableCatchHitObject.cs         | 14 +-----
 5 files changed, 28 insertions(+), 59 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index 2ffebb7de1..e1d817b314 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -11,13 +11,13 @@ namespace osu.Game.Rulesets.Catch.Tests
 {
     public class TestSceneFruitRandomness : OsuTestScene
     {
-        private readonly TestDrawableFruit drawableFruit;
-        private readonly TestDrawableBanana drawableBanana;
+        private readonly DrawableFruit drawableFruit;
+        private readonly DrawableBanana drawableBanana;
 
         public TestSceneFruitRandomness()
         {
-            drawableFruit = new TestDrawableFruit(new Fruit());
-            drawableBanana = new TestDrawableBanana(new Banana());
+            drawableFruit = new DrawableFruit(new Fruit());
+            drawableBanana = new DrawableBanana(new Banana());
 
             Add(new TestDrawableCatchHitObjectSpecimen(drawableFruit) { X = -200 });
             Add(new TestDrawableCatchHitObjectSpecimen(drawableBanana));
@@ -44,9 +44,9 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
 
-                fruitRotation = drawableFruit.InnerRotation;
-                bananaRotation = drawableBanana.InnerRotation;
-                bananaScale = drawableBanana.InnerScale;
+                fruitRotation = drawableFruit.Rotation;
+                bananaRotation = drawableBanana.Rotation;
+                bananaScale = drawableBanana.Scale.X;
                 bananaColour = drawableBanana.AccentColour.Value;
             });
 
@@ -55,9 +55,9 @@ namespace osu.Game.Rulesets.Catch.Tests
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = another_start_time;
             });
 
-            AddAssert("fruit rotation is changed", () => drawableFruit.InnerRotation != fruitRotation);
-            AddAssert("banana rotation is changed", () => drawableBanana.InnerRotation != bananaRotation);
-            AddAssert("banana scale is changed", () => drawableBanana.InnerScale != bananaScale);
+            AddAssert("fruit rotation is changed", () => drawableFruit.Rotation != fruitRotation);
+            AddAssert("banana rotation is changed", () => drawableBanana.Rotation != bananaRotation);
+            AddAssert("banana scale is changed", () => drawableBanana.Scale.X != bananaScale);
             AddAssert("banana colour is changed", () => drawableBanana.AccentColour.Value != bananaColour);
 
             AddStep("reset start time", () =>
@@ -66,31 +66,10 @@ namespace osu.Game.Rulesets.Catch.Tests
             });
 
             AddAssert("rotation and scale restored", () =>
-                drawableFruit.InnerRotation == fruitRotation &&
-                drawableBanana.InnerRotation == bananaRotation &&
-                drawableBanana.InnerScale == bananaScale &&
+                drawableFruit.Rotation == fruitRotation &&
+                drawableBanana.Rotation == bananaRotation &&
+                drawableBanana.Scale.X == bananaScale &&
                 drawableBanana.AccentColour.Value == bananaColour);
         }
-
-        private class TestDrawableFruit : DrawableFruit
-        {
-            public float InnerRotation => ScaleContainer.Rotation;
-
-            public TestDrawableFruit(Fruit h)
-                : base(h)
-            {
-            }
-        }
-
-        private class TestDrawableBanana : DrawableBanana
-        {
-            public float InnerRotation => ScaleContainer.Rotation;
-            public float InnerScale => ScaleContainer.Scale.X;
-
-            public TestDrawableBanana(Banana h)
-                : base(h)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index 2a543a0e04..4bc5da2396 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -24,9 +24,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            ScaleContainer.Child = new SkinnableDrawable(
+            AddInternal(new SkinnableDrawable(
                 new CatchSkinComponent(CatchSkinComponents.Banana),
-                _ => new BananaPiece());
+                _ => new BananaPiece()));
         }
 
         protected override void LoadComplete()
@@ -44,12 +44,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             const float end_scale = 0.6f;
             const float random_scale_range = 1.6f;
 
-            ScaleContainer.ScaleTo(HitObject.Scale * (end_scale + random_scale_range * RandomSingle(3)))
-                          .Then().ScaleTo(HitObject.Scale * end_scale, HitObject.TimePreempt);
+            this.ScaleTo(HitObject.Scale * (end_scale + random_scale_range * RandomSingle(3)))
+                .Then().ScaleTo(HitObject.Scale * end_scale, HitObject.TimePreempt);
 
-            ScaleContainer.RotateTo(getRandomAngle(1))
-                          .Then()
-                          .RotateTo(getRandomAngle(2), HitObject.TimePreempt);
+            this.RotateTo(getRandomAngle(1))
+                .Then()
+                .RotateTo(getRandomAngle(2), HitObject.TimePreempt);
 
             float getRandomAngle(int series) => 180 * (RandomSingle(series) * 2 - 1);
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index 81c8de2e59..d96b1c8902 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -26,9 +26,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            ScaleContainer.Child = new SkinnableDrawable(
+            AddInternal(new SkinnableDrawable(
                 new CatchSkinComponent(CatchSkinComponents.Droplet),
-                _ => new DropletPiece());
+                _ => new DropletPiece()));
         }
 
         protected override void UpdateInitialTransforms()
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             float startRotation = RandomSingle(1) * 20;
             double duration = HitObject.TimePreempt + 2000;
 
-            ScaleContainer.RotateTo(startRotation).RotateTo(startRotation + 720, duration);
+            this.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 0fcd319a93..8135a31b43 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -32,16 +32,16 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 VisualRepresentation.Value = (FruitVisualRepresentation)(change.NewValue % 4);
             }, true);
 
-            ScaleContainer.Child = new SkinnableDrawable(
+            AddInternal(new SkinnableDrawable(
                 new CatchSkinComponent(CatchSkinComponents.Fruit),
-                _ => new FruitPiece());
+                _ => new FruitPiece()));
         }
 
         protected override void UpdateInitialTransforms()
         {
             base.UpdateInitialTransforms();
 
-            ScaleContainer.RotateTo((RandomSingle(1) - 0.5f) * 40);
+            this.RotateTo((RandomSingle(1) - 0.5f) * 40);
         }
     }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 0877b5e248..b99710ae8e 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -5,7 +5,6 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
@@ -21,7 +20,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         public readonly Bindable<int> IndexInBeatmap = new Bindable<int>();
 
         /// <summary>
-        /// The multiplicative factor applied to <see cref="ScaleContainer"/> scale relative to <see cref="HitObject"/> scale.
+        /// The multiplicative factor applied to <see cref="Drawable.Scale"/> relative to <see cref="HitObject"/> scale.
         /// </summary>
         protected virtual float ScaleFactor => 1;
 
@@ -32,20 +31,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         public float DisplayRadius => CatchHitObject.OBJECT_RADIUS * HitObject.Scale * ScaleFactor;
 
-        protected readonly Container ScaleContainer;
-
         protected DrawablePalpableCatchHitObject([CanBeNull] CatchHitObject h)
             : base(h)
         {
             Origin = Anchor.Centre;
             Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
-
-            AddInternal(ScaleContainer = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-            });
         }
 
         [BackgroundDependencyLoader]
@@ -58,7 +48,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
             ScaleBindable.BindValueChanged(scale =>
             {
-                ScaleContainer.Scale = new Vector2(scale.NewValue * ScaleFactor);
+                Scale = new Vector2(scale.NewValue * ScaleFactor);
             }, true);
 
             IndexInBeatmap.BindValueChanged(_ => UpdateComboColour());

From 94a59ac3b240c75a00e440f2062ddbd7d9cec6e5 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 20:41:26 +0900
Subject: [PATCH 06726/10326] Make catch hit lighting logic not dependent on
 caught object

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 33 +++++++++++++++------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 76c5afeda7..ac0f25e21b 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -215,10 +215,19 @@ namespace osu.Game.Rulesets.Catch.UI
             catchResult.CatcherAnimationState = CurrentState;
             catchResult.CatcherHyperDash = HyperDashing;
 
-            if (!(drawableObject.HitObject is PalpableCatchHitObject hitObject)) return;
+            if (!(drawableObject is DrawablePalpableCatchHitObject palpableObject)) return;
+
+            var hitObject = palpableObject.HitObject;
 
             if (result.IsHit)
-                placeCaughtObject(hitObject);
+            {
+                var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplayRadius);
+
+                placeCaughtObject(hitObject, positionInStack);
+
+                if (hitLighting.Value)
+                    addLighting(hitObject, positionInStack.X, drawableObject.AccentColour.Value);
+            }
 
             // droplet doesn't affect the catcher state
             if (hitObject is TinyDroplet) return;
@@ -441,16 +450,14 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
-        private void placeCaughtObject(PalpableCatchHitObject source)
+        private void placeCaughtObject(PalpableCatchHitObject source, Vector2 position)
         {
             var caughtObject = createCaughtObject(source);
 
             if (caughtObject == null) return;
 
-            var positionInStack = computePositionInStack(new Vector2(source.X - X, 0), caughtObject.DisplayRadius);
-
             caughtObject.RelativePositionAxes = Axes.None;
-            caughtObject.Position = positionInStack;
+            caughtObject.Position = position;
             caughtObject.IsOnPlate = true;
 
             caughtObject.Anchor = Anchor.TopCentre;
@@ -461,8 +468,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
             caughtFruitContainer.Add(caughtObject);
 
-            addLighting(caughtObject);
-
             if (!caughtObject.StaysOnPlate)
                 removeFromPlate(caughtObject, DroppedObjectAnimation.Explode);
         }
@@ -485,15 +490,13 @@ namespace osu.Game.Rulesets.Catch.UI
             return position;
         }
 
-        private void addLighting(DrawablePalpableCatchHitObject caughtObject)
+        private void addLighting(CatchHitObject hitObject, float x, Color4 colour)
         {
-            if (!hitLighting.Value) return;
-
             HitExplosion hitExplosion = hitExplosionPool.Get();
-            hitExplosion.HitObject = caughtObject.HitObject;
-            hitExplosion.X = caughtObject.X;
-            hitExplosion.Scale = new Vector2(caughtObject.HitObject.Scale);
-            hitExplosion.ObjectColour = caughtObject.AccentColour.Value;
+            hitExplosion.HitObject = hitObject;
+            hitExplosion.X = x;
+            hitExplosion.Scale = new Vector2(hitObject.Scale);
+            hitExplosion.ObjectColour = colour;
             hitExplosionContainer.Add(hitExplosion);
         }
 

From be4a668e0b83025c6c7d87f5964ea4887e62d606 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Dec 2020 15:34:31 +0900
Subject: [PATCH 06727/10326] Add basic structure for multiplayer state and
 model components

---
 .../RealtimeMultiplayer/ISpectatorClient.cs   | 19 +++++++++++++++++++
 .../RealtimeMultiplayer/ISpectatorServer.cs   | 13 +++++++++++++
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 15 +++++++++++++++
 .../MultiplayerRoomState.cs                   | 17 +++++++++++++++++
 4 files changed, 64 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
new file mode 100644
index 0000000000..8054c489c5
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.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.Threading.Tasks;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// An interface defining a spectator client instance.
+    /// </summary>
+    public interface IMultiplayerClient
+    {
+        /// <summary>
+        /// Signals that the room has changed state.
+        /// </summary>
+        /// <param name="state">The state of the room.</param>
+        Task RoomStateChanged(MultiplayerRoomState state);
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
new file mode 100644
index 0000000000..3d00eaaf6a
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.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.
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// An interface defining the spectator server instance.
+    /// </summary>
+    public interface IMultiplayerServer
+    {
+        // TODO: implement
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
new file mode 100644
index 0000000000..ee1f42f7bf
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.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 System;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    [Serializable]
+    public class MultiplayerRoom
+    {
+        public long RoomID { get; set; }
+
+        public MultiplayerRoomState State { get; set; }
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
new file mode 100644
index 0000000000..60e47e9027
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// The current overall state of a realtime multiplayer room.
+    /// </summary>
+    public enum MultiplayerRoomState
+    {
+        Open,
+        WaitingForLoad,
+        Playing,
+        WaitingForResults,
+        Closed
+    }
+}

From daed27460c8f2b29349401d59ac4026f2fcf8e48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Dec 2020 17:23:57 +0900
Subject: [PATCH 06728/10326] Add simple user state class

---
 .../RealtimeMultiplayer/MultiplayerClientState.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
new file mode 100644
index 0000000000..ac76f8999a
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.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.
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class MultiplayerClientState
+    {
+        public MultiplayerClientState(in long roomId)
+        {
+            CurrentRoomID = roomId;
+        }
+
+        public long CurrentRoomID { get; }
+    }
+}

From f4ccbbd09261ac4ba63d4633d3d884841b4139c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Dec 2020 18:18:41 +0900
Subject: [PATCH 06729/10326] Add basic server implementation

---
 .../RealtimeMultiplayer/ISpectatorServer.cs       | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
index 3d00eaaf6a..ba7d7d3832 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.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.Threading.Tasks;
+
 namespace osu.Game.Online.RealtimeMultiplayer
 {
     /// <summary>
@@ -8,6 +10,17 @@ namespace osu.Game.Online.RealtimeMultiplayer
     /// </summary>
     public interface IMultiplayerServer
     {
-        // TODO: implement
+        /// <summary>
+        /// Request to join a multiplayer room.
+        /// </summary>
+        /// <param name="roomId">The databased room ID.</param>
+        /// <returns>Whether the room could be joined.</returns>
+        Task<bool> JoinRoom(long roomId);
+
+        /// <summary>
+        /// Request to leave the currently joined room.
+        /// </summary>
+        /// <param name="roomId">The databased room ID.</param>
+        Task LeaveRoom(long roomId);
     }
 }

From 8ebdb5723b19827960f08a60e3e0c252fb188208 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Dec 2020 18:50:02 +0900
Subject: [PATCH 06730/10326] Add models for users and rooms

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    |  9 ++++++++
 .../MultiplayerRoomUser.cs                    | 21 +++++++++++++++++++
 .../MultiplayerUserState.cs                   | 13 ++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index ee1f42f7bf..f42f8d7f5f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
@@ -11,5 +12,13 @@ namespace osu.Game.Online.RealtimeMultiplayer
         public long RoomID { get; set; }
 
         public MultiplayerRoomState State { get; set; }
+
+        public IReadOnlyList<MultiplayerRoomUser> Users => users;
+
+        private List<MultiplayerRoomUser> users = new List<MultiplayerRoomUser>();
+
+        public void Join(int user) => users.Add(new MultiplayerRoomUser(user));
+
+        public void Leave(int user) => users.RemoveAll(u => u.UserID == user);
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
new file mode 100644
index 0000000000..c5fed1629c
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Users;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class MultiplayerRoomUser
+    {
+        public MultiplayerRoomUser(in int userId)
+        {
+            UserID = userId;
+        }
+
+        public long UserID { get; set; }
+
+        public MultiplayerUserState State { get; set; }
+
+        public User User { get; set; }
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
new file mode 100644
index 0000000000..6d6baa8017
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.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.
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public enum MultiplayerUserState
+    {
+        Watching,
+        Ready,
+        Playing,
+        Results,
+    }
+}

From fdf025942b526ad34ce1a8cd25bd55f0acb6980c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 01:24:38 +0900
Subject: [PATCH 06731/10326] Ensure room is locked when mutating users

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index f42f8d7f5f..1a02dab5e0 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -9,16 +9,33 @@ namespace osu.Game.Online.RealtimeMultiplayer
     [Serializable]
     public class MultiplayerRoom
     {
+        private object writeLock = new object();
+
         public long RoomID { get; set; }
 
         public MultiplayerRoomState State { get; set; }
 
-        public IReadOnlyList<MultiplayerRoomUser> Users => users;
-
         private List<MultiplayerRoomUser> users = new List<MultiplayerRoomUser>();
 
-        public void Join(int user) => users.Add(new MultiplayerRoomUser(user));
+        public IReadOnlyList<MultiplayerRoomUser> Users
+        {
+            get
+            {
+                lock (writeLock)
+                    return users.ToArray();
+            }
+        }
 
-        public void Leave(int user) => users.RemoveAll(u => u.UserID == user);
+        public void Join(int user)
+        {
+            lock (writeLock)
+                users.Add(new MultiplayerRoomUser(user));
+        }
+
+        public void Leave(int user)
+        {
+            lock (writeLock)
+                users.RemoveAll(u => u.UserID == user);
+        }
     }
 }

From ca86524c922012b32e7a1420c54b49d96a6df3d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 01:35:29 +0900
Subject: [PATCH 06732/10326] Add locking on join/leave operations

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 1a02dab5e0..db3993255a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -26,16 +26,25 @@ namespace osu.Game.Online.RealtimeMultiplayer
             }
         }
 
-        public void Join(int user)
+        public MultiplayerRoomUser Join(int userId)
         {
-            lock (writeLock)
-                users.Add(new MultiplayerRoomUser(user));
+            var user = new MultiplayerRoomUser(userId);
+            lock (writeLock) users.Add(user);
+            return user;
         }
 
-        public void Leave(int user)
+        public MultiplayerRoomUser Leave(int userId)
         {
             lock (writeLock)
-                users.RemoveAll(u => u.UserID == user);
+            {
+                var user = users.Find(u => u.UserID == userId);
+
+                if (user == null)
+                    return null;
+
+                users.Remove(user);
+                return user;
+            }
         }
     }
 }

From ff52a5ddc6bc5cbb4d5dfdf52fed460b6e660826 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 01:35:42 +0900
Subject: [PATCH 06733/10326] Add callbacks for join/leave events to notify
 other room occupants

---
 .../Online/RealtimeMultiplayer/ISpectatorClient.cs   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
index 8054c489c5..d5f6baad43 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
@@ -15,5 +15,17 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="state">The state of the room.</param>
         Task RoomStateChanged(MultiplayerRoomState state);
+
+        /// <summary>
+        /// Signals that a user has joined the room.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        Task UserJoined(MultiplayerRoomUser user);
+
+        /// <summary>
+        /// Signals that a user has left the room.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        Task UserLeft(MultiplayerRoomUser user);
     }
 }

From 6e5846d91b7389575a91691851f6311de8a5cddc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:33:01 +0900
Subject: [PATCH 06734/10326] Fix serialization failure due to missing set

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
index ac76f8999a..17c209ba26 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
@@ -5,11 +5,11 @@ namespace osu.Game.Online.RealtimeMultiplayer
 {
     public class MultiplayerClientState
     {
+        public long CurrentRoomID { get; set; }
+
         public MultiplayerClientState(in long roomId)
         {
             CurrentRoomID = roomId;
         }
-
-        public long CurrentRoomID { get; }
     }
 }

From baf16cfbc3a30082996acb9bde002b58ff815105 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:33:38 +0900
Subject: [PATCH 06735/10326] Add room settings related model and event flow

---
 .../RealtimeMultiplayer/ISpectatorClient.cs   |  6 +++++
 .../RealtimeMultiplayer/MultiplayerRoom.cs    |  2 ++
 .../MultiplayerRoomSettings.cs                | 25 +++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
index d5f6baad43..1e6832e728 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
@@ -27,5 +27,11 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="user">The user.</param>
         Task UserLeft(MultiplayerRoomUser user);
+
+        /// <summary>
+        /// Signals that the settings for this room have changed.
+        /// </summary>
+        /// <param name="newSettings">The updated room settings.</param>
+        Task SettingsChanged(MultiplayerRoomSettings newSettings);
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index db3993255a..61320b9d73 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public MultiplayerRoomState State { get; set; }
 
+        public MultiplayerRoomSettings Settings { get; set; }
+
         private List<MultiplayerRoomUser> users = new List<MultiplayerRoomUser>();
 
         public IReadOnlyList<MultiplayerRoomUser> Users
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
new file mode 100644
index 0000000000..4c2c014cd9
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using osu.Game.Online.API;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class MultiplayerRoomSettings : IEquatable<MultiplayerRoomSettings>
+    {
+        public int? BeatmapID { get; set; }
+
+        public int? RulesetID { get; set; }
+
+        [NotNull]
+        public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
+
+        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other?.BeatmapID && Mods.SequenceEqual(other?.Mods) && RulesetID == other?.RulesetID;
+
+        public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
+    }
+}

From 882ace6efea12be861efc400d5b61e0a8dd48a0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:33:47 +0900
Subject: [PATCH 06736/10326] Make MultiplayerRoomUser equatable

---
 .../MultiplayerRoomUser.cs                    | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
index c5fed1629c..3daebe3dda 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
@@ -1,21 +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 osu.Game.Users;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
-    public class MultiplayerRoomUser
+    public class MultiplayerRoomUser : IEquatable<MultiplayerRoomUser>
     {
         public MultiplayerRoomUser(in int userId)
         {
             UserID = userId;
         }
 
-        public long UserID { get; set; }
+        public long UserID { get; }
 
         public MultiplayerUserState State { get; set; }
 
         public User User { get; set; }
+
+        public bool Equals(MultiplayerRoomUser other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return UserID == other.UserID;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+
+            return Equals((MultiplayerRoomUser)obj);
+        }
+
+        public override int GetHashCode() => UserID.GetHashCode();
     }
 }

From e193f8214df514f770d3bcad9ef41ce053255ed8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:39:26 +0900
Subject: [PATCH 06737/10326] Remove unnecessary room id from leave room
 request

---
 osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
index ba7d7d3832..053ffa0462 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// Request to leave the currently joined room.
         /// </summary>
-        /// <param name="roomId">The databased room ID.</param>
-        Task LeaveRoom(long roomId);
+        Task LeaveRoom();
     }
 }

From b3bdaaa7b59dc6a58f4448a7a236e0b8f2756f6f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:49:36 +0900
Subject: [PATCH 06738/10326] Move exceptions to common code

---
 .../RealtimeMultiplayer/InvalidStateException.cs  | 15 +++++++++++++++
 .../RealtimeMultiplayer/NotJoinedRoomException.cs | 12 ++++++++++++
 .../UserAlreadyInMultiplayerRoom.cs               | 15 +++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs b/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
new file mode 100644
index 0000000000..8393e7e925
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.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 System;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class InvalidStateException : Exception
+    {
+        public InvalidStateException(string message)
+            : base(message)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
new file mode 100644
index 0000000000..1b264d1ac5
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class NotJoinedRoomException : Exception
+    {
+        public NotJoinedRoomException()
+            : base("This user has not yet joined a multiplayer room.")
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs
new file mode 100644
index 0000000000..9a2090c710
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.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 System;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class UserAlreadyInMultiplayerRoom : Exception
+    {
+        public UserAlreadyInMultiplayerRoom()
+            : base("This user is already in a room.")
+        {
+        }
+    }
+}

From 327799c263bd923f4b7b51b8e675914aabb1d74f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:51:48 +0900
Subject: [PATCH 06739/10326] Rename multiplayer server file to match class

---
 .../{ISpectatorServer.cs => IMultiplayerServer.cs}       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
 rename osu.Game/Online/RealtimeMultiplayer/{ISpectatorServer.cs => IMultiplayerServer.cs} (66%)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
similarity index 66%
rename from osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
rename to osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 053ffa0462..f6eb3b8ff5 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -1,6 +1,3 @@
-// Copyright (c) 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.Threading.Tasks;
 
 namespace osu.Game.Online.RealtimeMultiplayer
@@ -14,12 +11,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Request to join a multiplayer room.
         /// </summary>
         /// <param name="roomId">The databased room ID.</param>
-        /// <returns>Whether the room could be joined.</returns>
-        Task<bool> JoinRoom(long roomId);
+        /// <exception cref="UserAlreadyInMultiplayerRoom">If the user is already in the requested (or another) room.</exception>
+        Task JoinRoom(long roomId);
 
         /// <summary>
         /// Request to leave the currently joined room.
         /// </summary>
         Task LeaveRoom();
     }
-}
+}
\ No newline at end of file

From 5a231cef1507289a2da1c4a719e26b195edccf01 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 15:46:11 +0900
Subject: [PATCH 06740/10326] Add thread safety for external operations on
 MultiplayerRoom

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 61320b9d73..7c3724915f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -9,8 +9,6 @@ namespace osu.Game.Online.RealtimeMultiplayer
     [Serializable]
     public class MultiplayerRoom
     {
-        private object writeLock = new object();
-
         public long RoomID { get; set; }
 
         public MultiplayerRoomState State { get; set; }
@@ -31,22 +29,34 @@ namespace osu.Game.Online.RealtimeMultiplayer
         public MultiplayerRoomUser Join(int userId)
         {
             var user = new MultiplayerRoomUser(userId);
-            lock (writeLock) users.Add(user);
+            PerformUpdate(_ => users.Add(user));
             return user;
         }
 
         public MultiplayerRoomUser Leave(int userId)
         {
-            lock (writeLock)
+            MultiplayerRoomUser user = null;
+
+            PerformUpdate(_ =>
             {
-                var user = users.Find(u => u.UserID == userId);
+                user = users.Find(u => u.UserID == userId);
 
-                if (user == null)
-                    return null;
+                if (user != null)
+                    users.Remove(user);
+            });
 
-                users.Remove(user);
-                return user;
-            }
+            return user;
+        }
+
+        private object writeLock = new object();
+
+        /// <summary>
+        /// Perform an update on this room in a thread-safe manner.
+        /// </summary>
+        /// <param name="action">The action to perform.</param>
+        public void PerformUpdate(Action<MultiplayerRoom> action)
+        {
+            lock (writeLock) action(this);
         }
     }
 }

From 4f449ba8217fa7ce930d2f608f55464d9da90ff0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 15:49:08 +0900
Subject: [PATCH 06741/10326] Rename idle state

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
index 6d6baa8017..47a1226e29 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
@@ -5,7 +5,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 {
     public enum MultiplayerUserState
     {
-        Watching,
+        Idle,
         Ready,
         Playing,
         Results,

From 42b1e9d6a4185cea488227a159de1d256456bb4b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 15:54:52 +0900
Subject: [PATCH 06742/10326] Add xmldoc coverage of MultiplayerRoom

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 7c3724915f..4bd8411344 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -9,14 +9,28 @@ namespace osu.Game.Online.RealtimeMultiplayer
     [Serializable]
     public class MultiplayerRoom
     {
+        /// <summary>
+        /// The ID of the room, used for database persistence.
+        /// </summary>
         public long RoomID { get; set; }
 
+        /// <summary>
+        /// The current state of the room (ie. whether it is in progress or otherwise).
+        /// </summary>
         public MultiplayerRoomState State { get; set; }
 
+        /// <summary>
+        /// All currently enforced game settings for this room.
+        /// </summary>
         public MultiplayerRoomSettings Settings { get; set; }
 
         private List<MultiplayerRoomUser> users = new List<MultiplayerRoomUser>();
 
+        private object writeLock = new object();
+
+        /// <summary>
+        /// All users which are currently in this room, in any state.
+        /// </summary>
         public IReadOnlyList<MultiplayerRoomUser> Users
         {
             get
@@ -26,6 +40,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
             }
         }
 
+        /// <summary>
+        /// Join a new user to this room.
+        /// </summary>
         public MultiplayerRoomUser Join(int userId)
         {
             var user = new MultiplayerRoomUser(userId);
@@ -33,6 +50,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
             return user;
         }
 
+        /// <summary>
+        /// Remove a user from this room.
+        /// </summary>
         public MultiplayerRoomUser Leave(int userId)
         {
             MultiplayerRoomUser user = null;
@@ -48,8 +68,6 @@ namespace osu.Game.Online.RealtimeMultiplayer
             return user;
         }
 
-        private object writeLock = new object();
-
         /// <summary>
         /// Perform an update on this room in a thread-safe manner.
         /// </summary>

From 2365d656104a66233ffe983907db64c5515b108c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 16:02:35 +0900
Subject: [PATCH 06743/10326] Move business logic out of MultiplayerRoom

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 48 +++----------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 4bd8411344..dc7ced7a9a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -6,6 +6,9 @@ using System.Collections.Generic;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
+    /// <summary>
+    /// A multiplayer room.
+    /// </summary>
     [Serializable]
     public class MultiplayerRoom
     {
@@ -24,50 +27,13 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         public MultiplayerRoomSettings Settings { get; set; }
 
-        private List<MultiplayerRoomUser> users = new List<MultiplayerRoomUser>();
+        /// <summary>
+        /// All users currently in this room.
+        /// </summary>
+        public List<MultiplayerRoomUser> Users { get; set; } = new List<MultiplayerRoomUser>();
 
         private object writeLock = new object();
 
-        /// <summary>
-        /// All users which are currently in this room, in any state.
-        /// </summary>
-        public IReadOnlyList<MultiplayerRoomUser> Users
-        {
-            get
-            {
-                lock (writeLock)
-                    return users.ToArray();
-            }
-        }
-
-        /// <summary>
-        /// Join a new user to this room.
-        /// </summary>
-        public MultiplayerRoomUser Join(int userId)
-        {
-            var user = new MultiplayerRoomUser(userId);
-            PerformUpdate(_ => users.Add(user));
-            return user;
-        }
-
-        /// <summary>
-        /// Remove a user from this room.
-        /// </summary>
-        public MultiplayerRoomUser Leave(int userId)
-        {
-            MultiplayerRoomUser user = null;
-
-            PerformUpdate(_ =>
-            {
-                user = users.Find(u => u.UserID == userId);
-
-                if (user != null)
-                    users.Remove(user);
-            });
-
-            return user;
-        }
-
         /// <summary>
         /// Perform an update on this room in a thread-safe manner.
         /// </summary>

From 5d2ca7fc39be724fb6098b2c36076131220406c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 16:15:51 +0900
Subject: [PATCH 06744/10326] Make remaining model classes nullable and
 serializable

---
 .../MultiplayerClientState.cs                 |  2 ++
 .../RealtimeMultiplayer/MultiplayerRoom.cs    |  9 ++++++++-
 .../MultiplayerRoomSettings.cs                |  7 ++++++-
 .../MultiplayerRoomState.cs                   |  2 ++
 .../MultiplayerRoomUser.cs                    | 19 ++++++++++---------
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
index 17c209ba26..8c440abba3 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.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.
 
+#nullable enable
+
 namespace osu.Game.Online.RealtimeMultiplayer
 {
     public class MultiplayerClientState
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index dc7ced7a9a..e70e12c89e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.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.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 
@@ -25,13 +27,18 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// All currently enforced game settings for this room.
         /// </summary>
-        public MultiplayerRoomSettings Settings { get; set; }
+        public MultiplayerRoomSettings Settings { get; set; } = MultiplayerRoomSettings.Empty();
 
         /// <summary>
         /// All users currently in this room.
         /// </summary>
         public List<MultiplayerRoomUser> Users { get; set; } = new List<MultiplayerRoomUser>();
 
+        /// <summary>
+        /// The host of this room, in control of changing room settings.
+        /// </summary>
+        public MultiplayerRoomUser? Host { get; set; }
+
         private object writeLock = new object();
 
         /// <summary>
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index 4c2c014cd9..3137afa8a4 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.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.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,6 +11,7 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
+    [Serializable]
     public class MultiplayerRoomSettings : IEquatable<MultiplayerRoomSettings>
     {
         public int? BeatmapID { get; set; }
@@ -18,8 +21,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
         [NotNull]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other?.BeatmapID && Mods.SequenceEqual(other?.Mods) && RulesetID == other?.RulesetID;
+        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID;
 
         public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
+
+        public static MultiplayerRoomSettings Empty() => new MultiplayerRoomSettings();
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
index 60e47e9027..9f76cd945e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.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.
 
+#nullable enable
+
 namespace osu.Game.Online.RealtimeMultiplayer
 {
     /// <summary>
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
index 3daebe3dda..17aca4458a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
@@ -1,27 +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.
 
+#nullable enable
+
 using System;
 using osu.Game.Users;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
+    [Serializable]
     public class MultiplayerRoomUser : IEquatable<MultiplayerRoomUser>
     {
+        public readonly long UserID;
+
+        public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
+
+        public User? User { get; set; }
+
         public MultiplayerRoomUser(in int userId)
         {
             UserID = userId;
         }
 
-        public long UserID { get; }
-
-        public MultiplayerUserState State { get; set; }
-
-        public User User { get; set; }
-
         public bool Equals(MultiplayerRoomUser other)
         {
-            if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
 
             return UserID == other.UserID;
@@ -29,9 +31,8 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
-            if (obj.GetType() != this.GetType()) return false;
+            if (obj.GetType() != GetType()) return false;
 
             return Equals((MultiplayerRoomUser)obj);
         }

From 5f5c0d55336a2228becd3021e2ee348c56c55d58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 16:15:58 +0900
Subject: [PATCH 06745/10326] Return room model when joining

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index f6eb3b8ff5..a05a4c1e11 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="roomId">The databased room ID.</param>
         /// <exception cref="UserAlreadyInMultiplayerRoom">If the user is already in the requested (or another) room.</exception>
-        Task JoinRoom(long roomId);
+        Task<MultiplayerRoom> JoinRoom(long roomId);
 
         /// <summary>
         /// Request to leave the currently joined room.

From 71de7ce0a3abc0af75d210d54ceafca9c1f0f5b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 16:32:45 +0900
Subject: [PATCH 06746/10326] Add missing methods to server interface

---
 .../RealtimeMultiplayer/IMultiplayerServer.cs      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index a05a4c1e11..44d7ecc2e9 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -18,5 +18,17 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Request to leave the currently joined room.
         /// </summary>
         Task LeaveRoom();
+
+        /// <summary>
+        /// Transfer the host of the currently joined room to another user in the room.
+        /// </summary>
+        /// <param name="userId">The new user which is to become host.</param>
+        Task TransferHost(long userId);
+
+        /// <summary>
+        /// As the host, update the settings of the currently joined room.
+        /// </summary>
+        /// <param name="settings">The new settings to apply.</param>
+        Task ChangeSettings(MultiplayerRoomSettings settings);
     }
-}
\ No newline at end of file
+}

From a4ca8d2998dc9fa222aceeb09ae90bf013bdf542 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 16:44:47 +0900
Subject: [PATCH 06747/10326] Ensure multiplayer rooms are instantiated with a
 room ID

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index e70e12c89e..8a88d8fc90 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// The ID of the room, used for database persistence.
         /// </summary>
-        public long RoomID { get; set; }
+        public readonly long RoomID;
 
         /// <summary>
         /// The current state of the room (ie. whether it is in progress or otherwise).
@@ -41,6 +41,11 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         private object writeLock = new object();
 
+        public MultiplayerRoom(in long roomId)
+        {
+            RoomID = roomId;
+        }
+
         /// <summary>
         /// Perform an update on this room in a thread-safe manner.
         /// </summary>

From dbe048cdc6b6d893e92109d50fd3fa5732fa294c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 17:03:44 +0900
Subject: [PATCH 06748/10326] Add client method for notifying about host
 changes

---
 osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
index 1e6832e728..f3dff0de86 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
@@ -28,6 +28,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <param name="user">The user.</param>
         Task UserLeft(MultiplayerRoomUser user);
 
+        /// <summary>
+        /// Signal that the host of the room has changed.
+        /// </summary>
+        /// <param name="userId">The user ID of the new host.</param>
+        Task HostChanged(long userId);
+
         /// <summary>
         /// Signals that the settings for this room have changed.
         /// </summary>

From 11a7057289b20a195bd1be91e1a11681d2f29eb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 17:41:56 +0900
Subject: [PATCH 06749/10326] Add notification flow for user state changes in
 room

---
 .../RealtimeMultiplayer/IMultiplayerServer.cs     |  7 +++++++
 .../RealtimeMultiplayer/ISpectatorClient.cs       |  7 +++++++
 .../RealtimeMultiplayer/InvalidStateChange.cs     | 15 +++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 44d7ecc2e9..ad4aa5d2c2 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -30,5 +30,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="settings">The new settings to apply.</param>
         Task ChangeSettings(MultiplayerRoomSettings settings);
+
+        /// <summary>
+        /// Change the local user state in the currently joined room.
+        /// </summary>
+        /// <param name="newState">The proposed new state.</param>
+        /// <exception cref="InvalidStateChange">If the state change requested is not valid, given the previous state or room state.</exception>
+        Task ChangeState(MultiplayerUserState newState);
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
index f3dff0de86..fa06652474 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
@@ -39,5 +39,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="newSettings">The updated room settings.</param>
         Task SettingsChanged(MultiplayerRoomSettings newSettings);
+
+        /// <summary>
+        /// Signals that a user in this room changed their state.
+        /// </summary>
+        /// <param name="userId">The ID of the user performing a state change.</param>
+        /// <param name="state">The new state of the user.</param>
+        Task UserStateChanged(long userId, MultiplayerUserState state);
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs
new file mode 100644
index 0000000000..d1016e95cb
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.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 System;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class InvalidStateChange : Exception
+    {
+        public InvalidStateChange(MultiplayerUserState oldState, MultiplayerUserState newState)
+            : base($"Cannot change from {oldState} to {newState}")
+        {
+        }
+    }
+}

From 345352be6757ab9225df004307e07a48de2523dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 17:42:08 +0900
Subject: [PATCH 06750/10326] Mark PerformUpdate as an instant handle method
 (doesn't really help with anything)

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 8a88d8fc90..3fbc01a2f5 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
@@ -50,7 +51,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Perform an update on this room in a thread-safe manner.
         /// </summary>
         /// <param name="action">The action to perform.</param>
-        public void PerformUpdate(Action<MultiplayerRoom> action)
+        public void PerformUpdate([InstantHandle] Action<MultiplayerRoom> action)
         {
             lock (writeLock) action(this);
         }

From 8eccfa476cbbff5a3e6ceb1e0cef9b2c0e74a683 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 18:02:14 +0900
Subject: [PATCH 06751/10326] Add loading states

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
index 47a1226e29..948ed50cca 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
@@ -7,6 +7,8 @@ namespace osu.Game.Online.RealtimeMultiplayer
     {
         Idle,
         Ready,
+        WaitingForLoad,
+        Loaded,
         Playing,
         Results,
     }

From 60550b73f77d0ec625c070fcd6eee395e8397149 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 18:18:20 +0900
Subject: [PATCH 06752/10326] Add missing states and xmldoc for all states'
 purposes

---
 .../MultiplayerUserState.cs                   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
index 948ed50cca..ed799f5252 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
@@ -5,11 +5,51 @@ namespace osu.Game.Online.RealtimeMultiplayer
 {
     public enum MultiplayerUserState
     {
+        /// <summary>
+        /// The user is idle and waiting for something to happen (or watching the match but not participating).
+        /// </summary>
         Idle,
+
+        /// <summary>
+        /// The user has marked themselves as ready to participate and should be considered for the next game start.
+        /// </summary>
         Ready,
+
+        /// <summary>
+        /// The server is waiting for this user to finish loading. This is a reserved state, and is set by the server.
+        /// </summary>
+        /// <remarks>
+        /// All users in <see cref="Ready"/> state when the game start will be transitioned to this state.
+        /// All users in this state need to transition to <see cref="Loaded"/> before the game can start.
+        /// </remarks>
         WaitingForLoad,
+
+        /// <summary>
+        /// The user's client has marked itself as loaded and ready to begin gameplay.
+        /// </summary>
         Loaded,
+
+        /// <summary>
+        /// The user is currently playing in a game. This is a reserved state, and is set by the server.
+        /// </summary>
+        /// <remarks>
+        /// Once there are no remaining <see cref="WaitingForLoad"/> users, all users in <see cref="Loaded"/> state will be transitioned to this state.
+        /// At this point the game will start for all users.
+        /// </remarks>
         Playing,
+
+        /// <summary>
+        /// The user has finished playing and is ready to view results.
+        /// </summary>
+        /// <remarks>
+        /// Once all users transition from <see cref="Playing"/> to this state, the game will end and results will be distributed.
+        /// All users will be transitioned to the <see cref="Results"/> state.
+        /// </remarks>
+        FinishedPlay,
+
+        /// <summary>
+        /// The user is currently viewing results. This is a reserved state, and is set by the server.
+        /// </summary>
         Results,
     }
 }

From 147db0abe22642c8f449b3f121cc8040c98f17f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 18:28:31 +0900
Subject: [PATCH 06753/10326] Fix client naming and xmldoc

---
 .../{ISpectatorClient.cs => IMultiplayerClient.cs}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game/Online/RealtimeMultiplayer/{ISpectatorClient.cs => IMultiplayerClient.cs} (96%)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
similarity index 96%
rename from osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
rename to osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index fa06652474..e772ef39f9 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 namespace osu.Game.Online.RealtimeMultiplayer
 {
     /// <summary>
-    /// An interface defining a spectator client instance.
+    /// An interface defining a multiplayer client instance.
     /// </summary>
     public interface IMultiplayerClient
     {

From 2aedd82e27a490a09c5efe526e2e45a7120b12e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 18:30:58 +0900
Subject: [PATCH 06754/10326] Document room states and remove unnecessary
 WaitingForResults state

---
 .../RealtimeMultiplayer/MultiplayerRoomState.cs  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
index 9f76cd945e..69c04b09a8 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
@@ -10,10 +10,24 @@ namespace osu.Game.Online.RealtimeMultiplayer
     /// </summary>
     public enum MultiplayerRoomState
     {
+        /// <summary>
+        /// The room is open and accepting new players.
+        /// </summary>
         Open,
+
+        /// <summary>
+        /// A game start has been triggered but players have not finished loading.
+        /// </summary>
         WaitingForLoad,
+
+        /// <summary>
+        /// A game is currently ongoing.
+        /// </summary>
         Playing,
-        WaitingForResults,
+
+        /// <summary>
+        /// The room has been disbanded and closed.
+        /// </summary>
         Closed
     }
 }

From 2433838d5887e84089496713857dbd8f12f797aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 18:42:08 +0900
Subject: [PATCH 06755/10326] Add methods covering match start / end

---
 .../RealtimeMultiplayer/IMultiplayerClient.cs     | 15 +++++++++++++++
 .../RealtimeMultiplayer/IMultiplayerServer.cs     |  5 +++++
 2 files changed, 20 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index e772ef39f9..1e59b62a9d 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -46,5 +46,20 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <param name="userId">The ID of the user performing a state change.</param>
         /// <param name="state">The new state of the user.</param>
         Task UserStateChanged(long userId, MultiplayerUserState state);
+
+        /// <summary>
+        /// Signals that a match is to be started. Users in the <see cref="MultiplayerUserState.Ready"/> state should begin loading gameplay at this point.
+        /// </summary>
+        Task LoadRequested();
+
+        /// <summary>
+        /// Signals that a match has started. All loaded users' clients should now start gameplay as soon as possible.
+        /// </summary>
+        Task MatchStarted();
+
+        /// <summary>
+        /// Signals that the match has ended, all players have finished and results are ready to be displayed.
+        /// </summary>
+        Task ResultsReady();
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index ad4aa5d2c2..eb9eddbdf5 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -37,5 +37,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <param name="newState">The proposed new state.</param>
         /// <exception cref="InvalidStateChange">If the state change requested is not valid, given the previous state or room state.</exception>
         Task ChangeState(MultiplayerUserState newState);
+
+        /// <summary>
+        /// As the host of a room, start the match.
+        /// </summary>
+        Task StartMatch();
     }
 }

From df908f90b2fe4ed8eab7804dbd32c0191d16c4ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 19:06:08 +0900
Subject: [PATCH 06756/10326] Add exception to be thrown when an operation is
 requested requiring host when not host

---
 .../RealtimeMultiplayer/IMultiplayerServer.cs     |  2 ++
 .../RealtimeMultiplayer/NotHostException.cs       | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/NotHostException.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index eb9eddbdf5..565c07d0ec 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Transfer the host of the currently joined room to another user in the room.
         /// </summary>
         /// <param name="userId">The new user which is to become host.</param>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
         Task TransferHost(long userId);
 
         /// <summary>
@@ -41,6 +42,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// As the host of a room, start the match.
         /// </summary>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to start the game.</exception>
         Task StartMatch();
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs b/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
new file mode 100644
index 0000000000..e421c6ae28
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/NotHostException.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 System;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class NotHostException : Exception
+    {
+        public NotHostException()
+            : base("User is attempting to perform a host level operation while not the host")
+        {
+        }
+    }
+}

From 021a11609326c10de152d53963c04bebc2a77e21 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 19:06:27 +0900
Subject: [PATCH 06757/10326] Add extra xmldoc covering the fact that
 MatchStarted is received by all users

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index 1e59b62a9d..c89d99dd1c 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         Task LoadRequested();
 
         /// <summary>
-        /// Signals that a match has started. All loaded users' clients should now start gameplay as soon as possible.
+        /// Signals that a match has started. All user in the <see cref="MultiplayerUserState.Loaded"/> state should begin gameplay as soon as possible.
         /// </summary>
         Task MatchStarted();
 

From d76fabedf90c4c45eda7e0ead815170f3b3012e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 19:44:22 +0900
Subject: [PATCH 06758/10326] Add note about LoadRequested only being sent to a
 subset of room users

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs   | 2 +-
 osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index c89d99dd1c..e75b0da207 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         Task UserStateChanged(long userId, MultiplayerUserState state);
 
         /// <summary>
-        /// Signals that a match is to be started. Users in the <see cref="MultiplayerUserState.Ready"/> state should begin loading gameplay at this point.
+        /// Signals that a match is to be started. This will *only* be sent to clients which are to begin loading at this point.
         /// </summary>
         Task LoadRequested();
 
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
index ed799f5252..ed9acd146e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
@@ -13,6 +13,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// The user has marked themselves as ready to participate and should be considered for the next game start.
         /// </summary>
+        /// <remarks>
+        /// Clients in this state will receive gameplay channel messages.
+        /// As a client the only thing to look for in this state is a <see cref="IMultiplayerClient.LoadRequested"/> call.
+        /// </remarks>
         Ready,
 
         /// <summary>

From aa68ae4ff27713f25ad42545baa905d83e29de4f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 20:10:23 +0900
Subject: [PATCH 06759/10326] Change locking mechanism for multiplayer rooms to
 use using-disposal pattern

Was required to lock over `await` calls server-side.
---
 .../RealtimeMultiplayer/LockUntilDisposal.cs  | 24 +++++++++++++++++++
 .../RealtimeMultiplayer/MultiplayerRoom.cs    |  9 ++-----
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs b/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs
new file mode 100644
index 0000000000..cd16fce2ee
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.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 System;
+using System.Threading;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public readonly struct LockUntilDisposal : IDisposable
+    {
+        private readonly object lockTarget;
+
+        public LockUntilDisposal(object lockTarget)
+        {
+            this.lockTarget = lockTarget;
+            Monitor.Enter(lockTarget);
+        }
+
+        public void Dispose()
+        {
+            Monitor.Exit(lockTarget);
+        }
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 3fbc01a2f5..0f18ab6c89 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using JetBrains.Annotations;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
@@ -48,12 +47,8 @@ namespace osu.Game.Online.RealtimeMultiplayer
         }
 
         /// <summary>
-        /// Perform an update on this room in a thread-safe manner.
+        /// Request a lock on this room to perform a thread-safe update.
         /// </summary>
-        /// <param name="action">The action to perform.</param>
-        public void PerformUpdate([InstantHandle] Action<MultiplayerRoom> action)
-        {
-            lock (writeLock) action(this);
-        }
+        public LockUntilDisposal LockForUpdate() => new LockUntilDisposal(writeLock);
     }
 }

From ed50fd445e81589df6375b284fbb003617bd129a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 21:07:12 +0900
Subject: [PATCH 06760/10326] Fix hit lighting colour not applied in
 TestSceneCatcher

---
 .../TestSceneCatcher.cs                       | 59 +++++++++++++------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index cf6011d721..94cd0ec8a7 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -18,6 +18,7 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -65,13 +66,11 @@ namespace osu.Game.Rulesets.Catch.Tests
             JudgementResult result2 = null;
             AddStep("catch hyper fruit", () =>
             {
-                drawableObject1 = createDrawableObject(new Fruit { HyperDashTarget = new Fruit { X = 100 } });
-                result1 = attemptCatch(drawableObject1);
+                attemptCatch(new Fruit { HyperDashTarget = new Fruit { X = 100 } }, out drawableObject1, out result1);
             });
             AddStep("catch normal fruit", () =>
             {
-                drawableObject2 = createDrawableObject(new Fruit());
-                result2 = attemptCatch(drawableObject2);
+                attemptCatch(new Fruit(), out drawableObject2, out result2);
             });
             AddStep("revert second result", () =>
             {
@@ -92,8 +91,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             JudgementResult result = null;
             AddStep("catch kiai fruit", () =>
             {
-                drawableObject = createDrawableObject(new TestKiaiFruit());
-                result = attemptCatch(drawableObject);
+                attemptCatch(new TestKiaiFruit(), out drawableObject, out result);
             });
             checkState(CatcherAnimationState.Kiai);
             AddStep("revert result", () =>
@@ -200,13 +198,22 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddAssert("fruits are dropped", () => !catcher.CaughtObjects.Any() && droppedObjectContainer.Count == 10);
         }
 
-        [TestCase(true)]
-        [TestCase(false)]
-        public void TestHitLighting(bool enabled)
+        [Test]
+        public void TestHitLightingColour()
         {
-            AddStep($"{(enabled ? "enable" : "disable")} hit lighting", () => config.Set(OsuSetting.HitLighting, enabled));
+            var fruitColour = SkinConfiguration.DefaultComboColours[1];
+            AddStep("enable hit lighting", () => config.Set(OsuSetting.HitLighting, true));
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
-            AddAssert("check hit lighting", () => catcher.ChildrenOfType<HitExplosion>().Any() == enabled);
+            AddAssert("correct hit lighting colour", () =>
+                catcher.ChildrenOfType<HitExplosion>().First()?.ObjectColour == fruitColour);
+        }
+
+        [Test]
+        public void TestHitLightingDisabled()
+        {
+            AddStep("disable hit lighting", () => config.Set(OsuSetting.HitLighting, false));
+            AddStep("catch fruit", () => attemptCatch(new Fruit()));
+            AddAssert("no hit lighting", () => !catcher.ChildrenOfType<HitExplosion>().Any());
         }
 
         private void checkPlate(int count) => AddAssert($"{count} objects on the plate", () => catcher.CaughtObjects.Count() == count);
@@ -218,18 +225,34 @@ namespace osu.Game.Rulesets.Catch.Tests
         private void attemptCatch(CatchHitObject hitObject, int count = 1)
         {
             for (var i = 0; i < count; i++)
-                attemptCatch(createDrawableObject(hitObject));
+                attemptCatch(hitObject, out _, out _);
         }
 
-        private JudgementResult attemptCatch(DrawableCatchHitObject drawableObject)
+        private void attemptCatch(CatchHitObject hitObject, out DrawableCatchHitObject drawableObject, out JudgementResult result)
         {
-            drawableObject.HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-            var result = new CatchJudgementResult(drawableObject.HitObject, drawableObject.HitObject.CreateJudgement())
+            hitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            drawableObject = createDrawableObject(hitObject);
+            result = createResult(hitObject);
+            applyResult(drawableObject, result);
+        }
+
+        private void applyResult(DrawableCatchHitObject drawableObject, JudgementResult result)
+        {
+            // Load DHO to set colour of hit explosion correctly
+            Add(drawableObject);
+            drawableObject.OnLoadComplete += _ =>
             {
-                Type = catcher.CanCatch(drawableObject.HitObject) ? HitResult.Great : HitResult.Miss
+                catcher.OnNewResult(drawableObject, result);
+                drawableObject.Expire();
+            };
+        }
+
+        private JudgementResult createResult(CatchHitObject hitObject)
+        {
+            return new CatchJudgementResult(hitObject, hitObject.CreateJudgement())
+            {
+                Type = catcher.CanCatch(hitObject) ? HitResult.Great : HitResult.Miss
             };
-            catcher.OnNewResult(drawableObject, result);
-            return result;
         }
 
         private DrawableCatchHitObject createDrawableObject(CatchHitObject hitObject)

From c301223d8cf12897e6d0327b11c505b59798be3d Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 20:34:08 +0900
Subject: [PATCH 06761/10326] Make object on the catcher plate separate
 CaughtObject class

---
 .../TestSceneCatcher.cs                       |  2 +-
 .../Objects/Drawables/CaughtObject.cs         | 83 +++++++++++++++++++
 .../Drawables/DrawableCatchHitObject.cs       |  4 -
 .../Objects/Drawables/DrawableDroplet.cs      |  2 -
 .../DrawablePalpableCatchHitObject.cs         |  7 +-
 .../Skinning/Default/CatchHitObjectPiece.cs   | 16 +++-
 .../Skinning/Default/FruitPiece.cs            |  4 +
 .../Skinning/Legacy/LegacyFruitPiece.cs       |  4 +
 .../Skinning/LegacyCatchHitObjectPiece.cs     |  7 ++
 osu.Game.Rulesets.Catch/UI/Catcher.cs         | 76 ++++++-----------
 10 files changed, 141 insertions(+), 64 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 94cd0ec8a7..2747524503 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -275,7 +275,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         public class TestCatcher : Catcher
         {
-            public IEnumerable<DrawablePalpableCatchHitObject> CaughtObjects => this.ChildrenOfType<DrawablePalpableCatchHitObject>();
+            public IEnumerable<CaughtObject> CaughtObjects => this.ChildrenOfType<CaughtObject>();
 
             public TestCatcher(Container trailsTarget, Container droppedObjectTarget, BeatmapDifficulty difficulty)
                 : base(trailsTarget, droppedObjectTarget, difficulty)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
new file mode 100644
index 0000000000..0f3a143553
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.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 System;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Catch.Skinning.Default;
+using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    [Cached(typeof(CaughtObject))]
+    public abstract class CaughtObject : SkinnableDrawable
+    {
+        public readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
+
+        public CatchHitObject HitObject { get; private set; }
+
+        /// <summary>
+        /// Whether this hit object should stay on the catcher plate when the object is caught by the catcher.
+        /// </summary>
+        public virtual bool StaysOnPlate => true;
+
+        public override bool RemoveWhenNotAlive => true;
+
+        protected CaughtObject(CatchSkinComponents skinComponent, Func<ISkinComponent, Drawable> defaultImplementation)
+            : base(new CatchSkinComponent(skinComponent), defaultImplementation)
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.Centre;
+
+            RelativeSizeAxes = Axes.None;
+            Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
+        }
+
+        public virtual void CopyFrom(DrawablePalpableCatchHitObject drawableObject)
+        {
+            HitObject = drawableObject.HitObject;
+            Scale = drawableObject.Scale / 2;
+            Rotation = drawableObject.Rotation;
+            AccentColour.Value = drawableObject.AccentColour.Value;
+        }
+    }
+
+    public class CaughtFruit : CaughtObject
+    {
+        public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
+
+        public CaughtFruit()
+            : base(CatchSkinComponents.Fruit, _ => new FruitPiece())
+        {
+        }
+
+        public override void CopyFrom(DrawablePalpableCatchHitObject drawableObject)
+        {
+            base.CopyFrom(drawableObject);
+
+            var drawableFruit = (DrawableFruit)drawableObject;
+            VisualRepresentation.Value = drawableFruit.VisualRepresentation.Value;
+        }
+    }
+
+    public class CaughtBanana : CaughtObject
+    {
+        public CaughtBanana()
+            : base(CatchSkinComponents.Banana, _ => new BananaPiece())
+        {
+        }
+    }
+
+    public class CaughtDroplet : CaughtObject
+    {
+        public override bool StaysOnPlate => false;
+
+        public CaughtDroplet()
+            : base(CatchSkinComponents.Droplet, _ => new DropletPiece())
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 70efe9cf29..bfd124c691 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -50,10 +50,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         public Func<CatchHitObject, bool> CheckPosition;
 
-        public bool IsOnPlate;
-
-        public override bool RemoveWhenNotAlive => IsOnPlate;
-
         protected override JudgementResult CreateResult(Judgement judgement) => new CatchJudgementResult(HitObject, judgement);
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index d96b1c8902..c5f0bb8b18 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -11,8 +11,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableDroplet : DrawablePalpableCatchHitObject
     {
-        public override bool StaysOnPlate => false;
-
         public DrawableDroplet()
             : this(null)
         {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index b99710ae8e..34d9cf820e 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -24,11 +24,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         /// </summary>
         protected virtual float ScaleFactor => 1;
 
-        /// <summary>
-        /// Whether this hit object should stay on the catcher plate when the object is caught by the catcher.
-        /// </summary>
-        public virtual bool StaysOnPlate => true;
-
         public float DisplayRadius => CatchHitObject.OBJECT_RADIUS * HitObject.Scale * ScaleFactor;
 
         protected DrawablePalpableCatchHitObject([CanBeNull] CatchHitObject h)
@@ -43,7 +38,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             XBindable.BindValueChanged(x =>
             {
-                if (!IsOnPlate) X = x.NewValue;
+                X = x.NewValue;
             }, true);
 
             ScaleBindable.BindValueChanged(scale =>
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
index d59b6cc0de..cb326b77e2 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
@@ -21,6 +21,10 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         [CanBeNull]
         protected DrawableHitObject DrawableHitObject { get; private set; }
 
+        [Resolved(canBeNull: true)]
+        [CanBeNull]
+        protected CaughtObject CaughtObject { get; private set; }
+
         /// <summary>
         /// A part of this piece that will be faded out while falling in the playfield.
         /// </summary>
@@ -45,6 +49,9 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
                 HyperDash.BindTo(hitObject.HyperDash);
             }
 
+            if (CaughtObject != null)
+                AccentColour.BindTo(CaughtObject.AccentColour);
+
             HyperDash.BindValueChanged(hyper =>
             {
                 if (HyperBorderPiece != null)
@@ -54,8 +61,13 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 
         protected override void Update()
         {
-            if (BorderPiece != null && DrawableHitObject?.HitObject != null)
-                BorderPiece.Alpha = (float)Math.Clamp((DrawableHitObject.HitObject.StartTime - Time.Current) / 500, 0, 1);
+            if (BorderPiece != null)
+            {
+                if (DrawableHitObject?.HitObject != null)
+                    BorderPiece.Alpha = (float)Math.Clamp((DrawableHitObject.HitObject.StartTime - Time.Current) / 500, 0, 1);
+                else
+                    BorderPiece.Alpha = 0;
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
index 2e3803a31a..8c705cec4f 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
@@ -43,6 +43,10 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 
             if (fruit != null)
                 VisualRepresentation.BindTo(fruit.VisualRepresentation);
+
+            var caughtFruit = (CaughtFruit)CaughtObject;
+            if (caughtFruit != null)
+                VisualRepresentation.BindTo(caughtFruit.VisualRepresentation);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index 6f93e68594..5140c62d3e 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -19,6 +19,10 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
             if (fruit != null)
                 VisualRepresentation.BindTo(fruit.VisualRepresentation);
 
+            var caughtFruit = (CaughtFruit)CaughtObject;
+            if (caughtFruit != null)
+                VisualRepresentation.BindTo(caughtFruit.VisualRepresentation);
+
             VisualRepresentation.BindValueChanged(visual => setTexture(visual.NewValue), true);
         }
 
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
index 1e68439402..9527f15ff1 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
@@ -33,6 +33,10 @@ namespace osu.Game.Rulesets.Catch.Skinning
         [CanBeNull]
         protected DrawableHitObject DrawableHitObject { get; private set; }
 
+        [Resolved(canBeNull: true)]
+        [CanBeNull]
+        protected CaughtObject CaughtObject { get; private set; }
+
         protected LegacyCatchHitObjectPiece()
         {
             RelativeSizeAxes = Axes.Both;
@@ -73,6 +77,9 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 HyperDash.BindTo(hitObject.HyperDash);
             }
 
+            if (CaughtObject != null)
+                AccentColour.BindTo(CaughtObject.AccentColour);
+
             hyperSprite.Colour = Skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??
                                  Skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
                                  Catcher.DEFAULT_HYPER_DASH_COLOUR;
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index ac0f25e21b..756582e3f2 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private readonly Container droppedObjectTarget;
 
-        private readonly Container<DrawablePalpableCatchHitObject> caughtFruitContainer;
+        private readonly Container<CaughtObject> caughtFruitContainer;
 
         public CatcherAnimationState CurrentState { get; private set; }
 
@@ -124,7 +124,7 @@ namespace osu.Game.Rulesets.Catch.UI
             InternalChildren = new Drawable[]
             {
                 hitExplosionPool = new DrawablePool<HitExplosion>(10),
-                caughtFruitContainer = new Container<DrawablePalpableCatchHitObject>
+                caughtFruitContainer = new Container<CaughtObject>
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.BottomCentre,
@@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplayRadius);
 
-                placeCaughtObject(hitObject, positionInStack);
+                placeCaughtObject(palpableObject, positionInStack);
 
                 if (hitLighting.Value)
                     addLighting(hitObject, positionInStack.X, drawableObject.AccentColour.Value);
@@ -450,21 +450,14 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
-        private void placeCaughtObject(PalpableCatchHitObject source, Vector2 position)
+        private void placeCaughtObject(DrawablePalpableCatchHitObject drawableObject, Vector2 position)
         {
-            var caughtObject = createCaughtObject(source);
+            var caughtObject = createCaughtObject(drawableObject.HitObject);
 
             if (caughtObject == null) return;
 
-            caughtObject.RelativePositionAxes = Axes.None;
+            caughtObject.CopyFrom(drawableObject);
             caughtObject.Position = position;
-            caughtObject.IsOnPlate = true;
-
-            caughtObject.Anchor = Anchor.TopCentre;
-            caughtObject.Origin = Anchor.Centre;
-            caughtObject.Scale *= 0.5f;
-            caughtObject.LifetimeStart = source.StartTime;
-            caughtObject.LifetimeEnd = double.MaxValue;
 
             caughtFruitContainer.Add(caughtObject);
 
@@ -500,21 +493,18 @@ namespace osu.Game.Rulesets.Catch.UI
             hitExplosionContainer.Add(hitExplosion);
         }
 
-        private DrawablePalpableCatchHitObject createCaughtObject(PalpableCatchHitObject source)
+        private CaughtObject createCaughtObject(PalpableCatchHitObject source)
         {
             switch (source)
             {
-                case Banana banana:
-                    return new DrawableBanana(banana);
+                case Fruit _:
+                    return new CaughtFruit();
 
-                case Fruit fruit:
-                    return new DrawableFruit(fruit);
+                case Banana _:
+                    return new CaughtBanana();
 
-                case TinyDroplet tiny:
-                    return new DrawableTinyDroplet(tiny);
-
-                case Droplet droplet:
-                    return new DrawableDroplet(droplet);
+                case Droplet _:
+                    return new CaughtDroplet();
 
                 default:
                     return null;
@@ -532,7 +522,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 drop(caughtObject, animation);
         }
 
-        private void removeFromPlate(DrawablePalpableCatchHitObject caughtObject, DroppedObjectAnimation animation)
+        private void removeFromPlate(CaughtObject caughtObject, DroppedObjectAnimation animation)
         {
             if (!caughtFruitContainer.Remove(caughtObject))
                 throw new InvalidOperationException("Can only drop a caught object on the plate");
@@ -542,40 +532,28 @@ namespace osu.Game.Rulesets.Catch.UI
             drop(caughtObject, animation);
         }
 
-        private void drop(DrawablePalpableCatchHitObject d, DroppedObjectAnimation animation)
+        private void drop(CaughtObject d, DroppedObjectAnimation animation)
         {
             var originalX = d.X * Scale.X;
-            var startTime = Clock.CurrentTime;
 
             d.Anchor = Anchor.TopLeft;
             d.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(d.DrawPosition, droppedObjectTarget);
 
-            // we cannot just apply the transforms because DHO clears transforms when state is updated
-            d.ApplyCustomUpdateState += (o, state) => animate(o, animation, originalX, startTime);
-            if (d.IsLoaded)
-                animate(d, animation, originalX, startTime);
-        }
-
-        private void animate(Drawable d, DroppedObjectAnimation animation, float originalX, double startTime)
-        {
-            using (d.BeginAbsoluteSequence(startTime))
+            switch (animation)
             {
-                switch (animation)
-                {
-                    case DroppedObjectAnimation.Drop:
-                        d.MoveToY(d.Y + 75, 750, Easing.InSine);
-                        d.FadeOut(750);
-                        break;
+                case DroppedObjectAnimation.Drop:
+                    d.MoveToY(d.Y + 75, 750, Easing.InSine);
+                    d.FadeOut(750);
+                    break;
 
-                    case DroppedObjectAnimation.Explode:
-                        d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine);
-                        d.MoveToX(d.X + originalX * 6, 1000);
-                        d.FadeOut(750);
-                        break;
-                }
-
-                d.Expire();
+                case DroppedObjectAnimation.Explode:
+                    d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine);
+                    d.MoveToX(d.X + originalX * 6, 1000);
+                    d.FadeOut(750);
+                    break;
             }
+
+            d.Expire();
         }
 
         private enum DroppedObjectAnimation

From 02f5fda330306b6ae9b3a67dad6f50b2373562c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 21:15:10 +0900
Subject: [PATCH 06762/10326] Add missing final newline in file

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
index 1b264d1ac5..ca4a54f6d7 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
@@ -9,4 +9,4 @@ namespace osu.Game.Online.RealtimeMultiplayer
         {
         }
     }
-}
\ No newline at end of file
+}

From a32dac00ddf388f2359dd97ebd23fc7faa68d687 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 21:29:03 +0900
Subject: [PATCH 06763/10326] Introduce IHasCatchObjectState implemented by DHO
 and CaughtObject

---
 .../Objects/Drawables/CaughtObject.cs         | 31 ++++++++++---------
 .../Objects/Drawables/DrawableBanana.cs       |  2 +-
 .../Objects/Drawables/DrawableDroplet.cs      |  2 +-
 .../Objects/Drawables/DrawableFruit.cs        |  4 +--
 ...s => DrawablePalpableHasCatchHitObject.cs} | 14 ++++++---
 .../Objects/Drawables/IHasCatchObjectState.cs | 24 ++++++++++++++
 .../Skinning/Default/CatchHitObjectPiece.cs   | 31 ++++---------------
 .../Skinning/Default/FruitPiece.cs            | 10 ++----
 .../Skinning/Legacy/LegacyFruitPiece.cs       | 10 ++----
 .../Skinning/LegacyCatchHitObjectPiece.cs     | 23 +++-----------
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |  5 +--
 11 files changed, 70 insertions(+), 86 deletions(-)
 rename osu.Game.Rulesets.Catch/Objects/Drawables/{DrawablePalpableCatchHitObject.cs => DrawablePalpableHasCatchHitObject.cs} (78%)
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
index 0f3a143553..d3555ea771 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
@@ -12,12 +12,12 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    [Cached(typeof(CaughtObject))]
-    public abstract class CaughtObject : SkinnableDrawable
+    [Cached(typeof(IHasCatchObjectState))]
+    public abstract class CaughtObject : SkinnableDrawable, IHasCatchObjectState
     {
-        public readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
-
         public CatchHitObject HitObject { get; private set; }
+        public Bindable<Color4> AccentColour { get; } = new Bindable<Color4>();
+        public Bindable<bool> HyperDash { get; } = new Bindable<bool>();
 
         /// <summary>
         /// Whether this hit object should stay on the catcher plate when the object is caught by the catcher.
@@ -36,30 +36,31 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
         }
 
-        public virtual void CopyFrom(DrawablePalpableCatchHitObject drawableObject)
+        public virtual void CopyFrom(IHasCatchObjectState objectState)
         {
-            HitObject = drawableObject.HitObject;
-            Scale = drawableObject.Scale / 2;
-            Rotation = drawableObject.Rotation;
-            AccentColour.Value = drawableObject.AccentColour.Value;
+            HitObject = objectState.HitObject;
+            Scale = objectState.Scale;
+            Rotation = objectState.Rotation;
+            AccentColour.Value = objectState.AccentColour.Value;
+            HyperDash.Value = objectState.HyperDash.Value;
         }
     }
 
-    public class CaughtFruit : CaughtObject
+    public class CaughtFruit : CaughtObject, IHasFruitState
     {
-        public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
+        public Bindable<FruitVisualRepresentation> VisualRepresentation { get; } = new Bindable<FruitVisualRepresentation>();
 
         public CaughtFruit()
             : base(CatchSkinComponents.Fruit, _ => new FruitPiece())
         {
         }
 
-        public override void CopyFrom(DrawablePalpableCatchHitObject drawableObject)
+        public override void CopyFrom(IHasCatchObjectState objectState)
         {
-            base.CopyFrom(drawableObject);
+            base.CopyFrom(objectState);
 
-            var drawableFruit = (DrawableFruit)drawableObject;
-            VisualRepresentation.Value = drawableFruit.VisualRepresentation.Value;
+            var fruitState = (IHasFruitState)objectState;
+            VisualRepresentation.Value = fruitState.VisualRepresentation.Value;
         }
     }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index 4bc5da2396..34d89eb188 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableBanana : DrawablePalpableCatchHitObject
+    public class DrawableBanana : DrawablePalpableHasCatchHitObject
     {
         public DrawableBanana()
             : this(null)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index c5f0bb8b18..acdb3bb38c 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableDroplet : DrawablePalpableCatchHitObject
+    public class DrawableDroplet : DrawablePalpableHasCatchHitObject
     {
         public DrawableDroplet()
             : this(null)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index 8135a31b43..6ec46f6535 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -10,9 +10,9 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableFruit : DrawablePalpableCatchHitObject
+    public class DrawableFruit : DrawablePalpableHasCatchHitObject, IHasFruitState
     {
-        public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
+        public Bindable<FruitVisualRepresentation> VisualRepresentation { get; } = new Bindable<FruitVisualRepresentation>();
 
         public DrawableFruit()
             : this(null)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableHasCatchHitObject.cs
similarity index 78%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableHasCatchHitObject.cs
index 34d9cf820e..ee893f7880 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableHasCatchHitObject.cs
@@ -6,18 +6,22 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public abstract class DrawablePalpableCatchHitObject : DrawableCatchHitObject
+    [Cached(typeof(IHasCatchObjectState))]
+    public abstract class DrawablePalpableHasCatchHitObject : DrawableCatchHitObject, IHasCatchObjectState
     {
         public new PalpableCatchHitObject HitObject => (PalpableCatchHitObject)base.HitObject;
 
-        public readonly Bindable<bool> HyperDash = new Bindable<bool>();
+        Bindable<Color4> IHasCatchObjectState.AccentColour => AccentColour;
 
-        public readonly Bindable<float> ScaleBindable = new Bindable<float>(1);
+        public Bindable<bool> HyperDash { get; } = new Bindable<bool>();
 
-        public readonly Bindable<int> IndexInBeatmap = new Bindable<int>();
+        public Bindable<float> ScaleBindable { get; } = new Bindable<float>(1);
+
+        public Bindable<int> IndexInBeatmap { get; } = new Bindable<int>();
 
         /// <summary>
         /// The multiplicative factor applied to <see cref="Drawable.Scale"/> relative to <see cref="HitObject"/> scale.
@@ -26,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         public float DisplayRadius => CatchHitObject.OBJECT_RADIUS * HitObject.Scale * ScaleFactor;
 
-        protected DrawablePalpableCatchHitObject([CanBeNull] CatchHitObject h)
+        protected DrawablePalpableHasCatchHitObject([CanBeNull] CatchHitObject h)
             : base(h)
         {
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
new file mode 100644
index 0000000000..01d833b61a
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.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.Bindables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    public interface IHasCatchObjectState
+    {
+        CatchHitObject HitObject { get; }
+        Bindable<Color4> AccentColour { get; }
+        Bindable<bool> HyperDash { get; }
+
+        float Rotation { get; }
+        Vector2 Scale { get; }
+    }
+
+    public interface IHasFruitState : IHasCatchObjectState
+    {
+        Bindable<FruitVisualRepresentation> VisualRepresentation { get; }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
index cb326b77e2..b105fb4034 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Drawables;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Default
@@ -17,13 +16,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         public readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
         public readonly Bindable<bool> HyperDash = new Bindable<bool>();
 
-        [Resolved(canBeNull: true)]
-        [CanBeNull]
-        protected DrawableHitObject DrawableHitObject { get; private set; }
-
-        [Resolved(canBeNull: true)]
-        [CanBeNull]
-        protected CaughtObject CaughtObject { get; private set; }
+        [Resolved]
+        protected IHasCatchObjectState ObjectState { get; private set; }
 
         /// <summary>
         /// A part of this piece that will be faded out while falling in the playfield.
@@ -41,16 +35,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         {
             base.LoadComplete();
 
-            var hitObject = (DrawablePalpableCatchHitObject)DrawableHitObject;
-
-            if (hitObject != null)
-            {
-                AccentColour.BindTo(hitObject.AccentColour);
-                HyperDash.BindTo(hitObject.HyperDash);
-            }
-
-            if (CaughtObject != null)
-                AccentColour.BindTo(CaughtObject.AccentColour);
+            AccentColour.BindTo(ObjectState.AccentColour);
+            HyperDash.BindTo(ObjectState.HyperDash);
 
             HyperDash.BindValueChanged(hyper =>
             {
@@ -61,13 +47,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 
         protected override void Update()
         {
-            if (BorderPiece != null)
-            {
-                if (DrawableHitObject?.HitObject != null)
-                    BorderPiece.Alpha = (float)Math.Clamp((DrawableHitObject.HitObject.StartTime - Time.Current) / 500, 0, 1);
-                else
-                    BorderPiece.Alpha = 0;
-            }
+            if (BorderPiece != null && ObjectState?.HitObject != null)
+                BorderPiece.Alpha = (float)Math.Clamp((ObjectState.HitObject.StartTime - Time.Current) / 500, 0, 1);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
index 8c705cec4f..49f128c960 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
@@ -39,14 +39,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         {
             base.LoadComplete();
 
-            var fruit = (DrawableFruit)DrawableHitObject;
-
-            if (fruit != null)
-                VisualRepresentation.BindTo(fruit.VisualRepresentation);
-
-            var caughtFruit = (CaughtFruit)CaughtObject;
-            if (caughtFruit != null)
-                VisualRepresentation.BindTo(caughtFruit.VisualRepresentation);
+            var fruitState = (IHasFruitState)ObjectState;
+            VisualRepresentation.BindTo(fruitState.VisualRepresentation);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index 5140c62d3e..969cc38e5b 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -14,14 +14,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            var fruit = (DrawableFruit)DrawableHitObject;
-
-            if (fruit != null)
-                VisualRepresentation.BindTo(fruit.VisualRepresentation);
-
-            var caughtFruit = (CaughtFruit)CaughtObject;
-            if (caughtFruit != null)
-                VisualRepresentation.BindTo(caughtFruit.VisualRepresentation);
+            var fruitState = (IHasFruitState)ObjectState;
+            VisualRepresentation.BindTo(fruitState.VisualRepresentation);
 
             VisualRepresentation.BindValueChanged(visual => setTexture(visual.NewValue), true);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
index 9527f15ff1..4b1f5a4724 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -10,7 +9,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -29,13 +27,8 @@ namespace osu.Game.Rulesets.Catch.Skinning
         [Resolved]
         protected ISkinSource Skin { get; private set; }
 
-        [Resolved(canBeNull: true)]
-        [CanBeNull]
-        protected DrawableHitObject DrawableHitObject { get; private set; }
-
-        [Resolved(canBeNull: true)]
-        [CanBeNull]
-        protected CaughtObject CaughtObject { get; private set; }
+        [Resolved]
+        protected IHasCatchObjectState ObjectState { get; private set; }
 
         protected LegacyCatchHitObjectPiece()
         {
@@ -69,16 +62,8 @@ namespace osu.Game.Rulesets.Catch.Skinning
         {
             base.LoadComplete();
 
-            var hitObject = (DrawablePalpableCatchHitObject)DrawableHitObject;
-
-            if (hitObject != null)
-            {
-                AccentColour.BindTo(hitObject.AccentColour);
-                HyperDash.BindTo(hitObject.HyperDash);
-            }
-
-            if (CaughtObject != null)
-                AccentColour.BindTo(CaughtObject.AccentColour);
+            AccentColour.BindTo(ObjectState.AccentColour);
+            HyperDash.BindTo(ObjectState.HyperDash);
 
             hyperSprite.Colour = Skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??
                                  Skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 756582e3f2..4d540bce03 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Rulesets.Catch.UI
             catchResult.CatcherAnimationState = CurrentState;
             catchResult.CatcherHyperDash = HyperDashing;
 
-            if (!(drawableObject is DrawablePalpableCatchHitObject palpableObject)) return;
+            if (!(drawableObject is DrawablePalpableHasCatchHitObject palpableObject)) return;
 
             var hitObject = palpableObject.HitObject;
 
@@ -450,7 +450,7 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
-        private void placeCaughtObject(DrawablePalpableCatchHitObject drawableObject, Vector2 position)
+        private void placeCaughtObject(DrawablePalpableHasCatchHitObject drawableObject, Vector2 position)
         {
             var caughtObject = createCaughtObject(drawableObject.HitObject);
 
@@ -458,6 +458,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             caughtObject.CopyFrom(drawableObject);
             caughtObject.Position = position;
+            caughtObject.Scale /= 2;
 
             caughtFruitContainer.Add(caughtObject);
 

From 168ba625006f86ca7fd758adcec2e24af1169f40 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 8 Dec 2020 22:09:48 +0900
Subject: [PATCH 06764/10326] Port StanR's dynamic SO pp changes

---
 osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs  | 1 +
 osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs  | 2 ++
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
index fff033357d..e8ac60bc5e 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
@@ -12,5 +12,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         public double ApproachRate;
         public double OverallDifficulty;
         public int HitCircleCount;
+        public int SpinnerCount;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 6027635b75..6a7d76151c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -48,6 +48,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             maxCombo += beatmap.HitObjects.OfType<Slider>().Sum(s => s.NestedHitObjects.Count - 1);
 
             int hitCirclesCount = beatmap.HitObjects.Count(h => h is HitCircle);
+            int spinnerCount = beatmap.HitObjects.Count(h => h is Spinner);
 
             return new OsuDifficultyAttributes
             {
@@ -59,6 +60,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 OverallDifficulty = (80 - hitWindowGreat) / 6,
                 MaxCombo = maxCombo,
                 HitCircleCount = hitCirclesCount,
+                SpinnerCount = spinnerCount,
                 Skills = skills
             };
         }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 0ebe0ddc2d..030b0cf6d1 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 multiplier *= 0.90;
 
             if (mods.Any(m => m is OsuModSpunOut))
-                multiplier *= 0.95;
+                multiplier *= 1.0 - Math.Pow((double)Attributes.SpinnerCount / totalHits, 0.85);
 
             double aimValue = computeAimValue();
             double speedValue = computeSpeedValue();

From 749d5380ca5a1c5bd118307e4f9459cd7df00130 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 22:38:10 +0900
Subject: [PATCH 06765/10326] Pool caught objects and dropped objects

---
 .../TestSceneCatcherArea.cs                   |  5 +-
 .../Objects/Drawables/CaughtObject.cs         | 14 ++++-
 .../Objects/Drawables/IHasCatchObjectState.cs |  2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs         | 52 +++++++++++++------
 4 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 8602c7aad1..3d5e44476e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -73,7 +73,10 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             SetContents(() =>
             {
-                var droppedObjectContainer = new Container();
+                var droppedObjectContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both
+                };
 
                 return new CatchInputManager(catchRuleset)
                 {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
index d3555ea771..f36d287126 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
     [Cached(typeof(IHasCatchObjectState))]
     public abstract class CaughtObject : SkinnableDrawable, IHasCatchObjectState
     {
-        public CatchHitObject HitObject { get; private set; }
+        public PalpableCatchHitObject HitObject { get; private set; }
         public Bindable<Color4> AccentColour { get; } = new Bindable<Color4>();
         public Bindable<bool> HyperDash { get; } = new Bindable<bool>();
 
@@ -29,7 +29,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         protected CaughtObject(CatchSkinComponents skinComponent, Func<ISkinComponent, Drawable> defaultImplementation)
             : base(new CatchSkinComponent(skinComponent), defaultImplementation)
         {
-            Anchor = Anchor.TopCentre;
             Origin = Anchor.Centre;
 
             RelativeSizeAxes = Axes.None;
@@ -44,6 +43,17 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             AccentColour.Value = objectState.AccentColour.Value;
             HyperDash.Value = objectState.HyperDash.Value;
         }
+
+        protected override void FreeAfterUse()
+        {
+            ClearTransforms();
+
+            Alpha = 1;
+            LifetimeStart = double.MinValue;
+            LifetimeEnd = double.MaxValue;
+
+            base.FreeAfterUse();
+        }
     }
 
     public class CaughtFruit : CaughtObject, IHasFruitState
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
index 01d833b61a..a282bc5da0 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public interface IHasCatchObjectState
     {
-        CatchHitObject HitObject { get; }
+        PalpableCatchHitObject HitObject { get; }
         Bindable<Color4> AccentColour { get; }
         Bindable<bool> HyperDash { get; }
 
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 4d540bce03..7aecd95efd 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -108,6 +108,10 @@ namespace osu.Game.Rulesets.Catch.UI
         private readonly DrawablePool<HitExplosion> hitExplosionPool;
         private readonly Container<HitExplosion> hitExplosionContainer;
 
+        private readonly DrawablePool<CaughtFruit> caughtFruitPool;
+        private readonly DrawablePool<CaughtBanana> caughtBananaPool;
+        private readonly DrawablePool<CaughtDroplet> caughtDropletPool;
+
         public Catcher([NotNull] Container trailsTarget, [NotNull] Container droppedObjectTarget, BeatmapDifficulty difficulty = null)
         {
             this.trailsTarget = trailsTarget;
@@ -124,6 +128,10 @@ namespace osu.Game.Rulesets.Catch.UI
             InternalChildren = new Drawable[]
             {
                 hitExplosionPool = new DrawablePool<HitExplosion>(10),
+                caughtFruitPool = new DrawablePool<CaughtFruit>(50),
+                caughtBananaPool = new DrawablePool<CaughtBanana>(100),
+                // less capacity is needed compared to fruit because droplet is not stacked
+                caughtDropletPool = new DrawablePool<CaughtDroplet>(25),
                 caughtFruitContainer = new Container<CaughtObject>
                 {
                     Anchor = Anchor.TopCentre,
@@ -452,11 +460,12 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void placeCaughtObject(DrawablePalpableHasCatchHitObject drawableObject, Vector2 position)
         {
-            var caughtObject = createCaughtObject(drawableObject.HitObject);
+            var caughtObject = getCaughtObject(drawableObject.HitObject);
 
             if (caughtObject == null) return;
 
             caughtObject.CopyFrom(drawableObject);
+            caughtObject.Anchor = Anchor.TopCentre;
             caughtObject.Position = position;
             caughtObject.Scale /= 2;
 
@@ -494,52 +503,62 @@ namespace osu.Game.Rulesets.Catch.UI
             hitExplosionContainer.Add(hitExplosion);
         }
 
-        private CaughtObject createCaughtObject(PalpableCatchHitObject source)
+        private CaughtObject getCaughtObject(PalpableCatchHitObject source)
         {
             switch (source)
             {
                 case Fruit _:
-                    return new CaughtFruit();
+                    return caughtFruitPool.Get();
 
                 case Banana _:
-                    return new CaughtBanana();
+                    return caughtBananaPool.Get();
 
                 case Droplet _:
-                    return new CaughtDroplet();
+                    return caughtDropletPool.Get();
 
                 default:
                     return null;
             }
         }
 
+        private CaughtObject getDroppedObject(CaughtObject caughtObject)
+        {
+            var droppedObject = getCaughtObject(caughtObject.HitObject);
+
+            droppedObject.CopyFrom(caughtObject);
+            droppedObject.Anchor = Anchor.TopLeft;
+            droppedObject.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(caughtObject.DrawPosition, droppedObjectTarget);
+
+            return droppedObject;
+        }
+
         private void clearPlate(DroppedObjectAnimation animation)
         {
             var caughtObjects = caughtFruitContainer.Children.ToArray();
+            var droppedObjects = caughtObjects.Select(getDroppedObject).ToArray();
+
             caughtFruitContainer.Clear(false);
 
-            droppedObjectTarget.AddRange(caughtObjects);
+            droppedObjectTarget.AddRange(droppedObjects);
 
-            foreach (var caughtObject in caughtObjects)
-                drop(caughtObject, animation);
+            foreach (var droppedObject in droppedObjects)
+                applyDropAnimation(droppedObject, animation);
         }
 
         private void removeFromPlate(CaughtObject caughtObject, DroppedObjectAnimation animation)
         {
+            var droppedObject = getDroppedObject(caughtObject);
+
             if (!caughtFruitContainer.Remove(caughtObject))
                 throw new InvalidOperationException("Can only drop a caught object on the plate");
 
-            droppedObjectTarget.Add(caughtObject);
+            droppedObjectTarget.Add(droppedObject);
 
-            drop(caughtObject, animation);
+            applyDropAnimation(droppedObject, animation);
         }
 
-        private void drop(CaughtObject d, DroppedObjectAnimation animation)
+        private void applyDropAnimation(Drawable d, DroppedObjectAnimation animation)
         {
-            var originalX = d.X * Scale.X;
-
-            d.Anchor = Anchor.TopLeft;
-            d.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(d.DrawPosition, droppedObjectTarget);
-
             switch (animation)
             {
                 case DroppedObjectAnimation.Drop:
@@ -548,6 +567,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     break;
 
                 case DroppedObjectAnimation.Explode:
+                    var originalX = droppedObjectTarget.ToSpaceOfOtherDrawable(d.DrawPosition, caughtFruitContainer).X * Scale.X;
                     d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine);
                     d.MoveToX(d.X + originalX * 6, 1000);
                     d.FadeOut(750);

From 1f36bbecd180049026e62f592201434c3cf2c283 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 23:07:30 +0900
Subject: [PATCH 06766/10326] Fix dropped objects not removed on revert result

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 7aecd95efd..d2930af1ca 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -274,7 +274,7 @@ namespace osu.Game.Rulesets.Catch.UI
             }
 
             caughtFruitContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
-            droppedObjectTarget.RemoveAll(d => (d as DrawableCatchHitObject)?.HitObject == drawableObject.HitObject);
+            droppedObjectTarget.RemoveAll(d => (d as CaughtObject)?.HitObject == drawableObject.HitObject);
             hitExplosionContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
         }
 

From 5ca98b00334946cf1f0e0a876cd268374f3a7267 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 23:11:22 +0900
Subject: [PATCH 06767/10326] Add doc comments a bit

---
 osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs   | 3 +++
 .../Objects/Drawables/IHasCatchObjectState.cs               | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
index f36d287126..01bf943e1a 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
@@ -12,6 +12,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
+    /// <summary>
+    /// Represents a <see cref="PalpableCatchHitObject"/> caught by the catcher.
+    /// </summary>
     [Cached(typeof(IHasCatchObjectState))]
     public abstract class CaughtObject : SkinnableDrawable, IHasCatchObjectState
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
index a282bc5da0..0a75fb2224 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
@@ -7,6 +7,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
+    /// <summary>
+    /// Provides a visual state of a <see cref="PalpableCatchHitObject"/>.
+    /// </summary>
     public interface IHasCatchObjectState
     {
         PalpableCatchHitObject HitObject { get; }
@@ -17,6 +20,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         Vector2 Scale { get; }
     }
 
+    /// <summary>
+    /// Provides a visual state of a <see cref="Fruit"/>.
+    /// </summary>
     public interface IHasFruitState : IHasCatchObjectState
     {
         Bindable<FruitVisualRepresentation> VisualRepresentation { get; }

From 1212ffd24f7c6aae776b796fdab47dec3673d2e8 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 23:35:24 +0900
Subject: [PATCH 06768/10326] Rename to CopyStateFrom, and add comment

---
 .../Objects/Drawables/CaughtObject.cs                    | 9 ++++++---
 osu.Game.Rulesets.Catch/UI/Catcher.cs                    | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
index 01bf943e1a..87319a4498 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
@@ -38,7 +38,10 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
         }
 
-        public virtual void CopyFrom(IHasCatchObjectState objectState)
+        /// <summary>
+        /// Copies the hit object visual state from another <see cref="IHasCatchObjectState"/> object.
+        /// </summary>
+        public virtual void CopyStateFrom(IHasCatchObjectState objectState)
         {
             HitObject = objectState.HitObject;
             Scale = objectState.Scale;
@@ -68,9 +71,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
         }
 
-        public override void CopyFrom(IHasCatchObjectState objectState)
+        public override void CopyStateFrom(IHasCatchObjectState objectState)
         {
-            base.CopyFrom(objectState);
+            base.CopyStateFrom(objectState);
 
             var fruitState = (IHasFruitState)objectState;
             VisualRepresentation.Value = fruitState.VisualRepresentation.Value;
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index d2930af1ca..c9580ca5f8 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -464,7 +464,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (caughtObject == null) return;
 
-            caughtObject.CopyFrom(drawableObject);
+            caughtObject.CopyStateFrom(drawableObject);
             caughtObject.Anchor = Anchor.TopCentre;
             caughtObject.Position = position;
             caughtObject.Scale /= 2;
@@ -525,7 +525,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             var droppedObject = getCaughtObject(caughtObject.HitObject);
 
-            droppedObject.CopyFrom(caughtObject);
+            droppedObject.CopyStateFrom(caughtObject);
             droppedObject.Anchor = Anchor.TopLeft;
             droppedObject.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(caughtObject.DrawPosition, droppedObjectTarget);
 

From d8838ddbfbda709e1b92e10e6914d8f492a23623 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 8 Dec 2020 18:48:50 +0100
Subject: [PATCH 06769/10326] Remove duplicated overload.

---
 osu.Game/Database/ArchiveModelManager.cs | 43 +-----------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 3ec3b96579..6766ca2b77 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -218,48 +218,7 @@ namespace osu.Game.Database
             }
 
             return import;
-        }
-
-        /// <summary>
-        /// Import one <typeparamref name="TModel"/> from a <see cref="Stream"/>.
-        /// </summary>
-        /// <param name="stream">The stream to import files from.</param>
-        /// <param name="filename">The filename of the archive being imported.</param>
-        public async Task Import(Stream stream, string filename)
-        {
-            var notification = new ProgressNotification
-            {
-                Progress = 0,
-                State = ProgressNotificationState.Active,
-                Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import is initialising...",
-            };
-
-            PostNotification.Invoke(notification);
-
-            try
-            {
-                // we need to keep around the filename as some model managers (namely SkinManager) use the archive name to populate skin info
-                var imported = await Import(new ZipArchiveReader(stream, filename), notification.CancellationToken);
-
-                notification.CompletionText = $"Imported {imported}! Click to view.";
-                notification.CompletionClickAction += () =>
-                {
-                    PresentImport?.Invoke(new[] { imported });
-                    return true;
-                };
-                notification.State = ProgressNotificationState.Completed;
-            }
-            catch (TaskCanceledException)
-            {
-                throw;
-            }
-            catch (Exception e)
-            {
-                notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import failed!";
-                notification.State = ProgressNotificationState.Cancelled;
-                Logger.Error(e, $@"Could not import ({filename})", LoggingTarget.Database);
-            }
-        }
+        }        
 
         /// <summary>
         /// Fired when the user requests to view the resulting import.

From aa7d22460d2b7e77bae25f7edd030fbef3cb71ba Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 8 Dec 2020 19:46:55 +0100
Subject: [PATCH 06770/10326] Override Import() instead.

---
 osu.Android/OsuGameActivity.cs           |  3 ++-
 osu.Android/OsuGameAndroid.cs            | 11 +++++------
 osu.Game/Database/ArchiveModelManager.cs |  2 +-
 osu.Game/OsuGameBase.cs                  |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 541455277d..eb9df24bf7 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.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.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
@@ -57,7 +58,7 @@ namespace osu.Android
 
             var stream = ContentResolver.OpenInputStream(uri);
             if (stream != null)
-                game.ScheduleImport(stream, cursor.GetString(filename_column));
+                Task.Factory.StartNew(() => game.Import(stream, cursor.GetString(filename_column)), TaskCreationOptions.LongRunning);
         }
     }
 }
diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 81945ee083..c9b27a16d6 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -67,12 +67,11 @@ namespace osu.Android
             }
         }
 
-        /// <summary>
-        /// Schedules a file to be imported once the game is loaded.
-        /// </summary>
-        /// <param name="stream">A stream to the file to import.</param>
-        /// <param name="filename">The filename of the file to import.</param>
-        public void ScheduleImport(Stream stream, string filename) => WaitForReady(() => this, _ => Task.Run(() => Import(stream, filename)));
+        public override Task Import(Stream stream, string filename)
+        {
+            WaitForReady(() => this, _ => Task.Run(() => base.Import(stream, filename)));
+            return Task.CompletedTask;
+        }
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 6766ca2b77..36cc4cce39 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Database
             }
 
             return import;
-        }        
+        }
 
         /// <summary>
         /// Fired when the user requests to view the resulting import.
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 0fc2b8d1d7..150569f1dd 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -395,7 +395,7 @@ namespace osu.Game
             }
         }
 
-        public async Task Import(Stream stream, string filename)
+        public virtual async Task Import(Stream stream, string filename)
         {
             var extension = Path.GetExtension(filename)?.ToLowerInvariant();
 

From 748035e80a4550305cc2b294c2ced3d254829c6e Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Tue, 8 Dec 2020 16:53:52 -0600
Subject: [PATCH 06771/10326] changes to acc scaling curve for speed and aim pp

---
 .../Difficulty/OsuPerformanceCalculator.cs       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 0ebe0ddc2d..f239289d7f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -121,10 +121,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                 : 0.0);
             }
 
-            // Scale the aim value with accuracy _slightly_
-            aimValue *= 0.5 + accuracy / 2.0;
-            // It is important to also consider accuracy difficulty when doing that
-            aimValue *= 0.98 + Math.Pow(Attributes.OverallDifficulty, 2) / 2500;
+            // Scale the speed value with accuracy _alot_
+            if (accuracy > .8)
+              aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
+            else
+              aimValue *= accuracy * (.5 / .8);
 
             return aimValue;
         }
@@ -154,8 +155,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (mods.Any(m => m is OsuModHidden))
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
-            // Scale the speed value with accuracy _slightly_
-            speedValue *= 0.02 + accuracy;
+            // Scale the speed value with accuracy _alot_
+            if (accuracy > .8)
+              speedValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
+            else
+              speedValue *= accuracy * (.5 / .8);
             // It is important to also consider accuracy difficulty when doing that
             speedValue *= 0.96 + Math.Pow(Attributes.OverallDifficulty, 2) / 1600;
 

From b80204642e52a31163805731db903d1327419a49 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 10:25:35 +0900
Subject: [PATCH 06772/10326] Revert rename error

---
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs   | 2 +-
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs  | 2 +-
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs    | 2 +-
 ...HasCatchHitObject.cs => DrawablePalpableCatchHitObject.cs} | 4 ++--
 osu.Game.Rulesets.Catch/UI/Catcher.cs                         | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game.Rulesets.Catch/Objects/Drawables/{DrawablePalpableHasCatchHitObject.cs => DrawablePalpableCatchHitObject.cs} (92%)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index 34d89eb188..4bc5da2396 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableBanana : DrawablePalpableHasCatchHitObject
+    public class DrawableBanana : DrawablePalpableCatchHitObject
     {
         public DrawableBanana()
             : this(null)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index acdb3bb38c..c5f0bb8b18 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableDroplet : DrawablePalpableHasCatchHitObject
+    public class DrawableDroplet : DrawablePalpableCatchHitObject
     {
         public DrawableDroplet()
             : this(null)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index 6ec46f6535..57f27d01b8 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -10,7 +10,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
-    public class DrawableFruit : DrawablePalpableHasCatchHitObject, IHasFruitState
+    public class DrawableFruit : DrawablePalpableCatchHitObject, IHasFruitState
     {
         public Bindable<FruitVisualRepresentation> VisualRepresentation { get; } = new Bindable<FruitVisualRepresentation>();
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableHasCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
similarity index 92%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableHasCatchHitObject.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index ee893f7880..aea9d2c082 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableHasCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -11,7 +11,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     [Cached(typeof(IHasCatchObjectState))]
-    public abstract class DrawablePalpableHasCatchHitObject : DrawableCatchHitObject, IHasCatchObjectState
+    public abstract class DrawablePalpableCatchHitObject : DrawableCatchHitObject, IHasCatchObjectState
     {
         public new PalpableCatchHitObject HitObject => (PalpableCatchHitObject)base.HitObject;
 
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         public float DisplayRadius => CatchHitObject.OBJECT_RADIUS * HitObject.Scale * ScaleFactor;
 
-        protected DrawablePalpableHasCatchHitObject([CanBeNull] CatchHitObject h)
+        protected DrawablePalpableCatchHitObject([CanBeNull] CatchHitObject h)
             : base(h)
         {
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index c9580ca5f8..30a5832c4f 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.Catch.UI
             catchResult.CatcherAnimationState = CurrentState;
             catchResult.CatcherHyperDash = HyperDashing;
 
-            if (!(drawableObject is DrawablePalpableHasCatchHitObject palpableObject)) return;
+            if (!(drawableObject is DrawablePalpableCatchHitObject palpableObject)) return;
 
             var hitObject = palpableObject.HitObject;
 
@@ -458,7 +458,7 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
-        private void placeCaughtObject(DrawablePalpableHasCatchHitObject drawableObject, Vector2 position)
+        private void placeCaughtObject(DrawablePalpableCatchHitObject drawableObject, Vector2 position)
         {
             var caughtObject = getCaughtObject(drawableObject.HitObject);
 

From df9de7a8ddee1986df712deb138c7d4238f41bed Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 10:28:42 +0900
Subject: [PATCH 06773/10326] Remove null check that is not required anymore

---
 osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
index b105fb4034..51c06c8e37 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 
         protected override void Update()
         {
-            if (BorderPiece != null && ObjectState?.HitObject != null)
+            if (BorderPiece != null)
                 BorderPiece.Alpha = (float)Math.Clamp((ObjectState.HitObject.StartTime - Time.Current) / 500, 0, 1);
         }
     }

From ccca7e0b25a97f52d9ef6d754d2f39fe6132a65b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 10:35:01 +0900
Subject: [PATCH 06774/10326] more specific type droppedObjectContainer

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs  |  6 +++---
 .../TestSceneCatcherArea.cs                        |  4 ++--
 .../TestSceneHyperDashColouring.cs                 |  2 +-
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs       |  2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs              | 14 ++++++++++----
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs          |  2 +-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 2747524503..e8bb57cdf3 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Resolved]
         private OsuConfigManager config { get; set; }
 
-        private Container droppedObjectContainer;
+        private Container<CaughtObject> droppedObjectContainer;
 
         private TestCatcher catcher;
 
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             };
 
             var trailContainer = new Container();
-            droppedObjectContainer = new Container();
+            droppedObjectContainer = new Container<CaughtObject>();
             catcher = new TestCatcher(trailContainer, droppedObjectContainer, difficulty);
 
             Child = new Container
@@ -277,7 +277,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             public IEnumerable<CaughtObject> CaughtObjects => this.ChildrenOfType<CaughtObject>();
 
-            public TestCatcher(Container trailsTarget, Container droppedObjectTarget, BeatmapDifficulty difficulty)
+            public TestCatcher(Container trailsTarget, Container<CaughtObject> droppedObjectTarget, BeatmapDifficulty difficulty)
                 : base(trailsTarget, droppedObjectTarget, difficulty)
             {
             }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 3d5e44476e..31c285ef22 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             SetContents(() =>
             {
-                var droppedObjectContainer = new Container
+                var droppedObjectContainer = new Container<CaughtObject>
                 {
                     RelativeSizeAxes = Axes.Both
                 };
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private class TestCatcherArea : CatcherArea
         {
-            public TestCatcherArea(Container droppedObjectContainer, BeatmapDifficulty beatmapDifficulty)
+            public TestCatcherArea(Container<CaughtObject> droppedObjectContainer, BeatmapDifficulty beatmapDifficulty)
                 : base(droppedObjectContainer, beatmapDifficulty)
             {
             }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index d78dc2d2b5..683a776dcc 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             AddStep("create hyper-dashing catcher", () =>
             {
-                Child = setupSkinHierarchy(catcherArea = new CatcherArea(new Container())
+                Child = setupSkinHierarchy(catcherArea = new CatcherArea(new Container<CaughtObject>())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index fdc12bf088..73420a9eda 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatchPlayfield(BeatmapDifficulty difficulty, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation)
         {
-            var droppedObjectContainer = new Container
+            var droppedObjectContainer = new Container<CaughtObject>
             {
                 RelativeSizeAxes = Axes.Both,
             };
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 30a5832c4f..2893fcee92 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -53,10 +53,16 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private CatcherTrailDisplay trails;
 
-        private readonly Container droppedObjectTarget;
-
+        /// <summary>
+        /// Contains caught objects on the plate.
+        /// </summary>
         private readonly Container<CaughtObject> caughtFruitContainer;
 
+        /// <summary>
+        /// Contains objects dropped from the plate.
+        /// </summary>
+        private readonly Container<CaughtObject> droppedObjectTarget;
+
         public CatcherAnimationState CurrentState { get; private set; }
 
         /// <summary>
@@ -112,7 +118,7 @@ namespace osu.Game.Rulesets.Catch.UI
         private readonly DrawablePool<CaughtBanana> caughtBananaPool;
         private readonly DrawablePool<CaughtDroplet> caughtDropletPool;
 
-        public Catcher([NotNull] Container trailsTarget, [NotNull] Container droppedObjectTarget, BeatmapDifficulty difficulty = null)
+        public Catcher([NotNull] Container trailsTarget, [NotNull] Container<CaughtObject> droppedObjectTarget, BeatmapDifficulty difficulty = null)
         {
             this.trailsTarget = trailsTarget;
             this.droppedObjectTarget = droppedObjectTarget;
@@ -274,7 +280,7 @@ namespace osu.Game.Rulesets.Catch.UI
             }
 
             caughtFruitContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
-            droppedObjectTarget.RemoveAll(d => (d as CaughtObject)?.HitObject == drawableObject.HitObject);
+            droppedObjectTarget.RemoveAll(d => d.HitObject == drawableObject.HitObject);
             hitExplosionContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
         }
 
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 857d9141c9..44adbd5512 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Catch.UI
         public readonly Catcher MovableCatcher;
         private readonly CatchComboDisplay comboDisplay;
 
-        public CatcherArea(Container droppedObjectContainer, BeatmapDifficulty difficulty = null)
+        public CatcherArea(Container<CaughtObject> droppedObjectContainer, BeatmapDifficulty difficulty = null)
         {
             Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
             Children = new Drawable[]

From c8b0934573c029e7568d63927533dcbddcde9099 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 10:35:36 +0900
Subject: [PATCH 06775/10326] Rename caughtFruitContainer ->
 caughtObjectContainer

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 2893fcee92..475fca7f1c 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// Contains caught objects on the plate.
         /// </summary>
-        private readonly Container<CaughtObject> caughtFruitContainer;
+        private readonly Container<CaughtObject> caughtObjectContainer;
 
         /// <summary>
         /// Contains objects dropped from the plate.
@@ -138,7 +138,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 caughtBananaPool = new DrawablePool<CaughtBanana>(100),
                 // less capacity is needed compared to fruit because droplet is not stacked
                 caughtDropletPool = new DrawablePool<CaughtDroplet>(25),
-                caughtFruitContainer = new Container<CaughtObject>
+                caughtObjectContainer = new Container<CaughtObject>
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.BottomCentre,
@@ -186,7 +186,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// Creates proxied content to be displayed beneath hitobjects.
         /// </summary>
-        public Drawable CreateProxiedContent() => caughtFruitContainer.CreateProxy();
+        public Drawable CreateProxiedContent() => caughtObjectContainer.CreateProxy();
 
         /// <summary>
         /// Calculates the scale of the catcher based off the provided beatmap difficulty.
@@ -279,7 +279,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     SetHyperDashState();
             }
 
-            caughtFruitContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
+            caughtObjectContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
             droppedObjectTarget.RemoveAll(d => d.HitObject == drawableObject.HitObject);
             hitExplosionContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
         }
@@ -475,7 +475,7 @@ namespace osu.Game.Rulesets.Catch.UI
             caughtObject.Position = position;
             caughtObject.Scale /= 2;
 
-            caughtFruitContainer.Add(caughtObject);
+            caughtObjectContainer.Add(caughtObject);
 
             if (!caughtObject.StaysOnPlate)
                 removeFromPlate(caughtObject, DroppedObjectAnimation.Explode);
@@ -486,7 +486,7 @@ namespace osu.Game.Rulesets.Catch.UI
             const float radius_div_2 = CatchHitObject.OBJECT_RADIUS / 2;
             const float allowance = 10;
 
-            while (caughtFruitContainer.Any(f => Vector2Extensions.Distance(f.Position, position) < (displayRadius + radius_div_2) / (allowance / 2)))
+            while (caughtObjectContainer.Any(f => Vector2Extensions.Distance(f.Position, position) < (displayRadius + radius_div_2) / (allowance / 2)))
             {
                 float diff = (displayRadius + radius_div_2) / allowance;
 
@@ -533,17 +533,17 @@ namespace osu.Game.Rulesets.Catch.UI
 
             droppedObject.CopyStateFrom(caughtObject);
             droppedObject.Anchor = Anchor.TopLeft;
-            droppedObject.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(caughtObject.DrawPosition, droppedObjectTarget);
+            droppedObject.Position = caughtObjectContainer.ToSpaceOfOtherDrawable(caughtObject.DrawPosition, droppedObjectTarget);
 
             return droppedObject;
         }
 
         private void clearPlate(DroppedObjectAnimation animation)
         {
-            var caughtObjects = caughtFruitContainer.Children.ToArray();
+            var caughtObjects = caughtObjectContainer.Children.ToArray();
             var droppedObjects = caughtObjects.Select(getDroppedObject).ToArray();
 
-            caughtFruitContainer.Clear(false);
+            caughtObjectContainer.Clear(false);
 
             droppedObjectTarget.AddRange(droppedObjects);
 
@@ -555,7 +555,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             var droppedObject = getDroppedObject(caughtObject);
 
-            if (!caughtFruitContainer.Remove(caughtObject))
+            if (!caughtObjectContainer.Remove(caughtObject))
                 throw new InvalidOperationException("Can only drop a caught object on the plate");
 
             droppedObjectTarget.Add(droppedObject);
@@ -573,7 +573,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     break;
 
                 case DroppedObjectAnimation.Explode:
-                    var originalX = droppedObjectTarget.ToSpaceOfOtherDrawable(d.DrawPosition, caughtFruitContainer).X * Scale.X;
+                    var originalX = droppedObjectTarget.ToSpaceOfOtherDrawable(d.DrawPosition, caughtObjectContainer).X * Scale.X;
                     d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine);
                     d.MoveToX(d.X + originalX * 6, 1000);
                     d.FadeOut(750);

From 86445e7c2304eb54193c2278ac306e938b0a525e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 10:36:54 +0900
Subject: [PATCH 06776/10326] Remove unnecessary copy

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 475fca7f1c..e885881c42 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -540,8 +540,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void clearPlate(DroppedObjectAnimation animation)
         {
-            var caughtObjects = caughtObjectContainer.Children.ToArray();
-            var droppedObjects = caughtObjects.Select(getDroppedObject).ToArray();
+            var droppedObjects = caughtObjectContainer.Children.Select(getDroppedObject).ToArray();
 
             caughtObjectContainer.Clear(false);
 

From b52e279702a879eebd333efa734aae9b3b1a2820 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 10:38:11 +0900
Subject: [PATCH 06777/10326] Reword exception message

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index e885881c42..125f735a60 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -555,7 +555,7 @@ namespace osu.Game.Rulesets.Catch.UI
             var droppedObject = getDroppedObject(caughtObject);
 
             if (!caughtObjectContainer.Remove(caughtObject))
-                throw new InvalidOperationException("Can only drop a caught object on the plate");
+                throw new InvalidOperationException("Can only drop objects that were previously caught on the plate");
 
             droppedObjectTarget.Add(droppedObject);
 

From da2f3d4473a0583b53cfc76671b48e209f21f321 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 10:40:42 +0900
Subject: [PATCH 06778/10326] Move classes to separate files

---
 .../Objects/Drawables/CaughtBanana.cs         | 18 +++++++++
 .../Objects/Drawables/CaughtDroplet.cs        | 20 ++++++++++
 .../Objects/Drawables/CaughtFruit.cs          | 29 +++++++++++++++
 .../Objects/Drawables/CaughtObject.cs         | 37 -------------------
 .../Objects/Drawables/IHasCatchObjectState.cs |  8 ----
 .../Objects/Drawables/IHasFruitState.cs       | 15 ++++++++
 6 files changed, 82 insertions(+), 45 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/CaughtBanana.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/CaughtDroplet.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/CaughtFruit.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/IHasFruitState.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtBanana.cs
new file mode 100644
index 0000000000..8a91f82437
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtBanana.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.Catch.Skinning.Default;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    /// <summary>
+    /// Represents a <see cref="Banana"/> caught by the catcher.
+    /// </summary>
+    public class CaughtBanana : CaughtObject
+    {
+        public CaughtBanana()
+            : base(CatchSkinComponents.Banana, _ => new BananaPiece())
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtDroplet.cs
new file mode 100644
index 0000000000..4a3397feff
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtDroplet.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.Rulesets.Catch.Skinning.Default;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    /// <summary>
+    /// Represents a <see cref="Droplet"/> caught by the catcher.
+    /// </summary>
+    public class CaughtDroplet : CaughtObject
+    {
+        public override bool StaysOnPlate => false;
+
+        public CaughtDroplet()
+            : base(CatchSkinComponents.Droplet, _ => new DropletPiece())
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtFruit.cs
new file mode 100644
index 0000000000..140b411c88
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtFruit.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.Bindables;
+using osu.Game.Rulesets.Catch.Skinning.Default;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    /// <summary>
+    /// Represents a <see cref="Fruit"/> caught by the catcher.
+    /// </summary>
+    public class CaughtFruit : CaughtObject, IHasFruitState
+    {
+        public Bindable<FruitVisualRepresentation> VisualRepresentation { get; } = new Bindable<FruitVisualRepresentation>();
+
+        public CaughtFruit()
+            : base(CatchSkinComponents.Fruit, _ => new FruitPiece())
+        {
+        }
+
+        public override void CopyStateFrom(IHasCatchObjectState objectState)
+        {
+            base.CopyStateFrom(objectState);
+
+            var fruitState = (IHasFruitState)objectState;
+            VisualRepresentation.Value = fruitState.VisualRepresentation.Value;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
index 87319a4498..e597d1a4cd 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
@@ -5,7 +5,6 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Catch.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -61,40 +60,4 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             base.FreeAfterUse();
         }
     }
-
-    public class CaughtFruit : CaughtObject, IHasFruitState
-    {
-        public Bindable<FruitVisualRepresentation> VisualRepresentation { get; } = new Bindable<FruitVisualRepresentation>();
-
-        public CaughtFruit()
-            : base(CatchSkinComponents.Fruit, _ => new FruitPiece())
-        {
-        }
-
-        public override void CopyStateFrom(IHasCatchObjectState objectState)
-        {
-            base.CopyStateFrom(objectState);
-
-            var fruitState = (IHasFruitState)objectState;
-            VisualRepresentation.Value = fruitState.VisualRepresentation.Value;
-        }
-    }
-
-    public class CaughtBanana : CaughtObject
-    {
-        public CaughtBanana()
-            : base(CatchSkinComponents.Banana, _ => new BananaPiece())
-        {
-        }
-    }
-
-    public class CaughtDroplet : CaughtObject
-    {
-        public override bool StaysOnPlate => false;
-
-        public CaughtDroplet()
-            : base(CatchSkinComponents.Droplet, _ => new DropletPiece())
-        {
-        }
-    }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
index 0a75fb2224..55ca502877 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
@@ -19,12 +19,4 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         float Rotation { get; }
         Vector2 Scale { get; }
     }
-
-    /// <summary>
-    /// Provides a visual state of a <see cref="Fruit"/>.
-    /// </summary>
-    public interface IHasFruitState : IHasCatchObjectState
-    {
-        Bindable<FruitVisualRepresentation> VisualRepresentation { get; }
-    }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasFruitState.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasFruitState.cs
new file mode 100644
index 0000000000..2d4de543c3
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasFruitState.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.Bindables;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    /// <summary>
+    /// Provides a visual state of a <see cref="Fruit"/>.
+    /// </summary>
+    public interface IHasFruitState : IHasCatchObjectState
+    {
+        Bindable<FruitVisualRepresentation> VisualRepresentation { get; }
+    }
+}

From 775c4bad973c3f9afba809851b0b63add97929a1 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 10:47:04 +0900
Subject: [PATCH 06779/10326] Remove unneeded lifetime assignment

---
 osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
index e597d1a4cd..fb83b73212 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
@@ -52,10 +52,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         protected override void FreeAfterUse()
         {
             ClearTransforms();
-
             Alpha = 1;
-            LifetimeStart = double.MinValue;
-            LifetimeEnd = double.MaxValue;
 
             base.FreeAfterUse();
         }

From a8e2f35b622a5797837115eeef7f2b96fd4a9169 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 10:50:35 +0900
Subject: [PATCH 06780/10326] Remove unneeded check of caught object removal

The logic was public but now it is private
so the condition is ensured by the caller
---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 125f735a60..64dacd09e6 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -554,8 +554,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             var droppedObject = getDroppedObject(caughtObject);
 
-            if (!caughtObjectContainer.Remove(caughtObject))
-                throw new InvalidOperationException("Can only drop objects that were previously caught on the plate");
+            caughtObjectContainer.Remove(caughtObject);
 
             droppedObjectTarget.Add(droppedObject);
 

From ff5150a14d152242026cdd6be462088f2a15ad03 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:03:52 +0900
Subject: [PATCH 06781/10326] Fix typo in IMultiplayerClient xmldoc

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index e75b0da207..c162f066d4 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         Task LoadRequested();
 
         /// <summary>
-        /// Signals that a match has started. All user in the <see cref="MultiplayerUserState.Loaded"/> state should begin gameplay as soon as possible.
+        /// Signals that a match has started. All users in the <see cref="MultiplayerUserState.Loaded"/> state should begin gameplay as soon as possible.
         /// </summary>
         Task MatchStarted();
 

From 2046cbe2d987fa12b46f6acfcd40a91a5cb283f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:05:50 +0900
Subject: [PATCH 06782/10326] Add missing exceptions to server xmldoc

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 565c07d0ec..3c92f70a01 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// Request to leave the currently joined room.
         /// </summary>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task LeaveRoom();
 
         /// <summary>
@@ -24,12 +25,15 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="userId">The new user which is to become host.</param>
         /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task TransferHost(long userId);
 
         /// <summary>
         /// As the host, update the settings of the currently joined room.
         /// </summary>
         /// <param name="settings">The new settings to apply.</param>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task ChangeSettings(MultiplayerRoomSettings settings);
 
         /// <summary>
@@ -37,12 +41,14 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="newState">The proposed new state.</param>
         /// <exception cref="InvalidStateChange">If the state change requested is not valid, given the previous state or room state.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task ChangeState(MultiplayerUserState newState);
 
         /// <summary>
         /// As the host of a room, start the match.
         /// </summary>
         /// <exception cref="NotHostException">A user other than the current host is attempting to start the game.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task StartMatch();
     }
 }

From fd4fa963ac6e86265ad9db5e5335040ae1de5291 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:07:19 +0900
Subject: [PATCH 06783/10326] Standardise exception naming

---
 ...lreadyInMultiplayerRoom.cs => AlreadyInRoomException.cs} | 6 +++---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs   | 4 ++--
 ...InvalidStateChange.cs => InvalidStateChangeException.cs} | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game/Online/RealtimeMultiplayer/{UserAlreadyInMultiplayerRoom.cs => AlreadyInRoomException.cs} (60%)
 rename osu.Game/Online/RealtimeMultiplayer/{InvalidStateChange.cs => InvalidStateChangeException.cs} (65%)

diff --git a/osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
similarity index 60%
rename from osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs
rename to osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
index 9a2090c710..f99bea651c 100644
--- a/osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
@@ -5,10 +5,10 @@ using System;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
-    public class UserAlreadyInMultiplayerRoom : Exception
+    public class AlreadyInRoomException : Exception
     {
-        public UserAlreadyInMultiplayerRoom()
-            : base("This user is already in a room.")
+        public AlreadyInRoomException()
+            : base("This user is already in a multiplayer room.")
         {
         }
     }
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 3c92f70a01..1bb6331c0a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Request to join a multiplayer room.
         /// </summary>
         /// <param name="roomId">The databased room ID.</param>
-        /// <exception cref="UserAlreadyInMultiplayerRoom">If the user is already in the requested (or another) room.</exception>
+        /// <exception cref="AlreadyInRoomException">If the user is already in the requested (or another) room.</exception>
         Task<MultiplayerRoom> JoinRoom(long roomId);
 
         /// <summary>
@@ -40,7 +40,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Change the local user state in the currently joined room.
         /// </summary>
         /// <param name="newState">The proposed new state.</param>
-        /// <exception cref="InvalidStateChange">If the state change requested is not valid, given the previous state or room state.</exception>
+        /// <exception cref="InvalidStateChangeException">If the state change requested is not valid, given the previous state or room state.</exception>
         /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task ChangeState(MultiplayerUserState newState);
 
diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
similarity index 65%
rename from osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs
rename to osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
index d1016e95cb..1e33f55491 100644
--- a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
@@ -5,9 +5,9 @@ using System;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
-    public class InvalidStateChange : Exception
+    public class InvalidStateChangeException : Exception
     {
-        public InvalidStateChange(MultiplayerUserState oldState, MultiplayerUserState newState)
+        public InvalidStateChangeException(MultiplayerUserState oldState, MultiplayerUserState newState)
             : base($"Cannot change from {oldState} to {newState}")
         {
         }

From 1013749a83365c54d7585e1a4289c54113754e52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:10:47 +0900
Subject: [PATCH 06784/10326] Change user id type to int

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
index 17aca4458a..60f1c9e42e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
     [Serializable]
     public class MultiplayerRoomUser : IEquatable<MultiplayerRoomUser>
     {
-        public readonly long UserID;
+        public readonly int UserID;
 
         public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
 

From 0eb5b16454647d0f1fa7de484b2f5eb15d6d37fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:12:03 +0900
Subject: [PATCH 06785/10326] Remove Empty() implementation for RoomSettings
 until otherwise necessary

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs         | 2 +-
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 0f18ab6c89..24c20bded4 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// All currently enforced game settings for this room.
         /// </summary>
-        public MultiplayerRoomSettings Settings { get; set; } = MultiplayerRoomSettings.Empty();
+        public MultiplayerRoomSettings Settings { get; set; } = new MultiplayerRoomSettings();
 
         /// <summary>
         /// All users currently in this room.
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index 3137afa8a4..8f0f4febd1 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
@@ -24,7 +24,5 @@ namespace osu.Game.Online.RealtimeMultiplayer
         public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID;
 
         public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
-
-        public static MultiplayerRoomSettings Empty() => new MultiplayerRoomSettings();
     }
 }

From 427d41bab5a08b998f6b8c3349e402f0c4315890 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:17:37 +0900
Subject: [PATCH 06786/10326] Add missing licence headers

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs     | 3 +++
 osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 1bb6331c0a..836260a26d 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.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.
+
 using System.Threading.Tasks;
 
 namespace osu.Game.Online.RealtimeMultiplayer
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
index ca4a54f6d7..d71200a086 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.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.
+
 using System;
 
 namespace osu.Game.Online.RealtimeMultiplayer

From 48129c52d676d8e33d63852031e530fe4cef6b32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:38:24 +0900
Subject: [PATCH 06787/10326] Change get-only property for now

---
 .../Online/RealtimeMultiplayer/MultiplayerClientState.cs     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
index 8c440abba3..27fa0e9ac9 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
@@ -1,13 +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;
+
 #nullable enable
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
+    [Serializable]
     public class MultiplayerClientState
     {
-        public long CurrentRoomID { get; set; }
+        public readonly long CurrentRoomID;
 
         public MultiplayerClientState(in long roomId)
         {

From c92c2cbfc01716b553369e376b9754d9f70c5262 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 14:46:43 +0900
Subject: [PATCH 06788/10326] Change exceptions which should be returned to the
 user to HubException type

See
https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.signalr.hubexception?view=aspnetcore-5.0.
---
 .../RealtimeMultiplayer/AlreadyInRoomException.cs      | 10 +++++++++-
 .../RealtimeMultiplayer/InvalidStateChangeException.cs | 10 +++++++++-
 .../Online/RealtimeMultiplayer/NotHostException.cs     | 10 +++++++++-
 .../RealtimeMultiplayer/NotJoinedRoomException.cs      | 10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
index f99bea651c..7f3c2b339a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
@@ -2,14 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Runtime.Serialization;
+using Microsoft.AspNetCore.SignalR;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
-    public class AlreadyInRoomException : Exception
+    [Serializable]
+    public class AlreadyInRoomException : HubException
     {
         public AlreadyInRoomException()
             : base("This user is already in a multiplayer room.")
         {
         }
+
+        protected AlreadyInRoomException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
index 1e33f55491..d9a276fc19 100644
--- a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
@@ -2,14 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Runtime.Serialization;
+using Microsoft.AspNetCore.SignalR;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
-    public class InvalidStateChangeException : Exception
+    [Serializable]
+    public class InvalidStateChangeException : HubException
     {
         public InvalidStateChangeException(MultiplayerUserState oldState, MultiplayerUserState newState)
             : base($"Cannot change from {oldState} to {newState}")
         {
         }
+
+        protected InvalidStateChangeException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs b/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
index e421c6ae28..56095043f0 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
@@ -2,14 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Runtime.Serialization;
+using Microsoft.AspNetCore.SignalR;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
-    public class NotHostException : Exception
+    [Serializable]
+    public class NotHostException : HubException
     {
         public NotHostException()
             : base("User is attempting to perform a host level operation while not the host")
         {
         }
+
+        protected NotHostException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
index d71200a086..7a6e089d0b 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
@@ -2,14 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Runtime.Serialization;
+using Microsoft.AspNetCore.SignalR;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
-    public class NotJoinedRoomException : Exception
+    [Serializable]
+    public class NotJoinedRoomException : HubException
     {
         public NotJoinedRoomException()
             : base("This user has not yet joined a multiplayer room.")
         {
         }
+
+        protected NotJoinedRoomException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }

From e09715d71efe23bdedf5a6b7718e6bdbe4ef2258 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 14:47:26 +0900
Subject: [PATCH 06789/10326] Add ToString implementation to MultiplayerRoom
 for easier debug

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 24c20bded4..1ba8d0c487 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -50,5 +50,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Request a lock on this room to perform a thread-safe update.
         /// </summary>
         public LockUntilDisposal LockForUpdate() => new LockUntilDisposal(writeLock);
+
+        public override string ToString() => $"RoomID:{RoomID} Host:{Host?.UserID} Users:{Users.Count} State:{State} Settings: [{Settings}]";
     }
 }

From bef52af1da4da012d37eb78dc2ac62fa138a371e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 15:05:32 +0900
Subject: [PATCH 06790/10326] Move client state class to server implementation

Never used by client.
---
 .../MultiplayerClientState.cs                 | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
deleted file mode 100644
index 27fa0e9ac9..0000000000
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
+++ /dev/null
@@ -1,20 +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;
-
-#nullable enable
-
-namespace osu.Game.Online.RealtimeMultiplayer
-{
-    [Serializable]
-    public class MultiplayerClientState
-    {
-        public readonly long CurrentRoomID;
-
-        public MultiplayerClientState(in long roomId)
-        {
-            CurrentRoomID = roomId;
-        }
-    }
-}

From ab00a15555a31394e23b9dd6277fc02aa25f9239 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 15:05:57 +0900
Subject: [PATCH 06791/10326] Add JsonConstructor specs to allow for correct
 deserialization of readonly fields

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs     | 2 ++
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 1ba8d0c487..5704ddd675 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
@@ -41,6 +42,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         private object writeLock = new object();
 
+        [JsonConstructor]
         public MultiplayerRoom(in long roomId)
         {
             RoomID = roomId;
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
index 60f1c9e42e..caf1a70197 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using Newtonsoft.Json;
 using osu.Game.Users;
 
 namespace osu.Game.Online.RealtimeMultiplayer
@@ -17,6 +18,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public User? User { get; set; }
 
+        [JsonConstructor]
         public MultiplayerRoomUser(in int userId)
         {
             UserID = userId;

From 578e5cb92e66a62bd81b08d2cb0c944cedca5030 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 15:59:13 +0900
Subject: [PATCH 06792/10326] Also make InvalidStateException serializable

---
 .../RealtimeMultiplayer/InvalidStateException.cs       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs b/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
index 8393e7e925..7791bfc69f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
@@ -2,14 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Runtime.Serialization;
+using Microsoft.AspNetCore.SignalR;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
-    public class InvalidStateException : Exception
+    [Serializable]
+    public class InvalidStateException : HubException
     {
         public InvalidStateException(string message)
             : base(message)
         {
         }
+
+        protected InvalidStateException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }

From 1e08b298b865cac8f05e13c4941a23a7b0131fa6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 16:01:09 +0900
Subject: [PATCH 06793/10326] Remove unnecessary exception type

---
 .../AlreadyInRoomException.cs                 | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
deleted file mode 100644
index 7f3c2b339a..0000000000
--- a/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
+++ /dev/null
@@ -1,23 +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.Runtime.Serialization;
-using Microsoft.AspNetCore.SignalR;
-
-namespace osu.Game.Online.RealtimeMultiplayer
-{
-    [Serializable]
-    public class AlreadyInRoomException : HubException
-    {
-        public AlreadyInRoomException()
-            : base("This user is already in a multiplayer room.")
-        {
-        }
-
-        protected AlreadyInRoomException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-}

From bb97eae8b1b46df5162a6502a282b0915527dd6b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 16:02:37 +0900
Subject: [PATCH 06794/10326] Update outdated exception references in xmldoc

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 836260a26d..e2e7b6b991 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Request to join a multiplayer room.
         /// </summary>
         /// <param name="roomId">The databased room ID.</param>
-        /// <exception cref="AlreadyInRoomException">If the user is already in the requested (or another) room.</exception>
+        /// <exception cref="InvalidStateException">If the user is already in the requested (or another) room.</exception>
         Task<MultiplayerRoom> JoinRoom(long roomId);
 
         /// <summary>
@@ -52,6 +52,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <exception cref="NotHostException">A user other than the current host is attempting to start the game.</exception>
         /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        /// <exception cref="InvalidStateException">If an attempt to start the game occurs when the game's (or users') state disallows it.</exception>
         Task StartMatch();
     }
 }

From c8e3c7e77bb9b00356cd6b020ac212941d1b5fa5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 17:45:07 +0900
Subject: [PATCH 06795/10326] Add stateful client interface

---
 .../IStatefulMultiplayerClient.cs               | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs
new file mode 100644
index 0000000000..578092662a
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable enable
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// A multiplayer client which maintains local room and user state. Also provides a proxy to access the <see cref="IMultiplayerServer"/>.
+    /// </summary>
+    public interface IStatefulMultiplayerClient : IMultiplayerClient, IMultiplayerServer
+    {
+        MultiplayerUserState State { get; }
+
+        MultiplayerRoom? Room { get; }
+    }
+}

From 6da854e37c3eb3b8f426904895f6ece374bea498 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 9 Dec 2020 13:32:59 +0100
Subject: [PATCH 06796/10326] Move scheduled import logic to OsuGame.

---
 osu.Android/OsuGameAndroid.cs | 6 ------
 osu.Game/OsuGame.cs           | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index c9b27a16d6..57512012f9 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -67,12 +67,6 @@ namespace osu.Android
             }
         }
 
-        public override Task Import(Stream stream, string filename)
-        {
-            WaitForReady(() => this, _ => Task.Run(() => base.Import(stream, filename)));
-            return Task.CompletedTask;
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 2c1db67d24..0ad58b2438 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -52,6 +52,7 @@ using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
 using osu.Game.Users;
+using System.IO;
 
 namespace osu.Game
 {
@@ -426,6 +427,12 @@ namespace osu.Game
             }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
+        public override Task Import(Stream stream, string filename)
+        {
+            WaitForReady(() => this, _ => Task.Run(() => base.Import(stream, filename)));
+            return Task.CompletedTask;
+        }
+
         protected virtual Loader CreateLoader() => new Loader();
 
         protected virtual UpdateManager CreateUpdateManager() => new UpdateManager();

From ac91f0e2707bf57eacacf079c4de09b1c108926d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 10 Dec 2020 00:25:46 +0900
Subject: [PATCH 06797/10326] Add extended limits to difficulty adjustment mod

---
 .../Mods/CatchModDifficultyAdjust.cs          | 12 ++-
 .../Mods/OsuModDifficultyAdjust.cs            | 12 ++-
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs | 79 ++++++++++++++++++-
 3 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index acdd0a420c..859dfb7647 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Catch.Mods
     public class CatchModDifficultyAdjust : ModDifficultyAdjust
     {
         [SettingSource("Circle Size", "Override a beatmap's set CS.", FIRST_SETTING_ORDER - 1)]
-        public BindableNumber<float> CircleSize { get; } = new BindableFloat
+        public BindableNumber<float> CircleSize { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 1,
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.Mods
         };
 
         [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1)]
-        public BindableNumber<float> ApproachRate { get; } = new BindableFloat
+        public BindableNumber<float> ApproachRate { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 1,
@@ -31,6 +31,14 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = 5,
         };
 
+        protected override void ApplyLimits(bool extended)
+        {
+            base.ApplyLimits(extended);
+
+            CircleSize.MaxValue = extended ? 11 : 10;
+            ApproachRate.MaxValue = extended ? 11 : 10;
+        }
+
         public override string SettingDescription
         {
             get
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index ff995e38ce..a6ad2e75f1 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     public class OsuModDifficultyAdjust : ModDifficultyAdjust
     {
         [SettingSource("Circle Size", "Override a beatmap's set CS.", FIRST_SETTING_ORDER - 1)]
-        public BindableNumber<float> CircleSize { get; } = new BindableFloat
+        public BindableNumber<float> CircleSize { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 0,
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         };
 
         [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1)]
-        public BindableNumber<float> ApproachRate { get; } = new BindableFloat
+        public BindableNumber<float> ApproachRate { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 0,
@@ -31,6 +31,14 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = 5,
         };
 
+        protected override void ApplyLimits(bool extended)
+        {
+            base.ApplyLimits(extended);
+
+            CircleSize.MaxValue = extended ? 11 : 10;
+            ApproachRate.MaxValue = extended ? 11 : 10;
+        }
+
         public override string SettingDescription
         {
             get
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 165644edbe..7df663ad3a 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mods
         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
+        public BindableNumber<float> DrainRate { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 0,
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mods
         };
 
         [SettingSource("Accuracy", "Override a beatmap's set OD.", LAST_SETTING_ORDER)]
-        public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
+        public BindableNumber<float> OverallDifficulty { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 0,
@@ -53,6 +53,24 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
+        [SettingSource("Extended Limits", "Adjust difficulty beyond sane limits.")]
+        public BindableBool ExtendedLimits { get; } = new BindableBool();
+
+        protected ModDifficultyAdjust()
+        {
+            ExtendedLimits.BindValueChanged(extend => ApplyLimits(extend.NewValue));
+        }
+
+        /// <summary>
+        /// Changes the difficulty adjustment limits. Occurs when the value of <see cref="ExtendedLimits"/> is changed.
+        /// </summary>
+        /// <param name="extended">Whether limits should extend beyond sane ranges.</param>
+        protected virtual void ApplyLimits(bool extended)
+        {
+            DrainRate.MaxValue = extended ? 11 : 10;
+            OverallDifficulty.MaxValue = extended ? 11 : 10;
+        }
+
         public override string SettingDescription
         {
             get
@@ -123,5 +141,62 @@ namespace osu.Game.Rulesets.Mods
             difficulty.DrainRate = DrainRate.Value;
             difficulty.OverallDifficulty = OverallDifficulty.Value;
         }
+
+        /// <summary>
+        /// A <see cref="BindableDouble"/> that extends its min/max values to support any assigned value.
+        /// </summary>
+        protected class BindableDoubleWithLimitExtension : BindableDouble
+        {
+            public override double Value
+            {
+                get => base.Value;
+                set
+                {
+                    if (value < MinValue)
+                        MinValue = value;
+                    if (value > MaxValue)
+                        MaxValue = value;
+                    base.Value = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// A <see cref="BindableFloat"/> that extends its min/max values to support any assigned value.
+        /// </summary>
+        protected class BindableFloatWithLimitExtension : BindableFloat
+        {
+            public override float Value
+            {
+                get => base.Value;
+                set
+                {
+                    if (value < MinValue)
+                        MinValue = value;
+                    if (value > MaxValue)
+                        MaxValue = value;
+                    base.Value = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// A <see cref="BindableInt"/> that extends its min/max values to support any assigned value.
+        /// </summary>
+        protected class BindableIntWithLimitExtension : BindableInt
+        {
+            public override int Value
+            {
+                get => base.Value;
+                set
+                {
+                    if (value < MinValue)
+                        MinValue = value;
+                    if (value > MaxValue)
+                        MaxValue = value;
+                    base.Value = value;
+                }
+            }
+        }
     }
 }

From 47a93d8614eff32b5fd7bb9db8b81e8d97a47f34 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 10 Dec 2020 00:26:35 +0900
Subject: [PATCH 06798/10326] Adjust osu! hitobject fade-ins to support AR>10

---
 .../Objects/Drawables/Connections/FollowPointConnection.cs   | 5 ++++-
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs                | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 6e7b1050cb..40154ca84c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -110,8 +110,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             double startTime = start.GetEndTime();
             double duration = end.StartTime - startTime;
 
+            // For now, adjust the pre-empt for approach rates > 10.
+            double preempt = PREEMPT * Math.Min(1, start.TimePreempt / 450);
+
             fadeOutTime = startTime + fraction * duration;
-            fadeInTime = fadeOutTime - PREEMPT;
+            fadeInTime = fadeOutTime - preempt;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 15af141c99..6d28a576a4 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.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.Bindables;
 using osu.Game.Beatmaps;
@@ -113,7 +114,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
             TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
-            TimeFadeIn = 400; // as per osu-stable
+            TimeFadeIn = 400 * Math.Min(1, TimePreempt / 450);
 
             Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
         }

From 9835245ea29e3dcc053feb818b65f2e959cb5d06 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 10 Dec 2020 00:32:31 +0900
Subject: [PATCH 06799/10326] Add test

---
 .../Online/TestAPIModSerialization.cs         | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Online/TestAPIModSerialization.cs b/osu.Game.Tests/Online/TestAPIModSerialization.cs
index 5948582d77..84862ebb07 100644
--- a/osu.Game.Tests/Online/TestAPIModSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModSerialization.cs
@@ -68,12 +68,29 @@ namespace osu.Game.Tests.Online
             Assert.That(converted.FinalRate.Value, Is.EqualTo(0.25));
         }
 
+        [Test]
+        public void TestDeserialiseDifficultyAdjustModWithExtendedLimits()
+        {
+            var apiMod = new APIMod(new TestModDifficultyAdjust
+            {
+                OverallDifficulty = { Value = 11 },
+                ExtendedLimits = { Value = true }
+            });
+
+            var deserialised = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
+            var converted = (TestModDifficultyAdjust)deserialised.ToMod(new TestRuleset());
+
+            Assert.That(converted.ExtendedLimits.Value, Is.True);
+            Assert.That(converted.OverallDifficulty.Value, Is.EqualTo(11));
+        }
+
         private class TestRuleset : Ruleset
         {
             public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[]
             {
                 new TestMod(),
                 new TestModTimeRamp(),
+                new TestModDifficultyAdjust()
             };
 
             public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new System.NotImplementedException();
@@ -135,5 +152,9 @@ namespace osu.Game.Tests.Online
                 Value = true
             };
         }
+
+        private class TestModDifficultyAdjust : ModDifficultyAdjust
+        {
+        }
     }
 }

From 7e3fcfe43721ef34a2619084a9007f67de79ad92 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Wed, 9 Dec 2020 10:35:48 -0600
Subject: [PATCH 06800/10326] fixed issue with comment

---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index f239289d7f..c35b739f81 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                 : 0.0);
             }
 
-            // Scale the speed value with accuracy _alot_
+            // Scale the aim value with accuracy _alot_
             if (accuracy > .8)
               aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else

From cfc34a63bd478b914ebf98f47eef25a08879c3d6 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Wed, 9 Dec 2020 11:21:03 -0600
Subject: [PATCH 06801/10326] realized i accidently deleted the OD scaling

---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index c35b739f81..306c491210 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -126,6 +126,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
               aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else
               aimValue *= accuracy * (.5 / .8);
+            // It is important to also consider accuracy difficulty when doing that
+            aimValue *= 0.975 + Math.Pow(Attributes.OverallDifficulty, 2) / 2000;
 
             return aimValue;
         }
@@ -161,7 +163,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             else
               speedValue *= accuracy * (.5 / .8);
             // It is important to also consider accuracy difficulty when doing that
-            speedValue *= 0.96 + Math.Pow(Attributes.OverallDifficulty, 2) / 1600;
+            speedValue *= 0.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 1000;
 
             return speedValue;
         }

From 146e6a61935bb71a7dec3dac37b1c4791c88a061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 9 Dec 2020 18:30:52 +0100
Subject: [PATCH 06802/10326] Fix formatting issues

---
 .../Difficulty/OsuPerformanceCalculator.cs                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 306c491210..0306ef3ca0 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -123,9 +123,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Scale the aim value with accuracy _alot_
             if (accuracy > .8)
-              aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
+                aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else
-              aimValue *= accuracy * (.5 / .8);
+                aimValue *= accuracy * (.5 / .8);
             // It is important to also consider accuracy difficulty when doing that
             aimValue *= 0.975 + Math.Pow(Attributes.OverallDifficulty, 2) / 2000;
 
@@ -159,9 +159,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Scale the speed value with accuracy _alot_
             if (accuracy > .8)
-              speedValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
+                speedValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else
-              speedValue *= accuracy * (.5 / .8);
+                speedValue *= accuracy * (.5 / .8);
             // It is important to also consider accuracy difficulty when doing that
             speedValue *= 0.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 1000;
 

From 051afe5a7a6838b40be5cea60d2d8d0af777ef43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 9 Dec 2020 18:31:51 +0100
Subject: [PATCH 06803/10326] Fix typos in comments

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 0306ef3ca0..477028b02b 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                 : 0.0);
             }
 
-            // Scale the aim value with accuracy _alot_
+            // Scale the aim value with accuracy _a lot_
             if (accuracy > .8)
                 aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (mods.Any(m => m is OsuModHidden))
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
-            // Scale the speed value with accuracy _alot_
+            // Scale the speed value with accuracy _a lot_
             if (accuracy > .8)
                 speedValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else

From 05ad9aae8d221e0caf59ce282771d6996fb50abb Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Wed, 9 Dec 2020 11:57:01 -0600
Subject: [PATCH 06804/10326] changed curve to linear OD + acc based curve

---
 .../Difficulty/OsuPerformanceCalculator.cs     | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 306c491210..87a6fbb23a 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -121,13 +121,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                 : 0.0);
             }
 
-            // Scale the aim value with accuracy _alot_
-            if (accuracy > .8)
-              aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
-            else
-              aimValue *= accuracy * (.5 / .8);
-            // It is important to also consider accuracy difficulty when doing that
-            aimValue *= 0.975 + Math.Pow(Attributes.OverallDifficulty, 2) / 2000;
+            // Scale the aim value with accuracy and OD
+            aimValue *= .975 + Math.Pow(Attributes.OverallDifficulty, 2) / 1500 + 200 * (accuracy - 1) * Math.Pow(1 / Attributes.OverallDifficulty, 2);
 
             return aimValue;
         }
@@ -157,13 +152,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (mods.Any(m => m is OsuModHidden))
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
-            // Scale the speed value with accuracy _alot_
-            if (accuracy > .8)
-              speedValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
-            else
-              speedValue *= accuracy * (.5 / .8);
-            // It is important to also consider accuracy difficulty when doing that
-            speedValue *= 0.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 1000;
+            // Scale the speed value with accuracy and OD
+            speedValue *= .95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750 + 200 * (accuracy - 1) * Math.Pow(1 / Attributes.OverallDifficulty, 2);
 
             return speedValue;
         }

From d604c51cbd50ef2b72e831d23937373df55b6a0f Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Wed, 9 Dec 2020 13:04:14 -0600
Subject: [PATCH 06805/10326] capped scaling at OD 8 to prevent overscaling

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 87a6fbb23a..fce17071e4 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             }
 
             // Scale the aim value with accuracy and OD
-            aimValue *= .975 + Math.Pow(Attributes.OverallDifficulty, 2) / 1500 + 200 * (accuracy - 1) * Math.Pow(1 / Attributes.OverallDifficulty, 2);
+            aimValue *= Math.Max(0, .975 + Math.Pow(Attributes.OverallDifficulty, 2) / 1500 + 200 * (accuracy - 1) * Math.Pow(1 / Math.Max(8, Attributes.OverallDifficulty), 2));
 
             return aimValue;
         }
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
             // Scale the speed value with accuracy and OD
-            speedValue *= .95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750 + 200 * (accuracy - 1) * Math.Pow(1 / Attributes.OverallDifficulty, 2);
+            speedValue *= Math.Max(0, .95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750 + 200 * (accuracy - 1) * Math.Pow(1 / Math.Max(8, Attributes.OverallDifficulty), 2));
 
             return speedValue;
         }

From 54abc3bd4dd121fab5986b4a6c0f35bec5e0c037 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Wed, 9 Dec 2020 20:07:52 -0600
Subject: [PATCH 06806/10326] revert aim curve and add new 50s nerf

---
 .../Difficulty/OsuPerformanceCalculator.cs           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index ddb5cb506d..2b9c817094 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -121,9 +121,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                 : 0.0);
             }
 
-            // Scale the aim value with accuracy and OD
-            aimValue *= Math.Max(0, .975 + Math.Pow(Attributes.OverallDifficulty, 2) / 1500 + 200 * (accuracy - 1) * Math.Pow(1 / Math.Max(8, Attributes.OverallDifficulty), 2));
-
+            // Scale the aim value with accuracy _slightly_
+            aimValue *= 0.5 + accuracy / 2.0;
+            // It is important to also consider accuracy difficulty when doing that
+            aimValue *= 0.98 + Math.Pow(Attributes.OverallDifficulty, 2) / 2500;
+            
             return aimValue;
         }
 
@@ -153,7 +155,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
             // Scale the speed value with accuracy and OD
-            speedValue *= Math.Max(0, .95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750 + 200 * (accuracy - 1) * Math.Pow(1 / Math.Max(8, Attributes.OverallDifficulty), 2));
+            speedValue *= (.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750) * Math.Pow(accuracy, (14.5 - Math.Max(Attributes.OverallDifficulty, 8)) / 2);
+            // Scale the speed value with # of 50s to punish doubletapping.
+            speedValue *= Math.Pow(0.98, countMeh < totalHits / 500.0 ? 0.5 * countMeh : countMeh - totalHits / 500.0 * 0.5);
 
             return speedValue;
         }

From cc996ec7fcbe360b451ec786c81f6a243703af7d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Dec 2020 16:32:14 +0900
Subject: [PATCH 06807/10326] Ensure player is consumed at the point of
 scheduled push running the first time

---
 osu.Game/Screens/Play/PlayerLoader.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 42074ac241..c26195b09c 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -274,6 +274,13 @@ namespace osu.Game.Screens.Play
             }
         }
 
+        private Player consumePlayer()
+        {
+            var consumed = player;
+            player = null;
+            return consumed;
+        }
+
         private void prepareNewPlayer()
         {
             if (!this.IsCurrentScreen())
@@ -331,6 +338,8 @@ namespace osu.Game.Screens.Play
                 scheduledPushPlayer = Scheduler.AddDelayed(() =>
                 {
                     contentOut();
+                // ensure that once we have reached this "point of no return", readyForPush will be false for all future checks (until a new player instance is prepared).
+                var consumedPlayer = consumePlayer();
 
                     TransformSequence<PlayerLoader> pushSequence = this.Delay(250);
 
@@ -362,8 +371,6 @@ namespace osu.Game.Screens.Play
                         // 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();
                     });
@@ -373,6 +380,8 @@ namespace osu.Game.Screens.Play
             {
                 Schedule(pushWhenLoaded);
             }
+                    if (consumedPlayer.LoadedBeatmapSuccessfully)
+                        this.Push(consumedPlayer);
         }
 
         private void cancelLoad()

From 491ab7405942009e17012d326aa90ae88fea46ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Dec 2020 16:33:28 +0900
Subject: [PATCH 06808/10326] Schedule pushWhenLoaded once ever

Previously it was being scheduled another time each OnResume, resulting
in more and more calls as a user retries the same beatmap multiple
times.

To simplify things I've decided to just schedule once ever. This means
that on resuming there's no 400ms delay any more, but in testing this
isn't really an issue (load time is still high enough that it will never
really be below that anyway). Even if gameplay was to load faster, the
animation should gracefully proceed.
---
 osu.Game/Screens/Play/PlayerLoader.cs | 95 +++++++++++++--------------
 1 file changed, 46 insertions(+), 49 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index c26195b09c..d9c7afdc3c 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -179,7 +179,10 @@ namespace osu.Game.Screens.Play
             contentIn();
 
             MetadataInfo.Delay(750).FadeIn(500);
-            this.Delay(1800).Schedule(pushWhenLoaded);
+
+            // after an initial delay, start the debounced load check.
+            // this will continue to execute even after resuming back on restart.
+            Scheduler.Add(new ScheduledDelegate(pushWhenLoaded, 1800, 0));
 
             showMuteWarningIfNeeded();
         }
@@ -189,8 +192,6 @@ namespace osu.Game.Screens.Play
             base.OnResuming(last);
 
             contentIn();
-
-            this.Delay(400).Schedule(pushWhenLoaded);
         }
 
         public override void OnSuspending(IScreen next)
@@ -322,66 +323,62 @@ namespace osu.Game.Screens.Play
         {
             if (!this.IsCurrentScreen()) return;
 
-            try
+            if (!readyForPush)
             {
-                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;
-                }
+                // 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;
+            // if a push has already been scheduled, no further action is required.
+            // this value is reset via cancelLoad() to allow a second usage of the same PlayerLoader screen.
+            if (scheduledPushPlayer != null)
+                return;
 
-                scheduledPushPlayer = Scheduler.AddDelayed(() =>
-                {
-                    contentOut();
+            scheduledPushPlayer = Scheduler.AddDelayed(() =>
+            {
                 // ensure that once we have reached this "point of no return", readyForPush will be false for all future checks (until a new player instance is prepared).
                 var consumedPlayer = consumePlayer();
 
-                    TransformSequence<PlayerLoader> pushSequence = this.Delay(250);
+                contentOut();
 
-                    // only show if the warning was created (i.e. the beatmap needs it)
-                    // and this is not a restart of the map (the warning expires after first load).
-                    if (epilepsyWarning?.IsAlive == true)
-                    {
-                        const double epilepsy_display_length = 3000;
+                TransformSequence<PlayerLoader> pushSequence = this.Delay(250);
 
-                        pushSequence
-                            .Schedule(() => epilepsyWarning.State.Value = Visibility.Visible)
-                            .TransformBindableTo(volumeAdjustment, 0.25, EpilepsyWarning.FADE_DURATION, Easing.OutQuint)
-                            .Delay(epilepsy_display_length)
-                            .Schedule(() =>
-                            {
-                                epilepsyWarning.Hide();
-                                epilepsyWarning.Expire();
-                            })
-                            .Delay(EpilepsyWarning.FADE_DURATION);
-                    }
+                // only show if the warning was created (i.e. the beatmap needs it)
+                // and this is not a restart of the map (the warning expires after first load).
+                if (epilepsyWarning?.IsAlive == true)
+                {
+                    const double epilepsy_display_length = 3000;
 
-                    pushSequence.Schedule(() =>
-                    {
-                        if (!this.IsCurrentScreen()) return;
+                    pushSequence
+                        .Schedule(() => epilepsyWarning.State.Value = Visibility.Visible)
+                        .TransformBindableTo(volumeAdjustment, 0.25, EpilepsyWarning.FADE_DURATION, Easing.OutQuint)
+                        .Delay(epilepsy_display_length)
+                        .Schedule(() =>
+                        {
+                            epilepsyWarning.Hide();
+                            epilepsyWarning.Expire();
+                        })
+                        .Delay(EpilepsyWarning.FADE_DURATION);
+                }
 
-                        LoadTask = null;
+                pushSequence.Schedule(() =>
+                {
+                    if (!this.IsCurrentScreen()) return;
 
-                        // 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;
+                    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;
 
-                        else
-                            this.Exit();
-                    });
-                }, 500);
-            }
-            finally
-            {
-                Schedule(pushWhenLoaded);
-            }
                     if (consumedPlayer.LoadedBeatmapSuccessfully)
                         this.Push(consumedPlayer);
+                    else
+                        this.Exit();
+                });
+            }, 500);
         }
 
         private void cancelLoad()

From 67dd7be71a549822b47562be9a4cfc106b338a12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Dec 2020 16:34:58 +0900
Subject: [PATCH 06809/10326] Move cancelLoad call to OnResuming

This has no real effect; it just feels more readable to me.
---
 osu.Game/Screens/Play/PlayerLoader.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index d9c7afdc3c..f3575b01b4 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -191,6 +191,7 @@ namespace osu.Game.Screens.Play
         {
             base.OnResuming(last);
 
+            cancelLoad();
             contentIn();
         }
 
@@ -198,8 +199,6 @@ namespace osu.Game.Screens.Play
         {
             base.OnSuspending(next);
 
-            cancelLoad();
-
             BackgroundBrightnessReduction = false;
 
             // we're moving to player, so a period of silence is upcoming.

From 437c0506cec8ee2b2ba1ee3ed71bb57ea50dd04b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Dec 2020 16:56:56 +0900
Subject: [PATCH 06810/10326] Refactor to allow for special disposal handling
 to still work

---
 osu.Game/Screens/Play/PlayerLoader.cs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index f3575b01b4..729119fa36 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
@@ -71,8 +72,9 @@ namespace osu.Game.Screens.Play
         }
 
         private bool readyForPush =>
+            !playerConsumed
             // don't push unless the player is completely loaded
-            player?.LoadState == LoadState.Ready
+            && 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.
@@ -84,6 +86,11 @@ namespace osu.Game.Screens.Play
 
         private Player player;
 
+        /// <summary>
+        /// Whether the curent player instance has been consumed via <see cref="consumePlayer"/>.
+        /// </summary>
+        private bool playerConsumed;
+
         private LogoTrackingContainer content;
 
         private bool hideOverlays;
@@ -191,7 +198,11 @@ namespace osu.Game.Screens.Play
         {
             base.OnResuming(last);
 
+            // prepare for a retry.
+            player = null;
+            playerConsumed = false;
             cancelLoad();
+
             contentIn();
         }
 
@@ -276,9 +287,10 @@ namespace osu.Game.Screens.Play
 
         private Player consumePlayer()
         {
-            var consumed = player;
-            player = null;
-            return consumed;
+            Debug.Assert(!playerConsumed);
+
+            playerConsumed = true;
+            return player;
         }
 
         private void prepareNewPlayer()
@@ -395,7 +407,7 @@ namespace osu.Game.Screens.Play
             if (isDisposing)
             {
                 // if the player never got pushed, we should explicitly dispose it.
-                DisposalTask = LoadTask?.ContinueWith(_ => player.Dispose());
+                DisposalTask = LoadTask?.ContinueWith(_ => player?.Dispose());
             }
         }
 

From 7c2f506b7902ec2c77048ccd058ec205fedd1570 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 10 Dec 2020 17:10:29 +0900
Subject: [PATCH 06811/10326] Port StanR's NF multiplier changes

---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 030b0cf6d1..12192e36d4 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             double multiplier = 1.12; // This is being adjusted to keep the final pp value scaled around what it used to be when changing things
 
             if (mods.Any(m => m is OsuModNoFail))
-                multiplier *= 0.90;
+                multiplier *= Math.Max(0.90, 1.0 - 0.02 * countMiss);
 
             if (mods.Any(m => m is OsuModSpunOut))
                 multiplier *= 1.0 - Math.Pow((double)Attributes.SpinnerCount / totalHits, 0.85);

From 679a550d833c9d6e12160c4a77ac81fa2662cca5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Dec 2020 17:42:28 +0900
Subject: [PATCH 06812/10326] Fix single threaded seeking not working due to
 unnecessary seek call

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 2c83161614..5d11cdf21d 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -154,13 +154,16 @@ namespace osu.Game.Screens.Play
 
         public void Start()
         {
-            // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
-            // This accounts for the audio clock source potentially taking time to enter a completely stopped state
-            Seek(GameplayClock.CurrentTime);
-            adjustableClock.Start();
-            IsPaused.Value = false;
+            if (!adjustableClock.IsRunning)
+            {
+                // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
+                // This accounts for the audio clock source potentially taking time to enter a completely stopped state
+                Seek(GameplayClock.CurrentTime);
 
             this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
+                adjustableClock.Start();
+            }
+            IsPaused.Value = false;
         }
 
         /// <summary>

From 01bd765384e9f9d2b61118fcab7e75132a7c3cf0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Dec 2020 17:42:47 +0900
Subject: [PATCH 06813/10326] Simplify pause handling by moving transform logic
 to bindable change event

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

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 5d11cdf21d..0bbdc980db 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -95,6 +95,16 @@ namespace osu.Game.Screens.Play
             localGameplayClock = new LocalGameplayClock(userOffsetClock);
 
             GameplayClock.IsPaused.BindTo(IsPaused);
+
+            IsPaused.BindValueChanged(onPaused);
+        }
+
+        private void onPaused(ValueChangedEvent<bool> isPaused)
+        {
+            if (isPaused.NewValue)
+                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => adjustableClock.Stop());
+            else
+                this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
         }
 
         private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
@@ -160,9 +170,9 @@ namespace osu.Game.Screens.Play
                 // This accounts for the audio clock source potentially taking time to enter a completely stopped state
                 Seek(GameplayClock.CurrentTime);
 
-            this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
                 adjustableClock.Start();
             }
+
             IsPaused.Value = false;
         }
 
@@ -202,8 +212,6 @@ namespace osu.Game.Screens.Play
 
         public void Stop()
         {
-            this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => adjustableClock.Stop());
-
             IsPaused.Value = true;
         }
 

From e097b6e61c2796f0c5071704d90b7119134fca0c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 10 Dec 2020 19:42:01 +0900
Subject: [PATCH 06814/10326] Add ScalingContainer back

Don't want to set DHO.Scale or DHO.Rotation because because DHO may be transformed by mods.
DHO.Size is also assigned for drawable visualizer
---
 .../Objects/Drawables/CaughtObject.cs         |  4 +++-
 .../Objects/Drawables/DrawableBanana.cs       | 14 ++++++-------
 .../Objects/Drawables/DrawableDroplet.cs      |  6 +++---
 .../Objects/Drawables/DrawableFruit.cs        |  6 +++---
 .../DrawablePalpableCatchHitObject.cs         | 20 ++++++++++++++++++-
 .../Objects/Drawables/IHasCatchObjectState.cs |  3 +--
 6 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
index fb83b73212..22fb338229 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         public Bindable<Color4> AccentColour { get; } = new Bindable<Color4>();
         public Bindable<bool> HyperDash { get; } = new Bindable<bool>();
 
+        float IHasCatchObjectState.Scale => Scale.X;
+
         /// <summary>
         /// Whether this hit object should stay on the catcher plate when the object is caught by the catcher.
         /// </summary>
@@ -43,7 +45,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         public virtual void CopyStateFrom(IHasCatchObjectState objectState)
         {
             HitObject = objectState.HitObject;
-            Scale = objectState.Scale;
+            Scale = new Vector2(objectState.Scale);
             Rotation = objectState.Rotation;
             AccentColour.Value = objectState.AccentColour.Value;
             HyperDash.Value = objectState.HyperDash.Value;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index 4bc5da2396..c1b41a7afc 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -24,9 +24,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(new SkinnableDrawable(
+            ScalingContainer.Child = new SkinnableDrawable(
                 new CatchSkinComponent(CatchSkinComponents.Banana),
-                _ => new BananaPiece()));
+                _ => new BananaPiece());
         }
 
         protected override void LoadComplete()
@@ -44,12 +44,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             const float end_scale = 0.6f;
             const float random_scale_range = 1.6f;
 
-            this.ScaleTo(HitObject.Scale * (end_scale + random_scale_range * RandomSingle(3)))
-                .Then().ScaleTo(HitObject.Scale * end_scale, HitObject.TimePreempt);
+            ScalingContainer.ScaleTo(HitObject.Scale * (end_scale + random_scale_range * RandomSingle(3)))
+                            .Then().ScaleTo(HitObject.Scale * end_scale, HitObject.TimePreempt);
 
-            this.RotateTo(getRandomAngle(1))
-                .Then()
-                .RotateTo(getRandomAngle(2), HitObject.TimePreempt);
+            ScalingContainer.RotateTo(getRandomAngle(1))
+                            .Then()
+                            .RotateTo(getRandomAngle(2), HitObject.TimePreempt);
 
             float getRandomAngle(int series) => 180 * (RandomSingle(series) * 2 - 1);
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index c5f0bb8b18..2dce9507a5 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -24,9 +24,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(new SkinnableDrawable(
+            ScalingContainer.Child = new SkinnableDrawable(
                 new CatchSkinComponent(CatchSkinComponents.Droplet),
-                _ => new DropletPiece()));
+                _ => new DropletPiece());
         }
 
         protected override void UpdateInitialTransforms()
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             float startRotation = RandomSingle(1) * 20;
             double duration = HitObject.TimePreempt + 2000;
 
-            this.RotateTo(startRotation).RotateTo(startRotation + 720, duration);
+            ScalingContainer.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 57f27d01b8..0b89c46480 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -32,16 +32,16 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 VisualRepresentation.Value = (FruitVisualRepresentation)(change.NewValue % 4);
             }, true);
 
-            AddInternal(new SkinnableDrawable(
+            ScalingContainer.Child = new SkinnableDrawable(
                 new CatchSkinComponent(CatchSkinComponents.Fruit),
-                _ => new FruitPiece()));
+                _ => new FruitPiece());
         }
 
         protected override void UpdateInitialTransforms()
         {
             base.UpdateInitialTransforms();
 
-            this.RotateTo((RandomSingle(1) - 0.5f) * 40);
+            ScalingContainer.RotateTo((RandomSingle(1) - 0.5f) * 40);
         }
     }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index aea9d2c082..9ddf56a9cd 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -5,6 +5,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osuTK;
 using osuTK.Graphics;
 
@@ -30,11 +31,27 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         public float DisplayRadius => CatchHitObject.OBJECT_RADIUS * HitObject.Scale * ScaleFactor;
 
+        /// <summary>
+        /// The container internal transforms (such as scaling based on the circle size) are applied to.
+        /// </summary>
+        protected readonly Container ScalingContainer;
+
+        float IHasCatchObjectState.Scale => HitObject.Scale * ScaleFactor;
+
+        float IHasCatchObjectState.Rotation => ScalingContainer.Rotation;
+
         protected DrawablePalpableCatchHitObject([CanBeNull] CatchHitObject h)
             : base(h)
         {
             Origin = Anchor.Centre;
             Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
+
+            AddInternal(ScalingContainer = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2)
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -47,7 +64,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
             ScaleBindable.BindValueChanged(scale =>
             {
-                Scale = new Vector2(scale.NewValue * ScaleFactor);
+                ScalingContainer.Scale = new Vector2(scale.NewValue * ScaleFactor);
+                Size = ScalingContainer.Size * ScalingContainer.Scale;
             }, true);
 
             IndexInBeatmap.BindValueChanged(_ => UpdateComboColour());
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
index 55ca502877..fac0249985 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
@@ -17,6 +16,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         Bindable<bool> HyperDash { get; }
 
         float Rotation { get; }
-        Vector2 Scale { get; }
+        float Scale { get; }
     }
 }

From 2634c6b8d9dc18f34ae7eb81dd114d36a71adb21 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 10 Dec 2020 20:43:01 +0900
Subject: [PATCH 06815/10326] Combine DisplayRadius and Scale to DisplaySize

---
 .../TestSceneFruitRandomness.cs               | 23 ++++++++++---------
 .../Objects/Drawables/CaughtObject.cs         |  8 ++++---
 .../DrawablePalpableCatchHitObject.cs         |  8 +++----
 .../Objects/Drawables/IHasCatchObjectState.cs |  5 ++--
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |  2 +-
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index e1d817b314..c888dc0a65 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Tests.Visual;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -37,16 +38,16 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             float fruitRotation = 0;
             float bananaRotation = 0;
-            float bananaScale = 0;
+            Vector2 bananaSize = new Vector2();
             Color4 bananaColour = new Color4();
 
             AddStep("Initialize start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
 
-                fruitRotation = drawableFruit.Rotation;
-                bananaRotation = drawableBanana.Rotation;
-                bananaScale = drawableBanana.Scale.X;
+                fruitRotation = drawableFruit.DisplayRotation;
+                bananaRotation = drawableBanana.DisplayRotation;
+                bananaSize = drawableBanana.DisplaySize;
                 bananaColour = drawableBanana.AccentColour.Value;
             });
 
@@ -55,9 +56,9 @@ namespace osu.Game.Rulesets.Catch.Tests
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = another_start_time;
             });
 
-            AddAssert("fruit rotation is changed", () => drawableFruit.Rotation != fruitRotation);
-            AddAssert("banana rotation is changed", () => drawableBanana.Rotation != bananaRotation);
-            AddAssert("banana scale is changed", () => drawableBanana.Scale.X != bananaScale);
+            AddAssert("fruit rotation is changed", () => drawableFruit.DisplayRotation != fruitRotation);
+            AddAssert("banana rotation is changed", () => drawableBanana.DisplayRotation != bananaRotation);
+            AddAssert("banana size is changed", () => drawableBanana.DisplaySize != bananaSize);
             AddAssert("banana colour is changed", () => drawableBanana.AccentColour.Value != bananaColour);
 
             AddStep("reset start time", () =>
@@ -65,10 +66,10 @@ namespace osu.Game.Rulesets.Catch.Tests
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
             });
 
-            AddAssert("rotation and scale restored", () =>
-                drawableFruit.Rotation == fruitRotation &&
-                drawableBanana.Rotation == bananaRotation &&
-                drawableBanana.Scale.X == bananaScale &&
+            AddAssert("rotation and size restored", () =>
+                drawableFruit.DisplayRotation == fruitRotation &&
+                drawableBanana.DisplayRotation == bananaRotation &&
+                drawableBanana.DisplaySize == bananaSize &&
                 drawableBanana.AccentColour.Value == bananaColour);
         }
     }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
index 22fb338229..524505d588 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
@@ -21,7 +21,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         public Bindable<Color4> AccentColour { get; } = new Bindable<Color4>();
         public Bindable<bool> HyperDash { get; } = new Bindable<bool>();
 
-        float IHasCatchObjectState.Scale => Scale.X;
+        public Vector2 DisplaySize => Size * Scale;
+
+        public float DisplayRotation => Rotation;
 
         /// <summary>
         /// Whether this hit object should stay on the catcher plate when the object is caught by the catcher.
@@ -45,8 +47,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         public virtual void CopyStateFrom(IHasCatchObjectState objectState)
         {
             HitObject = objectState.HitObject;
-            Scale = new Vector2(objectState.Scale);
-            Rotation = objectState.Rotation;
+            Scale = Vector2.Divide(objectState.DisplaySize, Size);
+            Rotation = objectState.DisplayRotation;
             AccentColour.Value = objectState.AccentColour.Value;
             HyperDash.Value = objectState.HyperDash.Value;
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 9ddf56a9cd..7df06bd92d 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -29,16 +29,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         /// </summary>
         protected virtual float ScaleFactor => 1;
 
-        public float DisplayRadius => CatchHitObject.OBJECT_RADIUS * HitObject.Scale * ScaleFactor;
-
         /// <summary>
         /// The container internal transforms (such as scaling based on the circle size) are applied to.
         /// </summary>
         protected readonly Container ScalingContainer;
 
-        float IHasCatchObjectState.Scale => HitObject.Scale * ScaleFactor;
+        public Vector2 DisplaySize => ScalingContainer.Size * ScalingContainer.Scale;
 
-        float IHasCatchObjectState.Rotation => ScalingContainer.Rotation;
+        public float DisplayRotation => ScalingContainer.Rotation;
 
         protected DrawablePalpableCatchHitObject([CanBeNull] CatchHitObject h)
             : base(h)
@@ -65,7 +63,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             ScaleBindable.BindValueChanged(scale =>
             {
                 ScalingContainer.Scale = new Vector2(scale.NewValue * ScaleFactor);
-                Size = ScalingContainer.Size * ScalingContainer.Scale;
+                Size = DisplaySize;
             }, true);
 
             IndexInBeatmap.BindValueChanged(_ => UpdateComboColour());
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
index fac0249985..d68e32aca9 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
@@ -15,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         Bindable<Color4> AccentColour { get; }
         Bindable<bool> HyperDash { get; }
 
-        float Rotation { get; }
-        float Scale { get; }
+        Vector2 DisplaySize { get; }
+        float DisplayRotation { get; }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 64dacd09e6..f164c2655a 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -235,7 +235,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (result.IsHit)
             {
-                var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplayRadius);
+                var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplaySize.X / 2);
 
                 placeCaughtObject(palpableObject, positionInStack);
 

From b3d834731586f16cff8ea513ab1a361283b38078 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Thu, 10 Dec 2020 20:11:08 +0600
Subject: [PATCH 06816/10326] add support for ScorePosition into
 LegacyManiaSkin

---
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs       | 1 +
 osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs | 1 +
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs             | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 35a6140cbc..a8225a5bea 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Skinning
 
         public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
         public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
+        public float ScorePosition = (480 - 402 + 150) * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;
         public bool KeysUnderNotes;
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index a99710ea96..9db6c8bf66 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Skinning
         LeftLineWidth,
         RightLineWidth,
         HitPosition,
+        ScorePosition,
         LightPosition,
         HitTargetImage,
         ShowJudgementLine,
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 3dbec23194..49feb9c3f0 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -94,6 +94,10 @@ namespace osu.Game.Skinning
                         currentConfig.LightPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         break;
 
+                    case "ScorePosition":
+                        currentConfig.ScorePosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
+                        break;
+
                     case "JudgementLine":
                         currentConfig.ShowJudgementLine = pair.Value == "1";
                         break;

From cc5639d2b42cfd9b05272fb659a72c879cd1e3c5 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Thu, 10 Dec 2020 09:48:40 -0600
Subject: [PATCH 06817/10326] added unneeded whitespace

---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 2b9c817094..5a827eef96 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             aimValue *= 0.5 + accuracy / 2.0;
             // It is important to also consider accuracy difficulty when doing that
             aimValue *= 0.98 + Math.Pow(Attributes.OverallDifficulty, 2) / 2500;
-            
+
             return aimValue;
         }
 

From 1f2946d64c988362c528b2401091252416a99cc2 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Thu, 10 Dec 2020 14:21:06 -0600
Subject: [PATCH 06818/10326] changed miss penalty curve to scale with
 totalhits

---
 .../Difficulty/OsuPerformanceCalculator.cs                  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 0ebe0ddc2d..8a641992d3 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -93,7 +93,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             aimValue *= lengthBonus;
 
             // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
-            aimValue *= Math.Pow(0.97, countMiss);
+            if (countMiss > 0)
+                aimValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, .75));
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)
@@ -139,7 +140,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             speedValue *= lengthBonus;
 
             // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
-            speedValue *= Math.Pow(0.97, countMiss);
+            if (countMiss > 0)
+                speedValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, 1));
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)

From fd0d793c6966beb9d93cffbbef9cc809e76e9d73 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Thu, 10 Dec 2020 18:51:54 -0600
Subject: [PATCH 06819/10326] changed the comment to reflect the change

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 8a641992d3..66ebc63243 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             aimValue *= lengthBonus;
 
-            // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
+            // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
                 aimValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, .75));
 
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                  (totalHits > 2000 ? Math.Log10(totalHits / 2000.0) * 0.5 : 0.0);
             speedValue *= lengthBonus;
 
-            // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
+            // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
                 speedValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, 1));
 

From 3fb41a20b55aa7e2d5270195e1a182dec18ed80b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 13:27:52 +0900
Subject: [PATCH 06820/10326] Add room name to settings

---
 .../Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index 8f0f4febd1..a5dcafefcd 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
@@ -18,11 +18,13 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public int? RulesetID { get; set; }
 
+        public string Name { get; set; } = "Unnamed room";
+
         [NotNull]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID;
+        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID && Name.Equals(other.Name, StringComparison.Ordinal);
 
-        public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
+        public override string ToString() => $"Name:{Name} Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
     }
 }

From c1c0b9a9db1c9a35114fd0535fc49ed3b5671e9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 14:10:45 +0900
Subject: [PATCH 06821/10326] Add realtime to room categories

---
 osu.Game/Online/Multiplayer/RoomCategory.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/RoomCategory.cs b/osu.Game/Online/Multiplayer/RoomCategory.cs
index 636a73a3e9..d6786a72fe 100644
--- a/osu.Game/Online/Multiplayer/RoomCategory.cs
+++ b/osu.Game/Online/Multiplayer/RoomCategory.cs
@@ -6,6 +6,7 @@ namespace osu.Game.Online.Multiplayer
     public enum RoomCategory
     {
         Normal,
-        Spotlight
+        Spotlight,
+        Realtime,
     }
 }

From 719b08b22fc0f078194b3fa54c64c78f88786666 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 14:11:42 +0900
Subject: [PATCH 06822/10326] Make room setting's BeatmapID non-nullable

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index a5dcafefcd..3934b8c1d7 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
     [Serializable]
     public class MultiplayerRoomSettings : IEquatable<MultiplayerRoomSettings>
     {
-        public int? BeatmapID { get; set; }
+        public int BeatmapID { get; set; }
 
         public int? RulesetID { get; set; }
 

From d3b2e2b36eebcb6913244df225f4007bd014708b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 14:43:17 +0900
Subject: [PATCH 06823/10326] Change locking method to better allow
 cross-thread locking

---
 .../RealtimeMultiplayer/LockUntilDisposal.cs  | 24 -------------------
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 20 +++++++++++++++-
 2 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs b/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs
deleted file mode 100644
index cd16fce2ee..0000000000
--- a/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.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;
-using System.Threading;
-
-namespace osu.Game.Online.RealtimeMultiplayer
-{
-    public readonly struct LockUntilDisposal : IDisposable
-    {
-        private readonly object lockTarget;
-
-        public LockUntilDisposal(object lockTarget)
-        {
-            this.lockTarget = lockTarget;
-            Monitor.Enter(lockTarget);
-        }
-
-        public void Dispose()
-        {
-            Monitor.Exit(lockTarget);
-        }
-    }
-}
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 5704ddd675..e009a34707 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -5,7 +5,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using Newtonsoft.Json;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
@@ -48,10 +50,26 @@ namespace osu.Game.Online.RealtimeMultiplayer
             RoomID = roomId;
         }
 
+        private object updateLock = new object();
+
+        private ManualResetEventSlim freeForWrite = new ManualResetEventSlim(true);
+
         /// <summary>
         /// Request a lock on this room to perform a thread-safe update.
         /// </summary>
-        public LockUntilDisposal LockForUpdate() => new LockUntilDisposal(writeLock);
+        public IDisposable LockForUpdate()
+        {
+            // ReSharper disable once InconsistentlySynchronizedField
+            freeForWrite.Wait();
+
+            lock (updateLock)
+            {
+                freeForWrite.Wait();
+                freeForWrite.Reset();
+
+                return new ValueInvokeOnDisposal<MultiplayerRoom>(this, r => freeForWrite.Set());
+            }
+        }
 
         public override string ToString() => $"RoomID:{RoomID} Host:{Host?.UserID} Users:{Users.Count} State:{State} Settings: [{Settings}]";
     }

From 2dd591125673b4b4d6b130204995bfe41cf54de9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 14:44:01 +0900
Subject: [PATCH 06824/10326] Rename method to better match purpose

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 0bbdc980db..0248432917 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -96,10 +96,10 @@ namespace osu.Game.Screens.Play
 
             GameplayClock.IsPaused.BindTo(IsPaused);
 
-            IsPaused.BindValueChanged(onPaused);
+            IsPaused.BindValueChanged(onPauseChanged);
         }
 
-        private void onPaused(ValueChangedEvent<bool> isPaused)
+        private void onPauseChanged(ValueChangedEvent<bool> isPaused)
         {
             if (isPaused.NewValue)
                 this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => adjustableClock.Stop());

From c0d20d8ce430a2ee7257c7ac8cf34eeefd54489f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 16:43:00 +0900
Subject: [PATCH 06825/10326] Add some spacing to interface class

---
 .../Objects/Drawables/IHasCatchObjectState.cs                  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
index d68e32aca9..81b61f0959 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
@@ -13,10 +13,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
     public interface IHasCatchObjectState
     {
         PalpableCatchHitObject HitObject { get; }
+
         Bindable<Color4> AccentColour { get; }
+
         Bindable<bool> HyperDash { get; }
 
         Vector2 DisplaySize { get; }
+
         float DisplayRotation { get; }
     }
 }

From a35060ea7a3c7c825b826b4ad7a65a898249d8bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 17:56:00 +0900
Subject: [PATCH 06826/10326] Add a simple cache-busting query string to
 online.db retrieval

As we are finally pushing updates for this database, this adds a minimum
level of guarantee that a client will request a new version (without
having to worry about multiple levels of server-side caching).
---
 osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index c4563d5844..e90ccbb805 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Beatmaps
                 string cacheFilePath = storage.GetFullPath(cache_database_name);
                 string compressedCacheFilePath = $"{cacheFilePath}.bz2";
 
-                cacheDownloadRequest = new FileWebRequest(compressedCacheFilePath, $"https://assets.ppy.sh/client-resources/{cache_database_name}.bz2");
+                cacheDownloadRequest = new FileWebRequest(compressedCacheFilePath, $"https://assets.ppy.sh/client-resources/{cache_database_name}.bz2?{DateTimeOffset.UtcNow:yyyyMMdd}");
 
                 cacheDownloadRequest.Failed += ex =>
                 {

From b5f6baf3412128bc142d966affffc433abfbe490 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 18:03:48 +0900
Subject: [PATCH 06827/10326] 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 9a3d42d6b7..e0bf1867b9 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1203.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1211.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9d37ceee6c..bd8a7c73b2 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1203.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1211.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ab03393836..c5e7c45eda 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.Framework.iOS" Version="2020.1203.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1211.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1203.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1211.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From aedb18b9f21e0e98af5f3720369314658565a2aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 18:14:33 +0900
Subject: [PATCH 06828/10326] Make RulesetID non-nullable

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index 3934b8c1d7..d2f64235c3 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
     {
         public int BeatmapID { get; set; }
 
-        public int? RulesetID { get; set; }
+        public int RulesetID { get; set; }
 
         public string Name { get; set; } = "Unnamed room";
 

From 544160798b6448df40d9c2a9d85ca210f14fa3d4 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Fri, 11 Dec 2020 08:01:45 -0600
Subject: [PATCH 06829/10326] cleaned up mistakes and made quality changes

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 66ebc63243..2c41959d3f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                aimValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, .75));
+                aimValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                speedValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, 1));
+                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)

From abc8a2982c68163e29a80736c5227d51d01d0417 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Fri, 11 Dec 2020 08:20:56 -0600
Subject: [PATCH 06830/10326] swapped ^.75 buff onto speed instead of aim

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 2c41959d3f..5d3552798c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                aimValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
+                aimValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), countMiss);
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
+                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), Math.Pow(countMiss, .75));
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)

From 3acaa63373f1465249b537a956b0b9901936cedd Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 11 Dec 2020 23:24:38 +0900
Subject: [PATCH 06831/10326] CI fixes

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 2c41959d3f..ebcebeae7c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                aimValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
+                aimValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), countMiss);
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
+                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), countMiss);
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)

From b7872a54b885a2572ec439e8e2a8c0cb2f47dccf Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Fri, 11 Dec 2020 10:48:53 -0600
Subject: [PATCH 06832/10326] small factor rebalance

---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 5d3552798c..a43c78f93f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), Math.Pow(countMiss, .75));
+                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), Math.Pow(countMiss, .875));
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)

From f20c5a2bda5f3d4a199af516e22b8caf1e97526a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 12 Dec 2020 15:29:21 +0900
Subject: [PATCH 06833/10326] Update framework (again)

---
 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 e0bf1867b9..eaedcb7bc3 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1211.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1212.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index bd8a7c73b2..b4c7dca12f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1211.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1212.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index c5e7c45eda..7542aded86 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.Framework.iOS" Version="2020.1211.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1212.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1211.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1212.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 08b79bb92126925a538eb8ff62a7c7d058f6c574 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 12 Dec 2020 17:12:15 +0100
Subject: [PATCH 06834/10326] Store and return unstarted task for consumers to
 await on.

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 0ad58b2438..6c32e2e94c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -429,8 +429,9 @@ namespace osu.Game
 
         public override Task Import(Stream stream, string filename)
         {
-            WaitForReady(() => this, _ => Task.Run(() => base.Import(stream, filename)));
-            return Task.CompletedTask;
+            var importTask = new Task(async () => await base.Import(stream, filename));
+            WaitForReady(() => this, _ => importTask.Start());
+            return importTask;
         }
 
         protected virtual Loader CreateLoader() => new Loader();

From 8292c746ea82e35412f717fe8d6db6921661e54e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Dec 2020 22:42:40 +0100
Subject: [PATCH 06835/10326] Leverage hitobject model for strong hit instead
 of creating own

---
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index e4c0766844..c1b422452e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -2,6 +2,7 @@
 // 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.Utils;
@@ -9,7 +10,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             var cpi = new ControlPointInfo();
             cpi.Add(0, new EffectControlPoint { KiaiMode = kiai });
 
-            Hit hit = new Hit();
+            Hit hit = new Hit { IsStrong = true };
             hit.ApplyDefaults(cpi, new BeatmapDifficulty());
 
             var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             DrawableRuleset.Playfield.Add(h);
 
             ((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.NestedHitObjects.Single(), new JudgementResult(new HitObject(), new TaikoStrongJudgement()) { Type = HitResult.Great });
         }
 
         private void addMissJudgement()
@@ -210,15 +210,5 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableRuleset.Playfield.Add(new DrawableHit(h));
         }
-
-        private class TestStrongNestedHit : DrawableStrongNestedHit
-        {
-            public TestStrongNestedHit(DrawableHitObject mainObject)
-                : base(new StrongHitObject { StartTime = mainObject.HitObject.StartTime }, mainObject)
-            {
-            }
-
-            public override bool OnPressed(TaikoAction action) => false;
-        }
     }
 }

From 34e7a36b382ba88d4e2ae74fceb8ad7833133090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Dec 2020 22:48:22 +0100
Subject: [PATCH 06836/10326] Fix kiai hit steps not working correctly

---
 osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs |  7 +++++--
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs   | 14 ++------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
index fb0917341e..f048cad18c 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
@@ -13,12 +13,15 @@ namespace osu.Game.Rulesets.Taiko.Tests
     {
         public readonly HitResult Type;
 
-        public DrawableTestHit(Hit hit, HitResult type = HitResult.Great)
+        public DrawableTestHit(Hit hit, HitResult type = HitResult.Great, bool kiai = false)
             : base(hit)
         {
             Type = type;
 
-            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            var controlPoints = new ControlPointInfo();
+            controlPoints.Add(0, new EffectControlPoint { KiaiMode = kiai });
+
+            HitObject.ApplyDefaults(controlPoints, new BeatmapDifficulty());
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index c1b422452e..14a127ac82 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -106,13 +106,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Ok : HitResult.Great;
 
-            var cpi = new ControlPointInfo();
-            cpi.Add(0, new EffectControlPoint { KiaiMode = kiai });
-
             Hit hit = new Hit();
-            hit.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
+            var h = new DrawableTestHit(hit, kiai: kiai) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
 
             DrawableRuleset.Playfield.Add(h);
 
@@ -123,13 +118,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Ok : HitResult.Great;
 
-            var cpi = new ControlPointInfo();
-            cpi.Add(0, new EffectControlPoint { KiaiMode = kiai });
-
             Hit hit = new Hit { IsStrong = true };
-            hit.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
+            var h = new DrawableTestHit(hit, kiai: kiai) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
 
             DrawableRuleset.Playfield.Add(h);
 

From 76193e221754455ac9638f7974437c2259b9fc5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Dec 2020 22:52:01 +0100
Subject: [PATCH 06837/10326] Fix miss step not working

---
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 14a127ac82..d257712553 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -130,8 +130,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
         private void addMissJudgement()
         {
             DrawableTestHit h;
-            DrawableRuleset.Playfield.Add(h = new DrawableTestHit(new Hit(), HitResult.Miss));
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = HitResult.Miss });
+            DrawableRuleset.Playfield.Add(h = new DrawableTestHit(new Hit { StartTime = DrawableRuleset.Playfield.Time.Current }, HitResult.Miss)
+            {
+                Alpha = 0
+            });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(h.HitObject, new TaikoJudgement()) { Type = HitResult.Miss });
         }
 
         private void addBarLine(bool major, double delay = scroll_time)

From 43c0e2191deaad07687704619d69b2c10056c0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Dec 2020 23:50:12 +0100
Subject: [PATCH 06838/10326] Apply local fix for strong/colour not being
 applied correctly

---
 .../TestSceneHits.cs                          | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index d257712553..1d51020a6f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
@@ -118,7 +120,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Ok : HitResult.Great;
 
-            Hit hit = new Hit { IsStrong = true };
+            Hit hit = new Hit
+            {
+                IsStrong = true,
+                Samples = createSamples(strong: true)
+            };
             var h = new DrawableTestHit(hit, kiai: kiai) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
 
             DrawableRuleset.Playfield.Add(h);
@@ -166,6 +172,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             {
                 StartTime = DrawableRuleset.Playfield.Time.Current + scroll_time,
                 IsStrong = strong,
+                Samples = createSamples(strong: strong),
                 Duration = duration,
                 TickRate = 8,
             };
@@ -183,7 +190,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
             Hit h = new Hit
             {
                 StartTime = DrawableRuleset.Playfield.Time.Current + scroll_time,
-                IsStrong = strong
+                IsStrong = strong,
+                Samples = createSamples(HitType.Centre, strong)
             };
 
             h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
@@ -196,12 +204,27 @@ namespace osu.Game.Rulesets.Taiko.Tests
             Hit h = new Hit
             {
                 StartTime = DrawableRuleset.Playfield.Time.Current + scroll_time,
-                IsStrong = strong
+                IsStrong = strong,
+                Samples = createSamples(HitType.Rim, strong)
             };
 
             h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             DrawableRuleset.Playfield.Add(new DrawableHit(h));
         }
+
+        // TODO: can be removed if a better way of handling colour/strong type and samples is developed
+        private IList<HitSampleInfo> createSamples(HitType? hitType = null, bool strong = false)
+        {
+            var samples = new List<HitSampleInfo>();
+
+            if (hitType == HitType.Rim)
+                samples.Add(new HitSampleInfo(HitSampleInfo.HIT_CLAP));
+
+            if (strong)
+                samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
+
+            return samples;
+        }
     }
 }

From 3a3b32186ee62acc40a66f9047a777d4d2b72b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 00:00:37 +0100
Subject: [PATCH 06839/10326] Make height test steps work better

---
 .../DrawableTaikoRulesetTestScene.cs                      | 8 +++++---
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs            | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs
index d1c4a1c56d..783636a62d 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
 {
     public abstract class DrawableTaikoRulesetTestScene : OsuTestScene
     {
+        protected const int DEFAULT_PLAYFIELD_CONTAINER_HEIGHT = 768;
+
         protected DrawableTaikoRuleset DrawableRuleset { get; private set; }
         protected Container PlayfieldContainer { get; private set; }
 
@@ -44,10 +46,10 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             Add(PlayfieldContainer = new Container
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
                 RelativeSizeAxes = Axes.X,
-                Height = 768,
+                Height = DEFAULT_PLAYFIELD_CONTAINER_HEIGHT,
                 Children = new[] { DrawableRuleset = new DrawableTaikoRuleset(new TaikoRuleset(), beatmap.GetPlayableBeatmap(new TaikoRuleset().RulesetInfo)) }
             });
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 1d51020a6f..c3fa03d404 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                     break;
 
                 case 6:
-                    PlayfieldContainer.Delay(delay).ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_HEIGHT), 500);
+                    PlayfieldContainer.Delay(delay).ResizeTo(new Vector2(1, DEFAULT_PLAYFIELD_CONTAINER_HEIGHT), 500);
                     break;
             }
         }

From 1ddc896b765a72c5135e2bd10e8759293dcce73b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 12:18:29 +0100
Subject: [PATCH 06840/10326] Rename Strong{-> Nested}HitObject

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs                | 2 +-
 .../Objects/Drawables/DrawableDrumRoll.cs                   | 6 +++---
 .../Objects/Drawables/DrawableDrumRollTick.cs               | 6 +++---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs    | 6 +++---
 .../Objects/Drawables/DrawableStrongNestedHit.cs            | 4 ++--
 .../Objects/Drawables/DrawableTaikoHitObject.cs             | 6 +++---
 .../{StrongHitObject.cs => StrongNestedHitObject.cs}        | 2 +-
 osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs           | 2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)
 rename osu.Game.Rulesets.Taiko/Objects/{StrongHitObject.cs => StrongNestedHitObject.cs} (89%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 99e103da3b..e62841b2c4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             createDrawableRuleset();
 
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
-            assertStateAfterResult(new JudgementResult(new StrongHitObject(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Idle);
+            assertStateAfterResult(new JudgementResult(new StrongNestedHitObject(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Idle);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 4ead4982a1..4330e426c1 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Content.X = DrawHeight / 2;
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private void updateColour()
         {
@@ -164,8 +164,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(StrongHitObject strong, DrawableDrumRoll drumRoll)
-                : base(strong, drumRoll)
+            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableDrumRoll drumRoll)
+                : base(nestedHit, drumRoll)
             {
             }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index e68e40ae1c..c458a620bd 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -61,12 +61,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return UpdateResult(true);
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(StrongHitObject strong, DrawableDrumRollTick tick)
-                : base(strong, tick)
+            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableDrumRollTick tick)
+                : base(nestedHit, tick)
             {
             }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index d1751d8a75..5837a391b4 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
@@ -240,8 +240,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             public new DrawableHit MainObject => (DrawableHit)base.MainObject;
 
-            public StrongNestedHit(StrongHitObject strong, DrawableHit hit)
-                : base(strong, hit)
+            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableHit hit)
+                : base(nestedHit, hit)
             {
             }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index 108e42eea5..e1da357c47 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
@@ -13,8 +13,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     {
         public readonly DrawableHitObject MainObject;
 
-        protected DrawableStrongNestedHit(StrongHitObject strong, DrawableHitObject mainObject)
-            : base(strong)
+        protected DrawableStrongNestedHit(StrongNestedHitObject nestedHit, DrawableHitObject mainObject)
+            : base(nestedHit)
         {
             MainObject = mainObject;
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index ff5b221273..42f24f1f52 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             switch (hitObject)
             {
-                case StrongHitObject strong:
+                case StrongNestedHitObject strong:
                     return CreateStrongHit(strong);
             }
 
@@ -221,11 +221,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected abstract SkinnableDrawable CreateMainPiece();
 
         /// <summary>
-        /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongHitObject"/>.
+        /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongNestedHitObject"/>.
         /// This is only invoked if <see cref="TaikoHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
         /// </summary>
         /// <param name="hitObject">The strong hitobject.</param>
         /// <returns>The strong hitobject handler.</returns>
-        protected virtual DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => null;
+        protected virtual DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => null;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
similarity index 89%
rename from osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs
rename to osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
index 72a04698be..b2def4c6e5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class StrongHitObject : TaikoHitObject
+    public class StrongNestedHitObject : TaikoHitObject
     {
         public override Judgement CreateJudgement() => new TaikoStrongJudgement();
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
index d2c37d965c..2c1e3f32f3 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
             base.CreateNestedHitObjects(cancellationToken);
 
             if (IsStrong)
-                AddNested(new StrongHitObject { StartTime = this.GetEndTime() });
+                AddNested(new StrongNestedHitObject { StartTime = this.GetEndTime() });
         }
 
         public override Judgement CreateJudgement() => new TaikoJudgement();

From f74567e8eb393d351039c0208700cc703bfc3e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 12:36:39 +0100
Subject: [PATCH 06841/10326] Introduce base class for hitobjects that can be
 strong

---
 .../TaikoBeatmapConversionTest.cs             |  2 +-
 .../Beatmaps/TaikoBeatmapConverter.cs         |  4 +-
 .../Edit/TaikoSelectionHandler.cs             |  2 +-
 .../Drawables/DrawableTaikoHitObject.cs       |  2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs   |  2 +-
 .../Objects/DrumRollTick.cs                   |  2 +-
 osu.Game.Rulesets.Taiko/Objects/Hit.cs        |  2 +-
 osu.Game.Rulesets.Taiko/Objects/Swell.cs      |  2 -
 .../Objects/TaikoHitObject.cs                 | 44 -------------------
 .../Objects/TaikoStrongHitObject.cs           | 42 ++++++++++++++++++
 .../Replays/TaikoAutoGenerator.cs             |  4 +-
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs    |  2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs  |  6 +--
 13 files changed, 56 insertions(+), 60 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index 5e550a5d03..126af1a6ad 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 IsCentre = (hitObject as Hit)?.Type == HitType.Centre,
                 IsDrumRoll = hitObject is DrumRoll,
                 IsSwell = hitObject is Swell,
-                IsStrong = ((TaikoHitObject)hitObject).IsStrong
+                IsStrong = (hitObject as TaikoStrongHitObject)?.IsStrong == true
             };
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 607eaf5dbd..78a0d1fdff 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -65,8 +65,8 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 converted.HitObjects = converted.HitObjects.GroupBy(t => t.StartTime).Select(x =>
                 {
                     TaikoHitObject first = x.First();
-                    if (x.Skip(1).Any() && first.CanBeStrong)
-                        first.IsStrong = true;
+                    if (x.Skip(1).Any() && first is TaikoStrongHitObject strong)
+                        strong.IsStrong = true;
                     return first;
                 }).ToList();
             }
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index a05de1f217..7de920ca8c 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
             base.UpdateTernaryStates();
 
             selectionRimState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<Hit>(), h => h.Type == HitType.Rim);
-            selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoHitObject>(), h => h.IsStrong);
+            selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoStrongHitObject>(), h => h.IsStrong);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 42f24f1f52..1e39e7e97e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             base.LoadSamples();
 
-            if (HitObject.CanBeStrong)
+            if (HitObject is TaikoStrongHitObject)
                 isStrong.Value = getStrongSamples().Any();
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 5f52160be1..471e1a7b2f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoHitObject, IHasPath
+    public class DrumRoll : TaikoStrongHitObject, IHasPath
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 8a8be3e38d..5c36a3203c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRollTick : TaikoHitObject
+    public class DrumRollTick : TaikoStrongHitObject
     {
         /// <summary>
         /// Whether this is the first (initial) tick of the slider.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 68cc8d0ead..d6385c810d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -5,7 +5,7 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class Hit : TaikoHitObject
+    public class Hit : TaikoStrongHitObject
     {
         public readonly Bindable<HitType> TypeBindable = new Bindable<HitType>();
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index bf8b7bc178..eeae6e79f8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
             set => Duration = value - StartTime;
         }
 
-        public override bool CanBeStrong => false;
-
         public double Duration { get; set; }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
index 2c1e3f32f3..f047c03f4b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.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.Threading;
-using osu.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -19,47 +16,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public const float DEFAULT_SIZE = 0.45f;
 
-        /// <summary>
-        /// Scale multiplier for a strong drawable taiko hit object.
-        /// </summary>
-        public const float STRONG_SCALE = 1.4f;
-
-        /// <summary>
-        /// Default size of a strong drawable taiko hit object.
-        /// </summary>
-        public const float DEFAULT_STRONG_SIZE = DEFAULT_SIZE * STRONG_SCALE;
-
-        public readonly Bindable<bool> IsStrongBindable = new BindableBool();
-
-        /// <summary>
-        /// Whether this <see cref="TaikoHitObject"/> can be made a "strong" (large) hit.
-        /// </summary>
-        public virtual bool CanBeStrong => true;
-
-        /// <summary>
-        /// Whether this HitObject is a "strong" type.
-        /// Strong hit objects give more points for hitting the hit object with both keys.
-        /// </summary>
-        public bool IsStrong
-        {
-            get => IsStrongBindable.Value;
-            set
-            {
-                if (value && !CanBeStrong)
-                    throw new InvalidOperationException($"Object of type {GetType()} cannot be strong");
-
-                IsStrongBindable.Value = value;
-            }
-        }
-
-        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
-        {
-            base.CreateNestedHitObjects(cancellationToken);
-
-            if (IsStrong)
-                AddNested(new StrongNestedHitObject { StartTime = this.GetEndTime() });
-        }
-
         public override Judgement CreateJudgement() => new TaikoJudgement();
 
         protected override HitWindows CreateHitWindows() => new TaikoHitWindows();
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
new file mode 100644
index 0000000000..a8d00b7681
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.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.Threading;
+using osu.Framework.Bindables;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Objects
+{
+    public abstract class TaikoStrongHitObject : TaikoHitObject
+    {
+        /// <summary>
+        /// Scale multiplier for a strong drawable taiko hit object.
+        /// </summary>
+        public const float STRONG_SCALE = 1.4f;
+
+        /// <summary>
+        /// Default size of a strong drawable taiko hit object.
+        /// </summary>
+        public const float DEFAULT_STRONG_SIZE = DEFAULT_SIZE * STRONG_SCALE;
+
+        public readonly Bindable<bool> IsStrongBindable = new BindableBool();
+
+        /// <summary>
+        /// Whether this HitObject is a "strong" type.
+        /// Strong hit objects give more points for hitting the hit object with both keys.
+        /// </summary>
+        public bool IsStrong
+        {
+            get => IsStrongBindable.Value;
+            set => IsStrongBindable.Value = value;
+        }
+
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
+        {
+            base.CreateNestedHitObjects(cancellationToken);
+
+            if (IsStrong)
+                AddNested(new StrongNestedHitObject { StartTime = this.GetEndTime() });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index db2e5948f5..a3dbe672a4 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -102,13 +102,13 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
                         if (hit.Type == HitType.Centre)
                         {
-                            actions = h.IsStrong
+                            actions = hit.IsStrong
                                 ? new[] { TaikoAction.LeftCentre, TaikoAction.RightCentre }
                                 : new[] { hitButton ? TaikoAction.LeftCentre : TaikoAction.RightCentre };
                         }
                         else
                         {
-                            actions = h.IsStrong
+                            actions = hit.IsStrong
                                 ? new[] { TaikoAction.LeftRim, TaikoAction.RightRim }
                                 : new[] { hitButton ? TaikoAction.LeftRim : TaikoAction.RightRim };
                         }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index 247c0dde73..05408e1049 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         /// </summary>
         public void VisualiseSecondHit()
         {
-            this.ResizeTo(new Vector2(TaikoHitObject.DEFAULT_STRONG_SIZE), 50);
+            this.ResizeTo(new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE), 50);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
index caddc8b122..5d8145391d 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(border_thickness, (1 - TaikoHitObject.DEFAULT_STRONG_SIZE) / 2f),
+                    Size = new Vector2(border_thickness, (1 - TaikoStrongHitObject.DEFAULT_STRONG_SIZE) / 2f),
                     Alpha = 0.1f
                 },
                 new CircularContainer
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(TaikoHitObject.DEFAULT_STRONG_SIZE),
+                    Size = new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE),
                     Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = border_thickness,
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(border_thickness, (1 - TaikoHitObject.DEFAULT_STRONG_SIZE) / 2f),
+                    Size = new Vector2(border_thickness, (1 - TaikoStrongHitObject.DEFAULT_STRONG_SIZE) / 2f),
                     Alpha = 0.1f
                 },
             };

From b1635ecd166456bfa0667c80af75f1ea642f603c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 12:51:10 +0100
Subject: [PATCH 06842/10326] Reflect can-be-strong split in DHO structure

---
 .../Objects/Drawables/DrawableDrumRoll.cs     |   2 +-
 .../Objects/Drawables/DrawableDrumRollTick.cs |   2 +-
 .../Objects/Drawables/DrawableHit.cs          |   2 +-
 .../Drawables/DrawableTaikoHitObject.cs       |  82 +------------
 .../Drawables/DrawableTaikoStrongHitObject.cs | 110 ++++++++++++++++++
 .../Skinning/Legacy/LegacyCirclePiece.cs      |   4 +-
 6 files changed, 116 insertions(+), 86 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 4330e426c1..3f8970e506 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRoll : DrawableTaikoHitObject<DrumRoll>
+    public class DrawableDrumRoll : DrawableTaikoStrongHitObject<DrumRoll>
     {
         /// <summary>
         /// Number of rolling hits required to reach the dark/final colour.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index c458a620bd..c21b7983a0 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRollTick : DrawableTaikoHitObject<DrumRollTick>
+    public class DrawableDrumRollTick : DrawableTaikoStrongHitObject<DrumRollTick>
     {
         /// <summary>
         /// The hit type corresponding to the <see cref="TaikoAction"/> that the user pressed to hit this <see cref="DrawableDrumRollTick"/>.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 5837a391b4..c82ac8498e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -16,7 +16,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableHit : DrawableTaikoHitObject<Hit>
+    public class DrawableHit : DrawableTaikoStrongHitObject<Hit>
     {
         /// <summary>
         /// A list of keys which can result in hits for this HitObject.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 1e39e7e97e..cf3aa69b6f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -4,13 +4,11 @@
 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.Primitives;
 using osu.Framework.Input.Bindings;
 using osu.Game.Audio;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
@@ -120,112 +118,34 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected Vector2 BaseSize;
         protected SkinnableDrawable MainPiece;
 
-        private readonly Bindable<bool> isStrong;
-
-        private readonly Container<DrawableStrongNestedHit> strongHitContainer;
-
         protected DrawableTaikoHitObject(TObject hitObject)
             : base(hitObject)
         {
             HitObject = hitObject;
-            isStrong = HitObject.IsStrongBindable.GetBoundCopy();
 
             Anchor = Anchor.CentreLeft;
             Origin = Anchor.Custom;
 
             RelativeSizeAxes = Axes.Both;
-
-            AddInternal(strongHitContainer = new Container<DrawableStrongNestedHit>());
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            isStrong.BindValueChanged(_ =>
-            {
-                // will overwrite samples, should only be called on change.
-                updateSamplesFromStrong();
-
-                RecreatePieces();
-            });
-
             RecreatePieces();
         }
 
-        private HitSampleInfo[] getStrongSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
-
-        protected override void LoadSamples()
-        {
-            base.LoadSamples();
-
-            if (HitObject is TaikoStrongHitObject)
-                isStrong.Value = getStrongSamples().Any();
-        }
-
-        private void updateSamplesFromStrong()
-        {
-            var strongSamples = getStrongSamples();
-
-            if (isStrong.Value != strongSamples.Any())
-            {
-                if (isStrong.Value)
-                    HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
-                else
-                {
-                    foreach (var sample in strongSamples)
-                        HitObject.Samples.Remove(sample);
-                }
-            }
-        }
-
         protected virtual void RecreatePieces()
         {
-            Size = BaseSize = new Vector2(HitObject.IsStrong ? TaikoHitObject.DEFAULT_STRONG_SIZE : TaikoHitObject.DEFAULT_SIZE);
+            Size = BaseSize = new Vector2(TaikoHitObject.DEFAULT_SIZE);
 
             MainPiece?.Expire();
             Content.Add(MainPiece = CreateMainPiece());
         }
 
-        protected override void AddNestedHitObject(DrawableHitObject hitObject)
-        {
-            base.AddNestedHitObject(hitObject);
-
-            switch (hitObject)
-            {
-                case DrawableStrongNestedHit strong:
-                    strongHitContainer.Add(strong);
-                    break;
-            }
-        }
-
-        protected override void ClearNestedHitObjects()
-        {
-            base.ClearNestedHitObjects();
-            strongHitContainer.Clear();
-        }
-
-        protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
-        {
-            switch (hitObject)
-            {
-                case StrongNestedHitObject strong:
-                    return CreateStrongHit(strong);
-            }
-
-            return base.CreateNestedHitObject(hitObject);
-        }
-
         // Most osu!taiko hitsounds are managed by the drum (see DrumSampleMapping).
         public override IEnumerable<HitSampleInfo> GetSamples() => Enumerable.Empty<HitSampleInfo>();
 
         protected abstract SkinnableDrawable CreateMainPiece();
-
-        /// <summary>
-        /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongNestedHitObject"/>.
-        /// This is only invoked if <see cref="TaikoHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The strong hitobject.</param>
-        /// <returns>The strong hitobject handler.</returns>
-        protected virtual DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => null;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
new file mode 100644
index 0000000000..875612c8a1
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
@@ -0,0 +1,110 @@
+// Copyright (c) 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.Containers;
+using osu.Game.Audio;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.Objects.Drawables
+{
+    public abstract class DrawableTaikoStrongHitObject<TObject> : DrawableTaikoHitObject<TObject>
+        where TObject : TaikoStrongHitObject
+    {
+        private readonly Bindable<bool> isStrong;
+
+        private readonly Container<DrawableStrongNestedHit> strongHitContainer;
+
+        protected DrawableTaikoStrongHitObject(TObject hitObject)
+            : base(hitObject)
+        {
+            isStrong = HitObject.IsStrongBindable.GetBoundCopy();
+
+            AddInternal(strongHitContainer = new Container<DrawableStrongNestedHit>());
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            isStrong.BindValueChanged(_ =>
+            {
+                // will overwrite samples, should only be called on change.
+                updateSamplesFromStrong();
+
+                RecreatePieces();
+            });
+        }
+
+        private HitSampleInfo[] getStrongSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
+
+        protected override void LoadSamples()
+        {
+            base.LoadSamples();
+            isStrong.Value = getStrongSamples().Any();
+        }
+
+        private void updateSamplesFromStrong()
+        {
+            var strongSamples = getStrongSamples();
+
+            if (isStrong.Value != strongSamples.Any())
+            {
+                if (isStrong.Value)
+                    HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
+                else
+                {
+                    foreach (var sample in strongSamples)
+                        HitObject.Samples.Remove(sample);
+                }
+            }
+        }
+
+        protected override void RecreatePieces()
+        {
+            base.RecreatePieces();
+            if (HitObject.IsStrong)
+                Size = BaseSize = new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE);
+        }
+
+        protected override void AddNestedHitObject(DrawableHitObject hitObject)
+        {
+            base.AddNestedHitObject(hitObject);
+
+            switch (hitObject)
+            {
+                case DrawableStrongNestedHit strong:
+                    strongHitContainer.Add(strong);
+                    break;
+            }
+        }
+
+        protected override void ClearNestedHitObjects()
+        {
+            base.ClearNestedHitObjects();
+            strongHitContainer.Clear();
+        }
+
+        protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case StrongNestedHitObject strong:
+                    return CreateStrongHit(strong);
+            }
+
+            return base.CreateNestedHitObject(hitObject);
+        }
+
+        /// <summary>
+        /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongNestedHitObject"/>.
+        /// This is only invoked if <see cref="TaikoStrongHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The strong hitobject.</param>
+        /// <returns>The strong hitobject handler.</returns>
+        protected abstract DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject);
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index 821ddc3c04..52c9080633 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 const string normal_hit = "taikohit";
                 const string big_hit = "taikobig";
 
-                string prefix = ((drawableHitObject as DrawableTaikoHitObject)?.HitObject.IsStrong ?? false) ? big_hit : normal_hit;
+                string prefix = ((drawableHitObject.HitObject as TaikoStrongHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
 
                 return skin.GetAnimation($"{prefix}{lookup}", true, false) ??
                        // fallback to regular size if "big" version doesn't exist.

From 4d444df6b3979852403e46e37c5a1c29237cfb21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 12:53:42 +0100
Subject: [PATCH 06843/10326] Rename DHO CreateStrong{-> Nested}Hit

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs | 2 +-
 .../Objects/Drawables/DrawableDrumRollTick.cs                 | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs      | 2 +-
 .../Objects/Drawables/DrawableTaikoStrongHitObject.cs         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 3f8970e506..3a7b644158 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Content.X = DrawHeight / 2;
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private void updateColour()
         {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index c21b7983a0..bc83fc538c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return UpdateResult(true);
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index c82ac8498e..3928c4bb5e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
index 875612c8a1..0aa8be2da5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             switch (hitObject)
             {
                 case StrongNestedHitObject strong:
-                    return CreateStrongHit(strong);
+                    return CreateStrongNestedHit(strong);
             }
 
             return base.CreateNestedHitObject(hitObject);
@@ -105,6 +105,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         /// <param name="hitObject">The strong hitobject.</param>
         /// <returns>The strong hitobject handler.</returns>
-        protected abstract DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject);
+        protected abstract DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject);
     }
 }

From 61c488cd5eb33314611e87035073112b6a5444b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 12:59:46 +0100
Subject: [PATCH 06844/10326] Create HO-specific nested hit types

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs             | 2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs              | 6 ++++++
 osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs          | 6 ++++++
 osu.Game.Rulesets.Taiko/Objects/Hit.cs                   | 6 ++++++
 osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs | 2 +-
 osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs  | 9 ++++++++-
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index e62841b2c4..8d1aafdcc2 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             createDrawableRuleset();
 
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
-            assertStateAfterResult(new JudgementResult(new StrongNestedHitObject(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Idle);
+            assertStateAfterResult(new JudgementResult(new Hit.StrongNestedHit(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Idle);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 471e1a7b2f..93f95d6446 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -109,6 +109,12 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+
+        public class StrongNestedHit : StrongNestedHitObject
+        {
+        }
+
         #region LegacyBeatmapEncoder
 
         double IHasDistance.Distance => Duration * Velocity;
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 5c36a3203c..6b6ffa8668 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -28,5 +28,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
         public override Judgement CreateJudgement() => new TaikoDrumRollTickJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+
+        public class StrongNestedHit : StrongNestedHitObject
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index d6385c810d..6bdde376f6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -17,5 +17,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
             get => TypeBindable.Value;
             set => TypeBindable.Value = value;
         }
+
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+
+        public class StrongNestedHit : StrongNestedHitObject
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
index b2def4c6e5..a0b1d3ef9b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class StrongNestedHitObject : TaikoHitObject
+    public abstract class StrongNestedHitObject : TaikoHitObject
     {
         public override Judgement CreateJudgement() => new TaikoStrongJudgement();
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
index a8d00b7681..6a8e33e718 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
@@ -36,7 +36,14 @@ namespace osu.Game.Rulesets.Taiko.Objects
             base.CreateNestedHitObjects(cancellationToken);
 
             if (IsStrong)
-                AddNested(new StrongNestedHitObject { StartTime = this.GetEndTime() });
+                AddNested(CreateStrongNestedHit(this.GetEndTime()));
         }
+
+        /// <summary>
+        /// Creates a <see cref="StrongNestedHitObject"/> representing a second hit on this object.
+        /// This is only called if <see cref="IsStrong"/> is true.
+        /// </summary>
+        /// <param name="startTime">The start time of the nested hit.</param>
+        protected abstract StrongNestedHitObject CreateStrongNestedHit(double startTime);
     }
 }

From 60379b09dbc22a1b8229c45a5a74a8f384a2bb39 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Sun, 13 Dec 2020 18:14:41 +0600
Subject: [PATCH 06845/10326] added a container for the judgements to move up
 or down

---
 ...awableManiaJudgementAdjustmentContainer.cs | 23 +++++++++++++++++++
 osu.Game.Rulesets.Mania/UI/Stage.cs           |  8 +------
 2 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
new file mode 100644
index 0000000000..b5abd9fb10
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using osu.Game.Rulesets.UI;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public class DrawableManiaJudgementAdjustmentContainer : JudgementContainer<DrawableManiaJudgement>
+    {
+        private float scorePosition => 0;
+        public DrawableManiaJudgementAdjustmentContainer(float hitTargetPosition)
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.Centre;
+            RelativeSizeAxes = Axes.Both;
+            Y = hitTargetPosition + 150;
+        }
+
+        public DrawableManiaJudgementAdjustmentContainer()
+            : this(110) { }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 3d7960ffe3..73af205a37 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -101,13 +101,7 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        judgements = new JudgementContainer<DrawableManiaJudgement>
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.Centre,
-                            RelativeSizeAxes = Axes.Both,
-                            Y = HIT_TARGET_POSITION + 150,
-                        },
+                        judgements = new DrawableManiaJudgementAdjustmentContainer(HIT_TARGET_POSITION),
                         topLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
                     }
                 }

From 7d2b77cdbdf2f09b5c4938d3c87fe5b181682ab8 Mon Sep 17 00:00:00 2001
From: Graham Johnson <johnson.graham.ib@gmail.com>
Date: Sun, 13 Dec 2020 07:58:58 -0500
Subject: [PATCH 06846/10326] improve selection box rotation UX

---
 .../Screens/Edit/Compose/Components/SelectionBox.cs   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 742d433760..347d9e3ba7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -191,7 +191,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 {
                     Anchor = Anchor.TopCentre,
                     Y = -separation,
-                    HandleDrag = e => OnRotation?.Invoke(e.Delta.X),
+                    HandleDrag = e => OnRotation?.Invoke(convertDragEventToAngleOfRotation(e)),
                     OperationStarted = operationStarted,
                     OperationEnded = operationEnded
                 }
@@ -242,6 +242,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private int activeOperations;
 
+        private float convertDragEventToAngleOfRotation(DragEvent e)
+        {
+            // Adjust coordinate system to the center of SelectionBox
+            float startAngle = MathF.Atan2(e.LastMousePosition.Y - DrawHeight / 2, e.LastMousePosition.X - DrawWidth / 2);
+            float endAngle = MathF.Atan2(e.MousePosition.Y - DrawHeight / 2, e.MousePosition.X - DrawWidth / 2);
+
+            return (endAngle - startAngle) * 180 / MathF.PI;
+        }
+
         private void operationEnded()
         {
             if (--activeOperations == 0)

From 091b08b5070e4abac6999cf7e7a9c2ef4c71d560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 14:38:16 +0100
Subject: [PATCH 06847/10326] Scope drawable nested hits more closely to models

---
 .../Objects/Drawables/DrawableDrumRoll.cs                  | 6 +++---
 .../Objects/Drawables/DrawableDrumRollTick.cs              | 6 +++---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs   | 6 +++---
 .../Objects/Drawables/DrawableTaikoStrongHitObject.cs      | 7 ++++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 3a7b644158..0c6d28472d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRoll : DrawableTaikoStrongHitObject<DrumRoll>
+    public class DrawableDrumRoll : DrawableTaikoStrongHitObject<DrumRoll, DrumRoll.StrongNestedHit>
     {
         /// <summary>
         /// Number of rolling hits required to reach the dark/final colour.
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Content.X = DrawHeight / 2;
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRoll.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
 
         private void updateColour()
         {
@@ -164,7 +164,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableDrumRoll drumRoll)
+            public StrongNestedHit(DrumRoll.StrongNestedHit nestedHit, DrawableDrumRoll drumRoll)
                 : base(nestedHit, drumRoll)
             {
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index bc83fc538c..c26e20f92c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRollTick : DrawableTaikoStrongHitObject<DrumRollTick>
+    public class DrawableDrumRollTick : DrawableTaikoStrongHitObject<DrumRollTick, DrumRollTick.StrongNestedHit>
     {
         /// <summary>
         /// The hit type corresponding to the <see cref="TaikoAction"/> that the user pressed to hit this <see cref="DrawableDrumRollTick"/>.
@@ -61,11 +61,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return UpdateResult(true);
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRollTick.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableDrumRollTick tick)
+            public StrongNestedHit(DrumRollTick.StrongNestedHit nestedHit, DrawableDrumRollTick tick)
                 : base(nestedHit, tick)
             {
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 3928c4bb5e..31cb3d764d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -16,7 +16,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableHit : DrawableTaikoStrongHitObject<Hit>
+    public class DrawableHit : DrawableTaikoStrongHitObject<Hit, Hit.StrongNestedHit>
     {
         /// <summary>
         /// A list of keys which can result in hits for this HitObject.
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(Hit.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
@@ -240,7 +240,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             public new DrawableHit MainObject => (DrawableHit)base.MainObject;
 
-            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableHit hit)
+            public StrongNestedHit(Hit.StrongNestedHit nestedHit, DrawableHit hit)
                 : base(nestedHit, hit)
             {
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
index 0aa8be2da5..04e584e15d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
@@ -12,8 +12,9 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public abstract class DrawableTaikoStrongHitObject<TObject> : DrawableTaikoHitObject<TObject>
+    public abstract class DrawableTaikoStrongHitObject<TObject, TStrongNestedObject> : DrawableTaikoHitObject<TObject>
         where TObject : TaikoStrongHitObject
+        where TStrongNestedObject : StrongNestedHitObject
     {
         private readonly Bindable<bool> isStrong;
 
@@ -92,7 +93,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             switch (hitObject)
             {
-                case StrongNestedHitObject strong:
+                case TStrongNestedObject strong:
                     return CreateStrongNestedHit(strong);
             }
 
@@ -105,6 +106,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         /// <param name="hitObject">The strong hitobject.</param>
         /// <returns>The strong hitobject handler.</returns>
-        protected abstract DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject);
+        protected abstract DrawableStrongNestedHit CreateStrongNestedHit(TStrongNestedObject hitObject);
     }
 }

From 080f7a3e32d9d19bca0b25ebb184c8402d155d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 13:04:44 +0100
Subject: [PATCH 06848/10326] Add/fix up xmldocs with clarifications

---
 .../Objects/Drawables/DrawableStrongNestedHit.cs              | 2 +-
 osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs      | 4 ++++
 osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs       | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index e1da357c47..d735d258b3 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     /// <summary>
-    /// Used as a nested hitobject to provide <see cref="TaikoStrongJudgement"/>s for <see cref="DrawableTaikoHitObject"/>s.
+    /// Used as a nested hitobject to provide <see cref="TaikoStrongJudgement"/>s for <see cref="DrawableTaikoStrongHitObject{TObject, TNested}"/>s.
     /// </summary>
     public abstract class DrawableStrongNestedHit : DrawableTaikoHitObject
     {
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
index a0b1d3ef9b..2e8989bc79 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
@@ -7,6 +7,10 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
+    /// <summary>
+    /// Base type for nested strong hits.
+    /// Used by <see cref="TaikoStrongHitObject"/>s to represent their strong bonus scoring portions.
+    /// </summary>
     public abstract class StrongNestedHitObject : TaikoHitObject
     {
         public override Judgement CreateJudgement() => new TaikoStrongJudgement();
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
index 6a8e33e718..861de95bae 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
@@ -7,6 +7,9 @@ using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
+    /// <summary>
+    /// Base class for taiko hitobjects that can become strong (large).
+    /// </summary>
     public abstract class TaikoStrongHitObject : TaikoHitObject
     {
         /// <summary>

From acd07017d1cf3b9c3497b73915363ed3be109725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 16:36:09 +0100
Subject: [PATCH 06849/10326] Replace now-default SDL run config with legacy
 osuTK config

---
 .../{osu_SDL.xml => osu___legacy_osuTK_.xml}                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename .idea/.idea.osu.Desktop/.idea/runConfigurations/{osu_SDL.xml => osu___legacy_osuTK_.xml} (79%)

diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
similarity index 79%
rename from .idea/.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml
rename to .idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
index 31f1fda09d..811fd9cc6d 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu! SDL" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
+  <configuration default="false" name="osu! (legacy osuTK)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll" />
-    <option name="PROGRAM_PARAMETERS" value="--sdl" />
+    <option name="PROGRAM_PARAMETERS" value="--tk" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />

From f14e49c72e9dada5dc4771b15dd209528cc8ddef Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Sun, 13 Dec 2020 19:59:34 +0600
Subject: [PATCH 06850/10326] fetch ScorePosition from the skin

---
 ...awableManiaJudgementAdjustmentContainer.cs | 29 +++++++++++++++----
 osu.Game.Rulesets.Mania/UI/Stage.cs           | 15 ++++++++--
 .../UI/Scrolling/ScrollingPlayfield.cs        | 14 ++++++++-
 3 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
index b5abd9fb10..79e7d58f63 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
@@ -8,16 +8,33 @@ namespace osu.Game.Rulesets.Mania.UI
 {
     public class DrawableManiaJudgementAdjustmentContainer : JudgementContainer<DrawableManiaJudgement>
     {
-        private float scorePosition => 0;
-        public DrawableManiaJudgementAdjustmentContainer(float hitTargetPosition)
+        private float hitTargetPosition = 110;
+        private float scorePosition;
+
+        public float HitTargetPosition
+        {
+            get => hitTargetPosition;
+            set
+            {
+                hitTargetPosition = value;
+                Y = value + scorePosition + 150;
+            }
+        }
+
+        public float ScorePosition
+        {
+            set
+            {
+                scorePosition = value;
+                Y = hitTargetPosition + value + 150;
+            }
+        }
+
+        public DrawableManiaJudgementAdjustmentContainer()
         {
             Anchor = Anchor.TopCentre;
             Origin = Anchor.Centre;
             RelativeSizeAxes = Axes.Both;
-            Y = hitTargetPosition + 150;
         }
-
-        public DrawableManiaJudgementAdjustmentContainer()
-            : this(110) { }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 73af205a37..d06e341744 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -32,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public IReadOnlyList<Column> Columns => columnFlow.Content;
         private readonly ColumnFlow<Column> columnFlow;
 
-        private readonly JudgementContainer<DrawableManiaJudgement> judgements;
+        private DrawableManiaJudgementAdjustmentContainer judgements;
         private readonly DrawablePool<DrawableManiaJudgement> judgementPool;
 
         private readonly Drawable barLineContainer;
@@ -101,7 +102,10 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        judgements = new DrawableManiaJudgementAdjustmentContainer(HIT_TARGET_POSITION),
+                        judgements = new DrawableManiaJudgementAdjustmentContainer()
+                        {
+                            HitTargetPosition = HIT_TARGET_POSITION,
+                        },
                         topLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
                     }
                 }
@@ -175,6 +179,13 @@ namespace osu.Game.Rulesets.Mania.UI
             }));
         }
 
+        protected override void OnSkinChanged()
+        {
+            judgements.ScorePosition = CurrentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ScorePosition))
+                                               ?.Value ?? 0;
+        }
+
         protected override void Update()
         {
             // Due to masking differences, it is not possible to get the width of the columns container automatically
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 9dac3f4de1..e611f09dcf 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI.Scrolling
@@ -18,10 +19,21 @@ namespace osu.Game.Rulesets.UI.Scrolling
         [Resolved]
         protected IScrollingInfo ScrollingInfo { get; private set; }
 
+        protected ISkinSource CurrentSkin;
+
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(ISkinSource skin)
         {
             Direction.BindTo(ScrollingInfo.Direction);
+            CurrentSkin = skin;
+
+            skin.SourceChanged += OnSkinChanged;
+            OnSkinChanged();
+        }
+
+        protected virtual void OnSkinChanged()
+        {
+
         }
 
         /// <summary>

From 21088443199777bc68cbd7f502468435cc9e29d3 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Sun, 13 Dec 2020 22:00:46 +0600
Subject: [PATCH 06851/10326] apply ScorePosition to the judgement container

---
 osu.Game.Rulesets.Mania/UI/Stage.cs               | 5 ++---
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs | 2 +-
 osu.Game/Skinning/LegacySkin.cs                   | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index d06e341744..db344a6934 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -181,9 +181,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected override void OnSkinChanged()
         {
-            judgements.ScorePosition = CurrentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ScorePosition))
-                                               ?.Value ?? 0;
+            judgements.ScorePosition = CurrentSkin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)
+                                                   ?.Value ?? 0;
         }
 
         protected override void Update()
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index a8225a5bea..40588f0ac4 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Skinning
 
         public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
         public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
-        public float ScorePosition = (480 - 402 + 150) * POSITION_SCALE_FACTOR;
+        public float ScorePosition = (480 - 300) * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;
         public bool KeysUnderNotes;
 
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 63a22eba62..80b2fef35c 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -169,6 +169,9 @@ namespace osu.Game.Skinning
                 case LegacyManiaSkinConfigurationLookups.HitPosition:
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));
 
+                case LegacyManiaSkinConfigurationLookups.ScorePosition:
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ScorePosition));
+
                 case LegacyManiaSkinConfigurationLookups.LightPosition:
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.LightPosition));
 

From 3741c2339a084244f98623b83b8cd71c35fe5d70 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Sun, 13 Dec 2020 22:43:36 +0600
Subject: [PATCH 06852/10326] simplify implementation and adjust the default
 values

---
 ...awableManiaJudgementAdjustmentContainer.cs | 40 -------------------
 osu.Game.Rulesets.Mania/UI/Stage.cs           | 12 +++---
 .../Skinning/LegacyManiaSkinConfiguration.cs  |  2 +-
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs   |  2 +-
 4 files changed, 9 insertions(+), 47 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
deleted file mode 100644
index 79e7d58f63..0000000000
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using osu.Game.Rulesets.UI;
-using osu.Framework.Graphics;
-
-namespace osu.Game.Rulesets.Mania.UI
-{
-    public class DrawableManiaJudgementAdjustmentContainer : JudgementContainer<DrawableManiaJudgement>
-    {
-        private float hitTargetPosition = 110;
-        private float scorePosition;
-
-        public float HitTargetPosition
-        {
-            get => hitTargetPosition;
-            set
-            {
-                hitTargetPosition = value;
-                Y = value + scorePosition + 150;
-            }
-        }
-
-        public float ScorePosition
-        {
-            set
-            {
-                scorePosition = value;
-                Y = hitTargetPosition + value + 150;
-            }
-        }
-
-        public DrawableManiaJudgementAdjustmentContainer()
-        {
-            Anchor = Anchor.TopCentre;
-            Origin = Anchor.Centre;
-            RelativeSizeAxes = Axes.Both;
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index db344a6934..7d6ddce815 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public IReadOnlyList<Column> Columns => columnFlow.Content;
         private readonly ColumnFlow<Column> columnFlow;
 
-        private DrawableManiaJudgementAdjustmentContainer judgements;
+        private JudgementContainer<DrawableManiaJudgement> judgements;
         private readonly DrawablePool<DrawableManiaJudgement> judgementPool;
 
         private readonly Drawable barLineContainer;
@@ -102,9 +102,11 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        judgements = new DrawableManiaJudgementAdjustmentContainer()
+                        judgements = new JudgementContainer<DrawableManiaJudgement>()
                         {
-                            HitTargetPosition = HIT_TARGET_POSITION,
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
                         },
                         topLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
                     }
@@ -181,8 +183,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected override void OnSkinChanged()
         {
-            judgements.ScorePosition = CurrentSkin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)
-                                                   ?.Value ?? 0;
+            judgements.Y = CurrentSkin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)
+                                                   ?.Value ?? HIT_TARGET_POSITION + 150;
         }
 
         protected override void Update()
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 40588f0ac4..77d390875b 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Skinning
 
         public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
         public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
-        public float ScorePosition = (480 - 300) * POSITION_SCALE_FACTOR;
+        public float ScorePosition = 300 * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;
         public bool KeysUnderNotes;
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 49feb9c3f0..6a04a95040 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Skinning
                         break;
 
                     case "ScorePosition":
-                        currentConfig.ScorePosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
+                        currentConfig.ScorePosition = (float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         break;
 
                     case "JudgementLine":

From cf7303e07231f2df157207a67e91578c59e3c6f4 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Sun, 13 Dec 2020 22:54:01 +0600
Subject: [PATCH 06853/10326] dotnet format

---
 osu.Game.Rulesets.Mania/UI/Stage.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 7d6ddce815..d2f5e6902a 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public IReadOnlyList<Column> Columns => columnFlow.Content;
         private readonly ColumnFlow<Column> columnFlow;
 
-        private JudgementContainer<DrawableManiaJudgement> judgements;
+        private readonly JudgementContainer<DrawableManiaJudgement> judgements;
         private readonly DrawablePool<DrawableManiaJudgement> judgementPool;
 
         private readonly Drawable barLineContainer;
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        judgements = new JudgementContainer<DrawableManiaJudgement>()
+                        judgements = new JudgementContainer<DrawableManiaJudgement>
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.Centre,

From c83c3e92fcebfe9793633ed1b55fa330ab4028a0 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Mon, 14 Dec 2020 01:50:25 +0600
Subject: [PATCH 06854/10326] apply a private setter in a protected property

---
 osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index e611f09dcf..7259bf293c 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -18,8 +18,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         [Resolved]
         protected IScrollingInfo ScrollingInfo { get; private set; }
-
-        protected ISkinSource CurrentSkin;
+        protected ISkinSource CurrentSkin { get; private set; }
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)

From beee9b89d53806803a45a87462c2711daa689225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 19:29:41 +0100
Subject: [PATCH 06855/10326] Change bar line SHOC to nested playfield

---
 .../UI/BarLinePlayfield.cs                    | 11 ++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 62 ++++++++++++++++---
 2 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs

diff --git a/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs b/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs
new file mode 100644
index 0000000000..83d0a17e09
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.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.
+
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public class BarLinePlayfield : ScrollingPlayfield
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 370760f03e..d20b190c86 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -10,6 +10,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -38,10 +39,15 @@ namespace osu.Game.Rulesets.Taiko.UI
         private SkinnableDrawable mascot;
 
         private ProxyContainer topLevelHitContainer;
-        private ScrollingHitObjectContainer barlineContainer;
         private Container rightArea;
         private Container leftArea;
 
+        /// <remarks>
+        /// <see cref="Playfield.AddNested"/> is purposefully not called on this to prevent i.e. being able to interact
+        /// with bar lines in the editor.
+        /// </remarks>
+        private BarLinePlayfield barLinePlayfield;
+
         private Container hitTargetOffsetContent;
 
         public TaikoPlayfield(ControlPointInfo controlPoints)
@@ -84,7 +90,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                             RelativeSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
-                                barlineContainer = new ScrollingHitObjectContainer(),
+                                barLinePlayfield = new BarLinePlayfield(),
                                 new Container
                                 {
                                     Name = "Hit objects",
@@ -155,12 +161,50 @@ namespace osu.Game.Rulesets.Taiko.UI
             mascot.Scale = new Vector2(DrawHeight / DEFAULT_HEIGHT);
         }
 
+        #region Pooling support
+
+        public override void Add(HitObject h)
+        {
+            switch (h)
+            {
+                case BarLine barLine:
+                    barLinePlayfield.Add(barLine);
+                    break;
+
+                case TaikoHitObject taikoHitObject:
+                    base.Add(taikoHitObject);
+                    break;
+
+                default:
+                    throw new ArgumentException($"Unsupported {nameof(HitObject)} type: {h.GetType()}");
+            }
+        }
+
+        public override bool Remove(HitObject h)
+        {
+            switch (h)
+            {
+                case BarLine barLine:
+                    return barLinePlayfield.Remove(barLine);
+
+                case TaikoHitObject taikoHitObject:
+                    return base.Remove(taikoHitObject);
+
+                default:
+                    throw new ArgumentException($"Unsupported {nameof(HitObject)} type: {h.GetType()}");
+            }
+        }
+
+        #endregion
+
+        #region Non-pooling support
+
         public override void Add(DrawableHitObject h)
         {
             switch (h)
             {
-                case DrawableBarLine barline:
-                    barlineContainer.Add(barline);
+                case DrawableBarLine barLine:
+                    barLinePlayfield.Add(barLine);
                     break;
 
                 case DrawableTaikoHitObject taikoObject:
@@ -170,7 +214,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     break;
 
                 default:
-                    throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type");
+                    throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type: {h.GetType()}");
             }
         }
 
@@ -178,8 +222,8 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             switch (h)
             {
-                case DrawableBarLine barline:
-                    return barlineContainer.Remove(barline);
+                case DrawableBarLine barLine:
+                    return barLinePlayfield.Remove(barLine);
 
                 case DrawableTaikoHitObject _:
                     h.OnNewResult -= OnNewResult;
@@ -187,10 +231,12 @@ namespace osu.Game.Rulesets.Taiko.UI
                     return base.Remove(h);
 
                 default:
-                    throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type");
+                    throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type: {h.GetType()}");
             }
         }
 
+        #endregion
+
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             if (!DisplayJudgements.Value)

From f83c5fa81d8f5291e0c3d75b37e65a35ec8b2a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 19:38:32 +0100
Subject: [PATCH 06856/10326] Add backing bindable for major field

---
 osu.Game.Rulesets.Taiko/Objects/BarLine.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/BarLine.cs b/osu.Game.Rulesets.Taiko/Objects/BarLine.cs
index 6306195704..bbfc02f975 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.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 
@@ -8,7 +9,13 @@ namespace osu.Game.Rulesets.Taiko.Objects
 {
     public class BarLine : TaikoHitObject, IBarLine
     {
-        public bool Major { get; set; }
+        public bool Major
+        {
+            get => MajorBindable.Value;
+            set => MajorBindable.Value = value;
+        }
+
+        public readonly Bindable<bool> MajorBindable = new BindableBool();
 
         public override Judgement CreateJudgement() => new IgnoreJudgement();
     }

From a8e86a20e1aa127ff35bfdf244feeb32b63f685f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 19:59:07 +0100
Subject: [PATCH 06857/10326] Unify bar line types & prepare for pooling

---
 .../Skinning/TestSceneDrawableBarLine.cs      |   2 +-
 .../TestSceneHits.cs                          |   8 +-
 .../Objects/Drawables/DrawableBarLine.cs      | 110 +++++++++++++++---
 .../Objects/Drawables/DrawableBarLineMajor.cs |  67 -----------
 .../UI/DrawableTaikoRuleset.cs                |   2 +-
 5 files changed, 102 insertions(+), 87 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
index f6aec20d53..ff309f278e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     }
                 };
 
-                hoc.Add(new DrawableBarLineMajor(createBarLineAtCurrentTime(true))
+                hoc.Add(new DrawableBarLine(createBarLineAtCurrentTime(true))
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index c3fa03d404..18ee903977 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -145,9 +145,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private void addBarLine(bool major, double delay = scroll_time)
         {
-            BarLine bl = new BarLine { StartTime = DrawableRuleset.Playfield.Time.Current + delay };
+            BarLine bl = new BarLine
+            {
+                StartTime = DrawableRuleset.Playfield.Time.Current + delay,
+                Major = major
+            };
 
-            DrawableRuleset.Playfield.Add(major ? new DrawableBarLineMajor(bl) : new DrawableBarLine(bl));
+            DrawableRuleset.Playfield.Add(new DrawableBarLine(bl));
         }
 
         private void addSwell(double duration = default_duration)
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
index aadcc420df..e7dd9a18c2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
@@ -1,7 +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 JetBrains.Annotations;
+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.Objects;
 using osuTK;
@@ -15,49 +19,123 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     /// </summary>
     public class DrawableBarLine : DrawableHitObject<HitObject>
     {
+        public new BarLine HitObject => (BarLine)base.HitObject;
+
         /// <summary>
         /// The width of the line tracker.
         /// </summary>
         private const float tracker_width = 2f;
 
         /// <summary>
-        /// Fade out time calibrated to a pre-empt of 1000ms.
+        /// The vertical offset of the triangles from the line tracker.
         /// </summary>
-        private const float base_fadeout_time = 100f;
+        private const float triangle_offset = 10f;
+
+        /// <summary>
+        /// The size of the triangles.
+        /// </summary>
+        private const float triangle_size = 20f;
 
         /// <summary>
         /// The visual line tracker.
         /// </summary>
-        protected SkinnableDrawable Line;
+        private SkinnableDrawable line;
 
         /// <summary>
-        /// The bar line.
+        /// Container with triangles. Only visible for major lines.
         /// </summary>
-        protected readonly BarLine BarLine;
+        private Container triangleContainer;
 
-        public DrawableBarLine(BarLine barLine)
+        private readonly Bindable<bool> major = new Bindable<bool>();
+
+        public DrawableBarLine()
+            : this(null)
+        {
+        }
+
+        public DrawableBarLine([CanBeNull] BarLine barLine)
             : base(barLine)
         {
-            BarLine = barLine;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             Anchor = Anchor.CentreLeft;
             Origin = Anchor.Centre;
 
             RelativeSizeAxes = Axes.Y;
             Width = tracker_width;
 
-            AddInternal(Line = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.BarLine), _ => new Box
+            AddRangeInternal(new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                EdgeSmoothness = new Vector2(0.5f, 0),
-            })
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Alpha = 0.75f,
+                line = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.BarLine), _ => new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    EdgeSmoothness = new Vector2(0.5f, 0),
+                })
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                triangleContainer = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new[]
+                    {
+                        new EquilateralTriangle
+                        {
+                            Name = "Top",
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Position = new Vector2(0, -triangle_offset),
+                            Size = new Vector2(-triangle_size),
+                            EdgeSmoothness = new Vector2(1),
+                        },
+                        new EquilateralTriangle
+                        {
+                            Name = "Bottom",
+                            Anchor = Anchor.BottomCentre,
+                            Origin = Anchor.TopCentre,
+                            Position = new Vector2(0, triangle_offset),
+                            Size = new Vector2(triangle_size),
+                            EdgeSmoothness = new Vector2(1),
+                        }
+                    }
+                }
             });
         }
 
-        protected override void UpdateHitStateTransforms(ArmedState state) => this.FadeOut(150);
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            major.BindValueChanged(majorChanged => updateMajor(majorChanged.NewValue), true);
+        }
+
+        private void updateMajor(bool major)
+        {
+            line.Alpha = major ? 1f : 0.75f;
+            triangleContainer.Alpha = major ? 1 : 0;
+        }
+
+        protected override void OnApply()
+        {
+            base.OnApply();
+            major.BindTo(HitObject.MajorBindable);
+        }
+
+        protected override void OnFree()
+        {
+            base.OnFree();
+            major.UnbindFrom(HitObject.MajorBindable);
+        }
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            using (BeginAbsoluteSequence(HitObject.StartTime))
+                this.FadeOutFromOne(150).Expire();
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.cs
deleted file mode 100644
index 62aab3524b..0000000000
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.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 osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osuTK;
-using osu.Framework.Graphics.Shapes;
-
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables
-{
-    public class DrawableBarLineMajor : DrawableBarLine
-    {
-        /// <summary>
-        /// The vertical offset of the triangles from the line tracker.
-        /// </summary>
-        private const float triangle_offfset = 10f;
-
-        /// <summary>
-        /// The size of the triangles.
-        /// </summary>
-        private const float triangle_size = 20f;
-
-        private readonly Container triangleContainer;
-
-        public DrawableBarLineMajor(BarLine barLine)
-            : base(barLine)
-        {
-            AddInternal(triangleContainer = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                Children = new[]
-                {
-                    new EquilateralTriangle
-                    {
-                        Name = "Top",
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Position = new Vector2(0, -triangle_offfset),
-                        Size = new Vector2(-triangle_size),
-                        EdgeSmoothness = new Vector2(1),
-                    },
-                    new EquilateralTriangle
-                    {
-                        Name = "Bottom",
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.TopCentre,
-                        Position = new Vector2(0, triangle_offfset),
-                        Size = new Vector2(triangle_size),
-                        EdgeSmoothness = new Vector2(1),
-                    }
-                }
-            });
-
-            Line.Alpha = 1f;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            using (triangleContainer.BeginAbsoluteSequence(HitObject.StartTime))
-                triangleContainer.FadeOut(150);
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index e6aacf34dc..9ed5480777 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(bar.Major ? new DrawableBarLineMajor(bar) : new DrawableBarLine(bar)));
+            new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(new DrawableBarLine(bar)));
 
             FrameStableComponents.Add(scroller = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Scroller), _ => Empty())
             {

From 44dd9a57a8718da214ea801b35b9aca941518cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 20:03:24 +0100
Subject: [PATCH 06858/10326] Add abstract hit object application test scene

---
 .../HitObjectApplicationTestScene.cs          | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
new file mode 100644
index 0000000000..8e1b01385a
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.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.Graphics;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public abstract class HitObjectApplicationTestScene : OsuTestScene
+    {
+        [Cached(typeof(IScrollingInfo))]
+        private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
+        {
+            Direction = { Value = ScrollingDirection.Left },
+            TimeRange = { Value = 1000 },
+        };
+
+        private ScrollingHitObjectContainer hitObjectContainer;
+
+        [SetUpSteps]
+        public void SetUp()
+            => AddStep("create SHOC", () => Child = hitObjectContainer = new ScrollingHitObjectContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = 200,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Clock = new FramedClock(new StopwatchClock())
+            });
+
+        protected void AddHitObject(Func<DrawableHitObject> hitObject)
+            => AddStep("add to SHOC", () => hitObjectContainer.Add(hitObject.Invoke()));
+
+        protected void RemoveHitObject(Func<DrawableHitObject> hitObject)
+            => AddStep("remove from SHOC", () => hitObjectContainer.Remove(hitObject.Invoke()));
+
+        protected TObject PrepareObject<TObject>(TObject hitObject)
+            where TObject : TaikoHitObject
+        {
+            hitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            return hitObject;
+        }
+    }
+}

From c103c3691f53364298b517691739a19200ba915f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 20:09:44 +0100
Subject: [PATCH 06859/10326] Add test for bar line application

---
 .../TestBarLineApplication.cs                 | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs
new file mode 100644
index 0000000000..3e5a956d64
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.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 NUnit.Framework;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestBarLineApplication : HitObjectApplicationTestScene
+    {
+        [Test]
+        public void TestApplyNewBarLine()
+        {
+            DrawableBarLine barLine = null;
+
+            AddHitObject(() => barLine = new DrawableBarLine(PrepareObject(new BarLine
+            {
+                StartTime = 400,
+                Major = true
+            })));
+
+            RemoveHitObject(() => barLine);
+
+            AddStep("apply new bar line", () => barLine.Apply(PrepareObject(new BarLine
+            {
+                StartTime = 200,
+                Major = false
+            }), null));
+
+            AddHitObject(() => barLine);
+        }
+    }
+}

From ea09cbddc6944a612e81b29a1236b02081c3d1c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 20:12:54 +0100
Subject: [PATCH 06860/10326] Register bar line pool & use in drawable ruleset

---
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs     | 2 +-
 osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs     | 8 ++++++++
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 18ee903977..7695ca067b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Major = major
             };
 
-            DrawableRuleset.Playfield.Add(new DrawableBarLine(bl));
+            DrawableRuleset.Playfield.Add(bl);
         }
 
         private void addSwell(double duration = default_duration)
diff --git a/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs b/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs
index 83d0a17e09..cb878e8ea0 100644
--- a/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs
@@ -1,11 +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.Allocation;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
     public class BarLinePlayfield : ScrollingPlayfield
     {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RegisterPool<BarLine, DrawableBarLine>(15);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 9ed5480777..bbf8cb8de0 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(new DrawableBarLine(bar)));
+            new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(bar));
 
             FrameStableComponents.Add(scroller = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Scroller), _ => Empty())
             {

From d275418b2598c14f5a217cf96ec45887ad4b7409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 23:17:26 +0100
Subject: [PATCH 06861/10326] Rename and simplify test

---
 .../HitObjectApplicationTestScene.cs               |  9 ++++-----
 ...plication.cs => TestSceneBarLineApplication.cs} | 14 ++++++--------
 2 files changed, 10 insertions(+), 13 deletions(-)
 rename osu.Game.Rulesets.Taiko.Tests/{TestBarLineApplication.cs => TestSceneBarLineApplication.cs} (68%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
index 8e1b01385a..07c7b4d1db 100644
--- a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.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.Testing;
@@ -37,11 +36,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Clock = new FramedClock(new StopwatchClock())
             });
 
-        protected void AddHitObject(Func<DrawableHitObject> hitObject)
-            => AddStep("add to SHOC", () => hitObjectContainer.Add(hitObject.Invoke()));
+        protected void AddHitObject(DrawableHitObject hitObject)
+            => AddStep("add to SHOC", () => hitObjectContainer.Add(hitObject));
 
-        protected void RemoveHitObject(Func<DrawableHitObject> hitObject)
-            => AddStep("remove from SHOC", () => hitObjectContainer.Remove(hitObject.Invoke()));
+        protected void RemoveHitObject(DrawableHitObject hitObject)
+            => AddStep("remove from SHOC", () => hitObjectContainer.Remove(hitObject));
 
         protected TObject PrepareObject<TObject>(TObject hitObject)
             where TObject : TaikoHitObject
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
similarity index 68%
rename from osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs
rename to osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
index 3e5a956d64..65230a07bc 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
@@ -7,28 +7,26 @@ using osu.Game.Rulesets.Taiko.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
-    public class TestBarLineApplication : HitObjectApplicationTestScene
+    public class TestSceneBarLineApplication : HitObjectApplicationTestScene
     {
         [Test]
         public void TestApplyNewBarLine()
         {
-            DrawableBarLine barLine = null;
-
-            AddHitObject(() => barLine = new DrawableBarLine(PrepareObject(new BarLine
+            DrawableBarLine barLine = new DrawableBarLine(PrepareObject(new BarLine
             {
                 StartTime = 400,
                 Major = true
-            })));
+            }));
 
-            RemoveHitObject(() => barLine);
+            AddHitObject(barLine);
+            RemoveHitObject(barLine);
 
             AddStep("apply new bar line", () => barLine.Apply(PrepareObject(new BarLine
             {
                 StartTime = 200,
                 Major = false
             }), null));
-
-            AddHitObject(() => barLine);
+            AddHitObject(barLine);
         }
     }
 }

From 6b78045ff1b35b0d406d43494feda064d97a43ed Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Mon, 14 Dec 2020 06:57:43 +0600
Subject: [PATCH 06862/10326] fix codefactor empty line complaint

---
 osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 7259bf293c..2f817a6c30 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -32,7 +32,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         protected virtual void OnSkinChanged()
         {
-
         }
 
         /// <summary>

From 8da502da4405ad5658a702f67e8ad3eb71e24453 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 17:46:36 +0900
Subject: [PATCH 06863/10326] Separate asymmetric CatchHitObject.X to
 EffectiveX and OriginalX

---
 .../Objects/CatchHitObject.cs                 | 25 +++++++++++--------
 .../Drawables/DrawableCatchHitObject.cs       |  4 +--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index b86b3a7496..9fdd590464 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -16,23 +16,27 @@ namespace osu.Game.Rulesets.Catch.Objects
     {
         public const float OBJECT_RADIUS = 64;
 
-        // This value is after XOffset applied.
-        public readonly Bindable<float> XBindable = new Bindable<float>();
+        public readonly Bindable<float> OriginalXBindable = new Bindable<float>();
 
-        // This value is before XOffset applied.
-        private float originalX;
+        public float OriginalX
+        {
+            get => OriginalXBindable.Value;
+            set => OriginalXBindable.Value = value;
+        }
 
         /// <summary>
         /// The horizontal position of the fruit between 0 and <see cref="CatchPlayfield.WIDTH"/>.
         /// </summary>
         public float X
         {
-            // TODO: I don't like this asymmetry.
-            get => XBindable.Value;
-            // originalX is set by `XBindable.BindValueChanged`
-            set => XBindable.Value = value + xOffset;
+            get => EffectiveX;
+            set => OriginalXBindable.Value = value;
         }
 
+        public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
+
+        public float EffectiveX => EffectiveXBindable.Value;
+
         private float xOffset;
 
         /// <summary>
@@ -40,11 +44,10 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// </summary>
         internal float XOffset
         {
-            get => xOffset;
             set
             {
                 xOffset = value;
-                XBindable.Value = originalX + xOffset;
+                EffectiveXBindable.Value = OriginalX + xOffset;
             }
         }
 
@@ -116,7 +119,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         protected CatchHitObject()
         {
-            XBindable.BindValueChanged(x => originalX = x.NewValue - xOffset);
+            OriginalXBindable.BindValueChanged(change => EffectiveXBindable.Value = change.NewValue + xOffset);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index bfd124c691..131edb650f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -38,14 +38,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             base.OnApply();
 
-            XBindable.BindTo(HitObject.XBindable);
+            XBindable.BindTo(HitObject.EffectiveXBindable);
         }
 
         protected override void OnFree()
         {
             base.OnFree();
 
-            XBindable.UnbindFrom(HitObject.XBindable);
+            XBindable.UnbindFrom(HitObject.EffectiveXBindable);
         }
 
         public Func<CatchHitObject, bool> CheckPosition;

From c1f3f1c231c259ff4b494ce3bdcb3d11d3632469 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 17:47:17 +0900
Subject: [PATCH 06864/10326] Obsolete `X` getter

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 9fdd590464..a5c254f2f1 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.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.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -29,6 +30,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// </summary>
         public float X
         {
+            [Obsolete("Use EffectiveX instead")]
             get => EffectiveX;
             set => OriginalXBindable.Value = value;
         }

From 96f3e0dad8243d221592d99ed39949488d829e6f Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 17:58:53 +0900
Subject: [PATCH 06865/10326] Replace CatchHitObject.X usage to EffectiveX and
 OriginalX

---
 .../CatchBeatmapConversionTest.cs                |  2 +-
 .../TestSceneCatcherArea.cs                      |  2 +-
 .../Beatmaps/CatchBeatmapProcessor.cs            | 14 +++++++-------
 .../Preprocessing/CatchDifficultyHitObject.cs    |  4 ++--
 .../Objects/Drawables/DrawableCatchHitObject.cs  |  2 +-
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs   |  8 ++++----
 .../Replays/CatchAutoGenerator.cs                | 16 ++++++++--------
 osu.Game.Rulesets.Catch/UI/Catcher.cs            |  6 +++---
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index 466cbdaf8d..33fdcdaf1e 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         public float Position
         {
-            get => HitObject?.X ?? position;
+            get => HitObject?.EffectiveX ?? position;
             set => position = value;
         }
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 31c285ef22..5079e57e5e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private void attemptCatch(Fruit fruit)
         {
-            fruit.X += catcher.X;
+            fruit.OriginalX += catcher.X;
             fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty
             {
                 CircleSize = circleSize
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 00ce9ea8c2..fac5d03833 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
                     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;
+                        lastPosition = juiceStream.OriginalX + juiceStream.Path.ControlPoints[^1].Position.Value.X;
 
                         // 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;
@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                             catchObject.XOffset = 0;
 
                             if (catchObject is TinyDroplet)
-                                catchObject.XOffset = Math.Clamp(rng.Next(-20, 20), -catchObject.X, CatchPlayfield.WIDTH - catchObject.X);
+                                catchObject.XOffset = Math.Clamp(rng.Next(-20, 20), -catchObject.OriginalX, CatchPlayfield.WIDTH - catchObject.OriginalX);
                             else if (catchObject is Droplet)
                                 rng.Next(); // osu!stable retrieved a random droplet rotation
                         }
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
         private static void applyHardRockOffset(CatchHitObject hitObject, ref float? lastPosition, ref double lastStartTime, FastRandom rng)
         {
-            float offsetPosition = hitObject.X;
+            float offsetPosition = hitObject.OriginalX;
             double startTime = hitObject.StartTime;
 
             if (lastPosition == null)
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             if (positionDiff == 0)
             {
                 applyRandomOffset(ref offsetPosition, timeDiff / 4d, rng);
-                hitObject.XOffset = offsetPosition - hitObject.X;
+                hitObject.XOffset = offsetPosition - hitObject.OriginalX;
                 return;
             }
 
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             if (Math.Abs(positionDiff) < timeDiff / 3)
                 applyOffset(ref offsetPosition, positionDiff);
 
-            hitObject.XOffset = offsetPosition - hitObject.X;
+            hitObject.XOffset = offsetPosition - hitObject.OriginalX;
 
             lastPosition = offsetPosition;
             lastStartTime = startTime;
@@ -230,9 +230,9 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 currentObject.HyperDashTarget = null;
                 currentObject.DistanceToHyperDash = 0;
 
-                int thisDirection = nextObject.X > currentObject.X ? 1 : -1;
+                int thisDirection = nextObject.EffectiveX > currentObject.EffectiveX ? 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);
+                double distanceToNext = Math.Abs(nextObject.EffectiveX - currentObject.EffectiveX) - (lastDirection == thisDirection ? lastExcess : halfCatcherWidth);
                 float distanceToHyper = (float)(timeToNext * Catcher.BASE_SPEED - distanceToNext);
 
                 if (distanceToHyper < 0)
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
index dcd410e08f..d936ef97ac 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
@@ -32,8 +32,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
             // We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
             var scalingFactor = normalized_hitobject_radius / halfCatcherWidth;
 
-            NormalizedPosition = BaseObject.X * scalingFactor;
-            LastNormalizedPosition = LastObject.X * scalingFactor;
+            NormalizedPosition = BaseObject.EffectiveX * scalingFactor;
+            LastNormalizedPosition = LastObject.EffectiveX * scalingFactor;
 
             // Every strain interval is hard capped at the equivalent of 375 BPM streaming speed as a safety measure
             StrainTime = Math.Max(40, DeltaTime);
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 131edb650f..c511ea5006 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected override double InitialLifetimeOffset => HitObject.TimePreempt;
 
-        protected override float SamplePlaybackPosition => HitObject.X / CatchPlayfield.WIDTH;
+        protected override float SamplePlaybackPosition => HitObject.EffectiveX / CatchPlayfield.WIDTH;
 
         public int RandomSeed => HitObject?.RandomSeed ?? 0;
 
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index d5819935ad..35fd58826e 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
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
-                                X = X + Path.PositionAt(
+                                X = OriginalX + Path.PositionAt(
                                     lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X,
                             });
                         }
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            X = X + Path.PositionAt(e.PathProgress).X,
+                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
 
@@ -104,14 +104,14 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
-                            X = X + Path.PositionAt(e.PathProgress).X,
+                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
                 }
             }
         }
 
-        public float EndX => X + this.CurvePositionAt(1).X;
+        public float EndX => OriginalX + this.CurvePositionAt(1).X;
 
         public double Duration
         {
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index dfc81ee8d9..32e8ab5da7 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Catch.Replays
 
             void moveToNext(PalpableCatchHitObject h)
             {
-                float positionChange = Math.Abs(lastPosition - h.X);
+                float positionChange = Math.Abs(lastPosition - h.EffectiveX);
                 double timeAvailable = h.StartTime - lastTime;
 
                 // So we can either make it there without a dash or not.
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Catch.Replays
                 // todo: get correct catcher size, based on difficulty CS.
                 const float catcher_width_half = CatcherArea.CATCHER_SIZE * 0.3f * 0.5f;
 
-                if (lastPosition - catcher_width_half < h.X && lastPosition + catcher_width_half > h.X)
+                if (lastPosition - catcher_width_half < h.EffectiveX && lastPosition + catcher_width_half > h.EffectiveX)
                 {
                     // we are already in the correct range.
                     lastTime = h.StartTime;
@@ -66,12 +66,12 @@ namespace osu.Game.Rulesets.Catch.Replays
 
                 if (impossibleJump)
                 {
-                    addFrame(h.StartTime, h.X);
+                    addFrame(h.StartTime, h.EffectiveX);
                 }
                 else if (h.HyperDash)
                 {
                     addFrame(h.StartTime - timeAvailable, lastPosition);
-                    addFrame(h.StartTime, h.X);
+                    addFrame(h.StartTime, h.EffectiveX);
                 }
                 else if (dashRequired)
                 {
@@ -80,23 +80,23 @@ namespace osu.Game.Rulesets.Catch.Replays
                     double timeWeNeedToSave = timeAtNormalSpeed - timeAvailable;
                     double timeAtDashSpeed = timeWeNeedToSave / 2;
 
-                    float midPosition = (float)Interpolation.Lerp(lastPosition, h.X, (float)timeAtDashSpeed / timeAvailable);
+                    float midPosition = (float)Interpolation.Lerp(lastPosition, h.EffectiveX, (float)timeAtDashSpeed / timeAvailable);
 
                     // dash movement
                     addFrame(h.StartTime - timeAvailable + 1, lastPosition, true);
                     addFrame(h.StartTime - timeAvailable + timeAtDashSpeed, midPosition);
-                    addFrame(h.StartTime, h.X);
+                    addFrame(h.StartTime, h.EffectiveX);
                 }
                 else
                 {
                     double timeBefore = positionChange / movement_speed;
 
                     addFrame(h.StartTime - timeBefore, lastPosition);
-                    addFrame(h.StartTime, h.X);
+                    addFrame(h.StartTime, h.EffectiveX);
                 }
 
                 lastTime = h.StartTime;
-                lastPosition = h.X;
+                lastPosition = h.EffectiveX;
             }
 
             foreach (var obj in Beatmap.HitObjects)
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index f164c2655a..ed875e7002 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -216,7 +216,7 @@ namespace osu.Game.Rulesets.Catch.UI
             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;
+            var catchObjectPosition = fruit.EffectiveX;
             var catcherPosition = Position.X;
 
             return catchObjectPosition >= catcherPosition - halfCatchWidth &&
@@ -250,10 +250,10 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 var target = hitObject.HyperDashTarget;
                 var timeDifference = target.StartTime - hitObject.StartTime;
-                double positionDifference = target.X - X;
+                double positionDifference = target.EffectiveX - X;
                 var velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
 
-                SetHyperDashState(Math.Abs(velocity), target.X);
+                SetHyperDashState(Math.Abs(velocity), target.EffectiveX);
             }
             else
                 SetHyperDashState();

From cd2db59900f8d8b7f79dea26bb9a035fb334f503 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 11:05:26 +0900
Subject: [PATCH 06866/10326] XBindable -> EffectiveXBindable in catch DHO

---
 .../Objects/Drawables/DrawableCatchHitObject.cs             | 6 +++---
 .../Objects/Drawables/DrawablePalpableCatchHitObject.cs     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index c511ea5006..edd607a443 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
     {
-        public readonly Bindable<float> XBindable = new Bindable<float>();
+        public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
 
         protected override double InitialLifetimeOffset => HitObject.TimePreempt;
 
@@ -38,14 +38,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             base.OnApply();
 
-            XBindable.BindTo(HitObject.EffectiveXBindable);
+            EffectiveXBindable.BindTo(HitObject.EffectiveXBindable);
         }
 
         protected override void OnFree()
         {
             base.OnFree();
 
-            XBindable.UnbindFrom(HitObject.EffectiveXBindable);
+            EffectiveXBindable.UnbindFrom(HitObject.EffectiveXBindable);
         }
 
         public Func<CatchHitObject, bool> CheckPosition;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 7df06bd92d..d3fa43c6b6 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            XBindable.BindValueChanged(x =>
+            EffectiveXBindable.BindValueChanged(x =>
             {
                 X = x.NewValue;
             }, true);

From 089f3bebf57f3be57c8a1b2e525681a62f8d095a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 11:15:49 +0900
Subject: [PATCH 06867/10326] Add doc comments to catch hit object X properties

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index a5c254f2f1..d40821c840 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -19,6 +19,12 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public readonly Bindable<float> OriginalXBindable = new Bindable<float>();
 
+        /// <summary>
+        /// The horizontal position of the hit object between 0 and <see cref="CatchPlayfield.WIDTH"/>.
+        /// </summary>
+        /// <remarks>
+        /// This value is the original value specified in the beatmap, not affected by beatmap processing.
+        /// </remarks>
         public float OriginalX
         {
             get => OriginalXBindable.Value;
@@ -37,12 +43,15 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
 
+        /// <summary>
+        /// The effective horizontal position of the hit object between 0 and <see cref="CatchPlayfield.WIDTH"/>.
+        /// </summary>
         public float EffectiveX => EffectiveXBindable.Value;
 
         private float xOffset;
 
         /// <summary>
-        /// A random offset applied to <see cref="X"/>, set by the <see cref="CatchBeatmapProcessor"/>.
+        /// A random offset applied to the horizontal value, set by the <see cref="CatchBeatmapProcessor"/>.
         /// </summary>
         internal float XOffset
         {

From 36529bdd1b103ea5c5284b70e1cfbf30eec19f2b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 11:25:09 +0900
Subject: [PATCH 06868/10326] Use OriginalX for CatchHitObject.X instead of
 EffectiveX

And explicitly implement IHasXPosition interface to prevent use of the X property.
It should be preferred for beatmap conversion purpose.
---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index d40821c840..6a040efb91 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -31,14 +30,11 @@ namespace osu.Game.Rulesets.Catch.Objects
             set => OriginalXBindable.Value = value;
         }
 
-        /// <summary>
-        /// The horizontal position of the fruit between 0 and <see cref="CatchPlayfield.WIDTH"/>.
-        /// </summary>
+        float IHasXPosition.X => OriginalX;
+
         public float X
         {
-            [Obsolete("Use EffectiveX instead")]
-            get => EffectiveX;
-            set => OriginalXBindable.Value = value;
+            set => OriginalX = value;
         }
 
         public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();

From f621d977fc413835f411e1dc8cc57d61505ca71e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 11:32:34 +0900
Subject: [PATCH 06869/10326] Add some more doc comment

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 6a040efb91..e689d6a178 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// </summary>
         /// <remarks>
         /// This value is the original value specified in the beatmap, not affected by beatmap processing.
+        /// It should be used instead of <see cref="EffectiveX"/> when working on a beatmap, not a gameplay.
         /// </remarks>
         public float OriginalX
         {
@@ -32,6 +33,9 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         float IHasXPosition.X => OriginalX;
 
+        /// <summary>
+        /// An alias of <see cref="OriginalX"/> setter.
+        /// </summary>
         public float X
         {
             set => OriginalX = value;

From 7cbbd74df247626ae917f766bcc6f03cd5e37a27 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 11:38:07 +0900
Subject: [PATCH 06870/10326] Remove X setter from CatchHitObject

---
 .../Mods/TestSceneCatchModRelax.cs            |  8 +++----
 .../TestSceneAutoJuiceStream.cs               |  2 +-
 .../TestSceneCatchModHidden.cs                |  2 +-
 .../TestSceneCatchStacker.cs                  |  2 +-
 .../TestSceneCatcher.cs                       | 22 +++++++++----------
 .../TestSceneCatcherArea.cs                   |  2 +-
 .../TestSceneDrawableHitObjects.cs            |  6 ++---
 .../TestSceneHyperDash.cs                     | 14 ++++++------
 .../TestSceneJuiceStream.cs                   |  4 ++--
 .../Beatmaps/CatchBeatmapConverter.cs         |  4 ++--
 .../Objects/CatchHitObject.cs                 |  8 -------
 .../Objects/JuiceStream.cs                    |  6 ++---
 12 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
index c01aff0aa0..da4834aa73 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -32,22 +32,22 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 {
                     new Fruit
                     {
-                        X = CatchPlayfield.CENTER_X,
+                        OriginalX = CatchPlayfield.CENTER_X,
                         StartTime = 0
                     },
                     new Fruit
                     {
-                        X = 0,
+                        OriginalX = 0,
                         StartTime = 1000
                     },
                     new Fruit
                     {
-                        X = CatchPlayfield.WIDTH,
+                        OriginalX = CatchPlayfield.WIDTH,
                         StartTime = 2000
                     },
                     new JuiceStream
                     {
-                        X = CatchPlayfield.CENTER_X,
+                        OriginalX = CatchPlayfield.CENTER_X,
                         StartTime = 3000,
                         Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 })
                     }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index f552c3c27b..45cf5095f6 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
                 beatmap.HitObjects.Add(new JuiceStream
                 {
-                    X = CatchPlayfield.CENTER_X - width / 2,
+                    OriginalX = CatchPlayfield.CENTER_X - width / 2,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
index f15da29993..6af9c88088 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                         {
                             StartTime = 1000,
                             Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(0, -192) }),
-                            X = CatchPlayfield.WIDTH / 2
+                            OriginalX = CatchPlayfield.WIDTH / 2
                         }
                     }
                 },
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
index 1ff31697b8..d7835bd8c4 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 beatmap.HitObjects.Add(new Fruit
                 {
-                    X = (0.5f + i / 2048f * (i % 10 - 5)) * CatchPlayfield.WIDTH,
+                    OriginalX = (0.5f + i / 2048f * (i % 10 - 5)) * CatchPlayfield.WIDTH,
                     StartTime = i * 100,
                     NewCombo = i % 8 == 0
                 });
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index e8bb57cdf3..d57e8e027e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             JudgementResult result2 = null;
             AddStep("catch hyper fruit", () =>
             {
-                attemptCatch(new Fruit { HyperDashTarget = new Fruit { X = 100 } }, out drawableObject1, out result1);
+                attemptCatch(new Fruit { HyperDashTarget = new Fruit { OriginalX = 100 } }, out drawableObject1, out result1);
             });
             AddStep("catch normal fruit", () =>
             {
@@ -107,14 +107,14 @@ namespace osu.Game.Rulesets.Catch.Tests
             var halfWidth = Catcher.CalculateCatchWidth(new BeatmapDifficulty { CircleSize = 0 }) / 2;
             AddStep("catch fruit", () =>
             {
-                attemptCatch(new Fruit { X = -halfWidth + 1 });
-                attemptCatch(new Fruit { X = halfWidth - 1 });
+                attemptCatch(new Fruit { OriginalX = -halfWidth + 1 });
+                attemptCatch(new Fruit { OriginalX = halfWidth - 1 });
             });
             checkPlate(2);
             AddStep("miss fruit", () =>
             {
-                attemptCatch(new Fruit { X = -halfWidth - 1 });
-                attemptCatch(new Fruit { X = halfWidth + 1 });
+                attemptCatch(new Fruit { OriginalX = -halfWidth - 1 });
+                attemptCatch(new Fruit { OriginalX = halfWidth + 1 });
             });
             checkPlate(2);
         }
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Test]
         public void TestFruitChangesCatcherState()
         {
-            AddStep("miss fruit", () => attemptCatch(new Fruit { X = 100 }));
+            AddStep("miss fruit", () => attemptCatch(new Fruit { OriginalX = 100 }));
             checkState(CatcherAnimationState.Fail);
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             checkState(CatcherAnimationState.Idle);
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper fruit", () => attemptCatch(new Fruit
             {
-                HyperDashTarget = new Fruit { X = 100 }
+                HyperDashTarget = new Fruit { OriginalX = 100 }
             }));
             checkHyperDash(true);
             AddStep("catch normal fruit", () => attemptCatch(new Fruit()));
@@ -147,10 +147,10 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
             {
-                HyperDashTarget = new Fruit { X = 100 }
+                HyperDashTarget = new Fruit { OriginalX = 100 }
             }));
             AddStep("catch tiny droplet", () => attemptCatch(new TinyDroplet()));
-            AddStep("miss tiny droplet", () => attemptCatch(new TinyDroplet { X = 100 }));
+            AddStep("miss tiny droplet", () => attemptCatch(new TinyDroplet { OriginalX = 100 }));
             // catcher state and hyper dash state is preserved
             checkState(CatcherAnimationState.Kiai);
             checkHyperDash(true);
@@ -161,9 +161,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
             {
-                HyperDashTarget = new Fruit { X = 100 }
+                HyperDashTarget = new Fruit { OriginalX = 100 }
             }));
-            AddStep("miss banana", () => attemptCatch(new Banana { X = 100 }));
+            AddStep("miss banana", () => attemptCatch(new Banana { OriginalX = 100 }));
             // catcher state is preserved but hyper dash state is reset
             checkState(CatcherAnimationState.Kiai);
             checkHyperDash(false);
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 5079e57e5e..423c3b7a13 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             AddStep("catch fruit last in combo", () => attemptCatch(new Fruit { LastInCombo = true }));
             AddStep("catch kiai fruit", () => attemptCatch(new TestSceneCatcher.TestKiaiFruit()));
-            AddStep("miss last in combo", () => attemptCatch(new Fruit { X = 100, LastInCombo = true }));
+            AddStep("miss last in combo", () => attemptCatch(new Fruit { OriginalX = 100, LastInCombo = true }));
         }
 
         private void attemptCatch(Fruit fruit)
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
index 3e4995482d..2db534e8c9 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 var fruit = new Fruit
                 {
-                    X = getXCoords(hit),
+                    OriginalX = getXCoords(hit),
                     LastInCombo = i % 4 == 0,
                     StartTime = playfieldTime + 800 + (200 * i)
                 };
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             var juice = new JuiceStream
             {
-                X = xCoords,
+                OriginalX = xCoords,
                 StartTime = playfieldTime + 1000,
                 Path = new SliderPath(PathType.Linear, new[]
                 {
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 var banana = new Banana
                 {
-                    X = getXCoords(hit),
+                    OriginalX = getXCoords(hit),
                     LastInCombo = i % 4 == 0,
                     StartTime = playfieldTime + 800 + (200 * i)
                 };
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index db09b2bc6b..67af3c4420 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -70,20 +70,20 @@ namespace osu.Game.Rulesets.Catch.Tests
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint());
 
             // Should produce a hyper-dash (edge case test)
-            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56, NewCombo = true });
-            beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308, NewCombo = true });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, OriginalX = 56, NewCombo = true });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 2008, OriginalX = 308, NewCombo = true });
 
             double startTime = 3000;
 
             const float left_x = 0.02f * CatchPlayfield.WIDTH;
             const float right_x = 0.98f * CatchPlayfield.WIDTH;
 
-            createObjects(() => new Fruit { X = left_x });
+            createObjects(() => new Fruit { OriginalX = 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 Fruit { OriginalX = right_x });
+            createObjects(() => new Fruit { OriginalX = left_x });
+            createObjects(() => new Fruit { OriginalX = right_x });
             createObjects(() => new TestJuiceStream(left_x), 1);
 
             beatmap.ControlPointInfo.Add(startTime, new TimingControlPoint
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             public TestJuiceStream(float x)
             {
-                X = x;
+                OriginalX = x;
 
                 Path = new SliderPath(new[]
                 {
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
index 269e783899..dbcf382d62 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 new JuiceStream
                 {
-                    X = CatchPlayfield.CENTER_X,
+                    OriginalX = CatchPlayfield.CENTER_X,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 },
                 new Banana
                 {
-                    X = CatchPlayfield.CENTER_X,
+                    OriginalX = CatchPlayfield.CENTER_X,
                     StartTime = 1000,
                     NewCombo = true
                 }
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 34964fc4ae..55e86a7be2 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         Path = curveData.Path,
                         NodeSamples = curveData.NodeSamples,
                         RepeatCount = curveData.RepeatCount,
-                        X = positionData?.X ?? 0,
+                        OriginalX = positionData?.X ?? 0,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
                         LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         Samples = obj.Samples,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
-                        X = positionData?.X ?? 0
+                        OriginalX = positionData?.X ?? 0
                     }.Yield();
             }
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index e689d6a178..ebbbd44960 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -33,14 +33,6 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         float IHasXPosition.X => OriginalX;
 
-        /// <summary>
-        /// An alias of <see cref="OriginalX"/> setter.
-        /// </summary>
-        public float X
-        {
-            set => OriginalX = value;
-        }
-
         public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 35fd58826e..bda0457c83 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
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
-                                X = OriginalX + Path.PositionAt(
+                                OriginalX = OriginalX + Path.PositionAt(
                                     lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X,
                             });
                         }
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            OriginalX = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
 
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
-                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            OriginalX = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
                 }

From 1794bfeddba4b8533d10f9854f06a0f5e9731cc7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 14 Dec 2020 13:07:55 +0900
Subject: [PATCH 06871/10326] Move offset into legacy mania judgement

---
 .../Legacy/LegacyManiaJudgementPiece.cs       | 84 +++++++++++++++++++
 .../Legacy/ManiaLegacySkinTransformer.cs      |  3 +-
 .../UI/DrawableManiaJudgement.cs              | 53 +++++-------
 osu.Game.Rulesets.Mania/UI/Stage.cs           |  8 +-
 .../UI/Scrolling/ScrollingPlayfield.cs        |  9 --
 5 files changed, 108 insertions(+), 49 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
new file mode 100644
index 0000000000..464d754205
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
@@ -0,0 +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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
+{
+    public class LegacyManiaJudgementPiece : CompositeDrawable, IAnimatableJudgement
+    {
+        private readonly HitResult result;
+        private readonly Drawable animation;
+
+        public LegacyManiaJudgementPiece(HitResult result, Drawable animation)
+        {
+            this.result = result;
+            this.animation = animation;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            float? scorePosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)?.Value;
+
+            if (scorePosition != null)
+                scorePosition -= Stage.HIT_TARGET_POSITION + 150;
+
+            Y = scorePosition ?? 0;
+
+            if (animation != null)
+                InternalChild = animation;
+        }
+
+        public void PlayAnimation()
+        {
+            if (animation == null)
+                return;
+
+            (animation as IFramedAnimation)?.GotoFrame(0);
+
+            switch (result)
+            {
+                case HitResult.None:
+                    break;
+
+                case HitResult.Miss:
+                    animation.ScaleTo(1.6f);
+                    animation.ScaleTo(1, 100, Easing.In);
+
+                    animation.MoveTo(Vector2.Zero);
+                    animation.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+
+                    animation.RotateTo(0);
+                    animation.RotateTo(40, 800, Easing.InQuint);
+
+                    this.FadeOutFromOne(800);
+                    break;
+
+                default:
+                    animation.ScaleTo(0.8f);
+                    animation.ScaleTo(1, 250, Easing.OutElastic);
+
+                    animation.Delay(50).ScaleTo(0.75f, 250);
+
+                    this.Delay(50).FadeOut(200);
+                    break;
+            }
+        }
+
+        public Drawable GetAboveHitObjectsProxiedContent() => null;
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 89f639e2fe..7e2a8823b6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -136,7 +136,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             string filename = this.GetManiaSkinConfig<string>(hitresult_mapping[result])?.Value
                               ?? default_hitresult_skin_filenames[result];
 
-            return this.GetAnimation(filename, true, true);
+            var animation = this.GetAnimation(filename, true, true);
+            return animation == null ? null : new LegacyManiaJudgementPiece(result, animation);
         }
 
         public override SampleChannel GetSample(ISampleInfo sampleInfo)
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
index a3dcd0e57f..34d972e60f 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -20,37 +19,6 @@ namespace osu.Game.Rulesets.Mania.UI
         {
         }
 
-        protected override void ApplyMissAnimations()
-        {
-            if (!(JudgementBody.Drawable is DefaultManiaJudgementPiece))
-            {
-                // this is temporary logic until mania's skin transformer returns IAnimatableJudgements
-                JudgementBody.ScaleTo(1.6f);
-                JudgementBody.ScaleTo(1, 100, Easing.In);
-
-                JudgementBody.MoveTo(Vector2.Zero);
-                JudgementBody.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
-
-                JudgementBody.RotateTo(0);
-                JudgementBody.RotateTo(40, 800, Easing.InQuint);
-                JudgementBody.FadeOutFromOne(800);
-
-                LifetimeEnd = JudgementBody.LatestTransformEndTime;
-            }
-
-            base.ApplyMissAnimations();
-        }
-
-        protected override void ApplyHitAnimations()
-        {
-            JudgementBody.ScaleTo(0.8f);
-            JudgementBody.ScaleTo(1, 250, Easing.OutElastic);
-
-            JudgementBody.Delay(50)
-                         .ScaleTo(0.75f, 250)
-                         .FadeOut(200);
-        }
-
         protected override Drawable CreateDefaultJudgement(HitResult result) => new DefaultManiaJudgementPiece(result);
 
         private class DefaultManiaJudgementPiece : DefaultJudgementPiece
@@ -66,6 +34,27 @@ namespace osu.Game.Rulesets.Mania.UI
 
                 JudgementText.Font = JudgementText.Font.With(size: 25);
             }
+
+            public override void PlayAnimation()
+            {
+                base.PlayAnimation();
+
+                switch (Result)
+                {
+                    case HitResult.None:
+                    case HitResult.Miss:
+                        break;
+
+                    default:
+                        this.ScaleTo(0.8f);
+                        this.ScaleTo(1, 250, Easing.OutElastic);
+
+                        this.Delay(50)
+                            .ScaleTo(0.75f, 250)
+                            .FadeOut(200);
+                        break;
+                }
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index d2f5e6902a..dc34bffab1 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -107,6 +106,7 @@ namespace osu.Game.Rulesets.Mania.UI
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.Centre,
                             RelativeSizeAxes = Axes.Both,
+                            Y = HIT_TARGET_POSITION + 150
                         },
                         topLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
                     }
@@ -181,12 +181,6 @@ namespace osu.Game.Rulesets.Mania.UI
             }));
         }
 
-        protected override void OnSkinChanged()
-        {
-            judgements.Y = CurrentSkin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)
-                                                   ?.Value ?? HIT_TARGET_POSITION + 150;
-        }
-
         protected override void Update()
         {
             // Due to masking differences, it is not possible to get the width of the columns container automatically
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 4f76198b9f..844a249769 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -20,20 +20,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         [Resolved]
         protected IScrollingInfo ScrollingInfo { get; private set; }
-        protected ISkinSource CurrentSkin { get; private set; }
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
             Direction.BindTo(ScrollingInfo.Direction);
-            CurrentSkin = skin;
-
-            skin.SourceChanged += OnSkinChanged;
-            OnSkinChanged();
-        }
-
-        protected virtual void OnSkinChanged()
-        {
         }
 
         /// <summary>

From 028909353c8dc5b027a05ae5fb995ee278db9ede Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 14 Dec 2020 13:15:52 +0900
Subject: [PATCH 06872/10326] Revert one more change

---
 osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 844a249769..475300c483 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         protected IScrollingInfo ScrollingInfo { get; private set; }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        private void load()
         {
             Direction.BindTo(ScrollingInfo.Direction);
         }

From d96399ea42130f3727d0188aa1ec8a0855c0b4b7 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 13:18:14 +0900
Subject: [PATCH 06873/10326] Revert "Remove X setter from CatchHitObject"

This reverts commit 7cbbd74d
---
 .../Mods/TestSceneCatchModRelax.cs            |  8 +++----
 .../TestSceneAutoJuiceStream.cs               |  2 +-
 .../TestSceneCatchModHidden.cs                |  2 +-
 .../TestSceneCatchStacker.cs                  |  2 +-
 .../TestSceneCatcher.cs                       | 22 +++++++++----------
 .../TestSceneCatcherArea.cs                   |  2 +-
 .../TestSceneDrawableHitObjects.cs            |  6 ++---
 .../TestSceneHyperDash.cs                     | 14 ++++++------
 .../TestSceneJuiceStream.cs                   |  4 ++--
 .../Beatmaps/CatchBeatmapConverter.cs         |  4 ++--
 .../Objects/CatchHitObject.cs                 |  8 +++++++
 .../Objects/JuiceStream.cs                    |  6 ++---
 12 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
index da4834aa73..c01aff0aa0 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -32,22 +32,22 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 {
                     new Fruit
                     {
-                        OriginalX = CatchPlayfield.CENTER_X,
+                        X = CatchPlayfield.CENTER_X,
                         StartTime = 0
                     },
                     new Fruit
                     {
-                        OriginalX = 0,
+                        X = 0,
                         StartTime = 1000
                     },
                     new Fruit
                     {
-                        OriginalX = CatchPlayfield.WIDTH,
+                        X = CatchPlayfield.WIDTH,
                         StartTime = 2000
                     },
                     new JuiceStream
                     {
-                        OriginalX = CatchPlayfield.CENTER_X,
+                        X = CatchPlayfield.CENTER_X,
                         StartTime = 3000,
                         Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 })
                     }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 45cf5095f6..f552c3c27b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
                 beatmap.HitObjects.Add(new JuiceStream
                 {
-                    OriginalX = CatchPlayfield.CENTER_X - width / 2,
+                    X = CatchPlayfield.CENTER_X - width / 2,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
index 6af9c88088..f15da29993 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                         {
                             StartTime = 1000,
                             Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(0, -192) }),
-                            OriginalX = CatchPlayfield.WIDTH / 2
+                            X = CatchPlayfield.WIDTH / 2
                         }
                     }
                 },
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
index d7835bd8c4..1ff31697b8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 beatmap.HitObjects.Add(new Fruit
                 {
-                    OriginalX = (0.5f + i / 2048f * (i % 10 - 5)) * CatchPlayfield.WIDTH,
+                    X = (0.5f + i / 2048f * (i % 10 - 5)) * CatchPlayfield.WIDTH,
                     StartTime = i * 100,
                     NewCombo = i % 8 == 0
                 });
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index d57e8e027e..e8bb57cdf3 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             JudgementResult result2 = null;
             AddStep("catch hyper fruit", () =>
             {
-                attemptCatch(new Fruit { HyperDashTarget = new Fruit { OriginalX = 100 } }, out drawableObject1, out result1);
+                attemptCatch(new Fruit { HyperDashTarget = new Fruit { X = 100 } }, out drawableObject1, out result1);
             });
             AddStep("catch normal fruit", () =>
             {
@@ -107,14 +107,14 @@ namespace osu.Game.Rulesets.Catch.Tests
             var halfWidth = Catcher.CalculateCatchWidth(new BeatmapDifficulty { CircleSize = 0 }) / 2;
             AddStep("catch fruit", () =>
             {
-                attemptCatch(new Fruit { OriginalX = -halfWidth + 1 });
-                attemptCatch(new Fruit { OriginalX = halfWidth - 1 });
+                attemptCatch(new Fruit { X = -halfWidth + 1 });
+                attemptCatch(new Fruit { X = halfWidth - 1 });
             });
             checkPlate(2);
             AddStep("miss fruit", () =>
             {
-                attemptCatch(new Fruit { OriginalX = -halfWidth - 1 });
-                attemptCatch(new Fruit { OriginalX = halfWidth + 1 });
+                attemptCatch(new Fruit { X = -halfWidth - 1 });
+                attemptCatch(new Fruit { X = halfWidth + 1 });
             });
             checkPlate(2);
         }
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Test]
         public void TestFruitChangesCatcherState()
         {
-            AddStep("miss fruit", () => attemptCatch(new Fruit { OriginalX = 100 }));
+            AddStep("miss fruit", () => attemptCatch(new Fruit { X = 100 }));
             checkState(CatcherAnimationState.Fail);
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             checkState(CatcherAnimationState.Idle);
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper fruit", () => attemptCatch(new Fruit
             {
-                HyperDashTarget = new Fruit { OriginalX = 100 }
+                HyperDashTarget = new Fruit { X = 100 }
             }));
             checkHyperDash(true);
             AddStep("catch normal fruit", () => attemptCatch(new Fruit()));
@@ -147,10 +147,10 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
             {
-                HyperDashTarget = new Fruit { OriginalX = 100 }
+                HyperDashTarget = new Fruit { X = 100 }
             }));
             AddStep("catch tiny droplet", () => attemptCatch(new TinyDroplet()));
-            AddStep("miss tiny droplet", () => attemptCatch(new TinyDroplet { OriginalX = 100 }));
+            AddStep("miss tiny droplet", () => attemptCatch(new TinyDroplet { X = 100 }));
             // catcher state and hyper dash state is preserved
             checkState(CatcherAnimationState.Kiai);
             checkHyperDash(true);
@@ -161,9 +161,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
             {
-                HyperDashTarget = new Fruit { OriginalX = 100 }
+                HyperDashTarget = new Fruit { X = 100 }
             }));
-            AddStep("miss banana", () => attemptCatch(new Banana { OriginalX = 100 }));
+            AddStep("miss banana", () => attemptCatch(new Banana { X = 100 }));
             // catcher state is preserved but hyper dash state is reset
             checkState(CatcherAnimationState.Kiai);
             checkHyperDash(false);
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 423c3b7a13..5079e57e5e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             AddStep("catch fruit last in combo", () => attemptCatch(new Fruit { LastInCombo = true }));
             AddStep("catch kiai fruit", () => attemptCatch(new TestSceneCatcher.TestKiaiFruit()));
-            AddStep("miss last in combo", () => attemptCatch(new Fruit { OriginalX = 100, LastInCombo = true }));
+            AddStep("miss last in combo", () => attemptCatch(new Fruit { X = 100, LastInCombo = true }));
         }
 
         private void attemptCatch(Fruit fruit)
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
index 2db534e8c9..3e4995482d 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 var fruit = new Fruit
                 {
-                    OriginalX = getXCoords(hit),
+                    X = getXCoords(hit),
                     LastInCombo = i % 4 == 0,
                     StartTime = playfieldTime + 800 + (200 * i)
                 };
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             var juice = new JuiceStream
             {
-                OriginalX = xCoords,
+                X = xCoords,
                 StartTime = playfieldTime + 1000,
                 Path = new SliderPath(PathType.Linear, new[]
                 {
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 var banana = new Banana
                 {
-                    OriginalX = getXCoords(hit),
+                    X = getXCoords(hit),
                     LastInCombo = i % 4 == 0,
                     StartTime = playfieldTime + 800 + (200 * i)
                 };
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 67af3c4420..db09b2bc6b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -70,20 +70,20 @@ namespace osu.Game.Rulesets.Catch.Tests
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint());
 
             // Should produce a hyper-dash (edge case test)
-            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, OriginalX = 56, NewCombo = true });
-            beatmap.HitObjects.Add(new Fruit { StartTime = 2008, OriginalX = 308, NewCombo = true });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56, NewCombo = true });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308, NewCombo = true });
 
             double startTime = 3000;
 
             const float left_x = 0.02f * CatchPlayfield.WIDTH;
             const float right_x = 0.98f * CatchPlayfield.WIDTH;
 
-            createObjects(() => new Fruit { OriginalX = left_x });
+            createObjects(() => new Fruit { X = left_x });
             createObjects(() => new TestJuiceStream(right_x), 1);
             createObjects(() => new TestJuiceStream(left_x), 1);
-            createObjects(() => new Fruit { OriginalX = right_x });
-            createObjects(() => new Fruit { OriginalX = left_x });
-            createObjects(() => new Fruit { OriginalX = right_x });
+            createObjects(() => new Fruit { X = right_x });
+            createObjects(() => new Fruit { X = left_x });
+            createObjects(() => new Fruit { X = right_x });
             createObjects(() => new TestJuiceStream(left_x), 1);
 
             beatmap.ControlPointInfo.Add(startTime, new TimingControlPoint
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             public TestJuiceStream(float x)
             {
-                OriginalX = x;
+                X = x;
 
                 Path = new SliderPath(new[]
                 {
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
index dbcf382d62..269e783899 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 new JuiceStream
                 {
-                    OriginalX = CatchPlayfield.CENTER_X,
+                    X = CatchPlayfield.CENTER_X,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 },
                 new Banana
                 {
-                    OriginalX = CatchPlayfield.CENTER_X,
+                    X = CatchPlayfield.CENTER_X,
                     StartTime = 1000,
                     NewCombo = true
                 }
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 55e86a7be2..34964fc4ae 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         Path = curveData.Path,
                         NodeSamples = curveData.NodeSamples,
                         RepeatCount = curveData.RepeatCount,
-                        OriginalX = positionData?.X ?? 0,
+                        X = positionData?.X ?? 0,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
                         LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         Samples = obj.Samples,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
-                        OriginalX = positionData?.X ?? 0
+                        X = positionData?.X ?? 0
                     }.Yield();
             }
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index ebbbd44960..e689d6a178 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -33,6 +33,14 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         float IHasXPosition.X => OriginalX;
 
+        /// <summary>
+        /// An alias of <see cref="OriginalX"/> setter.
+        /// </summary>
+        public float X
+        {
+            set => OriginalX = value;
+        }
+
         public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index bda0457c83..35fd58826e 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
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
-                                OriginalX = OriginalX + Path.PositionAt(
+                                X = OriginalX + Path.PositionAt(
                                     lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X,
                             });
                         }
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            OriginalX = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
 
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
-                            OriginalX = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
                 }

From 0ad256a7626c6aa28c97f64ecc9bc9a1940c2f87 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 13:18:32 +0900
Subject: [PATCH 06874/10326] Fix comment

---
 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 e689d6a178..6267eca7de 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         private float xOffset;
 
         /// <summary>
-        /// A random offset applied to the horizontal value, set by the <see cref="CatchBeatmapProcessor"/>.
+        /// A random offset applied to the horizontal position, set by the <see cref="CatchBeatmapProcessor"/>.
         /// </summary>
         internal float XOffset
         {

From 2e88e283d84c0547fd2f8272be87de6ccd8375d2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 14 Dec 2020 13:20:51 +0900
Subject: [PATCH 06875/10326] Remove unused using

---
 osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 475300c483..2b75f93f9e 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI.Scrolling

From 5b5e883904298074b80671e87e0b88eca883127c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 13:39:07 +0900
Subject: [PATCH 06876/10326] Remove EffectiveXBindable (setting Value was not
 handled)

And use orthogonal `OriginalXBindable` and `XOffsetBindable`.
---
 .../TestSceneCatcherArea.cs                   |  2 +-
 .../Objects/CatchHitObject.cs                 | 52 +++++++------------
 .../Drawables/DrawableCatchHitObject.cs       |  9 ++--
 .../DrawablePalpableCatchHitObject.cs         |  6 +--
 4 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 5079e57e5e..1cbfa6338e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private void attemptCatch(Fruit fruit)
         {
-            fruit.OriginalX += catcher.X;
+            fruit.X = fruit.OriginalX + catcher.X;
             fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty
             {
                 CircleSize = circleSize
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 6267eca7de..ae45182960 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -21,46 +20,40 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// <summary>
         /// The horizontal position of the hit object between 0 and <see cref="CatchPlayfield.WIDTH"/>.
         /// </summary>
-        /// <remarks>
-        /// This value is the original value specified in the beatmap, not affected by beatmap processing.
-        /// It should be used instead of <see cref="EffectiveX"/> when working on a beatmap, not a gameplay.
-        /// </remarks>
-        public float OriginalX
+        public float X
         {
-            get => OriginalXBindable.Value;
             set => OriginalXBindable.Value = value;
         }
 
-        float IHasXPosition.X => OriginalX;
+        float IHasXPosition.X => OriginalXBindable.Value;
+
+        public readonly Bindable<float> XOffsetBindable = new Bindable<float>();
 
         /// <summary>
-        /// An alias of <see cref="OriginalX"/> setter.
+        /// A random offset applied to the horizontal position, set by the beatmap processing.
         /// </summary>
-        public float X
+        public float XOffset
         {
-            set => OriginalX = value;
+            set => XOffsetBindable.Value = value;
         }
 
-        public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
+        /// <summary>
+        /// The horizontal position of the hit object between 0 and <see cref="CatchPlayfield.WIDTH"/>.
+        /// </summary>
+        /// <remarks>
+        /// This value is the original <see cref="X"/> value specified in the beatmap, not affected by the beatmap processing.
+        /// Use <see cref="EffectiveX"/> for a gameplay.
+        /// </remarks>
+        public float OriginalX => OriginalXBindable.Value;
 
         /// <summary>
         /// The effective horizontal position of the hit object between 0 and <see cref="CatchPlayfield.WIDTH"/>.
         /// </summary>
-        public float EffectiveX => EffectiveXBindable.Value;
-
-        private float xOffset;
-
-        /// <summary>
-        /// A random offset applied to the horizontal position, set by the <see cref="CatchBeatmapProcessor"/>.
-        /// </summary>
-        internal float XOffset
-        {
-            set
-            {
-                xOffset = value;
-                EffectiveXBindable.Value = OriginalX + xOffset;
-            }
-        }
+        /// <remarks>
+        /// This value is the original <see cref="X"/> value plus the offset applied by the beatmap processing.
+        /// Use <see cref="OriginalX"/> if a value not affected by the offset is desired.
+        /// </remarks>
+        public float EffectiveX => OriginalXBindable.Value + XOffsetBindable.Value;
 
         public double TimePreempt = 1000;
 
@@ -127,10 +120,5 @@ namespace osu.Game.Rulesets.Catch.Objects
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
-
-        protected CatchHitObject()
-        {
-            OriginalXBindable.BindValueChanged(change => EffectiveXBindable.Value = change.NewValue + xOffset);
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index edd607a443..0c065948ef 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -15,7 +15,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
     {
-        public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
+        public readonly Bindable<float> OriginalXBindable = new Bindable<float>();
+        public readonly Bindable<float> XOffsetBindable = new Bindable<float>();
 
         protected override double InitialLifetimeOffset => HitObject.TimePreempt;
 
@@ -38,14 +39,16 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             base.OnApply();
 
-            EffectiveXBindable.BindTo(HitObject.EffectiveXBindable);
+            OriginalXBindable.BindTo(HitObject.OriginalXBindable);
+            XOffsetBindable.BindTo(HitObject.XOffsetBindable);
         }
 
         protected override void OnFree()
         {
             base.OnFree();
 
-            EffectiveXBindable.UnbindFrom(HitObject.EffectiveXBindable);
+            OriginalXBindable.UnbindFrom(HitObject.OriginalXBindable);
+            XOffsetBindable.UnbindFrom(HitObject.XOffsetBindable);
         }
 
         public Func<CatchHitObject, bool> CheckPosition;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index d3fa43c6b6..84af7922f9 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -55,10 +55,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            EffectiveXBindable.BindValueChanged(x =>
-            {
-                X = x.NewValue;
-            }, true);
+            OriginalXBindable.BindValueChanged(_ => X = OriginalXBindable.Value + XOffsetBindable.Value);
+            XOffsetBindable.BindValueChanged(_ => X = OriginalXBindable.Value + XOffsetBindable.Value, true);
 
             ScaleBindable.BindValueChanged(scale =>
             {

From b81dbfc1921dabe9b846d752c7b4ca2a2a347c6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 13:56:46 +0900
Subject: [PATCH 06877/10326] Move shared implementation to a named function

---
 .../Objects/Drawables/DrawablePalpableCatchHitObject.cs  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 84af7922f9..27cd7ed2bc 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -55,8 +55,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            OriginalXBindable.BindValueChanged(_ => X = OriginalXBindable.Value + XOffsetBindable.Value);
-            XOffsetBindable.BindValueChanged(_ => X = OriginalXBindable.Value + XOffsetBindable.Value, true);
+            OriginalXBindable.BindValueChanged(updateXPosition);
+            XOffsetBindable.BindValueChanged(updateXPosition, true);
 
             ScaleBindable.BindValueChanged(scale =>
             {
@@ -67,6 +67,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             IndexInBeatmap.BindValueChanged(_ => UpdateComboColour());
         }
 
+        private void updateXPosition(ValueChangedEvent<float> _)
+        {
+            X = OriginalXBindable.Value + XOffsetBindable.Value;
+        }
+
         protected override void OnApply()
         {
             base.OnApply();

From a835ca9612e29fa71d66c852a0e4f5401bd3a465 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 14 Dec 2020 14:20:43 +0900
Subject: [PATCH 06878/10326] Fix anchors/origins for legacy pieces

---
 .../Skinning/Legacy/LegacyManiaJudgementPiece.cs          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
index 464d754205..9684cbb167 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
@@ -40,7 +40,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             Y = scorePosition ?? 0;
 
             if (animation != null)
-                InternalChild = animation;
+            {
+                InternalChild = animation.With(d =>
+                {
+                    d.Anchor = Anchor.Centre;
+                    d.Origin = Anchor.Centre;
+                });
+            }
         }
 
         public void PlayAnimation()

From 0d7f53b0b9b8d83835ac16aaf32d032c15b68dc9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 14:21:21 +0900
Subject: [PATCH 06879/10326] Fix gameplay loading too fast the first time
 entering a beatmap

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

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 729119fa36..f59b36bc42 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Screens.Play
 
             // after an initial delay, start the debounced load check.
             // this will continue to execute even after resuming back on restart.
-            Scheduler.Add(new ScheduledDelegate(pushWhenLoaded, 1800, 0));
+            Scheduler.Add(new ScheduledDelegate(pushWhenLoaded, Clock.CurrentTime + 1800, 0));
 
             showMuteWarningIfNeeded();
         }

From 704150306324135bbb6ba4957627619fa294548c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 15:34:32 +0900
Subject: [PATCH 06880/10326] Avoid intermediary delegate

---
 .../Objects/Drawables/DrawableBarLine.cs                  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
index e7dd9a18c2..9e50faabc1 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
@@ -111,13 +111,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            major.BindValueChanged(majorChanged => updateMajor(majorChanged.NewValue), true);
+            major.BindValueChanged(updateMajor);
         }
 
-        private void updateMajor(bool major)
+        private void updateMajor(ValueChangedEvent<bool> major)
         {
-            line.Alpha = major ? 1f : 0.75f;
-            triangleContainer.Alpha = major ? 1 : 0;
+            line.Alpha = major.NewValue ? 1f : 0.75f;
+            triangleContainer.Alpha = major.NewValue ? 1 : 0;
         }
 
         protected override void OnApply()

From 51e8a05f181de7f34ef7b2f4290a3693069119e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 16:44:29 +0900
Subject: [PATCH 06881/10326] Seal SetRecordTarget method to simplify
 modification

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

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index c1a601eaae..b66a09aef1 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -268,7 +268,7 @@ namespace osu.Game.Rulesets.UI
             return false;
         }
 
-        public override void SetRecordTarget(Replay recordingReplay)
+        public sealed override void SetRecordTarget(Replay recordingReplay)
         {
             if (!(KeyBindingInputManager is IHasRecordingHandler recordingInputManager))
                 throw new InvalidOperationException($"A {nameof(KeyBindingInputManager)} which supports recording is not available");

From 1793385e96270a9b07050845b37b14fde04fe5c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 16:52:14 +0900
Subject: [PATCH 06882/10326] Pass a score to the replay recorder to allow
 reading more general scoring data

---
 osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs      |  4 ++--
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs     |  3 ++-
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs     |  3 ++-
 osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs      |  6 +++---
 osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs         |  3 ++-
 osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs          |  6 +++---
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs     |  3 ++-
 osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs      |  6 +++---
 .../Visual/Gameplay/TestSceneReplayRecorder.cs         |  5 +++--
 .../Visual/Gameplay/TestSceneReplayRecording.cs        |  5 +++--
 .../Visual/Gameplay/TestSceneSpectatorPlayback.cs      |  3 ++-
 osu.Game/Rulesets/UI/DrawableRuleset.cs                | 10 +++++-----
 osu.Game/Rulesets/UI/ReplayRecorder.cs                 | 10 +++++-----
 osu.Game/Screens/Play/Player.cs                        |  8 ++++----
 14 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs b/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs
index 9a4d1f9585..1ddb5ac630 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs
@@ -2,10 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Catch.UI
     {
         private readonly CatchPlayfield playfield;
 
-        public CatchReplayRecorder(Replay target, CatchPlayfield playfield)
+        public CatchReplayRecorder(Score target, CatchPlayfield playfield)
             : base(target)
         {
             this.playfield = playfield;
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index 46733181e3..9389fa803b 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -31,7 +32,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);
 
-        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new CatchReplayRecorder(replay, (CatchPlayfield)Playfield);
+        protected override ReplayRecorder CreateReplayRecorder(Score score) => new CatchReplayRecorder(score, (CatchPlayfield)Playfield);
 
         protected override Playfield CreatePlayfield() => new CatchPlayfield(Beatmap.BeatmapInfo.BaseDifficulty, CreateDrawableRepresentation);
 
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 7f5b9a6ee0..941ac9816c 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -23,6 +23,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -132,6 +133,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new ManiaFramedReplayInputHandler(replay);
 
-        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new ManiaReplayRecorder(replay);
+        protected override ReplayRecorder CreateReplayRecorder(Score score) => new ManiaReplayRecorder(score);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs b/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
index 18275000a2..b502d1f9e5 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
@@ -2,18 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
     public class ManiaReplayRecorder : ReplayRecorder<ManiaAction>
     {
-        public ManiaReplayRecorder(Replay replay)
-            : base(replay)
+        public ManiaReplayRecorder(Score score)
+            : base(score)
         {
         }
 
diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index 69179137a6..df3f7c64e4 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osuTK;
 
@@ -44,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new OsuFramedReplayInputHandler(replay);
 
-        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new OsuReplayRecorder(replay);
+        protected override ReplayRecorder CreateReplayRecorder(Score score) => new OsuReplayRecorder(score);
 
         public override double GameplayStartTime
         {
diff --git a/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs b/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
index b68ea136d5..1304dfe416 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
@@ -2,18 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
     public class OsuReplayRecorder : ReplayRecorder<OsuAction>
     {
-        public OsuReplayRecorder(Replay replay)
-            : base(replay)
+        public OsuReplayRecorder(Score score)
+            : base(score)
         {
         }
 
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index bbf8cb8de0..9cf931ee0a 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -17,6 +17,7 @@ using osu.Game.Replays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -82,6 +83,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new TaikoFramedReplayInputHandler(replay);
 
-        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new TaikoReplayRecorder(replay);
+        protected override ReplayRecorder CreateReplayRecorder(Score score) => new TaikoReplayRecorder(score);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs b/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs
index 1859dabf03..e6391d1386 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs
@@ -2,18 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Taiko.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
     public class TaikoReplayRecorder : ReplayRecorder<TaikoAction>
     {
-        public TaikoReplayRecorder(Replay replay)
-            : base(replay)
+        public TaikoReplayRecorder(Score score)
+            : base(score)
         {
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index b72960931f..b2ad7ca5b4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -19,6 +19,7 @@ using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
@@ -53,7 +54,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         recordingManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
-                            Recorder = recorder = new TestReplayRecorder(replay)
+                            Recorder = recorder = new TestReplayRecorder(new Score { Replay = replay })
                             {
                                 ScreenSpaceToGamefield = pos => recordingManager.ToLocalSpace(pos),
                             },
@@ -271,7 +272,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         internal class TestReplayRecorder : ReplayRecorder<TestAction>
         {
-            public TestReplayRecorder(Replay target)
+            public TestReplayRecorder(Score target)
                 : base(target)
             {
             }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
index 6872b6a669..40c4214749 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
@@ -15,6 +15,7 @@ using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
@@ -44,7 +45,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         recordingManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
-                            Recorder = new TestReplayRecorder(replay)
+                            Recorder = new TestReplayRecorder(new Score { Replay = replay })
                             {
                                 ScreenSpaceToGamefield = pos => recordingManager.ToLocalSpace(pos)
                             },
@@ -206,7 +207,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
     internal class TestReplayRecorder : ReplayRecorder<TestAction>
     {
-        public TestReplayRecorder(Replay target)
+        public TestReplayRecorder(Score target)
             : base(target)
         {
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 35473ee76c..e148fa381c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -27,6 +27,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
@@ -348,7 +349,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         internal class TestReplayRecorder : ReplayRecorder<TestAction>
         {
             public TestReplayRecorder()
-                : base(new Replay())
+                : base(new Score())
             {
             }
 
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index b66a09aef1..6940e43e5b 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -268,12 +268,12 @@ namespace osu.Game.Rulesets.UI
             return false;
         }
 
-        public sealed override void SetRecordTarget(Replay recordingReplay)
+        public sealed override void SetRecordTarget(Score score)
         {
             if (!(KeyBindingInputManager is IHasRecordingHandler recordingInputManager))
                 throw new InvalidOperationException($"A {nameof(KeyBindingInputManager)} which supports recording is not available");
 
-            var recorder = CreateReplayRecorder(recordingReplay);
+            var recorder = CreateReplayRecorder(score);
 
             if (recorder == null)
                 return;
@@ -327,7 +327,7 @@ namespace osu.Game.Rulesets.UI
 
         protected virtual ReplayInputHandler CreateReplayInputHandler(Replay replay) => null;
 
-        protected virtual ReplayRecorder CreateReplayRecorder(Replay replay) => null;
+        protected virtual ReplayRecorder CreateReplayRecorder(Score score) => null;
 
         /// <summary>
         /// Creates a Playfield.
@@ -516,8 +516,8 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// Sets a replay to be used to record gameplay.
         /// </summary>
-        /// <param name="recordingReplay">The target to be recorded to.</param>
-        public abstract void SetRecordTarget(Replay recordingReplay);
+        /// <param name="score">The target to be recorded to.</param>
+        public abstract void SetRecordTarget(Score score);
 
         /// <summary>
         /// Invoked when the interactive user requests resuming from a paused state.
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index 1438ebd37a..2918a3b445 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -10,8 +10,8 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Online.Spectator;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osuTK;
 
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.UI
     public abstract class ReplayRecorder<T> : ReplayRecorder, IKeyBindingHandler<T>
         where T : struct
     {
-        private readonly Replay target;
+        private readonly Score target;
 
         private readonly List<T> pressedActions = new List<T>();
 
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.UI
         [Resolved]
         private GameplayBeatmap gameplayBeatmap { get; set; }
 
-        protected ReplayRecorder(Replay target)
+        protected ReplayRecorder(Score target)
         {
             this.target = target;
 
@@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.UI
 
         private void recordFrame(bool important)
         {
-            var last = target.Frames.LastOrDefault();
+            var last = target.Replay.Frames.LastOrDefault();
 
             if (!important && last != null && Time.Current - last.Time < (1000d / RecordFrameRate))
                 return;
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.UI
 
             if (frame != null)
             {
-                target.Frames.Add(frame);
+                target.Replay.Frames.Add(frame);
 
                 spectatorStreaming?.HandleFrame(frame);
             }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7979b635aa..f7491ddfba 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -157,14 +157,14 @@ namespace osu.Game.Screens.Play
                 PrepareReplay();
         }
 
-        private Replay recordingReplay;
+        private Score recordingScore;
 
         /// <summary>
         /// Run any recording / playback setup for replays.
         /// </summary>
         protected virtual void PrepareReplay()
         {
-            DrawableRuleset.SetRecordTarget(recordingReplay = new Replay());
+            DrawableRuleset.SetRecordTarget(recordingScore = new Score { Replay = new Replay() });
         }
 
         [BackgroundDependencyLoader(true)]
@@ -758,9 +758,9 @@ namespace osu.Game.Screens.Play
 
             var score = new Score { ScoreInfo = CreateScore() };
 
-            if (recordingReplay?.Frames.Count > 0)
+            if (recordingScore?.Replay.Frames.Count > 0)
             {
-                score.Replay = recordingReplay;
+                score.Replay = recordingScore.Replay;
 
                 using (var stream = new MemoryStream())
                 {

From 64a2526678c07acd9b568ae11ff682f197306717 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 17:33:23 +0900
Subject: [PATCH 06883/10326] Add header class and basic flow for propagating
 data updates

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  3 +-
 osu.Game/Online/Spectator/FrameDataBundle.cs  |  8 ++++-
 osu.Game/Online/Spectator/FrameHeader.cs      | 35 +++++++++++++++++++
 .../Spectator/SpectatorStreamingClient.cs     | 12 +++++--
 osu.Game/Rulesets/UI/ReplayRecorder.cs        |  2 +-
 5 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Online/Spectator/FrameHeader.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 72c6fd8d44..3e5b561a6f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -17,6 +17,7 @@ using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Users;
@@ -272,7 +273,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
                 }
 
-                var bundle = new FrameDataBundle(frames);
+                var bundle = new FrameDataBundle(new ScoreInfo(), frames);
                 ((ISpectatorClient)this).UserSentFrames(StreamingUser.Id, bundle);
 
                 if (!sentState)
diff --git a/osu.Game/Online/Spectator/FrameDataBundle.cs b/osu.Game/Online/Spectator/FrameDataBundle.cs
index 5281e61f9c..fecf88de22 100644
--- a/osu.Game/Online/Spectator/FrameDataBundle.cs
+++ b/osu.Game/Online/Spectator/FrameDataBundle.cs
@@ -1,20 +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.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using osu.Game.Replays.Legacy;
+using osu.Game.Scoring;
 
 namespace osu.Game.Online.Spectator
 {
     [Serializable]
     public class FrameDataBundle
     {
+        public FrameHeader Header { get; set; }
+
         public IEnumerable<LegacyReplayFrame> Frames { get; set; }
 
-        public FrameDataBundle(IEnumerable<LegacyReplayFrame> frames)
+        public FrameDataBundle(ScoreInfo score, IEnumerable<LegacyReplayFrame> frames)
         {
             Frames = frames;
+            Header = new FrameHeader(score);
         }
     }
 }
diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
new file mode 100644
index 0000000000..0940eefa40
--- /dev/null
+++ b/osu.Game/Online/Spectator/FrameHeader.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.
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+
+namespace osu.Game.Online.Spectator
+{
+    [Serializable]
+    public class FrameHeader
+    {
+        public int Combo { get; set; }
+
+        public int MaxCombo { get; set; }
+
+        public Dictionary<HitResult, int> Statistics = new Dictionary<HitResult, int>();
+
+        /// <summary>
+        /// Construct header summary information from a point-in-time reference to a score which is actively being played.
+        /// </summary>
+        /// <param name="score">The score for reference.</param>
+        public FrameHeader(ScoreInfo score)
+        {
+            Combo = score.Combo;
+            MaxCombo = score.MaxCombo;
+
+            foreach (var kvp in score.Statistics)
+                Statistics[kvp.Key] = kvp.Value;
+        }
+    }
+}
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 08b524087a..0167a5d025 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Online.Spectator
@@ -52,6 +53,9 @@ namespace osu.Game.Online.Spectator
         [CanBeNull]
         private IBeatmap currentBeatmap;
 
+        [CanBeNull]
+        private Score currentScore;
+
         [Resolved]
         private IBindable<RulesetInfo> currentRuleset { get; set; }
 
@@ -203,7 +207,7 @@ namespace osu.Game.Online.Spectator
             return Task.CompletedTask;
         }
 
-        public void BeginPlaying(GameplayBeatmap beatmap)
+        public void BeginPlaying(GameplayBeatmap beatmap, Score score)
         {
             if (isPlaying)
                 throw new InvalidOperationException($"Cannot invoke {nameof(BeginPlaying)} when already playing");
@@ -216,6 +220,8 @@ namespace osu.Game.Online.Spectator
             currentState.Mods = currentMods.Value.Select(m => new APIMod(m));
 
             currentBeatmap = beatmap.PlayableBeatmap;
+            currentScore = score;
+
             beginPlaying();
         }
 
@@ -308,7 +314,9 @@ namespace osu.Game.Online.Spectator
 
             pendingFrames.Clear();
 
-            SendFrames(new FrameDataBundle(frames));
+            Debug.Assert(currentScore != null);
+
+            SendFrames(new FrameDataBundle(currentScore.ScoreInfo, frames));
 
             lastSendTime = Time.Current;
         }
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index 2918a3b445..a4d46e3888 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.UI
 
             inputManager = GetContainingInputManager();
 
-            spectatorStreaming?.BeginPlaying(gameplayBeatmap);
+            spectatorStreaming?.BeginPlaying(gameplayBeatmap, target);
         }
 
         protected override void Dispose(bool isDisposing)

From ae22f75406970fb5521ac70ad756ae378be59d92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 17:33:33 +0900
Subject: [PATCH 06884/10326] Bind replay recording score to judgement changes

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index f7491ddfba..f40a7ccda8 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -165,6 +165,8 @@ namespace osu.Game.Screens.Play
         protected virtual void PrepareReplay()
         {
             DrawableRuleset.SetRecordTarget(recordingScore = new Score { Replay = new Replay() });
+
+            ScoreProcessor.NewJudgement += result => ScoreProcessor.PopulateScore(recordingScore.ScoreInfo);
         }
 
         [BackgroundDependencyLoader(true)]

From 79768f0aa412f00fa6d8e45101038cd8417e2c78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 17:52:38 +0900
Subject: [PATCH 06885/10326] 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 eaedcb7bc3..2a08cb7867 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1212.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1214.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b4c7dca12f..960959f367 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1212.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1214.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 7542aded86..a5bcb91c74 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.Framework.iOS" Version="2020.1212.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1214.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1212.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1214.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From f3e6c586f7765c2ade6bf446e0605f792ef49bf9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 17:59:04 +0900
Subject: [PATCH 06886/10326] Change waitForReady back to private
 implementation

---
 osu.Game/OsuGame.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6c32e2e94c..888fd8c803 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -268,7 +268,7 @@ namespace osu.Game
                 case LinkAction.OpenEditorTimestamp:
                 case LinkAction.JoinMultiplayerMatch:
                 case LinkAction.Spectate:
-                    WaitForReady(() => notifications, _ => notifications.Post(new SimpleNotification
+                    waitForReady(() => notifications, _ => notifications.Post(new SimpleNotification
                     {
                         Text = @"This link type is not yet supported!",
                         Icon = FontAwesome.Solid.LifeRing,
@@ -289,7 +289,7 @@ namespace osu.Game
             }
         });
 
-        public void OpenUrlExternally(string url) => WaitForReady(() => externalLinkOpener, _ =>
+        public void OpenUrlExternally(string url) => waitForReady(() => externalLinkOpener, _ =>
         {
             if (url.StartsWith('/'))
                 url = $"{API.Endpoint}{url}";
@@ -301,7 +301,7 @@ namespace osu.Game
         /// Open a specific channel in chat.
         /// </summary>
         /// <param name="channel">The channel to display.</param>
-        public void ShowChannel(string channel) => WaitForReady(() => channelManager, _ =>
+        public void ShowChannel(string channel) => waitForReady(() => channelManager, _ =>
         {
             try
             {
@@ -317,19 +317,19 @@ namespace osu.Game
         /// Show a beatmap set as an overlay.
         /// </summary>
         /// <param name="setId">The set to display.</param>
-        public void ShowBeatmapSet(int setId) => WaitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmapSet(setId));
+        public void ShowBeatmapSet(int setId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmapSet(setId));
 
         /// <summary>
         /// Show a user's profile as an overlay.
         /// </summary>
         /// <param name="userId">The user to display.</param>
-        public void ShowUser(int userId) => WaitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
+        public void ShowUser(int userId) => waitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
 
         /// <summary>
         /// Show a beatmap's set as an overlay, displaying the given beatmap.
         /// </summary>
         /// <param name="beatmapId">The beatmap to show.</param>
-        public void ShowBeatmap(int beatmapId) => WaitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
+        public void ShowBeatmap(int beatmapId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
 
         /// <summary>
         /// Present a beatmap at song select immediately.
@@ -430,7 +430,7 @@ namespace osu.Game
         public override Task Import(Stream stream, string filename)
         {
             var importTask = new Task(async () => await base.Import(stream, filename));
-            WaitForReady(() => this, _ => importTask.Start());
+            waitForReady(() => this, _ => importTask.Start());
             return importTask;
         }
 
@@ -491,13 +491,13 @@ namespace osu.Game
         /// <param name="retrieveInstance">A function to retrieve a (potentially not-yet-constructed) target instance.</param>
         /// <param name="action">The action to perform on the instance when load is confirmed.</param>
         /// <typeparam name="T">The type of the target instance.</typeparam>
-        protected void WaitForReady<T>(Func<T> retrieveInstance, Action<T> action)
+        private void waitForReady<T>(Func<T> retrieveInstance, Action<T> action)
             where T : Drawable
         {
             var instance = retrieveInstance();
 
             if (ScreenStack == null || ScreenStack.CurrentScreen is StartupScreen || instance?.IsLoaded != true)
-                Schedule(() => WaitForReady(retrieveInstance, action));
+                Schedule(() => waitForReady(retrieveInstance, action));
             else
                 action(instance);
         }

From c5112edd08b5fea1688bbc4e339536b725f8cd7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 18:03:01 +0900
Subject: [PATCH 06887/10326] Add comment regarding the reasoning for
 encapsulating the task in another

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 888fd8c803..d67d790ce2 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -429,8 +429,11 @@ namespace osu.Game
 
         public override Task Import(Stream stream, string filename)
         {
+            // encapsulate task as we don't want to begin the import process until in a ready state.
             var importTask = new Task(async () => await base.Import(stream, filename));
+
             waitForReady(() => this, _ => importTask.Start());
+
             return importTask;
         }
 

From 7bf04808485e78ea96c85176dcfdf8e3360cc89b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 18:12:23 +0900
Subject: [PATCH 06888/10326] Tidy up android-side code quality

---
 osu.Android/OsuGameActivity.cs | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index eb9df24bf7..9798d669d6 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -38,27 +38,38 @@ namespace osu.Android
 
         protected override void OnNewIntent(Intent intent)
         {
-            if (intent.Action == Intent.ActionDefault && intent.Scheme == ContentResolver.SchemeContent)
+            switch (intent.Action)
             {
-                handleImportFromUri(intent.Data);
-            }
+                case Intent.ActionDefault:
+                    if (intent.Scheme == ContentResolver.SchemeContent)
+                        handleImportFromUri(intent.Data);
+                    break;
 
-            if (intent.Action == Intent.ActionSend)
-            {
-                var content = intent.ClipData.GetItemAt(0);
-                handleImportFromUri(content.Uri);
+                case Intent.ActionSend:
+                {
+                    var content = intent.ClipData?.GetItemAt(0);
+                    if (content != null)
+                        handleImportFromUri(content.Uri);
+                    break;
+                }
             }
         }
 
         private void handleImportFromUri(Uri uri)
         {
-            var cursor = ContentResolver.Query(uri, new[] { OpenableColumns.DisplayName }, null, null);
-            var filename_column = cursor.GetColumnIndex(OpenableColumns.DisplayName);
+            var cursor = ContentResolver?.Query(uri, new[] { OpenableColumns.DisplayName }, null, null);
+
+            if (cursor == null)
+                return;
+
             cursor.MoveToFirst();
 
+            var filenameColumn = cursor.GetColumnIndex(OpenableColumns.DisplayName);
+
             var stream = ContentResolver.OpenInputStream(uri);
+
             if (stream != null)
-                Task.Factory.StartNew(() => game.Import(stream, cursor.GetString(filename_column)), TaskCreationOptions.LongRunning);
+                Task.Factory.StartNew(() => game.Import(stream, cursor.GetString(filenameColumn)), TaskCreationOptions.LongRunning);
         }
     }
 }

From 38e0b4e64dd3fbf26b3e39364ef0d968f66c193f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 18:13:32 +0900
Subject: [PATCH 06889/10326] Remove unused using statements

---
 osu.Android/OsuGameAndroid.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 57512012f9..21d6336b2c 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
-using System.Threading.Tasks;
 using Android.App;
 using Android.OS;
 using osu.Framework.Allocation;

From 0d9c1cb5d338fc77cbd13b1f1f27efe0450102c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 18:41:24 +0900
Subject: [PATCH 06890/10326] Fix issues with data serialisation

---
 osu.Game/Online/Spectator/FrameDataBundle.cs |  8 +++++++
 osu.Game/Online/Spectator/FrameHeader.cs     | 17 ++++++++++-----
 osu.Game/Online/Spectator/StatisticPair.cs   | 23 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Online/Spectator/StatisticPair.cs

diff --git a/osu.Game/Online/Spectator/FrameDataBundle.cs b/osu.Game/Online/Spectator/FrameDataBundle.cs
index fecf88de22..a8d0434324 100644
--- a/osu.Game/Online/Spectator/FrameDataBundle.cs
+++ b/osu.Game/Online/Spectator/FrameDataBundle.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Replays.Legacy;
 using osu.Game.Scoring;
 
@@ -22,5 +23,12 @@ namespace osu.Game.Online.Spectator
             Frames = frames;
             Header = new FrameHeader(score);
         }
+
+        [JsonConstructor]
+        public FrameDataBundle(FrameHeader header, IEnumerable<LegacyReplayFrame> frames)
+        {
+            Header = header;
+            Frames = frames;
+        }
     }
 }
diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index 0940eefa40..9b6cc615a4 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -4,8 +4,8 @@
 #nullable enable
 
 using System;
-using System.Collections.Generic;
-using osu.Game.Rulesets.Scoring;
+using System.Linq;
+using Newtonsoft.Json;
 using osu.Game.Scoring;
 
 namespace osu.Game.Online.Spectator
@@ -17,7 +17,7 @@ namespace osu.Game.Online.Spectator
 
         public int MaxCombo { get; set; }
 
-        public Dictionary<HitResult, int> Statistics = new Dictionary<HitResult, int>();
+        public StatisticPair[] Statistics { get; set; }
 
         /// <summary>
         /// Construct header summary information from a point-in-time reference to a score which is actively being played.
@@ -28,8 +28,15 @@ namespace osu.Game.Online.Spectator
             Combo = score.Combo;
             MaxCombo = score.MaxCombo;
 
-            foreach (var kvp in score.Statistics)
-                Statistics[kvp.Key] = kvp.Value;
+            Statistics = score.Statistics.Select(kvp => new StatisticPair(kvp.Key, kvp.Value)).ToArray();
+        }
+
+        [JsonConstructor]
+        public FrameHeader(int combo, int maxCombo, StatisticPair[] statistics)
+        {
+            Combo = combo;
+            MaxCombo = maxCombo;
+            Statistics = statistics;
         }
     }
 }
diff --git a/osu.Game/Online/Spectator/StatisticPair.cs b/osu.Game/Online/Spectator/StatisticPair.cs
new file mode 100644
index 0000000000..793143a64c
--- /dev/null
+++ b/osu.Game/Online/Spectator/StatisticPair.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 System;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Online.Spectator
+{
+    [Serializable]
+    public struct StatisticPair
+    {
+        public HitResult Result;
+        public int Count;
+
+        public StatisticPair(HitResult result, int count)
+        {
+            Result = result;
+            Count = count;
+        }
+
+        public override string ToString() => $"{Result}=>{Count}";
+    }
+}

From 54827d4e96c82beec3d8eccd650b074623ee775d Mon Sep 17 00:00:00 2001
From: Xexxar <xexxar.xexxar@gmail.com>
Date: Mon, 14 Dec 2020 12:41:24 -0600
Subject: [PATCH 06891/10326] fixed low 50s count still penalizing high obj
 count maps

---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 60df173223..af7786c3fd 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             // Scale the speed value with accuracy and OD
             speedValue *= (.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750) * Math.Pow(accuracy, (14.5 - Math.Max(Attributes.OverallDifficulty, 8)) / 2);
             // Scale the speed value with # of 50s to punish doubletapping.
-            speedValue *= Math.Pow(0.98, countMeh < totalHits / 500.0 ? 0.5 * countMeh : countMeh - totalHits / 500.0 * 0.5);
+            speedValue *= Math.Pow(0.98, countMeh < totalHits / 500.0 ? 0 : countMeh - totalHits / 500.0);
 
             return speedValue;
         }

From a323c5ce580bee6ed909ee3bb84adc5baf5a9efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 20:01:28 +0100
Subject: [PATCH 06892/10326] Use most backwards-compatible overload for query

---
 osu.Android/OsuGameActivity.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 9798d669d6..fe9b292389 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -57,7 +57,9 @@ namespace osu.Android
 
         private void handleImportFromUri(Uri uri)
         {
-            var cursor = ContentResolver?.Query(uri, new[] { OpenableColumns.DisplayName }, null, null);
+            // there are more performant overloads of this method, but this one is the most backwards-compatible
+            // (dates back to API 1).
+            var cursor = ContentResolver?.Query(uri, null, null, null, null);
 
             if (cursor == null)
                 return;

From 1f6e5f4d329934d06b5423481806e1fc8c78ddb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 20:11:53 +0100
Subject: [PATCH 06893/10326] Copy archive contents to memory stream

---
 osu.Android/OsuGameActivity.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index fe9b292389..f531b79d92 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.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.IO;
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
@@ -69,9 +70,21 @@ namespace osu.Android
             var filenameColumn = cursor.GetColumnIndex(OpenableColumns.DisplayName);
 
             var stream = ContentResolver.OpenInputStream(uri);
+            string filename = cursor.GetString(filenameColumn);
 
             if (stream != null)
-                Task.Factory.StartNew(() => game.Import(stream, cursor.GetString(filenameColumn)), TaskCreationOptions.LongRunning);
+                Task.Factory.StartNew(() => runImport(stream, filename), TaskCreationOptions.LongRunning);
+        }
+
+        private Task runImport(Stream stream, string filename)
+        {
+            // SharpCompress requires archive streams to be seekable, which the stream opened by
+            // OpenInputStream() seems to not necessarily be.
+            // copy to an arbitrary-access memory stream to be able to proceed with the import.
+            var copy = new MemoryStream();
+            stream.CopyTo(copy);
+
+            return game.Import(copy, filename);
         }
     }
 }

From 3e3be56e468d5bdf8d6a3042d7d21159d7b7e538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 20:23:49 +0100
Subject: [PATCH 06894/10326] Touch up and clarify intent handling

---
 osu.Android/OsuGameActivity.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index f531b79d92..28c9433095 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.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 System.IO;
 using System.Threading.Tasks;
 using Android.App;
@@ -31,13 +32,18 @@ namespace osu.Android
 
             base.OnCreate(savedInstanceState);
 
-            OnNewIntent(Intent);
+            // OnNewIntent() only fires for an activity if it's *re-launched* while it's on top of the activity stack.
+            // on first launch we still have to fire manually.
+            // reference: https://developer.android.com/reference/android/app/Activity#onNewIntent(android.content.Intent)
+            handleIntent(Intent);
 
             Window.AddFlags(WindowManagerFlags.Fullscreen);
             Window.AddFlags(WindowManagerFlags.KeepScreenOn);
         }
 
-        protected override void OnNewIntent(Intent intent)
+        protected override void OnNewIntent(Intent intent) => handleIntent(intent);
+
+        private void handleIntent(Intent intent)
         {
             switch (intent.Action)
             {

From f9d7945a6f96b9b7bf19c301a251372e6c3bb681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 21:03:49 +0100
Subject: [PATCH 06895/10326] Remove non-functional replay import for now

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 28c9433095..cf0179e2ac 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -16,7 +16,7 @@ using osu.Framework.Android;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk", ".*\\.osr" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
         private OsuGameAndroid game;

From 5af1ac1b537bfce3b993692dbdff1e01a4de7278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 21:46:02 +0100
Subject: [PATCH 06896/10326] Rename TaikoStrong{-> able}HitObject

---
 osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs | 2 +-
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs   | 2 +-
 osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs       | 2 +-
 .../Objects/Drawables/DrawableTaikoStrongHitObject.cs       | 6 +++---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs                 | 2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs             | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Hit.cs                      | 2 +-
 osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs    | 2 +-
 ...{TaikoStrongHitObject.cs => TaikoStrongableHitObject.cs} | 2 +-
 .../Skinning/Legacy/LegacyCirclePiece.cs                    | 2 +-
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs                  | 2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs                | 6 +++---
 12 files changed, 16 insertions(+), 16 deletions(-)
 rename osu.Game.Rulesets.Taiko/Objects/{TaikoStrongHitObject.cs => TaikoStrongableHitObject.cs} (96%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index 126af1a6ad..3d77fb05db 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 IsCentre = (hitObject as Hit)?.Type == HitType.Centre,
                 IsDrumRoll = hitObject is DrumRoll,
                 IsSwell = hitObject is Swell,
-                IsStrong = (hitObject as TaikoStrongHitObject)?.IsStrong == true
+                IsStrong = (hitObject as TaikoStrongableHitObject)?.IsStrong == true
             };
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 78a0d1fdff..1214c594aa 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 converted.HitObjects = converted.HitObjects.GroupBy(t => t.StartTime).Select(x =>
                 {
                     TaikoHitObject first = x.First();
-                    if (x.Skip(1).Any() && first is TaikoStrongHitObject strong)
+                    if (x.Skip(1).Any() && first is TaikoStrongableHitObject strong)
                         strong.IsStrong = true;
                     return first;
                 }).ToList();
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index 7de920ca8c..3fbcee44af 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
             base.UpdateTernaryStates();
 
             selectionRimState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<Hit>(), h => h.Type == HitType.Rim);
-            selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoStrongHitObject>(), h => h.IsStrong);
+            selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoStrongableHitObject>(), h => h.IsStrong);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
index 04e584e15d..614c12165e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
@@ -13,7 +13,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     public abstract class DrawableTaikoStrongHitObject<TObject, TStrongNestedObject> : DrawableTaikoHitObject<TObject>
-        where TObject : TaikoStrongHitObject
+        where TObject : TaikoStrongableHitObject
         where TStrongNestedObject : StrongNestedHitObject
     {
         private readonly Bindable<bool> isStrong;
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             base.RecreatePieces();
             if (HitObject.IsStrong)
-                Size = BaseSize = new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE);
+                Size = BaseSize = new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE);
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         /// <summary>
         /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongNestedHitObject"/>.
-        /// This is only invoked if <see cref="TaikoStrongHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
+        /// This is only invoked if <see cref="TaikoStrongableHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
         /// </summary>
         /// <param name="hitObject">The strong hitobject.</param>
         /// <returns>The strong hitobject handler.</returns>
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 93f95d6446..c0377c67a5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoStrongHitObject, IHasPath
+    public class DrumRoll : TaikoStrongableHitObject, IHasPath
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 6b6ffa8668..9d0336441e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRollTick : TaikoStrongHitObject
+    public class DrumRollTick : TaikoStrongableHitObject
     {
         /// <summary>
         /// Whether this is the first (initial) tick of the slider.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 6bdde376f6..1b51288605 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -5,7 +5,7 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class Hit : TaikoStrongHitObject
+    public class Hit : TaikoStrongableHitObject
     {
         public readonly Bindable<HitType> TypeBindable = new Bindable<HitType>();
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
index 2e8989bc79..3b427e48c5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
 {
     /// <summary>
     /// Base type for nested strong hits.
-    /// Used by <see cref="TaikoStrongHitObject"/>s to represent their strong bonus scoring portions.
+    /// Used by <see cref="TaikoStrongableHitObject"/>s to represent their strong bonus scoring portions.
     /// </summary>
     public abstract class StrongNestedHitObject : TaikoHitObject
     {
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
similarity index 96%
rename from osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
rename to osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
index 861de95bae..fcd055bcec 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
     /// <summary>
     /// Base class for taiko hitobjects that can become strong (large).
     /// </summary>
-    public abstract class TaikoStrongHitObject : TaikoHitObject
+    public abstract class TaikoStrongableHitObject : TaikoHitObject
     {
         /// <summary>
         /// Scale multiplier for a strong drawable taiko hit object.
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index 52c9080633..2b6c14ca63 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 const string normal_hit = "taikohit";
                 const string big_hit = "taikobig";
 
-                string prefix = ((drawableHitObject.HitObject as TaikoStrongHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
+                string prefix = ((drawableHitObject.HitObject as TaikoStrongableHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
 
                 return skin.GetAnimation($"{prefix}{lookup}", true, false) ??
                        // fallback to regular size if "big" version doesn't exist.
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index 05408e1049..d1fb3348b9 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         /// </summary>
         public void VisualiseSecondHit()
         {
-            this.ResizeTo(new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE), 50);
+            this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
index 5d8145391d..6401c6d09f 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(border_thickness, (1 - TaikoStrongHitObject.DEFAULT_STRONG_SIZE) / 2f),
+                    Size = new Vector2(border_thickness, (1 - TaikoStrongableHitObject.DEFAULT_STRONG_SIZE) / 2f),
                     Alpha = 0.1f
                 },
                 new CircularContainer
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE),
+                    Size = new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE),
                     Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = border_thickness,
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(border_thickness, (1 - TaikoStrongHitObject.DEFAULT_STRONG_SIZE) / 2f),
+                    Size = new Vector2(border_thickness, (1 - TaikoStrongableHitObject.DEFAULT_STRONG_SIZE) / 2f),
                     Alpha = 0.1f
                 },
             };

From c5a218f7c96afe0551d4f083075e9edb924a9405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 21:46:28 +0100
Subject: [PATCH 06897/10326] Add "strongable" to user dictionary

---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 3ef419c572..22ea73858e 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -928,5 +928,6 @@ private void load()
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strongable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

From 512549b4ea796e4b8f7e026cc1d2ad58db43ef46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 21:47:31 +0100
Subject: [PATCH 06898/10326] Rename DrawableTaikoStrong{-> able}HitObject

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs | 2 +-
 .../Objects/Drawables/DrawableDrumRollTick.cs                 | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs      | 2 +-
 .../Objects/Drawables/DrawableStrongNestedHit.cs              | 2 +-
 ...StrongHitObject.cs => DrawableTaikoStrongableHitObject.cs} | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game.Rulesets.Taiko/Objects/Drawables/{DrawableTaikoStrongHitObject.cs => DrawableTaikoStrongableHitObject.cs} (94%)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 0c6d28472d..4925b6fdfc 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRoll : DrawableTaikoStrongHitObject<DrumRoll, DrumRoll.StrongNestedHit>
+    public class DrawableDrumRoll : DrawableTaikoStrongableHitObject<DrumRoll, DrumRoll.StrongNestedHit>
     {
         /// <summary>
         /// Number of rolling hits required to reach the dark/final colour.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index c26e20f92c..c6761de5e3 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRollTick : DrawableTaikoStrongHitObject<DrumRollTick, DrumRollTick.StrongNestedHit>
+    public class DrawableDrumRollTick : DrawableTaikoStrongableHitObject<DrumRollTick, DrumRollTick.StrongNestedHit>
     {
         /// <summary>
         /// The hit type corresponding to the <see cref="TaikoAction"/> that the user pressed to hit this <see cref="DrawableDrumRollTick"/>.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 31cb3d764d..431f2980ec 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -16,7 +16,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableHit : DrawableTaikoStrongHitObject<Hit, Hit.StrongNestedHit>
+    public class DrawableHit : DrawableTaikoStrongableHitObject<Hit, Hit.StrongNestedHit>
     {
         /// <summary>
         /// A list of keys which can result in hits for this HitObject.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index d735d258b3..d2e8888197 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     /// <summary>
-    /// Used as a nested hitobject to provide <see cref="TaikoStrongJudgement"/>s for <see cref="DrawableTaikoStrongHitObject{TObject, TNested}"/>s.
+    /// Used as a nested hitobject to provide <see cref="TaikoStrongJudgement"/>s for <see cref="DrawableTaikoStrongableHitObject{TObject,TStrongNestedObject}"/>s.
     /// </summary>
     public abstract class DrawableStrongNestedHit : DrawableTaikoHitObject
     {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
similarity index 94%
rename from osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
rename to osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
index 614c12165e..af3e94d9c6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
@@ -12,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public abstract class DrawableTaikoStrongHitObject<TObject, TStrongNestedObject> : DrawableTaikoHitObject<TObject>
+    public abstract class DrawableTaikoStrongableHitObject<TObject, TStrongNestedObject> : DrawableTaikoHitObject<TObject>
         where TObject : TaikoStrongableHitObject
         where TStrongNestedObject : StrongNestedHitObject
     {
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private readonly Container<DrawableStrongNestedHit> strongHitContainer;
 
-        protected DrawableTaikoStrongHitObject(TObject hitObject)
+        protected DrawableTaikoStrongableHitObject(TObject hitObject)
             : base(hitObject)
         {
             isStrong = HitObject.IsStrongBindable.GetBoundCopy();

From 2051f49f78c98e79214cee4d3f5ae8f185545bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 21:58:13 +0100
Subject: [PATCH 06899/10326] Ensure correct initial state of taiko bar lines

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
index 9e50faabc1..d653f01db6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            major.BindValueChanged(updateMajor);
+            major.BindValueChanged(updateMajor, true);
         }
 
         private void updateMajor(ValueChangedEvent<bool> major)

From 523e8034407435b3d4b1beeaea4a24a457bc9918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 15 Dec 2020 00:28:00 +0100
Subject: [PATCH 06900/10326] Fix swells crashing on rapid seeks in editor

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

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 5c6278ed08..229d581d0c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
                 foreach (var t in ticks)
                 {
-                    if (!t.IsHit)
+                    if (!t.Result.HasResult)
                     {
                         nextTick = t;
                         break;
@@ -208,7 +208,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                         continue;
                     }
 
-                    tick.TriggerResult(false);
+                    if (!tick.Result.HasResult)
+                        tick.TriggerResult(false);
                 }
 
                 ApplyResult(r => r.Type = numHits > HitObject.RequiredHits / 2 ? HitResult.Ok : r.Judgement.MinResult);

From cba4657021286be23f5c0d90a89f5dca0da7de80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 12:37:41 +0900
Subject: [PATCH 06901/10326] Get handled file extensions from game itself,
 rather than duplicating locally

---
 osu.Game/Screens/Import/FileImportScreen.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index e2e2b699f5..24a498e8cd 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -36,7 +37,7 @@ namespace osu.Game.Screens.Import
         private const float button_vertical_margin = 15;
 
         [Resolved]
-        private OsuGameBase gameBase { get; set; }
+        private OsuGameBase game { get; set; }
 
         [Resolved]
         private OsuColour colours { get; set; }
@@ -46,7 +47,6 @@ namespace osu.Game.Screens.Import
         {
             storage.GetStorageForDirectory("imports");
             var originalPath = storage.GetFullPath("imports", true);
-            string[] fileExtensions = { ".osk", ".osr", ".osz" };
 
             InternalChild = contentContainer = new Container
             {
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Import
                         Colour = colours.GreySeafoamDark,
                         RelativeSizeAxes = Axes.Both,
                     },
-                    fileSelector = new FileSelector(initialPath: originalPath, validFileExtensions: fileExtensions)
+                    fileSelector = new FileSelector(originalPath, game.HandledExtensions.ToArray())
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.65f
@@ -174,7 +174,7 @@ namespace osu.Game.Screens.Import
 
             string[] paths = { path };
 
-            Task.Factory.StartNew(() => gameBase.Import(paths), TaskCreationOptions.LongRunning);
+            Task.Factory.StartNew(() => game.Import(paths), TaskCreationOptions.LongRunning);
         }
     }
 }

From 33f77f81f2d3af9dec7c1d6f9f94442e8211924c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 12:43:27 +0900
Subject: [PATCH 06902/10326] Disable the import button when no file is
 selected, rather than weird flash logic

---
 osu.Game/Screens/Import/FileImportScreen.cs | 24 +++++++++------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 24a498e8cd..da6d3f6622 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Screens.Import
         private TextFlowContainer currentFileText;
         private OsuScrollContainer fileNameScroll;
 
+        private TriangleButton importButton;
+
         private const float duration = 300;
         private const float button_height = 50;
         private const float button_vertical_margin = 15;
@@ -100,7 +102,7 @@ namespace osu.Game.Screens.Import
                                     },
                                 },
                             },
-                            new TriangleButton
+                            importButton = new TriangleButton
                             {
                                 Text = "Import",
                                 Anchor = Anchor.BottomCentre,
@@ -109,14 +111,7 @@ namespace osu.Game.Screens.Import
                                 Height = button_height,
                                 Width = 0.9f,
                                 Margin = new MarginPadding { Vertical = button_vertical_margin },
-                                Action = () =>
-                                {
-                                    var d = currentFile.Value?.FullName;
-                                    if (d != null)
-                                        startImport(d);
-                                    else
-                                        currentFileText.FlashColour(Color4.Red, 500);
-                                }
+                                Action = () => startImport(currentFile.Value?.FullName)
                             }
                         }
                     }
@@ -125,21 +120,22 @@ namespace osu.Game.Screens.Import
             fileNameScroll.ScrollContent.Anchor = Anchor.Centre;
             fileNameScroll.ScrollContent.Origin = Anchor.Centre;
 
-            currentFile.BindValueChanged(updateFileSelectionText, true);
-            currentDirectory.BindValueChanged(onCurrentDirectoryChanged);
+            currentFile.BindValueChanged(fileChanged, true);
+            currentDirectory.BindValueChanged(directoryChanged);
 
             currentDirectory.BindTo(fileSelector.CurrentPath);
             currentFile.BindTo(fileSelector.CurrentFile);
         }
 
-        private void onCurrentDirectoryChanged(ValueChangedEvent<DirectoryInfo> v)
+        private void directoryChanged(ValueChangedEvent<DirectoryInfo> v)
         {
             currentFile.Value = null;
         }
 
-        private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)
+        private void fileChanged(ValueChangedEvent<FileInfo> selectedFile)
         {
-            currentFileText.Text = v.NewValue?.Name ?? "Select a file";
+            importButton.Enabled.Value = selectedFile.NewValue != null;
+            currentFileText.Text = selectedFile.NewValue?.Name ?? "Select a file";
         }
 
         public override void OnEntering(IScreen last)

From cafe81ab97cdf5565a168fe9c757b833bec64b35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 12:52:38 +0900
Subject: [PATCH 06903/10326] Further refactoring and bindable simplification

---
 osu.Game/Screens/Import/FileImportScreen.cs | 37 +++++++++------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index da6d3f6622..72032c82b8 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -12,11 +12,10 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Graphics.Containers;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Import
 {
@@ -24,13 +23,9 @@ namespace osu.Game.Screens.Import
     {
         public override bool HideOverlaysOnEnter => true;
 
-        private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
-        private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
-
         private FileSelector fileSelector;
         private Container contentContainer;
         private TextFlowContainer currentFileText;
-        private OsuScrollContainer fileNameScroll;
 
         private TriangleButton importButton;
 
@@ -47,9 +42,6 @@ namespace osu.Game.Screens.Import
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage)
         {
-            storage.GetStorageForDirectory("imports");
-            var originalPath = storage.GetFullPath("imports", true);
-
             InternalChild = contentContainer = new Container
             {
                 Masking = true,
@@ -65,7 +57,7 @@ namespace osu.Game.Screens.Import
                         Colour = colours.GreySeafoamDark,
                         RelativeSizeAxes = Axes.Both,
                     },
-                    fileSelector = new FileSelector(originalPath, game.HandledExtensions.ToArray())
+                    fileSelector = new FileSelector(validFileExtensions: game.HandledExtensions.ToArray())
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.65f
@@ -87,7 +79,7 @@ namespace osu.Game.Screens.Import
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Padding = new MarginPadding { Bottom = button_height + button_vertical_margin * 2 },
-                                Child = fileNameScroll = new OsuScrollContainer
+                                Child = new OsuScrollContainer
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Anchor = Anchor.TopCentre,
@@ -100,6 +92,11 @@ namespace osu.Game.Screens.Import
                                         Origin = Anchor.Centre,
                                         TextAnchor = Anchor.Centre
                                     },
+                                    ScrollContent =
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                    }
                                 },
                             },
                             importButton = new TriangleButton
@@ -111,25 +108,21 @@ namespace osu.Game.Screens.Import
                                 Height = button_height,
                                 Width = 0.9f,
                                 Margin = new MarginPadding { Vertical = button_vertical_margin },
-                                Action = () => startImport(currentFile.Value?.FullName)
+                                Action = () => startImport(fileSelector.CurrentFile.Value?.FullName)
                             }
                         }
                     }
                 }
             };
-            fileNameScroll.ScrollContent.Anchor = Anchor.Centre;
-            fileNameScroll.ScrollContent.Origin = Anchor.Centre;
 
-            currentFile.BindValueChanged(fileChanged, true);
-            currentDirectory.BindValueChanged(directoryChanged);
-
-            currentDirectory.BindTo(fileSelector.CurrentPath);
-            currentFile.BindTo(fileSelector.CurrentFile);
+            fileSelector.CurrentFile.BindValueChanged(fileChanged, true);
+            fileSelector.CurrentPath.BindValueChanged(directoryChanged);
         }
 
-        private void directoryChanged(ValueChangedEvent<DirectoryInfo> v)
+        private void directoryChanged(ValueChangedEvent<DirectoryInfo> _)
         {
-            currentFile.Value = null;
+            // this should probably be done by the selector itself, but let's do it here for now.
+            fileSelector.CurrentFile.Value = null;
         }
 
         private void fileChanged(ValueChangedEvent<FileInfo> selectedFile)

From db4f2d5ffbbcf3ba90a4aa5c563314c40d5bacb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 12:52:45 +0900
Subject: [PATCH 06904/10326] Refresh view after import succeeds

---
 osu.Game/Screens/Import/FileImportScreen.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 72032c82b8..3646dc819c 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -154,16 +154,17 @@ namespace osu.Game.Screens.Import
             if (string.IsNullOrEmpty(path))
                 return;
 
-            if (!File.Exists(path))
-            {
-                currentFileText.Text = "No such file";
-                currentFileText.FlashColour(colours.Red, duration);
-                return;
-            }
+            Task.Factory.StartNew(async () => await game.Import(path), TaskCreationOptions.LongRunning)
+                .ContinueWith(_ =>
+                {
+                    // some files will be deleted after successful import, so we want to refresh the view.
 
-            string[] paths = { path };
-
-            Task.Factory.StartNew(() => game.Import(paths), TaskCreationOptions.LongRunning);
+                    Schedule(() =>
+                    {
+                        // should probably be exposed as a refresh method.
+                        fileSelector.CurrentPath.TriggerChange();
+                    });
+                });
         }
     }
 }

From 0d4ac2f748b968cf972c8270b1dc2138857ced96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 12:57:28 +0900
Subject: [PATCH 06905/10326] Refresh view after import completes

---
 osu.Game/Screens/Import/FileImportScreen.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 3646dc819c..5f7888d743 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -154,17 +154,17 @@ namespace osu.Game.Screens.Import
             if (string.IsNullOrEmpty(path))
                 return;
 
-            Task.Factory.StartNew(async () => await game.Import(path), TaskCreationOptions.LongRunning)
-                .ContinueWith(_ =>
-                {
-                    // some files will be deleted after successful import, so we want to refresh the view.
+            Task.Factory.StartNew(async () =>
+            {
+                await game.Import(path);
 
-                    Schedule(() =>
-                    {
-                        // should probably be exposed as a refresh method.
-                        fileSelector.CurrentPath.TriggerChange();
-                    });
+                // some files will be deleted after successful import, so we want to refresh the view.
+                Schedule(() =>
+                {
+                    // should probably be exposed as a refresh method.
+                    fileSelector.CurrentPath.TriggerChange();
                 });
+            }, TaskCreationOptions.LongRunning);
         }
     }
 }

From 10ee8ed8e86c392015a29ffa81c8798101066fd0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 13:02:38 +0900
Subject: [PATCH 06906/10326] Reorder functions and simplify transform logic

---
 osu.Game/Screens/Import/FileImportScreen.cs | 34 ++++++++++-----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 5f7888d743..329623e03a 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -119,6 +119,22 @@ namespace osu.Game.Screens.Import
             fileSelector.CurrentPath.BindValueChanged(directoryChanged);
         }
 
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            contentContainer.ScaleTo(0.95f).ScaleTo(1, duration, Easing.OutQuint);
+            this.FadeInFromZero(duration);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            contentContainer.ScaleTo(0.95f, duration, Easing.OutQuint);
+            this.FadeOut(duration, Easing.OutQuint);
+
+            return base.OnExiting(next);
+        }
+
         private void directoryChanged(ValueChangedEvent<DirectoryInfo> _)
         {
             // this should probably be done by the selector itself, but let's do it here for now.
@@ -131,24 +147,6 @@ namespace osu.Game.Screens.Import
             currentFileText.Text = selectedFile.NewValue?.Name ?? "Select a file";
         }
 
-        public override void OnEntering(IScreen last)
-        {
-            base.OnEntering(last);
-
-            contentContainer.FadeOut().Then().ScaleTo(0.95f)
-                            .Then()
-                            .ScaleTo(1, duration, Easing.OutQuint)
-                            .FadeIn(duration);
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            contentContainer.ScaleTo(0.95f, duration, Easing.OutQuint);
-            this.FadeOut(duration, Easing.OutQuint);
-
-            return base.OnExiting(next);
-        }
-
         private void startImport(string path)
         {
             if (string.IsNullOrEmpty(path))

From f0e6b6eaf81c540382f70dc39dcdad249acaad42 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Tue, 15 Dec 2020 11:09:09 +0700
Subject: [PATCH 06907/10326] sort by ruleset id first then star diff

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

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
index 88c15776cd..1567e18caa 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
             }
             else
             {
-                foreach (var b in SetInfo.Beatmaps.OrderBy(beatmap => beatmap.StarDifficulty))
+                foreach (var b in SetInfo.Beatmaps.OrderBy(beatmap => beatmap.Ruleset.ID).ThenBy(beatmap => beatmap.StarDifficulty))
                     icons.Add(new DifficultyIcon(b));
             }
 

From 8bdef0ff5573276ea4f2a7f6a833bd81098b84d9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Dec 2020 13:18:41 +0900
Subject: [PATCH 06908/10326] Code quality fix

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index af7786c3fd..b235b59609 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
             // Scale the speed value with accuracy and OD
-            speedValue *= (.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750) * Math.Pow(accuracy, (14.5 - Math.Max(Attributes.OverallDifficulty, 8)) / 2);
+            speedValue *= (0.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750) * Math.Pow(accuracy, (14.5 - Math.Max(Attributes.OverallDifficulty, 8)) / 2);
             // Scale the speed value with # of 50s to punish doubletapping.
             speedValue *= Math.Pow(0.98, countMeh < totalHits / 500.0 ? 0 : countMeh - totalHits / 500.0);
 

From 8362ad37e34c10d2ada7bd4468d851d6debdb45a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 15:22:14 +0900
Subject: [PATCH 06909/10326] Bring up-to-date with code changes

---
 .../Gameplay/TestSceneInGameLeaderboard.cs    | 26 ++++++++-----------
 osu.Game/Screens/Play/InGameScoreContainer.cs |  3 ++-
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 0019212dfa..4944a6477d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -1,12 +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.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
 using osuTK;
@@ -16,12 +15,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneInGameLeaderboard : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(InGameLeaderboard),
-            typeof(InGameScoreContainer),
-        };
-
         private readonly TestInGameLeaderboard leaderboard;
         private readonly BindableDouble playerScore;
 
@@ -35,18 +28,21 @@ namespace osu.Game.Tests.Visual.Gameplay
                 RelativeSizeAxes = Axes.X,
                 PlayerCurrentScore = { BindTarget = playerScore = new BindableDouble(1222333) }
             });
+        }
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("reset leaderboard", () =>
+            {
+                leaderboard.ClearScores();
+                playerScore.Value = 1222333;
+            });
 
             AddStep("add player user", () => leaderboard.PlayerUser = new User { Username = "You" });
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
-        [SetUp]
-        public void SetUp()
-        {
-            leaderboard.ClearScores();
-            playerScore.Value = 1222333;
-        }
-
         [Test]
         public void TestPlayerScore()
         {
diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index f548b3de3f..d3ec132351 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -6,6 +6,7 @@ using System.Linq;
 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.Game.Graphics;
@@ -210,7 +211,7 @@ namespace osu.Game.Screens.Play
                             },
                             scoreText = new GlowingSpriteText
                             {
-                                GlowColour = OsuColour.FromHex(@"83ccfa"),
+                                GlowColour = Color4Extensions.FromHex(@"83ccfa"),
                                 Font = OsuFont.Numeric.With(size: 14),
                             }
                         }

From dd5572b20a9336562e30bcf14d4bc444d8d0f3be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 15:26:20 +0900
Subject: [PATCH 06910/10326] Remove unnecessary methods and event

---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index d3ec132351..693020fc4c 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -19,12 +19,6 @@ namespace osu.Game.Screens.Play
 {
     public class InGameScoreContainer : FillFlowContainer<InGameScoreItem>
     {
-        /// <summary>
-        /// Called once an item's score has changed.
-        /// Useful for doing calculations on what score to show or hide next. (scrolling system)
-        /// </summary>
-        public Action OnScoreChange;
-
         /// <summary>
         /// Whether to declare a new position for un-positioned players.
         /// Must be disabled for online leaderboards with top 50 scores only.
@@ -101,9 +95,16 @@ namespace osu.Game.Screens.Play
 
         private void updateScores()
         {
-            reorderPositions();
+            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
+            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
 
-            OnScoreChange?.Invoke();
+            for (int i = 0; i < Count; i++)
+            {
+                int newPosition = orderedPositions[i] ?? maxPosition + 1;
+
+                SetLayoutPosition(orderedByScore[i], newPosition);
+                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
+            }
         }
     }
 

From 8b68ccc0ff96f2bd0ae9b3076cdc19e2bff3ac26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 15:27:26 +0900
Subject: [PATCH 06911/10326] Rename class and move inside HUD namespace

---
 .../Gameplay/TestSceneInGameLeaderboard.cs    |  34 +++---
 .../Screens/Play/HUD/GameplayLeaderboard.cs   | 104 ++++++++++++++++++
 .../GameplayLeaderboardScore.cs}              | 100 +----------------
 osu.Game/Screens/Play/InGameLeaderboard.cs    |  42 -------
 4 files changed, 122 insertions(+), 158 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
 rename osu.Game/Screens/Play/{InGameScoreContainer.cs => HUD/GameplayLeaderboardScore.cs} (52%)
 delete mode 100644 osu.Game/Screens/Play/InGameLeaderboard.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 4944a6477d..657eb7e8ba 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -6,27 +6,27 @@ using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestSceneInGameLeaderboard : OsuTestScene
+    public class TestSceneGameplayLeaderboard : OsuTestScene
     {
-        private readonly TestInGameLeaderboard leaderboard;
-        private readonly BindableDouble playerScore;
+        private readonly TestGameplayLeaderboard leaderboard;
 
-        public TestSceneInGameLeaderboard()
+        private readonly BindableDouble playerScore = new BindableDouble();
+
+        public TestSceneGameplayLeaderboard()
         {
-            Add(leaderboard = new TestInGameLeaderboard
+            Add(leaderboard = new TestGameplayLeaderboard
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Scale = new Vector2(2),
                 RelativeSizeAxes = Axes.X,
-                PlayerCurrentScore = { BindTarget = playerScore = new BindableDouble(1222333) }
             });
         }
 
@@ -35,11 +35,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("reset leaderboard", () =>
             {
-                leaderboard.ClearScores();
+                leaderboard.Clear();
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add player user", () => leaderboard.PlayerUser = new User { Username = "You" });
+            AddStep("add player user", () => leaderboard.AddRealTimePlayer(playerScore, new User { Username = "You" }));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => leaderboard.AddDummyPlayer(player2Score, "Player 2"));
-            AddStep("add player 3", () => leaderboard.AddDummyPlayer(player3Score, "Player 3"));
+            AddStep("add player 2", () => leaderboard.AddRealTimePlayer(player2Score, new User { Username = "Player 2" }));
+            AddStep("add player 3", () => leaderboard.AddRealTimePlayer(player3Score, new User { Username = "Player 3" }));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
@@ -67,18 +67,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
         }
 
-        private class TestInGameLeaderboard : InGameLeaderboard
+        private class TestGameplayLeaderboard : GameplayLeaderboard
         {
-            public void ClearScores() => ScoresContainer.RemoveAll(s => s.User.Username != PlayerUser.Username);
-
-            public bool CheckPositionByUsername(string username, int? estimatedPosition)
+            public bool CheckPositionByUsername(string username, int? expectedPosition)
             {
-                var scoreItem = ScoresContainer.FirstOrDefault(i => i.User.Username == username);
+                var scoreItem = this.FirstOrDefault(i => i.User.Username == username);
 
-                return scoreItem != null && scoreItem.ScorePosition == estimatedPosition;
+                return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }
-
-            public void AddDummyPlayer(BindableDouble currentScore, string username) => ScoresContainer.AddRealTimePlayer(currentScore, new User { Username = username });
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
new file mode 100644
index 0000000000..9e1b9a3958
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.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.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Scoring;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class GameplayLeaderboard : FillFlowContainer<GameplayLeaderboardScore>
+    {
+        /// <summary>
+        /// Whether to declare a new position for un-positioned players.
+        /// Must be disabled for online leaderboards with top 50 scores only.
+        /// </summary>
+        public bool DeclareNewPosition = true;
+
+        public GameplayLeaderboard()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+            Spacing = new Vector2(2.5f);
+            LayoutDuration = 500;
+            LayoutEasing = Easing.OutQuint;
+        }
+
+        /// <summary>
+        /// Adds a real-time player score item whose score is updated via a <see cref="BindableDouble"/>.
+        /// </summary>
+        /// <param name="currentScore">The bindable current score of the player.</param>
+        /// <param name="user">The player user.</param>
+        /// <returns>Returns the drawable score item of that player.</returns>
+        public GameplayLeaderboardScore AddRealTimePlayer(BindableDouble currentScore, User user = null)
+        {
+            if (currentScore == null)
+                return null;
+
+            var scoreItem = addScore(currentScore.Value, user);
+            currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
+
+            return scoreItem;
+        }
+
+        /// <summary>
+        /// Adds a score item based off a <see cref="ScoreInfo"/> with an initial position.
+        /// </summary>
+        /// <param name="score">The score info to use for this item.</param>
+        /// <param name="initialPosition">The initial position of this item.</param>
+        /// <returns>Returns the drawable score item of that player.</returns>
+        public GameplayLeaderboardScore AddScore(ScoreInfo score, int? initialPosition = null) => score != null ? addScore(score.TotalScore, score.User, initialPosition) : null;
+
+        private int maxPosition => this.Max(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition) ?? 0;
+
+        private GameplayLeaderboardScore addScore(double totalScore, User user = null, int? position = null)
+        {
+            var scoreItem = new GameplayLeaderboardScore(position)
+            {
+                User = user,
+                TotalScore = totalScore,
+                OnScoreChange = updateScores,
+            };
+
+            Add(scoreItem);
+            SetLayoutPosition(scoreItem, position ?? maxPosition + 1);
+
+            reorderPositions();
+
+            return scoreItem;
+        }
+
+        private void reorderPositions()
+        {
+            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
+            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
+
+            for (int i = 0; i < Count; i++)
+            {
+                int newPosition = orderedPositions[i] ?? maxPosition + 1;
+
+                SetLayoutPosition(orderedByScore[i], newPosition);
+                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
+            }
+        }
+
+        private void updateScores()
+        {
+            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
+            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
+
+            for (int i = 0; i < Count; i++)
+            {
+                int newPosition = orderedPositions[i] ?? maxPosition + 1;
+
+                SetLayoutPosition(orderedByScore[i], newPosition);
+                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
similarity index 52%
rename from osu.Game/Screens/Play/InGameScoreContainer.cs
rename to osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 693020fc4c..3af7345ae1 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -2,113 +2,19 @@
 // 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;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Scoring;
 using osu.Game.Users;
 using osuTK;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Screens.Play.HUD
 {
-    public class InGameScoreContainer : FillFlowContainer<InGameScoreItem>
-    {
-        /// <summary>
-        /// Whether to declare a new position for un-positioned players.
-        /// Must be disabled for online leaderboards with top 50 scores only.
-        /// </summary>
-        public bool DeclareNewPosition = true;
-
-        public InGameScoreContainer()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            Direction = FillDirection.Vertical;
-            Spacing = new Vector2(2.5f);
-            LayoutDuration = 500;
-            LayoutEasing = Easing.OutQuint;
-        }
-
-        /// <summary>
-        /// Adds a real-time player score item whose score is updated via a <see cref="BindableDouble"/>.
-        /// </summary>
-        /// <param name="currentScore">The bindable current score of the player.</param>
-        /// <param name="user">The player user.</param>
-        /// <returns>Returns the drawable score item of that player.</returns>
-        public InGameScoreItem AddRealTimePlayer(BindableDouble currentScore, User user = null)
-        {
-            if (currentScore == null)
-                return null;
-
-            var scoreItem = addScore(currentScore.Value, user);
-            currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
-
-            return scoreItem;
-        }
-
-        /// <summary>
-        /// Adds a score item based off a <see cref="ScoreInfo"/> with an initial position.
-        /// </summary>
-        /// <param name="score">The score info to use for this item.</param>
-        /// <param name="initialPosition">The initial position of this item.</param>
-        /// <returns>Returns the drawable score item of that player.</returns>
-        public InGameScoreItem AddScore(ScoreInfo score, int? initialPosition = null) => score != null ? addScore(score.TotalScore, score.User, initialPosition) : null;
-
-        private int maxPosition => this.Max(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition) ?? 0;
-
-        private InGameScoreItem addScore(double totalScore, User user = null, int? position = null)
-        {
-            var scoreItem = new InGameScoreItem(position)
-            {
-                User = user,
-                TotalScore = totalScore,
-                OnScoreChange = updateScores,
-            };
-
-            Add(scoreItem);
-            SetLayoutPosition(scoreItem, position ?? maxPosition + 1);
-
-            reorderPositions();
-
-            return scoreItem;
-        }
-
-        private void reorderPositions()
-        {
-            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
-            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
-
-            for (int i = 0; i < Count; i++)
-            {
-                int newPosition = orderedPositions[i] ?? maxPosition + 1;
-
-                SetLayoutPosition(orderedByScore[i], newPosition);
-                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
-            }
-        }
-
-        private void updateScores()
-        {
-            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
-            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
-
-            for (int i = 0; i < Count; i++)
-            {
-                int newPosition = orderedPositions[i] ?? maxPosition + 1;
-
-                SetLayoutPosition(orderedByScore[i], newPosition);
-                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
-            }
-        }
-    }
-
-    public class InGameScoreItem : CompositeDrawable
+    public class GameplayLeaderboardScore : CompositeDrawable
     {
         private readonly OsuSpriteText positionText, positionSymbol, userString;
         private readonly GlowingSpriteText scoreText;
@@ -159,7 +65,7 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public InGameScoreItem(int? initialPosition)
+        public GameplayLeaderboardScore(int? initialPosition)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
diff --git a/osu.Game/Screens/Play/InGameLeaderboard.cs b/osu.Game/Screens/Play/InGameLeaderboard.cs
deleted file mode 100644
index c8f5cf5fd7..0000000000
--- a/osu.Game/Screens/Play/InGameLeaderboard.cs
+++ /dev/null
@@ -1,42 +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.Users;
-
-namespace osu.Game.Screens.Play
-{
-    public class InGameLeaderboard : CompositeDrawable
-    {
-        protected readonly InGameScoreContainer ScoresContainer;
-
-        public readonly BindableDouble PlayerCurrentScore = new BindableDouble();
-
-        private bool playerItemCreated;
-        private User playerUser;
-
-        public User PlayerUser
-        {
-            get => playerUser;
-            set
-            {
-                playerUser = value;
-
-                if (playerItemCreated)
-                    return;
-
-                ScoresContainer.AddRealTimePlayer(PlayerCurrentScore, playerUser);
-                playerItemCreated = true;
-            }
-        }
-
-        public InGameLeaderboard()
-        {
-            AutoSizeAxes = Axes.Y;
-
-            InternalChild = ScoresContainer = new InGameScoreContainer();
-        }
-    }
-}

From b5ab400ad78ac968b4b5a629bb5aacab39dd63eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 15:44:43 +0900
Subject: [PATCH 06912/10326] Fix test filename not matching updated class name

---
 ...InGameLeaderboard.cs => TestSceneGameplayLeaderboard.cs} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestSceneInGameLeaderboard.cs => TestSceneGameplayLeaderboard.cs} (89%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
similarity index 89%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 657eb7e8ba..df970c1c46 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add player user", () => leaderboard.AddRealTimePlayer(playerScore, new User { Username = "You" }));
+            AddStep("add player user", () => leaderboard.AddPlayer(playerScore, new User { Username = "You" }));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => leaderboard.AddRealTimePlayer(player2Score, new User { Username = "Player 2" }));
-            AddStep("add player 3", () => leaderboard.AddRealTimePlayer(player3Score, new User { Username = "Player 3" }));
+            AddStep("add player 2", () => leaderboard.AddPlayer(player2Score, new User { Username = "Player 2" }));
+            AddStep("add player 3", () => leaderboard.AddPlayer(player3Score, new User { Username = "Player 3" }));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));

From e37089af5e188e7dbb769ba4d891a25b48420412 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 15:44:56 +0900
Subject: [PATCH 06913/10326] Further code cleanup

---
 .../Screens/Play/HUD/GameplayLeaderboard.cs   | 65 ++++---------------
 .../Play/HUD/GameplayLeaderboardScore.cs      |  5 +-
 2 files changed, 15 insertions(+), 55 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 9e1b9a3958..6ee654fb9e 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -1,11 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Scoring;
 using osu.Game.Users;
 using osuTK;
 
@@ -13,52 +14,33 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboard : FillFlowContainer<GameplayLeaderboardScore>
     {
-        /// <summary>
-        /// Whether to declare a new position for un-positioned players.
-        /// Must be disabled for online leaderboards with top 50 scores only.
-        /// </summary>
-        public bool DeclareNewPosition = true;
-
         public GameplayLeaderboard()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
+
             Direction = FillDirection.Vertical;
+
             Spacing = new Vector2(2.5f);
-            LayoutDuration = 500;
+
+            LayoutDuration = 250;
             LayoutEasing = Easing.OutQuint;
         }
 
         /// <summary>
-        /// Adds a real-time player score item whose score is updated via a <see cref="BindableDouble"/>.
+        /// Adds a player to the leaderboard.
         /// </summary>
         /// <param name="currentScore">The bindable current score of the player.</param>
-        /// <param name="user">The player user.</param>
-        /// <returns>Returns the drawable score item of that player.</returns>
-        public GameplayLeaderboardScore AddRealTimePlayer(BindableDouble currentScore, User user = null)
+        /// <param name="user">The player.</param>
+        public void AddPlayer([NotNull] BindableDouble currentScore, [NotNull] User user)
         {
-            if (currentScore == null)
-                return null;
-
             var scoreItem = addScore(currentScore.Value, user);
             currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
-
-            return scoreItem;
         }
 
-        /// <summary>
-        /// Adds a score item based off a <see cref="ScoreInfo"/> with an initial position.
-        /// </summary>
-        /// <param name="score">The score info to use for this item.</param>
-        /// <param name="initialPosition">The initial position of this item.</param>
-        /// <returns>Returns the drawable score item of that player.</returns>
-        public GameplayLeaderboardScore AddScore(ScoreInfo score, int? initialPosition = null) => score != null ? addScore(score.TotalScore, score.User, initialPosition) : null;
-
-        private int maxPosition => this.Max(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition) ?? 0;
-
-        private GameplayLeaderboardScore addScore(double totalScore, User user = null, int? position = null)
+        private GameplayLeaderboardScore addScore(double totalScore, User user)
         {
-            var scoreItem = new GameplayLeaderboardScore(position)
+            var scoreItem = new GameplayLeaderboardScore
             {
                 User = user,
                 TotalScore = totalScore,
@@ -66,38 +48,19 @@ namespace osu.Game.Screens.Play.HUD
             };
 
             Add(scoreItem);
-            SetLayoutPosition(scoreItem, position ?? maxPosition + 1);
-
-            reorderPositions();
+            updateScores();
 
             return scoreItem;
         }
 
-        private void reorderPositions()
-        {
-            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
-            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
-
-            for (int i = 0; i < Count; i++)
-            {
-                int newPosition = orderedPositions[i] ?? maxPosition + 1;
-
-                SetLayoutPosition(orderedByScore[i], newPosition);
-                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
-            }
-        }
-
         private void updateScores()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
-            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
 
             for (int i = 0; i < Count; i++)
             {
-                int newPosition = orderedPositions[i] ?? maxPosition + 1;
-
-                SetLayoutPosition(orderedByScore[i], newPosition);
-                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
+                SetLayoutPosition(orderedByScore[i], i);
+                orderedByScore[i].ScorePosition = i + 1;
             }
         }
     }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 3af7345ae1..4c75f422c9 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Screens.Play.HUD
         public Action OnScoreChange;
 
         private int? scorePosition;
-        public int? InitialPosition;
 
         public int? ScorePosition
         {
@@ -65,7 +64,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        public GameplayLeaderboardScore(int? initialPosition)
+        public GameplayLeaderboardScore()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -125,8 +124,6 @@ namespace osu.Game.Screens.Play.HUD
                     },
                 },
             };
-
-            InitialPosition = ScorePosition = initialPosition;
         }
 
         [BackgroundDependencyLoader]

From ea6c196f81e72ac967da65218c69f8bf37ce2f9a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 16:03:18 +0900
Subject: [PATCH 06914/10326] Remove unused using statement

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 6ee654fb9e..e53c56b390 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.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.Bindables;

From d0668192aad1d44fea6516ce0d108146177a7737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 15 Dec 2020 21:25:53 +0100
Subject: [PATCH 06915/10326] Ensure stream disposal & move entire operation
 inside task

---
 osu.Android/OsuGameActivity.cs | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index cf0179e2ac..e801c2ca6e 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.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 System.IO;
 using System.Threading.Tasks;
 using Android.App;
@@ -62,7 +61,7 @@ namespace osu.Android
             }
         }
 
-        private void handleImportFromUri(Uri uri)
+        private void handleImportFromUri(Uri uri) => Task.Factory.StartNew(async () =>
         {
             // there are more performant overloads of this method, but this one is the most backwards-compatible
             // (dates back to API 1).
@@ -74,23 +73,16 @@ namespace osu.Android
             cursor.MoveToFirst();
 
             var filenameColumn = cursor.GetColumnIndex(OpenableColumns.DisplayName);
-
-            var stream = ContentResolver.OpenInputStream(uri);
             string filename = cursor.GetString(filenameColumn);
 
-            if (stream != null)
-                Task.Factory.StartNew(() => runImport(stream, filename), TaskCreationOptions.LongRunning);
-        }
-
-        private Task runImport(Stream stream, string filename)
-        {
             // SharpCompress requires archive streams to be seekable, which the stream opened by
             // OpenInputStream() seems to not necessarily be.
             // copy to an arbitrary-access memory stream to be able to proceed with the import.
             var copy = new MemoryStream();
-            stream.CopyTo(copy);
+            using (var stream = ContentResolver.OpenInputStream(uri))
+                await stream.CopyToAsync(copy);
 
-            return game.Import(copy, filename);
-        }
+            await game.Import(copy, filename);
+        }, TaskCreationOptions.LongRunning);
     }
 }

From 4cd290af11eb9918848929b717e38d681bac7a3d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 16 Dec 2020 12:31:05 +0900
Subject: [PATCH 06916/10326] Split server interfaces

---
 .../IMultiplayerLoungeServer.cs               | 20 ++++++++
 .../IMultiplayerRoomServer.cs                 | 51 +++++++++++++++++++
 .../RealtimeMultiplayer/IMultiplayerServer.cs | 50 +-----------------
 3 files changed, 73 insertions(+), 48 deletions(-)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs
new file mode 100644
index 0000000000..eecb61bcb0
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.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.Threading.Tasks;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// Interface for an out-of-room multiplayer server.
+    /// </summary>
+    public interface IMultiplayerLoungeServer
+    {
+        /// <summary>
+        /// Request to join a multiplayer room.
+        /// </summary>
+        /// <param name="roomId">The databased room ID.</param>
+        /// <exception cref="InvalidStateException">If the user is already in the requested (or another) room.</exception>
+        Task<MultiplayerRoom> JoinRoom(long roomId);
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
new file mode 100644
index 0000000000..f1b3daf7d3
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.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 System.Threading.Tasks;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// Interface for an in-room multiplayer server.
+    /// </summary>
+    public interface IMultiplayerRoomServer
+    {
+        /// <summary>
+        /// Request to leave the currently joined room.
+        /// </summary>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        Task LeaveRoom();
+
+        /// <summary>
+        /// Transfer the host of the currently joined room to another user in the room.
+        /// </summary>
+        /// <param name="userId">The new user which is to become host.</param>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        Task TransferHost(long userId);
+
+        /// <summary>
+        /// As the host, update the settings of the currently joined room.
+        /// </summary>
+        /// <param name="settings">The new settings to apply.</param>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        Task ChangeSettings(MultiplayerRoomSettings settings);
+
+        /// <summary>
+        /// Change the local user state in the currently joined room.
+        /// </summary>
+        /// <param name="newState">The proposed new state.</param>
+        /// <exception cref="InvalidStateChangeException">If the state change requested is not valid, given the previous state or room state.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        Task ChangeState(MultiplayerUserState newState);
+
+        /// <summary>
+        /// As the host of a room, start the match.
+        /// </summary>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to start the game.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        /// <exception cref="InvalidStateException">If an attempt to start the game occurs when the game's (or users') state disallows it.</exception>
+        Task StartMatch();
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index e2e7b6b991..1d093af743 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -1,58 +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.Threading.Tasks;
-
 namespace osu.Game.Online.RealtimeMultiplayer
 {
     /// <summary>
-    /// An interface defining the spectator server instance.
+    /// An interface defining the multiplayer server instance.
     /// </summary>
-    public interface IMultiplayerServer
+    public interface IMultiplayerServer : IMultiplayerRoomServer, IMultiplayerLoungeServer
     {
-        /// <summary>
-        /// Request to join a multiplayer room.
-        /// </summary>
-        /// <param name="roomId">The databased room ID.</param>
-        /// <exception cref="InvalidStateException">If the user is already in the requested (or another) room.</exception>
-        Task<MultiplayerRoom> JoinRoom(long roomId);
-
-        /// <summary>
-        /// Request to leave the currently joined room.
-        /// </summary>
-        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        Task LeaveRoom();
-
-        /// <summary>
-        /// Transfer the host of the currently joined room to another user in the room.
-        /// </summary>
-        /// <param name="userId">The new user which is to become host.</param>
-        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
-        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        Task TransferHost(long userId);
-
-        /// <summary>
-        /// As the host, update the settings of the currently joined room.
-        /// </summary>
-        /// <param name="settings">The new settings to apply.</param>
-        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
-        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        Task ChangeSettings(MultiplayerRoomSettings settings);
-
-        /// <summary>
-        /// Change the local user state in the currently joined room.
-        /// </summary>
-        /// <param name="newState">The proposed new state.</param>
-        /// <exception cref="InvalidStateChangeException">If the state change requested is not valid, given the previous state or room state.</exception>
-        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        Task ChangeState(MultiplayerUserState newState);
-
-        /// <summary>
-        /// As the host of a room, start the match.
-        /// </summary>
-        /// <exception cref="NotHostException">A user other than the current host is attempting to start the game.</exception>
-        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        /// <exception cref="InvalidStateException">If an attempt to start the game occurs when the game's (or users') state disallows it.</exception>
-        Task StartMatch();
     }
 }

From 31fe28b8b326f70180c31c94c5e46a36a95b99b2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 16 Dec 2020 12:32:53 +0900
Subject: [PATCH 06917/10326] Remove IStatefulMultiplayerClient

---
 .../IStatefulMultiplayerClient.cs               | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs
deleted file mode 100644
index 578092662a..0000000000
--- a/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.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.
-
-#nullable enable
-
-namespace osu.Game.Online.RealtimeMultiplayer
-{
-    /// <summary>
-    /// A multiplayer client which maintains local room and user state. Also provides a proxy to access the <see cref="IMultiplayerServer"/>.
-    /// </summary>
-    public interface IStatefulMultiplayerClient : IMultiplayerClient, IMultiplayerServer
-    {
-        MultiplayerUserState State { get; }
-
-        MultiplayerRoom? Room { get; }
-    }
-}

From 84a077078967aeb6bf8a5f526bdb7cd1288c876d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:35:07 +0900
Subject: [PATCH 06918/10326] Change frame header to use dictionary for
 compatibility

---
 osu.Game/Online/Spectator/FrameHeader.cs   | 10 ++++++----
 osu.Game/Online/Spectator/StatisticPair.cs | 23 ----------------------
 2 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 osu.Game/Online/Spectator/StatisticPair.cs

diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index 9b6cc615a4..f2dd30a002 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -4,8 +4,9 @@
 #nullable enable
 
 using System;
-using System.Linq;
+using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 
 namespace osu.Game.Online.Spectator
@@ -17,7 +18,7 @@ namespace osu.Game.Online.Spectator
 
         public int MaxCombo { get; set; }
 
-        public StatisticPair[] Statistics { get; set; }
+        public Dictionary<HitResult, int> Statistics { get; set; }
 
         /// <summary>
         /// Construct header summary information from a point-in-time reference to a score which is actively being played.
@@ -28,11 +29,12 @@ namespace osu.Game.Online.Spectator
             Combo = score.Combo;
             MaxCombo = score.MaxCombo;
 
-            Statistics = score.Statistics.Select(kvp => new StatisticPair(kvp.Key, kvp.Value)).ToArray();
+            // copy for safety
+            Statistics = new Dictionary<HitResult, int>(score.Statistics);
         }
 
         [JsonConstructor]
-        public FrameHeader(int combo, int maxCombo, StatisticPair[] statistics)
+        public FrameHeader(int combo, int maxCombo, Dictionary<HitResult, int> statistics)
         {
             Combo = combo;
             MaxCombo = maxCombo;
diff --git a/osu.Game/Online/Spectator/StatisticPair.cs b/osu.Game/Online/Spectator/StatisticPair.cs
deleted file mode 100644
index 793143a64c..0000000000
--- a/osu.Game/Online/Spectator/StatisticPair.cs
+++ /dev/null
@@ -1,23 +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.Game.Rulesets.Scoring;
-
-namespace osu.Game.Online.Spectator
-{
-    [Serializable]
-    public struct StatisticPair
-    {
-        public HitResult Result;
-        public int Count;
-
-        public StatisticPair(HitResult result, int count)
-        {
-            Result = result;
-            Count = count;
-        }
-
-        public override string ToString() => $"{Result}=>{Count}";
-    }
-}

From 72d296f4128066787bf0c098d52422aefe363622 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 16:19:53 +0900
Subject: [PATCH 06919/10326] Add received timestamp and basic xmldoc for
 header class

---
 osu.Game/Online/Spectator/FrameHeader.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index f2dd30a002..b4988fecf9 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -14,12 +14,26 @@ namespace osu.Game.Online.Spectator
     [Serializable]
     public class FrameHeader
     {
+        /// <summary>
+        /// The current combo of the score.
+        /// </summary>
         public int Combo { get; set; }
 
+        /// <summary>
+        /// The maximum combo achieved up to the current point in time.
+        /// </summary>
         public int MaxCombo { get; set; }
 
+        /// <summary>
+        /// Cumulative hit statistics.
+        /// </summary>
         public Dictionary<HitResult, int> Statistics { get; set; }
 
+        /// <summary>
+        /// The time at which this frame was received by the server.
+        /// </summary>
+        public DateTimeOffset ReceivedTime { get; set; }
+
         /// <summary>
         /// Construct header summary information from a point-in-time reference to a score which is actively being played.
         /// </summary>
@@ -34,11 +48,12 @@ namespace osu.Game.Online.Spectator
         }
 
         [JsonConstructor]
-        public FrameHeader(int combo, int maxCombo, Dictionary<HitResult, int> statistics)
+        public FrameHeader(int combo, int maxCombo, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime)
         {
             Combo = combo;
             MaxCombo = maxCombo;
             Statistics = statistics;
+            ReceivedTime = receivedTime;
         }
     }
 }

From fb795f6bfdbb0638c21ae33e2f02e025ca38d780 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 13:00:19 +0900
Subject: [PATCH 06920/10326] Add initial hook-up to spectator backend

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  2 +-
 .../TestSceneSpectatorDrivenLeaderboard.cs    | 74 +++++++++++++++++++
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 3e5b561a6f..1fdff99da6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -232,7 +232,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
-            public readonly User StreamingUser = new User { Id = 1234, Username = "Test user" };
+            public readonly User StreamingUser = new User { Id = 55, Username = "Test user" };
 
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
new file mode 100644
index 0000000000..7211755ba6
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Database;
+using osu.Game.Online.API;
+using osu.Game.Online.Spectator;
+using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSpectatorDrivenLeaderboard : OsuTestScene
+    {
+        [Cached(typeof(SpectatorStreamingClient))]
+        private TestSceneSpectator.TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSceneSpectator.TestSpectatorStreamingClient();
+
+        // used just to show beatmap card for the time being.
+        protected override bool UseOnlineAPI => true;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            OsuScoreProcessor scoreProcessor;
+
+            testSpectatorStreamingClient.StartPlay(55);
+
+            Children = new Drawable[]
+            {
+                scoreProcessor = new OsuScoreProcessor(),
+                new MultiplayerGameplayLeaderboard(scoreProcessor)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            };
+        });
+    }
+
+    public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
+    {
+        private readonly OsuScoreProcessor scoreProcessor;
+
+        public MultiplayerGameplayLeaderboard(OsuScoreProcessor scoreProcessor)
+        {
+            this.scoreProcessor = scoreProcessor;
+
+            AddPlayer(new BindableDouble(), new GuestUser());
+        }
+
+        [Resolved]
+        private SpectatorStreamingClient streamingClient { get; set; }
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Console.WriteLine("got here");
+
+            foreach (var user in streamingClient.PlayingUsers)
+            {
+                streamingClient.WatchUser(user);
+                var resolvedUser = userLookupCache.GetUserAsync(user).Result;
+                AddPlayer(new BindableDouble(), resolvedUser);
+            }
+        }
+    }
+}

From 2954218897e90eb54a692063c0e4af5cf882d28c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:25:20 +0900
Subject: [PATCH 06921/10326] Add method to ScoreProcessor to calculate score
 and accuracy from statistics

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 39 +++++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 499673619f..b4f29d7a6e 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -68,7 +68,12 @@ namespace osu.Game.Rulesets.Scoring
         private readonly double comboPortion;
 
         private int maxAchievableCombo;
-        private double maxBaseScore;
+
+        /// <summary>
+        /// The maximum achievable base score.
+        /// </summary>
+        public double MaxBaseScore { get; private set; }
+
         private double rollingMaxBaseScore;
         private double baseScore;
 
@@ -196,7 +201,7 @@ namespace osu.Game.Rulesets.Scoring
         private double getScore(ScoringMode mode)
         {
             return GetScore(mode, maxAchievableCombo,
-                maxBaseScore > 0 ? baseScore / maxBaseScore : 0,
+                MaxBaseScore > 0 ? baseScore / MaxBaseScore : 0,
                 maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1,
                 scoreResultCounts);
         }
@@ -227,6 +232,34 @@ namespace osu.Game.Rulesets.Scoring
             }
         }
 
+        /// <summary>
+        /// Given a minimal set of inputs, return the computed score and accuracy for the tracked beatmap / mods combination.
+        /// </summary>
+        /// <param name="mode">The <see cref="ScoringMode"/> to compute the total score in.</param>
+        /// <param name="maxCombo">The maximum combo achievable in the beatmap.</param>
+        /// <param name="statistics">Statistics to be used for calculating accuracy, bonus score, etc.</param>
+        /// <returns>The computed score and accuracy for provided inputs.</returns>
+        public (double score, double accuracy) GetScoreAndAccuracy(ScoringMode mode, int maxCombo, Dictionary<HitResult, int> statistics)
+        {
+            // calculate base score from statistics pairs
+            int computedBaseScore = 0;
+
+            foreach (var pair in statistics)
+            {
+                if (!pair.Key.AffectsAccuracy())
+                    continue;
+
+                computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
+            }
+
+            double accuracy = MaxBaseScore > 0 ? computedBaseScore / MaxBaseScore : 0;
+            double comboRatio = maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1;
+
+            double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts);
+
+            return (score, accuracy);
+        }
+
         private double getBonusScore(Dictionary<HitResult, int> statistics)
             => statistics.GetOrDefault(HitResult.SmallBonus) * Judgement.SMALL_BONUS_SCORE
                + statistics.GetOrDefault(HitResult.LargeBonus) * Judgement.LARGE_BONUS_SCORE;
@@ -266,7 +299,7 @@ namespace osu.Game.Rulesets.Scoring
             if (storeResults)
             {
                 maxAchievableCombo = HighestCombo.Value;
-                maxBaseScore = baseScore;
+                MaxBaseScore = baseScore;
             }
 
             baseScore = 0;

From d009a0be51defe7890002ca501d666c40e29fbd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:25:27 +0900
Subject: [PATCH 06922/10326] Move class to final location

---
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
new file mode 100644
index 0000000000..1d9fdd9ded
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.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.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Database;
+using osu.Game.Online.API;
+using osu.Game.Online.Spectator;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
+    {
+        private readonly ScoreProcessor scoreProcessor;
+
+        /// <summary>
+        /// Construct a new leaderboard.
+        /// </summary>
+        /// <param name="scoreProcessor">A score processor instance to handle score calculation for scores of users in the match.</param>
+        public MultiplayerGameplayLeaderboard(ScoreProcessor scoreProcessor)
+        {
+            this.scoreProcessor = scoreProcessor;
+
+            AddPlayer(new BindableDouble(), new GuestUser());
+        }
+
+        [Resolved]
+        private SpectatorStreamingClient streamingClient { get; set; }
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; }
+
+        private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
+
+        private Bindable<ScoringMode> scoringMode;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            streamingClient.OnNewFrames += handleIncomingFrames;
+
+            foreach (var user in streamingClient.PlayingUsers)
+            {
+                streamingClient.WatchUser(user);
+                var resolvedUser = userLookupCache.GetUserAsync(user).Result;
+
+                var trackedUser = new TrackedUserData();
+
+                userScores[user] = trackedUser;
+                AddPlayer(trackedUser.Score, resolvedUser);
+            }
+
+            scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
+            scoringMode.BindValueChanged(updateAllScores, true);
+        }
+
+        private void updateAllScores(ValueChangedEvent<ScoringMode> mode)
+        {
+            foreach (var trackedData in userScores.Values)
+                trackedData.UpdateScore(scoreProcessor, mode.NewValue);
+        }
+
+        private void handleIncomingFrames(int userId, FrameDataBundle bundle)
+        {
+            if (userScores.TryGetValue(userId, out var trackedData))
+            {
+                trackedData.LastHeader = bundle.Header;
+                trackedData.UpdateScore(scoreProcessor, scoringMode.Value);
+            }
+        }
+
+        private class TrackedUserData
+        {
+            public readonly BindableDouble Score = new BindableDouble();
+
+            public readonly BindableDouble Accuracy = new BindableDouble();
+
+            public readonly BindableInt CurrentCombo = new BindableInt();
+
+            [CanBeNull]
+            public FrameHeader LastHeader;
+
+            public void UpdateScore(ScoreProcessor processor, ScoringMode mode)
+            {
+                if (LastHeader == null)
+                    return;
+
+                (Score.Value, Accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics.ToDictionary(s => s.Result, s => s.Count));
+                CurrentCombo.Value = LastHeader.Combo;
+            }
+        }
+    }
+}

From 09d0ceb7668e115170437c1d2063ed883897ed02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:26:03 +0900
Subject: [PATCH 06923/10326] Add testing setup to get a better visual idea of
 how scoreboard will work

fixup! Add method to ScoreProcessor to calculate score and accuracy from statistics
---
 .../TestSceneSpectatorDrivenLeaderboard.cs    | 109 +++++++++++++-----
 .../HUD/MultiplayerGameplayLeaderboard.cs     |   4 +-
 2 files changed, 85 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
index 7211755ba6..e7ebf6e92c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
@@ -2,14 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Database;
-using osu.Game.Online.API;
+using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
+using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -17,7 +21,7 @@ namespace osu.Game.Tests.Visual.Gameplay
     public class TestSceneSpectatorDrivenLeaderboard : OsuTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
-        private TestSceneSpectator.TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSceneSpectator.TestSpectatorStreamingClient();
+        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(16);
 
         // used just to show beatmap card for the time being.
         protected override bool UseOnlineAPI => true;
@@ -27,7 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             OsuScoreProcessor scoreProcessor;
 
-            testSpectatorStreamingClient.StartPlay(55);
+            streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
 
             Children = new Drawable[]
             {
@@ -38,37 +42,90 @@ namespace osu.Game.Tests.Visual.Gameplay
                     Origin = Anchor.Centre,
                 }
             };
+
+            Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
+
+            var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
+
+            scoreProcessor.ApplyBeatmap(playable);
         });
-    }
 
-    public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
-    {
-        private readonly OsuScoreProcessor scoreProcessor;
-
-        public MultiplayerGameplayLeaderboard(OsuScoreProcessor scoreProcessor)
+        [Test]
+        public void TestScoreUpdates()
         {
-            this.scoreProcessor = scoreProcessor;
-
-            AddPlayer(new BindableDouble(), new GuestUser());
+            AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 100);
         }
 
-        [Resolved]
-        private SpectatorStreamingClient streamingClient { get; set; }
-
-        [Resolved]
-        private UserLookupCache userLookupCache { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load()
+        public class TestMultiplayerStreaming : SpectatorStreamingClient
         {
-            Console.WriteLine("got here");
+            public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
 
-            foreach (var user in streamingClient.PlayingUsers)
+            private readonly int totalUsers;
+
+            public TestMultiplayerStreaming(int totalUsers)
             {
-                streamingClient.WatchUser(user);
-                var resolvedUser = userLookupCache.GetUserAsync(user).Result;
-                AddPlayer(new BindableDouble(), resolvedUser);
+                this.totalUsers = totalUsers;
             }
+
+            public void Start(int beatmapId)
+            {
+                for (int i = 0; i < totalUsers; i++)
+                {
+                    ((ISpectatorClient)this).UserBeganPlaying(i, new SpectatorState
+                    {
+                        BeatmapID = beatmapId,
+                        RulesetID = 0,
+                    });
+                }
+            }
+
+            private readonly Dictionary<int, FrameHeader> lastHeaders = new Dictionary<int, FrameHeader>();
+
+            public void RandomlyUpdateState()
+            {
+                foreach (var userId in PlayingUsers)
+                {
+                    if (RNG.Next(0, 1) == 1)
+                        continue;
+
+                    if (!lastHeaders.TryGetValue(userId, out var header))
+                    {
+                        lastHeaders[userId] = header = new FrameHeader(new ScoreInfo
+                        {
+                            Statistics = new Dictionary<HitResult, int>(new[]
+                            {
+                                new KeyValuePair<HitResult, int>(HitResult.Miss, 0),
+                                new KeyValuePair<HitResult, int>(HitResult.Meh, 0),
+                                new KeyValuePair<HitResult, int>(HitResult.Great, 0)
+                            })
+                        });
+                    }
+
+                    switch (RNG.Next(0, 3))
+                    {
+                        case 0:
+                            header.Combo = 0;
+                            header.Statistics[HitResult.Miss]++;
+                            break;
+
+                        case 1:
+                            header.Combo++;
+                            header.MaxCombo = Math.Max(header.MaxCombo, header.Combo);
+                            header.Statistics[HitResult.Meh]++;
+                            break;
+
+                        default:
+                            header.Combo++;
+                            header.MaxCombo = Math.Max(header.MaxCombo, header.Combo);
+                            header.Statistics[HitResult.Great]++;
+                            break;
+                    }
+
+                    ((ISpectatorClient)this).UserSentFrames(userId, new FrameDataBundle(header, Array.Empty<LegacyReplayFrame>()));
+                }
+            }
+
+            protected override Task Connect() => Task.CompletedTask;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 1d9fdd9ded..b3621f42c2 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -90,7 +89,8 @@ namespace osu.Game.Screens.Play.HUD
                 if (LastHeader == null)
                     return;
 
-                (Score.Value, Accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics.ToDictionary(s => s.Result, s => s.Count));
+                (Score.Value, Accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics);
+
                 CurrentCombo.Value = LastHeader.Combo;
             }
         }

From c1ba0f46425e756177e6c383d7f2e42b9d176c80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:53:05 +0900
Subject: [PATCH 06924/10326] Use a local lookup cache for better usernames

---
 .../TestSceneSpectatorDrivenLeaderboard.cs    |  7 +++++
 .../TestSceneCurrentlyPlayingDisplay.cs       | 28 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
index e7ebf6e92c..647d57b5fe 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
@@ -9,12 +9,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Database;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Tests.Visual.Online;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -23,6 +25,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(SpectatorStreamingClient))]
         private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(16);
 
+        [Cached(typeof(UserLookupCache))]
+        private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
+
         // used just to show beatmap card for the time being.
         protected override bool UseOnlineAPI => true;
 
@@ -35,6 +40,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             Children = new Drawable[]
             {
+                streamingClient,
+                lookupCache,
                 scoreProcessor = new OsuScoreProcessor(),
                 new MultiplayerGameplayLeaderboard(scoreProcessor)
                 {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 7eba64f418..4f0ca67e64 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -69,8 +69,34 @@ namespace osu.Game.Tests.Visual.Online
 
         internal class TestUserLookupCache : UserLookupCache
         {
+            private static readonly string[] usernames =
+            {
+                "fieryrage",
+                "Kerensa",
+                "MillhioreF",
+                "Player01",
+                "smoogipoo",
+                "Ephemeral",
+                "BTMC",
+                "Cilvery",
+                "m980",
+                "HappyStick",
+                "LittleEndu",
+                "frenzibyte",
+                "Zallius",
+                "BanchoBot",
+                "rocketminer210",
+                "pishifat"
+            };
+
+            private int id;
+
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
-                => Task.FromResult(new User { Username = "peppy", Id = 2 });
+                => Task.FromResult(new User
+                {
+                    Id = id++,
+                    Username = usernames[id % usernames.Length],
+                });
         }
     }
 }

From 6e2131c164ad2a2d45ec7bab53d58deae3279de7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:53:15 +0900
Subject: [PATCH 06925/10326] Don't track local user score in any special way

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index b3621f42c2..f8fce0825f 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Database;
-using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Rulesets.Scoring;
 
@@ -24,8 +23,6 @@ namespace osu.Game.Screens.Play.HUD
         public MultiplayerGameplayLeaderboard(ScoreProcessor scoreProcessor)
         {
             this.scoreProcessor = scoreProcessor;
-
-            AddPlayer(new BindableDouble(), new GuestUser());
         }
 
         [Resolved]

From 6bce587b599c04194589c8f3bd2716a44f886ea3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 16:05:46 +0900
Subject: [PATCH 06926/10326] Pass users in via constructor and correctly
 unbind on disposal

---
 .../TestSceneSpectatorDrivenLeaderboard.cs    |  3 +-
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 32 ++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
index 647d57b5fe..ffd02d247a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -43,7 +44,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 streamingClient,
                 lookupCache,
                 scoreProcessor = new OsuScoreProcessor(),
-                new MultiplayerGameplayLeaderboard(scoreProcessor)
+                new MultiplayerGameplayLeaderboard(scoreProcessor, streamingClient.PlayingUsers.ToArray())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index f8fce0825f..93f258c507 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -16,13 +16,22 @@ namespace osu.Game.Screens.Play.HUD
     {
         private readonly ScoreProcessor scoreProcessor;
 
+        private readonly int[] userIds;
+
+        private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
+
         /// <summary>
         /// Construct a new leaderboard.
         /// </summary>
         /// <param name="scoreProcessor">A score processor instance to handle score calculation for scores of users in the match.</param>
-        public MultiplayerGameplayLeaderboard(ScoreProcessor scoreProcessor)
+        /// <param name="userIds">IDs of all users in this match.</param>
+        public MultiplayerGameplayLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
         {
+            // todo: this will eventually need to be created per user to support different mod combinations.
             this.scoreProcessor = scoreProcessor;
+
+            // todo: this will likely be passed in as User instances.
+            this.userIds = userIds;
         }
 
         [Resolved]
@@ -31,8 +40,6 @@ namespace osu.Game.Screens.Play.HUD
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
 
-        private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
-
         private Bindable<ScoringMode> scoringMode;
 
         [BackgroundDependencyLoader]
@@ -40,9 +47,11 @@ namespace osu.Game.Screens.Play.HUD
         {
             streamingClient.OnNewFrames += handleIncomingFrames;
 
-            foreach (var user in streamingClient.PlayingUsers)
+            foreach (var user in userIds)
             {
                 streamingClient.WatchUser(user);
+
+                // probably won't be required in the final implementation.
                 var resolvedUser = userLookupCache.GetUserAsync(user).Result;
 
                 var trackedUser = new TrackedUserData();
@@ -70,6 +79,21 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (streamingClient != null)
+            {
+                foreach (var user in userIds)
+                {
+                    streamingClient.StopWatchingUser(user);
+                }
+
+                streamingClient.OnNewFrames -= handleIncomingFrames;
+            }
+        }
+
         private class TrackedUserData
         {
             public readonly BindableDouble Score = new BindableDouble();

From a01bb3d5a3a7ee33650de9b305addf61a1daa16f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 16:08:44 +0900
Subject: [PATCH 06927/10326] Better limit bindable exposure of data class

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs |  2 +-
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs   | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index e53c56b390..3934a99221 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         /// <param name="currentScore">The bindable current score of the player.</param>
         /// <param name="user">The player.</param>
-        public void AddPlayer([NotNull] BindableDouble currentScore, [NotNull] User user)
+        public void AddPlayer([NotNull] IBindableNumber<double> currentScore, [NotNull] User user)
         {
             var scoreItem = addScore(currentScore.Value, user);
             currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 93f258c507..33bcf06aa7 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -96,11 +96,17 @@ namespace osu.Game.Screens.Play.HUD
 
         private class TrackedUserData
         {
-            public readonly BindableDouble Score = new BindableDouble();
+            public IBindableNumber<double> Score => score;
 
-            public readonly BindableDouble Accuracy = new BindableDouble();
+            private readonly BindableDouble score = new BindableDouble();
 
-            public readonly BindableInt CurrentCombo = new BindableInt();
+            public IBindableNumber<double> Accuracy => accuracy;
+
+            private readonly BindableDouble accuracy = new BindableDouble();
+
+            public IBindableNumber<int> CurrentCombo => currentCombo;
+
+            private readonly BindableInt currentCombo = new BindableInt();
 
             [CanBeNull]
             public FrameHeader LastHeader;
@@ -110,9 +116,9 @@ namespace osu.Game.Screens.Play.HUD
                 if (LastHeader == null)
                     return;
 
-                (Score.Value, Accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics);
+                (score.Value, accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics);
 
-                CurrentCombo.Value = LastHeader.Combo;
+                currentCombo.Value = LastHeader.Combo;
             }
         }
     }

From cda3bd2017180391786a46ef771c4b3e04dc4cb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 16:22:47 +0900
Subject: [PATCH 06928/10326] Rename test scene to match tested class name

---
 ...erboard.cs => TestSceneMultiplayerGameplayLeaderboard.cs} | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestSceneSpectatorDrivenLeaderboard.cs => TestSceneMultiplayerGameplayLeaderboard.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index ffd02d247a..78f9db57be 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -21,7 +21,7 @@ using osu.Game.Tests.Visual.Online;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSpectatorDrivenLeaderboard : OsuTestScene
+    public class TestSceneMultiplayerGameplayLeaderboard : OsuTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
         private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(16);
@@ -29,9 +29,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
 
-        // used just to show beatmap card for the time being.
-        protected override bool UseOnlineAPI => true;
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {

From c0021847686aa1c3022abef0dabaa858b2cc8464 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 18:08:16 +0900
Subject: [PATCH 06929/10326] Clamp osu!mania's HitPosition offset to match
 osu-stable implementation

Closes #11184.
---
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 6a04a95040..0a1de461ea 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Skinning
                         break;
 
                     case "HitPosition":
-                        currentConfig.HitPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
+                        currentConfig.HitPosition = (480 - Math.Clamp(float.Parse(pair.Value, CultureInfo.InvariantCulture), 240, 480)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         break;
 
                     case "LightPosition":

From 95711578415c95d6fcc52498e88c55da0712d40f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 16 Dec 2020 20:04:28 +0900
Subject: [PATCH 06930/10326] Use ints for userid parameters

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs     | 4 ++--
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index c162f066d4..9af0047137 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Signal that the host of the room has changed.
         /// </summary>
         /// <param name="userId">The user ID of the new host.</param>
-        Task HostChanged(long userId);
+        Task HostChanged(int userId);
 
         /// <summary>
         /// Signals that the settings for this room have changed.
@@ -45,7 +45,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="userId">The ID of the user performing a state change.</param>
         /// <param name="state">The new state of the user.</param>
-        Task UserStateChanged(long userId, MultiplayerUserState state);
+        Task UserStateChanged(int userId, MultiplayerUserState state);
 
         /// <summary>
         /// Signals that a match is to be started. This will *only* be sent to clients which are to begin loading at this point.
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
index f1b3daf7d3..12dfe481c4 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <param name="userId">The new user which is to become host.</param>
         /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
         /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        Task TransferHost(long userId);
+        Task TransferHost(int userId);
 
         /// <summary>
         /// As the host, update the settings of the currently joined room.

From 5d7294451f1a5a24a7eabdf7a738e6fc07278b17 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 16 Dec 2020 14:28:16 +0100
Subject: [PATCH 06931/10326] Refactor Import() overload to take a list of
 import tasks instead.

---
 osu.Android/OsuGameActivity.cs                  | 3 ++-
 osu.Game/Database/ArchiveModelManager.cs        | 4 ++--
 osu.Game/Database/ICanAcceptFiles.cs            | 7 ++-----
 osu.Game/OsuGame.cs                             | 6 +++---
 osu.Game/OsuGameBase.cs                         | 6 +++---
 osu.Game/Screens/Edit/Setup/ResourcesSection.cs | 2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index e801c2ca6e..bd5523f0e2 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -11,6 +11,7 @@ using Android.OS;
 using Android.Provider;
 using Android.Views;
 using osu.Framework.Android;
+using osu.Game.Database;
 
 namespace osu.Android
 {
@@ -82,7 +83,7 @@ namespace osu.Android
             using (var stream = ContentResolver.OpenInputStream(uri))
                 await stream.CopyToAsync(copy);
 
-            await game.Import(copy, filename);
+            await game.Import(new ImportTask(copy, filename));
         }, TaskCreationOptions.LongRunning);
     }
 }
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 36cc4cce39..9f69ad035f 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -115,13 +115,13 @@ namespace osu.Game.Database
             return Import(notification, paths.Select(p => new ImportTask(p)).ToArray());
         }
 
-        public Task Import(Stream stream, string filename)
+        public Task Import(params ImportTask[] tasks)
         {
             var notification = new ProgressNotification { State = ProgressNotificationState.Active };
 
             PostNotification?.Invoke(notification);
 
-            return Import(notification, new ImportTask(stream, filename));
+            return Import(notification, tasks);
         }
 
         protected async Task<IEnumerable<TModel>> Import(ProgressNotification notification, params ImportTask[] tasks)
diff --git a/osu.Game/Database/ICanAcceptFiles.cs b/osu.Game/Database/ICanAcceptFiles.cs
index 276c284c9f..5ec187975a 100644
--- a/osu.Game/Database/ICanAcceptFiles.cs
+++ b/osu.Game/Database/ICanAcceptFiles.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.IO;
 using System.Threading.Tasks;
 
 namespace osu.Game.Database
@@ -19,11 +18,9 @@ namespace osu.Game.Database
         Task Import(params string[] paths);
 
         /// <summary>
-        /// Import the provided stream as a simple item.
+        /// Import the specified files from the given import tasks.
         /// </summary>
-        /// <param name="stream">The stream to import files from. Should be in a supported archive format.</param>
-        /// <param name="filename">The filename of the archive being imported.</param>
-        Task Import(Stream stream, string filename);
+        Task Import(params ImportTask[] tasks);
 
         /// <summary>
         /// An array of accepted file extensions (in the standard format of ".abc").
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d67d790ce2..1f5b991758 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -52,7 +52,7 @@ using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
 using osu.Game.Users;
-using System.IO;
+using osu.Game.Database;
 
 namespace osu.Game
 {
@@ -427,10 +427,10 @@ namespace osu.Game
             }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
-        public override Task Import(Stream stream, string filename)
+        public override Task Import(params ImportTask[] imports)
         {
             // encapsulate task as we don't want to begin the import process until in a ready state.
-            var importTask = new Task(async () => await base.Import(stream, filename));
+            var importTask = new Task(async () => await base.Import(imports));
 
             waitForReady(() => this, _ => importTask.Start());
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 150569f1dd..0a579cc347 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -395,14 +395,14 @@ namespace osu.Game
             }
         }
 
-        public virtual async Task Import(Stream stream, string filename)
+        public virtual async Task Import(params ImportTask[] tasks)
         {
-            var extension = Path.GetExtension(filename)?.ToLowerInvariant();
+            var extension = Path.GetExtension(tasks.First().Path)?.ToLowerInvariant();
 
             foreach (var importer in fileImporters)
             {
                 if (importer.HandledExtensions.Contains(extension))
-                    await importer.Import(stream, Path.GetFileNameWithoutExtension(filename));
+                    await importer.Import(tasks);
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 0c957b80af..fe9b10667a 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Edit.Setup
             return Task.CompletedTask;
         }
 
-        Task ICanAcceptFiles.Import(Stream stream, string filename) => throw new NotImplementedException();
+        Task ICanAcceptFiles.Import(params ImportTask[] tasks) => throw new NotImplementedException();
 
         protected override void LoadComplete()
         {

From 9d8906924580cc3886759de27dbbb05fb5460b00 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 16 Dec 2020 20:33:29 +0100
Subject: [PATCH 06932/10326] Add ability to import multiple files at once on
 android.

---
 osu.Android/OsuGameActivity.cs | 63 ++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 19 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index bd5523f0e2..bf73f33b74 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
@@ -16,7 +18,7 @@ using osu.Game.Database;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
         private OsuGameAndroid game;
@@ -49,41 +51,64 @@ namespace osu.Android
             {
                 case Intent.ActionDefault:
                     if (intent.Scheme == ContentResolver.SchemeContent)
-                        handleImportFromUri(intent.Data);
+                        handleImportFromUris(intent.Data);
                     break;
 
                 case Intent.ActionSend:
                 {
                     var content = intent.ClipData?.GetItemAt(0);
                     if (content != null)
-                        handleImportFromUri(content.Uri);
+                        handleImportFromUris(content.Uri);
+                    break;
+                }
+
+                case Intent.ActionSendMultiple:
+                {
+                    var uris = new List<Uri>();
+                    for (int i = 0; i < intent.ClipData?.ItemCount; i++)
+                    {
+                        var content = intent.ClipData?.GetItemAt(i);
+                        if (content != null)
+                            uris.Add(content.Uri);
+                    }
+                    handleImportFromUris(uris.ToArray());
                     break;
                 }
             }
         }
 
-        private void handleImportFromUri(Uri uri) => Task.Factory.StartNew(async () =>
+        private void handleImportFromUris(params Uri[] uris) => Task.Factory.StartNew(async () =>
         {
-            // there are more performant overloads of this method, but this one is the most backwards-compatible
-            // (dates back to API 1).
-            var cursor = ContentResolver?.Query(uri, null, null, null, null);
+            var tasks = new List<ImportTask>();
 
-            if (cursor == null)
-                return;
+            await Task.WhenAll(uris.Select(async uri =>
+            {
+                // there are more performant overloads of this method, but this one is the most backwards-compatible
+                // (dates back to API 1).
+                var cursor = ContentResolver?.Query(uri, null, null, null, null);
 
-            cursor.MoveToFirst();
+                if (cursor == null)
+                    return;
 
-            var filenameColumn = cursor.GetColumnIndex(OpenableColumns.DisplayName);
-            string filename = cursor.GetString(filenameColumn);
+                cursor.MoveToFirst();
 
-            // SharpCompress requires archive streams to be seekable, which the stream opened by
-            // OpenInputStream() seems to not necessarily be.
-            // copy to an arbitrary-access memory stream to be able to proceed with the import.
-            var copy = new MemoryStream();
-            using (var stream = ContentResolver.OpenInputStream(uri))
-                await stream.CopyToAsync(copy);
+                var filenameColumn = cursor.GetColumnIndex(OpenableColumns.DisplayName);
+                string filename = cursor.GetString(filenameColumn);
 
-            await game.Import(new ImportTask(copy, filename));
+                // SharpCompress requires archive streams to be seekable, which the stream opened by
+                // OpenInputStream() seems to not necessarily be.
+                // copy to an arbitrary-access memory stream to be able to proceed with the import.
+                var copy = new MemoryStream();
+                using (var stream = ContentResolver.OpenInputStream(uri))
+                    await stream.CopyToAsync(copy);
+
+                lock (tasks)
+                {
+                    tasks.Add(new ImportTask(copy, filename));
+                }
+            }));
+
+            await game.Import(tasks.ToArray());
         }, TaskCreationOptions.LongRunning);
     }
 }

From cc0442a9a17880bd6f427638f831f97f6f50cb50 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 16 Dec 2020 20:42:30 +0100
Subject: [PATCH 06933/10326] Fix CI inspections.

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 0a579cc347..521778a9cd 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -397,7 +397,7 @@ namespace osu.Game
 
         public virtual async Task Import(params ImportTask[] tasks)
         {
-            var extension = Path.GetExtension(tasks.First().Path)?.ToLowerInvariant();
+            var extension = Path.GetExtension(tasks.First().Path).ToLowerInvariant();
 
             foreach (var importer in fileImporters)
             {

From 41d8b84bd7c7aff099593a034c8dd71ee1d0ae13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 15:47:20 +0900
Subject: [PATCH 06934/10326] Revert MaxBaseScore to being a private field (no
 longe required to be public)

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index b4f29d7a6e..f4850d3325 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// The maximum achievable base score.
         /// </summary>
-        public double MaxBaseScore { get; private set; }
+        private double maxBaseScore;
 
         private double rollingMaxBaseScore;
         private double baseScore;
@@ -201,7 +201,7 @@ namespace osu.Game.Rulesets.Scoring
         private double getScore(ScoringMode mode)
         {
             return GetScore(mode, maxAchievableCombo,
-                MaxBaseScore > 0 ? baseScore / MaxBaseScore : 0,
+                maxBaseScore > 0 ? baseScore / maxBaseScore : 0,
                 maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1,
                 scoreResultCounts);
         }
@@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Scoring
                 computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
             }
 
-            double accuracy = MaxBaseScore > 0 ? computedBaseScore / MaxBaseScore : 0;
+            double accuracy = maxBaseScore > 0 ? computedBaseScore / maxBaseScore : 0;
             double comboRatio = maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1;
 
             double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts);
@@ -299,7 +299,7 @@ namespace osu.Game.Rulesets.Scoring
             if (storeResults)
             {
                 maxAchievableCombo = HighestCombo.Value;
-                MaxBaseScore = baseScore;
+                maxBaseScore = baseScore;
             }
 
             baseScore = 0;

From de9c21e7d19e265fbf776430d2708f860ed16bbf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 15:48:53 +0900
Subject: [PATCH 06935/10326] Tenatively mark leaderboard class as
 LongRunningLoad until final integration

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 33bcf06aa7..b2dc47ce61 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play.HUD
 {
+    [LongRunningLoad]
     public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
     {
         private readonly ScoreProcessor scoreProcessor;

From cc3dddf59fa432bad0fc2d36fe8810853223f48f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 16:02:06 +0900
Subject: [PATCH 06936/10326] Fix test scene crashing on second run of SetUp

Also correctly support LongRunningLoad
---
 ...TestSceneMultiplayerGameplayLeaderboard.cs | 53 +++++++++++++------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index 78f9db57be..0c8d8ca165 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -9,6 +9,8 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Online.Spectator;
@@ -29,31 +31,48 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
 
-        [SetUp]
-        public void SetUp() => Schedule(() =>
+        private MultiplayerGameplayLeaderboard leaderboard;
+
+        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+
+        public TestSceneMultiplayerGameplayLeaderboard()
         {
-            OsuScoreProcessor scoreProcessor;
-
-            streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
-
-            Children = new Drawable[]
+            base.Content.Children = new Drawable[]
             {
                 streamingClient,
                 lookupCache,
-                scoreProcessor = new OsuScoreProcessor(),
-                new MultiplayerGameplayLeaderboard(scoreProcessor, streamingClient.PlayingUsers.ToArray())
+                Content
+            };
+        }
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create leaderboard", () =>
+            {
+                OsuScoreProcessor scoreProcessor;
+                Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
+
+                var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
+
+                streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
+
+                Children = new Drawable[]
+                {
+                    scoreProcessor = new OsuScoreProcessor(),
+                };
+
+                scoreProcessor.ApplyBeatmap(playable);
+
+                LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(scoreProcessor, streamingClient.PlayingUsers.ToArray())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                }
-            };
+                }, Add);
+            });
 
-            Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
-
-            var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
-
-            scoreProcessor.ApplyBeatmap(playable);
-        });
+            AddUntilStep("wait for load", () => leaderboard.IsLoaded);
+        }
 
         [Test]
         public void TestScoreUpdates()

From f13683dc908e2f42b19d2a1fb6b05f808eb01b36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 16:05:41 +0900
Subject: [PATCH 06937/10326] Correctly account for max combo of the input,
 rather than the global

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

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index f4850d3325..f5fb918ba3 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -253,7 +253,7 @@ namespace osu.Game.Rulesets.Scoring
             }
 
             double accuracy = maxBaseScore > 0 ? computedBaseScore / maxBaseScore : 0;
-            double comboRatio = maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1;
+            double comboRatio = maxAchievableCombo > 0 ? (double)maxCombo / maxAchievableCombo : 1;
 
             double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts);
 

From 81b0db040179821af0928ae8389a85f5666f3f4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 16:14:41 +0900
Subject: [PATCH 06938/10326] Remove double construction of empty replay object

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index f40a7ccda8..18950a9d0a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -21,7 +21,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
-using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -164,7 +163,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected virtual void PrepareReplay()
         {
-            DrawableRuleset.SetRecordTarget(recordingScore = new Score { Replay = new Replay() });
+            DrawableRuleset.SetRecordTarget(recordingScore = new Score());
 
             ScoreProcessor.NewJudgement += result => ScoreProcessor.PopulateScore(recordingScore.ScoreInfo);
         }

From 3ff70d331adf2e87451b3bcb8306c39140d9a7e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 16:17:13 +0900
Subject: [PATCH 06939/10326] Mark recordingScore as nullable

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 18950a9d0a..a54f9fc047 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -156,6 +157,7 @@ namespace osu.Game.Screens.Play
                 PrepareReplay();
         }
 
+        [CanBeNull]
         private Score recordingScore;
 
         /// <summary>

From 78ce6f1cd21e81858f7f923dab907e52dde020e9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 13:30:55 +0300
Subject: [PATCH 06940/10326] Add friends list to API providers

---
 osu.Game/Online/API/APIAccess.cs      | 14 ++++++++++++--
 osu.Game/Online/API/DummyAPIAccess.cs |  7 +++++++
 osu.Game/Online/API/IAPIProvider.cs   |  6 ++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index b916339a53..f084f6f2c7 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -41,6 +41,8 @@ namespace osu.Game.Online.API
 
         public Bindable<User> LocalUser { get; } = new Bindable<User>(createGuestUser());
 
+        public BindableList<User> Friends { get; } = new BindableList<User>();
+
         public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
 
         protected bool HasLogin => authentication.Token.Value != null || (!string.IsNullOrEmpty(ProvidedUsername) && !string.IsNullOrEmpty(password));
@@ -143,6 +145,10 @@ namespace osu.Game.Online.API
 
                             failureCount = 0;
 
+                            var friendsReq = new GetFriendsRequest();
+                            friendsReq.Success += f => Friends.AddRange(f);
+                            handleRequest(friendsReq);
+
                             //we're connected!
                             state.Value = APIState.Online;
                         };
@@ -352,8 +358,12 @@ namespace osu.Game.Online.API
             password = null;
             authentication.Clear();
 
-            // Scheduled prior to state change such that the state changed event is invoked with the correct user present
-            Schedule(() => LocalUser.Value = createGuestUser());
+            // Scheduled prior to state change such that the state changed event is invoked with the correct user and their friends present
+            Schedule(() =>
+            {
+                LocalUser.Value = createGuestUser();
+                Friends.Clear();
+            });
 
             state.Value = APIState.Offline;
         }
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index e275676cea..7e5a6378ec 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -5,6 +5,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Users;
 
@@ -18,6 +19,12 @@ namespace osu.Game.Online.API
             Id = 1001,
         });
 
+        public BindableList<User> Friends { get; } = new BindableList<User>(new User
+        {
+            Username = @"Dummy's friend",
+            Id = 2002,
+        }.Yield());
+
         public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
 
         public string AccessToken => "token";
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index cadc806f4f..3f62b37a48 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -15,6 +15,12 @@ namespace osu.Game.Online.API
         /// </summary>
         Bindable<User> LocalUser { get; }
 
+        /// <summary>
+        /// The user's friends.
+        /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
+        /// </summary>
+        BindableList<User> Friends { get; }
+
         /// <summary>
         /// The current user's activity.
         /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.

From 449b9a21aefe912280728fd621fe11c782fbdb28 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 13:31:57 +0300
Subject: [PATCH 06941/10326] Allow OverlayView fetching with no API requests
 required

---
 osu.Game/Overlays/OverlayView.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
index c254cdf290..f5ef183bd5 100644
--- a/osu.Game/Overlays/OverlayView.cs
+++ b/osu.Game/Overlays/OverlayView.cs
@@ -42,25 +42,29 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Create the API request for fetching data.
         /// </summary>
-        protected abstract APIRequest<T> CreateRequest();
+        protected virtual APIRequest<T> CreateRequest() => null;
 
         /// <summary>
         /// Fired when results arrive from the main API request.
         /// </summary>
         /// <param name="response"></param>
-        protected abstract void OnSuccess(T response);
+        protected virtual void OnSuccess(T response)
+        {
+        }
 
         /// <summary>
         /// Force a re-request for data from the API.
         /// </summary>
-        protected void PerformFetch()
+        protected virtual void PerformFetch()
         {
             request?.Cancel();
-
             request = CreateRequest();
-            request.Success += response => Schedule(() => OnSuccess(response));
 
-            API.Queue(request);
+            if (request != null)
+            {
+                request.Success += response => Schedule(() => OnSuccess(response));
+                API.Queue(request);
+            }
         }
 
         private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>

From 94175d053289d944765c24d3e486f402929692e0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 13:33:17 +0300
Subject: [PATCH 06942/10326] Use global friends list instead of always
 fetching

---
 osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index 41b25ee1a5..8a8ac36e14 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -9,8 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Users;
 using osuTK;
 
@@ -143,11 +141,11 @@ namespace osu.Game.Overlays.Dashboard.Friends
             userListToolbar.SortCriteria.BindValueChanged(_ => recreatePanels());
         }
 
-        protected override APIRequest<List<User>> CreateRequest() => new GetFriendsRequest();
-
-        protected override void OnSuccess(List<User> response)
+        protected override void PerformFetch()
         {
-            Users = response;
+            base.PerformFetch();
+
+            Users = API.Friends.ToList();
         }
 
         private void recreatePanels()

From 904a4daa985b8f5e37573520a9147ad9adb80167 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 13:33:49 +0300
Subject: [PATCH 06943/10326] Add todo comment reminding of updating friends
 list along

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

diff --git a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
index 6e1b6e2c7d..6c2b2dc16a 100644
--- a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
@@ -50,6 +50,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 }
             };
 
+            // todo: when friending/unfriending is implemented, the APIAccess.Friends list should be updated accordingly.
+
             User.BindValueChanged(user => updateFollowers(user.NewValue), true);
         }
 

From 5d180753fa3cbc40971c867e5d1b36cdf1484306 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 13:44:30 +0300
Subject: [PATCH 06944/10326] Complete connection once friends list is
 succesfully fetched

---
 osu.Game/Online/API/APIAccess.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index f084f6f2c7..806a42a38b 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -146,11 +146,15 @@ namespace osu.Game.Online.API
                             failureCount = 0;
 
                             var friendsReq = new GetFriendsRequest();
-                            friendsReq.Success += f => Friends.AddRange(f);
-                            handleRequest(friendsReq);
+                            friendsReq.Success += f =>
+                            {
+                                Friends.AddRange(f);
 
-                            //we're connected!
-                            state.Value = APIState.Online;
+                                //we're connected!
+                                state.Value = APIState.Online;
+                            };
+
+                            handleRequest(friendsReq);
                         };
 
                         if (!handleRequest(userReq))

From 0faf3fdfd3fc4f96d137d1e8824398383e441ace Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 15:12:32 +0300
Subject: [PATCH 06945/10326] Update gameplay leaderboard scores with the new
 design

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs  |  11 +-
 .../Screens/Play/HUD/GameplayLeaderboard.cs   |  47 +--
 .../Play/HUD/GameplayLeaderboardScore.cs      | 268 ++++++++++++------
 3 files changed, 215 insertions(+), 111 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index df970c1c46..d0fdb3dd9c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -24,9 +24,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             Add(leaderboard = new TestGameplayLeaderboard
             {
                 Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
+                Origin = Anchor.TopCentre,
                 Scale = new Vector2(2),
-                RelativeSizeAxes = Axes.X,
             });
         }
 
@@ -39,7 +38,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add player user", () => leaderboard.AddPlayer(playerScore, new User { Username = "You" }));
+            AddStep("add player user", () => leaderboard.AddLocalUser(playerScore, new User { Username = "You" }));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -75,6 +74,12 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }
+
+            public void AddPlayer(BindableDouble totalScore, User user) =>
+                base.AddPlayer(totalScore, new BindableDouble(1f), new BindableInt(1), user, false);
+
+            public void AddLocalUser(BindableDouble totalScore, User user) =>
+                base.AddPlayer(totalScore, new BindableDouble(1f), new BindableInt(1), user, true);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index e53c56b390..a2673e3097 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -15,8 +15,7 @@ namespace osu.Game.Screens.Play.HUD
     {
         public GameplayLeaderboard()
         {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
+            AutoSizeAxes = Axes.Both;
 
             Direction = FillDirection.Vertical;
 
@@ -29,32 +28,44 @@ namespace osu.Game.Screens.Play.HUD
         /// <summary>
         /// Adds a player to the leaderboard.
         /// </summary>
-        /// <param name="currentScore">The bindable current score of the player.</param>
+        /// <param name="totalScore">A bindable of the player's total score.</param>
+        /// <param name="accuracy">A bindable of the player's accuracy.</param>
+        /// <param name="combo">A bindable of the player's current combo.</param>
         /// <param name="user">The player.</param>
-        public void AddPlayer([NotNull] BindableDouble currentScore, [NotNull] User user)
+        public void AddPlayer([NotNull] IBindableNumber<double> totalScore,
+                              [NotNull] IBindableNumber<double> accuracy,
+                              [NotNull] IBindableNumber<int> combo,
+                              [NotNull] User user)
         {
-            var scoreItem = addScore(currentScore.Value, user);
-            currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
+            AddPlayer(totalScore, accuracy, combo, user, false);
         }
 
-        private GameplayLeaderboardScore addScore(double totalScore, User user)
+        /// <summary>
+        /// Adds a player to the leaderboard.
+        /// </summary>
+        /// <param name="totalScore">A bindable of the player's total score.</param>
+        /// <param name="accuracy">A bindable of the player's accuracy.</param>
+        /// <param name="combo">A bindable of the player's current combo.</param>
+        /// <param name="user">The player.</param>
+        /// <param name="localUser">Whether the provided <paramref name="user"/> is the local user.</param>
+        protected void AddPlayer([NotNull] IBindableNumber<double> totalScore,
+                                 [NotNull] IBindableNumber<double> accuracy,
+                                 [NotNull] IBindableNumber<int> combo,
+                                 [NotNull] User user, bool localUser) => Schedule(() =>
         {
-            var scoreItem = new GameplayLeaderboardScore
+            Add(new GameplayLeaderboardScore(user, localUser)
             {
-                User = user,
-                TotalScore = totalScore,
-                OnScoreChange = updateScores,
-            };
+                TotalScore = { BindTarget = totalScore },
+                Accuracy = { BindTarget = accuracy },
+                Combo = { BindTarget = combo },
+            });
 
-            Add(scoreItem);
-            updateScores();
-
-            return scoreItem;
-        }
+            totalScore.BindValueChanged(_ => updateScores(), true);
+        });
 
         private void updateScores()
         {
-            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
+            var orderedByScore = this.OrderByDescending(i => i.TotalScore.Value).ToList();
 
             for (int i = 0; i < Count; i++)
             {
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 4c75f422c9..62ea5782e8 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -1,25 +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.Linq;
 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.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
 using osu.Game.Users;
+using osu.Game.Utils;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboardScore : CompositeDrawable
     {
-        private readonly OsuSpriteText positionText, positionSymbol, userString;
-        private readonly GlowingSpriteText scoreText;
+        private const float regular_width = 215f;
+        private const float extended_width = 235f;
 
-        public Action OnScoreChange;
+        private const float panel_height = 35f;
+
+        private OsuSpriteText positionText, scoreText, accuracyText, comboText;
+        public readonly BindableDouble TotalScore = new BindableDouble();
+        public readonly BindableDouble Accuracy = new BindableDouble();
+        public readonly BindableInt Combo = new BindableInt();
 
         private int? scorePosition;
 
@@ -34,103 +44,181 @@ namespace osu.Game.Screens.Play.HUD
                     positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}";
 
                 positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
-                positionSymbol.FadeTo(scorePosition.HasValue ? 1 : 0);
             }
         }
 
-        private double totalScore;
+        public User User { get; }
 
-        public double TotalScore
+        private readonly bool localUser;
+
+        public GameplayLeaderboardScore(User user, bool localUser)
         {
-            get => totalScore;
-            set
-            {
-                totalScore = value;
-                scoreText.Text = totalScore.ToString("N0");
+            User = user;
+            this.localUser = localUser;
 
-                OnScoreChange?.Invoke();
-            }
-        }
+            AutoSizeAxes = Axes.Both;
 
-        private User user;
-
-        public User User
-        {
-            get => user;
-            set
-            {
-                user = value;
-                userString.Text = user?.Username;
-            }
-        }
-
-        public GameplayLeaderboardScore()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            InternalChild = new Container
-            {
-                Masking = true,
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-                AutoSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new FillFlowContainer
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopRight,
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Margin = new MarginPadding { Right = 2.5f },
-                        Spacing = new Vector2(2.5f),
-                        Children = new[]
-                        {
-                            positionText = new OsuSpriteText
-                            {
-                                Alpha = 0,
-                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
-                            },
-                            positionSymbol = new OsuSpriteText
-                            {
-                                Alpha = 0,
-                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
-                                Text = ">",
-                            },
-                        }
-                    },
-                    new FillFlowContainer
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopLeft,
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Margin = new MarginPadding { Left = 2.5f },
-                        Spacing = new Vector2(2.5f),
-                        Children = new Drawable[]
-                        {
-                            userString = new OsuSpriteText
-                            {
-                                Size = new Vector2(80, 16),
-                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
-                            },
-                            scoreText = new GlowingSpriteText
-                            {
-                                GlowColour = Color4Extensions.FromHex(@"83ccfa"),
-                                Font = OsuFont.Numeric.With(size: 14),
-                            }
-                        }
-                    },
-                },
-            };
+            Anchor = Anchor.TopRight;
+            Origin = Anchor.TopRight;
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(IAPIProvider api)
         {
-            positionText.Colour = colours.YellowLight;
-            positionSymbol.Colour = colours.Yellow;
+            const float panel_shear = 0.15f;
+            const float shear_width = panel_height * panel_shear;
+
+            Color4 panelColour, textColour;
+            float panelWidth;
+
+            if (localUser)
+            {
+                panelWidth = extended_width;
+                panelColour = Color4Extensions.FromHex("7fcc33");
+                textColour = Color4.White;
+            }
+            else if (api.Friends.Any(f => User.Equals(f)))
+            {
+                panelWidth = extended_width;
+                panelColour = Color4Extensions.FromHex("ffd966");
+                textColour = Color4Extensions.FromHex("2e576b");
+            }
+            else
+            {
+                panelWidth = regular_width;
+                panelColour = Color4Extensions.FromHex("3399cc");
+                textColour = Color4.White;
+            }
+
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Masking = true,
+                    CornerRadius = 5f,
+                    Shear = new Vector2(panel_shear, 0f),
+                    Size = new Vector2(panelWidth, panel_height),
+                    Child = new Box
+                    {
+                        Alpha = 0.5f,
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = panelColour,
+                    }
+                },
+                new GridContainer
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Size = new Vector2(regular_width, panel_height),
+                    ColumnDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.Absolute, 35f),
+                        new Dimension(),
+                        new Dimension(GridSizeMode.Absolute, 85f),
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            positionText = new OsuSpriteText
+                            {
+                                Padding = new MarginPadding { Right = shear_width / 2 },
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Colour = textColour,
+                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.Bold),
+                                Shadow = false,
+                            },
+                            new Container
+                            {
+                                Padding = new MarginPadding { Horizontal = shear_width / 3 },
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new Container
+                                    {
+                                        Masking = true,
+                                        CornerRadius = 5f,
+                                        Shear = new Vector2(panel_shear, 0f),
+                                        RelativeSizeAxes = Axes.Both,
+                                        Children = new[]
+                                        {
+                                            new Box
+                                            {
+                                                Alpha = 0.5f,
+                                                RelativeSizeAxes = Axes.Both,
+                                                Colour = panelColour,
+                                            },
+                                        }
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Padding = new MarginPadding { Left = shear_width },
+                                        RelativeSizeAxes = Axes.X,
+                                        Width = 0.8f,
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Colour = textColour,
+                                        Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
+                                        Text = User.Username,
+                                        Truncate = true,
+                                        Shadow = false,
+                                    }
+                                }
+                            },
+                            new Container
+                            {
+                                Padding = new MarginPadding { Top = 2f, Right = 17.5f, Bottom = 5f },
+                                RelativeSizeAxes = Axes.Both,
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                Colour = textColour,
+                                Children = new Drawable[]
+                                {
+                                    scoreText = new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.TopLeft,
+                                        Origin = Anchor.TopLeft,
+                                        Spacing = new Vector2(0.5f, 0f),
+                                        Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold),
+                                        Shadow = false,
+                                    },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Anchor = Anchor.BottomLeft,
+                                        Origin = Anchor.BottomLeft,
+                                        Children = new Drawable[]
+                                        {
+                                            accuracyText = new OsuSpriteText
+                                            {
+                                                Anchor = Anchor.CentreLeft,
+                                                Origin = Anchor.CentreLeft,
+                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
+                                                Shadow = false,
+                                            },
+                                            comboText = new OsuSpriteText
+                                            {
+                                                Anchor = Anchor.CentreRight,
+                                                Origin = Anchor.CentreRight,
+                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
+                                                Shadow = false,
+                                            },
+                                        }
+                                    }
+                                },
+                            }
+                        }
+                    }
+                }
+            };
+
+            TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
+            Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
+            Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
         }
     }
 }

From c15bb6b928a4130d1515e8db07dd2e9f071dccfb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 17 Dec 2020 21:47:57 +0900
Subject: [PATCH 06946/10326] Add beatmap hash to MultiplayerRoomSettings

---
 .../RealtimeMultiplayer/MultiplayerRoomSettings.cs    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index d2f64235c3..60e0d1292e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
@@ -18,13 +18,20 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public int RulesetID { get; set; }
 
+        public string BeatmapChecksum { get; set; } = string.Empty;
+
         public string Name { get; set; } = "Unnamed room";
 
         [NotNull]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID && Name.Equals(other.Name, StringComparison.Ordinal);
+        public bool Equals(MultiplayerRoomSettings other)
+            => BeatmapID == other.BeatmapID
+               && BeatmapChecksum == other.BeatmapChecksum
+               && Mods.SequenceEqual(other.Mods)
+               && RulesetID == other.RulesetID
+               && Name.Equals(other.Name, StringComparison.Ordinal);
 
-        public override string ToString() => $"Name:{Name} Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
+        public override string ToString() => $"Name:{Name} Beatmap:{BeatmapID} ({BeatmapChecksum}) Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
     }
 }

From 5e4f667cffac3ce6f4bfb108b29697e8fea9ba40 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 01:27:58 +0300
Subject: [PATCH 06947/10326] Revert "Allow OverlayView fetching with no API
 requests required"

This reverts commit 449b9a21aefe912280728fd621fe11c782fbdb28.
---
 osu.Game/Overlays/OverlayView.cs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
index f5ef183bd5..c254cdf290 100644
--- a/osu.Game/Overlays/OverlayView.cs
+++ b/osu.Game/Overlays/OverlayView.cs
@@ -42,29 +42,25 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Create the API request for fetching data.
         /// </summary>
-        protected virtual APIRequest<T> CreateRequest() => null;
+        protected abstract APIRequest<T> CreateRequest();
 
         /// <summary>
         /// Fired when results arrive from the main API request.
         /// </summary>
         /// <param name="response"></param>
-        protected virtual void OnSuccess(T response)
-        {
-        }
+        protected abstract void OnSuccess(T response);
 
         /// <summary>
         /// Force a re-request for data from the API.
         /// </summary>
-        protected virtual void PerformFetch()
+        protected void PerformFetch()
         {
             request?.Cancel();
-            request = CreateRequest();
 
-            if (request != null)
-            {
-                request.Success += response => Schedule(() => OnSuccess(response));
-                API.Queue(request);
-            }
+            request = CreateRequest();
+            request.Success += response => Schedule(() => OnSuccess(response));
+
+            API.Queue(request);
         }
 
         private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>

From 9c22753f3fb23f94a19b3870d7cc1e46638e616e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 02:51:19 +0300
Subject: [PATCH 06948/10326] Remove unnecessary inheritance to OverlayView

---
 .../Visual/Online/TestSceneFriendDisplay.cs   | 11 +++-----
 .../Dashboard/Friends/FriendDisplay.cs        | 26 ++++++++++++-------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
index 0cc6e9f358..9bece39ca0 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private TestFriendDisplay display;
+        private FriendDisplay display;
 
         [SetUp]
         public void Setup() => Schedule(() =>
@@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual.Online
             Child = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = display = new TestFriendDisplay()
+                Child = display = new FriendDisplay()
             };
         });
 
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestOnline()
         {
-            AddStep("Fetch online", () => display?.Fetch());
+            // No need to do anything, fetch is performed automatically.
         }
 
         private List<User> getUsers() => new List<User>
@@ -76,10 +76,5 @@ namespace osu.Game.Tests.Visual.Online
                 LastVisit = DateTimeOffset.Now
             }
         };
-
-        private class TestFriendDisplay : FriendDisplay
-        {
-            public void Fetch() => PerformFetch();
-        }
     }
 }
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index 8a8ac36e14..cc26a11da1 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -5,16 +5,18 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 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;
 using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Overlays.Dashboard.Friends
 {
-    public class FriendDisplay : OverlayView<List<User>>
+    public class FriendDisplay : CompositeDrawable
     {
         private List<User> users = new List<User>();
 
@@ -39,8 +41,16 @@ namespace osu.Game.Overlays.Dashboard.Friends
         private Container itemsPlaceholder;
         private LoadingLayer loading;
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private readonly IBindableList<User> apiFriends = new BindableList<User>();
+
+        public FriendDisplay()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(OverlayColourProvider colourProvider, IAPIProvider api)
         {
             InternalChild = new FillFlowContainer
             {
@@ -130,6 +140,9 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
             background.Colour = colourProvider.Background4;
             controlBackground.Colour = colourProvider.Background5;
+
+            apiFriends.BindTo(api.Friends);
+            apiFriends.BindCollectionChanged((_, __) => Schedule(() => Users = apiFriends.ToList()), true);
         }
 
         protected override void LoadComplete()
@@ -141,13 +154,6 @@ namespace osu.Game.Overlays.Dashboard.Friends
             userListToolbar.SortCriteria.BindValueChanged(_ => recreatePanels());
         }
 
-        protected override void PerformFetch()
-        {
-            base.PerformFetch();
-
-            Users = API.Friends.ToList();
-        }
-
         private void recreatePanels()
         {
             if (!users.Any())

From 8a01e567a146d71405b8feeb7bfd7d532569b000 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 03:06:28 +0300
Subject: [PATCH 06949/10326] Fix API potentially getting stuck in connecting
 state

---
 osu.Game/Online/API/APIAccess.cs | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 806a42a38b..b42c78e9cd 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -145,16 +145,14 @@ namespace osu.Game.Online.API
 
                             failureCount = 0;
 
-                            var friendsReq = new GetFriendsRequest();
-                            friendsReq.Success += f =>
+                            fetchFriends(() =>
                             {
-                                Friends.AddRange(f);
-
                                 //we're connected!
                                 state.Value = APIState.Online;
-                            };
-
-                            handleRequest(friendsReq);
+                            }, () =>
+                            {
+                                state.Value = APIState.Failing;
+                            });
                         };
 
                         if (!handleRequest(userReq))
@@ -255,6 +253,19 @@ namespace osu.Game.Online.API
             return null;
         }
 
+        private void fetchFriends(Action onSuccess, Action onFail)
+        {
+            var friendsReq = new GetFriendsRequest();
+            friendsReq.Success += res =>
+            {
+                Friends.AddRange(res);
+                onSuccess?.Invoke();
+            };
+
+            if (!handleRequest(friendsReq))
+                onFail?.Invoke();
+        }
+
         /// <summary>
         /// Handle a single API request.
         /// Ensures all exceptions are caught and dealt with correctly.

From a01ed1827a481fb8ac87aef1a1fda89ed5b33f4e Mon Sep 17 00:00:00 2001
From: Graham Johnson <johnson.graham.ib@gmail.com>
Date: Thu, 17 Dec 2020 19:34:16 -0500
Subject: [PATCH 06950/10326] Align the drag circles on the selction box in the
 editor to be on the center of the border

---
 .../Edit/Compose/Components/SelectionBox.cs   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 347d9e3ba7..e4feceb987 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -235,6 +235,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void addDragHandle(Anchor anchor) => AddInternal(new SelectionBoxDragHandle
         {
             Anchor = anchor,
+            Y = getAdjustmentToCenterCircleOnBorder(anchor).Y,
+            X = getAdjustmentToCenterCircleOnBorder(anchor).X,
             HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
             OperationStarted = operationStarted,
             OperationEnded = operationEnded
@@ -251,6 +253,45 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return (endAngle - startAngle) * 180 / MathF.PI;
         }
 
+        /// <summary>
+        /// Adjust Drag circle to be centered on the center of the border instead of on the edge.
+        /// </summary>
+        /// <param name="anchor">The part of the rectangle to be adjusted.</param>
+        private Vector2 getAdjustmentToCenterCircleOnBorder(Anchor anchor)
+        {
+            Vector2 adjustment = Vector2.Zero;
+
+            switch (anchor)
+            {
+                case Anchor.TopLeft:
+                case Anchor.CentreLeft:
+                case Anchor.BottomLeft:
+                    adjustment.X = BORDER_RADIUS / 2;
+                    break;
+                case Anchor.TopRight:
+                case Anchor.CentreRight:
+                case Anchor.BottomRight:
+                    adjustment.X = -BORDER_RADIUS / 2;
+                    break;
+            }
+
+            switch (anchor)
+            {
+                case Anchor.TopLeft:
+                case Anchor.TopCentre:
+                case Anchor.TopRight:
+                    adjustment.Y = BORDER_RADIUS / 2;
+                    break;
+                case Anchor.BottomLeft:
+                case Anchor.BottomCentre:
+                case Anchor.BottomRight:
+                    adjustment.Y = -BORDER_RADIUS / 2;
+                    break;
+            }
+
+            return adjustment;
+        }
+
         private void operationEnded()
         {
             if (--activeOperations == 0)

From a8abefcd665adf869b97e45d89c0d85a6d979a7b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 03:34:33 +0300
Subject: [PATCH 06951/10326] Make GameplayLeaderboardScore a model class

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs  | 20 +++++----
 .../Screens/Play/HUD/GameplayLeaderboard.cs   | 41 ++-----------------
 .../Play/HUD/GameplayLeaderboardScore.cs      |  5 ++-
 3 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index d0fdb3dd9c..12bc918d45 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add player user", () => leaderboard.AddLocalUser(playerScore, new User { Username = "You" }));
+            AddStep("add local player", () => leaderboard.Add(createLeaderboardScore(playerScore, "You", true)));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -48,8 +48,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => leaderboard.AddPlayer(player2Score, new User { Username = "Player 2" }));
-            AddStep("add player 3", () => leaderboard.AddPlayer(player3Score, new User { Username = "Player 3" }));
+            AddStep("add player 2", () => leaderboard.Add(createLeaderboardScore(player2Score, "Player 2")));
+            AddStep("add player 3", () => leaderboard.Add(createLeaderboardScore(player3Score, "Player 3")));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
@@ -66,6 +66,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
         }
 
+        private static GameplayLeaderboardScore createLeaderboardScore(BindableDouble score, string username, bool localOrReplayPlayer = false)
+        {
+            return new GameplayLeaderboardScore(new User { Username = username }, localOrReplayPlayer)
+            {
+                TotalScore = { BindTarget = score },
+            };
+        }
+
         private class TestGameplayLeaderboard : GameplayLeaderboard
         {
             public bool CheckPositionByUsername(string username, int? expectedPosition)
@@ -74,12 +82,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }
-
-            public void AddPlayer(BindableDouble totalScore, User user) =>
-                base.AddPlayer(totalScore, new BindableDouble(1f), new BindableInt(1), user, false);
-
-            public void AddLocalUser(BindableDouble totalScore, User user) =>
-                base.AddPlayer(totalScore, new BindableDouble(1f), new BindableInt(1), user, true);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index a2673e3097..573bf54b14 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -2,11 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using JetBrains.Annotations;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -25,44 +22,12 @@ namespace osu.Game.Screens.Play.HUD
             LayoutEasing = Easing.OutQuint;
         }
 
-        /// <summary>
-        /// Adds a player to the leaderboard.
-        /// </summary>
-        /// <param name="totalScore">A bindable of the player's total score.</param>
-        /// <param name="accuracy">A bindable of the player's accuracy.</param>
-        /// <param name="combo">A bindable of the player's current combo.</param>
-        /// <param name="user">The player.</param>
-        public void AddPlayer([NotNull] IBindableNumber<double> totalScore,
-                              [NotNull] IBindableNumber<double> accuracy,
-                              [NotNull] IBindableNumber<int> combo,
-                              [NotNull] User user)
+        public override void Add(GameplayLeaderboardScore drawable)
         {
-            AddPlayer(totalScore, accuracy, combo, user, false);
+            base.Add(drawable);
+            drawable?.TotalScore.BindValueChanged(_ => updateScores(), true);
         }
 
-        /// <summary>
-        /// Adds a player to the leaderboard.
-        /// </summary>
-        /// <param name="totalScore">A bindable of the player's total score.</param>
-        /// <param name="accuracy">A bindable of the player's accuracy.</param>
-        /// <param name="combo">A bindable of the player's current combo.</param>
-        /// <param name="user">The player.</param>
-        /// <param name="localUser">Whether the provided <paramref name="user"/> is the local user.</param>
-        protected void AddPlayer([NotNull] IBindableNumber<double> totalScore,
-                                 [NotNull] IBindableNumber<double> accuracy,
-                                 [NotNull] IBindableNumber<int> combo,
-                                 [NotNull] User user, bool localUser) => Schedule(() =>
-        {
-            Add(new GameplayLeaderboardScore(user, localUser)
-            {
-                TotalScore = { BindTarget = totalScore },
-                Accuracy = { BindTarget = accuracy },
-                Combo = { BindTarget = combo },
-            });
-
-            totalScore.BindValueChanged(_ => updateScores(), true);
-        });
-
         private void updateScores()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore.Value).ToList();
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 62ea5782e8..f94d6bd01f 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -27,8 +27,9 @@ namespace osu.Game.Screens.Play.HUD
         private const float panel_height = 35f;
 
         private OsuSpriteText positionText, scoreText, accuracyText, comboText;
-        public readonly BindableDouble TotalScore = new BindableDouble();
-        public readonly BindableDouble Accuracy = new BindableDouble();
+
+        public readonly BindableDouble TotalScore = new BindableDouble(1000000);
+        public readonly BindableDouble Accuracy = new BindableDouble(1);
         public readonly BindableInt Combo = new BindableInt();
 
         private int? scorePosition;

From 92bf74ba29b3bc6c8ec645fe54d9c218d76ff6cf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 03:37:24 +0300
Subject: [PATCH 06952/10326] localUser -> localOrReplayPlayer

---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index f94d6bd01f..285ed93341 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -50,12 +50,17 @@ namespace osu.Game.Screens.Play.HUD
 
         public User User { get; }
 
-        private readonly bool localUser;
+        private readonly bool localOrReplayPlayer;
 
-        public GameplayLeaderboardScore(User user, bool localUser)
+        /// <summary>
+        /// Creates a new <see cref="GameplayLeaderboardScore"/>.
+        /// </summary>
+        /// <param name="user">The score's player.</param>
+        /// <param name="localOrReplayPlayer">Whether the player is the local user or a replay player.</param>
+        public GameplayLeaderboardScore(User user, bool localOrReplayPlayer)
         {
             User = user;
-            this.localUser = localUser;
+            this.localOrReplayPlayer = localOrReplayPlayer;
 
             AutoSizeAxes = Axes.Both;
 
@@ -72,7 +77,7 @@ namespace osu.Game.Screens.Play.HUD
             Color4 panelColour, textColour;
             float panelWidth;
 
-            if (localUser)
+            if (localOrReplayPlayer)
             {
                 panelWidth = extended_width;
                 panelColour = Color4Extensions.FromHex("7fcc33");

From a0235a06e642319ce5108c21a3643e09bdc2031f Mon Sep 17 00:00:00 2001
From: Graham Johnson <johnson.graham.ib@gmail.com>
Date: Thu, 17 Dec 2020 19:40:21 -0500
Subject: [PATCH 06953/10326] update comment

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index e4feceb987..4a0a925962 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -257,6 +257,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Adjust Drag circle to be centered on the center of the border instead of on the edge.
         /// </summary>
         /// <param name="anchor">The part of the rectangle to be adjusted.</param>
+        /// <returns>A 2d vector on how much to adjust the drag circle</returns>
         private Vector2 getAdjustmentToCenterCircleOnBorder(Anchor anchor)
         {
             Vector2 adjustment = Vector2.Zero;

From 44f4ed4fd3001587378bae5ff90d4e4edfd5011a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 11:19:40 +0900
Subject: [PATCH 06954/10326] Fix spacing

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 4a0a925962..f50e599457 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -269,6 +269,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 case Anchor.BottomLeft:
                     adjustment.X = BORDER_RADIUS / 2;
                     break;
+
                 case Anchor.TopRight:
                 case Anchor.CentreRight:
                 case Anchor.BottomRight:
@@ -283,6 +284,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 case Anchor.TopRight:
                     adjustment.Y = BORDER_RADIUS / 2;
                     break;
+
                 case Anchor.BottomLeft:
                 case Anchor.BottomCentre:
                 case Anchor.BottomRight:

From 9079d33412207d9f3e18940d3d61c8d8f1a86137 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 11:20:21 +0900
Subject: [PATCH 06955/10326] X before Y for sanity

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index f50e599457..8ccd4f71e9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -235,8 +235,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void addDragHandle(Anchor anchor) => AddInternal(new SelectionBoxDragHandle
         {
             Anchor = anchor,
-            Y = getAdjustmentToCenterCircleOnBorder(anchor).Y,
             X = getAdjustmentToCenterCircleOnBorder(anchor).X,
+            Y = getAdjustmentToCenterCircleOnBorder(anchor).Y,
             HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
             OperationStarted = operationStarted,
             OperationEnded = operationEnded

From 208a9e596ed91f212f37745f493c3416601c3ada Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 14:58:58 +0900
Subject: [PATCH 06956/10326] Set new room for each test iteration

---
 .../Multiplayer/TestSceneLoungeRoomInfo.cs    |  5 +---
 .../TestSceneMatchBeatmapDetailArea.cs        |  4 +---
 .../Multiplayer/TestSceneMatchHeader.cs       | 12 ++++++----
 .../Multiplayer/TestSceneMatchLeaderboard.cs  | 10 +++++---
 .../TestSceneMatchSettingsOverlay.cs          |  4 +---
 .../Multiplayer/TestSceneMatchSongSelect.cs   |  7 ------
 .../Multiplayer/TestSceneMatchSubScreen.cs    |  6 -----
 .../TestSceneOverlinedParticipants.cs         |  5 ++--
 .../Multiplayer/TestSceneOverlinedPlaylist.cs | 23 +++++++++++--------
 .../Multiplayer/TestSceneParticipantsList.cs  | 13 +++++------
 osu.Game/Tests/Visual/MultiplayerTestScene.cs | 15 +++++++-----
 11 files changed, 49 insertions(+), 55 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
index cdad37a9ad..9baaa42c83 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -4,7 +4,6 @@
 using System;
 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;
@@ -14,10 +13,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneLoungeRoomInfo : MultiplayerTestScene
     {
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room();
-
             Child = new RoomInfo
             {
                 Anchor = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 01cd26fbe5..6b1d90e06e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -24,10 +24,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private RulesetStore rulesetStore { get; set; }
 
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room();
-
             Child = new MatchBeatmapDetailArea
             {
                 Anchor = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index e5943105b7..ec5292e51e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.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 NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
@@ -14,7 +15,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         public TestSceneMatchHeader()
         {
-            Room = new Room();
+            Child = new Header();
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
             Room.Playlist.Add(new PlaylistItem
             {
                 Beatmap =
@@ -41,8 +47,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             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/TestSceneMatchLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
index c24c6c4ba3..a72f71d79c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
@@ -3,10 +3,10 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Users;
 using osuTK;
@@ -19,8 +19,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneMatchLeaderboard()
         {
-            Room = new Room { RoomID = { Value = 3 } };
-
             Add(new MatchLeaderboard
             {
                 Origin = Anchor.Centre,
@@ -40,6 +38,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             api.Queue(req);
         }
 
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Room.RoomID.Value = 3;
+        });
+
         private class GetRoomScoresRequest : APIRequest<List<RoomScore>>
         {
             protected override string Target => "rooms/3/leaderboard";
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 07ff56b5c3..cbe8cc6137 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -23,10 +23,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private TestRoomSettings settings;
 
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room();
-
             settings = new TestRoomSettings
             {
                 RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 55b8902d7b..4742fd0d84 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -14,7 +14,6 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -94,12 +93,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
         }
 
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            Room = new Room();
-        });
-
         [Test]
         public void TestItemAddedIfEmptyOnStart()
         {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index 2e22317539..65e9893851 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -45,12 +45,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             manager.Import(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo.BeatmapSet).Wait();
         }
 
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            Room = new Room();
-        });
-
         [SetUpSteps]
         public void SetupSteps()
         {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
index b6bfa7c93a..481541a1af 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
@@ -14,9 +13,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         protected override bool UseOnlineAPI => true;
 
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room { RoomID = { Value = 7 } };
+            Room.RoomID.Value = 7;
         });
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
index 14984988cb..3dbc990f7a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
@@ -16,7 +17,18 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneOverlinedPlaylist()
         {
-            Room = new Room { RoomID = { Value = 7 } };
+            Add(new DrawableRoomPlaylist(false, false)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(500),
+            });
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Room.RoomID.Value = 7;
 
             for (int i = 0; i < 10; i++)
             {
@@ -27,13 +39,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     Ruleset = { Value = new OsuRuleset().RulesetInfo }
                 });
             }
-
-            Add(new DrawableRoomPlaylist(false, false)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(500),
-            });
-        }
+        });
     }
 }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
index f71c5fc5d2..1e5647f7f4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -12,15 +11,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            Room = new Room { RoomID = { Value = 7 } };
-        });
-
         public TestSceneParticipantsList()
         {
             Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
         }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Room.RoomID.Value = 7;
+        });
     }
 }
diff --git a/osu.Game/Tests/Visual/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/MultiplayerTestScene.cs
index 4d073f16f4..dc614896c5 100644
--- a/osu.Game/Tests/Visual/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/MultiplayerTestScene.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Multiplayer;
@@ -10,13 +11,9 @@ namespace osu.Game.Tests.Visual
     public abstract class MultiplayerTestScene : ScreenTestScene
     {
         [Cached]
-        private readonly Bindable<Room> currentRoom = new Bindable<Room>();
+        private readonly Bindable<Room> currentRoom = new Bindable<Room>(new Room());
 
-        protected Room Room
-        {
-            get => currentRoom.Value;
-            set => currentRoom.Value = value;
-        }
+        protected Room Room => currentRoom.Value;
 
         private CachedModelDependencyContainer<Room> dependencies;
 
@@ -26,5 +23,11 @@ namespace osu.Game.Tests.Visual
             dependencies.Model.BindTo(currentRoom);
             return dependencies;
         }
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Room.CopyFrom(new Room());
+        });
     }
 }

From a4f7eb83c7baa4b847600fcca112b219abe71287 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 15:07:39 +0900
Subject: [PATCH 06957/10326] Fix overlined participants test scene not working

---
 .../TestSceneOverlinedParticipants.cs          | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
index 481541a1af..88ecdb0aad 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
@@ -4,18 +4,25 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Multi.Components;
-using osuTK;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneOverlinedParticipants : MultiplayerTestScene
     {
-        protected override bool UseOnlineAPI => true;
-
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
             Room.RoomID.Value = 7;
+
+            for (int i = 0; i < 50; i++)
+            {
+                Room.RecentParticipants.Add(new User
+                {
+                    Username = "peppy",
+                    Id = 2
+                });
+            }
         });
 
         [Test]
@@ -27,7 +34,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Width = 500,
+                    Width = 0.2f,
                 };
             });
         }
@@ -41,7 +48,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(500)
+                    Width = 0.2f,
+                    Height = 0.2f,
                 };
             });
         }

From f0e91ba43188c7cc3f7a0e660c13477551082f71 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 15:09:11 +0900
Subject: [PATCH 06958/10326] Fix overlined playlist test scene not working

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
index 3dbc990f7a..f8af67aa7f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(500),
+                Items = { BindTarget = Room.Playlist }
             });
         }
 

From 8c5e25b990af1ea231617428af012ba516db95ee Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 15:11:11 +0900
Subject: [PATCH 06959/10326] Remove overlined test scenes

---
 .../TestSceneOverlinedParticipants.cs         | 57 -------------------
 .../Multiplayer/TestSceneOverlinedPlaylist.cs | 45 ---------------
 .../Multiplayer/TestSceneParticipantsList.cs  | 46 ++++++++++++---
 3 files changed, 39 insertions(+), 109 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
 delete mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
deleted file mode 100644
index 88ecdb0aad..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ /dev/null
@@ -1,57 +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.Components;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    public class TestSceneOverlinedParticipants : MultiplayerTestScene
-    {
-        [SetUp]
-        public new void Setup() => Schedule(() =>
-        {
-            Room.RoomID.Value = 7;
-
-            for (int i = 0; i < 50; i++)
-            {
-                Room.RecentParticipants.Add(new User
-                {
-                    Username = "peppy",
-                    Id = 2
-                });
-            }
-        });
-
-        [Test]
-        public void TestHorizontalLayout()
-        {
-            AddStep("create component", () =>
-            {
-                Child = new ParticipantsDisplay(Direction.Horizontal)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Width = 0.2f,
-                };
-            });
-        }
-
-        [Test]
-        public void TestVerticalLayout()
-        {
-            AddStep("create component", () =>
-            {
-                Child = new ParticipantsDisplay(Direction.Vertical)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Width = 0.2f,
-                    Height = 0.2f,
-                };
-            });
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
deleted file mode 100644
index f8af67aa7f..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.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 NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi;
-using osu.Game.Tests.Beatmaps;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    public class TestSceneOverlinedPlaylist : MultiplayerTestScene
-    {
-        protected override bool UseOnlineAPI => true;
-
-        public TestSceneOverlinedPlaylist()
-        {
-            Add(new DrawableRoomPlaylist(false, false)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(500),
-                Items = { BindTarget = Room.Playlist }
-            });
-        }
-
-        [SetUp]
-        public new void Setup() => Schedule(() =>
-        {
-            Room.RoomID.Value = 7;
-
-            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 }
-                });
-            }
-        });
-    }
-}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
index 1e5647f7f4..7bbec7d30e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
@@ -4,22 +4,54 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Multi.Components;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneParticipantsList : MultiplayerTestScene
     {
-        protected override bool UseOnlineAPI => true;
-
-        public TestSceneParticipantsList()
-        {
-            Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
-        }
-
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
             Room.RoomID.Value = 7;
+
+            for (int i = 0; i < 50; i++)
+            {
+                Room.RecentParticipants.Add(new User
+                {
+                    Username = "peppy",
+                    Id = 2
+                });
+            }
         });
+
+        [Test]
+        public void TestHorizontalLayout()
+        {
+            AddStep("create component", () =>
+            {
+                Child = new ParticipantsDisplay(Direction.Horizontal)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 0.2f,
+                };
+            });
+        }
+
+        [Test]
+        public void TestVerticalLayout()
+        {
+            AddStep("create component", () =>
+            {
+                Child = new ParticipantsDisplay(Direction.Vertical)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 0.2f,
+                    Height = 0.2f,
+                };
+            });
+        }
     }
 }

From 206bf3713ed2af58b97b55489783848728934dde Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:16:36 +0900
Subject: [PATCH 06960/10326] Make IAPIProvider read-only bindables into
 IBindables

---
 osu.Desktop/DiscordRichPresence.cs            |  2 +-
 .../Visual/Menus/TestSceneDisclaimer.cs       |  3 ++-
 .../Online/TestSceneAccountCreationOverlay.cs |  2 +-
 .../Online/TestSceneNowPlayingCommand.cs      | 11 +++++---
 osu.Game/Online/API/APIAccess.cs              | 26 +++++++++++--------
 osu.Game/Online/API/DummyAPIAccess.cs         |  4 +++
 osu.Game/Online/API/IAPIProvider.cs           |  6 ++---
 osu.Game/OsuGame.cs                           |  3 +--
 .../BeatmapSet/Buttons/FavouriteButton.cs     |  2 +-
 .../BeatmapSet/Scores/ScoresContainer.cs      |  2 +-
 .../Overlays/Comments/CommentsContainer.cs    |  2 +-
 .../Backgrounds/BackgroundScreenDefault.cs    |  2 +-
 osu.Game/Screens/Menu/Disclaimer.cs           |  2 +-
 .../Screens/Menu/MenuLogoVisualisation.cs     |  2 +-
 osu.Game/Screens/Menu/MenuSideFlashes.cs      |  2 +-
 15 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index 26d7402a5b..f1878d967d 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -26,7 +26,7 @@ namespace osu.Desktop
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        private Bindable<User> user;
+        private IBindable<User> user;
 
         private readonly IBindable<UserStatus> status = new Bindable<UserStatus>();
         private readonly IBindable<UserActivity> activity = new Bindable<UserActivity>();
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs b/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
index 49fab08ded..9cbdee3632 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Online.API;
 using osu.Game.Screens.Menu;
 using osu.Game.Users;
 
@@ -16,7 +17,7 @@ namespace osu.Game.Tests.Visual.Menus
 
             AddStep("toggle support", () =>
             {
-                API.LocalUser.Value = new User
+                ((DummyAPIAccess)API).LocalUser.Value = new User
                 {
                     Username = API.LocalUser.Value.Username,
                     Id = API.LocalUser.Value.Id + 1,
diff --git a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
index 6c8ec917ba..dcfe0432a8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual.Online
     {
         private readonly Container userPanelArea;
 
-        private Bindable<User> localUser;
+        private IBindable<User> localUser;
 
         public TestSceneAccountCreationOverlay()
         {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
index 8e151a987a..0324da6cf5 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
 using osu.Game.Online.Chat;
 using osu.Game.Rulesets;
 using osu.Game.Users;
@@ -18,6 +19,8 @@ namespace osu.Game.Tests.Visual.Online
         [Cached(typeof(IChannelPostTarget))]
         private PostTarget postTarget { get; set; }
 
+        private DummyAPIAccess api => (DummyAPIAccess)API;
+
         public TestSceneNowPlayingCommand()
         {
             Add(postTarget = new PostTarget());
@@ -26,7 +29,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestGenericActivity()
         {
-            AddStep("Set activity", () => API.Activity.Value = new UserActivity.InLobby(null));
+            AddStep("Set activity", () => api.Activity.Value = new UserActivity.InLobby(null));
 
             AddStep("Run command", () => Add(new NowPlayingCommand()));
 
@@ -36,7 +39,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestEditActivity()
         {
-            AddStep("Set activity", () => API.Activity.Value = new UserActivity.Editing(new BeatmapInfo()));
+            AddStep("Set activity", () => api.Activity.Value = new UserActivity.Editing(new BeatmapInfo()));
 
             AddStep("Run command", () => Add(new NowPlayingCommand()));
 
@@ -46,7 +49,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestPlayActivity()
         {
-            AddStep("Set activity", () => API.Activity.Value = new UserActivity.SoloGame(new BeatmapInfo(), new RulesetInfo()));
+            AddStep("Set activity", () => api.Activity.Value = new UserActivity.SoloGame(new BeatmapInfo(), new RulesetInfo()));
 
             AddStep("Run command", () => Add(new NowPlayingCommand()));
 
@@ -57,7 +60,7 @@ namespace osu.Game.Tests.Visual.Online
         [TestCase(false)]
         public void TestLinkPresence(bool hasOnlineId)
         {
-            AddStep("Set activity", () => API.Activity.Value = new UserActivity.InLobby(null));
+            AddStep("Set activity", () => api.Activity.Value = new UserActivity.InLobby(null));
 
             AddStep("Set beatmap", () => Beatmap.Value = new DummyWorkingBeatmap(Audio, null)
             {
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index b42c78e9cd..b96475d5bf 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -39,11 +39,15 @@ namespace osu.Game.Online.API
 
         private string password;
 
-        public Bindable<User> LocalUser { get; } = new Bindable<User>(createGuestUser());
+        public IBindable<User> LocalUser => localUser;
+        public IBindableList<User> Friends => friends;
+        public IBindable<UserActivity> Activity => activity;
 
-        public BindableList<User> Friends { get; } = new BindableList<User>();
+        private Bindable<User> localUser { get; } = new Bindable<User>(createGuestUser());
 
-        public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
+        private BindableList<User> friends { get; } = new BindableList<User>();
+
+        private Bindable<UserActivity> activity { get; } = new Bindable<UserActivity>();
 
         protected bool HasLogin => authentication.Token.Value != null || (!string.IsNullOrEmpty(ProvidedUsername) && !string.IsNullOrEmpty(password));
 
@@ -63,10 +67,10 @@ namespace osu.Game.Online.API
             authentication.TokenString = config.Get<string>(OsuSetting.Token);
             authentication.Token.ValueChanged += onTokenChanged;
 
-            LocalUser.BindValueChanged(u =>
+            localUser.BindValueChanged(u =>
             {
-                u.OldValue?.Activity.UnbindFrom(Activity);
-                u.NewValue.Activity.BindTo(Activity);
+                u.OldValue?.Activity.UnbindFrom(activity);
+                u.NewValue.Activity.BindTo(activity);
             }, true);
 
             var thread = new Thread(run)
@@ -138,10 +142,10 @@ namespace osu.Game.Online.API
                         var userReq = new GetUserRequest();
                         userReq.Success += u =>
                         {
-                            LocalUser.Value = u;
+                            localUser.Value = u;
 
                             // todo: save/pull from settings
-                            LocalUser.Value.Status.Value = new UserStatusOnline();
+                            localUser.Value.Status.Value = new UserStatusOnline();
 
                             failureCount = 0;
 
@@ -343,7 +347,7 @@ namespace osu.Game.Online.API
             return true;
         }
 
-        public bool IsLoggedIn => LocalUser.Value.Id > 1;
+        public bool IsLoggedIn => localUser.Value.Id > 1;
 
         public void Queue(APIRequest request)
         {
@@ -376,8 +380,8 @@ namespace osu.Game.Online.API
             // Scheduled prior to state change such that the state changed event is invoked with the correct user and their friends present
             Schedule(() =>
             {
-                LocalUser.Value = createGuestUser();
-                Friends.Clear();
+                localUser.Value = createGuestUser();
+                friends.Clear();
             });
 
             state.Value = APIState.Offline;
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 7e5a6378ec..a0bc8dd9d6 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -93,5 +93,9 @@ namespace osu.Game.Online.API
         }
 
         public void SetState(APIState newState) => state.Value = newState;
+
+        IBindable<User> IAPIProvider.LocalUser => LocalUser;
+        IBindableList<User> IAPIProvider.Friends => Friends;
+        IBindable<UserActivity> IAPIProvider.Activity => Activity;
     }
 }
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 3f62b37a48..3a444460f2 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -13,19 +13,19 @@ namespace osu.Game.Online.API
         /// The local user.
         /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
         /// </summary>
-        Bindable<User> LocalUser { get; }
+        IBindable<User> LocalUser { get; }
 
         /// <summary>
         /// The user's friends.
         /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
         /// </summary>
-        BindableList<User> Friends { get; }
+        IBindableList<User> Friends { get; }
 
         /// <summary>
         /// The current user's activity.
         /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
         /// </summary>
-        Bindable<UserActivity> Activity { get; }
+        IBindable<UserActivity> Activity { get; }
 
         /// <summary>
         /// Retrieve the OAuth access token.
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d67d790ce2..1e342fa464 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -51,7 +51,6 @@ using osu.Game.Screens.Select;
 using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
-using osu.Game.Users;
 using System.IO;
 
 namespace osu.Game
@@ -976,7 +975,7 @@ namespace osu.Game
             if (newScreen is IOsuScreen newOsuScreen)
             {
                 OverlayActivationMode.BindTo(newOsuScreen.OverlayActivationMode);
-                ((IBindable<UserActivity>)API.Activity).BindTo(newOsuScreen.Activity);
+                API.Activity.BindTo(newOsuScreen.Activity);
 
                 MusicController.AllowRateAdjustments = newOsuScreen.AllowRateAdjustments;
 
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
index 742b1055b2..c983b337b5 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
         private PostBeatmapFavouriteRequest request;
         private LoadingLayer loading;
 
-        private readonly Bindable<User> localUser = new Bindable<User>();
+        private readonly IBindable<User> localUser = new Bindable<User>();
 
         public string TooltipText
         {
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index a58d662de7..9a2dcd014a 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
         private readonly Bindable<BeatmapLeaderboardScope> scope = new Bindable<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Global);
-        private readonly Bindable<User> user = new Bindable<User>();
+        private readonly IBindable<User> user = new Bindable<User>();
 
         private readonly Box background;
         private readonly ScoreTable scoreTable;
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 2a78748be6..513fabf52a 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -25,7 +25,7 @@ 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>();
+        protected readonly IBindable<User> User = new Bindable<User>();
 
         [Resolved]
         private IAPIProvider api { get; set; }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 8beb955824..bd4577fd57 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Backgrounds
 
         private int currentDisplay;
         private const int background_count = 7;
-        private Bindable<User> user;
+        private IBindable<User> user;
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
         private Bindable<IntroSequence> introSequence;
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 8368047d5a..ceec12c967 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Menu
             if (nextScreen != null)
                 LoadComponentAsync(nextScreen);
 
-            currentUser.BindTo(api.LocalUser);
+            ((IBindable<User>)currentUser).BindTo(api.LocalUser);
         }
 
         public override void OnEntering(IScreen last)
diff --git a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
index 92add458f9..c44beeffa5 100644
--- a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Menu
 {
     internal class MenuLogoVisualisation : LogoVisualisation
     {
-        private Bindable<User> user;
+        private IBindable<User> user;
         private Bindable<Skin> skin;
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Menu/MenuSideFlashes.cs b/osu.Game/Screens/Menu/MenuSideFlashes.cs
index 2ff8132d47..a1ae4555ed 100644
--- a/osu.Game/Screens/Menu/MenuSideFlashes.cs
+++ b/osu.Game/Screens/Menu/MenuSideFlashes.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Menu
         private const double box_fade_in_time = 65;
         private const int box_width = 200;
 
-        private Bindable<User> user;
+        private IBindable<User> user;
         private Bindable<Skin> skin;
 
         [Resolved]

From d36169f697ce53809bbec26b44411b28c66f6b0a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:16:48 +0900
Subject: [PATCH 06961/10326] Move friend request to a more understandable
 place in connection flow

---
 osu.Game/Online/API/APIAccess.cs | 36 +++++++++++++-------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index b96475d5bf..93d913dfad 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -140,6 +140,7 @@ namespace osu.Game.Online.API
                         }
 
                         var userReq = new GetUserRequest();
+
                         userReq.Success += u =>
                         {
                             localUser.Value = u;
@@ -148,15 +149,6 @@ namespace osu.Game.Online.API
                             localUser.Value.Status.Value = new UserStatusOnline();
 
                             failureCount = 0;
-
-                            fetchFriends(() =>
-                            {
-                                //we're connected!
-                                state.Value = APIState.Online;
-                            }, () =>
-                            {
-                                state.Value = APIState.Failing;
-                            });
                         };
 
                         if (!handleRequest(userReq))
@@ -166,6 +158,19 @@ namespace osu.Game.Online.API
                             continue;
                         }
 
+                        // getting user's friends is considered part of the connection process.
+                        var friendsReq = new GetFriendsRequest();
+
+                        friendsReq.Success += res =>
+                        {
+                            friends.AddRange(res);
+
+                            //we're connected!
+                            state.Value = APIState.Online;
+                        };
+
+                        if (!handleRequest(friendsReq))
+                            state.Value = APIState.Failing;
                         // The Success callback event is fired on the main thread, so we should wait for that to run before proceeding.
                         // Without this, we will end up circulating this Connecting loop multiple times and queueing up many web requests
                         // before actually going online.
@@ -257,19 +262,6 @@ namespace osu.Game.Online.API
             return null;
         }
 
-        private void fetchFriends(Action onSuccess, Action onFail)
-        {
-            var friendsReq = new GetFriendsRequest();
-            friendsReq.Success += res =>
-            {
-                Friends.AddRange(res);
-                onSuccess?.Invoke();
-            };
-
-            if (!handleRequest(friendsReq))
-                onFail?.Invoke();
-        }
-
         /// <summary>
         /// Handle a single API request.
         /// Ensures all exceptions are caught and dealt with correctly.

From bdfeb55dec5614b535737fb22df80c59627973a4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 15:18:06 +0900
Subject: [PATCH 06962/10326] Fix room status test scene not working

---
 .../Visual/Multiplayer/TestSceneRoomStatus.cs    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
index 1925e0ef4f..c1dfb94464 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
@@ -22,18 +23,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new DrawableRoom(new Room
                     {
                         Name = { Value = "Room 1" },
-                        Status = { Value = new RoomStatusOpen() }
-                    }),
+                        Status = { Value = new RoomStatusOpen() },
+                        EndDate = { Value = DateTimeOffset.Now.AddDays(1) }
+                    }) { MatchingFilter = true },
                     new DrawableRoom(new Room
                     {
                         Name = { Value = "Room 2" },
-                        Status = { Value = new RoomStatusPlaying() }
-                    }),
+                        Status = { Value = new RoomStatusPlaying() },
+                        EndDate = { Value = DateTimeOffset.Now.AddDays(1) }
+                    }) { MatchingFilter = true },
                     new DrawableRoom(new Room
                     {
                         Name = { Value = "Room 3" },
-                        Status = { Value = new RoomStatusEnded() }
-                    }),
+                        Status = { Value = new RoomStatusEnded() },
+                        EndDate = { Value = DateTimeOffset.Now }
+                    }) { MatchingFilter = true },
                 }
             };
         }

From 57c5d45c022844e729e11c4236d7fa0b8cc93ed9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:19:38 +0900
Subject: [PATCH 06963/10326] Standardise and extract common connection failure
 handling logic

---
 osu.Game/Online/API/APIAccess.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 93d913dfad..fe500b9548 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -153,8 +153,7 @@ namespace osu.Game.Online.API
 
                         if (!handleRequest(userReq))
                         {
-                            if (State.Value == APIState.Connecting)
-                                state.Value = APIState.Failing;
+                            failConnectionProcess();
                             continue;
                         }
 
@@ -170,7 +169,11 @@ namespace osu.Game.Online.API
                         };
 
                         if (!handleRequest(friendsReq))
-                            state.Value = APIState.Failing;
+                        {
+                            failConnectionProcess();
+                            continue;
+                        }
+
                         // The Success callback event is fired on the main thread, so we should wait for that to run before proceeding.
                         // Without this, we will end up circulating this Connecting loop multiple times and queueing up many web requests
                         // before actually going online.
@@ -203,6 +206,13 @@ namespace osu.Game.Online.API
 
                 Thread.Sleep(50);
             }
+
+            void failConnectionProcess()
+            {
+                // if something went wrong during the connection process, we want to reset the state (but only if still connecting).
+                if (State.Value == APIState.Connecting)
+                    state.Value = APIState.Failing;
+            }
         }
 
         public void Perform(APIRequest request)

From 99b670627a847e42ca245923b6e89f70f3a1ea04 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:25:12 +0900
Subject: [PATCH 06964/10326] Remove unused placeholder friend in DummyAPI
 implementation

---
 osu.Game/Online/API/DummyAPIAccess.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index a0bc8dd9d6..4e1bc21df3 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -19,11 +19,7 @@ namespace osu.Game.Online.API
             Id = 1001,
         });
 
-        public BindableList<User> Friends { get; } = new BindableList<User>(new User
-        {
-            Username = @"Dummy's friend",
-            Id = 2002,
-        }.Yield());
+        public BindableList<User> Friends { get; } = new BindableList<User>();
 
         public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
 

From 4af508235ee855cd0ac9be9d5aed56d416651f95 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:35:18 +0900
Subject: [PATCH 06965/10326] Rename long variable

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 285ed93341..1d548e8809 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -50,17 +50,17 @@ namespace osu.Game.Screens.Play.HUD
 
         public User User { get; }
 
-        private readonly bool localOrReplayPlayer;
+        private readonly bool trackedPlayer;
 
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
         /// </summary>
         /// <param name="user">The score's player.</param>
-        /// <param name="localOrReplayPlayer">Whether the player is the local user or a replay player.</param>
-        public GameplayLeaderboardScore(User user, bool localOrReplayPlayer)
+        /// <param name="trackedPlayer">Whether the player is the local user or a replay player.</param>
+        public GameplayLeaderboardScore(User user, bool trackedPlayer)
         {
             User = user;
-            this.localOrReplayPlayer = localOrReplayPlayer;
+            this.trackedPlayer = trackedPlayer;
 
             AutoSizeAxes = Axes.Both;
 
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Play.HUD
             Color4 panelColour, textColour;
             float panelWidth;
 
-            if (localOrReplayPlayer)
+            if (trackedPlayer)
             {
                 panelWidth = extended_width;
                 panelColour = Color4Extensions.FromHex("7fcc33");

From c80ecec0b418eedfa54931ef34d496984655cec1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 15:36:24 +0900
Subject: [PATCH 06966/10326] Reorder methods

---
 osu.Game/Screens/Play/Player.cs | 42 ++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a54f9fc047..92c76ec2d2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -531,29 +531,8 @@ namespace osu.Game.Screens.Play
                 completionProgressDelegate = Schedule(GotoRanking);
         }
 
-        protected virtual ScoreInfo CreateScore()
-        {
-            var score = new ScoreInfo
-            {
-                Beatmap = Beatmap.Value.BeatmapInfo,
-                Ruleset = rulesetInfo,
-                Mods = Mods.Value.ToArray(),
-            };
-
-            if (DrawableRuleset.ReplayScore != null)
-                score.User = DrawableRuleset.ReplayScore.ScoreInfo?.User ?? new GuestUser();
-            else
-                score.User = api.LocalUser.Value;
-
-            ScoreProcessor.PopulateScore(score);
-
-            return score;
-        }
-
         protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
 
-        protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, true);
-
         #region Fail Logic
 
         protected FailOverlay FailOverlay { get; private set; }
@@ -748,6 +727,25 @@ namespace osu.Game.Screens.Play
             return base.OnExiting(next);
         }
 
+        protected virtual ScoreInfo CreateScore()
+        {
+            var score = new ScoreInfo
+            {
+                Beatmap = Beatmap.Value.BeatmapInfo,
+                Ruleset = rulesetInfo,
+                Mods = Mods.Value.ToArray(),
+            };
+
+            if (DrawableRuleset.ReplayScore != null)
+                score.User = DrawableRuleset.ReplayScore.ScoreInfo?.User ?? new GuestUser();
+            else
+                score.User = api.LocalUser.Value;
+
+            ScoreProcessor.PopulateScore(score);
+
+            return score;
+        }
+
         protected virtual void GotoRanking()
         {
             if (DrawableRuleset.ReplayScore != null)
@@ -781,6 +779,8 @@ namespace osu.Game.Screens.Play
                         }));
         }
 
+        protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, true);
+
         private void fadeOut(bool instant = false)
         {
             float fadeOutDuration = instant ? 0 : 250;

From a749dca20b14a247cb8828cc0171b99be5e6f141 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:43:15 +0900
Subject: [PATCH 06967/10326] Remove left over using statement

---
 osu.Game/Online/API/DummyAPIAccess.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 4e1bc21df3..265298270c 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -5,7 +5,6 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Users;
 

From ceb2e4762d7c63efc3f9e044ae326447543c8528 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 16:20:42 +0900
Subject: [PATCH 06968/10326] Add test covering a more consistent spread of
 player scores

---
 .../Visual/Gameplay/TestSceneGameplayLeaderboard.cs       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 12bc918d45..d596def98a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
@@ -66,6 +67,13 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
         }
 
+        [Test]
+        public void TestRandomScores()
+        {
+            int playerNumber = 1;
+            AddRepeatStep("add player with random score", () => leaderboard.Add(createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}")), 10);
+        }
+
         private static GameplayLeaderboardScore createLeaderboardScore(BindableDouble score, string username, bool localOrReplayPlayer = false)
         {
             return new GameplayLeaderboardScore(new User { Username = username }, localOrReplayPlayer)

From c84807ed5c0f09e47993666920d5374d561c5f9b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 16:20:54 +0900
Subject: [PATCH 06969/10326] Refactor implementation

---
 .../Play/HUD/GameplayLeaderboardScore.cs      | 123 +++++++++++-------
 1 file changed, 73 insertions(+), 50 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 1d548e8809..439210c944 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.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 Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API;
 using osu.Game.Users;
 using osu.Game.Utils;
 using osuTK;
@@ -26,7 +24,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private const float panel_height = 35f;
 
-        private OsuSpriteText positionText, scoreText, accuracyText, comboText;
+        private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
         public readonly BindableDouble TotalScore = new BindableDouble(1000000);
         public readonly BindableDouble Accuracy = new BindableDouble(1);
@@ -45,6 +43,7 @@ namespace osu.Game.Screens.Play.HUD
                     positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}";
 
                 positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
+                updateColour();
             }
         }
 
@@ -52,6 +51,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private readonly bool trackedPlayer;
 
+        private Container mainFillContainer;
+        private Box centralFill;
+
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
         /// </summary>
@@ -62,62 +64,93 @@ namespace osu.Game.Screens.Play.HUD
             User = user;
             this.trackedPlayer = trackedPlayer;
 
-            AutoSizeAxes = Axes.Both;
+            AutoSizeAxes = Axes.X;
+            Height = panel_height;
 
             Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
+        protected override void LoadComplete()
         {
-            const float panel_shear = 0.15f;
-            const float shear_width = panel_height * panel_shear;
+            base.LoadComplete();
 
-            Color4 panelColour, textColour;
-            float panelWidth;
+            updateColour();
+            FinishTransforms(true);
+        }
 
-            if (trackedPlayer)
+        private void updateColour()
+        {
+            if (scorePosition == 1)
             {
-                panelWidth = extended_width;
+                mainFillContainer.ResizeWidthTo(extended_width, 200, Easing.OutQuint);
                 panelColour = Color4Extensions.FromHex("7fcc33");
                 textColour = Color4.White;
             }
-            else if (api.Friends.Any(f => User.Equals(f)))
+            else if (trackedPlayer)
             {
-                panelWidth = extended_width;
+                mainFillContainer.ResizeWidthTo(extended_width, 200, Easing.OutQuint);
                 panelColour = Color4Extensions.FromHex("ffd966");
                 textColour = Color4Extensions.FromHex("2e576b");
             }
             else
             {
-                panelWidth = regular_width;
+                mainFillContainer.ResizeWidthTo(regular_width, 200, Easing.OutQuint);
                 panelColour = Color4Extensions.FromHex("3399cc");
                 textColour = Color4.White;
             }
+        }
+
+        private Color4 panelColour
+        {
+            set
+            {
+                mainFillContainer.FadeColour(value, 200, Easing.OutQuint);
+                centralFill.FadeColour(value, 200, Easing.OutQuint);
+            }
+        }
+
+        private Color4 textColour
+        {
+            set
+            {
+                scoreText.FadeColour(value, 200, Easing.OutQuint);
+                accuracyText.FadeColour(value, 200, Easing.OutQuint);
+                comboText.FadeColour(value, 200, Easing.OutQuint);
+                usernameText.FadeColour(value, 200, Easing.OutQuint);
+                positionText.FadeColour(value, 200, Easing.OutQuint);
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            const float panel_shear = 0.15f;
+            const float shear_width = panel_height * panel_shear;
 
             InternalChildren = new Drawable[]
             {
-                new Container
+                mainFillContainer = new Container
                 {
+                    Width = regular_width,
+                    RelativeSizeAxes = Axes.Y,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     Masking = true,
                     CornerRadius = 5f,
                     Shear = new Vector2(panel_shear, 0f),
-                    Size = new Vector2(panelWidth, panel_height),
                     Child = new Box
                     {
                         Alpha = 0.5f,
                         RelativeSizeAxes = Axes.Both,
-                        Colour = panelColour,
                     }
                 },
                 new GridContainer
                 {
+                    Width = regular_width,
+                    RelativeSizeAxes = Axes.Y,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    Size = new Vector2(regular_width, panel_height),
                     ColumnDimensions = new[]
                     {
                         new Dimension(GridSizeMode.Absolute, 35f),
@@ -133,7 +166,7 @@ namespace osu.Game.Screens.Play.HUD
                                 Padding = new MarginPadding { Right = shear_width / 2 },
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Colour = textColour,
+                                Colour = Color4.White,
                                 Font = OsuFont.Torus.With(size: 14, weight: FontWeight.Bold),
                                 Shadow = false,
                             },
@@ -151,22 +184,22 @@ namespace osu.Game.Screens.Play.HUD
                                         RelativeSizeAxes = Axes.Both,
                                         Children = new[]
                                         {
-                                            new Box
+                                            centralFill = new Box
                                             {
                                                 Alpha = 0.5f,
                                                 RelativeSizeAxes = Axes.Both,
-                                                Colour = panelColour,
+                                                Colour = Color4Extensions.FromHex("3399cc"),
                                             },
                                         }
                                     },
-                                    new OsuSpriteText
+                                    usernameText = new OsuSpriteText
                                     {
                                         Padding = new MarginPadding { Left = shear_width },
                                         RelativeSizeAxes = Axes.X,
                                         Width = 0.8f,
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
-                                        Colour = textColour,
+                                        Colour = Color4.White,
                                         Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
                                         Text = User.Username,
                                         Truncate = true,
@@ -180,41 +213,31 @@ namespace osu.Game.Screens.Play.HUD
                                 RelativeSizeAxes = Axes.Both,
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
-                                Colour = textColour,
+                                Colour = Color4.White,
                                 Children = new Drawable[]
                                 {
                                     scoreText = new OsuSpriteText
                                     {
-                                        Anchor = Anchor.TopLeft,
-                                        Origin = Anchor.TopLeft,
-                                        Spacing = new Vector2(0.5f, 0f),
-                                        Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold),
+                                        Spacing = new Vector2(-1f, 0f),
+                                        Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold, fixedWidth: true),
                                         Shadow = false,
                                     },
-                                    new Container
+                                    accuracyText = new OsuSpriteText
                                     {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
                                         Anchor = Anchor.BottomLeft,
                                         Origin = Anchor.BottomLeft,
-                                        Children = new Drawable[]
-                                        {
-                                            accuracyText = new OsuSpriteText
-                                            {
-                                                Anchor = Anchor.CentreLeft,
-                                                Origin = Anchor.CentreLeft,
-                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
-                                                Shadow = false,
-                                            },
-                                            comboText = new OsuSpriteText
-                                            {
-                                                Anchor = Anchor.CentreRight,
-                                                Origin = Anchor.CentreRight,
-                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
-                                                Shadow = false,
-                                            },
-                                        }
-                                    }
+                                        Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
+                                        Spacing = new Vector2(-1f, 0f),
+                                        Shadow = false,
+                                    },
+                                    comboText = new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.BottomRight,
+                                        Origin = Anchor.BottomRight,
+                                        Spacing = new Vector2(-1f, 0f),
+                                        Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
+                                        Shadow = false,
+                                    },
                                 },
                             }
                         }

From e6a38ffbce738d3c464647349b8e5b81b55b373f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 16:33:55 +0900
Subject: [PATCH 06970/10326] Fix test failure due to polluted bindable value
 from previous test

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

diff --git a/osu.Game/Tests/Visual/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/MultiplayerTestScene.cs
index dc614896c5..6f24e00a92 100644
--- a/osu.Game/Tests/Visual/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/MultiplayerTestScene.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Tests.Visual
     public abstract class MultiplayerTestScene : ScreenTestScene
     {
         [Cached]
-        private readonly Bindable<Room> currentRoom = new Bindable<Room>(new Room());
+        private readonly Bindable<Room> currentRoom = new Bindable<Room>();
 
         protected Room Room => currentRoom.Value;
 
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.CopyFrom(new Room());
+            currentRoom.Value = new Room();
         });
     }
 }

From 07a8ffa4aaefeeaa2da30aea60a94381826f7c13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 16:50:25 +0900
Subject: [PATCH 06971/10326] Fix failing tests due to ignoring the lookup ID

---
 .../Visual/Online/TestSceneCurrentlyPlayingDisplay.cs       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 4f0ca67e64..eaa881b02c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -89,13 +89,11 @@ namespace osu.Game.Tests.Visual.Online
                 "pishifat"
             };
 
-            private int id;
-
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
                 => Task.FromResult(new User
                 {
-                    Id = id++,
-                    Username = usernames[id % usernames.Length],
+                    Id = lookup++,
+                    Username = usernames[lookup % usernames.Length],
                 });
         }
     }

From 2db7433c0b11f5a90be103621af529a2c35f50e7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 16:51:59 +0900
Subject: [PATCH 06972/10326] Refactor player score creation and submission
 process

---
 .../TestSceneCompletionCancellation.cs        |  3 +-
 .../Screens/Multi/Play/TimeshiftPlayer.cs     | 17 ++--
 osu.Game/Screens/Play/Player.cs               | 79 ++++++++++---------
 osu.Game/Screens/Play/ReplayPlayer.cs         | 13 +--
 4 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
index 6fd5511e5a..6e3b394057 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
@@ -10,6 +10,7 @@ using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Scoring;
 using osu.Game.Storyboards;
 using osuTK;
 
@@ -117,7 +118,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            protected override void GotoRanking()
+            protected override void GotoRanking(ScoreInfo score)
             {
                 GotoRankingInvoked = true;
             }
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 0efa9c5196..76e4a328e0 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
@@ -95,19 +96,25 @@ namespace osu.Game.Screens.Multi.Play
             return new TimeshiftResultsScreen(score, roomId.Value.Value, playlistItem, true);
         }
 
-        protected override ScoreInfo CreateScore()
+        protected override Score CreateScore()
         {
             var score = base.CreateScore();
-            score.TotalScore = (int)Math.Round(ScoreProcessor.GetStandardisedScore());
+            score.ScoreInfo.TotalScore = (int)Math.Round(ScoreProcessor.GetStandardisedScore());
+            return score;
+        }
+
+        protected override async Task<ScoreInfo> SubmitScore(Score score)
+        {
+            await base.SubmitScore(score);
 
             Debug.Assert(token != null);
 
-            var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score);
-            request.Success += s => score.OnlineScoreID = s.ID;
+            var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score.ScoreInfo);
+            request.Success += s => score.ScoreInfo.OnlineScoreID = s.ID;
             request.Failure += e => Logger.Error(e, "Failed to submit score");
             api.Queue(request);
 
-            return score;
+            return score.ScoreInfo;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 92c76ec2d2..3fb680b9c9 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -527,8 +528,18 @@ namespace osu.Game.Screens.Play
 
             if (!showResults) return;
 
-            using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
-                completionProgressDelegate = Schedule(GotoRanking);
+            SubmitScore(CreateScore()).ContinueWith(t => Schedule(() =>
+            {
+                using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
+                {
+                    completionProgressDelegate = Schedule(() =>
+                    {
+                        // screen may be in the exiting transition phase.
+                        if (this.IsCurrentScreen())
+                            GotoRanking(t.Result);
+                    });
+                }
+            }));
         }
 
         protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
@@ -727,60 +738,56 @@ namespace osu.Game.Screens.Play
             return base.OnExiting(next);
         }
 
-        protected virtual ScoreInfo CreateScore()
+        protected virtual Score CreateScore()
         {
-            var score = new ScoreInfo
+            var score = new Score
             {
-                Beatmap = Beatmap.Value.BeatmapInfo,
-                Ruleset = rulesetInfo,
-                Mods = Mods.Value.ToArray(),
+                ScoreInfo = new ScoreInfo
+                {
+                    Beatmap = Beatmap.Value.BeatmapInfo,
+                    Ruleset = rulesetInfo,
+                    Mods = Mods.Value.ToArray(),
+                }
             };
 
             if (DrawableRuleset.ReplayScore != null)
-                score.User = DrawableRuleset.ReplayScore.ScoreInfo?.User ?? new GuestUser();
+            {
+                score.ScoreInfo.User = DrawableRuleset.ReplayScore.ScoreInfo?.User ?? new GuestUser();
+                score.Replay = DrawableRuleset.ReplayScore.Replay;
+            }
             else
-                score.User = api.LocalUser.Value;
+            {
+                score.ScoreInfo.User = api.LocalUser.Value;
+                if (recordingScore?.Replay.Frames.Count > 0)
+                    score.Replay = recordingScore.Replay;
+            }
 
-            ScoreProcessor.PopulateScore(score);
+            ScoreProcessor.PopulateScore(score.ScoreInfo);
 
             return score;
         }
 
-        protected virtual void GotoRanking()
+        protected virtual async Task<ScoreInfo> SubmitScore(Score score)
         {
+            // Replays are already populated and present in the game's database, so should not be re-imported.
             if (DrawableRuleset.ReplayScore != null)
+                return score.ScoreInfo;
+
+            LegacyByteArrayReader replayReader;
+
+            using (var stream = new MemoryStream())
             {
-                // if a replay is present, we likely don't want to import into the local database.
-                this.Push(CreateResults(CreateScore()));
-                return;
+                new LegacyScoreEncoder(score, gameplayBeatmap.PlayableBeatmap).Encode(stream);
+                replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
             }
 
-            LegacyByteArrayReader replayReader = null;
-
-            var score = new Score { ScoreInfo = CreateScore() };
-
-            if (recordingScore?.Replay.Frames.Count > 0)
-            {
-                score.Replay = recordingScore.Replay;
-
-                using (var stream = new MemoryStream())
-                {
-                    new LegacyScoreEncoder(score, gameplayBeatmap.PlayableBeatmap).Encode(stream);
-                    replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
-                }
-            }
-
-            scoreManager.Import(score.ScoreInfo, replayReader)
-                        .ContinueWith(imported => Schedule(() =>
-                        {
-                            // screen may be in the exiting transition phase.
-                            if (this.IsCurrentScreen())
-                                this.Push(CreateResults(imported.Result));
-                        }));
+            return await scoreManager.Import(score.ScoreInfo, replayReader);
         }
 
         protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, true);
 
+        protected virtual void GotoRanking(ScoreInfo score) => this.Push(CreateResults(score));
+
         private void fadeOut(bool instant = false)
         {
             float fadeOutDuration = instant ? 0 : 250;
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 294d116f51..390d1d1959 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.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.Threading.Tasks;
 using osu.Framework.Input.Bindings;
 using osu.Game.Input.Bindings;
 using osu.Game.Scoring;
@@ -26,18 +27,20 @@ namespace osu.Game.Screens.Play
             DrawableRuleset?.SetReplayScore(Score);
         }
 
-        protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
-
-        protected override ScoreInfo CreateScore()
+        protected override Score CreateScore()
         {
             var baseScore = base.CreateScore();
 
             // Since the replay score doesn't contain statistics, we'll pass them through here.
-            Score.ScoreInfo.HitEvents = baseScore.HitEvents;
+            Score.ScoreInfo.HitEvents = baseScore.ScoreInfo.HitEvents;
 
-            return Score.ScoreInfo;
+            return Score;
         }
 
+        protected override Task<ScoreInfo> SubmitScore(Score score) => Task.FromResult(score.ScoreInfo);
+
+        protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
+
         public bool OnPressed(GlobalAction action)
         {
             switch (action)

From 70cda680c0e868f41f27bd902cd2d0712d7ee4b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 16:55:55 +0900
Subject: [PATCH 06973/10326] Update to match new implementation

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index b2dc47ce61..4d39d1a6b3 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Rulesets.Scoring;
 
@@ -44,7 +45,7 @@ namespace osu.Game.Screens.Play.HUD
         private Bindable<ScoringMode> scoringMode;
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, IAPIProvider api)
         {
             streamingClient.OnNewFrames += handleIncomingFrames;
 
@@ -58,7 +59,7 @@ namespace osu.Game.Screens.Play.HUD
                 var trackedUser = new TrackedUserData();
 
                 userScores[user] = trackedUser;
-                AddPlayer(trackedUser.Score, resolvedUser);
+                Add(new GameplayLeaderboardScore(resolvedUser, resolvedUser.Id == api.LocalUser.Value.Id)); //trackedUser.Score, resolvedUser);
             }
 
             scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);

From 97ff500b0daa28063188e699411b99017e2241bb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 16:56:22 +0900
Subject: [PATCH 06974/10326] Make timeshift wait on score submission

---
 .../Screens/Multi/Play/TimeshiftPlayer.cs     | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 76e4a328e0..e106dc3a1c 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -105,16 +105,29 @@ namespace osu.Game.Screens.Multi.Play
 
         protected override async Task<ScoreInfo> SubmitScore(Score score)
         {
-            await base.SubmitScore(score);
-
             Debug.Assert(token != null);
 
+            bool completed = false;
             var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score.ScoreInfo);
-            request.Success += s => score.ScoreInfo.OnlineScoreID = s.ID;
-            request.Failure += e => Logger.Error(e, "Failed to submit score");
+
+            request.Success += s =>
+            {
+                score.ScoreInfo.OnlineScoreID = s.ID;
+                completed = true;
+            };
+
+            request.Failure += e =>
+            {
+                Logger.Error(e, "Failed to submit score");
+                completed = true;
+            };
+
             api.Queue(request);
 
-            return score.ScoreInfo;
+            while (!completed)
+                await Task.Delay(100);
+
+            return await base.SubmitScore(score);
         }
 
         protected override void Dispose(bool isDisposing)

From 157a72ec5deb0f5176fd171c57b9e61d30daa958 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:07:38 +0900
Subject: [PATCH 06975/10326] Revert previous player add flow via interface

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs     | 16 +++++++---------
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 16 +++++++++++++---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs |  8 ++++----
 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs   | 14 ++++++++++++++
 4 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index d596def98a..6e9375f69c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add local player", () => leaderboard.Add(createLeaderboardScore(playerScore, "You", true)));
+            AddStep("add local player", () => createLeaderboardScore(playerScore, "You", true));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => leaderboard.Add(createLeaderboardScore(player2Score, "Player 2")));
-            AddStep("add player 3", () => leaderboard.Add(createLeaderboardScore(player3Score, "Player 3")));
+            AddStep("add player 2", () => createLeaderboardScore(player2Score, "Player 2"));
+            AddStep("add player 3", () => createLeaderboardScore(player3Score, "Player 3"));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
@@ -71,15 +71,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestRandomScores()
         {
             int playerNumber = 1;
-            AddRepeatStep("add player with random score", () => leaderboard.Add(createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}")), 10);
+            AddRepeatStep("add player with random score", () => createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}"), 10);
         }
 
-        private static GameplayLeaderboardScore createLeaderboardScore(BindableDouble score, string username, bool localOrReplayPlayer = false)
+        private void createLeaderboardScore(BindableDouble score, string username, bool isTracked = false)
         {
-            return new GameplayLeaderboardScore(new User { Username = username }, localOrReplayPlayer)
-            {
-                TotalScore = { BindTarget = score },
-            };
+            var leaderboardScore = leaderboard.AddPlayer(new User { Username = username }, isTracked);
+            leaderboardScore.TotalScore.BindTo(score);
         }
 
         private class TestGameplayLeaderboard : GameplayLeaderboard
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 573bf54b14..e738477a80 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -1,9 +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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -22,13 +24,21 @@ namespace osu.Game.Screens.Play.HUD
             LayoutEasing = Easing.OutQuint;
         }
 
-        public override void Add(GameplayLeaderboardScore drawable)
+        public ILeaderboardScore AddPlayer(User user, bool isTracked)
         {
+            var drawable = new GameplayLeaderboardScore(user, isTracked);
             base.Add(drawable);
-            drawable?.TotalScore.BindValueChanged(_ => updateScores(), true);
+            drawable.TotalScore.BindValueChanged(_ => Scheduler.AddOnce(sort), true);
+
+            return drawable;
         }
 
-        private void updateScores()
+        public override void Add(GameplayLeaderboardScore drawable)
+        {
+            throw new InvalidOperationException($"Use {nameof(AddPlayer)} instead.");
+        }
+
+        private void sort()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore.Value).ToList();
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 439210c944..d4d7c69f6b 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class GameplayLeaderboardScore : CompositeDrawable
+    public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
         private const float regular_width = 215f;
         private const float extended_width = 235f;
@@ -26,9 +26,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
-        public readonly BindableDouble TotalScore = new BindableDouble(1000000);
-        public readonly BindableDouble Accuracy = new BindableDouble(1);
-        public readonly BindableInt Combo = new BindableInt();
+        public BindableDouble TotalScore { get; } = new BindableDouble();
+        public BindableDouble Accuracy { get; } = new BindableDouble(1);
+        public BindableInt Combo { get; } = new BindableInt();
 
         private int? scorePosition;
 
diff --git a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
new file mode 100644
index 0000000000..bc1a03c5aa
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
@@ -0,0 +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.Bindables;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public interface ILeaderboardScore
+    {
+        BindableDouble TotalScore { get; }
+        BindableDouble Accuracy { get; }
+        BindableInt Combo { get; }
+    }
+}

From cb3f89d0a5c73baa360413c9ef9cf08c8ea39617 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:13:51 +0900
Subject: [PATCH 06976/10326] Hook up with new leaderboard design

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 4d39d1a6b3..c96f496cd0 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -59,7 +59,11 @@ namespace osu.Game.Screens.Play.HUD
                 var trackedUser = new TrackedUserData();
 
                 userScores[user] = trackedUser;
-                Add(new GameplayLeaderboardScore(resolvedUser, resolvedUser.Id == api.LocalUser.Value.Id)); //trackedUser.Score, resolvedUser);
+                var leaderboardScore = AddPlayer(resolvedUser, resolvedUser.Id == api.LocalUser.Value.Id);
+
+                ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
+                ((IBindable<double>)leaderboardScore.TotalScore).BindTo(trackedUser.Score);
+                ((IBindable<int>)leaderboardScore.Combo).BindTo(trackedUser.CurrentCombo);
             }
 
             scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);

From bca4d83af794a587eb02eba41357ce6e841381c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:07:38 +0900
Subject: [PATCH 06977/10326] Revert previous player add flow via interface

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs     | 16 +++++++---------
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 16 +++++++++++++---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs |  8 ++++----
 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs   | 14 ++++++++++++++
 4 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index d596def98a..6e9375f69c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add local player", () => leaderboard.Add(createLeaderboardScore(playerScore, "You", true)));
+            AddStep("add local player", () => createLeaderboardScore(playerScore, "You", true));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => leaderboard.Add(createLeaderboardScore(player2Score, "Player 2")));
-            AddStep("add player 3", () => leaderboard.Add(createLeaderboardScore(player3Score, "Player 3")));
+            AddStep("add player 2", () => createLeaderboardScore(player2Score, "Player 2"));
+            AddStep("add player 3", () => createLeaderboardScore(player3Score, "Player 3"));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
@@ -71,15 +71,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestRandomScores()
         {
             int playerNumber = 1;
-            AddRepeatStep("add player with random score", () => leaderboard.Add(createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}")), 10);
+            AddRepeatStep("add player with random score", () => createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}"), 10);
         }
 
-        private static GameplayLeaderboardScore createLeaderboardScore(BindableDouble score, string username, bool localOrReplayPlayer = false)
+        private void createLeaderboardScore(BindableDouble score, string username, bool isTracked = false)
         {
-            return new GameplayLeaderboardScore(new User { Username = username }, localOrReplayPlayer)
-            {
-                TotalScore = { BindTarget = score },
-            };
+            var leaderboardScore = leaderboard.AddPlayer(new User { Username = username }, isTracked);
+            leaderboardScore.TotalScore.BindTo(score);
         }
 
         private class TestGameplayLeaderboard : GameplayLeaderboard
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 573bf54b14..e738477a80 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -1,9 +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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -22,13 +24,21 @@ namespace osu.Game.Screens.Play.HUD
             LayoutEasing = Easing.OutQuint;
         }
 
-        public override void Add(GameplayLeaderboardScore drawable)
+        public ILeaderboardScore AddPlayer(User user, bool isTracked)
         {
+            var drawable = new GameplayLeaderboardScore(user, isTracked);
             base.Add(drawable);
-            drawable?.TotalScore.BindValueChanged(_ => updateScores(), true);
+            drawable.TotalScore.BindValueChanged(_ => Scheduler.AddOnce(sort), true);
+
+            return drawable;
         }
 
-        private void updateScores()
+        public override void Add(GameplayLeaderboardScore drawable)
+        {
+            throw new InvalidOperationException($"Use {nameof(AddPlayer)} instead.");
+        }
+
+        private void sort()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore.Value).ToList();
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 439210c944..d4d7c69f6b 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class GameplayLeaderboardScore : CompositeDrawable
+    public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
         private const float regular_width = 215f;
         private const float extended_width = 235f;
@@ -26,9 +26,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
-        public readonly BindableDouble TotalScore = new BindableDouble(1000000);
-        public readonly BindableDouble Accuracy = new BindableDouble(1);
-        public readonly BindableInt Combo = new BindableInt();
+        public BindableDouble TotalScore { get; } = new BindableDouble();
+        public BindableDouble Accuracy { get; } = new BindableDouble(1);
+        public BindableInt Combo { get; } = new BindableInt();
 
         private int? scorePosition;
 
diff --git a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
new file mode 100644
index 0000000000..bc1a03c5aa
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
@@ -0,0 +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.Bindables;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public interface ILeaderboardScore
+    {
+        BindableDouble TotalScore { get; }
+        BindableDouble Accuracy { get; }
+        BindableInt Combo { get; }
+    }
+}

From 4cf013c0058555776eea78a956203cfbbfe8d70a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:19:00 +0900
Subject: [PATCH 06978/10326] Fix animation replacing itself even when score
 position hasn't changed

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index d4d7c69f6b..086ac956e8 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -37,6 +37,9 @@ namespace osu.Game.Screens.Play.HUD
             get => scorePosition;
             set
             {
+                if (value == scorePosition)
+                    return;
+
                 scorePosition = value;
 
                 if (scorePosition.HasValue)

From e82986b76328983a9c648ba274df7689115941af Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:19:36 +0900
Subject: [PATCH 06979/10326] Fix panel x positions getting weird duration
 relayouts

Also adjust the transitions a bit to feel better.
---
 .../Play/HUD/GameplayLeaderboardScore.cs       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 086ac956e8..77e6d320ae 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -67,11 +67,7 @@ namespace osu.Game.Screens.Play.HUD
             User = user;
             this.trackedPlayer = trackedPlayer;
 
-            AutoSizeAxes = Axes.X;
-            Height = panel_height;
-
-            Anchor = Anchor.TopRight;
-            Origin = Anchor.TopRight;
+            Size = new Vector2(extended_width, panel_height);
         }
 
         protected override void LoadComplete()
@@ -82,23 +78,25 @@ namespace osu.Game.Screens.Play.HUD
             FinishTransforms(true);
         }
 
+        private const double transition_duration = 500;
+
         private void updateColour()
         {
             if (scorePosition == 1)
             {
-                mainFillContainer.ResizeWidthTo(extended_width, 200, Easing.OutQuint);
+                mainFillContainer.ResizeWidthTo(extended_width, transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("7fcc33");
                 textColour = Color4.White;
             }
             else if (trackedPlayer)
             {
-                mainFillContainer.ResizeWidthTo(extended_width, 200, Easing.OutQuint);
+                mainFillContainer.ResizeWidthTo(extended_width, transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("ffd966");
                 textColour = Color4Extensions.FromHex("2e576b");
             }
             else
             {
-                mainFillContainer.ResizeWidthTo(regular_width, 200, Easing.OutQuint);
+                mainFillContainer.ResizeWidthTo(regular_width, transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("3399cc");
                 textColour = Color4.White;
             }
@@ -108,8 +106,8 @@ namespace osu.Game.Screens.Play.HUD
         {
             set
             {
-                mainFillContainer.FadeColour(value, 200, Easing.OutQuint);
-                centralFill.FadeColour(value, 200, Easing.OutQuint);
+                mainFillContainer.FadeColour(value, transition_duration, Easing.OutQuint);
+                centralFill.FadeColour(value, transition_duration, Easing.OutQuint);
             }
         }
 

From 668536ce562eb30088b66602f294672b5be58d58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:25:48 +0900
Subject: [PATCH 06980/10326] Fix vertical size potentially changing during
 relayout

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs      |  2 +-
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs  |  4 +++-
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs  | 15 ++++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 6e9375f69c..ff15e1d2dc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             Add(leaderboard = new TestGameplayLeaderboard
             {
                 Anchor = Anchor.Centre,
-                Origin = Anchor.TopCentre,
+                Origin = Anchor.Centre,
                 Scale = new Vector2(2),
             });
         }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index e738477a80..99319c0008 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.HUD
     {
         public GameplayLeaderboard()
         {
-            AutoSizeAxes = Axes.Both;
+            Width = GameplayLeaderboardScore.EXTENDED_WIDTH;
 
             Direction = FillDirection.Vertical;
 
@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Play.HUD
             base.Add(drawable);
             drawable.TotalScore.BindValueChanged(_ => Scheduler.AddOnce(sort), true);
 
+            Height = Count * (GameplayLeaderboardScore.PANEL_HEIGHT + Spacing.Y);
+
             return drawable;
         }
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 77e6d320ae..242e7ff6b9 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -19,10 +19,11 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
-        private const float regular_width = 215f;
-        private const float extended_width = 235f;
+        public const float EXTENDED_WIDTH = 235f;
 
-        private const float panel_height = 35f;
+        private const float regular_width = 215f;
+
+        public const float PANEL_HEIGHT = 35f;
 
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
@@ -67,7 +68,7 @@ namespace osu.Game.Screens.Play.HUD
             User = user;
             this.trackedPlayer = trackedPlayer;
 
-            Size = new Vector2(extended_width, panel_height);
+            Size = new Vector2(EXTENDED_WIDTH, PANEL_HEIGHT);
         }
 
         protected override void LoadComplete()
@@ -84,13 +85,13 @@ namespace osu.Game.Screens.Play.HUD
         {
             if (scorePosition == 1)
             {
-                mainFillContainer.ResizeWidthTo(extended_width, transition_duration, Easing.OutElastic);
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("7fcc33");
                 textColour = Color4.White;
             }
             else if (trackedPlayer)
             {
-                mainFillContainer.ResizeWidthTo(extended_width, transition_duration, Easing.OutElastic);
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("ffd966");
                 textColour = Color4Extensions.FromHex("2e576b");
             }
@@ -127,7 +128,7 @@ namespace osu.Game.Screens.Play.HUD
         private void load()
         {
             const float panel_shear = 0.15f;
-            const float shear_width = panel_height * panel_shear;
+            const float shear_width = PANEL_HEIGHT * panel_shear;
 
             InternalChildren = new Drawable[]
             {

From 615352c1e41a13c9dc189003aeb4ee2b8a3f95df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:30:11 +0900
Subject: [PATCH 06981/10326] Fix shear offset not being included in
 GameplayLeaderboard's own size

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs   |  9 +++++++--
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs   | 14 ++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 99319c0008..aa668cc4c8 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.HUD
     {
         public GameplayLeaderboard()
         {
-            Width = GameplayLeaderboardScore.EXTENDED_WIDTH;
+            Width = GameplayLeaderboardScore.EXTENDED_WIDTH + GameplayLeaderboardScore.SHEAR_WIDTH;
 
             Direction = FillDirection.Vertical;
 
@@ -26,7 +26,12 @@ namespace osu.Game.Screens.Play.HUD
 
         public ILeaderboardScore AddPlayer(User user, bool isTracked)
         {
-            var drawable = new GameplayLeaderboardScore(user, isTracked);
+            var drawable = new GameplayLeaderboardScore(user, isTracked)
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+            };
+
             base.Add(drawable);
             drawable.TotalScore.BindValueChanged(_ => Scheduler.AddOnce(sort), true);
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 242e7ff6b9..5c4b4406cc 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -16,6 +16,7 @@ using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
+
 {
     public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
@@ -25,6 +26,10 @@ namespace osu.Game.Screens.Play.HUD
 
         public const float PANEL_HEIGHT = 35f;
 
+        public const float SHEAR_WIDTH = PANEL_HEIGHT * panel_shear;
+
+        private const float panel_shear = 0.15f;
+
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
         public BindableDouble TotalScore { get; } = new BindableDouble();
@@ -127,9 +132,6 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load()
         {
-            const float panel_shear = 0.15f;
-            const float shear_width = PANEL_HEIGHT * panel_shear;
-
             InternalChildren = new Drawable[]
             {
                 mainFillContainer = new Container
@@ -165,7 +167,7 @@ namespace osu.Game.Screens.Play.HUD
                         {
                             positionText = new OsuSpriteText
                             {
-                                Padding = new MarginPadding { Right = shear_width / 2 },
+                                Padding = new MarginPadding { Right = SHEAR_WIDTH / 2 },
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
                                 Colour = Color4.White,
@@ -174,7 +176,7 @@ namespace osu.Game.Screens.Play.HUD
                             },
                             new Container
                             {
-                                Padding = new MarginPadding { Horizontal = shear_width / 3 },
+                                Padding = new MarginPadding { Horizontal = SHEAR_WIDTH / 3 },
                                 RelativeSizeAxes = Axes.Both,
                                 Children = new Drawable[]
                                 {
@@ -196,7 +198,7 @@ namespace osu.Game.Screens.Play.HUD
                                     },
                                     usernameText = new OsuSpriteText
                                     {
-                                        Padding = new MarginPadding { Left = shear_width },
+                                        Padding = new MarginPadding { Left = SHEAR_WIDTH },
                                         RelativeSizeAxes = Axes.X,
                                         Width = 0.8f,
                                         Anchor = Anchor.CentreLeft,

From fdad5e86d3baa4adb991717e8408afae2da02bb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:33:18 +0900
Subject: [PATCH 06982/10326] Remove stray newline

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 5c4b4406cc..0b58cf76a2 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -16,7 +16,6 @@ using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
-
 {
     public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {

From 2958cab239027632f0b9b5c61109bbbd90bfa8b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 17:47:33 +0900
Subject: [PATCH 06983/10326] Remove GotoRanking

---
 .../TestSceneCompletionCancellation.cs         | 13 ++++++++-----
 osu.Game/Screens/Play/Player.cs                | 18 +++++++++++++++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
index 6e3b394057..4ee48fd853 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
@@ -11,6 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
 using osu.Game.Storyboards;
 using osuTK;
 
@@ -51,7 +52,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             cancel();
             complete();
 
-            AddUntilStep("attempted to push ranking", () => ((FakeRankingPushPlayer)Player).GotoRankingInvoked);
+            AddUntilStep("attempted to push ranking", () => ((FakeRankingPushPlayer)Player).ResultsCreated);
         }
 
         /// <summary>
@@ -85,7 +86,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             // wait to ensure there was no attempt of pushing the results screen.
             AddWaitStep("wait", resultsDisplayWaitCount);
-            AddAssert("no attempt to push ranking", () => !((FakeRankingPushPlayer)Player).GotoRankingInvoked);
+            AddAssert("no attempt to push ranking", () => !((FakeRankingPushPlayer)Player).ResultsCreated);
         }
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
@@ -111,16 +112,18 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public class FakeRankingPushPlayer : TestPlayer
         {
-            public bool GotoRankingInvoked;
+            public bool ResultsCreated { get; private set; }
 
             public FakeRankingPushPlayer()
                 : base(true, true)
             {
             }
 
-            protected override void GotoRanking(ScoreInfo score)
+            protected override ResultsScreen CreateResults(ScoreInfo score)
             {
-                GotoRankingInvoked = true;
+                var results = base.CreateResults(score);
+                ResultsCreated = true;
+                return results;
             }
         }
     }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 3fb680b9c9..cc5f32d300 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -536,7 +536,7 @@ namespace osu.Game.Screens.Play
                     {
                         // screen may be in the exiting transition phase.
                         if (this.IsCurrentScreen())
-                            GotoRanking(t.Result);
+                            this.Push(CreateResults(t.Result));
                     });
                 }
             }));
@@ -738,6 +738,10 @@ namespace osu.Game.Screens.Play
             return base.OnExiting(next);
         }
 
+        /// <summary>
+        /// Creates the player's <see cref="Score"/>.
+        /// </summary>
+        /// <returns>The <see cref="Score"/>.</returns>
         protected virtual Score CreateScore()
         {
             var score = new Score
@@ -767,6 +771,11 @@ namespace osu.Game.Screens.Play
             return score;
         }
 
+        /// <summary>
+        /// Submits the player's <see cref="Score"/>.
+        /// </summary>
+        /// <param name="score">The <see cref="Score"/> to submit.</param>
+        /// <returns>The submitted score.</returns>
         protected virtual async Task<ScoreInfo> SubmitScore(Score score)
         {
             // Replays are already populated and present in the game's database, so should not be re-imported.
@@ -784,10 +793,13 @@ namespace osu.Game.Screens.Play
             return await scoreManager.Import(score.ScoreInfo, replayReader);
         }
 
+        /// <summary>
+        /// Creates the <see cref="ResultsScreen"/> for a <see cref="ScoreInfo"/>.
+        /// </summary>
+        /// <param name="score">The <see cref="ScoreInfo"/> to be displayed in the results screen.</param>
+        /// <returns>The <see cref="ResultsScreen"/>.</returns>
         protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, true);
 
-        protected virtual void GotoRanking(ScoreInfo score) => this.Push(CreateResults(score));
-
         private void fadeOut(bool instant = false)
         {
             float fadeOutDuration = instant ? 0 : 250;

From 1369b75a86b93cac21c22c0d4a9305b9864f9258 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 17:48:42 +0900
Subject: [PATCH 06984/10326] Fix potential multiple submission

---
 osu.Game/Screens/Play/Player.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index cc5f32d300..94c595908e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -502,6 +502,7 @@ namespace osu.Game.Screens.Play
         }
 
         private ScheduledDelegate completionProgressDelegate;
+        private Task<ScoreInfo> scoreSubmissionTask;
 
         private void updateCompletionState(ValueChangedEvent<bool> completionState)
         {
@@ -528,7 +529,8 @@ namespace osu.Game.Screens.Play
 
             if (!showResults) return;
 
-            SubmitScore(CreateScore()).ContinueWith(t => Schedule(() =>
+            scoreSubmissionTask ??= SubmitScore(CreateScore());
+            scoreSubmissionTask.ContinueWith(t => Schedule(() =>
             {
                 using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
                 {

From 8826d0155908750dfcc99df83bed41e548bb3391 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 18:20:36 +0900
Subject: [PATCH 06985/10326] Create completion progress delegate immediately

---
 osu.Game/Screens/Play/Player.cs | 37 ++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 94c595908e..b79b8eeae8 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -529,21 +529,38 @@ namespace osu.Game.Screens.Play
 
             if (!showResults) return;
 
-            scoreSubmissionTask ??= SubmitScore(CreateScore());
-            scoreSubmissionTask.ContinueWith(t => Schedule(() =>
+            scoreSubmissionTask ??= Task.Run(async () =>
             {
-                using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
+                var score = CreateScore();
+
+                try
                 {
-                    completionProgressDelegate = Schedule(() =>
-                    {
-                        // screen may be in the exiting transition phase.
-                        if (this.IsCurrentScreen())
-                            this.Push(CreateResults(t.Result));
-                    });
+                    return await SubmitScore(score);
                 }
-            }));
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, "Score submission failed!");
+                    return score.ScoreInfo;
+                }
+            });
+
+            using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
+                scheduleCompletion();
         }
 
+        private void scheduleCompletion() => completionProgressDelegate = Schedule(() =>
+        {
+            if (!scoreSubmissionTask.IsCompleted)
+            {
+                scheduleCompletion();
+                return;
+            }
+
+            // screen may be in the exiting transition phase.
+            if (this.IsCurrentScreen())
+                this.Push(CreateResults(scoreSubmissionTask.Result));
+        });
+
         protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
 
         #region Fail Logic

From eccfc8ccd2b420c99cc2b30f868ad74e1214881a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 18:31:49 +0900
Subject: [PATCH 06986/10326] Fix potential cross-reference access

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index b79b8eeae8..c8f1980ab1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -23,8 +23,10 @@ using osu.Game.Graphics.Containers;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
+using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
@@ -781,8 +783,7 @@ namespace osu.Game.Screens.Play
             else
             {
                 score.ScoreInfo.User = api.LocalUser.Value;
-                if (recordingScore?.Replay.Frames.Count > 0)
-                    score.Replay = recordingScore.Replay;
+                score.Replay = new Replay { Frames = recordingScore?.Replay.Frames.ToList() ?? new List<ReplayFrame>() };
             }
 
             ScoreProcessor.PopulateScore(score.ScoreInfo);

From c9e75e790830816cd4b90525a71a625319e43bae Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 13:09:05 +0300
Subject: [PATCH 06987/10326] Add user avatar to leaderboard scores

---
 .../Play/HUD/GameplayLeaderboardScore.cs      | 53 +++++++++++++++----
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 0b58cf76a2..9c444a6f1f 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
+using osu.Game.Users.Drawables;
 using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
@@ -129,7 +130,7 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
             InternalChildren = new Drawable[]
             {
@@ -195,19 +196,51 @@ namespace osu.Game.Screens.Play.HUD
                                             },
                                         }
                                     },
-                                    usernameText = new OsuSpriteText
+                                    new FillFlowContainer
                                     {
                                         Padding = new MarginPadding { Left = SHEAR_WIDTH },
-                                        RelativeSizeAxes = Axes.X,
-                                        Width = 0.8f,
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
-                                        Colour = Color4.White,
-                                        Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
-                                        Text = User.Username,
-                                        Truncate = true,
-                                        Shadow = false,
-                                    }
+                                        RelativeSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Horizontal,
+                                        Spacing = new Vector2(4f, 0f),
+                                        Children = new Drawable[]
+                                        {
+                                            new CircularContainer
+                                            {
+                                                Masking = true,
+                                                Anchor = Anchor.CentreLeft,
+                                                Origin = Anchor.CentreLeft,
+                                                Size = new Vector2(25f),
+                                                Children = new Drawable[]
+                                                {
+                                                    new Box
+                                                    {
+                                                        Name = "Placeholder while avatar loads",
+                                                        Alpha = 0.3f,
+                                                        RelativeSizeAxes = Axes.Both,
+                                                        Colour = colours.Gray4,
+                                                    },
+                                                    new UpdateableAvatar(User)
+                                                    {
+                                                        RelativeSizeAxes = Axes.Both,
+                                                    },
+                                                }
+                                            },
+                                            usernameText = new OsuSpriteText
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                Width = 0.8f,
+                                                Anchor = Anchor.CentreLeft,
+                                                Origin = Anchor.CentreLeft,
+                                                Colour = Color4.White,
+                                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
+                                                Text = User.Username,
+                                                Truncate = true,
+                                                Shadow = false,
+                                            }
+                                        }
+                                    },
                                 }
                             },
                             new Container

From 030dce55599422cc4017b5b754eab9a66cee623a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 13:09:50 +0300
Subject: [PATCH 06988/10326] Increase leaderboard score width a bit

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 9c444a6f1f..af3cb640bb 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -20,9 +20,9 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
-        public const float EXTENDED_WIDTH = 235f;
+        public const float EXTENDED_WIDTH = 255f;
 
-        private const float regular_width = 215f;
+        private const float regular_width = 235f;
 
         public const float PANEL_HEIGHT = 35f;
 

From 228acf25a7d1b483841f4c6b1bbc4ab46c15aad6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 13:13:31 +0300
Subject: [PATCH 06989/10326] Add test case creating leaderboard scores with
 existing users

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs  | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index ff15e1d2dc..ca61672ef9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add local player", () => createLeaderboardScore(playerScore, "You", true));
+            AddStep("add local player", () => createLeaderboardScore(playerScore, new User { Username = "You", Id = 3 }, true));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => createLeaderboardScore(player2Score, "Player 2"));
-            AddStep("add player 3", () => createLeaderboardScore(player3Score, "Player 3"));
+            AddStep("add player 2", () => createLeaderboardScore(player2Score, new User { Username = "Player 2" }));
+            AddStep("add player 3", () => createLeaderboardScore(player3Score, new User { Username = "Player 3" }));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
@@ -71,12 +71,23 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestRandomScores()
         {
             int playerNumber = 1;
-            AddRepeatStep("add player with random score", () => createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}"), 10);
+            AddRepeatStep("add player with random score", () => createRandomScore(new User { Username = $"Player {playerNumber++}" }), 10);
         }
 
-        private void createLeaderboardScore(BindableDouble score, string username, bool isTracked = false)
+        [Test]
+        public void TestExistingUsers()
         {
-            var leaderboardScore = leaderboard.AddPlayer(new User { Username = username }, isTracked);
+            AddStep("add peppy", () => createRandomScore(new User { Username = "peppy", Id = 2 }));
+            AddStep("add smoogipoo", () => createRandomScore(new User { Username = "smoogipoo", Id = 1040328 }));
+            AddStep("add flyte", () => createRandomScore(new User { Username = "flyte", Id = 3103765 }));
+            AddStep("add frenzibyte", () => createRandomScore(new User { Username = "frenzibyte", Id = 14210502 }));
+        }
+
+        private void createRandomScore(User user) => createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), user);
+
+        private void createLeaderboardScore(BindableDouble score, User user, bool isTracked = false)
+        {
+            var leaderboardScore = leaderboard.AddPlayer(user, isTracked);
             leaderboardScore.TotalScore.BindTo(score);
         }
 

From 122250f454059d9adc231e982bd976e3795e1beb Mon Sep 17 00:00:00 2001
From: Graham Johnson <johnson.graham.ib@gmail.com>
Date: Fri, 18 Dec 2020 10:45:23 -0500
Subject: [PATCH 06990/10326] replace drag cirle function with dictionary

---
 .../Edit/Compose/Components/SelectionBox.cs   | 61 ++++++-------------
 1 file changed, 17 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 8ccd4f71e9..85e86499be 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -2,6 +2,7 @@
 // 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;
@@ -235,13 +236,27 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void addDragHandle(Anchor anchor) => AddInternal(new SelectionBoxDragHandle
         {
             Anchor = anchor,
-            X = getAdjustmentToCenterCircleOnBorder(anchor).X,
-            Y = getAdjustmentToCenterCircleOnBorder(anchor).Y,
+            X = dragCircleAdjustments[anchor].X,
+            Y = dragCircleAdjustments[anchor].Y,
             HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
             OperationStarted = operationStarted,
             OperationEnded = operationEnded
         });
 
+        /// <summary>
+        /// Adjust Drag circle to be centered on the center of the border instead of on the edge.
+        /// </summary>
+        private Dictionary<Anchor, Vector2> dragCircleAdjustments = new Dictionary<Anchor, Vector2>(){
+            {Anchor.TopLeft, new Vector2(BORDER_RADIUS / 2)},
+            {Anchor.CentreLeft, new Vector2(BORDER_RADIUS / 2, 0)},
+            {Anchor.BottomLeft, new Vector2(BORDER_RADIUS / 2, -BORDER_RADIUS / 2)},
+            {Anchor.TopCentre, new Vector2(0, BORDER_RADIUS / 2)},
+            {Anchor.BottomCentre, new Vector2(0, -BORDER_RADIUS / 2)},
+            {Anchor.TopRight, new Vector2(-BORDER_RADIUS / 2, BORDER_RADIUS / 2)},
+            {Anchor.CentreRight, new Vector2(-BORDER_RADIUS / 2, 0)},
+            {Anchor.BottomRight, new Vector2(-BORDER_RADIUS / 2)}
+        };
+
         private int activeOperations;
 
         private float convertDragEventToAngleOfRotation(DragEvent e)
@@ -253,48 +268,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return (endAngle - startAngle) * 180 / MathF.PI;
         }
 
-        /// <summary>
-        /// Adjust Drag circle to be centered on the center of the border instead of on the edge.
-        /// </summary>
-        /// <param name="anchor">The part of the rectangle to be adjusted.</param>
-        /// <returns>A 2d vector on how much to adjust the drag circle</returns>
-        private Vector2 getAdjustmentToCenterCircleOnBorder(Anchor anchor)
-        {
-            Vector2 adjustment = Vector2.Zero;
-
-            switch (anchor)
-            {
-                case Anchor.TopLeft:
-                case Anchor.CentreLeft:
-                case Anchor.BottomLeft:
-                    adjustment.X = BORDER_RADIUS / 2;
-                    break;
-
-                case Anchor.TopRight:
-                case Anchor.CentreRight:
-                case Anchor.BottomRight:
-                    adjustment.X = -BORDER_RADIUS / 2;
-                    break;
-            }
-
-            switch (anchor)
-            {
-                case Anchor.TopLeft:
-                case Anchor.TopCentre:
-                case Anchor.TopRight:
-                    adjustment.Y = BORDER_RADIUS / 2;
-                    break;
-
-                case Anchor.BottomLeft:
-                case Anchor.BottomCentre:
-                case Anchor.BottomRight:
-                    adjustment.Y = -BORDER_RADIUS / 2;
-                    break;
-            }
-
-            return adjustment;
-        }
-
         private void operationEnded()
         {
             if (--activeOperations == 0)

From 4494bb1eb5a587157f180f3ae14d078a0604194d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 00:15:41 +0900
Subject: [PATCH 06991/10326] Abstract RoomManager and Multiplayer

---
 .../Multiplayer/TestSceneMultiScreen.cs       |   3 +-
 .../Navigation/TestSceneScreenNavigation.cs   |   5 +-
 osu.Game/Screens/Menu/MainMenu.cs             |   4 +-
 .../Components/ListingPollingComponent.cs     |  68 ++++
 .../Screens/Multi/Components/RoomManager.cs   | 188 ++++++++++
 .../Multi/Components/RoomPollingComponent.cs  |  41 +++
 .../Components/SelectionPollingComponent.cs   |  69 ++++
 osu.Game/Screens/Multi/IRoomManager.cs        |   2 +
 osu.Game/Screens/Multi/Multiplayer.cs         |  60 +---
 osu.Game/Screens/Multi/RoomManager.cs         | 337 ------------------
 .../Multi/Timeshift/TimeshiftMultiplayer.cs   |  48 +++
 .../Multi/Timeshift/TimeshiftRoomManager.cs   |  20 ++
 12 files changed, 460 insertions(+), 385 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
 create mode 100644 osu.Game/Screens/Multi/Components/RoomManager.cs
 create mode 100644 osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
 create mode 100644 osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
 delete mode 100644 osu.Game/Screens/Multi/RoomManager.cs
 create mode 100644 osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
 create mode 100644 osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
index 3924b0333f..0390b995e1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
+using osu.Game.Screens.Multi.Timeshift;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -17,7 +18,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneMultiScreen()
         {
-            Screens.Multi.Multiplayer multi = new Screens.Multi.Multiplayer();
+            var multi = new TimeshiftMultiplayer();
 
             AddStep("show", () => LoadScreen(multi));
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index d87854a7ea..43f97d8ace 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -11,6 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
+using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Options;
@@ -107,14 +108,14 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitMultiWithEscape()
         {
-            PushAndConfirm(() => new Screens.Multi.Multiplayer());
+            PushAndConfirm(() => new TimeshiftMultiplayer());
             exitViaEscapeAndConfirm();
         }
 
         [Test]
         public void TestExitMultiWithBackButton()
         {
-            PushAndConfirm(() => new Screens.Multi.Multiplayer());
+            PushAndConfirm(() => new TimeshiftMultiplayer());
             exitViaBackButtonAndConfirm();
         }
 
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index c3ecd75963..b781c347f0 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -17,7 +17,7 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Multi;
+using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.Menu
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Menu
                                 this.Push(new Editor());
                             },
                             OnSolo = onSolo,
-                            OnMulti = delegate { this.Push(new Multiplayer()); },
+                            OnMulti = delegate { this.Push(new TimeshiftMultiplayer()); },
                             OnExit = confirmAndExit,
                         }
                     }
diff --git a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
new file mode 100644
index 0000000000..e22f09779e
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/ListingPollingComponent.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 System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    /// <summary>
+    /// A <see cref="RoomPollingComponent"/> that polls for the lounge listing.
+    /// </summary>
+    public class ListingPollingComponent : RoomPollingComponent
+    {
+        [Resolved]
+        private Bindable<FilterCriteria> currentFilter { get; set; }
+
+        [Resolved]
+        private Bindable<Room> selectedRoom { 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.Status, currentFilter.Value.Category);
+
+            pollReq.Success += result =>
+            {
+                for (int i = 0; i < result.Count; i++)
+                {
+                    if (result[i].RoomID.Value == selectedRoom.Value?.RoomID.Value)
+                    {
+                        // The listing request always has less information than the opened room, so don't include it.
+                        result[i] = selectedRoom.Value;
+                        break;
+                    }
+                }
+
+                NotifyRoomsReceived(result);
+                tcs.SetResult(true);
+            };
+
+            pollReq.Failure += _ => tcs.SetResult(false);
+
+            API.Queue(pollReq);
+
+            return tcs.Task;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
new file mode 100644
index 0000000000..46941dc58e
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -0,0 +1,188 @@
+// Copyright (c) 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.Diagnostics;
+using System.Linq;
+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.API;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    public abstract class RoomManager : CompositeDrawable, IRoomManager
+    {
+        public event Action RoomsUpdated;
+
+        private readonly BindableList<Room> rooms = new BindableList<Room>();
+
+        public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>();
+
+        public IBindableList<Room> Rooms => rooms;
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private Room joinedRoom;
+
+        protected RoomManager()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = CreatePollingComponents().Select(p =>
+            {
+                p.InitialRoomsReceived.BindTo(InitialRoomsReceived);
+                p.RoomsReceived = onRoomsReceived;
+                return p;
+            }).ToList();
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            PartRoom();
+        }
+
+        public virtual void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+        {
+            room.Host.Value = api.LocalUser.Value;
+
+            var req = new CreateRoomRequest(room);
+
+            req.Success += result =>
+            {
+                joinedRoom = room;
+
+                update(room, result);
+                addRoom(room);
+
+                RoomsUpdated?.Invoke();
+                onSuccess?.Invoke(room);
+            };
+
+            req.Failure += exception =>
+            {
+                if (req.Result != null)
+                    onError?.Invoke(req.Result.Error);
+                else
+                    Logger.Log($"Failed to create the room: {exception}", level: LogLevel.Important);
+            };
+
+            api.Queue(req);
+        }
+
+        private JoinRoomRequest currentJoinRoomRequest;
+
+        public virtual void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+        {
+            currentJoinRoomRequest?.Cancel();
+            currentJoinRoomRequest = new JoinRoomRequest(room);
+
+            currentJoinRoomRequest.Success += () =>
+            {
+                joinedRoom = room;
+                onSuccess?.Invoke(room);
+            };
+
+            currentJoinRoomRequest.Failure += exception =>
+            {
+                if (!(exception is OperationCanceledException))
+                    Logger.Log($"Failed to join room: {exception}", level: LogLevel.Important);
+                onError?.Invoke(exception.ToString());
+            };
+
+            api.Queue(currentJoinRoomRequest);
+        }
+
+        public void PartRoom()
+        {
+            currentJoinRoomRequest?.Cancel();
+
+            if (joinedRoom == null)
+                return;
+
+            api.Queue(new PartRoomRequest(joinedRoom));
+            joinedRoom = null;
+        }
+
+        private readonly HashSet<int> ignoredRooms = new HashSet<int>();
+
+        private void onRoomsReceived(List<Room> received)
+        {
+            // Remove past matches
+            foreach (var r in rooms.ToList())
+            {
+                if (received.All(e => e.RoomID.Value != r.RoomID.Value))
+                    rooms.Remove(r);
+            }
+
+            for (int i = 0; i < received.Count; i++)
+            {
+                var room = received[i];
+
+                Debug.Assert(room.RoomID.Value != null);
+
+                if (ignoredRooms.Contains(room.RoomID.Value.Value))
+                    continue;
+
+                room.Position.Value = i;
+
+                try
+                {
+                    update(room, room);
+                    addRoom(room);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, $"Failed to update room: {room.Name.Value}.");
+
+                    ignoredRooms.Add(room.RoomID.Value.Value);
+                    rooms.Remove(room);
+                }
+            }
+
+            RoomsUpdated?.Invoke();
+        }
+
+        /// <summary>
+        /// Updates a local <see cref="Room"/> with a remote copy.
+        /// </summary>
+        /// <param name="local">The local <see cref="Room"/> to update.</param>
+        /// <param name="remote">The remote <see cref="Room"/> to update with.</param>
+        private void update(Room local, Room remote)
+        {
+            foreach (var pi in remote.Playlist)
+                pi.MapObjects(beatmaps, rulesets);
+
+            local.CopyFrom(remote);
+        }
+
+        /// <summary>
+        /// Adds a <see cref="Room"/> to the list of available rooms.
+        /// </summary>
+        /// <param name="room">The <see cref="Room"/> to add.</param>
+        private void addRoom(Room room)
+        {
+            var existing = rooms.FirstOrDefault(e => e.RoomID.Value == room.RoomID.Value);
+            if (existing == null)
+                rooms.Add(room);
+            else
+                existing.CopyFrom(room);
+        }
+
+        protected abstract RoomPollingComponent[] CreatePollingComponents();
+    }
+}
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
new file mode 100644
index 0000000000..5430d54644
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/RoomPollingComponent.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.Bindables;
+using osu.Game.Online;
+using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    public abstract class RoomPollingComponent : PollingComponent
+    {
+        public Action<List<Room>> RoomsReceived;
+
+        /// <summary>
+        /// The time in milliseconds to wait between polls.
+        /// Setting to zero stops all polling.
+        /// </summary>
+        public new readonly Bindable<double> TimeBetweenPolls = new Bindable<double>();
+
+        public IBindable<bool> InitialRoomsReceived => initialRoomsReceived;
+        private readonly Bindable<bool> initialRoomsReceived = new Bindable<bool>();
+
+        [Resolved]
+        protected IAPIProvider API { get; private set; }
+
+        protected RoomPollingComponent()
+        {
+            TimeBetweenPolls.BindValueChanged(time => base.TimeBetweenPolls = time.NewValue);
+        }
+
+        protected void NotifyRoomsReceived(List<Room> rooms)
+        {
+            initialRoomsReceived.Value = true;
+            RoomsReceived?.Invoke(rooms);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
new file mode 100644
index 0000000000..544d5b2388
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
@@ -0,0 +1,69 @@
+// Copyright (c) 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.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.Multiplayer;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    /// <summary>
+    /// A <see cref="RoomPollingComponent"/> that polls for the currently-selected room.
+    /// </summary>
+    public class SelectionPollingComponent : RoomPollingComponent
+    {
+        [Resolved]
+        private Bindable<Room> selectedRoom { get; set; }
+
+        [Resolved]
+        private IRoomManager roomManager { 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 =>
+            {
+                var rooms = new List<Room>(roomManager.Rooms);
+
+                int index = rooms.FindIndex(r => r.RoomID == result.RoomID);
+                if (index < 0)
+                    return;
+
+                rooms[index] = result;
+
+                NotifyRoomsReceived(rooms);
+                tcs.SetResult(true);
+            };
+
+            pollReq.Failure += _ => tcs.SetResult(false);
+
+            API.Queue(pollReq);
+
+            return tcs.Task;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs
index bf75843c3e..3d18edcd71 100644
--- a/osu.Game/Screens/Multi/IRoomManager.cs
+++ b/osu.Game/Screens/Multi/IRoomManager.cs
@@ -2,11 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Screens.Multi
 {
+    [Cached(typeof(IRoomManager))]
     public interface IRoomManager
     {
         /// <summary>
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index a323faeea1..5f61c5e635 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.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.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
@@ -30,7 +29,7 @@ using osuTK;
 namespace osu.Game.Screens.Multi
 {
     [Cached]
-    public class Multiplayer : OsuScreen
+    public abstract class Multiplayer : OsuScreen
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
 
@@ -46,6 +45,9 @@ namespace osu.Game.Screens.Multi
 
         private readonly IBindable<bool> isIdle = new BindableBool();
 
+        [Cached(Type = typeof(IRoomManager))]
+        protected IRoomManager RoomManager { get; private set; }
+
         [Cached]
         private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
 
@@ -55,9 +57,6 @@ namespace osu.Game.Screens.Multi
         [Resolved(CanBeNull = true)]
         private MusicController music { get; set; }
 
-        [Cached(Type = typeof(IRoomManager))]
-        private RoomManager roomManager;
-
         [Resolved]
         private OsuGameBase game { get; set; }
 
@@ -70,7 +69,7 @@ namespace osu.Game.Screens.Multi
         private readonly Drawable header;
         private readonly Drawable headerBackground;
 
-        public Multiplayer()
+        protected Multiplayer()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -82,7 +81,7 @@ namespace osu.Game.Screens.Multi
             InternalChild = waves = new MultiplayerWaveContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
+                Children = new[]
                 {
                     new Box
                     {
@@ -137,7 +136,7 @@ namespace osu.Game.Screens.Multi
                         Origin = Anchor.TopRight,
                         Action = () => CreateRoom()
                     },
-                    roomManager = new RoomManager()
+                    (Drawable)(RoomManager = CreateRoomManager())
                 }
             };
 
@@ -168,7 +167,7 @@ namespace osu.Game.Screens.Multi
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            isIdle.BindValueChanged(idle => updatePollingRate(idle.NewValue), true);
+            isIdle.BindValueChanged(idle => UpdatePollingRate(idle.NewValue), true);
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -178,36 +177,7 @@ namespace osu.Game.Screens.Multi
             return dependencies;
         }
 
-        private void updatePollingRate(bool idle)
-        {
-            if (!this.IsCurrentScreen())
-            {
-                roomManager.TimeBetweenListingPolls = 0;
-                roomManager.TimeBetweenSelectionPolls = 0;
-            }
-            else
-            {
-                switch (screenStack.CurrentScreen)
-                {
-                    case LoungeSubScreen _:
-                        roomManager.TimeBetweenListingPolls = idle ? 120000 : 15000;
-                        roomManager.TimeBetweenSelectionPolls = idle ? 120000 : 15000;
-                        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})");
-        }
+        protected abstract void UpdatePollingRate(bool isIdle);
 
         private void forcefullyExit()
         {
@@ -241,7 +211,7 @@ namespace osu.Game.Screens.Multi
 
             beginHandlingTrack();
 
-            updatePollingRate(isIdle.Value);
+            UpdatePollingRate(isIdle.Value);
         }
 
         public override void OnSuspending(IScreen next)
@@ -251,12 +221,12 @@ namespace osu.Game.Screens.Multi
 
             endHandlingTrack();
 
-            updatePollingRate(isIdle.Value);
+            UpdatePollingRate(isIdle.Value);
         }
 
         public override bool OnExiting(IScreen next)
         {
-            roomManager.PartRoom();
+            RoomManager.PartRoom();
 
             waves.Hide();
 
@@ -344,12 +314,14 @@ namespace osu.Game.Screens.Multi
             if (newScreen is IOsuScreen newOsuScreen)
                 ((IBindable<UserActivity>)Activity).BindTo(newOsuScreen.Activity);
 
-            updatePollingRate(isIdle.Value);
+            UpdatePollingRate(isIdle.Value);
             createButton.FadeTo(newScreen is LoungeSubScreen ? 1 : 0, 200);
 
             updateTrack();
         }
 
+        protected IScreen CurrentSubScreen => screenStack.CurrentScreen;
+
         private void updateTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
         {
             if (screenStack.CurrentScreen is MatchSubScreen)
@@ -381,6 +353,8 @@ namespace osu.Game.Screens.Multi
             }
         }
 
+        protected abstract IRoomManager CreateRoomManager();
+
         private class MultiplayerWaveContainer : WaveContainer
         {
             protected override bool StartHidden => true;
diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
deleted file mode 100644
index fb0cf73bb9..0000000000
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ /dev/null
@@ -1,337 +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.Diagnostics;
-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;
-using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.Lounge.Components;
-
-namespace osu.Game.Screens.Multi
-{
-    public class RoomManager : CompositeDrawable, IRoomManager
-    {
-        public event Action RoomsUpdated;
-
-        private readonly BindableList<Room> rooms = new BindableList<Room>();
-
-        public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>();
-
-        public IBindableList<Room> Rooms => rooms;
-
-        public double TimeBetweenListingPolls
-        {
-            get => listingPollingComponent.TimeBetweenPolls;
-            set => listingPollingComponent.TimeBetweenPolls = value;
-        }
-
-        public double TimeBetweenSelectionPolls
-        {
-            get => selectionPollingComponent.TimeBetweenPolls;
-            set => selectionPollingComponent.TimeBetweenPolls = value;
-        }
-
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        [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()
-        {
-            RelativeSizeAxes = Axes.Both;
-
-            InternalChildren = new Drawable[]
-            {
-                listingPollingComponent = new ListingPollingComponent
-                {
-                    InitialRoomsReceived = { BindTarget = InitialRoomsReceived },
-                    RoomsReceived = onListingReceived
-                },
-                selectionPollingComponent = new SelectionPollingComponent { RoomReceived = onSelectedRoomReceived }
-            };
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            PartRoom();
-        }
-
-        public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-        {
-            room.Host.Value = api.LocalUser.Value;
-
-            var req = new CreateRoomRequest(room);
-
-            req.Success += result =>
-            {
-                joinedRoom = room;
-
-                update(room, result);
-                addRoom(room);
-
-                RoomsUpdated?.Invoke();
-                onSuccess?.Invoke(room);
-            };
-
-            req.Failure += exception =>
-            {
-                if (req.Result != null)
-                    onError?.Invoke(req.Result.Error);
-                else
-                    Logger.Log($"Failed to create the room: {exception}", level: LogLevel.Important);
-            };
-
-            api.Queue(req);
-        }
-
-        private JoinRoomRequest currentJoinRoomRequest;
-
-        public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-        {
-            currentJoinRoomRequest?.Cancel();
-            currentJoinRoomRequest = new JoinRoomRequest(room);
-
-            currentJoinRoomRequest.Success += () =>
-            {
-                joinedRoom = room;
-                onSuccess?.Invoke(room);
-            };
-
-            currentJoinRoomRequest.Failure += exception =>
-            {
-                if (!(exception is OperationCanceledException))
-                    Logger.Log($"Failed to join room: {exception}", level: LogLevel.Important);
-                onError?.Invoke(exception.ToString());
-            };
-
-            api.Queue(currentJoinRoomRequest);
-        }
-
-        public void PartRoom()
-        {
-            currentJoinRoomRequest?.Cancel();
-
-            if (joinedRoom == null)
-                return;
-
-            api.Queue(new PartRoomRequest(joinedRoom));
-            joinedRoom = null;
-        }
-
-        private readonly HashSet<int> ignoredRooms = new HashSet<int>();
-
-        /// <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 onListingReceived(List<Room> listing)
-        {
-            // 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)
-                {
-                    // 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;
-                }
-
-                var room = listing[i];
-
-                Debug.Assert(room.RoomID.Value != null);
-
-                if (ignoredRooms.Contains(room.RoomID.Value.Value))
-                    continue;
-
-                room.Position.Value = i;
-
-                try
-                {
-                    update(room, room);
-                    addRoom(room);
-                }
-                catch (Exception ex)
-                {
-                    Logger.Error(ex, $"Failed to update room: {room.Name.Value}.");
-
-                    ignoredRooms.Add(room.RoomID.Value.Value);
-                    rooms.Remove(room);
-                }
-            }
-
-            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 onSelectedRoomReceived(Room toUpdate)
-        {
-            foreach (var room in rooms)
-            {
-                if (room.RoomID.Value == toUpdate.RoomID.Value)
-                {
-                    toUpdate.Position.Value = room.Position.Value;
-                    update(room, toUpdate);
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Updates a local <see cref="Room"/> with a remote copy.
-        /// </summary>
-        /// <param name="local">The local <see cref="Room"/> to update.</param>
-        /// <param name="remote">The remote <see cref="Room"/> to update with.</param>
-        private void update(Room local, Room remote)
-        {
-            foreach (var pi in remote.Playlist)
-                pi.MapObjects(beatmaps, rulesets);
-
-            local.CopyFrom(remote);
-        }
-
-        /// <summary>
-        /// Adds a <see cref="Room"/> to the list of available rooms.
-        /// </summary>
-        /// <param name="room">The <see cref="Room"/> to add.</param>
-        private void addRoom(Room room)
-        {
-            var existing = rooms.FirstOrDefault(e => e.RoomID.Value == room.RoomID.Value);
-            if (existing == null)
-                rooms.Add(room);
-            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;
-
-            public readonly Bindable<bool> InitialRoomsReceived = new Bindable<bool>();
-
-            [Resolved]
-            private IAPIProvider api { get; set; }
-
-            [Resolved]
-            private Bindable<FilterCriteria> currentFilter { get; set; }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                currentFilter.BindValueChanged(_ =>
-                {
-                    InitialRoomsReceived.Value = false;
-
-                    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.Status, currentFilter.Value.Category);
-
-                pollReq.Success += result =>
-                {
-                    InitialRoomsReceived.Value = true;
-                    RoomsReceived?.Invoke(result);
-                    tcs.SetResult(true);
-                };
-
-                pollReq.Failure += _ => tcs.SetResult(false);
-
-                api.Queue(pollReq);
-
-                return tcs.Task;
-            }
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
new file mode 100644
index 0000000000..1ff9c670a8
--- /dev/null
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.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.Logging;
+using osu.Framework.Screens;
+using osu.Game.Screens.Multi.Lounge;
+using osu.Game.Screens.Multi.Match;
+
+namespace osu.Game.Screens.Multi.Timeshift
+{
+    public class TimeshiftMultiplayer : Multiplayer
+    {
+        protected override void UpdatePollingRate(bool isIdle)
+        {
+            var timeshiftManager = (TimeshiftRoomManager)RoomManager;
+
+            if (!this.IsCurrentScreen())
+            {
+                timeshiftManager.TimeBetweenListingPolls.Value = 0;
+                timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+            }
+            else
+            {
+                switch (CurrentSubScreen)
+                {
+                    case LoungeSubScreen _:
+                        timeshiftManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
+                        break;
+
+                    case MatchSubScreen _:
+                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
+                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 30000 : 5000;
+                        break;
+
+                    default:
+                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
+                        timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                        break;
+                }
+            }
+
+            Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
+        }
+
+        protected override IRoomManager CreateRoomManager() => new TimeshiftRoomManager();
+    }
+}
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs
new file mode 100644
index 0000000000..ba96721afc
--- /dev/null
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.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.Bindables;
+using osu.Game.Screens.Multi.Components;
+
+namespace osu.Game.Screens.Multi.Timeshift
+{
+    public class TimeshiftRoomManager : RoomManager
+    {
+        public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
+        public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
+
+        protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
+        {
+            new ListingPollingComponent { TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls } },
+            new SelectionPollingComponent { TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls } }
+        };
+    }
+}

From f4e9703deb20a7abdd303781a17c63e736951136 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 00:52:32 +0900
Subject: [PATCH 06992/10326] Fix incorrect comparison

---
 osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
index 544d5b2388..37a190b5e0 100644
--- a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Multi.Components
             {
                 var rooms = new List<Room>(roomManager.Rooms);
 
-                int index = rooms.FindIndex(r => r.RoomID == result.RoomID);
+                int index = rooms.FindIndex(r => r.RoomID.Value == result.RoomID.Value);
                 if (index < 0)
                     return;
 

From ab9158c306c5b19c6f314967216ab4fe4915fd23 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 20:50:54 +0900
Subject: [PATCH 06993/10326] Add a stateful multiplayer client

---
 .../StatefulMultiplayerClient.cs              | 389 ++++++++++++++++++
 1 file changed, 389 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
new file mode 100644
index 0000000000..3e2f435524
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -0,0 +1,389 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable enable
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Rulesets;
+using osu.Game.Users;
+using osu.Game.Utils;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public abstract class StatefulMultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
+    {
+        /// <summary>
+        /// Invoked when any change occurs to the multiplayer room.
+        /// </summary>
+        public event Action? RoomChanged;
+
+        /// <summary>
+        /// Invoked when the multiplayer server requests the current beatmap to be loaded into play.
+        /// </summary>
+        public event Action? LoadRequested;
+
+        /// <summary>
+        /// Invoked when the multiplayer server requests gameplay to be started.
+        /// </summary>
+        public event Action? MatchStarted;
+
+        /// <summary>
+        /// Invoked when the multiplayer server has finished collating results.
+        /// </summary>
+        public event Action? ResultsReady;
+
+        /// <summary>
+        /// Whether the <see cref="StatefulMultiplayerClient"/> is currently connected.
+        /// </summary>
+        public abstract IBindable<bool> IsConnected { get; }
+
+        /// <summary>
+        /// The joined <see cref="MultiplayerRoom"/>.
+        /// </summary>
+        public MultiplayerRoom? Room { get; private set; }
+
+        /// <summary>
+        /// The users currently in gameplay.
+        /// </summary>
+        public readonly BindableList<int> PlayingUsers = new BindableList<int>();
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; } = null!;
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; } = null!;
+
+        private Room? apiRoom;
+        private int playlistItemId; // Todo: THIS IS SUPER TEMPORARY!!
+
+        /// <summary>
+        /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
+        /// </summary>
+        /// <param name="room">The API <see cref="Room"/>.</param>
+        public async Task JoinRoom(Room room)
+        {
+            Debug.Assert(Room == null);
+            Debug.Assert(room.RoomID.Value != null);
+
+            apiRoom = room;
+            playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
+
+            Room = await JoinRoom(room.RoomID.Value.Value);
+
+            Debug.Assert(Room != null);
+
+            foreach (var user in Room.Users)
+                await PopulateUser(user);
+
+            updateLocalRoomSettings(Room.Settings);
+        }
+
+        /// <summary>
+        /// Joins the <see cref="MultiplayerRoom"/> with a given ID.
+        /// </summary>
+        /// <param name="roomId">The room ID.</param>
+        /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
+        protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
+
+        public virtual Task LeaveRoom()
+        {
+            if (Room == null)
+                return Task.CompletedTask;
+
+            apiRoom = null;
+            Room = null;
+
+            Schedule(() => RoomChanged?.Invoke());
+
+            return Task.CompletedTask;
+        }
+
+        /// <summary>
+        /// Change the current <see cref="MultiplayerRoom"/> settings.
+        /// </summary>
+        /// <remarks>
+        /// A room must have been joined via <see cref="JoinRoom"/> for this to have any effect.
+        /// </remarks>
+        /// <param name="name">The new room name, if any.</param>
+        /// <param name="item">The new room playlist item, if any.</param>
+        public void ChangeSettings(Optional<string> name = default, Optional<PlaylistItem> item = default)
+        {
+            if (Room == null)
+                return;
+
+            // A dummy playlist item filled with the current room settings (except mods).
+            var existingPlaylistItem = new PlaylistItem
+            {
+                Beatmap =
+                {
+                    Value = new BeatmapInfo
+                    {
+                        OnlineBeatmapID = Room.Settings.BeatmapID,
+                        MD5Hash = Room.Settings.BeatmapChecksum
+                    }
+                },
+                RulesetID = Room.Settings.RulesetID
+            };
+
+            var newSettings = new MultiplayerRoomSettings
+            {
+                Name = name.GetOr(Room.Settings.Name),
+                BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
+                BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
+                RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
+                Mods = item.HasValue ? item.Value!.RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods
+            };
+
+            // Make sure there would be a meaningful change in settings.
+            if (newSettings.Equals(Room.Settings))
+                return;
+
+            ChangeSettings(newSettings);
+        }
+
+        public abstract Task TransferHost(int userId);
+
+        public abstract Task ChangeSettings(MultiplayerRoomSettings settings);
+
+        public abstract Task ChangeState(MultiplayerUserState newState);
+
+        public abstract Task StartMatch();
+
+        Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Debug.Assert(apiRoom != null);
+
+                Room.State = state;
+
+                switch (state)
+                {
+                    case MultiplayerRoomState.Open:
+                        apiRoom.Status.Value = new RoomStatusOpen();
+                        break;
+
+                    case MultiplayerRoomState.Playing:
+                        apiRoom.Status.Value = new RoomStatusPlaying();
+                        break;
+
+                    case MultiplayerRoomState.Closed:
+                        apiRoom.Status.Value = new RoomStatusEnded();
+                        break;
+                }
+
+                RoomChanged?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        async Task IMultiplayerClient.UserJoined(MultiplayerRoomUser user)
+        {
+            await PopulateUser(user);
+
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Add(user);
+
+                RoomChanged?.Invoke();
+            });
+        }
+
+        Task IMultiplayerClient.UserLeft(MultiplayerRoomUser user)
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Remove(user);
+                PlayingUsers.Remove(user.UserID);
+
+                RoomChanged?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.HostChanged(int userId)
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Debug.Assert(apiRoom != null);
+
+                var user = Room.Users.FirstOrDefault(u => u.UserID == userId);
+
+                Room.Host = user;
+                apiRoom.Host.Value = user?.User;
+
+                RoomChanged?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.SettingsChanged(MultiplayerRoomSettings newSettings)
+        {
+            updateLocalRoomSettings(newSettings);
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.UserStateChanged(int userId, MultiplayerUserState state)
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Single(u => u.UserID == userId).State = state;
+
+                if (state != MultiplayerUserState.Playing)
+                    PlayingUsers.Remove(userId);
+
+                RoomChanged?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.LoadRequested()
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                LoadRequested?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.MatchStarted()
+        {
+            Debug.Assert(Room != null);
+            var players = Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID).ToList();
+
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                PlayingUsers.AddRange(players);
+
+                MatchStarted?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.ResultsReady()
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                ResultsReady?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        /// <summary>
+        /// Populates the <see cref="User"/> for a given <see cref="MultiplayerRoomUser"/>.
+        /// </summary>
+        /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
+        protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID);
+
+        /// <summary>
+        /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
+        /// </summary>
+        /// <remarks>
+        /// This updates both the joined <see cref="MultiplayerRoom"/> and the respective API <see cref="Room"/>.
+        /// </remarks>
+        /// <param name="settings">The new <see cref="MultiplayerRoomSettings"/> to update from.</param>
+        private void updateLocalRoomSettings(MultiplayerRoomSettings settings)
+        {
+            if (Room == null)
+                return;
+
+            // Update a few instantaneously properties of the room.
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Debug.Assert(apiRoom != null);
+
+                Room.Settings = settings;
+                apiRoom.Name.Value = Room.Settings.Name;
+
+                // The playlist update is delayed until an online beatmap lookup (below) succeeds.
+                // In-order for the client to not display an outdated beatmap, the playlist is forcefully cleared here.
+                apiRoom.Playlist.Clear();
+
+                RoomChanged?.Invoke();
+            });
+
+            var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
+            req.Success += res =>
+            {
+                var beatmapSet = res.ToBeatmapSet(rulesets);
+
+                var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
+                beatmap.MD5Hash = settings.BeatmapChecksum;
+
+                var ruleset = rulesets.GetRuleset(settings.RulesetID);
+                var mods = settings.Mods.Select(m => m.ToMod(ruleset.CreateInstance()));
+
+                PlaylistItem playlistItem = new PlaylistItem
+                {
+                    ID = playlistItemId,
+                    Beatmap = { Value = beatmap },
+                    Ruleset = { Value = ruleset },
+                };
+
+                playlistItem.RequiredMods.AddRange(mods);
+
+                Schedule(() =>
+                {
+                    if (Room == null || !Room.Settings.Equals(settings))
+                        return;
+
+                    Debug.Assert(apiRoom != null);
+
+                    apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
+                    apiRoom.Playlist.Add(playlistItem);
+                });
+            };
+
+            api.Queue(req);
+        }
+    }
+}

From 9ceb090f04d682f583fdc2d06fe1462f12a9c8ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 00:17:50 +0900
Subject: [PATCH 06994/10326] Fix ambiguous reference

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 3e2f435524..60960f4929 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Change the current <see cref="MultiplayerRoom"/> settings.
         /// </summary>
         /// <remarks>
-        /// A room must have been joined via <see cref="JoinRoom"/> for this to have any effect.
+        /// A room must be joined for this to have any effect.
         /// </remarks>
         /// <param name="name">The new room name, if any.</param>
         /// <param name="item">The new room playlist item, if any.</param>

From cf2340cafb8b7ce964935a410f3bd3af49041458 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 00:18:41 +0900
Subject: [PATCH 06995/10326] Add a realtime room manager

---
 .../RealtimeRoomManager.cs                    | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
new file mode 100644
index 0000000000..a86e924c85
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.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 System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Logging;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeRoomManager : RoomManager
+    {
+        [Resolved]
+        private StatefulMultiplayerClient multiplayerClient { get; set; }
+
+        public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+            => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
+
+        public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+            => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
+
+        private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null)
+        {
+            Debug.Assert(room.RoomID.Value != null);
+
+            var joinTask = multiplayerClient.JoinRoom(room);
+            joinTask.ContinueWith(_ => onSuccess?.Invoke(room));
+            joinTask.ContinueWith(t =>
+            {
+                PartRoom();
+                if (t.Exception != null)
+                    Logger.Error(t.Exception, "Failed to join multiplayer room.");
+            }, TaskContinuationOptions.NotOnRanToCompletion);
+        }
+
+        protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
+        {
+            new ListingPollingComponent()
+        };
+    }
+}

From a6520d3d446230cb3c0ef49aa15cdf45ba8b2232 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:01:09 +0900
Subject: [PATCH 06996/10326] Clear rooms and poll only when connected to
 multiplayer server

---
 .../Screens/Multi/Components/RoomManager.cs   |  6 ++
 .../RealtimeRoomManager.cs                    | 64 ++++++++++++++++++-
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 46941dc58e..d92427680e 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -157,6 +157,12 @@ namespace osu.Game.Screens.Multi.Components
             RoomsUpdated?.Invoke();
         }
 
+        protected void ClearRooms()
+        {
+            rooms.Clear();
+            InitialRoomsReceived.Value = false;
+        }
+
         /// <summary>
         /// Updates a local <see cref="Room"/> with a remote copy.
         /// </summary>
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index a86e924c85..62ea5d5512 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -17,6 +18,22 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [Resolved]
         private StatefulMultiplayerClient multiplayerClient { get; set; }
 
+        public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
+        public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
+        private readonly IBindable<bool> isConnected = new Bindable<bool>();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            isConnected.BindTo(multiplayerClient.IsConnected);
+            isConnected.BindValueChanged(connected => Schedule(() =>
+            {
+                if (!connected.NewValue)
+                    ClearRooms();
+            }));
+        }
+
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
 
@@ -39,7 +56,52 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
         {
-            new ListingPollingComponent()
+            new RealtimeListingPollingComponent
+            {
+                TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
+                AllowPolling = { BindTarget = isConnected }
+            },
+            new RealtimeSelectionPollingComponent
+            {
+                TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
+                AllowPolling = { BindTarget = isConnected }
+            }
         };
+
+        private class RealtimeListingPollingComponent : ListingPollingComponent
+        {
+            public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                AllowPolling.BindValueChanged(_ =>
+                {
+                    if (IsLoaded)
+                        PollImmediately();
+                });
+            }
+
+            protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
+        }
+
+        private class RealtimeSelectionPollingComponent : SelectionPollingComponent
+        {
+            public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                AllowPolling.BindValueChanged(_ =>
+                {
+                    if (IsLoaded)
+                        PollImmediately();
+                });
+            }
+
+            protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
+        }
     }
 }

From 1e2163f55e0378604ebe2f083a84b1271a8e7f4d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:14:50 +0900
Subject: [PATCH 06997/10326] Add a testable realtime multiplayer client

---
 .../TestRealtimeMultiplayerClient.cs          | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
new file mode 100644
index 0000000000..2a90f1e744
--- /dev/null
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.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.
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.API;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestRealtimeMultiplayerClient : StatefulMultiplayerClient
+    {
+        public override IBindable<bool> IsConnected { get; } = new Bindable<bool>(true);
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        public void AddUser(User user) => ((IMultiplayerClient)this).UserJoined(new MultiplayerRoomUser(user.Id) { User = user });
+
+        public void RemoveUser(User user)
+        {
+            Debug.Assert(Room != null);
+            ((IMultiplayerClient)this).UserLeft(Room.Users.Single(u => u.User == user));
+
+            Schedule(() =>
+            {
+                if (Room.Users.Any())
+                    TransferHost(Room.Users.First().UserID);
+            });
+        }
+
+        public void ChangeUserState(int userId, MultiplayerUserState newState)
+        {
+            Debug.Assert(Room != null);
+
+            ((IMultiplayerClient)this).UserStateChanged(userId, newState);
+
+            Schedule(() =>
+            {
+                switch (newState)
+                {
+                    case MultiplayerUserState.Loaded:
+                        if (Room.Users.All(u => u.State != MultiplayerUserState.WaitingForLoad))
+                        {
+                            foreach (var u in Room.Users.Where(u => u.State == MultiplayerUserState.Loaded))
+                                ChangeUserState(u.UserID, MultiplayerUserState.Playing);
+
+                            ((IMultiplayerClient)this).MatchStarted();
+                        }
+
+                        break;
+
+                    case MultiplayerUserState.FinishedPlay:
+                        if (Room.Users.All(u => u.State != MultiplayerUserState.Playing))
+                        {
+                            foreach (var u in Room.Users.Where(u => u.State == MultiplayerUserState.FinishedPlay))
+                                ChangeUserState(u.UserID, MultiplayerUserState.Results);
+
+                            ((IMultiplayerClient)this).ResultsReady();
+                        }
+
+                        break;
+                }
+            });
+        }
+
+        protected override Task<MultiplayerRoom> JoinRoom(long roomId)
+        {
+            var user = new MultiplayerRoomUser(api.LocalUser.Value.Id) { User = api.LocalUser.Value };
+
+            var room = new MultiplayerRoom(roomId);
+            room.Users.Add(user);
+
+            if (room.Users.Count == 1)
+                room.Host = user;
+
+            return Task.FromResult(room);
+        }
+
+        public override Task TransferHost(int userId) => ((IMultiplayerClient)this).HostChanged(userId);
+
+        public override async Task ChangeSettings(MultiplayerRoomSettings settings)
+        {
+            Debug.Assert(Room != null);
+
+            await ((IMultiplayerClient)this).SettingsChanged(settings);
+
+            foreach (var user in Room.Users.Where(u => u.State == MultiplayerUserState.Ready))
+                ChangeUserState(user.UserID, MultiplayerUserState.Idle);
+        }
+
+        public override Task ChangeState(MultiplayerUserState newState)
+        {
+            ChangeUserState(api.LocalUser.Value.Id, newState);
+            return Task.CompletedTask;
+        }
+
+        public override async Task StartMatch()
+        {
+            Debug.Assert(Room != null);
+
+            foreach (var user in Room.Users.Where(u => u.State == MultiplayerUserState.Ready))
+                ChangeUserState(user.UserID, MultiplayerUserState.WaitingForLoad);
+
+            await ((IMultiplayerClient)this).LoadRequested();
+        }
+    }
+}

From 50a35c0f63222f767678d4b661b93f19e04a2b67 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:16:00 +0900
Subject: [PATCH 06998/10326] Add connection/disconnection capability

---
 .../RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
index 2a90f1e744..bfa8362c7e 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
@@ -16,11 +16,16 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
     public class TestRealtimeMultiplayerClient : StatefulMultiplayerClient
     {
-        public override IBindable<bool> IsConnected { get; } = new Bindable<bool>(true);
+        public override IBindable<bool> IsConnected => isConnected;
+        private readonly Bindable<bool> isConnected = new Bindable<bool>(true);
 
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
+        public void Connect() => isConnected.Value = true;
+
+        public void Disconnect() => isConnected.Value = false;
+
         public void AddUser(User user) => ((IMultiplayerClient)this).UserJoined(new MultiplayerRoomUser(user.Id) { User = user });
 
         public void RemoveUser(User user)

From c6555c53cc315b6df93cab9d7c56dc2c018ad2ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:17:24 +0900
Subject: [PATCH 06999/10326] Add a testable realtime room manager

---
 .../API/Requests/GetBeatmapSetRequest.cs      | 10 +-
 .../Online/Multiplayer/CreateRoomRequest.cs   |  6 +-
 .../TestRealtimeRoomManager.cs                | 91 +++++++++++++++++++
 3 files changed, 99 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs

diff --git a/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs b/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs
index 8e6deeb3c6..158ae03b8d 100644
--- a/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs
+++ b/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs
@@ -7,16 +7,16 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetBeatmapSetRequest : APIRequest<APIBeatmapSet>
     {
-        private readonly int id;
-        private readonly BeatmapSetLookupType type;
+        public readonly int ID;
+        public readonly BeatmapSetLookupType Type;
 
         public GetBeatmapSetRequest(int id, BeatmapSetLookupType type = BeatmapSetLookupType.SetId)
         {
-            this.id = id;
-            this.type = type;
+            ID = id;
+            Type = type;
         }
 
-        protected override string Target => type == BeatmapSetLookupType.SetId ? $@"beatmapsets/{id}" : $@"beatmapsets/lookup?beatmap_id={id}";
+        protected override string Target => Type == BeatmapSetLookupType.SetId ? $@"beatmapsets/{ID}" : $@"beatmapsets/lookup?beatmap_id={ID}";
     }
 
     public enum BeatmapSetLookupType
diff --git a/osu.Game/Online/Multiplayer/CreateRoomRequest.cs b/osu.Game/Online/Multiplayer/CreateRoomRequest.cs
index dcb4ed51ea..5be99e9442 100644
--- a/osu.Game/Online/Multiplayer/CreateRoomRequest.cs
+++ b/osu.Game/Online/Multiplayer/CreateRoomRequest.cs
@@ -10,11 +10,11 @@ namespace osu.Game.Online.Multiplayer
 {
     public class CreateRoomRequest : APIRequest<APICreatedRoom>
     {
-        private readonly Room room;
+        public readonly Room Room;
 
         public CreateRoomRequest(Room room)
         {
-            this.room = room;
+            Room = room;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -24,7 +24,7 @@ namespace osu.Game.Online.Multiplayer
             req.ContentType = "application/json";
             req.Method = HttpMethod.Post;
 
-            req.AddRaw(JsonConvert.SerializeObject(room));
+            req.AddRaw(JsonConvert.SerializeObject(Room));
 
             return req;
         }
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
new file mode 100644
index 0000000000..773b72da88
--- /dev/null
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
@@ -0,0 +1,91 @@
+// Copyright (c) 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.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestRealtimeRoomManager : RealtimeRoomManager
+    {
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
+        private readonly List<Room> rooms = new List<Room>();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            int currentScoreId = 0;
+
+            ((DummyAPIAccess)api).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case CreateRoomRequest createRoomRequest:
+                        var createdRoom = new APICreatedRoom();
+
+                        createdRoom.CopyFrom(createRoomRequest.Room);
+                        createdRoom.RoomID.Value = 1;
+
+                        rooms.Add(createdRoom);
+                        createRoomRequest.TriggerSuccess(createdRoom);
+                        break;
+
+                    case JoinRoomRequest joinRoomRequest:
+                        joinRoomRequest.TriggerSuccess();
+                        break;
+
+                    case PartRoomRequest partRoomRequest:
+                        partRoomRequest.TriggerSuccess();
+                        break;
+
+                    case GetRoomsRequest getRoomsRequest:
+                        getRoomsRequest.TriggerSuccess(rooms);
+                        break;
+
+                    case GetBeatmapSetRequest getBeatmapSetRequest:
+                        var onlineReq = new GetBeatmapSetRequest(getBeatmapSetRequest.ID, getBeatmapSetRequest.Type);
+                        onlineReq.Success += res => getBeatmapSetRequest.TriggerSuccess(res);
+                        onlineReq.Failure += e => getBeatmapSetRequest.TriggerFailure(e);
+
+                        // Get the online API from the game's dependencies.
+                        game.Dependencies.Get<IAPIProvider>().Queue(onlineReq);
+                        break;
+
+                    case CreateRoomScoreRequest createRoomScoreRequest:
+                        createRoomScoreRequest.TriggerSuccess(new APIScoreToken { ID = 1 });
+                        break;
+
+                    case SubmitRoomScoreRequest submitRoomScoreRequest:
+                        submitRoomScoreRequest.TriggerSuccess(new MultiplayerScore
+                        {
+                            ID = currentScoreId++,
+                            Accuracy = 1,
+                            EndedAt = DateTimeOffset.Now,
+                            Passed = true,
+                            Rank = ScoreRank.S,
+                            MaxCombo = 1000,
+                            TotalScore = 1000000,
+                            User = api.LocalUser.Value,
+                            Statistics = new Dictionary<HitResult, int>()
+                        });
+                        break;
+                }
+            };
+        }
+
+        public new void Schedule(Action action) => base.Schedule(action);
+    }
+}

From c6da680c803a0d9cf055fbedbd57e7992eed823e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:19:08 +0900
Subject: [PATCH 07000/10326] Add a container for testing purposes

---
 .../TestRealtimeRoomContainer.cs              | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
new file mode 100644
index 0000000000..aa75968cca
--- /dev/null
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestRealtimeRoomContainer : Container
+    {
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        [Cached(typeof(StatefulMultiplayerClient))]
+        public readonly TestRealtimeMultiplayerClient Client;
+
+        [Cached(typeof(RealtimeRoomManager))]
+        public readonly TestRealtimeRoomManager RoomManager;
+
+        [Cached]
+        public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
+
+        public TestRealtimeRoomContainer()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            AddRangeInternal(new Drawable[]
+            {
+                Client = new TestRealtimeMultiplayerClient(),
+                RoomManager = new TestRealtimeRoomManager(),
+                content = new Container { RelativeSizeAxes = Axes.Both }
+            });
+        }
+    }
+}

From 2fc5561b7ec7a4a5c53235203cd65b1c8d6869b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:22:52 +0900
Subject: [PATCH 07001/10326] Add handling for GetRoomRequest()

---
 osu.Game/Online/Multiplayer/GetRoomRequest.cs |  6 +++---
 .../TestRealtimeRoomManager.cs                | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/GetRoomRequest.cs b/osu.Game/Online/Multiplayer/GetRoomRequest.cs
index 2907b49f1d..449c2c8e31 100644
--- a/osu.Game/Online/Multiplayer/GetRoomRequest.cs
+++ b/osu.Game/Online/Multiplayer/GetRoomRequest.cs
@@ -7,13 +7,13 @@ namespace osu.Game.Online.Multiplayer
 {
     public class GetRoomRequest : APIRequest<Room>
     {
-        private readonly int roomId;
+        public readonly int RoomId;
 
         public GetRoomRequest(int roomId)
         {
-            this.roomId = roomId;
+            RoomId = roomId;
         }
 
-        protected override string Target => $"rooms/{roomId}";
+        protected override string Target => $"rooms/{RoomId}";
     }
 }
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
index 773b72da88..cee1c706ae 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -52,7 +53,23 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                         break;
 
                     case GetRoomsRequest getRoomsRequest:
-                        getRoomsRequest.TriggerSuccess(rooms);
+                        var roomsWithoutParticipants = new List<Room>();
+
+                        foreach (var r in rooms)
+                        {
+                            var newRoom = new Room();
+
+                            newRoom.CopyFrom(r);
+                            newRoom.RecentParticipants.Clear();
+
+                            roomsWithoutParticipants.Add(newRoom);
+                        }
+
+                        getRoomsRequest.TriggerSuccess(roomsWithoutParticipants);
+                        break;
+
+                    case GetRoomRequest getRoomRequest:
+                        getRoomRequest.TriggerSuccess(rooms.Single(r => r.RoomID.Value == getRoomRequest.RoomId));
                         break;
 
                     case GetBeatmapSetRequest getBeatmapSetRequest:

From 9b0ca8fc3b2b380578202e5e75145d1b88ed9743 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:57:30 +0900
Subject: [PATCH 07002/10326] Make real time room manager not poll while inside
 a room

---
 .../Screens/Multi/Components/RoomManager.cs   | 14 ++++++------
 .../RealtimeRoomManager.cs                    | 22 +++++++++++++------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index d92427680e..6e27515849 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.Multi.Components
 
         public IBindableList<Room> Rooms => rooms;
 
+        protected Room JoinedRoom { get; private set; }
+
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
@@ -36,8 +38,6 @@ namespace osu.Game.Screens.Multi.Components
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private Room joinedRoom;
-
         protected RoomManager()
         {
             RelativeSizeAxes = Axes.Both;
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Multi.Components
 
             req.Success += result =>
             {
-                joinedRoom = room;
+                JoinedRoom = room;
 
                 update(room, result);
                 addRoom(room);
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Multi.Components
 
             currentJoinRoomRequest.Success += () =>
             {
-                joinedRoom = room;
+                JoinedRoom = room;
                 onSuccess?.Invoke(room);
             };
 
@@ -111,11 +111,11 @@ namespace osu.Game.Screens.Multi.Components
         {
             currentJoinRoomRequest?.Cancel();
 
-            if (joinedRoom == null)
+            if (JoinedRoom == null)
                 return;
 
-            api.Queue(new PartRoomRequest(joinedRoom));
-            joinedRoom = null;
+            api.Queue(new PartRoomRequest(JoinedRoom));
+            JoinedRoom = null;
         }
 
         private readonly HashSet<int> ignoredRooms = new HashSet<int>();
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 62ea5d5512..69addde2a6 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -21,17 +21,16 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
         public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
+        private readonly Bindable<bool> allowPolling = new Bindable<bool>();
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
             isConnected.BindTo(multiplayerClient.IsConnected);
-            isConnected.BindValueChanged(connected => Schedule(() =>
-            {
-                if (!connected.NewValue)
-                    ClearRooms();
-            }));
+            isConnected.BindValueChanged(_ => Schedule(updatePolling), true);
+
+            updatePolling();
         }
 
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
@@ -54,17 +53,26 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
 
+        private void updatePolling()
+        {
+            if (!isConnected.Value)
+                ClearRooms();
+
+            // Don't poll when not connected or when a room has been joined.
+            allowPolling.Value = isConnected.Value && JoinedRoom == null;
+        }
+
         protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
         {
             new RealtimeListingPollingComponent
             {
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
-                AllowPolling = { BindTarget = isConnected }
+                AllowPolling = { BindTarget = allowPolling }
             },
             new RealtimeSelectionPollingComponent
             {
                 TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
-                AllowPolling = { BindTarget = isConnected }
+                AllowPolling = { BindTarget = allowPolling }
             }
         };
 

From 7d1fe7955e633e332e2d43fafc1dd24f313e4ee5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:57:40 +0900
Subject: [PATCH 07003/10326] Small improvements to testable room manager

---
 .../RealtimeMultiplayer/TestRealtimeRoomManager.cs     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
index cee1c706ae..0d1314fb51 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
@@ -5,11 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.RealtimeMultiplayer;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
@@ -22,6 +24,9 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         [Resolved]
         private OsuGameBase game { get; set; }
 
+        [Cached]
+        public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
+
         private readonly List<Room> rooms = new List<Room>();
 
         protected override void LoadComplete()
@@ -29,6 +34,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             base.LoadComplete();
 
             int currentScoreId = 0;
+            int currentRoomId = 0;
 
             ((DummyAPIAccess)api).HandleRequest = req =>
             {
@@ -38,7 +44,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                         var createdRoom = new APICreatedRoom();
 
                         createdRoom.CopyFrom(createRoomRequest.Room);
-                        createdRoom.RoomID.Value = 1;
+                        createdRoom.RoomID.Value ??= currentRoomId++;
 
                         rooms.Add(createdRoom);
                         createRoomRequest.TriggerSuccess(createdRoom);
@@ -103,6 +109,8 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             };
         }
 
+        public new void ClearRooms() => base.ClearRooms();
+
         public new void Schedule(Action action) => base.Schedule(action);
     }
 }

From 0fb8615f95b29dbff7ba1c839c3591a1b72aa5b1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:02:04 +0900
Subject: [PATCH 07004/10326] Implement room parting

---
 .../Screens/Multi/Components/RoomManager.cs   |  4 +++-
 .../RealtimeRoomManager.cs                    | 20 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 6e27515849..21bff70b8b 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Multi.Components
             api.Queue(currentJoinRoomRequest);
         }
 
-        public void PartRoom()
+        public virtual void PartRoom()
         {
             currentJoinRoomRequest?.Cancel();
 
@@ -157,6 +157,8 @@ namespace osu.Game.Screens.Multi.Components
             RoomsUpdated?.Invoke();
         }
 
+        protected void RemoveRoom(Room room) => rooms.Remove(room);
+
         protected void ClearRooms()
         {
             rooms.Clear();
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 69addde2a6..4f73ee3865 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
         private readonly Bindable<bool> allowPolling = new Bindable<bool>();
 
+        private ListingPollingComponent listingPollingComponent;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -39,6 +41,22 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
 
+        public override void PartRoom()
+        {
+            if (JoinedRoom == null)
+                return;
+
+            var joinedRoom = JoinedRoom;
+
+            base.PartRoom();
+            multiplayerClient.LeaveRoom().Wait();
+
+            // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
+            RemoveRoom(joinedRoom);
+            // This is delayed one frame because upon exiting the match subscreen, multiplayer updates the polling rate and messes with polling.
+            Schedule(() => listingPollingComponent.PollImmediately());
+        }
+
         private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null)
         {
             Debug.Assert(room.RoomID.Value != null);
@@ -64,7 +82,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
         {
-            new RealtimeListingPollingComponent
+            listingPollingComponent = new RealtimeListingPollingComponent
             {
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
                 AllowPolling = { BindTarget = allowPolling }

From a593f588db95a8ac6b8bb2594c1a94909ade9c5f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:02:47 +0900
Subject: [PATCH 07005/10326] Add a test for the realtime room manager

---
 .../TestSceneRealtimeRoomManager.cs           | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
new file mode 100644
index 0000000000..6bd8c410a4
--- /dev/null
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
@@ -0,0 +1,105 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestSceneRealtimeRoomManager : MultiplayerTestScene
+    {
+        private TestRealtimeRoomContainer roomContainer;
+        private TestRealtimeRoomManager roomManager => roomContainer.RoomManager;
+
+        [Test]
+        public void TestPollsInitially()
+        {
+            AddStep("create room manager with a few rooms", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room { Name = { Value = "1" } });
+                    roomManager.PartRoom();
+                    roomManager.CreateRoom(new Room { Name = { Value = "2" } });
+                    roomManager.PartRoom();
+                    roomManager.ClearRooms();
+                });
+            });
+
+            AddAssert("manager polled for rooms", () => roomManager.Rooms.Count == 2);
+            AddAssert("initial rooms received", () => roomManager.InitialRoomsReceived.Value);
+        }
+
+        [Test]
+        public void TestRoomsClearedOnDisconnection()
+        {
+            AddStep("create room manager with a few rooms", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room());
+                    roomManager.PartRoom();
+                    roomManager.CreateRoom(new Room());
+                    roomManager.PartRoom();
+                });
+            });
+
+            AddStep("disconnect", () => roomContainer.Client.Disconnect());
+
+            AddAssert("rooms cleared", () => roomManager.Rooms.Count == 0);
+            AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
+        }
+
+        [Test]
+        public void TestRoomsPolledOnReconnect()
+        {
+            AddStep("create room manager with a few rooms", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room());
+                    roomManager.PartRoom();
+                    roomManager.CreateRoom(new Room());
+                    roomManager.PartRoom();
+                });
+            });
+
+            AddStep("disconnect", () => roomContainer.Client.Disconnect());
+            AddStep("connect", () => roomContainer.Client.Connect());
+
+            AddAssert("manager polled for rooms", () => roomManager.Rooms.Count == 2);
+            AddAssert("initial rooms received", () => roomManager.InitialRoomsReceived.Value);
+        }
+
+        [Test]
+        public void TestRoomsNotPolledWhenJoined()
+        {
+            AddStep("create room manager with a room", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room());
+                    roomManager.ClearRooms();
+                });
+            });
+
+            AddAssert("manager not polled for rooms", () => roomManager.Rooms.Count == 0);
+            AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
+        }
+
+        private TestRealtimeRoomManager createRoomManager()
+        {
+            Child = roomContainer = new TestRealtimeRoomContainer
+            {
+                RoomManager =
+                {
+                    TimeBetweenListingPolls = { Value = 1 },
+                    TimeBetweenSelectionPolls = { Value = 1 }
+                }
+            };
+
+            return roomManager;
+        }
+    }
+}

From e84ce80d6cb0187b67527d5289ee3480e0746484 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:17:07 +0900
Subject: [PATCH 07006/10326] Make test headless

---
 .../Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
index 6bd8c410a4..9a4b748de1 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
@@ -3,10 +3,12 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
+    [HeadlessTest]
     public class TestSceneRealtimeRoomManager : MultiplayerTestScene
     {
         private TestRealtimeRoomContainer roomContainer;

From 109e6b4283e0a49ac13be9a59572ab1f6f599e0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:20:02 +0900
Subject: [PATCH 07007/10326] Add tests for creating/joining/parting
 multiplayer rooms

---
 .../TestSceneRealtimeRoomManager.cs           | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
index 9a4b748de1..598641682b 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
@@ -90,6 +90,52 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
         }
 
+        [Test]
+        public void TestMultiplayerRoomJoinedWhenCreated()
+        {
+            AddStep("create room manager with a room", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room());
+                });
+            });
+
+            AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
+        }
+
+        [Test]
+        public void TestMultiplayerRoomPartedWhenAPIRoomParted()
+        {
+            AddStep("create room manager with a room", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room());
+                    roomManager.PartRoom();
+                });
+            });
+
+            AddAssert("multiplayer room parted", () => roomContainer.Client.Room == null);
+        }
+
+        [Test]
+        public void TestMultiplayerRoomPartedWhenAPIRoomJoined()
+        {
+            AddStep("create room manager with a room", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    var r = new Room();
+                    roomManager.CreateRoom(r);
+                    roomManager.PartRoom();
+                    roomManager.JoinRoom(r);
+                });
+            });
+
+            AddAssert("multiplayer room parted", () => roomContainer.Client.Room != null);
+        }
+
         private TestRealtimeRoomManager createRoomManager()
         {
             Child = roomContainer = new TestRealtimeRoomContainer

From 3f4a66c4ae6036b98cb3512ba2440d75596c056e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:23:42 +0900
Subject: [PATCH 07008/10326] Add realtime multiplayer test scene abstract
 class

---
 .../RealtimeMultiplayerTestScene.cs           | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
new file mode 100644
index 0000000000..e41076a4fd
--- /dev/null
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class RealtimeMultiplayerTestScene : MultiplayerTestScene
+    {
+        [Cached(typeof(StatefulMultiplayerClient))]
+        public TestRealtimeMultiplayerClient Client { get; }
+
+        [Cached(typeof(RealtimeRoomManager))]
+        public TestRealtimeRoomManager RoomManager { get; }
+
+        [Cached]
+        public Bindable<FilterCriteria> Filter { get; }
+
+        protected override Container<Drawable> Content => content;
+        private readonly TestRealtimeRoomContainer content;
+
+        private readonly bool joinRoom;
+
+        public RealtimeMultiplayerTestScene(bool joinRoom = true)
+        {
+            this.joinRoom = joinRoom;
+            base.Content.Add(content = new TestRealtimeRoomContainer { RelativeSizeAxes = Axes.Both });
+
+            Client = content.Client;
+            RoomManager = content.RoomManager;
+            Filter = content.Filter;
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            RoomManager.Schedule(() => RoomManager.PartRoom());
+
+            if (joinRoom)
+            {
+                Room.RoomID.Value = 1;
+                RoomManager.Schedule(() => RoomManager.JoinRoom(Room, null, null));
+            }
+        });
+    }
+}

From 9b08f573baeb360e0f5135f98f5205b7145757e5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:41:04 +0900
Subject: [PATCH 07009/10326] Fix room not created before being joined

---
 .../RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
index e41076a4fd..b52106551e 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
@@ -44,10 +44,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             RoomManager.Schedule(() => RoomManager.PartRoom());
 
             if (joinRoom)
-            {
-                Room.RoomID.Value = 1;
-                RoomManager.Schedule(() => RoomManager.JoinRoom(Room, null, null));
-            }
+                RoomManager.Schedule(() => RoomManager.CreateRoom(Room));
         });
     }
 }

From 4d051818a152573834a0e859994f25c83bda1b7a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:30:53 +0900
Subject: [PATCH 07010/10326] Add base class for all realtime multiplayer
 classes

---
 .../RealtimeRoomComposite.cs                  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs
new file mode 100644
index 0000000000..e6d1274316
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Game.Online.RealtimeMultiplayer;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public abstract class RealtimeRoomComposite : MultiplayerComposite
+    {
+        [CanBeNull]
+        protected MultiplayerRoom Room => Client.Room;
+
+        [Resolved]
+        protected StatefulMultiplayerClient Client { get; private set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Client.RoomChanged += OnRoomChanged;
+            OnRoomChanged();
+        }
+
+        protected virtual void OnRoomChanged()
+        {
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            if (Client != null)
+                Client.RoomChanged -= OnRoomChanged;
+
+            base.Dispose(isDisposing);
+        }
+    }
+}

From 1e5c32410ad572883295e0f8e47e90704ef4593e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:37:47 +0900
Subject: [PATCH 07011/10326] Add the realtime multiplayer participants list

---
 .../TestSceneParticipantsList.cs              |  96 +++++++++
 .../Participants/ParticipantPanel.cs          | 187 ++++++++++++++++++
 .../Participants/ParticipantsList.cs          |  55 ++++++
 .../Participants/ReadyMark.cs                 |  51 +++++
 4 files changed, 389 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
new file mode 100644
index 0000000000..ee6bbc4ecd
--- /dev/null
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
@@ -0,0 +1,96 @@
+// Copyright (c) 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;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Testing;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestSceneParticipantsList : RealtimeMultiplayerTestScene
+    {
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Child = new ParticipantsList
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Y,
+                Size = new Vector2(380, 0.7f)
+            };
+        });
+
+        [Test]
+        public void TestAddUser()
+        {
+            AddAssert("one unique panel", () => this.ChildrenOfType<ParticipantPanel>().Select(p => p.User).Distinct().Count() == 1);
+
+            AddStep("add user", () => Client.AddUser(new User
+            {
+                Id = 3,
+                Username = "Second",
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+            }));
+
+            AddAssert("two unique panels", () => this.ChildrenOfType<ParticipantPanel>().Select(p => p.User).Distinct().Count() == 2);
+        }
+
+        [Test]
+        public void TestRemoveUser()
+        {
+            User secondUser = null;
+
+            AddStep("add a user", () =>
+            {
+                Client.AddUser(secondUser = new User
+                {
+                    Id = 3,
+                    Username = "Second",
+                    CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                });
+            });
+
+            AddStep("remove host", () => Client.RemoveUser(API.LocalUser.Value));
+
+            AddAssert("single panel is for second user", () => this.ChildrenOfType<ParticipantPanel>().Single().User.User == secondUser);
+        }
+
+        [Test]
+        public void TestToggleReadyState()
+        {
+            AddAssert("ready mark invisible", () => !this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+
+            AddStep("make user ready", () => Client.ChangeState(MultiplayerUserState.Ready));
+            AddUntilStep("ready mark visible", () => this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+
+            AddStep("make user idle", () => Client.ChangeState(MultiplayerUserState.Idle));
+            AddUntilStep("ready mark invisible", () => !this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+        }
+
+        [Test]
+        public void TestCrownChangesStateWhenHostTransferred()
+        {
+            AddStep("add user", () => Client.AddUser(new User
+            {
+                Id = 3,
+                Username = "Second",
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+            }));
+
+            AddUntilStep("first user crown visible", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(0).ChildrenOfType<SpriteIcon>().First().Alpha == 1);
+            AddUntilStep("second user crown hidden", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(1).ChildrenOfType<SpriteIcon>().First().Alpha == 0);
+
+            AddStep("make second user host", () => Client.TransferHost(3));
+
+            AddUntilStep("first user crown hidden", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(0).ChildrenOfType<SpriteIcon>().First().Alpha == 0);
+            AddUntilStep("second user crown visible", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(1).ChildrenOfType<SpriteIcon>().First().Alpha == 1);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
new file mode 100644
index 0000000000..306a54bfdc
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
@@ -0,0 +1,187 @@
+// Copyright (c) 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.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.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Users;
+using osu.Game.Users.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+{
+    public class ParticipantPanel : RealtimeRoomComposite, IHasContextMenu
+    {
+        public readonly MultiplayerRoomUser User;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private ReadyMark readyMark;
+        private SpriteIcon crown;
+
+        public ParticipantPanel(MultiplayerRoomUser user)
+        {
+            User = user;
+
+            RelativeSizeAxes = Axes.X;
+            Height = 40;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Debug.Assert(User.User != null);
+
+            var backgroundColour = Color4Extensions.FromHex("#33413C");
+
+            InternalChildren = new Drawable[]
+            {
+                crown = new SpriteIcon
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Icon = FontAwesome.Solid.Crown,
+                    Size = new Vector2(14),
+                    Colour = Color4Extensions.FromHex("#F7E65D"),
+                    Alpha = 0
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Left = 24 },
+                    Child = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        CornerRadius = 5,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = backgroundColour
+                            },
+                            new UserCoverBackground
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                RelativeSizeAxes = Axes.Both,
+                                Width = 0.75f,
+                                User = User.User,
+                                Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0), Color4.White.Opacity(0.25f))
+                            },
+                            new FillFlowContainer
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Spacing = new Vector2(10),
+                                Direction = FillDirection.Horizontal,
+                                Children = new Drawable[]
+                                {
+                                    new UpdateableAvatar
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        RelativeSizeAxes = Axes.Both,
+                                        FillMode = FillMode.Fit,
+                                        User = User.User
+                                    },
+                                    new UpdateableFlag
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Size = new Vector2(30, 20),
+                                        Country = User.User.Country
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 18),
+                                        Text = User.User.Username
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Font = OsuFont.GetFont(size: 14),
+                                        Text = User.User.CurrentModeRank != null ? $"#{User.User.CurrentModeRank}" : string.Empty
+                                    }
+                                }
+                            },
+                            readyMark = new ReadyMark
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                Margin = new MarginPadding { Right = 10 },
+                                Alpha = 0
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void OnRoomChanged()
+        {
+            base.OnRoomChanged();
+
+            if (Room == null)
+                return;
+
+            if (User.State == MultiplayerUserState.Ready)
+                readyMark.FadeIn(50);
+            else
+                readyMark.FadeOut(50);
+
+            if (Room.Host?.Equals(User) == true)
+                crown.FadeIn(50);
+            else
+                crown.FadeOut(50);
+        }
+
+        public MenuItem[] ContextMenuItems
+        {
+            get
+            {
+                if (Room == null)
+                    return null;
+
+                // If the local user is targetted.
+                if (User.UserID == api.LocalUser.Value.Id)
+                    return null;
+
+                // If the local user is not the host of the room.
+                if (Room.Host?.UserID != api.LocalUser.Value.Id)
+                    return null;
+
+                int targetUser = User.UserID;
+
+                return new MenuItem[]
+                {
+                    new OsuMenuItem("Give host", MenuItemType.Standard, () =>
+                    {
+                        // Ensure the local user is still host.
+                        if (Room.Host?.UserID != api.LocalUser.Value.Id)
+                            return;
+
+                        Client.TransferHost(targetUser);
+                    })
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
new file mode 100644
index 0000000000..d4c32d9189
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.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.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Cursor;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+{
+    public class ParticipantsList : RealtimeRoomComposite
+    {
+        private FillFlowContainer<ParticipantPanel> panels;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new OsuContextMenuContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new OsuScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = panels = new FillFlowContainer<ParticipantPanel>
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 2)
+                    }
+                }
+            };
+        }
+
+        protected override void OnRoomChanged()
+        {
+            base.OnRoomChanged();
+
+            if (Room == null)
+                panels.Clear();
+            else
+            {
+                // Remove panels for users no longer in the room.
+                panels.RemoveAll(p => !Room.Users.Contains(p.User));
+
+                // Add panels for all users new to the room.
+                foreach (var user in Room.Users.Except(panels.Select(p => p.User)))
+                    panels.Add(new ParticipantPanel(user));
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs
new file mode 100644
index 0000000000..df49d9342e
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.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.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+{
+    public class ReadyMark : CompositeDrawable
+    {
+        public ReadyMark()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Spacing = new Vector2(5),
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 12),
+                        Text = "ready",
+                        Colour = Color4Extensions.FromHex("#DDFFFF")
+                    },
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Icon = FontAwesome.Solid.CheckCircle,
+                        Size = new Vector2(12),
+                        Colour = Color4Extensions.FromHex("#AADD00")
+                    }
+                }
+            };
+        }
+    }
+}

From 11a903a206a820191af25de9e4f953223869c44a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:46:16 +0900
Subject: [PATCH 07012/10326] Add test for many users and disable scrollbar

---
 .../TestSceneParticipantsList.cs              | 20 +++++++++++++++++++
 .../Participants/ParticipantsList.cs          |  1 +
 2 files changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
index ee6bbc4ecd..8c997e9e32 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
@@ -92,5 +92,25 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             AddUntilStep("first user crown hidden", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(0).ChildrenOfType<SpriteIcon>().First().Alpha == 0);
             AddUntilStep("second user crown visible", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(1).ChildrenOfType<SpriteIcon>().First().Alpha == 1);
         }
+
+        [Test]
+        public void TestManyUsers()
+        {
+            AddStep("add many users", () =>
+            {
+                for (int i = 0; i < 20; i++)
+                {
+                    Client.AddUser(new User
+                    {
+                        Id = i,
+                        Username = $"User {i}",
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                    });
+
+                    if (i % 2 == 0)
+                        Client.ChangeUserState(i, MultiplayerUserState.Ready);
+                }
+            });
+        }
     }
 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
index d4c32d9189..218c2cabb7 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
                 Child = new OsuScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
+                    ScrollbarVisible = false,
                     Child = panels = new FillFlowContainer<ParticipantPanel>
                     {
                         RelativeSizeAxes = Axes.X,

From e4a54dc6cdccdf17b1e950fe1abf0424e9c28485 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:52:51 +0900
Subject: [PATCH 07013/10326] Renamespace ready button

---
 osu.Game/Screens/Multi/{Match => }/Components/ReadyButton.cs | 2 +-
 osu.Game/Screens/Multi/Match/Components/Footer.cs            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename osu.Game/Screens/Multi/{Match => }/Components/ReadyButton.cs (98%)

diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Components/ReadyButton.cs
similarity index 98%
rename from osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
rename to osu.Game/Screens/Multi/Components/ReadyButton.cs
index a64f24dd7e..6d12111d8f 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Components/ReadyButton.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.Multi.Components
 {
     public class ReadyButton : TriangleButton
     {
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index be4ee873fa..4ec8628d2b 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Components;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Match.Components

From 4e0113afbf51e5d9be43e73b1fee714a21c04ee1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:55:48 +0900
Subject: [PATCH 07014/10326] Abstractify ready button and add a timeshift
 implementation

---
 .../Screens/Multi/Components/ReadyButton.cs   | 24 +++---------
 .../Screens/Multi/Match/Components/Footer.cs  |  4 +-
 .../Multi/Timeshift/TimeshiftReadyButton.cs   | 38 +++++++++++++++++++
 3 files changed, 46 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs

diff --git a/osu.Game/Screens/Multi/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Components/ReadyButton.cs
index 6d12111d8f..0bb4ed8617 100644
--- a/osu.Game/Screens/Multi/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Components/ReadyButton.cs
@@ -13,26 +13,20 @@ using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Screens.Multi.Components
 {
-    public class ReadyButton : TriangleButton
+    public abstract class ReadyButton : TriangleButton
     {
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
-        [Resolved(typeof(Room), nameof(Room.EndDate))]
-        private Bindable<DateTimeOffset> endDate { get; set; }
+        public new readonly BindableBool Enabled = new BindableBool();
 
         [Resolved]
-        private IBindable<WorkingBeatmap> gameBeatmap { get; set; }
+        protected IBindable<WorkingBeatmap> GameBeatmap { get; private set; }
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
         private bool hasBeatmap;
 
-        public ReadyButton()
-        {
-            Text = "Start";
-        }
-
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
 
@@ -45,10 +39,6 @@ namespace osu.Game.Screens.Multi.Components
             managerRemoved.BindValueChanged(beatmapRemoved);
 
             SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
-
-            BackgroundColour = colours.Green;
-            Triangles.ColourDark = colours.Green;
-            Triangles.ColourLight = colours.GreenLight;
         }
 
         private void updateSelectedItem(PlaylistItem item)
@@ -94,15 +84,13 @@ namespace osu.Game.Screens.Multi.Components
 
         private void updateEnabledState()
         {
-            if (gameBeatmap.Value == null || SelectedItem.Value == null)
+            if (GameBeatmap.Value == null || SelectedItem.Value == null)
             {
-                Enabled.Value = false;
+                base.Enabled.Value = false;
                 return;
             }
 
-            bool hasEnoughTime = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(gameBeatmap.Value.Track.Length) < endDate.Value;
-
-            Enabled.Value = hasBeatmap && hasEnoughTime;
+            base.Enabled.Value = hasBeatmap && Enabled.Value;
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index 4ec8628d2b..d6a7e380bf 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Multi.Timeshift;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Match.Components
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             InternalChildren = new[]
             {
                 background = new Box { RelativeSizeAxes = Axes.Both },
-                new ReadyButton
+                new TimeshiftReadyButton
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
new file mode 100644
index 0000000000..b6698b195c
--- /dev/null
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.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 System;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Graphics;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Components;
+
+namespace osu.Game.Screens.Multi.Timeshift
+{
+    public class TimeshiftReadyButton : ReadyButton
+    {
+        [Resolved(typeof(Room), nameof(Room.EndDate))]
+        private Bindable<DateTimeOffset?> endDate { get; set; }
+
+        public TimeshiftReadyButton()
+        {
+            Text = "Start";
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            BackgroundColour = colours.Green;
+            Triangles.ColourDark = colours.Green;
+            Triangles.ColourLight = colours.GreenLight;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            Enabled.Value = endDate.Value == null || DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
+        }
+    }
+}

From 6efe24695b2cf930f554fd72cd9c5c51214abf6f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:59:11 +0900
Subject: [PATCH 07015/10326] Add the realtime multiplayer ready button

---
 .../TestSceneRealtimeReadyButton.cs           | 129 ++++++++++++++++++
 .../RealtimeReadyButton.cs                    | 122 +++++++++++++++++
 2 files changed, 251 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
new file mode 100644
index 0000000000..889c0c0be3
--- /dev/null
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
@@ -0,0 +1,129 @@
+// Copyright (c) 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.Audio;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
+using osu.Game.Tests.Resources;
+using osu.Game.Users;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestSceneRealtimeReadyButton : RealtimeMultiplayerTestScene
+    {
+        private RealtimeReadyButton button;
+
+        private BeatmapManager beatmaps;
+        private RulesetStore rulesets;
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, AudioManager audio)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+            beatmaps.Import(TestResources.GetTestBeatmapForImport(true)).Wait();
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            var beatmap = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First().Beatmaps.First();
+
+            Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap);
+
+            Child = button = new RealtimeReadyButton
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(200, 50),
+                SelectedItem =
+                {
+                    Value = new PlaylistItem
+                    {
+                        Beatmap = { Value = beatmap },
+                        Ruleset = { Value = beatmap.Ruleset }
+                    }
+                }
+            };
+
+            Client.AddUser(API.LocalUser.Value);
+        });
+
+        [Test]
+        public void TestToggleStateWhenNotHost()
+        {
+            AddStep("add second user as host", () =>
+            {
+                Client.AddUser(new User { Id = 2, Username = "Another user" });
+                Client.TransferHost(2);
+            });
+
+            addClickButtonStep();
+            AddAssert("user is ready", () => Client.Room?.Users[0].State == MultiplayerUserState.Ready);
+
+            addClickButtonStep();
+            AddAssert("user is idle", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestToggleStateWhenHost(bool allReady)
+        {
+            AddStep("setup", () =>
+            {
+                Client.TransferHost(Client.Room?.Users[0].UserID ?? 0);
+
+                if (!allReady)
+                    Client.AddUser(new User { Id = 2, Username = "Another user" });
+            });
+
+            addClickButtonStep();
+            AddAssert("user is ready", () => Client.Room?.Users[0].State == MultiplayerUserState.Ready);
+
+            addClickButtonStep();
+            AddAssert("match started", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
+        }
+
+        [Test]
+        public void TestBecomeHostWhileReady()
+        {
+            addClickButtonStep();
+            AddStep("make user host", () => Client.TransferHost(Client.Room?.Users[0].UserID ?? 0));
+
+            addClickButtonStep();
+            AddAssert("match started", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
+        }
+
+        [Test]
+        public void TestLoseHostWhileReady()
+        {
+            AddStep("setup", () =>
+            {
+                Client.TransferHost(Client.Room?.Users[0].UserID ?? 0);
+                Client.AddUser(new User { Id = 2, Username = "Another user" });
+            });
+
+            addClickButtonStep();
+            AddStep("transfer host", () => Client.TransferHost(Client.Room?.Users[1].UserID ?? 0));
+
+            addClickButtonStep();
+            AddAssert("match not started", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
+        }
+
+        private void addClickButtonStep() => AddStep("click button", () =>
+        {
+            InputManager.MoveMouseTo(button);
+            InputManager.Click(MouseButton.Left);
+        });
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
new file mode 100644
index 0000000000..d52df258ad
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.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 System.Diagnostics;
+using System.Linq;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Backgrounds;
+using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Components;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeReadyButton : RealtimeRoomComposite
+    {
+        public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [CanBeNull]
+        private MultiplayerRoomUser localUser;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private readonly ButtonWithTrianglesExposed button;
+
+        public RealtimeReadyButton()
+        {
+            InternalChild = button = new ButtonWithTrianglesExposed
+            {
+                RelativeSizeAxes = Axes.Both,
+                Size = Vector2.One,
+                Enabled = { Value = true },
+                Action = onClick
+            };
+        }
+
+        protected override void OnRoomChanged()
+        {
+            base.OnRoomChanged();
+
+            localUser = Room?.Users.Single(u => u.User?.Id == api.LocalUser.Value.Id);
+            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open;
+            updateState();
+        }
+
+        private void updateState()
+        {
+            if (localUser == null)
+                return;
+
+            Debug.Assert(Room != null);
+
+            switch (localUser.State)
+            {
+                case MultiplayerUserState.Idle:
+                    button.Text = "Ready";
+                    updateButtonColour(true);
+                    break;
+
+                case MultiplayerUserState.Ready:
+                    if (Room?.Host?.Equals(localUser) == true)
+                    {
+                        button.Text = "Let's go!";
+                        updateButtonColour(Room.Users.All(u => u.State == MultiplayerUserState.Ready));
+                    }
+                    else
+                    {
+                        button.Text = "Waiting for host...";
+                        updateButtonColour(false);
+                    }
+
+                    break;
+            }
+        }
+
+        private void updateButtonColour(bool green)
+        {
+            if (green)
+            {
+                button.BackgroundColour = colours.Green;
+                button.Triangles.ColourDark = colours.Green;
+                button.Triangles.ColourLight = colours.GreenLight;
+            }
+            else
+            {
+                button.BackgroundColour = colours.YellowDark;
+                button.Triangles.ColourDark = colours.YellowDark;
+                button.Triangles.ColourLight = colours.Yellow;
+            }
+        }
+
+        private void onClick()
+        {
+            if (localUser == null)
+                return;
+
+            if (localUser.State == MultiplayerUserState.Idle)
+                Client.ChangeState(MultiplayerUserState.Ready);
+            else
+            {
+                if (Room?.Host?.Equals(localUser) == true)
+                    Client.StartMatch();
+                else
+                    Client.ChangeState(MultiplayerUserState.Idle);
+            }
+        }
+
+        private class ButtonWithTrianglesExposed : ReadyButton
+        {
+            public new Triangles Triangles => base.Triangles;
+        }
+    }
+}

From cc22efaa6babc4592a06a34f6affb226caea56cb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 03:17:04 +0900
Subject: [PATCH 07016/10326] Use tcs instead of delay-wait

---
 osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index e106dc3a1c..2b7ca189ee 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -107,25 +107,23 @@ namespace osu.Game.Screens.Multi.Play
         {
             Debug.Assert(token != null);
 
-            bool completed = false;
+            var tcs = new TaskCompletionSource<bool>();
             var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score.ScoreInfo);
 
             request.Success += s =>
             {
                 score.ScoreInfo.OnlineScoreID = s.ID;
-                completed = true;
+                tcs.SetResult(true);
             };
 
             request.Failure += e =>
             {
                 Logger.Error(e, "Failed to submit score");
-                completed = true;
+                tcs.SetResult(false);
             };
 
             api.Queue(request);
-
-            while (!completed)
-                await Task.Delay(100);
+            await tcs.Task;
 
             return await base.SubmitScore(score);
         }

From 772dd0287e4932e232d4f6c033b7246f740d3541 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 03:32:05 +0900
Subject: [PATCH 07017/10326] Split submission and import into two methods

---
 .../Screens/Multi/Play/TimeshiftPlayer.cs     |  6 ++--
 osu.Game/Screens/Play/Player.cs               | 33 ++++++++++++++-----
 osu.Game/Screens/Play/ReplayPlayer.cs         |  3 +-
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 2b7ca189ee..41dcf61740 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -103,8 +103,10 @@ namespace osu.Game.Screens.Multi.Play
             return score;
         }
 
-        protected override async Task<ScoreInfo> SubmitScore(Score score)
+        protected override async Task SubmitScore(Score score)
         {
+            await base.SubmitScore(score);
+
             Debug.Assert(token != null);
 
             var tcs = new TaskCompletionSource<bool>();
@@ -124,8 +126,6 @@ namespace osu.Game.Screens.Multi.Play
 
             api.Queue(request);
             await tcs.Task;
-
-            return await base.SubmitScore(score);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c8f1980ab1..a83f0e1b33 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -537,13 +537,23 @@ namespace osu.Game.Screens.Play
 
                 try
                 {
-                    return await SubmitScore(score);
+                    await SubmitScore(score);
                 }
                 catch (Exception ex)
                 {
                     Logger.Error(ex, "Score submission failed!");
-                    return score.ScoreInfo;
                 }
+
+                try
+                {
+                    await ImportScore(score);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, "Score import failed!");
+                }
+
+                return score.ScoreInfo;
             });
 
             using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
@@ -792,15 +802,15 @@ namespace osu.Game.Screens.Play
         }
 
         /// <summary>
-        /// Submits the player's <see cref="Score"/>.
+        /// Imports the player's <see cref="Score"/> to the local database.
         /// </summary>
-        /// <param name="score">The <see cref="Score"/> to submit.</param>
-        /// <returns>The submitted score.</returns>
-        protected virtual async Task<ScoreInfo> SubmitScore(Score score)
+        /// <param name="score">The <see cref="Score"/> to import.</param>
+        /// <returns>The imported score.</returns>
+        protected virtual async Task ImportScore(Score score)
         {
             // Replays are already populated and present in the game's database, so should not be re-imported.
             if (DrawableRuleset.ReplayScore != null)
-                return score.ScoreInfo;
+                return;
 
             LegacyByteArrayReader replayReader;
 
@@ -810,9 +820,16 @@ namespace osu.Game.Screens.Play
                 replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
             }
 
-            return await scoreManager.Import(score.ScoreInfo, replayReader);
+            await scoreManager.Import(score.ScoreInfo, replayReader);
         }
 
+        /// <summary>
+        /// Submits the player's <see cref="Score"/>.
+        /// </summary>
+        /// <param name="score">The <see cref="Score"/> to submit.</param>
+        /// <returns>The submitted score.</returns>
+        protected virtual Task SubmitScore(Score score) => Task.CompletedTask;
+
         /// <summary>
         /// Creates the <see cref="ResultsScreen"/> for a <see cref="ScoreInfo"/>.
         /// </summary>
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 390d1d1959..a07213cb33 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -37,7 +37,8 @@ namespace osu.Game.Screens.Play
             return Score;
         }
 
-        protected override Task<ScoreInfo> SubmitScore(Score score) => Task.FromResult(score.ScoreInfo);
+        // Don't re-import replay scores as they're already present in the database.
+        protected override Task ImportScore(Score score) => Task.CompletedTask;
 
         protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
 

From f1878eff639bce6d336008cc85e4a4b2c8260bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 18 Dec 2020 23:45:42 +0100
Subject: [PATCH 07018/10326] Use yet another solution leveraging padding

---
 .../Edit/Compose/Components/SelectionBox.cs   | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 85e86499be..2f4721f63e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.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.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -93,6 +92,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        private Container dragHandles;
         private FillFlowContainer buttons;
 
         public const float BORDER_RADIUS = 3;
@@ -152,6 +152,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         },
                     }
                 },
+                dragHandles = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    // ensures that the centres of all drag handles line up with the middle of the selection box border.
+                    Padding = new MarginPadding(BORDER_RADIUS / 2)
+                },
                 buttons = new FillFlowContainer
                 {
                     Y = 20,
@@ -233,30 +239,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             });
         }
 
-        private void addDragHandle(Anchor anchor) => AddInternal(new SelectionBoxDragHandle
+        private void addDragHandle(Anchor anchor) => dragHandles.Add(new SelectionBoxDragHandle
         {
             Anchor = anchor,
-            X = dragCircleAdjustments[anchor].X,
-            Y = dragCircleAdjustments[anchor].Y,
             HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
             OperationStarted = operationStarted,
             OperationEnded = operationEnded
         });
 
-        /// <summary>
-        /// Adjust Drag circle to be centered on the center of the border instead of on the edge.
-        /// </summary>
-        private Dictionary<Anchor, Vector2> dragCircleAdjustments = new Dictionary<Anchor, Vector2>(){
-            {Anchor.TopLeft, new Vector2(BORDER_RADIUS / 2)},
-            {Anchor.CentreLeft, new Vector2(BORDER_RADIUS / 2, 0)},
-            {Anchor.BottomLeft, new Vector2(BORDER_RADIUS / 2, -BORDER_RADIUS / 2)},
-            {Anchor.TopCentre, new Vector2(0, BORDER_RADIUS / 2)},
-            {Anchor.BottomCentre, new Vector2(0, -BORDER_RADIUS / 2)},
-            {Anchor.TopRight, new Vector2(-BORDER_RADIUS / 2, BORDER_RADIUS / 2)},
-            {Anchor.CentreRight, new Vector2(-BORDER_RADIUS / 2, 0)},
-            {Anchor.BottomRight, new Vector2(-BORDER_RADIUS / 2)}
-        };
-
         private int activeOperations;
 
         private float convertDragEventToAngleOfRotation(DragEvent e)

From beaced321153867f0ae9c1d39af5a82848e2ced0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 19 Dec 2020 13:58:56 +0900
Subject: [PATCH 07019/10326] Remove unnecessary async state machine

---
 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 a83f0e1b33..c539dff5d9 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -806,11 +806,11 @@ namespace osu.Game.Screens.Play
         /// </summary>
         /// <param name="score">The <see cref="Score"/> to import.</param>
         /// <returns>The imported score.</returns>
-        protected virtual async Task ImportScore(Score score)
+        protected virtual Task ImportScore(Score score)
         {
             // Replays are already populated and present in the game's database, so should not be re-imported.
             if (DrawableRuleset.ReplayScore != null)
-                return;
+                return Task.CompletedTask;
 
             LegacyByteArrayReader replayReader;
 
@@ -820,7 +820,7 @@ namespace osu.Game.Screens.Play
                 replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
             }
 
-            await scoreManager.Import(score.ScoreInfo, replayReader);
+            return scoreManager.Import(score.ScoreInfo, replayReader);
         }
 
         /// <summary>

From 926281831b85353c1ddf878167abfbbad965a56f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 19 Dec 2020 10:36:27 +0100
Subject: [PATCH 07020/10326] Fix missing  XMLDoc bit.

---
 osu.Game/Database/ICanAcceptFiles.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Database/ICanAcceptFiles.cs b/osu.Game/Database/ICanAcceptFiles.cs
index 5ec187975a..74fd6fcc36 100644
--- a/osu.Game/Database/ICanAcceptFiles.cs
+++ b/osu.Game/Database/ICanAcceptFiles.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Import the specified files from the given import tasks.
         /// </summary>
+        /// <param name="tasks">The import tasks from which the files should be imported.</param>
         Task Import(params ImportTask[] tasks);
 
         /// <summary>

From 4fba0c8e6a3279216294a5a75fa2f79687d0a0c1 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 19 Dec 2020 10:55:39 +0100
Subject: [PATCH 07021/10326] Remove not used using statement.

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 4ebf7fbe63..e382ff5d48 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -51,7 +51,6 @@ using osu.Game.Screens.Select;
 using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
-using osu.Game.Users;
 using osu.Game.Database;
 
 namespace osu.Game

From 28ca21b432627ffb9d8058475bf969143dd71163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 14:50:09 +0100
Subject: [PATCH 07022/10326] Seal banned method & throw better exception

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index aa668cc4c8..d2d5594edd 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -40,9 +40,9 @@ namespace osu.Game.Screens.Play.HUD
             return drawable;
         }
 
-        public override void Add(GameplayLeaderboardScore drawable)
+        public sealed override void Add(GameplayLeaderboardScore drawable)
         {
-            throw new InvalidOperationException($"Use {nameof(AddPlayer)} instead.");
+            throw new NotSupportedException($"Use {nameof(AddPlayer)} instead.");
         }
 
         private void sort()

From 22a2c3efdf2f15944e7714da36ea11962345055d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 14:55:58 +0100
Subject: [PATCH 07023/10326] Add back xmldoc of AddPlayer

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index d2d5594edd..cab1cbd3f1 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -24,6 +24,14 @@ namespace osu.Game.Screens.Play.HUD
             LayoutEasing = Easing.OutQuint;
         }
 
+        /// <summary>
+        /// Adds a player to the leaderboard.
+        /// </summary>
+        /// <param name="user">The player.</param>
+        /// <param name="isTracked">
+        /// Whether the player should be tracked on the leaderboard.
+        /// Set to <c>true</c> for the local player or a player whose replay is currently being played.
+        /// </param>
         public ILeaderboardScore AddPlayer(User user, bool isTracked)
         {
             var drawable = new GameplayLeaderboardScore(user, isTracked)

From d392e0f27e2444dfa8a21758a835ddbaef1842e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 15:02:56 +0100
Subject: [PATCH 07024/10326] Extract shared rank-formatting helper

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs      | 4 ++--
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 3 +--
 osu.Game/Utils/FormatUtils.cs                         | 8 ++++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index dcd0cb435a..d8207aa8f4 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -24,8 +24,8 @@ using osu.Game.Scoring;
 using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
-using Humanizer;
 using osu.Game.Online.API;
+using osu.Game.Utils;
 
 namespace osu.Game.Online.Leaderboards
 {
@@ -358,7 +358,7 @@ namespace osu.Game.Online.Leaderboards
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Font = OsuFont.GetFont(size: 20, italics: true),
-                    Text = rank == null ? "-" : rank.Value.ToMetric(decimals: rank < 100000 ? 1 : 0),
+                    Text = rank == null ? "-" : rank.Value.FormatRank()
                 };
             }
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index af3cb640bb..9684ae016c 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.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 Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -49,7 +48,7 @@ namespace osu.Game.Screens.Play.HUD
                 scorePosition = value;
 
                 if (scorePosition.HasValue)
-                    positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}";
+                    positionText.Text = $"#{scorePosition.Value.FormatRank()}";
 
                 positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
                 updateColour();
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index f2ab99f4b7..2578d8d835 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.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 Humanizer;
+
 namespace osu.Game.Utils
 {
     public static class FormatUtils
@@ -18,5 +20,11 @@ namespace osu.Game.Utils
         /// <param name="accuracy">The accuracy to be formatted</param>
         /// <returns>formatted accuracy in percentage</returns>
         public static string FormatAccuracy(this decimal accuracy) => $"{accuracy:0.00}%";
+
+        /// <summary>
+        /// Formats the supplied rank/leaderboard position in a consistent, simplified way.
+        /// </summary>
+        /// <param name="rank">The rank/position to be formatted.</param>
+        public static string FormatRank(this int rank) => rank.ToMetric(decimals: rank < 100_000 ? 1 : 0);
     }
 }

From e2cc401c124b631c8ade6bde8120e71c44c3e2ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 15:05:59 +0100
Subject: [PATCH 07025/10326] Move BDL above LoadComplete()

---
 .../Play/HUD/GameplayLeaderboardScore.cs      | 106 +++++++++---------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 9684ae016c..d510ea5f8b 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -75,59 +75,6 @@ namespace osu.Game.Screens.Play.HUD
             Size = new Vector2(EXTENDED_WIDTH, PANEL_HEIGHT);
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            updateColour();
-            FinishTransforms(true);
-        }
-
-        private const double transition_duration = 500;
-
-        private void updateColour()
-        {
-            if (scorePosition == 1)
-            {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
-                panelColour = Color4Extensions.FromHex("7fcc33");
-                textColour = Color4.White;
-            }
-            else if (trackedPlayer)
-            {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
-                panelColour = Color4Extensions.FromHex("ffd966");
-                textColour = Color4Extensions.FromHex("2e576b");
-            }
-            else
-            {
-                mainFillContainer.ResizeWidthTo(regular_width, transition_duration, Easing.OutElastic);
-                panelColour = Color4Extensions.FromHex("3399cc");
-                textColour = Color4.White;
-            }
-        }
-
-        private Color4 panelColour
-        {
-            set
-            {
-                mainFillContainer.FadeColour(value, transition_duration, Easing.OutQuint);
-                centralFill.FadeColour(value, transition_duration, Easing.OutQuint);
-            }
-        }
-
-        private Color4 textColour
-        {
-            set
-            {
-                scoreText.FadeColour(value, 200, Easing.OutQuint);
-                accuracyText.FadeColour(value, 200, Easing.OutQuint);
-                comboText.FadeColour(value, 200, Easing.OutQuint);
-                usernameText.FadeColour(value, 200, Easing.OutQuint);
-                positionText.FadeColour(value, 200, Easing.OutQuint);
-            }
-        }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -284,5 +231,58 @@ namespace osu.Game.Screens.Play.HUD
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            updateColour();
+            FinishTransforms(true);
+        }
+
+        private const double transition_duration = 500;
+
+        private void updateColour()
+        {
+            if (scorePosition == 1)
+            {
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
+                panelColour = Color4Extensions.FromHex("7fcc33");
+                textColour = Color4.White;
+            }
+            else if (trackedPlayer)
+            {
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
+                panelColour = Color4Extensions.FromHex("ffd966");
+                textColour = Color4Extensions.FromHex("2e576b");
+            }
+            else
+            {
+                mainFillContainer.ResizeWidthTo(regular_width, transition_duration, Easing.OutElastic);
+                panelColour = Color4Extensions.FromHex("3399cc");
+                textColour = Color4.White;
+            }
+        }
+
+        private Color4 panelColour
+        {
+            set
+            {
+                mainFillContainer.FadeColour(value, transition_duration, Easing.OutQuint);
+                centralFill.FadeColour(value, transition_duration, Easing.OutQuint);
+            }
+        }
+
+        private Color4 textColour
+        {
+            set
+            {
+                scoreText.FadeColour(value, 200, Easing.OutQuint);
+                accuracyText.FadeColour(value, 200, Easing.OutQuint);
+                comboText.FadeColour(value, 200, Easing.OutQuint);
+                usernameText.FadeColour(value, 200, Easing.OutQuint);
+                positionText.FadeColour(value, 200, Easing.OutQuint);
+            }
+        }
     }
 }

From 315a957a0ca3ad242671e49ec73a27e05e1432b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 15:17:31 +0100
Subject: [PATCH 07026/10326] Extract constant for text transition duration

---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index d510ea5f8b..cff3a1fc66 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -273,15 +273,17 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        private const double text_transition_duration = 200;
+
         private Color4 textColour
         {
             set
             {
-                scoreText.FadeColour(value, 200, Easing.OutQuint);
-                accuracyText.FadeColour(value, 200, Easing.OutQuint);
-                comboText.FadeColour(value, 200, Easing.OutQuint);
-                usernameText.FadeColour(value, 200, Easing.OutQuint);
-                positionText.FadeColour(value, 200, Easing.OutQuint);
+                scoreText.FadeColour(value, text_transition_duration, Easing.OutQuint);
+                accuracyText.FadeColour(value, text_transition_duration, Easing.OutQuint);
+                comboText.FadeColour(value, text_transition_duration, Easing.OutQuint);
+                usernameText.FadeColour(value, text_transition_duration, Easing.OutQuint);
+                positionText.FadeColour(value, text_transition_duration, Easing.OutQuint);
             }
         }
     }

From 06a17a9d8cb9c94dd886e2b1e80992436521f42d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 15:18:05 +0100
Subject: [PATCH 07027/10326] Rename other constant to be distinguishable

---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index cff3a1fc66..b93db09f71 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -240,25 +240,25 @@ namespace osu.Game.Screens.Play.HUD
             FinishTransforms(true);
         }
 
-        private const double transition_duration = 500;
+        private const double panel_transition_duration = 500;
 
         private void updateColour()
         {
             if (scorePosition == 1)
             {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, panel_transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("7fcc33");
                 textColour = Color4.White;
             }
             else if (trackedPlayer)
             {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, panel_transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("ffd966");
                 textColour = Color4Extensions.FromHex("2e576b");
             }
             else
             {
-                mainFillContainer.ResizeWidthTo(regular_width, transition_duration, Easing.OutElastic);
+                mainFillContainer.ResizeWidthTo(regular_width, panel_transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("3399cc");
                 textColour = Color4.White;
             }
@@ -268,8 +268,8 @@ namespace osu.Game.Screens.Play.HUD
         {
             set
             {
-                mainFillContainer.FadeColour(value, transition_duration, Easing.OutQuint);
-                centralFill.FadeColour(value, transition_duration, Easing.OutQuint);
+                mainFillContainer.FadeColour(value, panel_transition_duration, Easing.OutQuint);
+                centralFill.FadeColour(value, panel_transition_duration, Easing.OutQuint);
             }
         }
 

From c738a57b399b5f701fa314fb2dc01de43659c092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 18:48:17 +0100
Subject: [PATCH 07028/10326] Fix username overflow in new leaderboard design

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index b93db09f71..58281debf1 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Screens.Play.HUD
                                             usernameText = new OsuSpriteText
                                             {
                                                 RelativeSizeAxes = Axes.X,
-                                                Width = 0.8f,
+                                                Width = 0.6f,
                                                 Anchor = Anchor.CentreLeft,
                                                 Origin = Anchor.CentreLeft,
                                                 Colour = Color4.White,

From afa6a869545692f4abed538f7d5e20e70a37a3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 19:00:05 +0100
Subject: [PATCH 07029/10326] Remove unnecessary lookup incrementing

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index eaa881b02c..1666c9cde4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Online
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
                 => Task.FromResult(new User
                 {
-                    Id = lookup++,
+                    Id = lookup,
                     Username = usernames[lookup % usernames.Length],
                 });
         }

From ee33c0be93c16b61762edc6d85165fb5ec05fd93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 19:08:29 +0100
Subject: [PATCH 07030/10326] Extract combo & accuracy ratio calculation
 helpers

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index f5fb918ba3..10d0cc2865 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -201,8 +201,8 @@ namespace osu.Game.Rulesets.Scoring
         private double getScore(ScoringMode mode)
         {
             return GetScore(mode, maxAchievableCombo,
-                maxBaseScore > 0 ? baseScore / maxBaseScore : 0,
-                maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1,
+                calculateAccuracyRatio(baseScore),
+                calculateComboRatio(HighestCombo.Value),
                 scoreResultCounts);
         }
 
@@ -252,14 +252,17 @@ namespace osu.Game.Rulesets.Scoring
                 computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
             }
 
-            double accuracy = maxBaseScore > 0 ? computedBaseScore / maxBaseScore : 0;
-            double comboRatio = maxAchievableCombo > 0 ? (double)maxCombo / maxAchievableCombo : 1;
+            double accuracy = calculateAccuracyRatio(computedBaseScore);
+            double comboRatio = calculateComboRatio(maxCombo);
 
             double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts);
 
             return (score, accuracy);
         }
 
+        private double calculateAccuracyRatio(double baseScore) => maxBaseScore > 0 ? baseScore / maxBaseScore : 0;
+        private double calculateComboRatio(int maxCombo) => maxAchievableCombo > 0 ? (double)maxCombo / maxAchievableCombo : 1;
+
         private double getBonusScore(Dictionary<HitResult, int> statistics)
             => statistics.GetOrDefault(HitResult.SmallBonus) * Judgement.SMALL_BONUS_SCORE
                + statistics.GetOrDefault(HitResult.LargeBonus) * Judgement.LARGE_BONUS_SCORE;

From 631a0cea41e7e21b1ab592bc80fa748c733a22d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 21:25:04 +0100
Subject: [PATCH 07031/10326] Fix intended random factor not being random in
 test

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index 0c8d8ca165..0ca1d9008b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 foreach (var userId in PlayingUsers)
                 {
-                    if (RNG.Next(0, 1) == 1)
+                    if (RNG.NextBool())
                         continue;
 
                     if (!lastHeaders.TryGetValue(userId, out var header))

From f827b6c030b3cbde588effdd908b3138eff827fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 21:26:40 +0100
Subject: [PATCH 07032/10326] Use terser dictionary initialiser syntax

---
 .../TestSceneMultiplayerGameplayLeaderboard.cs         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index 0ca1d9008b..e42ddeb35e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -116,12 +116,12 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         lastHeaders[userId] = header = new FrameHeader(new ScoreInfo
                         {
-                            Statistics = new Dictionary<HitResult, int>(new[]
+                            Statistics = new Dictionary<HitResult, int>
                             {
-                                new KeyValuePair<HitResult, int>(HitResult.Miss, 0),
-                                new KeyValuePair<HitResult, int>(HitResult.Meh, 0),
-                                new KeyValuePair<HitResult, int>(HitResult.Great, 0)
-                            })
+                                [HitResult.Miss] = 0,
+                                [HitResult.Meh] = 0,
+                                [HitResult.Great] = 0
+                            }
                         });
                     }
 

From 4e5064c4f611de5704982e8dbbe670a247814f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 21:31:17 +0100
Subject: [PATCH 07033/10326] Start accuracy at 1

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index c96f496cd0..12321de442 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.Play.HUD
 
             public IBindableNumber<double> Accuracy => accuracy;
 
-            private readonly BindableDouble accuracy = new BindableDouble();
+            private readonly BindableDouble accuracy = new BindableDouble(1);
 
             public IBindableNumber<int> CurrentCombo => currentCombo;
 

From b87f89986a5b2bb5fd73a43ba04459df84f92417 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 19 Dec 2020 16:57:25 -0800
Subject: [PATCH 07034/10326] Fix selected item not being highlighted on some
 setting dropdowns

---
 .../Settings/Sections/Graphics/LayoutSettings.cs      |  3 +--
 .../Sections/UserInterface/MainMenuSettings.cs        | 11 +++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 62dc1dc806..3df2a78552 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -59,11 +59,10 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             Children = new Drawable[]
             {
-                windowModeDropdown = new SettingsDropdown<WindowMode>
+                windowModeDropdown = new SettingsEnumDropdown<WindowMode>
                 {
                     LabelText = "Screen mode",
                     Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
-                    ItemSource = windowModes,
                 },
                 resolutionSettingsContainer = new Container
                 {
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 598b666642..95e2e9da30 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
@@ -28,23 +26,20 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
                     LabelText = "osu! music theme",
                     Current = config.GetBindable<bool>(OsuSetting.MenuMusic)
                 },
-                new SettingsDropdown<IntroSequence>
+                new SettingsEnumDropdown<IntroSequence>
                 {
                     LabelText = "Intro sequence",
                     Current = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence),
-                    Items = Enum.GetValues(typeof(IntroSequence)).Cast<IntroSequence>()
                 },
-                new SettingsDropdown<BackgroundSource>
+                new SettingsEnumDropdown<BackgroundSource>
                 {
                     LabelText = "Background source",
                     Current = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
-                    Items = Enum.GetValues(typeof(BackgroundSource)).Cast<BackgroundSource>()
                 },
-                new SettingsDropdown<SeasonalBackgroundMode>
+                new SettingsEnumDropdown<SeasonalBackgroundMode>
                 {
                     LabelText = "Seasonal backgrounds",
                     Current = config.GetBindable<SeasonalBackgroundMode>(OsuSetting.SeasonalBackgroundMode),
-                    Items = Enum.GetValues(typeof(SeasonalBackgroundMode)).Cast<SeasonalBackgroundMode>()
                 }
             };
         }

From 5b8e35c98cec02b359eb2cf598713638538d349a Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 19 Dec 2020 16:57:42 -0800
Subject: [PATCH 07035/10326] Make settings dropdown abstract

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

diff --git a/osu.Game/Overlays/Settings/SettingsDropdown.cs b/osu.Game/Overlays/Settings/SettingsDropdown.cs
index 1175ddaab8..e1c6333aa0 100644
--- a/osu.Game/Overlays/Settings/SettingsDropdown.cs
+++ b/osu.Game/Overlays/Settings/SettingsDropdown.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings
 {
-    public class SettingsDropdown<T> : SettingsItem<T>
+    public abstract class SettingsDropdown<T> : SettingsItem<T>
     {
         protected new OsuDropdown<T> Control => (OsuDropdown<T>)base.Control;
 

From d20eb368f5f86a22bf91a9f8f9838ef862effbc5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 17:36:23 +0900
Subject: [PATCH 07036/10326] Make return into IEnumerable

---
 osu.Game/Screens/Multi/Components/RoomManager.cs         | 2 +-
 osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 46941dc58e..ffc5e94106 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -183,6 +183,6 @@ namespace osu.Game.Screens.Multi.Components
                 existing.CopyFrom(room);
         }
 
-        protected abstract RoomPollingComponent[] CreatePollingComponents();
+        protected abstract IEnumerable<RoomPollingComponent> CreatePollingComponents();
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs
index ba96721afc..d21f844e04 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.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.Bindables;
 using osu.Game.Screens.Multi.Components;
 
@@ -11,7 +12,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
         public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
 
-        protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
+        protected override IEnumerable<RoomPollingComponent> CreatePollingComponents() => new RoomPollingComponent[]
         {
             new ListingPollingComponent { TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls } },
             new SelectionPollingComponent { TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls } }

From 7c7f15089a6ee06b3e244fc03db8e7114e165cca Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 17:42:23 +0900
Subject: [PATCH 07037/10326] Make CreateRoomManager return the drawable
 version

---
 osu.Game/Screens/Multi/Multiplayer.cs                    | 8 ++++----
 osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 5f61c5e635..837ccdf2e9 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Multi
         private readonly IBindable<bool> isIdle = new BindableBool();
 
         [Cached(Type = typeof(IRoomManager))]
-        protected IRoomManager RoomManager { get; private set; }
+        protected RoomManager RoomManager { get; private set; }
 
         [Cached]
         private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Multi
             InternalChild = waves = new MultiplayerWaveContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Children = new[]
+                Children = new Drawable[]
                 {
                     new Box
                     {
@@ -136,7 +136,7 @@ namespace osu.Game.Screens.Multi
                         Origin = Anchor.TopRight,
                         Action = () => CreateRoom()
                     },
-                    (Drawable)(RoomManager = CreateRoomManager())
+                    RoomManager = CreateRoomManager()
                 }
             };
 
@@ -353,7 +353,7 @@ namespace osu.Game.Screens.Multi
             }
         }
 
-        protected abstract IRoomManager CreateRoomManager();
+        protected abstract RoomManager CreateRoomManager();
 
         private class MultiplayerWaveContainer : WaveContainer
         {
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index 1ff9c670a8..d2d6a35a2e 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Match;
 
@@ -43,6 +44,6 @@ namespace osu.Game.Screens.Multi.Timeshift
             Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
         }
 
-        protected override IRoomManager CreateRoomManager() => new TimeshiftRoomManager();
+        protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
     }
 }

From d74485704ae9c4a424bfb5fc5780b03e14f3f8be Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 17:46:45 +0900
Subject: [PATCH 07038/10326] Reset intial rooms received on filter change

---
 osu.Game/Screens/Multi/Components/ListingPollingComponent.cs | 2 ++
 osu.Game/Screens/Multi/Components/RoomPollingComponent.cs    | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
index e22f09779e..ebb3403950 100644
--- a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Screens.Multi.Components
         {
             currentFilter.BindValueChanged(_ =>
             {
+                InitialRoomsReceived.Value = false;
+
                 if (IsLoaded)
                     PollImmediately();
             });
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
index 5430d54644..a81a9540c3 100644
--- a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
@@ -21,8 +21,7 @@ namespace osu.Game.Screens.Multi.Components
         /// </summary>
         public new readonly Bindable<double> TimeBetweenPolls = new Bindable<double>();
 
-        public IBindable<bool> InitialRoomsReceived => initialRoomsReceived;
-        private readonly Bindable<bool> initialRoomsReceived = new Bindable<bool>();
+        public readonly Bindable<bool> InitialRoomsReceived = new Bindable<bool>();
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
@@ -34,7 +33,7 @@ namespace osu.Game.Screens.Multi.Components
 
         protected void NotifyRoomsReceived(List<Room> rooms)
         {
-            initialRoomsReceived.Value = true;
+            InitialRoomsReceived.Value = true;
             RoomsReceived?.Invoke(rooms);
         }
     }

From 812a1d2b4f43cfb1eade5f22d9290bbe26d0fb27 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:03:30 +0900
Subject: [PATCH 07039/10326] Fix onSuccess callback potentially being called
 on failure

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 4f73ee3865..1a6e976d15 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             Debug.Assert(room.RoomID.Value != null);
 
             var joinTask = multiplayerClient.JoinRoom(room);
-            joinTask.ContinueWith(_ => onSuccess?.Invoke(room));
+            joinTask.ContinueWith(_ => onSuccess?.Invoke(room), TaskContinuationOptions.OnlyOnRanToCompletion);
             joinTask.ContinueWith(t =>
             {
                 PartRoom();

From fb61cdfd417701b4cacfe1aefd4bb374e344c2e5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:05:43 +0900
Subject: [PATCH 07040/10326] Remove unnecessary first-frame polling + address
 concerns

---
 .../Screens/Multi/Components/RoomManager.cs     | 11 ++++++-----
 .../RealtimeMultiplayer/RealtimeRoomManager.cs  | 17 ++++++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 21bff70b8b..7b419c9efe 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -27,7 +27,8 @@ namespace osu.Game.Screens.Multi.Components
 
         public IBindableList<Room> Rooms => rooms;
 
-        protected Room JoinedRoom { get; private set; }
+        protected IBindable<Room> JoinedRoom => joinedRoom;
+        private readonly Bindable<Room> joinedRoom = new Bindable<Room>();
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
@@ -64,7 +65,7 @@ namespace osu.Game.Screens.Multi.Components
 
             req.Success += result =>
             {
-                JoinedRoom = room;
+                joinedRoom.Value = room;
 
                 update(room, result);
                 addRoom(room);
@@ -93,7 +94,7 @@ namespace osu.Game.Screens.Multi.Components
 
             currentJoinRoomRequest.Success += () =>
             {
-                JoinedRoom = room;
+                joinedRoom.Value = room;
                 onSuccess?.Invoke(room);
             };
 
@@ -114,8 +115,8 @@ namespace osu.Game.Screens.Multi.Components
             if (JoinedRoom == null)
                 return;
 
-            api.Queue(new PartRoomRequest(JoinedRoom));
-            JoinedRoom = null;
+            api.Queue(new PartRoomRequest(joinedRoom.Value));
+            joinedRoom.Value = null;
         }
 
         private readonly HashSet<int> ignoredRooms = new HashSet<int>();
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 1a6e976d15..9e3c921d9e 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             base.LoadComplete();
 
             isConnected.BindTo(multiplayerClient.IsConnected);
-            isConnected.BindValueChanged(_ => Schedule(updatePolling), true);
+            isConnected.BindValueChanged(_ => Schedule(updatePolling));
+            JoinedRoom.BindValueChanged(_ => updatePolling());
 
             updatePolling();
         }
@@ -46,7 +47,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             if (JoinedRoom == null)
                 return;
 
-            var joinedRoom = JoinedRoom;
+            var joinedRoom = JoinedRoom.Value;
 
             base.PartRoom();
             multiplayerClient.LeaveRoom().Wait();
@@ -77,7 +78,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 ClearRooms();
 
             // Don't poll when not connected or when a room has been joined.
-            allowPolling.Value = isConnected.Value && JoinedRoom == null;
+            allowPolling.Value = isConnected.Value && JoinedRoom.Value == null;
         }
 
         protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
@@ -102,8 +103,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 base.LoadComplete();
 
-                AllowPolling.BindValueChanged(_ =>
+                AllowPolling.BindValueChanged(allowPolling =>
                 {
+                    if (!allowPolling.NewValue)
+                        return;
+
                     if (IsLoaded)
                         PollImmediately();
                 });
@@ -120,8 +124,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 base.LoadComplete();
 
-                AllowPolling.BindValueChanged(_ =>
+                AllowPolling.BindValueChanged(allowPolling =>
                 {
+                    if (!allowPolling.NewValue)
+                        return;
+
                     if (IsLoaded)
                         PollImmediately();
                 });

From 724e4b83fe266896bef4c10f9a51840cc36a24ae Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:19:41 +0900
Subject: [PATCH 07041/10326] Fix nullability and remove early check

---
 .../StatefulMultiplayerClient.cs                    | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 60960f4929..fe2f4c88f0 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
@@ -140,20 +141,14 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 RulesetID = Room.Settings.RulesetID
             };
 
-            var newSettings = new MultiplayerRoomSettings
+            ChangeSettings(new MultiplayerRoomSettings
             {
                 Name = name.GetOr(Room.Settings.Name),
                 BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
                 BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
                 RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
-                Mods = item.HasValue ? item.Value!.RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods
-            };
-
-            // Make sure there would be a meaningful change in settings.
-            if (newSettings.Equals(Room.Settings))
-                return;
-
-            ChangeSettings(newSettings);
+                Mods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods
+            });
         }
 
         public abstract Task TransferHost(int userId);

From ba4307a74c9bf82503b2e5dad391e3b28442959a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:24:13 +0900
Subject: [PATCH 07042/10326] Directly return task

---
 .../RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
index bfa8362c7e..de52633c88 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
@@ -106,14 +106,14 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             return Task.CompletedTask;
         }
 
-        public override async Task StartMatch()
+        public override Task StartMatch()
         {
             Debug.Assert(Room != null);
 
             foreach (var user in Room.Users.Where(u => u.State == MultiplayerUserState.Ready))
                 ChangeUserState(user.UserID, MultiplayerUserState.WaitingForLoad);
 
-            await ((IMultiplayerClient)this).LoadRequested();
+            return ((IMultiplayerClient)this).LoadRequested();
         }
     }
 }

From 1e2b425f3f0b787a747896e485a80a066b1a7429 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:24:15 +0900
Subject: [PATCH 07043/10326] Fix incorrect test name + assertion

---
 .../RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
index 598641682b..925a83a863 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         }
 
         [Test]
-        public void TestMultiplayerRoomPartedWhenAPIRoomJoined()
+        public void TestMultiplayerRoomJoinedWhenAPIRoomJoined()
         {
             AddStep("create room manager with a room", () =>
             {
@@ -133,7 +133,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                 });
             });
 
-            AddAssert("multiplayer room parted", () => roomContainer.Client.Room != null);
+            AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
         }
 
         private TestRealtimeRoomManager createRoomManager()

From 8b1f5ff4927fa83700a4b22e213fe8ff0914d8d8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:25:23 +0900
Subject: [PATCH 07044/10326] Only instantiate ruleset once

---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index fe2f4c88f0..77dbc16786 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -354,14 +354,14 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
                 beatmap.MD5Hash = settings.BeatmapChecksum;
 
-                var ruleset = rulesets.GetRuleset(settings.RulesetID);
-                var mods = settings.Mods.Select(m => m.ToMod(ruleset.CreateInstance()));
+                var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
+                var mods = settings.Mods.Select(m => m.ToMod(ruleset));
 
                 PlaylistItem playlistItem = new PlaylistItem
                 {
                     ID = playlistItemId,
                     Beatmap = { Value = beatmap },
-                    Ruleset = { Value = ruleset },
+                    Ruleset = { Value = ruleset.RulesetInfo },
                 };
 
                 playlistItem.RequiredMods.AddRange(mods);

From 508f73d94961b8baae97956a3c328b41277ed434 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:25:54 +0900
Subject: [PATCH 07045/10326] Fix up comment

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 77dbc16786..35c8a3397e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -328,7 +328,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
             if (Room == null)
                 return;
 
-            // Update a few instantaneously properties of the room.
+            // Update a few properties of the room instantaneously.
             Schedule(() =>
             {
                 if (Room == null)

From 0cf078562dada06982d9af80136c02e145d42efa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:30:00 +0900
Subject: [PATCH 07046/10326] Split method up and remove nested scheduling

---
 .../StatefulMultiplayerClient.cs              | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 35c8a3397e..8d3b161804 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -15,6 +15,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Rulesets;
@@ -347,38 +348,36 @@ namespace osu.Game.Online.RealtimeMultiplayer
             });
 
             var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-            req.Success += res =>
-            {
-                var beatmapSet = res.ToBeatmapSet(rulesets);
-
-                var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
-                beatmap.MD5Hash = settings.BeatmapChecksum;
-
-                var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
-                var mods = settings.Mods.Select(m => m.ToMod(ruleset));
-
-                PlaylistItem playlistItem = new PlaylistItem
-                {
-                    ID = playlistItemId,
-                    Beatmap = { Value = beatmap },
-                    Ruleset = { Value = ruleset.RulesetInfo },
-                };
-
-                playlistItem.RequiredMods.AddRange(mods);
-
-                Schedule(() =>
-                {
-                    if (Room == null || !Room.Settings.Equals(settings))
-                        return;
-
-                    Debug.Assert(apiRoom != null);
-
-                    apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
-                    apiRoom.Playlist.Add(playlistItem);
-                });
-            };
+            req.Success += res => updatePlaylist(settings, res);
 
             api.Queue(req);
         }
+
+        private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)
+        {
+            if (Room == null || !Room.Settings.Equals(settings))
+                return;
+
+            Debug.Assert(apiRoom != null);
+
+            var beatmapSet = onlineSet.ToBeatmapSet(rulesets);
+            var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
+            beatmap.MD5Hash = settings.BeatmapChecksum;
+
+            var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
+            var mods = settings.Mods.Select(m => m.ToMod(ruleset));
+
+            PlaylistItem playlistItem = new PlaylistItem
+            {
+                ID = playlistItemId,
+                Beatmap = { Value = beatmap },
+                Ruleset = { Value = ruleset.RulesetInfo },
+            };
+
+            playlistItem.RequiredMods.AddRange(mods);
+
+            apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
+            apiRoom.Playlist.Add(playlistItem);
+        }
     }
 }

From 45107280a00e310402a368a6f9b15050f1bcfd0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:34:54 +0900
Subject: [PATCH 07047/10326] Make TimeBetweenPolls into a bindable

---
 .../Components/TestScenePollingComponent.cs   | 10 +++----
 osu.Game/Online/Chat/ChannelManager.cs        |  2 +-
 osu.Game/Online/PollingComponent.cs           | 30 ++++++++-----------
 .../Multi/Components/RoomPollingComponent.cs  | 11 -------
 4 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/Components/TestScenePollingComponent.cs b/osu.Game.Tests/Visual/Components/TestScenePollingComponent.cs
index fb10015ef4..2236f85b92 100644
--- a/osu.Game.Tests/Visual/Components/TestScenePollingComponent.cs
+++ b/osu.Game.Tests/Visual/Components/TestScenePollingComponent.cs
@@ -61,12 +61,12 @@ namespace osu.Game.Tests.Visual.Components
         {
             createPoller(true);
 
-            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls = TimePerAction * safety_adjust);
+            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls.Value = TimePerAction * safety_adjust);
             checkCount(1);
             checkCount(2);
             checkCount(3);
 
-            AddStep("set poll interval to 5", () => poller.TimeBetweenPolls = TimePerAction * safety_adjust * 5);
+            AddStep("set poll interval to 5", () => poller.TimeBetweenPolls.Value = TimePerAction * safety_adjust * 5);
             checkCount(4);
             checkCount(4);
             checkCount(4);
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.Components
             checkCount(5);
             checkCount(5);
 
-            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls = TimePerAction * safety_adjust);
+            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls.Value = TimePerAction * safety_adjust);
             checkCount(6);
             checkCount(7);
         }
@@ -87,7 +87,7 @@ namespace osu.Game.Tests.Visual.Components
         {
             createPoller(false);
 
-            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls = TimePerAction * safety_adjust * 5);
+            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls.Value = TimePerAction * safety_adjust * 5);
             checkCount(0);
             skip();
             checkCount(0);
@@ -141,7 +141,7 @@ namespace osu.Game.Tests.Visual.Components
 
         public class TestSlowPoller : TestPoller
         {
-            protected override Task Poll() => Task.Delay((int)(TimeBetweenPolls / 2f / Clock.Rate)).ContinueWith(_ => base.Poll());
+            protected override Task Poll() => Task.Delay((int)(TimeBetweenPolls.Value / 2f / Clock.Rate)).ContinueWith(_ => base.Poll());
         }
     }
 }
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 16f46581c5..62ae507419 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Online.Chat
         {
             CurrentChannel.ValueChanged += currentChannelChanged;
 
-            HighPollRate.BindValueChanged(enabled => TimeBetweenPolls = enabled.NewValue ? 1000 : 6000, true);
+            HighPollRate.BindValueChanged(enabled => TimeBetweenPolls.Value = enabled.NewValue ? 1000 : 6000, true);
         }
 
         /// <summary>
diff --git a/osu.Game/Online/PollingComponent.cs b/osu.Game/Online/PollingComponent.cs
index 228f147835..3d19f2ab09 100644
--- a/osu.Game/Online/PollingComponent.cs
+++ b/osu.Game/Online/PollingComponent.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
 
@@ -19,22 +20,11 @@ namespace osu.Game.Online
 
         private bool pollingActive;
 
-        private double timeBetweenPolls;
-
         /// <summary>
         /// The time in milliseconds to wait between polls.
         /// Setting to zero stops all polling.
         /// </summary>
-        public double TimeBetweenPolls
-        {
-            get => timeBetweenPolls;
-            set
-            {
-                timeBetweenPolls = value;
-                scheduledPoll?.Cancel();
-                pollIfNecessary();
-            }
-        }
+        public readonly Bindable<double> TimeBetweenPolls = new Bindable<double>();
 
         /// <summary>
         ///
@@ -42,7 +32,13 @@ namespace osu.Game.Online
         /// <param name="timeBetweenPolls">The initial time in milliseconds to wait between polls. Setting to zero stops all polling.</param>
         protected PollingComponent(double timeBetweenPolls = 0)
         {
-            TimeBetweenPolls = timeBetweenPolls;
+            TimeBetweenPolls.BindValueChanged(_ =>
+            {
+                scheduledPoll?.Cancel();
+                pollIfNecessary();
+            });
+
+            TimeBetweenPolls.Value = timeBetweenPolls;
         }
 
         protected override void LoadComplete()
@@ -60,7 +56,7 @@ namespace osu.Game.Online
             if (pollingActive) return false;
 
             // don't try polling if the time between polls hasn't been set.
-            if (timeBetweenPolls == 0) return false;
+            if (TimeBetweenPolls.Value == 0) return false;
 
             if (!lastTimePolled.HasValue)
             {
@@ -68,7 +64,7 @@ namespace osu.Game.Online
                 return true;
             }
 
-            if (Time.Current - lastTimePolled.Value > timeBetweenPolls)
+            if (Time.Current - lastTimePolled.Value > TimeBetweenPolls.Value)
             {
                 doPoll();
                 return true;
@@ -99,7 +95,7 @@ namespace osu.Game.Online
         /// </summary>
         public void PollImmediately()
         {
-            lastTimePolled = Time.Current - timeBetweenPolls;
+            lastTimePolled = Time.Current - TimeBetweenPolls.Value;
             scheduleNextPoll();
         }
 
@@ -121,7 +117,7 @@ namespace osu.Game.Online
 
             double lastPollDuration = lastTimePolled.HasValue ? Time.Current - lastTimePolled.Value : 0;
 
-            scheduledPoll = Scheduler.AddDelayed(doPoll, Math.Max(0, timeBetweenPolls - lastPollDuration));
+            scheduledPoll = Scheduler.AddDelayed(doPoll, Math.Max(0, TimeBetweenPolls.Value - lastPollDuration));
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
index a81a9540c3..ad0720db7b 100644
--- a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
@@ -15,22 +15,11 @@ namespace osu.Game.Screens.Multi.Components
     {
         public Action<List<Room>> RoomsReceived;
 
-        /// <summary>
-        /// The time in milliseconds to wait between polls.
-        /// Setting to zero stops all polling.
-        /// </summary>
-        public new readonly Bindable<double> TimeBetweenPolls = new Bindable<double>();
-
         public readonly Bindable<bool> InitialRoomsReceived = new Bindable<bool>();
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        protected RoomPollingComponent()
-        {
-            TimeBetweenPolls.BindValueChanged(time => base.TimeBetweenPolls = time.NewValue);
-        }
-
         protected void NotifyRoomsReceived(List<Room> rooms)
         {
             InitialRoomsReceived.Value = true;

From ce2560b545deea1076c5f6cfd781e9089a360061 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:36:31 +0900
Subject: [PATCH 07048/10326] Extract value into const

---
 .../Participants/ParticipantPanel.cs                   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
index 306a54bfdc..002849a275 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
@@ -142,15 +142,17 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
             if (Room == null)
                 return;
 
+            const double fade_time = 50;
+
             if (User.State == MultiplayerUserState.Ready)
-                readyMark.FadeIn(50);
+                readyMark.FadeIn(fade_time);
             else
-                readyMark.FadeOut(50);
+                readyMark.FadeOut(fade_time);
 
             if (Room.Host?.Equals(User) == true)
-                crown.FadeIn(50);
+                crown.FadeIn(fade_time);
             else
-                crown.FadeOut(50);
+                crown.FadeOut(fade_time);
         }
 
         public MenuItem[] ContextMenuItems

From 19db35501e156ceaaf45f65bb4360dc4d859a68f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:44:36 +0900
Subject: [PATCH 07049/10326] Fix incorrect end date usage in timeshift ready
 button

---
 osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
index b6698b195c..ba639c29f4 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Multi.Timeshift
     public class TimeshiftReadyButton : ReadyButton
     {
         [Resolved(typeof(Room), nameof(Room.EndDate))]
-        private Bindable<DateTimeOffset?> endDate { get; set; }
+        private Bindable<DateTimeOffset> endDate { get; set; }
 
         public TimeshiftReadyButton()
         {
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         {
             base.Update();
 
-            Enabled.Value = endDate.Value == null || DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
+            Enabled.Value = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
         }
     }
 }

From a07a36793a5d90781178b0f94743580359c17973 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:44:41 +0900
Subject: [PATCH 07050/10326] Fix test not working

---
 .../RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
index 889c0c0be3..1f863028af 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
@@ -97,6 +97,12 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         [Test]
         public void TestBecomeHostWhileReady()
         {
+            AddStep("add host", () =>
+            {
+                Client.AddUser(new User { Id = 2, Username = "Another user" });
+                Client.TransferHost(2);
+            });
+
             addClickButtonStep();
             AddStep("make user host", () => Client.TransferHost(Client.Room?.Users[0].UserID ?? 0));
 

From b002c466660535e32e036d322e97e68335c6c497 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:49:39 +0900
Subject: [PATCH 07051/10326] Add number of ready users to button

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
index d52df258ad..ea8fb04994 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
@@ -69,8 +69,9 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 case MultiplayerUserState.Ready:
                     if (Room?.Host?.Equals(localUser) == true)
                     {
-                        button.Text = "Let's go!";
-                        updateButtonColour(Room.Users.All(u => u.State == MultiplayerUserState.Ready));
+                        int countReady = Room.Users.Count(u => u.State == MultiplayerUserState.Ready);
+                        button.Text = $"Start match ({countReady} / {Room.Users.Count} ready)";
+                        updateButtonColour(true);
                     }
                     else
                     {

From f1aefcdf86a9ef784644614915bd11c1476c9816 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 19 Dec 2020 22:48:39 +0100
Subject: [PATCH 07052/10326] Handle multiple extensions in the import files.

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 521778a9cd..ca87772209 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -397,13 +397,18 @@ namespace osu.Game
 
         public virtual async Task Import(params ImportTask[] tasks)
         {
-            var extension = Path.GetExtension(tasks.First().Path).ToLowerInvariant();
+            var importTasks = new List<Task>();
 
-            foreach (var importer in fileImporters)
+            foreach (var extension in tasks.Select(t => Path.GetExtension(t.Path)).Distinct())
             {
-                if (importer.HandledExtensions.Contains(extension))
-                    await importer.Import(tasks);
+                var importList = tasks.Where(t => t.Path.EndsWith(extension, StringComparison.OrdinalIgnoreCase));
+                var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(extension));
+
+                if (importer != null)
+                    importTasks.Add(importer.Import(importList.ToArray()));
             }
+
+            await Task.WhenAll(importTasks);
         }
 
         public IEnumerable<string> HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions);

From f876a329b1b4e8b2cbef4effd6ef242e1be1c233 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 22:51:33 +0900
Subject: [PATCH 07053/10326] Fire-and-forget leave-room request

---
 .../StatefulMultiplayerClient.cs              | 29 +++++++++++++++++--
 .../RealtimeRoomManager.cs                    |  2 +-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 60960f4929..b846d6732f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -77,7 +77,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <param name="room">The API <see cref="Room"/>.</param>
         public async Task JoinRoom(Room room)
         {
-            Debug.Assert(Room == null);
+            if (Room != null)
+                throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
+
             Debug.Assert(room.RoomID.Value != null);
 
             apiRoom = room;
@@ -166,6 +168,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
@@ -198,6 +203,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         async Task IMultiplayerClient.UserJoined(MultiplayerRoomUser user)
         {
+            if (Room == null)
+                return;
+
             await PopulateUser(user);
 
             Schedule(() =>
@@ -213,6 +221,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.UserLeft(MultiplayerRoomUser user)
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
@@ -229,6 +240,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.HostChanged(int userId)
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
@@ -255,6 +269,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.UserStateChanged(int userId, MultiplayerUserState state)
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
@@ -273,6 +290,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.LoadRequested()
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
@@ -286,7 +306,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.MatchStarted()
         {
-            Debug.Assert(Room != null);
+            if (Room == null)
+                return Task.CompletedTask;
+
             var players = Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID).ToList();
 
             Schedule(() =>
@@ -304,6 +326,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.ResultsReady()
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 4f73ee3865..d2a03da714 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             var joinedRoom = JoinedRoom;
 
             base.PartRoom();
-            multiplayerClient.LeaveRoom().Wait();
+            multiplayerClient.LeaveRoom();
 
             // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
             RemoveRoom(joinedRoom);

From 9d13a5b06a9f90e9cd9a8e489594f03b3d3ec4f0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 22:53:07 +0900
Subject: [PATCH 07054/10326] Fix potential cross-thread list access

---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index b846d6732f..bf58849e35 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -309,14 +309,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            var players = Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID).ToList();
-
             Schedule(() =>
             {
                 if (Room == null)
                     return;
 
-                PlayingUsers.AddRange(players);
+                PlayingUsers.AddRange(Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID));
 
                 MatchStarted?.Invoke();
             });

From c33e693b8e3331af505931950940dc7684b04f41 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:05:17 +0900
Subject: [PATCH 07055/10326] Refactor InitialRoomsReceived to avoid extra
 bindables

---
 .../Visual/Multiplayer/TestRoomManager.cs        |  2 +-
 .../Multiplayer/TestSceneMatchSettingsOverlay.cs |  2 +-
 .../Multiplayer/TestSceneMatchSubScreen.cs       |  2 +-
 .../Multi/Components/ListingPollingComponent.cs  |  3 +--
 osu.Game/Screens/Multi/Components/RoomManager.cs | 12 ++++++++++--
 .../Multi/Components/RoomPollingComponent.cs     | 16 ++++++++--------
 osu.Game/Screens/Multi/IRoomManager.cs           |  2 +-
 osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs |  2 +-
 8 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
index 67a53307fc..9dd4aea4bd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public readonly BindableList<Room> Rooms = new BindableList<Room>();
 
-        public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
+        public IBindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
 
         IBindableList<Room> IRoomManager.Rooms => Rooms;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index cbe8cc6137..234374ee2b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 remove { }
             }
 
-            public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
+            public IBindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
 
             public IBindableList<Room> Rooms => null;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index 65e9893851..bceb6efac1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 remove => throw new NotImplementedException();
             }
 
-            public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
+            public IBindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
 
             public IBindableList<Room> Rooms { get; } = new BindableList<Room>();
 
diff --git a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
index ebb3403950..dff6c50bf2 100644
--- a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
@@ -25,8 +25,7 @@ namespace osu.Game.Screens.Multi.Components
         {
             currentFilter.BindValueChanged(_ =>
             {
-                InitialRoomsReceived.Value = false;
-
+                NotifyRoomsReceived(null);
                 if (IsLoaded)
                     PollImmediately();
             });
diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index ffc5e94106..382ce52723 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -23,7 +23,8 @@ namespace osu.Game.Screens.Multi.Components
 
         private readonly BindableList<Room> rooms = new BindableList<Room>();
 
-        public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>();
+        public IBindable<bool> InitialRoomsReceived => initialRoomsReceived;
+        private readonly Bindable<bool> initialRoomsReceived = new Bindable<bool>();
 
         public IBindableList<Room> Rooms => rooms;
 
@@ -44,7 +45,6 @@ namespace osu.Game.Screens.Multi.Components
 
             InternalChildren = CreatePollingComponents().Select(p =>
             {
-                p.InitialRoomsReceived.BindTo(InitialRoomsReceived);
                 p.RoomsReceived = onRoomsReceived;
                 return p;
             }).ToList();
@@ -122,6 +122,13 @@ namespace osu.Game.Screens.Multi.Components
 
         private void onRoomsReceived(List<Room> received)
         {
+            if (received == null)
+            {
+                rooms.Clear();
+                initialRoomsReceived.Value = false;
+                return;
+            }
+
             // Remove past matches
             foreach (var r in rooms.ToList())
             {
@@ -155,6 +162,7 @@ namespace osu.Game.Screens.Multi.Components
             }
 
             RoomsUpdated?.Invoke();
+            initialRoomsReceived.Value = true;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
index ad0720db7b..fbaf9dd930 100644
--- a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
@@ -13,17 +12,18 @@ namespace osu.Game.Screens.Multi.Components
 {
     public abstract class RoomPollingComponent : PollingComponent
     {
+        /// <summary>
+        /// Invoked when any <see cref="Room"/>s have been received from the API.
+        /// <para>
+        /// Any <see cref="Room"/>s present locally but not returned by this event are to be removed from display.
+        /// If null, the display of local rooms is reset to an initial state.
+        /// </para>
+        /// </summary>
         public Action<List<Room>> RoomsReceived;
 
-        public readonly Bindable<bool> InitialRoomsReceived = new Bindable<bool>();
-
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        protected void NotifyRoomsReceived(List<Room> rooms)
-        {
-            InitialRoomsReceived.Value = true;
-            RoomsReceived?.Invoke(rooms);
-        }
+        protected void NotifyRoomsReceived(List<Room> rooms) => RoomsReceived?.Invoke(rooms);
     }
 }
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs
index 3d18edcd71..630e3af91c 100644
--- a/osu.Game/Screens/Multi/IRoomManager.cs
+++ b/osu.Game/Screens/Multi/IRoomManager.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Multi
         /// <summary>
         /// Whether an initial listing of rooms has been received.
         /// </summary>
-        Bindable<bool> InitialRoomsReceived { get; }
+        IBindable<bool> InitialRoomsReceived { get; }
 
         /// <summary>
         /// All the active <see cref="Room"/>s.
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index a26a64d86d..165a2b201c 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
         protected override UserActivity InitialActivity => new UserActivity.SearchingForLobby();
 
-        private readonly Bindable<bool> initialRoomsReceived = new Bindable<bool>();
+        private readonly IBindable<bool> initialRoomsReceived = new Bindable<bool>();
 
         private Container content;
         private LoadingLayer loadingLayer;

From 594db76cf3191ae55861633c1efa187794a018c5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:10:45 +0900
Subject: [PATCH 07056/10326] Fix compilation errors

---
 osu.Game/Screens/Multi/Components/RoomManager.cs             | 5 ++---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 0bcf3a90c3..276a5a6148 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -125,8 +125,7 @@ namespace osu.Game.Screens.Multi.Components
         {
             if (received == null)
             {
-                rooms.Clear();
-                initialRoomsReceived.Value = false;
+                ClearRooms();
                 return;
             }
 
@@ -171,7 +170,7 @@ namespace osu.Game.Screens.Multi.Components
         protected void ClearRooms()
         {
             rooms.Clear();
-            InitialRoomsReceived.Value = false;
+            initialRoomsReceived.Value = false;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 9e3c921d9e..a50628a5fa 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.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.Diagnostics;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
@@ -81,7 +82,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             allowPolling.Value = isConnected.Value && JoinedRoom.Value == null;
         }
 
-        protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
+        protected override IEnumerable<RoomPollingComponent> CreatePollingComponents() => new RoomPollingComponent[]
         {
             listingPollingComponent = new RealtimeListingPollingComponent
             {

From 1d7d8bd6fccba84c32f004caddaf3fb0a3bdfe33 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:26:31 +0900
Subject: [PATCH 07057/10326] Hook up a realtime multiplayer client

---
 .../RealtimeMultiplayerClient.cs              | 171 ++++++++++++++++++
 1 file changed, 171 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
new file mode 100644
index 0000000000..6f18e1c922
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -0,0 +1,171 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable enable
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Client;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Logging;
+using osu.Game.Online.API;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class RealtimeMultiplayerClient : StatefulMultiplayerClient
+    {
+        private const string endpoint = "https://spectator.ppy.sh/multiplayer";
+
+        public override IBindable<bool> IsConnected => isConnected;
+
+        private readonly Bindable<bool> isConnected = new Bindable<bool>();
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        private HubConnection? connection;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(apiStateChanged, true);
+        }
+
+        private void apiStateChanged(ValueChangedEvent<APIState> state)
+        {
+            switch (state.NewValue)
+            {
+                case APIState.Failing:
+                case APIState.Offline:
+                    connection?.StopAsync();
+                    connection = null;
+                    break;
+
+                case APIState.Online:
+                    Task.Run(Connect);
+                    break;
+            }
+        }
+
+        protected virtual async Task Connect()
+        {
+            if (connection != null)
+                return;
+
+            connection = new HubConnectionBuilder()
+                         .WithUrl(endpoint, options =>
+                         {
+                             options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
+                         })
+                         .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
+                         .Build();
+
+            // this is kind of SILLY
+            // https://github.com/dotnet/aspnetcore/issues/15198
+            connection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
+            connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
+            connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
+            connection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
+            connection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
+            connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
+            connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
+            connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
+            connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+
+            connection.Closed += async ex =>
+            {
+                isConnected.Value = false;
+
+                if (ex != null)
+                {
+                    Logger.Log($"Multiplayer client lost connection: {ex}", LoggingTarget.Network);
+                    await tryUntilConnected();
+                }
+            };
+
+            await tryUntilConnected();
+
+            async Task tryUntilConnected()
+            {
+                Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);
+
+                while (api.State.Value == APIState.Online)
+                {
+                    try
+                    {
+                        // reconnect on any failure
+                        await connection.StartAsync();
+                        Logger.Log("Multiplayer client connected!", LoggingTarget.Network);
+
+                        // Success.
+                        isConnected.Value = true;
+                        break;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Log($"Multiplayer client connection error: {e}", LoggingTarget.Network);
+                        await Task.Delay(5000);
+                    }
+                }
+            }
+        }
+
+        protected override Task<MultiplayerRoom> JoinRoom(long roomId)
+        {
+            if (!isConnected.Value)
+                return Task.FromCanceled<MultiplayerRoom>(CancellationToken.None);
+
+            return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
+        }
+
+        public override async Task LeaveRoom()
+        {
+            if (!isConnected.Value)
+                return;
+
+            if (Room == null)
+                return;
+
+            await base.LeaveRoom();
+            await connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
+        }
+
+        public override Task TransferHost(int userId)
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.TransferHost), userId);
+        }
+
+        public override Task ChangeSettings(MultiplayerRoomSettings settings)
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeSettings), settings);
+        }
+
+        public override Task ChangeState(MultiplayerUserState newState)
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
+        }
+
+        public override Task StartMatch()
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
+        }
+    }
+}

From 455a84c73fb616e89ec76c8af8cb553ed61d3688 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:32:57 +0900
Subject: [PATCH 07058/10326] Add realtime multiplayer screen

---
 .../Multi/Lounge/Components/DrawableRoom.cs   |  2 +-
 osu.Game/Screens/Multi/Multiplayer.cs         | 12 +++-
 .../RealtimeMultiplayer.cs                    | 65 +++++++++++++++++++
 3 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs

diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index 01a85382e4..56116b219a 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         {
             new OsuMenuItem("Create copy", MenuItemType.Standard, () =>
             {
-                multiplayer?.CreateRoom(Room.CreateCopy());
+                multiplayer?.OpenNewRoom(Room.CreateCopy());
             })
         };
     }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 837ccdf2e9..027fedaad6 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Multi
                     {
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
-                        Action = () => CreateRoom()
+                        Action = () => OpenNewRoom()
                     },
                     RoomManager = CreateRoomManager()
                 }
@@ -264,10 +264,16 @@ namespace osu.Game.Screens.Multi
         }
 
         /// <summary>
-        /// Create a new room.
+        /// Creates and opens the newly-created room.
         /// </summary>
         /// <param name="room">An optional template to use when creating the room.</param>
-        public void CreateRoom(Room room = null) => loungeSubScreen.Open(room ?? new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } });
+        public void OpenNewRoom(Room room = null) => loungeSubScreen.Open(room ?? CreateNewRoom());
+
+        /// <summary>
+        /// Creates a new room.
+        /// </summary>
+        /// <returns>The created <see cref="Room"/>.</returns>
+        protected virtual Room CreateNewRoom() => new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } };
 
         private void beginHandlingTrack()
         {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
new file mode 100644
index 0000000000..075c552437
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -0,0 +1,65 @@
+// Copyright (c) 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.Logging;
+using osu.Framework.Screens;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Multi.Lounge;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeMultiplayer : Multiplayer
+    {
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+
+            if (client.Room != null)
+                client.ChangeState(MultiplayerUserState.Idle);
+        }
+
+        protected override void UpdatePollingRate(bool isIdle)
+        {
+            var timeshiftManager = (RealtimeRoomManager)RoomManager;
+
+            if (!this.IsCurrentScreen())
+            {
+                timeshiftManager.TimeBetweenListingPolls.Value = 0;
+                timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+            }
+            else
+            {
+                switch (CurrentSubScreen)
+                {
+                    case LoungeSubScreen _:
+                        timeshiftManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
+                        break;
+
+                    // Don't poll inside the match or anywhere else.
+                    default:
+                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
+                        timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                        break;
+                }
+            }
+
+            Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
+        }
+
+        protected override Room CreateNewRoom()
+        {
+            var room = base.CreateNewRoom();
+            room.Category.Value = RoomCategory.Realtime;
+            return room;
+        }
+
+        protected override RoomManager CreateRoomManager() => new RealtimeRoomManager();
+    }
+}

From b9e4a7196e454743a96736c597b6749975e197eb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:36:56 +0900
Subject: [PATCH 07059/10326] Add realtime lounge subscreen

---
 ...s => TestSceneTimeshiftLoungeSubScreen.cs} |  5 ++--
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   | 25 ++++++++++---------
 osu.Game/Screens/Multi/Multiplayer.cs         |  4 ++-
 .../RealtimeFilterControl.cs                  | 17 +++++++++++++
 .../RealtimeLoungeSubScreen.cs                | 13 ++++++++++
 .../RealtimeMultiplayer.cs                    |  2 ++
 .../Timeshift/TimeshiftLoungeSubScreen.cs     | 13 ++++++++++
 .../Multi/Timeshift/TimeshiftMultiplayer.cs   |  2 ++
 8 files changed, 66 insertions(+), 15 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneLoungeSubScreen.cs => TestSceneTimeshiftLoungeSubScreen.cs} (92%)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
 create mode 100644 osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs
similarity index 92%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs
index 68987127d2..73afd65d6d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs
@@ -10,10 +10,11 @@ using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.Timeshift;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneLoungeSubScreen : RoomManagerTestScene
+    public class TestSceneTimeshiftLoungeSubScreen : RoomManagerTestScene
     {
         private LoungeSubScreen loungeScreen;
 
@@ -26,7 +27,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.SetUpSteps();
 
-            AddStep("push screen", () => LoadScreen(loungeScreen = new LoungeSubScreen
+            AddStep("push screen", () => LoadScreen(loungeScreen = new TimeshiftLoungeSubScreen
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 165a2b201c..26e351fc2b 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -19,16 +19,15 @@ using osu.Game.Users;
 namespace osu.Game.Screens.Multi.Lounge
 {
     [Cached]
-    public class LoungeSubScreen : MultiplayerSubScreen
+    public abstract class LoungeSubScreen : MultiplayerSubScreen
     {
         public override string Title => "Lounge";
 
-        protected FilterControl Filter;
-
         protected override UserActivity InitialActivity => new UserActivity.SearchingForLobby();
 
         private readonly IBindable<bool> initialRoomsReceived = new Bindable<bool>();
 
+        private FilterControl filter;
         private Container content;
         private LoadingLayer loadingLayer;
 
@@ -78,11 +77,11 @@ namespace osu.Game.Screens.Multi.Lounge
                         },
                     },
                 },
-                Filter = new TimeshiftFilterControl
+                filter = CreateFilterControl().With(d =>
                 {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 80,
-                },
+                    d.RelativeSizeAxes = Axes.X;
+                    d.Height = 80;
+                })
             };
 
             // scroll selected room into view on selection.
@@ -108,7 +107,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
             content.Padding = new MarginPadding
             {
-                Top = Filter.DrawHeight,
+                Top = filter.DrawHeight,
                 Left = WaveOverlayContainer.WIDTH_PADDING - DrawableRoom.SELECTION_BORDER_WIDTH + HORIZONTAL_OVERFLOW_PADDING,
                 Right = WaveOverlayContainer.WIDTH_PADDING + HORIZONTAL_OVERFLOW_PADDING,
             };
@@ -116,7 +115,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
         protected override void OnFocus(FocusEvent e)
         {
-            Filter.TakeFocus();
+            filter.TakeFocus();
         }
 
         public override void OnEntering(IScreen last)
@@ -140,19 +139,19 @@ namespace osu.Game.Screens.Multi.Lounge
 
         private void onReturning()
         {
-            Filter.HoldFocus = true;
+            filter.HoldFocus = true;
         }
 
         public override bool OnExiting(IScreen next)
         {
-            Filter.HoldFocus = false;
+            filter.HoldFocus = false;
             return base.OnExiting(next);
         }
 
         public override void OnSuspending(IScreen next)
         {
             base.OnSuspending(next);
-            Filter.HoldFocus = false;
+            filter.HoldFocus = false;
         }
 
         private void joinRequested(Room room)
@@ -195,5 +194,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
             this.Push(new MatchSubScreen(room));
         }
+
+        protected abstract FilterControl CreateFilterControl();
     }
 }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 027fedaad6..b37ee45b84 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Multi
             screenStack.ScreenPushed += screenPushed;
             screenStack.ScreenExited += screenExited;
 
-            screenStack.Push(loungeSubScreen = new LoungeSubScreen());
+            screenStack.Push(loungeSubScreen = CreateLounge());
         }
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
@@ -361,6 +361,8 @@ namespace osu.Game.Screens.Multi
 
         protected abstract RoomManager CreateRoomManager();
 
+        protected abstract LoungeSubScreen CreateLounge();
+
         private class MultiplayerWaveContainer : WaveContainer
         {
             protected override bool StartHidden => true;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs
new file mode 100644
index 0000000000..acd9a057e3
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeFilterControl : FilterControl
+    {
+        protected override FilterCriteria CreateCriteria()
+        {
+            var criteria = base.CreateCriteria();
+            criteria.Category = "realtime";
+            return criteria;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
new file mode 100644
index 0000000000..ed187e436f
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.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 osu.Game.Screens.Multi.Lounge;
+using osu.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeLoungeSubScreen : LoungeSubScreen
+    {
+        protected override FilterControl CreateFilterControl() => new RealtimeFilterControl();
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index 075c552437..6455701d31 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -61,5 +61,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         }
 
         protected override RoomManager CreateRoomManager() => new RealtimeRoomManager();
+
+        protected override LoungeSubScreen CreateLounge() => new RealtimeLoungeSubScreen();
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
new file mode 100644
index 0000000000..70fb1aef1d
--- /dev/null
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.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 osu.Game.Screens.Multi.Lounge;
+using osu.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Screens.Multi.Timeshift
+{
+    public class TimeshiftLoungeSubScreen : LoungeSubScreen
+    {
+        protected override FilterControl CreateFilterControl() => new TimeshiftFilterControl();
+    }
+}
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index d2d6a35a2e..a38b2a931e 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -45,5 +45,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         }
 
         protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
+
+        protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen();
     }
 }

From a1ba4b6979f0a0029855bfb30b3215499d6905a1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:40:19 +0900
Subject: [PATCH 07060/10326] Split MatchSubScreen into abstract component +
 timeshift implementation

---
 ....cs => TestSceneTimeshiftRoomSubScreen.cs} | 12 +--
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |  4 +-
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs | 74 ++++++++++++++++
 osu.Game/Screens/Multi/Multiplayer.cs         |  4 +-
 .../Multi/Timeshift/TimeshiftMultiplayer.cs   |  2 +-
 .../TimeshiftRoomSubScreen.cs}                | 88 +++----------------
 6 files changed, 97 insertions(+), 87 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneMatchSubScreen.cs => TestSceneTimeshiftRoomSubScreen.cs} (94%)
 create mode 100644 osu.Game/Screens/Multi/Match/RoomSubScreen.cs
 rename osu.Game/Screens/Multi/{Match/MatchSubScreen.cs => Timeshift/TimeshiftRoomSubScreen.cs} (78%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
similarity index 94%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
index bceb6efac1..f56f78ce89 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
@@ -16,15 +16,15 @@ 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.Screens.Multi.Timeshift;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchSubScreen : MultiplayerTestScene
+    public class TestSceneTimeshiftRoomSubScreen : MultiplayerTestScene
     {
         protected override bool UseOnlineAPI => true;
 
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapManager manager;
         private RulesetStore rulesets;
 
-        private TestMatchSubScreen match;
+        private TestTimeshiftRoomSubScreen match;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUpSteps]
         public void SetupSteps()
         {
-            AddStep("load match", () => LoadScreen(match = new TestMatchSubScreen(Room)));
+            AddStep("load match", () => LoadScreen(match = new TestTimeshiftRoomSubScreen(Room)));
             AddUntilStep("wait for load", () => match.IsCurrentScreen());
         }
 
@@ -131,13 +131,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("match has original beatmap", () => match.Beatmap.Value.Beatmap.BeatmapInfo.BaseDifficulty.CircleSize != 1);
         }
 
-        private class TestMatchSubScreen : MatchSubScreen
+        private class TestTimeshiftRoomSubScreen : TimeshiftRoomSubScreen
         {
             public new Bindable<PlaylistItem> SelectedItem => base.SelectedItem;
 
             public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap;
 
-            public TestMatchSubScreen(Room room)
+            public TestTimeshiftRoomSubScreen(Room room)
                 : base(room)
             {
             }
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 26e351fc2b..f4591d089e 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -13,7 +13,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Multi.Lounge
@@ -192,7 +192,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
             selectedRoom.Value = room;
 
-            this.Push(new MatchSubScreen(room));
+            this.Push(new TimeshiftRoomSubScreen(room));
         }
 
         protected abstract FilterControl CreateFilterControl();
diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
new file mode 100644
index 0000000000..0cc9a4354e
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.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 System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Screens;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Screens.Multi.Match
+{
+    [Cached(typeof(IPreviewTrackOwner))]
+    public abstract class RoomSubScreen : MultiplayerSubScreen, IPreviewTrackOwner
+    {
+        protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        [Resolved(typeof(Room), nameof(Room.Playlist))]
+        protected BindableList<PlaylistItem> Playlist { get; private set; }
+
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
+        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(selectedItemChanged));
+            SelectedItem.Value = Playlist.FirstOrDefault();
+
+            managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
+            managerUpdated.BindValueChanged(beatmapUpdated);
+        }
+
+        private void selectedItemChanged()
+        {
+            updateWorkingBeatmap();
+
+            var item = SelectedItem.Value;
+
+            Mods.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
+
+            if (item?.Ruleset != null)
+                Ruleset.Value = item.Ruleset.Value;
+        }
+
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet) => Schedule(updateWorkingBeatmap);
+
+        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);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            RoomManager?.PartRoom();
+            Mods.Value = Array.Empty<Mod>();
+
+            return base.OnExiting(next);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index b37ee45b84..eae779421d 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -308,7 +308,7 @@ namespace osu.Game.Screens.Multi
                     headerBackground.MoveToX(0, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
                     break;
 
-                case MatchSubScreen _:
+                case RoomSubScreen _:
                     header.ResizeHeightTo(135, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint);
                     headerBackground.MoveToX(-MultiplayerSubScreen.X_SHIFT, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
                     break;
@@ -330,7 +330,7 @@ namespace osu.Game.Screens.Multi
 
         private void updateTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
         {
-            if (screenStack.CurrentScreen is MatchSubScreen)
+            if (screenStack.CurrentScreen is RoomSubScreen)
             {
                 var track = Beatmap.Value?.Track;
 
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index a38b2a931e..2ea4857799 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Multi.Timeshift
                         timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
-                    case MatchSubScreen _:
+                    case RoomSubScreen _:
                         timeshiftManager.TimeBetweenListingPolls.Value = 0;
                         timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 30000 : 5000;
                         break;
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
similarity index 78%
rename from osu.Game/Screens/Multi/Match/MatchSubScreen.cs
rename to osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
index 2f8aad4e65..433a980d60 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
@@ -1,7 +1,6 @@
-// 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;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -9,28 +8,21 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
-using osu.Game.Audio;
-using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 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;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
-using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
-namespace osu.Game.Screens.Multi.Match
+namespace osu.Game.Screens.Multi.Timeshift
 {
-    [Cached(typeof(IPreviewTrackOwner))]
-    public class MatchSubScreen : MultiplayerSubScreen, IPreviewTrackOwner
+    public class TimeshiftRoomSubScreen : RoomSubScreen
     {
-        public override bool DisallowExternalBeatmapRulesetChanges => true;
-
         public override string Title { get; }
 
         public override string ShortTitle => "room";
@@ -38,27 +30,15 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
 
-        [Resolved(typeof(Room), nameof(Room.Type))]
-        private Bindable<GameType> type { get; set; }
-
-        [Resolved(typeof(Room), nameof(Room.Playlist))]
-        private BindableList<PlaylistItem> playlist { get; set; }
-
-        [Resolved]
-        private BeatmapManager beatmapManager { get; set; }
-
         [Resolved(canBeNull: true)]
         private Multiplayer multiplayer { get; set; }
 
-        protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
-
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;
 
-        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private OverlinedHeader participantsHeader;
 
-        public MatchSubScreen(Room room)
+        public TimeshiftRoomSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
             Activity.Value = new UserActivity.InLobby(room);
@@ -96,7 +76,7 @@ namespace osu.Game.Screens.Multi.Match
                                     },
                                     Content = new[]
                                     {
-                                        new Drawable[] { new Components.Header() },
+                                        new Drawable[] { new Match.Components.Header() },
                                         new Drawable[]
                                         {
                                             participantsHeader = new OverlinedHeader("Participants")
@@ -141,7 +121,7 @@ namespace osu.Game.Screens.Multi.Match
                                                                         new DrawableRoomPlaylistWithResults
                                                                         {
                                                                             RelativeSizeAxes = Axes.Both,
-                                                                            Items = { BindTarget = playlist },
+                                                                            Items = { BindTarget = Playlist },
                                                                             SelectedItem = { BindTarget = SelectedItem },
                                                                             RequestShowResults = item =>
                                                                             {
@@ -195,7 +175,7 @@ namespace osu.Game.Screens.Multi.Match
                         },
                         new Drawable[]
                         {
-                            new Footer
+                            new Match.Components.Footer
                             {
                                 OnStart = onStart,
                                 SelectedItem = { BindTarget = SelectedItem }
@@ -234,61 +214,17 @@ namespace osu.Game.Screens.Multi.Match
 
                     // 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());
+                    Schedule(() => SelectedItem.Value = Playlist.FirstOrDefault());
                 }
             }, true);
-
-            SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(selectedItemChanged));
-            SelectedItem.Value = playlist.FirstOrDefault();
-
-            managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
-            managerUpdated.BindValueChanged(beatmapUpdated);
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            RoomManager?.PartRoom();
-            Mods.Value = Array.Empty<Mod>();
-
-            return base.OnExiting(next);
-        }
-
-        private void selectedItemChanged()
-        {
-            updateWorkingBeatmap();
-
-            var item = SelectedItem.Value;
-
-            Mods.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
-
-            if (item?.Ruleset != null)
-                Ruleset.Value = item.Ruleset.Value;
-        }
-
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet) => Schedule(updateWorkingBeatmap);
-
-        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);
         }
 
         private void onStart()
         {
-            switch (type.Value)
+            multiplayer?.Push(new PlayerLoader(() => new TimeshiftPlayer(SelectedItem.Value)
             {
-                default:
-                case GameTypeTimeshift _:
-                    multiplayer?.Push(new PlayerLoader(() => new TimeshiftPlayer(SelectedItem.Value)
-                    {
-                        Exited = () => leaderboard.RefreshScores()
-                    }));
-                    break;
-            }
+                Exited = () => leaderboard.RefreshScores()
+            }));
         }
     }
 }

From a25cd910f83fe6ed012fdf63e1f2a20245ac625d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 22:20:35 +0100
Subject: [PATCH 07061/10326] Prepare base DHO for HO application

---
 .../Objects/Drawables/DrawableTaikoHitObject.cs    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index cf3aa69b6f..6041eccb51 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Allocation;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private readonly Container nonProxiedContent;
 
-        protected DrawableTaikoHitObject(TaikoHitObject hitObject)
+        protected DrawableTaikoHitObject([CanBeNull] TaikoHitObject hitObject)
             : base(hitObject)
         {
             AddRangeInternal(new[]
@@ -113,25 +113,23 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     {
         public override Vector2 OriginPosition => new Vector2(DrawHeight / 2);
 
-        public new TObject HitObject;
+        public new TObject HitObject => (TObject)base.HitObject;
 
         protected Vector2 BaseSize;
         protected SkinnableDrawable MainPiece;
 
-        protected DrawableTaikoHitObject(TObject hitObject)
+        protected DrawableTaikoHitObject([CanBeNull] TObject hitObject)
             : base(hitObject)
         {
-            HitObject = hitObject;
-
             Anchor = Anchor.CentreLeft;
             Origin = Anchor.Custom;
 
             RelativeSizeAxes = Axes.Both;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void OnApply()
         {
+            base.OnApply();
             RecreatePieces();
         }
 

From 7b350fc8e5f61644d63700c236fe2c447eb39efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 22:27:45 +0100
Subject: [PATCH 07062/10326] Prepare strongable DHO for HO application

---
 .../DrawableTaikoStrongableHitObject.cs       | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
index af3e94d9c6..62f338ca91 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using osu.Framework.Allocation;
+using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
@@ -16,28 +16,38 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         where TObject : TaikoStrongableHitObject
         where TStrongNestedObject : StrongNestedHitObject
     {
-        private readonly Bindable<bool> isStrong;
+        private readonly Bindable<bool> isStrong = new BindableBool();
 
         private readonly Container<DrawableStrongNestedHit> strongHitContainer;
 
-        protected DrawableTaikoStrongableHitObject(TObject hitObject)
+        protected DrawableTaikoStrongableHitObject([CanBeNull] TObject hitObject)
             : base(hitObject)
         {
-            isStrong = HitObject.IsStrongBindable.GetBoundCopy();
-
             AddInternal(strongHitContainer = new Container<DrawableStrongNestedHit>());
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void OnApply()
         {
+            isStrong.BindTo(HitObject.IsStrongBindable);
             isStrong.BindValueChanged(_ =>
             {
-                // will overwrite samples, should only be called on change.
+                // will overwrite samples, should only be called on subsequent changes
+                // after the initial application.
                 updateSamplesFromStrong();
 
                 RecreatePieces();
             });
+
+            base.OnApply();
+        }
+
+        protected override void OnFree()
+        {
+            base.OnFree();
+
+            isStrong.UnbindFrom(HitObject.IsStrongBindable);
+            // ensure the next application does not accidentally overwrite samples.
+            isStrong.UnbindEvents();
         }
 
         private HitSampleInfo[] getStrongSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();

From a31e8d137f3c0bf2926e603a9ef294eb0f8f47c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 22:53:00 +0100
Subject: [PATCH 07063/10326] Add guard when clearing samples

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 644c67ea59..da6da0ea97 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -303,7 +303,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             samplesBindable.CollectionChanged -= onSamplesChanged;
 
             // Release the samples for other hitobjects to use.
-            Samples.Samples = null;
+            if (Samples != null)
+                Samples.Samples = null;
 
             if (nestedHitObjects.IsValueCreated)
             {

From 55cdff5be770414190ed13b7d0effea094c848bb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:49:06 +0900
Subject: [PATCH 07064/10326] Renamespace ready button

---
 .../Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs  | 2 +-
 .../RealtimeMultiplayer/{ => Match}/RealtimeReadyButton.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game/Screens/Multi/RealtimeMultiplayer/{ => Match}/RealtimeReadyButton.cs (98%)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
index 1f863028af..b7cd81fb32 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
@@ -11,7 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 using osuTK;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
similarity index 98%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
rename to osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
index ea8fb04994..09487e9831 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
@@ -15,7 +15,7 @@ using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 {
     public class RealtimeReadyButton : RealtimeRoomComposite
     {

From 232c0205b4d7927c3b84dac00a719ec2fa4be7ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 22:51:35 +0100
Subject: [PATCH 07065/10326] Refactor hit object application scene to work
 reliably

---
 .../HitObjectApplicationTestScene.cs               | 14 ++++++++++----
 .../TestSceneBarLineApplication.cs                 |  7 ++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
index 07c7b4d1db..a1d000386f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
@@ -25,16 +25,22 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private ScrollingHitObjectContainer hitObjectContainer;
 
-        [SetUpSteps]
-        public void SetUp()
-            => AddStep("create SHOC", () => Child = hitObjectContainer = new ScrollingHitObjectContainer
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = hitObjectContainer = new ScrollingHitObjectContainer
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 200,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Clock = new FramedClock(new StopwatchClock())
-            });
+            };
+        }
+
+        [SetUpSteps]
+        public void SetUp()
+            => AddStep("clear SHOC", () => hitObjectContainer.Clear(false));
 
         protected void AddHitObject(DrawableHitObject hitObject)
             => AddStep("add to SHOC", () => hitObjectContainer.Add(hitObject));
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
index 65230a07bc..a970965141 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
@@ -12,12 +12,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [Test]
         public void TestApplyNewBarLine()
         {
-            DrawableBarLine barLine = new DrawableBarLine(PrepareObject(new BarLine
+            DrawableBarLine barLine = new DrawableBarLine();
+
+            AddStep("apply new bar line", () => barLine.Apply(PrepareObject(new BarLine
             {
                 StartTime = 400,
                 Major = true
-            }));
-
+            }), null));
             AddHitObject(barLine);
             RemoveHitObject(barLine);
 

From 536df074a9a5505a9b14dddd29f616d42e243c93 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:02:49 +0900
Subject: [PATCH 07066/10326] Don't attempt to re-map existing beatmap/ruleset
 (for testing)

---
 osu.Game/Online/Multiplayer/PlaylistItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Multiplayer/PlaylistItem.cs
index 416091a1aa..4c4c071fc9 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Multiplayer/PlaylistItem.cs
@@ -64,8 +64,8 @@ namespace osu.Game.Online.Multiplayer
 
         public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets)
         {
-            Beatmap.Value = apiBeatmap.ToBeatmap(rulesets);
-            Ruleset.Value = rulesets.GetRuleset(RulesetID);
+            Beatmap.Value ??= apiBeatmap.ToBeatmap(rulesets);
+            Ruleset.Value ??= rulesets.GetRuleset(RulesetID);
 
             Ruleset rulesetInstance = Ruleset.Value.CreateInstance();
 

From 1fdc19ee0fe9855a44eb95e94a8555be2103b0b7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:04:06 +0900
Subject: [PATCH 07067/10326] Add realtime match subscreen and related
 components

---
 .../TestSceneRealtimeMatchSubScreen.cs        |  77 +++
 .../Match/BeatmapSelectionControl.cs          |  81 ++++
 .../Match/RealtimeMatchFooter.cs              |  48 ++
 .../Match/RealtimeMatchHeader.cs              | 106 +++++
 .../Match/RealtimeMatchSettingsOverlay.cs     | 441 ++++++++++++++++++
 .../Participants/ParticipantsListHeader.cs    |  31 ++
 .../RealtimeMatchSongSelect.cs                |  20 +
 .../RealtimeMatchSubScreen.cs                 | 201 ++++++++
 .../RealtimeMultiplayer/RealtimePlayer.cs     |  16 +
 9 files changed, 1021 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
new file mode 100644
index 0000000000..d31364d62e
--- /dev/null
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
@@ -0,0 +1,77 @@
+// Copyright (c) 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.Screens;
+using osu.Framework.Testing;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
+using osu.Game.Tests.Beatmaps;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestSceneRealtimeMatchSubScreen : RealtimeMultiplayerTestScene
+    {
+        private RealtimeMatchSubScreen screen;
+
+        public TestSceneRealtimeMatchSubScreen()
+            : base(false)
+        {
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Room.Name.Value = "Test Room";
+        });
+
+        [SetUpSteps]
+        public void SetupSteps()
+        {
+            AddStep("load match", () => LoadScreen(screen = new RealtimeMatchSubScreen(Room)));
+            AddUntilStep("wait for load", () => screen.IsCurrentScreen());
+        }
+
+        [Test]
+        public void TestSettingValidity()
+        {
+            AddAssert("create button not enabled", () => !this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
+
+            AddStep("set playlist", () =>
+            {
+                Room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                });
+            });
+
+            AddAssert("create button enabled", () => this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
+        }
+
+        [Test]
+        public void TestCreatedRoom()
+        {
+            AddStep("set playlist", () =>
+            {
+                Room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                });
+            });
+
+            AddStep("click create button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddWaitStep("wait", 500);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs
new file mode 100644
index 0000000000..1939744916
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.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.Collections.Specialized;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Screens;
+using osu.Game.Online.API;
+using osu.Game.Screens.Multi.Match.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+{
+    public class BeatmapSelectionControl : MultiplayerComposite
+    {
+        [Resolved]
+        private RealtimeMatchSubScreen matchSubScreen { get; set; }
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private Container beatmapPanelContainer;
+        private Button selectButton;
+
+        public BeatmapSelectionControl()
+        {
+            AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    beatmapPanelContainer = new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y
+                    },
+                    selectButton = new PurpleTriangleButton
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 40,
+                        Text = "Select beatmap",
+                        Action = () => matchSubScreen.Push(new RealtimeMatchSongSelect()),
+                        Alpha = 0
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            Host.BindValueChanged(host =>
+            {
+                if (RoomID.Value == null || host.NewValue?.Equals(api.LocalUser.Value) == true)
+                    selectButton.Show();
+                else
+                    selectButton.Hide();
+            }, true);
+        }
+
+        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (Playlist.Any())
+                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(Playlist.Single(), false, false);
+            else
+                beatmapPanelContainer.Clear();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs
new file mode 100644
index 0000000000..31871729f6
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.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.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.Game.Graphics;
+using osu.Game.Online.Multiplayer;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+{
+    public class RealtimeMatchFooter : CompositeDrawable
+    {
+        public const float HEIGHT = 50;
+
+        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+        private readonly Drawable background;
+
+        public RealtimeMatchFooter()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = HEIGHT;
+
+            InternalChildren = new[]
+            {
+                background = new Box { RelativeSizeAxes = Axes.Both },
+                new RealtimeReadyButton
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(600, 50),
+                    SelectedItem = { BindTarget = SelectedItem }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = Color4Extensions.FromHex(@"28242d");
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs
new file mode 100644
index 0000000000..a9a10d1510
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs
@@ -0,0 +1,106 @@
+// Copyright (c) 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.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
+using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Users.Drawables;
+using osuTK;
+using FontWeight = osu.Game.Graphics.FontWeight;
+using OsuColour = osu.Game.Graphics.OsuColour;
+using OsuFont = osu.Game.Graphics.OsuFont;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+{
+    public class RealtimeMatchHeader : MultiplayerComposite
+    {
+        public const float HEIGHT = 50;
+
+        public Action OpenSettings;
+
+        private UpdateableAvatar avatar;
+        private LinkFlowContainer hostText;
+        private Button openSettingsButton;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        public RealtimeMatchHeader()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = HEIGHT;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(10, 0),
+                    Children = new Drawable[]
+                    {
+                        avatar = new UpdateableAvatar
+                        {
+                            Size = new Vector2(50),
+                            Masking = true,
+                            CornerRadius = 10,
+                        },
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Vertical,
+                            Children = new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Font = OsuFont.GetFont(size: 30),
+                                    Current = { BindTarget = RoomName }
+                                },
+                                hostText = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 20))
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                }
+                            }
+                        }
+                    }
+                },
+                openSettingsButton = new PurpleTriangleButton
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Size = new Vector2(150, HEIGHT),
+                    Text = "Open settings",
+                    Action = () => OpenSettings?.Invoke(),
+                    Alpha = 0
+                }
+            };
+
+            Host.BindValueChanged(host =>
+            {
+                avatar.User = host.NewValue;
+
+                hostText.Clear();
+
+                if (host.NewValue != null)
+                {
+                    hostText.AddText("hosted by ");
+                    hostText.AddUserLink(host.NewValue, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
+                }
+
+                openSettingsButton.Alpha = host.NewValue?.Equals(api.LocalUser.Value) == true ? 1 : 0;
+            }, true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
new file mode 100644
index 0000000000..3b9603e1bd
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
@@ -0,0 +1,441 @@
+// Copyright (c) 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.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.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Overlays;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Multi.Match.Components;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+{
+    public class RealtimeMatchSettingsOverlay : FocusedOverlayContainer
+    {
+        private const float transition_duration = 350;
+        private const float field_padding = 45;
+
+        protected MatchSettings Settings { get; private set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Masking = true;
+
+            Child = Settings = new MatchSettings
+            {
+                RelativeSizeAxes = Axes.Both,
+                RelativePositionAxes = Axes.Y,
+                SettingsApplied = Hide
+            };
+        }
+
+        protected override void PopIn()
+        {
+            Settings.MoveToY(0, transition_duration, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            Settings.MoveToY(-1, transition_duration, Easing.InSine);
+        }
+
+        protected class MatchSettings : MultiplayerComposite
+        {
+            private const float disabled_alpha = 0.2f;
+
+            public Action SettingsApplied;
+
+            public OsuTextBox NameField, MaxParticipantsField;
+            public RoomAvailabilityPicker AvailabilityPicker;
+            public GameTypePicker TypePicker;
+            public TriangleButton ApplyButton;
+
+            public OsuSpriteText ErrorText;
+
+            private OsuSpriteText typeLabel;
+            private LoadingLayer loadingLayer;
+            private BeatmapSelectionControl initialBeatmapControl;
+
+            [Resolved]
+            private RealtimeRoomManager manager { get; set; }
+
+            [Resolved]
+            private StatefulMultiplayerClient client { get; set; }
+
+            [Resolved]
+            private Bindable<Room> currentRoom { get; set; }
+
+            [Resolved]
+            private Bindable<WorkingBeatmap> beatmap { get; set; }
+
+            [Resolved]
+            private Bindable<RulesetInfo> ruleset { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Container dimContent;
+
+                InternalChildren = new Drawable[]
+                {
+                    dimContent = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4Extensions.FromHex(@"28242d"),
+                            },
+                            new GridContainer
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(GridSizeMode.Distributed),
+                                    new Dimension(GridSizeMode.AutoSize),
+                                },
+                                Content = new[]
+                                {
+                                    new Drawable[]
+                                    {
+                                        new OsuScrollContainer
+                                        {
+                                            Padding = new MarginPadding
+                                            {
+                                                Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+                                                Vertical = 10
+                                            },
+                                            RelativeSizeAxes = Axes.Both,
+                                            Children = new[]
+                                            {
+                                                new FillFlowContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Direction = FillDirection.Vertical,
+                                                    Spacing = new Vector2(0, 10),
+                                                    Children = new Drawable[]
+                                                    {
+                                                        new Container
+                                                        {
+                                                            Anchor = Anchor.TopCentre,
+                                                            Origin = Anchor.TopCentre,
+                                                            Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
+                                                            RelativeSizeAxes = Axes.X,
+                                                            AutoSizeAxes = Axes.Y,
+                                                            Children = new Drawable[]
+                                                            {
+                                                                new SectionContainer
+                                                                {
+                                                                    Padding = new MarginPadding { Right = field_padding / 2 },
+                                                                    Children = new[]
+                                                                    {
+                                                                        new Section("Room name")
+                                                                        {
+                                                                            Child = NameField = new SettingsTextBox
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.X,
+                                                                                TabbableContentContainer = this,
+                                                                            },
+                                                                        },
+                                                                        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
+                                                                                    {
+                                                                                        RelativeSizeAxes = Axes.X,
+                                                                                        Enabled = { Value = false }
+                                                                                    },
+                                                                                    typeLabel = new OsuSpriteText
+                                                                                    {
+                                                                                        Font = OsuFont.GetFont(size: 14),
+                                                                                        Colour = colours.Yellow
+                                                                                    },
+                                                                                },
+                                                                            },
+                                                                        },
+                                                                    },
+                                                                },
+                                                                new SectionContainer
+                                                                {
+                                                                    Anchor = Anchor.TopRight,
+                                                                    Origin = Anchor.TopRight,
+                                                                    Padding = new MarginPadding { Left = field_padding / 2 },
+                                                                    Children = new[]
+                                                                    {
+                                                                        new Section("Max participants")
+                                                                        {
+                                                                            Alpha = disabled_alpha,
+                                                                            Child = MaxParticipantsField = new SettingsNumberTextBox
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.X,
+                                                                                TabbableContentContainer = this,
+                                                                                ReadOnly = true,
+                                                                            },
+                                                                        },
+                                                                        new Section("Password (optional)")
+                                                                        {
+                                                                            Alpha = disabled_alpha,
+                                                                            Child = new SettingsPasswordTextBox
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.X,
+                                                                                TabbableContentContainer = this,
+                                                                                ReadOnly = true,
+                                                                            },
+                                                                        },
+                                                                    }
+                                                                }
+                                                            },
+                                                        },
+                                                        initialBeatmapControl = new BeatmapSelectionControl
+                                                        {
+                                                            Anchor = Anchor.TopCentre,
+                                                            Origin = Anchor.TopCentre,
+                                                            RelativeSizeAxes = Axes.X,
+                                                            Width = 0.5f
+                                                        }
+                                                    }
+                                                }
+                                            },
+                                        },
+                                    },
+                                    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 = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
+                                                },
+                                                new FillFlowContainer
+                                                {
+                                                    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 CreateOrUpdateButton
+                                                        {
+                                                            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
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                        }
+                    },
+                    loadingLayer = new LoadingLayer(dimContent)
+                };
+
+                TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
+                RoomName.BindValueChanged(name => NameField.Text = name.NewValue, true);
+                Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
+                Type.BindValueChanged(type => TypePicker.Current.Value = type.NewValue, true);
+                MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
+                RoomID.BindValueChanged(roomId => initialBeatmapControl.Alpha = roomId.NewValue == null ? 1 : 0, true);
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                ApplyButton.Enabled.Value = Playlist.Count > 0 && NameField.Text.Length > 0;
+            }
+
+            private void apply()
+            {
+                if (!ApplyButton.Enabled.Value)
+                    return;
+
+                hideError();
+                loadingLayer.Show();
+
+                // If the client is already in a room, update via the client.
+                // Otherwise, update the room directly in preparation for it to be submitted to the API on match creation.
+                if (client.Room != null)
+                {
+                    client.ChangeSettings(name: NameField.Text);
+                    onSuccess(currentRoom.Value);
+                }
+                else
+                {
+                    currentRoom.Value.Name.Value = NameField.Text;
+                    currentRoom.Value.Availability.Value = AvailabilityPicker.Current.Value;
+                    currentRoom.Value.Type.Value = TypePicker.Current.Value;
+
+                    if (int.TryParse(MaxParticipantsField.Text, out int max))
+                        currentRoom.Value.MaxParticipants.Value = max;
+                    else
+                        currentRoom.Value.MaxParticipants.Value = null;
+
+                    manager?.CreateRoom(currentRoom.Value, onSuccess, onError);
+                }
+            }
+
+            private void hideError() => ErrorText.FadeOut(50);
+
+            private void onSuccess(Room room)
+            {
+                loadingLayer.Hide();
+                SettingsApplied?.Invoke();
+            }
+
+            private void onError(string text)
+            {
+                ErrorText.Text = text;
+                ErrorText.FadeIn(50);
+
+                loadingLayer.Hide();
+            }
+        }
+
+        private class SettingsTextBox : OsuTextBox
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                BackgroundUnfocused = Color4.Black;
+                BackgroundFocused = Color4.Black;
+            }
+        }
+
+        private class SettingsNumberTextBox : SettingsTextBox
+        {
+            protected override bool CanAddCharacter(char character) => char.IsNumber(character);
+        }
+
+        private class SettingsPasswordTextBox : OsuPasswordTextBox
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                BackgroundUnfocused = Color4.Black;
+                BackgroundFocused = Color4.Black;
+            }
+        }
+
+        private class SectionContainer : FillFlowContainer<Section>
+        {
+            public SectionContainer()
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                Width = 0.5f;
+                Direction = FillDirection.Vertical;
+                Spacing = new Vector2(field_padding);
+            }
+        }
+
+        private class Section : Container
+        {
+            private readonly Container content;
+
+            protected override Container<Drawable> Content => content;
+
+            public Section(string title)
+            {
+                AutoSizeAxes = Axes.Y;
+                RelativeSizeAxes = Axes.X;
+
+                InternalChild = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(5),
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 12),
+                            Text = title.ToUpper(),
+                        },
+                        content = new Container
+                        {
+                            AutoSizeAxes = Axes.Y,
+                            RelativeSizeAxes = Axes.X,
+                        },
+                    },
+                };
+            }
+        }
+
+        public class CreateOrUpdateButton : TriangleButton
+        {
+            [Resolved(typeof(Room), nameof(Room.RoomID))]
+            private Bindable<int?> roomId { get; set; }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                roomId.BindValueChanged(id => Text = id.NewValue == null ? "Create" : "Update", true);
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = colours.Yellow;
+                Triangles.ColourLight = colours.YellowLight;
+                Triangles.ColourDark = colours.YellowDark;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs
new file mode 100644
index 0000000000..0ca7d34005
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.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.Allocation;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+{
+    public class ParticipantsListHeader : OverlinedHeader
+    {
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
+
+        public ParticipantsListHeader()
+            : base("Participants")
+        {
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            var room = client.Room;
+            if (room == null)
+                return;
+
+            Details.Value = room.Users.Count.ToString();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
new file mode 100644
index 0000000000..9bcc303065
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.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.Screens.Select;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeMatchSongSelect : SongSelect
+    {
+        protected override BeatmapDetailArea CreateBeatmapDetailArea()
+        {
+            throw new System.NotImplementedException();
+        }
+
+        protected override bool OnStart()
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
new file mode 100644
index 0000000000..d8b42e065b
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -0,0 +1,201 @@
+// Copyright (c) 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Screens;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
+using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
+using osu.Game.Screens.Play;
+using osu.Game.Users;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    [Cached]
+    public class RealtimeMatchSubScreen : RoomSubScreen
+    {
+        public override string Title { get; }
+
+        public override string ShortTitle => "match";
+
+        [Resolved(canBeNull: true)]
+        private Multiplayer multiplayer { get; set; }
+
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
+
+        private RealtimeMatchSettingsOverlay settingsOverlay;
+
+        public RealtimeMatchSubScreen(Room room)
+        {
+            Title = room.RoomID.Value == null ? "New match" : room.Name.Value;
+            Activity.Value = new UserActivity.InLobby(room);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new GridContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding
+                                {
+                                    Horizontal = 105,
+                                    Vertical = 20
+                                },
+                                Child = new GridContainer
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    RowDimensions = new[]
+                                    {
+                                        new Dimension(GridSizeMode.AutoSize),
+                                        new Dimension(),
+                                    },
+                                    Content = new[]
+                                    {
+                                        new Drawable[]
+                                        {
+                                            new RealtimeMatchHeader
+                                            {
+                                                OpenSettings = () => settingsOverlay.Show()
+                                            }
+                                        },
+                                        new Drawable[]
+                                        {
+                                            new GridContainer
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Content = new[]
+                                                {
+                                                    new Drawable[]
+                                                    {
+                                                        new Container
+                                                        {
+                                                            RelativeSizeAxes = Axes.Both,
+                                                            Padding = new MarginPadding { Horizontal = 5, Vertical = 10 },
+                                                            Child = new GridContainer
+                                                            {
+                                                                RelativeSizeAxes = Axes.Both,
+                                                                RowDimensions = new[]
+                                                                {
+                                                                    new Dimension(GridSizeMode.AutoSize)
+                                                                },
+                                                                Content = new[]
+                                                                {
+                                                                    new Drawable[] { new ParticipantsListHeader() },
+                                                                    new Drawable[]
+                                                                    {
+                                                                        new Participants.ParticipantsList
+                                                                        {
+                                                                            RelativeSizeAxes = Axes.Both
+                                                                        },
+                                                                    }
+                                                                }
+                                                            }
+                                                        },
+                                                        new FillFlowContainer
+                                                        {
+                                                            Anchor = Anchor.Centre,
+                                                            Origin = Anchor.Centre,
+                                                            RelativeSizeAxes = Axes.X,
+                                                            AutoSizeAxes = Axes.Y,
+                                                            Padding = new MarginPadding { Horizontal = 5 },
+                                                            Children = new Drawable[]
+                                                            {
+                                                                new OverlinedHeader("Beatmap"),
+                                                                new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        },
+                                        new Drawable[]
+                                        {
+                                            new GridContainer
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                RowDimensions = new[]
+                                                {
+                                                    new Dimension(GridSizeMode.AutoSize)
+                                                },
+                                                Content = new[]
+                                                {
+                                                    new Drawable[] { new OverlinedHeader("Chat") },
+                                                    new Drawable[] { new MatchChatDisplay { RelativeSizeAxes = Axes.Both } }
+                                                }
+                                            }
+                                        }
+                                    },
+                                }
+                            }
+                        },
+                        new Drawable[]
+                        {
+                            new Footer { SelectedItem = { BindTarget = SelectedItem } }
+                        }
+                    },
+                    RowDimensions = new[]
+                    {
+                        new Dimension(),
+                        new Dimension(GridSizeMode.AutoSize),
+                    }
+                },
+                settingsOverlay = new RealtimeMatchSettingsOverlay
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Playlist.BindCollectionChanged(onPlaylistChanged, true);
+
+            client.LoadRequested += onLoadRequested;
+        }
+
+        public override bool OnBackButton()
+        {
+            if (client.Room != null && settingsOverlay.State.Value == Visibility.Visible)
+            {
+                settingsOverlay.Hide();
+                return true;
+            }
+
+            return base.OnBackButton();
+        }
+
+        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
+
+        private void onLoadRequested() => multiplayer?.Push(new PlayerLoader(() => new RealtimePlayer(SelectedItem.Value)));
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (client != null)
+                client.LoadRequested -= onLoadRequested;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
new file mode 100644
index 0000000000..d629027246
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.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.Online.Multiplayer;
+using osu.Game.Screens.Multi.Play;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimePlayer : TimeshiftPlayer
+    {
+        public RealtimePlayer(PlaylistItem playlistItem)
+            : base(playlistItem)
+        {
+        }
+    }
+}

From 945ba59c8e3cb9c6df69fdba8ced4fc8322f9085 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:06:44 +0900
Subject: [PATCH 07068/10326] Make timeshift player able to not allow pause

---
 osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 41dcf61740..f86d8ff267 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -35,7 +35,8 @@ namespace osu.Game.Screens.Multi.Play
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        public TimeshiftPlayer(PlaylistItem playlistItem)
+        public TimeshiftPlayer(PlaylistItem playlistItem, bool allowPause = true)
+            : base(allowPause)
         {
             this.playlistItem = playlistItem;
         }

From 07077b8f4e52e2aa3902d73a4f936fc2086e7e84 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:13:05 +0900
Subject: [PATCH 07069/10326] Add realtime player

---
 .../Screens/Multi/Play/TimeshiftPlayer.cs     | 32 ++++-----
 .../RealtimeMultiplayer/RealtimePlayer.cs     | 67 ++++++++++++++++++-
 .../RealtimeResultsScreen.cs                  | 17 +++++
 3 files changed, 99 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index f86d8ff267..e8462088f1 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -25,9 +25,11 @@ namespace osu.Game.Screens.Multi.Play
         public Action Exited;
 
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
+        protected Bindable<int?> RoomId { get; private set; }
 
-        private readonly PlaylistItem playlistItem;
+        protected readonly PlaylistItem PlaylistItem;
+
+        protected int? Token { get; private set; }
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -38,30 +40,28 @@ namespace osu.Game.Screens.Multi.Play
         public TimeshiftPlayer(PlaylistItem playlistItem, bool allowPause = true)
             : base(allowPause)
         {
-            this.playlistItem = playlistItem;
+            PlaylistItem = playlistItem;
         }
 
-        private int? token;
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            token = null;
+            Token = null;
 
             bool failed = false;
 
             // Sanity checks to ensure that TimeshiftPlayer matches the settings for the current PlaylistItem
-            if (Beatmap.Value.BeatmapInfo.OnlineBeatmapID != playlistItem.Beatmap.Value.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.Value.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)))
+            if (!PlaylistItem.RequiredMods.All(m => Mods.Value.Any(m.Equals)))
                 throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods");
 
-            var req = new CreateRoomScoreRequest(roomId.Value ?? 0, playlistItem.ID, Game.VersionHash);
-            req.Success += r => token = r.ID;
+            var req = new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
+            req.Success += r => Token = r.ID;
             req.Failure += e =>
             {
                 failed = true;
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Multi.Play
 
             api.Queue(req);
 
-            while (!failed && !token.HasValue)
+            while (!failed && !Token.HasValue)
                 Thread.Sleep(1000);
         }
 
@@ -93,8 +93,8 @@ namespace osu.Game.Screens.Multi.Play
 
         protected override ResultsScreen CreateResults(ScoreInfo score)
         {
-            Debug.Assert(roomId.Value != null);
-            return new TimeshiftResultsScreen(score, roomId.Value.Value, playlistItem, true);
+            Debug.Assert(RoomId.Value != null);
+            return new TimeshiftResultsScreen(score, RoomId.Value.Value, PlaylistItem, true);
         }
 
         protected override Score CreateScore()
@@ -108,10 +108,10 @@ namespace osu.Game.Screens.Multi.Play
         {
             await base.SubmitScore(score);
 
-            Debug.Assert(token != null);
+            Debug.Assert(Token != null);
 
             var tcs = new TaskCompletionSource<bool>();
-            var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score.ScoreInfo);
+            var request = new SubmitRoomScoreRequest(Token.Value, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
 
             request.Success += s =>
             {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index d629027246..d654496f40 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -1,16 +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;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Play;
+using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
     public class RealtimePlayer : TimeshiftPlayer
     {
+        protected override bool PauseOnFocusLost => false;
+
+        // Disallow fails in multiplayer for now.
+        protected override bool CheckModsAllowFailure() => false;
+
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
+
+        private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
+        private bool started;
+
         public RealtimePlayer(PlaylistItem playlistItem)
-            : base(playlistItem)
+            : base(playlistItem, false)
         {
         }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (Token == null)
+                return; // Todo: Somehow handle token retrieval failure.
+
+            client.MatchStarted += onMatchStarted;
+            client.ResultsReady += onResultsReady;
+            client.ChangeState(MultiplayerUserState.Loaded);
+
+            while (!started)
+                Thread.Sleep(100);
+        }
+
+        private void onMatchStarted() => started = true;
+
+        private void onResultsReady() => resultsReady.SetResult(true);
+
+        protected override async Task SubmitScore(Score score)
+        {
+            await base.SubmitScore(score);
+
+            await client.ChangeState(MultiplayerUserState.FinishedPlay);
+
+            // Await up to 30 seconds for results to become available (3 api request timeouts).
+            // This is arbitrary just to not leave the player in an essentially deadlocked state if any connection issues occur.
+            await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(30)));
+        }
+
+        protected override ResultsScreen CreateResults(ScoreInfo score)
+        {
+            Debug.Assert(RoomId.Value != null);
+            return new RealtimeResultsScreen(score, RoomId.Value.Value, PlaylistItem);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (client != null)
+            {
+                client.MatchStarted -= onMatchStarted;
+                client.ResultsReady -= onResultsReady;
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
new file mode 100644
index 0000000000..1598c8fbb5
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Online.Multiplayer;
+using osu.Game.Scoring;
+using osu.Game.Screens.Multi.Ranking;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeResultsScreen : TimeshiftResultsScreen
+    {
+        public RealtimeResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
+            : base(score, roomId, playlistItem, false)
+        {
+        }
+    }
+}

From 5b4197a9efb7194e955d2d6eb891f8ec67638f91 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:14:54 +0900
Subject: [PATCH 07070/10326] Disable watching replays from realtime results
 screen

---
 .../Multi/Ranking/TimeshiftResultsScreen.cs   |  4 ++--
 .../RealtimeResultsScreen.cs                  |  2 +-
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 23 +++++++++++--------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 3623208fa7..d3f1c19c7c 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -32,8 +32,8 @@ namespace osu.Game.Screens.Multi.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry)
-            : base(score, allowRetry)
+        public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
+            : base(score, allowRetry, allowWatchingReplay)
         {
             this.roomId = roomId;
             this.playlistItem = playlistItem;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
index 1598c8fbb5..3964a87eb6 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
     public class RealtimeResultsScreen : TimeshiftResultsScreen
     {
         public RealtimeResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
-            : base(score, roomId, playlistItem, false)
+            : base(score, roomId, playlistItem, false, false)
         {
         }
     }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 887e7ec8a9..528a1842af 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -57,11 +57,13 @@ namespace osu.Game.Screens.Ranking
         private APIRequest nextPageRequest;
 
         private readonly bool allowRetry;
+        private readonly bool allowWatchingReplay;
 
-        protected ResultsScreen(ScoreInfo score, bool allowRetry)
+        protected ResultsScreen(ScoreInfo score, bool allowRetry, bool allowWatchingReplay = true)
         {
             Score = score;
             this.allowRetry = allowRetry;
+            this.allowWatchingReplay = allowWatchingReplay;
 
             SelectedScore.Value = score;
         }
@@ -128,15 +130,7 @@ namespace osu.Game.Screens.Ranking
                                     Origin = Anchor.Centre,
                                     AutoSizeAxes = Axes.Both,
                                     Spacing = new Vector2(5),
-                                    Direction = FillDirection.Horizontal,
-                                    Children = new Drawable[]
-                                    {
-                                        new ReplayDownloadButton(null)
-                                        {
-                                            Score = { BindTarget = SelectedScore },
-                                            Width = 300
-                                        },
-                                    }
+                                    Direction = FillDirection.Horizontal
                                 }
                             }
                         }
@@ -157,6 +151,15 @@ namespace osu.Game.Screens.Ranking
                 ScorePanelList.AddScore(Score, shouldFlair);
             }
 
+            if (allowWatchingReplay)
+            {
+                buttons.Add(new ReplayDownloadButton(null)
+                {
+                    Score = { BindTarget = SelectedScore },
+                    Width = 300
+                });
+            }
+
             if (player != null && allowRetry)
             {
                 buttons.Add(new RetryButton { Width = 300 });

From 15480c006b6353620b64dce0affcb935d935e3a7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:21:30 +0900
Subject: [PATCH 07071/10326] Create the correct room subscreen

---
 osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs            | 6 ++++--
 .../Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs    | 4 ++++
 .../Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs     | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index f4591d089e..44c893363b 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -13,7 +13,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Match;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Multi.Lounge
@@ -192,9 +192,11 @@ namespace osu.Game.Screens.Multi.Lounge
 
             selectedRoom.Value = room;
 
-            this.Push(new TimeshiftRoomSubScreen(room));
+            this.Push(CreateRoomSubScreen(room));
         }
 
         protected abstract FilterControl CreateFilterControl();
+
+        protected abstract RoomSubScreen CreateRoomSubScreen(Room room);
     }
 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
index ed187e436f..9fbf0c4654 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
@@ -1,13 +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.Online.Multiplayer;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
     public class RealtimeLoungeSubScreen : LoungeSubScreen
     {
         protected override FilterControl CreateFilterControl() => new RealtimeFilterControl();
+
+        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new RealtimeMatchSubScreen(room);
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
index 70fb1aef1d..8e426ffbcc 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
@@ -1,13 +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.Online.Multiplayer;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.Timeshift
 {
     public class TimeshiftLoungeSubScreen : LoungeSubScreen
     {
         protected override FilterControl CreateFilterControl() => new TimeshiftFilterControl();
+
+        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new TimeshiftRoomSubScreen(room);
     }
 }

From 959959dbedf50b76d470d5f0457c260988e7c15b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:21:41 +0900
Subject: [PATCH 07072/10326] Add multiplayer client to OsuGameBase

---
 osu.Game/OsuGameBase.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 150569f1dd..eb27821d82 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -30,6 +30,7 @@ using osu.Game.Database;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
+using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Resources;
@@ -78,6 +79,7 @@ namespace osu.Game
         protected IAPIProvider API;
 
         private SpectatorStreamingClient spectatorStreaming;
+        private StatefulMultiplayerClient multiplayerClient;
 
         protected MenuCursorContainer MenuCursorContainer;
 
@@ -211,6 +213,7 @@ namespace osu.Game
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig));
 
             dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient());
+            dependencies.CacheAs(multiplayerClient = new RealtimeMultiplayerClient());
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
@@ -277,6 +280,7 @@ namespace osu.Game
             if (API is APIAccess apiAccess)
                 AddInternal(apiAccess);
             AddInternal(spectatorStreaming);
+            AddInternal(multiplayerClient);
 
             AddInternal(RulesetConfigCache);
 

From 275efd12b84bf8d775313bcf93d75840c48ad370 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:21:48 +0900
Subject: [PATCH 07073/10326] Fix room manager reference

---
 .../RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
index 3b9603e1bd..924c736472 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
             private BeatmapSelectionControl initialBeatmapControl;
 
             [Resolved]
-            private RealtimeRoomManager manager { get; set; }
+            private IRoomManager manager { get; set; }
 
             [Resolved]
             private StatefulMultiplayerClient client { get; set; }

From e32b1c34cac0436c39a5087896f386af30239d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 22:53:46 +0100
Subject: [PATCH 07074/10326] Implement hit application

---
 .../TestSceneHitApplication.cs                | 37 ++++++++++++++++
 .../Objects/Drawables/DrawableHit.cs          | 44 ++++++++++++++-----
 2 files changed, 70 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs
new file mode 100644
index 0000000000..52fd440857
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.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.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneHitApplication : HitObjectApplicationTestScene
+    {
+        [Test]
+        public void TestApplyNewHit()
+        {
+            var hit = new DrawableHit();
+
+            AddStep("apply new hit", () => hit.Apply(PrepareObject(new Hit
+            {
+                Type = HitType.Rim,
+                IsStrong = false,
+                StartTime = 300
+            }), null));
+
+            AddHitObject(hit);
+            RemoveHitObject(hit);
+
+            AddStep("apply new hit", () => hit.Apply(PrepareObject(new Hit
+            {
+                Type = HitType.Centre,
+                IsStrong = true,
+                StartTime = 500
+            }), null));
+
+            AddHitObject(hit);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 431f2980ec..5a479e1f53 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using osu.Framework.Allocation;
+using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Audio;
@@ -36,29 +36,51 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private bool pressHandledThisFrame;
 
-        private readonly Bindable<HitType> type;
+        private readonly Bindable<HitType> type = new Bindable<HitType>();
 
-        public DrawableHit(Hit hit)
-            : base(hit)
+        public DrawableHit()
+            : this(null)
         {
-            type = HitObject.TypeBindable.GetBoundCopy();
-            FillMode = FillMode.Fit;
-
-            updateActionsFromType();
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        public DrawableHit([CanBeNull] Hit hit)
+            : base(hit)
         {
+            FillMode = FillMode.Fit;
+        }
+
+        protected override void OnApply()
+        {
+            type.BindTo(HitObject.TypeBindable);
             type.BindValueChanged(_ =>
             {
                 updateActionsFromType();
 
-                // will overwrite samples, should only be called on change.
+                // will overwrite samples, should only be called on subsequent changes
+                // after the initial application.
                 updateSamplesFromTypeChange();
 
                 RecreatePieces();
             });
+
+            // action update also has to happen immediately on application.
+            updateActionsFromType();
+
+            base.OnApply();
+        }
+
+        protected override void OnFree()
+        {
+            base.OnFree();
+
+            type.UnbindFrom(HitObject.TypeBindable);
+            type.UnbindEvents();
+
+            UnproxyContent();
+
+            HitActions = null;
+            HitAction = null;
+            validActionPressed = pressHandledThisFrame = false;
         }
 
         private HitSampleInfo[] getRimSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();

From 8b6bc09b8f0c0dd48879fe05adb5f614aeb4dc29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 23:02:33 +0100
Subject: [PATCH 07075/10326] Implement drum roll application

---
 .../TestSceneDrumRollApplication.cs           | 39 +++++++++++++++++++
 .../Objects/Drawables/DrawableDrumRoll.cs     | 34 ++++++++++------
 2 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs
new file mode 100644
index 0000000000..54450e27db
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.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 NUnit.Framework;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneDrumRollApplication : HitObjectApplicationTestScene
+    {
+        [Test]
+        public void TestApplyNewDrumRoll()
+        {
+            var drumRoll = new DrawableDrumRoll();
+
+            AddStep("apply new drum roll", () => drumRoll.Apply(PrepareObject(new DrumRoll
+            {
+                StartTime = 300,
+                Duration = 500,
+                IsStrong = false,
+                TickRate = 2
+            }), null));
+
+            AddHitObject(drumRoll);
+            RemoveHitObject(drumRoll);
+
+            AddStep("apply new drum roll", () => drumRoll.Apply(PrepareObject(new DrumRoll
+            {
+                StartTime = 150,
+                Duration = 400,
+                IsStrong = true,
+                TickRate = 16
+            }), null));
+
+            AddHitObject(drumRoll);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 4925b6fdfc..ede7453804 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
@@ -31,15 +32,26 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         private int rollingHits;
 
-        private Container tickContainer;
+        private readonly Container tickContainer;
 
         private Color4 colourIdle;
         private Color4 colourEngaged;
 
-        public DrawableDrumRoll(DrumRoll drumRoll)
+        public DrawableDrumRoll()
+            : this(null)
+        {
+        }
+
+        public DrawableDrumRoll([CanBeNull] DrumRoll drumRoll)
             : base(drumRoll)
         {
             RelativeSizeAxes = Axes.Y;
+
+            Content.Add(tickContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Depth = float.MinValue
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -47,12 +59,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             colourIdle = colours.YellowDark;
             colourEngaged = colours.YellowDarker;
-
-            Content.Add(tickContainer = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Depth = float.MinValue
-            });
         }
 
         protected override void LoadComplete()
@@ -68,6 +74,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             updateColour();
         }
 
+        protected override void OnFree()
+        {
+            base.OnFree();
+            rollingHits = 0;
+        }
+
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
         {
             base.AddNestedHitObject(hitObject);
@@ -114,7 +126,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             rollingHits = Math.Clamp(rollingHits, 0, rolling_hits_for_engaged_colour);
 
-            updateColour();
+            updateColour(100);
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
@@ -156,10 +168,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRoll.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
 
-        private void updateColour()
+        private void updateColour(double fadeDuration = 0)
         {
             Color4 newColour = Interpolation.ValueAt((float)rollingHits / rolling_hits_for_engaged_colour, colourIdle, colourEngaged, 0, 1);
-            (MainPiece.Drawable as IHasAccentColour)?.FadeAccent(newColour, 100);
+            (MainPiece.Drawable as IHasAccentColour)?.FadeAccent(newColour, fadeDuration);
         }
 
         private class StrongNestedHit : DrawableStrongNestedHit

From e3b6eaa39059ba8afc2e71a0d034bc3b227fe49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 23:06:22 +0100
Subject: [PATCH 07076/10326] Implement swell application

Also removes a weird sizing application that seems to have no effect
(introduced in 27e63eb; compare removals for other taiko DHO types in
9d00e5b and 58bf288).
---
 .../Objects/Drawables/DrawableSwell.cs          | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 229d581d0c..9798a79450 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -35,7 +36,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private readonly CircularContainer targetRing;
         private readonly CircularContainer expandingRing;
 
-        public DrawableSwell(Swell swell)
+        public DrawableSwell()
+            : this(null)
+        {
+        }
+
+        public DrawableSwell([CanBeNull] Swell swell)
             : base(swell)
         {
             FillMode = FillMode.Fit;
@@ -123,12 +129,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 Origin = Anchor.Centre,
             });
 
-        protected override void LoadComplete()
+        protected override void OnFree()
         {
-            base.LoadComplete();
+            base.OnFree();
 
-            // We need to set this here because RelativeSizeAxes won't/can't set our size by default with a different RelativeChildSize
-            Width *= Parent.RelativeChildSize.X;
+            UnproxyContent();
+
+            lastWasCentre = null;
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)

From 3bd42795899eda793b9b0d346abdae7902585ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 23:10:19 +0100
Subject: [PATCH 07077/10326] Implement drum roll tick application

---
 .../Objects/Drawables/DrawableDrumRollTick.cs             | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index c6761de5e3..e7d8ef1e12 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Skinning.Default;
@@ -16,7 +17,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         public HitType JudgementType;
 
-        public DrawableDrumRollTick(DrumRollTick tick)
+        public DrawableDrumRollTick()
+            : this(null)
+        {
+        }
+
+        public DrawableDrumRollTick([CanBeNull] DrumRollTick tick)
             : base(tick)
         {
             FillMode = FillMode.Fit;

From d823c77a63e315207bbe7f282ef07ef3eeb8bf1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 23:11:51 +0100
Subject: [PATCH 07078/10326] Implement swell tick application

---
 .../Objects/Drawables/DrawableSwellTick.cs                | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
index 14c86d151f..47fc7e5ab3 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.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 JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Taiko.Skinning.Default;
 using osu.Game.Skinning;
@@ -11,7 +12,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     {
         public override bool DisplayResult => false;
 
-        public DrawableSwellTick(SwellTick hitObject)
+        public DrawableSwellTick()
+            : this(null)
+        {
+        }
+
+        public DrawableSwellTick([CanBeNull] SwellTick hitObject)
             : base(hitObject)
         {
         }

From ae6dedacaf1edb784c9ca7bdfb4a871f6e0821f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 23:21:19 +0100
Subject: [PATCH 07079/10326] Implement nested strong hit application

---
 .../Objects/Drawables/DrawableDrumRoll.cs     | 17 ++++++++----
 .../Objects/Drawables/DrawableDrumRollTick.cs | 17 ++++++++----
 .../Objects/Drawables/DrawableHit.cs          | 27 +++++++++++--------
 .../Drawables/DrawableStrongNestedHit.cs      |  7 +++--
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |  2 +-
 5 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index ede7453804..01336ea2e4 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -166,7 +166,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Content.X = DrawHeight / 2;
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRoll.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRoll.StrongNestedHit hitObject) => new StrongNestedHit(hitObject);
 
         private void updateColour(double fadeDuration = 0)
         {
@@ -176,17 +176,24 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(DrumRoll.StrongNestedHit nestedHit, DrawableDrumRoll drumRoll)
-                : base(nestedHit, drumRoll)
+            public new DrawableDrumRoll ParentHitObject => (DrawableDrumRoll)base.ParentHitObject;
+
+            public StrongNestedHit()
+                : this(null)
+            {
+            }
+
+            public StrongNestedHit([CanBeNull] DrumRoll.StrongNestedHit nestedHit)
+                : base(nestedHit)
             {
             }
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (!MainObject.Judged)
+                if (!ParentHitObject.Judged)
                     return;
 
-                ApplyResult(r => r.Type = MainObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+                ApplyResult(r => r.Type = ParentHitObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
             }
 
             public override bool OnPressed(TaikoAction action) => false;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index e7d8ef1e12..1e625d91d6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -67,21 +67,28 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return UpdateResult(true);
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRollTick.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRollTick.StrongNestedHit hitObject) => new StrongNestedHit(hitObject);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(DrumRollTick.StrongNestedHit nestedHit, DrawableDrumRollTick tick)
-                : base(nestedHit, tick)
+            public new DrawableDrumRollTick ParentHitObject => (DrawableDrumRollTick)base.ParentHitObject;
+
+            public StrongNestedHit()
+                : this(null)
+            {
+            }
+
+            public StrongNestedHit([CanBeNull] DrumRollTick.StrongNestedHit nestedHit)
+                : base(nestedHit)
             {
             }
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (!MainObject.Judged)
+                if (!ParentHitObject.Judged)
                     return;
 
-                ApplyResult(r => r.Type = MainObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+                ApplyResult(r => r.Type = ParentHitObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
             }
 
             public override bool OnPressed(TaikoAction action) => false;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 5a479e1f53..73ebd7c117 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -250,32 +250,37 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(Hit.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(Hit.StrongNestedHit hitObject) => new StrongNestedHit(hitObject);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
+            public new DrawableHit ParentHitObject => (DrawableHit)base.ParentHitObject;
+
             /// <summary>
             /// The lenience for the second key press.
             /// This does not adjust by map difficulty in ScoreV2 yet.
             /// </summary>
             private const double second_hit_window = 30;
 
-            public new DrawableHit MainObject => (DrawableHit)base.MainObject;
+            public StrongNestedHit()
+                : this(null)
+            {
+            }
 
-            public StrongNestedHit(Hit.StrongNestedHit nestedHit, DrawableHit hit)
-                : base(nestedHit, hit)
+            public StrongNestedHit([CanBeNull] Hit.StrongNestedHit nestedHit)
+                : base(nestedHit)
             {
             }
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (!MainObject.Result.HasResult)
+                if (!ParentHitObject.Result.HasResult)
                 {
                     base.CheckForResult(userTriggered, timeOffset);
                     return;
                 }
 
-                if (!MainObject.Result.IsHit)
+                if (!ParentHitObject.Result.IsHit)
                 {
                     ApplyResult(r => r.Type = r.Judgement.MinResult);
                     return;
@@ -283,27 +288,27 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
                 if (!userTriggered)
                 {
-                    if (timeOffset - MainObject.Result.TimeOffset > second_hit_window)
+                    if (timeOffset - ParentHitObject.Result.TimeOffset > second_hit_window)
                         ApplyResult(r => r.Type = r.Judgement.MinResult);
                     return;
                 }
 
-                if (Math.Abs(timeOffset - MainObject.Result.TimeOffset) <= second_hit_window)
+                if (Math.Abs(timeOffset - ParentHitObject.Result.TimeOffset) <= second_hit_window)
                     ApplyResult(r => r.Type = r.Judgement.MaxResult);
             }
 
             public override bool OnPressed(TaikoAction action)
             {
                 // Don't process actions until the main hitobject is hit
-                if (!MainObject.IsHit)
+                if (!ParentHitObject.IsHit)
                     return false;
 
                 // Don't process actions if the pressed button was released
-                if (MainObject.HitAction == null)
+                if (ParentHitObject.HitAction == null)
                     return false;
 
                 // Don't handle invalid hit action presses
-                if (!MainObject.HitActions.Contains(action))
+                if (!ParentHitObject.HitActions.Contains(action))
                     return false;
 
                 return UpdateResult(true);
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index d2e8888197..9c22e34387 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.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.Rulesets.Objects.Drawables;
+using JetBrains.Annotations;
 using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -11,12 +11,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     /// </summary>
     public abstract class DrawableStrongNestedHit : DrawableTaikoHitObject
     {
-        public readonly DrawableHitObject MainObject;
+        public new DrawableTaikoHitObject ParentHitObject => (DrawableTaikoHitObject)base.ParentHitObject;
 
-        protected DrawableStrongNestedHit(StrongNestedHitObject nestedHit, DrawableHitObject mainObject)
+        protected DrawableStrongNestedHit([CanBeNull] StrongNestedHitObject nestedHit)
             : base(nestedHit)
         {
-            MainObject = mainObject;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index d20b190c86..8682495b41 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             {
                 case TaikoStrongJudgement _:
                     if (result.IsHit)
-                        hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongNestedHit)judgedObject).MainObject)?.VisualiseSecondHit();
+                        hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongNestedHit)judgedObject).ParentHitObject)?.VisualiseSecondHit();
                     break;
 
                 case TaikoDrumRollTickJudgement _:

From 3af702453f66663cef225445e11f5cfc5d2cf4b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:37:13 +0900
Subject: [PATCH 07080/10326] Implement realtime match song select

---
 .../RealtimeMatchSongSelect.cs                | 45 ++++++++++++++++---
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index 9bcc303065..157216e9bb 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -1,20 +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.Linq;
+using Humanizer;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Screens;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
-    public class RealtimeMatchSongSelect : SongSelect
+    public class RealtimeMatchSongSelect : SongSelect, IMultiplayerSubScreen
     {
-        protected override BeatmapDetailArea CreateBeatmapDetailArea()
-        {
-            throw new System.NotImplementedException();
-        }
+        public string ShortTitle => "song selection";
+
+        public override string Title => ShortTitle.Humanize();
+
+        [Resolved(typeof(Room), nameof(Room.Playlist))]
+        private BindableList<PlaylistItem> playlist { get; set; }
+
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
 
         protected override bool OnStart()
         {
-            throw new System.NotImplementedException();
+            var item = new PlaylistItem();
+
+            item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
+            item.Ruleset.Value = Ruleset.Value;
+
+            item.RequiredMods.Clear();
+            item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
+
+            // If the client is already in a room, update via the client.
+            // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
+            if (client.Room != null)
+                client.ChangeSettings(item: item);
+            else
+            {
+                playlist.Clear();
+                playlist.Add(item);
+            }
+
+            this.Exit();
+            return true;
         }
+
+        protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
     }
 }

From d127494c2dedfd133012e574f7fe68d15049073d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:39:31 +0900
Subject: [PATCH 07081/10326] Fix thread-unsafe room removal

---
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index a50628a5fa..734d00b9aa 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -54,9 +54,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             multiplayerClient.LeaveRoom().Wait();
 
             // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
-            RemoveRoom(joinedRoom);
             // This is delayed one frame because upon exiting the match subscreen, multiplayer updates the polling rate and messes with polling.
-            Schedule(() => listingPollingComponent.PollImmediately());
+            Schedule(() =>
+            {
+                RemoveRoom(joinedRoom);
+                listingPollingComponent.PollImmediately();
+            });
         }
 
         private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null)

From a893360c0e07d3c2b31206ace178ad33cf85a47f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:41:14 +0900
Subject: [PATCH 07082/10326] Reword comment

---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 8d3b161804..0065b425ec 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -71,7 +71,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
         private RulesetStore rulesets { get; set; } = null!;
 
         private Room? apiRoom;
-        private int playlistItemId; // Todo: THIS IS SUPER TEMPORARY!!
+
+        // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
+        private int playlistItemId;
 
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.

From 0c5333bd586dfea1f40e3f6e6d4144bd887713a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 17:57:19 +0100
Subject: [PATCH 07083/10326] Adjust top-level hitobjects to support nested
 pooling

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs   | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs      | 2 +-
 .../Objects/Drawables/DrawableTaikoStrongableHitObject.cs       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 01336ea2e4..d085b95f35 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
-            tickContainer.Clear();
+            tickContainer.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 9798a79450..60f9521996 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
-            ticks.Clear();
+            ticks.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
index 62f338ca91..4f1523eb3f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
-            strongHitContainer.Clear();
+            strongHitContainer.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)

From 370f56eadbb97aa1ed05d7bc1952e3b35924430f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 18:02:31 +0100
Subject: [PATCH 07084/10326] Make strong hit DHOs public for pool registration

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs   | 2 +-
 .../Objects/Drawables/DrawableDrumRollTick.cs                   | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index d085b95f35..d066abf767 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             (MainPiece.Drawable as IHasAccentColour)?.FadeAccent(newColour, fadeDuration);
         }
 
-        private class StrongNestedHit : DrawableStrongNestedHit
+        public class StrongNestedHit : DrawableStrongNestedHit
         {
             public new DrawableDrumRoll ParentHitObject => (DrawableDrumRoll)base.ParentHitObject;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index 1e625d91d6..0df45c424d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRollTick.StrongNestedHit hitObject) => new StrongNestedHit(hitObject);
 
-        private class StrongNestedHit : DrawableStrongNestedHit
+        public class StrongNestedHit : DrawableStrongNestedHit
         {
             public new DrawableDrumRollTick ParentHitObject => (DrawableDrumRollTick)base.ParentHitObject;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 73ebd7c117..38cda69a46 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override DrawableStrongNestedHit CreateStrongNestedHit(Hit.StrongNestedHit hitObject) => new StrongNestedHit(hitObject);
 
-        private class StrongNestedHit : DrawableStrongNestedHit
+        public class StrongNestedHit : DrawableStrongNestedHit
         {
             public new DrawableHit ParentHitObject => (DrawableHit)base.ParentHitObject;
 

From 62da4eff37db8dfc1cfeaeac7d35190eab54356a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 18:07:59 +0100
Subject: [PATCH 07085/10326] Route new result callback via playfield

Follows route taken by osu! and catch (and required for proper pooling
support).
---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 8682495b41..6b001d6c70 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -149,6 +149,12 @@ namespace osu.Game.Rulesets.Taiko.UI
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            NewResult += OnNewResult;
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -208,7 +214,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     break;
 
                 case DrawableTaikoHitObject taikoObject:
-                    h.OnNewResult += OnNewResult;
                     topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
                     base.Add(h);
                     break;
@@ -226,7 +231,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     return barLinePlayfield.Remove(barLine);
 
                 case DrawableTaikoHitObject _:
-                    h.OnNewResult -= OnNewResult;
                     // todo: consider tidying of proxied content if required.
                     return base.Remove(h);
 

From 5d575d2a9b8dd95d8c06e9ef9f1b91214b7794d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 18:11:29 +0100
Subject: [PATCH 07086/10326] Accept proxied content via OnNewDrawableHitObject

In the non-pooled case, `OnNewDrawableHitObject()` will be called
automatically on each new DHO via `Playfield.Add(DrawableHitObject)`.

In the pooled case, it will be called via `Playfield`'s implementation
of `GetPooledDrawableRepresentation(HitObject, DrawableHitObject)`.
---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 6b001d6c70..b3bf0974c3 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -155,6 +155,14 @@ namespace osu.Game.Rulesets.Taiko.UI
             NewResult += OnNewResult;
         }
 
+        protected override void OnNewDrawableHitObject(DrawableHitObject drawableHitObject)
+        {
+            base.OnNewDrawableHitObject(drawableHitObject);
+
+            var taikoObject = (DrawableTaikoHitObject)drawableHitObject;
+            topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -213,8 +221,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     barLinePlayfield.Add(barLine);
                     break;
 
-                case DrawableTaikoHitObject taikoObject:
-                    topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
+                case DrawableTaikoHitObject _:
                     base.Add(h);
                     break;
 
@@ -231,7 +238,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     return barLinePlayfield.Remove(barLine);
 
                 case DrawableTaikoHitObject _:
-                    // todo: consider tidying of proxied content if required.
                     return base.Remove(h);
 
                 default:

From b24fc1922e11b103243ef24e361609376c353b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 18:16:05 +0100
Subject: [PATCH 07087/10326] Enable pooling for taiko DHOs

---
 .../UI/DrawableTaikoRuleset.cs                 | 18 +-----------------
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 9cf931ee0a..ed8e6859a2 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Taiko.Replays;
 using osu.Framework.Input;
@@ -64,22 +63,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         protected override Playfield CreatePlayfield() => new TaikoPlayfield(Beatmap.ControlPointInfo);
 
-        public override DrawableHitObject<TaikoHitObject> CreateDrawableRepresentation(TaikoHitObject h)
-        {
-            switch (h)
-            {
-                case Hit hit:
-                    return new DrawableHit(hit);
-
-                case DrumRoll drumRoll:
-                    return new DrawableDrumRoll(drumRoll);
-
-                case Swell swell:
-                    return new DrawableSwell(swell);
-            }
-
-            return null;
-        }
+        public override DrawableHitObject<TaikoHitObject> CreateDrawableRepresentation(TaikoHitObject h) => null;
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new TaikoFramedReplayInputHandler(replay);
 
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index b3bf0974c3..148ec7755e 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -147,6 +147,18 @@ namespace osu.Game.Rulesets.Taiko.UI
                 },
                 drumRollHitContainer.CreateProxy(),
             };
+
+            RegisterPool<Hit, DrawableHit>(50);
+            RegisterPool<Hit.StrongNestedHit, DrawableHit.StrongNestedHit>(50);
+
+            RegisterPool<DrumRoll, DrawableDrumRoll>(5);
+            RegisterPool<DrumRoll.StrongNestedHit, DrawableDrumRoll.StrongNestedHit>(5);
+
+            RegisterPool<DrumRollTick, DrawableDrumRollTick>(100);
+            RegisterPool<DrumRollTick.StrongNestedHit, DrawableDrumRollTick.StrongNestedHit>(100);
+
+            RegisterPool<Swell, DrawableSwell>(5);
+            RegisterPool<SwellTick, DrawableSwellTick>(100);
         }
 
         protected override void LoadComplete()

From 6e21806873976561322499602e516ee0a6c29d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 18:25:49 +0100
Subject: [PATCH 07088/10326] Adjust sample test to pass with pooling

---
 .../TestSceneSampleOutput.cs                  | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
index 4ba9c447fb..296468d98d 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.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 System.Linq;
 using osu.Framework.Testing;
 using osu.Game.Audio;
@@ -18,24 +19,33 @@ namespace osu.Game.Rulesets.Taiko.Tests
         public override void SetUpSteps()
         {
             base.SetUpSteps();
-            AddAssert("has correct samples", () =>
+
+            var expectedSampleNames = new[]
             {
-                var names = Player.DrawableRuleset.Playfield.AllHitObjects.OfType<DrawableHit>().Select(h => string.Join(',', h.GetSamples().Select(s => s.Name)));
+                string.Empty,
+                string.Empty,
+                string.Empty,
+                string.Empty,
+                HitSampleInfo.HIT_FINISH,
+                HitSampleInfo.HIT_WHISTLE,
+                HitSampleInfo.HIT_WHISTLE,
+                HitSampleInfo.HIT_WHISTLE,
+            };
+            var actualSampleNames = new List<string>();
 
-                var expected = new[]
-                {
-                    string.Empty,
-                    string.Empty,
-                    string.Empty,
-                    string.Empty,
-                    HitSampleInfo.HIT_FINISH,
-                    HitSampleInfo.HIT_WHISTLE,
-                    HitSampleInfo.HIT_WHISTLE,
-                    HitSampleInfo.HIT_WHISTLE,
-                };
+            // due to pooling we can't access all samples right away due to object re-use,
+            // so we need to collect as we go.
+            AddStep("collect sample names", () => Player.DrawableRuleset.Playfield.NewResult += (dho, _) =>
+            {
+                if (!(dho is DrawableHit h))
+                    return;
 
-                return names.SequenceEqual(expected);
+                actualSampleNames.Add(string.Join(',', h.GetSamples().Select(s => s.Name)));
             });
+
+            AddUntilStep("all samples collected", () => actualSampleNames.Count == expectedSampleNames.Length);
+
+            AddAssert("samples are correct", () => actualSampleNames.SequenceEqual(expectedSampleNames));
         }
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TaikoBeatmapConversionTest().GetBeatmap("sample-to-type-conversions");

From a8569fe15cdf663685d960e69356205b11944f8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 13:35:46 +0900
Subject: [PATCH 07089/10326] Fix a couple of simple cases of incorrect
 TextureLoaderStore initialisation

---
 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs  | 3 ++-
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index a9b2a15b35..b13b20dae2 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -13,6 +13,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
+using osu.Framework.Platform;
 using osu.Game.Rulesets.Configuration;
 
 namespace osu.Game.Rulesets.UI
@@ -46,7 +47,7 @@ namespace osu.Game.Rulesets.UI
 
             if (resources != null)
             {
-                TextureStore = new TextureStore(new TextureLoaderStore(new NamespacedResourceStore<byte[]>(resources, @"Textures")));
+                TextureStore = new TextureStore(parent.Get<GameHost>().CreateTextureLoaderStore(new NamespacedResourceStore<byte[]>(resources, @"Textures")));
                 CacheAs(TextureStore = new FallbackTextureStore(TextureStore, parent.Get<TextureStore>()));
 
                 SampleStore = parent.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, @"Samples"));
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 4bc28e6cef..af4615c895 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Platform;
 using osu.Game.IO;
 using osu.Game.Screens.Play;
 
@@ -59,12 +60,12 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(FileStore fileStore, GameplayClock clock, CancellationToken? cancellationToken)
+        private void load(FileStore fileStore, GameplayClock clock, CancellationToken? cancellationToken, GameHost host)
         {
             if (clock != null)
                 Clock = clock;
 
-            dependencies.Cache(new TextureStore(new TextureLoaderStore(fileStore.Store), false, scaleAdjust: 1));
+            dependencies.Cache(new TextureStore(host.CreateTextureLoaderStore(fileStore.Store), false, scaleAdjust: 1));
 
             foreach (var layer in Storyboard.Layers)
             {

From 7c804be4d3c0dd28ba9cbe3c8eabb771bcc32670 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 14:06:33 +0900
Subject: [PATCH 07090/10326] Rename textureStore to make its purpose more
 clear

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

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 33e024fa28..c9d507d068 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Beatmaps
         private readonly RulesetStore rulesets;
         private readonly BeatmapStore beatmaps;
         private readonly AudioManager audioManager;
-        private readonly TextureStore textureStore;
+        private readonly LargeTextureStore largeTextureStore;
         private readonly ITrackStore trackStore;
 
         [CanBeNull]
@@ -92,7 +92,7 @@ namespace osu.Game.Beatmaps
             if (performOnlineLookups)
                 onlineLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
 
-            textureStore = new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store));
+            largeTextureStore = new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store));
             trackStore = audioManager.GetTrackStore(Files.Store);
         }
 
@@ -302,7 +302,7 @@ namespace osu.Game.Beatmaps
 
                 beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 
-                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, textureStore, trackStore, beatmapInfo, audioManager));
+                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, largeTextureStore, trackStore, beatmapInfo, audioManager));
 
                 return working;
             }

From 0ffbe12fcc2c13af237d71aa06d1e0ccc170651b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 14:06:50 +0900
Subject: [PATCH 07091/10326] Expose resources to beatmaps in a saner way

---
 osu.Game/Beatmaps/BeatmapManager.cs           | 16 ++++++--
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs | 28 +++++--------
 osu.Game/Beatmaps/IBeatmapResourceProvider.cs | 40 +++++++++++++++++++
 3 files changed, 64 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Beatmaps/IBeatmapResourceProvider.cs

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index c9d507d068..4b334952ef 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -16,6 +16,7 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
 using osu.Framework.Lists;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -28,8 +29,8 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Users;
 using osu.Game.Skinning;
+using osu.Game.Users;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
 namespace osu.Game.Beatmaps
@@ -38,7 +39,7 @@ namespace osu.Game.Beatmaps
     /// Handles the storage and retrieval of Beatmaps/WorkingBeatmaps.
     /// </summary>
     [ExcludeFromDynamicCompile]
-    public partial class BeatmapManager : DownloadableArchiveModelManager<BeatmapSetInfo, BeatmapSetFileInfo>, IDisposable
+    public partial class BeatmapManager : DownloadableArchiveModelManager<BeatmapSetInfo, BeatmapSetFileInfo>, IDisposable, IBeatmapResourceProvider
     {
         /// <summary>
         /// Fired when a single difficulty has been hidden.
@@ -71,6 +72,8 @@ namespace osu.Game.Beatmaps
         private readonly LargeTextureStore largeTextureStore;
         private readonly ITrackStore trackStore;
 
+        private readonly GameHost host;
+
         [CanBeNull]
         private readonly BeatmapOnlineLookupQueue onlineLookupQueue;
 
@@ -80,6 +83,7 @@ namespace osu.Game.Beatmaps
         {
             this.rulesets = rulesets;
             this.audioManager = audioManager;
+            this.host = host;
 
             DefaultBeatmap = defaultBeatmap;
 
@@ -302,7 +306,7 @@ namespace osu.Game.Beatmaps
 
                 beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 
-                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, largeTextureStore, trackStore, beatmapInfo, audioManager));
+                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(beatmapInfo, this));
 
                 return working;
             }
@@ -492,6 +496,12 @@ namespace osu.Game.Beatmaps
             onlineLookupQueue?.Dispose();
         }
 
+        TextureStore IBeatmapResourceProvider.LargeTextureStore => largeTextureStore;
+        ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
+        AudioManager IBeatmapResourceProvider.AudioManager => audioManager;
+        IResourceStore<byte[]> IBeatmapResourceProvider.Files => Files.Store;
+        IResourceStore<TextureUpload> IBeatmapResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+
         /// <summary>
         /// A dummy WorkingBeatmap for the purpose of retrieving a beatmap for star difficulty calculation.
         /// </summary>
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index f5c0d97c1f..1d9a496e36 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -3,10 +3,8 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.Formats;
@@ -21,16 +19,12 @@ namespace osu.Game.Beatmaps
         [ExcludeFromDynamicCompile]
         private class BeatmapManagerWorkingBeatmap : WorkingBeatmap
         {
-            private readonly IResourceStore<byte[]> store;
-            private readonly TextureStore textureStore;
-            private readonly ITrackStore trackStore;
+            private readonly IBeatmapResourceProvider resources;
 
-            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, ITrackStore trackStore, BeatmapInfo beatmapInfo, AudioManager audioManager)
-                : base(beatmapInfo, audioManager)
+            public BeatmapManagerWorkingBeatmap(BeatmapInfo beatmapInfo, IBeatmapResourceProvider resources)
+                : base(beatmapInfo, resources?.AudioManager)
             {
-                this.store = store;
-                this.textureStore = textureStore;
-                this.trackStore = trackStore;
+                this.resources = resources;
             }
 
             protected override IBeatmap GetBeatmap()
@@ -40,7 +34,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    using (var stream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapInfo.Path))))
                         return Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
                 }
                 catch (Exception e)
@@ -61,7 +55,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return textureStore.Get(getPathForFile(Metadata.BackgroundFile));
+                    return resources.LargeTextureStore.Get(getPathForFile(Metadata.BackgroundFile));
                 }
                 catch (Exception e)
                 {
@@ -77,7 +71,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return trackStore.Get(getPathForFile(Metadata.AudioFile));
+                    return resources.Tracks.Get(getPathForFile(Metadata.AudioFile));
                 }
                 catch (Exception e)
                 {
@@ -93,7 +87,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    var trackData = store.GetStream(getPathForFile(Metadata.AudioFile));
+                    var trackData = resources.Files.GetStream(getPathForFile(Metadata.AudioFile));
                     return trackData == null ? null : new Waveform(trackData);
                 }
                 catch (Exception e)
@@ -109,7 +103,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    using (var stream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapInfo.Path))))
                     {
                         var decoder = Decoder.GetDecoder<Storyboard>(stream);
 
@@ -118,7 +112,7 @@ namespace osu.Game.Beatmaps
                             storyboard = decoder.Decode(stream);
                         else
                         {
-                            using (var secondaryStream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
+                            using (var secondaryStream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
                                 storyboard = decoder.Decode(stream, secondaryStream);
                         }
                     }
@@ -138,7 +132,7 @@ namespace osu.Game.Beatmaps
             {
                 try
                 {
-                    return new LegacyBeatmapSkin(BeatmapInfo, store, AudioManager);
+                    return new LegacyBeatmapSkin(BeatmapInfo, resources.Files, AudioManager);
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
new file mode 100644
index 0000000000..43d1a60784
--- /dev/null
+++ b/osu.Game/Beatmaps/IBeatmapResourceProvider.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 osu.Framework.Audio;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+
+namespace osu.Game.Beatmaps
+{
+    public interface IBeatmapResourceProvider
+    {
+        /// <summary>
+        /// Retrieve a global large texture store, used for loading beatmap backgrounds.
+        /// </summary>
+        TextureStore LargeTextureStore { get; }
+
+        /// <summary>
+        /// Access a global track store for retrieving beatmap tracks from.
+        /// </summary>
+        ITrackStore Tracks { get; }
+
+        /// <summary>
+        /// Retrieve the game-wide audio manager.
+        /// </summary>
+        AudioManager AudioManager { get; }
+
+        /// <summary>
+        /// Access game-wide user files.
+        /// </summary>
+        IResourceStore<byte[]> Files { get; }
+
+        /// <summary>
+        /// Create a texture loader store based on an underlying data store.
+        /// </summary>
+        /// <param name="underlyingStore">The underlying provider of texture data (in arbitrary image formats).</param>
+        /// <returns>A texture loader store.</returns>
+        IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore);
+    }
+}

From a5bcf1dc20b31f6fb318dd3bdc7f7be40ae078f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 15:14:32 +0900
Subject: [PATCH 07092/10326] Expose resources to skin via interface (and share
 common pieces with beatmap)

---
 .../Gameplay/TestSceneStoryboardSamples.cs    | 28 +++++++++++-------
 osu.Game/Beatmaps/BeatmapManager.cs           |  6 ++--
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs |  2 +-
 osu.Game/Beatmaps/IBeatmapResourceProvider.cs | 22 ++------------
 osu.Game/IO/IStorageResourceProvider.cs       | 29 +++++++++++++++++++
 osu.Game/Skinning/DefaultLegacySkin.cs        |  6 ++--
 osu.Game/Skinning/LegacyBeatmapSkin.cs        |  6 ++--
 osu.Game/Skinning/LegacySkin.cs               | 11 ++++---
 osu.Game/Skinning/SkinManager.cs              | 19 ++++++++----
 .../Tests/Beatmaps/HitObjectSampleTest.cs     | 20 +++++++++----
 .../Tests/Visual/LegacySkinPlayerTestScene.cs |  5 ++--
 osu.Game/Tests/Visual/SkinnableTestScene.cs   | 23 ++++++++++-----
 12 files changed, 109 insertions(+), 68 deletions(-)
 create mode 100644 osu.Game/IO/IStorageResourceProvider.cs

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index d46769a7c0..36f99c5599 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -10,9 +10,11 @@ using NUnit.Framework;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics.Audio;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Audio;
+using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -27,7 +29,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Gameplay
 {
     [HeadlessTest]
-    public class TestSceneStoryboardSamples : OsuTestScene
+    public class TestSceneStoryboardSamples : OsuTestScene, IStorageResourceProvider
     {
         [Test]
         public void TestRetrieveTopLevelSample()
@@ -35,7 +37,7 @@ namespace osu.Game.Tests.Gameplay
             ISkin skin = null;
             SampleChannel channel = null;
 
-            AddStep("create skin", () => skin = new TestSkin("test-sample", Audio));
+            AddStep("create skin", () => skin = new TestSkin("test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("test-sample")));
 
             AddAssert("sample is non-null", () => channel != null);
@@ -47,7 +49,7 @@ namespace osu.Game.Tests.Gameplay
             ISkin skin = null;
             SampleChannel channel = null;
 
-            AddStep("create skin", () => skin = new TestSkin("folder/test-sample", Audio));
+            AddStep("create skin", () => skin = new TestSkin("folder/test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("folder/test-sample")));
 
             AddAssert("sample is non-null", () => channel != null);
@@ -105,7 +107,7 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("setup storyboard sample", () =>
             {
-                Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, Audio);
+                Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, this);
                 SelectedMods.Value = new[] { testedMod };
 
                 var beatmapSkinSourceContainer = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
@@ -128,8 +130,8 @@ namespace osu.Game.Tests.Gameplay
 
         private class TestSkin : LegacySkin
         {
-            public TestSkin(string resourceName, AudioManager audioManager)
-                : base(DefaultLegacySkin.Info, new TestResourceStore(resourceName), audioManager, "skin.ini")
+            public TestSkin(string resourceName, IStorageResourceProvider resources)
+                : base(DefaultLegacySkin.Info, new TestResourceStore(resourceName), resources, "skin.ini")
             {
             }
         }
@@ -158,15 +160,15 @@ namespace osu.Game.Tests.Gameplay
 
         private class TestCustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
         {
-            private readonly AudioManager audio;
+            private readonly IStorageResourceProvider resources;
 
-            public TestCustomSkinWorkingBeatmap(RulesetInfo ruleset, AudioManager audio)
-                : base(ruleset, null, audio)
+            public TestCustomSkinWorkingBeatmap(RulesetInfo ruleset, IStorageResourceProvider resources)
+                : base(ruleset, null, resources.AudioManager)
             {
-                this.audio = audio;
+                this.resources = resources;
             }
 
-            protected override ISkin GetSkin() => new TestSkin("test-sample", audio);
+            protected override ISkin GetSkin() => new TestSkin("test-sample", resources);
         }
 
         private class TestDrawableStoryboardSample : DrawableStoryboardSample
@@ -176,5 +178,9 @@ namespace osu.Game.Tests.Gameplay
             {
             }
         }
+
+        public AudioManager AudioManager => Audio;
+        public IResourceStore<byte[]> Files => null;
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 4b334952ef..3cf691da9a 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -498,9 +498,9 @@ namespace osu.Game.Beatmaps
 
         TextureStore IBeatmapResourceProvider.LargeTextureStore => largeTextureStore;
         ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
-        AudioManager IBeatmapResourceProvider.AudioManager => audioManager;
-        IResourceStore<byte[]> IBeatmapResourceProvider.Files => Files.Store;
-        IResourceStore<TextureUpload> IBeatmapResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+        AudioManager IStorageResourceProvider.AudioManager => audioManager;
+        IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
+        IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
 
         /// <summary>
         /// A dummy WorkingBeatmap for the purpose of retrieving a beatmap for star difficulty calculation.
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 1d9a496e36..5d298dbccc 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Beatmaps
             {
                 try
                 {
-                    return new LegacyBeatmapSkin(BeatmapInfo, resources.Files, AudioManager);
+                    return new LegacyBeatmapSkin(BeatmapInfo, resources.Files, resources);
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
index 43d1a60784..dfea0c7a30 100644
--- a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
+++ b/osu.Game/Beatmaps/IBeatmapResourceProvider.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 osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
+using osu.Game.IO;
 
 namespace osu.Game.Beatmaps
 {
-    public interface IBeatmapResourceProvider
+    public interface IBeatmapResourceProvider : IStorageResourceProvider
     {
         /// <summary>
         /// Retrieve a global large texture store, used for loading beatmap backgrounds.
@@ -19,22 +18,5 @@ namespace osu.Game.Beatmaps
         /// Access a global track store for retrieving beatmap tracks from.
         /// </summary>
         ITrackStore Tracks { get; }
-
-        /// <summary>
-        /// Retrieve the game-wide audio manager.
-        /// </summary>
-        AudioManager AudioManager { get; }
-
-        /// <summary>
-        /// Access game-wide user files.
-        /// </summary>
-        IResourceStore<byte[]> Files { get; }
-
-        /// <summary>
-        /// Create a texture loader store based on an underlying data store.
-        /// </summary>
-        /// <param name="underlyingStore">The underlying provider of texture data (in arbitrary image formats).</param>
-        /// <returns>A texture loader store.</returns>
-        IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore);
     }
 }
diff --git a/osu.Game/IO/IStorageResourceProvider.cs b/osu.Game/IO/IStorageResourceProvider.cs
new file mode 100644
index 0000000000..cbd1039807
--- /dev/null
+++ b/osu.Game/IO/IStorageResourceProvider.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.Audio;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+
+namespace osu.Game.IO
+{
+    public interface IStorageResourceProvider
+    {
+        /// <summary>
+        /// Retrieve the game-wide audio manager.
+        /// </summary>
+        AudioManager AudioManager { get; }
+
+        /// <summary>
+        /// Access game-wide user files.
+        /// </summary>
+        IResourceStore<byte[]> Files { get; }
+
+        /// <summary>
+        /// Create a texture loader store based on an underlying data store.
+        /// </summary>
+        /// <param name="underlyingStore">The underlying provider of texture data (in arbitrary image formats).</param>
+        /// <returns>A texture loader store.</returns>
+        IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore);
+    }
+}
diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 2758a4cbba..4027cc650d 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.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.Audio;
 using osu.Framework.IO.Stores;
+using osu.Game.IO;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
     public class DefaultLegacySkin : LegacySkin
     {
-        public DefaultLegacySkin(IResourceStore<byte[]> storage, AudioManager audioManager)
-            : base(Info, storage, audioManager, string.Empty)
+        public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
+            : base(Info, storage, resources, string.Empty)
         {
             Configuration.CustomColours["SliderBall"] = new Color4(2, 170, 255, 255);
             Configuration.AddComboColours(
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index d647bc4a2d..fdcb81b574 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.IO.Stores;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
+using osu.Game.IO;
 using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Skinning
@@ -16,8 +16,8 @@ namespace osu.Game.Skinning
         protected override bool AllowManiaSkin => false;
         protected override bool UseCustomSampleBanks => true;
 
-        public LegacyBeatmapSkin(BeatmapInfo beatmap, IResourceStore<byte[]> storage, AudioManager audioManager)
-            : base(createSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), audioManager, beatmap.Path)
+        public LegacyBeatmapSkin(BeatmapInfo beatmap, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
+            : base(createSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), resources, beatmap.Path)
         {
             // Disallow default colours fallback on beatmap skins to allow using parent skin combo colours. (via SkinProvidingContainer)
             Configuration.AllowDefaultComboColoursFallback = false;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 80b2fef35c..5a7ad095f6 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using JetBrains.Annotations;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -54,12 +53,12 @@ namespace osu.Game.Skinning
 
         private readonly Dictionary<int, LegacyManiaSkinConfiguration> maniaConfigurations = new Dictionary<int, LegacyManiaSkinConfiguration>();
 
-        public LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager)
-            : this(skin, new LegacySkinResourceStore<SkinFileInfo>(skin, storage), audioManager, "skin.ini")
+        public LegacySkin(SkinInfo skin, IStorageResourceProvider resources)
+            : this(skin, new LegacySkinResourceStore<SkinFileInfo>(skin, resources.Files), resources, "skin.ini")
         {
         }
 
-        protected LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, string filename)
+        protected LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources, string filename)
             : base(skin)
         {
             using (var stream = storage?.GetStream(filename))
@@ -85,12 +84,12 @@ namespace osu.Game.Skinning
 
             if (storage != null)
             {
-                var samples = audioManager?.GetSampleStore(storage);
+                var samples = resources?.AudioManager?.GetSampleStore(storage);
                 if (samples != null)
                     samples.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
 
                 Samples = samples;
-                Textures = new TextureStore(new TextureLoaderStore(storage));
+                Textures = new TextureStore(resources?.CreateTextureLoaderStore(storage));
 
                 (storage as ResourceStore<byte[]>)?.AddExtension("ogg");
             }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 9b69a1eecd..2ee940c02d 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -22,15 +22,18 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Database;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 
 namespace osu.Game.Skinning
 {
     [ExcludeFromDynamicCompile]
-    public class SkinManager : ArchiveModelManager<SkinInfo, SkinFileInfo>, ISkinSource
+    public class SkinManager : ArchiveModelManager<SkinInfo, SkinFileInfo>, ISkinSource, IStorageResourceProvider
     {
         private readonly AudioManager audio;
 
+        private readonly GameHost host;
+
         private readonly IResourceStore<byte[]> legacyDefaultResources;
 
         public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin());
@@ -42,10 +45,12 @@ namespace osu.Game.Skinning
 
         protected override string ImportFromStablePath => "Skins";
 
-        public SkinManager(Storage storage, DatabaseContextFactory contextFactory, IIpcHost importHost, AudioManager audio, IResourceStore<byte[]> legacyDefaultResources)
-            : base(storage, contextFactory, new SkinStore(contextFactory, storage), importHost)
+        public SkinManager(Storage storage, DatabaseContextFactory contextFactory, GameHost host, AudioManager audio, IResourceStore<byte[]> legacyDefaultResources)
+            : base(storage, contextFactory, new SkinStore(contextFactory, storage), host)
         {
             this.audio = audio;
+            this.host = host;
+
             this.legacyDefaultResources = legacyDefaultResources;
 
             CurrentSkinInfo.ValueChanged += skin => CurrentSkin.Value = GetSkin(skin.NewValue);
@@ -148,9 +153,9 @@ namespace osu.Game.Skinning
                 return new DefaultSkin();
 
             if (skinInfo == DefaultLegacySkin.Info)
-                return new DefaultLegacySkin(legacyDefaultResources, audio);
+                return new DefaultLegacySkin(legacyDefaultResources, this);
 
-            return new LegacySkin(skinInfo, Files.Store, audio);
+            return new LegacySkin(skinInfo, this);
         }
 
         /// <summary>
@@ -169,5 +174,9 @@ namespace osu.Game.Skinning
         public SampleChannel GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => CurrentSkin.Value.GetConfig<TLookup, TValue>(lookup);
+
+        AudioManager IStorageResourceProvider.AudioManager => audio;
+        IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
+        IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
     }
 }
diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index e3557222d5..dd1979a7e3 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
@@ -25,7 +26,7 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Beatmaps
 {
     [HeadlessTest]
-    public abstract class HitObjectSampleTest : PlayerTestScene
+    public abstract class HitObjectSampleTest : PlayerTestScene, IStorageResourceProvider
     {
         protected abstract IResourceStore<byte[]> Resources { get; }
         protected LegacySkin Skin { get; private set; }
@@ -58,7 +59,7 @@ namespace osu.Game.Tests.Beatmaps
         protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestBeatmap;
 
         protected sealed override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-            => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, Audio);
+            => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, this);
 
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(false);
 
@@ -109,7 +110,7 @@ namespace osu.Game.Tests.Beatmaps
                 };
 
                 // Need to refresh the cached skin source to refresh the skin resource store.
-                dependencies.SkinSource = new SkinProvidingContainer(Skin = new LegacySkin(userSkinInfo, userSkinResourceStore, Audio));
+                dependencies.SkinSource = new SkinProvidingContainer(Skin = new LegacySkin(userSkinInfo, this));
             });
         }
 
@@ -122,6 +123,10 @@ namespace osu.Game.Tests.Beatmaps
         protected void AssertNoLookup(string name) => AddAssert($"\"{name}\" not looked up",
             () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && !userSkinResourceStore.PerformedLookups.Contains(name));
 
+        public AudioManager AudioManager => Audio;
+        public IResourceStore<byte[]> Files => userSkinResourceStore;
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
+
         private class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
         {
             public ISkinSource SkinSource;
@@ -191,14 +196,17 @@ namespace osu.Game.Tests.Beatmaps
             private readonly BeatmapInfo skinBeatmapInfo;
             private readonly IResourceStore<byte[]> resourceStore;
 
-            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio)
-                : base(beatmap, storyboard, referenceClock, audio)
+            private readonly IStorageResourceProvider resources;
+
+            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, IStorageResourceProvider resources)
+                : base(beatmap, storyboard, referenceClock, resources.AudioManager)
             {
                 this.skinBeatmapInfo = skinBeatmapInfo;
                 this.resourceStore = resourceStore;
+                this.resources = resources;
             }
 
-            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, AudioManager);
+            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, resources);
         }
     }
 }
diff --git a/osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs b/osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs
index 054f72400e..c186525757 100644
--- a/osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.IO.Stores;
 using osu.Game.Rulesets;
 using osu.Game.Skinning;
@@ -18,9 +17,9 @@ namespace osu.Game.Tests.Visual
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => new SkinProvidingPlayer(legacySkinSource);
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuGameBase game)
+        private void load(OsuGameBase game, SkinManager skins)
         {
-            var legacySkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), audio);
+            var legacySkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), skins);
             legacySkinSource = new SkinProvidingContainer(legacySkin);
         }
 
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 68098f9d3b..3a9c33788a 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -13,8 +13,10 @@ using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
+using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
+using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osuTK;
@@ -22,13 +24,16 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class SkinnableTestScene : OsuGridTestScene
+    public abstract class SkinnableTestScene : OsuGridTestScene, IStorageResourceProvider
     {
         private Skin metricsSkin;
         private Skin defaultSkin;
         private Skin specialSkin;
         private Skin oldSkin;
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         protected SkinnableTestScene()
             : base(2, 3)
         {
@@ -39,10 +44,10 @@ namespace osu.Game.Tests.Visual
         {
             var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly);
 
-            metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
-            defaultSkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), audio);
-            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);
+            metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), this, true);
+            defaultSkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), this);
+            specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), this, true);
+            oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), this, true);
         }
 
         private readonly List<Drawable> createdDrawables = new List<Drawable>();
@@ -147,6 +152,10 @@ namespace osu.Game.Tests.Visual
 
         protected virtual IBeatmap CreateBeatmapForSkinProvider() => CreateWorkingBeatmap(Ruleset.Value).GetPlayableBeatmap(Ruleset.Value);
 
+        public AudioManager AudioManager => Audio;
+        public IResourceStore<byte[]> Files => null;
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+
         private class OutlineBox : CompositeDrawable
         {
             public OutlineBox()
@@ -170,8 +179,8 @@ namespace osu.Game.Tests.Visual
         {
             private readonly bool extrapolateAnimations;
 
-            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, bool extrapolateAnimations)
-                : base(skin, storage, audioManager, "skin.ini")
+            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources, bool extrapolateAnimations)
+                : base(skin, storage, resources, "skin.ini")
             {
                 this.extrapolateAnimations = extrapolateAnimations;
             }

From 82cf58353ce15e45770bea510181769abeaee846 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 15:38:20 +0900
Subject: [PATCH 07093/10326] Fix incorrect joinedroom null checks

---
 osu.Game/Screens/Multi/Components/RoomManager.cs                | 2 +-
 .../Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 276a5a6148..482ee5492c 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Multi.Components
         {
             currentJoinRoomRequest?.Cancel();
 
-            if (JoinedRoom == null)
+            if (JoinedRoom.Value == null)
                 return;
 
             api.Queue(new PartRoomRequest(joinedRoom.Value));
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index b81ca7aade..e0fca3ce4c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         public override void PartRoom()
         {
-            if (JoinedRoom == null)
+            if (JoinedRoom.Value == null)
                 return;
 
             var joinedRoom = JoinedRoom.Value;

From a59124dd938a8c98a276c85299cbbb144f87b190 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:18:39 +0900
Subject: [PATCH 07094/10326] Make room duration/endsat nullable

---
 .../Visual/Multiplayer/TestSceneRoomStatus.cs    | 12 +++++++++---
 osu.Game/Online/Multiplayer/Room.cs              | 16 +++++++++++-----
 .../Screens/Multi/Components/RoomStatusInfo.cs   | 11 +++++++++--
 .../Match/Components/MatchSettingsOverlay.cs     |  2 +-
 osu.Game/Screens/Multi/MultiplayerComposite.cs   |  4 ++--
 .../Multi/Timeshift/TimeshiftReadyButton.cs      |  4 ++--
 6 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
index c1dfb94464..a6dd1437f7 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
@@ -22,22 +22,28 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     new DrawableRoom(new Room
                     {
-                        Name = { Value = "Room 1" },
+                        Name = { Value = "Open - ending in 1 day" },
                         Status = { Value = new RoomStatusOpen() },
                         EndDate = { Value = DateTimeOffset.Now.AddDays(1) }
                     }) { MatchingFilter = true },
                     new DrawableRoom(new Room
                     {
-                        Name = { Value = "Room 2" },
+                        Name = { Value = "Playing - ending in 1 day" },
                         Status = { Value = new RoomStatusPlaying() },
                         EndDate = { Value = DateTimeOffset.Now.AddDays(1) }
                     }) { MatchingFilter = true },
                     new DrawableRoom(new Room
                     {
-                        Name = { Value = "Room 3" },
+                        Name = { Value = "Ended" },
                         Status = { Value = new RoomStatusEnded() },
                         EndDate = { Value = DateTimeOffset.Now }
                     }) { MatchingFilter = true },
+                    new DrawableRoom(new Room
+                    {
+                        Name = { Value = "Open (realtime)" },
+                        Status = { Value = new RoomStatusOpen() },
+                        Category = { Value = RoomCategory.Realtime }
+                    }) { MatchingFilter = true },
                 }
             };
         }
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 9a21543b2e..ee8992e399 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Online.Multiplayer
 
         [Cached]
         [JsonIgnore]
-        public readonly Bindable<TimeSpan> Duration = new Bindable<TimeSpan>(TimeSpan.FromMinutes(30));
+        public readonly Bindable<TimeSpan?> Duration = new Bindable<TimeSpan?>();
 
         [Cached]
         [JsonIgnore]
@@ -78,16 +78,22 @@ namespace osu.Game.Online.Multiplayer
         }
 
         [JsonProperty("duration")]
-        private int duration
+        private int? duration
         {
-            get => (int)Duration.Value.TotalMinutes;
-            set => Duration.Value = TimeSpan.FromMinutes(value);
+            get => (int?)Duration.Value?.TotalMinutes;
+            set
+            {
+                if (value == null)
+                    Duration.Value = null;
+                else
+                    Duration.Value = TimeSpan.FromMinutes(value.Value);
+            }
         }
 
         // Only supports retrieval for now
         [Cached]
         [JsonProperty("ends_at")]
-        public readonly Bindable<DateTimeOffset> EndDate = new Bindable<DateTimeOffset>();
+        public readonly Bindable<DateTimeOffset?> EndDate = new Bindable<DateTimeOffset?>();
 
         // Todo: Find a better way to do this (https://github.com/ppy/osu-framework/issues/1930)
         [JsonProperty("max_attempts", DefaultValueHandling = DefaultValueHandling.Ignore)]
diff --git a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs b/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
index d799f846c2..b5676692a4 100644
--- a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
+++ b/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
@@ -48,16 +48,23 @@ namespace osu.Game.Screens.Multi.Components
 
         private class EndDatePart : DrawableDate
         {
-            public readonly IBindable<DateTimeOffset> EndDate = new Bindable<DateTimeOffset>();
+            public readonly IBindable<DateTimeOffset?> EndDate = new Bindable<DateTimeOffset?>();
 
             public EndDatePart()
                 : base(DateTimeOffset.UtcNow)
             {
-                EndDate.BindValueChanged(date => Date = date.NewValue);
+                EndDate.BindValueChanged(date =>
+                {
+                    // If null, set a very large future date to prevent unnecessary schedules.
+                    Date = date.NewValue ?? DateTimeOffset.Now.AddYears(1);
+                }, true);
             }
 
             protected override string Format()
             {
+                if (EndDate.Value == null)
+                    return string.Empty;
+
                 var diffToNow = Date.Subtract(DateTimeOffset.Now);
 
                 if (diffToNow.TotalSeconds < -5)
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index b8003b9774..1859e8db8a 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -325,7 +325,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                 Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
                 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);
+                Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue ?? TimeSpan.FromMinutes(30), true);
 
                 playlist.Items.BindTo(Playlist);
                 Playlist.BindCollectionChanged(onPlaylistChanged, true);
diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/Multi/MultiplayerComposite.cs
index e612e77748..6e0c69d712 100644
--- a/osu.Game/Screens/Multi/MultiplayerComposite.cs
+++ b/osu.Game/Screens/Multi/MultiplayerComposite.cs
@@ -40,12 +40,12 @@ namespace osu.Game.Screens.Multi
         protected Bindable<int?> MaxParticipants { get; private set; }
 
         [Resolved(typeof(Room))]
-        protected Bindable<DateTimeOffset> EndDate { get; private set; }
+        protected Bindable<DateTimeOffset?> EndDate { get; private set; }
 
         [Resolved(typeof(Room))]
         protected Bindable<RoomAvailability> Availability { get; private set; }
 
         [Resolved(typeof(Room))]
-        protected Bindable<TimeSpan> Duration { get; private set; }
+        protected Bindable<TimeSpan?> Duration { get; private set; }
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
index ba639c29f4..c878451eee 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Multi.Timeshift
     public class TimeshiftReadyButton : ReadyButton
     {
         [Resolved(typeof(Room), nameof(Room.EndDate))]
-        private Bindable<DateTimeOffset> endDate { get; set; }
+        private Bindable<DateTimeOffset?> endDate { get; set; }
 
         public TimeshiftReadyButton()
         {
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         {
             base.Update();
 
-            Enabled.Value = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
+            Enabled.Value = endDate.Value != null && DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
         }
     }
 }

From c3d1eaf36dec71ff703f623b1f274192e6f1275c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:21:05 +0900
Subject: [PATCH 07095/10326] Make RealtimeMultiplayerTestScene abstract

---
 .../RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
index b52106551e..aec70d8be4 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
@@ -12,7 +12,7 @@ using osu.Game.Screens.Multi.RealtimeMultiplayer;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
-    public class RealtimeMultiplayerTestScene : MultiplayerTestScene
+    public abstract class RealtimeMultiplayerTestScene : MultiplayerTestScene
     {
         [Cached(typeof(StatefulMultiplayerClient))]
         public TestRealtimeMultiplayerClient Client { get; }
@@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 
         private readonly bool joinRoom;
 
-        public RealtimeMultiplayerTestScene(bool joinRoom = true)
+        protected RealtimeMultiplayerTestScene(bool joinRoom = true)
         {
             this.joinRoom = joinRoom;
             base.Content.Add(content = new TestRealtimeRoomContainer { RelativeSizeAxes = Axes.Both });

From 64a32723f3b544fec8f02b120f00986ffcd3e65e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:23:42 +0900
Subject: [PATCH 07096/10326] One more case

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

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index ee8992e399..e3444d6b7e 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Online.Multiplayer
             ParticipantCount.Value = other.ParticipantCount.Value;
             EndDate.Value = other.EndDate.Value;
 
-            if (DateTimeOffset.Now >= EndDate.Value)
+            if (EndDate.Value != null && DateTimeOffset.Now >= EndDate.Value)
                 Status.Value = new RoomStatusEnded();
 
             if (!Playlist.SequenceEqual(other.Playlist))

From 5d73359bd7c0e95a9e18c202319d0ecf77071e18 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:35:19 +0900
Subject: [PATCH 07097/10326] Make participant count non-nullable

---
 osu.Game/Online/Multiplayer/Room.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 9a21543b2e..5930a624bc 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -67,15 +67,8 @@ namespace osu.Game.Online.Multiplayer
         public readonly BindableList<User> RecentParticipants = new BindableList<User>();
 
         [Cached]
-        public readonly Bindable<int> ParticipantCount = new Bindable<int>();
-
-        // todo: TEMPORARY
         [JsonProperty("participant_count")]
-        private int? participantCount
-        {
-            get => ParticipantCount.Value;
-            set => ParticipantCount.Value = value ?? 0;
-        }
+        public readonly Bindable<int> ParticipantCount = new Bindable<int>();
 
         [JsonProperty("duration")]
         private int duration

From d096f2f8f6445eb3524df9612e8d7a891528bebe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 16:39:46 +0900
Subject: [PATCH 07098/10326] Fix potential cross-thread operation during chat
 channel load

The callbacks are scheduled to the API thread, but hooked up in BDL
load. This causes a potential case of cross-thread collection
enumeration.

I've tested and it seems like the schedule logic should be fine for
short term. Longer term, we probably want to re-think how this works so
background operations aren't performed on the `DrawableChannel` in the
first place (chat shouldn't have an overhead like this when not
visible).

Closes #11231.
---
 osu.Game/Overlays/Chat/DrawableChannel.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index d63faebae4..5926d11c03 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.Chat
             Colour = colours.ChatBlue.Lighten(0.7f),
         };
 
-        private void newMessagesArrived(IEnumerable<Message> newMessages)
+        private void newMessagesArrived(IEnumerable<Message> newMessages) => Schedule(() =>
         {
             if (newMessages.Min(m => m.Id) < chatLines.Max(c => c.Message.Id))
             {
@@ -155,9 +155,9 @@ namespace osu.Game.Overlays.Chat
 
             if (shouldScrollToEnd)
                 scrollToEnd();
-        }
+        });
 
-        private void pendingMessageResolved(Message existing, Message updated)
+        private void pendingMessageResolved(Message existing, Message updated) => Schedule(() =>
         {
             var found = chatLines.LastOrDefault(c => c.Message == existing);
 
@@ -169,12 +169,12 @@ namespace osu.Game.Overlays.Chat
                 found.Message = updated;
                 ChatLineFlow.Add(found);
             }
-        }
+        });
 
-        private void messageRemoved(Message removed)
+        private void messageRemoved(Message removed) => Schedule(() =>
         {
             chatLines.FirstOrDefault(c => c.Message == removed)?.FadeColour(Color4.Red, 400).FadeOut(600).Expire();
-        }
+        });
 
         private IEnumerable<ChatLine> chatLines => ChatLineFlow.Children.OfType<ChatLine>();
 

From a021aaf54673acf78c5272d077e757b1ded87bc8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:42:21 +0900
Subject: [PATCH 07099/10326] Fix room category being serialised as ints

---
 osu.Game/Online/Multiplayer/Room.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 9a21543b2e..53ae142ad4 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -35,9 +35,22 @@ namespace osu.Game.Online.Multiplayer
         public readonly Bindable<int> ChannelId = new Bindable<int>();
 
         [Cached]
-        [JsonProperty("category")]
+        [JsonIgnore]
         public readonly Bindable<RoomCategory> Category = new Bindable<RoomCategory>();
 
+        // Todo: osu-framework bug (https://github.com/ppy/osu-framework/issues/4106)
+        [JsonProperty("category")]
+        private string categoryString
+        {
+            get => Category.Value.ToString().ToLower();
+            set
+            {
+                if (!Enum.TryParse<RoomCategory>(value, true, out var enumValue))
+                    enumValue = RoomCategory.Normal;
+                Category.Value = enumValue;
+            }
+        }
+
         [Cached]
         [JsonIgnore]
         public readonly Bindable<TimeSpan> Duration = new Bindable<TimeSpan>(TimeSpan.FromMinutes(30));

From e23d81bfc64594c80d21ea1043ec085a47161f25 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:56:45 +0900
Subject: [PATCH 07100/10326] Use enum property

---
 .../Converters/SnakeCaseStringEnumConverter.cs   | 16 ++++++++++++++++
 osu.Game/Online/Multiplayer/Room.cs              | 13 +++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.cs

diff --git a/osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.cs b/osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.cs
new file mode 100644
index 0000000000..1d82a5bc87
--- /dev/null
+++ b/osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.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 Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+
+namespace osu.Game.IO.Serialization.Converters
+{
+    public class SnakeCaseStringEnumConverter : StringEnumConverter
+    {
+        public SnakeCaseStringEnumConverter()
+        {
+            NamingStrategy = new SnakeCaseNamingStrategy();
+        }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 53ae142ad4..66e3e8975a 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.IO.Serialization.Converters;
 using osu.Game.Online.Multiplayer.GameTypes;
 using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Users;
@@ -40,15 +41,11 @@ namespace osu.Game.Online.Multiplayer
 
         // Todo: osu-framework bug (https://github.com/ppy/osu-framework/issues/4106)
         [JsonProperty("category")]
-        private string categoryString
+        [JsonConverter(typeof(SnakeCaseStringEnumConverter))]
+        private RoomCategory category
         {
-            get => Category.Value.ToString().ToLower();
-            set
-            {
-                if (!Enum.TryParse<RoomCategory>(value, true, out var enumValue))
-                    enumValue = RoomCategory.Normal;
-                Category.Value = enumValue;
-            }
+            get => Category.Value;
+            set => Category.Value = value;
         }
 
         [Cached]

From eb46c9ce9be47341a18e08fedeeb65408ac5847c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 17:11:30 +0900
Subject: [PATCH 07101/10326] Fix metadata lost in beatmapset deserialisation

---
 .../Online/API/Requests/Responses/APIBeatmapSet.cs  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
index 6d0160fbc4..720d6bfff4 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public BeatmapSetInfo ToBeatmapSet(RulesetStore rulesets)
         {
-            return new BeatmapSetInfo
+            var beatmapSet = new BeatmapSetInfo
             {
                 OnlineBeatmapSetID = OnlineBeatmapSetID,
                 Metadata = this,
@@ -104,8 +104,17 @@ namespace osu.Game.Online.API.Requests.Responses
                     Genre = genre,
                     Language = language
                 },
-                Beatmaps = beatmaps?.Select(b => b.ToBeatmap(rulesets)).ToList(),
             };
+
+            beatmapSet.Beatmaps = beatmaps?.Select(b =>
+            {
+                var beatmap = b.ToBeatmap(rulesets);
+                beatmap.BeatmapSet = beatmapSet;
+                beatmap.Metadata = beatmapSet.Metadata;
+                return beatmap;
+            }).ToList();
+
+            return beatmapSet;
         }
     }
 }

From e1b2de27a6395f051e4f9f71aa52dfe6398cc4fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 17:19:29 +0900
Subject: [PATCH 07102/10326] Update osu!mania legacy skin's judgement
 animation to match stable

---
 .../Legacy/LegacyManiaJudgementPiece.cs       | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
index 9684cbb167..e275e1c0ca 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
@@ -5,11 +5,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
@@ -56,31 +56,30 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
             (animation as IFramedAnimation)?.GotoFrame(0);
 
+            this.FadeInFromZero(20, Easing.Out)
+                .Then().Delay(160)
+                .FadeOutFromOne(40, Easing.In);
+
             switch (result)
             {
                 case HitResult.None:
                     break;
 
                 case HitResult.Miss:
-                    animation.ScaleTo(1.6f);
-                    animation.ScaleTo(1, 100, Easing.In);
-
-                    animation.MoveTo(Vector2.Zero);
-                    animation.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+                    animation.ScaleTo(1.2f).Then().ScaleTo(1, 100, Easing.Out);
 
                     animation.RotateTo(0);
-                    animation.RotateTo(40, 800, Easing.InQuint);
-
-                    this.FadeOutFromOne(800);
+                    animation.RotateTo(RNG.NextSingle(-18, 18), 100, Easing.Out);
                     break;
 
                 default:
-                    animation.ScaleTo(0.8f);
-                    animation.ScaleTo(1, 250, Easing.OutElastic);
-
-                    animation.Delay(50).ScaleTo(0.75f, 250);
-
-                    this.Delay(50).FadeOut(200);
+                    animation.ScaleTo(0.8f)
+                             .Then().ScaleTo(1, 40)
+                             // this is actually correct to match stable; there were overlapping transforms.
+                             .Then().ScaleTo(0.85f)
+                             .Then().ScaleTo(0.7f, 40)
+                             .Then().Delay(100)
+                             .Then().ScaleTo(0.4f, 40, Easing.In);
                     break;
             }
         }

From 9fa1f60b7d2f0fcae3537148374a5e9214ac907b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 17:31:15 +0900
Subject: [PATCH 07103/10326] Fix incorrect footer being used

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index d8b42e065b..cdab1435c0 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                         },
                         new Drawable[]
                         {
-                            new Footer { SelectedItem = { BindTarget = SelectedItem } }
+                            new RealtimeMatchFooter { SelectedItem = { BindTarget = SelectedItem } }
                         }
                     },
                     RowDimensions = new[]

From 83f1350d7d218ba69082bffe0fc7f495b428cf34 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 17:49:10 +0900
Subject: [PATCH 07104/10326] Fix editor background not being correctly cleaned
 up on forced exit

Closes #11214. Should be pretty obvious why.
---
 osu.Game/Screens/Edit/Editor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index ca7e5fbf20..223c678fba 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -461,7 +461,7 @@ namespace osu.Game.Screens.Edit
                 if (dialogOverlay == null || dialogOverlay.CurrentDialog is PromptForSaveDialog)
                 {
                     confirmExit();
-                    return false;
+                    return base.OnExiting(next);
                 }
 
                 if (isNewBeatmap || HasUnsavedChanges)

From d11d754715220e5e84c991d497e91d561126444a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 18:09:37 +0900
Subject: [PATCH 07105/10326] Increase size of circle display on timeline

---
 .../Compose/Components/Timeline/TimelineHitObjectBlueprint.cs   | 2 +-
 1 file changed, 1 insertion(+), 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 657c5834b2..ae2a82fa10 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     {
         private const float thickness = 5;
         private const float shadow_radius = 5;
-        private const float circle_size = 24;
+        private const float circle_size = 34;
 
         public Action<DragEvent> OnDragHandled;
 

From d1be7c23d96ec9efe7d4edaaa87fd43c155af259 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 18:09:56 +0900
Subject: [PATCH 07106/10326] Increase height of timeline drag area

---
 .../Compose/Components/Timeline/TimelineBlueprintContainer.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 2f14c607c2..ead1aa5c62 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            Height = 0.4f;
+            Height = 0.6f;
 
             AddInternal(new Box
             {

From 423c6158e16bda8c5382de4f99eeabcd776cfb97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 18:10:11 +0900
Subject: [PATCH 07107/10326] Highlight timeline drag area when hovered for
 better visibility

---
 .../Timeline/TimelineBlueprintContainer.cs    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index ead1aa5c62..1fc529910b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -25,10 +26,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         private DragEvent lastDragEvent;
         private Bindable<HitObject> placement;
         private SelectionBlueprint placementBlueprint;
 
+        private readonly Box backgroundBox;
+
         public TimelineBlueprintContainer(HitObjectComposer composer)
             : base(composer)
         {
@@ -38,7 +44,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             Height = 0.6f;
 
-            AddInternal(new Box
+            AddInternal(backgroundBox = new Box
             {
                 Colour = Color4.Black,
                 RelativeSizeAxes = Axes.Both,
@@ -77,6 +83,18 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
 
+        protected override bool OnHover(HoverEvent e)
+        {
+            backgroundBox.FadeColour(colours.BlueLighter, 120, Easing.OutQuint);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            backgroundBox.FadeColour(Color4.Black, 600, Easing.OutQuint);
+            base.OnHoverLost(e);
+        }
+
         protected override void OnDrag(DragEvent e)
         {
             handleScrollViaDrag(e);

From 0566ed1a9b15a105530ab800865077bc68ab5a9e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 18:38:44 +0900
Subject: [PATCH 07108/10326] Add button to main menu

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 11 +++++------
 osu.Game/Screens/Menu/MainMenu.cs     |  5 +++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 4becdd58cd..0014f6768f 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -42,8 +42,7 @@ namespace osu.Game.Screens.Menu
         public Action OnBeatmapListing;
         public Action OnSolo;
         public Action OnSettings;
-        public Action OnMulti;
-        public Action OnChart;
+        public Action<bool> OnMulti;
 
         public const float BUTTON_WIDTH = 140f;
         public const float WEDGE_WIDTH = 20;
@@ -124,8 +123,8 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio, IdleTracker idleTracker, GameHost host)
         {
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMulti, 0, Key.M));
-            buttonsPlay.Add(new Button(@"chart", @"button-generic-select", OsuIcon.Charts, new Color4(80, 53, 160, 255), () => OnChart?.Invoke()));
+            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), () => onMulti(true), 0, Key.M));
+            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), () => onMulti(false), 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
@@ -154,7 +153,7 @@ namespace osu.Game.Screens.Menu
             sampleBack = audio.Samples.Get(@"Menu/button-back-select");
         }
 
-        private void onMulti()
+        private void onMulti(bool realtime)
         {
             if (!api.IsLoggedIn)
             {
@@ -172,7 +171,7 @@ namespace osu.Game.Screens.Menu
                 return;
             }
 
-            OnMulti?.Invoke();
+            OnMulti?.Invoke(realtime);
         }
 
         private void updateIdleState(bool isIdle)
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index b781c347f0..391bbf8429 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -17,6 +17,8 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
+using osu.Game.Screens.Multi;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Screens.Select;
 
@@ -104,7 +106,7 @@ namespace osu.Game.Screens.Menu
                                 this.Push(new Editor());
                             },
                             OnSolo = onSolo,
-                            OnMulti = delegate { this.Push(new TimeshiftMultiplayer()); },
+                            OnMulti = realtime => this.Push(realtime ? (Multiplayer)new RealtimeMultiplayer() : new TimeshiftMultiplayer()),
                             OnExit = confirmAndExit,
                         }
                     }
@@ -136,7 +138,6 @@ namespace osu.Game.Screens.Menu
 
             buttons.OnSettings = () => settings?.ToggleVisibility();
             buttons.OnBeatmapListing = () => beatmapListing?.ToggleVisibility();
-            buttons.OnChart = () => rankings?.ShowSpotlights();
 
             LoadComponentAsync(background = new BackgroundScreenDefault());
             preloadSongSelect();

From 8427ee1b8e6425b2d6e2bc837a737dba2f7e6e85 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 18:42:23 +0900
Subject: [PATCH 07109/10326] Fix incorrect cached type

---
 .../RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs       | 4 ++--
 .../Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
index aec70d8be4..30bd3ebc32 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
@@ -7,8 +7,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         [Cached(typeof(StatefulMultiplayerClient))]
         public TestRealtimeMultiplayerClient Client { get; }
 
-        [Cached(typeof(RealtimeRoomManager))]
+        [Cached(typeof(IRoomManager))]
         public TestRealtimeRoomManager RoomManager { get; }
 
         [Cached]
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
index aa75968cca..3565d6ac5d 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
@@ -6,8 +6,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         [Cached(typeof(StatefulMultiplayerClient))]
         public readonly TestRealtimeMultiplayerClient Client;
 
-        [Cached(typeof(RealtimeRoomManager))]
+        [Cached(typeof(IRoomManager))]
         public readonly TestRealtimeRoomManager RoomManager;
 
         [Cached]

From 56bd3d8a82230fd626fad39c23a40a3fd0729e1a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 18:42:31 +0900
Subject: [PATCH 07110/10326] Add realtime multiplayer test scene

---
 .../TestSceneRealtimeMultiplayer.cs           | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
new file mode 100644
index 0000000000..80955ca380
--- /dev/null
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Screens.Multi.Components;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestSceneRealtimeMultiplayer : RealtimeMultiplayerTestScene
+    {
+        public TestSceneRealtimeMultiplayer()
+        {
+            var multi = new TestRealtimeMultiplayer();
+
+            AddStep("show", () => LoadScreen(multi));
+            AddUntilStep("wait for loaded", () => multi.IsLoaded);
+        }
+
+        private class TestRealtimeMultiplayer : Screens.Multi.RealtimeMultiplayer.RealtimeMultiplayer
+        {
+            protected override RoomManager CreateRoomManager() => new TestRealtimeRoomManager();
+        }
+    }
+}

From f21b4a269fb7620ef6d612f7709c88f35093c3ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 18:42:55 +0900
Subject: [PATCH 07111/10326] Reduce wait length

---
 .../RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
index d31364d62e..a059bb1cc0 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddWaitStep("wait", 500);
+            AddWaitStep("wait", 10);
         }
     }
 }

From 10c2745682db8b3be8f35f81b8ef42345a4f3e44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:01:09 +0900
Subject: [PATCH 07112/10326] Add region specifications around implicit
 interface implementations

---
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs | 4 ++++
 osu.Game/Beatmaps/BeatmapManager.cs                   | 4 ++++
 osu.Game/Skinning/SkinManager.cs                      | 4 ++++
 osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs        | 4 ++++
 osu.Game/Tests/Visual/SkinnableTestScene.cs           | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 36f99c5599..38cb6729c3 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -179,8 +179,12 @@ namespace osu.Game.Tests.Gameplay
             }
         }
 
+        #region IResourceStorageProvider
+
         public AudioManager AudioManager => Audio;
         public IResourceStore<byte[]> Files => null;
         public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
+
+        #endregion
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 3cf691da9a..8a2991af90 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -496,12 +496,16 @@ namespace osu.Game.Beatmaps
             onlineLookupQueue?.Dispose();
         }
 
+        #region IResourceStorageProvider
+
         TextureStore IBeatmapResourceProvider.LargeTextureStore => largeTextureStore;
         ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
         AudioManager IStorageResourceProvider.AudioManager => audioManager;
         IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
         IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
 
+        #endregion
+
         /// <summary>
         /// A dummy WorkingBeatmap for the purpose of retrieving a beatmap for star difficulty calculation.
         /// </summary>
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 2ee940c02d..99c64b13a4 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -175,8 +175,12 @@ namespace osu.Game.Skinning
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => CurrentSkin.Value.GetConfig<TLookup, TValue>(lookup);
 
+        #region IResourceStorageProvider
+
         AudioManager IStorageResourceProvider.AudioManager => audio;
         IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
         IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+
+        #endregion
     }
 }
diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index dd1979a7e3..62814d4ed4 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -123,10 +123,14 @@ namespace osu.Game.Tests.Beatmaps
         protected void AssertNoLookup(string name) => AddAssert($"\"{name}\" not looked up",
             () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && !userSkinResourceStore.PerformedLookups.Contains(name));
 
+        #region IResourceStorageProvider
+
         public AudioManager AudioManager => Audio;
         public IResourceStore<byte[]> Files => userSkinResourceStore;
         public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
 
+        #endregion
+
         private class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
         {
             public ISkinSource SkinSource;
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 3a9c33788a..3d2c68c2ad 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -152,10 +152,14 @@ namespace osu.Game.Tests.Visual
 
         protected virtual IBeatmap CreateBeatmapForSkinProvider() => CreateWorkingBeatmap(Ruleset.Value).GetPlayableBeatmap(Ruleset.Value);
 
+        #region IResourceStorageProvider
+
         public AudioManager AudioManager => Audio;
         public IResourceStore<byte[]> Files => null;
         public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
 
+        #endregion
+
         private class OutlineBox : CompositeDrawable
         {
             public OutlineBox()

From a97a2b2a6637b2ec49ff2430dd7dce1cbd935099 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:03:25 +0900
Subject: [PATCH 07113/10326] Add nullability to BeatmapManager's GameHost
 reference

---
 osu.Game/Beatmaps/BeatmapManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 8a2991af90..42418e532b 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -72,6 +72,7 @@ namespace osu.Game.Beatmaps
         private readonly LargeTextureStore largeTextureStore;
         private readonly ITrackStore trackStore;
 
+        [CanBeNull]
         private readonly GameHost host;
 
         [CanBeNull]
@@ -502,7 +503,7 @@ namespace osu.Game.Beatmaps
         ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
         AudioManager IStorageResourceProvider.AudioManager => audioManager;
         IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
-        IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+        IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host?.CreateTextureLoaderStore(underlyingStore);
 
         #endregion
 

From 85518b4d9919973a685d2467530064c0518fc605 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:06:10 +0900
Subject: [PATCH 07114/10326] Enforce non-null for BeatmapManager
 WorkingBeatmap resources

---
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 5d298dbccc..62cf29dc03 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
@@ -19,10 +20,11 @@ namespace osu.Game.Beatmaps
         [ExcludeFromDynamicCompile]
         private class BeatmapManagerWorkingBeatmap : WorkingBeatmap
         {
+            [NotNull]
             private readonly IBeatmapResourceProvider resources;
 
-            public BeatmapManagerWorkingBeatmap(BeatmapInfo beatmapInfo, IBeatmapResourceProvider resources)
-                : base(beatmapInfo, resources?.AudioManager)
+            public BeatmapManagerWorkingBeatmap(BeatmapInfo beatmapInfo, [NotNull] IBeatmapResourceProvider resources)
+                : base(beatmapInfo, resources.AudioManager)
             {
                 this.resources = resources;
             }

From 13ef097a53933e2e84608911aa6fd5976a73c945 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:08:40 +0900
Subject: [PATCH 07115/10326] Annotate potentially null parameters in protected
 ctor of LegacySkin

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

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 5a7ad095f6..e4e5bf2f75 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Skinning
         {
         }
 
-        protected LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources, string filename)
+        protected LegacySkin(SkinInfo skin, [CanBeNull] IResourceStore<byte[]> storage, [CanBeNull] IStorageResourceProvider resources, string filename)
             : base(skin)
         {
             using (var stream = storage?.GetStream(filename))

From bf39aa5980819bc4c0171251173111e47573fb4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:18:42 +0900
Subject: [PATCH 07116/10326] Fix incorrectly converted rotation values

---
 .../Skinning/Legacy/LegacyManiaJudgementPiece.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
index e275e1c0ca..5d662c18d3 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                     animation.ScaleTo(1.2f).Then().ScaleTo(1, 100, Easing.Out);
 
                     animation.RotateTo(0);
-                    animation.RotateTo(RNG.NextSingle(-18, 18), 100, Easing.Out);
+                    animation.RotateTo(RNG.NextSingle(-5.73f, 5.73f), 100, Easing.Out);
                     break;
 
                 default:

From 87176edca142a2fbbfe4aea1076902449fda1c79 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:52:30 +0900
Subject: [PATCH 07117/10326] Fix crash when attempting to scale two hitobjects
 on the same axis

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index ec8c68005f..660e1844aa 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -157,10 +157,16 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 foreach (var h in hitObjects)
                 {
-                    h.Position = new Vector2(
-                        quad.TopLeft.X + (h.X - quad.TopLeft.X) / quad.Width * (quad.Width + scale.X),
-                        quad.TopLeft.Y + (h.Y - quad.TopLeft.Y) / quad.Height * (quad.Height + scale.Y)
-                    );
+                    var newPosition = h.Position;
+
+                    // guard against no-ops and NaN.
+                    if (scale.X != 0 && quad.Width > 0)
+                        newPosition.X = quad.TopLeft.X + (h.X - quad.TopLeft.X) / quad.Width * (quad.Width + scale.X);
+
+                    if (scale.Y != 0 && quad.Height > 0)
+                        newPosition.Y = quad.TopLeft.Y + (h.Y - quad.TopLeft.Y) / quad.Height * (quad.Height + scale.Y);
+
+                    h.Position = newPosition;
                 }
             }
 

From 7c5964fad8471635aa98a4fa1f81ef43ee9d5351 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 13:04:39 +0900
Subject: [PATCH 07118/10326] Revert window modes to previous code to correctly
 apply framework restrictions

---
 osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs | 3 ++-
 osu.Game/Overlays/Settings/SettingsDropdown.cs                 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 3df2a78552..3ef60c8fcd 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -59,9 +59,10 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             Children = new Drawable[]
             {
-                windowModeDropdown = new SettingsEnumDropdown<WindowMode>
+                windowModeDropdown = new SettingsDropdown<WindowMode>
                 {
                     LabelText = "Screen mode",
+                    ItemSource = windowModes,
                     Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
                 },
                 resolutionSettingsContainer = new Container
diff --git a/osu.Game/Overlays/Settings/SettingsDropdown.cs b/osu.Game/Overlays/Settings/SettingsDropdown.cs
index e1c6333aa0..1175ddaab8 100644
--- a/osu.Game/Overlays/Settings/SettingsDropdown.cs
+++ b/osu.Game/Overlays/Settings/SettingsDropdown.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings
 {
-    public abstract class SettingsDropdown<T> : SettingsItem<T>
+    public class SettingsDropdown<T> : SettingsItem<T>
     {
         protected new OsuDropdown<T> Control => (OsuDropdown<T>)base.Control;
 

From dab5924a63c869dc0ce74b3c22e8c797a6485169 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 22 Dec 2020 08:02:15 +0300
Subject: [PATCH 07119/10326] Fix resolution dropdown not respecting current
 display changes

---
 .../Sections/Graphics/LayoutSettings.cs       | 103 ++++++++----------
 1 file changed, 45 insertions(+), 58 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 62dc1dc806..ff3b580c7e 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.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.Drawing;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -25,9 +24,13 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
         private FillFlowContainer<SettingsSlider<float>> scalingSettings;
 
+        private readonly IBindable<Display> currentDisplay = new Bindable<Display>();
+        private readonly IBindableList<WindowMode> windowModes = new BindableList<WindowMode>();
+
         private Bindable<ScalingMode> scalingMode;
         private Bindable<Size> sizeFullscreen;
-        private readonly IBindableList<WindowMode> windowModes = new BindableList<WindowMode>();
+
+        private readonly BindableList<Size> resolutions = new BindableList<Size>(new[] { new Size(9999, 9999) });
 
         [Resolved]
         private OsuGameBase game { get; set; }
@@ -53,9 +56,10 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
 
             if (host.Window != null)
+            {
+                currentDisplay.BindTo(host.Window.CurrentDisplayBindable);
                 windowModes.BindTo(host.Window.SupportedWindowModes);
-
-            Container resolutionSettingsContainer;
+            }
 
             Children = new Drawable[]
             {
@@ -65,10 +69,12 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
                     ItemSource = windowModes,
                 },
-                resolutionSettingsContainer = new Container
+                resolutionDropdown = new ResolutionSettingsDropdown
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y
+                    LabelText = "Resolution",
+                    ShowsDefaultIndicator = false,
+                    ItemSource = resolutions,
+                    Current = sizeFullscreen
                 },
                 new SettingsSlider<float, UIScaleSlider>
                 {
@@ -126,31 +132,34 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 },
             };
 
-            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
-
-            var resolutions = getResolutions();
-
-            if (resolutions.Count > 1)
+            windowModes.BindCollectionChanged((sender, args) =>
             {
-                resolutionSettingsContainer.Child = resolutionDropdown = new ResolutionSettingsDropdown
-                {
-                    LabelText = "Resolution",
-                    ShowsDefaultIndicator = false,
-                    Items = resolutions,
-                    Current = sizeFullscreen
-                };
+                if (windowModes.Count > 1)
+                    windowModeDropdown.Show();
+                else
+                    windowModeDropdown.Hide();
+            }, true);
 
-                windowModeDropdown.Current.BindValueChanged(mode =>
+            windowModeDropdown.Current.ValueChanged += v => updateResolutionDropdown();
+
+            currentDisplay.BindValueChanged(v => Schedule(() =>
+            {
+                resolutions.RemoveRange(1, resolutions.Count - 1);
+
+                if (v.NewValue != null)
                 {
-                    if (mode.NewValue == WindowMode.Fullscreen)
-                    {
-                        resolutionDropdown.Show();
-                        sizeFullscreen.TriggerChange();
-                    }
-                    else
-                        resolutionDropdown.Hide();
-                }, true);
-            }
+                    resolutions.AddRange(v.NewValue.DisplayModes
+                                          .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
+                                          .OrderByDescending(m => m.Size.Width)
+                                          .ThenByDescending(m => m.Size.Height)
+                                          .Select(m => m.Size)
+                                          .Distinct());
+                }
+
+                updateResolutionDropdown();
+            }), true);
+
+            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
 
             scalingMode.BindValueChanged(mode =>
             {
@@ -163,17 +172,13 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 scalingSettings.ForEach(s => s.TransferValueOnCommit = mode.NewValue == ScalingMode.Everything);
             }, true);
 
-            windowModes.CollectionChanged += (sender, args) => windowModesChanged();
-
-            windowModesChanged();
-        }
-
-        private void windowModesChanged()
-        {
-            if (windowModes.Count > 1)
-                windowModeDropdown.Show();
-            else
-                windowModeDropdown.Hide();
+            void updateResolutionDropdown()
+            {
+                if (resolutions.Count > 1 && windowModeDropdown.Current.Value == WindowMode.Fullscreen)
+                    resolutionDropdown.Show();
+                else
+                    resolutionDropdown.Hide();
+            }
         }
 
         /// <summary>
@@ -205,24 +210,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             preview.Expire();
         }
 
-        private IReadOnlyList<Size> getResolutions()
-        {
-            var resolutions = new List<Size> { new Size(9999, 9999) };
-            var currentDisplay = game.Window?.CurrentDisplayBindable.Value;
-
-            if (currentDisplay != null)
-            {
-                resolutions.AddRange(currentDisplay.DisplayModes
-                                                   .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
-                                                   .OrderByDescending(m => m.Size.Width)
-                                                   .ThenByDescending(m => m.Size.Height)
-                                                   .Select(m => m.Size)
-                                                   .Distinct());
-            }
-
-            return resolutions;
-        }
-
         private class ScalingPreview : ScalingContainer
         {
             public ScalingPreview()

From dff865f335c8c4c70ed8b4ec7bf1975fc2f52440 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:12:02 +0900
Subject: [PATCH 07120/10326] Tidy up comments, code, and multiple linq
 enumeration

---
 osu.Game/OsuGame.cs                            | 18 ++++++------------
 .../Screens/Select/DifficultyRecommender.cs    |  2 ++
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d2c27b766c..d76bd163e1 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -364,25 +364,19 @@ namespace osu.Game
 
                 // we might even already be at the song
                 if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && (difficultyCriteria?.Invoke(Beatmap.Value.BeatmapInfo) ?? true))
-                {
                     return;
-                }
 
                 // Find beatmaps that match our predicate.
-                var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria?.Invoke(b) ?? true);
+                var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria?.Invoke(b) ?? true).ToList();
 
                 // Use all beatmaps if predicate matched nothing
-                if (!beatmaps.Any())
+                if (beatmaps.Count == 0)
                     beatmaps = databasedSet.Beatmaps;
 
-                // Try to select recommended beatmap
-                // This should give us a beatmap from current ruleset if there are any in our matched beatmaps
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
-                // Fallback if a difficulty can't be recommended, maybe we are offline
-                // First try to find a beatmap in current ruleset
-                selection ??= beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value));
-                // Otherwise use first beatmap
-                selection ??= beatmaps.First();
+                // Prefer recommended beatmap if recommendations are available, else fallback to a sane selection.
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps)
+                                ?? beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value))
+                                ?? beatmaps.First();
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index fa48316e9d..3b3fc812e6 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -47,6 +48,7 @@ namespace osu.Game.Screens.Select
         /// </remarks>
         /// <param name="beatmaps">A collection of beatmaps to select a difficulty from.</param>
         /// <returns>The recommended difficulty, or null if a recommendation could not be provided.</returns>
+        [CanBeNull]
         public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps)
         {
             if (!recommendedStarDifficulty.Any())

From 626b7615ad86ca6b93b68cf0dd32e5f23b30b03d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:23:33 +0900
Subject: [PATCH 07121/10326] Move and rename some fields for better
 readability

---
 osu.Game/OsuGameBase.cs                          |  6 +++---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 5fcd6882a6..f6ec541bcb 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -99,6 +99,9 @@ namespace osu.Game
         [Cached(typeof(IBindable<IReadOnlyList<Mod>>))]
         protected readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
+        [Cached]
+        protected readonly DifficultyRecommender DifficultyRecommender = new DifficultyRecommender();
+
         /// <summary>
         /// Mods available for the current <see cref="Ruleset"/>.
         /// </summary>
@@ -117,9 +120,6 @@ namespace osu.Game
 
         public bool IsDeployedBuild => AssemblyVersion.Major > 0;
 
-        [Cached]
-        protected readonly DifficultyRecommender DifficultyRecommender = new DifficultyRecommender();
-
         public virtual string Version
         {
             get
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 3b3fc812e6..5c031b5d6e 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -27,7 +27,10 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private Bindable<RulesetInfo> ruleset { get; set; }
 
-        private int storedUserId;
+        /// <summary>
+        /// The user for which the last requests were run.
+        /// </summary>
+        private int? requestedUserId;
 
         private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
 
@@ -73,12 +76,12 @@ namespace osu.Game.Screens.Select
             return beatmap;
         }
 
-        private void calculateRecommendedDifficulties()
+        private void fetchRecommendedValues()
         {
-            if (recommendedStarDifficulty.Any() && api.LocalUser.Value.Id == storedUserId)
+            if (recommendedStarDifficulty.Count > 0 && api.LocalUser.Value.Id == requestedUserId)
                 return;
 
-            storedUserId = api.LocalUser.Value.Id;
+            requestedUserId = api.LocalUser.Value.Id;
 
             // only query API for built-in rulesets
             rulesets.AvailableRulesets.Where(ruleset => ruleset.ID <= ILegacyRuleset.MAX_LEGACY_RULESET_ID).ForEach(rulesetInfo =>
@@ -125,7 +128,7 @@ namespace osu.Game.Screens.Select
             switch (state.NewValue)
             {
                 case APIState.Online:
-                    calculateRecommendedDifficulties();
+                    fetchRecommendedValues();
                     break;
             }
         });

From 8cc2ed3faeb362e8c78c8a924b4f8c5889690660 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:28:26 +0900
Subject: [PATCH 07122/10326] Move from OsuGameBase to OsuGame

Also moves to a more suitable namespace.
---
 .../{Screens/Select => Beatmaps}/DifficultyRecommender.cs  | 7 +++++--
 osu.Game/OsuGame.cs                                        | 7 ++++++-
 osu.Game/OsuGameBase.cs                                    | 6 ------
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename osu.Game/{Screens/Select => Beatmaps}/DifficultyRecommender.cs (94%)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Beatmaps/DifficultyRecommender.cs
similarity index 94%
rename from osu.Game/Screens/Select/DifficultyRecommender.cs
rename to osu.Game/Beatmaps/DifficultyRecommender.cs
index 5c031b5d6e..f870e8f89f 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Beatmaps/DifficultyRecommender.cs
@@ -9,13 +9,16 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 
-namespace osu.Game.Screens.Select
+namespace osu.Game.Beatmaps
 {
+    /// <summary>
+    /// A class which will recommend the most suitable difficulty for the local user from a beatmap set.
+    /// This requires the user to be logged in, as it sources from the user's online profile.
+    /// </summary>
     public class DifficultyRecommender : Component
     {
         [Resolved]
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d76bd163e1..bb51c55551 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -80,6 +80,9 @@ namespace osu.Game
 
         private BeatmapSetOverlay beatmapSetOverlay;
 
+        [Cached]
+        private readonly DifficultyRecommender difficultyRecommender = new DifficultyRecommender();
+
         [Cached]
         private readonly ScreenshotManager screenshotManager = new ScreenshotManager();
 
@@ -374,7 +377,7 @@ namespace osu.Game
                     beatmaps = databasedSet.Beatmaps;
 
                 // Prefer recommended beatmap if recommendations are available, else fallback to a sane selection.
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps)
+                var selection = difficultyRecommender.GetRecommendedBeatmap(beatmaps)
                                 ?? beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value))
                                 ?? beatmaps.First();
 
@@ -639,6 +642,8 @@ namespace osu.Game
                 GetStableStorage = GetStorageForStableInstall
             }, Add, true);
 
+            loadComponentSingleFile(difficultyRecommender, Add);
+
             loadComponentSingleFile(screenshotManager, Add);
 
             // dependency on notification overlay, dependent by settings overlay
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index f6ec541bcb..150569f1dd 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -36,7 +36,6 @@ using osu.Game.Resources;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
-using osu.Game.Screens.Select;
 using osu.Game.Skinning;
 using osuTK.Input;
 using RuntimeInfo = osu.Framework.RuntimeInfo;
@@ -99,9 +98,6 @@ namespace osu.Game
         [Cached(typeof(IBindable<IReadOnlyList<Mod>>))]
         protected readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
-        [Cached]
-        protected readonly DifficultyRecommender DifficultyRecommender = new DifficultyRecommender();
-
         /// <summary>
         /// Mods available for the current <see cref="Ruleset"/>.
         /// </summary>
@@ -306,8 +302,6 @@ namespace osu.Game
             AddInternal(MusicController = new MusicController());
             dependencies.CacheAs(MusicController);
 
-            Add(DifficultyRecommender);
-
             Ruleset.BindValueChanged(onRulesetChanged);
         }
 

From df5e1d83bd24fb0311868aa93034f790e7b47758 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:36:52 +0900
Subject: [PATCH 07123/10326] Allow recommender to potentially be null

---
 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 2847b31e98..a5252fdc96 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Screens.Select
                 BleedBottom = Footer.HEIGHT,
                 SelectionChanged = updateSelectedBeatmap,
                 BeatmapSetsChanged = carouselBeatmapsLoaded,
-                GetRecommendedBeatmap = recommender.GetRecommendedBeatmap,
+                GetRecommendedBeatmap = s => recommender?.GetRecommendedBeatmap(s),
             }, c => carouselContainer.Child = c);
 
             AddRangeInternal(new Drawable[]

From c6be969e336e153d7e59fd5e23a5d3eeb8547f5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:42:12 +0900
Subject: [PATCH 07124/10326] Remove unnecessary resolved recommender in test

---
 .../Visual/SongSelect/TestSceneBeatmapRecommendations.cs     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 75a33af247..53a956c77c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
@@ -15,7 +14,6 @@ using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Taiko;
-using osu.Game.Screens.Select;
 using osu.Game.Tests.Visual.Navigation;
 using osu.Game.Users;
 
@@ -23,9 +21,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public class TestSceneBeatmapRecommendations : OsuGameTestScene
     {
-        [Resolved]
-        private DifficultyRecommender recommender { get; set; }
-
         [SetUpSteps]
         public override void SetUpSteps()
         {

From 3bf670510ad61874b516255562c940da0f10c8b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 14:55:25 +0900
Subject: [PATCH 07125/10326] Split into two actions

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 32 ++++++++++++++++++++++-----
 osu.Game/Screens/Menu/MainMenu.cs     |  4 ++--
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 0014f6768f..b52ab2cb2f 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -42,7 +42,8 @@ namespace osu.Game.Screens.Menu
         public Action OnBeatmapListing;
         public Action OnSolo;
         public Action OnSettings;
-        public Action<bool> OnMulti;
+        public Action OnMultiplayer;
+        public Action OnTimeshift;
 
         public const float BUTTON_WIDTH = 140f;
         public const float WEDGE_WIDTH = 20;
@@ -123,8 +124,8 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio, IdleTracker idleTracker, GameHost host)
         {
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), () => onMulti(true), 0, Key.M));
-            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), () => onMulti(false), 0, Key.L));
+            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
+            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
@@ -153,7 +154,7 @@ namespace osu.Game.Screens.Menu
             sampleBack = audio.Samples.Get(@"Menu/button-back-select");
         }
 
-        private void onMulti(bool realtime)
+        private void onMultiplayer()
         {
             if (!api.IsLoggedIn)
             {
@@ -171,7 +172,28 @@ namespace osu.Game.Screens.Menu
                 return;
             }
 
-            OnMulti?.Invoke(realtime);
+            OnMultiplayer?.Invoke();
+        }
+
+        private void onTimeshift()
+        {
+            if (!api.IsLoggedIn)
+            {
+                notifications?.Post(new SimpleNotification
+                {
+                    Text = "You gotta be logged in to multi 'yo!",
+                    Icon = FontAwesome.Solid.Globe,
+                    Activated = () =>
+                    {
+                        loginOverlay?.Show();
+                        return true;
+                    }
+                });
+
+                return;
+            }
+
+            OnTimeshift?.Invoke();
         }
 
         private void updateIdleState(bool isIdle)
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 391bbf8429..fa96ac9c51 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -17,7 +17,6 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Screens.Select;
@@ -106,7 +105,8 @@ namespace osu.Game.Screens.Menu
                                 this.Push(new Editor());
                             },
                             OnSolo = onSolo,
-                            OnMulti = realtime => this.Push(realtime ? (Multiplayer)new RealtimeMultiplayer() : new TimeshiftMultiplayer()),
+                            OnMultiplayer = () => this.Push(new RealtimeMultiplayer()),
+                            OnTimeshift = () => this.Push(new TimeshiftMultiplayer()),
                             OnExit = confirmAndExit,
                         }
                     }

From 807c1ecd1f47386554d4adc160d426e675413711 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:57:32 +0900
Subject: [PATCH 07126/10326] Refactor recommendation iteration code to read
 better

---
 osu.Game/Beatmaps/DifficultyRecommender.cs | 52 +++++++---------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Beatmaps/DifficultyRecommender.cs b/osu.Game/Beatmaps/DifficultyRecommender.cs
index f870e8f89f..340c47d89b 100644
--- a/osu.Game/Beatmaps/DifficultyRecommender.cs
+++ b/osu.Game/Beatmaps/DifficultyRecommender.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         private int? requestedUserId;
 
-        private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
+        private readonly Dictionary<RulesetInfo, double> recommendedDifficultyMapping = new Dictionary<RulesetInfo, double>();
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
@@ -57,31 +57,27 @@ namespace osu.Game.Beatmaps
         [CanBeNull]
         public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps)
         {
-            if (!recommendedStarDifficulty.Any())
-                return null;
-
-            BeatmapInfo beatmap = null;
-
-            foreach (var r in getBestRulesetOrder())
+            foreach (var r in orderedRulesets)
             {
-                recommendedStarDifficulty.TryGetValue(r, out var stars);
+                if (!recommendedDifficultyMapping.TryGetValue(r, out var recommendation))
+                    continue;
 
-                beatmap = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
+                BeatmapInfo beatmap = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
                 {
-                    var difference = b.StarDifficulty - stars;
+                    var difference = b.StarDifficulty - recommendation;
                     return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
                 }).FirstOrDefault();
 
                 if (beatmap != null)
-                    break;
+                    return beatmap;
             }
 
-            return beatmap;
+            return null;
         }
 
         private void fetchRecommendedValues()
         {
-            if (recommendedStarDifficulty.Count > 0 && api.LocalUser.Value.Id == requestedUserId)
+            if (recommendedDifficultyMapping.Count > 0 && api.LocalUser.Value.Id == requestedUserId)
                 return;
 
             requestedUserId = api.LocalUser.Value.Id;
@@ -94,7 +90,7 @@ namespace osu.Game.Beatmaps
                 req.Success += result =>
                 {
                     // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
-                    recommendedStarDifficulty[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
+                    recommendedDifficultyMapping[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
                 };
 
                 api.Queue(req);
@@ -102,29 +98,13 @@ namespace osu.Game.Beatmaps
         }
 
         /// <returns>
-        /// Rulesets ordered by highest recommended star difficulty, except currently selected ruleset first
+        /// Rulesets ordered descending by their respective recommended difficulties.
+        /// The currently selected ruleset will always be first.
         /// </returns>
-        private IEnumerable<RulesetInfo> getBestRulesetOrder()
-        {
-            IEnumerable<RulesetInfo> bestRulesetOrder = recommendedStarDifficulty.OrderByDescending(pair => pair.Value)
-                                                                                 .Select(pair => pair.Key);
-
-            List<RulesetInfo> orderedRulesets;
-
-            if (bestRulesetOrder.Contains(ruleset.Value))
-            {
-                orderedRulesets = bestRulesetOrder.ToList();
-                orderedRulesets.Remove(ruleset.Value);
-                orderedRulesets.Insert(0, ruleset.Value);
-            }
-            else
-            {
-                orderedRulesets = new List<RulesetInfo> { ruleset.Value };
-                orderedRulesets.AddRange(bestRulesetOrder);
-            }
-
-            return orderedRulesets;
-        }
+        private IEnumerable<RulesetInfo> orderedRulesets =>
+            recommendedDifficultyMapping
+                .OrderByDescending(pair => pair.Value).Select(pair => pair.Key).Where(r => !r.Equals(ruleset.Value))
+                .Prepend(ruleset.Value);
 
         private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {

From dece41d050d2f063ed3002269475167484b2270c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 14:58:47 +0900
Subject: [PATCH 07127/10326] Add todo

---
 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index d654496f40..f4e84510bf 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -14,6 +14,7 @@ using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
+    // Todo: The "room" part of TimeshiftPlayer should be split out into an abstract player class to be inherited instead.
     public class RealtimePlayer : TimeshiftPlayer
     {
         protected override bool PauseOnFocusLost => false;

From 81e2edc73ff95d47d272c711d1c7034829a68870 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 14:59:11 +0900
Subject: [PATCH 07128/10326] Use MRE with timeout to wait on match start

---
 .../RealtimeMultiplayer/RealtimePlayer.cs      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index f4e84510bf..c6d44686b5 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -6,6 +6,8 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Logging;
+using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Scoring;
@@ -26,7 +28,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private StatefulMultiplayerClient client { get; set; }
 
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
-        private bool started;
+        private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
         public RealtimePlayer(PlaylistItem playlistItem)
             : base(playlistItem, false)
@@ -43,11 +45,19 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             client.ResultsReady += onResultsReady;
             client.ChangeState(MultiplayerUserState.Loaded);
 
-            while (!started)
-                Thread.Sleep(100);
+            if (!startedEvent.Wait(TimeSpan.FromSeconds(30)))
+            {
+                Logger.Log("Failed to start the multiplayer match in time.", LoggingTarget.Runtime, LogLevel.Important);
+
+                Schedule(() =>
+                {
+                    ValidForResume = false;
+                    this.Exit();
+                });
+            }
         }
 
-        private void onMatchStarted() => started = true;
+        private void onMatchStarted() => startedEvent.Set();
 
         private void onResultsReady() => resultsReady.SetResult(true);
 

From 3f966386ed563bd43c241068cf3bdd8ec10f8541 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 15:15:32 +0900
Subject: [PATCH 07129/10326] Fix compile time failure due to potentially null
 connection

---
 .../Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 6f18e1c922..75bb578a29 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
@@ -99,6 +100,8 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 {
                     try
                     {
+                        Debug.Assert(connection != null);
+
                         // reconnect on any failure
                         await connection.StartAsync();
                         Logger.Log("Multiplayer client connected!", LoggingTarget.Network);

From 85e93c5ddec913aa48515814867e89688c92e518 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 15:22:27 +0900
Subject: [PATCH 07130/10326] Fix main menu multiplayer icons being back to
 front

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index b52ab2cb2f..badfa3f693 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -124,8 +124,8 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio, IdleTracker idleTracker, GameHost host)
         {
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
-            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
+            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
+            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));

From ab90db7c8df2ab778d3b84d964eae62823e41443 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 15:27:49 +0900
Subject: [PATCH 07131/10326] Fix stuck lounge on join failure

---
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index e0fca3ce4c..0c9b58a0c4 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -38,10 +38,10 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         }
 
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-            => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
+            => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-            => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
+            => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 
         public override void PartRoom()
         {
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             });
         }
 
-        private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null)
+        private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
         {
             Debug.Assert(room.RoomID.Value != null);
 
@@ -73,6 +73,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 PartRoom();
                 if (t.Exception != null)
                     Logger.Error(t.Exception, "Failed to join multiplayer room.");
+                onError?.Invoke(t.Exception?.ToString() ?? string.Empty);
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
 

From 27e64bdb342aa33aa74da56fa155960662fc3a1e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 15:31:07 +0900
Subject: [PATCH 07132/10326] Schedule callback continuations

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 0c9b58a0c4..7ce031e0e9 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -67,13 +67,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             Debug.Assert(room.RoomID.Value != null);
 
             var joinTask = multiplayerClient.JoinRoom(room);
-            joinTask.ContinueWith(_ => onSuccess?.Invoke(room), TaskContinuationOptions.OnlyOnRanToCompletion);
+            joinTask.ContinueWith(_ => Schedule(() => onSuccess?.Invoke(room)), TaskContinuationOptions.OnlyOnRanToCompletion);
             joinTask.ContinueWith(t =>
             {
                 PartRoom();
                 if (t.Exception != null)
                     Logger.Error(t.Exception, "Failed to join multiplayer room.");
-                onError?.Invoke(t.Exception?.ToString() ?? string.Empty);
+                Schedule(() => onError?.Invoke(t.Exception?.ToString() ?? string.Empty));
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
 

From 8201fa8e3463024ab3155738df934bc1cf967822 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 15:51:24 +0900
Subject: [PATCH 07133/10326] Split out common implementation and private
 classes in MatchSettingsOverlay

---
 .../TestSceneMatchSettingsOverlay.cs          |  10 +-
 .../TestSceneTimeshiftRoomSubScreen.cs        |   2 +-
 .../Match/Components/MatchSettingsOverlay.cs  | 185 +++++++++---------
 .../Match/RealtimeMatchSettingsOverlay.cs     |  95 +--------
 .../Multi/Timeshift/TimeshiftRoomSubScreen.cs |   5 +-
 5 files changed, 108 insertions(+), 189 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 234374ee2b..90eef26b20 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -109,14 +109,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("error not displayed", () => !settings.ErrorText.IsPresent);
         }
 
-        private class TestRoomSettings : MatchSettingsOverlay
+        private class TestRoomSettings : TimeshiftMatchSettingsOverlay
         {
-            public TriangleButton ApplyButton => Settings.ApplyButton;
+            public TriangleButton ApplyButton => ((MatchSettings)Settings).ApplyButton;
 
-            public OsuTextBox NameField => Settings.NameField;
-            public OsuDropdown<TimeSpan> DurationField => Settings.DurationField;
+            public OsuTextBox NameField => ((MatchSettings)Settings).NameField;
+            public OsuDropdown<TimeSpan> DurationField => ((MatchSettings)Settings).DurationField;
 
-            public OsuSpriteText ErrorText => Settings.ErrorText;
+            public OsuSpriteText ErrorText => ((MatchSettings)Settings).ErrorText;
         }
 
         private class TestRoomManager : IRoomManager
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
index f56f78ce89..bbd7d84081 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("create room", () =>
             {
-                InputManager.MoveMouseTo(match.ChildrenOfType<MatchSettingsOverlay.CreateRoomButton>().Single());
+                InputManager.MoveMouseTo(match.ChildrenOfType<TimeshiftMatchSettingsOverlay.CreateRoomButton>().Single());
                 InputManager.Click(MouseButton.Left);
             });
 
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 1859e8db8a..d837ceaccf 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -21,20 +21,108 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
-    public class MatchSettingsOverlay : FocusedOverlayContainer
+    public abstract class MatchSettingsOverlay : FocusedOverlayContainer
     {
-        private const float transition_duration = 350;
-        private const float field_padding = 45;
+        protected const float TRANSITION_DURATION = 350;
+        protected const float FIELD_PADDING = 45;
 
-        public Action EditPlaylist;
-
-        protected MatchSettings Settings { get; private set; }
+        protected MultiplayerComposite Settings { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
         {
             Masking = true;
+        }
 
+        protected override void PopIn()
+        {
+            Settings.MoveToY(0, TRANSITION_DURATION, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            Settings.MoveToY(-1, TRANSITION_DURATION, Easing.InSine);
+        }
+
+        protected class SettingsTextBox : OsuTextBox
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                BackgroundUnfocused = Color4.Black;
+                BackgroundFocused = Color4.Black;
+            }
+        }
+
+        protected class SettingsNumberTextBox : SettingsTextBox
+        {
+            protected override bool CanAddCharacter(char character) => char.IsNumber(character);
+        }
+
+        protected class SettingsPasswordTextBox : OsuPasswordTextBox
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                BackgroundUnfocused = Color4.Black;
+                BackgroundFocused = Color4.Black;
+            }
+        }
+
+        protected class SectionContainer : FillFlowContainer<Section>
+        {
+            public SectionContainer()
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                Width = 0.5f;
+                Direction = FillDirection.Vertical;
+                Spacing = new Vector2(FIELD_PADDING);
+            }
+        }
+
+        protected class Section : Container
+        {
+            private readonly Container content;
+
+            protected override Container<Drawable> Content => content;
+
+            public Section(string title)
+            {
+                AutoSizeAxes = Axes.Y;
+                RelativeSizeAxes = Axes.X;
+
+                InternalChild = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(5),
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 12),
+                            Text = title.ToUpper(),
+                        },
+                        content = new Container
+                        {
+                            AutoSizeAxes = Axes.Y,
+                            RelativeSizeAxes = Axes.X,
+                        },
+                    },
+                };
+            }
+        }
+    }
+
+    public class TimeshiftMatchSettingsOverlay : MatchSettingsOverlay
+    {
+        public Action EditPlaylist;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             Child = Settings = new MatchSettings
             {
                 RelativeSizeAxes = Axes.Both,
@@ -43,16 +131,6 @@ namespace osu.Game.Screens.Multi.Match.Components
             };
         }
 
-        protected override void PopIn()
-        {
-            Settings.MoveToY(0, transition_duration, Easing.OutQuint);
-        }
-
-        protected override void PopOut()
-        {
-            Settings.MoveToY(-1, transition_duration, Easing.InSine);
-        }
-
         protected class MatchSettings : MultiplayerComposite
         {
             private const float disabled_alpha = 0.2f;
@@ -126,7 +204,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                     {
                                                         new SectionContainer
                                                         {
-                                                            Padding = new MarginPadding { Right = field_padding / 2 },
+                                                            Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
                                                             Children = new[]
                                                             {
                                                                 new Section("Room name")
@@ -216,7 +294,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                         {
                                                             Anchor = Anchor.TopRight,
                                                             Origin = Anchor.TopRight,
-                                                            Padding = new MarginPadding { Left = field_padding / 2 },
+                                                            Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
                                                             Children = new[]
                                                             {
                                                                 new Section("Playlist")
@@ -379,77 +457,6 @@ namespace osu.Game.Screens.Multi.Match.Components
             }
         }
 
-        private class SettingsTextBox : OsuTextBox
-        {
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                BackgroundUnfocused = Color4.Black;
-                BackgroundFocused = Color4.Black;
-            }
-        }
-
-        private class SettingsNumberTextBox : SettingsTextBox
-        {
-            protected override bool CanAddCharacter(char character) => char.IsNumber(character);
-        }
-
-        private class SettingsPasswordTextBox : OsuPasswordTextBox
-        {
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                BackgroundUnfocused = Color4.Black;
-                BackgroundFocused = Color4.Black;
-            }
-        }
-
-        private class SectionContainer : FillFlowContainer<Section>
-        {
-            public SectionContainer()
-            {
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
-                Width = 0.5f;
-                Direction = FillDirection.Vertical;
-                Spacing = new Vector2(field_padding);
-            }
-        }
-
-        private class Section : Container
-        {
-            private readonly Container content;
-
-            protected override Container<Drawable> Content => content;
-
-            public Section(string title)
-            {
-                AutoSizeAxes = Axes.Y;
-                RelativeSizeAxes = Axes.X;
-
-                InternalChild = new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Y,
-                    RelativeSizeAxes = Axes.X,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(5),
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 12),
-                            Text = title.ToUpper(),
-                        },
-                        content = new Container
-                        {
-                            AutoSizeAxes = Axes.Y,
-                            RelativeSizeAxes = Axes.X,
-                        },
-                    },
-                };
-            }
-        }
-
         public class CreateRoomButton : TriangleButton
         {
             public CreateRoomButton()
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
index 924c736472..5bd388cceb 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
@@ -19,22 +19,14 @@ using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Multi.Match.Components;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 {
-    public class RealtimeMatchSettingsOverlay : FocusedOverlayContainer
+    public class RealtimeMatchSettingsOverlay : MatchSettingsOverlay
     {
-        private const float transition_duration = 350;
-        private const float field_padding = 45;
-
-        protected MatchSettings Settings { get; private set; }
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            Masking = true;
-
             Child = Settings = new MatchSettings
             {
                 RelativeSizeAxes = Axes.Both,
@@ -43,16 +35,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
             };
         }
 
-        protected override void PopIn()
-        {
-            Settings.MoveToY(0, transition_duration, Easing.OutQuint);
-        }
-
-        protected override void PopOut()
-        {
-            Settings.MoveToY(-1, transition_duration, Easing.InSine);
-        }
-
         protected class MatchSettings : MultiplayerComposite
         {
             private const float disabled_alpha = 0.2f;
@@ -143,7 +125,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                                                             {
                                                                 new SectionContainer
                                                                 {
-                                                                    Padding = new MarginPadding { Right = field_padding / 2 },
+                                                                    Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
                                                                     Children = new[]
                                                                     {
                                                                         new Section("Room name")
@@ -192,7 +174,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                                                                 {
                                                                     Anchor = Anchor.TopRight,
                                                                     Origin = Anchor.TopRight,
-                                                                    Padding = new MarginPadding { Left = field_padding / 2 },
+                                                                    Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
                                                                     Children = new[]
                                                                     {
                                                                         new Section("Max participants")
@@ -347,77 +329,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
             }
         }
 
-        private class SettingsTextBox : OsuTextBox
-        {
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                BackgroundUnfocused = Color4.Black;
-                BackgroundFocused = Color4.Black;
-            }
-        }
-
-        private class SettingsNumberTextBox : SettingsTextBox
-        {
-            protected override bool CanAddCharacter(char character) => char.IsNumber(character);
-        }
-
-        private class SettingsPasswordTextBox : OsuPasswordTextBox
-        {
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                BackgroundUnfocused = Color4.Black;
-                BackgroundFocused = Color4.Black;
-            }
-        }
-
-        private class SectionContainer : FillFlowContainer<Section>
-        {
-            public SectionContainer()
-            {
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
-                Width = 0.5f;
-                Direction = FillDirection.Vertical;
-                Spacing = new Vector2(field_padding);
-            }
-        }
-
-        private class Section : Container
-        {
-            private readonly Container content;
-
-            protected override Container<Drawable> Content => content;
-
-            public Section(string title)
-            {
-                AutoSizeAxes = Axes.Y;
-                RelativeSizeAxes = Axes.X;
-
-                InternalChild = new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Y,
-                    RelativeSizeAxes = Axes.X,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(5),
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 12),
-                            Text = title.ToUpper(),
-                        },
-                        content = new Container
-                        {
-                            AutoSizeAxes = Axes.Y,
-                            RelativeSizeAxes = Axes.X,
-                        },
-                    },
-                };
-            }
-        }
-
         public class CreateOrUpdateButton : TriangleButton
         {
             [Resolved(typeof(Room), nameof(Room.RoomID))]
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
index 433a980d60..fa901179e9 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
@@ -18,6 +18,7 @@ using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
+using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
 namespace osu.Game.Screens.Multi.Timeshift
 {
@@ -175,7 +176,7 @@ namespace osu.Game.Screens.Multi.Timeshift
                         },
                         new Drawable[]
                         {
-                            new Match.Components.Footer
+                            new Footer
                             {
                                 OnStart = onStart,
                                 SelectedItem = { BindTarget = SelectedItem }
@@ -188,7 +189,7 @@ namespace osu.Game.Screens.Multi.Timeshift
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                settingsOverlay = new MatchSettingsOverlay
+                settingsOverlay = new TimeshiftMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
                     EditPlaylist = () => this.Push(new MatchSongSelect()),

From 17d924c7554d561d028ed761681c6e4703286267 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 15:52:47 +0900
Subject: [PATCH 07134/10326] Move timeshift settings overlay to correct
 namespace

---
 .../TestSceneMatchSettingsOverlay.cs          |   2 +-
 .../Match/Components/MatchSettingsOverlay.cs  | 377 -----------------
 .../TimeshiftMatchSettingsOverlay.cs          | 391 ++++++++++++++++++
 3 files changed, 392 insertions(+), 378 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 90eef26b20..1fcae9c709 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.Multi.Timeshift;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index d837ceaccf..0bb56d0cdf 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -1,21 +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.Specialized;
-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.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 
@@ -115,372 +106,4 @@ namespace osu.Game.Screens.Multi.Match.Components
             }
         }
     }
-
-    public class TimeshiftMatchSettingsOverlay : MatchSettingsOverlay
-    {
-        public Action EditPlaylist;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Child = Settings = new MatchSettings
-            {
-                RelativeSizeAxes = Axes.Both,
-                RelativePositionAxes = Axes.Y,
-                EditPlaylist = () => EditPlaylist?.Invoke()
-            };
-        }
-
-        protected class MatchSettings : MultiplayerComposite
-        {
-            private const float disabled_alpha = 0.2f;
-
-            public Action EditPlaylist;
-
-            public OsuTextBox NameField, MaxParticipantsField;
-            public OsuDropdown<TimeSpan> DurationField;
-            public RoomAvailabilityPicker AvailabilityPicker;
-            public GameTypePicker TypePicker;
-            public TriangleButton ApplyButton;
-
-            public OsuSpriteText ErrorText;
-
-            private OsuSpriteText typeLabel;
-            private LoadingLayer loadingLayer;
-            private DrawableRoomPlaylist playlist;
-            private OsuSpriteText playlistLength;
-
-            [Resolved(CanBeNull = true)]
-            private IRoomManager manager { get; set; }
-
-            [Resolved]
-            private Bindable<Room> currentRoom { get; set; }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                Container dimContent;
-
-                InternalChildren = new Drawable[]
-                {
-                    dimContent = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4Extensions.FromHex(@"28242d"),
-                            },
-                            new GridContainer
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                RowDimensions = new[]
-                                {
-                                    new Dimension(GridSizeMode.Distributed),
-                                    new Dimension(GridSizeMode.AutoSize),
-                                },
-                                Content = new[]
-                                {
-                                    new Drawable[]
-                                    {
-                                        new OsuScrollContainer
-                                        {
-                                            Padding = new MarginPadding
-                                            {
-                                                Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
-                                                Vertical = 10
-                                            },
-                                            RelativeSizeAxes = Axes.Both,
-                                            Children = new[]
-                                            {
-                                                new Container
-                                                {
-                                                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Children = new Drawable[]
-                                                    {
-                                                        new SectionContainer
-                                                        {
-                                                            Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
-                                                            Children = new[]
-                                                            {
-                                                                new Section("Room name")
-                                                                {
-                                                                    Child = NameField = new SettingsTextBox
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        TabbableContentContainer = this,
-                                                                        LengthLimit = 100
-                                                                    },
-                                                                },
-                                                                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,
-                                                                    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,
-                                                                    },
-                                                                },
-                                                                new Section("Password (optional)")
-                                                                {
-                                                                    Alpha = disabled_alpha,
-                                                                    Child = new SettingsPasswordTextBox
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        TabbableContentContainer = this,
-                                                                        ReadOnly = true,
-                                                                    },
-                                                                },
-                                                            },
-                                                        },
-                                                        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[]
-                                                                            {
-                                                                                playlistLength = new OsuSpriteText
-                                                                                {
-                                                                                    Margin = new MarginPadding { Vertical = 5 },
-                                                                                    Colour = colours.Yellow,
-                                                                                    Font = OsuFont.GetFont(size: 12),
-                                                                                }
-                                                                            },
-                                                                            new Drawable[]
-                                                                            {
-                                                                                new PurpleTriangleButton
-                                                                                {
-                                                                                    RelativeSizeAxes = Axes.X,
-                                                                                    Height = 40,
-                                                                                    Text = "Edit playlist",
-                                                                                    Action = () => EditPlaylist?.Invoke()
-                                                                                }
-                                                                            }
-                                                                        },
-                                                                        RowDimensions = new[]
-                                                                        {
-                                                                            new Dimension(),
-                                                                            new Dimension(GridSizeMode.AutoSize),
-                                                                            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 = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
-                                                },
-                                                new FillFlowContainer
-                                                {
-                                                    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
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            },
-                        }
-                    },
-                    loadingLayer = new LoadingLayer(dimContent)
-                };
-
-                TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
-                RoomName.BindValueChanged(name => NameField.Text = name.NewValue, true);
-                Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
-                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 ?? TimeSpan.FromMinutes(30), true);
-
-                playlist.Items.BindTo(Playlist);
-                Playlist.BindCollectionChanged(onPlaylistChanged, true);
-            }
-
-            protected override void Update()
-            {
-                base.Update();
-
-                ApplyButton.Enabled.Value = hasValidSettings;
-            }
-
-            private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) =>
-                playlistLength.Text = $"Length: {Playlist.GetTotalDuration()}";
-
-            private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0;
-
-            private void apply()
-            {
-                if (!ApplyButton.Enabled.Value)
-                    return;
-
-                hideError();
-
-                RoomName.Value = NameField.Text;
-                Availability.Value = AvailabilityPicker.Current.Value;
-                Type.Value = TypePicker.Current.Value;
-
-                if (int.TryParse(MaxParticipantsField.Text, out int max))
-                    MaxParticipants.Value = max;
-                else
-                    MaxParticipants.Value = null;
-
-                Duration.Value = DurationField.Current.Value;
-
-                manager?.CreateRoom(currentRoom.Value, onSuccess, onError);
-
-                loadingLayer.Show();
-            }
-
-            private void hideError() => ErrorText.FadeOut(50);
-
-            private void onSuccess(Room room) => loadingLayer.Hide();
-
-            private void onError(string text)
-            {
-                ErrorText.Text = text;
-                ErrorText.FadeIn(50);
-
-                loadingLayer.Hide();
-            }
-        }
-
-        public class CreateRoomButton : TriangleButton
-        {
-            public CreateRoomButton()
-            {
-                Text = "Create";
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                BackgroundColour = colours.Yellow;
-                Triangles.ColourLight = colours.YellowLight;
-                Triangles.ColourDark = colours.YellowDark;
-            }
-        }
-
-        private class DurationDropdown : OsuDropdown<TimeSpan>
-        {
-            public DurationDropdown()
-            {
-                Menu.MaxHeight = 100;
-            }
-
-            protected override string GenerateItemText(TimeSpan item) => item.Humanize();
-        }
-    }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs
new file mode 100644
index 0000000000..7e1e9894d8
--- /dev/null
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs
@@ -0,0 +1,391 @@
+// Copyright (c) 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.Specialized;
+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.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Overlays;
+using osu.Game.Screens.Multi.Match.Components;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Timeshift
+{
+    public class TimeshiftMatchSettingsOverlay : MatchSettingsOverlay
+    {
+        public Action EditPlaylist;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = Settings = new MatchSettings
+            {
+                RelativeSizeAxes = Axes.Both,
+                RelativePositionAxes = Axes.Y,
+                EditPlaylist = () => EditPlaylist?.Invoke()
+            };
+        }
+
+        protected class MatchSettings : MultiplayerComposite
+        {
+            private const float disabled_alpha = 0.2f;
+
+            public Action EditPlaylist;
+
+            public OsuTextBox NameField, MaxParticipantsField;
+            public OsuDropdown<TimeSpan> DurationField;
+            public RoomAvailabilityPicker AvailabilityPicker;
+            public GameTypePicker TypePicker;
+            public TriangleButton ApplyButton;
+
+            public OsuSpriteText ErrorText;
+
+            private OsuSpriteText typeLabel;
+            private LoadingLayer loadingLayer;
+            private DrawableRoomPlaylist playlist;
+            private OsuSpriteText playlistLength;
+
+            [Resolved(CanBeNull = true)]
+            private IRoomManager manager { get; set; }
+
+            [Resolved]
+            private Bindable<Room> currentRoom { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Container dimContent;
+
+                InternalChildren = new Drawable[]
+                {
+                    dimContent = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4Extensions.FromHex(@"28242d"),
+                            },
+                            new GridContainer
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(GridSizeMode.Distributed),
+                                    new Dimension(GridSizeMode.AutoSize),
+                                },
+                                Content = new[]
+                                {
+                                    new Drawable[]
+                                    {
+                                        new OsuScrollContainer
+                                        {
+                                            Padding = new MarginPadding
+                                            {
+                                                Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+                                                Vertical = 10
+                                            },
+                                            RelativeSizeAxes = Axes.Both,
+                                            Children = new[]
+                                            {
+                                                new Container
+                                                {
+                                                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Children = new Drawable[]
+                                                    {
+                                                        new SectionContainer
+                                                        {
+                                                            Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
+                                                            Children = new[]
+                                                            {
+                                                                new Section("Room name")
+                                                                {
+                                                                    Child = NameField = new SettingsTextBox
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                        LengthLimit = 100
+                                                                    },
+                                                                },
+                                                                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,
+                                                                    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,
+                                                                    },
+                                                                },
+                                                                new Section("Password (optional)")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = new SettingsPasswordTextBox
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                        ReadOnly = true,
+                                                                    },
+                                                                },
+                                                            },
+                                                        },
+                                                        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[]
+                                                                            {
+                                                                                playlistLength = new OsuSpriteText
+                                                                                {
+                                                                                    Margin = new MarginPadding { Vertical = 5 },
+                                                                                    Colour = colours.Yellow,
+                                                                                    Font = OsuFont.GetFont(size: 12),
+                                                                                }
+                                                                            },
+                                                                            new Drawable[]
+                                                                            {
+                                                                                new PurpleTriangleButton
+                                                                                {
+                                                                                    RelativeSizeAxes = Axes.X,
+                                                                                    Height = 40,
+                                                                                    Text = "Edit playlist",
+                                                                                    Action = () => EditPlaylist?.Invoke()
+                                                                                }
+                                                                            }
+                                                                        },
+                                                                        RowDimensions = new[]
+                                                                        {
+                                                                            new Dimension(),
+                                                                            new Dimension(GridSizeMode.AutoSize),
+                                                                            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 = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
+                                                },
+                                                new FillFlowContainer
+                                                {
+                                                    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
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                        }
+                    },
+                    loadingLayer = new LoadingLayer(dimContent)
+                };
+
+                TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
+                RoomName.BindValueChanged(name => NameField.Text = name.NewValue, true);
+                Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
+                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 ?? TimeSpan.FromMinutes(30), true);
+
+                playlist.Items.BindTo(Playlist);
+                Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                ApplyButton.Enabled.Value = hasValidSettings;
+            }
+
+            private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) =>
+                playlistLength.Text = $"Length: {Playlist.GetTotalDuration()}";
+
+            private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0;
+
+            private void apply()
+            {
+                if (!ApplyButton.Enabled.Value)
+                    return;
+
+                hideError();
+
+                RoomName.Value = NameField.Text;
+                Availability.Value = AvailabilityPicker.Current.Value;
+                Type.Value = TypePicker.Current.Value;
+
+                if (int.TryParse(MaxParticipantsField.Text, out int max))
+                    MaxParticipants.Value = max;
+                else
+                    MaxParticipants.Value = null;
+
+                Duration.Value = DurationField.Current.Value;
+
+                manager?.CreateRoom(currentRoom.Value, onSuccess, onError);
+
+                loadingLayer.Show();
+            }
+
+            private void hideError() => ErrorText.FadeOut(50);
+
+            private void onSuccess(Room room) => loadingLayer.Hide();
+
+            private void onError(string text)
+            {
+                ErrorText.Text = text;
+                ErrorText.FadeIn(50);
+
+                loadingLayer.Hide();
+            }
+        }
+
+        public class CreateRoomButton : TriangleButton
+        {
+            public CreateRoomButton()
+            {
+                Text = "Create";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = colours.Yellow;
+                Triangles.ColourLight = colours.YellowLight;
+                Triangles.ColourDark = colours.YellowDark;
+            }
+        }
+
+        private class DurationDropdown : OsuDropdown<TimeSpan>
+        {
+            public DurationDropdown()
+            {
+                Menu.MaxHeight = 100;
+            }
+
+            protected override string GenerateItemText(TimeSpan item) => item.Humanize();
+        }
+    }
+}

From 34421c92327c00fb3574141271f6d6094f5f94da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 15:58:57 +0900
Subject: [PATCH 07135/10326] 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 2a08cb7867..fc01f9bf1d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1214.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1222.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 960959f367..cbf9f6f1bd 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1214.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1222.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a5bcb91c74..adbcc0ef1c 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.Framework.iOS" Version="2020.1214.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1222.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1214.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1222.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3cf889b7c5c4d8f4e8382ab5245c30a551b1f7e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 16:19:19 +0900
Subject: [PATCH 07136/10326] Fix some errors being completely ignored

---
 osu.Game/Screens/Multi/Components/RoomManager.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 482ee5492c..f78d0d979e 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -76,10 +76,7 @@ namespace osu.Game.Screens.Multi.Components
 
             req.Failure += exception =>
             {
-                if (req.Result != null)
-                    onError?.Invoke(req.Result.Error);
-                else
-                    Logger.Log($"Failed to create the room: {exception}", level: LogLevel.Important);
+                onError?.Invoke(req.Result?.Error ?? exception.Message);
             };
 
             api.Queue(req);

From 2d7174d99cc6e24b30f3266a32cd86fe9c735c34 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 16:23:06 +0900
Subject: [PATCH 07137/10326] Add padding to song select

---
 .../Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index 157216e9bb..b2ae5402a1 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -24,6 +25,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
+        public RealtimeMatchSongSelect()
+        {
+            Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
+        }
+
         protected override bool OnStart()
         {
             var item = new PlaylistItem();

From 12876d7fb642500d7c5db31827a718a0af7b1798 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 16:50:30 +0900
Subject: [PATCH 07138/10326] Add very basic error handling on ChangeSettings
 calls

---
 .../StatefulMultiplayerClient.cs                    |  6 +++---
 .../Match/RealtimeMatchSettingsOverlay.cs           |  9 +++++++--
 .../RealtimeMultiplayer/RealtimeMatchSongSelect.cs  | 13 +++++++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index f56499f040..4ebd648689 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -127,10 +127,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </remarks>
         /// <param name="name">The new room name, if any.</param>
         /// <param name="item">The new room playlist item, if any.</param>
-        public void ChangeSettings(Optional<string> name = default, Optional<PlaylistItem> item = default)
+        public Task ChangeSettings(Optional<string> name = default, Optional<PlaylistItem> item = default)
         {
             if (Room == null)
-                return;
+                throw new InvalidOperationException("Must be joined to a match to change settings.");
 
             // A dummy playlist item filled with the current room settings (except mods).
             var existingPlaylistItem = new PlaylistItem
@@ -146,7 +146,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 RulesetID = Room.Settings.RulesetID
             };
 
-            ChangeSettings(new MultiplayerRoomSettings
+            return ChangeSettings(new MultiplayerRoomSettings
             {
                 Name = name.GetOr(Room.Settings.Name),
                 BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
index 5bd388cceb..3e495b490f 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
@@ -294,8 +294,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                 // Otherwise, update the room directly in preparation for it to be submitted to the API on match creation.
                 if (client.Room != null)
                 {
-                    client.ChangeSettings(name: NameField.Text);
-                    onSuccess(currentRoom.Value);
+                    client.ChangeSettings(name: NameField.Text).ContinueWith(t => Schedule(() =>
+                    {
+                        if (t.IsCompletedSuccessfully)
+                            onSuccess(currentRoom.Value);
+                        else
+                            onError(t.Exception?.Message ?? "Error changing settings.");
+                    }));
                 }
                 else
                 {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index b2ae5402a1..0feeed6fe5 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -6,6 +6,7 @@ using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -43,14 +44,22 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             // If the client is already in a room, update via the client.
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
             if (client.Room != null)
-                client.ChangeSettings(item: item);
+            {
+                client.ChangeSettings(item: item).ContinueWith(t => Schedule(() =>
+                {
+                    if (t.IsCompletedSuccessfully)
+                        this.Exit();
+                    else
+                        Logger.Log($"Could not use current beatmap ({t.Exception?.Message})", level: LogLevel.Important);
+                }));
+            }
             else
             {
                 playlist.Clear();
                 playlist.Add(item);
+                this.Exit();
             }
 
-            this.Exit();
             return true;
         }
 

From 30357a9447a077e09b7e0a11006fd48a156890a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 17:08:02 +0900
Subject: [PATCH 07139/10326] Add loading layer to multi song select to show
 during settings confirmation

---
 .../RealtimeMatchSongSelect.cs                | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index 0feeed6fe5..d4308d361c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -2,12 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using System.Threading;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Select;
@@ -26,11 +28,19 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
+        private LoadingLayer loadingLayer;
+
         public RealtimeMatchSongSelect()
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(loadingLayer = new LoadingLayer(Carousel));
+        }
+
         protected override bool OnStart()
         {
             var item = new PlaylistItem();
@@ -45,13 +55,20 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
             if (client.Room != null)
             {
-                client.ChangeSettings(item: item).ContinueWith(t => Schedule(() =>
+                loadingLayer.Show();
+
+                client.ChangeSettings(item: item).ContinueWith(t =>
                 {
-                    if (t.IsCompletedSuccessfully)
-                        this.Exit();
-                    else
-                        Logger.Log($"Could not use current beatmap ({t.Exception?.Message})", level: LogLevel.Important);
-                }));
+                    return Schedule(() =>
+                    {
+                        loadingLayer.Hide();
+
+                        if (t.IsCompletedSuccessfully)
+                            this.Exit();
+                        else
+                            Logger.Log($"Could not use current beatmap ({t.Exception?.Message})", level: LogLevel.Important);
+                    });
+                });
             }
             else
             {

From 59734229ff94bd907fd640374ce081c62581cb61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 17:21:53 +0900
Subject: [PATCH 07140/10326] Remove unused using

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index d4308d361c..f3dab93089 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using System.Threading;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;

From 3d5783a0eab3e1360dad85f9b6b5183c56467be9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 17:34:51 +0900
Subject: [PATCH 07141/10326] Improve variable names

---
 .../Sections/Graphics/LayoutSettings.cs        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 6ec5d1f03a..b722fd4137 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -140,20 +140,20 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     windowModeDropdown.Hide();
             }, true);
 
-            windowModeDropdown.Current.ValueChanged += v => updateResolutionDropdown();
+            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
 
-            currentDisplay.BindValueChanged(v => Schedule(() =>
+            currentDisplay.BindValueChanged(display => Schedule(() =>
             {
                 resolutions.RemoveRange(1, resolutions.Count - 1);
 
-                if (v.NewValue != null)
+                if (display.NewValue != null)
                 {
-                    resolutions.AddRange(v.NewValue.DisplayModes
-                                          .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
-                                          .OrderByDescending(m => m.Size.Width)
-                                          .ThenByDescending(m => m.Size.Height)
-                                          .Select(m => m.Size)
-                                          .Distinct());
+                    resolutions.AddRange(display.NewValue.DisplayModes
+                                                .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
+                                                .OrderByDescending(m => m.Size.Width)
+                                                .ThenByDescending(m => m.Size.Height)
+                                                .Select(m => m.Size)
+                                                .Distinct());
                 }
 
                 updateResolutionDropdown();

From 4f02928601b75ed162b6527b728cce8d971182cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 17:36:56 +0900
Subject: [PATCH 07142/10326] Change sorting to better handle portrait screens

---
 .../Overlays/Settings/Sections/Graphics/LayoutSettings.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index b722fd4137..3d3b543d70 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.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.Drawing;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -150,8 +151,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 {
                     resolutions.AddRange(display.NewValue.DisplayModes
                                                 .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
-                                                .OrderByDescending(m => m.Size.Width)
-                                                .ThenByDescending(m => m.Size.Height)
+                                                .OrderByDescending(m => Math.Max(m.Size.Height, m.Size.Width))
                                                 .Select(m => m.Size)
                                                 .Distinct());
                 }

From ce806dd880f58b03e18fdf80d76ce9f5c67c86e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 18:25:45 +0900
Subject: [PATCH 07143/10326] Replace the ready mark display with a state
 display, showing all participant states

---
 .../Multiplayer/TestSceneParticipantsList.cs  |   1 +
 .../TestSceneParticipantsList.cs              |  11 +-
 .../Participants/ParticipantPanel.cs          |  10 +-
 .../Participants/ReadyMark.cs                 |  51 -------
 .../Participants/StateDisplay.cs              | 128 ++++++++++++++++++
 5 files changed, 138 insertions(+), 63 deletions(-)
 delete mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
index 7bbec7d30e..360aa22af9 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Room.RecentParticipants.Add(new User
                 {
                     Username = "peppy",
+                    CurrentModeRank = 1234,
                     Id = 2
                 });
             }
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
index 8c997e9e32..35ea0d3813 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
 using osu.Game.Users;
@@ -65,13 +66,13 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         [Test]
         public void TestToggleReadyState()
         {
-            AddAssert("ready mark invisible", () => !this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+            AddAssert("ready mark invisible", () => !this.ChildrenOfType<StateDisplay>().Single().IsPresent);
 
             AddStep("make user ready", () => Client.ChangeState(MultiplayerUserState.Ready));
-            AddUntilStep("ready mark visible", () => this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+            AddUntilStep("ready mark visible", () => this.ChildrenOfType<StateDisplay>().Single().IsPresent);
 
             AddStep("make user idle", () => Client.ChangeState(MultiplayerUserState.Idle));
-            AddUntilStep("ready mark invisible", () => !this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+            AddUntilStep("ready mark invisible", () => !this.ChildrenOfType<StateDisplay>().Single().IsPresent);
         }
 
         [Test]
@@ -104,11 +105,11 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                     {
                         Id = i,
                         Username = $"User {i}",
+                        CurrentModeRank = RNG.Next(1, 100000),
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     });
 
-                    if (i % 2 == 0)
-                        Client.ChangeUserState(i, MultiplayerUserState.Ready);
+                    Client.ChangeUserState(i, (MultiplayerUserState)RNG.Next(0, (int)MultiplayerUserState.Results));
                 }
             });
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
index 002849a275..a4ff2ce346 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private ReadyMark readyMark;
+        private StateDisplay userStateDisplay;
         private SpriteIcon crown;
 
         public ParticipantPanel(MultiplayerRoomUser user)
@@ -122,12 +122,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
                                     }
                                 }
                             },
-                            readyMark = new ReadyMark
+                            userStateDisplay = new StateDisplay
                             {
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
                                 Margin = new MarginPadding { Right = 10 },
-                                Alpha = 0
                             }
                         }
                     }
@@ -144,10 +143,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
 
             const double fade_time = 50;
 
-            if (User.State == MultiplayerUserState.Ready)
-                readyMark.FadeIn(fade_time);
-            else
-                readyMark.FadeOut(fade_time);
+            userStateDisplay.Status = User.State;
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs
deleted file mode 100644
index df49d9342e..0000000000
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs
+++ /dev/null
@@ -1,51 +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.Sprites;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osuTK;
-
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
-{
-    public class ReadyMark : CompositeDrawable
-    {
-        public ReadyMark()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            InternalChild = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Spacing = new Vector2(5),
-                Children = new Drawable[]
-                {
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 12),
-                        Text = "ready",
-                        Colour = Color4Extensions.FromHex("#DDFFFF")
-                    },
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Icon = FontAwesome.Solid.CheckCircle,
-                        Size = new Vector2(12),
-                        Colour = Color4Extensions.FromHex("#AADD00")
-                    }
-                }
-            };
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
new file mode 100644
index 0000000000..db93525217
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
@@ -0,0 +1,128 @@
+// Copyright (c) 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.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.RealtimeMultiplayer;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+{
+    public class StateDisplay : CompositeDrawable
+    {
+        public StateDisplay()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        private MultiplayerUserState status;
+
+        private OsuSpriteText text;
+        private SpriteIcon icon;
+
+        private const double fade_time = 50;
+
+        public MultiplayerUserState Status
+        {
+            set
+            {
+                if (value == status)
+                    return;
+
+                status = value;
+
+                if (IsLoaded)
+                    updateStatus();
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Spacing = new Vector2(5),
+                Children = new Drawable[]
+                {
+                    text = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 12),
+                        Colour = Color4Extensions.FromHex("#DDFFFF")
+                    },
+                    icon = new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Icon = FontAwesome.Solid.CheckCircle,
+                        Size = new Vector2(12),
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateStatus();
+        }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private void updateStatus()
+        {
+            switch (status)
+            {
+                default:
+                    this.FadeOut(fade_time);
+                    return;
+
+                case MultiplayerUserState.Ready:
+                    text.Text = "ready";
+                    icon.Icon = FontAwesome.Solid.CheckCircle;
+                    icon.Colour = Color4Extensions.FromHex("#AADD00");
+                    break;
+
+                case MultiplayerUserState.WaitingForLoad:
+                    text.Text = "loading";
+                    icon.Icon = FontAwesome.Solid.PauseCircle;
+                    icon.Colour = colours.Yellow;
+                    break;
+
+                case MultiplayerUserState.Loaded:
+                    text.Text = "loaded";
+                    icon.Icon = FontAwesome.Solid.DotCircle;
+                    icon.Colour = colours.YellowLight;
+                    break;
+
+                case MultiplayerUserState.Playing:
+                    text.Text = "playing";
+                    icon.Icon = FontAwesome.Solid.PlayCircle;
+                    icon.Colour = colours.BlueLight;
+                    break;
+
+                case MultiplayerUserState.FinishedPlay:
+                    text.Text = "results pending";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                    icon.Colour = colours.BlueLighter;
+                    break;
+
+                case MultiplayerUserState.Results:
+                    text.Text = "results";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                    icon.Colour = colours.BlueLighter;
+                    break;
+            }
+
+            this.FadeIn(fade_time);
+        }
+    }
+}

From 23bf9c372c71d15049595955c22bda7df3939dfd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 18:26:39 +0900
Subject: [PATCH 07144/10326] Fix naming conflict with test scenes

---
 ...articipantsList.cs => TestSceneTimeshiftParticipantsList.cs} | 2 +-
 ...sList.cs => TestSceneRealtimeMultiplayerParticipantsList.cs} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneParticipantsList.cs => TestSceneTimeshiftParticipantsList.cs} (95%)
 rename osu.Game.Tests/Visual/RealtimeMultiplayer/{TestSceneParticipantsList.cs => TestSceneRealtimeMultiplayerParticipantsList.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs
index 360aa22af9..efc3be032c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs
@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneParticipantsList : MultiplayerTestScene
+    public class TestSceneTimeshiftParticipantsList : MultiplayerTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
similarity index 97%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
rename to osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
index 35ea0d3813..7fd31906f7 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
-    public class TestSceneParticipantsList : RealtimeMultiplayerTestScene
+    public class TestSceneRealtimeMultiplayerParticipantsList : RealtimeMultiplayerTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>

From 6517acc510885301d7bc0c3cf82d7638f7fc63cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 19:09:59 +0900
Subject: [PATCH 07145/10326] Add leaderboard display to realtime player

---
 .../RealtimeMultiplayer/RealtimePlayer.cs     | 23 +++++++++++++++++++
 osu.Game/Screens/Play/HUDOverlay.cs           |  7 +++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index c6d44686b5..453e7e6140 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
@@ -12,7 +13,9 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Play;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
+using osuTK;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
@@ -30,6 +33,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
         private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
+        private MultiplayerGameplayLeaderboard leaderboard;
+
         public RealtimePlayer(PlaylistItem playlistItem)
             : base(playlistItem, false)
         {
@@ -55,6 +60,24 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                     this.Exit();
                 });
             }
+
+            Debug.Assert(client.Room != null);
+
+            int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
+
+            // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
+            LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            const float padding = 44; // enough margin to avoid the hit error display.
+
+            leaderboard.Position = new Vector2(
+                padding,
+                padding + HUDOverlay.TopScoringElementsHeight);
         }
 
         private void onMatchStarted() => startedEvent.Set();
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 50195d571c..3dffab8102 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -28,6 +28,11 @@ namespace osu.Game.Screens.Play
 
         public const Easing FADE_EASING = Easing.Out;
 
+        /// <summary>
+        /// The total height of all the top of screen scoring elements.
+        /// </summary>
+        public float TopScoringElementsHeight { get; private set; }
+
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableComboCounter ComboCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
@@ -209,7 +214,7 @@ namespace osu.Game.Screens.Play
             // HACK: for now align with the accuracy counter.
             // this is done for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
             // it only works with the default skin due to padding offsetting it *just enough* to coexist.
-            topRightElements.Y = ToLocalSpace(AccuracyCounter.Drawable.ScreenSpaceDrawQuad.BottomRight).Y;
+            topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(AccuracyCounter.Drawable.ScreenSpaceDrawQuad.BottomRight).Y;
 
             bottomRightElements.Y = -Progress.Height;
         }

From e3483147e2f682000121bd1534f494efbd42e6c8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 22 Dec 2020 13:53:01 +0300
Subject: [PATCH 07146/10326] Move track looping logic into subscreens

---
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs | 52 ++++++++++++++++++
 osu.Game/Screens/Multi/Multiplayer.cs         | 53 -------------------
 2 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
index 0cc9a4354e..21316a98ce 100644
--- a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
@@ -9,6 +9,7 @@ using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.Multi.Match
@@ -23,6 +24,9 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
+        [Resolved]
+        private MusicController music { get; set; }
+
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -61,6 +65,30 @@ namespace osu.Game.Screens.Multi.Match
             var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID);
 
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
+            if (this.IsCurrentScreen())
+                applyTrackLooping();
+        }
+
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            music?.EnsurePlayingSomething();
+            applyTrackLooping();
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            cancelTrackLooping();
+            base.OnSuspending(next);
+        }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+
+            music?.EnsurePlayingSomething();
+            applyTrackLooping();
         }
 
         public override bool OnExiting(IScreen next)
@@ -68,7 +96,31 @@ namespace osu.Game.Screens.Multi.Match
             RoomManager?.PartRoom();
             Mods.Value = Array.Empty<Mod>();
 
+            cancelTrackLooping();
+
             return base.OnExiting(next);
         }
+
+        private void applyTrackLooping()
+        {
+            var track = Beatmap.Value?.Track;
+
+            if (track != null)
+            {
+                track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
+                track.Looping = true;
+            }
+        }
+
+        private void cancelTrackLooping()
+        {
+            var track = Beatmap?.Value?.Track;
+
+            if (track != null)
+            {
+                track.Looping = false;
+                track.RestartPoint = 0;
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index eae779421d..de2e0d58c9 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
@@ -198,8 +197,6 @@ namespace osu.Game.Screens.Multi
         {
             this.FadeIn();
             waves.Show();
-
-            beginHandlingTrack();
         }
 
         public override void OnResuming(IScreen last)
@@ -209,8 +206,6 @@ namespace osu.Game.Screens.Multi
 
             base.OnResuming(last);
 
-            beginHandlingTrack();
-
             UpdatePollingRate(isIdle.Value);
         }
 
@@ -219,8 +214,6 @@ namespace osu.Game.Screens.Multi
             this.ScaleTo(1.1f, 250, Easing.InSine);
             this.FadeOut(250);
 
-            endHandlingTrack();
-
             UpdatePollingRate(isIdle.Value);
         }
 
@@ -235,8 +228,6 @@ namespace osu.Game.Screens.Multi
             if (screenStack.CurrentScreen != null)
                 loungeSubScreen.MakeCurrent();
 
-            endHandlingTrack();
-
             base.OnExiting(next);
             return false;
         }
@@ -275,17 +266,6 @@ namespace osu.Game.Screens.Multi
         /// <returns>The created <see cref="Room"/>.</returns>
         protected virtual Room CreateNewRoom() => new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } };
 
-        private void beginHandlingTrack()
-        {
-            Beatmap.BindValueChanged(updateTrack, true);
-        }
-
-        private void endHandlingTrack()
-        {
-            cancelLooping();
-            Beatmap.ValueChanged -= updateTrack;
-        }
-
         private void screenPushed(IScreen lastScreen, IScreen newScreen)
         {
             subScreenChanged(lastScreen, newScreen);
@@ -322,43 +302,10 @@ namespace osu.Game.Screens.Multi
 
             UpdatePollingRate(isIdle.Value);
             createButton.FadeTo(newScreen is LoungeSubScreen ? 1 : 0, 200);
-
-            updateTrack();
         }
 
         protected IScreen CurrentSubScreen => screenStack.CurrentScreen;
 
-        private void updateTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
-        {
-            if (screenStack.CurrentScreen is RoomSubScreen)
-            {
-                var track = Beatmap.Value?.Track;
-
-                if (track != null)
-                {
-                    track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-                    track.Looping = true;
-
-                    music?.EnsurePlayingSomething();
-                }
-            }
-            else
-            {
-                cancelLooping();
-            }
-        }
-
-        private void cancelLooping()
-        {
-            var track = Beatmap?.Value?.Track;
-
-            if (track != null)
-            {
-                track.Looping = false;
-                track.RestartPoint = 0;
-            }
-        }
-
         protected abstract RoomManager CreateRoomManager();
 
         protected abstract LoungeSubScreen CreateLounge();

From 91d5c53643a7489066a23b36e6865d67c621ddf2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 22 Dec 2020 16:36:17 +0300
Subject: [PATCH 07147/10326] Add method for checking room joinability

---
 osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs        | 2 ++
 .../Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs     | 2 ++
 .../Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs   | 2 ++
 osu.Game/Screens/Multi/Components/RoomManager.cs            | 2 ++
 osu.Game/Screens/Multi/IRoomManager.cs                      | 6 ++++++
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs        | 3 +++
 6 files changed, 17 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
index 9dd4aea4bd..ea8fb4ef49 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room);
 
+        public bool CanJoinRoom(Room room) => true;
+
         public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
         {
         }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 1fcae9c709..55dbd1a7c6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -146,6 +146,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     onSuccess?.Invoke(room);
             }
 
+            public bool CanJoinRoom(Room room) => true;
+
             public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => throw new NotImplementedException();
 
             public void PartRoom() => throw new NotImplementedException();
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
index bbd7d84081..8fdb5d4093 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
@@ -161,6 +161,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 onSuccess?.Invoke(room);
             }
 
+            public bool CanJoinRoom(Room room) => true;
+
             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/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index f78d0d979e..3fcfe1df25 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -82,6 +82,8 @@ namespace osu.Game.Screens.Multi.Components
             api.Queue(req);
         }
 
+        public virtual bool CanJoinRoom(Room room) => true;
+
         private JoinRoomRequest currentJoinRoomRequest;
 
         public virtual void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs
index 630e3af91c..a1cff129a9 100644
--- a/osu.Game/Screens/Multi/IRoomManager.cs
+++ b/osu.Game/Screens/Multi/IRoomManager.cs
@@ -34,6 +34,12 @@ namespace osu.Game.Screens.Multi
         /// <param name="onError">An action to be invoked if an error occurred.</param>
         void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null);
 
+        /// <summary>
+        /// Whether the provided <paramref name="room"/> can be joined.
+        /// </summary>
+        /// <param name="room">The <see cref="Room"/> to check for.</param>
+        bool CanJoinRoom(Room room);
+
         /// <summary>
         /// Joins a <see cref="Room"/>.
         /// </summary>
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 7ce031e0e9..d8dc5f127a 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
 
@@ -40,6 +41,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 
+        public override bool CanJoinRoom(Room room) => !(room.Status.Value is RoomStatusEnded);
+
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 

From a64ffcd2949ca3f47c0bc3019de9596dc28e79d5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 22 Dec 2020 16:38:10 +0300
Subject: [PATCH 07148/10326] Refrain from joining room if not allowed

---
 osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index c7c37cbc0d..c1f69b779c 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -115,7 +115,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                     {
                         if (room == selectedRoom.Value)
                         {
-                            joinSelected();
+                            if (roomManager.CanJoinRoom(room))
+                                joinSelected();
+
                             return;
                         }
 

From 668f89d8b230103d8daee7fd639fde069baa4d99 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 22 Dec 2020 17:33:11 +0200
Subject: [PATCH 07149/10326] Copy test from #11019

---
 .../TestSceneSectionsContainer.cs             | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs
new file mode 100644
index 0000000000..5c2e6e457d
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneSectionsContainer : OsuManualInputManagerTestScene
+    {
+        private readonly SectionsContainer<TestSection> container;
+        private float custom;
+        private const float header_height = 100;
+
+        public TestSceneSectionsContainer()
+        {
+            container = new SectionsContainer<TestSection>
+            {
+                RelativeSizeAxes = Axes.Y,
+                Width = 300,
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+                FixedHeader = new Box
+                {
+                    Alpha = 0.5f,
+                    Width = 300,
+                    Height = header_height,
+                    Colour = Color4.Red
+                }
+            };
+            container.SelectedSection.ValueChanged += section =>
+            {
+                if (section.OldValue != null)
+                    section.OldValue.Selected = false;
+                if (section.NewValue != null)
+                    section.NewValue.Selected = true;
+            };
+            Add(container);
+        }
+
+        [Test]
+        public void TestSelection()
+        {
+            AddStep("clear", () => container.Clear());
+            AddStep("add 1/8th", () => append(1 / 8.0f));
+            AddStep("add third", () => append(1 / 3.0f));
+            AddStep("add half", () => append(1 / 2.0f));
+            AddStep("add full", () => append(1));
+            AddSliderStep("set custom", 0.1f, 1.1f, 0.5f, i => custom = i);
+            AddStep("add custom", () => append(custom));
+            AddStep("scroll to previous", () => container.ScrollTo(
+                container.Children.Reverse().SkipWhile(s => s != container.SelectedSection.Value).Skip(1).FirstOrDefault() ?? container.Children.First()
+            ));
+            AddStep("scroll to next", () => container.ScrollTo(
+                container.Children.SkipWhile(s => s != container.SelectedSection.Value).Skip(1).FirstOrDefault() ?? container.Children.Last()
+            ));
+            AddStep("scroll up", () => triggerUserScroll(1));
+            AddStep("scroll down", () => triggerUserScroll(-1));
+        }
+
+        [Test]
+        public void TestCorrectSectionSelected()
+        {
+            const int sections_count = 11;
+            float[] alternating = { 0.07f, 0.33f, 0.16f, 0.33f };
+            AddStep("clear", () => container.Clear());
+            AddStep("fill with sections", () =>
+            {
+                for (int i = 0; i < sections_count; i++)
+                    append(alternating[i % alternating.Length]);
+            });
+
+            void step(int scrollIndex)
+            {
+                AddStep($"scroll to section {scrollIndex + 1}", () => container.ScrollTo(container.Children[scrollIndex]));
+                AddUntilStep("correct section selected", () => container.SelectedSection.Value == container.Children[scrollIndex]);
+            }
+
+            for (int i = 1; i < sections_count; i++)
+                step(i);
+            for (int i = sections_count - 2; i >= 0; i--)
+                step(i);
+
+            AddStep("scroll almost to end", () => container.ScrollTo(container.Children[sections_count - 2]));
+            AddUntilStep("correct section selected", () => container.SelectedSection.Value == container.Children[sections_count - 2]);
+            AddStep("scroll down", () => triggerUserScroll(-1));
+            AddUntilStep("correct section selected", () => container.SelectedSection.Value == container.Children[sections_count - 1]);
+        }
+
+        private static readonly ColourInfo selected_colour = ColourInfo.GradientVertical(Color4.Yellow, Color4.Gold);
+        private static readonly ColourInfo default_colour = ColourInfo.GradientVertical(Color4.White, Color4.DarkGray);
+
+        private void append(float multiplier)
+        {
+            container.Add(new TestSection
+            {
+                Width = 300,
+                Height = (container.ChildSize.Y - header_height) * multiplier,
+                Colour = default_colour
+            });
+        }
+
+        private void triggerUserScroll(float direction)
+        {
+            InputManager.MoveMouseTo(container);
+            InputManager.ScrollVerticalBy(direction);
+        }
+
+        private class TestSection : Box
+        {
+            public bool Selected
+            {
+                set => Colour = value ? selected_colour : default_colour;
+            }
+        }
+    }
+}

From 78c14fd69693f688f40595699eba849486f49463 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 22 Dec 2020 17:36:44 +0200
Subject: [PATCH 07150/10326] Refactor code into UserTrackingScrollContainer

---
 .../Graphics/Containers/SectionsContainer.cs  |  4 +-
 .../Containers/UserTrackingScrollContainer.cs | 49 +++++++++++++++++++
 osu.Game/Overlays/OverlayScrollContainer.cs   |  4 +-
 osu.Game/Overlays/UserProfileOverlay.cs       |  2 +-
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 20 +-------
 5 files changed, 55 insertions(+), 24 deletions(-)
 create mode 100644 osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 81968de304..6e9520ef8f 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Graphics.Containers
 
         protected override Container<T> Content => scrollContentContainer;
 
-        private readonly OsuScrollContainer scrollContainer;
+        private readonly UserTrackingScrollContainer scrollContainer;
         private readonly Container headerBackgroundContainer;
         private readonly MarginPadding originalSectionsMargin;
         private Drawable expandableHeader, fixedHeader, footer, headerBackground;
@@ -139,7 +139,7 @@ namespace osu.Game.Graphics.Containers
         public void ScrollToTop() => scrollContainer.ScrollTo(0);
 
         [NotNull]
-        protected virtual OsuScrollContainer CreateScrollContainer() => new OsuScrollContainer();
+        protected virtual UserTrackingScrollContainer CreateScrollContainer() => new UserTrackingScrollContainer();
 
         [NotNull]
         protected virtual FlowContainer<T> CreateScrollContentContainer() =>
diff --git a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
new file mode 100644
index 0000000000..b8ce34b204
--- /dev/null
+++ b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.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;
+
+namespace osu.Game.Graphics.Containers
+{
+    public class UserTrackingScrollContainer : UserTrackingScrollContainer<Drawable>
+    {
+        public UserTrackingScrollContainer()
+        {
+        }
+
+        public UserTrackingScrollContainer(Direction direction)
+            : base(direction)
+        {
+        }
+    }
+
+    public class UserTrackingScrollContainer<T> : OsuScrollContainer<T>
+        where T : Drawable
+    {
+        /// <summary>
+        /// Whether the last scroll event was user triggered, directly on the scroll container.
+        /// </summary>
+        public bool UserScrolling { get; private set; }
+
+        public UserTrackingScrollContainer()
+        {
+        }
+
+        public UserTrackingScrollContainer(Direction direction)
+            : base(direction)
+        {
+        }
+
+        protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
+        {
+            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);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index b67d5db1a4..0004719b87 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -17,9 +17,9 @@ using osuTK.Graphics;
 namespace osu.Game.Overlays
 {
     /// <summary>
-    /// <see cref="OsuScrollContainer"/> which provides <see cref="ScrollToTopButton"/>. Mostly used in <see cref="FullscreenOverlay{T}"/>.
+    /// <see cref="UserTrackingScrollContainer"/> which provides <see cref="ScrollToTopButton"/>. Mostly used in <see cref="FullscreenOverlay{T}"/>.
     /// </summary>
-    public class OverlayScrollContainer : OsuScrollContainer
+    public class OverlayScrollContainer : UserTrackingScrollContainer
     {
         /// <summary>
         /// Scroll position at which the <see cref="ScrollToTopButton"/> will be shown.
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 81027667fa..7f29545c2e 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Overlays
                 RelativeSizeAxes = Axes.Both;
             }
 
-            protected override OsuScrollContainer CreateScrollContainer() => new OverlayScrollContainer();
+            protected override UserTrackingScrollContainer CreateScrollContainer() => new OverlayScrollContainer();
 
             protected override FlowContainer<ProfileSection> CreateScrollContentContainer() => new FillFlowContainer<ProfileSection>
             {
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index d76f0abb9e..e9a8d28316 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -901,15 +901,10 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        protected class CarouselScrollContainer : OsuScrollContainer<DrawableCarouselItem>
+        protected class CarouselScrollContainer : UserTrackingScrollContainer<DrawableCarouselItem>
         {
             private bool rightMouseScrollBlocked;
 
-            /// <summary>
-            /// Whether the last scroll event was user triggered, directly on the scroll container.
-            /// </summary>
-            public bool UserScrolling { get; private set; }
-
             public CarouselScrollContainer()
             {
                 // size is determined by the carousel itself, due to not all content necessarily being loaded.
@@ -919,19 +914,6 @@ namespace osu.Game.Screens.Select
                 Masking = false;
             }
 
-            // ReSharper disable once OptionalParameterHierarchyMismatch 2020.3 EAP4 bug. (https://youtrack.jetbrains.com/issue/RSRP-481535?p=RIDER-51910)
-            protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
-            {
-                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 2cf76ebc75c6e0dc4bfbe428a9ee099c21a5eeb9 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 22 Dec 2020 17:51:12 +0200
Subject: [PATCH 07151/10326] Scroll to 20% and select section intersecting
 below there

---
 .../Graphics/Containers/SectionsContainer.cs  | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 6e9520ef8f..b5f81c516a 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Layout;
+using osu.Framework.Utils;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -20,6 +21,8 @@ namespace osu.Game.Graphics.Containers
         where T : Drawable
     {
         public Bindable<T> SelectedSection { get; } = new Bindable<T>();
+        private Drawable lastClickedSection;
+        private T smallestSection;
 
         public Drawable ExpandableHeader
         {
@@ -131,10 +134,21 @@ namespace osu.Game.Graphics.Containers
             lastKnownScroll = float.NaN;
             headerHeight = float.NaN;
             footerHeight = float.NaN;
+
+            if (drawable == null)
+                return;
+
+            if (smallestSection == null || smallestSection.Height > drawable.Height)
+                smallestSection = drawable;
         }
 
-        public void ScrollTo(Drawable section) =>
-            scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - (FixedHeader?.BoundingBox.Height ?? 0));
+        private const float scroll_target_multiplier = 0.2f;
+
+        public void ScrollTo(Drawable section)
+        {
+            lastClickedSection = section;
+            scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - scrollContainer.DisplayableContent * scroll_target_multiplier - (FixedHeader?.BoundingBox.Height ?? 0));
+        }
 
         public void ScrollToTop() => scrollContainer.ScrollTo(0);
 
@@ -183,6 +197,10 @@ namespace osu.Game.Graphics.Containers
             {
                 lastKnownScroll = currentScroll;
 
+                // reset last clicked section because user started scrolling themselves
+                if (scrollContainer.UserScrolling)
+                    lastClickedSection = null;
+
                 if (ExpandableHeader != null && FixedHeader != null)
                 {
                     float offset = Math.Min(ExpandableHeader.LayoutSize.Y, currentScroll);
@@ -194,18 +212,27 @@ namespace osu.Game.Graphics.Containers
                 headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
                 headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
 
-                float scrollOffset = FixedHeader?.LayoutSize.Y ?? 0;
+                // scroll offset is our fixed header height if we have it plus 20% of content height
+                // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
+                // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
+                float sectionOrContent = Math.Min(smallestSection?.Height / 2.0f ?? 0, scrollContainer.DisplayableContent * 0.05f);
+                float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
                 Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 
-                if (scrollContainer.IsScrolledToEnd())
+                if (Precision.AlmostBigger(0, scrollContainer.Current))
                 {
-                    SelectedSection.Value = Children.LastOrDefault();
+                    SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();
+                    return;
                 }
-                else
+
+                if (Precision.AlmostBigger(scrollContainer.Current, scrollContainer.ScrollableExtent))
                 {
-                    SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault()
-                                            ?? Children.FirstOrDefault();
+                    SelectedSection.Value = lastClickedSection as T ?? Children.LastOrDefault();
+                    return;
                 }
+
+                SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault()
+                                        ?? Children.FirstOrDefault();
             }
         }
 

From 5efc3b94961cf918fa96b54818382e89b2cd9faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Dec 2020 21:12:28 +0100
Subject: [PATCH 07152/10326] Start state display as hidden

Would otherwise flicker for a few frames when a new user was added to
the list of participants.
---
 .../Multi/RealtimeMultiplayer/Participants/StateDisplay.cs       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
index db93525217..844f239363 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
         public StateDisplay()
         {
             AutoSizeAxes = Axes.Both;
+            Alpha = 0;
         }
 
         private MultiplayerUserState status;

From 4a677ecc190f0ec7b354db5f2436349353cd9f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Dec 2020 21:16:45 +0100
Subject: [PATCH 07153/10326] Make random state choice in test more robust

`RNG.Next(int, int)` is max-exclusive, so the random state choice would
actually never pick `MultiplayerUserState.Results` on its own. The only
reason why that state ever did show up was by a freak accident of sorts
(the logic in `TestRealtimeMultiplayerClient` would automatically
convert every `FinishedPlay` state to `Results`, up until seeing the
first player that was in the `Playing` state).
---
 .../TestSceneRealtimeMultiplayerParticipantsList.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
index 7fd31906f7..4221821496 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     });
 
-                    Client.ChangeUserState(i, (MultiplayerUserState)RNG.Next(0, (int)MultiplayerUserState.Results));
+                    Client.ChangeUserState(i, (MultiplayerUserState)RNG.Next(0, (int)MultiplayerUserState.Results + 1));
                 }
             });
         }

From 32728047044a426d2c076cc143d836412d53b7a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Dec 2020 22:31:40 +0100
Subject: [PATCH 07154/10326] Fix potential crash when no submission token

Can happen because `TimeshiftPlayer` will schedule a screen exit on
token retrieval failure, and `RealtimePlayer`'s BDL won't even attempt
to create a leaderboard in that case.
---
 .../Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 453e7e6140..7824b414f2 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -6,6 +6,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
@@ -33,6 +34,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
         private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
+        [CanBeNull]
         private MultiplayerGameplayLeaderboard leaderboard;
 
         public RealtimePlayer(PlaylistItem playlistItem)
@@ -72,6 +74,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         protected override void Update()
         {
             base.Update();
+            adjustLeaderboardPosition();
+        }
+
+        private void adjustLeaderboardPosition()
+        {
+            if (leaderboard == null)
+                return;
 
             const float padding = 44; // enough margin to avoid the hit error display.
 

From 7751ef4f3eadf4fa4583e3815bc6f3a95c5c354b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 23 Dec 2020 05:49:18 +0300
Subject: [PATCH 07155/10326] Revert previous logic of join guarding

---
 osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs        | 2 --
 .../Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs     | 2 --
 .../Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs   | 2 --
 osu.Game/Screens/Multi/Components/RoomManager.cs            | 2 --
 osu.Game/Screens/Multi/IRoomManager.cs                      | 6 ------
 osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs  | 4 +---
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs        | 3 ---
 7 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
index ea8fb4ef49..9dd4aea4bd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
@@ -24,8 +24,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room);
 
-        public bool CanJoinRoom(Room room) => true;
-
         public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
         {
         }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 55dbd1a7c6..1fcae9c709 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -146,8 +146,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     onSuccess?.Invoke(room);
             }
 
-            public bool CanJoinRoom(Room room) => true;
-
             public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => throw new NotImplementedException();
 
             public void PartRoom() => throw new NotImplementedException();
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
index 8fdb5d4093..bbd7d84081 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
@@ -161,8 +161,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 onSuccess?.Invoke(room);
             }
 
-            public bool CanJoinRoom(Room room) => true;
-
             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/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 3fcfe1df25..f78d0d979e 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -82,8 +82,6 @@ namespace osu.Game.Screens.Multi.Components
             api.Queue(req);
         }
 
-        public virtual bool CanJoinRoom(Room room) => true;
-
         private JoinRoomRequest currentJoinRoomRequest;
 
         public virtual void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs
index a1cff129a9..630e3af91c 100644
--- a/osu.Game/Screens/Multi/IRoomManager.cs
+++ b/osu.Game/Screens/Multi/IRoomManager.cs
@@ -34,12 +34,6 @@ namespace osu.Game.Screens.Multi
         /// <param name="onError">An action to be invoked if an error occurred.</param>
         void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null);
 
-        /// <summary>
-        /// Whether the provided <paramref name="room"/> can be joined.
-        /// </summary>
-        /// <param name="room">The <see cref="Room"/> to check for.</param>
-        bool CanJoinRoom(Room room);
-
         /// <summary>
         /// Joins a <see cref="Room"/>.
         /// </summary>
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index c1f69b779c..c7c37cbc0d 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -115,9 +115,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                     {
                         if (room == selectedRoom.Value)
                         {
-                            if (roomManager.CanJoinRoom(room))
-                                joinSelected();
-
+                            joinSelected();
                             return;
                         }
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index d8dc5f127a..7ce031e0e9 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -9,7 +9,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
 
@@ -41,8 +40,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 
-        public override bool CanJoinRoom(Room room) => !(room.Status.Value is RoomStatusEnded);
-
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 

From 3aa2b228380ccc8a2ce3e9043c5dcd43a80a6b97 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 23 Dec 2020 05:52:10 +0300
Subject: [PATCH 07156/10326] Add early check for room status before joining

---
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 7ce031e0e9..484d5cce0b 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
 
@@ -41,7 +42,15 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-            => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
+        {
+            if (room.Status.Value is RoomStatusEnded)
+            {
+                onError?.Invoke("Cannot join an ended room.");
+                return;
+            }
+
+            base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
+        }
 
         public override void PartRoom()
         {

From 45dcd3242db7cc84753577d4de75ba571e75deb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 13:57:48 +0900
Subject: [PATCH 07157/10326] Add comment explaining why things are done where
 they are

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 484d5cce0b..f982574eb3 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -43,6 +43,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
         {
+            // this is done here as a pre-check to avoid clicking on already closed rooms in the lounge from triggering a server join.
+            // should probably be done at a higher level, but due to the current structure of things this is the easiest place for now.
             if (room.Status.Value is RoomStatusEnded)
             {
                 onError?.Invoke("Cannot join an ended room.");

From be427a4ec0fd7f30189f3b37941844483ad95d62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 14:20:35 +0900
Subject: [PATCH 07158/10326] Fix realtime leaderboard showing accuracy based
 on final base score, not rolling

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 23 ++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 10d0cc2865..4b2e2bf715 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -233,7 +233,7 @@ namespace osu.Game.Rulesets.Scoring
         }
 
         /// <summary>
-        /// Given a minimal set of inputs, return the computed score and accuracy for the tracked beatmap / mods combination.
+        /// Given a minimal set of inputs, return the computed score and accuracy for the tracked beatmap / mods combination, at the current point in time.
         /// </summary>
         /// <param name="mode">The <see cref="ScoringMode"/> to compute the total score in.</param>
         /// <param name="maxCombo">The maximum combo achievable in the beatmap.</param>
@@ -252,15 +252,28 @@ namespace osu.Game.Rulesets.Scoring
                 computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
             }
 
-            double accuracy = calculateAccuracyRatio(computedBaseScore);
+            double pointInTimeAccuracy = calculateAccuracyRatio(computedBaseScore, true);
             double comboRatio = calculateComboRatio(maxCombo);
 
-            double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts);
+            double score = GetScore(mode, maxAchievableCombo, calculateAccuracyRatio(computedBaseScore), comboRatio, scoreResultCounts);
 
-            return (score, accuracy);
+            return (score, pointInTimeAccuracy);
+        }
+
+        /// <summary>
+        /// Get the accuracy fraction for the provided base score.
+        /// </summary>
+        /// <param name="baseScore">The score to be used for accuracy calculation.</param>
+        /// <param name="preferRolling">Whether the rolling base score should be used (ie. for the current point in time based on Apply/Reverted results).</param>
+        /// <returns>The computed accuracy.</returns>
+        private double calculateAccuracyRatio(double baseScore, bool preferRolling = false)
+        {
+            if (preferRolling && rollingMaxBaseScore != 0)
+                return baseScore / rollingMaxBaseScore;
+
+            return maxBaseScore > 0 ? baseScore / maxBaseScore : 0;
         }
 
-        private double calculateAccuracyRatio(double baseScore) => maxBaseScore > 0 ? baseScore / maxBaseScore : 0;
         private double calculateComboRatio(int maxCombo) => maxAchievableCombo > 0 ? (double)maxCombo / maxAchievableCombo : 1;
 
         private double getBonusScore(Dictionary<HitResult, int> statistics)

From dec997c0f49687800b9c90641299d38b4c9e060d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 14:44:20 +0900
Subject: [PATCH 07159/10326] Fix flashlight not updating its position during
 replay rewinding

Closes #11260
---
 osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index ac20407ed2..3f770cfb5e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 var destination = e.MousePosition;
 
                 FlashlightPosition = Interpolation.ValueAt(
-                    Math.Clamp(Clock.ElapsedFrameTime, 0, follow_delay), position, destination, 0, follow_delay, Easing.Out);
+                    Math.Clamp(Math.Abs(Clock.ElapsedFrameTime), 0, follow_delay), position, destination, 0, follow_delay, Easing.Out);
 
                 return base.OnMouseMove(e);
             }

From 286884421d74d8cd565533bdd723448b88416dc3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 23 Dec 2020 08:47:34 +0300
Subject: [PATCH 07160/10326] Apply track looping and play on track change

---
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
index 21316a98ce..4f5d2a5b3e 100644
--- a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
@@ -41,6 +41,37 @@ namespace osu.Game.Screens.Multi.Match
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
+
+            if (music != null)
+                music.TrackChanged += applyToTrack;
+        }
+
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+            applyToTrack();
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            resetTrack();
+            base.OnSuspending(next);
+        }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+            applyToTrack();
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            RoomManager?.PartRoom();
+            Mods.Value = Array.Empty<Mod>();
+
+            resetTrack();
+
+            return base.OnExiting(next);
         }
 
         private void selectedItemChanged()
@@ -65,54 +96,25 @@ namespace osu.Game.Screens.Multi.Match
             var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID);
 
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
-            if (this.IsCurrentScreen())
-                applyTrackLooping();
         }
 
-        public override void OnEntering(IScreen last)
+        private void applyToTrack(WorkingBeatmap _ = default, TrackChangeDirection __ = default)
         {
-            base.OnEntering(last);
+            if (!this.IsCurrentScreen())
+                return;
 
-            music?.EnsurePlayingSomething();
-            applyTrackLooping();
-        }
-
-        public override void OnSuspending(IScreen next)
-        {
-            cancelTrackLooping();
-            base.OnSuspending(next);
-        }
-
-        public override void OnResuming(IScreen last)
-        {
-            base.OnResuming(last);
-
-            music?.EnsurePlayingSomething();
-            applyTrackLooping();
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            RoomManager?.PartRoom();
-            Mods.Value = Array.Empty<Mod>();
-
-            cancelTrackLooping();
-
-            return base.OnExiting(next);
-        }
-
-        private void applyTrackLooping()
-        {
             var track = Beatmap.Value?.Track;
 
             if (track != null)
             {
                 track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
                 track.Looping = true;
+
+                music?.EnsurePlayingSomething();
             }
         }
 
-        private void cancelTrackLooping()
+        private void resetTrack()
         {
             var track = Beatmap?.Value?.Track;
 

From 00d50150de6e39cbdff44e7f5a98c41a3c57b6a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 15:49:22 +0900
Subject: [PATCH 07161/10326] Ensure the current room is left at a mutliplayer
 client level on client disconnection

---
 .../RealtimeMultiplayer/RealtimeMultiplayerClient.cs   |  4 ++++
 .../RealtimeMultiplayer/StatefulMultiplayerClient.cs   | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 75bb578a29..5cbf3be8ca 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -130,7 +130,11 @@ namespace osu.Game.Online.RealtimeMultiplayer
         public override async Task LeaveRoom()
         {
             if (!isConnected.Value)
+            {
+                // even if not connected, make sure the local room state can be cleaned up.
+                await base.LeaveRoom();
                 return;
+            }
 
             if (Room == null)
                 return;
diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 4ebd648689..9680387fcc 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -75,6 +75,16 @@ namespace osu.Game.Online.RealtimeMultiplayer
         // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
         private int playlistItemId;
 
+        protected StatefulMultiplayerClient()
+        {
+            IsConnected.BindValueChanged(connected =>
+            {
+                // clean up local room state on server disconnect.
+                if (!connected.NewValue)
+                    LeaveRoom();
+            });
+        }
+
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
         /// </summary>

From 12df3056e6d27d2da5d29a172708e849162eaa3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 15:58:50 +0900
Subject: [PATCH 07162/10326] Ensure appropriate screens handle exiting when
 the server gets disconnected

I would have liked for this to be handled via the `OnRoomChanged` event
flow, but this isn't present in RealtimeMatchSubScreen due to
inheritence woes.
---
 .../RealtimeMultiplayer/RealtimeMatchSubScreen.cs  | 14 ++++++++++++++
 .../Multi/RealtimeMultiplayer/RealtimePlayer.cs    | 12 ++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index cdab1435c0..8405fc196b 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -4,8 +4,10 @@
 using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -34,6 +36,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         private RealtimeMatchSettingsOverlay settingsOverlay;
 
+        private IBindable<bool> isConnected;
+
         public RealtimeMatchSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New match" : room.Name.Value;
@@ -173,6 +177,16 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
 
             client.LoadRequested += onLoadRequested;
+
+            isConnected = client.IsConnected.GetBoundCopy();
+            isConnected.BindValueChanged(connected =>
+            {
+                if (!connected.NewValue)
+                {
+                    Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
+                    Schedule(this.Exit);
+                }
+            }, true);
         }
 
         public override bool OnBackButton()
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index c6d44686b5..d74ccdd32f 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -6,6 +6,7 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
@@ -30,6 +31,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
         private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
+        private IBindable<bool> isConnected;
+
         public RealtimePlayer(PlaylistItem playlistItem)
             : base(playlistItem, false)
         {
@@ -43,6 +46,15 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             client.MatchStarted += onMatchStarted;
             client.ResultsReady += onResultsReady;
+
+            isConnected = client.IsConnected.GetBoundCopy();
+            isConnected.BindValueChanged(connected =>
+            {
+                if (!connected.NewValue)
+                    // messaging to the user about this disconnect will be provided by the RealtimeMatchSubScreen.
+                    Schedule(this.Exit);
+            }, true);
+
             client.ChangeState(MultiplayerUserState.Loaded);
 
             if (!startedEvent.Wait(TimeSpan.FromSeconds(30)))

From a1d42dc4a061a8fb2f50064c485cbd3cf07186be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:17:55 +0900
Subject: [PATCH 07163/10326] Don't allow creating or joining a room when not
 connected to server

---
 .../Screens/Multi/Lounge/LoungeSubScreen.cs     |  2 +-
 .../RealtimeLoungeSubScreen.cs                  | 17 +++++++++++++++++
 .../RealtimeMultiplayer/RealtimeRoomManager.cs  |  6 ++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 44c893363b..6b08745dd7 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Multi.Lounge
         /// <summary>
         /// Push a room as a new subscreen.
         /// </summary>
-        public void Open(Room room)
+        public virtual void Open(Room room)
         {
             // Handles the case where a room is clicked 3 times in quick succession
             if (!this.IsCurrentScreen())
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
index 9fbf0c4654..b53ec94519 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
@@ -1,7 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
+using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
@@ -13,5 +16,19 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         protected override FilterControl CreateFilterControl() => new RealtimeFilterControl();
 
         protected override RoomSubScreen CreateRoomSubScreen(Room room) => new RealtimeMatchSubScreen(room);
+
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
+
+        public override void Open(Room room)
+        {
+            if (!client.IsConnected.Value)
+            {
+                Logger.Log("Not currently connected to the multiplayer server.", LoggingTarget.Runtime, LogLevel.Important);
+                return;
+            }
+
+            base.Open(room);
+        }
     }
 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index f982574eb3..2f60f504de 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -43,6 +43,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
         {
+            if (!multiplayerClient.IsConnected.Value)
+            {
+                onError?.Invoke("Not currently connected to the multiplayer server.");
+                return;
+            }
+
             // this is done here as a pre-check to avoid clicking on already closed rooms in the lounge from triggering a server join.
             // should probably be done at a higher level, but due to the current structure of things this is the easiest place for now.
             if (room.Status.Value is RoomStatusEnded)

From 569c4092efe42a55caabc5a08c7f7bc227f3b1e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:19:03 +0900
Subject: [PATCH 07164/10326] Move notification to stateful client so it is
 only shown to the user from one location

---
 .../RealtimeMultiplayer/StatefulMultiplayerClient.cs       | 4 ++++
 .../Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs    | 7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 9680387fcc..79d82a8d02 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Online.API;
@@ -81,7 +82,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
             {
                 // clean up local room state on server disconnect.
                 if (!connected.NewValue)
+                {
+                    Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
                     LeaveRoom();
+                }
             });
         }
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index 8405fc196b..807ea74404 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -18,6 +17,7 @@ using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
+using ParticipantsList = osu.Game.Screens.Multi.RealtimeMultiplayer.Participants.ParticipantsList;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                                                                     new Drawable[] { new ParticipantsListHeader() },
                                                                     new Drawable[]
                                                                     {
-                                                                        new Participants.ParticipantsList
+                                                                        new ParticipantsList
                                                                         {
                                                                             RelativeSizeAxes = Axes.Both
                                                                         },
@@ -182,10 +182,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             isConnected.BindValueChanged(connected =>
             {
                 if (!connected.NewValue)
-                {
-                    Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
                     Schedule(this.Exit);
-                }
             }, true);
         }
 

From f5d27b40a8f5c9dd8b3e849360425ed540b79c39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:32:58 +0900
Subject: [PATCH 07165/10326] Standardise flow for aborting realtime player
 exit to avoid double-exit call

---
 .../Multi/RealtimeMultiplayer/RealtimePlayer.cs      | 12 ++++++------
 osu.Game/Screens/Play/Player.cs                      |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index d74ccdd32f..edec40890e 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -51,8 +51,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             isConnected.BindValueChanged(connected =>
             {
                 if (!connected.NewValue)
+                {
+                    startedEvent.Set();
+
                     // messaging to the user about this disconnect will be provided by the RealtimeMatchSubScreen.
-                    Schedule(this.Exit);
+                    Schedule(PerformImmediateExit);
+                }
             }, true);
 
             client.ChangeState(MultiplayerUserState.Loaded);
@@ -61,11 +65,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 Logger.Log("Failed to start the multiplayer match in time.", LoggingTarget.Runtime, LogLevel.Important);
 
-                Schedule(() =>
-                {
-                    ValidForResume = false;
-                    this.Exit();
-                });
+                Schedule(PerformImmediateExit);
             }
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c539dff5d9..c6265c48d2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -386,7 +386,7 @@ namespace osu.Game.Screens.Play
                         if (!this.IsCurrentScreen()) return;
 
                         fadeOut(true);
-                        performImmediateExit();
+                        PerformImmediateExit();
                     },
                 },
                 failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
@@ -458,7 +458,7 @@ namespace osu.Game.Screens.Play
             return playable;
         }
 
-        private void performImmediateExit()
+        protected void PerformImmediateExit()
         {
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
@@ -498,7 +498,7 @@ namespace osu.Game.Screens.Play
             RestartRequested?.Invoke();
 
             if (this.IsCurrentScreen())
-                performImmediateExit();
+                PerformImmediateExit();
             else
                 this.MakeCurrent();
         }

From 91021eb8c45b0826bf0503cc9d5d4fac822fe005 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:49:17 +0900
Subject: [PATCH 07166/10326] Remove unused using

---
 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index edec40890e..9e2ba9b04a 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
-using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Scoring;

From d27b83d678bb4c9f0525b685880a5e9dd136ee90 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:51:11 +0900
Subject: [PATCH 07167/10326] More correctly handle fire-and-forget async call

---
 .../RealtimeMultiplayer/RealtimePlayer.cs     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 9e2ba9b04a..0f8c0f247c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -51,21 +51,25 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 if (!connected.NewValue)
                 {
-                    startedEvent.Set();
-
                     // messaging to the user about this disconnect will be provided by the RealtimeMatchSubScreen.
-                    Schedule(PerformImmediateExit);
+                    failAndBail();
                 }
             }, true);
 
-            client.ChangeState(MultiplayerUserState.Loaded);
+            client.ChangeState(MultiplayerUserState.Loaded).ContinueWith(task =>
+                failAndBail(task.Exception?.Message ?? "Server error"), TaskContinuationOptions.NotOnRanToCompletion);
 
             if (!startedEvent.Wait(TimeSpan.FromSeconds(30)))
-            {
-                Logger.Log("Failed to start the multiplayer match in time.", LoggingTarget.Runtime, LogLevel.Important);
+                failAndBail("Failed to start the multiplayer match in time.");
+        }
 
-                Schedule(PerformImmediateExit);
-            }
+        private void failAndBail(string message = null)
+        {
+            if (!string.IsNullOrEmpty(message))
+                Logger.Log(message, LoggingTarget.Runtime, LogLevel.Important);
+
+            startedEvent.Set();
+            Schedule(PerformImmediateExit);
         }
 
         private void onMatchStarted() => startedEvent.Set();

From c3c3364d399b915f9d0d3044dc3cd045830bd3dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:56:51 +0900
Subject: [PATCH 07168/10326] Simplify error handling of JoinRoom call

---
 .../RealtimeRoomManager.cs                    | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 2f60f504de..8bdf2bdc1a 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -83,15 +83,19 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         {
             Debug.Assert(room.RoomID.Value != null);
 
-            var joinTask = multiplayerClient.JoinRoom(room);
-            joinTask.ContinueWith(_ => Schedule(() => onSuccess?.Invoke(room)), TaskContinuationOptions.OnlyOnRanToCompletion);
-            joinTask.ContinueWith(t =>
+            multiplayerClient.JoinRoom(room).ContinueWith(t =>
             {
-                PartRoom();
-                if (t.Exception != null)
-                    Logger.Error(t.Exception, "Failed to join multiplayer room.");
-                Schedule(() => onError?.Invoke(t.Exception?.ToString() ?? string.Empty));
-            }, TaskContinuationOptions.NotOnRanToCompletion);
+                if (t.IsCompletedSuccessfully)
+                    Schedule(() => onSuccess?.Invoke(room));
+                else
+                {
+                    if (t.Exception != null)
+                        Logger.Error(t.Exception, "Failed to join multiplayer room.");
+
+                    PartRoom();
+                    Schedule(() => onError?.Invoke(t.Exception?.ToString() ?? string.Empty));
+                }
+            });
         }
 
         private void updatePolling()

From 1864da00e69806eefb389fd0a5742c0477eb419d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 17:10:02 +0900
Subject: [PATCH 07169/10326] Add extension method to handle cases of
 fire-and-forget async usage

---
 osu.Game/Extensions/TaskExtensions.cs | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 osu.Game/Extensions/TaskExtensions.cs

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
new file mode 100644
index 0000000000..913a622d9b
--- /dev/null
+++ b/osu.Game/Extensions/TaskExtensions.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 System.Threading.Tasks;
+using osu.Framework.Logging;
+
+namespace osu.Game.Extensions
+{
+    public static class TaskExtensions
+    {
+        /// <summary>
+        /// Denote a task which is to be run without local error handling logic, where failure is not catastrophic.
+        /// Avoids unobserved exceptions from being fired.
+        /// </summary>
+        /// <param name="task">The task.</param>
+        /// <param name="logOnError">Whether errors should be logged as important, or silently ignored.</param>
+        public static void FireAndForget(this Task task, bool logOnError = false)
+        {
+            task.ContinueWith(t =>
+            {
+                if (logOnError)
+                    Logger.Log($"Error running task: {t.Exception?.Message ?? "unknown"}", LoggingTarget.Runtime, LogLevel.Important);
+            }, TaskContinuationOptions.NotOnRanToCompletion);
+        }
+    }
+}

From 7cc38f03d10a44c30c5edb59e28f2bdc46e377dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 17:10:34 +0900
Subject: [PATCH 07170/10326] Use extension method in all call sites of
 fire-and-forget async usage

---
 .../RealtimeMultiplayer/StatefulMultiplayerClient.cs       | 5 +++--
 .../Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs | 7 ++++---
 .../RealtimeMultiplayer/Participants/ParticipantPanel.cs   | 3 ++-
 .../Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs   | 2 +-
 .../Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs       | 3 ++-
 .../Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs    | 4 ++--
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs       | 4 +++-
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 79d82a8d02..3196f10f6f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable enable
@@ -14,6 +14,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
+using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -84,7 +85,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 if (!connected.NewValue)
                 {
                     Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
-                    LeaveRoom();
+                    LeaveRoom().FireAndForget();
                 }
             });
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
index 09487e9831..59f9d5e1ec 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
@@ -7,6 +7,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Online.API;
@@ -105,13 +106,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                 return;
 
             if (localUser.State == MultiplayerUserState.Idle)
-                Client.ChangeState(MultiplayerUserState.Ready);
+                Client.ChangeState(MultiplayerUserState.Ready).FireAndForget(true);
             else
             {
                 if (Room?.Host?.Equals(localUser) == true)
-                    Client.StartMatch();
+                    Client.StartMatch().FireAndForget(true);
                 else
-                    Client.ChangeState(MultiplayerUserState.Idle);
+                    Client.ChangeState(MultiplayerUserState.Idle).FireAndForget(true);
             }
         }
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
index a4ff2ce346..fd16754045 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -176,7 +177,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
                         if (Room.Host?.UserID != api.LocalUser.Value.Id)
                             return;
 
-                        Client.TransferHost(targetUser);
+                        Client.TransferHost(targetUser).FireAndForget(true);
                     })
                 };
             }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index f3dab93089..4a8e398008 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
                 client.ChangeSettings(item: item).ContinueWith(t =>
                 {
-                    return Schedule(() =>
+                    Schedule(() =>
                     {
                         loadingLayer.Hide();
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index 6455701d31..d5b891f2cc 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
@@ -21,7 +22,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             base.OnResuming(last);
 
             if (client.Room != null)
-                client.ChangeState(MultiplayerUserState.Idle);
+                client.ChangeState(MultiplayerUserState.Idle).FireAndForget(true);
         }
 
         protected override void UpdatePollingRate(bool isIdle)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 0f8c0f247c..7c6b33cddd 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -56,8 +56,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 }
             }, true);
 
-            client.ChangeState(MultiplayerUserState.Loaded).ContinueWith(task =>
-                failAndBail(task.Exception?.Message ?? "Server error"), TaskContinuationOptions.NotOnRanToCompletion);
+            client.ChangeState(MultiplayerUserState.Loaded)
+                  .ContinueWith(task => failAndBail(task.Exception?.Message ?? "Server error"), TaskContinuationOptions.NotOnRanToCompletion);
 
             if (!startedEvent.Wait(TimeSpan.FromSeconds(30)))
                 failAndBail("Failed to start the multiplayer match in time.");
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 8bdf2bdc1a..98a0e5b694 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
+using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -68,7 +69,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             var joinedRoom = JoinedRoom.Value;
 
             base.PartRoom();
-            multiplayerClient.LeaveRoom();
+
+            multiplayerClient.LeaveRoom().FireAndForget();
 
             // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
             // This is delayed one frame because upon exiting the match subscreen, multiplayer updates the polling rate and messes with polling.

From 0ddcab574f05416953361e920a1af22856a16828 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 17:14:58 +0900
Subject: [PATCH 07171/10326] Rename method to avoid weird code analysis rule

---
 osu.Game/Extensions/TaskExtensions.cs                       | 2 +-
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs | 2 +-
 .../Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs  | 6 +++---
 .../RealtimeMultiplayer/Participants/ParticipantPanel.cs    | 2 +-
 .../Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs        | 2 +-
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index 913a622d9b..a1215d786b 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Extensions
         /// </summary>
         /// <param name="task">The task.</param>
         /// <param name="logOnError">Whether errors should be logged as important, or silently ignored.</param>
-        public static void FireAndForget(this Task task, bool logOnError = false)
+        public static void CatchUnobservedExceptions(this Task task, bool logOnError = false)
         {
             task.ContinueWith(t =>
             {
diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 3196f10f6f..7b375ca475 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 if (!connected.NewValue)
                 {
                     Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
-                    LeaveRoom().FireAndForget();
+                    LeaveRoom().CatchUnobservedExceptions();
                 }
             });
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
index 59f9d5e1ec..5bead2b271 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
@@ -106,13 +106,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                 return;
 
             if (localUser.State == MultiplayerUserState.Idle)
-                Client.ChangeState(MultiplayerUserState.Ready).FireAndForget(true);
+                Client.ChangeState(MultiplayerUserState.Ready).CatchUnobservedExceptions(true);
             else
             {
                 if (Room?.Host?.Equals(localUser) == true)
-                    Client.StartMatch().FireAndForget(true);
+                    Client.StartMatch().CatchUnobservedExceptions(true);
                 else
-                    Client.ChangeState(MultiplayerUserState.Idle).FireAndForget(true);
+                    Client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
             }
         }
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
index fd16754045..85393d1bae 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
                         if (Room.Host?.UserID != api.LocalUser.Value.Id)
                             return;
 
-                        Client.TransferHost(targetUser).FireAndForget(true);
+                        Client.TransferHost(targetUser).CatchUnobservedExceptions(true);
                     })
                 };
             }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index d5b891f2cc..6685cf52d6 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             base.OnResuming(last);
 
             if (client.Room != null)
-                client.ChangeState(MultiplayerUserState.Idle).FireAndForget(true);
+                client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
         }
 
         protected override void UpdatePollingRate(bool isIdle)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 98a0e5b694..cd337bbb55 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             base.PartRoom();
 
-            multiplayerClient.LeaveRoom().FireAndForget();
+            multiplayerClient.LeaveRoom().CatchUnobservedExceptions();
 
             // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
             // This is delayed one frame because upon exiting the match subscreen, multiplayer updates the polling rate and messes with polling.

From 3c8f871b2815ca8f4618dbf2e51870e31324cae8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 17:39:08 +0900
Subject: [PATCH 07172/10326] Move player constructor configuration to
 dedicated class; add AllowRestart parameter

---
 .../TestSceneHoldNoteInput.cs                 |   6 +-
 .../TestSceneOutOfOrderHits.cs                |   6 +-
 .../TestSceneLegacyBeatmapSkin.cs             |   6 +-
 .../TestSceneOutOfOrderHits.cs                |   6 +-
 .../TestSceneSliderInput.cs                   |   6 +-
 .../Screens/Multi/Play/TimeshiftPlayer.cs     |   4 +-
 .../RealtimeMultiplayer/RealtimePlayer.cs     |   7 +-
 osu.Game/Screens/Play/Player.cs               | 140 +++++++++---------
 osu.Game/Screens/Play/PlayerConfiguration.cs  |  23 +++
 osu.Game/Screens/Play/ReplayPlayer.cs         |   4 +-
 osu.Game/Screens/Ranking/ResultsScreen.cs     |  15 +-
 osu.Game/Tests/Visual/TestPlayer.cs           |   6 +-
 12 files changed, 146 insertions(+), 83 deletions(-)
 create mode 100644 osu.Game/Screens/Play/PlayerConfiguration.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 5cb1519196..596430f9e5 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -355,7 +355,11 @@ namespace osu.Game.Rulesets.Mania.Tests
             protected override bool PauseOnFocusLost => false;
 
             public ScoreAccessibleReplayPlayer(Score score)
-                : base(score, false, false)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
             {
             }
         }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index cecac38f70..18891f8c58 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -176,7 +176,11 @@ namespace osu.Game.Rulesets.Mania.Tests
             protected override bool PauseOnFocusLost => false;
 
             public ScoreAccessibleReplayPlayer(Score score)
-                : base(score, false, false)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
             {
             }
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 3ff37c4147..a768626005 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -74,7 +74,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             private readonly bool userHasCustomColours;
 
             public ExposedPlayer(bool userHasCustomColours)
-                : base(false, false)
+                : base(new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
             {
                 this.userHasCustomColours = userHasCustomColours;
             }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index 32a36ab317..296b421a11 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -439,7 +439,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             protected override bool PauseOnFocusLost => false;
 
             public ScoreAccessibleReplayPlayer(Score score)
-                : base(score, false, false)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
             {
             }
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 0164fb8bf4..2cc031405e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -378,7 +378,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             protected override bool PauseOnFocusLost => false;
 
             public ScoreAccessibleReplayPlayer(Score score)
-                : base(score, false, false)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
             {
             }
         }
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index e8462088f1..f07f1c2fb0 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Screens.Multi.Play
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        public TimeshiftPlayer(PlaylistItem playlistItem, bool allowPause = true)
-            : base(allowPause)
+        public TimeshiftPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
+            : base(configuration)
         {
             PlaylistItem = playlistItem;
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index c6d44686b5..4b878f43d0 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -12,6 +12,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Play;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
@@ -31,7 +32,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
         public RealtimePlayer(PlaylistItem playlistItem)
-            : base(playlistItem, false)
+            : base(playlistItem, new PlayerConfiguration
+            {
+                AllowPause = false,
+                AllowRestart = false,
+            })
         {
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c539dff5d9..a1c91ab26b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -128,18 +128,14 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected virtual bool CheckModsAllowFailure() => Mods.Value.OfType<IApplicableFailOverride>().All(m => m.PerformFail());
 
-        private readonly bool allowPause;
-        private readonly bool showResults;
+        public readonly PlayerConfiguration Configuration;
 
         /// <summary>
         /// Create a new player instance.
         /// </summary>
-        /// <param name="allowPause">Whether pausing should be allowed. If not allowed, attempting to pause will quit.</param>
-        /// <param name="showResults">Whether results screen should be pushed on completion.</param>
-        public Player(bool allowPause = true, bool showResults = true)
+        public Player(PlayerConfiguration configuration = null)
         {
-            this.allowPause = allowPause;
-            this.showResults = showResults;
+            this.Configuration = configuration ??= new PlayerConfiguration();
         }
 
         private GameplayBeatmap gameplayBeatmap;
@@ -317,59 +313,77 @@ namespace osu.Game.Screens.Play
             }
         };
 
-        private Drawable createOverlayComponents(WorkingBeatmap working) => new Container
+        private Drawable createOverlayComponents(WorkingBeatmap working)
         {
-            RelativeSizeAxes = Axes.Both,
-            Children = new[]
+            var container = new Container
             {
-                DimmableStoryboard.OverlayLayerContainer.CreateProxy(),
-                BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)
+                RelativeSizeAxes = Axes.Both,
+                Children = new[]
                 {
-                    Clock = DrawableRuleset.FrameStableClock,
-                    ProcessCustomClock = false,
-                    Breaks = working.Beatmap.Breaks
-                },
-                // display the cursor above some HUD elements.
-                DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
-                DrawableRuleset.ResumeOverlay?.CreateProxy() ?? new Container(),
-                HUDOverlay = new HUDOverlay(ScoreProcessor, HealthProcessor, DrawableRuleset, Mods.Value)
-                {
-                    HoldToQuit =
+                    DimmableStoryboard.OverlayLayerContainer.CreateProxy(),
+                    BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)
                     {
-                        Action = performUserRequestedExit,
-                        IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
+                        Clock = DrawableRuleset.FrameStableClock,
+                        ProcessCustomClock = false,
+                        Breaks = working.Beatmap.Breaks
                     },
-                    PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
-                    KeyCounter =
+                    // display the cursor above some HUD elements.
+                    DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
+                    DrawableRuleset.ResumeOverlay?.CreateProxy() ?? new Container(),
+                    HUDOverlay = new HUDOverlay(ScoreProcessor, HealthProcessor, DrawableRuleset, Mods.Value)
                     {
-                        AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded },
-                        IsCounting = false
+                        HoldToQuit =
+                        {
+                            Action = performUserRequestedExit,
+                            IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
+                        },
+                        PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
+                        KeyCounter =
+                        {
+                            AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded },
+                            IsCounting = false
+                        },
+                        RequestSeek = time =>
+                        {
+                            GameplayClockContainer.Seek(time);
+                            GameplayClockContainer.Start();
+                        },
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre
                     },
-                    RequestSeek = time =>
+                    skipOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
                     {
-                        GameplayClockContainer.Seek(time);
-                        GameplayClockContainer.Start();
+                        RequestSkip = GameplayClockContainer.Skip
                     },
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
-                },
-                skipOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
-                {
-                    RequestSkip = GameplayClockContainer.Skip
-                },
-                FailOverlay = new FailOverlay
-                {
-                    OnRetry = Restart,
-                    OnQuit = performUserRequestedExit,
-                },
-                PauseOverlay = new PauseOverlay
-                {
-                    OnResume = Resume,
-                    Retries = RestartCount,
-                    OnRetry = Restart,
-                    OnQuit = performUserRequestedExit,
-                },
-                new HotkeyRetryOverlay
+                    FailOverlay = new FailOverlay
+                    {
+                        OnRetry = Restart,
+                        OnQuit = performUserRequestedExit,
+                    },
+                    PauseOverlay = new PauseOverlay
+                    {
+                        OnResume = Resume,
+                        Retries = RestartCount,
+                        OnRetry = Restart,
+                        OnQuit = performUserRequestedExit,
+                    },
+                    new HotkeyExitOverlay
+                    {
+                        Action = () =>
+                        {
+                            if (!this.IsCurrentScreen()) return;
+
+                            fadeOut(true);
+                            performImmediateExit();
+                        },
+                    },
+                    failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
+                }
+            };
+
+            if (Configuration.AllowRestart)
+            {
+                container.Add(new HotkeyRetryOverlay
                 {
                     Action = () =>
                     {
@@ -378,20 +392,11 @@ namespace osu.Game.Screens.Play
                         fadeOut(true);
                         Restart();
                     },
-                },
-                new HotkeyExitOverlay
-                {
-                    Action = () =>
-                    {
-                        if (!this.IsCurrentScreen()) return;
-
-                        fadeOut(true);
-                        performImmediateExit();
-                    },
-                },
-                failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
+                });
             }
-        };
+
+            return container;
+        }
 
         private void onBreakTimeChanged(ValueChangedEvent<bool> isBreakTime)
         {
@@ -490,6 +495,9 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public void Restart()
         {
+            if (!Configuration.AllowRestart)
+                return;
+
             // at the point of restarting the track should either already be paused or the volume should be zero.
             // stopping here is to ensure music doesn't become audible after exiting back to PlayerLoader.
             musicController.Stop();
@@ -529,7 +537,7 @@ namespace osu.Game.Screens.Play
 
             ValidForResume = false;
 
-            if (!showResults) return;
+            if (!Configuration.ShowResults) return;
 
             scoreSubmissionTask ??= Task.Run(async () =>
             {
@@ -628,7 +636,7 @@ namespace osu.Game.Screens.Play
 
         private bool canPause =>
             // must pass basic screen conditions (beatmap loaded, instance allows pause)
-            LoadedBeatmapSuccessfully && allowPause && ValidForResume
+            LoadedBeatmapSuccessfully && Configuration.AllowPause && ValidForResume
             // replays cannot be paused and exit immediately
             && !DrawableRuleset.HasReplayLoaded.Value
             // cannot pause if we are already in a fail state
diff --git a/osu.Game/Screens/Play/PlayerConfiguration.cs b/osu.Game/Screens/Play/PlayerConfiguration.cs
new file mode 100644
index 0000000000..475a234679
--- /dev/null
+++ b/osu.Game/Screens/Play/PlayerConfiguration.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.
+
+namespace osu.Game.Screens.Play
+{
+    public class PlayerConfiguration
+    {
+        /// <summary>
+        /// Whether pausing should be allowed. If not allowed, attempting to pause will quit.
+        /// </summary>
+        public bool AllowPause { get; set; } = true;
+
+        /// <summary>
+        /// Whether results screen should be pushed on completion.
+        /// </summary>
+        public bool ShowResults { get; set; } = true;
+
+        /// <summary>
+        /// Whether the player should be allowed to trigger a restart.
+        /// </summary>
+        public bool AllowRestart { get; set; } = true;
+    }
+}
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index a07213cb33..e23cc22929 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -16,8 +16,8 @@ namespace osu.Game.Screens.Play
         // Disallow replays from failing. (see https://github.com/ppy/osu/issues/6108)
         protected override bool CheckModsAllowFailure() => false;
 
-        public ReplayPlayer(Score score, bool allowPause = true, bool showResults = true)
-            : base(allowPause, showResults)
+        public ReplayPlayer(Score score, PlayerConfiguration configuration = null)
+            : base(configuration)
         {
             Score = score;
         }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 528a1842af..8a12427798 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -164,15 +164,18 @@ namespace osu.Game.Screens.Ranking
             {
                 buttons.Add(new RetryButton { Width = 300 });
 
-                AddInternal(new HotkeyRetryOverlay
+                if (player?.Configuration.AllowRestart == true)
                 {
-                    Action = () =>
+                    AddInternal(new HotkeyRetryOverlay
                     {
-                        if (!this.IsCurrentScreen()) return;
+                        Action = () =>
+                        {
+                            if (!this.IsCurrentScreen()) return;
 
-                        player?.Restart();
-                    },
-                });
+                            player?.Restart();
+                        },
+                    });
+                }
             }
         }
 
diff --git a/osu.Game/Tests/Visual/TestPlayer.cs b/osu.Game/Tests/Visual/TestPlayer.cs
index f016d29f38..f47391ce6a 100644
--- a/osu.Game/Tests/Visual/TestPlayer.cs
+++ b/osu.Game/Tests/Visual/TestPlayer.cs
@@ -37,7 +37,11 @@ namespace osu.Game.Tests.Visual
         public readonly List<JudgementResult> Results = new List<JudgementResult>();
 
         public TestPlayer(bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)
-            : base(allowPause, showResults)
+            : base(new PlayerConfiguration
+            {
+                AllowPause = allowPause,
+                ShowResults = showResults
+            })
         {
             PauseOnFocusLost = pauseOnFocusLost;
         }

From f9fd909187c3839101e3c52aa476e2460b3e0778 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 18:07:38 +0900
Subject: [PATCH 07173/10326] Fix missed inspections

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a1c91ab26b..f1fb27e154 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public Player(PlayerConfiguration configuration = null)
         {
-            this.Configuration = configuration ??= new PlayerConfiguration();
+            Configuration = configuration ?? new PlayerConfiguration();
         }
 
         private GameplayBeatmap gameplayBeatmap;

From 94e4928c4b5feb2bb404173e27fadedbb5d5468d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 11:27:15 +0100
Subject: [PATCH 07174/10326] Bring back accidentally-removed license header

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 7b375ca475..6331d324a6 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -1,4 +1,4 @@
-
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable enable

From 6a80e1303d540187093c794302f5982fa171ae0e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 23 Dec 2020 12:56:04 +0100
Subject: [PATCH 07175/10326] LINQ-ify Import() logic and ignore case of file
 extensions.

---
 osu.Game/OsuGameBase.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index ca87772209..7def93255b 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -397,18 +397,13 @@ namespace osu.Game
 
         public virtual async Task Import(params ImportTask[] tasks)
         {
-            var importTasks = new List<Task>();
-
-            foreach (var extension in tasks.Select(t => Path.GetExtension(t.Path)).Distinct())
+            var extensions = tasks.Select(t => Path.GetExtension(t.Path).ToLowerInvariant()).Distinct();
+            await Task.WhenAll(extensions.Select(ext =>
             {
-                var importList = tasks.Where(t => t.Path.EndsWith(extension, StringComparison.OrdinalIgnoreCase));
-                var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(extension));
+                var imports = tasks.Where(t => t.Path.EndsWith(ext, StringComparison.OrdinalIgnoreCase));
 
-                if (importer != null)
-                    importTasks.Add(importer.Import(importList.ToArray()));
-            }
-
-            await Task.WhenAll(importTasks);
+                return fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(ext))?.Import(imports.ToArray()) ?? Task.CompletedTask;
+            }));
         }
 
         public IEnumerable<string> HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions);

From ea5da53597e2d1a57b76b6f4d80429645ccc6657 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 23 Dec 2020 13:31:27 +0100
Subject: [PATCH 07176/10326] Handle URL links with the osu scheme.

---
 osu.Android/OsuGameActivity.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index e801c2ca6e..55484c439a 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -16,8 +16,11 @@ namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
     [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataScheme = osu_url_scheme)]
     public class OsuGameActivity : AndroidGameActivity
     {
+        private const string osu_url_scheme = "osu";
+
         private OsuGameAndroid game;
 
         protected override Framework.Game CreateGame() => game = new OsuGameAndroid(this);
@@ -49,6 +52,8 @@ namespace osu.Android
                 case Intent.ActionDefault:
                     if (intent.Scheme == ContentResolver.SchemeContent)
                         handleImportFromUri(intent.Data);
+                    else if (intent.Scheme == osu_url_scheme)
+                        Task.Run(() => game.HandleLink(intent.DataString));
                     break;
 
                 case Intent.ActionSend:

From 78b8c60f1949aef5c5a63febcf46968038dd9287 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 23 Dec 2020 13:38:33 +0100
Subject: [PATCH 07177/10326] Opt for SingleInstance launch mode

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 55484c439a..dfdecdca2e 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -14,7 +14,7 @@ using osu.Framework.Android;
 
 namespace osu.Android
 {
-    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
+    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
     [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataScheme = osu_url_scheme)]
     public class OsuGameActivity : AndroidGameActivity

From 582b0d2a7467f54f4ae125f79fe6c5611fb88f66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 13:47:28 +0100
Subject: [PATCH 07178/10326] Revert logic to be closer to original

Note the reversal of the order of operations in `endHandlingTrack()`
(done for extra safety, to ensure no more value changed events can be
fired at the point of cancelling looping).
---
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
index 4f5d2a5b3e..b9d7408946 100644
--- a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
@@ -41,27 +41,24 @@ namespace osu.Game.Screens.Multi.Match
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
-
-            if (music != null)
-                music.TrackChanged += applyToTrack;
         }
 
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
-            applyToTrack();
+            beginHandlingTrack();
         }
 
         public override void OnSuspending(IScreen next)
         {
-            resetTrack();
+            endHandlingTrack();
             base.OnSuspending(next);
         }
 
         public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
-            applyToTrack();
+            beginHandlingTrack();
         }
 
         public override bool OnExiting(IScreen next)
@@ -69,7 +66,7 @@ namespace osu.Game.Screens.Multi.Match
             RoomManager?.PartRoom();
             Mods.Value = Array.Empty<Mod>();
 
-            resetTrack();
+            endHandlingTrack();
 
             return base.OnExiting(next);
         }
@@ -98,7 +95,18 @@ namespace osu.Game.Screens.Multi.Match
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
-        private void applyToTrack(WorkingBeatmap _ = default, TrackChangeDirection __ = default)
+        private void beginHandlingTrack()
+        {
+            Beatmap.BindValueChanged(applyLoopingToTrack, true);
+        }
+
+        private void endHandlingTrack()
+        {
+            Beatmap.ValueChanged -= applyLoopingToTrack;
+            cancelTrackLooping();
+        }
+
+        private void applyLoopingToTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
         {
             if (!this.IsCurrentScreen())
                 return;
@@ -114,7 +122,7 @@ namespace osu.Game.Screens.Multi.Match
             }
         }
 
-        private void resetTrack()
+        private void cancelTrackLooping()
         {
             var track = Beatmap?.Value?.Track;
 

From c5692a5d6aa51c51513e8a34c5ac023cb9326847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 14:18:24 +0100
Subject: [PATCH 07179/10326] Re-enable carousel selection after error

---
 .../Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index 4a8e398008..8f317800e3 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -65,7 +65,10 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                         if (t.IsCompletedSuccessfully)
                             this.Exit();
                         else
+                        {
                             Logger.Log($"Could not use current beatmap ({t.Exception?.Message})", level: LogLevel.Important);
+                            Carousel.AllowSelection = true;
+                        }
                     });
                 });
             }

From 4296f61d6cbe0a8d25a94a9ae22274139c8b1b1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 22:39:14 +0900
Subject: [PATCH 07180/10326] Tidy up event flow of change settings call

---
 .../RealtimeMultiplayer/StatefulMultiplayerClient.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 6331d324a6..dc999ee2be 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -369,7 +369,6 @@ namespace osu.Game.Online.RealtimeMultiplayer
             if (Room == null)
                 return;
 
-            // Update a few properties of the room instantaneously.
             Schedule(() =>
             {
                 if (Room == null)
@@ -377,6 +376,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
                 Debug.Assert(apiRoom != null);
 
+                // Update a few properties of the room instantaneously.
                 Room.Settings = settings;
                 apiRoom.Name.Value = Room.Settings.Name;
 
@@ -385,12 +385,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 apiRoom.Playlist.Clear();
 
                 RoomChanged?.Invoke();
+
+                var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
+                req.Success += res => updatePlaylist(settings, res);
+
+                api.Queue(req);
             });
-
-            var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-            req.Success += res => updatePlaylist(settings, res);
-
-            api.Queue(req);
         }
 
         private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)

From 980e85ce25f087f28306c530e15b3d7916b2b5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 15:51:26 +0100
Subject: [PATCH 07181/10326] Refactor player exit logic to convey intention
 better

---
 .../RealtimeMultiplayer/RealtimePlayer.cs     |  4 ++--
 osu.Game/Screens/Play/Player.cs               | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 0d8e636450..e467e5fcf8 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                     startedEvent.Set();
 
                     // messaging to the user about this disconnect will be provided by the RealtimeMatchSubScreen.
-                    Schedule(PerformImmediateExit);
+                    Schedule(() => PerformExit(false));
                 }
             }, true);
 
@@ -71,7 +71,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 Logger.Log("Failed to start the multiplayer match in time.", LoggingTarget.Runtime, LogLevel.Important);
 
-                Schedule(PerformImmediateExit);
+                Schedule(() => PerformExit(false));
             }
 
             Debug.Assert(client.Room != null);
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c6265c48d2..2bc84ce5d5 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -386,7 +386,7 @@ namespace osu.Game.Screens.Play
                         if (!this.IsCurrentScreen()) return;
 
                         fadeOut(true);
-                        PerformImmediateExit();
+                        PerformExit(true);
                     },
                 },
                 failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
@@ -458,20 +458,30 @@ namespace osu.Game.Screens.Play
             return playable;
         }
 
-        protected void PerformImmediateExit()
+        /// <summary>
+        /// Exits the <see cref="Player"/>.
+        /// </summary>
+        /// <param name="userRequested">
+        /// Whether the exit is requested by the user, or a higher-level game component.
+        /// Pausing is allowed only in the former case.
+        /// </param>
+        protected void PerformExit(bool userRequested)
         {
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
 
             ValidForResume = false;
 
-            performUserRequestedExit();
+            if (!this.IsCurrentScreen()) return;
+
+            if (userRequested)
+                performUserRequestedExit();
+            else
+                this.Exit();
         }
 
         private void performUserRequestedExit()
         {
-            if (!this.IsCurrentScreen()) return;
-
             if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
             {
                 failAnimation.FinishTransforms(true);
@@ -498,7 +508,7 @@ namespace osu.Game.Screens.Play
             RestartRequested?.Invoke();
 
             if (this.IsCurrentScreen())
-                PerformImmediateExit();
+                PerformExit(true);
             else
                 this.MakeCurrent();
         }

From 3b0bf1136642c40fd189cbbd1940d3121f286e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 17:01:01 +0100
Subject: [PATCH 07182/10326] Fix JoinRoom failing to return canceled token

As it turns out, `Task.FromCanceled` expects to receive an already
cancelled `CancellationToken`, which `CancellationToken.None` is not.
---
 .../Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 5cbf3be8ca..026b7176d1 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
         {
             if (!isConnected.Value)
-                return Task.FromCanceled<MultiplayerRoom>(CancellationToken.None);
+                return Task.FromCanceled<MultiplayerRoom>(new CancellationToken(true));
 
             return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
         }

From e4959489b70d61f76c6f25e0c7125fd24d96becc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 17:08:28 +0100
Subject: [PATCH 07183/10326] Improve user-facing error messages in room
 settings

---
 .../Match/RealtimeMatchSettingsOverlay.cs                  | 3 ++-
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs       | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
index 3e495b490f..a93b1b09d1 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -299,7 +300,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                         if (t.IsCompletedSuccessfully)
                             onSuccess(currentRoom.Value);
                         else
-                            onError(t.Exception?.Message ?? "Error changing settings.");
+                            onError(t.Exception?.AsSingular().Message ?? "Error changing settings.");
                     }));
                 }
                 else
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index cd337bbb55..eb6e5fad07 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
 using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
@@ -91,11 +92,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                     Schedule(() => onSuccess?.Invoke(room));
                 else
                 {
+                    const string message = "Failed to join multiplayer room.";
+
                     if (t.Exception != null)
-                        Logger.Error(t.Exception, "Failed to join multiplayer room.");
+                        Logger.Error(t.Exception, message);
 
                     PartRoom();
-                    Schedule(() => onError?.Invoke(t.Exception?.ToString() ?? string.Empty));
+                    Schedule(() => onError?.Invoke(t.Exception?.AsSingular().Message ?? message));
                 }
             });
         }

From e89583d732e5c9996534bdb89a8ee42470cbe530 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 01:33:19 +0900
Subject: [PATCH 07184/10326] Prefer connecting to dev server when running in
 DEBUG

---
 osu.Game/Online/API/APIAccess.cs                          | 8 +++++++-
 .../RealtimeMultiplayer/RealtimeMultiplayerClient.cs      | 4 ++++
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs     | 4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index fe500b9548..ca457ccf71 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -26,9 +26,15 @@ namespace osu.Game.Online.API
 
         private readonly OAuth authentication;
 
+#if DEBUG
+        public string Endpoint => @"https://dev.ppy.sh";
+        private const string client_secret = @"3LP2mhUrV89xxzD1YKNndXHEhWWCRLPNKioZ9ymT";
+#else
         public string Endpoint => @"https://osu.ppy.sh";
-        private const string client_id = @"5";
         private const string client_secret = @"FGc9GAtyHzeQDshWP5Ah7dega8hJACAJpQtw6OXk";
+#endif
+
+        private const string client_id = @"5";
 
         private readonly Queue<APIRequest> queue = new Queue<APIRequest>();
 
diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 75bb578a29..4ec5b9af40 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -19,7 +19,11 @@ namespace osu.Game.Online.RealtimeMultiplayer
 {
     public class RealtimeMultiplayerClient : StatefulMultiplayerClient
     {
+#if DEBUG
+        private const string endpoint = "https://dev.ppy.sh/multiplayer";
+#else
         private const string endpoint = "https://spectator.ppy.sh/multiplayer";
+#endif
 
         public override IBindable<bool> IsConnected => isConnected;
 
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 0167a5d025..c9203b595e 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -104,7 +104,11 @@ namespace osu.Game.Online.Spectator
             }
         }
 
+#if DEBUG
+        private const string endpoint = "https://dev.ppy.sh/spectator";
+#else
         private const string endpoint = "https://spectator.ppy.sh/spectator";
+#endif
 
         protected virtual async Task Connect()
         {

From 9843da59f4866918391902de30125577b60c1464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 20:29:17 +0100
Subject: [PATCH 07185/10326] Fix intermittent test fail due to duplicate user

`TestSceneRealtimeReadyButton` was manually adding `API.LocalUser`,
which wasn't actually needed. The base `RealtimeMultiplayerTestScene` by
default creates a new room as `API.LocalUser`, therefore automatically
adding that user to the room - and as such there is no need to add them
manually unless the `joinRoom` ctor param is specified as `false`.
---
 .../Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
index b7cd81fb32..e9d3ddb32d 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
@@ -55,8 +55,6 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                     }
                 }
             };
-
-            Client.AddUser(API.LocalUser.Value);
         });
 
         [Test]

From 47020c888731c2370d6f81fbfe9f11d6e7fcfdc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 21:00:47 +0100
Subject: [PATCH 07186/10326] Add failing test cases

---
 .../TestSceneRealtimeMultiplayer.cs           | 24 +++++++++++++++++++
 .../TestRealtimeMultiplayerClient.cs          |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
index 80955ca380..5cf80df6aa 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using NUnit.Framework;
 using osu.Game.Screens.Multi.Components;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
@@ -15,6 +17,28 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
         }
 
+        [Test]
+        public void TestOneUserJoinedMultipleTimes()
+        {
+            var user = new User { Id = 33 };
+
+            AddRepeatStep("add user multiple times", () => Client.AddUser(user), 3);
+
+            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
+        }
+
+        [Test]
+        public void TestOneUserLeftMultipleTimes()
+        {
+            var user = new User { Id = 44 };
+
+            AddStep("add user", () => Client.AddUser(user));
+            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
+
+            AddRepeatStep("remove user multiple times", () => Client.RemoveUser(user), 3);
+            AddAssert("room has 1 user", () => Client.Room?.Users.Count == 1);
+        }
+
         private class TestRealtimeMultiplayer : Screens.Multi.RealtimeMultiplayer.RealtimeMultiplayer
         {
             protected override RoomManager CreateRoomManager() => new TestRealtimeRoomManager();
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
index de52633c88..52047016e2 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         public void RemoveUser(User user)
         {
             Debug.Assert(Room != null);
-            ((IMultiplayerClient)this).UserLeft(Room.Users.Single(u => u.User == user));
+            ((IMultiplayerClient)this).UserLeft(new MultiplayerRoomUser(user.Id));
 
             Schedule(() =>
             {

From a71496bc4e9f0386d13b295eb92496f33144e5b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 20:34:19 +0100
Subject: [PATCH 07187/10326] Sanity check received user joined messages

While test failures fixed in 9843da5 were a shortcoming of the test,
they exposed a potential vulnerable point of the multiplayer client
logic. In case of unreliable message delivery it is not unreasonable
that duplicate messages might arrive, in which case the same scenario
that failed in the tests could crash the game.

To ensure that is not the case, explicitly screen each new joined user
against the room user list, to ensure that duplicates do not show up.
`UserLeft` is already tolerant in that respect (if a user is requested
to be removed twice by the server, the second removal just won't do
anything).
---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 6331d324a6..e8dbeda9cb 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -226,6 +226,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 if (Room == null)
                     return;
 
+                // for sanity, ensure that there can be no duplicate users in the room user list.
+                if (Room.Users.Any(existing => existing.UserID == user.UserID))
+                    return;
+
                 Room.Users.Add(user);
 
                 RoomChanged?.Invoke();

From 05d9f2376224b42d9ee56f8ee094374a15dc2801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 16:38:18 +0100
Subject: [PATCH 07188/10326] Move out create room button to separate class

---
 osu.Game/Screens/Multi/CreateRoomButton.cs | 31 ++++++++++++++++++++++
 osu.Game/Screens/Multi/Multiplayer.cs      | 23 ----------------
 2 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/CreateRoomButton.cs

diff --git a/osu.Game/Screens/Multi/CreateRoomButton.cs b/osu.Game/Screens/Multi/CreateRoomButton.cs
new file mode 100644
index 0000000000..b501de46ef
--- /dev/null
+++ b/osu.Game/Screens/Multi/CreateRoomButton.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Multi.Match.Components;
+using osuTK;
+
+namespace osu.Game.Screens.Multi
+{
+    public class CreateRoomButton : PurpleTriangleButton
+    {
+        public CreateRoomButton()
+        {
+            Size = new Vector2(150, Header.HEIGHT - 20);
+            Margin = new MarginPadding
+            {
+                Top = 10,
+                Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Triangles.TriangleScale = 1.5f;
+
+            Text = "Create room";
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index de2e0d58c9..a957eb6824 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -21,9 +21,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.Users;
-using osuTK;
 
 namespace osu.Game.Screens.Multi
 {
@@ -332,26 +330,5 @@ namespace osu.Game.Screens.Multi
                 protected override double TransformDuration => 200;
             }
         }
-
-        public class CreateRoomButton : PurpleTriangleButton
-        {
-            public CreateRoomButton()
-            {
-                Size = new Vector2(150, Header.HEIGHT - 20);
-                Margin = new MarginPadding
-                {
-                    Top = 10,
-                    Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                Triangles.TriangleScale = 1.5f;
-
-                Text = "Create room";
-            }
-        }
     }
 }

From c13acb609aed79df56e883586697be71b72e74c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 21:50:29 +0100
Subject: [PATCH 07189/10326] Move out sizing logic to multiplayer screen

---
 osu.Game/Screens/Multi/CreateRoomButton.cs | 12 ------------
 osu.Game/Screens/Multi/Multiplayer.cs      |  7 +++++++
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Multi/CreateRoomButton.cs b/osu.Game/Screens/Multi/CreateRoomButton.cs
index b501de46ef..9e53904510 100644
--- a/osu.Game/Screens/Multi/CreateRoomButton.cs
+++ b/osu.Game/Screens/Multi/CreateRoomButton.cs
@@ -2,24 +2,12 @@
 // 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.Match.Components;
-using osuTK;
 
 namespace osu.Game.Screens.Multi
 {
     public class CreateRoomButton : PurpleTriangleButton
     {
-        public CreateRoomButton()
-        {
-            Size = new Vector2(150, Header.HEIGHT - 20);
-            Margin = new MarginPadding
-            {
-                Top = 10,
-                Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
-            };
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index a957eb6824..c820eae51f 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -22,6 +22,7 @@ using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Users;
+using osuTK;
 
 namespace osu.Game.Screens.Multi
 {
@@ -131,6 +132,12 @@ namespace osu.Game.Screens.Multi
                     {
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
+                        Size = new Vector2(150, Header.HEIGHT - 20),
+                        Margin = new MarginPadding
+                        {
+                            Top = 10,
+                            Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
+                        },
                         Action = () => OpenNewRoom()
                     },
                     RoomManager = CreateRoomManager()

From 414f886b02d21c24ddaddc273ac747dc1d347b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 22:02:37 +0100
Subject: [PATCH 07190/10326] Split timeshift & multiplayer "create" buttons

Multiplayer button gets new, different "Create match" text, and disable
logic in case of a dropped connection to the multiplayer server.
---
 osu.Game/Screens/Multi/Multiplayer.cs         | 18 ++++++++-------
 .../CreateRealtimeMatchButton.cs              | 23 +++++++++++++++++++
 .../RealtimeMultiplayer.cs                    |  3 +++
 .../CreateTimeshiftRoomButton.cs}             |  4 ++--
 .../Multi/Timeshift/TimeshiftMultiplayer.cs   |  3 +++
 5 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
 rename osu.Game/Screens/Multi/{CreateRoomButton.cs => Timeshift/CreateTimeshiftRoomButton.cs} (78%)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index c820eae51f..a7d40a89d3 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -128,18 +128,18 @@ namespace osu.Game.Screens.Multi
                         }
                     },
                     new Header(screenStack),
-                    createButton = new CreateRoomButton
+                    createButton = CreateNewMultiplayerGameButton().With(button =>
                     {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        Size = new Vector2(150, Header.HEIGHT - 20),
-                        Margin = new MarginPadding
+                        button.Anchor = Anchor.TopRight;
+                        button.Origin = Anchor.TopRight;
+                        button.Size = new Vector2(150, Header.HEIGHT - 20);
+                        button.Margin = new MarginPadding
                         {
                             Top = 10,
                             Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
-                        },
-                        Action = () => OpenNewRoom()
-                    },
+                        };
+                        button.Action = () => OpenNewRoom();
+                    }),
                     RoomManager = CreateRoomManager()
                 }
             };
@@ -315,6 +315,8 @@ namespace osu.Game.Screens.Multi
 
         protected abstract LoungeSubScreen CreateLounge();
 
+        protected abstract OsuButton CreateNewMultiplayerGameButton();
+
         private class MultiplayerWaveContainer : WaveContainer
         {
             protected override bool StartHidden => true;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
new file mode 100644
index 0000000000..eda907f8cb
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Match.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class CreateRealtimeMatchButton : PurpleTriangleButton
+    {
+        [BackgroundDependencyLoader]
+        private void load(StatefulMultiplayerClient multiplayerClient)
+        {
+            Triangles.TriangleScale = 1.5f;
+
+            Text = "Create match";
+
+            ((IBindable<bool>)Enabled).BindTo(multiplayerClient.IsConnected);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index 6685cf52d6..6739a51fe8 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Extensions;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
@@ -64,5 +65,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         protected override RoomManager CreateRoomManager() => new RealtimeRoomManager();
 
         protected override LoungeSubScreen CreateLounge() => new RealtimeLoungeSubScreen();
+
+        protected override OsuButton CreateNewMultiplayerGameButton() => new CreateRealtimeMatchButton();
     }
 }
diff --git a/osu.Game/Screens/Multi/CreateRoomButton.cs b/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
similarity index 78%
rename from osu.Game/Screens/Multi/CreateRoomButton.cs
rename to osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
index 9e53904510..bd9d667630 100644
--- a/osu.Game/Screens/Multi/CreateRoomButton.cs
+++ b/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
@@ -4,9 +4,9 @@
 using osu.Framework.Allocation;
 using osu.Game.Screens.Multi.Match.Components;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.Multi.Timeshift
 {
-    public class CreateRoomButton : PurpleTriangleButton
+    public class CreateTimeshiftRoomButton : PurpleTriangleButton
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index 2ea4857799..d525a3800d 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Match;
@@ -47,5 +48,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
 
         protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen();
+
+        protected override OsuButton CreateNewMultiplayerGameButton() => new CreateTimeshiftRoomButton();
     }
 }

From 06bc3cd54d448d5597a193d7024c036f25b9e081 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 24 Dec 2020 00:17:26 +0100
Subject: [PATCH 07191/10326] Apply review suggestions.

---
 osu.Android/OsuGameActivity.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index dfdecdca2e..953c06f4e2 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
@@ -16,10 +17,10 @@ namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
     [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
-    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataScheme = osu_url_scheme)]
+    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {
-        private const string osu_url_scheme = "osu";
+        private static readonly string[] osu_url_schemes = { "osu", "osump" };
 
         private OsuGameAndroid game;
 
@@ -52,8 +53,8 @@ namespace osu.Android
                 case Intent.ActionDefault:
                     if (intent.Scheme == ContentResolver.SchemeContent)
                         handleImportFromUri(intent.Data);
-                    else if (intent.Scheme == osu_url_scheme)
-                        Task.Run(() => game.HandleLink(intent.DataString));
+                    else if (osu_url_schemes.Contains(intent.Scheme))
+                        game.HandleLink(intent.DataString);
                     break;
 
                 case Intent.ActionSend:

From d6dadd12faa7c277befcdcefd0eecdc25196cf0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 10:38:53 +0900
Subject: [PATCH 07192/10326] Send multiplayer user IDs via ctor for better
 thread safety

---
 .../RealtimeMultiplayer/RealtimeMatchSubScreen.cs   | 10 +++++++++-
 .../Multi/RealtimeMultiplayer/RealtimePlayer.cs     | 13 +++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index cdab1435c0..468908f83d 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -188,7 +189,14 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
-        private void onLoadRequested() => multiplayer?.Push(new PlayerLoader(() => new RealtimePlayer(SelectedItem.Value)));
+        private void onLoadRequested()
+        {
+            Debug.Assert(client.Room != null);
+
+            int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
+
+            multiplayer?.Push(new PlayerLoader(() => new RealtimePlayer(SelectedItem.Value, userIds)));
+        }
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 7824b414f2..25543d3d6d 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
@@ -37,9 +36,17 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [CanBeNull]
         private MultiplayerGameplayLeaderboard leaderboard;
 
-        public RealtimePlayer(PlaylistItem playlistItem)
+        private readonly int[] userIds;
+
+        /// <summary>
+        /// Construct a multiplayer player.
+        /// </summary>
+        /// <param name="playlistItem">The playlist item to be played.</param>
+        /// <param name="userIds">The users which are participating in this game.</param>
+        public RealtimePlayer(PlaylistItem playlistItem, int[] userIds)
             : base(playlistItem, false)
         {
+            this.userIds = userIds;
         }
 
         [BackgroundDependencyLoader]
@@ -65,8 +72,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             Debug.Assert(client.Room != null);
 
-            int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
-
             // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
             LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
         }

From a411b26a09530bed75c404afe49d5b447bd5a863 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 10:51:24 +0900
Subject: [PATCH 07193/10326] Remove unnecessary clamp

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index 3f770cfb5e..20c0818d03 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 var destination = e.MousePosition;
 
                 FlashlightPosition = Interpolation.ValueAt(
-                    Math.Clamp(Math.Abs(Clock.ElapsedFrameTime), 0, follow_delay), position, destination, 0, follow_delay, Easing.Out);
+                    Math.Min(Math.Abs(Clock.ElapsedFrameTime), follow_delay), position, destination, 0, follow_delay, Easing.Out);
 
                 return base.OnMouseMove(e);
             }

From 61a5d3ef4ae8d7724eb02686a01a33e85cbc4e0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 13:32:35 +0900
Subject: [PATCH 07194/10326] Remove double handling of restart allowance on
 results screen (already handled locally)

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 8a12427798..528a1842af 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -164,18 +164,15 @@ namespace osu.Game.Screens.Ranking
             {
                 buttons.Add(new RetryButton { Width = 300 });
 
-                if (player?.Configuration.AllowRestart == true)
+                AddInternal(new HotkeyRetryOverlay
                 {
-                    AddInternal(new HotkeyRetryOverlay
+                    Action = () =>
                     {
-                        Action = () =>
-                        {
-                            if (!this.IsCurrentScreen()) return;
+                        if (!this.IsCurrentScreen()) return;
 
-                            player?.Restart();
-                        },
-                    });
-                }
+                        player?.Restart();
+                    },
+                });
             }
         }
 

From 1f80f01b53f4861a26ee8564bb7b81684cfad488 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 14:46:52 +0900
Subject: [PATCH 07195/10326] Add accuracy to frame bundle header

---
 osu.Game/Online/Spectator/FrameHeader.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index b4988fecf9..135b356eda 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Online.Spectator
     [Serializable]
     public class FrameHeader
     {
+        /// <summary>
+        /// The current accuracy of the score.
+        /// </summary>
+        public double Accuracy { get; set; }
+
         /// <summary>
         /// The current combo of the score.
         /// </summary>
@@ -42,16 +47,18 @@ namespace osu.Game.Online.Spectator
         {
             Combo = score.Combo;
             MaxCombo = score.MaxCombo;
+            Accuracy = score.Accuracy;
 
             // copy for safety
             Statistics = new Dictionary<HitResult, int>(score.Statistics);
         }
 
         [JsonConstructor]
-        public FrameHeader(int combo, int maxCombo, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime)
+        public FrameHeader(int combo, int maxCombo, double accuracy, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime)
         {
             Combo = combo;
             MaxCombo = maxCombo;
+            Accuracy = accuracy;
             Statistics = statistics;
             ReceivedTime = receivedTime;
         }

From d66e2183185bbedc26b2d7350499e71d3aebc0fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 14:57:23 +0900
Subject: [PATCH 07196/10326] Source display accuracy from header and remove
 from ScoreProcessor function

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs       | 15 +++++----------
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs    |  4 ++--
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 4b2e2bf715..2024290460 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -193,7 +193,7 @@ namespace osu.Game.Rulesets.Scoring
         private void updateScore()
         {
             if (rollingMaxBaseScore != 0)
-                Accuracy.Value = baseScore / rollingMaxBaseScore;
+                Accuracy.Value = calculateAccuracyRatio(baseScore, true);
 
             TotalScore.Value = getScore(Mode.Value);
         }
@@ -233,13 +233,13 @@ namespace osu.Game.Rulesets.Scoring
         }
 
         /// <summary>
-        /// Given a minimal set of inputs, return the computed score and accuracy for the tracked beatmap / mods combination, at the current point in time.
+        /// Given a minimal set of inputs, return the computed score for the tracked beatmap / mods combination, at the current point in time.
         /// </summary>
         /// <param name="mode">The <see cref="ScoringMode"/> to compute the total score in.</param>
         /// <param name="maxCombo">The maximum combo achievable in the beatmap.</param>
         /// <param name="statistics">Statistics to be used for calculating accuracy, bonus score, etc.</param>
-        /// <returns>The computed score and accuracy for provided inputs.</returns>
-        public (double score, double accuracy) GetScoreAndAccuracy(ScoringMode mode, int maxCombo, Dictionary<HitResult, int> statistics)
+        /// <returns>The computed score for provided inputs.</returns>
+        public double GetImmediateScore(ScoringMode mode, int maxCombo, Dictionary<HitResult, int> statistics)
         {
             // calculate base score from statistics pairs
             int computedBaseScore = 0;
@@ -252,12 +252,7 @@ namespace osu.Game.Rulesets.Scoring
                 computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
             }
 
-            double pointInTimeAccuracy = calculateAccuracyRatio(computedBaseScore, true);
-            double comboRatio = calculateComboRatio(maxCombo);
-
-            double score = GetScore(mode, maxAchievableCombo, calculateAccuracyRatio(computedBaseScore), comboRatio, scoreResultCounts);
-
-            return (score, pointInTimeAccuracy);
+            return GetScore(mode, maxAchievableCombo, calculateAccuracyRatio(computedBaseScore), calculateComboRatio(maxCombo), scoreResultCounts);
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 12321de442..c10ec9e004 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -122,8 +122,8 @@ namespace osu.Game.Screens.Play.HUD
                 if (LastHeader == null)
                     return;
 
-                (score.Value, accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics);
-
+                score.Value = processor.GetImmediateScore(mode, LastHeader.MaxCombo, LastHeader.Statistics);
+                accuracy.Value = LastHeader.Accuracy;
                 currentCombo.Value = LastHeader.Combo;
             }
         }

From e86e9bfae625351e5323c9393e011190dd58c7b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 15:32:55 +0900
Subject: [PATCH 07197/10326] Don't begin gameplay until all users are in a
 completely prepared state

---
 .../RealtimeMultiplayer/RealtimePlayer.cs     | 39 ++++++++++++-------
 osu.Game/Screens/Play/Player.cs               | 18 +++++++--
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 085c52cb85..20b184bed3 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -3,12 +3,12 @@
 
 using System;
 using System.Diagnostics;
-using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Scoring;
@@ -33,13 +33,14 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private IBindable<bool> isConnected;
 
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
-        private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
         [CanBeNull]
         private MultiplayerGameplayLeaderboard leaderboard;
 
         private readonly int[] userIds;
 
+        private LoadingLayer loadingDisplay;
+
         /// <summary>
         /// Construct a multiplayer player.
         /// </summary>
@@ -60,6 +61,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             client.MatchStarted += onMatchStarted;
             client.ResultsReady += onResultsReady;
 
+            ScoreProcessor.HasCompleted.BindValueChanged(completed =>
+            {
+                // wait for server to tell us that results are ready (see SubmitScore implementation)
+                loadingDisplay.Show();
+            });
+
             isConnected = client.IsConnected.GetBoundCopy();
             isConnected.BindValueChanged(connected =>
             {
@@ -70,19 +77,20 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 }
             }, true);
 
-            client.ChangeState(MultiplayerUserState.Loaded)
-                  .ContinueWith(task => failAndBail(task.Exception?.Message ?? "Server error"), TaskContinuationOptions.NotOnRanToCompletion);
-
-            if (!startedEvent.Wait(TimeSpan.FromSeconds(30)))
-            {
-                failAndBail("Failed to start the multiplayer match in time.");
-                return;
-            }
-
             Debug.Assert(client.Room != null);
 
             // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
             LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
+
+            HUDOverlay.Add(loadingDisplay = new LoadingLayer(DrawableRuleset) { Depth = float.MaxValue });
+        }
+
+        protected override void StartGameplay()
+        {
+            // block base call, but let the server know we are ready to start.
+            loadingDisplay.Show();
+
+            client.ChangeState(MultiplayerUserState.Loaded).ContinueWith(task => failAndBail(task.Exception?.Message ?? "Server error"), TaskContinuationOptions.NotOnRanToCompletion);
         }
 
         private void failAndBail(string message = null)
@@ -90,7 +98,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             if (!string.IsNullOrEmpty(message))
                 Logger.Log(message, LoggingTarget.Runtime, LogLevel.Important);
 
-            startedEvent.Set();
             Schedule(() => PerformExit(false));
         }
 
@@ -112,7 +119,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 padding + HUDOverlay.TopScoringElementsHeight);
         }
 
-        private void onMatchStarted() => startedEvent.Set();
+        private void onMatchStarted() => Scheduler.Add(() =>
+        {
+            loadingDisplay.Hide();
+            base.StartGameplay();
+        });
 
         private void onResultsReady() => resultsReady.SetResult(true);
 
@@ -124,7 +135,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             // Await up to 30 seconds for results to become available (3 api request timeouts).
             // This is arbitrary just to not leave the player in an essentially deadlocked state if any connection issues occur.
-            await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(30)));
+            await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(60)));
         }
 
         protected override ResultsScreen CreateResults(ScoreInfo score)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 2bc84ce5d5..3f761d9e11 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -723,9 +723,6 @@ namespace osu.Game.Screens.Play
 
             storyboardReplacesBackground.Value = Beatmap.Value.Storyboard.ReplacesBackground && Beatmap.Value.Storyboard.HasDrawable;
 
-            GameplayClockContainer.Restart();
-            GameplayClockContainer.FadeInFromZero(750, Easing.OutQuint);
-
             foreach (var mod in Mods.Value.OfType<IApplicableToPlayer>())
                 mod.ApplyToPlayer(this);
 
@@ -740,6 +737,21 @@ namespace osu.Game.Screens.Play
                 mod.ApplyToTrack(musicController.CurrentTrack);
 
             updateGameplayState();
+
+            GameplayClockContainer.FadeInFromZero(750, Easing.OutQuint);
+            StartGameplay();
+        }
+
+        /// <summary>
+        /// Called to trigger the starting of the gameplay clock and underlying gameplay.
+        /// This will be called on entering the player screen once. A derived class may block the first call to this to delay the start of gameplay.
+        /// </summary>
+        protected virtual void StartGameplay()
+        {
+            if (GameplayClockContainer.GameplayClock.IsRunning)
+                throw new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running");
+
+            GameplayClockContainer.Restart();
         }
 
         public override void OnSuspending(IScreen next)

From 5457e4598b1a21405a183790cdd299218f789849 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 16:20:38 +0900
Subject: [PATCH 07198/10326] Schedule UpdateFilter calls to avoid operations
 occuring while at a sub screen

---
 osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 896c215c42..3712cbe33e 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -98,7 +98,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             scheduledFilterUpdate = Scheduler.AddDelayed(UpdateFilter, 200);
         }
 
-        protected void UpdateFilter()
+        protected void UpdateFilter() => Scheduler.AddOnce(updateFilter);
+
+        private void updateFilter()
         {
             scheduledFilterUpdate?.Cancel();
 

From 6bd6888a938667f2050ef55c24ff4f9872a418ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 16:29:51 +0900
Subject: [PATCH 07199/10326] Disallow skipping in multiplayer for now

---
 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs | 1 +
 osu.Game/Screens/Play/Player.cs                              | 3 +++
 osu.Game/Screens/Play/PlayerConfiguration.cs                 | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index b1615cc7f6..5da712bfcc 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -51,6 +51,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 AllowPause = false,
                 AllowRestart = false,
+                AllowSkippingIntro = false,
             })
         {
             this.userIds = userIds;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4bd6340751..90600b0cf1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -381,6 +381,9 @@ namespace osu.Game.Screens.Play
                 }
             };
 
+            if (!Configuration.AllowSkippingIntro)
+                skipOverlay.Expire();
+
             if (Configuration.AllowRestart)
             {
                 container.Add(new HotkeyRetryOverlay
diff --git a/osu.Game/Screens/Play/PlayerConfiguration.cs b/osu.Game/Screens/Play/PlayerConfiguration.cs
index 475a234679..cd30ead638 100644
--- a/osu.Game/Screens/Play/PlayerConfiguration.cs
+++ b/osu.Game/Screens/Play/PlayerConfiguration.cs
@@ -19,5 +19,10 @@ namespace osu.Game.Screens.Play
         /// Whether the player should be allowed to trigger a restart.
         /// </summary>
         public bool AllowRestart { get; set; } = true;
+
+        /// <summary>
+        /// Whether the player should be allowed to skip the intro, advancing to the start of gameplay.
+        /// </summary>
+        public bool AllowSkippingIntro { get; set; } = true;
     }
 }

From 3148c04fb89493c65159d177e208fc2f03b6187e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 16:53:25 +0900
Subject: [PATCH 07200/10326] Play a sound when starting a timeshift or
 multiplayer room

---
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs | 20 +++++++++++++++++++
 .../RealtimeMatchSubScreen.cs                 |  6 +-----
 .../Multi/Timeshift/TimeshiftRoomSubScreen.cs | 10 +++-------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
index b9d7408946..0598524e81 100644
--- a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Screens;
 using osu.Game.Audio;
@@ -11,6 +13,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.Multi.Match
 {
@@ -21,6 +24,8 @@ namespace osu.Game.Screens.Multi.Match
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        private SampleChannel sampleStart;
+
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
@@ -30,8 +35,17 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        [Resolved(canBeNull: true)]
+        protected Multiplayer Multiplayer { get; private set; }
+
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            sampleStart = audio.Samples.Get(@"SongSelect/confirm-selection");
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -71,6 +85,12 @@ namespace osu.Game.Screens.Multi.Match
             return base.OnExiting(next);
         }
 
+        protected void StartPlay(Func<Player> player)
+        {
+            sampleStart?.Play();
+            Multiplayer?.Push(new PlayerLoader(player));
+        }
+
         private void selectedItemChanged()
         {
             updateWorkingBeatmap();
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index 45ac7e25d3..15d997605c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -16,7 +16,6 @@ using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
-using osu.Game.Screens.Play;
 using osu.Game.Users;
 using ParticipantsList = osu.Game.Screens.Multi.RealtimeMultiplayer.Participants.ParticipantsList;
 
@@ -29,9 +28,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         public override string ShortTitle => "match";
 
-        [Resolved(canBeNull: true)]
-        private Multiplayer multiplayer { get; set; }
-
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
@@ -206,7 +202,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
 
-            multiplayer?.Push(new PlayerLoader(() => new RealtimePlayer(SelectedItem.Value, userIds)));
+            StartPlay(() => new RealtimePlayer(SelectedItem.Value, userIds));
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
index fa901179e9..730ad795b2 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
@@ -15,7 +15,6 @@ using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Multi.Ranking;
-using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
@@ -220,12 +219,9 @@ namespace osu.Game.Screens.Multi.Timeshift
             }, true);
         }
 
-        private void onStart()
+        private void onStart() => StartPlay(() => new TimeshiftPlayer(SelectedItem.Value)
         {
-            multiplayer?.Push(new PlayerLoader(() => new TimeshiftPlayer(SelectedItem.Value)
-            {
-                Exited = () => leaderboard.RefreshScores()
-            }));
-        }
+            Exited = () => leaderboard.RefreshScores()
+        });
     }
 }

From c35454081c931b2d1e836698d4f11186d1c7f56e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 17:17:45 +0900
Subject: [PATCH 07201/10326] Add sound when players change ready state

---
 .../TestSceneRealtimeReadyButton.cs           | 31 ++++++++++++++++
 .../Match/RealtimeReadyButton.cs              | 36 +++++++++++++++++--
 2 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
index e9d3ddb32d..825470846c 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -124,6 +125,36 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             AddAssert("match not started", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
         }
 
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestManyUsersChangingState(bool isHost)
+        {
+            const int users = 10;
+            AddStep("setup", () =>
+            {
+                Client.TransferHost(Client.Room?.Users[0].UserID ?? 0);
+                for (int i = 0; i < users; i++)
+                    Client.AddUser(new User { Id = i, Username = "Another user" });
+            });
+
+            if (!isHost)
+                AddStep("transfer host", () => Client.TransferHost(2));
+
+            addClickButtonStep();
+
+            AddRepeatStep("change user ready state", () =>
+            {
+                Client.ChangeUserState(RNG.Next(0, users), RNG.NextBool() ? MultiplayerUserState.Ready : MultiplayerUserState.Idle);
+            }, 20);
+
+            AddRepeatStep("ready all users", () =>
+            {
+                var nextUnready = Client.Room?.Users.FirstOrDefault(c => c.State == MultiplayerUserState.Idle);
+                if (nextUnready != null)
+                    Client.ChangeUserState(nextUnready.UserID, MultiplayerUserState.Ready);
+            }, users);
+        }
+
         private void addClickButtonStep() => AddStep("click button", () =>
         {
             InputManager.MoveMouseTo(button);
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
index 5bead2b271..962c6bbead 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
@@ -5,6 +5,8 @@ using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Extensions;
@@ -31,8 +33,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private SampleChannel sampleReadyCount;
+
         private readonly ButtonWithTrianglesExposed button;
 
+        private int countReady;
+
         public RealtimeReadyButton()
         {
             InternalChild = button = new ButtonWithTrianglesExposed
@@ -44,6 +50,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            sampleReadyCount = audio.Samples.Get(@"SongSelect/select-difficulty");
+        }
+
         protected override void OnRoomChanged()
         {
             base.OnRoomChanged();
@@ -60,6 +72,10 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 
             Debug.Assert(Room != null);
 
+            int newCountReady = Room.Users.Count(u => u.State == MultiplayerUserState.Ready);
+
+            string countText = $"({newCountReady} / {Room.Users.Count} ready)";
+
             switch (localUser.State)
             {
                 case MultiplayerUserState.Idle:
@@ -70,18 +86,32 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                 case MultiplayerUserState.Ready:
                     if (Room?.Host?.Equals(localUser) == true)
                     {
-                        int countReady = Room.Users.Count(u => u.State == MultiplayerUserState.Ready);
-                        button.Text = $"Start match ({countReady} / {Room.Users.Count} ready)";
+                        button.Text = $"Start match {countText}";
                         updateButtonColour(true);
                     }
                     else
                     {
-                        button.Text = "Waiting for host...";
+                        button.Text = $"Waiting for host... {countText}";
                         updateButtonColour(false);
                     }
 
                     break;
             }
+
+            if (newCountReady != countReady)
+            {
+                countReady = newCountReady;
+                Scheduler.AddOnce(playSound);
+            }
+        }
+
+        private void playSound()
+        {
+            if (sampleReadyCount != null)
+            {
+                sampleReadyCount.Frequency.Value = 0.77f + countReady * 0.06f;
+                sampleReadyCount.Play();
+            }
         }
 
         private void updateButtonColour(bool green)

From eb795a212730b87f947f35eb25586a802563b543 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 17:58:38 +0900
Subject: [PATCH 07202/10326] Move all endpoint information to a configuration
 class

---
 ...TestSceneMultiplayerGameplayLeaderboard.cs |  2 ++
 .../Visual/Gameplay/TestSceneSpectator.cs     |  6 ++++
 .../DevelopmentOsuConfigManager.cs            | 19 ++++++++++++
 osu.Game/Online/API/APIAccess.cs              | 18 ++++-------
 .../DevelopmentEndpointConfiguration.cs       | 17 +++++++++++
 osu.Game/Online/EndpointConfiguration.cs      | 30 +++++++++++++++++++
 .../Online/ProductionEndpointConfiguration.cs | 17 +++++++++++
 .../RealtimeMultiplayerClient.cs              | 13 ++++----
 .../Spectator/SpectatorStreamingClient.cs     | 13 ++++----
 osu.Game/OsuGameBase.cs                       | 18 +++++++----
 10 files changed, 124 insertions(+), 29 deletions(-)
 create mode 100644 osu.Game/Configuration/DevelopmentOsuConfigManager.cs
 create mode 100644 osu.Game/Online/DevelopmentEndpointConfiguration.cs
 create mode 100644 osu.Game/Online/EndpointConfiguration.cs
 create mode 100644 osu.Game/Online/ProductionEndpointConfiguration.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index e42ddeb35e..8078c7b994 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Database;
+using osu.Game.Online;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -87,6 +88,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             private readonly int totalUsers;
 
             public TestMultiplayerStreaming(int totalUsers)
+                : base(new DevelopmentEndpointConfiguration())
             {
                 this.totalUsers = totalUsers;
             }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 1fdff99da6..26524f07da 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -12,6 +12,7 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Online;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu;
@@ -238,6 +239,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             private int beatmapId;
 
+            public TestSpectatorStreamingClient()
+                : base(new DevelopmentEndpointConfiguration())
+            {
+            }
+
             protected override Task Connect()
             {
                 return Task.CompletedTask;
diff --git a/osu.Game/Configuration/DevelopmentOsuConfigManager.cs b/osu.Game/Configuration/DevelopmentOsuConfigManager.cs
new file mode 100644
index 0000000000..ff19dd874c
--- /dev/null
+++ b/osu.Game/Configuration/DevelopmentOsuConfigManager.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.Platform;
+using osu.Framework.Testing;
+
+namespace osu.Game.Configuration
+{
+    [ExcludeFromDynamicCompile]
+    public class DevelopmentOsuConfigManager : OsuConfigManager
+    {
+        protected override string Filename => base.Filename.Replace(".ini", ".dev.ini");
+
+        public DevelopmentOsuConfigManager(Storage storage)
+            : base(storage)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index ca457ccf71..49c815b2d3 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -26,18 +26,10 @@ namespace osu.Game.Online.API
 
         private readonly OAuth authentication;
 
-#if DEBUG
-        public string Endpoint => @"https://dev.ppy.sh";
-        private const string client_secret = @"3LP2mhUrV89xxzD1YKNndXHEhWWCRLPNKioZ9ymT";
-#else
-        public string Endpoint => @"https://osu.ppy.sh";
-        private const string client_secret = @"FGc9GAtyHzeQDshWP5Ah7dega8hJACAJpQtw6OXk";
-#endif
-
-        private const string client_id = @"5";
-
         private readonly Queue<APIRequest> queue = new Queue<APIRequest>();
 
+        public string Endpoint { get; }
+
         /// <summary>
         /// The username/email provided by the user when initiating a login.
         /// </summary>
@@ -61,11 +53,13 @@ namespace osu.Game.Online.API
 
         private readonly Logger log;
 
-        public APIAccess(OsuConfigManager config)
+        public APIAccess(OsuConfigManager config, EndpointConfiguration endpointConfiguration)
         {
             this.config = config;
 
-            authentication = new OAuth(client_id, client_secret, Endpoint);
+            Endpoint = endpointConfiguration.APIEndpoint;
+
+            authentication = new OAuth(endpointConfiguration.APIClientID, endpointConfiguration.APIClientSecret, Endpoint);
             log = Logger.GetLogger(LoggingTarget.Network);
 
             ProvidedUsername = config.Get<string>(OsuSetting.Username);
diff --git a/osu.Game/Online/DevelopmentEndpointConfiguration.cs b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
new file mode 100644
index 0000000000..5e4105f5fd
--- /dev/null
+++ b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Online
+{
+    public class DevelopmentEndpointConfiguration : EndpointConfiguration
+    {
+        public DevelopmentEndpointConfiguration()
+        {
+            APIEndpoint = @"https://dev.ppy.sh";
+            APIClientSecret = @"3LP2mhUrV89xxzD1YKNndXHEhWWCRLPNKioZ9ymT";
+            APIClientID = "5";
+            SpectatorEndpoint = $"{APIEndpoint}/spectator";
+            MultiplayerEndpoint = $"{APIEndpoint}/multiplayer";
+        }
+    }
+}
diff --git a/osu.Game/Online/EndpointConfiguration.cs b/osu.Game/Online/EndpointConfiguration.cs
new file mode 100644
index 0000000000..a8b1a84e62
--- /dev/null
+++ b/osu.Game/Online/EndpointConfiguration.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.
+
+namespace osu.Game.Online
+{
+    /// <summary>
+    /// Holds configuration for API endpoints.
+    /// </summary>
+    public class EndpointConfiguration
+    {
+        /// <summary>
+        /// The endpoint for the main (osu-web) API.
+        /// </summary>
+        public string APIEndpoint { get; set; }
+
+        /// <summary>
+        /// The OAuth client secret.
+        /// </summary>
+        public string APIClientSecret { get; set; }
+
+        /// <summary>
+        /// The OAuth client ID.
+        /// </summary>
+        public string APIClientID { get; set; }
+
+        public string SpectatorEndpoint { get; set; }
+
+        public string MultiplayerEndpoint { get; set; }
+    }
+}
diff --git a/osu.Game/Online/ProductionEndpointConfiguration.cs b/osu.Game/Online/ProductionEndpointConfiguration.cs
new file mode 100644
index 0000000000..f5c71ef737
--- /dev/null
+++ b/osu.Game/Online/ProductionEndpointConfiguration.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Online
+{
+    public class ProductionEndpointConfiguration : EndpointConfiguration
+    {
+        public ProductionEndpointConfiguration()
+        {
+            APIEndpoint = @"https://osu.ppy.sh";
+            APIClientSecret = @"FGc9GAtyHzeQDshWP5Ah7dega8hJACAJpQtw6OXk";
+            APIClientID = "5";
+            SpectatorEndpoint = "https://spectator.ppy.sh/spectator";
+            MultiplayerEndpoint = "https://spectator.ppy.sh/multiplayer";
+        }
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 4ec5b9af40..0e2b4855da 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -19,12 +19,6 @@ namespace osu.Game.Online.RealtimeMultiplayer
 {
     public class RealtimeMultiplayerClient : StatefulMultiplayerClient
     {
-#if DEBUG
-        private const string endpoint = "https://dev.ppy.sh/multiplayer";
-#else
-        private const string endpoint = "https://spectator.ppy.sh/multiplayer";
-#endif
-
         public override IBindable<bool> IsConnected => isConnected;
 
         private readonly Bindable<bool> isConnected = new Bindable<bool>();
@@ -35,6 +29,13 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         private HubConnection? connection;
 
+        private readonly string endpoint;
+
+        public RealtimeMultiplayerClient(EndpointConfiguration endpoints)
+        {
+            endpoint = endpoints.MultiplayerEndpoint;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index c9203b595e..1432fd1c98 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -81,6 +81,13 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, SpectatorState> OnUserFinishedPlaying;
 
+        private readonly string endpoint;
+
+        public SpectatorStreamingClient(EndpointConfiguration endpoints)
+        {
+            endpoint = endpoints.SpectatorEndpoint;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -104,12 +111,6 @@ namespace osu.Game.Online.Spectator
             }
         }
 
-#if DEBUG
-        private const string endpoint = "https://dev.ppy.sh/spectator";
-#else
-        private const string endpoint = "https://spectator.ppy.sh/spectator";
-#endif
-
         protected virtual async Task Connect()
         {
             if (connection != null)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index eb27821d82..bdc9e5eb7b 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -30,6 +30,7 @@ using osu.Game.Database;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
+using osu.Game.Online;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
@@ -54,6 +55,8 @@ namespace osu.Game
 
         public const int SAMPLE_CONCURRENCY = 6;
 
+        public bool UseDevelopmentServer { get; }
+
         protected OsuConfigManager LocalConfig;
 
         protected BeatmapManager BeatmapManager;
@@ -132,6 +135,7 @@ namespace osu.Game
 
         public OsuGameBase()
         {
+            UseDevelopmentServer = DebugUtils.IsDebugBuild;
             Name = @"osu!lazer";
         }
 
@@ -170,7 +174,7 @@ namespace osu.Game
             dependencies.Cache(largeStore);
 
             dependencies.CacheAs(this);
-            dependencies.Cache(LocalConfig);
+            dependencies.CacheAs(LocalConfig);
 
             AddFont(Resources, @"Fonts/osuFont");
 
@@ -210,10 +214,12 @@ namespace osu.Game
                 }
             });
 
-            dependencies.CacheAs(API ??= new APIAccess(LocalConfig));
+            EndpointConfiguration endpoints = UseDevelopmentServer ? (EndpointConfiguration)new DevelopmentEndpointConfiguration() : new ProductionEndpointConfiguration();
 
-            dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient());
-            dependencies.CacheAs(multiplayerClient = new RealtimeMultiplayerClient());
+            dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints));
+
+            dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));
+            dependencies.CacheAs(multiplayerClient = new RealtimeMultiplayerClient(endpoints));
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
@@ -369,7 +375,9 @@ namespace osu.Game
             // may be non-null for certain tests
             Storage ??= host.Storage;
 
-            LocalConfig ??= new OsuConfigManager(Storage);
+            LocalConfig ??= UseDevelopmentServer
+                ? new DevelopmentOsuConfigManager(Storage)
+                : new OsuConfigManager(Storage);
         }
 
         protected override Storage CreateStorage(GameHost host, Storage defaultStorage) => new OsuStorage(host, defaultStorage);

From 323da82477304456af0c9a4bd04e089061c6ea3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 18:11:40 +0900
Subject: [PATCH 07203/10326] Add website root URL and update most links to use
 it

For what it's worth, I intentionally didn't include news / changelog /
supporter, because these should never change.
---
 osu.Game/Online/API/APIAccess.cs                | 11 +++++++----
 osu.Game/Online/API/APIRequest.cs               |  2 +-
 osu.Game/Online/API/DummyAPIAccess.cs           |  4 +++-
 osu.Game/Online/API/IAPIProvider.cs             |  7 ++++++-
 osu.Game/Online/Chat/NowPlayingCommand.cs       |  2 +-
 .../Online/DevelopmentEndpointConfiguration.cs  |  6 +++---
 osu.Game/Online/EndpointConfiguration.cs        | 17 ++++++++++++++---
 .../Online/ProductionEndpointConfiguration.cs   |  6 +++---
 .../RealtimeMultiplayerClient.cs                |  2 +-
 .../Spectator/SpectatorStreamingClient.cs       |  2 +-
 osu.Game/OsuGame.cs                             |  2 +-
 osu.Game/Overlays/BeatmapSet/Header.cs          |  6 +++++-
 .../Profile/Header/BottomHeaderContainer.cs     |  6 +++++-
 .../Profile/Header/TopHeaderContainer.cs        |  6 +++++-
 .../Sections/Recent/DrawableRecentActivity.cs   |  2 +-
 15 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 49c815b2d3..133ba22406 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -28,7 +28,9 @@ namespace osu.Game.Online.API
 
         private readonly Queue<APIRequest> queue = new Queue<APIRequest>();
 
-        public string Endpoint { get; }
+        public string APIEndpointUrl { get; }
+
+        public string WebsiteRootUrl { get; }
 
         /// <summary>
         /// The username/email provided by the user when initiating a login.
@@ -57,9 +59,10 @@ namespace osu.Game.Online.API
         {
             this.config = config;
 
-            Endpoint = endpointConfiguration.APIEndpoint;
+            APIEndpointUrl = endpointConfiguration.APIEndpointUrl;
+            WebsiteRootUrl = endpointConfiguration.WebsiteRootUrl;
 
-            authentication = new OAuth(endpointConfiguration.APIClientID, endpointConfiguration.APIClientSecret, Endpoint);
+            authentication = new OAuth(endpointConfiguration.APIClientID, endpointConfiguration.APIClientSecret, APIEndpointUrl);
             log = Logger.GetLogger(LoggingTarget.Network);
 
             ProvidedUsername = config.Get<string>(OsuSetting.Username);
@@ -245,7 +248,7 @@ namespace osu.Game.Online.API
 
             var req = new RegistrationRequest
             {
-                Url = $@"{Endpoint}/users",
+                Url = $@"{APIEndpointUrl}/users",
                 Method = HttpMethod.Post,
                 Username = username,
                 Email = email,
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 6912d9b629..a7174324d8 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Online.API
 
         protected virtual WebRequest CreateWebRequest() => new OsuWebRequest(Uri);
 
-        protected virtual string Uri => $@"{API.Endpoint}/api/v2/{Target}";
+        protected virtual string Uri => $@"{API.APIEndpointUrl}/api/v2/{Target}";
 
         protected APIAccess API;
         protected WebRequest WebRequest;
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 265298270c..3e996ac97f 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -28,7 +28,9 @@ namespace osu.Game.Online.API
 
         public string ProvidedUsername => LocalUser.Value.Username;
 
-        public string Endpoint => "http://localhost";
+        public string APIEndpointUrl => "http://localhost";
+
+        public string WebsiteRootUrl => "http://localhost";
 
         /// <summary>
         /// Provide handling logic for an arbitrary API request.
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 3a444460f2..4407f1f55e 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -46,7 +46,12 @@ namespace osu.Game.Online.API
         /// <summary>
         /// The URL endpoint for this API. Does not include a trailing slash.
         /// </summary>
-        string Endpoint { get; }
+        string APIEndpointUrl { get; }
+
+        /// <summary>
+        /// The root URL of of the website, excluding the trailing slash.
+        /// </summary>
+        public string WebsiteRootUrl { get; }
 
         /// <summary>
         /// The current connection state of the API.
diff --git a/osu.Game/Online/Chat/NowPlayingCommand.cs b/osu.Game/Online/Chat/NowPlayingCommand.cs
index c0b54812b6..926709694b 100644
--- a/osu.Game/Online/Chat/NowPlayingCommand.cs
+++ b/osu.Game/Online/Chat/NowPlayingCommand.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Online.Chat
                     break;
             }
 
-            var beatmapString = beatmap.OnlineBeatmapID.HasValue ? $"[https://osu.ppy.sh/b/{beatmap.OnlineBeatmapID} {beatmap}]" : beatmap.ToString();
+            var beatmapString = beatmap.OnlineBeatmapID.HasValue ? $"[{api.WebsiteRootUrl}/b/{beatmap.OnlineBeatmapID} {beatmap}]" : beatmap.ToString();
 
             channelManager.PostMessage($"is {verb} {beatmapString}", true);
             Expire();
diff --git a/osu.Game/Online/DevelopmentEndpointConfiguration.cs b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
index 5e4105f5fd..69531dbe1b 100644
--- a/osu.Game/Online/DevelopmentEndpointConfiguration.cs
+++ b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
@@ -7,11 +7,11 @@ namespace osu.Game.Online
     {
         public DevelopmentEndpointConfiguration()
         {
-            APIEndpoint = @"https://dev.ppy.sh";
+            WebsiteRootUrl = APIEndpointUrl = @"https://dev.ppy.sh";
             APIClientSecret = @"3LP2mhUrV89xxzD1YKNndXHEhWWCRLPNKioZ9ymT";
             APIClientID = "5";
-            SpectatorEndpoint = $"{APIEndpoint}/spectator";
-            MultiplayerEndpoint = $"{APIEndpoint}/multiplayer";
+            SpectatorEndpointUrl = $"{APIEndpointUrl}/spectator";
+            MultiplayerEndpointUrl = $"{APIEndpointUrl}/multiplayer";
         }
     }
 }
diff --git a/osu.Game/Online/EndpointConfiguration.cs b/osu.Game/Online/EndpointConfiguration.cs
index a8b1a84e62..e347d3c653 100644
--- a/osu.Game/Online/EndpointConfiguration.cs
+++ b/osu.Game/Online/EndpointConfiguration.cs
@@ -8,10 +8,15 @@ namespace osu.Game.Online
     /// </summary>
     public class EndpointConfiguration
     {
+        /// <summary>
+        /// The base URL for the website.
+        /// </summary>
+        public string WebsiteRootUrl { get; set; }
+
         /// <summary>
         /// The endpoint for the main (osu-web) API.
         /// </summary>
-        public string APIEndpoint { get; set; }
+        public string APIEndpointUrl { get; set; }
 
         /// <summary>
         /// The OAuth client secret.
@@ -23,8 +28,14 @@ namespace osu.Game.Online
         /// </summary>
         public string APIClientID { get; set; }
 
-        public string SpectatorEndpoint { get; set; }
+        /// <summary>
+        /// The endpoint for the SignalR spectator server.
+        /// </summary>
+        public string SpectatorEndpointUrl { get; set; }
 
-        public string MultiplayerEndpoint { get; set; }
+        /// <summary>
+        /// The endpoint for the SignalR multiplayer server.
+        /// </summary>
+        public string MultiplayerEndpointUrl { get; set; }
     }
 }
diff --git a/osu.Game/Online/ProductionEndpointConfiguration.cs b/osu.Game/Online/ProductionEndpointConfiguration.cs
index f5c71ef737..c6ddc03564 100644
--- a/osu.Game/Online/ProductionEndpointConfiguration.cs
+++ b/osu.Game/Online/ProductionEndpointConfiguration.cs
@@ -7,11 +7,11 @@ namespace osu.Game.Online
     {
         public ProductionEndpointConfiguration()
         {
-            APIEndpoint = @"https://osu.ppy.sh";
+            WebsiteRootUrl = APIEndpointUrl = @"https://osu.ppy.sh";
             APIClientSecret = @"FGc9GAtyHzeQDshWP5Ah7dega8hJACAJpQtw6OXk";
             APIClientID = "5";
-            SpectatorEndpoint = "https://spectator.ppy.sh/spectator";
-            MultiplayerEndpoint = "https://spectator.ppy.sh/multiplayer";
+            SpectatorEndpointUrl = "https://spectator.ppy.sh/spectator";
+            MultiplayerEndpointUrl = "https://spectator.ppy.sh/multiplayer";
         }
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 0e2b4855da..bfc89df483 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public RealtimeMultiplayerClient(EndpointConfiguration endpoints)
         {
-            endpoint = endpoints.MultiplayerEndpoint;
+            endpoint = endpoints.MultiplayerEndpointUrl;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 1432fd1c98..344b73f3d9 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Online.Spectator
 
         public SpectatorStreamingClient(EndpointConfiguration endpoints)
         {
-            endpoint = endpoints.SpectatorEndpoint;
+            endpoint = endpoints.SpectatorEndpointUrl;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index bb51c55551..17831ed26b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -294,7 +294,7 @@ namespace osu.Game
         public void OpenUrlExternally(string url) => waitForReady(() => externalLinkOpener, _ =>
         {
             if (url.StartsWith('/'))
-                url = $"{API.Endpoint}{url}";
+                url = $"{API.APIEndpointUrl}{url}";
 
             externalLinkOpener.OpenUrlExternally(url);
         });
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 06e31277dd..321e496511 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -15,6 +15,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Overlays.BeatmapSet.Buttons;
 using osu.Game.Rulesets;
@@ -40,6 +41,9 @@ namespace osu.Game.Overlays.BeatmapSet
 
         public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         public BeatmapRulesetSelector RulesetSelector => beatmapSetHeader.RulesetSelector;
         public readonly BeatmapPicker Picker;
 
@@ -213,7 +217,7 @@ namespace osu.Game.Overlays.BeatmapSet
             Picker.Beatmap.ValueChanged += b =>
             {
                 Details.Beatmap = b.NewValue;
-                externalLink.Link = $@"https://osu.ppy.sh/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
+                externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
             };
         }
 
diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index ebee377a51..2925107766 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Online.API;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
@@ -27,6 +28,9 @@ namespace osu.Game.Overlays.Profile.Header
 
         private Color4 iconColour;
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         public BottomHeaderContainer()
         {
             AutoSizeAxes = Axes.Y;
@@ -109,7 +113,7 @@ 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);
+            topLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"{api.WebsiteRootUrl}/users/{user.Id}/posts", creationParameters: embolden);
 
             string websiteWithoutProtocol = user.Website;
 
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 2cc1f6533f..e0642d650c 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -10,6 +10,7 @@ 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.Overlays.Profile.Header.Components;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
@@ -23,6 +24,9 @@ namespace osu.Game.Overlays.Profile.Header
 
         public readonly Bindable<User> User = new Bindable<User>();
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         private SupporterIcon supporterTag;
         private UpdateableAvatar avatar;
         private OsuSpriteText usernameText;
@@ -166,7 +170,7 @@ namespace osu.Game.Overlays.Profile.Header
         {
             avatar.User = user;
             usernameText.Text = user?.Username ?? string.Empty;
-            openUserExternally.Link = $@"https://osu.ppy.sh/users/{user?.Id ?? 0}";
+            openUserExternally.Link = $@"{api.WebsiteRootUrl}/users/{user?.Id ?? 0}";
             userFlag.Country = user?.Country;
             userCountryText.Text = user?.Country?.FullName ?? "Alien";
             supporterTag.SupportLevel = user?.SupportLevel ?? 0;
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index 8782e82642..49b46f7e7a 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -216,7 +216,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
         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 string getLinkArgument(string url) => MessageFormatter.GetLinkDetails($"{api.APIEndpointUrl}{url}").Argument;
 
         private FontUsage getLinkFont(FontWeight fontWeight = FontWeight.Regular)
             => OsuFont.GetFont(size: font_size, weight: fontWeight, italics: true);

From 261c250b46dae0db37151601a2d789c0e789b5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 11:33:49 +0100
Subject: [PATCH 07204/10326] Update outdated comment

---
 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 20b184bed3..b1179ea7cd 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             await client.ChangeState(MultiplayerUserState.FinishedPlay);
 
-            // Await up to 30 seconds for results to become available (3 api request timeouts).
+            // Await up to 60 seconds for results to become available (6 api request timeouts).
             // This is arbitrary just to not leave the player in an essentially deadlocked state if any connection issues occur.
             await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(60)));
         }

From 40b9d1bc5ef7b3f0c63766a7478f278aaa565cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 12:45:01 +0100
Subject: [PATCH 07205/10326] Invert if & early-return to reduce nesting

---
 .../RealtimeMultiplayer/Match/RealtimeReadyButton.cs   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
index 962c6bbead..be405feef1 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
@@ -107,11 +107,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 
         private void playSound()
         {
-            if (sampleReadyCount != null)
-            {
-                sampleReadyCount.Frequency.Value = 0.77f + countReady * 0.06f;
-                sampleReadyCount.Play();
-            }
+            if (sampleReadyCount == null)
+                return;
+
+            sampleReadyCount.Frequency.Value = 0.77f + countReady * 0.06f;
+            sampleReadyCount.Play();
         }
 
         private void updateButtonColour(bool green)

From 66a23c22e5580f6866db87aebfe503d195a2a8dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 21:28:21 +0900
Subject: [PATCH 07206/10326] Fix various tests failing due to dependence on
 specific online data

---
 .../Online/TestSceneChangelogOverlay.cs       |  5 +-
 .../Online/TestSceneNowPlayingCommand.cs      |  2 +-
 .../Requests/Responses/APIChangelogEntry.cs   |  3 +-
 osu.Game/Overlays/Changelog/ChangelogBuild.cs | 49 ++++++++++---------
 osu.Game/Overlays/ChangelogOverlay.cs         |  1 +
 5 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 02f6de2269..998e42b478 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [Test]
+        [Ignore("needs to be updated to not be so server dependent")]
         public void ShowWithBuild()
         {
             AddStep(@"Show with Lazer 2018.712.0", () =>
@@ -49,7 +50,7 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     Version = "2018.712.0",
                     DisplayVersion = "2018.712.0",
-                    UpdateStream = new APIUpdateStream { Id = 7, Name = OsuGameBase.CLIENT_STREAM_NAME },
+                    UpdateStream = new APIUpdateStream { Id = 5, Name = OsuGameBase.CLIENT_STREAM_NAME },
                     ChangelogEntries = new List<APIChangelogEntry>
                     {
                         new APIChangelogEntry
@@ -64,7 +65,7 @@ namespace osu.Game.Tests.Visual.Online
 
             AddUntilStep(@"wait for streams", () => changelog.Streams?.Count > 0);
             AddAssert(@"correct build displayed", () => changelog.Current.Value.Version == "2018.712.0");
-            AddAssert(@"correct stream selected", () => changelog.Header.Streams.Current.Value.Id == 7);
+            AddAssert(@"correct stream selected", () => changelog.Header.Streams.Current.Value.Id == 5);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
index 0324da6cf5..64e80e9f02 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Run command", () => Add(new NowPlayingCommand()));
 
             if (hasOnlineId)
-                AddAssert("Check link presence", () => postTarget.LastMessage.Contains("https://osu.ppy.sh/b/1234"));
+                AddAssert("Check link presence", () => postTarget.LastMessage.Contains("/b/1234"));
             else
                 AddAssert("Check link not present", () => !postTarget.LastMessage.Contains("https://"));
         }
diff --git a/osu.Game/Online/API/Requests/Responses/APIChangelogEntry.cs b/osu.Game/Online/API/Requests/Responses/APIChangelogEntry.cs
index f949ab5da5..1ff7523ba6 100644
--- a/osu.Game/Online/API/Requests/Responses/APIChangelogEntry.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIChangelogEntry.cs
@@ -48,6 +48,7 @@ namespace osu.Game.Online.API.Requests.Responses
     public enum ChangelogEntryType
     {
         Add,
-        Fix
+        Fix,
+        Misc
     }
 }
diff --git a/osu.Game/Overlays/Changelog/ChangelogBuild.cs b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
index 48bf6c2ddd..65ff0fef92 100644
--- a/osu.Game/Overlays/Changelog/ChangelogBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
@@ -131,33 +131,36 @@ namespace osu.Game.Overlays.Changelog
                         t.Padding = new MarginPadding { Left = 10 };
                     });
 
-                    if (entry.GithubUser.UserId != null)
+                    if (entry.GithubUser != null)
                     {
-                        title.AddUserLink(new User
+                        if (entry.GithubUser.UserId != null)
                         {
-                            Username = entry.GithubUser.OsuUsername,
-                            Id = entry.GithubUser.UserId.Value
-                        }, t =>
+                            title.AddUserLink(new User
+                            {
+                                Username = entry.GithubUser.OsuUsername,
+                                Id = entry.GithubUser.UserId.Value
+                            }, t =>
+                            {
+                                t.Font = fontMedium;
+                                t.Colour = entryColour;
+                            });
+                        }
+                        else if (entry.GithubUser.GithubUrl != null)
                         {
-                            t.Font = fontMedium;
-                            t.Colour = entryColour;
-                        });
-                    }
-                    else if (entry.GithubUser.GithubUrl != null)
-                    {
-                        title.AddLink(entry.GithubUser.DisplayName, entry.GithubUser.GithubUrl, t =>
+                            title.AddLink(entry.GithubUser.DisplayName, entry.GithubUser.GithubUrl, t =>
+                            {
+                                t.Font = fontMedium;
+                                t.Colour = entryColour;
+                            });
+                        }
+                        else
                         {
-                            t.Font = fontMedium;
-                            t.Colour = entryColour;
-                        });
-                    }
-                    else
-                    {
-                        title.AddText(entry.GithubUser.DisplayName, t =>
-                        {
-                            t.Font = fontMedium;
-                            t.Colour = entryColour;
-                        });
+                            title.AddText(entry.GithubUser.DisplayName, t =>
+                            {
+                                t.Font = fontMedium;
+                                t.Colour = entryColour;
+                            });
+                        }
                     }
 
                     ChangelogEntries.Add(titleContainer);
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index c7e9a86fa4..f591b1d427 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -86,6 +86,7 @@ namespace osu.Game.Overlays
         }
 
         public void ShowListing()
+
         {
             Current.Value = null;
             Show();

From 4270c29f6083cea4abc28f9d82aef3bc6c5c222a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 13:42:08 +0100
Subject: [PATCH 07207/10326] Trim stray newline

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

diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index f591b1d427..c7e9a86fa4 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -86,7 +86,6 @@ namespace osu.Game.Overlays
         }
 
         public void ShowListing()
-
         {
             Current.Value = null;
             Show();

From d5c348b568096b1a10fc2d2a04a0b2dd922c20e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 13:44:46 +0100
Subject: [PATCH 07208/10326] Remove explicit public access modifier from
 interface

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

diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 4407f1f55e..1951dfaf40 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Online.API
         /// <summary>
         /// The root URL of of the website, excluding the trailing slash.
         /// </summary>
-        public string WebsiteRootUrl { get; }
+        string WebsiteRootUrl { get; }
 
         /// <summary>
         /// The current connection state of the API.

From f991448a3e6f359efa277f4491c472421c311ca9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 21:49:38 +0900
Subject: [PATCH 07209/10326] Re-sort the leaderboard order a maximum of once a
 second

---
 .../Screens/Play/HUD/GameplayLeaderboard.cs     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index cab1cbd3f1..e33cc05e64 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Users;
@@ -12,6 +13,8 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboard : FillFlowContainer<GameplayLeaderboardScore>
     {
+        private readonly Cached sorting = new Cached();
+
         public GameplayLeaderboard()
         {
             Width = GameplayLeaderboardScore.EXTENDED_WIDTH + GameplayLeaderboardScore.SHEAR_WIDTH;
@@ -24,6 +27,13 @@ namespace osu.Game.Screens.Play.HUD
             LayoutEasing = Easing.OutQuint;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Scheduler.AddDelayed(sort, 1000, true);
+        }
+
         /// <summary>
         /// Adds a player to the leaderboard.
         /// </summary>
@@ -41,7 +51,7 @@ namespace osu.Game.Screens.Play.HUD
             };
 
             base.Add(drawable);
-            drawable.TotalScore.BindValueChanged(_ => Scheduler.AddOnce(sort), true);
+            drawable.TotalScore.BindValueChanged(_ => sorting.Invalidate(), true);
 
             Height = Count * (GameplayLeaderboardScore.PANEL_HEIGHT + Spacing.Y);
 
@@ -55,6 +65,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void sort()
         {
+            if (sorting.IsValid)
+                return;
+
             var orderedByScore = this.OrderByDescending(i => i.TotalScore.Value).ToList();
 
             for (int i = 0; i < Count; i++)
@@ -62,6 +75,8 @@ namespace osu.Game.Screens.Play.HUD
                 SetLayoutPosition(orderedByScore[i], i);
                 orderedByScore[i].ScorePosition = i + 1;
             }
+
+            sorting.Validate();
         }
     }
 }

From aec25e2d73079043d810fbc97da19441c1b1c581 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 21:53:18 +0900
Subject: [PATCH 07210/10326] Rename "timeshift" to "playlists"

This only covers the user-facing instances. Code and class name changes
will happen once things have calmed down.
---
 osu.Game/Screens/Menu/ButtonSystem.cs | 2 +-
 osu.Game/Screens/Menu/Disclaimer.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index badfa3f693..5af6517f49 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.Menu
         {
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
             buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
-            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
+            buttonsPlay.Add(new Button(@"playlists", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index ceec12c967..9c7206d259 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Screens.Menu
                 "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 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!",
+                "Check out the \"playlist\" system, which lets users create their own custom and permanent leaderboards!",
                 "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 3a46e210d48d903bc631021979518f1fcab59293 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 21:59:10 +0900
Subject: [PATCH 07211/10326] Change low-hanging references of "room" to
 "playlist"

---
 osu.Game/Screens/Multi/Multiplayer.cs                       | 6 +++---
 .../Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs        | 2 +-
 .../Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs    | 2 +-
 osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs    | 6 ++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index a7d40a89d3..585ac71189 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Multi
         private OsuGameBase game { get; set; }
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        protected IAPIProvider API { get; private set; }
 
         [Resolved(CanBeNull = true)]
         private OsuLogo logo { get; set; }
@@ -155,7 +155,7 @@ namespace osu.Game.Screens.Multi
         [BackgroundDependencyLoader(true)]
         private void load(IdleTracker idleTracker)
         {
-            apiState.BindTo(api.State);
+            apiState.BindTo(API.State);
             apiState.BindValueChanged(onlineStateChanged, true);
 
             if (idleTracker != null)
@@ -269,7 +269,7 @@ namespace osu.Game.Screens.Multi
         /// Creates a new room.
         /// </summary>
         /// <returns>The created <see cref="Room"/>.</returns>
-        protected virtual Room CreateNewRoom() => new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } };
+        protected abstract Room CreateNewRoom();
 
         private void screenPushed(IScreen lastScreen, IScreen newScreen)
         {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index 6739a51fe8..e15a6bd408 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override Room CreateNewRoom()
         {
-            var room = base.CreateNewRoom();
+            var room = new Room { Name = { Value = $"{API.LocalUser}'s awesome room" } };
             room.Category.Value = RoomCategory.Realtime;
             return room;
         }
diff --git a/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs b/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
index bd9d667630..0424493472 100644
--- a/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
+++ b/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         {
             Triangles.TriangleScale = 1.5f;
 
-            Text = "Create room";
+            Text = "Create playlist";
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index d525a3800d..e1b94f8455 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Match;
@@ -45,6 +46,11 @@ namespace osu.Game.Screens.Multi.Timeshift
             Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
         }
 
+        protected override Room CreateNewRoom()
+        {
+            return new Room { Name = { Value = $"{API.LocalUser}'s awesome playlist" } };
+        }
+
         protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
 
         protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen();

From d0e834796818beedbfbb9ecb3ab70dfd8bb18b5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 22:28:25 +0900
Subject: [PATCH 07212/10326] Change asserts into until steps

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index ca61672ef9..c0a021436e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -52,19 +52,19 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("add player 2", () => createLeaderboardScore(player2Score, new User { Username = "Player 2" }));
             AddStep("add player 3", () => createLeaderboardScore(player3Score, new User { Username = "Player 3" }));
 
-            AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
-            AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
-            AddAssert("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
+            AddUntilStep("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
+            AddUntilStep("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
+            AddUntilStep("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
 
             AddStep("set score above player 3", () => player2Score.Value = playerScore.Value - 500);
-            AddAssert("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
-            AddAssert("is player 2 position #2", () => leaderboard.CheckPositionByUsername("Player 2", 2));
-            AddAssert("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
+            AddUntilStep("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
+            AddUntilStep("is player 2 position #2", () => leaderboard.CheckPositionByUsername("Player 2", 2));
+            AddUntilStep("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
 
             AddStep("set score below players", () => player2Score.Value = playerScore.Value - 123456);
-            AddAssert("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
-            AddAssert("is player 3 position #2", () => leaderboard.CheckPositionByUsername("Player 3", 2));
-            AddAssert("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
+            AddUntilStep("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
+            AddUntilStep("is player 3 position #2", () => leaderboard.CheckPositionByUsername("Player 3", 2));
+            AddUntilStep("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
         }
 
         [Test]

From 76a7aabfe86b73d5619ff4b3e0d6d23e74907f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 14:32:30 +0100
Subject: [PATCH 07213/10326] Always create realtime-specific player elements
 regardless of token

---
 .../Multi/RealtimeMultiplayer/RealtimePlayer.cs   | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 07d21995ce..8eb6a11228 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
@@ -35,7 +34,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
 
-        [CanBeNull]
         private MultiplayerGameplayLeaderboard leaderboard;
 
         private readonly int[] userIds;
@@ -61,6 +59,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
+            // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
+            LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
+
+            HUDOverlay.Add(loadingDisplay = new LoadingLayer(DrawableRuleset) { Depth = float.MaxValue });
+
             if (Token == null)
                 return; // Todo: Somehow handle token retrieval failure.
 
@@ -84,11 +87,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             }, true);
 
             Debug.Assert(client.Room != null);
-
-            // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
-            LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
-
-            HUDOverlay.Add(loadingDisplay = new LoadingLayer(DrawableRuleset) { Depth = float.MaxValue });
         }
 
         protected override void StartGameplay()
@@ -115,9 +113,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         private void adjustLeaderboardPosition()
         {
-            if (leaderboard == null)
-                return;
-
             const float padding = 44; // enough margin to avoid the hit error display.
 
             leaderboard.Position = new Vector2(

From a97681a5daa18b6e4374a901b65e836a1bef82eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 15:07:03 +0100
Subject: [PATCH 07214/10326] Proxy screen transition events to subscreens in
 multiplayer

---
 osu.Game/Screens/Multi/Multiplayer.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index a7d40a89d3..c4259400fa 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -202,6 +202,11 @@ namespace osu.Game.Screens.Multi
         {
             this.FadeIn();
             waves.Show();
+
+            if (loungeSubScreen.IsCurrentScreen())
+                loungeSubScreen.OnEntering(last);
+            else
+                loungeSubScreen.MakeCurrent();
         }
 
         public override void OnResuming(IScreen last)
@@ -209,6 +214,7 @@ namespace osu.Game.Screens.Multi
             this.FadeIn(250);
             this.ScaleTo(1, 250, Easing.OutSine);
 
+            screenStack.CurrentScreen?.OnResuming(last);
             base.OnResuming(last);
 
             UpdatePollingRate(isIdle.Value);
@@ -219,6 +225,8 @@ namespace osu.Game.Screens.Multi
             this.ScaleTo(1.1f, 250, Easing.InSine);
             this.FadeOut(250);
 
+            screenStack.CurrentScreen?.OnSuspending(next);
+
             UpdatePollingRate(isIdle.Value);
         }
 
@@ -230,9 +238,7 @@ namespace osu.Game.Screens.Multi
 
             this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();
 
-            if (screenStack.CurrentScreen != null)
-                loungeSubScreen.MakeCurrent();
-
+            screenStack.CurrentScreen?.OnExiting(next);
             base.OnExiting(next);
             return false;
         }

From 7f0f6d86b0f931401e4fb8b347485ff6656ee354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 16:08:45 +0100
Subject: [PATCH 07215/10326] Rename {room -> playlist} on playlist room screen

---
 osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
index 730ad795b2..4a66f09a22 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Multi.Timeshift
     {
         public override string Title { get; }
 
-        public override string ShortTitle => "room";
+        public override string ShortTitle => "playlist";
 
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
@@ -40,7 +40,7 @@ namespace osu.Game.Screens.Multi.Timeshift
 
         public TimeshiftRoomSubScreen(Room room)
         {
-            Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
+            Title = room.RoomID.Value == null ? "New playlist" : room.Name.Value;
             Activity.Value = new UserActivity.InLobby(room);
         }
 

From db1c11073f430edd13aa8a480b0e30233de4697e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 16:10:29 +0100
Subject: [PATCH 07216/10326] Rename back to "room" for "realtime" multiplayer

---
 .../Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs    | 2 +-
 .../Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
index eda907f8cb..cdaeb6faec 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         {
             Triangles.TriangleScale = 1.5f;
 
-            Text = "Create match";
+            Text = "Create room";
 
             ((IBindable<bool>)Enabled).BindTo(multiplayerClient.IsConnected);
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index 15d997605c..1778bc272c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
     {
         public override string Title { get; }
 
-        public override string ShortTitle => "match";
+        public override string ShortTitle => "room";
 
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         public RealtimeMatchSubScreen(Room room)
         {
-            Title = room.RoomID.Value == null ? "New match" : room.Name.Value;
+            Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
             Activity.Value = new UserActivity.InLobby(room);
         }
 

From 6ec045f2353e80534efc1961990ac3d04adf58f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 16:18:35 +0100
Subject: [PATCH 07217/10326] Distinguish primary multi screen titles in header

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs | 2 +-
 osu.Game/Screens/Multi/Header.cs                          | 8 ++++----
 osu.Game/Screens/Multi/Multiplayer.cs                     | 4 +++-
 .../Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs      | 2 ++
 osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs  | 2 ++
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
index 76ab402b72..0ccd882d95 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Children = new Drawable[]
             {
                 screenStack,
-                new Header(screenStack)
+                new Header("Multiplayer", screenStack)
             };
 
             AddStep("push multi screen", () => screenStack.CurrentScreen.Push(new TestMultiplayerSubScreen(++index)));
diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index cd8695286b..637d8bb52b 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Multi
     {
         public const float HEIGHT = 80;
 
-        public Header(ScreenStack stack)
+        public Header(string mainTitle, ScreenStack stack)
         {
             RelativeSizeAxes = Axes.X;
             Height = HEIGHT;
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Multi
                     Padding = new MarginPadding { Left = WaveOverlayContainer.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
                     Children = new Drawable[]
                     {
-                        title = new MultiHeaderTitle
+                        title = new MultiHeaderTitle(mainTitle)
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.BottomLeft,
@@ -80,7 +80,7 @@ namespace osu.Game.Screens.Multi
                 set => pageTitle.Text = value.ShortTitle.Titleize();
             }
 
-            public MultiHeaderTitle()
+            public MultiHeaderTitle(string mainTitle)
             {
                 AutoSizeAxes = Axes.Both;
 
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.Multi
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
                                 Font = OsuFont.GetFont(size: 24),
-                                Text = "Multiplayer"
+                                Text = mainTitle
                             },
                             dot = new OsuSpriteText
                             {
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 585ac71189..56c1c6cb37 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Screens.Multi
                             screenStack = new MultiplayerSubScreenStack { RelativeSizeAxes = Axes.Both }
                         }
                     },
-                    new Header(screenStack),
+                    new Header(ScreenTitle, screenStack),
                     createButton = CreateNewMultiplayerGameButton().With(button =>
                     {
                         button.Anchor = Anchor.TopRight;
@@ -311,6 +311,8 @@ namespace osu.Game.Screens.Multi
 
         protected IScreen CurrentSubScreen => screenStack.CurrentScreen;
 
+        protected abstract string ScreenTitle { get; }
+
         protected abstract RoomManager CreateRoomManager();
 
         protected abstract LoungeSubScreen CreateLounge();
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index e15a6bd408..70308844b0 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -62,6 +62,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             return room;
         }
 
+        protected override string ScreenTitle => "Multiplayer";
+
         protected override RoomManager CreateRoomManager() => new RealtimeRoomManager();
 
         protected override LoungeSubScreen CreateLounge() => new RealtimeLoungeSubScreen();
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index e1b94f8455..60b01ee431 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -51,6 +51,8 @@ namespace osu.Game.Screens.Multi.Timeshift
             return new Room { Name = { Value = $"{API.LocalUser}'s awesome playlist" } };
         }
 
+        protected override string ScreenTitle => "Playlists";
+
         protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
 
         protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen();

From 60c7c8b63badedf7c0bef7ec7b5c365d1877e486 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 00:44:42 +0900
Subject: [PATCH 07218/10326] Pluralise playlists in tip

---
 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 9c7206d259..46fddabb26 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Screens.Menu
                 "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 temporary until exiting. Restore accidentally deleted content from the maintenance settings!",
-                "Check out the \"playlist\" system, which lets users create their own custom and permanent leaderboards!",
+                "Check out the \"playlists\" system, which lets users create their own custom and permanent leaderboards!",
                 "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 a1384942b1e6b2720988cb4618f9eab7bf8058cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 13:11:21 +0900
Subject: [PATCH 07219/10326] Timeshift -> Playlists at a code level

---
 .../TestSceneMatchSettingsOverlay.cs          |  4 +--
 .../Multiplayer/TestSceneMultiScreen.cs       |  4 +--
 ....cs => TestScenePlaylistsFilterControl.cs} |  6 ++--
 ...s => TestScenePlaylistsLoungeSubScreen.cs} |  6 ++--
 ... => TestScenePlaylistsParticipantsList.cs} |  2 +-
 ....cs => TestScenePlaylistsResultsScreen.cs} |  4 +--
 ....cs => TestScenePlaylistsRoomSubScreen.cs} | 14 ++++-----
 .../Navigation/TestSceneScreenNavigation.cs   |  6 ++--
 .../GameTypes/GameTypeTimeshift.cs            |  4 +--
 osu.Game/Online/Multiplayer/Room.cs           |  2 +-
 osu.Game/Screens/Menu/ButtonSystem.cs         |  8 ++---
 osu.Game/Screens/Menu/MainMenu.cs             |  4 +--
 .../Components/TimeshiftFilterControl.cs      | 14 ++++-----
 .../Screens/Multi/Match/Components/Footer.cs  |  4 +--
 .../Multi/Match/Components/GameTypePicker.cs  |  2 +-
 .../Screens/Multi/Play/TimeshiftPlayer.cs     |  8 ++---
 .../CreatePlaylistsRoomButton.cs}             |  4 +--
 .../PlaylistsLoungeSubScreen.cs}              |  8 ++---
 .../PlaylistsMatchSettingsOverlay.cs}         |  4 +--
 .../PlaylistsMultiplayer.cs}                  | 30 +++++++++----------
 .../PlaylistsReadyButton.cs}                  |  6 ++--
 .../PlaylistsRoomManager.cs}                  |  4 +--
 .../PlaylistsRoomSubScreen.cs}                | 12 ++++----
 .../Multi/Ranking/TimeshiftResultsScreen.cs   |  4 +--
 .../RealtimeMultiplayer.cs                    | 16 +++++-----
 .../RealtimeMultiplayer/RealtimePlayer.cs     |  4 +--
 .../RealtimeResultsScreen.cs                  |  2 +-
 27 files changed, 93 insertions(+), 93 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneTimeshiftFilterControl.cs => TestScenePlaylistsFilterControl.cs} (76%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneTimeshiftLoungeSubScreen.cs => TestScenePlaylistsLoungeSubScreen.cs} (93%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneTimeshiftParticipantsList.cs => TestScenePlaylistsParticipantsList.cs} (95%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneTimeshiftResultsScreen.cs => TestScenePlaylistsResultsScreen.cs} (99%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneTimeshiftRoomSubScreen.cs => TestScenePlaylistsRoomSubScreen.cs} (93%)
 rename osu.Game/Screens/Multi/{Timeshift/CreateTimeshiftRoomButton.cs => Playlists/CreatePlaylistsRoomButton.cs} (79%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftLoungeSubScreen.cs => Playlists/PlaylistsLoungeSubScreen.cs} (71%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftMatchSettingsOverlay.cs => Playlists/PlaylistsMatchSettingsOverlay.cs} (99%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftMultiplayer.cs => Playlists/PlaylistsMultiplayer.cs} (62%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftReadyButton.cs => Playlists/PlaylistsReadyButton.cs} (88%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftRoomManager.cs => Playlists/PlaylistsRoomManager.cs} (89%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftRoomSubScreen.cs => Playlists/PlaylistsRoomSubScreen.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 1fcae9c709..90abecd26d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("error not displayed", () => !settings.ErrorText.IsPresent);
         }
 
-        private class TestRoomSettings : TimeshiftMatchSettingsOverlay
+        private class TestRoomSettings : PlaylistsMatchSettingsOverlay
         {
             public TriangleButton ApplyButton => ((MatchSettings)Settings).ApplyButton;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
index 0390b995e1..9ac1eb8013 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneMultiScreen()
         {
-            var multi = new TimeshiftMultiplayer();
+            var multi = new PlaylistsMultiplayer();
 
             AddStep("show", () => LoadScreen(multi));
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftFilterControl.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs
similarity index 76%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftFilterControl.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs
index f635a28b5c..427a69552d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftFilterControl.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs
@@ -6,11 +6,11 @@ using osu.Game.Screens.Multi.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneTimeshiftFilterControl : OsuTestScene
+    public class TestScenePlaylistsFilterControl : OsuTestScene
     {
-        public TestSceneTimeshiftFilterControl()
+        public TestScenePlaylistsFilterControl()
         {
-            Child = new TimeshiftFilterControl
+            Child = new PlaylistsFilterControl
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs
similarity index 93%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs
index 73afd65d6d..f8788f0c36 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs
@@ -10,11 +10,11 @@ using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneTimeshiftLoungeSubScreen : RoomManagerTestScene
+    public class TestScenePlaylistsLoungeSubScreen : RoomManagerTestScene
     {
         private LoungeSubScreen loungeScreen;
 
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.SetUpSteps();
 
-            AddStep("push screen", () => LoadScreen(loungeScreen = new TimeshiftLoungeSubScreen
+            AddStep("push screen", () => LoadScreen(loungeScreen = new PlaylistsLoungeSubScreen
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs
index efc3be032c..d71fdc42e3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs
@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneTimeshiftParticipantsList : MultiplayerTestScene
+    public class TestScenePlaylistsParticipantsList : MultiplayerTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs
index 03fd2b968c..99fc6597ee 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs
@@ -26,7 +26,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneTimeshiftResultsScreen : ScreenTestScene
+    public class TestScenePlaylistsResultsScreen : ScreenTestScene
     {
         private const int scores_per_result = 10;
 
@@ -360,7 +360,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             };
         }
 
-        private class TestResultsScreen : TimeshiftResultsScreen
+        private class TestResultsScreen : PlaylistsResultsScreen
         {
             public new LoadingSpinner LeftSpinner => base.LeftSpinner;
             public new LoadingSpinner CentreSpinner => base.CentreSpinner;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs
similarity index 93%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs
index bbd7d84081..02cc03eca4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs
@@ -17,14 +17,14 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneTimeshiftRoomSubScreen : MultiplayerTestScene
+    public class TestScenePlaylistsRoomSubScreen : MultiplayerTestScene
     {
         protected override bool UseOnlineAPI => true;
 
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapManager manager;
         private RulesetStore rulesets;
 
-        private TestTimeshiftRoomSubScreen match;
+        private TestPlaylistsRoomSubScreen match;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUpSteps]
         public void SetupSteps()
         {
-            AddStep("load match", () => LoadScreen(match = new TestTimeshiftRoomSubScreen(Room)));
+            AddStep("load match", () => LoadScreen(match = new TestPlaylistsRoomSubScreen(Room)));
             AddUntilStep("wait for load", () => match.IsCurrentScreen());
         }
 
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("create room", () =>
             {
-                InputManager.MoveMouseTo(match.ChildrenOfType<TimeshiftMatchSettingsOverlay.CreateRoomButton>().Single());
+                InputManager.MoveMouseTo(match.ChildrenOfType<PlaylistsMatchSettingsOverlay.CreateRoomButton>().Single());
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -131,13 +131,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("match has original beatmap", () => match.Beatmap.Value.Beatmap.BeatmapInfo.BaseDifficulty.CircleSize != 1);
         }
 
-        private class TestTimeshiftRoomSubScreen : TimeshiftRoomSubScreen
+        private class TestPlaylistsRoomSubScreen : PlaylistsRoomSubScreen
         {
             public new Bindable<PlaylistItem> SelectedItem => base.SelectedItem;
 
             public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap;
 
-            public TestTimeshiftRoomSubScreen(Room room)
+            public TestPlaylistsRoomSubScreen(Room room)
                 : base(room)
             {
             }
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 43f97d8ace..381bbca74f 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -11,7 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Options;
@@ -108,14 +108,14 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitMultiWithEscape()
         {
-            PushAndConfirm(() => new TimeshiftMultiplayer());
+            PushAndConfirm(() => new PlaylistsMultiplayer());
             exitViaEscapeAndConfirm();
         }
 
         [Test]
         public void TestExitMultiWithBackButton()
         {
-            PushAndConfirm(() => new TimeshiftMultiplayer());
+            PushAndConfirm(() => new PlaylistsMultiplayer());
             exitViaBackButtonAndConfirm();
         }
 
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
index 1a3d2837ce..5840ccb803 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
+++ b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
@@ -8,9 +8,9 @@ using osuTK;
 
 namespace osu.Game.Online.Multiplayer.GameTypes
 {
-    public class GameTypeTimeshift : GameType
+    public class GameTypePlaylists : GameType
     {
-        public override string Name => "Timeshift";
+        public override string Name => "Playlists";
 
         public override Drawable GetIcon(OsuColour colours, float size) => new SpriteIcon
         {
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 11efe281d1..d13d7dc774 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Online.Multiplayer
 
         [Cached]
         [JsonIgnore]
-        public readonly Bindable<GameType> Type = new Bindable<GameType>(new GameTypeTimeshift());
+        public readonly Bindable<GameType> Type = new Bindable<GameType>(new GameTypePlaylists());
 
         [Cached]
         [JsonIgnore]
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 5af6517f49..474cbde192 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Menu
         public Action OnSolo;
         public Action OnSettings;
         public Action OnMultiplayer;
-        public Action OnTimeshift;
+        public Action OnPlaylists;
 
         public const float BUTTON_WIDTH = 140f;
         public const float WEDGE_WIDTH = 20;
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.Menu
         {
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
             buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
-            buttonsPlay.Add(new Button(@"playlists", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
+            buttonsPlay.Add(new Button(@"playlists", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
@@ -175,7 +175,7 @@ namespace osu.Game.Screens.Menu
             OnMultiplayer?.Invoke();
         }
 
-        private void onTimeshift()
+        private void onPlaylists()
         {
             if (!api.IsLoggedIn)
             {
@@ -193,7 +193,7 @@ namespace osu.Game.Screens.Menu
                 return;
             }
 
-            OnTimeshift?.Invoke();
+            OnPlaylists?.Invoke();
         }
 
         private void updateIdleState(bool isIdle)
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index fa96ac9c51..5650b22f25 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -18,7 +18,7 @@ using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Multi.RealtimeMultiplayer;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.Menu
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Menu
                             },
                             OnSolo = onSolo,
                             OnMultiplayer = () => this.Push(new RealtimeMultiplayer()),
-                            OnTimeshift = () => this.Push(new TimeshiftMultiplayer()),
+                            OnPlaylists = () => this.Push(new PlaylistsMultiplayer()),
                             OnExit = confirmAndExit,
                         }
                     }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
index 68cab283a0..3c55c3c43f 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
@@ -7,13 +7,13 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
-    public class TimeshiftFilterControl : FilterControl
+    public class PlaylistsFilterControl : FilterControl
     {
-        private readonly Dropdown<TimeshiftCategory> dropdown;
+        private readonly Dropdown<PlaylistsCategory> dropdown;
 
-        public TimeshiftFilterControl()
+        public PlaylistsFilterControl()
         {
-            AddInternal(dropdown = new SlimEnumDropdown<TimeshiftCategory>
+            AddInternal(dropdown = new SlimEnumDropdown<PlaylistsCategory>
             {
                 Anchor = Anchor.BottomRight,
                 Origin = Anchor.TopRight,
@@ -37,11 +37,11 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
             switch (dropdown.Current.Value)
             {
-                case TimeshiftCategory.Normal:
+                case PlaylistsCategory.Normal:
                     criteria.Category = "normal";
                     break;
 
-                case TimeshiftCategory.Spotlight:
+                case PlaylistsCategory.Spotlight:
                     criteria.Category = "spotlight";
                     break;
             }
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             return criteria;
         }
 
-        private enum TimeshiftCategory
+        private enum PlaylistsCategory
         {
             Any,
             Normal,
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index d6a7e380bf..fdf1d0dbeb 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Match.Components
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             InternalChildren = new[]
             {
                 background = new Box { RelativeSizeAxes = Axes.Both },
-                new TimeshiftReadyButton
+                new PlaylistsReadyButton
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs b/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
index b69cb9705d..c7fc329a1a 100644
--- a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
+++ b/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             AddItem(new GameTypeVersus());
             AddItem(new GameTypeTagTeam());
             AddItem(new GameTypeTeamVersus());
-            AddItem(new GameTypeTimeshift());
+            AddItem(new GameTypePlaylists());
         }
 
         private class GameTypePickerItem : DisableableTabItem
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index f07f1c2fb0..65b0091505 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -20,7 +20,7 @@ using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Multi.Play
 {
-    public class TimeshiftPlayer : Player
+    public class PlaylistsPlayer : Player
     {
         public Action Exited;
 
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Multi.Play
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        public TimeshiftPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
+        public PlaylistsPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
             : base(configuration)
         {
             PlaylistItem = playlistItem;
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Multi.Play
 
             bool failed = false;
 
-            // Sanity checks to ensure that TimeshiftPlayer matches the settings for the current PlaylistItem
+            // Sanity checks to ensure that PlaylistsPlayer matches the settings for the current PlaylistItem
             if (Beatmap.Value.BeatmapInfo.OnlineBeatmapID != PlaylistItem.Beatmap.Value.OnlineBeatmapID)
                 throw new InvalidOperationException("Current Beatmap does not match PlaylistItem's Beatmap");
 
@@ -94,7 +94,7 @@ namespace osu.Game.Screens.Multi.Play
         protected override ResultsScreen CreateResults(ScoreInfo score)
         {
             Debug.Assert(RoomId.Value != null);
-            return new TimeshiftResultsScreen(score, RoomId.Value.Value, PlaylistItem, true);
+            return new PlaylistsResultsScreen(score, RoomId.Value.Value, PlaylistItem, true);
         }
 
         protected override Score CreateScore()
diff --git a/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs b/osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs
similarity index 79%
rename from osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
rename to osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs
index 0424493472..acee063115 100644
--- a/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
+++ b/osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs
@@ -4,9 +4,9 @@
 using osu.Framework.Allocation;
 using osu.Game.Screens.Multi.Match.Components;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class CreateTimeshiftRoomButton : PurpleTriangleButton
+    public class CreatePlaylistsRoomButton : PurpleTriangleButton
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
similarity index 71%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
index 8e426ffbcc..b40c543b68 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
@@ -6,12 +6,12 @@ using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftLoungeSubScreen : LoungeSubScreen
+    public class PlaylistsLoungeSubScreen : LoungeSubScreen
     {
-        protected override FilterControl CreateFilterControl() => new TimeshiftFilterControl();
+        protected override FilterControl CreateFilterControl() => new PlaylistsFilterControl();
 
-        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new TimeshiftRoomSubScreen(room);
+        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new PlaylistsRoomSubScreen(room);
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
similarity index 99%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
index 7e1e9894d8..af29e8d34d 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -19,9 +19,9 @@ using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Match.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftMatchSettingsOverlay : MatchSettingsOverlay
+    public class PlaylistsMatchSettingsOverlay : MatchSettingsOverlay
     {
         public Action EditPlaylist;
 
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
similarity index 62%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
index 60b01ee431..fce24da966 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
@@ -9,41 +9,41 @@ using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Match;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftMultiplayer : Multiplayer
+    public class PlaylistsMultiplayer : Multiplayer
     {
         protected override void UpdatePollingRate(bool isIdle)
         {
-            var timeshiftManager = (TimeshiftRoomManager)RoomManager;
+            var playlistsManager = (PlaylistsRoomManager)RoomManager;
 
             if (!this.IsCurrentScreen())
             {
-                timeshiftManager.TimeBetweenListingPolls.Value = 0;
-                timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                playlistsManager.TimeBetweenListingPolls.Value = 0;
+                playlistsManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
                 switch (CurrentSubScreen)
                 {
                     case LoungeSubScreen _:
-                        timeshiftManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
-                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
+                        playlistsManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        playlistsManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     case RoomSubScreen _:
-                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
-                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 30000 : 5000;
+                        playlistsManager.TimeBetweenListingPolls.Value = 0;
+                        playlistsManager.TimeBetweenSelectionPolls.Value = isIdle ? 30000 : 5000;
                         break;
 
                     default:
-                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
-                        timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                        playlistsManager.TimeBetweenListingPolls.Value = 0;
+                        playlistsManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {playlistsManager.TimeBetweenListingPolls.Value}, selection: {playlistsManager.TimeBetweenSelectionPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
@@ -53,10 +53,10 @@ namespace osu.Game.Screens.Multi.Timeshift
 
         protected override string ScreenTitle => "Playlists";
 
-        protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
+        protected override RoomManager CreateRoomManager() => new PlaylistsRoomManager();
 
-        protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen();
+        protected override LoungeSubScreen CreateLounge() => new PlaylistsLoungeSubScreen();
 
-        protected override OsuButton CreateNewMultiplayerGameButton() => new CreateTimeshiftRoomButton();
+        protected override OsuButton CreateNewMultiplayerGameButton() => new CreatePlaylistsRoomButton();
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
similarity index 88%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
index c878451eee..f5adf899e3 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
@@ -8,14 +8,14 @@ using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftReadyButton : ReadyButton
+    public class PlaylistsReadyButton : ReadyButton
     {
         [Resolved(typeof(Room), nameof(Room.EndDate))]
         private Bindable<DateTimeOffset?> endDate { get; set; }
 
-        public TimeshiftReadyButton()
+        public PlaylistsReadyButton()
         {
             Text = "Start";
         }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs
similarity index 89%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs
index d21f844e04..ae57eeddcc 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs
@@ -5,9 +5,9 @@ using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Game.Screens.Multi.Components;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftRoomManager : RoomManager
+    public class PlaylistsRoomManager : RoomManager
     {
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
         public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
similarity index 97%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
index 4a66f09a22..b2bcba1724 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
@@ -19,9 +19,9 @@ using osu.Game.Screens.Select;
 using osu.Game.Users;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftRoomSubScreen : RoomSubScreen
+    public class PlaylistsRoomSubScreen : RoomSubScreen
     {
         public override string Title { get; }
 
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Multi.Timeshift
 
         private OverlinedHeader participantsHeader;
 
-        public TimeshiftRoomSubScreen(Room room)
+        public PlaylistsRoomSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New playlist" : room.Name.Value;
             Activity.Value = new UserActivity.InLobby(room);
@@ -126,7 +126,7 @@ namespace osu.Game.Screens.Multi.Timeshift
                                                                             RequestShowResults = item =>
                                                                             {
                                                                                 Debug.Assert(roomId.Value != null);
-                                                                                multiplayer?.Push(new TimeshiftResultsScreen(null, roomId.Value.Value, item, false));
+                                                                                multiplayer?.Push(new PlaylistsResultsScreen(null, roomId.Value.Value, item, false));
                                                                             }
                                                                         }
                                                                     },
@@ -188,7 +188,7 @@ namespace osu.Game.Screens.Multi.Timeshift
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                settingsOverlay = new TimeshiftMatchSettingsOverlay
+                settingsOverlay = new PlaylistsMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
                     EditPlaylist = () => this.Push(new MatchSongSelect()),
@@ -219,7 +219,7 @@ namespace osu.Game.Screens.Multi.Timeshift
             }, true);
         }
 
-        private void onStart() => StartPlay(() => new TimeshiftPlayer(SelectedItem.Value)
+        private void onStart() => StartPlay(() => new PlaylistsPlayer(SelectedItem.Value)
         {
             Exited = () => leaderboard.RefreshScores()
         });
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index d3f1c19c7c..c757433e2f 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -17,7 +17,7 @@ using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Multi.Ranking
 {
-    public class TimeshiftResultsScreen : ResultsScreen
+    public class PlaylistsResultsScreen : ResultsScreen
     {
         private readonly int roomId;
         private readonly PlaylistItem playlistItem;
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
+        public PlaylistsResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
             : base(score, allowRetry, allowWatchingReplay)
         {
             this.roomId = roomId;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index 70308844b0..87c838f29f 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -28,31 +28,31 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override void UpdatePollingRate(bool isIdle)
         {
-            var timeshiftManager = (RealtimeRoomManager)RoomManager;
+            var playlistsManager = (RealtimeRoomManager)RoomManager;
 
             if (!this.IsCurrentScreen())
             {
-                timeshiftManager.TimeBetweenListingPolls.Value = 0;
-                timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                playlistsManager.TimeBetweenListingPolls.Value = 0;
+                playlistsManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
                 switch (CurrentSubScreen)
                 {
                     case LoungeSubScreen _:
-                        timeshiftManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
-                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
+                        playlistsManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        playlistsManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     // Don't poll inside the match or anywhere else.
                     default:
-                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
-                        timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                        playlistsManager.TimeBetweenListingPolls.Value = 0;
+                        playlistsManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {playlistsManager.TimeBetweenListingPolls.Value}, selection: {playlistsManager.TimeBetweenSelectionPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 8eb6a11228..033e4756eb 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -19,8 +19,8 @@ using osuTK;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
-    // Todo: The "room" part of TimeshiftPlayer should be split out into an abstract player class to be inherited instead.
-    public class RealtimePlayer : TimeshiftPlayer
+    // Todo: The "room" part of PlaylistsPlayer should be split out into an abstract player class to be inherited instead.
+    public class RealtimePlayer : PlaylistsPlayer
     {
         protected override bool PauseOnFocusLost => false;
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
index 3964a87eb6..6bec06cbba 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
@@ -7,7 +7,7 @@ using osu.Game.Screens.Multi.Ranking;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
-    public class RealtimeResultsScreen : TimeshiftResultsScreen
+    public class RealtimeResultsScreen : PlaylistsResultsScreen
     {
         public RealtimeResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
             : base(score, roomId, playlistItem, false, false)

From 12e4bbdc5b00de3a1c81da809fad4c69787269a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 13:20:37 +0900
Subject: [PATCH 07220/10326] Reorganise test scenes into playlists specific
 namespace

---
 .../TestSceneRealtimeMatchSubScreen.cs                      | 3 ++-
 .../TestSceneRealtimeMultiplayer.cs                         | 3 ++-
 .../TestSceneRealtimeMultiplayerParticipantsList.cs         | 3 ++-
 .../TestSceneRealtimeReadyButton.cs                         | 3 ++-
 .../TestSceneRealtimeRoomManager.cs                         | 3 ++-
 .../TestScenePlaylistsFilterControl.cs                      | 2 +-
 .../TestScenePlaylistsLoungeSubScreen.cs                    | 3 ++-
 .../TestScenePlaylistsMatchSettingsOverlay.cs}              | 4 ++--
 .../TestScenePlaylistsParticipantsList.cs                   | 2 +-
 .../TestScenePlaylistsResultsScreen.cs                      | 2 +-
 .../TestScenePlaylistsRoomSubScreen.cs                      | 2 +-
 .../TestScenePlaylistsScreen.cs}                            | 6 +++---
 12 files changed, 21 insertions(+), 15 deletions(-)
 rename osu.Game.Tests/Visual/{RealtimeMultiplayer => Multiplayer}/TestSceneRealtimeMatchSubScreen.cs (96%)
 rename osu.Game.Tests/Visual/{RealtimeMultiplayer => Multiplayer}/TestSceneRealtimeMultiplayer.cs (94%)
 rename osu.Game.Tests/Visual/{RealtimeMultiplayer => Multiplayer}/TestSceneRealtimeMultiplayerParticipantsList.cs (97%)
 rename osu.Game.Tests/Visual/{RealtimeMultiplayer => Multiplayer}/TestSceneRealtimeReadyButton.cs (98%)
 rename osu.Game.Tests/Visual/{RealtimeMultiplayer => Multiplayer}/TestSceneRealtimeRoomManager.cs (98%)
 rename osu.Game.Tests/Visual/{Multiplayer => Playlists}/TestScenePlaylistsFilterControl.cs (93%)
 rename osu.Game.Tests/Visual/{Multiplayer => Playlists}/TestScenePlaylistsLoungeSubScreen.cs (95%)
 rename osu.Game.Tests/Visual/{Multiplayer/TestSceneMatchSettingsOverlay.cs => Playlists/TestScenePlaylistsMatchSettingsOverlay.cs} (97%)
 rename osu.Game.Tests/Visual/{Multiplayer => Playlists}/TestScenePlaylistsParticipantsList.cs (97%)
 rename osu.Game.Tests/Visual/{Multiplayer => Playlists}/TestScenePlaylistsResultsScreen.cs (99%)
 rename osu.Game.Tests/Visual/{Multiplayer => Playlists}/TestScenePlaylistsRoomSubScreen.cs (99%)
 rename osu.Game.Tests/Visual/{Multiplayer/TestSceneMultiScreen.cs => Playlists/TestScenePlaylistsScreen.cs} (82%)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs
similarity index 96%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs
index a059bb1cc0..dff375d1bb 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs
@@ -10,9 +10,10 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
 using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneRealtimeMatchSubScreen : RealtimeMultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs
similarity index 94%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs
index 5cf80df6aa..cc07bb8e79 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs
@@ -3,9 +3,10 @@
 
 using NUnit.Framework;
 using osu.Game.Screens.Multi.Components;
+using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osu.Game.Users;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneRealtimeMultiplayer : RealtimeMultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
similarity index 97%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
index 4221821496..7c26918927 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
@@ -9,10 +9,11 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
+using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osu.Game.Users;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneRealtimeMultiplayerParticipantsList : RealtimeMultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs
similarity index 98%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs
index 825470846c..3c92276629 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs
@@ -14,11 +14,12 @@ using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
 using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneRealtimeReadyButton : RealtimeMultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs
similarity index 98%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs
index 925a83a863..ba90e0840b 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs
@@ -5,8 +5,9 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Tests.Visual.RealtimeMultiplayer;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     [HeadlessTest]
     public class TestSceneRealtimeRoomManager : MultiplayerTestScene
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
similarity index 93%
rename from osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
index 427a69552d..66992b27a2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Screens.Multi.Lounge.Components;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsFilterControl : OsuTestScene
     {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
index f8788f0c36..04555857f5 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
@@ -11,8 +11,9 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Tests.Visual.Multiplayer;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsLoungeSubScreen : RoomManagerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
similarity index 97%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
index 90abecd26d..2a110c0386 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
@@ -13,9 +13,9 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Playlists;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
-    public class TestSceneMatchSettingsOverlay : MultiplayerTestScene
+    public class TestScenePlaylistsMatchSettingsOverlay : MultiplayerTestScene
     {
         [Cached(Type = typeof(IRoomManager))]
         private TestRoomManager roomManager = new TestRoomManager();
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
similarity index 97%
rename from osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
index d71fdc42e3..d5553e4527 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Users;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsParticipantsList : MultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index 99fc6597ee..10ae44351b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -24,7 +24,7 @@ using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsResultsScreen : ScreenTestScene
     {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
index 02cc03eca4..aebff14c80 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
@@ -22,7 +22,7 @@ using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsRoomSubScreen : MultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
similarity index 82%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
index 9ac1eb8013..8203ca4845 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
@@ -6,17 +6,17 @@ using osu.Framework.Allocation;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Playlists;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     [TestFixture]
-    public class TestSceneMultiScreen : ScreenTestScene
+    public class TestScenePlaylistsScreen : ScreenTestScene
     {
         protected override bool UseOnlineAPI => true;
 
         [Cached]
         private MusicController musicController { get; set; } = new MusicController();
 
-        public TestSceneMultiScreen()
+        public TestScenePlaylistsScreen()
         {
             var multi = new PlaylistsMultiplayer();
 

From 5d4b73baa5f655c1c7f77a69228c06e895c40b6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 13:38:11 +0900
Subject: [PATCH 07221/10326] RealtimeMultiplayer -> Multiplayer

---
 .../Multiplayer/RoomManagerTestScene.cs       |  4 ++--
 .../Visual/Multiplayer/TestRoomManager.cs     |  2 +-
 .../TestSceneDrawableRoomPlaylist.cs          |  2 +-
 .../Multiplayer/TestSceneLoungeRoomInfo.cs    |  2 +-
 .../TestSceneLoungeRoomsContainer.cs          |  2 +-
 .../TestSceneMatchBeatmapDetailArea.cs        |  2 +-
 .../Multiplayer/TestSceneMatchHeader.cs       |  2 +-
 ...Multiplayer.cs => TestSceneMultiplayer.cs} | 11 ++++-----
 ... => TestSceneMultiplayerMatchSubScreen.cs} | 21 ++++++++--------
 ...> TestSceneMultiplayerParticipantsList.cs} |  7 +++---
 ....cs => TestSceneMultiplayerReadyButton.cs} | 11 ++++-----
 ....cs => TestSceneMultiplayerRoomManager.cs} | 13 +++++-----
 .../Visual/Multiplayer/TestSceneRoomStatus.cs |  8 +++----
 .../TestScenePlaylistsMatchSettingsOverlay.cs |  4 ++--
 .../TestScenePlaylistsParticipantsList.cs     |  2 +-
 .../TestScenePlaylistsResultsScreen.cs        |  2 +-
 .../TestScenePlaylistsRoomSubScreen.cs        |  4 ++--
 .../IMultiplayerClient.cs                     |  2 +-
 .../IMultiplayerLoungeServer.cs               |  2 +-
 .../IMultiplayerRoomServer.cs                 |  2 +-
 .../IMultiplayerServer.cs                     |  2 +-
 .../InvalidStateChangeException.cs            |  2 +-
 .../InvalidStateException.cs                  |  2 +-
 .../MultiplayerClient.cs}                     |  6 ++---
 .../MultiplayerRoom.cs                        |  2 +-
 .../MultiplayerRoomSettings.cs                |  2 +-
 .../MultiplayerRoomState.cs                   |  4 ++--
 .../MultiplayerRoomUser.cs                    |  2 +-
 .../MultiplayerUserState.cs                   |  2 +-
 .../NotHostException.cs                       |  2 +-
 .../NotJoinedRoomException.cs                 |  2 +-
 .../StatefulMultiplayerClient.cs              |  6 ++---
 .../{Multiplayer => Rooms}/APICreatedRoom.cs  |  2 +-
 .../{Multiplayer => Rooms}/APILeaderboard.cs  |  2 +-
 .../APIPlaylistBeatmap.cs                     |  2 +-
 .../{Multiplayer => Rooms}/APIScoreToken.cs   |  2 +-
 .../CreateRoomRequest.cs                      |  2 +-
 .../CreateRoomScoreRequest.cs                 |  2 +-
 .../Online/{Multiplayer => Rooms}/GameType.cs |  2 +-
 .../GameTypes/GameTypeTag.cs                  |  2 +-
 .../GameTypes/GameTypeTagTeam.cs              |  2 +-
 .../GameTypes/GameTypeTeamVersus.cs           |  2 +-
 .../GameTypes/GameTypeTimeshift.cs            |  2 +-
 .../GameTypes/GameTypeVersus.cs               |  2 +-
 .../GameTypes/VersusRow.cs                    |  2 +-
 .../GetRoomLeaderboardRequest.cs              |  2 +-
 .../{Multiplayer => Rooms}/GetRoomRequest.cs  |  2 +-
 .../{Multiplayer => Rooms}/GetRoomsRequest.cs |  2 +-
 .../IndexPlaylistScoresRequest.cs             |  2 +-
 .../IndexScoresParams.cs                      |  2 +-
 .../IndexedMultiplayerScores.cs               |  2 +-
 .../{Multiplayer => Rooms}/JoinRoomRequest.cs |  2 +-
 .../MultiplayerScore.cs                       |  2 +-
 .../MultiplayerScores.cs                      |  2 +-
 .../MultiplayerScoresAround.cs                |  2 +-
 .../{Multiplayer => Rooms}/PartRoomRequest.cs |  2 +-
 .../PlaylistExtensions.cs                     |  2 +-
 .../{Multiplayer => Rooms}/PlaylistItem.cs    |  2 +-
 .../Online/{Multiplayer => Rooms}/Room.cs     |  6 ++---
 .../RoomAvailability.cs                       |  2 +-
 .../{Multiplayer => Rooms}/RoomCategory.cs    |  4 ++--
 .../{Multiplayer => Rooms}/RoomStatus.cs      |  4 ++--
 .../RoomStatuses/RoomStatusEnded.cs           |  2 +-
 .../RoomStatuses/RoomStatusOpen.cs            |  2 +-
 .../RoomStatuses/RoomStatusPlaying.cs         |  2 +-
 .../ShowPlaylistUserScoreRequest.cs           |  2 +-
 .../SubmitRoomScoreRequest.cs                 |  2 +-
 osu.Game/OsuGameBase.cs                       |  4 ++--
 osu.Game/Screens/Menu/MainMenu.cs             |  4 ++--
 .../Multi/Components/DrawableGameType.cs      |  2 +-
 .../Components/ListingPollingComponent.cs     |  2 +-
 .../Components/MatchBeatmapDetailArea.cs      |  2 +-
 .../Components/OverlinedPlaylistHeader.cs     |  2 +-
 .../Screens/Multi/Components/ReadyButton.cs   |  2 +-
 .../Screens/Multi/Components/RoomManager.cs   |  2 +-
 .../Multi/Components/RoomPollingComponent.cs  |  2 +-
 .../Multi/Components/RoomStatusInfo.cs        |  4 ++--
 .../Components/SelectionPollingComponent.cs   |  2 +-
 .../Components/StatusColouredContainer.cs     |  2 +-
 .../Screens/Multi/DrawableRoomPlaylist.cs     |  2 +-
 .../Screens/Multi/DrawableRoomPlaylistItem.cs |  2 +-
 .../Multi/DrawableRoomPlaylistWithResults.cs  |  2 +-
 osu.Game/Screens/Multi/IRoomManager.cs        |  2 +-
 .../Multi/Lounge/Components/DrawableRoom.cs   |  6 ++---
 .../Multi/Lounge/Components/RoomsContainer.cs |  2 +-
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |  2 +-
 .../Screens/Multi/Match/Components/Footer.cs  |  2 +-
 .../Multi/Match/Components/GameTypePicker.cs  |  4 ++--
 .../Match/Components/MatchChatDisplay.cs      |  2 +-
 .../Match/Components/MatchLeaderboard.cs      |  2 +-
 .../Components/RoomAvailabilityPicker.cs      |  2 +-
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs |  4 ++--
 .../CreateMultiplayerMatchButton.cs}          |  6 ++---
 .../Match/BeatmapSelectionControl.cs          |  6 ++---
 .../Match/MultiplayerMatchFooter.cs}          | 10 ++++----
 .../Match/MultiplayerMatchHeader.cs}          |  6 ++---
 .../Match/MultiplayerMatchSettingsOverlay.cs} |  6 ++---
 .../Match/MultiplayerReadyButton.cs}          |  8 +++----
 .../Multiplayer.cs}                           | 16 ++++++-------
 .../MultiplayerFilterControl.cs}              |  4 ++--
 .../MultiplayerLoungeSubScreen.cs}            | 10 ++++----
 .../MultiplayerMatchSongSelect.cs}            |  8 +++----
 .../MultiplayerMatchSubScreen.cs}             | 24 +++++++++----------
 .../MultiplayerPlayer.cs}                     | 12 +++++-----
 .../MultiplayerResultsScreen.cs}              |  8 +++----
 .../MultiplayerRoomComposite.cs}              |  6 ++---
 .../MultiplayerRoomManager.cs}                | 16 ++++++-------
 .../Participants/ParticipantPanel.cs          |  6 ++---
 .../Participants/ParticipantsList.cs          |  4 ++--
 .../Participants/ParticipantsListHeader.cs    |  4 ++--
 .../Participants/StateDisplay.cs              |  4 ++--
 .../Screens/Multi/MultiplayerComposite.cs     |  2 +-
 .../{Multiplayer.cs => MultiplayerScreen.cs}  |  6 ++---
 .../Screens/Multi/Play/TimeshiftPlayer.cs     |  2 +-
 .../Playlists/PlaylistsLoungeSubScreen.cs     |  2 +-
 .../PlaylistsMatchSettingsOverlay.cs          |  2 +-
 .../Multi/Playlists/PlaylistsMultiplayer.cs   |  4 ++--
 .../Multi/Playlists/PlaylistsReadyButton.cs   |  2 +-
 .../Multi/Playlists/PlaylistsRoomSubScreen.cs |  4 ++--
 .../Multi/Ranking/TimeshiftResultsScreen.cs   |  2 +-
 osu.Game/Screens/Select/MatchSongSelect.cs    |  2 +-
 .../MultiplayerTestScene.cs}                  | 16 ++++++-------
 .../TestMultiplayerClient.cs}                 |  6 ++---
 .../TestMultiplayerRoomContainer.cs}          | 16 ++++++-------
 .../TestMultiplayerRoomManager.cs}            |  8 +++----
 ...ltiplayerTestScene.cs => RoomTestScene.cs} |  4 ++--
 osu.Game/Users/UserActivity.cs                |  2 +-
 127 files changed, 260 insertions(+), 265 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneRealtimeMultiplayer.cs => TestSceneMultiplayer.cs} (77%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneRealtimeMatchSubScreen.cs => TestSceneMultiplayerMatchSubScreen.cs} (73%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneRealtimeMultiplayerParticipantsList.cs => TestSceneMultiplayerParticipantsList.cs} (94%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneRealtimeReadyButton.cs => TestSceneMultiplayerReadyButton.cs} (94%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneRealtimeRoomManager.cs => TestSceneMultiplayerRoomManager.cs} (92%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/IMultiplayerClient.cs (98%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/IMultiplayerLoungeServer.cs (93%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/IMultiplayerRoomServer.cs (98%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/IMultiplayerServer.cs (88%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/InvalidStateChangeException.cs (93%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/InvalidStateException.cs (92%)
 rename osu.Game/Online/{RealtimeMultiplayer/RealtimeMultiplayerClient.cs => Multiplayer/MultiplayerClient.cs} (97%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/MultiplayerRoom.cs (98%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/MultiplayerRoomSettings.cs (96%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/MultiplayerRoomState.cs (86%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/MultiplayerRoomUser.cs (96%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/MultiplayerUserState.cs (98%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/NotHostException.cs (92%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/NotJoinedRoomException.cs (92%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/StatefulMultiplayerClient.cs (99%)
 rename osu.Game/Online/{Multiplayer => Rooms}/APICreatedRoom.cs (88%)
 rename osu.Game/Online/{Multiplayer => Rooms}/APILeaderboard.cs (92%)
 rename osu.Game/Online/{Multiplayer => Rooms}/APIPlaylistBeatmap.cs (94%)
 rename osu.Game/Online/{Multiplayer => Rooms}/APIScoreToken.cs (88%)
 rename osu.Game/Online/{Multiplayer => Rooms}/CreateRoomRequest.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/CreateRoomScoreRequest.cs (96%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameType.cs (93%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/GameTypeTag.cs (94%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/GameTypeTagTeam.cs (96%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/GameTypeTeamVersus.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/GameTypeTimeshift.cs (93%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/GameTypeVersus.cs (92%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/VersusRow.cs (97%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GetRoomLeaderboardRequest.cs (92%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GetRoomRequest.cs (92%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GetRoomsRequest.cs (96%)
 rename osu.Game/Online/{Multiplayer => Rooms}/IndexPlaylistScoresRequest.cs (97%)
 rename osu.Game/Online/{Multiplayer => Rooms}/IndexScoresParams.cs (94%)
 rename osu.Game/Online/{Multiplayer => Rooms}/IndexedMultiplayerScores.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/JoinRoomRequest.cs (94%)
 rename osu.Game/Online/{Multiplayer => Rooms}/MultiplayerScore.cs (98%)
 rename osu.Game/Online/{Multiplayer => Rooms}/MultiplayerScores.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/MultiplayerScoresAround.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/PartRoomRequest.cs (94%)
 rename osu.Game/Online/{Multiplayer => Rooms}/PlaylistExtensions.cs (93%)
 rename osu.Game/Online/{Multiplayer => Rooms}/PlaylistItem.cs (98%)
 rename osu.Game/Online/{Multiplayer => Rooms}/Room.cs (97%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomAvailability.cs (90%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomCategory.cs (80%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomStatus.cs (93%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomStatuses/RoomStatusEnded.cs (88%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomStatuses/RoomStatusOpen.cs (89%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomStatuses/RoomStatusPlaying.cs (88%)
 rename osu.Game/Online/{Multiplayer => Rooms}/ShowPlaylistUserScoreRequest.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/SubmitRoomScoreRequest.cs (97%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/CreateRealtimeMatchButton.cs => Multiplayer/CreateMultiplayerMatchButton.cs} (77%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer => Multiplayer}/Match/BeatmapSelectionControl.cs (91%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/Match/RealtimeMatchFooter.cs => Multiplayer/Match/MultiplayerMatchFooter.cs} (84%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/Match/RealtimeMatchHeader.cs => Multiplayer/Match/MultiplayerMatchHeader.cs} (95%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs => Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs} (99%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/Match/RealtimeReadyButton.cs => Multiplayer/Match/MultiplayerReadyButton.cs} (95%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeMultiplayer.cs => Multiplayer/Multiplayer.cs} (86%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeFilterControl.cs => Multiplayer/MultiplayerFilterControl.cs} (79%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeLoungeSubScreen.cs => Multiplayer/MultiplayerLoungeSubScreen.cs} (79%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeMatchSongSelect.cs => Multiplayer/MultiplayerMatchSongSelect.cs} (92%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeMatchSubScreen.cs => Multiplayer/MultiplayerMatchSubScreen.cs} (92%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimePlayer.cs => Multiplayer/MultiplayerPlayer.cs} (93%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeResultsScreen.cs => Multiplayer/MultiplayerResultsScreen.cs} (55%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeRoomComposite.cs => Multiplayer/MultiplayerRoomComposite.cs} (83%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeRoomManager.cs => Multiplayer/MultiplayerRoomManager.cs} (92%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer => Multiplayer}/Participants/ParticipantPanel.cs (97%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer => Multiplayer}/Participants/ParticipantsList.cs (93%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer => Multiplayer}/Participants/ParticipantsListHeader.cs (86%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer => Multiplayer}/Participants/StateDisplay.cs (97%)
 rename osu.Game/Screens/Multi/{Multiplayer.cs => MultiplayerScreen.cs} (99%)
 rename osu.Game/Tests/Visual/{RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs => Multiplayer/MultiplayerTestScene.cs} (67%)
 rename osu.Game/Tests/Visual/{RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs => Multiplayer/TestMultiplayerClient.cs} (95%)
 rename osu.Game/Tests/Visual/{RealtimeMultiplayer/TestRealtimeRoomContainer.cs => Multiplayer/TestMultiplayerRoomContainer.cs} (67%)
 rename osu.Game/Tests/Visual/{RealtimeMultiplayer/TestRealtimeRoomManager.cs => Multiplayer/TestMultiplayerRoomManager.cs} (95%)
 rename osu.Game/Tests/Visual/{MultiplayerTestScene.cs => RoomTestScene.cs} (90%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
index 8b7e0fd9da..a2c496a504 100644
--- a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
@@ -4,14 +4,14 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Multi;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public abstract class RoomManagerTestScene : MultiplayerTestScene
+    public abstract class RoomManagerTestScene : RoomTestScene
     {
         [Cached(Type = typeof(IRoomManager))]
         protected TestRoomManager RoomManager { get; } = new TestRoomManager();
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
index 9dd4aea4bd..7d9d4a6542 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
@@ -3,7 +3,7 @@
 
 using System;
 using osu.Framework.Bindables;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 55b026eff6..722e1a50ef 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -13,7 +13,7 @@ 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.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
index 9baaa42c83..1359274512 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -4,7 +4,7 @@
 using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Users;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index e33d15cfff..9b6a6de7c2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -6,7 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi.Lounge.Components;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 6b1d90e06e..f4e0cc415c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -5,7 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index ec5292e51e..e162009771 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
@@ -3,7 +3,7 @@
 
 using NUnit.Framework;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Multi.Match.Components;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
similarity index 77%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index cc07bb8e79..5c07b9d0ea 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -3,16 +3,15 @@
 
 using NUnit.Framework;
 using osu.Game.Screens.Multi.Components;
-using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneRealtimeMultiplayer : RealtimeMultiplayerTestScene
+    public class TestSceneMultiplayer : MultiplayerTestScene
     {
-        public TestSceneRealtimeMultiplayer()
+        public TestSceneMultiplayer()
         {
-            var multi = new TestRealtimeMultiplayer();
+            var multi = new TestMultiplayer();
 
             AddStep("show", () => LoadScreen(multi));
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
@@ -40,9 +39,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("room has 1 user", () => Client.Room?.Users.Count == 1);
         }
 
-        private class TestRealtimeMultiplayer : Screens.Multi.RealtimeMultiplayer.RealtimeMultiplayer
+        private class TestMultiplayer : Screens.Multi.Multiplayer.Multiplayer
         {
-            protected override RoomManager CreateRoomManager() => new TestRealtimeRoomManager();
+            protected override RoomManager CreateRoomManager() => new TestMultiplayerRoomManager();
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
similarity index 73%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index dff375d1bb..6dc26dae57 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -5,21 +5,20 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
-using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
+using osu.Game.Screens.Multi.Multiplayer;
+using osu.Game.Screens.Multi.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
-using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneRealtimeMatchSubScreen : RealtimeMultiplayerTestScene
+    public class TestSceneMultiplayerMatchSubScreen : MultiplayerTestScene
     {
-        private RealtimeMatchSubScreen screen;
+        private MultiplayerMatchSubScreen screen;
 
-        public TestSceneRealtimeMatchSubScreen()
+        public TestSceneMultiplayerMatchSubScreen()
             : base(false)
         {
         }
@@ -33,14 +32,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUpSteps]
         public void SetupSteps()
         {
-            AddStep("load match", () => LoadScreen(screen = new RealtimeMatchSubScreen(Room)));
+            AddStep("load match", () => LoadScreen(screen = new MultiplayerMatchSubScreen(Room)));
             AddUntilStep("wait for load", () => screen.IsCurrentScreen());
         }
 
         [Test]
         public void TestSettingValidity()
         {
-            AddAssert("create button not enabled", () => !this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
+            AddAssert("create button not enabled", () => !this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
 
             AddStep("set playlist", () =>
             {
@@ -51,7 +50,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             });
 
-            AddAssert("create button enabled", () => this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
+            AddAssert("create button enabled", () => this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
         }
 
         [Test]
@@ -68,7 +67,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("click create button", () =>
             {
-                InputManager.MoveMouseTo(this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single());
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());
                 InputManager.Click(MouseButton.Left);
             });
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
similarity index 94%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 7c26918927..ee2fa4ef5a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -7,15 +7,14 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osu.Game.Online.RealtimeMultiplayer;
-using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
-using osu.Game.Tests.Visual.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Multiplayer.Participants;
 using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneRealtimeMultiplayerParticipantsList : RealtimeMultiplayerTestScene
+    public class TestSceneMultiplayerParticipantsList : MultiplayerTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
similarity index 94%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 3c92276629..c8ebdb1b76 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -10,20 +10,19 @@ using osu.Framework.Platform;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
+using osu.Game.Screens.Multi.Multiplayer.Match;
 using osu.Game.Tests.Resources;
-using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneRealtimeReadyButton : RealtimeMultiplayerTestScene
+    public class TestSceneMultiplayerReadyButton : MultiplayerTestScene
     {
-        private RealtimeReadyButton button;
+        private MultiplayerReadyButton button;
 
         private BeatmapManager beatmaps;
         private RulesetStore rulesets;
@@ -43,7 +42,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap);
 
-            Child = button = new RealtimeReadyButton
+            Child = button = new MultiplayerReadyButton
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
similarity index 92%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index ba90e0840b..292c4846ab 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -4,16 +4,15 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Tests.Visual.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [HeadlessTest]
-    public class TestSceneRealtimeRoomManager : MultiplayerTestScene
+    public class TestSceneMultiplayerRoomManager : MultiplayerTestScene
     {
-        private TestRealtimeRoomContainer roomContainer;
-        private TestRealtimeRoomManager roomManager => roomContainer.RoomManager;
+        private TestMultiplayerRoomContainer roomContainer;
+        private TestMultiplayerRoomManager roomManager => roomContainer.RoomManager;
 
         [Test]
         public void TestPollsInitially()
@@ -137,9 +136,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
         }
 
-        private TestRealtimeRoomManager createRoomManager()
+        private TestMultiplayerRoomManager createRoomManager()
         {
-            Child = roomContainer = new TestRealtimeRoomContainer
+            Child = roomContainer = new TestMultiplayerRoomContainer
             {
                 RoomManager =
                 {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
index a6dd1437f7..788255501b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
@@ -4,8 +4,8 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Screens.Multi.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -40,9 +40,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     }) { MatchingFilter = true },
                     new DrawableRoom(new Room
                     {
-                        Name = { Value = "Open (realtime)" },
+                        Name = { Value = "Open" },
                         Status = { Value = new RoomStatusOpen() },
-                        Category = { Value = RoomCategory.Realtime }
+                        Category = { Value = RoomCategory.Multiplayer }
                     }) { MatchingFilter = true },
                 }
             };
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
index 2a110c0386..4e75619f13 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
@@ -9,13 +9,13 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
-    public class TestScenePlaylistsMatchSettingsOverlay : MultiplayerTestScene
+    public class TestScenePlaylistsMatchSettingsOverlay : RoomTestScene
     {
         [Cached(Type = typeof(IRoomManager))]
         private TestRoomManager roomManager = new TestRoomManager();
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
index d5553e4527..5a0f196df9 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
-    public class TestScenePlaylistsParticipantsList : MultiplayerTestScene
+    public class TestScenePlaylistsParticipantsList : RoomTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index 10ae44351b..b42f2e1d2d 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -15,7 +15,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
index aebff14c80..96ff93a145 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
@@ -12,7 +12,7 @@ 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.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi;
@@ -24,7 +24,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
-    public class TestScenePlaylistsRoomSubScreen : MultiplayerTestScene
+    public class TestScenePlaylistsRoomSubScreen : RoomTestScene
     {
         protected override bool UseOnlineAPI => true;
 
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
similarity index 98%
rename from osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
rename to osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 9af0047137..b97fcc9ae7 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
     /// An interface defining a multiplayer client instance.
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerLoungeServer.cs
similarity index 93%
rename from osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs
rename to osu.Game/Online/Multiplayer/IMultiplayerLoungeServer.cs
index eecb61bcb0..4640640c5f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerLoungeServer.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
     /// Interface for an out-of-room multiplayer server.
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
similarity index 98%
rename from osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
rename to osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 12dfe481c4..481e3fb1de 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
     /// Interface for an in-room multiplayer server.
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerServer.cs
similarity index 88%
rename from osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
rename to osu.Game/Online/Multiplayer/IMultiplayerServer.cs
index 1d093af743..d3a070af6d 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerServer.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.
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
     /// An interface defining the multiplayer server instance.
diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs b/osu.Game/Online/Multiplayer/InvalidStateChangeException.cs
similarity index 93%
rename from osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
rename to osu.Game/Online/Multiplayer/InvalidStateChangeException.cs
index d9a276fc19..69b6d4bc13 100644
--- a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
+++ b/osu.Game/Online/Multiplayer/InvalidStateChangeException.cs
@@ -5,7 +5,7 @@ using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class InvalidStateChangeException : HubException
diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs b/osu.Game/Online/Multiplayer/InvalidStateException.cs
similarity index 92%
rename from osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
rename to osu.Game/Online/Multiplayer/InvalidStateException.cs
index 7791bfc69f..77a3533dd3 100644
--- a/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
+++ b/osu.Game/Online/Multiplayer/InvalidStateException.cs
@@ -5,7 +5,7 @@ using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class InvalidStateException : HubException
diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
similarity index 97%
rename from osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
rename to osu.Game/Online/Multiplayer/MultiplayerClient.cs
index cb5c21a8c9..24ea6abc4a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -15,9 +15,9 @@ using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
-    public class RealtimeMultiplayerClient : StatefulMultiplayerClient
+    public class MultiplayerClient : StatefulMultiplayerClient
     {
         public override IBindable<bool> IsConnected => isConnected;
 
@@ -31,7 +31,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         private readonly string endpoint;
 
-        public RealtimeMultiplayerClient(EndpointConfiguration endpoints)
+        public MultiplayerClient(EndpointConfiguration endpoints)
         {
             endpoint = endpoints.MultiplayerEndpointUrl;
         }
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
similarity index 98%
rename from osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
rename to osu.Game/Online/Multiplayer/MultiplayerRoom.cs
index e009a34707..2134e50d72 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
@@ -9,7 +9,7 @@ using System.Threading;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
     /// A multiplayer room.
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
similarity index 96%
rename from osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
rename to osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 60e0d1292e..857b38ea60 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -9,7 +9,7 @@ using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class MultiplayerRoomSettings : IEquatable<MultiplayerRoomSettings>
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomState.cs
similarity index 86%
rename from osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
rename to osu.Game/Online/Multiplayer/MultiplayerRoomState.cs
index 69c04b09a8..48f25d7ca2 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomState.cs
@@ -3,10 +3,10 @@
 
 #nullable enable
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
-    /// The current overall state of a realtime multiplayer room.
+    /// The current overall state of a multiplayer room.
     /// </summary>
     public enum MultiplayerRoomState
     {
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
similarity index 96%
rename from osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
rename to osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index caf1a70197..99624dc3e7 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -7,7 +7,7 @@ using System;
 using Newtonsoft.Json;
 using osu.Game.Users;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class MultiplayerRoomUser : IEquatable<MultiplayerRoomUser>
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
similarity index 98%
rename from osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
rename to osu.Game/Online/Multiplayer/MultiplayerUserState.cs
index ed9acd146e..e54c71cd85 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerUserState.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.
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     public enum MultiplayerUserState
     {
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs b/osu.Game/Online/Multiplayer/NotHostException.cs
similarity index 92%
rename from osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
rename to osu.Game/Online/Multiplayer/NotHostException.cs
index 56095043f0..051cde45a0 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
+++ b/osu.Game/Online/Multiplayer/NotHostException.cs
@@ -5,7 +5,7 @@ using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class NotHostException : HubException
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs b/osu.Game/Online/Multiplayer/NotJoinedRoomException.cs
similarity index 92%
rename from osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
rename to osu.Game/Online/Multiplayer/NotJoinedRoomException.cs
index 7a6e089d0b..0e9902f002 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
+++ b/osu.Game/Online/Multiplayer/NotJoinedRoomException.cs
@@ -5,7 +5,7 @@ using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class NotJoinedRoomException : HubException
diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
similarity index 99%
rename from osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
rename to osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 9149bdcba3..e422e982ae 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -18,13 +18,13 @@ using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Rulesets;
 using osu.Game.Users;
 using osu.Game.Utils;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     public abstract class StatefulMultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
     {
diff --git a/osu.Game/Online/Multiplayer/APICreatedRoom.cs b/osu.Game/Online/Rooms/APICreatedRoom.cs
similarity index 88%
rename from osu.Game/Online/Multiplayer/APICreatedRoom.cs
rename to osu.Game/Online/Rooms/APICreatedRoom.cs
index 2a3bb39647..d1062b2306 100644
--- a/osu.Game/Online/Multiplayer/APICreatedRoom.cs
+++ b/osu.Game/Online/Rooms/APICreatedRoom.cs
@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class APICreatedRoom : Room
     {
diff --git a/osu.Game/Online/Multiplayer/APILeaderboard.cs b/osu.Game/Online/Rooms/APILeaderboard.cs
similarity index 92%
rename from osu.Game/Online/Multiplayer/APILeaderboard.cs
rename to osu.Game/Online/Rooms/APILeaderboard.cs
index 65863d6e0e..c487123906 100644
--- a/osu.Game/Online/Multiplayer/APILeaderboard.cs
+++ b/osu.Game/Online/Rooms/APILeaderboard.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Game.Online.API.Requests.Responses;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class APILeaderboard
     {
diff --git a/osu.Game/Online/Multiplayer/APIPlaylistBeatmap.cs b/osu.Game/Online/Rooms/APIPlaylistBeatmap.cs
similarity index 94%
rename from osu.Game/Online/Multiplayer/APIPlaylistBeatmap.cs
rename to osu.Game/Online/Rooms/APIPlaylistBeatmap.cs
index 98972ef36d..973dccd528 100644
--- a/osu.Game/Online/Multiplayer/APIPlaylistBeatmap.cs
+++ b/osu.Game/Online/Rooms/APIPlaylistBeatmap.cs
@@ -6,7 +6,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class APIPlaylistBeatmap : APIBeatmap
     {
diff --git a/osu.Game/Online/Multiplayer/APIScoreToken.cs b/osu.Game/Online/Rooms/APIScoreToken.cs
similarity index 88%
rename from osu.Game/Online/Multiplayer/APIScoreToken.cs
rename to osu.Game/Online/Rooms/APIScoreToken.cs
index 1f0063d94e..f652c1720d 100644
--- a/osu.Game/Online/Multiplayer/APIScoreToken.cs
+++ b/osu.Game/Online/Rooms/APIScoreToken.cs
@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class APIScoreToken
     {
diff --git a/osu.Game/Online/Multiplayer/CreateRoomRequest.cs b/osu.Game/Online/Rooms/CreateRoomRequest.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/CreateRoomRequest.cs
rename to osu.Game/Online/Rooms/CreateRoomRequest.cs
index 5be99e9442..f058eb9ba8 100644
--- a/osu.Game/Online/Multiplayer/CreateRoomRequest.cs
+++ b/osu.Game/Online/Rooms/CreateRoomRequest.cs
@@ -6,7 +6,7 @@ using Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class CreateRoomRequest : APIRequest<APICreatedRoom>
     {
diff --git a/osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs b/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
similarity index 96%
rename from osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs
rename to osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
index 2d99b12519..afd0dadc7e 100644
--- a/osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs
+++ b/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
@@ -5,7 +5,7 @@ using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class CreateRoomScoreRequest : APIRequest<APIScoreToken>
     {
diff --git a/osu.Game/Online/Multiplayer/GameType.cs b/osu.Game/Online/Rooms/GameType.cs
similarity index 93%
rename from osu.Game/Online/Multiplayer/GameType.cs
rename to osu.Game/Online/Rooms/GameType.cs
index 10381d93bb..caa352d812 100644
--- a/osu.Game/Online/Multiplayer/GameType.cs
+++ b/osu.Game/Online/Rooms/GameType.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public abstract class GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs b/osu.Game/Online/Rooms/GameTypes/GameTypeTag.cs
similarity index 94%
rename from osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypeTag.cs
index 5ba5f1a415..e468612738 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs
+++ b/osu.Game/Online/Rooms/GameTypes/GameTypeTag.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osuTK;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class GameTypeTag : GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs b/osu.Game/Online/Rooms/GameTypes/GameTypeTagTeam.cs
similarity index 96%
rename from osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypeTagTeam.cs
index ef0a00a9f0..b82f203fac 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs
+++ b/osu.Game/Online/Rooms/GameTypes/GameTypeTagTeam.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osuTK;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class GameTypeTagTeam : GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTeamVersus.cs b/osu.Game/Online/Rooms/GameTypes/GameTypeTeamVersus.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/GameTypes/GameTypeTeamVersus.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypeTeamVersus.cs
index c25bce1c71..5ad4033dc9 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTeamVersus.cs
+++ b/osu.Game/Online/Rooms/GameTypes/GameTypeTeamVersus.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osuTK;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class GameTypeTeamVersus : GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs b/osu.Game/Online/Rooms/GameTypes/GameTypeTimeshift.cs
similarity index 93%
rename from osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypeTimeshift.cs
index 5840ccb803..3425c6c5cd 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
+++ b/osu.Game/Online/Rooms/GameTypes/GameTypeTimeshift.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osuTK;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class GameTypePlaylists : GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeVersus.cs b/osu.Game/Online/Rooms/GameTypes/GameTypeVersus.cs
similarity index 92%
rename from osu.Game/Online/Multiplayer/GameTypes/GameTypeVersus.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypeVersus.cs
index 4640c7b361..3783cc67b0 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeVersus.cs
+++ b/osu.Game/Online/Rooms/GameTypes/GameTypeVersus.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class GameTypeVersus : GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/VersusRow.cs b/osu.Game/Online/Rooms/GameTypes/VersusRow.cs
similarity index 97%
rename from osu.Game/Online/Multiplayer/GameTypes/VersusRow.cs
rename to osu.Game/Online/Rooms/GameTypes/VersusRow.cs
index b6e8e4458f..0bd09a23ac 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/VersusRow.cs
+++ b/osu.Game/Online/Rooms/GameTypes/VersusRow.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Shapes;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class VersusRow : FillFlowContainer
     {
diff --git a/osu.Game/Online/Multiplayer/GetRoomLeaderboardRequest.cs b/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
similarity index 92%
rename from osu.Game/Online/Multiplayer/GetRoomLeaderboardRequest.cs
rename to osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
index 37c21457bc..15f1221a00 100644
--- a/osu.Game/Online/Multiplayer/GetRoomLeaderboardRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class GetRoomLeaderboardRequest : APIRequest<APILeaderboard>
     {
diff --git a/osu.Game/Online/Multiplayer/GetRoomRequest.cs b/osu.Game/Online/Rooms/GetRoomRequest.cs
similarity index 92%
rename from osu.Game/Online/Multiplayer/GetRoomRequest.cs
rename to osu.Game/Online/Rooms/GetRoomRequest.cs
index 449c2c8e31..ce117075c7 100644
--- a/osu.Game/Online/Multiplayer/GetRoomRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomRequest.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class GetRoomRequest : APIRequest<Room>
     {
diff --git a/osu.Game/Online/Multiplayer/GetRoomsRequest.cs b/osu.Game/Online/Rooms/GetRoomsRequest.cs
similarity index 96%
rename from osu.Game/Online/Multiplayer/GetRoomsRequest.cs
rename to osu.Game/Online/Rooms/GetRoomsRequest.cs
index a0609f77dd..5084b8627f 100644
--- a/osu.Game/Online/Multiplayer/GetRoomsRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomsRequest.cs
@@ -7,7 +7,7 @@ using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 using osu.Game.Screens.Multi.Lounge.Components;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class GetRoomsRequest : APIRequest<List<Room>>
     {
diff --git a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs b/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
similarity index 97%
rename from osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
rename to osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
index 684d0aecd8..43f80a2dc4 100644
--- a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
@@ -8,7 +8,7 @@ using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     /// <summary>
     /// Returns a list of scores for the specified playlist item.
diff --git a/osu.Game/Online/Multiplayer/IndexScoresParams.cs b/osu.Game/Online/Rooms/IndexScoresParams.cs
similarity index 94%
rename from osu.Game/Online/Multiplayer/IndexScoresParams.cs
rename to osu.Game/Online/Rooms/IndexScoresParams.cs
index a511e9a780..3df8c8e753 100644
--- a/osu.Game/Online/Multiplayer/IndexScoresParams.cs
+++ b/osu.Game/Online/Rooms/IndexScoresParams.cs
@@ -6,7 +6,7 @@ using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     /// <summary>
     /// A collection of parameters which should be passed to the index endpoint to fetch the next page.
diff --git a/osu.Game/Online/Multiplayer/IndexedMultiplayerScores.cs b/osu.Game/Online/Rooms/IndexedMultiplayerScores.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/IndexedMultiplayerScores.cs
rename to osu.Game/Online/Rooms/IndexedMultiplayerScores.cs
index e237b7e3fb..2008d1aa52 100644
--- a/osu.Game/Online/Multiplayer/IndexedMultiplayerScores.cs
+++ b/osu.Game/Online/Rooms/IndexedMultiplayerScores.cs
@@ -4,7 +4,7 @@
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     /// <summary>
     /// A <see cref="MultiplayerScores"/> object returned via a <see cref="IndexPlaylistScoresRequest"/>.
diff --git a/osu.Game/Online/Multiplayer/JoinRoomRequest.cs b/osu.Game/Online/Rooms/JoinRoomRequest.cs
similarity index 94%
rename from osu.Game/Online/Multiplayer/JoinRoomRequest.cs
rename to osu.Game/Online/Rooms/JoinRoomRequest.cs
index 74375af856..faa20a3e6c 100644
--- a/osu.Game/Online/Multiplayer/JoinRoomRequest.cs
+++ b/osu.Game/Online/Rooms/JoinRoomRequest.cs
@@ -5,7 +5,7 @@ using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class JoinRoomRequest : APIRequest
     {
diff --git a/osu.Game/Online/Multiplayer/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs
similarity index 98%
rename from osu.Game/Online/Multiplayer/MultiplayerScore.cs
rename to osu.Game/Online/Rooms/MultiplayerScore.cs
index 8191003aad..677a3d3026 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScore.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScore.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Users;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class MultiplayerScore
     {
diff --git a/osu.Game/Online/Multiplayer/MultiplayerScores.cs b/osu.Game/Online/Rooms/MultiplayerScores.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/MultiplayerScores.cs
rename to osu.Game/Online/Rooms/MultiplayerScores.cs
index 7b9dcff828..3f970b2f8e 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScores.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScores.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Game.Online.API.Requests;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     /// <summary>
     /// An object which contains scores and related data for fetching next pages.
diff --git a/osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs b/osu.Game/Online/Rooms/MultiplayerScoresAround.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs
rename to osu.Game/Online/Rooms/MultiplayerScoresAround.cs
index 2ac62d0300..a99439312a 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScoresAround.cs
@@ -4,7 +4,7 @@
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     /// <summary>
     /// An object which stores scores higher and lower than the user's score.
diff --git a/osu.Game/Online/Multiplayer/PartRoomRequest.cs b/osu.Game/Online/Rooms/PartRoomRequest.cs
similarity index 94%
rename from osu.Game/Online/Multiplayer/PartRoomRequest.cs
rename to osu.Game/Online/Rooms/PartRoomRequest.cs
index 54bb005d96..2f036abc8c 100644
--- a/osu.Game/Online/Multiplayer/PartRoomRequest.cs
+++ b/osu.Game/Online/Rooms/PartRoomRequest.cs
@@ -5,7 +5,7 @@ using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class PartRoomRequest : APIRequest
     {
diff --git a/osu.Game/Online/Multiplayer/PlaylistExtensions.cs b/osu.Game/Online/Rooms/PlaylistExtensions.cs
similarity index 93%
rename from osu.Game/Online/Multiplayer/PlaylistExtensions.cs
rename to osu.Game/Online/Rooms/PlaylistExtensions.cs
index fe3d96e295..992011da3c 100644
--- a/osu.Game/Online/Multiplayer/PlaylistExtensions.cs
+++ b/osu.Game/Online/Rooms/PlaylistExtensions.cs
@@ -6,7 +6,7 @@ using Humanizer;
 using Humanizer.Localisation;
 using osu.Framework.Bindables;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public static class PlaylistExtensions
     {
diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Rooms/PlaylistItem.cs
similarity index 98%
rename from osu.Game/Online/Multiplayer/PlaylistItem.cs
rename to osu.Game/Online/Rooms/PlaylistItem.cs
index 4c4c071fc9..ada2140ca6 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Rooms/PlaylistItem.cs
@@ -10,7 +10,7 @@ using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class PlaylistItem : IEquatable<PlaylistItem>
     {
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Rooms/Room.cs
similarity index 97%
rename from osu.Game/Online/Multiplayer/Room.cs
rename to osu.Game/Online/Rooms/Room.cs
index d13d7dc774..67f874cdc4 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -7,11 +7,11 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.IO.Serialization.Converters;
-using osu.Game.Online.Multiplayer.GameTypes;
-using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Online.Rooms.GameTypes;
+using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Users;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class Room
     {
diff --git a/osu.Game/Online/Multiplayer/RoomAvailability.cs b/osu.Game/Online/Rooms/RoomAvailability.cs
similarity index 90%
rename from osu.Game/Online/Multiplayer/RoomAvailability.cs
rename to osu.Game/Online/Rooms/RoomAvailability.cs
index 08fa853562..3aea0e5948 100644
--- a/osu.Game/Online/Multiplayer/RoomAvailability.cs
+++ b/osu.Game/Online/Rooms/RoomAvailability.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public enum RoomAvailability
     {
diff --git a/osu.Game/Online/Multiplayer/RoomCategory.cs b/osu.Game/Online/Rooms/RoomCategory.cs
similarity index 80%
rename from osu.Game/Online/Multiplayer/RoomCategory.cs
rename to osu.Game/Online/Rooms/RoomCategory.cs
index d6786a72fe..f485e65ba9 100644
--- a/osu.Game/Online/Multiplayer/RoomCategory.cs
+++ b/osu.Game/Online/Rooms/RoomCategory.cs
@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public enum RoomCategory
     {
         Normal,
         Spotlight,
-        Realtime,
+        Multiplayer,
     }
 }
diff --git a/osu.Game/Online/Multiplayer/RoomStatus.cs b/osu.Game/Online/Rooms/RoomStatus.cs
similarity index 93%
rename from osu.Game/Online/Multiplayer/RoomStatus.cs
rename to osu.Game/Online/Rooms/RoomStatus.cs
index 3ff2770ab4..87c5aa3fda 100644
--- a/osu.Game/Online/Multiplayer/RoomStatus.cs
+++ b/osu.Game/Online/Rooms/RoomStatus.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 osuTK.Graphics;
 using osu.Game.Graphics;
+using osuTK.Graphics;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public abstract class RoomStatus
     {
diff --git a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusEnded.cs b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusEnded.cs
similarity index 88%
rename from osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusEnded.cs
rename to osu.Game/Online/Rooms/RoomStatuses/RoomStatusEnded.cs
index 4177d28a99..c852f86f6b 100644
--- a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusEnded.cs
+++ b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusEnded.cs
@@ -4,7 +4,7 @@
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
-namespace osu.Game.Online.Multiplayer.RoomStatuses
+namespace osu.Game.Online.Rooms.RoomStatuses
 {
     public class RoomStatusEnded : RoomStatus
     {
diff --git a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusOpen.cs b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpen.cs
similarity index 89%
rename from osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusOpen.cs
rename to osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpen.cs
index 45a1cb1909..4f7f0d6f5d 100644
--- a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusOpen.cs
+++ b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpen.cs
@@ -4,7 +4,7 @@
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
-namespace osu.Game.Online.Multiplayer.RoomStatuses
+namespace osu.Game.Online.Rooms.RoomStatuses
 {
     public class RoomStatusOpen : RoomStatus
     {
diff --git a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusPlaying.cs b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusPlaying.cs
similarity index 88%
rename from osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusPlaying.cs
rename to osu.Game/Online/Rooms/RoomStatuses/RoomStatusPlaying.cs
index b2cb5c4510..f04f1b23af 100644
--- a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusPlaying.cs
+++ b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusPlaying.cs
@@ -4,7 +4,7 @@
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
-namespace osu.Game.Online.Multiplayer.RoomStatuses
+namespace osu.Game.Online.Rooms.RoomStatuses
 {
     public class RoomStatusPlaying : RoomStatus
     {
diff --git a/osu.Game/Online/Multiplayer/ShowPlaylistUserScoreRequest.cs b/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/ShowPlaylistUserScoreRequest.cs
rename to osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
index 936b8bbe89..3f728a5417 100644
--- a/osu.Game/Online/Multiplayer/ShowPlaylistUserScoreRequest.cs
+++ b/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class ShowPlaylistUserScoreRequest : APIRequest<MultiplayerScore>
     {
diff --git a/osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs b/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
similarity index 97%
rename from osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs
rename to osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
index d31aef2ea5..5a78b9fabd 100644
--- a/osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs
+++ b/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
@@ -7,7 +7,7 @@ using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 using osu.Game.Scoring;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class SubmitRoomScoreRequest : APIRequest<MultiplayerScore>
     {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index bdc9e5eb7b..0b5abc4e31 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -31,7 +31,7 @@ using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
 using osu.Game.Online;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Resources;
@@ -219,7 +219,7 @@ namespace osu.Game
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints));
 
             dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));
-            dependencies.CacheAs(multiplayerClient = new RealtimeMultiplayerClient(endpoints));
+            dependencies.CacheAs(multiplayerClient = new MultiplayerClient(endpoints));
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 5650b22f25..15ac2237d3 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -17,7 +17,7 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Multiplayer;
 using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Select;
 
@@ -105,7 +105,7 @@ namespace osu.Game.Screens.Menu
                                 this.Push(new Editor());
                             },
                             OnSolo = onSolo,
-                            OnMultiplayer = () => this.Push(new RealtimeMultiplayer()),
+                            OnMultiplayer = () => this.Push(new Multiplayer()),
                             OnPlaylists = () => this.Push(new PlaylistsMultiplayer()),
                             OnExit = confirmAndExit,
                         }
diff --git a/osu.Game/Screens/Multi/Components/DrawableGameType.cs b/osu.Game/Screens/Multi/Components/DrawableGameType.cs
index 28240f0796..38af6d065e 100644
--- a/osu.Game/Screens/Multi/Components/DrawableGameType.cs
+++ b/osu.Game/Screens/Multi/Components/DrawableGameType.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
index dff6c50bf2..edce5400d1 100644
--- a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Lounge.Components;
 
 namespace osu.Game.Screens.Multi.Components
diff --git a/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs b/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
index 2c5fd2d397..6997840c92 100644
--- a/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
+++ b/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
@@ -8,7 +8,7 @@ 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.Online.Rooms;
 using osu.Game.Screens.Select;
 using osuTK;
 
diff --git a/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs b/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs
index 5552c1cb72..ebebe8b660 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.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.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Components/ReadyButton.cs
index 0bb4ed8617..68df30965d 100644
--- a/osu.Game/Screens/Multi/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Components/ReadyButton.cs
@@ -9,7 +9,7 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index f78d0d979e..7e0c8c4ec5 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -12,7 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.Multi.Components
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
index fbaf9dd930..1d10277d1c 100644
--- a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Online;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs b/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
index b5676692a4..89021691f3 100644
--- a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
+++ b/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
@@ -8,8 +8,8 @@ using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.RoomStatuses;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
index 37a190b5e0..3050765931 100644
--- a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs b/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
index a115f06e7b..68c14eeb15 100644
--- a/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
+++ b/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
@@ -6,7 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
index 89c335183b..956d38a90e 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
@@ -7,7 +7,7 @@ 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 osu.Game.Online.Rooms;
 using osuTK;
 
 namespace osu.Game.Screens.Multi
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index bda00b65b5..a2aeae154a 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -21,7 +21,7 @@ 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.Online.Rooms;
 using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs
index 439aaaa275..fa241a3c42 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs
@@ -11,7 +11,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi
 {
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs
index 630e3af91c..eee2a223a1 100644
--- a/osu.Game/Screens/Multi/IRoomManager.cs
+++ b/osu.Game/Screens/Multi/IRoomManager.cs
@@ -4,7 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi
 {
diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index 56116b219a..6e4d8b46ed 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -17,12 +17,12 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         private CachedModelDependencyContainer<Room> dependencies;
 
         [Resolved(canBeNull: true)]
-        private Multiplayer multiplayer { get; set; }
+        private MultiplayerScreen multiplayer { get; set; }
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -228,7 +228,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         private class RoomName : OsuSpriteText
         {
-            [Resolved(typeof(Room), nameof(Online.Multiplayer.Room.Name))]
+            [Resolved(typeof(Room), nameof(Online.Rooms.Room.Name))]
             private Bindable<string> name { get; set; }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index c7c37cbc0d..fbd5f44a30 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -15,9 +15,9 @@ using osu.Framework.Threading;
 using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
-using osu.Game.Online.Multiplayer;
 using osuTK;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 6b08745dd7..cbab79e2ab 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -10,7 +10,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index fdf1d0dbeb..7074ceca38 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Playlists;
 using osuTK;
 
diff --git a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs b/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
index c7fc329a1a..23a3da6e38 100644
--- a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
+++ b/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
@@ -8,8 +8,8 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.GameTypes;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.GameTypes;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs
index f8b64a54ef..b790ad9be5 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Chat;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index f2409d64e7..8cc7b62f98 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -8,7 +8,7 @@ using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
diff --git a/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs b/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
index 7ef39c2a74..2292826d55 100644
--- a/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
+++ b/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
index 0598524e81..b626156852 100644
--- a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
@@ -10,7 +10,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Multi.Match
         private BeatmapManager beatmapManager { get; set; }
 
         [Resolved(canBeNull: true)]
-        protected Multiplayer Multiplayer { get; private set; }
+        protected MultiplayerScreen Multiplayer { get; private set; }
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs b/osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs
similarity index 77%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
rename to osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs
index cdaeb6faec..b8b3f15fca 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -3,12 +3,12 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Match.Components;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class CreateRealtimeMatchButton : PurpleTriangleButton
+    public class CreateMultiplayerMatchButton : PurpleTriangleButton
     {
         [BackgroundDependencyLoader]
         private void load(StatefulMultiplayerClient multiplayerClient)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs
similarity index 91%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs
rename to osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs
index 1939744916..dfb6feeaf9 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -11,12 +11,12 @@ using osu.Framework.Screens;
 using osu.Game.Online.API;
 using osu.Game.Screens.Multi.Match.Components;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+namespace osu.Game.Screens.Multi.Multiplayer.Match
 {
     public class BeatmapSelectionControl : MultiplayerComposite
     {
         [Resolved]
-        private RealtimeMatchSubScreen matchSubScreen { get; set; }
+        private MultiplayerMatchSubScreen matchSubScreen { get; set; }
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                         RelativeSizeAxes = Axes.X,
                         Height = 40,
                         Text = "Select beatmap",
-                        Action = () => matchSubScreen.Push(new RealtimeMatchSongSelect()),
+                        Action = () => matchSubScreen.Push(new MultiplayerMatchSongSelect()),
                         Alpha = 0
                     }
                 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs
similarity index 84%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs
rename to osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs
index 31871729f6..145ae18817 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -8,12 +8,12 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+namespace osu.Game.Screens.Multi.Multiplayer.Match
 {
-    public class RealtimeMatchFooter : CompositeDrawable
+    public class MultiplayerMatchFooter : CompositeDrawable
     {
         public const float HEIGHT = 50;
 
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 
         private readonly Drawable background;
 
-        public RealtimeMatchFooter()
+        public MultiplayerMatchFooter()
         {
             RelativeSizeAxes = Axes.X;
             Height = HEIGHT;
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
             InternalChildren = new[]
             {
                 background = new Box { RelativeSizeAxes = Axes.Both },
-                new RealtimeReadyButton
+                new MultiplayerReadyButton
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs
similarity index 95%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs
rename to osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs
index a9a10d1510..0c0e580a3e 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs
@@ -17,9 +17,9 @@ using FontWeight = osu.Game.Graphics.FontWeight;
 using OsuColour = osu.Game.Graphics.OsuColour;
 using OsuFont = osu.Game.Graphics.OsuFont;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+namespace osu.Game.Screens.Multi.Multiplayer.Match
 {
-    public class RealtimeMatchHeader : MultiplayerComposite
+    public class MultiplayerMatchHeader : MultiplayerComposite
     {
         public const float HEIGHT = 50;
 
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public RealtimeMatchHeader()
+        public MultiplayerMatchHeader()
         {
             RelativeSizeAxes = Axes.X;
             Height = HEIGHT;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
similarity index 99%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
rename to osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index a93b1b09d1..4a5b5fd181 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -15,15 +15,15 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Multi.Match.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+namespace osu.Game.Screens.Multi.Multiplayer.Match
 {
-    public class RealtimeMatchSettingsOverlay : MatchSettingsOverlay
+    public class MultiplayerMatchSettingsOverlay : MatchSettingsOverlay
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs
similarity index 95%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
rename to osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs
index be405feef1..cea1eeecbb 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -14,13 +14,13 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+namespace osu.Game.Screens.Multi.Multiplayer.Match
 {
-    public class RealtimeReadyButton : RealtimeRoomComposite
+    public class MultiplayerReadyButton : MultiplayerRoomComposite
     {
         public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
 
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 
         private int countReady;
 
-        public RealtimeReadyButton()
+        public MultiplayerReadyButton()
         {
             InternalChild = button = new ButtonWithTrianglesExposed
             {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
similarity index 86%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
rename to osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
index 87c838f29f..97fa4cfa6e 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
@@ -7,13 +7,13 @@ using osu.Framework.Screens;
 using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeMultiplayer : Multiplayer
+    public class Multiplayer : MultiplayerScreen
     {
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override void UpdatePollingRate(bool isIdle)
         {
-            var playlistsManager = (RealtimeRoomManager)RoomManager;
+            var playlistsManager = (MultiplayerRoomManager)RoomManager;
 
             if (!this.IsCurrentScreen())
             {
@@ -58,16 +58,16 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         protected override Room CreateNewRoom()
         {
             var room = new Room { Name = { Value = $"{API.LocalUser}'s awesome room" } };
-            room.Category.Value = RoomCategory.Realtime;
+            room.Category.Value = RoomCategory.Multiplayer;
             return room;
         }
 
         protected override string ScreenTitle => "Multiplayer";
 
-        protected override RoomManager CreateRoomManager() => new RealtimeRoomManager();
+        protected override RoomManager CreateRoomManager() => new MultiplayerRoomManager();
 
-        protected override LoungeSubScreen CreateLounge() => new RealtimeLoungeSubScreen();
+        protected override LoungeSubScreen CreateLounge() => new MultiplayerLoungeSubScreen();
 
-        protected override OsuButton CreateNewMultiplayerGameButton() => new CreateRealtimeMatchButton();
+        protected override OsuButton CreateNewMultiplayerGameButton() => new CreateMultiplayerMatchButton();
     }
 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs
similarity index 79%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs
index acd9a057e3..bebad1944e 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs
@@ -3,9 +3,9 @@
 
 using osu.Game.Screens.Multi.Lounge.Components;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeFilterControl : FilterControl
+    public class MultiplayerFilterControl : FilterControl
     {
         protected override FilterCriteria CreateCriteria()
         {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs
similarity index 79%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs
index b53ec94519..ffc81efe3c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs
@@ -4,18 +4,18 @@
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeLoungeSubScreen : LoungeSubScreen
+    public class MultiplayerLoungeSubScreen : LoungeSubScreen
     {
-        protected override FilterControl CreateFilterControl() => new RealtimeFilterControl();
+        protected override FilterControl CreateFilterControl() => new MultiplayerFilterControl();
 
-        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new RealtimeMatchSubScreen(room);
+        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new MultiplayerMatchSubScreen(room);
 
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs
similarity index 92%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs
index 8f317800e3..ed1321d4e2 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -10,12 +10,12 @@ using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Select;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeMatchSongSelect : SongSelect, IMultiplayerSubScreen
+    public class MultiplayerMatchSongSelect : SongSelect, IMultiplayerSubScreen
     {
         public string ShortTitle => "song selection";
 
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         private LoadingLayer loadingLayer;
 
-        public RealtimeMatchSongSelect()
+        public MultiplayerMatchSongSelect()
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs
similarity index 92%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs
index 1778bc272c..4e371d4ed4 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -10,19 +10,19 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
-using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
+using osu.Game.Screens.Multi.Multiplayer.Match;
+using osu.Game.Screens.Multi.Multiplayer.Participants;
 using osu.Game.Users;
-using ParticipantsList = osu.Game.Screens.Multi.RealtimeMultiplayer.Participants.ParticipantsList;
+using ParticipantsList = osu.Game.Screens.Multi.Multiplayer.Participants.ParticipantsList;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
     [Cached]
-    public class RealtimeMatchSubScreen : RoomSubScreen
+    public class MultiplayerMatchSubScreen : RoomSubScreen
     {
         public override string Title { get; }
 
@@ -31,11 +31,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
-        private RealtimeMatchSettingsOverlay settingsOverlay;
+        private MultiplayerMatchSettingsOverlay settingsOverlay;
 
         private IBindable<bool> isConnected;
 
-        public RealtimeMatchSubScreen(Room room)
+        public MultiplayerMatchSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
             Activity.Value = new UserActivity.InLobby(room);
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                                     {
                                         new Drawable[]
                                         {
-                                            new RealtimeMatchHeader
+                                            new MultiplayerMatchHeader
                                             {
                                                 OpenSettings = () => settingsOverlay.Show()
                                             }
@@ -150,7 +150,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                         },
                         new Drawable[]
                         {
-                            new RealtimeMatchFooter { SelectedItem = { BindTarget = SelectedItem } }
+                            new MultiplayerMatchFooter { SelectedItem = { BindTarget = SelectedItem } }
                         }
                     },
                     RowDimensions = new[]
@@ -159,7 +159,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                settingsOverlay = new RealtimeMatchSettingsOverlay
+                settingsOverlay = new MultiplayerMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
@@ -202,7 +202,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
 
-            StartPlay(() => new RealtimePlayer(SelectedItem.Value, userIds));
+            StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
similarity index 93%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
index 033e4756eb..3255bcc642 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
@@ -9,7 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Play;
@@ -17,10 +17,10 @@ using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
     // Todo: The "room" part of PlaylistsPlayer should be split out into an abstract player class to be inherited instead.
-    public class RealtimePlayer : PlaylistsPlayer
+    public class MultiplayerPlayer : PlaylistsPlayer
     {
         protected override bool PauseOnFocusLost => false;
 
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         /// </summary>
         /// <param name="playlistItem">The playlist item to be played.</param>
         /// <param name="userIds">The users which are participating in this game.</param>
-        public RealtimePlayer(PlaylistItem playlistItem, int[] userIds)
+        public MultiplayerPlayer(PlaylistItem playlistItem, int[] userIds)
             : base(playlistItem, new PlayerConfiguration
             {
                 AllowPause = false,
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 if (!connected.NewValue)
                 {
-                    // messaging to the user about this disconnect will be provided by the RealtimeMatchSubScreen.
+                    // messaging to the user about this disconnect will be provided by the MultiplayerMatchSubScreen.
                     failAndBail();
                 }
             }, true);
@@ -142,7 +142,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         protected override ResultsScreen CreateResults(ScoreInfo score)
         {
             Debug.Assert(RoomId.Value != null);
-            return new RealtimeResultsScreen(score, RoomId.Value.Value, PlaylistItem);
+            return new MultiplayerResultsScreen(score, RoomId.Value.Value, PlaylistItem);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
similarity index 55%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
index 6bec06cbba..a01930c5ef 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
@@ -1,15 +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.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Ranking;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeResultsScreen : PlaylistsResultsScreen
+    public class MultiplayerResultsScreen : PlaylistsResultsScreen
     {
-        public RealtimeResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
+        public MultiplayerResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
             : base(score, roomId, playlistItem, false, false)
         {
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs
similarity index 83%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs
index e6d1274316..6fe7c10bfb 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs
@@ -3,11 +3,11 @@
 
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public abstract class RealtimeRoomComposite : MultiplayerComposite
+    public abstract class MultiplayerRoomComposite : MultiplayerComposite
     {
         [CanBeNull]
         protected MultiplayerRoom Room => Client.Room;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs
similarity index 92%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs
index eb6e5fad07..fdd46cdc2a 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs
@@ -11,13 +11,13 @@ using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
 using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Screens.Multi.Components;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeRoomManager : RoomManager
+    public class MultiplayerRoomManager : RoomManager
     {
         [Resolved]
         private StatefulMultiplayerClient multiplayerClient { get; set; }
@@ -114,19 +114,19 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override IEnumerable<RoomPollingComponent> CreatePollingComponents() => new RoomPollingComponent[]
         {
-            listingPollingComponent = new RealtimeListingPollingComponent
+            listingPollingComponent = new MultiplayerListingPollingComponent
             {
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
                 AllowPolling = { BindTarget = allowPolling }
             },
-            new RealtimeSelectionPollingComponent
+            new MultiplayerSelectionPollingComponent
             {
                 TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
                 AllowPolling = { BindTarget = allowPolling }
             }
         };
 
-        private class RealtimeListingPollingComponent : ListingPollingComponent
+        private class MultiplayerListingPollingComponent : ListingPollingComponent
         {
             public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
 
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
         }
 
-        private class RealtimeSelectionPollingComponent : SelectionPollingComponent
+        private class MultiplayerSelectionPollingComponent : SelectionPollingComponent
         {
             public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs
similarity index 97%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
rename to osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs
index 85393d1bae..93f8a9de8b 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs
@@ -16,15 +16,15 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+namespace osu.Game.Screens.Multi.Multiplayer.Participants
 {
-    public class ParticipantPanel : RealtimeRoomComposite, IHasContextMenu
+    public class ParticipantPanel : MultiplayerRoomComposite, IHasContextMenu
     {
         public readonly MultiplayerRoomUser User;
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs
similarity index 93%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
rename to osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs
index 218c2cabb7..3f37274d4c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs
@@ -9,9 +9,9 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+namespace osu.Game.Screens.Multi.Multiplayer.Participants
 {
-    public class ParticipantsList : RealtimeRoomComposite
+    public class ParticipantsList : MultiplayerRoomComposite
     {
         private FillFlowContainer<ParticipantPanel> panels;
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs
similarity index 86%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs
rename to osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs
index 0ca7d34005..dc3ceedfd7 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs
@@ -2,10 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+namespace osu.Game.Screens.Multi.Multiplayer.Participants
 {
     public class ParticipantsListHeader : OverlinedHeader
     {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs
similarity index 97%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
rename to osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs
index 844f239363..61faa0d85d 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs
@@ -8,10 +8,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+namespace osu.Game.Screens.Multi.Multiplayer.Participants
 {
     public class StateDisplay : CompositeDrawable
     {
diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/Multi/MultiplayerComposite.cs
index 6e0c69d712..fe4ca759b0 100644
--- a/osu.Game/Screens/Multi/MultiplayerComposite.cs
+++ b/osu.Game/Screens/Multi/MultiplayerComposite.cs
@@ -5,7 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Multi
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/MultiplayerScreen.cs
similarity index 99%
rename from osu.Game/Screens/Multi/Multiplayer.cs
rename to osu.Game/Screens/Multi/MultiplayerScreen.cs
index 34b7139f2d..983c7aeac9 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/MultiplayerScreen.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Multi.Components;
@@ -27,7 +27,7 @@ using osuTK;
 namespace osu.Game.Screens.Multi
 {
     [Cached]
-    public abstract class Multiplayer : OsuScreen
+    public abstract class MultiplayerScreen : OsuScreen
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Multi
         private readonly Drawable header;
         private readonly Drawable headerBackground;
 
-        protected Multiplayer()
+        protected MultiplayerScreen()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 65b0091505..f05f732494 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -11,7 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Ranking;
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
index b40c543b68..513854515b 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.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.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
index af29e8d34d..f3109a33e4 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Match.Components;
 using osuTK;
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
index fce24da966..92b0160247 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
@@ -4,14 +4,14 @@
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.Playlists
 {
-    public class PlaylistsMultiplayer : Multiplayer
+    public class PlaylistsMultiplayer : MultiplayerScreen
     {
         protected override void UpdatePollingRate(bool isIdle)
         {
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
index f5adf899e3..3c35e2a6f3 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
@@ -5,7 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 
 namespace osu.Game.Screens.Multi.Playlists
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
index b2bcba1724..67242003e6 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Multi.Playlists
         private Bindable<int?> roomId { get; set; }
 
         [Resolved(canBeNull: true)]
-        private Multiplayer multiplayer { get; set; }
+        private MultiplayerScreen multiplayer { get; set; }
 
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index c757433e2f..7b1ab2c5b7 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -11,7 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 8692833a21..80fd5c2067 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -9,7 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Components;
 
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
similarity index 67%
rename from osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
rename to osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 30bd3ebc32..0e23f4d8c6 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -6,32 +6,32 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge.Components;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public abstract class RealtimeMultiplayerTestScene : MultiplayerTestScene
+    public abstract class MultiplayerTestScene : RoomTestScene
     {
         [Cached(typeof(StatefulMultiplayerClient))]
-        public TestRealtimeMultiplayerClient Client { get; }
+        public TestMultiplayerClient Client { get; }
 
         [Cached(typeof(IRoomManager))]
-        public TestRealtimeRoomManager RoomManager { get; }
+        public TestMultiplayerRoomManager RoomManager { get; }
 
         [Cached]
         public Bindable<FilterCriteria> Filter { get; }
 
         protected override Container<Drawable> Content => content;
-        private readonly TestRealtimeRoomContainer content;
+        private readonly TestMultiplayerRoomContainer content;
 
         private readonly bool joinRoom;
 
-        protected RealtimeMultiplayerTestScene(bool joinRoom = true)
+        protected MultiplayerTestScene(bool joinRoom = true)
         {
             this.joinRoom = joinRoom;
-            base.Content.Add(content = new TestRealtimeRoomContainer { RelativeSizeAxes = Axes.Both });
+            base.Content.Add(content = new TestMultiplayerRoomContainer { RelativeSizeAxes = Axes.Both });
 
             Client = content.Client;
             RoomManager = content.RoomManager;
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
similarity index 95%
rename from osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
rename to osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 52047016e2..9a839c8d22 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -9,12 +9,12 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Users;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestRealtimeMultiplayerClient : StatefulMultiplayerClient
+    public class TestMultiplayerClient : StatefulMultiplayerClient
     {
         public override IBindable<bool> IsConnected => isConnected;
         private readonly Bindable<bool> isConnected = new Bindable<bool>(true);
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
similarity index 67%
rename from osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
rename to osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
index 3565d6ac5d..0df397d98e 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
@@ -5,34 +5,34 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge.Components;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestRealtimeRoomContainer : Container
+    public class TestMultiplayerRoomContainer : Container
     {
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
         [Cached(typeof(StatefulMultiplayerClient))]
-        public readonly TestRealtimeMultiplayerClient Client;
+        public readonly TestMultiplayerClient Client;
 
         [Cached(typeof(IRoomManager))]
-        public readonly TestRealtimeRoomManager RoomManager;
+        public readonly TestMultiplayerRoomManager RoomManager;
 
         [Cached]
         public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
 
-        public TestRealtimeRoomContainer()
+        public TestMultiplayerRoomContainer()
         {
             RelativeSizeAxes = Axes.Both;
 
             AddRangeInternal(new Drawable[]
             {
-                Client = new TestRealtimeMultiplayerClient(),
-                RoomManager = new TestRealtimeRoomManager(),
+                Client = new TestMultiplayerClient(),
+                RoomManager = new TestMultiplayerRoomManager(),
                 content = new Container { RelativeSizeAxes = Axes.Both }
             });
         }
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
similarity index 95%
rename from osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
rename to osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
index 0d1314fb51..abfefd363a 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
@@ -8,15 +8,15 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Multiplayer;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestRealtimeRoomManager : RealtimeRoomManager
+    public class TestMultiplayerRoomManager : MultiplayerRoomManager
     {
         [Resolved]
         private IAPIProvider api { get; set; }
diff --git a/osu.Game/Tests/Visual/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/RoomTestScene.cs
similarity index 90%
rename from osu.Game/Tests/Visual/MultiplayerTestScene.cs
rename to osu.Game/Tests/Visual/RoomTestScene.cs
index 6f24e00a92..aaf5c7624f 100644
--- a/osu.Game/Tests/Visual/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/RoomTestScene.cs
@@ -4,11 +4,11 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class MultiplayerTestScene : ScreenTestScene
+    public abstract class RoomTestScene : ScreenTestScene
     {
         [Cached]
         private readonly Bindable<Room> currentRoom = new Bindable<Room>();
diff --git a/osu.Game/Users/UserActivity.cs b/osu.Game/Users/UserActivity.cs
index 0b4fa94942..f633773d11 100644
--- a/osu.Game/Users/UserActivity.cs
+++ b/osu.Game/Users/UserActivity.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 

From e49dce2c866f804b2e1a93fa49b025c112fc8f06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 15:34:13 +0900
Subject: [PATCH 07222/10326] Fix some missed renames

---
 .../GameTypes/{GameTypeTimeshift.cs => GameTypePlaylists.cs}      | 0
 .../{TimeshiftFilterControl.cs => PlaylistsFilterControl.cs}      | 0
 .../Screens/Multi/Play/{TimeshiftPlayer.cs => PlaylistsPlayer.cs} | 0
 .../{TimeshiftResultsScreen.cs => PlaylistsResultsScreen.cs}      | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Online/Rooms/GameTypes/{GameTypeTimeshift.cs => GameTypePlaylists.cs} (100%)
 rename osu.Game/Screens/Multi/Lounge/Components/{TimeshiftFilterControl.cs => PlaylistsFilterControl.cs} (100%)
 rename osu.Game/Screens/Multi/Play/{TimeshiftPlayer.cs => PlaylistsPlayer.cs} (100%)
 rename osu.Game/Screens/Multi/Ranking/{TimeshiftResultsScreen.cs => PlaylistsResultsScreen.cs} (100%)

diff --git a/osu.Game/Online/Rooms/GameTypes/GameTypeTimeshift.cs b/osu.Game/Online/Rooms/GameTypes/GameTypePlaylists.cs
similarity index 100%
rename from osu.Game/Online/Rooms/GameTypes/GameTypeTimeshift.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypePlaylists.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/PlaylistsFilterControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
rename to osu.Game/Screens/Multi/Lounge/Components/PlaylistsFilterControl.cs
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/PlaylistsPlayer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
rename to osu.Game/Screens/Multi/Play/PlaylistsPlayer.cs
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/PlaylistsResultsScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
rename to osu.Game/Screens/Multi/Ranking/PlaylistsResultsScreen.cs

From 13c38c9b5556d988ab343beb70fbe2659a5237db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 14:18:21 +0100
Subject: [PATCH 07223/10326] Fix tests failing due to wrong inheritance

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs  | 2 +-
 .../Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
index a72f71d79c..71b8ad05ee 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchLeaderboard : MultiplayerTestScene
+    public class TestSceneMatchLeaderboard : RoomTestScene
     {
         protected override bool UseOnlineAPI => true;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 292c4846ab..7a3845cbf3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -9,7 +9,7 @@ using osu.Game.Online.Rooms;
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [HeadlessTest]
-    public class TestSceneMultiplayerRoomManager : MultiplayerTestScene
+    public class TestSceneMultiplayerRoomManager : RoomTestScene
     {
         private TestMultiplayerRoomContainer roomContainer;
         private TestMultiplayerRoomManager roomManager => roomContainer.RoomManager;

From da8365f9d0047301b63a10103f0e7630fc8b3a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 14:34:47 +0100
Subject: [PATCH 07224/10326] Fix other missed cases of changing inheritance

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs    | 2 +-
 .../Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs       | 2 +-
 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs       | 2 +-
 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
index 1359274512..f58e1114b8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -10,7 +10,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneLoungeRoomInfo : MultiplayerTestScene
+    public class TestSceneLoungeRoomInfo : RoomTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index f4e0cc415c..571330f50e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchBeatmapDetailArea : MultiplayerTestScene
+    public class TestSceneMatchBeatmapDetailArea : RoomTestScene
     {
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index e162009771..61968dce46 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
@@ -11,7 +11,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchHeader : MultiplayerTestScene
+    public class TestSceneMatchHeader : RoomTestScene
     {
         public TestSceneMatchHeader()
         {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 4742fd0d84..157597e800 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -23,7 +23,7 @@ using osu.Game.Screens.Select;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchSongSelect : MultiplayerTestScene
+    public class TestSceneMatchSongSelect : RoomTestScene
     {
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }

From 3a6a3a067b4816b81bf1851b75640a8e73349221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 14:54:21 +0100
Subject: [PATCH 07225/10326] Rewrite test to cover failure case

---
 .../Online/TestSceneAccountCreationOverlay.cs | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
index dcfe0432a8..3d65e7e4ba 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -13,13 +14,12 @@ namespace osu.Game.Tests.Visual.Online
     public class TestSceneAccountCreationOverlay : OsuTestScene
     {
         private readonly Container userPanelArea;
+        private readonly AccountCreationOverlay accountCreation;
 
         private IBindable<User> localUser;
 
         public TestSceneAccountCreationOverlay()
         {
-            AccountCreationOverlay accountCreation;
-
             Children = new Drawable[]
             {
                 accountCreation = new AccountCreationOverlay(),
@@ -31,8 +31,6 @@ namespace osu.Game.Tests.Visual.Online
                     Origin = Anchor.TopRight,
                 },
             };
-
-            AddStep("show", () => accountCreation.Show());
         }
 
         [BackgroundDependencyLoader]
@@ -42,8 +40,19 @@ namespace osu.Game.Tests.Visual.Online
 
             localUser = API.LocalUser.GetBoundCopy();
             localUser.BindValueChanged(user => { userPanelArea.Child = new UserGridPanel(user.NewValue) { Width = 200 }; }, true);
+        }
 
-            AddStep("logout", API.Logout);
+        [Test]
+        public void TestOverlayVisibility()
+        {
+            AddStep("start hidden", () => accountCreation.Hide());
+            AddStep("log out", API.Logout);
+
+            AddStep("show manually", () => accountCreation.Show());
+            AddUntilStep("overlay is visible", () => accountCreation.State.Value == Visibility.Visible);
+
+            AddStep("log back in", () => API.Login("dummy", "password"));
+            AddUntilStep("overlay is hidden", () => accountCreation.State.Value == Visibility.Hidden);
         }
     }
 }

From 2d7f9bf29045e9096ad8cb9dc672a05ad6ab7c97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 23:34:29 +0900
Subject: [PATCH 07226/10326] Revert RoomCategory naming change to avoid json
 deserialization failures

---
 osu.Game/Online/Rooms/RoomCategory.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/RoomCategory.cs b/osu.Game/Online/Rooms/RoomCategory.cs
index f485e65ba9..bb9f1298d3 100644
--- a/osu.Game/Online/Rooms/RoomCategory.cs
+++ b/osu.Game/Online/Rooms/RoomCategory.cs
@@ -5,8 +5,9 @@ namespace osu.Game.Online.Rooms
 {
     public enum RoomCategory
     {
+        // used for osu-web deserialization so names shouldn't be changed.
         Normal,
         Spotlight,
-        Multiplayer,
+        Realtime,
     }
 }

From e421b6d34e50642cae45794fdb28e64805c6efd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 23:36:09 +0900
Subject: [PATCH 07227/10326] Update some missed variables

---
 .../Visual/Multiplayer/TestSceneRoomStatus.cs  |  2 +-
 .../Screens/Multi/Multiplayer/Multiplayer.cs   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
index 788255501b..7140050bd5 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     {
                         Name = { Value = "Open" },
                         Status = { Value = new RoomStatusOpen() },
-                        Category = { Value = RoomCategory.Multiplayer }
+                        Category = { Value = RoomCategory.Realtime }
                     }) { MatchingFilter = true },
                 }
             };
diff --git a/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
index 97fa4cfa6e..76aa6b9f8f 100644
--- a/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
@@ -28,37 +28,37 @@ namespace osu.Game.Screens.Multi.Multiplayer
 
         protected override void UpdatePollingRate(bool isIdle)
         {
-            var playlistsManager = (MultiplayerRoomManager)RoomManager;
+            var multiplayerRoomManager = (MultiplayerRoomManager)RoomManager;
 
             if (!this.IsCurrentScreen())
             {
-                playlistsManager.TimeBetweenListingPolls.Value = 0;
-                playlistsManager.TimeBetweenSelectionPolls.Value = 0;
+                multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
                 switch (CurrentSubScreen)
                 {
                     case LoungeSubScreen _:
-                        playlistsManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
-                        playlistsManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
+                        multiplayerRoomManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     // Don't poll inside the match or anywhere else.
                     default:
-                        playlistsManager.TimeBetweenListingPolls.Value = 0;
-                        playlistsManager.TimeBetweenSelectionPolls.Value = 0;
+                        multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {playlistsManager.TimeBetweenListingPolls.Value}, selection: {playlistsManager.TimeBetweenSelectionPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
         {
             var room = new Room { Name = { Value = $"{API.LocalUser}'s awesome room" } };
-            room.Category.Value = RoomCategory.Multiplayer;
+            room.Category.Value = RoomCategory.Realtime;
             return room;
         }
 

From 0d8fb83d0a0a56359947ac8e52ff9e10a953db66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 15:37:14 +0100
Subject: [PATCH 07228/10326] Ensure account creation overlay is shown after
 logout

Scheduling the entire API state change callback caused the scheduled
hide to fire the first time the user attempted to display the account
creation overlay after a logout, because the drawable wasn't present
before that (so its scheduler wasn't running).

It is not theoretically safe to run `Hide()` unscheduled at its present
call site (as the value change callbacks are fired on the background
API thread). This could also be fixed by setting `AlwaysPresent = true`,
but that's a pretty ugly and unperformant change to make in general.
---
 osu.Game/Overlays/AccountCreationOverlay.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/AccountCreationOverlay.cs b/osu.Game/Overlays/AccountCreationOverlay.cs
index 58ede5502a..3084c7475a 100644
--- a/osu.Game/Overlays/AccountCreationOverlay.cs
+++ b/osu.Game/Overlays/AccountCreationOverlay.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
+using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
@@ -93,6 +94,11 @@ namespace osu.Game.Overlays
 
             if (welcomeScreen.GetChildScreen() != null)
                 welcomeScreen.MakeCurrent();
+
+            // there might be a stale scheduled hide from a previous API state change.
+            // cancel it here so that the overlay is not hidden again after one frame.
+            scheduledHide?.Cancel();
+            scheduledHide = null;
         }
 
         protected override void PopOut()
@@ -101,7 +107,9 @@ namespace osu.Game.Overlays
             this.FadeOut(100);
         }
 
-        private void apiStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
+        private ScheduledDelegate scheduledHide;
+
+        private void apiStateChanged(ValueChangedEvent<APIState> state)
         {
             switch (state.NewValue)
             {
@@ -113,9 +121,10 @@ namespace osu.Game.Overlays
                     break;
 
                 case APIState.Online:
-                    Hide();
+                    scheduledHide?.Cancel();
+                    scheduledHide = Schedule(Hide);
                     break;
             }
-        });
+        }
     }
 }

From 8a36eab060264b8b903142000657caf5c7d3056c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 23:42:02 +0900
Subject: [PATCH 07229/10326] Move missed file from Play namespace

---
 osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs       | 2 +-
 osu.Game/Screens/Multi/{Play => Playlists}/PlaylistsPlayer.cs | 2 +-
 osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename osu.Game/Screens/Multi/{Play => Playlists}/PlaylistsPlayer.cs (99%)

diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
index 3255bcc642..32d95aa11f 100644
--- a/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Play;
+using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
diff --git a/osu.Game/Screens/Multi/Play/PlaylistsPlayer.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
similarity index 99%
rename from osu.Game/Screens/Multi/Play/PlaylistsPlayer.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
index f05f732494..40198d82cd 100644
--- a/osu.Game/Screens/Multi/Play/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
@@ -18,7 +18,7 @@ using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 
-namespace osu.Game.Screens.Multi.Play
+namespace osu.Game.Screens.Multi.Playlists
 {
     public class PlaylistsPlayer : Player
     {
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
index 67242003e6..f6d084b112 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
@@ -13,7 +13,6 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Select;
 using osu.Game.Users;

From 836d1491d0d1576ee444179953eb863bb8c1d740 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 23:45:44 +0900
Subject: [PATCH 07230/10326] PlaylistsMultiplayer -> Playlists

---
 .../Visual/Navigation/TestSceneScreenNavigation.cs           | 5 ++---
 osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs  | 3 +--
 osu.Game/Screens/Menu/MainMenu.cs                            | 2 +-
 .../Playlists/{PlaylistsMultiplayer.cs => Playlists.cs}      | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename osu.Game/Screens/Multi/Playlists/{PlaylistsMultiplayer.cs => Playlists.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 381bbca74f..ac63c89183 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -11,7 +11,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
-using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Options;
@@ -108,14 +107,14 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitMultiWithEscape()
         {
-            PushAndConfirm(() => new PlaylistsMultiplayer());
+            PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
             exitViaEscapeAndConfirm();
         }
 
         [Test]
         public void TestExitMultiWithBackButton()
         {
-            PushAndConfirm(() => new PlaylistsMultiplayer());
+            PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
             exitViaBackButtonAndConfirm();
         }
 
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
index 8203ca4845..b780eb5347 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
@@ -4,7 +4,6 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
-using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
@@ -18,7 +17,7 @@ namespace osu.Game.Tests.Visual.Playlists
 
         public TestScenePlaylistsScreen()
         {
-            var multi = new PlaylistsMultiplayer();
+            var multi = new Screens.Multi.Playlists.Playlists();
 
             AddStep("show", () => LoadScreen(multi));
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 15ac2237d3..aeb58a75fc 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Menu
                             },
                             OnSolo = onSolo,
                             OnMultiplayer = () => this.Push(new Multiplayer()),
-                            OnPlaylists = () => this.Push(new PlaylistsMultiplayer()),
+                            OnPlaylists = () => this.Push(new Playlists()),
                             OnExit = confirmAndExit,
                         }
                     }
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs b/osu.Game/Screens/Multi/Playlists/Playlists.cs
similarity index 97%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
rename to osu.Game/Screens/Multi/Playlists/Playlists.cs
index 92b0160247..da6aade942 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Playlists/Playlists.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.Playlists
 {
-    public class PlaylistsMultiplayer : MultiplayerScreen
+    public class Playlists : MultiplayerScreen
     {
         protected override void UpdatePollingRate(bool isIdle)
         {

From 9de1a67e0389017d5a233fa7b38478f26287b305 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 23:47:32 +0900
Subject: [PATCH 07231/10326] Move PlaylistsResultsScreen to correct namespace

---
 .../Visual/Playlists/TestScenePlaylistsResultsScreen.cs         | 2 +-
 osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs  | 2 +-
 osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs             | 1 -
 .../Multi/{Ranking => Playlists}/PlaylistsResultsScreen.cs      | 2 +-
 osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs      | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)
 rename osu.Game/Screens/Multi/{Ranking => Playlists}/PlaylistsResultsScreen.cs (99%)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index b42f2e1d2d..97bb48c7b5 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -19,7 +19,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Ranking;
+using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
index a01930c5ef..3e39473954 100644
--- a/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Ranking;
+using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Screens.Multi.Multiplayer
 {
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
index 40198d82cd..25a3340ead 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
@@ -14,7 +14,6 @@ using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 
diff --git a/osu.Game/Screens/Multi/Ranking/PlaylistsResultsScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs
similarity index 99%
rename from osu.Game/Screens/Multi/Ranking/PlaylistsResultsScreen.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs
index 7b1ab2c5b7..5d1d3a2724 100644
--- a/osu.Game/Screens/Multi/Ranking/PlaylistsResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs
@@ -15,7 +15,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 
-namespace osu.Game.Screens.Multi.Ranking
+namespace osu.Game.Screens.Multi.Playlists
 {
     public class PlaylistsResultsScreen : ResultsScreen
     {
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
index f6d084b112..4867268fe1 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
@@ -13,7 +13,6 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;

From e797e5ce7a73441cc2c65e4fd5909c789b3fc3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 16:48:03 +0100
Subject: [PATCH 07232/10326] Rename Multi directory to OnlinePlay

---
 .../Components/BeatmapDetailAreaPlaylistTabItem.cs                | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Components/BeatmapTitle.cs | 0
 .../Screens/{Multi => OnlinePlay}/Components/BeatmapTypeInfo.cs   | 0
 .../{Multi => OnlinePlay}/Components/DisableableTabControl.cs     | 0
 .../Screens/{Multi => OnlinePlay}/Components/DrawableGameType.cs  | 0
 .../{Multi => OnlinePlay}/Components/ListingPollingComponent.cs   | 0
 .../{Multi => OnlinePlay}/Components/MatchBeatmapDetailArea.cs    | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Components/ModeTypeInfo.cs | 0
 .../Components/MultiplayerBackgroundSprite.cs                     | 0
 .../Screens/{Multi => OnlinePlay}/Components/OverlinedHeader.cs   | 0
 .../{Multi => OnlinePlay}/Components/OverlinedPlaylistHeader.cs   | 0
 .../{Multi => OnlinePlay}/Components/ParticipantCountDisplay.cs   | 0
 .../{Multi => OnlinePlay}/Components/ParticipantsDisplay.cs       | 0
 .../Screens/{Multi => OnlinePlay}/Components/ParticipantsList.cs  | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Components/ReadyButton.cs  | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Components/RoomManager.cs  | 0
 .../{Multi => OnlinePlay}/Components/RoomPollingComponent.cs      | 0
 .../Screens/{Multi => OnlinePlay}/Components/RoomStatusInfo.cs    | 0
 .../{Multi => OnlinePlay}/Components/SelectionPollingComponent.cs | 0
 .../{Multi => OnlinePlay}/Components/StatusColouredContainer.cs   | 0
 osu.Game/Screens/{Multi => OnlinePlay}/DrawableRoomPlaylist.cs    | 0
 .../Screens/{Multi => OnlinePlay}/DrawableRoomPlaylistItem.cs     | 0
 .../{Multi => OnlinePlay}/DrawableRoomPlaylistWithResults.cs      | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Header.cs                  | 0
 osu.Game/Screens/{Multi => OnlinePlay}/IMultiplayerSubScreen.cs   | 0
 osu.Game/Screens/{Multi => OnlinePlay}/IRoomManager.cs            | 0
 .../{Multi => OnlinePlay}/Lounge/Components/DrawableRoom.cs       | 0
 .../{Multi => OnlinePlay}/Lounge/Components/FilterControl.cs      | 0
 .../{Multi => OnlinePlay}/Lounge/Components/FilterCriteria.cs     | 0
 .../{Multi => OnlinePlay}/Lounge/Components/ParticipantInfo.cs    | 0
 .../Lounge/Components/PlaylistsFilterControl.cs                   | 0
 .../Screens/{Multi => OnlinePlay}/Lounge/Components/RoomInfo.cs   | 0
 .../{Multi => OnlinePlay}/Lounge/Components/RoomInspector.cs      | 0
 .../{Multi => OnlinePlay}/Lounge/Components/RoomStatusFilter.cs   | 0
 .../{Multi => OnlinePlay}/Lounge/Components/RoomsContainer.cs     | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Lounge/LoungeSubScreen.cs  | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/Footer.cs | 0
 .../{Multi => OnlinePlay}/Match/Components/GameTypePicker.cs      | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/Header.cs | 0
 .../{Multi => OnlinePlay}/Match/Components/MatchChatDisplay.cs    | 0
 .../{Multi => OnlinePlay}/Match/Components/MatchLeaderboard.cs    | 0
 .../Match/Components/MatchLeaderboardScore.cs                     | 0
 .../Match/Components/MatchSettingsOverlay.cs                      | 0
 .../Match/Components/PurpleTriangleButton.cs                      | 0
 .../Match/Components/RoomAvailabilityPicker.cs                    | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Match/RoomSubScreen.cs     | 0
 .../Multiplayer/CreateMultiplayerMatchButton.cs                   | 0
 .../Multiplayer/Match/BeatmapSelectionControl.cs                  | 0
 .../Multiplayer/Match/MultiplayerMatchFooter.cs                   | 0
 .../Multiplayer/Match/MultiplayerMatchHeader.cs                   | 0
 .../Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs          | 0
 .../Multiplayer/Match/MultiplayerReadyButton.cs                   | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Multiplayer.cs | 0
 .../{Multi => OnlinePlay}/Multiplayer/MultiplayerFilterControl.cs | 0
 .../Multiplayer/MultiplayerLoungeSubScreen.cs                     | 0
 .../Multiplayer/MultiplayerMatchSongSelect.cs                     | 0
 .../Multiplayer/MultiplayerMatchSubScreen.cs                      | 0
 .../{Multi => OnlinePlay}/Multiplayer/MultiplayerPlayer.cs        | 0
 .../{Multi => OnlinePlay}/Multiplayer/MultiplayerResultsScreen.cs | 0
 .../{Multi => OnlinePlay}/Multiplayer/MultiplayerRoomComposite.cs | 0
 .../{Multi => OnlinePlay}/Multiplayer/MultiplayerRoomManager.cs   | 0
 .../Multiplayer/Participants/ParticipantPanel.cs                  | 0
 .../Multiplayer/Participants/ParticipantsList.cs                  | 0
 .../Multiplayer/Participants/ParticipantsListHeader.cs            | 0
 .../Multiplayer/Participants/StateDisplay.cs                      | 0
 osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerComposite.cs    | 0
 osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerScreen.cs       | 0
 osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerSubScreen.cs    | 0
 .../Screens/{Multi => OnlinePlay}/MultiplayerSubScreenStack.cs    | 0
 .../{Multi => OnlinePlay}/Playlists/CreatePlaylistsRoomButton.cs  | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Playlists/Playlists.cs     | 0
 .../{Multi => OnlinePlay}/Playlists/PlaylistsLoungeSubScreen.cs   | 0
 .../Playlists/PlaylistsMatchSettingsOverlay.cs                    | 0
 .../Screens/{Multi => OnlinePlay}/Playlists/PlaylistsPlayer.cs    | 0
 .../{Multi => OnlinePlay}/Playlists/PlaylistsReadyButton.cs       | 0
 .../{Multi => OnlinePlay}/Playlists/PlaylistsResultsScreen.cs     | 0
 .../{Multi => OnlinePlay}/Playlists/PlaylistsRoomManager.cs       | 0
 .../{Multi => OnlinePlay}/Playlists/PlaylistsRoomSubScreen.cs     | 0
 78 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/BeatmapDetailAreaPlaylistTabItem.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/BeatmapTitle.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/BeatmapTypeInfo.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/DisableableTabControl.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/DrawableGameType.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ListingPollingComponent.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/MatchBeatmapDetailArea.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ModeTypeInfo.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/MultiplayerBackgroundSprite.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/OverlinedHeader.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/OverlinedPlaylistHeader.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ParticipantCountDisplay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ParticipantsDisplay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ParticipantsList.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ReadyButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/RoomManager.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/RoomPollingComponent.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/RoomStatusInfo.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/SelectionPollingComponent.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/StatusColouredContainer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/DrawableRoomPlaylist.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/DrawableRoomPlaylistItem.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/DrawableRoomPlaylistWithResults.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Header.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/IMultiplayerSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/IRoomManager.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/DrawableRoom.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/FilterControl.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/FilterCriteria.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/ParticipantInfo.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/PlaylistsFilterControl.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/RoomInfo.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/RoomInspector.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/RoomStatusFilter.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/RoomsContainer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/LoungeSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/Footer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/GameTypePicker.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/Header.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/MatchChatDisplay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/MatchLeaderboard.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/MatchLeaderboardScore.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/MatchSettingsOverlay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/PurpleTriangleButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/RoomAvailabilityPicker.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/RoomSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/CreateMultiplayerMatchButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Match/BeatmapSelectionControl.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Match/MultiplayerMatchFooter.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Match/MultiplayerMatchHeader.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Match/MultiplayerReadyButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Multiplayer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerFilterControl.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerLoungeSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerMatchSongSelect.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerMatchSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerPlayer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerResultsScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerRoomComposite.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerRoomManager.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Participants/ParticipantPanel.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Participants/ParticipantsList.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Participants/ParticipantsListHeader.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Participants/StateDisplay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerComposite.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerSubScreenStack.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/CreatePlaylistsRoomButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/Playlists.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsLoungeSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsMatchSettingsOverlay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsPlayer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsReadyButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsResultsScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsRoomManager.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsRoomSubScreen.cs (100%)

diff --git a/osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs
rename to osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/BeatmapTitle.cs
rename to osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
rename to osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
diff --git a/osu.Game/Screens/Multi/Components/DisableableTabControl.cs b/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/DisableableTabControl.cs
rename to osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
diff --git a/osu.Game/Screens/Multi/Components/DrawableGameType.cs b/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/DrawableGameType.cs
rename to osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
diff --git a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
rename to osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
diff --git a/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs b/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
rename to osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
diff --git a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
rename to osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
diff --git a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
rename to osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
diff --git a/osu.Game/Screens/Multi/Components/OverlinedHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/OverlinedHeader.cs
rename to osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
diff --git a/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs
rename to osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
diff --git a/osu.Game/Screens/Multi/Components/ParticipantCountDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ParticipantCountDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ParticipantsDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ParticipantsList.cs
rename to osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
diff --git a/osu.Game/Screens/Multi/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ReadyButton.cs
rename to osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/RoomManager.cs
rename to osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
rename to osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
diff --git a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
rename to osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
diff --git a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
rename to osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
diff --git a/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs b/osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
rename to osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
similarity index 100%
rename from osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
rename to osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
similarity index 100%
rename from osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
rename to osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
similarity index 100%
rename from osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs
rename to osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/OnlinePlay/Header.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Header.cs
rename to osu.Game/Screens/OnlinePlay/Header.cs
diff --git a/osu.Game/Screens/Multi/IMultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/IMultiplayerSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/OnlinePlay/IRoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/IRoomManager.cs
rename to osu.Game/Screens/OnlinePlay/IRoomManager.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/PlaylistsFilterControl.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/PlaylistsFilterControl.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomStatusFilter.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomStatusFilter.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/Footer.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs b/osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/Header.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs b/osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs b/osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/RoomSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerComposite.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerScreen.cs b/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerScreen.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreenStack.cs b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerSubScreenStack.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
diff --git a/osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
diff --git a/osu.Game/Screens/Multi/Playlists/Playlists.cs b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/Playlists.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs

From 83fb7c7a1ae3a0aac1e42ec8160c90d1aef5009e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 16:50:00 +0100
Subject: [PATCH 07233/10326] Re-namespace all files in OnlinePlay directory

---
 .../Visual/Multiplayer/RoomManagerTestScene.cs     |  2 +-
 .../Visual/Multiplayer/TestRoomManager.cs          |  2 +-
 .../Multiplayer/TestSceneDrawableRoomPlaylist.cs   |  2 +-
 .../Visual/Multiplayer/TestSceneLoungeRoomInfo.cs  |  2 +-
 .../Multiplayer/TestSceneLoungeRoomsContainer.cs   |  2 +-
 .../Multiplayer/TestSceneMatchBeatmapDetailArea.cs |  2 +-
 .../Visual/Multiplayer/TestSceneMatchHeader.cs     |  2 +-
 .../Multiplayer/TestSceneMatchLeaderboard.cs       |  2 +-
 .../Visual/Multiplayer/TestSceneMatchSongSelect.cs |  2 +-
 .../Visual/Multiplayer/TestSceneMultiHeader.cs     |  2 +-
 .../Visual/Multiplayer/TestSceneMultiplayer.cs     |  4 ++--
 .../TestSceneMultiplayerMatchSubScreen.cs          |  4 ++--
 .../TestSceneMultiplayerParticipantsList.cs        |  2 +-
 .../Multiplayer/TestSceneMultiplayerReadyButton.cs |  2 +-
 .../Visual/Multiplayer/TestSceneRoomStatus.cs      |  2 +-
 .../Visual/Navigation/TestSceneScreenNavigation.cs |  4 ++--
 .../Playlists/TestScenePlaylistsFilterControl.cs   |  2 +-
 .../Playlists/TestScenePlaylistsLoungeSubScreen.cs |  6 +++---
 .../TestScenePlaylistsMatchSettingsOverlay.cs      |  4 ++--
 .../TestScenePlaylistsParticipantsList.cs          |  2 +-
 .../Playlists/TestScenePlaylistsResultsScreen.cs   |  2 +-
 .../Playlists/TestScenePlaylistsRoomSubScreen.cs   |  6 +++---
 .../Visual/Playlists/TestScenePlaylistsScreen.cs   |  2 +-
 osu.Game/Online/Rooms/GetRoomsRequest.cs           |  2 +-
 .../Overlays/Dashboard/CurrentlyPlayingDisplay.cs  |  2 +-
 osu.Game/Screens/Menu/MainMenu.cs                  |  4 ++--
 .../Components/BeatmapDetailAreaPlaylistTabItem.cs |  2 +-
 .../Screens/OnlinePlay/Components/BeatmapTitle.cs  |  2 +-
 .../OnlinePlay/Components/BeatmapTypeInfo.cs       |  2 +-
 .../OnlinePlay/Components/DisableableTabControl.cs |  2 +-
 .../OnlinePlay/Components/DrawableGameType.cs      |  2 +-
 .../Components/ListingPollingComponent.cs          |  4 ++--
 .../Components/MatchBeatmapDetailArea.cs           |  2 +-
 .../Screens/OnlinePlay/Components/ModeTypeInfo.cs  |  2 +-
 .../Components/MultiplayerBackgroundSprite.cs      |  2 +-
 .../OnlinePlay/Components/OverlinedHeader.cs       |  2 +-
 .../Components/OverlinedPlaylistHeader.cs          |  2 +-
 .../Components/ParticipantCountDisplay.cs          |  2 +-
 .../OnlinePlay/Components/ParticipantsDisplay.cs   |  2 +-
 .../OnlinePlay/Components/ParticipantsList.cs      |  2 +-
 .../Screens/OnlinePlay/Components/ReadyButton.cs   |  2 +-
 .../Screens/OnlinePlay/Components/RoomManager.cs   |  2 +-
 .../OnlinePlay/Components/RoomPollingComponent.cs  |  2 +-
 .../OnlinePlay/Components/RoomStatusInfo.cs        |  2 +-
 .../Components/SelectionPollingComponent.cs        |  2 +-
 .../Components/StatusColouredContainer.cs          |  2 +-
 .../Screens/OnlinePlay/DrawableRoomPlaylist.cs     |  2 +-
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs |  2 +-
 .../OnlinePlay/DrawableRoomPlaylistWithResults.cs  |  2 +-
 osu.Game/Screens/OnlinePlay/Header.cs              |  4 ++--
 .../Screens/OnlinePlay/IMultiplayerSubScreen.cs    |  2 +-
 osu.Game/Screens/OnlinePlay/IRoomManager.cs        |  2 +-
 .../OnlinePlay/Lounge/Components/DrawableRoom.cs   | 10 +++++-----
 .../OnlinePlay/Lounge/Components/FilterControl.cs  |  2 +-
 .../OnlinePlay/Lounge/Components/FilterCriteria.cs |  2 +-
 .../Lounge/Components/ParticipantInfo.cs           |  2 +-
 .../Lounge/Components/PlaylistsFilterControl.cs    |  2 +-
 .../OnlinePlay/Lounge/Components/RoomInfo.cs       |  4 ++--
 .../OnlinePlay/Lounge/Components/RoomInspector.cs  |  4 ++--
 .../Lounge/Components/RoomStatusFilter.cs          |  2 +-
 .../OnlinePlay/Lounge/Components/RoomsContainer.cs |  6 +++---
 .../Screens/OnlinePlay/Lounge/LoungeSubScreen.cs   |  6 +++---
 .../Screens/OnlinePlay/Match/Components/Footer.cs  |  4 ++--
 .../OnlinePlay/Match/Components/GameTypePicker.cs  |  4 ++--
 .../Screens/OnlinePlay/Match/Components/Header.cs  |  2 +-
 .../Match/Components/MatchChatDisplay.cs           |  2 +-
 .../Match/Components/MatchLeaderboard.cs           |  2 +-
 .../Match/Components/MatchLeaderboardScore.cs      |  2 +-
 .../Match/Components/MatchSettingsOverlay.cs       |  2 +-
 .../Match/Components/PurpleTriangleButton.cs       |  2 +-
 .../Match/Components/RoomAvailabilityPicker.cs     |  4 ++--
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs |  2 +-
 .../Multiplayer/CreateMultiplayerMatchButton.cs    |  4 ++--
 .../Multiplayer/Match/BeatmapSelectionControl.cs   |  4 ++--
 .../Multiplayer/Match/MultiplayerMatchFooter.cs    |  2 +-
 .../Multiplayer/Match/MultiplayerMatchHeader.cs    |  4 ++--
 .../Match/MultiplayerMatchSettingsOverlay.cs       |  4 ++--
 .../Multiplayer/Match/MultiplayerReadyButton.cs    |  4 ++--
 .../Screens/OnlinePlay/Multiplayer/Multiplayer.cs  |  6 +++---
 .../Multiplayer/MultiplayerFilterControl.cs        |  4 ++--
 .../Multiplayer/MultiplayerLoungeSubScreen.cs      |  8 ++++----
 .../Multiplayer/MultiplayerMatchSongSelect.cs      |  2 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs       | 14 +++++++-------
 .../OnlinePlay/Multiplayer/MultiplayerPlayer.cs    |  4 ++--
 .../Multiplayer/MultiplayerResultsScreen.cs        |  4 ++--
 .../Multiplayer/MultiplayerRoomComposite.cs        |  2 +-
 .../Multiplayer/MultiplayerRoomManager.cs          |  4 ++--
 .../Multiplayer/Participants/ParticipantPanel.cs   |  2 +-
 .../Multiplayer/Participants/ParticipantsList.cs   |  2 +-
 .../Participants/ParticipantsListHeader.cs         |  4 ++--
 .../Multiplayer/Participants/StateDisplay.cs       |  2 +-
 .../Screens/OnlinePlay/MultiplayerComposite.cs     |  2 +-
 osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs   | 10 +++++-----
 .../Screens/OnlinePlay/MultiplayerSubScreen.cs     |  2 +-
 .../OnlinePlay/MultiplayerSubScreenStack.cs        |  2 +-
 .../Playlists/CreatePlaylistsRoomButton.cs         |  4 ++--
 osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs |  8 ++++----
 .../Playlists/PlaylistsLoungeSubScreen.cs          |  8 ++++----
 .../Playlists/PlaylistsMatchSettingsOverlay.cs     |  4 ++--
 .../OnlinePlay/Playlists/PlaylistsPlayer.cs        |  2 +-
 .../OnlinePlay/Playlists/PlaylistsReadyButton.cs   |  4 ++--
 .../OnlinePlay/Playlists/PlaylistsResultsScreen.cs |  2 +-
 .../OnlinePlay/Playlists/PlaylistsRoomManager.cs   |  4 ++--
 .../OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs | 10 +++++-----
 osu.Game/Screens/Play/Spectator.cs                 |  2 +-
 osu.Game/Screens/Select/MatchSongSelect.cs         |  4 ++--
 .../Visual/Multiplayer/MultiplayerTestScene.cs     |  4 ++--
 .../Multiplayer/TestMultiplayerRoomContainer.cs    |  4 ++--
 .../Multiplayer/TestMultiplayerRoomManager.cs      |  4 ++--
 109 files changed, 176 insertions(+), 176 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
index a2c496a504..c665a57452 100644
--- a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
@@ -6,7 +6,7 @@ using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Screens.Multi;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
index 7d9d4a6542..1785c99784 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
@@ -4,7 +4,7 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi;
+using osu.Game.Screens.OnlinePlay;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 722e1a50ef..65c0cfd328 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -18,7 +18,7 @@ using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.Multi;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Tests.Beatmaps;
 using osuTK;
 using osuTK.Input;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
index f58e1114b8..9f24347ae9 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -5,7 +5,7 @@ using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Online.Rooms.RoomStatuses;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index 9b6a6de7c2..279dcfa584 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 571330f50e..9ad9f2c883 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -9,7 +9,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Tests.Beatmaps;
 using osuTK;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index 61968dce46..7cdc6b1a7d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
@@ -6,7 +6,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
index 71b8ad05ee..64eaf0556b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
@@ -7,7 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Users;
 using osuTK;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 157597e800..e0fd7d9874 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -18,7 +18,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
index 0ccd882d95..089de223fc 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
@@ -5,7 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Screens;
-using osu.Game.Screens.Multi;
+using osu.Game.Screens.OnlinePlay;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 5c07b9d0ea..2e39471dc0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("room has 1 user", () => Client.Room?.Users.Count == 1);
         }
 
-        private class TestMultiplayer : Screens.Multi.Multiplayer.Multiplayer
+        private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer
         {
             protected override RoomManager CreateRoomManager() => new TestMultiplayerRoomManager();
         }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 6dc26dae57..8869718fd1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -7,8 +7,8 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi.Multiplayer;
-using osu.Game.Screens.Multi.Multiplayer.Match;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
 using osuTK.Input;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index ee2fa4ef5a..9181170bee 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Multiplayer.Participants;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
 using osu.Game.Users;
 using osuTK;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index c8ebdb1b76..6b11613f1c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -12,7 +12,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.Multiplayer.Match;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 using osuTK;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
index 7140050bd5..cec40635f3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index ac63c89183..8480e6eaaa 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -107,14 +107,14 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitMultiWithEscape()
         {
-            PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
+            PushAndConfirm(() => new Screens.OnlinePlay.Playlists.Playlists());
             exitViaEscapeAndConfirm();
         }
 
         [Test]
         public void TestExitMultiWithBackButton()
         {
-            PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
+            PushAndConfirm(() => new Screens.OnlinePlay.Playlists.Playlists());
             exitViaBackButtonAndConfirm();
         }
 
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
index 66992b27a2..40e191dd7e 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
index 04555857f5..008c862cc3 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
@@ -8,9 +8,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;
-using osu.Game.Screens.Multi.Lounge;
-using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Lounge;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Tests.Visual.Multiplayer;
 
 namespace osu.Game.Tests.Visual.Playlists
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
index 4e75619f13..44a79b6598 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
@@ -10,8 +10,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Playlists;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
index 5a0f196df9..8dd81e02e2 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
@@ -3,7 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Playlists
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index 97bb48c7b5..cdcded8f61 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -19,7 +19,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
index 96ff93a145..a4c87d3ace 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
@@ -15,9 +15,9 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 using osuTK.Input;
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
index b780eb5347..e52f823f0b 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.Playlists
 
         public TestScenePlaylistsScreen()
         {
-            var multi = new Screens.Multi.Playlists.Playlists();
+            var multi = new Screens.OnlinePlay.Playlists.Playlists();
 
             AddStep("show", () => LoadScreen(multi));
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
diff --git a/osu.Game/Online/Rooms/GetRoomsRequest.cs b/osu.Game/Online/Rooms/GetRoomsRequest.cs
index 5084b8627f..e45365797a 100644
--- a/osu.Game/Online/Rooms/GetRoomsRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomsRequest.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Humanizer;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Online.Rooms
 {
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index d39a81f5e8..c89699f2ee 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -11,7 +11,7 @@ using osu.Framework.Screens;
 using osu.Game.Database;
 using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
 using osuTK;
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index aeb58a75fc..9d5720ff34 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -17,8 +17,8 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Multi.Multiplayer;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.Menu
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
index 3f2ab28f1a..fb927411e6 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Screens.Select;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class BeatmapDetailAreaPlaylistTabItem : BeatmapDetailAreaTabItem
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index 9e7a59d7d2..bc355d18a9 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Chat;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class BeatmapTitle : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
index ce3b612262..434d7b75ed 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class BeatmapTypeInfo : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs b/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
index 27b5aec4d3..bbc407e926 100644
--- a/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
@@ -5,7 +5,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public abstract class DisableableTabControl<T> : TabControl<T>
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs b/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
index 38af6d065e..c4dc2a2b8f 100644
--- a/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class DrawableGameType : CircularContainer, IHasTooltip
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
index edce5400d1..e50784fcbe 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
@@ -5,9 +5,9 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     /// <summary>
     /// A <see cref="RoomPollingComponent"/> that polls for the lounge listing.
diff --git a/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs b/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
index 6997840c92..b013cbafd8 100644
--- a/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
@@ -12,7 +12,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.Select;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class MatchBeatmapDetailArea : BeatmapDetailArea
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
index f07bd8c3b2..719afcdd33 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.Drawables;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class ModeTypeInfo : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
index 2240e55e2f..45e2c553e7 100644
--- a/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
@@ -6,7 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Drawables;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class MultiplayerBackgroundSprite : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
index 7ec20c8cae..c78dfef592 100644
--- a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     /// <summary>
     /// A header used in the multiplayer interface which shows text / details beneath a line.
diff --git a/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
index ebebe8b660..45b822d20a 100644
--- a/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class OverlinedPlaylistHeader : OverlinedHeader
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
index 498eeb09b3..357974adfc 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class ParticipantCountDisplay : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
index 6ea4283379..5184f873f3 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
@@ -6,7 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class ParticipantsDisplay : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
index 7978b4eaab..b5019b4cdc 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
@@ -12,7 +12,7 @@ using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class ParticipantsList : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 68df30965d..08f89d8ed8 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public abstract class ReadyButton : TriangleButton
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
index 7e0c8c4ec5..2ed259e2b8 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
@@ -15,7 +15,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public abstract class RoomManager : CompositeDrawable, IRoomManager
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
index 1d10277d1c..b2ea3a05d6 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
@@ -8,7 +8,7 @@ using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public abstract class RoomPollingComponent : PollingComponent
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
index 89021691f3..58cb25f30e 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class RoomStatusInfo : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
index 3050765931..0eec155060 100644
--- a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
@@ -7,7 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     /// <summary>
     /// A <see cref="RoomPollingComponent"/> that polls for the currently-selected room.
diff --git a/osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs b/osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
index 68c14eeb15..760de354dc 100644
--- a/osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class StatusColouredContainer : Container
     {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
index 956d38a90e..a08d9edb34 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Online.Rooms;
 using osuTK;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class DrawableRoomPlaylist : OsuRearrangeableListContainer<PlaylistItem>
     {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index a2aeae154a..e3bce4029f 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -29,7 +29,7 @@ using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class DrawableRoomPlaylistItem : OsuRearrangeableListItem<PlaylistItem>
     {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
index fa241a3c42..575f336e58 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
@@ -13,7 +13,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class DrawableRoomPlaylistWithResults : DrawableRoomPlaylist
     {
diff --git a/osu.Game/Screens/OnlinePlay/Header.cs b/osu.Game/Screens/OnlinePlay/Header.cs
index 637d8bb52b..bffd744fdc 100644
--- a/osu.Game/Screens/OnlinePlay/Header.cs
+++ b/osu.Game/Screens/OnlinePlay/Header.cs
@@ -10,13 +10,13 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class Header : Container
     {
diff --git a/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
index 31ee123f83..fc149cd2b2 100644
--- a/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.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.
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public interface IMultiplayerSubScreen : IOsuScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/IRoomManager.cs b/osu.Game/Screens/OnlinePlay/IRoomManager.cs
index eee2a223a1..8ff02536f3 100644
--- a/osu.Game/Screens/OnlinePlay/IRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/IRoomManager.cs
@@ -6,7 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     [Cached(typeof(IRoomManager))]
     public interface IRoomManager
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index 6e4d8b46ed..6d37a483a9 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -9,22 +9,22 @@ using osu.Framework.Bindables;
 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.Shapes;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Online.Rooms;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class DrawableRoom : OsuClickableContainer, IStateful<SelectionState>, IFilterable, IHasContextMenu
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
index 3712cbe33e..7fc1c670ca 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
@@ -12,7 +12,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public abstract class FilterControl : CompositeDrawable
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
index 7b04be86b1..488af5d4de 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Rulesets;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class FilterCriteria
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
index 4152a9a3b2..895c0e3eda 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Users.Drawables;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class ParticipantInfo : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
index 3c55c3c43f..a463742097 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
@@ -5,7 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class PlaylistsFilterControl : FilterControl
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
index e6f6ce5ed2..8552d425aa 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
@@ -6,10 +6,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class RoomInfo : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
index dfee278e87..4b1ec9ae89 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
@@ -7,10 +7,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class RoomInspector : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
index 9da938ac8b..0c8dc8832b 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public enum RoomStatusFilter
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
index fbd5f44a30..f70c33babe 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
@@ -13,13 +13,13 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
 using osu.Game.Extensions;
+using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
-using osuTK;
-using osu.Game.Graphics.Cursor;
 using osu.Game.Online.Rooms;
+using osuTK;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class RoomsContainer : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index cbab79e2ab..cc56c11d32 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -12,11 +12,11 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
-using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Users;
 
-namespace osu.Game.Screens.Multi.Lounge
+namespace osu.Game.Screens.OnlinePlay.Lounge
 {
     [Cached]
     public abstract class LoungeSubScreen : MultiplayerSubScreen
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
index 7074ceca38..5c27d78d50 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
@@ -10,10 +10,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class Footer : CompositeDrawable
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs b/osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
index 23a3da6e38..cca1f84bbb 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
@@ -10,10 +10,10 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.GameTypes;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class GameTypePicker : DisableableTabControl<GameType>
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
index 134a0b3f2e..df0dfc6ec1 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Users.Drawables;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class Header : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
index b790ad9be5..8800215c2e 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
@@ -6,7 +6,7 @@ using osu.Framework.Bindables;
 using osu.Game.Online.Chat;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class MatchChatDisplay : StandAloneChatDisplay
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
index 8cc7b62f98..50869f42ff 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
@@ -10,7 +10,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class MatchLeaderboard : Leaderboard<MatchLeaderboardScope, APIUserScoreAggregate>
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
index 1fabdbb86a..e8f5b1e826 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
@@ -8,7 +8,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Scoring;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class MatchLeaderboardScore : LeaderboardScore
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
index 0bb56d0cdf..998ab889d6 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public abstract class MatchSettingsOverlay : FocusedOverlayContainer
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs b/osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
index 1d93116d07..28e8961a9a 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class PurpleTriangleButton : TriangleButton
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs b/osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
index 2292826d55..677a5be0d9 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
@@ -11,11 +11,11 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class RoomAvailabilityPicker : DisableableTabControl<RoomAvailability>
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index b626156852..2b0035c8bc 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -15,7 +15,7 @@ using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
 
-namespace osu.Game.Screens.Multi.Match
+namespace osu.Game.Screens.OnlinePlay.Match
 {
     [Cached(typeof(IPreviewTrackOwner))]
     public abstract class RoomSubScreen : MultiplayerSubScreen, IPreviewTrackOwner
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index b8b3f15fca..163efd9c20 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -4,9 +4,9 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class CreateMultiplayerMatchButton : PurpleTriangleButton
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index dfb6feeaf9..1718ebd83a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -9,9 +9,9 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Match
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class BeatmapSelectionControl : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index 145ae18817..a52f62fe00 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Match
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerMatchFooter : CompositeDrawable
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
index 0c0e580a3e..42e34c4be3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
@@ -10,14 +10,14 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Users.Drawables;
 using osuTK;
 using FontWeight = osu.Game.Graphics.FontWeight;
 using OsuColour = osu.Game.Graphics.OsuColour;
 using OsuFont = osu.Game.Graphics.OsuFont;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Match
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerMatchHeader : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index 4a5b5fd181..8741b0323d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -18,10 +18,10 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Match
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerMatchSettingsOverlay : MatchSettingsOverlay
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index cea1eeecbb..15d6ef8aff 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -15,10 +15,10 @@ using osu.Game.Graphics.Backgrounds;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Match
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerReadyButton : MultiplayerRoomComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 76aa6b9f8f..ce4918dae1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -8,10 +8,10 @@ using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Multi.Lounge;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Lounge;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class Multiplayer : MultiplayerScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
index bebad1944e..37e0fd109a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.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.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerFilterControl : FilterControl
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
index ffc81efe3c..0a9a3f680f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
@@ -5,11 +5,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Lounge;
-using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.OnlinePlay.Lounge;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Match;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerLoungeSubScreen : LoungeSubScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index ed1321d4e2..76869300e8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -13,7 +13,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.Select;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerMatchSongSelect : SongSelect, IMultiplayerSubScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 4e371d4ed4..58314c3774 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -11,15 +11,15 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Multi.Match;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.Multiplayer.Match;
-using osu.Game.Screens.Multi.Multiplayer.Participants;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Match;
+using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
 using osu.Game.Users;
-using ParticipantsList = osu.Game.Screens.Multi.Multiplayer.Participants.ParticipantsList;
+using ParticipantsList = osu.Game.Screens.OnlinePlay.Multiplayer.Participants.ParticipantsList;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     [Cached]
     public class MultiplayerMatchSubScreen : RoomSubScreen
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 32d95aa11f..4247e954bd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -11,13 +11,13 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     // Todo: The "room" part of PlaylistsPlayer should be split out into an abstract player class to be inherited instead.
     public class MultiplayerPlayer : PlaylistsPlayer
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
index 3e39473954..e3b47b3254 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
@@ -3,9 +3,9 @@
 
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Playlists;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerResultsScreen : PlaylistsResultsScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
index 6fe7c10bfb..654dafe9aa 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
@@ -5,7 +5,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Game.Online.Multiplayer;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public abstract class MultiplayerRoomComposite : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index fdd46cdc2a..3cb263298f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -13,9 +13,9 @@ using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerRoomManager : RoomManager
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 93f8a9de8b..044afa7445 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -22,7 +22,7 @@ using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Participants
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 {
     public class ParticipantPanel : MultiplayerRoomComposite, IHasContextMenu
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
index 3f37274d4c..b9ac096c4a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Participants
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 {
     public class ParticipantsList : MultiplayerRoomComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
index dc3ceedfd7..6c1a55a0eb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
@@ -3,9 +3,9 @@
 
 using osu.Framework.Allocation;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Participants
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 {
     public class ParticipantsListHeader : OverlinedHeader
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index 61faa0d85d..8d2879fc93 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Multiplayer;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Participants
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 {
     public class StateDisplay : CompositeDrawable
     {
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs b/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
index fe4ca759b0..ab54178ab4 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Rooms;
 using osu.Game.Users;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class MultiplayerComposite : CompositeDrawable
     {
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs b/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
index 983c7aeac9..3693e897ae 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
@@ -17,14 +17,14 @@ using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 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;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Lounge;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Users;
 using osuTK;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     [Cached]
     public abstract class MultiplayerScreen : OsuScreen
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
index 8e46de1a95..d7fca98ebe 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public abstract class MultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
index 3b0ed0dba1..335da86a65 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
+++ b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Screens;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class MultiplayerSubScreenStack : OsuScreenStack
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
index acee063115..fcb773f8be 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class CreatePlaylistsRoomButton : PurpleTriangleButton
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
index da6aade942..a7fb391fbc 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
@@ -5,11 +5,11 @@ using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Multi.Lounge;
-using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Lounge;
+using osu.Game.Screens.OnlinePlay.Match;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class Playlists : MultiplayerScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
index 513854515b..bfbff4240c 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
@@ -2,11 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Lounge;
-using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.OnlinePlay.Lounge;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Match;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsLoungeSubScreen : LoungeSubScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index f3109a33e4..557f1df657 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -16,10 +16,10 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsMatchSettingsOverlay : MatchSettingsOverlay
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 25a3340ead..2c3e7a12e2 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -17,7 +17,7 @@ using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsPlayer : Player
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
index 3c35e2a6f3..edee8e571a 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
@@ -6,9 +6,9 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsReadyButton : ReadyButton
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
index 5d1d3a2724..e13c8a9f82 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
@@ -15,7 +15,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsResultsScreen : ResultsScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
index ae57eeddcc..c55d1c3e94 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
@@ -3,9 +3,9 @@
 
 using System.Collections.Generic;
 using osu.Framework.Bindables;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsRoomManager : RoomManager
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 4867268fe1..51a9ae569e 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -10,14 +10,14 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Multi.Match;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Match;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
-using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
+using Footer = osu.Game.Screens.OnlinePlay.Match.Components.Footer;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsRoomSubScreen : RoomSubScreen
     {
diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 71ce157296..28311f5113 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -30,7 +30,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Users;
 using osuTK;
 
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 80fd5c2067..1b89a58b40 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -10,8 +10,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Components;
 
 namespace osu.Game.Screens.Select
 {
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 0e23f4d8c6..da0e39d965 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -7,8 +7,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
index 0df397d98e..ad3e2f7105 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
@@ -6,8 +6,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
index abfefd363a..5e12156f3c 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
@@ -11,8 +11,8 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {

From 4caf75850b4faf18d62827fcb4e9b1b50f4f1b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:00:00 +0100
Subject: [PATCH 07234/10326] Rename {Multiplayer -> OnlinePlay}Screen

---
 .../Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs     | 4 ++--
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs           | 4 ++--
 osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs       | 2 +-
 .../OnlinePlay/{MultiplayerScreen.cs => OnlinePlayScreen.cs} | 4 ++--
 osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs           | 2 +-
 .../Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs   | 5 +----
 6 files changed, 9 insertions(+), 12 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{MultiplayerScreen.cs => OnlinePlayScreen.cs} (99%)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index 6d37a483a9..f4d167a193 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         private CachedModelDependencyContainer<Room> dependencies;
 
         [Resolved(canBeNull: true)]
-        private MultiplayerScreen multiplayer { get; set; }
+        private OnlinePlayScreen parentScreen { get; set; }
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -242,7 +242,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             new OsuMenuItem("Create copy", MenuItemType.Standard, () =>
             {
-                multiplayer?.OpenNewRoom(Room.CreateCopy());
+                parentScreen?.OpenNewRoom(Room.CreateCopy());
             })
         };
     }
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2b0035c8bc..3a5af90824 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private BeatmapManager beatmapManager { get; set; }
 
         [Resolved(canBeNull: true)]
-        protected MultiplayerScreen Multiplayer { get; private set; }
+        protected OnlinePlayScreen ParentScreen { get; private set; }
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
@@ -88,7 +88,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         protected void StartPlay(Func<Player> player)
         {
             sampleStart?.Play();
-            Multiplayer?.Push(new PlayerLoader(player));
+            ParentScreen?.Push(new PlayerLoader(player));
         }
 
         private void selectedItemChanged()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index ce4918dae1..76f5c74433 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.OnlinePlay.Lounge;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public class Multiplayer : MultiplayerScreen
+    public class Multiplayer : OnlinePlayScreen
     {
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
similarity index 99%
rename from osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
rename to osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 3693e897ae..08741ef4fe 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -27,7 +27,7 @@ using osuTK;
 namespace osu.Game.Screens.OnlinePlay
 {
     [Cached]
-    public abstract class MultiplayerScreen : OsuScreen
+    public abstract class OnlinePlayScreen : OsuScreen
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.OnlinePlay
         private readonly Drawable header;
         private readonly Drawable headerBackground;
 
-        protected MultiplayerScreen()
+        protected OnlinePlayScreen()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
index a7fb391fbc..5b132c97fd 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.OnlinePlay.Match;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
 {
-    public class Playlists : MultiplayerScreen
+    public class Playlists : OnlinePlayScreen
     {
         protected override void UpdatePollingRate(bool isIdle)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 51a9ae569e..e76ca995bf 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -28,9 +28,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private MultiplayerScreen multiplayer { get; set; }
-
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;
 
@@ -124,7 +121,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                                             RequestShowResults = item =>
                                                                             {
                                                                                 Debug.Assert(roomId.Value != null);
-                                                                                multiplayer?.Push(new PlaylistsResultsScreen(null, roomId.Value.Value, item, false));
+                                                                                ParentScreen?.Push(new PlaylistsResultsScreen(null, roomId.Value.Value, item, false));
                                                                             }
                                                                         }
                                                                     },

From eb0f125fefb5691e82c31a1730db1da323a0a095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:00:31 +0100
Subject: [PATCH 07235/10326] Rename {Multiplayer -> OnlinePlay}SubScreenStack

---
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs                 | 2 +-
 ...MultiplayerSubScreenStack.cs => OnlinePlaySubScreenStack.cs} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{MultiplayerSubScreenStack.cs => OnlinePlaySubScreenStack.cs} (93%)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 08741ef4fe..66309bd47e 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Screens.OnlinePlay
                                     }
                                 }
                             },
-                            screenStack = new MultiplayerSubScreenStack { RelativeSizeAxes = Axes.Both }
+                            screenStack = new OnlinePlaySubScreenStack { RelativeSizeAxes = Axes.Both }
                         }
                     },
                     new Header(ScreenTitle, screenStack),
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
similarity index 93%
rename from osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
rename to osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
index 335da86a65..7f2a0980c1 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
@@ -5,7 +5,7 @@ using osu.Framework.Screens;
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public class MultiplayerSubScreenStack : OsuScreenStack
+    public class OnlinePlaySubScreenStack : OsuScreenStack
     {
         protected override void ScreenChanged(IScreen prev, IScreen next)
         {

From e5064ee930c58a01fcf79807c14aaf83a7e420d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:02:35 +0100
Subject: [PATCH 07236/10326] Rename {Multiplayer -> OnlinePlay}SubScreen

---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs     | 2 +-
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs        | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs           | 8 ++++----
 .../{MultiplayerSubScreen.cs => OnlinePlaySubScreen.cs}   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{MultiplayerSubScreen.cs => OnlinePlaySubScreen.cs} (94%)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index cc56c11d32..79f5dfdee1 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -19,7 +19,7 @@ using osu.Game.Users;
 namespace osu.Game.Screens.OnlinePlay.Lounge
 {
     [Cached]
-    public abstract class LoungeSubScreen : MultiplayerSubScreen
+    public abstract class LoungeSubScreen : OnlinePlaySubScreen
     {
         public override string Title => "Lounge";
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 3a5af90824..2449563c73 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -18,7 +18,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Screens.OnlinePlay.Match
 {
     [Cached(typeof(IPreviewTrackOwner))]
-    public abstract class RoomSubScreen : MultiplayerSubScreen, IPreviewTrackOwner
+    public abstract class RoomSubScreen : OnlinePlaySubScreen, IPreviewTrackOwner
     {
         protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 66309bd47e..60897e8b4c 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -295,13 +295,13 @@ namespace osu.Game.Screens.OnlinePlay
             switch (newScreen)
             {
                 case LoungeSubScreen _:
-                    header.Delay(MultiplayerSubScreen.RESUME_TRANSITION_DELAY).ResizeHeightTo(400, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint);
-                    headerBackground.MoveToX(0, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
+                    header.Delay(OnlinePlaySubScreen.RESUME_TRANSITION_DELAY).ResizeHeightTo(400, OnlinePlaySubScreen.APPEAR_DURATION, Easing.OutQuint);
+                    headerBackground.MoveToX(0, OnlinePlaySubScreen.X_MOVE_DURATION, Easing.OutQuint);
                     break;
 
                 case RoomSubScreen _:
-                    header.ResizeHeightTo(135, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint);
-                    headerBackground.MoveToX(-MultiplayerSubScreen.X_SHIFT, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
+                    header.ResizeHeightTo(135, OnlinePlaySubScreen.APPEAR_DURATION, Easing.OutQuint);
+                    headerBackground.MoveToX(-OnlinePlaySubScreen.X_SHIFT, OnlinePlaySubScreen.X_MOVE_DURATION, Easing.OutQuint);
                     break;
             }
 
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
similarity index 94%
rename from osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
index d7fca98ebe..b6dcfe6dab 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
@@ -7,7 +7,7 @@ using osu.Framework.Screens;
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public abstract class MultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen
+    public abstract class OnlinePlaySubScreen : OsuScreen, IMultiplayerSubScreen
     {
         public override bool DisallowExternalBeatmapRulesetChanges => false;
 
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(CanBeNull = true)]
         protected IRoomManager RoomManager { get; private set; }
 
-        protected MultiplayerSubScreen()
+        protected OnlinePlaySubScreen()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;

From 4c43a67b68a9b0d1c574f33a4aa4e739e80397e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:05:29 +0100
Subject: [PATCH 07237/10326] Rename I{Multiplayer -> OnlinePlay}SubScreen

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs | 8 ++++----
 osu.Game/Screens/OnlinePlay/Header.cs                     | 6 +++---
 .../{IMultiplayerSubScreen.cs => IOnlinePlaySubScreen.cs} | 2 +-
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs  | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs           | 4 ++--
 osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs        | 2 +-
 osu.Game/Screens/Select/MatchSongSelect.cs                | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{IMultiplayerSubScreen.cs => IOnlinePlaySubScreen.cs} (82%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
index 089de223fc..2244dcfc56 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             OsuScreenStack screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
 
-            screenStack.Push(new TestMultiplayerSubScreen(index));
+            screenStack.Push(new TestOnlinePlaySubScreen(index));
 
             Children = new Drawable[]
             {
@@ -26,16 +26,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 new Header("Multiplayer", screenStack)
             };
 
-            AddStep("push multi screen", () => screenStack.CurrentScreen.Push(new TestMultiplayerSubScreen(++index)));
+            AddStep("push multi screen", () => screenStack.CurrentScreen.Push(new TestOnlinePlaySubScreen(++index)));
         }
 
-        private class TestMultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen
+        private class TestOnlinePlaySubScreen : OsuScreen, IOnlinePlaySubScreen
         {
             private readonly int index;
 
             public string ShortTitle => $"Screen {index}";
 
-            public TestMultiplayerSubScreen(int index)
+            public TestOnlinePlaySubScreen(int index)
             {
                 this.index = index;
             }
diff --git a/osu.Game/Screens/OnlinePlay/Header.cs b/osu.Game/Screens/OnlinePlay/Header.cs
index bffd744fdc..bf0a53cbb6 100644
--- a/osu.Game/Screens/OnlinePlay/Header.cs
+++ b/osu.Game/Screens/OnlinePlay/Header.cs
@@ -61,8 +61,8 @@ namespace osu.Game.Screens.OnlinePlay
 
             breadcrumbs.Current.ValueChanged += screen =>
             {
-                if (screen.NewValue is IMultiplayerSubScreen multiScreen)
-                    title.Screen = multiScreen;
+                if (screen.NewValue is IOnlinePlaySubScreen onlineSubScreen)
+                    title.Screen = onlineSubScreen;
             };
 
             breadcrumbs.Current.TriggerChange();
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.OnlinePlay
             private readonly OsuSpriteText dot;
             private readonly OsuSpriteText pageTitle;
 
-            public IMultiplayerSubScreen Screen
+            public IOnlinePlaySubScreen Screen
             {
                 set => pageTitle.Text = value.ShortTitle.Titleize();
             }
diff --git a/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
similarity index 82%
rename from osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
index fc149cd2b2..a4762292a9 100644
--- a/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public interface IMultiplayerSubScreen : IOsuScreen
+    public interface IOnlinePlaySubScreen : IOsuScreen
     {
         string Title { get; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 76869300e8..0842574f54 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -15,7 +15,7 @@ using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public class MultiplayerMatchSongSelect : SongSelect, IMultiplayerSubScreen
+    public class MultiplayerMatchSongSelect : SongSelect, IOnlinePlaySubScreen
     {
         public string ShortTitle => "song selection";
 
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 60897e8b4c..9ba2e41d12 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay
     [Cached]
     public abstract class OnlinePlayScreen : OsuScreen
     {
-        public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
+        public override bool CursorVisible => (screenStack.CurrentScreen as IOnlinePlaySubScreen)?.CursorVisible ?? true;
 
         // this is required due to PlayerLoader eventually being pushed to the main stack
         // while leases may be taken out by a subscreen.
@@ -245,7 +245,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         public override bool OnBackButton()
         {
-            if ((screenStack.CurrentScreen as IMultiplayerSubScreen)?.OnBackButton() == true)
+            if ((screenStack.CurrentScreen as IOnlinePlaySubScreen)?.OnBackButton() == true)
                 return true;
 
             if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
index b6dcfe6dab..e1bd889088 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
@@ -7,7 +7,7 @@ using osu.Framework.Screens;
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public abstract class OnlinePlaySubScreen : OsuScreen, IMultiplayerSubScreen
+    public abstract class OnlinePlaySubScreen : OsuScreen, IOnlinePlaySubScreen
     {
         public override bool DisallowExternalBeatmapRulesetChanges => false;
 
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 1b89a58b40..0948a4d19a 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -15,7 +15,7 @@ using osu.Game.Screens.OnlinePlay.Components;
 
 namespace osu.Game.Screens.Select
 {
-    public class MatchSongSelect : SongSelect, IMultiplayerSubScreen
+    public class MatchSongSelect : SongSelect, IOnlinePlaySubScreen
     {
         public Action<PlaylistItem> Selected;
 

From ed4b8482b60d1133753296aebf78afd4fec95c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:12:33 +0100
Subject: [PATCH 07238/10326] Rename {Multiplayer -> OnlinePlay}Composite

---
 osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs          | 2 +-
 osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs       | 2 +-
 osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs          | 2 +-
 osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs       | 2 +-
 .../Screens/OnlinePlay/Components/ParticipantCountDisplay.cs    | 2 +-
 osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs   | 2 +-
 osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs      | 2 +-
 osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs        | 2 +-
 osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs   | 2 +-
 .../Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs     | 2 +-
 osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs       | 2 +-
 osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs  | 2 +-
 osu.Game/Screens/OnlinePlay/Match/Components/Header.cs          | 2 +-
 .../Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs | 2 +-
 .../OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs     | 2 +-
 .../OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs      | 2 +-
 .../Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs        | 2 +-
 .../Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs  | 2 +-
 .../{MultiplayerComposite.cs => OnlinePlayComposite.cs}         | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs                 | 2 +-
 .../OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs       | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{MultiplayerComposite.cs => OnlinePlayComposite.cs} (96%)

diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index bc355d18a9..acb82360b3 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -12,7 +12,7 @@ using osu.Game.Online.Chat;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class BeatmapTitle : MultiplayerComposite
+    public class BeatmapTitle : OnlinePlayComposite
     {
         private readonly LinkFlowContainer textFlow;
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
index 434d7b75ed..3aa13458a4 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class BeatmapTypeInfo : MultiplayerComposite
+    public class BeatmapTypeInfo : OnlinePlayComposite
     {
         private LinkFlowContainer beatmapAuthor;
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
index 719afcdd33..03b27b605c 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
@@ -10,7 +10,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class ModeTypeInfo : MultiplayerComposite
+    public class ModeTypeInfo : OnlinePlayComposite
     {
         private const float height = 30;
         private const float transition_duration = 100;
diff --git a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
index c78dfef592..08a0a3405e 100644
--- a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
     /// <summary>
     /// A header used in the multiplayer interface which shows text / details beneath a line.
     /// </summary>
-    public class OverlinedHeader : MultiplayerComposite
+    public class OverlinedHeader : OnlinePlayComposite
     {
         private bool showLine = true;
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
index 357974adfc..53821da8fd 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class ParticipantCountDisplay : MultiplayerComposite
+    public class ParticipantCountDisplay : OnlinePlayComposite
     {
         private const float text_size = 30;
         private const float transition_duration = 100;
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
index 5184f873f3..c36d1a2e76 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
@@ -8,7 +8,7 @@ using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class ParticipantsDisplay : MultiplayerComposite
+    public class ParticipantsDisplay : OnlinePlayComposite
     {
         public Bindable<string> Details = new Bindable<string>();
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
index b5019b4cdc..9aceb39a27 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class ParticipantsList : MultiplayerComposite
+    public class ParticipantsList : OnlinePlayComposite
     {
         public const float TILE_SIZE = 35;
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
index 58cb25f30e..bcc256bcff 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
@@ -13,7 +13,7 @@ using osu.Game.Online.Rooms.RoomStatuses;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class RoomStatusInfo : MultiplayerComposite
+    public class RoomStatusInfo : OnlinePlayComposite
     {
         public RoomStatusInfo()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index f4d167a193..0a7198a7fa 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -155,7 +155,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                                 Width = cover_width,
                                 Masking = true,
                                 Margin = new MarginPadding { Left = stripWidth },
-                                Child = new MultiplayerBackgroundSprite(BeatmapSetCoverType.List) { RelativeSizeAxes = Axes.Both }
+                                Child = new OnlinePlayBackgroundSprite(BeatmapSetCoverType.List) { RelativeSizeAxes = Axes.Both }
                             },
                             new Container
                             {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
index 895c0e3eda..0d5ce65d5a 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public class ParticipantInfo : MultiplayerComposite
+    public class ParticipantInfo : OnlinePlayComposite
     {
         public ParticipantInfo()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
index 8552d425aa..0a17702f2a 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public class RoomInfo : MultiplayerComposite
+    public class RoomInfo : OnlinePlayComposite
     {
         private readonly List<Drawable> statusElements = new List<Drawable>();
         private readonly OsuTextFlowContainer roomName;
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
index 4b1ec9ae89..c28354c753 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
@@ -12,7 +12,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public class RoomInspector : MultiplayerComposite
+    public class RoomInspector : OnlinePlayComposite
     {
         private const float transition_duration = 100;
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
index df0dfc6ec1..a2d11c54c1 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
@@ -12,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
-    public class Header : MultiplayerComposite
+    public class Header : OnlinePlayComposite
     {
         public const float HEIGHT = 50;
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
index 998ab889d6..ea3951fc3b 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
         protected const float TRANSITION_DURATION = 350;
         protected const float FIELD_PADDING = 45;
 
-        protected MultiplayerComposite Settings { get; set; }
+        protected OnlinePlayComposite Settings { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index 1718ebd83a..f17e04d4d4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.OnlinePlay.Match.Components;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
-    public class BeatmapSelectionControl : MultiplayerComposite
+    public class BeatmapSelectionControl : OnlinePlayComposite
     {
         [Resolved]
         private MultiplayerMatchSubScreen matchSubScreen { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
index 42e34c4be3..bb351d06d3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
@@ -19,7 +19,7 @@ using OsuFont = osu.Game.Graphics.OsuFont;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
-    public class MultiplayerMatchHeader : MultiplayerComposite
+    public class MultiplayerMatchHeader : OnlinePlayComposite
     {
         public const float HEIGHT = 50;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index 8741b0323d..ae03d384f6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             };
         }
 
-        protected class MatchSettings : MultiplayerComposite
+        protected class MatchSettings : OnlinePlayComposite
         {
             private const float disabled_alpha = 0.2f;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
index 654dafe9aa..ac608a13d4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
@@ -7,7 +7,7 @@ using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public abstract class MultiplayerRoomComposite : MultiplayerComposite
+    public abstract class MultiplayerRoomComposite : OnlinePlayComposite
     {
         [CanBeNull]
         protected MultiplayerRoom Room => Client.Room;
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
similarity index 96%
rename from osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
rename to osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index ab54178ab4..64792a32f3 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -10,7 +10,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public class MultiplayerComposite : CompositeDrawable
+    public class OnlinePlayComposite : CompositeDrawable
     {
         [Resolved(typeof(Room))]
         protected Bindable<int?> RoomID { get; private set; }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 9ba2e41d12..4074dd1573 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -338,7 +338,7 @@ namespace osu.Game.Screens.OnlinePlay
             }
         }
 
-        private class HeaderBackgroundSprite : MultiplayerBackgroundSprite
+        private class HeaderBackgroundSprite : OnlinePlayBackgroundSprite
         {
             protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new BackgroundSprite { RelativeSizeAxes = Axes.Both };
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index 557f1df657..6b92526f35 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             };
         }
 
-        protected class MatchSettings : MultiplayerComposite
+        protected class MatchSettings : OnlinePlayComposite
         {
             private const float disabled_alpha = 0.2f;
 

From 2e4b1b95c283418818bd72f40a0885778112728f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:12:46 +0100
Subject: [PATCH 07239/10326] Rename {Multiplayer ->
 OnlinePlay}BackgroundSprite

---
 ...layerBackgroundSprite.cs => OnlinePlayBackgroundSprite.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game/Screens/OnlinePlay/Components/{MultiplayerBackgroundSprite.cs => OnlinePlayBackgroundSprite.cs} (85%)

diff --git a/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/OnlinePlay/Components/OnlinePlayBackgroundSprite.cs
similarity index 85%
rename from osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
rename to osu.Game/Screens/OnlinePlay/Components/OnlinePlayBackgroundSprite.cs
index 45e2c553e7..d8dfac496d 100644
--- a/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/OnlinePlayBackgroundSprite.cs
@@ -8,12 +8,12 @@ using osu.Game.Beatmaps.Drawables;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class MultiplayerBackgroundSprite : MultiplayerComposite
+    public class OnlinePlayBackgroundSprite : OnlinePlayComposite
     {
         private readonly BeatmapSetCoverType beatmapSetCoverType;
         private UpdateableBeatmapBackgroundSprite sprite;
 
-        public MultiplayerBackgroundSprite(BeatmapSetCoverType beatmapSetCoverType = BeatmapSetCoverType.Cover)
+        public OnlinePlayBackgroundSprite(BeatmapSetCoverType beatmapSetCoverType = BeatmapSetCoverType.Cover)
         {
             this.beatmapSetCoverType = beatmapSetCoverType;
         }

From 0bd9f68cbd6758faa79fbb8a3feac064edb2bdda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 18:39:55 +0100
Subject: [PATCH 07240/10326] Refactor update stream colour mapping code

---
 .../API/Requests/Responses/APIUpdateStream.cs | 37 +++++--------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APIUpdateStream.cs b/osu.Game/Online/API/Requests/Responses/APIUpdateStream.cs
index d9e48373bb..5af7d6a01c 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUpdateStream.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUpdateStream.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Framework.Graphics.Colour;
 using osuTK.Graphics;
@@ -27,34 +28,16 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public bool Equals(APIUpdateStream other) => Id == other?.Id;
 
-        public ColourInfo Colour
+        internal static readonly Dictionary<string, Color4> KNOWN_STREAMS = new Dictionary<string, Color4>
         {
-            get
-            {
-                switch (Name)
-                {
-                    case "stable40":
-                        return new Color4(102, 204, 255, 255);
+            ["stable40"] = new Color4(102, 204, 255, 255),
+            ["stable"] = new Color4(34, 153, 187, 255),
+            ["beta40"] = new Color4(255, 221, 85, 255),
+            ["cuttingedge"] = new Color4(238, 170, 0, 255),
+            [OsuGameBase.CLIENT_STREAM_NAME] = new Color4(237, 18, 33, 255),
+            ["web"] = new Color4(136, 102, 238, 255)
+        };
 
-                    case "stable":
-                        return new Color4(34, 153, 187, 255);
-
-                    case "beta40":
-                        return new Color4(255, 221, 85, 255);
-
-                    case "cuttingedge":
-                        return new Color4(238, 170, 0, 255);
-
-                    case OsuGameBase.CLIENT_STREAM_NAME:
-                        return new Color4(237, 18, 33, 255);
-
-                    case "web":
-                        return new Color4(136, 102, 238, 255);
-
-                    default:
-                        return new Color4(0, 0, 0, 255);
-                }
-            }
-        }
+        public ColourInfo Colour => KNOWN_STREAMS.TryGetValue(Name, out var colour) ? colour : new Color4(0, 0, 0, 255);
     }
 }

From dacf6d5a34134b2d10070a0fc74232492e37e237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 19:28:33 +0100
Subject: [PATCH 07241/10326] Decouple changelog test scene from web

---
 .../Online/TestSceneChangelogOverlay.cs       | 132 ++++++++++++------
 1 file changed, 92 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 998e42b478..9f617d49da 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -1,8 +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.Collections.Generic;
+using System.Linq;
+using Humanizer;
 using NUnit.Framework;
+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.Changelog;
@@ -12,15 +17,63 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneChangelogOverlay : OsuTestScene
     {
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+
+        private readonly Dictionary<string, APIUpdateStream> streams;
+        private readonly Dictionary<string, APIChangelogBuild> builds;
+
+        private APIChangelogBuild requestedBuild;
         private TestChangelogOverlay changelog;
 
-        protected override bool UseOnlineAPI => true;
+        public TestSceneChangelogOverlay()
+        {
+            streams = APIUpdateStream.KNOWN_STREAMS.Keys.Select((stream, id) => new APIUpdateStream
+            {
+                Id = id + 1,
+                Name = stream,
+                DisplayName = stream.Humanize(), // not quite there, but good enough.
+            }).ToDictionary(stream => stream.Name);
+
+            string version = DateTimeOffset.Now.ToString("yyyy.Mdd.0");
+            builds = APIUpdateStream.KNOWN_STREAMS.Keys.Select(stream => new APIChangelogBuild
+            {
+                Version = version,
+                DisplayVersion = version,
+                UpdateStream = streams[stream],
+                ChangelogEntries = new List<APIChangelogEntry>()
+            }).ToDictionary(build => build.UpdateStream.Name);
+
+            foreach (var stream in streams.Values)
+                stream.LatestBuild = builds[stream.Name];
+        }
 
         [SetUp]
-        public void SetUp() => Schedule(() =>
+        public void SetUp()
         {
-            Child = changelog = new TestChangelogOverlay();
-        });
+            requestedBuild = null;
+
+            dummyAPI.HandleRequest = request =>
+            {
+                switch (request)
+                {
+                    case GetChangelogRequest changelogRequest:
+                        var changelogResponse = new APIChangelogIndex
+                        {
+                            Streams = streams.Values.ToList(),
+                            Builds = builds.Values.ToList()
+                        };
+                        changelogRequest.TriggerSuccess(changelogResponse);
+                        break;
+
+                    case GetChangelogBuildRequest buildRequest:
+                        if (requestedBuild != null)
+                            buildRequest.TriggerSuccess(requestedBuild);
+                        break;
+                }
+            };
+
+            Schedule(() => Child = changelog = new TestChangelogOverlay());
+        }
 
         [Test]
         public void ShowWithNoFetch()
@@ -41,26 +94,22 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [Test]
-        [Ignore("needs to be updated to not be so server dependent")]
         public void ShowWithBuild()
         {
-            AddStep(@"Show with Lazer 2018.712.0", () =>
+            showBuild(() => new APIChangelogBuild
             {
-                changelog.ShowBuild(new APIChangelogBuild
+                Version = "2018.712.0",
+                DisplayVersion = "2018.712.0",
+                UpdateStream = streams[OsuGameBase.CLIENT_STREAM_NAME],
+                ChangelogEntries = new List<APIChangelogEntry>
                 {
-                    Version = "2018.712.0",
-                    DisplayVersion = "2018.712.0",
-                    UpdateStream = new APIUpdateStream { Id = 5, Name = OsuGameBase.CLIENT_STREAM_NAME },
-                    ChangelogEntries = new List<APIChangelogEntry>
+                    new APIChangelogEntry
                     {
-                        new APIChangelogEntry
-                        {
-                            Category = "Test",
-                            Title = "Title",
-                            MessageHtml = "Message",
-                        }
+                        Category = "Test",
+                        Title = "Title",
+                        MessageHtml = "Message",
                     }
-                });
+                }
             });
 
             AddUntilStep(@"wait for streams", () => changelog.Streams?.Count > 0);
@@ -71,35 +120,38 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestHTMLUnescaping()
         {
-            AddStep(@"Ensure HTML string unescaping", () =>
+            showBuild(() => new APIChangelogBuild
             {
-                changelog.ShowBuild(new APIChangelogBuild
+                Version = "2019.920.0",
+                DisplayVersion = "2019.920.0",
+                UpdateStream = new APIUpdateStream
                 {
-                    Version = "2019.920.0",
-                    DisplayVersion = "2019.920.0",
-                    UpdateStream = new APIUpdateStream
+                    Name = "Test",
+                    DisplayName = "Test"
+                },
+                ChangelogEntries = new List<APIChangelogEntry>
+                {
+                    new APIChangelogEntry
                     {
-                        Name = "Test",
-                        DisplayName = "Test"
-                    },
-                    ChangelogEntries = new List<APIChangelogEntry>
-                    {
-                        new APIChangelogEntry
+                        Category = "Testing HTML strings unescaping",
+                        Title = "Ensuring HTML strings are being unescaped",
+                        MessageHtml = "&quot;&quot;&quot;This text should appear triple-quoted&quot;&quot;&quot;    &gt;_&lt;",
+                        GithubUser = new APIChangelogUser
                         {
-                            Category = "Testing HTML strings unescaping",
-                            Title = "Ensuring HTML strings are being unescaped",
-                            MessageHtml = "&quot;&quot;&quot;This text should appear triple-quoted&quot;&quot;&quot;    &gt;_&lt;",
-                            GithubUser = new APIChangelogUser
-                            {
-                                DisplayName = "Dummy",
-                                OsuUsername = "Dummy",
-                            }
-                        },
-                    }
-                });
+                            DisplayName = "Dummy",
+                            OsuUsername = "Dummy",
+                        }
+                    },
+                }
             });
         }
 
+        private void showBuild(Func<APIChangelogBuild> build)
+        {
+            AddStep("set up build", () => requestedBuild = build.Invoke());
+            AddStep("show build", () => changelog.ShowBuild(requestedBuild));
+        }
+
         private class TestChangelogOverlay : ChangelogOverlay
         {
             public new List<APIUpdateStream> Streams => base.Streams;

From 5f43299d3779ffbde32d3bd2f735592f30fad820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 19:49:41 +0100
Subject: [PATCH 07242/10326] Fix tests failing due to base logic firing

It turns out that the changelog code was semi-intentionally relying on
the request to get release streams to be slow to initially show the
listing of all streams.

Locally suppress the base tab control logic to fix this.
---
 osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
index 509a6dabae..6bbff045b5 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
@@ -8,5 +8,11 @@ namespace osu.Game.Overlays.Changelog
     public class ChangelogUpdateStreamControl : OverlayStreamControl<APIUpdateStream>
     {
         protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
+
+        protected override void LoadComplete()
+        {
+            // suppress base logic of immediately selecting first item if one exists
+            // (we always want to start with no stream selected).
+        }
     }
 }

From 3ac618778f11010de62bedec719141319b37cc40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 20:08:57 +0100
Subject: [PATCH 07243/10326] Handle all changelog entry types correctly

---
 .../Online/TestSceneChangelogOverlay.cs       | 20 +++++++++++++++---
 osu.Game/Overlays/Changelog/ChangelogBuild.cs | 21 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 9f617d49da..42f822664f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -105,9 +105,23 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     new APIChangelogEntry
                     {
-                        Category = "Test",
-                        Title = "Title",
-                        MessageHtml = "Message",
+                        Type = ChangelogEntryType.Fix,
+                        Category = "osu!",
+                        Title = "Fix thing",
+                        MessageHtml = "Additional info goes here.",
+                    },
+                    new APIChangelogEntry
+                    {
+                        Type = ChangelogEntryType.Add,
+                        Category = "osu!",
+                        Title = "Add thing",
+                        Major = true
+                    },
+                    new APIChangelogEntry
+                    {
+                        Type = ChangelogEntryType.Misc,
+                        Category = "Code quality",
+                        Title = "Clean up thing"
                     }
                 }
             });
diff --git a/osu.Game/Overlays/Changelog/ChangelogBuild.cs b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
index 65ff0fef92..6ec3f08a2b 100644
--- a/osu.Game/Overlays/Changelog/ChangelogBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Changelog
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreRight,
                                 Size = new Vector2(10),
-                                Icon = entry.Type == ChangelogEntryType.Fix ? FontAwesome.Solid.Check : FontAwesome.Solid.Plus,
+                                Icon = getIconForChangelogEntry(entry.Type),
                                 Colour = entryColour.Opacity(0.5f),
                                 Margin = new MarginPadding { Right = 5 },
                             },
@@ -186,6 +186,25 @@ namespace osu.Game.Overlays.Changelog
             }
         }
 
+        private static IconUsage getIconForChangelogEntry(ChangelogEntryType entryType)
+        {
+            // compare: https://github.com/ppy/osu-web/blob/master/resources/assets/coffee/react/_components/changelog-entry.coffee#L8-L11
+            switch (entryType)
+            {
+                case ChangelogEntryType.Add:
+                    return FontAwesome.Solid.Plus;
+
+                case ChangelogEntryType.Fix:
+                    return FontAwesome.Solid.Check;
+
+                case ChangelogEntryType.Misc:
+                    return FontAwesome.Regular.Circle;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(entryType), $"Unrecognised entry type {entryType}");
+            }
+        }
+
         protected virtual FillFlowContainer CreateHeader() => new FillFlowContainer
         {
             Anchor = Anchor.TopCentre,

From 0aedc720f2c61a9f0d8d4223d3896259181ad071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 20:31:12 +0100
Subject: [PATCH 07244/10326] Extract changelog entry component

---
 osu.Game/Overlays/Changelog/ChangelogBuild.cs | 146 +------------
 osu.Game/Overlays/Changelog/ChangelogEntry.cs | 202 ++++++++++++++++++
 2 files changed, 203 insertions(+), 145 deletions(-)
 create mode 100644 osu.Game/Overlays/Changelog/ChangelogEntry.cs

diff --git a/osu.Game/Overlays/Changelog/ChangelogBuild.cs b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
index 6ec3f08a2b..2d071b7345 100644
--- a/osu.Game/Overlays/Changelog/ChangelogBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
@@ -9,14 +9,8 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests.Responses;
 using System;
 using System.Linq;
-using System.Text.RegularExpressions;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Users;
-using osuTK.Graphics;
 using osu.Framework.Allocation;
-using System.Net;
-using osuTK;
-using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Overlays.Changelog
 {
@@ -63,145 +57,7 @@ namespace osu.Game.Overlays.Changelog
                     Margin = new MarginPadding { Top = 35, Bottom = 15 },
                 });
 
-                var fontLarge = OsuFont.GetFont(size: 16);
-                var fontMedium = OsuFont.GetFont(size: 12);
-
-                foreach (var entry in categoryEntries)
-                {
-                    var entryColour = entry.Major ? colours.YellowLight : Color4.White;
-
-                    LinkFlowContainer title;
-
-                    var titleContainer = new Container
-                    {
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Margin = new MarginPadding { Vertical = 5 },
-                        Children = new Drawable[]
-                        {
-                            new SpriteIcon
-                            {
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.CentreRight,
-                                Size = new Vector2(10),
-                                Icon = getIconForChangelogEntry(entry.Type),
-                                Colour = entryColour.Opacity(0.5f),
-                                Margin = new MarginPadding { Right = 5 },
-                            },
-                            title = new LinkFlowContainer
-                            {
-                                Direction = FillDirection.Full,
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                TextAnchor = Anchor.BottomLeft,
-                            }
-                        }
-                    };
-
-                    title.AddText(entry.Title, t =>
-                    {
-                        t.Font = fontLarge;
-                        t.Colour = entryColour;
-                    });
-
-                    if (!string.IsNullOrEmpty(entry.Repository))
-                    {
-                        title.AddText(" (", t =>
-                        {
-                            t.Font = fontLarge;
-                            t.Colour = entryColour;
-                        });
-                        title.AddLink($"{entry.Repository.Replace("ppy/", "")}#{entry.GithubPullRequestId}", entry.GithubUrl,
-                            creationParameters: t =>
-                            {
-                                t.Font = fontLarge;
-                                t.Colour = entryColour;
-                            });
-                        title.AddText(")", t =>
-                        {
-                            t.Font = fontLarge;
-                            t.Colour = entryColour;
-                        });
-                    }
-
-                    title.AddText("by ", t =>
-                    {
-                        t.Font = fontMedium;
-                        t.Colour = entryColour;
-                        t.Padding = new MarginPadding { Left = 10 };
-                    });
-
-                    if (entry.GithubUser != null)
-                    {
-                        if (entry.GithubUser.UserId != null)
-                        {
-                            title.AddUserLink(new User
-                            {
-                                Username = entry.GithubUser.OsuUsername,
-                                Id = entry.GithubUser.UserId.Value
-                            }, t =>
-                            {
-                                t.Font = fontMedium;
-                                t.Colour = entryColour;
-                            });
-                        }
-                        else if (entry.GithubUser.GithubUrl != null)
-                        {
-                            title.AddLink(entry.GithubUser.DisplayName, entry.GithubUser.GithubUrl, t =>
-                            {
-                                t.Font = fontMedium;
-                                t.Colour = entryColour;
-                            });
-                        }
-                        else
-                        {
-                            title.AddText(entry.GithubUser.DisplayName, t =>
-                            {
-                                t.Font = fontMedium;
-                                t.Colour = entryColour;
-                            });
-                        }
-                    }
-
-                    ChangelogEntries.Add(titleContainer);
-
-                    if (!string.IsNullOrEmpty(entry.MessageHtml))
-                    {
-                        var message = new TextFlowContainer
-                        {
-                            AutoSizeAxes = Axes.Y,
-                            RelativeSizeAxes = Axes.X,
-                        };
-
-                        // todo: use markdown parsing once API returns markdown
-                        message.AddText(WebUtility.HtmlDecode(Regex.Replace(entry.MessageHtml, @"<(.|\n)*?>", string.Empty)), t =>
-                        {
-                            t.Font = fontMedium;
-                            t.Colour = colourProvider.Foreground1;
-                        });
-
-                        ChangelogEntries.Add(message);
-                    }
-                }
-            }
-        }
-
-        private static IconUsage getIconForChangelogEntry(ChangelogEntryType entryType)
-        {
-            // compare: https://github.com/ppy/osu-web/blob/master/resources/assets/coffee/react/_components/changelog-entry.coffee#L8-L11
-            switch (entryType)
-            {
-                case ChangelogEntryType.Add:
-                    return FontAwesome.Solid.Plus;
-
-                case ChangelogEntryType.Fix:
-                    return FontAwesome.Solid.Check;
-
-                case ChangelogEntryType.Misc:
-                    return FontAwesome.Regular.Circle;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(entryType), $"Unrecognised entry type {entryType}");
+                ChangelogEntries.AddRange(categoryEntries.Select(entry => new ChangelogEntry(entry)));
             }
         }
 
diff --git a/osu.Game/Overlays/Changelog/ChangelogEntry.cs b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
new file mode 100644
index 0000000000..55edb40283
--- /dev/null
+++ b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
@@ -0,0 +1,202 @@
+// Copyright (c) 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.Net;
+using System.Text.RegularExpressions;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+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.Requests.Responses;
+using osu.Game.Users;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Changelog
+{
+    public class ChangelogEntry : FillFlowContainer
+    {
+        private readonly APIChangelogEntry entry;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
+        private FontUsage fontLarge;
+        private FontUsage fontMedium;
+
+        public ChangelogEntry(APIChangelogEntry entry)
+        {
+            this.entry = entry;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            fontLarge = OsuFont.GetFont(size: 16);
+            fontMedium = OsuFont.GetFont(size: 12);
+
+            Children = new[]
+            {
+                createTitle(),
+                createMessage()
+            };
+        }
+
+        private Drawable createTitle()
+        {
+            var entryColour = entry.Major ? colours.YellowLight : Color4.White;
+
+            LinkFlowContainer title;
+
+            var titleContainer = new Container
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Margin = new MarginPadding { Vertical = 5 },
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreRight,
+                        Size = new Vector2(10),
+                        Icon = getIconForChangelogEntry(entry.Type),
+                        Colour = entryColour.Opacity(0.5f),
+                        Margin = new MarginPadding { Right = 5 },
+                    },
+                    title = new LinkFlowContainer
+                    {
+                        Direction = FillDirection.Full,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        TextAnchor = Anchor.BottomLeft,
+                    }
+                }
+            };
+
+            title.AddText(entry.Title, t =>
+            {
+                t.Font = fontLarge;
+                t.Colour = entryColour;
+            });
+
+            if (!string.IsNullOrEmpty(entry.Repository))
+                addRepositoryReference(title, entryColour);
+
+            if (entry.GithubUser != null)
+                addGithubAuthorReference(title, entryColour);
+
+            return titleContainer;
+        }
+
+        private void addRepositoryReference(LinkFlowContainer title, Color4 entryColour)
+        {
+            title.AddText(" (", t =>
+            {
+                t.Font = fontLarge;
+                t.Colour = entryColour;
+            });
+            title.AddLink($"{entry.Repository.Replace("ppy/", "")}#{entry.GithubPullRequestId}", entry.GithubUrl,
+                t =>
+                {
+                    t.Font = fontLarge;
+                    t.Colour = entryColour;
+                });
+            title.AddText(")", t =>
+            {
+                t.Font = fontLarge;
+                t.Colour = entryColour;
+            });
+        }
+
+        private void addGithubAuthorReference(LinkFlowContainer title, Color4 entryColour)
+        {
+            title.AddText("by ", t =>
+            {
+                t.Font = fontMedium;
+                t.Colour = entryColour;
+                t.Padding = new MarginPadding { Left = 10 };
+            });
+
+            if (entry.GithubUser.UserId != null)
+            {
+                title.AddUserLink(new User
+                {
+                    Username = entry.GithubUser.OsuUsername,
+                    Id = entry.GithubUser.UserId.Value
+                }, t =>
+                {
+                    t.Font = fontMedium;
+                    t.Colour = entryColour;
+                });
+            }
+            else if (entry.GithubUser.GithubUrl != null)
+            {
+                title.AddLink(entry.GithubUser.DisplayName, entry.GithubUser.GithubUrl, t =>
+                {
+                    t.Font = fontMedium;
+                    t.Colour = entryColour;
+                });
+            }
+            else
+            {
+                title.AddText(entry.GithubUser.DisplayName, t =>
+                {
+                    t.Font = fontMedium;
+                    t.Colour = entryColour;
+                });
+            }
+        }
+
+        private Drawable createMessage()
+        {
+            if (string.IsNullOrEmpty(entry.MessageHtml))
+                return Empty();
+
+            var message = new TextFlowContainer
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+            };
+
+            // todo: use markdown parsing once API returns markdown
+            message.AddText(WebUtility.HtmlDecode(Regex.Replace(entry.MessageHtml, @"<(.|\n)*?>", string.Empty)), t =>
+            {
+                t.Font = fontMedium;
+                t.Colour = colourProvider.Foreground1;
+            });
+
+            return message;
+        }
+
+        private static IconUsage getIconForChangelogEntry(ChangelogEntryType entryType)
+        {
+            // compare: https://github.com/ppy/osu-web/blob/master/resources/assets/coffee/react/_components/changelog-entry.coffee#L8-L11
+            switch (entryType)
+            {
+                case ChangelogEntryType.Add:
+                    return FontAwesome.Solid.Plus;
+
+                case ChangelogEntryType.Fix:
+                    return FontAwesome.Solid.Check;
+
+                case ChangelogEntryType.Misc:
+                    return FontAwesome.Regular.Circle;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(entryType), $"Unrecognised entry type {entryType}");
+            }
+        }
+    }
+}

From c32fc05f69435a8b5adc6b7c715ce57b75cb404e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 20:41:35 +0100
Subject: [PATCH 07245/10326] Improve test scene coverage of corner cases

---
 .../Online/TestSceneChangelogOverlay.cs       | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 42f822664f..eef2892290 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -109,19 +109,43 @@ namespace osu.Game.Tests.Visual.Online
                         Category = "osu!",
                         Title = "Fix thing",
                         MessageHtml = "Additional info goes here.",
+                        Repository = "osu",
+                        GithubPullRequestId = 11100,
+                        GithubUser = new APIChangelogUser
+                        {
+                            OsuUsername = "smoogipoo",
+                            UserId = 1040328
+                        }
                     },
                     new APIChangelogEntry
                     {
                         Type = ChangelogEntryType.Add,
                         Category = "osu!",
                         Title = "Add thing",
-                        Major = true
+                        Major = true,
+                        Repository = "ppy/osu-framework",
+                        GithubPullRequestId = 4444,
+                        GithubUser = new APIChangelogUser
+                        {
+                            DisplayName = "frenzibyte",
+                            GithubUrl = "https://github.com/frenzibyte"
+                        }
                     },
                     new APIChangelogEntry
                     {
                         Type = ChangelogEntryType.Misc,
                         Category = "Code quality",
-                        Title = "Clean up thing"
+                        Title = "Clean up thing",
+                        GithubUser = new APIChangelogUser
+                        {
+                            DisplayName = "some dude"
+                        }
+                    },
+                    new APIChangelogEntry
+                    {
+                        Type = ChangelogEntryType.Misc,
+                        Category = "Code quality",
+                        Title = "Clean up another thing"
                     }
                 }
             });

From 09b0a57290fe224f9a45bd759ae4c85856c3f518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 20:44:19 +0100
Subject: [PATCH 07246/10326] Schedule all of setup to avoid headless test fail

---
 osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index eef2892290..cd2c4e9346 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [SetUp]
-        public void SetUp()
+        public void SetUp() => Schedule(() =>
         {
             requestedBuild = null;
 
@@ -72,8 +72,8 @@ namespace osu.Game.Tests.Visual.Online
                 }
             };
 
-            Schedule(() => Child = changelog = new TestChangelogOverlay());
-        }
+            Child = changelog = new TestChangelogOverlay();
+        });
 
         [Test]
         public void ShowWithNoFetch()

From e0198c36aeebfddea645a9386a66a7439568d3d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 09:48:13 +0900
Subject: [PATCH 07247/10326] Fix user population happening in single file

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index e422e982ae..6d253d5992 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -108,8 +108,7 @@ namespace osu.Game.Online.Multiplayer
 
             Debug.Assert(Room != null);
 
-            foreach (var user in Room.Users)
-                await PopulateUser(user);
+            await Task.WhenAll(Room.Users.Select(PopulateUser));
 
             updateLocalRoomSettings(Room.Settings);
         }

From 5ce5b6cec06403b2bbbeea6864f97cf0ebca0bc0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 10:25:16 +0900
Subject: [PATCH 07248/10326] Fix non-safe thread access to room users on room
 join

---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 44 ++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 6d253d5992..ec0967df75 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -4,8 +4,10 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -108,7 +110,9 @@ namespace osu.Game.Online.Multiplayer
 
             Debug.Assert(Room != null);
 
-            await Task.WhenAll(Room.Users.Select(PopulateUser));
+            var users = getRoomUsers();
+
+            await Task.WhenAll(users.Select(PopulateUser));
 
             updateLocalRoomSettings(Room.Settings);
         }
@@ -122,13 +126,16 @@ namespace osu.Game.Online.Multiplayer
 
         public virtual Task LeaveRoom()
         {
-            if (Room == null)
-                return Task.CompletedTask;
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
 
-            apiRoom = null;
-            Room = null;
+                apiRoom = null;
+                Room = null;
 
-            Schedule(() => RoomChanged?.Invoke());
+                RoomChanged?.Invoke();
+            });
 
             return Task.CompletedTask;
         }
@@ -360,6 +367,31 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
         protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID);
 
+        /// <summary>
+        /// Retrieve a copy of users currently in the joined <see cref="Room"/> in a thread-safe manner.
+        /// This should be used whenever accessing users from outside of an Update thread context (ie. when not calling <see cref="Drawable.Schedule"/>).
+        /// </summary>
+        /// <returns>A copy of users in the current room, or null if unavailable.</returns>
+        private List<MultiplayerRoomUser>? getRoomUsers()
+        {
+            List<MultiplayerRoomUser>? users = null;
+
+            ManualResetEventSlim resetEvent = new ManualResetEventSlim();
+
+            // at some point we probably want to replace all these schedule calls with Room.LockForUpdate.
+            // for now, as this would require quite some consideration due to the number of accesses to the room instance,
+            // let's just to a schedule for the non-scheduled usages instead.
+            Schedule(() =>
+            {
+                users = Room?.Users.ToList();
+                resetEvent.Set();
+            });
+
+            resetEvent.Wait(100);
+
+            return users;
+        }
+
         /// <summary>
         /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
         /// </summary>

From f9900720d58e9b5e61f48f3a83643b8f2c11b88c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 10:48:55 +0900
Subject: [PATCH 07249/10326] Rename OnRoomChanged to OnRoomUpdated to avoid
 confusion

---
 .../Multiplayer/StatefulMultiplayerClient.cs     | 16 ++++++++--------
 .../Multiplayer/Match/MultiplayerReadyButton.cs  |  4 ++--
 .../Multiplayer/MultiplayerRoomComposite.cs      | 11 +++++++----
 .../Multiplayer/Participants/ParticipantPanel.cs |  4 ++--
 .../Multiplayer/Participants/ParticipantsList.cs |  4 ++--
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index ec0967df75..8839b79c13 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// Invoked when any change occurs to the multiplayer room.
         /// </summary>
-        public event Action? RoomChanged;
+        public event Action? RoomUpdated;
 
         /// <summary>
         /// Invoked when the multiplayer server requests the current beatmap to be loaded into play.
@@ -134,7 +134,7 @@ namespace osu.Game.Online.Multiplayer
                 apiRoom = null;
                 Room = null;
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
 
             return Task.CompletedTask;
@@ -214,7 +214,7 @@ namespace osu.Game.Online.Multiplayer
                         break;
                 }
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
 
             return Task.CompletedTask;
@@ -238,7 +238,7 @@ namespace osu.Game.Online.Multiplayer
 
                 Room.Users.Add(user);
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
         }
 
@@ -255,7 +255,7 @@ namespace osu.Game.Online.Multiplayer
                 Room.Users.Remove(user);
                 PlayingUsers.Remove(user.UserID);
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
 
             return Task.CompletedTask;
@@ -278,7 +278,7 @@ namespace osu.Game.Online.Multiplayer
                 Room.Host = user;
                 apiRoom.Host.Value = user?.User;
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
 
             return Task.CompletedTask;
@@ -305,7 +305,7 @@ namespace osu.Game.Online.Multiplayer
                 if (state != MultiplayerUserState.Playing)
                     PlayingUsers.Remove(userId);
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
 
             return Task.CompletedTask;
@@ -419,7 +419,7 @@ namespace osu.Game.Online.Multiplayer
                 // In-order for the client to not display an outdated beatmap, the playlist is forcefully cleared here.
                 apiRoom.Playlist.Clear();
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
 
                 var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
                 req.Success += res => updatePlaylist(settings, res);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 15d6ef8aff..975a2cf023 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -56,9 +56,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             sampleReadyCount = audio.Samples.Get(@"SongSelect/select-difficulty");
         }
 
-        protected override void OnRoomChanged()
+        protected override void OnRoomUpdated()
         {
-            base.OnRoomChanged();
+            base.OnRoomUpdated();
 
             localUser = Room?.Users.Single(u => u.User?.Id == api.LocalUser.Value.Id);
             button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
index ac608a13d4..8030107ad8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
@@ -19,18 +19,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            Client.RoomChanged += OnRoomChanged;
-            OnRoomChanged();
+            Client.RoomUpdated += OnRoomUpdated;
+            OnRoomUpdated();
         }
 
-        protected virtual void OnRoomChanged()
+        /// <summary>
+        /// Invoked when any change occurs to the multiplayer room.
+        /// </summary>
+        protected virtual void OnRoomUpdated()
         {
         }
 
         protected override void Dispose(bool isDisposing)
         {
             if (Client != null)
-                Client.RoomChanged -= OnRoomChanged;
+                Client.RoomUpdated -= OnRoomUpdated;
 
             base.Dispose(isDisposing);
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 044afa7445..de3069b2f6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -135,9 +135,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             };
         }
 
-        protected override void OnRoomChanged()
+        protected override void OnRoomUpdated()
         {
-            base.OnRoomChanged();
+            base.OnRoomUpdated();
 
             if (Room == null)
                 return;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
index b9ac096c4a..3759e45f18 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
@@ -36,9 +36,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             };
         }
 
-        protected override void OnRoomChanged()
+        protected override void OnRoomUpdated()
         {
-            base.OnRoomChanged();
+            base.OnRoomUpdated();
 
             if (Room == null)
                 panels.Clear();

From fe1bbb1cac671b65dca154784955314db434adbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 10:49:22 +0900
Subject: [PATCH 07250/10326] Don't fail if the local user is not present in
 room users when updating ready button state

---
 .../OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 975a2cf023..281e92404c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -60,7 +60,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             base.OnRoomUpdated();
 
-            localUser = Room?.Users.Single(u => u.User?.Id == api.LocalUser.Value.Id);
+            // this method is called on leaving the room, so the local user may not exist in the room any more.
+            localUser = Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
+
             button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open;
             updateState();
         }

From e7339d6959ba8c94fd76ec2e5f2d0e9da0f5074d Mon Sep 17 00:00:00 2001
From: Neuheit <38368299+Neuheit@users.noreply.github.com>
Date: Fri, 25 Dec 2020 21:07:33 -0500
Subject: [PATCH 07251/10326] fix(osu.Game): Ensure Category property is copied
 in Room.

---
 osu.Game/Online/Rooms/Room.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index 67f874cdc4..bb21971afa 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -130,6 +130,7 @@ namespace osu.Game.Online.Rooms
         {
             RoomID.Value = other.RoomID.Value;
             Name.Value = other.Name.Value;
+            Category.Value = other.Category.Value;
 
             if (other.Host.Value != null && Host.Value?.Id != other.Host.Value.Id)
                 Host.Value = other.Host.Value;

From ff57562956515a4895c6f50c0ec49746a2ad4963 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 11:34:05 +0900
Subject: [PATCH 07252/10326] Fix multiplayer leaderboard not unsubscribing
 from quit users

---
 ...TestSceneMultiplayerGameplayLeaderboard.cs |  5 +-
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 61 ++++++++++++++-----
 2 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index 8078c7b994..98a3ce9b47 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -20,11 +20,12 @@ using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Tests.Visual.Multiplayer;
 using osu.Game.Tests.Visual.Online;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneMultiplayerGameplayLeaderboard : OsuTestScene
+    public class TestSceneMultiplayerGameplayLeaderboard : MultiplayerTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
         private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(16);
@@ -47,7 +48,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [SetUpSteps]
-        public void SetUpSteps()
+        public override void SetUpSteps()
         {
             AddStep("create leaderboard", () =>
             {
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index c10ec9e004..ce6e19aea0 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -2,12 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Rulesets.Scoring;
 
@@ -18,10 +22,21 @@ namespace osu.Game.Screens.Play.HUD
     {
         private readonly ScoreProcessor scoreProcessor;
 
-        private readonly int[] userIds;
-
         private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
 
+        [Resolved]
+        private SpectatorStreamingClient streamingClient { get; set; }
+
+        [Resolved]
+        private StatefulMultiplayerClient multiplayerClient { get; set; }
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; }
+
+        private Bindable<ScoringMode> scoringMode;
+
+        private readonly BindableList<int> playingUsers;
+
         /// <summary>
         /// Construct a new leaderboard.
         /// </summary>
@@ -33,32 +48,24 @@ namespace osu.Game.Screens.Play.HUD
             this.scoreProcessor = scoreProcessor;
 
             // todo: this will likely be passed in as User instances.
-            this.userIds = userIds;
+            playingUsers = new BindableList<int>(userIds);
         }
 
-        [Resolved]
-        private SpectatorStreamingClient streamingClient { get; set; }
-
-        [Resolved]
-        private UserLookupCache userLookupCache { get; set; }
-
-        private Bindable<ScoringMode> scoringMode;
-
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, IAPIProvider api)
         {
             streamingClient.OnNewFrames += handleIncomingFrames;
 
-            foreach (var user in userIds)
+            foreach (var userId in playingUsers)
             {
-                streamingClient.WatchUser(user);
+                streamingClient.WatchUser(userId);
 
                 // probably won't be required in the final implementation.
-                var resolvedUser = userLookupCache.GetUserAsync(user).Result;
+                var resolvedUser = userLookupCache.GetUserAsync(userId).Result;
 
                 var trackedUser = new TrackedUserData();
 
-                userScores[user] = trackedUser;
+                userScores[userId] = trackedUser;
                 var leaderboardScore = AddPlayer(resolvedUser, resolvedUser.Id == api.LocalUser.Value.Id);
 
                 ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
@@ -70,6 +77,28 @@ namespace osu.Game.Screens.Play.HUD
             scoringMode.BindValueChanged(updateAllScores, true);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            playingUsers.BindCollectionChanged(usersChanged);
+            playingUsers.BindTo(multiplayerClient.PlayingUsers);
+        }
+
+        private void usersChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (var userId in e.OldItems.OfType<int>())
+                    {
+                        streamingClient.StopWatchingUser(userId);
+                    }
+
+                    break;
+            }
+        }
+
         private void updateAllScores(ValueChangedEvent<ScoringMode> mode)
         {
             foreach (var trackedData in userScores.Values)
@@ -91,7 +120,7 @@ namespace osu.Game.Screens.Play.HUD
 
             if (streamingClient != null)
             {
-                foreach (var user in userIds)
+                foreach (var user in playingUsers)
                 {
                     streamingClient.StopWatchingUser(user);
                 }

From 116acc2b5e073dc6578ad1169ce109a09bc76d24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 11:35:51 +0900
Subject: [PATCH 07253/10326] Add flow for marking user as quit for further
 handling

---
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index ce6e19aea0..a71c4685d9 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -93,6 +93,9 @@ namespace osu.Game.Screens.Play.HUD
                     foreach (var userId in e.OldItems.OfType<int>())
                     {
                         streamingClient.StopWatchingUser(userId);
+
+                        if (userScores.TryGetValue(userId, out var trackedData))
+                            trackedData.MarkUserQuit();
                     }
 
                     break;
@@ -143,11 +146,19 @@ namespace osu.Game.Screens.Play.HUD
 
             private readonly BindableInt currentCombo = new BindableInt();
 
+            public IBindable<bool> UserQuit => userQuit;
+
+            private readonly BindableBool userQuit = new BindableBool();
+
             [CanBeNull]
             public FrameHeader LastHeader;
 
+            public void MarkUserQuit() => userQuit.Value = true;
+
             public void UpdateScore(ScoreProcessor processor, ScoringMode mode)
             {
+                Debug.Assert(UserQuit.Value);
+
                 if (LastHeader == null)
                     return;
 

From 71dcbeaf7ce57eb0aae0cd72be4f3a74a2e505bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 11:43:10 +0900
Subject: [PATCH 07254/10326] Mark user as quit visually on the leaderboard

---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs    | 13 +++++++++++++
 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs      |  2 ++
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs      | 12 ++++++++++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 58281debf1..ed86f3241d 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Screens.Play.HUD
         public BindableDouble TotalScore { get; } = new BindableDouble();
         public BindableDouble Accuracy { get; } = new BindableDouble(1);
         public BindableInt Combo { get; } = new BindableInt();
+        public BindableBool HasQuit { get; } = new BindableBool();
 
         private int? scorePosition;
 
@@ -230,6 +231,15 @@ namespace osu.Game.Screens.Play.HUD
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
+            HasQuit.BindValueChanged(v =>
+            {
+                if (v.NewValue)
+                {
+                    // we will probably want to display this in a better way once we have a design.
+                    // and also show states other than quit.
+                    panelColour = Color4.Gray;
+                }
+            }, true);
         }
 
         protected override void LoadComplete()
@@ -244,6 +254,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updateColour()
         {
+            if (HasQuit.Value)
+                return;
+
             if (scorePosition == 1)
             {
                 mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, panel_transition_duration, Easing.OutElastic);
diff --git a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
index bc1a03c5aa..83b6f6621b 100644
--- a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
@@ -10,5 +10,7 @@ namespace osu.Game.Screens.Play.HUD
         BindableDouble TotalScore { get; }
         BindableDouble Accuracy { get; }
         BindableInt Combo { get; }
+
+        BindableBool HasQuit { get; }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index a71c4685d9..6b0ca4d74c 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -71,6 +71,7 @@ namespace osu.Game.Screens.Play.HUD
                 ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
                 ((IBindable<double>)leaderboardScore.TotalScore).BindTo(trackedUser.Score);
                 ((IBindable<int>)leaderboardScore.Combo).BindTo(trackedUser.CurrentCombo);
+                ((IBindable<bool>)leaderboardScore.HasQuit).BindTo(trackedUser.UserQuit);
             }
 
             scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
@@ -81,8 +82,15 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            playingUsers.BindCollectionChanged(usersChanged);
+            // BindableList handles binding in a really bad way (Clear then AddRange) so we need to do this manually..
+            foreach (int userId in playingUsers)
+            {
+                if (!multiplayerClient.PlayingUsers.Contains(userId))
+                    usersChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, new[] { userId }));
+            }
+
             playingUsers.BindTo(multiplayerClient.PlayingUsers);
+            playingUsers.BindCollectionChanged(usersChanged);
         }
 
         private void usersChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -157,7 +165,7 @@ namespace osu.Game.Screens.Play.HUD
 
             public void UpdateScore(ScoreProcessor processor, ScoringMode mode)
             {
-                Debug.Assert(UserQuit.Value);
+                Debug.Assert(!UserQuit.Value);
 
                 if (LastHeader == null)
                     return;

From 2599e95335a95ac8ae6b4a9685ac074432089a60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 12:11:19 +0900
Subject: [PATCH 07255/10326] Add test coverage

---
 .../TestSceneMultiplayerGameplayLeaderboard.cs      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index 98a3ce9b47..c214a34fe3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -27,8 +27,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneMultiplayerGameplayLeaderboard : MultiplayerTestScene
     {
+        private const int users = 16;
+
         [Cached(typeof(SpectatorStreamingClient))]
-        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(16);
+        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(users);
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
@@ -59,6 +61,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
 
+                Client.PlayingUsers.Clear();
+                Client.PlayingUsers.AddRange(streamingClient.PlayingUsers);
+
                 Children = new Drawable[]
                 {
                     scoreProcessor = new OsuScoreProcessor(),
@@ -82,6 +87,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 100);
         }
 
+        [Test]
+        public void TestUserQuit()
+        {
+            AddRepeatStep("mark user quit", () => Client.PlayingUsers.RemoveAt(0), users);
+        }
+
         public class TestMultiplayerStreaming : SpectatorStreamingClient
         {
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;

From 966a2151e3c2af58e9cdb506ffe8637dc5ce9fe3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 17:55:24 +0900
Subject: [PATCH 07256/10326] Ensure the previous leaderboard is removed

---
 .../Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index c214a34fe3..975c54c3f6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -54,6 +54,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create leaderboard", () =>
             {
+                leaderboard?.Expire();
+
                 OsuScoreProcessor scoreProcessor;
                 Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
 

From dae27fefe433cefe70b1eb69be65e62b6c1f689b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 10:59:14 +0100
Subject: [PATCH 07257/10326] Run user list copy inline if possible

`getRoomUsers()` was not safe to call from the update thread, as
evidenced by the test failures. This was due to the fact that the added
reset event could never actually be set from within the method, as the
wait was blocking the scheduled set from ever proceeding.

Resolve by allowing the scheduled copy & set to run inline if on the
update thread already.
---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index ec0967df75..06ed4b4a6c 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -380,12 +380,12 @@ namespace osu.Game.Online.Multiplayer
 
             // at some point we probably want to replace all these schedule calls with Room.LockForUpdate.
             // for now, as this would require quite some consideration due to the number of accesses to the room instance,
-            // let's just to a schedule for the non-scheduled usages instead.
-            Schedule(() =>
+            // let's just add a manual schedule for the non-scheduled usages instead.
+            Scheduler.Add(() =>
             {
                 users = Room?.Users.ToList();
                 resetEvent.Set();
-            });
+            }, false);
 
             resetEvent.Wait(100);
 

From 04d54c40dbdc65f08975f1ca065ddd4ca1b67d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 11:58:25 +0100
Subject: [PATCH 07258/10326] Allow all StatefulMultiplayerClient schedules to
 run inline

Fixes test failures due to not allowing to do so, therefore inverting
execution order in some cases - for example, calling

        JoinRoom(room);
        LeaveRoom();

on the update thread would invert execution order due to the first being
unscheduled but the second being scheduled.
---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 06ed4b4a6c..98b53e723c 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Online.Multiplayer
 
         public virtual Task LeaveRoom()
         {
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -135,7 +135,7 @@ namespace osu.Game.Online.Multiplayer
                 Room = null;
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -190,7 +190,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -215,7 +215,7 @@ namespace osu.Game.Online.Multiplayer
                 }
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -227,7 +227,7 @@ namespace osu.Game.Online.Multiplayer
 
             await PopulateUser(user);
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -239,7 +239,7 @@ namespace osu.Game.Online.Multiplayer
                 Room.Users.Add(user);
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
         }
 
         Task IMultiplayerClient.UserLeft(MultiplayerRoomUser user)
@@ -247,7 +247,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -256,7 +256,7 @@ namespace osu.Game.Online.Multiplayer
                 PlayingUsers.Remove(user.UserID);
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -266,7 +266,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -279,7 +279,7 @@ namespace osu.Game.Online.Multiplayer
                 apiRoom.Host.Value = user?.User;
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -295,7 +295,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -306,7 +306,7 @@ namespace osu.Game.Online.Multiplayer
                     PlayingUsers.Remove(userId);
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -316,13 +316,13 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
 
                 LoadRequested?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -332,7 +332,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -340,7 +340,7 @@ namespace osu.Game.Online.Multiplayer
                 PlayingUsers.AddRange(Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID));
 
                 MatchStarted?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -350,13 +350,13 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
 
                 ResultsReady?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -404,7 +404,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -425,7 +425,7 @@ namespace osu.Game.Online.Multiplayer
                 req.Success += res => updatePlaylist(settings, res);
 
                 api.Queue(req);
-            });
+            }, false);
         }
 
         private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)

From b9d725ab4928c0385b63da2d5ed5496b0faee21a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 20:13:28 +0900
Subject: [PATCH 07259/10326] Don't copy spotlight category

---
 osu.Game/Online/Rooms/Room.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index bb21971afa..763ba25d52 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -130,7 +130,9 @@ namespace osu.Game.Online.Rooms
         {
             RoomID.Value = other.RoomID.Value;
             Name.Value = other.Name.Value;
-            Category.Value = other.Category.Value;
+
+            if (other.Category.Value != RoomCategory.Spotlight)
+                Category.Value = other.Category.Value;
 
             if (other.Host.Value != null && Host.Value?.Id != other.Host.Value.Id)
                 Host.Value = other.Host.Value;

From 0b42b4b95598dcb067a4d06b4b734a0e468204c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 13:54:10 +0100
Subject: [PATCH 07260/10326] Rename {Drawable -> Clickable}Avatar

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs           | 4 ++--
 osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs       | 4 ++--
 .../Drawables/{DrawableAvatar.cs => ClickableAvatar.cs}    | 7 ++++---
 osu.Game/Users/Drawables/UpdateableAvatar.cs               | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename osu.Game/Users/Drawables/{DrawableAvatar.cs => ClickableAvatar.cs} (90%)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index d8207aa8f4..5608002513 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Online.Leaderboards
 
             statisticsLabels = GetStatistics(score).Select(s => new ScoreComponentLabel(s)).ToList();
 
-            DrawableAvatar innerAvatar;
+            ClickableAvatar innerAvatar;
 
             Children = new Drawable[]
             {
@@ -115,7 +115,7 @@ namespace osu.Game.Online.Leaderboards
                             Children = new[]
                             {
                                 avatar = new DelayedLoadWrapper(
-                                    innerAvatar = new DrawableAvatar(user)
+                                    innerAvatar = new ClickableAvatar(user)
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         CornerRadius = corner_radius,
diff --git a/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs b/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs
index 5b428a3825..00f46b0035 100644
--- a/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs
+++ b/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             if (value.Type != ChannelType.PM)
                 throw new ArgumentException("Argument value needs to have the targettype user!");
 
-            DrawableAvatar avatar;
+            ClickableAvatar avatar;
 
             AddRange(new Drawable[]
             {
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Chat.Tabs
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Masking = true,
-                            Child = new DelayedLoadWrapper(avatar = new DrawableAvatar(value.Users.First())
+                            Child = new DelayedLoadWrapper(avatar = new ClickableAvatar(value.Users.First())
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 OpenOnClick = { Value = false },
diff --git a/osu.Game/Users/Drawables/DrawableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
similarity index 90%
rename from osu.Game/Users/Drawables/DrawableAvatar.cs
rename to osu.Game/Users/Drawables/ClickableAvatar.cs
index 42d2dbb1c6..61af2d8e27 100644
--- a/osu.Game/Users/Drawables/DrawableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.Containers;
 namespace osu.Game.Users.Drawables
 {
     [LongRunningLoad]
-    public class DrawableAvatar : Container
+    public class ClickableAvatar : Container
     {
         /// <summary>
         /// Whether to open the user's profile when clicked.
@@ -27,10 +27,11 @@ namespace osu.Game.Users.Drawables
         private OsuGame game { get; set; }
 
         /// <summary>
-        /// An avatar for specified user.
+        /// A clickable avatar for specified user, with UI sounds included.
+        /// If <see cref="OpenOnClick"/> is <c>true</c>, clicking will open the user's profile.
         /// </summary>
         /// <param name="user">The user. A null value will get a placeholder avatar.</param>
-        public DrawableAvatar(User user = null)
+        public ClickableAvatar(User user = null)
         {
             this.user = user;
         }
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index 171462f3fc..4772207edf 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Users.Drawables
             if (user == null && !ShowGuestOnNull)
                 return null;
 
-            var avatar = new DrawableAvatar(user)
+            var avatar = new ClickableAvatar(user)
             {
                 RelativeSizeAxes = Axes.Both,
             };

From e8f96b24013827b5c173159b960a0443d18ee87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 14:02:53 +0100
Subject: [PATCH 07261/10326] Bring back DrawableAvatar as a simple sprite

---
 osu.Game/Users/Drawables/ClickableAvatar.cs | 22 ++----------
 osu.Game/Users/Drawables/DrawableAvatar.cs  | 39 +++++++++++++++++++++
 2 files changed, 42 insertions(+), 19 deletions(-)
 create mode 100644 osu.Game/Users/Drawables/DrawableAvatar.cs

diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index 61af2d8e27..0fca9c7c9b 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -1,19 +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;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Users.Drawables
 {
-    [LongRunningLoad]
     public class ClickableAvatar : Container
     {
         /// <summary>
@@ -27,7 +24,7 @@ namespace osu.Game.Users.Drawables
         private OsuGame game { get; set; }
 
         /// <summary>
-        /// A clickable avatar for specified user, with UI sounds included.
+        /// A clickable avatar for the specified user, with UI sounds included.
         /// If <see cref="OpenOnClick"/> is <c>true</c>, clicking will open the user's profile.
         /// </summary>
         /// <param name="user">The user. A null value will get a placeholder avatar.</param>
@@ -39,28 +36,15 @@ namespace osu.Game.Users.Drawables
         [BackgroundDependencyLoader]
         private void load(LargeTextureStore textures)
         {
-            if (textures == null)
-                throw new ArgumentNullException(nameof(textures));
-
-            Texture texture = null;
-            if (user != null && user.Id > 1) texture = textures.Get($@"https://a.ppy.sh/{user.Id}");
-            texture ??= textures.Get(@"Online/avatar-guest");
-
             ClickableArea clickableArea;
             Add(clickableArea = new ClickableArea
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = new Sprite
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Texture = texture,
-                    FillMode = FillMode.Fit,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
-                },
                 Action = openProfile
             });
 
+            LoadComponentAsync(new DrawableAvatar(user), clickableArea.Add);
+
             clickableArea.Enabled.BindTo(OpenOnClick);
         }
 
diff --git a/osu.Game/Users/Drawables/DrawableAvatar.cs b/osu.Game/Users/Drawables/DrawableAvatar.cs
new file mode 100644
index 0000000000..81f6ad52d9
--- /dev/null
+++ b/osu.Game/Users/Drawables/DrawableAvatar.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Users.Drawables
+{
+    [LongRunningLoad]
+    public class DrawableAvatar : Sprite
+    {
+        private readonly User user;
+
+        /// <summary>
+        /// A simple, non-interactable avatar sprite for the specified user.
+        /// </summary>
+        /// <param name="user">The user. A null value will get a placeholder avatar.</param>
+        public DrawableAvatar(User user = null)
+        {
+            this.user = user;
+
+            RelativeSizeAxes = Axes.Both;
+            FillMode = FillMode.Fit;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(LargeTextureStore textures)
+        {
+            if (user != null && user.Id > 1)
+                Texture = textures.Get($@"https://a.ppy.sh/{user.Id}");
+
+            Texture ??= textures.Get(@"Online/avatar-guest");
+        }
+    }
+}

From 8ec7970b6ab10a028d4066571255587e95baf29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 14:06:09 +0100
Subject: [PATCH 07262/10326] Move load-complete fade specification inside

---
 osu.Game/Users/Drawables/DrawableAvatar.cs   | 6 ++++++
 osu.Game/Users/Drawables/UpdateableAvatar.cs | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Users/Drawables/DrawableAvatar.cs b/osu.Game/Users/Drawables/DrawableAvatar.cs
index 81f6ad52d9..3dae3afe3f 100644
--- a/osu.Game/Users/Drawables/DrawableAvatar.cs
+++ b/osu.Game/Users/Drawables/DrawableAvatar.cs
@@ -35,5 +35,11 @@ namespace osu.Game.Users.Drawables
 
             Texture ??= textures.Get(@"Online/avatar-guest");
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            this.FadeInFromZero(300, Easing.OutQuint);
+        }
     }
 }
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index 4772207edf..927e48cb56 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -70,7 +70,6 @@ namespace osu.Game.Users.Drawables
                 RelativeSizeAxes = Axes.Both,
             };
 
-            avatar.OnLoadComplete += d => d.FadeInFromZero(300, Easing.OutQuint);
             avatar.OpenOnClick.BindTo(OpenOnClick);
 
             return avatar;

From 15948de2f0cbe1c64abf0b6a4a9fba813c047a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 14:06:23 +0100
Subject: [PATCH 07263/10326] Fix gameplay leaderboard avatars being clickable

---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 58281debf1..51b19a8d45 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -78,6 +78,8 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
+            Container avatarContainer;
+
             InternalChildren = new Drawable[]
             {
                 mainFillContainer = new Container
@@ -152,7 +154,7 @@ namespace osu.Game.Screens.Play.HUD
                                         Spacing = new Vector2(4f, 0f),
                                         Children = new Drawable[]
                                         {
-                                            new CircularContainer
+                                            avatarContainer = new CircularContainer
                                             {
                                                 Masking = true,
                                                 Anchor = Anchor.CentreLeft,
@@ -166,11 +168,7 @@ namespace osu.Game.Screens.Play.HUD
                                                         Alpha = 0.3f,
                                                         RelativeSizeAxes = Axes.Both,
                                                         Colour = colours.Gray4,
-                                                    },
-                                                    new UpdateableAvatar(User)
-                                                    {
-                                                        RelativeSizeAxes = Axes.Both,
-                                                    },
+                                                    }
                                                 }
                                             },
                                             usernameText = new OsuSpriteText
@@ -227,6 +225,8 @@ namespace osu.Game.Screens.Play.HUD
                 }
             };
 
+            LoadComponentAsync(new DrawableAvatar(User), avatarContainer.Add);
+
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);

From 9e15dccc56bfcdde0f36a6c15db413faff07b06b Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 26 Dec 2020 15:36:21 +0100
Subject: [PATCH 07264/10326] Move graceful exit to OsuGameBase

---
 osu.Game/OsuGame.cs     | 12 ------------
 osu.Game/OsuGameBase.cs | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index bb638bcf3a..710dfd7031 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -918,18 +918,6 @@ namespace osu.Game
             return base.OnExiting();
         }
 
-        /// <summary>
-        /// Use to programatically exit the game as if the user was triggering via alt-f4.
-        /// Will keep persisting until an exit occurs (exit may be blocked multiple times).
-        /// </summary>
-        public void GracefullyExit()
-        {
-            if (!OnExiting())
-                Exit();
-            else
-                Scheduler.AddDelayed(GracefullyExit, 2000);
-        }
-
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e7b5d3304d..91ab2bdc1e 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -368,6 +368,18 @@ namespace osu.Game
             LocalConfig ??= new OsuConfigManager(Storage);
         }
 
+        /// <summary>
+        /// Use to programatically exit the game as if the user was triggering via alt-f4.
+        /// Will keep persisting until an exit occurs (exit may be blocked multiple times).
+        /// </summary>
+        public void GracefullyExit()
+        {
+            if (!OnExiting())
+                Exit();
+            else
+                Scheduler.AddDelayed(GracefullyExit, 2000);
+        }
+
         protected override Storage CreateStorage(GameHost host, Storage defaultStorage) => new OsuStorage(host, defaultStorage);
 
         private readonly List<ICanAcceptFiles> fileImporters = new List<ICanAcceptFiles>();

From 8e428353ee0ae94e7efd7995ddbd01317842b7f7 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 26 Dec 2020 15:44:59 +0100
Subject: [PATCH 07265/10326] Revise TournamentSwitcher to include a close
 button

---
 osu.Game.Tournament/Screens/SetupScreen.cs | 44 ++++++++++++++++++----
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 3c9d3c949b..de3321397e 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        [Resolved]
+        private TournamentGameBase game { get; set; }
+
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
@@ -68,9 +71,6 @@ namespace osu.Game.Tournament.Screens
             reload();
         }
 
-        [Resolved]
-        private Framework.Game game { get; set; }
-
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
@@ -115,12 +115,14 @@ namespace osu.Game.Tournament.Screens
                     Items = rulesets.AvailableRulesets,
                     Current = LadderInfo.Ruleset,
                 },
-                new LabelledDropdown<string>
+                new TournamentSwitcher
                 {
                     Label = "Current tournament",
                     Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart to apply changes.",
                     Items = storage.ListTournaments(),
                     Current = storage.CurrentTournament,
+                    ButtonText = "Close osu!",
+                    Action = () => game.GracefullyExit()
                 },
                 resolution = new ResolutionSelector
                 {
@@ -165,7 +167,7 @@ namespace osu.Game.Tournament.Screens
 
         private class ActionableInfo : LabelledDrawable<Drawable>
         {
-            private OsuButton button;
+            protected OsuButton Button;
 
             public ActionableInfo()
                 : base(true)
@@ -174,7 +176,7 @@ namespace osu.Game.Tournament.Screens
 
             public string ButtonText
             {
-                set => button.Text = value;
+                set => Button.Text = value;
             }
 
             public string Value
@@ -211,7 +213,7 @@ namespace osu.Game.Tournament.Screens
                         Spacing = new Vector2(10, 0),
                         Children = new Drawable[]
                         {
-                            button = new TriangleButton
+                            Button = new TriangleButton
                             {
                                 Size = new Vector2(100, 40),
                                 Action = () => Action?.Invoke()
@@ -222,6 +224,34 @@ namespace osu.Game.Tournament.Screens
             };
         }
 
+        private class TournamentSwitcher : ActionableInfo
+        {
+            private OsuDropdown<string> dropdown;
+
+            public IEnumerable<string> Items
+            {
+                get => dropdown.Items;
+                set => dropdown.Items = value;
+            }
+
+            public Bindable<string> Current
+            {
+                get => dropdown.Current;
+                set => dropdown.Current = value;
+            }
+
+            protected override Drawable CreateComponent()
+            {
+                var drawable = base.CreateComponent();
+                FlowContainer.Insert(-1, dropdown = new OsuDropdown<string>
+                {
+                    Width = 510
+                });
+
+                return drawable;
+            }
+        }
+
         private class ResolutionSelector : ActionableInfo
         {
             private const int minimum_window_height = 480;

From 43f8f3638a9550a0d2d14d827ef3ee53f552f4e3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 27 Dec 2020 02:42:13 +0300
Subject: [PATCH 07266/10326] Fix mod using reference equality unless casted to
 `IMod`

---
 osu.Game/Online/API/APIMod.cs  | 4 ++--
 osu.Game/Rulesets/Mods/IMod.cs | 3 +--
 osu.Game/Rulesets/Mods/Mod.cs  | 4 ++--
 osu.Game/Scoring/ScoreInfo.cs  | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 780e5daa16..f4e0e1b11f 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Online.API
 {
-    public class APIMod : IMod
+    public class APIMod : IMod, IEquatable<APIMod>
     {
         [JsonProperty("acronym")]
         public string Acronym { get; set; }
@@ -52,7 +52,7 @@ namespace osu.Game.Online.API
             return resultMod;
         }
 
-        public bool Equals(IMod other) => Acronym == other?.Acronym;
+        public bool Equals(APIMod other) => Acronym == other?.Acronym;
 
         public override string ToString()
         {
diff --git a/osu.Game/Rulesets/Mods/IMod.cs b/osu.Game/Rulesets/Mods/IMod.cs
index a5e19f293c..448ad0eb30 100644
--- a/osu.Game/Rulesets/Mods/IMod.cs
+++ b/osu.Game/Rulesets/Mods/IMod.cs
@@ -1,12 +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 Newtonsoft.Json;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public interface IMod : IEquatable<IMod>
+    public interface IMod
     {
         /// <summary>
         /// The shortened name of this mod.
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b8dc7a2661..33550e070b 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mods
     /// The base class for gameplay modifiers.
     /// </summary>
     [ExcludeFromDynamicCompile]
-    public abstract class Mod : IMod, IJsonSerializable
+    public abstract class Mod : IMod, IEquatable<Mod>, IJsonSerializable
     {
         /// <summary>
         /// The name of this mod.
@@ -149,6 +149,6 @@ namespace osu.Game.Rulesets.Mods
             return copy;
         }
 
-        public bool Equals(IMod other) => GetType() == other?.GetType();
+        public bool Equals(Mod other) => GetType() == other?.GetType();
     }
 }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index f5192f3a40..59eaa994c2 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -252,11 +252,11 @@ namespace osu.Game.Scoring
         }
 
         [Serializable]
-        protected class DeserializedMod : IMod
+        protected class DeserializedMod : IMod, IEquatable<DeserializedMod>
         {
             public string Acronym { get; set; }
 
-            public bool Equals(IMod other) => Acronym == other?.Acronym;
+            public bool Equals(DeserializedMod other) => Acronym == other?.Acronym;
         }
 
         public override string ToString() => $"{User} playing {Beatmap}";

From fa0576f47f05faa4631e7a00a5a50b4c50d38eb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 27 Dec 2020 13:40:02 +0900
Subject: [PATCH 07267/10326] Move quit colour change implementation to
 updateColour for better coverage

---
 .../Play/HUD/GameplayLeaderboardScore.cs        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index ed86f3241d..4aeb65bb01 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -231,15 +231,7 @@ namespace osu.Game.Screens.Play.HUD
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
-            HasQuit.BindValueChanged(v =>
-            {
-                if (v.NewValue)
-                {
-                    // we will probably want to display this in a better way once we have a design.
-                    // and also show states other than quit.
-                    panelColour = Color4.Gray;
-                }
-            }, true);
+            HasQuit.BindValueChanged(v => updateColour());
         }
 
         protected override void LoadComplete()
@@ -255,7 +247,14 @@ namespace osu.Game.Screens.Play.HUD
         private void updateColour()
         {
             if (HasQuit.Value)
+            {
+                // we will probably want to display this in a better way once we have a design.
+                // and also show states other than quit.
+                mainFillContainer.ResizeWidthTo(regular_width, panel_transition_duration, Easing.OutElastic);
+                panelColour = Color4.Gray;
+                textColour = Color4.White;
                 return;
+            }
 
             if (scorePosition == 1)
             {

From d14a8d24b5c3cb7669a3b7537ba69820aa1e0fa4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 27 Dec 2020 16:42:20 +0900
Subject: [PATCH 07268/10326] Remove assert for now

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

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 6b0ca4d74c..42df0cfe8c 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -165,8 +165,6 @@ namespace osu.Game.Screens.Play.HUD
 
             public void UpdateScore(ScoreProcessor processor, ScoringMode mode)
             {
-                Debug.Assert(!UserQuit.Value);
-
                 if (LastHeader == null)
                     return;
 

From 1b34f2115f6ef323aa66bf07d3e0b7ac05e76606 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 27 Dec 2020 16:57:23 +0900
Subject: [PATCH 07269/10326] Remove dignostics using

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 42df0cfe8c..00e2b8bfa7 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;

From 6b6b1514e2b7b2249db579297cfe94aa44a8b52d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 27 Dec 2020 12:58:37 +0100
Subject: [PATCH 07270/10326] Rename method to be less misleading

As it doesn't only change colour, but also width.
---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 4aeb65bb01..1bd279922c 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Play.HUD
                     positionText.Text = $"#{scorePosition.Value.FormatRank()}";
 
                 positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
-                updateColour();
+                updateState();
             }
         }
 
@@ -231,20 +231,20 @@ namespace osu.Game.Screens.Play.HUD
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
-            HasQuit.BindValueChanged(v => updateColour());
+            HasQuit.BindValueChanged(v => updateState());
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            updateColour();
+            updateState();
             FinishTransforms(true);
         }
 
         private const double panel_transition_duration = 500;
 
-        private void updateColour()
+        private void updateState()
         {
             if (HasQuit.Value)
             {

From f75dccc9e4872477c66a484ddc13ef943511e43f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 27 Dec 2020 13:00:27 +0100
Subject: [PATCH 07271/10326] Explicitly use discard in value changed callback

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 1bd279922c..43e259695e 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Screens.Play.HUD
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
-            HasQuit.BindValueChanged(v => updateState());
+            HasQuit.BindValueChanged(_ => updateState());
         }
 
         protected override void LoadComplete()

From e9e0e18dc53a83c18c6aff7a2aac27b92445c1cb Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 27 Dec 2020 14:11:30 +0100
Subject: [PATCH 07272/10326] Fix missed change in merge conflict...

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index c397608bc6..7f2ef82d12 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -54,7 +54,7 @@ namespace osu.Android
             {
                 case Intent.ActionDefault:
                     if (intent.Scheme == ContentResolver.SchemeContent)
-                        handleImportFromUri(intent.Data);
+                        handleImportFromUris(intent.Data);
                     else if (osu_url_schemes.Contains(intent.Scheme))
                         game.HandleLink(intent.DataString);
                     break;

From 4d61c143db058bcc47bac98490dbaa246e873872 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 14:56:29 +0900
Subject: [PATCH 07273/10326] Fix lookup cache throwing a null reference if no
 matches were successful

---
 osu.Game/Database/UserLookupCache.cs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index 05d6930992..e7ddf4c567 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -72,6 +72,7 @@ namespace osu.Game.Database
             var request = new GetUsersRequest(userTasks.Keys.ToArray());
 
             // rather than queueing, we maintain our own single-threaded request stream.
+            // todo: we probably want retry logic here.
             api.Perform(request);
 
             // Create a new request task if there's still more users to query.
@@ -82,14 +83,19 @@ namespace osu.Game.Database
                     createNewTask();
             }
 
-            foreach (var user in request.Result.Users)
-            {
-                if (userTasks.TryGetValue(user.Id, out var tasks))
-                {
-                    foreach (var task in tasks)
-                        task.SetResult(user);
+            List<User> foundUsers = request.Result?.Users;
 
-                    userTasks.Remove(user.Id);
+            if (foundUsers != null)
+            {
+                foreach (var user in foundUsers)
+                {
+                    if (userTasks.TryGetValue(user.Id, out var tasks))
+                    {
+                        foreach (var task in tasks)
+                            task.SetResult(user);
+
+                        userTasks.Remove(user.Id);
+                    }
                 }
             }
 

From 046a76cb1d1597414ae08e9e47a2dfa1dcac8e09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 14:56:53 +0900
Subject: [PATCH 07274/10326] Allow null users to still be displayed in the
 participant list

The fix here is correcting the access of `user.Country`. The deicision
to have null users display is because this is the best we can do (if
osu-web could not resolve the user). We still want the users in the
lobby to be aware of this user's presence, rather than hiding them from
view.

osu-stable does a similar thing, showing these users as `[Loading]`. I
decided to go with blank names instead because having *any* text there
causes confusion. We can iterate on this in future design updates.
---
 .../TestSceneMultiplayerParticipantsList.cs         | 10 ++++++++++
 .../Multiplayer/Participants/ParticipantPanel.cs    | 13 ++++++-------
 .../Visual/Multiplayer/TestMultiplayerClient.cs     |  2 ++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 9181170bee..968a869532 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -43,6 +43,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("two unique panels", () => this.ChildrenOfType<ParticipantPanel>().Select(p => p.User).Distinct().Count() == 2);
         }
 
+        [Test]
+        public void TestAddNullUser()
+        {
+            AddAssert("one unique panel", () => this.ChildrenOfType<ParticipantPanel>().Select(p => p.User).Distinct().Count() == 1);
+
+            AddStep("add non-resolvable user", () => Client.AddNullUser(-3));
+
+            AddUntilStep("two unique panels", () => this.ChildrenOfType<ParticipantPanel>().Select(p => p.User).Distinct().Count() == 2);
+        }
+
         [Test]
         public void TestRemoveUser()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index de3069b2f6..f99655e305 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -45,7 +44,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
         [BackgroundDependencyLoader]
         private void load()
         {
-            Debug.Assert(User.User != null);
+            var user = User.User;
 
             var backgroundColour = Color4Extensions.FromHex("#33413C");
 
@@ -82,7 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                 Origin = Anchor.CentreRight,
                                 RelativeSizeAxes = Axes.Both,
                                 Width = 0.75f,
-                                User = User.User,
+                                User = user,
                                 Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0), Color4.White.Opacity(0.25f))
                             },
                             new FillFlowContainer
@@ -98,28 +97,28 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                         Origin = Anchor.CentreLeft,
                                         RelativeSizeAxes = Axes.Both,
                                         FillMode = FillMode.Fit,
-                                        User = User.User
+                                        User = user
                                     },
                                     new UpdateableFlag
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
                                         Size = new Vector2(30, 20),
-                                        Country = User.User.Country
+                                        Country = user?.Country
                                     },
                                     new OsuSpriteText
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
                                         Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 18),
-                                        Text = User.User.Username
+                                        Text = user?.Username
                                     },
                                     new OsuSpriteText
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
                                         Font = OsuFont.GetFont(size: 14),
-                                        Text = User.User.CurrentModeRank != null ? $"#{User.User.CurrentModeRank}" : string.Empty
+                                        Text = user?.CurrentModeRank != null ? $"#{user.CurrentModeRank}" : string.Empty
                                     }
                                 }
                             },
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 9a839c8d22..2ce5211757 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public void AddUser(User user) => ((IMultiplayerClient)this).UserJoined(new MultiplayerRoomUser(user.Id) { User = user });
 
+        public void AddNullUser(int userId) => ((IMultiplayerClient)this).UserJoined(new MultiplayerRoomUser(userId));
+
         public void RemoveUser(User user)
         {
             Debug.Assert(Room != null);

From bdbc210f6d6cbea01a5d8106b31c34be5c43955c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 16:51:45 +0900
Subject: [PATCH 07275/10326] Update fastlane and dependencies

---
 Gemfile.lock | 56 +++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a4b49af7e4..8ac863c9a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,27 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
+    CFPropertyList (3.0.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
-    aws-partitions (1.354.0)
-    aws-sdk-core (3.104.3)
+    aws-partitions (1.413.0)
+    aws-sdk-core (3.110.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kms (1.40.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.78.0)
-      aws-sdk-core (~> 3, >= 3.104.3)
+    aws-sdk-s3 (1.87.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.1)
+    aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    babosa (1.0.3)
+    babosa (1.0.4)
     claide (1.0.3)
     colored (1.2)
     colored2 (3.1.2)
@@ -29,22 +29,23 @@ GEM
       highline (~> 1.7.2)
     declarative (0.0.20)
     declarative-option (0.1.0)
-    digest-crc (0.6.1)
-      rake (~> 13.0)
+    digest-crc (0.6.3)
+      rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    emoji_regex (3.0.0)
-    excon (0.76.0)
-    faraday (1.0.1)
+    emoji_regex (3.2.1)
+    excon (0.78.1)
+    faraday (1.2.0)
       multipart-post (>= 1.2, < 3)
-    faraday-cookie_jar (0.0.6)
-      faraday (>= 0.7.4)
+      ruby2_keywords
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    fastimage (2.2.0)
-    fastlane (2.156.0)
+    fastimage (2.2.1)
+    fastlane (2.170.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       aws-sdk-s3 (~> 1.0)
@@ -96,17 +97,17 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.3)
+    google-cloud-env (1.4.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.1)
-    google-cloud-storage (1.27.0)
+    google-cloud-storage (1.29.2)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.13.1)
+    googleauth (0.14.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -118,10 +119,10 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.4.0)
-    json (2.3.1)
-    jwt (2.2.1)
+    json (2.5.1)
+    jwt (2.2.2)
     memoist (0.16.2)
-    mini_magick (4.10.1)
+    mini_magick (4.11.0)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     multi_json (1.15.0)
@@ -132,14 +133,15 @@ GEM
       mini_portile2 (~> 2.4.0)
     os (1.1.1)
     plist (3.5.0)
-    public_suffix (4.0.5)
-    rake (13.0.1)
+    public_suffix (4.0.6)
+    rake (13.0.3)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
+    ruby2_keywords (0.0.2)
     rubyzip (2.3.0)
     security (0.1.3)
     signet (0.14.0)
@@ -168,7 +170,7 @@ GEM
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.18.0)
+    xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

From 2e3537e9664d24dbb6f5fec80e0c9a3e42cb1664 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 16:52:54 +0900
Subject: [PATCH 07276/10326] 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 fc01f9bf1d..cd2ce58c55 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1222.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1228.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cbf9f6f1bd..3e1b56c29c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1222.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1228.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index adbcc0ef1c..85ba0590ea 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.Framework.iOS" Version="2020.1222.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1228.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1222.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1228.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 5ca9a6a98018544d67f61ef1912596084a70999a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:05:48 +0900
Subject: [PATCH 07277/10326] Add xmldoc on UserLookupCache's lookup method

---
 osu.Game/Database/UserLookupCache.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index 05d6930992..8a99e27708 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -17,6 +17,12 @@ namespace osu.Game.Database
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        /// <summary>
+        /// Perform an API lookup on the specified user, populating a <see cref="User"/> model.
+        /// </summary>
+        /// <param name="userId">The user to lookup.</param>
+        /// <param name="token">An optional cancellation token.</param>
+        /// <returns>The populated user, or null if the user does not exist or the request could not be satisfied.</returns>
         public Task<User> GetUserAsync(int userId, CancellationToken token = default) => GetAsync(userId, token);
 
         protected override async Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)

From 545dcac4ec0950f2ade486c55a88f9f39b1802ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:13:24 +0900
Subject: [PATCH 07278/10326] Add null hinting on UserLookupCache query method

---
 osu.Game/Database/UserLookupCache.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index 8a99e27708..49ea82a4fe 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -23,6 +24,7 @@ namespace osu.Game.Database
         /// <param name="userId">The user to lookup.</param>
         /// <param name="token">An optional cancellation token.</param>
         /// <returns>The populated user, or null if the user does not exist or the request could not be satisfied.</returns>
+        [ItemCanBeNull]
         public Task<User> GetUserAsync(int userId, CancellationToken token = default) => GetAsync(userId, token);
 
         protected override async Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)

From 447a55ce11cf144eddc85dea8e37d99c2dbb46e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:16:53 +0900
Subject: [PATCH 07279/10326] Fix incorrect null handling in
 GameplayLeaderboard

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs       | 6 ++++--
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 83b70911c6..cb20deb272 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -56,6 +57,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        [CanBeNull]
         public User User { get; }
 
         private readonly bool trackedPlayer;
@@ -68,7 +70,7 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         /// <param name="user">The score's player.</param>
         /// <param name="trackedPlayer">Whether the player is the local user or a replay player.</param>
-        public GameplayLeaderboardScore(User user, bool trackedPlayer)
+        public GameplayLeaderboardScore([CanBeNull] User user, bool trackedPlayer)
         {
             User = user;
             this.trackedPlayer = trackedPlayer;
@@ -180,7 +182,7 @@ namespace osu.Game.Screens.Play.HUD
                                                 Origin = Anchor.CentreLeft,
                                                 Colour = Color4.White,
                                                 Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
-                                                Text = User.Username,
+                                                Text = User?.Username,
                                                 Truncate = true,
                                                 Shadow = false,
                                             }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 00e2b8bfa7..e7e5459f76 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Play.HUD
                 var trackedUser = new TrackedUserData();
 
                 userScores[userId] = trackedUser;
-                var leaderboardScore = AddPlayer(resolvedUser, resolvedUser.Id == api.LocalUser.Value.Id);
+                var leaderboardScore = AddPlayer(resolvedUser, resolvedUser?.Id == api.LocalUser.Value.Id);
 
                 ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
                 ((IBindable<double>)leaderboardScore.TotalScore).BindTo(trackedUser.Score);

From 8f0413472cfd57b480d0feedd365a5ce22aae3ea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:30:08 +0900
Subject: [PATCH 07280/10326] Add test coverage of null users in scoreboard

---
 .../Visual/Online/TestSceneCurrentlyPlayingDisplay.cs     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 1666c9cde4..1baa07f208 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -90,11 +90,17 @@ namespace osu.Game.Tests.Visual.Online
             };
 
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
-                => Task.FromResult(new User
+            {
+                // tests against failed lookups
+                if (lookup == 13)
+                    return Task.FromResult<User>(null);
+
+                return Task.FromResult(new User
                 {
                     Id = lookup,
                     Username = usernames[lookup % usernames.Length],
                 });
+            }
         }
     }
 }

From 6254907ef984032f158bb0a3164862cc13a5d435 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:31:08 +0900
Subject: [PATCH 07281/10326] Move multiplayer leaderboard test to correct
 namespace

---
 .../TestSceneMultiplayerGameplayLeaderboard.cs                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/{Gameplay => Multiplayer}/TestSceneMultiplayerGameplayLeaderboard.cs (98%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 975c54c3f6..d0b1e77549 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -20,10 +20,9 @@ using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Tests.Visual.Multiplayer;
 using osu.Game.Tests.Visual.Online;
 
-namespace osu.Game.Tests.Visual.Gameplay
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiplayerGameplayLeaderboard : MultiplayerTestScene
     {

From fb21b7c0167bed184df6c71dcfcd7a1f29c3ecfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 12:09:32 +0100
Subject: [PATCH 07282/10326] Add failing test cases

---
 .../TestSceneMultiplayerMatchSongSelect.cs    | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
new file mode 100644
index 0000000000..95c333e9f4
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -0,0 +1,145 @@
+// Copyright (c) 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;
+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.Catch;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Taiko;
+using osu.Game.Rulesets.Taiko.Mods;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.Select;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerMatchSongSelect : RoomTestScene
+    {
+        private BeatmapManager manager;
+        private RulesetStore rulesets;
+
+        private List<BeatmapInfo> beatmaps;
+
+        private TestMultiplayerMatchSongSelect 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));
+
+            beatmaps = new List<BeatmapInfo>();
+
+            for (int i = 0; i < 8; ++i)
+            {
+                int beatmapId = 10 * 10 + i;
+
+                int length = RNG.Next(30000, 200000);
+                double bpm = RNG.NextSingle(80, 200);
+
+                beatmaps.Add(new BeatmapInfo
+                {
+                    Ruleset = rulesets.GetRuleset(i % 4),
+                    OnlineBeatmapID = beatmapId,
+                    Length = length,
+                    BPM = bpm,
+                    BaseDifficulty = new BeatmapDifficulty()
+                });
+            }
+
+            manager.Import(new BeatmapSetInfo
+            {
+                OnlineBeatmapSetID = 10,
+                Hash = Guid.NewGuid().ToString().ComputeMD5Hash(),
+                Metadata = new BeatmapMetadata
+                {
+                    Artist = "Some Artist",
+                    Title = "Some Beatmap",
+                    AuthorString = "Some Author"
+                },
+                Beatmaps = beatmaps,
+                DateAdded = DateTimeOffset.UtcNow
+            }).Wait();
+        }
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("reset", () =>
+            {
+                Ruleset.Value = new OsuRuleset().RulesetInfo;
+                Beatmap.SetDefault();
+                SelectedMods.SetDefault();
+            });
+
+            AddStep("create song select", () => LoadScreen(songSelect = new TestMultiplayerMatchSongSelect()));
+            AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
+        }
+
+        [Test]
+        public void TestBeatmapRevertedOnExitIfNoSelection()
+        {
+            BeatmapInfo selectedBeatmap = null;
+
+            AddStep("select beatmap",
+                () => songSelect.Carousel.SelectBeatmap(selectedBeatmap = beatmaps.Where(beatmap => beatmap.RulesetID == new OsuRuleset().LegacyID).ElementAt(1)));
+            AddUntilStep("wait for selection", () => Beatmap.Value.BeatmapInfo.Equals(selectedBeatmap));
+
+            AddStep("exit song select", () => songSelect.Exit());
+            AddAssert("beatmap reverted", () => Beatmap.IsDefault);
+        }
+
+        [Test]
+        public void TestModsRevertedOnExitIfNoSelection()
+        {
+            AddStep("change mods", () => SelectedMods.Value = new[] { new OsuModDoubleTime() });
+
+            AddStep("exit song select", () => songSelect.Exit());
+            AddAssert("mods reverted", () => SelectedMods.Value.Count == 0);
+        }
+
+        [Test]
+        public void TestRulesetRevertedOnExitIfNoSelection()
+        {
+            AddStep("change ruleset", () => Ruleset.Value = new CatchRuleset().RulesetInfo);
+
+            AddStep("exit song select", () => songSelect.Exit());
+            AddAssert("ruleset reverted", () => Ruleset.Value.Equals(new OsuRuleset().RulesetInfo));
+        }
+
+        [Test]
+        public void TestBeatmapConfirmed()
+        {
+            BeatmapInfo selectedBeatmap = null;
+
+            AddStep("change ruleset", () => Ruleset.Value = new TaikoRuleset().RulesetInfo);
+            AddStep("select beatmap",
+                () => songSelect.Carousel.SelectBeatmap(selectedBeatmap = beatmaps.First(beatmap => beatmap.RulesetID == new TaikoRuleset().LegacyID)));
+            AddUntilStep("wait for selection", () => Beatmap.Value.BeatmapInfo.Equals(selectedBeatmap));
+            AddStep("set mods", () => SelectedMods.Value = new[] { new TaikoModDoubleTime() });
+
+            AddStep("confirm selection", () => songSelect.FinaliseSelection());
+            AddStep("exit song select", () => songSelect.Exit());
+
+            AddAssert("beatmap not changed", () => Beatmap.Value.BeatmapInfo.Equals(selectedBeatmap));
+            AddAssert("ruleset not changed", () => Ruleset.Value.Equals(new TaikoRuleset().RulesetInfo));
+            AddAssert("mods not changed", () => SelectedMods.Value.Single() is TaikoModDoubleTime);
+        }
+
+        private class TestMultiplayerMatchSongSelect : MultiplayerMatchSongSelect
+        {
+            public new BeatmapCarousel Carousel => base.Carousel;
+        }
+    }
+}

From f16b516e5880d8d27a439ab0a6615535879eee34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 12:32:06 +0100
Subject: [PATCH 07283/10326] Revert user changes if no selection was made

---
 .../Multiplayer/MultiplayerMatchSongSelect.cs | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 0842574f54..72539a2e3a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.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 System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
@@ -8,9 +9,12 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
@@ -29,6 +33,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private LoadingLayer loadingLayer;
 
+        private WorkingBeatmap initialBeatmap;
+        private RulesetInfo initialRuleset;
+        private IReadOnlyList<Mod> initialMods;
+
+        private bool itemSelected;
+
         public MultiplayerMatchSongSelect()
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
@@ -38,10 +48,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private void load()
         {
             AddInternal(loadingLayer = new LoadingLayer(Carousel));
+            initialBeatmap = Beatmap.Value;
+            initialRuleset = Ruleset.Value;
+            initialMods = Mods.Value.ToList();
         }
 
         protected override bool OnStart()
         {
+            itemSelected = true;
             var item = new PlaylistItem();
 
             item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
@@ -82,6 +96,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             return true;
         }
 
+        public override bool OnExiting(IScreen next)
+        {
+            if (!itemSelected)
+            {
+                Beatmap.Value = initialBeatmap;
+                Ruleset.Value = initialRuleset;
+                Mods.Value = initialMods;
+            }
+
+            return base.OnExiting(next);
+        }
+
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
     }
 }

From 92d74a9343df3fd7378205fe26ff1753ebf52134 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:48:14 +0900
Subject: [PATCH 07284/10326] Fix potential nullref in test scene

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index c0a021436e..17fe09f2c6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public bool CheckPositionByUsername(string username, int? expectedPosition)
             {
-                var scoreItem = this.FirstOrDefault(i => i.User.Username == username);
+                var scoreItem = this.FirstOrDefault(i => i.User?.Username == username);
 
                 return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }

From a9822800fc368986a152723b883d9842b920f54c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 13:00:05 +0100
Subject: [PATCH 07285/10326] Add more null hinting in GameplayLeaderboard

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index e33cc05e64..7b94bf19ec 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -42,7 +43,7 @@ namespace osu.Game.Screens.Play.HUD
         /// Whether the player should be tracked on the leaderboard.
         /// Set to <c>true</c> for the local player or a player whose replay is currently being played.
         /// </param>
-        public ILeaderboardScore AddPlayer(User user, bool isTracked)
+        public ILeaderboardScore AddPlayer([CanBeNull] User user, bool isTracked)
         {
             var drawable = new GameplayLeaderboardScore(user, isTracked)
             {

From 5efcdbd431153a902fd510d727f9b02400afcb66 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 28 Dec 2020 15:19:28 +0300
Subject: [PATCH 07286/10326] Fix IMod now using reference equality as well

---
 osu.Game/Online/API/APIMod.cs  | 3 ++-
 osu.Game/Rulesets/Mods/IMod.cs | 3 ++-
 osu.Game/Rulesets/Mods/Mod.cs  | 3 ++-
 osu.Game/Scoring/ScoreInfo.cs  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index f4e0e1b11f..c1b243c743 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -52,7 +52,8 @@ namespace osu.Game.Online.API
             return resultMod;
         }
 
-        public bool Equals(APIMod other) => Acronym == other?.Acronym;
+        public bool Equals(IMod other) => other is APIMod them && Equals(them);
+        public bool Equals(APIMod other) => ((IMod)this).Equals(other);
 
         public override string ToString()
         {
diff --git a/osu.Game/Rulesets/Mods/IMod.cs b/osu.Game/Rulesets/Mods/IMod.cs
index 448ad0eb30..a5e19f293c 100644
--- a/osu.Game/Rulesets/Mods/IMod.cs
+++ b/osu.Game/Rulesets/Mods/IMod.cs
@@ -1,11 +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 Newtonsoft.Json;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public interface IMod
+    public interface IMod : IEquatable<IMod>
     {
         /// <summary>
         /// The shortened name of this mod.
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 33550e070b..3ccebe4174 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -149,6 +149,7 @@ namespace osu.Game.Rulesets.Mods
             return copy;
         }
 
-        public bool Equals(Mod other) => GetType() == other?.GetType();
+        public bool Equals(IMod other) => other is Mod them && Equals(them);
+        public bool Equals(Mod other) => Acronym == other?.Acronym;
     }
 }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 59eaa994c2..335671ea4e 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -256,7 +256,8 @@ namespace osu.Game.Scoring
         {
             public string Acronym { get; set; }
 
-            public bool Equals(DeserializedMod other) => Acronym == other?.Acronym;
+            bool IEquatable<IMod>.Equals(IMod other) => other is DeserializedMod them && Equals(them);
+            public bool Equals(DeserializedMod other) => ((IMod)this).Equals(other);
         }
 
         public override string ToString() => $"{User} playing {Beatmap}";

From 41b79d938b401d7101440e4ee21f6f28a7590b4a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 28 Dec 2020 15:30:52 +0300
Subject: [PATCH 07287/10326] Fix wrong checks..

---
 osu.Game/Online/API/APIMod.cs | 2 +-
 osu.Game/Rulesets/Mods/Mod.cs | 2 +-
 osu.Game/Scoring/ScoreInfo.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index c1b243c743..f4fed4e5c5 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Online.API
         }
 
         public bool Equals(IMod other) => other is APIMod them && Equals(them);
-        public bool Equals(APIMod other) => ((IMod)this).Equals(other);
+        public bool Equals(APIMod other) => Acronym == other?.Acronym;
 
         public override string ToString()
         {
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 3ccebe4174..dbb2a0fdc1 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -150,6 +150,6 @@ namespace osu.Game.Rulesets.Mods
         }
 
         public bool Equals(IMod other) => other is Mod them && Equals(them);
-        public bool Equals(Mod other) => Acronym == other?.Acronym;
+        public bool Equals(Mod other) => GetType() == other?.GetType();
     }
 }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 335671ea4e..1e5742c358 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -257,7 +257,7 @@ namespace osu.Game.Scoring
             public string Acronym { get; set; }
 
             bool IEquatable<IMod>.Equals(IMod other) => other is DeserializedMod them && Equals(them);
-            public bool Equals(DeserializedMod other) => ((IMod)this).Equals(other);
+            public bool Equals(DeserializedMod other) => Acronym == other?.Acronym;
         }
 
         public override string ToString() => $"{User} playing {Beatmap}";

From b352c1503ff2eff470dd573d08ad8e2015c07906 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Mon, 28 Dec 2020 15:13:33 +0100
Subject: [PATCH 07288/10326] Fix IntentFilter capturing all file types

Removed string arrays and split the IntentFilter into multiple. Also added DataHost and DataMimeType
---
 osu.Android/OsuGameActivity.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 953c06f4e2..7abaff3cdb 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -16,7 +16,10 @@ using osu.Framework.Android;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "file", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "file", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {

From d971aa5295b7d20a471d8be62fdc4c6e263dd139 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Mon, 28 Dec 2020 15:54:21 +0100
Subject: [PATCH 07289/10326] Remove file intents and add Send intent

Removed IntentFilters with DataScheme = "file"
Added Intent.ActionSend with application/octet-stream and application/zip
---
 osu.Android/OsuGameActivity.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 7abaff3cdb..cdf033e685 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -16,10 +16,10 @@ using osu.Framework.Android;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "file", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "file", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeType = "application/octet-stream")]
+    [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeType = "application/zip")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {

From d2301068b6c2a04961986570075ef5075c2cf168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 16:35:33 +0100
Subject: [PATCH 07290/10326] Fix changelog header staying dimmed after build
 show

---
 .../Overlays/Changelog/ChangelogUpdateStreamControl.cs   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
index 6bbff045b5..aa36a5c8fd 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
@@ -7,12 +7,11 @@ namespace osu.Game.Overlays.Changelog
 {
     public class ChangelogUpdateStreamControl : OverlayStreamControl<APIUpdateStream>
     {
-        protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
-
-        protected override void LoadComplete()
+        public ChangelogUpdateStreamControl()
         {
-            // suppress base logic of immediately selecting first item if one exists
-            // (we always want to start with no stream selected).
+            SelectFirstTabByDefault = false;
         }
+
+        protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
     }
 }

From 1d311a66805aad4c784ff0a51bc523e69019ccde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 19:11:44 +0100
Subject: [PATCH 07291/10326] Change PlayingUsers population logic to match
 expectations

---
 .../Multiplayer/StatefulMultiplayerClient.cs   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index fcb0977f53..c15401e99d 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -133,6 +133,7 @@ namespace osu.Game.Online.Multiplayer
 
                 apiRoom = null;
                 Room = null;
+                PlayingUsers.Clear();
 
                 RoomUpdated?.Invoke();
             }, false);
@@ -302,8 +303,7 @@ namespace osu.Game.Online.Multiplayer
 
                 Room.Users.Single(u => u.UserID == userId).State = state;
 
-                if (state != MultiplayerUserState.Playing)
-                    PlayingUsers.Remove(userId);
+                updatePlayingUsers(userId, state);
 
                 RoomUpdated?.Invoke();
             }, false);
@@ -337,8 +337,6 @@ namespace osu.Game.Online.Multiplayer
                 if (Room == null)
                     return;
 
-                PlayingUsers.AddRange(Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID));
-
                 MatchStarted?.Invoke();
             }, false);
 
@@ -454,5 +452,17 @@ namespace osu.Game.Online.Multiplayer
             apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
             apiRoom.Playlist.Add(playlistItem);
         }
+
+        private void updatePlayingUsers(int userId, MultiplayerUserState state)
+        {
+            bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
+            bool wasPlaying = PlayingUsers.Contains(userId);
+
+            if (!wasPlaying && isPlaying)
+                PlayingUsers.Add(userId);
+
+            if (wasPlaying && !isPlaying)
+                PlayingUsers.Remove(userId);
+        }
     }
 }

From a014d0ec18953854650c33263489273171d828f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 19:12:58 +0100
Subject: [PATCH 07292/10326] Use PlayingUsers when constructing player
 directly

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 58314c3774..ba0ed16cf4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -200,7 +200,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Debug.Assert(client.Room != null);
 
-            int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
+            int[] userIds = client.PlayingUsers.ToArray();
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
         }

From f7407347f78445a141c196fbcda5282f1ba14250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 20:01:17 +0100
Subject: [PATCH 07293/10326] Add test coverage of PlayingUsers tracking

---
 .../StatefulMultiplayerClientTest.cs          | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs

diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
new file mode 100644
index 0000000000..8d543e7485
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.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.Linq;
+using Humanizer;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Tests.Visual.Multiplayer;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.NonVisual.Multiplayer
+{
+    [HeadlessTest]
+    public class StatefulMultiplayerClientTest : MultiplayerTestScene
+    {
+        [Test]
+        public void TestPlayingUserTracking()
+        {
+            int id = 2000;
+
+            AddRepeatStep("add some users", () => Client.AddUser(new User { Id = id++ }), 5);
+            checkPlayingUserCount(0);
+
+            changeState(3, MultiplayerUserState.WaitingForLoad);
+            checkPlayingUserCount(3);
+
+            changeState(3, MultiplayerUserState.Playing);
+            checkPlayingUserCount(3);
+
+            changeState(3, MultiplayerUserState.Results);
+            checkPlayingUserCount(0);
+
+            changeState(6, MultiplayerUserState.WaitingForLoad);
+            checkPlayingUserCount(6);
+
+            AddStep("another user left", () => Client.RemoveUser(Client.Room?.Users.Last().User));
+            checkPlayingUserCount(5);
+
+            AddStep("leave room", () => Client.LeaveRoom());
+            checkPlayingUserCount(0);
+        }
+
+        private void checkPlayingUserCount(int expectedCount)
+            => AddAssert($"{"user".ToQuantity(expectedCount)} playing", () => Client.PlayingUsers.Count == expectedCount);
+
+        private void changeState(int userCount, MultiplayerUserState state)
+            => AddStep($"{"user".ToQuantity(userCount)} in {state}", () =>
+            {
+                for (int i = 0; i < userCount; ++i)
+                {
+                    var userId = Client.Room?.Users[i].UserID ?? throw new AssertionException("Room cannot be null!");
+                    Client.ChangeUserState(userId, state);
+                }
+            });
+    }
+}

From 770a5a85dff5cff621287732639eb33534ea95ad Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Mon, 28 Dec 2020 20:57:08 +0100
Subject: [PATCH 07294/10326] Merge Intent.ActionSend into one IntentFilter

Co-authored-by: Lucas A. <game4allyt@gmail.com>
---
 osu.Android/OsuGameActivity.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index cdf033e685..da69b516dd 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -19,7 +19,7 @@ namespace osu.Android
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeType = "application/octet-stream")]
-    [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeType = "application/zip")]
+    [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream" })]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {

From 9e6994166c0eef43cb63b6d1d34e70e0cb324634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 20:59:12 +0100
Subject: [PATCH 07295/10326] Add helper to track ongoing operations in UI

---
 .../OnlinePlay/OngoingOperationTracker.cs     | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
new file mode 100644
index 0000000000..f2d943e14f
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.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 System;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Screens.OnlinePlay
+{
+    /// <summary>
+    /// Utility class to track ongoing online operations' progress.
+    /// Can be used to disable interactivity while waiting for a response from online sources.
+    /// </summary>
+    public class OngoingOperationTracker
+    {
+        /// <summary>
+        /// Whether there is an online operation in progress.
+        /// </summary>
+        public IBindable<bool> InProgress => inProgress;
+
+        private readonly Bindable<bool> inProgress = new BindableBool();
+
+        private LeasedBindable<bool> leasedInProgress;
+
+        /// <summary>
+        /// Begins tracking a new online operation.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">An operation has already been started.</exception>
+        public void BeginOperation()
+        {
+            if (leasedInProgress != null)
+                throw new InvalidOperationException("Cannot begin operation while another is in progress.");
+
+            leasedInProgress = inProgress.BeginLease(true);
+            leasedInProgress.Value = true;
+        }
+
+        /// <summary>
+        /// Ends tracking an online operation.
+        /// Does nothing if an operation has not been begun yet.
+        /// </summary>
+        public void EndOperation()
+        {
+            leasedInProgress?.Return();
+            leasedInProgress = null;
+        }
+    }
+}

From 47ab7c9fd67270079d39e8ad9f45fb3e986c76df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 20:59:38 +0100
Subject: [PATCH 07296/10326] Disable ready button after host click

---
 .../TestSceneMultiplayerReadyButton.cs        | 22 +++++++++++++++----
 .../Match/MultiplayerReadyButton.cs           | 13 ++++++++++-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  4 ++++
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 6b11613f1c..958c6d218b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -7,11 +7,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
@@ -27,6 +30,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapManager beatmaps;
         private RulesetStore rulesets;
 
+        [Cached]
+        private OngoingOperationTracker gameplayStartTracker = new OngoingOperationTracker();
+
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
         {
@@ -89,8 +95,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             addClickButtonStep();
             AddAssert("user is ready", () => Client.Room?.Users[0].State == MultiplayerUserState.Ready);
 
-            addClickButtonStep();
-            AddAssert("match started", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
+            verifyGameplayStartFlow();
         }
 
         [Test]
@@ -105,8 +110,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             addClickButtonStep();
             AddStep("make user host", () => Client.TransferHost(Client.Room?.Users[0].UserID ?? 0));
 
-            addClickButtonStep();
-            AddAssert("match started", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
+            verifyGameplayStartFlow();
         }
 
         [Test]
@@ -160,5 +164,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
             InputManager.MoveMouseTo(button);
             InputManager.Click(MouseButton.Left);
         });
+
+        private void verifyGameplayStartFlow()
+        {
+            addClickButtonStep();
+            AddAssert("user waiting for load", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
+            AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
+
+            AddStep("transitioned to gameplay", () => gameplayStartTracker.EndOperation());
+            AddAssert("ready button enabled", () => button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
+        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 281e92404c..5009b435f4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -33,11 +33,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         [Resolved]
         private OsuColour colours { get; set; }
 
+        [Resolved]
+        private OngoingOperationTracker gameplayStartTracker { get; set; }
+
         private SampleChannel sampleReadyCount;
 
         private readonly ButtonWithTrianglesExposed button;
 
         private int countReady;
+        private IBindable<bool> gameplayStartInProgress;
 
         public MultiplayerReadyButton()
         {
@@ -54,6 +58,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         private void load(AudioManager audio)
         {
             sampleReadyCount = audio.Samples.Get(@"SongSelect/select-difficulty");
+
+            gameplayStartInProgress = gameplayStartTracker.InProgress.GetBoundCopy();
+            gameplayStartInProgress.BindValueChanged(_ => updateState());
         }
 
         protected override void OnRoomUpdated()
@@ -63,7 +70,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             // this method is called on leaving the room, so the local user may not exist in the room any more.
             localUser = Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
 
-            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open;
             updateState();
         }
 
@@ -100,6 +106,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     break;
             }
 
+            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !gameplayStartInProgress.Value;
+
             if (newCountReady != countReady)
             {
                 countReady = newCountReady;
@@ -142,7 +150,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             else
             {
                 if (Room?.Host?.Equals(localUser) == true)
+                {
+                    gameplayStartTracker.BeginOperation();
                     Client.StartMatch().CatchUnobservedExceptions(true);
+                }
                 else
                     Client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
             }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 58314c3774..93db913ce0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -31,6 +31,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
+        [Cached]
+        private OngoingOperationTracker gameplayStartTracker = new OngoingOperationTracker();
+
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
         private IBindable<bool> isConnected;
@@ -203,6 +206,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
+            gameplayStartTracker.EndOperation();
         }
 
         protected override void Dispose(bool isDisposing)

From af66e4531196853215e8625cf858d4a0d221aaec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 21:39:11 +0100
Subject: [PATCH 07297/10326] Disable create room button after triggering join

---
 .../TestSceneCreateMultiplayerMatchButton.cs  | 52 +++++++++++++++++++
 .../OnlinePlay/Lounge/LoungeSubScreen.cs      | 22 ++++----
 .../CreateMultiplayerMatchButton.cs           | 19 ++++++-
 .../Screens/OnlinePlay/OnlinePlayScreen.cs    |  3 ++
 4 files changed, 83 insertions(+), 13 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
new file mode 100644
index 0000000000..2a549e5262
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.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.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneCreateMultiplayerMatchButton : MultiplayerTestScene
+    {
+        [Cached]
+        private OngoingOperationTracker joiningRoomTracker = new OngoingOperationTracker();
+
+        private CreateMultiplayerMatchButton button;
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("create button", () => Child = button = new CreateMultiplayerMatchButton
+            {
+                Width = 200,
+                Height = 100,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            });
+        }
+
+        [Test]
+        public void TestButtonEnableStateChanges()
+        {
+            assertButtonEnableState(true);
+
+            AddStep("begin joining room", () => joiningRoomTracker.BeginOperation());
+            assertButtonEnableState(false);
+
+            AddStep("end joining room", () => joiningRoomTracker.EndOperation());
+            assertButtonEnableState(true);
+
+            AddStep("disconnect client", () => Client.Disconnect());
+            assertButtonEnableState(false);
+
+            AddStep("re-connect client", () => Client.Connect());
+            assertButtonEnableState(true);
+        }
+
+        private void assertButtonEnableState(bool enabled)
+            => AddAssert($"button {(enabled ? "enabled" : "disabled")}", () => button.Enabled.Value == enabled);
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 79f5dfdee1..2730693f73 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         protected override UserActivity InitialActivity => new UserActivity.SearchingForLobby();
 
         private readonly IBindable<bool> initialRoomsReceived = new Bindable<bool>();
+        private readonly IBindable<bool> joiningRoom = new Bindable<bool>();
 
         private FilterControl filter;
         private Container content;
@@ -37,7 +38,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         [Resolved]
         private MusicController music { get; set; }
 
-        private bool joiningRoom;
+        [Resolved]
+        private OngoingOperationTracker joiningRoomTracker { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -98,7 +100,10 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             base.LoadComplete();
 
             initialRoomsReceived.BindTo(RoomManager.InitialRoomsReceived);
-            initialRoomsReceived.BindValueChanged(onInitialRoomsReceivedChanged, true);
+            initialRoomsReceived.BindValueChanged(_ => updateLoadingLayer());
+
+            joiningRoom.BindTo(joiningRoomTracker.InProgress);
+            joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
         }
 
         protected override void UpdateAfterChildren()
@@ -156,26 +161,21 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
         private void joinRequested(Room room)
         {
-            joiningRoom = true;
-            updateLoadingLayer();
+            joiningRoomTracker.BeginOperation();
 
             RoomManager?.JoinRoom(room, r =>
             {
                 Open(room);
-                joiningRoom = false;
-                updateLoadingLayer();
+                joiningRoomTracker.EndOperation();
             }, _ =>
             {
-                joiningRoom = false;
-                updateLoadingLayer();
+                joiningRoomTracker.EndOperation();
             });
         }
 
-        private void onInitialRoomsReceivedChanged(ValueChangedEvent<bool> received) => updateLoadingLayer();
-
         private void updateLoadingLayer()
         {
-            if (joiningRoom || !initialRoomsReceived.Value)
+            if (joiningRoom.Value || !initialRoomsReceived.Value)
                 loadingLayer.Show();
             else
                 loadingLayer.Hide();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index 163efd9c20..7518a4e71b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -10,14 +10,29 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class CreateMultiplayerMatchButton : PurpleTriangleButton
     {
+        private IBindable<bool> isConnected;
+        private IBindable<bool> joiningRoom;
+
+        [Resolved]
+        private StatefulMultiplayerClient multiplayerClient { get; set; }
+
+        [Resolved]
+        private OngoingOperationTracker joiningRoomTracker { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(StatefulMultiplayerClient multiplayerClient)
+        private void load()
         {
             Triangles.TriangleScale = 1.5f;
 
             Text = "Create room";
 
-            ((IBindable<bool>)Enabled).BindTo(multiplayerClient.IsConnected);
+            isConnected = multiplayerClient.IsConnected.GetBoundCopy();
+            isConnected.BindValueChanged(_ => updateState());
+
+            joiningRoom = joiningRoomTracker.InProgress.GetBoundCopy();
+            joiningRoom.BindValueChanged(_ => updateState(), true);
         }
+
+        private void updateState() => Enabled.Value = isConnected.Value && !joiningRoom.Value;
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 4074dd1573..92665c498b 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -52,6 +52,9 @@ namespace osu.Game.Screens.OnlinePlay
         [Cached]
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
+        [Cached]
+        private readonly OngoingOperationTracker joiningRoomTracker = new OngoingOperationTracker();
+
         [Resolved(CanBeNull = true)]
         private MusicController music { get; set; }
 

From 6dc0f6af50a3befd707a7f9d4a5fe10cd0862413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 21:44:58 +0100
Subject: [PATCH 07298/10326] Disable setting apply button for duration of
 operation

---
 .../Match/MultiplayerMatchSettingsOverlay.cs  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index ae03d384f6..de25cff546 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             [Resolved]
             private Bindable<RulesetInfo> ruleset { get; set; }
 
+            private readonly OngoingOperationTracker applyingSettingsTracker = new OngoingOperationTracker();
+
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
@@ -274,13 +276,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 Type.BindValueChanged(type => TypePicker.Current.Value = type.NewValue, true);
                 MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
                 RoomID.BindValueChanged(roomId => initialBeatmapControl.Alpha = roomId.NewValue == null ? 1 : 0, true);
+
+                applyingSettingsTracker.InProgress.BindValueChanged(v =>
+                {
+                    if (v.NewValue)
+                        loadingLayer.Show();
+                    else
+                        loadingLayer.Hide();
+                });
             }
 
             protected override void Update()
             {
                 base.Update();
 
-                ApplyButton.Enabled.Value = Playlist.Count > 0 && NameField.Text.Length > 0;
+                ApplyButton.Enabled.Value = Playlist.Count > 0 && NameField.Text.Length > 0 && !applyingSettingsTracker.InProgress.Value;
             }
 
             private void apply()
@@ -289,7 +299,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     return;
 
                 hideError();
-                loadingLayer.Show();
+                applyingSettingsTracker.BeginOperation();
 
                 // If the client is already in a room, update via the client.
                 // Otherwise, update the room directly in preparation for it to be submitted to the API on match creation.
@@ -322,7 +332,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             private void onSuccess(Room room)
             {
-                loadingLayer.Hide();
+                applyingSettingsTracker.EndOperation();
                 SettingsApplied?.Invoke();
             }
 
@@ -330,8 +340,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             {
                 ErrorText.Text = text;
                 ErrorText.FadeIn(50);
-
-                loadingLayer.Hide();
+                applyingSettingsTracker.EndOperation();
             }
         }
 

From 540dec2e7ccbb96342683545d744ffa74b4011d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 22:54:52 +0100
Subject: [PATCH 07299/10326] Allow null tracker in lounge screen for tests

---
 .../Screens/OnlinePlay/Lounge/LoungeSubScreen.cs  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 2730693f73..f25835f56a 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         [Resolved]
         private MusicController music { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private OngoingOperationTracker joiningRoomTracker { get; set; }
 
         [BackgroundDependencyLoader]
@@ -102,8 +102,11 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             initialRoomsReceived.BindTo(RoomManager.InitialRoomsReceived);
             initialRoomsReceived.BindValueChanged(_ => updateLoadingLayer());
 
-            joiningRoom.BindTo(joiningRoomTracker.InProgress);
-            joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
+            if (joiningRoomTracker != null)
+            {
+                joiningRoom.BindTo(joiningRoomTracker.InProgress);
+                joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
+            }
         }
 
         protected override void UpdateAfterChildren()
@@ -161,15 +164,15 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
         private void joinRequested(Room room)
         {
-            joiningRoomTracker.BeginOperation();
+            joiningRoomTracker?.BeginOperation();
 
             RoomManager?.JoinRoom(room, r =>
             {
                 Open(room);
-                joiningRoomTracker.EndOperation();
+                joiningRoomTracker?.EndOperation();
             }, _ =>
             {
-                joiningRoomTracker.EndOperation();
+                joiningRoomTracker?.EndOperation();
             });
         }
 

From 355ecc4499bf1357612c6c6607b65a46e84ea432 Mon Sep 17 00:00:00 2001
From: TheOmyNomy <theomynomy@gmail.com>
Date: Tue, 29 Dec 2020 12:37:57 +1100
Subject: [PATCH 07300/10326] Change cursor trail blending mode to match stable

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
index f18d3191ca..af9ea99232 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
@@ -20,17 +20,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private double lastTrailTime;
         private IBindable<float> cursorSize;
 
-        public LegacyCursorTrail()
-        {
-            Blending = BlendingParameters.Additive;
-        }
-
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, OsuConfigManager config)
         {
             Texture = skin.GetTexture("cursortrail");
             disjointTrail = skin.GetTexture("cursormiddle") == null;
 
+            Blending = !disjointTrail ? BlendingParameters.Additive : BlendingParameters.Inherit;
+
             if (Texture != null)
             {
                 // stable "magic ratio". see OsuPlayfieldAdjustmentContainer for full explanation.

From 6aeb7ece660ef5600f8b8da00ac38fd05a5def41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 14:25:08 +0900
Subject: [PATCH 07301/10326] Tidy up update state code, naming, xmldoc

---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index c15401e99d..bf62c450c9 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -303,7 +303,7 @@ namespace osu.Game.Online.Multiplayer
 
                 Room.Users.Single(u => u.UserID == userId).State = state;
 
-                updatePlayingUsers(userId, state);
+                updateUserPlayingState(userId, state);
 
                 RoomUpdated?.Invoke();
             }, false);
@@ -453,15 +453,22 @@ namespace osu.Game.Online.Multiplayer
             apiRoom.Playlist.Add(playlistItem);
         }
 
-        private void updatePlayingUsers(int userId, MultiplayerUserState state)
+        /// <summary>
+        /// For the provided user ID, update whether the user is included in <see cref="PlayingUsers"/>.
+        /// </summary>
+        /// <param name="userId">The user's ID.</param>
+        /// <param name="state">The new state of the user.</param>
+        private void updateUserPlayingState(int userId, MultiplayerUserState state)
         {
-            bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
             bool wasPlaying = PlayingUsers.Contains(userId);
+            bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
 
-            if (!wasPlaying && isPlaying)
+            if (isPlaying == wasPlaying)
+                return;
+
+            if (isPlaying)
                 PlayingUsers.Add(userId);
-
-            if (wasPlaying && !isPlaying)
+            else
                 PlayingUsers.Remove(userId);
         }
     }

From e3a41f61186525d18d01bd8306e1d2a6f7a2baa3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 14:27:33 +0900
Subject: [PATCH 07302/10326] Rename variable to make more sense

It needs to be explicitly stated that the users in this list are related
to the *joined* room. Especially since it's sharing its variable name
with `SpectatorStreamingClient` where it has the opposite meaning (is a
list of *globally* playing players).
---
 .../Multiplayer/StatefulMultiplayerClientTest.cs |  2 +-
 .../TestSceneMultiplayerGameplayLeaderboard.cs   |  6 +++---
 .../Multiplayer/StatefulMultiplayerClient.cs     | 16 ++++++++--------
 .../Multiplayer/MultiplayerMatchSubScreen.cs     |  2 +-
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs   |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
index 8d543e7485..a2ad37cf4a 100644
--- a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
         }
 
         private void checkPlayingUserCount(int expectedCount)
-            => AddAssert($"{"user".ToQuantity(expectedCount)} playing", () => Client.PlayingUsers.Count == expectedCount);
+            => AddAssert($"{"user".ToQuantity(expectedCount)} playing", () => Client.CurrentMatchPlayingUserIds.Count == expectedCount);
 
         private void changeState(int userCount, MultiplayerUserState state)
             => AddStep($"{"user".ToQuantity(userCount)} in {state}", () =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index d0b1e77549..d016accc25 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -62,8 +62,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
 
-                Client.PlayingUsers.Clear();
-                Client.PlayingUsers.AddRange(streamingClient.PlayingUsers);
+                Client.CurrentMatchPlayingUserIds.Clear();
+                Client.CurrentMatchPlayingUserIds.AddRange(streamingClient.PlayingUsers);
 
                 Children = new Drawable[]
                 {
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestUserQuit()
         {
-            AddRepeatStep("mark user quit", () => Client.PlayingUsers.RemoveAt(0), users);
+            AddRepeatStep("mark user quit", () => Client.CurrentMatchPlayingUserIds.RemoveAt(0), users);
         }
 
         public class TestMultiplayerStreaming : SpectatorStreamingClient
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index bf62c450c9..bb690d786a 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -61,9 +61,9 @@ namespace osu.Game.Online.Multiplayer
         public MultiplayerRoom? Room { get; private set; }
 
         /// <summary>
-        /// The users currently in gameplay.
+        /// The users in the joined <see cref="Room"/> which are currently in gameplay.
         /// </summary>
-        public readonly BindableList<int> PlayingUsers = new BindableList<int>();
+        public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
 
         [Resolved]
         private UserLookupCache userLookupCache { get; set; } = null!;
@@ -133,7 +133,7 @@ namespace osu.Game.Online.Multiplayer
 
                 apiRoom = null;
                 Room = null;
-                PlayingUsers.Clear();
+                CurrentMatchPlayingUserIds.Clear();
 
                 RoomUpdated?.Invoke();
             }, false);
@@ -254,7 +254,7 @@ namespace osu.Game.Online.Multiplayer
                     return;
 
                 Room.Users.Remove(user);
-                PlayingUsers.Remove(user.UserID);
+                CurrentMatchPlayingUserIds.Remove(user.UserID);
 
                 RoomUpdated?.Invoke();
             }, false);
@@ -454,22 +454,22 @@ namespace osu.Game.Online.Multiplayer
         }
 
         /// <summary>
-        /// For the provided user ID, update whether the user is included in <see cref="PlayingUsers"/>.
+        /// For the provided user ID, update whether the user is included in <see cref="CurrentMatchPlayingUserIds"/>.
         /// </summary>
         /// <param name="userId">The user's ID.</param>
         /// <param name="state">The new state of the user.</param>
         private void updateUserPlayingState(int userId, MultiplayerUserState state)
         {
-            bool wasPlaying = PlayingUsers.Contains(userId);
+            bool wasPlaying = CurrentMatchPlayingUserIds.Contains(userId);
             bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
 
             if (isPlaying == wasPlaying)
                 return;
 
             if (isPlaying)
-                PlayingUsers.Add(userId);
+                CurrentMatchPlayingUserIds.Add(userId);
             else
-                PlayingUsers.Remove(userId);
+                CurrentMatchPlayingUserIds.Remove(userId);
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index ba0ed16cf4..ffa36ecfdb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -200,7 +200,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Debug.Assert(client.Room != null);
 
-            int[] userIds = client.PlayingUsers.ToArray();
+            int[] userIds = client.CurrentMatchPlayingUserIds.ToArray();
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
         }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index e7e5459f76..d4ce542a67 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -84,11 +84,11 @@ namespace osu.Game.Screens.Play.HUD
             // BindableList handles binding in a really bad way (Clear then AddRange) so we need to do this manually..
             foreach (int userId in playingUsers)
             {
-                if (!multiplayerClient.PlayingUsers.Contains(userId))
+                if (!multiplayerClient.CurrentMatchPlayingUserIds.Contains(userId))
                     usersChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, new[] { userId }));
             }
 
-            playingUsers.BindTo(multiplayerClient.PlayingUsers);
+            playingUsers.BindTo(multiplayerClient.CurrentMatchPlayingUserIds);
             playingUsers.BindCollectionChanged(usersChanged);
         }
 

From f31a0e455a7834e839643a711df9dcd96409c315 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 14:29:40 +0900
Subject: [PATCH 07303/10326] Minor xmldoc rewording

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

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index bb690d786a..39d119b2a4 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Online.Multiplayer
         public MultiplayerRoom? Room { get; private set; }
 
         /// <summary>
-        /// The users in the joined <see cref="Room"/> which are currently in gameplay.
+        /// The users in the joined <see cref="Room"/> which are participating in the current gameplay loop.
         /// </summary>
         public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
 

From 45c578b85780f81051035dee3094efeef995fff9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 15:10:08 +0900
Subject: [PATCH 07304/10326] Remove selection polling from multiplayer

Looks like this was just copy-paste without any thought into whether it
should exist. It really shouldn't exist.

This is a thing for the playlists system because the *whole system*
there relies on polling the web API to get updated information. In the
case of mutliplayer, we hand off all communications to the realtime
server at the point of joining the rooms.

The argument that this was there to do faster polling on the selection
isn't valid since the polling times were the same for both cases.

Closes #11348.
---
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  5 +---
 .../Multiplayer/MultiplayerRoomManager.cs     | 28 +------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 76f5c74433..310617a0bc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -33,7 +33,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
             {
                 multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
-                multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
@@ -41,18 +40,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 {
                     case LoungeSubScreen _:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
-                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     // Don't poll inside the match or anywhere else.
                     default:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
-                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 3cb263298f..5c327266a3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private StatefulMultiplayerClient multiplayerClient { get; set; }
 
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
-        public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
+
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
         private readonly Bindable<bool> allowPolling = new Bindable<bool>();
 
@@ -119,11 +119,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
                 AllowPolling = { BindTarget = allowPolling }
             },
-            new MultiplayerSelectionPollingComponent
-            {
-                TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
-                AllowPolling = { BindTarget = allowPolling }
-            }
         };
 
         private class MultiplayerListingPollingComponent : ListingPollingComponent
@@ -146,26 +141,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
         }
-
-        private class MultiplayerSelectionPollingComponent : SelectionPollingComponent
-        {
-            public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                AllowPolling.BindValueChanged(allowPolling =>
-                {
-                    if (!allowPolling.NewValue)
-                        return;
-
-                    if (IsLoaded)
-                        PollImmediately();
-                });
-            }
-
-            protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
-        }
     }
 }

From 2cb84c5111b9e244d98492e4b7fe43e3ef553492 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 15:19:52 +0900
Subject: [PATCH 07305/10326] Fix error message being shown to user on
 multiplayer disconnection when not in room

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

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 39d119b2a4..dc80488d39 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Online.Multiplayer
             IsConnected.BindValueChanged(connected =>
             {
                 // clean up local room state on server disconnect.
-                if (!connected.NewValue)
+                if (!connected.NewValue && Room != null)
                 {
                     Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
                     LeaveRoom().CatchUnobservedExceptions();

From 903dca875e7aa364277dc336e52c9c350a6f363a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 07:46:22 +0100
Subject: [PATCH 07306/10326] Make localUser a client property

---
 .../Online/Multiplayer/StatefulMultiplayerClient.cs    |  5 +++++
 .../Multiplayer/Match/MultiplayerReadyButton.cs        | 10 ++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 39d119b2a4..0f44085134 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -65,6 +65,11 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
 
+        /// <summary>
+        /// The <see cref="MultiplayerRoomUser"/> corresponding to the local player, if available.
+        /// </summary>
+        public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
+
         [Resolved]
         private UserLookupCache userLookupCache { get; set; } = null!;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 5009b435f4..9b406ff52c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -27,9 +27,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [CanBeNull]
-        private MultiplayerRoomUser localUser;
-
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -67,14 +64,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             base.OnRoomUpdated();
 
-            // this method is called on leaving the room, so the local user may not exist in the room any more.
-            localUser = Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
-
             updateState();
         }
 
         private void updateState()
         {
+            var localUser = Client.LocalUser;
+
             if (localUser == null)
                 return;
 
@@ -142,6 +138,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         private void onClick()
         {
+            var localUser = Client.LocalUser;
+
             if (localUser == null)
                 return;
 

From 9ff214023297f4300a439e5c2427281a0cb37bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 07:51:46 +0100
Subject: [PATCH 07307/10326] Move ready-up logic to match sub-screen

---
 .../Match/MultiplayerMatchFooter.cs           |  9 +++++-
 .../Match/MultiplayerReadyButton.cs           | 30 ++++---------------
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 28 ++++++++++++++++-
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index a52f62fe00..bd1ca1377e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -19,7 +20,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
+        public Action OnReady
+        {
+            set => readyButton.OnReady = value;
+        }
+
         private readonly Drawable background;
+        private readonly MultiplayerReadyButton readyButton;
 
         public MultiplayerMatchFooter()
         {
@@ -29,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             InternalChildren = new[]
             {
                 background = new Box { RelativeSizeAxes = Axes.Both },
-                new MultiplayerReadyButton
+                readyButton = new MultiplayerReadyButton
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 9b406ff52c..96470cf070 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -1,15 +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;
 using System.Diagnostics;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Online.API;
@@ -24,6 +23,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
     {
         public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
 
+        public Action OnReady
+        {
+            set => button.Action = value;
+        }
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -47,7 +51,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 RelativeSizeAxes = Axes.Both,
                 Size = Vector2.One,
                 Enabled = { Value = true },
-                Action = onClick
             };
         }
 
@@ -136,27 +139,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             }
         }
 
-        private void onClick()
-        {
-            var localUser = Client.LocalUser;
-
-            if (localUser == null)
-                return;
-
-            if (localUser.State == MultiplayerUserState.Idle)
-                Client.ChangeState(MultiplayerUserState.Ready).CatchUnobservedExceptions(true);
-            else
-            {
-                if (Room?.Host?.Equals(localUser) == true)
-                {
-                    gameplayStartTracker.BeginOperation();
-                    Client.StartMatch().CatchUnobservedExceptions(true);
-                }
-                else
-                    Client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
-            }
-        }
-
         private class ButtonWithTrianglesExposed : ReadyButton
         {
             public new Triangles Triangles => base.Triangles;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 8eafd7c7df..a87471c8af 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
+using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -153,7 +154,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         },
                         new Drawable[]
                         {
-                            new MultiplayerMatchFooter { SelectedItem = { BindTarget = SelectedItem } }
+                            new MultiplayerMatchFooter
+                            {
+                                SelectedItem = { BindTarget = SelectedItem },
+                                OnReady = onReady
+                            }
                         }
                     },
                     RowDimensions = new[]
@@ -199,6 +204,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
+        private void onReady()
+        {
+            var localUser = client.LocalUser;
+
+            if (localUser == null)
+                return;
+
+            if (localUser.State == MultiplayerUserState.Idle)
+                client.ChangeState(MultiplayerUserState.Ready).CatchUnobservedExceptions(true);
+            else
+            {
+                if (client.Room?.Host?.Equals(localUser) == true)
+                {
+                    gameplayStartTracker.BeginOperation();
+                    client.StartMatch().CatchUnobservedExceptions(true);
+                }
+                else
+                    client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
+            }
+        }
+
         private void onLoadRequested()
         {
             Debug.Assert(client.Room != null);

From f59ba799d30390f030fcac0e12ac99a1893f78f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 07:54:27 +0100
Subject: [PATCH 07308/10326] Adjust operation tracker implementation

---
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index f2d943e14f..6a340d7954 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 
 namespace osu.Game.Screens.OnlinePlay
@@ -24,21 +25,26 @@ namespace osu.Game.Screens.OnlinePlay
         /// <summary>
         /// Begins tracking a new online operation.
         /// </summary>
+        /// <returns>
+        /// An <see cref="IDisposable"/> that will automatically mark the operation as ended on disposal.
+        /// </returns>
         /// <exception cref="InvalidOperationException">An operation has already been started.</exception>
-        public void BeginOperation()
+        public IDisposable BeginOperation()
         {
             if (leasedInProgress != null)
                 throw new InvalidOperationException("Cannot begin operation while another is in progress.");
 
             leasedInProgress = inProgress.BeginLease(true);
             leasedInProgress.Value = true;
+
+            return new InvokeOnDisposal(endOperation);
         }
 
         /// <summary>
         /// Ends tracking an online operation.
         /// Does nothing if an operation has not been begun yet.
         /// </summary>
-        public void EndOperation()
+        private void endOperation()
         {
             leasedInProgress?.Return();
             leasedInProgress = null;

From db52255bbec7a284b07baac967280e2cf5b3d9a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 08:20:43 +0100
Subject: [PATCH 07309/10326] Adjust tracker usages to match new API

---
 .../TestSceneCreateMultiplayerMatchButton.cs  |  9 ++++--
 .../TestSceneMultiplayerReadyButton.cs        |  9 ++++--
 .../OnlinePlay/Lounge/LoungeSubScreen.cs      | 21 +++++++++----
 .../CreateMultiplayerMatchButton.cs           | 10 +++---
 .../Match/MultiplayerMatchSettingsOverlay.cs  | 31 +++++++++++++++----
 .../Match/MultiplayerReadyButton.cs           | 10 +++---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 19 +++++++++---
 .../Screens/OnlinePlay/OnlinePlayScreen.cs    |  2 +-
 8 files changed, 79 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
index 2a549e5262..381270c5aa 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -12,7 +13,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneCreateMultiplayerMatchButton : MultiplayerTestScene
     {
         [Cached]
-        private OngoingOperationTracker joiningRoomTracker = new OngoingOperationTracker();
+        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
         private CreateMultiplayerMatchButton button;
 
@@ -31,12 +32,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestButtonEnableStateChanges()
         {
+            IDisposable joiningRoomOperation = null;
+
             assertButtonEnableState(true);
 
-            AddStep("begin joining room", () => joiningRoomTracker.BeginOperation());
+            AddStep("begin joining room", () => joiningRoomOperation = ongoingOperationTracker.BeginOperation());
             assertButtonEnableState(false);
 
-            AddStep("end joining room", () => joiningRoomTracker.EndOperation());
+            AddStep("end joining room", () => joiningRoomOperation.Dispose());
             assertButtonEnableState(true);
 
             AddStep("disconnect client", () => Client.Disconnect());
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 958c6d218b..de02c6c844 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -31,7 +32,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private RulesetStore rulesets;
 
         [Cached]
-        private OngoingOperationTracker gameplayStartTracker = new OngoingOperationTracker();
+        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -167,11 +168,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void verifyGameplayStartFlow()
         {
+            IDisposable gameplayStartOperation = null;
+
+            AddStep("hook up tracker", () => button.OnReady = () => gameplayStartOperation = ongoingOperationTracker.BeginOperation());
+
             addClickButtonStep();
             AddAssert("user waiting for load", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
             AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
 
-            AddStep("transitioned to gameplay", () => gameplayStartTracker.EndOperation());
+            AddStep("transitioned to gameplay", () => gameplayStartOperation.Dispose());
             AddAssert("ready button enabled", () => button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index f25835f56a..2a16a62714 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -1,7 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -39,7 +42,10 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         private MusicController music { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private OngoingOperationTracker joiningRoomTracker { get; set; }
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
+
+        [CanBeNull]
+        private IDisposable joiningRoomOperation { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -102,9 +108,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             initialRoomsReceived.BindTo(RoomManager.InitialRoomsReceived);
             initialRoomsReceived.BindValueChanged(_ => updateLoadingLayer());
 
-            if (joiningRoomTracker != null)
+            if (ongoingOperationTracker != null)
             {
-                joiningRoom.BindTo(joiningRoomTracker.InProgress);
+                joiningRoom.BindTo(ongoingOperationTracker.InProgress);
                 joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
             }
         }
@@ -164,15 +170,18 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
         private void joinRequested(Room room)
         {
-            joiningRoomTracker?.BeginOperation();
+            Debug.Assert(joiningRoomOperation == null);
+            joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
 
             RoomManager?.JoinRoom(room, r =>
             {
                 Open(room);
-                joiningRoomTracker?.EndOperation();
+                joiningRoomOperation?.Dispose();
+                joiningRoomOperation = null;
             }, _ =>
             {
-                joiningRoomTracker?.EndOperation();
+                joiningRoomOperation?.Dispose();
+                joiningRoomOperation = null;
             });
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index 7518a4e71b..3785dfc29f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -11,13 +11,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     public class CreateMultiplayerMatchButton : PurpleTriangleButton
     {
         private IBindable<bool> isConnected;
-        private IBindable<bool> joiningRoom;
+        private IBindable<bool> operationInProgress;
 
         [Resolved]
         private StatefulMultiplayerClient multiplayerClient { get; set; }
 
         [Resolved]
-        private OngoingOperationTracker joiningRoomTracker { get; set; }
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -29,10 +29,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             isConnected = multiplayerClient.IsConnected.GetBoundCopy();
             isConnected.BindValueChanged(_ => updateState());
 
-            joiningRoom = joiningRoomTracker.InProgress.GetBoundCopy();
-            joiningRoom.BindValueChanged(_ => updateState(), true);
+            operationInProgress = ongoingOperationTracker.InProgress.GetBoundCopy();
+            operationInProgress.BindValueChanged(_ => updateState(), true);
         }
 
-        private void updateState() => Enabled.Value = isConnected.Value && !joiningRoom.Value;
+        private void updateState() => Enabled.Value = isConnected.Value && !operationInProgress.Value;
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index de25cff546..59b138123d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -68,7 +70,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             [Resolved]
             private Bindable<RulesetInfo> ruleset { get; set; }
 
-            private readonly OngoingOperationTracker applyingSettingsTracker = new OngoingOperationTracker();
+            [Resolved]
+            private OngoingOperationTracker ongoingOperationTracker { get; set; }
+
+            private readonly IBindable<bool> operationInProgress = new BindableBool();
+
+            [CanBeNull]
+            private IDisposable applyingSettingsOperation;
 
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
@@ -277,7 +285,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
                 RoomID.BindValueChanged(roomId => initialBeatmapControl.Alpha = roomId.NewValue == null ? 1 : 0, true);
 
-                applyingSettingsTracker.InProgress.BindValueChanged(v =>
+                operationInProgress.BindTo(ongoingOperationTracker.InProgress);
+                operationInProgress.BindValueChanged(v =>
                 {
                     if (v.NewValue)
                         loadingLayer.Show();
@@ -290,7 +299,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             {
                 base.Update();
 
-                ApplyButton.Enabled.Value = Playlist.Count > 0 && NameField.Text.Length > 0 && !applyingSettingsTracker.InProgress.Value;
+                ApplyButton.Enabled.Value = Playlist.Count > 0 && NameField.Text.Length > 0 && !operationInProgress.Value;
             }
 
             private void apply()
@@ -299,7 +308,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     return;
 
                 hideError();
-                applyingSettingsTracker.BeginOperation();
+
+                Debug.Assert(applyingSettingsOperation == null);
+                applyingSettingsOperation = ongoingOperationTracker.BeginOperation();
 
                 // If the client is already in a room, update via the client.
                 // Otherwise, update the room directly in preparation for it to be submitted to the API on match creation.
@@ -332,15 +343,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             private void onSuccess(Room room)
             {
-                applyingSettingsTracker.EndOperation();
+                Debug.Assert(applyingSettingsOperation != null);
+
                 SettingsApplied?.Invoke();
+
+                applyingSettingsOperation.Dispose();
+                applyingSettingsOperation = null;
             }
 
             private void onError(string text)
             {
+                Debug.Assert(applyingSettingsOperation != null);
+
                 ErrorText.Text = text;
                 ErrorText.FadeIn(50);
-                applyingSettingsTracker.EndOperation();
+
+                applyingSettingsOperation.Dispose();
+                applyingSettingsOperation = null;
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 96470cf070..b145cd46c1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -35,14 +35,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         private OsuColour colours { get; set; }
 
         [Resolved]
-        private OngoingOperationTracker gameplayStartTracker { get; set; }
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
         private SampleChannel sampleReadyCount;
 
         private readonly ButtonWithTrianglesExposed button;
 
         private int countReady;
-        private IBindable<bool> gameplayStartInProgress;
+        private IBindable<bool> operationInProgress;
 
         public MultiplayerReadyButton()
         {
@@ -59,8 +59,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             sampleReadyCount = audio.Samples.Get(@"SongSelect/select-difficulty");
 
-            gameplayStartInProgress = gameplayStartTracker.InProgress.GetBoundCopy();
-            gameplayStartInProgress.BindValueChanged(_ => updateState());
+            operationInProgress = ongoingOperationTracker.InProgress.GetBoundCopy();
+            operationInProgress.BindValueChanged(_ => updateState());
         }
 
         protected override void OnRoomUpdated()
@@ -105,7 +105,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     break;
             }
 
-            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !gameplayStartInProgress.Value;
+            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
 
             if (newCountReady != countReady)
             {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index a87471c8af..b82bf508ce 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -1,9 +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.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -32,13 +34,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
-        [Cached]
-        private OngoingOperationTracker gameplayStartTracker = new OngoingOperationTracker();
+        [Resolved]
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
         private IBindable<bool> isConnected;
 
+        [CanBeNull]
+        private IDisposable gameplayStartOperation;
+
         public MultiplayerMatchSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
@@ -217,7 +222,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             {
                 if (client.Room?.Host?.Equals(localUser) == true)
                 {
-                    gameplayStartTracker.BeginOperation();
+                    Debug.Assert(gameplayStartOperation == null);
+                    gameplayStartOperation = ongoingOperationTracker.BeginOperation();
+
                     client.StartMatch().CatchUnobservedExceptions(true);
                 }
                 else
@@ -232,7 +239,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             int[] userIds = client.CurrentMatchPlayingUserIds.ToArray();
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
-            gameplayStartTracker.EndOperation();
+
+            Debug.Assert(gameplayStartOperation != null);
+
+            gameplayStartOperation.Dispose();
+            gameplayStartOperation = null;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 92665c498b..13ebc1912e 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.OnlinePlay
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
         [Cached]
-        private readonly OngoingOperationTracker joiningRoomTracker = new OngoingOperationTracker();
+        private readonly OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
         [Resolved(CanBeNull = true)]
         private MusicController music { get; set; }

From 03b78d1c4b2de871626068a454b163448f216e09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 15:27:22 +0900
Subject: [PATCH 07310/10326] Handle SocketExceptions and HttpRequestExceptions
 more silently

These can occur when a network connection is completely unavailable (ie.
host resolution failures are occurring). Currently these would appear as
important errors which spammed the notification overlay every retry
forever, while no network connection is available.

I also took this opportunity to remove a lot of `bool` passing which was
no longer in use (previously the fail count / retry process was
different to what we have today).
---
 osu.Game/Online/API/APIAccess.cs | 46 ++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 133ba22406..2aaea22155 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Net;
 using System.Net.Http;
+using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
@@ -293,8 +294,21 @@ namespace osu.Game.Online.API
                 failureCount = 0;
                 return true;
             }
+            catch (HttpRequestException re)
+            {
+                log.Add($"{nameof(HttpRequestException)} while performing request {req}: {re.Message}");
+                handleFailure();
+                return false;
+            }
+            catch (SocketException se)
+            {
+                log.Add($"{nameof(SocketException)} while performing request {req}: {se.Message}");
+                handleFailure();
+                return false;
+            }
             catch (WebException we)
             {
+                log.Add($"{nameof(WebException)} while performing request {req}: {we.Message}");
                 handleWebException(we);
                 return false;
             }
@@ -312,7 +326,7 @@ namespace osu.Game.Online.API
         /// </summary>
         public IBindable<APIState> State => state;
 
-        private bool handleWebException(WebException we)
+        private void handleWebException(WebException we)
         {
             HttpStatusCode statusCode = (we.Response as HttpWebResponse)?.StatusCode
                                         ?? (we.Status == WebExceptionStatus.UnknownError ? HttpStatusCode.NotAcceptable : HttpStatusCode.RequestTimeout);
@@ -330,26 +344,24 @@ namespace osu.Game.Online.API
             {
                 case HttpStatusCode.Unauthorized:
                     Logout();
-                    return true;
+                    break;
 
                 case HttpStatusCode.RequestTimeout:
-                    failureCount++;
-                    log.Add($@"API failure count is now {failureCount}");
-
-                    if (failureCount < 3)
-                        // we might try again at an api level.
-                        return false;
-
-                    if (State.Value == APIState.Online)
-                    {
-                        state.Value = APIState.Failing;
-                        flushQueue();
-                    }
-
-                    return true;
+                    handleFailure();
+                    break;
             }
+        }
 
-            return true;
+        private void handleFailure()
+        {
+            failureCount++;
+            log.Add($@"API failure count is now {failureCount}");
+
+            if (failureCount >= 3 && State.Value == APIState.Online)
+            {
+                state.Value = APIState.Failing;
+                flushQueue();
+            }
         }
 
         public bool IsLoggedIn => localUser.Value.Id > 1;

From 4d04e0dee7c73eaab08ecb4a47cee7822221972a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 16:25:51 +0900
Subject: [PATCH 07311/10326] Disallow entering the playlists/multiplayer
 screens if API is failing

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

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 474cbde192..65a16f2fcb 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Screens.Menu
 
         private void onMultiplayer()
         {
-            if (!api.IsLoggedIn)
+            if (!api.IsLoggedIn || api.State.Value != APIState.Online)
             {
                 notifications?.Post(new SimpleNotification
                 {
@@ -177,11 +177,11 @@ namespace osu.Game.Screens.Menu
 
         private void onPlaylists()
         {
-            if (!api.IsLoggedIn)
+            if (!api.IsLoggedIn || api.State.Value != APIState.Online)
             {
                 notifications?.Post(new SimpleNotification
                 {
-                    Text = "You gotta be logged in to multi 'yo!",
+                    Text = "You gotta be logged in to view playlists 'yo!",
                     Icon = FontAwesome.Solid.Globe,
                     Activated = () =>
                     {

From 906a9b79b5b62a6d25c304549a6308451127079b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 16:47:36 +0900
Subject: [PATCH 07312/10326] Show an error when forcefully exiting online play
 due to API failure

---
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 4074dd1573..75612516a9 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -8,6 +8,7 @@ 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.Drawables;
 using osu.Game.Graphics.Containers;
@@ -165,7 +166,10 @@ namespace osu.Game.Screens.OnlinePlay
         private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
             if (state.NewValue != APIState.Online)
+            {
+                Logger.Log("API connection was lost, can't continue with online play", LoggingTarget.Network, LogLevel.Important);
                 Schedule(forcefullyExit);
+            }
         });
 
         protected override void LoadComplete()

From e9b0652359e9bcffed8c4e84f95a35f3397eef45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 09:09:47 +0100
Subject: [PATCH 07313/10326] Move ready-up operation logic again to client

To salvage ready up button tests.
---
 .../TestSceneMultiplayerReadyButton.cs        | 16 ++++++---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 33 +++++++++++++++++++
 .../Match/MultiplayerMatchFooter.cs           |  4 +--
 .../Match/MultiplayerReadyButton.cs           |  2 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 33 ++++++++-----------
 5 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index de02c6c844..86398b205d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached]
         private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
+        private IDisposable toggleReadyOperation;
+
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
         {
@@ -61,6 +63,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         Beatmap = { Value = beatmap },
                         Ruleset = { Value = beatmap.Ruleset }
                     }
+                },
+                OnToggleReady = async () =>
+                {
+                    toggleReadyOperation = ongoingOperationTracker.BeginOperation();
+
+                    bool gameplayStarted = await Client.ToggleReady();
+                    if (!gameplayStarted)
+                        toggleReadyOperation.Dispose();
                 }
             };
         });
@@ -168,15 +178,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void verifyGameplayStartFlow()
         {
-            IDisposable gameplayStartOperation = null;
-
-            AddStep("hook up tracker", () => button.OnReady = () => gameplayStartOperation = ongoingOperationTracker.BeginOperation());
-
             addClickButtonStep();
             AddAssert("user waiting for load", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
             AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
 
-            AddStep("transitioned to gameplay", () => gameplayStartOperation.Dispose());
+            AddStep("transitioned to gameplay", () => toggleReadyOperation.Dispose());
             AddAssert("ready button enabled", () => button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
         }
     }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 0f44085134..ee42e56d75 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -183,6 +183,39 @@ namespace osu.Game.Online.Multiplayer
             });
         }
 
+        /// <summary>
+        /// Toggles the <see cref="LocalUser"/>'s ready state.
+        /// </summary>
+        /// <returns><c>true</c> if this toggle triggered a gameplay start; <c>false</c> otherwise.</returns>
+        /// <exception cref="InvalidOperationException">If a toggle of ready state is not valid at this time.</exception>
+        public async Task<bool> ToggleReady()
+        {
+            var localUser = LocalUser;
+
+            if (localUser == null)
+                return false;
+
+            switch (localUser.State)
+            {
+                case MultiplayerUserState.Idle:
+                    await ChangeState(MultiplayerUserState.Ready);
+                    return false;
+
+                case MultiplayerUserState.Ready:
+                    if (Room?.Host?.Equals(localUser) == true)
+                    {
+                        await StartMatch();
+                        return true;
+                    }
+
+                    await ChangeState(MultiplayerUserState.Idle);
+                    return false;
+
+                default:
+                    throw new InvalidOperationException($"Cannot toggle ready when in {localUser.State}");
+            }
+        }
+
         public abstract Task TransferHost(int userId);
 
         public abstract Task ChangeSettings(MultiplayerRoomSettings settings);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index bd1ca1377e..a5e7650e31 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -20,9 +20,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
-        public Action OnReady
+        public Action OnToggleReady
         {
-            set => readyButton.OnReady = value;
+            set => readyButton.OnToggleReady = value;
         }
 
         private readonly Drawable background;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index b145cd46c1..251b5b30ae 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
     {
         public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
 
-        public Action OnReady
+        public Action OnToggleReady
         {
             set => button.Action = value;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index b82bf508ce..88b4c8a1bf 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                             new MultiplayerMatchFooter
                             {
                                 SelectedItem = { BindTarget = SelectedItem },
-                                OnReady = onReady
+                                OnToggleReady = onToggleReady
                             }
                         }
                     },
@@ -209,27 +209,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
-        private void onReady()
+        private void onToggleReady()
         {
-            var localUser = client.LocalUser;
+            Debug.Assert(gameplayStartOperation == null);
+            gameplayStartOperation = ongoingOperationTracker.BeginOperation();
 
-            if (localUser == null)
-                return;
+            client.ToggleReady()
+                  .ContinueWith(t =>
+                  {
+                      // if gameplay was started, the button will be unblocked on load requested.
+                      if (t.Result) return;
 
-            if (localUser.State == MultiplayerUserState.Idle)
-                client.ChangeState(MultiplayerUserState.Ready).CatchUnobservedExceptions(true);
-            else
-            {
-                if (client.Room?.Host?.Equals(localUser) == true)
-                {
-                    Debug.Assert(gameplayStartOperation == null);
-                    gameplayStartOperation = ongoingOperationTracker.BeginOperation();
-
-                    client.StartMatch().CatchUnobservedExceptions(true);
-                }
-                else
-                    client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
-            }
+                      // gameplay was not started; unblock button.
+                      gameplayStartOperation?.Dispose();
+                      gameplayStartOperation = null;
+                  })
+                  .CatchUnobservedExceptions();
         }
 
         private void onLoadRequested()

From 274730de34336b646ca57027c6820922cd9fc0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 09:15:33 +0100
Subject: [PATCH 07314/10326] Cache tracker in test scene to resolve test fails

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 8869718fd1..2344ebea0e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -3,10 +3,12 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
@@ -18,6 +20,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         private MultiplayerMatchSubScreen screen;
 
+        [Cached]
+        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
+
         public TestSceneMultiplayerMatchSubScreen()
             : base(false)
         {

From 6bbd0ecfac9fc77ae680064ec61b29f2409380e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 17:39:00 +0900
Subject: [PATCH 07315/10326] Remove unused lock object

---
 osu.Game/Online/Multiplayer/MultiplayerRoom.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
index 2134e50d72..99f0eae2b3 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
@@ -42,8 +42,6 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public MultiplayerRoomUser? Host { get; set; }
 
-        private object writeLock = new object();
-
         [JsonConstructor]
         public MultiplayerRoom(in long roomId)
         {

From cafa241ef3e7d73952956fda2ec83b04ef519da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 09:41:32 +0100
Subject: [PATCH 07316/10326] Fix ready-up button getting stuck if server
 operation fails

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 88b4c8a1bf..5676bb22b4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -11,7 +11,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
-using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -218,13 +217,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                   .ContinueWith(t =>
                   {
                       // if gameplay was started, the button will be unblocked on load requested.
-                      if (t.Result) return;
+                      // accessing Exception here also silences any potential errors from the antecedent task
+                      // (we still want to unblock the button if the ready-up fails).
+                      if (t.Exception == null && t.Result) return;
 
                       // gameplay was not started; unblock button.
                       gameplayStartOperation?.Dispose();
                       gameplayStartOperation = null;
-                  })
-                  .CatchUnobservedExceptions();
+                  });
         }
 
         private void onLoadRequested()

From 5d2319923324b48fa749474c11686db3f82b41d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 10:56:29 +0100
Subject: [PATCH 07317/10326] Trim redundant IsLoggedIn checks

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 65a16f2fcb..3ac9bb6c24 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Screens.Menu
 
         private void onMultiplayer()
         {
-            if (!api.IsLoggedIn || api.State.Value != APIState.Online)
+            if (api.State.Value != APIState.Online)
             {
                 notifications?.Post(new SimpleNotification
                 {
@@ -177,7 +177,7 @@ namespace osu.Game.Screens.Menu
 
         private void onPlaylists()
         {
-            if (!api.IsLoggedIn || api.State.Value != APIState.Online)
+            if (api.State.Value != APIState.Online)
             {
                 notifications?.Post(new SimpleNotification
                 {

From 361d215ab4def9965856c4e998a6373c504bfc0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 10:56:59 +0100
Subject: [PATCH 07318/10326] Reword notification messages to match new logic

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 3ac9bb6c24..fd4d74dc6b 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Screens.Menu
             {
                 notifications?.Post(new SimpleNotification
                 {
-                    Text = "You gotta be logged in to multi 'yo!",
+                    Text = "You gotta be online to multi 'yo!",
                     Icon = FontAwesome.Solid.Globe,
                     Activated = () =>
                     {
@@ -181,7 +181,7 @@ namespace osu.Game.Screens.Menu
             {
                 notifications?.Post(new SimpleNotification
                 {
-                    Text = "You gotta be logged in to view playlists 'yo!",
+                    Text = "You gotta be online to view playlists 'yo!",
                     Icon = FontAwesome.Solid.Globe,
                     Activated = () =>
                     {

From f2163a471a83eee0c0d41486f256a9b607113e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 11:53:42 +0100
Subject: [PATCH 07319/10326] Trim missed reference to deleted member

---
 .../Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 7a3845cbf3..80d1acd145 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -143,7 +143,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 RoomManager =
                 {
                     TimeBetweenListingPolls = { Value = 1 },
-                    TimeBetweenSelectionPolls = { Value = 1 }
                 }
             };
 

From 013b9b62a1ff7dfd22db139d0571259bcd89de43 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Tue, 29 Dec 2020 20:22:56 +0600
Subject: [PATCH 07320/10326] add SV multipliers to taiko difficulty mods

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs     | 9 +++++++++
 osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs | 9 +++++++++
 osu.Game/Rulesets/Mods/ModHardRock.cs            | 2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index d1ad4c9d8d..5ff91eec9f 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.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.Beatmaps;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Taiko.Mods
@@ -8,5 +9,13 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModEasy : ModEasy
     {
         public override string Description => @"Beats move slower, and less accuracy required!";
+
+        private const double slider_multiplier = 0.8;
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            base.ApplyToDifficulty(difficulty);
+            difficulty.SliderMultiplier *= slider_multiplier;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
index 49d225cdb5..37c8dab2de 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.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.Beatmaps;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Taiko.Mods
@@ -9,5 +10,13 @@ namespace osu.Game.Rulesets.Taiko.Mods
     {
         public override double ScoreMultiplier => 1.06;
         public override bool Ranked => true;
+
+        private const double slider_multiplier = 1.87;
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            base.ApplyToDifficulty(difficulty);
+            difficulty.SliderMultiplier *= slider_multiplier;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHardRock.cs b/osu.Game/Rulesets/Mods/ModHardRock.cs
index 0e589735c1..4edcb0b074 100644
--- a/osu.Game/Rulesets/Mods/ModHardRock.cs
+++ b/osu.Game/Rulesets/Mods/ModHardRock.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
         {
         }
 
-        public void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        public virtual void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
             const float ratio = 1.4f;
             difficulty.CircleSize = Math.Min(difficulty.CircleSize * 1.3f, 10.0f); // CS uses a custom 1.3 ratio.

From 3552034ffe0044dc5edff9195e6e609504336c84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Dec 2020 00:55:27 +0900
Subject: [PATCH 07321/10326] 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 cd2ce58c55..611f0d05f4 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1228.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1229.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3e1b56c29c..93aa2bc701 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1228.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1229.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 85ba0590ea..5445adb3fb 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.Framework.iOS" Version="2020.1228.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1229.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1228.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1229.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 9d9c0df64c9213757c51f379ee6be56cce68b87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 17:17:44 +0100
Subject: [PATCH 07322/10326] Make DeserializedMod equality members match other
 IMods

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

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 1e5742c358..3084afb833 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -256,7 +256,7 @@ namespace osu.Game.Scoring
         {
             public string Acronym { get; set; }
 
-            bool IEquatable<IMod>.Equals(IMod other) => other is DeserializedMod them && Equals(them);
+            public bool Equals(IMod other) => other is DeserializedMod them && Equals(them);
             public bool Equals(DeserializedMod other) => Acronym == other?.Acronym;
         }
 

From 497d644a19f04ad19d990bbe7a042f1a556265f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Dec 2020 20:24:50 +0900
Subject: [PATCH 07323/10326] Move thread safety / locking logic from
 MultiplayerRoom

---
 .../Online/Multiplayer/MultiplayerRoom.cs     | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
index 99f0eae2b3..12fcf25ace 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
@@ -5,9 +5,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using Newtonsoft.Json;
-using osu.Framework.Allocation;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -48,27 +46,6 @@ namespace osu.Game.Online.Multiplayer
             RoomID = roomId;
         }
 
-        private object updateLock = new object();
-
-        private ManualResetEventSlim freeForWrite = new ManualResetEventSlim(true);
-
-        /// <summary>
-        /// Request a lock on this room to perform a thread-safe update.
-        /// </summary>
-        public IDisposable LockForUpdate()
-        {
-            // ReSharper disable once InconsistentlySynchronizedField
-            freeForWrite.Wait();
-
-            lock (updateLock)
-            {
-                freeForWrite.Wait();
-                freeForWrite.Reset();
-
-                return new ValueInvokeOnDisposal<MultiplayerRoom>(this, r => freeForWrite.Set());
-            }
-        }
-
         public override string ToString() => $"RoomID:{RoomID} Host:{Host?.UserID} Users:{Users.Count} State:{State} Settings: [{Settings}]";
     }
 }

From 669c42a38d7f3ac2d015754166b7af7aacbd13c9 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Wed, 30 Dec 2020 20:57:41 +0600
Subject: [PATCH 07324/10326] add remarks explaining HR SV multiplier

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs     |  3 +++
 osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index 5ff91eec9f..ad6fdf59e2 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
@@ -10,6 +10,9 @@ namespace osu.Game.Rulesets.Taiko.Mods
     {
         public override string Description => @"Beats move slower, and less accuracy required!";
 
+        /// <summary>
+        /// Multiplier factor added to the scrolling speed.
+        /// </summary>
         private const double slider_multiplier = 0.8;
 
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
index 37c8dab2de..a5a8b75f80 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
@@ -11,7 +11,15 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override double ScoreMultiplier => 1.06;
         public override bool Ranked => true;
 
-        private const double slider_multiplier = 1.87;
+        /// <summary>
+        /// Multiplier factor added to the scrolling speed.
+        /// </summary>
+        /// <remarks>
+        /// This factor is made up of two parts: the base part (1.4) and the aspect ratio adjustment (4/3).
+        /// Stable applies the latter by dividing the width of the user's display by the width of a display with the same height, but 4:3 aspect ratio.
+        /// TODO: Revisit if taiko playfield ever changes away from a hard-coded 16:9 (see https://github.com/ppy/osu/issues/5685).
+        /// </remarks>
+        private const double slider_multiplier = 1.4 * 4 / 3;
 
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {

From 59f2017a13672be09b527873470d528717d4ae70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 30 Dec 2020 16:22:11 +0100
Subject: [PATCH 07325/10326] Move BindValueChanged subscriptions to
 LoadComplete

---
 .../Multiplayer/CreateMultiplayerMatchButton.cs          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index 3785dfc29f..87b0e49b5b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -27,9 +27,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Text = "Create room";
 
             isConnected = multiplayerClient.IsConnected.GetBoundCopy();
-            isConnected.BindValueChanged(_ => updateState());
-
             operationInProgress = ongoingOperationTracker.InProgress.GetBoundCopy();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            isConnected.BindValueChanged(_ => updateState());
             operationInProgress.BindValueChanged(_ => updateState(), true);
         }
 

From dd87478690096232e4833dc69116006b1bf1e57e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 30 Dec 2020 16:29:19 +0100
Subject: [PATCH 07326/10326] Add helper IsHost property to Client

---
 .../Online/Multiplayer/StatefulMultiplayerClient.cs  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index ee42e56d75..290765dc35 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -70,6 +70,18 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
 
+        /// <summary>
+        /// Whether the <see cref="LocalUser"/> is the host in <see cref="Room"/>.
+        /// </summary>
+        public bool IsHost
+        {
+            get
+            {
+                var localUser = LocalUser;
+                return localUser != null && Room?.Host != null && localUser.Equals(Room.Host);
+            }
+        }
+
         [Resolved]
         private UserLookupCache userLookupCache { get; set; } = null!;
 

From d34609b98ed925ccb181f2fc6d47101e3c1623a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 30 Dec 2020 16:29:36 +0100
Subject: [PATCH 07327/10326] Rename On{ToggleReady -> ReadyClick}

---
 .../Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs     | 2 +-
 .../OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs    | 4 ++--
 .../OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs    | 2 +-
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 86398b205d..1d82b29a91 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         Ruleset = { Value = beatmap.Ruleset }
                     }
                 },
-                OnToggleReady = async () =>
+                OnReadyClick = async () =>
                 {
                     toggleReadyOperation = ongoingOperationTracker.BeginOperation();
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index a5e7650e31..bbf861fac3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -20,9 +20,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
-        public Action OnToggleReady
+        public Action OnReadyClick
         {
-            set => readyButton.OnToggleReady = value;
+            set => readyButton.OnReadyClick = value;
         }
 
         private readonly Drawable background;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 251b5b30ae..c6018a79e9 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
     {
         public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
 
-        public Action OnToggleReady
+        public Action OnReadyClick
         {
             set => button.Action = value;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 5676bb22b4..b00ab065fb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -161,7 +161,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                             new MultiplayerMatchFooter
                             {
                                 SelectedItem = { BindTarget = SelectedItem },
-                                OnToggleReady = onToggleReady
+                                OnReadyClick = onToggleReady
                             }
                         }
                     },

From f800448c87f163346a2ce4284ace782646816823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 30 Dec 2020 18:00:57 +0100
Subject: [PATCH 07328/10326] Move game start logic to a higher level

---
 .../TestSceneMultiplayerReadyButton.cs        | 17 ++++---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 15 ++----
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 51 ++++++++++++-------
 3 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 1d82b29a91..a6037dcbf2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached]
         private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
-        private IDisposable toggleReadyOperation;
+        private IDisposable readyClickOperation;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -66,11 +66,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 },
                 OnReadyClick = async () =>
                 {
-                    toggleReadyOperation = ongoingOperationTracker.BeginOperation();
+                    readyClickOperation = ongoingOperationTracker.BeginOperation();
 
-                    bool gameplayStarted = await Client.ToggleReady();
-                    if (!gameplayStarted)
-                        toggleReadyOperation.Dispose();
+                    if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
+                    {
+                        await Client.StartMatch();
+                        return;
+                    }
+
+                    await Client.ToggleReady();
+                    readyClickOperation.Dispose();
                 }
             };
         });
@@ -182,7 +187,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("user waiting for load", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
             AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
 
-            AddStep("transitioned to gameplay", () => toggleReadyOperation.Dispose());
+            AddStep("transitioned to gameplay", () => readyClickOperation.Dispose());
             AddAssert("ready button enabled", () => button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
         }
     }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 290765dc35..5c6baa4fea 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -198,30 +198,23 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// Toggles the <see cref="LocalUser"/>'s ready state.
         /// </summary>
-        /// <returns><c>true</c> if this toggle triggered a gameplay start; <c>false</c> otherwise.</returns>
         /// <exception cref="InvalidOperationException">If a toggle of ready state is not valid at this time.</exception>
-        public async Task<bool> ToggleReady()
+        public async Task ToggleReady()
         {
             var localUser = LocalUser;
 
             if (localUser == null)
-                return false;
+                return;
 
             switch (localUser.State)
             {
                 case MultiplayerUserState.Idle:
                     await ChangeState(MultiplayerUserState.Ready);
-                    return false;
+                    return;
 
                 case MultiplayerUserState.Ready:
-                    if (Room?.Host?.Equals(localUser) == true)
-                    {
-                        await StartMatch();
-                        return true;
-                    }
-
                     await ChangeState(MultiplayerUserState.Idle);
-                    return false;
+                    return;
 
                 default:
                     throw new InvalidOperationException($"Cannot toggle ready when in {localUser.State}");
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index b00ab065fb..1bef8841f5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
+using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -41,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private IBindable<bool> isConnected;
 
         [CanBeNull]
-        private IDisposable gameplayStartOperation;
+        private IDisposable readyClickOperation;
 
         public MultiplayerMatchSubScreen(Room room)
         {
@@ -161,7 +162,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                             new MultiplayerMatchFooter
                             {
                                 SelectedItem = { BindTarget = SelectedItem },
-                                OnReadyClick = onToggleReady
+                                OnReadyClick = onReadyClick
                             }
                         }
                     },
@@ -208,23 +209,37 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
-        private void onToggleReady()
+        private void onReadyClick()
         {
-            Debug.Assert(gameplayStartOperation == null);
-            gameplayStartOperation = ongoingOperationTracker.BeginOperation();
+            Debug.Assert(readyClickOperation == null);
+            readyClickOperation = ongoingOperationTracker.BeginOperation();
+
+            if (client.IsHost && client.LocalUser?.State == MultiplayerUserState.Ready)
+            {
+                client.StartMatch()
+                      .ContinueWith(t =>
+                      {
+                          // accessing Exception here silences any potential errors from the antecedent task
+                          if (t.Exception != null)
+                          {
+                              // gameplay was not started due to an exception; unblock button.
+                              endOperation();
+                          }
+
+                          // gameplay is starting, the button will be unblocked on load requested.
+                      });
+                return;
+            }
 
             client.ToggleReady()
-                  .ContinueWith(t =>
-                  {
-                      // if gameplay was started, the button will be unblocked on load requested.
-                      // accessing Exception here also silences any potential errors from the antecedent task
-                      // (we still want to unblock the button if the ready-up fails).
-                      if (t.Exception == null && t.Result) return;
+                  .ContinueWith(_ => endOperation())
+                  .CatchUnobservedExceptions();
 
-                      // gameplay was not started; unblock button.
-                      gameplayStartOperation?.Dispose();
-                      gameplayStartOperation = null;
-                  });
+            void endOperation()
+            {
+                readyClickOperation?.Dispose();
+                readyClickOperation = null;
+            }
         }
 
         private void onLoadRequested()
@@ -235,10 +250,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
 
-            Debug.Assert(gameplayStartOperation != null);
+            Debug.Assert(readyClickOperation != null);
 
-            gameplayStartOperation.Dispose();
-            gameplayStartOperation = null;
+            readyClickOperation.Dispose();
+            readyClickOperation = null;
         }
 
         protected override void Dispose(bool isDisposing)

From eb64e6bf4da427df3b3b0f1bfab8dbab42f4819f Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Wed, 30 Dec 2020 23:35:07 +0100
Subject: [PATCH 07329/10326] Remove duplicate application/octet-stream

---
 osu.Android/OsuGameActivity.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index da69b516dd..9d28ad7c5b 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -18,7 +18,6 @@ namespace osu.Android
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeType = "application/octet-stream")]
     [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream" })]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity

From f9196ae9767653c75dc2d9ff6a0a273671a4466c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Dec 2020 16:36:20 +0900
Subject: [PATCH 07330/10326] Fix PerformFromMenuRunner failing if
 CurrentScreen is null

---
 osu.Game/PerformFromMenuRunner.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index e2d4fc6051..9222a64023 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -73,13 +73,16 @@ namespace osu.Game
             // find closest valid target
             IScreen current = getCurrentScreen();
 
+            if (current == null)
+                return;
+
             // a dialog may be blocking the execution for now.
             if (checkForDialog(current)) return;
 
             game?.CloseAllOverlays(false);
 
             // we may already be at the target screen type.
-            if (validScreens.Contains(getCurrentScreen().GetType()) && !beatmap.Disabled)
+            if (validScreens.Contains(current.GetType()) && !beatmap.Disabled)
             {
                 complete();
                 return;

From 00c6703c51df3cd05788d1c41d84b64d88de1ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 31 Dec 2020 10:27:42 +0100
Subject: [PATCH 07331/10326] Inline complete method as well

For better guarantees that `finalAction` is actually called on the same
screen that `checkCanComplete()` was (uses result of one
`getCurrentScreen()` call throughout instead of calling multiple times).
---
 osu.Game/PerformFromMenuRunner.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 9222a64023..7999023998 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -84,7 +84,8 @@ namespace osu.Game
             // we may already be at the target screen type.
             if (validScreens.Contains(current.GetType()) && !beatmap.Disabled)
             {
-                complete();
+                finalAction(current);
+                Cancel();
                 return;
             }
 
@@ -138,11 +139,5 @@ namespace osu.Game
             lastEncounteredDialogScreen = current;
             return true;
         }
-
-        private void complete()
-        {
-            finalAction(getCurrentScreen());
-            Cancel();
-        }
     }
 }

From 2d279350ad5f6a4e544601c7be7bca768bef1cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 31 Dec 2020 11:29:02 +0100
Subject: [PATCH 07332/10326] Catch multiplayer client-related unobserved
 exceptions better

Silencing an exception from a task continuation requires accessing
`task.Exception` in any way, which was not done previously if
`logOnError` was false.

To resolve without having to worry whether the compiler will optimise
away a useless access or now, just always log, but switch the logging
level. The unimportant errors will be logged as debug and therefore
essentially silenced on release builds (but could still be potentially
useful in debugging).
---
 osu.Game/Extensions/TaskExtensions.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index a1215d786b..4138c2757a 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -1,7 +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.
 
+#nullable enable
+
+using System;
 using System.Threading.Tasks;
+using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
 
 namespace osu.Game.Extensions
@@ -13,13 +17,19 @@ namespace osu.Game.Extensions
         /// Avoids unobserved exceptions from being fired.
         /// </summary>
         /// <param name="task">The task.</param>
-        /// <param name="logOnError">Whether errors should be logged as important, or silently ignored.</param>
-        public static void CatchUnobservedExceptions(this Task task, bool logOnError = false)
+        /// <param name="logAsError">
+        /// Whether errors should be logged as errors visible to users, or as debug messages.
+        /// Logging as debug will essentially silence the errors on non-release builds.
+        /// </param>
+        public static void CatchUnobservedExceptions(this Task task, bool logAsError = false)
         {
             task.ContinueWith(t =>
             {
-                if (logOnError)
-                    Logger.Log($"Error running task: {t.Exception?.Message ?? "unknown"}", LoggingTarget.Runtime, LogLevel.Important);
+                Exception? exception = t.Exception?.AsSingular();
+                if (logAsError)
+                    Logger.Error(exception, $"Error running task: {exception?.Message ?? "(unknown)"}", LoggingTarget.Runtime, true);
+                else
+                    Logger.Log($"Error running task: {exception}", LoggingTarget.Runtime, LogLevel.Debug);
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
     }

From 7d9a61fbc1b7afad59df89d3cf13cea4cce8be8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 31 Dec 2020 11:50:59 +0100
Subject: [PATCH 07333/10326] Handle unobserved exceptions from ready button
 properly

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 1bef8841f5..39323d9db9 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -222,6 +222,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                           // accessing Exception here silences any potential errors from the antecedent task
                           if (t.Exception != null)
                           {
+                              t.CatchUnobservedExceptions(true); // will run immediately.
                               // gameplay was not started due to an exception; unblock button.
                               endOperation();
                           }
@@ -232,8 +233,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
 
             client.ToggleReady()
-                  .ContinueWith(_ => endOperation())
-                  .CatchUnobservedExceptions();
+                  .ContinueWith(t =>
+                  {
+                      t.CatchUnobservedExceptions(true); // will run immediately.
+                      endOperation();
+                  });
 
             void endOperation()
             {

From 17abe90c27ff837d39e97ec3678dad33bad3e6c9 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Thu, 31 Dec 2020 20:23:13 +0800
Subject: [PATCH 07334/10326] move SkinnableHealthDisplay

Similar components are in osu.Game.Screens.Play.HUD while this is not
---
 .../Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs         | 2 +-
 osu.Game/Screens/Play/{ => HUD}/SkinnableHealthDisplay.cs      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename osu.Game/Screens/Play/{ => HUD}/SkinnableHealthDisplay.cs (95%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index e1b0820662..5bac8582d7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
diff --git a/osu.Game/Screens/Play/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
similarity index 95%
rename from osu.Game/Screens/Play/SkinnableHealthDisplay.cs
rename to osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index d35d15d665..1f91f5e50f 100644
--- a/osu.Game/Screens/Play/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -5,10 +5,9 @@ using System;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
     {

From b4df2d6d43f96659c6687badc4c739770957ebfa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Jan 2021 03:46:09 +0300
Subject: [PATCH 07335/10326] Add method for copying properties from another
 mod

---
 osu.Game/Rulesets/Mods/Mod.cs | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b8dc7a2661..236bf9ff00 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -131,22 +131,31 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         public virtual Mod CreateCopy()
         {
-            var copy = (Mod)Activator.CreateInstance(GetType());
+            var result = (Mod)Activator.CreateInstance(GetType(), true);
+            result.CopyFrom(this);
+            return result;
+        }
+
+        /// <summary>
+        /// Copies properties of given mod into here, through changing value.
+        /// </summary>
+        /// <param name="them">The mod to copy properties from.</param>
+        public void CopyFrom(Mod them)
+        {
+            if (them.GetType() != GetType())
+                throw new ArgumentException($"Expected mod of type {GetType()}, got {them.GetType()}.", nameof(them));
 
-            // Copy bindable values across
             foreach (var (_, prop) in this.GetSettingsSourceProperties())
             {
-                var origBindable = prop.GetValue(this);
-                var copyBindable = prop.GetValue(copy);
+                var ourBindable = prop.GetValue(this);
+                var theirBindable = prop.GetValue(them);
 
                 // The bindables themselves are readonly, so the value must be transferred through the Bindable<T>.Value property.
-                var valueProperty = origBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
+                var valueProperty = theirBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
                 Debug.Assert(valueProperty != null);
 
-                valueProperty.SetValue(copyBindable, valueProperty.GetValue(origBindable));
+                valueProperty.SetValue(ourBindable, valueProperty.GetValue(theirBindable));
             }
-
-            return copy;
         }
 
         public bool Equals(IMod other) => GetType() == other?.GetType();

From 2ce9599957d50f5c9b8220cf7d3105372191a6d4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Jan 2021 03:47:13 +0300
Subject: [PATCH 07336/10326] Copy selected mods properties into overlay's
 buttons

---
 osu.Game/Overlays/Mods/ModSection.cs       | 24 +++++++++++++++-------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 0107f94dcf..86da179064 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -127,18 +127,28 @@ namespace osu.Game.Overlays.Mods
         }
 
         /// <summary>
-        /// Select one or more mods in this section and deselects all other ones.
+        /// Updates all buttons with the given list of selected mods.
         /// </summary>
-        /// <param name="modTypes">The types of <see cref="Mod"/>s which should be selected.</param>
-        public void SelectTypes(IEnumerable<Type> modTypes)
+        /// <param name="newSelectedMods">The types of <see cref="Mod"/>s to select.</param>
+        public void UpdateSelectedMods(IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var button in buttons)
             {
-                int i = Array.FindIndex(button.Mods, m => modTypes.Any(t => t == m.GetType()));
+                int index = -1;
 
-                if (i >= 0)
-                    button.SelectAt(i);
-                else
+                foreach (var mod in newSelectedMods)
+                {
+                    index = Array.FindIndex(button.Mods, m1 => mod.GetType() == m1.GetType());
+                    if (index < 0)
+                        continue;
+
+                    var buttonMod = button.Mods[index];
+                    buttonMod.CopyFrom(mod);
+                    button.SelectAt(index);
+                    break;
+                }
+
+                if (index < 0)
                     button.Deselect();
             }
         }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 34f5c70adb..c1622548f5 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -409,7 +409,7 @@ namespace osu.Game.Overlays.Mods
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             foreach (var section in ModSectionsContainer.Children)
-                section.SelectTypes(mods.NewValue.Select(m => m.GetType()).ToList());
+                section.UpdateSelectedMods(mods.NewValue);
 
             updateMods();
         }

From ee664ad57117fbdd01dd38a3025a621e69bf7eca Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Jan 2021 03:47:18 +0300
Subject: [PATCH 07337/10326] Add test coverage

---
 .../UserInterface/TestSceneModSelectOverlay.cs       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 6f083f4ab6..0d0acbb8f4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -131,6 +131,18 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("ensure mods not selected", () => modDisplay.Current.Value.Count == 0);
         }
 
+        [Test]
+        public void TestExternallySetCustomizedMod()
+        {
+            AddStep("set customized mod externally", () => SelectedMods.Value = new[] { new OsuModDoubleTime { SpeedChange = { Value = 1.01 } } });
+
+            AddAssert("ensure button is selected and customized accordingly", () =>
+            {
+                var button = modSelect.GetModButton(SelectedMods.Value.Single());
+                return ((OsuModDoubleTime)button.SelectedMod).SpeedChange.Value == 1.01;
+            });
+        }
+
         private void testSingleMod(Mod mod)
         {
             selectNext(mod);

From a031c8e0b62f3933e23e049dc75633f6c4603aef Mon Sep 17 00:00:00 2001
From: Salman Ahmed <slmanarendo1950@gmail.com>
Date: Fri, 1 Jan 2021 15:34:09 +0300
Subject: [PATCH 07338/10326] Apply documentation suggestions
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/Overlays/Mods/ModSection.cs | 2 +-
 osu.Game/Rulesets/Mods/Mod.cs        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 86da179064..e29ed4f5c4 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Overlays.Mods
         /// <summary>
         /// Updates all buttons with the given list of selected mods.
         /// </summary>
-        /// <param name="newSelectedMods">The types of <see cref="Mod"/>s to select.</param>
+        /// <param name="newSelectedMods">The new list of selected mods to select.</param>
         public void UpdateSelectedMods(IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var button in buttons)
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 236bf9ff00..6e83299d63 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Rulesets.Mods
         }
 
         /// <summary>
-        /// Copies properties of given mod into here, through changing value.
+        /// Copies mod setting values from <paramref name="them"/> into this instance.
         /// </summary>
         /// <param name="them">The mod to copy properties from.</param>
         public void CopyFrom(Mod them)

From c1a1e3acc5aa199442ce7a96058e1eaae2bc7dd9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Jan 2021 15:40:40 +0300
Subject: [PATCH 07339/10326] Revert drive-by changes

---
 osu.Game/Rulesets/Mods/Mod.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 6e83299d63..3f1f16e561 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         public virtual Mod CreateCopy()
         {
-            var result = (Mod)Activator.CreateInstance(GetType(), true);
+            var result = (Mod)Activator.CreateInstance(GetType());
             result.CopyFrom(this);
             return result;
         }
@@ -151,7 +151,7 @@ namespace osu.Game.Rulesets.Mods
                 var theirBindable = prop.GetValue(them);
 
                 // The bindables themselves are readonly, so the value must be transferred through the Bindable<T>.Value property.
-                var valueProperty = theirBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
+                var valueProperty = ourBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
                 Debug.Assert(valueProperty != null);
 
                 valueProperty.SetValue(ourBindable, valueProperty.GetValue(theirBindable));

From 988f9b98a153d95b5f6de42dc3782d08912c125f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Jan 2021 16:16:00 +0300
Subject: [PATCH 07340/10326] Split button mods updating to private method

---
 osu.Game/Overlays/Mods/ModSection.cs | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index e29ed4f5c4..573d1e5355 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -133,24 +133,24 @@ namespace osu.Game.Overlays.Mods
         public void UpdateSelectedMods(IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var button in buttons)
+                updateButtonMods(button, newSelectedMods);
+        }
+
+        private void updateButtonMods(ModButton button, IReadOnlyList<Mod> newSelectedMods)
+        {
+            foreach (var mod in newSelectedMods)
             {
-                int index = -1;
-
-                foreach (var mod in newSelectedMods)
-                {
-                    index = Array.FindIndex(button.Mods, m1 => mod.GetType() == m1.GetType());
-                    if (index < 0)
-                        continue;
-
-                    var buttonMod = button.Mods[index];
-                    buttonMod.CopyFrom(mod);
-                    button.SelectAt(index);
-                    break;
-                }
-
+                var index = Array.FindIndex(button.Mods, m1 => mod.GetType() == m1.GetType());
                 if (index < 0)
-                    button.Deselect();
+                    continue;
+
+                var buttonMod = button.Mods[index];
+                buttonMod.CopyFrom(mod);
+                button.SelectAt(index);
+                return;
             }
+
+            button.Deselect();
         }
 
         protected ModSection()

From 7441cfd94ee93e764102eead7839bb2c862ce541 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 17:53:29 +0000
Subject: [PATCH 07341/10326] Bump
 Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson

Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/aspnet/AspNetCore) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/aspnet/AspNetCore/releases)
- [Commits](https://github.com/aspnet/AspNetCore/compare/v3.1.9...v3.1.10)

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 93aa2bc701..4c57eb6d00 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.9" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.10" />
     <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" />

From 0fd2e368c1c73e0d2e4932a620f2f4c6021633c7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 17:53:41 +0000
Subject: [PATCH 07342/10326] Bump Microsoft.NET.Test.Sdk from 16.8.0 to 16.8.3

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.0 to 16.8.3.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3)

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 61ecd79e3d..51d2032795 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 fa7bfd7169..3261f632f2 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 d6a03da807..32243e0bc3 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 a89645d881..210f81d111 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 83d7b4135a..9049b67f90 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 bc6b994988..dc4f22788d 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>

From 652b0ccd8fe5c47dbde90e41f15d8d11baea76f7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 17:54:11 +0000
Subject: [PATCH 07343/10326] Bump Microsoft.AspNetCore.SignalR.Client from
 3.1.9 to 3.1.10

Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/aspnet/AspNetCore) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/aspnet/AspNetCore/releases)
- [Commits](https://github.com/aspnet/AspNetCore/compare/v3.1.9...v3.1.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 93aa2bc701..3c8df17ee5 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 5445adb3fb..f5c133263b 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -78,7 +78,7 @@
     <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From 6cd838fd4b8e510739891e64019c192122e08f2f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 17:55:04 +0000
Subject: [PATCH 07344/10326] Bump Microsoft.CodeAnalysis.BannedApiAnalyzers
 from 3.3.1 to 3.3.2

Bumps [Microsoft.CodeAnalysis.BannedApiAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 551cb75077..9ec442aafa 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,7 +16,7 @@
     <EmbeddedResource Include="Resources\**\*.*" />
   </ItemGroup>
   <ItemGroup Label="Code Analysis">
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />
   </ItemGroup>

From fa73d0172e01492f6f22c8c457751c0ea37fb659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 2 Jan 2021 00:11:21 +0100
Subject: [PATCH 07345/10326] Keep SignalR at last working version on iOS

---
 osu.iOS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index f5c133263b..5445adb3fb 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -78,7 +78,7 @@
     <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From 72a6ca77559c409bc0a5671663510d1fbcbaffb6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 2 Jan 2021 16:47:00 +0900
Subject: [PATCH 07346/10326] Allow signalr to retry connecting when connection
 is closed without an exception

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 24ea6abc4a..7cd1ef78f7 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -88,11 +88,12 @@ namespace osu.Game.Online.Multiplayer
             {
                 isConnected.Value = false;
 
-                if (ex != null)
-                {
-                    Logger.Log($"Multiplayer client lost connection: {ex}", LoggingTarget.Network);
+                Logger.Log(ex != null
+                    ? $"Multiplayer client lost connection: {ex}"
+                    : "Multiplayer client disconnected", LoggingTarget.Network);
+
+                if (connection != null)
                     await tryUntilConnected();
-                }
             };
 
             await tryUntilConnected();

From 66bd847b4507cb575549c01496dbabf819c6164b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 2 Jan 2021 11:53:06 +0100
Subject: [PATCH 07347/10326] Bump InspectCode tool to 2020.3.2

---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index dd53eefd23..58c24181d3 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "jetbrains.resharper.globaltools": {
-      "version": "2020.2.4",
+      "version": "2020.3.2",
       "commands": [
         "jb"
       ]

From 18ac97ca563e9a02d56c469e5c084ccfa4b1e978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 2 Jan 2021 12:21:53 +0100
Subject: [PATCH 07348/10326] Disable "merge sequential patterns" suggestions

As they were considered to be detrimental to code readability.
---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 22ea73858e..aa8f8739c1 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -106,6 +106,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>

From 924af58f5b1ba2b5fcdaa00a79db21ce6c19bceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 2 Jan 2021 12:25:16 +0100
Subject: [PATCH 07349/10326] Replace using static with explicit nested
 reference

This seems to be an inspectcode bug, as the code is correct and
compiles, but let's just work around it for now.
---
 .../Visual/Components/TestScenePreviewTrackManager.cs      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs b/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
index a3db20ce83..9a999a4931 100644
--- a/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
+++ b/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
@@ -8,7 +8,6 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
-using static osu.Game.Tests.Visual.Components.TestScenePreviewTrackManager.TestPreviewTrackManager;
 
 namespace osu.Game.Tests.Visual.Components
 {
@@ -100,7 +99,7 @@ namespace osu.Game.Tests.Visual.Components
         [Test]
         public void TestNonPresentTrack()
         {
-            TestPreviewTrack track = null;
+            TestPreviewTrackManager.TestPreviewTrack track = null;
 
             AddStep("get non-present track", () =>
             {
@@ -182,9 +181,9 @@ namespace osu.Game.Tests.Visual.Components
             AddAssert("track stopped", () => !track.IsRunning);
         }
 
-        private TestPreviewTrack getTrack() => (TestPreviewTrack)trackManager.Get(null);
+        private TestPreviewTrackManager.TestPreviewTrack getTrack() => (TestPreviewTrackManager.TestPreviewTrack)trackManager.Get(null);
 
-        private TestPreviewTrack getOwnedTrack()
+        private TestPreviewTrackManager.TestPreviewTrack getOwnedTrack()
         {
             var track = getTrack();
 

From 6c3ccaddbfec4a148ad6080e2ab6e958d54cd2e0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 2 Jan 2021 12:51:41 +0000
Subject: [PATCH 07350/10326] Bump Microsoft.CodeAnalysis.FxCopAnalyzers from
 3.3.1 to 3.3.2

Bumps [Microsoft.CodeAnalysis.FxCopAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 9ec442aafa..a74b204436 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,7 +18,7 @@
   <ItemGroup Label="Code Analysis">
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup Label="Code Analysis">
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis\osu.ruleset</CodeAnalysisRuleSet>

From e2de5bb8f940e71fcf9cfefa8fe504966c5e00bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 2 Jan 2021 22:05:41 +0900
Subject: [PATCH 07351/10326] Fix the beatmap carousel not returning to centre
 correctly after resizing window

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index d76f0abb9e..c83c89bb7f 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -567,6 +568,15 @@ namespace osu.Game.Screens.Select
 
         #endregion
 
+        protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
+        {
+            // handles the vertical size of the carousel changing (ie. on window resize when aspect ratio has changed).
+            if ((invalidation & Invalidation.Layout) > 0)
+                itemsCache.Invalidate();
+
+            return base.OnInvalidate(invalidation, source);
+        }
+
         protected override void Update()
         {
             base.Update();

From 26b2a065bc365fc75e04315dfe9cbc71a3b0bb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 2 Jan 2021 14:25:15 +0100
Subject: [PATCH 07352/10326] Add deprecation warning ignore with explanation

---
 Directory.Build.props | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a74b204436..b55eff9df9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -28,9 +28,17 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Label="Project">
-    <!-- DeepEqual is not netstandard-compatible. This is fine since we run tests with .NET Framework anyway.
-    This is required due to https://github.com/NuGet/Home/issues/5740 -->
-    <NoWarn>$(NoWarn);NU1701</NoWarn>
+    <!--
+    NU1701:
+      DeepEqual is not netstandard-compatible. This is fine since we run tests with .NET Framework anyway.
+      This is required due to https://github.com/NuGet/Home/issues/5740
+
+    CA9998:
+      Microsoft.CodeAnalysis.FxCopAnalyzers has been deprecated.
+      The entire package will be able to be removed after migrating to .NET 5,
+      as analysers are shipped as part of the .NET 5 SDK anyway.
+    -->
+    <NoWarn>$(NoWarn);NU1701;CA9998</NoWarn>
   </PropertyGroup>
   <PropertyGroup Label="Nuget">
     <IsPackable>false</IsPackable>
@@ -43,4 +51,4 @@
     <Copyright>Copyright (c) 2020 ppy Pty Ltd</Copyright>
     <PackageTags>osu game</PackageTags>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

From 4266c67bb66dc58fcdbc4406afe38a7d47c392d9 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 2 Jan 2021 19:19:55 +0100
Subject: [PATCH 07353/10326] Remove duplicated code path in switch.

---
 osu.Android/OsuGameActivity.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 42d9ad33ab..788e5f82be 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -62,13 +62,6 @@ namespace osu.Android
                     break;
 
                 case Intent.ActionSend:
-                {
-                    var content = intent.ClipData?.GetItemAt(0);
-                    if (content != null)
-                        handleImportFromUris(content.Uri);
-                    break;
-                }
-
                 case Intent.ActionSendMultiple:
                 {
                     var uris = new List<Uri>();

From 0e0cb94ed5804fc9ef1b2316ec3e2663a5341fe8 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Sun, 3 Jan 2021 03:20:25 +0100
Subject: [PATCH 07354/10326] testing (#2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Catch multiplayer client-related unobserved exceptions better

Silencing an exception from a task continuation requires accessing
`task.Exception` in any way, which was not done previously if
`logOnError` was false.

To resolve without having to worry whether the compiler will optimise
away a useless access or now, just always log, but switch the logging
level. The unimportant errors will be logged as debug and therefore
essentially silenced on release builds (but could still be potentially
useful in debugging).

* move SkinnableHealthDisplay

Similar components are in osu.Game.Screens.Play.HUD while this is not

* Bump Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson

Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/aspnet/AspNetCore) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/aspnet/AspNetCore/releases)
- [Commits](https://github.com/aspnet/AspNetCore/compare/v3.1.9...v3.1.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump Microsoft.NET.Test.Sdk from 16.8.0 to 16.8.3

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.0 to 16.8.3.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump Microsoft.AspNetCore.SignalR.Client from 3.1.9 to 3.1.10

Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/aspnet/AspNetCore) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/aspnet/AspNetCore/releases)
- [Commits](https://github.com/aspnet/AspNetCore/compare/v3.1.9...v3.1.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump Microsoft.CodeAnalysis.BannedApiAnalyzers from 3.3.1 to 3.3.2

Bumps [Microsoft.CodeAnalysis.BannedApiAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Keep SignalR at last working version on iOS

* Allow signalr to retry connecting when connection is closed without an exception

* Bump InspectCode tool to 2020.3.2

* Disable "merge sequential patterns" suggestions

As they were considered to be detrimental to code readability.

* Replace using static with explicit nested reference

This seems to be an inspectcode bug, as the code is correct and
compiles, but let's just work around it for now.

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Co-authored-by: mcendu <nathandu@outlook.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 .config/dotnet-tools.json                      |  2 +-
 Directory.Build.props                          |  2 +-
 .../osu.Game.Rulesets.Catch.Tests.csproj       |  2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj       |  2 +-
 .../osu.Game.Rulesets.Osu.Tests.csproj         |  2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj       |  2 +-
 .../Components/TestScenePreviewTrackManager.cs |  7 +++----
 .../TestSceneSkinnableHealthDisplay.cs         |  2 +-
 osu.Game.Tests/osu.Game.Tests.csproj           |  2 +-
 .../osu.Game.Tournament.Tests.csproj           |  2 +-
 osu.Game/Extensions/TaskExtensions.cs          | 18 ++++++++++++++----
 .../Online/Multiplayer/MultiplayerClient.cs    |  9 +++++----
 .../Play/{ => HUD}/SkinnableHealthDisplay.cs   |  3 +--
 osu.Game/osu.Game.csproj                       |  4 ++--
 osu.sln.DotSettings                            |  1 +
 15 files changed, 35 insertions(+), 25 deletions(-)
 rename osu.Game/Screens/Play/{ => HUD}/SkinnableHealthDisplay.cs (95%)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index dd53eefd23..58c24181d3 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "jetbrains.resharper.globaltools": {
-      "version": "2020.2.4",
+      "version": "2020.3.2",
       "commands": [
         "jb"
       ]
diff --git a/Directory.Build.props b/Directory.Build.props
index 551cb75077..9ec442aafa 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,7 +16,7 @@
     <EmbeddedResource Include="Resources\**\*.*" />
   </ItemGroup>
   <ItemGroup Label="Code Analysis">
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />
   </ItemGroup>
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 61ecd79e3d..51d2032795 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 fa7bfd7169..3261f632f2 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 d6a03da807..32243e0bc3 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 a89645d881..210f81d111 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs b/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
index a3db20ce83..9a999a4931 100644
--- a/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
+++ b/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
@@ -8,7 +8,6 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
-using static osu.Game.Tests.Visual.Components.TestScenePreviewTrackManager.TestPreviewTrackManager;
 
 namespace osu.Game.Tests.Visual.Components
 {
@@ -100,7 +99,7 @@ namespace osu.Game.Tests.Visual.Components
         [Test]
         public void TestNonPresentTrack()
         {
-            TestPreviewTrack track = null;
+            TestPreviewTrackManager.TestPreviewTrack track = null;
 
             AddStep("get non-present track", () =>
             {
@@ -182,9 +181,9 @@ namespace osu.Game.Tests.Visual.Components
             AddAssert("track stopped", () => !track.IsRunning);
         }
 
-        private TestPreviewTrack getTrack() => (TestPreviewTrack)trackManager.Get(null);
+        private TestPreviewTrackManager.TestPreviewTrack getTrack() => (TestPreviewTrackManager.TestPreviewTrack)trackManager.Get(null);
 
-        private TestPreviewTrack getOwnedTrack()
+        private TestPreviewTrackManager.TestPreviewTrack getOwnedTrack()
         {
             var track = getTrack();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index e1b0820662..5bac8582d7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 83d7b4135a..9049b67f90 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 bc6b994988..dc4f22788d 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index a1215d786b..4138c2757a 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -1,7 +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.
 
+#nullable enable
+
+using System;
 using System.Threading.Tasks;
+using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
 
 namespace osu.Game.Extensions
@@ -13,13 +17,19 @@ namespace osu.Game.Extensions
         /// Avoids unobserved exceptions from being fired.
         /// </summary>
         /// <param name="task">The task.</param>
-        /// <param name="logOnError">Whether errors should be logged as important, or silently ignored.</param>
-        public static void CatchUnobservedExceptions(this Task task, bool logOnError = false)
+        /// <param name="logAsError">
+        /// Whether errors should be logged as errors visible to users, or as debug messages.
+        /// Logging as debug will essentially silence the errors on non-release builds.
+        /// </param>
+        public static void CatchUnobservedExceptions(this Task task, bool logAsError = false)
         {
             task.ContinueWith(t =>
             {
-                if (logOnError)
-                    Logger.Log($"Error running task: {t.Exception?.Message ?? "unknown"}", LoggingTarget.Runtime, LogLevel.Important);
+                Exception? exception = t.Exception?.AsSingular();
+                if (logAsError)
+                    Logger.Error(exception, $"Error running task: {exception?.Message ?? "(unknown)"}", LoggingTarget.Runtime, true);
+                else
+                    Logger.Log($"Error running task: {exception}", LoggingTarget.Runtime, LogLevel.Debug);
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
     }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 24ea6abc4a..7cd1ef78f7 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -88,11 +88,12 @@ namespace osu.Game.Online.Multiplayer
             {
                 isConnected.Value = false;
 
-                if (ex != null)
-                {
-                    Logger.Log($"Multiplayer client lost connection: {ex}", LoggingTarget.Network);
+                Logger.Log(ex != null
+                    ? $"Multiplayer client lost connection: {ex}"
+                    : "Multiplayer client disconnected", LoggingTarget.Network);
+
+                if (connection != null)
                     await tryUntilConnected();
-                }
             };
 
             await tryUntilConnected();
diff --git a/osu.Game/Screens/Play/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
similarity index 95%
rename from osu.Game/Screens/Play/SkinnableHealthDisplay.cs
rename to osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index d35d15d665..1f91f5e50f 100644
--- a/osu.Game/Screens/Play/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -5,10 +5,9 @@ using System;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
     {
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 93aa2bc701..6c220a5c21 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.9" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.10" />
     <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" />
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 22ea73858e..aa8f8739c1 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -106,6 +106,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>

From 8bb84570df904c9c55cc781e18cc13bfb13e834e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 04:21:50 +0300
Subject: [PATCH 07355/10326] Introduce beatmap availability structure

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 56 ++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 osu.Game/Online/Rooms/BeatmapAvailability.cs

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
new file mode 100644
index 0000000000..ca53cb2295
--- /dev/null
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.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;
+
+namespace osu.Game.Online.Rooms
+{
+    /// <summary>
+    /// The local availability information about a certain beatmap for the client.
+    /// </summary>
+    public readonly struct BeatmapAvailability : IEquatable<BeatmapAvailability>
+    {
+        /// <summary>
+        /// The beatmap's availability state.
+        /// </summary>
+        public readonly DownloadState State;
+
+        /// <summary>
+        /// The beatmap's downloading progress, null when not in <see cref="DownloadState.Downloading"/> state.
+        /// </summary>
+        public readonly double? DownloadProgress;
+
+        /// <summary>
+        /// Constructs a new non-<see cref="DownloadState.Downloading"/> beatmap availability state.
+        /// </summary>
+        /// <param name="state">The beatmap availability state.</param>
+        /// <exception cref="ArgumentException">Throws if <see cref="DownloadState.Downloading"/> was specified in this constructor, as it has its own constructor (see <see cref="BeatmapAvailability(DownloadState, double)"/>.</exception>
+        public BeatmapAvailability(DownloadState state)
+        {
+            if (state == DownloadState.Downloading)
+                throw new ArgumentException($"{nameof(DownloadState.Downloading)} state has its own constructor, use it instead.");
+
+            State = state;
+            DownloadProgress = null;
+        }
+
+        /// <summary>
+        /// Constructs a new <see cref="DownloadState.Downloading"/>-specific beatmap availability state.
+        /// </summary>
+        /// <param name="state">The beatmap availability state (always <see cref="DownloadState.Downloading"/>).</param>
+        /// <param name="downloadProgress">The beatmap's downloading current progress.</param>
+        /// <exception cref="ArgumentException">Throws if non-<see cref="DownloadState.Downloading"/> was specified in this constructor, as they have their own constructor (see <see cref="BeatmapAvailability(DownloadState)"/>.</exception>
+        public BeatmapAvailability(DownloadState state, double downloadProgress)
+        {
+            if (state != DownloadState.Downloading)
+                throw new ArgumentException($"This is a constructor specific for {DownloadState.Downloading} state, use the regular one instead.");
+
+            State = DownloadState.Downloading;
+            DownloadProgress = downloadProgress;
+        }
+
+        public bool Equals(BeatmapAvailability other) => State == other.State && DownloadProgress == other.DownloadProgress;
+
+        public override string ToString() => $"{string.Join(", ", State, $"{DownloadProgress:0.00%}")}";
+    }
+}

From 09e5e2629ab2ffa0ad052683bcb91000e18a87fe Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 04:25:06 +0300
Subject: [PATCH 07356/10326] Add user beatmap availability property

---
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 99624dc3e7..92c92f438d 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -5,6 +5,7 @@
 
 using System;
 using Newtonsoft.Json;
+using osu.Game.Online.Rooms;
 using osu.Game.Users;
 
 namespace osu.Game.Online.Multiplayer
@@ -16,6 +17,11 @@ namespace osu.Game.Online.Multiplayer
 
         public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
 
+        /// <summary>
+        /// The availability state of the beatmap, set to <see cref="DownloadState.LocallyAvailable"/> by default.
+        /// </summary>
+        public BeatmapAvailability BeatmapAvailability { get; set; } = new BeatmapAvailability(DownloadState.LocallyAvailable);
+
         public User? User { get; set; }
 
         [JsonConstructor]

From dfa8be9173839c3f5dd7aaabb14f0a60692580f1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 04:32:50 +0300
Subject: [PATCH 07357/10326] Add beatmap availability change state & event
 methods

---
 .../Online/Multiplayer/IMultiplayerClient.cs  |  8 ++++++++
 .../Multiplayer/IMultiplayerRoomServer.cs     |  8 ++++++++
 .../Online/Multiplayer/MultiplayerClient.cs   |  9 +++++++++
 .../Multiplayer/StatefulMultiplayerClient.cs  | 20 +++++++++++++++++++
 .../Multiplayer/TestMultiplayerClient.cs      | 15 ++++++++++++++
 5 files changed, 60 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index b97fcc9ae7..5410fbc030 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading.Tasks;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -47,6 +48,13 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="state">The new state of the user.</param>
         Task UserStateChanged(int userId, MultiplayerUserState state);
 
+        /// <summary>
+        /// Signals that a user in this room has their beatmap availability state changed.
+        /// </summary>
+        /// <param name="userId">The ID of the user whose beatmap availability state has changed.</param>
+        /// <param name="beatmapAvailability">The new beatmap availability state of the user.</param>
+        Task UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability);
+
         /// <summary>
         /// Signals that a match is to be started. This will *only* be sent to clients which are to begin loading at this point.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 481e3fb1de..7fda526faf 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading.Tasks;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -40,6 +41,13 @@ namespace osu.Game.Online.Multiplayer
         /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task ChangeState(MultiplayerUserState newState);
 
+        /// <summary>
+        /// Change the user's local availability state of the beatmap set in joined room.
+        /// This will also force user state back to <see cref="MultiplayerUserState.Idle"/>.
+        /// </summary>
+        /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
+        Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
+
         /// <summary>
         /// As the host of a room, start the match.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 7cd1ef78f7..50dc8f661c 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -14,6 +14,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -173,6 +174,14 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
         }
 
+        public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeBeatmapAvailability), newBeatmapAvailability);
+        }
+
         public override Task StartMatch()
         {
             if (!isConnected.Value)
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index dc80488d39..c1818de87a 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -184,6 +184,8 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task ChangeState(MultiplayerUserState newState);
 
+        public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
+
         public abstract Task StartMatch();
 
         Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
@@ -311,6 +313,24 @@ namespace osu.Game.Online.Multiplayer
             return Task.CompletedTask;
         }
 
+        Task IMultiplayerClient.UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability)
+        {
+            if (Room == null)
+                return Task.CompletedTask;
+
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Single(u => u.UserID == userId).BeatmapAvailability = beatmapAvailability;
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
+        }
+
         Task IMultiplayerClient.LoadRequested()
         {
             if (Room == null)
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 2ce5211757..c155447f8c 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -77,6 +78,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
         }
 
+        public void ChangeUserBeatmapAvailability(int userId, BeatmapAvailability newBeatmapAvailability)
+        {
+            Debug.Assert(Room != null);
+
+            ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged(userId, newBeatmapAvailability);
+            ChangeUserState(userId, MultiplayerUserState.Idle);
+        }
+
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
         {
             var user = new MultiplayerRoomUser(api.LocalUser.Value.Id) { User = api.LocalUser.Value };
@@ -108,6 +117,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.CompletedTask;
         }
 
+        public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
+        {
+            ChangeUserBeatmapAvailability(api.LocalUser.Value.Id, newBeatmapAvailability);
+            return Task.CompletedTask;
+        }
+
         public override Task StartMatch()
         {
             Debug.Assert(Room != null);

From caa5109e3a0e1e526c789024d2ecbc9d57767e76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 12:18:35 +0900
Subject: [PATCH 07358/10326] Add precautionary null checks to update methods
 in SongSelect

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a5252fdc96..8ad1ace36a 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -428,7 +428,7 @@ namespace osu.Game.Screens.Select
 
         private void updateSelectedBeatmap(BeatmapInfo beatmap)
         {
-            if (beatmap?.Equals(beatmapNoDebounce) == true)
+            if (beatmap == null || beatmap.Equals(beatmapNoDebounce))
                 return;
 
             beatmapNoDebounce = beatmap;
@@ -438,7 +438,7 @@ namespace osu.Game.Screens.Select
 
         private void updateSelectedRuleset(RulesetInfo ruleset)
         {
-            if (ruleset?.Equals(rulesetNoDebounce) == true)
+            if (ruleset == null || ruleset.Equals(rulesetNoDebounce))
                 return;
 
             rulesetNoDebounce = ruleset;

From 2e5c67be3f415bc0841c4ae2cd122237ff49c380 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Wed, 30 Dec 2020 12:29:51 +0700
Subject: [PATCH 07359/10326] Add ability to toggle discord rich presence

There are 3 modes: enabled, limited, and disabled.

The limited mode hides identifiable information such as username, rank, and
(if participating in one) multiplayer lobby name.
---
 osu.Desktop/DiscordRichPresence.cs            | 15 ++++++++---
 .../Configuration/DiscordRichPresenceMode.cs  | 17 ++++++++++++
 osu.Game/Configuration/OsuConfigManager.cs    |  5 +++-
 .../Sections/Online/IntegrationSettings.cs    | 27 +++++++++++++++++++
 .../Settings/Sections/OnlineSection.cs        |  3 ++-
 5 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Configuration/DiscordRichPresenceMode.cs
 create mode 100644 osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index f1878d967d..6b331d4952 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
+using osu.Game.Configuration;
 using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Users;
@@ -30,6 +31,7 @@ namespace osu.Desktop
 
         private readonly IBindable<UserStatus> status = new Bindable<UserStatus>();
         private readonly IBindable<UserActivity> activity = new Bindable<UserActivity>();
+        private readonly Bindable<DiscordRichPresenceMode> mode = new Bindable<DiscordRichPresenceMode>();
 
         private readonly RichPresence presence = new RichPresence
         {
@@ -37,7 +39,7 @@ namespace osu.Desktop
         };
 
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider provider)
+        private void load(IAPIProvider provider, OsuConfigManager config)
         {
             client = new DiscordRpcClient(client_id)
             {
@@ -51,6 +53,7 @@ namespace osu.Desktop
 
             client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Code} {e.Message}", LoggingTarget.Network);
 
+            config.BindWith(OsuSetting.DiscordRichPresence, mode);
             (user = provider.LocalUser.GetBoundCopy()).BindValueChanged(u =>
             {
                 status.UnbindBindings();
@@ -63,6 +66,7 @@ namespace osu.Desktop
             ruleset.BindValueChanged(_ => updateStatus());
             status.BindValueChanged(_ => updateStatus());
             activity.BindValueChanged(_ => updateStatus());
+            mode.BindValueChanged(_ => updateStatus());
 
             client.Initialize();
         }
@@ -78,7 +82,7 @@ namespace osu.Desktop
             if (!client.IsInitialized)
                 return;
 
-            if (status.Value is UserStatusOffline)
+            if (status.Value is UserStatusOffline || mode.Value == DiscordRichPresenceMode.Disabled)
             {
                 client.ClearPresence();
                 return;
@@ -96,7 +100,10 @@ namespace osu.Desktop
             }
 
             // update user information
-            presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.Ranks.Global > 0 ? $" (rank #{user.Value.Statistics.Ranks.Global:N0})" : string.Empty);
+            if (mode.Value == DiscordRichPresenceMode.Limited)
+                presence.Assets.LargeImageText = string.Empty;
+            else
+                presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.Ranks.Global > 0 ? $" (rank #{user.Value.Statistics.Ranks.Global:N0})" : string.Empty);
 
             // update ruleset
             presence.Assets.SmallImageKey = ruleset.Value.ID <= 3 ? $"mode_{ruleset.Value.ID}" : "mode_custom";
@@ -137,7 +144,7 @@ namespace osu.Desktop
                     return edit.Beatmap.ToString();
 
                 case UserActivity.InLobby lobby:
-                    return lobby.Room.Name.Value;
+                    return mode.Value == DiscordRichPresenceMode.Limited ? string.Empty : lobby.Room.Name.Value;
             }
 
             return string.Empty;
diff --git a/osu.Game/Configuration/DiscordRichPresenceMode.cs b/osu.Game/Configuration/DiscordRichPresenceMode.cs
new file mode 100644
index 0000000000..bd39faff4d
--- /dev/null
+++ b/osu.Game/Configuration/DiscordRichPresenceMode.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.ComponentModel;
+
+namespace osu.Game.Configuration
+{
+    public enum DiscordRichPresenceMode
+    {
+        Disabled,
+
+        [Description("Hide identifiable information")]
+        Limited,
+
+        Enabled
+    }
+}
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index a07e446d2e..c733fe2fb4 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.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;
@@ -138,6 +138,8 @@ namespace osu.Game.Configuration
             Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
             Set(OsuSetting.SeasonalBackgroundMode, SeasonalBackgroundMode.Sometimes);
 
+            Set(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Enabled);
+
             Set(OsuSetting.EditorWaveformOpacity, 1f);
         }
 
@@ -266,6 +268,7 @@ namespace osu.Game.Configuration
         GameplayDisableWinKey,
         SeasonalBackgroundMode,
         EditorWaveformOpacity,
+        DiscordRichPresence,
         AutomaticallyDownloadWhenSpectating,
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs
new file mode 100644
index 0000000000..d2867962c0
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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.Configuration;
+
+namespace osu.Game.Overlays.Settings.Sections.Online
+{
+    public class IntegrationSettings : SettingsSubsection
+    {
+        protected override string Header => "Integrations";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsEnumDropdown<DiscordRichPresenceMode>
+                {
+                    LabelText = "Discord Rich Presence",
+                    Current = config.GetBindable<DiscordRichPresenceMode>(OsuSetting.DiscordRichPresence)
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
index 150cddb388..7aa4eff29a 100644
--- a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
@@ -20,7 +20,8 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             Children = new Drawable[]
             {
-                new WebSettings()
+                new WebSettings(),
+                new IntegrationSettings()
             };
         }
     }

From a6d49929978a2617ef2f180d3e3e868513e8737e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 12:53:25 +0900
Subject: [PATCH 07360/10326] Ensure SelectionChanged events are only sent once
 when selection is null

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 31 ++++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index c83c89bb7f..37213c6003 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -125,6 +125,8 @@ namespace osu.Game.Screens.Select
             {
                 BeatmapSetsChanged?.Invoke();
                 BeatmapSetsLoaded = true;
+
+                itemsCache.Invalidate();
             });
         }
 
@@ -731,6 +733,12 @@ namespace osu.Game.Screens.Select
 
         private const float panel_padding = 5;
 
+        /// <summary>
+        /// After loading, we want to invoke a selection changed event at least once.
+        /// This handles the case where this event is potentially sending a null selection.
+        /// </summary>
+        private bool sentInitialSelectionEvent;
+
         /// <summary>
         /// Computes the target Y positions for every item in the carousel.
         /// </summary>
@@ -787,13 +795,21 @@ namespace osu.Game.Screens.Select
 
             Scroll.ScrollContent.Height = currentY;
 
-            if (BeatmapSetsLoaded && (selectedBeatmapSet == null || selectedBeatmap == null || selectedBeatmapSet.State.Value != CarouselItemState.Selected))
-            {
-                selectedBeatmapSet = null;
-                SelectionChanged?.Invoke(null);
-            }
-
             itemsCache.Validate();
+
+            // update and let external consumers know about selection loss.
+            if (BeatmapSetsLoaded)
+            {
+                bool selectionLost = selectedBeatmapSet != null && selectedBeatmapSet.State.Value != CarouselItemState.Selected;
+
+                if (selectionLost || !sentInitialSelectionEvent)
+                {
+                    selectedBeatmapSet = null;
+                    SelectionChanged?.Invoke(null);
+
+                    sentInitialSelectionEvent = true;
+                }
+            }
         }
 
         private bool firstScroll = true;
@@ -816,14 +832,13 @@ namespace osu.Game.Screens.Select
                         break;
 
                     case PendingScrollOperation.Immediate:
+
                         // in order to simplify animation logic, rather than using the animated version of ScrollTo,
                         // we take the difference in scroll height and apply to all visible panels.
                         // this avoids edge cases like when the visible panels is reduced suddenly, causing ScrollContainer
                         // to enter clamp-special-case mode where it animates completely differently to normal.
                         float scrollChange = scrollTarget.Value - Scroll.Current;
-
                         Scroll.ScrollTo(scrollTarget.Value, false);
-
                         foreach (var i in Scroll.Children)
                             i.Y += scrollChange;
                         break;

From 1a443381247492b9233ae9c01ebf1a44510359ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 15:38:28 +0900
Subject: [PATCH 07361/10326] Use SingleOrDefault for added safety when looking
 up mod acronyms

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

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 780e5daa16..6c988e2e00 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Online.API
 
         public Mod ToMod(Ruleset ruleset)
         {
-            Mod resultMod = ruleset.GetAllMods().FirstOrDefault(m => m.Acronym == Acronym);
+            Mod resultMod = ruleset.GetAllMods().SingleOrDefault(m => m.Acronym == Acronym);
 
             if (resultMod == null)
                 throw new InvalidOperationException($"There is no mod in the ruleset ({ruleset.ShortName}) matching the acronym {Acronym}.");

From 23e216fa0b374e23751c97124dc069877004a60d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 15:47:15 +0900
Subject: [PATCH 07362/10326] Simplify some default value checks (we are sure
 the return is an IBindable)

---
 osu.Game/Online/API/APIMod.cs | 7 ++++++-
 osu.Game/Rulesets/Mods/Mod.cs | 8 +++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 6c988e2e00..a7e5f0d6f9 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -31,7 +31,12 @@ namespace osu.Game.Online.API
             Acronym = mod.Acronym;
 
             foreach (var (_, property) in mod.GetSettingsSourceProperties())
-                Settings.Add(property.Name.Underscore(), property.GetValue(mod));
+            {
+                var bindable = (IBindable)property.GetValue(mod);
+
+                if (!bindable.IsDefault)
+                    Settings.Add(property.Name.Underscore(), property.GetValue(mod));
+            }
         }
 
         public Mod ToMod(Ruleset ruleset)
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b8dc7a2661..92b548a9cc 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -84,12 +84,10 @@ namespace osu.Game.Rulesets.Mods
 
                 foreach ((SettingSourceAttribute attr, PropertyInfo property) in this.GetOrderedSettingsSourceProperties())
                 {
-                    object bindableObj = property.GetValue(this);
+                    var bindable = (IBindable)property.GetValue(this);
 
-                    if ((bindableObj as IHasDefaultValue)?.IsDefault == true)
-                        continue;
-
-                    tooltipTexts.Add($"{attr.Label} {bindableObj}");
+                    if (!bindable.IsDefault)
+                        tooltipTexts.Add($"{attr.Label} {bindable}");
                 }
 
                 return string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));

From 29dbb1cc0d94d26b3fb077e924bd2eb6d6b16dfd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 15:48:28 +0900
Subject: [PATCH 07363/10326] Add internal pathway for ensuring correct
 application of bindable mods

---
 osu.Game/Online/API/APIMod.cs                 |  2 +-
 osu.Game/Rulesets/Mods/Mod.cs                 | 21 ++++++++++++-------
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs |  6 ++++++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index a7e5f0d6f9..6e3bdac61a 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Online.API
                 if (!Settings.TryGetValue(property.Name.Underscore(), out object settingValue))
                     continue;
 
-                ((IBindable)property.GetValue(resultMod)).Parse(settingValue);
+                resultMod.CopyAdjustedSetting((IBindable)property.GetValue(resultMod), settingValue);
             }
 
             return resultMod;
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 92b548a9cc..487cdedd13 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using Newtonsoft.Json;
@@ -134,19 +133,25 @@ namespace osu.Game.Rulesets.Mods
             // Copy bindable values across
             foreach (var (_, prop) in this.GetSettingsSourceProperties())
             {
-                var origBindable = prop.GetValue(this);
-                var copyBindable = prop.GetValue(copy);
+                var origBindable = (IBindable)prop.GetValue(this);
+                var copyBindable = (IBindable)prop.GetValue(copy);
 
-                // The bindables themselves are readonly, so the value must be transferred through the Bindable<T>.Value property.
-                var valueProperty = origBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
-                Debug.Assert(valueProperty != null);
-
-                valueProperty.SetValue(copyBindable, valueProperty.GetValue(origBindable));
+                // we only care about changes that have been made away from defaults.
+                if (!origBindable.IsDefault)
+                    copy.CopyAdjustedSetting(copyBindable, origBindable);
             }
 
             return copy;
         }
 
+        /// <summary>
+        /// When creating copies or clones of a Mod, this method will be called to copy explicitly adjusted user settings.
+        /// The base implementation will transfer the value via <see cref="Bindable{T}.Parse"/> and should be called unless replaced with custom logic.
+        /// </summary>
+        /// <param name="bindable">The target bindable to apply the adjustment.</param>
+        /// <param name="value">The adjustment to apply.</param>
+        internal virtual void CopyAdjustedSetting(IBindable bindable, object value) => bindable.Parse(value);
+
         public bool Equals(IMod other) => GetType() == other?.GetType();
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 165644edbe..58af96a8df 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -114,6 +114,12 @@ namespace osu.Game.Rulesets.Mods
             bindable.ValueChanged += _ => userChangedSettings[bindable] = !bindable.IsDefault;
         }
 
+        internal override void CopyAdjustedSetting(IBindable bindable, object value)
+        {
+            userChangedSettings[bindable] = true;
+            base.CopyAdjustedSetting(bindable, value);
+        }
+
         /// <summary>
         /// Apply all custom settings to the provided beatmap.
         /// </summary>

From 99fa0e25dcb542e98e6bdf3c71de45a891634806 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 16:46:24 +0900
Subject: [PATCH 07364/10326] Switch back to FirstOrDefault to allow for weird
 testing logic to pass

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

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 6e3bdac61a..3ceafc5160 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Online.API
 
         public Mod ToMod(Ruleset ruleset)
         {
-            Mod resultMod = ruleset.GetAllMods().SingleOrDefault(m => m.Acronym == Acronym);
+            Mod resultMod = ruleset.GetAllMods().FirstOrDefault(m => m.Acronym == Acronym);
 
             if (resultMod == null)
                 throw new InvalidOperationException($"There is no mod in the ruleset ({ruleset.ShortName}) matching the acronym {Acronym}.");

From 6ad1b7767e6ded5cd992838a7395c7205378b90c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 17:04:16 +0900
Subject: [PATCH 07365/10326] Update osu.Game/Online/API/APIMod.cs

Co-authored-by: Salman Ahmed <slmanarendo1950@gmail.com>
---
 osu.Game/Online/API/APIMod.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 3ceafc5160..c8b76b9685 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Online.API
                 var bindable = (IBindable)property.GetValue(mod);
 
                 if (!bindable.IsDefault)
-                    Settings.Add(property.Name.Underscore(), property.GetValue(mod));
+                    Settings.Add(property.Name.Underscore(), bindable);
             }
         }
 

From 7c9f345cd27ff36ea5e638a53fb1c12f74712361 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Sun, 3 Jan 2021 16:46:25 +0700
Subject: [PATCH 07366/10326] Use better naming for DiscordRichPresenceMode

---
 osu.Desktop/DiscordRichPresence.cs                | 2 +-
 osu.Game/Configuration/DiscordRichPresenceMode.cs | 4 ++--
 osu.Game/Configuration/OsuConfigManager.cs        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index 6b331d4952..172db324cb 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -82,7 +82,7 @@ namespace osu.Desktop
             if (!client.IsInitialized)
                 return;
 
-            if (status.Value is UserStatusOffline || mode.Value == DiscordRichPresenceMode.Disabled)
+            if (status.Value is UserStatusOffline || mode.Value == DiscordRichPresenceMode.Off)
             {
                 client.ClearPresence();
                 return;
diff --git a/osu.Game/Configuration/DiscordRichPresenceMode.cs b/osu.Game/Configuration/DiscordRichPresenceMode.cs
index bd39faff4d..2e58e3554b 100644
--- a/osu.Game/Configuration/DiscordRichPresenceMode.cs
+++ b/osu.Game/Configuration/DiscordRichPresenceMode.cs
@@ -7,11 +7,11 @@ namespace osu.Game.Configuration
 {
     public enum DiscordRichPresenceMode
     {
-        Disabled,
+        Off,
 
         [Description("Hide identifiable information")]
         Limited,
 
-        Enabled
+        Full
     }
 }
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index c733fe2fb4..eb34a0885d 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
             Set(OsuSetting.SeasonalBackgroundMode, SeasonalBackgroundMode.Sometimes);
 
-            Set(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Enabled);
+            Set(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
 
             Set(OsuSetting.EditorWaveformOpacity, 1f);
         }

From 2501707d7d86c9927fda5f3ece0d75c14e769bb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 20:44:57 +0900
Subject: [PATCH 07367/10326] Copy values using Bind to also copy defaults

---
 osu.Game/Rulesets/Mods/Mod.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 487cdedd13..d2747d98c7 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -150,7 +150,17 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         /// <param name="bindable">The target bindable to apply the adjustment.</param>
         /// <param name="value">The adjustment to apply.</param>
-        internal virtual void CopyAdjustedSetting(IBindable bindable, object value) => bindable.Parse(value);
+        internal virtual void CopyAdjustedSetting(IBindable bindable, object value)
+        {
+            if (value is IBindable incoming)
+            {
+                //copy including transfer of default values.
+                bindable.BindTo(incoming);
+                bindable.UnbindFrom(incoming);
+            }
+            else
+                bindable.Parse(value);
+        }
 
         public bool Equals(IMod other) => GetType() == other?.GetType();
     }

From a3e29b9154c996efbe051da95e9c8bbaac8c2096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 3 Jan 2021 13:25:44 +0100
Subject: [PATCH 07368/10326] Rename parameters for readability

---
 osu.Game/Rulesets/Mods/Mod.cs                 | 14 +++++++-------
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index d2747d98c7..b7432ec966 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -148,18 +148,18 @@ namespace osu.Game.Rulesets.Mods
         /// When creating copies or clones of a Mod, this method will be called to copy explicitly adjusted user settings.
         /// The base implementation will transfer the value via <see cref="Bindable{T}.Parse"/> and should be called unless replaced with custom logic.
         /// </summary>
-        /// <param name="bindable">The target bindable to apply the adjustment.</param>
-        /// <param name="value">The adjustment to apply.</param>
-        internal virtual void CopyAdjustedSetting(IBindable bindable, object value)
+        /// <param name="target">The target bindable to apply the adjustment.</param>
+        /// <param name="source">The adjustment to apply.</param>
+        internal virtual void CopyAdjustedSetting(IBindable target, object source)
         {
-            if (value is IBindable incoming)
+            if (source is IBindable sourceBindable)
             {
                 //copy including transfer of default values.
-                bindable.BindTo(incoming);
-                bindable.UnbindFrom(incoming);
+                target.BindTo(sourceBindable);
+                target.UnbindFrom(sourceBindable);
             }
             else
-                bindable.Parse(value);
+                target.Parse(source);
         }
 
         public bool Equals(IMod other) => GetType() == other?.GetType();
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 58af96a8df..72a4bb297f 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -114,10 +114,10 @@ namespace osu.Game.Rulesets.Mods
             bindable.ValueChanged += _ => userChangedSettings[bindable] = !bindable.IsDefault;
         }
 
-        internal override void CopyAdjustedSetting(IBindable bindable, object value)
+        internal override void CopyAdjustedSetting(IBindable target, object source)
         {
-            userChangedSettings[bindable] = true;
-            base.CopyAdjustedSetting(bindable, value);
+            userChangedSettings[target] = true;
+            base.CopyAdjustedSetting(target, source);
         }
 
         /// <summary>

From 9e4a925ab1f071fced203cc081f2c6f0b7c2ca96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 3 Jan 2021 13:30:21 +0100
Subject: [PATCH 07369/10326] Clarify & cleanup comments some

---
 osu.Game/Rulesets/Mods/Mod.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b7432ec966..24d184e531 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -145,16 +145,19 @@ namespace osu.Game.Rulesets.Mods
         }
 
         /// <summary>
-        /// When creating copies or clones of a Mod, this method will be called to copy explicitly adjusted user settings.
-        /// The base implementation will transfer the value via <see cref="Bindable{T}.Parse"/> and should be called unless replaced with custom logic.
+        /// When creating copies or clones of a Mod, this method will be called
+        /// to copy explicitly adjusted user settings from <paramref name="target"/>.
+        /// The base implementation will transfer the value via <see cref="Bindable{T}.Parse"/>
+        /// or by binding and unbinding (if <paramref name="source"/> is an <see cref="IBindable"/>)
+        /// and should be called unless replaced with custom logic.
         /// </summary>
-        /// <param name="target">The target bindable to apply the adjustment.</param>
+        /// <param name="target">The target bindable to apply the adjustment to.</param>
         /// <param name="source">The adjustment to apply.</param>
         internal virtual void CopyAdjustedSetting(IBindable target, object source)
         {
             if (source is IBindable sourceBindable)
             {
-                //copy including transfer of default values.
+                // copy including transfer of default values.
                 target.BindTo(sourceBindable);
                 target.UnbindFrom(sourceBindable);
             }

From efb71713efdde039ab6a3d0fce58476e6ef6d575 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 22:43:02 +0900
Subject: [PATCH 07370/10326] Fix null condition inhibiting deselection events

---
 osu.Game/Screens/Select/SongSelect.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 8ad1ace36a..e3036c662b 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -428,7 +428,10 @@ namespace osu.Game.Screens.Select
 
         private void updateSelectedBeatmap(BeatmapInfo beatmap)
         {
-            if (beatmap == null || beatmap.Equals(beatmapNoDebounce))
+            if (beatmap == null && beatmapNoDebounce == null)
+                return;
+
+            if (beatmap?.Equals(beatmapNoDebounce) == true)
                 return;
 
             beatmapNoDebounce = beatmap;

From 53e6a349bbed8492c62b66ff8b47333da8101230 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 22:44:30 +0900
Subject: [PATCH 07371/10326] Fix incorrect initial conditional

Turns out this wasn't actually required.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 37213c6003..36f8fbedb3 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -733,12 +733,6 @@ namespace osu.Game.Screens.Select
 
         private const float panel_padding = 5;
 
-        /// <summary>
-        /// After loading, we want to invoke a selection changed event at least once.
-        /// This handles the case where this event is potentially sending a null selection.
-        /// </summary>
-        private bool sentInitialSelectionEvent;
-
         /// <summary>
         /// Computes the target Y positions for every item in the carousel.
         /// </summary>
@@ -802,12 +796,10 @@ namespace osu.Game.Screens.Select
             {
                 bool selectionLost = selectedBeatmapSet != null && selectedBeatmapSet.State.Value != CarouselItemState.Selected;
 
-                if (selectionLost || !sentInitialSelectionEvent)
+                if (selectionLost)
                 {
                     selectedBeatmapSet = null;
                     SelectionChanged?.Invoke(null);
-
-                    sentInitialSelectionEvent = true;
                 }
             }
         }

From 152e9ecccf0f6150236d70a0d90f6d3a721e87aa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 18:34:11 +0300
Subject: [PATCH 07372/10326] Make `BeatmapAvailability` class in-line with
 other online data structures

---
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs | 2 +-
 osu.Game/Online/Rooms/BeatmapAvailability.cs       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 92c92f438d..f515b574df 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// The availability state of the beatmap, set to <see cref="DownloadState.LocallyAvailable"/> by default.
         /// </summary>
-        public BeatmapAvailability BeatmapAvailability { get; set; } = new BeatmapAvailability(DownloadState.LocallyAvailable);
+        public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
         public User? User { get; set; }
 
diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index ca53cb2295..04dcd2a84a 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Online.Rooms
     /// <summary>
     /// The local availability information about a certain beatmap for the client.
     /// </summary>
-    public readonly struct BeatmapAvailability : IEquatable<BeatmapAvailability>
+    public class BeatmapAvailability : IEquatable<BeatmapAvailability>
     {
         /// <summary>
         /// The beatmap's availability state.
@@ -49,7 +49,7 @@ namespace osu.Game.Online.Rooms
             DownloadProgress = downloadProgress;
         }
 
-        public bool Equals(BeatmapAvailability other) => State == other.State && DownloadProgress == other.DownloadProgress;
+        public bool Equals(BeatmapAvailability other) => other != null && State == other.State && DownloadProgress == other.DownloadProgress;
 
         public override string ToString() => $"{string.Join(", ", State, $"{DownloadProgress:0.00%}")}";
     }

From c8423d1c4600d89bf4979715e7da540ca118633c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 18:34:58 +0300
Subject: [PATCH 07373/10326] Make constructors design more pleasent to eyes

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 30 ++++----------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 04dcd2a84a..1fd099fcc7 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -20,35 +20,17 @@ namespace osu.Game.Online.Rooms
         /// </summary>
         public readonly double? DownloadProgress;
 
-        /// <summary>
-        /// Constructs a new non-<see cref="DownloadState.Downloading"/> beatmap availability state.
-        /// </summary>
-        /// <param name="state">The beatmap availability state.</param>
-        /// <exception cref="ArgumentException">Throws if <see cref="DownloadState.Downloading"/> was specified in this constructor, as it has its own constructor (see <see cref="BeatmapAvailability(DownloadState, double)"/>.</exception>
-        public BeatmapAvailability(DownloadState state)
+        private BeatmapAvailability(DownloadState state, double? downloadProgress = null)
         {
-            if (state == DownloadState.Downloading)
-                throw new ArgumentException($"{nameof(DownloadState.Downloading)} state has its own constructor, use it instead.");
-
             State = state;
-            DownloadProgress = null;
-        }
-
-        /// <summary>
-        /// Constructs a new <see cref="DownloadState.Downloading"/>-specific beatmap availability state.
-        /// </summary>
-        /// <param name="state">The beatmap availability state (always <see cref="DownloadState.Downloading"/>).</param>
-        /// <param name="downloadProgress">The beatmap's downloading current progress.</param>
-        /// <exception cref="ArgumentException">Throws if non-<see cref="DownloadState.Downloading"/> was specified in this constructor, as they have their own constructor (see <see cref="BeatmapAvailability(DownloadState)"/>.</exception>
-        public BeatmapAvailability(DownloadState state, double downloadProgress)
-        {
-            if (state != DownloadState.Downloading)
-                throw new ArgumentException($"This is a constructor specific for {DownloadState.Downloading} state, use the regular one instead.");
-
-            State = DownloadState.Downloading;
             DownloadProgress = downloadProgress;
         }
 
+        public static BeatmapAvailability NotDownload() => new BeatmapAvailability(DownloadState.NotDownloaded);
+        public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
+        public static BeatmapAvailability Downloaded() => new BeatmapAvailability(DownloadState.Downloaded);
+        public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);
+
         public bool Equals(BeatmapAvailability other) => other != null && State == other.State && DownloadProgress == other.DownloadProgress;
 
         public override string ToString() => $"{string.Join(", ", State, $"{DownloadProgress:0.00%}")}";

From 839f5a75705f92cb77dfb75392ecf748a7f955d9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 18:36:37 +0300
Subject: [PATCH 07374/10326] Ensure clients don't blow up when given user
 isn't in room

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index c1818de87a..799b66020c 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -320,10 +320,13 @@ namespace osu.Game.Online.Multiplayer
 
             Scheduler.Add(() =>
             {
-                if (Room == null)
+                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
+
+                // we don't care whether the room doesn't exist or user isn't in joined room, just return in that point.
+                if (user == null)
                     return;
 
-                Room.Users.Single(u => u.UserID == userId).BeatmapAvailability = beatmapAvailability;
+                user.BeatmapAvailability = beatmapAvailability;
 
                 RoomUpdated?.Invoke();
             }, false);

From df04dd21de6a16da70031ee4fac020ae0f923211 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 07:45:29 +0300
Subject: [PATCH 07375/10326] Add failing test case

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index c32e359de6..041df3e6ff 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -852,6 +852,39 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
+        [Test]
+        public async Task TestItemRemovedShouldPassConsumableBeatmapSet()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host);
+                    var manager = osu.Dependencies.Get<BeatmapManager>();
+
+                    var removedQueue = new Queue<BeatmapSetInfo>();
+                    manager.ItemRemoved.BindValueChanged(evt =>
+                    {
+                        if (evt.NewValue.TryGetTarget(out var target))
+                            removedQueue.Enqueue(target);
+                    });
+
+                    var imported = await LoadOszIntoOsu(osu);
+                    deleteBeatmapSet(imported, osu);
+
+                    Assert.That(removedQueue.Count, Is.EqualTo(1));
+
+                    var removedItem = removedQueue.Single();
+                    Assert.That(removedItem.Metadata, Is.EqualTo(imported.Metadata));
+                    Assert.That(removedItem.Beatmaps, Is.EquivalentTo(imported.Beatmaps));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         public static async Task<BeatmapSetInfo> LoadOszIntoOsu(OsuGameBase osu, string path = null, bool virtualTrack = false)
         {
             var temp = path ?? TestResources.GetTestBeatmapForImport(virtualTrack);

From 738c94d1938f99ff5fb638528cff02bf80f297df Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 07:46:51 +0300
Subject: [PATCH 07376/10326] Update soft-deletion logic to use model store's
 consumable items instead

---
 osu.Game/Database/ArchiveModelManager.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 36cc4cce39..61b2f7668e 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Database
 
         protected readonly IDatabaseContextFactory ContextFactory;
 
-        protected readonly MutableDatabaseBackedStore<TModel> ModelStore;
+        protected readonly MutableDatabaseBackedStoreWithFileIncludes<TModel, TFileModel> ModelStore;
 
         // ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised)
         private ArchiveImportIPCChannel ipc;
@@ -492,7 +492,7 @@ namespace osu.Game.Database
             using (ContextFactory.GetForWrite())
             {
                 // re-fetch the model on the import context.
-                var foundModel = queryModel().Include(s => s.Files).ThenInclude(f => f.FileInfo).FirstOrDefault(s => s.ID == item.ID);
+                var foundModel = ModelStore.ConsumableItems.SingleOrDefault(i => i.ID == item.ID);
 
                 if (foundModel == null || foundModel.DeletePending) return false;
 
@@ -731,8 +731,6 @@ namespace osu.Game.Database
                 yield return f.Filename;
         }
 
-        private DbSet<TModel> queryModel() => ContextFactory.Get().Set<TModel>();
-
         protected virtual string HumanisedModelName => $"{typeof(TModel).Name.Replace("Info", "").ToLower()}";
 
         #region Event handling / delaying

From 1463ff288629232333880a0f18888c4f1a65e5d6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 08:12:31 +0300
Subject: [PATCH 07377/10326] Remove unnecessary using directive

---
 osu.Game/Database/ArchiveModelManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 61b2f7668e..b9f805ae31 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Humanizer;
 using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore;
 using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;

From ca5f2bcd4ca8395698a5267d6a8fb2a6cb214e45 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 08:49:03 +0300
Subject: [PATCH 07378/10326] Revert database-side changes

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 33 -------------------
 osu.Game/Database/ArchiveModelManager.cs      |  6 ++--
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 041df3e6ff..c32e359de6 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -852,39 +852,6 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
-        [Test]
-        public async Task TestItemRemovedShouldPassConsumableBeatmapSet()
-        {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
-            {
-                try
-                {
-                    var osu = LoadOsuIntoHost(host);
-                    var manager = osu.Dependencies.Get<BeatmapManager>();
-
-                    var removedQueue = new Queue<BeatmapSetInfo>();
-                    manager.ItemRemoved.BindValueChanged(evt =>
-                    {
-                        if (evt.NewValue.TryGetTarget(out var target))
-                            removedQueue.Enqueue(target);
-                    });
-
-                    var imported = await LoadOszIntoOsu(osu);
-                    deleteBeatmapSet(imported, osu);
-
-                    Assert.That(removedQueue.Count, Is.EqualTo(1));
-
-                    var removedItem = removedQueue.Single();
-                    Assert.That(removedItem.Metadata, Is.EqualTo(imported.Metadata));
-                    Assert.That(removedItem.Beatmaps, Is.EquivalentTo(imported.Beatmaps));
-                }
-                finally
-                {
-                    host.Exit();
-                }
-            }
-        }
-
         public static async Task<BeatmapSetInfo> LoadOszIntoOsu(OsuGameBase osu, string path = null, bool virtualTrack = false)
         {
             var temp = path ?? TestResources.GetTestBeatmapForImport(virtualTrack);
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index b9f805ae31..81d8668196 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Database
 
         protected readonly IDatabaseContextFactory ContextFactory;
 
-        protected readonly MutableDatabaseBackedStoreWithFileIncludes<TModel, TFileModel> ModelStore;
+        protected readonly MutableDatabaseBackedStore<TModel> ModelStore;
 
         // ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised)
         private ArchiveImportIPCChannel ipc;
@@ -491,7 +491,7 @@ namespace osu.Game.Database
             using (ContextFactory.GetForWrite())
             {
                 // re-fetch the model on the import context.
-                var foundModel = ModelStore.ConsumableItems.SingleOrDefault(i => i.ID == item.ID);
+                var foundModel = queryModel().Include(s => s.Files).ThenInclude(f => f.FileInfo).FirstOrDefault(s => s.ID == item.ID);
 
                 if (foundModel == null || foundModel.DeletePending) return false;
 
@@ -730,6 +730,8 @@ namespace osu.Game.Database
                 yield return f.Filename;
         }
 
+        private DbSet<TModel> queryModel() => ContextFactory.Get().Set<TModel>();
+
         protected virtual string HumanisedModelName => $"{typeof(TModel).Name.Replace("Info", "").ToLower()}";
 
         #region Event handling / delaying

From 445a4bd01c70428f33bc36b603a52e80e92d0aeb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 08:51:37 +0300
Subject: [PATCH 07379/10326] Re-query beatmap info on database changes

---
 osu.Game/Database/ArchiveModelManager.cs      |  1 +
 .../OnlinePlay/Components/ReadyButton.cs      | 34 ++++---------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 81d8668196..36cc4cce39 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -9,6 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Humanizer;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore;
 using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 08f89d8ed8..144535ed4c 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
-using System.Linq.Expressions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -41,38 +39,20 @@ namespace osu.Game.Screens.OnlinePlay.Components
             SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
         }
 
-        private void updateSelectedItem(PlaylistItem item)
-        {
-            hasBeatmap = findBeatmap(expr => beatmaps.QueryBeatmap(expr));
-        }
+        private void updateSelectedItem(PlaylistItem _) => updateBeatmapState();
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => updateBeatmapState();
+        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => updateBeatmapState();
 
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
-        {
-            if (weakSet.NewValue.TryGetTarget(out var set))
-            {
-                if (findBeatmap(expr => set.Beatmaps.AsQueryable().FirstOrDefault(expr)))
-                    Schedule(() => hasBeatmap = true);
-            }
-        }
-
-        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
-        {
-            if (weakSet.NewValue.TryGetTarget(out var set))
-            {
-                if (findBeatmap(expr => set.Beatmaps.AsQueryable().FirstOrDefault(expr)))
-                    Schedule(() => hasBeatmap = false);
-            }
-        }
-
-        private bool findBeatmap(Func<Expression<Func<BeatmapInfo, bool>>, BeatmapInfo> expression)
+        private void updateBeatmapState()
         {
             int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
             string checksum = SelectedItem.Value?.Beatmap.Value?.MD5Hash;
 
             if (beatmapId == null || checksum == null)
-                return false;
+                return;
 
-            return expression(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum) != null;
+            var databasedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+            hasBeatmap = databasedBeatmap != null && !databasedBeatmap.BeatmapSet.DeletePending;
         }
 
         protected override void Update()

From cb7df0fe1172935581909b938cab6fe987fcc5ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 15:14:39 +0900
Subject: [PATCH 07380/10326] Add failing test for storyboard start time
 ordering

---
 .../Formats/LegacyStoryboardDecoderTest.cs    | 20 +++++++++++++++++++
 .../Resources/out-of-order-starttimes.osb     |  6 ++++++
 2 files changed, 26 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/out-of-order-starttimes.osb

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 9ebedb3c80..b36597a949 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -95,6 +95,26 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestOutOfOrderStartTimes()
+        {
+            var decoder = new LegacyStoryboardDecoder();
+
+            using (var resStream = TestResources.OpenResource("out-of-order-starttimes.osb"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var storyboard = decoder.Decode(stream);
+
+                StoryboardLayer background = storyboard.Layers.Single(l => l.Depth == 3);
+                Assert.AreEqual(2, background.Elements.Count);
+
+                Assert.AreEqual(1500, background.Elements[0].StartTime);
+                Assert.AreEqual(1000, background.Elements[1].StartTime);
+
+                Assert.AreEqual(1000, storyboard.FirstEventTime);
+            }
+        }
+
         [Test]
         public void TestDecodeVariableWithSuffix()
         {
diff --git a/osu.Game.Tests/Resources/out-of-order-starttimes.osb b/osu.Game.Tests/Resources/out-of-order-starttimes.osb
new file mode 100644
index 0000000000..09988ff64e
--- /dev/null
+++ b/osu.Game.Tests/Resources/out-of-order-starttimes.osb
@@ -0,0 +1,6 @@
+[Events]
+//Storyboard Layer 0 (Background)
+Sprite,Background,TopCentre,"img.jpg",320,240
+ F,0,1500,1600,0,1
+Sprite,Background,TopCentre,"img.jpg",320,240
+ F,0,1000,1100,0,1

From 20d04d69332f18b7f14eedc44fed5bdf0ae9e9a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 15:16:01 +0900
Subject: [PATCH 07381/10326] Fix Storyboard's FirstEventTime not finding the
 true earliest event

---
 .../Beatmaps/Formats/LegacyStoryboardDecoderTest.cs    |  2 +-
 osu.Game/Screens/Play/GameplayClockContainer.cs        |  4 +++-
 osu.Game/Storyboards/Storyboard.cs                     | 10 +++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index b36597a949..7bee580863 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual(1500, background.Elements[0].StartTime);
                 Assert.AreEqual(1000, background.Elements[1].StartTime);
 
-                Assert.AreEqual(1000, storyboard.FirstEventTime);
+                Assert.AreEqual(1000, storyboard.EarliestEventTime);
             }
         }
 
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 0248432917..ddbb087962 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -131,7 +131,9 @@ namespace osu.Game.Screens.Play
 
                 // if a storyboard is present, it may dictate the appropriate start time by having events in negative time space.
                 // this is commonly used to display an intro before the audio track start.
-                startTime = Math.Min(startTime, beatmap.Storyboard.FirstEventTime);
+                double? firstStoryboardEvent = beatmap.Storyboard.EarliestEventTime;
+                if (firstStoryboardEvent != null)
+                    startTime = Math.Min(startTime, firstStoryboardEvent.Value);
 
                 // some beatmaps specify a current lead-in time which should be used instead of the ruleset-provided value when available.
                 // this is not available as an option in the live editor but can still be applied via .osu editing.
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index e0d18eab00..d4ba18d394 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore.Internal;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
@@ -27,7 +28,14 @@ namespace osu.Game.Storyboards
 
         public bool HasDrawable => Layers.Any(l => l.Elements.Any(e => e.IsDrawable));
 
-        public double FirstEventTime => Layers.Min(l => l.Elements.FirstOrDefault()?.StartTime ?? 0);
+        /// <summary>
+        /// Across all layers, find the earliest point in time that a storyboard element exists at.
+        /// Will return null if there are no elements.
+        /// </summary>
+        /// <remarks>
+        /// This iterates all elements and as such should be used sparingly or stored locally.
+        /// </remarks>
+        public double? EarliestEventTime => Layers.SelectMany(l => l.Elements).OrderBy(e => e.StartTime).FirstOrDefault()?.StartTime;
 
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.

From 9e0c490141e4e85ecde7c96d7a6b3f37f0b3b4fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 15:40:22 +0900
Subject: [PATCH 07382/10326] Remove unused using

---
 osu.Game/Storyboards/Storyboard.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index d4ba18d394..1ba25cc11e 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Internal;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;

From ea38b00b29adabf0ec91b0b085f2af0b11829b23 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 10:27:08 +0300
Subject: [PATCH 07383/10326] Schedule all calls to `updateBeatmapState()`

---
 osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 144535ed4c..6f86f2b879 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -39,9 +39,9 @@ namespace osu.Game.Screens.OnlinePlay.Components
             SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
         }
 
-        private void updateSelectedItem(PlaylistItem _) => updateBeatmapState();
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => updateBeatmapState();
-        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => updateBeatmapState();
+        private void updateSelectedItem(PlaylistItem _) => Scheduler.AddOnce(updateBeatmapState);
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => Scheduler.AddOnce(updateBeatmapState);
+        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => Scheduler.AddOnce(updateBeatmapState);
 
         private void updateBeatmapState()
         {

From 485a57776b205581528925011a1d2ec77d8fc26d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 10:28:41 +0300
Subject: [PATCH 07384/10326] Fix `hasBeatmap` potentially checking on outdated
 `DeletePending` value

---
 osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 6f86f2b879..b782df75df 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -52,7 +52,15 @@ namespace osu.Game.Screens.OnlinePlay.Components
                 return;
 
             var databasedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
-            hasBeatmap = databasedBeatmap != null && !databasedBeatmap.BeatmapSet.DeletePending;
+
+            if (databasedBeatmap == null)
+                hasBeatmap = false;
+            else
+            {
+                // DeletePending isn't updated in the beatmap info query above, need to directly query the beatmap set from database as well.
+                var databasedSet = beatmaps.QueryBeatmapSet(s => s.Equals(databasedBeatmap.BeatmapSet));
+                hasBeatmap = databasedSet?.DeletePending == false;
+            }
         }
 
         protected override void Update()

From ba4e41142262d683e25185af98e13a07157214ce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 16:37:07 +0900
Subject: [PATCH 07385/10326] Clone and copy ControlPointInfo when retrieving a
 playable beatmap

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs | 17 +++++++++++++++++
 .../Beatmaps/ControlPoints/ControlPointInfo.cs  | 12 +++++++++++-
 .../ControlPoints/DifficultyControlPoint.cs     |  7 +++++++
 .../ControlPoints/EffectControlPoint.cs         |  8 ++++++++
 .../ControlPoints/SampleControlPoint.cs         |  8 ++++++++
 .../ControlPoints/TimingControlPoint.cs         |  8 ++++++++
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs      | 15 +++++++++++++--
 osu.Game/Beatmaps/IBeatmap.cs                   |  2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs             |  3 +++
 osu.Game/Screens/Edit/EditorBeatmap.cs          |  6 +++++-
 osu.Game/Screens/Play/GameplayBeatmap.cs        |  6 +++++-
 11 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index c6649f6af1..090675473d 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -28,5 +28,22 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="existing">An existing control point to compare with.</param>
         /// <returns>Whether this <see cref="ControlPoint"/> is redundant when placed alongside <paramref name="existing"/>.</returns>
         public abstract bool IsRedundant(ControlPoint existing);
+
+        /// <summary>
+        /// Create a copy of this room without online information.
+        /// Should be used to create a local copy of a room for submitting in the future.
+        /// </summary>
+        public ControlPoint CreateCopy()
+        {
+            var copy = (ControlPoint)Activator.CreateInstance(GetType());
+
+            copy.CopyFrom(this);
+
+            return copy;
+        }
+
+        public virtual void CopyFrom(ControlPoint other)
+        {
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index b843aad950..b56f9a106b 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -11,7 +11,7 @@ using osu.Framework.Lists;
 namespace osu.Game.Beatmaps.ControlPoints
 {
     [Serializable]
-    public class ControlPointInfo
+    public class ControlPointInfo : ICloneable
     {
         /// <summary>
         /// All control points grouped by time.
@@ -297,5 +297,15 @@ namespace osu.Game.Beatmaps.ControlPoints
                     break;
             }
         }
+
+        public object Clone()
+        {
+            var controlPointInfo = new ControlPointInfo();
+
+            foreach (var point in AllControlPoints)
+                controlPointInfo.Add(point.Time, point.CreateCopy());
+
+            return controlPointInfo;
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 283bf76572..0bc5605051 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -39,5 +39,12 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool IsRedundant(ControlPoint existing)
             => existing is DifficultyControlPoint existingDifficulty
                && SpeedMultiplier == existingDifficulty.SpeedMultiplier;
+
+        public override void CopyFrom(ControlPoint other)
+        {
+            SpeedMultiplier = ((DifficultyControlPoint)other).SpeedMultiplier;
+
+            base.CopyFrom(other);
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index ea28fca170..79bc88e773 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -50,5 +50,13 @@ namespace osu.Game.Beatmaps.ControlPoints
                && existing is EffectControlPoint existingEffect
                && KiaiMode == existingEffect.KiaiMode
                && OmitFirstBarLine == existingEffect.OmitFirstBarLine;
+
+        public override void CopyFrom(ControlPoint other)
+        {
+            KiaiMode = ((EffectControlPoint)other).KiaiMode;
+            OmitFirstBarLine = ((EffectControlPoint)other).OmitFirstBarLine;
+
+            base.CopyFrom(other);
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index fd0b496335..4aa6a3d6e9 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -72,5 +72,13 @@ namespace osu.Game.Beatmaps.ControlPoints
             => existing is SampleControlPoint existingSample
                && SampleBank == existingSample.SampleBank
                && SampleVolume == existingSample.SampleVolume;
+
+        public override void CopyFrom(ControlPoint other)
+        {
+            SampleVolume = ((SampleControlPoint)other).SampleVolume;
+            SampleBank = ((SampleControlPoint)other).SampleBank;
+
+            base.CopyFrom(other);
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index d9378bca4a..580642f593 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -69,5 +69,13 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         // Timing points are never redundant as they can change the time signature.
         public override bool IsRedundant(ControlPoint existing) => false;
+
+        public override void CopyFrom(ControlPoint other)
+        {
+            TimeSignature = ((TimingControlPoint)other).TimeSignature;
+            BeatLength = ((TimingControlPoint)other).BeatLength;
+
+            base.CopyFrom(other);
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index c9d139bdd0..06ff677aed 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -164,13 +164,24 @@ namespace osu.Game.Beatmaps.Formats
             /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
             /// DO NOT USE THIS UNLESS 100% SURE.
             /// </summary>
-            public readonly float BpmMultiplier;
+            public float BpmMultiplier { get; set; }
 
             public LegacyDifficultyControlPoint(double beatLength)
+                : this()
+            {
+                BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100f : 1;
+            }
+
+            public LegacyDifficultyControlPoint()
             {
                 SpeedMultiplierBindable.Precision = double.Epsilon;
+            }
 
-                BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100f : 1;
+            public override void CopyFrom(ControlPoint other)
+            {
+                base.CopyFrom(other);
+
+                BpmMultiplier = ((LegacyDifficultyControlPoint)other).BpmMultiplier;
             }
         }
 
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 8f27e0b0e9..7dd85e1232 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// The control points in this beatmap.
         /// </summary>
-        ControlPointInfo ControlPointInfo { get; }
+        ControlPointInfo ControlPointInfo { get; set; }
 
         /// <summary>
         /// The breaks in this beatmap.
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 30382c444f..06b5913b18 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
 using osu.Framework.Statistics;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Types;
@@ -111,6 +112,8 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert(cancellationSource.Token);
 
+                converted.ControlPointInfo = (ControlPointInfo)converted.ControlPointInfo.Clone();
+
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())
                 {
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 165d2ba278..a54a95f59d 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -74,7 +74,11 @@ namespace osu.Game.Screens.Edit
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
+        public ControlPointInfo ControlPointInfo
+        {
+            get => PlayableBeatmap.ControlPointInfo;
+            set => PlayableBeatmap.ControlPointInfo = value;
+        }
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 64894544f4..565595656f 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -29,7 +29,11 @@ namespace osu.Game.Screens.Play
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
+        public ControlPointInfo ControlPointInfo
+        {
+            get => PlayableBeatmap.ControlPointInfo;
+            set => PlayableBeatmap.ControlPointInfo = value;
+        }
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 

From b4a779108e7c87994198690cba57ca05e1a0e503 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 16:37:49 +0900
Subject: [PATCH 07386/10326] Ensure working beatmap is reloaded on exiting the
 editor

---
 osu.Game/Screens/Edit/Editor.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 223c678fba..a9fe7ba38d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -483,6 +483,8 @@ namespace osu.Game.Screens.Edit
             Background.FadeColour(Color4.White, 500);
             resetTrack();
 
+            Beatmap.Value = beatmapManager.GetWorkingBeatmap(Beatmap.Value.BeatmapInfo);
+
             return base.OnExiting(next);
         }
 

From 7fdf876b4c8fb19020033d080fca3ee08dd44adc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 16:38:15 +0900
Subject: [PATCH 07387/10326] Fix editor timing screen mutating the
 WorkingBeatmap instead of EditorBeatmap

---
 osu.Game/Screens/Edit/Timing/DifficultySection.cs |  2 +-
 osu.Game/Screens/Edit/Timing/EffectSection.cs     |  2 +-
 osu.Game/Screens/Edit/Timing/GroupSection.cs      |  9 ++++-----
 osu.Game/Screens/Edit/Timing/SampleSection.cs     |  2 +-
 osu.Game/Screens/Edit/Timing/Section.cs           |  3 +--
 osu.Game/Screens/Edit/Timing/TimingScreen.cs      | 11 +++++------
 osu.Game/Screens/Edit/Timing/TimingSection.cs     |  2 +-
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/DifficultySection.cs b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
index b55d74e3b4..b87b8961f8 100644
--- a/osu.Game/Screens/Edit/Timing/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         protected override DifficultyControlPoint CreatePoint()
         {
-            var reference = Beatmap.Value.Beatmap.ControlPointInfo.DifficultyPointAt(SelectedGroup.Value.Time);
+            var reference = Beatmap.ControlPointInfo.DifficultyPointAt(SelectedGroup.Value.Time);
 
             return new DifficultyControlPoint
             {
diff --git a/osu.Game/Screens/Edit/Timing/EffectSection.cs b/osu.Game/Screens/Edit/Timing/EffectSection.cs
index 2f143108a9..6d23b52c05 100644
--- a/osu.Game/Screens/Edit/Timing/EffectSection.cs
+++ b/osu.Game/Screens/Edit/Timing/EffectSection.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         protected override EffectControlPoint CreatePoint()
         {
-            var reference = Beatmap.Value.Beatmap.ControlPointInfo.EffectPointAt(SelectedGroup.Value.Time);
+            var reference = Beatmap.ControlPointInfo.EffectPointAt(SelectedGroup.Value.Time);
 
             return new EffectControlPoint
             {
diff --git a/osu.Game/Screens/Edit/Timing/GroupSection.cs b/osu.Game/Screens/Edit/Timing/GroupSection.cs
index 2605ea8b75..2e2c380d4a 100644
--- a/osu.Game/Screens/Edit/Timing/GroupSection.cs
+++ b/osu.Game/Screens/Edit/Timing/GroupSection.cs
@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
@@ -24,7 +23,7 @@ namespace osu.Game.Screens.Edit.Timing
         protected Bindable<ControlPointGroup> SelectedGroup { get; private set; }
 
         [Resolved]
-        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
+        protected EditorBeatmap Beatmap { get; private set; }
 
         [Resolved]
         private EditorClock clock { get; set; }
@@ -107,13 +106,13 @@ namespace osu.Game.Screens.Edit.Timing
 
             var currentGroupItems = SelectedGroup.Value.ControlPoints.ToArray();
 
-            Beatmap.Value.Beatmap.ControlPointInfo.RemoveGroup(SelectedGroup.Value);
+            Beatmap.ControlPointInfo.RemoveGroup(SelectedGroup.Value);
 
             foreach (var cp in currentGroupItems)
-                Beatmap.Value.Beatmap.ControlPointInfo.Add(time, cp);
+                Beatmap.ControlPointInfo.Add(time, cp);
 
             // the control point might not necessarily exist yet, if currentGroupItems was empty.
-            SelectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(time, true);
+            SelectedGroup.Value = Beatmap.ControlPointInfo.GroupAt(time, true);
 
             changeHandler?.EndChange();
         }
diff --git a/osu.Game/Screens/Edit/Timing/SampleSection.cs b/osu.Game/Screens/Edit/Timing/SampleSection.cs
index 280e19c99a..cc73af6349 100644
--- a/osu.Game/Screens/Edit/Timing/SampleSection.cs
+++ b/osu.Game/Screens/Edit/Timing/SampleSection.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         protected override SampleControlPoint CreatePoint()
         {
-            var reference = Beatmap.Value.Beatmap.ControlPointInfo.SamplePointAt(SelectedGroup.Value.Time);
+            var reference = Beatmap.ControlPointInfo.SamplePointAt(SelectedGroup.Value.Time);
 
             return new SampleControlPoint
             {
diff --git a/osu.Game/Screens/Edit/Timing/Section.cs b/osu.Game/Screens/Edit/Timing/Section.cs
index 7a81eeb1a4..5269fa9774 100644
--- a/osu.Game/Screens/Edit/Timing/Section.cs
+++ b/osu.Game/Screens/Edit/Timing/Section.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.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
@@ -27,7 +26,7 @@ namespace osu.Game.Screens.Edit.Timing
         private const float header_height = 20;
 
         [Resolved]
-        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
+        protected EditorBeatmap Beatmap { get; private set; }
 
         [Resolved]
         protected Bindable<ControlPointGroup> SelectedGroup { get; private set; }
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index eab909b798..c5d2dd756a 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.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.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -62,7 +61,7 @@ namespace osu.Game.Screens.Edit.Timing
             private EditorClock clock { get; set; }
 
             [Resolved]
-            protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
+            protected EditorBeatmap Beatmap { get; private set; }
 
             [Resolved]
             private Bindable<ControlPointGroup> selectedGroup { get; set; }
@@ -124,7 +123,7 @@ namespace osu.Game.Screens.Edit.Timing
 
                 selectedGroup.BindValueChanged(selected => { deleteButton.Enabled.Value = selected.NewValue != null; }, true);
 
-                controlPointGroups.BindTo(Beatmap.Value.Beatmap.ControlPointInfo.Groups);
+                controlPointGroups.BindTo(Beatmap.ControlPointInfo.Groups);
                 controlPointGroups.BindCollectionChanged((sender, args) =>
                 {
                     table.ControlGroups = controlPointGroups;
@@ -137,14 +136,14 @@ namespace osu.Game.Screens.Edit.Timing
                 if (selectedGroup.Value == null)
                     return;
 
-                Beatmap.Value.Beatmap.ControlPointInfo.RemoveGroup(selectedGroup.Value);
+                Beatmap.ControlPointInfo.RemoveGroup(selectedGroup.Value);
 
-                selectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.Groups.FirstOrDefault(g => g.Time >= clock.CurrentTime);
+                selectedGroup.Value = Beatmap.ControlPointInfo.Groups.FirstOrDefault(g => g.Time >= clock.CurrentTime);
             }
 
             private void addNew()
             {
-                selectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(clock.CurrentTime, true);
+                selectedGroup.Value = Beatmap.ControlPointInfo.GroupAt(clock.CurrentTime, true);
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index 1ae2a86885..a0bb9ac506 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         protected override TimingControlPoint CreatePoint()
         {
-            var reference = Beatmap.Value.Beatmap.ControlPointInfo.TimingPointAt(SelectedGroup.Value.Time);
+            var reference = Beatmap.ControlPointInfo.TimingPointAt(SelectedGroup.Value.Time);
 
             return new TimingControlPoint
             {

From b7dd54847fc97e98ac5d0eef7d06b5b4d12b509b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 16:47:08 +0900
Subject: [PATCH 07388/10326] Move resolved usage of WorkingBeatmap in editor
 components as local as possible to avoid misuse

---
 .../Screens/Edit/Compose/ComposeScreen.cs     |  5 ++++-
 osu.Game/Screens/Edit/EditorScreen.cs         |  5 -----
 .../Screens/Edit/Setup/DifficultySection.cs   | 16 ++++++++--------
 .../Screens/Edit/Setup/MetadataSection.cs     | 16 ++++++++--------
 .../Screens/Edit/Setup/ResourcesSection.cs    | 19 +++++++++++--------
 osu.Game/Screens/Edit/Setup/SetupSection.cs   |  4 +---
 6 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index c297a03dbf..81b1195a40 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -16,6 +16,9 @@ namespace osu.Game.Screens.Edit.Compose
 {
     public class ComposeScreen : EditorScreenWithTimeline
     {
+        [Resolved]
+        private IBindable<WorkingBeatmap> beatmap { get; set; }
+
         private HitObjectComposer composer;
 
         public ComposeScreen()
@@ -59,7 +62,7 @@ namespace osu.Game.Screens.Edit.Compose
         {
             Debug.Assert(ruleset != null);
 
-            var beatmapSkinProvider = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
+            var beatmapSkinProvider = new BeatmapSkinProvidingContainer(beatmap.Value.Skin);
 
             // the beatmapSkinProvider is used as the fallback source here to allow the ruleset-specific skin implementation
             // full access to all skin sources.
diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs
index 4d62a7d3cd..7fbb6a8ca0 100644
--- a/osu.Game/Screens/Edit/EditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorScreen.cs
@@ -2,10 +2,8 @@
 // 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.Game.Beatmaps;
 
 namespace osu.Game.Screens.Edit
 {
@@ -14,9 +12,6 @@ namespace osu.Game.Screens.Edit
     /// </summary>
     public abstract class EditorScreen : Container
     {
-        [Resolved]
-        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
-
         [Resolved]
         protected EditorBeatmap EditorBeatmap { get; private set; }
 
diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 897ddc6955..f180d7e63e 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Setup
                 {
                     Label = "Object Size",
                     Description = "The size of all hit objects",
-                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize)
+                    Current = new BindableFloat(Beatmap.BeatmapInfo.BaseDifficulty.CircleSize)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 0,
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Edit.Setup
                 {
                     Label = "Health Drain",
                     Description = "The rate of passive health drain throughout playable time",
-                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.DrainRate)
+                    Current = new BindableFloat(Beatmap.BeatmapInfo.BaseDifficulty.DrainRate)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 0,
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Edit.Setup
                 {
                     Label = "Approach Rate",
                     Description = "The speed at which objects are presented to the player",
-                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.ApproachRate)
+                    Current = new BindableFloat(Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 0,
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Edit.Setup
                 {
                     Label = "Overall Difficulty",
                     Description = "The harshness of hit windows and difficulty of special objects (ie. spinners)",
-                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.OverallDifficulty)
+                    Current = new BindableFloat(Beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 0,
@@ -88,10 +88,10 @@ namespace osu.Game.Screens.Edit.Setup
         {
             // for now, update these on commit rather than making BeatmapMetadata bindables.
             // after switching database engines we can reconsider if switching to bindables is a good direction.
-            Beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize = circleSizeSlider.Current.Value;
-            Beatmap.Value.BeatmapInfo.BaseDifficulty.DrainRate = healthDrainSlider.Current.Value;
-            Beatmap.Value.BeatmapInfo.BaseDifficulty.ApproachRate = approachRateSlider.Current.Value;
-            Beatmap.Value.BeatmapInfo.BaseDifficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
+            Beatmap.BeatmapInfo.BaseDifficulty.CircleSize = circleSizeSlider.Current.Value;
+            Beatmap.BeatmapInfo.BaseDifficulty.DrainRate = healthDrainSlider.Current.Value;
+            Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate = approachRateSlider.Current.Value;
+            Beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
 
             editorBeatmap.UpdateAllHitObjects();
         }
diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index 4ddee2acc6..e812c042fb 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -29,25 +29,25 @@ namespace osu.Game.Screens.Edit.Setup
                 artistTextBox = new LabelledTextBox
                 {
                     Label = "Artist",
-                    Current = { Value = Beatmap.Value.Metadata.Artist },
+                    Current = { Value = Beatmap.Metadata.Artist },
                     TabbableContentContainer = this
                 },
                 titleTextBox = new LabelledTextBox
                 {
                     Label = "Title",
-                    Current = { Value = Beatmap.Value.Metadata.Title },
+                    Current = { Value = Beatmap.Metadata.Title },
                     TabbableContentContainer = this
                 },
                 creatorTextBox = new LabelledTextBox
                 {
                     Label = "Creator",
-                    Current = { Value = Beatmap.Value.Metadata.AuthorString },
+                    Current = { Value = Beatmap.Metadata.AuthorString },
                     TabbableContentContainer = this
                 },
                 difficultyTextBox = new LabelledTextBox
                 {
                     Label = "Difficulty Name",
-                    Current = { Value = Beatmap.Value.BeatmapInfo.Version },
+                    Current = { Value = Beatmap.BeatmapInfo.Version },
                     TabbableContentContainer = this
                 },
             };
@@ -62,10 +62,10 @@ namespace osu.Game.Screens.Edit.Setup
 
             // for now, update these on commit rather than making BeatmapMetadata bindables.
             // after switching database engines we can reconsider if switching to bindables is a good direction.
-            Beatmap.Value.Metadata.Artist = artistTextBox.Current.Value;
-            Beatmap.Value.Metadata.Title = titleTextBox.Current.Value;
-            Beatmap.Value.Metadata.AuthorString = creatorTextBox.Current.Value;
-            Beatmap.Value.BeatmapInfo.Version = difficultyTextBox.Current.Value;
+            Beatmap.Metadata.Artist = artistTextBox.Current.Value;
+            Beatmap.Metadata.Title = titleTextBox.Current.Value;
+            Beatmap.Metadata.AuthorString = creatorTextBox.Current.Value;
+            Beatmap.BeatmapInfo.Version = difficultyTextBox.Current.Value;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 0c957b80af..b3bceceea3 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Screens.Edit.Setup
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
+        [Resolved]
+        private IBindable<WorkingBeatmap> working { get; set; }
+
         [Resolved(canBeNull: true)]
         private Editor editor { get; set; }
 
@@ -70,7 +73,7 @@ namespace osu.Game.Screens.Edit.Setup
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",
-                    Current = { Value = Beatmap.Value.Metadata.AudioFile ?? "Click to select a track" },
+                    Current = { Value = Beatmap.Metadata.AudioFile ?? "Click to select a track" },
                     Target = audioTrackFileChooserContainer,
                     TabbableContentContainer = this
                 },
@@ -115,11 +118,11 @@ namespace osu.Game.Screens.Edit.Setup
             if (!info.Exists)
                 return false;
 
-            var set = Beatmap.Value.BeatmapSetInfo;
+            var set = working.Value.BeatmapSetInfo;
 
             // remove the previous background for now.
             // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.BackgroundFile);
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
 
             using (var stream = info.OpenRead())
             {
@@ -129,7 +132,7 @@ namespace osu.Game.Screens.Edit.Setup
                     beatmaps.AddFile(set, stream, info.Name);
             }
 
-            Beatmap.Value.Metadata.BackgroundFile = info.Name;
+            working.Value.Metadata.BackgroundFile = info.Name;
             updateBackgroundSprite();
 
             return true;
@@ -148,11 +151,11 @@ namespace osu.Game.Screens.Edit.Setup
             if (!info.Exists)
                 return false;
 
-            var set = Beatmap.Value.BeatmapSetInfo;
+            var set = working.Value.BeatmapSetInfo;
 
             // remove the previous audio track for now.
             // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.AudioFile);
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.AudioFile);
 
             using (var stream = info.OpenRead())
             {
@@ -162,7 +165,7 @@ namespace osu.Game.Screens.Edit.Setup
                     beatmaps.AddFile(set, stream, info.Name);
             }
 
-            Beatmap.Value.Metadata.AudioFile = info.Name;
+            working.Value.Metadata.AudioFile = info.Name;
 
             music.ReloadCurrentTrack();
 
@@ -178,7 +181,7 @@ namespace osu.Game.Screens.Edit.Setup
 
         private void updateBackgroundSprite()
         {
-            LoadComponentAsync(new BeatmapBackgroundSprite(Beatmap.Value)
+            LoadComponentAsync(new BeatmapBackgroundSprite(working.Value)
             {
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index cdf17d355e..88521a8fb0 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -2,10 +2,8 @@
 // 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.Game.Beatmaps;
 using osu.Game.Graphics;
 using osuTK;
 
@@ -19,7 +17,7 @@ namespace osu.Game.Screens.Edit.Setup
         protected OsuColour Colours { get; private set; }
 
         [Resolved]
-        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
+        protected EditorBeatmap Beatmap { get; private set; }
 
         protected override Container<Drawable> Content => flow;
 

From 3b08faa0ea134d99f6cd9dcd02096df1ffac115a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 17:49:11 +0900
Subject: [PATCH 07389/10326] Fix RemoveBlockingOverlay causing transform
 mutation from disposal threads

---
 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 17831ed26b..36e3078653 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -151,11 +151,11 @@ namespace osu.Game
             updateBlockingOverlayFade();
         }
 
-        public void RemoveBlockingOverlay(OverlayContainer overlay)
+        public void RemoveBlockingOverlay(OverlayContainer overlay) => Schedule(() =>
         {
             visibleBlockingOverlays.Remove(overlay);
             updateBlockingOverlayFade();
-        }
+        });
 
         /// <summary>
         /// Close all game-wide overlays.

From 2d1b52be0d8e02ffc4c4fbbd6a9f8f621d54f211 Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 17:21:31 +0000
Subject: [PATCH 07390/10326] Moved "ToolbarSocialButton"

This will remove it from coming off the screen.
---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 393e349bd0..88a2518f84 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -69,12 +69,13 @@ namespace osu.Game.Overlays.Toolbar
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
+                        
+                        new ToolbarSocialButton(),
                         new ToolbarNewsButton(),
                         new ToolbarChangelogButton(),
                         new ToolbarRankingsButton(),
                         new ToolbarBeatmapListingButton(),
                         new ToolbarChatButton(),
-                        new ToolbarSocialButton(),
                         new ToolbarMusicButton(),
                         //new ToolbarButton
                         //{

From 2e2b3ab5d4f66cd0295cd939a209c51485d59b41 Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 17:26:42 +0000
Subject: [PATCH 07391/10326] Should remove codeFactor error

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 88a2518f84..c95d02cea4 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -69,7 +69,6 @@ namespace osu.Game.Overlays.Toolbar
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        
                         new ToolbarSocialButton(),
                         new ToolbarNewsButton(),
                         new ToolbarChangelogButton(),

From 73f5e5aaf9fb94726b6906f98b6493202fedb680 Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 21:03:51 +0000
Subject: [PATCH 07392/10326] Moved "ToolbarSocialButton" back

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index c95d02cea4..393e349bd0 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -69,12 +69,12 @@ namespace osu.Game.Overlays.Toolbar
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        new ToolbarSocialButton(),
                         new ToolbarNewsButton(),
                         new ToolbarChangelogButton(),
                         new ToolbarRankingsButton(),
                         new ToolbarBeatmapListingButton(),
                         new ToolbarChatButton(),
+                        new ToolbarSocialButton(),
                         new ToolbarMusicButton(),
                         //new ToolbarButton
                         //{

From 3468df840b37291dfdae94af3fb0d29a8e7493fa Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 21:04:30 +0000
Subject: [PATCH 07393/10326] Moved tooltip to the left to stop the overflow

---
 osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
index e62c7bc807..ca334702ce 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
@@ -2,12 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarSocialButton : ToolbarOverlayToggleButton
     {
+
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         public ToolbarSocialButton()
         {
             Hotkey = GlobalAction.ToggleSocial;

From 0e42d415c18888192358e4f7e2a41074ebd0530f Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 21:05:28 +0000
Subject: [PATCH 07394/10326] Hit another oopie

---
 osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
index ca334702ce..1e00afc5fd 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
@@ -9,7 +9,6 @@ namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarSocialButton : ToolbarOverlayToggleButton
     {
-
         protected override Anchor TooltipAnchor => Anchor.TopRight;
 
         public ToolbarSocialButton()

From 1234d0fa0409c786c4e4ec4e2a63b5a5da406292 Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 22:01:12 +0000
Subject: [PATCH 07395/10326] Applied all tooltips to the right

---
 osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs | 3 +++
 osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs      | 5 ++++-
 osu.Game/Overlays/Toolbar/ToolbarChatButton.cs           | 3 +++
 osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs           | 3 +++
 osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs       | 3 +++
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index 0363873326..c495d673ce 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
@@ -2,12 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarBeatmapListingButton : ToolbarOverlayToggleButton
     {
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         public ToolbarBeatmapListingButton()
         {
             Hotkey = GlobalAction.ToggleDirect;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
index 23f8b141b2..28112d178f 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarChangelogButton : ToolbarOverlayToggleButton
-    {
+    {       
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         [BackgroundDependencyLoader(true)]
         private void load(ChangelogOverlay changelog)
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
index f9a66ae7bb..2d3b33e9bc 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
@@ -2,12 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarChatButton : ToolbarOverlayToggleButton
     {
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         public ToolbarChatButton()
         {
             Hotkey = GlobalAction.ToggleChat;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
index 0ba2935c80..9b2573ad07 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarNewsButton : ToolbarOverlayToggleButton
     {
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         [BackgroundDependencyLoader(true)]
         private void load(NewsOverlay news)
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
index 22a01bcdb5..312fc41aab 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarRankingsButton : ToolbarOverlayToggleButton
     {
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         [BackgroundDependencyLoader(true)]
         private void load(RankingsOverlay rankings)
         {

From 77e660e42677eee4d2407b3b59a649f836b35f34 Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 22:11:52 +0000
Subject: [PATCH 07396/10326] Should pass all checks again now.

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

diff --git a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
index 28112d178f..86bc73361a 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics;
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarChangelogButton : ToolbarOverlayToggleButton
-    {       
+    {
         protected override Anchor TooltipAnchor => Anchor.TopRight;
 
         [BackgroundDependencyLoader(true)]

From 81355652fa8601d4537cb6998afe6208da1b925d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Jan 2021 06:00:15 +0300
Subject: [PATCH 07397/10326] Add simple test coverage

---
 .../TestSceneMultiplayerReadyButton.cs        | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 6b11613f1c..03ba73d35b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -7,8 +7,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
@@ -23,6 +25,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerReadyButton : MultiplayerTestScene
     {
         private MultiplayerReadyButton button;
+        private BeatmapSetInfo importedSet;
 
         private BeatmapManager beatmaps;
         private RulesetStore rulesets;
@@ -38,9 +41,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
-            var beatmap = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First().Beatmaps.First();
-
-            Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap);
+            importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+            Beatmap.Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First());
 
             Child = button = new MultiplayerReadyButton
             {
@@ -51,13 +53,30 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Value = new PlaylistItem
                     {
-                        Beatmap = { Value = beatmap },
-                        Ruleset = { Value = beatmap.Ruleset }
+                        Beatmap = { Value = Beatmap.Value.BeatmapInfo },
+                        Ruleset = { Value = Beatmap.Value.BeatmapInfo.Ruleset }
                     }
                 }
             };
         });
 
+        [Test]
+        public void TestDeletedBeatmapDisableReady()
+        {
+            OsuButton readyButton = null;
+
+            AddAssert("ensure ready button enabled", () =>
+            {
+                readyButton = button.ChildrenOfType<OsuButton>().Single();
+                return readyButton.Enabled.Value;
+            });
+
+            AddStep("delete beatmap", () => beatmaps.Delete(importedSet));
+            AddAssert("ready button disabled", () => !readyButton.Enabled.Value);
+            AddStep("undelete beatmap", () => beatmaps.Undelete(importedSet));
+            AddAssert("ready button enabled back", () => readyButton.Enabled.Value);
+        }
+
         [Test]
         public void TestToggleStateWhenNotHost()
         {

From caa88c6100cb17d3307336ab43e00f16fbe98b01 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 13:13:51 +0900
Subject: [PATCH 07398/10326] Use CreateCopy instead of Clone interface

I was going for conformity by using the IClonable interface, but it
doesn't look like we use it anywhere else in the project.
---
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs | 4 ++--
 osu.Game/Beatmaps/WorkingBeatmap.cs                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index b56f9a106b..e8a91e4001 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -11,7 +11,7 @@ using osu.Framework.Lists;
 namespace osu.Game.Beatmaps.ControlPoints
 {
     [Serializable]
-    public class ControlPointInfo : ICloneable
+    public class ControlPointInfo
     {
         /// <summary>
         /// All control points grouped by time.
@@ -298,7 +298,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             }
         }
 
-        public object Clone()
+        public ControlPointInfo CreateCopy()
         {
             var controlPointInfo = new ControlPointInfo();
 
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 06b5913b18..8688017887 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert(cancellationSource.Token);
 
-                converted.ControlPointInfo = (ControlPointInfo)converted.ControlPointInfo.Clone();
+                converted.ControlPointInfo = converted.ControlPointInfo.CreateCopy();
 
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())

From 385c9cd2e23e9f66b3b316b11b594c5377d27b77 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 13:14:16 +0900
Subject: [PATCH 07399/10326] Add test coverage

---
 .../NonVisual/ControlPointInfoTest.cs         | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
index 90a487c0ac..b27c257795 100644
--- a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
+++ b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
@@ -246,5 +246,32 @@ namespace osu.Game.Tests.NonVisual
             Assert.That(cpi.DifficultyPoints.Count, Is.EqualTo(0));
             Assert.That(cpi.AllControlPoints.Count, Is.EqualTo(0));
         }
+
+        [Test]
+        public void TestCreateCopyIsDeepClone()
+        {
+            var cpi = new ControlPointInfo();
+
+            cpi.Add(1000, new TimingControlPoint { BeatLength = 500 });
+
+            var cpiCopy = cpi.CreateCopy();
+
+            cpiCopy.Add(2000, new TimingControlPoint { BeatLength = 500 });
+
+            Assert.That(cpi.Groups.Count, Is.EqualTo(1));
+            Assert.That(cpiCopy.Groups.Count, Is.EqualTo(2));
+
+            Assert.That(cpi.TimingPoints.Count, Is.EqualTo(1));
+            Assert.That(cpiCopy.TimingPoints.Count, Is.EqualTo(2));
+
+            Assert.That(cpi.TimingPoints[0], Is.Not.SameAs(cpiCopy.TimingPoints[0]));
+            Assert.That(cpi.TimingPoints[0].BeatLengthBindable, Is.Not.SameAs(cpiCopy.TimingPoints[0].BeatLengthBindable));
+
+            Assert.That(cpi.TimingPoints[0].BeatLength, Is.EqualTo(cpiCopy.TimingPoints[0].BeatLength));
+
+            cpi.TimingPoints[0].BeatLength = 800;
+
+            Assert.That(cpi.TimingPoints[0].BeatLength, Is.Not.EqualTo(cpiCopy.TimingPoints[0].BeatLength));
+        }
     }
 }

From 6b8e1913eee030038ed4af72be5168d0c2ba7fab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 13:27:45 +0900
Subject: [PATCH 07400/10326] Fix dependency not always available due to nested
 LoadComponentAsync call

---
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index b9457f422a..2d623a200c 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -30,16 +30,16 @@ namespace osu.Game.Screens.Edit
         {
         }
 
+        private Container mainContent;
+
+        private LoadingSpinner spinner;
+
         [BackgroundDependencyLoader(true)]
         private void load([CanBeNull] BindableBeatDivisor beatDivisor)
         {
             if (beatDivisor != null)
                 this.beatDivisor.BindTo(beatDivisor);
 
-            Container mainContent;
-
-            LoadingSpinner spinner;
-
             Children = new Drawable[]
             {
                 mainContent = new Container
@@ -99,6 +99,11 @@ namespace osu.Game.Screens.Edit
                     }
                 },
             };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             LoadComponentAsync(CreateMainContent(), content =>
             {

From afab35a31ad71e8f25e0d9084dc4edbb8e0183b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 13:41:31 +0900
Subject: [PATCH 07401/10326] Fix missing copy implementation in
 LegacySampleControlPiont

---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 06ff677aed..a06ad35b89 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -203,6 +203,13 @@ namespace osu.Game.Beatmaps.Formats
                 => base.IsRedundant(existing)
                    && existing is LegacySampleControlPoint existingSample
                    && CustomSampleBank == existingSample.CustomSampleBank;
+
+            public override void CopyFrom(ControlPoint other)
+            {
+                base.CopyFrom(other);
+
+                CustomSampleBank = ((LegacySampleControlPoint)other).CustomSampleBank;
+            }
         }
     }
 }

From 31a6e9b860ceb9ee1ece9441beb41b8aca042f5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 14:24:49 +0900
Subject: [PATCH 07402/10326] Remove unused using

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 8688017887..d25adca92b 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
 using osu.Framework.Statistics;
 using osu.Framework.Testing;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Types;

From ed6ffe2ef1b55d957851391d4635d0e93585dcf2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 14:54:59 +0900
Subject: [PATCH 07403/10326] Remove hacky code

---
 osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index b782df75df..64ddba669d 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -53,14 +53,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
 
             var databasedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
 
-            if (databasedBeatmap == null)
-                hasBeatmap = false;
-            else
-            {
-                // DeletePending isn't updated in the beatmap info query above, need to directly query the beatmap set from database as well.
-                var databasedSet = beatmaps.QueryBeatmapSet(s => s.Equals(databasedBeatmap.BeatmapSet));
-                hasBeatmap = databasedSet?.DeletePending == false;
-            }
+            hasBeatmap = databasedBeatmap?.BeatmapSet?.DeletePending == false;
         }
 
         protected override void Update()

From 962c95dc0158bfddf43ad8128dc4e1db2a131cb6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 19:06:00 +0900
Subject: [PATCH 07404/10326] Fix ModSelection making unsafe advances of
 ModSection

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

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 0107f94dcf..d00a365dde 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Overlays.Mods
         /// Select one or more mods in this section and deselects all other ones.
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be selected.</param>
-        public void SelectTypes(IEnumerable<Type> modTypes)
+        public void SelectTypes(IEnumerable<Type> modTypes) => Schedule(() =>
         {
             foreach (var button in buttons)
             {
@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.Mods
                 else
                     button.Deselect();
             }
-        }
+        });
 
         protected ModSection()
         {

From a3e4e2f6c394544efae9df90228690fbdd3660c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 18:24:21 +0900
Subject: [PATCH 07405/10326] Switch ResultsScreen and SongSelect inheritance
 and remove local implementation

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 4 +---
 osu.Game/Screens/Select/SongSelect.cs     | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 528a1842af..98794627fe 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -25,7 +25,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking
 {
-    public abstract class ResultsScreen : OsuScreen, IKeyBindingHandler<GlobalAction>
+    public abstract class ResultsScreen : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>
     {
         protected const float BACKGROUND_BLUR = 20;
         private static readonly float screen_height = 768 - TwoLayerButton.SIZE_EXTENDED.Y;
@@ -35,8 +35,6 @@ namespace osu.Game.Screens.Ranking
         // 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);
-
         public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
 
         public readonly ScoreInfo Score;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a5252fdc96..50a1dd6edf 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -41,7 +41,7 @@ using System.Diagnostics;
 
 namespace osu.Game.Screens.Select
 {
-    public abstract class SongSelect : OsuScreen, IKeyBindingHandler<GlobalAction>
+    public abstract class SongSelect : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>
     {
         public static readonly float WEDGE_HEIGHT = 245;
 
@@ -76,8 +76,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; }
 
-        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
-
         protected BeatmapCarousel Carousel { get; private set; }
 
         private BeatmapInfoWedge beatmapInfoWedge;

From b3f08b29ca60b99f6c3aa2f3a5d3dec679452a06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 18:32:23 +0900
Subject: [PATCH 07406/10326] Ensure that all changes to screen backgrounds are
 on the correct thread

---
 .../Background/TestSceneUserDimBackgrounds.cs | 55 ++++++++++++-------
 osu.Game/Rulesets/Mods/ModCinema.cs           |  2 +-
 osu.Game/Screens/BackgroundScreen.cs          |  2 +
 osu.Game/Screens/Edit/Editor.cs               | 13 +++--
 osu.Game/Screens/Menu/MainMenu.cs             |  6 +-
 osu.Game/Screens/OsuScreen.cs                 | 21 +++++--
 osu.Game/Screens/Play/EpilepsyWarning.cs      | 21 ++++++-
 osu.Game/Screens/Play/Player.cs               | 17 ++++--
 osu.Game/Screens/Play/PlayerLoader.cs         | 32 +++++++----
 .../Play/ScreenWithBeatmapBackground.cs       |  3 +-
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 14 +++--
 osu.Game/Screens/Select/SongSelect.cs         |  6 +-
 12 files changed, 132 insertions(+), 60 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 5323f58a66..b5df3285f0 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Tests.Visual.Background
             });
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
             AddStep("Stop background preview", () => InputManager.MoveMouseTo(playerLoader.ScreenPos));
-            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && playerLoader.IsBlurCorrect());
+            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.CheckBackgroundBlur(playerLoader.ExpectedBackgroundBlur));
         }
 
         /// <summary>
@@ -106,6 +106,7 @@ namespace osu.Game.Tests.Visual.Background
         public void TestStoryboardBackgroundVisibility()
         {
             performFullSetup();
+            AddAssert("Background retained from song select", () => songSelect.IsBackgroundCurrent());
             createFakeStoryboard();
             AddStep("Enable Storyboard", () =>
             {
@@ -198,8 +199,9 @@ namespace osu.Game.Tests.Visual.Background
             })));
 
             AddUntilStep("Wait for results is current", () => results.IsCurrentScreen());
+
             AddUntilStep("Screen is undimmed, original background retained", () =>
-                songSelect.IsBackgroundUndimmed() && songSelect.IsBackgroundCurrent() && results.IsBlurCorrect());
+                songSelect.IsBackgroundUndimmed() && songSelect.IsBackgroundCurrent() && songSelect.CheckBackgroundBlur(results.ExpectedBackgroundBlur));
         }
 
         /// <summary>
@@ -224,7 +226,7 @@ namespace osu.Game.Tests.Visual.Background
             AddStep("Resume PlayerLoader", () => player.Restart());
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
             AddStep("Move mouse to center of screen", () => InputManager.MoveMouseTo(playerLoader.ScreenPos));
-            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && playerLoader.IsBlurCorrect());
+            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.CheckBackgroundBlur(playerLoader.ExpectedBackgroundBlur));
         }
 
         private void createFakeStoryboard() => AddStep("Create storyboard", () =>
@@ -274,9 +276,11 @@ namespace osu.Game.Tests.Visual.Background
 
         private class DummySongSelect : PlaySongSelect
         {
+            private FadeAccessibleBackground background;
+
             protected override BackgroundScreen CreateBackground()
             {
-                FadeAccessibleBackground background = new FadeAccessibleBackground(Beatmap.Value);
+                background = new FadeAccessibleBackground(Beatmap.Value);
                 DimEnabled.BindTo(background.EnableUserDim);
                 return background;
             }
@@ -294,42 +298,54 @@ namespace osu.Game.Tests.Visual.Background
                 config.BindWith(OsuSetting.BlurLevel, BlurLevel);
             }
 
-            public bool IsBackgroundDimmed() => ((FadeAccessibleBackground)Background).CurrentColour == OsuColour.Gray(1f - ((FadeAccessibleBackground)Background).CurrentDim);
+            public bool IsBackgroundDimmed() => background.CurrentColour == OsuColour.Gray(1f - background.CurrentDim);
 
-            public bool IsBackgroundUndimmed() => ((FadeAccessibleBackground)Background).CurrentColour == Color4.White;
+            public bool IsBackgroundUndimmed() => background.CurrentColour == Color4.White;
 
-            public bool IsUserBlurApplied() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2((float)BlurLevel.Value * BackgroundScreenBeatmap.USER_BLUR_FACTOR);
+            public bool IsUserBlurApplied() => background.CurrentBlur == new Vector2((float)BlurLevel.Value * BackgroundScreenBeatmap.USER_BLUR_FACTOR);
 
-            public bool IsUserBlurDisabled() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2(0);
+            public bool IsUserBlurDisabled() => background.CurrentBlur == new Vector2(0);
 
-            public bool IsBackgroundInvisible() => ((FadeAccessibleBackground)Background).CurrentAlpha == 0;
+            public bool IsBackgroundInvisible() => background.CurrentAlpha == 0;
 
-            public bool IsBackgroundVisible() => ((FadeAccessibleBackground)Background).CurrentAlpha == 1;
+            public bool IsBackgroundVisible() => background.CurrentAlpha == 1;
 
-            public bool IsBlurCorrect() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2(BACKGROUND_BLUR);
+            public bool IsBlurCorrect() => background.CurrentBlur == new Vector2(BACKGROUND_BLUR);
+
+            public bool CheckBackgroundBlur(Vector2 expected) => background.CurrentBlur == expected;
 
             /// <summary>
             /// Make sure every time a screen gets pushed, the background doesn't get replaced
             /// </summary>
             /// <returns>Whether or not the original background (The one created in DummySongSelect) is still the current background</returns>
-            public bool IsBackgroundCurrent() => ((FadeAccessibleBackground)Background).IsCurrentScreen();
+            public bool IsBackgroundCurrent() => background?.IsCurrentScreen() == true;
         }
 
         private class FadeAccessibleResults : ResultsScreen
         {
+            private FadeAccessibleBackground background;
+
             public FadeAccessibleResults(ScoreInfo score)
                 : base(score, true)
             {
             }
 
-            protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
+            protected override BackgroundScreen CreateBackground() => background = new FadeAccessibleBackground(Beatmap.Value);
 
-            public bool IsBlurCorrect() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2(BACKGROUND_BLUR);
+            public Vector2 ExpectedBackgroundBlur => new Vector2(BACKGROUND_BLUR);
         }
 
         private class LoadBlockingTestPlayer : TestPlayer
         {
-            protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
+            protected override BackgroundScreen CreateBackground() =>
+                new FadeAccessibleBackground(Beatmap.Value);
+
+            public override void OnEntering(IScreen last)
+            {
+                base.OnEntering(last);
+
+                ApplyToBackground(b => ReplacesBackground.BindTo(b.StoryboardReplacesBackground));
+            }
 
             public new DimmableStoryboard DimmableStoryboard => base.DimmableStoryboard;
 
@@ -354,15 +370,16 @@ namespace osu.Game.Tests.Visual.Background
                     Thread.Sleep(1);
 
                 StoryboardEnabled = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
-                ReplacesBackground.BindTo(Background.StoryboardReplacesBackground);
                 DrawableRuleset.IsPaused.BindTo(IsPaused);
             }
         }
 
         private class TestPlayerLoader : PlayerLoader
         {
+            private FadeAccessibleBackground background;
+
             public VisualSettings VisualSettingsPos => VisualSettings;
-            public BackgroundScreen ScreenPos => Background;
+            public BackgroundScreen ScreenPos => background;
 
             public TestPlayerLoader(Player player)
                 : base(() => player)
@@ -371,9 +388,9 @@ namespace osu.Game.Tests.Visual.Background
 
             public void TriggerOnHover() => OnHover(new HoverEvent(new InputState()));
 
-            public bool IsBlurCorrect() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2(BACKGROUND_BLUR);
+            public Vector2 ExpectedBackgroundBlur => new Vector2(BACKGROUND_BLUR);
 
-            protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
+            protected override BackgroundScreen CreateBackground() => background = new FadeAccessibleBackground(Beatmap.Value);
         }
 
         private class FadeAccessibleBackground : BackgroundScreenBeatmap
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index cf8128301c..bee9e56edd 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mods
 
         public void ApplyToPlayer(Player player)
         {
-            player.Background.EnableUserDim.Value = false;
+            player.ApplyToBackground(b => b.EnableUserDim.Value = false);
 
             player.DimmableStoryboard.IgnoreUserSettings.Value = true;
 
diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index 0f3615b7a9..ea220c2f82 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Screens
             return false;
         }
 
+        public void ApplyToBackground(Action<BackgroundScreen> action) => Schedule(() => action.Invoke(this));
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 223c678fba..8c34cb2e08 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -444,11 +444,14 @@ namespace osu.Game.Screens.Edit
         {
             base.OnEntering(last);
 
-            // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
-            Background.FadeColour(Color4.DarkGray, 500);
+            ApplyToBackground(b =>
+            {
+                // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
+                b.FadeColour(Color4.DarkGray, 500);
 
-            Background.EnableUserDim.Value = false;
-            Background.BlurAmount.Value = 0;
+                b.EnableUserDim.Value = false;
+                b.BlurAmount.Value = 0;
+            });
 
             resetTrack(true);
         }
@@ -480,7 +483,7 @@ namespace osu.Game.Screens.Edit
                 }
             }
 
-            Background.FadeColour(Color4.White, 500);
+            ApplyToBackground(b => b.FadeColour(Color4.White, 500));
             resetTrack();
 
             return base.OnExiting(next);
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 9d5720ff34..97fd58318b 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -127,11 +127,11 @@ namespace osu.Game.Screens.Menu
                 {
                     case ButtonSystemState.Initial:
                     case ButtonSystemState.Exit:
-                        Background.FadeColour(Color4.White, 500, Easing.OutSine);
+                        ApplyToBackground(b => b.FadeColour(Color4.White, 500, Easing.OutSine));
                         break;
 
                     default:
-                        Background.FadeColour(OsuColour.Gray(0.8f), 500, Easing.OutSine);
+                        ApplyToBackground(b => b.FadeColour(OsuColour.Gray(0.8f), 500, Easing.OutSine));
                         break;
                 }
             };
@@ -256,7 +256,7 @@ namespace osu.Game.Screens.Menu
         {
             base.OnResuming(last);
 
-            (Background as BackgroundScreenDefault)?.Next();
+            ApplyToBackground(b => (b as BackgroundScreenDefault)?.Next());
 
             // we may have consumed our preloaded instance, so let's make another.
             preloadSongSelect();
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 851aedd84f..c97c0aef2b 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -114,9 +114,14 @@ namespace osu.Game.Screens
             Mods = screenDependencies.Mods;
         }
 
-        protected BackgroundScreen Background => backgroundStack?.CurrentScreen as BackgroundScreen;
+        public void ApplyToBackground(Action<BackgroundScreen> action) => background.ApplyToBackground(action);
 
-        private BackgroundScreen localBackground;
+        /// <summary>
+        /// The background created and owned by this screen. May be null if the background didn't change.
+        /// </summary>
+        private BackgroundScreen ownedBackground;
+
+        private BackgroundScreen background;
 
         [Resolved(canBeNull: true)]
         private BackgroundScreenStack backgroundStack { get; set; }
@@ -160,7 +165,15 @@ namespace osu.Game.Screens
         {
             applyArrivingDefaults(false);
 
-            backgroundStack?.Push(localBackground = CreateBackground());
+            backgroundStack?.Push(ownedBackground = CreateBackground());
+
+            background = backgroundStack?.CurrentScreen as BackgroundScreen;
+
+            if (background != ownedBackground)
+            {
+                // background may have not been replaced, at which point we don't want to track the background lifetime.
+                ownedBackground = null;
+            }
 
             base.OnEntering(last);
         }
@@ -173,7 +186,7 @@ namespace osu.Game.Screens
             if (base.OnExiting(next))
                 return true;
 
-            if (localBackground != null && backgroundStack?.CurrentScreen == localBackground)
+            if (ownedBackground != null && backgroundStack?.CurrentScreen == ownedBackground)
                 backgroundStack?.Exit();
 
             return false;
diff --git a/osu.Game/Screens/Play/EpilepsyWarning.cs b/osu.Game/Screens/Play/EpilepsyWarning.cs
index dc42427fbf..89e25d849f 100644
--- a/osu.Game/Screens/Play/EpilepsyWarning.cs
+++ b/osu.Game/Screens/Play/EpilepsyWarning.cs
@@ -24,7 +24,19 @@ namespace osu.Game.Screens.Play
             Alpha = 0f;
         }
 
-        public BackgroundScreenBeatmap DimmableBackground { get; set; }
+        private BackgroundScreenBeatmap dimmableBackground;
+
+        public BackgroundScreenBeatmap DimmableBackground
+        {
+            get => dimmableBackground;
+            set
+            {
+                dimmableBackground = value;
+
+                if (IsLoaded)
+                    updateBackgroundFade();
+            }
+        }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, IBindable<WorkingBeatmap> beatmap)
@@ -75,11 +87,16 @@ namespace osu.Game.Screens.Play
 
         protected override void PopIn()
         {
-            DimmableBackground?.FadeColour(OsuColour.Gray(0.5f), FADE_DURATION, Easing.OutQuint);
+            updateBackgroundFade();
 
             this.FadeIn(FADE_DURATION, Easing.OutQuint);
         }
 
+        private void updateBackgroundFade()
+        {
+            DimmableBackground?.FadeColour(OsuColour.Gray(0.5f), FADE_DURATION, Easing.OutQuint);
+        }
+
         protected override void PopOut() => this.FadeOut(FADE_DURATION);
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index bf2e6f5379..1fcbed7ef7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -721,15 +721,20 @@ namespace osu.Game.Screens.Play
                 .Delay(250)
                 .FadeIn(250);
 
-            Background.EnableUserDim.Value = true;
-            Background.BlurAmount.Value = 0;
+            ApplyToBackground(b =>
+            {
+                b.EnableUserDim.Value = true;
+                b.BlurAmount.Value = 0;
+
+                // bind component bindables.
+                b.IsBreakTime.BindTo(breakTracker.IsBreakTime);
+
+                b.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
+            });
 
-            // bind component bindables.
-            Background.IsBreakTime.BindTo(breakTracker.IsBreakTime);
             HUDOverlay.IsBreakTime.BindTo(breakTracker.IsBreakTime);
             DimmableStoryboard.IsBreakTime.BindTo(breakTracker.IsBreakTime);
 
-            Background.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
             DimmableStoryboard.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
 
             storyboardReplacesBackground.Value = Beatmap.Value.Storyboard.ReplacesBackground && Beatmap.Value.Storyboard.HasDrawable;
@@ -875,7 +880,7 @@ namespace osu.Game.Screens.Play
             float fadeOutDuration = instant ? 0 : 250;
             this.FadeOut(fadeOutDuration);
 
-            Background.EnableUserDim.Value = false;
+            ApplyToBackground(b => b.EnableUserDim.Value = false);
             storyboardReplacesBackground.Value = false;
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index f59b36bc42..5b4bd11216 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Play
 
                 backgroundBrightnessReduction = value;
 
-                Background.FadeColour(OsuColour.Gray(backgroundBrightnessReduction ? 0.8f : 1), 200);
+                ApplyToBackground(b => b.FadeColour(OsuColour.Gray(backgroundBrightnessReduction ? 0.8f : 1), 200));
             }
         }
 
@@ -176,12 +176,17 @@ namespace osu.Game.Screens.Play
         {
             base.OnEntering(last);
 
-            if (epilepsyWarning != null)
-                epilepsyWarning.DimmableBackground = Background;
+            ApplyToBackground(b =>
+            {
+                if (epilepsyWarning != null)
+                    epilepsyWarning.DimmableBackground = b;
+
+                b?.FadeColour(Color4.White, 800, Easing.OutQuint);
+            });
+
             Beatmap.Value.Track.AddAdjustment(AdjustableProperty.Volume, volumeAdjustment);
 
             content.ScaleTo(0.7f);
-            Background?.FadeColour(Color4.White, 800, Easing.OutQuint);
 
             contentIn();
 
@@ -225,7 +230,8 @@ namespace osu.Game.Screens.Play
             content.ScaleTo(0.7f, 150, Easing.InQuint);
             this.FadeOut(150);
 
-            Background.EnableUserDim.Value = false;
+            ApplyToBackground(b => b.EnableUserDim.Value = false);
+
             BackgroundBrightnessReduction = false;
             Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
 
@@ -270,16 +276,22 @@ namespace osu.Game.Screens.Play
             if (inputManager.HoveredDrawables.Contains(VisualSettings))
             {
                 // Preview user-defined background dim and blur when hovered on the visual settings panel.
-                Background.EnableUserDim.Value = true;
-                Background.BlurAmount.Value = 0;
+                ApplyToBackground(b =>
+                {
+                    b.EnableUserDim.Value = true;
+                    b.BlurAmount.Value = 0;
+                });
 
                 BackgroundBrightnessReduction = false;
             }
             else
             {
-                // Returns background dim and blur to the values specified by PlayerLoader.
-                Background.EnableUserDim.Value = false;
-                Background.BlurAmount.Value = BACKGROUND_BLUR;
+                ApplyToBackground(b =>
+                {
+                    // Returns background dim and blur to the values specified by PlayerLoader.
+                    b.EnableUserDim.Value = false;
+                    b.BlurAmount.Value = BACKGROUND_BLUR;
+                });
 
                 BackgroundBrightnessReduction = true;
             }
diff --git a/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs b/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs
index 8eb253608b..88dab88d42 100644
--- a/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs
+++ b/osu.Game/Screens/Play/ScreenWithBeatmapBackground.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.Game.Screens.Backgrounds;
 
 namespace osu.Game.Screens.Play
@@ -9,6 +10,6 @@ namespace osu.Game.Screens.Play
     {
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
-        public new BackgroundScreenBeatmap Background => (BackgroundScreenBeatmap)base.Background;
+        public void ApplyToBackground(Action<BackgroundScreenBeatmap> action) => base.ApplyToBackground(b => action.Invoke((BackgroundScreenBeatmap)b));
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 98794627fe..c1f5d92d17 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -18,7 +18,6 @@ using osu.Game.Input.Bindings;
 using osu.Game.Online.API;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
-using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking.Statistics;
 using osuTK;
@@ -235,15 +234,18 @@ namespace osu.Game.Screens.Ranking
         {
             base.OnEntering(last);
 
-            ((BackgroundScreenBeatmap)Background).BlurAmount.Value = BACKGROUND_BLUR;
+            ApplyToBackground(b =>
+            {
+                b.BlurAmount.Value = BACKGROUND_BLUR;
+                b.FadeTo(0.5f, 250);
+            });
 
-            Background.FadeTo(0.5f, 250);
             bottomPanel.FadeTo(1, 250);
         }
 
         public override bool OnExiting(IScreen next)
         {
-            Background.FadeTo(1, 250);
+            ApplyToBackground(b => b.FadeTo(1, 250));
 
             return base.OnExiting(next);
         }
@@ -293,7 +295,7 @@ namespace osu.Game.Screens.Ranking
                 ScorePanelList.HandleInput = false;
 
                 // Dim background.
-                Background.FadeTo(0.1f, 150);
+                ApplyToBackground(b => b.FadeTo(0.1f, 150));
 
                 detachedPanel = expandedPanel;
             }
@@ -317,7 +319,7 @@ namespace osu.Game.Screens.Ranking
                 ScorePanelList.HandleInput = true;
 
                 // Un-dim background.
-                Background.FadeTo(0.5f, 150);
+                ApplyToBackground(b => b.FadeTo(0.5f, 150));
 
                 detachedPanel = null;
             }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 50a1dd6edf..3c255011c9 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -19,7 +19,6 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Select.Options;
@@ -38,6 +37,7 @@ using osu.Game.Collections;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 using System.Diagnostics;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.Select
 {
@@ -682,12 +682,12 @@ namespace osu.Game.Screens.Select
         /// <param name="beatmap">The working beatmap.</param>
         private void updateComponentFromBeatmap(WorkingBeatmap beatmap)
         {
-            if (Background is BackgroundScreenBeatmap backgroundModeBeatmap)
+            ApplyToBackground(backgroundModeBeatmap =>
             {
                 backgroundModeBeatmap.Beatmap = beatmap;
                 backgroundModeBeatmap.BlurAmount.Value = BACKGROUND_BLUR;
                 backgroundModeBeatmap.FadeColour(Color4.White, 250);
-            }
+            });
 
             beatmapInfoWedge.Beatmap = beatmap;
 

From 5904e426ebf666ce8191ec5902389adc9f25b1b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 16:00:25 +0900
Subject: [PATCH 07407/10326] Remove unused variable

---
 .../Visual/Background/TestSceneUserDimBackgrounds.cs          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index b5df3285f0..7ade7725d9 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -323,14 +323,12 @@ namespace osu.Game.Tests.Visual.Background
 
         private class FadeAccessibleResults : ResultsScreen
         {
-            private FadeAccessibleBackground background;
-
             public FadeAccessibleResults(ScoreInfo score)
                 : base(score, true)
             {
             }
 
-            protected override BackgroundScreen CreateBackground() => background = new FadeAccessibleBackground(Beatmap.Value);
+            protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
 
             public Vector2 ExpectedBackgroundBlur => new Vector2(BACKGROUND_BLUR);
         }

From 57a8cd74615765e54d60a425f904a4034045b1a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 16:17:55 +0900
Subject: [PATCH 07408/10326] Schedule deselection operations for safety

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

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index d00a365dde..47b101c2b0 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
         /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false)
+        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false) => Schedule(() =>
         {
             int delay = 0;
 
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.Mods
                     }
                 }
             }
-        }
+        });
 
         /// <summary>
         /// Select one or more mods in this section and deselects all other ones.

From 9bac791a576a0b16860f3addb3ef3a451d166d1c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 16:17:42 +0900
Subject: [PATCH 07409/10326] Fix deselection of autoplay mod failing

---
 osu.Game/Screens/Select/PlaySongSelect.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 50a61ed4c2..e61d5cce85 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -9,6 +9,7 @@ using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
@@ -42,6 +43,8 @@ namespace osu.Game.Screens.Select
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
+        private ModAutoplay getAutoplayMod() => Ruleset.Value.CreateInstance().GetAutoplayMod();
+
         public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
@@ -50,10 +53,10 @@ namespace osu.Game.Screens.Select
 
             if (removeAutoModOnResume)
             {
-                var autoType = Ruleset.Value.CreateInstance().GetAutoplayMod()?.GetType();
+                var autoType = getAutoplayMod()?.GetType();
 
                 if (autoType != null)
-                    ModSelect.DeselectTypes(new[] { autoType }, true);
+                    Mods.Value = Mods.Value.Where(m => m.GetType() != autoType).ToArray();
 
                 removeAutoModOnResume = false;
             }
@@ -81,12 +84,9 @@ namespace osu.Game.Screens.Select
             // Ctrl+Enter should start map with autoplay enabled.
             if (GetContainingInputManager().CurrentState?.Keyboard.ControlPressed == true)
             {
-                var auto = Ruleset.Value.CreateInstance().GetAutoplayMod();
-                var autoType = auto?.GetType();
+                var autoplayMod = getAutoplayMod();
 
-                var mods = Mods.Value;
-
-                if (autoType == null)
+                if (autoplayMod == null)
                 {
                     notifications?.Post(new SimpleNotification
                     {
@@ -95,9 +95,11 @@ namespace osu.Game.Screens.Select
                     return false;
                 }
 
-                if (mods.All(m => m.GetType() != autoType))
+                var mods = Mods.Value;
+
+                if (mods.All(m => m.GetType() != autoplayMod.GetType()))
                 {
-                    Mods.Value = mods.Append(auto).ToArray();
+                    Mods.Value = mods.Append(autoplayMod).ToArray();
                     removeAutoModOnResume = true;
                 }
             }

From 4d6c13f169cc7c09c4db61bbfdfd780c5b44fef5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 16:18:13 +0900
Subject: [PATCH 07410/10326] Privatise ModSelectOverlay methods that may be
 unsafe to be called externally

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 34f5c70adb..491052fa2c 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -249,7 +249,7 @@ namespace osu.Game.Overlays.Mods
                                             {
                                                 Width = 180,
                                                 Text = "Deselect All",
-                                                Action = DeselectAll,
+                                                Action = deselectAll,
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
@@ -318,7 +318,7 @@ namespace osu.Game.Overlays.Mods
             sampleOff = audio.Samples.Get(@"UI/check-off");
         }
 
-        public void DeselectAll()
+        private void deselectAll()
         {
             foreach (var section in ModSectionsContainer.Children)
                 section.DeselectAll();
@@ -331,7 +331,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
         /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        public void DeselectTypes(Type[] modTypes, bool immediate = false)
+        private void deselectTypes(Type[] modTypes, bool immediate = false)
         {
             if (modTypes.Length == 0) return;
 
@@ -438,7 +438,7 @@ namespace osu.Game.Overlays.Mods
             {
                 if (State.Value == Visibility.Visible) sampleOn?.Play();
 
-                DeselectTypes(selectedMod.IncompatibleMods, true);
+                deselectTypes(selectedMod.IncompatibleMods, true);
 
                 if (selectedMod.RequiresConfiguration) ModSettingsContainer.Show();
             }

From 5d8c153c1e21949156a0dbf54b9cf8d71bca4c4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 16:41:03 +0900
Subject: [PATCH 07411/10326] Move schedule logic to buttons rather than
 section

It turns out there's some quite convoluted scheduling / order of
execution requirements of ModSelectOverlay and ModSection. Applying
scheduling causes a runaway condition ending in zero frames after many
mod button changes.

I wanted to avoid rewriting the whole component, so have just moved the
schedule to guard against the part where drawables are actually changed.
---
 osu.Game/Overlays/Mods/ModButton.cs  | 62 +++++++++++++++-------------
 osu.Game/Overlays/Mods/ModSection.cs |  8 ++--
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index e574828cd2..51c8bcf9a9 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -64,41 +64,45 @@ namespace osu.Game.Overlays.Mods
             if (newIndex >= 0 && !Mods[newIndex].HasImplementation)
                 return false;
 
-            selectedIndex = newIndex;
-            Mod modAfter = SelectedMod ?? Mods[0];
-
-            if (beforeSelected != Selected)
+            Schedule(() =>
             {
-                iconsContainer.RotateTo(Selected ? 5f : 0f, 300, Easing.OutElastic);
-                iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, Easing.OutElastic);
-            }
+                selectedIndex = newIndex;
+                Mod modAfter = SelectedMod ?? Mods[0];
 
-            if (modBefore != modAfter)
-            {
-                const float rotate_angle = 16;
-
-                foregroundIcon.RotateTo(rotate_angle * direction, mod_switch_duration, mod_switch_easing);
-                backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
-
-                backgroundIcon.Mod = modAfter;
-
-                using (BeginDelayedSequence(mod_switch_duration, true))
+                if (beforeSelected != Selected)
                 {
-                    foregroundIcon
-                        .RotateTo(-rotate_angle * direction)
-                        .RotateTo(0f, mod_switch_duration, mod_switch_easing);
-
-                    backgroundIcon
-                        .RotateTo(rotate_angle * direction)
-                        .RotateTo(0f, mod_switch_duration, mod_switch_easing);
-
-                    Schedule(() => displayMod(modAfter));
+                    iconsContainer.RotateTo(Selected ? 5f : 0f, 300, Easing.OutElastic);
+                    iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, Easing.OutElastic);
                 }
-            }
 
-            foregroundIcon.Selected.Value = Selected;
+                if (modBefore != modAfter)
+                {
+                    const float rotate_angle = 16;
+
+                    foregroundIcon.RotateTo(rotate_angle * direction, mod_switch_duration, mod_switch_easing);
+                    backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
+
+                    backgroundIcon.Mod = modAfter;
+
+                    using (BeginDelayedSequence(mod_switch_duration, true))
+                    {
+                        foregroundIcon
+                            .RotateTo(-rotate_angle * direction)
+                            .RotateTo(0f, mod_switch_duration, mod_switch_easing);
+
+                        backgroundIcon
+                            .RotateTo(rotate_angle * direction)
+                            .RotateTo(0f, mod_switch_duration, mod_switch_easing);
+
+                        Schedule(() => displayMod(modAfter));
+                    }
+                }
+
+                foregroundIcon.Selected.Value = Selected;
+
+                SelectionChanged?.Invoke(SelectedMod);
+            });
 
-            SelectionChanged?.Invoke(SelectedMod);
             return true;
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 47b101c2b0..0107f94dcf 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
         /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false) => Schedule(() =>
+        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false)
         {
             int delay = 0;
 
@@ -124,13 +124,13 @@ namespace osu.Game.Overlays.Mods
                     }
                 }
             }
-        });
+        }
 
         /// <summary>
         /// Select one or more mods in this section and deselects all other ones.
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be selected.</param>
-        public void SelectTypes(IEnumerable<Type> modTypes) => Schedule(() =>
+        public void SelectTypes(IEnumerable<Type> modTypes)
         {
             foreach (var button in buttons)
             {
@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.Mods
                 else
                     button.Deselect();
             }
-        });
+        }
 
         protected ModSection()
         {

From 54982dcdd7e46ee8081f176ebc07b9037e0bfd5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 22:42:39 +0900
Subject: [PATCH 07412/10326] Refactor LoadingLayer to avoid applying effects
 to external drawables

In theory this seemed like a good idea (and an optimisation in some
cases, due to lower fill rate), but in practice this leads to weird edge
cases.

This aims to do away with the operations on external drawables by
applying a dim to the area behind the `LoadingLayer` when required.
I went over each usage and ensured they look as good or better than
previously.

The specific bad usage here was the restoration of the colour on dispose
(if the `LoadingLayer` was disposed in a still-visible state).

I'm aware that the `BeatmapListingOverlay` will now dim completely during
load. I think this is fine for the time being.
---
 .../UserInterface/TestSceneLoadingLayer.cs    |  10 +-
 .../Graphics/UserInterface/LoadingLayer.cs    |  29 +-
 .../Overlays/AccountCreation/ScreenEntry.cs   |   2 +-
 osu.Game/Overlays/BeatmapListingOverlay.cs    |   8 +-
 .../BeatmapSet/Buttons/FavouriteButton.cs     |   2 +-
 .../BeatmapSet/Scores/ScoresContainer.cs      |  10 +-
 .../Dashboard/Friends/FriendDisplay.cs        |   2 +-
 osu.Game/Overlays/DashboardOverlay.cs         |   2 +-
 osu.Game/Overlays/NewsOverlay.cs              |   2 +-
 .../Overlays/Rankings/SpotlightsLayout.cs     |   3 +-
 osu.Game/Overlays/RankingsOverlay.cs          |   6 +-
 .../OnlinePlay/Lounge/LoungeSubScreen.cs      |   2 +-
 .../Match/MultiplayerMatchSettingsOverlay.cs  | 279 ++++++------
 .../Multiplayer/MultiplayerMatchSongSelect.cs |   2 +-
 .../Multiplayer/MultiplayerPlayer.cs          |   2 +-
 .../PlaylistsMatchSettingsOverlay.cs          | 409 +++++++++---------
 .../Screens/Play/BeatmapMetadataDisplay.cs    |   2 +-
 osu.Game/Screens/Select/BeatmapDetails.cs     |   6 +-
 18 files changed, 389 insertions(+), 389 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
index 1be191fc29..a694595115 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -14,11 +15,12 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneLoadingLayer : OsuTestScene
     {
-        private Drawable dimContent;
         private LoadingLayer overlay;
 
         private Container content;
 
+        private Drawable dimContent => overlay.Children.OfType<Box>().First();
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -29,14 +31,14 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Size = new Vector2(300),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Children = new[]
+                    Children = new Drawable[]
                     {
                         new Box
                         {
                             Colour = Color4.SlateGray,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        dimContent = new FillFlowContainer
+                        new FillFlowContainer
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
@@ -51,7 +53,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                                 new TriangleButton { Text = "puush me", Width = 200, Action = () => { } },
                             }
                         },
-                        overlay = new LoadingLayer(dimContent),
+                        overlay = new LoadingLayer(true),
                     }
                 },
             };
diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index c8c4424bee..6aca30328a 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osuTK;
 using osuTK.Graphics;
@@ -17,22 +18,31 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class LoadingLayer : LoadingSpinner
     {
-        private readonly Drawable dimTarget;
+        private readonly Box backgroundDimLayer;
 
         /// <summary>
-        /// Constuct a new loading spinner.
+        /// Construct a new loading spinner.
         /// </summary>
-        /// <param name="dimTarget">An optional target to dim when displayed.</param>
+        /// <param name="dimBackground">Whether the full background area should be dimmed while loading.</param>
         /// <param name="withBox">Whether the spinner should have a surrounding black box for visibility.</param>
-        public LoadingLayer(Drawable dimTarget = null, bool withBox = true)
+        public LoadingLayer(bool dimBackground = false, bool withBox = true)
             : base(withBox)
         {
             RelativeSizeAxes = Axes.Both;
             Size = new Vector2(1);
 
-            this.dimTarget = dimTarget;
-
             MainContents.RelativeSizeAxes = Axes.None;
+
+            if (dimBackground)
+            {
+                AddInternal(backgroundDimLayer = new Box
+                {
+                    Depth = float.MaxValue,
+                    Colour = Color4.Black,
+                    Alpha = 0,
+                    RelativeSizeAxes = Axes.Both,
+                });
+            }
         }
 
         public override bool HandleNonPositionalInput => false;
@@ -56,19 +66,20 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override void PopIn()
         {
-            dimTarget?.FadeColour(OsuColour.Gray(0.5f), TRANSITION_DURATION, Easing.OutQuint);
+            backgroundDimLayer?.FadeTo(0.5f, TRANSITION_DURATION * 2, Easing.OutQuint);
             base.PopIn();
         }
 
         protected override void PopOut()
         {
-            dimTarget?.FadeColour(Color4.White, TRANSITION_DURATION, Easing.OutQuint);
+            backgroundDimLayer?.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
             base.PopOut();
         }
 
         protected override void Update()
         {
             base.Update();
+
             MainContents.Size = new Vector2(Math.Clamp(Math.Min(DrawWidth, DrawHeight) * 0.25f, 30, 100));
         }
 
@@ -79,7 +90,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, Easing.OutQuint);
+                // 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 a0b1b27ebf..0d5538155a 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.AccountCreation
                         },
                     },
                 },
-                loadingLayer = new LoadingLayer(mainContent)
+                loadingLayer = new LoadingLayer(true)
             };
 
             textboxes = new[] { usernameTextBox, emailTextBox, passwordTextBox };
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 1e29e713af..0c9c995dd6 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -92,14 +92,14 @@ namespace osu.Game.Overlays
                                         {
                                             foundContent = new FillFlowContainer<BeatmapPanel>(),
                                             notFoundContent = new NotFoundDrawable(),
-                                            loadingLayer = new LoadingLayer(panelTarget)
                                         }
                                     }
-                                }
+                                },
                             },
                         }
-                    }
-                }
+                    },
+                },
+                loadingLayer = new LoadingLayer(true)
             };
         }
 
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
index c983b337b5..7ad6906cea 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                     Size = new Vector2(18),
                     Shadow = false,
                 },
-                loading = new LoadingLayer(icon, false),
+                loading = new LoadingLayer(true, false),
             });
 
             Action = () =>
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 9a2dcd014a..b598b7d97f 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -157,11 +157,11 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                         }
                                     }
                                 },
-                                loading = new LoadingLayer()
                             }
                         }
-                    }
-                }
+                    },
+                },
+                loading = new LoadingLayer()
             });
         }
 
@@ -228,7 +228,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             {
                 Scores = null;
                 notSupporterPlaceholder.Show();
+
                 loading.Hide();
+                loading.FinishTransforms();
                 return;
             }
 
@@ -241,6 +243,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             getScoresRequest.Success += scores =>
             {
                 loading.Hide();
+                loading.FinishTransforms();
+
                 Scores = scores;
 
                 if (!scores.Scores.Any())
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index cc26a11da1..e6fe6ac749 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
                                                 AutoSizeAxes = Axes.Y,
                                                 Padding = new MarginPadding { Horizontal = 50 }
                                             },
-                                            loading = new LoadingLayer(itemsPlaceholder)
+                                            loading = new LoadingLayer(true)
                                         }
                                     }
                                 }
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 04defce636..03c320debe 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays
                         }
                     }
                 },
-                loading = new LoadingLayer(content),
+                loading = new LoadingLayer(true),
             };
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index c8c1db012f..5820d405d4 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays
                         },
                     },
                 },
-                loading = new LoadingLayer(content),
+                loading = new LoadingLayer(true),
             };
         }
 
diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
index 61339df76f..b16e0a4908 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Overlays.Rankings
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
+
             InternalChild = new ReverseChildIDFillFlowContainer<Drawable>
             {
                 RelativeSizeAxes = Axes.X,
@@ -68,7 +69,7 @@ namespace osu.Game.Overlays.Rankings
                                 AutoSizeAxes = Axes.Y,
                                 Margin = new MarginPadding { Vertical = 10 }
                             },
-                            loading = new LoadingLayer(content)
+                            loading = new LoadingLayer(true)
                         }
                     }
                 }
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index ae6d49960a..25350e310a 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Overlays
                 Depth = -float.MaxValue
             })
         {
+            loading = new LoadingLayer(true);
+
             Children = new Drawable[]
             {
                 background = new Box
@@ -74,12 +76,12 @@ namespace osu.Game.Overlays
                                         RelativeSizeAxes = Axes.X,
                                         Margin = new MarginPadding { Bottom = 10 }
                                     },
-                                    loading = new LoadingLayer(contentContainer),
                                 }
                             }
                         }
                     }
-                }
+                },
+                loading
             };
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 79f5dfdee1..0f06188dc2 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
                                     Padding = new MarginPadding(10),
                                     Child = roomsContainer = new RoomsContainer { JoinRequested = joinRequested }
                                 },
-                                loadingLayer = new LoadingLayer(roomsContainer),
+                                loadingLayer = new LoadingLayer(true),
                             }
                         },
                         new RoomInspector
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index ae03d384f6..67c6aa7add 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -71,201 +71,192 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
-                Container dimContent;
-
                 InternalChildren = new Drawable[]
                 {
-                    dimContent = new Container
+                    new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
+                        Colour = Color4Extensions.FromHex(@"28242d"),
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
                         {
-                            new Box
+                            new Dimension(GridSizeMode.Distributed),
+                            new Dimension(GridSizeMode.AutoSize),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4Extensions.FromHex(@"28242d"),
-                            },
-                            new GridContainer
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                RowDimensions = new[]
+                                new OsuScrollContainer
                                 {
-                                    new Dimension(GridSizeMode.Distributed),
-                                    new Dimension(GridSizeMode.AutoSize),
-                                },
-                                Content = new[]
-                                {
-                                    new Drawable[]
+                                    Padding = new MarginPadding
                                     {
-                                        new OsuScrollContainer
+                                        Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+                                        Vertical = 10
+                                    },
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new[]
+                                    {
+                                        new FillFlowContainer
                                         {
-                                            Padding = new MarginPadding
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 10),
+                                            Children = new Drawable[]
                                             {
-                                                Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
-                                                Vertical = 10
-                                            },
-                                            RelativeSizeAxes = Axes.Both,
-                                            Children = new[]
-                                            {
-                                                new FillFlowContainer
+                                                new Container
                                                 {
+                                                    Anchor = Anchor.TopCentre,
+                                                    Origin = Anchor.TopCentre,
+                                                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
                                                     RelativeSizeAxes = Axes.X,
                                                     AutoSizeAxes = Axes.Y,
-                                                    Direction = FillDirection.Vertical,
-                                                    Spacing = new Vector2(0, 10),
                                                     Children = new Drawable[]
                                                     {
-                                                        new Container
+                                                        new SectionContainer
                                                         {
-                                                            Anchor = Anchor.TopCentre,
-                                                            Origin = Anchor.TopCentre,
-                                                            Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
-                                                            RelativeSizeAxes = Axes.X,
-                                                            AutoSizeAxes = Axes.Y,
-                                                            Children = new Drawable[]
+                                                            Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
+                                                            Children = new[]
                                                             {
-                                                                new SectionContainer
+                                                                new Section("Room name")
                                                                 {
-                                                                    Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
-                                                                    Children = new[]
+                                                                    Child = NameField = new SettingsTextBox
                                                                     {
-                                                                        new Section("Room name")
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                    },
+                                                                },
+                                                                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[]
                                                                         {
-                                                                            Child = NameField = new SettingsTextBox
+                                                                            TypePicker = new GameTypePicker
                                                                             {
                                                                                 RelativeSizeAxes = Axes.X,
-                                                                                TabbableContentContainer = this,
-                                                                            },
-                                                                        },
-                                                                        new Section("Room visibility")
-                                                                        {
-                                                                            Alpha = disabled_alpha,
-                                                                            Child = AvailabilityPicker = new RoomAvailabilityPicker
-                                                                            {
                                                                                 Enabled = { Value = false }
                                                                             },
-                                                                        },
-                                                                        new Section("Game type")
-                                                                        {
-                                                                            Alpha = disabled_alpha,
-                                                                            Child = new FillFlowContainer
+                                                                            typeLabel = new OsuSpriteText
                                                                             {
-                                                                                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
-                                                                                    },
-                                                                                },
+                                                                                Font = OsuFont.GetFont(size: 14),
+                                                                                Colour = colours.Yellow
                                                                             },
                                                                         },
                                                                     },
                                                                 },
-                                                                new SectionContainer
-                                                                {
-                                                                    Anchor = Anchor.TopRight,
-                                                                    Origin = Anchor.TopRight,
-                                                                    Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
-                                                                    Children = new[]
-                                                                    {
-                                                                        new Section("Max participants")
-                                                                        {
-                                                                            Alpha = disabled_alpha,
-                                                                            Child = MaxParticipantsField = new SettingsNumberTextBox
-                                                                            {
-                                                                                RelativeSizeAxes = Axes.X,
-                                                                                TabbableContentContainer = this,
-                                                                                ReadOnly = true,
-                                                                            },
-                                                                        },
-                                                                        new Section("Password (optional)")
-                                                                        {
-                                                                            Alpha = disabled_alpha,
-                                                                            Child = new SettingsPasswordTextBox
-                                                                            {
-                                                                                RelativeSizeAxes = Axes.X,
-                                                                                TabbableContentContainer = this,
-                                                                                ReadOnly = true,
-                                                                            },
-                                                                        },
-                                                                    }
-                                                                }
                                                             },
                                                         },
-                                                        initialBeatmapControl = new BeatmapSelectionControl
+                                                        new SectionContainer
                                                         {
-                                                            Anchor = Anchor.TopCentre,
-                                                            Origin = Anchor.TopCentre,
-                                                            RelativeSizeAxes = Axes.X,
-                                                            Width = 0.5f
+                                                            Anchor = Anchor.TopRight,
+                                                            Origin = Anchor.TopRight,
+                                                            Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
+                                                            Children = new[]
+                                                            {
+                                                                new Section("Max participants")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = MaxParticipantsField = new SettingsNumberTextBox
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                        ReadOnly = true,
+                                                                    },
+                                                                },
+                                                                new Section("Password (optional)")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = new SettingsPasswordTextBox
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                        ReadOnly = true,
+                                                                    },
+                                                                },
+                                                            }
                                                         }
-                                                    }
+                                                    },
+                                                },
+                                                initialBeatmapControl = new BeatmapSelectionControl
+                                                {
+                                                    Anchor = Anchor.TopCentre,
+                                                    Origin = Anchor.TopCentre,
+                                                    RelativeSizeAxes = Axes.X,
+                                                    Width = 0.5f
                                                 }
-                                            },
-                                        },
+                                            }
+                                        }
                                     },
-                                    new Drawable[]
+                                },
+                            },
+                            new Drawable[]
+                            {
+                                new Container
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Y = 2,
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Children = new Drawable[]
                                     {
-                                        new Container
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
+                                        },
+                                        new FillFlowContainer
                                         {
-                                            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[]
                                             {
-                                                new Box
+                                                ApplyButton = new CreateOrUpdateButton
                                                 {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
+                                                    Anchor = Anchor.BottomCentre,
+                                                    Origin = Anchor.BottomCentre,
+                                                    Size = new Vector2(230, 55),
+                                                    Enabled = { Value = false },
+                                                    Action = apply,
                                                 },
-                                                new FillFlowContainer
+                                                ErrorText = new OsuSpriteText
                                                 {
-                                                    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 CreateOrUpdateButton
-                                                        {
-                                                            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
-                                                        }
-                                                    }
+                                                    Anchor = Anchor.BottomCentre,
+                                                    Origin = Anchor.BottomCentre,
+                                                    Alpha = 0,
+                                                    Depth = 1,
+                                                    Colour = colours.RedDark
                                                 }
                                             }
                                         }
                                     }
                                 }
-                            },
+                            }
                         }
                     },
-                    loadingLayer = new LoadingLayer(dimContent)
+                    loadingLayer = new LoadingLayer(true)
                 };
 
                 TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 72539a2e3a..36dbb9e792 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(loadingLayer = new LoadingLayer(Carousel));
+            AddInternal(loadingLayer = new LoadingLayer(true));
             initialBeatmap = Beatmap.Value;
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 4247e954bd..4bee502e2e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
             LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
 
-            HUDOverlay.Add(loadingDisplay = new LoadingLayer(DrawableRuleset) { Depth = float.MaxValue });
+            HUDOverlay.Add(loadingDisplay = new LoadingLayer(true) { Depth = float.MaxValue });
 
             if (Token == null)
                 return; // Todo: Somehow handle token retrieval failure.
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index 6b92526f35..01f9920609 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -64,243 +64,234 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
-                Container dimContent;
-
                 InternalChildren = new Drawable[]
                 {
-                    dimContent = new Container
+                    new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
+                        Colour = Color4Extensions.FromHex(@"28242d"),
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
                         {
-                            new Box
+                            new Dimension(GridSizeMode.Distributed),
+                            new Dimension(GridSizeMode.AutoSize),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4Extensions.FromHex(@"28242d"),
-                            },
-                            new GridContainer
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                RowDimensions = new[]
+                                new OsuScrollContainer
                                 {
-                                    new Dimension(GridSizeMode.Distributed),
-                                    new Dimension(GridSizeMode.AutoSize),
-                                },
-                                Content = new[]
-                                {
-                                    new Drawable[]
+                                    Padding = new MarginPadding
                                     {
-                                        new OsuScrollContainer
-                                        {
-                                            Padding = new MarginPadding
-                                            {
-                                                Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
-                                                Vertical = 10
-                                            },
-                                            RelativeSizeAxes = Axes.Both,
-                                            Children = new[]
-                                            {
-                                                new Container
-                                                {
-                                                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Children = new Drawable[]
-                                                    {
-                                                        new SectionContainer
-                                                        {
-                                                            Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
-                                                            Children = new[]
-                                                            {
-                                                                new Section("Room name")
-                                                                {
-                                                                    Child = NameField = new SettingsTextBox
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        TabbableContentContainer = this,
-                                                                        LengthLimit = 100
-                                                                    },
-                                                                },
-                                                                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,
-                                                                    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,
-                                                                    },
-                                                                },
-                                                                new Section("Password (optional)")
-                                                                {
-                                                                    Alpha = disabled_alpha,
-                                                                    Child = new SettingsPasswordTextBox
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        TabbableContentContainer = this,
-                                                                        ReadOnly = true,
-                                                                    },
-                                                                },
-                                                            },
-                                                        },
-                                                        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[]
-                                                                            {
-                                                                                playlistLength = new OsuSpriteText
-                                                                                {
-                                                                                    Margin = new MarginPadding { Vertical = 5 },
-                                                                                    Colour = colours.Yellow,
-                                                                                    Font = OsuFont.GetFont(size: 12),
-                                                                                }
-                                                                            },
-                                                                            new Drawable[]
-                                                                            {
-                                                                                new PurpleTriangleButton
-                                                                                {
-                                                                                    RelativeSizeAxes = Axes.X,
-                                                                                    Height = 40,
-                                                                                    Text = "Edit playlist",
-                                                                                    Action = () => EditPlaylist?.Invoke()
-                                                                                }
-                                                                            }
-                                                                        },
-                                                                        RowDimensions = new[]
-                                                                        {
-                                                                            new Dimension(),
-                                                                            new Dimension(GridSizeMode.AutoSize),
-                                                                            new Dimension(GridSizeMode.AutoSize),
-                                                                        }
-                                                                    }
-                                                                },
-                                                            },
-                                                        },
-                                                    },
-                                                }
-                                            },
-                                        },
+                                        Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+                                        Vertical = 10
                                     },
-                                    new Drawable[]
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new[]
                                     {
                                         new Container
                                         {
-                                            Anchor = Anchor.BottomLeft,
-                                            Origin = Anchor.BottomLeft,
-                                            Y = 2,
+                                            Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
                                             Children = new Drawable[]
                                             {
-                                                new Box
+                                                new SectionContainer
                                                 {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
-                                                },
-                                                new FillFlowContainer
-                                                {
-                                                    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[]
+                                                    Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
+                                                    Children = new[]
                                                     {
-                                                        ApplyButton = new CreateRoomButton
+                                                        new Section("Room name")
                                                         {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            Size = new Vector2(230, 55),
-                                                            Enabled = { Value = false },
-                                                            Action = apply,
+                                                            Child = NameField = new SettingsTextBox
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                TabbableContentContainer = this,
+                                                                LengthLimit = 100
+                                                            },
                                                         },
-                                                        ErrorText = new OsuSpriteText
+                                                        new Section("Duration")
                                                         {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            Alpha = 0,
-                                                            Depth = 1,
-                                                            Colour = colours.RedDark
-                                                        }
-                                                    }
+                                                            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,
+                                                            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,
+                                                            },
+                                                        },
+                                                        new Section("Password (optional)")
+                                                        {
+                                                            Alpha = disabled_alpha,
+                                                            Child = new SettingsPasswordTextBox
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                TabbableContentContainer = this,
+                                                                ReadOnly = true,
+                                                            },
+                                                        },
+                                                    },
+                                                },
+                                                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[]
+                                                                    {
+                                                                        playlistLength = new OsuSpriteText
+                                                                        {
+                                                                            Margin = new MarginPadding { Vertical = 5 },
+                                                                            Colour = colours.Yellow,
+                                                                            Font = OsuFont.GetFont(size: 12),
+                                                                        }
+                                                                    },
+                                                                    new Drawable[]
+                                                                    {
+                                                                        new PurpleTriangleButton
+                                                                        {
+                                                                            RelativeSizeAxes = Axes.X,
+                                                                            Height = 40,
+                                                                            Text = "Edit playlist",
+                                                                            Action = () => EditPlaylist?.Invoke()
+                                                                        }
+                                                                    }
+                                                                },
+                                                                RowDimensions = new[]
+                                                                {
+                                                                    new Dimension(),
+                                                                    new Dimension(GridSizeMode.AutoSize),
+                                                                    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 = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
+                                        },
+                                        new FillFlowContainer
+                                        {
+                                            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
                                                 }
                                             }
                                         }
                                     }
                                 }
-                            },
+                            }
                         }
                     },
-                    loadingLayer = new LoadingLayer(dimContent)
+                    loadingLayer = new LoadingLayer(true)
                 };
 
                 TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 5530b4beac..00176e9127 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Screens.Play
                                     Anchor = Anchor.Centre,
                                     FillMode = FillMode.Fill,
                                 },
-                                loading = new LoadingLayer(backgroundSprite)
+                                loading = new LoadingLayer(true)
                             }
                         },
                         new OsuSpriteText
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 71f78c5c95..8a1c291fca 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -63,8 +63,6 @@ namespace osu.Game.Screens.Select
 
         public BeatmapDetails()
         {
-            Container content;
-
             Children = new Drawable[]
             {
                 new Box
@@ -72,7 +70,7 @@ namespace osu.Game.Screens.Select
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4.Black.Opacity(0.5f),
                 },
-                content = new Container
+                new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Horizontal = spacing },
@@ -159,7 +157,7 @@ namespace osu.Game.Screens.Select
                         },
                     },
                 },
-                loading = new LoadingLayer(content),
+                loading = new LoadingLayer(true),
             };
         }
 

From 0b1ee2e267f3daea22a437d445edf4336bd048f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 17:42:19 +0900
Subject: [PATCH 07413/10326] Remove unused dispose logic

---
 osu.Game/Graphics/UserInterface/LoadingLayer.cs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index 6aca30328a..a4905156a9 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osuTK;
@@ -82,16 +81,5 @@ namespace osu.Game.Graphics.UserInterface
 
             MainContents.Size = new Vector2(Math.Clamp(Math.Min(DrawWidth, DrawHeight) * 0.25f, 30, 100));
         }
-
-        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);
-            }
-        }
     }
 }

From 0639429a23bb706d84b56dea98b7f23d3f4563b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 18:10:39 +0900
Subject: [PATCH 07414/10326] Fix test (and remove no longer valid test)

---
 .../UserInterface/TestSceneLoadingLayer.cs    | 36 ++++++++-----------
 .../Graphics/UserInterface/LoadingLayer.cs    |  8 ++---
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
index a694595115..d426723f0b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
@@ -15,12 +15,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneLoadingLayer : OsuTestScene
     {
-        private LoadingLayer overlay;
+        private TestLoadingLayer overlay;
 
         private Container content;
 
-        private Drawable dimContent => overlay.Children.OfType<Box>().First();
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -53,7 +51,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                                 new TriangleButton { Text = "puush me", Width = 200, Action = () => { } },
                             }
                         },
-                        overlay = new LoadingLayer(true),
+                        overlay = new TestLoadingLayer(true),
                     }
                 },
             };
@@ -66,25 +64,11 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("show", () => overlay.Show());
 
-            AddUntilStep("wait for content dim", () => dimContent.Colour != Color4.White);
+            AddUntilStep("wait for content dim", () => overlay.BackgroundDimLayer.Alpha > 0);
 
             AddStep("hide", () => overlay.Hide());
 
-            AddUntilStep("wait for content restore", () => dimContent.Colour == Color4.White);
-        }
-
-        [Test]
-        public void TestContentRestoreOnDispose()
-        {
-            AddAssert("not visible", () => !overlay.IsPresent);
-
-            AddStep("show", () => overlay.Show());
-
-            AddUntilStep("wait for content dim", () => dimContent.Colour != Color4.White);
-
-            AddStep("expire", () => overlay.Expire());
-
-            AddUntilStep("wait for content restore", () => dimContent.Colour == Color4.White);
+            AddUntilStep("wait for content restore", () => Precision.AlmostEquals(overlay.BackgroundDimLayer.Alpha, 0));
         }
 
         [Test]
@@ -100,5 +84,15 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("hide", () => overlay.Hide());
         }
+
+        private class TestLoadingLayer : LoadingLayer
+        {
+            public new Box BackgroundDimLayer => base.BackgroundDimLayer;
+
+            public TestLoadingLayer(bool dimBackground = false, bool withBox = true)
+                : base(dimBackground, withBox)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index a4905156a9..3e3fd32d65 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class LoadingLayer : LoadingSpinner
     {
-        private readonly Box backgroundDimLayer;
+        protected Box BackgroundDimLayer { get; private set; }
 
         /// <summary>
         /// Construct a new loading spinner.
@@ -34,7 +34,7 @@ namespace osu.Game.Graphics.UserInterface
 
             if (dimBackground)
             {
-                AddInternal(backgroundDimLayer = new Box
+                AddInternal(BackgroundDimLayer = new Box
                 {
                     Depth = float.MaxValue,
                     Colour = Color4.Black,
@@ -65,13 +65,13 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override void PopIn()
         {
-            backgroundDimLayer?.FadeTo(0.5f, TRANSITION_DURATION * 2, Easing.OutQuint);
+            BackgroundDimLayer?.FadeTo(0.5f, TRANSITION_DURATION * 2, Easing.OutQuint);
             base.PopIn();
         }
 
         protected override void PopOut()
         {
-            backgroundDimLayer?.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
+            BackgroundDimLayer?.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
             base.PopOut();
         }
 

From d0d2e41b28df281507e16d5de19f4ec0c5e8a8b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 18:19:28 +0900
Subject: [PATCH 07415/10326] Fix display settings binding to configuration
 bindables in async load

---
 .../Settings/Sections/Graphics/LayoutSettings.cs    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 3d3b543d70..e815e2f68b 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -133,6 +133,15 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 },
             };
 
+            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
+
             windowModes.BindCollectionChanged((sender, args) =>
             {
                 if (windowModes.Count > 1)
@@ -141,8 +150,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     windowModeDropdown.Hide();
             }, true);
 
-            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
-
             currentDisplay.BindValueChanged(display => Schedule(() =>
             {
                 resolutions.RemoveRange(1, resolutions.Count - 1);
@@ -159,8 +166,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 updateResolutionDropdown();
             }), true);
 
-            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
-
             scalingMode.BindValueChanged(mode =>
             {
                 scalingSettings.ClearTransforms();

From 83dbba3cbfb3a02297ae8bc801a11bf2028f3cb6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 18:41:45 +0900
Subject: [PATCH 07416/10326] Fix carousel beatmap set panels applying
 transforms to difficulties while they are loading

---
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index b3c5d458d6..17fa66447d 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -40,6 +41,8 @@ namespace osu.Game.Screens.Select.Carousel
 
         private BeatmapSetInfo beatmapSet;
 
+        private Task beatmapsLoadTask;
+
         [Resolved]
         private BeatmapManager manager { get; set; }
 
@@ -85,7 +88,9 @@ namespace osu.Game.Screens.Select.Carousel
             base.UpdateItem();
 
             Content.Clear();
+
             beatmapContainer = null;
+            beatmapsLoadTask = null;
 
             if (Item == null)
                 return;
@@ -122,11 +127,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             MovementContainer.MoveToX(0, 500, Easing.OutExpo);
 
-            if (beatmapContainer != null)
-            {
-                foreach (var beatmap in beatmapContainer)
-                    beatmap.MoveToY(0, 800, Easing.OutQuint);
-            }
+            updateBeatmapYPositions();
         }
 
         protected override void Selected()
@@ -163,7 +164,7 @@ namespace osu.Game.Screens.Select.Carousel
                     ChildrenEnumerable = visibleBeatmaps.Select(c => c.CreateDrawableRepresentation())
                 };
 
-                LoadComponentAsync(beatmapContainer, loaded =>
+                beatmapsLoadTask = LoadComponentAsync(beatmapContainer, loaded =>
                 {
                     // make sure the pooled target hasn't changed.
                     if (beatmapContainer != loaded)
@@ -173,16 +174,26 @@ namespace osu.Game.Screens.Select.Carousel
                     updateBeatmapYPositions();
                 });
             }
+        }
 
-            void updateBeatmapYPositions()
+        private void updateBeatmapYPositions()
+        {
+            if (beatmapsLoadTask == null || !beatmapsLoadTask.IsCompleted)
+                return;
+
+            float yPos = DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
+
+            bool isSelected = Item.State.Value == CarouselItemState.Selected;
+
+            foreach (var panel in beatmapContainer.Children)
             {
-                float yPos = DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
-
-                foreach (var panel in beatmapContainer.Children)
+                if (isSelected)
                 {
                     panel.MoveToY(yPos, 800, Easing.OutQuint);
                     yPos += panel.Item.TotalHeight;
                 }
+                else
+                    panel.MoveToY(0, 800, Easing.OutQuint);
             }
         }
 

From 4b539b01c1862bfb0a29ad69dc6b400f3719e99b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 20:38:58 +0900
Subject: [PATCH 07417/10326] Match code between updateSelectedBeatmap/Ruleset

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index e3036c662b..7e217ca7a4 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -435,13 +435,15 @@ namespace osu.Game.Screens.Select
                 return;
 
             beatmapNoDebounce = beatmap;
-
             performUpdateSelected();
         }
 
         private void updateSelectedRuleset(RulesetInfo ruleset)
         {
-            if (ruleset == null || ruleset.Equals(rulesetNoDebounce))
+            if (ruleset == null && rulesetNoDebounce == null)
+                return;
+
+            if (ruleset?.Equals(rulesetNoDebounce) == true)
                 return;
 
             rulesetNoDebounce = ruleset;

From 2b253f6d01426901994e95b03ead4233f7cb67dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Jan 2021 22:39:59 +0100
Subject: [PATCH 07418/10326] Remove now-unused fields & locals

---
 osu.Game/Overlays/AccountCreation/ScreenEntry.cs | 4 +---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs  | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index 0d5538155a..bcb3d4b635 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -48,11 +48,9 @@ namespace osu.Game.Overlays.AccountCreation
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            FillFlowContainer mainContent;
-
             InternalChildren = new Drawable[]
             {
-                mainContent = new FillFlowContainer
+                new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 00176e9127..b53141e8fb 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -53,7 +53,6 @@ namespace osu.Game.Screens.Play
         private readonly Bindable<IReadOnlyList<Mod>> mods;
         private readonly Drawable facade;
         private LoadingSpinner loading;
-        private Sprite backgroundSprite;
 
         public IBindable<IReadOnlyList<Mod>> Mods => mods;
 
@@ -123,7 +122,7 @@ namespace osu.Game.Screens.Play
                             Masking = true,
                             Children = new Drawable[]
                             {
-                                backgroundSprite = new Sprite
+                                new Sprite
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Texture = beatmap?.Background,

From ac1d6d444430296d2ab08ac3f5e89f5a965655ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Jan 2021 22:40:16 +0100
Subject: [PATCH 07419/10326] Make auto-property get-only

---
 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 3e3fd32d65..d86ea9e4ea 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class LoadingLayer : LoadingSpinner
     {
-        protected Box BackgroundDimLayer { get; private set; }
+        protected Box BackgroundDimLayer { get; }
 
         /// <summary>
         /// Construct a new loading spinner.

From 0880e76da8d58d02ffe4ad95c173d9373e3d50b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Jan 2021 22:47:57 +0100
Subject: [PATCH 07420/10326] Mark background dim layer as possibly-null

---
 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 d86ea9e4ea..47ba5fce4d 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
@@ -17,6 +18,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class LoadingLayer : LoadingSpinner
     {
+        [CanBeNull]
         protected Box BackgroundDimLayer { get; }
 
         /// <summary>

From 15dd7a87a62d73d0ba6e85fea034f1d7cb9656c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 15:19:12 +0900
Subject: [PATCH 07421/10326] Move gameplay preview event binding to
 LoadComplete

---
 .../Settings/Sections/Graphics/LayoutSettings.cs         | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index e815e2f68b..7acbf038d8 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -132,14 +132,14 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     }
                 },
             };
-
-            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
+
             windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
 
             windowModes.BindCollectionChanged((sender, args) =>
@@ -186,11 +186,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             }
         }
 
-        /// <summary>
-        /// Create a delayed bindable which only updates when a condition is met.
-        /// </summary>
-        /// <param name="bindable">The config bindable.</param>
-        /// <returns>A bindable which will propagate updates with a delay.</returns>
         private void bindPreviewEvent(Bindable<float> bindable)
         {
             bindable.ValueChanged += _ =>

From 11a0c637bc07812e01125df31251791cf9a24694 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 15:25:53 +0900
Subject: [PATCH 07422/10326] Mark background properties as nullable

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

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index c97c0aef2b..d1cdb9f1de 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -119,8 +120,10 @@ namespace osu.Game.Screens
         /// <summary>
         /// The background created and owned by this screen. May be null if the background didn't change.
         /// </summary>
+        [CanBeNull]
         private BackgroundScreen ownedBackground;
 
+        [CanBeNull]
         private BackgroundScreen background;
 
         [Resolved(canBeNull: true)]

From e9d4e4d1d5bb5c6df13474c867c81b4d516cd61d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 15:26:13 +0900
Subject: [PATCH 07423/10326] Add xmldoc and throw a local exception on null
 background

---
 osu.Game/Screens/BackgroundScreen.cs |  4 ++++
 osu.Game/Screens/OsuScreen.cs        | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index ea220c2f82..c81362eebe 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -34,6 +34,10 @@ namespace osu.Game.Screens
             return false;
         }
 
+        /// <summary>
+        /// Apply arbitrary changes to this background in a thread safe manner.
+        /// </summary>
+        /// <param name="action">The operation to perform.</param>
         public void ApplyToBackground(Action<BackgroundScreen> action) => Schedule(() => action.Invoke(this));
 
         protected override void Update()
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index d1cdb9f1de..11467db6c8 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -115,8 +115,6 @@ namespace osu.Game.Screens
             Mods = screenDependencies.Mods;
         }
 
-        public void ApplyToBackground(Action<BackgroundScreen> action) => background.ApplyToBackground(action);
-
         /// <summary>
         /// The background created and owned by this screen. May be null if the background didn't change.
         /// </summary>
@@ -148,6 +146,18 @@ namespace osu.Game.Screens
             Activity.Value ??= InitialActivity;
         }
 
+        /// <summary>
+        /// Apply arbitrary changes to the current background screen in a thread safe manner.
+        /// </summary>
+        /// <param name="action">The operation to perform.</param>
+        public void ApplyToBackground(Action<BackgroundScreen> action)
+        {
+            if (background == null)
+                throw new InvalidOperationException("Attempted to apply to background before screen is pushed");
+
+            background.ApplyToBackground(action);
+        }
+
         public override void OnResuming(IScreen last)
         {
             if (PlayResumeSound)

From 550ef3f13307f3d8592a0bc1ecd103f67af046e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 15:28:01 +0900
Subject: [PATCH 07424/10326] Aggressively dispose ownedBackground if it was
 not used, because we can

---
 osu.Game/Screens/OsuScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 11467db6c8..fb26739a44 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -185,6 +185,7 @@ namespace osu.Game.Screens
             if (background != ownedBackground)
             {
                 // background may have not been replaced, at which point we don't want to track the background lifetime.
+                ownedBackground?.Dispose();
                 ownedBackground = null;
             }
 

From 07cff7038728545a5ce399c3b727b1d03c68813c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 18:19:03 +0900
Subject: [PATCH 07425/10326] Add specific messaging for when there's no
 background stack available

---
 osu.Game/Screens/OsuScreen.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index fb26739a44..e1a29946f4 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -125,6 +125,7 @@ namespace osu.Game.Screens
         private BackgroundScreen background;
 
         [Resolved(canBeNull: true)]
+        [CanBeNull]
         private BackgroundScreenStack backgroundStack { get; set; }
 
         [Resolved(canBeNull: true)]
@@ -152,8 +153,11 @@ namespace osu.Game.Screens
         /// <param name="action">The operation to perform.</param>
         public void ApplyToBackground(Action<BackgroundScreen> action)
         {
+            if (backgroundStack == null)
+                throw new InvalidOperationException("Attempted to apply to background without a background stack being available.");
+
             if (background == null)
-                throw new InvalidOperationException("Attempted to apply to background before screen is pushed");
+                throw new InvalidOperationException("Attempted to apply to background before screen is pushed.");
 
             background.ApplyToBackground(action);
         }

From 99701a6d9b22e2fbc4864556a14f9f44311b5236 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 21:06:33 +0900
Subject: [PATCH 07426/10326] Add null check on beatmapContainer for safety

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 17fa66447d..c0415384c8 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -178,6 +178,9 @@ namespace osu.Game.Screens.Select.Carousel
 
         private void updateBeatmapYPositions()
         {
+            if (beatmapContainer == null)
+                return;
+
             if (beatmapsLoadTask == null || !beatmapsLoadTask.IsCompleted)
                 return;
 

From 43b9fde45731fdbd5da77f119eaedc5e0afa0f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 13:15:15 +0100
Subject: [PATCH 07427/10326] Add some nullability annotations for good measure

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index c0415384c8..d7e901b71e 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -37,10 +38,12 @@ namespace osu.Game.Screens.Select.Carousel
 
         public IEnumerable<DrawableCarouselItem> DrawableBeatmaps => beatmapContainer?.Children ?? Enumerable.Empty<DrawableCarouselItem>();
 
+        [CanBeNull]
         private Container<DrawableCarouselItem> beatmapContainer;
 
         private BeatmapSetInfo beatmapSet;
 
+        [CanBeNull]
         private Task beatmapsLoadTask;
 
         [Resolved]

From 32accc8eab227aebcc40cc026897324119c0e589 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 22:56:10 +0900
Subject: [PATCH 07428/10326] Remove "osu!direct" button

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 2 +-
 osu.Game/Screens/Menu/ButtonSystem.cs            | 1 -
 osu.Game/Screens/Menu/Disclaimer.cs              | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 1270df5374..fa3f70735a 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Input.Bindings
         [Description("Toggle settings")]
         ToggleSettings,
 
-        [Description("Toggle osu!direct")]
+        [Description("Toggle beatmap listing")]
         ToggleDirect,
 
         [Description("Increase volume")]
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index fd4d74dc6b..0c47ef3b1e 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -130,7 +130,6 @@ namespace osu.Game.Screens.Menu
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
-            buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 46fddabb26..72eb9c7c0c 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -201,7 +201,7 @@ namespace osu.Game.Screens.Menu
                 "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!",
+                "For now, what used to be \"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!",

From 59025e9d50a6866b71f2571919460c94a155222c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:09:58 +0900
Subject: [PATCH 07429/10326] Remove related events

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 1 -
 osu.Game/Screens/Menu/MainMenu.cs     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 0c47ef3b1e..8417858878 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -39,7 +39,6 @@ namespace osu.Game.Screens.Menu
 
         public Action OnEdit;
         public Action OnExit;
-        public Action OnBeatmapListing;
         public Action OnSolo;
         public Action OnSettings;
         public Action OnMultiplayer;
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 97fd58318b..ef45a656fa 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Screens.Menu
         private SongTicker songTicker;
 
         [BackgroundDependencyLoader(true)]
-        private void load(BeatmapListingOverlay beatmapListing, SettingsOverlay settings, RankingsOverlay rankings, OsuConfigManager config, SessionStatics statics)
+        private void load(SettingsOverlay settings, OsuConfigManager config, SessionStatics statics)
         {
             holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
@@ -137,7 +137,6 @@ namespace osu.Game.Screens.Menu
             };
 
             buttons.OnSettings = () => settings?.ToggleVisibility();
-            buttons.OnBeatmapListing = () => beatmapListing?.ToggleVisibility();
 
             LoadComponentAsync(background = new BackgroundScreenDefault());
             preloadSongSelect();

From 283c69a68f3f4a1a29ea6d676fdaabdad67000aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:12:56 +0900
Subject: [PATCH 07430/10326] Update enum name in line with changes

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs         | 4 ++--
 osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index fa3f70735a..b8c2fa201f 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.R }, GlobalAction.ResetInputSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.T }, GlobalAction.ToggleToolbar),
             new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
-            new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleDirect),
+            new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleBeatmapListing),
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
@@ -113,7 +113,7 @@ namespace osu.Game.Input.Bindings
         ToggleSettings,
 
         [Description("Toggle beatmap listing")]
-        ToggleDirect,
+        ToggleBeatmapListing,
 
         [Description("Increase volume")]
         IncreaseVolume,
diff --git a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index c495d673ce..bfe36a6a0f 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Toolbar
 
         public ToolbarBeatmapListingButton()
         {
-            Hotkey = GlobalAction.ToggleDirect;
+            Hotkey = GlobalAction.ToggleBeatmapListing;
         }
 
         [BackgroundDependencyLoader(true)]

From cf3043fc08fa723dde4f6c4a7ea4a060a4e72c50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:20:26 +0900
Subject: [PATCH 07431/10326] Only show "development build" footer on debug
 releases

---
 osu.Desktop/Overlays/VersionManager.cs | 39 ++++++++++++++++----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs
index 8c759f8487..59d0f9635d 100644
--- a/osu.Desktop/Overlays/VersionManager.cs
+++ b/osu.Desktop/Overlays/VersionManager.cs
@@ -26,9 +26,11 @@ namespace osu.Desktop.Overlays
 
             Alpha = 0;
 
+            FillFlowContainer mainFill;
+
             Children = new Drawable[]
             {
-                new FillFlowContainer
+                mainFill = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
@@ -55,23 +57,30 @@ namespace osu.Desktop.Overlays
                                 },
                             }
                         },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Font = OsuFont.Numeric.With(size: 12),
-                            Colour = colours.Yellow,
-                            Text = @"Development Build"
-                        },
-                        new Sprite
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Texture = textures.Get(@"Menu/dev-build-footer"),
-                        },
                     }
                 }
             };
+
+            if (DebugUtils.IsDebugBuild)
+            {
+                mainFill.AddRange(new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Font = OsuFont.Numeric.With(size: 12),
+                        Colour = colours.Yellow,
+                        Text = @"Development Build"
+                    },
+                    new Sprite
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Texture = textures.Get(@"Menu/dev-build-footer"),
+                    },
+                });
+            }
         }
 
         protected override void PopIn()

From cfbfb8d58bd2768bf83be25c2e2da1cd26a1d4ce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:21:46 +0900
Subject: [PATCH 07432/10326] Revert "Remove related events"

This reverts commit 59025e9d50a6866b71f2571919460c94a155222c.
---
 osu.Game/Screens/Menu/ButtonSystem.cs | 1 +
 osu.Game/Screens/Menu/MainMenu.cs     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 8417858878..0c47ef3b1e 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Screens.Menu
 
         public Action OnEdit;
         public Action OnExit;
+        public Action OnBeatmapListing;
         public Action OnSolo;
         public Action OnSettings;
         public Action OnMultiplayer;
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index ef45a656fa..97fd58318b 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Screens.Menu
         private SongTicker songTicker;
 
         [BackgroundDependencyLoader(true)]
-        private void load(SettingsOverlay settings, OsuConfigManager config, SessionStatics statics)
+        private void load(BeatmapListingOverlay beatmapListing, SettingsOverlay settings, RankingsOverlay rankings, OsuConfigManager config, SessionStatics statics)
         {
             holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
@@ -137,6 +137,7 @@ namespace osu.Game.Screens.Menu
             };
 
             buttons.OnSettings = () => settings?.ToggleVisibility();
+            buttons.OnBeatmapListing = () => beatmapListing?.ToggleVisibility();
 
             LoadComponentAsync(background = new BackgroundScreenDefault());
             preloadSongSelect();

From 35be7ec0e1477c9d904538c4dd726e50b6f2e827 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:28:14 +0900
Subject: [PATCH 07433/10326] Add back button but rename to "browse"

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 0c47ef3b1e..f400b2114b 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -129,7 +129,8 @@ namespace osu.Game.Screens.Menu
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
-            buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
+            buttonsTopLevel.Add(new Button(@"edit", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
+            buttonsTopLevel.Add(new Button(@"browse", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));

From d056e6575e1cd711890ffee0592b173b6eccb960 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:30:54 +0900
Subject: [PATCH 07434/10326] Use IsDeployedBuild instead of IsDebugBuild for
 footer display conditional

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

diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs
index 59d0f9635d..e4a3451651 100644
--- a/osu.Desktop/Overlays/VersionManager.cs
+++ b/osu.Desktop/Overlays/VersionManager.cs
@@ -61,7 +61,7 @@ namespace osu.Desktop.Overlays
                 }
             };
 
-            if (DebugUtils.IsDebugBuild)
+            if (!game.IsDeployedBuild)
             {
                 mainFill.AddRange(new Drawable[]
                 {

From a8530fde9d3dea6f4a0064e8371c2debbcdd2471 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 00:05:12 +0900
Subject: [PATCH 07435/10326] Tidy up variables and spacing

---
 osu.Desktop/DiscordRichPresence.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index 172db324cb..63b12fb84b 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -31,7 +31,8 @@ namespace osu.Desktop
 
         private readonly IBindable<UserStatus> status = new Bindable<UserStatus>();
         private readonly IBindable<UserActivity> activity = new Bindable<UserActivity>();
-        private readonly Bindable<DiscordRichPresenceMode> mode = new Bindable<DiscordRichPresenceMode>();
+
+        private readonly Bindable<DiscordRichPresenceMode> privacyMode = new Bindable<DiscordRichPresenceMode>();
 
         private readonly RichPresence presence = new RichPresence
         {
@@ -53,7 +54,8 @@ namespace osu.Desktop
 
             client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Code} {e.Message}", LoggingTarget.Network);
 
-            config.BindWith(OsuSetting.DiscordRichPresence, mode);
+            config.BindWith(OsuSetting.DiscordRichPresence, privacyMode);
+
             (user = provider.LocalUser.GetBoundCopy()).BindValueChanged(u =>
             {
                 status.UnbindBindings();
@@ -66,7 +68,7 @@ namespace osu.Desktop
             ruleset.BindValueChanged(_ => updateStatus());
             status.BindValueChanged(_ => updateStatus());
             activity.BindValueChanged(_ => updateStatus());
-            mode.BindValueChanged(_ => updateStatus());
+            privacyMode.BindValueChanged(_ => updateStatus());
 
             client.Initialize();
         }
@@ -82,7 +84,7 @@ namespace osu.Desktop
             if (!client.IsInitialized)
                 return;
 
-            if (status.Value is UserStatusOffline || mode.Value == DiscordRichPresenceMode.Off)
+            if (status.Value is UserStatusOffline || privacyMode.Value == DiscordRichPresenceMode.Off)
             {
                 client.ClearPresence();
                 return;
@@ -100,7 +102,7 @@ namespace osu.Desktop
             }
 
             // update user information
-            if (mode.Value == DiscordRichPresenceMode.Limited)
+            if (privacyMode.Value == DiscordRichPresenceMode.Limited)
                 presence.Assets.LargeImageText = string.Empty;
             else
                 presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.Ranks.Global > 0 ? $" (rank #{user.Value.Statistics.Ranks.Global:N0})" : string.Empty);
@@ -144,7 +146,7 @@ namespace osu.Desktop
                     return edit.Beatmap.ToString();
 
                 case UserActivity.InLobby lobby:
-                    return mode.Value == DiscordRichPresenceMode.Limited ? string.Empty : lobby.Room.Name.Value;
+                    return privacyMode.Value == DiscordRichPresenceMode.Limited ? string.Empty : lobby.Room.Name.Value;
             }
 
             return string.Empty;

From fb057857e707349ead9bf7aa539d5e61c3a42cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 17:40:29 +0100
Subject: [PATCH 07436/10326] Update references to current year

---
 Directory.Build.props  | 4 ++--
 LICENCE                | 2 +-
 osu.Desktop/osu.nuspec | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 9ec442aafa..049db816a8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -40,7 +40,7 @@
     <RepositoryUrl>https://github.com/ppy/osu</RepositoryUrl>
     <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
     <Company>ppy Pty Ltd</Company>
-    <Copyright>Copyright (c) 2020 ppy Pty Ltd</Copyright>
+    <Copyright>Copyright (c) 2021 ppy Pty Ltd</Copyright>
     <PackageTags>osu game</PackageTags>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/LICENCE b/LICENCE
index 2435c23545..b5962ad3b2 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,4 +1,4 @@
-Copyright (c) 2020 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2021 ppy Pty Ltd <contact@ppy.sh>.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/osu.Desktop/osu.nuspec b/osu.Desktop/osu.nuspec
index 2fc6009183..fa182f8e70 100644
--- a/osu.Desktop/osu.nuspec
+++ b/osu.Desktop/osu.nuspec
@@ -11,7 +11,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>A free-to-win rhythm game. Rhythm is just a *click* away!</description>
         <releaseNotes>testing</releaseNotes>
-        <copyright>Copyright (c) 2020 ppy Pty Ltd</copyright>
+        <copyright>Copyright (c) 2021 ppy Pty Ltd</copyright>
         <language>en-AU</language>
     </metadata>
     <files>

From 09742998cdeaeaae7fda4c77309e45cd14b69b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 17:40:46 +0100
Subject: [PATCH 07437/10326] Fix mistaken obsoletion notice

It was added in c9f38f7bb6af116fa7ec813ceb3f100dcad30adb, which
specified 2021 in another place (and was committed in October of 2020
anyway). Update the year so that it doesn't get culled prematurely.
---
 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 da6da0ea97..e5eaf5db88 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -750,7 +750,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 if (Result.Type != originalType)
                 {
                     Logger.Log($"{GetType().ReadableName()} applied an invalid hit result ({originalType}) when {nameof(HitResult.IgnoreMiss)} or {nameof(HitResult.IgnoreHit)} is expected.\n"
-                               + $"This has been automatically adjusted to {Result.Type}, and support will be removed from 2020-03-28 onwards.", level: LogLevel.Important);
+                               + $"This has been automatically adjusted to {Result.Type}, and support will be removed from 2021-03-28 onwards.", level: LogLevel.Important);
                 }
             }
 

From 539785e422accca0ccd360b4b02969ccf7a70a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 17:46:44 +0100
Subject: [PATCH 07438/10326] Remove obsoleted IHasCurve

---
 .../Rulesets/Objects/Legacy/ConvertSlider.cs  |  5 +-
 osu.Game/Rulesets/Objects/Types/IHasCurve.cs  | 55 -------------------
 2 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Objects/Types/IHasCurve.cs

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 36b421586e..df569b91c1 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -10,10 +10,7 @@ using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {
-    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset,
-#pragma warning disable 618
-                                            IHasCurve
-#pragma warning restore 618
+    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset
     {
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second.
diff --git a/osu.Game/Rulesets/Objects/Types/IHasCurve.cs b/osu.Game/Rulesets/Objects/Types/IHasCurve.cs
deleted file mode 100644
index 26f50ffa31..0000000000
--- a/osu.Game/Rulesets/Objects/Types/IHasCurve.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 osuTK;
-
-namespace osu.Game.Rulesets.Objects.Types
-{
-    [Obsolete("Use IHasPathWithRepeats instead.")] // can be removed 20201126
-    public interface IHasCurve : IHasDistance, IHasRepeats
-    {
-        /// <summary>
-        /// The curve.
-        /// </summary>
-        SliderPath Path { get; }
-    }
-
-#pragma warning disable 618
-    [Obsolete("Use IHasPathWithRepeats instead.")] // can be removed 20201126
-    public static class HasCurveExtensions
-    {
-        /// <summary>
-        /// Computes the position on the curve relative to how much of the <see cref="HitObject"/> has been completed.
-        /// </summary>
-        /// <param name="obj">The curve.</param>
-        /// <param name="progress">[0, 1] where 0 is the start time of the <see cref="HitObject"/> and 1 is the end time of the <see cref="HitObject"/>.</param>
-        /// <returns>The position on the curve.</returns>
-        public static Vector2 CurvePositionAt(this IHasCurve obj, double progress)
-            => obj.Path.PositionAt(obj.ProgressAt(progress));
-
-        /// <summary>
-        /// Computes the progress along the curve relative to how much of the <see cref="HitObject"/> has been completed.
-        /// </summary>
-        /// <param name="obj">The curve.</param>
-        /// <param name="progress">[0, 1] where 0 is the start time of the <see cref="HitObject"/> and 1 is the end time of the <see cref="HitObject"/>.</param>
-        /// <returns>[0, 1] where 0 is the beginning of the curve and 1 is the end of the curve.</returns>
-        public static double ProgressAt(this IHasCurve obj, double progress)
-        {
-            double p = progress * obj.SpanCount() % 1;
-            if (obj.SpanAt(progress) % 2 == 1)
-                p = 1 - p;
-            return p;
-        }
-
-        /// <summary>
-        /// Determines which span of the curve the progress point is on.
-        /// </summary>
-        /// <param name="obj">The curve.</param>
-        /// <param name="progress">[0, 1] where 0 is the beginning of the curve and 1 is the end of the curve.</param>
-        /// <returns>[0, SpanCount) where 0 is the first run.</returns>
-        public static int SpanAt(this IHasCurve obj, double progress)
-            => (int)(progress * obj.SpanCount());
-    }
-#pragma warning restore 618
-}

From 9cc63e8dce8e65feba008ffb02195928f8ea8a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 17:48:46 +0100
Subject: [PATCH 07439/10326] Remove obsoleted IHasEndTime

---
 .../Rulesets/Objects/Types/IHasDuration.cs    | 16 +++---------
 .../Rulesets/Objects/Types/IHasEndTime.cs     | 26 -------------------
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Objects/Types/IHasEndTime.cs

diff --git a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
index b558273650..ca734da5ad 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
@@ -6,26 +6,16 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that ends at a different time than its start time.
     /// </summary>
-#pragma warning disable 618
-    public interface IHasDuration : IHasEndTime
-#pragma warning restore 618
+    public interface IHasDuration
     {
-        double IHasEndTime.EndTime
-        {
-            get => EndTime;
-            set => Duration = (Duration - EndTime) + value;
-        }
-
-        double IHasEndTime.Duration => Duration;
-
         /// <summary>
         /// The time at which the HitObject ends.
         /// </summary>
-        new double EndTime { get; }
+        double EndTime { get; }
 
         /// <summary>
         /// The duration of the HitObject.
         /// </summary>
-        new double Duration { get; set; }
+        double Duration { get; set; }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
deleted file mode 100644
index c3769c5909..0000000000
--- a/osu.Game/Rulesets/Objects/Types/IHasEndTime.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;
-using Newtonsoft.Json;
-
-namespace osu.Game.Rulesets.Objects.Types
-{
-    /// <summary>
-    /// A HitObject that ends at a different time than its start time.
-    /// </summary>
-    [Obsolete("Use IHasDuration instead.")] // can be removed 20201126
-    public interface IHasEndTime
-    {
-        /// <summary>
-        /// The time at which the HitObject ends.
-        /// </summary>
-        [JsonIgnore]
-        double EndTime { get; set; }
-
-        /// <summary>
-        /// The duration of the HitObject.
-        /// </summary>
-        double Duration { get; }
-    }
-}

From 68352782db59f2db881ba5f443bf352cf8a9c03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 18:11:47 +0100
Subject: [PATCH 07440/10326] Change .StartsWith() to .Equals()

In line with planned-but-delayed breaking change.
---
 osu.Game/Rulesets/RulesetStore.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index d422bca087..deabea57ef 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -100,9 +100,7 @@ namespace osu.Game.Rulesets
 
                 foreach (var r in instances.Where(r => !(r is ILegacyRuleset)))
                 {
-                    // todo: StartsWith can be changed to Equals on 2020-11-08
-                    // This is to give users enough time to have their database use new abbreviated info).
-                    if (existingRulesets.FirstOrDefault(ri => ri.InstantiationInfo.StartsWith(r.RulesetInfo.InstantiationInfo, StringComparison.Ordinal)) == null)
+                    if (existingRulesets.FirstOrDefault(ri => ri.InstantiationInfo.Equals(r.RulesetInfo.InstantiationInfo, StringComparison.Ordinal)) == null)
                         context.RulesetInfo.Add(r.RulesetInfo);
                 }
 

From 4998aaaa987b75de4d017f09067f44dd05caeec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 18:13:30 +0100
Subject: [PATCH 07441/10326] Remove outdated warning disable

Does not trigger any more on Rider 2020.3.2.
---
 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 36f8fbedb3..7ba6e400bf 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -936,7 +936,6 @@ namespace osu.Game.Screens.Select
                 Masking = false;
             }
 
-            // ReSharper disable once OptionalParameterHierarchyMismatch 2020.3 EAP4 bug. (https://youtrack.jetbrains.com/issue/RSRP-481535?p=RIDER-51910)
             protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
             {
                 UserScrolling = true;

From 9984c80c87c428316d622523f805a4d7a4a4f196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 20:40:47 +0100
Subject: [PATCH 07442/10326] Make useless existing test actually fail

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 49c1fe8540..db8546c71b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -1,13 +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 System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 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.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
@@ -18,8 +22,23 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         public void TestNoAdjustment() => CreateModTest(new ModTestData
         {
             Mod = new OsuModDifficultyAdjust(),
+            Beatmap = new Beatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    BaseDifficulty = new BeatmapDifficulty
+                    {
+                        CircleSize = 8
+                    }
+                },
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle { StartTime = 1000 },
+                    new HitCircle { StartTime = 2000 }
+                }
+            },
             Autoplay = true,
-            PassCondition = checkSomeHit
+            PassCondition = () => checkSomeHit() && checkObjectsScale(0.29f)
         });
 
         [Test]

From 303cc62ee7c8eec32cb9cd4522202bb3cbdf512d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 21:57:54 +0100
Subject: [PATCH 07443/10326] Transfer flags indicating if settings were
 changed

---
 .../Mods/CatchModDifficultyAdjust.cs           |  4 ++--
 .../Mods/OsuModDifficultyAdjust.cs             |  4 ++--
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs  | 18 +++++++++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index acdd0a420c..438d17dbc5 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -59,8 +59,8 @@ namespace osu.Game.Rulesets.Catch.Mods
         {
             base.ApplySettings(difficulty);
 
-            difficulty.CircleSize = CircleSize.Value;
-            difficulty.ApproachRate = ApproachRate.Value;
+            ApplySetting(CircleSize, cs => difficulty.CircleSize = cs);
+            ApplySetting(ApproachRate, ar => difficulty.ApproachRate = ar);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index ff995e38ce..a638234dbd 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -59,8 +59,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             base.ApplySettings(difficulty);
 
-            difficulty.CircleSize = CircleSize.Value;
-            difficulty.ApproachRate = ApproachRate.Value;
+            ApplySetting(CircleSize, cs => difficulty.CircleSize = cs);
+            ApplySetting(ApproachRate, ar => difficulty.ApproachRate = ar);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 72a4bb297f..a531e885db 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -116,18 +116,30 @@ namespace osu.Game.Rulesets.Mods
 
         internal override void CopyAdjustedSetting(IBindable target, object source)
         {
-            userChangedSettings[target] = true;
+            // if the value is non-bindable, it's presumably coming from an external source (like the API) - therefore presume it is not default.
+            // if the value is bindable, defer to the source's IsDefault to be able to tell.
+            userChangedSettings[target] = !(source is IBindable bindableSource) || !bindableSource.IsDefault;
             base.CopyAdjustedSetting(target, source);
         }
 
+        /// <summary>
+        /// Applies a setting from a configuration bindable using <paramref name="applyFunc"/>, if it has been changed by the user.
+        /// </summary>
+        protected void ApplySetting<T>(BindableNumber<T> setting, Action<T> applyFunc)
+            where T : struct, IComparable<T>, IConvertible, IEquatable<T>
+        {
+            if (userChangedSettings.TryGetValue(setting, out bool userChangedSetting) && userChangedSetting)
+                applyFunc.Invoke(setting.Value);
+        }
+
         /// <summary>
         /// Apply all custom settings to the provided beatmap.
         /// </summary>
         /// <param name="difficulty">The beatmap to have settings applied.</param>
         protected virtual void ApplySettings(BeatmapDifficulty difficulty)
         {
-            difficulty.DrainRate = DrainRate.Value;
-            difficulty.OverallDifficulty = OverallDifficulty.Value;
+            ApplySetting(DrainRate, dr => difficulty.DrainRate = dr);
+            ApplySetting(OverallDifficulty, od => difficulty.OverallDifficulty = od);
         }
     }
 }

From 6620eadec3f1c7fe5fac7b98d52683d1a05aba4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 18:47:03 +0900
Subject: [PATCH 07444/10326] Reduce default hover sound debounce interval

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

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 40899e7e95..22d59e70f7 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface
         /// <summary>
         /// Length of debounce for hover sound playback, in milliseconds. Default is 50ms.
         /// </summary>
-        public double HoverDebounceTime { get; } = 50;
+        public double HoverDebounceTime { get; } = 20;
 
         protected readonly HoverSampleSet SampleSet;
 

From 8f52a83b297d277bf07bbda9e9e2efd2d0684092 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 18:47:20 +0900
Subject: [PATCH 07445/10326] Share hover sound debounce across all instances
 via SessionStatics

---
 osu.Game/Configuration/SessionStatics.cs      |  9 ++++++
 .../Graphics/UserInterface/HoverSounds.cs     | 29 +++++++++++--------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 03bc434aac..f28ee707b9 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
 
 namespace osu.Game.Configuration
 {
@@ -14,6 +16,7 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
+            Set(Static.LastHoverSoundPlaybackTime, 0.0);
             Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
     }
@@ -28,5 +31,11 @@ namespace osu.Game.Configuration
         /// Value under this lookup can be <c>null</c> if there are no backgrounds available (or API is not reachable).
         /// </summary>
         SeasonalBackgrounds,
+
+        /// <summary>
+        /// The last playback time in milliseconds of a hover sample (from <see cref="HoverSounds"/>).
+        /// Used to debounce hover sounds game-wide to avoid volume saturation, especially in scrolling views with many UI controls like <see cref="SettingsOverlay"/>.
+        /// </summary>
+        LastHoverSoundPlaybackTime
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 22d59e70f7..efd55c892c 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -5,11 +5,12 @@ using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
-using osu.Framework.Threading;
+using osu.Game.Configuration;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -28,31 +29,35 @@ namespace osu.Game.Graphics.UserInterface
 
         protected readonly HoverSampleSet SampleSet;
 
+        private Bindable<double> lastPlaybackTime;
+
         public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal)
         {
             SampleSet = sampleSet;
             RelativeSizeAxes = Axes.Both;
         }
 
-        private ScheduledDelegate playDelegate;
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, SessionStatics statics)
+        {
+            lastPlaybackTime = statics.GetBindable<double>(Static.LastHoverSoundPlaybackTime);
+
+            sampleHover = audio.Samples.Get($@"UI/generic-hover{SampleSet.GetDescription()}");
+        }
 
         protected override bool OnHover(HoverEvent e)
         {
-            playDelegate?.Cancel();
+            bool requiresDebounce = HoverDebounceTime <= 0;
+            bool enoughTimePassedSinceLastPlayback = lastPlaybackTime.Value == 0 || Time.Current - lastPlaybackTime.Value > HoverDebounceTime;
 
-            if (HoverDebounceTime <= 0)
+            if (!requiresDebounce || enoughTimePassedSinceLastPlayback)
+            {
                 sampleHover?.Play();
-            else
-                playDelegate = Scheduler.AddDelayed(() => sampleHover?.Play(), HoverDebounceTime);
+                lastPlaybackTime.Value = Time.Current;
+            }
 
             return base.OnHover(e);
         }
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            sampleHover = audio.Samples.Get($@"UI/generic-hover{SampleSet.GetDescription()}");
-        }
     }
 
     public enum HoverSampleSet

From 69ac22dd7fdd477943ce041cb42072de318c15e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 19:06:10 +0900
Subject: [PATCH 07446/10326] Fix incorrectly copy pasted xmldoc

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index 090675473d..e8dc623ddb 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -30,8 +30,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         public abstract bool IsRedundant(ControlPoint existing);
 
         /// <summary>
-        /// Create a copy of this room without online information.
-        /// Should be used to create a local copy of a room for submitting in the future.
+        /// Create an unbound copy of this control point.
         /// </summary>
         public ControlPoint CreateCopy()
         {

From 00dc98e3ab0fef1b568969a5086d9ede48ec8003 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 19:06:52 +0900
Subject: [PATCH 07447/10326] Make legacy control point's BpmMultiplier setter
 private again

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

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index a06ad35b89..069a25b83d 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -164,7 +164,7 @@ namespace osu.Game.Beatmaps.Formats
             /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
             /// DO NOT USE THIS UNLESS 100% SURE.
             /// </summary>
-            public float BpmMultiplier { get; set; }
+            public float BpmMultiplier { get; private set; }
 
             public LegacyDifficultyControlPoint(double beatLength)
                 : this()

From 42643fbaf69e321f8ae1d52e70ddbc17ac985a42 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 19:10:19 +0900
Subject: [PATCH 07448/10326] Use already resolved EditorBeatmap rather than
 resolving a second time locally

---
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index f180d7e63e..36fb0191b0 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -13,9 +13,6 @@ namespace osu.Game.Screens.Edit.Setup
 {
     internal class DifficultySection : SetupSection
     {
-        [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; }
-
         private LabelledSliderBar<float> circleSizeSlider;
         private LabelledSliderBar<float> healthDrainSlider;
         private LabelledSliderBar<float> approachRateSlider;
@@ -93,7 +90,7 @@ namespace osu.Game.Screens.Edit.Setup
             Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate = approachRateSlider.Current.Value;
             Beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
 
-            editorBeatmap.UpdateAllHitObjects();
+            Beatmap.UpdateAllHitObjects();
         }
     }
 }

From 77b55212a3c9870a0e42cd90e77e3ae4a552e273 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 19:11:51 +0900
Subject: [PATCH 07449/10326] Change access of beatmap to use working for
 consistency in file

---
 osu.Game/Screens/Edit/Setup/ResourcesSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index b3bceceea3..010d7c2797 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Edit.Setup
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",
-                    Current = { Value = Beatmap.Metadata.AudioFile ?? "Click to select a track" },
+                    Current = { Value = working.Value.Metadata.AudioFile ?? "Click to select a track" },
                     Target = audioTrackFileChooserContainer,
                     TabbableContentContainer = this
                 },

From 3c3e860dbc34d37855b79786a1abb754af1667e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 23:52:04 +0900
Subject: [PATCH 07450/10326] Move ControlPointInfo copying to base
 Beatmap.Clone method (and remove setter)

---
 osu.Game/Beatmaps/Beatmap.cs             | 10 +++++++++-
 osu.Game/Beatmaps/IBeatmap.cs            |  2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs      |  2 --
 osu.Game/Screens/Edit/EditorBeatmap.cs   |  6 +-----
 osu.Game/Screens/Play/GameplayBeatmap.cs |  6 +-----
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 5435e86dfd..be2006e67a 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -50,7 +50,15 @@ namespace osu.Game.Beatmaps
 
         IBeatmap IBeatmap.Clone() => Clone();
 
-        public Beatmap<T> Clone() => (Beatmap<T>)MemberwiseClone();
+        public Beatmap<T> Clone()
+        {
+            var clone = (Beatmap<T>)MemberwiseClone();
+
+            clone.ControlPointInfo = ControlPointInfo.CreateCopy();
+            // todo: deep clone other elements as required.
+
+            return clone;
+        }
     }
 
     public class Beatmap : Beatmap<HitObject>
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 7dd85e1232..8f27e0b0e9 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// The control points in this beatmap.
         /// </summary>
-        ControlPointInfo ControlPointInfo { get; set; }
+        ControlPointInfo ControlPointInfo { get; }
 
         /// <summary>
         /// The breaks in this beatmap.
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index d25adca92b..30382c444f 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -111,8 +111,6 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert(cancellationSource.Token);
 
-                converted.ControlPointInfo = converted.ControlPointInfo.CreateCopy();
-
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())
                 {
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index a54a95f59d..165d2ba278 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -74,11 +74,7 @@ namespace osu.Game.Screens.Edit
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo
-        {
-            get => PlayableBeatmap.ControlPointInfo;
-            set => PlayableBeatmap.ControlPointInfo = value;
-        }
+        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 565595656f..64894544f4 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -29,11 +29,7 @@ namespace osu.Game.Screens.Play
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo
-        {
-            get => PlayableBeatmap.ControlPointInfo;
-            set => PlayableBeatmap.ControlPointInfo = value;
-        }
+        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 

From 11801d61c1b3701356b253c9feb3a23eaa0d1dcf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 Jan 2021 14:05:22 +0900
Subject: [PATCH 07451/10326] Use nullable doubule to better represent initial
 playback case

---
 osu.Game/Configuration/SessionStatics.cs       | 2 +-
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index f28ee707b9..382eab751b 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
-            Set(Static.LastHoverSoundPlaybackTime, 0.0);
+            Set(Static.LastHoverSoundPlaybackTime, (double?)0.0);
             Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
     }
diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index efd55c892c..29b4bf5704 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Graphics.UserInterface
 
         protected readonly HoverSampleSet SampleSet;
 
-        private Bindable<double> lastPlaybackTime;
+        private Bindable<double?> lastPlaybackTime;
 
         public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal)
         {
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SessionStatics statics)
         {
-            lastPlaybackTime = statics.GetBindable<double>(Static.LastHoverSoundPlaybackTime);
+            lastPlaybackTime = statics.GetBindable<double?>(Static.LastHoverSoundPlaybackTime);
 
             sampleHover = audio.Samples.Get($@"UI/generic-hover{SampleSet.GetDescription()}");
         }
@@ -48,7 +48,7 @@ namespace osu.Game.Graphics.UserInterface
         protected override bool OnHover(HoverEvent e)
         {
             bool requiresDebounce = HoverDebounceTime <= 0;
-            bool enoughTimePassedSinceLastPlayback = lastPlaybackTime.Value == 0 || Time.Current - lastPlaybackTime.Value > HoverDebounceTime;
+            bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
 
             if (!requiresDebounce || enoughTimePassedSinceLastPlayback)
             {

From e156bcdcae175f46a5c78fb9eb7c4ed5d0dbf5d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 Jan 2021 14:05:34 +0900
Subject: [PATCH 07452/10326] Remove unnecessary (and broken) requiresDebounce
 check

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 29b4bf5704..4d30d61ff0 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -47,10 +47,9 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override bool OnHover(HoverEvent e)
         {
-            bool requiresDebounce = HoverDebounceTime <= 0;
             bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
 
-            if (!requiresDebounce || enoughTimePassedSinceLastPlayback)
+            if (enoughTimePassedSinceLastPlayback)
             {
                 sampleHover?.Play();
                 lastPlaybackTime.Value = Time.Current;

From c208800150494eceb06472e45310eecc8859b29b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 Jan 2021 14:17:14 +0900
Subject: [PATCH 07453/10326] Fix auto selection scenario regressing due to
 scheduling too much

---
 osu.Game/Overlays/Mods/ModButton.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 51c8bcf9a9..b58e70cae6 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -52,9 +52,10 @@ namespace osu.Game.Overlays.Mods
             if (newIndex == selectedIndex) return false;
 
             int direction = newIndex < selectedIndex ? -1 : 1;
+
             bool beforeSelected = Selected;
 
-            Mod modBefore = SelectedMod ?? Mods[0];
+            Mod previousSelection = SelectedMod ?? Mods[0];
 
             if (newIndex >= Mods.Length)
                 newIndex = -1;
@@ -64,25 +65,26 @@ namespace osu.Game.Overlays.Mods
             if (newIndex >= 0 && !Mods[newIndex].HasImplementation)
                 return false;
 
+            selectedIndex = newIndex;
+
+            Mod newSelection = SelectedMod ?? Mods[0];
+
             Schedule(() =>
             {
-                selectedIndex = newIndex;
-                Mod modAfter = SelectedMod ?? Mods[0];
-
                 if (beforeSelected != Selected)
                 {
                     iconsContainer.RotateTo(Selected ? 5f : 0f, 300, Easing.OutElastic);
                     iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, Easing.OutElastic);
                 }
 
-                if (modBefore != modAfter)
+                if (previousSelection != newSelection)
                 {
                     const float rotate_angle = 16;
 
                     foregroundIcon.RotateTo(rotate_angle * direction, mod_switch_duration, mod_switch_easing);
                     backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
 
-                    backgroundIcon.Mod = modAfter;
+                    backgroundIcon.Mod = newSelection;
 
                     using (BeginDelayedSequence(mod_switch_duration, true))
                     {
@@ -94,15 +96,15 @@ namespace osu.Game.Overlays.Mods
                             .RotateTo(rotate_angle * direction)
                             .RotateTo(0f, mod_switch_duration, mod_switch_easing);
 
-                        Schedule(() => displayMod(modAfter));
+                        Schedule(() => displayMod(newSelection));
                     }
                 }
 
                 foregroundIcon.Selected.Value = Selected;
-
-                SelectionChanged?.Invoke(SelectedMod);
             });
 
+            SelectionChanged?.Invoke(newSelection);
+
             return true;
         }
 

From a6766e64de95cdd23dfa17e029275be3e7ea3c15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 Jan 2021 17:08:01 +0900
Subject: [PATCH 07454/10326] Add custom handling of Point serialization to fix
 startup crashes of tournament client

SixLabors moved their data types around in a recent update (see
https://github.com/ppy/osu-framework/pull/4025) and it was deemed that
we should prefer `System.Drawing` primitives where possible.

This was applied to the tournament client via
https://github.com/ppy/osu/pull/11072 without correct consideration
given to the fact that we serialize these types.

`System.Drawing.Point` serializes into a comma separated string, which
seems to be less correct than what we had, so I've switched back to the
old format for the time being. We can reasses this in the future; the
main goal here is to restore usability to the tournament client.

Closes #11443.
---
 osu.Game.Tournament/JsonPointConverter.cs | 67 +++++++++++++++++++++++
 osu.Game.Tournament/TournamentGameBase.cs |  7 ++-
 2 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Tournament/JsonPointConverter.cs

diff --git a/osu.Game.Tournament/JsonPointConverter.cs b/osu.Game.Tournament/JsonPointConverter.cs
new file mode 100644
index 0000000000..57b91958d8
--- /dev/null
+++ b/osu.Game.Tournament/JsonPointConverter.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;
+using System.Diagnostics;
+using System.Drawing;
+using Newtonsoft.Json;
+
+namespace osu.Game.Tournament
+{
+    /// <summary>
+    /// We made a change from using SixLabors.ImageSharp.Point to System.Drawing.Point at some stage.
+    /// This handles converting to a standardised format on json serialize/deserialize operations.
+    /// </summary>
+    internal class JsonPointConverter : JsonConverter<Point>
+    {
+        public override void WriteJson(JsonWriter writer, Point value, JsonSerializer serializer)
+        {
+            // use the format of LaborSharp's Point since it is nicer.
+            serializer.Serialize(writer, new SixLabors.ImageSharp.Point(value.X, value.Y));
+        }
+
+        public override Point ReadJson(JsonReader reader, Type objectType, Point existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType != JsonToken.StartObject)
+            {
+                // if there's no object present then this is using string representation (System.Drawing.Point serializes to "x,y")
+                string str = (string)reader.Value;
+
+                Debug.Assert(str != null);
+
+                var split = str.Split(',');
+
+                return new Point(int.Parse(split[0]), int.Parse(split[1]));
+            }
+
+            var point = new Point();
+
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonToken.EndObject) break;
+
+                if (reader.TokenType == JsonToken.PropertyName)
+                {
+                    var name = reader.Value?.ToString();
+                    int? val = reader.ReadAsInt32();
+
+                    if (val == null)
+                        continue;
+
+                    switch (name)
+                    {
+                        case "X":
+                            point.X = val.Value;
+                            break;
+
+                        case "Y":
+                            point.Y = val.Value;
+                            break;
+                    }
+                }
+            }
+
+            return point;
+        }
+    }
+}
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index dbda6aa023..bc36f27e5b 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -8,12 +8,12 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
-using osu.Framework.Platform;
 using osu.Framework.IO.Stores;
+using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests;
-using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.IO;
+using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osu.Game.Users;
 using osuTK.Input;
@@ -60,7 +60,7 @@ namespace osu.Game.Tournament
             {
                 using (Stream stream = storage.GetStream(bracket_filename, FileAccess.Read, FileMode.Open))
                 using (var sr = new StreamReader(stream))
-                    ladder = JsonConvert.DeserializeObject<LadderInfo>(sr.ReadToEnd());
+                    ladder = JsonConvert.DeserializeObject<LadderInfo>(sr.ReadToEnd(), new JsonPointConverter());
             }
 
             ladder ??= new LadderInfo();
@@ -251,6 +251,7 @@ namespace osu.Game.Tournament
                         Formatting = Formatting.Indented,
                         NullValueHandling = NullValueHandling.Ignore,
                         DefaultValueHandling = DefaultValueHandling.Ignore,
+                        Converters = new JsonConverter[] { new JsonPointConverter() }
                     }));
             }
         }

From edd328c8fecdb2566c8f68f087f2c8089219bb77 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 Jan 2021 17:24:55 +0900
Subject: [PATCH 07455/10326] Move bindable closer to source class

---
 .../OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index c6018a79e9..04030cdbfd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -37,12 +37,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
+        private IBindable<bool> operationInProgress;
+
         private SampleChannel sampleReadyCount;
 
         private readonly ButtonWithTrianglesExposed button;
 
         private int countReady;
-        private IBindable<bool> operationInProgress;
 
         public MultiplayerReadyButton()
         {

From 924f91ed9b91445d4cba0bd819441a0959021faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 15:56:35 +0100
Subject: [PATCH 07456/10326] Fix song select test doing the completely wrong
 thing

---
 .../Visual/SongSelect/TestSceneAdvancedStats.cs   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
index 3d3517ada4..40b2f66d74 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
@@ -11,6 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Select.Details;
 using osuTK.Graphics;
 
@@ -141,16 +142,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("select changed Difficulty Adjust mod", () =>
             {
                 var ruleset = advancedStats.Beatmap.Ruleset.CreateInstance();
-                var difficultyAdjustMod = ruleset.GetAllMods().OfType<ModDifficultyAdjust>().Single();
+                var difficultyAdjustMod = ruleset.GetAllMods().OfType<OsuModDifficultyAdjust>().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);
+
+                difficultyAdjustMod.ReadFromDifficulty(originalDifficulty);
+                difficultyAdjustMod.DrainRate.Value = originalDifficulty.DrainRate - 0.5f;
+                difficultyAdjustMod.ApproachRate.Value = originalDifficulty.ApproachRate + 2.2f;
                 SelectedMods.Value = new[] { difficultyAdjustMod };
             });
 

From 9182f5dafb224baf6e6534edc7c727026231a1b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 9 Jan 2021 00:38:38 +0900
Subject: [PATCH 07457/10326] Switch to using an anonymous type for
 serialisation
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/JsonPointConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/JsonPointConverter.cs b/osu.Game.Tournament/JsonPointConverter.cs
index 57b91958d8..7ad972f3e7 100644
--- a/osu.Game.Tournament/JsonPointConverter.cs
+++ b/osu.Game.Tournament/JsonPointConverter.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tournament
         public override void WriteJson(JsonWriter writer, Point value, JsonSerializer serializer)
         {
             // use the format of LaborSharp's Point since it is nicer.
-            serializer.Serialize(writer, new SixLabors.ImageSharp.Point(value.X, value.Y));
+            serializer.Serialize(writer, new { value.X, value.Y });
         }
 
         public override Point ReadJson(JsonReader reader, Type objectType, Point existingValue, bool hasExistingValue, JsonSerializer serializer)

From 82725b59c030d27abd3159ee3397a4b77e834b1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 9 Jan 2021 00:56:54 +0900
Subject: [PATCH 07458/10326] Use PointConverter

---
 osu.Game.Tournament/JsonPointConverter.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/JsonPointConverter.cs b/osu.Game.Tournament/JsonPointConverter.cs
index 7ad972f3e7..9c82f8ac06 100644
--- a/osu.Game.Tournament/JsonPointConverter.cs
+++ b/osu.Game.Tournament/JsonPointConverter.cs
@@ -29,9 +29,7 @@ namespace osu.Game.Tournament
 
                 Debug.Assert(str != null);
 
-                var split = str.Split(',');
-
-                return new Point(int.Parse(split[0]), int.Parse(split[1]));
+                return new PointConverter().ConvertFromString(str) as Point? ?? new Point();
             }
 
             var point = new Point();

From 0cf5be3ef432a718d23bab4fc951f04182375ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 17:02:57 +0100
Subject: [PATCH 07459/10326] Fix selection change event being invoked with
 wrong mod

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

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index b58e70cae6..ab8efdabcc 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.Mods
                 foregroundIcon.Selected.Value = Selected;
             });
 
-            SelectionChanged?.Invoke(newSelection);
+            SelectionChanged?.Invoke(SelectedMod);
 
             return true;
         }

From 8feaf3fb6ad084885f8b69b997caea7faf92bb50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 9 Jan 2021 01:24:18 +0900
Subject: [PATCH 07460/10326] 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 611f0d05f4..492c88c7e4 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1229.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.106.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6c220a5c21..f28a55e016 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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.1229.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.106.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 5445adb3fb..93be3645ee 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.Framework.iOS" Version="2020.1229.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.106.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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.1229.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.106.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From d507a08951b33618a00fcce8e3c61ab289ee9172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 18:16:03 +0100
Subject: [PATCH 07461/10326] Start with null last hover playback time

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

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 382eab751b..fd401119ff 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
-            Set(Static.LastHoverSoundPlaybackTime, (double?)0.0);
+            Set(Static.LastHoverSoundPlaybackTime, (double?)null);
             Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
     }

From 49c6abcb5c1a8eaa3baa8d0c3b94b2799b3e82cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 18:25:51 +0100
Subject: [PATCH 07462/10326] Remove mention of default value in xmldoc

Just bound to get outdated with every change anyway. Look at the actual
default value declaration to see what the default is.
---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 4d30d61ff0..a1d06711db 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Graphics.UserInterface
         private SampleChannel sampleHover;
 
         /// <summary>
-        /// Length of debounce for hover sound playback, in milliseconds. Default is 50ms.
+        /// Length of debounce for hover sound playback, in milliseconds.
         /// </summary>
         public double HoverDebounceTime { get; } = 20;
 

From 52789118a363bf0f648936d9d629d2afa554c76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 19:59:13 +0100
Subject: [PATCH 07463/10326] Schedule play button state update

Revealed by the framework-side transform thread safety checks. `Stopped`
is even annotated as not being thread-safe (but was annotated as such
long after the class's nascence).
---
 osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
index e95fdeecf4..04df27ce52 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
@@ -142,7 +142,9 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 
                     AddInternal(preview);
                     loading = false;
-                    preview.Stopped += () => Playing.Value = false;
+                    // make sure that the update of value of Playing (and the ensuing value change callbacks)
+                    // are marshaled back to the update thread.
+                    preview.Stopped += () => Schedule(() => Playing.Value = false);
 
                     // user may have changed their mind.
                     if (Playing.Value)

From 274a045d8dbd03640280b422674bd5c7b0eebf44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 20:01:47 +0100
Subject: [PATCH 07464/10326] Remove Dispose() override

Culls another non-thread-safe mutation of the `Playing` bindable.
It seems to be a weird vestige from an earlier revision of the old
"direct" panel, which relied on `DisposeOnDeathRemoval` to finish track
playback (and then was removed in
6c150c9ed793799fd6672cc2107c97c2e3844a09). The play button is no longer
responsible for managing preview track lifetime anyway;
`PreviewTrackManager`'s method are intended for that.
---
 osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
index 04df27ce52..eb409785e0 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
@@ -163,11 +163,5 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
             if (Preview?.Start() != true)
                 Playing.Value = false;
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            Playing.Value = false;
-        }
     }
 }

From 284d30d336d0d7b851481a084c3067c45ff3cfdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 21:13:36 +0100
Subject: [PATCH 07465/10326] Move screen activity update to LoadComplete()

Fixes a potential crash when moving from main menu to editor after
having previously opened the login settings overlay. Setting the
activity in BDL as done before is unsafe, as that set can trigger value
change callbacks, which in turn can trigger adding transforms, which
should always be done on the update thread.

Semantically it also makes sense, as the user activity should change
once the screen they're moving to has actually loaded and displayed to
the user.
---
 osu.Game/Screens/OsuScreen.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index e1a29946f4..9b716b323d 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -143,7 +143,11 @@ namespace osu.Game.Screens
         private void load(OsuGame osu, AudioManager audio)
         {
             sampleExit = audio.Samples.Get(@"UI/screen-back");
+        }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
             Activity.Value ??= InitialActivity;
         }
 

From dad5dd36676de0c965c645b2564e496adb334908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 22:17:37 +0100
Subject: [PATCH 07466/10326] Remove unnecessary permissiveness wrt null

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs  | 3 ++-
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs   | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 39323d9db9..e539b315e4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -241,7 +241,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             void endOperation()
             {
-                readyClickOperation?.Dispose();
+                Debug.Assert(readyClickOperation != null);
+                readyClickOperation.Dispose();
                 readyClickOperation = null;
             }
         }
diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index 6a340d7954..c34d39136e 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -40,13 +40,12 @@ namespace osu.Game.Screens.OnlinePlay
             return new InvokeOnDisposal(endOperation);
         }
 
-        /// <summary>
-        /// Ends tracking an online operation.
-        /// Does nothing if an operation has not been begun yet.
-        /// </summary>
         private void endOperation()
         {
-            leasedInProgress?.Return();
+            if (leasedInProgress == null)
+                throw new InvalidOperationException("Cannot end operation multiple times.");
+
+            leasedInProgress.Return();
             leasedInProgress = null;
         }
     }

From c2eeb822b84d007beec6190cda094ca3ea1ba062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 22:23:38 +0100
Subject: [PATCH 07467/10326] Rename {joiningRoom -> operationInProgress}

---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 2a16a62714..9b4e78543c 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         protected override UserActivity InitialActivity => new UserActivity.SearchingForLobby();
 
         private readonly IBindable<bool> initialRoomsReceived = new Bindable<bool>();
-        private readonly IBindable<bool> joiningRoom = new Bindable<bool>();
+        private readonly IBindable<bool> operationInProgress = new Bindable<bool>();
 
         private FilterControl filter;
         private Container content;
@@ -110,8 +110,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             if (ongoingOperationTracker != null)
             {
-                joiningRoom.BindTo(ongoingOperationTracker.InProgress);
-                joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
+                operationInProgress.BindTo(ongoingOperationTracker.InProgress);
+                operationInProgress.BindValueChanged(_ => updateLoadingLayer(), true);
             }
         }
 
@@ -187,7 +187,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
         private void updateLoadingLayer()
         {
-            if (joiningRoom.Value || !initialRoomsReceived.Value)
+            if (operationInProgress.Value || !initialRoomsReceived.Value)
                 loadingLayer.Show();
             else
                 loadingLayer.Hide();

From ff60d652ed6094054125990375dc9edc8ea05313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 22:28:21 +0100
Subject: [PATCH 07468/10326] Move out test ongoing operation tracker to higher
 level

---
 .../Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs   | 6 +-----
 osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs   | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index a6037dcbf2..8b9bffcee1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -15,7 +15,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
@@ -31,9 +30,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapManager beatmaps;
         private RulesetStore rulesets;
 
-        [Cached]
-        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
-
         private IDisposable readyClickOperation;
 
         [BackgroundDependencyLoader]
@@ -66,7 +62,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 },
                 OnReadyClick = async () =>
                 {
-                    readyClickOperation = ongoingOperationTracker.BeginOperation();
+                    readyClickOperation = OngoingOperationTracker.BeginOperation();
 
                     if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
                     {
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index da0e39d965..75ddb34685 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached]
         public Bindable<FilterCriteria> Filter { get; }
 
+        [Cached]
+        public OngoingOperationTracker OngoingOperationTracker { get; } = new OngoingOperationTracker();
+
         protected override Container<Drawable> Content => content;
         private readonly TestMultiplayerRoomContainer content;
 

From 0aad0c7c6c5dd363bd5bb75d2eb4cc5c35a3804f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 9 Jan 2021 00:30:12 +0300
Subject: [PATCH 07469/10326] Target logic at `this` and adjust variables

---
 osu.Game/Rulesets/Mods/Mod.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 7fe9a06597..e72e9a004f 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -144,12 +144,12 @@ namespace osu.Game.Rulesets.Mods
 
             foreach (var (_, prop) in this.GetSettingsSourceProperties())
             {
-                var origBindable = (IBindable)prop.GetValue(this);
-                var copyBindable = (IBindable)prop.GetValue(copy);
+                var targetBindable = (IBindable)prop.GetValue(this);
+                var sourceBindable = (IBindable)prop.GetValue(them);
 
                 // we only care about changes that have been made away from defaults.
-                if (!origBindable.IsDefault)
-                    copy.CopyAdjustedSetting(copyBindable, origBindable);
+                if (!sourceBindable.IsDefault)
+                    CopyAdjustedSetting(targetBindable, sourceBindable);
             }
         }
 

From 8c3955d34136026b2387864223b065c7f57b185e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 9 Jan 2021 21:38:20 +0100
Subject: [PATCH 07470/10326] Improve safety of ongoing operation tracker

Finishing an operation started via
`OngoingOperationTracker.BeginOperation()` was risky in cases where the
operation ended at a callback on another thread (which, in the case of
multiplayer, is *most* cases). In particular, if any consumer registered
a callback that mutates transforms when the operation ends, it would
result in crashes after the framework-side safety checks.

Rework `OngoingOperationTracker` into an always-present component
residing in the drawable hierarchy, and ensure that the
`operationInProgress` bindable is always updated on the update thread.
This way consumers don't have to add local schedules in multiple places.
---
 .../TestSceneCreateMultiplayerMatchButton.cs          |  7 +------
 .../Screens/OnlinePlay/OngoingOperationTracker.cs     | 11 +++++++++--
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs       |  5 +++--
 .../Tests/Visual/Multiplayer/MultiplayerTestScene.cs  |  3 ++-
 .../Multiplayer/TestMultiplayerRoomContainer.cs       |  4 ++++
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
index 381270c5aa..2f0398c6ef 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
@@ -3,18 +3,13 @@
 
 using System;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneCreateMultiplayerMatchButton : MultiplayerTestScene
     {
-        [Cached]
-        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
-
         private CreateMultiplayerMatchButton button;
 
         public override void SetUpSteps()
@@ -36,7 +31,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             assertButtonEnableState(true);
 
-            AddStep("begin joining room", () => joiningRoomOperation = ongoingOperationTracker.BeginOperation());
+            AddStep("begin joining room", () => joiningRoomOperation = OngoingOperationTracker.BeginOperation());
             assertButtonEnableState(false);
 
             AddStep("end joining room", () => joiningRoomOperation.Dispose());
diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index c34d39136e..5c9e9ce90b 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay
 {
@@ -11,7 +12,7 @@ namespace osu.Game.Screens.OnlinePlay
     /// Utility class to track ongoing online operations' progress.
     /// Can be used to disable interactivity while waiting for a response from online sources.
     /// </summary>
-    public class OngoingOperationTracker
+    public class OngoingOperationTracker : Component
     {
         /// <summary>
         /// Whether there is an online operation in progress.
@@ -22,6 +23,11 @@ namespace osu.Game.Screens.OnlinePlay
 
         private LeasedBindable<bool> leasedInProgress;
 
+        public OngoingOperationTracker()
+        {
+            AlwaysPresent = true;
+        }
+
         /// <summary>
         /// Begins tracking a new online operation.
         /// </summary>
@@ -37,7 +43,8 @@ namespace osu.Game.Screens.OnlinePlay
             leasedInProgress = inProgress.BeginLease(true);
             leasedInProgress.Value = true;
 
-            return new InvokeOnDisposal(endOperation);
+            // for extra safety, marshal the end of operation back to the update thread if necessary.
+            return new InvokeOnDisposal(() => Scheduler.Add(endOperation, false));
         }
 
         private void endOperation()
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index b73e0a7c52..71fd0d5c76 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.OnlinePlay
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
         [Cached]
-        private readonly OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
         [Resolved(CanBeNull = true)]
         private MusicController music { get; set; }
@@ -144,7 +144,8 @@ namespace osu.Game.Screens.OnlinePlay
                         };
                         button.Action = () => OpenNewRoom();
                     }),
-                    RoomManager = CreateRoomManager()
+                    RoomManager = CreateRoomManager(),
+                    ongoingOperationTracker = new OngoingOperationTracker()
                 }
             };
 
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 75ddb34685..a87b22affe 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public Bindable<FilterCriteria> Filter { get; }
 
         [Cached]
-        public OngoingOperationTracker OngoingOperationTracker { get; } = new OngoingOperationTracker();
+        public OngoingOperationTracker OngoingOperationTracker { get; }
 
         protected override Container<Drawable> Content => content;
         private readonly TestMultiplayerRoomContainer content;
@@ -39,6 +39,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Client = content.Client;
             RoomManager = content.RoomManager;
             Filter = content.Filter;
+            OngoingOperationTracker = content.OngoingOperationTracker;
         }
 
         [SetUp]
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
index ad3e2f7105..860caef071 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached]
         public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
 
+        [Cached]
+        public readonly OngoingOperationTracker OngoingOperationTracker;
+
         public TestMultiplayerRoomContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -33,6 +36,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 Client = new TestMultiplayerClient(),
                 RoomManager = new TestMultiplayerRoomManager(),
+                OngoingOperationTracker = new OngoingOperationTracker(),
                 content = new Container { RelativeSizeAxes = Axes.Both }
             });
         }

From 4b4adc927cb49a166f9f13c093c318afbbe18f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 10 Jan 2021 15:35:53 +0100
Subject: [PATCH 07471/10326] Rename param to match method body

---
 osu.Game/Rulesets/Mods/Mod.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index e72e9a004f..3a8717e678 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -134,18 +134,18 @@ namespace osu.Game.Rulesets.Mods
         }
 
         /// <summary>
-        /// Copies mod setting values from <paramref name="them"/> into this instance.
+        /// Copies mod setting values from <paramref name="source"/> into this instance.
         /// </summary>
-        /// <param name="them">The mod to copy properties from.</param>
-        public void CopyFrom(Mod them)
+        /// <param name="source">The mod to copy properties from.</param>
+        public void CopyFrom(Mod source)
         {
-            if (them.GetType() != GetType())
-                throw new ArgumentException($"Expected mod of type {GetType()}, got {them.GetType()}.", nameof(them));
+            if (source.GetType() != GetType())
+                throw new ArgumentException($"Expected mod of type {GetType()}, got {source.GetType()}.", nameof(source));
 
             foreach (var (_, prop) in this.GetSettingsSourceProperties())
             {
                 var targetBindable = (IBindable)prop.GetValue(this);
-                var sourceBindable = (IBindable)prop.GetValue(them);
+                var sourceBindable = (IBindable)prop.GetValue(source);
 
                 // we only care about changes that have been made away from defaults.
                 if (!sourceBindable.IsDefault)

From f466791b69d3341b05625157ae52301a4a035be6 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 10 Jan 2021 17:34:20 +0100
Subject: [PATCH 07472/10326] Move assignments to the TournamentSwitcher
 component

This also adds conditional checks for displaying the "Close osu!" button
---
 osu.Game.Tournament/Screens/SetupScreen.cs | 41 ++++++++++++++++------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index de3321397e..7ae0375b9a 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -42,17 +42,13 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        [Resolved]
-        private TournamentGameBase game { get; set; }
-
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
         private Bindable<Size> windowSize;
-        private TournamentStorage storage;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig, Storage storage)
+        private void load(FrameworkConfigManager frameworkConfig)
         {
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
 
@@ -67,7 +63,6 @@ namespace osu.Game.Tournament.Screens
 
             api.LocalUser.BindValueChanged(_ => Schedule(reload));
             stableInfo.OnStableInfoSaved += () => Schedule(reload);
-            this.storage = (TournamentStorage)storage;
             reload();
         }
 
@@ -119,10 +114,6 @@ namespace osu.Game.Tournament.Screens
                 {
                     Label = "Current tournament",
                     Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart to apply changes.",
-                    Items = storage.ListTournaments(),
-                    Current = storage.CurrentTournament,
-                    ButtonText = "Close osu!",
-                    Action = () => game.GracefullyExit()
                 },
                 resolution = new ResolutionSelector
                 {
@@ -240,14 +231,44 @@ namespace osu.Game.Tournament.Screens
                 set => dropdown.Current = value;
             }
 
+            private string originalTournament;
+
+            private TournamentStorage storage;
+
+            [Resolved]
+            private TournamentGameBase game { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load(Storage storage)
+            {
+                this.storage = (TournamentStorage)storage;
+                Current = this.storage.CurrentTournament;
+                originalTournament = this.storage.CurrentTournament.Value;
+                Items = this.storage.ListTournaments();
+                Action = () => game.GracefullyExit();
+                ButtonText = "Close osu!";
+            }
+
             protected override Drawable CreateComponent()
             {
                 var drawable = base.CreateComponent();
+
                 FlowContainer.Insert(-1, dropdown = new OsuDropdown<string>
                 {
                     Width = 510
                 });
 
+                Current.BindValueChanged(v =>
+                {
+                    if (v.NewValue == originalTournament)
+                    {
+                        Button.Hide();
+                        return;
+                    }
+
+                    Button.Show();
+                });
+
                 return drawable;
             }
         }

From bd377237884c071617df95c797650fd1af2774bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 01:47:04 +0900
Subject: [PATCH 07473/10326] Expose as IBindable for added safety

---
 .../BeatmapListing/Panels/BeatmapPanel.cs     |  2 +-
 .../BeatmapListing/Panels/PlayButton.cs       | 21 +++++++++++--------
 .../BeatmapSet/Buttons/PreviewButton.cs       |  3 ++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
index 1567e18caa..afb5eeda36 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         private Container content;
 
         public PreviewTrack Preview => PlayButton.Preview;
-        public Bindable<bool> PreviewPlaying => PlayButton?.Playing;
+        public IBindable<bool> PreviewPlaying => PlayButton?.Playing;
 
         protected abstract PlayButton PlayButton { get; }
         protected abstract Box PreviewBar { get; }
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
index eb409785e0..4bbc3569fe 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
@@ -18,7 +18,10 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 {
     public class PlayButton : Container
     {
-        public readonly BindableBool Playing = new BindableBool();
+        public IBindable<bool> Playing => playing;
+
+        private readonly BindableBool playing = new BindableBool();
+
         public PreviewTrack Preview { get; private set; }
 
         private BeatmapSetInfo beatmapSet;
@@ -36,7 +39,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 Preview?.Expire();
                 Preview = null;
 
-                Playing.Value = false;
+                playing.Value = false;
             }
         }
 
@@ -82,7 +85,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 },
             });
 
-            Playing.ValueChanged += playingStateChanged;
+            playing.ValueChanged += playingStateChanged;
         }
 
         [Resolved]
@@ -96,7 +99,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 
         protected override bool OnClick(ClickEvent e)
         {
-            Playing.Toggle();
+            playing.Toggle();
             return true;
         }
 
@@ -108,7 +111,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            if (!Playing.Value)
+            if (!playing.Value)
                 icon.FadeColour(Color4.White, 120, Easing.InOutQuint);
             base.OnHoverLost(e);
         }
@@ -122,7 +125,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
             {
                 if (BeatmapSet == null)
                 {
-                    Playing.Value = false;
+                    playing.Value = false;
                     return;
                 }
 
@@ -144,10 +147,10 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                     loading = false;
                     // make sure that the update of value of Playing (and the ensuing value change callbacks)
                     // are marshaled back to the update thread.
-                    preview.Stopped += () => Schedule(() => Playing.Value = false);
+                    preview.Stopped += () => Schedule(() => playing.Value = false);
 
                     // user may have changed their mind.
-                    if (Playing.Value)
+                    if (playing.Value)
                         attemptStart();
                 });
             }
@@ -161,7 +164,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         private void attemptStart()
         {
             if (Preview?.Start() != true)
-                Playing.Value = false;
+                playing.Value = false;
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
index 6accce7d77..56d60a97b2 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
         private readonly PlayButton playButton;
 
         private PreviewTrack preview => playButton.Preview;
-        public Bindable<bool> Playing => playButton.Playing;
+
+        public IBindable<bool> Playing => playButton.Playing;
 
         public BeatmapSetInfo BeatmapSet
         {

From d2ca6da0fdae2f14b7430aa0d183e31087f5c3f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 01:56:09 +0900
Subject: [PATCH 07474/10326] Remove unused constant

---
 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 56d60a97b2..a5e5f664c9 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -18,8 +18,6 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
 {
     public class PreviewButton : OsuClickableContainer
     {
-        private const float transition_duration = 500;
-
         private readonly Box background, progress;
         private readonly PlayButton playButton;
 

From e99310b59cfddbad40882e187a79668cdd865bb4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 11 Jan 2021 08:02:57 +0300
Subject: [PATCH 07475/10326] Add JsonConstructor attribute

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 1fd099fcc7..4796e26d14 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
 
 namespace osu.Game.Online.Rooms
 {
@@ -20,6 +21,7 @@ namespace osu.Game.Online.Rooms
         /// </summary>
         public readonly double? DownloadProgress;
 
+        [JsonConstructor]
         private BeatmapAvailability(DownloadState state, double? downloadProgress = null)
         {
             State = state;

From a8dfa5e2a9b09e07893c83fb410b0c669e6868a5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 11 Jan 2021 08:04:00 +0300
Subject: [PATCH 07476/10326] Rename typo'd method

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

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 4796e26d14..794e79ce55 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Online.Rooms
             DownloadProgress = downloadProgress;
         }
 
-        public static BeatmapAvailability NotDownload() => new BeatmapAvailability(DownloadState.NotDownloaded);
+        public static BeatmapAvailability NotDownloaded() => new BeatmapAvailability(DownloadState.NotDownloaded);
         public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
         public static BeatmapAvailability Downloaded() => new BeatmapAvailability(DownloadState.Downloaded);
         public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);

From 2286e3679f75adb10b9ba7f32316db4e116cea71 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 11 Jan 2021 08:21:07 +0300
Subject: [PATCH 07477/10326] Downloaded -> Importing

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

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 794e79ce55..b6b9c632fe 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Online.Rooms
 
         public static BeatmapAvailability NotDownloaded() => new BeatmapAvailability(DownloadState.NotDownloaded);
         public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
-        public static BeatmapAvailability Downloaded() => new BeatmapAvailability(DownloadState.Downloaded);
+        public static BeatmapAvailability Importing() => new BeatmapAvailability(DownloadState.Downloaded);
         public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);
 
         public bool Equals(BeatmapAvailability other) => other != null && State == other.State && DownloadProgress == other.DownloadProgress;

From 49057e8cbcca3921affcefca625365c5d9ccf23c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 14:35:42 +0900
Subject: [PATCH 07478/10326] Cache TournamentStorage explicitly for better
 safety

---
 osu.Game.Tournament/TournamentGameBase.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index bc36f27e5b..97c950261b 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Tournament
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
             dependencies.CacheAs<Storage>(storage = new TournamentStorage(baseStorage));
+            dependencies.CacheAs(storage);
+
             dependencies.Cache(new TournamentVideoResourceStore(storage));
 
             Textures.AddStore(new TextureLoaderStore(new StorageBackedResourceStore(storage)));

From ba3a7a0501aad64940217bd104d4d74f96ed5e1d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 14:35:47 +0900
Subject: [PATCH 07479/10326] Clean up code

---
 osu.Game.Tournament/Screens/SetupScreen.cs | 40 +++++-----------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 7ae0375b9a..cefad148a0 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -219,33 +219,22 @@ namespace osu.Game.Tournament.Screens
         {
             private OsuDropdown<string> dropdown;
 
-            public IEnumerable<string> Items
-            {
-                get => dropdown.Items;
-                set => dropdown.Items = value;
-            }
-
-            public Bindable<string> Current
-            {
-                get => dropdown.Current;
-                set => dropdown.Current = value;
-            }
-
-            private string originalTournament;
-
-            private TournamentStorage storage;
+            private string startupTournament;
 
             [Resolved]
             private TournamentGameBase game { get; set; }
 
             [BackgroundDependencyLoader]
-            private void load(Storage storage)
+            private void load(TournamentStorage storage)
             {
-                this.storage = (TournamentStorage)storage;
-                Current = this.storage.CurrentTournament;
-                originalTournament = this.storage.CurrentTournament.Value;
-                Items = this.storage.ListTournaments();
+                dropdown.Current = storage.CurrentTournament;
+                dropdown.Items = storage.ListTournaments();
+                dropdown.Current.BindValueChanged(v => Button.FadeTo(v.NewValue == startupTournament ? 0 : 1));
+
+                startupTournament = storage.CurrentTournament.Value;
+
                 Action = () => game.GracefullyExit();
+
                 ButtonText = "Close osu!";
             }
 
@@ -258,17 +247,6 @@ namespace osu.Game.Tournament.Screens
                     Width = 510
                 });
 
-                Current.BindValueChanged(v =>
-                {
-                    if (v.NewValue == originalTournament)
-                    {
-                        Button.Hide();
-                        return;
-                    }
-
-                    Button.Show();
-                });
-
                 return drawable;
             }
         }

From bd627534b76edaf9bb71329eb50597ac3b17f9cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 14:38:51 +0900
Subject: [PATCH 07480/10326] Use disabled state instead of hiding button

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

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index cefad148a0..c7b299e07f 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -227,11 +227,11 @@ namespace osu.Game.Tournament.Screens
             [BackgroundDependencyLoader]
             private void load(TournamentStorage storage)
             {
+                startupTournament = storage.CurrentTournament.Value;
+
                 dropdown.Current = storage.CurrentTournament;
                 dropdown.Items = storage.ListTournaments();
-                dropdown.Current.BindValueChanged(v => Button.FadeTo(v.NewValue == startupTournament ? 0 : 1));
-
-                startupTournament = storage.CurrentTournament.Value;
+                dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
 
                 Action = () => game.GracefullyExit();
 

From 7a7c583ded7de7e6a354f49d83f131b7471c89f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 14:44:07 +0900
Subject: [PATCH 07481/10326] Move setup screen classes out of single file and
 into their own namespace

---
 .../Screens/TestSceneSetupScreen.cs           |   2 +-
 .../TestSceneStablePathSelectScreen.cs        |   2 +-
 .../Screens/Setup/ActionableInfo.cs           |  69 +++++++++
 .../Screens/Setup/ResolutionSelector.cs       |  50 ++++++
 .../Screens/{ => Setup}/SetupScreen.cs        | 145 +-----------------
 .../{ => Setup}/StablePathSelectScreen.cs     |   4 +-
 .../Screens/Setup/TournamentSwitcher.cs       |  43 ++++++
 osu.Game.Tournament/TournamentSceneManager.cs |   1 +
 8 files changed, 168 insertions(+), 148 deletions(-)
 create mode 100644 osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
 create mode 100644 osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
 rename osu.Game.Tournament/Screens/{ => Setup}/SetupScreen.cs (54%)
 rename osu.Game.Tournament/Screens/{ => Setup}/StablePathSelectScreen.cs (99%)
 create mode 100644 osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
index 650b4c5412..70b260c84c 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Tournament.Screens;
+using osu.Game.Tournament.Screens.Setup;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
index 6e63b2d799..b422227788 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.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.Tournament.Screens;
+using osu.Game.Tournament.Screens.Setup;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
diff --git a/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs b/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
new file mode 100644
index 0000000000..f7d52a294e
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
@@ -0,0 +1,69 @@
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tournament.Screens.Setup
+{
+    internal class ActionableInfo : LabelledDrawable<Drawable>
+    {
+        protected OsuButton Button;
+
+        public ActionableInfo()
+            : base(true)
+        {
+        }
+
+        public string ButtonText
+        {
+            set => Button.Text = value;
+        }
+
+        public string Value
+        {
+            set => valueText.Text = value;
+        }
+
+        public bool Failing
+        {
+            set => valueText.Colour = value ? Color4.Red : Color4.White;
+        }
+
+        public Action Action;
+
+        private TournamentSpriteText valueText;
+        protected FillFlowContainer FlowContainer;
+
+        protected override Drawable CreateComponent() => new Container
+        {
+            AutoSizeAxes = Axes.Y,
+            RelativeSizeAxes = Axes.X,
+            Children = new Drawable[]
+            {
+                valueText = new TournamentSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
+                FlowContainer = new FillFlowContainer
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    AutoSizeAxes = Axes.Both,
+                    Spacing = new Vector2(10, 0),
+                    Children = new Drawable[]
+                    {
+                        Button = new TriangleButton
+                        {
+                            Size = new Vector2(100, 40),
+                            Action = () => Action?.Invoke()
+                        }
+                    }
+                }
+            }
+        };
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
new file mode 100644
index 0000000000..47472c386c
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
@@ -0,0 +1,50 @@
+using System;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Tournament.Screens.Setup
+{
+    internal class ResolutionSelector : ActionableInfo
+    {
+        private const int minimum_window_height = 480;
+        private const int maximum_window_height = 2160;
+
+        public new Action<int> Action;
+
+        private OsuNumberBox numberBox;
+
+        protected override Drawable CreateComponent()
+        {
+            var drawable = base.CreateComponent();
+            FlowContainer.Insert(-1, numberBox = new OsuNumberBox
+            {
+                Text = "1080",
+                Width = 100
+            });
+
+            base.Action = () =>
+            {
+                if (string.IsNullOrEmpty(numberBox.Text))
+                    return;
+
+                // box contains text
+                if (!int.TryParse(numberBox.Text, out var number))
+                {
+                    // at this point, the only reason we can arrive here is if the input number was too big to parse into an int
+                    // so clamp to max allowed value
+                    number = maximum_window_height;
+                }
+                else
+                {
+                    number = Math.Clamp(number, minimum_window_height, maximum_window_height);
+                }
+
+                // in case number got clamped, reset number in numberBox
+                numberBox.Text = number.ToString();
+
+                Action?.Invoke(number);
+            };
+            return drawable;
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
similarity index 54%
rename from osu.Game.Tournament/Screens/SetupScreen.cs
rename to osu.Game.Tournament/Screens/Setup/SetupScreen.cs
index c7b299e07f..5d8f0405ca 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/SetupScreen.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.Drawing;
 using osu.Framework.Allocation;
@@ -9,19 +8,16 @@ using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Platform;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.Tournament.IO;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osuTK;
-using osuTK.Graphics;
 
-namespace osu.Game.Tournament.Screens
+namespace osu.Game.Tournament.Screens.Setup
 {
     public class SetupScreen : TournamentScreen, IProvideVideo
     {
@@ -155,144 +151,5 @@ namespace osu.Game.Tournament.Screens
                 Width = 0.5f,
             };
         }
-
-        private class ActionableInfo : LabelledDrawable<Drawable>
-        {
-            protected OsuButton Button;
-
-            public ActionableInfo()
-                : base(true)
-            {
-            }
-
-            public string ButtonText
-            {
-                set => Button.Text = value;
-            }
-
-            public string Value
-            {
-                set => valueText.Text = value;
-            }
-
-            public bool Failing
-            {
-                set => valueText.Colour = value ? Color4.Red : Color4.White;
-            }
-
-            public Action Action;
-
-            private TournamentSpriteText valueText;
-            protected FillFlowContainer FlowContainer;
-
-            protected override Drawable CreateComponent() => new Container
-            {
-                AutoSizeAxes = Axes.Y,
-                RelativeSizeAxes = Axes.X,
-                Children = new Drawable[]
-                {
-                    valueText = new TournamentSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                    },
-                    FlowContainer = new FillFlowContainer
-                    {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        AutoSizeAxes = Axes.Both,
-                        Spacing = new Vector2(10, 0),
-                        Children = new Drawable[]
-                        {
-                            Button = new TriangleButton
-                            {
-                                Size = new Vector2(100, 40),
-                                Action = () => Action?.Invoke()
-                            }
-                        }
-                    }
-                }
-            };
-        }
-
-        private class TournamentSwitcher : ActionableInfo
-        {
-            private OsuDropdown<string> dropdown;
-
-            private string startupTournament;
-
-            [Resolved]
-            private TournamentGameBase game { get; set; }
-
-            [BackgroundDependencyLoader]
-            private void load(TournamentStorage storage)
-            {
-                startupTournament = storage.CurrentTournament.Value;
-
-                dropdown.Current = storage.CurrentTournament;
-                dropdown.Items = storage.ListTournaments();
-                dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
-
-                Action = () => game.GracefullyExit();
-
-                ButtonText = "Close osu!";
-            }
-
-            protected override Drawable CreateComponent()
-            {
-                var drawable = base.CreateComponent();
-
-                FlowContainer.Insert(-1, dropdown = new OsuDropdown<string>
-                {
-                    Width = 510
-                });
-
-                return drawable;
-            }
-        }
-
-        private class ResolutionSelector : ActionableInfo
-        {
-            private const int minimum_window_height = 480;
-            private const int maximum_window_height = 2160;
-
-            public new Action<int> Action;
-
-            private OsuNumberBox numberBox;
-
-            protected override Drawable CreateComponent()
-            {
-                var drawable = base.CreateComponent();
-                FlowContainer.Insert(-1, numberBox = new OsuNumberBox
-                {
-                    Text = "1080",
-                    Width = 100
-                });
-
-                base.Action = () =>
-                {
-                    if (string.IsNullOrEmpty(numberBox.Text))
-                        return;
-
-                    // box contains text
-                    if (!int.TryParse(numberBox.Text, out var number))
-                    {
-                        // at this point, the only reason we can arrive here is if the input number was too big to parse into an int
-                        // so clamp to max allowed value
-                        number = maximum_window_height;
-                    }
-                    else
-                    {
-                        number = Math.Clamp(number, minimum_window_height, maximum_window_height);
-                    }
-
-                    // in case number got clamped, reset number in numberBox
-                    numberBox.Text = number.ToString();
-
-                    Action?.Invoke(number);
-                };
-                return drawable;
-            }
-        }
     }
 }
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
similarity index 99%
rename from osu.Game.Tournament/Screens/StablePathSelectScreen.cs
rename to osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
index 717b43f704..03f79b644f 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
@@ -13,11 +13,11 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
-using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.IPC;
 using osuTK;
 
-namespace osu.Game.Tournament.Screens
+namespace osu.Game.Tournament.Screens.Setup
 {
     public class StablePathSelectScreen : TournamentScreen
     {
diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
new file mode 100644
index 0000000000..a993a0594a
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -0,0 +1,43 @@
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Tournament.IO;
+
+namespace osu.Game.Tournament.Screens.Setup
+{
+    internal class TournamentSwitcher : ActionableInfo
+    {
+        private OsuDropdown<string> dropdown;
+
+        private string startupTournament;
+
+        [Resolved]
+        private TournamentGameBase game { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load(TournamentStorage storage)
+        {
+            startupTournament = storage.CurrentTournament.Value;
+
+            dropdown.Current = storage.CurrentTournament;
+            dropdown.Items = storage.ListTournaments();
+            dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
+
+            Action = () => game.GracefullyExit();
+
+            ButtonText = "Close osu!";
+        }
+
+        protected override Drawable CreateComponent()
+        {
+            var drawable = base.CreateComponent();
+
+            FlowContainer.Insert(-1, dropdown = new OsuDropdown<string>
+            {
+                Width = 510
+            });
+
+            return drawable;
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index 870ea466cc..ced1a8ec72 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -19,6 +19,7 @@ using osu.Game.Tournament.Screens.Gameplay;
 using osu.Game.Tournament.Screens.Ladder;
 using osu.Game.Tournament.Screens.MapPool;
 using osu.Game.Tournament.Screens.Schedule;
+using osu.Game.Tournament.Screens.Setup;
 using osu.Game.Tournament.Screens.Showcase;
 using osu.Game.Tournament.Screens.TeamIntro;
 using osu.Game.Tournament.Screens.TeamWin;

From c9466426b743471e36e4126f3637d44c00fc819c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 14:45:01 +0900
Subject: [PATCH 07482/10326] Change field to local variable

---
 osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index a993a0594a..e38a374e1c 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -9,15 +9,13 @@ namespace osu.Game.Tournament.Screens.Setup
     {
         private OsuDropdown<string> dropdown;
 
-        private string startupTournament;
-
         [Resolved]
         private TournamentGameBase game { get; set; }
 
         [BackgroundDependencyLoader]
         private void load(TournamentStorage storage)
         {
-            startupTournament = storage.CurrentTournament.Value;
+            string startupTournament = storage.CurrentTournament.Value;
 
             dropdown.Current = storage.CurrentTournament;
             dropdown.Items = storage.ListTournaments();
@@ -40,4 +38,4 @@ namespace osu.Game.Tournament.Screens.Setup
             return drawable;
         }
     }
-}
\ No newline at end of file
+}

From f65042cf4452997589ba678b8c4670a16eafdd65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 15:47:27 +0900
Subject: [PATCH 07483/10326] Add missing licence headers

---
 osu.Game.Tournament/Screens/Setup/ActionableInfo.cs     | 3 +++
 osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs | 3 +++
 osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs b/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
index f7d52a294e..cfdf9c99ae 100644
--- a/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
+++ b/osu.Game.Tournament/Screens/Setup/ActionableInfo.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.
+
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
index 47472c386c..4b518ea7c7 100644
--- a/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
+++ b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.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.
+
 using System;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index e38a374e1c..74c872646c 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.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.
+
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;

From 90fb67b377e2022f3bfa60dfca4f31a7d3670228 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 11 Jan 2021 20:52:02 +0300
Subject: [PATCH 07484/10326] Update code in-line with decided direction

---
 osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs      | 1 -
 osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 7fda526faf..f324a1a216 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -43,7 +43,6 @@ namespace osu.Game.Online.Multiplayer
 
         /// <summary>
         /// Change the user's local availability state of the beatmap set in joined room.
-        /// This will also force user state back to <see cref="MultiplayerUserState.Idle"/>.
         /// </summary>
         /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
         Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index c155447f8c..7fbc770351 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -83,7 +83,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Debug.Assert(Room != null);
 
             ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged(userId, newBeatmapAvailability);
-            ChangeUserState(userId, MultiplayerUserState.Idle);
         }
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)

From 0d5fbb15ac06c321a0f43d9a2e6ff5d9a61e8cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Jan 2021 20:28:24 +0100
Subject: [PATCH 07485/10326] Fix up code comments

Default value restated in xmldoc was snipped because it's made redundant
by the initialiser and possibly bound to be outdated at some point.
---
 osu.Game/Online/Multiplayer/IMultiplayerClient.cs        | 2 +-
 osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs    | 2 +-
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs       | 2 +-
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 5410fbc030..19dd473230 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Online.Multiplayer
         Task UserStateChanged(int userId, MultiplayerUserState state);
 
         /// <summary>
-        /// Signals that a user in this room has their beatmap availability state changed.
+        /// Signals that a user in this room changed their beatmap availability state.
         /// </summary>
         /// <param name="userId">The ID of the user whose beatmap availability state has changed.</param>
         /// <param name="beatmapAvailability">The new beatmap availability state of the user.</param>
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index f324a1a216..09816974a7 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Online.Multiplayer
         Task ChangeState(MultiplayerUserState newState);
 
         /// <summary>
-        /// Change the user's local availability state of the beatmap set in joined room.
+        /// Change the local user's availability state of the current beatmap set in joined room.
         /// </summary>
         /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
         Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index f515b574df..2590acbc81 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Online.Multiplayer
         public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
 
         /// <summary>
-        /// The availability state of the beatmap, set to <see cref="DownloadState.LocallyAvailable"/> by default.
+        /// The availability state of the current beatmap.
         /// </summary>
         public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 799b66020c..99aa8fe015 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -322,7 +322,7 @@ namespace osu.Game.Online.Multiplayer
             {
                 var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
 
-                // we don't care whether the room doesn't exist or user isn't in joined room, just return in that point.
+                // errors here are not critical - beatmap availability state is mostly for display.
                 if (user == null)
                     return;
 

From 249be461d511b10f541ef331b3b1aebe666d74be Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Jan 2021 11:09:55 +0300
Subject: [PATCH 07486/10326] Add "explicit maps" search filter control

---
 .../Online/API/Requests/SearchBeatmapSetsRequest.cs   |  8 +++++++-
 .../BeatmapListing/BeatmapListingFilterControl.cs     |  4 +++-
 .../BeatmapListing/BeatmapListingSearchControl.cs     |  6 +++++-
 osu.Game/Overlays/BeatmapListing/SearchExplicit.cs    | 11 +++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/SearchExplicit.cs

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index bbaa7e745f..939d3c6cb4 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Online.API.Requests
 
         public SearchPlayed Played { get; }
 
+        public SearchExplicit Explicit { get; }
+
         [CanBeNull]
         public IReadOnlyCollection<ScoreRank> Ranks { get; }
 
@@ -50,7 +52,8 @@ namespace osu.Game.Online.API.Requests
             SearchLanguage language = SearchLanguage.Any,
             IReadOnlyCollection<SearchExtra> extra = null,
             IReadOnlyCollection<ScoreRank> ranks = null,
-            SearchPlayed played = SearchPlayed.Any)
+            SearchPlayed played = SearchPlayed.Any,
+            SearchExplicit explicitMaps = SearchExplicit.Hide)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
@@ -64,6 +67,7 @@ namespace osu.Game.Online.API.Requests
             Extra = extra;
             Ranks = ranks;
             Played = played;
+            Explicit = explicitMaps;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -93,6 +97,8 @@ namespace osu.Game.Online.API.Requests
             if (Played != SearchPlayed.Any)
                 req.AddParameter("played", Played.ToString().ToLowerInvariant());
 
+            req.AddParameter("nsfw", Explicit == SearchExplicit.Show ? "true" : "false");
+
             req.AddCursor(cursor);
 
             return req;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index d991dcfcfb..650adcb4a9 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -141,6 +141,7 @@ namespace osu.Game.Overlays.BeatmapListing
             searchControl.Extra.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Ranks.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Played.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.Explicit.BindValueChanged(_ => queueUpdateSearch());
 
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
@@ -193,7 +194,8 @@ namespace osu.Game.Overlays.BeatmapListing
                 searchControl.Language.Value,
                 searchControl.Extra,
                 searchControl.Ranks,
-                searchControl.Played.Value);
+                searchControl.Played.Value,
+                searchControl.Explicit.Value);
 
             getSetsRequest.Success += response =>
             {
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index e232bf045f..c14d693f7d 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<SearchPlayed> Played => playedFilter.Current;
 
+        public Bindable<SearchExplicit> Explicit => explicitFilter.Current;
+
         public BeatmapSetInfo BeatmapSet
         {
             set
@@ -65,6 +67,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchMultipleSelectionFilterRow<SearchExtra> extraFilter;
         private readonly BeatmapSearchScoreFilterRow ranksFilter;
         private readonly BeatmapSearchFilterRow<SearchPlayed> playedFilter;
+        private readonly BeatmapSearchFilterRow<SearchExplicit> explicitFilter;
 
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
@@ -125,7 +128,8 @@ namespace osu.Game.Overlays.BeatmapListing
                                     languageFilter = new BeatmapSearchFilterRow<SearchLanguage>(@"Language"),
                                     extraFilter = new BeatmapSearchMultipleSelectionFilterRow<SearchExtra>(@"Extra"),
                                     ranksFilter = new BeatmapSearchScoreFilterRow(),
-                                    playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played")
+                                    playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played"),
+                                    explicitFilter = new BeatmapSearchFilterRow<SearchExplicit>(@"Explicit Maps"),
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs b/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs
new file mode 100644
index 0000000000..3e57cdd48c
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SearchExplicit.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.Overlays.BeatmapListing
+{
+    public enum SearchExplicit
+    {
+        Hide,
+        Show
+    }
+}

From 24c18397397648894f0b943ec98e2f63735c71cf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Jan 2021 11:10:25 +0300
Subject: [PATCH 07487/10326] Add global web setting for allowing explicit
 content

---
 osu.Game/Configuration/OsuConfigManager.cs           |  3 +++
 .../BeatmapListing/BeatmapListingSearchControl.cs    | 12 +++++++++++-
 .../Overlays/Settings/Sections/Online/WebSettings.cs |  6 ++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index eb34a0885d..5e7a843baf 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Configuration
             Set(OsuSetting.ExternalLinkWarning, true);
             Set(OsuSetting.PreferNoVideo, false);
 
+            Set(OsuSetting.AllowExplicitContent, false);
+
             // Audio
             Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
 
@@ -270,5 +272,6 @@ namespace osu.Game.Configuration
         EditorWaveformOpacity,
         DiscordRichPresence,
         AutomaticallyDownloadWhenSpectating,
+        AllowExplicitContent,
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index c14d693f7d..3761aee312 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osuTK.Graphics;
@@ -140,10 +141,19 @@ namespace osu.Game.Overlays.BeatmapListing
             categoryFilter.Current.Value = SearchCategory.Leaderboard;
         }
 
+        private IBindable<bool> allowExplicitContent;
+
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider, OsuConfigManager config)
         {
             background.Colour = colourProvider.Dark6;
+
+            allowExplicitContent = config.GetBindable<bool>(OsuSetting.AllowExplicitContent);
+            allowExplicitContent.BindValueChanged(allow =>
+            {
+                // Update search control if global "explicit allowed" setting changed.
+                Explicit.Value = allow.NewValue ? SearchExplicit.Show : SearchExplicit.Hide;
+            }, true);
         }
 
         public void TakeFocus() => textBox.TakeFocus();
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index 8134c350a6..da7ef46f65 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -33,6 +33,12 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                     Keywords = new[] { "spectator" },
                     Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Hide warnings for explicit content in beatmaps",
+                    Keywords = new[] { "nsfw", "18+", "offensive" },
+                    Current = config.GetBindable<bool>(OsuSetting.AllowExplicitContent),
+                }
             };
         }
     }

From 80fa2cf69330ff805c1de0f4464682a8f79b5156 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Jan 2021 11:14:05 +0300
Subject: [PATCH 07488/10326] Add test coverage

---
 .../TestSceneBeatmapListingSearchControl.cs   | 71 +++++++++++++------
 1 file changed, 48 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index 3f757031f8..cb86047dea 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
@@ -19,9 +20,18 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private readonly BeatmapListingSearchControl control;
+        private BeatmapListingSearchControl control;
 
-        public TestSceneBeatmapListingSearchControl()
+        private OsuConfigManager localConfig;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Dependencies.Cache(localConfig = new OsuConfigManager(LocalStorage));
+        }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
             OsuSpriteText query;
             OsuSpriteText ruleset;
@@ -31,30 +41,34 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuSpriteText extra;
             OsuSpriteText ranks;
             OsuSpriteText played;
+            OsuSpriteText explicitMap;
 
-            Add(control = new BeatmapListingSearchControl
+            Children = new Drawable[]
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            });
-
-            Add(new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 5),
-                Children = new Drawable[]
+                control = new BeatmapListingSearchControl
                 {
-                    query = new OsuSpriteText(),
-                    ruleset = new OsuSpriteText(),
-                    category = new OsuSpriteText(),
-                    genre = new OsuSpriteText(),
-                    language = new OsuSpriteText(),
-                    extra = new OsuSpriteText(),
-                    ranks = new OsuSpriteText(),
-                    played = new OsuSpriteText()
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0, 5),
+                    Children = new Drawable[]
+                    {
+                        query = new OsuSpriteText(),
+                        ruleset = new OsuSpriteText(),
+                        category = new OsuSpriteText(),
+                        genre = new OsuSpriteText(),
+                        language = new OsuSpriteText(),
+                        extra = new OsuSpriteText(),
+                        ranks = new OsuSpriteText(),
+                        played = new OsuSpriteText(),
+                        explicitMap = new OsuSpriteText(),
+                    }
                 }
-            });
+            };
 
             control.Query.BindValueChanged(q => query.Text = $"Query: {q.NewValue}", true);
             control.Ruleset.BindValueChanged(r => ruleset.Text = $"Ruleset: {r.NewValue}", true);
@@ -64,7 +78,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.Extra.BindCollectionChanged((u, v) => extra.Text = $"Extra: {(control.Extra.Any() ? string.Join('.', control.Extra.Select(i => i.ToString().ToLowerInvariant())) : "")}", true);
             control.Ranks.BindCollectionChanged((u, v) => ranks.Text = $"Ranks: {(control.Ranks.Any() ? string.Join('.', control.Ranks.Select(i => i.ToString())) : "")}", true);
             control.Played.BindValueChanged(p => played.Text = $"Played: {p.NewValue}", true);
-        }
+            control.Explicit.BindValueChanged(e => explicitMap.Text = $"Explicit Maps: {e.NewValue}", true);
+        });
 
         [Test]
         public void TestCovers()
@@ -74,6 +89,16 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Set null beatmap", () => control.BeatmapSet = null);
         }
 
+        [Test]
+        public void TestExplicitConfig()
+        {
+            AddStep("configure explicit content to allowed", () => localConfig.Set(OsuSetting.AllowExplicitContent, true));
+            AddAssert("explicit control set to show", () => control.Explicit.Value == SearchExplicit.Show);
+
+            AddStep("configure explicit content to disallowed", () => localConfig.Set(OsuSetting.AllowExplicitContent, false));
+            AddAssert("explicit control set to hide", () => control.Explicit.Value == SearchExplicit.Hide);
+        }
+
         private static readonly BeatmapSetInfo beatmap_set = new BeatmapSetInfo
         {
             OnlineInfo = new BeatmapSetOnlineInfo

From 422260797b68cc6e3710d327c4e3accc66d4797c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 16:03:12 +0900
Subject: [PATCH 07489/10326] Revert polling changes to fix participant list
 display

It turns out this polling was necessary to get extra data that isn't
included in the main listing request. It was removed deemed useless, and
in order to fix the order of rooms changing when selecting a room.
Weirdly, I can't reproduce this happening any more, and on close
inspection of the code can't see how it could happen in the first place.

For now, let's revert this change and iterate from there, if/when the
same issue arises again.

I've discussed avoiding this second poll by potentially including more
data (just `user_id`s?) in the main listing request, but not 100% sure
on this - even if the returned data is minimal it's an extra join
server-side, which could cause performance issues for large numbers of
rooms.
---
 .../TestSceneMultiplayerRoomManager.cs        |  1 +
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  5 +++-
 .../Multiplayer/MultiplayerRoomManager.cs     | 28 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 80d1acd145..7a3845cbf3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -143,6 +143,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 RoomManager =
                 {
                     TimeBetweenListingPolls = { Value = 1 },
+                    TimeBetweenSelectionPolls = { Value = 1 }
                 }
             };
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 310617a0bc..76f5c74433 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
             {
                 multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
@@ -40,16 +41,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 {
                     case LoungeSubScreen _:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     // Don't poll inside the match or anywhere else.
                     default:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 5c327266a3..3cb263298f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private StatefulMultiplayerClient multiplayerClient { get; set; }
 
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
-
+        public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
         private readonly Bindable<bool> allowPolling = new Bindable<bool>();
 
@@ -119,6 +119,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
                 AllowPolling = { BindTarget = allowPolling }
             },
+            new MultiplayerSelectionPollingComponent
+            {
+                TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
+                AllowPolling = { BindTarget = allowPolling }
+            }
         };
 
         private class MultiplayerListingPollingComponent : ListingPollingComponent
@@ -141,5 +146,26 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
         }
+
+        private class MultiplayerSelectionPollingComponent : SelectionPollingComponent
+        {
+            public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                AllowPolling.BindValueChanged(allowPolling =>
+                {
+                    if (!allowPolling.NewValue)
+                        return;
+
+                    if (IsLoaded)
+                        PollImmediately();
+                });
+            }
+
+            protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
+        }
     }
 }

From 22a0f99f35496d22b5b610626b057c36d1bea82d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 12 Jan 2021 17:49:18 +0900
Subject: [PATCH 07490/10326] Add failing test

---
 .../TaikoBeatmapConversionTest.cs             |  1 +
 ...rating-drumroll-2-expected-conversion.json | 18 ++++++++++++++++++
 .../Beatmaps/slider-generating-drumroll-2.osu | 19 +++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2.osu

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index 3d77fb05db..b6db333dc9 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [TestCase("sample-to-type-conversions")]
         [TestCase("slider-conversion-v6")]
         [TestCase("slider-conversion-v14")]
+        [TestCase("slider-generating-drumroll-2")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2-expected-conversion.json b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2-expected-conversion.json
new file mode 100644
index 0000000000..b4ee98c86a
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2-expected-conversion.json
@@ -0,0 +1,18 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 51532,
+      "Objects": [
+        {
+          "StartTime": 51532,
+          "EndTime": 52301,
+          "IsRim": false,
+          "IsCentre": false,
+          "IsDrumRoll": true,
+          "IsSwell": false,
+          "IsStrong": false
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2.osu b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2.osu
new file mode 100644
index 0000000000..d81b09ee26
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2.osu
@@ -0,0 +1,19 @@
+osu file format v14
+
+[General]
+Mode: 0
+
+[Difficulty]
+HPDrainRate:2
+CircleSize:3.2
+OverallDifficulty:2
+ApproachRate:3
+SliderMultiplier:0.999999999999999
+SliderTickRate:1
+
+[TimingPoints]
+763,384.615384615385,4,2,0,70,1,0
+49993,-90.9090909090909,4,2,0,75,0,1
+
+[HitObjects]
+51,245,51532,2,0,P|18:150|17:122,2,110.000003356934,0|8|0,0:0|0:0|0:0,0:0:0:0:

From 9a22df2b88029de3f22b51938ad6b163322d95ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 12 Jan 2021 17:50:22 +0900
Subject: [PATCH 07491/10326] Fix BPM multiplier not working in all cases

---
 .../Beatmaps/TaikoBeatmapConverter.cs         |   6 +-
 ...er-conversion-v14-expected-conversion.json | 307 +-----------------
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    |   5 +-
 3 files changed, 18 insertions(+), 300 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 1214c594aa..b51f096d7d 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             }
         }
 
-        private bool shouldConvertSliderToHits(HitObject obj, IBeatmap beatmap, IHasDistance distanceData, out double taikoDuration, out double tickSpacing)
+        private bool shouldConvertSliderToHits(HitObject obj, IBeatmap beatmap, IHasDistance distanceData, out int taikoDuration, out double tickSpacing)
         {
             // DO NOT CHANGE OR REFACTOR ANYTHING IN HERE WITHOUT TESTING AGAINST _ALL_ BEATMAPS.
             // Some of these calculations look redundant, but they are not - extremely small floating point errors are introduced to maintain 1:1 compatibility with stable.
@@ -185,7 +185,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
             // The velocity and duration of the taiko hit object - calculated as the velocity of a drum roll.
             double taikoVelocity = sliderScoringPointDistance * beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate;
-            taikoDuration = distance / taikoVelocity * beatLength;
+            taikoDuration = (int)(distance / taikoVelocity * beatLength);
 
             if (isForCurrentRuleset)
             {
@@ -200,7 +200,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 beatLength = timingPoint.BeatLength;
 
             // If the drum roll is to be split into hit circles, assume the ticks are 1/8 spaced within the duration of one beat
-            tickSpacing = Math.Min(beatLength / beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate, taikoDuration / spans);
+            tickSpacing = Math.Min(beatLength / beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate, (double)taikoDuration / spans);
 
             return tickSpacing > 0
                    && distance / osuVelocity * 1000 < 2 * beatLength;
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json
index 6a6063cb74..b7ad128cab 100644
--- a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json
@@ -1,7 +1,9 @@
 {
-    "Mappings": [{
+    "Mappings": [
+        {
             "StartTime": 2000,
-            "Objects": [{
+            "Objects": [
+                {
                     "StartTime": 2000,
                     "EndTime": 2000,
                     "IsRim": false,
@@ -23,7 +25,8 @@
         },
         {
             "StartTime": 4000,
-            "Objects": [{
+            "Objects": [
+                {
                     "StartTime": 4000,
                     "EndTime": 4000,
                     "IsRim": false,
@@ -45,7 +48,8 @@
         },
         {
             "StartTime": 6000,
-            "Objects": [{
+            "Objects": [
+                {
                     "StartTime": 6000,
                     "EndTime": 6000,
                     "IsRim": true,
@@ -76,300 +80,13 @@
         },
         {
             "StartTime": 8000,
-            "Objects": [{
+            "Objects": [
+                {
                     "StartTime": 8000,
-                    "EndTime": 8000,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8026,
-                    "EndTime": 8026,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8053,
-                    "EndTime": 8053,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8080,
-                    "EndTime": 8080,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8107,
-                    "EndTime": 8107,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8133,
-                    "EndTime": 8133,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8160,
-                    "EndTime": 8160,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8187,
-                    "EndTime": 8187,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8214,
-                    "EndTime": 8214,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8241,
-                    "EndTime": 8241,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8267,
-                    "EndTime": 8267,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8294,
-                    "EndTime": 8294,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8321,
-                    "EndTime": 8321,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8348,
-                    "EndTime": 8348,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8374,
-                    "EndTime": 8374,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8401,
-                    "EndTime": 8401,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8428,
-                    "EndTime": 8428,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8455,
-                    "EndTime": 8455,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8482,
-                    "EndTime": 8482,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8508,
-                    "EndTime": 8508,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8535,
-                    "EndTime": 8535,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8562,
-                    "EndTime": 8562,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8589,
-                    "EndTime": 8589,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8615,
-                    "EndTime": 8615,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8642,
-                    "EndTime": 8642,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8669,
-                    "EndTime": 8669,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8696,
-                    "EndTime": 8696,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8723,
-                    "EndTime": 8723,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8749,
-                    "EndTime": 8749,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8776,
-                    "EndTime": 8776,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8803,
-                    "EndTime": 8803,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8830,
-                    "EndTime": 8830,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8857,
                     "EndTime": 8857,
                     "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
+                    "IsCentre": false,
+                    "IsDrumRoll": true,
                     "IsSwell": false,
                     "IsStrong": false
                 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 069a25b83d..2fb24c24e0 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -164,12 +164,13 @@ namespace osu.Game.Beatmaps.Formats
             /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
             /// DO NOT USE THIS UNLESS 100% SURE.
             /// </summary>
-            public float BpmMultiplier { get; private set; }
+            public double BpmMultiplier { get; private set; }
 
             public LegacyDifficultyControlPoint(double beatLength)
                 : this()
             {
-                BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100f : 1;
+                // Note: In stable, the division occurs on floats, but with compiler optimisations turned on actually seems to occur on doubles via some .NET black magic (possibly inlining?).
+                BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100.0 : 1;
             }
 
             public LegacyDifficultyControlPoint()

From b51b07c3a90c0dc1635984f9346175746c5e3da7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 18:05:29 +0900
Subject: [PATCH 07492/10326] Fix unstable multiplayer room ordering when
 selection is made

---
 .../OnlinePlay/Components/SelectionPollingComponent.cs       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
index 0eec155060..dcf3c94b76 100644
--- a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -47,9 +48,11 @@ namespace osu.Game.Screens.OnlinePlay.Components
 
             pollReq.Success += result =>
             {
-                var rooms = new List<Room>(roomManager.Rooms);
+                // existing rooms need to be ordered by their position because the received of NotifyRoomsReceives expects to be able to sort them based on this order.
+                var rooms = new List<Room>(roomManager.Rooms.OrderBy(r => r.Position.Value));
 
                 int index = rooms.FindIndex(r => r.RoomID.Value == result.RoomID.Value);
+
                 if (index < 0)
                     return;
 

From 7298adc9d9b8ef878f4be5b8799be222aa0dd90b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 19:04:16 +0900
Subject: [PATCH 07493/10326] Fix non-threadsafe usage of
 MultiplayerClient.IsConnected

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs    | 1 +
 .../OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs  | 4 ++--
 .../Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs     | 4 ++--
 .../OnlinePlay/Multiplayer/MultiplayerRoomManager.cs        | 6 ++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 34cba09e8c..770039d79d 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Online.Multiplayer
 
         /// <summary>
         /// Whether the <see cref="StatefulMultiplayerClient"/> is currently connected.
+        /// This is NOT thread safe and usage should be scheduled.
         /// </summary>
         public abstract IBindable<bool> IsConnected { get; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index 87b0e49b5b..a13d2cf540 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            isConnected.BindValueChanged(_ => updateState());
-            operationInProgress.BindValueChanged(_ => updateState(), true);
+            isConnected.BindValueChanged(_ => Scheduler.AddOnce(updateState));
+            operationInProgress.BindValueChanged(_ => Scheduler.AddOnce(updateState), true);
         }
 
         private void updateState() => Enabled.Value = isConnected.Value && !operationInProgress.Value;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 4bee502e2e..04d9e0a72a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -77,14 +77,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             });
 
             isConnected = client.IsConnected.GetBoundCopy();
-            isConnected.BindValueChanged(connected =>
+            isConnected.BindValueChanged(connected => Schedule(() =>
             {
                 if (!connected.NewValue)
                 {
                     // messaging to the user about this disconnect will be provided by the MultiplayerMatchSubScreen.
                     failAndBail();
                 }
-            }, true);
+            }), true);
 
             Debug.Assert(client.Room != null);
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 5c327266a3..bcae2e5cbb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -34,10 +34,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.LoadComplete();
 
             isConnected.BindTo(multiplayerClient.IsConnected);
-            isConnected.BindValueChanged(_ => Schedule(updatePolling));
-            JoinedRoom.BindValueChanged(_ => updatePolling());
-
-            updatePolling();
+            isConnected.BindValueChanged(_ => Scheduler.AddOnce(updatePolling));
+            JoinedRoom.BindValueChanged(_ => Scheduler.AddOnce(updatePolling), true);
         }
 
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)

From 2d3cacca11bc1d8de6c78cf8b6f1154f1e058050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Jan 2021 00:58:53 +0100
Subject: [PATCH 07494/10326] Fix non-hosts crashing on load requested

`onLoadRequested()` always released the `readyClickOperation` ongoing
operation, without checking whether it actually needs to/should (it
should only do so if the action initiating the operation was starting
the game by the host). This would crash all other consumers, who already
released the operation when their ready-up operation completed server
side.

To resolve, relax the constraint such that the operation can be ended
multiple times in any order. At the end of the day the thing that
matters is that the operation is done and the ready button is unblocked.
---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index e539b315e4..80991569dc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -241,8 +241,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             void endOperation()
             {
-                Debug.Assert(readyClickOperation != null);
-                readyClickOperation.Dispose();
+                readyClickOperation?.Dispose();
                 readyClickOperation = null;
             }
         }
@@ -255,9 +254,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
 
-            Debug.Assert(readyClickOperation != null);
-
-            readyClickOperation.Dispose();
+            readyClickOperation?.Dispose();
             readyClickOperation = null;
         }
 

From 5f10bcce02411a22f783ba3a5bbb9d7ab66f43af Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 00:09:22 -0500
Subject: [PATCH 07495/10326] Added beatmap colour settings checkbox and
 associated tests.

---
 .../TestSceneLegacyBeatmapSkin.cs             | 78 +++++++++++++++++--
 .../TestSceneSkinFallbacks.cs                 | 25 ++++++
 osu.Game/Configuration/OsuConfigManager.cs    |  2 +
 .../Overlays/Settings/Sections/SkinSection.cs |  5 ++
 .../Play/PlayerSettings/VisualSettings.cs     |  3 +
 .../Skinning/BeatmapSkinProvidingContainer.cs |  7 +-
 6 files changed, 110 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index a768626005..83b1e28476 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -7,9 +7,12 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
@@ -24,34 +27,81 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Resolved]
         private AudioManager audio { get; set; }
 
-        [TestCase(true)]
-        [TestCase(false)]
-        public void TestBeatmapComboColours(bool customSkinColoursPresent)
+        private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
+        private readonly Bindable<bool> beatmapColours = new Bindable<bool>();
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
+            config.BindWith(OsuSetting.BeatmapColours, beatmapColours);
+        }
+
+        [TestCase(true, true, true)]
+        [TestCase(true, false, true)]
+        [TestCase(false, true, true)]
+        [TestCase(false, false, true)]
+        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin, bool useBeatmapColour)
         {
             ExposedPlayer player = null;
 
-            AddStep("load coloured beatmap", () => player = loadBeatmap(customSkinColoursPresent, true));
+            configureSettings(useBeatmapSkin, useBeatmapColour);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(userHasCustomColours, true));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
             AddAssert("is beatmap skin colours", () => player.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
         }
 
-        [Test]
-        public void TestBeatmapNoComboColours()
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin, bool useBeatmapColour)
         {
             ExposedPlayer player = null;
 
+            configureSettings(useBeatmapSkin, useBeatmapColour);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(true, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is user custom skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+        }
+
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin, bool useBeatmapColour)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, useBeatmapColour);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(false, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+        }
+
+        [TestCase(true, true)]
+        [TestCase(false, true)]
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, useBeatmapColour);
             AddStep("load no-colour beatmap", () => player = loadBeatmap(false, false));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
             AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
         }
 
-        [Test]
-        public void TestBeatmapNoComboColoursSkinOverride()
+        [TestCase(true, true)]
+        [TestCase(false, true)]
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
         {
             ExposedPlayer player = null;
 
+            configureSettings(useBeatmapSkin, useBeatmapColour);
             AddStep("load custom-skin colour", () => player = loadBeatmap(true, false));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
@@ -69,6 +119,18 @@ namespace osu.Game.Rulesets.Osu.Tests
             return player;
         }
 
+        private void configureSettings(bool beatmapSkins, bool beatmapColours)
+        {
+            AddStep($"{(beatmapSkins ? "enable" : "disable")} beatmap skins", () =>
+            {
+                this.beatmapSkins.Value = beatmapSkins;
+            });
+            AddStep($"{(beatmapColours ? "enable" : "disable")} beatmap colours", () =>
+            {
+                this.beatmapColours.Value = beatmapColours;
+            });
+        }
+
         private class ExposedPlayer : Player
         {
             private readonly bool userHasCustomColours;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 856bfd7e80..10baca438d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -52,6 +52,31 @@ namespace osu.Game.Rulesets.Osu.Tests
             checkNextHitObject(null);
         }
 
+        [Test]
+        public void TestBeatmapColourDefault()
+        {
+            AddStep("enable user provider", () => testUserSkin.Enabled = true);
+
+            AddStep("enable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, true));
+            AddStep("enable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, true));
+            checkNextHitObject("beatmap");
+
+            AddStep("enable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, true));
+            AddStep("disable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, false));
+            checkNextHitObject("beatmap");
+
+            AddStep("disable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, false));
+            AddStep("enable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, true));
+            checkNextHitObject("user");
+
+            AddStep("disable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, false));
+            AddStep("disable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, false));
+            checkNextHitObject("user");
+
+            AddStep("disable user provider", () => testUserSkin.Enabled = false);
+            checkNextHitObject(null);
+        }
+
         private void checkNextHitObject(string skin) =>
             AddUntilStep($"check skin from {skin}", () =>
             {
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index eb34a0885d..5a8f7b4477 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -82,6 +82,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.ShowStoryboard, true);
             Set(OsuSetting.BeatmapSkins, true);
+            Set(OsuSetting.BeatmapColours, true);
             Set(OsuSetting.BeatmapHitsounds, true);
 
             Set(OsuSetting.CursorRotation, true);
@@ -250,6 +251,7 @@ namespace osu.Game.Configuration
         ScreenshotCaptureMenuCursor,
         SongSelectRightMouseScroll,
         BeatmapSkins,
+        BeatmapColours,
         BeatmapHitsounds,
         IncreaseFirstObjectVisibility,
         ScoreDisplayMode,
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 5898482e4a..e29f97c33e 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -70,6 +70,11 @@ namespace osu.Game.Overlays.Settings.Sections
                     Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins)
                 },
                 new SettingsCheckbox
+                {
+                    LabelText = "Beatmap colours",
+                    Current = config.GetBindable<bool>(OsuSetting.BeatmapColours)
+                },
+                new SettingsCheckbox
                 {
                     LabelText = "Beatmap hitsounds",
                     Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds)
diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
index 8f29fe7893..a97078c461 100644
--- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
         private readonly PlayerSliderBar<double> blurSliderBar;
         private readonly PlayerCheckbox showStoryboardToggle;
         private readonly PlayerCheckbox beatmapSkinsToggle;
+        private readonly PlayerCheckbox beatmapColorsToggle;
         private readonly PlayerCheckbox beatmapHitsoundsToggle;
 
         public VisualSettings()
@@ -43,6 +44,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
                 },
                 showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboard / Video" },
                 beatmapSkinsToggle = new PlayerCheckbox { LabelText = "Beatmap skins" },
+                beatmapColorsToggle = new PlayerCheckbox { LabelText = "Beatmap colours" },
                 beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hitsounds" }
             };
         }
@@ -54,6 +56,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
             blurSliderBar.Current = config.GetBindable<double>(OsuSetting.BlurLevel);
             showStoryboardToggle.Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
             beatmapSkinsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
+            beatmapColorsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapColours);
             beatmapHitsoundsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
         }
     }
diff --git a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
index fc01f0bd31..ffc35b3ab6 100644
--- a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
@@ -15,6 +15,7 @@ namespace osu.Game.Skinning
     public class BeatmapSkinProvidingContainer : SkinProvidingContainer
     {
         private Bindable<bool> beatmapSkins;
+        private Bindable<bool> beatmapColours;
         private Bindable<bool> beatmapHitsounds;
 
         protected override bool AllowConfigurationLookup
@@ -24,10 +25,10 @@ namespace osu.Game.Skinning
                 if (beatmapSkins == null)
                     throw new InvalidOperationException($"{nameof(BeatmapSkinProvidingContainer)} needs to be loaded before being consumed.");
 
-                return beatmapSkins.Value;
+                return beatmapColours.Value;
             }
         }
-
+        
         protected override bool AllowDrawableLookup(ISkinComponent component)
         {
             if (beatmapSkins == null)
@@ -62,6 +63,7 @@ namespace osu.Game.Skinning
             var config = parent.Get<OsuConfigManager>();
 
             beatmapSkins = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
+            beatmapColours = config.GetBindable<bool>(OsuSetting.BeatmapColours);
             beatmapHitsounds = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
 
             return base.CreateChildDependencies(parent);
@@ -71,6 +73,7 @@ namespace osu.Game.Skinning
         private void load()
         {
             beatmapSkins.BindValueChanged(_ => TriggerSourceChanged());
+            beatmapColours.BindValueChanged(_ => TriggerSourceChanged());
             beatmapHitsounds.BindValueChanged(_ => TriggerSourceChanged());
         }
     }

From 7bfb5954a8e7553dbd429f5901865525045d809a Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 00:25:54 -0500
Subject: [PATCH 07496/10326] Fix whitespace formatting.

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

diff --git a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
index ffc35b3ab6..c16547589d 100644
--- a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Skinning
                 return beatmapColours.Value;
             }
         }
-        
+
         protected override bool AllowDrawableLookup(ISkinComponent component)
         {
             if (beatmapSkins == null)

From 80bcd78a4802131d02576bebcf87c16f8297f2af Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 02:04:59 -0500
Subject: [PATCH 07497/10326] Removed unnecessary using.

---
 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 83b1e28476..138182c7c4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -12,7 +12,6 @@ using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;

From e8daea91d22e87e95d2deaf8caf70817c6277ebc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Jan 2021 18:13:05 +0300
Subject: [PATCH 07498/10326] Add online beatmap "explicit content" property

---
 osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs               | 5 +++++
 osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
index 06dee4d3f5..48f1f0ce68 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
@@ -31,6 +31,11 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public BeatmapSetOnlineStatus Status { get; set; }
 
+        /// <summary>
+        /// Whether or not this beatmap set has explicit content.
+        /// </summary>
+        public bool HasExplicitContent { get; set; }
+
         /// <summary>
         /// Whether or not this beatmap set has a background video.
         /// </summary>
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
index 720d6bfff4..bd1800e9f7 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"bpm")]
         private double bpm { get; set; }
 
+        [JsonProperty(@"nsfw")]
+        private bool hasExplicitContent { get; set; }
+
         [JsonProperty(@"video")]
         private bool hasVideo { get; set; }
 
@@ -94,6 +97,7 @@ namespace osu.Game.Online.API.Requests.Responses
                     FavouriteCount = favouriteCount,
                     BPM = bpm,
                     Status = Status,
+                    HasExplicitContent = hasExplicitContent,
                     HasVideo = hasVideo,
                     HasStoryboard = hasStoryboard,
                     Submitted = submitted,

From ee6baeb57e0d51e8d65a3c8c70e25701cc58ada8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Jan 2021 18:15:00 +0300
Subject: [PATCH 07499/10326] Add "explicit" marker pill

---
 .../BeatmapSet/ExplicitBeatmapPill.cs         | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs

diff --git a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
new file mode 100644
index 0000000000..77528c65c3
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.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 osu.Game.Graphics.Sprites;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public class ExplicitBeatmapPill : CompositeDrawable
+    {
+        public ExplicitBeatmapPill()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(OsuColour colours, OverlayColourProvider colourProvider)
+        {
+            InternalChild = new CircularContainer
+            {
+                Masking = true,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider?.Background5 ?? colours.Gray2,
+                    },
+                    new OsuSpriteText
+                    {
+                        Margin = new MarginPadding { Horizontal = 10f, Vertical = 2f },
+                        Text = "EXPLICIT",
+                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold),
+                        // todo: this is --hsl-orange-2 from the new palette in https://github.com/ppy/osu-web/blob/8ceb46f/resources/assets/less/colors.less#L128-L151,
+                        // should probably take the whole palette from there onto OsuColour for a nicer look in code.
+                        Colour = Color4.FromHsl(new Vector4(45f / 360, 0.8f, 0.6f, 1f)),
+                    }
+                }
+            };
+        }
+    }
+}

From f6637eec36a460c5551e81d5b8776c12fad0caa9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:29:30 +0300
Subject: [PATCH 07500/10326] Add explicit pill to beatmap panels

---
 .../BeatmapListing/Panels/GridBeatmapPanel.cs | 29 +++++++++++++++----
 .../BeatmapListing/Panels/ListBeatmapPanel.cs | 27 ++++++++++++++---
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index 28c36e6c56..b7002a96e5 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -14,6 +14,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays.BeatmapSet;
 using osuTK;
 using osuTK.Graphics;
 
@@ -24,7 +25,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         private const float horizontal_padding = 10;
         private const float vertical_padding = 5;
 
-        private FillFlowContainer bottomPanel, statusContainer;
+        private FillFlowContainer bottomPanel, statusContainer, titleContainer;
         private PlayButton playButton;
         private Box progressBar;
 
@@ -73,12 +74,20 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                             AutoSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Left = horizontal_padding, Right = horizontal_padding },
                             Direction = FillDirection.Vertical,
-                            Children = new[]
+                            Children = new Drawable[]
                             {
-                                new OsuSpriteText
+                                titleContainer = new FillFlowContainer
                                 {
-                                    Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
-                                    Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
+                                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                        },
+                                    }
                                 },
                                 new OsuSpriteText
                                 {
@@ -194,6 +203,16 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 },
             });
 
+            if (SetInfo.OnlineInfo?.HasExplicitContent ?? false)
+            {
+                titleContainer.Add(new ExplicitBeatmapPill
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Margin = new MarginPadding { Left = 10f, Top = 2f },
+                });
+            }
+
             if (SetInfo.OnlineInfo?.HasVideo ?? false)
             {
                 statusContainer.Add(new IconPill(FontAwesome.Solid.Film));
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 433ea37f06..69671ab75b 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -14,6 +14,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays.BeatmapSet;
 using osuTK;
 using osuTK.Graphics;
 
@@ -26,7 +27,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         private const float vertical_padding = 5;
         private const float height = 70;
 
-        private FillFlowContainer statusContainer;
+        private FillFlowContainer statusContainer, titleContainer;
         protected BeatmapPanelDownloadButton DownloadButton;
         private PlayButton playButton;
         private Box progressBar;
@@ -98,10 +99,18 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                                     Direction = FillDirection.Vertical,
                                                     Children = new Drawable[]
                                                     {
-                                                        new OsuSpriteText
+                                                        titleContainer = new FillFlowContainer
                                                         {
-                                                            Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
-                                                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                                            AutoSizeAxes = Axes.Both,
+                                                            Direction = FillDirection.Horizontal,
+                                                            Children = new[]
+                                                            {
+                                                                new OsuSpriteText
+                                                                {
+                                                                    Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
+                                                                    Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                                                },
+                                                            }
                                                         },
                                                         new OsuSpriteText
                                                         {
@@ -208,6 +217,16 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 },
             });
 
+            if (SetInfo.OnlineInfo?.HasExplicitContent ?? false)
+            {
+                titleContainer.Add(new ExplicitBeatmapPill
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Margin = new MarginPadding { Left = 10f, Top = 2f },
+                });
+            }
+
             if (SetInfo.OnlineInfo?.HasVideo ?? false)
             {
                 statusContainer.Add(new IconPill(FontAwesome.Solid.Film) { IconSize = new Vector2(20) });

From 78631323ba35174543cbb09d2c8fd4f545888077 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:32:36 +0300
Subject: [PATCH 07501/10326] Add explicit pill to beatmap overlay

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

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 321e496511..fbdee91d42 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly Box coverGradient;
         private readonly OsuSpriteText title, artist;
         private readonly AuthorInfo author;
+        private readonly ExplicitBeatmapPill explicitPill;
         private readonly FillFlowContainer downloadButtonsContainer;
         private readonly BeatmapAvailability beatmapAvailability;
         private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
@@ -146,6 +147,13 @@ namespace osu.Game.Overlays.BeatmapSet
                                                         Origin = Anchor.BottomLeft,
                                                         Margin = new MarginPadding { Left = 3, Bottom = 4 }, // To better lineup with the font
                                                     },
+                                                    explicitPill = new ExplicitBeatmapPill
+                                                    {
+                                                        Alpha = 0f,
+                                                        Anchor = Anchor.CentreLeft,
+                                                        Origin = Anchor.CentreLeft,
+                                                        Margin = new MarginPadding { Left = 10f, Top = 4 },
+                                                    }
                                                 }
                                             },
                                             artist = new OsuSpriteText
@@ -253,6 +261,8 @@ namespace osu.Game.Overlays.BeatmapSet
                     title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
                     artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
 
+                    explicitPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
+
                     onlineStatusPill.FadeIn(500, Easing.OutQuint);
                     onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
 

From 1502b07ea86d7673dbbffa2fc2ec83612ca8d81c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:33:00 +0300
Subject: [PATCH 07502/10326] Add explicit pill to playlist items

---
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index e3bce4029f..7987d715e3 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -23,6 +23,7 @@ using osu.Game.Online;
 using osu.Game.Online.Chat;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.BeatmapListing.Panels;
+using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play.HUD;
@@ -41,6 +42,7 @@ namespace osu.Game.Screens.OnlinePlay
         private Container difficultyIconContainer;
         private LinkFlowContainer beatmapText;
         private LinkFlowContainer authorText;
+        private ExplicitBeatmapPill explicitPill;
         private ModDisplay modDisplay;
 
         private readonly Bindable<BeatmapInfo> beatmap = new Bindable<BeatmapInfo>();
@@ -116,6 +118,9 @@ namespace osu.Game.Screens.OnlinePlay
                 authorText.AddUserLink(Item.Beatmap.Value?.Metadata.Author);
             }
 
+            bool hasExplicitContent = Item.Beatmap.Value.BeatmapSet.OnlineInfo?.HasExplicitContent == true;
+            explicitPill.Alpha = hasExplicitContent ? 1 : 0;
+
             modDisplay.Current.Value = requiredMods.ToArray();
         }
 
@@ -165,18 +170,37 @@ namespace osu.Game.Screens.OnlinePlay
                                 {
                                     AutoSizeAxes = Axes.Both,
                                     Direction = FillDirection.Horizontal,
-                                    Spacing = new Vector2(15, 0),
+                                    Spacing = new Vector2(10f, 0),
                                     Children = new Drawable[]
                                     {
-                                        authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
-                                        modDisplay = new ModDisplay
+                                        new FillFlowContainer
+                                        {
+                                            AutoSizeAxes = Axes.Both,
+                                            Direction = FillDirection.Horizontal,
+                                            Spacing = new Vector2(10f, 0),
+                                            Children = new Drawable[]
+                                            {
+                                                authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
+                                                explicitPill = new ExplicitBeatmapPill
+                                                {
+                                                    Alpha = 0f,
+                                                    Anchor = Anchor.CentreLeft,
+                                                    Origin = Anchor.CentreLeft,
+                                                    Margin = new MarginPadding { Top = 3f },
+                                                }
+                                            },
+                                        },
+                                        new Container
                                         {
                                             Anchor = Anchor.CentreLeft,
                                             Origin = Anchor.CentreLeft,
                                             AutoSizeAxes = Axes.Both,
-                                            Scale = new Vector2(0.4f),
-                                            DisplayUnrankedText = false,
-                                            ExpansionMode = ExpansionMode.AlwaysExpanded
+                                            Child = modDisplay = new ModDisplay
+                                            {
+                                                Scale = new Vector2(0.4f),
+                                                DisplayUnrankedText = false,
+                                                ExpansionMode = ExpansionMode.AlwaysExpanded
+                                            }
                                         }
                                     }
                                 }

From 7fd55efc434fb5522de44429cc27e27c32cd6969 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:57:29 +0300
Subject: [PATCH 07503/10326] Add test cases for displaying explicit beatmaps

---
 .../Multiplayer/TestSceneDrawableRoomPlaylist.cs      |  9 +++++++++
 .../Visual/Online/TestSceneBeatmapSetOverlay.cs       | 11 +++++++++++
 osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs  |  7 ++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 65c0cfd328..17d85d1120 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -222,6 +222,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("download buttons shown", () => playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().All(d => d.IsPresent));
         }
 
+        [Test]
+        public void TestExplicitBeatmapItem()
+        {
+            var beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo;
+            beatmap.BeatmapSet.OnlineInfo.HasExplicitContent = true;
+
+            createPlaylist(beatmap);
+        }
+
         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.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index c5d1fd6887..689321698a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -235,6 +235,17 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("left-most beatmap selected", () => overlay.Header.Picker.Difficulties.First().State == BeatmapPicker.DifficultySelectorState.Selected);
         }
 
+        [Test]
+        public void TestExplicitBeatmap()
+        {
+            AddStep("show explicit map", () =>
+            {
+                var beatmapSet = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet;
+                beatmapSet.OnlineInfo.HasExplicitContent = true;
+                overlay.ShowBeatmapSet(beatmapSet);
+            });
+        }
+
         [Test]
         public void TestHide()
         {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
index 74ece5da05..fd5f306e07 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
@@ -99,13 +99,16 @@ namespace osu.Game.Tests.Visual.Online
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
         {
-            var normal = CreateWorkingBeatmap(Ruleset.Value).BeatmapSetInfo;
+            var normal = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet;
             normal.OnlineInfo.HasVideo = true;
             normal.OnlineInfo.HasStoryboard = true;
 
             var undownloadable = getUndownloadableBeatmapSet();
             var manyDifficulties = getManyDifficultiesBeatmapSet(rulesets);
 
+            var explicitMap = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet;
+            explicitMap.OnlineInfo.HasExplicitContent = true;
+
             Child = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -121,9 +124,11 @@ namespace osu.Game.Tests.Visual.Online
                         new GridBeatmapPanel(normal),
                         new GridBeatmapPanel(undownloadable),
                         new GridBeatmapPanel(manyDifficulties),
+                        new GridBeatmapPanel(explicitMap),
                         new ListBeatmapPanel(normal),
                         new ListBeatmapPanel(undownloadable),
                         new ListBeatmapPanel(manyDifficulties),
+                        new ListBeatmapPanel(explicitMap)
                     },
                 },
             };

From f827c620813468f2c670f393c424b84e8b11f634 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:58:55 +0300
Subject: [PATCH 07504/10326] Add empty online info to test beatmap

This is for `BeatmapSetOverlay` to not eat a null reference trying to access `Beatmap.OnlineInfo`.
---
 osu.Game/Tests/Beatmaps/TestBeatmap.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index 035cb64099..fa6dc5647d 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Tests.Beatmaps
             BeatmapInfo.BeatmapSet.Files = new List<BeatmapSetFileInfo>();
             BeatmapInfo.BeatmapSet.Beatmaps = new List<BeatmapInfo> { BeatmapInfo };
             BeatmapInfo.Length = 75000;
+            BeatmapInfo.OnlineInfo = new BeatmapOnlineInfo();
             BeatmapInfo.BeatmapSet.OnlineInfo = new BeatmapSetOnlineInfo
             {
                 Status = BeatmapSetOnlineStatus.Ranked,

From 268f9d661f16c55aa1c8ebadb4f44e05baa7373a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 13:00:14 +0300
Subject: [PATCH 07505/10326] Dispose of local config on disposal

---
 .../UserInterface/TestSceneBeatmapListingSearchControl.cs   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index cb86047dea..dc46da6293 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -99,6 +99,12 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("explicit control set to hide", () => control.Explicit.Value == SearchExplicit.Hide);
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            localConfig?.Dispose();
+            base.Dispose(isDisposing);
+        }
+
         private static readonly BeatmapSetInfo beatmap_set = new BeatmapSetInfo
         {
             OnlineInfo = new BeatmapSetOnlineInfo

From 9d59d784f8674b1319a175c1edb74d079de76dfe Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 17:06:44 +0300
Subject: [PATCH 07506/10326] Add Colour{1-4} properties to
 `OverlayColourProvider`

---
 osu.Game/Overlays/OverlayColourProvider.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index 9816f313ad..f33223d7aa 100644
--- a/osu.Game/Overlays/OverlayColourProvider.cs
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -16,6 +16,11 @@ namespace osu.Game.Overlays
             this.colourScheme = colourScheme;
         }
 
+        public Color4 Colour1 => getColour(1, 0.7f);
+        public Color4 Colour2 => getColour(0.8f, 0.6f);
+        public Color4 Colour3 => getColour(0.6f, 0.5f);
+        public Color4 Colour4 => getColour(0.4f, 0.3f);
+
         public Color4 Highlight1 => getColour(1, 0.7f);
         public Color4 Content1 => getColour(0.4f, 1);
         public Color4 Content2 => getColour(0.4f, 0.9f);

From e275dd02e08ab8d9e890d2d0a2b1f822e1c53f6c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 17:07:11 +0300
Subject: [PATCH 07507/10326] Create static colour properties for now

---
 osu.Game/Overlays/OverlayColourProvider.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index f33223d7aa..abd1e43f25 100644
--- a/osu.Game/Overlays/OverlayColourProvider.cs
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -11,6 +11,13 @@ namespace osu.Game.Overlays
     {
         private readonly OverlayColourScheme colourScheme;
 
+        public static OverlayColourProvider Red { get; } = new OverlayColourProvider(OverlayColourScheme.Red);
+        public static OverlayColourProvider Pink { get; } = new OverlayColourProvider(OverlayColourScheme.Pink);
+        public static OverlayColourProvider Orange { get; } = new OverlayColourProvider(OverlayColourScheme.Orange);
+        public static OverlayColourProvider Green { get; } = new OverlayColourProvider(OverlayColourScheme.Green);
+        public static OverlayColourProvider Purple { get; } = new OverlayColourProvider(OverlayColourScheme.Purple);
+        public static OverlayColourProvider Blue { get; } = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         public OverlayColourProvider(OverlayColourScheme colourScheme)
         {
             this.colourScheme = colourScheme;

From 43daa7c7c09463acac11095bc93f304e1c20ae83 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 17:07:42 +0300
Subject: [PATCH 07508/10326] Use `Colour2` of orange theme for explicit pill

---
 osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
index 77528c65c3..ad19dffccb 100644
--- a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
+++ b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
@@ -7,8 +7,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
@@ -38,9 +36,7 @@ namespace osu.Game.Overlays.BeatmapSet
                         Margin = new MarginPadding { Horizontal = 10f, Vertical = 2f },
                         Text = "EXPLICIT",
                         Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold),
-                        // todo: this is --hsl-orange-2 from the new palette in https://github.com/ppy/osu-web/blob/8ceb46f/resources/assets/less/colors.less#L128-L151,
-                        // should probably take the whole palette from there onto OsuColour for a nicer look in code.
-                        Colour = Color4.FromHsl(new Vector4(45f / 360, 0.8f, 0.6f, 1f)),
+                        Colour = OverlayColourProvider.Orange.Colour2,
                     }
                 }
             };

From 1f12b2bd091e7968c60e6c100cc9369edd5c3973 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 18:04:29 +0300
Subject: [PATCH 07509/10326] Rename download state `Downloaded` to `Importing`

---
 osu.Game/Graphics/UserInterface/DownloadButton.cs             | 2 +-
 osu.Game/Online/DownloadState.cs                              | 2 +-
 osu.Game/Online/DownloadTrackingComposite.cs                  | 4 ++--
 .../BeatmapListing/Panels/BeatmapPanelDownloadButton.cs       | 2 +-
 .../Overlays/BeatmapListing/Panels/DownloadProgressBar.cs     | 2 +-
 osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs  | 2 +-
 osu.Game/Overlays/BeatmapSet/Header.cs                        | 2 +-
 osu.Game/Screens/Ranking/ReplayDownloadButton.cs              | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/DownloadButton.cs b/osu.Game/Graphics/UserInterface/DownloadButton.cs
index da6c95299e..5168ff646b 100644
--- a/osu.Game/Graphics/UserInterface/DownloadButton.cs
+++ b/osu.Game/Graphics/UserInterface/DownloadButton.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Graphics.UserInterface
                     TooltipText = "Downloading...";
                     break;
 
-                case DownloadState.Downloaded:
+                case DownloadState.Importing:
                     background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
                     TooltipText = "Importing";
                     break;
diff --git a/osu.Game/Online/DownloadState.cs b/osu.Game/Online/DownloadState.cs
index 72efbc286e..a58c40d16a 100644
--- a/osu.Game/Online/DownloadState.cs
+++ b/osu.Game/Online/DownloadState.cs
@@ -7,7 +7,7 @@ namespace osu.Game.Online
     {
         NotDownloaded,
         Downloading,
-        Downloaded,
+        Importing,
         LocallyAvailable
     }
 }
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index bed95344c6..7a64c9002d 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Online
             {
                 if (attachedRequest.Progress == 1)
                 {
-                    State.Value = DownloadState.Downloaded;
+                    State.Value = DownloadState.Importing;
                     Progress.Value = 1;
                 }
                 else
@@ -125,7 +125,7 @@ namespace osu.Game.Online
             }
         }
 
-        private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Downloaded);
+        private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Importing);
 
         private void onRequestProgress(float progress) => Schedule(() => Progress.Value = progress);
 
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
index 001ca801d9..cec1a5ac12 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 switch (State.Value)
                 {
                     case DownloadState.Downloading:
-                    case DownloadState.Downloaded:
+                    case DownloadState.Importing:
                         shakeContainer.Shake();
                         break;
 
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs b/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
index 93cf8799b5..6a2f2e4569 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                         progressBar.ResizeHeightTo(4, 400, Easing.OutQuint);
                         break;
 
-                    case DownloadState.Downloaded:
+                    case DownloadState.Importing:
                         progressBar.FadeIn(400, Easing.OutQuint);
                         progressBar.ResizeHeightTo(4, 400, Easing.OutQuint);
 
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
index 56c0052bfe..cffff86a64 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                         };
                         break;
 
-                    case DownloadState.Downloaded:
+                    case DownloadState.Importing:
                         textSprites.Children = new Drawable[]
                         {
                             new OsuSpriteText
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 321e496511..c17901bb3f 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -287,7 +287,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     break;
 
                 case DownloadState.Downloading:
-                case DownloadState.Downloaded:
+                case DownloadState.Importing:
                     // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
                     downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
                     break;
diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index b76842f405..18b8649a59 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Ranking
                         scores.Download(Model.Value);
                         break;
 
-                    case DownloadState.Downloaded:
+                    case DownloadState.Importing:
                     case DownloadState.Downloading:
                         shakeContainer.Shake();
                         break;

From 1ba586a683b3321cf7806d9dabf068983d0bd27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Jan 2021 17:53:01 +0100
Subject: [PATCH 07510/10326] Revert overlooked AR<8 speed buff

Pull request #11107 introduced changes in osu! performance calculation,
related to a scaling coefficient applied to the speed and aim skills.
The coefficient in question was dependent on the approach rate of
a map. During a post-merge review of that PR, it was spotted that
the scaling coefficient for speed also had a 10x buff applied for AR<8,
which could reach magnitudes as large as 80% on AR0, which seems quite
exorbitant. This change was not discussed or mentioned anywhere in the
review process.

Revert back to the old multiplier of 0.01 rather than 0.1 for AR<8. The
negative slope through AR0 to 8 is retained in its previous form.
---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index a44c97c3cf..44a9dd2f1f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (Attributes.ApproachRate > 10.33)
                 approachRateFactor += 0.4 * (Attributes.ApproachRate - 10.33);
             else if (Attributes.ApproachRate < 8.0)
-                approachRateFactor += 0.1 * (8.0 - Attributes.ApproachRate);
+                approachRateFactor += 0.01 * (8.0 - Attributes.ApproachRate);
 
             aimValue *= 1.0 + Math.Min(approachRateFactor, approachRateFactor * (totalHits / 1000.0));
 

From 1248d39d7e5fa6a7a30271a1346059594e0e021d Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 13:07:07 -0500
Subject: [PATCH 07511/10326] Reverted change to AllowConfigurationLookup and
 added a separate AllowColourLookup bool with config case based on lookup type
 in SkinProvidingContainer GetConfig call.

---
 .../Skinning/BeatmapSkinProvidingContainer.cs | 11 ++++++
 osu.Game/Skinning/SkinProvidingContainer.cs   | 34 ++++++++++++++++---
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
index c16547589d..57c08a903f 100644
--- a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
@@ -25,6 +25,17 @@ namespace osu.Game.Skinning
                 if (beatmapSkins == null)
                     throw new InvalidOperationException($"{nameof(BeatmapSkinProvidingContainer)} needs to be loaded before being consumed.");
 
+                return beatmapSkins.Value;
+            }
+        }
+
+        protected override bool AllowColourLookup
+        {
+            get
+            {
+                if (beatmapColours == null)
+                    throw new InvalidOperationException($"{nameof(BeatmapSkinProvidingContainer)} needs to be loaded before being consumed.");
+
                 return beatmapColours.Value;
             }
         }
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index adf62ed452..3232a30110 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Skinning
 
         protected virtual bool AllowConfigurationLookup => true;
 
+        protected virtual bool AllowColourLookup => true;
+
         public SkinProvidingContainer(ISkin skin)
         {
             this.skin = skin;
@@ -68,11 +70,35 @@ namespace osu.Game.Skinning
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
-            if (AllowConfigurationLookup && skin != null)
+            if (skin != null)
             {
-                var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-                if (bindable != null)
-                    return bindable;
+                switch (lookup)
+                {
+                    // todo: the GlobalSkinColours switch is pulled from LegacySkin and should not exist.
+                    // will likely change based on how databased storage of skin configuration goes.
+                    case GlobalSkinColours global:
+                        switch (global)
+                        {
+                            case GlobalSkinColours.ComboColours:
+                                var bindable = skin.GetConfig<TLookup, TValue>(lookup);
+                                if (bindable != null && AllowColourLookup)
+                                    return bindable;
+                                else
+                                    return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
+                        }
+
+                        break;
+
+                    default:
+                        if (AllowConfigurationLookup)
+                        {
+                            var bindable = skin.GetConfig<TLookup, TValue>(lookup);
+                            if (bindable != null)
+                                return bindable;
+                        }
+
+                        break;
+                }
             }
 
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);

From 95acc457aad5f08df2b7a7a4bc37af4a241ffc2d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 22:34:48 +0300
Subject: [PATCH 07512/10326] Fix stupid mistake

fuck.
---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index b6b9c632fe..e7dbc5f436 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Online.Rooms
 
         public static BeatmapAvailability NotDownloaded() => new BeatmapAvailability(DownloadState.NotDownloaded);
         public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
-        public static BeatmapAvailability Importing() => new BeatmapAvailability(DownloadState.Downloaded);
+        public static BeatmapAvailability Importing() => new BeatmapAvailability(DownloadState.Importing);
         public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);
 
         public bool Equals(BeatmapAvailability other) => other != null && State == other.State && DownloadProgress == other.DownloadProgress;

From 8b95817f7abf8f5674ffa11d37c1eb37ce259806 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 16:05:46 -0500
Subject: [PATCH 07513/10326] Moved SkinProvidingContainer bindable fetching to
 common method. Replaced redundant test boolean declarations with inline
 values.

---
 .../TestSceneLegacyBeatmapSkin.cs             | 28 +++++++++----------
 osu.Game/Skinning/SkinProvidingContainer.cs   | 24 ++++++++--------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 138182c7c4..22b028906f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -36,41 +36,41 @@ namespace osu.Game.Rulesets.Osu.Tests
             config.BindWith(OsuSetting.BeatmapColours, beatmapColours);
         }
 
-        [TestCase(true, true, true)]
-        [TestCase(true, false, true)]
-        [TestCase(false, true, true)]
-        [TestCase(false, false, true)]
-        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin, bool useBeatmapColour)
+        [TestCase(true, true)]
+        [TestCase(true, false)]
+        [TestCase(false, true)]
+        [TestCase(false, false)]
+        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
         {
             ExposedPlayer player = null;
 
-            configureSettings(useBeatmapSkin, useBeatmapColour);
+            configureSettings(useBeatmapSkin, true);
             AddStep("load coloured beatmap", () => player = loadBeatmap(userHasCustomColours, true));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
             AddAssert("is beatmap skin colours", () => player.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
         }
 
-        [TestCase(true, false)]
-        [TestCase(false, false)]
-        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin, bool useBeatmapColour)
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
         {
             ExposedPlayer player = null;
 
-            configureSettings(useBeatmapSkin, useBeatmapColour);
+            configureSettings(useBeatmapSkin, false);
             AddStep("load coloured beatmap", () => player = loadBeatmap(true, true));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
             AddAssert("is user custom skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
-        [TestCase(true, false)]
-        [TestCase(false, false)]
-        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin, bool useBeatmapColour)
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
         {
             ExposedPlayer player = null;
 
-            configureSettings(useBeatmapSkin, useBeatmapColour);
+            configureSettings(useBeatmapSkin, false);
             AddStep("load coloured beatmap", () => player = loadBeatmap(false, true));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 3232a30110..ae9a84932a 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -80,30 +80,28 @@ namespace osu.Game.Skinning
                         switch (global)
                         {
                             case GlobalSkinColours.ComboColours:
-                                var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-                                if (bindable != null && AllowColourLookup)
-                                    return bindable;
-                                else
-                                    return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
+                                return getBindable<TLookup, TValue>(lookup, AllowColourLookup);
                         }
 
                         break;
 
                     default:
-                        if (AllowConfigurationLookup)
-                        {
-                            var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-                            if (bindable != null)
-                                return bindable;
-                        }
-
-                        break;
+                        return getBindable<TLookup, TValue>(lookup, AllowConfigurationLookup);
                 }
             }
 
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
         }
 
+        private IBindable<TValue> getBindable<TLookup, TValue>(TLookup lookup, bool bindableReturnCheck)
+        {
+            var bindable = skin.GetConfig<TLookup, TValue>(lookup);
+            if (bindable != null && bindableReturnCheck)
+                return bindable;
+            else
+                return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
+        }
+
         protected virtual void TriggerSourceChanged() => SourceChanged?.Invoke();
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)

From 562634dfd2de90736dfb812c9d8834c0c97bcb4c Mon Sep 17 00:00:00 2001
From: Jesse Myers <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 16:49:14 -0500
Subject: [PATCH 07514/10326] Improve naming around the config lookup with
 fallback private method.
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/Skinning/SkinProvidingContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index ae9a84932a..2dc19667e4 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -93,10 +93,10 @@ namespace osu.Game.Skinning
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
         }
 
-        private IBindable<TValue> getBindable<TLookup, TValue>(TLookup lookup, bool bindableReturnCheck)
+        private IBindable<TValue> lookupWithFallback<TLookup, TValue>(TLookup lookup, bool canUseSkinLookup)
         {
             var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-            if (bindable != null && bindableReturnCheck)
+            if (bindable != null && canUseSkinLookup)
                 return bindable;
             else
                 return fallbackSource?.GetConfig<TLookup, TValue>(lookup);

From abf718242b11519825228a2f6098dff745231608 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 14 Jan 2021 05:40:43 +0300
Subject: [PATCH 07515/10326] Make explicit marker font semi-bold

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

diff --git a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
index ad19dffccb..aefb3299a5 100644
--- a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
+++ b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     {
                         Margin = new MarginPadding { Horizontal = 10f, Vertical = 2f },
                         Text = "EXPLICIT",
-                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold),
+                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
                         Colour = OverlayColourProvider.Orange.Colour2,
                     }
                 }

From 6281c1086ac377503c89a5648608e47ab6b71e89 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 14 Jan 2021 05:41:09 +0300
Subject: [PATCH 07516/10326] Space out explicit marker in beatmap overlay

---
 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 fbdee91d42..9f2b40dfa4 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                                         Alpha = 0f,
                                                         Anchor = Anchor.CentreLeft,
                                                         Origin = Anchor.CentreLeft,
-                                                        Margin = new MarginPadding { Left = 10f, Top = 4 },
+                                                        Margin = new MarginPadding { Left = 15f, Top = 4 },
                                                     }
                                                 }
                                             },

From d5878db615ef55e87b9e39e22b480610f12cdf6c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 14 Jan 2021 12:33:33 +0900
Subject: [PATCH 07517/10326] Fix default judgement text mispositioned for one
 frame

---
 osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index d94346cb72..21ac017685 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Rulesets.Judgements
             {
                 JudgementText = new OsuSpriteText
                 {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Text = Result.GetDescription().ToUpperInvariant(),
                     Colour = colours.ForHitResult(Result),
                     Font = OsuFont.Numeric.With(size: 20),

From 8a0b975d71d08f6a845b10b46aec50d714d00c68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Jan 2021 18:25:32 +0900
Subject: [PATCH 07518/10326] Fix deadlock scenario when calculating fallback
 difficulty

The previous code would run a calcaulation for the beatmap's own ruleset
if the current one failed. While this does make sense, with the current
way we use this component (and the implementation flow) it is quite unsafe.

The to the call on `.Result` in the `catch` block, this would 100%
deadlock due to the thread concurrency of the `ThreadedTaskScheduler`
being 1. Even if the nested run could be run inline (it should be), the
task scheduler won't even get to the point of checking whether this is
feasible due to it being saturated by the already running task.

I'm not sure if we still need this fallback lookup logic. After removing
it, it's feasible that 0 stars will be returned during the scenario that
previously caused a deadlock, but I don't necessarily think this is
incorrect. There may be another reason for this needing to exist which
I'm not aware of (diffcalc?) but if that's the case we may want to move
the try-catch handling to the point of usage.

To reproduce the deadlock scenario with 100% success (the repro
instructions in the linked issue aren't that simple and require some
patience and good timing), the main portion of the lookup can be changed
to randomly trigger a nested lookup:

```
if (RNG.NextSingle() > 0.5f)
    return GetAsync(new
DifficultyCacheLookup(key.Beatmap, key.Beatmap.Ruleset,
key.OrderedMods)).Result;
else
    return new StarDifficulty(attributes);
```

After switching beatmap once or twice, pausing debug and viewing the
state of threads should show exactly what is going on.
---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 3b58062add..37d262abe5 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -260,17 +260,10 @@ namespace osu.Game.Beatmaps
             }
             catch (BeatmapInvalidForRulesetException e)
             {
-                // Conversion has failed for the given ruleset, so return the difficulty in the beatmap's default ruleset.
-
-                // Ensure the beatmap's default ruleset isn't the one already being converted to.
-                // This shouldn't happen as it means something went seriously wrong, but if it does an endless loop should be avoided.
                 if (rulesetInfo.Equals(beatmapInfo.Ruleset))
-                {
                     Logger.Error(e, $"Failed to convert {beatmapInfo.OnlineBeatmapID} to the beatmap's default ruleset ({beatmapInfo.Ruleset}).");
-                    return new StarDifficulty();
-                }
 
-                return GetAsync(new DifficultyCacheLookup(key.Beatmap, key.Beatmap.Ruleset, key.OrderedMods)).Result;
+                return new StarDifficulty();
             }
             catch
             {

From 99e43c77c23709c90100cea34210c5a2d054a206 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Thu, 14 Jan 2021 16:53:55 -0500
Subject: [PATCH 07519/10326] Simplified colour config checks in
 SkinProvidingContainer.cs

---
 osu.Game/Skinning/SkinProvidingContainer.cs | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 2dc19667e4..d2645eff68 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
@@ -72,22 +73,12 @@ namespace osu.Game.Skinning
         {
             if (skin != null)
             {
-                switch (lookup)
-                {
-                    // todo: the GlobalSkinColours switch is pulled from LegacySkin and should not exist.
-                    // will likely change based on how databased storage of skin configuration goes.
-                    case GlobalSkinColours global:
-                        switch (global)
-                        {
-                            case GlobalSkinColours.ComboColours:
-                                return getBindable<TLookup, TValue>(lookup, AllowColourLookup);
-                        }
+                TValue tValueTypeCheck = default;
 
-                        break;
-
-                    default:
-                        return getBindable<TLookup, TValue>(lookup, AllowConfigurationLookup);
-                }
+                if (lookup is GlobalSkinColours || tValueTypeCheck is Color4)
+                    return lookupWithFallback<TLookup, TValue>(lookup, AllowColourLookup);
+                else
+                    return lookupWithFallback<TLookup, TValue>(lookup, AllowConfigurationLookup);
             }
 
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);

From dc8e38cf4d8dfcdb0a33a6d4c73147ce43fe4c05 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 15 Jan 2021 07:20:13 +0300
Subject: [PATCH 07520/10326] Remove pointless inline comment

---
 osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 3761aee312..5c6267b726 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -151,7 +151,6 @@ namespace osu.Game.Overlays.BeatmapListing
             allowExplicitContent = config.GetBindable<bool>(OsuSetting.AllowExplicitContent);
             allowExplicitContent.BindValueChanged(allow =>
             {
-                // Update search control if global "explicit allowed" setting changed.
                 Explicit.Value = allow.NewValue ? SearchExplicit.Show : SearchExplicit.Hide;
             }, true);
         }

From 4cccde9007cdb1646f041da71d77184c51f490d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 13:20:46 +0900
Subject: [PATCH 07521/10326] 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 492c88c7e4..919d83f8db 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.106.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.115.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ff016199d3..ac014f2964 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -28,7 +28,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="2021.106.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.115.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 93be3645ee..799042626b 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.Framework.iOS" Version="2021.106.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.115.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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="2021.106.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.115.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 0c01a3a685c9ba1ca5c29f5e124043780c9f1d61 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Thu, 14 Jan 2021 23:30:24 -0500
Subject: [PATCH 07522/10326] Found a better solution than TValue type checking
 for additional beatmap colour settings. Added unit tests for Catch Beatmap
 Skin settings.

---
 .../TestSceneLegacyBeatmapSkin.cs             | 360 ++++++++++++++++++
 osu.Game/Skinning/SkinProvidingContainer.cs   |   5 +-
 2 files changed, 361 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
new file mode 100644
index 0000000000..12ceaaa6fa
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -0,0 +1,360 @@
+// Copyright (c) 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;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Skinning;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public class TestSceneLegacyBeatmapSkin : ScreenTestScene
+    {
+        [Resolved]
+        private AudioManager audio { get; set; }
+
+        private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
+        private readonly Bindable<bool> beatmapColours = new Bindable<bool>();
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
+            config.BindWith(OsuSetting.BeatmapColours, beatmapColours);
+        }
+
+        [TestCase(true, true)]
+        [TestCase(true, false)]
+        [TestCase(false, true)]
+        [TestCase(false, false)]
+        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, true);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(userHasCustomColours, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is beatmap skin colours", () => player.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, false);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(true, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is user custom skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, false);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(false, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+        }
+
+        [TestCase(true, true)]
+        [TestCase(false, true)]
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, useBeatmapColour);
+            AddStep("load no-colour beatmap", () => player = loadBeatmap(false, false));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+        }
+
+        [TestCase(true, true)]
+        [TestCase(false, true)]
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, useBeatmapColour);
+            AddStep("load custom-skin colour", () => player = loadBeatmap(true, false));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is custom user skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapHyperDashColours(bool useBeatmapSkin)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, true);
+            AddStep("load custom-skin colour", () => player = loadBeatmap(true, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is custom hyper dash colours", () => player.UsableHyperDashColour == TestBeatmapSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => player.UsableHyperDashAfterImageColour == TestBeatmapSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => player.UsableHyperDashFruitColour == TestBeatmapSkin.HYPER_DASH_FRUIT_COLOUR);
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapHyperDashColoursOverride(bool useBeatmapSkin)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, false);
+            AddStep("load custom-skin colour", () => player = loadBeatmap(true, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is custom hyper dash colours", () => player.UsableHyperDashColour == TestSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => player.UsableHyperDashAfterImageColour == TestSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => player.UsableHyperDashFruitColour == TestSkin.HYPER_DASH_FRUIT_COLOUR);
+        }
+
+        private ExposedPlayer loadBeatmap(bool userHasCustomColours, bool beatmapHasColours)
+        {
+            ExposedPlayer player;
+
+            Beatmap.Value = new CustomSkinWorkingBeatmap(audio, beatmapHasColours);
+
+            LoadScreen(player = new ExposedPlayer(userHasCustomColours));
+
+            return player;
+        }
+
+        private void configureSettings(bool beatmapSkins, bool beatmapColours)
+        {
+            AddStep($"{(beatmapSkins ? "enable" : "disable")} beatmap skins", () =>
+            {
+                this.beatmapSkins.Value = beatmapSkins;
+            });
+            AddStep($"{(beatmapColours ? "enable" : "disable")} beatmap colours", () =>
+            {
+                this.beatmapColours.Value = beatmapColours;
+            });
+        }
+
+        private class ExposedPlayer : Player
+        {
+            private readonly bool userHasCustomColours;
+
+            public ExposedPlayer(bool userHasCustomColours)
+                : base(new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+                this.userHasCustomColours = userHasCustomColours;
+            }
+
+            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            {
+                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+                dependencies.CacheAs<ISkinSource>(new TestSkin(userHasCustomColours));
+                return dependencies;
+            }
+
+            public IReadOnlyList<Color4> UsableComboColours =>
+                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
+                                      .First()
+                                      .GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+
+            public Color4 UsableHyperDashColour =>
+                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
+                                      .First()
+                                      .GetConfig<SkinCustomColourLookup, Color4>(new SkinCustomColourLookup(CatchSkinColour.HyperDash))?
+                                      .Value ?? Color4.Red;
+
+            public Color4 UsableHyperDashAfterImageColour =>
+                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
+                                      .First()
+                                      .GetConfig<SkinCustomColourLookup, Color4>(new SkinCustomColourLookup(CatchSkinColour.HyperDashAfterImage))?
+                                      .Value ?? Color4.Red;
+
+            public Color4 UsableHyperDashFruitColour =>
+                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
+                                      .First()
+                                      .GetConfig<SkinCustomColourLookup, Color4>(new SkinCustomColourLookup(CatchSkinColour.HyperDashFruit))?
+                                      .Value ?? Color4.Red;
+        }
+
+        private class TestJuiceStream : JuiceStream
+        {
+            public TestJuiceStream(float x)
+            {
+                X = x;
+
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(Vector2.Zero),
+                    new PathControlPoint(new Vector2(30, 0)),
+                });
+            }
+        }
+
+        private class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
+        {
+            private readonly bool hasColours;
+
+            public CustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
+                : base(createBeatmap(new CatchRuleset().RulesetInfo), null, null, audio)
+            {
+                this.hasColours = hasColours;
+            }
+
+            protected override ISkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, hasColours);
+
+            private static IBeatmap createBeatmap(RulesetInfo ruleset)
+            {
+                var beatmap = new Beatmap
+                {
+                    BeatmapInfo =
+                    {
+                        Ruleset = ruleset,
+                        BaseDifficulty = new BeatmapDifficulty { CircleSize = 3.6f }
+                    }
+                };
+
+                beatmap.ControlPointInfo.Add(0, new TimingControlPoint());
+
+                // Should produce a hyper-dash (edge case test)
+                beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56, NewCombo = true });
+                beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308, NewCombo = true });
+
+                double startTime = 3000;
+
+                const float left_x = 0.02f * CatchPlayfield.WIDTH;
+                const float right_x = 0.98f * CatchPlayfield.WIDTH;
+
+                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);
+
+                beatmap.ControlPointInfo.Add(startTime, new TimingControlPoint
+                {
+                    BeatLength = 50
+                });
+
+                createObjects(() => new TestJuiceStream(left_x)
+                {
+                    Path = new SliderPath(new[]
+                    {
+                        new PathControlPoint(Vector2.Zero),
+                        new PathControlPoint(new Vector2(512, 0))
+                    })
+                }, 1);
+
+                return beatmap;
+
+                void createObjects(Func<CatchHitObject> createObject, int count = 3)
+                {
+                    const float spacing = 140;
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        var hitObject = createObject();
+                        hitObject.StartTime = startTime + i * spacing;
+                        beatmap.HitObjects.Add(hitObject);
+                    }
+
+                    startTime += 700;
+                }
+            }
+        }
+
+        private class TestBeatmapSkin : LegacyBeatmapSkin
+        {
+            public static Color4[] Colours { get; } =
+            {
+                new Color4(50, 100, 150, 255),
+                new Color4(40, 80, 120, 255),
+            };
+
+            public static readonly Color4 HYPER_DASH_COLOUR = Color4.DarkBlue;
+
+            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.DarkCyan;
+
+            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.DarkGoldenrod;
+
+            public TestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
+                : base(beatmap, new ResourceStore<byte[]>(), null)
+            {
+                if (hasColours)
+                {
+                    Configuration.AddComboColours(Colours);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
+                }
+            }
+        }
+
+        private class TestSkin : LegacySkin, ISkinSource
+        {
+            public static Color4[] Colours { get; } =
+            {
+                new Color4(150, 100, 50, 255),
+                new Color4(20, 20, 20, 255),
+            };
+
+            public static readonly Color4 HYPER_DASH_COLOUR = Color4.LightBlue;
+
+            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.LightCoral;
+
+            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.LightCyan;
+
+            public TestSkin(bool hasCustomColours)
+                : base(new SkinInfo(), new ResourceStore<byte[]>(), null, string.Empty)
+            {
+                if (hasCustomColours)
+                {
+                    Configuration.AddComboColours(Colours);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
+                }
+            }
+
+            public event Action SourceChanged
+            {
+                add { }
+                remove { }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index d2645eff68..e97822b86e 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
@@ -73,9 +72,7 @@ namespace osu.Game.Skinning
         {
             if (skin != null)
             {
-                TValue tValueTypeCheck = default;
-
-                if (lookup is GlobalSkinColours || tValueTypeCheck is Color4)
+                if (lookup is GlobalSkinColours || lookup is SkinCustomColourLookup)
                     return lookupWithFallback<TLookup, TValue>(lookup, AllowColourLookup);
                 else
                     return lookupWithFallback<TLookup, TValue>(lookup, AllowConfigurationLookup);

From 0a65ae8f1ef72f883e9f1e324bf3cd622bd321d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 14:07:24 +0900
Subject: [PATCH 07523/10326] Fix the beatmap carousel playing the difficulty
 change sample on beatmap change

---
 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 40db04ae71..6c0bd3a228 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -500,7 +500,7 @@ namespace osu.Game.Screens.Select
 
                     if (beatmap != null)
                     {
-                        if (beatmap.BeatmapSetInfoID == beatmapNoDebounce?.BeatmapSetInfoID)
+                        if (beatmap.BeatmapSetInfoID == previous?.BeatmapInfo.BeatmapSetInfoID)
                             sampleChangeDifficulty.Play();
                         else
                             sampleChangeBeatmap.Play();

From c6e9a6cd5a3d990b2c72fab3f82148cd65dfb6fe Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 Jan 2021 14:28:49 +0900
Subject: [PATCH 07524/10326] Make most common BPM more accurate

---
 osu.Game/Beatmaps/Beatmap.cs                  | 38 +++++++++++++++++++
 osu.Game/Beatmaps/BeatmapManager.cs           |  2 +-
 .../ControlPoints/ControlPointInfo.cs         |  7 ----
 osu.Game/Beatmaps/IBeatmap.cs                 |  5 +++
 osu.Game/Screens/Edit/EditorBeatmap.cs        |  2 +
 osu.Game/Screens/Play/GameplayBeatmap.cs      |  2 +
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   |  2 +-
 7 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index be2006e67a..410fd5e92e 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -48,6 +48,44 @@ namespace osu.Game.Beatmaps
 
         public virtual IEnumerable<BeatmapStatistic> GetStatistics() => Enumerable.Empty<BeatmapStatistic>();
 
+        public double GetMostCommonBeatLength()
+        {
+            // The last playable time in the beatmap - the last timing point extends to this time.
+            // Note: This is more accurate and may present different results because osu-stable didn't have the ability to calculate slider durations in this context.
+            double lastTime = HitObjects.LastOrDefault()?.GetEndTime() ?? ControlPointInfo.TimingPoints.LastOrDefault()?.Time ?? 0;
+
+            var beatLengthsAndDurations =
+                // Construct a set of (beatLength, duration) tuples for each individual timing point.
+                ControlPointInfo.TimingPoints.Select((t, i) =>
+                                {
+                                    if (t.Time > lastTime)
+                                        return (beatLength: t.BeatLength, 0);
+
+                                    var nextTime = i == ControlPointInfo.TimingPoints.Count - 1 ? lastTime : ControlPointInfo.TimingPoints[i + 1].Time;
+                                    return (beatLength: t.BeatLength, duration: nextTime - t.Time);
+                                })
+                                // Aggregate durations into a set of (beatLength, duration) tuples for each beat length
+                                .GroupBy(t => t.beatLength)
+                                .Select(g => (beatLength: g.Key, duration: g.Sum(t => t.duration)))
+                                // And if there are no timing points, use a default.
+                                .DefaultIfEmpty((TimingControlPoint.DEFAULT_BEAT_LENGTH, 0));
+
+            // Find the single beat length with the maximum aggregate duration.
+            double maxDurationBeatLength = double.NegativeInfinity;
+            double maxDuration = double.NegativeInfinity;
+
+            foreach (var (beatLength, duration) in beatLengthsAndDurations)
+            {
+                if (duration > maxDuration)
+                {
+                    maxDuration = duration;
+                    maxDurationBeatLength = beatLength;
+                }
+            }
+
+            return 60000 / maxDurationBeatLength;
+        }
+
         IBeatmap IBeatmap.Clone() => Clone();
 
         public Beatmap<T> Clone()
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 42418e532b..0d4cc38ac3 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -451,7 +451,7 @@ namespace osu.Game.Beatmaps
                     // TODO: this should be done in a better place once we actually need to dynamically update it.
                     beatmap.BeatmapInfo.StarDifficulty = ruleset?.CreateInstance().CreateDifficultyCalculator(new DummyConversionBeatmap(beatmap)).Calculate().StarRating ?? 0;
                     beatmap.BeatmapInfo.Length = calculateLength(beatmap);
-                    beatmap.BeatmapInfo.BPM = beatmap.ControlPointInfo.BPMMode;
+                    beatmap.BeatmapInfo.BPM = beatmap.GetMostCommonBeatLength();
 
                     beatmapInfos.Add(beatmap.BeatmapInfo);
                 }
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index e8a91e4001..5cc60a5758 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -101,13 +101,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         public double BPMMinimum =>
             60000 / (TimingPoints.OrderByDescending(c => c.BeatLength).FirstOrDefault() ?? TimingControlPoint.DEFAULT).BeatLength;
 
-        /// <summary>
-        /// Finds the mode BPM (most common BPM) represented by the control points.
-        /// </summary>
-        [JsonIgnore]
-        public double BPMMode =>
-            60000 / (TimingPoints.GroupBy(c => c.BeatLength).OrderByDescending(grp => grp.Count()).FirstOrDefault()?.FirstOrDefault() ?? TimingControlPoint.DEFAULT).BeatLength;
-
         /// <summary>
         /// Remove all <see cref="ControlPointGroup"/>s and return to a pristine state.
         /// </summary>
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 8f27e0b0e9..aaca8f7658 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -47,6 +47,11 @@ namespace osu.Game.Beatmaps
         /// <returns></returns>
         IEnumerable<BeatmapStatistic> GetStatistics();
 
+        /// <summary>
+        /// Finds the most common beat length represented by the control points in this beatmap.
+        /// </summary>
+        double GetMostCommonBeatLength();
+
         /// <summary>
         /// Creates a shallow-clone of this beatmap and returns it.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 165d2ba278..0e9008ba68 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -84,6 +84,8 @@ namespace osu.Game.Screens.Edit
 
         public IEnumerable<BeatmapStatistic> GetStatistics() => PlayableBeatmap.GetStatistics();
 
+        public double GetMostCommonBeatLength() => PlayableBeatmap.GetMostCommonBeatLength();
+
         public IBeatmap Clone() => (EditorBeatmap)MemberwiseClone();
 
         private IList mutableHitObjects => (IList)PlayableBeatmap.HitObjects;
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 64894544f4..53c1360bfa 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Screens.Play
 
         public IEnumerable<BeatmapStatistic> GetStatistics() => PlayableBeatmap.GetStatistics();
 
+        public double GetMostCommonBeatLength() => PlayableBeatmap.GetMostCommonBeatLength();
+
         public IBeatmap Clone() => PlayableBeatmap.Clone();
 
         private readonly Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 04c1f6efe4..abcd697d85 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -391,7 +391,7 @@ namespace osu.Game.Screens.Select
                 if (Precision.AlmostEquals(bpmMin, bpmMax))
                     return $"{bpmMin:0}";
 
-                return $"{bpmMin:0}-{bpmMax:0} (mostly {beatmap.ControlPointInfo.BPMMode:0})";
+                return $"{bpmMin:0}-{bpmMax:0} (mostly {beatmap.GetMostCommonBeatLength():0})";
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)

From 24e991a5ef9c1797e4bebddf1d0a2f623845a40f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 Jan 2021 14:32:06 +0900
Subject: [PATCH 07525/10326] Actually return beat length and not BPM

---
 osu.Game/Beatmaps/Beatmap.cs                | 2 +-
 osu.Game/Beatmaps/BeatmapManager.cs         | 2 +-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 410fd5e92e..4e2e9eb96d 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            return 60000 / maxDurationBeatLength;
+            return maxDurationBeatLength;
         }
 
         IBeatmap IBeatmap.Clone() => Clone();
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 0d4cc38ac3..b934ac556d 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -451,7 +451,7 @@ namespace osu.Game.Beatmaps
                     // TODO: this should be done in a better place once we actually need to dynamically update it.
                     beatmap.BeatmapInfo.StarDifficulty = ruleset?.CreateInstance().CreateDifficultyCalculator(new DummyConversionBeatmap(beatmap)).Calculate().StarRating ?? 0;
                     beatmap.BeatmapInfo.Length = calculateLength(beatmap);
-                    beatmap.BeatmapInfo.BPM = beatmap.GetMostCommonBeatLength();
+                    beatmap.BeatmapInfo.BPM = 60000 / beatmap.GetMostCommonBeatLength();
 
                     beatmapInfos.Add(beatmap.BeatmapInfo);
                 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index abcd697d85..86cb561bc7 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -391,7 +391,7 @@ namespace osu.Game.Screens.Select
                 if (Precision.AlmostEquals(bpmMin, bpmMax))
                     return $"{bpmMin:0}";
 
-                return $"{bpmMin:0}-{bpmMax:0} (mostly {beatmap.GetMostCommonBeatLength():0})";
+                return $"{bpmMin:0}-{bpmMax:0} (mostly {60000 / beatmap.GetMostCommonBeatLength():0})";
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)

From ebbc32adfa9c4652cadff32dc5c429af9867ff09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 14:51:26 +0900
Subject: [PATCH 07526/10326] Change conditional used to decide legacy
 judgement animation to match stable

In stable, the type of legacy judgement to show is based on the presence
of particle textures in the skin. We were using the skin version
instead, which turns out to be incorrect and not what some user skins
expect.

Closes #11078.
---
 osu.Game/Skinning/LegacySkin.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e4e5bf2f75..7397e3d08b 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -378,8 +378,12 @@ namespace osu.Game.Skinning
                     // kind of wasteful that we throw this away, but should do for now.
                     if (createDrawable() != null)
                     {
-                        if (Configuration.LegacyVersion > 1)
-                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, getParticleTexture(resultComponent.Component));
+                        var particle = getParticleTexture(resultComponent.Component);
+
+                        if (particle != null)
+                        {
+                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, particle);
+                        }
                         else
                             return new LegacyJudgementPieceOld(resultComponent.Component, createDrawable);
                     }

From 86f66727de47175b8045523c56f719a8051041a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 13:29:37 +0900
Subject: [PATCH 07527/10326] Update KeyBinding usages in line with interface
 changes

---
 osu.Game/Database/OsuDbContext.cs                       | 2 ++
 osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs | 2 +-
 osu.Game/Input/Bindings/GlobalActionContainer.cs        | 2 +-
 osu.Game/Input/KeyBindingStore.cs                       | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index 2ae07b3cf8..2aae62edea 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -135,6 +135,8 @@ namespace osu.Game.Database
 
             modelBuilder.Entity<DatabasedKeyBinding>().HasIndex(b => new { b.RulesetID, b.Variant });
             modelBuilder.Entity<DatabasedKeyBinding>().HasIndex(b => b.IntAction);
+            modelBuilder.Entity<DatabasedKeyBinding>().Ignore(b => b.KeyCombination);
+            modelBuilder.Entity<DatabasedKeyBinding>().Ignore(b => b.Action);
 
             modelBuilder.Entity<DatabasedSetting>().HasIndex(b => new { b.RulesetID, b.Variant });
 
diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index 94edc33099..d12eaa10f6 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Input.Bindings
 
         private KeyBindingStore store;
 
-        public override IEnumerable<KeyBinding> DefaultKeyBindings => ruleset.CreateInstance().GetDefaultKeyBindings(variant ?? 0);
+        public override IEnumerable<IKeyBinding> DefaultKeyBindings => ruleset.CreateInstance().GetDefaultKeyBindings(variant ?? 0);
 
         /// <summary>
         /// Create a new instance.
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index b8c2fa201f..8ccdb9249e 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Input.Bindings
                 handler = game;
         }
 
-        public override IEnumerable<KeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings).Concat(EditorKeyBindings);
+        public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings).Concat(EditorKeyBindings);
 
         public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {
diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index bc73d74d74..b25b00eb84 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Input
             }
         }
 
-        private void insertDefaults(IEnumerable<KeyBinding> defaults, int? rulesetId = null, int? variant = null)
+        private void insertDefaults(IEnumerable<IKeyBinding> defaults, int? rulesetId = null, int? variant = null)
         {
             using (var usage = ContextFactory.GetForWrite())
             {

From 51255033e24c2afbbac85573ef5e7edf610eb920 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 13:41:35 +0900
Subject: [PATCH 07528/10326] Update some missed usages of KeyBindingContainer
 in tests

---
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs    | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs   | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index b2ad7ca5b4..802dbf2021 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -244,7 +244,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
             {
-                public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+                public override IEnumerable<IKeyBinding> DefaultKeyBindings => new[]
                 {
                     new KeyBinding(InputKey.MouseLeft, TestAction.Down),
                 };
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
index 40c4214749..6e338b7202 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
@@ -179,7 +179,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
         {
-            public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+            public override IEnumerable<IKeyBinding> DefaultKeyBindings => new[]
             {
                 new KeyBinding(InputKey.MouseLeft, TestAction.Down),
             };
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index b9ff95cb29..8278ff9adf 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -303,7 +303,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
             {
-                public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+                public override IEnumerable<IKeyBinding> DefaultKeyBindings => new[]
                 {
                     new KeyBinding(InputKey.MouseLeft, TestAction.Down),
                 };

From f42a6270bbd750e2539ddad3ff97c0adb29ee521 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 14:53:55 +0900
Subject: [PATCH 07529/10326] Update framework (again) for native libs fix

---
 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 919d83f8db..db5c933c41 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.115.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.115.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ac014f2964..5e9e90c78f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -28,7 +28,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="2021.115.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.115.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 799042626b..225cf981f2 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.Framework.iOS" Version="2021.115.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.115.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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="2021.115.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.115.1" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From e0a4a666c8e5fa8224fae065d3597b49fa747103 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 15:01:16 +0900
Subject: [PATCH 07530/10326] Remove unnecessary workaround (mentioned package
 is pinned by SignalR to a working version)

---
 osu.Game/osu.Game.csproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5e9e90c78f..301ee39a61 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,8 +18,6 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <!-- WorkaroundWorkaround for a System.IO.FileNotFoundException on startup. Required because of old EF Core version. -->
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />

From 7c612ec5561225b2a618bf11915aa693e20e7cf6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 15:11:03 +0900
Subject: [PATCH 07531/10326] Remove global.json

---
 global.json | 10 ----------
 osu.sln     |  1 -
 2 files changed, 11 deletions(-)
 delete mode 100644 global.json

diff --git a/global.json b/global.json
deleted file mode 100644
index f5aaffcd3d..0000000000
--- a/global.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false,
-    "rollForward": "minor",
-    "version": "5.0.100"
-  },
-  "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "3.0.2"
-  }
-}
\ No newline at end of file
diff --git a/osu.sln b/osu.sln
index 1d64f6ff10..c9453359b1 100644
--- a/osu.sln
+++ b/osu.sln
@@ -57,7 +57,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
-		global.json = global.json
 		osu.Android.props = osu.Android.props
 		osu.iOS.props = osu.iOS.props
 		CodeAnalysis\osu.ruleset = CodeAnalysis\osu.ruleset

From 3f8834030416aeb80f5746a37999a83c16064d86 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 15:17:38 +0900
Subject: [PATCH 07532/10326] Restore previous exception handling flow for
 stable path lookup

---
 osu.Desktop/OsuGameDesktop.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 55e42b160e..d1515acafa 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -59,10 +59,14 @@ namespace osu.Desktop
 
             if (OperatingSystem.IsWindows())
             {
-                stableInstallPath = getStableInstallPathFromRegistry();
+                try
+                {
+                    stableInstallPath = getStableInstallPathFromRegistry();
 
-                if (checkExists(stableInstallPath))
-                    return stableInstallPath;
+                    if (!string.IsNullOrEmpty(stableInstallPath) && checkExists(stableInstallPath))
+                        return stableInstallPath;
+                }
+                catch { }
             }
 
             stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");

From d023ad8ad1a03b500f13b90ca5d1d24a75e182ea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 15:18:29 +0900
Subject: [PATCH 07533/10326] Remove assert messages

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 8278ff9adf..35b3bfc1f8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
-                        Debug.Assert(args.NewItems != null, "args.NewItems != null");
+                        Debug.Assert(args.NewItems != null);
 
                         foreach (int user in args.NewItems)
                         {
@@ -86,7 +86,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
-                        Debug.Assert(args.OldItems != null, "args.OldItems != null");
+                        Debug.Assert(args.OldItems != null);
 
                         foreach (int user in args.OldItems)
                         {

From b8c85ef017184b8672adb80401375bd3c8c8e224 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 16:03:12 +0900
Subject: [PATCH 07534/10326] Revert polling changes to fix participant list
 display

It turns out this polling was necessary to get extra data that isn't
included in the main listing request. It was removed deemed useless, and
in order to fix the order of rooms changing when selecting a room.
Weirdly, I can't reproduce this happening any more, and on close
inspection of the code can't see how it could happen in the first place.

For now, let's revert this change and iterate from there, if/when the
same issue arises again.

I've discussed avoiding this second poll by potentially including more
data (just `user_id`s?) in the main listing request, but not 100% sure
on this - even if the returned data is minimal it's an extra join
server-side, which could cause performance issues for large numbers of
rooms.
---
 .../TestSceneMultiplayerRoomManager.cs        |  1 +
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  5 +++-
 .../Multiplayer/MultiplayerRoomManager.cs     | 28 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 80d1acd145..7a3845cbf3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -143,6 +143,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 RoomManager =
                 {
                     TimeBetweenListingPolls = { Value = 1 },
+                    TimeBetweenSelectionPolls = { Value = 1 }
                 }
             };
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 310617a0bc..76f5c74433 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
             {
                 multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
@@ -40,16 +41,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 {
                     case LoungeSubScreen _:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     // Don't poll inside the match or anywhere else.
                     default:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 5c327266a3..3cb263298f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private StatefulMultiplayerClient multiplayerClient { get; set; }
 
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
-
+        public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
         private readonly Bindable<bool> allowPolling = new Bindable<bool>();
 
@@ -119,6 +119,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
                 AllowPolling = { BindTarget = allowPolling }
             },
+            new MultiplayerSelectionPollingComponent
+            {
+                TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
+                AllowPolling = { BindTarget = allowPolling }
+            }
         };
 
         private class MultiplayerListingPollingComponent : ListingPollingComponent
@@ -141,5 +146,26 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
         }
+
+        private class MultiplayerSelectionPollingComponent : SelectionPollingComponent
+        {
+            public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                AllowPolling.BindValueChanged(allowPolling =>
+                {
+                    if (!allowPolling.NewValue)
+                        return;
+
+                    if (IsLoaded)
+                        PollImmediately();
+                });
+            }
+
+            protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
+        }
     }
 }

From ede5abdba4eb0f88806c38790c7a622546f70af9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 18:05:29 +0900
Subject: [PATCH 07535/10326] Fix unstable multiplayer room ordering when
 selection is made

---
 .../OnlinePlay/Components/SelectionPollingComponent.cs       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
index 0eec155060..dcf3c94b76 100644
--- a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -47,9 +48,11 @@ namespace osu.Game.Screens.OnlinePlay.Components
 
             pollReq.Success += result =>
             {
-                var rooms = new List<Room>(roomManager.Rooms);
+                // existing rooms need to be ordered by their position because the received of NotifyRoomsReceives expects to be able to sort them based on this order.
+                var rooms = new List<Room>(roomManager.Rooms.OrderBy(r => r.Position.Value));
 
                 int index = rooms.FindIndex(r => r.RoomID.Value == result.RoomID.Value);
+
                 if (index < 0)
                     return;
 

From 2b578e97e532fc0bb215566b8bd34df25d1d4625 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Jan 2021 18:25:32 +0900
Subject: [PATCH 07536/10326] Fix deadlock scenario when calculating fallback
 difficulty

The previous code would run a calcaulation for the beatmap's own ruleset
if the current one failed. While this does make sense, with the current
way we use this component (and the implementation flow) it is quite unsafe.

The to the call on `.Result` in the `catch` block, this would 100%
deadlock due to the thread concurrency of the `ThreadedTaskScheduler`
being 1. Even if the nested run could be run inline (it should be), the
task scheduler won't even get to the point of checking whether this is
feasible due to it being saturated by the already running task.

I'm not sure if we still need this fallback lookup logic. After removing
it, it's feasible that 0 stars will be returned during the scenario that
previously caused a deadlock, but I don't necessarily think this is
incorrect. There may be another reason for this needing to exist which
I'm not aware of (diffcalc?) but if that's the case we may want to move
the try-catch handling to the point of usage.

To reproduce the deadlock scenario with 100% success (the repro
instructions in the linked issue aren't that simple and require some
patience and good timing), the main portion of the lookup can be changed
to randomly trigger a nested lookup:

```
if (RNG.NextSingle() > 0.5f)
    return GetAsync(new
DifficultyCacheLookup(key.Beatmap, key.Beatmap.Ruleset,
key.OrderedMods)).Result;
else
    return new StarDifficulty(attributes);
```

After switching beatmap once or twice, pausing debug and viewing the
state of threads should show exactly what is going on.
---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 3b58062add..37d262abe5 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -260,17 +260,10 @@ namespace osu.Game.Beatmaps
             }
             catch (BeatmapInvalidForRulesetException e)
             {
-                // Conversion has failed for the given ruleset, so return the difficulty in the beatmap's default ruleset.
-
-                // Ensure the beatmap's default ruleset isn't the one already being converted to.
-                // This shouldn't happen as it means something went seriously wrong, but if it does an endless loop should be avoided.
                 if (rulesetInfo.Equals(beatmapInfo.Ruleset))
-                {
                     Logger.Error(e, $"Failed to convert {beatmapInfo.OnlineBeatmapID} to the beatmap's default ruleset ({beatmapInfo.Ruleset}).");
-                    return new StarDifficulty();
-                }
 
-                return GetAsync(new DifficultyCacheLookup(key.Beatmap, key.Beatmap.Ruleset, key.OrderedMods)).Result;
+                return new StarDifficulty();
             }
             catch
             {

From ed78be825f9a988df3920fdbda730120bebfe125 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 15:47:41 +0900
Subject: [PATCH 07537/10326] Fix editor timeline not snapping on non-precise
 wheel scroll

For wheel input with precision, we still prefer exact tracking for now.
May change this in the future based on feedback from mappers, but it
makes little sense to do non-snapped scrolling when input is coming from
a non-precise source.
---
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 20836c0e68..12f7625bf9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -138,6 +138,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 scrollToTrackTime();
         }
 
+        protected override bool OnScroll(ScrollEvent e)
+        {
+            // if this is not a precision scroll event, let the editor handle the seek itself (for snapping support)
+            if (!e.AltPressed && !e.IsPrecise)
+                return false;
+
+            return base.OnScroll(e);
+        }
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();

From 04fa32bc34852ba79a249529f627b9a6f8aa6dd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 16:14:21 +0900
Subject: [PATCH 07538/10326] Rename and add xmldoc for smooth seeking method

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  2 +-
 .../Timelines/Summary/Parts/MarkerPart.cs     |  2 +-
 .../Compose/Components/BlueprintContainer.cs  |  2 +-
 osu.Game/Screens/Edit/EditorClock.cs          | 33 +++++++++++--------
 .../Screens/Edit/Timing/ControlPointTable.cs  |  2 +-
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 35852f60ea..e927951d0a 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -332,7 +332,7 @@ namespace osu.Game.Rulesets.Edit
                 EditorBeatmap.Add(hitObject);
 
                 if (EditorClock.CurrentTime < hitObject.StartTime)
-                    EditorClock.SeekTo(hitObject.StartTime);
+                    EditorClock.SeekSmoothlyTo(hitObject.StartTime);
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
index 9e9ac93d23..5a2214509c 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                     return;
 
                 float markerPos = Math.Clamp(ToLocalSpace(screenPosition).X, 0, DrawWidth);
-                editorClock.SeekTo(markerPos / DrawWidth * editorClock.TrackLength);
+                editorClock.SeekSmoothlyTo(markerPos / DrawWidth * editorClock.TrackLength);
             });
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 0b45bd5597..5371beac60 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -170,7 +170,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (clickedBlueprint == null || SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != clickedBlueprint)
                 return false;
 
-            EditorClock?.SeekTo(clickedBlueprint.HitObject.StartTime);
+            EditorClock?.SeekSmoothlyTo(clickedBlueprint.HitObject.StartTime);
             return true;
         }
 
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 148eef6c93..c651d6a7c4 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Screens.Edit
 
             if (!snapped || ControlPointInfo.TimingPoints.Count == 0)
             {
-                SeekTo(seekTime);
+                SeekSmoothlyTo(seekTime);
                 return;
             }
 
@@ -145,11 +145,11 @@ namespace osu.Game.Screens.Edit
 
             // Ensure the sought point is within the boundaries
             seekTime = Math.Clamp(seekTime, 0, TrackLength);
-            SeekTo(seekTime);
+            SeekSmoothlyTo(seekTime);
         }
 
         /// <summary>
-        /// The current time of this clock, include any active transform seeks performed via <see cref="SeekTo"/>.
+        /// The current time of this clock, include any active transform seeks performed via <see cref="SeekSmoothlyTo"/>.
         /// </summary>
         public double CurrentTimeAccurate =>
             Transforms.OfType<TransformSeek>().FirstOrDefault()?.EndValue ?? CurrentTime;
@@ -182,6 +182,23 @@ namespace osu.Game.Screens.Edit
             return underlyingClock.Seek(position);
         }
 
+        /// <summary>
+        /// Seek smoothly to the provided destination.
+        /// Use <see cref="Seek"/> to perform an immediate seek.
+        /// </summary>
+        /// <param name="seekDestination"></param>
+        public void SeekSmoothlyTo(double seekDestination)
+        {
+            seekingOrStopped.Value = true;
+
+            if (IsRunning)
+                Seek(seekDestination);
+            else
+            {
+                transformSeekTo(seekDestination, transform_time, Easing.OutQuint);
+            }
+        }
+
         public void ResetSpeedAdjustments() => underlyingClock.ResetSpeedAdjustments();
 
         double IAdjustableClock.Rate
@@ -243,16 +260,6 @@ namespace osu.Game.Screens.Edit
             }
         }
 
-        public void SeekTo(double seekDestination)
-        {
-            seekingOrStopped.Value = true;
-
-            if (IsRunning)
-                Seek(seekDestination);
-            else
-                transformSeekTo(seekDestination, transform_time, Easing.OutQuint);
-        }
-
         private void transformSeekTo(double seek, double duration = 0, Easing easing = Easing.None)
             => this.TransformTo(this.PopulateTransform(new TransformSeek(), seek, duration, easing));
 
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 89d3c36250..e4b9150df1 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Screens.Edit.Timing
                 Action = () =>
                 {
                     selectedGroup.Value = controlGroup;
-                    clock.SeekTo(controlGroup.Time);
+                    clock.SeekSmoothlyTo(controlGroup.Time);
                 };
             }
 

From 831c06a3c7c02549fe9bab75ff83afaaf30fa1ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 16:14:38 +0900
Subject: [PATCH 07539/10326] Expose and consume boolean covering whether an
 ongoing smooth seek is running

---
 .../Edit/Compose/Components/Timeline/Timeline.cs      | 10 ++++++----
 osu.Game/Screens/Edit/EditorClock.cs                  | 11 +++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 20836c0e68..7df4f1ae7d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -146,12 +146,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 seekTrackToCurrent();
             else if (!editorClock.IsRunning)
             {
-                // The track isn't running. There are two cases we have to be wary of:
-                // 1) The user flick-drags on this timeline: We want the track to follow us
-                // 2) The user changes the track time through some other means (scrolling in the editor or overview timeline): We want to follow the track time
+                // The track isn't running. There are three cases we have to be wary of:
+                // 1) The user flick-drags on this timeline and we are applying an interpolated seek on the clock, until interrupted by 2 or 3.
+                // 2) The user changes the track time through some other means (scrolling in the editor or overview timeline; clicking a hitobject etc.). We want the timeline to track the clock's time.
+                // 3) An ongoing seek transform is running from an external seek. We want the timeline to track the clock's time.
 
                 // The simplest way to cover both cases is by checking whether the scroll position has changed and the audio hasn't been changed externally
-                if (Current != lastScrollPosition && editorClock.CurrentTime == lastTrackTime)
+                // Checking IsSeeking covers the third case, where the transform may not have been applied yet.
+                if (Current != lastScrollPosition && editorClock.CurrentTime == lastTrackTime && !editorClock.IsSeeking)
                     seekTrackToCurrent();
                 else
                     scrollToTrackTime();
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index c651d6a7c4..ec0f5d7154 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -35,6 +35,11 @@ namespace osu.Game.Screens.Edit
 
         private readonly Bindable<bool> seekingOrStopped = new Bindable<bool>(true);
 
+        /// <summary>
+        /// Whether a seek is currently in progress. True for the duration of a seek performed via <see cref="SeekSmoothlyTo"/>.
+        /// </summary>
+        public bool IsSeeking { get; private set; }
+
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
             : this(beatmap.Beatmap.ControlPointInfo, beatmap.Track.Length, beatDivisor)
         {
@@ -176,7 +181,7 @@ namespace osu.Game.Screens.Edit
 
         public bool Seek(double position)
         {
-            seekingOrStopped.Value = true;
+            seekingOrStopped.Value = IsSeeking = true;
 
             ClearTransforms();
             return underlyingClock.Seek(position);
@@ -246,6 +251,8 @@ namespace osu.Game.Screens.Edit
         {
             if (seekingOrStopped.Value)
             {
+                IsSeeking &= Transforms.Any();
+
                 if (track.Value?.IsRunning != true)
                 {
                     // seeking in the editor can happen while the track isn't running.
@@ -256,7 +263,7 @@ namespace osu.Game.Screens.Edit
                 // we are either running a seek tween or doing an immediate seek.
                 // in the case of an immediate seek the seeking bool will be set to false after one update.
                 // this allows for silencing hit sounds and the likes.
-                seekingOrStopped.Value = Transforms.Any();
+                seekingOrStopped.Value = IsSeeking;
             }
         }
 

From b5e784ed427a47c93eae96a2a459b6a4b9dc224c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 16:34:28 +0900
Subject: [PATCH 07540/10326] Fix possibility of crash when selecting a random
 skin during skin import

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

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 5898482e4a..123cecb0cd 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Overlays.Settings.Sections
             if (skinDropdown.Items.All(s => s.ID != configBindable.Value))
                 configBindable.Value = 0;
 
-            configBindable.BindValueChanged(id => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == id.NewValue), true);
+            configBindable.BindValueChanged(id => Scheduler.AddOnce(updateSelectedSkinFromConfig), true);
             dropdownBindable.BindValueChanged(skin =>
             {
                 if (skin.NewValue == random_skin_info)
@@ -104,6 +104,8 @@ namespace osu.Game.Overlays.Settings.Sections
             });
         }
 
+        private void updateSelectedSkinFromConfig() => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == configBindable.Value);
+
         private void updateItems()
         {
             skinItems = skins.GetAllUsableSkins();

From 88a27124c095f5a3cff7eaddaaab92cfe1832d55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:13:27 +0900
Subject: [PATCH 07541/10326] Make long spinner test longer and fix step name

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 496b1b3559..c22b1dc407 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(true)]
         public void TestLongSpinner(bool autoplay)
         {
-            AddStep("Very short spinner", () => SetContents(() => testSingle(5, autoplay, 2000)));
+            AddStep("Very long spinner", () => SetContents(() => testSingle(5, autoplay, 4000)));
             AddUntilStep("Wait for completion", () => drawableSpinner.Result.HasResult);
             AddUntilStep("Check correct progress", () => drawableSpinner.Progress == (autoplay ? 1 : 0));
         }

From 6adb6b6700b4b19336955b397d5939679919d70b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:13:52 +0900
Subject: [PATCH 07542/10326] Fix spinner tests not playing spinning sound due
 to empty hitsamples

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index c22b1dc407..f697a77d94 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -1,9 +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 System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;
@@ -55,7 +57,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             var spinner = new Spinner
             {
                 StartTime = Time.Current + delay,
-                EndTime = Time.Current + delay + length
+                EndTime = Time.Current + delay + length,
+                Samples = new List<HitSampleInfo>
+                {
+                    new HitSampleInfo("hitnormal")
+                }
             };
 
             spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = circleSize });

From 8a6857f151373dc2bb6edeb5239efef9932e447f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:16:12 +0900
Subject: [PATCH 07543/10326] Add support for playing a SkinnableSample without
 restarting it

---
 osu.Game/Skinning/PausableSkinnableSound.cs | 4 ++--
 osu.Game/Skinning/SkinnableSound.cs         | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 4b6099e85f..cb5234c847 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Skinning
             }
         }
 
-        public override void Play()
+        public override void Play(bool restart = true)
         {
             cancelPendingStart();
             RequestedPlaying = true;
@@ -75,7 +75,7 @@ namespace osu.Game.Skinning
             if (samplePlaybackDisabled.Value)
                 return;
 
-            base.Play();
+            base.Play(restart);
         }
 
         public override void Stop()
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 645c08cd00..b841f99598 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -119,12 +119,13 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Plays the samples.
         /// </summary>
-        public virtual void Play()
+        /// <param name="restart">Whether to play the sample from the beginning.</param>
+        public virtual void Play(bool restart = true)
         {
             samplesContainer.ForEach(c =>
             {
                 if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
-                    c.Play();
+                    c.Play(restart);
             });
         }
 

From 767c76921faa69b9f648e14fec3ab95f466abce1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:17:10 +0900
Subject: [PATCH 07544/10326] Adjust transition time of spinner sound

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 1f3bcece0c..4f61ab4a9a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -131,11 +131,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (tracking.NewValue)
             {
                 spinningSample?.Play();
-                spinningSample?.VolumeTo(1, 200);
+                spinningSample?.VolumeTo(1, 300);
             }
             else
             {
-                spinningSample?.VolumeTo(0, 200).Finally(_ => spinningSample.Stop());
+                spinningSample?.VolumeTo(0, 300).Finally(_ => spinningSample.Stop());
             }
         }
 

From 311f8b70178cb5ebf0fdc23824fdae53b8336a7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:17:51 +0900
Subject: [PATCH 07545/10326] Only restart spinning sample if it was not
 already playing

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 4f61ab4a9a..c5ae195274 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (tracking.NewValue)
             {
-                spinningSample?.Play();
+                spinningSample?.Play(!spinningSample.IsPlaying);
                 spinningSample?.VolumeTo(1, 300);
             }
             else

From 14b33236828438a72b5c6b4acc4edbba9e26d985 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:18:15 +0900
Subject: [PATCH 07546/10326] Use OnComplete instead of Finally to avoid
 potentially stopping on aborted transforms

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index c5ae195274..56aedebed3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
             else
             {
-                spinningSample?.VolumeTo(0, 300).Finally(_ => spinningSample.Stop());
+                spinningSample?.VolumeTo(0, 300).OnComplete(_ => spinningSample.Stop());
             }
         }
 

From d6e6b4bbeea9ec532b7d927fa3d38c7e1efbf49f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:34:01 +0900
Subject: [PATCH 07547/10326] Revert forced cloning of ControlPointInfo

This reverts commit 3c3e860dbc34d37855b79786a1abb754af1667e8.

Closes https://github.com/ppy/osu/issues/11491.
---
 osu.Game/Beatmaps/Beatmap.cs             | 10 +---------
 osu.Game/Beatmaps/IBeatmap.cs            |  2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs      |  2 ++
 osu.Game/Screens/Edit/EditorBeatmap.cs   |  6 +++++-
 osu.Game/Screens/Play/GameplayBeatmap.cs |  6 +++++-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index be2006e67a..5435e86dfd 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -50,15 +50,7 @@ namespace osu.Game.Beatmaps
 
         IBeatmap IBeatmap.Clone() => Clone();
 
-        public Beatmap<T> Clone()
-        {
-            var clone = (Beatmap<T>)MemberwiseClone();
-
-            clone.ControlPointInfo = ControlPointInfo.CreateCopy();
-            // todo: deep clone other elements as required.
-
-            return clone;
-        }
+        public Beatmap<T> Clone() => (Beatmap<T>)MemberwiseClone();
     }
 
     public class Beatmap : Beatmap<HitObject>
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 8f27e0b0e9..7dd85e1232 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// The control points in this beatmap.
         /// </summary>
-        ControlPointInfo ControlPointInfo { get; }
+        ControlPointInfo ControlPointInfo { get; set; }
 
         /// <summary>
         /// The breaks in this beatmap.
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 30382c444f..d25adca92b 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -111,6 +111,8 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert(cancellationSource.Token);
 
+                converted.ControlPointInfo = converted.ControlPointInfo.CreateCopy();
+
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())
                 {
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 165d2ba278..a54a95f59d 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -74,7 +74,11 @@ namespace osu.Game.Screens.Edit
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
+        public ControlPointInfo ControlPointInfo
+        {
+            get => PlayableBeatmap.ControlPointInfo;
+            set => PlayableBeatmap.ControlPointInfo = value;
+        }
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 64894544f4..565595656f 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -29,7 +29,11 @@ namespace osu.Game.Screens.Play
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
+        public ControlPointInfo ControlPointInfo
+        {
+            get => PlayableBeatmap.ControlPointInfo;
+            set => PlayableBeatmap.ControlPointInfo = value;
+        }
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 

From 3c1a86d11deefc694a00ebad3369c563a07168de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 15 Jan 2021 22:04:45 +0100
Subject: [PATCH 07548/10326] Trim braces for consistency

---
 osu.Game/Skinning/LegacySkin.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 7397e3d08b..090ffaebd7 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -381,9 +381,7 @@ namespace osu.Game.Skinning
                         var particle = getParticleTexture(resultComponent.Component);
 
                         if (particle != null)
-                        {
                             return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, particle);
-                        }
                         else
                             return new LegacyJudgementPieceOld(resultComponent.Component, createDrawable);
                     }

From 112967c1e8d0fd75c24aed6276afd95140687e79 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Fri, 15 Jan 2021 23:46:46 -0500
Subject: [PATCH 07549/10326] Created base class for testing beatmap colours.

---
 .../TestSceneLegacyBeatmapSkin.cs             | 191 +++++-------------
 .../TestSceneLegacyBeatmapSkin.cs             | 178 +++++-----------
 .../Beatmaps/LegacyBeatmapSkinColourTest.cs   | 147 ++++++++++++++
 3 files changed, 245 insertions(+), 271 deletions(-)
 create mode 100644 osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
index 12ceaaa6fa..89298242e5 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -2,13 +2,10 @@
 // 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;
 using osu.Framework.Audio;
-using osu.Framework.Bindables;
-using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -17,179 +14,114 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Skinning;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Screens.Play;
 using osu.Game.Skinning;
-using osu.Game.Tests.Visual;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneLegacyBeatmapSkin : ScreenTestScene
+    public class TestSceneLegacyBeatmapSkin : LegacyBeatmapSkinColourTest
     {
         [Resolved]
         private AudioManager audio { get; set; }
 
-        private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
-        private readonly Bindable<bool> beatmapColours = new Bindable<bool>();
-
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
-            config.BindWith(OsuSetting.BeatmapColours, beatmapColours);
+            config.BindWith(OsuSetting.BeatmapSkins, BeatmapSkins);
+            config.BindWith(OsuSetting.BeatmapColours, BeatmapColours);
         }
 
         [TestCase(true, true)]
         [TestCase(true, false)]
         [TestCase(false, true)]
         [TestCase(false, false)]
-        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
+        public override void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, true);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(userHasCustomColours, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is beatmap skin colours", () => player.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColours(userHasCustomColours, useBeatmapSkin);
+            AddAssert("is beatmap skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
         }
 
         [TestCase(true)]
         [TestCase(false)]
-        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
+        public override void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, false);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(true, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is user custom skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColoursOverride(useBeatmapSkin);
+            AddAssert("is user custom skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
         [TestCase(true)]
         [TestCase(false)]
-        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
+        public override void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, false);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(false, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColoursOverrideWithDefaultColours(useBeatmapSkin);
+            AddAssert("is default user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
         }
 
         [TestCase(true, true)]
         [TestCase(false, true)]
         [TestCase(true, false)]
         [TestCase(false, false)]
-        public void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
+        public override void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, useBeatmapColour);
-            AddStep("load no-colour beatmap", () => player = loadBeatmap(false, false));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, false);
+            base.TestBeatmapNoComboColours(useBeatmapSkin, useBeatmapColour);
+            AddAssert("is default user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
         }
 
         [TestCase(true, true)]
         [TestCase(false, true)]
         [TestCase(true, false)]
         [TestCase(false, false)]
-        public void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
+        public override void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, useBeatmapColour);
-            AddStep("load custom-skin colour", () => player = loadBeatmap(true, false));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is custom user skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, false);
+            base.TestBeatmapNoComboColoursSkinOverride(useBeatmapSkin, useBeatmapColour);
+            AddAssert("is custom user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
         [TestCase(true)]
         [TestCase(false)]
         public void TestBeatmapHyperDashColours(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, true);
-            AddStep("load custom-skin colour", () => player = loadBeatmap(true, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is custom hyper dash colours", () => player.UsableHyperDashColour == TestBeatmapSkin.HYPER_DASH_COLOUR);
-            AddAssert("is custom hyper dash after image colours", () => player.UsableHyperDashAfterImageColour == TestBeatmapSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
-            AddAssert("is custom hyper dash fruit colours", () => player.UsableHyperDashFruitColour == TestBeatmapSkin.HYPER_DASH_FRUIT_COLOUR);
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
+            ConfigureTest(useBeatmapSkin, true, true);
+            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == CatchTestBeatmapSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == CatchTestBeatmapSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == CatchTestBeatmapSkin.HYPER_DASH_FRUIT_COLOUR);
         }
 
         [TestCase(true)]
         [TestCase(false)]
         public void TestBeatmapHyperDashColoursOverride(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, false);
-            AddStep("load custom-skin colour", () => player = loadBeatmap(true, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is custom hyper dash colours", () => player.UsableHyperDashColour == TestSkin.HYPER_DASH_COLOUR);
-            AddAssert("is custom hyper dash after image colours", () => player.UsableHyperDashAfterImageColour == TestSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
-            AddAssert("is custom hyper dash fruit colours", () => player.UsableHyperDashFruitColour == TestSkin.HYPER_DASH_FRUIT_COLOUR);
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
+            ConfigureTest(useBeatmapSkin, false, true);
+            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == CatchTestSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == CatchTestSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == CatchTestSkin.HYPER_DASH_FRUIT_COLOUR);
         }
 
-        private ExposedPlayer loadBeatmap(bool userHasCustomColours, bool beatmapHasColours)
+        protected override ExposedPlayer CreateTestPlayer(bool userHasCustomColours) => new CatchExposedPlayer(userHasCustomColours);
+
+        private class CatchExposedPlayer : ExposedPlayer
         {
-            ExposedPlayer player;
-
-            Beatmap.Value = new CustomSkinWorkingBeatmap(audio, beatmapHasColours);
-
-            LoadScreen(player = new ExposedPlayer(userHasCustomColours));
-
-            return player;
-        }
-
-        private void configureSettings(bool beatmapSkins, bool beatmapColours)
-        {
-            AddStep($"{(beatmapSkins ? "enable" : "disable")} beatmap skins", () =>
+            public CatchExposedPlayer(bool userHasCustomColours)
+                : base(userHasCustomColours)
             {
-                this.beatmapSkins.Value = beatmapSkins;
-            });
-            AddStep($"{(beatmapColours ? "enable" : "disable")} beatmap colours", () =>
-            {
-                this.beatmapColours.Value = beatmapColours;
-            });
-        }
-
-        private class ExposedPlayer : Player
-        {
-            private readonly bool userHasCustomColours;
-
-            public ExposedPlayer(bool userHasCustomColours)
-                : base(new PlayerConfiguration
-                {
-                    AllowPause = false,
-                    ShowResults = false,
-                })
-            {
-                this.userHasCustomColours = userHasCustomColours;
             }
 
             protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             {
                 var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-                dependencies.CacheAs<ISkinSource>(new TestSkin(userHasCustomColours));
+                dependencies.CacheAs<ISkinSource>(new CatchTestSkin(UserHasCustomColours));
                 return dependencies;
             }
 
-            public IReadOnlyList<Color4> UsableComboColours =>
-                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
-                                      .First()
-                                      .GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
-
             public Color4 UsableHyperDashColour =>
                 GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
                                       .First()
@@ -223,17 +155,14 @@ namespace osu.Game.Rulesets.Catch.Tests
             }
         }
 
-        private class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
+        private class CatchCustomSkinWorkingBeatmap : CustomSkinWorkingBeatmap
         {
-            private readonly bool hasColours;
-
-            public CustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
-                : base(createBeatmap(new CatchRuleset().RulesetInfo), null, null, audio)
+            public CatchCustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
+                : base(createBeatmap(new CatchRuleset().RulesetInfo), audio, hasColours)
             {
-                this.hasColours = hasColours;
             }
 
-            protected override ISkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, hasColours);
+            protected override ISkin GetSkin() => new CatchTestBeatmapSkin(BeatmapInfo, HasColours);
 
             private static IBeatmap createBeatmap(RulesetInfo ruleset)
             {
@@ -297,26 +226,19 @@ namespace osu.Game.Rulesets.Catch.Tests
             }
         }
 
-        private class TestBeatmapSkin : LegacyBeatmapSkin
+        private class CatchTestBeatmapSkin : TestBeatmapSkin
         {
-            public static Color4[] Colours { get; } =
-            {
-                new Color4(50, 100, 150, 255),
-                new Color4(40, 80, 120, 255),
-            };
-
             public static readonly Color4 HYPER_DASH_COLOUR = Color4.DarkBlue;
 
             public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.DarkCyan;
 
             public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.DarkGoldenrod;
 
-            public TestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
-                : base(beatmap, new ResourceStore<byte[]>(), null)
+            public CatchTestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
+                : base(beatmap, hasColours)
             {
                 if (hasColours)
                 {
-                    Configuration.AddComboColours(Colours);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
@@ -324,37 +246,24 @@ namespace osu.Game.Rulesets.Catch.Tests
             }
         }
 
-        private class TestSkin : LegacySkin, ISkinSource
+        private class CatchTestSkin : TestSkin
         {
-            public static Color4[] Colours { get; } =
-            {
-                new Color4(150, 100, 50, 255),
-                new Color4(20, 20, 20, 255),
-            };
-
             public static readonly Color4 HYPER_DASH_COLOUR = Color4.LightBlue;
 
             public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.LightCoral;
 
             public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.LightCyan;
 
-            public TestSkin(bool hasCustomColours)
-                : base(new SkinInfo(), new ResourceStore<byte[]>(), null, string.Empty)
+            public CatchTestSkin(bool hasCustomColours)
+                : base(hasCustomColours)
             {
                 if (hasCustomColours)
                 {
-                    Configuration.AddComboColours(Colours);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
                 }
             }
-
-            public event Action SourceChanged
-            {
-                add { }
-                remove { }
-            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 22b028906f..095ce63ec5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -1,168 +1,113 @@
 // Copyright (c) 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;
 using osu.Framework.Audio;
-using osu.Framework.Bindables;
-using osu.Framework.IO.Stores;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Screens.Play;
 using osu.Game.Skinning;
-using osu.Game.Tests.Visual;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestSceneLegacyBeatmapSkin : ScreenTestScene
+    public class TestSceneLegacyBeatmapSkin : LegacyBeatmapSkinColourTest
     {
         [Resolved]
         private AudioManager audio { get; set; }
 
-        private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
-        private readonly Bindable<bool> beatmapColours = new Bindable<bool>();
-
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
-            config.BindWith(OsuSetting.BeatmapColours, beatmapColours);
+            config.BindWith(OsuSetting.BeatmapSkins, BeatmapSkins);
+            config.BindWith(OsuSetting.BeatmapColours, BeatmapColours);
         }
 
         [TestCase(true, true)]
         [TestCase(true, false)]
         [TestCase(false, true)]
         [TestCase(false, false)]
-        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
+        public override void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, true);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(userHasCustomColours, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is beatmap skin colours", () => player.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
+            TestBeatmap = new OsuCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColours(userHasCustomColours, useBeatmapSkin);
+            AddAssert("is beatmap skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
         }
 
         [TestCase(true)]
         [TestCase(false)]
-        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
+        public override void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, false);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(true, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is user custom skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+            TestBeatmap = new OsuCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColoursOverride(useBeatmapSkin);
+            AddAssert("is user custom skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
         [TestCase(true)]
         [TestCase(false)]
-        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
+        public override void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, false);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(false, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+            TestBeatmap = new OsuCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColoursOverrideWithDefaultColours(useBeatmapSkin);
+            AddAssert("is default user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
         }
 
         [TestCase(true, true)]
         [TestCase(false, true)]
         [TestCase(true, false)]
         [TestCase(false, false)]
-        public void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
+        public override void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, useBeatmapColour);
-            AddStep("load no-colour beatmap", () => player = loadBeatmap(false, false));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+            TestBeatmap = new OsuCustomSkinWorkingBeatmap(audio, false);
+            base.TestBeatmapNoComboColours(useBeatmapSkin, useBeatmapColour);
+            AddAssert("is default user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
         }
 
         [TestCase(true, true)]
         [TestCase(false, true)]
         [TestCase(true, false)]
         [TestCase(false, false)]
-        public void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
+        public override void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, useBeatmapColour);
-            AddStep("load custom-skin colour", () => player = loadBeatmap(true, false));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is custom user skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+            TestBeatmap = new OsuCustomSkinWorkingBeatmap(audio, false);
+            base.TestBeatmapNoComboColoursSkinOverride(useBeatmapSkin, useBeatmapColour);
+            AddAssert("is custom user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
-        private ExposedPlayer loadBeatmap(bool userHasCustomColours, bool beatmapHasColours)
+        protected override ExposedPlayer CreateTestPlayer(bool userHasCustomColours) => new OsuExposedPlayer(userHasCustomColours);
+
+        private class OsuExposedPlayer : ExposedPlayer
         {
-            ExposedPlayer player;
-
-            Beatmap.Value = new CustomSkinWorkingBeatmap(audio, beatmapHasColours);
-
-            LoadScreen(player = new ExposedPlayer(userHasCustomColours));
-
-            return player;
-        }
-
-        private void configureSettings(bool beatmapSkins, bool beatmapColours)
-        {
-            AddStep($"{(beatmapSkins ? "enable" : "disable")} beatmap skins", () =>
+            public OsuExposedPlayer(bool userHasCustomColours)
+                : base(userHasCustomColours)
             {
-                this.beatmapSkins.Value = beatmapSkins;
-            });
-            AddStep($"{(beatmapColours ? "enable" : "disable")} beatmap colours", () =>
-            {
-                this.beatmapColours.Value = beatmapColours;
-            });
-        }
-
-        private class ExposedPlayer : Player
-        {
-            private readonly bool userHasCustomColours;
-
-            public ExposedPlayer(bool userHasCustomColours)
-                : base(new PlayerConfiguration
-                {
-                    AllowPause = false,
-                    ShowResults = false,
-                })
-            {
-                this.userHasCustomColours = userHasCustomColours;
             }
 
             protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             {
                 var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-                dependencies.CacheAs<ISkinSource>(new TestSkin(userHasCustomColours));
+                dependencies.CacheAs<ISkinSource>(new OsuTestSkin(UserHasCustomColours));
                 return dependencies;
             }
-
-            public IReadOnlyList<Color4> UsableComboColours =>
-                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
-                                      .First()
-                                      .GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
         }
 
-        private class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
+        private class OsuCustomSkinWorkingBeatmap : CustomSkinWorkingBeatmap
         {
             private readonly bool hasColours;
 
-            public CustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
-                : base(new Beatmap
+            public OsuCustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
+                : base(createBeatmap(), audio, hasColours)
+            {
+                this.hasColours = hasColours;
+            }
+
+            protected override ISkin GetSkin() => new OsuTestBeatmapSkin(BeatmapInfo, hasColours);
+
+            private static IBeatmap createBeatmap() =>
+                new Beatmap
                 {
                     BeatmapInfo =
                     {
@@ -170,49 +115,22 @@ namespace osu.Game.Rulesets.Osu.Tests
                         Ruleset = new OsuRuleset().RulesetInfo,
                     },
                     HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
-                }, null, null, audio)
-            {
-                this.hasColours = hasColours;
-            }
-
-            protected override ISkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, hasColours);
+                };
         }
 
-        private class TestBeatmapSkin : LegacyBeatmapSkin
+        private class OsuTestBeatmapSkin : TestBeatmapSkin
         {
-            public static Color4[] Colours { get; } =
+            public OsuTestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
+                : base(beatmap, hasColours)
             {
-                new Color4(50, 100, 150, 255),
-                new Color4(40, 80, 120, 255),
-            };
-
-            public TestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
-                : base(beatmap, new ResourceStore<byte[]>(), null)
-            {
-                if (hasColours)
-                    Configuration.AddComboColours(Colours);
             }
         }
 
-        private class TestSkin : LegacySkin, ISkinSource
+        private class OsuTestSkin : TestSkin
         {
-            public static Color4[] Colours { get; } =
+            public OsuTestSkin(bool hasCustomColours)
+                : base(hasCustomColours)
             {
-                new Color4(150, 100, 50, 255),
-                new Color4(20, 20, 20, 255),
-            };
-
-            public TestSkin(bool hasCustomColours)
-                : base(new SkinInfo(), null, null, string.Empty)
-            {
-                if (hasCustomColours)
-                    Configuration.AddComboColours(Colours);
-            }
-
-            public event Action SourceChanged
-            {
-                add { }
-                remove { }
             }
         }
     }
diff --git a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
new file mode 100644
index 0000000000..b42c3ea70d
--- /dev/null
+++ b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Beatmaps
+{
+    public class LegacyBeatmapSkinColourTest : ScreenTestScene
+    {
+        protected readonly Bindable<bool> BeatmapSkins = new Bindable<bool>();
+        protected readonly Bindable<bool> BeatmapColours = new Bindable<bool>();
+        protected ExposedPlayer TestPlayer;
+        protected WorkingBeatmap TestBeatmap;
+
+        public virtual void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin) => ConfigureTest(useBeatmapSkin, true, userHasCustomColours);
+
+        public virtual void TestBeatmapComboColoursOverride(bool useBeatmapSkin) => ConfigureTest(useBeatmapSkin, false, true);
+
+        public virtual void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin) => ConfigureTest(useBeatmapSkin, false, false);
+
+        public virtual void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour) => ConfigureTest(useBeatmapSkin, useBeatmapColour, false);
+
+        public virtual void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour) => ConfigureTest(useBeatmapSkin, useBeatmapColour, true);
+
+        protected virtual void ConfigureTest(bool useBeatmapSkin, bool useBeatmapColours, bool userHasCustomColours)
+        {
+            configureSettings(useBeatmapSkin, useBeatmapColours);
+            AddStep($"load {(((CustomSkinWorkingBeatmap)TestBeatmap).HasColours ? "coloured " : "")} beatmap", () => TestPlayer = LoadBeatmap(userHasCustomColours));
+            AddUntilStep("wait for player load", () => TestPlayer.IsLoaded);
+        }
+
+        private void configureSettings(bool beatmapSkins, bool beatmapColours)
+        {
+            AddStep($"{(beatmapSkins ? "enable" : "disable")} beatmap skins", () =>
+            {
+                BeatmapSkins.Value = beatmapSkins;
+            });
+            AddStep($"{(beatmapColours ? "enable" : "disable")} beatmap colours", () =>
+            {
+                BeatmapColours.Value = beatmapColours;
+            });
+        }
+
+        protected virtual ExposedPlayer LoadBeatmap(bool userHasCustomColours)
+        {
+            ExposedPlayer player;
+
+            Beatmap.Value = TestBeatmap;
+
+            LoadScreen(player = CreateTestPlayer(userHasCustomColours));
+
+            return player;
+        }
+
+        protected virtual ExposedPlayer CreateTestPlayer(bool userHasCustomColours) => new ExposedPlayer(userHasCustomColours);
+
+        protected class ExposedPlayer : Player
+        {
+            protected readonly bool UserHasCustomColours;
+
+            public ExposedPlayer(bool userHasCustomColours)
+                : base(new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+                UserHasCustomColours = userHasCustomColours;
+            }
+
+            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            {
+                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+                dependencies.CacheAs<ISkinSource>(new TestSkin(UserHasCustomColours));
+                return dependencies;
+            }
+
+            public IReadOnlyList<Color4> UsableComboColours =>
+                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
+                                      .First()
+                                      .GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+        }
+
+        protected class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
+        {
+            public readonly bool HasColours;
+
+            public CustomSkinWorkingBeatmap(IBeatmap beatmap, AudioManager audio, bool hasColours)
+                : base(beatmap, null, null, audio)
+            {
+                HasColours = hasColours;
+            }
+
+            protected override ISkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, HasColours);
+        }
+
+        protected class TestBeatmapSkin : LegacyBeatmapSkin
+        {
+            public static Color4[] Colours { get; } =
+            {
+                new Color4(50, 100, 150, 255),
+                new Color4(40, 80, 120, 255),
+            };
+
+            public TestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
+                : base(beatmap, new ResourceStore<byte[]>(), null)
+            {
+                if (hasColours)
+                    Configuration.AddComboColours(Colours);
+            }
+        }
+
+        protected class TestSkin : LegacySkin, ISkinSource
+        {
+            public static Color4[] Colours { get; } =
+            {
+                new Color4(150, 100, 50, 255),
+                new Color4(20, 20, 20, 255),
+            };
+
+            public TestSkin(bool hasCustomColours)
+                : base(new SkinInfo(), new ResourceStore<byte[]>(), null, string.Empty)
+            {
+                if (hasCustomColours)
+                    Configuration.AddComboColours(Colours);
+            }
+
+            public event Action SourceChanged
+            {
+                add { }
+                remove { }
+            }
+        }
+    }
+}

From a3535f4b79a3634e31fe9fd935545b653558787f Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Sat, 16 Jan 2021 02:09:35 -0500
Subject: [PATCH 07550/10326] Further simplified beatmap colouring tests.

---
 .../TestSceneLegacyBeatmapSkin.cs             | 144 ++----------------
 .../TestSceneLegacyBeatmapSkin.cs             |  38 -----
 .../Beatmaps/LegacyBeatmapSkinColourTest.cs   |  22 +++
 3 files changed, 35 insertions(+), 169 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
index 89298242e5..eea83ef7c1 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -1,22 +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 System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Skinning;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -90,9 +85,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
             ConfigureTest(useBeatmapSkin, true, true);
-            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == CatchTestBeatmapSkin.HYPER_DASH_COLOUR);
-            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == CatchTestBeatmapSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
-            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == CatchTestBeatmapSkin.HYPER_DASH_FRUIT_COLOUR);
+            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == TestBeatmapSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == TestBeatmapSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == TestBeatmapSkin.HYPER_DASH_FRUIT_COLOUR);
         }
 
         [TestCase(true)]
@@ -101,9 +96,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
             ConfigureTest(useBeatmapSkin, false, true);
-            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == CatchTestSkin.HYPER_DASH_COLOUR);
-            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == CatchTestSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
-            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == CatchTestSkin.HYPER_DASH_FRUIT_COLOUR);
+            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == TestSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == TestSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == TestSkin.HYPER_DASH_FRUIT_COLOUR);
         }
 
         protected override ExposedPlayer CreateTestPlayer(bool userHasCustomColours) => new CatchExposedPlayer(userHasCustomColours);
@@ -115,13 +110,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
             }
 
-            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-            {
-                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-                dependencies.CacheAs<ISkinSource>(new CatchTestSkin(UserHasCustomColours));
-                return dependencies;
-            }
-
             public Color4 UsableHyperDashColour =>
                 GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
                                       .First()
@@ -141,129 +129,23 @@ namespace osu.Game.Rulesets.Catch.Tests
                                       .Value ?? Color4.Red;
         }
 
-        private class TestJuiceStream : JuiceStream
-        {
-            public TestJuiceStream(float x)
-            {
-                X = x;
-
-                Path = new SliderPath(new[]
-                {
-                    new PathControlPoint(Vector2.Zero),
-                    new PathControlPoint(new Vector2(30, 0)),
-                });
-            }
-        }
-
         private class CatchCustomSkinWorkingBeatmap : CustomSkinWorkingBeatmap
         {
             public CatchCustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
-                : base(createBeatmap(new CatchRuleset().RulesetInfo), audio, hasColours)
+                : base(createBeatmap(), audio, hasColours)
             {
             }
 
-            protected override ISkin GetSkin() => new CatchTestBeatmapSkin(BeatmapInfo, HasColours);
-
-            private static IBeatmap createBeatmap(RulesetInfo ruleset)
-            {
-                var beatmap = new Beatmap
+            private static IBeatmap createBeatmap() =>
+                new Beatmap
                 {
                     BeatmapInfo =
                     {
-                        Ruleset = ruleset,
-                        BaseDifficulty = new BeatmapDifficulty { CircleSize = 3.6f }
-                    }
+                        BeatmapSet = new BeatmapSetInfo(),
+                        Ruleset = new CatchRuleset().RulesetInfo
+                    },
+                    HitObjects = { new Fruit { StartTime = 1816, X = 56, NewCombo = true } }
                 };
-
-                beatmap.ControlPointInfo.Add(0, new TimingControlPoint());
-
-                // Should produce a hyper-dash (edge case test)
-                beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56, NewCombo = true });
-                beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308, NewCombo = true });
-
-                double startTime = 3000;
-
-                const float left_x = 0.02f * CatchPlayfield.WIDTH;
-                const float right_x = 0.98f * CatchPlayfield.WIDTH;
-
-                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);
-
-                beatmap.ControlPointInfo.Add(startTime, new TimingControlPoint
-                {
-                    BeatLength = 50
-                });
-
-                createObjects(() => new TestJuiceStream(left_x)
-                {
-                    Path = new SliderPath(new[]
-                    {
-                        new PathControlPoint(Vector2.Zero),
-                        new PathControlPoint(new Vector2(512, 0))
-                    })
-                }, 1);
-
-                return beatmap;
-
-                void createObjects(Func<CatchHitObject> createObject, int count = 3)
-                {
-                    const float spacing = 140;
-
-                    for (int i = 0; i < count; i++)
-                    {
-                        var hitObject = createObject();
-                        hitObject.StartTime = startTime + i * spacing;
-                        beatmap.HitObjects.Add(hitObject);
-                    }
-
-                    startTime += 700;
-                }
-            }
-        }
-
-        private class CatchTestBeatmapSkin : TestBeatmapSkin
-        {
-            public static readonly Color4 HYPER_DASH_COLOUR = Color4.DarkBlue;
-
-            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.DarkCyan;
-
-            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.DarkGoldenrod;
-
-            public CatchTestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
-                : base(beatmap, hasColours)
-            {
-                if (hasColours)
-                {
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
-                }
-            }
-        }
-
-        private class CatchTestSkin : TestSkin
-        {
-            public static readonly Color4 HYPER_DASH_COLOUR = Color4.LightBlue;
-
-            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.LightCoral;
-
-            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.LightCyan;
-
-            public CatchTestSkin(bool hasCustomColours)
-                : base(hasCustomColours)
-            {
-                if (hasCustomColours)
-                {
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
-                }
-            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 095ce63ec5..c26419b0e8 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -77,35 +77,13 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("is custom user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
-        protected override ExposedPlayer CreateTestPlayer(bool userHasCustomColours) => new OsuExposedPlayer(userHasCustomColours);
-
-        private class OsuExposedPlayer : ExposedPlayer
-        {
-            public OsuExposedPlayer(bool userHasCustomColours)
-                : base(userHasCustomColours)
-            {
-            }
-
-            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-            {
-                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-                dependencies.CacheAs<ISkinSource>(new OsuTestSkin(UserHasCustomColours));
-                return dependencies;
-            }
-        }
-
         private class OsuCustomSkinWorkingBeatmap : CustomSkinWorkingBeatmap
         {
-            private readonly bool hasColours;
-
             public OsuCustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
                 : base(createBeatmap(), audio, hasColours)
             {
-                this.hasColours = hasColours;
             }
 
-            protected override ISkin GetSkin() => new OsuTestBeatmapSkin(BeatmapInfo, hasColours);
-
             private static IBeatmap createBeatmap() =>
                 new Beatmap
                 {
@@ -117,21 +95,5 @@ namespace osu.Game.Rulesets.Osu.Tests
                     HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
                 };
         }
-
-        private class OsuTestBeatmapSkin : TestBeatmapSkin
-        {
-            public OsuTestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
-                : base(beatmap, hasColours)
-            {
-            }
-        }
-
-        private class OsuTestSkin : TestSkin
-        {
-            public OsuTestSkin(bool hasCustomColours)
-                : base(hasCustomColours)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
index b42c3ea70d..fb3432fbae 100644
--- a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
@@ -114,11 +114,22 @@ namespace osu.Game.Tests.Beatmaps
                 new Color4(40, 80, 120, 255),
             };
 
+            public static readonly Color4 HYPER_DASH_COLOUR = Color4.DarkBlue;
+
+            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.DarkCyan;
+
+            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.DarkGoldenrod;
+
             public TestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
                 : base(beatmap, new ResourceStore<byte[]>(), null)
             {
                 if (hasColours)
+                {
                     Configuration.AddComboColours(Colours);
+                    Configuration.CustomColours.Add("HyperDash", HYPER_DASH_COLOUR);
+                    Configuration.CustomColours.Add("HyperDashAfterImage", HYPER_DASH_AFTER_IMAGE_COLOUR);
+                    Configuration.CustomColours.Add("HyperDashFruit", HYPER_DASH_FRUIT_COLOUR);
+                }
             }
         }
 
@@ -130,11 +141,22 @@ namespace osu.Game.Tests.Beatmaps
                 new Color4(20, 20, 20, 255),
             };
 
+            public static readonly Color4 HYPER_DASH_COLOUR = Color4.LightBlue;
+
+            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.LightCoral;
+
+            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.LightCyan;
+
             public TestSkin(bool hasCustomColours)
                 : base(new SkinInfo(), new ResourceStore<byte[]>(), null, string.Empty)
             {
                 if (hasCustomColours)
+                {
                     Configuration.AddComboColours(Colours);
+                    Configuration.CustomColours.Add("HyperDash", HYPER_DASH_COLOUR);
+                    Configuration.CustomColours.Add("HyperDashAfterImage", HYPER_DASH_AFTER_IMAGE_COLOUR);
+                    Configuration.CustomColours.Add("HyperDashFruit", HYPER_DASH_FRUIT_COLOUR);
+                }
             }
 
             public event Action SourceChanged

From d9034eab26e8abe8698a4de5feacd1be0ae8ecff Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 22:54:54 +0300
Subject: [PATCH 07551/10326] Make model manager in `DownloadTrackingComposite`
 protected

---
 osu.Game/Online/DownloadTrackingComposite.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 7a64c9002d..4e52761813 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Online
         protected readonly Bindable<TModel> Model = new Bindable<TModel>();
 
         [Resolved(CanBeNull = true)]
-        private TModelManager manager { get; set; }
+        protected TModelManager Manager { get; private 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.
@@ -49,19 +49,19 @@ namespace osu.Game.Online
                 else if (manager?.IsAvailableLocally(modelInfo.NewValue) == true)
                     State.Value = DownloadState.LocallyAvailable;
                 else
-                    attachDownload(manager?.GetExistingDownload(modelInfo.NewValue));
+                    attachDownload(Manager?.GetExistingDownload(modelInfo.NewValue));
             }, true);
 
-            if (manager == null)
+            if (Manager == null)
                 return;
 
-            managerDownloadBegan = manager.DownloadBegan.GetBoundCopy();
+            managerDownloadBegan = Manager.DownloadBegan.GetBoundCopy();
             managerDownloadBegan.BindValueChanged(downloadBegan);
-            managerDownloadFailed = manager.DownloadFailed.GetBoundCopy();
+            managerDownloadFailed = Manager.DownloadFailed.GetBoundCopy();
             managerDownloadFailed.BindValueChanged(downloadFailed);
-            managedUpdated = manager.ItemUpdated.GetBoundCopy();
+            managedUpdated = Manager.ItemUpdated.GetBoundCopy();
             managedUpdated.BindValueChanged(itemUpdated);
-            managerRemoved = manager.ItemRemoved.GetBoundCopy();
+            managerRemoved = Manager.ItemRemoved.GetBoundCopy();
             managerRemoved.BindValueChanged(itemRemoved);
         }
 

From 04d17aadfa4685f54e670b934e17fc3be3cf2b3e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 22:57:55 +0300
Subject: [PATCH 07552/10326] Add overridable method for verifying models in
 database

---
 osu.Game/Online/DownloadTrackingComposite.cs | 42 +++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 4e52761813..9dd8258e78 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -2,6 +2,7 @@
 // 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.Graphics.Containers;
@@ -65,6 +66,15 @@ namespace osu.Game.Online
             managerRemoved.BindValueChanged(itemRemoved);
         }
 
+        /// <summary>
+        /// Verifies that the given databased model is in a correct state to be considered available.
+        /// </summary>
+        /// <example>
+        /// In the case of multiplayer/playlists, this has to verify that the databased beatmap set with the selected beatmap matches what's online.
+        /// </example>
+        /// <param name="databasedModel">The model in database.</param>
+        protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;
+
         private void downloadBegan(ValueChangedEvent<WeakReference<ArchiveDownloadRequest<TModel>>> weakRequest)
         {
             if (weakRequest.NewValue.TryGetTarget(out var request))
@@ -134,23 +144,35 @@ namespace osu.Game.Online
         private void itemUpdated(ValueChangedEvent<WeakReference<TModel>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-                setDownloadStateFromManager(item, DownloadState.LocallyAvailable);
+            {
+                Schedule(() =>
+                {
+                    if (!item.Equals(Model.Value))
+                        return;
+
+                    if (!VerifyDatabasedModel(item))
+                    {
+                        State.Value = DownloadState.NotDownloaded;
+                        return;
+                    }
+
+                    State.Value = DownloadState.LocallyAvailable;
+                });
+            }
         }
 
         private void itemRemoved(ValueChangedEvent<WeakReference<TModel>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-                setDownloadStateFromManager(item, DownloadState.NotDownloaded);
+            {
+                Schedule(() =>
+                {
+                    if (item.Equals(Model.Value))
+                        State.Value = DownloadState.NotDownloaded;
+                });
+            }
         }
 
-        private void setDownloadStateFromManager(TModel s, DownloadState state) => Schedule(() =>
-        {
-            if (!s.Equals(Model.Value))
-                return;
-
-            State.Value = state;
-        });
-
         #region Disposal
 
         protected override void Dispose(bool isDisposing)

From 7ad8b167ccb2f73247f2506cace66b22ec333665 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 22:58:29 +0300
Subject: [PATCH 07553/10326] Add overridable method for checking local
 availability of current model

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

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 9dd8258e78..1631d9790b 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Online
             {
                 if (modelInfo.NewValue == null)
                     attachDownload(null);
-                else if (manager?.IsAvailableLocally(modelInfo.NewValue) == true)
+                else if (IsModelAvailableLocally())
                     State.Value = DownloadState.LocallyAvailable;
                 else
                     attachDownload(Manager?.GetExistingDownload(modelInfo.NewValue));
@@ -75,6 +75,13 @@ namespace osu.Game.Online
         /// <param name="databasedModel">The model in database.</param>
         protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;
 
+        /// <summary>
+        /// Whether the given model is available in the database.
+        /// By default, this calls <see cref="IModelDownloader{TModel}.IsAvailableLocally"/>,
+        /// but can be overriden to add additional checks for verifying the model in database.
+        /// </summary>
+        protected virtual bool IsModelAvailableLocally() => Manager.IsAvailableLocally(Model.Value);
+
         private void downloadBegan(ValueChangedEvent<WeakReference<ArchiveDownloadRequest<TModel>>> weakRequest)
         {
             if (weakRequest.NewValue.TryGetTarget(out var request))

From da9c23f3478356b9183fecbe82d0d416c039a26d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:00:56 +0300
Subject: [PATCH 07554/10326] Add beatmap availability tracker component for
 multiplayer

---
 .../Online/Rooms/MultiplayerBeatmapTracker.cs | 89 +++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
new file mode 100644
index 0000000000..b22d17f3ef
--- /dev/null
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.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;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Online.Rooms
+{
+    public class MultiplayerBeatmapTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    {
+        public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+        /// <summary>
+        /// The availability state of the currently selected playlist item.
+        /// </summary>
+        public IBindable<BeatmapAvailability> Availability => availability;
+
+        private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>();
+
+        public MultiplayerBeatmapTracker()
+        {
+            State.BindValueChanged(_ => updateAvailability());
+            Progress.BindValueChanged(_ => updateAvailability());
+            updateAvailability();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            SelectedItem.BindValueChanged(item => Model.Value = item.NewValue?.Beatmap.Value.BeatmapSet, true);
+        }
+
+        protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)
+        {
+            int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
+            string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
+
+            BeatmapInfo matchingBeatmap;
+
+            if (databasedSet.Beatmaps == null)
+            {
+                // The given databased beatmap set is not passed in a usable state to check with.
+                // Perform a full query instead, as per https://github.com/ppy/osu/pull/11415.
+                matchingBeatmap = Manager.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+                return matchingBeatmap != null;
+            }
+
+            matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+            return matchingBeatmap != null;
+        }
+
+        protected override bool IsModelAvailableLocally()
+        {
+            int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
+            string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
+
+            var beatmap = Manager.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+            return beatmap?.BeatmapSet.DeletePending == false;
+        }
+
+        private void updateAvailability()
+        {
+            switch (State.Value)
+            {
+                case DownloadState.NotDownloaded:
+                    availability.Value = BeatmapAvailability.NotDownloaded();
+                    break;
+
+                case DownloadState.Downloading:
+                    availability.Value = BeatmapAvailability.Downloading(Progress.Value);
+                    break;
+
+                case DownloadState.Importing:
+                    availability.Value = BeatmapAvailability.Importing();
+                    break;
+
+                case DownloadState.LocallyAvailable:
+                    availability.Value = BeatmapAvailability.LocallyAvailable();
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(State));
+            }
+        }
+    }
+}

From cf2378103656863879a08b9e2e2704bdffdebd03 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:02:30 +0300
Subject: [PATCH 07555/10326] Cache beatmap tracker and bind to selected item
 in `RoomSubScreen`

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2449563c73..c049d4be20 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -40,6 +40,17 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
+        [Cached]
+        protected readonly MultiplayerBeatmapTracker BeatmapTracker;
+
+        protected RoomSubScreen()
+        {
+            InternalChild = BeatmapTracker = new MultiplayerBeatmapTracker
+            {
+                SelectedItem = { BindTarget = SelectedItem },
+            };
+        }
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {

From 96feaa027ded707f31ef18482aa0b632dad5627c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:06:54 +0300
Subject: [PATCH 07556/10326] Make `ArchiveModelManager` import method
 overridable (for testing purposes)

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

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 36cc4cce39..8502ab5965 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -308,7 +308,7 @@ namespace osu.Game.Database
         /// <param name="item">The model to be imported.</param>
         /// <param name="archive">An optional archive to use for model population.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
-        public async Task<TModel> Import(TModel item, ArchiveReader archive = null, CancellationToken cancellationToken = default) => await Task.Factory.StartNew(async () =>
+        public virtual async Task<TModel> Import(TModel item, ArchiveReader archive = null, CancellationToken cancellationToken = default) => await Task.Factory.StartNew(async () =>
         {
             cancellationToken.ThrowIfCancellationRequested();
 

From 4778686dc4b712e7c93a30661718fd383674fee2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:07:46 +0300
Subject: [PATCH 07557/10326] Expose method for triggering filename-backed
 success in `APIDownloadRequest`

Exactly like in `APIRequest<T>`
---
 osu.Game/Online/API/APIDownloadRequest.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIDownloadRequest.cs b/osu.Game/Online/API/APIDownloadRequest.cs
index 940b9b4803..02c589403c 100644
--- a/osu.Game/Online/API/APIDownloadRequest.cs
+++ b/osu.Game/Online/API/APIDownloadRequest.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.IO;
 using osu.Framework.IO.Network;
 
@@ -28,13 +29,19 @@ namespace osu.Game.Online.API
 
         private void request_Progress(long current, long total) => API.Schedule(() => Progressed?.Invoke(current, total));
 
-        protected APIDownloadRequest()
+        internal void TriggerSuccess(string filename)
         {
-            base.Success += onSuccess;
+            if (this.filename != null)
+                throw new InvalidOperationException("Attempted to trigger success more than once");
+
+            this.filename = filename;
+
+            TriggerSuccess();
         }
 
-        private void onSuccess()
+        internal override void TriggerSuccess()
         {
+            base.TriggerSuccess();
             Success?.Invoke(filename);
         }
 

From 23c7afa573b6d9b8b0f4af49283224e2231394b7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:17:05 +0300
Subject: [PATCH 07558/10326] Expose method for setting progress of archive
 download request

---
 osu.Game/Online/API/ArchiveDownloadRequest.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index f1966aeb2b..bb57a7a5f8 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -18,7 +18,13 @@ namespace osu.Game.Online.API
         {
             Model = model;
 
-            Progressed += (current, total) => DownloadProgressed?.Invoke(Progress = (float)current / total);
+            Progressed += (current, total) => SetProgress((float)current / total);
+        }
+
+        protected void SetProgress(float progress)
+        {
+            Progress = progress;
+            DownloadProgressed?.Invoke(progress);
         }
     }
 }

From adb2605d5d7ddb30fea80a5f289e28e3c357a8db Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:17:47 +0300
Subject: [PATCH 07559/10326] Enforce `double` type in the download progress
 path

Wasn't sure where to exactly put this, or whether to split it, but it's very small change to worry about, so I guess it's fine being here
---
 osu.Game/Online/API/ArchiveDownloadRequest.cs          |  8 ++++----
 osu.Game/Online/DownloadTrackingComposite.cs           |  2 +-
 .../Overlays/Notifications/ProgressNotification.cs     | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index bb57a7a5f8..fdb2a984dc 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -10,18 +10,18 @@ namespace osu.Game.Online.API
     {
         public readonly TModel Model;
 
-        public float Progress;
+        public double Progress { get; private set; }
 
-        public event Action<float> DownloadProgressed;
+        public event Action<double> DownloadProgressed;
 
         protected ArchiveDownloadRequest(TModel model)
         {
             Model = model;
 
-            Progressed += (current, total) => SetProgress((float)current / total);
+            Progressed += (current, total) => SetProgress((double)current / total);
         }
 
-        protected void SetProgress(float progress)
+        protected void SetProgress(double progress)
         {
             Progress = progress;
             DownloadProgressed?.Invoke(progress);
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 1631d9790b..b72cf38369 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Online
 
         private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Importing);
 
-        private void onRequestProgress(float progress) => Schedule(() => Progress.Value = progress);
+        private void onRequestProgress(double progress) => Schedule(() => Progress.Value = progress);
 
         private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
 
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 3105ecd742..e18bab8e83 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -23,9 +23,9 @@ namespace osu.Game.Overlays.Notifications
 
         public string CompletionText { get; set; } = "Task has completed!";
 
-        private float progress;
+        private double progress;
 
-        public float Progress
+        public double Progress
         {
             get => progress;
             set
@@ -185,9 +185,9 @@ namespace osu.Game.Overlays.Notifications
             private Color4 colourActive;
             private Color4 colourInactive;
 
-            private float progress;
+            private double progress;
 
-            public float Progress
+            public double Progress
             {
                 get => progress;
                 set
@@ -195,7 +195,7 @@ namespace osu.Game.Overlays.Notifications
                     if (progress == value) return;
 
                     progress = value;
-                    box.ResizeTo(new Vector2(progress, 1), 100, Easing.OutQuad);
+                    box.ResizeTo(new Vector2((float)progress, 1), 100, Easing.OutQuad);
                 }
             }
 

From f0602243bfa792f3880e9d083f1ddc67431a29cf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:30:01 +0300
Subject: [PATCH 07560/10326] Add beatmapset file containing the eaxct beatmap
 in `TestBeatmap` solely

---
 .../Resources/Archives/test-beatmap.osz          | Bin 0 -> 7286 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/Archives/test-beatmap.osz

diff --git a/osu.Game.Tests/Resources/Archives/test-beatmap.osz b/osu.Game.Tests/Resources/Archives/test-beatmap.osz
new file mode 100644
index 0000000000000000000000000000000000000000..f98fd2f8ffef0968270a1f2c7d75162de80417c9
GIT binary patch
literal 7286
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
BJ!=2}

literal 0
HcmV?d00001


From 80f7db8db364dc4903bf2ec4888b1269e82cde3a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:31:15 +0300
Subject: [PATCH 07561/10326] Add test coverage for the new multiplayer beatmap
 tracker

---
 .../TestSceneMultiplayerBeatmapTracker.cs     | 178 ++++++++++++++++++
 1 file changed, 178 insertions(+)
 create mode 100644 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
new file mode 100644
index 0000000000..839d47afc2
--- /dev/null
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -0,0 +1,178 @@
+// Copyright (c) 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.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.Platform;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.IO.Archives;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Online
+{
+    [HeadlessTest]
+    public class TestSceneMultiplayerBeatmapTracker : OsuTestScene
+    {
+        private RulesetStore rulesets;
+        private TestBeatmapManager beatmaps;
+
+        private string testBeatmapFile;
+        private BeatmapInfo testBeatmapInfo;
+        private BeatmapSetInfo testBeatmapSet;
+
+        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
+        private MultiplayerBeatmapTracker tracker;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, GameHost host)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.CacheAs<BeatmapManager>(beatmaps = new TestBeatmapManager(LocalStorage, ContextFactory, rulesets, API, audio, host, Beatmap.Default));
+        }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            testBeatmapFile = getTestBeatmapOsz();
+
+            testBeatmapInfo = new TestBeatmap(Ruleset.Value).BeatmapInfo;
+            testBeatmapSet = testBeatmapInfo.BeatmapSet;
+
+            var existing = beatmaps.QueryBeatmapSet(s => s.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID);
+            if (existing != null)
+                beatmaps.Delete(existing);
+
+            selectedItem.Value = new PlaylistItem
+            {
+                Beatmap = { Value = testBeatmapInfo },
+                Ruleset = { Value = testBeatmapInfo.Ruleset },
+            };
+
+            Child = tracker = new MultiplayerBeatmapTracker
+            {
+                SelectedItem = { BindTarget = selectedItem, }
+            };
+        });
+
+        [Test]
+        public void TestBeatmapDownloadingFlow()
+        {
+            AddAssert("ensure beatmap unavailable", () => !beatmaps.IsAvailableLocally(testBeatmapSet));
+            addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
+
+            AddStep("start downloading", () => beatmaps.Download(testBeatmapSet));
+            addAvailabilityCheckStep("state downloading 0%", () => BeatmapAvailability.Downloading(0.0));
+
+            AddStep("set progress 40%", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).SetProgress(0.4));
+            addAvailabilityCheckStep("state downloading 40%", () => BeatmapAvailability.Downloading(0.4));
+
+            AddStep("finish download", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).TriggerSuccess(testBeatmapFile));
+            addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
+
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddUntilStep("wait for import", () => beatmaps.IsAvailableLocally(testBeatmapSet));
+            addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
+        }
+
+        [Test]
+        public void TestTrackerRespectsSoftDeleting()
+        {
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("import beatmap", () => beatmaps.Import(testBeatmapSet).Wait());
+            addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
+
+            AddStep("delete beatmap", () => beatmaps.Delete(testBeatmapSet));
+            addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
+
+            AddStep("undelete beatmap", () => beatmaps.Undelete(testBeatmapSet));
+            addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
+        }
+
+        [Test]
+        public void TestTrackerRespectsChecksum()
+        {
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+
+            BeatmapInfo wrongBeatmap = null;
+
+            AddStep("import wrong checksum beatmap", () =>
+            {
+                wrongBeatmap = new TestBeatmap(Ruleset.Value).BeatmapInfo;
+                wrongBeatmap.MD5Hash = "1337";
+
+                beatmaps.Import(wrongBeatmap.BeatmapSet).Wait();
+            });
+            AddAssert("wrong beatmap available", () => beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == wrongBeatmap.OnlineBeatmapID) != null);
+            addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
+
+            AddStep("recreate tracker", () => Child = tracker = new MultiplayerBeatmapTracker
+            {
+                SelectedItem = { BindTarget = selectedItem }
+            });
+            addAvailabilityCheckStep("state not downloaded as well", BeatmapAvailability.NotDownloaded);
+        }
+
+        private void addAvailabilityCheckStep(string description, Func<BeatmapAvailability> expected)
+        {
+            AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
+        }
+
+        private string getTestBeatmapOsz()
+        {
+            var filename = Path.GetTempFileName() + ".osz";
+
+            using (var stream = TestResources.OpenResource("Archives/test-beatmap.osz"))
+            using (var file = File.Create(filename))
+                stream.CopyTo(file);
+
+            return filename;
+        }
+
+        private class TestBeatmapManager : BeatmapManager
+        {
+            public readonly ManualResetEventSlim AllowImport = new ManualResetEventSlim();
+
+            protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize)
+                => new TestDownloadRequest(set);
+
+            public TestBeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, GameHost host = null, WorkingBeatmap defaultBeatmap = null, bool performOnlineLookups = false)
+                : base(storage, contextFactory, rulesets, api, audioManager, host, defaultBeatmap, performOnlineLookups)
+            {
+            }
+
+            public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
+            {
+                while (!AllowImport.IsSet)
+                    await Task.Delay(10, cancellationToken);
+
+                return await base.Import(item, archive, cancellationToken);
+            }
+        }
+
+        private class TestDownloadRequest : ArchiveDownloadRequest<BeatmapSetInfo>
+        {
+            public new void SetProgress(double progress) => base.SetProgress(progress);
+
+            public TestDownloadRequest(BeatmapSetInfo model)
+                : base(model)
+            {
+            }
+
+            protected override string Target => null;
+        }
+    }
+}

From 59ae50b0e58d1ff813498093b39c60c73b3e790f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:02:30 +0300
Subject: [PATCH 07562/10326] Clean up ready button logic into using
 `MultiplayerBeatmapTracker`

---
 .../OnlinePlay/Components/ReadyButton.cs      | 62 +++----------------
 .../OnlinePlay/Match/Components/Footer.cs     |  4 --
 .../Match/MultiplayerMatchFooter.cs           |  5 --
 .../Match/MultiplayerReadyButton.cs           |  3 -
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  5 +-
 .../Playlists/PlaylistsReadyButton.cs         |  6 +-
 .../Playlists/PlaylistsRoomSubScreen.cs       |  5 +-
 7 files changed, 16 insertions(+), 74 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 64ddba669d..d4e34b5331 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -1,77 +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 System;
 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;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
     public abstract class ReadyButton : TriangleButton
     {
-        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
-
         public new readonly BindableBool Enabled = new BindableBool();
 
-        [Resolved]
-        protected IBindable<WorkingBeatmap> GameBeatmap { get; private set; }
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        private bool hasBeatmap;
-
-        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
-        private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
+        private IBindable<BeatmapAvailability> availability;
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(MultiplayerBeatmapTracker beatmapTracker)
         {
-            managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
-            managerUpdated.BindValueChanged(beatmapUpdated);
-            managerRemoved = beatmaps.ItemRemoved.GetBoundCopy();
-            managerRemoved.BindValueChanged(beatmapRemoved);
+            availability = beatmapTracker.Availability.GetBoundCopy();
 
-            SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
+            availability.BindValueChanged(_ => updateState());
+            Enabled.BindValueChanged(_ => updateState(), true);
         }
 
-        private void updateSelectedItem(PlaylistItem _) => Scheduler.AddOnce(updateBeatmapState);
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => Scheduler.AddOnce(updateBeatmapState);
-        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => Scheduler.AddOnce(updateBeatmapState);
-
-        private void updateBeatmapState()
-        {
-            int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
-            string checksum = SelectedItem.Value?.Beatmap.Value?.MD5Hash;
-
-            if (beatmapId == null || checksum == null)
-                return;
-
-            var databasedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
-
-            hasBeatmap = databasedBeatmap?.BeatmapSet?.DeletePending == false;
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            updateEnabledState();
-        }
-
-        private void updateEnabledState()
-        {
-            if (GameBeatmap.Value == null || SelectedItem.Value == null)
-            {
-                base.Enabled.Value = false;
-                return;
-            }
-
-            base.Enabled.Value = hasBeatmap && Enabled.Value;
-        }
+        private void updateState() => base.Enabled.Value = availability.Value.State == DownloadState.LocallyAvailable && Enabled.Value;
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
index 5c27d78d50..e91c46beed 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
@@ -3,13 +3,11 @@
 
 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;
 using osu.Game.Graphics;
-using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Playlists;
 using osuTK;
 
@@ -20,7 +18,6 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
         public const float HEIGHT = 50;
 
         public Action OnStart;
-        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
         private readonly Drawable background;
 
@@ -37,7 +34,6 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Size = new Vector2(600, 50),
-                    SelectedItem = { BindTarget = SelectedItem },
                     Action = () => OnStart?.Invoke()
                 }
             };
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index bbf861fac3..fdc1ae9d3c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -3,13 +3,11 @@
 
 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;
 using osu.Game.Graphics;
-using osu.Game.Online.Rooms;
 using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
@@ -18,8 +16,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
     {
         public const float HEIGHT = 50;
 
-        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
-
         public Action OnReadyClick
         {
             set => readyButton.OnReadyClick = value;
@@ -41,7 +37,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Size = new Vector2(600, 50),
-                    SelectedItem = { BindTarget = SelectedItem }
                 }
             };
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 04030cdbfd..389a2380fa 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -13,7 +13,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 
@@ -21,8 +20,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerReadyButton : MultiplayerRoomComposite
     {
-        public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
-
         public Action OnReadyClick
         {
             set => button.Action = value;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 80991569dc..a641935b9a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 new GridContainer
                 {
@@ -161,7 +161,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         {
                             new MultiplayerMatchFooter
                             {
-                                SelectedItem = { BindTarget = SelectedItem },
                                 OnReadyClick = onReadyClick
                             }
                         }
@@ -177,7 +176,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     RelativeSizeAxes = Axes.Both,
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            };
+            });
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
index edee8e571a..9ac1fe1722 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -15,6 +16,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved(typeof(Room), nameof(Room.EndDate))]
         private Bindable<DateTimeOffset?> endDate { get; set; }
 
+        [Resolved]
+        private IBindable<WorkingBeatmap> gameBeatmap { get; set; }
+
         public PlaylistsReadyButton()
         {
             Text = "Start";
@@ -32,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         {
             base.Update();
 
-            Enabled.Value = endDate.Value != null && DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
+            Enabled.Value = endDate.Value != null && DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(gameBeatmap.Value.Track.Length) < endDate.Value;
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index e76ca995bf..7b3cdf16db 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 new GridContainer
                 {
@@ -173,7 +173,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                             new Footer
                             {
                                 OnStart = onStart,
-                                SelectedItem = { BindTarget = SelectedItem }
                             }
                         }
                     },
@@ -189,7 +188,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     EditPlaylist = () => this.Push(new MatchSongSelect()),
                     State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            };
+            });
         }
 
         [Resolved]

From 63c0dc9bd9cf9d7c7f7251aa91d778c23a021071 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:04:28 +0300
Subject: [PATCH 07563/10326] Update ready button test scene with new logic

---
 .../TestSceneMultiplayerReadyButton.cs        | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 878776bf51..1357adb39a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
@@ -26,8 +27,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerReadyButton : MultiplayerTestScene
     {
         private MultiplayerReadyButton button;
+        private MultiplayerBeatmapTracker beatmapTracker;
         private BeatmapSetInfo importedSet;
 
+        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
+
         private BeatmapManager beatmaps;
         private RulesetStore rulesets;
 
@@ -39,6 +43,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
             beatmaps.Import(TestResources.GetTestBeatmapForImport(true)).Wait();
+
+            Add(beatmapTracker = new MultiplayerBeatmapTracker
+            {
+                SelectedItem = { BindTarget = selectedItem }
+            });
+
+            Dependencies.Cache(beatmapTracker);
         }
 
         [SetUp]
@@ -46,20 +57,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
             Beatmap.Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First());
+            selectedItem.Value = new PlaylistItem
+            {
+                Beatmap = { Value = Beatmap.Value.BeatmapInfo },
+                Ruleset = { Value = Beatmap.Value.BeatmapInfo.Ruleset },
+            };
 
-            Child = button = new MultiplayerReadyButton
+            if (button != null)
+                Remove(button);
+
+            Add(button = new MultiplayerReadyButton
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(200, 50),
-                SelectedItem =
-                {
-                    Value = new PlaylistItem
-                    {
-                        Beatmap = { Value = Beatmap.Value.BeatmapInfo },
-                        Ruleset = { Value = Beatmap.Value.BeatmapInfo.Ruleset }
-                    }
-                },
                 OnReadyClick = async () =>
                 {
                     readyClickOperation = OngoingOperationTracker.BeginOperation();
@@ -73,7 +84,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     await Client.ToggleReady();
                     readyClickOperation.Dispose();
                 }
-            };
+            });
         });
 
         [Test]

From bb0d2899931bbefedf3229d2b963a5d368fc6177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 16 Jan 2021 23:24:28 +0100
Subject: [PATCH 07564/10326] Split variable for readability

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d3273ba170..716796a585 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -426,7 +426,8 @@ namespace osu.Game
             {
                 var imports = tasks.Where(t => t.Path.EndsWith(ext, StringComparison.OrdinalIgnoreCase));
 
-                return fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(ext))?.Import(imports.ToArray()) ?? Task.CompletedTask;
+                var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(ext));
+                return importer?.Import(imports.ToArray()) ?? Task.CompletedTask;
             }));
         }
 

From dee46d7ba201e70c463f68f5b4cf38c43a87d085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 16 Jan 2021 23:42:28 +0100
Subject: [PATCH 07565/10326] Use GroupBy() instead

---
 osu.Game/OsuGameBase.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 716796a585..1f8ae54e55 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -421,13 +421,11 @@ namespace osu.Game
 
         public virtual async Task Import(params ImportTask[] tasks)
         {
-            var extensions = tasks.Select(t => Path.GetExtension(t.Path).ToLowerInvariant()).Distinct();
-            await Task.WhenAll(extensions.Select(ext =>
+            var tasksPerExtension = tasks.GroupBy(t => Path.GetExtension(t.Path).ToLowerInvariant());
+            await Task.WhenAll(tasksPerExtension.Select(taskGroup =>
             {
-                var imports = tasks.Where(t => t.Path.EndsWith(ext, StringComparison.OrdinalIgnoreCase));
-
-                var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(ext));
-                return importer?.Import(imports.ToArray()) ?? Task.CompletedTask;
+                var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(taskGroup.Key));
+                return importer?.Import(taskGroup.ToArray()) ?? Task.CompletedTask;
             }));
         }
 

From 816cc7a59b146cff51773d9f3ec862e0d61af7ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 17 Jan 2021 00:35:23 +0100
Subject: [PATCH 07566/10326] Adjust explicit label spacing on beatmap set
 overlay

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

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 9f2b40dfa4..a84ed5ac29 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -145,14 +145,14 @@ namespace osu.Game.Overlays.BeatmapSet
                                                     {
                                                         Anchor = Anchor.BottomLeft,
                                                         Origin = Anchor.BottomLeft,
-                                                        Margin = new MarginPadding { Left = 3, Bottom = 4 }, // To better lineup with the font
+                                                        Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
                                                     },
                                                     explicitPill = new ExplicitBeatmapPill
                                                     {
                                                         Alpha = 0f,
-                                                        Anchor = Anchor.CentreLeft,
-                                                        Origin = Anchor.CentreLeft,
-                                                        Margin = new MarginPadding { Left = 15f, Top = 4 },
+                                                        Anchor = Anchor.BottomLeft,
+                                                        Origin = Anchor.BottomLeft,
+                                                        Margin = new MarginPadding { Left = 10, Bottom = 4 },
                                                     }
                                                 }
                                             },

From eb53e32792dcb36c1aac9d612dc24f09733487dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 17 Jan 2021 14:40:22 +0100
Subject: [PATCH 07567/10326] Use task completion source for room join flow

On Android, users were unable to join or create multiplayer rooms. The
root cause of that was that the both the wait and set of the
`ManualResetEvent` in `getRoomUsers` occurred on the same thread, which
created a chicken-and-egg situation - the set could not proceed until
the wait had actually completed.

Resolve by substituting the `ManualResetEvent` for a
`TaskCompletionSource` to achieve a promise-style task, which the
previous code was a crude approximation of anyway.

Closes #11385.
---
 .../Multiplayer/StatefulMultiplayerClient.cs   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index fbdfb6a8c5..f0e11b2b8b 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -128,7 +127,8 @@ namespace osu.Game.Online.Multiplayer
 
             Debug.Assert(Room != null);
 
-            var users = getRoomUsers();
+            var users = await getRoomUsers();
+            Debug.Assert(users != null);
 
             await Task.WhenAll(users.Select(PopulateUser));
 
@@ -437,24 +437,20 @@ namespace osu.Game.Online.Multiplayer
         /// This should be used whenever accessing users from outside of an Update thread context (ie. when not calling <see cref="Drawable.Schedule"/>).
         /// </summary>
         /// <returns>A copy of users in the current room, or null if unavailable.</returns>
-        private List<MultiplayerRoomUser>? getRoomUsers()
+        private Task<List<MultiplayerRoomUser>?> getRoomUsers()
         {
-            List<MultiplayerRoomUser>? users = null;
-
-            ManualResetEventSlim resetEvent = new ManualResetEventSlim();
+            var tcs = new TaskCompletionSource<List<MultiplayerRoomUser>?>();
 
             // at some point we probably want to replace all these schedule calls with Room.LockForUpdate.
             // for now, as this would require quite some consideration due to the number of accesses to the room instance,
             // let's just add a manual schedule for the non-scheduled usages instead.
             Scheduler.Add(() =>
             {
-                users = Room?.Users.ToList();
-                resetEvent.Set();
+                var users = Room?.Users.ToList();
+                tcs.SetResult(users);
             }, false);
 
-            resetEvent.Wait(100);
-
-            return users;
+            return tcs.Task;
         }
 
         /// <summary>

From 5fd644fc576de33cab2f4b0daeb323b262b3b98e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 17 Jan 2021 22:40:24 +0900
Subject: [PATCH 07568/10326] Unify variable names

---
 .../TestSceneBeatmapListingSearchControl.cs            | 10 +++++-----
 osu.Game/Configuration/OsuConfigManager.cs             |  4 ++--
 .../Online/API/Requests/SearchBeatmapSetsRequest.cs    |  8 ++++----
 .../BeatmapListing/BeatmapListingFilterControl.cs      |  4 ++--
 .../BeatmapListing/BeatmapListingSearchControl.cs      | 10 +++++-----
 .../Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs |  2 +-
 .../Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs |  2 +-
 ...citBeatmapPill.cs => ExplicitContentBeatmapPill.cs} |  4 ++--
 osu.Game/Overlays/BeatmapSet/Header.cs                 |  6 +++---
 .../Overlays/Settings/Sections/Online/WebSettings.cs   |  2 +-
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs     |  6 +++---
 11 files changed, 29 insertions(+), 29 deletions(-)
 rename osu.Game/Overlays/BeatmapSet/{ExplicitBeatmapPill.cs => ExplicitContentBeatmapPill.cs} (92%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index dc46da6293..a9747e73f9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.Extra.BindCollectionChanged((u, v) => extra.Text = $"Extra: {(control.Extra.Any() ? string.Join('.', control.Extra.Select(i => i.ToString().ToLowerInvariant())) : "")}", true);
             control.Ranks.BindCollectionChanged((u, v) => ranks.Text = $"Ranks: {(control.Ranks.Any() ? string.Join('.', control.Ranks.Select(i => i.ToString())) : "")}", true);
             control.Played.BindValueChanged(p => played.Text = $"Played: {p.NewValue}", true);
-            control.Explicit.BindValueChanged(e => explicitMap.Text = $"Explicit Maps: {e.NewValue}", true);
+            control.ExplicitContent.BindValueChanged(e => explicitMap.Text = $"Explicit Maps: {e.NewValue}", true);
         });
 
         [Test]
@@ -92,11 +92,11 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestExplicitConfig()
         {
-            AddStep("configure explicit content to allowed", () => localConfig.Set(OsuSetting.AllowExplicitContent, true));
-            AddAssert("explicit control set to show", () => control.Explicit.Value == SearchExplicit.Show);
+            AddStep("configure explicit content to allowed", () => localConfig.Set(OsuSetting.ShowOnlineExplicitContent, true));
+            AddAssert("explicit control set to show", () => control.ExplicitContent.Value == SearchExplicit.Show);
 
-            AddStep("configure explicit content to disallowed", () => localConfig.Set(OsuSetting.AllowExplicitContent, false));
-            AddAssert("explicit control set to hide", () => control.Explicit.Value == SearchExplicit.Hide);
+            AddStep("configure explicit content to disallowed", () => localConfig.Set(OsuSetting.ShowOnlineExplicitContent, false));
+            AddAssert("explicit control set to hide", () => control.ExplicitContent.Value == SearchExplicit.Hide);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 5e7a843baf..6b48501dac 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.ExternalLinkWarning, true);
             Set(OsuSetting.PreferNoVideo, false);
 
-            Set(OsuSetting.AllowExplicitContent, false);
+            Set(OsuSetting.ShowOnlineExplicitContent, false);
 
             // Audio
             Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
@@ -272,6 +272,6 @@ namespace osu.Game.Configuration
         EditorWaveformOpacity,
         DiscordRichPresence,
         AutomaticallyDownloadWhenSpectating,
-        AllowExplicitContent,
+        ShowOnlineExplicitContent,
     }
 }
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 939d3c6cb4..5360d36f3d 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Online.API.Requests
 
         public SearchPlayed Played { get; }
 
-        public SearchExplicit Explicit { get; }
+        public SearchExplicit ExplicitContent { get; }
 
         [CanBeNull]
         public IReadOnlyCollection<ScoreRank> Ranks { get; }
@@ -53,7 +53,7 @@ namespace osu.Game.Online.API.Requests
             IReadOnlyCollection<SearchExtra> extra = null,
             IReadOnlyCollection<ScoreRank> ranks = null,
             SearchPlayed played = SearchPlayed.Any,
-            SearchExplicit explicitMaps = SearchExplicit.Hide)
+            SearchExplicit explicitContent = SearchExplicit.Hide)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
@@ -67,7 +67,7 @@ namespace osu.Game.Online.API.Requests
             Extra = extra;
             Ranks = ranks;
             Played = played;
-            Explicit = explicitMaps;
+            ExplicitContent = explicitContent;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -97,7 +97,7 @@ namespace osu.Game.Online.API.Requests
             if (Played != SearchPlayed.Any)
                 req.AddParameter("played", Played.ToString().ToLowerInvariant());
 
-            req.AddParameter("nsfw", Explicit == SearchExplicit.Show ? "true" : "false");
+            req.AddParameter("nsfw", ExplicitContent == SearchExplicit.Show ? "true" : "false");
 
             req.AddCursor(cursor);
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 650adcb4a9..bcc5a91677 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.BeatmapListing
             searchControl.Extra.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Ranks.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Played.BindValueChanged(_ => queueUpdateSearch());
-            searchControl.Explicit.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.ExplicitContent.BindValueChanged(_ => queueUpdateSearch());
 
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
@@ -195,7 +195,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 searchControl.Extra,
                 searchControl.Ranks,
                 searchControl.Played.Value,
-                searchControl.Explicit.Value);
+                searchControl.ExplicitContent.Value);
 
             getSetsRequest.Success += response =>
             {
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 5c6267b726..b138a5ac52 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<SearchPlayed> Played => playedFilter.Current;
 
-        public Bindable<SearchExplicit> Explicit => explicitFilter.Current;
+        public Bindable<SearchExplicit> ExplicitContent => explicitContentFilter.Current;
 
         public BeatmapSetInfo BeatmapSet
         {
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchMultipleSelectionFilterRow<SearchExtra> extraFilter;
         private readonly BeatmapSearchScoreFilterRow ranksFilter;
         private readonly BeatmapSearchFilterRow<SearchPlayed> playedFilter;
-        private readonly BeatmapSearchFilterRow<SearchExplicit> explicitFilter;
+        private readonly BeatmapSearchFilterRow<SearchExplicit> explicitContentFilter;
 
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
@@ -130,7 +130,7 @@ namespace osu.Game.Overlays.BeatmapListing
                                     extraFilter = new BeatmapSearchMultipleSelectionFilterRow<SearchExtra>(@"Extra"),
                                     ranksFilter = new BeatmapSearchScoreFilterRow(),
                                     playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played"),
-                                    explicitFilter = new BeatmapSearchFilterRow<SearchExplicit>(@"Explicit Maps"),
+                                    explicitContentFilter = new BeatmapSearchFilterRow<SearchExplicit>(@"Explicit Content"),
                                 }
                             }
                         }
@@ -148,10 +148,10 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             background.Colour = colourProvider.Dark6;
 
-            allowExplicitContent = config.GetBindable<bool>(OsuSetting.AllowExplicitContent);
+            allowExplicitContent = config.GetBindable<bool>(OsuSetting.ShowOnlineExplicitContent);
             allowExplicitContent.BindValueChanged(allow =>
             {
-                Explicit.Value = allow.NewValue ? SearchExplicit.Show : SearchExplicit.Hide;
+                ExplicitContent.Value = allow.NewValue ? SearchExplicit.Show : SearchExplicit.Hide;
             }, true);
         }
 
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index b7002a96e5..c1d366bb82 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -205,7 +205,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 
             if (SetInfo.OnlineInfo?.HasExplicitContent ?? false)
             {
-                titleContainer.Add(new ExplicitBeatmapPill
+                titleContainer.Add(new ExplicitContentBeatmapPill
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 69671ab75b..76a30d1c11 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 
             if (SetInfo.OnlineInfo?.HasExplicitContent ?? false)
             {
-                titleContainer.Add(new ExplicitBeatmapPill
+                titleContainer.Add(new ExplicitContentBeatmapPill
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs b/osu.Game/Overlays/BeatmapSet/ExplicitContentBeatmapPill.cs
similarity index 92%
rename from osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
rename to osu.Game/Overlays/BeatmapSet/ExplicitContentBeatmapPill.cs
index aefb3299a5..329f8ee0a2 100644
--- a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
+++ b/osu.Game/Overlays/BeatmapSet/ExplicitContentBeatmapPill.cs
@@ -10,9 +10,9 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public class ExplicitBeatmapPill : CompositeDrawable
+    public class ExplicitContentBeatmapPill : CompositeDrawable
     {
-        public ExplicitBeatmapPill()
+        public ExplicitContentBeatmapPill()
         {
             AutoSizeAxes = Axes.Both;
         }
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 876a7e8917..916c21c010 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly Box coverGradient;
         private readonly OsuSpriteText title, artist;
         private readonly AuthorInfo author;
-        private readonly ExplicitBeatmapPill explicitPill;
+        private readonly ExplicitContentBeatmapPill explicitContentPill;
         private readonly FillFlowContainer downloadButtonsContainer;
         private readonly BeatmapAvailability beatmapAvailability;
         private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
@@ -147,7 +147,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                                         Origin = Anchor.BottomLeft,
                                                         Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
                                                     },
-                                                    explicitPill = new ExplicitBeatmapPill
+                                                    explicitContentPill = new ExplicitContentBeatmapPill
                                                     {
                                                         Alpha = 0f,
                                                         Anchor = Anchor.BottomLeft,
@@ -261,7 +261,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
                     artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
 
-                    explicitPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
+                    explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
 
                     onlineStatusPill.FadeIn(500, Easing.OutQuint);
                     onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index da7ef46f65..3e1cc1d91e 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                 {
                     LabelText = "Hide warnings for explicit content in beatmaps",
                     Keywords = new[] { "nsfw", "18+", "offensive" },
-                    Current = config.GetBindable<bool>(OsuSetting.AllowExplicitContent),
+                    Current = config.GetBindable<bool>(OsuSetting.ShowOnlineExplicitContent),
                 }
             };
         }
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 7987d715e3..b16f82fce9 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay
         private Container difficultyIconContainer;
         private LinkFlowContainer beatmapText;
         private LinkFlowContainer authorText;
-        private ExplicitBeatmapPill explicitPill;
+        private ExplicitContentBeatmapPill explicitContentPill;
         private ModDisplay modDisplay;
 
         private readonly Bindable<BeatmapInfo> beatmap = new Bindable<BeatmapInfo>();
@@ -119,7 +119,7 @@ namespace osu.Game.Screens.OnlinePlay
             }
 
             bool hasExplicitContent = Item.Beatmap.Value.BeatmapSet.OnlineInfo?.HasExplicitContent == true;
-            explicitPill.Alpha = hasExplicitContent ? 1 : 0;
+            explicitContentPill.Alpha = hasExplicitContent ? 1 : 0;
 
             modDisplay.Current.Value = requiredMods.ToArray();
         }
@@ -181,7 +181,7 @@ namespace osu.Game.Screens.OnlinePlay
                                             Children = new Drawable[]
                                             {
                                                 authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
-                                                explicitPill = new ExplicitBeatmapPill
+                                                explicitContentPill = new ExplicitContentBeatmapPill
                                                 {
                                                     Alpha = 0f,
                                                     Anchor = Anchor.CentreLeft,

From 5278cad393aeb1d76f7603cda445fb67b2d46234 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 17 Jan 2021 22:40:58 +0900
Subject: [PATCH 07569/10326] Reword setting to make more sense

---
 osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index 3e1cc1d91e..59bcbe4d89 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = "Hide warnings for explicit content in beatmaps",
+                    LabelText = "Show explicit content in search results",
                     Keywords = new[] { "nsfw", "18+", "offensive" },
                     Current = config.GetBindable<bool>(OsuSetting.ShowOnlineExplicitContent),
                 }

From 39746cb3de8ad11221ff1766822f720918d49858 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 00:11:35 +0900
Subject: [PATCH 07570/10326] Test removing nuget restore from iOS/Android
 build scripts

---
 fastlane/Fastfile | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8c278604aa..18b5907e82 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -48,10 +48,6 @@ desc 'Deploy to play store'
 
   desc 'Compile the project'
   lane :build do |options|
-    nuget_restore(
-      project_path: 'osu.sln'
-    )
-
     souyuz(
       build_configuration: 'Release',
       solution_path: 'osu.sln',
@@ -107,10 +103,6 @@ platform :ios do
 
   desc 'Compile the project'
   lane :build do
-    nuget_restore(
-      project_path: 'osu.sln'
-    )
-
     souyuz(
       platform: "ios",
       plist_path: "osu.iOS/Info.plist"

From 585aa87c5389b16dc9c8d4c17c38365cb0100174 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 19:17:14 +0300
Subject: [PATCH 07571/10326] Fix playlist item download button never shown
 back after hiding

---
 .../Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs   | 8 +++++++-
 osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs   | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 17d85d1120..c6cfd3c64a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -201,11 +201,17 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         [Test]
-        public void TestDownloadButtonHiddenInitiallyWhenBeatmapExists()
+        public void TestDownloadButtonHiddenWhenBeatmapExists()
         {
             createPlaylist(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo);
 
             AddAssert("download button hidden", () => !playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
+
+            AddStep("delete beatmap set", () => manager.Delete(manager.QueryBeatmapSets(_ => true).Single()));
+            AddUntilStep("download button shown", () => playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
+
+            AddStep("undelete beatmap set", () => manager.Undelete(manager.QueryBeatmapSets(_ => true).Single()));
+            AddUntilStep("download button hidden", () => !playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
         }
 
         [Test]
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index b16f82fce9..f8982582d5 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -249,6 +249,8 @@ namespace osu.Game.Screens.OnlinePlay
             [Resolved]
             private BeatmapManager beatmapManager { get; set; }
 
+            public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
+
             public PlaylistDownloadButton(PlaylistItem playlistItem)
                 : base(playlistItem.Beatmap.Value.BeatmapSet)
             {

From 2b23c8eabd02a1c3743d7538bbecb9ae3d224333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 17 Jan 2021 18:08:58 +0100
Subject: [PATCH 07572/10326] Use alpha directly for checking visibility in
 test

`IsPresent` is no longer synonymous with being visible, after applying
the fix to the issue in question.
---
 .../Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index c6cfd3c64a..874c1694eb 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -205,13 +205,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             createPlaylist(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo);
 
-            AddAssert("download button hidden", () => !playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
+            assertDownloadButtonVisible(false);
 
             AddStep("delete beatmap set", () => manager.Delete(manager.QueryBeatmapSets(_ => true).Single()));
-            AddUntilStep("download button shown", () => playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
+            assertDownloadButtonVisible(true);
 
             AddStep("undelete beatmap set", () => manager.Undelete(manager.QueryBeatmapSets(_ => true).Single()));
-            AddUntilStep("download button hidden", () => !playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
+            assertDownloadButtonVisible(false);
+
+            void assertDownloadButtonVisible(bool visible) => AddUntilStep($"download button {(visible ? "shown" : "hidden")}",
+                () => playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().Alpha == (visible ? 1 : 0));
         }
 
         [Test]

From 172552d55173791a5a5293bcab1d2240b8b02783 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 21:02:33 +0300
Subject: [PATCH 07573/10326] Use `TaskCompletionSource` for better awaiting

---
 .../Online/TestSceneMultiplayerBeatmapTracker.cs   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 839d47afc2..05e8f8b2e4 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -47,6 +47,8 @@ namespace osu.Game.Tests.Online
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            beatmaps.AllowImport = new TaskCompletionSource<bool>();
+
             testBeatmapFile = getTestBeatmapOsz();
 
             testBeatmapInfo = new TestBeatmap(Ruleset.Value).BeatmapInfo;
@@ -83,7 +85,7 @@ namespace osu.Game.Tests.Online
             AddStep("finish download", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).TriggerSuccess(testBeatmapFile));
             addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
 
-            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
             AddUntilStep("wait for import", () => beatmaps.IsAvailableLocally(testBeatmapSet));
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
         }
@@ -91,7 +93,7 @@ namespace osu.Game.Tests.Online
         [Test]
         public void TestTrackerRespectsSoftDeleting()
         {
-            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
             AddStep("import beatmap", () => beatmaps.Import(testBeatmapSet).Wait());
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
 
@@ -105,7 +107,7 @@ namespace osu.Game.Tests.Online
         [Test]
         public void TestTrackerRespectsChecksum()
         {
-            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
 
             BeatmapInfo wrongBeatmap = null;
 
@@ -144,7 +146,7 @@ namespace osu.Game.Tests.Online
 
         private class TestBeatmapManager : BeatmapManager
         {
-            public readonly ManualResetEventSlim AllowImport = new ManualResetEventSlim();
+            public TaskCompletionSource<bool> AllowImport = new TaskCompletionSource<bool>();
 
             protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize)
                 => new TestDownloadRequest(set);
@@ -156,9 +158,7 @@ namespace osu.Game.Tests.Online
 
             public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
             {
-                while (!AllowImport.IsSet)
-                    await Task.Delay(10, cancellationToken);
-
+                await AllowImport.Task;
                 return await base.Import(item, archive, cancellationToken);
             }
         }

From d93a853dfd531e9d8d83473b04e3c22b5d290023 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 21:16:45 +0300
Subject: [PATCH 07574/10326] Enforce `float` type in the download progress
 path instead

---
 .../Online/TestSceneMultiplayerBeatmapTracker.cs       |  8 ++++----
 osu.Game/Online/API/ArchiveDownloadRequest.cs          |  6 +++---
 osu.Game/Online/DownloadTrackingComposite.cs           |  2 +-
 osu.Game/Online/Rooms/BeatmapAvailability.cs           |  6 +++---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs     |  2 +-
 .../Overlays/Notifications/ProgressNotification.cs     | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 05e8f8b2e4..60a4508b3d 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -77,10 +77,10 @@ namespace osu.Game.Tests.Online
             addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
 
             AddStep("start downloading", () => beatmaps.Download(testBeatmapSet));
-            addAvailabilityCheckStep("state downloading 0%", () => BeatmapAvailability.Downloading(0.0));
+            addAvailabilityCheckStep("state downloading 0%", () => BeatmapAvailability.Downloading(0.0f));
 
-            AddStep("set progress 40%", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).SetProgress(0.4));
-            addAvailabilityCheckStep("state downloading 40%", () => BeatmapAvailability.Downloading(0.4));
+            AddStep("set progress 40%", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).SetProgress(0.4f));
+            addAvailabilityCheckStep("state downloading 40%", () => BeatmapAvailability.Downloading(0.4f));
 
             AddStep("finish download", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).TriggerSuccess(testBeatmapFile));
             addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
@@ -165,7 +165,7 @@ namespace osu.Game.Tests.Online
 
         private class TestDownloadRequest : ArchiveDownloadRequest<BeatmapSetInfo>
         {
-            public new void SetProgress(double progress) => base.SetProgress(progress);
+            public new void SetProgress(float progress) => base.SetProgress(progress);
 
             public TestDownloadRequest(BeatmapSetInfo model)
                 : base(model)
diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index fdb2a984dc..ccb4e9c119 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -12,16 +12,16 @@ namespace osu.Game.Online.API
 
         public double Progress { get; private set; }
 
-        public event Action<double> DownloadProgressed;
+        public event Action<float> DownloadProgressed;
 
         protected ArchiveDownloadRequest(TModel model)
         {
             Model = model;
 
-            Progressed += (current, total) => SetProgress((double)current / total);
+            Progressed += (current, total) => SetProgress((float)current / total);
         }
 
-        protected void SetProgress(double progress)
+        protected void SetProgress(float progress)
         {
             Progress = progress;
             DownloadProgressed?.Invoke(progress);
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index b72cf38369..1631d9790b 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Online
 
         private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Importing);
 
-        private void onRequestProgress(double progress) => Schedule(() => Progress.Value = progress);
+        private void onRequestProgress(float progress) => Schedule(() => Progress.Value = progress);
 
         private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
 
diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index e7dbc5f436..170009a85b 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -19,17 +19,17 @@ namespace osu.Game.Online.Rooms
         /// <summary>
         /// The beatmap's downloading progress, null when not in <see cref="DownloadState.Downloading"/> state.
         /// </summary>
-        public readonly double? DownloadProgress;
+        public readonly float? DownloadProgress;
 
         [JsonConstructor]
-        private BeatmapAvailability(DownloadState state, double? downloadProgress = null)
+        private BeatmapAvailability(DownloadState state, float? downloadProgress = null)
         {
             State = state;
             DownloadProgress = downloadProgress;
         }
 
         public static BeatmapAvailability NotDownloaded() => new BeatmapAvailability(DownloadState.NotDownloaded);
-        public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
+        public static BeatmapAvailability Downloading(float progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
         public static BeatmapAvailability Importing() => new BeatmapAvailability(DownloadState.Importing);
         public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);
 
diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index b22d17f3ef..b15399ad62 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Online.Rooms
                     break;
 
                 case DownloadState.Downloading:
-                    availability.Value = BeatmapAvailability.Downloading(Progress.Value);
+                    availability.Value = BeatmapAvailability.Downloading((float)Progress.Value);
                     break;
 
                 case DownloadState.Importing:
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index e18bab8e83..3105ecd742 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -23,9 +23,9 @@ namespace osu.Game.Overlays.Notifications
 
         public string CompletionText { get; set; } = "Task has completed!";
 
-        private double progress;
+        private float progress;
 
-        public double Progress
+        public float Progress
         {
             get => progress;
             set
@@ -185,9 +185,9 @@ namespace osu.Game.Overlays.Notifications
             private Color4 colourActive;
             private Color4 colourInactive;
 
-            private double progress;
+            private float progress;
 
-            public double Progress
+            public float Progress
             {
                 get => progress;
                 set
@@ -195,7 +195,7 @@ namespace osu.Game.Overlays.Notifications
                     if (progress == value) return;
 
                     progress = value;
-                    box.ResizeTo(new Vector2((float)progress, 1), 100, Easing.OutQuad);
+                    box.ResizeTo(new Vector2(progress, 1), 100, Easing.OutQuad);
                 }
             }
 

From 0425a659a8c0bae3117e77dd512e899ca6a5c3da Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 21:19:55 +0300
Subject: [PATCH 07575/10326] Add null-permissive operator to manager back

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

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 1631d9790b..188cb9be7a 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Online
         /// By default, this calls <see cref="IModelDownloader{TModel}.IsAvailableLocally"/>,
         /// but can be overriden to add additional checks for verifying the model in database.
         /// </summary>
-        protected virtual bool IsModelAvailableLocally() => Manager.IsAvailableLocally(Model.Value);
+        protected virtual bool IsModelAvailableLocally() => Manager?.IsAvailableLocally(Model.Value) == true;
 
         private void downloadBegan(ValueChangedEvent<WeakReference<ArchiveDownloadRequest<TModel>>> weakRequest)
         {

From ccef50e2a2e16767565c75bdc70c52faba7c57e4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 22:04:12 +0300
Subject: [PATCH 07576/10326] Log important message if user imported
 bad-checksum beatmap

---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index b15399ad62..659f52f00f 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Online.Rooms
@@ -34,6 +35,15 @@ namespace osu.Game.Online.Rooms
         }
 
         protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)
+        {
+            var verified = verifyDatabasedModel(databasedSet);
+            if (!verified)
+                Logger.Log("The imported beatmapset does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
+
+            return verified;
+        }
+
+        private bool verifyDatabasedModel(BeatmapSetInfo databasedSet)
         {
             int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
             string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;

From b6a37c1c15fe2a95b7efb94b61e37de132d9864e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 22:08:28 +0300
Subject: [PATCH 07577/10326] Make `TriggerSuccess(filename)` protected and
 expose in test instead

---
 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs | 1 +
 osu.Game/Online/API/APIDownloadRequest.cs                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 60a4508b3d..4b8992052e 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -166,6 +166,7 @@ namespace osu.Game.Tests.Online
         private class TestDownloadRequest : ArchiveDownloadRequest<BeatmapSetInfo>
         {
             public new void SetProgress(float progress) => base.SetProgress(progress);
+            public new void TriggerSuccess(string filename) => base.TriggerSuccess(filename);
 
             public TestDownloadRequest(BeatmapSetInfo model)
                 : base(model)
diff --git a/osu.Game/Online/API/APIDownloadRequest.cs b/osu.Game/Online/API/APIDownloadRequest.cs
index 02c589403c..62e22d8f88 100644
--- a/osu.Game/Online/API/APIDownloadRequest.cs
+++ b/osu.Game/Online/API/APIDownloadRequest.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Online.API
 
         private void request_Progress(long current, long total) => API.Schedule(() => Progressed?.Invoke(current, total));
 
-        internal void TriggerSuccess(string filename)
+        protected void TriggerSuccess(string filename)
         {
             if (this.filename != null)
                 throw new InvalidOperationException("Attempted to trigger success more than once");

From ec00aaef90a9bfe8d768f01148f99a78d043401e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 Jan 2021 19:13:55 +0900
Subject: [PATCH 07578/10326] Add nuget deploys for all rulesets

---
 appveyor_deploy.yml                           | 73 +++++++++++++++----
 .../osu.Game.Rulesets.Catch.csproj            |  7 ++
 .../osu.Game.Rulesets.Mania.csproj            |  7 ++
 .../osu.Game.Rulesets.Osu.csproj              |  7 ++
 .../osu.Game.Rulesets.Taiko.csproj            |  7 ++
 5 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/appveyor_deploy.yml b/appveyor_deploy.yml
index bb4482f501..737e5c43ab 100644
--- a/appveyor_deploy.yml
+++ b/appveyor_deploy.yml
@@ -1,21 +1,68 @@
 clone_depth: 1
 version: '{build}'
 image: Visual Studio 2019
-dotnet_csproj:
-  patch: true
-  file: 'osu.Game\osu.Game.csproj' # Use wildcard when it's able to exclude Xamarin projects
-  version: $(APPVEYOR_REPO_TAG_NAME)
-before_build:
-  - ps: dotnet --info # Useful when version mismatch between CI and local
-  - ps: nuget restore -verbosity quiet # Only nuget.exe knows both new (.NET Core) and old (Xamarin) projects
 test: off
 skip_non_tags: true
 configuration: Release
-build:
-  project: build\Desktop.proj # Skipping Xamarin Release that's slow and covered by fastlane
-  parallel: true
-  verbosity: minimal
-  publish_nuget: true
+
+environment:
+  matrix:
+    - job_name: osu-game
+    - job_name: osu-ruleset
+      job_depends_on: osu-game
+    - job_name: taiko-ruleset
+      job_depends_on: osu-game
+    - job_name: catch-ruleset
+      job_depends_on: osu-game
+    - job_name: mania-ruleset
+      job_depends_on: osu-game
+
+nuget:
+  project_feed: true
+
+for:
+  -
+    matrix:
+      only:
+        - job_name: osu-game
+    build_script:
+      - cmd: dotnet pack osu.Game\osu.Game.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: osu-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: taiko-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: catch-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: mania-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+
+artifacts:
+  - path: '**\*.nupkg'
+
 deploy:
   - provider: Environment
-    name: nuget
+    name: nuget
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
index b19affbf9f..5bdf39824c 100644
--- a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
+++ b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
@@ -5,6 +5,13 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>catch the fruit. to the beat.</Description>
   </PropertyGroup>
+
+  <PropertyGroup Label="Nuget">
+    <Title>osu!catch</Title>
+    <PackageId>ppy.osu.Game.Rulesets.Catch</PackageId>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
index 07ef1022ae..c30fe8494f 100644
--- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
+++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
@@ -5,6 +5,13 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>smash the keys. to the beat.</Description>
   </PropertyGroup>
+
+  <PropertyGroup Label="Nuget">
+    <Title>osu!mania</Title>
+    <PackageId>ppy.osu.Game.Rulesets.Mania</PackageId>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
index bffeaabb55..36ee804259 100644
--- a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
+++ b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
@@ -5,6 +5,13 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>click the circles. to the beat.</Description>
   </PropertyGroup>
+
+  <PropertyGroup Label="Nuget">
+    <Title>osu!standard</Title>
+    <PackageId>ppy.osu.Game.Rulesets.Osu</PackageId>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
index ebed8c6d7c..00deb719e1 100644
--- a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
+++ b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
@@ -5,6 +5,13 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>bash the drum. to the beat.</Description>
   </PropertyGroup>
+
+  <PropertyGroup Label="Nuget">
+    <Title>osu!taiko</Title>
+    <PackageId>ppy.osu.Game.Rulesets.Taiko</PackageId>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>

From 1b166d809eb5bb5f04bdbcfabfba3916cd66a114 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 18 Jan 2021 11:07:54 +0900
Subject: [PATCH 07579/10326] Adjust package titles

---
 osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj | 2 +-
 osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj | 2 +-
 osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj     | 2 +-
 osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
index 5bdf39824c..e2f95ca177 100644
--- a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
+++ b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
-    <Title>osu!catch</Title>
+    <Title>osu!catch (ruleset)</Title>
     <PackageId>ppy.osu.Game.Rulesets.Catch</PackageId>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
index c30fe8494f..4f6840f9ca 100644
--- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
+++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
-    <Title>osu!mania</Title>
+    <Title>osu!mania (ruleset)</Title>
     <PackageId>ppy.osu.Game.Rulesets.Mania</PackageId>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
diff --git a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
index 36ee804259..98f1e69bd1 100644
--- a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
+++ b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
-    <Title>osu!standard</Title>
+    <Title>osu! (ruleset)</Title>
     <PackageId>ppy.osu.Game.Rulesets.Osu</PackageId>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
diff --git a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
index 00deb719e1..b752c13d18 100644
--- a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
+++ b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
-    <Title>osu!taiko</Title>
+    <Title>osu!taiko (ruleset)</Title>
     <PackageId>ppy.osu.Game.Rulesets.Taiko</PackageId>
     <IsPackable>true</IsPackable>
   </PropertyGroup>

From 94fee8c31d123b940ddf636cf6982152479cc7ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 16:13:58 +0900
Subject: [PATCH 07580/10326] Avoid doing a config lookup if initial
 conditional fails

---
 osu.Game/Skinning/SkinProvidingContainer.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index e97822b86e..27cf0c697a 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -74,8 +74,8 @@ namespace osu.Game.Skinning
             {
                 if (lookup is GlobalSkinColours || lookup is SkinCustomColourLookup)
                     return lookupWithFallback<TLookup, TValue>(lookup, AllowColourLookup);
-                else
-                    return lookupWithFallback<TLookup, TValue>(lookup, AllowConfigurationLookup);
+
+                return lookupWithFallback<TLookup, TValue>(lookup, AllowConfigurationLookup);
             }
 
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
@@ -83,11 +83,14 @@ namespace osu.Game.Skinning
 
         private IBindable<TValue> lookupWithFallback<TLookup, TValue>(TLookup lookup, bool canUseSkinLookup)
         {
-            var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-            if (bindable != null && canUseSkinLookup)
-                return bindable;
-            else
-                return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
+            if (canUseSkinLookup)
+            {
+                var bindable = skin.GetConfig<TLookup, TValue>(lookup);
+                if (bindable != null)
+                    return bindable;
+            }
+
+            return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
         }
 
         protected virtual void TriggerSourceChanged() => SourceChanged?.Invoke();

From 27ffc9844520036e81a652d9d8d7b45b7b5845be Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 18 Jan 2021 10:48:12 +0300
Subject: [PATCH 07581/10326] Implement WebOverlay component

---
 .../Online/TestSceneFullscreenOverlay.cs      |  4 +-
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 86 ++++++++-----------
 osu.Game/Overlays/BeatmapSetOverlay.cs        | 74 ++++++----------
 osu.Game/Overlays/ChangelogOverlay.cs         | 56 +++---------
 osu.Game/Overlays/DashboardOverlay.cs         | 56 ++----------
 osu.Game/Overlays/FullscreenOverlay.cs        | 26 +++++-
 osu.Game/Overlays/NewsOverlay.cs              | 62 +++----------
 osu.Game/Overlays/RankingsOverlay.cs          | 81 +++--------------
 osu.Game/Overlays/UserProfileOverlay.cs       | 13 ++-
 osu.Game/Overlays/WebOverlay.cs               | 50 +++++++++++
 10 files changed, 193 insertions(+), 315 deletions(-)
 create mode 100644 osu.Game/Overlays/WebOverlay.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
index 8f20bcdcc1..f8b059e471 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Online
         private class TestFullscreenOverlay : FullscreenOverlay<OverlayHeader>
         {
             public TestFullscreenOverlay()
-                : base(OverlayColourScheme.Pink, null)
+                : base(OverlayColourScheme.Pink)
             {
                 Children = new Drawable[]
                 {
@@ -52,6 +52,8 @@ namespace osu.Game.Tests.Visual.Online
                     },
                 };
             }
+
+            protected override OverlayHeader CreateHeader() => null;
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 0c9c995dd6..ae1667d403 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -15,98 +15,82 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 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.Overlays.BeatmapListing;
 using osu.Game.Overlays.BeatmapListing.Panels;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapListingOverlay : FullscreenOverlay<BeatmapListingHeader>
+    public class BeatmapListingOverlay : WebOverlay<BeatmapListingHeader>
     {
         [Resolved]
         private PreviewTrackManager previewTrackManager { get; set; }
 
         private Drawable currentContent;
-        private LoadingLayer loadingLayer;
         private Container panelTarget;
         private FillFlowContainer<BeatmapPanel> foundContent;
         private NotFoundDrawable notFoundContent;
-
-        private OverlayScrollContainer resultScrollContainer;
+        private BeatmapListingFilterControl filterControl;
 
         public BeatmapListingOverlay()
-            : base(OverlayColourScheme.Blue, new BeatmapListingHeader())
+            : base(OverlayColourScheme.Blue)
         {
         }
 
-        private BeatmapListingFilterControl filterControl;
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            Children = new Drawable[]
+            Child = new FillFlowContainer
             {
-                new Box
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = ColourProvider.Background6
-                },
-                resultScrollContainer = new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new ReverseChildIDFillFlowContainer<Drawable>
+                    filterControl = new BeatmapListingFilterControl
+                    {
+                        TypingStarted = onTypingStarted,
+                        SearchStarted = onSearchStarted,
+                        SearchFinished = onSearchFinished,
+                    },
+                    new Container
                     {
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
-                        Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header,
-                            filterControl = new BeatmapListingFilterControl
+                            new Box
                             {
-                                TypingStarted = onTypingStarted,
-                                SearchStarted = onSearchStarted,
-                                SearchFinished = onSearchFinished,
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = ColourProvider.Background4,
                             },
-                            new Container
+                            panelTarget = new Container
                             {
                                 AutoSizeAxes = Axes.Y,
                                 RelativeSizeAxes = Axes.X,
+                                Padding = new MarginPadding { Horizontal = 20 },
                                 Children = new Drawable[]
                                 {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = ColourProvider.Background4,
-                                    },
-                                    panelTarget = new Container
-                                    {
-                                        AutoSizeAxes = Axes.Y,
-                                        RelativeSizeAxes = Axes.X,
-                                        Padding = new MarginPadding { Horizontal = 20 },
-                                        Children = new Drawable[]
-                                        {
-                                            foundContent = new FillFlowContainer<BeatmapPanel>(),
-                                            notFoundContent = new NotFoundDrawable(),
-                                        }
-                                    }
-                                },
-                            },
-                        }
+                                    foundContent = new FillFlowContainer<BeatmapPanel>(),
+                                    notFoundContent = new NotFoundDrawable(),
+                                }
+                            }
+                        },
                     },
-                },
-                loadingLayer = new LoadingLayer(true)
+                }
             };
         }
 
+        protected override BeatmapListingHeader CreateHeader() => new BeatmapListingHeader();
+
+        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
+
         private void onTypingStarted()
         {
             // temporary until the textbox/header is updated to always stay on screen.
-            resultScrollContainer.ScrollToStart();
+            ScrollFlow.ScrollToStart();
         }
 
         protected override void OnFocus(FocusEvent e)
@@ -125,7 +109,7 @@ namespace osu.Game.Overlays
             previewTrackManager.StopAnyPlaying(this);
 
             if (panelTarget.Any())
-                loadingLayer.Show();
+                Loading.Show();
         }
 
         private Task panelLoadDelegate;
@@ -173,7 +157,7 @@ namespace osu.Game.Overlays
 
         private void addContentToPlaceholder(Drawable content)
         {
-            loadingLayer.Hide();
+            Loading.Hide();
             lastFetchDisplayedTime = Time.Current;
 
             var lastContent = currentContent;
@@ -256,7 +240,7 @@ namespace osu.Game.Overlays
 
             bool shouldShowMore = panelLoadDelegate?.IsCompleted != false
                                   && Time.Current - lastFetchDisplayedTime > time_between_fetches
-                                  && (resultScrollContainer.ScrollableExtent > 0 && resultScrollContainer.IsScrolledToEnd(pagination_scroll_distance));
+                                  && (ScrollFlow.ScrollableExtent > 0 && ScrollFlow.IsScrolledToEnd(pagination_scroll_distance));
 
             if (shouldShowMore)
                 filterControl.FetchNextPage();
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index bbec62a85a..10953415ed 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -6,7 +6,6 @@ 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.Beatmaps;
 using osu.Game.Graphics.Containers;
@@ -16,10 +15,11 @@ using osu.Game.Overlays.BeatmapSet.Scores;
 using osu.Game.Overlays.Comments;
 using osu.Game.Rulesets;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapSetOverlay : FullscreenOverlay<OverlayHeader> // we don't provide a standard header for now.
+    public class BeatmapSetOverlay : WebOverlay<OverlayHeader> // we don't provide a standard header for now.
     {
         public const float X_PADDING = 40;
         public const float Y_PADDING = 25;
@@ -36,55 +36,40 @@ 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, null)
+            : base(OverlayColourScheme.Blue)
         {
-            OverlayScrollContainer scroll;
             Info info;
             CommentsSection comments;
 
-            Children = new Drawable[]
+            Child = new FillFlowContainer
             {
-                background = new Box
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 20),
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both
-                },
-                scroll = new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new ReverseChildIDFillFlowContainer<BeatmapSetLayoutSection>
+                    new BeatmapSetLayoutSection
                     {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 20),
-                        Children = new[]
+                        Child = new ReverseChildIDFillFlowContainer<Drawable>
                         {
-                            new BeatmapSetLayoutSection
+                            AutoSizeAxes = Axes.Y,
+                            RelativeSizeAxes = Axes.X,
+                            Direction = FillDirection.Vertical,
+                            Children = new Drawable[]
                             {
-                                Child = 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 }
-                            },
-                            comments = new CommentsSection()
+                                Header = new Header(),
+                                info = new Info()
+                            }
                         },
                     },
-                },
+                    new ScoresContainer
+                    {
+                        Beatmap = { BindTarget = Header.Picker.Beatmap }
+                    },
+                    comments = new CommentsSection()
+                }
             };
 
             Header.BeatmapSet.BindTo(beatmapSet);
@@ -94,16 +79,13 @@ namespace osu.Game.Overlays
             Header.Picker.Beatmap.ValueChanged += b =>
             {
                 info.Beatmap = b.NewValue;
-
-                scroll.ScrollToStart();
+                ScrollFlow.ScrollToStart();
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            background.Colour = ColourProvider.Background6;
-        }
+        protected override OverlayHeader CreateHeader() => null;
+
+        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
 
         protected override void PopOutComplete()
         {
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index c7e9a86fa4..5d99887053 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -11,22 +11,18 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics.Containers;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Changelog;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class ChangelogOverlay : FullscreenOverlay<ChangelogHeader>
+    public class ChangelogOverlay : WebOverlay<ChangelogHeader>
     {
         public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
 
-        private Container<ChangelogContent> content;
-
         private SampleChannel sampleBack;
 
         private List<APIChangelogBuild> builds;
@@ -34,45 +30,14 @@ namespace osu.Game.Overlays
         protected List<APIUpdateStream> Streams;
 
         public ChangelogOverlay()
-            : base(OverlayColourScheme.Purple, new ChangelogHeader())
+            : base(OverlayColourScheme.Purple)
         {
         }
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = ColourProvider.Background4,
-                },
-                new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new ReverseChildIDFillFlowContainer<Drawable>
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
-                        {
-                            Header.With(h =>
-                            {
-                                h.ListingSelected = ShowListing;
-                                h.Build.BindTarget = Current;
-                            }),
-                            content = new Container<ChangelogContent>
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                            }
-                        },
-                    },
-                },
-            };
+            Header.Build.BindTarget = Current;
 
             sampleBack = audio.Samples.Get(@"UI/generic-select-soft");
 
@@ -85,6 +50,13 @@ namespace osu.Game.Overlays
             });
         }
 
+        protected override ChangelogHeader CreateHeader() => new ChangelogHeader
+        {
+            ListingSelected = ShowListing,
+        };
+
+        protected override Color4 GetBackgroundColour() => ColourProvider.Background4;
+
         public void ShowListing()
         {
             Current.Value = null;
@@ -198,16 +170,16 @@ namespace osu.Game.Overlays
 
         private void loadContent(ChangelogContent newContent)
         {
-            content.FadeTo(0.2f, 300, Easing.OutQuint);
+            Content.FadeTo(0.2f, 300, Easing.OutQuint);
 
             loadContentCancellation?.Cancel();
 
             LoadComponentAsync(newContent, c =>
             {
-                content.FadeIn(300, Easing.OutQuint);
+                Content.FadeIn(300, Easing.OutQuint);
 
                 c.BuildSelected = ShowBuild;
-                content.Child = c;
+                Child = c;
             }, (loadContentCancellation = new CancellationTokenSource()).Token);
         }
     }
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 03c320debe..3722d36388 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -7,29 +7,18 @@ 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;
 using osu.Game.Overlays.Dashboard;
 using osu.Game.Overlays.Dashboard.Friends;
 
 namespace osu.Game.Overlays
 {
-    public class DashboardOverlay : FullscreenOverlay<DashboardOverlayHeader>
+    public class DashboardOverlay : WebOverlay<DashboardOverlayHeader>
     {
         private CancellationTokenSource cancellationToken;
 
-        private Container content;
-        private LoadingLayer loading;
-        private OverlayScrollContainer scrollFlow;
-
         public DashboardOverlay()
-            : base(OverlayColourScheme.Purple, new DashboardOverlayHeader
-            {
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-                Depth = -float.MaxValue
-            })
+            : base(OverlayColourScheme.Purple)
         {
         }
 
@@ -40,45 +29,16 @@ namespace osu.Game.Overlays
         {
             apiState.BindTo(api.State);
             apiState.BindValueChanged(onlineStateChanged, true);
-
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = ColourProvider.Background5
-                },
-                scrollFlow = new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
-                        {
-                            Header,
-                            content = new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y
-                            }
-                        }
-                    }
-                },
-                loading = new LoadingLayer(true),
-            };
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-
             Header.Current.BindValueChanged(onTabChanged);
         }
 
+        protected override DashboardOverlayHeader CreateHeader() => new DashboardOverlayHeader();
+
         private bool displayUpdateRequired = true;
 
         protected override void PopIn()
@@ -102,21 +62,21 @@ namespace osu.Game.Overlays
 
         private void loadDisplay(Drawable display)
         {
-            scrollFlow.ScrollToStart();
+            ScrollFlow.ScrollToStart();
 
             LoadComponentAsync(display, loaded =>
             {
                 if (API.IsLoggedIn)
-                    loading.Hide();
+                    Loading.Hide();
 
-                content.Child = loaded;
+                Child = loaded;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
         private void onTabChanged(ValueChangedEvent<DashboardOverlayTabs> tab)
         {
             cancellationToken?.Cancel();
-            loading.Show();
+            Loading.Show();
 
             if (!API.IsLoggedIn)
             {
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 6f56d95929..d65213f573 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -6,6 +6,7 @@ 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.Containers;
 using osu.Game.Online.API;
 using osuTK.Graphics;
@@ -27,9 +28,13 @@ namespace osu.Game.Overlays
         [Cached]
         protected readonly OverlayColourProvider ColourProvider;
 
-        protected FullscreenOverlay(OverlayColourScheme colourScheme, T header)
+        protected override Container<Drawable> Content => content;
+
+        private readonly Container content;
+
+        protected FullscreenOverlay(OverlayColourScheme colourScheme)
         {
-            Header = header;
+            Header = CreateHeader();
 
             ColourProvider = new OverlayColourProvider(colourScheme);
 
@@ -47,6 +52,19 @@ namespace osu.Game.Overlays
                 Type = EdgeEffectType.Shadow,
                 Radius = 10
             };
+
+            base.Content.AddRange(new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = GetBackgroundColour()
+                },
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both
+                }
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -58,6 +76,10 @@ namespace osu.Game.Overlays
             Waves.FourthWaveColour = ColourProvider.Dark3;
         }
 
+        protected abstract T CreateHeader();
+
+        protected virtual Color4 GetBackgroundColour() => ColourProvider.Background5;
+
         public override void Show()
         {
             if (State.Value == Visibility.Visible)
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 5820d405d4..268d2bb6a2 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -2,67 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading;
-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.Overlays.News;
 using osu.Game.Overlays.News.Displays;
 
 namespace osu.Game.Overlays
 {
-    public class NewsOverlay : FullscreenOverlay<NewsHeader>
+    public class NewsOverlay : WebOverlay<NewsHeader>
     {
         private readonly Bindable<string> article = new Bindable<string>(null);
 
-        private Container content;
-        private LoadingLayer loading;
-        private OverlayScrollContainer scrollFlow;
-
         public NewsOverlay()
-            : base(OverlayColourScheme.Purple, new NewsHeader())
+            : base(OverlayColourScheme.Purple)
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = ColourProvider.Background5,
-                },
-                scrollFlow = new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
-                        {
-                            Header.With(h =>
-                            {
-                                h.ShowFrontPage = ShowFrontPage;
-                            }),
-                            content = new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                            }
-                        },
-                    },
-                },
-                loading = new LoadingLayer(true),
-            };
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -71,6 +26,11 @@ namespace osu.Game.Overlays
             article.BindValueChanged(onArticleChanged);
         }
 
+        protected override NewsHeader CreateHeader() => new NewsHeader
+        {
+            ShowFrontPage = ShowFrontPage
+        };
+
         private bool displayUpdateRequired = true;
 
         protected override void PopIn()
@@ -107,7 +67,7 @@ namespace osu.Game.Overlays
         private void onArticleChanged(ValueChangedEvent<string> e)
         {
             cancellationToken?.Cancel();
-            loading.Show();
+            Loading.Show();
 
             if (e.NewValue == null)
             {
@@ -122,11 +82,11 @@ namespace osu.Game.Overlays
 
         protected void LoadDisplay(Drawable display)
         {
-            scrollFlow.ScrollToStart();
+            ScrollFlow.ScrollToStart();
             LoadComponentAsync(display, loaded =>
             {
-                content.Child = loaded;
-                loading.Hide();
+                Child = loaded;
+                Loading.Hide();
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 25350e310a..89853e9044 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -4,96 +4,41 @@
 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.Overlays.Rankings;
 using osu.Game.Users;
 using osu.Game.Rulesets;
 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;
 
 namespace osu.Game.Overlays
 {
-    public class RankingsOverlay : FullscreenOverlay<RankingsOverlayHeader>
+    public class RankingsOverlay : WebOverlay<RankingsOverlayHeader>
     {
         protected Bindable<Country> Country => Header.Country;
 
         protected Bindable<RankingsScope> Scope => Header.Current;
 
-        private readonly OverlayScrollContainer scrollFlow;
-        private readonly Container contentContainer;
-        private readonly LoadingLayer loading;
-        private readonly Box background;
-
         private APIRequest lastRequest;
         private CancellationTokenSource cancellationToken;
 
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public RankingsOverlay()
-            : base(OverlayColourScheme.Green, new RankingsOverlayHeader
-            {
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-                Depth = -float.MaxValue
-            })
-        {
-            loading = new LoadingLayer(true);
+        [Resolved]
+        private Bindable<RulesetInfo> ruleset { get; set; }
 
-            Children = new Drawable[]
-            {
-                background = new Box
-                {
-                    RelativeSizeAxes = Axes.Both
-                },
-                scrollFlow = new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
-                        {
-                            Header,
-                            new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Children = new Drawable[]
-                                {
-                                    contentContainer = new Container
-                                    {
-                                        Anchor = Anchor.TopCentre,
-                                        Origin = Anchor.TopCentre,
-                                        AutoSizeAxes = Axes.Y,
-                                        RelativeSizeAxes = Axes.X,
-                                        Margin = new MarginPadding { Bottom = 10 }
-                                    },
-                                }
-                            }
-                        }
-                    }
-                },
-                loading
-            };
+        public RankingsOverlay()
+            : base(OverlayColourScheme.Green)
+        {
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            background.Colour = ColourProvider.Background5;
         }
 
-        [Resolved]
-        private Bindable<RulesetInfo> ruleset { get; set; }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -129,6 +74,8 @@ namespace osu.Game.Overlays
             Scheduler.AddOnce(loadNewContent);
         }
 
+        protected override RankingsOverlayHeader CreateHeader() => new RankingsOverlayHeader();
+
         public void ShowCountry(Country requested)
         {
             if (requested == null)
@@ -147,7 +94,7 @@ namespace osu.Game.Overlays
 
         private void loadNewContent()
         {
-            loading.Show();
+            Loading.Show();
 
             cancellationToken?.Cancel();
             lastRequest?.Cancel();
@@ -218,19 +165,19 @@ namespace osu.Game.Overlays
 
         private void loadContent(Drawable content)
         {
-            scrollFlow.ScrollToStart();
+            ScrollFlow.ScrollToStart();
 
             if (content == null)
             {
-                contentContainer.Clear();
-                loading.Hide();
+                Clear();
+                Loading.Hide();
                 return;
             }
 
             LoadComponentAsync(content, loaded =>
             {
-                loading.Hide();
-                contentContainer.Child = loaded;
+                Loading.Hide();
+                Child = loaded;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 81027667fa..c29df72501 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -15,6 +15,7 @@ using osu.Game.Overlays.Profile;
 using osu.Game.Overlays.Profile.Sections;
 using osu.Game.Users;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
@@ -29,10 +30,14 @@ namespace osu.Game.Overlays
         public const float CONTENT_X_MARGIN = 70;
 
         public UserProfileOverlay()
-            : base(OverlayColourScheme.Pink, new ProfileHeader())
+            : base(OverlayColourScheme.Pink)
         {
         }
 
+        protected override ProfileHeader CreateHeader() => new ProfileHeader();
+
+        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
+
         public void ShowUser(int userId) => ShowUser(new User { Id = userId });
 
         public void ShowUser(User user, bool fetchOnline = true)
@@ -72,12 +77,6 @@ namespace osu.Game.Overlays
                 Origin = Anchor.TopCentre,
             };
 
-            Add(new Box
-            {
-                RelativeSizeAxes = Axes.Both,
-                Colour = ColourProvider.Background6
-            });
-
             Add(sectionsContainer = new ProfileSectionsContainer
             {
                 ExpandableHeader = Header,
diff --git a/osu.Game/Overlays/WebOverlay.cs b/osu.Game/Overlays/WebOverlay.cs
new file mode 100644
index 0000000000..aca767e32f
--- /dev/null
+++ b/osu.Game/Overlays/WebOverlay.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.UserInterface;
+
+namespace osu.Game.Overlays
+{
+    public abstract class WebOverlay<T> : FullscreenOverlay<T>
+        where T : OverlayHeader
+    {
+        protected override Container<Drawable> Content => content;
+
+        protected readonly OverlayScrollContainer ScrollFlow;
+        protected readonly LoadingLayer Loading;
+        private readonly Container content;
+
+        protected WebOverlay(OverlayColourScheme colourScheme)
+            : base(colourScheme)
+        {
+            FillFlowContainer flow = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Direction = FillDirection.Vertical
+            };
+
+            if (Header != null)
+                flow.Add(Header.With(h => h.Depth = -float.MaxValue));
+
+            flow.Add(content = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y
+            });
+
+            base.Content.AddRange(new Drawable[]
+            {
+                ScrollFlow = new OverlayScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    ScrollbarVisible = false,
+                    Child = flow
+                },
+                Loading = new LoadingLayer(true)
+            });
+        }
+    }
+}

From 88abee705b37d0a6c9db00aa7b8a3f5323703590 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 10:48:53 +0300
Subject: [PATCH 07582/10326] Add missing event mapping for user beatmap
 availability change

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 50dc8f661c..6f789b1ef5 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -81,6 +81,7 @@ namespace osu.Game.Online.Multiplayer
             connection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
             connection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
             connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
+            connection.On<int, BeatmapAvailability>(nameof(IMultiplayerClient.UserBeatmapAvailabilityChanged), ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged);
             connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
             connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
             connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);

From 4e6c1a3906ed40be5752b13994499f73b4c10142 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 10:49:38 +0300
Subject: [PATCH 07583/10326] Update client beatmap availability in-line with
 tracker

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  2 ++
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index c049d4be20..7569da00f2 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -43,6 +43,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Cached]
         protected readonly MultiplayerBeatmapTracker BeatmapTracker;
 
+        protected IBindable<BeatmapAvailability> BeatmapAvailability => BeatmapTracker.Availability;
+
         protected RoomSubScreen()
         {
             InternalChild = BeatmapTracker = new MultiplayerBeatmapTracker
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index a641935b9a..94288673fb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -184,7 +184,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.LoadComplete();
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            BeatmapAvailability.BindValueChanged(updateClientAvailability, true);
 
+            client.RoomUpdated += onRoomUpdated;
             client.LoadRequested += onLoadRequested;
 
             isConnected = client.IsConnected.GetBoundCopy();
@@ -208,6 +210,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
+        private void updateClientAvailability(ValueChangedEvent<BeatmapAvailability> _ = null)
+        {
+            if (client.Room != null)
+                client.ChangeBeatmapAvailability(BeatmapAvailability.Value).CatchUnobservedExceptions(true);
+        }
+
+        private void onRoomUpdated()
+        {
+            if (client.Room == null)
+                return;
+
+            if (client.LocalUser?.BeatmapAvailability.Equals(BeatmapAvailability.Value) == false)
+                updateClientAvailability();
+        }
+
         private void onReadyClick()
         {
             Debug.Assert(readyClickOperation == null);
@@ -262,7 +279,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.Dispose(isDisposing);
 
             if (client != null)
+            {
                 client.LoadRequested -= onLoadRequested;
+                client.RoomUpdated -= onRoomUpdated;
+            }
         }
     }
 }

From bd44bf8c0b9348f9443df2dfc95470d86bd80ecf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 10:46:48 +0300
Subject: [PATCH 07584/10326] Extract disabling progress bar user-interactivity

---
 osu.Game/Graphics/UserInterface/ProgressBar.cs            | 8 +++++++-
 .../Overlays/BeatmapListing/Panels/DownloadProgressBar.cs | 8 +-------
 osu.Game/Overlays/NowPlayingOverlay.cs                    | 5 +++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ProgressBar.cs b/osu.Game/Graphics/UserInterface/ProgressBar.cs
index d271cd121c..4ee1c73bf5 100644
--- a/osu.Game/Graphics/UserInterface/ProgressBar.cs
+++ b/osu.Game/Graphics/UserInterface/ProgressBar.cs
@@ -40,8 +40,14 @@ namespace osu.Game.Graphics.UserInterface
             set => CurrentNumber.Value = value;
         }
 
-        public ProgressBar()
+        private readonly bool userInteractive;
+        public override bool HandlePositionalInput => userInteractive;
+        public override bool HandleNonPositionalInput => userInteractive;
+
+        public ProgressBar(bool userInteractive)
         {
+            this.userInteractive = userInteractive;
+
             CurrentNumber.MinValue = 0;
             CurrentNumber.MaxValue = 1;
             RelativeSizeAxes = Axes.X;
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs b/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
index 6a2f2e4569..ca94078401 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         public DownloadProgressBar(BeatmapSetInfo beatmapSet)
             : base(beatmapSet)
         {
-            AddInternal(progressBar = new InteractionDisabledProgressBar
+            AddInternal(progressBar = new ProgressBar(false)
             {
                 Height = 0,
                 Alpha = 0,
@@ -64,11 +64,5 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 }
             }, true);
         }
-
-        private class InteractionDisabledProgressBar : ProgressBar
-        {
-            public override bool HandlePositionalInput => false;
-            public override bool HandleNonPositionalInput => false;
-        }
     }
 }
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 9beb859f28..d64c61044d 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -411,6 +411,11 @@ namespace osu.Game.Overlays
 
         private class HoverableProgressBar : ProgressBar
         {
+            public HoverableProgressBar()
+                : base(true)
+            {
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 this.ResizeHeightTo(progress_height, 500, Easing.OutQuint);

From 02d2b2742b66d1bf6b9899430d90580f69872db1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 16:57:36 +0900
Subject: [PATCH 07585/10326] Fix selection box not updating with
 hitcircles/sliders far in the future or past

---
 .../Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs   | 2 +-
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
index 093bae854e..abbb54e3c1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
@@ -30,6 +30,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.HitArea.ReceivePositionalInputAt(screenSpacePos);
 
-        public override Quad SelectionQuad => DrawableObject.HitArea.ScreenSpaceDrawQuad;
+        public override Quad SelectionQuad => CirclePiece.ScreenSpaceDrawQuad;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index d592e129d9..3d3dff653a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }
 
+        public override Quad SelectionQuad => BodyPiece.ScreenSpaceDrawQuad;
+
         private readonly BindableList<PathControlPoint> controlPoints = new BindableList<PathControlPoint>();
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 

From c79ab63743e14b4205e40f33d5ae4519dfbeb58e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 16:56:10 +0900
Subject: [PATCH 07586/10326] Fix sliders with an even number of repeats not
 allowing rotation/scale transforms

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 660e1844aa..91bb665ee2 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -236,7 +236,18 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </summary>
         /// <param name="hitObjects">The hit objects to calculate a quad for.</param>
         private Quad getSurroundingQuad(OsuHitObject[] hitObjects) =>
-            getSurroundingQuad(hitObjects.SelectMany(h => new[] { h.Position, h.EndPosition }));
+            getSurroundingQuad(hitObjects.SelectMany(h =>
+            {
+                if (h is IHasPath path)
+                    return new[]
+                    {
+                        h.Position,
+                        // can't use EndPosition for reverse slider cases.
+                        h.Position + path.Path.PositionAt(1)
+                    };
+
+                return new[] { h.Position };
+            }));
 
         /// <summary>
         /// Returns a gamefield-space quad surrounding the provided points.

From 6deb10e0750423c60175975edf62e383535dc346 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 11:09:45 +0300
Subject: [PATCH 07587/10326] Add UI state display for each client's beatmap
 availability

---
 .../Participants/ParticipantPanel.cs          |   2 +-
 .../Multiplayer/Participants/StateDisplay.cs  | 193 +++++++++++-------
 2 files changed, 119 insertions(+), 76 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index f99655e305..17bf3a58ec 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             const double fade_time = 50;
 
-            userStateDisplay.Status = User.State;
+            userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index 8d2879fc93..4245628a59 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -8,119 +9,161 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 {
     public class StateDisplay : CompositeDrawable
     {
+        private const double fade_time = 50;
+
+        private SpriteIcon icon;
+        private OsuSpriteText text;
+        private ProgressBar progressBar;
+
         public StateDisplay()
         {
             AutoSizeAxes = Axes.Both;
             Alpha = 0;
         }
 
-        private MultiplayerUserState status;
-
-        private OsuSpriteText text;
-        private SpriteIcon icon;
-
-        private const double fade_time = 50;
-
-        public MultiplayerUserState Status
-        {
-            set
-            {
-                if (value == status)
-                    return;
-
-                status = value;
-
-                if (IsLoaded)
-                    updateStatus();
-            }
-        }
-
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
+            this.colours = colours;
+
             InternalChild = new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
+                Anchor = Anchor.CentreRight,
+                Origin = Anchor.CentreRight,
                 Spacing = new Vector2(5),
                 Children = new Drawable[]
                 {
-                    text = new OsuSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 12),
-                        Colour = Color4Extensions.FromHex("#DDFFFF")
-                    },
                     icon = new SpriteIcon
                     {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
                         Icon = FontAwesome.Solid.CheckCircle,
                         Size = new Vector2(12),
-                    }
+                    },
+                    new CircularContainer
+                    {
+                        Masking = true,
+                        AutoSizeAxes = Axes.Both,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Children = new Drawable[]
+                        {
+                            progressBar = new ProgressBar(false)
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                BackgroundColour = Color4.Black.Opacity(0.4f),
+                                FillColour = colours.Blue,
+                                Alpha = 0f,
+                            },
+                            text = new OsuSpriteText
+                            {
+                                Padding = new MarginPadding { Horizontal = 5f, Vertical = 1f },
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 12),
+                                Colour = Color4Extensions.FromHex("#DDFFFF")
+                            },
+                        }
+                    },
                 }
             };
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateStatus();
-        }
+        private OsuColour colours;
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        private void updateStatus()
+        public void UpdateStatus(MultiplayerUserState state, BeatmapAvailability availability)
         {
-            switch (status)
+            if (availability.State != DownloadState.LocallyAvailable)
             {
-                default:
-                    this.FadeOut(fade_time);
-                    return;
+                switch (availability.State)
+                {
+                    case DownloadState.NotDownloaded:
+                        progressBar.FadeOut(fade_time);
+                        text.Text = "no map";
+                        icon.Icon = FontAwesome.Solid.MinusCircle;
+                        icon.Colour = colours.RedLight;
+                        break;
 
-                case MultiplayerUserState.Ready:
-                    text.Text = "ready";
-                    icon.Icon = FontAwesome.Solid.CheckCircle;
-                    icon.Colour = Color4Extensions.FromHex("#AADD00");
-                    break;
+                    case DownloadState.Downloading:
+                        Debug.Assert(availability.DownloadProgress != null);
 
-                case MultiplayerUserState.WaitingForLoad:
-                    text.Text = "loading";
-                    icon.Icon = FontAwesome.Solid.PauseCircle;
-                    icon.Colour = colours.Yellow;
-                    break;
+                        var progress = availability.DownloadProgress.Value;
+                        progressBar.FadeIn(fade_time);
+                        progressBar.CurrentTime = progress;
 
-                case MultiplayerUserState.Loaded:
-                    text.Text = "loaded";
-                    icon.Icon = FontAwesome.Solid.DotCircle;
-                    icon.Colour = colours.YellowLight;
-                    break;
+                        text.Text = "downloading map";
+                        icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
+                        icon.Colour = colours.Blue;
+                        break;
 
-                case MultiplayerUserState.Playing:
-                    text.Text = "playing";
-                    icon.Icon = FontAwesome.Solid.PlayCircle;
-                    icon.Colour = colours.BlueLight;
-                    break;
+                    case DownloadState.Importing:
+                        progressBar.FadeOut(fade_time);
+                        text.Text = "importing map";
+                        icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
+                        icon.Colour = colours.Yellow;
+                        break;
+                }
+            }
+            else
+            {
+                progressBar.FadeOut(fade_time);
 
-                case MultiplayerUserState.FinishedPlay:
-                    text.Text = "results pending";
-                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
-                    icon.Colour = colours.BlueLighter;
-                    break;
+                switch (state)
+                {
+                    default:
+                        this.FadeOut(fade_time);
+                        return;
 
-                case MultiplayerUserState.Results:
-                    text.Text = "results";
-                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
-                    icon.Colour = colours.BlueLighter;
-                    break;
+                    case MultiplayerUserState.Ready:
+                        text.Text = "ready";
+                        icon.Icon = FontAwesome.Solid.CheckCircle;
+                        icon.Colour = Color4Extensions.FromHex("#AADD00");
+                        break;
+
+                    case MultiplayerUserState.WaitingForLoad:
+                        text.Text = "loading";
+                        icon.Icon = FontAwesome.Solid.PauseCircle;
+                        icon.Colour = colours.Yellow;
+                        break;
+
+                    case MultiplayerUserState.Loaded:
+                        text.Text = "loaded";
+                        icon.Icon = FontAwesome.Solid.DotCircle;
+                        icon.Colour = colours.YellowLight;
+                        break;
+
+                    case MultiplayerUserState.Playing:
+                        text.Text = "playing";
+                        icon.Icon = FontAwesome.Solid.PlayCircle;
+                        icon.Colour = colours.BlueLight;
+                        break;
+
+                    case MultiplayerUserState.FinishedPlay:
+                        text.Text = "results pending";
+                        icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                        icon.Colour = colours.BlueLighter;
+                        break;
+
+                    case MultiplayerUserState.Results:
+                        text.Text = "results";
+                        icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                        icon.Colour = colours.BlueLighter;
+                        break;
+                }
             }
 
             this.FadeIn(fade_time);

From 6e34ab5d152f37d19702ff305c2a53323e89ef75 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 18 Jan 2021 11:13:38 +0300
Subject: [PATCH 07588/10326] Rename WebOverlay to OnlineOverlay

---
 osu.Game/Overlays/BeatmapListingOverlay.cs            | 2 +-
 osu.Game/Overlays/BeatmapSetOverlay.cs                | 2 +-
 osu.Game/Overlays/ChangelogOverlay.cs                 | 2 +-
 osu.Game/Overlays/DashboardOverlay.cs                 | 2 +-
 osu.Game/Overlays/NewsOverlay.cs                      | 2 +-
 osu.Game/Overlays/{WebOverlay.cs => OnlineOverlay.cs} | 4 ++--
 osu.Game/Overlays/RankingsOverlay.cs                  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game/Overlays/{WebOverlay.cs => OnlineOverlay.cs} (91%)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index ae1667d403..eafb7e95d5 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -23,7 +23,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapListingOverlay : WebOverlay<BeatmapListingHeader>
+    public class BeatmapListingOverlay : OnlineOverlay<BeatmapListingHeader>
     {
         [Resolved]
         private PreviewTrackManager previewTrackManager { get; set; }
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 10953415ed..872621801a 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -19,7 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapSetOverlay : WebOverlay<OverlayHeader> // we don't provide a standard header for now.
+    public class BeatmapSetOverlay : OnlineOverlay<OverlayHeader> // we don't provide a standard header for now.
     {
         public const float X_PADDING = 40;
         public const float Y_PADDING = 25;
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 5d99887053..5200b567ff 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -19,7 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class ChangelogOverlay : WebOverlay<ChangelogHeader>
+    public class ChangelogOverlay : OnlineOverlay<ChangelogHeader>
     {
         public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
 
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 3722d36388..39a23fe3d4 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -13,7 +13,7 @@ using osu.Game.Overlays.Dashboard.Friends;
 
 namespace osu.Game.Overlays
 {
-    public class DashboardOverlay : WebOverlay<DashboardOverlayHeader>
+    public class DashboardOverlay : OnlineOverlay<DashboardOverlayHeader>
     {
         private CancellationTokenSource cancellationToken;
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 268d2bb6a2..08e8331dd3 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -9,7 +9,7 @@ using osu.Game.Overlays.News.Displays;
 
 namespace osu.Game.Overlays
 {
-    public class NewsOverlay : WebOverlay<NewsHeader>
+    public class NewsOverlay : OnlineOverlay<NewsHeader>
     {
         private readonly Bindable<string> article = new Bindable<string>(null);
 
diff --git a/osu.Game/Overlays/WebOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
similarity index 91%
rename from osu.Game/Overlays/WebOverlay.cs
rename to osu.Game/Overlays/OnlineOverlay.cs
index aca767e32f..b44ccc32c9 100644
--- a/osu.Game/Overlays/WebOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -7,7 +7,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays
 {
-    public abstract class WebOverlay<T> : FullscreenOverlay<T>
+    public abstract class OnlineOverlay<T> : FullscreenOverlay<T>
         where T : OverlayHeader
     {
         protected override Container<Drawable> Content => content;
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays
         protected readonly LoadingLayer Loading;
         private readonly Container content;
 
-        protected WebOverlay(OverlayColourScheme colourScheme)
+        protected OnlineOverlay(OverlayColourScheme colourScheme)
             : base(colourScheme)
         {
             FillFlowContainer flow = new FillFlowContainer
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 89853e9044..f6bbac4407 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -14,7 +14,7 @@ using osu.Game.Overlays.Rankings.Tables;
 
 namespace osu.Game.Overlays
 {
-    public class RankingsOverlay : WebOverlay<RankingsOverlayHeader>
+    public class RankingsOverlay : OnlineOverlay<RankingsOverlayHeader>
     {
         protected Bindable<Country> Country => Header.Country;
 

From 2f1d4bf51b0964aded4fa5d31be592c7da3eb482 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 17:13:47 +0900
Subject: [PATCH 07589/10326] Add missing braces

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 91bb665ee2..871339ae7b 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -239,12 +239,14 @@ namespace osu.Game.Rulesets.Osu.Edit
             getSurroundingQuad(hitObjects.SelectMany(h =>
             {
                 if (h is IHasPath path)
+                {
                     return new[]
                     {
                         h.Position,
                         // can't use EndPosition for reverse slider cases.
                         h.Position + path.Path.PositionAt(1)
                     };
+                }
 
                 return new[] { h.Position };
             }));

From 5f2e9c5485d854c3a5a85dee64613226fd77cd38 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 11:10:38 +0300
Subject: [PATCH 07590/10326] Add visual test case for displaying beatmap
 availability states

---
 .../TestSceneMultiplayerParticipantsList.cs   | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 968a869532..e2f1a13593 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -7,7 +7,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Online;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
 using osu.Game.Users;
 using osuTK;
@@ -73,6 +75,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("single panel is for second user", () => this.ChildrenOfType<ParticipantPanel>().Single().User.User == secondUser);
         }
 
+        [Test]
+        public void TestBeatmapDownloadingStates()
+        {
+            AddStep("set to no map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.NotDownloaded()));
+            AddStep("set to downloading map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(0)));
+            AddRepeatStep("increment progress", () =>
+            {
+                var progress = this.ChildrenOfType<ParticipantPanel>().Single().User.BeatmapAvailability.DownloadProgress ?? 0;
+                Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(progress + RNG.NextSingle(0.1f)));
+            }, 25);
+            AddStep("set to importing map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Importing()));
+            AddStep("set to available", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.LocallyAvailable()));
+        }
+
         [Test]
         public void TestToggleReadyState()
         {
@@ -120,6 +136,26 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     });
 
                     Client.ChangeUserState(i, (MultiplayerUserState)RNG.Next(0, (int)MultiplayerUserState.Results + 1));
+
+                    if (RNG.NextBool())
+                    {
+                        var beatmapState = (DownloadState)RNG.Next(0, (int)DownloadState.LocallyAvailable + 1);
+
+                        switch (beatmapState)
+                        {
+                            case DownloadState.NotDownloaded:
+                                Client.ChangeUserBeatmapAvailability(i, BeatmapAvailability.NotDownloaded());
+                                break;
+
+                            case DownloadState.Downloading:
+                                Client.ChangeUserBeatmapAvailability(i, BeatmapAvailability.Downloading(RNG.NextSingle()));
+                                break;
+
+                            case DownloadState.Importing:
+                                Client.ChangeUserBeatmapAvailability(i, BeatmapAvailability.Importing());
+                                break;
+                        }
+                    }
                 }
             });
         }

From 0b165dce4bbbb0647ccbdae48b8d2621173655f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 17:50:32 +0900
Subject: [PATCH 07591/10326] Fix multiplayer mod select showing autoplay as a
 choice

---
 osu.Game/OsuGameBase.cs                                   | 1 +
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                | 7 +++++--
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs  | 5 +++++
 osu.Game/Screens/Select/SongSelect.cs                     | 8 +++-----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 1f8ae54e55..20d88d33f2 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -327,6 +327,7 @@ namespace osu.Game
 
             if (!SelectedMods.Disabled)
                 SelectedMods.Value = Array.Empty<Mod>();
+
             AvailableMods.Value = dict;
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 0c8245bebe..b93602116b 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Overlays.Mods
 {
     public class ModSelectOverlay : WaveOverlayContainer
     {
+        private readonly Func<Mod, bool> isValidMod;
         public const float HEIGHT = 510;
 
         protected readonly TriangleButton DeselectAllButton;
@@ -60,8 +61,10 @@ namespace osu.Game.Overlays.Mods
 
         private SampleChannel sampleOn, sampleOff;
 
-        public ModSelectOverlay()
+        public ModSelectOverlay(Func<Mod, bool> isValidMod = null)
         {
+            this.isValidMod = isValidMod ?? (m => true);
+
             Waves.FirstWaveColour = Color4Extensions.FromHex(@"19b0e2");
             Waves.SecondWaveColour = Color4Extensions.FromHex(@"2280a2");
             Waves.ThirdWaveColour = Color4Extensions.FromHex(@"005774");
@@ -403,7 +406,7 @@ namespace osu.Game.Overlays.Mods
             if (mods.NewValue == null) return;
 
             foreach (var section in ModSectionsContainer.Children)
-                section.Mods = mods.NewValue[section.ModType];
+                section.Mods = mods.NewValue[section.ModType].Where(isValidMod);
         }
 
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 36dbb9e792..ebc06d2445 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
@@ -109,5 +110,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         }
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
+
+        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+
+        private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 6c0bd3a228..4fca77a176 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -251,11 +251,7 @@ namespace osu.Game.Screens.Select
                                     Children = new Drawable[]
                                     {
                                         BeatmapOptions = new BeatmapOptionsOverlay(),
-                                        ModSelect = new ModSelectOverlay
-                                        {
-                                            Origin = Anchor.BottomCentre,
-                                            Anchor = Anchor.BottomCentre,
-                                        }
+                                        ModSelect = CreateModSelectOverlay()
                                     }
                                 }
                             }
@@ -305,6 +301,8 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        protected virtual ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay();
+
         protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)
         {
             // if not the current screen, we want to get carousel in a good presentation state before displaying (resume or enter).

From 1359153382232fc303dd1ded30048545c4aa0638 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 17:54:22 +0900
Subject: [PATCH 07592/10326] Revert "Test removing nuget restore from
 iOS/Android build scripts"

This reverts commit 39746cb3de8ad11221ff1766822f720918d49858.
---
 fastlane/Fastfile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 18b5907e82..8c278604aa 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -48,6 +48,10 @@ desc 'Deploy to play store'
 
   desc 'Compile the project'
   lane :build do |options|
+    nuget_restore(
+      project_path: 'osu.sln'
+    )
+
     souyuz(
       build_configuration: 'Release',
       solution_path: 'osu.sln',
@@ -103,6 +107,10 @@ platform :ios do
 
   desc 'Compile the project'
   lane :build do
+    nuget_restore(
+      project_path: 'osu.sln'
+    )
+
     souyuz(
       platform: "ios",
       plist_path: "osu.iOS/Info.plist"

From 46681322d0489d0829114fc87071b7e5c8f0c525 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 17:56:00 +0900
Subject: [PATCH 07593/10326] Restore nuget packages per project to avoid
 toolchain incompatibilities with net50

---
 fastlane/Fastfile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8c278604aa..1823b9e924 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -48,9 +48,8 @@ desc 'Deploy to play store'
 
   desc 'Compile the project'
   lane :build do |options|
-    nuget_restore(
-      project_path: 'osu.sln'
-    )
+    nuget_restore(project_path: 'osu.Android/osu.Android.csproj')
+    nuget_restore(project_path: 'osu.Game/osu.Game.csproj')
 
     souyuz(
       build_configuration: 'Release',
@@ -107,9 +106,8 @@ platform :ios do
 
   desc 'Compile the project'
   lane :build do
-    nuget_restore(
-      project_path: 'osu.sln'
-    )
+    nuget_restore(project_path: 'osu.iOS/osu.iOS.csproj')
+    nuget_restore(project_path: 'osu.Game/osu.Game.csproj')
 
     souyuz(
       platform: "ios",

From 0560eb41201d0094d8321927bc3498502065c994 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 18:22:21 +0900
Subject: [PATCH 07594/10326] Reduce final fill alpha of main menu
 confirm-to-exit

---
 osu.Game/Overlays/HoldToConfirmOverlay.cs   | 13 +++++++++++--
 osu.Game/Screens/Menu/ExitConfirmOverlay.cs |  5 +++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/HoldToConfirmOverlay.cs b/osu.Game/Overlays/HoldToConfirmOverlay.cs
index eb325d8dd3..0542f66b5b 100644
--- a/osu.Game/Overlays/HoldToConfirmOverlay.cs
+++ b/osu.Game/Overlays/HoldToConfirmOverlay.cs
@@ -24,6 +24,13 @@ namespace osu.Game.Overlays
         [Resolved]
         private AudioManager audio { get; set; }
 
+        private readonly float finalFillAlpha;
+
+        protected HoldToConfirmOverlay(float finalFillAlpha = 1)
+        {
+            this.finalFillAlpha = finalFillAlpha;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -42,8 +49,10 @@ namespace osu.Game.Overlays
 
             Progress.ValueChanged += p =>
             {
-                audioVolume.Value = 1 - p.NewValue;
-                overlay.Alpha = (float)p.NewValue;
+                var target = p.NewValue * finalFillAlpha;
+
+                audioVolume.Value = 1 - target;
+                overlay.Alpha = (float)target;
             };
 
             audio.Tracks.AddAdjustment(AdjustableProperty.Volume, audioVolume);
diff --git a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
index db2faeb60a..a491283e5f 100644
--- a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
+++ b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
@@ -13,6 +13,11 @@ namespace osu.Game.Screens.Menu
 
         public void Abort() => AbortConfirm();
 
+        public ExitConfirmOverlay()
+            : base(0.7f)
+        {
+        }
+
         public bool OnPressed(GlobalAction action)
         {
             if (action == GlobalAction.Back)

From 12443e39ae70060657f1b097bc7b9c6e35345e08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 19:16:32 +0900
Subject: [PATCH 07595/10326] 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 db5c933c41..9ad5946311 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.115.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.118.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 301ee39a61..2b8f81532d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,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="2021.115.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.118.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 225cf981f2..4732620085 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.Framework.iOS" Version="2021.115.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.118.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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="2021.115.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.118.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From ced7a36788d7f61ce1163f043d872eb97ad44a02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 21:24:10 +0900
Subject: [PATCH 07596/10326] Update namespaces

---
 osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs | 1 -
 osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs          | 2 +-
 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs             | 1 -
 osu.Game/Rulesets/UI/Playfield.cs                               | 2 +-
 osu.Game/Skinning/PoolableSkinnableSample.cs                    | 2 +-
 osu.Game/Skinning/SkinnableSound.cs                             | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index 33e3c7cb8c..987a5812db 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -9,7 +9,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs b/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
index 80f1b02794..97087e31ab 100644
--- a/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
+++ b/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index b13b20dae2..81ec73a6c5 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index b4e0025351..c40ab4bd94 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -8,7 +8,6 @@ using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
@@ -20,6 +19,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Skinning;
 using osuTK;
 using System.Diagnostics;
+using osu.Framework.Audio.Sample;
 
 namespace osu.Game.Rulesets.UI
 {
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index cc6b85a13e..2a0f480b48 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -5,7 +5,7 @@ using System;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index b841f99598..a874e9a0db 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;

From e6ceaad73233c8322f93554ebcbf136da5c47285 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 17:23:51 +0300
Subject: [PATCH 07597/10326] Revert user state back to idle upon availability
 change

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 94288673fb..826859c598 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.LoadComplete();
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
-            BeatmapAvailability.BindValueChanged(updateClientAvailability, true);
+            BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
 
             client.RoomUpdated += onRoomUpdated;
             client.LoadRequested += onLoadRequested;
@@ -210,10 +210,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
-        private void updateClientAvailability(ValueChangedEvent<BeatmapAvailability> _ = null)
+        private void updateBeatmapAvailability(ValueChangedEvent<BeatmapAvailability> _ = null)
         {
-            if (client.Room != null)
-                client.ChangeBeatmapAvailability(BeatmapAvailability.Value).CatchUnobservedExceptions(true);
+            if (client.Room == null)
+                return;
+
+            client.ChangeBeatmapAvailability(BeatmapAvailability.Value).CatchUnobservedExceptions(true);
+
+            if (client.LocalUser?.State == MultiplayerUserState.Ready)
+                client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
         }
 
         private void onRoomUpdated()
@@ -222,7 +227,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return;
 
             if (client.LocalUser?.BeatmapAvailability.Equals(BeatmapAvailability.Value) == false)
-                updateClientAvailability();
+                updateBeatmapAvailability();
         }
 
         private void onReadyClick()

From e74ecebfd61440a47c7423b0802491ccc1930b7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 23:45:57 +0900
Subject: [PATCH 07598/10326] nuget restore other rulesets

---
 fastlane/Fastfile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1823b9e924..cc5abf5b03 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -50,6 +50,10 @@ desc 'Deploy to play store'
   lane :build do |options|
     nuget_restore(project_path: 'osu.Android/osu.Android.csproj')
     nuget_restore(project_path: 'osu.Game/osu.Game.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj')
 
     souyuz(
       build_configuration: 'Release',
@@ -108,6 +112,10 @@ platform :ios do
   lane :build do
     nuget_restore(project_path: 'osu.iOS/osu.iOS.csproj')
     nuget_restore(project_path: 'osu.Game/osu.Game.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj')
 
     souyuz(
       platform: "ios",

From ddcfd854bd1c66b673d73e5459526ded76ebcb41 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 19:20:19 +0300
Subject: [PATCH 07599/10326] Wait for scheduled state changes before asserting

---
 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 4b8992052e..d692e6f9a3 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -130,6 +130,8 @@ namespace osu.Game.Tests.Online
 
         private void addAvailabilityCheckStep(string description, Func<BeatmapAvailability> expected)
         {
+            // In DownloadTrackingComposite, state changes are scheduled one frame later, wait one step.
+            AddWaitStep("wait for potential change", 1);
             AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
         }
 

From c6b0f3c247aa54a64d9e61c47643a09ea91ec177 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 18 Jan 2021 21:22:50 +0300
Subject: [PATCH 07600/10326] Implement TabbableOnlineOverlay component

---
 osu.Game/Overlays/DashboardOverlay.cs      |  92 ++-----------------
 osu.Game/Overlays/RankingsOverlay.cs       |  46 ++--------
 osu.Game/Overlays/TabbableOnlineOverlay.cs | 101 +++++++++++++++++++++
 3 files changed, 116 insertions(+), 123 deletions(-)
 create mode 100644 osu.Game/Overlays/TabbableOnlineOverlay.cs

diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 39a23fe3d4..83ad8faf1c 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -2,115 +2,35 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Threading;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Online.API;
 using osu.Game.Overlays.Dashboard;
 using osu.Game.Overlays.Dashboard.Friends;
 
 namespace osu.Game.Overlays
 {
-    public class DashboardOverlay : OnlineOverlay<DashboardOverlayHeader>
+    public class DashboardOverlay : TabbableOnlineOverlay<DashboardOverlayHeader, DashboardOverlayTabs>
     {
-        private CancellationTokenSource cancellationToken;
-
         public DashboardOverlay()
             : base(OverlayColourScheme.Purple)
         {
         }
 
-        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
-
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
-        {
-            apiState.BindTo(api.State);
-            apiState.BindValueChanged(onlineStateChanged, true);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            Header.Current.BindValueChanged(onTabChanged);
-        }
-
         protected override DashboardOverlayHeader CreateHeader() => new DashboardOverlayHeader();
 
-        private bool displayUpdateRequired = true;
-
-        protected override void PopIn()
+        protected override void CreateDisplayToLoad(DashboardOverlayTabs tab)
         {
-            base.PopIn();
-
-            // We don't want to create a new display on every call, only when exiting from fully closed state.
-            if (displayUpdateRequired)
-            {
-                Header.Current.TriggerChange();
-                displayUpdateRequired = false;
-            }
-        }
-
-        protected override void PopOutComplete()
-        {
-            base.PopOutComplete();
-            loadDisplay(Empty());
-            displayUpdateRequired = true;
-        }
-
-        private void loadDisplay(Drawable display)
-        {
-            ScrollFlow.ScrollToStart();
-
-            LoadComponentAsync(display, loaded =>
-            {
-                if (API.IsLoggedIn)
-                    Loading.Hide();
-
-                Child = loaded;
-            }, (cancellationToken = new CancellationTokenSource()).Token);
-        }
-
-        private void onTabChanged(ValueChangedEvent<DashboardOverlayTabs> tab)
-        {
-            cancellationToken?.Cancel();
-            Loading.Show();
-
-            if (!API.IsLoggedIn)
-            {
-                loadDisplay(Empty());
-                return;
-            }
-
-            switch (tab.NewValue)
+            switch (tab)
             {
                 case DashboardOverlayTabs.Friends:
-                    loadDisplay(new FriendDisplay());
+                    LoadDisplay(new FriendDisplay());
                     break;
 
                 case DashboardOverlayTabs.CurrentlyPlaying:
-                    loadDisplay(new CurrentlyPlayingDisplay());
+                    LoadDisplay(new CurrentlyPlayingDisplay());
                     break;
 
                 default:
-                    throw new NotImplementedException($"Display for {tab.NewValue} tab is not implemented");
+                    throw new NotImplementedException($"Display for {tab} tab is not implemented");
             }
         }
-
-        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
-        {
-            if (State.Value == Visibility.Hidden)
-                return;
-
-            Header.Current.TriggerChange();
-        });
-
-        protected override void Dispose(bool isDisposing)
-        {
-            cancellationToken?.Cancel();
-            base.Dispose(isDisposing);
-        }
     }
 }
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index f6bbac4407..6cd72d6e2c 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -8,20 +8,18 @@ using osu.Game.Overlays.Rankings;
 using osu.Game.Users;
 using osu.Game.Rulesets;
 using osu.Game.Online.API;
-using System.Threading;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Rankings.Tables;
 
 namespace osu.Game.Overlays
 {
-    public class RankingsOverlay : OnlineOverlay<RankingsOverlayHeader>
+    public class RankingsOverlay : TabbableOnlineOverlay<RankingsOverlayHeader, RankingsScope>
     {
         protected Bindable<Country> Country => Header.Country;
 
         protected Bindable<RankingsScope> Scope => Header.Current;
 
         private APIRequest lastRequest;
-        private CancellationTokenSource cancellationToken;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -34,11 +32,6 @@ namespace osu.Game.Overlays
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -54,6 +47,8 @@ namespace osu.Game.Overlays
                 Scheduler.AddOnce(loadNewContent);
             });
 
+            // Unbind events from scope so base class event will not be called
+            Scope.UnbindEvents();
             Scope.BindValueChanged(_ =>
             {
                 // country filtering is only valid for performance scope.
@@ -70,8 +65,6 @@ namespace osu.Game.Overlays
 
                 Scheduler.AddOnce(loadNewContent);
             });
-
-            Scheduler.AddOnce(loadNewContent);
         }
 
         protected override RankingsOverlayHeader CreateHeader() => new RankingsOverlayHeader();
@@ -92,16 +85,13 @@ namespace osu.Game.Overlays
             Show();
         }
 
-        private void loadNewContent()
+        protected override void CreateDisplayToLoad(RankingsScope tab)
         {
-            Loading.Show();
-
-            cancellationToken?.Cancel();
             lastRequest?.Cancel();
 
             if (Scope.Value == RankingsScope.Spotlights)
             {
-                loadContent(new SpotlightsLayout
+                LoadDisplay(new SpotlightsLayout
                 {
                     Ruleset = { BindTarget = ruleset }
                 });
@@ -113,12 +103,12 @@ namespace osu.Game.Overlays
 
             if (request == null)
             {
-                loadContent(null);
+                LoadDisplay(Empty());
                 return;
             }
 
-            request.Success += () => Schedule(() => loadContent(createTableFromResponse(request)));
-            request.Failure += _ => Schedule(() => loadContent(null));
+            request.Success += () => Schedule(() => LoadDisplay(createTableFromResponse(request)));
+            request.Failure += _ => Schedule(() => LoadDisplay(Empty()));
 
             api.Queue(request);
         }
@@ -163,29 +153,11 @@ namespace osu.Game.Overlays
             return null;
         }
 
-        private void loadContent(Drawable content)
-        {
-            ScrollFlow.ScrollToStart();
-
-            if (content == null)
-            {
-                Clear();
-                Loading.Hide();
-                return;
-            }
-
-            LoadComponentAsync(content, loaded =>
-            {
-                Loading.Hide();
-                Child = loaded;
-            }, (cancellationToken = new CancellationTokenSource()).Token);
-        }
+        private void loadNewContent() => OnTabChanged(Scope.Value);
 
         protected override void Dispose(bool isDisposing)
         {
             lastRequest?.Cancel();
-            cancellationToken?.Cancel();
-
             base.Dispose(isDisposing);
         }
     }
diff --git a/osu.Game/Overlays/TabbableOnlineOverlay.cs b/osu.Game/Overlays/TabbableOnlineOverlay.cs
new file mode 100644
index 0000000000..cbcf3cd96e
--- /dev/null
+++ b/osu.Game/Overlays/TabbableOnlineOverlay.cs
@@ -0,0 +1,101 @@
+// Copyright (c) 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.Threading;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.API;
+
+namespace osu.Game.Overlays
+{
+    public abstract class TabbableOnlineOverlay<THeader, TEnum> : OnlineOverlay<THeader>
+        where THeader : TabControlOverlayHeader<TEnum>
+    {
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
+        private CancellationTokenSource cancellationToken;
+        private bool displayUpdateRequired = true;
+
+        protected TabbableOnlineOverlay(OverlayColourScheme colourScheme)
+            : base(colourScheme)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Header.Current.BindValueChanged(tab => OnTabChanged(tab.NewValue));
+        }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+
+            // We don't want to create a new display on every call, only when exiting from fully closed state.
+            if (displayUpdateRequired)
+            {
+                Header.Current.TriggerChange();
+                displayUpdateRequired = false;
+            }
+        }
+
+        protected override void PopOutComplete()
+        {
+            base.PopOutComplete();
+            LoadDisplay(Empty());
+            displayUpdateRequired = true;
+        }
+
+        protected void LoadDisplay(Drawable display)
+        {
+            ScrollFlow.ScrollToStart();
+
+            LoadComponentAsync(display, loaded =>
+            {
+                if (API.IsLoggedIn)
+                    Loading.Hide();
+
+                Child = loaded;
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        protected void OnTabChanged(TEnum tab)
+        {
+            cancellationToken?.Cancel();
+            Loading.Show();
+
+            if (!API.IsLoggedIn)
+            {
+                LoadDisplay(Empty());
+                return;
+            }
+
+            CreateDisplayToLoad(tab);
+        }
+
+        protected abstract void CreateDisplayToLoad(TEnum tab);
+
+        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
+        {
+            if (State.Value == Visibility.Hidden)
+                return;
+
+            Header.Current.TriggerChange();
+        });
+
+        protected override void Dispose(bool isDisposing)
+        {
+            cancellationToken?.Cancel();
+            base.Dispose(isDisposing);
+        }
+    }
+}

From 25f511fd5b2b6b2bfbd9e1787182a8a87f086de0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 21:34:24 +0300
Subject: [PATCH 07601/10326] Remove unnecessary full querying

---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index 659f52f00f..c2c800badc 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -48,17 +48,7 @@ namespace osu.Game.Online.Rooms
             int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
             string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
 
-            BeatmapInfo matchingBeatmap;
-
-            if (databasedSet.Beatmaps == null)
-            {
-                // The given databased beatmap set is not passed in a usable state to check with.
-                // Perform a full query instead, as per https://github.com/ppy/osu/pull/11415.
-                matchingBeatmap = Manager.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
-                return matchingBeatmap != null;
-            }
-
-            matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+            var matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
             return matchingBeatmap != null;
         }
 

From 5e476fa189d7637db79c228721a601a005f2d355 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 22:07:25 +0300
Subject: [PATCH 07602/10326] Enforce one missed property back to
 single-floating type

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

diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index ccb4e9c119..0bf238109e 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Online.API
     {
         public readonly TModel Model;
 
-        public double Progress { get; private set; }
+        public float Progress { get; private set; }
 
         public event Action<float> DownloadProgressed;
 

From 7476cb3047b400489d39af6494c782de531313ed Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Mon, 18 Jan 2021 19:51:42 +0000
Subject: [PATCH 07603/10326] Sort SkinSection in alphabetical order

---
 .../Overlays/Settings/Sections/SkinSection.cs | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 5898482e4a..0bfa0ba4f0 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -107,21 +107,20 @@ namespace osu.Game.Overlays.Settings.Sections
         private void updateItems()
         {
             skinItems = skins.GetAllUsableSkins();
-
-            // insert after lazer built-in skins
-            int firstNonDefault = skinItems.FindIndex(s => s.ID > 0);
-            if (firstNonDefault < 0)
-                firstNonDefault = skinItems.Count;
-
-            skinItems.Insert(firstNonDefault, random_skin_info);
-
+            skinItems = sortList(skinItems);
+            
             skinDropdown.Items = skinItems;
         }
 
         private void itemUpdated(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-                Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToArray());
+            {
+                List<SkinInfo> newDropdownItems = skinDropdown.Items.ToList();
+                newDropdownItems.Add(item);
+                newDropdownItems = sortList(newDropdownItems);
+                Schedule(() => skinDropdown.Items = newDropdownItems.ToArray());
+            }
         }
 
         private void itemRemoved(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
@@ -130,6 +129,24 @@ namespace osu.Game.Overlays.Settings.Sections
                 Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != item.ID).ToArray());
         }
 
+        private List<SkinInfo> sortList(List<SkinInfo> skinsList)
+        {
+            skinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.Ordinal));
+            for (int i = 0; i < skinsList.Count; i++)
+            {
+                // insert lazer built-in skins before user skins
+                if (skinsList[i].ID <= 0) {
+                    var itemToMove = skinsList[i];
+                    skinsList.RemoveAt(i);
+                    skinsList.Insert(0, itemToMove);
+                }
+            }
+            skinsList.RemoveAll(s => s.ID == SkinInfo.RANDOM_SKIN);
+            skinsList.Insert(0, random_skin_info);
+
+            return skinsList;
+        }
+
         private class SkinSettingsDropdown : SettingsDropdown<SkinInfo>
         {
             protected override OsuDropdown<SkinInfo> CreateDropdown() => new SkinDropdownControl();

From 63ca9de7e4a85990bd162d25cd9be01f8c91c239 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 23:00:07 +0300
Subject: [PATCH 07604/10326] Rewerite beatmap term properly
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/Online/Rooms/MultiplayerBeatmapTracker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index c2c800badc..32a6c39ea8 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Online.Rooms
         {
             var verified = verifyDatabasedModel(databasedSet);
             if (!verified)
-                Logger.Log("The imported beatmapset does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
+                Logger.Log("The imported beatmap set does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
 
             return verified;
         }

From 0b65c0cd25a727fbfa121395e515fe9e8bd295b1 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Mon, 18 Jan 2021 20:17:42 +0000
Subject: [PATCH 07605/10326] Remove whitespace

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 8e78940ac2..20953b7a9b 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -113,7 +113,6 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             skinItems = skins.GetAllUsableSkins();
             skinItems = sortList(skinItems);
-            
             skinDropdown.Items = skinItems;
         }
 

From 5233a0449a63b3db599d11535b3484c8ebc50f47 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Mon, 18 Jan 2021 16:08:06 -0500
Subject: [PATCH 07606/10326] Hide main room subscreen on initial mp room
 creation. Toggle mp room subscreen visibility based on settings overlay
 visibility before room is created.

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 80991569dc..df61a0ad21 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -39,6 +39,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
+        private readonly Bindable<Visibility> settingsOverlayVisibility = new Bindable<Visibility>();
+
+        private GridContainer subScreenContainer;
+
         private IBindable<bool> isConnected;
 
         [CanBeNull]
@@ -55,7 +59,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             InternalChildren = new Drawable[]
             {
-                new GridContainer
+                subScreenContainer = new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Content = new[]
@@ -178,6 +182,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
             };
+
+            subScreenContainer.Hide();
+            settingsOverlayVisibility.BindTo(settingsOverlay.State);
+            settingsOverlayVisibility.ValueChanged += settingsOverlayVisibilityChanged;
         }
 
         protected override void LoadComplete()
@@ -258,6 +266,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
+        private void settingsOverlayVisibilityChanged(ValueChangedEvent<Visibility> settingsOverlayVisibilityChangedEvent)
+        {
+            if (client.Room != null)
+            {
+                subScreenContainer.Show();
+                settingsOverlayVisibility.ValueChanged -= settingsOverlayVisibilityChanged;
+            }
+            else
+            {
+                if (settingsOverlayVisibilityChangedEvent.NewValue == Visibility.Visible)
+                    subScreenContainer.Hide();
+                else
+                    subScreenContainer.Show();
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From cbfb999c2845074d799d1126296584898d9be52b Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Mon, 18 Jan 2021 17:13:24 -0500
Subject: [PATCH 07607/10326] Use the client.RoomUpdated action instead of
 binding the value of the settings overlay visibility and creating an event
 from it based on its ValueChanged action.

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs    | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index df61a0ad21..38c2ca7e0c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -39,8 +39,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
-        private readonly Bindable<Visibility> settingsOverlayVisibility = new Bindable<Visibility>();
-
         private GridContainer subScreenContainer;
 
         private IBindable<bool> isConnected;
@@ -184,8 +182,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             };
 
             subScreenContainer.Hide();
-            settingsOverlayVisibility.BindTo(settingsOverlay.State);
-            settingsOverlayVisibility.ValueChanged += settingsOverlayVisibilityChanged;
+            client.RoomUpdated += roomUpdated;
         }
 
         protected override void LoadComplete()
@@ -266,19 +263,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
-        private void settingsOverlayVisibilityChanged(ValueChangedEvent<Visibility> settingsOverlayVisibilityChangedEvent)
+        private void roomUpdated()
         {
             if (client.Room != null)
             {
+                // If the room is updated and is not null, show the room sub screen container and unsubscribe.
                 subScreenContainer.Show();
-                settingsOverlayVisibility.ValueChanged -= settingsOverlayVisibilityChanged;
-            }
-            else
-            {
-                if (settingsOverlayVisibilityChangedEvent.NewValue == Visibility.Visible)
-                    subScreenContainer.Hide();
-                else
-                    subScreenContainer.Show();
+                client.RoomUpdated -= roomUpdated;
             }
         }
 

From f0add0a7cff7b6fe63ca0ccbf0de4caa130fd30d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 19 Jan 2021 01:34:37 +0300
Subject: [PATCH 07608/10326] Make BeatmapSetOverlay use OverlayHeader

---
 .../Online/TestSceneBeatmapSetOverlay.cs      |   2 +-
 .../Overlays/BeatmapSet/BeatmapSetHeader.cs   | 300 ++++++++++++++++-
 osu.Game/Overlays/BeatmapSet/Header.cs        | 313 ------------------
 osu.Game/Overlays/BeatmapSetOverlay.cs        |   9 +-
 4 files changed, 302 insertions(+), 322 deletions(-)
 delete mode 100644 osu.Game/Overlays/BeatmapSet/Header.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index 689321698a..7ff978c7ca 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -315,7 +315,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private class TestBeatmapSetOverlay : BeatmapSetOverlay
         {
-            public new Header Header => base.Header;
+            public new BeatmapSetHeader Header => base.Header;
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
index 6511b15fc8..bc9008d1f5 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
@@ -1,23 +1,319 @@
 // Copyright (c) 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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
+using osu.Game.Online.API;
+using osu.Game.Overlays.BeatmapListing.Panels;
+using osu.Game.Overlays.BeatmapSet.Buttons;
 using osu.Game.Rulesets;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
     public class BeatmapSetHeader : OverlayHeader
     {
-        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+        private const float transition_duration = 200;
+        private const float buttons_height = 45;
+        private const float buttons_spacing = 5;
+
+        public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
+
+        public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
+
+        public BeatmapPicker Picker { get; private set; }
 
         public BeatmapRulesetSelector RulesetSelector { get; private set; }
 
+        private IBindable<DownloadState> state => downloadTracker.State;
+
+        [Cached(typeof(IBindable<RulesetInfo>))]
+        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private readonly DownloadTracker downloadTracker;
+        private OsuSpriteText title, artist;
+        private AuthorInfo author;
+        private ExplicitContentBeatmapPill explicitContentPill;
+        private FillFlowContainer downloadButtonsContainer;
+        private BeatmapAvailability beatmapAvailability;
+        private BeatmapSetOnlineStatusPill onlineStatusPill;
+        private ExternalLinkButton externalLink;
+        private UpdateableBeatmapSetCover cover;
+        private Box coverGradient;
+        private FillFlowContainer fadeContent;
+        private FavouriteButton favouriteButton;
+        private LoadingSpinner loading;
+        private Details details;
+
+        public BeatmapSetHeader()
+        {
+            Masking = true;
+
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Colour = Color4.Black.Opacity(0.25f),
+                Type = EdgeEffectType.Shadow,
+                Radius = 3,
+                Offset = new Vector2(0f, 1f),
+            };
+
+            AddInternal(downloadTracker = new DownloadTracker
+            {
+                BeatmapSet = { BindTarget = BeatmapSet }
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            Picker.Beatmap.ValueChanged += b =>
+            {
+                details.Beatmap = b.NewValue;
+                externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
+            };
+
+            coverGradient.Colour = ColourInfo.GradientVertical(colourProvider.Background6.Opacity(0.3f), colourProvider.Background6.Opacity(0.8f));
+            onlineStatusPill.BackgroundColour = colourProvider.Background6;
+
+            state.BindValueChanged(_ => updateDownloadButtons());
+
+            BeatmapSet.BindValueChanged(setInfo =>
+            {
+                Picker.BeatmapSet = RulesetSelector.BeatmapSet = author.BeatmapSet = beatmapAvailability.BeatmapSet = details.BeatmapSet = setInfo.NewValue;
+                cover.BeatmapSet = setInfo.NewValue;
+
+                if (setInfo.NewValue == null)
+                {
+                    onlineStatusPill.FadeTo(0.5f, 500, Easing.OutQuint);
+                    fadeContent.Hide();
+
+                    loading.Show();
+
+                    downloadButtonsContainer.FadeOut(transition_duration);
+                    favouriteButton.FadeOut(transition_duration);
+                }
+                else
+                {
+                    fadeContent.FadeIn(500, Easing.OutQuint);
+
+                    loading.Hide();
+
+                    title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
+                    artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
+
+                    explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
+
+                    onlineStatusPill.FadeIn(500, Easing.OutQuint);
+                    onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
+
+                    downloadButtonsContainer.FadeIn(transition_duration);
+                    favouriteButton.FadeIn(transition_duration);
+
+                    updateDownloadButtons();
+                }
+            }, true);
+        }
+
+        protected override Drawable CreateContent() => new Container
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Children = new Drawable[]
+            {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        cover = new UpdateableBeatmapSetCover
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Masking = true,
+                        },
+                        coverGradient = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        },
+                    },
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding
+                    {
+                        Vertical = BeatmapSetOverlay.Y_PADDING,
+                        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[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Child = Picker = new BeatmapPicker(),
+                                },
+                                new FillFlowContainer
+                                {
+                                    Direction = FillDirection.Horizontal,
+                                    AutoSizeAxes = Axes.Both,
+                                    Margin = new MarginPadding { Top = 15 },
+                                    Children = new Drawable[]
+                                    {
+                                        title = new OsuSpriteText
+                                        {
+                                            Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
+                                        },
+                                        externalLink = new ExternalLinkButton
+                                        {
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft,
+                                            Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
+                                        },
+                                        explicitContentPill = new ExplicitContentBeatmapPill
+                                        {
+                                            Alpha = 0f,
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft,
+                                            Margin = new MarginPadding { Left = 10, Bottom = 4 },
+                                        }
+                                    }
+                                },
+                                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,
+                                    Child = author = new AuthorInfo(),
+                                },
+                                beatmapAvailability = new BeatmapAvailability(),
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    Height = buttons_height,
+                                    Margin = new MarginPadding { Top = 10 },
+                                    Children = new Drawable[]
+                                    {
+                                        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 LoadingSpinner
+                {
+                    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.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(10),
+                    Children = new Drawable[]
+                    {
+                        onlineStatusPill = new BeatmapSetOnlineStatusPill
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            TextSize = 14,
+                            TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
+                        },
+                        details = new Details(),
+                    },
+                },
+            }
+        };
+
+        private void updateDownloadButtons()
+        {
+            if (BeatmapSet.Value == null) return;
+
+            if ((BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false) && state.Value != DownloadState.LocallyAvailable)
+            {
+                downloadButtonsContainer.Clear();
+                return;
+            }
+
+            switch (state.Value)
+            {
+                case DownloadState.LocallyAvailable:
+                    // temporary for UX until new design is implemented.
+                    downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value)
+                    {
+                        Width = 50,
+                        RelativeSizeAxes = Axes.Y,
+                        SelectedBeatmap = { BindTarget = Picker.Beatmap }
+                    };
+                    break;
+
+                case DownloadState.Downloading:
+                case DownloadState.Importing:
+                    // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
+                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
+                    break;
+
+                default:
+                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
+                    if (BeatmapSet.Value.OnlineInfo.HasVideo)
+                        downloadButtonsContainer.Add(new HeaderDownloadButton(BeatmapSet.Value, true));
+                    break;
+            }
+        }
+
+        private class DownloadTracker : BeatmapDownloadTrackingComposite
+        {
+            public new Bindable<DownloadState> State => base.State;
+        }
+
         protected override OverlayTitle CreateTitle() => new BeatmapHeaderTitle();
 
         protected override Drawable CreateTitleContent() => RulesetSelector = new BeatmapRulesetSelector
         {
-            Current = Ruleset
+            Current = ruleset
         };
 
         private class BeatmapHeaderTitle : OverlayTitle
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
deleted file mode 100644
index 916c21c010..0000000000
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ /dev/null
@@ -1,313 +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.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps.Drawables;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online;
-using osu.Game.Online.API;
-using osu.Game.Overlays.BeatmapListing.Panels;
-using osu.Game.Overlays.BeatmapSet.Buttons;
-using osu.Game.Rulesets;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.BeatmapSet
-{
-    public class Header : BeatmapDownloadTrackingComposite
-    {
-        private const float transition_duration = 200;
-        private const float buttons_height = 45;
-        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 ExplicitContentBeatmapPill explicitContentPill;
-        private readonly FillFlowContainer downloadButtonsContainer;
-        private readonly BeatmapAvailability beatmapAvailability;
-        private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
-        public Details Details;
-
-        public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        public BeatmapRulesetSelector RulesetSelector => beatmapSetHeader.RulesetSelector;
-        public readonly BeatmapPicker Picker;
-
-        private readonly FavouriteButton favouriteButton;
-        private readonly FillFlowContainer fadeContent;
-        private readonly LoadingSpinner loading;
-        private readonly BeatmapSetHeader beatmapSetHeader;
-
-        [Cached(typeof(IBindable<RulesetInfo>))]
-        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
-
-        public Header()
-        {
-            ExternalLinkButton externalLink;
-
-            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),
-            };
-
-            InternalChild = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Children = new Drawable[]
-                {
-                    beatmapSetHeader = new BeatmapSetHeader
-                    {
-                        Ruleset = { BindTarget = ruleset },
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Children = new Drawable[]
-                        {
-                            new Container
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Children = new Drawable[]
-                                {
-                                    cover = new UpdateableBeatmapSetCover
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Masking = true,
-                                    },
-                                    coverGradient = new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both
-                                    },
-                                },
-                            },
-                            new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Padding = new MarginPadding
-                                {
-                                    Vertical = BeatmapSetOverlay.Y_PADDING,
-                                    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[]
-                                        {
-                                            new Container
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                AutoSizeAxes = Axes.Y,
-                                                Child = Picker = new BeatmapPicker(),
-                                            },
-                                            new FillFlowContainer
-                                            {
-                                                Direction = FillDirection.Horizontal,
-                                                AutoSizeAxes = Axes.Both,
-                                                Margin = new MarginPadding { Top = 15 },
-                                                Children = new Drawable[]
-                                                {
-                                                    title = new OsuSpriteText
-                                                    {
-                                                        Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
-                                                    },
-                                                    externalLink = new ExternalLinkButton
-                                                    {
-                                                        Anchor = Anchor.BottomLeft,
-                                                        Origin = Anchor.BottomLeft,
-                                                        Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
-                                                    },
-                                                    explicitContentPill = new ExplicitContentBeatmapPill
-                                                    {
-                                                        Alpha = 0f,
-                                                        Anchor = Anchor.BottomLeft,
-                                                        Origin = Anchor.BottomLeft,
-                                                        Margin = new MarginPadding { Left = 10, Bottom = 4 },
-                                                    }
-                                                }
-                                            },
-                                            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,
-                                                Child = author = new AuthorInfo(),
-                                            },
-                                            beatmapAvailability = new BeatmapAvailability(),
-                                            new Container
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                Height = buttons_height,
-                                                Margin = new MarginPadding { Top = 10 },
-                                                Children = new Drawable[]
-                                                {
-                                                    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 LoadingSpinner
-                            {
-                                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.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
-                                Direction = FillDirection.Vertical,
-                                Spacing = new Vector2(10),
-                                Children = new Drawable[]
-                                {
-                                    onlineStatusPill = new BeatmapSetOnlineStatusPill
-                                    {
-                                        Anchor = Anchor.TopRight,
-                                        Origin = Anchor.TopRight,
-                                        TextSize = 14,
-                                        TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
-                                    },
-                                    Details = new Details(),
-                                },
-                            },
-                        },
-                    },
-                }
-            };
-
-            Picker.Beatmap.ValueChanged += b =>
-            {
-                Details.Beatmap = b.NewValue;
-                externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        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());
-
-            BeatmapSet.BindValueChanged(setInfo =>
-            {
-                Picker.BeatmapSet = RulesetSelector.BeatmapSet = author.BeatmapSet = beatmapAvailability.BeatmapSet = Details.BeatmapSet = setInfo.NewValue;
-                cover.BeatmapSet = setInfo.NewValue;
-
-                if (setInfo.NewValue == null)
-                {
-                    onlineStatusPill.FadeTo(0.5f, 500, Easing.OutQuint);
-                    fadeContent.Hide();
-
-                    loading.Show();
-
-                    downloadButtonsContainer.FadeOut(transition_duration);
-                    favouriteButton.FadeOut(transition_duration);
-                }
-                else
-                {
-                    fadeContent.FadeIn(500, Easing.OutQuint);
-
-                    loading.Hide();
-
-                    title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
-                    artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
-
-                    explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
-
-                    onlineStatusPill.FadeIn(500, Easing.OutQuint);
-                    onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
-
-                    downloadButtonsContainer.FadeIn(transition_duration);
-                    favouriteButton.FadeIn(transition_duration);
-
-                    updateDownloadButtons();
-                }
-            }, true);
-        }
-
-        private void updateDownloadButtons()
-        {
-            if (BeatmapSet.Value == null) return;
-
-            if ((BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false) && State.Value != DownloadState.LocallyAvailable)
-            {
-                downloadButtonsContainer.Clear();
-                return;
-            }
-
-            switch (State.Value)
-            {
-                case DownloadState.LocallyAvailable:
-                    // temporary for UX until new design is implemented.
-                    downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value)
-                    {
-                        Width = 50,
-                        RelativeSizeAxes = Axes.Y,
-                        SelectedBeatmap = { BindTarget = Picker.Beatmap }
-                    };
-                    break;
-
-                case DownloadState.Downloading:
-                case DownloadState.Importing:
-                    // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
-                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
-                    break;
-
-                default:
-                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
-                    if (BeatmapSet.Value.OnlineInfo.HasVideo)
-                        downloadButtonsContainer.Add(new HeaderDownloadButton(BeatmapSet.Value, true));
-                    break;
-            }
-        }
-    }
-}
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index bbec62a85a..86f0f4f614 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -19,15 +19,12 @@ using osuTK;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapSetOverlay : FullscreenOverlay<OverlayHeader> // we don't provide a standard header for now.
+    public class BeatmapSetOverlay : FullscreenOverlay<BeatmapSetHeader>
     {
         public const float X_PADDING = 40;
         public const float Y_PADDING = 25;
         public const float RIGHT_WIDTH = 275;
 
-        //todo: should be an OverlayHeader? or maybe not?
-        protected new readonly Header Header;
-
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
@@ -39,7 +36,7 @@ namespace osu.Game.Overlays
         private readonly Box background;
 
         public BeatmapSetOverlay()
-            : base(OverlayColourScheme.Blue, null)
+            : base(OverlayColourScheme.Blue, new BeatmapSetHeader())
         {
             OverlayScrollContainer scroll;
             Info info;
@@ -72,7 +69,7 @@ namespace osu.Game.Overlays
                                     Direction = FillDirection.Vertical,
                                     Children = new Drawable[]
                                     {
-                                        Header = new Header(),
+                                        Header,
                                         info = new Info()
                                     }
                                 },

From 1e99357a9790884a7a84e4c052a6ab65921586a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Jan 2021 12:13:27 +0900
Subject: [PATCH 07609/10326] Update build configurations to net5.0 paths

---
 .../.idea/runConfigurations/Benchmarks.xml     |  6 +++---
 .../runConfigurations/CatchRuleset__Tests_.xml |  6 +++---
 .../runConfigurations/ManiaRuleset__Tests_.xml |  6 +++---
 .../runConfigurations/OsuRuleset__Tests_.xml   |  6 +++---
 .../runConfigurations/TaikoRuleset__Tests_.xml |  6 +++---
 .../.idea/runConfigurations/Tournament.xml     |  6 +++---
 .../runConfigurations/Tournament__Tests_.xml   |  6 +++---
 .../.idea/runConfigurations/osu_.xml           |  6 +++---
 .../.idea/runConfigurations/osu___Tests_.xml   |  6 +++---
 .../runConfigurations/osu___legacy_osuTK_.xml  |  6 +++---
 .vscode/launch.json                            | 18 +++++++++---------
 .../.vscode/launch.json                        |  4 ++--
 .../.vscode/launch.json                        |  4 ++--
 .../.vscode/launch.json                        |  4 ++--
 .../.vscode/launch.json                        |  4 ++--
 osu.Game.Tournament.Tests/.vscode/launch.json  |  4 ++--
 16 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml
index 1815c271b4..8fa7608b8e 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Benchmarks" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Release/netcoreapp3.1/osu.Game.Benchmarks.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Release/net5.0/osu.Game.Benchmarks.dll" />
     <option name="PROGRAM_PARAMETERS" value="--filter *" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Release/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Release/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <method v="2">
       <option name="Build" enabled="true" />
     </method>
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
index 512ac4393a..657b885df1 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="CatchRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Catch.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Catch.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
index dec1ef717f..847dcf822c 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ManiaRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Mania.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Mania.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
index d9370d5440..5dc1168e35 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OsuRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Osu.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Osu.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
index def4940bb1..ab4ce5a9cc 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="TaikoRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Taiko.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Taiko.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
index 1ffa73c257..61331944a8 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Tournament" type="DotNetProject" factoryName=".NET Project" folderName="Tournament" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="--tournament" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
index e64da796b7..9a00f58c3b 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Tournament (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Tournament" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tournament.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net5.0/osu.Game.Tournament.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
index 22105e1de2..4ae656b6d8 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="osu!" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
index cc243f6901..e58c602962 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="osu! (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net5.0/osu.Game.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
index 811fd9cc6d..9ece926b34 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="osu! (legacy osuTK)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="--tk" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 4e8af405a2..afd997f91d 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Debug/net5.0/osu!.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Debug)",
@@ -19,7 +19,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp3.1/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Release/net5.0/osu!.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Release)",
@@ -31,7 +31,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Debug/net5.0/osu.Game.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Debug)",
@@ -43,7 +43,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp3.1/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Release/net5.0/osu.Game.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Release)",
@@ -55,7 +55,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Debug/net5.0/osu!.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -68,7 +68,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp3.1/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Release/net5.0/osu!.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -81,7 +81,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tournament.Tests.dll",
+                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net5.0/osu.Game.Tournament.Tests.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -94,7 +94,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tournament.Tests.dll",
+                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net5.0/osu.Game.Tournament.Tests.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -105,7 +105,7 @@
             "name": "Benchmark",
             "type": "coreclr",
             "request": "launch",
-            "program": "${workspaceRoot}/osu.Game.Benchmarks/bin/Release/netcoreapp3.1/osu.Game.Benchmarks.dll",
+            "program": "${workspaceRoot}/osu.Game.Benchmarks/bin/Release/net5.0/osu.Game.Benchmarks.dll",
             "args": [
                 "--filter",
                 "*"
diff --git a/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json b/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
index 67d27c33eb..9aaaf418c2 100644
--- a/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Catch.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Catch.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json b/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
index 0811c2724c..e3d7956e85 100644
--- a/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Mania.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Mania.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json b/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
index 94568e3852..01a5985464 100644
--- a/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Osu.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Osu.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.Osu.Tests.dll"
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Osu.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json b/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
index 5b02ecfc91..779ebba9ae 100644
--- a/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Taiko.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Taiko.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.Taiko.Tests.dll"
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Taiko.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Tournament.Tests/.vscode/launch.json b/osu.Game.Tournament.Tests/.vscode/launch.json
index 0204158347..28532d3ed3 100644
--- a/osu.Game.Tournament.Tests/.vscode/launch.json
+++ b/osu.Game.Tournament.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp2.1/osu.Game.Tournament.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Tournament.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp2.1/osu.Game.Tournament.Tests.dll"
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Tournament.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",

From 35be91fc513ce624290024215cad049d10843cef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Jan 2021 12:15:18 +0900
Subject: [PATCH 07610/10326] Update readme

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c9443ba063..efca075042 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,7 @@ If you are looking to install or test osu! without setting up a development envi
 
 - The iOS testflight link may fill up (Apple has a hard limit of 10,000 users). We reset it occasionally when this happens. Please do not ask about this. Check back regularly for link resets or follow [peppy](https://twitter.com/ppy) on twitter for announcements of link resets.
 
-- 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 running on Windows 7 or 8.1, *[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net50&pivots=os-windows#dependencies)** may be required to correctly run .NET 5 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 a custom ruleset
@@ -50,7 +49,7 @@ You can see some examples of custom rulesets by visiting the [custom ruleset dir
 
 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.
+- A desktop platform with the [.NET 5.0 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.

From 3a7608275d5b0188c3ab70df2ae9482fad252392 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Tue, 19 Jan 2021 00:35:56 -0500
Subject: [PATCH 07611/10326] Use fades instead of event listening. Fixed same
 issue in the playlist room creation.

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 45 ++++++++++++++-----
 .../Playlists/PlaylistsRoomSubScreen.cs       | 38 +++++++++++++++-
 2 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 38c2ca7e0c..03a76c66f2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -180,9 +180,40 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
             };
+        }
 
-            subScreenContainer.Hide();
-            client.RoomUpdated += roomUpdated;
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            if (base.OnExiting(next))
+                return true;
+
+            subScreenContainer.FadeOut();
+
+            return false;
+        }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+
+            if (client.Room == null)
+                subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
+            else
+                subScreenContainer.FadeInFromZero();
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            subScreenContainer.FadeOut();
+
+            base.OnSuspending(next);
         }
 
         protected override void LoadComplete()
@@ -263,16 +294,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
-        private void roomUpdated()
-        {
-            if (client.Room != null)
-            {
-                // If the room is updated and is not null, show the room sub screen container and unsubscribe.
-                subScreenContainer.Show();
-                client.RoomUpdated -= roomUpdated;
-            }
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index e76ca995bf..583956b3f1 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         private OverlinedHeader participantsHeader;
 
+        private GridContainer subScreenContainer;
+
         public PlaylistsRoomSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New playlist" : room.Name.Value;
@@ -44,7 +46,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         {
             InternalChildren = new Drawable[]
             {
-                new GridContainer
+                subScreenContainer = new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Content = new[]
@@ -195,6 +197,40 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            if (base.OnExiting(next))
+                return true;
+
+            subScreenContainer.FadeOut();
+
+            return false;
+        }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+
+            if (roomId.Value == null)
+                subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
+            else
+                subScreenContainer.FadeInFromZero();
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            subScreenContainer.FadeOut();
+
+            base.OnSuspending(next);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From de9d075f941fe840e14e9a576e3329956884ee4c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 19 Jan 2021 17:11:40 +0900
Subject: [PATCH 07612/10326] Initial sample + samplechannel rework

---
 .../Legacy/ManiaLegacySkinTransformer.cs      |  4 +-
 .../TestSceneCursorTrail.cs                   |  2 +-
 .../TestSceneSkinFallbacks.cs                 |  2 +-
 .../Objects/Drawables/DrawableSpinner.cs      |  3 +-
 .../Legacy/TaikoLegacySkinTransformer.cs      |  2 +-
 .../TestSceneHitObjectAccentColour.cs         |  2 +-
 .../Gameplay/TestSceneStoryboardSamples.cs    |  4 +-
 .../Skinning/LegacySkinAnimationTest.cs       |  2 +-
 .../TestSceneDrawableRulesetDependencies.cs   |  4 +-
 .../Skins/TestSceneSkinConfigurationLookup.cs |  2 +-
 .../Editing/TestSceneEditorSamplePlayback.cs  | 16 +++---
 .../TestSceneGameplaySamplePlayback.cs        |  7 +--
 .../Gameplay/TestSceneSkinnableDrawable.cs    |  6 +-
 .../Gameplay/TestSceneSkinnableSound.cs       | 56 +++++++------------
 .../Containers/OsuFocusedOverlayContainer.cs  |  4 +-
 osu.Game/Graphics/ScreenshotManager.cs        |  2 +-
 .../UserInterface/DrawableOsuMenuItem.cs      |  4 +-
 .../UserInterface/HoverClickSounds.cs         |  2 +-
 .../Graphics/UserInterface/HoverSounds.cs     |  2 +-
 .../Graphics/UserInterface/OsuCheckbox.cs     |  4 +-
 .../Graphics/UserInterface/OsuSliderBar.cs    | 12 ++--
 osu.Game/Graphics/UserInterface/OsuTextBox.cs | 10 ++--
 osu.Game/Overlays/ChangelogOverlay.cs         |  2 +-
 osu.Game/Overlays/MedalOverlay.cs             |  2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  2 +-
 .../UI/DrawableRulesetDependencies.cs         |  4 +-
 osu.Game/Screens/Menu/Button.cs               |  4 +-
 osu.Game/Screens/Menu/ButtonSystem.cs         |  2 +-
 osu.Game/Screens/Menu/IntroCircles.cs         |  2 +-
 osu.Game/Screens/Menu/IntroScreen.cs          |  2 +-
 osu.Game/Screens/Menu/IntroTriangles.cs       |  2 +-
 osu.Game/Screens/Menu/IntroWelcome.cs         | 11 ++--
 osu.Game/Screens/Menu/OsuLogo.cs              |  4 +-
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  2 +-
 .../Match/MultiplayerReadyButton.cs           |  6 +-
 osu.Game/Screens/OsuScreen.cs                 |  2 +-
 osu.Game/Screens/Play/FailAnimation.cs        |  2 +-
 osu.Game/Screens/Play/Player.cs               |  2 +-
 osu.Game/Screens/Play/SkipOverlay.cs          |  2 +-
 .../Screens/Select/Carousel/CarouselHeader.cs |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         |  6 +-
 osu.Game/Skinning/DefaultSkin.cs              |  2 +-
 osu.Game/Skinning/ISkin.cs                    |  2 +-
 osu.Game/Skinning/LegacyBeatmapSkin.cs        |  2 +-
 osu.Game/Skinning/LegacySkin.cs               |  4 +-
 osu.Game/Skinning/LegacySkinTransformer.cs    |  4 +-
 osu.Game/Skinning/PausableSkinnableSound.cs   |  4 +-
 osu.Game/Skinning/PoolableSkinnableSample.cs  | 23 +++++---
 osu.Game/Skinning/Skin.cs                     |  2 +-
 osu.Game/Skinning/SkinManager.cs              |  2 +-
 osu.Game/Skinning/SkinProvidingContainer.cs   |  4 +-
 osu.Game/Skinning/SkinnableSound.cs           |  7 ++-
 52 files changed, 131 insertions(+), 138 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 7e2a8823b6..cbbbacfe19 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -140,11 +140,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             return animation == null ? null : new LegacyManiaJudgementPiece(result, animation);
         }
 
-        public override SampleChannel GetSample(ISampleInfo sampleInfo)
+        public override Sample GetSample(ISampleInfo sampleInfo)
         {
             // layered hit sounds never play in mania
             if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample && legacySample.IsLayered)
-                return new SampleChannelVirtual();
+                return new SampleVirtual();
 
             return Source.GetSample(sampleInfo);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index fefe983f97..e2d9f144c0 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 return null;
             }
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 10baca438d..8dbb48c048 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => null;
+            public Sample GetSample(ISampleInfo sampleInfo) => null;
 
             public TValue GetValue<TConfiguration, TValue>(Func<TConfiguration, TValue> query) where TConfiguration : SkinConfiguration => default;
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => null;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 56aedebed3..b9c5b6e83a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -130,7 +130,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (tracking.NewValue)
             {
-                spinningSample?.Play(!spinningSample.IsPlaying);
+                if (!spinningSample.IsPlaying)
+                    spinningSample?.Play();
                 spinningSample?.VolumeTo(1, 300);
             }
             else
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index d8e3100048..9f29675230 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             throw new ArgumentOutOfRangeException(nameof(component), $"Invalid component type: {component}");
         }
 
-        public override SampleChannel GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
+        public override Sample GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => Source.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index de46f9d1cf..3ded3009bd 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
             {
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 38cb6729c3..7a0dd5b719 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestRetrieveTopLevelSample()
         {
             ISkin skin = null;
-            SampleChannel channel = null;
+            Sample channel = null;
 
             AddStep("create skin", () => skin = new TestSkin("test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("test-sample")));
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestRetrieveSampleInSubFolder()
         {
             ISkin skin = null;
-            SampleChannel channel = null;
+            Sample channel = null;
 
             AddStep("create skin", () => skin = new TestSkin("folder/test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("folder/test-sample")));
diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
index a5c937119e..da004b9088 100644
--- a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
             }
 
             public Drawable GetDrawableComponent(ISkinComponent component) => throw new NotSupportedException();
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotSupportedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotSupportedException();
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotSupportedException();
         }
 
diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index 987a5812db..787f72ba79 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -105,9 +105,9 @@ namespace osu.Game.Tests.Rulesets
                 IsDisposed = true;
             }
 
-            public SampleChannel Get(string name) => null;
+            public Sample Get(string name) => null;
 
-            public Task<SampleChannel> GetAsync(string name) => null;
+            public Task<Sample> GetAsync(string name) => null;
 
             public Stream GetStream(string name) => null;
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index ad5b3ec0f6..414f7d3f88 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Tests.Skins
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
+            public Sample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => skin.GetConfig<TLookup, TValue>(lookup);
         }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
index f182023c0e..876c1308b4 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
@@ -3,11 +3,11 @@
 
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Graphics.Audio;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Editing
 {
@@ -19,14 +19,14 @@ namespace osu.Game.Tests.Visual.Editing
         public void TestSlidingSampleStopsOnSeek()
         {
             DrawableSlider slider = null;
-            DrawableSample[] loopingSamples = null;
-            DrawableSample[] onceOffSamples = null;
+            SkinnableSound[] loopingSamples = null;
+            SkinnableSound[] onceOffSamples = null;
 
             AddStep("get first slider", () =>
             {
                 slider = Editor.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
-                onceOffSamples = slider.ChildrenOfType<DrawableSample>().Where(s => !s.Looping).ToArray();
-                loopingSamples = slider.ChildrenOfType<DrawableSample>().Where(s => s.Looping).ToArray();
+                onceOffSamples = slider.ChildrenOfType<SkinnableSound>().Where(s => !s.Looping).ToArray();
+                loopingSamples = slider.ChildrenOfType<SkinnableSound>().Where(s => s.Looping).ToArray();
             });
 
             AddStep("start playback", () => EditorClock.Start());
@@ -36,15 +36,15 @@ namespace osu.Game.Tests.Visual.Editing
                 if (!slider.Tracking.Value)
                     return false;
 
-                if (!loopingSamples.Any(s => s.Playing))
+                if (!loopingSamples.Any(s => s.IsPlaying))
                     return false;
 
                 EditorClock.Seek(20000);
                 return true;
             });
 
-            AddAssert("non-looping samples are playing", () => onceOffSamples.Length == 4 && loopingSamples.All(s => s.Played || s.Playing));
-            AddAssert("looping samples are not playing", () => loopingSamples.Length == 1 && loopingSamples.All(s => s.Played && !s.Playing));
+            AddAssert("non-looping samples are playing", () => onceOffSamples.Length == 4 && loopingSamples.All(s => s.IsPlayed || s.IsPlaying));
+            AddAssert("looping samples are not playing", () => loopingSamples.Length == 1 && loopingSamples.All(s => s.IsPlayed && !s.IsPlaying));
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index 7c6a213fe2..b13acdcb95 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Graphics.Audio;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
@@ -20,14 +19,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestAllSamplesStopDuringSeek()
         {
             DrawableSlider slider = null;
-            DrawableSample[] samples = null;
+            SkinnableSound[] samples = null;
             ISamplePlaybackDisabler sampleDisabler = null;
 
             AddUntilStep("get variables", () =>
             {
                 sampleDisabler = Player;
                 slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).FirstOrDefault();
-                samples = slider?.ChildrenOfType<DrawableSample>().ToArray();
+                samples = slider?.ChildrenOfType<SkinnableSound>().ToArray();
 
                 return slider != null;
             });
@@ -37,7 +36,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 if (!slider.Tracking.Value)
                     return false;
 
-                if (!samples.Any(s => s.Playing))
+                if (!samples.Any(s => s.IsPlaying))
                     return false;
 
                 Player.ChildrenOfType<GameplayClockContainer>().First().Seek(40000);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index bed48f3d86..44142b69d7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -298,7 +298,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
         }
@@ -309,7 +309,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
         }
@@ -321,7 +321,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index fc0cda2c1f..28c266f7d8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -43,70 +43,52 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoppedSoundDoesntResumeAfterPause()
         {
-            DrawableSample sample = null;
-            AddStep("start sample with looping", () =>
-            {
-                sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
+            AddStep("start sample with looping", () => skinnableSound.Looping = true);
 
-                skinnableSound.Looping = true;
-                skinnableSound.Play();
-            });
-
-            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+            AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);
 
             AddStep("stop sample", () => skinnableSound.Stop());
 
-            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+            AddUntilStep("wait for sample to stop playing", () => !skinnableSound.IsPlaying);
 
             AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
 
             AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
 
             AddWaitStep("wait a bit", 5);
-            AddAssert("sample not playing", () => !sample.Playing);
+            AddAssert("sample not playing", () => !skinnableSound.IsPlaying);
         }
 
         [Test]
         public void TestLoopingSoundResumesAfterPause()
         {
-            DrawableSample sample = null;
-            AddStep("start sample with looping", () =>
-            {
-                skinnableSound.Looping = true;
-                skinnableSound.Play();
-                sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
-            });
+            AddStep("start sample with looping", () => skinnableSound.Looping = true);
 
-            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+            AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);
 
             AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
-            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+            AddUntilStep("wait for sample to stop playing", () => !skinnableSound.IsPlaying);
 
             AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
-            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+            AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);
         }
 
         [Test]
         public void TestNonLoopingStopsWithPause()
         {
-            DrawableSample sample = null;
-            AddStep("start sample", () =>
-            {
-                skinnableSound.Play();
-                sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
-            });
+            AddStep("start sample", () => skinnableSound.Play());
 
-            AddAssert("sample playing", () => sample.Playing);
+            AddAssert("sample playing", () => skinnableSound.IsPlaying);
 
             AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
 
-            AddUntilStep("sample not playing", () => !sample.Playing);
+            AddUntilStep("sample not playing", () => !skinnableSound.IsPlaying);
 
             AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
 
-            AddAssert("sample not playing", () => !sample.Playing);
-            AddAssert("sample not playing", () => !sample.Playing);
-            AddAssert("sample not playing", () => !sample.Playing);
+            AddAssert("sample not playing", () => !skinnableSound.IsPlaying);
+            AddAssert("sample not playing", () => !skinnableSound.IsPlaying);
+            AddAssert("sample not playing", () => !skinnableSound.IsPlaying);
         }
 
         [Test]
@@ -119,10 +101,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                 sample = skinnableSound.ChildrenOfType<DrawableSample>().Single();
             });
 
-            AddAssert("sample playing", () => sample.Playing);
+            AddAssert("sample playing", () => skinnableSound.IsPlaying);
 
             AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
-            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+            AddUntilStep("wait for sample to stop playing", () => !skinnableSound.IsPlaying);
 
             AddStep("trigger skin change", () => skinSource.TriggerSourceChanged());
 
@@ -133,11 +115,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                 return sample != oldSample;
             });
 
-            AddAssert("new sample stopped", () => !sample.Playing);
+            AddAssert("new sample stopped", () => !skinnableSound.IsPlaying);
             AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
 
             AddWaitStep("wait a bit", 5);
-            AddAssert("new sample not played", () => !sample.Playing);
+            AddAssert("new sample not played", () => !skinnableSound.IsPlaying);
         }
 
         [Cached(typeof(ISkinSource))]
@@ -155,7 +137,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Drawable GetDrawableComponent(ISkinComponent component) => source?.GetDrawableComponent(component);
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source?.GetTexture(componentName, wrapModeS, wrapModeT);
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);
+            public Sample GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => source?.GetConfig<TLookup, TValue>(lookup);
 
             public void TriggerSourceChanged()
diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 41fd37a0d7..d623622434 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Graphics.Containers
     [Cached(typeof(IPreviewTrackOwner))]
     public abstract class OsuFocusedOverlayContainer : FocusedOverlayContainer, IPreviewTrackOwner, IKeyBindingHandler<GlobalAction>
     {
-        private SampleChannel samplePopIn;
-        private SampleChannel samplePopOut;
+        private Sample samplePopIn;
+        private Sample samplePopOut;
 
         protected override bool BlockNonPositionalInput => true;
 
diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index 53ee711626..f7914cbbca 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Graphics
         [Resolved]
         private NotificationOverlay notificationOverlay { get; set; }
 
-        private SampleChannel shutter;
+        private Sample shutter;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, Storage storage, AudioManager audio)
diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index abaae7b43c..b499b26f38 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Graphics.UserInterface
         private const int text_size = 17;
         private const int transition_length = 80;
 
-        private SampleChannel sampleClick;
-        private SampleChannel sampleHover;
+        private Sample sampleClick;
+        private Sample sampleHover;
 
         private TextContainer text;
 
diff --git a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
index 803facae04..c1963ce62d 100644
--- a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class HoverClickSounds : HoverSounds
     {
-        private SampleChannel sampleClick;
+        private Sample sampleClick;
         private readonly MouseButton[] buttons;
 
         /// <summary>
diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index a1d06711db..a91e2ffcab 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class HoverSounds : CompositeDrawable
     {
-        private SampleChannel sampleHover;
+        private Sample sampleHover;
 
         /// <summary>
         /// Length of debounce for hover sound playback, in milliseconds.
diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 6593531099..c075fbb328 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -40,8 +40,8 @@ namespace osu.Game.Graphics.UserInterface
         protected readonly Nub Nub;
 
         private readonly OsuTextFlowContainer labelText;
-        private SampleChannel sampleChecked;
-        private SampleChannel sampleUnchecked;
+        private Sample sampleChecked;
+        private Sample sampleUnchecked;
 
         public OsuCheckbox()
         {
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index d0356e77c7..bcf5220380 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Graphics.UserInterface
         /// </summary>
         private const int max_decimal_digits = 5;
 
-        private SampleChannel sample;
+        private Sample sample;
         private double lastSampleTime;
         private T lastSampleValue;
 
@@ -157,14 +157,14 @@ namespace osu.Game.Graphics.UserInterface
             lastSampleValue = value;
 
             lastSampleTime = Clock.CurrentTime;
-            sample.Frequency.Value = 1 + NormalizedValue * 0.2f;
 
+            var channel = sample.Play();
+
+            channel.Frequency.Value = 1 + NormalizedValue * 0.2f;
             if (NormalizedValue == 0)
-                sample.Frequency.Value -= 0.4f;
+                channel.Frequency.Value -= 0.4f;
             else if (NormalizedValue == 1)
-                sample.Frequency.Value += 0.4f;
-
-            sample.Play();
+                channel.Frequency.Value += 0.4f;
         }
 
         private void updateTooltipText(T value)
diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 1ec4dfc91a..75af9efc38 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -23,11 +23,11 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTextBox : BasicTextBox
     {
-        private readonly SampleChannel[] textAddedSamples = new SampleChannel[4];
-        private SampleChannel capsTextAddedSample;
-        private SampleChannel textRemovedSample;
-        private SampleChannel textCommittedSample;
-        private SampleChannel caretMovedSample;
+        private readonly Sample[] textAddedSamples = new Sample[4];
+        private Sample capsTextAddedSample;
+        private Sample textRemovedSample;
+        private Sample textCommittedSample;
+        private Sample caretMovedSample;
 
         /// <summary>
         /// Whether to allow playing a different samples based on the type of character.
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index c7e9a86fa4..a4f46517d5 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays
 
         private Container<ChangelogContent> content;
 
-        private SampleChannel sampleBack;
+        private Sample sampleBack;
 
         private List<APIChangelogBuild> builds;
 
diff --git a/osu.Game/Overlays/MedalOverlay.cs b/osu.Game/Overlays/MedalOverlay.cs
index 4425c2f168..0feae16b68 100644
--- a/osu.Game/Overlays/MedalOverlay.cs
+++ b/osu.Game/Overlays/MedalOverlay.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays
         private readonly Sprite innerSpin, outerSpin;
         private DrawableMedal drawableMedal;
 
-        private SampleChannel getSample;
+        private Sample getSample;
 
         private readonly Container content;
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 0c8245bebe..7bbffc6172 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Mods
 
         private readonly FillFlowContainer footerContainer;
 
-        private SampleChannel sampleOn, sampleOff;
+        private Sample sampleOn, sampleOff;
 
         public ModSelectOverlay()
         {
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index 81ec73a6c5..deec948d14 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -102,9 +102,9 @@ namespace osu.Game.Rulesets.UI
                 this.fallback = fallback;
             }
 
-            public SampleChannel Get(string name) => primary.Get(name) ?? fallback.Get(name);
+            public Sample Get(string name) => primary.Get(name) ?? fallback.Get(name);
 
-            public Task<SampleChannel> GetAsync(string name) => primary.GetAsync(name) ?? fallback.GetAsync(name);
+            public Task<Sample> GetAsync(string name) => primary.GetAsync(name) ?? fallback.GetAsync(name);
 
             public Stream GetStream(string name) => primary.GetStream(name) ?? fallback.GetStream(name);
 
diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs
index be6ed9700c..d956394ebb 100644
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@@ -45,8 +45,8 @@ namespace osu.Game.Screens.Menu
         public ButtonSystemState VisibleState = ButtonSystemState.TopLevel;
 
         private readonly Action clickAction;
-        private SampleChannel sampleClick;
-        private SampleChannel sampleHover;
+        private Sample sampleClick;
+        private Sample sampleHover;
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index f400b2114b..00061d6ea6 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Menu
         private readonly List<Button> buttonsTopLevel = new List<Button>();
         private readonly List<Button> buttonsPlay = new List<Button>();
 
-        private SampleChannel sampleBack;
+        private Sample sampleBack;
 
         private readonly LogoTrackingContainer logoTrackingContainer;
 
diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index d4cd073b7a..a1b8c3a203 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Menu
         private const double delay_step_one = 2300;
         private const double delay_step_two = 600;
 
-        private SampleChannel welcome;
+        private Sample welcome;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 1df5c503d6..b8b962be6c 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Menu
 
         private const int exit_delay = 3000;
 
-        private SampleChannel seeya;
+        private Sample seeya;
 
         protected virtual string SeeyaSampleName => "Intro/seeya";
 
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index a96fddb5ad..ffe6882a72 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Menu
 
         private BackgroundScreenDefault background;
 
-        private SampleChannel welcome;
+        private Sample welcome;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index abb83f894a..f8021a151e 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -21,8 +21,8 @@ namespace osu.Game.Screens.Menu
         protected override string BeatmapHash => "64e00d7022195959bfa3109d09c2e2276c8f12f486b91fcf6175583e973b48f2";
         protected override string BeatmapFile => "welcome.osz";
         private const double delay_step_two = 2142;
-        private SampleChannel welcome;
-        private SampleChannel pianoReverb;
+        private Sample welcome;
+        private Sample pianoReverb;
         protected override string SeeyaSampleName => "Intro/Welcome/seeya";
 
         protected override BackgroundScreen CreateBackground() => background = new BackgroundScreenDefault(false)
@@ -56,12 +56,13 @@ namespace osu.Game.Screens.Menu
                 {
                     PrepareMenuLoad();
 
-                    intro.LogoVisualisation.AddAmplitudeSource(pianoReverb);
-
                     AddInternal(intro);
 
                     welcome?.Play();
-                    pianoReverb?.Play();
+
+                    var reverbChannel = pianoReverb?.Play();
+                    if (reverbChannel != null)
+                        intro.LogoVisualisation.AddAmplitudeSource(reverbChannel);
 
                     Scheduler.AddDelayed(() =>
                     {
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 68d23e1a32..ffd7df97c4 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -43,8 +43,8 @@ namespace osu.Game.Screens.Menu
 
         private readonly IntroSequence intro;
 
-        private SampleChannel sampleClick;
-        private SampleChannel sampleBeat;
+        private Sample sampleClick;
+        private Sample sampleBeat;
 
         private readonly Container colourAndTriangles;
         private readonly Triangles triangles;
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2449563c73..a79119057d 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
-        private SampleChannel sampleStart;
+        private Sample sampleStart;
 
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 04030cdbfd..d17d3295c4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         private IBindable<bool> operationInProgress;
 
-        private SampleChannel sampleReadyCount;
+        private Sample sampleReadyCount;
 
         private readonly ButtonWithTrianglesExposed button;
 
@@ -120,8 +120,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             if (sampleReadyCount == null)
                 return;
 
-            sampleReadyCount.Frequency.Value = 0.77f + countReady * 0.06f;
-            sampleReadyCount.Play();
+            var channel = sampleReadyCount.Play();
+            channel.Frequency.Value = 0.77f + countReady * 0.06f;
         }
 
         private void updateButtonColour(bool green)
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 9b716b323d..aeb51813e4 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens
         /// </summary>
         public virtual bool DisallowExternalBeatmapRulesetChanges => false;
 
-        private SampleChannel sampleExit;
+        private Sample sampleExit;
 
         protected virtual bool PlayResumeSound => true;
 
diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index 608f20affd..71bea2a145 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Play
 
         private const float duration = 2500;
 
-        private SampleChannel failSample;
+        private Sample failSample;
 
         public FailAnimation(DrawableRuleset drawableRuleset)
         {
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1fcbed7ef7..7dda5973a0 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private MusicController musicController { get; set; }
 
-        private SampleChannel sampleRestart;
+        private Sample sampleRestart;
 
         public BreakOverlay BreakOverlay;
 
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 92b304de91..3f214e49d9 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -230,7 +230,7 @@ namespace osu.Game.Screens.Play
             private Box background;
             private AspectContainer aspect;
 
-            private SampleChannel sampleConfirm;
+            private Sample sampleConfirm;
 
             public Button()
             {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index f1120f55a6..c5c1e2eac7 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselHeader : Container
     {
-        private SampleChannel sampleHover;
+        private Sample sampleHover;
 
         private readonly Box hoverLayer;
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 6c0bd3a228..a91dc49069 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -86,10 +86,10 @@ namespace osu.Game.Screens.Select
 
         protected ModSelectOverlay ModSelect { get; private set; }
 
-        protected SampleChannel SampleConfirm { get; private set; }
+        protected Sample SampleConfirm { get; private set; }
 
-        private SampleChannel sampleChangeDifficulty;
-        private SampleChannel sampleChangeBeatmap;
+        private Sample sampleChangeDifficulty;
+        private Sample sampleChangeBeatmap;
 
         private Container carouselContainer;
 
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 61d0112c89..346c7b3c65 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Skinning
 
         public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
-        public override SampleChannel GetSample(ISampleInfo sampleInfo) => null;
+        public override Sample GetSample(ISampleInfo sampleInfo) => null;
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index 5abd963773..ef8de01042 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Skinning
         /// <param name="sampleInfo">The requested sample.</param>
         /// <returns>A matching sample channel, or null if unavailable.</returns>
         [CanBeNull]
-        SampleChannel GetSample(ISampleInfo sampleInfo);
+        Sample GetSample(ISampleInfo sampleInfo);
 
         /// <summary>
         /// Retrieve a configuration value.
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index fdcb81b574..fb4207b647 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
             return base.GetConfig<TLookup, TValue>(lookup);
         }
 
-        public override SampleChannel GetSample(ISampleInfo sampleInfo)
+        public override Sample GetSample(ISampleInfo sampleInfo)
         {
             if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy && legacy.CustomSampleBank == 0)
             {
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 090ffaebd7..e5d0217671 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Skinning
         protected TextureStore Textures;
 
         [CanBeNull]
-        protected IResourceStore<SampleChannel> Samples;
+        protected ISampleStore Samples;
 
         /// <summary>
         /// Whether texture for the keys exists.
@@ -452,7 +452,7 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        public override SampleChannel GetSample(ISampleInfo sampleInfo)
+        public override Sample GetSample(ISampleInfo sampleInfo)
         {
             IEnumerable<string> lookupNames;
 
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index ebc4757e75..e2f4a82a54 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -34,14 +34,14 @@ namespace osu.Game.Skinning
         public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             => Source.GetTexture(componentName, wrapModeS, wrapModeT);
 
-        public virtual SampleChannel GetSample(ISampleInfo sampleInfo)
+        public virtual Sample GetSample(ISampleInfo sampleInfo)
         {
             if (!(sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample))
                 return Source.GetSample(sampleInfo);
 
             var playLayeredHitSounds = GetConfig<LegacySetting, bool>(LegacySetting.LayeredHitSounds);
             if (legacySample.IsLayered && playLayeredHitSounds?.Value == false)
-                return new SampleChannelVirtual();
+                return new SampleVirtual();
 
             return Source.GetSample(sampleInfo);
         }
diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index cb5234c847..4b6099e85f 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Skinning
             }
         }
 
-        public override void Play(bool restart = true)
+        public override void Play()
         {
             cancelPendingStart();
             RequestedPlaying = true;
@@ -75,7 +75,7 @@ namespace osu.Game.Skinning
             if (samplePlaybackDisabled.Value)
                 return;
 
-            base.Play(restart);
+            base.Play();
         }
 
         public override void Stop()
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 2a0f480b48..2c83023fdc 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Skinning
 
         private readonly AudioContainer<DrawableSample> sampleContainer;
         private ISampleInfo sampleInfo;
+        private SampleChannel activeChannel;
 
         [Resolved]
         private ISampleStore sampleStore { get; set; }
@@ -99,7 +100,7 @@ namespace osu.Game.Skinning
             if (ch == null)
                 return;
 
-            sampleContainer.Add(Sample = new DrawableSample(ch) { Looping = Looping });
+            sampleContainer.Add(Sample = new DrawableSample(ch));
 
             // Start playback internally for the new sample if the previous one was playing beforehand.
             if (wasPlaying && Looping)
@@ -109,18 +110,26 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Plays the sample.
         /// </summary>
-        /// <param name="restart">Whether to play the sample from the beginning.</param>
-        public void Play(bool restart = true) => Sample?.Play(restart);
+        public void Play()
+        {
+            if (Sample == null)
+                return;
+
+            activeChannel = Sample.Play();
+            activeChannel.Looping = Looping;
+        }
 
         /// <summary>
         /// Stops the sample.
         /// </summary>
-        public void Stop() => Sample?.Stop();
+        public void Stop() => activeChannel?.Stop();
 
         /// <summary>
         /// Whether the sample is currently playing.
         /// </summary>
-        public bool Playing => Sample?.Playing ?? false;
+        public bool Playing => activeChannel?.Playing ?? false;
+
+        public bool Played => activeChannel?.Played ?? false;
 
         private bool looping;
 
@@ -134,8 +143,8 @@ namespace osu.Game.Skinning
             {
                 looping = value;
 
-                if (Sample != null)
-                    Sample.Looping = value;
+                if (activeChannel != null)
+                    activeChannel.Looping = value;
             }
         }
 
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 4b0cf02c0a..e8d84b49f9 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Skinning
 
         public abstract Drawable GetDrawableComponent(ISkinComponent componentName);
 
-        public abstract SampleChannel GetSample(ISampleInfo sampleInfo);
+        public abstract Sample GetSample(ISampleInfo sampleInfo);
 
         public Texture GetTexture(string componentName) => GetTexture(componentName, default, default);
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 99c64b13a4..2826c826a5 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Skinning
 
         public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => CurrentSkin.Value.GetTexture(componentName, wrapModeS, wrapModeT);
 
-        public SampleChannel GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
+        public Sample GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => CurrentSkin.Value.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 27cf0c697a..ba67d0a678 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -59,9 +59,9 @@ namespace osu.Game.Skinning
             return fallbackSource?.GetTexture(componentName, wrapModeS, wrapModeT);
         }
 
-        public SampleChannel GetSample(ISampleInfo sampleInfo)
+        public Sample GetSample(ISampleInfo sampleInfo)
         {
-            SampleChannel sourceChannel;
+            Sample sourceChannel;
             if (AllowSampleLookup(sampleInfo) && (sourceChannel = skin?.GetSample(sampleInfo)) != null)
                 return sourceChannel;
 
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index a874e9a0db..06c694dc7a 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -119,13 +119,12 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Plays the samples.
         /// </summary>
-        /// <param name="restart">Whether to play the sample from the beginning.</param>
-        public virtual void Play(bool restart = true)
+        public virtual void Play()
         {
             samplesContainer.ForEach(c =>
             {
                 if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
-                    c.Play(restart);
+                    c.Play();
             });
         }
 
@@ -188,6 +187,8 @@ namespace osu.Game.Skinning
         /// </summary>
         public bool IsPlaying => samplesContainer.Any(s => s.Playing);
 
+        public bool IsPlayed => samplesContainer.Any(s => s.Played);
+
         #endregion
     }
 }

From 5a64abee648f7c49f92305f6ba988c19199e9f64 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 11:51:31 +0300
Subject: [PATCH 07613/10326] Inline with above method

---
 .../Online/Rooms/MultiplayerBeatmapTracker.cs  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index 32a6c39ea8..59dfdcf464 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -35,21 +35,19 @@ namespace osu.Game.Online.Rooms
         }
 
         protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)
-        {
-            var verified = verifyDatabasedModel(databasedSet);
-            if (!verified)
-                Logger.Log("The imported beatmap set does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
-
-            return verified;
-        }
-
-        private bool verifyDatabasedModel(BeatmapSetInfo databasedSet)
         {
             int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
             string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
 
             var matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
-            return matchingBeatmap != null;
+
+            if (matchingBeatmap == null)
+            {
+                Logger.Log("The imported beatmap set does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
+                return false;
+            }
+
+            return true;
         }
 
         protected override bool IsModelAvailableLocally()

From 63b4c529a6fe1f3a996f6074bfb736144e2e9c76 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 11:57:40 +0300
Subject: [PATCH 07614/10326] Add xmldoc explaining what the multiplayer
 beatmap tracker is for

---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index 59dfdcf464..28e4872ad3 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -9,6 +9,12 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Online.Rooms
 {
+    /// <summary>
+    /// Represent a checksum-verifying beatmap availability tracker usable for online play screens.
+    ///
+    /// This differs from a regular download tracking composite as this accounts for the
+    /// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
+    /// </summary>
     public class MultiplayerBeatmapTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
         public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();

From f1894a8bacb83c8e35c62422447d2d7cd78a3aa9 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 12:17:56 +0000
Subject: [PATCH 07615/10326] fixed itemUpdated()

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

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 0bfa0ba4f0..ba92ed5b04 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -116,8 +116,7 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
             {
-                List<SkinInfo> newDropdownItems = skinDropdown.Items.ToList();
-                newDropdownItems.Add(item);
+                List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
                 newDropdownItems = sortList(newDropdownItems);
                 Schedule(() => skinDropdown.Items = newDropdownItems.ToArray());
             }

From 9b7187e3c855fa50dfc8331f43730a113ed95059 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Tue, 19 Jan 2021 08:23:31 -0500
Subject: [PATCH 07616/10326] Revert "Use fades instead of event listening.
 Fixed same issue in the playlist room creation."

This reverts commit 3a7608275d5b0188c3ab70df2ae9482fad252392.
---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 45 +++++--------------
 .../Playlists/PlaylistsRoomSubScreen.cs       | 38 +---------------
 2 files changed, 13 insertions(+), 70 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 03a76c66f2..38c2ca7e0c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -180,40 +180,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
             };
-        }
 
-        public override void OnEntering(IScreen last)
-        {
-            base.OnEntering(last);
-
-            subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            if (base.OnExiting(next))
-                return true;
-
-            subScreenContainer.FadeOut();
-
-            return false;
-        }
-
-        public override void OnResuming(IScreen last)
-        {
-            base.OnResuming(last);
-
-            if (client.Room == null)
-                subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
-            else
-                subScreenContainer.FadeInFromZero();
-        }
-
-        public override void OnSuspending(IScreen next)
-        {
-            subScreenContainer.FadeOut();
-
-            base.OnSuspending(next);
+            subScreenContainer.Hide();
+            client.RoomUpdated += roomUpdated;
         }
 
         protected override void LoadComplete()
@@ -294,6 +263,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
+        private void roomUpdated()
+        {
+            if (client.Room != null)
+            {
+                // If the room is updated and is not null, show the room sub screen container and unsubscribe.
+                subScreenContainer.Show();
+                client.RoomUpdated -= roomUpdated;
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 583956b3f1..e76ca995bf 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -33,8 +33,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         private OverlinedHeader participantsHeader;
 
-        private GridContainer subScreenContainer;
-
         public PlaylistsRoomSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New playlist" : room.Name.Value;
@@ -46,7 +44,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         {
             InternalChildren = new Drawable[]
             {
-                subScreenContainer = new GridContainer
+                new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Content = new[]
@@ -197,40 +195,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public override void OnEntering(IScreen last)
-        {
-            base.OnEntering(last);
-
-            subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            if (base.OnExiting(next))
-                return true;
-
-            subScreenContainer.FadeOut();
-
-            return false;
-        }
-
-        public override void OnResuming(IScreen last)
-        {
-            base.OnResuming(last);
-
-            if (roomId.Value == null)
-                subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
-            else
-                subScreenContainer.FadeInFromZero();
-        }
-
-        public override void OnSuspending(IScreen next)
-        {
-            subScreenContainer.FadeOut();
-
-            base.OnSuspending(next);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 6d1d488831f1992957b6817eaa590114e6db60b5 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Tue, 19 Jan 2021 08:24:14 -0500
Subject: [PATCH 07617/10326] Revert "Use the client.RoomUpdated action instead
 of binding the value of the settings overlay visibility and creating an event
 from it based on its ValueChanged action."

This reverts commit cbfb999c2845074d799d1126296584898d9be52b.
---
 .../Multiplayer/MultiplayerMatchSubScreen.cs    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 38c2ca7e0c..df61a0ad21 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
+        private readonly Bindable<Visibility> settingsOverlayVisibility = new Bindable<Visibility>();
+
         private GridContainer subScreenContainer;
 
         private IBindable<bool> isConnected;
@@ -182,7 +184,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             };
 
             subScreenContainer.Hide();
-            client.RoomUpdated += roomUpdated;
+            settingsOverlayVisibility.BindTo(settingsOverlay.State);
+            settingsOverlayVisibility.ValueChanged += settingsOverlayVisibilityChanged;
         }
 
         protected override void LoadComplete()
@@ -263,13 +266,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
-        private void roomUpdated()
+        private void settingsOverlayVisibilityChanged(ValueChangedEvent<Visibility> settingsOverlayVisibilityChangedEvent)
         {
             if (client.Room != null)
             {
-                // If the room is updated and is not null, show the room sub screen container and unsubscribe.
                 subScreenContainer.Show();
-                client.RoomUpdated -= roomUpdated;
+                settingsOverlayVisibility.ValueChanged -= settingsOverlayVisibilityChanged;
+            }
+            else
+            {
+                if (settingsOverlayVisibilityChangedEvent.NewValue == Visibility.Visible)
+                    subScreenContainer.Hide();
+                else
+                    subScreenContainer.Show();
             }
         }
 

From 33677f57702f2b17dd6dd9e385a4553aa66bdd9a Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Tue, 19 Jan 2021 08:52:43 -0500
Subject: [PATCH 07618/10326] Use BindValueChanged to show main content for new
 multiplayer and playlist rooms when the settings overlay is hidden.

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 37 +++++++------------
 .../Playlists/PlaylistsRoomSubScreen.cs       | 15 +++++++-
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index df61a0ad21..0ec43c2b10 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -39,15 +39,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
-        private readonly Bindable<Visibility> settingsOverlayVisibility = new Bindable<Visibility>();
-
-        private GridContainer subScreenContainer;
-
         private IBindable<bool> isConnected;
 
         [CanBeNull]
         private IDisposable readyClickOperation;
 
+        private GridContainer mainContent;
+
         public MultiplayerMatchSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
@@ -59,7 +57,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             InternalChildren = new Drawable[]
             {
-                subScreenContainer = new GridContainer
+                mainContent = new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Content = new[]
@@ -183,9 +181,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 }
             };
 
-            subScreenContainer.Hide();
-            settingsOverlayVisibility.BindTo(settingsOverlay.State);
-            settingsOverlayVisibility.ValueChanged += settingsOverlayVisibilityChanged;
+            if (client.Room == null)
+            {
+                mainContent.Hide();
+
+                settingsOverlay.State.BindValueChanged(visibility =>
+                {
+                    if (visibility.NewValue == Visibility.Hidden)
+                        mainContent.Show();
+                }, true);
+            }
         }
 
         protected override void LoadComplete()
@@ -266,22 +271,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
-        private void settingsOverlayVisibilityChanged(ValueChangedEvent<Visibility> settingsOverlayVisibilityChangedEvent)
-        {
-            if (client.Room != null)
-            {
-                subScreenContainer.Show();
-                settingsOverlayVisibility.ValueChanged -= settingsOverlayVisibilityChanged;
-            }
-            else
-            {
-                if (settingsOverlayVisibilityChangedEvent.NewValue == Visibility.Visible)
-                    subScreenContainer.Hide();
-                else
-                    subScreenContainer.Show();
-            }
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index e76ca995bf..b8d9d258f5 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         private OverlinedHeader participantsHeader;
 
+        private GridContainer mainContent;
+
         public PlaylistsRoomSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New playlist" : room.Name.Value;
@@ -44,7 +46,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         {
             InternalChildren = new Drawable[]
             {
-                new GridContainer
+                mainContent = new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Content = new[]
@@ -190,6 +192,17 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
                 }
             };
+
+            if (roomId.Value == null)
+            {
+                mainContent.Hide();
+
+                settingsOverlay.State.BindValueChanged(visibility =>
+                {
+                    if (visibility.NewValue == Visibility.Hidden)
+                        mainContent.Show();
+                }, true);
+            }
         }
 
         [Resolved]

From 31e61326e1ea4d4f3b3e1e8450c8fdc385939d0d Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 14:00:17 +0000
Subject: [PATCH 07619/10326] Only user skins are sorted

---
 .../Overlays/Settings/Sections/SkinSection.cs | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index ba92ed5b04..1dcc5d824d 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private List<SkinInfo> skinItems;
 
+        private int firstNonDefault;
+
         [Resolved]
         private SkinManager skins { get; set; }
 
@@ -107,8 +109,10 @@ namespace osu.Game.Overlays.Settings.Sections
         private void updateItems()
         {
             skinItems = skins.GetAllUsableSkins();
+            firstNonDefault = skinItems.FindIndex(s => s.ID > 0);
+
+            skinItems.Insert(firstNonDefault, random_skin_info);
             skinItems = sortList(skinItems);
-            
             skinDropdown.Items = skinItems;
         }
 
@@ -130,19 +134,12 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private List<SkinInfo> sortList(List<SkinInfo> skinsList)
         {
-            skinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.Ordinal));
-            for (int i = 0; i < skinsList.Count; i++)
-            {
-                // insert lazer built-in skins before user skins
-                if (skinsList[i].ID <= 0) {
-                    var itemToMove = skinsList[i];
-                    skinsList.RemoveAt(i);
-                    skinsList.Insert(0, itemToMove);
-                }
-            }
-            skinsList.RemoveAll(s => s.ID == SkinInfo.RANDOM_SKIN);
-            skinsList.Insert(0, random_skin_info);
-
+            // Sort user skins seperate from built-in skins
+            List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
+            skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
+            userSkinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
+            
+            skinsList.AddRange(userSkinsList);
             return skinsList;
         }
 

From c5c5fdca454cd9f1a036eba686d33673d074c038 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 14:10:08 +0000
Subject: [PATCH 07620/10326] Remove another whitespace

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index b42091ce30..9ca8ec9051 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -143,7 +143,6 @@ namespace osu.Game.Overlays.Settings.Sections
             List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             userSkinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
-            
             skinsList.AddRange(userSkinsList);
             return skinsList;
         }

From b265d2dab499f4cdf75fadbc1acc20acb2f21ad3 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 14:16:22 +0000
Subject: [PATCH 07621/10326] Remove another whitespace

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index b42091ce30..9ca8ec9051 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -143,7 +143,6 @@ namespace osu.Game.Overlays.Settings.Sections
             List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             userSkinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
-            
             skinsList.AddRange(userSkinsList);
             return skinsList;
         }

From 052e9eef02661abf004152ac29c015a329ad20d3 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Tue, 19 Jan 2021 09:16:39 -0500
Subject: [PATCH 07622/10326] Added inline comments

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 ++
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 0ec43c2b10..7c4b6d18ec 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -183,6 +183,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             if (client.Room == null)
             {
+                // A new room is being created.
+                // The main content should be hidden until the settings overlay is hidden, signaling the room is ready to be displayed.
                 mainContent.Hide();
 
                 settingsOverlay.State.BindValueChanged(visibility =>
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index b8d9d258f5..22580f0537 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -195,6 +195,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
             if (roomId.Value == null)
             {
+                // A new room is being created.
+                // The main content should be hidden until the settings overlay is hidden, signaling the room is ready to be displayed.
                 mainContent.Hide();
 
                 settingsOverlay.State.BindValueChanged(visibility =>

From ed3dece9f8f7c0c0e0d35ac3fa330f2359b84cbc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 18:36:05 +0300
Subject: [PATCH 07623/10326] Fix wrong importing of test beatmaps

Importing via `testBeatmapSet` causes the beatmapset hash to not be calculated due to no files existing in the importing process, which leads into not reusing existing test beatmaps due to no hash.
---
 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index d692e6f9a3..a6275f14e6 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -94,13 +94,13 @@ namespace osu.Game.Tests.Online
         public void TestTrackerRespectsSoftDeleting()
         {
             AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
-            AddStep("import beatmap", () => beatmaps.Import(testBeatmapSet).Wait());
+            AddStep("import beatmap", () => beatmaps.Import(testBeatmapFile).Wait());
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
 
-            AddStep("delete beatmap", () => beatmaps.Delete(testBeatmapSet));
+            AddStep("delete beatmap", () => beatmaps.Delete(beatmaps.QueryBeatmapSet(b => b.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID)));
             addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
 
-            AddStep("undelete beatmap", () => beatmaps.Undelete(testBeatmapSet));
+            AddStep("undelete beatmap", () => beatmaps.Undelete(beatmaps.QueryBeatmapSet(b => b.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID)));
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
         }
 

From 14ff2af00ef868bd1ff65dd22f7eed242d7c2e8b Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 15:37:59 +0000
Subject: [PATCH 07624/10326] Satisfy AppVeyor

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

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 9ca8ec9051..7023702d0e 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Overlays.Settings.Sections
             // Sort user skins seperate from built-in skins
             List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
-            userSkinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
+            userSkinsList.Sort((a, b) => System.String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
             skinsList.AddRange(userSkinsList);
             return skinsList;
         }

From dba01cf2b1ea7cf3445f14e30855ce9e95e6bd76 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 18:43:16 +0300
Subject: [PATCH 07625/10326] Use beatmap "soleily" and remove no longer needed
 archive

---
 .../TestSceneMultiplayerBeatmapTracker.cs     |  41 ++++++++++--------
 .../Resources/Archives/test-beatmap.osz       | Bin 7286 -> 0 bytes
 2 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 osu.Game.Tests/Resources/Archives/test-beatmap.osz

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index a6275f14e6..9caecc198a 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.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.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -10,15 +11,17 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
 
@@ -49,9 +52,9 @@ namespace osu.Game.Tests.Online
         {
             beatmaps.AllowImport = new TaskCompletionSource<bool>();
 
-            testBeatmapFile = getTestBeatmapOsz();
+            testBeatmapFile = TestResources.GetTestBeatmapForImport();
 
-            testBeatmapInfo = new TestBeatmap(Ruleset.Value).BeatmapInfo;
+            testBeatmapInfo = getTestBeatmapInfo(testBeatmapFile);
             testBeatmapSet = testBeatmapInfo.BeatmapSet;
 
             var existing = beatmaps.QueryBeatmapSet(s => s.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID);
@@ -109,16 +112,10 @@ namespace osu.Game.Tests.Online
         {
             AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
 
-            BeatmapInfo wrongBeatmap = null;
-
-            AddStep("import wrong checksum beatmap", () =>
+            AddStep("import altered beatmap", () =>
             {
-                wrongBeatmap = new TestBeatmap(Ruleset.Value).BeatmapInfo;
-                wrongBeatmap.MD5Hash = "1337";
-
-                beatmaps.Import(wrongBeatmap.BeatmapSet).Wait();
+                beatmaps.Import(TestResources.GetTestBeatmapForImport(true)).Wait();
             });
-            AddAssert("wrong beatmap available", () => beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == wrongBeatmap.OnlineBeatmapID) != null);
             addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
 
             AddStep("recreate tracker", () => Child = tracker = new MultiplayerBeatmapTracker
@@ -135,15 +132,25 @@ namespace osu.Game.Tests.Online
             AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
         }
 
-        private string getTestBeatmapOsz()
+        private static BeatmapInfo getTestBeatmapInfo(string archiveFile)
         {
-            var filename = Path.GetTempFileName() + ".osz";
+            BeatmapInfo info;
 
-            using (var stream = TestResources.OpenResource("Archives/test-beatmap.osz"))
-            using (var file = File.Create(filename))
-                stream.CopyTo(file);
+            using (var archive = new ZipArchiveReader(File.OpenRead(archiveFile)))
+            using (var stream = archive.GetStream("Soleily - Renatus (Gamu) [Insane].osu"))
+            using (var reader = new LineBufferedReader(stream))
+            {
+                var decoder = Decoder.GetDecoder<Beatmap>(reader);
+                var beatmap = decoder.Decode(reader);
 
-            return filename;
+                info = beatmap.BeatmapInfo;
+                info.BeatmapSet.Beatmaps = new List<BeatmapInfo> { info };
+                info.BeatmapSet.Metadata = info.Metadata;
+                info.MD5Hash = stream.ComputeMD5Hash();
+                info.Hash = stream.ComputeSHA2Hash();
+            }
+
+            return info;
         }
 
         private class TestBeatmapManager : BeatmapManager
diff --git a/osu.Game.Tests/Resources/Archives/test-beatmap.osz b/osu.Game.Tests/Resources/Archives/test-beatmap.osz
deleted file mode 100644
index f98fd2f8ffef0968270a1f2c7d75162de80417c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7286
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
BJ!=2}


From a880b8d21dae103d8e3340678384356b9218b4f2 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 16:11:16 +0000
Subject: [PATCH 07626/10326] Satisfy AppVeyor

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

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 9ca8ec9051..c39f95d93a 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Overlays.Settings.Sections
             // Sort user skins seperate from built-in skins
             List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
-            userSkinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
+            userSkinsList.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
             skinsList.AddRange(userSkinsList);
             return skinsList;
         }

From 206a0b8bace7733f6ac6f12909adcaecb6472d08 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 16:55:50 +0000
Subject: [PATCH 07627/10326] Fix firstNonDefault staying as -1

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index c39f95d93a..a3e472a9f9 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -115,7 +115,8 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             skinItems = skins.GetAllUsableSkins();
             firstNonDefault = skinItems.FindIndex(s => s.ID > 0);
-
+            if (firstNonDefault < 0)
+                firstNonDefault = skinItems.Count;
             skinItems.Insert(firstNonDefault, random_skin_info);
             skinItems = sortList(skinItems);
             skinDropdown.Items = skinItems;

From 34612ae233fbf664c7db40567b09505be918d3f2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 19:03:29 +0300
Subject: [PATCH 07628/10326] Forward internal management to a container
 alongside tracker

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs   | 17 ++++++++++++++---
 .../Multiplayer/MultiplayerMatchSubScreen.cs    |  4 ++--
 .../Playlists/PlaylistsRoomSubScreen.cs         |  4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index c049d4be20..4b89a0c278 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -7,6 +7,8 @@ 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;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -43,14 +45,23 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Cached]
         protected readonly MultiplayerBeatmapTracker BeatmapTracker;
 
+        private readonly Container content = new Container { RelativeSizeAxes = Axes.Both };
+
         protected RoomSubScreen()
         {
-            InternalChild = BeatmapTracker = new MultiplayerBeatmapTracker
+            base.AddInternal(BeatmapTracker = new MultiplayerBeatmapTracker
             {
-                SelectedItem = { BindTarget = SelectedItem },
-            };
+                SelectedItem = { BindTarget = SelectedItem }
+            });
+
+            base.AddInternal(content);
         }
 
+        // This is a bit ugly but we don't have the concept of InternalContent so it'll have to do for now. (https://github.com/ppy/osu-framework/issues/1690)
+        protected override void AddInternal(Drawable drawable) => content.Add(drawable);
+        protected override bool RemoveInternal(Drawable drawable) => content.Remove(drawable);
+        protected override void ClearInternal(bool disposeChildren = true) => content.Clear(disposeChildren);
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index a641935b9a..fa4b972f98 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddRangeInternal(new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new GridContainer
                 {
@@ -176,7 +176,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     RelativeSizeAxes = Axes.Both,
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            });
+            };
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 7b3cdf16db..781c455eb4 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddRangeInternal(new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new GridContainer
                 {
@@ -188,7 +188,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     EditPlaylist = () => this.Push(new MatchSongSelect()),
                     State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            });
+            };
         }
 
         [Resolved]

From b00c6a1d60723622101512b13168214ff61696aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Jan 2021 18:29:55 +0100
Subject: [PATCH 07629/10326] Make first non-default skin index a property

The previous code was very brittle - it was not always updating
properly, and seems to have worked either by a carefully crafted set of
circumstances, or just plain coincidence.

Having this be a get-only property avoids potential error in the future
caused by not updating the index properly, at the expense of an added
linear lookup.
---
 .../Overlays/Settings/Sections/SkinSection.cs | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index a3e472a9f9..bbb4c50f6b 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -38,7 +38,17 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private List<SkinInfo> skinItems;
 
-        private int firstNonDefault;
+        private int firstNonDefaultSkinIndex
+        {
+            get
+            {
+                var index = skinItems.FindIndex(s => s.ID > 0);
+                if (index < 0)
+                    index = skinItems.Count;
+
+                return index;
+            }
+        }
 
         [Resolved]
         private SkinManager skins { get; set; }
@@ -114,10 +124,7 @@ namespace osu.Game.Overlays.Settings.Sections
         private void updateItems()
         {
             skinItems = skins.GetAllUsableSkins();
-            firstNonDefault = skinItems.FindIndex(s => s.ID > 0);
-            if (firstNonDefault < 0)
-                firstNonDefault = skinItems.Count;
-            skinItems.Insert(firstNonDefault, random_skin_info);
+            skinItems.Insert(firstNonDefaultSkinIndex, random_skin_info);
             skinItems = sortList(skinItems);
             skinDropdown.Items = skinItems;
         }
@@ -141,8 +148,8 @@ namespace osu.Game.Overlays.Settings.Sections
         private List<SkinInfo> sortList(List<SkinInfo> skinsList)
         {
             // Sort user skins seperate from built-in skins
-            List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
-            skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
+            List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefaultSkinIndex, skinsList.Count - firstNonDefaultSkinIndex);
+            skinsList.RemoveRange(firstNonDefaultSkinIndex, skinsList.Count - firstNonDefaultSkinIndex);
             userSkinsList.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
             skinsList.AddRange(userSkinsList);
             return skinsList;

From 78e590d25da4b570447d8fb3b8462f56fa52f50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Jan 2021 18:36:42 +0100
Subject: [PATCH 07630/10326] Refactor skin sorting method

* Rename to `sortUserSkins` to convey meaning better.
* Sort in-place instead of slicing the list.
* Change to `void` to avoid misleading users that the method returns
  a new list instance.
* Fix typo in comment.
---
 .../Overlays/Settings/Sections/SkinSection.cs     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index bbb4c50f6b..75c0324408 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             skinItems = skins.GetAllUsableSkins();
             skinItems.Insert(firstNonDefaultSkinIndex, random_skin_info);
-            skinItems = sortList(skinItems);
+            sortUserSkins(skinItems);
             skinDropdown.Items = skinItems;
         }
 
@@ -134,7 +134,7 @@ namespace osu.Game.Overlays.Settings.Sections
             if (weakItem.NewValue.TryGetTarget(out var item))
             {
                 List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
-                newDropdownItems = sortList(newDropdownItems);
+                sortUserSkins(newDropdownItems);
                 Schedule(() => skinDropdown.Items = newDropdownItems.ToArray());
             }
         }
@@ -145,14 +145,11 @@ namespace osu.Game.Overlays.Settings.Sections
                 Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != item.ID).ToArray());
         }
 
-        private List<SkinInfo> sortList(List<SkinInfo> skinsList)
+        private void sortUserSkins(List<SkinInfo> skinsList)
         {
-            // Sort user skins seperate from built-in skins
-            List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefaultSkinIndex, skinsList.Count - firstNonDefaultSkinIndex);
-            skinsList.RemoveRange(firstNonDefaultSkinIndex, skinsList.Count - firstNonDefaultSkinIndex);
-            userSkinsList.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
-            skinsList.AddRange(userSkinsList);
-            return skinsList;
+            // Sort user skins separately from built-in skins
+            skinsList.Sort(firstNonDefaultSkinIndex, skinsList.Count - firstNonDefaultSkinIndex,
+                Comparer<SkinInfo>.Create((a, b) => string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase)));
         }
 
         private class SkinSettingsDropdown : SettingsDropdown<SkinInfo>

From 3b49b7461ef628031ba3440ea795cf5a42073a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Jan 2021 18:46:21 +0100
Subject: [PATCH 07631/10326] Schedule entire operation for safety

Also removes a redundant list copy.
---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 75c0324408..4cfd801caf 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -133,9 +133,12 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
             {
-                List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
-                sortUserSkins(newDropdownItems);
-                Schedule(() => skinDropdown.Items = newDropdownItems.ToArray());
+                Schedule(() =>
+                {
+                    List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
+                    sortUserSkins(newDropdownItems);
+                    skinDropdown.Items = newDropdownItems;
+                });
             }
         }
 

From 82e5a5bf6fbcc997e692e2af269a69f990343ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Jan 2021 23:10:15 +0100
Subject: [PATCH 07632/10326] Mark legacy beatmap skin colour test as abstract

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

diff --git a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
index fb3432fbae..051ede30b7 100644
--- a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Beatmaps
 {
-    public class LegacyBeatmapSkinColourTest : ScreenTestScene
+    public abstract class LegacyBeatmapSkinColourTest : ScreenTestScene
     {
         protected readonly Bindable<bool> BeatmapSkins = new Bindable<bool>();
         protected readonly Bindable<bool> BeatmapColours = new Bindable<bool>();

From 2ca3ccad0647c28f20b9aedaf0d560baf98b9de9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 20 Jan 2021 04:56:46 +0300
Subject: [PATCH 07633/10326] Move all the content to BeatmapSetHeaderContent
 drawable

---
 .../Online/TestSceneBeatmapSetOverlay.cs      |   6 +-
 .../Overlays/BeatmapSet/BeatmapSetHeader.cs   | 278 +----------------
 .../BeatmapSet/BeatmapSetHeaderContent.cs     | 283 ++++++++++++++++++
 osu.Game/Overlays/BeatmapSetOverlay.cs        |   6 +-
 4 files changed, 295 insertions(+), 278 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index 7ff978c7ca..edc1696456 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -231,8 +231,8 @@ namespace osu.Game.Tests.Visual.Online
                 });
             });
 
-            AddAssert("shown beatmaps of current ruleset", () => overlay.Header.Picker.Difficulties.All(b => b.Beatmap.Ruleset.Equals(overlay.Header.RulesetSelector.Current.Value)));
-            AddAssert("left-most beatmap selected", () => overlay.Header.Picker.Difficulties.First().State == BeatmapPicker.DifficultySelectorState.Selected);
+            AddAssert("shown beatmaps of current ruleset", () => overlay.Header.HeaderContent.Picker.Difficulties.All(b => b.Beatmap.Ruleset.Equals(overlay.Header.RulesetSelector.Current.Value)));
+            AddAssert("left-most beatmap selected", () => overlay.Header.HeaderContent.Picker.Difficulties.First().State == BeatmapPicker.DifficultySelectorState.Selected);
         }
 
         [Test]
@@ -310,7 +310,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private void downloadAssert(bool shown)
         {
-            AddAssert($"is download button {(shown ? "shown" : "hidden")}", () => overlay.Header.DownloadButtonsVisible == shown);
+            AddAssert($"is download button {(shown ? "shown" : "hidden")}", () => overlay.Header.HeaderContent.DownloadButtonsVisible == shown);
         }
 
         private class TestBeatmapSetOverlay : BeatmapSetOverlay
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
index bc9008d1f5..4b26b02a8e 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
@@ -1,24 +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.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.Effects;
-using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online;
-using osu.Game.Online.API;
-using osu.Game.Overlays.BeatmapListing.Panels;
-using osu.Game.Overlays.BeatmapSet.Buttons;
 using osu.Game.Rulesets;
 using osuTK;
 using osuTK.Graphics;
@@ -27,41 +15,16 @@ namespace osu.Game.Overlays.BeatmapSet
 {
     public class BeatmapSetHeader : OverlayHeader
     {
-        private const float transition_duration = 200;
-        private const float buttons_height = 45;
-        private const float buttons_spacing = 5;
-
         public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
 
-        public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
-
-        public BeatmapPicker Picker { get; private set; }
+        public BeatmapSetHeaderContent HeaderContent { get; private set; }
 
+        [Cached]
         public BeatmapRulesetSelector RulesetSelector { get; private set; }
 
-        private IBindable<DownloadState> state => downloadTracker.State;
-
         [Cached(typeof(IBindable<RulesetInfo>))]
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        private readonly DownloadTracker downloadTracker;
-        private OsuSpriteText title, artist;
-        private AuthorInfo author;
-        private ExplicitContentBeatmapPill explicitContentPill;
-        private FillFlowContainer downloadButtonsContainer;
-        private BeatmapAvailability beatmapAvailability;
-        private BeatmapSetOnlineStatusPill onlineStatusPill;
-        private ExternalLinkButton externalLink;
-        private UpdateableBeatmapSetCover cover;
-        private Box coverGradient;
-        private FillFlowContainer fadeContent;
-        private FavouriteButton favouriteButton;
-        private LoadingSpinner loading;
-        private Details details;
-
         public BeatmapSetHeader()
         {
             Masking = true;
@@ -73,249 +36,20 @@ namespace osu.Game.Overlays.BeatmapSet
                 Radius = 3,
                 Offset = new Vector2(0f, 1f),
             };
-
-            AddInternal(downloadTracker = new DownloadTracker
-            {
-                BeatmapSet = { BindTarget = BeatmapSet }
-            });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        protected override Drawable CreateContent() => HeaderContent = new BeatmapSetHeaderContent
         {
-            Picker.Beatmap.ValueChanged += b =>
-            {
-                details.Beatmap = b.NewValue;
-                externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
-            };
-
-            coverGradient.Colour = ColourInfo.GradientVertical(colourProvider.Background6.Opacity(0.3f), colourProvider.Background6.Opacity(0.8f));
-            onlineStatusPill.BackgroundColour = colourProvider.Background6;
-
-            state.BindValueChanged(_ => updateDownloadButtons());
-
-            BeatmapSet.BindValueChanged(setInfo =>
-            {
-                Picker.BeatmapSet = RulesetSelector.BeatmapSet = author.BeatmapSet = beatmapAvailability.BeatmapSet = details.BeatmapSet = setInfo.NewValue;
-                cover.BeatmapSet = setInfo.NewValue;
-
-                if (setInfo.NewValue == null)
-                {
-                    onlineStatusPill.FadeTo(0.5f, 500, Easing.OutQuint);
-                    fadeContent.Hide();
-
-                    loading.Show();
-
-                    downloadButtonsContainer.FadeOut(transition_duration);
-                    favouriteButton.FadeOut(transition_duration);
-                }
-                else
-                {
-                    fadeContent.FadeIn(500, Easing.OutQuint);
-
-                    loading.Hide();
-
-                    title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
-                    artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
-
-                    explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
-
-                    onlineStatusPill.FadeIn(500, Easing.OutQuint);
-                    onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
-
-                    downloadButtonsContainer.FadeIn(transition_duration);
-                    favouriteButton.FadeIn(transition_duration);
-
-                    updateDownloadButtons();
-                }
-            }, true);
-        }
-
-        protected override Drawable CreateContent() => new Container
-        {
-            RelativeSizeAxes = Axes.X,
-            AutoSizeAxes = Axes.Y,
-            Children = new Drawable[]
-            {
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        cover = new UpdateableBeatmapSetCover
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Masking = true,
-                        },
-                        coverGradient = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both
-                        },
-                    },
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding
-                    {
-                        Vertical = BeatmapSetOverlay.Y_PADDING,
-                        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[]
-                            {
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Child = Picker = new BeatmapPicker(),
-                                },
-                                new FillFlowContainer
-                                {
-                                    Direction = FillDirection.Horizontal,
-                                    AutoSizeAxes = Axes.Both,
-                                    Margin = new MarginPadding { Top = 15 },
-                                    Children = new Drawable[]
-                                    {
-                                        title = new OsuSpriteText
-                                        {
-                                            Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
-                                        },
-                                        externalLink = new ExternalLinkButton
-                                        {
-                                            Anchor = Anchor.BottomLeft,
-                                            Origin = Anchor.BottomLeft,
-                                            Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
-                                        },
-                                        explicitContentPill = new ExplicitContentBeatmapPill
-                                        {
-                                            Alpha = 0f,
-                                            Anchor = Anchor.BottomLeft,
-                                            Origin = Anchor.BottomLeft,
-                                            Margin = new MarginPadding { Left = 10, Bottom = 4 },
-                                        }
-                                    }
-                                },
-                                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,
-                                    Child = author = new AuthorInfo(),
-                                },
-                                beatmapAvailability = new BeatmapAvailability(),
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    Height = buttons_height,
-                                    Margin = new MarginPadding { Top = 10 },
-                                    Children = new Drawable[]
-                                    {
-                                        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 LoadingSpinner
-                {
-                    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.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(10),
-                    Children = new Drawable[]
-                    {
-                        onlineStatusPill = new BeatmapSetOnlineStatusPill
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            TextSize = 14,
-                            TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
-                        },
-                        details = new Details(),
-                    },
-                },
-            }
+            BeatmapSet = { BindTarget = BeatmapSet }
         };
 
-        private void updateDownloadButtons()
-        {
-            if (BeatmapSet.Value == null) return;
-
-            if ((BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false) && state.Value != DownloadState.LocallyAvailable)
-            {
-                downloadButtonsContainer.Clear();
-                return;
-            }
-
-            switch (state.Value)
-            {
-                case DownloadState.LocallyAvailable:
-                    // temporary for UX until new design is implemented.
-                    downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value)
-                    {
-                        Width = 50,
-                        RelativeSizeAxes = Axes.Y,
-                        SelectedBeatmap = { BindTarget = Picker.Beatmap }
-                    };
-                    break;
-
-                case DownloadState.Downloading:
-                case DownloadState.Importing:
-                    // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
-                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
-                    break;
-
-                default:
-                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
-                    if (BeatmapSet.Value.OnlineInfo.HasVideo)
-                        downloadButtonsContainer.Add(new HeaderDownloadButton(BeatmapSet.Value, true));
-                    break;
-            }
-        }
-
-        private class DownloadTracker : BeatmapDownloadTrackingComposite
-        {
-            public new Bindable<DownloadState> State => base.State;
-        }
-
-        protected override OverlayTitle CreateTitle() => new BeatmapHeaderTitle();
-
         protected override Drawable CreateTitleContent() => RulesetSelector = new BeatmapRulesetSelector
         {
             Current = ruleset
         };
 
+        protected override OverlayTitle CreateTitle() => new BeatmapHeaderTitle();
+
         private class BeatmapHeaderTitle : OverlayTitle
         {
             public BeatmapHeaderTitle()
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
new file mode 100644
index 0000000000..153aa41582
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
@@ -0,0 +1,283 @@
+// Copyright (c) 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.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
+using osu.Game.Online.API;
+using osu.Game.Overlays.BeatmapListing.Panels;
+using osu.Game.Overlays.BeatmapSet.Buttons;
+using osuTK;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public class BeatmapSetHeaderContent : BeatmapDownloadTrackingComposite
+    {
+        private const float transition_duration = 200;
+        private const float buttons_height = 45;
+        private const float buttons_spacing = 5;
+
+        public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
+
+        public readonly Details Details;
+        public readonly BeatmapPicker Picker;
+
+        private readonly UpdateableBeatmapSetCover cover;
+        private readonly Box coverGradient;
+        private readonly OsuSpriteText title, artist;
+        private readonly AuthorInfo author;
+        private readonly ExplicitContentBeatmapPill explicitContentPill;
+        private readonly FillFlowContainer downloadButtonsContainer;
+        private readonly BeatmapAvailability beatmapAvailability;
+        private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
+        private readonly FavouriteButton favouriteButton;
+        private readonly FillFlowContainer fadeContent;
+        private readonly LoadingSpinner loading;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private BeatmapRulesetSelector rulesetSelector { get; set; }
+
+        public BeatmapSetHeaderContent()
+        {
+            ExternalLinkButton externalLink;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            InternalChild = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            cover = new UpdateableBeatmapSetCover
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Masking = true,
+                            },
+                            coverGradient = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both
+                            },
+                        },
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding
+                        {
+                            Vertical = BeatmapSetOverlay.Y_PADDING,
+                            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[]
+                                {
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Child = Picker = new BeatmapPicker(),
+                                    },
+                                    new FillFlowContainer
+                                    {
+                                        Direction = FillDirection.Horizontal,
+                                        AutoSizeAxes = Axes.Both,
+                                        Margin = new MarginPadding { Top = 15 },
+                                        Children = new Drawable[]
+                                        {
+                                            title = new OsuSpriteText
+                                            {
+                                                Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
+                                            },
+                                            externalLink = new ExternalLinkButton
+                                            {
+                                                Anchor = Anchor.BottomLeft,
+                                                Origin = Anchor.BottomLeft,
+                                                Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
+                                            },
+                                            explicitContentPill = new ExplicitContentBeatmapPill
+                                            {
+                                                Alpha = 0f,
+                                                Anchor = Anchor.BottomLeft,
+                                                Origin = Anchor.BottomLeft,
+                                                Margin = new MarginPadding { Left = 10, Bottom = 4 },
+                                            }
+                                        }
+                                    },
+                                    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,
+                                        Child = author = new AuthorInfo(),
+                                    },
+                                    beatmapAvailability = new BeatmapAvailability(),
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        Height = buttons_height,
+                                        Margin = new MarginPadding { Top = 10 },
+                                        Children = new Drawable[]
+                                        {
+                                            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 LoadingSpinner
+                    {
+                        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.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(10),
+                        Children = new Drawable[]
+                        {
+                            onlineStatusPill = new BeatmapSetOnlineStatusPill
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                TextSize = 14,
+                                TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
+                            },
+                            Details = new Details(),
+                        },
+                    },
+                }
+            };
+
+            Picker.Beatmap.ValueChanged += b =>
+            {
+                Details.Beatmap = b.NewValue;
+                externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        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());
+
+            BeatmapSet.BindValueChanged(setInfo =>
+            {
+                Picker.BeatmapSet = rulesetSelector.BeatmapSet = author.BeatmapSet = beatmapAvailability.BeatmapSet = Details.BeatmapSet = setInfo.NewValue;
+                cover.BeatmapSet = setInfo.NewValue;
+
+                if (setInfo.NewValue == null)
+                {
+                    onlineStatusPill.FadeTo(0.5f, 500, Easing.OutQuint);
+                    fadeContent.Hide();
+
+                    loading.Show();
+
+                    downloadButtonsContainer.FadeOut(transition_duration);
+                    favouriteButton.FadeOut(transition_duration);
+                }
+                else
+                {
+                    fadeContent.FadeIn(500, Easing.OutQuint);
+
+                    loading.Hide();
+
+                    title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
+                    artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
+
+                    explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
+
+                    onlineStatusPill.FadeIn(500, Easing.OutQuint);
+                    onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
+
+                    downloadButtonsContainer.FadeIn(transition_duration);
+                    favouriteButton.FadeIn(transition_duration);
+
+                    updateDownloadButtons();
+                }
+            }, true);
+        }
+
+        private void updateDownloadButtons()
+        {
+            if (BeatmapSet.Value == null) return;
+
+            if ((BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false) && State.Value != DownloadState.LocallyAvailable)
+            {
+                downloadButtonsContainer.Clear();
+                return;
+            }
+
+            switch (State.Value)
+            {
+                case DownloadState.LocallyAvailable:
+                    // temporary for UX until new design is implemented.
+                    downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value)
+                    {
+                        Width = 50,
+                        RelativeSizeAxes = Axes.Y,
+                        SelectedBeatmap = { BindTarget = Picker.Beatmap }
+                    };
+                    break;
+
+                case DownloadState.Downloading:
+                case DownloadState.Importing:
+                    // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
+                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
+                    break;
+
+                default:
+                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
+                    if (BeatmapSet.Value.OnlineInfo.HasVideo)
+                        downloadButtonsContainer.Add(new HeaderDownloadButton(BeatmapSet.Value, true));
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 86f0f4f614..c16ec339bb 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Overlays
                             },
                             new ScoresContainer
                             {
-                                Beatmap = { BindTarget = Header.Picker.Beatmap }
+                                Beatmap = { BindTarget = Header.HeaderContent.Picker.Beatmap }
                             },
                             comments = new CommentsSection()
                         },
@@ -88,7 +88,7 @@ namespace osu.Game.Overlays
             info.BeatmapSet.BindTo(beatmapSet);
             comments.BeatmapSet.BindTo(beatmapSet);
 
-            Header.Picker.Beatmap.ValueChanged += b =>
+            Header.HeaderContent.Picker.Beatmap.ValueChanged += b =>
             {
                 info.Beatmap = b.NewValue;
 
@@ -122,7 +122,7 @@ namespace osu.Game.Overlays
             req.Success += res =>
             {
                 beatmapSet.Value = res.ToBeatmapSet(rulesets);
-                Header.Picker.Beatmap.Value = Header.BeatmapSet.Value.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
+                Header.HeaderContent.Picker.Beatmap.Value = Header.BeatmapSet.Value.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
             };
             API.Queue(req);
 

From 58269f931491a2e2b6367a68b9c3a178415aa3c1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 13:35:43 +0900
Subject: [PATCH 07634/10326] Update with framework changes

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

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 2c83023fdc..0157af002e 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Skinning
         /// </summary>
         public bool Playing => activeChannel?.Playing ?? false;
 
-        public bool Played => activeChannel?.Played ?? false;
+        public bool Played => !activeChannel?.Playing ?? false;
 
         private bool looping;
 

From bdb9d4f7d0ac8c0b20adffeb85823e60ee0d5ceb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 13:59:30 +0900
Subject: [PATCH 07635/10326] Restart sound on play

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

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 06c694dc7a..b3db2d6558 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -124,7 +124,10 @@ namespace osu.Game.Skinning
             samplesContainer.ForEach(c =>
             {
                 if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
+                {
+                    c.Stop();
                     c.Play();
+                }
             });
         }
 

From 8ffbcc9860e48e1940774540281511f32387f2e6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 14:05:35 +0900
Subject: [PATCH 07636/10326] Fix test failures and general discrepancies

---
 .../Editing/TestSceneEditorSamplePlayback.cs       | 14 +++++++-------
 .../Gameplay/TestSceneGameplaySamplePlayback.cs    |  6 +++---
 .../Visual/Gameplay/TestSceneSkinnableSound.cs     | 12 ++++++++++--
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs    |  1 -
 osu.Game/Skinning/PoolableSkinnableSample.cs       | 10 ++++++++--
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
index 876c1308b4..2abc8a8dec 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
@@ -19,14 +19,14 @@ namespace osu.Game.Tests.Visual.Editing
         public void TestSlidingSampleStopsOnSeek()
         {
             DrawableSlider slider = null;
-            SkinnableSound[] loopingSamples = null;
-            SkinnableSound[] onceOffSamples = null;
+            PoolableSkinnableSample[] loopingSamples = null;
+            PoolableSkinnableSample[] onceOffSamples = null;
 
             AddStep("get first slider", () =>
             {
                 slider = Editor.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
-                onceOffSamples = slider.ChildrenOfType<SkinnableSound>().Where(s => !s.Looping).ToArray();
-                loopingSamples = slider.ChildrenOfType<SkinnableSound>().Where(s => s.Looping).ToArray();
+                onceOffSamples = slider.ChildrenOfType<PoolableSkinnableSample>().Where(s => !s.Looping).ToArray();
+                loopingSamples = slider.ChildrenOfType<PoolableSkinnableSample>().Where(s => s.Looping).ToArray();
             });
 
             AddStep("start playback", () => EditorClock.Start());
@@ -36,15 +36,15 @@ namespace osu.Game.Tests.Visual.Editing
                 if (!slider.Tracking.Value)
                     return false;
 
-                if (!loopingSamples.Any(s => s.IsPlaying))
+                if (!loopingSamples.Any(s => s.Playing))
                     return false;
 
                 EditorClock.Seek(20000);
                 return true;
             });
 
-            AddAssert("non-looping samples are playing", () => onceOffSamples.Length == 4 && loopingSamples.All(s => s.IsPlayed || s.IsPlaying));
-            AddAssert("looping samples are not playing", () => loopingSamples.Length == 1 && loopingSamples.All(s => s.IsPlayed && !s.IsPlaying));
+            AddAssert("non-looping samples are playing", () => onceOffSamples.Length == 4 && loopingSamples.All(s => s.Played || s.Playing));
+            AddAssert("looping samples are not playing", () => loopingSamples.Length == 1 && loopingSamples.All(s => s.Played && !s.Playing));
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index b13acdcb95..6b3fc304e0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
@@ -19,14 +19,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestAllSamplesStopDuringSeek()
         {
             DrawableSlider slider = null;
-            SkinnableSound[] samples = null;
+            PoolableSkinnableSample[] samples = null;
             ISamplePlaybackDisabler sampleDisabler = null;
 
             AddUntilStep("get variables", () =>
             {
                 sampleDisabler = Player;
                 slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).FirstOrDefault();
-                samples = slider?.ChildrenOfType<SkinnableSound>().ToArray();
+                samples = slider?.ChildrenOfType<PoolableSkinnableSample>().ToArray();
 
                 return slider != null;
             });
@@ -36,7 +36,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 if (!slider.Tracking.Value)
                     return false;
 
-                if (!samples.Any(s => s.IsPlaying))
+                if (!samples.Any(s => s.Playing))
                     return false;
 
                 Player.ChildrenOfType<GameplayClockContainer>().First().Seek(40000);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 28c266f7d8..d688e9cb21 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -43,7 +43,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoppedSoundDoesntResumeAfterPause()
         {
-            AddStep("start sample with looping", () => skinnableSound.Looping = true);
+            AddStep("start sample with looping", () =>
+            {
+                skinnableSound.Looping = true;
+                skinnableSound.Play();
+            });
 
             AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);
 
@@ -62,7 +66,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLoopingSoundResumesAfterPause()
         {
-            AddStep("start sample with looping", () => skinnableSound.Looping = true);
+            AddStep("start sample with looping", () =>
+            {
+                skinnableSound.Looping = true;
+                skinnableSound.Play();
+            });
 
             AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);
 
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index bcf5220380..f58962f8e1 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -155,7 +155,6 @@ namespace osu.Game.Graphics.UserInterface
                 return;
 
             lastSampleValue = value;
-
             lastSampleTime = Clock.CurrentTime;
 
             var channel = sample.Play();
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 0157af002e..cff793e8d4 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -117,19 +117,25 @@ namespace osu.Game.Skinning
 
             activeChannel = Sample.Play();
             activeChannel.Looping = Looping;
+
+            Played = true;
         }
 
         /// <summary>
         /// Stops the sample.
         /// </summary>
-        public void Stop() => activeChannel?.Stop();
+        public void Stop()
+        {
+            activeChannel?.Stop();
+            activeChannel = null;
+        }
 
         /// <summary>
         /// Whether the sample is currently playing.
         /// </summary>
         public bool Playing => activeChannel?.Playing ?? false;
 
-        public bool Played => !activeChannel?.Playing ?? false;
+        public bool Played { get; private set; }
 
         private bool looping;
 

From 5261c0184919c79973c08a7bc43466adf4f0d3ba Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 19:43:42 +0900
Subject: [PATCH 07637/10326] Tie JoinRoom() and PartRoom() together

---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 154 +++++++++++-------
 1 file changed, 92 insertions(+), 62 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f0e11b2b8b..18a63171c4 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -4,7 +4,6 @@
 #nullable enable
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
@@ -109,30 +108,54 @@ namespace osu.Game.Online.Multiplayer
             });
         }
 
+        private readonly object joinOrLeaveTaskLock = new object();
+        private Task? joinOrLeaveTask;
+
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
         /// </summary>
         /// <param name="room">The API <see cref="Room"/>.</param>
         public async Task JoinRoom(Room room)
         {
-            if (Room != null)
-                throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
+            Task? lastTask;
+            Task newTask;
 
-            Debug.Assert(room.RoomID.Value != null);
+            lock (joinOrLeaveTaskLock)
+            {
+                lastTask = joinOrLeaveTask;
+                joinOrLeaveTask = newTask = Task.Run(async () =>
+                {
+                    if (lastTask != null)
+                        await lastTask;
 
-            apiRoom = room;
-            playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
+                    // Should be thread-safe since joinOrLeaveTask is locked on in both JoinRoom() and LeaveRoom().
+                    if (Room != null)
+                        throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
 
-            Room = await JoinRoom(room.RoomID.Value.Value);
+                    Debug.Assert(room.RoomID.Value != null);
 
-            Debug.Assert(Room != null);
+                    // Join the server-side room.
+                    var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
+                    Debug.Assert(joinedRoom != null);
 
-            var users = await getRoomUsers();
-            Debug.Assert(users != null);
+                    // Populate users.
+                    Debug.Assert(joinedRoom.Users != null);
+                    await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
 
-            await Task.WhenAll(users.Select(PopulateUser));
+                    // Update the stored room (must be done on update thread for thread-safety).
+                    await scheduleAsync(() =>
+                    {
+                        Room = joinedRoom;
+                        apiRoom = room;
+                        playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
+                    });
 
-            updateLocalRoomSettings(Room.Settings);
+                    // Update room settings.
+                    await updateLocalRoomSettings(joinedRoom.Settings);
+                });
+            }
+
+            await newTask;
         }
 
         /// <summary>
@@ -142,21 +165,35 @@ namespace osu.Game.Online.Multiplayer
         /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
         protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
 
-        public virtual Task LeaveRoom()
+        public virtual async Task LeaveRoom()
         {
-            Scheduler.Add(() =>
+            Task? lastTask;
+            Task newTask;
+
+            lock (joinOrLeaveTaskLock)
             {
-                if (Room == null)
-                    return;
+                lastTask = joinOrLeaveTask;
+                joinOrLeaveTask = newTask = Task.Run(async () =>
+                {
+                    if (lastTask != null)
+                        await lastTask;
 
-                apiRoom = null;
-                Room = null;
-                CurrentMatchPlayingUserIds.Clear();
+                    // Should be thread-safe since joinOrLeaveTask is locked on in both JoinRoom() and LeaveRoom().
+                    if (Room == null)
+                        return;
 
-                RoomUpdated?.Invoke();
-            }, false);
+                    await scheduleAsync(() =>
+                    {
+                        apiRoom = null;
+                        Room = null;
+                        CurrentMatchPlayingUserIds.Clear();
 
-            return Task.CompletedTask;
+                        RoomUpdated?.Invoke();
+                    });
+                });
+            }
+
+            await newTask;
         }
 
         /// <summary>
@@ -432,27 +469,6 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
         protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID);
 
-        /// <summary>
-        /// Retrieve a copy of users currently in the joined <see cref="Room"/> in a thread-safe manner.
-        /// This should be used whenever accessing users from outside of an Update thread context (ie. when not calling <see cref="Drawable.Schedule"/>).
-        /// </summary>
-        /// <returns>A copy of users in the current room, or null if unavailable.</returns>
-        private Task<List<MultiplayerRoomUser>?> getRoomUsers()
-        {
-            var tcs = new TaskCompletionSource<List<MultiplayerRoomUser>?>();
-
-            // at some point we probably want to replace all these schedule calls with Room.LockForUpdate.
-            // for now, as this would require quite some consideration due to the number of accesses to the room instance,
-            // let's just add a manual schedule for the non-scheduled usages instead.
-            Scheduler.Add(() =>
-            {
-                var users = Room?.Users.ToList();
-                tcs.SetResult(users);
-            }, false);
-
-            return tcs.Task;
-        }
-
         /// <summary>
         /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
         /// </summary>
@@ -460,34 +476,28 @@ namespace osu.Game.Online.Multiplayer
         /// This updates both the joined <see cref="MultiplayerRoom"/> and the respective API <see cref="Room"/>.
         /// </remarks>
         /// <param name="settings">The new <see cref="MultiplayerRoomSettings"/> to update from.</param>
-        private void updateLocalRoomSettings(MultiplayerRoomSettings settings)
+        private Task updateLocalRoomSettings(MultiplayerRoomSettings settings) => scheduleAsync(() =>
         {
             if (Room == null)
                 return;
 
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
+            Debug.Assert(apiRoom != null);
 
-                Debug.Assert(apiRoom != null);
+            // Update a few properties of the room instantaneously.
+            Room.Settings = settings;
+            apiRoom.Name.Value = Room.Settings.Name;
 
-                // Update a few properties of the room instantaneously.
-                Room.Settings = settings;
-                apiRoom.Name.Value = Room.Settings.Name;
+            // The playlist update is delayed until an online beatmap lookup (below) succeeds.
+            // In-order for the client to not display an outdated beatmap, the playlist is forcefully cleared here.
+            apiRoom.Playlist.Clear();
 
-                // The playlist update is delayed until an online beatmap lookup (below) succeeds.
-                // In-order for the client to not display an outdated beatmap, the playlist is forcefully cleared here.
-                apiRoom.Playlist.Clear();
+            RoomUpdated?.Invoke();
 
-                RoomUpdated?.Invoke();
+            var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
+            req.Success += res => updatePlaylist(settings, res);
 
-                var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-                req.Success += res => updatePlaylist(settings, res);
-
-                api.Queue(req);
-            }, false);
-        }
+            api.Queue(req);
+        });
 
         private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)
         {
@@ -534,5 +544,25 @@ namespace osu.Game.Online.Multiplayer
             else
                 CurrentMatchPlayingUserIds.Remove(userId);
         }
+
+        private Task scheduleAsync(Action action)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+
+            Scheduler.Add(() =>
+            {
+                try
+                {
+                    action();
+                    tcs.SetResult(true);
+                }
+                catch (Exception ex)
+                {
+                    tcs.SetException(ex);
+                }
+            });
+
+            return tcs.Task;
+        }
     }
 }

From 5ff76be052a73b95e4aa2b562dfb88055939018b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 19:43:51 +0900
Subject: [PATCH 07638/10326] Fix potential test failures due to timing

---
 .../Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 7a3845cbf3..6de5704410 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             });
 
-            AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
+            AddUntilStep("multiplayer room joined", () => roomContainer.Client.Room != null);
         }
 
         [Test]
@@ -133,7 +133,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             });
 
-            AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
+            AddUntilStep("multiplayer room joined", () => roomContainer.Client.Room != null);
         }
 
         private TestMultiplayerRoomManager createRoomManager()

From e005a1cc9fc72413fe5a6c4592eb867cde860c14 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 20:16:34 +0900
Subject: [PATCH 07639/10326] Remove unnecessary condition blocking the part

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 50dc8f661c..5d18521eac 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -143,9 +143,6 @@ namespace osu.Game.Online.Multiplayer
                 return;
             }
 
-            if (Room == null)
-                return;
-
             await base.LeaveRoom();
             await connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
         }

From 6b139d4cf312cb75970a1555dab546d65f8ba898 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 20:21:07 +0900
Subject: [PATCH 07640/10326] Reset task post-execution

---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 18a63171c4..80162eae59 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -155,7 +155,19 @@ namespace osu.Game.Online.Multiplayer
                 });
             }
 
-            await newTask;
+            try
+            {
+                await newTask;
+            }
+            finally
+            {
+                // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
+                lock (joinOrLeaveTask)
+                {
+                    if (joinOrLeaveTask == newTask)
+                        joinOrLeaveTask = null;
+                }
+            }
         }
 
         /// <summary>
@@ -193,7 +205,19 @@ namespace osu.Game.Online.Multiplayer
                 });
             }
 
-            await newTask;
+            try
+            {
+                await newTask;
+            }
+            finally
+            {
+                // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
+                lock (joinOrLeaveTask)
+                {
+                    if (joinOrLeaveTask == newTask)
+                        joinOrLeaveTask = null;
+                }
+            }
         }
 
         /// <summary>

From eb85efcea2d79eb8b1750b9d703692e6fb305280 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 20:59:28 +0900
Subject: [PATCH 07641/10326] Add check to playlists too

---
 osu.Game/Screens/Select/MatchSongSelect.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 0948a4d19a..ed47b5d5ac 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -10,6 +10,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Components;
 
@@ -78,5 +80,9 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.Clear();
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
+
+        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+
+        private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
 }

From bba182a02d10f283d85a876c89530c55247359b6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 21:27:16 +0900
Subject: [PATCH 07642/10326] Fix test failure

---
 .../Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
index a4c87d3ace..319c2bc6fd 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
@@ -11,12 +11,10 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay;
-using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
@@ -85,8 +83,7 @@ namespace osu.Game.Tests.Visual.Playlists
 
             AddStep("move mouse to create button", () =>
             {
-                var footer = match.ChildrenOfType<Footer>().Single();
-                InputManager.MoveMouseTo(footer.ChildrenOfType<OsuButton>().Single());
+                InputManager.MoveMouseTo(this.ChildrenOfType<PlaylistsMatchSettingsOverlay.CreateRoomButton>().Single());
             });
 
             AddStep("click", () => InputManager.Click(MouseButton.Left));

From ce3c2f07dc8f36d6cfea1af94943cc74093833d7 Mon Sep 17 00:00:00 2001
From: vmaggioli <vinmags16@gmail.com>
Date: Tue, 19 Jan 2021 20:13:21 -0500
Subject: [PATCH 07643/10326] Fix zero length spinners and sliders

---
 .../TestSceneSliderSelectionBlueprint.cs      | 21 +++++++++++++++++++
 .../Sliders/SliderSelectionBlueprint.cs       |  5 ++++-
 .../Timeline/TimelineHitObjectBlueprint.cs    |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index f6e1be693b..55b3707c38 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -161,6 +161,27 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             checkControlPointSelected(1, false);
         }
 
+        [Test]
+        public void TestZeroLengthSliderNotAllowed()
+        {
+            moveMouseToControlPoint(1);
+            AddStep("drag control point 1 to control point 0", () =>
+            {
+                InputManager.PressButton(MouseButton.Left);
+                moveMouseToControlPoint(0);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+            moveMouseToControlPoint(2);
+            AddStep("drag control point 2 to control point 0", () =>
+            {
+                InputManager.PressButton(MouseButton.Left);
+                moveMouseToControlPoint(0);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+            checkPositions();
+
+        }
+
         private void moveHitObject()
         {
             AddStep("move hitobject", () =>
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 3d3dff653a..99edcd2149 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -226,7 +226,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private void updatePath()
         {
-            HitObject.Path.ExpectedDistance.Value = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
+            float expectedDistance = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
+            if (expectedDistance < 1)
+                return;
+            HitObject.Path.ExpectedDistance.Value = expectedDistance;
             editorBeatmap?.Update(HitObject);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index ae2a82fa10..1dc37510ad 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -387,7 +387,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         case IHasDuration endTimeHitObject:
                             var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
 
-                            if (endTimeHitObject.EndTime == snappedTime)
+                            if (endTimeHitObject.EndTime == snappedTime || (snappedTime - hitObject.StartTime) < 1)
                                 return;
 
                             endTimeHitObject.Duration = snappedTime - hitObject.StartTime;

From d42773ebb2b731e93b03feab519fa951cbc60421 Mon Sep 17 00:00:00 2001
From: vmaggioli <Vince.Maggioli@philips.com>
Date: Wed, 20 Jan 2021 12:36:31 -0500
Subject: [PATCH 07644/10326] Fix preceeding space

---
 .../Editor/TestSceneSliderSelectionBlueprint.cs                  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index 55b3707c38..ce1c13dac5 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -179,7 +179,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 InputManager.ReleaseButton(MouseButton.Left);
             });
             checkPositions();
-
         }
 
         private void moveHitObject()

From 5ee3a5f230435a166c85fdb8d542f4dc34be1f91 Mon Sep 17 00:00:00 2001
From: vmaggioli <Vince.Maggioli@philips.com>
Date: Wed, 20 Jan 2021 13:00:25 -0500
Subject: [PATCH 07645/10326] Use AlmostEquals

---
 .../Compose/Components/Timeline/TimelineHitObjectBlueprint.cs  | 3 ++-
 1 file changed, 2 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 1dc37510ad..301543b3c1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -387,7 +388,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         case IHasDuration endTimeHitObject:
                             var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
 
-                            if (endTimeHitObject.EndTime == snappedTime || (snappedTime - hitObject.StartTime) < 1)
+                            if (endTimeHitObject.EndTime == snappedTime || Precision.AlmostEquals(snappedTime, hitObject.StartTime, 1))
                                 return;
 
                             endTimeHitObject.Duration = snappedTime - hitObject.StartTime;

From 7abe33ad0e2df62efe586788e8963b0fe10f869d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Jan 2021 23:23:12 +0100
Subject: [PATCH 07646/10326] Add failing test case

---
 .../Gameplay/TestScenePoolingRuleset.cs       | 75 +++++++++++++++++--
 1 file changed, 69 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
index cd7d692b0a..17a009a2ce 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -17,10 +17,12 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Judgements;
 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.UI;
 using osuTK;
 using osuTK.Graphics;
@@ -129,6 +131,31 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("no DHOs shown", () => !this.ChildrenOfType<DrawableTestHitObject>().Any());
         }
 
+        [Test]
+        public void TestApplyHitResultOnKilled()
+        {
+            ManualClock clock = null;
+            bool anyJudged = false;
+
+            void onNewResult(JudgementResult _) => anyJudged = true;
+
+            var beatmap = new Beatmap();
+            beatmap.HitObjects.Add(new TestKilledHitObject { Duration = 20 });
+
+            createTest(beatmap, 10, () => new FramedClock(clock = new ManualClock()));
+
+            AddStep("subscribe to new result", () =>
+            {
+                anyJudged = false;
+                drawableRuleset.NewResult += onNewResult;
+            });
+            AddStep("skip past object", () => clock.CurrentTime = beatmap.HitObjects[0].GetEndTime() + 1000);
+
+            AddAssert("object judged", () => anyJudged);
+
+            AddStep("clean up", () => drawableRuleset.NewResult -= onNewResult);
+        }
+
         private void createTest(IBeatmap beatmap, int poolSize, Func<IFrameBasedClock> createClock = null) => AddStep("create test", () =>
         {
             var ruleset = new TestPoolingRuleset();
@@ -192,6 +219,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             private void load()
             {
                 RegisterPool<TestHitObject, DrawableTestHitObject>(poolSize);
+                RegisterPool<TestKilledHitObject, DrawableTestKilledHitObject>(poolSize);
             }
 
             protected override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject) => new TestHitObjectLifetimeEntry(hitObject);
@@ -220,19 +248,30 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             protected override IEnumerable<TestHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
             {
-                yield return new TestHitObject
+                switch (original)
                 {
-                    StartTime = original.StartTime,
-                    Duration = 250
-                };
+                    case TestKilledHitObject h:
+                        yield return h;
+
+                        break;
+
+                    default:
+                        yield return new TestHitObject
+                        {
+                            StartTime = original.StartTime,
+                            Duration = 250
+                        };
+
+                        break;
+                }
             }
         }
 
         #endregion
 
-        #region HitObject
+        #region HitObjects
 
-        private class TestHitObject : ConvertHitObject
+        private class TestHitObject : ConvertHitObject, IHasDuration
         {
             public double EndTime => StartTime + Duration;
 
@@ -287,6 +326,30 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
+        private class TestKilledHitObject : TestHitObject
+        {
+        }
+
+        private class DrawableTestKilledHitObject : DrawableHitObject<TestKilledHitObject>
+        {
+            public DrawableTestKilledHitObject()
+                : base(null)
+            {
+            }
+
+            protected override void UpdateHitStateTransforms(ArmedState state)
+            {
+                base.UpdateHitStateTransforms(state);
+                Expire();
+            }
+
+            public override void OnKilled()
+            {
+                base.OnKilled();
+                ApplyResult(r => r.Type = r.Judgement.MinResult);
+            }
+        }
+
         #endregion
     }
 }

From 1d9aaac2c221a4e507df4019076f080e74f1a0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Jan 2021 23:55:54 +0100
Subject: [PATCH 07647/10326] Fix HOC not propagating DHO results applied on
 kill

`DrawableHitObject.OnKilled()` calls `UpdateResult()` to clean up a
hitobject's state definitively with regards to the judgement result
before returning the DHO back to the pool.

As it turns out, if a consumer was relying on this code path (as taiko
was in the case of nested strong hit objects), it would not work
properly with pooling, due to `HitObjectContainer` unsubscribing from
`On{New,Revert}Result` *before* calling the DHO's `OnKilled()`.

This in turn would lead to users potentially getting stuck in gameplay,
due to `ScoreProcessor` not receiving all results via that event path.

To resolve, change the call ordering to allow hit result changes applied
in `OnKilled()` to propagate normally.
---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 12e39d4fbf..1972043ccb 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -124,9 +124,11 @@ namespace osu.Game.Rulesets.UI
             Debug.Assert(drawableMap.ContainsKey(entry));
 
             var drawable = drawableMap[entry];
+
+            // OnKilled can potentially change the hitobject's result, so it needs to run first before unbinding.
+            drawable.OnKilled();
             drawable.OnNewResult -= onNewResult;
             drawable.OnRevertResult -= onRevertResult;
-            drawable.OnKilled();
 
             drawableMap.Remove(entry);
 

From 76e1f6e57bbd27297a320b64cbb27dcbdad6c85a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 21 Jan 2021 12:45:44 +0900
Subject: [PATCH 07648/10326] Fix locking on incorrect object
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/Online/Multiplayer/StatefulMultiplayerClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 80162eae59..f2b5a44fcf 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Online.Multiplayer
             finally
             {
                 // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
-                lock (joinOrLeaveTask)
+                lock (joinOrLeaveTaskLock)
                 {
                     if (joinOrLeaveTask == newTask)
                         joinOrLeaveTask = null;
@@ -212,7 +212,7 @@ namespace osu.Game.Online.Multiplayer
             finally
             {
                 // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
-                lock (joinOrLeaveTask)
+                lock (joinOrLeaveTaskLock)
                 {
                     if (joinOrLeaveTask == newTask)
                         joinOrLeaveTask = null;

From 163a937e415b21b4f92d84675aae2a27f57e70c9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 Jan 2021 13:30:53 +0900
Subject: [PATCH 07649/10326] Fix mod test failing intermittently

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 0d0acbb8f4..bb72226750 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -134,6 +134,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestExternallySetCustomizedMod()
         {
+            changeRuleset(0);
+
             AddStep("set customized mod externally", () => SelectedMods.Value = new[] { new OsuModDoubleTime { SpeedChange = { Value = 1.01 } } });
 
             AddAssert("ensure button is selected and customized accordingly", () =>

From 65ece1aa722b74e6590b4b3d208a10141238164d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 07:50:41 +0300
Subject: [PATCH 07650/10326] Mark OverlayHeader as NotNull in
 FullscreenOverlay

---
 osu.Game/Overlays/FullscreenOverlay.cs |  8 ++++---
 osu.Game/Overlays/OnlineOverlay.cs     | 32 ++++++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index d65213f573..d0a0c994aa 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -16,9 +17,9 @@ namespace osu.Game.Overlays
     public abstract class FullscreenOverlay<T> : WaveOverlayContainer, INamedOverlayComponent
         where T : OverlayHeader
     {
-        public virtual string IconTexture => Header?.Title.IconTexture ?? string.Empty;
-        public virtual string Title => Header?.Title.Title ?? string.Empty;
-        public virtual string Description => Header?.Title.Description ?? string.Empty;
+        public virtual string IconTexture => Header.Title.IconTexture ?? string.Empty;
+        public virtual string Title => Header.Title.Title ?? string.Empty;
+        public virtual string Description => Header.Title.Description ?? string.Empty;
 
         public T Header { get; }
 
@@ -76,6 +77,7 @@ namespace osu.Game.Overlays
             Waves.FourthWaveColour = ColourProvider.Dark3;
         }
 
+        [NotNull]
         protected abstract T CreateHeader();
 
         protected virtual Color4 GetBackgroundColour() => ColourProvider.Background5;
diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index b44ccc32c9..4a7318d065 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -19,29 +19,27 @@ namespace osu.Game.Overlays
         protected OnlineOverlay(OverlayColourScheme colourScheme)
             : base(colourScheme)
         {
-            FillFlowContainer flow = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Y,
-                RelativeSizeAxes = Axes.X,
-                Direction = FillDirection.Vertical
-            };
-
-            if (Header != null)
-                flow.Add(Header.With(h => h.Depth = -float.MaxValue));
-
-            flow.Add(content = new Container
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y
-            });
-
             base.Content.AddRange(new Drawable[]
             {
                 ScrollFlow = new OverlayScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarVisible = false,
-                    Child = flow
+                    Child = new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Direction = FillDirection.Vertical,
+                        Children = new Drawable[]
+                        {
+                            Header.With(h => h.Depth = -float.MaxValue),
+                            content = new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y
+                            }
+                        }
+                    }
                 },
                 Loading = new LoadingLayer(true)
             });

From 54dbb43f79a758e73e4782c1364e2405384a82c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 Jan 2021 14:03:35 +0900
Subject: [PATCH 07651/10326] Fix more potential failures

---
 osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index bb72226750..bd4010a7f3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            SelectedMods.Value = Array.Empty<Mod>();
             Children = new Drawable[]
             {
                 modSelect = new TestModSelectOverlay

From 0fcf61d352197ef5f4d8e10d8bf1d19d55c266b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:07:02 +0900
Subject: [PATCH 07652/10326] Replace null check with assert

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index b5f81c516a..d378b67acf 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -131,13 +132,13 @@ namespace osu.Game.Graphics.Containers
         public override void Add(T drawable)
         {
             base.Add(drawable);
+
+            Debug.Assert(drawable != null);
+
             lastKnownScroll = float.NaN;
             headerHeight = float.NaN;
             footerHeight = float.NaN;
 
-            if (drawable == null)
-                return;
-
             if (smallestSection == null || smallestSection.Height > drawable.Height)
                 smallestSection = drawable;
         }

From 8f9089d1aefa26c90a883e226dcce91b9cabfd8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:30:22 +0900
Subject: [PATCH 07653/10326] Move constant to a better place

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

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index d378b67acf..fd8b98e767 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -109,6 +109,8 @@ namespace osu.Game.Graphics.Containers
 
         private float lastKnownScroll;
 
+        private const float scroll_target_multiplier = 0.2f;
+
         public SectionsContainer()
         {
             AddRangeInternal(new Drawable[]
@@ -143,8 +145,6 @@ namespace osu.Game.Graphics.Containers
                 smallestSection = drawable;
         }
 
-        private const float scroll_target_multiplier = 0.2f;
-
         public void ScrollTo(Drawable section)
         {
             lastClickedSection = section;

From 555abcdc3695c437efe3277fc738e54b637fe235 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:31:31 +0900
Subject: [PATCH 07654/10326] Replace nan usage with nullable float

---
 .../Graphics/Containers/SectionsContainer.cs  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index fd8b98e767..2140e251f8 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.Containers
                 if (value == null) return;
 
                 AddInternal(expandableHeader);
-                lastKnownScroll = float.NaN;
+                lastKnownScroll = null;
             }
         }
 
@@ -56,7 +56,7 @@ namespace osu.Game.Graphics.Containers
                 if (value == null) return;
 
                 AddInternal(fixedHeader);
-                lastKnownScroll = float.NaN;
+                lastKnownScroll = null;
             }
         }
 
@@ -75,7 +75,7 @@ namespace osu.Game.Graphics.Containers
                 footer.Anchor |= Anchor.y2;
                 footer.Origin |= Anchor.y2;
                 scrollContainer.Add(footer);
-                lastKnownScroll = float.NaN;
+                lastKnownScroll = null;
             }
         }
 
@@ -93,7 +93,7 @@ namespace osu.Game.Graphics.Containers
 
                 headerBackgroundContainer.Add(headerBackground);
 
-                lastKnownScroll = float.NaN;
+                lastKnownScroll = null;
             }
         }
 
@@ -105,9 +105,9 @@ namespace osu.Game.Graphics.Containers
         private Drawable expandableHeader, fixedHeader, footer, headerBackground;
         private FlowContainer<T> scrollContentContainer;
 
-        private float headerHeight, footerHeight;
+        private float? headerHeight, footerHeight;
 
-        private float lastKnownScroll;
+        private float? lastKnownScroll;
 
         private const float scroll_target_multiplier = 0.2f;
 
@@ -137,9 +137,9 @@ namespace osu.Game.Graphics.Containers
 
             Debug.Assert(drawable != null);
 
-            lastKnownScroll = float.NaN;
-            headerHeight = float.NaN;
-            footerHeight = float.NaN;
+            lastKnownScroll = null;
+            headerHeight = null;
+            footerHeight = null;
 
             if (smallestSection == null || smallestSection.Height > drawable.Height)
                 smallestSection = drawable;
@@ -171,7 +171,7 @@ namespace osu.Game.Graphics.Containers
 
             if (source == InvalidationSource.Child && (invalidation & Invalidation.DrawSize) != 0)
             {
-                lastKnownScroll = -1;
+                lastKnownScroll = null;
                 result = true;
             }
 
@@ -242,8 +242,9 @@ namespace osu.Game.Graphics.Containers
             if (!Children.Any()) return;
 
             var newMargin = originalSectionsMargin;
-            newMargin.Top += headerHeight;
-            newMargin.Bottom += footerHeight;
+
+            newMargin.Top += (headerHeight ?? 0);
+            newMargin.Bottom += (footerHeight ?? 0);
 
             scrollContentContainer.Margin = newMargin;
         }

From 6d167b7865688b4f73cb94106fbbe233e739ce40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:40:55 +0900
Subject: [PATCH 07655/10326] Remove the need to store the smallest section

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 2140e251f8..6607193cc6 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Graphics.Containers
     {
         public Bindable<T> SelectedSection { get; } = new Bindable<T>();
         private Drawable lastClickedSection;
-        private T smallestSection;
 
         public Drawable ExpandableHeader
         {
@@ -140,9 +139,6 @@ namespace osu.Game.Graphics.Containers
             lastKnownScroll = null;
             headerHeight = null;
             footerHeight = null;
-
-            if (smallestSection == null || smallestSection.Height > drawable.Height)
-                smallestSection = drawable;
         }
 
         public void ScrollTo(Drawable section)
@@ -213,10 +209,12 @@ namespace osu.Game.Graphics.Containers
                 headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
                 headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
 
+                var smallestSectionHeight = Children.Count > 0 ? Children.Min(d => d.Height) : 0;
+
                 // scroll offset is our fixed header height if we have it plus 20% of content height
                 // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
-                float sectionOrContent = Math.Min(smallestSection?.Height / 2.0f ?? 0, scrollContainer.DisplayableContent * 0.05f);
+                float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
                 float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
                 Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 

From e5eec27e9574037e13287b11438c044d8cc1c0da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:44:47 +0900
Subject: [PATCH 07656/10326] Simplify selected section resolution

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 6607193cc6..cae2dd7e37 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -215,23 +215,16 @@ namespace osu.Game.Graphics.Containers
                 // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
                 float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
+
                 float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
                 Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 
                 if (Precision.AlmostBigger(0, scrollContainer.Current))
-                {
                     SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();
-                    return;
-                }
-
-                if (Precision.AlmostBigger(scrollContainer.Current, scrollContainer.ScrollableExtent))
-                {
+                else if (Precision.AlmostBigger(scrollContainer.Current, scrollContainer.ScrollableExtent))
                     SelectedSection.Value = lastClickedSection as T ?? Children.LastOrDefault();
-                    return;
-                }
-
-                SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault()
-                                        ?? Children.FirstOrDefault();
+                else
+                    SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault() ?? Children.FirstOrDefault();
             }
         }
 

From a85f952a381ca32869e06a16a23c149955a88dbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:46:35 +0900
Subject: [PATCH 07657/10326] Inline single use function

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index cae2dd7e37..cf361abadc 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -217,14 +217,17 @@ namespace osu.Game.Graphics.Containers
                 float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
 
                 float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
-                Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 
                 if (Precision.AlmostBigger(0, scrollContainer.Current))
                     SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();
                 else if (Precision.AlmostBigger(scrollContainer.Current, scrollContainer.ScrollableExtent))
                     SelectedSection.Value = lastClickedSection as T ?? Children.LastOrDefault();
                 else
-                    SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault() ?? Children.FirstOrDefault();
+                {
+                    SelectedSection.Value = Children
+                                            .TakeWhile(section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset <= 0)
+                                            .LastOrDefault() ?? Children.FirstOrDefault();
+                }
             }
         }
 

From 9daf29fedcb0b4e74a7a3d17579557c68fd4723a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:52:41 +0900
Subject: [PATCH 07658/10326] Extract out commonly used variables

---
 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 cf361abadc..5afe74db18 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -178,7 +178,10 @@ namespace osu.Game.Graphics.Containers
         {
             base.UpdateAfterChildren();
 
-            float headerH = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
+            float fixedHeaderSize = (FixedHeader?.LayoutSize.Y ?? 0);
+            float expandableHeaderSize = ExpandableHeader?.LayoutSize.Y ?? 0;
+
+            float headerH = expandableHeaderSize + fixedHeaderSize;
             float footerH = Footer?.LayoutSize.Y ?? 0;
 
             if (headerH != headerHeight || footerH != footerHeight)
@@ -200,13 +203,13 @@ namespace osu.Game.Graphics.Containers
 
                 if (ExpandableHeader != null && FixedHeader != null)
                 {
-                    float offset = Math.Min(ExpandableHeader.LayoutSize.Y, currentScroll);
+                    float offset = Math.Min(expandableHeaderSize, currentScroll);
 
                     ExpandableHeader.Y = -offset;
-                    FixedHeader.Y = -offset + ExpandableHeader.LayoutSize.Y;
+                    FixedHeader.Y = -offset + expandableHeaderSize;
                 }
 
-                headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
+                headerBackgroundContainer.Height = expandableHeaderSize + fixedHeaderSize;
                 headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
 
                 var smallestSectionHeight = Children.Count > 0 ? Children.Min(d => d.Height) : 0;
@@ -216,7 +219,7 @@ namespace osu.Game.Graphics.Containers
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
                 float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
 
-                float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
+                float scrollOffset = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
 
                 if (Precision.AlmostBigger(0, scrollContainer.Current))
                     SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();

From c650cbd2a70f1f333d2fc3b159a1ca10ace61fca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:56:10 +0900
Subject: [PATCH 07659/10326] Rename variable to something slightly better

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

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 5afe74db18..87c3007ca4 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -217,9 +217,9 @@ namespace osu.Game.Graphics.Containers
                 // scroll offset is our fixed header height if we have it plus 20% of content height
                 // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
-                float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
+                float scrollIntoSectionAmount = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
 
-                float scrollOffset = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
+                float scrollOffset = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_target_multiplier + scrollIntoSectionAmount;
 
                 if (Precision.AlmostBigger(0, scrollContainer.Current))
                     SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();

From 8853ac04d97e2419da6b4f2db2a464d680173d3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 15:08:36 +0900
Subject: [PATCH 07660/10326] Rename some variable and add xmldoc for scroll
 centre position

---
 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 87c3007ca4..6ed161fa77 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -108,7 +108,10 @@ namespace osu.Game.Graphics.Containers
 
         private float? lastKnownScroll;
 
-        private const float scroll_target_multiplier = 0.2f;
+        /// <summary>
+        /// The percentage of the container to consider the centre-point for deciding the active section (and scrolling to a requested section).
+        /// </summary>
+        private const float scroll_y_centre = 0.2f;
 
         public SectionsContainer()
         {
@@ -144,7 +147,7 @@ namespace osu.Game.Graphics.Containers
         public void ScrollTo(Drawable section)
         {
             lastClickedSection = section;
-            scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - scrollContainer.DisplayableContent * scroll_target_multiplier - (FixedHeader?.BoundingBox.Height ?? 0));
+            scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - scrollContainer.DisplayableContent * scroll_y_centre - (FixedHeader?.BoundingBox.Height ?? 0));
         }
 
         public void ScrollToTop() => scrollContainer.ScrollTo(0);
@@ -217,9 +220,9 @@ namespace osu.Game.Graphics.Containers
                 // scroll offset is our fixed header height if we have it plus 20% of content height
                 // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
-                float scrollIntoSectionAmount = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
+                float selectionLenienceAboveSection = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
 
-                float scrollOffset = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_target_multiplier + scrollIntoSectionAmount;
+                float scrollCentre = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_y_centre + selectionLenienceAboveSection;
 
                 if (Precision.AlmostBigger(0, scrollContainer.Current))
                     SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();
@@ -228,7 +231,7 @@ namespace osu.Game.Graphics.Containers
                 else
                 {
                     SelectedSection.Value = Children
-                                            .TakeWhile(section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset <= 0)
+                                            .TakeWhile(section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollCentre <= 0)
                                             .LastOrDefault() ?? Children.FirstOrDefault();
                 }
             }

From e6980688f60fd9d6b9e6489f2879eb397a50218f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 15:42:23 +0900
Subject: [PATCH 07661/10326] Leave the multiplayer channel when leaving
 multiplayer

---
 osu.Game/Online/Chat/ChannelManager.cs                 | 10 +++++++---
 .../OnlinePlay/Match/Components/MatchChatDisplay.cs    |  6 ++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 62ae507419..036ec4d0f3 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -339,7 +339,7 @@ namespace osu.Game.Online.Chat
         }
 
         /// <summary>
-        /// Joins a channel if it has not already been joined.
+        /// Joins a channel if it has not already been joined. Must be called from the update thread.
         /// </summary>
         /// <param name="channel">The channel to join.</param>
         /// <returns>The joined channel. Note that this may not match the parameter channel as it is a backed object.</returns>
@@ -399,7 +399,11 @@ namespace osu.Game.Online.Chat
             return channel;
         }
 
-        public void LeaveChannel(Channel channel)
+        /// <summary>
+        /// Leave the specified channel. Can be called from any thread.
+        /// </summary>
+        /// <param name="channel">The channel to leave.</param>
+        public void LeaveChannel(Channel channel) => Schedule(() =>
         {
             if (channel == null) return;
 
@@ -413,7 +417,7 @@ namespace osu.Game.Online.Chat
                 api.Queue(new LeaveChannelRequest(channel));
                 channel.Joined.Value = false;
             }
-        }
+        });
 
         private long lastMessageId;
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
index 8800215c2e..6da2866236 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
@@ -38,5 +38,11 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
             Channel.Value = channelManager?.JoinChannel(new Channel { Id = channelId.Value, Type = ChannelType.Multiplayer, Name = $"#lazermp_{roomId.Value}" });
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            channelManager?.LeaveChannel(Channel.Value);
+        }
     }
 }

From 9eb74e86edacd10d0f8fa8facf4f7f0045c4ca5c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 21 Jan 2021 17:40:15 +0900
Subject: [PATCH 07662/10326] Apply comment suggestion
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/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 7df4f1ae7d..e215ecc17a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 // 2) The user changes the track time through some other means (scrolling in the editor or overview timeline; clicking a hitobject etc.). We want the timeline to track the clock's time.
                 // 3) An ongoing seek transform is running from an external seek. We want the timeline to track the clock's time.
 
-                // The simplest way to cover both cases is by checking whether the scroll position has changed and the audio hasn't been changed externally
+                // The simplest way to cover the first two cases is by checking whether the scroll position has changed and the audio hasn't been changed externally
                 // Checking IsSeeking covers the third case, where the transform may not have been applied yet.
                 if (Current != lastScrollPosition && editorClock.CurrentTime == lastTrackTime && !editorClock.IsSeeking)
                     seekTrackToCurrent();

From 153149554bdb5c7ba44b57d6bc75acda7cfc1763 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Thu, 21 Jan 2021 16:25:16 +0100
Subject: [PATCH 07663/10326] add more mime types

---
 osu.Android/OsuGameActivity.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 788e5f82be..48b059b482 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -20,7 +20,8 @@ namespace osu.Android
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream" })]
+    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataMimeTypes = new[] { "application/x-osu-beatmap", "application/x-osu-skin" })]
+    [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/x-osu-beatmap", "application/x-osu-skin", "application/zip", "application/octet-stream", "application/x-zip", "application/x-zip-compressed" })]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {

From e4b59c7317b7788f03b184ccc900aee717153658 Mon Sep 17 00:00:00 2001
From: vmaggioli <Vince.Maggioli@philips.com>
Date: Thu, 21 Jan 2021 11:54:26 -0500
Subject: [PATCH 07664/10326] Test setup

---
 .../TestSceneTimelineHitObjectBlueprint.cs    | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
new file mode 100644
index 0000000000..ed427c2020
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+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.Screens.Edit.Compose.Components.Timeline;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneTimelineHitObjectBlueprint : TimelineTestScene
+    {
+        private Spinner spinner;
+        private TimelineHitObjectBlueprint blueprint;
+
+        public TestSceneTimelineHitObjectBlueprint()
+        {
+            var spinner = new Spinner
+            {
+                Position = new Vector2(256, 256),
+                StartTime = -1000,
+                EndTime = 2000
+            };
+
+            spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
+            Add(new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Size = new Vector2(0.5f),
+                Child = _ = new DrawableSpinner(spinner)
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Clock.Seek(10000);
+        }
+
+        public override Drawable CreateTestComponent() => blueprint = new TimelineHitObjectBlueprint(spinner);
+
+        [Test]
+        public void TestDisallowZeroLengthSpinners()
+        {
+
+        }
+    }
+}

From 05d3914fee2d9365577a2bf2fb8cd25fc0e11a17 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 21:26:33 +0300
Subject: [PATCH 07665/10326] Rename friends tooltip to followers

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

diff --git a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
index 6c2b2dc16a..7080a578d0 100644
--- a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
     {
         public readonly Bindable<User> User = new Bindable<User>();
 
-        public override string TooltipText => "friends";
+        public override string TooltipText => "followers";
 
         private OsuSpriteText followerText;
 

From 2aa1df9ea4b5d95bdaa44b956d55f8de2eecf9ea Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 21:38:52 +0300
Subject: [PATCH 07666/10326] Implement ProfileHeaderStatisticsButton component

---
 .../Header/Components/AddFriendButton.cs      | 38 ++------------
 .../ProfileHeaderStatisticsButton.cs          | 52 +++++++++++++++++++
 2 files changed, 55 insertions(+), 35 deletions(-)
 create mode 100644 osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs

diff --git a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
index 7080a578d0..ac05511132 100644
--- a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
@@ -3,58 +3,26 @@
 
 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.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
-using osuTK;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public class AddFriendButton : ProfileHeaderButton
+    public class AddFriendButton : ProfileHeaderStatisticsButton
     {
         public readonly Bindable<User> User = new Bindable<User>();
 
         public override string TooltipText => "followers";
 
-        private OsuSpriteText followerText;
+        protected override IconUsage CreateIcon() => FontAwesome.Solid.User;
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                Direction = FillDirection.Horizontal,
-                Padding = new MarginPadding { Right = 10 },
-                Children = new Drawable[]
-                {
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Icon = FontAwesome.Solid.User,
-                        FillMode = FillMode.Fit,
-                        Size = new Vector2(50, 14)
-                    },
-                    followerText = new OsuSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Font = OsuFont.GetFont(weight: FontWeight.Bold)
-                    }
-                }
-            };
-
             // todo: when friending/unfriending is implemented, the APIAccess.Friends list should be updated accordingly.
-
             User.BindValueChanged(user => updateFollowers(user.NewValue), true);
         }
 
-        private void updateFollowers(User user) => followerText.Text = user?.FollowerCount.ToString("#,##0");
+        private void updateFollowers(User user) => SetValue(user?.FollowerCount.ToString("#,##0"));
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
new file mode 100644
index 0000000000..7c1da503d1
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.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 JetBrains.Annotations;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Overlays.Profile.Header.Components
+{
+    public abstract class ProfileHeaderStatisticsButton : ProfileHeaderButton
+    {
+        private readonly OsuSpriteText drawableText;
+
+        protected ProfileHeaderStatisticsButton()
+        {
+            Child = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Direction = FillDirection.Horizontal,
+                Padding = new MarginPadding { Right = 10 },
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Icon = CreateIcon(),
+                        FillMode = FillMode.Fit,
+                        Size = new Vector2(50, 14)
+                    },
+                    drawableText = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Font = OsuFont.GetFont(weight: FontWeight.Bold)
+                    }
+                }
+            };
+        }
+
+        [NotNull]
+        protected abstract IconUsage CreateIcon();
+
+        protected void SetValue(string value) => drawableText.Text = value;
+    }
+}

From 966440f109a452b46fa99b3fd2d3845650e02467 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 22:02:19 +0300
Subject: [PATCH 07667/10326] Add MappingFollowerCount field to User

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

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index d7e78d5b35..518236755d 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -126,6 +126,9 @@ namespace osu.Game.Users
         [JsonProperty(@"follower_count")]
         public int FollowerCount;
 
+        [JsonProperty(@"mapping_follower_count")]
+        public int MappingFollowerCount;
+
         [JsonProperty(@"favourite_beatmapset_count")]
         public int FavouriteBeatmapsetCount;
 

From a7c22ebe88812ba1cf33bb931eceabcb11e83105 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 22:02:54 +0300
Subject: [PATCH 07668/10326] Implement MappingSubscribersButton component

---
 .../Profile/Header/CentreHeaderContainer.cs   |  7 ++++--
 .../{AddFriendButton.cs => FriendsButton.cs}  |  6 ++---
 .../Components/MappingSubscribersButton.cs    | 25 +++++++++++++++++++
 .../ProfileHeaderStatisticsButton.cs          | 14 +++++------
 4 files changed, 39 insertions(+), 13 deletions(-)
 rename osu.Game/Overlays/Profile/Header/Components/{AddFriendButton.cs => FriendsButton.cs} (75%)
 create mode 100644 osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs

diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 658cdb8ce3..1849b6d88a 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -49,9 +49,12 @@ namespace osu.Game.Overlays.Profile.Header
                     Spacing = new Vector2(10, 0),
                     Children = new Drawable[]
                     {
-                        new AddFriendButton
+                        new FriendsButton
+                        {
+                            User = { BindTarget = User }
+                        },
+                        new MappingSubscribersButton
                         {
-                            RelativeSizeAxes = Axes.Y,
                             User = { BindTarget = User }
                         },
                         new MessageUserButton
diff --git a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
similarity index 75%
rename from osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
rename to osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
index ac05511132..f369874586 100644
--- a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public class AddFriendButton : ProfileHeaderStatisticsButton
+    public class FriendsButton : ProfileHeaderStatisticsButton
     {
         public readonly Bindable<User> User = new Bindable<User>();
 
@@ -20,9 +20,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         private void load()
         {
             // todo: when friending/unfriending is implemented, the APIAccess.Friends list should be updated accordingly.
-            User.BindValueChanged(user => updateFollowers(user.NewValue), true);
+            User.BindValueChanged(user => SetValue(user.NewValue?.FollowerCount ?? 0), true);
         }
-
-        private void updateFollowers(User user) => SetValue(user?.FollowerCount.ToString("#,##0"));
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
new file mode 100644
index 0000000000..2fb53a0b9a
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
@@ -0,0 +1,25 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Users;
+
+namespace osu.Game.Overlays.Profile.Header.Components
+{
+    public class MappingSubscribersButton : ProfileHeaderStatisticsButton
+    {
+        public readonly Bindable<User> User = new Bindable<User>();
+
+        public override string TooltipText => "mapping subscribers";
+
+        protected override IconUsage CreateIcon() => FontAwesome.Solid.Bell;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            User.BindValueChanged(user => SetValue(user.NewValue?.MappingFollowerCount ?? 0), true);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
index 7c1da503d1..84a6e351ea 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.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 JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -17,13 +16,14 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         protected ProfileHeaderStatisticsButton()
         {
+            RelativeSizeAxes = Axes.Y;
             Child = new FillFlowContainer
             {
-                AutoSizeAxes = Axes.Both,
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
+                AutoSizeAxes = Axes.X,
+                RelativeSizeAxes = Axes.Y,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
                 Direction = FillDirection.Horizontal,
-                Padding = new MarginPadding { Right = 10 },
                 Children = new Drawable[]
                 {
                     new SpriteIcon
@@ -38,15 +38,15 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
+                        Margin = new MarginPadding { Right = 10 },
                         Font = OsuFont.GetFont(weight: FontWeight.Bold)
                     }
                 }
             };
         }
 
-        [NotNull]
         protected abstract IconUsage CreateIcon();
 
-        protected void SetValue(string value) => drawableText.Text = value;
+        protected void SetValue(int value) => drawableText.Text = value.ToString("#,##0");
     }
 }

From 343166f158d09e74a9fee1df901989a80252c7be Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 22:47:44 +0300
Subject: [PATCH 07669/10326] Make CreateIcon a property

---
 osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs  | 2 +-
 .../Profile/Header/Components/MappingSubscribersButton.cs     | 2 +-
 .../Header/Components/ProfileHeaderStatisticsButton.cs        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
index f369874586..e0930b6a65 100644
--- a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         public override string TooltipText => "followers";
 
-        protected override IconUsage CreateIcon() => FontAwesome.Solid.User;
+        protected override IconUsage CreateIcon => FontAwesome.Solid.User;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
index 2fb53a0b9a..ef290676d9 100644
--- a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         public override string TooltipText => "mapping subscribers";
 
-        protected override IconUsage CreateIcon() => FontAwesome.Solid.Bell;
+        protected override IconUsage CreateIcon => FontAwesome.Solid.Bell;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
index 84a6e351ea..ff315727fa 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Icon = CreateIcon(),
+                        Icon = CreateIcon,
                         FillMode = FillMode.Fit,
                         Size = new Vector2(50, 14)
                     },
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             };
         }
 
-        protected abstract IconUsage CreateIcon();
+        protected abstract IconUsage CreateIcon { get; }
 
         protected void SetValue(int value) => drawableText.Text = value.ToString("#,##0");
     }

From e87197c7fc80b9d40e85829b2120cfbbf8cca87d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 22:48:31 +0300
Subject: [PATCH 07670/10326] Adjust text size

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

diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
index ff315727fa..118ea4c6aa 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                         Margin = new MarginPadding { Right = 10 },
-                        Font = OsuFont.GetFont(weight: FontWeight.Bold)
+                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold)
                     }
                 }
             };

From 4555b9ff704bad005b094d0e5997ed1b29e9606c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 22:56:12 +0300
Subject: [PATCH 07671/10326] Make ProfileHeaderButton height defined

---
 osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs        | 1 -
 osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs | 1 -
 .../Overlays/Profile/Header/Components/ProfileHeaderButton.cs    | 1 +
 .../Profile/Header/Components/ProfileHeaderStatisticsButton.cs   | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 1849b6d88a..8f940cd0cc 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -72,7 +72,6 @@ namespace osu.Game.Overlays.Profile.Header
                     Width = UserProfileOverlay.CONTENT_X_MARGIN,
                     Child = new ExpandDetailsButton
                     {
-                        RelativeSizeAxes = Axes.Y,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         DetailsVisible = { BindTarget = DetailsVisible }
diff --git a/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs b/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
index cc6edcdd6a..228765ee1a 100644
--- a/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
@@ -33,7 +33,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
         public MessageUserButton()
         {
             Content.Alpha = 0;
-            RelativeSizeAxes = Axes.Y;
 
             Child = new SpriteIcon
             {
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
index e14d73dd98..cea63574cf 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         protected ProfileHeaderButton()
         {
             AutoSizeAxes = Axes.X;
+            Height = 40;
 
             base.Content.Add(new CircularContainer
             {
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
index 118ea4c6aa..0b8f0b4d25 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
@@ -16,7 +16,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         protected ProfileHeaderStatisticsButton()
         {
-            RelativeSizeAxes = Axes.Y;
             Child = new FillFlowContainer
             {
                 AutoSizeAxes = Axes.X,

From a5f866d95ce0a6e97c8620b22266b5bf3f470173 Mon Sep 17 00:00:00 2001
From: vmaggioli <vinmags16@gmail.com>
Date: Thu, 21 Jan 2021 15:14:24 -0500
Subject: [PATCH 07672/10326] Test updates

---
 .../TestSceneTimelineHitObjectBlueprint.cs    | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index ed427c2020..1fa37470cb 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -1,28 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 using NUnit.Framework;
 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.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
+using osuTK.Input;
+using static osu.Game.Screens.Edit.Compose.Components.Timeline.TimelineHitObjectBlueprint;
 
 namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneTimelineHitObjectBlueprint : TimelineTestScene
     {
         private Spinner spinner;
-        private TimelineHitObjectBlueprint blueprint;
 
         public TestSceneTimelineHitObjectBlueprint()
         {
-            var spinner = new Spinner
+            spinner = new Spinner
             {
                 Position = new Vector2(256, 256),
                 StartTime = -1000,
@@ -30,26 +29,22 @@ namespace osu.Game.Tests.Visual.Editing
             };
 
             spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
-            Add(new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Size = new Vector2(0.5f),
-                Child = _ = new DrawableSpinner(spinner)
-            });
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            Clock.Seek(10000);
-        }
-
-        public override Drawable CreateTestComponent() => blueprint = new TimelineHitObjectBlueprint(spinner);
+        public override Drawable CreateTestComponent() => new TimelineHitObjectBlueprint(spinner);
 
         [Test]
         public void TestDisallowZeroLengthSpinners()
         {
-
+            DragBar dragBar = this.ChildrenOfType<DragBar>().First();
+            Circle circle = this.ChildrenOfType<Circle>().First();
+            InputManager.MoveMouseTo(dragBar.ScreenSpaceDrawQuad.TopRight);
+            AddStep("drag dragbar to hit object", () =>
+            {
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(circle.ScreenSpaceDrawQuad.TopLeft);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
         }
     }
 }

From c631354b57d39f165332f6482cce23fb1702c576 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 23:39:19 +0300
Subject: [PATCH 07673/10326] Rename property

---
 osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs  | 2 +-
 .../Profile/Header/Components/MappingSubscribersButton.cs     | 2 +-
 .../Header/Components/ProfileHeaderStatisticsButton.cs        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
index e0930b6a65..09916997a4 100644
--- a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         public override string TooltipText => "followers";
 
-        protected override IconUsage CreateIcon => FontAwesome.Solid.User;
+        protected override IconUsage Icon => FontAwesome.Solid.User;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
index ef290676d9..b4d7c9a05c 100644
--- a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         public override string TooltipText => "mapping subscribers";
 
-        protected override IconUsage CreateIcon => FontAwesome.Solid.Bell;
+        protected override IconUsage Icon => FontAwesome.Solid.Bell;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
index 0b8f0b4d25..b65d5e2329 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Icon = CreateIcon,
+                        Icon = Icon,
                         FillMode = FillMode.Fit,
                         Size = new Vector2(50, 14)
                     },
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             };
         }
 
-        protected abstract IconUsage CreateIcon { get; }
+        protected abstract IconUsage Icon { get; }
 
         protected void SetValue(int value) => drawableText.Text = value.ToString("#,##0");
     }

From 2eba2a9abf2b56f2637843846fab1988ea10aeb3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 23:40:23 +0300
Subject: [PATCH 07674/10326] Rename FriendsButton to FollowersButton

---
 osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs       | 2 +-
 .../Header/Components/{FriendsButton.cs => FollowersButton.cs}  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game/Overlays/Profile/Header/Components/{FriendsButton.cs => FollowersButton.cs} (92%)

diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 8f940cd0cc..04a1040e06 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Profile.Header
                     Spacing = new Vector2(10, 0),
                     Children = new Drawable[]
                     {
-                        new FriendsButton
+                        new FollowersButton
                         {
                             User = { BindTarget = User }
                         },
diff --git a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs b/osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs
similarity index 92%
rename from osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
rename to osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs
index 09916997a4..bd8aa7b3bd 100644
--- a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs
@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public class FriendsButton : ProfileHeaderStatisticsButton
+    public class FollowersButton : ProfileHeaderStatisticsButton
     {
         public readonly Bindable<User> User = new Bindable<User>();
 

From 7046f64e7f7eaec8d9aa65cdac54aca13d01bc06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Jan 2021 22:07:08 +0100
Subject: [PATCH 07675/10326] Rewrite test scene

---
 .../TestSceneTimelineHitObjectBlueprint.cs    | 54 ++++++++++---------
 .../Visual/Editing/TimelineTestScene.cs       | 10 ++--
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index 1fa37470cb..15fa1d995b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -1,13 +1,9 @@
 using System.Linq;
 using NUnit.Framework;
 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.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 using osuTK.Input;
@@ -17,34 +13,40 @@ namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneTimelineHitObjectBlueprint : TimelineTestScene
     {
-        private Spinner spinner;
-
-        public TestSceneTimelineHitObjectBlueprint()
-        {
-            spinner = new Spinner
-            {
-                Position = new Vector2(256, 256),
-                StartTime = -1000,
-                EndTime = 2000
-            };
-
-            spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
-        }
-
-        public override Drawable CreateTestComponent() => new TimelineHitObjectBlueprint(spinner);
+        public override Drawable CreateTestComponent() => new TimelineBlueprintContainer(Composer);
 
         [Test]
-        public void TestDisallowZeroLengthSpinners()
+        public void TestDisallowZeroDurationObjects()
         {
-            DragBar dragBar = this.ChildrenOfType<DragBar>().First();
-            Circle circle = this.ChildrenOfType<Circle>().First();
-            InputManager.MoveMouseTo(dragBar.ScreenSpaceDrawQuad.TopRight);
-            AddStep("drag dragbar to hit object", () =>
+            DragBar dragBar;
+
+            AddStep("add spinner", () =>
             {
+                EditorBeatmap.Clear();
+                EditorBeatmap.Add(new Spinner
+                {
+                    Position = new Vector2(256, 256),
+                    StartTime = 150,
+                    Duration = 500
+                });
+            });
+
+            AddStep("hold down drag bar", () =>
+            {
+                // distinguishes between the actual drag bar and its "underlay shadow".
+                dragBar = this.ChildrenOfType<DragBar>().Single(bar => bar.HandlePositionalInput);
+                InputManager.MoveMouseTo(dragBar);
                 InputManager.PressButton(MouseButton.Left);
-                InputManager.MoveMouseTo(circle.ScreenSpaceDrawQuad.TopLeft);
+            });
+
+            AddStep("try to drag bar past start", () =>
+            {
+                var blueprint = this.ChildrenOfType<TimelineHitObjectBlueprint>().Single();
+                InputManager.MoveMouseTo(blueprint.SelectionQuad.TopLeft - new Vector2(100, 0));
                 InputManager.ReleaseButton(MouseButton.Left);
             });
+
+            AddAssert("object has non-zero duration", () => EditorBeatmap.HitObjects.OfType<IHasDuration>().Single().Duration > 0);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 63bb018d6e..d6db171cf0 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -23,22 +23,24 @@ namespace osu.Game.Tests.Visual.Editing
 
         protected HitObjectComposer Composer { get; private set; }
 
+        protected EditorBeatmap EditorBeatmap { get; private set; }
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
             Beatmap.Value = new WaveformTestBeatmap(audio);
 
             var playable = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
-            var editorBeatmap = new EditorBeatmap(playable);
+            EditorBeatmap = new EditorBeatmap(playable);
 
-            Dependencies.Cache(editorBeatmap);
-            Dependencies.CacheAs<IBeatSnapProvider>(editorBeatmap);
+            Dependencies.Cache(EditorBeatmap);
+            Dependencies.CacheAs<IBeatSnapProvider>(EditorBeatmap);
 
             Composer = playable.BeatmapInfo.Ruleset.CreateInstance().CreateHitObjectComposer().With(d => d.Alpha = 0);
 
             AddRange(new Drawable[]
             {
-                editorBeatmap,
+                EditorBeatmap,
                 Composer,
                 new FillFlowContainer
                 {

From a71f769cce26eb9a010e2dd67d2ee637f74cd932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Jan 2021 22:09:42 +0100
Subject: [PATCH 07676/10326] Add missing license header

---
 .../Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index 15fa1d995b..35f394fe1d 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -1,4 +1,7 @@
-using System.Linq;
+// Copyright (c) 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;
 using osu.Framework.Testing;

From e4c5e5ba17ae1b7359d26b628fc92a9565f4bcfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Jan 2021 22:11:51 +0100
Subject: [PATCH 07677/10326] Separate return statement with blank line

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 99edcd2149..508783a499 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -229,6 +229,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             float expectedDistance = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
             if (expectedDistance < 1)
                 return;
+
             HitObject.Path.ExpectedDistance.Value = expectedDistance;
             editorBeatmap?.Update(HitObject);
         }

From d0fd2ae432700dc8a7d125b827e6931ab69940c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Jan 2021 22:20:07 +0100
Subject: [PATCH 07678/10326] Fix added zero-length slider test not working
 properly

---
 .../TestSceneSliderSelectionBlueprint.cs      | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index ce1c13dac5..4edf778bfd 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -165,20 +165,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         public void TestZeroLengthSliderNotAllowed()
         {
             moveMouseToControlPoint(1);
-            AddStep("drag control point 1 to control point 0", () =>
-            {
-                InputManager.PressButton(MouseButton.Left);
-                moveMouseToControlPoint(0);
-                InputManager.ReleaseButton(MouseButton.Left);
-            });
+            dragMouseToControlPoint(0);
+
             moveMouseToControlPoint(2);
-            AddStep("drag control point 2 to control point 0", () =>
-            {
-                InputManager.PressButton(MouseButton.Left);
-                moveMouseToControlPoint(0);
-                InputManager.ReleaseButton(MouseButton.Left);
-            });
-            checkPositions();
+            dragMouseToControlPoint(0);
+
+            AddAssert("slider has non-zero duration", () => slider.Duration > 0);
         }
 
         private void moveHitObject()
@@ -209,6 +201,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
         }
 
+        private void dragMouseToControlPoint(int index)
+        {
+            AddStep("hold down mouse button", () => InputManager.PressButton(MouseButton.Left));
+            moveMouseToControlPoint(index);
+            AddStep("release mouse button", () => InputManager.ReleaseButton(MouseButton.Left));
+        }
+
         private void checkControlPointSelected(int index, bool selected)
             => AddAssert($"control point {index} {(selected ? "selected" : "not selected")}", () => blueprint.ControlPointVisualiser.Pieces[index].IsSelected.Value == selected);
 

From b220939650672b6e2056464f32082a31b8f0c531 Mon Sep 17 00:00:00 2001
From: Mysfit <8022806+Mysfit@users.noreply.github.com>
Date: Thu, 21 Jan 2021 17:10:11 -0500
Subject: [PATCH 07679/10326] Fix storyboard samples continuing to play when
 the beatmap is paused or the intro is skipped.

---
 osu.Game/Screens/Play/Player.cs                     | 13 ++++++++++++-
 osu.Game/Skinning/PausableSkinnableSound.cs         |  8 ++++----
 .../Drawables/DrawableStoryboardSample.cs           | 10 ++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1fcbed7ef7..b622f11775 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -353,7 +353,7 @@ namespace osu.Game.Screens.Play
                     },
                     skipOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
                     {
-                        RequestSkip = GameplayClockContainer.Skip
+                        RequestSkip = performUserRequestedSkip
                     },
                     FailOverlay = new FailOverlay
                     {
@@ -488,6 +488,17 @@ namespace osu.Game.Screens.Play
                 this.Exit();
         }
 
+        private void performUserRequestedSkip()
+        {
+            // user requested skip
+            // disable sample playback to stop currently playing samples and perform skip
+            samplePlaybackDisabled.Value = true;
+            GameplayClockContainer.Skip();
+
+            // return samplePlaybackDisabled.Value to what is defined by the beatmap's current state
+            updateSampleDisabledState();
+        }
+
         private void performUserRequestedExit()
         {
             if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index cb5234c847..e0891fbda2 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Skinning
         {
         }
 
-        private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+        protected readonly IBindable<bool> SamplePlaybackDisabled = new Bindable<bool>();
 
         private ScheduledDelegate scheduledStart;
 
@@ -42,8 +42,8 @@ namespace osu.Game.Skinning
             // if in a gameplay context, pause sample playback when gameplay is paused.
             if (samplePlaybackDisabler != null)
             {
-                samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
-                samplePlaybackDisabled.BindValueChanged(disabled =>
+                SamplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
+                SamplePlaybackDisabled.BindValueChanged(disabled =>
                 {
                     if (!RequestedPlaying) return;
 
@@ -72,7 +72,7 @@ namespace osu.Game.Skinning
             cancelPendingStart();
             RequestedPlaying = true;
 
-            if (samplePlaybackDisabled.Value)
+            if (SamplePlaybackDisabled.Value)
                 return;
 
             base.Play(restart);
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 218f051bf0..5b49e71daa 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -40,6 +40,16 @@ namespace osu.Game.Storyboards.Drawables
                 foreach (var sample in DrawableSamples)
                     mod.ApplyToSample(sample);
             }
+
+            SamplePlaybackDisabled.BindValueChanged(disabled =>
+            {
+                if (!RequestedPlaying) return;
+
+                // Since storyboard samples can be very long we want to stop the playback regardless of
+                // whether or not the sample is looping or not
+                if (disabled.NewValue)
+                    Stop();
+            });
         }
 
         protected override void Update()

From 07ec0c0e0bbe7047442033bde8f23ea7c8533e4b Mon Sep 17 00:00:00 2001
From: Mysfit <8022806+Mysfit@users.noreply.github.com>
Date: Thu, 21 Jan 2021 17:46:47 -0500
Subject: [PATCH 07680/10326] Updated DrawableStoryboardSample to use
 GetBoundCopy()

---
 osu.Game/Skinning/PausableSkinnableSound.cs   |  6 ++--
 .../Drawables/DrawableStoryboardSample.cs     | 28 ++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index e0891fbda2..361360035d 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,6 +18,10 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
+        protected IBindable<bool> SamplePlaybackDisabled => samplePlaybackDisabled;
+
+        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
         public PausableSkinnableSound()
         {
         }
@@ -32,8 +36,6 @@ namespace osu.Game.Skinning
         {
         }
 
-        protected readonly IBindable<bool> SamplePlaybackDisabled = new Bindable<bool>();
-
         private ScheduledDelegate scheduledStart;
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 5b49e71daa..b924b0551f 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -21,11 +21,29 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
+        private readonly IBindable<bool> samplePlaybackDisabled;
+
         public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
             : base(sampleInfo)
         {
             this.sampleInfo = sampleInfo;
             LifetimeStart = sampleInfo.StartTime;
+
+            samplePlaybackDisabled = SamplePlaybackDisabled.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load()
+        {
+            samplePlaybackDisabled.BindValueChanged(disabled =>
+            {
+                if (!RequestedPlaying) return;
+
+                // Since storyboard samples can be very long we want to stop the playback regardless of
+                // whether or not the sample is looping or not
+                if (disabled.NewValue)
+                    Stop();
+            });
         }
 
         [Resolved]
@@ -40,16 +58,6 @@ namespace osu.Game.Storyboards.Drawables
                 foreach (var sample in DrawableSamples)
                     mod.ApplyToSample(sample);
             }
-
-            SamplePlaybackDisabled.BindValueChanged(disabled =>
-            {
-                if (!RequestedPlaying) return;
-
-                // Since storyboard samples can be very long we want to stop the playback regardless of
-                // whether or not the sample is looping or not
-                if (disabled.NewValue)
-                    Stop();
-            });
         }
 
         protected override void Update()

From b53ad50cd48461b564fafe30c3c6885b3a6b11dd Mon Sep 17 00:00:00 2001
From: Mysfit <8022806+Mysfit@users.noreply.github.com>
Date: Thu, 21 Jan 2021 18:00:37 -0500
Subject: [PATCH 07681/10326] Remove redundant variable

---
 osu.Game/Skinning/PausableSkinnableSound.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 361360035d..0f97307372 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,9 +18,7 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
-        protected IBindable<bool> SamplePlaybackDisabled => samplePlaybackDisabled;
-
-        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+        protected readonly IBindable<bool> SamplePlaybackDisabled = new Bindable<bool>();
 
         public PausableSkinnableSound()
         {

From 5b1bdfbdc502a0500bb0cfdeb3b3075c8d530324 Mon Sep 17 00:00:00 2001
From: Mysfit <8022806+Mysfit@users.noreply.github.com>
Date: Thu, 21 Jan 2021 20:06:24 -0500
Subject: [PATCH 07682/10326] Use callback method override

---
 osu.Game/Skinning/PausableSkinnableSound.cs   | 59 ++++++++++---------
 .../Drawables/DrawableStoryboardSample.cs     | 31 ++++------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 0f97307372..b48cf5d448 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
-        protected readonly IBindable<bool> SamplePlaybackDisabled = new Bindable<bool>();
+        private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
 
         public PausableSkinnableSound()
         {
@@ -42,37 +42,32 @@ namespace osu.Game.Skinning
             // if in a gameplay context, pause sample playback when gameplay is paused.
             if (samplePlaybackDisabler != null)
             {
-                SamplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
-                SamplePlaybackDisabled.BindValueChanged(disabled =>
-                {
-                    if (!RequestedPlaying) return;
-
-                    // let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
-                    if (!Looping) return;
-
-                    cancelPendingStart();
-
-                    if (disabled.NewValue)
-                        base.Stop();
-                    else
-                    {
-                        // schedule so we don't start playing a sample which is no longer alive.
-                        scheduledStart = Schedule(() =>
-                        {
-                            if (RequestedPlaying)
-                                base.Play();
-                        });
-                    }
-                });
+                samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
+                samplePlaybackDisabled.BindValueChanged(SamplePlaybackDisabledChanged);
             }
         }
 
+        protected virtual void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
+        {
+            if (!RequestedPlaying) return;
+
+            // let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
+            if (!Looping) return;
+
+            CancelPendingStart();
+
+            if (disabled.NewValue)
+                base.Stop();
+            else
+                ScheduleStart();
+        }
+
         public override void Play(bool restart = true)
         {
-            cancelPendingStart();
+            CancelPendingStart();
             RequestedPlaying = true;
 
-            if (SamplePlaybackDisabled.Value)
+            if (samplePlaybackDisabled.Value)
                 return;
 
             base.Play(restart);
@@ -80,15 +75,25 @@ namespace osu.Game.Skinning
 
         public override void Stop()
         {
-            cancelPendingStart();
+            CancelPendingStart();
             RequestedPlaying = false;
             base.Stop();
         }
 
-        private void cancelPendingStart()
+        protected void CancelPendingStart()
         {
             scheduledStart?.Cancel();
             scheduledStart = null;
         }
+
+        protected void ScheduleStart()
+        {
+            // schedule so we don't start playing a sample which is no longer alive.
+            scheduledStart = Schedule(() =>
+            {
+                if (RequestedPlaying)
+                    base.Play();
+            });
+        }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index b924b0551f..d5e1e19666 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -21,34 +21,29 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
-        private readonly IBindable<bool> samplePlaybackDisabled;
-
         public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
             : base(sampleInfo)
         {
             this.sampleInfo = sampleInfo;
             LifetimeStart = sampleInfo.StartTime;
-
-            samplePlaybackDisabled = SamplePlaybackDisabled.GetBoundCopy();
-        }
-
-        [BackgroundDependencyLoader(true)]
-        private void load()
-        {
-            samplePlaybackDisabled.BindValueChanged(disabled =>
-            {
-                if (!RequestedPlaying) return;
-
-                // Since storyboard samples can be very long we want to stop the playback regardless of
-                // whether or not the sample is looping or not
-                if (disabled.NewValue)
-                    Stop();
-            });
         }
 
         [Resolved]
         private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
+        protected override void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
+        {
+            if (!RequestedPlaying) return;
+
+            if (disabled.NewValue)
+                Stop();
+            else
+            {
+                CancelPendingStart();
+                ScheduleStart();
+            }
+        }
+
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);

From 9f89b4e6d79822f7e7eb382767818add29bda6db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 14:25:21 +0900
Subject: [PATCH 07683/10326] Rewrite connection logic to better handle failure
 cases

The main goal here is to ensure the connection is built each connection
attempt. Previously, the access token would never be updated, leading to
outdated tokens failing repeatedly (in the connection retry loop) and
never being able to establish a new connection as a result.

Due to threading considerations, this isn't as simple as I would hope it
to be. I'm open to proposals as to a better way of handling this.

Also, keep in mind that this logic will need to be abstracted and
(re)used in `SpectatorClient` as well. I've intentionally not done that
yet until we agree that this is a good direction forward.
---
 .../Online/Multiplayer/MultiplayerClient.cs   | 141 ++++++++++++------
 1 file changed, 93 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 50dc8f661c..34616a45a5 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -4,7 +4,6 @@
 #nullable enable
 
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
@@ -30,6 +29,8 @@ namespace osu.Game.Online.Multiplayer
 
         private HubConnection? connection;
 
+        private CancellationTokenSource connectCancelSource = new CancellationTokenSource();
+
         private readonly string endpoint;
 
         public MultiplayerClient(EndpointConfiguration endpoints)
@@ -50,8 +51,7 @@ namespace osu.Game.Online.Multiplayer
             {
                 case APIState.Failing:
                 case APIState.Offline:
-                    connection?.StopAsync();
-                    connection = null;
+                    Task.Run(Disconnect);
                     break;
 
                 case APIState.Online:
@@ -60,70 +60,57 @@ namespace osu.Game.Online.Multiplayer
             }
         }
 
-        protected virtual async Task Connect()
+        private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
+
+        public Task Disconnect() => disconnect(true);
+
+        protected async Task Connect()
         {
-            if (connection != null)
-                return;
+            cancelExistingConnect();
 
-            connection = new HubConnectionBuilder()
-                         .WithUrl(endpoint, options =>
-                         {
-                             options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
-                         })
-                         .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
-                         .Build();
+            await connectionLock.WaitAsync();
 
-            // this is kind of SILLY
-            // https://github.com/dotnet/aspnetcore/issues/15198
-            connection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
-            connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
-            connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
-            connection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
-            connection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
-            connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
-            connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
-            connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
-            connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
-
-            connection.Closed += async ex =>
+            try
             {
-                isConnected.Value = false;
+                await disconnect(false);
 
-                Logger.Log(ex != null
-                    ? $"Multiplayer client lost connection: {ex}"
-                    : "Multiplayer client disconnected", LoggingTarget.Network);
+                // this token will be valid for the scope of this connection.
+                // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
+                var cancellationToken = connectCancelSource.Token;
 
-                if (connection != null)
-                    await tryUntilConnected();
-            };
-
-            await tryUntilConnected();
-
-            async Task tryUntilConnected()
-            {
-                Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);
-
-                while (api.State.Value == APIState.Online)
+                while (api.State.Value == APIState.Online && !cancellationToken.IsCancellationRequested)
                 {
+                    Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);
+
                     try
                     {
-                        Debug.Assert(connection != null);
+                        // importantly, rebuild the connection each attempt to get an updated access token.
+                        connection = createConnection(cancellationToken);
+
+                        await connection.StartAsync(cancellationToken);
 
-                        // reconnect on any failure
-                        await connection.StartAsync();
                         Logger.Log("Multiplayer client connected!", LoggingTarget.Network);
-
-                        // Success.
                         isConnected.Value = true;
-                        break;
+                        return;
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        //connection process was cancelled.
+                        return;
                     }
                     catch (Exception e)
                     {
                         Logger.Log($"Multiplayer client connection error: {e}", LoggingTarget.Network);
-                        await Task.Delay(5000);
+
+                        // retry on any failure.
+                        await Task.Delay(5000, cancellationToken);
                     }
                 }
             }
+            finally
+            {
+                connectionLock.Release();
+            }
         }
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
@@ -189,5 +176,63 @@ namespace osu.Game.Online.Multiplayer
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
         }
+
+        private async Task disconnect(bool takeLock)
+        {
+            cancelExistingConnect();
+
+            if (takeLock)
+                await connectionLock.WaitAsync();
+
+            try
+            {
+                if (connection != null)
+                    await connection.StopAsync();
+            }
+            finally
+            {
+                connection = null;
+                if (takeLock)
+                    connectionLock.Release();
+            }
+        }
+
+        private void cancelExistingConnect()
+        {
+            connectCancelSource.Cancel();
+            connectCancelSource = new CancellationTokenSource();
+        }
+
+        private HubConnection createConnection(CancellationToken cancellationToken)
+        {
+            var newConnection = new HubConnectionBuilder()
+                                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); })
+                                .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
+                                .Build();
+
+            // this is kind of SILLY
+            // https://github.com/dotnet/aspnetcore/issues/15198
+            newConnection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
+            newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
+            newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
+            newConnection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
+            newConnection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
+            newConnection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
+            newConnection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
+            newConnection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
+            newConnection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+
+            newConnection.Closed += async ex =>
+            {
+                isConnected.Value = false;
+
+                Logger.Log(ex != null ? $"Multiplayer client lost connection: {ex}" : "Multiplayer client disconnected", LoggingTarget.Network);
+
+                // make sure a disconnect wasn't triggered (and this is still the active connection).
+                if (!cancellationToken.IsCancellationRequested)
+                    await Connect();
+            };
+            return newConnection;
+        }
     }
 }

From d24d23646875b0bca4755c9d5b8a0caa24f30cae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 14:34:58 +0900
Subject: [PATCH 07684/10326] Make OperationCanceledException throwing
 behaviour consistent

---
 .../Online/Multiplayer/MultiplayerClient.cs     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 34616a45a5..aa2305c991 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -12,6 +12,7 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
+using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 
@@ -51,11 +52,11 @@ namespace osu.Game.Online.Multiplayer
             {
                 case APIState.Failing:
                 case APIState.Offline:
-                    Task.Run(Disconnect);
+                    Task.Run(Disconnect).CatchUnobservedExceptions();
                     break;
 
                 case APIState.Online:
-                    Task.Run(Connect);
+                    Task.Run(Connect).CatchUnobservedExceptions();
                     break;
             }
         }
@@ -78,8 +79,10 @@ namespace osu.Game.Online.Multiplayer
                 // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
                 var cancellationToken = connectCancelSource.Token;
 
-                while (api.State.Value == APIState.Online && !cancellationToken.IsCancellationRequested)
+                while (api.State.Value == APIState.Online)
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
+
                     Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);
 
                     try
@@ -96,7 +99,7 @@ namespace osu.Game.Online.Multiplayer
                     catch (OperationCanceledException)
                     {
                         //connection process was cancelled.
-                        return;
+                        throw;
                     }
                     catch (Exception e)
                     {
@@ -222,7 +225,7 @@ namespace osu.Game.Online.Multiplayer
             newConnection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
             newConnection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
 
-            newConnection.Closed += async ex =>
+            newConnection.Closed += ex =>
             {
                 isConnected.Value = false;
 
@@ -230,7 +233,9 @@ namespace osu.Game.Online.Multiplayer
 
                 // make sure a disconnect wasn't triggered (and this is still the active connection).
                 if (!cancellationToken.IsCancellationRequested)
-                    await Connect();
+                    Task.Run(Connect, default).CatchUnobservedExceptions();
+
+                return Task.CompletedTask;
             };
             return newConnection;
         }

From 65b70759844c37ee4cdf723c615781934da9059e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 15:37:50 +0900
Subject: [PATCH 07685/10326] Limit the effect of parallax when outside the
 bounds of the ParallaxContainer

This fixes the visual issues that still remain when mouse confining
fails. I think it also feels more correct in general.
---
 .../Graphics/Containers/ParallaxContainer.cs  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs
index 4cd3934cde..b501e68ba1 100644
--- a/osu.Game/Graphics/Containers/ParallaxContainer.cs
+++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs
@@ -24,6 +24,10 @@ namespace osu.Game.Graphics.Containers
 
         private Bindable<bool> parallaxEnabled;
 
+        private const float parallax_duration = 100;
+
+        private bool firstUpdate = true;
+
         public ParallaxContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -60,17 +64,27 @@ namespace osu.Game.Graphics.Containers
             input = GetContainingInputManager();
         }
 
-        private bool firstUpdate = true;
-
         protected override void Update()
         {
             base.Update();
 
             if (parallaxEnabled.Value)
             {
-                Vector2 offset = (input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.Position) - DrawSize / 2) * ParallaxAmount;
+                Vector2 offset = Vector2.Zero;
 
-                const float parallax_duration = 100;
+                if (input.CurrentState.Mouse != null)
+                {
+                    var sizeDiv2 = DrawSize / 2;
+
+                    Vector2 relativeAmount = ToLocalSpace(input.CurrentState.Mouse.Position) - sizeDiv2;
+
+                    const float base_factor = 0.999f;
+
+                    relativeAmount.X = (float)(Math.Sign(relativeAmount.X) * Interpolation.Damp(0, 1, base_factor, Math.Abs(relativeAmount.X)));
+                    relativeAmount.Y = (float)(Math.Sign(relativeAmount.Y) * Interpolation.Damp(0, 1, base_factor, Math.Abs(relativeAmount.Y)));
+
+                    offset = relativeAmount * sizeDiv2 * ParallaxAmount;
+                }
 
                 double elapsed = Math.Clamp(Clock.ElapsedFrameTime, 0, parallax_duration);
 

From fca6b15d2fa3fcfeec85cd3336aa181be6e1ffbb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 16:05:45 +0900
Subject: [PATCH 07686/10326] Fix local echo messages remaining permanently
 dimmed when chatting via multiplayer

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

diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 4eb348ae33..f43420e35e 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -190,13 +190,13 @@ namespace osu.Game.Overlays.Chat
                     }
                 }
             };
-
-            updateMessageContent();
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
+            updateMessageContent();
             FinishTransforms(true);
         }
 

From bfabb1fdea25412c24088185fc0ed2c3e8a7f40c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 16:50:22 +0900
Subject: [PATCH 07687/10326] Change offset value to 10%

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

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 6ed161fa77..16bc6e4fc5 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -110,8 +110,8 @@ namespace osu.Game.Graphics.Containers
 
         /// <summary>
         /// The percentage of the container to consider the centre-point for deciding the active section (and scrolling to a requested section).
-        /// </summary>
-        private const float scroll_y_centre = 0.2f;
+        /// </summar>
+        private const float scroll_y_centre = 0.1f;
 
         public SectionsContainer()
         {

From a5f7ca485bfeeb38d88f113c6afe1bba6c49ba3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 16:53:31 +0900
Subject: [PATCH 07688/10326] Fix unintended xmldoc tag edit

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

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 16bc6e4fc5..741fc17695 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Graphics.Containers
 
         /// <summary>
         /// The percentage of the container to consider the centre-point for deciding the active section (and scrolling to a requested section).
-        /// </summar>
+        /// </summary>
         private const float scroll_y_centre = 0.1f;
 
         public SectionsContainer()

From a9c8f9bd4aebe9929007a89bdb5a938aa1541077 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 17:47:38 +0900
Subject: [PATCH 07689/10326] Fix a potential crash when exiting the editor
 before a new beatmap is added to the database

---
 osu.Game/Screens/Edit/Editor.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b7ebf0c0a4..66fe1a9507 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -109,7 +110,16 @@ namespace osu.Game.Screens.Edit
             if (Beatmap.Value is DummyWorkingBeatmap)
             {
                 isNewBeatmap = true;
-                Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
+
+                var newBeatmap = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
+
+                // this is a bit haphazard, but guards against setting the lease Beatmap bindable if
+                // the editor has already been exited.
+                if (!ValidForPush)
+                    return;
+
+                // this probably shouldn't be set in the asynchronous load method, but everything following relies on it.
+                Beatmap.Value = newBeatmap;
             }
 
             beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;

From b44bd8c4eea20cb3338c3f85e639a7472b6f5262 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 18:03:33 +0900
Subject: [PATCH 07690/10326] Remove unused using statement

---
 osu.Game/Screens/Edit/Editor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 66fe1a9507..a49de3b887 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;

From e0f8f6a23f64b584e5592a39e81e21e5e555195a Mon Sep 17 00:00:00 2001
From: Mysfit <mysfit@mysfit.dev>
Date: Fri, 22 Jan 2021 12:09:40 -0500
Subject: [PATCH 07691/10326] introduce overrideable bool instead of copying
 event logic entirely

---
 osu.Game/Skinning/PausableSkinnableSound.cs   | 58 +++++++++----------
 .../Drawables/DrawableStoryboardSample.cs     | 15 +----
 2 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index b48cf5d448..6245bcae02 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
-        private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+        protected virtual bool AllowNonLoopingCutOff => false;
 
         public PausableSkinnableSound()
         {
@@ -34,6 +34,8 @@ namespace osu.Game.Skinning
         {
         }
 
+        private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
         private ScheduledDelegate scheduledStart;
 
         [BackgroundDependencyLoader(true)]
@@ -43,28 +45,34 @@ namespace osu.Game.Skinning
             if (samplePlaybackDisabler != null)
             {
                 samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
-                samplePlaybackDisabled.BindValueChanged(SamplePlaybackDisabledChanged);
+                samplePlaybackDisabled.BindValueChanged(disabled =>
+                {
+                    if (!RequestedPlaying) return;
+
+                    // if the sample is non-looping, and non-looping cut off is not allowed,
+                    // let the sample play out to completion (sounds better than abruptly cutting off).
+                    if (!Looping && !AllowNonLoopingCutOff) return;
+
+                    cancelPendingStart();
+
+                    if (disabled.NewValue)
+                        base.Stop();
+                    else
+                    {
+                        // schedule so we don't start playing a sample which is no longer alive.
+                        scheduledStart = Schedule(() =>
+                        {
+                            if (RequestedPlaying)
+                                base.Play();
+                        });
+                    }
+                });
             }
         }
 
-        protected virtual void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
-        {
-            if (!RequestedPlaying) return;
-
-            // let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
-            if (!Looping) return;
-
-            CancelPendingStart();
-
-            if (disabled.NewValue)
-                base.Stop();
-            else
-                ScheduleStart();
-        }
-
         public override void Play(bool restart = true)
         {
-            CancelPendingStart();
+            cancelPendingStart();
             RequestedPlaying = true;
 
             if (samplePlaybackDisabled.Value)
@@ -75,25 +83,15 @@ namespace osu.Game.Skinning
 
         public override void Stop()
         {
-            CancelPendingStart();
+            cancelPendingStart();
             RequestedPlaying = false;
             base.Stop();
         }
 
-        protected void CancelPendingStart()
+        private void cancelPendingStart()
         {
             scheduledStart?.Cancel();
             scheduledStart = null;
         }
-
-        protected void ScheduleStart()
-        {
-            // schedule so we don't start playing a sample which is no longer alive.
-            scheduledStart = Schedule(() =>
-            {
-                if (RequestedPlaying)
-                    base.Play();
-            });
-        }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index d5e1e19666..ebdf64e7ba 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
+        protected override bool AllowNonLoopingCutOff => true;
+
         public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
             : base(sampleInfo)
         {
@@ -31,19 +33,6 @@ namespace osu.Game.Storyboards.Drawables
         [Resolved]
         private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
-        protected override void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
-        {
-            if (!RequestedPlaying) return;
-
-            if (disabled.NewValue)
-                Stop();
-            else
-            {
-                CancelPendingStart();
-                ScheduleStart();
-            }
-        }
-
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);

From 6379381f957c9194050f9ae5f47d15edba39f802 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 22 Jan 2021 20:46:20 +0300
Subject: [PATCH 07692/10326] Make VotePill background transparent for own
 comments

---
 .../Visual/Online/TestSceneVotePill.cs          | 17 +++++++++++++++--
 osu.Game/Overlays/Comments/VotePill.cs          | 14 ++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
index 9bb29541ec..420f6b1ab6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
@@ -7,6 +7,7 @@ using osu.Game.Overlays.Comments;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -16,13 +17,14 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private VotePill votePill;
+        private TestPill votePill;
 
         [Test]
         public void TestUserCommentPill()
         {
             AddStep("Log in", logIn);
             AddStep("User comment", () => addVotePill(getUserComment()));
+            AddAssert("Background is transparent", () => votePill.Background.Alpha == 0);
             AddStep("Click", () => votePill.Click());
             AddAssert("Not loading", () => !votePill.IsLoading);
         }
@@ -32,6 +34,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("Log in", logIn);
             AddStep("Random comment", () => addVotePill(getRandomComment()));
+            AddAssert("Background is not transparent", () => votePill.Background.Alpha == 1);
             AddStep("Click", () => votePill.Click());
             AddAssert("Loading", () => votePill.IsLoading);
         }
@@ -64,11 +67,21 @@ namespace osu.Game.Tests.Visual.Online
         private void addVotePill(Comment comment)
         {
             Clear();
-            Add(votePill = new VotePill(comment)
+            Add(votePill = new TestPill(comment)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             });
         }
+
+        private class TestPill : VotePill
+        {
+            public new Box Background => base.Background;
+
+            public TestPill(Comment comment)
+                : base(comment)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/VotePill.cs b/osu.Game/Overlays/Comments/VotePill.cs
index aa9723ea85..b6e6aa82c7 100644
--- a/osu.Game/Overlays/Comments/VotePill.cs
+++ b/osu.Game/Overlays/Comments/VotePill.cs
@@ -36,8 +36,10 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
+        protected Box Background { get; private set; }
+
         private readonly Comment comment;
-        private Box background;
+
         private Box hoverLayer;
         private CircularContainer borderContainer;
         private SpriteText sideNumber;
@@ -62,8 +64,12 @@ namespace osu.Game.Overlays.Comments
             AccentColour = borderContainer.BorderColour = sideNumber.Colour = colours.GreenLight;
             hoverLayer.Colour = Color4.Black.Opacity(0.5f);
 
-            if (api.IsLoggedIn && api.LocalUser.Value.Id != comment.UserId)
+            var ownComment = api.LocalUser.Value.Id == comment.UserId;
+
+            if (api.IsLoggedIn && !ownComment)
                 Action = onAction;
+
+            Background.Alpha = ownComment ? 0 : 1;
         }
 
         protected override void LoadComplete()
@@ -71,7 +77,7 @@ namespace osu.Game.Overlays.Comments
             base.LoadComplete();
             isVoted.Value = comment.IsVoted;
             votesCount.Value = comment.VotesCount;
-            isVoted.BindValueChanged(voted => background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
+            isVoted.BindValueChanged(voted => Background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
             votesCount.BindValueChanged(count => votesCounter.Text = $"+{count.NewValue}", true);
         }
 
@@ -102,7 +108,7 @@ namespace osu.Game.Overlays.Comments
                     Masking = true,
                     Children = new Drawable[]
                     {
-                        background = new Box
+                        Background = new Box
                         {
                             RelativeSizeAxes = Axes.Both
                         },

From 61fcb486a8c7aea90c40b2c9f881fcc295f7b8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 22 Jan 2021 19:47:38 +0100
Subject: [PATCH 07693/10326] Trim unnecessary parentheses

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

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 741fc17695..624ec70cb6 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Graphics.Containers
         {
             base.UpdateAfterChildren();
 
-            float fixedHeaderSize = (FixedHeader?.LayoutSize.Y ?? 0);
+            float fixedHeaderSize = FixedHeader?.LayoutSize.Y ?? 0;
             float expandableHeaderSize = ExpandableHeader?.LayoutSize.Y ?? 0;
 
             float headerH = expandableHeaderSize + fixedHeaderSize;

From 20161aea6a472320f34ff0e8057d08a0cdea527d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 22 Jan 2021 21:47:53 +0300
Subject: [PATCH 07694/10326] Show LoginOverlay if not logged-in when clicking
 on a pill

---
 .../Visual/Online/TestSceneVotePill.cs        | 32 ++++++++++++++++---
 osu.Game/Overlays/Comments/VotePill.cs        | 11 ++++++-
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
index 420f6b1ab6..e9e826e62f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
@@ -8,6 +8,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -17,11 +18,30 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
+        [Cached]
+        private LoginOverlay login;
+
         private TestPill votePill;
+        private readonly Container pillContainer;
+
+        public TestSceneVotePill()
+        {
+            AddRange(new Drawable[]
+            {
+                pillContainer = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AutoSizeAxes = Axes.Both
+                },
+                login = new LoginOverlay()
+            });
+        }
 
         [Test]
         public void TestUserCommentPill()
         {
+            AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("User comment", () => addVotePill(getUserComment()));
             AddAssert("Background is transparent", () => votePill.Background.Alpha == 0);
@@ -32,9 +52,10 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestRandomCommentPill()
         {
+            AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("Random comment", () => addVotePill(getRandomComment()));
-            AddAssert("Background is not transparent", () => votePill.Background.Alpha == 1);
+            AddAssert("Background is visible", () => votePill.Background.Alpha == 1);
             AddStep("Click", () => votePill.Click());
             AddAssert("Loading", () => votePill.IsLoading);
         }
@@ -42,10 +63,11 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestOfflineRandomCommentPill()
         {
+            AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log out", API.Logout);
             AddStep("Random comment", () => addVotePill(getRandomComment()));
             AddStep("Click", () => votePill.Click());
-            AddAssert("Not loading", () => !votePill.IsLoading);
+            AddAssert("Login overlay is visible", () => login.State.Value == Visibility.Visible);
         }
 
         private void logIn() => API.Login("localUser", "password");
@@ -66,12 +88,12 @@ namespace osu.Game.Tests.Visual.Online
 
         private void addVotePill(Comment comment)
         {
-            Clear();
-            Add(votePill = new TestPill(comment)
+            pillContainer.Clear();
+            pillContainer.Child = votePill = new TestPill(comment)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-            });
+            };
         }
 
         private class TestPill : VotePill
diff --git a/osu.Game/Overlays/Comments/VotePill.cs b/osu.Game/Overlays/Comments/VotePill.cs
index b6e6aa82c7..cf3c470f96 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(canBeNull: true)]
+        private LoginOverlay login { get; set; }
+
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
@@ -66,7 +69,7 @@ namespace osu.Game.Overlays.Comments
 
             var ownComment = api.LocalUser.Value.Id == comment.UserId;
 
-            if (api.IsLoggedIn && !ownComment)
+            if (!ownComment)
                 Action = onAction;
 
             Background.Alpha = ownComment ? 0 : 1;
@@ -83,6 +86,12 @@ namespace osu.Game.Overlays.Comments
 
         private void onAction()
         {
+            if (!api.IsLoggedIn)
+            {
+                login?.Show();
+                return;
+            }
+
             request = new CommentVoteRequest(comment.Id, isVoted.Value ? CommentVoteAction.UnVote : CommentVoteAction.Vote);
             request.Success += onSuccess;
             api.Queue(request);

From f3192877fee57db6f29d84faa208d10d1bdf41b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 22 Jan 2021 19:48:33 +0100
Subject: [PATCH 07695/10326] Update outdated comment

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

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 624ec70cb6..8ab146efe7 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -217,7 +217,7 @@ namespace osu.Game.Graphics.Containers
 
                 var smallestSectionHeight = Children.Count > 0 ? Children.Min(d => d.Height) : 0;
 
-                // scroll offset is our fixed header height if we have it plus 20% of content height
+                // scroll offset is our fixed header height if we have it plus 10% of content height
                 // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
                 float selectionLenienceAboveSection = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);

From 3d42cc1f9199715990aa25c234a15885a87ec09a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 22 Jan 2021 22:27:26 +0300
Subject: [PATCH 07696/10326] Minor refactoring

---
 .../Visual/Online/TestSceneVotePill.cs        | 19 ++-----
 osu.Game/Overlays/Comments/VotePill.cs        | 53 ++++++++-----------
 2 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
index e9e826e62f..6334c014c8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
@@ -7,7 +7,6 @@ using osu.Game.Overlays.Comments;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Tests.Visual.Online
@@ -21,7 +20,7 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private LoginOverlay login;
 
-        private TestPill votePill;
+        private VotePill votePill;
         private readonly Container pillContainer;
 
         public TestSceneVotePill()
@@ -44,7 +43,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("User comment", () => addVotePill(getUserComment()));
-            AddAssert("Background is transparent", () => votePill.Background.Alpha == 0);
+            AddAssert("Is disabled", () => !votePill.Enabled.Value);
             AddStep("Click", () => votePill.Click());
             AddAssert("Not loading", () => !votePill.IsLoading);
         }
@@ -55,7 +54,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("Random comment", () => addVotePill(getRandomComment()));
-            AddAssert("Background is visible", () => votePill.Background.Alpha == 1);
+            AddAssert("Is enabled", () => votePill.Enabled.Value);
             AddStep("Click", () => votePill.Click());
             AddAssert("Loading", () => votePill.IsLoading);
         }
@@ -89,21 +88,11 @@ namespace osu.Game.Tests.Visual.Online
         private void addVotePill(Comment comment)
         {
             pillContainer.Clear();
-            pillContainer.Child = votePill = new TestPill(comment)
+            pillContainer.Child = votePill = new VotePill(comment)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
         }
-
-        private class TestPill : VotePill
-        {
-            public new Box Background => base.Background;
-
-            public TestPill(Comment comment)
-                : base(comment)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/VotePill.cs b/osu.Game/Overlays/Comments/VotePill.cs
index cf3c470f96..04a0508f3d 100644
--- a/osu.Game/Overlays/Comments/VotePill.cs
+++ b/osu.Game/Overlays/Comments/VotePill.cs
@@ -39,10 +39,9 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        protected Box Background { get; private set; }
-
+        private bool isOwnComment;
         private readonly Comment comment;
-
+        private Box background;
         private Box hoverLayer;
         private CircularContainer borderContainer;
         private SpriteText sideNumber;
@@ -64,15 +63,14 @@ namespace osu.Game.Overlays.Comments
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
+            isOwnComment = api.LocalUser.Value.Id == comment.UserId;
+            Action = onAction;
+
             AccentColour = borderContainer.BorderColour = sideNumber.Colour = colours.GreenLight;
             hoverLayer.Colour = Color4.Black.Opacity(0.5f);
+            background.Alpha = isOwnComment ? 0 : 1;
 
-            var ownComment = api.LocalUser.Value.Id == comment.UserId;
-
-            if (!ownComment)
-                Action = onAction;
-
-            Background.Alpha = ownComment ? 0 : 1;
+            Enabled.Value = !isOwnComment;
         }
 
         protected override void LoadComplete()
@@ -80,7 +78,7 @@ namespace osu.Game.Overlays.Comments
             base.LoadComplete();
             isVoted.Value = comment.IsVoted;
             votesCount.Value = comment.VotesCount;
-            isVoted.BindValueChanged(voted => Background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
+            isVoted.BindValueChanged(voted => background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
             votesCount.BindValueChanged(count => votesCounter.Text = $"+{count.NewValue}", true);
         }
 
@@ -117,7 +115,7 @@ namespace osu.Game.Overlays.Comments
                     Masking = true,
                     Children = new Drawable[]
                     {
-                        Background = new Box
+                        background = new Box
                         {
                             RelativeSizeAxes = Axes.Both
                         },
@@ -151,55 +149,48 @@ namespace osu.Game.Overlays.Comments
         protected override void OnLoadStarted()
         {
             votesCounter.FadeOut(duration, Easing.OutQuint);
-            updateDisplay();
+            updateDisplay(false);
         }
 
         protected override void OnLoadFinished()
         {
             votesCounter.FadeIn(duration, Easing.OutQuint);
-
-            if (IsHovered)
-                onHoverAction();
+            updateDisplay(IsHovered);
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            onHoverAction();
+            if (!isOwnComment && !IsLoading)
+                updateDisplay(true);
+
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            updateDisplay();
+            if (!isOwnComment && !IsLoading)
+                updateDisplay(false);
+
             base.OnHoverLost(e);
         }
 
-        private void updateDisplay()
+        private void updateDisplay(bool isHovered)
         {
-            if (Action == null)
-                return;
-
             if (isVoted.Value)
             {
-                hoverLayer.FadeTo(IsHovered ? 1 : 0);
+                hoverLayer.FadeTo(isHovered ? 1 : 0);
                 sideNumber.Hide();
             }
             else
-                sideNumber.FadeTo(IsHovered ? 1 : 0);
+                sideNumber.FadeTo(isHovered ? 1 : 0);
 
-            borderContainer.BorderThickness = IsHovered ? 3 : 0;
-        }
-
-        private void onHoverAction()
-        {
-            if (!IsLoading)
-                updateDisplay();
+            borderContainer.BorderThickness = isHovered ? 3 : 0;
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            base.Dispose(isDisposing);
             request?.Cancel();
+            base.Dispose(isDisposing);
         }
     }
 }

From b692abd3c2574cacd5d41033e979f431069187e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 22 Jan 2021 20:17:21 +0100
Subject: [PATCH 07697/10326] Simplify condition from two to one operand

---
 osu.Game/Skinning/PausableSkinnableSound.cs         | 13 ++++++++-----
 .../Drawables/DrawableStoryboardSample.cs           |  6 +++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 6245bcae02..d8149e76c0 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,7 +18,13 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
-        protected virtual bool AllowNonLoopingCutOff => false;
+        /// <summary>
+        /// Whether this <see cref="PausableSkinnableSound"/> is affected by
+        /// a higher-level <see cref="ISamplePlaybackDisabler"/>'s state changes.
+        /// By default only looping samples are started/stopped on sample disable
+        /// to prevent one-time samples from cutting off abruptly.
+        /// </summary>
+        protected virtual bool AffectedBySamplePlaybackDisable => Looping;
 
         public PausableSkinnableSound()
         {
@@ -48,10 +54,7 @@ namespace osu.Game.Skinning
                 samplePlaybackDisabled.BindValueChanged(disabled =>
                 {
                     if (!RequestedPlaying) return;
-
-                    // if the sample is non-looping, and non-looping cut off is not allowed,
-                    // let the sample play out to completion (sounds better than abruptly cutting off).
-                    if (!Looping && !AllowNonLoopingCutOff) return;
+                    if (!AffectedBySamplePlaybackDisable) return;
 
                     cancelPendingStart();
 
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index ebdf64e7ba..5a800a71fd 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -21,7 +21,11 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
-        protected override bool AllowNonLoopingCutOff => true;
+        /// <remarks>
+        /// Contrary to <see cref="PausableSkinnableSound"/>, all <see cref="DrawableStoryboardSample"/>s are affected
+        /// by sample disables, as they are oftentimes longer-running sound effects. This also matches stable behaviour.
+        /// </remarks>
+        protected override bool AffectedBySamplePlaybackDisable => true;
 
         public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
             : base(sampleInfo)

From e9d10bb6e7bf9d9e48d25263cdc7c8f696b9a27a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 22 Jan 2021 22:49:49 +0300
Subject: [PATCH 07698/10326] Revert "Minor refactoring"

This reverts commit 3d42cc1f9199715990aa25c234a15885a87ec09a.
---
 .../Visual/Online/TestSceneVotePill.cs        | 19 +++++--
 osu.Game/Overlays/Comments/VotePill.cs        | 53 +++++++++++--------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
index 6334c014c8..e9e826e62f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
@@ -7,6 +7,7 @@ using osu.Game.Overlays.Comments;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Tests.Visual.Online
@@ -20,7 +21,7 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private LoginOverlay login;
 
-        private VotePill votePill;
+        private TestPill votePill;
         private readonly Container pillContainer;
 
         public TestSceneVotePill()
@@ -43,7 +44,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("User comment", () => addVotePill(getUserComment()));
-            AddAssert("Is disabled", () => !votePill.Enabled.Value);
+            AddAssert("Background is transparent", () => votePill.Background.Alpha == 0);
             AddStep("Click", () => votePill.Click());
             AddAssert("Not loading", () => !votePill.IsLoading);
         }
@@ -54,7 +55,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("Random comment", () => addVotePill(getRandomComment()));
-            AddAssert("Is enabled", () => votePill.Enabled.Value);
+            AddAssert("Background is visible", () => votePill.Background.Alpha == 1);
             AddStep("Click", () => votePill.Click());
             AddAssert("Loading", () => votePill.IsLoading);
         }
@@ -88,11 +89,21 @@ namespace osu.Game.Tests.Visual.Online
         private void addVotePill(Comment comment)
         {
             pillContainer.Clear();
-            pillContainer.Child = votePill = new VotePill(comment)
+            pillContainer.Child = votePill = new TestPill(comment)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
         }
+
+        private class TestPill : VotePill
+        {
+            public new Box Background => base.Background;
+
+            public TestPill(Comment comment)
+                : base(comment)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/VotePill.cs b/osu.Game/Overlays/Comments/VotePill.cs
index 04a0508f3d..cf3c470f96 100644
--- a/osu.Game/Overlays/Comments/VotePill.cs
+++ b/osu.Game/Overlays/Comments/VotePill.cs
@@ -39,9 +39,10 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        private bool isOwnComment;
+        protected Box Background { get; private set; }
+
         private readonly Comment comment;
-        private Box background;
+
         private Box hoverLayer;
         private CircularContainer borderContainer;
         private SpriteText sideNumber;
@@ -63,14 +64,15 @@ namespace osu.Game.Overlays.Comments
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            isOwnComment = api.LocalUser.Value.Id == comment.UserId;
-            Action = onAction;
-
             AccentColour = borderContainer.BorderColour = sideNumber.Colour = colours.GreenLight;
             hoverLayer.Colour = Color4.Black.Opacity(0.5f);
-            background.Alpha = isOwnComment ? 0 : 1;
 
-            Enabled.Value = !isOwnComment;
+            var ownComment = api.LocalUser.Value.Id == comment.UserId;
+
+            if (!ownComment)
+                Action = onAction;
+
+            Background.Alpha = ownComment ? 0 : 1;
         }
 
         protected override void LoadComplete()
@@ -78,7 +80,7 @@ namespace osu.Game.Overlays.Comments
             base.LoadComplete();
             isVoted.Value = comment.IsVoted;
             votesCount.Value = comment.VotesCount;
-            isVoted.BindValueChanged(voted => background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
+            isVoted.BindValueChanged(voted => Background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
             votesCount.BindValueChanged(count => votesCounter.Text = $"+{count.NewValue}", true);
         }
 
@@ -115,7 +117,7 @@ namespace osu.Game.Overlays.Comments
                     Masking = true,
                     Children = new Drawable[]
                     {
-                        background = new Box
+                        Background = new Box
                         {
                             RelativeSizeAxes = Axes.Both
                         },
@@ -149,48 +151,55 @@ namespace osu.Game.Overlays.Comments
         protected override void OnLoadStarted()
         {
             votesCounter.FadeOut(duration, Easing.OutQuint);
-            updateDisplay(false);
+            updateDisplay();
         }
 
         protected override void OnLoadFinished()
         {
             votesCounter.FadeIn(duration, Easing.OutQuint);
-            updateDisplay(IsHovered);
+
+            if (IsHovered)
+                onHoverAction();
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            if (!isOwnComment && !IsLoading)
-                updateDisplay(true);
-
+            onHoverAction();
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            if (!isOwnComment && !IsLoading)
-                updateDisplay(false);
-
+            updateDisplay();
             base.OnHoverLost(e);
         }
 
-        private void updateDisplay(bool isHovered)
+        private void updateDisplay()
         {
+            if (Action == null)
+                return;
+
             if (isVoted.Value)
             {
-                hoverLayer.FadeTo(isHovered ? 1 : 0);
+                hoverLayer.FadeTo(IsHovered ? 1 : 0);
                 sideNumber.Hide();
             }
             else
-                sideNumber.FadeTo(isHovered ? 1 : 0);
+                sideNumber.FadeTo(IsHovered ? 1 : 0);
 
-            borderContainer.BorderThickness = isHovered ? 3 : 0;
+            borderContainer.BorderThickness = IsHovered ? 3 : 0;
+        }
+
+        private void onHoverAction()
+        {
+            if (!IsLoading)
+                updateDisplay();
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            request?.Cancel();
             base.Dispose(isDisposing);
+            request?.Cancel();
         }
     }
 }

From adcef19ab25953f003bc150654798f82e739a7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 15:44:30 +0100
Subject: [PATCH 07699/10326] Add coverage for operation tracker with failing
 tests

---
 .../NonVisual/OngoingOperationTrackerTest.cs  | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs

diff --git a/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
new file mode 100644
index 0000000000..b2be83d1f9
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
@@ -0,0 +1,62 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Framework.Testing;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [HeadlessTest]
+    public class OngoingOperationTrackerTest : OsuTestScene
+    {
+        private OngoingOperationTracker tracker;
+        private IBindable<bool> operationInProgress;
+
+        [SetUpSteps]
+        public void SetUp()
+        {
+            AddStep("create tracker", () => Child = tracker = new OngoingOperationTracker());
+            AddStep("bind to operation status", () => operationInProgress = tracker.InProgress.GetBoundCopy());
+        }
+
+        [Test]
+        public void TestOperationTracking()
+        {
+            IDisposable firstOperation = null;
+            IDisposable secondOperation = null;
+
+            AddStep("begin first operation", () => firstOperation = tracker.BeginOperation());
+            AddAssert("operation in progress", () => operationInProgress.Value);
+
+            AddStep("cannot start another operation",
+                () => Assert.Throws<InvalidOperationException>(() => tracker.BeginOperation()));
+
+            AddStep("end first operation", () => firstOperation.Dispose());
+            AddAssert("operation is ended", () => !operationInProgress.Value);
+
+            AddStep("start second operation", () => secondOperation = tracker.BeginOperation());
+            AddAssert("operation in progress", () => operationInProgress.Value);
+
+            AddStep("dispose first operation again", () => firstOperation.Dispose());
+            AddAssert("operation in progress", () => operationInProgress.Value);
+
+            AddStep("dispose second operation", () => secondOperation.Dispose());
+            AddAssert("operation is ended", () => !operationInProgress.Value);
+        }
+
+        [Test]
+        public void TestOperationDisposalAfterTracker()
+        {
+            IDisposable operation = null;
+
+            AddStep("begin operation", () => operation = tracker.BeginOperation());
+            AddStep("dispose tracker", () => tracker.Expire());
+            AddStep("end operation", () => operation.Dispose());
+            AddAssert("operation is ended", () => !operationInProgress.Value);
+        }
+    }
+}

From 18b309a195e9aea1890a726dc1c77ed1f2e7afdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 16:02:51 +0100
Subject: [PATCH 07700/10326] Make disposal of tracker operation idempotent

---
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index 5c9e9ce90b..b834d4fa25 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -49,10 +49,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void endOperation()
         {
-            if (leasedInProgress == null)
-                throw new InvalidOperationException("Cannot end operation multiple times.");
-
-            leasedInProgress.Return();
+            leasedInProgress?.Return();
             leasedInProgress = null;
         }
     }

From 7f89d9117d98f593209bc90271dd099a2febbcfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 16:04:12 +0100
Subject: [PATCH 07701/10326] Make disposal of tracker idempotent for
 operations

---
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index b834d4fa25..5d171e6e43 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -52,5 +52,13 @@ namespace osu.Game.Screens.OnlinePlay
             leasedInProgress?.Return();
             leasedInProgress = null;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            // base call does an UnbindAllBindables().
+            // clean up the leased reference here so that it doesn't get returned twice.
+            leasedInProgress = null;
+        }
     }
 }

From d22f557a3bd074ff4ee29128f7d8a3375dece37d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 16:14:58 +0100
Subject: [PATCH 07702/10326] Remove possibility of double-disposal
 interference

---
 .../OnlinePlay/OngoingOperationTracker.cs     | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index 5d171e6e43..060f1d7b91 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.OnlinePlay
             leasedInProgress.Value = true;
 
             // for extra safety, marshal the end of operation back to the update thread if necessary.
-            return new InvokeOnDisposal(() => Scheduler.Add(endOperation, false));
+            return new OngoingOperation(() => Scheduler.Add(endOperation, false));
         }
 
         private void endOperation()
@@ -60,5 +60,26 @@ namespace osu.Game.Screens.OnlinePlay
             // clean up the leased reference here so that it doesn't get returned twice.
             leasedInProgress = null;
         }
+
+        private class OngoingOperation : InvokeOnDisposal
+        {
+            private bool isDisposed;
+
+            public OngoingOperation(Action action)
+                : base(action)
+            {
+            }
+
+            public override void Dispose()
+            {
+                // base class does not check disposal state for performance reasons which aren't relevant here.
+                // track locally, to avoid interfering with other operations in case of a potential double-disposal.
+                if (isDisposed)
+                    return;
+
+                base.Dispose();
+                isDisposed = true;
+            }
+        }
     }
 }

From c30b700b3a320d070ceebac14e3f43cdd770661c Mon Sep 17 00:00:00 2001
From: yhsphd <yhsphd05@gmail.com>
Date: Sun, 24 Jan 2021 00:26:52 +0900
Subject: [PATCH 07703/10326] "started" for past matches

fixes grammar error at 'coming up next' section in schedule screen which displays schedule like "starting an hour ago" for past matches
---
 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 88289ad6bd..b3fa9dc91c 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -194,7 +194,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                                         {
                                             new TournamentSpriteText
                                             {
-                                                Text = "Starting ",
+                                                Text = match.NewValue.Date.Value.CompareTo(DateTimeOffset.Now) > 0 ? "Starting " : "Started ",
                                                 Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
                                             },
                                             new DrawableDate(match.NewValue.Date.Value)

From 899942611fcb085fc09226c84a7bbbd47500450f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 17:01:47 +0100
Subject: [PATCH 07704/10326] Add tests for time display

---
 .../Screens/TestSceneScheduleScreen.cs        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index b240ef3ae5..0da8d1eb4a 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Tournament.Components;
@@ -16,5 +18,23 @@ namespace osu.Game.Tournament.Tests.Screens
             Add(new TourneyVideo("main") { RelativeSizeAxes = Axes.Both });
             Add(new ScheduleScreen());
         }
+
+        [Test]
+        public void TestCurrentMatchTime()
+        {
+            setMatchDate(TimeSpan.FromDays(-1));
+            setMatchDate(TimeSpan.FromSeconds(5));
+            setMatchDate(TimeSpan.FromMinutes(4));
+            setMatchDate(TimeSpan.FromHours(3));
+        }
+
+        private void setMatchDate(TimeSpan relativeTime)
+            // Humanizer cannot handle negative timespans.
+            => AddStep($"start time is {relativeTime}", () =>
+            {
+                var match = CreateSampleMatch();
+                match.Date.Value = DateTimeOffset.Now + relativeTime;
+                Ladder.CurrentMatch.Value = match;
+            });
     }
 }

From a8fa09103cc0573dff3c0a3f2681293f40f45ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 17:16:13 +0100
Subject: [PATCH 07705/10326] Update match start text prefix in real time

---
 .../Screens/Schedule/ScheduleScreen.cs        | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index b3fa9dc91c..c1d8c8ddd3 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -192,12 +192,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                                         Origin = Anchor.CentreLeft,
                                         Children = new Drawable[]
                                         {
-                                            new TournamentSpriteText
-                                            {
-                                                Text = match.NewValue.Date.Value.CompareTo(DateTimeOffset.Now) > 0 ? "Starting " : "Started ",
-                                                Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
-                                            },
-                                            new DrawableDate(match.NewValue.Date.Value)
+                                            new ScheduleMatchDate(match.NewValue.Date.Value)
                                             {
                                                 Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
                                             }
@@ -251,6 +246,18 @@ namespace osu.Game.Tournament.Screens.Schedule
             }
         }
 
+        public class ScheduleMatchDate : DrawableDate
+        {
+            public ScheduleMatchDate(DateTimeOffset date, float textSize = OsuFont.DEFAULT_FONT_SIZE, bool italic = true)
+                : base(date, textSize, italic)
+            {
+            }
+
+            protected override string Format() => Date < DateTimeOffset.Now
+                ? $"Started {base.Format()}"
+                : $"Starting {base.Format()}";
+        }
+
         public class ScheduleContainer : Container
         {
             protected override Container<Drawable> Content => content;

From d83abfa7d2cbcfcdb2922f1756a3b2b8fac18ff5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Jan 2021 23:29:32 +0300
Subject: [PATCH 07706/10326] Add test scene with failing test case

---
 .../TestSceneUpdateableBeatmapSetCover.cs     | 130 ++++++++++++++++++
 .../Drawables/UpdateableBeatmapSetCover.cs    |  14 +-
 2 files changed, 137 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
new file mode 100644
index 0000000000..7daaae45a4
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -0,0 +1,130 @@
+// Copyright (c) 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.Threading;
+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.Beatmaps.Drawables;
+using osu.Game.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneUpdateableBeatmapSetCover : OsuTestScene
+    {
+        [Test]
+        public void TestLocal([Values] BeatmapSetCoverType coverType)
+        {
+            AddStep("setup cover", () => Child = new UpdateableBeatmapSetCover
+            {
+                CoverType = coverType,
+                BeatmapSet = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet,
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+            });
+
+            AddUntilStep("wait for load", () => this.ChildrenOfType<BeatmapSetCover>().SingleOrDefault()?.IsLoaded ?? false);
+        }
+
+        [Test]
+        public void TestUnloadAndReload()
+        {
+            OsuScrollContainer scroll = null;
+            List<UpdateableBeatmapSetCover> covers = new List<UpdateableBeatmapSetCover>();
+
+            AddStep("setup covers", () =>
+            {
+                BeatmapSetInfo setInfo = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet;
+
+                FillFlowContainer fillFlow;
+
+                Child = scroll = new OsuScrollContainer
+                {
+                    Size = new Vector2(500f),
+                    Child = fillFlow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(10),
+                        Padding = new MarginPadding { Bottom = 550 }
+                    }
+                };
+
+                var coverTypes = Enum.GetValues<BeatmapSetCoverType>();
+
+                for (int i = 0; i < 25; i++)
+                {
+                    var coverType = coverTypes[i % coverTypes.Length];
+
+                    var cover = new UpdateableBeatmapSetCover
+                    {
+                        CoverType = coverType,
+                        BeatmapSet = setInfo,
+                        Height = 100,
+                        Masking = true,
+                    };
+
+                    if (coverType == BeatmapSetCoverType.Cover)
+                        cover.Width = 500;
+                    else if (coverType == BeatmapSetCoverType.Card)
+                        cover.Width = 400;
+                    else if (coverType == BeatmapSetCoverType.List)
+                        cover.Size = new Vector2(100, 50);
+
+                    fillFlow.Add(cover);
+                    covers.Add(cover);
+                }
+            });
+
+            var loadedCovers = covers.Where(c => c.ChildrenOfType<BeatmapSetCover>().SingleOrDefault()?.IsLoaded ?? false);
+
+            AddUntilStep("some loaded", () => loadedCovers.Any());
+            AddStep("scroll to end", () => scroll.ScrollToEnd());
+            AddUntilStep("all unloaded", () => !loadedCovers.Any());
+        }
+
+        [Test]
+        public void TestSetNullBeatmapWhileLoading()
+        {
+            TestUpdateableBeatmapSetCover updateableCover = null;
+
+            AddStep("setup cover", () => Child = updateableCover = new TestUpdateableBeatmapSetCover
+            {
+                BeatmapSet = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet,
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+            });
+
+            AddStep("change model", () => updateableCover.BeatmapSet = null);
+            AddWaitStep("wait some", 5);
+            AddAssert("no cover added", () => !updateableCover.ChildrenOfType<DelayedLoadUnloadWrapper>().Any());
+        }
+
+        private class TestUpdateableBeatmapSetCover : UpdateableBeatmapSetCover
+        {
+            protected override BeatmapSetCover CreateBeatmapSetCover(BeatmapSetInfo beatmapSet, BeatmapSetCoverType coverType) => new TestBeatmapSetCover(beatmapSet, coverType);
+        }
+
+        private class TestBeatmapSetCover : BeatmapSetCover
+        {
+            public TestBeatmapSetCover(BeatmapSetInfo set, BeatmapSetCoverType type = BeatmapSetCoverType.Cover)
+                : base(set, type)
+            {
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Thread.Sleep(10000);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index 6c229755e7..4b0430381b 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -59,6 +59,8 @@ namespace osu.Game.Beatmaps.Drawables
             updateCover();
         }
 
+        protected virtual BeatmapSetCover CreateBeatmapSetCover(BeatmapSetInfo beatmapSet, BeatmapSetCoverType coverType) => new BeatmapSetCover(beatmapSet, coverType);
+
         private void updateCover()
         {
             displayedCover?.FadeOut(400);
@@ -69,13 +71,11 @@ namespace osu.Game.Beatmaps.Drawables
             {
                 Add(displayedCover = new DelayedLoadUnloadWrapper(() =>
                 {
-                    var cover = new BeatmapSetCover(beatmapSet, coverType)
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        FillMode = FillMode.Fill,
-                    };
+                    var cover = CreateBeatmapSetCover(beatmapSet, coverType);
+                    cover.Anchor = Anchor.Centre;
+                    cover.Origin = Anchor.Centre;
+                    cover.RelativeSizeAxes = Axes.Both;
+                    cover.FillMode = FillMode.Fill;
                     cover.OnLoadComplete += d => d.FadeInFromZero(400, Easing.Out);
                     return cover;
                 }));

From acfb2d2980a99d7f88657db43712a3ed88caaac6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Jan 2021 23:28:46 +0300
Subject: [PATCH 07707/10326] Refactor beatmap set covers into using
 `ModelBackedDrawable<T>`

---
 .../TestSceneUpdateableBeatmapSetCover.cs     | 24 ++++--
 .../Drawables/UpdateableBeatmapSetCover.cs    | 79 ++++++-------------
 .../Historical/DrawableMostPlayedBeatmap.cs   |  3 +-
 3 files changed, 44 insertions(+), 62 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index 7daaae45a4..2ffa7e2668 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -22,9 +22,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestLocal([Values] BeatmapSetCoverType coverType)
         {
-            AddStep("setup cover", () => Child = new UpdateableBeatmapSetCover
+            AddStep("setup cover", () => Child = new UpdateableBeatmapSetCover(coverType)
             {
-                CoverType = coverType,
                 BeatmapSet = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet,
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
@@ -64,9 +63,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 {
                     var coverType = coverTypes[i % coverTypes.Length];
 
-                    var cover = new UpdateableBeatmapSetCover
+                    var cover = new UpdateableBeatmapSetCover(coverType)
                     {
-                        CoverType = coverType,
                         BeatmapSet = setInfo,
                         Height = 100,
                         Masking = true,
@@ -110,13 +108,25 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestUpdateableBeatmapSetCover : UpdateableBeatmapSetCover
         {
-            protected override BeatmapSetCover CreateBeatmapSetCover(BeatmapSetInfo beatmapSet, BeatmapSetCoverType coverType) => new TestBeatmapSetCover(beatmapSet, coverType);
+            protected override Drawable CreateDrawable(BeatmapSetInfo model)
+            {
+                if (model == null)
+                    return null;
+
+                return new TestBeatmapSetCover(model)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode = FillMode.Fill,
+                };
+            }
         }
 
         private class TestBeatmapSetCover : BeatmapSetCover
         {
-            public TestBeatmapSetCover(BeatmapSetInfo set, BeatmapSetCoverType type = BeatmapSetCoverType.Cover)
-                : base(set, type)
+            public TestBeatmapSetCover(BeatmapSetInfo set)
+                : base(set)
             {
             }
 
diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index 4b0430381b..3a4423e42e 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -8,78 +9,50 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Beatmaps.Drawables
 {
-    public class UpdateableBeatmapSetCover : Container
+    public class UpdateableBeatmapSetCover : ModelBackedDrawable<BeatmapSetInfo>
     {
-        private Drawable displayedCover;
-
-        private BeatmapSetInfo beatmapSet;
+        private readonly BeatmapSetCoverType coverType;
 
         public BeatmapSetInfo BeatmapSet
         {
-            get => beatmapSet;
-            set
-            {
-                if (value == beatmapSet) return;
-
-                beatmapSet = value;
-
-                if (IsLoaded)
-                    updateCover();
-            }
+            get => Model;
+            set => Model = value;
         }
 
-        private BeatmapSetCoverType coverType = BeatmapSetCoverType.Cover;
-
-        public BeatmapSetCoverType CoverType
+        public new bool Masking
         {
-            get => coverType;
-            set
-            {
-                if (value == coverType) return;
-
-                coverType = value;
-
-                if (IsLoaded)
-                    updateCover();
-            }
+            get => base.Masking;
+            set => base.Masking = value;
         }
 
-        public UpdateableBeatmapSetCover()
+        public UpdateableBeatmapSetCover(BeatmapSetCoverType coverType = BeatmapSetCoverType.Cover)
         {
-            Child = new Box
+            this.coverType = coverType;
+
+            InternalChild = new Box
             {
                 RelativeSizeAxes = Axes.Both,
                 Colour = OsuColour.Gray(0.2f),
             };
         }
 
-        protected override void LoadComplete()
+        protected override double TransformDuration => 400.0;
+
+        protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
+            => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad);
+
+        protected override Drawable CreateDrawable(BeatmapSetInfo model)
         {
-            base.LoadComplete();
-            updateCover();
-        }
+            if (model == null)
+                return null;
 
-        protected virtual BeatmapSetCover CreateBeatmapSetCover(BeatmapSetInfo beatmapSet, BeatmapSetCoverType coverType) => new BeatmapSetCover(beatmapSet, coverType);
-
-        private void updateCover()
-        {
-            displayedCover?.FadeOut(400);
-            displayedCover?.Expire();
-            displayedCover = null;
-
-            if (beatmapSet != null)
+            return new BeatmapSetCover(model, coverType)
             {
-                Add(displayedCover = new DelayedLoadUnloadWrapper(() =>
-                {
-                    var cover = CreateBeatmapSetCover(beatmapSet, coverType);
-                    cover.Anchor = Anchor.Centre;
-                    cover.Origin = Anchor.Centre;
-                    cover.RelativeSizeAxes = Axes.Both;
-                    cover.FillMode = FillMode.Fill;
-                    cover.OnLoadComplete += d => d.FadeInFromZero(400, Easing.Out);
-                    return cover;
-                }));
-            }
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                FillMode = FillMode.Fill,
+            };
         }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index 5b7c5efbe2..f409411953 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -41,12 +41,11 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         {
             AddRangeInternal(new Drawable[]
             {
-                new UpdateableBeatmapSetCover
+                new UpdateableBeatmapSetCover(BeatmapSetCoverType.List)
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = cover_width,
                     BeatmapSet = beatmap.BeatmapSet,
-                    CoverType = BeatmapSetCoverType.List,
                 },
                 new Container
                 {

From faa221027444b36fd3089888119c39964bbdbe4a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 24 Jan 2021 00:55:45 +0300
Subject: [PATCH 07708/10326] Use old-style Enum.GetValues method for older
 than .NET 5

---
 .../UserInterface/TestSceneUpdateableBeatmapSetCover.cs     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index 2ffa7e2668..2f60fbcda8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -57,11 +57,15 @@ namespace osu.Game.Tests.Visual.UserInterface
                     }
                 };
 
+#if NET5_0
                 var coverTypes = Enum.GetValues<BeatmapSetCoverType>();
+#else
+                var coverTypes = Enum.GetValues(typeof(BeatmapSetCoverType)).Cast<BeatmapSetCoverType>();
+#endif
 
                 for (int i = 0; i < 25; i++)
                 {
-                    var coverType = coverTypes[i % coverTypes.Length];
+                    var coverType = coverTypes.ElementAt(i);
 
                     var cover = new UpdateableBeatmapSetCover(coverType)
                     {

From 85b8b00b8c10ff23ca10169d5ca9940ea67eb1bb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 24 Jan 2021 00:59:16 +0300
Subject: [PATCH 07709/10326] Fix forgotten modulo

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index 2f60fbcda8..0b9bcad9fe 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
                 for (int i = 0; i < 25; i++)
                 {
-                    var coverType = coverTypes.ElementAt(i);
+                    var coverType = coverTypes.ElementAt(i % coverTypes.Count());
 
                     var cover = new UpdateableBeatmapSetCover(coverType)
                     {

From d034728443f395cccc3b0764158ed679a738fb93 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 24 Jan 2021 01:05:45 +0300
Subject: [PATCH 07710/10326] Remove conditional compilation symbols for such
 case

---
 .../UserInterface/TestSceneUpdateableBeatmapSetCover.cs       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index 0b9bcad9fe..ecb076d356 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -57,11 +57,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     }
                 };
 
-#if NET5_0
-                var coverTypes = Enum.GetValues<BeatmapSetCoverType>();
-#else
                 var coverTypes = Enum.GetValues(typeof(BeatmapSetCoverType)).Cast<BeatmapSetCoverType>();
-#endif
 
                 for (int i = 0; i < 25; i++)
                 {

From eaa1519710577df734eb51e003777980fa434c81 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 24 Jan 2021 18:41:45 +0100
Subject: [PATCH 07711/10326] Implement native osu!lazer mod icons for
 tournament

---
 .../Components/TournamentBeatmapPanel.cs      | 98 ++++++++++++++++---
 1 file changed, 86 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 477bf4bd63..7fac2bac71 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -16,6 +16,9 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Tournament.Models;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.Play.HUD;
 using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Components
@@ -124,21 +127,11 @@ namespace osu.Game.Tournament.Components
 
             if (!string.IsNullOrEmpty(mods))
             {
-                AddInternal(new Container
+                AddInternal(new ModSprite
                 {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 60,
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
-                    Margin = new MarginPadding(10),
-                    Child = new Sprite
-                    {
-                        FillMode = FillMode.Fit,
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        Texture = textures.Get($"mods/{mods}"),
-                    }
+                    Mod = mods
                 });
             }
         }
@@ -192,5 +185,86 @@ namespace osu.Game.Tournament.Components
                 Alpha = 1;
             }
         }
+
+        private class ModSprite : Container
+        {
+            public string Mod;
+
+            public ModSprite()
+            {
+                Margin = new MarginPadding(10);
+                Width = 60;
+                RelativeSizeAxes = Axes.Y;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                var texture = textures.Get($"mods/{Mod}");
+
+                if (texture != null)
+                {
+                    Child = new Sprite
+                    {
+                        FillMode = FillMode.Fit,
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Texture = texture
+                    };
+                }
+                else
+                {
+                    Mod selectedMod = null;
+
+                    switch (Mod)
+                    {
+                        case "DT":
+                            selectedMod = new OsuModDoubleTime();
+                            break;
+
+                        case "FL":
+                            selectedMod = new OsuModFlashlight();
+                            break;
+
+                        case "HT":
+                            selectedMod = new OsuModHalfTime();
+                            break;
+
+                        case "HD":
+                            selectedMod = new OsuModHidden();
+                            break;
+
+                        case "HR":
+                            selectedMod = new OsuModHardRock();
+                            break;
+
+                        case "NF":
+                            selectedMod = new OsuModNoFail();
+                            break;
+
+                        case "EZ":
+                            selectedMod = new OsuModEasy();
+                            break;
+                    }
+
+                    if (selectedMod != null)
+                    {
+                        Child = new ModDisplay
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Current =
+                            {
+                                Value = new[]
+                                {
+                                    selectedMod
+                                }
+                            }
+                        };
+                    }
+                }
+            }
+        }
     }
 }

From 9a5790cd31dbd9a60932fb16790fea3390db7ca8 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 24 Jan 2021 19:18:16 +0100
Subject: [PATCH 07712/10326] Implement StableStorage class.

---
 osu.Desktop/OsuGameDesktop.cs |  3 +-
 osu.Game/IO/StableStorage.cs  | 64 +++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/IO/StableStorage.cs

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index d1515acafa..0dc659b120 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -18,6 +18,7 @@ using osu.Framework.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
+using osu.Game.IO;
 
 namespace osu.Desktop
 {
@@ -40,7 +41,7 @@ namespace osu.Desktop
                 {
                     string stablePath = getStableInstallPath();
                     if (!string.IsNullOrEmpty(stablePath))
-                        return new DesktopStorage(stablePath, desktopHost);
+                        return new StableStorage(stablePath, desktopHost);
                 }
             }
             catch (Exception)
diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
new file mode 100644
index 0000000000..a8665b5267
--- /dev/null
+++ b/osu.Game/IO/StableStorage.cs
@@ -0,0 +1,64 @@
+// Copyright (c) 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.IO;
+using System.Linq;
+using osu.Framework.Platform;
+
+namespace osu.Game.IO
+{
+    /// <summary>
+    /// A storage pointing to an osu-stable installation.
+    /// Provides methods for handling installations with a custom Song folder location.
+    /// </summary>
+    public class StableStorage : DesktopStorage
+    {
+        private const string stable_songs_path = "Songs";
+
+        private readonly DesktopGameHost host;
+        private string songs_path;
+
+        public StableStorage(string path, DesktopGameHost host)
+            : base(path, host)
+        {
+            this.host = host;
+            songs_path = locateSongsDirectory();
+        }
+
+        /// <summary>
+        /// Returns a <see cref="Storage"/> pointing to the osu-stable Songs directory.
+        /// </summary>
+        public Storage GetSongStorage()
+        {
+            if (songs_path.Equals(stable_songs_path, StringComparison.OrdinalIgnoreCase))
+                return GetStorageForDirectory(stable_songs_path);
+            else
+                return new DesktopStorage(songs_path, host);
+        }
+
+        private string locateSongsDirectory()
+        {
+            var configFile = GetStream(GetFiles(".", "osu!.*.cfg").First());
+            var textReader = new StreamReader(configFile);
+
+            var songs_directory_path = stable_songs_path;
+
+            while (!textReader.EndOfStream)
+            {
+                var line = textReader.ReadLine();
+
+                if (line?.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase) == true)
+                {
+                    var directory = line.Split('=')[1].TrimStart();
+                    if (Path.IsPathFullyQualified(directory) && !directory.Equals(stable_songs_path, StringComparison.OrdinalIgnoreCase))
+                        songs_directory_path = directory;
+
+                    break;
+                }
+            }
+
+            return songs_directory_path;
+        }
+    }
+}

From d71ac834280c0873422a974dbc78bf73baa5ce71 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 24 Jan 2021 19:46:10 +0100
Subject: [PATCH 07713/10326] Use StableStorage in ArchiveModelManager.

---
 osu.Desktop/OsuGameDesktop.cs            | 2 +-
 osu.Game/Database/ArchiveModelManager.cs | 4 ++--
 osu.Game/OsuGame.cs                      | 3 ++-
 osu.Game/Scoring/ScoreManager.cs         | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 0dc659b120..5909b82c8f 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -33,7 +33,7 @@ namespace osu.Desktop
             noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
         }
 
-        public override Storage GetStorageForStableInstall()
+        public override StableStorage GetStorageForStableInstall()
         {
             try
             {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 9f69ad035f..7d22c51d0f 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -625,7 +625,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Set a storage with access to an osu-stable install for import purposes.
         /// </summary>
-        public Func<Storage> GetStableStorage { private get; set; }
+        public Func<StableStorage> GetStableStorage { private get; set; }
 
         /// <summary>
         /// Denotes whether an osu-stable installation is present to perform automated imports from.
@@ -640,7 +640,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
-        protected virtual IEnumerable<string> GetStableImportPaths(Storage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath);
+        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath);
 
         /// <summary>
         /// Whether this specified path should be removed after successful import.
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5acd6bc73d..399bdda491 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -52,6 +52,7 @@ using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
 using osu.Game.Database;
+using osu.Game.IO;
 
 namespace osu.Game
 {
@@ -88,7 +89,7 @@ namespace osu.Game
 
         protected SentryLogger SentryLogger;
 
-        public virtual Storage GetStorageForStableInstall() => null;
+        public virtual StableStorage GetStorageForStableInstall() => null;
 
         public float ToolbarOffset => (Toolbar?.Position.Y ?? 0) + (Toolbar?.DrawHeight ?? 0);
 
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index cf1d123c06..11f31f7d59 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -16,6 +16,7 @@ using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -71,7 +72,7 @@ namespace osu.Game.Scoring
             }
         }
 
-        protected override IEnumerable<string> GetStableImportPaths(Storage stableStorage)
+        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
             => stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false));
 
         public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);

From f0fdad2f838ec4ab18a82841f4483cba66f715f0 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 24 Jan 2021 22:04:46 +0100
Subject: [PATCH 07714/10326] Construct a DesktopStorage pointing to the
 absolute path of the song directory.

---
 osu.Game/IO/StableStorage.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index a8665b5267..c7ca37a163 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -29,20 +29,14 @@ namespace osu.Game.IO
         /// <summary>
         /// Returns a <see cref="Storage"/> pointing to the osu-stable Songs directory.
         /// </summary>
-        public Storage GetSongStorage()
-        {
-            if (songs_path.Equals(stable_songs_path, StringComparison.OrdinalIgnoreCase))
-                return GetStorageForDirectory(stable_songs_path);
-            else
-                return new DesktopStorage(songs_path, host);
-        }
+        public Storage GetSongStorage() => new DesktopStorage(songs_path, host);
 
         private string locateSongsDirectory()
         {
             var configFile = GetStream(GetFiles(".", "osu!.*.cfg").First());
             var textReader = new StreamReader(configFile);
 
-            var songs_directory_path = stable_songs_path;
+            var songs_directory_path = Path.Combine(BasePath, stable_songs_path);
 
             while (!textReader.EndOfStream)
             {
@@ -51,7 +45,7 @@ namespace osu.Game.IO
                 if (line?.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase) == true)
                 {
                     var directory = line.Split('=')[1].TrimStart();
-                    if (Path.IsPathFullyQualified(directory) && !directory.Equals(stable_songs_path, StringComparison.OrdinalIgnoreCase))
+                    if (Path.IsPathFullyQualified(directory))
                         songs_directory_path = directory;
 
                     break;

From 51d4da565c87192549f62fa94cf624818809a3d8 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 24 Jan 2021 22:25:49 +0100
Subject: [PATCH 07715/10326] Fix ArchiveModelManagers lookup paths.

---
 osu.Game/Beatmaps/BeatmapManager.cs      |  8 +++++++-
 osu.Game/Database/ArchiveModelManager.cs | 12 +++++++++---
 osu.Game/Scoring/ScoreManager.cs         |  3 ++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 42418e532b..a455f676b3 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -64,7 +64,13 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        protected override string ImportFromStablePath => "Songs";
+        protected override bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
+
+        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStoage)
+        {
+            var songStorage = stableStoage.GetSongStorage();
+            return songStorage.GetDirectories(".").Select(path => songStorage.GetFullPath(path));
+        }
 
         private readonly RulesetStore rulesets;
         private readonly BeatmapStore beatmaps;
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 7d22c51d0f..516f70c700 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -637,10 +637,16 @@ namespace osu.Game.Database
         /// </summary>
         protected virtual string ImportFromStablePath => null;
 
+        /// <summary>
+        /// Checks for the existence of an osu-stable directory.
+        /// </summary>
+        protected virtual bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.ExistsDirectory(ImportFromStablePath);
+
         /// <summary>
         /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
-        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath);
+        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath)
+                                                                                                              .Select(path => stableStoage.GetFullPath(path));
 
         /// <summary>
         /// Whether this specified path should be removed after successful import.
@@ -662,14 +668,14 @@ namespace osu.Game.Database
                 return Task.CompletedTask;
             }
 
-            if (!stable.ExistsDirectory(ImportFromStablePath))
+            if (!CheckStableDirectoryExists(stable))
             {
                 // This handles situations like when the user does not have a Skins folder
                 Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
                 return Task.CompletedTask;
             }
 
-            return Task.Run(async () => await Import(GetStableImportPaths(GetStableStorage()).Select(f => stable.GetFullPath(f)).ToArray()));
+            return Task.Run(async () => await Import(GetStableImportPaths(stable).ToArray()));
         }
 
         #endregion
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 11f31f7d59..6aa0a30a75 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -73,7 +73,8 @@ namespace osu.Game.Scoring
         }
 
         protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
-            => stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false));
+            => stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
+                            .Select(path => stableStorage.GetFullPath(path));
 
         public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);
 

From d38db6eace2c6b00f5a3b92fe0f603302184f993 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 24 Jan 2021 23:29:05 +0100
Subject: [PATCH 07716/10326] Change ModSprite to use ruleset's mods directly.

---
 .../Components/TournamentBeatmapPanel.cs      | 66 +++++--------------
 1 file changed, 16 insertions(+), 50 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 7fac2bac71..8fc52f8b4b 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -15,10 +15,9 @@ using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
-using osu.Game.Tournament.Models;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Tournament.Models;
 using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Components
@@ -190,6 +189,12 @@ namespace osu.Game.Tournament.Components
         {
             public string Mod;
 
+            [Resolved]
+            private LadderInfo ladderInfo { get; set; }
+
+            [Resolved]
+            private RulesetStore rulesets { get; set; }
+
             public ModSprite()
             {
                 Margin = new MarginPadding(10);
@@ -198,7 +203,7 @@ namespace osu.Game.Tournament.Components
             }
 
             [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
+            private void load(TextureStore textures, IBindable<RulesetInfo> ruleset)
             {
                 var texture = textures.Get($"mods/{Mod}");
 
@@ -215,54 +220,15 @@ namespace osu.Game.Tournament.Components
                 }
                 else
                 {
-                    Mod selectedMod = null;
-
-                    switch (Mod)
+                    Child = new ModDisplay
                     {
-                        case "DT":
-                            selectedMod = new OsuModDoubleTime();
-                            break;
-
-                        case "FL":
-                            selectedMod = new OsuModFlashlight();
-                            break;
-
-                        case "HT":
-                            selectedMod = new OsuModHalfTime();
-                            break;
-
-                        case "HD":
-                            selectedMod = new OsuModHidden();
-                            break;
-
-                        case "HR":
-                            selectedMod = new OsuModHardRock();
-                            break;
-
-                        case "NF":
-                            selectedMod = new OsuModNoFail();
-                            break;
-
-                        case "EZ":
-                            selectedMod = new OsuModEasy();
-                            break;
-                    }
-
-                    if (selectedMod != null)
-                    {
-                        Child = new ModDisplay
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Current =
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Current =
-                            {
-                                Value = new[]
-                                {
-                                    selectedMod
-                                }
-                            }
-                        };
-                    }
+                            Value = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().Where(mod => mod.Acronym == Mod).ToArray()
+                        }
+                    };
                 }
             }
         }

From c6d46129ad25567e2a3c9736de085e3669c78557 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 24 Jan 2021 23:33:02 +0100
Subject: [PATCH 07717/10326] Remove unneccessary ruleset parameter

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

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 8fc52f8b4b..92ac123097 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Tournament.Components
             }
 
             [BackgroundDependencyLoader]
-            private void load(TextureStore textures, IBindable<RulesetInfo> ruleset)
+            private void load(TextureStore textures)
             {
                 var texture = textures.Get($"mods/{Mod}");
 

From 304264046b0feba5236722652a81bd70ffe46628 Mon Sep 17 00:00:00 2001
From: Mysfit <mysfit@mysfit.dev>
Date: Sun, 24 Jan 2021 17:46:54 -0500
Subject: [PATCH 07718/10326] Added tests.

---
 .../TestSceneStoryboardSamplePlayback.cs      | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
new file mode 100644
index 0000000000..1544f8fd35
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Storyboards;
+using osu.Game.Storyboards.Drawables;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneStoryboardSamplePlayback : PlayerTestScene
+    {
+        private Storyboard storyboard;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.Set(OsuSetting.ShowStoryboard, true);
+
+            storyboard = new Storyboard();
+            var backgroundLayer = storyboard.GetLayer("Background");
+            backgroundLayer.Add(new StoryboardSampleInfo("Intro/welcome.mp3", time: -7000, volume: 20));
+            backgroundLayer.Add(new StoryboardSampleInfo("Intro/welcome.mp3", time: -5000, volume: 20));
+            backgroundLayer.Add(new StoryboardSampleInfo("Intro/welcome.mp3", time: 0, volume: 20));
+        }
+
+        [Test]
+        public void TestStoryboardSamplesStopDuringPause()
+        {
+            checkForFirstSamplePlayback();
+
+            AddStep("player paused", () => Player.Pause());
+            AddAssert("player is currently paused", () => Player.GameplayClockContainer.IsPaused.Value);
+            AddAssert("all storyboard samples stopped immediately", () => allStoryboardSamples.All(sound => !sound.IsPlaying));
+
+            AddStep("player resume", () => Player.Resume());
+            AddUntilStep("any storyboard samples playing after resume", () => allStoryboardSamples.Any(sound => sound.IsPlaying));
+        }
+
+        [Test]
+        public void TestStoryboardSamplesStopOnSkip()
+        {
+            checkForFirstSamplePlayback();
+
+            AddStep("skip intro", () => InputManager.Key(osuTK.Input.Key.Space));
+            AddAssert("all storyboard samples stopped immediately", () => allStoryboardSamples.All(sound => !sound.IsPlaying));
+
+            AddUntilStep("any storyboard samples playing after skip", () => allStoryboardSamples.Any(sound => sound.IsPlaying));
+        }
+
+        private void checkForFirstSamplePlayback()
+        {
+            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
+            AddUntilStep("any storyboard samples playing", () => allStoryboardSamples.Any(sound => sound.IsPlaying));
+        }
+
+        private IEnumerable<DrawableStoryboardSample> allStoryboardSamples => Player.ChildrenOfType<DrawableStoryboardSample>();
+
+        protected override bool AllowFail => false;
+
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(true, false);
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) =>
+            new ClockBackedTestWorkingBeatmap(beatmap, storyboard ?? this.storyboard, Clock, Audio);
+    }
+}

From bb8113fb5136b1c235693899ea11b58c649f289c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 14:47:47 +0900
Subject: [PATCH 07719/10326] Fix mod select footer not animating correctly on
 first reveal

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b93602116b..1258ba719d 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -216,9 +216,9 @@ namespace osu.Game.Overlays.Mods
                         },
                         new Drawable[]
                         {
-                            // Footer
                             new Container
                             {
+                                Name = "Footer content",
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Origin = Anchor.TopCentre,
@@ -237,10 +237,9 @@ namespace osu.Game.Overlays.Mods
                                         Anchor = Anchor.BottomCentre,
                                         AutoSizeAxes = Axes.Y,
                                         RelativeSizeAxes = Axes.X,
+                                        RelativePositionAxes = Axes.X,
                                         Width = content_width,
                                         Spacing = new Vector2(footer_button_spacing, footer_button_spacing / 2),
-                                        LayoutDuration = 100,
-                                        LayoutEasing = Easing.OutQuint,
                                         Padding = new MarginPadding
                                         {
                                             Vertical = 15,
@@ -354,7 +353,7 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopOut();
 
-            footerContainer.MoveToX(footerContainer.DrawSize.X, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
+            footerContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
             footerContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
 
             foreach (var section in ModSectionsContainer.Children)

From 366f074f86eab5f0a665fe70843720b03fc9fb5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 16:53:38 +0900
Subject: [PATCH 07720/10326] Better describe test steps to discern on failures

---
 .../NonVisual/OngoingOperationTrackerTest.cs           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
index b2be83d1f9..eef9582af9 100644
--- a/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
+++ b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
@@ -30,22 +30,22 @@ namespace osu.Game.Tests.NonVisual
             IDisposable secondOperation = null;
 
             AddStep("begin first operation", () => firstOperation = tracker.BeginOperation());
-            AddAssert("operation in progress", () => operationInProgress.Value);
+            AddAssert("first operation in progress", () => operationInProgress.Value);
 
             AddStep("cannot start another operation",
                 () => Assert.Throws<InvalidOperationException>(() => tracker.BeginOperation()));
 
             AddStep("end first operation", () => firstOperation.Dispose());
-            AddAssert("operation is ended", () => !operationInProgress.Value);
+            AddAssert("first operation is ended", () => !operationInProgress.Value);
 
             AddStep("start second operation", () => secondOperation = tracker.BeginOperation());
-            AddAssert("operation in progress", () => operationInProgress.Value);
+            AddAssert("second operation in progress", () => operationInProgress.Value);
 
             AddStep("dispose first operation again", () => firstOperation.Dispose());
-            AddAssert("operation in progress", () => operationInProgress.Value);
+            AddAssert("second operation still in progress", () => operationInProgress.Value);
 
             AddStep("dispose second operation", () => secondOperation.Dispose());
-            AddAssert("operation is ended", () => !operationInProgress.Value);
+            AddAssert("second operation is ended", () => !operationInProgress.Value);
         }
 
         [Test]

From 10e8b7082e5affb83670333a6115af16c34ee9c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 16:53:58 +0900
Subject: [PATCH 07721/10326] Rework logic to avoid custom disposal early
 return handling

---
 .../OnlinePlay/OngoingOperationTracker.cs     | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index 060f1d7b91..b7ee84eb9e 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -2,7 +2,6 @@
 // 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;
 
@@ -43,42 +42,45 @@ namespace osu.Game.Screens.OnlinePlay
             leasedInProgress = inProgress.BeginLease(true);
             leasedInProgress.Value = true;
 
-            // for extra safety, marshal the end of operation back to the update thread if necessary.
-            return new OngoingOperation(() => Scheduler.Add(endOperation, false));
+            return new OngoingOperation(this, leasedInProgress);
         }
 
-        private void endOperation()
+        private void endOperationWithKnownLease(LeasedBindable<bool> lease)
         {
-            leasedInProgress?.Return();
-            leasedInProgress = null;
+            if (lease != leasedInProgress)
+                return;
+
+            // for extra safety, marshal the end of operation back to the update thread if necessary.
+            Scheduler.Add(() =>
+            {
+                leasedInProgress?.Return();
+                leasedInProgress = null;
+            }, false);
         }
 
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
+
             // base call does an UnbindAllBindables().
             // clean up the leased reference here so that it doesn't get returned twice.
             leasedInProgress = null;
         }
 
-        private class OngoingOperation : InvokeOnDisposal
+        private class OngoingOperation : IDisposable
         {
-            private bool isDisposed;
+            private readonly OngoingOperationTracker tracker;
+            private readonly LeasedBindable<bool> lease;
 
-            public OngoingOperation(Action action)
-                : base(action)
+            public OngoingOperation(OngoingOperationTracker tracker, LeasedBindable<bool> lease)
             {
+                this.tracker = tracker;
+                this.lease = lease;
             }
 
-            public override void Dispose()
+            public void Dispose()
             {
-                // base class does not check disposal state for performance reasons which aren't relevant here.
-                // track locally, to avoid interfering with other operations in case of a potential double-disposal.
-                if (isDisposed)
-                    return;
-
-                base.Dispose();
-                isDisposed = true;
+                tracker.endOperationWithKnownLease(lease);
             }
         }
     }

From c05ae3497afa8c5a7dc551496e189620ccbd11ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 17:02:24 +0900
Subject: [PATCH 07722/10326] Make connect/disconnect private

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index aa2305c991..7dc4919d23 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Online.Multiplayer
         private readonly Bindable<bool> isConnected = new Bindable<bool>();
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
+        private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
+
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
@@ -52,20 +54,16 @@ namespace osu.Game.Online.Multiplayer
             {
                 case APIState.Failing:
                 case APIState.Offline:
-                    Task.Run(Disconnect).CatchUnobservedExceptions();
+                    Task.Run(() => disconnect(true)).CatchUnobservedExceptions();
                     break;
 
                 case APIState.Online:
-                    Task.Run(Connect).CatchUnobservedExceptions();
+                    Task.Run(connect).CatchUnobservedExceptions();
                     break;
             }
         }
 
-        private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
-
-        public Task Disconnect() => disconnect(true);
-
-        protected async Task Connect()
+        private async Task connect()
         {
             cancelExistingConnect();
 
@@ -233,7 +231,7 @@ namespace osu.Game.Online.Multiplayer
 
                 // make sure a disconnect wasn't triggered (and this is still the active connection).
                 if (!cancellationToken.IsCancellationRequested)
-                    Task.Run(Connect, default).CatchUnobservedExceptions();
+                    Task.Run(connect, default).CatchUnobservedExceptions();
 
                 return Task.CompletedTask;
             };

From 994fb2667dc22d06d0fc7aca26387ef03ec04859 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 17:11:04 +0900
Subject: [PATCH 07723/10326] Call DisposeAsync instead of StopAsync

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

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 7dc4919d23..ffed2b57fe 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Online.Multiplayer
             try
             {
                 if (connection != null)
-                    await connection.StopAsync();
+                    await connection.DisposeAsync();
             }
             finally
             {

From 0f09a7feb9ee12c05c1d53464db9e6194e8818d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 17:17:04 +0900
Subject: [PATCH 07724/10326] Avoid semaphore potentially getting held forever

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index ffed2b57fe..391658f0d0 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Online.Multiplayer
         {
             cancelExistingConnect();
 
-            await connectionLock.WaitAsync();
+            await connectionLock.WaitAsync(10000);
 
             try
             {
@@ -183,7 +183,7 @@ namespace osu.Game.Online.Multiplayer
             cancelExistingConnect();
 
             if (takeLock)
-                await connectionLock.WaitAsync();
+                await connectionLock.WaitAsync(10000);
 
             try
             {
@@ -237,5 +237,12 @@ namespace osu.Game.Online.Multiplayer
             };
             return newConnection;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            cancelExistingConnect();
+        }
     }
 }

From 91ce3df3a944244d73e18630f3dd26e3709df282 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 17:44:01 +0900
Subject: [PATCH 07725/10326] Bind MultiplayerGameplayLeaderboard to player
 updates later in load process

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index d4ce542a67..a3d27c4e71 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -53,8 +53,6 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, IAPIProvider api)
         {
-            streamingClient.OnNewFrames += handleIncomingFrames;
-
             foreach (var userId in playingUsers)
             {
                 streamingClient.WatchUser(userId);
@@ -90,6 +88,9 @@ namespace osu.Game.Screens.Play.HUD
 
             playingUsers.BindTo(multiplayerClient.CurrentMatchPlayingUserIds);
             playingUsers.BindCollectionChanged(usersChanged);
+
+            // this leaderboard should be guaranteed to be completely loaded before the gameplay starts (is a prerequisite in MultiplayerPlayer).
+            streamingClient.OnNewFrames += handleIncomingFrames;
         }
 
         private void usersChanged(object sender, NotifyCollectionChangedEventArgs e)

From 4ac362ee1acc899e1593ef548b981962e00916ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 18:29:00 +0900
Subject: [PATCH 07726/10326] Move cloning local to editor

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 2 --
 osu.Game/Screens/Edit/Editor.cs     | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index d25adca92b..30382c444f 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -111,8 +111,6 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert(cancellationSource.Token);
 
-                converted.ControlPointInfo = converted.ControlPointInfo.CreateCopy();
-
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())
                 {
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b7ebf0c0a4..0e04d1ea12 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -131,6 +131,10 @@ namespace osu.Game.Screens.Edit
             try
             {
                 playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
+
+                // clone these locally for now to avoid incurring overhead on GetPlayableBeatmap usages.
+                // eventually we will want to improve how/where this is done as there are issues with *not* cloning it in all cases.
+                playableBeatmap.ControlPointInfo = playableBeatmap.ControlPointInfo.CreateCopy();
             }
             catch (Exception e)
             {

From b489e92c9e1042e0d9254158f7da75a339142436 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 18:43:36 +0900
Subject: [PATCH 07727/10326] Fix TimelineParts not using correct beatmap

---
 .../Timelines/Summary/Parts/BookmarkPart.cs    |  3 +--
 .../Timelines/Summary/Parts/BreakPart.cs       |  5 ++---
 .../Summary/Parts/ControlPointPart.cs          |  5 ++---
 .../Timelines/Summary/Parts/MarkerPart.cs      |  8 ++------
 .../Timelines/Summary/Parts/TimelinePart.cs    | 18 +++++++++++-------
 .../Timeline/TimelineControlPointDisplay.cs    |  5 ++---
 6 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BookmarkPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BookmarkPart.cs
index 103e39e78a..8298cf4773 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BookmarkPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BookmarkPart.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
 
@@ -13,7 +12,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// </summary>
     public class BookmarkPart : TimelinePart
     {
-        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);
             foreach (int bookmark in beatmap.BeatmapInfo.Bookmarks)
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
index ceccbffc9c..e8a4b5c8c7 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Graphics;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
@@ -14,10 +13,10 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// </summary>
     public class BreakPart : TimelinePart
     {
-        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);
-            foreach (var breakPeriod in beatmap.Beatmap.Breaks)
+            foreach (var breakPeriod in beatmap.Breaks)
                 Add(new BreakVisualisation(breakPeriod));
         }
 
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
index e76ab71e54..70afc1e308 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
@@ -4,7 +4,6 @@
 using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
@@ -16,12 +15,12 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     {
         private readonly IBindableList<ControlPointGroup> controlPointGroups = new BindableList<ControlPointGroup>();
 
-        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);
 
             controlPointGroups.UnbindAll();
-            controlPointGroups.BindTo(beatmap.Beatmap.ControlPointInfo.Groups);
+            controlPointGroups.BindTo(beatmap.ControlPointInfo.Groups);
             controlPointGroups.BindCollectionChanged((sender, args) =>
             {
                 switch (args.Action)
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
index 5a2214509c..d551333616 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
@@ -2,15 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 {
@@ -54,9 +53,6 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
             scheduledSeek?.Cancel();
             scheduledSeek = Schedule(() =>
             {
-                if (Beatmap.Value == null)
-                    return;
-
                 float markerPos = Math.Clamp(ToLocalSpace(screenPosition).X, 0, DrawWidth);
                 editorClock.SeekSmoothlyTo(markerPos / DrawWidth * editorClock.TrackLength);
             });
@@ -68,7 +64,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
             marker.X = (float)editorClock.CurrentTime;
         }
 
-        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             // block base call so we don't clear our marker (can be reused on beatmap change).
         }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index 5b8f7c747b..5aba81aa7d 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -21,7 +21,10 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// </summary>
     public class TimelinePart<T> : Container<T> where T : Drawable
     {
-        protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+
+        [Resolved]
+        protected EditorBeatmap EditorBeatmap { get; private set; }
 
         protected readonly IBindable<Track> Track = new Bindable<Track>();
 
@@ -33,10 +36,9 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         {
             AddInternal(this.content = content ?? new Container<T> { RelativeSizeAxes = Axes.Both });
 
-            Beatmap.ValueChanged += b =>
+            beatmap.ValueChanged += b =>
             {
                 updateRelativeChildSize();
-                LoadBeatmap(b.NewValue);
             };
 
             Track.ValueChanged += _ => updateRelativeChildSize();
@@ -45,24 +47,26 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         [BackgroundDependencyLoader]
         private void load(IBindable<WorkingBeatmap> beatmap, EditorClock clock)
         {
-            Beatmap.BindTo(beatmap);
+            this.beatmap.BindTo(beatmap);
+            LoadBeatmap(EditorBeatmap);
+
             Track.BindTo(clock.Track);
         }
 
         private void updateRelativeChildSize()
         {
             // the track may not be loaded completely (only has a length once it is).
-            if (!Beatmap.Value.Track.IsLoaded)
+            if (!beatmap.Value.Track.IsLoaded)
             {
                 content.RelativeChildSize = Vector2.One;
                 Schedule(updateRelativeChildSize);
                 return;
             }
 
-            content.RelativeChildSize = new Vector2((float)Math.Max(1, Beatmap.Value.Track.Length), 1);
+            content.RelativeChildSize = new Vector2((float)Math.Max(1, beatmap.Value.Track.Length), 1);
         }
 
-        protected virtual void LoadBeatmap(WorkingBeatmap beatmap)
+        protected virtual void LoadBeatmap(EditorBeatmap beatmap)
         {
             content.Clear();
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
index 13191df13c..18600bcdee 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
@@ -5,7 +5,6 @@ using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 
@@ -23,12 +22,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.Both;
         }
 
-        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);
 
             controlPointGroups.UnbindAll();
-            controlPointGroups.BindTo(beatmap.Beatmap.ControlPointInfo.Groups);
+            controlPointGroups.BindTo(beatmap.ControlPointInfo.Groups);
             controlPointGroups.BindCollectionChanged((sender, args) =>
             {
                 switch (args.Action)

From f3061a8e837e4a59522d9a4faeac1b0e9f98aa00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 18:47:41 +0900
Subject: [PATCH 07728/10326] Update squirrel to fix incorrect desktop icon
 creation on install

---
 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 4554f8b83a..e201b250d4 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
-    <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
+    <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />

From 439f03e3b3d78dbdbc8ba3d6db559c13043f1e86 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 19:25:38 +0900
Subject: [PATCH 07729/10326] Fix failing test due to missing dependency

---
 .../Visual/Editing/TestSceneEditorSummaryTimeline.cs         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
index 3adc1bd425..94a9fd7b35 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
@@ -5,6 +5,8 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
 using osuTK;
 
@@ -13,6 +15,9 @@ namespace osu.Game.Tests.Visual.Editing
     [TestFixture]
     public class TestSceneEditorSummaryTimeline : EditorClockTestScene
     {
+        [Cached(typeof(EditorBeatmap))]
+        private readonly EditorBeatmap editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+
         [BackgroundDependencyLoader]
         private void load()
         {

From 964976f604e9071e929f90cdd934ab104cf20bdb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 25 Jan 2021 20:41:51 +0900
Subject: [PATCH 07730/10326] Use a task chain and fix potential misordering of
 events

---
 .../Online/Multiplayer/MultiplayerClient.cs   |  11 +-
 .../Multiplayer/StatefulMultiplayerClient.cs  | 123 +++++-------------
 .../Multiplayer/TestMultiplayerClient.cs      |   2 +
 osu.Game/Utils/TaskChain.cs                   |  30 +++++
 4 files changed, 70 insertions(+), 96 deletions(-)
 create mode 100644 osu.Game/Utils/TaskChain.cs

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 5d18521eac..8573adc94a 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -134,17 +134,12 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
         }
 
-        public override async Task LeaveRoom()
+        protected override Task LeaveRoomInternal()
         {
             if (!isConnected.Value)
-            {
-                // even if not connected, make sure the local room state can be cleaned up.
-                await base.LeaveRoom();
-                return;
-            }
+                return Task.FromCanceled(new CancellationToken(true));
 
-            await base.LeaveRoom();
-            await connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
+            return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
         }
 
         public override Task TransferHost(int userId)
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f2b5a44fcf..94122aeff5 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -108,67 +108,38 @@ namespace osu.Game.Online.Multiplayer
             });
         }
 
-        private readonly object joinOrLeaveTaskLock = new object();
-        private Task? joinOrLeaveTask;
+        private readonly TaskChain joinOrLeaveTaskChain = new TaskChain();
 
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
         /// </summary>
         /// <param name="room">The API <see cref="Room"/>.</param>
-        public async Task JoinRoom(Room room)
+        public async Task JoinRoom(Room room) => await joinOrLeaveTaskChain.Add(async () =>
         {
-            Task? lastTask;
-            Task newTask;
+            if (Room != null)
+                throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
 
-            lock (joinOrLeaveTaskLock)
+            Debug.Assert(room.RoomID.Value != null);
+
+            // Join the server-side room.
+            var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
+            Debug.Assert(joinedRoom != null);
+
+            // Populate users.
+            Debug.Assert(joinedRoom.Users != null);
+            await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
+
+            // Update the stored room (must be done on update thread for thread-safety).
+            await scheduleAsync(() =>
             {
-                lastTask = joinOrLeaveTask;
-                joinOrLeaveTask = newTask = Task.Run(async () =>
-                {
-                    if (lastTask != null)
-                        await lastTask;
+                Room = joinedRoom;
+                apiRoom = room;
+                playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
+            });
 
-                    // Should be thread-safe since joinOrLeaveTask is locked on in both JoinRoom() and LeaveRoom().
-                    if (Room != null)
-                        throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
-
-                    Debug.Assert(room.RoomID.Value != null);
-
-                    // Join the server-side room.
-                    var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
-                    Debug.Assert(joinedRoom != null);
-
-                    // Populate users.
-                    Debug.Assert(joinedRoom.Users != null);
-                    await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
-
-                    // Update the stored room (must be done on update thread for thread-safety).
-                    await scheduleAsync(() =>
-                    {
-                        Room = joinedRoom;
-                        apiRoom = room;
-                        playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
-                    });
-
-                    // Update room settings.
-                    await updateLocalRoomSettings(joinedRoom.Settings);
-                });
-            }
-
-            try
-            {
-                await newTask;
-            }
-            finally
-            {
-                // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
-                lock (joinOrLeaveTaskLock)
-                {
-                    if (joinOrLeaveTask == newTask)
-                        joinOrLeaveTask = null;
-                }
-            }
-        }
+            // Update room settings.
+            await updateLocalRoomSettings(joinedRoom.Settings);
+        });
 
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> with a given ID.
@@ -177,48 +148,24 @@ namespace osu.Game.Online.Multiplayer
         /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
         protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
 
-        public virtual async Task LeaveRoom()
+        public async Task LeaveRoom() => await joinOrLeaveTaskChain.Add(async () =>
         {
-            Task? lastTask;
-            Task newTask;
+            if (Room == null)
+                return;
 
-            lock (joinOrLeaveTaskLock)
+            await scheduleAsync(() =>
             {
-                lastTask = joinOrLeaveTask;
-                joinOrLeaveTask = newTask = Task.Run(async () =>
-                {
-                    if (lastTask != null)
-                        await lastTask;
+                apiRoom = null;
+                Room = null;
+                CurrentMatchPlayingUserIds.Clear();
 
-                    // Should be thread-safe since joinOrLeaveTask is locked on in both JoinRoom() and LeaveRoom().
-                    if (Room == null)
-                        return;
+                RoomUpdated?.Invoke();
+            });
 
-                    await scheduleAsync(() =>
-                    {
-                        apiRoom = null;
-                        Room = null;
-                        CurrentMatchPlayingUserIds.Clear();
+            await LeaveRoomInternal();
+        });
 
-                        RoomUpdated?.Invoke();
-                    });
-                });
-            }
-
-            try
-            {
-                await newTask;
-            }
-            finally
-            {
-                // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
-                lock (joinOrLeaveTaskLock)
-                {
-                    if (joinOrLeaveTask == newTask)
-                        joinOrLeaveTask = null;
-                }
-            }
-        }
+        protected abstract Task LeaveRoomInternal();
 
         /// <summary>
         /// Change the current <see cref="MultiplayerRoom"/> settings.
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 7fbc770351..a79183fdab 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -98,6 +98,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.FromResult(room);
         }
 
+        protected override Task LeaveRoomInternal() => Task.CompletedTask;
+
         public override Task TransferHost(int userId) => ((IMultiplayerClient)this).HostChanged(userId);
 
         public override async Task ChangeSettings(MultiplayerRoomSettings settings)
diff --git a/osu.Game/Utils/TaskChain.cs b/osu.Game/Utils/TaskChain.cs
new file mode 100644
index 0000000000..b397b0c45b
--- /dev/null
+++ b/osu.Game/Utils/TaskChain.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.
+
+#nullable enable
+
+using System;
+using System.Threading.Tasks;
+
+namespace osu.Game.Utils
+{
+    /// <summary>
+    /// A chain of <see cref="Task"/>s that run sequentially.
+    /// </summary>
+    public class TaskChain
+    {
+        private readonly object currentTaskLock = new object();
+        private Task? currentTask;
+
+        public Task Add(Func<Task> taskFunc)
+        {
+            lock (currentTaskLock)
+            {
+                currentTask = currentTask == null
+                    ? taskFunc()
+                    : currentTask.ContinueWith(_ => taskFunc()).Unwrap();
+                return currentTask;
+            }
+        }
+    }
+}

From bb44fcfe31c78f77321714c466724847d27492ce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 25 Jan 2021 20:58:02 +0900
Subject: [PATCH 07731/10326] Prevent some data races

---
 .../Multiplayer/StatefulMultiplayerClient.cs   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 94122aeff5..0e736ed7c6 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -148,12 +149,15 @@ namespace osu.Game.Online.Multiplayer
         /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
         protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
 
-        public async Task LeaveRoom() => await joinOrLeaveTaskChain.Add(async () =>
+        public Task LeaveRoom()
         {
             if (Room == null)
-                return;
+                return Task.FromCanceled(new CancellationToken(true));
 
-            await scheduleAsync(() =>
+            // Leaving rooms is expected to occur instantaneously whilst the operation is finalised in the background.
+            // However a few members need to be reset immediately to prevent other components from entering invalid states whilst the operation hasn't yet completed.
+            // For example, if a room was left and the user immediately pressed the "create room" button, then the user could be taken into the lobby if the value of Room is not reset in time.
+            var scheduledReset = scheduleAsync(() =>
             {
                 apiRoom = null;
                 Room = null;
@@ -162,8 +166,12 @@ namespace osu.Game.Online.Multiplayer
                 RoomUpdated?.Invoke();
             });
 
-            await LeaveRoomInternal();
-        });
+            return joinOrLeaveTaskChain.Add(async () =>
+            {
+                await scheduledReset;
+                await LeaveRoomInternal();
+            });
+        }
 
         protected abstract Task LeaveRoomInternal();
 

From c17774e23c6b770d07cd2d9ea059ca1bcc4dff1a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 25 Jan 2021 20:58:05 +0900
Subject: [PATCH 07732/10326] Add xmldoc

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

diff --git a/osu.Game/Utils/TaskChain.cs b/osu.Game/Utils/TaskChain.cs
index b397b0c45b..64d523bd3d 100644
--- a/osu.Game/Utils/TaskChain.cs
+++ b/osu.Game/Utils/TaskChain.cs
@@ -16,6 +16,11 @@ namespace osu.Game.Utils
         private readonly object currentTaskLock = new object();
         private Task? currentTask;
 
+        /// <summary>
+        /// Adds a new task to the end of this <see cref="TaskChain"/>.
+        /// </summary>
+        /// <param name="taskFunc">The task creation function.</param>
+        /// <returns>The awaitable <see cref="Task"/>.</returns>
         public Task Add(Func<Task> taskFunc)
         {
             lock (currentTaskLock)

From f89eb7d75db7982d3cdc6200b4737c630094eb87 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 13:22:37 +0100
Subject: [PATCH 07733/10326] Split and rename TournamentModDisplay component

---
 .../Components/TournamentBeatmapPanel.cs      | 64 +++----------------
 .../Components/TournamentModDisplay.cs        | 56 ++++++++++++++++
 2 files changed, 64 insertions(+), 56 deletions(-)
 create mode 100644 osu.Game.Tournament/Components/TournamentModDisplay.cs

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 92ac123097..2ed99d2fb5 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -9,14 +9,11 @@ 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.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
-using osu.Game.Rulesets;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Tournament.Models;
 using osuTK.Graphics;
 
@@ -25,7 +22,7 @@ namespace osu.Game.Tournament.Components
     public class TournamentBeatmapPanel : CompositeDrawable
     {
         public readonly BeatmapInfo Beatmap;
-        private readonly string mods;
+        private readonly string mod;
 
         private const float horizontal_padding = 10;
         private const float vertical_padding = 10;
@@ -40,7 +37,7 @@ namespace osu.Game.Tournament.Components
             if (beatmap == null) throw new ArgumentNullException(nameof(beatmap));
 
             Beatmap = beatmap;
-            this.mods = mods;
+            this.mod = mods;
             Width = 400;
             Height = HEIGHT;
         }
@@ -124,13 +121,16 @@ namespace osu.Game.Tournament.Components
                 },
             });
 
-            if (!string.IsNullOrEmpty(mods))
+            if (!string.IsNullOrEmpty(mod))
             {
-                AddInternal(new ModSprite
+                AddInternal(new TournamentModDisplay
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
-                    Mod = mods
+                    Margin = new MarginPadding(10),
+                    Width = 60,
+                    RelativeSizeAxes = Axes.Y,
+                    ModAcronym = mod
                 });
             }
         }
@@ -184,53 +184,5 @@ namespace osu.Game.Tournament.Components
                 Alpha = 1;
             }
         }
-
-        private class ModSprite : Container
-        {
-            public string Mod;
-
-            [Resolved]
-            private LadderInfo ladderInfo { get; set; }
-
-            [Resolved]
-            private RulesetStore rulesets { get; set; }
-
-            public ModSprite()
-            {
-                Margin = new MarginPadding(10);
-                Width = 60;
-                RelativeSizeAxes = Axes.Y;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
-            {
-                var texture = textures.Get($"mods/{Mod}");
-
-                if (texture != null)
-                {
-                    Child = new Sprite
-                    {
-                        FillMode = FillMode.Fit,
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        Texture = texture
-                    };
-                }
-                else
-                {
-                    Child = new ModDisplay
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Current =
-                        {
-                            Value = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().Where(mod => mod.Acronym == Mod).ToArray()
-                        }
-                    };
-                }
-            }
-        }
     }
 }
diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
new file mode 100644
index 0000000000..a22969c20d
--- /dev/null
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.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.Linq;
+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.Rulesets;
+using osu.Game.Rulesets.UI;
+using osu.Game.Tournament.Models;
+using osuTK;
+
+namespace osu.Game.Tournament.Components
+{
+    public class TournamentModDisplay : CompositeDrawable
+    {
+        public string ModAcronym;
+
+        [Resolved]
+        private LadderInfo ladderInfo { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            var texture = textures.Get($"mods/{ModAcronym}");
+
+            if (texture != null)
+            {
+                AddInternal(new Sprite
+                {
+                    FillMode = FillMode.Fit,
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Texture = texture
+                });
+            }
+            else
+            {
+                var mod = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+
+                AddInternal(new ModIcon(mod)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(0.5f)
+                });
+            }
+        }
+    }
+}

From 74310da7cf550af33367a4dd0e3d49eebacf32a5 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 13:24:43 +0100
Subject: [PATCH 07734/10326] Change parameter to be singular mod instead of
 plural

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 2ed99d2fb5..e02709a045 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -32,12 +32,12 @@ namespace osu.Game.Tournament.Components
         private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
         private Box flash;
 
-        public TournamentBeatmapPanel(BeatmapInfo beatmap, string mods = null)
+        public TournamentBeatmapPanel(BeatmapInfo beatmap, string mod = null)
         {
             if (beatmap == null) throw new ArgumentNullException(nameof(beatmap));
 
             Beatmap = beatmap;
-            this.mod = mods;
+            this.mod = mod;
             Width = 400;
             Height = HEIGHT;
         }

From ca08a19c409e4a454a0d6a66d7ce57d2ea845228 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 13:28:46 +0100
Subject: [PATCH 07735/10326] Rename mod to modIcon

---
 osu.Game.Tournament/Components/TournamentModDisplay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
index a22969c20d..827b3d6a69 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -42,9 +42,9 @@ namespace osu.Game.Tournament.Components
             }
             else
             {
-                var mod = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+                var modIcon = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
 
-                AddInternal(new ModIcon(mod)
+                AddInternal(new ModIcon(modIcon)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

From 07bd9013585ebae924cf44c501b079bb9d9b01b0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 14:20:58 +0100
Subject: [PATCH 07736/10326] Add visual test for Tournament Mod Display

---
 .../TestSceneTournamentModDisplay.cs          | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
new file mode 100644
index 0000000000..9689ecd4ae
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets;
+using osu.Game.Tournament.Components;
+
+namespace osu.Game.Tournament.Tests.Components
+{
+    public class TestSceneTournamentModDisplay : TournamentTestScene
+    {
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        private FillFlowContainer<TournamentBeatmapPanel> fillFlow;
+
+        private BeatmapInfo beatmap;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = 490154 });
+            req.Success += success;
+            api.Queue(req);
+
+            Add(fillFlow = new FillFlowContainer<TournamentBeatmapPanel>
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Direction = FillDirection.Full,
+                Spacing = new osuTK.Vector2(10)
+            });
+        }
+
+        [Test]
+        public void TestModDisplay()
+        {
+            AddUntilStep("beatmap is available", () => beatmap != null);
+            AddStep("add maps with available mods for ruleset", () => displayForRuleset(Ladder.Ruleset.Value.ID ?? 0));
+        }
+
+        private void displayForRuleset(int rulesetId)
+        {
+            fillFlow.Clear();
+            var mods = rulesets.GetRuleset(rulesetId).CreateInstance().GetAllMods();
+
+            foreach (var mod in mods)
+            {
+                fillFlow.Add(new TournamentBeatmapPanel(beatmap, mod.Acronym));
+            }
+        }
+
+        private void success(APIBeatmap apiBeatmap) => beatmap = apiBeatmap.ToBeatmap(rulesets);
+    }
+}

From 5e0ccb6c91d3e1d55968882b80d3ba0eca1971a0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 14:21:22 +0100
Subject: [PATCH 07737/10326] Remove unncessary test step

---
 .../TestSceneTournamentModDisplay.cs          | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
index 9689ecd4ae..b4d9fa4222 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -43,24 +42,19 @@ namespace osu.Game.Tournament.Tests.Components
             });
         }
 
-        [Test]
-        public void TestModDisplay()
+        private void success(APIBeatmap apiBeatmap)
         {
-            AddUntilStep("beatmap is available", () => beatmap != null);
-            AddStep("add maps with available mods for ruleset", () => displayForRuleset(Ladder.Ruleset.Value.ID ?? 0));
-        }
-
-        private void displayForRuleset(int rulesetId)
-        {
-            fillFlow.Clear();
-            var mods = rulesets.GetRuleset(rulesetId).CreateInstance().GetAllMods();
+            beatmap = apiBeatmap.ToBeatmap(rulesets);
+            var mods = rulesets.GetRuleset(Ladder.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods();
 
             foreach (var mod in mods)
             {
-                fillFlow.Add(new TournamentBeatmapPanel(beatmap, mod.Acronym));
+                fillFlow.Add(new TournamentBeatmapPanel(beatmap, mod.Acronym)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                });
             }
         }
-
-        private void success(APIBeatmap apiBeatmap) => beatmap = apiBeatmap.ToBeatmap(rulesets);
     }
 }

From 6a85f5ca8bf2a9506ed55d9a60f870b820326e2b Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 14:21:53 +0100
Subject: [PATCH 07738/10326] Add null checks to prevent nullrefexception in
 automated test

---
 osu.Game.Tournament/Components/TournamentModDisplay.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
index 827b3d6a69..e91c27345e 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -42,7 +42,15 @@ namespace osu.Game.Tournament.Components
             }
             else
             {
-                var modIcon = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+                var ruleset = rulesets.AvailableRulesets.FirstOrDefault(r => r == ladderInfo.Ruleset.Value);
+
+                if (ruleset == null)
+                    return;
+
+                var modIcon = ruleset.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+
+                if (modIcon == null)
+                    return;
 
                 AddInternal(new ModIcon(modIcon)
                 {

From a741d91aed91f338ffecd3a4596b551c8804b52e Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 14:57:35 +0100
Subject: [PATCH 07739/10326] use null propragtor for Ruleset.Value and rulset
 instead of null checks

---
 .../Components/TournamentModDisplay.cs              | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
index e91c27345e..369a58858e 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -18,14 +18,11 @@ namespace osu.Game.Tournament.Components
     {
         public string ModAcronym;
 
-        [Resolved]
-        private LadderInfo ladderInfo { get; set; }
-
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        private void load(TextureStore textures, LadderInfo ladderInfo)
         {
             var texture = textures.Get($"mods/{ModAcronym}");
 
@@ -42,12 +39,8 @@ namespace osu.Game.Tournament.Components
             }
             else
             {
-                var ruleset = rulesets.AvailableRulesets.FirstOrDefault(r => r == ladderInfo.Ruleset.Value);
-
-                if (ruleset == null)
-                    return;
-
-                var modIcon = ruleset.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+                var ruleset = rulesets.GetRuleset(ladderInfo.Ruleset.Value?.ID ?? 0);
+                var modIcon = ruleset?.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
 
                 if (modIcon == null)
                     return;

From b036f0165a077bc49cb0fd9d7e8713fb6a18fd89 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 15:47:31 +0100
Subject: [PATCH 07740/10326] move value set to constructor and make private
 readonly

---
 .../Components/TournamentBeatmapPanel.cs              |  3 +--
 .../Components/TournamentModDisplay.cs                | 11 ++++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index e02709a045..8cc4566c08 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -123,14 +123,13 @@ namespace osu.Game.Tournament.Components
 
             if (!string.IsNullOrEmpty(mod))
             {
-                AddInternal(new TournamentModDisplay
+                AddInternal(new TournamentModDisplay(mod)
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
                     Margin = new MarginPadding(10),
                     Width = 60,
                     RelativeSizeAxes = Axes.Y,
-                    ModAcronym = mod
                 });
             }
         }
diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
index 369a58858e..3df8550667 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -16,15 +16,20 @@ namespace osu.Game.Tournament.Components
 {
     public class TournamentModDisplay : CompositeDrawable
     {
-        public string ModAcronym;
+        private readonly string modAcronym;
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        public TournamentModDisplay(string mod)
+        {
+            modAcronym = mod;
+        }
+
         [BackgroundDependencyLoader]
         private void load(TextureStore textures, LadderInfo ladderInfo)
         {
-            var texture = textures.Get($"mods/{ModAcronym}");
+            var texture = textures.Get($"mods/{modAcronym}");
 
             if (texture != null)
             {
@@ -40,7 +45,7 @@ namespace osu.Game.Tournament.Components
             else
             {
                 var ruleset = rulesets.GetRuleset(ladderInfo.Ruleset.Value?.ID ?? 0);
-                var modIcon = ruleset?.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+                var modIcon = ruleset?.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == modAcronym);
 
                 if (modIcon == null)
                     return;

From a4a7f0c5787a1fd0a5470a8af72c1ac5211e7d1b Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 25 Jan 2021 19:05:16 +0100
Subject: [PATCH 07741/10326] Address CI inspections.

---
 osu.Game/IO/StableStorage.cs | 12 ++++++------
 osu.Game/OsuGame.cs          |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index c7ca37a163..85af92621b 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -17,26 +17,26 @@ namespace osu.Game.IO
         private const string stable_songs_path = "Songs";
 
         private readonly DesktopGameHost host;
-        private string songs_path;
+        private readonly string songsPath;
 
         public StableStorage(string path, DesktopGameHost host)
             : base(path, host)
         {
             this.host = host;
-            songs_path = locateSongsDirectory();
+            songsPath = locateSongsDirectory();
         }
 
         /// <summary>
         /// Returns a <see cref="Storage"/> pointing to the osu-stable Songs directory.
         /// </summary>
-        public Storage GetSongStorage() => new DesktopStorage(songs_path, host);
+        public Storage GetSongStorage() => new DesktopStorage(songsPath, host);
 
         private string locateSongsDirectory()
         {
             var configFile = GetStream(GetFiles(".", "osu!.*.cfg").First());
             var textReader = new StreamReader(configFile);
 
-            var songs_directory_path = Path.Combine(BasePath, stable_songs_path);
+            var songsDirectoryPath = Path.Combine(BasePath, stable_songs_path);
 
             while (!textReader.EndOfStream)
             {
@@ -46,13 +46,13 @@ namespace osu.Game.IO
                 {
                     var directory = line.Split('=')[1].TrimStart();
                     if (Path.IsPathFullyQualified(directory))
-                        songs_directory_path = directory;
+                        songsDirectoryPath = directory;
 
                     break;
                 }
             }
 
-            return songs_directory_path;
+            return songsDirectoryPath;
         }
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 399bdda491..78c4d4ccad 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -28,7 +28,6 @@ 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;
 using osu.Game.Collections;

From 9efce5717f40e2ade16c4dee2cb89501d6c27c0d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 25 Jan 2021 22:11:50 +0300
Subject: [PATCH 07742/10326] Fix beatmap listing placeholder disappearing on
 second time display

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

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 2f7f21e403..b65eaad0a2 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -176,6 +176,9 @@ namespace osu.Game.Overlays
             loadingLayer.Hide();
             lastFetchDisplayedTime = Time.Current;
 
+            if (content == currentContent)
+                return;
+
             var lastContent = currentContent;
 
             if (lastContent != null)

From 9312de7c2387f4534090304550f3910c54b98e39 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 25 Jan 2021 23:40:26 +0300
Subject: [PATCH 07743/10326] Move online beatmap listing overlay to separate
 test scene

---
 ...ingOverlay.cs => TestSceneOnlineBeatmapListingOverlay.cs} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Online/{TestSceneBeatmapListingOverlay.cs => TestSceneOnlineBeatmapListingOverlay.cs} (80%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapListingOverlay.cs
similarity index 80%
rename from osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
rename to osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapListingOverlay.cs
index 6cb1687d1f..fe1701a554 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapListingOverlay.cs
@@ -6,13 +6,14 @@ using NUnit.Framework;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneBeatmapListingOverlay : OsuTestScene
+    [Description("uses online API")]
+    public class TestSceneOnlineBeatmapListingOverlay : OsuTestScene
     {
         protected override bool UseOnlineAPI => true;
 
         private readonly BeatmapListingOverlay overlay;
 
-        public TestSceneBeatmapListingOverlay()
+        public TestSceneOnlineBeatmapListingOverlay()
         {
             Add(overlay = new BeatmapListingOverlay());
         }

From 75d6dbdbb7290c215505e408f15781b96128d929 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 25 Jan 2021 22:18:23 +0300
Subject: [PATCH 07744/10326] Fix beatmap listing placeholder potentially
 getting disposed

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 0c9c995dd6..2f7f21e403 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -180,18 +180,24 @@ namespace osu.Game.Overlays
 
             if (lastContent != null)
             {
-                lastContent.FadeOut(100, Easing.OutQuint).Expire();
+                lastContent.FadeOut(100, Easing.OutQuint);
 
                 // 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).Then().Schedule(() => panelTarget.Remove(lastContent));
+                lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y).Then().Schedule(() =>
+                {
+                    panelTarget.Remove(lastContent);
+
+                    // the content may be reused again (e.g. notFoundContent), clear Y-axis bypass for displaying back properly.
+                    lastContent.BypassAutoSizeAxes = Axes.None;
+                });
             }
 
             if (!content.IsAlive)
                 panelTarget.Add(content);
-            content.FadeIn(200, Easing.OutQuint);
+            content.FadeInFromZero(200, Easing.OutQuint);
 
             currentContent = content;
         }

From c317d6016967a321c70d02ee81d012129e8b5767 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 25 Jan 2021 23:41:05 +0300
Subject: [PATCH 07745/10326] Add offline test scene for beatmap listing
 overlay

---
 .../Online/TestSceneBeatmapListingOverlay.cs  | 81 +++++++++++++++++++
 .../API/Requests/Responses/APIBeatmapSet.cs   |  2 +-
 osu.Game/Overlays/BeatmapListingOverlay.cs    |  2 +-
 3 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.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..1349264bf9
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+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.BeatmapListing;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneBeatmapListingOverlay : OsuTestScene
+    {
+        private readonly List<APIBeatmapSet> setsForResponse = new List<APIBeatmapSet>();
+
+        private BeatmapListingOverlay overlay;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = overlay = new BeatmapListingOverlay { State = { Value = Visibility.Visible } };
+
+            ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                if (req is SearchBeatmapSetsRequest searchBeatmapSetsRequest)
+                {
+                    searchBeatmapSetsRequest.TriggerSuccess(new SearchBeatmapSetsResponse
+                    {
+                        BeatmapSets = setsForResponse,
+                    });
+                }
+            };
+        }
+
+        [Test]
+        public void TestNoBeatmapsPlaceholder()
+        {
+            AddStep("fetch for 0 beatmaps", () => fetchFor());
+            AddUntilStep("placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
+
+            AddStep("fetch for 1 beatmap", () => fetchFor(CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet));
+            AddUntilStep("placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
+
+            AddStep("fetch for 0 beatmaps", () => fetchFor());
+            AddUntilStep("placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
+
+            // fetch once more to ensure nothing happens in displaying placeholder again when it already is present.
+            AddStep("fetch for 0 beatmaps again", () => fetchFor());
+            AddUntilStep("placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
+        }
+
+        private void fetchFor(params BeatmapSetInfo[] beatmaps)
+        {
+            setsForResponse.Clear();
+            setsForResponse.AddRange(beatmaps.Select(b => new TestAPIBeatmapSet(b)));
+
+            // trigger arbitrary change for fetching.
+            overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Query.TriggerChange();
+        }
+
+        private class TestAPIBeatmapSet : APIBeatmapSet
+        {
+            private readonly BeatmapSetInfo beatmapSet;
+
+            public TestAPIBeatmapSet(BeatmapSetInfo beatmapSet)
+            {
+                this.beatmapSet = beatmapSet;
+            }
+
+            public override BeatmapSetInfo ToBeatmapSet(RulesetStore rulesets) => beatmapSet;
+        }
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
index bd1800e9f7..45d9c9405f 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"beatmaps")]
         private IEnumerable<APIBeatmap> beatmaps { get; set; }
 
-        public BeatmapSetInfo ToBeatmapSet(RulesetStore rulesets)
+        public virtual BeatmapSetInfo ToBeatmapSet(RulesetStore rulesets)
         {
             var beatmapSet = new BeatmapSetInfo
             {
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index b65eaad0a2..c5cc0a9c85 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Overlays
             base.Dispose(isDisposing);
         }
 
-        private class NotFoundDrawable : CompositeDrawable
+        public class NotFoundDrawable : CompositeDrawable
         {
             public NotFoundDrawable()
             {

From 0d8d0d685219e162e385f0bb506735d7fedcb2e0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 26 Jan 2021 01:03:29 +0300
Subject: [PATCH 07746/10326] Apply alternative way of fixing

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 2f7f21e403..fc90968ec4 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -178,21 +178,18 @@ namespace osu.Game.Overlays
 
             var lastContent = currentContent;
 
-            if (lastContent != null)
+            // "not found" placeholder is reused, only remove without disposing through expire.
+            if (lastContent == notFoundContent)
+                lastContent.FadeOut(100, Easing.OutQuint).Schedule(() => panelTarget.Remove(lastContent));
+            else if (lastContent != null)
             {
-                lastContent.FadeOut(100, Easing.OutQuint);
+                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).Then().Schedule(() =>
-                {
-                    panelTarget.Remove(lastContent);
-
-                    // the content may be reused again (e.g. notFoundContent), clear Y-axis bypass for displaying back properly.
-                    lastContent.BypassAutoSizeAxes = Axes.None;
-                });
+                lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y).Then().Schedule(() => panelTarget.Remove(lastContent));
             }
 
             if (!content.IsAlive)

From 3307e8357ff6f919ff649c6e8036b12c5d4ffb77 Mon Sep 17 00:00:00 2001
From: Mysfit <mysfit@mysfit.dev>
Date: Tue, 26 Jan 2021 00:36:32 -0500
Subject: [PATCH 07747/10326] DrawableStoryboardSample event method override
 for SamplePlaybackDisabledChanged

---
 osu.Game/Skinning/PausableSkinnableSound.cs   | 46 +++++++++----------
 .../Drawables/DrawableStoryboardSample.cs     | 14 +++---
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index d8149e76c0..e2794938ad 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,14 +18,6 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
-        /// <summary>
-        /// Whether this <see cref="PausableSkinnableSound"/> is affected by
-        /// a higher-level <see cref="ISamplePlaybackDisabler"/>'s state changes.
-        /// By default only looping samples are started/stopped on sample disable
-        /// to prevent one-time samples from cutting off abruptly.
-        /// </summary>
-        protected virtual bool AffectedBySamplePlaybackDisable => Looping;
-
         public PausableSkinnableSound()
         {
         }
@@ -51,24 +43,28 @@ namespace osu.Game.Skinning
             if (samplePlaybackDisabler != null)
             {
                 samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
-                samplePlaybackDisabled.BindValueChanged(disabled =>
+                samplePlaybackDisabled.BindValueChanged(SamplePlaybackDisabledChanged);
+            }
+        }
+
+        protected virtual void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
+        {
+            if (!RequestedPlaying) return;
+
+            // let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
+            if (!Looping) return;
+
+            cancelPendingStart();
+
+            if (disabled.NewValue)
+                base.Stop();
+            else
+            {
+                // schedule so we don't start playing a sample which is no longer alive.
+                scheduledStart = Schedule(() =>
                 {
-                    if (!RequestedPlaying) return;
-                    if (!AffectedBySamplePlaybackDisable) return;
-
-                    cancelPendingStart();
-
-                    if (disabled.NewValue)
-                        base.Stop();
-                    else
-                    {
-                        // schedule so we don't start playing a sample which is no longer alive.
-                        scheduledStart = Schedule(() =>
-                        {
-                            if (RequestedPlaying)
-                                base.Play();
-                        });
-                    }
+                    if (RequestedPlaying)
+                        base.Play();
                 });
             }
         }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 5a800a71fd..db8428f062 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -21,12 +21,6 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
-        /// <remarks>
-        /// Contrary to <see cref="PausableSkinnableSound"/>, all <see cref="DrawableStoryboardSample"/>s are affected
-        /// by sample disables, as they are oftentimes longer-running sound effects. This also matches stable behaviour.
-        /// </remarks>
-        protected override bool AffectedBySamplePlaybackDisable => true;
-
         public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
             : base(sampleInfo)
         {
@@ -48,6 +42,14 @@ namespace osu.Game.Storyboards.Drawables
             }
         }
 
+        protected override void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
+        {
+            if (!RequestedPlaying) return;
+
+            if (disabled.NewValue)
+                Stop();
+        }
+
         protected override void Update()
         {
             base.Update();

From ca0242debef0c77bde87d7f4fecdc84f3b65a8b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 15:42:48 +0900
Subject: [PATCH 07748/10326] Tidy up logic to correctly expire in cases where
 expiry is expected

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 27 +++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index fc90968ec4..de566c92cb 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -178,24 +178,29 @@ namespace osu.Game.Overlays
 
             var lastContent = currentContent;
 
-            // "not found" placeholder is reused, only remove without disposing through expire.
-            if (lastContent == notFoundContent)
-                lastContent.FadeOut(100, Easing.OutQuint).Schedule(() => panelTarget.Remove(lastContent));
-            else if (lastContent != null)
+            if (lastContent != null)
             {
-                lastContent.FadeOut(100, Easing.OutQuint).Expire();
+                var transform = lastContent.FadeOut(100, Easing.OutQuint);
 
-                // 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).Then().Schedule(() => panelTarget.Remove(lastContent));
+                if (lastContent == notFoundContent)
+                {
+                    // not found display may be used multiple times, so don't expire/dispose it.
+                    transform.Schedule(() => panelTarget.Remove(lastContent));
+                }
+                else
+                {
+                    // 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).Then().Schedule(() => lastContent.Expire());
+                }
             }
 
             if (!content.IsAlive)
                 panelTarget.Add(content);
-            content.FadeInFromZero(200, Easing.OutQuint);
 
+            content.FadeInFromZero(200, Easing.OutQuint);
             currentContent = content;
         }
 

From 60ae87ec383645e61194bf51f19e94d55a342023 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 16:25:49 +0900
Subject: [PATCH 07749/10326] Add MessagePack package

---
 osu.Game/osu.Game.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 2b8f81532d..3e971d9d4f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,6 +22,7 @@
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.11" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />

From e4fc6041635c4aebfbb791c6e671324ad9156abf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 16:26:03 +0900
Subject: [PATCH 07750/10326] Setup all multiplayer model classes for
 MessagePack support

---
 osu.Game/Online/API/APIMod.cs                          |  7 ++++++-
 osu.Game/Online/Multiplayer/MultiplayerRoom.cs         | 10 +++++++++-
 osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs |  7 +++++++
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs     |  8 +++++++-
 osu.Game/Online/Rooms/BeatmapAvailability.cs           |  6 +++++-
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index c8b76b9685..69ce3825ee 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Humanizer;
+using MessagePack;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
@@ -13,16 +14,20 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Online.API
 {
+    [MessagePackObject]
     public class APIMod : IMod
     {
         [JsonProperty("acronym")]
+        [Key(0)]
         public string Acronym { get; set; }
 
         [JsonProperty("settings")]
+        [Key(1)]
         public Dictionary<string, object> Settings { get; set; } = new Dictionary<string, object>();
 
         [JsonConstructor]
-        private APIMod()
+        [SerializationConstructor]
+        public APIMod()
         {
         }
 
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
index 12fcf25ace..c5fa6253ed 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using MessagePack;
 using Newtonsoft.Json;
 
 namespace osu.Game.Online.Multiplayer
@@ -13,35 +14,42 @@ namespace osu.Game.Online.Multiplayer
     /// A multiplayer room.
     /// </summary>
     [Serializable]
+    [MessagePackObject]
     public class MultiplayerRoom
     {
         /// <summary>
         /// The ID of the room, used for database persistence.
         /// </summary>
+        [Key(0)]
         public readonly long RoomID;
 
         /// <summary>
         /// The current state of the room (ie. whether it is in progress or otherwise).
         /// </summary>
+        [Key(1)]
         public MultiplayerRoomState State { get; set; }
 
         /// <summary>
         /// All currently enforced game settings for this room.
         /// </summary>
+        [Key(2)]
         public MultiplayerRoomSettings Settings { get; set; } = new MultiplayerRoomSettings();
 
         /// <summary>
         /// All users currently in this room.
         /// </summary>
+        [Key(3)]
         public List<MultiplayerRoomUser> Users { get; set; } = new List<MultiplayerRoomUser>();
 
         /// <summary>
         /// The host of this room, in control of changing room settings.
         /// </summary>
+        [Key(4)]
         public MultiplayerRoomUser? Host { get; set; }
 
         [JsonConstructor]
-        public MultiplayerRoom(in long roomId)
+        [SerializationConstructor]
+        public MultiplayerRoom(long roomId)
         {
             RoomID = roomId;
         }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 857b38ea60..0ead5db84c 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -7,22 +7,29 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
+using MessagePack;
 using osu.Game.Online.API;
 
 namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
+    [MessagePackObject]
     public class MultiplayerRoomSettings : IEquatable<MultiplayerRoomSettings>
     {
+        [Key(0)]
         public int BeatmapID { get; set; }
 
+        [Key(1)]
         public int RulesetID { get; set; }
 
+        [Key(2)]
         public string BeatmapChecksum { get; set; } = string.Empty;
 
+        [Key(3)]
         public string Name { get; set; } = "Unnamed room";
 
         [NotNull]
+        [Key(4)]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
         public bool Equals(MultiplayerRoomSettings other)
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 2590acbc81..b300be9f60 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using MessagePack;
 using Newtonsoft.Json;
 using osu.Game.Online.Rooms;
 using osu.Game.Users;
@@ -11,21 +12,26 @@ using osu.Game.Users;
 namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
+    [MessagePackObject]
     public class MultiplayerRoomUser : IEquatable<MultiplayerRoomUser>
     {
+        [Key(0)]
         public readonly int UserID;
 
+        [Key(1)]
         public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
 
         /// <summary>
         /// The availability state of the current beatmap.
         /// </summary>
+        [Key(2)]
         public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
+        [IgnoreMember]
         public User? User { get; set; }
 
         [JsonConstructor]
-        public MultiplayerRoomUser(in int userId)
+        public MultiplayerRoomUser(int userId)
         {
             UserID = userId;
         }
diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index e7dbc5f436..38bd236718 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using MessagePack;
 using Newtonsoft.Json;
 
 namespace osu.Game.Online.Rooms
@@ -9,20 +10,23 @@ namespace osu.Game.Online.Rooms
     /// <summary>
     /// The local availability information about a certain beatmap for the client.
     /// </summary>
+    [MessagePackObject]
     public class BeatmapAvailability : IEquatable<BeatmapAvailability>
     {
         /// <summary>
         /// The beatmap's availability state.
         /// </summary>
+        [Key(0)]
         public readonly DownloadState State;
 
         /// <summary>
         /// The beatmap's downloading progress, null when not in <see cref="DownloadState.Downloading"/> state.
         /// </summary>
+        [Key(1)]
         public readonly double? DownloadProgress;
 
         [JsonConstructor]
-        private BeatmapAvailability(DownloadState state, double? downloadProgress = null)
+        public BeatmapAvailability(DownloadState state, double? downloadProgress = null)
         {
             State = state;
             DownloadProgress = downloadProgress;

From 9537090d28bb29994e5a2902c4091e69bc15856b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 16:39:35 +0900
Subject: [PATCH 07751/10326] Setup all spectator model classes for MessagePack

---
 osu.Game/Online/Spectator/FrameDataBundle.cs |  4 ++++
 osu.Game/Online/Spectator/FrameHeader.cs     | 10 +++++++++-
 osu.Game/Online/Spectator/SpectatorState.cs  |  5 +++++
 osu.Game/Replays/Legacy/LegacyReplayFrame.cs | 13 +++++++++++++
 osu.Game/Rulesets/Replays/ReplayFrame.cs     |  4 ++++
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/FrameDataBundle.cs b/osu.Game/Online/Spectator/FrameDataBundle.cs
index a8d0434324..0e59cdf4ce 100644
--- a/osu.Game/Online/Spectator/FrameDataBundle.cs
+++ b/osu.Game/Online/Spectator/FrameDataBundle.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using MessagePack;
 using Newtonsoft.Json;
 using osu.Game.Replays.Legacy;
 using osu.Game.Scoring;
@@ -12,10 +13,13 @@ using osu.Game.Scoring;
 namespace osu.Game.Online.Spectator
 {
     [Serializable]
+    [MessagePackObject]
     public class FrameDataBundle
     {
+        [Key(0)]
         public FrameHeader Header { get; set; }
 
+        [Key(1)]
         public IEnumerable<LegacyReplayFrame> Frames { get; set; }
 
         public FrameDataBundle(ScoreInfo score, IEnumerable<LegacyReplayFrame> frames)
diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index 135b356eda..adfcbcd95a 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using MessagePack;
 using Newtonsoft.Json;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -12,31 +13,37 @@ using osu.Game.Scoring;
 namespace osu.Game.Online.Spectator
 {
     [Serializable]
+    [MessagePackObject]
     public class FrameHeader
     {
         /// <summary>
         /// The current accuracy of the score.
         /// </summary>
+        [Key(0)]
         public double Accuracy { get; set; }
 
         /// <summary>
         /// The current combo of the score.
         /// </summary>
+        [Key(1)]
         public int Combo { get; set; }
 
         /// <summary>
         /// The maximum combo achieved up to the current point in time.
         /// </summary>
+        [Key(2)]
         public int MaxCombo { get; set; }
 
         /// <summary>
         /// Cumulative hit statistics.
         /// </summary>
+        [Key(3)]
         public Dictionary<HitResult, int> Statistics { get; set; }
 
         /// <summary>
         /// The time at which this frame was received by the server.
         /// </summary>
+        [Key(4)]
         public DateTimeOffset ReceivedTime { get; set; }
 
         /// <summary>
@@ -54,7 +61,8 @@ namespace osu.Game.Online.Spectator
         }
 
         [JsonConstructor]
-        public FrameHeader(int combo, int maxCombo, double accuracy, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime)
+        [SerializationConstructor]
+        public FrameHeader(double accuracy, int combo, int maxCombo, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime)
         {
             Combo = combo;
             MaxCombo = maxCombo;
diff --git a/osu.Game/Online/Spectator/SpectatorState.cs b/osu.Game/Online/Spectator/SpectatorState.cs
index 101ce3d5d5..96a875bc14 100644
--- a/osu.Game/Online/Spectator/SpectatorState.cs
+++ b/osu.Game/Online/Spectator/SpectatorState.cs
@@ -5,18 +5,23 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using MessagePack;
 using osu.Game.Online.API;
 
 namespace osu.Game.Online.Spectator
 {
     [Serializable]
+    [MessagePackObject]
     public class SpectatorState : IEquatable<SpectatorState>
     {
+        [Key(0)]
         public int? BeatmapID { get; set; }
 
+        [Key(1)]
         public int? RulesetID { get; set; }
 
         [NotNull]
+        [Key(2)]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
         public bool Equals(SpectatorState other) => BeatmapID == other?.BeatmapID && Mods.SequenceEqual(other?.Mods) && RulesetID == other?.RulesetID;
diff --git a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
index 74bacae9e1..ab9ccda9b9 100644
--- a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
+++ b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
@@ -1,38 +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 MessagePack;
 using Newtonsoft.Json;
 using osu.Game.Rulesets.Replays;
 using osuTK;
 
 namespace osu.Game.Replays.Legacy
 {
+    [MessagePackObject]
     public class LegacyReplayFrame : ReplayFrame
     {
         [JsonIgnore]
+        [IgnoreMember]
         public Vector2 Position => new Vector2(MouseX ?? 0, MouseY ?? 0);
 
+        [Key(1)]
         public float? MouseX;
+
+        [Key(2)]
         public float? MouseY;
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseLeft => MouseLeft1 || MouseLeft2;
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseRight => MouseRight1 || MouseRight2;
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseLeft1 => ButtonState.HasFlag(ReplayButtonState.Left1);
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseRight1 => ButtonState.HasFlag(ReplayButtonState.Right1);
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseLeft2 => ButtonState.HasFlag(ReplayButtonState.Left2);
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseRight2 => ButtonState.HasFlag(ReplayButtonState.Right2);
 
+        [Key(3)]
         public ReplayButtonState ButtonState;
 
         public LegacyReplayFrame(double time, float? mouseX, float? mouseY, ReplayButtonState buttonState)
diff --git a/osu.Game/Rulesets/Replays/ReplayFrame.cs b/osu.Game/Rulesets/Replays/ReplayFrame.cs
index 85e068ae79..7de53211a2 100644
--- a/osu.Game/Rulesets/Replays/ReplayFrame.cs
+++ b/osu.Game/Rulesets/Replays/ReplayFrame.cs
@@ -1,10 +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 MessagePack;
+
 namespace osu.Game.Rulesets.Replays
 {
+    [MessagePackObject]
     public class ReplayFrame
     {
+        [Key(0)]
         public double Time;
 
         public ReplayFrame()

From 20cfa991bffbe1cb4255b6cc45cda39b16cc28f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 17:41:21 +0900
Subject: [PATCH 07752/10326] Switch clients to MessagePack mode

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs      | 2 +-
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 50dc8f661c..3221456e75 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Online.Multiplayer
                          {
                              options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
                          })
-                         .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
+                         .AddMessagePackProtocol()
                          .Build();
 
             // this is kind of SILLY
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 344b73f3d9..cc866b7ad9 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Online.Spectator
                          {
                              options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
                          })
-                         .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
+                         .AddMessagePackProtocol()
                          .Build();
 
             // until strong typed client support is added, each method must be manually bound (see https://github.com/dotnet/aspnetcore/issues/15198)

From 15885c17af58234c63ea154178f2156854e95bd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 18:07:43 +0900
Subject: [PATCH 07753/10326] Remove unused usings

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs      | 1 -
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 3221456e75..0d779232d0 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index cc866b7ad9..dac2131035 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;

From b573c96c079f9065ee4690131f4677eeeb2998be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 18:59:42 +0900
Subject: [PATCH 07754/10326] Move disconnect logic inside connection loop to
 ensure previous connection is disposed

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 391658f0d0..cbb91c0832 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -71,14 +71,15 @@ namespace osu.Game.Online.Multiplayer
 
             try
             {
-                await disconnect(false);
-
                 // this token will be valid for the scope of this connection.
                 // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
                 var cancellationToken = connectCancelSource.Token;
 
                 while (api.State.Value == APIState.Online)
                 {
+                    // ensure any previous connection was disposed.
+                    await disconnect(false);
+
                     cancellationToken.ThrowIfCancellationRequested();
 
                     Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);

From a5f3418e561efcf05800d4d2d61f9182091467a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 19:11:19 +0900
Subject: [PATCH 07755/10326] Avoid tooltip display

---
 .../Components/TournamentModDisplay.cs           |  2 +-
 osu.Game/Overlays/Mods/ModButton.cs              | 16 +++-------------
 osu.Game/Rulesets/UI/ModIcon.cs                  | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
index 3df8550667..fa9ee7edff 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Tournament.Components
                 if (modIcon == null)
                     return;
 
-                AddInternal(new ModIcon(modIcon)
+                AddInternal(new ModIcon(modIcon, false)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index ab8efdabcc..8e0d1f5bbd 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -236,13 +236,13 @@ namespace osu.Game.Overlays.Mods
             {
                 iconsContainer.AddRange(new[]
                 {
-                    backgroundIcon = new PassThroughTooltipModIcon(Mods[1])
+                    backgroundIcon = new ModIcon(Mods[1], false)
                     {
                         Origin = Anchor.BottomRight,
                         Anchor = Anchor.BottomRight,
                         Position = new Vector2(1.5f),
                     },
-                    foregroundIcon = new PassThroughTooltipModIcon(Mods[0])
+                    foregroundIcon = new ModIcon(Mods[0], false)
                     {
                         Origin = Anchor.BottomRight,
                         Anchor = Anchor.BottomRight,
@@ -252,7 +252,7 @@ namespace osu.Game.Overlays.Mods
             }
             else
             {
-                iconsContainer.Add(foregroundIcon = new PassThroughTooltipModIcon(Mod)
+                iconsContainer.Add(foregroundIcon = new ModIcon(Mod, false)
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
@@ -297,15 +297,5 @@ namespace osu.Game.Overlays.Mods
 
             Mod = mod;
         }
-
-        private class PassThroughTooltipModIcon : ModIcon
-        {
-            public override string TooltipText => null;
-
-            public PassThroughTooltipModIcon(Mod mod)
-                : base(mod)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 8ea6c74349..04a2e052fa 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -16,6 +16,9 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.UI
 {
+    /// <summary>
+    /// Display the specified mod at a fixed size.
+    /// </summary>
     public class ModIcon : Container, IHasTooltip
     {
         public readonly BindableBool Selected = new BindableBool();
@@ -28,9 +31,10 @@ namespace osu.Game.Rulesets.UI
 
         private readonly ModType type;
 
-        public virtual string TooltipText => mod.IconTooltip;
+        public virtual string TooltipText => showTooltip ? mod.IconTooltip : null;
 
         private Mod mod;
+        private readonly bool showTooltip;
 
         public Mod Mod
         {
@@ -42,9 +46,15 @@ namespace osu.Game.Rulesets.UI
             }
         }
 
-        public ModIcon(Mod mod)
+        /// <summary>
+        /// Construct a new instance.
+        /// </summary>
+        /// <param name="mod">The mod to be displayed</param>
+        /// <param name="showTooltip">Whether a tooltip describing the mod should display on hover.</param>
+        public ModIcon(Mod mod, bool showTooltip = true)
         {
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
+            this.showTooltip = showTooltip;
 
             type = mod.Type;
 

From 64a3c712aa8be74bb2d32fddeb55fc364a3cb0fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 19:15:19 +0900
Subject: [PATCH 07756/10326] Rename class and add xmldoc

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 2 +-
 .../{TournamentModDisplay.cs => TournamentModIcon.cs}    | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
 rename osu.Game.Tournament/Components/{TournamentModDisplay.cs => TournamentModIcon.cs} (86%)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 8cc4566c08..d1197b1a61 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Tournament.Components
 
             if (!string.IsNullOrEmpty(mod))
             {
-                AddInternal(new TournamentModDisplay(mod)
+                AddInternal(new TournamentModIcon(mod)
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModIcon.cs
similarity index 86%
rename from osu.Game.Tournament/Components/TournamentModDisplay.cs
rename to osu.Game.Tournament/Components/TournamentModIcon.cs
index fa9ee7edff..b53ecc02f8 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModIcon.cs
@@ -14,16 +14,19 @@ using osuTK;
 
 namespace osu.Game.Tournament.Components
 {
-    public class TournamentModDisplay : CompositeDrawable
+    /// <summary>
+    /// Mod icon displayed in tournament usages, allowing user overridden graphics.
+    /// </summary>
+    public class TournamentModIcon : CompositeDrawable
     {
         private readonly string modAcronym;
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        public TournamentModDisplay(string mod)
+        public TournamentModIcon(string modAcronym)
         {
-            modAcronym = mod;
+            this.modAcronym = modAcronym;
         }
 
         [BackgroundDependencyLoader]

From 81ab82fafe13df7aa513c5d64f3bb205feac6102 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 19:16:38 +0900
Subject: [PATCH 07757/10326] Tidy up nesting

---
 .../Components/TournamentModIcon.cs           | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentModIcon.cs b/osu.Game.Tournament/Components/TournamentModIcon.cs
index b53ecc02f8..43ac92d285 100644
--- a/osu.Game.Tournament/Components/TournamentModIcon.cs
+++ b/osu.Game.Tournament/Components/TournamentModIcon.cs
@@ -32,9 +32,9 @@ namespace osu.Game.Tournament.Components
         [BackgroundDependencyLoader]
         private void load(TextureStore textures, LadderInfo ladderInfo)
         {
-            var texture = textures.Get($"mods/{modAcronym}");
+            var customTexture = textures.Get($"mods/{modAcronym}");
 
-            if (texture != null)
+            if (customTexture != null)
             {
                 AddInternal(new Sprite
                 {
@@ -42,24 +42,24 @@ namespace osu.Game.Tournament.Components
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
-                    Texture = texture
+                    Texture = customTexture
                 });
+
+                return;
             }
-            else
+
+            var ruleset = rulesets.GetRuleset(ladderInfo.Ruleset.Value?.ID ?? 0);
+            var modIcon = ruleset?.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == modAcronym);
+
+            if (modIcon == null)
+                return;
+
+            AddInternal(new ModIcon(modIcon, false)
             {
-                var ruleset = rulesets.GetRuleset(ladderInfo.Ruleset.Value?.ID ?? 0);
-                var modIcon = ruleset?.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == modAcronym);
-
-                if (modIcon == null)
-                    return;
-
-                AddInternal(new ModIcon(modIcon, false)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(0.5f)
-                });
-            }
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(0.5f)
+            });
         }
     }
 }

From 8c3b0a316737eb359c4d00e03001ab7167ed0633 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 Jan 2021 22:47:37 +0900
Subject: [PATCH 07758/10326] Fix TaskChain performing the action in-line, add
 test

---
 osu.Game.Tests/NonVisual/TaskChainTest.cs | 83 +++++++++++++++++++++++
 osu.Game/Utils/TaskChain.cs               | 28 ++++++--
 2 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Tests/NonVisual/TaskChainTest.cs

diff --git a/osu.Game.Tests/NonVisual/TaskChainTest.cs b/osu.Game.Tests/NonVisual/TaskChainTest.cs
new file mode 100644
index 0000000000..d561fb4c1b
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/TaskChainTest.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 System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Game.Utils;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class TaskChainTest
+    {
+        private TaskChain taskChain;
+        private int currentTask;
+
+        [SetUp]
+        public void Setup()
+        {
+            taskChain = new TaskChain();
+            currentTask = 0;
+        }
+
+        [Test]
+        public async Task TestChainedTasksRunSequentially()
+        {
+            var task1 = addTask();
+            var task2 = addTask();
+            var task3 = addTask();
+
+            task3.mutex.Set();
+            task2.mutex.Set();
+            task1.mutex.Set();
+
+            await Task.WhenAll(task1.task, task2.task, task3.task);
+
+            Assert.That(task1.task.Result, Is.EqualTo(1));
+            Assert.That(task2.task.Result, Is.EqualTo(2));
+            Assert.That(task3.task.Result, Is.EqualTo(3));
+        }
+
+        [Test]
+        public async Task TestChainedTaskWithIntermediateCancelRunsInSequence()
+        {
+            var task1 = addTask();
+            var task2 = addTask();
+            var task3 = addTask();
+
+            // Cancel task2, allow task3 to complete.
+            task2.cancellation.Cancel();
+            task2.mutex.Set();
+            task3.mutex.Set();
+
+            // Allow task3 to potentially complete.
+            Thread.Sleep(1000);
+
+            // Allow task1 to complete.
+            task1.mutex.Set();
+
+            // Wait on both tasks.
+            await Task.WhenAll(task1.task, task3.task);
+
+            Assert.That(task1.task.Result, Is.EqualTo(1));
+            Assert.That(task2.task.IsCompleted, Is.False);
+            Assert.That(task3.task.Result, Is.EqualTo(2));
+        }
+
+        private (Task<int> task, ManualResetEventSlim mutex, CancellationTokenSource cancellation) addTask()
+        {
+            var mutex = new ManualResetEventSlim(false);
+            var cancellationSource = new CancellationTokenSource();
+            var completionSource = new TaskCompletionSource<int>();
+
+            taskChain.Add(() =>
+            {
+                mutex.Wait(CancellationToken.None);
+                completionSource.SetResult(Interlocked.Increment(ref currentTask));
+            }, cancellationSource.Token);
+
+            return (completionSource.Task, mutex, cancellationSource);
+        }
+    }
+}
diff --git a/osu.Game/Utils/TaskChain.cs b/osu.Game/Utils/TaskChain.cs
index 64d523bd3d..2bc2c00e28 100644
--- a/osu.Game/Utils/TaskChain.cs
+++ b/osu.Game/Utils/TaskChain.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace osu.Game.Utils
@@ -19,15 +20,32 @@ namespace osu.Game.Utils
         /// <summary>
         /// Adds a new task to the end of this <see cref="TaskChain"/>.
         /// </summary>
-        /// <param name="taskFunc">The task creation function.</param>
+        /// <param name="action">The action to be executed.</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> for this task. Does not affect further tasks in the chain.</param>
         /// <returns>The awaitable <see cref="Task"/>.</returns>
-        public Task Add(Func<Task> taskFunc)
+        public Task Add(Action action, CancellationToken cancellationToken = default)
         {
             lock (currentTaskLock)
             {
-                currentTask = currentTask == null
-                    ? taskFunc()
-                    : currentTask.ContinueWith(_ => taskFunc()).Unwrap();
+                // Note: Attaching the cancellation token to the continuation could lead to re-ordering of tasks in the chain.
+                // Therefore, the cancellation token is not used to cancel the continuation but only the run of each task.
+                if (currentTask == null)
+                {
+                    currentTask = Task.Run(() =>
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
+                        action();
+                    }, CancellationToken.None);
+                }
+                else
+                {
+                    currentTask = currentTask.ContinueWith(_ =>
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
+                        action();
+                    }, CancellationToken.None);
+                }
+
                 return currentTask;
             }
         }

From 085115cba538483ed2bbbfdac848a70a6ffdabb8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 Jan 2021 22:49:01 +0900
Subject: [PATCH 07759/10326] Make threading even more thread safe

---
 osu.Game/Extensions/TaskExtensions.cs         |  4 +-
 .../Multiplayer/StatefulMultiplayerClient.cs  | 82 ++++++++++++-------
 2 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index 4138c2757a..24f0188cf0 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -21,9 +21,9 @@ namespace osu.Game.Extensions
         /// Whether errors should be logged as errors visible to users, or as debug messages.
         /// Logging as debug will essentially silence the errors on non-release builds.
         /// </param>
-        public static void CatchUnobservedExceptions(this Task task, bool logAsError = false)
+        public static Task CatchUnobservedExceptions(this Task task, bool logAsError = false)
         {
-            task.ContinueWith(t =>
+            return task.ContinueWith(t =>
             {
                 Exception? exception = t.Exception?.AsSingular();
                 if (logAsError)
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 0e736ed7c6..3d8ab4b4c7 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -110,37 +110,49 @@ namespace osu.Game.Online.Multiplayer
         }
 
         private readonly TaskChain joinOrLeaveTaskChain = new TaskChain();
+        private CancellationTokenSource? joinCancellationSource;
 
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
         /// </summary>
         /// <param name="room">The API <see cref="Room"/>.</param>
-        public async Task JoinRoom(Room room) => await joinOrLeaveTaskChain.Add(async () =>
+        public async Task JoinRoom(Room room)
         {
-            if (Room != null)
-                throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
+            var cancellationSource = new CancellationTokenSource();
 
-            Debug.Assert(room.RoomID.Value != null);
-
-            // Join the server-side room.
-            var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
-            Debug.Assert(joinedRoom != null);
-
-            // Populate users.
-            Debug.Assert(joinedRoom.Users != null);
-            await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
-
-            // Update the stored room (must be done on update thread for thread-safety).
             await scheduleAsync(() =>
             {
-                Room = joinedRoom;
-                apiRoom = room;
-                playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
-            });
+                joinCancellationSource?.Cancel();
+                joinCancellationSource = cancellationSource;
+            }, CancellationToken.None);
 
-            // Update room settings.
-            await updateLocalRoomSettings(joinedRoom.Settings);
-        });
+            await joinOrLeaveTaskChain.Add(async () =>
+            {
+                if (Room != null)
+                    throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
+
+                Debug.Assert(room.RoomID.Value != null);
+
+                // Join the server-side room.
+                var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
+                Debug.Assert(joinedRoom != null);
+
+                // Populate users.
+                Debug.Assert(joinedRoom.Users != null);
+                await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
+
+                // Update the stored room (must be done on update thread for thread-safety).
+                await scheduleAsync(() =>
+                {
+                    Room = joinedRoom;
+                    apiRoom = room;
+                    playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
+                }, cancellationSource.Token);
+
+                // Update room settings.
+                await updateLocalRoomSettings(joinedRoom.Settings, cancellationSource.Token);
+            }, cancellationSource.Token);
+        }
 
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> with a given ID.
@@ -151,14 +163,15 @@ namespace osu.Game.Online.Multiplayer
 
         public Task LeaveRoom()
         {
-            if (Room == null)
-                return Task.FromCanceled(new CancellationToken(true));
-
             // Leaving rooms is expected to occur instantaneously whilst the operation is finalised in the background.
             // However a few members need to be reset immediately to prevent other components from entering invalid states whilst the operation hasn't yet completed.
             // For example, if a room was left and the user immediately pressed the "create room" button, then the user could be taken into the lobby if the value of Room is not reset in time.
             var scheduledReset = scheduleAsync(() =>
             {
+                // The join may have not completed yet, so certain tasks that either update the room or reference the room should be cancelled.
+                // This includes the setting of Room itself along with the initial update of the room settings on join.
+                joinCancellationSource?.Cancel();
+
                 apiRoom = null;
                 Room = null;
                 CurrentMatchPlayingUserIds.Clear();
@@ -169,7 +182,7 @@ namespace osu.Game.Online.Multiplayer
             return joinOrLeaveTaskChain.Add(async () =>
             {
                 await scheduledReset;
-                await LeaveRoomInternal();
+                await LeaveRoomInternal().CatchUnobservedExceptions();
             });
         }
 
@@ -455,7 +468,8 @@ namespace osu.Game.Online.Multiplayer
         /// This updates both the joined <see cref="MultiplayerRoom"/> and the respective API <see cref="Room"/>.
         /// </remarks>
         /// <param name="settings">The new <see cref="MultiplayerRoomSettings"/> to update from.</param>
-        private Task updateLocalRoomSettings(MultiplayerRoomSettings settings) => scheduleAsync(() =>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to cancel the update.</param>
+        private Task updateLocalRoomSettings(MultiplayerRoomSettings settings, CancellationToken cancellationToken = default) => scheduleAsync(() =>
         {
             if (Room == null)
                 return;
@@ -473,10 +487,17 @@ namespace osu.Game.Online.Multiplayer
             RoomUpdated?.Invoke();
 
             var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-            req.Success += res => updatePlaylist(settings, res);
+
+            req.Success += res =>
+            {
+                if (cancellationToken.IsCancellationRequested)
+                    return;
+
+                updatePlaylist(settings, res);
+            };
 
             api.Queue(req);
-        });
+        }, cancellationToken);
 
         private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)
         {
@@ -524,12 +545,15 @@ namespace osu.Game.Online.Multiplayer
                 CurrentMatchPlayingUserIds.Remove(userId);
         }
 
-        private Task scheduleAsync(Action action)
+        private Task scheduleAsync(Action action, CancellationToken cancellationToken = default)
         {
             var tcs = new TaskCompletionSource<bool>();
 
             Scheduler.Add(() =>
             {
+                if (cancellationToken.IsCancellationRequested)
+                    return;
+
                 try
                 {
                     action();

From 248989b3ebe9de5a1b24341774670be6533825d3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 01:20:50 +0900
Subject: [PATCH 07760/10326] wip

---
 osu.Game.Tests/NonVisual/TaskChainTest.cs     | 38 ++++++++++++++++--
 .../Multiplayer/StatefulMultiplayerClient.cs  |  2 +-
 osu.Game/Utils/TaskChain.cs                   | 39 +++++++------------
 3 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/TaskChainTest.cs b/osu.Game.Tests/NonVisual/TaskChainTest.cs
index d561fb4c1b..0a56468818 100644
--- a/osu.Game.Tests/NonVisual/TaskChainTest.cs
+++ b/osu.Game.Tests/NonVisual/TaskChainTest.cs
@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using osu.Game.Extensions;
 using osu.Game.Utils;
 
 namespace osu.Game.Tests.NonVisual
@@ -13,14 +14,22 @@ namespace osu.Game.Tests.NonVisual
     {
         private TaskChain taskChain;
         private int currentTask;
+        private CancellationTokenSource globalCancellationToken;
 
         [SetUp]
         public void Setup()
         {
+            globalCancellationToken = new CancellationTokenSource();
             taskChain = new TaskChain();
             currentTask = 0;
         }
 
+        [TearDown]
+        public void TearDown()
+        {
+            globalCancellationToken?.Cancel();
+        }
+
         [Test]
         public async Task TestChainedTasksRunSequentially()
         {
@@ -65,17 +74,40 @@ namespace osu.Game.Tests.NonVisual
             Assert.That(task3.task.Result, Is.EqualTo(2));
         }
 
+        [Test]
+        public async Task TestChainedTaskDoesNotCompleteBeforeChildTasks()
+        {
+            var mutex = new ManualResetEventSlim(false);
+
+            var task = taskChain.Add(async () =>
+            {
+                await Task.Run(() => mutex.Wait(globalCancellationToken.Token)).CatchUnobservedExceptions();
+            });
+
+            // Allow task to potentially complete
+            Thread.Sleep(1000);
+
+            Assert.That(task.IsCompleted, Is.False);
+
+            // Allow the task to complete.
+            mutex.Set();
+
+            await task;
+        }
+
         private (Task<int> task, ManualResetEventSlim mutex, CancellationTokenSource cancellation) addTask()
         {
             var mutex = new ManualResetEventSlim(false);
-            var cancellationSource = new CancellationTokenSource();
             var completionSource = new TaskCompletionSource<int>();
 
+            var cancellationSource = new CancellationTokenSource();
+            var token = CancellationTokenSource.CreateLinkedTokenSource(cancellationSource.Token, globalCancellationToken.Token);
+
             taskChain.Add(() =>
             {
-                mutex.Wait(CancellationToken.None);
+                mutex.Wait(globalCancellationToken.Token);
                 completionSource.SetResult(Interlocked.Increment(ref currentTask));
-            }, cancellationSource.Token);
+            }, token.Token);
 
             return (completionSource.Task, mutex, cancellationSource);
         }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 3d8ab4b4c7..5c6a0d34e0 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Online.Multiplayer
             return joinOrLeaveTaskChain.Add(async () =>
             {
                 await scheduledReset;
-                await LeaveRoomInternal().CatchUnobservedExceptions();
+                await LeaveRoomInternal();
             });
         }
 
diff --git a/osu.Game/Utils/TaskChain.cs b/osu.Game/Utils/TaskChain.cs
index 2bc2c00e28..30aea7578f 100644
--- a/osu.Game/Utils/TaskChain.cs
+++ b/osu.Game/Utils/TaskChain.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Utils
     /// </summary>
     public class TaskChain
     {
-        private readonly object currentTaskLock = new object();
-        private Task? currentTask;
+        private readonly object finalTaskLock = new object();
+        private Task? finalTask;
 
         /// <summary>
         /// Adds a new task to the end of this <see cref="TaskChain"/>.
@@ -23,31 +23,22 @@ namespace osu.Game.Utils
         /// <param name="action">The action to be executed.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> for this task. Does not affect further tasks in the chain.</param>
         /// <returns>The awaitable <see cref="Task"/>.</returns>
-        public Task Add(Action action, CancellationToken cancellationToken = default)
+        public async Task Add(Action action, CancellationToken cancellationToken = default)
         {
-            lock (currentTaskLock)
-            {
-                // Note: Attaching the cancellation token to the continuation could lead to re-ordering of tasks in the chain.
-                // Therefore, the cancellation token is not used to cancel the continuation but only the run of each task.
-                if (currentTask == null)
-                {
-                    currentTask = Task.Run(() =>
-                    {
-                        cancellationToken.ThrowIfCancellationRequested();
-                        action();
-                    }, CancellationToken.None);
-                }
-                else
-                {
-                    currentTask = currentTask.ContinueWith(_ =>
-                    {
-                        cancellationToken.ThrowIfCancellationRequested();
-                        action();
-                    }, CancellationToken.None);
-                }
+            Task? previousTask;
+            Task currentTask;
 
-                return currentTask;
+            lock (finalTaskLock)
+            {
+                previousTask = finalTask;
+                finalTask = currentTask = new Task(action, cancellationToken);
             }
+
+            if (previousTask != null)
+                await previousTask;
+
+            currentTask.Start();
+            await currentTask;
         }
     }
 }

From 9f9206726a0cd9cbae347ed26264434f37a86738 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 26 Jan 2021 18:11:54 +0100
Subject: [PATCH 07761/10326] Fix typos.

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 4 ++--
 osu.Game/Database/ArchiveModelManager.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index a455f676b3..43b2486ac5 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -66,9 +66,9 @@ namespace osu.Game.Beatmaps
 
         protected override bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
 
-        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStoage)
+        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
         {
-            var songStorage = stableStoage.GetSongStorage();
+            var songStorage = stableStorage.GetSongStorage();
             return songStorage.GetDirectories(".").Select(path => songStorage.GetFullPath(path));
         }
 
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 516f70c700..99301b6c68 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -645,8 +645,8 @@ namespace osu.Game.Database
         /// <summary>
         /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
-        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath)
-                                                                                                              .Select(path => stableStoage.GetFullPath(path));
+        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) => stableStorage.GetDirectories(ImportFromStablePath)
+                                                                                                              .Select(path => stableStorage.GetFullPath(path));
 
         /// <summary>
         /// Whether this specified path should be removed after successful import.

From 043385f91928204cba2a292469eecfd65fd086a9 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 26 Jan 2021 18:26:01 +0100
Subject: [PATCH 07762/10326] Rename const and fix unintended tabbing.

---
 osu.Game/Database/ArchiveModelManager.cs | 2 +-
 osu.Game/IO/StableStorage.cs             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 99301b6c68..ae1608d801 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -646,7 +646,7 @@ namespace osu.Game.Database
         /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
         protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) => stableStorage.GetDirectories(ImportFromStablePath)
-                                                                                                              .Select(path => stableStorage.GetFullPath(path));
+                                                                                                                .Select(path => stableStorage.GetFullPath(path));
 
         /// <summary>
         /// Whether this specified path should be removed after successful import.
diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index 85af92621b..88a087087e 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -14,7 +14,7 @@ namespace osu.Game.IO
     /// </summary>
     public class StableStorage : DesktopStorage
     {
-        private const string stable_songs_path = "Songs";
+        private const string stable_default_songs_path = "Songs";
 
         private readonly DesktopGameHost host;
         private readonly string songsPath;
@@ -36,7 +36,7 @@ namespace osu.Game.IO
             var configFile = GetStream(GetFiles(".", "osu!.*.cfg").First());
             var textReader = new StreamReader(configFile);
 
-            var songsDirectoryPath = Path.Combine(BasePath, stable_songs_path);
+            var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
 
             while (!textReader.EndOfStream)
             {

From 2a2b6f347e7e8af533e3a9053497fe7ee77898eb Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 26 Jan 2021 19:07:05 +0100
Subject: [PATCH 07763/10326] Use a lazy for delegating Songs directory
 locating until it is actually used.

---
 osu.Game/IO/StableStorage.cs | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index 88a087087e..ebceba6ce0 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -17,38 +17,43 @@ namespace osu.Game.IO
         private const string stable_default_songs_path = "Songs";
 
         private readonly DesktopGameHost host;
-        private readonly string songsPath;
+        private readonly Lazy<string> songsPath;
 
         public StableStorage(string path, DesktopGameHost host)
             : base(path, host)
         {
             this.host = host;
-            songsPath = locateSongsDirectory();
+            songsPath = new Lazy<string>(locateSongsDirectory);
         }
 
         /// <summary>
         /// Returns a <see cref="Storage"/> pointing to the osu-stable Songs directory.
         /// </summary>
-        public Storage GetSongStorage() => new DesktopStorage(songsPath, host);
+        public Storage GetSongStorage() => new DesktopStorage(songsPath.Value, host);
 
         private string locateSongsDirectory()
         {
-            var configFile = GetStream(GetFiles(".", "osu!.*.cfg").First());
-            var textReader = new StreamReader(configFile);
-
             var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
 
-            while (!textReader.EndOfStream)
+            var configFile = GetFiles(".", "osu!.*.cfg").FirstOrDefault();
+
+            if (configFile == null)
+                return songsDirectoryPath;
+
+            using (var textReader = new StreamReader(GetStream(configFile)))
             {
-                var line = textReader.ReadLine();
+                string line;
 
-                if (line?.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase) == true)
+                while ((line = textReader.ReadLine()) != null)
                 {
-                    var directory = line.Split('=')[1].TrimStart();
-                    if (Path.IsPathFullyQualified(directory))
-                        songsDirectoryPath = directory;
+                    if (line.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var directory = line.Split('=')[1].TrimStart();
+                        if (Path.IsPathFullyQualified(directory))
+                            songsDirectoryPath = directory;
 
-                    break;
+                        break;
+                    }
                 }
             }
 

From 383c40b99268b350e35d955b638781c75e09e682 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 26 Jan 2021 20:35:42 +0100
Subject: [PATCH 07764/10326] Address remaining reviews suggestions.

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 2 +-
 osu.Game/Database/ArchiveModelManager.cs | 6 +++---
 osu.Game/IO/StableStorage.cs             | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 43b2486ac5..4825569ee4 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        protected override bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
+        protected override bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
 
         protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
         {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index ae1608d801..fd94660a4b 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -640,10 +640,10 @@ namespace osu.Game.Database
         /// <summary>
         /// Checks for the existence of an osu-stable directory.
         /// </summary>
-        protected virtual bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.ExistsDirectory(ImportFromStablePath);
+        protected virtual bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.ExistsDirectory(ImportFromStablePath);
 
         /// <summary>
-        /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
+        /// Select paths to import from stable where all paths should be absolute. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
         protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) => stableStorage.GetDirectories(ImportFromStablePath)
                                                                                                                 .Select(path => stableStorage.GetFullPath(path));
@@ -668,7 +668,7 @@ namespace osu.Game.Database
                 return Task.CompletedTask;
             }
 
-            if (!CheckStableDirectoryExists(stable))
+            if (!StableDirectoryExists(stable))
             {
                 // This handles situations like when the user does not have a Skins folder
                 Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index ebceba6ce0..f86b18c724 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -35,12 +35,13 @@ namespace osu.Game.IO
         {
             var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
 
-            var configFile = GetFiles(".", "osu!.*.cfg").FirstOrDefault();
+            var configFile = GetFiles(".", "osu!.*.cfg").SingleOrDefault();
 
             if (configFile == null)
                 return songsDirectoryPath;
 
-            using (var textReader = new StreamReader(GetStream(configFile)))
+            using (var stream = GetStream(configFile))
+            using (var textReader = new StreamReader(stream))
             {
                 string line;
 

From 4d4d97661e7a8bbe924bdf4d2d5a414f017edb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Jan 2021 21:26:50 +0100
Subject: [PATCH 07765/10326] Fix connection loop always getting a cancelled
 token

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index cbb91c0832..319a8f7170 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -71,15 +71,16 @@ namespace osu.Game.Online.Multiplayer
 
             try
             {
-                // this token will be valid for the scope of this connection.
-                // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
-                var cancellationToken = connectCancelSource.Token;
-
                 while (api.State.Value == APIState.Online)
                 {
                     // ensure any previous connection was disposed.
+                    // this will also create a new cancellation token source.
                     await disconnect(false);
 
+                    // this token will be valid for the scope of this connection.
+                    // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
+                    var cancellationToken = connectCancelSource.Token;
+
                     cancellationToken.ThrowIfCancellationRequested();
 
                     Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);

From 690feb1c1e60aa563cdabad181344fda1dc5d62d Mon Sep 17 00:00:00 2001
From: Mysfit <mysfit@mysfit.dev>
Date: Tue, 26 Jan 2021 23:08:51 -0500
Subject: [PATCH 07766/10326] Allow looping storyboard samples to follow the
 base samplePlaybackDisabled event logic.

---
 .../Storyboards/Drawables/DrawableStoryboardSample.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index db8428f062..9041c10640 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -46,8 +46,15 @@ namespace osu.Game.Storyboards.Drawables
         {
             if (!RequestedPlaying) return;
 
-            if (disabled.NewValue)
-                Stop();
+            // non-looping storyboard samples should be stopped immediately when sample playback is disabled
+            if (!Looping)
+            {
+                if (disabled.NewValue)
+                    Stop();
+            }
+            else
+                base.SamplePlaybackDisabledChanged(disabled);
+
         }
 
         protected override void Update()

From ee89aa159cdc905c1c279080ac3d0333b105cfa4 Mon Sep 17 00:00:00 2001
From: Mysfit <mysfit@mysfit.dev>
Date: Tue, 26 Jan 2021 23:12:26 -0500
Subject: [PATCH 07767/10326] Removed blank line

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 9041c10640..fcbffda227 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -54,7 +54,6 @@ namespace osu.Game.Storyboards.Drawables
             }
             else
                 base.SamplePlaybackDisabledChanged(disabled);
-
         }
 
         protected override void Update()

From a800955bb1c9519732f1bf2d72ab3bd0d5840bfb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 19:46:25 +0900
Subject: [PATCH 07768/10326] Add mod validation utilities

---
 osu.Game.Tests/Mods/ModValidationTest.cs |  64 +++++++++++++
 osu.Game.Tests/osu.Game.Tests.csproj     |   1 +
 osu.Game/Utils/ModValidation.cs          | 116 +++++++++++++++++++++++
 3 files changed, 181 insertions(+)
 create mode 100644 osu.Game.Tests/Mods/ModValidationTest.cs
 create mode 100644 osu.Game/Utils/ModValidation.cs

diff --git a/osu.Game.Tests/Mods/ModValidationTest.cs b/osu.Game.Tests/Mods/ModValidationTest.cs
new file mode 100644
index 0000000000..c7a7e242e9
--- /dev/null
+++ b/osu.Game.Tests/Mods/ModValidationTest.cs
@@ -0,0 +1,64 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Moq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
+
+namespace osu.Game.Tests.Mods
+{
+    [TestFixture]
+    public class ModValidationTest
+    {
+        [Test]
+        public void TestModIsCompatibleByItself()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModValidation.CheckCompatible(new[] { mod.Object }));
+        }
+
+        [Test]
+        public void TestIncompatibleThroughTopLevel()
+        {
+            var mod1 = new Mock<Mod>();
+            var mod2 = new Mock<Mod>();
+
+            mod1.Setup(m => m.IncompatibleMods).Returns(new[] { mod2.Object.GetType() });
+
+            // Test both orderings.
+            Assert.That(ModValidation.CheckCompatible(new[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModValidation.CheckCompatible(new[] { mod2.Object, mod1.Object }), Is.False);
+        }
+
+        [Test]
+        public void TestIncompatibleThroughMultiMod()
+        {
+            var mod1 = new Mock<Mod>();
+
+            // The nested mod.
+            var mod2 = new Mock<Mod>();
+            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType() });
+
+            var multiMod = new MultiMod(new MultiMod(mod2.Object));
+
+            // Test both orderings.
+            Assert.That(ModValidation.CheckCompatible(new[] { multiMod, mod1.Object }), Is.False);
+            Assert.That(ModValidation.CheckCompatible(new[] { mod1.Object, multiMod }), Is.False);
+        }
+
+        [Test]
+        public void TestAllowedThroughMostDerivedType()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModValidation.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
+        }
+
+        [Test]
+        public void TestNotAllowedThroughBaseType()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModValidation.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
+        }
+    }
+}
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index c0c0578391..d29ed94b5f 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -7,6 +7,7 @@
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Include="Moq" Version="4.16.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game/Utils/ModValidation.cs b/osu.Game/Utils/ModValidation.cs
new file mode 100644
index 0000000000..0c4d58ab2e
--- /dev/null
+++ b/osu.Game/Utils/ModValidation.cs
@@ -0,0 +1,116 @@
+// Copyright (c) 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.Extensions.TypeExtensions;
+using osu.Game.Rulesets.Mods;
+
+#nullable enable
+
+namespace osu.Game.Utils
+{
+    /// <summary>
+    /// A set of utilities to validate <see cref="Mod"/> combinations.
+    /// </summary>
+    public static class ModValidation
+    {
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s are compatible with each-other, and that all appear within a set of allowed types.
+        /// </summary>
+        /// <remarks>
+        /// The allowed types must contain exact <see cref="Mod"/> types for the respective <see cref="Mod"/>s to be allowed.
+        /// </remarks>
+        /// <param name="combination">The <see cref="Mod"/>s to check.</param>
+        /// <param name="allowedTypes">The set of allowed <see cref="Mod"/> types.</param>
+        /// <returns>Whether all <see cref="Mod"/>s are compatible with each-other and appear in the set of allowed types.</returns>
+        public static bool CheckCompatibleAndAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
+        {
+            // Prevent multiple-enumeration.
+            var combinationList = combination as ICollection<Mod> ?? combination.ToArray();
+            return CheckCompatible(combinationList) && CheckAllowed(combinationList, allowedTypes);
+        }
+
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s in a combination are compatible with each-other.
+        /// </summary>
+        /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
+        /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
+        public static bool CheckCompatible(IEnumerable<Mod> combination)
+        {
+            var incompatibleTypes = new HashSet<Type>();
+            var incomingTypes = new HashSet<Type>();
+
+            foreach (var mod in combination.SelectMany(flattenMod))
+            {
+                // Add the new mod incompatibilities, checking whether any match the existing mod types.
+                foreach (var t in mod.IncompatibleMods)
+                {
+                    if (incomingTypes.Contains(t))
+                        return false;
+
+                    incompatibleTypes.Add(t);
+                }
+
+                // Add the new mod types, checking whether any match the incompatible types.
+                foreach (var t in mod.GetType().EnumerateBaseTypes())
+                {
+                    if (incomingTypes.Contains(t))
+                        return false;
+
+                    incomingTypes.Add(t);
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s in a combination appear within a set of allowed types.
+        /// </summary>
+        /// <remarks>
+        /// The set of allowed types must contain exact <see cref="Mod"/> types for the respective <see cref="Mod"/>s to be allowed.
+        /// </remarks>
+        /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
+        /// <param name="allowedTypes">The set of allowed <see cref="Mod"/> types.</param>
+        /// <returns>Whether all <see cref="Mod"/>s in the combination are allowed.</returns>
+        public static bool CheckAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
+        {
+            var allowedSet = new HashSet<Type>(allowedTypes);
+
+            return combination.SelectMany(flattenMod)
+                              .All(m => allowedSet.Contains(m.GetType()));
+        }
+
+        /// <summary>
+        /// Determines whether a <see cref="Mod"/> is in a set of incompatible types.
+        /// </summary>
+        /// <remarks>
+        /// A <see cref="Mod"/> can be incompatible through its most-declared type or any of its base types.
+        /// </remarks>
+        /// <param name="mod">The <see cref="Mod"/> to test.</param>
+        /// <param name="incompatibleTypes">The set of incompatible <see cref="Mod"/> types.</param>
+        /// <returns>Whether the given <see cref="Mod"/> is incompatible.</returns>
+        private static bool isModIncompatible(Mod mod, ICollection<Type> incompatibleTypes)
+            => flattenMod(mod)
+               .SelectMany(m => m.GetType().EnumerateBaseTypes())
+               .Any(incompatibleTypes.Contains);
+
+        /// <summary>
+        /// Flattens a <see cref="Mod"/>, returning a set of <see cref="Mod"/>s in-place of any <see cref="MultiMod"/>s.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> to flatten.</param>
+        /// <returns>A set of singular "flattened" <see cref="Mod"/>s</returns>
+        private static IEnumerable<Mod> flattenMod(Mod mod)
+        {
+            if (mod is MultiMod multi)
+            {
+                foreach (var m in multi.Mods.SelectMany(flattenMod))
+                    yield return m;
+            }
+            else
+                yield return mod;
+        }
+    }
+}

From fcfb0d52c2d1d605ac3b8510cdffa01a3714e928 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Jan 2021 19:50:16 +0900
Subject: [PATCH 07769/10326] Proposal to use extension method instead of
 TaskChain class

---
 osu.Game.Tests/NonVisual/TaskChainTest.cs | 19 ++++++++---
 osu.Game/Extensions/TaskExtensions.cs     | 39 +++++++++++++++++++++++
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/TaskChainTest.cs b/osu.Game.Tests/NonVisual/TaskChainTest.cs
index 0a56468818..bd4f15a6eb 100644
--- a/osu.Game.Tests/NonVisual/TaskChainTest.cs
+++ b/osu.Game.Tests/NonVisual/TaskChainTest.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.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -12,15 +13,17 @@ namespace osu.Game.Tests.NonVisual
     [TestFixture]
     public class TaskChainTest
     {
-        private TaskChain taskChain;
+        private Task taskChain;
+
         private int currentTask;
         private CancellationTokenSource globalCancellationToken;
 
         [SetUp]
         public void Setup()
         {
+            taskChain = Task.CompletedTask;
+
             globalCancellationToken = new CancellationTokenSource();
-            taskChain = new TaskChain();
             currentTask = 0;
         }
 
@@ -79,9 +82,15 @@ namespace osu.Game.Tests.NonVisual
         {
             var mutex = new ManualResetEventSlim(false);
 
-            var task = taskChain.Add(async () =>
+            var task = taskChain.ContinueWithSequential(async () =>
             {
-                await Task.Run(() => mutex.Wait(globalCancellationToken.Token)).CatchUnobservedExceptions();
+                try
+                {
+                    await Task.Run(() => mutex.Wait(globalCancellationToken.Token));
+                }
+                catch (OperationCanceledException)
+                {
+                }
             });
 
             // Allow task to potentially complete
@@ -103,7 +112,7 @@ namespace osu.Game.Tests.NonVisual
             var cancellationSource = new CancellationTokenSource();
             var token = CancellationTokenSource.CreateLinkedTokenSource(cancellationSource.Token, globalCancellationToken.Token);
 
-            taskChain.Add(() =>
+            taskChain = taskChain.ContinueWithSequential(() =>
             {
                 mutex.Wait(globalCancellationToken.Token);
                 completionSource.SetResult(Interlocked.Increment(ref currentTask));
diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index 24f0188cf0..fd0274f39e 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
@@ -32,5 +33,43 @@ namespace osu.Game.Extensions
                     Logger.Log($"Error running task: {exception}", LoggingTarget.Runtime, LogLevel.Debug);
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
+
+        public static Task ContinueWithSequential(this Task task, Action continuationFunction, CancellationToken cancellationToken = default)
+        {
+            return task.ContinueWithSequential(() => Task.Run(continuationFunction, cancellationToken), cancellationToken);
+        }
+
+        public static Task ContinueWithSequential(this Task task, Func<Task> continuationFunction, CancellationToken cancellationToken = default)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+
+            task.ContinueWith(t =>
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    tcs.SetCanceled();
+                }
+                else
+                {
+                    continuationFunction().ContinueWith(t2 =>
+                    {
+                        if (cancellationToken.IsCancellationRequested || t2.IsCanceled)
+                        {
+                            tcs.TrySetCanceled();
+                        }
+                        else if (t2.IsFaulted)
+                        {
+                            tcs.TrySetException(t2.Exception);
+                        }
+                        else
+                        {
+                            tcs.TrySetResult(true);
+                        }
+                    }, cancellationToken: default);
+                }
+            }, cancellationToken: default);
+
+            return tcs.Task;
+        }
     }
 }

From f2fa51bf5e31e79c799fcf8fd17cd785280cde94 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 19:59:28 +0900
Subject: [PATCH 07770/10326] Make ModSections overrideable

---
 osu.Game/Overlays/Mods/ModSection.cs          | 18 +++++-----
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 33 +++++++++++++++----
 .../Mods/Sections/AutomationSection.cs        | 19 -----------
 .../Mods/Sections/ConversionSection.cs        | 19 -----------
 .../Sections/DifficultyIncreaseSection.cs     | 19 -----------
 .../Sections/DifficultyReductionSection.cs    | 19 -----------
 osu.Game/Overlays/Mods/Sections/FunSection.cs | 19 -----------
 7 files changed, 34 insertions(+), 112 deletions(-)
 delete mode 100644 osu.Game/Overlays/Mods/Sections/AutomationSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/ConversionSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/FunSection.cs

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 573d1e5355..d70013602e 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -11,26 +11,23 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 using System.Threading;
+using Humanizer;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
-    public abstract class ModSection : Container
+    public class ModSection : Container
     {
         private readonly OsuSpriteText headerLabel;
 
         public FillFlowContainer<ModButtonEmpty> ButtonsContainer { get; }
 
         public Action<Mod> Action;
-        protected abstract Key[] ToggleKeys { get; }
-        public abstract ModType ModType { get; }
 
-        public string Header
-        {
-            get => headerLabel.Text;
-            set => headerLabel.Text = value;
-        }
+        public Key[] ToggleKeys;
+
+        public readonly ModType ModType;
 
         public IEnumerable<Mod> SelectedMods => buttons.Select(b => b.SelectedMod).Where(m => m != null);
 
@@ -153,7 +150,7 @@ namespace osu.Game.Overlays.Mods
             button.Deselect();
         }
 
-        protected ModSection()
+        public ModSection(ModType type)
         {
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
@@ -168,7 +165,8 @@ namespace osu.Game.Overlays.Mods
                     Origin = Anchor.TopLeft,
                     Anchor = Anchor.TopLeft,
                     Position = new Vector2(0f, 0f),
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold)
+                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                    Text = type.Humanize(LetterCasing.Title)
                 },
                 ButtonsContainer = new FillFlowContainer<ModButtonEmpty>
                 {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b93602116b..5775b08ae7 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -19,7 +19,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
-using osu.Game.Overlays.Mods.Sections;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
 using osuTK;
@@ -190,13 +189,31 @@ namespace osu.Game.Overlays.Mods
                                                 Width = content_width,
                                                 LayoutDuration = 200,
                                                 LayoutEasing = Easing.OutQuint,
-                                                Children = new ModSection[]
+                                                Children = new[]
                                                 {
-                                                    new DifficultyReductionSection { Action = modButtonPressed },
-                                                    new DifficultyIncreaseSection { Action = modButtonPressed },
-                                                    new AutomationSection { Action = modButtonPressed },
-                                                    new ConversionSection { Action = modButtonPressed },
-                                                    new FunSection { Action = modButtonPressed },
+                                                    CreateModSection(ModType.DifficultyReduction).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.DifficultyIncrease).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Automation).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Conversion).With(s =>
+                                                    {
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Fun).With(s =>
+                                                    {
+                                                        s.Action = modButtonPressed;
+                                                    }),
                                                 }
                                             },
                                         }
@@ -455,6 +472,8 @@ namespace osu.Game.Overlays.Mods
 
         private void refreshSelectedMods() => SelectedMods.Value = ModSectionsContainer.Children.SelectMany(s => s.SelectedMods).ToArray();
 
+        protected virtual ModSection CreateModSection(ModType type) => new ModSection(type);
+
         #region Disposal
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Overlays/Mods/Sections/AutomationSection.cs b/osu.Game/Overlays/Mods/Sections/AutomationSection.cs
deleted file mode 100644
index a2d7fec15f..0000000000
--- a/osu.Game/Overlays/Mods/Sections/AutomationSection.cs
+++ /dev/null
@@ -1,19 +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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class AutomationSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
-        public override ModType ModType => ModType.Automation;
-
-        public AutomationSection()
-        {
-            Header = @"Automation";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/ConversionSection.cs b/osu.Game/Overlays/Mods/Sections/ConversionSection.cs
deleted file mode 100644
index 24fd8c30dd..0000000000
--- a/osu.Game/Overlays/Mods/Sections/ConversionSection.cs
+++ /dev/null
@@ -1,19 +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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class ConversionSection : ModSection
-    {
-        protected override Key[] ToggleKeys => null;
-        public override ModType ModType => ModType.Conversion;
-
-        public ConversionSection()
-        {
-            Header = @"Conversion";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs b/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs
deleted file mode 100644
index 0b7ccd1f25..0000000000
--- a/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs
+++ /dev/null
@@ -1,19 +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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class DifficultyIncreaseSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
-        public override ModType ModType => ModType.DifficultyIncrease;
-
-        public DifficultyIncreaseSection()
-        {
-            Header = @"Difficulty Increase";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs b/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs
deleted file mode 100644
index 508e92508b..0000000000
--- a/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs
+++ /dev/null
@@ -1,19 +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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class DifficultyReductionSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
-        public override ModType ModType => ModType.DifficultyReduction;
-
-        public DifficultyReductionSection()
-        {
-            Header = @"Difficulty Reduction";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/FunSection.cs b/osu.Game/Overlays/Mods/Sections/FunSection.cs
deleted file mode 100644
index af1f5836b1..0000000000
--- a/osu.Game/Overlays/Mods/Sections/FunSection.cs
+++ /dev/null
@@ -1,19 +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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class FunSection : ModSection
-    {
-        protected override Key[] ToggleKeys => null;
-        public override ModType ModType => ModType.Fun;
-
-        public FunSection()
-        {
-            Header = @"Fun";
-        }
-    }
-}

From a30aecbafeb7d45f87f1061a2ccc71ee757c91cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Jan 2021 20:01:21 +0900
Subject: [PATCH 07771/10326] Comment and add xmldoc

---
 osu.Game.Tests/NonVisual/TaskChainTest.cs |  1 -
 osu.Game/Extensions/TaskExtensions.cs     | 32 +++++++++++++++++------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/TaskChainTest.cs b/osu.Game.Tests/NonVisual/TaskChainTest.cs
index bd4f15a6eb..342f137dfd 100644
--- a/osu.Game.Tests/NonVisual/TaskChainTest.cs
+++ b/osu.Game.Tests/NonVisual/TaskChainTest.cs
@@ -6,7 +6,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Game.Extensions;
-using osu.Game.Utils;
 
 namespace osu.Game.Tests.NonVisual
 {
diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index fd0274f39e..62b249b869 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -34,32 +34,46 @@ namespace osu.Game.Extensions
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
 
-        public static Task ContinueWithSequential(this Task task, Action continuationFunction, CancellationToken cancellationToken = default)
-        {
-            return task.ContinueWithSequential(() => Task.Run(continuationFunction, cancellationToken), cancellationToken);
-        }
+        /// <summary>
+        /// Add a continuation to be performed only after the attached task has completed.
+        /// </summary>
+        /// <param name="task">The previous task to be awaited on.</param>
+        /// <param name="action">The action to run.</param>
+        /// <param name="cancellationToken">An optional cancellation token. Will only cancel the provided action, not the sequence.</param>
+        /// <returns>A task representing the provided action.</returns>
+        public static Task ContinueWithSequential(this Task task, Action action, CancellationToken cancellationToken = default) =>
+            task.ContinueWithSequential(() => Task.Run(action, cancellationToken), cancellationToken);
 
+        /// <summary>
+        /// Add a continuation to be performed only after the attached task has completed.
+        /// </summary>
+        /// <param name="task">The previous task to be awaited on.</param>
+        /// <param name="continuationFunction">The continuation to run. Generally should be an async function.</param>
+        /// <param name="cancellationToken">An optional cancellation token. Will only cancel the provided action, not the sequence.</param>
+        /// <returns>A task representing the provided action.</returns>
         public static Task ContinueWithSequential(this Task task, Func<Task> continuationFunction, CancellationToken cancellationToken = default)
         {
             var tcs = new TaskCompletionSource<bool>();
 
             task.ContinueWith(t =>
             {
+                // the previous task has finished execution or been cancelled, so we can run the provided continuation.
+
                 if (cancellationToken.IsCancellationRequested)
                 {
                     tcs.SetCanceled();
                 }
                 else
                 {
-                    continuationFunction().ContinueWith(t2 =>
+                    continuationFunction().ContinueWith(continuationTask =>
                     {
-                        if (cancellationToken.IsCancellationRequested || t2.IsCanceled)
+                        if (cancellationToken.IsCancellationRequested || continuationTask.IsCanceled)
                         {
                             tcs.TrySetCanceled();
                         }
-                        else if (t2.IsFaulted)
+                        else if (continuationTask.IsFaulted)
                         {
-                            tcs.TrySetException(t2.Exception);
+                            tcs.TrySetException(continuationTask.Exception);
                         }
                         else
                         {
@@ -69,6 +83,8 @@ namespace osu.Game.Extensions
                 }
             }, cancellationToken: default);
 
+            // importantly, we are not returning the continuation itself but rather a task which represents its status in sequential execution order.
+            // this will not be cancelled or completed until the previous task has also.
             return tcs.Task;
         }
     }

From 0ff300628eff78d2d4c983d029137425b3209628 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 20:07:22 +0900
Subject: [PATCH 07772/10326] Fix type not being set

---
 osu.Game/Overlays/Mods/ModSection.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index d70013602e..df4d05daad 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -152,6 +152,8 @@ namespace osu.Game.Overlays.Mods
 
         public ModSection(ModType type)
         {
+            ModType = type;
+
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
 

From 91d34d86f74ba1466323c3ee5f29c6b9541f1640 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:02:23 +0900
Subject: [PATCH 07773/10326] Abstractify ModSelectOverlay

---
 .../TestSceneModSelectOverlay.cs              |  2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 23 ++++++------------
 .../Overlays/Mods/SoloModSelectOverlay.cs     | 24 +++++++++++++++++++
 osu.Game/Screens/Select/MatchSongSelect.cs    |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         |  2 +-
 5 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/SoloModSelectOverlay.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index bd4010a7f3..b03512ffde 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -265,7 +265,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void checkLabelColor(Func<Color4> getColour) => AddAssert("check label has expected colour", () => modSelect.MultiplierLabel.Colour.AverageColour == getColour());
 
-        private class TestModSelectOverlay : ModSelectOverlay
+        private class TestModSelectOverlay : SoloModSelectOverlay
         {
             public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 5775b08ae7..5709ca3b8d 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -27,7 +27,7 @@ using osuTK.Input;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class ModSelectOverlay : WaveOverlayContainer
+    public abstract class ModSelectOverlay : WaveOverlayContainer
     {
         private readonly Func<Mod, bool> isValidMod;
         public const float HEIGHT = 510;
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Mods
 
         private SampleChannel sampleOn, sampleOff;
 
-        public ModSelectOverlay(Func<Mod, bool> isValidMod = null)
+        protected ModSelectOverlay(Func<Mod, bool> isValidMod = null)
         {
             this.isValidMod = isValidMod ?? (m => true);
 
@@ -346,19 +346,6 @@ namespace osu.Game.Overlays.Mods
             refreshSelectedMods();
         }
 
-        /// <summary>
-        /// Deselect one or more mods.
-        /// </summary>
-        /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
-        /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        private void deselectTypes(Type[] modTypes, bool immediate = false)
-        {
-            if (modTypes.Length == 0) return;
-
-            foreach (var section in ModSectionsContainer.Children)
-                section.DeselectTypes(modTypes, immediate);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -458,7 +445,7 @@ namespace osu.Game.Overlays.Mods
             {
                 if (State.Value == Visibility.Visible) sampleOn?.Play();
 
-                deselectTypes(selectedMod.IncompatibleMods, true);
+                OnModSelected(selectedMod);
 
                 if (selectedMod.RequiresConfiguration) ModSettingsContainer.Show();
             }
@@ -470,6 +457,10 @@ namespace osu.Game.Overlays.Mods
             refreshSelectedMods();
         }
 
+        protected virtual void OnModSelected(Mod mod)
+        {
+        }
+
         private void refreshSelectedMods() => SelectedMods.Value = ModSectionsContainer.Children.SelectMany(s => s.SelectedMods).ToArray();
 
         protected virtual ModSection CreateModSection(ModType type) => new ModSection(type);
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
new file mode 100644
index 0000000000..53d0c9fce9
--- /dev/null
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.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 System;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class SoloModSelectOverlay : ModSelectOverlay
+    {
+        public SoloModSelectOverlay(Func<Mod, bool> isValidMod = null)
+            : base(isValidMod)
+        {
+        }
+
+        protected override void OnModSelected(Mod mod)
+        {
+            base.OnModSelected(mod);
+
+            foreach (var section in ModSectionsContainer.Children)
+                section.DeselectTypes(mod.IncompatibleMods, true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index ed47b5d5ac..280f46f9ab 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay(isValidMod);
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4fca77a176..ff49dd9f7e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -301,7 +301,7 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        protected virtual ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay();
+        protected virtual ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay();
 
         protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)
         {

From 4019cc38e5e34e8c900bed0e61176fdfa35dbb42 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:03:51 +0900
Subject: [PATCH 07774/10326] Allow footer buttons to be customised

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ff49dd9f7e..4af96b7a29 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -263,9 +263,8 @@ namespace osu.Game.Screens.Select
 
             if (Footer != null)
             {
-                Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
-                Footer.AddButton(new FooterButtonRandom { Action = triggerRandom });
-                Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
+                foreach (var (button, overlay) in CreateFooterButtons())
+                    Footer.AddButton(button, overlay);
 
                 BeatmapOptions.AddButton(@"Manage", @"collections", FontAwesome.Solid.Book, colours.Green, () => manageCollectionsDialog?.Show());
                 BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo));
@@ -301,6 +300,13 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[]
+        {
+            (new FooterButtonMods { Current = Mods }, ModSelect),
+            (new FooterButtonRandom { Action = triggerRandom }, null),
+            (new FooterButtonOptions(), BeatmapOptions)
+        };
+
         protected virtual ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay();
 
         protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)

From 45e41aaeacf930ce4b5e3b62f85acbc618ce73da Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:15:53 +0900
Subject: [PATCH 07775/10326] Initial implementation of freemod selection
 overlay

---
 .../TestSceneFreeModSelectOverlay.cs          |  24 +++++
 osu.Game/Overlays/Mods/ModButton.cs           |   8 +-
 osu.Game/Overlays/Mods/ModSection.cs          |  30 +++---
 .../Multiplayer/FreeModSelectOverlay.cs       | 101 ++++++++++++++++++
 .../Multiplayer/MultiplayerMatchSongSelect.cs |  66 +++++++++++-
 osu.Game/Screens/Select/Footer.cs             |  15 ++-
 6 files changed, 216 insertions(+), 28 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
new file mode 100644
index 0000000000..960402df88
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.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 NUnit.Framework;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays.Mods;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneFreeModSelectOverlay : MultiplayerTestScene
+    {
+        private ModSelectOverlay overlay;
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Child = overlay = new FreeModSelectOverlay
+            {
+                State = { Value = Visibility.Visible }
+            };
+        });
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index ab8efdabcc..9ea4f65eb2 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Overlays.Mods
                 switch (e.Button)
                 {
                     case MouseButton.Right:
-                        SelectNext(-1);
+                        OnRightClick(e);
                         break;
                 }
             }
@@ -183,10 +183,14 @@ namespace osu.Game.Overlays.Mods
         protected override bool OnClick(ClickEvent e)
         {
             SelectNext(1);
-
             return true;
         }
 
+        protected virtual void OnRightClick(MouseUpEvent e)
+        {
+            SelectNext(-1);
+        }
+
         /// <summary>
         /// Select the next available mod in a specified direction.
         /// </summary>
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index df4d05daad..5de629424b 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Mods
 {
     public class ModSection : Container
     {
-        private readonly OsuSpriteText headerLabel;
+        private readonly Drawable header;
 
         public FillFlowContainer<ModButtonEmpty> ButtonsContainer { get; }
 
@@ -47,10 +47,7 @@ namespace osu.Game.Overlays.Mods
                     if (m == null)
                         return new ModButtonEmpty();
 
-                    return new ModButton(m)
-                    {
-                        SelectionChanged = Action,
-                    };
+                    return CreateModButton(m).With(b => b.SelectionChanged = Action);
                 }).ToArray();
 
                 modsLoadCts?.Cancel();
@@ -58,7 +55,7 @@ namespace osu.Game.Overlays.Mods
                 if (modContainers.Length == 0)
                 {
                     ModIconsLoaded = true;
-                    headerLabel.Hide();
+                    header.Hide();
                     Hide();
                     return;
                 }
@@ -73,7 +70,7 @@ namespace osu.Game.Overlays.Mods
 
                 buttons = modContainers.OfType<ModButton>().ToArray();
 
-                headerLabel.FadeIn(200);
+                header.FadeIn(200);
                 this.FadeIn(200);
             }
         }
@@ -160,16 +157,9 @@ namespace osu.Game.Overlays.Mods
             Origin = Anchor.TopCentre;
             Anchor = Anchor.TopCentre;
 
-            Children = new Drawable[]
+            Children = new[]
             {
-                headerLabel = new OsuSpriteText
-                {
-                    Origin = Anchor.TopLeft,
-                    Anchor = Anchor.TopLeft,
-                    Position = new Vector2(0f, 0f),
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                    Text = type.Humanize(LetterCasing.Title)
-                },
+                header = CreateHeader(type.Humanize(LetterCasing.Title)),
                 ButtonsContainer = new FillFlowContainer<ModButtonEmpty>
                 {
                     AutoSizeAxes = Axes.Y,
@@ -185,5 +175,13 @@ namespace osu.Game.Overlays.Mods
                 },
             };
         }
+
+        protected virtual ModButton CreateModButton(Mod mod) => new ModButton(mod);
+
+        protected virtual Drawable CreateHeader(string text) => new OsuSpriteText
+        {
+            Font = OsuFont.GetFont(weight: FontWeight.Bold),
+            Text = text
+        };
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
new file mode 100644
index 0000000000..56e74a8460
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
@@ -0,0 +1,101 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
+{
+    public class FreeModSelectOverlay : ModSelectOverlay
+    {
+        protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
+
+        private class FreeModSection : ModSection
+        {
+            private HeaderCheckbox checkbox;
+
+            public FreeModSection(ModType type)
+                : base(type)
+            {
+            }
+
+            protected override ModButton CreateModButton(Mod mod) => new FreeModButton(mod);
+
+            protected override Drawable CreateHeader(string text) => new Container
+            {
+                AutoSizeAxes = Axes.Y,
+                Width = 175,
+                Child = checkbox = new HeaderCheckbox
+                {
+                    LabelText = text,
+                    Changed = onCheckboxChanged
+                }
+            };
+
+            private void onCheckboxChanged(bool value)
+            {
+                foreach (var button in ButtonsContainer.OfType<ModButton>())
+                {
+                    if (value)
+                        // Note: Buttons where only part of the group has an implementation are not fully supported.
+                        button.SelectAt(0);
+                    else
+                        button.Deselect();
+                }
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                // If any of the buttons aren't selected, deselect the checkbox.
+                foreach (var button in ButtonsContainer.OfType<ModButton>())
+                {
+                    if (button.Mods.Any(m => m.HasImplementation) && !button.Selected)
+                        checkbox.Current.Value = false;
+                }
+            }
+        }
+
+        private class HeaderCheckbox : OsuCheckbox
+        {
+            public Action<bool> Changed;
+
+            protected override void OnUserChange(bool value)
+            {
+                base.OnUserChange(value);
+                Changed?.Invoke(value);
+            }
+        }
+
+        private class FreeModButton : ModButton
+        {
+            public FreeModButton(Mod mod)
+                : base(mod)
+            {
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                onClick();
+                return true;
+            }
+
+            protected override void OnRightClick(MouseUpEvent e) => onClick();
+
+            private void onClick()
+            {
+                if (Selected)
+                    Deselect();
+                else
+                    SelectNext(1);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index ebc06d2445..5917ed3f49 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -6,17 +6,23 @@ using System.Linq;
 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.Graphics.UserInterface;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Select;
+using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
@@ -33,6 +39,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private StatefulMultiplayerClient client { get; set; }
 
         private LoadingLayer loadingLayer;
+        private FreeModSelectOverlay freeModSelectOverlay;
 
         private WorkingBeatmap initialBeatmap;
         private RulesetInfo initialRuleset;
@@ -43,6 +50,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         public MultiplayerMatchSongSelect()
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
+
+            freeModSelectOverlay = new FreeModSelectOverlay();
         }
 
         [BackgroundDependencyLoader]
@@ -52,6 +61,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             initialBeatmap = Beatmap.Value;
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
+
+            FooterPanels.Add(freeModSelectOverlay);
         }
 
         protected override bool OnStart()
@@ -111,8 +122,61 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay(isValidMod);
+
+        protected override IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons()
+        {
+            var buttons = base.CreateFooterButtons().ToList();
+            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods(), freeModSelectOverlay));
+            return buttons;
+        }
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
+
+    public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
+    {
+        public Bindable<IReadOnlyList<Mod>> Current
+        {
+            get => modDisplay.Current;
+            set => modDisplay.Current = value;
+        }
+
+        private readonly ModDisplay modDisplay;
+
+        public FooterButtonFreeMods()
+        {
+            ButtonContentContainer.Add(modDisplay = new ModDisplay
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                DisplayUnrankedText = false,
+                Scale = new Vector2(0.8f),
+                ExpansionMode = ExpansionMode.AlwaysContracted,
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            SelectedColour = colours.Yellow;
+            DeselectedColour = SelectedColour.Opacity(0.5f);
+            Text = @"freemods";
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(_ => updateModDisplay(), true);
+        }
+
+        private void updateModDisplay()
+        {
+            if (Current.Value?.Count > 0)
+                modDisplay.FadeIn();
+            else
+                modDisplay.FadeOut();
+        }
+    }
 }
diff --git a/osu.Game/Screens/Select/Footer.cs b/osu.Game/Screens/Select/Footer.cs
index 689a11166a..ee13ebda44 100644
--- a/osu.Game/Screens/Select/Footer.cs
+++ b/osu.Game/Screens/Select/Footer.cs
@@ -28,19 +28,16 @@ namespace osu.Game.Screens.Select
 
         private readonly List<OverlayContainer> overlays = new List<OverlayContainer>();
 
-        /// <param name="button">THe button to be added.</param>
+        /// <param name="button">The button to be added.</param>
         /// <param name="overlay">The <see cref="OverlayContainer"/> to be toggled by this button.</param>
         public void AddButton(FooterButton button, OverlayContainer overlay)
         {
-            overlays.Add(overlay);
-            button.Action = () => showOverlay(overlay);
+            if (overlay != null)
+            {
+                overlays.Add(overlay);
+                button.Action = () => showOverlay(overlay);
+            }
 
-            AddButton(button);
-        }
-
-        /// <param name="button">Button to be added.</param>
-        public void AddButton(FooterButton button)
-        {
             button.Hovered = updateModeLight;
             button.HoverLost = updateModeLight;
 

From 4c256f1fb361f4a64d7cf3fa7a919467c56969b0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:23:38 +0900
Subject: [PATCH 07776/10326] Actually populate the playlist item

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 5917ed3f49..4054d84540 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -62,6 +62,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
 
+            freeModSelectOverlay.SelectedMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToList();
             FooterPanels.Add(freeModSelectOverlay);
         }
 
@@ -76,6 +77,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             item.RequiredMods.Clear();
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
 
+            item.AllowedMods.Clear();
+            item.AllowedMods.AddRange(freeModSelectOverlay.SelectedMods.Value.Select(m => m.CreateCopy()));
+
             // If the client is already in a room, update via the client.
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
             if (client.Room != null)

From c408b46a2158e251d82ce99997d65d2c58c7203f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:25:14 +0900
Subject: [PATCH 07777/10326] Add AllowedMods to MultiplayerRoomSettings model

---
 osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 857b38ea60..ad624f18ed 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -25,13 +25,21 @@ namespace osu.Game.Online.Multiplayer
         [NotNull]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
+        [NotNull]
+        public IEnumerable<APIMod> AllowedMods { get; set; } = Enumerable.Empty<APIMod>();
+
         public bool Equals(MultiplayerRoomSettings other)
             => BeatmapID == other.BeatmapID
                && BeatmapChecksum == other.BeatmapChecksum
                && Mods.SequenceEqual(other.Mods)
+               && AllowedMods.SequenceEqual(other.AllowedMods)
                && RulesetID == other.RulesetID
                && Name.Equals(other.Name, StringComparison.Ordinal);
 
-        public override string ToString() => $"Name:{Name} Beatmap:{BeatmapID} ({BeatmapChecksum}) Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
+        public override string ToString() => $"Name:{Name}"
+                                             + $" Beatmap:{BeatmapID} ({BeatmapChecksum})"
+                                             + $" Mods:{string.Join(',', Mods)}"
+                                             + $" AllowedMods:{string.Join(',', AllowedMods)}"
+                                             + $" Ruleset:{RulesetID}";
     }
 }

From ff8ee379fb9c1684cdd064a32361f27d8fb6105e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:27:31 +0900
Subject: [PATCH 07778/10326] Fix possible nullref

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 4054d84540..70d3d128dd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Humanizer;
@@ -38,8 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
+        private readonly FreeModSelectOverlay freeModSelectOverlay;
         private LoadingLayer loadingLayer;
-        private FreeModSelectOverlay freeModSelectOverlay;
 
         private WorkingBeatmap initialBeatmap;
         private RulesetInfo initialRuleset;
@@ -62,7 +63,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
 
-            freeModSelectOverlay.SelectedMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToList();
+            freeModSelectOverlay.SelectedMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
             FooterPanels.Add(freeModSelectOverlay);
         }
 

From b79d1c7b81ef900087608be126f96b6e49e6bdf0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:33:03 +0900
Subject: [PATCH 07779/10326] Add mods to footer

---
 .../OnlinePlay/Multiplayer/FreeModSelectOverlay.cs    |  5 +++++
 .../Multiplayer/MultiplayerMatchSongSelect.cs         | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
index 56e74a8460..10b68ec5a6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class FreeModSelectOverlay : ModSelectOverlay
     {
+        public FreeModSelectOverlay(Func<Mod, bool> isValidMod = null)
+            : base(isValidMod)
+        {
+        }
+
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
         private class FreeModSection : ModSection
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 70d3d128dd..86b8f22d34 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
+        private readonly Bindable<IReadOnlyList<Mod>> freeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+
         private readonly FreeModSelectOverlay freeModSelectOverlay;
         private LoadingLayer loadingLayer;
 
@@ -52,7 +54,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
 
-            freeModSelectOverlay = new FreeModSelectOverlay();
+            freeModSelectOverlay = new FreeModSelectOverlay(isValidMod) { SelectedMods = { BindTarget = freeMods } };
         }
 
         [BackgroundDependencyLoader]
@@ -63,7 +65,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
 
-            freeModSelectOverlay.SelectedMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            freeMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+
             FooterPanels.Add(freeModSelectOverlay);
         }
 
@@ -79,7 +82,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
 
             item.AllowedMods.Clear();
-            item.AllowedMods.AddRange(freeModSelectOverlay.SelectedMods.Value.Select(m => m.CreateCopy()));
+            item.AllowedMods.AddRange(freeMods.Value.Select(m => m.CreateCopy()));
 
             // If the client is already in a room, update via the client.
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
@@ -132,7 +135,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         protected override IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons()
         {
             var buttons = base.CreateFooterButtons().ToList();
-            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods(), freeModSelectOverlay));
+            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods { Current = freeMods }, freeModSelectOverlay));
             return buttons;
         }
 

From 45395cb5e8fcf22d495908f7c77a3b5d90624d98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Jan 2021 23:00:14 +0900
Subject: [PATCH 07780/10326] 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 9ad5946311..f8ce6befd4 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.118.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.127.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3e971d9d4f..97f4320c95 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -27,7 +27,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="2021.118.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.127.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 4732620085..301e7378a6 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.Framework.iOS" Version="2021.118.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.127.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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="2021.118.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.127.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 63f057a525e01e3c58ede431293b124c8b14d70d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 27 Jan 2021 20:45:48 +0300
Subject: [PATCH 07781/10326] Fix dotnet run/publish with runtime specified not
 working again

---
 osu.Desktop/osu.Desktop.csproj | 5 +----
 osu.Game/osu.Game.csproj       | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index e201b250d4..cce7907c6c 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -24,16 +24,13 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.169" />
-    <!-- .NET 3.1 SDK seems to cause issues with a runtime specification. This will likely be resolved in .NET 5. -->
-    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 97f4320c95..eb541c9de5 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,6 +26,7 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.127.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />

From 2c08ce05fa18828248c1fe45aea502059917c0bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Jan 2021 22:01:56 +0100
Subject: [PATCH 07782/10326] Remove game-local enum [Order] attribute

In favour of the newly-added framework one.
---
 .../BeatmapListing/BeatmapSearchFilterRow.cs  |  4 +-
 .../Overlays/BeatmapListing/SearchLanguage.cs |  2 +-
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  |  4 +-
 osu.Game/Rulesets/Ruleset.cs                  |  6 +--
 osu.Game/Rulesets/Scoring/HitResult.cs        |  2 +-
 osu.Game/Utils/OrderAttribute.cs              | 52 -------------------
 6 files changed, 9 insertions(+), 61 deletions(-)
 delete mode 100644 osu.Game/Utils/OrderAttribute.cs

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index b429a5277b..01bcbd3244 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -12,7 +12,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 using Humanizer;
-using osu.Game.Utils;
+using osu.Framework.Extensions.EnumExtensions;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
                 if (typeof(T).IsEnum)
                 {
-                    foreach (var val in OrderAttributeUtils.GetValuesInOrder<T>())
+                    foreach (var val in EnumExtensions.GetValuesInOrder<T>())
                         AddItem(val);
                 }
             }
diff --git a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
index eee5d8f7e1..015cee8ce3 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchLanguage.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.Utils;
+using osu.Framework.Utils;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 324299ccba..ddd1dfa6cd 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.Framework.Extensions.EnumExtensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -15,7 +16,6 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Users.Drawables;
-using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -105,7 +105,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
             var ruleset = scores.First().Ruleset.CreateInstance();
 
-            foreach (var result in OrderAttributeUtils.GetValuesInOrder<HitResult>())
+            foreach (var result in EnumExtensions.GetValuesInOrder<HitResult>())
             {
                 if (!allScoreStatistics.Contains(result))
                     continue;
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index b3b3d11ab3..dbc2bd4d01 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -24,9 +24,9 @@ using osu.Game.Skinning;
 using osu.Game.Users;
 using JetBrains.Annotations;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Testing;
 using osu.Game.Screens.Ranking.Statistics;
-using osu.Game.Utils;
 
 namespace osu.Game.Rulesets
 {
@@ -272,7 +272,7 @@ namespace osu.Game.Rulesets
             var validResults = GetValidHitResults();
 
             // enumerate over ordered list to guarantee return order is stable.
-            foreach (var result in OrderAttributeUtils.GetValuesInOrder<HitResult>())
+            foreach (var result in EnumExtensions.GetValuesInOrder<HitResult>())
             {
                 switch (result)
                 {
@@ -298,7 +298,7 @@ namespace osu.Game.Rulesets
         /// <remarks>
         /// <see cref="HitResult.Miss"/> is implicitly included. Special types like <see cref="HitResult.IgnoreHit"/> are ignored even when specified.
         /// </remarks>
-        protected virtual IEnumerable<HitResult> GetValidHitResults() => OrderAttributeUtils.GetValuesInOrder<HitResult>();
+        protected virtual IEnumerable<HitResult> GetValidHitResults() => EnumExtensions.GetValuesInOrder<HitResult>();
 
         /// <summary>
         /// Get a display friendly name for the specified result type.
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 6a3a034fc1..eaa1f95744 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 using System.Diagnostics;
-using osu.Game.Utils;
+using osu.Framework.Utils;
 
 namespace osu.Game.Rulesets.Scoring
 {
diff --git a/osu.Game/Utils/OrderAttribute.cs b/osu.Game/Utils/OrderAttribute.cs
deleted file mode 100644
index aded7f9814..0000000000
--- a/osu.Game/Utils/OrderAttribute.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 System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace osu.Game.Utils
-{
-    public static class OrderAttributeUtils
-    {
-        /// <summary>
-        /// Get values of an enum in order. Supports custom ordering via <see cref="OrderAttribute"/>.
-        /// </summary>
-        public static IEnumerable<T> GetValuesInOrder<T>()
-        {
-            var type = typeof(T);
-
-            if (!type.IsEnum)
-                throw new InvalidOperationException("T must be an enum");
-
-            IEnumerable<T> items = (T[])Enum.GetValues(type);
-
-            if (Attribute.GetCustomAttribute(type, typeof(HasOrderedElementsAttribute)) == null)
-                return items;
-
-            return items.OrderBy(i =>
-            {
-                if (type.GetField(i.ToString()).GetCustomAttributes(typeof(OrderAttribute), false).FirstOrDefault() is OrderAttribute attr)
-                    return attr.Order;
-
-                throw new ArgumentException($"Not all values of {nameof(T)} have {nameof(OrderAttribute)} specified.");
-            });
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Field)]
-    public class OrderAttribute : Attribute
-    {
-        public readonly int Order;
-
-        public OrderAttribute(int order)
-        {
-            Order = order;
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Enum)]
-    public class HasOrderedElementsAttribute : Attribute
-    {
-    }
-}

From 90a82f986bcd2ba59f0ebc3ccc95e942a3e5665a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Jan 2021 16:20:16 +0900
Subject: [PATCH 07783/10326] Fallback to using json for signalr communication
 if JIT is unavailable

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 22 +++++++++++++------
 .../Spectator/SpectatorStreamingClient.cs     | 21 ++++++++++++------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 0d779232d0..c10c4dd1b0 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -9,6 +9,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
@@ -64,13 +66,19 @@ namespace osu.Game.Online.Multiplayer
             if (connection != null)
                 return;
 
-            connection = new HubConnectionBuilder()
-                         .WithUrl(endpoint, options =>
-                         {
-                             options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
-                         })
-                         .AddMessagePackProtocol()
-                         .Build();
+            var builder = new HubConnectionBuilder()
+                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
+
+            if (RuntimeInfo.SupportsJIT)
+                builder.AddMessagePackProtocol();
+            else
+            {
+                // eventuall we will precompile resolvers for messagepack, but this isn't working currently
+                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
+                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
+            }
+
+            connection = builder.Build();
 
             // this is kind of SILLY
             // https://github.com/dotnet/aspnetcore/issues/15198
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index dac2131035..7a28c179a8 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -9,6 +9,8 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -115,14 +117,19 @@ namespace osu.Game.Online.Spectator
             if (connection != null)
                 return;
 
-            connection = new HubConnectionBuilder()
-                         .WithUrl(endpoint, options =>
-                         {
-                             options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
-                         })
-                         .AddMessagePackProtocol()
-                         .Build();
+            var builder = new HubConnectionBuilder()
+                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
 
+            if (RuntimeInfo.SupportsJIT)
+                builder.AddMessagePackProtocol();
+            else
+            {
+                // eventuall we will precompile resolvers for messagepack, but this isn't working currently
+                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
+                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
+            }
+
+            connection = builder.Build();
             // until strong typed client support is added, each method must be manually bound (see https://github.com/dotnet/aspnetcore/issues/15198)
             connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
             connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);

From c3d40440170e98e026bfceaf3dbd25901704e7ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Jan 2021 16:53:56 +0900
Subject: [PATCH 07784/10326] Avoid using Dapper to fix iOS compatibility of
 beatmap lookup cache

---
 ...BeatmapManager_BeatmapOnlineLookupQueue.cs | 32 ++++++++++++-------
 osu.Game/osu.Game.csproj                      |  1 -
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index e90ccbb805..ea91f2d2e0 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -7,7 +7,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Dapper;
 using Microsoft.Data.Sqlite;
 using osu.Framework.Development;
 using osu.Framework.IO.Network;
@@ -154,20 +153,31 @@ namespace osu.Game.Beatmaps
                 {
                     using (var db = new SqliteConnection(storage.GetDatabaseConnectionString("online")))
                     {
-                        var found = db.QuerySingleOrDefault<CachedOnlineBeatmapLookup>(
-                            "SELECT * FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path", beatmap);
+                        db.Open();
 
-                        if (found != null)
+                        using (var cmd = db.CreateCommand())
                         {
-                            var status = (BeatmapSetOnlineStatus)found.approved;
+                            cmd.CommandText = "SELECT beatmapset_id, beatmap_id, approved FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path";
 
-                            beatmap.Status = status;
-                            beatmap.BeatmapSet.Status = status;
-                            beatmap.BeatmapSet.OnlineBeatmapSetID = found.beatmapset_id;
-                            beatmap.OnlineBeatmapID = found.beatmap_id;
+                            cmd.Parameters.Add(new SqliteParameter("@MD5Hash", beatmap.MD5Hash));
+                            cmd.Parameters.Add(new SqliteParameter("@OnlineBeatmapID", beatmap.OnlineBeatmapID));
+                            cmd.Parameters.Add(new SqliteParameter("@Path", beatmap.Path));
 
-                            LogForModel(set, $"Cached local retrieval for {beatmap}.");
-                            return true;
+                            using (var reader = cmd.ExecuteReader())
+                            {
+                                if (reader.Read())
+                                {
+                                    var status = (BeatmapSetOnlineStatus)reader.GetByte(2);
+
+                                    beatmap.Status = status;
+                                    beatmap.BeatmapSet.Status = status;
+                                    beatmap.BeatmapSet.OnlineBeatmapSetID = reader.GetInt32(0);
+                                    beatmap.OnlineBeatmapID = reader.GetInt32(1);
+
+                                    LogForModel(set, $"Cached local retrieval for {beatmap}.");
+                                    return true;
+                                }
+                            }
                         }
                     }
                 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 97f4320c95..bfc5ff302e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,7 +18,6 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />

From a616688a47a1d2d1c952eb8fe173cd88f8a64c37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Jan 2021 23:55:03 +0900
Subject: [PATCH 07785/10326] 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 f8ce6befd4..7060e88026 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.127.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.128.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 97f4320c95..a18eef15fc 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -27,7 +27,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="2021.127.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 301e7378a6..48dc01f5de 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.Framework.iOS" Version="2021.127.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.128.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,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="2021.127.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 386f9f78423f205490c817cab468d09a32d12339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Jan 2021 22:36:07 +0100
Subject: [PATCH 07786/10326] Fix typos in comments

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs      | 2 +-
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index c10c4dd1b0..b13d4fa899 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Online.Multiplayer
                 builder.AddMessagePackProtocol();
             else
             {
-                // eventuall we will precompile resolvers for messagepack, but this isn't working currently
+                // eventually we will precompile resolvers for messagepack, but this isn't working currently
                 // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
                 builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
             }
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 7a28c179a8..b95e3f1297 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Online.Spectator
                 builder.AddMessagePackProtocol();
             else
             {
-                // eventuall we will precompile resolvers for messagepack, but this isn't working currently
+                // eventually we will precompile resolvers for messagepack, but this isn't working currently
                 // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
                 builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
             }

From da4c207a73b4beb25a59237a2e43ce674ed9ec99 Mon Sep 17 00:00:00 2001
From: Corentin PALLARD <corentin.pallard@azeo.com>
Date: Fri, 29 Jan 2021 02:53:26 +0100
Subject: [PATCH 07787/10326] Fix the ctb auto mod speedup in some occasions

---
 osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index 32e8ab5da7..ae6868aea5 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -45,6 +45,9 @@ namespace osu.Game.Rulesets.Catch.Replays
                 float positionChange = Math.Abs(lastPosition - h.EffectiveX);
                 double timeAvailable = h.StartTime - lastTime;
 
+                if (timeAvailable < 0)
+                    return;
+
                 // So we can either make it there without a dash or not.
                 // If positionChange is 0, we don't need to move, so speedRequired should also be 0 (could be NaN if timeAvailable is 0 too)
                 // The case where positionChange > 0 and timeAvailable == 0 results in PositiveInfinity which provides expected beheaviour.

From d168de0ae32f0877d225efc13942b96a57a9bba2 Mon Sep 17 00:00:00 2001
From: Corentin PALLARD <corentin.pallard@azeo.com>
Date: Fri, 29 Jan 2021 03:03:23 +0100
Subject: [PATCH 07788/10326] Formatting

---
 osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index ae6868aea5..64ded8e94f 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -46,7 +46,9 @@ namespace osu.Game.Rulesets.Catch.Replays
                 double timeAvailable = h.StartTime - lastTime;
 
                 if (timeAvailable < 0)
+                {
                     return;
+                }
 
                 // So we can either make it there without a dash or not.
                 // If positionChange is 0, we don't need to move, so speedRequired should also be 0 (could be NaN if timeAvailable is 0 too)

From 449f883be15956273c5271eef5236dbd95776792 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Fri, 29 Jan 2021 11:48:51 +0600
Subject: [PATCH 07789/10326] add SV multiplier adjustment to
 TaikoModDifficultyAdjust

---
 .../Mods/TaikoModDifficultyAdjust.cs          | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
index 56a73ad7df..1d1773fcbb 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
@@ -1,11 +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 System.Linq;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModDifficultyAdjust : ModDifficultyAdjust
     {
+        [SettingSource("Slider Velocity", "Adjust a beatmap's set SV", LAST_SETTING_ORDER + 1)]
+        public BindableNumber<float> SliderVelocity { get; } = new BindableFloat
+        {
+            Precision = 0.05f,
+            MinValue = 0.25f,
+            MaxValue = 4,
+            Default = 1,
+            Value = 1,
+        };
+
+        public override string SettingDescription
+        {
+            get
+            {
+                string sliderVelocity = SliderVelocity.IsDefault ? string.Empty : $"SV {SliderVelocity.Value:N1}";
+
+                return string.Join(", ", new[]
+                {
+                    base.SettingDescription,
+                    sliderVelocity
+                }.Where(s => !string.IsNullOrEmpty(s)));
+            }
+        }
+
+        protected override void ApplySettings(BeatmapDifficulty difficulty)
+        {
+            base.ApplySettings(difficulty);
+
+            ApplySetting(SliderVelocity, sv => difficulty.SliderMultiplier *= sv);
+        }
     }
 }

From 1ec305e10d4ba70ee06a9f21bb3087e0d2e245e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 16:06:57 +0900
Subject: [PATCH 07790/10326] Update TaskChain to use ContinueWithSequential
 internally

It turns out we may still want to use TaskChain for its locking
behaviour, so I've made it internally use the refactored version I
implemented, while keeping the general structure.
---
 osu.Game/Utils/TaskChain.cs | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Utils/TaskChain.cs b/osu.Game/Utils/TaskChain.cs
index 30aea7578f..df28faf9fb 100644
--- a/osu.Game/Utils/TaskChain.cs
+++ b/osu.Game/Utils/TaskChain.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using osu.Game.Extensions;
 
 namespace osu.Game.Utils
 {
@@ -14,8 +15,9 @@ namespace osu.Game.Utils
     /// </summary>
     public class TaskChain
     {
-        private readonly object finalTaskLock = new object();
-        private Task? finalTask;
+        private readonly object taskLock = new object();
+
+        private Task lastTaskInChain = Task.CompletedTask;
 
         /// <summary>
         /// Adds a new task to the end of this <see cref="TaskChain"/>.
@@ -23,22 +25,22 @@ namespace osu.Game.Utils
         /// <param name="action">The action to be executed.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> for this task. Does not affect further tasks in the chain.</param>
         /// <returns>The awaitable <see cref="Task"/>.</returns>
-        public async Task Add(Action action, CancellationToken cancellationToken = default)
+        public Task Add(Action action, CancellationToken cancellationToken = default)
         {
-            Task? previousTask;
-            Task currentTask;
+            lock (taskLock)
+                return lastTaskInChain = lastTaskInChain.ContinueWithSequential(action, cancellationToken);
+        }
 
-            lock (finalTaskLock)
-            {
-                previousTask = finalTask;
-                finalTask = currentTask = new Task(action, cancellationToken);
-            }
-
-            if (previousTask != null)
-                await previousTask;
-
-            currentTask.Start();
-            await currentTask;
+        /// <summary>
+        /// Adds a new task to the end of this <see cref="TaskChain"/>.
+        /// </summary>
+        /// <param name="task">The task to be executed.</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> for this task. Does not affect further tasks in the chain.</param>
+        /// <returns>The awaitable <see cref="Task"/>.</returns>
+        public Task Add(Func<Task> task, CancellationToken cancellationToken = default)
+        {
+            lock (taskLock)
+                return lastTaskInChain = lastTaskInChain.ContinueWithSequential(task, cancellationToken);
         }
     }
 }

From c3aec3bfe43da7c71c243f2188b39bf24c8233cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 16:20:25 +0900
Subject: [PATCH 07791/10326] Revert test changes to test original class/scope

Importantly, this removes the call to CatchUnobservedExceptions(), which was
outright incorrect (awaiting on the wrong task as a result) in the
original test code.
---
 osu.Game.Tests/NonVisual/TaskChainTest.cs | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/TaskChainTest.cs b/osu.Game.Tests/NonVisual/TaskChainTest.cs
index 342f137dfd..d83eaafe20 100644
--- a/osu.Game.Tests/NonVisual/TaskChainTest.cs
+++ b/osu.Game.Tests/NonVisual/TaskChainTest.cs
@@ -1,28 +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;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using osu.Game.Extensions;
+using osu.Game.Utils;
 
 namespace osu.Game.Tests.NonVisual
 {
     [TestFixture]
     public class TaskChainTest
     {
-        private Task taskChain;
-
+        private TaskChain taskChain;
         private int currentTask;
         private CancellationTokenSource globalCancellationToken;
 
         [SetUp]
         public void Setup()
         {
-            taskChain = Task.CompletedTask;
-
             globalCancellationToken = new CancellationTokenSource();
+            taskChain = new TaskChain();
             currentTask = 0;
         }
 
@@ -81,16 +78,7 @@ namespace osu.Game.Tests.NonVisual
         {
             var mutex = new ManualResetEventSlim(false);
 
-            var task = taskChain.ContinueWithSequential(async () =>
-            {
-                try
-                {
-                    await Task.Run(() => mutex.Wait(globalCancellationToken.Token));
-                }
-                catch (OperationCanceledException)
-                {
-                }
-            });
+            var task = taskChain.Add(async () => await Task.Run(() => mutex.Wait(globalCancellationToken.Token)));
 
             // Allow task to potentially complete
             Thread.Sleep(1000);
@@ -111,7 +99,7 @@ namespace osu.Game.Tests.NonVisual
             var cancellationSource = new CancellationTokenSource();
             var token = CancellationTokenSource.CreateLinkedTokenSource(cancellationSource.Token, globalCancellationToken.Token);
 
-            taskChain = taskChain.ContinueWithSequential(() =>
+            taskChain.Add(() =>
             {
                 mutex.Wait(globalCancellationToken.Token);
                 completionSource.SetResult(Interlocked.Increment(ref currentTask));

From a61444690ea8324719e4f04f1cb6e02b3706bb19 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 16:32:28 +0900
Subject: [PATCH 07792/10326] Remove all usage of CatchUnobservedExceptions

This should no longer be required with the recent framework side change
that stops a game from crashing on unobserved exceptions
(https://github.com/ppy/osu-framework/pull/4171).
---
 osu.Game/Extensions/TaskExtensions.cs         | 36 -------------------
 .../Multiplayer/StatefulMultiplayerClient.cs  |  3 +-
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  3 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  8 +----
 .../Multiplayer/MultiplayerRoomManager.cs     |  3 +-
 .../Participants/ParticipantPanel.cs          |  3 +-
 6 files changed, 5 insertions(+), 51 deletions(-)
 delete mode 100644 osu.Game/Extensions/TaskExtensions.cs

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
deleted file mode 100644
index 4138c2757a..0000000000
--- a/osu.Game/Extensions/TaskExtensions.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.
-
-#nullable enable
-
-using System;
-using System.Threading.Tasks;
-using osu.Framework.Extensions.ExceptionExtensions;
-using osu.Framework.Logging;
-
-namespace osu.Game.Extensions
-{
-    public static class TaskExtensions
-    {
-        /// <summary>
-        /// Denote a task which is to be run without local error handling logic, where failure is not catastrophic.
-        /// Avoids unobserved exceptions from being fired.
-        /// </summary>
-        /// <param name="task">The task.</param>
-        /// <param name="logAsError">
-        /// Whether errors should be logged as errors visible to users, or as debug messages.
-        /// Logging as debug will essentially silence the errors on non-release builds.
-        /// </param>
-        public static void CatchUnobservedExceptions(this Task task, bool logAsError = false)
-        {
-            task.ContinueWith(t =>
-            {
-                Exception? exception = t.Exception?.AsSingular();
-                if (logAsError)
-                    Logger.Error(exception, $"Error running task: {exception?.Message ?? "(unknown)"}", LoggingTarget.Runtime, true);
-                else
-                    Logger.Log($"Error running task: {exception}", LoggingTarget.Runtime, LogLevel.Debug);
-            }, TaskContinuationOptions.NotOnRanToCompletion);
-        }
-    }
-}
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f0e11b2b8b..48194d1f0f 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -15,7 +15,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
-using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -104,7 +103,7 @@ namespace osu.Game.Online.Multiplayer
                 if (!connected.NewValue && Room != null)
                 {
                     Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
-                    LeaveRoom().CatchUnobservedExceptions();
+                    LeaveRoom();
                 }
             });
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 76f5c74433..ae22e1fcec 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
-using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
@@ -23,7 +22,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.OnResuming(last);
 
             if (client.Room != null)
-                client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
+                client.ChangeState(MultiplayerUserState.Idle);
         }
 
         protected override void UpdatePollingRate(bool isIdle)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 7c4b6d18ec..c071637b9b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -11,7 +11,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
-using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -237,7 +236,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                           // accessing Exception here silences any potential errors from the antecedent task
                           if (t.Exception != null)
                           {
-                              t.CatchUnobservedExceptions(true); // will run immediately.
                               // gameplay was not started due to an exception; unblock button.
                               endOperation();
                           }
@@ -248,11 +246,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
 
             client.ToggleReady()
-                  .ContinueWith(t =>
-                  {
-                      t.CatchUnobservedExceptions(true); // will run immediately.
-                      endOperation();
-                  });
+                  .ContinueWith(t => endOperation());
 
             void endOperation()
             {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 61d8896732..65d112a032 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -9,7 +9,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
-using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
@@ -69,7 +68,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             base.PartRoom();
 
-            multiplayerClient.LeaveRoom().CatchUnobservedExceptions();
+            multiplayerClient.LeaveRoom();
 
             // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
             // This is delayed one frame because upon exiting the match subscreen, multiplayer updates the polling rate and messes with polling.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index f99655e305..b5533f49cc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -176,7 +175,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                         if (Room.Host?.UserID != api.LocalUser.Value.Id)
                             return;
 
-                        Client.TransferHost(targetUser).CatchUnobservedExceptions(true);
+                        Client.TransferHost(targetUser);
                     })
                 };
             }

From 37ef5c70729c6f99cf51cc6841eb4833a728e51c Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Fri, 29 Jan 2021 15:04:55 +0600
Subject: [PATCH 07793/10326] rename SliderVelocity to ScrollSpeed

---
 .../Mods/TaikoModDifficultyAdjust.cs                   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
index 1d1773fcbb..4006652bd5 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
@@ -11,8 +11,8 @@ namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModDifficultyAdjust : ModDifficultyAdjust
     {
-        [SettingSource("Slider Velocity", "Adjust a beatmap's set SV", LAST_SETTING_ORDER + 1)]
-        public BindableNumber<float> SliderVelocity { get; } = new BindableFloat
+        [SettingSource("Scroll Speed", "Adjust a beatmap's set scroll speed", LAST_SETTING_ORDER + 1)]
+        public BindableNumber<float> ScrollSpeed { get; } = new BindableFloat
         {
             Precision = 0.05f,
             MinValue = 0.25f,
@@ -25,12 +25,12 @@ namespace osu.Game.Rulesets.Taiko.Mods
         {
             get
             {
-                string sliderVelocity = SliderVelocity.IsDefault ? string.Empty : $"SV {SliderVelocity.Value:N1}";
+                string scrollSpeed = ScrollSpeed.IsDefault ? string.Empty : $"Scroll x{ScrollSpeed.Value:N1}";
 
                 return string.Join(", ", new[]
                 {
                     base.SettingDescription,
-                    sliderVelocity
+                    scrollSpeed
                 }.Where(s => !string.IsNullOrEmpty(s)));
             }
         }
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         {
             base.ApplySettings(difficulty);
 
-            ApplySetting(SliderVelocity, sv => difficulty.SliderMultiplier *= sv);
+            ApplySetting(ScrollSpeed, scroll => difficulty.SliderMultiplier *= scroll);
         }
     }
 }

From ab9a3e6dd05bd4a85ab5d1be0e7acc726148e029 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 29 Jan 2021 18:21:22 +0900
Subject: [PATCH 07794/10326] Pass allowed mods and consume on server callback

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f0e11b2b8b..e5b07ddfb4 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -192,7 +192,8 @@ namespace osu.Game.Online.Multiplayer
                 BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
                 BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
                 RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
-                Mods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods
+                Mods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods,
+                AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods
             });
         }
 
@@ -502,6 +503,7 @@ namespace osu.Game.Online.Multiplayer
 
             var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
             var mods = settings.Mods.Select(m => m.ToMod(ruleset));
+            var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
             PlaylistItem playlistItem = new PlaylistItem
             {
@@ -511,6 +513,7 @@ namespace osu.Game.Online.Multiplayer
             };
 
             playlistItem.RequiredMods.AddRange(mods);
+            playlistItem.AllowedMods.AddRange(allowedMods);
 
             apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
             apiRoom.Playlist.Add(playlistItem);

From 18e6afbec06a2111275ba6415eb7d132f52f9ce2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 19:16:10 +0900
Subject: [PATCH 07795/10326] Ensure the item is present before trying to
 select it

---
 .../Overlays/Settings/Sections/SkinSection.cs | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 56c677d5b5..7c8309fd56 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -121,7 +121,22 @@ namespace osu.Game.Overlays.Settings.Sections
             });
         }
 
-        private void updateSelectedSkinFromConfig() => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == configBindable.Value);
+        private void updateSelectedSkinFromConfig()
+        {
+            int id = configBindable.Value;
+
+            var skin = skinDropdown.Items.FirstOrDefault(s => s.ID == id);
+
+            if (skin == null)
+            {
+                // there may be a thread race condition where an item is selected that hasn't yet been added to the dropdown.
+                // to avoid adding complexity, let's just ensure the item is added so we can perform the selection.
+                skin = skins.Query(s => s.ID == id);
+                addItem(skin);
+            }
+
+            dropdownBindable.Value = skin;
+        }
 
         private void updateItems()
         {
@@ -134,14 +149,14 @@ namespace osu.Game.Overlays.Settings.Sections
         private void itemUpdated(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-            {
-                Schedule(() =>
-                {
-                    List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
-                    sortUserSkins(newDropdownItems);
-                    skinDropdown.Items = newDropdownItems;
-                });
-            }
+                Schedule(() => addItem(item));
+        }
+
+        private void addItem(SkinInfo item)
+        {
+            List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
+            sortUserSkins(newDropdownItems);
+            skinDropdown.Items = newDropdownItems;
         }
 
         private void itemRemoved(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)

From 16f3d1815f27a344ca2e9a662f960f97ef4db666 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 19:53:56 +0900
Subject: [PATCH 07796/10326] Fix SQLite exception thrown is a beatmap lookup
 is attempted without an OnlineBeatmapID present
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It turns out the SQLite API isn't smart enough to handle nullables
directly, so we need to help it out a bit.

Stops the following from being thrown:

```
System.InvalidOperationException: Value must be set.
   at Microsoft.Data.Sqlite.SqliteParameter.Bind(sqlite3_stmt stmt) = 3
at
   at Microsoft.Data.Sqlite.SqliteParameterCollection.Bind(sqlite3_stmt
stmt) = 3 at
   at Microsoft.Data.Sqlite.SqliteCommand.ExecuteReader(CommandBehavior
behavior)
   at Microsoft.Data.Sqlite.SqliteCommand.ExecuteReader()
   at
osu.Game.Beatmaps.BeatmapManager.BeatmapOnlineLookupQueue.checkLocalCache(BeatmapSetInfo
set, BeatmapInfo beatmap) in
/Users/dean/Projects/osu/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs:line
166 = 166
```
---
 osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index ea91f2d2e0..7c4b344c9e 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Beatmaps
                             cmd.CommandText = "SELECT beatmapset_id, beatmap_id, approved FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path";
 
                             cmd.Parameters.Add(new SqliteParameter("@MD5Hash", beatmap.MD5Hash));
-                            cmd.Parameters.Add(new SqliteParameter("@OnlineBeatmapID", beatmap.OnlineBeatmapID));
+                            cmd.Parameters.Add(new SqliteParameter("@OnlineBeatmapID", beatmap.OnlineBeatmapID ?? (object)DBNull.Value));
                             cmd.Parameters.Add(new SqliteParameter("@Path", beatmap.Path));
 
                             using (var reader = cmd.ExecuteReader())

From f25809d35f9fd084f7486bab8066dc0da6b59347 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 19:55:51 +0900
Subject: [PATCH 07797/10326] Ensure spinners only handle input during their
 hittable time

While this was already being enforced inside of `CheckForResult`, the
internal tracking values of rotation were still being incremented as
long as the `DrawableSpinner` was present. This resulted in incorrect
SPM values being displayed if a user was to start spinning before the
object's `StartTime`.

Kind of annoying to write a test for (there's no setup for spinners yet)
but am willing to do so if that is deemed necessary.

Closes https://github.com/ppy/osu/issues/11600.
---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 56aedebed3..43012563ae 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -18,6 +18,7 @@ using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 
@@ -242,6 +243,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
+            HandleUserInput = Time.Current >= HitObject.StartTime && Time.Current <= HitObject.EndTime;
+
             if (HandleUserInput)
                 RotationTracker.Tracking = !Result.HasResult && (OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
 
@@ -255,6 +258,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (!SpmCounter.IsPresent && RotationTracker.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
+
             SpmCounter.SetRotation(Result.RateAdjustedRotation);
 
             updateBonusScore();

From 5a306dfc2b261e5926817eb03352a11ec846c1ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 20:22:25 +0900
Subject: [PATCH 07798/10326] Fix unused using

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 43012563ae..ab8156f4f2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -18,7 +18,6 @@ using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 

From d521bfc251195a4eb5560d9685181bf079602d46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 30 Jan 2021 02:35:11 +0900
Subject: [PATCH 07799/10326] Don't directly update HandleUserInput (as it is
 used by mods)

---
 .../Objects/Drawables/DrawableSpinner.cs              | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index ab8156f4f2..c58f703bef 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -242,10 +242,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
-            HandleUserInput = Time.Current >= HitObject.StartTime && Time.Current <= HitObject.EndTime;
-
             if (HandleUserInput)
-                RotationTracker.Tracking = !Result.HasResult && (OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
+            {
+                bool isValidSpinningTime = Time.Current >= HitObject.StartTime && Time.Current <= HitObject.EndTime;
+                bool correctButtonPressed = (OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
+
+                RotationTracker.Tracking = !Result.HasResult
+                                           && correctButtonPressed
+                                           && isValidSpinningTime;
+            }
 
             if (spinningSample != null && spinnerFrequencyModulate)
                 spinningSample.Frequency.Value = spinning_sample_modulated_base_frequency + Progress;

From ae08ef25437efd3e6aa6661a8d1d627cff338a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 29 Jan 2021 20:32:45 +0100
Subject: [PATCH 07800/10326] Reset SPM counter state on DHO application

---
 .../Skinning/Default/SpinnerSpmCounter.cs     | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
index e5952ecf97..69355f624b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
@@ -4,16 +4,21 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class SpinnerSpmCounter : Container
     {
+        [Resolved]
+        private DrawableHitObject drawableSpinner { get; set; }
+
         private readonly OsuSpriteText spmText;
 
         public SpinnerSpmCounter()
@@ -38,6 +43,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            drawableSpinner.HitObjectApplied += resetState;
+        }
+
         private double spm;
 
         public double SpinsPerMinute
@@ -82,5 +93,19 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
             records.Enqueue(new RotationRecord { Rotation = currentRotation, Time = Time.Current });
         }
+
+        private void resetState(DrawableHitObject hitObject)
+        {
+            SpinsPerMinute = 0;
+            records.Clear();
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (drawableSpinner != null)
+                drawableSpinner.HitObjectApplied -= resetState;
+        }
     }
 }

From c3ba92f057349d56c79906bd96ab0de8b67e0fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 30 Jan 2021 16:13:50 +0100
Subject: [PATCH 07801/10326] Set canceled result in scheduleAsync

Was holding up the task completion source, and in consequence,
potentially the entire task chain.
---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 4bec327884..de51a4b117 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -551,7 +551,10 @@ namespace osu.Game.Online.Multiplayer
             Scheduler.Add(() =>
             {
                 if (cancellationToken.IsCancellationRequested)
+                {
+                    tcs.SetCanceled();
                     return;
+                }
 
                 try
                 {

From 0aaa62efc2d9f2d1e8f6d46632661b0e6ef8db03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 30 Jan 2021 20:55:56 +0100
Subject: [PATCH 07802/10326] Add failing test case

---
 .../NonVisual/OngoingOperationTrackerTest.cs  | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
index eef9582af9..10216c3339 100644
--- a/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
+++ b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
@@ -3,8 +3,12 @@
 
 using System;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Screens;
 using osu.Framework.Testing;
+using osu.Game.Screens;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Tests.Visual;
 
@@ -58,5 +62,45 @@ namespace osu.Game.Tests.NonVisual
             AddStep("end operation", () => operation.Dispose());
             AddAssert("operation is ended", () => !operationInProgress.Value);
         }
+
+        [Test]
+        public void TestOperationDisposalAfterScreenExit()
+        {
+            TestScreenWithTracker screen = null;
+            OsuScreenStack stack;
+            IDisposable operation = null;
+
+            AddStep("create screen with tracker", () =>
+            {
+                Child = stack = new OsuScreenStack
+                {
+                    RelativeSizeAxes = Axes.Both
+                };
+
+                stack.Push(screen = new TestScreenWithTracker());
+            });
+            AddUntilStep("wait for loaded", () => screen.IsLoaded);
+
+            AddStep("begin operation", () => operation = screen.OngoingOperationTracker.BeginOperation());
+            AddAssert("operation in progress", () => screen.OngoingOperationTracker.InProgress.Value);
+
+            AddStep("dispose after screen exit", () =>
+            {
+                screen.Exit();
+                operation.Dispose();
+            });
+            AddAssert("operation ended", () => !screen.OngoingOperationTracker.InProgress.Value);
+        }
+
+        private class TestScreenWithTracker : OsuScreen
+        {
+            public OngoingOperationTracker OngoingOperationTracker { get; private set; }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                InternalChild = OngoingOperationTracker = new OngoingOperationTracker();
+            }
+        }
     }
 }

From 96f56d1c942505797f20cf1c166b5452c60ea592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 30 Jan 2021 21:00:13 +0100
Subject: [PATCH 07803/10326] Return tracker lease via UnbindAll()

Improves reliability by being fail-safe in case of multiple returns,
which can happen if the operation tracker is part of a screen being
exited (as is the case with its current primary usage in multiplayer).
---
 .../Screens/OnlinePlay/OngoingOperationTracker.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index b7ee84eb9e..9e88fabb3d 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -53,20 +53,15 @@ namespace osu.Game.Screens.OnlinePlay
             // for extra safety, marshal the end of operation back to the update thread if necessary.
             Scheduler.Add(() =>
             {
-                leasedInProgress?.Return();
+                // UnbindAll() is purposefully used instead of Return() - the two do roughly the same thing, with one difference:
+                // the former won't throw if the lease has already been returned before.
+                // this matters because framework can unbind the lease via the internal UnbindAllBindables(), which is not always detectable
+                // (it is in the case of disposal, but not in the case of screen exit - at least not cleanly).
+                leasedInProgress?.UnbindAll();
                 leasedInProgress = null;
             }, false);
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            // base call does an UnbindAllBindables().
-            // clean up the leased reference here so that it doesn't get returned twice.
-            leasedInProgress = null;
-        }
-
         private class OngoingOperation : IDisposable
         {
             private readonly OngoingOperationTracker tracker;

From 5f320cd4264ad444fe5cb3f7aa7bef74d530e932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 30 Jan 2021 21:03:09 +0100
Subject: [PATCH 07804/10326] Move lease check inside schedule

Theoretically safer due to avoiding a potential data race (change in
`leasedInProgress` between the time of the check and start of schedule
execution).
---
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index 9e88fabb3d..aabeafe460 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -47,12 +47,12 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void endOperationWithKnownLease(LeasedBindable<bool> lease)
         {
-            if (lease != leasedInProgress)
-                return;
-
             // for extra safety, marshal the end of operation back to the update thread if necessary.
             Scheduler.Add(() =>
             {
+                if (lease != leasedInProgress)
+                    return;
+
                 // UnbindAll() is purposefully used instead of Return() - the two do roughly the same thing, with one difference:
                 // the former won't throw if the lease has already been returned before.
                 // this matters because framework can unbind the lease via the internal UnbindAllBindables(), which is not always detectable

From 90ba8ae234bbec60aab5b42f9cd625eb8e2d2f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 30 Jan 2021 23:39:01 +0100
Subject: [PATCH 07805/10326] Don't part room if join task was cancelled

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 65d112a032..1e57847f04 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             {
                 if (t.IsCompletedSuccessfully)
                     Schedule(() => onSuccess?.Invoke(room));
-                else
+                else if (t.IsFaulted)
                 {
                     const string message = "Failed to join multiplayer room.";
 

From d7e5a212134e371838ee342ecb476bdcc0347c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 15:23:53 +0100
Subject: [PATCH 07806/10326] Add failing test case

---
 .../Formats/LegacyStoryboardDecoderTest.cs    | 20 +++++++++++++++++++
 osu.Game.Tests/Resources/animation-types.osb  |  9 +++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/animation-types.osb

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 7bee580863..bcde899789 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -129,5 +129,25 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual(3456, ((StoryboardSprite)background.Elements.Single()).InitialPosition.X);
             }
         }
+
+        [Test]
+        public void TestDecodeOutOfRangeLoopAnimationType()
+        {
+            var decoder = new LegacyStoryboardDecoder();
+
+            using (var resStream = TestResources.OpenResource("animation-types.osb"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var storyboard = decoder.Decode(stream);
+
+                StoryboardLayer foreground = storyboard.Layers.Single(l => l.Depth == 0);
+                Assert.AreEqual(AnimationLoopType.LoopForever, ((StoryboardAnimation)foreground.Elements[0]).LoopType);
+                Assert.AreEqual(AnimationLoopType.LoopOnce, ((StoryboardAnimation)foreground.Elements[1]).LoopType);
+                Assert.AreEqual(AnimationLoopType.LoopForever, ((StoryboardAnimation)foreground.Elements[2]).LoopType);
+                Assert.AreEqual(AnimationLoopType.LoopOnce, ((StoryboardAnimation)foreground.Elements[3]).LoopType);
+                Assert.AreEqual(AnimationLoopType.LoopForever, ((StoryboardAnimation)foreground.Elements[4]).LoopType);
+                Assert.AreEqual(AnimationLoopType.LoopForever, ((StoryboardAnimation)foreground.Elements[5]).LoopType);
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Resources/animation-types.osb b/osu.Game.Tests/Resources/animation-types.osb
new file mode 100644
index 0000000000..82233b7d30
--- /dev/null
+++ b/osu.Game.Tests/Resources/animation-types.osb
@@ -0,0 +1,9 @@
+osu file format v14
+
+[Events]
+Animation,Foreground,Centre,"forever-string.png",330,240,10,108,LoopForever
+Animation,Foreground,Centre,"once-string.png",330,240,10,108,LoopOnce
+Animation,Foreground,Centre,"forever-number.png",330,240,10,108,0
+Animation,Foreground,Centre,"once-number.png",330,240,10,108,1
+Animation,Foreground,Centre,"undefined-number.png",330,240,10,108,16
+Animation,Foreground,Centre,"omitted.png",330,240,10,108

From b9a49d5589dfd91e651ad84c0872401e27ab192e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 15:33:07 +0100
Subject: [PATCH 07807/10326] Coerce undefined animation loop types to Forever

---
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 9a244c8bb2..b9bf6823b5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Beatmaps.Formats
                             // this is random as hell but taken straight from osu-stable.
                             frameDelay = Math.Round(0.015 * frameDelay) * 1.186 * (1000 / 60f);
 
-                        var loopType = split.Length > 8 ? (AnimationLoopType)Enum.Parse(typeof(AnimationLoopType), split[8]) : AnimationLoopType.LoopForever;
+                        var loopType = split.Length > 8 ? parseAnimationLoopType(split[8]) : AnimationLoopType.LoopForever;
                         storyboardSprite = new StoryboardAnimation(path, origin, new Vector2(x, y), frameCount, frameDelay, loopType);
                         storyboard.GetLayer(layer).Add(storyboardSprite);
                         break;
@@ -341,6 +341,12 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
+        private AnimationLoopType parseAnimationLoopType(string value)
+        {
+            var parsed = (AnimationLoopType)Enum.Parse(typeof(AnimationLoopType), value);
+            return Enum.IsDefined(typeof(AnimationLoopType), parsed) ? parsed : AnimationLoopType.LoopForever;
+        }
+
         private void handleVariables(string line)
         {
             var pair = SplitKeyVal(line, '=');

From 81b052b866af6422434f96638dabace022618f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 20:18:12 +0100
Subject: [PATCH 07808/10326] Add failing test cases

---
 .../Rulesets/Mods/ModTimeRampTest.cs          | 82 +++++++++++++++++++
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  4 +-
 2 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs

diff --git a/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs b/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs
new file mode 100644
index 0000000000..894648b8b3
--- /dev/null
+++ b/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.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 NUnit.Framework;
+using osu.Framework.Audio.Track;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Tests.Rulesets.Mods
+{
+    [TestFixture]
+    public class ModTimeRampTest
+    {
+        private const double start_time = 1000;
+        private const double duration = 9000;
+
+        private TrackVirtual track;
+        private IBeatmap beatmap;
+
+        [SetUp]
+        public void SetUp()
+        {
+            track = new TrackVirtual(20_000);
+            beatmap = new Beatmap
+            {
+                HitObjects =
+                {
+                    new Spinner
+                    {
+                        StartTime = start_time,
+                        Duration = duration
+                    }
+                }
+            };
+        }
+
+        [TestCase(0, 1)]
+        [TestCase(start_time, 1)]
+        [TestCase(start_time + duration * ModTimeRamp.FINAL_RATE_PROGRESS / 2, 1.25)]
+        [TestCase(start_time + duration * ModTimeRamp.FINAL_RATE_PROGRESS, 1.5)]
+        [TestCase(start_time + duration, 1.5)]
+        [TestCase(15000, 1.5)]
+        public void TestModWindUp(double time, double expectedRate)
+        {
+            var mod = new ModWindUp();
+            mod.ApplyToBeatmap(beatmap);
+            mod.ApplyToTrack(track);
+
+            seekTrackAndUpdateMod(mod, time);
+
+            Assert.That(mod.SpeedChange.Value, Is.EqualTo(expectedRate));
+        }
+
+        [TestCase(0, 1)]
+        [TestCase(start_time, 1)]
+        [TestCase(start_time + duration * ModTimeRamp.FINAL_RATE_PROGRESS / 2, 0.75)]
+        [TestCase(start_time + duration * ModTimeRamp.FINAL_RATE_PROGRESS, 0.5)]
+        [TestCase(start_time + duration, 0.5)]
+        [TestCase(15000, 0.5)]
+        public void TestModWindDown(double time, double expectedRate)
+        {
+            var mod = new ModWindDown
+            {
+                FinalRate = { Value = 0.5 }
+            };
+            mod.ApplyToBeatmap(beatmap);
+            mod.ApplyToTrack(track);
+
+            seekTrackAndUpdateMod(mod, time);
+
+            Assert.That(mod.SpeedChange.Value, Is.EqualTo(expectedRate));
+        }
+
+        private void seekTrackAndUpdateMod(ModTimeRamp mod, double time)
+        {
+            track.Seek(time);
+            // update the mod via a fake playfield to re-calculate the current rate.
+            mod.Update(null);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 4d43ae73d3..c691339a81 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mods
         /// <summary>
         /// The point in the beatmap at which the final ramping rate should be reached.
         /// </summary>
-        private const double final_rate_progress = 0.75f;
+        public const double FINAL_RATE_PROGRESS = 0.75f;
 
         [SettingSource("Initial rate", "The starting speed of the track")]
         public abstract BindableNumber<double> InitialRate { get; }
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Mods
             SpeedChange.SetDefault();
 
             beginRampTime = beatmap.HitObjects.FirstOrDefault()?.StartTime ?? 0;
-            finalRateTime = final_rate_progress * (lastObject?.GetEndTime() ?? 0);
+            finalRateTime = FINAL_RATE_PROGRESS * (lastObject?.GetEndTime() ?? 0);
         }
 
         public virtual void Update(Playfield playfield)

From 547b3d8bed86d1398da54ea3d6ffcca8f883763b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 20:34:56 +0100
Subject: [PATCH 07809/10326] Fix speed change calculation in time ramp mods

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index c691339a81..a28a0351a6 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -66,17 +66,18 @@ namespace osu.Game.Rulesets.Mods
 
         public virtual void ApplyToBeatmap(IBeatmap beatmap)
         {
-            HitObject lastObject = beatmap.HitObjects.LastOrDefault();
-
             SpeedChange.SetDefault();
 
-            beginRampTime = beatmap.HitObjects.FirstOrDefault()?.StartTime ?? 0;
-            finalRateTime = FINAL_RATE_PROGRESS * (lastObject?.GetEndTime() ?? 0);
+            double firstObjectStart = beatmap.HitObjects.FirstOrDefault()?.StartTime ?? 0;
+            double lastObjectEnd = beatmap.HitObjects.LastOrDefault()?.GetEndTime() ?? 0;
+
+            beginRampTime = firstObjectStart;
+            finalRateTime = firstObjectStart + FINAL_RATE_PROGRESS * (lastObjectEnd - firstObjectStart);
         }
 
         public virtual void Update(Playfield playfield)
         {
-            applyRateAdjustment((track.CurrentTime - beginRampTime) / finalRateTime);
+            applyRateAdjustment((track.CurrentTime - beginRampTime) / (finalRateTime - beginRampTime));
         }
 
         /// <summary>

From a0de1cbfd07447789c4093d67c10e782e6463725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 21:09:41 +0100
Subject: [PATCH 07810/10326] Handle no-duration single-object edge case

---
 .../Rulesets/Mods/ModTimeRampTest.cs          | 55 +++++++++++++++----
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  2 +-
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs b/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs
index 894648b8b3..4b9f2181dc 100644
--- a/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs
+++ b/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs
@@ -16,23 +16,11 @@ namespace osu.Game.Tests.Rulesets.Mods
         private const double duration = 9000;
 
         private TrackVirtual track;
-        private IBeatmap beatmap;
 
         [SetUp]
         public void SetUp()
         {
             track = new TrackVirtual(20_000);
-            beatmap = new Beatmap
-            {
-                HitObjects =
-                {
-                    new Spinner
-                    {
-                        StartTime = start_time,
-                        Duration = duration
-                    }
-                }
-            };
         }
 
         [TestCase(0, 1)]
@@ -43,6 +31,7 @@ namespace osu.Game.Tests.Rulesets.Mods
         [TestCase(15000, 1.5)]
         public void TestModWindUp(double time, double expectedRate)
         {
+            var beatmap = createSingleSpinnerBeatmap();
             var mod = new ModWindUp();
             mod.ApplyToBeatmap(beatmap);
             mod.ApplyToTrack(track);
@@ -60,6 +49,7 @@ namespace osu.Game.Tests.Rulesets.Mods
         [TestCase(15000, 0.5)]
         public void TestModWindDown(double time, double expectedRate)
         {
+            var beatmap = createSingleSpinnerBeatmap();
             var mod = new ModWindDown
             {
                 FinalRate = { Value = 0.5 }
@@ -72,11 +62,52 @@ namespace osu.Game.Tests.Rulesets.Mods
             Assert.That(mod.SpeedChange.Value, Is.EqualTo(expectedRate));
         }
 
+        [TestCase(0, 1)]
+        [TestCase(start_time, 1)]
+        [TestCase(2 * start_time, 1.5)]
+        public void TestZeroDurationMap(double time, double expectedRate)
+        {
+            var beatmap = createSingleObjectBeatmap();
+            var mod = new ModWindUp();
+            mod.ApplyToBeatmap(beatmap);
+            mod.ApplyToTrack(track);
+
+            seekTrackAndUpdateMod(mod, time);
+
+            Assert.That(mod.SpeedChange.Value, Is.EqualTo(expectedRate));
+        }
+
         private void seekTrackAndUpdateMod(ModTimeRamp mod, double time)
         {
             track.Seek(time);
             // update the mod via a fake playfield to re-calculate the current rate.
             mod.Update(null);
         }
+
+        private static Beatmap createSingleSpinnerBeatmap()
+        {
+            return new Beatmap
+            {
+                HitObjects =
+                {
+                    new Spinner
+                    {
+                        StartTime = start_time,
+                        Duration = duration
+                    }
+                }
+            };
+        }
+
+        private static Beatmap createSingleObjectBeatmap()
+        {
+            return new Beatmap
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = start_time }
+                }
+            };
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index a28a0351a6..b6916c838e 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Mods
 
         public virtual void Update(Playfield playfield)
         {
-            applyRateAdjustment((track.CurrentTime - beginRampTime) / (finalRateTime - beginRampTime));
+            applyRateAdjustment((track.CurrentTime - beginRampTime) / Math.Max(1, finalRateTime - beginRampTime));
         }
 
         /// <summary>

From 39d46d21e6e2453121e513a2025cd6c5a2bd9ba9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 31 Jan 2021 23:44:27 +0300
Subject: [PATCH 07811/10326] Add failing test case

---
 .../Online/TestSceneStandAloneChatDisplay.cs  | 116 ++++++++++++------
 1 file changed, 80 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 492abdd88d..02ef024128 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -8,6 +8,7 @@ using osu.Game.Users;
 using osuTK;
 using System;
 using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays.Chat;
@@ -16,8 +17,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneStandAloneChatDisplay : OsuTestScene
     {
-        private readonly Channel testChannel = new Channel();
-
         private readonly User admin = new User
         {
             Username = "HappyStick",
@@ -46,78 +45,84 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private ChannelManager channelManager = new ChannelManager();
 
-        private readonly TestStandAloneChatDisplay chatDisplay;
-        private readonly TestStandAloneChatDisplay chatDisplay2;
+        private TestStandAloneChatDisplay chatDisplay;
+        private TestStandAloneChatDisplay chatDisplay2;
+        private int messageIdSequence;
+
+        private Channel testChannel;
 
         public TestSceneStandAloneChatDisplay()
         {
             Add(channelManager);
-
-            Add(chatDisplay = new TestStandAloneChatDisplay
-            {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                Margin = new MarginPadding(20),
-                Size = new Vector2(400, 80)
-            });
-
-            Add(chatDisplay2 = new TestStandAloneChatDisplay(true)
-            {
-                Anchor = Anchor.CentreRight,
-                Origin = Anchor.CentreRight,
-                Margin = new MarginPadding(20),
-                Size = new Vector2(400, 150)
-            });
         }
 
-        protected override void LoadComplete()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
-            base.LoadComplete();
+            messageIdSequence = 0;
+            channelManager.CurrentChannel.Value = testChannel = new Channel();
 
-            channelManager.CurrentChannel.Value = testChannel;
+            Children = new[]
+            {
+                chatDisplay = new TestStandAloneChatDisplay
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Margin = new MarginPadding(20),
+                    Size = new Vector2(400, 80),
+                    Channel = { Value = testChannel },
+                },
+                chatDisplay2 = new TestStandAloneChatDisplay(true)
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Margin = new MarginPadding(20),
+                    Size = new Vector2(400, 150),
+                    Channel = { Value = testChannel },
+                }
+            };
+        });
 
-            chatDisplay.Channel.Value = testChannel;
-            chatDisplay2.Channel.Value = testChannel;
-
-            int sequence = 0;
-
-            AddStep("message from admin", () => testChannel.AddNewMessages(new Message(sequence++)
+        [Test]
+        public void TestManyMessages()
+        {
+            AddStep("message from admin", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = admin,
                 Content = "I am a wang!"
             }));
 
-            AddStep("message from team red", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message from team red", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = redUser,
                 Content = "I am team red."
             }));
 
-            AddStep("message from team red", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message from team red", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = redUser,
                 Content = "I plan to win!"
             }));
 
-            AddStep("message from team blue", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message from team blue", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = blueUser,
                 Content = "Not on my watch. Prepare to eat saaaaaaaaaand. Lots and lots of saaaaaaand."
             }));
 
-            AddStep("message from admin", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message from admin", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = admin,
                 Content = "Okay okay, calm down guys. Let's do this!"
             }));
 
-            AddStep("message from long username", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message from long username", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = longUsernameUser,
                 Content = "Hi guys, my new username is lit!"
             }));
 
-            AddStep("message with new date", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message with new date", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = longUsernameUser,
                 Content = "Message from the future!",
@@ -131,7 +136,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 for (int i = 0; i < messages_per_call; i++)
                 {
-                    testChannel.AddNewMessages(new Message(sequence++)
+                    testChannel.AddNewMessages(new Message(messageIdSequence++)
                     {
                         Sender = longUsernameUser,
                         Content = "Many messages! " + Guid.NewGuid(),
@@ -156,6 +161,45 @@ namespace osu.Game.Tests.Visual.Online
             AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
         }
 
+        /// <summary>
+        /// Tests that when a message gets wrapped by the chat display getting contracted while scrolled to bottom, the chat will still keep scrolling down.
+        /// </summary>
+        [Test]
+        public void TestMessageWrappingKeepsAutoScrolling()
+        {
+            AddStep("fill chat", () =>
+            {
+                for (int i = 0; i < 10; i++)
+                {
+                    testChannel.AddNewMessages(new Message(messageIdSequence++)
+                    {
+                        Sender = longUsernameUser,
+                        Content = $"some stuff {Guid.NewGuid()}",
+                    });
+                }
+            });
+
+            AddAssert("ensure scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+
+            // send message with short words for text wrapping to occur when contracting chat.
+            AddStep("send lorem ipsum", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
+            {
+                Sender = longUsernameUser,
+                Content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce et bibendum velit.",
+            }));
+
+            AddStep("contract chat", () => chatDisplay.Width -= 100);
+            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+
+            AddStep("send another message", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
+            {
+                Sender = admin,
+                Content = "As we were saying...",
+            }));
+
+            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+        }
+
         private class TestStandAloneChatDisplay : StandAloneChatDisplay
         {
             public TestStandAloneChatDisplay(bool textbox = false)

From e806e5bcd1580f1c85026e53d289d7cf933e4767 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 31 Jan 2021 23:37:52 +0300
Subject: [PATCH 07812/10326] Improve robustness of chat auto-scrolling logic

Fix auto-scrolling state changing by old messages removal logic
---
 osu.Game/Overlays/Chat/DrawableChannel.cs | 47 ++++++++++++++++-------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 5926d11c03..f1aa387c17 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Chat
     {
         public readonly Channel Channel;
         protected FillFlowContainer ChatLineFlow;
-        private OsuScrollContainer scroll;
+        private ChannelScrollContainer scroll;
 
         private bool scrollbarVisible = true;
 
@@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Chat
             {
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
-                Child = scroll = new OsuScrollContainer
+                Child = scroll = new ChannelScrollContainer
                 {
                     ScrollbarVisible = scrollbarVisible,
                     RelativeSizeAxes = Axes.Both,
@@ -80,12 +80,6 @@ namespace osu.Game.Overlays.Chat
             Channel.PendingMessageResolved += pendingMessageResolved;
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            scrollToEnd();
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -113,8 +107,6 @@ namespace osu.Game.Overlays.Chat
                 ChatLineFlow.Clear();
             }
 
-            bool shouldScrollToEnd = scroll.IsScrolledToEnd(10) || !chatLines.Any() || newMessages.Any(m => m is LocalMessage);
-
             // Add up to last Channel.MAX_HISTORY messages
             var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - Channel.MAX_HISTORY));
 
@@ -153,8 +145,10 @@ namespace osu.Game.Overlays.Chat
                 }
             }
 
-            if (shouldScrollToEnd)
-                scrollToEnd();
+            // due to the scroll adjusts from old messages removal above, a scroll-to-end must be enforced,
+            // to avoid making the container think the user has scrolled back up and unwantedly disable auto-scrolling.
+            if (scroll.ShouldAutoScroll || newMessages.Any(m => m is LocalMessage))
+                ScheduleAfterChildren(() => scroll.ScrollToEnd());
         });
 
         private void pendingMessageResolved(Message existing, Message updated) => Schedule(() =>
@@ -178,8 +172,6 @@ namespace osu.Game.Overlays.Chat
 
         private IEnumerable<ChatLine> chatLines => ChatLineFlow.Children.OfType<ChatLine>();
 
-        private void scrollToEnd() => ScheduleAfterChildren(() => scroll.ScrollToEnd());
-
         public class DaySeparator : Container
         {
             public float TextSize
@@ -243,5 +235,32 @@ namespace osu.Game.Overlays.Chat
                 };
             }
         }
+
+        /// <summary>
+        /// An <see cref="OsuScrollContainer"/> with functionality to automatically scrolls whenever the maximum scrollable distance increases.
+        /// </summary>
+        private class ChannelScrollContainer : OsuScrollContainer
+        {
+            private const float auto_scroll_leniency = 10f;
+
+            private float? lastExtent;
+
+            /// <summary>
+            /// Whether this should automatically scroll to end on the next call to <see cref="UpdateAfterChildren"/>.
+            /// </summary>
+            public bool ShouldAutoScroll { get; private set; } = true;
+
+            protected override void UpdateAfterChildren()
+            {
+                base.UpdateAfterChildren();
+
+                if ((lastExtent == null || ScrollableExtent > lastExtent) && ShouldAutoScroll)
+                    ScrollToEnd();
+                else
+                    ShouldAutoScroll = IsScrolledToEnd(auto_scroll_leniency);
+
+                lastExtent = ScrollableExtent;
+            }
+        }
     }
 }

From 230b347c1efbfc7baa7da6af8676356e47d7a4d2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 12:18:11 +0900
Subject: [PATCH 07813/10326] Move ModSelectOverlay.IsValidMod to a property

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 29 ++++++++++++++-----
 .../Overlays/Mods/SoloModSelectOverlay.cs     |  6 ----
 .../Multiplayer/FreeModSelectOverlay.cs       |  5 ----
 .../Multiplayer/MultiplayerMatchSongSelect.cs | 11 +++++--
 osu.Game/Screens/Select/MatchSongSelect.cs    |  5 +++-
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 5709ca3b8d..c21b9ba409 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -29,7 +30,6 @@ namespace osu.Game.Overlays.Mods
 {
     public abstract class ModSelectOverlay : WaveOverlayContainer
     {
-        private readonly Func<Mod, bool> isValidMod;
         public const float HEIGHT = 510;
 
         protected readonly TriangleButton DeselectAllButton;
@@ -46,6 +46,20 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly ModSettingsContainer ModSettingsContainer;
 
+        [NotNull]
+        private Func<Mod, bool> isValidMod = m => true;
+
+        [NotNull]
+        public Func<Mod, bool> IsValidMod
+        {
+            get => isValidMod;
+            set
+            {
+                isValidMod = value ?? throw new ArgumentNullException(nameof(value));
+                updateAvailableMods();
+            }
+        }
+
         public readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         private Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> availableMods;
@@ -60,10 +74,8 @@ namespace osu.Game.Overlays.Mods
 
         private SampleChannel sampleOn, sampleOff;
 
-        protected ModSelectOverlay(Func<Mod, bool> isValidMod = null)
+        protected ModSelectOverlay()
         {
-            this.isValidMod = isValidMod ?? (m => true);
-
             Waves.FirstWaveColour = Color4Extensions.FromHex(@"19b0e2");
             Waves.SecondWaveColour = Color4Extensions.FromHex(@"2280a2");
             Waves.ThirdWaveColour = Color4Extensions.FromHex(@"005774");
@@ -350,7 +362,7 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            availableMods.BindValueChanged(availableModsChanged, true);
+            availableMods.BindValueChanged(_ => updateAvailableMods(), true);
             SelectedMods.BindValueChanged(selectedModsChanged, true);
         }
 
@@ -405,12 +417,13 @@ namespace osu.Game.Overlays.Mods
 
         public override bool OnPressed(GlobalAction action) => false; // handled by back button
 
-        private void availableModsChanged(ValueChangedEvent<Dictionary<ModType, IReadOnlyList<Mod>>> mods)
+        private void updateAvailableMods()
         {
-            if (mods.NewValue == null) return;
+            if (availableMods.Value == null)
+                return;
 
             foreach (var section in ModSectionsContainer.Children)
-                section.Mods = mods.NewValue[section.ModType].Where(isValidMod);
+                section.Mods = availableMods.Value[section.ModType].Where(IsValidMod);
         }
 
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
index 53d0c9fce9..d039ad1f98 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
@@ -1,18 +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 osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
     public class SoloModSelectOverlay : ModSelectOverlay
     {
-        public SoloModSelectOverlay(Func<Mod, bool> isValidMod = null)
-            : base(isValidMod)
-        {
-        }
-
         protected override void OnModSelected(Mod mod)
         {
             base.OnModSelected(mod);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
index 10b68ec5a6..56e74a8460 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
@@ -14,11 +14,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class FreeModSelectOverlay : ModSelectOverlay
     {
-        public FreeModSelectOverlay(Func<Mod, bool> isValidMod = null)
-            : base(isValidMod)
-        {
-        }
-
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
         private class FreeModSection : ModSection
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 86b8f22d34..d36ebeec0f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -54,7 +54,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
 
-            freeModSelectOverlay = new FreeModSelectOverlay(isValidMod) { SelectedMods = { BindTarget = freeMods } };
+            freeModSelectOverlay = new FreeModSelectOverlay
+            {
+                SelectedMods = { BindTarget = freeMods },
+                IsValidMod = isValidMod,
+            };
         }
 
         [BackgroundDependencyLoader]
@@ -130,7 +134,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
+        {
+            IsValidMod = isValidMod
+        };
 
         protected override IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons()
         {
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 280f46f9ab..98e02a9294 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -81,7 +81,10 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
+        {
+            IsValidMod = isValidMod
+        };
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }

From 797a8102876808174924486af644de927d7123f4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 13:24:56 +0900
Subject: [PATCH 07814/10326] Allow unstacking mods

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 30 +++++++++++++++++--
 .../Multiplayer/FreeModSelectOverlay.cs       |  5 ++++
 osu.Game/Utils/ModValidation.cs               | 17 +++++++----
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index c21b9ba409..db9460c494 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -22,6 +22,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -46,9 +47,27 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly ModSettingsContainer ModSettingsContainer;
 
+        private bool stacked = true;
+
+        /// <summary>
+        /// Whether mod icons should be stacked, or appear as individual buttons.
+        /// </summary>
+        public bool Stacked
+        {
+            get => stacked;
+            set
+            {
+                stacked = value;
+                updateAvailableMods();
+            }
+        }
+
         [NotNull]
         private Func<Mod, bool> isValidMod = m => true;
 
+        /// <summary>
+        /// A function that checks whether a given mod is valid.
+        /// </summary>
         [NotNull]
         public Func<Mod, bool> IsValidMod
         {
@@ -419,11 +438,18 @@ namespace osu.Game.Overlays.Mods
 
         private void updateAvailableMods()
         {
-            if (availableMods.Value == null)
+            if (availableMods?.Value == null)
                 return;
 
             foreach (var section in ModSectionsContainer.Children)
-                section.Mods = availableMods.Value[section.ModType].Where(IsValidMod);
+            {
+                IEnumerable<Mod> modEnumeration = availableMods.Value[section.ModType];
+
+                if (!stacked)
+                    modEnumeration = ModValidation.FlattenMods(modEnumeration);
+
+                section.Mods = modEnumeration.Where(IsValidMod);
+            }
         }
 
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
index 56e74a8460..8334df1e44 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class FreeModSelectOverlay : ModSelectOverlay
     {
+        public FreeModSelectOverlay()
+        {
+            Stacked = false;
+        }
+
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
         private class FreeModSection : ModSection
diff --git a/osu.Game/Utils/ModValidation.cs b/osu.Game/Utils/ModValidation.cs
index 0c4d58ab2e..3597396ec4 100644
--- a/osu.Game/Utils/ModValidation.cs
+++ b/osu.Game/Utils/ModValidation.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Utils
             var incompatibleTypes = new HashSet<Type>();
             var incomingTypes = new HashSet<Type>();
 
-            foreach (var mod in combination.SelectMany(flattenMod))
+            foreach (var mod in combination.SelectMany(FlattenMod))
             {
                 // Add the new mod incompatibilities, checking whether any match the existing mod types.
                 foreach (var t in mod.IncompatibleMods)
@@ -79,7 +79,7 @@ namespace osu.Game.Utils
         {
             var allowedSet = new HashSet<Type>(allowedTypes);
 
-            return combination.SelectMany(flattenMod)
+            return combination.SelectMany(FlattenMod)
                               .All(m => allowedSet.Contains(m.GetType()));
         }
 
@@ -93,20 +93,27 @@ namespace osu.Game.Utils
         /// <param name="incompatibleTypes">The set of incompatible <see cref="Mod"/> types.</param>
         /// <returns>Whether the given <see cref="Mod"/> is incompatible.</returns>
         private static bool isModIncompatible(Mod mod, ICollection<Type> incompatibleTypes)
-            => flattenMod(mod)
+            => FlattenMod(mod)
                .SelectMany(m => m.GetType().EnumerateBaseTypes())
                .Any(incompatibleTypes.Contains);
 
+        /// <summary>
+        /// Flattens a set of <see cref="Mod"/>s, returning a new set with all <see cref="MultiMod"/>s removed.
+        /// </summary>
+        /// <param name="mods">The set of <see cref="Mod"/>s to flatten.</param>
+        /// <returns>The new set, containing all <see cref="Mod"/>s in <paramref name="mods"/> recursively with all <see cref="MultiMod"/>s removed.</returns>
+        public static IEnumerable<Mod> FlattenMods(IEnumerable<Mod> mods) => mods.SelectMany(FlattenMod);
+
         /// <summary>
         /// Flattens a <see cref="Mod"/>, returning a set of <see cref="Mod"/>s in-place of any <see cref="MultiMod"/>s.
         /// </summary>
         /// <param name="mod">The <see cref="Mod"/> to flatten.</param>
         /// <returns>A set of singular "flattened" <see cref="Mod"/>s</returns>
-        private static IEnumerable<Mod> flattenMod(Mod mod)
+        public static IEnumerable<Mod> FlattenMod(Mod mod)
         {
             if (mod is MultiMod multi)
             {
-                foreach (var m in multi.Mods.SelectMany(flattenMod))
+                foreach (var m in multi.Mods.SelectMany(FlattenMod))
                     yield return m;
             }
             else

From e02e3cf19a9ad9ace7d21e949ec30e6c9269771e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 13:35:48 +0900
Subject: [PATCH 07815/10326] Disallow selecting DT/HT/WU/WD as allowable
 freemods

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index d36ebeec0f..98e3ca3358 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             freeModSelectOverlay = new FreeModSelectOverlay
             {
                 SelectedMods = { BindTarget = freeMods },
-                IsValidMod = isValidMod,
+                IsValidMod = isValidFreeMod,
             };
         }
 
@@ -147,6 +147,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         }
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
+
+        private bool isValidFreeMod(Mod mod) => isValidMod(mod) && !(mod is ModRateAdjust) && !(mod is ModTimeRamp);
     }
 
     public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>

From 4ae10b1e1c88f4d6b6a3fe5ec136abf1e3ead32b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 13:40:59 +0900
Subject: [PATCH 07816/10326] Add initial UI for selecting extra mods

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs | 29 ++++++--
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 69 +++++++++++++++++--
 2 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2449563c73..231fb58836 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -29,6 +30,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
+        /// <summary>
+        /// Any mods applied by/to the local user.
+        /// </summary>
+        protected readonly Bindable<IReadOnlyList<Mod>> ExtraMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+
         [Resolved]
         private MusicController music { get; set; }
 
@@ -55,6 +61,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
+
+            ExtraMods.BindValueChanged(_ => updateMods());
         }
 
         public override void OnEntering(IScreen last)
@@ -95,12 +103,17 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             updateWorkingBeatmap();
 
-            var item = SelectedItem.Value;
+            if (SelectedItem.Value == null)
+                return;
 
-            Mods.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
+            // Remove any extra mods that are no longer allowed.
+            ExtraMods.Value = ExtraMods.Value
+                                       .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
+                                       .ToList();
 
-            if (item?.Ruleset != null)
-                Ruleset.Value = item.Ruleset.Value;
+            updateMods();
+
+            Ruleset.Value = SelectedItem.Value.Ruleset.Value;
         }
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet) => Schedule(updateWorkingBeatmap);
@@ -115,6 +128,14 @@ namespace osu.Game.Screens.OnlinePlay.Match
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
+        private void updateMods()
+        {
+            if (SelectedItem.Value == null)
+                return;
+
+            Mods.Value = ExtraMods.Value.Concat(SelectedItem.Value.RequiredMods).ToList();
+        }
+
         private void beginHandlingTrack()
         {
             Beatmap.BindValueChanged(applyLoopingToTrack, true);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 7c4b6d18ec..95dda1a051 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -14,12 +14,15 @@ using osu.Framework.Screens;
 using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
+using osuTK;
 using ParticipantsList = osu.Game.Screens.OnlinePlay.Multiplayer.Participants.ParticipantsList;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
@@ -37,7 +40,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
+        private ModSelectOverlay extraModSelectOverlay;
         private MultiplayerMatchSettingsOverlay settingsOverlay;
+        private Drawable extraModsSection;
 
         private IBindable<bool> isConnected;
 
@@ -129,10 +134,39 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                             RelativeSizeAxes = Axes.X,
                                                             AutoSizeAxes = Axes.Y,
                                                             Padding = new MarginPadding { Horizontal = 5 },
-                                                            Children = new Drawable[]
+                                                            Spacing = new Vector2(0, 10),
+                                                            Children = new[]
                                                             {
-                                                                new OverlinedHeader("Beatmap"),
-                                                                new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
+                                                                new FillFlowContainer
+                                                                {
+                                                                    RelativeSizeAxes = Axes.X,
+                                                                    AutoSizeAxes = Axes.Y,
+                                                                    Children = new Drawable[]
+                                                                    {
+                                                                        new OverlinedHeader("Beatmap"),
+                                                                        new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
+                                                                    }
+                                                                },
+                                                                extraModsSection = new FillFlowContainer
+                                                                {
+                                                                    RelativeSizeAxes = Axes.X,
+                                                                    AutoSizeAxes = Axes.Y,
+                                                                    Children = new Drawable[]
+                                                                    {
+                                                                        new OverlinedHeader("Extra mods"),
+                                                                        new ModDisplay
+                                                                        {
+                                                                            DisplayUnrankedText = false,
+                                                                            Current = ExtraMods
+                                                                        },
+                                                                        new PurpleTriangleButton
+                                                                        {
+                                                                            RelativeSizeAxes = Axes.X,
+                                                                            Text = "Select",
+                                                                            Action = () => extraModSelectOverlay.Show()
+                                                                        }
+                                                                    }
+                                                                }
                                                             }
                                                         }
                                                     }
@@ -174,6 +208,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
+                extraModSelectOverlay = new SoloModSelectOverlay
+                {
+                    SelectedMods = { BindTarget = ExtraMods },
+                    Stacked = false,
+                    IsValidMod = _ => false
+                },
                 settingsOverlay = new MultiplayerMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -219,10 +259,31 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return true;
             }
 
+            if (extraModSelectOverlay.State.Value == Visibility.Visible)
+            {
+                extraModSelectOverlay.Hide();
+                return true;
+            }
+
             return base.OnBackButton();
         }
 
-        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
+        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            SelectedItem.Value = Playlist.FirstOrDefault();
+
+            if (SelectedItem.Value?.AllowedMods.Any() != true)
+            {
+                extraModsSection.Hide();
+                extraModSelectOverlay.Hide();
+                extraModSelectOverlay.IsValidMod = _ => false;
+            }
+            else
+            {
+                extraModsSection.Show();
+                extraModSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
+            }
+        }
 
         private void onReadyClick()
         {

From b846146f163a0dfe87d8d5e02f00730387b8de04 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 13:58:44 +0900
Subject: [PATCH 07817/10326] Update mods when resuming room subscreen

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 231fb58836..3c4c6ce040 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -81,6 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             base.OnResuming(last);
             beginHandlingTrack();
+            updateMods();
         }
 
         public override bool OnExiting(IScreen next)

From 426569c2a93244a7a31688a0d96529d752858ebc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 14:57:39 +0900
Subject: [PATCH 07818/10326] Move common song select implementation for online
 play

---
 .../Multiplayer/MultiplayerMatchSongSelect.cs |  91 +------------
 .../OnlinePlay/OnlinePlaySongSelect.cs        | 124 ++++++++++++++++++
 osu.Game/Screens/Select/MatchSongSelect.cs    |  34 +----
 3 files changed, 130 insertions(+), 119 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 98e3ca3358..e892570066 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.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 System.Collections.Generic;
-using System.Linq;
-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.Graphics.UserInterface;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Overlays.Mods;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Select;
@@ -27,67 +20,21 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public class MultiplayerMatchSongSelect : SongSelect, IOnlinePlaySubScreen
+    public class MultiplayerMatchSongSelect : OnlinePlaySongSelect
     {
-        public string ShortTitle => "song selection";
-
-        public override string Title => ShortTitle.Humanize();
-
-        [Resolved(typeof(Room), nameof(Room.Playlist))]
-        private BindableList<PlaylistItem> playlist { get; set; }
-
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
-        private readonly Bindable<IReadOnlyList<Mod>> freeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
-
-        private readonly FreeModSelectOverlay freeModSelectOverlay;
         private LoadingLayer loadingLayer;
 
-        private WorkingBeatmap initialBeatmap;
-        private RulesetInfo initialRuleset;
-        private IReadOnlyList<Mod> initialMods;
-
-        private bool itemSelected;
-
-        public MultiplayerMatchSongSelect()
-        {
-            Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
-
-            freeModSelectOverlay = new FreeModSelectOverlay
-            {
-                SelectedMods = { BindTarget = freeMods },
-                IsValidMod = isValidFreeMod,
-            };
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
             AddInternal(loadingLayer = new LoadingLayer(true));
-            initialBeatmap = Beatmap.Value;
-            initialRuleset = Ruleset.Value;
-            initialMods = Mods.Value.ToList();
-
-            freeMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
-
-            FooterPanels.Add(freeModSelectOverlay);
         }
 
-        protected override bool OnStart()
+        protected override void OnSetItem(PlaylistItem item)
         {
-            itemSelected = true;
-            var item = new PlaylistItem();
-
-            item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
-            item.Ruleset.Value = Ruleset.Value;
-
-            item.RequiredMods.Clear();
-            item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
-
-            item.AllowedMods.Clear();
-            item.AllowedMods.AddRange(freeMods.Value.Select(m => m.CreateCopy()));
-
             // If the client is already in a room, update via the client.
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
             if (client.Room != null)
@@ -112,43 +59,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
             else
             {
-                playlist.Clear();
-                playlist.Add(item);
+                Playlist.Clear();
+                Playlist.Add(item);
                 this.Exit();
             }
-
-            return true;
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            if (!itemSelected)
-            {
-                Beatmap.Value = initialBeatmap;
-                Ruleset.Value = initialRuleset;
-                Mods.Value = initialMods;
-            }
-
-            return base.OnExiting(next);
         }
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
-
-        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
-        {
-            IsValidMod = isValidMod
-        };
-
-        protected override IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons()
-        {
-            var buttons = base.CreateFooterButtons().ToList();
-            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods { Current = freeMods }, freeModSelectOverlay));
-            return buttons;
-        }
-
-        private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
-
-        private bool isValidFreeMod(Mod mod) => isValidMod(mod) && !(mod is ModRateAdjust) && !(mod is ModTimeRamp);
     }
 
     public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
new file mode 100644
index 0000000000..7c64e00dc4
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.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 System.Linq;
+using Humanizer;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.Select;
+
+namespace osu.Game.Screens.OnlinePlay
+{
+    public abstract class OnlinePlaySongSelect : SongSelect, IOnlinePlaySubScreen
+    {
+        public string ShortTitle => "song selection";
+
+        public override string Title => ShortTitle.Humanize();
+
+        public override bool AllowEditing => false;
+
+        [Resolved(typeof(Room), nameof(Room.Playlist))]
+        protected BindableList<PlaylistItem> Playlist { get; private set; }
+
+        private readonly Bindable<IReadOnlyList<Mod>> freeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+        private readonly FreeModSelectOverlay freeModSelectOverlay;
+
+        private WorkingBeatmap initialBeatmap;
+        private RulesetInfo initialRuleset;
+        private IReadOnlyList<Mod> initialMods;
+        private bool itemSelected;
+
+        protected OnlinePlaySongSelect()
+        {
+            Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
+
+            freeModSelectOverlay = new FreeModSelectOverlay
+            {
+                SelectedMods = { BindTarget = freeMods },
+                IsValidMod = IsValidFreeMod,
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            initialBeatmap = Beatmap.Value;
+            initialRuleset = Ruleset.Value;
+            initialMods = Mods.Value.ToList();
+
+            freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            FooterPanels.Add(freeModSelectOverlay);
+        }
+
+        protected sealed override bool OnStart()
+        {
+            itemSelected = true;
+
+            var item = new PlaylistItem();
+
+            item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
+            item.Ruleset.Value = Ruleset.Value;
+
+            item.RequiredMods.Clear();
+            item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
+
+            item.AllowedMods.Clear();
+            item.AllowedMods.AddRange(freeMods.Value.Select(m => m.CreateCopy()));
+
+            OnSetItem(item);
+            return true;
+        }
+
+        protected abstract void OnSetItem(PlaylistItem item);
+
+        public override bool OnBackButton()
+        {
+            if (freeModSelectOverlay.State.Value == Visibility.Visible)
+            {
+                freeModSelectOverlay.Hide();
+                return true;
+            }
+
+            return base.OnBackButton();
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            if (!itemSelected)
+            {
+                Beatmap.Value = initialBeatmap;
+                Ruleset.Value = initialRuleset;
+                Mods.Value = initialMods;
+            }
+
+            return base.OnExiting(next);
+        }
+
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
+        {
+            IsValidMod = IsValidMod
+        };
+
+        protected override IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons()
+        {
+            var buttons = base.CreateFooterButtons().ToList();
+            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods { Current = freeMods }, freeModSelectOverlay));
+            return buttons;
+        }
+
+        protected virtual bool IsValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
+
+        protected virtual bool IsValidFreeMod(Mod mod) => IsValidMod(mod);
+    }
+}
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 98e02a9294..23fe9620fe 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -1,48 +1,27 @@
 // Copyright (c) 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 Humanizer;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
-using osu.Game.Overlays.Mods;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Components;
 
 namespace osu.Game.Screens.Select
 {
-    public class MatchSongSelect : SongSelect, IOnlinePlaySubScreen
+    public class MatchSongSelect : OnlinePlaySongSelect
     {
-        public Action<PlaylistItem> Selected;
-
-        public string ShortTitle => "song selection";
-        public override string Title => ShortTitle.Humanize();
-
-        public override bool AllowEditing => false;
-
-        [Resolved(typeof(Room), nameof(Room.Playlist))]
-        protected BindableList<PlaylistItem> Playlist { get; private set; }
-
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        public MatchSongSelect()
-        {
-            Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
-        }
-
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new MatchBeatmapDetailArea
         {
             CreateNewItem = createNewItem
         };
 
-        protected override bool OnStart()
+        protected override void OnSetItem(PlaylistItem item)
         {
             switch (Playlist.Count)
             {
@@ -56,8 +35,6 @@ namespace osu.Game.Screens.Select
             }
 
             this.Exit();
-
-            return true;
         }
 
         private void createNewItem()
@@ -80,12 +57,5 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.Clear();
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
-
-        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
-        {
-            IsValidMod = isValidMod
-        };
-
-        private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
 }

From b43e529964b31ac40d5230aa41e68876985579d7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 15:06:50 +0900
Subject: [PATCH 07819/10326] Fix allowed mods being copied into required mods

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index e892570066..0c22813e56 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -33,6 +35,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             AddInternal(loadingLayer = new LoadingLayer(true));
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+        }
+
         protected override void OnSetItem(PlaylistItem item)
         {
             // If the client is already in a room, update via the client.

From 0909c73ead3d4c45495c8bb5d55dfac16386038a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 15:07:56 +0900
Subject: [PATCH 07820/10326] Once again disallow DT/etc as allowable mods

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 0c22813e56..80bb7c7ac2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -75,6 +75,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         }
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
+
+        protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust);
     }
 
     public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>

From 05982f42ab8a991d9056a7ad38f947c0edc4c4cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 16:43:53 +0900
Subject: [PATCH 07821/10326] Add more comprehensive commenting and simplify
 base call logic

We can call the base method regardless for better safety. Worst case
it's just going to run `Stop()` twice anyway.
---
 .../Drawables/DrawableStoryboardSample.cs           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index fcbffda227..7b16009859 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -46,14 +46,15 @@ namespace osu.Game.Storyboards.Drawables
         {
             if (!RequestedPlaying) return;
 
-            // non-looping storyboard samples should be stopped immediately when sample playback is disabled
-            if (!Looping)
+            if (!Looping && disabled.NewValue)
             {
-                if (disabled.NewValue)
-                    Stop();
+                // the default behaviour for sample disabling is to allow one-shot samples to play out.
+                // storyboards regularly have long running samples that can cause this behaviour to lead to unintended results.
+                // for this reason, we immediately stop such samples.
+                Stop();
             }
-            else
-                base.SamplePlaybackDisabledChanged(disabled);
+
+            base.SamplePlaybackDisabledChanged(disabled);
         }
 
         protected override void Update()

From 49e62c3a4b7118c1f3c81c6af357534bd541d8ee Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Feb 2021 11:02:08 +0300
Subject: [PATCH 07822/10326] Apply documentation changes

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Overlays/Chat/DrawableChannel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index f1aa387c17..4c8513b1d5 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -237,7 +237,7 @@ namespace osu.Game.Overlays.Chat
         }
 
         /// <summary>
-        /// An <see cref="OsuScrollContainer"/> with functionality to automatically scrolls whenever the maximum scrollable distance increases.
+        /// An <see cref="OsuScrollContainer"/> with functionality to automatically scroll whenever the maximum scrollable distance increases.
         /// </summary>
         private class ChannelScrollContainer : OsuScrollContainer
         {
@@ -246,7 +246,7 @@ namespace osu.Game.Overlays.Chat
             private float? lastExtent;
 
             /// <summary>
-            /// Whether this should automatically scroll to end on the next call to <see cref="UpdateAfterChildren"/>.
+            /// Whether this container should automatically scroll to end on the next call to <see cref="UpdateAfterChildren"/>.
             /// </summary>
             public bool ShouldAutoScroll { get; private set; } = true;
 

From fabb0eeb29a35c7e0d212d9c7be9f1aad8e90c35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 17:27:14 +0900
Subject: [PATCH 07823/10326] Add signalr messagepack key attribute

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 4ce797e583..2adeb9b959 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Online.Rooms
         /// <summary>
         /// The beatmap's downloading progress, null when not in <see cref="DownloadState.Downloading"/> state.
         /// </summary>
+        [Key(1)]
         public readonly float? DownloadProgress;
 
         [JsonConstructor]

From 1d8de2f718916b907b24bf1b411ebb627258cbd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 17:32:54 +0900
Subject: [PATCH 07824/10326] Rename class to better match purpose

---
 ... TestSceneMultiplayerBeatmapAvailabilityTracker.cs} | 10 +++++-----
 ...er.cs => MultiplayerBeatmapAvailablilityTracker.cs} |  7 +++----
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs     |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename osu.Game.Tests/Online/{TestSceneMultiplayerBeatmapTracker.cs => TestSceneMultiplayerBeatmapAvailabilityTracker.cs} (94%)
 rename osu.Game/Online/Rooms/{MultiplayerBeatmapTracker.cs => MultiplayerBeatmapAvailablilityTracker.cs} (93%)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
similarity index 94%
rename from osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
rename to osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
index 9caecc198a..3c3793670a 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
@@ -28,7 +28,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Online
 {
     [HeadlessTest]
-    public class TestSceneMultiplayerBeatmapTracker : OsuTestScene
+    public class TestSceneMultiplayerBeatmapAvailabilityTracker : OsuTestScene
     {
         private RulesetStore rulesets;
         private TestBeatmapManager beatmaps;
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Online
         private BeatmapSetInfo testBeatmapSet;
 
         private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
-        private MultiplayerBeatmapTracker tracker;
+        private MultiplayerBeatmapAvailablilityTracker availablilityTracker;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, GameHost host)
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Online
                 Ruleset = { Value = testBeatmapInfo.Ruleset },
             };
 
-            Child = tracker = new MultiplayerBeatmapTracker
+            Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem, }
             };
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Online
             });
             addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
 
-            AddStep("recreate tracker", () => Child = tracker = new MultiplayerBeatmapTracker
+            AddStep("recreate tracker", () => Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem }
             });
@@ -129,7 +129,7 @@ namespace osu.Game.Tests.Online
         {
             // In DownloadTrackingComposite, state changes are scheduled one frame later, wait one step.
             AddWaitStep("wait for potential change", 1);
-            AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
+            AddAssert(description, () => availablilityTracker.Availability.Value.Equals(expected.Invoke()));
         }
 
         private static BeatmapInfo getTestBeatmapInfo(string archiveFile)
diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
similarity index 93%
rename from osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
rename to osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
index 28e4872ad3..578c4db2f8 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online.Rooms
     /// This differs from a regular download tracking composite as this accounts for the
     /// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
     /// </summary>
-    public class MultiplayerBeatmapTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    public class MultiplayerBeatmapAvailablilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
         public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
@@ -26,11 +26,10 @@ namespace osu.Game.Online.Rooms
 
         private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>();
 
-        public MultiplayerBeatmapTracker()
+        public MultiplayerBeatmapAvailablilityTracker()
         {
             State.BindValueChanged(_ => updateAvailability());
-            Progress.BindValueChanged(_ => updateAvailability());
-            updateAvailability();
+            Progress.BindValueChanged(_ => updateAvailability(), true);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index c049d4be20..f2cb1120cb 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -41,11 +41,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         [Cached]
-        protected readonly MultiplayerBeatmapTracker BeatmapTracker;
+        protected readonly MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker;
 
         protected RoomSubScreen()
         {
-            InternalChild = BeatmapTracker = new MultiplayerBeatmapTracker
+            InternalChild = BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = SelectedItem },
             };

From ac2a995041590370e31b2b5ef9fb440dcb20d43c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 17:54:56 +0900
Subject: [PATCH 07825/10326] Add user and panel states

---
 .../TestSceneMultiplayerParticipantsList.cs   | 25 ++++++++++++++
 .../Online/Multiplayer/IMultiplayerClient.cs  |  4 +++
 .../Multiplayer/IMultiplayerRoomServer.cs     |  4 +++
 .../Online/Multiplayer/MultiplayerRoomUser.cs |  7 ++++
 .../Multiplayer/StatefulMultiplayerClient.cs  | 26 +++++++++++++++
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 11 +++++++
 .../Participants/ParticipantPanel.cs          | 33 ++++++++++++++++++-
 osu.Game/Screens/Play/HUD/ModDisplay.cs       | 14 +++++---
 .../Multiplayer/TestMultiplayerClient.cs      | 17 ++++++++++
 9 files changed, 136 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 968a869532..9aa1f2cf99 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -8,6 +8,8 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
 using osu.Game.Users;
 using osuTK;
@@ -123,5 +125,28 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 }
             });
         }
+
+        [Test]
+        public void TestUserWithMods()
+        {
+            AddStep("add user", () =>
+            {
+                Client.AddUser(new User
+                {
+                    Id = 0,
+                    Username = $"User 0",
+                    CurrentModeRank = RNG.Next(1, 100000),
+                    CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                });
+
+                Client.ChangeUserExtraMods(0, new Mod[]
+                {
+                    new OsuModHardRock(),
+                    new OsuModDifficultyAdjust { ApproachRate = { Value = 1 } }
+                });
+            });
+
+            AddToggleStep("toggle ready state", v => Client.ChangeUserState(0, v ? MultiplayerUserState.Ready : MultiplayerUserState.Idle));
+        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 19dd473230..37f60ab036 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
@@ -55,6 +57,8 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="beatmapAvailability">The new beatmap availability state of the user.</param>
         Task UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability);
 
+        Task UserExtraModsChanged(int userId, IEnumerable<APIMod> mods);
+
         /// <summary>
         /// Signals that a match is to be started. This will *only* be sent to clients which are to begin loading at this point.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 09816974a7..484acfe957 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
@@ -47,6 +49,8 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
         Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
+        Task ChangeExtraMods(IEnumerable<APIMod> newMods);
+
         /// <summary>
         /// As the host of a room, start the match.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 2590acbc81..d7f7f9135e 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -4,7 +4,11 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
 using Newtonsoft.Json;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Users;
 
@@ -22,6 +26,9 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
+        [NotNull]
+        public IEnumerable<APIMod> ExtraMods { get; set; } = Enumerable.Empty<APIMod>();
+
         public User? User { get; set; }
 
         [JsonConstructor]
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index e5b07ddfb4..33dcf1e8b4 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -22,6 +22,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Users;
 using osu.Game.Utils;
 
@@ -231,6 +232,10 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
+        public Task ChangeExtraMods(IEnumerable<Mod> newMods) => ChangeExtraMods(newMods.Select(m => new APIMod(m)).ToList());
+
+        public abstract Task ChangeExtraMods(IEnumerable<APIMod> newMods);
+
         public abstract Task StartMatch();
 
         Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
@@ -379,6 +384,27 @@ namespace osu.Game.Online.Multiplayer
             return Task.CompletedTask;
         }
 
+        public Task UserExtraModsChanged(int userId, IEnumerable<APIMod> mods)
+        {
+            if (Room == null)
+                return Task.CompletedTask;
+
+            Scheduler.Add(() =>
+            {
+                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
+
+                // errors here are not critical - user mods is mostly for display.
+                if (user == null)
+                    return;
+
+                user.ExtraMods = mods;
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
+        }
+
         Task IMultiplayerClient.LoadRequested()
         {
             if (Room == null)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 95dda1a051..c1025e73f8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.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.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
@@ -15,6 +16,7 @@ using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
@@ -240,6 +242,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.LoadComplete();
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            ExtraMods.BindValueChanged(onExtraModsChanged);
 
             client.LoadRequested += onLoadRequested;
 
@@ -285,6 +288,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
+        private void onExtraModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> extraMods)
+        {
+            if (client.Room == null)
+                return;
+
+            client.ChangeExtraMods(extraMods.NewValue).CatchUnobservedExceptions();
+        }
+
         private void onReadyClick()
         {
             Debug.Assert(readyClickOperation == null);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index f99655e305..059e9e518d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -16,6 +17,8 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
@@ -30,6 +33,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        private ModDisplay extraModsDisplay;
         private StateDisplay userStateDisplay;
         private SpriteIcon crown;
 
@@ -122,11 +129,32 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                     }
                                 }
                             },
-                            userStateDisplay = new StateDisplay
+                            new FillFlowContainer
                             {
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
                                 Margin = new MarginPadding { Right = 10 },
+                                Spacing = new Vector2(10),
+                                Children = new Drawable[]
+                                {
+                                    extraModsDisplay = new ModDisplay
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Scale = new Vector2(0.5f),
+                                        ExpansionMode = ExpansionMode.AlwaysContracted,
+                                        DisplayUnrankedText = false,
+                                        ExpandOnAppear = false
+                                    },
+                                    userStateDisplay = new StateDisplay
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        AlwaysPresent = true
+                                    }
+                                }
                             }
                         }
                     }
@@ -143,7 +171,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             const double fade_time = 50;
 
+            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
+
             userStateDisplay.Status = User.State;
+            extraModsDisplay.Current.Value = User.ExtraMods.Select(m => m.ToMod(ruleset)).ToList();
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 68d019bf71..2d5b07f056 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Screens.Play.HUD
 
         public ExpansionMode ExpansionMode = ExpansionMode.ExpandOnHover;
 
+        public bool ExpandOnAppear = true;
+
         private readonly Bindable<IReadOnlyList<Mod>> current = new Bindable<IReadOnlyList<Mod>>();
 
         public Bindable<IReadOnlyList<Mod>> Current
@@ -108,10 +110,14 @@ namespace osu.Game.Screens.Play.HUD
             else
                 unrankedText.Hide();
 
-            expand();
-
-            using (iconsContainer.BeginDelayedSequence(1200))
-                contract();
+            if (ExpandOnAppear)
+            {
+                expand();
+                using (iconsContainer.BeginDelayedSequence(1200))
+                    contract();
+            }
+            else
+                iconsContainer.TransformSpacingTo(new Vector2(-25, 0));
         }
 
         private void expand()
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 7fbc770351..e699e7fb34 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -3,6 +3,7 @@
 
 #nullable enable
 
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
@@ -11,6 +12,7 @@ using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -122,6 +124,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.CompletedTask;
         }
 
+        public void ChangeUserExtraMods(int userId, IEnumerable<Mod> newMods)
+            => ChangeUserExtraMods(userId, newMods.Select(m => new APIMod(m)).ToList());
+
+        public void ChangeUserExtraMods(int userId, IEnumerable<APIMod> newMods)
+        {
+            Debug.Assert(Room != null);
+            ((IMultiplayerClient)this).UserExtraModsChanged(userId, newMods.ToList());
+        }
+
+        public override Task ChangeExtraMods(IEnumerable<APIMod> newMods)
+        {
+            ChangeUserExtraMods(api.LocalUser.Value.Id, newMods);
+            return Task.CompletedTask;
+        }
+
         public override Task StartMatch()
         {
             Debug.Assert(Room != null);

From f53896360715341641dfc7971cb04f66d19fd91d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 17:57:32 +0900
Subject: [PATCH 07826/10326] Extra mods -> user mods

---
 .../TestSceneMultiplayerParticipantsList.cs   |  2 +-
 .../Online/Multiplayer/IMultiplayerClient.cs  |  2 +-
 .../Multiplayer/IMultiplayerRoomServer.cs     |  2 +-
 .../Online/Multiplayer/MultiplayerClient.cs   | 10 ++++++
 .../Online/Multiplayer/MultiplayerRoomUser.cs |  2 +-
 .../Multiplayer/StatefulMultiplayerClient.cs  |  8 ++---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs | 12 +++----
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 34 +++++++++----------
 .../Participants/ParticipantPanel.cs          |  6 ++--
 .../Multiplayer/TestMultiplayerClient.cs      | 12 +++----
 10 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 9aa1f2cf99..8caba5d9c8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 });
 
-                Client.ChangeUserExtraMods(0, new Mod[]
+                Client.ChangeUserMods(0, new Mod[]
                 {
                     new OsuModHardRock(),
                     new OsuModDifficultyAdjust { ApproachRate = { Value = 1 } }
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 37f60ab036..f22b0e4e28 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="beatmapAvailability">The new beatmap availability state of the user.</param>
         Task UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability);
 
-        Task UserExtraModsChanged(int userId, IEnumerable<APIMod> mods);
+        Task UserModsChanged(int userId, IEnumerable<APIMod> mods);
 
         /// <summary>
         /// Signals that a match is to be started. This will *only* be sent to clients which are to begin loading at this point.
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 484acfe957..71555ae23d 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
         Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
-        Task ChangeExtraMods(IEnumerable<APIMod> newMods);
+        Task ChangeUserMods(IEnumerable<APIMod> newMods);
 
         /// <summary>
         /// As the host of a room, start the match.
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 50dc8f661c..ecf314c1e5 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
@@ -84,6 +85,7 @@ namespace osu.Game.Online.Multiplayer
             connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
             connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
             connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+            connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
 
             connection.Closed += async ex =>
             {
@@ -182,6 +184,14 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeBeatmapAvailability), newBeatmapAvailability);
         }
 
+        public override Task ChangeUserMods(IEnumerable<APIMod> newMods)
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeUserMods), newMods);
+        }
+
         public override Task StartMatch()
         {
             if (!isConnected.Value)
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index d7f7f9135e..4c9643bfce 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Online.Multiplayer
         public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
         [NotNull]
-        public IEnumerable<APIMod> ExtraMods { get; set; } = Enumerable.Empty<APIMod>();
+        public IEnumerable<APIMod> UserMods { get; set; } = Enumerable.Empty<APIMod>();
 
         public User? User { get; set; }
 
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 33dcf1e8b4..a0e903e89a 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -232,9 +232,9 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
-        public Task ChangeExtraMods(IEnumerable<Mod> newMods) => ChangeExtraMods(newMods.Select(m => new APIMod(m)).ToList());
+        public Task ChangeUserMods(IEnumerable<Mod> newMods) => ChangeUserMods(newMods.Select(m => new APIMod(m)).ToList());
 
-        public abstract Task ChangeExtraMods(IEnumerable<APIMod> newMods);
+        public abstract Task ChangeUserMods(IEnumerable<APIMod> newMods);
 
         public abstract Task StartMatch();
 
@@ -384,7 +384,7 @@ namespace osu.Game.Online.Multiplayer
             return Task.CompletedTask;
         }
 
-        public Task UserExtraModsChanged(int userId, IEnumerable<APIMod> mods)
+        public Task UserModsChanged(int userId, IEnumerable<APIMod> mods)
         {
             if (Room == null)
                 return Task.CompletedTask;
@@ -397,7 +397,7 @@ namespace osu.Game.Online.Multiplayer
                 if (user == null)
                     return;
 
-                user.ExtraMods = mods;
+                user.UserMods = mods;
 
                 RoomUpdated?.Invoke();
             }, false);
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 3c4c6ce040..6367aa54a7 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         /// <summary>
         /// Any mods applied by/to the local user.
         /// </summary>
-        protected readonly Bindable<IReadOnlyList<Mod>> ExtraMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+        protected readonly Bindable<IReadOnlyList<Mod>> UserMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         [Resolved]
         private MusicController music { get; set; }
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
 
-            ExtraMods.BindValueChanged(_ => updateMods());
+            UserMods.BindValueChanged(_ => updateMods());
         }
 
         public override void OnEntering(IScreen last)
@@ -108,9 +108,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
                 return;
 
             // Remove any extra mods that are no longer allowed.
-            ExtraMods.Value = ExtraMods.Value
-                                       .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
-                                       .ToList();
+            UserMods.Value = UserMods.Value
+                                     .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
+                                     .ToList();
 
             updateMods();
 
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             if (SelectedItem.Value == null)
                 return;
 
-            Mods.Value = ExtraMods.Value.Concat(SelectedItem.Value.RequiredMods).ToList();
+            Mods.Value = UserMods.Value.Concat(SelectedItem.Value.RequiredMods).ToList();
         }
 
         private void beginHandlingTrack()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index c1025e73f8..a31a3e51ee 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -42,9 +42,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
-        private ModSelectOverlay extraModSelectOverlay;
+        private ModSelectOverlay userModsSelectOverlay;
         private MultiplayerMatchSettingsOverlay settingsOverlay;
-        private Drawable extraModsSection;
+        private Drawable userModsSection;
 
         private IBindable<bool> isConnected;
 
@@ -149,7 +149,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                         new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
                                                                     }
                                                                 },
-                                                                extraModsSection = new FillFlowContainer
+                                                                userModsSection = new FillFlowContainer
                                                                 {
                                                                     RelativeSizeAxes = Axes.X,
                                                                     AutoSizeAxes = Axes.Y,
@@ -159,13 +159,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                         new ModDisplay
                                                                         {
                                                                             DisplayUnrankedText = false,
-                                                                            Current = ExtraMods
+                                                                            Current = UserMods
                                                                         },
                                                                         new PurpleTriangleButton
                                                                         {
                                                                             RelativeSizeAxes = Axes.X,
                                                                             Text = "Select",
-                                                                            Action = () => extraModSelectOverlay.Show()
+                                                                            Action = () => userModsSelectOverlay.Show()
                                                                         }
                                                                     }
                                                                 }
@@ -210,9 +210,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                extraModSelectOverlay = new SoloModSelectOverlay
+                userModsSelectOverlay = new SoloModSelectOverlay
                 {
-                    SelectedMods = { BindTarget = ExtraMods },
+                    SelectedMods = { BindTarget = UserMods },
                     Stacked = false,
                     IsValidMod = _ => false
                 },
@@ -242,7 +242,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.LoadComplete();
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
-            ExtraMods.BindValueChanged(onExtraModsChanged);
+            UserMods.BindValueChanged(onUserModsChanged);
 
             client.LoadRequested += onLoadRequested;
 
@@ -262,9 +262,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return true;
             }
 
-            if (extraModSelectOverlay.State.Value == Visibility.Visible)
+            if (userModsSelectOverlay.State.Value == Visibility.Visible)
             {
-                extraModSelectOverlay.Hide();
+                userModsSelectOverlay.Hide();
                 return true;
             }
 
@@ -277,23 +277,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             if (SelectedItem.Value?.AllowedMods.Any() != true)
             {
-                extraModsSection.Hide();
-                extraModSelectOverlay.Hide();
-                extraModSelectOverlay.IsValidMod = _ => false;
+                userModsSection.Hide();
+                userModsSelectOverlay.Hide();
+                userModsSelectOverlay.IsValidMod = _ => false;
             }
             else
             {
-                extraModsSection.Show();
-                extraModSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
+                userModsSection.Show();
+                userModsSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
             }
         }
 
-        private void onExtraModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> extraMods)
+        private void onUserModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             if (client.Room == null)
                 return;
 
-            client.ChangeExtraMods(extraMods.NewValue).CatchUnobservedExceptions();
+            client.ChangeUserMods(mods.NewValue).CatchUnobservedExceptions();
         }
 
         private void onReadyClick()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 059e9e518d..a782da4c39 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        private ModDisplay extraModsDisplay;
+        private ModDisplay userModsDisplay;
         private StateDisplay userStateDisplay;
         private SpriteIcon crown;
 
@@ -139,7 +139,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                 Spacing = new Vector2(10),
                                 Children = new Drawable[]
                                 {
-                                    extraModsDisplay = new ModDisplay
+                                    userModsDisplay = new ModDisplay
                                     {
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
@@ -174,7 +174,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
 
             userStateDisplay.Status = User.State;
-            extraModsDisplay.Current.Value = User.ExtraMods.Select(m => m.ToMod(ruleset)).ToList();
+            userModsDisplay.Current.Value = User.UserMods.Select(m => m.ToMod(ruleset)).ToList();
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index e699e7fb34..d0d41e56c3 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -124,18 +124,18 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.CompletedTask;
         }
 
-        public void ChangeUserExtraMods(int userId, IEnumerable<Mod> newMods)
-            => ChangeUserExtraMods(userId, newMods.Select(m => new APIMod(m)).ToList());
+        public void ChangeUserMods(int userId, IEnumerable<Mod> newMods)
+            => ChangeUserMods(userId, newMods.Select(m => new APIMod(m)).ToList());
 
-        public void ChangeUserExtraMods(int userId, IEnumerable<APIMod> newMods)
+        public void ChangeUserMods(int userId, IEnumerable<APIMod> newMods)
         {
             Debug.Assert(Room != null);
-            ((IMultiplayerClient)this).UserExtraModsChanged(userId, newMods.ToList());
+            ((IMultiplayerClient)this).UserModsChanged(userId, newMods.ToList());
         }
 
-        public override Task ChangeExtraMods(IEnumerable<APIMod> newMods)
+        public override Task ChangeUserMods(IEnumerable<APIMod> newMods)
         {
-            ChangeUserExtraMods(api.LocalUser.Value.Id, newMods);
+            ChangeUserMods(api.LocalUser.Value.Id, newMods);
             return Task.CompletedTask;
         }
 

From 3cd30d284eb01689fab740342244ad33e37d66f7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:08:49 +0900
Subject: [PATCH 07827/10326] Renamespace

---
 .../TestSceneFreeModSelectOverlay.cs          |  2 +-
 .../OnlinePlay/Match/FooterButtonFreeMods.cs  | 63 +++++++++++++++++++
 .../FreeModSelectOverlay.cs                   |  2 +-
 .../Multiplayer/MultiplayerMatchSongSelect.cs | 54 ----------------
 .../OnlinePlay/OnlinePlaySongSelect.cs        |  2 +-
 5 files changed, 66 insertions(+), 57 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs
 rename osu.Game/Screens/OnlinePlay/{Multiplayer => Match}/FreeModSelectOverlay.cs (98%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
index 960402df88..b1700d5b6e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Mods;
-using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Match;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs
new file mode 100644
index 0000000000..ca2db877c3
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs
@@ -0,0 +1,63 @@
+// Copyright (c) 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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Select;
+using osuTK;
+
+namespace osu.Game.Screens.OnlinePlay.Match
+{
+    public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
+    {
+        public Bindable<IReadOnlyList<Mod>> Current
+        {
+            get => modDisplay.Current;
+            set => modDisplay.Current = value;
+        }
+
+        private readonly ModDisplay modDisplay;
+
+        public FooterButtonFreeMods()
+        {
+            ButtonContentContainer.Add(modDisplay = new ModDisplay
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                DisplayUnrankedText = false,
+                Scale = new Vector2(0.8f),
+                ExpansionMode = ExpansionMode.AlwaysContracted,
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            SelectedColour = colours.Yellow;
+            DeselectedColour = SelectedColour.Opacity(0.5f);
+            Text = @"freemods";
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(_ => updateModDisplay(), true);
+        }
+
+        private void updateModDisplay()
+        {
+            if (Current.Value?.Count > 0)
+                modDisplay.FadeIn();
+            else
+                modDisplay.FadeOut();
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
similarity index 98%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
rename to osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index 8334df1e44..aba86a3d72 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Match
 {
     public class FreeModSelectOverlay : ModSelectOverlay
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 80bb7c7ac2..e6b7656986 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -2,23 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Select;
-using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
@@ -78,50 +70,4 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust);
     }
-
-    public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
-    {
-        public Bindable<IReadOnlyList<Mod>> Current
-        {
-            get => modDisplay.Current;
-            set => modDisplay.Current = value;
-        }
-
-        private readonly ModDisplay modDisplay;
-
-        public FooterButtonFreeMods()
-        {
-            ButtonContentContainer.Add(modDisplay = new ModDisplay
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                DisplayUnrankedText = false,
-                Scale = new Vector2(0.8f),
-                ExpansionMode = ExpansionMode.AlwaysContracted,
-            });
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            SelectedColour = colours.Yellow;
-            DeselectedColour = SelectedColour.Opacity(0.5f);
-            Text = @"freemods";
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Current.BindValueChanged(_ => updateModDisplay(), true);
-        }
-
-        private void updateModDisplay()
-        {
-            if (Current.Value?.Count > 0)
-                modDisplay.FadeIn();
-            else
-                modDisplay.FadeOut();
-        }
-    }
 }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 7c64e00dc4..b75bf93204 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -15,7 +15,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.OnlinePlay

From 3e74f8fd9e260c48b4240a98bd7bfd2eef2c0598 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:11:20 +0900
Subject: [PATCH 07828/10326] Disable customisation of freemods, move stacking
 to property

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 28 ++++++++-----------
 .../OnlinePlay/Match/FreeModSelectOverlay.cs  |  7 ++---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  8 ++++--
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index db9460c494..56246a031d 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -39,6 +39,16 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly OsuSpriteText MultiplierLabel;
 
+        /// <summary>
+        /// Whether to allow customisation of mod settings.
+        /// </summary>
+        protected virtual bool AllowCustomisation => true;
+
+        /// <summary>
+        /// Whether mod icons should be stacked, or appear as individual buttons.
+        /// </summary>
+        protected virtual bool Stacked => true;
+
         protected override bool BlockNonPositionalInput => false;
 
         protected override bool DimMainContent => false;
@@ -47,21 +57,6 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly ModSettingsContainer ModSettingsContainer;
 
-        private bool stacked = true;
-
-        /// <summary>
-        /// Whether mod icons should be stacked, or appear as individual buttons.
-        /// </summary>
-        public bool Stacked
-        {
-            get => stacked;
-            set
-            {
-                stacked = value;
-                updateAvailableMods();
-            }
-        }
-
         [NotNull]
         private Func<Mod, bool> isValidMod = m => true;
 
@@ -307,6 +302,7 @@ namespace osu.Game.Overlays.Mods
                                             CustomiseButton = new TriangleButton
                                             {
                                                 Width = 180,
+                                                Alpha = AllowCustomisation ? 1 : 0,
                                                 Text = "Customisation",
                                                 Action = () => ModSettingsContainer.ToggleVisibility(),
                                                 Enabled = { Value = false },
@@ -445,7 +441,7 @@ namespace osu.Game.Overlays.Mods
             {
                 IEnumerable<Mod> modEnumeration = availableMods.Value[section.ModType];
 
-                if (!stacked)
+                if (!Stacked)
                     modEnumeration = ModValidation.FlattenMods(modEnumeration);
 
                 section.Mods = modEnumeration.Where(IsValidMod);
diff --git a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index aba86a3d72..0d62cc3d37 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -14,10 +14,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
 {
     public class FreeModSelectOverlay : ModSelectOverlay
     {
-        public FreeModSelectOverlay()
-        {
-            Stacked = false;
-        }
+        protected override bool AllowCustomisation => false;
+
+        protected override bool Stacked => false;
 
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index a31a3e51ee..22a58add70 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -210,10 +210,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                userModsSelectOverlay = new SoloModSelectOverlay
+                userModsSelectOverlay = new UserModSelectOverlay
                 {
                     SelectedMods = { BindTarget = UserMods },
-                    Stacked = false,
                     IsValidMod = _ => false
                 },
                 settingsOverlay = new MultiplayerMatchSettingsOverlay
@@ -352,5 +351,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (client != null)
                 client.LoadRequested -= onLoadRequested;
         }
+
+        private class UserModSelectOverlay : SoloModSelectOverlay
+        {
+            protected override bool Stacked => false;
+        }
     }
 }

From e134af82f52373cd3b360ab31139271c5d91007a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:16:38 +0900
Subject: [PATCH 07829/10326] Stack freemods for the local user

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs           | 12 +++++++++++-
 .../Multiplayer/MultiplayerMatchSubScreen.cs         |  7 +------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 56246a031d..2e69f15ff5 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -444,10 +444,20 @@ namespace osu.Game.Overlays.Mods
                 if (!Stacked)
                     modEnumeration = ModValidation.FlattenMods(modEnumeration);
 
-                section.Mods = modEnumeration.Where(IsValidMod);
+                section.Mods = modEnumeration.Select(validModOrNull).Where(m => m != null);
             }
         }
 
+        [CanBeNull]
+        private Mod validModOrNull([NotNull] Mod mod)
+        {
+            if (!(mod is MultiMod multi))
+                return IsValidMod(mod) ? mod : null;
+
+            var validSubset = multi.Mods.Select(validModOrNull).Where(m => m != null).ToArray();
+            return validSubset.Length == 0 ? null : new MultiMod(validSubset);
+        }
+
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             foreach (var section in ModSectionsContainer.Children)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 22a58add70..659551abfd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                userModsSelectOverlay = new UserModSelectOverlay
+                userModsSelectOverlay = new SoloModSelectOverlay
                 {
                     SelectedMods = { BindTarget = UserMods },
                     IsValidMod = _ => false
@@ -351,10 +351,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (client != null)
                 client.LoadRequested -= onLoadRequested;
         }
-
-        private class UserModSelectOverlay : SoloModSelectOverlay
-        {
-            protected override bool Stacked => false;
-        }
     }
 }

From 51cb2887172fb330a8b5ff40961e458c08ef7024 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:18:59 +0900
Subject: [PATCH 07830/10326] Reduce mod selection height

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 659551abfd..87ae723c63 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -210,10 +210,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                userModsSelectOverlay = new SoloModSelectOverlay
+                new Container
                 {
-                    SelectedMods = { BindTarget = UserMods },
-                    IsValidMod = _ => false
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.5f,
+                    Child = userModsSelectOverlay = new SoloModSelectOverlay
+                    {
+                        SelectedMods = { BindTarget = UserMods },
+                        IsValidMod = _ => false
+                    }
                 },
                 settingsOverlay = new MultiplayerMatchSettingsOverlay
                 {

From 3a906a89fce84a1dd7195af89aa7808276c1c70a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:25:09 +0900
Subject: [PATCH 07831/10326] Pin mod position in participant panels

---
 .../TestSceneMultiplayerParticipantsList.cs   |  6 +++-
 .../Participants/ParticipantPanel.cs          | 33 ++++++++-----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 8caba5d9c8..768dc6512c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -146,7 +146,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             });
 
-            AddToggleStep("toggle ready state", v => Client.ChangeUserState(0, v ? MultiplayerUserState.Ready : MultiplayerUserState.Idle));
+            for (var i = MultiplayerUserState.Idle; i < MultiplayerUserState.Results; i++)
+            {
+                var state = i;
+                AddStep($"set state: {state}", () => Client.ChangeUserState(0, state));
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index a782da4c39..f6a60c8f57 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -129,32 +129,25 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                     }
                                 }
                             },
-                            new FillFlowContainer
+                            new Container
                             {
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
                                 AutoSizeAxes = Axes.Both,
-                                Direction = FillDirection.Horizontal,
-                                Margin = new MarginPadding { Right = 10 },
-                                Spacing = new Vector2(10),
-                                Children = new Drawable[]
+                                Margin = new MarginPadding { Right = 70 },
+                                Child = userModsDisplay = new ModDisplay
                                 {
-                                    userModsDisplay = new ModDisplay
-                                    {
-                                        Anchor = Anchor.Centre,
-                                        Origin = Anchor.Centre,
-                                        Scale = new Vector2(0.5f),
-                                        ExpansionMode = ExpansionMode.AlwaysContracted,
-                                        DisplayUnrankedText = false,
-                                        ExpandOnAppear = false
-                                    },
-                                    userStateDisplay = new StateDisplay
-                                    {
-                                        Anchor = Anchor.Centre,
-                                        Origin = Anchor.Centre,
-                                        AlwaysPresent = true
-                                    }
+                                    Scale = new Vector2(0.5f),
+                                    ExpansionMode = ExpansionMode.AlwaysContracted,
+                                    DisplayUnrankedText = false,
+                                    ExpandOnAppear = false
                                 }
+                            },
+                            userStateDisplay = new StateDisplay
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                Margin = new MarginPadding { Right = 10 },
                             }
                         }
                     }

From 89a42d60fbc8f33c6cd28d2baa617b33c57b1312 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:50:32 +0900
Subject: [PATCH 07832/10326] General cleanup

---
 osu.Game.Tests/Mods/ModValidationTest.cs      | 14 ++++-----
 .../TestSceneFreeModSelectOverlay.cs          |  5 +--
 .../Online/Multiplayer/IMultiplayerClient.cs  |  5 +++
 .../Multiplayer/IMultiplayerRoomServer.cs     |  4 +++
 .../Online/Multiplayer/MultiplayerRoomUser.cs |  3 ++
 .../Multiplayer/StatefulMultiplayerClient.cs  |  6 +++-
 osu.Game/Overlays/Mods/ModButton.cs           |  8 ++---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 12 +++++--
 .../OnlinePlay/Match/FreeModSelectOverlay.cs  | 31 ++-----------------
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  2 +-
 .../Multiplayer/MultiplayerMatchSongSelect.cs |  2 +-
 .../OnlinePlay/OnlinePlaySongSelect.cs        | 18 +++++++++--
 osu.Game/Screens/Play/HUD/ModDisplay.cs       |  3 ++
 osu.Game/Screens/Select/MatchSongSelect.cs    |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         |  4 +++
 .../Utils/{ModValidation.cs => ModUtils.cs}   | 24 +++-----------
 16 files changed, 71 insertions(+), 72 deletions(-)
 rename osu.Game/Utils/{ModValidation.cs => ModUtils.cs} (79%)

diff --git a/osu.Game.Tests/Mods/ModValidationTest.cs b/osu.Game.Tests/Mods/ModValidationTest.cs
index c7a7e242e9..991adc221e 100644
--- a/osu.Game.Tests/Mods/ModValidationTest.cs
+++ b/osu.Game.Tests/Mods/ModValidationTest.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tests.Mods
         public void TestModIsCompatibleByItself()
         {
             var mod = new Mock<Mod>();
-            Assert.That(ModValidation.CheckCompatible(new[] { mod.Object }));
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod.Object }));
         }
 
         [Test]
@@ -27,8 +27,8 @@ namespace osu.Game.Tests.Mods
             mod1.Setup(m => m.IncompatibleMods).Returns(new[] { mod2.Object.GetType() });
 
             // Test both orderings.
-            Assert.That(ModValidation.CheckCompatible(new[] { mod1.Object, mod2.Object }), Is.False);
-            Assert.That(ModValidation.CheckCompatible(new[] { mod2.Object, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
         }
 
         [Test]
@@ -43,22 +43,22 @@ namespace osu.Game.Tests.Mods
             var multiMod = new MultiMod(new MultiMod(mod2.Object));
 
             // Test both orderings.
-            Assert.That(ModValidation.CheckCompatible(new[] { multiMod, mod1.Object }), Is.False);
-            Assert.That(ModValidation.CheckCompatible(new[] { mod1.Object, multiMod }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { multiMod, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
         }
 
         [Test]
         public void TestAllowedThroughMostDerivedType()
         {
             var mod = new Mock<Mod>();
-            Assert.That(ModValidation.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
+            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
         }
 
         [Test]
         public void TestNotAllowedThroughBaseType()
         {
             var mod = new Mock<Mod>();
-            Assert.That(ModValidation.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
+            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
index b1700d5b6e..e3342eb6a0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
@@ -3,19 +3,16 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Overlays.Mods;
 using osu.Game.Screens.OnlinePlay.Match;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneFreeModSelectOverlay : MultiplayerTestScene
     {
-        private ModSelectOverlay overlay;
-
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
-            Child = overlay = new FreeModSelectOverlay
+            Child = new FreeModSelectOverlay
             {
                 State = { Value = Visibility.Visible }
             };
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index f22b0e4e28..6d7b9d24d6 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -57,6 +57,11 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="beatmapAvailability">The new beatmap availability state of the user.</param>
         Task UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability);
 
+        /// <summary>
+        /// Signals that a user in this room changed their local mods.
+        /// </summary>
+        /// <param name="userId">The ID of the user whose mods have changed.</param>
+        /// <param name="mods">The user's new local mods.</param>
         Task UserModsChanged(int userId, IEnumerable<APIMod> mods);
 
         /// <summary>
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 71555ae23d..3527ce6314 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -49,6 +49,10 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
         Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
+        /// <summary>
+        /// Change the local user's mods in the currently joined room.
+        /// </summary>
+        /// <param name="newMods">The proposed new mods, excluding any required by the room itself.</param>
         Task ChangeUserMods(IEnumerable<APIMod> newMods);
 
         /// <summary>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 4c9643bfce..7de24826dd 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
+        /// <summary>
+        /// Any mods applicable only to the local user.
+        /// </summary>
         [NotNull]
         public IEnumerable<APIMod> UserMods { get; set; } = Enumerable.Empty<APIMod>();
 
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index a0e903e89a..597bee2764 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -232,6 +232,10 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
+        /// <summary>
+        /// Change the local user's mods in the currently joined room.
+        /// </summary>
+        /// <param name="newMods">The proposed new mods, excluding any required by the room itself.</param>
         public Task ChangeUserMods(IEnumerable<Mod> newMods) => ChangeUserMods(newMods.Select(m => new APIMod(m)).ToList());
 
         public abstract Task ChangeUserMods(IEnumerable<APIMod> newMods);
@@ -393,7 +397,7 @@ namespace osu.Game.Online.Multiplayer
             {
                 var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
 
-                // errors here are not critical - user mods is mostly for display.
+                // errors here are not critical - user mods are mostly for display.
                 if (user == null)
                     return;
 
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 9ea4f65eb2..ab8efdabcc 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Overlays.Mods
                 switch (e.Button)
                 {
                     case MouseButton.Right:
-                        OnRightClick(e);
+                        SelectNext(-1);
                         break;
                 }
             }
@@ -183,12 +183,8 @@ namespace osu.Game.Overlays.Mods
         protected override bool OnClick(ClickEvent e)
         {
             SelectNext(1);
-            return true;
-        }
 
-        protected virtual void OnRightClick(MouseUpEvent e)
-        {
-            SelectNext(-1);
+            return true;
         }
 
         /// <summary>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 2e69f15ff5..2950dc7489 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Mods
         private Func<Mod, bool> isValidMod = m => true;
 
         /// <summary>
-        /// A function that checks whether a given mod is valid.
+        /// A function that checks whether a given mod is selectable.
         /// </summary>
         [NotNull]
         public Func<Mod, bool> IsValidMod
@@ -442,12 +442,20 @@ namespace osu.Game.Overlays.Mods
                 IEnumerable<Mod> modEnumeration = availableMods.Value[section.ModType];
 
                 if (!Stacked)
-                    modEnumeration = ModValidation.FlattenMods(modEnumeration);
+                    modEnumeration = ModUtils.FlattenMods(modEnumeration);
 
                 section.Mods = modEnumeration.Select(validModOrNull).Where(m => m != null);
             }
         }
 
+        /// <summary>
+        /// Returns a valid form of a given <see cref="Mod"/> if possible, or null otherwise.
+        /// </summary>
+        /// <remarks>
+        /// This is a recursive process during which any invalid mods are culled while preserving <see cref="MultiMod"/> structures where possible.
+        /// </remarks>
+        /// <param name="mod">The <see cref="Mod"/> to check.</param>
+        /// <returns>A valid form of <paramref name="mod"/> if exists, or null otherwise.</returns>
         [CanBeNull]
         private Mod validModOrNull([NotNull] Mod mod)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index 0d62cc3d37..3cdf25fad0 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -5,13 +5,15 @@ using System;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.OnlinePlay.Match
 {
+    /// <summary>
+    /// A <see cref="ModSelectOverlay"/> used for free-mod selection in online play.
+    /// </summary>
     public class FreeModSelectOverlay : ModSelectOverlay
     {
         protected override bool AllowCustomisation => false;
@@ -29,8 +31,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
             {
             }
 
-            protected override ModButton CreateModButton(Mod mod) => new FreeModButton(mod);
-
             protected override Drawable CreateHeader(string text) => new Container
             {
                 AutoSizeAxes = Axes.Y,
@@ -47,7 +47,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
                 foreach (var button in ButtonsContainer.OfType<ModButton>())
                 {
                     if (value)
-                        // Note: Buttons where only part of the group has an implementation are not fully supported.
                         button.SelectAt(0);
                     else
                         button.Deselect();
@@ -77,29 +76,5 @@ namespace osu.Game.Screens.OnlinePlay.Match
                 Changed?.Invoke(value);
             }
         }
-
-        private class FreeModButton : ModButton
-        {
-            public FreeModButton(Mod mod)
-                : base(mod)
-            {
-            }
-
-            protected override bool OnClick(ClickEvent e)
-            {
-                onClick();
-                return true;
-            }
-
-            protected override void OnRightClick(MouseUpEvent e) => onClick();
-
-            private void onClick()
-            {
-                if (Selected)
-                    Deselect();
-                else
-                    SelectNext(1);
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 6367aa54a7..f4136c895f 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             if (SelectedItem.Value == null)
                 return;
 
-            // Remove any extra mods that are no longer allowed.
+            // Remove any user mods that are no longer allowed.
             UserMods.Value = UserMods.Value
                                      .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
                                      .ToList();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index e6b7656986..08c00e8372 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
         }
 
-        protected override void OnSetItem(PlaylistItem item)
+        protected override void SelectItem(PlaylistItem item)
         {
             // If the client is already in a room, update via the client.
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index b75bf93204..46be5591a8 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -76,11 +76,15 @@ namespace osu.Game.Screens.OnlinePlay
             item.AllowedMods.Clear();
             item.AllowedMods.AddRange(freeMods.Value.Select(m => m.CreateCopy()));
 
-            OnSetItem(item);
+            SelectItem(item);
             return true;
         }
 
-        protected abstract void OnSetItem(PlaylistItem item);
+        /// <summary>
+        /// Invoked when the user has requested a selection of a beatmap.
+        /// </summary>
+        /// <param name="item">The resultant <see cref="PlaylistItem"/>. This item has not yet been added to the <see cref="Room"/>'s.</param>
+        protected abstract void SelectItem(PlaylistItem item);
 
         public override bool OnBackButton()
         {
@@ -117,8 +121,18 @@ namespace osu.Game.Screens.OnlinePlay
             return buttons;
         }
 
+        /// <summary>
+        /// Checks whether a given <see cref="Mod"/> is valid for global selection.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> to check.</param>
+        /// <returns>Whether <paramref name="mod"/> is a valid mod for online play.</returns>
         protected virtual bool IsValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
 
+        /// <summary>
+        /// Checks whether a given <see cref="Mod"/> is valid for per-player free-mod selection.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> to check.</param>
+        /// <returns>Whether <paramref name="mod"/> is a selectable free-mod.</returns>
         protected virtual bool IsValidFreeMod(Mod mod) => IsValidMod(mod);
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 2d5b07f056..ce1a8a3205 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Screens.Play.HUD
 
         public ExpansionMode ExpansionMode = ExpansionMode.ExpandOnHover;
 
+        /// <summary>
+        /// Whether the mods should initially appear expanded, before potentially contracting into their final expansion state (depending on <see cref="ExpansionMode"/>).
+        /// </summary>
         public bool ExpandOnAppear = true;
 
         private readonly Bindable<IReadOnlyList<Mod>> current = new Bindable<IReadOnlyList<Mod>>();
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 23fe9620fe..1de3e0e989 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Select
             CreateNewItem = createNewItem
         };
 
-        protected override void OnSetItem(PlaylistItem item)
+        protected override void SelectItem(PlaylistItem item)
         {
             switch (Playlist.Count)
             {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4af96b7a29..ed6e0a1028 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -300,6 +300,10 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        /// <summary>
+        /// Creates the buttons to be displayed in the footer.
+        /// </summary>
+        /// <returns>A set of <see cref="FooterButton"/> and an optional <see cref="OverlayContainer"/> which the button opens when pressed.</returns>
         protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[]
         {
             (new FooterButtonMods { Current = Mods }, ModSelect),
diff --git a/osu.Game/Utils/ModValidation.cs b/osu.Game/Utils/ModUtils.cs
similarity index 79%
rename from osu.Game/Utils/ModValidation.cs
rename to osu.Game/Utils/ModUtils.cs
index 3597396ec4..808dba2900 100644
--- a/osu.Game/Utils/ModValidation.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -12,9 +12,9 @@ using osu.Game.Rulesets.Mods;
 namespace osu.Game.Utils
 {
     /// <summary>
-    /// A set of utilities to validate <see cref="Mod"/> combinations.
+    /// A set of utilities to handle <see cref="Mod"/> combinations.
     /// </summary>
-    public static class ModValidation
+    public static class ModUtils
     {
         /// <summary>
         /// Checks that all <see cref="Mod"/>s are compatible with each-other, and that all appear within a set of allowed types.
@@ -25,11 +25,11 @@ namespace osu.Game.Utils
         /// <param name="combination">The <see cref="Mod"/>s to check.</param>
         /// <param name="allowedTypes">The set of allowed <see cref="Mod"/> types.</param>
         /// <returns>Whether all <see cref="Mod"/>s are compatible with each-other and appear in the set of allowed types.</returns>
-        public static bool CheckCompatibleAndAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
+        public static bool CheckCompatibleSetAndAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
         {
             // Prevent multiple-enumeration.
             var combinationList = combination as ICollection<Mod> ?? combination.ToArray();
-            return CheckCompatible(combinationList) && CheckAllowed(combinationList, allowedTypes);
+            return CheckCompatibleSet(combinationList) && CheckAllowed(combinationList, allowedTypes);
         }
 
         /// <summary>
@@ -37,7 +37,7 @@ namespace osu.Game.Utils
         /// </summary>
         /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
         /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
-        public static bool CheckCompatible(IEnumerable<Mod> combination)
+        public static bool CheckCompatibleSet(IEnumerable<Mod> combination)
         {
             var incompatibleTypes = new HashSet<Type>();
             var incomingTypes = new HashSet<Type>();
@@ -83,20 +83,6 @@ namespace osu.Game.Utils
                               .All(m => allowedSet.Contains(m.GetType()));
         }
 
-        /// <summary>
-        /// Determines whether a <see cref="Mod"/> is in a set of incompatible types.
-        /// </summary>
-        /// <remarks>
-        /// A <see cref="Mod"/> can be incompatible through its most-declared type or any of its base types.
-        /// </remarks>
-        /// <param name="mod">The <see cref="Mod"/> to test.</param>
-        /// <param name="incompatibleTypes">The set of incompatible <see cref="Mod"/> types.</param>
-        /// <returns>Whether the given <see cref="Mod"/> is incompatible.</returns>
-        private static bool isModIncompatible(Mod mod, ICollection<Type> incompatibleTypes)
-            => FlattenMod(mod)
-               .SelectMany(m => m.GetType().EnumerateBaseTypes())
-               .Any(incompatibleTypes.Contains);
-
         /// <summary>
         /// Flattens a set of <see cref="Mod"/>s, returning a new set with all <see cref="MultiMod"/>s removed.
         /// </summary>

From ee92ec0a5c2e6120f45b36f14b9a678ecab78e8a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:54:47 +0900
Subject: [PATCH 07833/10326] Disallow local user mod customisation

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 87ae723c63..f09c7168b3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -216,7 +216,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     Origin = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.Both,
                     Height = 0.5f,
-                    Child = userModsSelectOverlay = new SoloModSelectOverlay
+                    Child = userModsSelectOverlay = new UserModSelectOverlay
                     {
                         SelectedMods = { BindTarget = UserMods },
                         IsValidMod = _ => false
@@ -358,5 +358,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (client != null)
                 client.LoadRequested -= onLoadRequested;
         }
+
+        private class UserModSelectOverlay : ModSelectOverlay
+        {
+            protected override bool AllowCustomisation => false;
+        }
     }
 }

From 76ebb3811a03ea45fb5279fab26c9951fe199ba9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 19:05:02 +0900
Subject: [PATCH 07834/10326] Fix mod icons potentially having incorrect
 colours

---
 osu.Game/Rulesets/UI/ModIcon.cs | 49 +++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 8ea6c74349..76fcb8e080 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -26,8 +26,6 @@ namespace osu.Game.Rulesets.UI
 
         private const float size = 80;
 
-        private readonly ModType type;
-
         public virtual string TooltipText => mod.IconTooltip;
 
         private Mod mod;
@@ -38,16 +36,22 @@ namespace osu.Game.Rulesets.UI
             set
             {
                 mod = value;
-                updateMod(value);
+
+                if (LoadState >= LoadState.Ready)
+                    updateMod(value);
             }
         }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private Color4 backgroundColour;
+        private Color4 highlightedColour;
+
         public ModIcon(Mod mod)
         {
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
 
-            type = mod.Type;
-
             Size = new Vector2(size);
 
             Children = new Drawable[]
@@ -79,10 +83,20 @@ namespace osu.Game.Rulesets.UI
                     Icon = FontAwesome.Solid.Question
                 },
             };
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             updateMod(mod);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Selected.BindValueChanged(_ => updateColour(), true);
+        }
+
         private void updateMod(Mod value)
         {
             modAcronym.Text = value.Acronym;
@@ -92,20 +106,14 @@ namespace osu.Game.Rulesets.UI
             {
                 modIcon.FadeOut();
                 modAcronym.FadeIn();
-                return;
+            }
+            else
+            {
+                modIcon.FadeIn();
+                modAcronym.FadeOut();
             }
 
-            modIcon.FadeIn();
-            modAcronym.FadeOut();
-        }
-
-        private Color4 backgroundColour;
-        private Color4 highlightedColour;
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            switch (type)
+            switch (value.Type)
             {
                 default:
                 case ModType.DifficultyIncrease:
@@ -139,12 +147,13 @@ namespace osu.Game.Rulesets.UI
                     modIcon.Colour = colours.Yellow;
                     break;
             }
+
+            updateColour();
         }
 
-        protected override void LoadComplete()
+        private void updateColour()
         {
-            base.LoadComplete();
-            Selected.BindValueChanged(selected => background.Colour = selected.NewValue ? highlightedColour : backgroundColour, true);
+            background.Colour = Selected.Value ? highlightedColour : backgroundColour;
         }
     }
 }

From e5ca9b1e500c06e1cc084bcf4f8d1cc8994a3474 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 19:28:33 +0900
Subject: [PATCH 07835/10326] Remove usage of removed method

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 3322c8ede1..9e1e9f3d69 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -298,7 +298,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (client.Room == null)
                 return;
 
-            client.ChangeUserMods(mods.NewValue).CatchUnobservedExceptions();
+            client.ChangeUserMods(mods.NewValue);
         }
 
         private void onReadyClick()

From b9832c1b2d2e55b06170e67c64c05e2f0cf016fc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 19:37:19 +0900
Subject: [PATCH 07836/10326] Add ModUtils class for validating mod usages

---
 .../osu.Game.Tests.Android.csproj             |   4 +
 osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj  |   1 +
 osu.Game.Tests/Mods/ModUtilsTest.cs           |  64 ++++++++++
 osu.Game.Tests/osu.Game.Tests.csproj          |   1 +
 osu.Game/Utils/ModUtils.cs                    | 109 ++++++++++++++++++
 5 files changed, 179 insertions(+)
 create mode 100644 osu.Game.Tests/Mods/ModUtilsTest.cs
 create mode 100644 osu.Game/Utils/ModUtils.cs

diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index c44ed69c4d..19e36a63f1 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -69,5 +69,9 @@
       <Name>osu.Game</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="DeepEqual" Version="2.0.0" />
+    <PackageReference Include="Moq" Version="4.16.0" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
index ca68369ebb..67b2298f4c 100644
--- a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
+++ b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="DeepEqual" Version="2.0.0" />
+    <PackageReference Include="Moq" Version="4.16.0" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
new file mode 100644
index 0000000000..fdb441343a
--- /dev/null
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -0,0 +1,64 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Moq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
+
+namespace osu.Game.Tests.Mods
+{
+    [TestFixture]
+    public class ModUtilsTest
+    {
+        [Test]
+        public void TestModIsCompatibleByItself()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod.Object }));
+        }
+
+        [Test]
+        public void TestIncompatibleThroughTopLevel()
+        {
+            var mod1 = new Mock<Mod>();
+            var mod2 = new Mock<Mod>();
+
+            mod1.Setup(m => m.IncompatibleMods).Returns(new[] { mod2.Object.GetType() });
+
+            // Test both orderings.
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
+        }
+
+        [Test]
+        public void TestIncompatibleThroughMultiMod()
+        {
+            var mod1 = new Mock<Mod>();
+
+            // The nested mod.
+            var mod2 = new Mock<Mod>();
+            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType() });
+
+            var multiMod = new MultiMod(new MultiMod(mod2.Object));
+
+            // Test both orderings.
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { multiMod, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
+        }
+
+        [Test]
+        public void TestAllowedThroughMostDerivedType()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
+        }
+
+        [Test]
+        public void TestNotAllowedThroughBaseType()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
+        }
+    }
+}
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index c0c0578391..d29ed94b5f 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -7,6 +7,7 @@
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Include="Moq" Version="4.16.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
new file mode 100644
index 0000000000..808dba2900
--- /dev/null
+++ b/osu.Game/Utils/ModUtils.cs
@@ -0,0 +1,109 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Extensions.TypeExtensions;
+using osu.Game.Rulesets.Mods;
+
+#nullable enable
+
+namespace osu.Game.Utils
+{
+    /// <summary>
+    /// A set of utilities to handle <see cref="Mod"/> combinations.
+    /// </summary>
+    public static class ModUtils
+    {
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s are compatible with each-other, and that all appear within a set of allowed types.
+        /// </summary>
+        /// <remarks>
+        /// The allowed types must contain exact <see cref="Mod"/> types for the respective <see cref="Mod"/>s to be allowed.
+        /// </remarks>
+        /// <param name="combination">The <see cref="Mod"/>s to check.</param>
+        /// <param name="allowedTypes">The set of allowed <see cref="Mod"/> types.</param>
+        /// <returns>Whether all <see cref="Mod"/>s are compatible with each-other and appear in the set of allowed types.</returns>
+        public static bool CheckCompatibleSetAndAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
+        {
+            // Prevent multiple-enumeration.
+            var combinationList = combination as ICollection<Mod> ?? combination.ToArray();
+            return CheckCompatibleSet(combinationList) && CheckAllowed(combinationList, allowedTypes);
+        }
+
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s in a combination are compatible with each-other.
+        /// </summary>
+        /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
+        /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
+        public static bool CheckCompatibleSet(IEnumerable<Mod> combination)
+        {
+            var incompatibleTypes = new HashSet<Type>();
+            var incomingTypes = new HashSet<Type>();
+
+            foreach (var mod in combination.SelectMany(FlattenMod))
+            {
+                // Add the new mod incompatibilities, checking whether any match the existing mod types.
+                foreach (var t in mod.IncompatibleMods)
+                {
+                    if (incomingTypes.Contains(t))
+                        return false;
+
+                    incompatibleTypes.Add(t);
+                }
+
+                // Add the new mod types, checking whether any match the incompatible types.
+                foreach (var t in mod.GetType().EnumerateBaseTypes())
+                {
+                    if (incomingTypes.Contains(t))
+                        return false;
+
+                    incomingTypes.Add(t);
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s in a combination appear within a set of allowed types.
+        /// </summary>
+        /// <remarks>
+        /// The set of allowed types must contain exact <see cref="Mod"/> types for the respective <see cref="Mod"/>s to be allowed.
+        /// </remarks>
+        /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
+        /// <param name="allowedTypes">The set of allowed <see cref="Mod"/> types.</param>
+        /// <returns>Whether all <see cref="Mod"/>s in the combination are allowed.</returns>
+        public static bool CheckAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
+        {
+            var allowedSet = new HashSet<Type>(allowedTypes);
+
+            return combination.SelectMany(FlattenMod)
+                              .All(m => allowedSet.Contains(m.GetType()));
+        }
+
+        /// <summary>
+        /// Flattens a set of <see cref="Mod"/>s, returning a new set with all <see cref="MultiMod"/>s removed.
+        /// </summary>
+        /// <param name="mods">The set of <see cref="Mod"/>s to flatten.</param>
+        /// <returns>The new set, containing all <see cref="Mod"/>s in <paramref name="mods"/> recursively with all <see cref="MultiMod"/>s removed.</returns>
+        public static IEnumerable<Mod> FlattenMods(IEnumerable<Mod> mods) => mods.SelectMany(FlattenMod);
+
+        /// <summary>
+        /// Flattens a <see cref="Mod"/>, returning a set of <see cref="Mod"/>s in-place of any <see cref="MultiMod"/>s.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> to flatten.</param>
+        /// <returns>A set of singular "flattened" <see cref="Mod"/>s</returns>
+        public static IEnumerable<Mod> FlattenMod(Mod mod)
+        {
+            if (mod is MultiMod multi)
+            {
+                foreach (var m in multi.Mods.SelectMany(FlattenMod))
+                    yield return m;
+            }
+            else
+                yield return mod;
+        }
+    }
+}

From 97247b7a673fa552b9f8f5b66aa87e9dfe2293c0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 19:59:18 +0900
Subject: [PATCH 07837/10326] Fix unset key

---
 osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index a25c332b47..d0e19d9f37 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Online.Multiplayer
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
         [NotNull]
+        [Key(5)]
         public IEnumerable<APIMod> AllowedMods { get; set; } = Enumerable.Empty<APIMod>();
 
         public bool Equals(MultiplayerRoomSettings other)

From 97e3023df9cb680feedadd089b2eb326078a2e39 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 20:16:58 +0900
Subject: [PATCH 07838/10326] Renamespace/rename MatchSongSelect ->
 PlaylistsSongSelect

---
 .../Visual/Multiplayer/TestSceneMatchSongSelect.cs        | 8 ++++----
 .../OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs        | 3 +--
 .../Playlists/PlaylistsSongSelect.cs}                     | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename osu.Game/Screens/{Select/MatchSongSelect.cs => OnlinePlay/Playlists/PlaylistsSongSelect.cs} (91%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index e0fd7d9874..86429ac50e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -19,7 +19,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
-using osu.Game.Screens.Select;
+using osu.Game.Screens.OnlinePlay.Playlists;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private RulesetStore rulesets;
 
-        private TestMatchSongSelect songSelect;
+        private TestPlaylistsSongSelect songSelect;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Beatmap.SetDefault();
             });
 
-            AddStep("create song select", () => LoadScreen(songSelect = new TestMatchSongSelect()));
+            AddStep("create song select", () => LoadScreen(songSelect = new TestPlaylistsSongSelect()));
             AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
         }
 
@@ -176,7 +176,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("item has rate 1.5", () => Precision.AlmostEquals(1.5, ((OsuModDoubleTime)Room.Playlist.First().RequiredMods[0]).SpeedChange.Value));
         }
 
-        private class TestMatchSongSelect : MatchSongSelect
+        private class TestPlaylistsSongSelect : PlaylistsSongSelect
         {
             public new MatchBeatmapDetailArea BeatmapDetails => (MatchBeatmapDetailArea)base.BeatmapDetails;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 22580f0537..cedde373b3 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -13,7 +13,6 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
-using osu.Game.Screens.Select;
 using osu.Game.Users;
 using Footer = osu.Game.Screens.OnlinePlay.Match.Components.Footer;
 
@@ -188,7 +187,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 settingsOverlay = new PlaylistsMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
-                    EditPlaylist = () => this.Push(new MatchSongSelect()),
+                    EditPlaylist = () => this.Push(new PlaylistsSongSelect()),
                     State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
                 }
             };
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
similarity index 91%
rename from osu.Game/Screens/Select/MatchSongSelect.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
index 1de3e0e989..0e8db6dfe5 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
@@ -6,12 +6,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.Select;
 
-namespace osu.Game.Screens.Select
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
-    public class MatchSongSelect : OnlinePlaySongSelect
+    public class PlaylistsSongSelect : OnlinePlaySongSelect
     {
         [Resolved]
         private BeatmapManager beatmaps { get; set; }

From ead8262257ed0749b9b81670aa76b534aa73874f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 20:20:10 +0900
Subject: [PATCH 07839/10326] Add function to check for (and return) invalid
 mods

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

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 808dba2900..9e638d4f2f 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -83,6 +83,48 @@ namespace osu.Game.Utils
                               .All(m => allowedSet.Contains(m.GetType()));
         }
 
+        /// <summary>
+        /// Check the provided combination of mods are valid for a local gameplay session.
+        /// </summary>
+        /// <param name="mods">The mods to check.</param>
+        /// <param name="invalidMods">Invalid mods, if any where found. Can be null if all mods were valid.</param>
+        /// <returns>Whether the input mods were all valid. If false, <paramref name="invalidMods"/> will contain all invalid entries.</returns>
+        public static bool CheckValidForGameplay(IEnumerable<Mod> mods, out Mod[]? invalidMods)
+        {
+            mods = mods.ToArray();
+
+            List<Mod>? foundInvalid = null;
+
+            void addInvalid(Mod mod)
+            {
+                foundInvalid ??= new List<Mod>();
+                foundInvalid.Add(mod);
+            }
+
+            foreach (var mod in mods)
+            {
+                bool valid = mod.Type != ModType.System
+                             && mod.HasImplementation
+                             && !(mod is MultiMod);
+
+                if (!valid)
+                {
+                    // if this mod was found as invalid, we can exclude it before potentially excluding more incompatible types.
+                    addInvalid(mod);
+                    continue;
+                }
+
+                foreach (var type in mod.IncompatibleMods)
+                {
+                    foreach (var invalid in mods.Where(m => type.IsInstanceOfType(m)))
+                        addInvalid(invalid);
+                }
+            }
+
+            invalidMods = foundInvalid?.ToArray();
+            return foundInvalid == null;
+        }
+
         /// <summary>
         /// Flattens a set of <see cref="Mod"/>s, returning a new set with all <see cref="MultiMod"/>s removed.
         /// </summary>

From 425dc8a210d69c853c58f4d2a10ce0347914261f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 20:20:19 +0900
Subject: [PATCH 07840/10326] Ensure mods are always in a valid state at a game
 level

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5acd6bc73d..a00cd5e6a0 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -468,6 +468,12 @@ namespace osu.Game
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             updateModDefaults();
+
+            if (!ModUtils.CheckValidForGameplay(mods.NewValue, out var invalid))
+            {
+                // ensure we always have a valid set of mods.
+                SelectedMods.Value = mods.NewValue.Except(invalid).ToArray();
+            }
         }
 
         private void updateModDefaults()

From 286726feb0cb93c4f3d54e60d690979bba35c005 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 17:44:30 +0000
Subject: [PATCH 07841/10326] Bump SharpCompress from 0.26.0 to 0.27.1

Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.26.0 to 0.27.1.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.26...0.27.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1552dff17d..d0aeb10c9c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
-    <PackageReference Include="SharpCompress" Version="0.26.0" />
+    <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index 48dc01f5de..b40e6a3346 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -89,7 +89,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
-    <PackageReference Include="SharpCompress" Version="0.26.0" />
+    <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 0560676236e2b73eb25726b10a07927912b2b201 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 18:09:05 +0000
Subject: [PATCH 07842/10326] Bump ppy.osu.Framework.NativeLibs from 2020.923.0
 to 2021.115.0

Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework) from 2020.923.0 to 2021.115.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2020.923.0...2021.115.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 b40e6a3346..dc3527c687 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -93,6 +93,6 @@
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2020.923.0" ExcludeAssets="all" />
+    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2021.115.0" ExcludeAssets="all" />
   </ItemGroup>
 </Project>

From 57213e630806a6e25973fa19588009217a0ad9ea Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 18:09:07 +0000
Subject: [PATCH 07843/10326] Bump DiscordRichPresence from 1.0.169 to 1.0.175

Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.169 to 1.0.175.
- [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 cce7907c6c..3e0f0cb7f6 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -30,7 +30,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="5.0.0" />
-    <PackageReference Include="DiscordRichPresence" Version="1.0.169" />
+    <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />

From 15fcabb1282c8c36c4f005e6acba36a7d239fb11 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Feb 2021 22:04:44 +0300
Subject: [PATCH 07844/10326] Add documentation to auto-scroll leniency
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/Overlays/Chat/DrawableChannel.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 4c8513b1d5..0cd5ecc05a 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -241,6 +241,11 @@ namespace osu.Game.Overlays.Chat
         /// </summary>
         private class ChannelScrollContainer : OsuScrollContainer
         {
+            /// <summary>
+            /// The chat will be automatically scrolled to end if and only if
+            /// the distance between the current scroll position and the end of the scroll
+            /// is less than this value.
+            /// </summary>
             private const float auto_scroll_leniency = 10f;
 
             private float? lastExtent;

From 5c28c030c86a270cd6435955ac82de4daa8a196e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Feb 2021 22:08:55 +0300
Subject: [PATCH 07845/10326] Unconditionally set "autoscroll" state

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

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 0cd5ecc05a..db6a27bf8c 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -261,8 +261,8 @@ namespace osu.Game.Overlays.Chat
 
                 if ((lastExtent == null || ScrollableExtent > lastExtent) && ShouldAutoScroll)
                     ScrollToEnd();
-                else
-                    ShouldAutoScroll = IsScrolledToEnd(auto_scroll_leniency);
+
+                ShouldAutoScroll = IsScrolledToEnd(auto_scroll_leniency);
 
                 lastExtent = ScrollableExtent;
             }

From 216b0d89a729cff6ad311ebb440f32dcb1e174e6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 19:16:51 +0000
Subject: [PATCH 07846/10326] Bump Sentry from 2.1.8 to 3.0.1

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.8 to 3.0.1.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.8...3.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 d0aeb10c9c..e2b506e187 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="Sentry" Version="2.1.8" />
+    <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From dcb1626e4d66649304d9307cdc63329f523192f9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Feb 2021 22:38:42 +0300
Subject: [PATCH 07847/10326] Remove no longer necessary field

---
 osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 02ef024128..8ea05784e9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -46,7 +46,6 @@ namespace osu.Game.Tests.Visual.Online
         private ChannelManager channelManager = new ChannelManager();
 
         private TestStandAloneChatDisplay chatDisplay;
-        private TestStandAloneChatDisplay chatDisplay2;
         private int messageIdSequence;
 
         private Channel testChannel;
@@ -72,7 +71,7 @@ namespace osu.Game.Tests.Visual.Online
                     Size = new Vector2(400, 80),
                     Channel = { Value = testChannel },
                 },
-                chatDisplay2 = new TestStandAloneChatDisplay(true)
+                new TestStandAloneChatDisplay(true)
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,

From f166c4c4148553e381f694cbdb7cca3fb65d7cf1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 11:04:09 +0900
Subject: [PATCH 07848/10326] Rename test

---
 ...tSceneMatchSongSelect.cs => TestScenePlaylistsSongSelect.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneMatchSongSelect.cs => TestScenePlaylistsSongSelect.cs} (99%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
index 86429ac50e..2f7e59f800 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
@@ -23,7 +23,7 @@ using osu.Game.Screens.OnlinePlay.Playlists;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchSongSelect : RoomTestScene
+    public class TestScenePlaylistsSongSelect : RoomTestScene
     {
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }

From 4cf52077b6dbb51bfb48f4589ed88f47cab886ca Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 11:11:28 +0900
Subject: [PATCH 07849/10326] Make checkbox also respond to all mods selected

---
 osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index 3cdf25fad0..9a3c87f1ff 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -57,12 +57,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
             {
                 base.Update();
 
-                // If any of the buttons aren't selected, deselect the checkbox.
-                foreach (var button in ButtonsContainer.OfType<ModButton>())
-                {
-                    if (button.Mods.Any(m => m.HasImplementation) && !button.Selected)
-                        checkbox.Current.Value = false;
-                }
+                var validButtons = ButtonsContainer.OfType<ModButton>().Where(b => b.Mod.HasImplementation);
+                checkbox.Current.Value = validButtons.All(b => b.Selected);
             }
         }
 

From b54f65c28279ffcc4d53b9eebdac6c1b73ac4d30 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 12:48:15 +0900
Subject: [PATCH 07850/10326] Exclude more mods from multiplayer

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs        | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 08c00e8372..f7f0402555 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -68,6 +68,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust);
+        protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust) && !mod.RequiresConfiguration;
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 46be5591a8..755dbdb55e 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Screens.OnlinePlay
         /// </summary>
         /// <param name="mod">The <see cref="Mod"/> to check.</param>
         /// <returns>Whether <paramref name="mod"/> is a valid mod for online play.</returns>
-        protected virtual bool IsValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
+        protected virtual bool IsValidMod(Mod mod) => mod.HasImplementation && !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
 
         /// <summary>
         /// Checks whether a given <see cref="Mod"/> is valid for per-player free-mod selection.

From 7a14e14e67db572f8ec1c8154d6e2e0111a0429b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 12:49:49 +0900
Subject: [PATCH 07851/10326] Refactor condition

This won't make any noticeable difference, but is the more correct way
to handle MultiMod because flattening works through infinite recursion levels.
---
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 755dbdb55e..b0062720e0 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.Select;
+using osu.Game.Utils;
 
 namespace osu.Game.Screens.OnlinePlay
 {
@@ -126,7 +127,7 @@ namespace osu.Game.Screens.OnlinePlay
         /// </summary>
         /// <param name="mod">The <see cref="Mod"/> to check.</param>
         /// <returns>Whether <paramref name="mod"/> is a valid mod for online play.</returns>
-        protected virtual bool IsValidMod(Mod mod) => mod.HasImplementation && !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
+        protected virtual bool IsValidMod(Mod mod) => mod.HasImplementation && !ModUtils.FlattenMod(mod).Any(m => m is ModAutoplay);
 
         /// <summary>
         /// Checks whether a given <see cref="Mod"/> is valid for per-player free-mod selection.

From 0d5353008c1d3e9520d7d12bf50d6f23b85d9712 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 13:34:34 +0900
Subject: [PATCH 07852/10326] Update sentry sdk usage

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

diff --git a/osu.Game/Utils/SentryLogger.cs b/osu.Game/Utils/SentryLogger.cs
index e8e41cdbbe..be9d01cde6 100644
--- a/osu.Game/Utils/SentryLogger.cs
+++ b/osu.Game/Utils/SentryLogger.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Utils
 
             var options = new SentryOptions
             {
-                Dsn = new Dsn("https://5e342cd55f294edebdc9ad604d28bbd3@sentry.io/1255255"),
+                Dsn = "https://5e342cd55f294edebdc9ad604d28bbd3@sentry.io/1255255",
                 Release = game.Version
             };
 

From 9c3c0895cf2a63d3a7517d53fecf8a0d64c149eb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:03:46 +0900
Subject: [PATCH 07853/10326] Hide customise button + multiplier label

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                | 3 ++-
 osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 25cb75f73a..a7bfac4088 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -37,6 +37,7 @@ namespace osu.Game.Overlays.Mods
         protected readonly TriangleButton CustomiseButton;
         protected readonly TriangleButton CloseButton;
 
+        protected readonly Drawable MultiplierSection;
         protected readonly OsuSpriteText MultiplierLabel;
 
         /// <summary>
@@ -316,7 +317,7 @@ namespace osu.Game.Overlays.Mods
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
-                                            new FillFlowContainer
+                                            MultiplierSection = new FillFlowContainer
                                             {
                                                 AutoSizeAxes = Axes.Both,
                                                 Spacing = new Vector2(footer_button_spacing / 2, 0),
diff --git a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index 9a3c87f1ff..f22c6603e5 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -20,6 +20,12 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         protected override bool Stacked => false;
 
+        public FreeModSelectOverlay()
+        {
+            CustomiseButton.Alpha = 0;
+            MultiplierSection.Alpha = 0;
+        }
+
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
         private class FreeModSection : ModSection

From 87f9e46b164c540d9f7a531510521087f3840a0c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:37:25 +0900
Subject: [PATCH 07854/10326] Add option to select all

---
 osu.Game/Overlays/Mods/ModSection.cs          |  8 +++-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 13 +++---
 .../OnlinePlay/Match/FreeModSelectOverlay.cs  | 40 +++++++++++++++++++
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 5de629424b..993f4ef9d7 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -91,7 +91,13 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
-        public void DeselectAll() => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
+        public void SelectAll()
+        {
+            foreach (var button in buttons.Where(b => !b.Selected))
+                button.SelectAt(0);
+        }
+
+        public void DeselectAll(bool immediate = false) => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null), immediate);
 
         /// <summary>
         /// Deselect one or more mods in this section.
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index a7bfac4088..087990d3f8 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Overlays.Mods
     {
         public const float HEIGHT = 510;
 
+        protected readonly FillFlowContainer FooterContainer;
         protected readonly TriangleButton DeselectAllButton;
         protected readonly TriangleButton CustomiseButton;
         protected readonly TriangleButton CloseButton;
@@ -85,8 +86,6 @@ namespace osu.Game.Overlays.Mods
         private const float content_width = 0.8f;
         private const float footer_button_spacing = 20;
 
-        private readonly FillFlowContainer footerContainer;
-
         private SampleChannel sampleOn, sampleOff;
 
         protected ModSelectOverlay()
@@ -275,7 +274,7 @@ namespace osu.Game.Overlays.Mods
                                         Colour = new Color4(172, 20, 116, 255),
                                         Alpha = 0.5f,
                                     },
-                                    footerContainer = new FillFlowContainer
+                                    FooterContainer = new FillFlowContainer
                                     {
                                         Origin = Anchor.BottomCentre,
                                         Anchor = Anchor.BottomCentre,
@@ -385,8 +384,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopOut();
 
-            footerContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
-            footerContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
+            FooterContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
+            FooterContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
 
             foreach (var section in ModSectionsContainer.Children)
             {
@@ -400,8 +399,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopIn();
 
-            footerContainer.MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
-            footerContainer.FadeIn(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+            FooterContainer.MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+            FooterContainer.FadeIn(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
 
             foreach (var section in ModSectionsContainer.Children)
             {
diff --git a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index f22c6603e5..9a676930a0 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -24,6 +24,46 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             CustomiseButton.Alpha = 0;
             MultiplierSection.Alpha = 0;
+            DeselectAllButton.Alpha = 0;
+
+            Drawable selectAllButton;
+            Drawable deselectAllButton;
+
+            FooterContainer.AddRange(new[]
+            {
+                selectAllButton = new TriangleButton
+                {
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Width = 180,
+                    Text = "Select All",
+                    Action = selectAll,
+                },
+                // Unlike the base mod select overlay, this button deselects mods instantaneously.
+                deselectAllButton = new TriangleButton
+                {
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Width = 180,
+                    Text = "Deselect All",
+                    Action = deselectAll,
+                },
+            });
+
+            FooterContainer.SetLayoutPosition(selectAllButton, -2);
+            FooterContainer.SetLayoutPosition(deselectAllButton, -1);
+        }
+
+        private void selectAll()
+        {
+            foreach (var section in ModSectionsContainer.Children)
+                section.SelectAll();
+        }
+
+        private void deselectAll()
+        {
+            foreach (var section in ModSectionsContainer.Children)
+                section.DeselectAll(true);
         }
 
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);

From 1d3dff8c75988867dce9fd6124fdb08bcb84e344 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:41:01 +0900
Subject: [PATCH 07855/10326] Refactor ModDisplay flag usage

---
 osu.Game/Screens/Play/HUD/ModDisplay.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index ce1a8a3205..052484afc4 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -113,14 +113,10 @@ namespace osu.Game.Screens.Play.HUD
             else
                 unrankedText.Hide();
 
-            if (ExpandOnAppear)
-            {
-                expand();
-                using (iconsContainer.BeginDelayedSequence(1200))
-                    contract();
-            }
-            else
-                iconsContainer.TransformSpacingTo(new Vector2(-25, 0));
+            expand();
+
+            using (iconsContainer.BeginDelayedSequence(ExpandOnAppear ? 1200 : 0))
+                contract();
         }
 
         private void expand()

From 53cfc3bc6ea4ddda9b8faf32a97b954e5a09c4f9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:42:45 +0900
Subject: [PATCH 07856/10326] Make ModIcon a bit more safe

---
 osu.Game/Rulesets/UI/ModIcon.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 981fe7f4a6..2ff59f4d1a 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.UI
             {
                 mod = value;
 
-                if (LoadState >= LoadState.Ready)
+                if (IsLoaded)
                     updateMod(value);
             }
         }
@@ -98,13 +98,15 @@ namespace osu.Game.Rulesets.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            updateMod(mod);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Selected.BindValueChanged(_ => updateColour(), true);
+
+            Selected.BindValueChanged(_ => updateColour());
+
+            updateMod(mod);
         }
 
         private void updateMod(Mod value)

From 173e20938cd0b87fc47747cc13b8deba60bb9bea Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:49:58 +0900
Subject: [PATCH 07857/10326] Revert changes to ModDisplay

---
 .../Multiplayer/Participants/ParticipantPanel.cs           | 1 -
 osu.Game/Screens/Play/HUD/ModDisplay.cs                    | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 8b907066a8..8036e5f702 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -139,7 +139,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                     Scale = new Vector2(0.5f),
                                     ExpansionMode = ExpansionMode.AlwaysContracted,
                                     DisplayUnrankedText = false,
-                                    ExpandOnAppear = false
                                 }
                             },
                             userStateDisplay = new StateDisplay
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 052484afc4..68d019bf71 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -26,11 +26,6 @@ namespace osu.Game.Screens.Play.HUD
 
         public ExpansionMode ExpansionMode = ExpansionMode.ExpandOnHover;
 
-        /// <summary>
-        /// Whether the mods should initially appear expanded, before potentially contracting into their final expansion state (depending on <see cref="ExpansionMode"/>).
-        /// </summary>
-        public bool ExpandOnAppear = true;
-
         private readonly Bindable<IReadOnlyList<Mod>> current = new Bindable<IReadOnlyList<Mod>>();
 
         public Bindable<IReadOnlyList<Mod>> Current
@@ -115,7 +110,7 @@ namespace osu.Game.Screens.Play.HUD
 
             expand();
 
-            using (iconsContainer.BeginDelayedSequence(ExpandOnAppear ? 1200 : 0))
+            using (iconsContainer.BeginDelayedSequence(1200))
                 contract();
         }
 

From 4194c9308eedc24e5ad6cc6315eb945e0838a7a8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:50:05 +0900
Subject: [PATCH 07858/10326] Add xmldoc

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 087990d3f8..b20c2d9d19 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -288,7 +288,7 @@ namespace osu.Game.Overlays.Mods
                                             Vertical = 15,
                                             Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING
                                         },
-                                        Children = new Drawable[]
+                                        Children = new[]
                                         {
                                             DeselectAllButton = new TriangleButton
                                             {
@@ -509,6 +509,10 @@ namespace osu.Game.Overlays.Mods
             refreshSelectedMods();
         }
 
+        /// <summary>
+        /// Invoked when a new <see cref="Mod"/> has been selected.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> that has been selected.</param>
         protected virtual void OnModSelected(Mod mod)
         {
         }

From 0bce9d68335d78f9c9286af6520e330f3d3f5c59 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:54:27 +0900
Subject: [PATCH 07859/10326] Clear freemods when ruleset is changed

---
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index b0062720e0..c58632c500 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -60,6 +60,13 @@ namespace osu.Game.Screens.OnlinePlay
 
             freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
             FooterPanels.Add(freeModSelectOverlay);
+
+            Ruleset.BindValueChanged(onRulesetChanged);
+        }
+
+        private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
+        {
+            freeMods.Value = Array.Empty<Mod>();
         }
 
         protected sealed override bool OnStart()

From 80d88024d6bbca6db1f9ca2765340bb765f5ae07 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 14:13:50 +0900
Subject: [PATCH 07860/10326] Add basic test coverage of CheckValidForGameplay
 function

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index fdb441343a..88eee5449c 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.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.Collections.Generic;
+using System.Linq;
 using Moq;
 using NUnit.Framework;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Utils;
 
 namespace osu.Game.Tests.Mods
@@ -60,5 +64,29 @@ namespace osu.Game.Tests.Mods
             var mod = new Mock<Mod>();
             Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
         }
+
+        // test incompatible pair.
+        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModHalfTime) }, new[] { typeof(OsuModDoubleTime), typeof(OsuModHalfTime) })]
+        // test incompatible pair with derived class.
+        [TestCase(new[] { typeof(OsuModNightcore), typeof(OsuModHalfTime) }, new[] { typeof(OsuModNightcore), typeof(OsuModHalfTime) })]
+        // test system mod.
+        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModTouchDevice) }, new[] { typeof(OsuModTouchDevice) })]
+        // test valid.
+        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModHardRock) }, null)]
+        public void TestInvalidModScenarios(Type[] input, Type[] expectedInvalid)
+        {
+            List<Mod> inputMods = new List<Mod>();
+            foreach (var t in input)
+                inputMods.Add((Mod)Activator.CreateInstance(t));
+
+            bool isValid = ModUtils.CheckValidForGameplay(inputMods, out var invalid);
+
+            Assert.That(isValid, Is.EqualTo(expectedInvalid == null));
+
+            if (isValid)
+                Assert.IsNull(invalid);
+            else
+                Assert.That(invalid?.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid));
+        }
     }
 }

From 1c645601d41491004c96903231c61ce5a163c7b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 14:14:31 +0900
Subject: [PATCH 07861/10326] Fix typo in xmldoc

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

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 9e638d4f2f..2146abacb6 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Utils
         /// Check the provided combination of mods are valid for a local gameplay session.
         /// </summary>
         /// <param name="mods">The mods to check.</param>
-        /// <param name="invalidMods">Invalid mods, if any where found. Can be null if all mods were valid.</param>
+        /// <param name="invalidMods">Invalid mods, if any were found. Can be null if all mods were valid.</param>
         /// <returns>Whether the input mods were all valid. If false, <paramref name="invalidMods"/> will contain all invalid entries.</returns>
         public static bool CheckValidForGameplay(IEnumerable<Mod> mods, out Mod[]? invalidMods)
         {

From ed63b571d2185d4b3e86d77a08c0f9ce656f819c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:16:26 +0900
Subject: [PATCH 07862/10326] Add "new" override for ScrollToEnd To
 UserTrackingScrollContainer

---
 osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
index b8ce34b204..be33c231c9 100644
--- a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
@@ -45,5 +45,11 @@ namespace osu.Game.Graphics.Containers
             UserScrolling = false;
             base.ScrollTo(value, animated, distanceDecay);
         }
+
+        public new void ScrollToEnd(bool animated = true, bool allowDuringDrag = false)
+        {
+            UserScrolling = false;
+            base.ScrollToEnd(animated, allowDuringDrag);
+        }
     }
 }

From 398ab9c2c2283a8bad2dd2bf513103a606868e89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:16:10 +0900
Subject: [PATCH 07863/10326] Use UserTrackingScrollContainer instead

---
 .../Online/TestSceneStandAloneChatDisplay.cs  |  2 +-
 osu.Game/Overlays/Chat/DrawableChannel.cs     | 32 ++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 8ea05784e9..e7669262fe 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Tests.Visual.Online
 
             protected DrawableChannel DrawableChannel => InternalChildren.OfType<DrawableChannel>().First();
 
-            protected OsuScrollContainer ScrollContainer => (OsuScrollContainer)((Container)DrawableChannel.Child).Child;
+            protected UserTrackingScrollContainer ScrollContainer => (UserTrackingScrollContainer)((Container)DrawableChannel.Child).Child;
 
             public FillFlowContainer FillFlow => (FillFlowContainer)ScrollContainer.Child;
 
diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index db6a27bf8c..1d021b331a 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -16,6 +16,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Chat
@@ -147,8 +148,8 @@ namespace osu.Game.Overlays.Chat
 
             // due to the scroll adjusts from old messages removal above, a scroll-to-end must be enforced,
             // to avoid making the container think the user has scrolled back up and unwantedly disable auto-scrolling.
-            if (scroll.ShouldAutoScroll || newMessages.Any(m => m is LocalMessage))
-                ScheduleAfterChildren(() => scroll.ScrollToEnd());
+            if (newMessages.Any(m => m is LocalMessage))
+                scroll.ScrollToEnd();
         });
 
         private void pendingMessageResolved(Message existing, Message updated) => Schedule(() =>
@@ -239,7 +240,7 @@ namespace osu.Game.Overlays.Chat
         /// <summary>
         /// An <see cref="OsuScrollContainer"/> with functionality to automatically scroll whenever the maximum scrollable distance increases.
         /// </summary>
-        private class ChannelScrollContainer : OsuScrollContainer
+        private class ChannelScrollContainer : UserTrackingScrollContainer
         {
             /// <summary>
             /// The chat will be automatically scrolled to end if and only if
@@ -250,21 +251,30 @@ namespace osu.Game.Overlays.Chat
 
             private float? lastExtent;
 
-            /// <summary>
-            /// Whether this container should automatically scroll to end on the next call to <see cref="UpdateAfterChildren"/>.
-            /// </summary>
-            public bool ShouldAutoScroll { get; private set; } = true;
+            protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
+            {
+                base.OnUserScroll(value, animated, distanceDecay);
+                lastExtent = null;
+            }
 
             protected override void UpdateAfterChildren()
             {
                 base.UpdateAfterChildren();
 
-                if ((lastExtent == null || ScrollableExtent > lastExtent) && ShouldAutoScroll)
-                    ScrollToEnd();
+                // If the user has scrolled to the bottom of the container, we should resume tracking new content.
+                bool cancelUserScroll = UserScrolling && IsScrolledToEnd(auto_scroll_leniency);
 
-                ShouldAutoScroll = IsScrolledToEnd(auto_scroll_leniency);
+                // If the user hasn't overridden our behaviour and there has been new content added to the container, we should update our scroll position to track it.
+                bool requiresScrollUpdate = !UserScrolling && (lastExtent == null || Precision.AlmostBigger(ScrollableExtent, lastExtent.Value));
 
-                lastExtent = ScrollableExtent;
+                if (cancelUserScroll || requiresScrollUpdate)
+                {
+                    ScheduleAfterChildren(() =>
+                    {
+                        ScrollToEnd();
+                        lastExtent = ScrollableExtent;
+                    });
+                }
             }
         }
     }

From bb0753f68d79860b0631938dbbea7b9cd9ab2210 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:44:03 +0900
Subject: [PATCH 07864/10326] Use a better method of cancelling user scroll

---
 .../Containers/UserTrackingScrollContainer.cs        |  2 ++
 osu.Game/Overlays/Chat/DrawableChannel.cs            | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
index be33c231c9..17506ce0f5 100644
--- a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public bool UserScrolling { get; private set; }
 
+        public void CancelUserScroll() => UserScrolling = false;
+
         public UserTrackingScrollContainer()
         {
         }
diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 1d021b331a..de3057e9dc 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -262,17 +262,21 @@ namespace osu.Game.Overlays.Chat
                 base.UpdateAfterChildren();
 
                 // If the user has scrolled to the bottom of the container, we should resume tracking new content.
-                bool cancelUserScroll = UserScrolling && IsScrolledToEnd(auto_scroll_leniency);
+                if (UserScrolling && IsScrolledToEnd(auto_scroll_leniency))
+                    CancelUserScroll();
 
                 // If the user hasn't overridden our behaviour and there has been new content added to the container, we should update our scroll position to track it.
                 bool requiresScrollUpdate = !UserScrolling && (lastExtent == null || Precision.AlmostBigger(ScrollableExtent, lastExtent.Value));
 
-                if (cancelUserScroll || requiresScrollUpdate)
+                if (requiresScrollUpdate)
                 {
                     ScheduleAfterChildren(() =>
                     {
-                        ScrollToEnd();
-                        lastExtent = ScrollableExtent;
+                        if (!UserScrolling)
+                        {
+                            ScrollToEnd();
+                            lastExtent = ScrollableExtent;
+                        }
                     });
                 }
             }

From 3670bd40c2c8dee50cdbc4ab3a61cf412c603b15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:44:11 +0900
Subject: [PATCH 07865/10326] Add test coverage of user scroll overriding

---
 .../Online/TestSceneStandAloneChatDisplay.cs  | 82 +++++++++++++++----
 1 file changed, 66 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index e7669262fe..0e1c90f88e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -12,10 +12,11 @@ using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays.Chat;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneStandAloneChatDisplay : OsuTestScene
+    public class TestSceneStandAloneChatDisplay : OsuManualInputManagerTestScene
     {
         private readonly User admin = new User
         {
@@ -128,7 +129,7 @@ namespace osu.Game.Tests.Visual.Online
                 Timestamp = DateTimeOffset.Now
             }));
 
-            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+            checkScrolledToBottom();
 
             const int messages_per_call = 10;
             AddRepeatStep("add many messages", () =>
@@ -157,7 +158,7 @@ namespace osu.Game.Tests.Visual.Online
                 return true;
             });
 
-            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+            checkScrolledToBottom();
         }
 
         /// <summary>
@@ -165,6 +166,58 @@ namespace osu.Game.Tests.Visual.Online
         /// </summary>
         [Test]
         public void TestMessageWrappingKeepsAutoScrolling()
+        {
+            fillChat();
+
+            // send message with short words for text wrapping to occur when contracting chat.
+            sendMessage();
+
+            AddStep("contract chat", () => chatDisplay.Width -= 100);
+            checkScrolledToBottom();
+
+            AddStep("send another message", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
+            {
+                Sender = admin,
+                Content = "As we were saying...",
+            }));
+
+            checkScrolledToBottom();
+        }
+
+        [Test]
+        public void TestUserScrollOverride()
+        {
+            fillChat();
+
+            sendMessage();
+            checkScrolledToBottom();
+
+            AddStep("User scroll up", () =>
+            {
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre);
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre + new Vector2(0, chatDisplay.ScreenSpaceDrawQuad.Height));
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            checkNotScrolledToBottom();
+            sendMessage();
+            checkNotScrolledToBottom();
+
+            AddRepeatStep("User scroll to bottom", () =>
+            {
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre);
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre - new Vector2(0, chatDisplay.ScreenSpaceDrawQuad.Height));
+                InputManager.ReleaseButton(MouseButton.Left);
+            }, 5);
+
+            checkScrolledToBottom();
+            sendMessage();
+            checkScrolledToBottom();
+        }
+
+        private void fillChat()
         {
             AddStep("fill chat", () =>
             {
@@ -178,27 +231,24 @@ namespace osu.Game.Tests.Visual.Online
                 }
             });
 
-            AddAssert("ensure scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+            checkScrolledToBottom();
+        }
 
-            // send message with short words for text wrapping to occur when contracting chat.
+        private void sendMessage()
+        {
             AddStep("send lorem ipsum", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = longUsernameUser,
                 Content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce et bibendum velit.",
             }));
-
-            AddStep("contract chat", () => chatDisplay.Width -= 100);
-            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
-
-            AddStep("send another message", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
-            {
-                Sender = admin,
-                Content = "As we were saying...",
-            }));
-
-            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
         }
 
+        private void checkScrolledToBottom() =>
+            AddUntilStep("is scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+
+        private void checkNotScrolledToBottom() =>
+            AddUntilStep("not scrolled to bottom", () => !chatDisplay.ScrolledToBottom);
+
         private class TestStandAloneChatDisplay : StandAloneChatDisplay
         {
             public TestStandAloneChatDisplay(bool textbox = false)

From b3105fb2920ac3f3c24e144550cbc598bbcf0cf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:46:26 +0900
Subject: [PATCH 07866/10326] Add coverage of local echo messages performing
 automatic scrolling

---
 .../Online/TestSceneStandAloneChatDisplay.cs  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 0e1c90f88e..ee01eb5f3a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -217,6 +217,33 @@ namespace osu.Game.Tests.Visual.Online
             checkScrolledToBottom();
         }
 
+        [Test]
+        public void TestLocalEchoMessageResetsScroll()
+        {
+            fillChat();
+
+            sendMessage();
+            checkScrolledToBottom();
+
+            AddStep("User scroll up", () =>
+            {
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre);
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre + new Vector2(0, chatDisplay.ScreenSpaceDrawQuad.Height));
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            checkNotScrolledToBottom();
+            sendMessage();
+            checkNotScrolledToBottom();
+
+            sendLocalMessage();
+            checkScrolledToBottom();
+
+            sendMessage();
+            checkScrolledToBottom();
+        }
+
         private void fillChat()
         {
             AddStep("fill chat", () =>
@@ -243,6 +270,15 @@ namespace osu.Game.Tests.Visual.Online
             }));
         }
 
+        private void sendLocalMessage()
+        {
+            AddStep("send local echo", () => testChannel.AddLocalEcho(new LocalEchoMessage()
+            {
+                Sender = longUsernameUser,
+                Content = "This is a local echo message.",
+            }));
+        }
+
         private void checkScrolledToBottom() =>
             AddUntilStep("is scrolled to bottom", () => chatDisplay.ScrolledToBottom);
 

From a76314a8760f98474067decfa23c8ed980def836 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:57:17 +0900
Subject: [PATCH 07867/10326] Use Update instead of UpdateAfterChildren (no
 need for the latter)

---
 osu.Game/Overlays/Chat/DrawableChannel.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index de3057e9dc..86ce724390 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -257,9 +257,9 @@ namespace osu.Game.Overlays.Chat
                 lastExtent = null;
             }
 
-            protected override void UpdateAfterChildren()
+            protected override void Update()
             {
-                base.UpdateAfterChildren();
+                base.Update();
 
                 // If the user has scrolled to the bottom of the container, we should resume tracking new content.
                 if (UserScrolling && IsScrolledToEnd(auto_scroll_leniency))
@@ -270,7 +270,8 @@ namespace osu.Game.Overlays.Chat
 
                 if (requiresScrollUpdate)
                 {
-                    ScheduleAfterChildren(() =>
+                    // Schedule required to allow FillFlow to be the correct size.
+                    Schedule(() =>
                     {
                         if (!UserScrolling)
                         {

From 54c0bdf7d3174ec1b6ee5ba61abf096492d7fa2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:04:42 +0900
Subject: [PATCH 07868/10326] Fix PlaylistLoungeTestScene appearing very narrow

---
 .../Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
index 008c862cc3..730bbbb397 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
@@ -28,12 +28,7 @@ namespace osu.Game.Tests.Visual.Playlists
         {
             base.SetUpSteps();
 
-            AddStep("push screen", () => LoadScreen(loungeScreen = new PlaylistsLoungeSubScreen
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Width = 0.5f,
-            }));
+            AddStep("push screen", () => LoadScreen(loungeScreen = new PlaylistsLoungeSubScreen()));
 
             AddUntilStep("wait for present", () => loungeScreen.IsCurrentScreen());
         }

From 3002fef05eebf7c7102ff2e07838347b232d4749 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:11:13 +0900
Subject: [PATCH 07869/10326] Remove empty parenthesis

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index ee01eb5f3a..01e67b1681 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -272,7 +272,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private void sendLocalMessage()
         {
-            AddStep("send local echo", () => testChannel.AddLocalEcho(new LocalEchoMessage()
+            AddStep("send local echo", () => testChannel.AddLocalEcho(new LocalEchoMessage
             {
                 Sender = longUsernameUser,
                 Content = "This is a local echo message.",

From 43052991f8120b51b6cce28f68f07f9250b09b47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:18:55 +0900
Subject: [PATCH 07870/10326] Remove unused using statement

---
 .../Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
index 730bbbb397..618447eae2 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;

From bdc05af4b7d3fcf43d919c594991f679410ae18d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:30:45 +0900
Subject: [PATCH 07871/10326] Make playlist settings area taller to better
 match screen aspect ratio

---
 .../OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index 01f9920609..ced6d1c5db 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -200,7 +200,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                             Child = new GridContainer
                                                             {
                                                                 RelativeSizeAxes = Axes.X,
-                                                                Height = 300,
+                                                                Height = 500,
                                                                 Content = new[]
                                                                 {
                                                                     new Drawable[]

From fb52ac8c69792e0101c7f612904cb562b3d1e8c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:57:08 +0900
Subject: [PATCH 07872/10326] Share remove from playlist button design with
 adjacent download button

---
 .../Graphics/UserInterface/DownloadButton.cs  | 60 +++++++------------
 osu.Game/Graphics/UserInterface/GrayButton.cs | 48 +++++++++++++++
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    | 26 +++++++-
 3 files changed, 93 insertions(+), 41 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/GrayButton.cs

diff --git a/osu.Game/Graphics/UserInterface/DownloadButton.cs b/osu.Game/Graphics/UserInterface/DownloadButton.cs
index 5168ff646b..7a8db158c1 100644
--- a/osu.Game/Graphics/UserInterface/DownloadButton.cs
+++ b/osu.Game/Graphics/UserInterface/DownloadButton.cs
@@ -4,54 +4,38 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Online;
 using osuTK;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class DownloadButton : OsuAnimatedButton
+    public class DownloadButton : GrayButton
     {
-        public readonly Bindable<DownloadState> State = new Bindable<DownloadState>();
-
-        private readonly SpriteIcon icon;
-        private readonly SpriteIcon checkmark;
-        private readonly Box background;
-
         [Resolved]
         private OsuColour colours { get; set; }
 
+        public readonly Bindable<DownloadState> State = new Bindable<DownloadState>();
+
+        private SpriteIcon checkmark;
+
         public DownloadButton()
+            : base(FontAwesome.Solid.Download)
         {
-            Children = new Drawable[]
-            {
-                background = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Depth = float.MaxValue
-                },
-                icon = new SpriteIcon
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(13),
-                    Icon = FontAwesome.Solid.Download,
-                },
-                checkmark = new SpriteIcon
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    X = 8,
-                    Size = Vector2.Zero,
-                    Icon = FontAwesome.Solid.Check,
-                }
-            };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
+            AddInternal(checkmark = new SpriteIcon
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                X = 8,
+                Size = Vector2.Zero,
+                Icon = FontAwesome.Solid.Check,
+            });
+
             State.BindValueChanged(updateState, true);
         }
 
@@ -60,27 +44,27 @@ namespace osu.Game.Graphics.UserInterface
             switch (state.NewValue)
             {
                 case DownloadState.NotDownloaded:
-                    background.FadeColour(colours.Gray4, 500, Easing.InOutExpo);
-                    icon.MoveToX(0, 500, Easing.InOutExpo);
+                    Background.FadeColour(colours.Gray4, 500, Easing.InOutExpo);
+                    Icon.MoveToX(0, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
                     TooltipText = "Download";
                     break;
 
                 case DownloadState.Downloading:
-                    background.FadeColour(colours.Blue, 500, Easing.InOutExpo);
-                    icon.MoveToX(0, 500, Easing.InOutExpo);
+                    Background.FadeColour(colours.Blue, 500, Easing.InOutExpo);
+                    Icon.MoveToX(0, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
                     TooltipText = "Downloading...";
                     break;
 
                 case DownloadState.Importing:
-                    background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
+                    Background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
                     TooltipText = "Importing";
                     break;
 
                 case DownloadState.LocallyAvailable:
-                    background.FadeColour(colours.Green, 500, Easing.InOutExpo);
-                    icon.MoveToX(-8, 500, Easing.InOutExpo);
+                    Background.FadeColour(colours.Green, 500, Easing.InOutExpo);
+                    Icon.MoveToX(-8, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(new Vector2(13), 500, Easing.InOutExpo);
                     break;
             }
diff --git a/osu.Game/Graphics/UserInterface/GrayButton.cs b/osu.Game/Graphics/UserInterface/GrayButton.cs
new file mode 100644
index 0000000000..dd05701545
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/GrayButton.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class GrayButton : OsuAnimatedButton
+    {
+        protected SpriteIcon Icon;
+        protected Box Background;
+
+        private readonly IconUsage icon;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public GrayButton(IconUsage icon)
+        {
+            this.icon = icon;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Children = new Drawable[]
+            {
+                Background = new Box
+                {
+                    Colour = colours.Gray4,
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = float.MaxValue
+                },
+                Icon = new SpriteIcon
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(13),
+                    Icon = icon,
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index f8982582d5..4316a9508e 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -214,7 +214,8 @@ namespace osu.Game.Screens.OnlinePlay
                     Origin = Anchor.CentreRight,
                     Direction = FillDirection.Horizontal,
                     AutoSizeAxes = Axes.Both,
-                    X = -18,
+                    Spacing = new Vector2(5),
+                    X = -10,
                     ChildrenEnumerable = CreateButtons()
                 }
             }
@@ -225,16 +226,35 @@ namespace osu.Game.Screens.OnlinePlay
             {
                 new PlaylistDownloadButton(Item)
                 {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Size = new Vector2(50, 30)
                 },
-                new IconButton
+                new PlaylistRemoveButton
                 {
-                    Icon = FontAwesome.Solid.MinusSquare,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(30, 30),
                     Alpha = allowEdit ? 1 : 0,
                     Action = () => RequestDeletion?.Invoke(Model),
                 },
             };
 
+        public class PlaylistRemoveButton : GrayButton
+        {
+            public PlaylistRemoveButton()
+                : base(FontAwesome.Solid.MinusSquare)
+            {
+                TooltipText = "Remove from playlist";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Icon.Scale = new Vector2(0.8f);
+            }
+        }
+
         protected override bool OnClick(ClickEvent e)
         {
             if (allowSelection)

From 6d9ac4d0f01bfefccd38b399ca9158bd4415ce23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:57:27 +0900
Subject: [PATCH 07873/10326] Increase darkness of gradient on buttons to make
 text readability (slightly) better

---
 .../TestSceneDrawableRoomPlaylist.cs            | 17 ++++++++++++++++-
 .../OnlinePlay/DrawableRoomPlaylistItem.cs      | 14 ++++----------
 2 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 874c1694eb..16f6723e2d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Tests.Beatmaps;
+using osu.Game.Users;
 using osuTK;
 using osuTK.Input;
 
@@ -278,7 +279,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     playlist.Items.Add(new PlaylistItem
                     {
                         ID = i,
-                        Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                        Beatmap =
+                        {
+                            Value = i % 2 == 1
+                                ? new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo
+                                : new BeatmapInfo
+                                {
+                                    Metadata = new BeatmapMetadata
+                                    {
+                                        Artist = "Artist",
+                                        Author = new User { Username = "Creator name here" },
+                                        Title = "Long title used to check background colour",
+                                    },
+                                    BeatmapSet = new BeatmapSetInfo()
+                                }
+                        },
                         Ruleset = { Value = new OsuRuleset().RulesetInfo },
                         RequiredMods =
                         {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 4316a9508e..844758b262 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -342,20 +342,14 @@ namespace osu.Game.Screens.OnlinePlay
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.9f)),
-                                Width = 0.05f,
+                                Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.7f)),
+                                Width = 0.4f,
                             },
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.9f), new Color4(0f, 0f, 0f, 0.1f)),
-                                Width = 0.2f,
-                            },
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.1f), new Color4(0, 0, 0, 0)),
-                                Width = 0.05f,
+                                Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.7f), new Color4(0, 0, 0, 0.4f)),
+                                Width = 0.4f,
                             },
                         }
                     }

From 40233fb47cba94b9b48eafdf28944036c301e347 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 17:09:59 +0900
Subject: [PATCH 07874/10326] Make font bolder

---
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    | 155 +++++++++---------
 1 file changed, 80 insertions(+), 75 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 844758b262..a7015ba1c4 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -124,102 +124,107 @@ namespace osu.Game.Screens.OnlinePlay
             modDisplay.Current.Value = requiredMods.ToArray();
         }
 
-        protected override Drawable CreateContent() => maskingContainer = new Container
+        protected override Drawable CreateContent()
         {
-            RelativeSizeAxes = Axes.X,
-            Height = 50,
-            Masking = true,
-            CornerRadius = 10,
-            Children = new Drawable[]
+            Action<SpriteText> fontParameters = s => s.Font = OsuFont.Default.With(weight: FontWeight.SemiBold);
+
+            return maskingContainer = new Container
             {
-                new Box // A transparent box that forces the border to be drawn if the panel background is opaque
+                RelativeSizeAxes = Axes.X,
+                Height = 50,
+                Masking = true,
+                CornerRadius = 10,
+                Children = new Drawable[]
                 {
-                    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[]
+                    new Box // A transparent box that forces the border to be drawn if the panel background is opaque
                     {
-                        difficultyIconContainer = new Container
+                        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[]
                         {
-                            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[]
+                            difficultyIconContainer = new Container
                             {
-                                beatmapText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
-                                new FillFlowContainer
+                                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[]
                                 {
-                                    AutoSizeAxes = Axes.Both,
-                                    Direction = FillDirection.Horizontal,
-                                    Spacing = new Vector2(10f, 0),
-                                    Children = new Drawable[]
+                                    beatmapText = new LinkFlowContainer(fontParameters) { AutoSizeAxes = Axes.Both },
+                                    new FillFlowContainer
                                     {
-                                        new FillFlowContainer
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Horizontal,
+                                        Spacing = new Vector2(10f, 0),
+                                        Children = new Drawable[]
                                         {
-                                            AutoSizeAxes = Axes.Both,
-                                            Direction = FillDirection.Horizontal,
-                                            Spacing = new Vector2(10f, 0),
-                                            Children = new Drawable[]
+                                            new FillFlowContainer
                                             {
-                                                authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
-                                                explicitContentPill = new ExplicitContentBeatmapPill
+                                                AutoSizeAxes = Axes.Both,
+                                                Direction = FillDirection.Horizontal,
+                                                Spacing = new Vector2(10f, 0),
+                                                Children = new Drawable[]
                                                 {
-                                                    Alpha = 0f,
-                                                    Anchor = Anchor.CentreLeft,
-                                                    Origin = Anchor.CentreLeft,
-                                                    Margin = new MarginPadding { Top = 3f },
-                                                }
+                                                    authorText = new LinkFlowContainer(fontParameters) { AutoSizeAxes = Axes.Both },
+                                                    explicitContentPill = new ExplicitContentBeatmapPill
+                                                    {
+                                                        Alpha = 0f,
+                                                        Anchor = Anchor.CentreLeft,
+                                                        Origin = Anchor.CentreLeft,
+                                                        Margin = new MarginPadding { Top = 3f },
+                                                    }
+                                                },
                                             },
-                                        },
-                                        new Container
-                                        {
-                                            Anchor = Anchor.CentreLeft,
-                                            Origin = Anchor.CentreLeft,
-                                            AutoSizeAxes = Axes.Both,
-                                            Child = modDisplay = new ModDisplay
+                                            new Container
                                             {
-                                                Scale = new Vector2(0.4f),
-                                                DisplayUnrankedText = false,
-                                                ExpansionMode = ExpansionMode.AlwaysExpanded
+                                                Anchor = Anchor.CentreLeft,
+                                                Origin = Anchor.CentreLeft,
+                                                AutoSizeAxes = Axes.Both,
+                                                Child = modDisplay = new ModDisplay
+                                                {
+                                                    Scale = new Vector2(0.4f),
+                                                    DisplayUnrankedText = false,
+                                                    ExpansionMode = ExpansionMode.AlwaysExpanded
+                                                }
                                             }
                                         }
                                     }
                                 }
                             }
                         }
+                    },
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Direction = FillDirection.Horizontal,
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(5),
+                        X = -10,
+                        ChildrenEnumerable = CreateButtons()
                     }
-                },
-                new FillFlowContainer
-                {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Direction = FillDirection.Horizontal,
-                    AutoSizeAxes = Axes.Both,
-                    Spacing = new Vector2(5),
-                    X = -10,
-                    ChildrenEnumerable = CreateButtons()
                 }
-            }
-        };
+            };
+        }
 
         protected virtual IEnumerable<Drawable> CreateButtons() =>
             new Drawable[]

From bc8a4f411159140371596546144fd56e34bc63d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 17:21:46 +0900
Subject: [PATCH 07875/10326] Update test handling

---
 .../Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 16f6723e2d..960aad10c6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -11,8 +11,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
@@ -242,7 +242,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         private void moveToItem(int index, Vector2? offset = null)
-            => AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index), offset));
+            => AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<DifficultyIcon>().ElementAt(index), offset));
 
         private void moveToDragger(int index, Vector2? offset = null) => AddStep($"move mouse to dragger {index}", () =>
         {
@@ -253,7 +253,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         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);
+            InputManager.MoveMouseTo(item.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(0), offset);
         });
 
         private void assertHandleVisibility(int index, bool visible)
@@ -261,7 +261,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 () => (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);
+            => AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", () => (playlist.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
 
         private void createPlaylist(bool allowEdit, bool allowSelection)
         {

From 7c29386717cc7f8c96668dc9fb4d970c7b43a17a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:01:33 +0900
Subject: [PATCH 07876/10326] Add failing tests

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index fdb441343a..b602c082bf 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -47,6 +47,29 @@ namespace osu.Game.Tests.Mods
             Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
         }
 
+        [Test]
+        public void TestCompatibleMods()
+        {
+            var mod1 = new Mock<Mod>();
+            var mod2 = new Mock<Mod>();
+
+            // Test both orderings.
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.True);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.True);
+        }
+
+        [Test]
+        public void TestIncompatibleThroughBaseType()
+        {
+            var mod1 = new Mock<Mod>();
+            var mod2 = new Mock<Mod>();
+            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType().BaseType });
+
+            // Test both orderings.
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
+        }
+
         [Test]
         public void TestAllowedThroughMostDerivedType()
         {

From 8232d9d2fe667a201aded46f4df1dba44b93ae7e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:01:38 +0900
Subject: [PATCH 07877/10326] Fix incorrect implementation

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

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 808dba2900..34bc0faca4 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Utils
                 // Add the new mod types, checking whether any match the incompatible types.
                 foreach (var t in mod.GetType().EnumerateBaseTypes())
                 {
-                    if (incomingTypes.Contains(t))
+                    if (incompatibleTypes.Contains(t))
                         return false;
 
                     incomingTypes.Add(t);

From d0655c21c6db7e73b006a837b276d2efd0492e27 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:18:57 +0900
Subject: [PATCH 07878/10326] Simplify implementation of CheckCompatibleSet

---
 osu.Game/Utils/ModUtils.cs | 40 ++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 34bc0faca4..a9271db1b5 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Extensions.TypeExtensions;
 using osu.Game.Rulesets.Mods;
 
 #nullable enable
@@ -29,7 +28,7 @@ namespace osu.Game.Utils
         {
             // Prevent multiple-enumeration.
             var combinationList = combination as ICollection<Mod> ?? combination.ToArray();
-            return CheckCompatibleSet(combinationList) && CheckAllowed(combinationList, allowedTypes);
+            return CheckCompatibleSet(combinationList, out _) && CheckAllowed(combinationList, allowedTypes);
         }
 
         /// <summary>
@@ -38,32 +37,31 @@ namespace osu.Game.Utils
         /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
         /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
         public static bool CheckCompatibleSet(IEnumerable<Mod> combination)
+            => CheckCompatibleSet(combination, out _);
+
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s in a combination are compatible with each-other.
+        /// </summary>
+        /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
+        /// <param name="invalidMods">Any invalid mods in the set.</param>
+        /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
+        public static bool CheckCompatibleSet(IEnumerable<Mod> combination, out List<Mod>? invalidMods)
         {
-            var incompatibleTypes = new HashSet<Type>();
-            var incomingTypes = new HashSet<Type>();
+            invalidMods = null;
 
-            foreach (var mod in combination.SelectMany(FlattenMod))
+            foreach (var mod in combination)
             {
-                // Add the new mod incompatibilities, checking whether any match the existing mod types.
-                foreach (var t in mod.IncompatibleMods)
+                foreach (var type in mod.IncompatibleMods)
                 {
-                    if (incomingTypes.Contains(t))
-                        return false;
-
-                    incompatibleTypes.Add(t);
-                }
-
-                // Add the new mod types, checking whether any match the incompatible types.
-                foreach (var t in mod.GetType().EnumerateBaseTypes())
-                {
-                    if (incompatibleTypes.Contains(t))
-                        return false;
-
-                    incomingTypes.Add(t);
+                    foreach (var invalid in combination.Where(m => type.IsInstanceOfType(m)))
+                    {
+                        invalidMods ??= new List<Mod>();
+                        invalidMods.Add(invalid);
+                    }
                 }
             }
 
-            return true;
+            return invalidMods == null;
         }
 
         /// <summary>

From 1df412a03cde9c1ef9363fc1759f8942ea73ec94 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:31:08 +0900
Subject: [PATCH 07879/10326] Fix incorrect handling of multi-mod
 incompatibilities

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 25 ++++++++++++++++++++++++-
 osu.Game/Utils/ModUtils.cs          |  1 +
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index b602c082bf..7d3dea7ed5 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Mods
         }
 
         [Test]
-        public void TestIncompatibleThroughMultiMod()
+        public void TestMultiModIncompatibleWithTopLevel()
         {
             var mod1 = new Mock<Mod>();
 
@@ -47,6 +47,21 @@ namespace osu.Game.Tests.Mods
             Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
         }
 
+        [Test]
+        public void TestTopLevelIncompatibleWithMultiMod()
+        {
+            // The nested mod.
+            var mod1 = new Mock<CustomMod1>();
+            var multiMod = new MultiMod(new MultiMod(mod1.Object));
+
+            var mod2 = new Mock<CustomMod2>();
+            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { typeof(CustomMod1) });
+
+            // Test both orderings.
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { multiMod, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod2.Object, multiMod }), Is.False);
+        }
+
         [Test]
         public void TestCompatibleMods()
         {
@@ -83,5 +98,13 @@ namespace osu.Game.Tests.Mods
             var mod = new Mock<Mod>();
             Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
         }
+
+        public abstract class CustomMod1 : Mod
+        {
+        }
+
+        public abstract class CustomMod2 : Mod
+        {
+        }
     }
 }
diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index a9271db1b5..41f7b1b45c 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -47,6 +47,7 @@ namespace osu.Game.Utils
         /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
         public static bool CheckCompatibleSet(IEnumerable<Mod> combination, out List<Mod>? invalidMods)
         {
+            combination = FlattenMods(combination);
             invalidMods = null;
 
             foreach (var mod in combination)

From 9955e0289869be6a14cb67e762a75e9b49a599b1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:33:12 +0900
Subject: [PATCH 07880/10326] Make more tests use the custom mod classes

For safety purposes... In implementing the previous tests, I found that
using mod.Object.GetType() can lead to bad assertions since the same
ModProxy class is used for all mocked classes.
---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 40 ++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index 7d3dea7ed5..e4ded602aa 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -14,37 +14,37 @@ namespace osu.Game.Tests.Mods
         [Test]
         public void TestModIsCompatibleByItself()
         {
-            var mod = new Mock<Mod>();
+            var mod = new Mock<CustomMod1>();
             Assert.That(ModUtils.CheckCompatibleSet(new[] { mod.Object }));
         }
 
         [Test]
         public void TestIncompatibleThroughTopLevel()
         {
-            var mod1 = new Mock<Mod>();
-            var mod2 = new Mock<Mod>();
+            var mod1 = new Mock<CustomMod1>();
+            var mod2 = new Mock<CustomMod2>();
 
             mod1.Setup(m => m.IncompatibleMods).Returns(new[] { mod2.Object.GetType() });
 
             // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod2.Object, mod1.Object }), Is.False);
         }
 
         [Test]
         public void TestMultiModIncompatibleWithTopLevel()
         {
-            var mod1 = new Mock<Mod>();
+            var mod1 = new Mock<CustomMod1>();
 
             // The nested mod.
-            var mod2 = new Mock<Mod>();
+            var mod2 = new Mock<CustomMod2>();
             mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType() });
 
             var multiMod = new MultiMod(new MultiMod(mod2.Object));
 
             // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { multiMod, mod1.Object }), Is.False);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { multiMod, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod1.Object, multiMod }), Is.False);
         }
 
         [Test]
@@ -65,37 +65,37 @@ namespace osu.Game.Tests.Mods
         [Test]
         public void TestCompatibleMods()
         {
-            var mod1 = new Mock<Mod>();
-            var mod2 = new Mock<Mod>();
+            var mod1 = new Mock<CustomMod1>();
+            var mod2 = new Mock<CustomMod2>();
 
             // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.True);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.True);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod1.Object, mod2.Object }), Is.True);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod2.Object, mod1.Object }), Is.True);
         }
 
         [Test]
         public void TestIncompatibleThroughBaseType()
         {
-            var mod1 = new Mock<Mod>();
-            var mod2 = new Mock<Mod>();
-            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType().BaseType });
+            var mod1 = new Mock<CustomMod1>();
+            var mod2 = new Mock<CustomMod2>();
+            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { typeof(Mod) });
 
             // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod2.Object, mod1.Object }), Is.False);
         }
 
         [Test]
         public void TestAllowedThroughMostDerivedType()
         {
-            var mod = new Mock<Mod>();
+            var mod = new Mock<CustomMod1>();
             Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
         }
 
         [Test]
         public void TestNotAllowedThroughBaseType()
         {
-            var mod = new Mock<Mod>();
+            var mod = new Mock<CustomMod1>();
             Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
         }
 

From 12f52316cd2f198c0d649f41b46ef2975cfbb16d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:37:11 +0900
Subject: [PATCH 07881/10326] Prevent multiple enumeration

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

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 41f7b1b45c..9336add465 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Utils
         /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
         public static bool CheckCompatibleSet(IEnumerable<Mod> combination, out List<Mod>? invalidMods)
         {
-            combination = FlattenMods(combination);
+            combination = FlattenMods(combination).ToArray();
             invalidMods = null;
 
             foreach (var mod in combination)

From 052cf1abaedec23cf44022aedc3324dacd5a8168 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:42:02 +0900
Subject: [PATCH 07882/10326] Reuse existing method

---
 osu.Game/Utils/ModUtils.cs | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 05a07f0459..0eb30cbe36 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -88,40 +88,22 @@ namespace osu.Game.Utils
         /// <param name="mods">The mods to check.</param>
         /// <param name="invalidMods">Invalid mods, if any were found. Can be null if all mods were valid.</param>
         /// <returns>Whether the input mods were all valid. If false, <paramref name="invalidMods"/> will contain all invalid entries.</returns>
-        public static bool CheckValidForGameplay(IEnumerable<Mod> mods, out Mod[]? invalidMods)
+        public static bool CheckValidForGameplay(IEnumerable<Mod> mods, out List<Mod>? invalidMods)
         {
             mods = mods.ToArray();
 
-            List<Mod>? foundInvalid = null;
-
-            void addInvalid(Mod mod)
-            {
-                foundInvalid ??= new List<Mod>();
-                foundInvalid.Add(mod);
-            }
+            CheckCompatibleSet(mods, out invalidMods);
 
             foreach (var mod in mods)
             {
-                bool valid = mod.Type != ModType.System
-                             && mod.HasImplementation
-                             && !(mod is MultiMod);
-
-                if (!valid)
+                if (mod.Type == ModType.System || !mod.HasImplementation || mod is MultiMod)
                 {
-                    // if this mod was found as invalid, we can exclude it before potentially excluding more incompatible types.
-                    addInvalid(mod);
-                    continue;
-                }
-
-                foreach (var type in mod.IncompatibleMods)
-                {
-                    foreach (var invalid in mods.Where(m => type.IsInstanceOfType(m)))
-                        addInvalid(invalid);
+                    invalidMods ??= new List<Mod>();
+                    invalidMods.Add(mod);
                 }
             }
 
-            invalidMods = foundInvalid?.ToArray();
-            return foundInvalid == null;
+            return invalidMods == null;
         }
 
         /// <summary>

From 6fdaf025182f29e39243240dff05d85ac6820810 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 17:57:23 +0900
Subject: [PATCH 07883/10326] Hook up room-level max attempts to UI

---
 .../Screens/OnlinePlay/OnlinePlayComposite.cs |  3 ++
 .../PlaylistsMatchSettingsOverlay.cs          | 45 +++++++------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index 64792a32f3..b2f3e4a1d9 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(typeof(Room))]
         protected Bindable<int?> MaxParticipants { get; private set; }
 
+        [Resolved(typeof(Room))]
+        protected Bindable<int?> MaxAttempts { get; private set; }
+
         [Resolved(typeof(Room))]
         protected Bindable<DateTimeOffset?> EndDate { get; private set; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index 01f9920609..bf85ecf13d 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -42,15 +42,13 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
             public Action EditPlaylist;
 
-            public OsuTextBox NameField, MaxParticipantsField;
+            public OsuTextBox NameField, MaxParticipantsField, MaxAttemptsField;
             public OsuDropdown<TimeSpan> DurationField;
             public RoomAvailabilityPicker AvailabilityPicker;
-            public GameTypePicker TypePicker;
             public TriangleButton ApplyButton;
 
             public OsuSpriteText ErrorText;
 
-            private OsuSpriteText typeLabel;
             private LoadingLayer loadingLayer;
             private DrawableRoomPlaylist playlist;
             private OsuSpriteText playlistLength;
@@ -134,6 +132,15 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                                 }
                                                             }
                                                         },
+                                                        new Section("Allowed attempts (across all playlist items)")
+                                                        {
+                                                            Child = MaxAttemptsField = new SettingsNumberTextBox
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                TabbableContentContainer = this,
+                                                                PlaceholderText = "Unlimited",
+                                                            },
+                                                        },
                                                         new Section("Room visibility")
                                                         {
                                                             Alpha = disabled_alpha,
@@ -142,30 +149,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                                 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,
@@ -294,10 +277,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     loadingLayer = new LoadingLayer(true)
                 };
 
-                TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
                 RoomName.BindValueChanged(name => NameField.Text = name.NewValue, true);
                 Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
-                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 ?? TimeSpan.FromMinutes(30), true);
 
@@ -326,13 +307,17 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
                 RoomName.Value = NameField.Text;
                 Availability.Value = AvailabilityPicker.Current.Value;
-                Type.Value = TypePicker.Current.Value;
 
                 if (int.TryParse(MaxParticipantsField.Text, out int max))
                     MaxParticipants.Value = max;
                 else
                     MaxParticipants.Value = null;
 
+                if (int.TryParse(MaxAttemptsField.Text, out max))
+                    MaxAttempts.Value = max;
+                else
+                    MaxAttempts.Value = null;
+
                 Duration.Value = DurationField.Current.Value;
 
                 manager?.CreateRoom(currentRoom.Value, onSuccess, onError);

From 90acdd4361550d251ede8fc93db8edda2c5a38d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 18:06:52 +0900
Subject: [PATCH 07884/10326] Display the correct error message on score
 submission failure

The server will return a valid error message in most cases here. We may
eventually want to add some fallback message for cases an error may
occur that isn't of
[InvariantException](https://github.com/ppy/osu-web/blob/3169b33ccc4c540be5f20136393ad5f00d635ff9/app/Exceptions/InvariantException.php#L9-L10) type, but I'm not 100% sure
how to identify these just yet.
---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 2c3e7a12e2..7936ab8ecd 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             {
                 failed = true;
 
-                Logger.Error(e, "Failed to retrieve a score submission token.\n\nThis may happen if you are running an old or non-official release of osu! (ie. you are self-compiling).");
+                Logger.Log($"You are not able to submit a score: {e.Message}", LoggingTarget.Information, LogLevel.Important);
 
                 Schedule(() =>
                 {

From 96d20bf6072aa181b6fb5662ddc32024be2d61bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 18:24:51 +0900
Subject: [PATCH 07885/10326] Reduce height of ModeTypeInfo to match adjacent
 text sections

---
 osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
index 03b27b605c..2026106c42 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class ModeTypeInfo : OnlinePlayComposite
     {
-        private const float height = 30;
+        private const float height = 28;
         private const float transition_duration = 100;
 
         private Container drawableRuleset;

From 9b209d67dc83568751994c1af8a0713f19339979 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 18:44:13 +0900
Subject: [PATCH 07886/10326] Match size of participants text with host display

---
 osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
index 0d5ce65d5a..bc4506b78e 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
@@ -63,7 +63,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                         summary = new OsuSpriteText
                         {
                             Text = "0 participants",
-                            Font = OsuFont.GetFont(size: 14)
                         }
                     },
                 },

From fc3adaf6123e9f697b85d7c8fa566e111f1eb05b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 18:44:35 +0900
Subject: [PATCH 07887/10326] Show maximum attempt count in room display (when
 not unlimited)

---
 .../Components/RoomLocalUserInfo.cs           | 50 +++++++++++++++++++
 .../OnlinePlay/Lounge/Components/RoomInfo.cs  | 39 ++++++---------
 2 files changed, 66 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs

diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
new file mode 100644
index 0000000000..f52e59b0c8
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.OnlinePlay.Components
+{
+    public class RoomLocalUserInfo : OnlinePlayComposite
+    {
+        private OsuSpriteText attemptDisplay;
+
+        public RoomLocalUserInfo()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    attemptDisplay = new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14)
+                    },
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            MaxAttempts.BindValueChanged(attempts =>
+            {
+                attemptDisplay.Text = attempts.NewValue == null
+                    ? string.Empty
+                    : $"Maximum attempts: {attempts.NewValue:N0}";
+            }, true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
index 0a17702f2a..a0a7f2dc28 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
@@ -20,41 +20,34 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             AutoSizeAxes = Axes.Y;
 
+            RoomLocalUserInfo localUserInfo;
             RoomStatusInfo statusInfo;
             ModeTypeInfo typeInfo;
             ParticipantInfo participantInfo;
 
             InternalChild = new FillFlowContainer
             {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
                 RelativeSizeAxes = Axes.X,
+                Spacing = new Vector2(0, 10),
                 AutoSizeAxes = Axes.Y,
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 4),
                 Children = new Drawable[]
                 {
+                    roomName = new OsuTextFlowContainer(t => t.Font = OsuFont.GetFont(size: 30))
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                    },
+                    participantInfo = new ParticipantInfo(),
                     new Container
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Children = new Drawable[]
                         {
-                            new FillFlowContainer
-                            {
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.CentreLeft,
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Direction = FillDirection.Vertical,
-                                Children = new Drawable[]
-                                {
-                                    roomName = new OsuTextFlowContainer(t => t.Font = OsuFont.GetFont(size: 30))
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                    },
-                                    statusInfo = new RoomStatusInfo(),
-                                }
-                            },
+                            statusInfo = new RoomStatusInfo(),
                             typeInfo = new ModeTypeInfo
                             {
                                 Anchor = Anchor.BottomRight,
@@ -62,20 +55,21 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                             }
                         }
                     },
-                    participantInfo = new ParticipantInfo(),
+                    localUserInfo = new RoomLocalUserInfo(),
                 }
             };
 
-            statusElements.AddRange(new Drawable[] { statusInfo, typeInfo, participantInfo });
+            statusElements.AddRange(new Drawable[]
+            {
+                statusInfo, typeInfo, participantInfo, localUserInfo
+            });
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-
             if (RoomID.Value == null)
                 statusElements.ForEach(e => e.FadeOut());
-
             RoomID.BindValueChanged(id =>
             {
                 if (id.NewValue == null)
@@ -83,7 +77,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 else
                     statusElements.ForEach(e => e.FadeIn(100));
             }, true);
-
             RoomName.BindValueChanged(name =>
             {
                 roomName.Text = name.NewValue ?? "No room selected";

From 0a9861d0abe19879a3d9772c248df7ed2b0c2e74 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:51:13 +0900
Subject: [PATCH 07888/10326] Use TestCaseSource and add multi-mod test

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 47 +++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index ff1af88bac..fbdb1e2f3d 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -103,20 +103,43 @@ namespace osu.Game.Tests.Mods
             Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
         }
 
-        // test incompatible pair.
-        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModHalfTime) }, new[] { typeof(OsuModDoubleTime), typeof(OsuModHalfTime) })]
-        // test incompatible pair with derived class.
-        [TestCase(new[] { typeof(OsuModNightcore), typeof(OsuModHalfTime) }, new[] { typeof(OsuModNightcore), typeof(OsuModHalfTime) })]
-        // test system mod.
-        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModTouchDevice) }, new[] { typeof(OsuModTouchDevice) })]
-        // test valid.
-        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModHardRock) }, null)]
-        public void TestInvalidModScenarios(Type[] input, Type[] expectedInvalid)
+        private static readonly object[] invalid_mod_test_scenarios =
         {
-            List<Mod> inputMods = new List<Mod>();
-            foreach (var t in input)
-                inputMods.Add((Mod)Activator.CreateInstance(t));
+            // incompatible pair.
+            new object[]
+            {
+                new Mod[] { new OsuModDoubleTime(), new OsuModHalfTime() },
+                new[] { typeof(OsuModDoubleTime), typeof(OsuModHalfTime) }
+            },
+            // incompatible pair with derived class.
+            new object[]
+            {
+                new Mod[] { new OsuModNightcore(), new OsuModHalfTime() },
+                new[] { typeof(OsuModNightcore), typeof(OsuModHalfTime) }
+            },
+            // system mod.
+            new object[]
+            {
+                new Mod[] { new OsuModDoubleTime(), new OsuModTouchDevice() },
+                new[] { typeof(OsuModTouchDevice) }
+            },
+            // multi mod.
+            new object[]
+            {
+                new Mod[] { new MultiMod(new OsuModHalfTime()), new OsuModHalfTime() },
+                new[] { typeof(MultiMod) }
+            },
+            // valid pair.
+            new object[]
+            {
+                new Mod[] { new OsuModDoubleTime(), new OsuModHardRock() },
+                null
+            }
+        };
 
+        [TestCaseSource(nameof(invalid_mod_test_scenarios))]
+        public void TestInvalidModScenarios(Mod[] inputMods, Type[] expectedInvalid)
+        {
             bool isValid = ModUtils.CheckValidForGameplay(inputMods, out var invalid);
 
             Assert.That(isValid, Is.EqualTo(expectedInvalid == null));

From 180af3c7f8311d0a4477ecb79e7f7403da9dc85a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 19:02:09 +0900
Subject: [PATCH 07889/10326] Add codeanalysis attribute

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

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 9336add465..8ac5bde65a 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using osu.Game.Rulesets.Mods;
 
@@ -45,7 +46,7 @@ namespace osu.Game.Utils
         /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
         /// <param name="invalidMods">Any invalid mods in the set.</param>
         /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
-        public static bool CheckCompatibleSet(IEnumerable<Mod> combination, out List<Mod>? invalidMods)
+        public static bool CheckCompatibleSet(IEnumerable<Mod> combination, [NotNullWhen(false)] out List<Mod>? invalidMods)
         {
             combination = FlattenMods(combination).ToArray();
             invalidMods = null;

From a2e3b1c0e454e81c6836b44ca6f29426040b6ac1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:56:57 +0900
Subject: [PATCH 07890/10326] Move Mods reset code to OnlinePlaySongSelect

---
 .../Multiplayer/MultiplayerMatchSongSelect.cs         |  9 ---------
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs   | 11 ++++++++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index f7f0402555..84e8849726 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
@@ -27,13 +25,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             AddInternal(loadingLayer = new LoadingLayer(true));
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
-        }
-
         protected override void SelectItem(PlaylistItem item)
         {
             // If the client is already in a room, update via the client.
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index c58632c500..1c345b883f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -58,8 +58,17 @@ namespace osu.Game.Screens.OnlinePlay
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
 
-            freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
             FooterPanels.Add(freeModSelectOverlay);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // At this point, Mods contains both the required and allowed mods. For selection purposes, it should only contain the required mods.
+            // Similarly, freeMods is currently empty but should only contain the allowed mods.
+            Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
 
             Ruleset.BindValueChanged(onRulesetChanged);
         }

From 41593ff09e4ef0ac405cbd0fdcdba0beff9a29b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 19:14:44 +0900
Subject: [PATCH 07891/10326] Privatise protected property setters

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

diff --git a/osu.Game/Graphics/UserInterface/GrayButton.cs b/osu.Game/Graphics/UserInterface/GrayButton.cs
index dd05701545..88c46f29e0 100644
--- a/osu.Game/Graphics/UserInterface/GrayButton.cs
+++ b/osu.Game/Graphics/UserInterface/GrayButton.cs
@@ -11,8 +11,8 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class GrayButton : OsuAnimatedButton
     {
-        protected SpriteIcon Icon;
-        protected Box Background;
+        protected SpriteIcon Icon { get; private set; }
+        protected Box Background { get; private set; }
 
         private readonly IconUsage icon;
 

From 8e70a50af0836af6fb821c69a7239c7cad9e1eec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 19:22:13 +0900
Subject: [PATCH 07892/10326] Remove unused using statement

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index fbdb1e2f3d..7dcaabca3d 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.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 Moq;
 using NUnit.Framework;

From 2dece12a7c6041fb8ff9e5a4896c77b78865de3a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 19:57:42 +0900
Subject: [PATCH 07893/10326] Disable/disallow freemods on
 incompatible/selected mods

---
 osu.Game/Overlays/Mods/ModSection.cs       |  6 +++---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 993f4ef9d7..728c726b82 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -130,13 +130,13 @@ namespace osu.Game.Overlays.Mods
         /// Updates all buttons with the given list of selected mods.
         /// </summary>
         /// <param name="newSelectedMods">The new list of selected mods to select.</param>
-        public void UpdateSelectedMods(IReadOnlyList<Mod> newSelectedMods)
+        public void UpdateSelectedButtons(IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var button in buttons)
-                updateButtonMods(button, newSelectedMods);
+                updateButtonSelection(button, newSelectedMods);
         }
 
-        private void updateButtonMods(ModButton button, IReadOnlyList<Mod> newSelectedMods)
+        private void updateButtonSelection(ModButton button, IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var mod in newSelectedMods)
             {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b20c2d9d19..56d6008b00 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -377,7 +377,7 @@ namespace osu.Game.Overlays.Mods
             base.LoadComplete();
 
             availableMods.BindValueChanged(_ => updateAvailableMods(), true);
-            SelectedMods.BindValueChanged(selectedModsChanged, true);
+            SelectedMods.BindValueChanged(_ => updateSelectedButtons(), true);
         }
 
         protected override void PopOut()
@@ -445,6 +445,8 @@ namespace osu.Game.Overlays.Mods
 
                 section.Mods = modEnumeration.Select(validModOrNull).Where(m => m != null);
             }
+
+            updateSelectedButtons();
         }
 
         /// <summary>
@@ -465,10 +467,13 @@ namespace osu.Game.Overlays.Mods
             return validSubset.Length == 0 ? null : new MultiMod(validSubset);
         }
 
-        private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
+        private void updateSelectedButtons()
         {
+            // Enumeration below may update the bindable list.
+            var selectedMods = SelectedMods.Value.ToList();
+
             foreach (var section in ModSectionsContainer.Children)
-                section.UpdateSelectedMods(mods.NewValue);
+                section.UpdateSelectedButtons(selectedMods);
 
             updateMods();
         }

From 3741f05ab335d5baeb755bd4e370310698c1fe7f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:11:40 +0900
Subject: [PATCH 07894/10326] Refactor mod sections and make them overridable

---
 osu.Game/Overlays/Mods/ModSection.cs          | 39 +++++++++----------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 38 ++++++++++++++----
 .../Mods/Sections/AutomationSection.cs        | 19 ---------
 .../Mods/Sections/ConversionSection.cs        | 19 ---------
 .../Sections/DifficultyIncreaseSection.cs     | 19 ---------
 .../Sections/DifficultyReductionSection.cs    | 19 ---------
 osu.Game/Overlays/Mods/Sections/FunSection.cs | 19 ---------
 7 files changed, 50 insertions(+), 122 deletions(-)
 delete mode 100644 osu.Game/Overlays/Mods/Sections/AutomationSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/ConversionSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/FunSection.cs

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 573d1e5355..89a3e2f5cd 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -11,26 +11,23 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 using System.Threading;
+using Humanizer;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
-    public abstract class ModSection : Container
+    public class ModSection : CompositeDrawable
     {
-        private readonly OsuSpriteText headerLabel;
+        private readonly Drawable header;
 
         public FillFlowContainer<ModButtonEmpty> ButtonsContainer { get; }
 
         public Action<Mod> Action;
-        protected abstract Key[] ToggleKeys { get; }
-        public abstract ModType ModType { get; }
 
-        public string Header
-        {
-            get => headerLabel.Text;
-            set => headerLabel.Text = value;
-        }
+        public Key[] ToggleKeys;
+
+        public readonly ModType ModType;
 
         public IEnumerable<Mod> SelectedMods => buttons.Select(b => b.SelectedMod).Where(m => m != null);
 
@@ -61,7 +58,7 @@ namespace osu.Game.Overlays.Mods
                 if (modContainers.Length == 0)
                 {
                     ModIconsLoaded = true;
-                    headerLabel.Hide();
+                    header.Hide();
                     Hide();
                     return;
                 }
@@ -76,7 +73,7 @@ namespace osu.Game.Overlays.Mods
 
                 buttons = modContainers.OfType<ModButton>().ToArray();
 
-                headerLabel.FadeIn(200);
+                header.FadeIn(200);
                 this.FadeIn(200);
             }
         }
@@ -153,23 +150,19 @@ namespace osu.Game.Overlays.Mods
             button.Deselect();
         }
 
-        protected ModSection()
+        public ModSection(ModType type)
         {
+            ModType = type;
+
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
 
             Origin = Anchor.TopCentre;
             Anchor = Anchor.TopCentre;
 
-            Children = new Drawable[]
+            InternalChildren = new[]
             {
-                headerLabel = new OsuSpriteText
-                {
-                    Origin = Anchor.TopLeft,
-                    Anchor = Anchor.TopLeft,
-                    Position = new Vector2(0f, 0f),
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold)
-                },
+                header = CreateHeader(type.Humanize(LetterCasing.Title)),
                 ButtonsContainer = new FillFlowContainer<ModButtonEmpty>
                 {
                     AutoSizeAxes = Axes.Y,
@@ -185,5 +178,11 @@ namespace osu.Game.Overlays.Mods
                 },
             };
         }
+
+        protected virtual Drawable CreateHeader(string text) => new OsuSpriteText
+        {
+            Font = OsuFont.GetFont(weight: FontWeight.Bold),
+            Text = text
+        };
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 1258ba719d..fd6f771f16 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -19,7 +19,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
-using osu.Game.Overlays.Mods.Sections;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
 using osuTK;
@@ -190,13 +189,31 @@ namespace osu.Game.Overlays.Mods
                                                 Width = content_width,
                                                 LayoutDuration = 200,
                                                 LayoutEasing = Easing.OutQuint,
-                                                Children = new ModSection[]
+                                                Children = new[]
                                                 {
-                                                    new DifficultyReductionSection { Action = modButtonPressed },
-                                                    new DifficultyIncreaseSection { Action = modButtonPressed },
-                                                    new AutomationSection { Action = modButtonPressed },
-                                                    new ConversionSection { Action = modButtonPressed },
-                                                    new FunSection { Action = modButtonPressed },
+                                                    CreateModSection(ModType.DifficultyReduction).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.DifficultyIncrease).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Automation).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Conversion).With(s =>
+                                                    {
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Fun).With(s =>
+                                                    {
+                                                        s.Action = modButtonPressed;
+                                                    }),
                                                 }
                                             },
                                         }
@@ -454,6 +471,13 @@ namespace osu.Game.Overlays.Mods
 
         private void refreshSelectedMods() => SelectedMods.Value = ModSectionsContainer.Children.SelectMany(s => s.SelectedMods).ToArray();
 
+        /// <summary>
+        /// Creates a <see cref="ModSection"/> that groups <see cref="Mod"/>s with the same <see cref="ModType"/>.
+        /// </summary>
+        /// <param name="type">The <see cref="ModType"/> of <see cref="Mod"/>s in the section.</param>
+        /// <returns>The <see cref="ModSection"/>.</returns>
+        protected virtual ModSection CreateModSection(ModType type) => new ModSection(type);
+
         #region Disposal
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Overlays/Mods/Sections/AutomationSection.cs b/osu.Game/Overlays/Mods/Sections/AutomationSection.cs
deleted file mode 100644
index a2d7fec15f..0000000000
--- a/osu.Game/Overlays/Mods/Sections/AutomationSection.cs
+++ /dev/null
@@ -1,19 +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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class AutomationSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
-        public override ModType ModType => ModType.Automation;
-
-        public AutomationSection()
-        {
-            Header = @"Automation";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/ConversionSection.cs b/osu.Game/Overlays/Mods/Sections/ConversionSection.cs
deleted file mode 100644
index 24fd8c30dd..0000000000
--- a/osu.Game/Overlays/Mods/Sections/ConversionSection.cs
+++ /dev/null
@@ -1,19 +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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class ConversionSection : ModSection
-    {
-        protected override Key[] ToggleKeys => null;
-        public override ModType ModType => ModType.Conversion;
-
-        public ConversionSection()
-        {
-            Header = @"Conversion";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs b/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs
deleted file mode 100644
index 0b7ccd1f25..0000000000
--- a/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs
+++ /dev/null
@@ -1,19 +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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class DifficultyIncreaseSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
-        public override ModType ModType => ModType.DifficultyIncrease;
-
-        public DifficultyIncreaseSection()
-        {
-            Header = @"Difficulty Increase";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs b/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs
deleted file mode 100644
index 508e92508b..0000000000
--- a/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs
+++ /dev/null
@@ -1,19 +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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class DifficultyReductionSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
-        public override ModType ModType => ModType.DifficultyReduction;
-
-        public DifficultyReductionSection()
-        {
-            Header = @"Difficulty Reduction";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/FunSection.cs b/osu.Game/Overlays/Mods/Sections/FunSection.cs
deleted file mode 100644
index af1f5836b1..0000000000
--- a/osu.Game/Overlays/Mods/Sections/FunSection.cs
+++ /dev/null
@@ -1,19 +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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class FunSection : ModSection
-    {
-        protected override Key[] ToggleKeys => null;
-        public override ModType ModType => ModType.Fun;
-
-        public FunSection()
-        {
-            Header = @"Fun";
-        }
-    }
-}

From 6d620264f48369f807a79983da19bf2ff37773e9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:27:41 +0900
Subject: [PATCH 07895/10326] Allow mod buttons to not be stacked

---
 .../TestSceneModSelectOverlay.cs              | 62 ++++++++++++-------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 12 +++-
 2 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index bd4010a7f3..71c549b433 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -38,28 +38,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [SetUp]
-        public void SetUp() => Schedule(() =>
-        {
-            SelectedMods.Value = Array.Empty<Mod>();
-            Children = new Drawable[]
-            {
-                modSelect = new TestModSelectOverlay
-                {
-                    Origin = Anchor.BottomCentre,
-                    Anchor = Anchor.BottomCentre,
-                    SelectedMods = { BindTarget = SelectedMods }
-                },
-
-                modDisplay = new ModDisplay
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    AutoSizeAxes = Axes.Both,
-                    Position = new Vector2(-5, 25),
-                    Current = { BindTarget = modSelect.SelectedMods }
-                }
-            };
-        });
+        public void SetUp() => Schedule(() => createDisplay(() => new TestModSelectOverlay()));
 
         [SetUpSteps]
         public void SetUpSteps()
@@ -146,6 +125,18 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
+        [Test]
+        public void TestNonStacked()
+        {
+            changeRuleset(0);
+
+            AddStep("create overlay", () => createDisplay(() => new TestNonStackedModSelectOverlay()));
+
+            AddStep("show", () => modSelect.Show());
+
+            AddAssert("ensure all buttons are spread out", () => modSelect.ChildrenOfType<ModButton>().All(m => m.Mods.Length <= 1));
+        }
+
         private void testSingleMod(Mod mod)
         {
             selectNext(mod);
@@ -265,6 +256,28 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void checkLabelColor(Func<Color4> getColour) => AddAssert("check label has expected colour", () => modSelect.MultiplierLabel.Colour.AverageColour == getColour());
 
+        private void createDisplay(Func<TestModSelectOverlay> createOverlayFunc)
+        {
+            SelectedMods.Value = Array.Empty<Mod>();
+            Children = new Drawable[]
+            {
+                modSelect = createOverlayFunc().With(d =>
+                {
+                    d.Origin = Anchor.BottomCentre;
+                    d.Anchor = Anchor.BottomCentre;
+                    d.SelectedMods.BindTarget = SelectedMods;
+                }),
+                modDisplay = new ModDisplay
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    AutoSizeAxes = Axes.Both,
+                    Position = new Vector2(-5, 25),
+                    Current = { BindTarget = modSelect.SelectedMods }
+                }
+            };
+        }
+
         private class TestModSelectOverlay : ModSelectOverlay
         {
             public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
@@ -283,5 +296,10 @@ namespace osu.Game.Tests.Visual.UserInterface
             public new Color4 LowMultiplierColour => base.LowMultiplierColour;
             public new Color4 HighMultiplierColour => base.HighMultiplierColour;
         }
+
+        private class TestNonStackedModSelectOverlay : TestModSelectOverlay
+        {
+            protected override bool Stacked => false;
+        }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 1258ba719d..c7e856028a 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -22,6 +22,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.Overlays.Mods.Sections;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -43,6 +44,11 @@ namespace osu.Game.Overlays.Mods
 
         protected override bool DimMainContent => false;
 
+        /// <summary>
+        /// Whether <see cref="Mod"/>s underneath the same <see cref="MultiMod"/> instance should appear as stacked buttons.
+        /// </summary>
+        protected virtual bool Stacked => true;
+
         protected readonly FillFlowContainer<ModSection> ModSectionsContainer;
 
         protected readonly ModSettingsContainer ModSettingsContainer;
@@ -405,7 +411,11 @@ namespace osu.Game.Overlays.Mods
             if (mods.NewValue == null) return;
 
             foreach (var section in ModSectionsContainer.Children)
-                section.Mods = mods.NewValue[section.ModType].Where(isValidMod);
+            {
+                section.Mods = Stacked
+                    ? availableMods.Value[section.ModType]
+                    : ModUtils.FlattenMods(availableMods.Value[section.ModType]);
+            }
         }
 
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)

From 75f81bfa062c9199759cd8257a10e64e543eb8ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:35:31 +0900
Subject: [PATCH 07896/10326] Add back mod validation

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index c7e856028a..775b0de1c0 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -412,9 +412,12 @@ namespace osu.Game.Overlays.Mods
 
             foreach (var section in ModSectionsContainer.Children)
             {
-                section.Mods = Stacked
-                    ? availableMods.Value[section.ModType]
-                    : ModUtils.FlattenMods(availableMods.Value[section.ModType]);
+                IEnumerable<Mod> modEnumeration = availableMods.Value[section.ModType];
+
+                if (!Stacked)
+                    modEnumeration = ModUtils.FlattenMods(modEnumeration);
+
+                section.Mods = modEnumeration.Where(isValidMod);
             }
         }
 

From 10ceddf3ffcf861f71aee5f4a681441b15913226 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:47:50 +0900
Subject: [PATCH 07897/10326] Make IsValidMod adjustable

---
 .../TestSceneModSelectOverlay.cs              | 16 ++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 54 ++++++++++++++++---
 .../Multiplayer/MultiplayerMatchSongSelect.cs |  2 +-
 osu.Game/Screens/Select/MatchSongSelect.cs    |  2 +-
 4 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 71c549b433..9cf8b95ddf 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -137,6 +137,22 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("ensure all buttons are spread out", () => modSelect.ChildrenOfType<ModButton>().All(m => m.Mods.Length <= 1));
         }
 
+        [Test]
+        public void TestChangeIsValidChangesButtonVisibility()
+        {
+            changeRuleset(0);
+
+            AddAssert("double time visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModDoubleTime)));
+
+            AddStep("make double time invalid", () => modSelect.IsValidMod = m => !(m is OsuModDoubleTime));
+            AddAssert("double time not visible", () => modSelect.ChildrenOfType<ModButton>().All(b => !b.Mods.Any(m => m is OsuModDoubleTime)));
+            AddAssert("nightcore still visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModNightcore)));
+
+            AddStep("make double time valid again", () => modSelect.IsValidMod = m => true);
+            AddAssert("double time visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModDoubleTime)));
+            AddAssert("nightcore still visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModNightcore)));
+        }
+
         private void testSingleMod(Mod mod)
         {
             selectNext(mod);
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 775b0de1c0..61e4b45495 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -31,7 +32,6 @@ namespace osu.Game.Overlays.Mods
 {
     public class ModSelectOverlay : WaveOverlayContainer
     {
-        private readonly Func<Mod, bool> isValidMod;
         public const float HEIGHT = 510;
 
         protected readonly TriangleButton DeselectAllButton;
@@ -49,6 +49,23 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected virtual bool Stacked => true;
 
+        [NotNull]
+        private Func<Mod, bool> isValidMod = m => true;
+
+        /// <summary>
+        /// A function that checks whether a given mod is selectable.
+        /// </summary>
+        [NotNull]
+        public Func<Mod, bool> IsValidMod
+        {
+            get => isValidMod;
+            set
+            {
+                isValidMod = value ?? throw new ArgumentNullException(nameof(value));
+                updateAvailableMods();
+            }
+        }
+
         protected readonly FillFlowContainer<ModSection> ModSectionsContainer;
 
         protected readonly ModSettingsContainer ModSettingsContainer;
@@ -67,10 +84,8 @@ namespace osu.Game.Overlays.Mods
 
         private SampleChannel sampleOn, sampleOff;
 
-        public ModSelectOverlay(Func<Mod, bool> isValidMod = null)
+        public ModSelectOverlay()
         {
-            this.isValidMod = isValidMod ?? (m => true);
-
             Waves.FirstWaveColour = Color4Extensions.FromHex(@"19b0e2");
             Waves.SecondWaveColour = Color4Extensions.FromHex(@"2280a2");
             Waves.ThirdWaveColour = Color4Extensions.FromHex(@"005774");
@@ -351,7 +366,7 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            availableMods.BindValueChanged(availableModsChanged, true);
+            availableMods.BindValueChanged(_ => updateAvailableMods(), true);
             SelectedMods.BindValueChanged(selectedModsChanged, true);
         }
 
@@ -406,9 +421,10 @@ namespace osu.Game.Overlays.Mods
 
         public override bool OnPressed(GlobalAction action) => false; // handled by back button
 
-        private void availableModsChanged(ValueChangedEvent<Dictionary<ModType, IReadOnlyList<Mod>>> mods)
+        private void updateAvailableMods()
         {
-            if (mods.NewValue == null) return;
+            if (availableMods?.Value == null)
+                return;
 
             foreach (var section in ModSectionsContainer.Children)
             {
@@ -417,10 +433,32 @@ namespace osu.Game.Overlays.Mods
                 if (!Stacked)
                     modEnumeration = ModUtils.FlattenMods(modEnumeration);
 
-                section.Mods = modEnumeration.Where(isValidMod);
+                section.Mods = modEnumeration.Select(getValidModOrNull).Where(m => m != null);
             }
         }
 
+        /// <summary>
+        /// Returns a valid form of a given <see cref="Mod"/> if possible, or null otherwise.
+        /// </summary>
+        /// <remarks>
+        /// This is a recursive process during which any invalid mods are culled while preserving <see cref="MultiMod"/> structures where possible.
+        /// </remarks>
+        /// <param name="mod">The <see cref="Mod"/> to check.</param>
+        /// <returns>A valid form of <paramref name="mod"/> if exists, or null otherwise.</returns>
+        [CanBeNull]
+        private Mod getValidModOrNull([NotNull] Mod mod)
+        {
+            if (!(mod is MultiMod multi))
+                return IsValidMod(mod) ? mod : null;
+
+            var validSubset = multi.Mods.Select(getValidModOrNull).Where(m => m != null).ToArray();
+
+            if (validSubset.Length == 0)
+                return null;
+
+            return validSubset.Length == 1 ? validSubset[0] : new MultiMod(validSubset);
+        }
+
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             foreach (var section in ModSectionsContainer.Children)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index ebc06d2445..5bf9b1ee7e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay { IsValidMod = isValidMod };
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index ed47b5d5ac..1bb7374ce3 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay { IsValidMod = isValidMod };
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }

From 50e92bd0ed729a2d4aa551bea13a66f37de6035c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:50:54 +0900
Subject: [PATCH 07898/10326] Fix selection not being preserved when IsValidMod
 changes

---
 .../UserInterface/TestSceneModSelectOverlay.cs       | 12 ++++++++++++
 osu.Game/Overlays/Mods/ModSection.cs                 |  6 +++---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs           | 11 ++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 9cf8b95ddf..81edcd8db8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -153,6 +153,18 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("nightcore still visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModNightcore)));
         }
 
+        [Test]
+        public void TestChangeIsValidPreservesSelection()
+        {
+            changeRuleset(0);
+
+            AddStep("select DT + HD", () => SelectedMods.Value = new Mod[] { new OsuModDoubleTime(), new OsuModHidden() });
+            AddAssert("DT + HD selected", () => modSelect.ChildrenOfType<ModButton>().Count(b => b.Selected) == 2);
+
+            AddStep("make NF invalid", () => modSelect.IsValidMod = m => !(m is ModNoFail));
+            AddAssert("DT + HD still selected", () => modSelect.ChildrenOfType<ModButton>().Count(b => b.Selected) == 2);
+        }
+
         private void testSingleMod(Mod mod)
         {
             selectNext(mod);
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 573d1e5355..4c629aef54 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -130,13 +130,13 @@ namespace osu.Game.Overlays.Mods
         /// Updates all buttons with the given list of selected mods.
         /// </summary>
         /// <param name="newSelectedMods">The new list of selected mods to select.</param>
-        public void UpdateSelectedMods(IReadOnlyList<Mod> newSelectedMods)
+        public void UpdateSelectedButtons(IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var button in buttons)
-                updateButtonMods(button, newSelectedMods);
+                updateButtonSelection(button, newSelectedMods);
         }
 
-        private void updateButtonMods(ModButton button, IReadOnlyList<Mod> newSelectedMods)
+        private void updateButtonSelection(ModButton button, IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var mod in newSelectedMods)
             {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 61e4b45495..fcec6f3926 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -367,7 +367,7 @@ namespace osu.Game.Overlays.Mods
             base.LoadComplete();
 
             availableMods.BindValueChanged(_ => updateAvailableMods(), true);
-            SelectedMods.BindValueChanged(selectedModsChanged, true);
+            SelectedMods.BindValueChanged(_ => updateSelectedButtons(), true);
         }
 
         protected override void PopOut()
@@ -435,6 +435,8 @@ namespace osu.Game.Overlays.Mods
 
                 section.Mods = modEnumeration.Select(getValidModOrNull).Where(m => m != null);
             }
+
+            updateSelectedButtons();
         }
 
         /// <summary>
@@ -459,10 +461,13 @@ namespace osu.Game.Overlays.Mods
             return validSubset.Length == 1 ? validSubset[0] : new MultiMod(validSubset);
         }
 
-        private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
+        private void updateSelectedButtons()
         {
+            // Enumeration below may update the bindable list.
+            var selectedMods = SelectedMods.Value.ToList();
+
             foreach (var section in ModSectionsContainer.Children)
-                section.UpdateSelectedMods(mods.NewValue);
+                section.UpdateSelectedButtons(selectedMods);
 
             updateMods();
         }

From e58ece9e108b757a72aaff635090ad00b245aa5a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:58:31 +0900
Subject: [PATCH 07899/10326] Make ModSelectOverlay abstract

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs    | 2 +-
 .../Visual/UserInterface/TestSceneModSettings.cs         | 2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs               | 4 ++--
 osu.Game/Overlays/Mods/SoloModSelectOverlay.cs           | 9 +++++++++
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs | 2 +-
 osu.Game/Screens/Select/MatchSongSelect.cs               | 2 +-
 osu.Game/Screens/Select/SongSelect.cs                    | 2 +-
 7 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/SoloModSelectOverlay.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 81edcd8db8..92104cfc72 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -306,7 +306,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
         }
 
-        private class TestModSelectOverlay : ModSelectOverlay
+        private class TestModSelectOverlay : SoloModSelectOverlay
         {
             public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 8614700b15..3c889bdec4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait for ready", () => modSelect.State.Value == Visibility.Visible && modSelect.ButtonsLoaded);
         }
 
-        private class TestModSelectOverlay : ModSelectOverlay
+        private class TestModSelectOverlay : SoloModSelectOverlay
         {
             public new VisibilityContainer ModSettingsContainer => base.ModSettingsContainer;
             public new TriangleButton CustomiseButton => base.CustomiseButton;
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index fcec6f3926..75ad90f065 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -30,7 +30,7 @@ using osuTK.Input;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class ModSelectOverlay : WaveOverlayContainer
+    public abstract class ModSelectOverlay : WaveOverlayContainer
     {
         public const float HEIGHT = 510;
 
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Mods
 
         private SampleChannel sampleOn, sampleOff;
 
-        public ModSelectOverlay()
+        protected ModSelectOverlay()
         {
             Waves.FirstWaveColour = Color4Extensions.FromHex(@"19b0e2");
             Waves.SecondWaveColour = Color4Extensions.FromHex(@"2280a2");
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
new file mode 100644
index 0000000000..8f6819d7ff
--- /dev/null
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
@@ -0,0 +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.
+
+namespace osu.Game.Overlays.Mods
+{
+    public class SoloModSelectOverlay : ModSelectOverlay
+    {
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 5bf9b1ee7e..930f70d087 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay { IsValidMod = isValidMod };
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay { IsValidMod = isValidMod };
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 1bb7374ce3..e181370cf7 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay { IsValidMod = isValidMod };
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay { IsValidMod = isValidMod };
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4fca77a176..ff49dd9f7e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -301,7 +301,7 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        protected virtual ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay();
+        protected virtual ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay();
 
         protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)
         {

From 728f8599b2bedbc721481c2bafb017a130177d25 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:06:32 +0900
Subject: [PATCH 07900/10326] Move incompatible mod deselection to
 SoloModOverlay

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 23 ++++++++-----------
 .../Overlays/Mods/SoloModSelectOverlay.cs     |  9 ++++++++
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 75ad90f065..c400e4cc43 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -349,19 +349,6 @@ namespace osu.Game.Overlays.Mods
             refreshSelectedMods();
         }
 
-        /// <summary>
-        /// Deselect one or more mods.
-        /// </summary>
-        /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
-        /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        private void deselectTypes(Type[] modTypes, bool immediate = false)
-        {
-            if (modTypes.Length == 0) return;
-
-            foreach (var section in ModSectionsContainer.Children)
-                section.DeselectTypes(modTypes, immediate);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -496,7 +483,7 @@ namespace osu.Game.Overlays.Mods
             {
                 if (State.Value == Visibility.Visible) sampleOn?.Play();
 
-                deselectTypes(selectedMod.IncompatibleMods, true);
+                OnModSelected(selectedMod);
 
                 if (selectedMod.RequiresConfiguration) ModSettingsContainer.Show();
             }
@@ -508,6 +495,14 @@ namespace osu.Game.Overlays.Mods
             refreshSelectedMods();
         }
 
+        /// <summary>
+        /// Invoked when a new <see cref="Mod"/> has been selected.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> that has been selected.</param>
+        protected virtual void OnModSelected(Mod mod)
+        {
+        }
+
         private void refreshSelectedMods() => SelectedMods.Value = ModSectionsContainer.Children.SelectMany(s => s.SelectedMods).ToArray();
 
         #region Disposal
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
index 8f6819d7ff..d039ad1f98 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
@@ -1,9 +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.Mods;
+
 namespace osu.Game.Overlays.Mods
 {
     public class SoloModSelectOverlay : ModSelectOverlay
     {
+        protected override void OnModSelected(Mod mod)
+        {
+            base.OnModSelected(mod);
+
+            foreach (var section in ModSectionsContainer.Children)
+                section.DeselectTypes(mod.IncompatibleMods, true);
+        }
     }
 }

From 643c0605d85cf7808394c4b2fe3ea4f39b62906b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:14:38 +0900
Subject: [PATCH 07901/10326] Implement the freemod selection overlay

---
 .../TestSceneFreeModSelectOverlay.cs          |  21 +++
 osu.Game/Overlays/Mods/ModSection.cs          |  15 ++-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  19 +--
 .../OnlinePlay/FreeModSelectOverlay.cs        | 120 ++++++++++++++++++
 4 files changed, 165 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
new file mode 100644
index 0000000000..26a0301d8a
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.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 NUnit.Framework;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Screens.OnlinePlay;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneFreeModSelectOverlay : MultiplayerTestScene
+    {
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Child = new FreeModSelectOverlay
+            {
+                State = { Value = Visibility.Visible }
+            };
+        });
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index b3ddd30772..87a45ebf63 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -94,7 +94,20 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
-        public void DeselectAll() => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
+        /// <summary>
+        /// Selects all mods.
+        /// </summary>
+        public void SelectAll()
+        {
+            foreach (var button in buttons.Where(b => !b.Selected))
+                button.SelectAt(0);
+        }
+
+        /// <summary>
+        /// Deselects all mods.
+        /// </summary>
+        /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
+        public void DeselectAll(bool immediate = false) => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null), immediate);
 
         /// <summary>
         /// Deselect one or more mods in this section.
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index e064a6fb84..8225c1b6bb 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -37,8 +37,11 @@ namespace osu.Game.Overlays.Mods
         protected readonly TriangleButton CustomiseButton;
         protected readonly TriangleButton CloseButton;
 
+        protected readonly Drawable MultiplierSection;
         protected readonly OsuSpriteText MultiplierLabel;
 
+        protected readonly FillFlowContainer FooterContainer;
+
         protected override bool BlockNonPositionalInput => false;
 
         protected override bool DimMainContent => false;
@@ -79,8 +82,6 @@ namespace osu.Game.Overlays.Mods
         private const float content_width = 0.8f;
         private const float footer_button_spacing = 20;
 
-        private readonly FillFlowContainer footerContainer;
-
         private SampleChannel sampleOn, sampleOff;
 
         protected ModSelectOverlay()
@@ -269,7 +270,7 @@ namespace osu.Game.Overlays.Mods
                                         Colour = new Color4(172, 20, 116, 255),
                                         Alpha = 0.5f,
                                     },
-                                    footerContainer = new FillFlowContainer
+                                    FooterContainer = new FillFlowContainer
                                     {
                                         Origin = Anchor.BottomCentre,
                                         Anchor = Anchor.BottomCentre,
@@ -283,7 +284,7 @@ namespace osu.Game.Overlays.Mods
                                             Vertical = 15,
                                             Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING
                                         },
-                                        Children = new Drawable[]
+                                        Children = new[]
                                         {
                                             DeselectAllButton = new TriangleButton
                                             {
@@ -310,7 +311,7 @@ namespace osu.Game.Overlays.Mods
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
-                                            new FillFlowContainer
+                                            MultiplierSection = new FillFlowContainer
                                             {
                                                 AutoSizeAxes = Axes.Both,
                                                 Spacing = new Vector2(footer_button_spacing / 2, 0),
@@ -378,8 +379,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopOut();
 
-            footerContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
-            footerContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
+            FooterContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
+            FooterContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
 
             foreach (var section in ModSectionsContainer.Children)
             {
@@ -393,8 +394,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopIn();
 
-            footerContainer.MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
-            footerContainer.FadeIn(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+            FooterContainer.MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+            FooterContainer.FadeIn(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
 
             foreach (var section in ModSectionsContainer.Children)
             {
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
new file mode 100644
index 0000000000..628199309a
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -0,0 +1,120 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Screens.OnlinePlay
+{
+    /// <summary>
+    /// A <see cref="ModSelectOverlay"/> used for free-mod selection in online play.
+    /// </summary>
+    public class FreeModSelectOverlay : ModSelectOverlay
+    {
+        protected override bool Stacked => false;
+
+        public FreeModSelectOverlay()
+        {
+            CustomiseButton.Alpha = 0;
+            MultiplierSection.Alpha = 0;
+            DeselectAllButton.Alpha = 0;
+
+            Drawable selectAllButton;
+            Drawable deselectAllButton;
+
+            FooterContainer.AddRange(new[]
+            {
+                selectAllButton = new TriangleButton
+                {
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Width = 180,
+                    Text = "Select All",
+                    Action = selectAll,
+                },
+                // Unlike the base mod select overlay, this button deselects mods instantaneously.
+                deselectAllButton = new TriangleButton
+                {
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Width = 180,
+                    Text = "Deselect All",
+                    Action = deselectAll,
+                },
+            });
+
+            FooterContainer.SetLayoutPosition(selectAllButton, -2);
+            FooterContainer.SetLayoutPosition(deselectAllButton, -1);
+        }
+
+        private void selectAll()
+        {
+            foreach (var section in ModSectionsContainer.Children)
+                section.SelectAll();
+        }
+
+        private void deselectAll()
+        {
+            foreach (var section in ModSectionsContainer.Children)
+                section.DeselectAll(true);
+        }
+
+        protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
+
+        private class FreeModSection : ModSection
+        {
+            private HeaderCheckbox checkbox;
+
+            public FreeModSection(ModType type)
+                : base(type)
+            {
+            }
+
+            protected override Drawable CreateHeader(string text) => new Container
+            {
+                AutoSizeAxes = Axes.Y,
+                Width = 175,
+                Child = checkbox = new HeaderCheckbox
+                {
+                    LabelText = text,
+                    Changed = onCheckboxChanged
+                }
+            };
+
+            private void onCheckboxChanged(bool value)
+            {
+                foreach (var button in ButtonsContainer.OfType<ModButton>())
+                {
+                    if (value)
+                        button.SelectAt(0);
+                    else
+                        button.Deselect();
+                }
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                var validButtons = ButtonsContainer.OfType<ModButton>().Where(b => b.Mod.HasImplementation);
+                checkbox.Current.Value = validButtons.All(b => b.Selected);
+            }
+        }
+
+        private class HeaderCheckbox : OsuCheckbox
+        {
+            public Action<bool> Changed;
+
+            protected override void OnUserChange(bool value)
+            {
+                base.OnUserChange(value);
+                Changed?.Invoke(value);
+            }
+        }
+    }
+}

From f25535548ae1910215fff01186cac34285cdac81 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:20:16 +0900
Subject: [PATCH 07902/10326] Fix buzzing on select all/deselect all

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 8225c1b6bb..c308dc2451 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
@@ -495,11 +496,17 @@ namespace osu.Game.Overlays.Mods
                 MultiplierLabel.FadeColour(Color4.White, 200);
         }
 
+        private ScheduledDelegate sampleOnDelegate;
+        private ScheduledDelegate sampleOffDelegate;
+
         private void modButtonPressed(Mod selectedMod)
         {
             if (selectedMod != null)
             {
-                if (State.Value == Visibility.Visible) sampleOn?.Play();
+                // Fixes buzzing when multiple mods are selected in the same frame.
+                sampleOnDelegate?.Cancel();
+                if (State.Value == Visibility.Visible)
+                    sampleOnDelegate = Scheduler.Add(() => sampleOn?.Play());
 
                 OnModSelected(selectedMod);
 
@@ -507,7 +514,10 @@ namespace osu.Game.Overlays.Mods
             }
             else
             {
-                if (State.Value == Visibility.Visible) sampleOff?.Play();
+                // Fixes buzzing when multiple mods are deselected in the same frame.
+                sampleOffDelegate?.Cancel();
+                if (State.Value == Visibility.Visible)
+                    sampleOffDelegate = Scheduler.Add(() => sampleOff?.Play());
             }
 
             refreshSelectedMods();

From 5a56e2ba4b66ae8058157a3b32935f154d0f0c02 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:29:00 +0900
Subject: [PATCH 07903/10326] Fix sound duplication due to checkbox

---
 osu.Game/Graphics/UserInterface/OsuCheckbox.cs  | 17 +++++++++++++----
 .../Screens/OnlinePlay/FreeModSelectOverlay.cs  |  2 ++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 6593531099..517f83daa9 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -18,6 +18,11 @@ namespace osu.Game.Graphics.UserInterface
         public Color4 UncheckedColor { get; set; } = Color4.White;
         public int FadeDuration { get; set; }
 
+        /// <summary>
+        /// Whether to play sounds when the state changes as a result of user interaction.
+        /// </summary>
+        protected virtual bool PlaySoundsOnUserChange => true;
+
         public string LabelText
         {
             set
@@ -96,10 +101,14 @@ namespace osu.Game.Graphics.UserInterface
         protected override void OnUserChange(bool value)
         {
             base.OnUserChange(value);
-            if (value)
-                sampleChecked?.Play();
-            else
-                sampleUnchecked?.Play();
+
+            if (PlaySoundsOnUserChange)
+            {
+                if (value)
+                    sampleChecked?.Play();
+                else
+                    sampleUnchecked?.Play();
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 628199309a..608e58b534 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -110,6 +110,8 @@ namespace osu.Game.Screens.OnlinePlay
         {
             public Action<bool> Changed;
 
+            protected override bool PlaySoundsOnUserChange => false;
+
             protected override void OnUserChange(bool value)
             {
                 base.OnUserChange(value);

From 6ff8e8dd37c3a79ea7b6c122f596272708cd6e58 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:29:08 +0900
Subject: [PATCH 07904/10326] Disable a few mods by default

---
 osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 608e58b534..5b9a19897f 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -18,8 +18,16 @@ namespace osu.Game.Screens.OnlinePlay
     {
         protected override bool Stacked => false;
 
+        public new Func<Mod, bool> IsValidMod
+        {
+            get => base.IsValidMod;
+            set => base.IsValidMod = m => m.HasImplementation && !m.RequiresConfiguration && !(m is ModAutoplay) && value(m);
+        }
+
         public FreeModSelectOverlay()
         {
+            IsValidMod = m => true;
+
             CustomiseButton.Alpha = 0;
             MultiplierSection.Alpha = 0;
             DeselectAllButton.Alpha = 0;

From 921f008217719bb6768b54c7746eef2d7d0f0ba7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:35:08 +0900
Subject: [PATCH 07905/10326] Fix ModIcon not updating background colour
 correctly

---
 .../Visual/UserInterface/TestSceneModIcon.cs  | 21 +++++++++
 osu.Game/Rulesets/UI/ModIcon.cs               | 46 +++++++++++--------
 2 files changed, 47 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
new file mode 100644
index 0000000000..e7fa7d9235
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.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 NUnit.Framework;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneModIcon : OsuTestScene
+    {
+        [Test]
+        public void TestChangeModType()
+        {
+            ModIcon icon = null;
+
+            AddStep("create mod icon", () => Child = icon = new ModIcon(new OsuModDoubleTime()));
+            AddStep("change mod", () => icon.Mod = new OsuModEasy());
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 04a2e052fa..cae5da3d16 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -29,8 +29,6 @@ namespace osu.Game.Rulesets.UI
 
         private const float size = 80;
 
-        private readonly ModType type;
-
         public virtual string TooltipText => showTooltip ? mod.IconTooltip : null;
 
         private Mod mod;
@@ -42,10 +40,18 @@ namespace osu.Game.Rulesets.UI
             set
             {
                 mod = value;
-                updateMod(value);
+
+                if (IsLoaded)
+                    updateMod(value);
             }
         }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private Color4 backgroundColour;
+        private Color4 highlightedColour;
+
         /// <summary>
         /// Construct a new instance.
         /// </summary>
@@ -56,8 +62,6 @@ namespace osu.Game.Rulesets.UI
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
             this.showTooltip = showTooltip;
 
-            type = mod.Type;
-
             Size = new Vector2(size);
 
             Children = new Drawable[]
@@ -89,6 +93,13 @@ namespace osu.Game.Rulesets.UI
                     Icon = FontAwesome.Solid.Question
                 },
             };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Selected.BindValueChanged(_ => updateColour());
 
             updateMod(mod);
         }
@@ -102,20 +113,14 @@ namespace osu.Game.Rulesets.UI
             {
                 modIcon.FadeOut();
                 modAcronym.FadeIn();
-                return;
+            }
+            else
+            {
+                modIcon.FadeIn();
+                modAcronym.FadeOut();
             }
 
-            modIcon.FadeIn();
-            modAcronym.FadeOut();
-        }
-
-        private Color4 backgroundColour;
-        private Color4 highlightedColour;
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            switch (type)
+            switch (value.Type)
             {
                 default:
                 case ModType.DifficultyIncrease:
@@ -149,12 +154,13 @@ namespace osu.Game.Rulesets.UI
                     modIcon.Colour = colours.Yellow;
                     break;
             }
+
+            updateColour();
         }
 
-        protected override void LoadComplete()
+        private void updateColour()
         {
-            base.LoadComplete();
-            Selected.BindValueChanged(selected => background.Colour = selected.NewValue ? highlightedColour : backgroundColour, true);
+            background.Colour = Selected.Value ? highlightedColour : backgroundColour;
         }
     }
 }

From aeb3ed8bb3bb12253eb2b4cf2092634e3c4c62ac Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:46:22 +0900
Subject: [PATCH 07906/10326] Renamespace footer button

---
 osu.Game/Screens/OnlinePlay/{Match => }/FooterButtonFreeMods.cs | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs             | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{Match => }/FooterButtonFreeMods.cs (97%)

diff --git a/osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
similarity index 97%
rename from osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs
rename to osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
index ca2db877c3..a3cc383b67 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs
+++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Select;
 using osuTK;
 
-namespace osu.Game.Screens.OnlinePlay.Match
+namespace osu.Game.Screens.OnlinePlay
 {
     public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
     {
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 1c345b883f..0baa663578 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -15,7 +15,6 @@ using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.Select;
 using osu.Game.Utils;
 

From 8e96ffd1e6ea4d848766c72e703503de6b23cffd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Feb 2021 16:54:40 +0300
Subject: [PATCH 07907/10326] Fix "wait for import" until step potentially
 finishing early

If not obvious, the issue with previous code is that it was checking for `IsAvailableLocally`, while the import is happening on a different thread, so that method could return `true` before the importing has finished and `ItemUpdated` event is called.
---
 .../TestSceneMultiplayerBeatmapAvailabilityTracker.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
index 3c3793670a..646c4139af 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Online
             addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
 
             AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
-            AddUntilStep("wait for import", () => beatmaps.IsAvailableLocally(testBeatmapSet));
+            AddUntilStep("wait for import", () => beatmaps.CurrentImportTask?.IsCompleted == true);
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
         }
 
@@ -127,8 +127,6 @@ namespace osu.Game.Tests.Online
 
         private void addAvailabilityCheckStep(string description, Func<BeatmapAvailability> expected)
         {
-            // In DownloadTrackingComposite, state changes are scheduled one frame later, wait one step.
-            AddWaitStep("wait for potential change", 1);
             AddAssert(description, () => availablilityTracker.Availability.Value.Equals(expected.Invoke()));
         }
 
@@ -157,6 +155,8 @@ namespace osu.Game.Tests.Online
         {
             public TaskCompletionSource<bool> AllowImport = new TaskCompletionSource<bool>();
 
+            public Task<BeatmapSetInfo> CurrentImportTask { get; private set; }
+
             protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize)
                 => new TestDownloadRequest(set);
 
@@ -168,7 +168,7 @@ namespace osu.Game.Tests.Online
             public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
             {
                 await AllowImport.Task;
-                return await base.Import(item, archive, cancellationToken);
+                return await (CurrentImportTask = base.Import(item, archive, cancellationToken));
             }
         }
 

From 50d57a39317c32d59e30006679a030bedfbdb10b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Feb 2021 17:07:16 +0300
Subject: [PATCH 07908/10326] Move tracker loading into BDL

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index f2cb1120cb..cdf889e4f1 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -41,11 +41,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         [Cached]
-        protected readonly MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker;
+        protected MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
 
         protected RoomSubScreen()
         {
-            InternalChild = BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = SelectedItem },
             };
@@ -54,6 +54,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
+            AddInternal(BeatmapAvailablilityTracker);
+
             sampleStart = audio.Samples.Get(@"SongSelect/confirm-selection");
         }
 

From 62d0036c819c0516005f9b5b3938d359e0cac987 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Feb 2021 17:45:07 +0300
Subject: [PATCH 07909/10326] Fix using private constructor on MessagePack
 object

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

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 2adeb9b959..a83327aad5 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Online.Rooms
         public readonly float? DownloadProgress;
 
         [JsonConstructor]
-        private BeatmapAvailability(DownloadState state, float? downloadProgress = null)
+        public BeatmapAvailability(DownloadState state, float? downloadProgress = null)
         {
             State = state;
             DownloadProgress = downloadProgress;

From 181d2c672b5c93c1dfb84929b78a413dfe326db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Feb 2021 22:05:25 +0100
Subject: [PATCH 07910/10326] Fix outdated comment

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

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index a7015ba1c4..2d438bd96e 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -343,7 +343,7 @@ namespace osu.Game.Screens.OnlinePlay
                                 Colour = Color4.Black,
                                 Width = 0.4f,
                             },
-                            // Piecewise-linear gradient with 3 segments to make it appear smoother
+                            // Piecewise-linear gradient with 2 segments to make it appear smoother
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,

From fc84ec131347ee220c9c9df63561b3e6a099156f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Feb 2021 22:18:14 +0100
Subject: [PATCH 07911/10326] Move anchor specification to central place

---
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 2d438bd96e..23c713a2c1 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -220,7 +220,11 @@ namespace osu.Game.Screens.OnlinePlay
                         AutoSizeAxes = Axes.Both,
                         Spacing = new Vector2(5),
                         X = -10,
-                        ChildrenEnumerable = CreateButtons()
+                        ChildrenEnumerable = CreateButtons().Select(button => button.With(b =>
+                        {
+                            b.Anchor = Anchor.Centre;
+                            b.Origin = Anchor.Centre;
+                        }))
                     }
                 }
             };
@@ -231,14 +235,10 @@ namespace osu.Game.Screens.OnlinePlay
             {
                 new PlaylistDownloadButton(Item)
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
                     Size = new Vector2(50, 30)
                 },
                 new PlaylistRemoveButton
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
                     Size = new Vector2(30, 30),
                     Alpha = allowEdit ? 1 : 0,
                     Action = () => RequestDeletion?.Invoke(Model),

From 21d5f842fccb799ad83ae47ca868b4b3a9827cbb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 14:52:36 +0900
Subject: [PATCH 07912/10326] Re-layout to reduce movement

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 95 +++++++++++--------
 1 file changed, 54 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 86982e2794..4664ac6bfe 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -97,18 +97,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                         },
                                         new Drawable[]
                                         {
-                                            new GridContainer
+                                            new Container
                                             {
                                                 RelativeSizeAxes = Axes.Both,
-                                                Content = new[]
+                                                Padding = new MarginPadding { Horizontal = 5, Vertical = 10 },
+                                                Child = new GridContainer
                                                 {
-                                                    new Drawable[]
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Content = new[]
                                                     {
-                                                        new Container
+                                                        new Drawable[]
                                                         {
-                                                            RelativeSizeAxes = Axes.Both,
-                                                            Padding = new MarginPadding { Horizontal = 5, Vertical = 10 },
-                                                            Child = new GridContainer
+                                                            // Main left column
+                                                            new GridContainer
                                                             {
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 RowDimensions = new[]
@@ -126,45 +127,57 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                         },
                                                                     }
                                                                 }
-                                                            }
-                                                        },
-                                                        new FillFlowContainer
-                                                        {
-                                                            Anchor = Anchor.Centre,
-                                                            Origin = Anchor.Centre,
-                                                            RelativeSizeAxes = Axes.X,
-                                                            AutoSizeAxes = Axes.Y,
-                                                            Padding = new MarginPadding { Horizontal = 5 },
-                                                            Spacing = new Vector2(0, 10),
-                                                            Children = new[]
+                                                            },
+                                                            // Main right column
+                                                            new FillFlowContainer
                                                             {
-                                                                new FillFlowContainer
+                                                                RelativeSizeAxes = Axes.X,
+                                                                AutoSizeAxes = Axes.Y,
+                                                                Children = new[]
                                                                 {
-                                                                    RelativeSizeAxes = Axes.X,
-                                                                    AutoSizeAxes = Axes.Y,
-                                                                    Children = new Drawable[]
+                                                                    new FillFlowContainer
                                                                     {
-                                                                        new OverlinedHeader("Beatmap"),
-                                                                        new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
-                                                                    }
-                                                                },
-                                                                userModsSection = new FillFlowContainer
-                                                                {
-                                                                    RelativeSizeAxes = Axes.X,
-                                                                    AutoSizeAxes = Axes.Y,
-                                                                    Children = new Drawable[]
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        AutoSizeAxes = Axes.Y,
+                                                                        Children = new Drawable[]
+                                                                        {
+                                                                            new OverlinedHeader("Beatmap"),
+                                                                            new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
+                                                                        }
+                                                                    },
+                                                                    userModsSection = new FillFlowContainer
                                                                     {
-                                                                        new OverlinedHeader("Extra mods"),
-                                                                        new ModDisplay
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        AutoSizeAxes = Axes.Y,
+                                                                        Margin = new MarginPadding { Top = 10 },
+                                                                        Children = new Drawable[]
                                                                         {
-                                                                            DisplayUnrankedText = false,
-                                                                            Current = UserMods
-                                                                        },
-                                                                        new PurpleTriangleButton
-                                                                        {
-                                                                            RelativeSizeAxes = Axes.X,
-                                                                            Text = "Select",
-                                                                            Action = () => userModsSelectOverlay.Show()
+                                                                            new OverlinedHeader("Extra mods"),
+                                                                            new FillFlowContainer
+                                                                            {
+                                                                                AutoSizeAxes = Axes.Both,
+                                                                                Direction = FillDirection.Horizontal,
+                                                                                Spacing = new Vector2(10, 0),
+                                                                                Children = new Drawable[]
+                                                                                {
+                                                                                    new PurpleTriangleButton
+                                                                                    {
+                                                                                        Anchor = Anchor.CentreLeft,
+                                                                                        Origin = Anchor.CentreLeft,
+                                                                                        Width = 90,
+                                                                                        Text = "Select",
+                                                                                        Action = () => userModsSelectOverlay.Show()
+                                                                                    },
+                                                                                    new ModDisplay
+                                                                                    {
+                                                                                        Anchor = Anchor.CentreLeft,
+                                                                                        Origin = Anchor.CentreLeft,
+                                                                                        DisplayUnrankedText = false,
+                                                                                        Current = UserMods,
+                                                                                        Scale = new Vector2(0.8f),
+                                                                                    },
+                                                                                }
+                                                                            }
                                                                         }
                                                                     }
                                                                 }

From 8bb13915152ef6c5ac4a96f684bdbece349409c8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 14:53:13 +0900
Subject: [PATCH 07913/10326] Fix inspection

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

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 768dc6512c..e2c98c0aad 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Client.AddUser(new User
                 {
                     Id = 0,
-                    Username = $"User 0",
+                    Username = "User 0",
                     CurrentModeRank = RNG.Next(1, 100000),
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 });

From 8295fb908174b78cdf7803a28e5b5be4ae5346e9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 16:28:22 +0900
Subject: [PATCH 07914/10326] Implement mania constant speed mod

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  1 +
 .../Mods/ManiaModConstantSpeed.cs             | 35 +++++++++++++++++++
 .../UI/DrawableManiaRuleset.cs                |  5 +++
 .../UI/Scrolling/DrawableScrollingRuleset.cs  |  8 ++---
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 59c766fd84..4c729fef83 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -238,6 +238,7 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModMirror(),
                         new ManiaModDifficultyAdjust(),
                         new ManiaModInvert(),
+                        new ManiaModConstantSpeed()
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
new file mode 100644
index 0000000000..078394b1d8
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.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.Sprites;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModConstantSpeed : Mod, IApplicableToDrawableRuleset<ManiaHitObject>
+    {
+        public override string Name => "Constant Speed";
+
+        public override string Acronym => "CS";
+
+        public override double ScoreMultiplier => 1;
+
+        public override string Description => "No more tricky speed changes!";
+
+        public override IconUsage? Icon => FontAwesome.Solid.Equals;
+
+        public override ModType Type => ModType.Conversion;
+
+        public override bool Ranked => false;
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
+        {
+            var maniaRuleset = (DrawableManiaRuleset)drawableRuleset;
+            maniaRuleset.ScrollMethod = ScrollVisualisationMethod.Constant;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 941ac9816c..6b34dbfa09 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Configuration;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -49,6 +50,10 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
+        public ScrollVisualisationMethod ScrollMethod = ScrollVisualisationMethod.Sequential;
+
+        protected override ScrollVisualisationMethod VisualisationMethod => ScrollMethod;
+
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
         private readonly Bindable<double> configTimeRange = new BindableDouble();
 
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index 0955f32790..6ffdad211b 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -91,7 +91,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
             scrollingInfo = new LocalScrollingInfo();
             scrollingInfo.Direction.BindTo(Direction);
             scrollingInfo.TimeRange.BindTo(TimeRange);
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             switch (VisualisationMethod)
             {
                 case ScrollVisualisationMethod.Sequential:
@@ -106,11 +110,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     scrollingInfo.Algorithm = new ConstantScrollAlgorithm();
                     break;
             }
-        }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
             double lastObjectTime = Objects.LastOrDefault()?.GetEndTime() ?? double.MaxValue;
             double baseBeatLength = TimingControlPoint.DEFAULT_BEAT_LENGTH;
 

From c8f1126bd793cdf6169a1d27742fd0909cdd9c33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 19:44:39 +0900
Subject: [PATCH 07915/10326] Add failing test

---
 ...tion.cs => TestAPIModJsonSerialization.cs} |   2 +-
 .../TestAPIModMessagePackSerialization.cs     | 139 ++++++++++++++++++
 2 files changed, 140 insertions(+), 1 deletion(-)
 rename osu.Game.Tests/Online/{TestAPIModSerialization.cs => TestAPIModJsonSerialization.cs} (99%)
 create mode 100644 osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs

diff --git a/osu.Game.Tests/Online/TestAPIModSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
similarity index 99%
rename from osu.Game.Tests/Online/TestAPIModSerialization.cs
rename to osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index 5948582d77..aa6f66da81 100644
--- a/osu.Game.Tests/Online/TestAPIModSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -16,7 +16,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Tests.Online
 {
     [TestFixture]
-    public class TestAPIModSerialization
+    public class TestAPIModJsonSerialization
     {
         [Test]
         public void TestAcronymIsPreserved()
diff --git a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
new file mode 100644
index 0000000000..4294f89397
--- /dev/null
+++ b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
@@ -0,0 +1,139 @@
+// Copyright (c) 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 MessagePack;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Online.API;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Tests.Online
+{
+    [TestFixture]
+    public class TestAPIModMessagePackSerialization
+    {
+        [Test]
+        public void TestAcronymIsPreserved()
+        {
+            var apiMod = new APIMod(new TestMod());
+
+            var deserialized = MessagePackSerializer.Deserialize<APIMod>(MessagePackSerializer.Serialize(apiMod));
+
+            Assert.That(deserialized.Acronym, Is.EqualTo(apiMod.Acronym));
+        }
+
+        [Test]
+        public void TestRawSettingIsPreserved()
+        {
+            var apiMod = new APIMod(new TestMod { TestSetting = { Value = 2 } });
+
+            var deserialized = MessagePackSerializer.Deserialize<APIMod>(MessagePackSerializer.Serialize(apiMod));
+
+            Assert.That(deserialized.Settings, Contains.Key("test_setting").With.ContainValue(2.0));
+        }
+
+        [Test]
+        public void TestConvertedModHasCorrectSetting()
+        {
+            var apiMod = new APIMod(new TestMod { TestSetting = { Value = 2 } });
+
+            var deserialized = MessagePackSerializer.Deserialize<APIMod>(MessagePackSerializer.Serialize(apiMod));
+            var converted = (TestMod)deserialized.ToMod(new TestRuleset());
+
+            Assert.That(converted.TestSetting.Value, Is.EqualTo(2));
+        }
+
+        [Test]
+        public void TestDeserialiseTimeRampMod()
+        {
+            // Create the mod with values different from default.
+            var apiMod = new APIMod(new TestModTimeRamp
+            {
+                AdjustPitch = { Value = false },
+                InitialRate = { Value = 1.25 },
+                FinalRate = { Value = 0.25 }
+            });
+
+            var deserialised = MessagePackSerializer.Deserialize<APIMod>(MessagePackSerializer.Serialize(apiMod));
+            var converted = (TestModTimeRamp)deserialised.ToMod(new TestRuleset());
+
+            Assert.That(converted.AdjustPitch.Value, Is.EqualTo(false));
+            Assert.That(converted.InitialRate.Value, Is.EqualTo(1.25));
+            Assert.That(converted.FinalRate.Value, Is.EqualTo(0.25));
+        }
+
+        private class TestRuleset : Ruleset
+        {
+            public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[]
+            {
+                new TestMod(),
+                new TestModTimeRamp(),
+            };
+
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new System.NotImplementedException();
+
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => throw new System.NotImplementedException();
+
+            public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => throw new System.NotImplementedException();
+
+            public override string Description { get; } = string.Empty;
+            public override string ShortName { get; } = string.Empty;
+        }
+
+        private class TestMod : Mod
+        {
+            public override string Name => "Test Mod";
+            public override string Acronym => "TM";
+            public override double ScoreMultiplier => 1;
+
+            [SettingSource("Test")]
+            public BindableNumber<double> TestSetting { get; } = new BindableDouble
+            {
+                MinValue = 0,
+                MaxValue = 10,
+                Default = 5,
+                Precision = 0.01,
+            };
+        }
+
+        private class TestModTimeRamp : ModTimeRamp
+        {
+            public override string Name => "Test Mod";
+            public override string Acronym => "TMTR";
+            public override double ScoreMultiplier => 1;
+
+            [SettingSource("Initial rate", "The starting speed of the track")]
+            public override BindableNumber<double> InitialRate { get; } = new BindableDouble
+            {
+                MinValue = 1,
+                MaxValue = 2,
+                Default = 1.5,
+                Value = 1.5,
+                Precision = 0.01,
+            };
+
+            [SettingSource("Final rate", "The speed increase to ramp towards")]
+            public override BindableNumber<double> FinalRate { get; } = new BindableDouble
+            {
+                MinValue = 0,
+                MaxValue = 1,
+                Default = 0.5,
+                Value = 0.5,
+                Precision = 0.01,
+            };
+
+            [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
+            public override BindableBool AdjustPitch { get; } = new BindableBool
+            {
+                Default = true,
+                Value = true
+            };
+        }
+    }
+}

From 75f1ebd5f92ef4200f21f457bea58a23d4cdfa70 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 19:46:47 +0900
Subject: [PATCH 07916/10326] Add custom resolver for mod settings dictionary

---
 osu.Game/Online/API/APIMod.cs                 |  1 +
 .../API/ModSettingsDictionaryFormatter.cs     | 96 +++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 osu.Game/Online/API/ModSettingsDictionaryFormatter.cs

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 69ce3825ee..bff08b0515 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Online.API
 
         [JsonProperty("settings")]
         [Key(1)]
+        [MessagePackFormatter(typeof(ModSettingsDictionaryFormatter))]
         public Dictionary<string, object> Settings { get; set; } = new Dictionary<string, object>();
 
         [JsonConstructor]
diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
new file mode 100644
index 0000000000..a8ee9beca5
--- /dev/null
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using MessagePack;
+using MessagePack.Formatters;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Online.API
+{
+    public class ModSettingsDictionaryFormatter : IMessagePackFormatter<Dictionary<string, object>>
+    {
+        public int Serialize(ref byte[] bytes, int offset, Dictionary<string, object> value, IFormatterResolver formatterResolver)
+        {
+            int startOffset = offset;
+
+            offset += MessagePackBinary.WriteArrayHeader(ref bytes, offset, value.Count);
+
+            foreach (var kvp in value)
+            {
+                offset += MessagePackBinary.WriteString(ref bytes, offset, kvp.Key);
+
+                switch (kvp.Value)
+                {
+                    case Bindable<double> d:
+                        offset += MessagePackBinary.WriteDouble(ref bytes, offset, d.Value);
+                        break;
+
+                    case Bindable<float> f:
+                        offset += MessagePackBinary.WriteSingle(ref bytes, offset, f.Value);
+                        break;
+
+                    case Bindable<bool> b:
+                        offset += MessagePackBinary.WriteBoolean(ref bytes, offset, b.Value);
+                        break;
+
+                    default:
+                        throw new ArgumentException("A setting was of a type not supported by the messagepack serialiser", nameof(bytes));
+                }
+            }
+
+            return offset - startOffset;
+        }
+
+        public Dictionary<string, object> Deserialize(byte[] bytes, int offset, IFormatterResolver formatterResolver, out int readSize)
+        {
+            int startOffset = offset;
+
+            var output = new Dictionary<string, object>();
+
+            int itemCount = MessagePackBinary.ReadArrayHeader(bytes, offset, out readSize);
+            offset += readSize;
+
+            for (int i = 0; i < itemCount; i++)
+            {
+                var key = MessagePackBinary.ReadString(bytes, offset, out readSize);
+                offset += readSize;
+
+                switch (MessagePackBinary.GetMessagePackType(bytes, offset))
+                {
+                    case MessagePackType.Float:
+                    {
+                        // could be either float or double...
+                        // see https://github.com/msgpack/msgpack/blob/master/spec.md#serialization-type-to-format-conversion
+                        switch (MessagePackCode.ToFormatName(bytes[offset]))
+                        {
+                            case "float 32":
+                                output[key] = MessagePackBinary.ReadSingle(bytes, offset, out readSize);
+                                offset += readSize;
+                                break;
+
+                            case "float 64":
+                                output[key] = MessagePackBinary.ReadDouble(bytes, offset, out readSize);
+                                offset += readSize;
+                                break;
+
+                            default:
+                                throw new ArgumentException("A setting was of a type not supported by the messagepack deserialiser", nameof(bytes));
+                        }
+
+                        break;
+                    }
+
+                    case MessagePackType.Boolean:
+                        output[key] = MessagePackBinary.ReadBoolean(bytes, offset, out readSize);
+                        offset += readSize;
+                        break;
+
+                    default:
+                        throw new ArgumentException("A setting was of a type not supported by the messagepack deserialiser", nameof(bytes));
+                }
+            }
+
+            readSize = offset - startOffset;
+            return output;
+        }
+    }
+}

From d3f056f188ee7410f7603d71b6abec964755231b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 20:06:25 +0900
Subject: [PATCH 07917/10326] Add missing licence header

---
 osu.Game/Online/API/ModSettingsDictionaryFormatter.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index a8ee9beca5..1b381e7c98 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.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.
+
 using System;
 using System.Collections.Generic;
 using MessagePack;

From 1380717ebb5b51da488736df8cd30484ecc62532 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 20:19:27 +0900
Subject: [PATCH 07918/10326] Use PrimitiveObjectFormatter to simplify code

---
 .../API/ModSettingsDictionaryFormatter.cs     | 43 +++----------------
 1 file changed, 7 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index 1b381e7c98..3dd8bff61b 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Online.API
         {
             int startOffset = offset;
 
+            var primitiveFormatter = PrimitiveObjectFormatter.Instance;
+
             offset += MessagePackBinary.WriteArrayHeader(ref bytes, offset, value.Count);
 
             foreach (var kvp in value)
@@ -24,15 +26,15 @@ namespace osu.Game.Online.API
                 switch (kvp.Value)
                 {
                     case Bindable<double> d:
-                        offset += MessagePackBinary.WriteDouble(ref bytes, offset, d.Value);
+                        offset += primitiveFormatter.Serialize(ref bytes, offset, d.Value, formatterResolver);
                         break;
 
                     case Bindable<float> f:
-                        offset += MessagePackBinary.WriteSingle(ref bytes, offset, f.Value);
+                        offset += primitiveFormatter.Serialize(ref bytes, offset, f.Value, formatterResolver);
                         break;
 
                     case Bindable<bool> b:
-                        offset += MessagePackBinary.WriteBoolean(ref bytes, offset, b.Value);
+                        offset += primitiveFormatter.Serialize(ref bytes, offset, b.Value, formatterResolver);
                         break;
 
                     default:
@@ -57,39 +59,8 @@ namespace osu.Game.Online.API
                 var key = MessagePackBinary.ReadString(bytes, offset, out readSize);
                 offset += readSize;
 
-                switch (MessagePackBinary.GetMessagePackType(bytes, offset))
-                {
-                    case MessagePackType.Float:
-                    {
-                        // could be either float or double...
-                        // see https://github.com/msgpack/msgpack/blob/master/spec.md#serialization-type-to-format-conversion
-                        switch (MessagePackCode.ToFormatName(bytes[offset]))
-                        {
-                            case "float 32":
-                                output[key] = MessagePackBinary.ReadSingle(bytes, offset, out readSize);
-                                offset += readSize;
-                                break;
-
-                            case "float 64":
-                                output[key] = MessagePackBinary.ReadDouble(bytes, offset, out readSize);
-                                offset += readSize;
-                                break;
-
-                            default:
-                                throw new ArgumentException("A setting was of a type not supported by the messagepack deserialiser", nameof(bytes));
-                        }
-
-                        break;
-                    }
-
-                    case MessagePackType.Boolean:
-                        output[key] = MessagePackBinary.ReadBoolean(bytes, offset, out readSize);
-                        offset += readSize;
-                        break;
-
-                    default:
-                        throw new ArgumentException("A setting was of a type not supported by the messagepack deserialiser", nameof(bytes));
-                }
+                output[key] = PrimitiveObjectFormatter.Instance.Deserialize(bytes, offset, formatterResolver, out readSize);
+                offset += readSize;
             }
 
             readSize = offset - startOffset;

From 65d45ec74cefcc4db80ef0d83d9bc598bc2e864b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 20:50:22 +0900
Subject: [PATCH 07919/10326] Unschedule cancellation

---
 .../Multiplayer/StatefulMultiplayerClient.cs     | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index de51a4b117..7d729a3c11 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -117,13 +117,7 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="room">The API <see cref="Room"/>.</param>
         public async Task JoinRoom(Room room)
         {
-            var cancellationSource = new CancellationTokenSource();
-
-            await scheduleAsync(() =>
-            {
-                joinCancellationSource?.Cancel();
-                joinCancellationSource = cancellationSource;
-            }, CancellationToken.None);
+            var cancellationSource = joinCancellationSource = new CancellationTokenSource();
 
             await joinOrLeaveTaskChain.Add(async () =>
             {
@@ -162,15 +156,15 @@ namespace osu.Game.Online.Multiplayer
 
         public Task LeaveRoom()
         {
+            // The join may have not completed yet, so certain tasks that either update the room or reference the room should be cancelled.
+            // This includes the setting of Room itself along with the initial update of the room settings on join.
+            joinCancellationSource?.Cancel();
+
             // Leaving rooms is expected to occur instantaneously whilst the operation is finalised in the background.
             // However a few members need to be reset immediately to prevent other components from entering invalid states whilst the operation hasn't yet completed.
             // For example, if a room was left and the user immediately pressed the "create room" button, then the user could be taken into the lobby if the value of Room is not reset in time.
             var scheduledReset = scheduleAsync(() =>
             {
-                // The join may have not completed yet, so certain tasks that either update the room or reference the room should be cancelled.
-                // This includes the setting of Room itself along with the initial update of the room settings on join.
-                joinCancellationSource?.Cancel();
-
                 apiRoom = null;
                 Room = null;
                 CurrentMatchPlayingUserIds.Clear();

From 623b47f9af503a400facfea44e2db230db42a279 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 21:25:05 +0900
Subject: [PATCH 07920/10326] Add flag to toggle follow circle tracking for
 slider heads

---
 .../Objects/Drawables/DrawableSliderHead.cs        | 14 ++++++++++----
 osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs  |  4 ++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index acc95ab036..c051a9918d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSliderHead : DrawableHitCircle
     {
+        public new SliderHeadCircle HitObject => (SliderHeadCircle)base.HitObject;
+
         [CanBeNull]
         public Slider Slider => DrawableSlider?.HitObject;
 
@@ -59,12 +61,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.Update();
 
             Debug.Assert(Slider != null);
+            Debug.Assert(HitObject != null);
 
-            double completionProgress = Math.Clamp((Time.Current - Slider.StartTime) / Slider.Duration, 0, 1);
+            if (HitObject.TrackFollowCircle)
+            {
+                double completionProgress = Math.Clamp((Time.Current - Slider.StartTime) / Slider.Duration, 0, 1);
 
-            //todo: we probably want to reconsider this before adding scoring, but it looks and feels nice.
-            if (!IsHit)
-                Position = Slider.CurvePositionAt(completionProgress);
+                //todo: we probably want to reconsider this before adding scoring, but it looks and feels nice.
+                if (!IsHit)
+                    Position = Slider.CurvePositionAt(completionProgress);
+            }
         }
 
         public Action<double> OnShake;
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index f6d46aeef5..5fc480883a 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -5,5 +5,9 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SliderHeadCircle : HitCircle
     {
+        /// <summary>
+        /// Makes the head circle track the follow circle when the start time is reached.
+        /// </summary>
+        public bool TrackFollowCircle = true;
     }
 }

From 3fe190cfbe7c5fb3c6d2863ea53a33b370ea03cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 22:00:16 +0900
Subject: [PATCH 07921/10326] Show original error message on web exceptions (or
 is no message is returned)

---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 7936ab8ecd..dc98eb8687 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
@@ -65,7 +66,10 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             {
                 failed = true;
 
-                Logger.Log($"You are not able to submit a score: {e.Message}", LoggingTarget.Information, LogLevel.Important);
+                if (e is WebException || string.IsNullOrEmpty(e.Message))
+                    Logger.Error(e, "Failed to retrieve a score submission token.\n\nThis may happen if you are running an old or non-official release of osu! (ie. you are self-compiling).");
+                else
+                    Logger.Log($"You are not able to submit a score: {e.Message}", level: LogLevel.Important);
 
                 Schedule(() =>
                 {

From 9d7164816cf073be96b07353d6d996c50086ad71 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 22:02:40 +0900
Subject: [PATCH 07922/10326] Add reverse binding for max attempts (currently
 unused but good for safety)

---
 .../OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index bf85ecf13d..56d3143f59 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -280,6 +280,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 RoomName.BindValueChanged(name => NameField.Text = name.NewValue, true);
                 Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
                 MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
+                MaxAttempts.BindValueChanged(count => MaxAttemptsField.Text = count.NewValue?.ToString(), true);
                 Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue ?? TimeSpan.FromMinutes(30), true);
 
                 playlist.Items.BindTo(Playlist);

From e3d323989c6925304f1f8e126e3cab6aee31695a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 20:42:27 +0900
Subject: [PATCH 07923/10326] Switch to SignalR 5.0 and implement using better
 API

---
 .../API/ModSettingsDictionaryFormatter.cs     | 39 ++++++++-----------
 osu.Game/osu.Game.csproj                      |  7 ++--
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index 3dd8bff61b..fc6b82a16b 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -1,8 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
+using System.Buffers;
 using System.Collections.Generic;
+using System.Text;
 using MessagePack;
 using MessagePack.Formatters;
 using osu.Framework.Bindables;
@@ -11,59 +12,51 @@ namespace osu.Game.Online.API
 {
     public class ModSettingsDictionaryFormatter : IMessagePackFormatter<Dictionary<string, object>>
     {
-        public int Serialize(ref byte[] bytes, int offset, Dictionary<string, object> value, IFormatterResolver formatterResolver)
+        public void Serialize(ref MessagePackWriter writer, Dictionary<string, object> value, MessagePackSerializerOptions options)
         {
-            int startOffset = offset;
-
             var primitiveFormatter = PrimitiveObjectFormatter.Instance;
 
-            offset += MessagePackBinary.WriteArrayHeader(ref bytes, offset, value.Count);
+            writer.WriteArrayHeader(value.Count);
 
             foreach (var kvp in value)
             {
-                offset += MessagePackBinary.WriteString(ref bytes, offset, kvp.Key);
+                var stringBytes = new ReadOnlySequence<byte>(Encoding.UTF8.GetBytes(kvp.Key));
+                writer.WriteString(in stringBytes);
 
                 switch (kvp.Value)
                 {
                     case Bindable<double> d:
-                        offset += primitiveFormatter.Serialize(ref bytes, offset, d.Value, formatterResolver);
+                        primitiveFormatter.Serialize(ref writer, d.Value, options);
                         break;
 
                     case Bindable<float> f:
-                        offset += primitiveFormatter.Serialize(ref bytes, offset, f.Value, formatterResolver);
+                        primitiveFormatter.Serialize(ref writer, f.Value, options);
                         break;
 
                     case Bindable<bool> b:
-                        offset += primitiveFormatter.Serialize(ref bytes, offset, b.Value, formatterResolver);
+                        primitiveFormatter.Serialize(ref writer, b.Value, options);
                         break;
 
                     default:
-                        throw new ArgumentException("A setting was of a type not supported by the messagepack serialiser", nameof(bytes));
+                        // fall back for non-bindable cases.
+                        primitiveFormatter.Serialize(ref writer, kvp.Value, options);
+                        break;
                 }
             }
-
-            return offset - startOffset;
         }
 
-        public Dictionary<string, object> Deserialize(byte[] bytes, int offset, IFormatterResolver formatterResolver, out int readSize)
+        public Dictionary<string, object> Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions options)
         {
-            int startOffset = offset;
-
             var output = new Dictionary<string, object>();
 
-            int itemCount = MessagePackBinary.ReadArrayHeader(bytes, offset, out readSize);
-            offset += readSize;
+            int itemCount = reader.ReadArrayHeader();
 
             for (int i = 0; i < itemCount; i++)
             {
-                var key = MessagePackBinary.ReadString(bytes, offset, out readSize);
-                offset += readSize;
-
-                output[key] = PrimitiveObjectFormatter.Instance.Deserialize(bytes, offset, formatterResolver, out readSize);
-                offset += readSize;
+                output[reader.ReadString()] =
+                    PrimitiveObjectFormatter.Instance.Deserialize(ref reader, options);
             }
 
-            readSize = offset - startOffset;
             return output;
         }
     }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e2b506e187..eabd5c7d12 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -20,11 +20,12 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.11" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />

From 03b7817887ea059719094f001a81c5b4f1c9ee36 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 22:12:20 +0900
Subject: [PATCH 07924/10326] Add flags to return to classic slider scoring

---
 .../Objects/Drawables/DrawableHitCircle.cs    |  9 ++++++-
 .../Objects/Drawables/DrawableSlider.cs       | 24 ++++++++++++++++++-
 .../Objects/Drawables/DrawableSliderHead.cs   | 15 ++++++++++++
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  8 ++++++-
 .../Objects/SliderHeadCircle.cs               | 14 ++++++++++-
 5 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 3c0260f5f5..77094f928b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 return;
             }
 
-            var result = HitObject.HitWindows.ResultFor(timeOffset);
+            var result = ResultFor(timeOffset);
 
             if (result == HitResult.None || CheckHittable?.Invoke(this, Time.Current) == false)
             {
@@ -146,6 +146,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             });
         }
 
+        /// <summary>
+        /// Retrieves the <see cref="HitResult"/> for a time offset.
+        /// </summary>
+        /// <param name="timeOffset">The time offset.</param>
+        /// <returns>The hit result, or <see cref="HitResult.None"/> if <paramref name="timeOffset"/> doesn't result in a judgement.</returns>
+        protected virtual HitResult ResultFor(double timeOffset) => HitObject.HitWindows.ResultFor(timeOffset);
+
         protected override void UpdateInitialTransforms()
         {
             base.UpdateInitialTransforms();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 511cbc2347..7061ce59d0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Scoring;
 using osuTK.Graphics;
 using osu.Game.Skinning;
 
@@ -249,7 +250,28 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || Time.Current < HitObject.EndTime)
                 return;
 
-            ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            if (HitObject.IgnoreJudgement)
+            {
+                ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
+                return;
+            }
+
+            // If not ignoring judgement, score proportionally based on the number of ticks hit, counting the head circle as a tick.
+            ApplyResult(r =>
+            {
+                int totalTicks = NestedHitObjects.Count;
+                int hitTicks = NestedHitObjects.Count(h => h.IsHit);
+                double hitFraction = (double)totalTicks / hitTicks;
+
+                if (hitTicks == totalTicks)
+                    r.Type = HitResult.Great;
+                else if (hitFraction >= 0.5)
+                    r.Type = HitResult.Ok;
+                else if (hitFraction > 0)
+                    r.Type = HitResult.Meh;
+                else
+                    r.Type = HitResult.Miss;
+            });
         }
 
         public override void PlaySamples()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index c051a9918d..08e9c5eb14 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -7,6 +7,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -19,6 +20,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
 
+        public override bool DisplayResult => HitObject?.JudgeAsNormalHitCircle ?? base.DisplayResult;
+
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
         protected override OsuSkinComponents CirclePieceComponent => OsuSkinComponents.SliderHeadHitCircle;
@@ -73,6 +76,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        protected override HitResult ResultFor(double timeOffset)
+        {
+            Debug.Assert(HitObject != null);
+
+            if (HitObject.JudgeAsNormalHitCircle)
+                return base.ResultFor(timeOffset);
+
+            // If not judged as a normal hitcircle, only track whether a hit has occurred (via IgnoreHit) rather than a scorable hit result.
+            var result = base.ResultFor(timeOffset);
+            return result.IsHit() ? HitResult.IgnoreHit : result;
+        }
+
         public Action<double> OnShake;
 
         public override void Shake(double maximumLength) => OnShake?.Invoke(maximumLength);
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 1670df24a8..e3365a8ccf 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -114,6 +114,12 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public double TickDistanceMultiplier = 1;
 
+        /// <summary>
+        /// Whether this <see cref="Slider"/>'s judgement should be ignored.
+        /// If <c>false</c>, this <see cref="Slider"/> will be judged proportionally to the number of ticks hit.
+        /// </summary>
+        public bool IgnoreJudgement = true;
+
         [JsonIgnore]
         public HitCircle HeadCircle { get; protected set; }
 
@@ -233,7 +239,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                 HeadCircle.Samples = this.GetNodeSamples(0);
         }
 
-        public override Judgement CreateJudgement() => new OsuIgnoreJudgement();
+        public override Judgement CreateJudgement() => IgnoreJudgement ? new OsuIgnoreJudgement() : new OsuJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index 5fc480883a..13eac60300 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -1,13 +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.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Judgements;
+
 namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SliderHeadCircle : HitCircle
     {
         /// <summary>
-        /// Makes the head circle track the follow circle when the start time is reached.
+        /// Makes this <see cref="SliderHeadCircle"/> track the follow circle when the start time is reached.
+        /// If <c>false</c>, this <see cref="SliderHeadCircle"/> will be pinned to its initial position in the slider.
         /// </summary>
         public bool TrackFollowCircle = true;
+
+        /// <summary>
+        /// Whether to treat this <see cref="SliderHeadCircle"/> as a normal <see cref="HitCircle"/> for judgement purposes.
+        /// If <c>false</c>, judgement will be ignored.
+        /// </summary>
+        public bool JudgeAsNormalHitCircle = true;
+
+        public override Judgement CreateJudgement() => JudgeAsNormalHitCircle ? base.CreateJudgement() : new OsuIgnoreJudgement();
     }
 }

From 2f22dbe06be3645ed9c5e8f99cc015414f578256 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 22:42:50 +0900
Subject: [PATCH 07925/10326] Make sliders display judgements when not ignored

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 13f5960bd4..79655c33e4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (JudgedObject?.HitObject is OsuHitObject osuObject)
             {
-                Position = osuObject.StackedPosition;
+                Position = osuObject.StackedEndPosition;
                 Scale = new Vector2(osuObject.Scale);
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 7061ce59d0..e607163b3e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public SliderBall Ball { get; private set; }
         public SkinnableDrawable Body { get; private set; }
 
-        public override bool DisplayResult => false;
+        public override bool DisplayResult => !HitObject.IgnoreJudgement;
 
         private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody;
 

From 3b5c67a0630681b6e1e2f0d52486e241772661d3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 23:08:59 +0900
Subject: [PATCH 07926/10326] Add OsuModClassic

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs | 43 +++++++++++++++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs         |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
new file mode 100644
index 0000000000..5542580979
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.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.Linq;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModClassic : Mod, IApplicableToHitObject
+    {
+        public override string Name => "Classic";
+
+        public override string Acronym => "CL";
+
+        public override double ScoreMultiplier => 1;
+
+        public override IconUsage? Icon => FontAwesome.Solid.History;
+
+        public override string Description => "Feeling nostalgic?";
+
+        public override bool Ranked => false;
+
+        public void ApplyToHitObject(HitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case Slider slider:
+                    slider.IgnoreJudgement = false;
+
+                    foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
+                    {
+                        head.TrackFollowCircle = false;
+                        head.JudgeAsNormalHitCircle = false;
+                    }
+
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index cba0c5be14..18324a18a8 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -163,6 +163,7 @@ namespace osu.Game.Rulesets.Osu
                     {
                         new OsuModTarget(),
                         new OsuModDifficultyAdjust(),
+                        new OsuModClassic()
                     };
 
                 case ModType.Automation:

From abdd417eb6ace553d81a11c32b6bc723247557b8 Mon Sep 17 00:00:00 2001
From: vmaggioli <vinmags16@gmail.com>
Date: Wed, 3 Feb 2021 10:03:38 -0500
Subject: [PATCH 07927/10326] Remove slider changes

---
 .../TestSceneSliderSelectionBlueprint.cs      | 19 -------------------
 .../Sliders/SliderSelectionBlueprint.cs       |  6 +-----
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index 4edf778bfd..f6e1be693b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -161,18 +161,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             checkControlPointSelected(1, false);
         }
 
-        [Test]
-        public void TestZeroLengthSliderNotAllowed()
-        {
-            moveMouseToControlPoint(1);
-            dragMouseToControlPoint(0);
-
-            moveMouseToControlPoint(2);
-            dragMouseToControlPoint(0);
-
-            AddAssert("slider has non-zero duration", () => slider.Duration > 0);
-        }
-
         private void moveHitObject()
         {
             AddStep("move hitobject", () =>
@@ -201,13 +189,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
         }
 
-        private void dragMouseToControlPoint(int index)
-        {
-            AddStep("hold down mouse button", () => InputManager.PressButton(MouseButton.Left));
-            moveMouseToControlPoint(index);
-            AddStep("release mouse button", () => InputManager.ReleaseButton(MouseButton.Left));
-        }
-
         private void checkControlPointSelected(int index, bool selected)
             => AddAssert($"control point {index} {(selected ? "selected" : "not selected")}", () => blueprint.ControlPointVisualiser.Pieces[index].IsSelected.Value == selected);
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 508783a499..3d3dff653a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -226,11 +226,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private void updatePath()
         {
-            float expectedDistance = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
-            if (expectedDistance < 1)
-                return;
-
-            HitObject.Path.ExpectedDistance.Value = expectedDistance;
+            HitObject.Path.ExpectedDistance.Value = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
             editorBeatmap?.Update(HitObject);
         }
 

From db3f9e7cbee3ff3c719d80fc2943420b82a828a2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 4 Feb 2021 02:20:18 +0300
Subject: [PATCH 07928/10326] Apply documentation suggestion

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

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 188cb9be7a..69c6ebd07c 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -67,10 +67,10 @@ namespace osu.Game.Online
         }
 
         /// <summary>
-        /// Verifies that the given databased model is in a correct state to be considered available.
+        /// Checks that a database model matches the one expected to be downloaded.
         /// </summary>
         /// <example>
-        /// In the case of multiplayer/playlists, this has to verify that the databased beatmap set with the selected beatmap matches what's online.
+        /// In the case of multiplayer/playlists, this has to check that the databased beatmap set with the selected beatmap matches what's online.
         /// </example>
         /// <param name="databasedModel">The model in database.</param>
         protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;

From 76cfeae7e9cf844996ac9c53a54a1756034d1562 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 15:10:56 +0900
Subject: [PATCH 07929/10326] Add support for Bindable int in config

---
 osu.Game/Online/API/ModSettingsDictionaryFormatter.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index fc6b82a16b..99e87677fa 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -29,6 +29,10 @@ namespace osu.Game.Online.API
                         primitiveFormatter.Serialize(ref writer, d.Value, options);
                         break;
 
+                    case Bindable<int> i:
+                        primitiveFormatter.Serialize(ref writer, i.Value, options);
+                        break;
+
                     case Bindable<float> f:
                         primitiveFormatter.Serialize(ref writer, f.Value, options);
                         break;

From d165344070434f8e47af0d92c206b7a7fe9ee9ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 15:19:57 +0900
Subject: [PATCH 07930/10326] Force newer version of MessagePack for fixed iOS
 compatibility

---
 osu.Game/osu.Game.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index eabd5c7d12..f866b232d8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -20,6 +20,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
+    <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />

From 30dae5bf1c1188139fb683e235b15b16af5e83ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 4 Feb 2021 15:17:47 +0900
Subject: [PATCH 07931/10326] Add test to make sure the algorithm is passed
 down in time

---
 .../Mods/TestSceneManiaModConstantSpeed.cs    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs
new file mode 100644
index 0000000000..60363aaeef
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Rulesets.UI.Scrolling.Algorithms;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests.Mods
+{
+    public class TestSceneManiaModConstantSpeed : ModTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
+        [Test]
+        public void TestConstantScroll() => CreateModTest(new ModTestData
+        {
+            Mod = new ManiaModConstantSpeed(),
+            PassCondition = () =>
+            {
+                var hitObject = Player.ChildrenOfType<DrawableManiaHitObject>().FirstOrDefault();
+                return hitObject?.Dependencies.Get<IScrollingInfo>().Algorithm is ConstantScrollAlgorithm;
+            }
+        });
+    }
+}

From a36b426b243e42062b93782ad5204dd35bd5ad88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 15:46:50 +0900
Subject: [PATCH 07932/10326] Force iOS back to previous versions of
 messagepack

---
 osu.iOS.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.iOS.props b/osu.iOS.props
index dc3527c687..22d104f2e1 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -80,6 +80,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.0.3" />
+    <PackageReference Include="MessagePack" Version="1.7.3.7" />
+    <PackageReference Include="MessagePack.Annotations" Version="2.2.85" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From b2f1e133f86d3cf26d9581cdb45c0beecbe2ab5f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 16:53:55 +0900
Subject: [PATCH 07933/10326] Allow checkbox nub to be moved to the left

---
 .../Graphics/UserInterface/OsuCheckbox.cs     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 517f83daa9..313962d9c6 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Graphics.UserInterface
         private SampleChannel sampleChecked;
         private SampleChannel sampleUnchecked;
 
-        public OsuCheckbox()
+        public OsuCheckbox(bool nubOnRight = true)
         {
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
@@ -61,17 +61,24 @@ namespace osu.Game.Graphics.UserInterface
                 {
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
-                    Padding = new MarginPadding { Right = Nub.EXPANDED_SIZE + nub_padding }
-                },
-                Nub = new Nub
-                {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Margin = new MarginPadding { Right = nub_padding },
                 },
+                Nub = new Nub(),
                 new HoverClickSounds()
             };
 
+            if (nubOnRight)
+            {
+                Nub.Anchor = Anchor.CentreRight;
+                Nub.Origin = Anchor.CentreRight;
+                Nub.Margin = new MarginPadding { Right = nub_padding };
+                labelText.Padding = new MarginPadding { Right = Nub.EXPANDED_SIZE + nub_padding };
+            }
+            else
+            {
+                Nub.Margin = new MarginPadding { Left = nub_padding };
+                labelText.Padding = new MarginPadding { Left = Nub.EXPANDED_SIZE + nub_padding };
+            }
+
             Nub.Current.BindTo(Current);
 
             Current.DisabledChanged += disabled => labelText.Alpha = Nub.Alpha = disabled ? 0.3f : 1;

From 3148bbda2a09c00f38aec261bcb4b78559c9412e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 16:54:17 +0900
Subject: [PATCH 07934/10326] Allow custom font to be used in OsuCheckbox

---
 osu.Game/Graphics/UserInterface/OsuCheckbox.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 313962d9c6..61a42dac23 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
@@ -57,7 +58,7 @@ namespace osu.Game.Graphics.UserInterface
 
             Children = new Drawable[]
             {
-                labelText = new OsuTextFlowContainer
+                labelText = new OsuTextFlowContainer(ApplyLabelParameters)
                 {
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
@@ -84,6 +85,13 @@ namespace osu.Game.Graphics.UserInterface
             Current.DisabledChanged += disabled => labelText.Alpha = Nub.Alpha = disabled ? 0.3f : 1;
         }
 
+        /// <summary>
+        /// A function which can be overridden to change the parameters of the label's text.
+        /// </summary>
+        protected virtual void ApplyLabelParameters(SpriteText text)
+        {
+        }
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {

From 48a58e790e2d2ec640d3273ee78e222ff6aed07e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 16:57:39 +0900
Subject: [PATCH 07935/10326] Don't specify arbitrary width

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

diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 5b9a19897f..c60afeb2aa 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.OnlinePlay
             protected override Drawable CreateHeader(string text) => new Container
             {
                 AutoSizeAxes = Axes.Y,
-                Width = 175,
+                RelativeSizeAxes = Axes.X,
                 Child = checkbox = new HeaderCheckbox
                 {
                     LabelText = text,

From b32e10514d1f8f48d7e580947176a56faa497d5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 16:58:02 +0900
Subject: [PATCH 07936/10326] Fix padding on label text not being
 double-applied (meaning no padding between nub and text)

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

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 61a42dac23..b80941c0bc 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -72,12 +72,12 @@ namespace osu.Game.Graphics.UserInterface
                 Nub.Anchor = Anchor.CentreRight;
                 Nub.Origin = Anchor.CentreRight;
                 Nub.Margin = new MarginPadding { Right = nub_padding };
-                labelText.Padding = new MarginPadding { Right = Nub.EXPANDED_SIZE + nub_padding };
+                labelText.Padding = new MarginPadding { Right = Nub.EXPANDED_SIZE + nub_padding * 2 };
             }
             else
             {
                 Nub.Margin = new MarginPadding { Left = nub_padding };
-                labelText.Padding = new MarginPadding { Left = Nub.EXPANDED_SIZE + nub_padding };
+                labelText.Padding = new MarginPadding { Left = Nub.EXPANDED_SIZE + nub_padding * 2 };
             }
 
             Nub.Current.BindTo(Current);

From daf7ab942274a71298ff4caf3505cee52381aed0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 16:58:15 +0900
Subject: [PATCH 07937/10326] Apply the expected font to the checkbox's label

---
 .../Screens/OnlinePlay/FreeModSelectOverlay.cs   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index c60afeb2aa..180f6079ac 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Linq;
+using System.Reflection.Emit;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
@@ -120,6 +123,19 @@ namespace osu.Game.Screens.OnlinePlay
 
             protected override bool PlaySoundsOnUserChange => false;
 
+            public HeaderCheckbox()
+                : base(false)
+
+            {
+            }
+
+            protected override void ApplyLabelParameters(SpriteText text)
+            {
+                base.ApplyLabelParameters(text);
+
+                text.Font = OsuFont.GetFont(weight: FontWeight.Bold);
+            }
+
             protected override void OnUserChange(bool value)
             {
                 base.OnUserChange(value);

From 4bfe3aabdc6c165e2bd368b9a70ab45ec4cc39b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 17:06:11 +0900
Subject: [PATCH 07938/10326] Simplify sound debounce logic

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index c308dc2451..97902d1c15 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -496,17 +496,12 @@ namespace osu.Game.Overlays.Mods
                 MultiplierLabel.FadeColour(Color4.White, 200);
         }
 
-        private ScheduledDelegate sampleOnDelegate;
-        private ScheduledDelegate sampleOffDelegate;
-
         private void modButtonPressed(Mod selectedMod)
         {
             if (selectedMod != null)
             {
-                // Fixes buzzing when multiple mods are selected in the same frame.
-                sampleOnDelegate?.Cancel();
                 if (State.Value == Visibility.Visible)
-                    sampleOnDelegate = Scheduler.Add(() => sampleOn?.Play());
+                    Scheduler.AddOnce(playSelectedSound);
 
                 OnModSelected(selectedMod);
 
@@ -514,15 +509,16 @@ namespace osu.Game.Overlays.Mods
             }
             else
             {
-                // Fixes buzzing when multiple mods are deselected in the same frame.
-                sampleOffDelegate?.Cancel();
                 if (State.Value == Visibility.Visible)
-                    sampleOffDelegate = Scheduler.Add(() => sampleOff?.Play());
+                    Scheduler.AddOnce(playDeselectedSound);
             }
 
             refreshSelectedMods();
         }
 
+        private void playSelectedSound() => sampleOn?.Play();
+        private void playDeselectedSound() => sampleOff?.Play();
+
         /// <summary>
         /// Invoked when a new <see cref="Mod"/> has been selected.
         /// </summary>

From f23ca7c7cfd7bbd752e50464189c2c84546beba2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 18:10:55 +0900
Subject: [PATCH 07939/10326] Centralise selection animation logic

---
 osu.Game/Overlays/Mods/ModSection.cs          | 51 +++++++++++++------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  1 -
 .../Overlays/Mods/SoloModSelectOverlay.cs     |  2 +-
 .../OnlinePlay/FreeModSelectOverlay.cs        | 25 +++++----
 4 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 87a45ebf63..495b1c05cd 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Overlays.Mods
 
         private CancellationTokenSource modsLoadCts;
 
+        protected bool SelectionAnimationRunning => pendingSelectionOperations.Count > 0;
+
         /// <summary>
         /// True when all mod icons have completed loading.
         /// </summary>
@@ -49,7 +51,11 @@ namespace osu.Game.Overlays.Mods
 
                     return new ModButton(m)
                     {
-                        SelectionChanged = Action,
+                        SelectionChanged = mod =>
+                        {
+                            ModButtonStateChanged(mod);
+                            Action?.Invoke(mod);
+                        },
                     };
                 }).ToArray();
 
@@ -78,6 +84,10 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
+        protected virtual void ModButtonStateChanged(Mod mod)
+        {
+        }
+
         private ModButton[] buttons = Array.Empty<ModButton>();
 
         protected override bool OnKeyDown(KeyDownEvent e)
@@ -94,44 +104,53 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
+        private const double initial_multiple_selection_delay = 100;
+
+        private readonly Queue<Action> pendingSelectionOperations = new Queue<Action>();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Scheduler.AddDelayed(() =>
+            {
+                if (pendingSelectionOperations.TryDequeue(out var dequeuedAction))
+                    dequeuedAction();
+            }, initial_multiple_selection_delay, true);
+        }
+
         /// <summary>
         /// Selects all mods.
         /// </summary>
         public void SelectAll()
         {
+            pendingSelectionOperations.Clear();
+
             foreach (var button in buttons.Where(b => !b.Selected))
-                button.SelectAt(0);
+                pendingSelectionOperations.Enqueue(() => button.SelectAt(0));
         }
 
         /// <summary>
         /// Deselects all mods.
         /// </summary>
-        /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        public void DeselectAll(bool immediate = false) => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null), immediate);
+        public void DeselectAll() => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
 
         /// <summary>
         /// Deselect one or more mods in this section.
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
-        /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false)
+        public void DeselectTypes(IEnumerable<Type> modTypes)
         {
-            int delay = 0;
+            pendingSelectionOperations.Clear();
 
             foreach (var button in buttons)
             {
-                Mod selected = button.SelectedMod;
-                if (selected == null) continue;
+                if (button.SelectedMod == null) continue;
 
                 foreach (var type in modTypes)
                 {
-                    if (type.IsInstanceOfType(selected))
-                    {
-                        if (immediate)
-                            button.Deselect();
-                        else
-                            Scheduler.AddDelayed(button.Deselect, delay += 50);
-                    }
+                    if (type.IsInstanceOfType(button.SelectedMod))
+                        pendingSelectionOperations.Enqueue(button.Deselect);
                 }
             }
         }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 97902d1c15..4f65a39ed3 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
index d039ad1f98..aa0e78c126 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Mods
             base.OnModSelected(mod);
 
             foreach (var section in ModSectionsContainer.Children)
-                section.DeselectTypes(mod.IncompatibleMods, true);
+                section.DeselectTypes(mod.IncompatibleMods);
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 180f6079ac..7bc226bb3f 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Linq;
-using System.Reflection.Emit;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -72,7 +71,7 @@ namespace osu.Game.Screens.OnlinePlay
         private void deselectAll()
         {
             foreach (var section in ModSectionsContainer.Children)
-                section.DeselectAll(true);
+                section.DeselectAll();
         }
 
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
@@ -99,21 +98,21 @@ namespace osu.Game.Screens.OnlinePlay
 
             private void onCheckboxChanged(bool value)
             {
-                foreach (var button in ButtonsContainer.OfType<ModButton>())
-                {
-                    if (value)
-                        button.SelectAt(0);
-                    else
-                        button.Deselect();
-                }
+                if (value)
+                    SelectAll();
+                else
+                    DeselectAll();
             }
 
-            protected override void Update()
+            protected override void ModButtonStateChanged(Mod mod)
             {
-                base.Update();
+                base.ModButtonStateChanged(mod);
 
-                var validButtons = ButtonsContainer.OfType<ModButton>().Where(b => b.Mod.HasImplementation);
-                checkbox.Current.Value = validButtons.All(b => b.Selected);
+                if (!SelectionAnimationRunning)
+                {
+                    var validButtons = ButtonsContainer.OfType<ModButton>().Where(b => b.Mod.HasImplementation);
+                    checkbox.Current.Value = validButtons.All(b => b.Selected);
+                }
             }
         }
 

From 223b858227ed2a0d2aa3af284acbe581dbab84be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 18:56:40 +0900
Subject: [PATCH 07940/10326] Ramp the animation speed

---
 osu.Game/Overlays/Mods/ModSection.cs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 495b1c05cd..b9640a6026 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -104,19 +104,31 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
-        private const double initial_multiple_selection_delay = 100;
+        private const double initial_multiple_selection_delay = 120;
+
+        private double selectionDelay = initial_multiple_selection_delay;
+        private double lastSelection;
 
         private readonly Queue<Action> pendingSelectionOperations = new Queue<Action>();
 
-        protected override void LoadComplete()
+        protected override void Update()
         {
-            base.LoadComplete();
+            base.Update();
 
-            Scheduler.AddDelayed(() =>
+            if (selectionDelay == initial_multiple_selection_delay || Time.Current - lastSelection >= selectionDelay)
             {
                 if (pendingSelectionOperations.TryDequeue(out var dequeuedAction))
+                {
                     dequeuedAction();
-            }, initial_multiple_selection_delay, true);
+
+                    selectionDelay = Math.Max(30, selectionDelay * 0.8f);
+                    lastSelection = Time.Current;
+                }
+                else
+                {
+                    selectionDelay = initial_multiple_selection_delay;
+                }
+            }
         }
 
         /// <summary>

From a2674f3c3ff5a99d81127aae980c0ed05614fc47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 18:58:56 +0900
Subject: [PATCH 07941/10326] Add comments

---
 osu.Game/Overlays/Mods/ModSection.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index b9640a6026..353f779b4f 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -121,11 +121,14 @@ namespace osu.Game.Overlays.Mods
                 {
                     dequeuedAction();
 
+                    // each time we play an animation, we decrease the time until the next animation (to ramp the visual and audible elements).
                     selectionDelay = Math.Max(30, selectionDelay * 0.8f);
                     lastSelection = Time.Current;
                 }
                 else
                 {
+                    // reset the selection delay after all animations have been completed.
+                    // this will cause the next action to be immediately performed.
                     selectionDelay = initial_multiple_selection_delay;
                 }
             }

From bf239f8bef321dbb90e61ebe8e453a13a22f11c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 19:12:37 +0900
Subject: [PATCH 07942/10326] Flush animation on closing mod overlay

---
 osu.Game/Overlays/Mods/ModSection.cs       | 9 +++++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 353f779b4f..440abfb1c0 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -231,5 +231,14 @@ namespace osu.Game.Overlays.Mods
             Font = OsuFont.GetFont(weight: FontWeight.Bold),
             Text = text
         };
+
+        /// <summary>
+        /// Play out all remaining animations immediately to leave mods in a good (final) state.
+        /// </summary>
+        public void FlushAnimation()
+        {
+            while (pendingSelectionOperations.TryDequeue(out var dequeuedAction))
+                dequeuedAction();
+        }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 4f65a39ed3..93fe693937 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -379,6 +379,11 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopOut();
 
+            foreach (var section in ModSectionsContainer)
+            {
+                section.FlushAnimation();
+            }
+
             FooterContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
             FooterContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
 

From 15062cc63f71ae8ae64b9a5343da7585a5bb5fa0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 19:29:48 +0900
Subject: [PATCH 07943/10326] Fix intermittent test failures

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 92104cfc72..7f4dfaa9b0 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -145,11 +145,11 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("double time visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModDoubleTime)));
 
             AddStep("make double time invalid", () => modSelect.IsValidMod = m => !(m is OsuModDoubleTime));
-            AddAssert("double time not visible", () => modSelect.ChildrenOfType<ModButton>().All(b => !b.Mods.Any(m => m is OsuModDoubleTime)));
+            AddUntilStep("double time not visible", () => modSelect.ChildrenOfType<ModButton>().All(b => !b.Mods.Any(m => m is OsuModDoubleTime)));
             AddAssert("nightcore still visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModNightcore)));
 
             AddStep("make double time valid again", () => modSelect.IsValidMod = m => true);
-            AddAssert("double time visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModDoubleTime)));
+            AddUntilStep("double time visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModDoubleTime)));
             AddAssert("nightcore still visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModNightcore)));
         }
 

From 8f2f1a444f25058760583545c3390ce0562b3e5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 19:55:09 +0900
Subject: [PATCH 07944/10326] Avoid resetting selection on deselecting
 incompatibile types

---
 osu.Game/Overlays/Mods/ModSection.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 440abfb1c0..3f93eec7df 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -148,7 +148,11 @@ namespace osu.Game.Overlays.Mods
         /// <summary>
         /// Deselects all mods.
         /// </summary>
-        public void DeselectAll() => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
+        public void DeselectAll()
+        {
+            pendingSelectionOperations.Clear();
+            DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
+        }
 
         /// <summary>
         /// Deselect one or more mods in this section.
@@ -156,8 +160,6 @@ namespace osu.Game.Overlays.Mods
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
         public void DeselectTypes(IEnumerable<Type> modTypes)
         {
-            pendingSelectionOperations.Clear();
-
             foreach (var button in buttons)
             {
                 if (button.SelectedMod == null) continue;

From cef16a9f61e6a9550f80b81f5c3cf6a2603c45e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 19:55:15 +0900
Subject: [PATCH 07945/10326] Add test coverage of animation / selection
 flushing

---
 .../TestSceneModSelectOverlay.cs              | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 7f4dfaa9b0..44605f4994 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -46,6 +47,32 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("show", () => modSelect.Show());
         }
 
+        [Test]
+        public void TestAnimationFlushOnClose()
+        {
+            changeRuleset(0);
+
+            AddStep("Select all fun mods", () =>
+            {
+                modSelect.ModSectionsContainer
+                         .Single(c => c.ModType == ModType.DifficultyIncrease)
+                         .SelectAll();
+            });
+
+            AddUntilStep("many mods selected", () => modDisplay.Current.Value.Count >= 5);
+
+            AddStep("trigger deselect and close overlay", () =>
+            {
+                modSelect.ModSectionsContainer
+                         .Single(c => c.ModType == ModType.DifficultyIncrease)
+                         .DeselectAll();
+
+                modSelect.Hide();
+            });
+
+            AddAssert("all mods deselected", () => modDisplay.Current.Value.Count == 0);
+        }
+
         [Test]
         public void TestOsuMods()
         {
@@ -312,6 +339,9 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             public bool AllLoaded => ModSectionsContainer.Children.All(c => c.ModIconsLoaded);
 
+            public new FillFlowContainer<ModSection> ModSectionsContainer =>
+                base.ModSectionsContainer;
+
             public ModButton GetModButton(Mod mod)
             {
                 var section = ModSectionsContainer.Children.Single(s => s.ModType == mod.Type);

From f86f3236254019b99ae64e37b3628159c6758c94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 22:28:17 +0900
Subject: [PATCH 07946/10326] Add a basic guard against setting ScrollMethod
 too late in initialisation

---
 .../UI/DrawableManiaRuleset.cs                  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 6b34dbfa09..4ee060e91e 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -50,9 +51,21 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
-        public ScrollVisualisationMethod ScrollMethod = ScrollVisualisationMethod.Sequential;
+        public ScrollVisualisationMethod ScrollMethod
+        {
+            get => scrollMethod;
+            set
+            {
+                if (IsLoaded)
+                    throw new InvalidOperationException($"Can't alter {nameof(ScrollMethod)} after ruleset is already loaded");
 
-        protected override ScrollVisualisationMethod VisualisationMethod => ScrollMethod;
+                scrollMethod = value;
+            }
+        }
+
+        private ScrollVisualisationMethod scrollMethod = ScrollVisualisationMethod.Sequential;
+
+        protected override ScrollVisualisationMethod VisualisationMethod => scrollMethod;
 
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
         private readonly Bindable<double> configTimeRange = new BindableDouble();

From 794f9e5e932294d8c77e9cdc5b0b995b8f8d9062 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 22:53:41 +0900
Subject: [PATCH 07947/10326] Add missing centre anchor/origin

---
 osu.Game/Graphics/UserInterface/OsuCheckbox.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index b80941c0bc..f6effa0834 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -76,6 +76,8 @@ namespace osu.Game.Graphics.UserInterface
             }
             else
             {
+                Nub.Anchor = Anchor.CentreLeft;
+                Nub.Origin = Anchor.CentreLeft;
                 Nub.Margin = new MarginPadding { Left = nub_padding };
                 labelText.Padding = new MarginPadding { Left = Nub.EXPANDED_SIZE + nub_padding * 2 };
             }

From 0750c3cb6a3ae9f8bc614fe61f082e936ba4f705 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 23:44:46 +0900
Subject: [PATCH 07948/10326] Add back immediate deselection flow to ensure
 user selections can occur without contention

---
 osu.Game/Overlays/Mods/ModSection.cs           | 10 ++++++++--
 osu.Game/Overlays/Mods/SoloModSelectOverlay.cs |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 3f93eec7df..ecbcba7ad3 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -158,7 +158,8 @@ namespace osu.Game.Overlays.Mods
         /// Deselect one or more mods in this section.
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
-        public void DeselectTypes(IEnumerable<Type> modTypes)
+        /// <param name="immediate">Whether the deselection should happen immediately. Should only be used when required to ensure correct selection flow.</param>
+        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false)
         {
             foreach (var button in buttons)
             {
@@ -167,7 +168,12 @@ namespace osu.Game.Overlays.Mods
                 foreach (var type in modTypes)
                 {
                     if (type.IsInstanceOfType(button.SelectedMod))
-                        pendingSelectionOperations.Enqueue(button.Deselect);
+                    {
+                        if (immediate)
+                            button.Deselect();
+                        else
+                            pendingSelectionOperations.Enqueue(button.Deselect);
+                    }
                 }
             }
         }
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
index aa0e78c126..d039ad1f98 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Mods
             base.OnModSelected(mod);
 
             foreach (var section in ModSectionsContainer.Children)
-                section.DeselectTypes(mod.IncompatibleMods);
+                section.DeselectTypes(mod.IncompatibleMods, true);
         }
     }
 }

From 18e50815232534bc456429b064ae3e71bc320a01 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 00:42:38 +0900
Subject: [PATCH 07949/10326] Fix test failures

---
 .../Tests/Visual/Multiplayer/MultiplayerTestScene.cs     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index a87b22affe..d76f354774 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;
@@ -50,5 +51,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             if (joinRoom)
                 RoomManager.Schedule(() => RoomManager.CreateRoom(Room));
         });
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            if (joinRoom)
+                AddUntilStep("wait for room join", () => Client.Room != null);
+        }
     }
 }

From dbea6d4ceed7504ff104683efcdf316d3c712d47 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 00:57:23 +0900
Subject: [PATCH 07950/10326] Remove unused using

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

diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index d76f354774..2e8c834c65 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;

From 4e530d2eaf45fc3c1b890b1016d2a6cbcec8658b Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 3 Feb 2021 21:14:27 -0800
Subject: [PATCH 07951/10326] Remove old alpha hack from nub fill

---
 osu.Game/Graphics/UserInterface/Nub.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/Nub.cs b/osu.Game/Graphics/UserInterface/Nub.cs
index 82b09e0821..18d8b880ea 100644
--- a/osu.Game/Graphics/UserInterface/Nub.cs
+++ b/osu.Game/Graphics/UserInterface/Nub.cs
@@ -42,13 +42,7 @@ namespace osu.Game.Graphics.UserInterface
                 },
             };
 
-            Current.ValueChanged += filled =>
-            {
-                if (filled.NewValue)
-                    fill.FadeIn(200, Easing.OutQuint);
-                else
-                    fill.FadeTo(0.01f, 200, Easing.OutQuint); //todo: remove once we figure why containers aren't drawing at all times
-            };
+            Current.ValueChanged += filled => fill.FadeTo(filled.NewValue ? 1 : 0, 200, Easing.OutQuint);
         }
 
         [BackgroundDependencyLoader]

From 9ef130cdccd46535c40db44b01b16f9624b4e36f Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 4 Feb 2021 13:28:35 -0800
Subject: [PATCH 07952/10326] Fix codefactor style issues

---
 osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs      | 1 -
 osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
index 7308d6b499..8d8ee49af7 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
@@ -29,4 +29,3 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         }
     }
 }
-
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
index d160956a6e..c8895f32f4 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
@@ -19,4 +19,3 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         }
     }
 }
-

From d62bbbb7627673b4dc03729639a54ad9b864079e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Feb 2021 00:38:56 +0300
Subject: [PATCH 07953/10326] Enhance documentation

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Online/DownloadTrackingComposite.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 69c6ebd07c..52042c266b 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Online
         /// Checks that a database model matches the one expected to be downloaded.
         /// </summary>
         /// <example>
-        /// In the case of multiplayer/playlists, this has to check that the databased beatmap set with the selected beatmap matches what's online.
+        /// For online play, this could be used to check that the databased model matches the online beatmap.
         /// </example>
         /// <param name="databasedModel">The model in database.</param>
         protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;

From c0bd27fe832c0d05083107b0f488d7c979cce6d6 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 4 Feb 2021 13:55:15 -0800
Subject: [PATCH 07954/10326] Fix readme version badge not linking to correct
 page

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index efca075042..e09b4d86a5 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 # osu!
 
 [![Build status](https://ci.appveyor.com/api/projects/status/u2p01nx7l6og8buh?svg=true)](https://ci.appveyor.com/project/peppy/osu)
-[![GitHub release](https://img.shields.io/github/release/ppy/osu.svg)]()
+[![GitHub release](https://img.shields.io/github/release/ppy/osu.svg)](https://github.com/ppy/osu/releases/latest)
 [![CodeFactor](https://www.codefactor.io/repository/github/ppy/osu/badge)](https://www.codefactor.io/repository/github/ppy/osu)
 [![dev chat](https://discordapp.com/api/guilds/188630481301012481/widget.png?style=shield)](https://discord.gg/ppy)
 

From a2fdba3e5173441147761ace92894f54cc6f309f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 12:24:38 +0900
Subject: [PATCH 07955/10326] Rename to OnlinePlayBeatmapAvailabilityTracker

---
 ...s => TestSceneOnlinePlayBeatmapAvailabilityTracker.cs} | 8 ++++----
 ...racker.cs => OnlinePlayBeatmapAvailablilityTracker.cs} | 4 ++--
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game.Tests/Online/{TestSceneMultiplayerBeatmapAvailabilityTracker.cs => TestSceneOnlinePlayBeatmapAvailabilityTracker.cs} (96%)
 rename osu.Game/Online/Rooms/{MultiplayerBeatmapAvailablilityTracker.cs => OnlinePlayBeatmapAvailablilityTracker.cs} (95%)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
similarity index 96%
rename from osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
rename to osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
index 646c4139af..d3475de157 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
@@ -28,7 +28,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Online
 {
     [HeadlessTest]
-    public class TestSceneMultiplayerBeatmapAvailabilityTracker : OsuTestScene
+    public class TestSceneOnlinePlayBeatmapAvailabilityTracker : OsuTestScene
     {
         private RulesetStore rulesets;
         private TestBeatmapManager beatmaps;
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Online
         private BeatmapSetInfo testBeatmapSet;
 
         private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
-        private MultiplayerBeatmapAvailablilityTracker availablilityTracker;
+        private OnlinePlayBeatmapAvailablilityTracker availablilityTracker;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, GameHost host)
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Online
                 Ruleset = { Value = testBeatmapInfo.Ruleset },
             };
 
-            Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            Child = availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem, }
             };
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Online
             });
             addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
 
-            AddStep("recreate tracker", () => Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            AddStep("recreate tracker", () => Child = availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem }
             });
diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
similarity index 95%
rename from osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
rename to osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
index 578c4db2f8..ad4b3c5151 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online.Rooms
     /// This differs from a regular download tracking composite as this accounts for the
     /// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
     /// </summary>
-    public class MultiplayerBeatmapAvailablilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    public class OnlinePlayBeatmapAvailablilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
         public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
@@ -26,7 +26,7 @@ namespace osu.Game.Online.Rooms
 
         private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>();
 
-        public MultiplayerBeatmapAvailablilityTracker()
+        public OnlinePlayBeatmapAvailablilityTracker()
         {
             State.BindValueChanged(_ => updateAvailability());
             Progress.BindValueChanged(_ => updateAvailability(), true);
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index cdf889e4f1..b1b3dde26e 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -41,11 +41,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         [Cached]
-        protected MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
+        protected OnlinePlayBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
 
         protected RoomSubScreen()
         {
-            BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = SelectedItem },
             };

From 85e63afcb48288f7838409c5b14380507ea3443d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 12:36:25 +0900
Subject: [PATCH 07956/10326] Rename Mods -> RequiredMods

---
 osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs   | 6 +++---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index d0e19d9f37..4fb9d724b5 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Online.Multiplayer
 
         [NotNull]
         [Key(4)]
-        public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
+        public IEnumerable<APIMod> RequiredMods { get; set; } = Enumerable.Empty<APIMod>();
 
         [NotNull]
         [Key(5)]
@@ -39,14 +39,14 @@ namespace osu.Game.Online.Multiplayer
         public bool Equals(MultiplayerRoomSettings other)
             => BeatmapID == other.BeatmapID
                && BeatmapChecksum == other.BeatmapChecksum
-               && Mods.SequenceEqual(other.Mods)
+               && RequiredMods.SequenceEqual(other.RequiredMods)
                && AllowedMods.SequenceEqual(other.AllowedMods)
                && RulesetID == other.RulesetID
                && Name.Equals(other.Name, StringComparison.Ordinal);
 
         public override string ToString() => $"Name:{Name}"
                                              + $" Beatmap:{BeatmapID} ({BeatmapChecksum})"
-                                             + $" Mods:{string.Join(',', Mods)}"
+                                             + $" RequiredMods:{string.Join(',', RequiredMods)}"
                                              + $" AllowedMods:{string.Join(',', AllowedMods)}"
                                              + $" Ruleset:{RulesetID}";
     }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 69df2a69cc..aedbe37d56 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -192,7 +192,7 @@ namespace osu.Game.Online.Multiplayer
                 BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
                 BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
                 RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
-                Mods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods,
+                RequiredMods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.RequiredMods,
                 AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods
             });
         }
@@ -531,7 +531,7 @@ namespace osu.Game.Online.Multiplayer
             beatmap.MD5Hash = settings.BeatmapChecksum;
 
             var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
-            var mods = settings.Mods.Select(m => m.ToMod(ruleset));
+            var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
             var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
             PlaylistItem playlistItem = new PlaylistItem

From 2e85ce5b824eeafe85f3b9b058b89601690314ea Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 12:40:16 +0900
Subject: [PATCH 07957/10326] Rename UserMods -> Mods for MultiplayerRoomUser

---
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs              | 2 +-
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs        | 2 +-
 .../OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 3271133bcd..c654127b94 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         [Key(3)]
         [NotNull]
-        public IEnumerable<APIMod> UserMods { get; set; } = Enumerable.Empty<APIMod>();
+        public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
         [IgnoreMember]
         public User? User { get; set; }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index aedbe37d56..f7c9193dfe 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -400,7 +400,7 @@ namespace osu.Game.Online.Multiplayer
                 if (user == null)
                     return;
 
-                user.UserMods = mods;
+                user.Mods = mods;
 
                 RoomUpdated?.Invoke();
             }, false);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 8036e5f702..2983d1268d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
 
             userStateDisplay.Status = User.State;
-            userModsDisplay.Current.Value = User.UserMods.Select(m => m.ToMod(ruleset)).ToList();
+            userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList();
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);

From 8004c19a8037bb4faece8646d604b1cb3c13ba97 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 12:40:42 +0900
Subject: [PATCH 07958/10326] Remove ModValidationTest

---
 osu.Game.Tests/Mods/ModValidationTest.cs | 64 ------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 osu.Game.Tests/Mods/ModValidationTest.cs

diff --git a/osu.Game.Tests/Mods/ModValidationTest.cs b/osu.Game.Tests/Mods/ModValidationTest.cs
deleted file mode 100644
index 991adc221e..0000000000
--- a/osu.Game.Tests/Mods/ModValidationTest.cs
+++ /dev/null
@@ -1,64 +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 Moq;
-using NUnit.Framework;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Utils;
-
-namespace osu.Game.Tests.Mods
-{
-    [TestFixture]
-    public class ModValidationTest
-    {
-        [Test]
-        public void TestModIsCompatibleByItself()
-        {
-            var mod = new Mock<Mod>();
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod.Object }));
-        }
-
-        [Test]
-        public void TestIncompatibleThroughTopLevel()
-        {
-            var mod1 = new Mock<Mod>();
-            var mod2 = new Mock<Mod>();
-
-            mod1.Setup(m => m.IncompatibleMods).Returns(new[] { mod2.Object.GetType() });
-
-            // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
-        }
-
-        [Test]
-        public void TestIncompatibleThroughMultiMod()
-        {
-            var mod1 = new Mock<Mod>();
-
-            // The nested mod.
-            var mod2 = new Mock<Mod>();
-            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType() });
-
-            var multiMod = new MultiMod(new MultiMod(mod2.Object));
-
-            // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { multiMod, mod1.Object }), Is.False);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
-        }
-
-        [Test]
-        public void TestAllowedThroughMostDerivedType()
-        {
-            var mod = new Mock<Mod>();
-            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
-        }
-
-        [Test]
-        public void TestNotAllowedThroughBaseType()
-        {
-            var mod = new Mock<Mod>();
-            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
-        }
-    }
-}

From df2da5950f2f7b1fd233f75900e3979a362204e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 13:05:11 +0900
Subject: [PATCH 07959/10326] Add back vertical spacer

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 4664ac6bfe..0466c8209f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -104,6 +104,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                 Child = new GridContainer
                                                 {
                                                     RelativeSizeAxes = Axes.Both,
+                                                    ColumnDimensions = new[]
+                                                    {
+                                                        new Dimension(GridSizeMode.Relative, size: 0.5f, maxSize: 400),
+                                                        new Dimension(),
+                                                        new Dimension(GridSizeMode.Relative, size: 0.5f, maxSize: 600),
+                                                    },
                                                     Content = new[]
                                                     {
                                                         new Drawable[]
@@ -128,6 +134,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                     }
                                                                 }
                                                             },
+                                                            // Spacer
+                                                            null,
                                                             // Main right column
                                                             new FillFlowContainer
                                                             {

From c5fa818630c25ee7b3912de0d1bfeca9194bc7a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 14:08:11 +0900
Subject: [PATCH 07960/10326] Actually handle case of failing to achieve lock
 on SemaphoreSlim

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 9067c9a738..36cdf3bc8f 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -67,7 +67,8 @@ namespace osu.Game.Online.Multiplayer
         {
             cancelExistingConnect();
 
-            await connectionLock.WaitAsync(10000);
+            if (!await connectionLock.WaitAsync(10000))
+                throw new TimeoutException("Could not obtain a lock to connect. A previous attempt is likely stuck.");
 
             var builder = new HubConnectionBuilder()
                 .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
@@ -199,7 +200,10 @@ namespace osu.Game.Online.Multiplayer
             cancelExistingConnect();
 
             if (takeLock)
-                await connectionLock.WaitAsync(10000);
+            {
+                if (!await connectionLock.WaitAsync(10000))
+                    throw new TimeoutException("Could not obtain a lock to disconnect. A previous attempt is likely stuck.");
+            }
 
             try
             {

From fc37d8b7df27a398f0343fcefbb6f15ce3b9450f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 14:25:19 +0900
Subject: [PATCH 07961/10326] Refactor content redirection logic to be easier
 to parse

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 19b68ee6d6..722b167387 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -45,18 +45,21 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Cached]
         protected OnlinePlayBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
 
-        private readonly Container content = new Container { RelativeSizeAxes = Axes.Both };
+        private readonly Container content;
 
         protected RoomSubScreen()
         {
-            BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+            InternalChildren = new Drawable[]
             {
-                SelectedItem = { BindTarget = SelectedItem }
+                BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+                {
+                    SelectedItem = { BindTarget = SelectedItem }
+                },
+                content = new Container { RelativeSizeAxes = Axes.Both },
             };
-
-            base.AddInternal(content);
         }
 
+        // Forward all internal management to content to ensure locally added components are not removed unintentionally.
         // This is a bit ugly but we don't have the concept of InternalContent so it'll have to do for now. (https://github.com/ppy/osu-framework/issues/1690)
         protected override void AddInternal(Drawable drawable) => content.Add(drawable);
         protected override bool RemoveInternal(Drawable drawable) => content.Remove(drawable);
@@ -65,8 +68,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            base.AddInternal(BeatmapAvailablilityTracker);
-
             sampleStart = audio.Samples.Get(@"SongSelect/confirm-selection");
         }
 

From de8724b1f6b7d714260589dab5f5619afea0ca6f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 14:39:25 +0900
Subject: [PATCH 07962/10326] Use AddRangeInternal for simplicity, but disallow
 ClearInternal for safety

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs | 21 +++++--------------
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  4 ++--
 .../Playlists/PlaylistsRoomSubScreen.cs       |  4 ++--
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 722b167387..8be0e89665 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -7,8 +7,6 @@ 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;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -45,25 +43,16 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Cached]
         protected OnlinePlayBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
 
-        private readonly Container content;
-
         protected RoomSubScreen()
         {
-            InternalChildren = new Drawable[]
+            AddInternal(BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
-                BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
-                {
-                    SelectedItem = { BindTarget = SelectedItem }
-                },
-                content = new Container { RelativeSizeAxes = Axes.Both },
-            };
+                SelectedItem = { BindTarget = SelectedItem }
+            });
         }
 
-        // Forward all internal management to content to ensure locally added components are not removed unintentionally.
-        // This is a bit ugly but we don't have the concept of InternalContent so it'll have to do for now. (https://github.com/ppy/osu-framework/issues/1690)
-        protected override void AddInternal(Drawable drawable) => content.Add(drawable);
-        protected override bool RemoveInternal(Drawable drawable) => content.Remove(drawable);
-        protected override void ClearInternal(bool disposeChildren = true) => content.Clear(disposeChildren);
+        protected override void ClearInternal(bool disposeChildren = true) =>
+            throw new InvalidOperationException($"{nameof(RoomSubScreen)}'s children should not be cleared as it will remove required components");
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 8cc2e9061b..e1524067da 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 mainContent = new GridContainer
                 {
@@ -177,7 +177,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     RelativeSizeAxes = Axes.Both,
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            };
+            });
 
             if (client.Room == null)
             {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 745e5a58bf..0b8026044b 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 mainContent = new GridContainer
                 {
@@ -190,7 +190,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     EditPlaylist = () => this.Push(new MatchSongSelect()),
                     State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            };
+            });
 
             if (roomId.Value == null)
             {

From 730e66f0ee00aec2b6c9f2a2f03ca56ec152a136 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Feb 2021 09:07:59 +0300
Subject: [PATCH 07963/10326] Make pausing on window focus lose instant

---
 .../Screens/Play/HUD/HoldForMenuButton.cs     | 40 -------------------
 osu.Game/Screens/Play/Player.cs               | 21 +++++++---
 2 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
index 387c0e587b..284ac899ed 100644
--- a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
+++ b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
@@ -88,11 +88,6 @@ namespace osu.Game.Screens.Play.HUD
             return base.OnMouseMove(e);
         }
 
-        public bool PauseOnFocusLost
-        {
-            set => button.PauseOnFocusLost = value;
-        }
-
         protected override void Update()
         {
             base.Update();
@@ -120,8 +115,6 @@ namespace osu.Game.Screens.Play.HUD
             public Action HoverGained;
             public Action HoverLost;
 
-            private readonly IBindable<bool> gameActive = new Bindable<bool>(true);
-
             [BackgroundDependencyLoader]
             private void load(OsuColour colours, Framework.Game game)
             {
@@ -164,14 +157,6 @@ namespace osu.Game.Screens.Play.HUD
                 };
 
                 bind();
-
-                gameActive.BindTo(game.IsActive);
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                gameActive.BindValueChanged(_ => updateActive(), true);
             }
 
             private void bind()
@@ -221,31 +206,6 @@ namespace osu.Game.Screens.Play.HUD
                 base.OnHoverLost(e);
             }
 
-            private bool pauseOnFocusLost = true;
-
-            public bool PauseOnFocusLost
-            {
-                set
-                {
-                    if (pauseOnFocusLost == value)
-                        return;
-
-                    pauseOnFocusLost = value;
-                    if (IsLoaded)
-                        updateActive();
-                }
-            }
-
-            private void updateActive()
-            {
-                if (!pauseOnFocusLost || IsPaused.Value) return;
-
-                if (gameActive.Value)
-                    AbortConfirm();
-                else
-                    BeginConfirm();
-            }
-
             public bool OnPressed(GlobalAction action)
             {
                 switch (action)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index b622f11775..556964bca4 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -59,6 +59,8 @@ namespace osu.Game.Screens.Play
         // We are managing our own adjustments (see OnEntering/OnExiting).
         public override bool AllowRateAdjustments => false;
 
+        private readonly IBindable<bool> gameActive = new Bindable<bool>(true);
+
         private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
 
         /// <summary>
@@ -154,6 +156,9 @@ namespace osu.Game.Screens.Play
             // replays should never be recorded or played back when autoplay is enabled
             if (!Mods.Value.Any(m => m is ModAutoplay))
                 PrepareReplay();
+
+            // needs to be bound here as the last binding, otherwise starting a replay while not focused causes player to exit.
+            gameActive.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
         }
 
         [CanBeNull]
@@ -170,7 +175,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, OsuConfigManager config, OsuGame game)
+        private void load(AudioManager audio, OsuConfigManager config, OsuGame game, OsuGameBase gameBase)
         {
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 
@@ -186,6 +191,8 @@ namespace osu.Game.Screens.Play
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
+            gameActive.BindTo(gameBase.IsActive);
+
             if (game != null)
                 LocalUserPlaying.BindTo(game.LocalUserPlaying);
 
@@ -420,10 +427,14 @@ namespace osu.Game.Screens.Play
             samplePlaybackDisabled.Value = DrawableRuleset.FrameStableClock.IsCatchingUp.Value || GameplayClockContainer.GameplayClock.IsPaused.Value;
         }
 
-        private void updatePauseOnFocusLostState() =>
-            HUDOverlay.HoldToQuit.PauseOnFocusLost = PauseOnFocusLost
-                                                     && !DrawableRuleset.HasReplayLoaded.Value
-                                                     && !breakTracker.IsBreakTime.Value;
+        private void updatePauseOnFocusLostState()
+        {
+            if (!IsLoaded || !PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
+                return;
+
+            if (gameActive.Value == false)
+                performUserRequestedExit();
+        }
 
         private IBeatmap loadPlayableBeatmap()
         {

From 0528469b440d33308cdc61c7d2a136027e4731e4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:04:04 +0900
Subject: [PATCH 07964/10326] Rename OrderedHitPolicy ->
 StartTimeOrderedHitPolicy

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs                      | 4 ++--
 .../UI/{OrderedHitPolicy.cs => StartTimeOrderedHitPolicy.cs}  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game.Rulesets.Osu/UI/{OrderedHitPolicy.cs => StartTimeOrderedHitPolicy.cs} (97%)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 975b444699..5c77112df7 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.UI
         private readonly ProxyContainer spinnerProxies;
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
         private readonly FollowPointRenderer followPoints;
-        private readonly OrderedHitPolicy hitPolicy;
+        private readonly StartTimeOrderedHitPolicy hitPolicy;
 
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
 
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            hitPolicy = new OrderedHitPolicy(HitObjectContainer);
+            hitPolicy = new StartTimeOrderedHitPolicy(HitObjectContainer);
 
             var hitWindows = new OsuHitWindows();
 
diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
similarity index 97%
rename from osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
rename to osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 8e4f81347d..1d9a5010ed 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -18,11 +18,11 @@ namespace osu.Game.Rulesets.Osu.UI
     /// <item><description>The hit causes all previous <see cref="HitObject"/>s to missed otherwise.</description></item>
     /// </list>
     /// </summary>
-    public class OrderedHitPolicy
+    public class StartTimeOrderedHitPolicy
     {
         private readonly HitObjectContainer hitObjectContainer;
 
-        public OrderedHitPolicy(HitObjectContainer hitObjectContainer)
+        public StartTimeOrderedHitPolicy(HitObjectContainer hitObjectContainer)
         {
             this.hitObjectContainer = hitObjectContainer;
         }

From df1df8184771f096a58acc095efc576485c7301c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:04:21 +0900
Subject: [PATCH 07965/10326] Better indicate ordering

---
 osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 1d9a5010ed..2b13a36e47 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.Osu.UI
 {
     /// <summary>
-    /// Ensures that <see cref="HitObject"/>s are hit in-order. Affectionately known as "note lock".
+    /// Ensures that <see cref="HitObject"/>s are hit in-order of their start times. Affectionately known as "note lock".
     /// If a <see cref="HitObject"/> is hit out of order:
     /// <list type="number">
     /// <item><description>The hit is blocked if it occurred earlier than the previous <see cref="HitObject"/>'s start time.</description></item>

From 08aae011c10880a24204717cfea5eb5c2629571b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:04:32 +0900
Subject: [PATCH 07966/10326] Add IHitPolicy interface

---
 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs        | 25 +++++++++++++++++++
 .../UI/StartTimeOrderedHitPolicy.cs           | 13 ++--------
 2 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs

diff --git a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
new file mode 100644
index 0000000000..fcc18b5f6f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/IHitPolicy.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.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    public interface IHitPolicy
+    {
+        /// <summary>
+        /// Determines whether a <see cref="DrawableHitObject"/> can be hit at a point in time.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to check.</param>
+        /// <param name="time">The time to check.</param>
+        /// <returns>Whether <paramref name="hitObject"/> can be hit at the given <paramref name="time"/>.</returns>
+        bool IsHittable(DrawableHitObject hitObject, double time);
+
+        /// <summary>
+        /// Handles a <see cref="HitObject"/> being hit.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
+        void HandleHit(DrawableHitObject hitObject);
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 2b13a36e47..2b5a440f67 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.UI
     /// <item><description>The hit causes all previous <see cref="HitObject"/>s to missed otherwise.</description></item>
     /// </list>
     /// </summary>
-    public class StartTimeOrderedHitPolicy
+    public class StartTimeOrderedHitPolicy : IHitPolicy
     {
         private readonly HitObjectContainer hitObjectContainer;
 
@@ -27,12 +27,6 @@ namespace osu.Game.Rulesets.Osu.UI
             this.hitObjectContainer = hitObjectContainer;
         }
 
-        /// <summary>
-        /// Determines whether a <see cref="DrawableHitObject"/> can be hit at a point in time.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to check.</param>
-        /// <param name="time">The time to check.</param>
-        /// <returns>Whether <paramref name="hitObject"/> can be hit at the given <paramref name="time"/>.</returns>
         public bool IsHittable(DrawableHitObject hitObject, double time)
         {
             DrawableHitObject blockingObject = null;
@@ -54,10 +48,6 @@ namespace osu.Game.Rulesets.Osu.UI
             return blockingObject.Judged || time >= blockingObject.HitObject.StartTime;
         }
 
-        /// <summary>
-        /// Handles a <see cref="HitObject"/> being hit to potentially miss all earlier <see cref="HitObject"/>s.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
         public void HandleHit(DrawableHitObject hitObject)
         {
             // Hitobjects which themselves don't block future hitobjects don't cause misses (e.g. slider ticks, spinners).
@@ -67,6 +57,7 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
                 throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
 
+            // Miss all hitobjects prior to the hit one.
             foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))
             {
                 if (obj.Judged)

From 8adf37d958abc4bb3b42e600149a4b0fdbbbaa16 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:09:25 +0900
Subject: [PATCH 07967/10326] Add SetHitObjects() to IHitPolicy instead of
 using ctor

---
 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs                |  7 +++++++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs              |  3 ++-
 osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs | 10 +++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
index fcc18b5f6f..72c3d781bb 100644
--- a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/IHitPolicy.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;
 using osu.Game.Rulesets.Objects.Drawables;
 
@@ -8,6 +9,12 @@ namespace osu.Game.Rulesets.Osu.UI
 {
     public interface IHitPolicy
     {
+        /// <summary>
+        /// Sets the <see cref="DrawableHitObject"/>s which this <see cref="IHitPolicy"/> controls.
+        /// </summary>
+        /// <param name="hitObjects">An enumeration of the <see cref="DrawableHitObject"/>s.</param>
+        void SetHitObjects(IEnumerable<DrawableHitObject> hitObjects);
+
         /// <summary>
         /// Determines whether a <see cref="DrawableHitObject"/> can be hit at a point in time.
         /// </summary>
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 5c77112df7..c7900558a0 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -54,7 +54,8 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            hitPolicy = new StartTimeOrderedHitPolicy(HitObjectContainer);
+            hitPolicy = new StartTimeOrderedHitPolicy();
+            hitPolicy.SetHitObjects(HitObjectContainer.AliveObjects);
 
             var hitWindows = new OsuHitWindows();
 
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 2b5a440f67..38ba5fc490 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
@@ -20,12 +19,9 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class StartTimeOrderedHitPolicy : IHitPolicy
     {
-        private readonly HitObjectContainer hitObjectContainer;
+        private IEnumerable<DrawableHitObject> hitObjects;
 
-        public StartTimeOrderedHitPolicy(HitObjectContainer hitObjectContainer)
-        {
-            this.hitObjectContainer = hitObjectContainer;
-        }
+        public void SetHitObjects(IEnumerable<DrawableHitObject> hitObjects) => this.hitObjects = hitObjects;
 
         public bool IsHittable(DrawableHitObject hitObject, double time)
         {
@@ -77,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(double targetTime)
         {
-            foreach (var obj in hitObjectContainer.AliveObjects)
+            foreach (var obj in hitObjects)
             {
                 if (obj.HitObject.StartTime >= targetTime)
                     yield break;

From c9481ebbafa4c28ba21730448dcdfbf2b71d59e6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:49:33 +0900
Subject: [PATCH 07968/10326] Rename test scene

---
 ...eOutOfOrderHits.cs => TestSceneStartTimeOrderedHitPolicy.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Rulesets.Osu.Tests/{TestSceneOutOfOrderHits.cs => TestSceneStartTimeOrderedHitPolicy.cs} (99%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
similarity index 99%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
rename to osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index 296b421a11..b8c1217a73 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -25,7 +25,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestSceneOutOfOrderHits : RateAdjustedBeatmapTestScene
+    public class TestSceneStartTimeOrderedHitPolicy : RateAdjustedBeatmapTestScene
     {
         private const double early_miss_window = 1000; // time after -1000 to -500 is considered a miss
         private const double late_miss_window = 500; // time after +500 is considered a miss

From 64a2c7825e89811dec78f803507fdd4c8696cc52 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:53:47 +0900
Subject: [PATCH 07969/10326] Fix incorrect assert

---
 .../TestSceneStartTimeOrderedHitPolicy.cs                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index b8c1217a73..177a4f50a1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Great);
             addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
-            addJudgementOffsetAssert(hitObjects[0], -200); // time_second_circle - first_circle_time - 100
+            addJudgementOffsetAssert(hitObjects[1], -200); // time_second_circle - first_circle_time - 100
         }
 
         /// <summary>

From 4bc324f040b3bfaca1e57af88f00558a6237d6bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 15:29:32 +0900
Subject: [PATCH 07970/10326] Rename parameter to make more sense

---
 osu.Game/Graphics/UserInterface/ProgressBar.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ProgressBar.cs b/osu.Game/Graphics/UserInterface/ProgressBar.cs
index 4ee1c73bf5..50367e600e 100644
--- a/osu.Game/Graphics/UserInterface/ProgressBar.cs
+++ b/osu.Game/Graphics/UserInterface/ProgressBar.cs
@@ -40,13 +40,18 @@ namespace osu.Game.Graphics.UserInterface
             set => CurrentNumber.Value = value;
         }
 
-        private readonly bool userInteractive;
-        public override bool HandlePositionalInput => userInteractive;
-        public override bool HandleNonPositionalInput => userInteractive;
+        private readonly bool allowSeek;
 
-        public ProgressBar(bool userInteractive)
+        public override bool HandlePositionalInput => allowSeek;
+        public override bool HandleNonPositionalInput => allowSeek;
+
+        /// <summary>
+        /// Construct a new progress bar.
+        /// </summary>
+        /// <param name="allowSeek">Whether the user should be allowed to click/drag to adjust the value.</param>
+        public ProgressBar(bool allowSeek)
         {
-            this.userInteractive = userInteractive;
+            this.allowSeek = allowSeek;
 
             CurrentNumber.MinValue = 0;
             CurrentNumber.MaxValue = 1;

From d1f9aa52a4c528053d7ee45344ad5ec15dff4fe5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 15:33:48 +0900
Subject: [PATCH 07971/10326] Inline variable

---
 .../OnlinePlay/Multiplayer/Participants/StateDisplay.cs        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index 4245628a59..c117c026dc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
@@ -101,9 +101,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                     case DownloadState.Downloading:
                         Debug.Assert(availability.DownloadProgress != null);
 
-                        var progress = availability.DownloadProgress.Value;
                         progressBar.FadeIn(fade_time);
-                        progressBar.CurrentTime = progress;
+                        progressBar.CurrentTime = availability.DownloadProgress.Value;
 
                         text.Text = "downloading map";
                         icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;

From a4551dc1eeb2eb6afb9dec61752559eaa6e5632c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:31:22 +0900
Subject: [PATCH 07972/10326] Add object-ordered hit policy

---
 .../UI/ObjectOrderedHitPolicy.cs              | 55 +++++++++++++++++++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  4 +-
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs

diff --git a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
new file mode 100644
index 0000000000..fdab241a9b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.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.Linq;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    /// <summary>
+    /// Ensures that <see cref="HitObject"/>s are hit in order of appearance. The classic note lock.
+    /// <remarks>
+    /// Hits will be blocked until the previous <see cref="HitObject"/>s have been judged.
+    /// </remarks>
+    /// </summary>
+    public class ObjectOrderedHitPolicy : IHitPolicy
+    {
+        private IEnumerable<DrawableHitObject> hitObjects;
+
+        public void SetHitObjects(IEnumerable<DrawableHitObject> hitObjects) => this.hitObjects = hitObjects;
+
+        public bool IsHittable(DrawableHitObject hitObject, double time) => enumerateHitObjectsUpTo(hitObject.HitObject.StartTime).All(obj => obj.AllJudged);
+
+        public void HandleHit(DrawableHitObject hitObject)
+        {
+        }
+
+        private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(double targetTime)
+        {
+            foreach (var obj in hitObjects)
+            {
+                if (obj.HitObject.StartTime >= targetTime)
+                    yield break;
+
+                switch (obj)
+                {
+                    case DrawableSpinner _:
+                        continue;
+
+                    case DrawableSlider slider:
+                        yield return slider.HeadCircle;
+
+                        break;
+
+                    default:
+                        yield return obj;
+
+                        break;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index c7900558a0..6cb890323b 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.UI
         private readonly ProxyContainer spinnerProxies;
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
         private readonly FollowPointRenderer followPoints;
-        private readonly StartTimeOrderedHitPolicy hitPolicy;
+        private readonly IHitPolicy hitPolicy;
 
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
 
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            hitPolicy = new StartTimeOrderedHitPolicy();
+            hitPolicy = new ObjectOrderedHitPolicy();
             hitPolicy.SetHitObjects(HitObjectContainer.AliveObjects);
 
             var hitWindows = new OsuHitWindows();

From 6aece18f8dedc392a84996d1c7e4a906b72b827e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 15:23:03 +0900
Subject: [PATCH 07973/10326] Add OOHP tests

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 491 ++++++++++++++++++
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs   |  29 +-
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  17 +-
 3 files changed, 529 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
new file mode 100644
index 0000000000..039a4f142f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -0,0 +1,491 @@
+// Copyright (c) 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.Extensions.TypeExtensions;
+using osu.Framework.Screens;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Judgements;
+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.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneObjectOrderedHitPolicy : RateAdjustedBeatmapTestScene
+    {
+        private const double early_miss_window = 1000; // time after -1000 to -500 is considered a miss
+        private const double late_miss_window = 500; // time after +500 is considered a miss
+
+        /// <summary>
+        /// Tests clicking a future circle before the first circle's start time, while the first circle HAS NOT been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleBeforeFirstCircleTime()
+        {
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle - 100, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[1], HitResult.Miss);
+            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle at the first circle's start time, while the first circle HAS NOT been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleAtFirstCircleTime()
+        {
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[1], HitResult.Miss);
+            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle after the first circle's start time, while the first circle HAS NOT been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleAfterFirstCircleTime()
+        {
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle + 100, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[1], HitResult.Miss);
+            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle before the first circle's start time, while the first circle HAS been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleBeforeFirstCircleTimeWithFirstCircleJudged()
+        {
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle - 200, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle - 100, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
+            addJudgementOffsetAssert(hitObjects[0], -200); // time_second_circle - first_circle_time - 100
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle after the first circle's start time, while the first circle HAS been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleAfterFirstCircleTimeWithFirstCircleJudged()
+        {
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle - 200, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
+            addJudgementOffsetAssert(hitObjects[1], -100); // time_second_circle - first_circle_time
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle after a slider's start time, but hitting all slider ticks.
+        /// </summary>
+        [Test]
+        public void TestMissSliderHeadAndHitAllSliderTicks()
+        {
+            const double time_slider = 1500;
+            const double time_circle = 1510;
+            Vector2 positionCircle = Vector2.Zero;
+            Vector2 positionSlider = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+                new TestSlider
+                {
+                    StartTime = time_slider,
+                    Position = positionSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_slider, Position = positionCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_slider + 10, Position = positionSlider, Actions = { OsuAction.RightButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.IgnoreHit);
+            addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
+        }
+
+        /// <summary>
+        /// Tests clicking hitting future slider ticks before a circle.
+        /// </summary>
+        [Test]
+        public void TestHitSliderTicksBeforeCircle()
+        {
+            const double time_slider = 1500;
+            const double time_circle = 1510;
+            Vector2 positionCircle = Vector2.Zero;
+            Vector2 positionSlider = new Vector2(30);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+                new TestSlider
+                {
+                    StartTime = time_slider,
+                    Position = positionSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_slider, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_circle + late_miss_window - 100, Position = positionCircle, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_circle + late_miss_window - 90, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.IgnoreHit);
+            addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle before a spinner.
+        /// </summary>
+        [Test]
+        public void TestHitCircleBeforeSpinner()
+        {
+            const double time_spinner = 1500;
+            const double time_circle = 1800;
+            Vector2 positionCircle = Vector2.Zero;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestSpinner
+                {
+                    StartTime = time_spinner,
+                    Position = new Vector2(256, 192),
+                    EndTime = time_spinner + 1000,
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_spinner - 100, Position = positionCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_spinner + 10, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_spinner + 20, Position = new Vector2(256, 172), Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_spinner + 30, Position = new Vector2(276, 192), Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_spinner + 40, Position = new Vector2(256, 212), Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_spinner + 50, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+        }
+
+        [Test]
+        public void TestHitSliderHeadBeforeHitCircle()
+        {
+            const double time_circle = 1000;
+            const double time_slider = 1200;
+            Vector2 positionCircle = Vector2.Zero;
+            Vector2 positionSlider = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+                new TestSlider
+                {
+                    StartTime = time_slider,
+                    Position = positionSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_circle - 100, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_circle, Position = positionCircle, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_slider, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+        }
+
+        private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
+        {
+            AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
+                () => judgementResults.Single(r => r.HitObject == hitObject).Type == result);
+        }
+
+        private void addJudgementAssert(string name, Func<OsuHitObject> hitObject, HitResult result)
+        {
+            AddAssert($"{name} judgement is {result}",
+                () => judgementResults.Single(r => r.HitObject == hitObject()).Type == result);
+        }
+
+        private void addJudgementOffsetAssert(OsuHitObject hitObject, double offset)
+        {
+            AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judged at {offset}",
+                () => Precision.AlmostEquals(judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, offset, 100));
+        }
+
+        private ScoreAccessibleReplayPlayer currentPlayer;
+        private List<JudgementResult> judgementResults;
+
+        private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames)
+        {
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
+                {
+                    HitObjects = hitObjects,
+                    BeatmapInfo =
+                    {
+                        BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 3 },
+                        Ruleset = new OsuRuleset().RulesetInfo
+                    },
+                });
+
+                Beatmap.Value.Beatmap.ControlPointInfo.Add(0, new DifficultyControlPoint { SpeedMultiplier = 0.1f });
+
+                SelectedMods.Value = new[] { new OsuModClassic() };
+
+                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
+
+                p.OnLoadComplete += _ =>
+                {
+                    p.ScoreProcessor.NewJudgement += result =>
+                    {
+                        if (currentPlayer == p) judgementResults.Add(result);
+                    };
+                };
+
+                LoadScreen(currentPlayer = p);
+                judgementResults = new List<JudgementResult>();
+            });
+
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
+        }
+
+        private class TestHitCircle : HitCircle
+        {
+            protected override HitWindows CreateHitWindows() => new TestHitWindows();
+        }
+
+        private class TestSlider : Slider
+        {
+            public TestSlider()
+            {
+                DefaultsApplied += _ =>
+                {
+                    HeadCircle.HitWindows = new TestHitWindows();
+                    TailCircle.HitWindows = new TestHitWindows();
+
+                    HeadCircle.HitWindows.SetDifficulty(0);
+                    TailCircle.HitWindows.SetDifficulty(0);
+                };
+            }
+        }
+
+        private class TestSpinner : Spinner
+        {
+            protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
+            {
+                base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
+                SpinsRequired = 1;
+            }
+        }
+
+        private class TestHitWindows : HitWindows
+        {
+            private static readonly DifficultyRange[] ranges =
+            {
+                new DifficultyRange(HitResult.Great, 500, 500, 500),
+                new DifficultyRange(HitResult.Miss, early_miss_window, early_miss_window, early_miss_window),
+            };
+
+            public override bool IsHitResultAllowed(HitResult result) => result == HitResult.Great || result == HitResult.Miss;
+
+            protected override DifficultyRange[] GetRanges() => ranges;
+        }
+
+        private class ScoreAccessibleReplayPlayer : ReplayPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            protected override bool PauseOnFocusLost => false;
+
+            public ScoreAccessibleReplayPlayer(Score score)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 5542580979..6f41bcc0b0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -2,14 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModClassic : Mod, IApplicableToHitObject
+    public class OsuModClassic : Mod, IApplicableToHitObject, IApplicableToDrawableRuleset<OsuHitObject>
     {
         public override string Name => "Classic";
 
@@ -23,21 +27,38 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override bool Ranked => false;
 
+        [SettingSource("Disable slider head judgement", "Scores sliders proportionally to the number of ticks hit.")]
+        public Bindable<bool> DisableSliderHeadJudgement { get; } = new BindableBool(true);
+
+        [SettingSource("Disable slider head tracking", "Pins slider heads at their starting position, regardless of time.")]
+        public Bindable<bool> DisableSliderHeadTracking { get; } = new BindableBool(true);
+
+        [SettingSource("Disable note lock lenience", "Applies note lock to the full hit window.")]
+        public Bindable<bool> DisableLenientNoteLock { get; } = new BindableBool(true);
+
         public void ApplyToHitObject(HitObject hitObject)
         {
             switch (hitObject)
             {
                 case Slider slider:
-                    slider.IgnoreJudgement = false;
+                    slider.IgnoreJudgement = !DisableSliderHeadJudgement.Value;
 
                     foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
                     {
-                        head.TrackFollowCircle = false;
-                        head.JudgeAsNormalHitCircle = false;
+                        head.TrackFollowCircle = !DisableSliderHeadTracking.Value;
+                        head.JudgeAsNormalHitCircle = !DisableSliderHeadJudgement.Value;
                     }
 
                     break;
             }
         }
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
+        {
+            var osuRuleset = (DrawableOsuRuleset)drawableRuleset;
+
+            if (!DisableLenientNoteLock.Value)
+                osuRuleset.Playfield.HitPolicy = new ObjectOrderedHitPolicy();
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 6cb890323b..9bd1dc74b7 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -31,7 +31,6 @@ namespace osu.Game.Rulesets.Osu.UI
         private readonly ProxyContainer spinnerProxies;
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
         private readonly FollowPointRenderer followPoints;
-        private readonly IHitPolicy hitPolicy;
 
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
 
@@ -54,11 +53,9 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            hitPolicy = new ObjectOrderedHitPolicy();
-            hitPolicy.SetHitObjects(HitObjectContainer.AliveObjects);
+            HitPolicy = new ObjectOrderedHitPolicy();
 
             var hitWindows = new OsuHitWindows();
-
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
                 poolDictionary.Add(result, new DrawableJudgementPool(result, onJudgmentLoaded));
 
@@ -67,6 +64,18 @@ namespace osu.Game.Rulesets.Osu.UI
             NewResult += onNewResult;
         }
 
+        private IHitPolicy hitPolicy;
+
+        public IHitPolicy HitPolicy
+        {
+            get => hitPolicy;
+            set
+            {
+                hitPolicy = value ?? throw new ArgumentNullException(nameof(value));
+                hitPolicy.SetHitObjects(HitObjectContainer.AliveObjects);
+            }
+        }
+
         protected override void OnNewDrawableHitObject(DrawableHitObject drawable)
         {
             ((DrawableOsuHitObject)drawable).CheckHittable = hitPolicy.IsHittable;

From 1b6a05279847569be9d5568bc9812fa55b7fe503 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 15:46:03 +0900
Subject: [PATCH 07974/10326] Refactor logic to suck a bit less

---
 .../Multiplayer/Participants/StateDisplay.cs  | 161 +++++++++---------
 1 file changed, 83 insertions(+), 78 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index c117c026dc..c571b51c83 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.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.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -87,85 +88,89 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
         public void UpdateStatus(MultiplayerUserState state, BeatmapAvailability availability)
         {
-            if (availability.State != DownloadState.LocallyAvailable)
-            {
-                switch (availability.State)
-                {
-                    case DownloadState.NotDownloaded:
-                        progressBar.FadeOut(fade_time);
-                        text.Text = "no map";
-                        icon.Icon = FontAwesome.Solid.MinusCircle;
-                        icon.Colour = colours.RedLight;
-                        break;
-
-                    case DownloadState.Downloading:
-                        Debug.Assert(availability.DownloadProgress != null);
-
-                        progressBar.FadeIn(fade_time);
-                        progressBar.CurrentTime = availability.DownloadProgress.Value;
-
-                        text.Text = "downloading map";
-                        icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
-                        icon.Colour = colours.Blue;
-                        break;
-
-                    case DownloadState.Importing:
-                        progressBar.FadeOut(fade_time);
-                        text.Text = "importing map";
-                        icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
-                        icon.Colour = colours.Yellow;
-                        break;
-                }
-            }
-            else
-            {
-                progressBar.FadeOut(fade_time);
-
-                switch (state)
-                {
-                    default:
-                        this.FadeOut(fade_time);
-                        return;
-
-                    case MultiplayerUserState.Ready:
-                        text.Text = "ready";
-                        icon.Icon = FontAwesome.Solid.CheckCircle;
-                        icon.Colour = Color4Extensions.FromHex("#AADD00");
-                        break;
-
-                    case MultiplayerUserState.WaitingForLoad:
-                        text.Text = "loading";
-                        icon.Icon = FontAwesome.Solid.PauseCircle;
-                        icon.Colour = colours.Yellow;
-                        break;
-
-                    case MultiplayerUserState.Loaded:
-                        text.Text = "loaded";
-                        icon.Icon = FontAwesome.Solid.DotCircle;
-                        icon.Colour = colours.YellowLight;
-                        break;
-
-                    case MultiplayerUserState.Playing:
-                        text.Text = "playing";
-                        icon.Icon = FontAwesome.Solid.PlayCircle;
-                        icon.Colour = colours.BlueLight;
-                        break;
-
-                    case MultiplayerUserState.FinishedPlay:
-                        text.Text = "results pending";
-                        icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
-                        icon.Colour = colours.BlueLighter;
-                        break;
-
-                    case MultiplayerUserState.Results:
-                        text.Text = "results";
-                        icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
-                        icon.Colour = colours.BlueLighter;
-                        break;
-                }
-            }
-
+            // the only case where the progress bar is used does its own local fade in.
+            // starting by fading out is a sane default.
+            progressBar.FadeOut(fade_time);
             this.FadeIn(fade_time);
+
+            switch (state)
+            {
+                case MultiplayerUserState.Idle:
+                    showBeatmapAvailability(availability);
+                    break;
+
+                case MultiplayerUserState.Ready:
+                    text.Text = "ready";
+                    icon.Icon = FontAwesome.Solid.CheckCircle;
+                    icon.Colour = Color4Extensions.FromHex("#AADD00");
+                    break;
+
+                case MultiplayerUserState.WaitingForLoad:
+                    text.Text = "loading";
+                    icon.Icon = FontAwesome.Solid.PauseCircle;
+                    icon.Colour = colours.Yellow;
+                    break;
+
+                case MultiplayerUserState.Loaded:
+                    text.Text = "loaded";
+                    icon.Icon = FontAwesome.Solid.DotCircle;
+                    icon.Colour = colours.YellowLight;
+                    break;
+
+                case MultiplayerUserState.Playing:
+                    text.Text = "playing";
+                    icon.Icon = FontAwesome.Solid.PlayCircle;
+                    icon.Colour = colours.BlueLight;
+                    break;
+
+                case MultiplayerUserState.FinishedPlay:
+                    text.Text = "results pending";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                    icon.Colour = colours.BlueLighter;
+                    break;
+
+                case MultiplayerUserState.Results:
+                    text.Text = "results";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                    icon.Colour = colours.BlueLighter;
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(state), state, null);
+            }
+        }
+
+        private void showBeatmapAvailability(BeatmapAvailability availability)
+        {
+            switch (availability.State)
+            {
+                default:
+                    this.FadeOut(fade_time);
+                    break;
+
+                case DownloadState.NotDownloaded:
+                    text.Text = "no map";
+                    icon.Icon = FontAwesome.Solid.MinusCircle;
+                    icon.Colour = colours.RedLight;
+                    break;
+
+                case DownloadState.Downloading:
+                    Debug.Assert(availability.DownloadProgress != null);
+
+                    progressBar.FadeIn(fade_time);
+                    progressBar.CurrentTime = availability.DownloadProgress.Value;
+
+                    text.Text = "downloading map";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
+                    icon.Colour = colours.Blue;
+                    break;
+
+                case DownloadState.Importing:
+                    text.Text = "importing map";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
+                    icon.Colour = colours.Yellow;
+                    break;
+            }
         }
     }
 }

From 98c4573240670b7992894d2ddaf84c8f9acdf476 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 15:52:49 +0900
Subject: [PATCH 07975/10326] Add assertions covering new test

---
 .../Multiplayer/TestSceneMultiplayerParticipantsList.cs  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 4fec1c6dd8..b025440d04 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
@@ -82,12 +83,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("set to no map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.NotDownloaded()));
             AddStep("set to downloading map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(0)));
+
+            AddUntilStep("progress bar visible", () => this.ChildrenOfType<ProgressBar>().Single().IsPresent);
+
             AddRepeatStep("increment progress", () =>
             {
                 var progress = this.ChildrenOfType<ParticipantPanel>().Single().User.BeatmapAvailability.DownloadProgress ?? 0;
                 Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(progress + RNG.NextSingle(0.1f)));
             }, 25);
+
+            AddAssert("progress bar increased", () => this.ChildrenOfType<ProgressBar>().Single().Current.Value > 0);
+
             AddStep("set to importing map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Importing()));
+            AddUntilStep("progress bar not visible", () => !this.ChildrenOfType<ProgressBar>().Single().IsPresent);
+
             AddStep("set to available", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.LocallyAvailable()));
         }
 

From 3aa3692ed4be0a5b94e4bbb9b489063b6532b0da Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 15:56:13 +0900
Subject: [PATCH 07976/10326] Disable snaking out when tracking is disabled

---
 .../Sliders/SliderCircleSelectionBlueprint.cs |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  2 +-
 .../Skinning/Default/PlaySliderBody.cs        | 22 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
index a0392fe536..dec9cd8622 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             base.Update();
 
-            CirclePiece.UpdateFrom(position == SliderPosition.Start ? HitObject.HeadCircle : HitObject.TailCircle);
+            CirclePiece.UpdateFrom(position == SliderPosition.Start ? (HitCircle)HitObject.HeadCircle : HitObject.TailCircle);
         }
 
         // Todo: This is temporary, since the slider circle masks don't do anything special yet. In the future they will handle input.
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index e3365a8ccf..01694a838b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         public bool IgnoreJudgement = true;
 
         [JsonIgnore]
-        public HitCircle HeadCircle { get; protected set; }
+        public SliderHeadCircle HeadCircle { get; protected set; }
 
         [JsonIgnore]
         public SliderTailCircle TailCircle { get; protected set; }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index e77c93c721..e9b4bb416c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         [Resolved(CanBeNull = true)]
         private OsuRulesetConfigManager config { get; set; }
 
+        private readonly Bindable<bool> snakingOut = new Bindable<bool>();
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, DrawableHitObject drawableObject)
         {
@@ -35,11 +37,29 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             accentColour = drawableObject.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(accent => updateAccentColour(skin, accent.NewValue), true);
 
+            SnakingOut.BindTo(snakingOut);
             config?.BindWith(OsuRulesetSetting.SnakingInSliders, SnakingIn);
-            config?.BindWith(OsuRulesetSetting.SnakingOutSliders, SnakingOut);
+            config?.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
 
             BorderSize = skin.GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.SliderBorderSize)?.Value ?? 1;
             BorderColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBorder)?.Value ?? Color4.White;
+
+            drawableObject.HitObjectApplied += onHitObjectApplied;
+            onHitObjectApplied(drawableObject);
+        }
+
+        private void onHitObjectApplied(DrawableHitObject obj)
+        {
+            var drawableSlider = (DrawableSlider)obj;
+            if (drawableSlider.HitObject == null)
+                return;
+
+            if (!drawableSlider.HitObject.HeadCircle.TrackFollowCircle)
+            {
+                // When not tracking the follow circle, force the path to not snake out as it looks better that way.
+                SnakingOut.UnbindFrom(snakingOut);
+                SnakingOut.Value = false;
+            }
         }
 
         private void updateAccentColour(ISkinSource skin, Color4 defaultAccentColour)

From 1368d551529ac09ecb1d47c5d32c0ddbf5f313b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 15:58:27 +0900
Subject: [PATCH 07977/10326] Add test coverage of precedence of display

---
 .../TestSceneMultiplayerParticipantsList.cs   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index b025440d04..c3852fafd4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -78,13 +78,27 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("single panel is for second user", () => this.ChildrenOfType<ParticipantPanel>().Single().User.User == secondUser);
         }
 
+        [Test]
+        public void TestGameStateHasPriorityOverDownloadState()
+        {
+            AddStep("set to downloading map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(0)));
+            checkProgressBarVisibility(true);
+
+            AddStep("make user ready", () => Client.ChangeState(MultiplayerUserState.Results));
+            checkProgressBarVisibility(false);
+            AddUntilStep("ready mark visible", () => this.ChildrenOfType<StateDisplay>().Single().IsPresent);
+
+            AddStep("make user ready", () => Client.ChangeState(MultiplayerUserState.Idle));
+            checkProgressBarVisibility(true);
+        }
+
         [Test]
         public void TestBeatmapDownloadingStates()
         {
             AddStep("set to no map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.NotDownloaded()));
             AddStep("set to downloading map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(0)));
 
-            AddUntilStep("progress bar visible", () => this.ChildrenOfType<ProgressBar>().Single().IsPresent);
+            checkProgressBarVisibility(true);
 
             AddRepeatStep("increment progress", () =>
             {
@@ -95,7 +109,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("progress bar increased", () => this.ChildrenOfType<ProgressBar>().Single().Current.Value > 0);
 
             AddStep("set to importing map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Importing()));
-            AddUntilStep("progress bar not visible", () => !this.ChildrenOfType<ProgressBar>().Single().IsPresent);
+            checkProgressBarVisibility(false);
 
             AddStep("set to available", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.LocallyAvailable()));
         }
@@ -197,5 +211,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 AddStep($"set state: {state}", () => Client.ChangeUserState(0, state));
             }
         }
+
+        private void checkProgressBarVisibility(bool visible) =>
+            AddUntilStep($"progress bar {(visible ? "is" : "is not")}visible", () =>
+                this.ChildrenOfType<ProgressBar>().Single().IsPresent == visible);
     }
 }

From 9ba5ae3db7c7f235fab1d44fd75a2e2a2f0ded94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 16:17:02 +0900
Subject: [PATCH 07978/10326] Remove lots of unnecessary client side logic

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 5bcb1d6dc8..bd1ec9c54a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -270,7 +270,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
             UserMods.BindValueChanged(onUserModsChanged);
 
-            client.RoomUpdated += onRoomUpdated;
             client.LoadRequested += onLoadRequested;
 
             isConnected = client.IsConnected.GetBoundCopy();
@@ -323,24 +322,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             client.ChangeUserMods(mods.NewValue);
         }
 
-        private void updateBeatmapAvailability(ValueChangedEvent<BeatmapAvailability> _ = null)
+        private void updateBeatmapAvailability(ValueChangedEvent<BeatmapAvailability> availability)
         {
             if (client.Room == null)
                 return;
 
-            client.ChangeBeatmapAvailability(BeatmapAvailability.Value);
-
-            if (client.LocalUser?.State == MultiplayerUserState.Ready)
-                client.ChangeState(MultiplayerUserState.Idle);
-        }
-
-        private void onRoomUpdated()
-        {
-            if (client.Room == null)
-                return;
-
-            if (client.LocalUser?.BeatmapAvailability.Equals(BeatmapAvailability.Value) == false)
-                updateBeatmapAvailability();
+            client.ChangeBeatmapAvailability(availability.NewValue);
         }
 
         private void onReadyClick()
@@ -392,10 +379,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.Dispose(isDisposing);
 
             if (client != null)
-            {
                 client.LoadRequested -= onLoadRequested;
-                client.RoomUpdated -= onRoomUpdated;
-            }
         }
 
         private class UserModSelectOverlay : ModSelectOverlay

From be91f54349202c6a633f0de9728ede538b120c9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 16:19:45 +0900
Subject: [PATCH 07979/10326] Add back edge case with comment

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index bd1ec9c54a..39e179262e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -328,6 +328,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return;
 
             client.ChangeBeatmapAvailability(availability.NewValue);
+
+            // while this flow is handled server-side, this covers the edge case of the local user being in a ready state and then deleting the current beatmap.
+            if (client.LocalUser?.State == MultiplayerUserState.Ready)
+                client.ChangeState(MultiplayerUserState.Idle);
         }
 
         private void onReadyClick()

From e1789c29b1a1e01f235b8e6bb9bdcfd131e5d715 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Feb 2021 10:28:13 +0300
Subject: [PATCH 07980/10326] Use `Pause()` instead of
 `performUserRequestedExit()` to avoid unexpected operations

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 556964bca4..542839f11d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -433,7 +433,7 @@ namespace osu.Game.Screens.Play
                 return;
 
             if (gameActive.Value == false)
-                performUserRequestedExit();
+                Pause();
         }
 
         private IBeatmap loadPlayableBeatmap()

From 8d18c7e9299cc9c8e4a8b55563c3a9a22d1a99bd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Feb 2021 10:28:33 +0300
Subject: [PATCH 07981/10326] Fix `BreakTracker.IsBreakTime` not updated
 properly on breaks set

Causes a pause from focus lose when playing a beatmap that has a break section at the beginning, due to `IsBreakTime` incorrectly set to `false`
---
 osu.Game/Screens/Play/BreakTracker.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/BreakTracker.cs b/osu.Game/Screens/Play/BreakTracker.cs
index 51e21656e1..793b6b0ebe 100644
--- a/osu.Game/Screens/Play/BreakTracker.cs
+++ b/osu.Game/Screens/Play/BreakTracker.cs
@@ -23,16 +23,16 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public IBindable<bool> IsBreakTime => isBreakTime;
 
-        private readonly BindableBool isBreakTime = new BindableBool();
+        private readonly BindableBool isBreakTime = new BindableBool(true);
 
         public IReadOnlyList<BreakPeriod> Breaks
         {
             set
             {
-                isBreakTime.Value = false;
-
                 breaks = new PeriodTracker(value.Where(b => b.HasEffect)
                                                 .Select(b => new Period(b.StartTime, b.EndTime - BreakOverlay.BREAK_FADE_DURATION)));
+
+                updateBreakTime();
             }
         }
 
@@ -45,8 +45,12 @@ namespace osu.Game.Screens.Play
         protected override void Update()
         {
             base.Update();
+            updateBreakTime();
+        }
 
-            var time = Clock.CurrentTime;
+        private void updateBreakTime()
+        {
+            var time = Clock?.CurrentTime ?? 0;
 
             isBreakTime.Value = breaks?.IsInAny(time) == true
                                 || time < gameplayStartTime

From 3e750feaa49cd9b0f7dea85965f657181b1c2eeb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 16:42:35 +0900
Subject: [PATCH 07982/10326] Subclass LocalPlayerModSelectOverlay to correctly
 deselect incompatible mods on free mod selection

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs           | 2 +-
 osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs     | 2 +-
 .../{SoloModSelectOverlay.cs => LocalPlayerModSelectOverlay.cs} | 2 +-
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs             | 2 +-
 osu.Game/Screens/Select/SongSelect.cs                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game/Overlays/Mods/{SoloModSelectOverlay.cs => LocalPlayerModSelectOverlay.cs} (88%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 44605f4994..37ebc72984 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -333,7 +333,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
         }
 
-        private class TestModSelectOverlay : SoloModSelectOverlay
+        private class TestModSelectOverlay : LocalPlayerModSelectOverlay
         {
             public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 3c889bdec4..89f9b7381b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait for ready", () => modSelect.State.Value == Visibility.Visible && modSelect.ButtonsLoaded);
         }
 
-        private class TestModSelectOverlay : SoloModSelectOverlay
+        private class TestModSelectOverlay : LocalPlayerModSelectOverlay
         {
             public new VisibilityContainer ModSettingsContainer => base.ModSettingsContainer;
             public new TriangleButton CustomiseButton => base.CustomiseButton;
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/LocalPlayerModSelectOverlay.cs
similarity index 88%
rename from osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
rename to osu.Game/Overlays/Mods/LocalPlayerModSelectOverlay.cs
index d039ad1f98..78cd9bdae5 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/LocalPlayerModSelectOverlay.cs
@@ -5,7 +5,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class SoloModSelectOverlay : ModSelectOverlay
+    public class LocalPlayerModSelectOverlay : ModSelectOverlay
     {
         protected override void OnModSelected(Mod mod)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 061e3b4d3f..f030879625 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -373,7 +373,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 client.LoadRequested -= onLoadRequested;
         }
 
-        private class UserModSelectOverlay : ModSelectOverlay
+        private class UserModSelectOverlay : LocalPlayerModSelectOverlay
         {
             public UserModSelectOverlay()
             {
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 0baa663578..b201c62b7f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.OnlinePlay
             return base.OnExiting(next);
         }
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
+        protected override ModSelectOverlay CreateModSelectOverlay() => new LocalPlayerModSelectOverlay
         {
             IsValidMod = IsValidMod
         };
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ed6e0a1028..b20effc67d 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -311,7 +311,7 @@ namespace osu.Game.Screens.Select
             (new FooterButtonOptions(), BeatmapOptions)
         };
 
-        protected virtual ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay();
+        protected virtual ModSelectOverlay CreateModSelectOverlay() => new LocalPlayerModSelectOverlay();
 
         protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)
         {

From 630c5bb74700ae3599013eddf70e2a1cda4a3642 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 16:46:21 +0900
Subject: [PATCH 07983/10326] Avoid potential crashes when lease is held on
 SelectedMods

---
 osu.Game/OsuGame.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a00cd5e6a0..1a1f7bd233 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -469,6 +469,10 @@ namespace osu.Game
         {
             updateModDefaults();
 
+            // a lease may be taken on the mods bindable, at which point we can't really ensure valid mods.
+            if (SelectedMods.Disabled)
+                return;
+
             if (!ModUtils.CheckValidForGameplay(mods.NewValue, out var invalid))
             {
                 // ensure we always have a valid set of mods.

From ee3367d7c549acecb778c652365c290e3e186e5b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 16:59:13 +0900
Subject: [PATCH 07984/10326] Add classic slider ball tracking

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs     | 17 ++++++++++++++++-
 .../Skinning/Default/SliderBall.cs              | 15 ++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 6f41bcc0b0..df3afb7063 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -1,19 +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 System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModClassic : Mod, IApplicableToHitObject, IApplicableToDrawableRuleset<OsuHitObject>
+    public class OsuModClassic : Mod, IApplicableToHitObject, IApplicableToDrawableHitObjects, IApplicableToDrawableRuleset<OsuHitObject>
     {
         public override string Name => "Classic";
 
@@ -36,6 +39,9 @@ namespace osu.Game.Rulesets.Osu.Mods
         [SettingSource("Disable note lock lenience", "Applies note lock to the full hit window.")]
         public Bindable<bool> DisableLenientNoteLock { get; } = new BindableBool(true);
 
+        [SettingSource("Disable exact slider follow circle tracking", "Makes the slider follow circle track its final size at all times.")]
+        public Bindable<bool> DisableExactFollowCircleTracking { get; } = new BindableBool(true);
+
         public void ApplyToHitObject(HitObject hitObject)
         {
             switch (hitObject)
@@ -60,5 +66,14 @@ namespace osu.Game.Rulesets.Osu.Mods
             if (!DisableLenientNoteLock.Value)
                 osuRuleset.Playfield.HitPolicy = new ObjectOrderedHitPolicy();
         }
+
+        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        {
+            foreach (var obj in drawables)
+            {
+                if (obj is DrawableSlider slider)
+                    slider.Ball.TrackVisualSize = !DisableExactFollowCircleTracking.Value;
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
index a96beb66d4..da3debbd42 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
@@ -31,6 +31,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             set => ball.Colour = value;
         }
 
+        /// <summary>
+        /// Whether to track accurately to the visual size of this <see cref="SliderBall"/>.
+        /// If <c>false</c>, tracking will be performed at the final scale at all times.
+        /// </summary>
+        public bool TrackVisualSize = true;
+
         private readonly Drawable followCircle;
         private readonly DrawableSlider drawableSlider;
         private readonly Drawable ball;
@@ -94,7 +100,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
                 tracking = value;
 
-                followCircle.ScaleTo(tracking ? 2.4f : 1f, 300, Easing.OutQuint);
+                if (TrackVisualSize)
+                    followCircle.ScaleTo(tracking ? 2.4f : 1f, 300, Easing.OutQuint);
+                else
+                {
+                    // We need to always be tracking the final size, at both endpoints. For now, this is achieved by removing the scale duration.
+                    followCircle.ScaleTo(tracking ? 2.4f : 1f);
+                }
+
                 followCircle.FadeTo(tracking ? 1f : 0, 300, Easing.OutQuint);
             }
         }

From 791cbb7f03e9637a123b83b77f339c3d44abbf1f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 17:17:29 +0900
Subject: [PATCH 07985/10326] Don't reset ready state if the map is locally
 available

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 39e179262e..53c939115c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -330,7 +330,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             client.ChangeBeatmapAvailability(availability.NewValue);
 
             // while this flow is handled server-side, this covers the edge case of the local user being in a ready state and then deleting the current beatmap.
-            if (client.LocalUser?.State == MultiplayerUserState.Ready)
+            if (availability.NewValue != Online.Rooms.BeatmapAvailability.LocallyAvailable()
+                && client.LocalUser?.State == MultiplayerUserState.Ready)
                 client.ChangeState(MultiplayerUserState.Idle);
         }
 

From 110458612d730e449174fe533606faecc041785b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 17:19:23 +0900
Subject: [PATCH 07986/10326] Avoid handling null playlist items when updating
 avaialability display

---
 .../Rooms/OnlinePlayBeatmapAvailablilityTracker.cs     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
index ad4b3c5151..dcb366ddab 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
@@ -36,7 +36,15 @@ namespace osu.Game.Online.Rooms
         {
             base.LoadComplete();
 
-            SelectedItem.BindValueChanged(item => Model.Value = item.NewValue?.Beatmap.Value.BeatmapSet, true);
+            SelectedItem.BindValueChanged(item =>
+            {
+                // the underlying playlist is regularly cleared for maintenance purposes (things which probably need to be fixed eventually).
+                // to avoid exposing a state change when there may actually be none, ignore all nulls for now.
+                if (item.NewValue == null)
+                    return;
+
+                Model.Value = item.NewValue.Beatmap.Value.BeatmapSet;
+            }, true);
         }
 
         protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)

From a5855f5d28f8e7db6b9d4038806e5d70b38c3a7f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 17:33:48 +0900
Subject: [PATCH 07987/10326] Move follow circle tracking to DrawableSliderHead

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs       | 15 ++++++++++-----
 .../Objects/Drawables/DrawableSliderHead.cs       |  8 +++++++-
 osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs |  6 ------
 .../Skinning/Default/PlaySliderBody.cs            |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index df3afb7063..8cd6676f9d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -50,10 +50,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     slider.IgnoreJudgement = !DisableSliderHeadJudgement.Value;
 
                     foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
-                    {
-                        head.TrackFollowCircle = !DisableSliderHeadTracking.Value;
                         head.JudgeAsNormalHitCircle = !DisableSliderHeadJudgement.Value;
-                    }
 
                     break;
             }
@@ -71,8 +68,16 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             foreach (var obj in drawables)
             {
-                if (obj is DrawableSlider slider)
-                    slider.Ball.TrackVisualSize = !DisableExactFollowCircleTracking.Value;
+                switch (obj)
+                {
+                    case DrawableSlider slider:
+                        slider.Ball.TrackVisualSize = !DisableExactFollowCircleTracking.Value;
+                        break;
+
+                    case DrawableSliderHead head:
+                        head.TrackFollowCircle = !DisableSliderHeadTracking.Value;
+                        break;
+                }
             }
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 08e9c5eb14..ee1df00ef7 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -22,6 +22,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => HitObject?.JudgeAsNormalHitCircle ?? base.DisplayResult;
 
+        /// <summary>
+        /// Makes this <see cref="DrawableSliderHead"/> track the follow circle when the start time is reached.
+        /// If <c>false</c>, this <see cref="DrawableSliderHead"/> will be pinned to its initial position in the slider.
+        /// </summary>
+        public bool TrackFollowCircle = true;
+
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
         protected override OsuSkinComponents CirclePieceComponent => OsuSkinComponents.SliderHeadHitCircle;
@@ -66,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Debug.Assert(Slider != null);
             Debug.Assert(HitObject != null);
 
-            if (HitObject.TrackFollowCircle)
+            if (TrackFollowCircle)
             {
                 double completionProgress = Math.Clamp((Time.Current - Slider.StartTime) / Slider.Duration, 0, 1);
 
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index 13eac60300..28e57567cb 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -8,12 +8,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SliderHeadCircle : HitCircle
     {
-        /// <summary>
-        /// Makes this <see cref="SliderHeadCircle"/> track the follow circle when the start time is reached.
-        /// If <c>false</c>, this <see cref="SliderHeadCircle"/> will be pinned to its initial position in the slider.
-        /// </summary>
-        public bool TrackFollowCircle = true;
-
         /// <summary>
         /// Whether to treat this <see cref="SliderHeadCircle"/> as a normal <see cref="HitCircle"/> for judgement purposes.
         /// If <c>false</c>, judgement will be ignored.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index e9b4bb416c..8eb2714c04 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             if (drawableSlider.HitObject == null)
                 return;
 
-            if (!drawableSlider.HitObject.HeadCircle.TrackFollowCircle)
+            if (!drawableSlider.HeadCircle.TrackFollowCircle)
             {
                 // When not tracking the follow circle, force the path to not snake out as it looks better that way.
                 SnakingOut.UnbindFrom(snakingOut);

From dad32da4153e8cb18443c6c1f12c1a1847754936 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 17:34:05 +0900
Subject: [PATCH 07988/10326] Add rate limiting on sending download progress
 updates

---
 .../Rooms/OnlinePlayBeatmapAvailablilityTracker.cs  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
index dcb366ddab..cfaf43451f 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
+using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Online.Rooms
@@ -24,12 +25,20 @@ namespace osu.Game.Online.Rooms
         /// </summary>
         public IBindable<BeatmapAvailability> Availability => availability;
 
-        private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>();
+        private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>(BeatmapAvailability.LocallyAvailable());
+
+        private ScheduledDelegate progressUpdate;
 
         public OnlinePlayBeatmapAvailablilityTracker()
         {
             State.BindValueChanged(_ => updateAvailability());
-            Progress.BindValueChanged(_ => updateAvailability(), true);
+            Progress.BindValueChanged(_ =>
+            {
+                // incoming progress changes are going to be at a very high rate.
+                // we don't want to flood the network with this, so rate limit how often we send progress updates.
+                if (progressUpdate?.Completed != false)
+                    progressUpdate = Scheduler.AddDelayed(updateAvailability, progressUpdate == null ? 0 : 500);
+            });
         }
 
         protected override void LoadComplete()

From 95ad7ea8f7667a5e3faacbcbe696ef09b5b38354 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 18:44:26 +0900
Subject: [PATCH 07989/10326] Fix mods on participant panels flashing when
 changed

---
 .../Multiplayer/Participants/ParticipantPanel.cs      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 2983d1268d..0ee1b6d684 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -162,15 +162,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             const double fade_time = 50;
 
-            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
-
             userStateDisplay.Status = User.State;
-            userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList();
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
             else
                 crown.FadeOut(fade_time);
+
+            // If the mods are updated at the end of the frame, the flow container will skip a reflow cycle: https://github.com/ppy/osu-framework/issues/4187
+            // This looks particularly jarring here, so re-schedule the update to that start of our frame as a fix.
+            Schedule(() =>
+            {
+                var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
+                userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList();
+            });
         }
 
         public MenuItem[] ContextMenuItems

From 0679901e4d3048552b9e89ace1896958189c6d4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 22:53:40 +0900
Subject: [PATCH 07990/10326] Update error handling

---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index dc98eb8687..33200ca076 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -66,8 +66,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             {
                 failed = true;
 
-                if (e is WebException || string.IsNullOrEmpty(e.Message))
-                    Logger.Error(e, "Failed to retrieve a score submission token.\n\nThis may happen if you are running an old or non-official release of osu! (ie. you are self-compiling).");
+                if (string.IsNullOrEmpty(e.Message))
+                    Logger.Error(e, "Failed to retrieve a score submission token.");
                 else
                     Logger.Log($"You are not able to submit a score: {e.Message}", level: LogLevel.Important);
 

From 7f82a06a61284b89a99a5b95cbae09cf428fa159 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 23:08:31 +0900
Subject: [PATCH 07991/10326] Remove no longer used using directive

---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 33200ca076..38eae2346a 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;

From 5061231e599a2d04a40a2526872383987c9acddb Mon Sep 17 00:00:00 2001
From: vmaggioli <vinmags16@gmail.com>
Date: Fri, 5 Feb 2021 09:39:14 -0500
Subject: [PATCH 07992/10326] Switch to beat length

---
 .../Compose/Components/Timeline/TimelineHitObjectBlueprint.cs   | 2 +-
 1 file changed, 1 insertion(+), 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 301543b3c1..d24614299c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -388,7 +388,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         case IHasDuration endTimeHitObject:
                             var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
 
-                            if (endTimeHitObject.EndTime == snappedTime || Precision.AlmostEquals(snappedTime, hitObject.StartTime, 1))
+                            if (endTimeHitObject.EndTime == snappedTime || Precision.AlmostEquals(snappedTime, hitObject.StartTime, beatmap.GetBeatLengthAtTime(snappedTime)))
                                 return;
 
                             endTimeHitObject.Duration = snappedTime - hitObject.StartTime;

From f29938e15d62bad02c0ff8d0f586bc2764f423a9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Feb 2021 20:39:57 +0300
Subject: [PATCH 07993/10326] Make last binding game activity more sensible

---
 osu.Game/Screens/Play/Player.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 542839f11d..f38eba3f27 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -80,6 +80,9 @@ namespace osu.Game.Screens.Play
 
         public int RestartCount;
 
+        [Resolved]
+        private OsuGameBase gameBase { get; set; }
+
         [Resolved]
         private ScoreManager scoreManager { get; set; }
 
@@ -157,7 +160,8 @@ namespace osu.Game.Screens.Play
             if (!Mods.Value.Any(m => m is ModAutoplay))
                 PrepareReplay();
 
-            // needs to be bound here as the last binding, otherwise starting a replay while not focused causes player to exit.
+            // needs to be bound here as the last binding, otherwise cases like starting a replay while not focused causes player to exit, if activity is bound before checks.
+            gameActive.BindTo(gameBase.IsActive);
             gameActive.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
         }
 
@@ -191,8 +195,6 @@ namespace osu.Game.Screens.Play
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
-            gameActive.BindTo(gameBase.IsActive);
-
             if (game != null)
                 LocalUserPlaying.BindTo(game.LocalUserPlaying);
 
@@ -429,7 +431,7 @@ namespace osu.Game.Screens.Play
 
         private void updatePauseOnFocusLostState()
         {
-            if (!IsLoaded || !PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
+            if (!PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
                 return;
 
             if (gameActive.Value == false)

From f6d08f54e6e950f4784087012fe27cd3e566a22c Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 5 Feb 2021 21:19:13 +0100
Subject: [PATCH 07994/10326] Use the oldest user config file available when
 there happens to be multiple config files available.

---
 osu.Game/IO/StableStorage.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index f86b18c724..614e548d93 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -35,7 +35,11 @@ namespace osu.Game.IO
         {
             var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
 
-            var configFile = GetFiles(".", "osu!.*.cfg").SingleOrDefault();
+            // enumerate the user config files available in case the user migrated their files from another pc / operating system.
+            var foundConfigFiles = GetFiles(".", "osu!.*.cfg");
+
+            // if more than one config file is found, let's use the oldest one (where the username in the filename doesn't match the local username).
+            var configFile = foundConfigFiles.Count() > 1 ? foundConfigFiles.FirstOrDefault(filename => !filename[5..^4].Contains(Environment.UserName, StringComparison.Ordinal)) : foundConfigFiles.FirstOrDefault();
 
             if (configFile == null)
                 return songsDirectoryPath;

From c9db0bf88651affc9bdd3a165984ad7577770149 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 6 Feb 2021 20:54:13 +0300
Subject: [PATCH 07995/10326] Call break time update when loaded

---
 osu.Game/Screens/Play/BreakTracker.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/BreakTracker.cs b/osu.Game/Screens/Play/BreakTracker.cs
index 793b6b0ebe..2f3673e91f 100644
--- a/osu.Game/Screens/Play/BreakTracker.cs
+++ b/osu.Game/Screens/Play/BreakTracker.cs
@@ -32,7 +32,8 @@ namespace osu.Game.Screens.Play
                 breaks = new PeriodTracker(value.Where(b => b.HasEffect)
                                                 .Select(b => new Period(b.StartTime, b.EndTime - BreakOverlay.BREAK_FADE_DURATION)));
 
-                updateBreakTime();
+                if (IsLoaded)
+                    updateBreakTime();
             }
         }
 
@@ -50,7 +51,7 @@ namespace osu.Game.Screens.Play
 
         private void updateBreakTime()
         {
-            var time = Clock?.CurrentTime ?? 0;
+            var time = Clock.CurrentTime;
 
             isBreakTime.Value = breaks?.IsInAny(time) == true
                                 || time < gameplayStartTime

From 40ddccf0c73904af580d3023b3d79d45a14868f3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 6 Feb 2021 20:55:55 +0300
Subject: [PATCH 07996/10326] Do not consider replays for "pause on focus lost"

Replays are not pausable as can be seen in the `canPause` check.
---
 osu.Game/Screens/Play/Player.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index f38eba3f27..81401b08e8 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -160,7 +160,6 @@ namespace osu.Game.Screens.Play
             if (!Mods.Value.Any(m => m is ModAutoplay))
                 PrepareReplay();
 
-            // needs to be bound here as the last binding, otherwise cases like starting a replay while not focused causes player to exit, if activity is bound before checks.
             gameActive.BindTo(gameBase.IsActive);
             gameActive.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
         }
@@ -267,8 +266,6 @@ namespace osu.Game.Screens.Play
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateGameplayState());
 
-            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
-
             // bind clock into components that require it
             DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);
 
@@ -431,7 +428,7 @@ namespace osu.Game.Screens.Play
 
         private void updatePauseOnFocusLostState()
         {
-            if (!PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
+            if (!PauseOnFocusLost || breakTracker.IsBreakTime.Value)
                 return;
 
             if (gameActive.Value == false)

From d0ca2b99a850f9903eec2f7ac1956e15a73089a2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 6 Feb 2021 20:57:01 +0300
Subject: [PATCH 07997/10326] Remove unnecessary injected dependency

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 81401b08e8..bd67d3f06a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, OsuConfigManager config, OsuGame game, OsuGameBase gameBase)
+        private void load(AudioManager audio, OsuConfigManager config, OsuGame game)
         {
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 

From 68c20a2a3705dcc0995303e83a4312164d9fd98d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 17:19:07 +0100
Subject: [PATCH 07998/10326] Allow autoplay score generation to access mod
 list

---
 osu.Game.Rulesets.Catch/Mods/CatchModAutoplay.cs     |  3 ++-
 osu.Game.Rulesets.Catch/Mods/CatchModCinema.cs       |  3 ++-
 osu.Game.Rulesets.Mania/Mods/ManiaModAutoplay.cs     |  3 ++-
 osu.Game.Rulesets.Mania/Mods/ManiaModCinema.cs       |  3 ++-
 .../TestSceneMissHitWindowJudgements.cs              |  4 +++-
 osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs         |  3 ++-
 osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs           |  3 ++-
 osu.Game.Rulesets.Taiko/Mods/TaikoModAutoplay.cs     |  3 ++-
 osu.Game.Rulesets.Taiko/Mods/TaikoModCinema.cs       |  3 ++-
 osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs    |  2 +-
 osu.Game/Rulesets/Mods/ModAutoplay.cs                | 12 +++++++++++-
 osu.Game/Rulesets/Mods/ModCinema.cs                  |  4 +++-
 12 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModAutoplay.cs b/osu.Game.Rulesets.Catch/Mods/CatchModAutoplay.cs
index 692e63fa69..e1eceea606 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModAutoplay.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModAutoplay.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.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Replays;
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModAutoplay : ModAutoplay<CatchHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "osu!salad!" } },
             Replay = new CatchAutoGenerator(beatmap).Generate(),
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModCinema.cs b/osu.Game.Rulesets.Catch/Mods/CatchModCinema.cs
index 3bc1ee5bf5..d53d019e90 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModCinema.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModCinema.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.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Replays;
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModCinema : ModCinema<CatchHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "osu!salad!" } },
             Replay = new CatchAutoGenerator(beatmap).Generate(),
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModAutoplay.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModAutoplay.cs
index c05e979e9a..105d88129c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModAutoplay.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModAutoplay.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.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
@@ -13,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModAutoplay : ModAutoplay<ManiaHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "osu!topus!" } },
             Replay = new ManiaAutoGenerator((ManiaBeatmap)beatmap).Generate(),
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModCinema.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModCinema.cs
index 02c1fc1b79..064c55ed8d 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModCinema.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModCinema.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.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
@@ -13,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModCinema : ModCinema<ManiaHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "osu!topus!" } },
             Replay = new ManiaAutoGenerator((ManiaBeatmap)beatmap).Generate(),
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
index 39deba2f57..f73649fcd9 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
@@ -1,9 +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 NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
@@ -65,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private class TestAutoMod : OsuModAutoplay
         {
-            public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+            public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
             {
                 ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
                 Replay = new MissingAutoGenerator(beatmap).Generate()
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs
index bea2bbcb32..454c94cd96 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
@@ -16,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModAutopilot)).Append(typeof(OsuModSpunOut)).ToArray();
 
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
             Replay = new OsuAutoGenerator(beatmap).Generate()
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs b/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs
index 5d9a524577..99e5568bb3 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
@@ -16,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModAutopilot)).Append(typeof(OsuModSpunOut)).ToArray();
 
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
             Replay = new OsuAutoGenerator(beatmap).Generate()
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModAutoplay.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModAutoplay.cs
index 5b890b3d03..64e59b64d0 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModAutoplay.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModAutoplay.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.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModAutoplay : ModAutoplay<TaikoHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "mekkadosu!" } },
             Replay = new TaikoAutoGenerator(beatmap).Generate(),
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModCinema.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModCinema.cs
index 71aa007d3b..00f0c8e321 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModCinema.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModCinema.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.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModCinema : ModCinema<TaikoHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "mekkadosu!" } },
             Replay = new TaikoAutoGenerator(beatmap).Generate(),
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
index 3a71d4ca54..f94e122b30 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var beatmap = Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, Array.Empty<Mod>());
 
-            return new ScoreAccessibleReplayPlayer(ruleset.GetAutoplayMod()?.CreateReplayScore(beatmap));
+            return new ScoreAccessibleReplayPlayer(ruleset.GetAutoplayMod()?.CreateReplayScore(beatmap, Array.Empty<Mod>()));
         }
 
         protected override void AddCheckSteps()
diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index 945dd444be..748c7272f4 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -15,7 +16,11 @@ namespace osu.Game.Rulesets.Mods
     public abstract class ModAutoplay<T> : ModAutoplay, IApplicableToDrawableRuleset<T>
         where T : HitObject
     {
-        public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset) => drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap));
+        public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
+        {
+            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
+            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, mods));
+        }
     }
 
     public abstract class ModAutoplay : Mod, IApplicableFailOverride
@@ -35,6 +40,11 @@ namespace osu.Game.Rulesets.Mods
 
         public override bool HasImplementation => GetType().GenericTypeArguments.Length == 0;
 
+        [Obsolete("Use the mod-supporting override")] // can be removed 20210731
         public virtual Score CreateReplayScore(IBeatmap beatmap) => new Score { Replay = new Replay() };
+
+#pragma warning disable 618
+        public virtual Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => CreateReplayScore(beatmap);
+#pragma warning restore 618
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index bee9e56edd..16e6400f23 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.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.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;
@@ -14,7 +15,8 @@ namespace osu.Game.Rulesets.Mods
     {
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
         {
-            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap));
+            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
+            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, mods));
 
             // AlwaysPresent required for hitsounds
             drawableRuleset.Playfield.AlwaysPresent = true;

From 7daeacaff230b58a13847db3727918cf7da38d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 17:43:16 +0100
Subject: [PATCH 07999/10326] Add and implement IApplicableToRate interface

---
 osu.Game/Rulesets/Mods/IApplicableToRate.cs | 20 ++++++++++++++++++++
 osu.Game/Rulesets/Mods/ModRateAdjust.cs     |  4 +++-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs       | 19 ++++++++++++-------
 3 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/IApplicableToRate.cs

diff --git a/osu.Game/Rulesets/Mods/IApplicableToRate.cs b/osu.Game/Rulesets/Mods/IApplicableToRate.cs
new file mode 100644
index 0000000000..f613867132
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/IApplicableToRate.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.
+
+namespace osu.Game.Rulesets.Mods
+{
+    /// <summary>
+    /// Interface that should be implemented by mods that affect the track playback speed,
+    /// and in turn, values of the track rate.
+    /// </summary>
+    public interface IApplicableToRate : IApplicableToAudio
+    {
+        /// <summary>
+        /// Returns the playback rate at <paramref name="time"/> after this mod is applied.
+        /// </summary>
+        /// <param name="time">The time instant at which the playback rate is queried.</param>
+        /// <param name="rate">The playback rate before applying this mod.</param>
+        /// <returns>The playback rate after applying this mod.</returns>
+        double ApplyToRate(double time, double rate = 1);
+    }
+}
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index 2150b0fb68..b016a6d43b 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Audio;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModRateAdjust : Mod, IApplicableToAudio
+    public abstract class ModRateAdjust : Mod, IApplicableToRate
     {
         public abstract BindableNumber<double> SpeedChange { get; }
 
@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Mods
             sample.AddAdjustment(AdjustableProperty.Frequency, SpeedChange);
         }
 
+        public double ApplyToRate(double time, double rate) => rate * SpeedChange.Value;
+
         public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N2}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index b6916c838e..7e801c3024 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModTimeRamp : Mod, IUpdatableByPlayfield, IApplicableToBeatmap, IApplicableToAudio
+    public abstract class ModTimeRamp : Mod, IUpdatableByPlayfield, IApplicableToBeatmap, IApplicableToRate
     {
         /// <summary>
         /// The point in the beatmap at which the final ramping rate should be reached.
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mods
         protected ModTimeRamp()
         {
             // for preview purpose at song select. eventually we'll want to be able to update every frame.
-            FinalRate.BindValueChanged(val => applyRateAdjustment(1), true);
+            FinalRate.BindValueChanged(val => applyRateAdjustment(double.PositiveInfinity), true);
             AdjustPitch.BindValueChanged(applyPitchAdjustment);
         }
 
@@ -75,17 +75,22 @@ namespace osu.Game.Rulesets.Mods
             finalRateTime = firstObjectStart + FINAL_RATE_PROGRESS * (lastObjectEnd - firstObjectStart);
         }
 
+        public double ApplyToRate(double time, double rate = 1)
+        {
+            double amount = (time - beginRampTime) / Math.Max(1, finalRateTime - beginRampTime);
+            double ramp = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
+            return rate * ramp;
+        }
+
         public virtual void Update(Playfield playfield)
         {
-            applyRateAdjustment((track.CurrentTime - beginRampTime) / Math.Max(1, finalRateTime - beginRampTime));
+            applyRateAdjustment(track.CurrentTime);
         }
 
         /// <summary>
-        /// Adjust the rate along the specified ramp
+        /// Adjust the rate along the specified ramp.
         /// </summary>
-        /// <param name="amount">The amount of adjustment to apply (from 0..1).</param>
-        private void applyRateAdjustment(double amount) =>
-            SpeedChange.Value = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
+        private void applyRateAdjustment(double time) => SpeedChange.Value = ApplyToRate(time);
 
         private void applyPitchAdjustment(ValueChangedEvent<bool> adjustPitchSetting)
         {

From 3fabe247b09a32ccf1fb6a652356875ce1c63b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 17:59:35 +0100
Subject: [PATCH 08000/10326] Allow OsuModGenerator to accept a mod list

---
 .../TestSceneMissHitWindowJudgements.cs                     | 6 +++---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs               | 3 ++-
 osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs                | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs                  | 2 +-
 osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs           | 6 ++++--
 osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs       | 3 ++-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
index f73649fcd9..af67ab5839 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
             {
                 ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
-                Replay = new MissingAutoGenerator(beatmap).Generate()
+                Replay = new MissingAutoGenerator(beatmap, mods).Generate()
             };
         }
 
@@ -78,8 +78,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             public new OsuBeatmap Beatmap => (OsuBeatmap)base.Beatmap;
 
-            public MissingAutoGenerator(IBeatmap beatmap)
-                : base(beatmap)
+            public MissingAutoGenerator(IBeatmap beatmap, IReadOnlyList<Mod> mods)
+                : base(beatmap, mods)
             {
             }
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 8c819c4773..59a5295858 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -62,7 +62,8 @@ namespace osu.Game.Rulesets.Osu.Mods
             inputManager.AllowUserCursorMovement = false;
 
             // Generate the replay frames the cursor should follow
-            replayFrames = new OsuAutoGenerator(drawableRuleset.Beatmap).Generate().Frames.Cast<OsuReplayFrame>().ToList();
+            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
+            replayFrames = new OsuAutoGenerator(drawableRuleset.Beatmap, mods).Generate().Frames.Cast<OsuReplayFrame>().ToList();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs
index 454c94cd96..3b1f271d41 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
-            Replay = new OsuAutoGenerator(beatmap).Generate()
+            Replay = new OsuAutoGenerator(beatmap, mods).Generate()
         };
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs b/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs
index 99e5568bb3..df06988b70 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
-            Replay = new OsuAutoGenerator(beatmap).Generate()
+            Replay = new OsuAutoGenerator(beatmap, mods).Generate()
         };
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index 954a217473..e4b6f6425d 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -6,10 +6,12 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -49,8 +51,8 @@ namespace osu.Game.Rulesets.Osu.Replays
 
         #region Construction / Initialisation
 
-        public OsuAutoGenerator(IBeatmap beatmap)
-            : base(beatmap)
+        public OsuAutoGenerator(IBeatmap beatmap, IReadOnlyList<Mod> mods)
+            : base(beatmap, mods)
         {
             // Already superhuman, but still somewhat realistic
             reactionTime = ApplyModsToRate(100);
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
index 3356a0fbe0..f88594a3ee 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
@@ -6,6 +6,7 @@ using osu.Game.Beatmaps;
 using System;
 using System.Collections.Generic;
 using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Replays;
 
@@ -34,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Replays
         protected Replay Replay;
         protected List<ReplayFrame> Frames => Replay.Frames;
 
-        protected OsuAutoGeneratorBase(IBeatmap beatmap)
+        protected OsuAutoGeneratorBase(IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(beatmap)
         {
             Replay = new Replay();

From 0e1ec703d33907268dbb2acc49f3e8e19318ae2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 17:56:03 +0100
Subject: [PATCH 08001/10326] Use IApplicableToRate in osu! auto generator

---
 .../Replays/OsuAutoGenerator.cs               | 42 ++++++++++-------
 .../Replays/OsuAutoGeneratorBase.cs           | 47 +++++++++++++++----
 2 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index e4b6f6425d..693943a08a 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -35,11 +35,6 @@ namespace osu.Game.Rulesets.Osu.Replays
 
         #region Constants
 
-        /// <summary>
-        /// The "reaction time" in ms between "seeing" a new hit object and moving to "react" to it.
-        /// </summary>
-        private readonly double reactionTime;
-
         private readonly HitWindows defaultHitWindows;
 
         /// <summary>
@@ -54,9 +49,6 @@ namespace osu.Game.Rulesets.Osu.Replays
         public OsuAutoGenerator(IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(beatmap, mods)
         {
-            // Already superhuman, but still somewhat realistic
-            reactionTime = ApplyModsToRate(100);
-
             defaultHitWindows = new OsuHitWindows();
             defaultHitWindows.SetDifficulty(Beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty);
         }
@@ -242,7 +234,7 @@ namespace osu.Game.Rulesets.Osu.Replays
             OsuReplayFrame lastFrame = (OsuReplayFrame)Frames[^1];
 
             // Wait until Auto could "see and react" to the next note.
-            double waitTime = h.StartTime - Math.Max(0.0, h.TimePreempt - reactionTime);
+            double waitTime = h.StartTime - Math.Max(0.0, h.TimePreempt - getReactionTime(h.StartTime - h.TimePreempt));
 
             if (waitTime > lastFrame.Time)
             {
@@ -252,7 +244,7 @@ namespace osu.Game.Rulesets.Osu.Replays
 
             Vector2 lastPosition = lastFrame.Position;
 
-            double timeDifference = ApplyModsToTime(h.StartTime - lastFrame.Time);
+            double timeDifference = ApplyModsToTimeDelta(lastFrame.Time, h.StartTime);
 
             // Only "snap" to hitcircles if they are far enough apart. As the time between hitcircles gets shorter the snapping threshold goes up.
             if (timeDifference > 0 && // Sanity checks
@@ -260,7 +252,7 @@ namespace osu.Game.Rulesets.Osu.Replays
                  timeDifference >= 266)) // ... or the beats are slow enough to tap anyway.
             {
                 // Perform eased movement
-                for (double time = lastFrame.Time + FrameDelay; time < h.StartTime; time += FrameDelay)
+                for (double time = lastFrame.Time + GetFrameDelay(lastFrame.Time); time < h.StartTime; time += GetFrameDelay(time))
                 {
                     Vector2 currentPosition = Interpolation.ValueAt(time, lastPosition, targetPos, lastFrame.Time, h.StartTime, easing);
                     AddFrameToReplay(new OsuReplayFrame((int)time, new Vector2(currentPosition.X, currentPosition.Y)) { Actions = lastFrame.Actions });
@@ -274,6 +266,14 @@ namespace osu.Game.Rulesets.Osu.Replays
             }
         }
 
+        /// <summary>
+        /// Calculates the "reaction time" in ms between "seeing" a new hit object and moving to "react" to it.
+        /// </summary>
+        /// <remarks>
+        /// Already superhuman, but still somewhat realistic.
+        /// </remarks>
+        private double getReactionTime(double timeInstant) => ApplyModsToRate(timeInstant, 100);
+
         // Add frames to click the hitobject
         private void addHitObjectClickFrames(OsuHitObject h, Vector2 startPosition, float spinnerDirection)
         {
@@ -343,17 +343,23 @@ namespace osu.Game.Rulesets.Osu.Replays
                     float angle = radius == 0 ? 0 : MathF.Atan2(difference.Y, difference.X);
 
                     double t;
+                    double previousFrame = h.StartTime;
 
-                    for (double j = h.StartTime + FrameDelay; j < spinner.EndTime; j += FrameDelay)
+                    for (double nextFrame = h.StartTime + GetFrameDelay(h.StartTime); nextFrame < spinner.EndTime; nextFrame += GetFrameDelay(nextFrame))
                     {
-                        t = ApplyModsToTime(j - h.StartTime) * spinnerDirection;
+                        t = ApplyModsToTimeDelta(previousFrame, nextFrame) * spinnerDirection;
+                        angle += (float)t / 20;
 
-                        Vector2 pos = SPINNER_CENTRE + CirclePosition(t / 20 + angle, SPIN_RADIUS);
-                        AddFrameToReplay(new OsuReplayFrame((int)j, new Vector2(pos.X, pos.Y), action));
+                        Vector2 pos = SPINNER_CENTRE + CirclePosition(angle, SPIN_RADIUS);
+                        AddFrameToReplay(new OsuReplayFrame((int)nextFrame, new Vector2(pos.X, pos.Y), action));
+
+                        previousFrame = nextFrame;
                     }
 
-                    t = ApplyModsToTime(spinner.EndTime - h.StartTime) * spinnerDirection;
-                    Vector2 endPosition = SPINNER_CENTRE + CirclePosition(t / 20 + angle, SPIN_RADIUS);
+                    t = ApplyModsToTimeDelta(previousFrame, spinner.EndTime) * spinnerDirection;
+                    angle += (float)t / 20;
+
+                    Vector2 endPosition = SPINNER_CENTRE + CirclePosition(angle, SPIN_RADIUS);
 
                     AddFrameToReplay(new OsuReplayFrame(spinner.EndTime, new Vector2(endPosition.X, endPosition.Y), action));
 
@@ -361,7 +367,7 @@ namespace osu.Game.Rulesets.Osu.Replays
                     break;
 
                 case Slider slider:
-                    for (double j = FrameDelay; j < slider.Duration; j += FrameDelay)
+                    for (double j = GetFrameDelay(slider.StartTime); j < slider.Duration; j += GetFrameDelay(slider.StartTime + j))
                     {
                         Vector2 pos = slider.StackedPositionAt(j / slider.Duration);
                         AddFrameToReplay(new OsuReplayFrame(h.StartTime + j, new Vector2(pos.X, pos.Y), action));
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
index f88594a3ee..1cb3208c30 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
@@ -5,6 +5,7 @@ using osuTK;
 using osu.Game.Beatmaps;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.UI;
@@ -23,33 +24,61 @@ namespace osu.Game.Rulesets.Osu.Replays
 
         public const float SPIN_RADIUS = 50;
 
-        /// <summary>
-        /// The time in ms between each ReplayFrame.
-        /// </summary>
-        protected readonly double FrameDelay;
-
         #endregion
 
         #region Construction / Initialisation
 
         protected Replay Replay;
         protected List<ReplayFrame> Frames => Replay.Frames;
+        private readonly IReadOnlyList<IApplicableToRate> timeAffectingMods;
 
         protected OsuAutoGeneratorBase(IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(beatmap)
         {
             Replay = new Replay();
 
-            // We are using ApplyModsToRate and not ApplyModsToTime to counteract the speed up / slow down from HalfTime / DoubleTime so that we remain at a constant framerate of 60 fps.
-            FrameDelay = ApplyModsToRate(1000.0 / 60.0);
+            timeAffectingMods = mods.OfType<IApplicableToRate>().ToList();
         }
 
         #endregion
 
         #region Utilities
 
-        protected double ApplyModsToTime(double v) => v;
-        protected double ApplyModsToRate(double v) => v;
+        /// <summary>
+        /// Returns the real duration of time between <paramref name="startTime"/> and <paramref name="endTime"/>
+        /// after applying rate-affecting mods.
+        /// </summary>
+        /// <remarks>
+        /// This method should only be used when <paramref name="startTime"/> and <paramref name="endTime"/> are very close.
+        /// That is because the track rate might be changing with time,
+        /// and the method used here is a rough instantaneous approximation.
+        /// </remarks>
+        /// <param name="startTime">The start time of the time delta, in original track time.</param>
+        /// <param name="endTime">The end time of the time delta, in original track time.</param>
+        protected double ApplyModsToTimeDelta(double startTime, double endTime)
+        {
+            double delta = endTime - startTime;
+
+            foreach (var mod in timeAffectingMods)
+                delta /= mod.ApplyToRate(startTime);
+
+            return delta;
+        }
+
+        protected double ApplyModsToRate(double time, double rate)
+        {
+            foreach (var mod in timeAffectingMods)
+                rate = mod.ApplyToRate(time, rate);
+            return rate;
+        }
+
+        /// <summary>
+        /// Calculates the interval after which the next <see cref="ReplayFrame"/> should be generated,
+        /// in milliseconds.
+        /// </summary>
+        /// <param name="time">The time of the previous frame.</param>
+        protected double GetFrameDelay(double time)
+            => ApplyModsToRate(time, 1000.0 / 60);
 
         private class ReplayFrameComparer : IComparer<ReplayFrame>
         {

From 0229851c9ca93570e68dbe056cc15d20099b1cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 7 Feb 2021 19:02:09 +0100
Subject: [PATCH 08002/10326] Apply rounding to ModTimeRamp to improve SPM
 consistency

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 7e801c3024..330945d3d3 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -79,7 +79,9 @@ namespace osu.Game.Rulesets.Mods
         {
             double amount = (time - beginRampTime) / Math.Max(1, finalRateTime - beginRampTime);
             double ramp = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
-            return rate * ramp;
+
+            // round the end result to match the bindable SpeedChange's precision, in case this is called externally.
+            return rate * Math.Round(ramp, 2);
         }
 
         public virtual void Update(Playfield playfield)

From 0df15b4d7a4361368d1504ec18695902b9969d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 7 Feb 2021 19:25:33 +0100
Subject: [PATCH 08003/10326] Add test coverage

---
 .../Mods/TestSceneOsuModAutoplay.cs           | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
new file mode 100644
index 0000000000..856b6554b9
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -0,0 +1,65 @@
+// Copyright (c) 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.Testing;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Skinning.Default;
+using osu.Game.Rulesets.Osu.UI;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public class TestSceneOsuModAutoplay : OsuModTestScene
+    {
+        [Test]
+        public void TestSpmUnaffectedByRateAdjust()
+            => runSpmTest(new OsuModDaycore
+            {
+                SpeedChange = { Value = 0.88 }
+            });
+
+        [Test]
+        public void TestSpmUnaffectedByTimeRamp()
+            => runSpmTest(new ModWindUp
+            {
+                InitialRate = { Value = 0.7 },
+                FinalRate = { Value = 1.3 }
+            });
+
+        private void runSpmTest(Mod mod)
+        {
+            SpinnerSpmCounter spmCounter = null;
+
+            CreateModTest(new ModTestData
+            {
+                Autoplay = true,
+                Mod = mod,
+                Beatmap = new Beatmap
+                {
+                    HitObjects =
+                    {
+                        new Spinner
+                        {
+                            Duration = 2000,
+                            Position = OsuPlayfield.BASE_SIZE / 2
+                        }
+                    }
+                },
+                PassCondition = () => Player.ScoreProcessor.JudgedHits >= 1
+            });
+
+            AddUntilStep("fetch SPM counter", () =>
+            {
+                spmCounter = this.ChildrenOfType<SpinnerSpmCounter>().SingleOrDefault();
+                return spmCounter != null;
+            });
+
+            AddUntilStep("SPM is correct", () => Precision.AlmostEquals(spmCounter.SpinsPerMinute, 477, 5));
+        }
+    }
+}

From d74a1437beddf07f471254588a4609130a361cd2 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 7 Feb 2021 15:14:08 -0800
Subject: [PATCH 08004/10326] Fix player loader metadata not being centred

---
 .../Screens/Play/BeatmapMetadataDisplay.cs    | 78 +++++++++++--------
 1 file changed, 46 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index b53141e8fb..eff06e26ee 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -23,32 +23,6 @@ namespace osu.Game.Screens.Play
     /// </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;
@@ -144,15 +118,34 @@ namespace osu.Game.Screens.Play
                                 Bottom = 40
                             },
                         },
-                        new MetadataLine("Source", metadata.Source)
+                        new GridContainer
                         {
-                            Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
-                        },
-                        new MetadataLine("Mapper", metadata.AuthorString)
-                        {
                             Origin = Anchor.TopCentre,
-                            Anchor = Anchor.TopCentre,
+                            AutoSizeAxes = Axes.Both,
+                            RowDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.AutoSize),
+                                new Dimension(GridSizeMode.AutoSize),
+                            },
+                            ColumnDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.AutoSize),
+                                new Dimension(GridSizeMode.AutoSize),
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    new MetadataLineLabel("Source"),
+                                    new MetadataLineInfo(metadata.Source)
+                                },
+                                new Drawable[]
+                                {
+                                    new MetadataLineLabel("Mapper"),
+                                    new MetadataLineInfo(metadata.AuthorString)
+                                }
+                            }
                         },
                         new ModDisplay
                         {
@@ -168,5 +161,26 @@ namespace osu.Game.Screens.Play
 
             Loading = true;
         }
+
+        private class MetadataLineLabel : OsuSpriteText
+        {
+            public MetadataLineLabel(string text)
+            {
+                Anchor = Anchor.TopRight;
+                Origin = Anchor.TopRight;
+                Margin = new MarginPadding { Right = 5 };
+                Colour = OsuColour.Gray(0.8f);
+                Text = text;
+            }
+        }
+
+        private class MetadataLineInfo : OsuSpriteText
+        {
+            public MetadataLineInfo(string text)
+            {
+                Margin = new MarginPadding { Left = 5 };
+                Text = string.IsNullOrEmpty(text) ? @"-" : text;
+            }
+        }
     }
 }

From 2218247b21d09a8317ae84dd4dffa1bbf7a744c0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 11:07:50 +0900
Subject: [PATCH 08005/10326] Override mod type

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 8cd6676f9d..863dc05216 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override bool Ranked => false;
 
+        public override ModType Type => ModType.Conversion;
+
         [SettingSource("Disable slider head judgement", "Scores sliders proportionally to the number of ticks hit.")]
         public Bindable<bool> DisableSliderHeadJudgement { get; } = new BindableBool(true);
 

From d955200e0718db14fa4b5ea13e6355e5b7134983 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 11:10:07 +0900
Subject: [PATCH 08006/10326] Prevent invalid hit results for ignored slider
 heads

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index ee1df00ef7..87cfa47091 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             // If not judged as a normal hitcircle, only track whether a hit has occurred (via IgnoreHit) rather than a scorable hit result.
             var result = base.ResultFor(timeOffset);
-            return result.IsHit() ? HitResult.IgnoreHit : result;
+            return result.IsHit() ? HitResult.IgnoreHit : HitResult.IgnoreMiss;
         }
 
         public Action<double> OnShake;

From 9e0724b138fd4c251dc61e5daa3e702dd2a77cee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Feb 2021 15:58:41 +0900
Subject: [PATCH 08007/10326] Remove unnecessary double resolution of OsuGame

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index bd67d3f06a..669fa93298 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -80,9 +80,6 @@ namespace osu.Game.Screens.Play
 
         public int RestartCount;
 
-        [Resolved]
-        private OsuGameBase gameBase { get; set; }
-
         [Resolved]
         private ScoreManager scoreManager { get; set; }
 
@@ -160,7 +157,6 @@ namespace osu.Game.Screens.Play
             if (!Mods.Value.Any(m => m is ModAutoplay))
                 PrepareReplay();
 
-            gameActive.BindTo(gameBase.IsActive);
             gameActive.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
         }
 
@@ -195,7 +191,10 @@ namespace osu.Game.Screens.Play
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
             if (game != null)
+            {
                 LocalUserPlaying.BindTo(game.LocalUserPlaying);
+                gameActive.BindTo(game.IsActive);
+            }
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
 

From 10142a44716882a4671d4cae2391a96348bd90ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Feb 2021 16:59:21 +0900
Subject: [PATCH 08008/10326] Disable failing test temporarily pending
 resolution

---
 .../Visual/Multiplayer/TestScenePlaylistsSongSelect.cs           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
index 2f7e59f800..1d13c6229c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
@@ -143,6 +143,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         /// Tests that the same <see cref="Mod"/> instances are not shared between two playlist items.
         /// </summary>
         [Test]
+        [Ignore("Temporarily disabled due to a non-trivial test failure")]
         public void TestNewItemHasNewModInstances()
         {
             AddStep("set dt mod", () => SelectedMods.Value = new[] { new OsuModDoubleTime() });

From 42c169054afa0b0aaf6e84002d4f05fd80e63e17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Feb 2021 17:46:34 +0900
Subject: [PATCH 08009/10326] Revert "Disable failing test temporarily pending
 resolution"

This reverts commit 10142a44716882a4671d4cae2391a96348bd90ba.
---
 .../Visual/Multiplayer/TestScenePlaylistsSongSelect.cs           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
index 1d13c6229c..2f7e59f800 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
@@ -143,7 +143,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
         /// Tests that the same <see cref="Mod"/> instances are not shared between two playlist items.
         /// </summary>
         [Test]
-        [Ignore("Temporarily disabled due to a non-trivial test failure")]
         public void TestNewItemHasNewModInstances()
         {
             AddStep("set dt mod", () => SelectedMods.Value = new[] { new OsuModDoubleTime() });

From fb8e31a30385636856e20ebdeb67d76ac6d815c8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 17:51:57 +0900
Subject: [PATCH 08010/10326] Fix incorrect connection building due to bad
 merges

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 1b966ae1dc..6908795510 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -71,20 +71,6 @@ namespace osu.Game.Online.Multiplayer
             if (!await connectionLock.WaitAsync(10000))
                 throw new TimeoutException("Could not obtain a lock to connect. A previous attempt is likely stuck.");
 
-            var builder = new HubConnectionBuilder()
-                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
-
-            if (RuntimeInfo.SupportsJIT)
-                builder.AddMessagePackProtocol();
-            else
-            {
-                // eventually we will precompile resolvers for messagepack, but this isn't working currently
-                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
-                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
-            }
-
-            connection = builder.Build();
-
             try
             {
                 while (api.State.Value == APIState.Online)
@@ -235,10 +221,19 @@ namespace osu.Game.Online.Multiplayer
 
         private HubConnection createConnection(CancellationToken cancellationToken)
         {
-            var newConnection = new HubConnectionBuilder()
-                                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); })
-                                .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
-                                .Build();
+            var builder = new HubConnectionBuilder()
+                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
+
+            if (RuntimeInfo.SupportsJIT)
+                builder.AddMessagePackProtocol();
+            else
+            {
+                // eventually we will precompile resolvers for messagepack, but this isn't working currently
+                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
+                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
+            }
+
+            var newConnection = builder.Build();
 
             // this is kind of SILLY
             // https://github.com/dotnet/aspnetcore/issues/15198

From 6b26a18a23162e784fad3c941ace78fa557bf7d4 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 8 Feb 2021 01:34:32 -0800
Subject: [PATCH 08011/10326] Fix attributes header not being aligned with
 content in editor timing mode

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index e4b9150df1..81b006e6c8 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -74,7 +74,8 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
                 new TableColumn("Time", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn("Attributes", Anchor.Centre),
+                new TableColumn(),
+                new TableColumn("Attributes", Anchor.CentreLeft),
             };
 
             return columns.ToArray();
@@ -93,6 +94,7 @@ namespace osu.Game.Screens.Edit.Timing
                 Text = group.Time.ToEditorFormattedString(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
             },
+            null,
             new ControlGroupAttributes(group),
         };
 
@@ -108,7 +110,6 @@ namespace osu.Game.Screens.Edit.Timing
                 {
                     RelativeSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
-                    Padding = new MarginPadding(10),
                     Spacing = new Vector2(2)
                 };
 

From 5e7823b289a607731f253ec342c24fa9fcde7143 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 8 Feb 2021 01:37:34 -0800
Subject: [PATCH 08012/10326] Fix attributes content being zero size and
 disappearing after being half off-screen

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 81b006e6c8..8980c2019a 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -106,6 +106,7 @@ namespace osu.Game.Screens.Edit.Timing
 
             public ControlGroupAttributes(ControlPointGroup group)
             {
+                RelativeSizeAxes = Axes.Both;
                 InternalChild = fill = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Both,

From b40b159acb276d35bc553a597bc58980f3d3c1dd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 18:52:50 +0900
Subject: [PATCH 08013/10326] Round beatlength

---
 osu.Game/Beatmaps/Beatmap.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 51fdbce96d..434bff14b5 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.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.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Objects;
 using System.Collections.Generic;
@@ -65,7 +66,7 @@ namespace osu.Game.Beatmaps
                                     return (beatLength: t.BeatLength, duration: nextTime - t.Time);
                                 })
                                 // Aggregate durations into a set of (beatLength, duration) tuples for each beat length
-                                .GroupBy(t => t.beatLength)
+                                .GroupBy(t => Math.Round(t.beatLength * 1000) / 1000)
                                 .Select(g => (beatLength: g.Key, duration: g.Sum(t => t.duration)))
                                 // And if there are no timing points, use a default.
                                 .DefaultIfEmpty((TimingControlPoint.DEFAULT_BEAT_LENGTH, 0));

From 18e3f8c233da2ed3eb8b859944994d39f9f54512 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 19:03:19 +0900
Subject: [PATCH 08014/10326] Sort beat lengths rather than linear search

---
 osu.Game/Beatmaps/Beatmap.cs | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 434bff14b5..e5b6a4bc44 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Beatmaps
             // Note: This is more accurate and may present different results because osu-stable didn't have the ability to calculate slider durations in this context.
             double lastTime = HitObjects.LastOrDefault()?.GetEndTime() ?? ControlPointInfo.TimingPoints.LastOrDefault()?.Time ?? 0;
 
-            var beatLengthsAndDurations =
+            var mostCommon =
                 // Construct a set of (beatLength, duration) tuples for each individual timing point.
                 ControlPointInfo.TimingPoints.Select((t, i) =>
                                 {
@@ -68,23 +68,10 @@ namespace osu.Game.Beatmaps
                                 // Aggregate durations into a set of (beatLength, duration) tuples for each beat length
                                 .GroupBy(t => Math.Round(t.beatLength * 1000) / 1000)
                                 .Select(g => (beatLength: g.Key, duration: g.Sum(t => t.duration)))
-                                // And if there are no timing points, use a default.
-                                .DefaultIfEmpty((TimingControlPoint.DEFAULT_BEAT_LENGTH, 0));
+                                // Get the most common one, or 0 as a suitable default
+                                .OrderByDescending(i => i.duration).FirstOrDefault();
 
-            // Find the single beat length with the maximum aggregate duration.
-            double maxDurationBeatLength = double.NegativeInfinity;
-            double maxDuration = double.NegativeInfinity;
-
-            foreach (var (beatLength, duration) in beatLengthsAndDurations)
-            {
-                if (duration > maxDuration)
-                {
-                    maxDuration = duration;
-                    maxDurationBeatLength = beatLength;
-                }
-            }
-
-            return maxDurationBeatLength;
+            return mostCommon.beatLength;
         }
 
         IBeatmap IBeatmap.Clone() => Clone();

From f0dfa9f8f397269571b96d1165f03f36a555bc8e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 8 Feb 2021 11:12:25 +0100
Subject: [PATCH 08015/10326] Use the newest config file available (where the
 local username matches the filename)

---
 osu.Game/IO/StableStorage.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index 614e548d93..ccc6f9c311 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -35,11 +35,7 @@ namespace osu.Game.IO
         {
             var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
 
-            // enumerate the user config files available in case the user migrated their files from another pc / operating system.
-            var foundConfigFiles = GetFiles(".", "osu!.*.cfg");
-
-            // if more than one config file is found, let's use the oldest one (where the username in the filename doesn't match the local username).
-            var configFile = foundConfigFiles.Count() > 1 ? foundConfigFiles.FirstOrDefault(filename => !filename[5..^4].Contains(Environment.UserName, StringComparison.Ordinal)) : foundConfigFiles.FirstOrDefault();
+            var configFile = GetFiles(".", $"osu!.{Environment.UserName}.cfg").SingleOrDefault();
 
             if (configFile == null)
                 return songsDirectoryPath;

From a08c51f213594a02ea3d354c4e913f29723ab2fd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 19:23:10 +0900
Subject: [PATCH 08016/10326] Remove duplicate code

---
 .../OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index e29fb658a3..ae32295676 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -164,9 +164,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
 
-            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
-            userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList();
-
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
             else

From d8c53e34ae5cba88b491d5379dec5d7ecd15e9f8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 19:42:17 +0900
Subject: [PATCH 08017/10326] Fix missing using

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 032493a5c6..f454fe619b 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;

From 19368f87fb8c37eec5bf06f71b2d15959722cf08 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 19:59:07 +0900
Subject: [PATCH 08018/10326] Fix failing test

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 669fa93298..7924e1390b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, OsuConfigManager config, OsuGame game)
+        private void load(AudioManager audio, OsuConfigManager config, OsuGameBase game)
         {
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 
@@ -191,10 +191,9 @@ namespace osu.Game.Screens.Play
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
             if (game != null)
-            {
-                LocalUserPlaying.BindTo(game.LocalUserPlaying);
                 gameActive.BindTo(game.IsActive);
-            }
+            if (game is OsuGame osuGame)
+                LocalUserPlaying.BindTo(osuGame.LocalUserPlaying);
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
 

From 156f5bd5df715323e6dc227c7fb5be7e439ff72e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Feb 2021 20:05:16 +0900
Subject: [PATCH 08019/10326] Add newline between statements

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7924e1390b..5d06ac5b3a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -192,6 +192,7 @@ namespace osu.Game.Screens.Play
 
             if (game != null)
                 gameActive.BindTo(game.IsActive);
+
             if (game is OsuGame osuGame)
                 LocalUserPlaying.BindTo(osuGame.LocalUserPlaying);
 

From f4a31287bfca31bf088f077e014f7af4d68b6232 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 20:11:06 +0900
Subject: [PATCH 08020/10326] Add/use IHitObjectContainer interface instead of
 IEnumerables

---
 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs        |  7 +++---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  3 +--
 .../UI/StartTimeOrderedHitPolicy.cs           |  7 +++---
 osu.Game/Rulesets/UI/HitObjectContainer.cs    | 11 +--------
 osu.Game/Rulesets/UI/IHitObjectContainer.cs   | 24 +++++++++++++++++++
 5 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Rulesets/UI/IHitObjectContainer.cs

diff --git a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
index 72c3d781bb..5d8ea035a7 100644
--- a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
@@ -1,19 +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.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
     public interface IHitPolicy
     {
         /// <summary>
-        /// Sets the <see cref="DrawableHitObject"/>s which this <see cref="IHitPolicy"/> controls.
+        /// The <see cref="IHitObjectContainer"/> containing the <see cref="DrawableHitObject"/>s which this <see cref="IHitPolicy"/> applies to.
         /// </summary>
-        /// <param name="hitObjects">An enumeration of the <see cref="DrawableHitObject"/>s.</param>
-        void SetHitObjects(IEnumerable<DrawableHitObject> hitObjects);
+        IHitObjectContainer HitObjectContainer { set; }
 
         /// <summary>
         /// Determines whether a <see cref="DrawableHitObject"/> can be hit at a point in time.
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index c7900558a0..e085714265 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -54,8 +54,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            hitPolicy = new StartTimeOrderedHitPolicy();
-            hitPolicy.SetHitObjects(HitObjectContainer.AliveObjects);
+            hitPolicy = new StartTimeOrderedHitPolicy { HitObjectContainer = HitObjectContainer };
 
             var hitWindows = new OsuHitWindows();
 
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 38ba5fc490..0173156246 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
@@ -19,9 +20,7 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class StartTimeOrderedHitPolicy : IHitPolicy
     {
-        private IEnumerable<DrawableHitObject> hitObjects;
-
-        public void SetHitObjects(IEnumerable<DrawableHitObject> hitObjects) => this.hitObjects = hitObjects;
+        public IHitObjectContainer HitObjectContainer { get; set; }
 
         public bool IsHittable(DrawableHitObject hitObject, double time)
         {
@@ -73,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(double targetTime)
         {
-            foreach (var obj in hitObjects)
+            foreach (var obj in HitObjectContainer.AliveObjects)
             {
                 if (obj.HitObject.StartTime >= targetTime)
                     yield break;
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 1972043ccb..11312a46df 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -17,19 +17,10 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.UI
 {
-    public class HitObjectContainer : LifetimeManagementContainer
+    public class HitObjectContainer : LifetimeManagementContainer, IHitObjectContainer
     {
-        /// <summary>
-        /// All currently in-use <see cref="DrawableHitObject"/>s.
-        /// </summary>
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
-        /// <summary>
-        /// All currently in-use <see cref="DrawableHitObject"/>s that are alive.
-        /// </summary>
-        /// <remarks>
-        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this is equivalent to <see cref="Objects"/>.
-        /// </remarks>
         public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
         /// <summary>
diff --git a/osu.Game/Rulesets/UI/IHitObjectContainer.cs b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
new file mode 100644
index 0000000000..4c784132e8
--- /dev/null
+++ b/osu.Game/Rulesets/UI/IHitObjectContainer.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 System.Collections.Generic;
+using osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.UI
+{
+    public interface IHitObjectContainer
+    {
+        /// <summary>
+        /// All currently in-use <see cref="DrawableHitObject"/>s.
+        /// </summary>
+        IEnumerable<DrawableHitObject> Objects { get; }
+
+        /// <summary>
+        /// All currently in-use <see cref="DrawableHitObject"/>s that are alive.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="IHitObjectContainer"/> uses pooled objects, this is equivalent to <see cref="Objects"/>.
+        /// </remarks>
+        IEnumerable<DrawableHitObject> AliveObjects { get; }
+    }
+}

From 414e05affdf867f3bda1eb02a9639c965368b3d7 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 8 Feb 2021 02:41:07 -0800
Subject: [PATCH 08021/10326] Fix editor effect attribute tooltip having
 unnecessary whitespace when only one is enabled

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 8980c2019a..cae7d5a021 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -151,7 +151,11 @@ namespace osu.Game.Screens.Edit.Timing
                         return new RowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x", colour);
 
                     case EffectControlPoint effect:
-                        return new RowAttribute("effect", () => $"{(effect.KiaiMode ? "Kiai " : "")}{(effect.OmitFirstBarLine ? "NoBarLine " : "")}", colour);
+                        return new RowAttribute("effect", () => string.Join(" ", new[]
+                        {
+                            effect.KiaiMode ? "Kiai" : string.Empty,
+                            effect.OmitFirstBarLine ? "NoBarLine" : string.Empty
+                        }.Where(s => !string.IsNullOrEmpty(s))), colour);
 
                     case SampleControlPoint sample:
                         return new RowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);

From bebff61a9dde4ea61b27094ae9c4c4c214dababa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 8 Feb 2021 21:13:00 +0300
Subject: [PATCH 08022/10326] Add method for retrieving condensed user
 statistics

---
 osu.Game/Users/User.cs | 62 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 518236755d..2f8c6823c7 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -2,10 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using JetBrains.Annotations;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using osu.Framework.Bindables;
+using osu.Game.IO.Serialization;
+using osu.Game.Online.API.Requests;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Users
 {
@@ -178,6 +184,11 @@ namespace osu.Game.Users
 
         private UserStatistics statistics;
 
+        /// <summary>
+        /// The user statistics of the ruleset specified within the API request.
+        /// If the user is fetched from a <see cref="GetUsersRequest"/> or similar
+        /// (i.e. is a user compact instance), use <see cref="GetStatisticsFor"/> instead.
+        /// </summary>
         [JsonProperty(@"statistics")]
         public UserStatistics Statistics
         {
@@ -228,13 +239,35 @@ namespace osu.Game.Users
         [JsonProperty("replays_watched_counts")]
         public UserHistoryCount[] ReplaysWatchedCounts;
 
-        public class UserHistoryCount
-        {
-            [JsonProperty("start_date")]
-            public DateTime Date;
+        [UsedImplicitly]
+        [JsonExtensionData]
+        private readonly IDictionary<string, JToken> otherProperties = new Dictionary<string, JToken>();
 
-            [JsonProperty("count")]
-            public long Count;
+        private readonly Dictionary<RulesetInfo, UserStatistics> statisticsCache = new Dictionary<RulesetInfo, UserStatistics>();
+
+        /// <summary>
+        /// Retrieves the user statistics for a certain ruleset.
+        /// If user is fetched from a <see cref="GetUserRequest"/>,
+        /// this will always return null, use <see cref="Statistics"/> instead.
+        /// </summary>
+        /// <param name="ruleset">The ruleset to retrieve statistics for.</param>
+        // todo: this should likely be moved to a separate UserCompact class at some point.
+        public UserStatistics GetStatisticsFor(RulesetInfo ruleset)
+        {
+            if (statisticsCache.TryGetValue(ruleset, out var existing))
+                return existing;
+
+            return statisticsCache[ruleset] = parseStatisticsFor(ruleset);
+        }
+
+        private UserStatistics parseStatisticsFor(RulesetInfo ruleset)
+        {
+            if (!(otherProperties.TryGetValue($"statistics_{ruleset.ShortName}", out var token)))
+                return null;
+
+            var settings = JsonSerializableExtensions.CreateGlobalSettings();
+            settings.DefaultValueHandling = DefaultValueHandling.Include;
+            return token.ToObject<UserStatistics>(JsonSerializer.Create(settings));
         }
 
         public override string ToString() => Username;
@@ -249,6 +282,14 @@ namespace osu.Game.Users
             Id = 0
         };
 
+        public bool Equals(User other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return Id == other.Id;
+        }
+
         public enum PlayStyle
         {
             [Description("Keyboard")]
@@ -264,12 +305,13 @@ namespace osu.Game.Users
             Touch,
         }
 
-        public bool Equals(User other)
+        public class UserHistoryCount
         {
-            if (ReferenceEquals(null, other)) return false;
-            if (ReferenceEquals(this, other)) return true;
+            [JsonProperty("start_date")]
+            public DateTime Date;
 
-            return Id == other.Id;
+            [JsonProperty("count")]
+            public long Count;
         }
     }
 }

From d101add1591599c53f860c21e31901cbed220060 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 8 Feb 2021 21:14:12 +0300
Subject: [PATCH 08023/10326] Display user global rank for selected ruleset in
 participants panel

---
 .../Participants/ParticipantPanel.cs          | 21 ++++++++++++-------
 osu.Game/Users/UserStatistics.cs              |  8 +++++++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 0ee1b6d684..f69a21918a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -35,9 +35,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        private SpriteIcon crown;
+        private OsuSpriteText userRankText;
         private ModDisplay userModsDisplay;
         private StateDisplay userStateDisplay;
-        private SpriteIcon crown;
 
         public ParticipantPanel(MultiplayerRoomUser user)
         {
@@ -119,12 +120,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                         Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 18),
                                         Text = user?.Username
                                     },
-                                    new OsuSpriteText
+                                    userRankText = new OsuSpriteText
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
                                         Font = OsuFont.GetFont(size: 14),
-                                        Text = user?.CurrentModeRank != null ? $"#{user.CurrentModeRank}" : string.Empty
                                     }
                                 }
                             },
@@ -162,6 +162,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             const double fade_time = 50;
 
+            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
+
+            var currentModeRank = User.User?.GetStatisticsFor(ruleset)?.GlobalRank;
+
+            // fallback to current mode rank for testing purposes.
+            currentModeRank ??= User.User?.CurrentModeRank;
+
+            userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
+
             userStateDisplay.Status = User.State;
 
             if (Room.Host?.Equals(User) == true)
@@ -171,11 +180,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             // If the mods are updated at the end of the frame, the flow container will skip a reflow cycle: https://github.com/ppy/osu-framework/issues/4187
             // This looks particularly jarring here, so re-schedule the update to that start of our frame as a fix.
-            Schedule(() =>
-            {
-                var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
-                userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList();
-            });
+            Schedule(() => userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset.CreateInstance())).ToList());
         }
 
         public MenuItem[] ContextMenuItems
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 8b7699d0ad..6c069f674e 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Newtonsoft.Json;
+using osu.Game.Online.API.Requests;
 using osu.Game.Scoring;
 using osu.Game.Utils;
 using static osu.Game.Users.User;
@@ -26,6 +27,13 @@ namespace osu.Game.Users
             public int Progress;
         }
 
+        /// <remarks>
+        /// This must only be used when coming from condensed user responses (e.g. from <see cref="GetUsersRequest"/>), otherwise use <code>Ranks.Global</code>.
+        /// </remarks>
+        // todo: this should likely be moved to a separate UserStatisticsCompact class at some point.
+        [JsonProperty(@"global_rank")]
+        public int? GlobalRank;
+
         [JsonProperty(@"pp")]
         public decimal? PP;
 

From cca1bac67d56d9d261149eb6f497fee824a69811 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 8 Feb 2021 22:00:01 +0300
Subject: [PATCH 08024/10326] Pass empty user statistics for consistency

Realized `Statistics` was never giving null user statistics, so decided to pass an empty one here as well.
---
 osu.Game/Users/User.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 2f8c6823c7..467f00e409 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Users
         /// <summary>
         /// Retrieves the user statistics for a certain ruleset.
         /// If user is fetched from a <see cref="GetUserRequest"/>,
-        /// this will always return null, use <see cref="Statistics"/> instead.
+        /// this will always return empty instance, use <see cref="Statistics"/> instead.
         /// </summary>
         /// <param name="ruleset">The ruleset to retrieve statistics for.</param>
         // todo: this should likely be moved to a separate UserCompact class at some point.
@@ -263,7 +263,7 @@ namespace osu.Game.Users
         private UserStatistics parseStatisticsFor(RulesetInfo ruleset)
         {
             if (!(otherProperties.TryGetValue($"statistics_{ruleset.ShortName}", out var token)))
-                return null;
+                return new UserStatistics();
 
             var settings = JsonSerializableExtensions.CreateGlobalSettings();
             settings.DefaultValueHandling = DefaultValueHandling.Include;

From af345ea5db05c056234e665f665b53b0a4912d1a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 01:52:35 +0300
Subject: [PATCH 08025/10326] Add a SignalR hub client connector component

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

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
new file mode 100644
index 0000000000..49b1ab639a
--- /dev/null
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -0,0 +1,209 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable enable
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Client;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using osu.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Logging;
+using osu.Game.Online.API;
+
+namespace osu.Game.Online
+{
+    /// <summary>
+    /// A component that maintains over a hub connection between client and server.
+    /// </summary>
+    public class HubClientConnector : Component
+    {
+        /// <summary>
+        /// Invoked whenever a new hub connection is built.
+        /// </summary>
+        public Action<HubConnection>? OnNewConnection;
+
+        private readonly string clientName;
+        private readonly string endpoint;
+
+        /// <summary>
+        /// The current connection opened by this connector.
+        /// </summary>
+        public HubConnection? CurrentConnection { get; private set; }
+
+        /// <summary>
+        /// Whether this is connected to the hub, use <see cref="CurrentConnection"/> to access the connection, if this is <c>true</c>.
+        /// </summary>
+        public IBindable<bool> IsConnected => isConnected;
+
+        private readonly Bindable<bool> isConnected = new Bindable<bool>();
+        private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
+        private CancellationTokenSource connectCancelSource = new CancellationTokenSource();
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
+        /// <summary>
+        /// Constructs a new <see cref="HubClientConnector"/>.
+        /// </summary>
+        /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
+        /// <param name="endpoint">The endpoint to the hub.</param>
+        public HubClientConnector(string clientName, string endpoint)
+        {
+            this.clientName = clientName;
+            this.endpoint = endpoint;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(state =>
+            {
+                switch (state.NewValue)
+                {
+                    case APIState.Failing:
+                    case APIState.Offline:
+                        Task.Run(() => disconnect(true));
+                        break;
+
+                    case APIState.Online:
+                        Task.Run(connect);
+                        break;
+                }
+            });
+        }
+
+        private async Task connect()
+        {
+            cancelExistingConnect();
+
+            if (!await connectionLock.WaitAsync(10000))
+                throw new TimeoutException("Could not obtain a lock to connect. A previous attempt is likely stuck.");
+
+            try
+            {
+                while (apiState.Value == APIState.Online)
+                {
+                    // ensure any previous connection was disposed.
+                    // this will also create a new cancellation token source.
+                    await disconnect(false);
+
+                    // this token will be valid for the scope of this connection.
+                    // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
+                    var cancellationToken = connectCancelSource.Token;
+
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    Logger.Log($"{clientName} connecting...", LoggingTarget.Network);
+
+                    try
+                    {
+                        // importantly, rebuild the connection each attempt to get an updated access token.
+                        CurrentConnection = createConnection(cancellationToken);
+
+                        await CurrentConnection.StartAsync(cancellationToken);
+
+                        Logger.Log($"{clientName} connected!", LoggingTarget.Network);
+                        isConnected.Value = true;
+                        return;
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        //connection process was cancelled.
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Log($"{clientName} connection error: {e}", LoggingTarget.Network);
+
+                        // retry on any failure.
+                        await Task.Delay(5000, cancellationToken);
+                    }
+                }
+            }
+            finally
+            {
+                connectionLock.Release();
+            }
+        }
+
+        private HubConnection createConnection(CancellationToken cancellationToken)
+        {
+            var builder = new HubConnectionBuilder()
+                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
+
+            if (RuntimeInfo.SupportsJIT)
+                builder.AddMessagePackProtocol();
+            else
+            {
+                // eventually we will precompile resolvers for messagepack, but this isn't working currently
+                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
+                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
+            }
+
+            var newConnection = builder.Build();
+
+            OnNewConnection?.Invoke(newConnection);
+
+            newConnection.Closed += ex =>
+            {
+                isConnected.Value = false;
+
+                Logger.Log(ex != null ? $"{clientName} lost connection: {ex}" : $"{clientName} disconnected", LoggingTarget.Network);
+
+                // make sure a disconnect wasn't triggered (and this is still the active connection).
+                if (!cancellationToken.IsCancellationRequested)
+                    Task.Run(connect, default);
+
+                return Task.CompletedTask;
+            };
+
+            return newConnection;
+        }
+
+        private async Task disconnect(bool takeLock)
+        {
+            cancelExistingConnect();
+
+            if (takeLock)
+            {
+                if (!await connectionLock.WaitAsync(10000))
+                    throw new TimeoutException("Could not obtain a lock to disconnect. A previous attempt is likely stuck.");
+            }
+
+            try
+            {
+                if (CurrentConnection != null)
+                    await CurrentConnection.DisposeAsync();
+            }
+            finally
+            {
+                CurrentConnection = null;
+                if (takeLock)
+                    connectionLock.Release();
+            }
+        }
+
+        private void cancelExistingConnect()
+        {
+            connectCancelSource.Cancel();
+            connectCancelSource = new CancellationTokenSource();
+        }
+
+        public override string ToString() => $"Connector for {clientName} ({(IsConnected.Value ? "connected" : "not connected")}";
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            cancelExistingConnect();
+        }
+    }
+}

From 28b815ffe13a5439241ccaeb763e26cb4e794ca6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 02:01:52 +0300
Subject: [PATCH 08026/10326] Clean up multiplayer client with new hub
 connector

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 209 +++---------------
 .../Multiplayer/StatefulMultiplayerClient.cs  |   7 +-
 2 files changed, 31 insertions(+), 185 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 493518ac80..07036e7ffc 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -3,17 +3,11 @@
 
 #nullable enable
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
-using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
-using osu.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Logging;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 
@@ -21,106 +15,37 @@ namespace osu.Game.Online.Multiplayer
 {
     public class MultiplayerClient : StatefulMultiplayerClient
     {
-        public override IBindable<bool> IsConnected => isConnected;
+        private readonly HubClientConnector connector;
 
-        private readonly Bindable<bool> isConnected = new Bindable<bool>();
-        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+        public override IBindable<bool> IsConnected => connector.IsConnected;
 
-        private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
-
-        [Resolved]
-        private IAPIProvider api { get; set; } = null!;
-
-        private HubConnection? connection;
-
-        private CancellationTokenSource connectCancelSource = new CancellationTokenSource();
-
-        private readonly string endpoint;
+        private HubConnection? connection => connector.CurrentConnection;
 
         public MultiplayerClient(EndpointConfiguration endpoints)
         {
-            endpoint = endpoints.MultiplayerEndpointUrl;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            apiState.BindTo(api.State);
-            apiState.BindValueChanged(apiStateChanged, true);
-        }
-
-        private void apiStateChanged(ValueChangedEvent<APIState> state)
-        {
-            switch (state.NewValue)
+            InternalChild = connector = new HubClientConnector("Multiplayer client", endpoints.MultiplayerEndpointUrl)
             {
-                case APIState.Failing:
-                case APIState.Offline:
-                    Task.Run(() => disconnect(true));
-                    break;
-
-                case APIState.Online:
-                    Task.Run(connect);
-                    break;
-            }
-        }
-
-        private async Task connect()
-        {
-            cancelExistingConnect();
-
-            if (!await connectionLock.WaitAsync(10000))
-                throw new TimeoutException("Could not obtain a lock to connect. A previous attempt is likely stuck.");
-
-            try
-            {
-                while (api.State.Value == APIState.Online)
+                OnNewConnection = newConnection =>
                 {
-                    // ensure any previous connection was disposed.
-                    // this will also create a new cancellation token source.
-                    await disconnect(false);
-
-                    // this token will be valid for the scope of this connection.
-                    // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
-                    var cancellationToken = connectCancelSource.Token;
-
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);
-
-                    try
-                    {
-                        // importantly, rebuild the connection each attempt to get an updated access token.
-                        connection = createConnection(cancellationToken);
-
-                        await connection.StartAsync(cancellationToken);
-
-                        Logger.Log("Multiplayer client connected!", LoggingTarget.Network);
-                        isConnected.Value = true;
-                        return;
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        //connection process was cancelled.
-                        throw;
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.Log($"Multiplayer client connection error: {e}", LoggingTarget.Network);
-
-                        // retry on any failure.
-                        await Task.Delay(5000, cancellationToken);
-                    }
-                }
-            }
-            finally
-            {
-                connectionLock.Release();
-            }
+                    // this is kind of SILLY
+                    // https://github.com/dotnet/aspnetcore/issues/15198
+                    newConnection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
+                    newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
+                    newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
+                    newConnection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
+                    newConnection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
+                    newConnection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
+                    newConnection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
+                    newConnection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
+                    newConnection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+                    newConnection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
+                },
+            };
         }
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.FromCanceled<MultiplayerRoom>(new CancellationToken(true));
 
             return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
@@ -128,7 +53,7 @@ namespace osu.Game.Online.Multiplayer
 
         protected override Task LeaveRoomInternal()
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.FromCanceled(new CancellationToken(true));
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
@@ -136,7 +61,7 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task TransferHost(int userId)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.TransferHost), userId);
@@ -144,7 +69,7 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task ChangeSettings(MultiplayerRoomSettings settings)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeSettings), settings);
@@ -152,7 +77,7 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task ChangeState(MultiplayerUserState newState)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
@@ -160,7 +85,7 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeBeatmapAvailability), newBeatmapAvailability);
@@ -168,7 +93,7 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task ChangeUserMods(IEnumerable<APIMod> newMods)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeUserMods), newMods);
@@ -176,90 +101,10 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task StartMatch()
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
         }
-
-        private async Task disconnect(bool takeLock)
-        {
-            cancelExistingConnect();
-
-            if (takeLock)
-            {
-                if (!await connectionLock.WaitAsync(10000))
-                    throw new TimeoutException("Could not obtain a lock to disconnect. A previous attempt is likely stuck.");
-            }
-
-            try
-            {
-                if (connection != null)
-                    await connection.DisposeAsync();
-            }
-            finally
-            {
-                connection = null;
-                if (takeLock)
-                    connectionLock.Release();
-            }
-        }
-
-        private void cancelExistingConnect()
-        {
-            connectCancelSource.Cancel();
-            connectCancelSource = new CancellationTokenSource();
-        }
-
-        private HubConnection createConnection(CancellationToken cancellationToken)
-        {
-            var builder = new HubConnectionBuilder()
-                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
-
-            if (RuntimeInfo.SupportsJIT)
-                builder.AddMessagePackProtocol();
-            else
-            {
-                // eventually we will precompile resolvers for messagepack, but this isn't working currently
-                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
-                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
-            }
-
-            var newConnection = builder.Build();
-
-            // this is kind of SILLY
-            // https://github.com/dotnet/aspnetcore/issues/15198
-            newConnection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
-            newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
-            newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
-            newConnection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
-            newConnection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
-            newConnection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
-            newConnection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
-            newConnection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
-            newConnection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
-            newConnection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
-
-            newConnection.Closed += ex =>
-            {
-                isConnected.Value = false;
-
-                Logger.Log(ex != null ? $"Multiplayer client lost connection: {ex}" : "Multiplayer client disconnected", LoggingTarget.Network);
-
-                // make sure a disconnect wasn't triggered (and this is still the active connection).
-                if (!cancellationToken.IsCancellationRequested)
-                    Task.Run(connect, default);
-
-                return Task.CompletedTask;
-            };
-            return newConnection;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            cancelExistingConnect();
-        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f454fe619b..06f6754258 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
@@ -28,7 +28,7 @@ using osu.Game.Utils;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public abstract class StatefulMultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
+    public abstract class StatefulMultiplayerClient : CompositeDrawable, IMultiplayerClient, IMultiplayerRoomServer
     {
         /// <summary>
         /// Invoked when any change occurs to the multiplayer room.
@@ -97,7 +97,8 @@ namespace osu.Game.Online.Multiplayer
         // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
         private int playlistItemId;
 
-        protected StatefulMultiplayerClient()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             IsConnected.BindValueChanged(connected =>
             {

From f76f92515e7eb3588af91e0b3aac4c47fbc26731 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 02:15:51 +0300
Subject: [PATCH 08027/10326] Clean up spectator streaming client with new hub
 connector

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |   8 +-
 ...TestSceneMultiplayerGameplayLeaderboard.cs |   5 +-
 .../Spectator/SpectatorStreamingClient.cs     | 159 +++++-------------
 3 files changed, 48 insertions(+), 124 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 26524f07da..61b0961638 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -233,6 +232,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
+            protected override IBindable<bool> IsConnected { get; } = new BindableBool(false);
+
             public readonly User StreamingUser = new User { Id = 55, Username = "Test user" };
 
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
@@ -244,11 +245,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            protected override Task Connect()
-            {
-                return Task.CompletedTask;
-            }
-
             public void StartPlay(int beatmapId)
             {
                 this.beatmapId = beatmapId;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index d016accc25..6a777e2a78 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -96,6 +95,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public class TestMultiplayerStreaming : SpectatorStreamingClient
         {
+            protected override IBindable<bool> IsConnected { get; } = new BindableBool(false);
+
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
 
             private readonly int totalUsers;
@@ -163,8 +164,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     ((ISpectatorClient)this).UserSentFrames(userId, new FrameDataBundle(header, Array.Empty<LegacyReplayFrame>()));
                 }
             }
-
-            protected override Task Connect() => Task.CompletedTask;
         }
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index b95e3f1297..7cea76c969 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -8,13 +8,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
-using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Logging;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Replays.Legacy;
@@ -27,14 +23,18 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Online.Spectator
 {
-    public class SpectatorStreamingClient : Component, ISpectatorClient
+    public class SpectatorStreamingClient : CompositeDrawable, ISpectatorClient
     {
         /// <summary>
         /// The maximum milliseconds between frame bundle sends.
         /// </summary>
         public const double TIME_BETWEEN_SENDS = 200;
 
-        private HubConnection connection;
+        private readonly HubClientConnector connector;
+
+        protected virtual IBindable<bool> IsConnected => connector.IsConnected;
+
+        private HubConnection connection => connector.CurrentConnection;
 
         private readonly List<int> watchingUsers = new List<int>();
 
@@ -44,13 +44,6 @@ namespace osu.Game.Online.Spectator
 
         private readonly BindableList<int> playingUsers = new BindableList<int>();
 
-        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
-
-        private bool isConnected;
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
         [CanBeNull]
         private IBeatmap currentBeatmap;
 
@@ -82,114 +75,50 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, SpectatorState> OnUserFinishedPlaying;
 
-        private readonly string endpoint;
-
         public SpectatorStreamingClient(EndpointConfiguration endpoints)
         {
-            endpoint = endpoints.SpectatorEndpointUrl;
+            InternalChild = connector = new HubClientConnector("Spectator client", endpoints.SpectatorEndpointUrl)
+            {
+                OnNewConnection = newConnection =>
+                {
+                    // until strong typed client support is added, each method must be manually bound
+                    // (see https://github.com/dotnet/aspnetcore/issues/15198)
+                    newConnection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
+                    newConnection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
+                    newConnection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+                }
+            };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            apiState.BindTo(api.State);
-            apiState.BindValueChanged(apiStateChanged, true);
-        }
-
-        private void apiStateChanged(ValueChangedEvent<APIState> state)
-        {
-            switch (state.NewValue)
+            IsConnected.BindValueChanged(connected =>
             {
-                case APIState.Failing:
-                case APIState.Offline:
-                    connection?.StopAsync();
-                    connection = null;
-                    break;
-
-                case APIState.Online:
-                    Task.Run(Connect);
-                    break;
-            }
-        }
-
-        protected virtual async Task Connect()
-        {
-            if (connection != null)
-                return;
-
-            var builder = new HubConnectionBuilder()
-                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
-
-            if (RuntimeInfo.SupportsJIT)
-                builder.AddMessagePackProtocol();
-            else
-            {
-                // eventually we will precompile resolvers for messagepack, but this isn't working currently
-                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
-                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
-            }
-
-            connection = builder.Build();
-            // until strong typed client support is added, each method must be manually bound (see https://github.com/dotnet/aspnetcore/issues/15198)
-            connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
-            connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
-            connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
-
-            connection.Closed += async ex =>
-            {
-                isConnected = false;
-                playingUsers.Clear();
-
-                if (ex != null)
+                if (connected.NewValue)
                 {
-                    Logger.Log($"Spectator client lost connection: {ex}", LoggingTarget.Network);
-                    await tryUntilConnected();
+                    // get all the users that were previously being watched
+                    int[] users;
+
+                    lock (userLock)
+                    {
+                        users = watchingUsers.ToArray();
+                        watchingUsers.Clear();
+                    }
+
+                    // resubscribe to watched users.
+                    foreach (var userId in users)
+                        WatchUser(userId);
+
+                    // re-send state in case it wasn't received
+                    if (isPlaying)
+                        beginPlaying();
                 }
-            };
-
-            await tryUntilConnected();
-
-            async Task tryUntilConnected()
-            {
-                Logger.Log("Spectator client connecting...", LoggingTarget.Network);
-
-                while (api.State.Value == APIState.Online)
+                else
                 {
-                    try
-                    {
-                        // reconnect on any failure
-                        await connection.StartAsync();
-                        Logger.Log("Spectator client connected!", LoggingTarget.Network);
-
-                        // get all the users that were previously being watched
-                        int[] users;
-
-                        lock (userLock)
-                        {
-                            users = watchingUsers.ToArray();
-                            watchingUsers.Clear();
-                        }
-
-                        // success
-                        isConnected = true;
-
-                        // resubscribe to watched users
-                        foreach (var userId in users)
-                            WatchUser(userId);
-
-                        // re-send state in case it wasn't received
-                        if (isPlaying)
-                            beginPlaying();
-
-                        break;
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.Log($"Spectator client connection error: {e}", LoggingTarget.Network);
-                        await Task.Delay(5000);
-                    }
+                    playingUsers.Clear();
                 }
-            }
+            }, true);
         }
 
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
@@ -240,14 +169,14 @@ namespace osu.Game.Online.Spectator
         {
             Debug.Assert(isPlaying);
 
-            if (!isConnected) return;
+            if (!IsConnected.Value) return;
 
             connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), currentState);
         }
 
         public void SendFrames(FrameDataBundle data)
         {
-            if (!isConnected) return;
+            if (!IsConnected.Value) return;
 
             lastSend = connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
         }
@@ -257,7 +186,7 @@ namespace osu.Game.Online.Spectator
             isPlaying = false;
             currentBeatmap = null;
 
-            if (!isConnected) return;
+            if (!IsConnected.Value) return;
 
             connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), currentState);
         }
@@ -271,7 +200,7 @@ namespace osu.Game.Online.Spectator
 
                 watchingUsers.Add(userId);
 
-                if (!isConnected)
+                if (!IsConnected.Value)
                     return;
             }
 
@@ -284,7 +213,7 @@ namespace osu.Game.Online.Spectator
             {
                 watchingUsers.Remove(userId);
 
-                if (!isConnected)
+                if (!IsConnected.Value)
                     return;
             }
 

From 3ce605b5e5174632bc78ec5792c75ea0e92be009 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 9 Feb 2021 12:00:03 +0900
Subject: [PATCH 08028/10326] Small refactoring to use .Trim() instead

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index cae7d5a021..a17b431fcc 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -151,11 +151,10 @@ namespace osu.Game.Screens.Edit.Timing
                         return new RowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x", colour);
 
                     case EffectControlPoint effect:
-                        return new RowAttribute("effect", () => string.Join(" ", new[]
-                        {
+                        return new RowAttribute("effect", () => string.Join(" ",
                             effect.KiaiMode ? "Kiai" : string.Empty,
                             effect.OmitFirstBarLine ? "NoBarLine" : string.Empty
-                        }.Where(s => !string.IsNullOrEmpty(s))), colour);
+                        ).Trim(), colour);
 
                     case SampleControlPoint sample:
                         return new RowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);

From 3133ccacfa79704dbf89faad3cb7c82fb242de32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 13:09:38 +0900
Subject: [PATCH 08029/10326] Reset selected mods between each test method

This doesn't actually fix or change behaviour, but does seem like
something we probably want to do here.
---
 .../Visual/Multiplayer/TestScenePlaylistsSongSelect.cs           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
index 2f7e59f800..7d83ba569d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
@@ -87,6 +87,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 Ruleset.Value = new OsuRuleset().RulesetInfo;
                 Beatmap.SetDefault();
+                SelectedMods.Value = Array.Empty<Mod>();
             });
 
             AddStep("create song select", () => LoadScreen(songSelect = new TestPlaylistsSongSelect()));

From be379e0e3cc910b7b3cf1fb6b48460aeaa2673d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 13:44:11 +0900
Subject: [PATCH 08030/10326] Change CopyFrom to always overwrite all settings
 with incoming values

---
 osu.Game/Rulesets/Mods/Mod.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 3a8717e678..dec72d94e5 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Mods
         }
 
         /// <summary>
-        /// Copies mod setting values from <paramref name="source"/> into this instance.
+        /// Copies mod setting values from <paramref name="source"/> into this instance, overwriting all existing settings.
         /// </summary>
         /// <param name="source">The mod to copy properties from.</param>
         public void CopyFrom(Mod source)
@@ -147,9 +147,7 @@ namespace osu.Game.Rulesets.Mods
                 var targetBindable = (IBindable)prop.GetValue(this);
                 var sourceBindable = (IBindable)prop.GetValue(source);
 
-                // we only care about changes that have been made away from defaults.
-                if (!sourceBindable.IsDefault)
-                    CopyAdjustedSetting(targetBindable, sourceBindable);
+                CopyAdjustedSetting(targetBindable, sourceBindable);
             }
         }
 

From 8204d360a8d84f5ac3fe2eec40155999c23a5ba2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 13:44:42 +0900
Subject: [PATCH 08031/10326] Always reset local user settings when a mod is
 deselected in ModSelectOverlay

---
 osu.Game/Overlays/Mods/ModButton.cs           |  2 ++
 osu.Game/Overlays/Mods/ModSection.cs          |  4 +++-
 osu.Game/Rulesets/Mods/Mod.cs                 |  5 +++++
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs | 11 +++++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 8e0d1f5bbd..06f2fea43f 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -69,6 +69,8 @@ namespace osu.Game.Overlays.Mods
 
             Mod newSelection = SelectedMod ?? Mods[0];
 
+            newSelection.ResetSettingsToDefaults();
+
             Schedule(() =>
             {
                 if (beforeSelected != Selected)
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index ecbcba7ad3..08bd3f8622 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -197,8 +197,10 @@ namespace osu.Game.Overlays.Mods
                     continue;
 
                 var buttonMod = button.Mods[index];
-                buttonMod.CopyFrom(mod);
                 button.SelectAt(index);
+
+                // the selection above will reset settings to defaults, but as this is an external change we want to copy the new settings across.
+                buttonMod.CopyFrom(mod);
                 return;
             }
 
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index dec72d94e5..2a11c92223 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -173,5 +173,10 @@ namespace osu.Game.Rulesets.Mods
         }
 
         public bool Equals(IMod other) => GetType() == other?.GetType();
+
+        /// <summary>
+        /// Reset all custom settings for this mod back to their defaults.
+        /// </summary>
+        public virtual void ResetSettingsToDefaults() => CopyFrom((Mod)Activator.CreateInstance(GetType()));
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index a531e885db..dbc35569e7 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -141,5 +141,16 @@ namespace osu.Game.Rulesets.Mods
             ApplySetting(DrainRate, dr => difficulty.DrainRate = dr);
             ApplySetting(OverallDifficulty, od => difficulty.OverallDifficulty = od);
         }
+
+        public override void ResetSettingsToDefaults()
+        {
+            base.ResetSettingsToDefaults();
+
+            if (difficulty != null)
+            {
+                // base implementation potentially overwrite modified defaults that came from a beatmap selection.
+                TransferSettings(difficulty);
+            }
+        }
     }
 }

From 71e564d399e617d6083d8540bdcdc2d89a18d2e3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 07:46:00 +0300
Subject: [PATCH 08032/10326] Revert clients to be `Component`s

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 4 ++--
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 06f6754258..18464a5f61 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
@@ -28,7 +28,7 @@ using osu.Game.Utils;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public abstract class StatefulMultiplayerClient : CompositeDrawable, IMultiplayerClient, IMultiplayerRoomServer
+    public abstract class StatefulMultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
     {
         /// <summary>
         /// Invoked when any change occurs to the multiplayer room.
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 7cea76c969..33ebe27937 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -10,7 +10,7 @@ using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Replays.Legacy;
@@ -23,7 +23,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Online.Spectator
 {
-    public class SpectatorStreamingClient : CompositeDrawable, ISpectatorClient
+    public class SpectatorStreamingClient : Component, ISpectatorClient
     {
         /// <summary>
         /// The maximum milliseconds between frame bundle sends.

From 848b81e952934ee90f3cc4e86428bb385c0fdde6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 07:53:22 +0300
Subject: [PATCH 08033/10326] Remove necessity of making hub client connector a
 component

---
 osu.Game/Online/HubClientConnector.cs | 51 ++++++++++++++-------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 49b1ab639a..b740aabb92 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -4,15 +4,14 @@
 #nullable enable
 
 using System;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using osu.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Online.API;
 
@@ -21,7 +20,7 @@ namespace osu.Game.Online
     /// <summary>
     /// A component that maintains over a hub connection between client and server.
     /// </summary>
-    public class HubClientConnector : Component
+    public class HubClientConnector : IDisposable
     {
         /// <summary>
         /// Invoked whenever a new hub connection is built.
@@ -30,6 +29,7 @@ namespace osu.Game.Online
 
         private readonly string clientName;
         private readonly string endpoint;
+        private readonly IAPIProvider? api;
 
         /// <summary>
         /// The current connection opened by this connector.
@@ -45,9 +45,6 @@ namespace osu.Game.Online
         private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
         private CancellationTokenSource connectCancelSource = new CancellationTokenSource();
 
-        [Resolved]
-        private IAPIProvider api { get; set; } = null!;
-
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
         /// <summary>
@@ -55,30 +52,32 @@ namespace osu.Game.Online
         /// </summary>
         /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
         /// <param name="endpoint">The endpoint to the hub.</param>
-        public HubClientConnector(string clientName, string endpoint)
+        /// <param name="api">The API provider for listening to state changes, or null to not listen.</param>
+        public HubClientConnector(string clientName, string endpoint, IAPIProvider? api)
         {
             this.clientName = clientName;
             this.endpoint = endpoint;
-        }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            apiState.BindTo(api.State);
-            apiState.BindValueChanged(state =>
+            this.api = api;
+
+            if (api != null)
             {
-                switch (state.NewValue)
+                apiState.BindTo(api.State);
+                apiState.BindValueChanged(state =>
                 {
-                    case APIState.Failing:
-                    case APIState.Offline:
-                        Task.Run(() => disconnect(true));
-                        break;
+                    switch (state.NewValue)
+                    {
+                        case APIState.Failing:
+                        case APIState.Offline:
+                            Task.Run(() => disconnect(true));
+                            break;
 
-                    case APIState.Online:
-                        Task.Run(connect);
-                        break;
-                }
-            });
+                        case APIState.Online:
+                            Task.Run(connect);
+                            break;
+                    }
+                }, true);
+            }
         }
 
         private async Task connect()
@@ -137,6 +136,8 @@ namespace osu.Game.Online
 
         private HubConnection createConnection(CancellationToken cancellationToken)
         {
+            Debug.Assert(api != null);
+
             var builder = new HubConnectionBuilder()
                 .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
 
@@ -200,9 +201,9 @@ namespace osu.Game.Online
 
         public override string ToString() => $"Connector for {clientName} ({(IsConnected.Value ? "connected" : "not connected")}";
 
-        protected override void Dispose(bool isDisposing)
+        public void Dispose()
         {
-            base.Dispose(isDisposing);
+            apiState.UnbindAll();
             cancelExistingConnect();
         }
     }

From 0efad9ded10e03233ef2f14d644260178d9c746d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 13:54:13 +0900
Subject: [PATCH 08034/10326] Add test coverage of setting reset on deselection

---
 .../UserInterface/TestSceneModSelectOverlay.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 37ebc72984..85350c028c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -47,6 +47,24 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("show", () => modSelect.Show());
         }
 
+        [Test]
+        public void TestSettingsResetOnDeselection()
+        {
+            var osuModDoubleTime = new OsuModDoubleTime { SpeedChange = { Value = 1.2 } };
+
+            changeRuleset(0);
+
+            AddStep("set dt mod with custom rate", () => { SelectedMods.Value = new[] { osuModDoubleTime }; });
+
+            AddAssert("selected mod matches", () => (SelectedMods.Value.Single() as OsuModDoubleTime)?.SpeedChange.Value == 1.2);
+
+            AddStep("deselect", () => modSelect.DeselectAllButton.Click());
+            AddAssert("selected mods empty", () => SelectedMods.Value.Count == 0);
+
+            AddStep("reselect", () => modSelect.GetModButton(osuModDoubleTime).Click());
+            AddAssert("selected mod has default value", () => (SelectedMods.Value.Single() as OsuModDoubleTime)?.SpeedChange.IsDefault == true);
+        }
+
         [Test]
         public void TestAnimationFlushOnClose()
         {

From f04d6d5e5e98ddbdc0d94e4825d4d31392024be7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 08:02:32 +0300
Subject: [PATCH 08035/10326] Update hub clients with changes to connecotr

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  2 -
 ...TestSceneMultiplayerGameplayLeaderboard.cs |  2 -
 .../Online/Multiplayer/MultiplayerClient.cs   | 46 +++++++++++++------
 .../Spectator/SpectatorStreamingClient.cs     | 45 ++++++++++--------
 4 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 61b0961638..4a0e1282c4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -232,8 +232,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
-            protected override IBindable<bool> IsConnected { get; } = new BindableBool(false);
-
             public readonly User StreamingUser = new User { Id = 55, Username = "Test user" };
 
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 6a777e2a78..aab69d687a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -95,8 +95,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public class TestMultiplayerStreaming : SpectatorStreamingClient
         {
-            protected override IBindable<bool> IsConnected { get; } = new BindableBool(false);
-
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
 
             private readonly int totalUsers;
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 07036e7ffc..6b67954351 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
@@ -15,32 +16,41 @@ namespace osu.Game.Online.Multiplayer
 {
     public class MultiplayerClient : StatefulMultiplayerClient
     {
-        private readonly HubClientConnector connector;
+        private readonly string endpoint;
+        private HubClientConnector? connector;
 
-        public override IBindable<bool> IsConnected => connector.IsConnected;
+        public override IBindable<bool> IsConnected { get; } = new BindableBool();
 
-        private HubConnection? connection => connector.CurrentConnection;
+        private HubConnection? connection => connector?.CurrentConnection;
 
         public MultiplayerClient(EndpointConfiguration endpoints)
         {
-            InternalChild = connector = new HubClientConnector("Multiplayer client", endpoints.MultiplayerEndpointUrl)
+            endpoint = endpoints.MultiplayerEndpointUrl;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            connector = new HubClientConnector(nameof(MultiplayerClient), endpoint, api)
             {
-                OnNewConnection = newConnection =>
+                OnNewConnection = connection =>
                 {
                     // this is kind of SILLY
                     // https://github.com/dotnet/aspnetcore/issues/15198
-                    newConnection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
-                    newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
-                    newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
-                    newConnection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
-                    newConnection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
-                    newConnection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
-                    newConnection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
-                    newConnection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
-                    newConnection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
-                    newConnection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
+                    connection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
+                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
+                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
+                    connection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
+                    connection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
+                    connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
+                    connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
+                    connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
+                    connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+                    connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
                 },
             };
+
+            IsConnected.BindTo(connector.IsConnected);
         }
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
@@ -106,5 +116,11 @@ namespace osu.Game.Online.Multiplayer
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            connector?.Dispose();
+        }
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 33ebe27937..4ef59b5e47 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -30,9 +30,11 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public const double TIME_BETWEEN_SENDS = 200;
 
-        private readonly HubClientConnector connector;
+        private readonly string endpoint;
 
-        protected virtual IBindable<bool> IsConnected => connector.IsConnected;
+        private HubClientConnector connector;
+
+        private readonly IBindable<bool> isConnected = new BindableBool();
 
         private HubConnection connection => connector.CurrentConnection;
 
@@ -77,23 +79,24 @@ namespace osu.Game.Online.Spectator
 
         public SpectatorStreamingClient(EndpointConfiguration endpoints)
         {
-            InternalChild = connector = new HubClientConnector("Spectator client", endpoints.SpectatorEndpointUrl)
-            {
-                OnNewConnection = newConnection =>
-                {
-                    // until strong typed client support is added, each method must be manually bound
-                    // (see https://github.com/dotnet/aspnetcore/issues/15198)
-                    newConnection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
-                    newConnection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
-                    newConnection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
-                }
-            };
+            endpoint = endpoints.SpectatorEndpointUrl;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(IAPIProvider api)
         {
-            IsConnected.BindValueChanged(connected =>
+            connector = CreateConnector(nameof(SpectatorStreamingClient), endpoint, api);
+            connector.OnNewConnection = connection =>
+            {
+                // until strong typed client support is added, each method must be manually bound
+                // (see https://github.com/dotnet/aspnetcore/issues/15198)
+                connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
+                connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
+                connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+            };
+
+            isConnected.BindTo(connector.IsConnected);
+            isConnected.BindValueChanged(connected =>
             {
                 if (connected.NewValue)
                 {
@@ -121,6 +124,8 @@ namespace osu.Game.Online.Spectator
             }, true);
         }
 
+        protected virtual HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => new HubClientConnector(name, endpoint, api);
+
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
         {
             if (!playingUsers.Contains(userId))
@@ -169,14 +174,14 @@ namespace osu.Game.Online.Spectator
         {
             Debug.Assert(isPlaying);
 
-            if (!IsConnected.Value) return;
+            if (!isConnected.Value) return;
 
             connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), currentState);
         }
 
         public void SendFrames(FrameDataBundle data)
         {
-            if (!IsConnected.Value) return;
+            if (!isConnected.Value) return;
 
             lastSend = connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
         }
@@ -186,7 +191,7 @@ namespace osu.Game.Online.Spectator
             isPlaying = false;
             currentBeatmap = null;
 
-            if (!IsConnected.Value) return;
+            if (!isConnected.Value) return;
 
             connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), currentState);
         }
@@ -200,7 +205,7 @@ namespace osu.Game.Online.Spectator
 
                 watchingUsers.Add(userId);
 
-                if (!IsConnected.Value)
+                if (!isConnected.Value)
                     return;
             }
 
@@ -213,7 +218,7 @@ namespace osu.Game.Online.Spectator
             {
                 watchingUsers.Remove(userId);
 
-                if (!IsConnected.Value)
+                if (!isConnected.Value)
                     return;
             }
 

From a0ead38496b9dcb9ead023729765c437e7902f95 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 08:02:51 +0300
Subject: [PATCH 08036/10326] Prevent test spectator clients from attempting
 hub connections

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs       | 7 +++++++
 .../Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 4a0e1282c4..1e499f20cb 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -12,6 +12,7 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu;
@@ -243,6 +244,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
+            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api)
+            {
+                // do not pass API to prevent attempting failing connections on an actual hub.
+                return base.CreateConnector(name, endpoint, null);
+            }
+
             public void StartPlay(int beatmapId)
             {
                 this.beatmapId = beatmapId;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index aab69d687a..b459cebdd7 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -13,6 +13,7 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -105,6 +106,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 this.totalUsers = totalUsers;
             }
 
+            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api)
+            {
+                // do not pass API to prevent attempting failing connections on an actual hub.
+                return base.CreateConnector(name, endpoint, null);
+            }
+
             public void Start(int beatmapId)
             {
                 for (int i = 0; i < totalUsers; i++)

From b96a594546b38a866c7e661b707de04518407baf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 15:11:58 +0900
Subject: [PATCH 08037/10326] Remove unnecessary initial call to
 HitObjectApplied bound method

Was causing test failures. Looks to be unnecessary on a check of when
HitObjectApplied is invoked.
---
 osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index 8eb2714c04..f9b8ffca7b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -45,7 +45,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             BorderColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBorder)?.Value ?? Color4.White;
 
             drawableObject.HitObjectApplied += onHitObjectApplied;
-            onHitObjectApplied(drawableObject);
         }
 
         private void onHitObjectApplied(DrawableHitObject obj)

From 695e46a358ba1dd75da161ee70e09bd19d462334 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 15:31:55 +0900
Subject: [PATCH 08038/10326] Fix AutoPilot mod failing to block touch input

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

diff --git a/osu.Game.Rulesets.Osu/OsuInputManager.cs b/osu.Game.Rulesets.Osu/OsuInputManager.cs
index c8fe4f41ca..7314021a14 100644
--- a/osu.Game.Rulesets.Osu/OsuInputManager.cs
+++ b/osu.Game.Rulesets.Osu/OsuInputManager.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu
 
         protected override bool Handle(UIEvent e)
         {
-            if (e is MouseMoveEvent && !AllowUserCursorMovement) return false;
+            if ((e is MouseMoveEvent || e is TouchMoveEvent) && !AllowUserCursorMovement) return false;
 
             return base.Handle(e);
         }

From b87327841dec18cda4edcc9c6ee4a52d4b8ebf29 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 15:46:23 +0900
Subject: [PATCH 08039/10326] Add test covering initial state propagation

---
 .../TestSceneMultiplayerParticipantsList.cs   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index c3852fafd4..0f7a9b442d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -22,16 +22,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerParticipantsList : MultiplayerTestScene
     {
         [SetUp]
-        public new void Setup() => Schedule(() =>
-        {
-            Child = new ParticipantsList
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Y,
-                Size = new Vector2(380, 0.7f)
-            };
-        });
+        public new void Setup() => Schedule(createNewParticipantsList);
 
         [Test]
         public void TestAddUser()
@@ -92,6 +83,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkProgressBarVisibility(true);
         }
 
+        [Test]
+        public void TestCorrectInitialState()
+        {
+            AddStep("set to downloading map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(0)));
+            AddStep("recreate list", createNewParticipantsList);
+            checkProgressBarVisibility(true);
+        }
+
         [Test]
         public void TestBeatmapDownloadingStates()
         {
@@ -212,6 +211,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             }
         }
 
+        private void createNewParticipantsList()
+        {
+            Child = new ParticipantsList { Anchor = Anchor.Centre, Origin = Anchor.Centre, RelativeSizeAxes = Axes.Y, Size = new Vector2(380, 0.7f) };
+        }
+
         private void checkProgressBarVisibility(bool visible) =>
             AddUntilStep($"progress bar {(visible ? "is" : "is not")}visible", () =>
                 this.ChildrenOfType<ProgressBar>().Single().IsPresent == visible);

From 04c243386b136359a81606c612686fe1a8754527 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 16:02:56 +0900
Subject: [PATCH 08040/10326] Fix initial state transfer regressing

---
 .../OnlinePlayBeatmapAvailablilityTracker.cs  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
index cfaf43451f..d6f4c45a75 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
@@ -29,18 +29,6 @@ namespace osu.Game.Online.Rooms
 
         private ScheduledDelegate progressUpdate;
 
-        public OnlinePlayBeatmapAvailablilityTracker()
-        {
-            State.BindValueChanged(_ => updateAvailability());
-            Progress.BindValueChanged(_ =>
-            {
-                // incoming progress changes are going to be at a very high rate.
-                // we don't want to flood the network with this, so rate limit how often we send progress updates.
-                if (progressUpdate?.Completed != false)
-                    progressUpdate = Scheduler.AddDelayed(updateAvailability, progressUpdate == null ? 0 : 500);
-            });
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -54,6 +42,16 @@ namespace osu.Game.Online.Rooms
 
                 Model.Value = item.NewValue.Beatmap.Value.BeatmapSet;
             }, true);
+
+            Progress.BindValueChanged(_ =>
+            {
+                // incoming progress changes are going to be at a very high rate.
+                // we don't want to flood the network with this, so rate limit how often we send progress updates.
+                if (progressUpdate?.Completed != false)
+                    progressUpdate = Scheduler.AddDelayed(updateAvailability, progressUpdate == null ? 0 : 500);
+            });
+
+            State.BindValueChanged(_ => updateAvailability(), true);
         }
 
         protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)

From 5bd4f74ddf752f3ddc83d67d8ea48708a0248b13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 16:24:29 +0900
Subject: [PATCH 08041/10326] Fix a potential crash when exiting play during
 the results screen transition

---
 osu.Game/Screens/Play/Player.cs | 48 +++++++++++++++++----------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 5d06ac5b3a..dbee49b5dd 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -339,7 +339,7 @@ namespace osu.Game.Screens.Play
                     {
                         HoldToQuit =
                         {
-                            Action = performUserRequestedExit,
+                            Action = () => PerformExit(true),
                             IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
                         },
                         PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
@@ -363,14 +363,14 @@ namespace osu.Game.Screens.Play
                     FailOverlay = new FailOverlay
                     {
                         OnRetry = Restart,
-                        OnQuit = performUserRequestedExit,
+                        OnQuit = () => PerformExit(true),
                     },
                     PauseOverlay = new PauseOverlay
                     {
                         OnResume = Resume,
                         Retries = RestartCount,
                         OnRetry = Restart,
-                        OnQuit = performUserRequestedExit,
+                        OnQuit = () => PerformExit(true),
                     },
                     new HotkeyExitOverlay
                     {
@@ -487,14 +487,30 @@ namespace osu.Game.Screens.Play
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
 
-            ValidForResume = false;
-
-            if (!this.IsCurrentScreen()) return;
+            if (!this.IsCurrentScreen())
+            {
+                // there is a chance that the exit was performed after the transition to results has started.
+                // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
+                ValidForResume = false;
+                this.MakeCurrent();
+            }
 
             if (userRequested)
-                performUserRequestedExit();
-            else
-                this.Exit();
+            {
+                if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
+                {
+                    failAnimation.FinishTransforms(true);
+                    return;
+                }
+
+                if (canPause)
+                {
+                    Pause();
+                    return;
+                }
+            }
+
+            this.Exit();
         }
 
         private void performUserRequestedSkip()
@@ -508,20 +524,6 @@ namespace osu.Game.Screens.Play
             updateSampleDisabledState();
         }
 
-        private void performUserRequestedExit()
-        {
-            if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
-            {
-                failAnimation.FinishTransforms(true);
-                return;
-            }
-
-            if (canPause)
-                Pause();
-            else
-                this.Exit();
-        }
-
         /// <summary>
         /// Restart gameplay via a parent <see cref="PlayerLoader"/>.
         /// <remarks>This can be called from a child screen in order to trigger the restart process.</remarks>

From 61b9539864289b9ded799cac93187fc641c3db35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:14:16 +0900
Subject: [PATCH 08042/10326] Fix regression in quick exit logic

---
 osu.Game/Screens/Play/Player.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dbee49b5dd..3f8651761e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -478,11 +478,11 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Exits the <see cref="Player"/>.
         /// </summary>
-        /// <param name="userRequested">
-        /// Whether the exit is requested by the user, or a higher-level game component.
-        /// Pausing is allowed only in the former case.
+        /// <param name="showDialogFirst">
+        /// Whether the pause or fail dialog should be shown before performing an exit.
+        /// If true and a dialog is not yet displayed, the exit will be blocked the the relevant dialog will display instead.
         /// </param>
-        protected void PerformExit(bool userRequested)
+        protected void PerformExit(bool showDialogFirst)
         {
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
@@ -495,7 +495,7 @@ namespace osu.Game.Screens.Play
                 this.MakeCurrent();
             }
 
-            if (userRequested)
+            if (showDialogFirst)
             {
                 if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
                 {
@@ -503,7 +503,7 @@ namespace osu.Game.Screens.Play
                     return;
                 }
 
-                if (canPause)
+                if (canPause && !GameplayClockContainer.IsPaused.Value)
                 {
                     Pause();
                     return;
@@ -540,10 +540,7 @@ namespace osu.Game.Screens.Play
             sampleRestart?.Play();
             RestartRequested?.Invoke();
 
-            if (this.IsCurrentScreen())
-                PerformExit(true);
-            else
-                this.MakeCurrent();
+            PerformExit(false);
         }
 
         private ScheduledDelegate completionProgressDelegate;

From cba116ff090c650cbc4812f16e15ddfd13747e3f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:28:57 +0900
Subject: [PATCH 08043/10326] Fix incorrect call parameter for quick exit

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 3f8651761e..8a977b0498 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -379,7 +379,7 @@ namespace osu.Game.Screens.Play
                             if (!this.IsCurrentScreen()) return;
 
                             fadeOut(true);
-                            PerformExit(true);
+                            PerformExit(false);
                         },
                     },
                     failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },

From 2c052d70e8668bc9f64354fc14d3425b5f0e6552 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:29:18 +0900
Subject: [PATCH 08044/10326] Only trigger pause cooldown on pause (not exit)

---
 osu.Game/Screens/Play/Player.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8a977b0498..dda52f4dae 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -505,6 +505,10 @@ namespace osu.Game.Screens.Play
 
                 if (canPause && !GameplayClockContainer.IsPaused.Value)
                 {
+                    if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
+                        // still want to block if we are within the cooldown period and not already paused.
+                        return;
+
                     Pause();
                     return;
                 }
@@ -808,14 +812,6 @@ namespace osu.Game.Screens.Play
                 return true;
             }
 
-            // ValidForResume is false when restarting
-            if (ValidForResume)
-            {
-                if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
-                    // still want to block if we are within the cooldown period and not already paused.
-                    return true;
-            }
-
             // GameplayClockContainer performs seeks / start / stop operations on the beatmap's track.
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             GameplayClockContainer?.StopUsingBeatmapClock();

From 94f35825ddb28b8bf2d3e86562afc47dbd30e4a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:29:27 +0900
Subject: [PATCH 08045/10326] Update test to cover changed exit/pause logic

I think this makes more sense?
---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 46dd91710a..ae806883b0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -108,19 +108,19 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestExitTooSoon()
+        public void TestExitSoonAfterResumeSucceeds()
         {
             AddStep("seek before gameplay", () => Player.GameplayClockContainer.Seek(-5000));
 
             pauseAndConfirm();
             resume();
 
-            AddStep("exit too soon", () => Player.Exit());
+            AddStep("exit quick", () => Player.Exit());
 
             confirmClockRunning(true);
             confirmPauseOverlayShown(false);
 
-            AddAssert("not exited", () => Player.IsCurrentScreen());
+            AddAssert("exited", () => !Player.IsCurrentScreen());
         }
 
         [Test]

From b5fa9508006c76decac0752a6bdaf47598196d4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 18:30:05 +0900
Subject: [PATCH 08046/10326] Remove unnecessary depth specification

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

diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 4a7318d065..b07f91b9ed 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header.With(h => h.Depth = -float.MaxValue),
+                            Header,
                             content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,

From 178d88bcf197393fab133d3bd760d33c35b8e3c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 18:32:44 +0900
Subject: [PATCH 08047/10326] Change BackgroundColour into a property

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 2 +-
 osu.Game/Overlays/BeatmapSetOverlay.cs     | 2 +-
 osu.Game/Overlays/ChangelogOverlay.cs      | 2 +-
 osu.Game/Overlays/FullscreenOverlay.cs     | 6 +++---
 osu.Game/Overlays/UserProfileOverlay.cs    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index cfa0ff00bc..5df7a4650e 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Overlays
 
         protected override BeatmapListingHeader CreateHeader() => new BeatmapListingHeader();
 
-        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
+        protected override Color4 BackgroundColour => ColourProvider.Background6;
 
         private void onTypingStarted()
         {
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 723b61bbc5..bdb3715e73 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays
 
         protected override BeatmapSetHeader CreateHeader() => new BeatmapSetHeader();
 
-        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
+        protected override Color4 BackgroundColour => ColourProvider.Background6;
 
         protected override void PopOutComplete()
         {
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 5200b567ff..05bad30107 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Overlays
             ListingSelected = ShowListing,
         };
 
-        protected override Color4 GetBackgroundColour() => ColourProvider.Background4;
+        protected override Color4 BackgroundColour => ColourProvider.Background4;
 
         public void ShowListing()
         {
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index d0a0c994aa..735f0bcbd4 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Overlays
 
         public T Header { get; }
 
+        protected virtual Color4 BackgroundColour => ColourProvider.Background5;
+
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
@@ -59,7 +61,7 @@ namespace osu.Game.Overlays
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = GetBackgroundColour()
+                    Colour = BackgroundColour
                 },
                 content = new Container
                 {
@@ -80,8 +82,6 @@ namespace osu.Game.Overlays
         [NotNull]
         protected abstract T CreateHeader();
 
-        protected virtual Color4 GetBackgroundColour() => ColourProvider.Background5;
-
         public override void Show()
         {
             if (State.Value == Visibility.Visible)
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index ccd9c291c4..299a14b250 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays
 
         protected override ProfileHeader CreateHeader() => new ProfileHeader();
 
-        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
+        protected override Color4 BackgroundColour => ColourProvider.Background6;
 
         public void ShowUser(int userId) => ShowUser(new User { Id = userId });
 

From 167076663304d009769df70fae7feccdf4128f0b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 18:42:15 +0900
Subject: [PATCH 08048/10326] Avoid unbinding external events

---
 osu.Game/Overlays/RankingsOverlay.cs       | 44 +++++++++-------------
 osu.Game/Overlays/TabbableOnlineOverlay.cs |  2 +-
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 6cd72d6e2c..a093969115 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Overlays
     {
         protected Bindable<Country> Country => Header.Country;
 
-        protected Bindable<RankingsScope> Scope => Header.Current;
-
         private APIRequest lastRequest;
 
         [Resolved]
@@ -42,31 +40,31 @@ namespace osu.Game.Overlays
             {
                 // if a country is requested, force performance scope.
                 if (Country.Value != null)
-                    Scope.Value = RankingsScope.Performance;
+                    Header.Current.Value = RankingsScope.Performance;
 
-                Scheduler.AddOnce(loadNewContent);
-            });
-
-            // Unbind events from scope so base class event will not be called
-            Scope.UnbindEvents();
-            Scope.BindValueChanged(_ =>
-            {
-                // country filtering is only valid for performance scope.
-                if (Scope.Value != RankingsScope.Performance)
-                    Country.Value = null;
-
-                Scheduler.AddOnce(loadNewContent);
+                Scheduler.AddOnce(triggerTabChanged);
             });
 
             ruleset.BindValueChanged(_ =>
             {
-                if (Scope.Value == RankingsScope.Spotlights)
+                if (Header.Current.Value == RankingsScope.Spotlights)
                     return;
 
-                Scheduler.AddOnce(loadNewContent);
+                Scheduler.AddOnce(triggerTabChanged);
             });
         }
 
+        protected override void OnTabChanged(RankingsScope tab)
+        {
+            // country filtering is only valid for performance scope.
+            if (Header.Current.Value != RankingsScope.Performance)
+                Country.Value = null;
+
+            Scheduler.AddOnce(triggerTabChanged);
+        }
+
+        private void triggerTabChanged() => base.OnTabChanged(Header.Current.Value);
+
         protected override RankingsOverlayHeader CreateHeader() => new RankingsOverlayHeader();
 
         public void ShowCountry(Country requested)
@@ -79,17 +77,11 @@ namespace osu.Game.Overlays
             Country.Value = requested;
         }
 
-        public void ShowSpotlights()
-        {
-            Scope.Value = RankingsScope.Spotlights;
-            Show();
-        }
-
         protected override void CreateDisplayToLoad(RankingsScope tab)
         {
             lastRequest?.Cancel();
 
-            if (Scope.Value == RankingsScope.Spotlights)
+            if (Header.Current.Value == RankingsScope.Spotlights)
             {
                 LoadDisplay(new SpotlightsLayout
                 {
@@ -115,7 +107,7 @@ namespace osu.Game.Overlays
 
         private APIRequest createScopedRequest()
         {
-            switch (Scope.Value)
+            switch (Header.Current.Value)
             {
                 case RankingsScope.Performance:
                     return new GetUserRankingsRequest(ruleset.Value, country: Country.Value?.FlagName);
@@ -153,8 +145,6 @@ namespace osu.Game.Overlays
             return null;
         }
 
-        private void loadNewContent() => OnTabChanged(Scope.Value);
-
         protected override void Dispose(bool isDisposing)
         {
             lastRequest?.Cancel();
diff --git a/osu.Game/Overlays/TabbableOnlineOverlay.cs b/osu.Game/Overlays/TabbableOnlineOverlay.cs
index cbcf3cd96e..8172e99c1b 100644
--- a/osu.Game/Overlays/TabbableOnlineOverlay.cs
+++ b/osu.Game/Overlays/TabbableOnlineOverlay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
-        protected void OnTabChanged(TEnum tab)
+        protected virtual void OnTabChanged(TEnum tab)
         {
             cancellationToken?.Cancel();
             Loading.Show();

From 17475e60b0a733344a60a619a3c4fc16f2d9b95d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 18:48:50 +0900
Subject: [PATCH 08049/10326] Fix missed test scene update

---
 osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
index 626f545b91..aff510dd95 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Online
             Add(rankingsOverlay = new TestRankingsOverlay
             {
                 Country = { BindTarget = countryBindable },
-                Scope = { BindTarget = scope },
+                Header = { Current = { BindTarget = scope } },
             });
         }
 
@@ -65,8 +65,6 @@ namespace osu.Game.Tests.Visual.Online
         private class TestRankingsOverlay : RankingsOverlay
         {
             public new Bindable<Country> Country => base.Country;
-
-            public new Bindable<RankingsScope> Scope => base.Scope;
         }
     }
 }

From 0a96f4d403cf3be814b10de8e2d7cc3e4e2c335e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 18:56:27 +0900
Subject: [PATCH 08050/10326] Avoid assigning null to a non-nullable property

---
 .../Visual/Online/TestSceneFullscreenOverlay.cs       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
index f8b059e471..dc468bb62d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
@@ -53,7 +53,16 @@ namespace osu.Game.Tests.Visual.Online
                 };
             }
 
-            protected override OverlayHeader CreateHeader() => null;
+            protected override OverlayHeader CreateHeader() => new TestHeader();
+
+            internal class TestHeader : OverlayHeader
+            {
+                protected override OverlayTitle CreateTitle() => new TestTitle();
+
+                internal class TestTitle : OverlayTitle
+                {
+                }
+            }
         }
     }
 }

From d8d830db6e39a3d590dc3963f10e60a5919727fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 19:46:57 +0900
Subject: [PATCH 08051/10326] Defer playlist load to improve load time of the
 now playing overlay

---
 osu.Game/Overlays/NowPlayingOverlay.cs | 37 +++++++++++++++++++-------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 9beb859f28..f94b41155a 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -84,11 +84,6 @@ namespace osu.Game.Overlays
                     AutoSizeAxes = Axes.Y,
                     Children = new Drawable[]
                     {
-                        playlist = new PlaylistOverlay
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Y = player_height + 10,
-                        },
                         playerContainer = new Container
                         {
                             RelativeSizeAxes = Axes.X,
@@ -171,7 +166,7 @@ namespace osu.Game.Overlays
                                             Anchor = Anchor.CentreRight,
                                             Position = new Vector2(-bottom_black_area_height / 2, 0),
                                             Icon = FontAwesome.Solid.Bars,
-                                            Action = () => playlist.ToggleVisibility(),
+                                            Action = togglePlaylist
                                         },
                                     }
                                 },
@@ -191,13 +186,35 @@ namespace osu.Game.Overlays
             };
         }
 
+        private void togglePlaylist()
+        {
+            if (playlist == null)
+            {
+                LoadComponentAsync(playlist = new PlaylistOverlay
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Y = player_height + 10,
+                }, _ =>
+                {
+                    dragContainer.Add(playlist);
+
+                    playlist.BeatmapSets.BindTo(musicController.BeatmapSets);
+                    playlist.State.BindValueChanged(s => playlistButton.FadeColour(s.NewValue == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint), true);
+
+                    togglePlaylist();
+                });
+
+                return;
+            }
+
+            if (!beatmap.Disabled)
+                playlist.ToggleVisibility();
+        }
+
         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;
@@ -306,7 +323,7 @@ namespace osu.Game.Overlays
         private void beatmapDisabledChanged(bool disabled)
         {
             if (disabled)
-                playlist.Hide();
+                playlist?.Hide();
 
             prevButton.Enabled.Value = !disabled;
             nextButton.Enabled.Value = !disabled;

From d9dcf8a042bc99e0161a49088784e06553c8b27e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 9 Feb 2021 20:30:31 +0300
Subject: [PATCH 08052/10326] Fix incorrect header depth in OnlineOverlay

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

diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index b07f91b9ed..4a7318d065 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header,
+                            Header.With(h => h.Depth = -float.MaxValue),
                             content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,

From e44667e5e073016b471c13d7cce1427d0db89be5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 11:31:34 +0900
Subject: [PATCH 08053/10326] Use MinValue instead

Co-authored-by: Salman Ahmed <slmanarendo1950@gmail.com>
---
 osu.Game/Overlays/OnlineOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 4a7318d065..7c9f751d3b 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header.With(h => h.Depth = -float.MaxValue),
+                            Header.With(h => h.Depth = float.MinValue),
                             content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,

From e9ef4aaf88a8908596231461420bc83d5ccc569f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 14:34:45 +0900
Subject: [PATCH 08054/10326] Add test covering expectations of external mod
 changes

---
 .../TestSceneModSelectOverlay.cs              | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 85350c028c..dec9e319ea 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -170,6 +170,31 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
+        [Test]
+        public void TestExternallySetModIsReplacedByOverlayInstance()
+        {
+            Mod external = new OsuModDoubleTime();
+            Mod overlayButtonMod = null;
+
+            changeRuleset(0);
+
+            AddStep("set mod externally", () => { SelectedMods.Value = new[] { external }; });
+
+            AddAssert("ensure button is selected", () =>
+            {
+                var button = modSelect.GetModButton(SelectedMods.Value.Single());
+                overlayButtonMod = button.SelectedMod;
+                return overlayButtonMod.GetType() == external.GetType();
+            });
+
+            // Right now, when an external change occurs, the ModSelectOverlay will replace the global instance with its own
+            AddAssert("mod instance doesn't match", () => external != overlayButtonMod);
+
+            AddAssert("one mod present in global selected", () => SelectedMods.Value.Count == 1);
+            AddAssert("globally selected matches button's mod instance", () => SelectedMods.Value.Contains(overlayButtonMod));
+            AddAssert("globally selected doesn't contain original external change", () => !SelectedMods.Value.Contains(external));
+        }
+
         [Test]
         public void TestNonStacked()
         {

From 52f0f3f3b212fb2d38057073138755b9e73c858b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 14:38:15 +0900
Subject: [PATCH 08055/10326] Add a note about SelectedMods behavioural quirks

---
 osu.Game/OsuGameBase.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 20d88d33f2..d3936ed27e 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -98,7 +98,14 @@ namespace osu.Game
         [Cached(typeof(IBindable<RulesetInfo>))]
         protected readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
 
-        // todo: move this to SongSelect once Screen has the ability to unsuspend.
+        /// <summary>
+        /// The current mod selection for the local user.
+        /// </summary>
+        /// <remarks>
+        /// If a mod select overlay is present, mod instances set to this value are not guaranteed to remain as the provided instance and will be overwritten by a copy.
+        /// In such a case, changes to settings of a mod will *not* propagate after a mod is added to this collection.
+        /// As such, all settings should be finalised before adding a mod to this collection.
+        /// </remarks>
         [Cached]
         [Cached(typeof(IBindable<IReadOnlyList<Mod>>))]
         protected readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());

From de8a60435fca3f4644efa5b268848829b3812ae8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 14:44:37 +0900
Subject: [PATCH 08056/10326] Add failing test covering reported breaking case

---
 .../UserInterface/TestSceneModSelectOverlay.cs     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index dec9e319ea..9ca1d4102a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -170,6 +170,20 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
+        [Test]
+        public void TestSettingsAreRetainedOnReload()
+        {
+            changeRuleset(0);
+
+            AddStep("set customized mod externally", () => SelectedMods.Value = new[] { new OsuModDoubleTime { SpeedChange = { Value = 1.01 } } });
+
+            AddAssert("setting remains", () => (SelectedMods.Value.SingleOrDefault() as OsuModDoubleTime)?.SpeedChange.Value == 1.01);
+
+            AddStep("create overlay", () => createDisplay(() => new TestNonStackedModSelectOverlay()));
+
+            AddAssert("setting remains", () => (SelectedMods.Value.SingleOrDefault() as OsuModDoubleTime)?.SpeedChange.Value == 1.01);
+        }
+
         [Test]
         public void TestExternallySetModIsReplacedByOverlayInstance()
         {

From 75bc9f607e30495763ec305fe7f6fae608931754 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 14:55:15 +0900
Subject: [PATCH 08057/10326] Rename wrongly named method

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 93fe693937..21ed9af421 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -479,10 +479,10 @@ namespace osu.Game.Overlays.Mods
             foreach (var section in ModSectionsContainer.Children)
                 section.UpdateSelectedButtons(selectedMods);
 
-            updateMods();
+            updateMultiplier();
         }
 
-        private void updateMods()
+        private void updateMultiplier()
         {
             var multiplier = 1.0;
 

From a39263423c95dd25344dff4e4a5e56afb0842d3a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 15:12:29 +0900
Subject: [PATCH 08058/10326] Fix externally changed settings from being reset
 when ModSelectOverlay is initialised

---
 osu.Game/Overlays/Mods/ModButton.cs  | 16 ++++++++++++----
 osu.Game/Overlays/Mods/ModSection.cs |  5 +++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 06f2fea43f..5e3733cd5e 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -46,8 +46,9 @@ namespace osu.Game.Overlays.Mods
         /// Change the selected mod index of this button.
         /// </summary>
         /// <param name="newIndex">The new index.</param>
+        /// <param name="resetSettings">Whether any settings applied to the mod should be reset on selection.</param>
         /// <returns>Whether the selection changed.</returns>
-        private bool changeSelectedIndex(int newIndex)
+        private bool changeSelectedIndex(int newIndex, bool resetSettings = true)
         {
             if (newIndex == selectedIndex) return false;
 
@@ -69,7 +70,8 @@ namespace osu.Game.Overlays.Mods
 
             Mod newSelection = SelectedMod ?? Mods[0];
 
-            newSelection.ResetSettingsToDefaults();
+            if (resetSettings)
+                newSelection.ResetSettingsToDefaults();
 
             Schedule(() =>
             {
@@ -211,11 +213,17 @@ namespace osu.Game.Overlays.Mods
             Deselect();
         }
 
-        public bool SelectAt(int index)
+        /// <summary>
+        /// Select the mod at the provided index.
+        /// </summary>
+        /// <param name="index">The index to select.</param>
+        /// <param name="resetSettings">Whether any settings applied to the mod should be reset on selection.</param>
+        /// <returns>Whether the selection changed.</returns>
+        public bool SelectAt(int index, bool resetSettings = true)
         {
             if (!Mods[index].HasImplementation) return false;
 
-            changeSelectedIndex(index);
+            changeSelectedIndex(index, resetSettings);
             return true;
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 08bd3f8622..71ecef2b82 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -197,9 +197,10 @@ namespace osu.Game.Overlays.Mods
                     continue;
 
                 var buttonMod = button.Mods[index];
-                button.SelectAt(index);
 
-                // the selection above will reset settings to defaults, but as this is an external change we want to copy the new settings across.
+                button.SelectAt(index, false);
+
+                // as this is likely coming from an external change, ensure the settings of the mod are in sync.
                 buttonMod.CopyFrom(mod);
                 return;
             }

From 435c85a2e79b8682d093c261054c8d4ad67215b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 15:13:09 +0900
Subject: [PATCH 08059/10326] Avoid executing selection twice on
 ModSelectOverlay load

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 21ed9af421..f1bfa26a98 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -371,8 +371,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
+            SelectedMods.BindValueChanged(_ => updateSelectedButtons());
             availableMods.BindValueChanged(_ => updateAvailableMods(), true);
-            SelectedMods.BindValueChanged(_ => updateSelectedButtons(), true);
         }
 
         protected override void PopOut()

From 98a83722ff0ad8fffdd426a55a32792d8ce8febd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 15:29:55 +0900
Subject: [PATCH 08060/10326] Move the point at which selected mods are reset
 in tests to allow mutliple creation test flow

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 9ca1d4102a..2885dbee00 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -39,7 +39,11 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [SetUp]
-        public void SetUp() => Schedule(() => createDisplay(() => new TestModSelectOverlay()));
+        public void SetUp() => Schedule(() =>
+        {
+            SelectedMods.Value = Array.Empty<Mod>();
+            createDisplay(() => new TestModSelectOverlay());
+        });
 
         [SetUpSteps]
         public void SetUpSteps()
@@ -370,7 +374,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void createDisplay(Func<TestModSelectOverlay> createOverlayFunc)
         {
-            SelectedMods.Value = Array.Empty<Mod>();
             Children = new Drawable[]
             {
                 modSelect = createOverlayFunc().With(d =>

From 67c1c4c1ebdd89e8c63c76e071f9598c1db32250 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 15:30:17 +0900
Subject: [PATCH 08061/10326] Copy settings before applying selection

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

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 71ecef2b82..c3e56abd05 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -198,10 +198,10 @@ namespace osu.Game.Overlays.Mods
 
                 var buttonMod = button.Mods[index];
 
-                button.SelectAt(index, false);
-
                 // as this is likely coming from an external change, ensure the settings of the mod are in sync.
                 buttonMod.CopyFrom(mod);
+
+                button.SelectAt(index, false);
                 return;
             }
 

From b3b0d97354d7c57e554a69ea78f516e0e64833c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 15:32:57 +0900
Subject: [PATCH 08062/10326] Avoid potential feedback from bindable event
 binds

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index f1bfa26a98..a6de0ad6b1 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -371,8 +371,11 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            SelectedMods.BindValueChanged(_ => updateSelectedButtons());
             availableMods.BindValueChanged(_ => updateAvailableMods(), true);
+
+            // intentionally bound after the above line to avoid a potential update feedback cycle.
+            // i haven't actually observed this happening but as updateAvailableMods() changes the selection it is plausible.
+            SelectedMods.BindValueChanged(_ => updateSelectedButtons());
         }
 
         protected override void PopOut()

From 806324b196607d6d918f792289d4043100944904 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 14:53:29 +0900
Subject: [PATCH 08063/10326] Allow overriding of Overlay pop-in and pop-out
 samples

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

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 41fd37a0d7..ee99a39523 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Graphics.Containers
     {
         private SampleChannel samplePopIn;
         private SampleChannel samplePopOut;
+        protected virtual string PopInSampleName => "UI/overlay-pop-in";
+        protected virtual string PopOutSampleName => "UI/overlay-pop-out";
 
         protected override bool BlockNonPositionalInput => true;
 
@@ -40,8 +42,8 @@ namespace osu.Game.Graphics.Containers
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio)
         {
-            samplePopIn = audio.Samples.Get(@"UI/overlay-pop-in");
-            samplePopOut = audio.Samples.Get(@"UI/overlay-pop-out");
+            samplePopIn = audio.Samples.Get(PopInSampleName);
+            samplePopOut = audio.Samples.Get(PopOutSampleName);
         }
 
         protected override void LoadComplete()

From 3eda78c363def6589adc0a84aee6c7795cd72d76 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 14:57:46 +0900
Subject: [PATCH 08064/10326] Use unique samples for Dialog, NowPlaying,
 SettingsPanel and WaveOverlay pop-in/pop-out

---
 osu.Game/Overlays/DialogOverlay.cs        | 3 +++
 osu.Game/Overlays/NowPlayingOverlay.cs    | 3 +++
 osu.Game/Overlays/SettingsPanel.cs        | 2 ++
 osu.Game/Overlays/WaveOverlayContainer.cs | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 9f9dbdbaf1..4cc17a4c14 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -14,6 +14,9 @@ namespace osu.Game.Overlays
     {
         private readonly Container dialogContainer;
 
+        protected override string PopInSampleName => "UI/dialog-pop-in";
+        protected override string PopOutSampleName => "UI/dialog-pop-out";
+
         public PopupDialog CurrentDialog { get; private set; }
 
         public DialogOverlay()
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 5c16a6e5c4..2866d2ad6d 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -51,6 +51,9 @@ namespace osu.Game.Overlays
         private Container dragContainer;
         private Container playerContainer;
 
+        protected override string PopInSampleName => "UI/now-playing-pop-in";
+        protected override string PopOutSampleName => "UI/now-playing-pop-out";
+
         /// <summary>
         /// Provide a source for the toolbar height.
         /// </summary>
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 7a5a586f67..f1270f750e 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Overlays
 
         private SeekLimitedSearchTextBox searchTextBox;
 
+        protected override string PopInSampleName => "UI/settings-pop-in";
+
         /// <summary>
         /// Provide a source for the toolbar height.
         /// </summary>
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index d0fa9987d5..52ae4dbdbb 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Overlays
 
         protected override bool StartHidden => true;
 
+        protected override string PopInSampleName => "UI/wave-pop-in";
+
         protected WaveOverlayContainer()
         {
             AddInternal(Waves = new WaveContainer

From 22995c216deb26b16ad5e307b35cc5c69ff54260 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 14:59:30 +0900
Subject: [PATCH 08065/10326] Use unique sample for edit button click
 (ButtonSystem)

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

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index f400b2114b..c6774127c1 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Screens.Menu
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
-            buttonsTopLevel.Add(new Button(@"edit", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
+            buttonsTopLevel.Add(new Button(@"edit", @"button-edit-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
             buttonsTopLevel.Add(new Button(@"browse", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
 
             if (host.CanExit)

From 73ab1b2b21f2eaaf40884d6d674d22c08031bfd7 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 15:01:22 +0900
Subject: [PATCH 08066/10326] Add pitch randomisation to HoverSounds on-hover
 sample playback

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index a1d06711db..21aae1b861 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
+using osu.Framework.Utils;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -49,9 +50,11 @@ namespace osu.Game.Graphics.UserInterface
         {
             bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
 
-            if (enoughTimePassedSinceLastPlayback)
+            if (enoughTimePassedSinceLastPlayback && sampleHover != null)
             {
-                sampleHover?.Play();
+                sampleHover.Frequency.Value = 0.96 + RNG.NextDouble(0.08);
+                sampleHover.Play();
+
                 lastPlaybackTime.Value = Time.Current;
             }
 

From 4e2ab0bad2c1aed6c9abc75250d1160ae87218f4 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 15:02:17 +0900
Subject: [PATCH 08067/10326] Use a separate sample set for Toolbar buttons

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 5 ++++-
 osu.Game/Overlays/Toolbar/ToolbarButton.cs     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index a1d06711db..4a79d1fbec 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -68,6 +68,9 @@ namespace osu.Game.Graphics.UserInterface
         Normal,
 
         [Description("-softer")]
-        Soft
+        Soft,
+
+        [Description("-toolbar")]
+        Toolbar
     }
 }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 49b9c62d85..83f2bdf6cb 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Toolbar
         private KeyBindingStore keyBindings { get; set; }
 
         protected ToolbarButton()
-            : base(HoverSampleSet.Loud)
+            : base(HoverSampleSet.Toolbar)
         {
             Width = Toolbar.HEIGHT;
             RelativeSizeAxes = Axes.Y;

From bc7f4a4f881b04feb4ac1c23b2d1fc5aba1fada5 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 20:16:22 +0900
Subject: [PATCH 08068/10326] Use a single sample for CarouselHeader on-hover
 with randomised pitch instead of multiple samples

---
 osu.Game/Screens/Select/Carousel/CarouselHeader.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index f1120f55a6..4f53a6e202 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Select.Carousel
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, OsuColour colours)
         {
-            sampleHover = audio.Samples.Get($@"SongSelect/song-ping-variation-{RNG.Next(1, 5)}");
+            sampleHover = audio.Samples.Get("SongSelect/song-ping");
             hoverLayer.Colour = colours.Blue.Opacity(0.1f);
         }
 
@@ -99,7 +99,11 @@ namespace osu.Game.Screens.Select.Carousel
 
         protected override bool OnHover(HoverEvent e)
         {
-            sampleHover?.Play();
+            if (sampleHover != null)
+            {
+                sampleHover.Frequency.Value = 0.90 + RNG.NextDouble(0.2);
+                sampleHover.Play();
+            }
 
             hoverLayer.FadeIn(100, Easing.OutQuint);
             return base.OnHover(e);

From 625eb78a118566dc72161da36c9b5997d10309e4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 17:59:52 +0900
Subject: [PATCH 08069/10326] Simplify with an early exit for null sample

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 21aae1b861..5d6d0896fd 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -48,9 +48,12 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override bool OnHover(HoverEvent e)
         {
+            if (sampleHover == null)
+                return false;
+
             bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
 
-            if (enoughTimePassedSinceLastPlayback && sampleHover != null)
+            if (enoughTimePassedSinceLastPlayback)
             {
                 sampleHover.Frequency.Value = 0.96 + RNG.NextDouble(0.08);
                 sampleHover.Play();
@@ -58,7 +61,7 @@ namespace osu.Game.Graphics.UserInterface
                 lastPlaybackTime.Value = Time.Current;
             }
 
-            return base.OnHover(e);
+            return false;
         }
     }
 

From 996f1098f6e7054e97150421ead8188147f5aa09 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Wed, 10 Feb 2021 18:14:32 +0900
Subject: [PATCH 08070/10326] Use alternate sample on the downbeat while
 hovering OsuLogo

---
 osu.Game/Screens/Menu/OsuLogo.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 68d23e1a32..1d0af30275 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Screens.Menu
 
         private SampleChannel sampleClick;
         private SampleChannel sampleBeat;
+        private SampleChannel sampleDownbeat;
 
         private readonly Container colourAndTriangles;
         private readonly Triangles triangles;
@@ -259,6 +260,7 @@ namespace osu.Game.Screens.Menu
         {
             sampleClick = audio.Samples.Get(@"Menu/osu-logo-select");
             sampleBeat = audio.Samples.Get(@"Menu/osu-logo-heartbeat");
+            sampleDownbeat = audio.Samples.Get(@"Menu/osu-logo-downbeat");
 
             logo.Texture = textures.Get(@"Menu/logo");
             ripple.Texture = textures.Get(@"Menu/logo");
@@ -281,7 +283,15 @@ namespace osu.Game.Screens.Menu
             if (beatIndex < 0) return;
 
             if (IsHovered)
-                this.Delay(early_activation).Schedule(() => sampleBeat.Play());
+            {
+                this.Delay(early_activation).Schedule(() =>
+                {
+                    if (beatIndex % (int)timingPoint.TimeSignature == 0)
+                        sampleDownbeat.Play();
+                    else
+                        sampleBeat.Play();
+                });
+            }
 
             logoBeatContainer
                 .ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, Easing.Out).Then()

From cf06684ad121d58548d6cf0b9e87a439167dbc57 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:38:31 +0900
Subject: [PATCH 08071/10326] Judge heads as slider ticks instead

---
 .../Judgements/SliderTickJudgement.cs                | 12 ++++++++++++
 .../Objects/Drawables/DrawableSliderHead.cs          |  2 +-
 osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs    |  4 ++--
 osu.Game.Rulesets.Osu/Objects/SliderTick.cs          |  5 -----
 4 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.cs

diff --git a/osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.cs
new file mode 100644
index 0000000000..a088696784
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.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.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Judgements
+{
+    public class SliderTickJudgement : OsuJudgement
+    {
+        public override HitResult MaxResult => HitResult.LargeTickHit;
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 87cfa47091..c3759b6a34 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             // If not judged as a normal hitcircle, only track whether a hit has occurred (via IgnoreHit) rather than a scorable hit result.
             var result = base.ResultFor(timeOffset);
-            return result.IsHit() ? HitResult.IgnoreHit : HitResult.IgnoreMiss;
+            return result.IsHit() ? HitResult.LargeTickHit : HitResult.LargeTickMiss;
         }
 
         public Action<double> OnShake;
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index 28e57567cb..5672283230 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -10,10 +10,10 @@ namespace osu.Game.Rulesets.Osu.Objects
     {
         /// <summary>
         /// Whether to treat this <see cref="SliderHeadCircle"/> as a normal <see cref="HitCircle"/> for judgement purposes.
-        /// If <c>false</c>, judgement will be ignored.
+        /// If <c>false</c>, this <see cref="SliderHeadCircle"/> will be judged as a <see cref="SliderTick"/> instead.
         /// </summary>
         public bool JudgeAsNormalHitCircle = true;
 
-        public override Judgement CreateJudgement() => JudgeAsNormalHitCircle ? base.CreateJudgement() : new OsuIgnoreJudgement();
+        public override Judgement CreateJudgement() => JudgeAsNormalHitCircle ? base.CreateJudgement() : new SliderTickJudgement();
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
index a427ee1955..725dbe81fb 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
@@ -33,10 +33,5 @@ namespace osu.Game.Rulesets.Osu.Objects
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
         public override Judgement CreateJudgement() => new SliderTickJudgement();
-
-        public class SliderTickJudgement : OsuJudgement
-        {
-            public override HitResult MaxResult => HitResult.LargeTickHit;
-        }
     }
 }

From 6730c4c58b22ce2e753ac0f4b7055b5b87f62cde Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:41:28 +0900
Subject: [PATCH 08072/10326] Apply review comments (user explanations +
 property names)

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs | 26 ++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 863dc05216..642da87693 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -32,27 +32,27 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override ModType Type => ModType.Conversion;
 
-        [SettingSource("Disable slider head judgement", "Scores sliders proportionally to the number of ticks hit.")]
-        public Bindable<bool> DisableSliderHeadJudgement { get; } = new BindableBool(true);
+        [SettingSource("No slider head accuracy requirement", "Scores sliders proportionally to the number of ticks hit.")]
+        public Bindable<bool> NoSliderHeadAccuracy { get; } = new BindableBool(true);
 
-        [SettingSource("Disable slider head tracking", "Pins slider heads at their starting position, regardless of time.")]
-        public Bindable<bool> DisableSliderHeadTracking { get; } = new BindableBool(true);
+        [SettingSource("No slider head movement", "Pins slider heads at their starting position, regardless of time.")]
+        public Bindable<bool> NoSliderHeadMovement { get; } = new BindableBool(true);
 
-        [SettingSource("Disable note lock lenience", "Applies note lock to the full hit window.")]
-        public Bindable<bool> DisableLenientNoteLock { get; } = new BindableBool(true);
+        [SettingSource("Apply classic note lock", "Applies note lock to the full hit window.")]
+        public Bindable<bool> ClassicNoteLock { get; } = new BindableBool(true);
 
-        [SettingSource("Disable exact slider follow circle tracking", "Makes the slider follow circle track its final size at all times.")]
-        public Bindable<bool> DisableExactFollowCircleTracking { get; } = new BindableBool(true);
+        [SettingSource("Use fixed slider follow circle hit area", "Makes the slider follow circle track its final size at all times.")]
+        public Bindable<bool> FixedFollowCircleHitArea { get; } = new BindableBool(true);
 
         public void ApplyToHitObject(HitObject hitObject)
         {
             switch (hitObject)
             {
                 case Slider slider:
-                    slider.IgnoreJudgement = !DisableSliderHeadJudgement.Value;
+                    slider.IgnoreJudgement = !NoSliderHeadAccuracy.Value;
 
                     foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
-                        head.JudgeAsNormalHitCircle = !DisableSliderHeadJudgement.Value;
+                        head.JudgeAsNormalHitCircle = !NoSliderHeadAccuracy.Value;
 
                     break;
             }
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             var osuRuleset = (DrawableOsuRuleset)drawableRuleset;
 
-            if (!DisableLenientNoteLock.Value)
+            if (!ClassicNoteLock.Value)
                 osuRuleset.Playfield.HitPolicy = new ObjectOrderedHitPolicy();
         }
 
@@ -73,11 +73,11 @@ namespace osu.Game.Rulesets.Osu.Mods
                 switch (obj)
                 {
                     case DrawableSlider slider:
-                        slider.Ball.TrackVisualSize = !DisableExactFollowCircleTracking.Value;
+                        slider.Ball.TrackVisualSize = !FixedFollowCircleHitArea.Value;
                         break;
 
                     case DrawableSliderHead head:
-                        head.TrackFollowCircle = !DisableSliderHeadTracking.Value;
+                        head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                         break;
                 }
             }

From 18a29dcb9664075e4fd1dadfc57157cbcc2fc21a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:42:13 +0900
Subject: [PATCH 08073/10326] Rename bindable member, reorder binds

---
 osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index f9b8ffca7b..b9cd176c63 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         [Resolved(CanBeNull = true)]
         private OsuRulesetConfigManager config { get; set; }
 
-        private readonly Bindable<bool> snakingOut = new Bindable<bool>();
+        private readonly Bindable<bool> configSnakingOut = new Bindable<bool>();
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, DrawableHitObject drawableObject)
@@ -37,9 +37,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             accentColour = drawableObject.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(accent => updateAccentColour(skin, accent.NewValue), true);
 
-            SnakingOut.BindTo(snakingOut);
             config?.BindWith(OsuRulesetSetting.SnakingInSliders, SnakingIn);
-            config?.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
+            config?.BindWith(OsuRulesetSetting.SnakingOutSliders, configSnakingOut);
+
+            SnakingOut.BindTo(configSnakingOut);
 
             BorderSize = skin.GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.SliderBorderSize)?.Value ?? 1;
             BorderColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBorder)?.Value ?? Color4.White;
@@ -56,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             if (!drawableSlider.HeadCircle.TrackFollowCircle)
             {
                 // When not tracking the follow circle, force the path to not snake out as it looks better that way.
-                SnakingOut.UnbindFrom(snakingOut);
+                SnakingOut.UnbindFrom(configSnakingOut);
                 SnakingOut.Value = false;
             }
         }

From 9519b7f7c16e234d119ecaf65e3ff019ad84c400 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:43:14 +0900
Subject: [PATCH 08074/10326] Adjust comment

---
 osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index b9cd176c63..4dd7b2d69c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -54,9 +54,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             if (drawableSlider.HitObject == null)
                 return;
 
+            // When not tracking the follow circle, unbind from the config and forcefully disable snaking out - it looks better that way.
             if (!drawableSlider.HeadCircle.TrackFollowCircle)
             {
-                // When not tracking the follow circle, force the path to not snake out as it looks better that way.
                 SnakingOut.UnbindFrom(configSnakingOut);
                 SnakingOut.Value = false;
             }

From 2fcc4213e16f8a9ebc33d91474fe3c0a632cf36c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:46:26 +0900
Subject: [PATCH 08075/10326] Rename IgnoreJudgement -> OnlyJudgeNestedObjects

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs               | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 4 ++--
 osu.Game.Rulesets.Osu/Objects/Slider.cs                   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 642da87693..8e533854c0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             switch (hitObject)
             {
                 case Slider slider:
-                    slider.IgnoreJudgement = !NoSliderHeadAccuracy.Value;
+                    slider.OnlyJudgeNestedObjects = !NoSliderHeadAccuracy.Value;
 
                     foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
                         head.JudgeAsNormalHitCircle = !NoSliderHeadAccuracy.Value;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index e607163b3e..13057d7a9a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public SliderBall Ball { get; private set; }
         public SkinnableDrawable Body { get; private set; }
 
-        public override bool DisplayResult => !HitObject.IgnoreJudgement;
+        public override bool DisplayResult => !HitObject.OnlyJudgeNestedObjects;
 
         private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody;
 
@@ -250,7 +250,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || Time.Current < HitObject.EndTime)
                 return;
 
-            if (HitObject.IgnoreJudgement)
+            if (HitObject.OnlyJudgeNestedObjects)
             {
                 ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
                 return;
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 01694a838b..332163454a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -115,10 +115,10 @@ namespace osu.Game.Rulesets.Osu.Objects
         public double TickDistanceMultiplier = 1;
 
         /// <summary>
-        /// Whether this <see cref="Slider"/>'s judgement should be ignored.
-        /// If <c>false</c>, this <see cref="Slider"/> will be judged proportionally to the number of ticks hit.
+        /// Whether this <see cref="Slider"/>'s judgement is fully handled by its nested <see cref="HitObject"/>s.
+        /// If <c>false</c>, this <see cref="Slider"/> will be judged proportionally to the number of nested <see cref="HitObject"/>s hit.
         /// </summary>
-        public bool IgnoreJudgement = true;
+        public bool OnlyJudgeNestedObjects = true;
 
         [JsonIgnore]
         public SliderHeadCircle HeadCircle { get; protected set; }
@@ -239,7 +239,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                 HeadCircle.Samples = this.GetNodeSamples(0);
         }
 
-        public override Judgement CreateJudgement() => IgnoreJudgement ? new OsuIgnoreJudgement() : new OsuJudgement();
+        public override Judgement CreateJudgement() => OnlyJudgeNestedObjects ? new OsuIgnoreJudgement() : new OsuJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }

From a16f4cee3a0d44bbcdf69adb4949f2d3a425efd1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:52:39 +0900
Subject: [PATCH 08076/10326] Adjust DrawableSlider comment

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 13057d7a9a..921139c4e9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -250,13 +250,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || Time.Current < HitObject.EndTime)
                 return;
 
+            // If only the nested hitobjects are judged, then the slider's own judgement is ignored for scoring purposes.
+            // But the slider needs to still be judged with a reasonable hit/miss result for visual purposes (hit/miss transforms, etc).
             if (HitObject.OnlyJudgeNestedObjects)
             {
                 ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
                 return;
             }
 
-            // If not ignoring judgement, score proportionally based on the number of ticks hit, counting the head circle as a tick.
+            // Otherwise, if this slider is also needs to be judged, apply judgement proportionally to the number of nested hitobjects hit. This is the classic osu!stable scoring.
             ApplyResult(r =>
             {
                 int totalTicks = NestedHitObjects.Count;

From 6bf40170db22f31cea0c040824a218794d236718 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:53:23 +0900
Subject: [PATCH 08077/10326] Rename SliderBall flag

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs          | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 8e533854c0..17b0b18b52 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 switch (obj)
                 {
                     case DrawableSlider slider:
-                        slider.Ball.TrackVisualSize = !FixedFollowCircleHitArea.Value;
+                        slider.Ball.InputTracksVisualSize = !FixedFollowCircleHitArea.Value;
                         break;
 
                     case DrawableSliderHead head:
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
index da3debbd42..82b677e12c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         /// Whether to track accurately to the visual size of this <see cref="SliderBall"/>.
         /// If <c>false</c>, tracking will be performed at the final scale at all times.
         /// </summary>
-        public bool TrackVisualSize = true;
+        public bool InputTracksVisualSize = true;
 
         private readonly Drawable followCircle;
         private readonly DrawableSlider drawableSlider;
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
                 tracking = value;
 
-                if (TrackVisualSize)
+                if (InputTracksVisualSize)
                     followCircle.ScaleTo(tracking ? 2.4f : 1f, 300, Easing.OutQuint);
                 else
                 {

From 0dcdad98397453b439cab67421e29ecb3ca13f00 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 19:04:23 +0900
Subject: [PATCH 08078/10326] Adjust comment for DrawableSliderHead

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index c3759b6a34..01c0d988ee 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (HitObject.JudgeAsNormalHitCircle)
                 return base.ResultFor(timeOffset);
 
-            // If not judged as a normal hitcircle, only track whether a hit has occurred (via IgnoreHit) rather than a scorable hit result.
+            // If not judged as a normal hitcircle, judge as a slider tick instead. This is the classic osu!stable scoring.
             var result = base.ResultFor(timeOffset);
             return result.IsHit() ? HitResult.LargeTickHit : HitResult.LargeTickMiss;
         }

From 393cd6c74a354919dc0b410d0bea38b8701bd032 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 19:39:47 +0900
Subject: [PATCH 08079/10326] Add helper class for tracking changes to mod
 settings

---
 .../Configuration/SettingSourceAttribute.cs   | 27 ++++++++++++++++
 .../Screens/Select/Details/AdvancedStats.cs   | 31 ++++++-------------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 50069be4b2..00c322065a 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -9,6 +9,7 @@ using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Configuration
 {
@@ -140,4 +141,30 @@ namespace osu.Game.Configuration
             return orderedRelative.Concat(unordered);
         }
     }
+
+    public class ModSettingChangeTracker : IDisposable
+    {
+        public Action<Mod> SettingChanged;
+
+        private readonly List<ISettingsItem> references = new List<ISettingsItem>();
+
+        public ModSettingChangeTracker(IEnumerable<Mod> mods)
+        {
+            foreach (var mod in mods)
+            {
+                foreach (var setting in mod.CreateSettingsControls().OfType<ISettingsItem>())
+                {
+                    setting.SettingChanged += () => SettingChanged?.Invoke(mod);
+                    references.Add(setting);
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            foreach (var r in references)
+                r.Dispose();
+            references.Clear();
+        }
+    }
 }
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 44d908fc46..7966ec4240 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -18,7 +18,6 @@ using System.Threading;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
-using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.Select.Details
@@ -83,32 +82,22 @@ namespace osu.Game.Screens.Select.Details
             mods.BindValueChanged(modsChanged, true);
         }
 
-        private readonly List<ISettingsItem> references = new List<ISettingsItem>();
+        private ModSettingChangeTracker settingChangeTracker;
+        private ScheduledDelegate debouncedStatisticsUpdate;
 
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
-            // TODO: find a more permanent solution for this if/when it is needed in other components.
-            // this is generating drawables for the only purpose of storing bindable references.
-            foreach (var r in references)
-                r.Dispose();
+            settingChangeTracker?.Dispose();
 
-            references.Clear();
-
-            ScheduledDelegate debounce = null;
-
-            foreach (var mod in mods.NewValue.OfType<IApplicableToDifficulty>())
+            settingChangeTracker = new ModSettingChangeTracker(mods.NewValue);
+            settingChangeTracker.SettingChanged += m =>
             {
-                foreach (var setting in mod.CreateSettingsControls().OfType<ISettingsItem>())
-                {
-                    setting.SettingChanged += () =>
-                    {
-                        debounce?.Cancel();
-                        debounce = Scheduler.AddDelayed(updateStatistics, 100);
-                    };
+                if (!(m is IApplicableToDifficulty))
+                    return;
 
-                    references.Add(setting);
-                }
-            }
+                debouncedStatisticsUpdate?.Cancel();
+                debouncedStatisticsUpdate = Scheduler.AddDelayed(updateStatistics, 100);
+            };
 
             updateStatistics();
         }

From 7827e991b2dda30e265c3fc210e3828698d9d00b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 19:43:39 +0900
Subject: [PATCH 08080/10326] Also clear event on dispose

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 00c322065a..04b8f8e962 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -162,6 +162,8 @@ namespace osu.Game.Configuration
 
         public void Dispose()
         {
+            SettingChanged = null;
+
             foreach (var r in references)
                 r.Dispose();
             references.Clear();

From 822c66033f0d9cb2c2dbee0d138cdb67bc1fdd3c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 19:56:59 +0900
Subject: [PATCH 08081/10326] Add local-user freemod configuration

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  9 +++++++-
 .../OnlinePlay/FreeModSelectOverlay.cs        |  5 +++--
 .../Multiplayer/MultiplayerMatchSongSelect.cs |  2 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 21 +++++++++++++++----
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 93fe693937..488c0659f4 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -51,6 +51,11 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected virtual bool Stacked => true;
 
+        /// <summary>
+        /// Whether configurable <see cref="Mod"/>s can be configured by the local user.
+        /// </summary>
+        protected virtual bool AllowConfiguration => true;
+
         [NotNull]
         private Func<Mod, bool> isValidMod = m => true;
 
@@ -300,6 +305,7 @@ namespace osu.Game.Overlays.Mods
                                                 Text = "Customisation",
                                                 Action = () => ModSettingsContainer.ToggleVisibility(),
                                                 Enabled = { Value = false },
+                                                Alpha = AllowConfiguration ? 1 : 0,
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
@@ -509,7 +515,8 @@ namespace osu.Game.Overlays.Mods
 
                 OnModSelected(selectedMod);
 
-                if (selectedMod.RequiresConfiguration) ModSettingsContainer.Show();
+                if (selectedMod.RequiresConfiguration && AllowConfiguration)
+                    ModSettingsContainer.Show();
             }
             else
             {
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 7bc226bb3f..ab7be13479 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -20,17 +20,18 @@ namespace osu.Game.Screens.OnlinePlay
     {
         protected override bool Stacked => false;
 
+        protected override bool AllowConfiguration => false;
+
         public new Func<Mod, bool> IsValidMod
         {
             get => base.IsValidMod;
-            set => base.IsValidMod = m => m.HasImplementation && !m.RequiresConfiguration && !(m is ModAutoplay) && value(m);
+            set => base.IsValidMod = m => m.HasImplementation && !(m is ModAutoplay) && value(m);
         }
 
         public FreeModSelectOverlay()
         {
             IsValidMod = m => true;
 
-            CustomiseButton.Alpha = 0;
             MultiplierSection.Alpha = 0;
             DeselectAllButton.Alpha = 0;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 84e8849726..f17d97c3fd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -59,6 +59,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust) && !mod.RequiresConfiguration;
+        protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 5f2f1366f7..7edba3231c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -12,6 +12,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
+using osu.Framework.Threading;
+using osu.Game.Configuration;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
@@ -314,12 +316,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
+        private ModSettingChangeTracker modSettingChangeTracker;
+        private ScheduledDelegate debouncedModSettingsUpdate;
+
         private void onUserModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
+            modSettingChangeTracker?.Dispose();
+
             if (client.Room == null)
                 return;
 
             client.ChangeUserMods(mods.NewValue);
+
+            modSettingChangeTracker = new ModSettingChangeTracker(mods.NewValue);
+            modSettingChangeTracker.SettingChanged += onModSettingsChanged;
+        }
+
+        private void onModSettingsChanged(Mod mod)
+        {
+            // Debounce changes to mod settings so as to not thrash the network.
+            debouncedModSettingsUpdate?.Cancel();
+            debouncedModSettingsUpdate = Scheduler.AddDelayed(() => client.ChangeUserMods(UserMods.Value), 500);
         }
 
         private void updateBeatmapAvailability(ValueChangedEvent<BeatmapAvailability> availability)
@@ -389,10 +406,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private class UserModSelectOverlay : LocalPlayerModSelectOverlay
         {
-            public UserModSelectOverlay()
-            {
-                CustomiseButton.Alpha = 0;
-            }
         }
     }
 }

From 4a405bb8598a8dcdbc6772eaac801c9fa4907956 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:04:16 +0900
Subject: [PATCH 08082/10326] Split ModSettingChangeTracker into separate file

---
 .../Configuration/ModSettingChangeTracker.cs  | 39 +++++++++++++++++++
 .../Configuration/SettingSourceAttribute.cs   | 29 --------------
 2 files changed, 39 insertions(+), 29 deletions(-)
 create mode 100644 osu.Game/Configuration/ModSettingChangeTracker.cs

diff --git a/osu.Game/Configuration/ModSettingChangeTracker.cs b/osu.Game/Configuration/ModSettingChangeTracker.cs
new file mode 100644
index 0000000000..f702a2fc22
--- /dev/null
+++ b/osu.Game/Configuration/ModSettingChangeTracker.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 System.Linq;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Configuration
+{
+    public class ModSettingChangeTracker : IDisposable
+    {
+        public Action<Mod> SettingChanged;
+
+        private readonly List<ISettingsItem> references = new List<ISettingsItem>();
+
+        public ModSettingChangeTracker(IEnumerable<Mod> mods)
+        {
+            foreach (var mod in mods)
+            {
+                foreach (var setting in mod.CreateSettingsControls().OfType<ISettingsItem>())
+                {
+                    setting.SettingChanged += () => SettingChanged?.Invoke(mod);
+                    references.Add(setting);
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            SettingChanged = null;
+
+            foreach (var r in references)
+                r.Dispose();
+            references.Clear();
+        }
+    }
+}
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 04b8f8e962..50069be4b2 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -9,7 +9,6 @@ using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Settings;
-using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Configuration
 {
@@ -141,32 +140,4 @@ namespace osu.Game.Configuration
             return orderedRelative.Concat(unordered);
         }
     }
-
-    public class ModSettingChangeTracker : IDisposable
-    {
-        public Action<Mod> SettingChanged;
-
-        private readonly List<ISettingsItem> references = new List<ISettingsItem>();
-
-        public ModSettingChangeTracker(IEnumerable<Mod> mods)
-        {
-            foreach (var mod in mods)
-            {
-                foreach (var setting in mod.CreateSettingsControls().OfType<ISettingsItem>())
-                {
-                    setting.SettingChanged += () => SettingChanged?.Invoke(mod);
-                    references.Add(setting);
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            SettingChanged = null;
-
-            foreach (var r in references)
-                r.Dispose();
-            references.Clear();
-        }
-    }
 }

From 6fff7c39daca9c27c39511b84223e7e98172325b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:09:45 +0900
Subject: [PATCH 08083/10326] Ensure tracker is disposed

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 ++
 osu.Game/Screens/Select/Details/AdvancedStats.cs                | 1 +
 2 files changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 7edba3231c..59418cb348 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -402,6 +402,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             if (client != null)
                 client.LoadRequested -= onLoadRequested;
+
+            modSettingChangeTracker?.Dispose();
         }
 
         private class UserModSelectOverlay : LocalPlayerModSelectOverlay
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 7966ec4240..4a03c5e614 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -162,6 +162,7 @@ namespace osu.Game.Screens.Select.Details
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
+            settingChangeTracker?.Dispose();
             starDifficultyCancellationSource?.Cancel();
         }
 

From 169acb42de35e88c8755a5140808cb3563cfb97d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:11:36 +0900
Subject: [PATCH 08084/10326] Xmldoc + cleanup

---
 .../Configuration/ModSettingChangeTracker.cs  | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/ModSettingChangeTracker.cs b/osu.Game/Configuration/ModSettingChangeTracker.cs
index f702a2fc22..e2ade7dc6a 100644
--- a/osu.Game/Configuration/ModSettingChangeTracker.cs
+++ b/osu.Game/Configuration/ModSettingChangeTracker.cs
@@ -9,12 +9,25 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Configuration
 {
+    /// <summary>
+    /// A helper class for tracking changes to the settings of a set of <see cref="Mod"/>s.
+    /// </summary>
+    /// <remarks>
+    /// Ensure to dispose when usage is finished.
+    /// </remarks>
     public class ModSettingChangeTracker : IDisposable
     {
+        /// <summary>
+        /// Notifies that the setting of a <see cref="Mod"/> has changed.
+        /// </summary>
         public Action<Mod> SettingChanged;
 
-        private readonly List<ISettingsItem> references = new List<ISettingsItem>();
+        private readonly List<ISettingsItem> settings = new List<ISettingsItem>();
 
+        /// <summary>
+        /// Creates a new <see cref="ModSettingChangeTracker"/> for a set of <see cref="Mod"/>s.
+        /// </summary>
+        /// <param name="mods">The set of <see cref="Mod"/>s whose settings need to be tracked.</param>
         public ModSettingChangeTracker(IEnumerable<Mod> mods)
         {
             foreach (var mod in mods)
@@ -22,7 +35,7 @@ namespace osu.Game.Configuration
                 foreach (var setting in mod.CreateSettingsControls().OfType<ISettingsItem>())
                 {
                     setting.SettingChanged += () => SettingChanged?.Invoke(mod);
-                    references.Add(setting);
+                    settings.Add(setting);
                 }
             }
         }
@@ -31,9 +44,9 @@ namespace osu.Game.Configuration
         {
             SettingChanged = null;
 
-            foreach (var r in references)
+            foreach (var r in settings)
                 r.Dispose();
-            references.Clear();
+            settings.Clear();
         }
     }
 }

From 86682cdb3480e711d2ecdeab04926c7488a17046 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:16:26 +0900
Subject: [PATCH 08085/10326] Add client/room null check

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 59418cb348..b7adb71e2f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -336,7 +336,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             // Debounce changes to mod settings so as to not thrash the network.
             debouncedModSettingsUpdate?.Cancel();
-            debouncedModSettingsUpdate = Scheduler.AddDelayed(() => client.ChangeUserMods(UserMods.Value), 500);
+            debouncedModSettingsUpdate = Scheduler.AddDelayed(() =>
+            {
+                if (client.Room == null)
+                    return;
+
+                client.ChangeUserMods(UserMods.Value);
+            }, 500);
         }
 
         private void updateBeatmapAvailability(ValueChangedEvent<BeatmapAvailability> availability)

From c458c4cfaee1d9a830e8ddafa512d30d35b5b4cf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:27:47 +0900
Subject: [PATCH 08086/10326] Fix unintended changes due to renaming or
 otherwise

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs | 2 +-
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 17b0b18b52..5470d0fcb4 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             var osuRuleset = (DrawableOsuRuleset)drawableRuleset;
 
-            if (!ClassicNoteLock.Value)
+            if (ClassicNoteLock.Value)
                 osuRuleset.Playfield.HitPolicy = new ObjectOrderedHitPolicy();
         }
 
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 189ef2d76c..b1069149f3 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            HitPolicy = new ObjectOrderedHitPolicy();
+            HitPolicy = new StartTimeOrderedHitPolicy();
 
             var hitWindows = new OsuHitWindows();
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))

From 321ca43b61a2a47857e04a117d622da6af385492 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:28:00 +0900
Subject: [PATCH 08087/10326] Update test

---
 .../TestSceneObjectOrderedHitPolicy.cs                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 039a4f142f..77a68b714b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Miss);
             addJudgementAssert(hitObjects[1], HitResult.Great);
-            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.IgnoreHit);
+            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
         }
 
@@ -291,7 +291,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Great);
-            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.IgnoreHit);
+            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
         }
 

From 4a391ce03d84adf76adb4214993c28e15cdebdbb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 21:24:41 +0900
Subject: [PATCH 08088/10326] Fix div-by-0 when 0 ticks are hit

---
 .../Objects/Drawables/DrawableSlider.cs          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 921139c4e9..d35da64ad5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -263,16 +263,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 int totalTicks = NestedHitObjects.Count;
                 int hitTicks = NestedHitObjects.Count(h => h.IsHit);
-                double hitFraction = (double)totalTicks / hitTicks;
 
                 if (hitTicks == totalTicks)
                     r.Type = HitResult.Great;
-                else if (hitFraction >= 0.5)
-                    r.Type = HitResult.Ok;
-                else if (hitFraction > 0)
-                    r.Type = HitResult.Meh;
-                else
+                else if (hitTicks == 0)
                     r.Type = HitResult.Miss;
+                else
+                {
+                    double hitFraction = (double)totalTicks / hitTicks;
+
+                    if (hitFraction >= 0.5)
+                        r.Type = HitResult.Ok;
+                    else if (hitFraction > 0)
+                        r.Type = HitResult.Meh;
+                }
             });
         }
 

From 1d425b83224ff7ac765b9af6d16389e637f1d840 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 21:25:31 +0900
Subject: [PATCH 08089/10326] Simplify case

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index d35da64ad5..847011850c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -271,11 +271,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 else
                 {
                     double hitFraction = (double)totalTicks / hitTicks;
-
-                    if (hitFraction >= 0.5)
-                        r.Type = HitResult.Ok;
-                    else if (hitFraction > 0)
-                        r.Type = HitResult.Meh;
+                    r.Type = hitFraction >= 0.5 ? HitResult.Ok : HitResult.Meh;
                 }
             });
         }

From bd2486e5a04bda5fb2a0ff32df6d2dce8681f2f3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 21:27:12 +0900
Subject: [PATCH 08090/10326] Fix grammatical error in comment

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 847011850c..253b9800a6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -258,7 +258,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 return;
             }
 
-            // Otherwise, if this slider is also needs to be judged, apply judgement proportionally to the number of nested hitobjects hit. This is the classic osu!stable scoring.
+            // Otherwise, if this slider also needs to be judged, apply judgement proportionally to the number of nested hitobjects hit. This is the classic osu!stable scoring.
             ApplyResult(r =>
             {
                 int totalTicks = NestedHitObjects.Count;

From 20a6405fd20a6cef1251eebfd7435928344679a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 22:06:19 +0900
Subject: [PATCH 08091/10326] Add explanatory comments + const

---
 .../Drawables/Connections/FollowPointConnection.cs |  6 ++++--
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs      | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 40154ca84c..5541d0e790 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -110,8 +110,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             double startTime = start.GetEndTime();
             double duration = end.StartTime - startTime;
 
-            // For now, adjust the pre-empt for approach rates > 10.
-            double preempt = PREEMPT * Math.Min(1, start.TimePreempt / 450);
+            // Preempt time can go below 800ms. Normally, this is achieved via the DT mod which uniformly speeds up all animations game wide regardless of AR.
+            // This uniform speedup is hard to match 1:1, however we can at least make AR>10 (via mods) feel good by extending the upper linear preempt function (see: OsuHitObject).
+            // Note that this doesn't exactly match the AR>10 visuals as they're classically known, but it feels good.
+            double preempt = PREEMPT * Math.Min(1, start.TimePreempt / OsuHitObject.PREEMPT_MIN);
 
             fadeOutTime = startTime + fraction * duration;
             fadeInTime = fadeOutTime - preempt;
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 6d28a576a4..22b64af3df 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -26,6 +26,11 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         internal const float BASE_SCORING_DISTANCE = 100;
 
+        /// <summary>
+        /// Minimum preempt time at AR=10.
+        /// </summary>
+        public const double PREEMPT_MIN = 450;
+
         public double TimePreempt = 600;
         public double TimeFadeIn = 400;
 
@@ -113,8 +118,13 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
-            TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
-            TimeFadeIn = 400 * Math.Min(1, TimePreempt / 450);
+            TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, PREEMPT_MIN);
+
+            // Preempt time can go below 450ms. Normally, this is achieved via the DT mod which uniformly speeds up all animations game wide regardless of AR.
+            // This uniform speedup is hard to match 1:1, however we can at least make AR>10 (via mods) feel good by extending the upper linear function above.
+            // Note that this doesn't exactly match the AR>10 visuals as they're classically known, but it feels good.
+            // This adjustment is necessary for AR>10, otherwise TimePreempt can become smaller leading to hitcircles not fully fading in.
+            TimeFadeIn = 400 * Math.Min(1, TimePreempt / PREEMPT_MIN);
 
             Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
         }

From 5d1d6ec1cbeef3ff0cf17b9e04d556e01772de1a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 22:09:24 +0900
Subject: [PATCH 08092/10326] Fix inverted calculation

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 253b9800a6..9122f347d0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -270,7 +270,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     r.Type = HitResult.Miss;
                 else
                 {
-                    double hitFraction = (double)totalTicks / hitTicks;
+                    double hitFraction = (double)hitTicks / totalTicks;
                     r.Type = hitFraction >= 0.5 ? HitResult.Ok : HitResult.Meh;
                 }
             });

From 07b661e28c2d2267dbe1a431f1a75e1d60fc6620 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 23:44:06 +0900
Subject: [PATCH 08093/10326] Add Messagepack support for serialising unknown
 bindable types

---
 .../TestAPIModMessagePackSerialization.cs     | 27 +++++++++++++++++++
 .../API/ModSettingsDictionaryFormatter.cs     |  8 ++++++
 2 files changed, 35 insertions(+)

diff --git a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
index 4294f89397..74db477cfc 100644
--- a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
@@ -68,6 +68,16 @@ namespace osu.Game.Tests.Online
             Assert.That(converted.FinalRate.Value, Is.EqualTo(0.25));
         }
 
+        [Test]
+        public void TestDeserialiseEnumMod()
+        {
+            var apiMod = new APIMod(new TestModEnum { TestSetting = { Value = TestEnum.Value2 } });
+
+            var deserialized = MessagePackSerializer.Deserialize<APIMod>(MessagePackSerializer.Serialize(apiMod));
+
+            Assert.That(deserialized.Settings, Contains.Key("test_setting").With.ContainValue(1));
+        }
+
         private class TestRuleset : Ruleset
         {
             public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[]
@@ -135,5 +145,22 @@ namespace osu.Game.Tests.Online
                 Value = true
             };
         }
+
+        private class TestModEnum : Mod
+        {
+            public override string Name => "Test Mod";
+            public override string Acronym => "TM";
+            public override double ScoreMultiplier => 1;
+
+            [SettingSource("Test")]
+            public Bindable<TestEnum> TestSetting { get; } = new Bindable<TestEnum>();
+        }
+
+        private enum TestEnum
+        {
+            Value1 = 0,
+            Value2 = 1,
+            Value3 = 2
+        }
     }
 }
diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index 99e87677fa..dd854acc32 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -3,6 +3,7 @@
 
 using System.Buffers;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Text;
 using MessagePack;
 using MessagePack.Formatters;
@@ -41,6 +42,13 @@ namespace osu.Game.Online.API
                         primitiveFormatter.Serialize(ref writer, b.Value, options);
                         break;
 
+                    case IBindable u:
+                        // A mod with unknown (e.g. enum) generic type.
+                        var valueMethod = u.GetType().GetProperty(nameof(IBindable<int>.Value));
+                        Debug.Assert(valueMethod != null);
+                        primitiveFormatter.Serialize(ref writer, valueMethod.GetValue(u), options);
+                        break;
+
                     default:
                         // fall back for non-bindable cases.
                         primitiveFormatter.Serialize(ref writer, kvp.Value, options);

From 97e799a26bc22316442500aefc79fad3f9c6d646 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Wed, 10 Feb 2021 18:10:31 +0100
Subject: [PATCH 08094/10326] add more MIME types to Android share intent
 filter

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 48b059b482..d3bb97973b 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -21,7 +21,7 @@ namespace osu.Android
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataMimeTypes = new[] { "application/x-osu-beatmap", "application/x-osu-skin" })]
-    [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/x-osu-beatmap", "application/x-osu-skin", "application/zip", "application/octet-stream", "application/x-zip", "application/x-zip-compressed" })]
+    [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream", "application/download", "application/x-zip", "application/x-zip-compressed" })]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {

From fed2dea7353a380103772ba99edb4882a6639d73 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Wed, 10 Feb 2021 18:13:59 +0100
Subject: [PATCH 08095/10326] remove unnecesary view intent filter

---
 osu.Android/OsuGameActivity.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index d3bb97973b..ad929bbac3 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -20,7 +20,6 @@ namespace osu.Android
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataMimeTypes = new[] { "application/x-osu-beatmap", "application/x-osu-skin" })]
     [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream", "application/download", "application/x-zip", "application/x-zip-compressed" })]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity

From 63e6ec1c9fa3b0ecb12ecbd2f389edc0042de939 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 20:06:55 +0900
Subject: [PATCH 08096/10326] Add audio feedback for OSD value changes

---
 osu.Game/Overlays/OSD/TrackedSettingToast.cs | 46 ++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/OSD/TrackedSettingToast.cs b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
index 8e8a99a0a7..c5a289a85c 100644
--- a/osu.Game/Overlays/OSD/TrackedSettingToast.cs
+++ b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
@@ -3,6 +3,8 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -19,6 +21,15 @@ namespace osu.Game.Overlays.OSD
     {
         private const int lights_bottom_margin = 40;
 
+        private readonly int optionCount;
+        private readonly int selectedOption = -1;
+
+        private SampleChannel sampleOn;
+        private SampleChannel sampleOff;
+        private SampleChannel sampleChange;
+
+        private bool playedSample;
+
         public TrackedSettingToast(SettingDescription description)
             : base(description.Name, description.Value, description.Shortcut)
         {
@@ -46,9 +57,6 @@ namespace osu.Game.Overlays.OSD
                 }
             };
 
-            int optionCount = 0;
-            int selectedOption = -1;
-
             switch (description.RawValue)
             {
                 case bool val:
@@ -69,6 +77,38 @@ namespace osu.Game.Overlays.OSD
                 optionLights.Add(new OptionLight { Glowing = i == selectedOption });
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (playedSample) return;
+
+            if (optionCount == 1)
+            {
+                if (selectedOption == 0)
+                    sampleOn?.Play();
+                else
+                    sampleOff?.Play();
+            }
+            else
+            {
+                if (sampleChange == null) return;
+
+                sampleChange.Frequency.Value = 1 + (double)selectedOption / (optionCount - 1) * 0.25f;
+                sampleChange.Play();
+            }
+
+            playedSample = true;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            sampleOn = audio.Samples.Get("UI/osd-on");
+            sampleOff = audio.Samples.Get("UI/osd-off");
+            sampleChange = audio.Samples.Get("UI/osd-change");
+        }
+
         private class OptionLight : Container
         {
             private Color4 glowingColour, idleColour;

From c12c09ec4d497ad7e52a3c4b625e3793dc23d8a1 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 11 Feb 2021 09:57:14 +0900
Subject: [PATCH 08097/10326] Move logic to LoadComplete instead

---
 osu.Game/Overlays/OSD/TrackedSettingToast.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/OSD/TrackedSettingToast.cs b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
index c5a289a85c..d61180baa2 100644
--- a/osu.Game/Overlays/OSD/TrackedSettingToast.cs
+++ b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
@@ -28,8 +28,6 @@ namespace osu.Game.Overlays.OSD
         private SampleChannel sampleOff;
         private SampleChannel sampleChange;
 
-        private bool playedSample;
-
         public TrackedSettingToast(SettingDescription description)
             : base(description.Name, description.Value, description.Shortcut)
         {
@@ -77,11 +75,9 @@ namespace osu.Game.Overlays.OSD
                 optionLights.Add(new OptionLight { Glowing = i == selectedOption });
         }
 
-        protected override void Update()
+        protected override void LoadComplete()
         {
-            base.Update();
-
-            if (playedSample) return;
+            base.LoadComplete();
 
             if (optionCount == 1)
             {
@@ -97,8 +93,6 @@ namespace osu.Game.Overlays.OSD
                 sampleChange.Frequency.Value = 1 + (double)selectedOption / (optionCount - 1) * 0.25f;
                 sampleChange.Play();
             }
-
-            playedSample = true;
         }
 
         [BackgroundDependencyLoader]

From a1ae739a6235f72995ec460d93874eac2a504aa6 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 15:21:50 +0900
Subject: [PATCH 08098/10326] Add support for Notification sounds

---
 .../Overlays/Notifications/Notification.cs    | 24 ++++++++++++++++++-
 .../Notifications/NotificationSection.cs      |  7 +++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 2dc6b39a92..86e409d0f6 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -3,6 +3,8 @@
 
 using System;
 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.Colour;
@@ -40,6 +42,11 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public virtual bool DisplayOnTop => true;
 
+        private SampleChannel samplePopIn;
+        private SampleChannel samplePopOut;
+        protected virtual string PopInSampleName => "UI/notification-pop-in";
+        protected virtual string PopOutSampleName => "UI/overlay-pop-out"; // TODO: replace with a unique sample?
+
         protected NotificationLight Light;
         private readonly CloseButton closeButton;
         protected Container IconContent;
@@ -120,6 +127,13 @@ namespace osu.Game.Overlays.Notifications
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            samplePopIn = audio.Samples.Get(PopInSampleName);
+            samplePopOut = audio.Samples.Get(PopOutSampleName);
+        }
+
         protected override bool OnHover(HoverEvent e)
         {
             closeButton.FadeIn(75);
@@ -143,6 +157,9 @@ namespace osu.Game.Overlays.Notifications
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
+            samplePopIn?.Play();
+
             this.FadeInFromZero(200);
             NotificationContent.MoveToX(DrawSize.X);
             NotificationContent.MoveToX(0, 500, Easing.OutQuint);
@@ -150,12 +167,17 @@ namespace osu.Game.Overlays.Notifications
 
         public bool WasClosed;
 
-        public virtual void Close()
+        public virtual void Close() => Close(true);
+
+        public virtual void Close(bool playSound)
         {
             if (WasClosed) return;
 
             WasClosed = true;
 
+            if (playSound)
+                samplePopOut?.Play();
+
             Closed?.Invoke();
             this.FadeOut(100);
             Expire();
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index c2a958b65e..c8cee22370 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -109,7 +109,12 @@ namespace osu.Game.Overlays.Notifications
 
         private void clearAll()
         {
-            notifications.Children.ForEach(c => c.Close());
+            bool playSound = true;
+            notifications.Children.ForEach(c =>
+            {
+                c.Close(playSound);
+                playSound = false;
+            });
         }
 
         protected override void Update()

From 2ee634d173647a97fa9e5ef40bfe1e262920162b Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 21 Jan 2021 18:42:53 +0900
Subject: [PATCH 08099/10326] Create subclass for "Error" notifications to
 allow them to have a unique pop-in sound

---
 .../TestSceneNotificationOverlay.cs           | 20 ++++++++++++++++++-
 osu.Game/OsuGame.cs                           |  2 +-
 .../Notifications/SimpleErrorNotification.cs  | 17 ++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Overlays/Notifications/SimpleErrorNotification.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 43ba23e6c6..d0f6f3fe47 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -105,6 +105,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             checkDisplayedCount(3);
         }
 
+        [Test]
+        public void TestError()
+        {
+            setState(Visibility.Visible);
+            AddStep(@"error #1", sendErrorNotification);
+            AddAssert("Is visible", () => notificationOverlay.State.Value == Visibility.Visible);
+            checkDisplayedCount(1);
+        }
+
         [Test]
         public void TestSpam()
         {
@@ -179,7 +188,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void sendBarrage()
         {
-            switch (RNG.Next(0, 4))
+            switch (RNG.Next(0, 5))
             {
                 case 0:
                     sendHelloNotification();
@@ -196,6 +205,10 @@ namespace osu.Game.Tests.Visual.UserInterface
                 case 3:
                     sendDownloadProgress();
                     break;
+
+                case 4:
+                    sendErrorNotification();
+                    break;
             }
         }
 
@@ -214,6 +227,11 @@ namespace osu.Game.Tests.Visual.UserInterface
             notificationOverlay.Post(new BackgroundNotification { Text = @"Welcome to osu!. Enjoy your stay!" });
         }
 
+        private void sendErrorNotification()
+        {
+            notificationOverlay.Post(new SimpleErrorNotification { Text = @"Rut roh!. Something went wrong!" });
+        }
+
         private void sendManyNotifications()
         {
             for (int i = 0; i < 10; i++)
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1a1f7bd233..0dc63dcd4b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -778,7 +778,7 @@ namespace osu.Game
 
                 if (recentLogCount < short_term_display_limit)
                 {
-                    Schedule(() => notifications.Post(new SimpleNotification
+                    Schedule(() => notifications.Post(new SimpleErrorNotification
                     {
                         Icon = entry.Level == LogLevel.Important ? FontAwesome.Solid.ExclamationCircle : FontAwesome.Solid.Bomb,
                         Text = entry.Message.Truncate(256) + (entry.Exception != null && IsDeployedBuild ? "\n\nThis error has been automatically reported to the devs." : string.Empty),
diff --git a/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs b/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
new file mode 100644
index 0000000000..13c9c5a02d
--- /dev/null
+++ b/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Sprites;
+
+namespace osu.Game.Overlays.Notifications
+{
+    public class SimpleErrorNotification : SimpleNotification
+    {
+        protected override string PopInSampleName => "UI/error-notification-pop-in";
+
+        public SimpleErrorNotification()
+        {
+            Icon = FontAwesome.Solid.Bomb;
+        }
+    }
+}

From 72562070bcea0718bd6ddce220e354d934b6a987 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 14:18:00 +0900
Subject: [PATCH 08100/10326] Remove second overload of Close (makes the call
 structure hard to follow / invoke correctly)

---
 osu.Game/Overlays/Notifications/Notification.cs         | 6 ++----
 osu.Game/Overlays/Notifications/ProgressNotification.cs | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 86e409d0f6..daf931bc24 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Overlays.Notifications
                         closeButton = new CloseButton
                         {
                             Alpha = 0,
-                            Action = Close,
+                            Action = () => Close(),
                             Anchor = Anchor.CentreRight,
                             Origin = Anchor.CentreRight,
                             Margin = new MarginPadding
@@ -167,9 +167,7 @@ namespace osu.Game.Overlays.Notifications
 
         public bool WasClosed;
 
-        public virtual void Close() => Close(true);
-
-        public virtual void Close(bool playSound)
+        public virtual void Close(bool playSound = true)
         {
             if (WasClosed) return;
 
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 3105ecd742..703c14af2b 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -150,12 +150,12 @@ namespace osu.Game.Overlays.Notifications
             colourCancelled = colours.Red;
         }
 
-        public override void Close()
+        public override void Close(bool playSound = true)
         {
             switch (State)
             {
                 case ProgressNotificationState.Cancelled:
-                    base.Close();
+                    base.Close(playSound);
                     break;
 
                 case ProgressNotificationState.Active:

From 896f318b56866306e455d92c4443c252723d75f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 14:18:40 +0900
Subject: [PATCH 08101/10326] Rename variable for clarity

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

diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index c8cee22370..38ba712254 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -109,11 +109,11 @@ namespace osu.Game.Overlays.Notifications
 
         private void clearAll()
         {
-            bool playSound = true;
+            bool first = true;
             notifications.Children.ForEach(c =>
             {
-                c.Close(playSound);
-                playSound = false;
+                c.Close(first);
+                first = false;
             });
         }
 

From 800f12a358b234f7d3409e843c5b913cc563f4b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 14:19:48 +0900
Subject: [PATCH 08102/10326] 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 7060e88026..a522a5f43d 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.1202.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.128.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f866b232d8..f69613cfd3 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.0" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 22d104f2e1..1c602e1584 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.128.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From c8899aff92f793ee03bf61ab026263d2e6bd4dd6 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 11 Feb 2021 14:36:41 +0900
Subject: [PATCH 08103/10326] Prevent the default on-click sample from playing
 for OsuCheckbox

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

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index f6effa0834..0d00bc0dce 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Graphics.UserInterface
                     RelativeSizeAxes = Axes.X,
                 },
                 Nub = new Nub(),
-                new HoverClickSounds()
+                new HoverSounds()
             };
 
             if (nubOnRight)

From f21a3c0c48abe02b8b949bd0881dfe02f5a143cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 14:50:55 +0900
Subject: [PATCH 08104/10326] Decrease the game-wide track playback volume to
 give samples some head-room

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1a1f7bd233..b77097a3f0 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -174,6 +174,8 @@ namespace osu.Game
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
+        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(0.5f);
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -230,6 +232,11 @@ namespace osu.Game
 
             Audio.AddAdjustment(AdjustableProperty.Volume, inactiveVolumeFade);
 
+            // drop track volume game-wide to leave some head-room for UI effects / samples.
+            // this means that for the time being, gameplay sample playback is louder relative to the audio track, compared to stable.
+            // we may want to revisit this if users notice or complain about the difference (consider this a bit of a trial).
+            Audio.Tracks.AddAdjustment(AdjustableProperty.Volume, globalTrackVolumeAdjust);
+
             SelectedMods.BindValueChanged(modsChanged);
             Beatmap.BindValueChanged(beatmapChanged, true);
         }

From eaa7b4cb93cdad7a27bc8958cacd860a7f2e3b10 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 14:54:50 +0900
Subject: [PATCH 08105/10326] Rename second usage variable name to match

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 4a03c5e614..ab4f3f4796 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -82,15 +82,15 @@ namespace osu.Game.Screens.Select.Details
             mods.BindValueChanged(modsChanged, true);
         }
 
-        private ModSettingChangeTracker settingChangeTracker;
+        private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedStatisticsUpdate;
 
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
-            settingChangeTracker?.Dispose();
+            modSettingChangeTracker?.Dispose();
 
-            settingChangeTracker = new ModSettingChangeTracker(mods.NewValue);
-            settingChangeTracker.SettingChanged += m =>
+            modSettingChangeTracker = new ModSettingChangeTracker(mods.NewValue);
+            modSettingChangeTracker.SettingChanged += m =>
             {
                 if (!(m is IApplicableToDifficulty))
                     return;
@@ -162,7 +162,7 @@ namespace osu.Game.Screens.Select.Details
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            settingChangeTracker?.Dispose();
+            modSettingChangeTracker?.Dispose();
             starDifficultyCancellationSource?.Cancel();
         }
 

From df7aaa5c816e6064920c32028bb3689e31174c81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 15:02:34 +0900
Subject: [PATCH 08106/10326] Move implementation to OsuGameBase to ensure it
 applies to test scenes

This also removed a previous attempt at the same thing, which happened
to not be applying due to the reference to the applied bindable not
being held. Whoops.
---
 osu.Game/OsuGame.cs     | 7 -------
 osu.Game/OsuGameBase.cs | 9 ++++++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index b77097a3f0..1a1f7bd233 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -174,8 +174,6 @@ namespace osu.Game
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(0.5f);
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -232,11 +230,6 @@ namespace osu.Game
 
             Audio.AddAdjustment(AdjustableProperty.Volume, inactiveVolumeFade);
 
-            // drop track volume game-wide to leave some head-room for UI effects / samples.
-            // this means that for the time being, gameplay sample playback is louder relative to the audio track, compared to stable.
-            // we may want to revisit this if users notice or complain about the difference (consider this a bit of a trial).
-            Audio.Tracks.AddAdjustment(AdjustableProperty.Volume, globalTrackVolumeAdjust);
-
             SelectedMods.BindValueChanged(modsChanged);
             Beatmap.BindValueChanged(beatmapChanged, true);
         }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d3936ed27e..a1b66ba9c0 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -155,6 +155,8 @@ namespace osu.Game
 
         protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
 
+        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(0.5f);
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -278,9 +280,10 @@ namespace osu.Game
             RegisterImportHandler(ScoreManager);
             RegisterImportHandler(SkinManager);
 
-            // tracks play so loud our samples can't keep up.
-            // this adds a global reduction of track volume for the time being.
-            Audio.Tracks.AddAdjustment(AdjustableProperty.Volume, new BindableDouble(0.8));
+            // drop track volume game-wide to leave some head-room for UI effects / samples.
+            // this means that for the time being, gameplay sample playback is louder relative to the audio track, compared to stable.
+            // we may want to revisit this if users notice or complain about the difference (consider this a bit of a trial).
+            Audio.Tracks.AddAdjustment(AdjustableProperty.Volume, globalTrackVolumeAdjust);
 
             Beatmap = new NonNullableBindable<WorkingBeatmap>(defaultBeatmap);
 

From 21f66a19fd21c492f8340cc70ef2934ff1d1033e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 15:55:08 +0900
Subject: [PATCH 08107/10326] Make server authoritative in which mods the
 client should be using when gameplay starts

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  8 +++---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index f3972ab7f9..6d06e638c8 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
 
-            UserMods.BindValueChanged(_ => updateMods());
+            UserMods.BindValueChanged(_ => UpdateMods());
         }
 
         public override void OnEntering(IScreen last)
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             base.OnResuming(last);
             beginHandlingTrack();
-            updateMods();
+            UpdateMods();
         }
 
         public override bool OnExiting(IScreen next)
@@ -128,7 +128,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
                                      .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
                                      .ToList();
 
-            updateMods();
+            UpdateMods();
 
             Ruleset.Value = SelectedItem.Value.Ruleset.Value;
         }
@@ -145,7 +145,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
-        private void updateMods()
+        protected virtual void UpdateMods()
         {
             if (SelectedItem.Value == null)
                 return;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 5f2f1366f7..3dff291858 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -271,6 +271,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             UserMods.BindValueChanged(onUserModsChanged);
 
             client.LoadRequested += onLoadRequested;
+            client.RoomUpdated += onRoomUpdated;
 
             isConnected = client.IsConnected.GetBoundCopy();
             isConnected.BindValueChanged(connected =>
@@ -367,6 +368,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
+        private void onRoomUpdated()
+        {
+            UpdateMods(); // user mods may have changed.
+        }
+
+        protected override void UpdateMods()
+        {
+            if (SelectedItem.Value == null || client.LocalUser == null)
+                return;
+
+            // update local mods based on room's reported status for the local user (omitting the base call implementation).
+            // this makes the server authoritative, and avoids the local user potentially settings mods that the server is not aware of (ie. if the match was started during the selection being changed).
+            var localUserMods = client.LocalUser.Mods.ToList();
+
+            Schedule(() =>
+            {
+                var ruleset = Ruleset.Value.CreateInstance();
+                Mods.Value = localUserMods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
+            });
+        }
+
         private void onLoadRequested()
         {
             Debug.Assert(client.Room != null);
@@ -384,7 +406,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.Dispose(isDisposing);
 
             if (client != null)
+            {
+                client.RoomUpdated -= onRoomUpdated;
                 client.LoadRequested -= onLoadRequested;
+            }
         }
 
         private class UserModSelectOverlay : LocalPlayerModSelectOverlay

From 549e7520c520cb9b9e45773ad41a5d25b0d2fc7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 16:00:26 +0900
Subject: [PATCH 08108/10326] Move scheduler logic to client callback rather
 than inside the update method

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 3dff291858..1599936a51 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -281,6 +281,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }, true);
         }
 
+        protected override void UpdateMods()
+        {
+            if (SelectedItem.Value == null || client.LocalUser == null)
+                return;
+
+            // update local mods based on room's reported status for the local user (omitting the base call implementation).
+            // this makes the server authoritative, and avoids the local user potentially settings mods that the server is not aware of (ie. if the match was started during the selection being changed).
+            var ruleset = Ruleset.Value.CreateInstance();
+            Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
+        }
+
         public override bool OnBackButton()
         {
             if (client.Room != null && settingsOverlay.State.Value == Visibility.Visible)
@@ -370,23 +381,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onRoomUpdated()
         {
-            UpdateMods(); // user mods may have changed.
-        }
-
-        protected override void UpdateMods()
-        {
-            if (SelectedItem.Value == null || client.LocalUser == null)
-                return;
-
-            // update local mods based on room's reported status for the local user (omitting the base call implementation).
-            // this makes the server authoritative, and avoids the local user potentially settings mods that the server is not aware of (ie. if the match was started during the selection being changed).
-            var localUserMods = client.LocalUser.Mods.ToList();
-
-            Schedule(() =>
-            {
-                var ruleset = Ruleset.Value.CreateInstance();
-                Mods.Value = localUserMods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
-            });
+            // user mods may have changed.
+            Scheduler.AddOnce(UpdateMods);
         }
 
         private void onLoadRequested()

From 889a99c49cd153b67e8ad7bc04b77517fbd90ef4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 16:00:35 +0900
Subject: [PATCH 08109/10326] Use AddOnce everywhere to reduce potential call
 count

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 6d06e638c8..3668743720 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
 
-            UserMods.BindValueChanged(_ => UpdateMods());
+            UserMods.BindValueChanged(_ => Scheduler.AddOnce(UpdateMods));
         }
 
         public override void OnEntering(IScreen last)
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             base.OnResuming(last);
             beginHandlingTrack();
-            UpdateMods();
+            Scheduler.AddOnce(UpdateMods);
         }
 
         public override bool OnExiting(IScreen next)

From dddd776802ad1f77f085c9862c317f93a3d1b191 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 16:38:17 +0900
Subject: [PATCH 08110/10326] Add the ability for settings items to have
 tooltips

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 6 ++++++
 osu.Game/Overlays/Settings/SettingsItem.cs       | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 50069be4b2..70d67aaaa0 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -57,6 +57,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<float>
                         {
                             LabelText = attr.Label,
+                            TooltipText = attr.Description,
                             Current = bNumber,
                             KeyboardStep = 0.1f,
                         };
@@ -67,6 +68,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<double>
                         {
                             LabelText = attr.Label,
+                            TooltipText = attr.Description,
                             Current = bNumber,
                             KeyboardStep = 0.1f,
                         };
@@ -77,6 +79,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<int>
                         {
                             LabelText = attr.Label,
+                            TooltipText = attr.Description,
                             Current = bNumber
                         };
 
@@ -86,6 +89,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsCheckbox
                         {
                             LabelText = attr.Label,
+                            TooltipText = attr.Description,
                             Current = bBool
                         };
 
@@ -95,6 +99,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsTextBox
                         {
                             LabelText = attr.Label,
+                            TooltipText = attr.Description,
                             Current = bString
                         };
 
@@ -105,6 +110,7 @@ namespace osu.Game.Configuration
                         var dropdown = (Drawable)Activator.CreateInstance(dropdownType);
 
                         dropdownType.GetProperty(nameof(SettingsDropdown<object>.LabelText))?.SetValue(dropdown, attr.Label);
+                        dropdownType.GetProperty(nameof(SettingsDropdown<object>.TooltipText))?.SetValue(dropdown, attr.Description);
                         dropdownType.GetProperty(nameof(SettingsDropdown<object>.Current))?.SetValue(dropdown, bindable);
 
                         yield return dropdown;
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 278479e04f..27232d0a49 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -21,7 +21,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Settings
 {
-    public abstract class SettingsItem<T> : Container, IFilterable, ISettingsItem, IHasCurrentValue<T>
+    public abstract class SettingsItem<T> : Container, IFilterable, ISettingsItem, IHasCurrentValue<T>, IHasTooltip
     {
         protected abstract Drawable CreateControl();
 
@@ -214,5 +214,7 @@ namespace osu.Game.Overlays.Settings
                 this.FadeColour(bindable.Disabled ? Color4.Gray : buttonColour, 200, Easing.OutQuint);
             }
         }
+
+        public string TooltipText { get; set; }
     }
 }

From 9fb41dc0b6f416e2232cffbeb576f0d9cdcf5955 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 16:41:21 +0900
Subject: [PATCH 08111/10326] Move property to a better place in the class

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

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 27232d0a49..af225889da 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Overlays.Settings
 
         public bool ShowsDefaultIndicator = true;
 
+        public string TooltipText { get; set; }
+
         public virtual string LabelText
         {
             get => labelText?.Text ?? string.Empty;
@@ -214,7 +216,5 @@ namespace osu.Game.Overlays.Settings
                 this.FadeColour(bindable.Disabled ? Color4.Gray : buttonColour, 200, Easing.OutQuint);
             }
         }
-
-        public string TooltipText { get; set; }
     }
 }

From 5fb99fdc52e12845dadc48a57f043e0da4696bbd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Feb 2021 10:49:16 +0300
Subject: [PATCH 08112/10326] Rename some members and extract connection
 closure to separate method

---
 osu.Game/Online/HubClientConnector.cs         | 35 ++++++++++---------
 .../Online/Multiplayer/MultiplayerClient.cs   |  2 +-
 .../Spectator/SpectatorStreamingClient.cs     |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index b740aabb92..65285882d9 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Online
         /// <summary>
         /// Invoked whenever a new hub connection is built.
         /// </summary>
-        public Action<HubConnection>? OnNewConnection;
+        public Action<HubConnection>? ConfigureConnection;
 
         private readonly string clientName;
         private readonly string endpoint;
@@ -106,7 +106,7 @@ namespace osu.Game.Online
                     try
                     {
                         // importantly, rebuild the connection each attempt to get an updated access token.
-                        CurrentConnection = createConnection(cancellationToken);
+                        CurrentConnection = buildConnection(cancellationToken);
 
                         await CurrentConnection.StartAsync(cancellationToken);
 
@@ -134,7 +134,7 @@ namespace osu.Game.Online
             }
         }
 
-        private HubConnection createConnection(CancellationToken cancellationToken)
+        private HubConnection buildConnection(CancellationToken cancellationToken)
         {
             Debug.Assert(api != null);
 
@@ -152,24 +152,25 @@ namespace osu.Game.Online
 
             var newConnection = builder.Build();
 
-            OnNewConnection?.Invoke(newConnection);
-
-            newConnection.Closed += ex =>
-            {
-                isConnected.Value = false;
-
-                Logger.Log(ex != null ? $"{clientName} lost connection: {ex}" : $"{clientName} disconnected", LoggingTarget.Network);
-
-                // make sure a disconnect wasn't triggered (and this is still the active connection).
-                if (!cancellationToken.IsCancellationRequested)
-                    Task.Run(connect, default);
-
-                return Task.CompletedTask;
-            };
+            ConfigureConnection?.Invoke(newConnection);
 
+            newConnection.Closed += ex => onConnectionClosed(ex, cancellationToken);
             return newConnection;
         }
 
+        private Task onConnectionClosed(Exception? ex, CancellationToken cancellationToken)
+        {
+            isConnected.Value = false;
+
+            Logger.Log(ex != null ? $"{clientName} lost connection: {ex}" : $"{clientName} disconnected", LoggingTarget.Network);
+
+            // make sure a disconnect wasn't triggered (and this is still the active connection).
+            if (!cancellationToken.IsCancellationRequested)
+                Task.Run(connect, default);
+
+            return Task.CompletedTask;
+        }
+
         private async Task disconnect(bool takeLock)
         {
             cancelExistingConnect();
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index f025a5b429..ba2a8d7246 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Online.Multiplayer
         {
             connector = new HubClientConnector(nameof(MultiplayerClient), endpoint, api)
             {
-                OnNewConnection = connection =>
+                ConfigureConnection = connection =>
                 {
                     // this is kind of SILLY
                     // https://github.com/dotnet/aspnetcore/issues/15198
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 4ef59b5e47..532f717f2c 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Online.Spectator
         private void load(IAPIProvider api)
         {
             connector = CreateConnector(nameof(SpectatorStreamingClient), endpoint, api);
-            connector.OnNewConnection = connection =>
+            connector.ConfigureConnection = connection =>
             {
                 // until strong typed client support is added, each method must be manually bound
                 // (see https://github.com/dotnet/aspnetcore/issues/15198)

From 18acd7f08032369f3c87d2327a3e1197b3c09d76 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Feb 2021 10:51:04 +0300
Subject: [PATCH 08113/10326] Apply documentation suggestions

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Online/HubClientConnector.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 65285882d9..71d9df84c4 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -18,7 +18,7 @@ using osu.Game.Online.API;
 namespace osu.Game.Online
 {
     /// <summary>
-    /// A component that maintains over a hub connection between client and server.
+    /// A component that manages the life cycle of a connection to a SignalR Hub.
     /// </summary>
     public class HubClientConnector : IDisposable
     {
@@ -52,7 +52,7 @@ namespace osu.Game.Online
         /// </summary>
         /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
         /// <param name="endpoint">The endpoint to the hub.</param>
-        /// <param name="api">The API provider for listening to state changes, or null to not listen.</param>
+        /// <param name="api"> An API provider used to react to connection state changes, or null to not establish connection at all (for testing purposes).</param>
         public HubClientConnector(string clientName, string endpoint, IAPIProvider? api)
         {
             this.clientName = clientName;

From db79080bc4deebef8277866157d3067b024ee533 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 17:14:49 +0900
Subject: [PATCH 08114/10326] Fix GetNodeSamples potentially returning a live
 reference and overwriting existing samples

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 1670df24a8..6fb36e80bc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -140,7 +140,8 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             // The samples should be attached to the slider tail, however this can only be done after LegacyLastTick is removed otherwise they would play earlier than they're intended to.
             // For now, the samples are attached to and played by the slider itself at the correct end time.
-            Samples = this.GetNodeSamples(repeatCount + 1);
+            // ToArray call is required as GetNodeSamples may fallback to Samples itself (without it it will get cleared due to the list reference being live).
+            Samples = this.GetNodeSamples(repeatCount + 1).ToArray();
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)

From e9730d4782e9e8716d61bcf3b7e91c5cb2d1573d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 17:16:17 +0900
Subject: [PATCH 08115/10326] Move default sample addition to inside
 PlacementBlueprint

This isn't actually required to fix the behaviour but it does feel like
a better place to put this logic.
---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs                  | 4 ++++
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs      | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index c0eb891f5e..bfff93e7c5 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
@@ -45,6 +46,9 @@ namespace osu.Game.Rulesets.Edit
         {
             HitObject = hitObject;
 
+            // adding the default hit sample should be the case regardless of the ruleset.
+            HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_NORMAL));
+
             RelativeSizeAxes = Axes.Both;
 
             // This is required to allow the blueprint's position to be updated via OnMouseMove/Handle
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index c09b935f28..79f457c050 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -211,9 +211,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (blueprint != null)
             {
-                // doing this post-creations as adding the default hit sample should be the case regardless of the ruleset.
-                blueprint.HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_NORMAL));
-
                 placementBlueprintContainer.Child = currentPlacement = blueprint;
 
                 // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame

From f84ea3063768bac3d8850c62f187f681ece7bbba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 17:47:29 +0900
Subject: [PATCH 08116/10326] Expose Mods in DrawableRuleset to avoid using
 external DI

---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs | 3 +--
 osu.Game/Rulesets/Mods/ModAutoplay.cs         | 3 +--
 osu.Game/Rulesets/Mods/ModCinema.cs           | 4 +---
 osu.Game/Rulesets/UI/DrawableRuleset.cs       | 4 ++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 59a5295858..77de0cb45b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -62,8 +62,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             inputManager.AllowUserCursorMovement = false;
 
             // Generate the replay frames the cursor should follow
-            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
-            replayFrames = new OsuAutoGenerator(drawableRuleset.Beatmap, mods).Generate().Frames.Cast<OsuReplayFrame>().ToList();
+            replayFrames = new OsuAutoGenerator(drawableRuleset.Beatmap, drawableRuleset.Mods).Generate().Frames.Cast<OsuReplayFrame>().ToList();
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index 748c7272f4..d1d23def67 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -18,8 +18,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
         {
-            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
-            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, mods));
+            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, drawableRuleset.Mods));
         }
     }
 
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index 16e6400f23..eb0473016a 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.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 osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;
@@ -15,8 +14,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
         {
-            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
-            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, mods));
+            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, drawableRuleset.Mods));
 
             // AlwaysPresent required for hitsounds
             drawableRuleset.Playfield.AlwaysPresent = true;
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 6940e43e5b..ca27e6b21a 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.UI
         protected IRulesetConfigManager Config { get; private set; }
 
         [Cached(typeof(IReadOnlyList<Mod>))]
-        protected override IReadOnlyList<Mod> Mods { get; }
+        public sealed override IReadOnlyList<Mod> Mods { get; }
 
         private FrameStabilityContainer frameStabilityContainer;
 
@@ -434,7 +434,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// The mods which are to be applied.
         /// </summary>
-        protected abstract IReadOnlyList<Mod> Mods { get; }
+        public abstract IReadOnlyList<Mod> Mods { get; }
 
         /// <summary>~
         /// The associated ruleset.

From ffd3caacb5167bf10d49587ef15cde22ae5896f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 17:57:50 +0900
Subject: [PATCH 08117/10326] 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 a522a5f43d..d88a11257d 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="2021.211.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.128.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f69613cfd3..d68a8a515c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 1c602e1584..87ebd41fee 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.128.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From d3c1b475929227b761731ab2c0f7b5c0a1ae54cd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Feb 2021 12:32:54 +0300
Subject: [PATCH 08118/10326] Replace nullable API with null connector instead

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  6 +-
 ...TestSceneMultiplayerGameplayLeaderboard.cs |  6 +-
 osu.Game/Online/HubClientConnector.cs         | 36 +++++-----
 .../Spectator/SpectatorStreamingClient.cs     | 67 ++++++++++---------
 4 files changed, 53 insertions(+), 62 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 1e499f20cb..36e7e1fb29 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -244,11 +244,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api)
-            {
-                // do not pass API to prevent attempting failing connections on an actual hub.
-                return base.CreateConnector(name, endpoint, null);
-            }
+            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => null;
 
             public void StartPlay(int beatmapId)
             {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index b459cebdd7..49abd62dba 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -106,11 +106,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 this.totalUsers = totalUsers;
             }
 
-            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api)
-            {
-                // do not pass API to prevent attempting failing connections on an actual hub.
-                return base.CreateConnector(name, endpoint, null);
-            }
+            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => null;
 
             public void Start(int beatmapId)
             {
diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 71d9df84c4..cfc4ff5d60 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Online
 
         private readonly string clientName;
         private readonly string endpoint;
-        private readonly IAPIProvider? api;
+        private readonly IAPIProvider api;
 
         /// <summary>
         /// The current connection opened by this connector.
@@ -52,32 +52,28 @@ namespace osu.Game.Online
         /// </summary>
         /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
         /// <param name="endpoint">The endpoint to the hub.</param>
-        /// <param name="api"> An API provider used to react to connection state changes, or null to not establish connection at all (for testing purposes).</param>
-        public HubClientConnector(string clientName, string endpoint, IAPIProvider? api)
+        /// <param name="api"> An API provider used to react to connection state changes.</param>
+        public HubClientConnector(string clientName, string endpoint, IAPIProvider api)
         {
             this.clientName = clientName;
             this.endpoint = endpoint;
-
             this.api = api;
 
-            if (api != null)
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(state =>
             {
-                apiState.BindTo(api.State);
-                apiState.BindValueChanged(state =>
+                switch (state.NewValue)
                 {
-                    switch (state.NewValue)
-                    {
-                        case APIState.Failing:
-                        case APIState.Offline:
-                            Task.Run(() => disconnect(true));
-                            break;
+                    case APIState.Failing:
+                    case APIState.Offline:
+                        Task.Run(() => disconnect(true));
+                        break;
 
-                        case APIState.Online:
-                            Task.Run(connect);
-                            break;
-                    }
-                }, true);
-            }
+                    case APIState.Online:
+                        Task.Run(connect);
+                        break;
+                }
+            }, true);
         }
 
         private async Task connect()
@@ -136,8 +132,6 @@ namespace osu.Game.Online
 
         private HubConnection buildConnection(CancellationToken cancellationToken)
         {
-            Debug.Assert(api != null);
-
             var builder = new HubConnectionBuilder()
                 .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
 
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 532f717f2c..7e61da9b87 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -32,11 +32,12 @@ namespace osu.Game.Online.Spectator
 
         private readonly string endpoint;
 
+        [CanBeNull]
         private HubClientConnector connector;
 
         private readonly IBindable<bool> isConnected = new BindableBool();
 
-        private HubConnection connection => connector.CurrentConnection;
+        private HubConnection connection => connector?.CurrentConnection;
 
         private readonly List<int> watchingUsers = new List<int>();
 
@@ -86,42 +87,46 @@ namespace osu.Game.Online.Spectator
         private void load(IAPIProvider api)
         {
             connector = CreateConnector(nameof(SpectatorStreamingClient), endpoint, api);
-            connector.ConfigureConnection = connection =>
-            {
-                // until strong typed client support is added, each method must be manually bound
-                // (see https://github.com/dotnet/aspnetcore/issues/15198)
-                connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
-                connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
-                connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
-            };
 
-            isConnected.BindTo(connector.IsConnected);
-            isConnected.BindValueChanged(connected =>
+            if (connector != null)
             {
-                if (connected.NewValue)
+                connector.ConfigureConnection = connection =>
                 {
-                    // get all the users that were previously being watched
-                    int[] users;
+                    // until strong typed client support is added, each method must be manually bound
+                    // (see https://github.com/dotnet/aspnetcore/issues/15198)
+                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
+                    connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
+                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+                };
 
-                    lock (userLock)
+                isConnected.BindTo(connector.IsConnected);
+                isConnected.BindValueChanged(connected =>
+                {
+                    if (connected.NewValue)
                     {
-                        users = watchingUsers.ToArray();
-                        watchingUsers.Clear();
+                        // get all the users that were previously being watched
+                        int[] users;
+
+                        lock (userLock)
+                        {
+                            users = watchingUsers.ToArray();
+                            watchingUsers.Clear();
+                        }
+
+                        // resubscribe to watched users.
+                        foreach (var userId in users)
+                            WatchUser(userId);
+
+                        // re-send state in case it wasn't received
+                        if (isPlaying)
+                            beginPlaying();
                     }
-
-                    // resubscribe to watched users.
-                    foreach (var userId in users)
-                        WatchUser(userId);
-
-                    // re-send state in case it wasn't received
-                    if (isPlaying)
-                        beginPlaying();
-                }
-                else
-                {
-                    playingUsers.Clear();
-                }
-            }, true);
+                    else
+                    {
+                        playingUsers.Clear();
+                    }
+                }, true);
+            }
         }
 
         protected virtual HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => new HubClientConnector(name, endpoint, api);

From 37e3d95c35a67f24f66302977bb31f0906e6babc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Feb 2021 12:39:06 +0300
Subject: [PATCH 08119/10326] Slight reword in `ConfigureConnection`'s xmldoc

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

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index cfc4ff5d60..fb76049446 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Online
     public class HubClientConnector : IDisposable
     {
         /// <summary>
-        /// Invoked whenever a new hub connection is built.
+        /// Invoked whenever a new hub connection is built, to configure it before it's started.
         /// </summary>
         public Action<HubConnection>? ConfigureConnection;
 

From f4a7ec57e982922928ed3f327c61b228457135cc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Feb 2021 13:00:18 +0300
Subject: [PATCH 08120/10326] Remove unused using

---
 osu.Game/Online/HubClientConnector.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index fb76049446..2298ac4243 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -4,7 +4,6 @@
 #nullable enable
 
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;

From 970039b7e3ff29804999cc0f28633bb308db0eee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 12:14:49 +0900
Subject: [PATCH 08121/10326] Split out hover sample debounce logic so it can
 be more easily used in other places

---
 .../HoverSampleDebounceComponent.cs           | 46 +++++++++++++++++++
 .../Graphics/UserInterface/HoverSounds.cs     | 32 ++-----------
 2 files changed, 50 insertions(+), 28 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs

diff --git a/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs b/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs
new file mode 100644
index 0000000000..f0c7c20fe8
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.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.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osu.Game.Configuration;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    /// <summary>
+    /// Handles debouncing hover sounds at a global level to ensure the effects are not overwhelming.
+    /// </summary>
+    public abstract class HoverSampleDebounceComponent : CompositeDrawable
+    {
+        /// <summary>
+        /// Length of debounce for hover sound playback, in milliseconds.
+        /// </summary>
+        public double HoverDebounceTime { get; } = 20;
+
+        private Bindable<double?> lastPlaybackTime;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, SessionStatics statics)
+        {
+            lastPlaybackTime = statics.GetBindable<double?>(Static.LastHoverSoundPlaybackTime);
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
+
+            if (enoughTimePassedSinceLastPlayback)
+            {
+                PlayHoverSample();
+                lastPlaybackTime.Value = Time.Current;
+            }
+
+            return false;
+        }
+
+        public abstract void PlayHoverSample();
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index fa43d4543f..29238377c7 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -5,11 +5,8 @@ using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 using osu.Framework.Utils;
 
@@ -19,19 +16,12 @@ namespace osu.Game.Graphics.UserInterface
     /// Adds hover sounds to a drawable.
     /// Does not draw anything.
     /// </summary>
-    public class HoverSounds : CompositeDrawable
+    public class HoverSounds : HoverSampleDebounceComponent
     {
         private SampleChannel sampleHover;
 
-        /// <summary>
-        /// Length of debounce for hover sound playback, in milliseconds.
-        /// </summary>
-        public double HoverDebounceTime { get; } = 20;
-
         protected readonly HoverSampleSet SampleSet;
 
-        private Bindable<double?> lastPlaybackTime;
-
         public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal)
         {
             SampleSet = sampleSet;
@@ -41,27 +31,13 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SessionStatics statics)
         {
-            lastPlaybackTime = statics.GetBindable<double?>(Static.LastHoverSoundPlaybackTime);
-
             sampleHover = audio.Samples.Get($@"UI/generic-hover{SampleSet.GetDescription()}");
         }
 
-        protected override bool OnHover(HoverEvent e)
+        public override void PlayHoverSample()
         {
-            if (sampleHover == null)
-                return false;
-
-            bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
-
-            if (enoughTimePassedSinceLastPlayback)
-            {
-                sampleHover.Frequency.Value = 0.96 + RNG.NextDouble(0.08);
-                sampleHover.Play();
-
-                lastPlaybackTime.Value = Time.Current;
-            }
-
-            return false;
+            sampleHover.Frequency.Value = 0.96 + RNG.NextDouble(0.08);
+            sampleHover.Play();
         }
     }
 

From cd01591dda9ae57e66eddb0d5a80564a98f7ab20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 12:14:57 +0900
Subject: [PATCH 08122/10326] Consume new debounce logic in carousel header

---
 .../Screens/Select/Carousel/CarouselHeader.cs | 69 +++++++++++--------
 1 file changed, 41 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index 4f53a6e202..90eebfc05b 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
@@ -20,10 +21,6 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselHeader : Container
     {
-        private SampleChannel sampleHover;
-
-        private readonly Box hoverLayer;
-
         public Container BorderContainer;
 
         public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
@@ -44,23 +41,11 @@ namespace osu.Game.Screens.Select.Carousel
                 Children = new Drawable[]
                 {
                     Content,
-                    hoverLayer = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                        Blending = BlendingParameters.Additive,
-                    },
+                    new HoverLayer()
                 }
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuColour colours)
-        {
-            sampleHover = audio.Samples.Get("SongSelect/song-ping");
-            hoverLayer.Colour = colours.Blue.Opacity(0.1f);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -97,22 +82,50 @@ namespace osu.Game.Screens.Select.Carousel
             }
         }
 
-        protected override bool OnHover(HoverEvent e)
+        public class HoverLayer : HoverSampleDebounceComponent
         {
-            if (sampleHover != null)
+            private SampleChannel sampleHover;
+
+            private Box box;
+
+            public HoverLayer()
             {
+                RelativeSizeAxes = Axes.Both;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(AudioManager audio, OsuColour colours)
+            {
+                InternalChild = box = new Box
+                {
+                    Colour = colours.Blue.Opacity(0.1f),
+                    Alpha = 0,
+                    Blending = BlendingParameters.Additive,
+                    RelativeSizeAxes = Axes.Both,
+                };
+
+                sampleHover = audio.Samples.Get("SongSelect/song-ping");
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                box.FadeIn(100, Easing.OutQuint);
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                box.FadeOut(1000, Easing.OutQuint);
+                base.OnHoverLost(e);
+            }
+
+            public override void PlayHoverSample()
+            {
+                if (sampleHover == null) return;
+
                 sampleHover.Frequency.Value = 0.90 + RNG.NextDouble(0.2);
                 sampleHover.Play();
             }
-
-            hoverLayer.FadeIn(100, Easing.OutQuint);
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            hoverLayer.FadeOut(1000, Easing.OutQuint);
-            base.OnHoverLost(e);
         }
     }
 }

From a2035a2e84d6a187331e0c56e2ffa906be673659 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 12:20:39 +0900
Subject: [PATCH 08123/10326] Stop hover sounds from playing when dragging
 (scrolling)

---
 .../Graphics/UserInterface/HoverSampleDebounceComponent.cs    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs b/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs
index f0c7c20fe8..55f43cfe46 100644
--- a/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs
@@ -30,6 +30,10 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override bool OnHover(HoverEvent e)
         {
+            // hover sounds shouldn't be played during scroll operations.
+            if (e.HasAnyButtonPressed)
+                return false;
+
             bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
 
             if (enoughTimePassedSinceLastPlayback)

From 5f23bd725941a94304481d7aa37409162426e8ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 12:48:32 +0900
Subject: [PATCH 08124/10326] Revert most of the changes to ArchiveModeManager
 by using better code

---
 osu.Game/Beatmaps/BeatmapManager.cs      |  8 ++------
 osu.Game/Database/ArchiveModelManager.cs | 26 ++++++++++++++----------
 osu.Game/Scoring/ScoreManager.cs         |  7 +++----
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 4825569ee4..f23e135c68 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -64,13 +64,9 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        protected override bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
+        protected override string ImportFromStablePath => ".";
 
-        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
-        {
-            var songStorage = stableStorage.GetSongStorage();
-            return songStorage.GetDirectories(".").Select(path => songStorage.GetFullPath(path));
-        }
+        protected override Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage.GetSongStorage();
 
         private readonly RulesetStore rulesets;
         private readonly BeatmapStore beatmaps;
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index fd94660a4b..b55020c437 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -637,16 +637,11 @@ namespace osu.Game.Database
         /// </summary>
         protected virtual string ImportFromStablePath => null;
 
-        /// <summary>
-        /// Checks for the existence of an osu-stable directory.
-        /// </summary>
-        protected virtual bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.ExistsDirectory(ImportFromStablePath);
-
         /// <summary>
         /// Select paths to import from stable where all paths should be absolute. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
-        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) => stableStorage.GetDirectories(ImportFromStablePath)
-                                                                                                                .Select(path => stableStorage.GetFullPath(path));
+        protected virtual IEnumerable<string> GetStableImportPaths(Storage storage) => storage.GetDirectories(ImportFromStablePath)
+                                                                                              .Select(path => storage.GetFullPath(path));
 
         /// <summary>
         /// Whether this specified path should be removed after successful import.
@@ -660,24 +655,33 @@ namespace osu.Game.Database
         /// </summary>
         public Task ImportFromStableAsync()
         {
-            var stable = GetStableStorage?.Invoke();
+            var stableStorage = GetStableStorage?.Invoke();
 
-            if (stable == null)
+            if (stableStorage == null)
             {
                 Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
                 return Task.CompletedTask;
             }
 
-            if (!StableDirectoryExists(stable))
+            var storage = PrepareStableStorage(stableStorage);
+
+            if (!storage.ExistsDirectory(ImportFromStablePath))
             {
                 // This handles situations like when the user does not have a Skins folder
                 Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
                 return Task.CompletedTask;
             }
 
-            return Task.Run(async () => await Import(GetStableImportPaths(stable).ToArray()));
+            return Task.Run(async () => await Import(GetStableImportPaths(storage).ToArray()));
         }
 
+        /// <summary>
+        /// Run any required traversal operations on the stable storage location before performing operations.
+        /// </summary>
+        /// <param name="stableStorage">The stable storage.</param>
+        /// <returns>The usable storage. Return the unchanged <paramref name="stableStorage"/> if no traversal is required.</returns>
+        protected virtual Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage;
+
         #endregion
 
         /// <summary>
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 6aa0a30a75..a6beb19876 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -16,7 +16,6 @@ using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Database;
-using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -72,9 +71,9 @@ namespace osu.Game.Scoring
             }
         }
 
-        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
-            => stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
-                            .Select(path => stableStorage.GetFullPath(path));
+        protected override IEnumerable<string> GetStableImportPaths(Storage storage)
+            => storage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
+                      .Select(path => storage.GetFullPath(path));
 
         public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);
 

From 8ab7d07eab83befc7332496d20250fe54bf5ddc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 12:57:57 +0900
Subject: [PATCH 08125/10326] Tidy up config parsing logic

---
 osu.Game/IO/StableStorage.cs | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index ccc6f9c311..d4b0d300ff 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -23,6 +23,7 @@ namespace osu.Game.IO
             : base(path, host)
         {
             this.host = host;
+
             songsPath = new Lazy<string>(locateSongsDirectory);
         }
 
@@ -33,32 +34,29 @@ namespace osu.Game.IO
 
         private string locateSongsDirectory()
         {
-            var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
-
             var configFile = GetFiles(".", $"osu!.{Environment.UserName}.cfg").SingleOrDefault();
 
-            if (configFile == null)
-                return songsDirectoryPath;
-
-            using (var stream = GetStream(configFile))
-            using (var textReader = new StreamReader(stream))
+            if (configFile != null)
             {
-                string line;
-
-                while ((line = textReader.ReadLine()) != null)
+                using (var stream = GetStream(configFile))
+                using (var textReader = new StreamReader(stream))
                 {
-                    if (line.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase))
+                    string line;
+
+                    while ((line = textReader.ReadLine()) != null)
                     {
-                        var directory = line.Split('=')[1].TrimStart();
-                        if (Path.IsPathFullyQualified(directory))
-                            songsDirectoryPath = directory;
+                        if (!line.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase)) continue;
+
+                        var customDirectory = line.Split('=').LastOrDefault()?.Trim();
+                        if (customDirectory != null && Path.IsPathFullyQualified(customDirectory))
+                            return customDirectory;
 
                         break;
                     }
                 }
             }
 
-            return songsDirectoryPath;
+            return GetFullPath(stable_default_songs_path);
         }
     }
 }

From 33c9ecac8a291657d19e4d4ba3cf7c55e15e3a5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 14:54:19 +0900
Subject: [PATCH 08126/10326] Fix MessageFormatter not working for custom
 endpoints

---
 osu.Game/Online/Chat/MessageFormatter.cs | 7 ++++++-
 osu.Game/OsuGameBase.cs                  | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index d2a117876d..8673d73be7 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -49,6 +49,11 @@ namespace osu.Game.Online.Chat
         // Unicode emojis
         private static readonly Regex emoji_regex = new Regex(@"(\uD83D[\uDC00-\uDE4F])");
 
+        /// <summary>
+        /// The root URL for the website, used for chat link matching.
+        /// </summary>
+        public static string WebsiteRootUrl { get; set; } = "https://osu.ppy.sh";
+
         private static void handleMatches(Regex regex, string display, string link, MessageFormatterResult result, int startIndex = 0, LinkAction? linkActionOverride = null, char[] escapeChars = null)
         {
             int captureOffset = 0;
@@ -119,7 +124,7 @@ namespace osu.Game.Online.Chat
                 case "http":
                 case "https":
                     // length > 3 since all these links need another argument to work
-                    if (args.Length > 3 && args[1] == "osu.ppy.sh")
+                    if (args.Length > 3 && url.StartsWith(WebsiteRootUrl, StringComparison.OrdinalIgnoreCase))
                     {
                         switch (args[2])
                         {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index a1b66ba9c0..174b5006a2 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -31,6 +31,7 @@ using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
 using osu.Game.Online;
+using osu.Game.Online.Chat;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
@@ -225,6 +226,8 @@ namespace osu.Game
 
             EndpointConfiguration endpoints = UseDevelopmentServer ? (EndpointConfiguration)new DevelopmentEndpointConfiguration() : new ProductionEndpointConfiguration();
 
+            MessageFormatter.WebsiteRootUrl = endpoints.WebsiteRootUrl;
+
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints));
 
             dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));

From 6a42d312f62fd1ba45b2ffda559fbcb31b075c74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 14:56:46 +0900
Subject: [PATCH 08127/10326] Match using EndsWith to ignore protocol (and
 allow http)

---
 osu.Game/Online/Chat/MessageFormatter.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 8673d73be7..d8e02e5b6d 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -52,7 +52,14 @@ namespace osu.Game.Online.Chat
         /// <summary>
         /// The root URL for the website, used for chat link matching.
         /// </summary>
-        public static string WebsiteRootUrl { get; set; } = "https://osu.ppy.sh";
+        public static string WebsiteRootUrl
+        {
+            set => websiteRootUrl = value
+                                    .Trim('/') // trim potential trailing slash/
+                                    .Split('/').Last(); // only keep domain name, ignoring protocol.
+        }
+
+        private static string websiteRootUrl;
 
         private static void handleMatches(Regex regex, string display, string link, MessageFormatterResult result, int startIndex = 0, LinkAction? linkActionOverride = null, char[] escapeChars = null)
         {
@@ -124,7 +131,7 @@ namespace osu.Game.Online.Chat
                 case "http":
                 case "https":
                     // length > 3 since all these links need another argument to work
-                    if (args.Length > 3 && url.StartsWith(WebsiteRootUrl, StringComparison.OrdinalIgnoreCase))
+                    if (args.Length > 3 && args[1].EndsWith(websiteRootUrl, StringComparison.OrdinalIgnoreCase))
                     {
                         switch (args[2])
                         {

From 1c5aaf3832e97a258bb764aa5dfd2f07200e4b35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:03:53 +0900
Subject: [PATCH 08128/10326] Add back default value

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

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index d8e02e5b6d..3c6df31462 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Online.Chat
                                     .Split('/').Last(); // only keep domain name, ignoring protocol.
         }
 
-        private static string websiteRootUrl;
+        private static string websiteRootUrl = "osu.ppy.sh";
 
         private static void handleMatches(Regex regex, string display, string link, MessageFormatterResult result, int startIndex = 0, LinkAction? linkActionOverride = null, char[] escapeChars = null)
         {

From 955c9a2dd3e47dab3752d62f4173bbde3b5ec0d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:17:39 +0900
Subject: [PATCH 08129/10326] Add test coverage of beatmap link resolution

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 600c820ce1..151e05b18d 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -21,6 +21,21 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(36, result.Links[0].Length);
         }
 
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456")]
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456?whatever")]
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123/456")]
+        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123")]
+        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123/whatever")]
+        public void TestBeatmapLinks(LinkAction expectedAction, string expectedArg, string link)
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = link });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(1, result.Links.Count);
+            Assert.AreEqual(expectedAction, result.Links[0].Action);
+            Assert.AreEqual(expectedArg, result.Links[0].Argument);
+        }
+
         [Test]
         public void TestMultipleComplexLinks()
         {

From bb9123eecd231cde3b1ed240e7ffe3575b005fee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:17:54 +0900
Subject: [PATCH 08130/10326] Better handle fallback scenarios for beatmap
 links

---
 osu.Game/Online/Chat/MessageFormatter.cs | 33 ++++++++++++++++++------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index d2a117876d..5aab476b6d 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -121,20 +121,37 @@ namespace osu.Game.Online.Chat
                     // length > 3 since all these links need another argument to work
                     if (args.Length > 3 && args[1] == "osu.ppy.sh")
                     {
+                        var mainArg = args[3];
+
                         switch (args[2])
                         {
+                            // old site only
                             case "b":
                             case "beatmaps":
-                                return new LinkDetails(LinkAction.OpenBeatmap, args[3]);
+                            {
+                                string trimmed = mainArg.Split('?').First();
+                                if (int.TryParse(trimmed, out var id))
+                                    return new LinkDetails(LinkAction.OpenBeatmap, id.ToString());
+
+                                break;
+                            }
 
                             case "s":
                             case "beatmapsets":
                             case "d":
-                                return new LinkDetails(LinkAction.OpenBeatmapSet, args[3]);
+                            {
+                                if (args.Length > 4 && int.TryParse(args[4], out var id))
+                                    // https://osu.ppy.sh/beatmapsets/1154158#osu/2768184
+                                    return new LinkDetails(LinkAction.OpenBeatmap, id.ToString());
+
+                                // https://osu.ppy.sh/beatmapsets/1154158#whatever
+                                string trimmed = mainArg.Split('#').First();
+                                return new LinkDetails(LinkAction.OpenBeatmapSet, trimmed);
+                            }
 
                             case "u":
                             case "users":
-                                return new LinkDetails(LinkAction.OpenUserProfile, args[3]);
+                                return new LinkDetails(LinkAction.OpenUserProfile, mainArg);
                         }
                     }
 
@@ -183,10 +200,9 @@ namespace osu.Game.Online.Chat
 
                 case "osump":
                     return new LinkDetails(LinkAction.JoinMultiplayerMatch, args[1]);
-
-                default:
-                    return new LinkDetails(LinkAction.External, null);
             }
+
+            return new LinkDetails(LinkAction.External, null);
         }
 
         private static MessageFormatterResult format(string toFormat, int startIndex = 0, int space = 3)
@@ -259,8 +275,9 @@ namespace osu.Game.Online.Chat
 
     public class LinkDetails
     {
-        public LinkAction Action;
-        public string Argument;
+        public readonly LinkAction Action;
+
+        public readonly string Argument;
 
         public LinkDetails(LinkAction action, string argument)
         {

From 3799493536907954559ed707d2edf07a1bd02c26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:25:00 +0900
Subject: [PATCH 08131/10326] Add test coverage of int match failures

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 4 ++++
 osu.Game/Online/Chat/MessageFormatter.cs     | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 151e05b18d..11e94f0b89 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -24,8 +24,10 @@ namespace osu.Game.Tests.Chat
         [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456")]
         [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456?whatever")]
         [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123/456")]
+        [TestCase(LinkAction.External, null, "https://osu.ppy.sh/beatmapsets/abc/def")]
         [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123")]
         [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123/whatever")]
+        [TestCase(LinkAction.External, null, "https://osu.ppy.sh/beatmapsets/abc")]
         public void TestBeatmapLinks(LinkAction expectedAction, string expectedArg, string link)
         {
             Message result = MessageFormatter.FormatMessage(new Message { Content = link });
@@ -34,6 +36,8 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(1, result.Links.Count);
             Assert.AreEqual(expectedAction, result.Links[0].Action);
             Assert.AreEqual(expectedArg, result.Links[0].Argument);
+            if (expectedAction == LinkAction.External)
+                Assert.AreEqual(link, result.Links[0].Url);
         }
 
         [Test]
diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 5aab476b6d..8e92078c2c 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -146,7 +146,10 @@ namespace osu.Game.Online.Chat
 
                                 // https://osu.ppy.sh/beatmapsets/1154158#whatever
                                 string trimmed = mainArg.Split('#').First();
-                                return new LinkDetails(LinkAction.OpenBeatmapSet, trimmed);
+                                if (int.TryParse(trimmed, out id))
+                                    return new LinkDetails(LinkAction.OpenBeatmapSet, id.ToString());
+
+                                break;
                             }
 
                             case "u":

From a1be3c8bfdf71df5b0b0476b379d36a427ee0ee4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Feb 2021 15:27:37 +0900
Subject: [PATCH 08132/10326] Fix header background being invisible in
 multiplayer/playlists

---
 .../Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
index eb05cbaf85..3206f7b3ab 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Beatmaps.Drawables
         /// </summary>
         protected virtual double UnloadDelay => 10000;
 
-        protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
-            => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad, UnloadDelay);
+        protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad) =>
+            new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad, UnloadDelay) { RelativeSizeAxes = Axes.Both };
 
         protected override double TransformDuration => 400;
 

From f7374703f00ee87f8865a51c5ef2fa5c3befad79 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:29:21 +0900
Subject: [PATCH 08133/10326] Update tests to match dev domain

---
 .../Visual/Online/TestSceneChatLink.cs        | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index 9e69530a77..74f53ebdca 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -103,26 +103,26 @@ namespace osu.Game.Tests.Visual.Online
         private void testLinksGeneral()
         {
             addMessageWithChecks("test!");
-            addMessageWithChecks("osu.ppy.sh!");
-            addMessageWithChecks("https://osu.ppy.sh!", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("dev.ppy.sh!");
+            addMessageWithChecks("https://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
             addMessageWithChecks("00:12:345 (1,2) - Test?", 1, expectedActions: LinkAction.OpenEditorTimestamp);
             addMessageWithChecks("Wiki link for tasty [[Performance Points]]", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("(osu forums)[https://osu.ppy.sh/forum] (old link format)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[https://osu.ppy.sh/home New site] (new link format)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[osu forums](https://osu.ppy.sh/forum) (new link format 2)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[https://osu.ppy.sh/home This is only a link to the new osu webpage but this is supposed to test word wrap.]", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("is now listening to [https://osu.ppy.sh/s/93523 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmapSet);
-            addMessageWithChecks("is now playing [https://osu.ppy.sh/b/252238 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmap);
-            addMessageWithChecks("Let's (try)[https://osu.ppy.sh/home] [https://osu.ppy.sh/b/252238 multiple links] https://osu.ppy.sh/home", 3,
+            addMessageWithChecks("(osu forums)[https://dev.ppy.sh/forum] (old link format)", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("[https://dev.ppy.sh/home New site] (new link format)", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("[osu forums](https://dev.ppy.sh/forum) (new link format 2)", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("[https://dev.ppy.sh/home This is only a link to the new osu webpage but this is supposed to test word wrap.]", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("is now listening to [https://dev.ppy.sh/s/93523 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmapSet);
+            addMessageWithChecks("is now playing [https://dev.ppy.sh/b/252238 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmap);
+            addMessageWithChecks("Let's (try)[https://dev.ppy.sh/home] [https://dev.ppy.sh/b/252238 multiple links] https://dev.ppy.sh/home", 3,
                 expectedActions: new[] { LinkAction.External, LinkAction.OpenBeatmap, LinkAction.External });
-            addMessageWithChecks("[https://osu.ppy.sh/home New link format with escaped [and \\[ paired] braces]", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[Markdown link format with escaped [and \\[ paired] braces](https://osu.ppy.sh/home)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("(Old link format with escaped (and \\( paired) parentheses)[https://osu.ppy.sh/home] and [[also a rogue wiki link]]", 2, expectedActions: new[] { LinkAction.External, LinkAction.External });
+            addMessageWithChecks("[https://dev.ppy.sh/home New link format with escaped [and \\[ paired] braces]", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("[Markdown link format with escaped [and \\[ paired] braces](https://dev.ppy.sh/home)", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("(Old link format with escaped (and \\( paired) parentheses)[https://dev.ppy.sh/home] and [[also a rogue wiki link]]", 2, expectedActions: new[] { LinkAction.External, LinkAction.External });
             // note that there's 0 links here (they get removed if a channel is not found)
             addMessageWithChecks("#lobby or #osu would be blue (and work) in the ChatDisplay test (when a proper ChatOverlay is present).");
             addMessageWithChecks("I am important!", 0, false, true);
             addMessageWithChecks("feels important", 0, true, true);
-            addMessageWithChecks("likes to post this [https://osu.ppy.sh/home link].", 1, true, true, expectedActions: LinkAction.External);
+            addMessageWithChecks("likes to post this [https://dev.ppy.sh/home link].", 1, true, true, expectedActions: LinkAction.External);
             addMessageWithChecks("Join my multiplayer game osump://12346.", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
             addMessageWithChecks("Join my [multiplayer game](osump://12346).", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
             addMessageWithChecks("Join my [#english](osu://chan/#english).", 1, expectedActions: LinkAction.OpenChannel);
@@ -136,9 +136,9 @@ namespace osu.Game.Tests.Visual.Online
             int echoCounter = 0;
 
             addEchoWithWait("sent!", "received!");
-            addEchoWithWait("https://osu.ppy.sh/home", null, 500);
-            addEchoWithWait("[https://osu.ppy.sh/forum let's try multiple words too!]");
-            addEchoWithWait("(long loading times! clickable while loading?)[https://osu.ppy.sh/home]", null, 5000);
+            addEchoWithWait("https://dev.ppy.sh/home", null, 500);
+            addEchoWithWait("[https://dev.ppy.sh/forum let's try multiple words too!]");
+            addEchoWithWait("(long loading times! clickable while loading?)[https://dev.ppy.sh/home]", null, 5000);
 
             void addEchoWithWait(string text, string completeText = null, double delay = 250)
             {

From a0733769206b58026ec0b044da3e2820b71a0c76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:18:16 +0900
Subject: [PATCH 08134/10326] Show URLs in tooltips when custom text has
 replaced the link

---
 osu.Game/Graphics/Containers/LinkFlowContainer.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index e3a9a5fe9d..914c8ff78d 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -38,7 +38,12 @@ namespace osu.Game.Graphics.Containers
             foreach (var link in links)
             {
                 AddText(text[previousLinkEnd..link.Index]);
-                AddLink(text.Substring(link.Index, link.Length), link.Action, link.Argument ?? link.Url);
+
+                string displayText = text.Substring(link.Index, link.Length);
+                string linkArgument = link.Argument ?? link.Url;
+                string tooltip = displayText == link.Url ? null : link.Url;
+
+                AddLink(displayText, link.Action, linkArgument, tooltip);
                 previousLinkEnd = link.Index + link.Length;
             }
 
@@ -52,7 +57,7 @@ namespace osu.Game.Graphics.Containers
             => createLink(AddText(text, creationParameters), new LinkDetails(LinkAction.Custom, null), tooltipText, action);
 
         public void AddLink(string text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
-            => createLink(AddText(text, creationParameters), new LinkDetails(action, argument), null);
+            => createLink(AddText(text, creationParameters), new LinkDetails(action, argument), tooltipText);
 
         public void AddLink(IEnumerable<SpriteText> text, LinkAction action = LinkAction.External, string linkArgument = null, string tooltipText = null)
         {

From 4ab16694d1ca145d2af3f6aa758504e9dba0a511 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 16:22:19 +0900
Subject: [PATCH 08135/10326] Fix classic "welcome" intro not looping as
 expected

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index abb83f894a..d454d85d9e 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -67,6 +67,10 @@ namespace osu.Game.Screens.Menu
                     {
                         StartTrack();
 
+                        // this classic intro loops forever.
+                        if (UsingThemedIntro)
+                            Track.Looping = true;
+
                         const float fade_in_time = 200;
 
                         logo.ScaleTo(1);

From 725db5683731e9b193fb9d309910c88e8e6ba398 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 16:55:34 +0900
Subject: [PATCH 08136/10326] Add loading spinner while tournament bracket is
 loading / retrieving data

---
 .../TournamentTestBrowser.cs                  |  2 +
 .../TournamentTestScene.cs                    |  2 +
 osu.Game.Tournament/TournamentGame.cs         | 43 +++++++++++++------
 osu.Game.Tournament/TournamentGameBase.cs     | 22 ++++++----
 4 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
index f7ad757926..2f50ae4141 100644
--- a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Tournament.Tests
         {
             base.LoadComplete();
 
+            BracketLoadTask.Wait();
+
             LoadComponentAsync(new Background("Menu/menu-background-0")
             {
                 Colour = OsuColour.Gray(0.5f),
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index d22da25f9d..62882d7188 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -154,6 +154,8 @@ namespace osu.Game.Tournament.Tests
 
             protected override void LoadAsyncComplete()
             {
+                BracketLoadTask.Wait();
+
                 // this has to be run here rather than LoadComplete because
                 // TestScene.cs is checking the IsLoaded state (on another thread) and expects
                 // the runner to be loaded at that point.
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index bbe4a53d8f..fadb821bef 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Colour;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Tournament.Models;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
@@ -32,25 +33,24 @@ namespace osu.Game.Tournament
         private Drawable heightWarning;
         private Bindable<Size> windowSize;
         private Bindable<WindowMode> windowMode;
+        private LoadingSpinner loadingSpinner;
 
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig)
         {
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
-            windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
-            {
-                var minWidth = (int)(size.NewValue.Height / 768f * TournamentSceneManager.REQUIRED_WIDTH) - 1;
-
-                heightWarning.Alpha = size.NewValue.Width < minWidth ? 1 : 0;
-            }), true);
-
             windowMode = frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            windowMode.BindValueChanged(mode => ScheduleAfterChildren(() =>
-            {
-                windowMode.Value = WindowMode.Windowed;
-            }), true);
 
-            AddRange(new[]
+            Add(loadingSpinner = new LoadingSpinner(true, true)
+            {
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.BottomRight,
+                Margin = new MarginPadding(40),
+            });
+
+            loadingSpinner.Show();
+
+            BracketLoadTask.ContinueWith(_ => LoadComponentsAsync(new[]
             {
                 new Container
                 {
@@ -93,7 +93,24 @@ namespace osu.Game.Tournament
                     RelativeSizeAxes = Axes.Both,
                     Child = new TournamentSceneManager()
                 }
-            });
+            }, drawables =>
+            {
+                loadingSpinner.Hide();
+                loadingSpinner.Expire();
+
+                AddRange(drawables);
+
+                windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
+                {
+                    var minWidth = (int)(size.NewValue.Height / 768f * TournamentSceneManager.REQUIRED_WIDTH) - 1;
+                    heightWarning.Alpha = size.NewValue.Width < minWidth ? 1 : 0;
+                }), true);
+
+                windowMode.BindValueChanged(mode => ScheduleAfterChildren(() =>
+                {
+                    windowMode.Value = WindowMode.Windowed;
+                }), true);
+            }));
         }
     }
 }
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 97c950261b..4dd072cf17 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -4,6 +4,8 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
@@ -29,6 +31,8 @@ namespace osu.Game.Tournament
         private DependencyContainer dependencies;
         private FileBasedIPC ipc;
 
+        protected Task BracketLoadTask { get; private set; }
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             return dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
@@ -46,14 +50,9 @@ namespace osu.Game.Tournament
 
             Textures.AddStore(new TextureLoaderStore(new StorageBackedResourceStore(storage)));
 
-            readBracket();
-
-            ladder.CurrentMatch.Value = ladder.Matches.FirstOrDefault(p => p.Current.Value);
+            BracketLoadTask = Task.Run(readBracket);
 
             dependencies.CacheAs(new StableInfo(storage));
-
-            dependencies.CacheAs<MatchIPCInfo>(ipc = new FileBasedIPC());
-            Add(ipc);
         }
 
         private void readBracket()
@@ -70,8 +69,6 @@ namespace osu.Game.Tournament
 
             Ruleset.BindTo(ladder.Ruleset);
 
-            dependencies.Cache(ladder);
-
             bool addedInfo = false;
 
             // assign teams
@@ -127,6 +124,15 @@ namespace osu.Game.Tournament
 
             if (addedInfo)
                 SaveChanges();
+
+            ladder.CurrentMatch.Value = ladder.Matches.FirstOrDefault(p => p.Current.Value);
+
+            Schedule(() =>
+            {
+                dependencies.Cache(ladder);
+                dependencies.CacheAs<MatchIPCInfo>(ipc = new FileBasedIPC());
+                Add(ipc);
+            });
         }
 
         /// <summary>

From 0c3aef8645f234acdc8a4ceb4646af176ea8963b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Feb 2021 17:42:02 +0900
Subject: [PATCH 08137/10326] Fix potential race in looping sample

As mentioned via GitHub comments. Very unlikely for this to happen unless: the sample takes a short amount of time to load, is very short itself, and the update thread stalls until the sample fully completes.
---
 osu.Game/Skinning/PoolableSkinnableSample.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index cff793e8d4..45880a8e1e 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -115,8 +115,7 @@ namespace osu.Game.Skinning
             if (Sample == null)
                 return;
 
-            activeChannel = Sample.Play();
-            activeChannel.Looping = Looping;
+            activeChannel = Sample.Play(Looping);
 
             Played = true;
         }

From 9b5995f2f1f6710e3d26357e806f00168d559d01 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Feb 2021 19:05:17 +0900
Subject: [PATCH 08138/10326] Update with removal of looping parameter

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

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 45880a8e1e..9025fdbd0f 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -115,7 +115,9 @@ namespace osu.Game.Skinning
             if (Sample == null)
                 return;
 
-            activeChannel = Sample.Play(Looping);
+            activeChannel = Sample.GetChannel();
+            activeChannel.Looping = Looping;
+            activeChannel.Play();
 
             Played = true;
         }

From 37a21cb192760c5f68a7842140d59d9421d681ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 21:30:02 +0900
Subject: [PATCH 08139/10326] Set static locally in test to ensure tests always
 run correctly

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 11e94f0b89..b80da928c8 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -21,15 +21,17 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(36, result.Links[0].Length);
         }
 
-        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456")]
-        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456?whatever")]
-        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123/456")]
-        [TestCase(LinkAction.External, null, "https://osu.ppy.sh/beatmapsets/abc/def")]
-        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123")]
-        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123/whatever")]
-        [TestCase(LinkAction.External, null, "https://osu.ppy.sh/beatmapsets/abc")]
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://dev.ppy.sh/beatmapsets/123#osu/456")]
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://dev.ppy.sh/beatmapsets/123#osu/456?whatever")]
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://dev.ppy.sh/beatmapsets/123/456")]
+        [TestCase(LinkAction.External, null, "https://dev.ppy.sh/beatmapsets/abc/def")]
+        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://dev.ppy.sh/beatmapsets/123")]
+        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://dev.ppy.sh/beatmapsets/123/whatever")]
+        [TestCase(LinkAction.External, null, "https://dev.ppy.sh/beatmapsets/abc")]
         public void TestBeatmapLinks(LinkAction expectedAction, string expectedArg, string link)
         {
+            MessageFormatter.WebsiteRootUrl = "dev.ppy.sh";
+
             Message result = MessageFormatter.FormatMessage(new Message { Content = link });
 
             Assert.AreEqual(result.Content, result.DisplayContent);

From 7d057ab6ce9d81a6afe6fe79884d7705a40491dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 22:38:55 +0900
Subject: [PATCH 08140/10326] Fix two threading issues

---
 osu.Game.Tournament/TournamentGameBase.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 4dd072cf17..4224da4bbe 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -4,7 +4,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
@@ -31,7 +30,9 @@ namespace osu.Game.Tournament
         private DependencyContainer dependencies;
         private FileBasedIPC ipc;
 
-        protected Task BracketLoadTask { get; private set; }
+        protected Task BracketLoadTask => taskCompletionSource.Task;
+
+        private readonly TaskCompletionSource<bool> taskCompletionSource = new TaskCompletionSource<bool>();
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
@@ -50,9 +51,9 @@ namespace osu.Game.Tournament
 
             Textures.AddStore(new TextureLoaderStore(new StorageBackedResourceStore(storage)));
 
-            BracketLoadTask = Task.Run(readBracket);
-
             dependencies.CacheAs(new StableInfo(storage));
+
+            Task.Run(readBracket);
         }
 
         private void readBracket()
@@ -67,8 +68,6 @@ namespace osu.Game.Tournament
             ladder ??= new LadderInfo();
             ladder.Ruleset.Value ??= RulesetStore.AvailableRulesets.First();
 
-            Ruleset.BindTo(ladder.Ruleset);
-
             bool addedInfo = false;
 
             // assign teams
@@ -129,9 +128,13 @@ namespace osu.Game.Tournament
 
             Schedule(() =>
             {
+                Ruleset.BindTo(ladder.Ruleset);
+
                 dependencies.Cache(ladder);
                 dependencies.CacheAs<MatchIPCInfo>(ipc = new FileBasedIPC());
                 Add(ipc);
+
+                taskCompletionSource.SetResult(true);
             });
         }
 

From 13aaf766f93eadf358ea9d6b0d0bac2e71358a46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Feb 2021 01:10:39 +0900
Subject: [PATCH 08141/10326] Fix regression in tournament test startup
 behaviour

---
 .../TournamentTestBrowser.cs                  | 19 ++++++++++---------
 .../TournamentTestScene.cs                    | 13 +++++++------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
index 2f50ae4141..50bdcd86c5 100644
--- a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
@@ -13,17 +13,18 @@ namespace osu.Game.Tournament.Tests
         {
             base.LoadComplete();
 
-            BracketLoadTask.Wait();
-
-            LoadComponentAsync(new Background("Menu/menu-background-0")
+            BracketLoadTask.ContinueWith(_ => Schedule(() =>
             {
-                Colour = OsuColour.Gray(0.5f),
-                Depth = 10
-            }, AddInternal);
+                LoadComponentAsync(new Background("Menu/menu-background-0")
+                {
+                    Colour = OsuColour.Gray(0.5f),
+                    Depth = 10
+                }, AddInternal);
 
-            // Have to construct this here, rather than in the constructor, because
-            // we depend on some dependencies to be loaded within OsuGameBase.load().
-            Add(new TestBrowser());
+                // Have to construct this here, rather than in the constructor, because
+                // we depend on some dependencies to be loaded within OsuGameBase.load().
+                Add(new TestBrowser());
+            }));
         }
     }
 }
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 62882d7188..025abfcbc6 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -154,12 +154,13 @@ namespace osu.Game.Tournament.Tests
 
             protected override void LoadAsyncComplete()
             {
-                BracketLoadTask.Wait();
-
-                // this has to be run here rather than LoadComplete because
-                // TestScene.cs is checking the IsLoaded state (on another thread) and expects
-                // the runner to be loaded at that point.
-                Add(runner = new TestSceneTestRunner.TestRunner());
+                BracketLoadTask.ContinueWith(_ => Schedule(() =>
+                {
+                    // this has to be run here rather than LoadComplete because
+                    // TestScene.cs is checking the IsLoaded state (on another thread) and expects
+                    // the runner to be loaded at that point.
+                    Add(runner = new TestSceneTestRunner.TestRunner());
+                }));
             }
 
             public void RunTestBlocking(TestScene test) => runner.RunTestBlocking(test);

From 52975c51854c665495a8384d5356829e90062bfc Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 12 Feb 2021 10:23:33 -0800
Subject: [PATCH 08142/10326] Remove hardcoded padding from main content

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index b7adb71e2f..56882e0d38 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                 RelativeSizeAxes = Axes.Both,
                                 Padding = new MarginPadding
                                 {
-                                    Horizontal = 105,
+                                    Horizontal = HORIZONTAL_OVERFLOW_PADDING + 55,
                                     Vertical = 20
                                 },
                                 Child = new GridContainer

From b28a906197eee66455c1201db6e3288afca2f571 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 12 Feb 2021 10:29:29 -0800
Subject: [PATCH 08143/10326] Fix extra mod settings overflowing from screen

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 56882e0d38..c5130baa94 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -237,6 +237,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     Origin = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.Both,
                     Height = 0.5f,
+                    Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
                     Child = userModsSelectOverlay = new UserModSelectOverlay
                     {
                         SelectedMods = { BindTarget = UserMods },

From 982d8e35edc3efb9a05111b37596c94c44e182e8 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 12 Feb 2021 10:42:48 -0800
Subject: [PATCH 08144/10326] Fix mod settings showing scrollbar when screen is
 offset

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

diff --git a/osu.Game/Overlays/Mods/ModSettingsContainer.cs b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
index 1c57ff54ad..64d65cab3b 100644
--- a/osu.Game/Overlays/Mods/ModSettingsContainer.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Overlays.Mods
                     new OsuScrollContainer
                     {
                         RelativeSizeAxes = Axes.Both,
+                        ScrollbarVisible = false,
                         Child = modSettingsContent = new FillFlowContainer<ModControlSection>
                         {
                             Anchor = Anchor.TopCentre,

From a4dc54423531c77a0fb34023f8a634a9faaf108d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:23:59 +0900
Subject: [PATCH 08145/10326] Refactor some shared code in TestScenePause

---
 .../Visual/Gameplay/TestScenePause.cs         | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index ae806883b0..1a0b594bb7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -56,9 +56,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseAndConfirm();
             resume();
 
-            confirmClockRunning(false);
-            confirmPauseOverlayShown(false);
-
+            confirmPausedWithNoOverlay();
             AddStep("click to resume", () => InputManager.Click(MouseButton.Left));
 
             confirmClockRunning(true);
@@ -73,9 +71,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseAndConfirm();
 
             resume();
-            confirmClockRunning(false);
-            confirmPauseOverlayShown(false);
-
+            confirmPausedWithNoOverlay();
             pauseAndConfirm();
 
             AddUntilStep("resume overlay is not active", () => Player.DrawableRuleset.ResumeOverlay.State.Value == Visibility.Hidden);
@@ -94,7 +90,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestPauseTooSoon()
+        public void TestPauseDuringCooldownTooSoon()
         {
             AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
 
@@ -103,8 +99,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             resume();
             pause();
 
-            confirmClockRunning(true);
-            confirmPauseOverlayShown(false);
+            confirmResumed();
+            AddAssert("not exited", () => Player.IsCurrentScreen());
         }
 
         [Test]
@@ -117,9 +113,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("exit quick", () => Player.Exit());
 
-            confirmClockRunning(true);
-            confirmPauseOverlayShown(false);
-
+            confirmResumed();
             AddAssert("exited", () => !Player.IsCurrentScreen());
         }
 
@@ -133,9 +127,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             pause();
 
-            confirmClockRunning(false);
-            confirmPauseOverlayShown(false);
-
+            confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
 
             exitAndConfirm();
@@ -277,6 +269,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             confirmPauseOverlayShown(false);
         }
 
+        private void confirmPausedWithNoOverlay()
+        {
+            confirmClockRunning(false);
+            confirmPauseOverlayShown(false);
+        }
+
         private void confirmExited()
         {
             AddUntilStep("player exited", () => !Player.IsCurrentScreen());

From 2b69c7b32530c4ab9ab712610b94664a2a9b9d43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:00:30 +0900
Subject: [PATCH 08146/10326] Fix incorrect order of operation in pause
 blocking logic

---
 osu.Game/Screens/Play/Player.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dda52f4dae..c462786916 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -503,14 +503,17 @@ namespace osu.Game.Screens.Play
                     return;
                 }
 
-                if (canPause && !GameplayClockContainer.IsPaused.Value)
+                if (!GameplayClockContainer.IsPaused.Value)
                 {
-                    if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
-                        // still want to block if we are within the cooldown period and not already paused.
+                    // if we are within the cooldown period and not already paused, the operation should block completely.
+                    if (pauseCooldownActive)
                         return;
 
-                    Pause();
-                    return;
+                    if (canPause)
+                    {
+                        Pause();
+                        return;
+                    }
                 }
             }
 

From 25f5120fdf51be4ca58c208f55198cdcbcf41d0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:36:14 +0900
Subject: [PATCH 08147/10326] Add failing test coverage of user pausing or
 quick exiting during cooldown

---
 .../Visual/Gameplay/TestScenePause.cs         | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 1a0b594bb7..8246e2c028 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -90,19 +90,47 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestPauseDuringCooldownTooSoon()
+        public void TestExternalPauseDuringCooldownTooSoon()
         {
             AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
 
             pauseAndConfirm();
 
             resume();
-            pause();
+            pauseExternally();
 
             confirmResumed();
             AddAssert("not exited", () => Player.IsCurrentScreen());
         }
 
+        [Test]
+        public void TestUserPauseDuringCooldownTooSoon()
+        {
+            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
+
+            pauseAndConfirm();
+
+            resume();
+            AddStep("pause via exit key", () => Player.ExitViaPause());
+
+            confirmResumed();
+            AddAssert("not exited", () => Player.IsCurrentScreen());
+        }
+
+        [Test]
+        public void TestQuickExitDuringCooldownTooSoon()
+        {
+            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
+
+            pauseAndConfirm();
+
+            resume();
+            AddStep("pause via exit key", () => Player.ExitViaQuickExit());
+
+            confirmResumed();
+            AddAssert("exited", () => !Player.IsCurrentScreen());
+        }
+
         [Test]
         public void TestExitSoonAfterResumeSucceeds()
         {
@@ -125,7 +153,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             confirmClockRunning(false);
 
-            pause();
+            pauseExternally();
 
             confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
@@ -237,7 +265,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void pauseAndConfirm()
         {
-            pause();
+            pauseExternally();
             confirmPaused();
         }
 
@@ -286,7 +314,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());
-        private void pause() => AddStep("pause", () => Player.Pause());
+        private void pauseExternally() => AddStep("pause", () => Player.Pause());
         private void resume() => AddStep("resume", () => Player.Resume());
 
         private void confirmPauseOverlayShown(bool isShown) =>
@@ -305,6 +333,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public bool PauseOverlayVisible => PauseOverlay.State.Value == Visibility.Visible;
 
+            public void ExitViaPause() => PerformExit(true);
+
+            public void ExitViaQuickExit() => PerformExit(false);
+
             public override void OnEntering(IScreen last)
             {
                 base.OnEntering(last);

From ec37e1602d566920601a1c197757991099b2447f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 15:02:58 +0900
Subject: [PATCH 08148/10326] Add failing test coverage of retrying from the
 results screen

---
 .../Visual/Navigation/OsuGameTestScene.cs     |  3 +++
 .../Navigation/TestSceneScreenNavigation.cs   | 26 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index c5038068ec..96393cc4c3 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -17,6 +17,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
@@ -115,6 +116,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
 
+            public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
+
             // 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";
 
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 8480e6eaaa..d8380b2dd3 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -11,7 +11,9 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Options;
 using osu.Game.Tests.Beatmaps.IO;
@@ -41,6 +43,30 @@ namespace osu.Game.Tests.Visual.Navigation
             exitViaEscapeAndConfirm();
         }
 
+        [Test]
+        public void TestRetryFromResults()
+        {
+            Player player = null;
+            ResultsScreen results = null;
+
+            WorkingBeatmap beatmap() => Game.Beatmap.Value;
+
+            PushAndConfirm(() => new TestSongSelect());
+
+            AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(Game, virtualTrack: true).Wait());
+
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("set autoplay", () => Game.SelectedMods.Value = new[] { new OsuModAutoplay() });
+
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
+            AddUntilStep("wait for player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
+            AddStep("seek to end", () => beatmap().Track.Seek(beatmap().Track.Length));
+            AddUntilStep("wait for pass", () => (results = Game.ScreenStack.CurrentScreen as ResultsScreen) != null && results.IsLoaded);
+            AddStep("attempt to retry", () => results.ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddUntilStep("wait for player", () => Game.ScreenStack.CurrentScreen != player && Game.ScreenStack.CurrentScreen is Player);
+        }
+
         [TestCase(true)]
         [TestCase(false)]
         public void TestSongContinuesAfterExitPlayer(bool withUserPause)

From 1aea840504aa337e24173ca701188e6fd88a6d1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:03:41 +0900
Subject: [PATCH 08149/10326] Add missing return in early exit scenario
 (MakeCurrent isn't compatible with the following Exit)

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c462786916..88ca516440 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -493,6 +493,7 @@ namespace osu.Game.Screens.Play
                 // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
                 ValidForResume = false;
                 this.MakeCurrent();
+                return;
             }
 
             if (showDialogFirst)

From 83183a84da2a877e44a5472cc375e0e9b162793e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 15:31:51 +0900
Subject: [PATCH 08150/10326] Ensure the tournament test runner is ready before
 performing the test run

---
 osu.Game.Tournament.Tests/TournamentTestScene.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 025abfcbc6..47d2160561 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -2,6 +2,7 @@
 // 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.Platform;
 using osu.Framework.Testing;
@@ -163,7 +164,13 @@ namespace osu.Game.Tournament.Tests
                 }));
             }
 
-            public void RunTestBlocking(TestScene test) => runner.RunTestBlocking(test);
+            public void RunTestBlocking(TestScene test)
+            {
+                while (runner?.IsLoaded != true && Host.ExecutionState == ExecutionState.Running)
+                    Thread.Sleep(10);
+
+                runner?.RunTestBlocking(test);
+            }
         }
     }
 }

From 4f264758a499fea09585cdd9403cba15d9a7777c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 15:57:34 +0900
Subject: [PATCH 08151/10326] Add test coverage of pause from resume overlay

---
 .../Visual/Gameplay/TestScenePause.cs           | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 8246e2c028..1ad1479cd4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -69,13 +69,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for hitobjects", () => Player.HealthProcessor.Health.Value < 1);
 
             pauseAndConfirm();
-
             resume();
+
             confirmPausedWithNoOverlay();
             pauseAndConfirm();
 
             AddUntilStep("resume overlay is not active", () => Player.DrawableRuleset.ResumeOverlay.State.Value == Visibility.Hidden);
             confirmPaused();
+            confirmNotExited();
         }
 
         [Test]
@@ -100,7 +101,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseExternally();
 
             confirmResumed();
-            AddAssert("not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
         }
 
         [Test]
@@ -114,7 +115,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("pause via exit key", () => Player.ExitViaPause());
 
             confirmResumed();
-            AddAssert("not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
         }
 
         [Test]
@@ -277,7 +278,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void exitAndConfirm()
         {
-            AddUntilStep("player not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
             AddStep("exit", () => Player.Exit());
             confirmExited();
             confirmNoTrackAdjustments();
@@ -286,7 +287,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private void confirmPaused()
         {
             confirmClockRunning(false);
-            AddAssert("player not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
             AddAssert("player not failed", () => !Player.HasFailed);
             AddAssert("pause overlay shown", () => Player.PauseOverlayVisible);
         }
@@ -303,10 +304,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             confirmPauseOverlayShown(false);
         }
 
-        private void confirmExited()
-        {
-            AddUntilStep("player exited", () => !Player.IsCurrentScreen());
-        }
+        private void confirmExited() => AddUntilStep("player exited", () => !Player.IsCurrentScreen());
+        private void confirmNotExited() => AddAssert("player not exited", () => Player.IsCurrentScreen());
 
         private void confirmNoTrackAdjustments()
         {

From 9cba350337484a3e1466063411daeb489c18abdc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 15:57:21 +0900
Subject: [PATCH 08152/10326] Refactor again to better cover cases where the
 pause dialog should definitely be shown

---
 osu.Game/Screens/Play/Player.cs | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 88ca516440..a844d3bcf7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -487,35 +487,30 @@ namespace osu.Game.Screens.Play
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
 
+            // there is a chance that the exit was performed after the transition to results has started.
+            // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
             if (!this.IsCurrentScreen())
             {
-                // there is a chance that the exit was performed after the transition to results has started.
-                // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
                 ValidForResume = false;
                 this.MakeCurrent();
                 return;
             }
 
-            if (showDialogFirst)
+            bool pauseDialogShown = PauseOverlay.State.Value == Visibility.Visible;
+
+            if (showDialogFirst && !pauseDialogShown)
             {
+                // if the fail animation is currently in progress, accelerate it (it will show the pause dialog on completion).
                 if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
                 {
                     failAnimation.FinishTransforms(true);
                     return;
                 }
 
-                if (!GameplayClockContainer.IsPaused.Value)
-                {
-                    // if we are within the cooldown period and not already paused, the operation should block completely.
-                    if (pauseCooldownActive)
-                        return;
-
-                    if (canPause)
-                    {
-                        Pause();
-                        return;
-                    }
-                }
+                // in the case a dialog needs to be shown, attempt to pause and show it.
+                // this may fail (see internal checks in Pause()) at which point the exit attempt will be aborted.
+                Pause();
+                return;
             }
 
             this.Exit();

From f664fca0ddf2ac466af1d27048f0d370c74ecb94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 16:11:17 +0900
Subject: [PATCH 08153/10326] Tidy up tests (and remove duplicate with new call
 logic)

---
 .../Visual/Gameplay/TestScenePause.cs         | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 1ad1479cd4..aa56c636ab 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -90,20 +90,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             resumeAndConfirm();
         }
 
-        [Test]
-        public void TestExternalPauseDuringCooldownTooSoon()
-        {
-            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
-
-            pauseAndConfirm();
-
-            resume();
-            pauseExternally();
-
-            confirmResumed();
-            confirmNotExited();
-        }
-
         [Test]
         public void TestUserPauseDuringCooldownTooSoon()
         {
@@ -112,7 +98,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseAndConfirm();
 
             resume();
-            AddStep("pause via exit key", () => Player.ExitViaPause());
+            pauseFromUserExitKey();
 
             confirmResumed();
             confirmNotExited();
@@ -154,7 +140,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             confirmClockRunning(false);
 
-            pauseExternally();
+            pauseFromUserExitKey();
 
             confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
@@ -266,7 +252,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void pauseAndConfirm()
         {
-            pauseExternally();
+            pauseFromUserExitKey();
             confirmPaused();
         }
 
@@ -313,7 +299,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());
-        private void pauseExternally() => AddStep("pause", () => Player.Pause());
+        private void pauseFromUserExitKey() => AddStep("user pause", () => Player.ExitViaPause());
         private void resume() => AddStep("resume", () => Player.Resume());
 
         private void confirmPauseOverlayShown(bool isShown) =>

From 9ad38ab20e9bcc6b43aa8cab09ee6f14c8b34638 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 16:31:00 +0900
Subject: [PATCH 08154/10326] Move HubClientConnector retrieval to IAPIProvider

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  3 --
 ...TestSceneMultiplayerGameplayLeaderboard.cs |  3 --
 osu.Game/Online/API/APIAccess.cs              |  2 ++
 osu.Game/Online/API/DummyAPIAccess.cs         |  2 ++
 osu.Game/Online/API/IAPIProvider.cs           |  9 +++++
 osu.Game/Online/HubClientConnector.cs         |  7 ++--
 osu.Game/Online/IHubClientConnector.cs        | 34 +++++++++++++++++++
 .../Online/Multiplayer/MultiplayerClient.cs   | 15 ++++----
 .../Spectator/SpectatorStreamingClient.cs     |  6 ++--
 9 files changed, 60 insertions(+), 21 deletions(-)
 create mode 100644 osu.Game/Online/IHubClientConnector.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 36e7e1fb29..4a0e1282c4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -12,7 +12,6 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online;
-using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu;
@@ -244,8 +243,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => null;
-
             public void StartPlay(int beatmapId)
             {
                 this.beatmapId = beatmapId;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 49abd62dba..aab69d687a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -13,7 +13,6 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Online;
-using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -106,8 +105,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 this.totalUsers = totalUsers;
             }
 
-            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => null;
-
             public void Start(int beatmapId)
             {
                 for (int i = 0; i < totalUsers; i++)
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 2aaea22155..657487971b 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -243,6 +243,8 @@ namespace osu.Game.Online.API
             this.password = password;
         }
 
+        public IHubClientConnector GetHubConnector(string clientName, string endpoint) => new HubClientConnector(clientName, endpoint, this);
+
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
         {
             Debug.Assert(State.Value == APIState.Offline);
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 3e996ac97f..943b52db88 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -83,6 +83,8 @@ namespace osu.Game.Online.API
             state.Value = APIState.Offline;
         }
 
+        public IHubClientConnector GetHubConnector(string clientName, string endpoint) => null;
+
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
         {
             Thread.Sleep(200);
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 1951dfaf40..34b7dc5f17 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.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.
 
+#nullable enable
+
 using System.Threading.Tasks;
 using osu.Framework.Bindables;
 using osu.Game.Users;
@@ -95,6 +97,13 @@ namespace osu.Game.Online.API
         /// </summary>
         void Logout();
 
+        /// <summary>
+        /// Constructs a new <see cref="IHubClientConnector"/>. May be null if not supported.
+        /// </summary>
+        /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
+        /// <param name="endpoint">The endpoint to the hub.</param>
+        IHubClientConnector? GetHubConnector(string clientName, string endpoint);
+
         /// <summary>
         /// Create a new user account. This is a blocking operation.
         /// </summary>
diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 2298ac4243..7884a294d3 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -16,15 +16,12 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online
 {
-    /// <summary>
-    /// A component that manages the life cycle of a connection to a SignalR Hub.
-    /// </summary>
-    public class HubClientConnector : IDisposable
+    public class HubClientConnector : IHubClientConnector
     {
         /// <summary>
         /// Invoked whenever a new hub connection is built, to configure it before it's started.
         /// </summary>
-        public Action<HubConnection>? ConfigureConnection;
+        public Action<HubConnection>? ConfigureConnection { get; set; }
 
         private readonly string clientName;
         private readonly string endpoint;
diff --git a/osu.Game/Online/IHubClientConnector.cs b/osu.Game/Online/IHubClientConnector.cs
new file mode 100644
index 0000000000..d2ceb1f030
--- /dev/null
+++ b/osu.Game/Online/IHubClientConnector.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.
+
+#nullable enable
+
+using System;
+using Microsoft.AspNetCore.SignalR.Client;
+using osu.Framework.Bindables;
+using osu.Game.Online.API;
+
+namespace osu.Game.Online
+{
+    /// <summary>
+    /// A component that manages the life cycle of a connection to a SignalR Hub.
+    /// Should generally be retrieved from an <see cref="IAPIProvider"/>.
+    /// </summary>
+    public interface IHubClientConnector : IDisposable
+    {
+        /// <summary>
+        /// The current connection opened by this connector.
+        /// </summary>
+        HubConnection? CurrentConnection { get; }
+
+        /// <summary>
+        /// Whether this is connected to the hub, use <see cref="CurrentConnection"/> to access the connection, if this is <c>true</c>.
+        /// </summary>
+        IBindable<bool> IsConnected { get; }
+
+        /// <summary>
+        /// Invoked whenever a new hub connection is built, to configure it before it's started.
+        /// </summary>
+        public Action<HubConnection>? ConfigureConnection { get; set; }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index ba2a8d7246..95d76f384f 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -17,7 +17,8 @@ namespace osu.Game.Online.Multiplayer
     public class MultiplayerClient : StatefulMultiplayerClient
     {
         private readonly string endpoint;
-        private HubClientConnector? connector;
+
+        private IHubClientConnector? connector;
 
         public override IBindable<bool> IsConnected { get; } = new BindableBool();
 
@@ -31,9 +32,11 @@ namespace osu.Game.Online.Multiplayer
         [BackgroundDependencyLoader]
         private void load(IAPIProvider api)
         {
-            connector = new HubClientConnector(nameof(MultiplayerClient), endpoint, api)
+            connector = api.GetHubConnector(nameof(MultiplayerClient), endpoint);
+
+            if (connector != null)
             {
-                ConfigureConnection = connection =>
+                connector.ConfigureConnection = connection =>
                 {
                     // this is kind of SILLY
                     // https://github.com/dotnet/aspnetcore/issues/15198
@@ -48,10 +51,10 @@ namespace osu.Game.Online.Multiplayer
                     connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
                     connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
                     connection.On<int, BeatmapAvailability>(nameof(IMultiplayerClient.UserBeatmapAvailabilityChanged), ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged);
-                },
-            };
+                };
 
-            IsConnected.BindTo(connector.IsConnected);
+                IsConnected.BindTo(connector.IsConnected);
+            }
         }
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 7e61da9b87..3a586874fe 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Online.Spectator
         private readonly string endpoint;
 
         [CanBeNull]
-        private HubClientConnector connector;
+        private IHubClientConnector connector;
 
         private readonly IBindable<bool> isConnected = new BindableBool();
 
@@ -86,7 +86,7 @@ namespace osu.Game.Online.Spectator
         [BackgroundDependencyLoader]
         private void load(IAPIProvider api)
         {
-            connector = CreateConnector(nameof(SpectatorStreamingClient), endpoint, api);
+            connector = api.GetHubConnector(nameof(SpectatorStreamingClient), endpoint);
 
             if (connector != null)
             {
@@ -129,8 +129,6 @@ namespace osu.Game.Online.Spectator
             }
         }
 
-        protected virtual HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => new HubClientConnector(name, endpoint, api);
-
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
         {
             if (!playingUsers.Contains(userId))

From 55d5d8d5be4c3ad504681d1fa0d605429ccad684 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 14 Feb 2021 23:31:57 +0900
Subject: [PATCH 08155/10326] Send version hash on hub connection

---
 osu.Game/Online/API/APIAccess.cs      |  7 +++++--
 osu.Game/Online/HubClientConnector.cs | 11 +++++++++--
 osu.Game/OsuGameBase.cs               |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 657487971b..8ffa0221c8 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Online.API
     {
         private readonly OsuConfigManager config;
 
+        private readonly string versionHash;
+
         private readonly OAuth authentication;
 
         private readonly Queue<APIRequest> queue = new Queue<APIRequest>();
@@ -56,9 +58,10 @@ namespace osu.Game.Online.API
 
         private readonly Logger log;
 
-        public APIAccess(OsuConfigManager config, EndpointConfiguration endpointConfiguration)
+        public APIAccess(OsuConfigManager config, EndpointConfiguration endpointConfiguration, string versionHash)
         {
             this.config = config;
+            this.versionHash = versionHash;
 
             APIEndpointUrl = endpointConfiguration.APIEndpointUrl;
             WebsiteRootUrl = endpointConfiguration.WebsiteRootUrl;
@@ -243,7 +246,7 @@ namespace osu.Game.Online.API
             this.password = password;
         }
 
-        public IHubClientConnector GetHubConnector(string clientName, string endpoint) => new HubClientConnector(clientName, endpoint, this);
+        public IHubClientConnector GetHubConnector(string clientName, string endpoint) => new HubClientConnector(clientName, endpoint, this, versionHash);
 
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
         {
diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 7884a294d3..fdb21c5000 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Online
 
         private readonly string clientName;
         private readonly string endpoint;
+        private readonly string versionHash;
         private readonly IAPIProvider api;
 
         /// <summary>
@@ -49,11 +50,13 @@ namespace osu.Game.Online
         /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
         /// <param name="endpoint">The endpoint to the hub.</param>
         /// <param name="api"> An API provider used to react to connection state changes.</param>
-        public HubClientConnector(string clientName, string endpoint, IAPIProvider api)
+        /// <param name="versionHash">The hash representing the current game version, used for verification purposes.</param>
+        public HubClientConnector(string clientName, string endpoint, IAPIProvider api, string versionHash)
         {
             this.clientName = clientName;
             this.endpoint = endpoint;
             this.api = api;
+            this.versionHash = versionHash;
 
             apiState.BindTo(api.State);
             apiState.BindValueChanged(state =>
@@ -129,7 +132,11 @@ namespace osu.Game.Online
         private HubConnection buildConnection(CancellationToken cancellationToken)
         {
             var builder = new HubConnectionBuilder()
-                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
+                .WithUrl(endpoint, options =>
+                {
+                    options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
+                    options.Headers.Add("OsuVersionHash", versionHash);
+                });
 
             if (RuntimeInfo.SupportsJIT)
                 builder.AddMessagePackProtocol();
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 174b5006a2..00b436931a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -228,7 +228,7 @@ namespace osu.Game
 
             MessageFormatter.WebsiteRootUrl = endpoints.WebsiteRootUrl;
 
-            dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints));
+            dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
 
             dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));
             dependencies.CacheAs(multiplayerClient = new MultiplayerClient(endpoints));

From 3562fddc27a2f4c31c3b93c93f70e660f8207dd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 17:02:07 +0900
Subject: [PATCH 08156/10326] Add missing nullability flag on CreateAccount
 return value

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

diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 34b7dc5f17..3a77b9cfee 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -111,6 +111,6 @@ namespace osu.Game.Online.API
         /// <param name="username">The username to create the account with.</param>
         /// <param name="password">The password to create the account with.</param>
         /// <returns>Any errors encoutnered during account creation.</returns>
-        RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password);
+        RegistrationRequest.RegistrationRequestErrors? CreateAccount(string email, string username, string password);
     }
 }

From de52b8a5ba0dc72f41d694c2ba7d1aa583276486 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 17:14:41 +0900
Subject: [PATCH 08157/10326] Fix test failures in PerformFromScreen tests

---
 osu.Game/Overlays/Volume/VolumeMeter.cs |  2 ++
 osu.Game/Screens/BackgroundScreen.cs    | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index 07accf8820..5b997bbd05 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -176,6 +176,7 @@ namespace osu.Game.Overlays.Volume
                     }
                 }
             };
+
             Bindable.ValueChanged += volume =>
             {
                 this.TransformTo("DisplayVolume",
@@ -183,6 +184,7 @@ namespace osu.Game.Overlays.Volume
                     400,
                     Easing.OutQuint);
             };
+
             bgProgress.Current.Value = 0.75f;
         }
 
diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index c81362eebe..48c5523883 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -68,15 +68,19 @@ namespace osu.Game.Screens
 
         public override bool OnExiting(IScreen next)
         {
-            this.FadeOut(transition_length, Easing.OutExpo);
-            this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
+            if (IsLoaded)
+            {
+                this.FadeOut(transition_length, Easing.OutExpo);
+                this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
+            }
 
             return base.OnExiting(next);
         }
 
         public override void OnResuming(IScreen last)
         {
-            this.MoveToX(0, transition_length, Easing.OutExpo);
+            if (IsLoaded)
+                this.MoveToX(0, transition_length, Easing.OutExpo);
             base.OnResuming(last);
         }
     }

From 6bfc7da671c355c5586cb556f473ae7773cecefb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 15 Feb 2021 18:10:45 +0900
Subject: [PATCH 08158/10326] Fix sample potentially playing at the wrong
 frequency

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 .../OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 1888bf06bd..c9fb234ccc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -117,8 +117,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             if (sampleReadyCount == null)
                 return;
 
-            var channel = sampleReadyCount.Play();
+            var channel = sampleReadyCount.GetChannel();
             channel.Frequency.Value = 0.77f + countReady * 0.06f;
+            channel.Play();
         }
 
         private void updateButtonColour(bool green)

From 1ac274e478b8fcb50d3cad3bf95f1c40d585231e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 21:22:18 +0900
Subject: [PATCH 08159/10326] 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 d88a11257d..e30416bc1c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.128.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.215.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d68a8a515c..cccebeb023 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.215.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 87ebd41fee..137c96a72d 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.Framework.iOS" Version="2021.128.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.215.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,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="2021.128.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.215.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 72b2123500f28257f140f6fc5f443e85973f99cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 21:42:35 +0900
Subject: [PATCH 08160/10326] Update nunit in line with framework

---
 osu.Game.Benchmarks/osu.Game.Benchmarks.csproj                  | 2 +-
 .../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 +-
 osu.Game/osu.Game.csproj                                        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index 7805bfcefc..ea43d9a54c 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="nunit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
 
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 54fddc297e..bf3aba5859 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 d55b4fe08a..fcc0cafefc 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 345c3e6d35..b4c686ccea 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 2a5a2e2fdb..2b084f3bee 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index d29ed94b5f..7e3868bd3b 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Moq" Version="4.16.0" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index 185b35e40d..77ae06d89c 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -6,7 +6,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cccebeb023..72f680f6f8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -33,7 +33,7 @@
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 </Project>

From a1496cd8f3afed32bd9c126a18dc8a3714ca6212 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 08:28:09 +0300
Subject: [PATCH 08161/10326] Remove necessity of using `CurrentModeRank` as a
 fallback

---
 .../TestSceneMultiplayerParticipantsList.cs            | 10 ++++++++--
 .../Multiplayer/Participants/ParticipantPanel.cs       |  4 ----
 osu.Game/Users/User.cs                                 |  9 ++++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 0f7a9b442d..5a0234e379 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -155,7 +155,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     {
                         Id = i,
                         Username = $"User {i}",
-                        CurrentModeRank = RNG.Next(1, 100000),
+                        AllStatistics =
+                        {
+                            { Ruleset.Value, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                        },
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     });
 
@@ -193,7 +196,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Id = 0,
                     Username = "User 0",
-                    CurrentModeRank = RNG.Next(1, 100000),
+                    AllStatistics =
+                    {
+                        { Ruleset.Value, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                    },
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 });
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 74bc86f279..e78264223e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -165,10 +165,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
 
             var currentModeRank = User.User?.GetStatisticsFor(ruleset)?.GlobalRank;
-
-            // fallback to current mode rank for testing purposes.
-            currentModeRank ??= User.User?.CurrentModeRank;
-
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 467f00e409..621d70301d 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -243,7 +243,10 @@ namespace osu.Game.Users
         [JsonExtensionData]
         private readonly IDictionary<string, JToken> otherProperties = new Dictionary<string, JToken>();
 
-        private readonly Dictionary<RulesetInfo, UserStatistics> statisticsCache = new Dictionary<RulesetInfo, UserStatistics>();
+        /// <summary>
+        /// Map for ruleset with their associated user statistics, can be altered for testing purposes.
+        /// </summary>
+        internal readonly Dictionary<RulesetInfo, UserStatistics> AllStatistics = new Dictionary<RulesetInfo, UserStatistics>();
 
         /// <summary>
         /// Retrieves the user statistics for a certain ruleset.
@@ -254,10 +257,10 @@ namespace osu.Game.Users
         // todo: this should likely be moved to a separate UserCompact class at some point.
         public UserStatistics GetStatisticsFor(RulesetInfo ruleset)
         {
-            if (statisticsCache.TryGetValue(ruleset, out var existing))
+            if (AllStatistics.TryGetValue(ruleset, out var existing))
                 return existing;
 
-            return statisticsCache[ruleset] = parseStatisticsFor(ruleset);
+            return AllStatistics[ruleset] = parseStatisticsFor(ruleset);
         }
 
         private UserStatistics parseStatisticsFor(RulesetInfo ruleset)

From 1466f36649f12edf22942b01c5bf278b1ee55f17 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 08:55:50 +0300
Subject: [PATCH 08162/10326] Improve documentation on `Statistics`

---
 osu.Game/Users/User.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 621d70301d..58f25703fc 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -185,9 +185,8 @@ namespace osu.Game.Users
         private UserStatistics statistics;
 
         /// <summary>
-        /// The user statistics of the ruleset specified within the API request.
-        /// If the user is fetched from a <see cref="GetUsersRequest"/> or similar
-        /// (i.e. is a user compact instance), use <see cref="GetStatisticsFor"/> instead.
+        /// User statistics for the requested ruleset (in the case of a <see cref="GetUserRequest"/> response).
+        /// Otherwise empty.
         /// </summary>
         [JsonProperty(@"statistics")]
         public UserStatistics Statistics

From 62514f23b59334ef3c6736941379a34c5ff0daf0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 08:56:01 +0300
Subject: [PATCH 08163/10326] Remove unnecessary json settings override

---
 osu.Game/Users/User.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 58f25703fc..b8ca345f5c 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -267,9 +267,7 @@ namespace osu.Game.Users
             if (!(otherProperties.TryGetValue($"statistics_{ruleset.ShortName}", out var token)))
                 return new UserStatistics();
 
-            var settings = JsonSerializableExtensions.CreateGlobalSettings();
-            settings.DefaultValueHandling = DefaultValueHandling.Include;
-            return token.ToObject<UserStatistics>(JsonSerializer.Create(settings));
+            return token.ToObject<UserStatistics>(JsonSerializer.Create(JsonSerializableExtensions.CreateGlobalSettings()));
         }
 
         public override string ToString() => Username;

From d15ffff9a57e6a09a1ecb6e196165eccd16c72e4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 09:54:17 +0300
Subject: [PATCH 08164/10326] Simplifiy user statistics retrieval to one-time
 on deserialization

---
 .../TestSceneMultiplayerParticipantsList.cs   |  4 +-
 .../Participants/ParticipantPanel.cs          |  3 +-
 osu.Game/Users/User.cs                        | 42 +++++++------------
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 5a0234e379..5da5ab74b2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         Username = $"User {i}",
                         AllStatistics =
                         {
-                            { Ruleset.Value, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                            { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
                         },
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     });
@@ -198,7 +198,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     Username = "User 0",
                     AllStatistics =
                     {
-                        { Ruleset.Value, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                        { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
                     },
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 });
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index e78264223e..49d3bfc2dc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.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 System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -164,7 +165,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
 
-            var currentModeRank = User.User?.GetStatisticsFor(ruleset)?.GlobalRank;
+            var currentModeRank = User.User?.AllStatistics.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index b8ca345f5c..2c2f293aac 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -5,13 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Runtime.Serialization;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using osu.Framework.Bindables;
 using osu.Game.IO.Serialization;
 using osu.Game.Online.API.Requests;
-using osu.Game.Rulesets;
 
 namespace osu.Game.Users
 {
@@ -238,36 +238,26 @@ namespace osu.Game.Users
         [JsonProperty("replays_watched_counts")]
         public UserHistoryCount[] ReplaysWatchedCounts;
 
+        /// <summary>
+        /// All user statistics per ruleset's short name (in the case of a <see cref="GetUsersRequest"/> response).
+        /// Otherwise empty. Can be altered for testing purposes.
+        /// </summary>
+        // todo: this should likely be moved to a separate UserCompact class at some point.
+        [UsedImplicitly]
+        public readonly Dictionary<string, UserStatistics> AllStatistics = new Dictionary<string, UserStatistics>();
+
         [UsedImplicitly]
         [JsonExtensionData]
         private readonly IDictionary<string, JToken> otherProperties = new Dictionary<string, JToken>();
 
-        /// <summary>
-        /// Map for ruleset with their associated user statistics, can be altered for testing purposes.
-        /// </summary>
-        internal readonly Dictionary<RulesetInfo, UserStatistics> AllStatistics = new Dictionary<RulesetInfo, UserStatistics>();
-
-        /// <summary>
-        /// Retrieves the user statistics for a certain ruleset.
-        /// If user is fetched from a <see cref="GetUserRequest"/>,
-        /// this will always return empty instance, use <see cref="Statistics"/> instead.
-        /// </summary>
-        /// <param name="ruleset">The ruleset to retrieve statistics for.</param>
-        // todo: this should likely be moved to a separate UserCompact class at some point.
-        public UserStatistics GetStatisticsFor(RulesetInfo ruleset)
+        [OnDeserialized]
+        private void onDeserialized(StreamingContext context)
         {
-            if (AllStatistics.TryGetValue(ruleset, out var existing))
-                return existing;
-
-            return AllStatistics[ruleset] = parseStatisticsFor(ruleset);
-        }
-
-        private UserStatistics parseStatisticsFor(RulesetInfo ruleset)
-        {
-            if (!(otherProperties.TryGetValue($"statistics_{ruleset.ShortName}", out var token)))
-                return new UserStatistics();
-
-            return token.ToObject<UserStatistics>(JsonSerializer.Create(JsonSerializableExtensions.CreateGlobalSettings()));
+            foreach (var kvp in otherProperties.Where(kvp => kvp.Key.StartsWith("statistics_", StringComparison.Ordinal)))
+            {
+                var shortName = kvp.Key.Replace("statistics_", string.Empty);
+                AllStatistics[shortName] = kvp.Value.ToObject<UserStatistics>(JsonSerializer.Create(JsonSerializableExtensions.CreateGlobalSettings()));
+            }
         }
 
         public override string ToString() => Username;

From e838a5d9f09ae14738981a9d49ec002f353952e6 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 15 Feb 2021 18:38:54 -0800
Subject: [PATCH 08165/10326] Fix comment edited at date not showing tooltip

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 31aa41e967..7c47ac655f 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -9,7 +9,6 @@ using osuTK;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Users.Drawables;
 using osu.Game.Graphics.Containers;
-using osu.Game.Utils;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Bindables;
 using System.Linq;
@@ -245,11 +244,32 @@ namespace osu.Game.Overlays.Comments
 
             if (Comment.EditedAt.HasValue)
             {
-                info.Add(new OsuSpriteText
+                var font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular);
+                var colour = colourProvider.Foreground1;
+
+                info.Add(new FillFlowContainer
                 {
-                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
-                    Text = $@"edited {HumanizerUtils.Humanize(Comment.EditedAt.Value)} by {Comment.EditedUser.Username}",
-                    Colour = colourProvider.Foreground1
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Font = font,
+                            Text = "edited ",
+                            Colour = colour
+                        },
+                        new DrawableDate(Comment.EditedAt.Value)
+                        {
+                            Font = font,
+                            Colour = colour
+                        },
+                        new OsuSpriteText
+                        {
+                            Font = font,
+                            Text = $@" by {Comment.EditedUser.Username}",
+                            Colour = colour
+                        },
+                    }
                 });
             }
 

From 02417697e994eb10183d4ba115c3085351a04a6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 13:32:14 +0900
Subject: [PATCH 08166/10326] Display remaining attempts for playlist rooms
 with room-level attempt limits

---
 osu.Game/Online/Rooms/ItemAttemptsCount.cs    | 19 +++++++++++++
 .../Online/Rooms/PlaylistAggregateScore.cs    | 16 +++++++++++
 osu.Game/Online/Rooms/Room.cs                 |  5 ++++
 .../Components/RoomLocalUserInfo.cs           | 27 +++++++++++++++----
 .../Screens/OnlinePlay/OnlinePlayComposite.cs |  3 +++
 5 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Online/Rooms/ItemAttemptsCount.cs
 create mode 100644 osu.Game/Online/Rooms/PlaylistAggregateScore.cs

diff --git a/osu.Game/Online/Rooms/ItemAttemptsCount.cs b/osu.Game/Online/Rooms/ItemAttemptsCount.cs
new file mode 100644
index 0000000000..298603d778
--- /dev/null
+++ b/osu.Game/Online/Rooms/ItemAttemptsCount.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 Newtonsoft.Json;
+
+namespace osu.Game.Online.Rooms
+{
+    /// <summary>
+    /// Represents attempts on a specific playlist item.
+    /// </summary>
+    public class ItemAttemptsCount
+    {
+        [JsonProperty("id")]
+        public int PlaylistItemID { get; set; }
+
+        [JsonProperty("attempts")]
+        public int Attempts { get; set; }
+    }
+}
diff --git a/osu.Game/Online/Rooms/PlaylistAggregateScore.cs b/osu.Game/Online/Rooms/PlaylistAggregateScore.cs
new file mode 100644
index 0000000000..61e0951cd5
--- /dev/null
+++ b/osu.Game/Online/Rooms/PlaylistAggregateScore.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 Newtonsoft.Json;
+
+namespace osu.Game.Online.Rooms
+{
+    /// <summary>
+    /// Represents aggregated score for the local user for a playlist.
+    /// </summary>
+    public class PlaylistAggregateScore
+    {
+        [JsonProperty("playlist_item_attempts")]
+        public ItemAttemptsCount[] PlaylistItemAttempts { get; set; }
+    }
+}
diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index 763ba25d52..10a60ab374 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -72,6 +72,10 @@ namespace osu.Game.Online.Rooms
         [JsonIgnore]
         public readonly Bindable<int?> MaxParticipants = new Bindable<int?>();
 
+        [Cached]
+        [JsonProperty("current_user_score")]
+        public readonly Bindable<PlaylistAggregateScore> UserScore = new Bindable<PlaylistAggregateScore>();
+
         [Cached]
         [JsonProperty("recent_participants")]
         public readonly BindableList<User> RecentParticipants = new BindableList<User>();
@@ -144,6 +148,7 @@ namespace osu.Game.Online.Rooms
             MaxParticipants.Value = other.MaxParticipants.Value;
             ParticipantCount.Value = other.ParticipantCount.Value;
             EndDate.Value = other.EndDate.Value;
+            UserScore.Value = other.UserScore.Value;
 
             if (EndDate.Value != null && DateTimeOffset.Now >= EndDate.Value)
                 Status.Value = new RoomStatusEnded();
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
index f52e59b0c8..2206726beb 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -39,12 +41,27 @@ namespace osu.Game.Screens.OnlinePlay.Components
         {
             base.LoadComplete();
 
-            MaxAttempts.BindValueChanged(attempts =>
+            MaxAttempts.BindValueChanged(_ => updateAttempts());
+            UserScore.BindValueChanged(_ => updateAttempts(), true);
+        }
+
+        private void updateAttempts()
+        {
+            if (MaxAttempts.Value != null)
             {
-                attemptDisplay.Text = attempts.NewValue == null
-                    ? string.Empty
-                    : $"Maximum attempts: {attempts.NewValue:N0}";
-            }, true);
+                attemptDisplay.Text = $"Maximum attempts: {MaxAttempts.Value:N0}";
+
+                if (UserScore.Value != null)
+                {
+                    int remaining = MaxAttempts.Value.Value - UserScore.Value.PlaylistItemAttempts.Sum(a => a.Attempts);
+                    attemptDisplay.Text += $" ({remaining} remaining)";
+                }
+            }
+
+            else
+            {
+                attemptDisplay.Text = string.Empty;
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index b2f3e4a1d9..f7a51230eb 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(typeof(Room))]
         protected Bindable<int?> MaxAttempts { get; private set; }
 
+        [Resolved(typeof(Room))]
+        public Bindable<PlaylistAggregateScore> UserScore { get; private set; }
+
         [Resolved(typeof(Room))]
         protected Bindable<DateTimeOffset?> EndDate { get; private set; }
 

From 5b4999e8afd8779e0da7cd153f3a59beaa59ea3c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 16 Feb 2021 04:51:21 +0300
Subject: [PATCH 08167/10326] Update user statistics retrieval with API changes

---
 .../TestSceneMultiplayerParticipantsList.cs   |  5 +++--
 .../Participants/ParticipantPanel.cs          |  2 +-
 osu.Game/Users/User.cs                        | 22 +++----------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 5da5ab74b2..a7398ebf02 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.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 System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
@@ -155,7 +156,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     {
                         Id = i,
                         Username = $"User {i}",
-                        AllStatistics =
+                        RulesetsStatistics = new Dictionary<string, UserStatistics>
                         {
                             { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
                         },
@@ -196,7 +197,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Id = 0,
                     Username = "User 0",
-                    AllStatistics =
+                    RulesetsStatistics = new Dictionary<string, UserStatistics>
                     {
                         { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
                     },
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 49d3bfc2dc..25bc314f1b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
 
-            var currentModeRank = User.User?.AllStatistics.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
+            var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 2c2f293aac..4a6fd540c7 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -5,12 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Runtime.Serialization;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using osu.Framework.Bindables;
-using osu.Game.IO.Serialization;
 using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Users
@@ -243,22 +240,9 @@ namespace osu.Game.Users
         /// Otherwise empty. Can be altered for testing purposes.
         /// </summary>
         // todo: this should likely be moved to a separate UserCompact class at some point.
-        [UsedImplicitly]
-        public readonly Dictionary<string, UserStatistics> AllStatistics = new Dictionary<string, UserStatistics>();
-
-        [UsedImplicitly]
-        [JsonExtensionData]
-        private readonly IDictionary<string, JToken> otherProperties = new Dictionary<string, JToken>();
-
-        [OnDeserialized]
-        private void onDeserialized(StreamingContext context)
-        {
-            foreach (var kvp in otherProperties.Where(kvp => kvp.Key.StartsWith("statistics_", StringComparison.Ordinal)))
-            {
-                var shortName = kvp.Key.Replace("statistics_", string.Empty);
-                AllStatistics[shortName] = kvp.Value.ToObject<UserStatistics>(JsonSerializer.Create(JsonSerializableExtensions.CreateGlobalSettings()));
-            }
-        }
+        [JsonProperty("statistics_rulesets")]
+        [CanBeNull]
+        public Dictionary<string, UserStatistics> RulesetsStatistics { get; set; }
 
         public override string ToString() => Username;
 

From 0e7f52b5ccb1ae1a14147d1df9877d22024fde6e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 16 Feb 2021 07:28:51 +0300
Subject: [PATCH 08168/10326] Always use JSON property `global_rank` for global
 ranks instead

---
 .../TestSceneMultiplayerParticipantsList.cs   | 16 ++++++++++--
 .../Participants/ParticipantPanel.cs          |  2 +-
 osu.Game/Users/UserStatistics.cs              | 25 ++++++++-----------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index a7398ebf02..1e14bbbbea 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -158,7 +158,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         Username = $"User {i}",
                         RulesetsStatistics = new Dictionary<string, UserStatistics>
                         {
-                            { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                            {
+                                Ruleset.Value.ShortName,
+                                new UserStatistics
+                                {
+                                    Ranks = new UserStatistics.UserRanks { Global = RNG.Next(1, 100000) }
+                                }
+                            }
                         },
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     });
@@ -199,7 +205,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     Username = "User 0",
                     RulesetsStatistics = new Dictionary<string, UserStatistics>
                     {
-                        { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                        {
+                            Ruleset.Value.ShortName,
+                            new UserStatistics
+                            {
+                                Ranks = new UserStatistics.UserRanks { Global = RNG.Next(1, 100000) }
+                            }
+                        }
                     },
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 });
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 25bc314f1b..c4d11676e7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
 
-            var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
+            var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.Ranks.Global;
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 6c069f674e..1fed908c39 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -3,7 +3,6 @@
 
 using System;
 using Newtonsoft.Json;
-using osu.Game.Online.API.Requests;
 using osu.Game.Scoring;
 using osu.Game.Utils;
 using static osu.Game.Users.User;
@@ -27,24 +26,22 @@ namespace osu.Game.Users
             public int Progress;
         }
 
-        /// <remarks>
-        /// This must only be used when coming from condensed user responses (e.g. from <see cref="GetUsersRequest"/>), otherwise use <code>Ranks.Global</code>.
-        /// </remarks>
-        // todo: this should likely be moved to a separate UserStatisticsCompact class at some point.
+        [JsonProperty(@"rank")]
+        public UserRanks Ranks;
+
+        // eventually UserRanks object will be completely replaced with separate global and country rank properties, see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
+        // but for now, always point UserRanks.Global to the global_rank property, as that is included solely for requests like GetUsersRequest.
         [JsonProperty(@"global_rank")]
-        public int? GlobalRank;
-
-        [JsonProperty(@"pp")]
-        public decimal? PP;
-
-        [JsonProperty(@"pp_rank")] // the API sometimes only returns this value in condensed user responses
-        private int? rank
+        private int? globalRank
         {
             set => Ranks.Global = value;
         }
 
-        [JsonProperty(@"rank")]
-        public UserRanks Ranks;
+        [JsonProperty(@"pp")]
+        public decimal? PP;
+
+        [JsonProperty(@"pp_rank")]
+        public int PPRank;
 
         [JsonProperty(@"ranked_score")]
         public long RankedScore;

From e82922f8c545a6e82247c3fafb336094308f6c30 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 13:44:36 +0900
Subject: [PATCH 08169/10326] Add the ability to deselect the currently
 selected room via clicking away

Always felt wrong that you couldn't do this until now.
---
 .../Multiplayer/TestSceneLoungeRoomsContainer.cs   | 14 ++++++++++++++
 .../OnlinePlay/Lounge/Components/RoomsContainer.cs | 10 ++++++++++
 2 files changed, 24 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index 279dcfa584..5682fd5c3c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -69,6 +69,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("last room joined", () => RoomManager.Rooms.Last().Status.Value is JoinedRoomStatus);
         }
 
+        [Test]
+        public void TestClickDeselection()
+        {
+            AddRooms(1);
+
+            AddAssert("no selection", () => checkRoomSelected(null));
+
+            press(Key.Down);
+            AddAssert("first room selected", () => checkRoomSelected(RoomManager.Rooms.First()));
+
+            AddStep("click away", () => InputManager.Click(MouseButton.Left));
+            AddAssert("no selection", () => checkRoomSelected(null));
+        }
+
         private void press(Key down)
         {
             AddStep($"press {down}", () => InputManager.Key(down));
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
index f70c33babe..134758d023 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
@@ -11,6 +11,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Framework.Threading;
 using osu.Game.Extensions;
 using osu.Game.Graphics.Cursor;
@@ -42,6 +43,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         [Resolved(CanBeNull = true)]
         private LoungeSubScreen loungeSubScreen { get; set; }
 
+        // handle deselection
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
         public RoomsContainer()
         {
             RelativeSizeAxes = Axes.X;
@@ -159,6 +163,12 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             JoinRequested?.Invoke(selectedRoom.Value);
         }
 
+        protected override bool OnClick(ClickEvent e)
+        {
+            selectRoom(null);
+            return base.OnClick(e);
+        }
+
         #region Key selection logic (shared with BeatmapCarousel)
 
         public bool OnPressed(GlobalAction action)

From e969ca8974d621eb4a089231f65b684f1a3d4f60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 13:52:42 +0900
Subject: [PATCH 08170/10326] Remove unused using statement that rider could
 not identify

---
 osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
index 2206726beb..c7d4ccd12e 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
@@ -3,7 +3,6 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;

From 31a5cdd8ac3339ed680a948355c1087af3fa3fd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 14:02:21 +0900
Subject: [PATCH 08171/10326] Fix current selection not updating visually after
 creating a new playlist

---
 .../Lounge/Components/RoomsContainer.cs          | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
index f70c33babe..40102b1693 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
@@ -69,8 +69,16 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             rooms.BindTo(roomManager.Rooms);
 
             filter?.BindValueChanged(criteria => Filter(criteria.NewValue));
+
+            selectedRoom.BindValueChanged(selection =>
+            {
+                updateSelection();
+            }, true);
         }
 
+        private void updateSelection() =>
+            roomFlow.Children.ForEach(r => r.State = r.Room == selectedRoom.Value ? SelectionState.Selected : SelectionState.NotSelected);
+
         public void Filter(FilterCriteria criteria)
         {
             roomFlow.Children.ForEach(r =>
@@ -125,6 +133,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             }
 
             Filter(filter?.Value);
+
+            updateSelection();
         }
 
         private void removeRooms(IEnumerable<Room> rooms)
@@ -146,11 +156,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 roomFlow.SetLayoutPosition(room, room.Room.Position.Value);
         }
 
-        private void selectRoom(Room room)
-        {
-            roomFlow.Children.ForEach(r => r.State = r.Room == room ? SelectionState.Selected : SelectionState.NotSelected);
-            selectedRoom.Value = room;
-        }
+        private void selectRoom(Room room) => selectedRoom.Value = room;
 
         private void joinSelected()
         {

From 9ed45ce1ca49c365a9a54cd7af71c7513ba5f233 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 14:31:00 +0900
Subject: [PATCH 08172/10326] Remove redundant double call to ValueChanged on
 UserMods change

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 2f50bee677..cc63f53ac0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -271,7 +271,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
-            UserMods.BindValueChanged(onUserModsChanged);
 
             client.LoadRequested += onLoadRequested;
             client.RoomUpdated += onRoomUpdated;

From 52e544aa678a5a2e2d42160299d2bf9cdfd88170 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 14:42:31 +0900
Subject: [PATCH 08173/10326] Revert "Remove redundant double call to
 ValueChanged on UserMods change"

This reverts commit 9ed45ce1ca49c365a9a54cd7af71c7513ba5f233.
---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index cc63f53ac0..2f50bee677 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -271,6 +271,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
+            UserMods.BindValueChanged(onUserModsChanged);
 
             client.LoadRequested += onLoadRequested;
             client.RoomUpdated += onRoomUpdated;

From da42c6d2825d1a97d048c29f2bd4730b1dd989d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 15:14:19 +0900
Subject: [PATCH 08174/10326] Expose FreeMods from OnlinePlaySongSelect

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

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index b201c62b7f..3f2873cbc4 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -31,7 +31,8 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
-        private readonly Bindable<IReadOnlyList<Mod>> freeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+        protected readonly Bindable<IReadOnlyList<Mod>> FreeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+
         private readonly FreeModSelectOverlay freeModSelectOverlay;
 
         private WorkingBeatmap initialBeatmap;
@@ -45,7 +46,7 @@ namespace osu.Game.Screens.OnlinePlay
 
             freeModSelectOverlay = new FreeModSelectOverlay
             {
-                SelectedMods = { BindTarget = freeMods },
+                SelectedMods = { BindTarget = FreeMods },
                 IsValidMod = IsValidFreeMod,
             };
         }
@@ -67,14 +68,14 @@ namespace osu.Game.Screens.OnlinePlay
             // At this point, Mods contains both the required and allowed mods. For selection purposes, it should only contain the required mods.
             // Similarly, freeMods is currently empty but should only contain the allowed mods.
             Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
-            freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            FreeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
 
             Ruleset.BindValueChanged(onRulesetChanged);
         }
 
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
         {
-            freeMods.Value = Array.Empty<Mod>();
+            FreeMods.Value = Array.Empty<Mod>();
         }
 
         protected sealed override bool OnStart()
@@ -90,7 +91,7 @@ namespace osu.Game.Screens.OnlinePlay
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
 
             item.AllowedMods.Clear();
-            item.AllowedMods.AddRange(freeMods.Value.Select(m => m.CreateCopy()));
+            item.AllowedMods.AddRange(FreeMods.Value.Select(m => m.CreateCopy()));
 
             SelectItem(item);
             return true;
@@ -133,7 +134,7 @@ namespace osu.Game.Screens.OnlinePlay
         protected override IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons()
         {
             var buttons = base.CreateFooterButtons().ToList();
-            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods { Current = freeMods }, freeModSelectOverlay));
+            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods { Current = FreeMods }, freeModSelectOverlay));
             return buttons;
         }
 

From fff1cb0b355e9b8984dbc950dd8d2d4412e01a94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 15:13:57 +0900
Subject: [PATCH 08175/10326] Fix allowed mods not being copied when populating
 playlist items

---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
index 0e8db6dfe5..21335fc90c 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
@@ -56,6 +56,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
             item.RequiredMods.Clear();
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
+
+            item.AllowedMods.Clear();
+            item.AllowedMods.AddRange(FreeMods.Value.Select(m => m.CreateCopy()));
         }
     }
 }

From 97a7572cb8daebc642cabe44e4ef8bbd1a0c97b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 15:14:48 +0900
Subject: [PATCH 08176/10326] Move UserModSelectOverlay to RoomSubScreen for
 Playlists consumption

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs | 68 ++++++++++++++++++-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 49 +------------
 2 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index e755f8c405..24d42283f7 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -3,16 +3,20 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 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;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
 
@@ -25,6 +29,14 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        private readonly ModSelectOverlay userModsSelectOverlay;
+
+        /// <summary>
+        /// A container that provides controls for selection of user mods.
+        /// This will be shown/hidden automatically when applicable.
+        /// </summary>
+        protected Drawable UserModsSection;
+
         private Sample sampleStart;
 
         [Resolved(typeof(Room), nameof(Room.Playlist))]
@@ -53,9 +65,26 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         protected RoomSubScreen()
         {
-            AddInternal(BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+            AddRangeInternal(new Drawable[]
             {
-                SelectedItem = { BindTarget = SelectedItem }
+                BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+                {
+                    SelectedItem = { BindTarget = SelectedItem }
+                },
+                new Container
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Depth = float.MinValue,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.5f,
+                    Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
+                    Child = userModsSelectOverlay = new UserModSelectOverlay
+                    {
+                        SelectedMods = { BindTarget = UserMods },
+                        IsValidMod = _ => false
+                    }
+                },
             });
         }
 
@@ -73,7 +102,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
             base.LoadComplete();
 
             SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(selectedItemChanged));
-            SelectedItem.Value = Playlist.FirstOrDefault();
+
+            Playlist.BindCollectionChanged(onPlaylistChanged, true);
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
@@ -81,6 +111,22 @@ namespace osu.Game.Screens.OnlinePlay.Match
             UserMods.BindValueChanged(_ => Scheduler.AddOnce(UpdateMods));
         }
 
+        public override bool OnBackButton()
+        {
+            if (userModsSelectOverlay.State.Value == Visibility.Visible)
+            {
+                userModsSelectOverlay.Hide();
+                return true;
+            }
+
+            return base.OnBackButton();
+        }
+
+        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) =>
+            SelectedItem.Value = Playlist.FirstOrDefault();
+
+        protected void ShowUserModSelect() => userModsSelectOverlay.Show();
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
@@ -131,6 +177,18 @@ namespace osu.Game.Screens.OnlinePlay.Match
             UpdateMods();
 
             Ruleset.Value = SelectedItem.Value.Ruleset.Value;
+
+            if (SelectedItem.Value?.AllowedMods.Any() != true)
+            {
+                UserModsSection?.Hide();
+                userModsSelectOverlay.Hide();
+                userModsSelectOverlay.IsValidMod = _ => false;
+            }
+            else
+            {
+                UserModsSection?.Show();
+                userModsSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
+            }
         }
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet) => Schedule(updateWorkingBeatmap);
@@ -190,5 +248,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
                 track.RestartPoint = 0;
             }
         }
+
+        private class UserModSelectOverlay : LocalPlayerModSelectOverlay
+        {
+        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 2f50bee677..49ac9f64ff 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
@@ -16,7 +15,6 @@ using osu.Framework.Threading;
 using osu.Game.Configuration;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
@@ -43,9 +41,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
-        private ModSelectOverlay userModsSelectOverlay;
         private MultiplayerMatchSettingsOverlay settingsOverlay;
-        private Drawable userModsSection;
 
         private IBindable<bool> isConnected;
 
@@ -155,7 +151,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                             new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
                                                                         }
                                                                     },
-                                                                    userModsSection = new FillFlowContainer
+                                                                    UserModsSection = new FillFlowContainer
                                                                     {
                                                                         RelativeSizeAxes = Axes.X,
                                                                         AutoSizeAxes = Axes.Y,
@@ -176,7 +172,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                                         Origin = Anchor.CentreLeft,
                                                                                         Width = 90,
                                                                                         Text = "Select",
-                                                                                        Action = () => userModsSelectOverlay.Show()
+                                                                                        Action = ShowUserModSelect,
                                                                                     },
                                                                                     new ModDisplay
                                                                                     {
@@ -231,19 +227,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                new Container
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    RelativeSizeAxes = Axes.Both,
-                    Height = 0.5f,
-                    Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
-                    Child = userModsSelectOverlay = new UserModSelectOverlay
-                    {
-                        SelectedMods = { BindTarget = UserMods },
-                        IsValidMod = _ => false
-                    }
-                },
                 settingsOverlay = new MultiplayerMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -269,7 +252,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            Playlist.BindCollectionChanged(onPlaylistChanged, true);
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
             UserMods.BindValueChanged(onUserModsChanged);
 
@@ -303,32 +285,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return true;
             }
 
-            if (userModsSelectOverlay.State.Value == Visibility.Visible)
-            {
-                userModsSelectOverlay.Hide();
-                return true;
-            }
-
             return base.OnBackButton();
         }
 
-        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            SelectedItem.Value = Playlist.FirstOrDefault();
-
-            if (SelectedItem.Value?.AllowedMods.Any() != true)
-            {
-                userModsSection.Hide();
-                userModsSelectOverlay.Hide();
-                userModsSelectOverlay.IsValidMod = _ => false;
-            }
-            else
-            {
-                userModsSection.Show();
-                userModsSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
-            }
-        }
-
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedModSettingsUpdate;
 
@@ -433,9 +392,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             modSettingChangeTracker?.Dispose();
         }
-
-        private class UserModSelectOverlay : LocalPlayerModSelectOverlay
-        {
-        }
     }
 }

From fdcb6384cb808e3f616a73a8343c98c5956cacf7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 15:14:56 +0900
Subject: [PATCH 08177/10326] Add user mod selection to playlists room screen

---
 .../Playlists/PlaylistsRoomSubScreen.cs       | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 88731a10bc..31c441bcd2 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -13,7 +13,9 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
+using osuTK;
 using Footer = osu.Game.Screens.OnlinePlay.Match.Components.Footer;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
@@ -140,13 +142,55 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                             RelativeSizeAxes = Axes.Both,
                                                             Content = new[]
                                                             {
-                                                                new Drawable[] { new OverlinedHeader("Leaderboard"), },
+                                                                new[]
+                                                                {
+                                                                    UserModsSection = new FillFlowContainer
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        AutoSizeAxes = Axes.Y,
+                                                                        Margin = new MarginPadding { Bottom = 10 },
+                                                                        Children = new Drawable[]
+                                                                        {
+                                                                            new OverlinedHeader("Extra mods"),
+                                                                            new FillFlowContainer
+                                                                            {
+                                                                                AutoSizeAxes = Axes.Both,
+                                                                                Direction = FillDirection.Horizontal,
+                                                                                Spacing = new Vector2(10, 0),
+                                                                                Children = new Drawable[]
+                                                                                {
+                                                                                    new PurpleTriangleButton
+                                                                                    {
+                                                                                        Anchor = Anchor.CentreLeft,
+                                                                                        Origin = Anchor.CentreLeft,
+                                                                                        Width = 90,
+                                                                                        Text = "Select",
+                                                                                        Action = ShowUserModSelect,
+                                                                                    },
+                                                                                    new ModDisplay
+                                                                                    {
+                                                                                        Anchor = Anchor.CentreLeft,
+                                                                                        Origin = Anchor.CentreLeft,
+                                                                                        DisplayUnrankedText = false,
+                                                                                        Current = UserMods,
+                                                                                        Scale = new Vector2(0.8f),
+                                                                                    },
+                                                                                }
+                                                                            }
+                                                                        }
+                                                                    },
+                                                                },
+                                                                new Drawable[]
+                                                                {
+                                                                    new OverlinedHeader("Leaderboard")
+                                                                },
                                                                 new Drawable[] { leaderboard = new MatchLeaderboard { RelativeSizeAxes = Axes.Both }, },
                                                                 new Drawable[] { new OverlinedHeader("Chat"), },
                                                                 new Drawable[] { new MatchChatDisplay { RelativeSizeAxes = Axes.Both } }
                                                             },
                                                             RowDimensions = new[]
                                                             {
+                                                                new Dimension(GridSizeMode.AutoSize),
                                                                 new Dimension(GridSizeMode.AutoSize),
                                                                 new Dimension(),
                                                                 new Dimension(GridSizeMode.AutoSize),

From f25b5147ef319c42329fd645490bf7ecc1907eb1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 15:37:45 +0900
Subject: [PATCH 08178/10326] Select last playlist item in match subscreen

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index c5130baa94..76608fb5c1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -302,7 +302,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            SelectedItem.Value = Playlist.FirstOrDefault();
+            SelectedItem.Value = Playlist.LastOrDefault();
 
             if (SelectedItem.Value?.AllowedMods.Any() != true)
             {

From 855d24dce769ae8ab65bd8f2daadfe638e6a76d8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 17:35:44 +0900
Subject: [PATCH 08179/10326] Cache selected item bindable from RoomSubScreen

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs |  1 +
 osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2946d07588..6a2844fa74 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
     [Cached(typeof(IPreviewTrackOwner))]
     public abstract class RoomSubScreen : OnlinePlaySubScreen, IPreviewTrackOwner
     {
+        [Cached(typeof(IBindable<PlaylistItem>))]
         protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index b2f3e4a1d9..c1aa93526f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -2,10 +2,12 @@
 // 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.Graphics.Containers;
 using osu.Game.Online.Rooms;
+using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.OnlinePlay
@@ -50,5 +52,13 @@ namespace osu.Game.Screens.OnlinePlay
 
         [Resolved(typeof(Room))]
         protected Bindable<TimeSpan?> Duration { get; private set; }
+
+        /// <summary>
+        /// The currently selected item in the <see cref="RoomSubScreen"/>.
+        /// May be null if this <see cref="OnlinePlayComposite"/> is not inside a <see cref="RoomSubScreen"/>.
+        /// </summary>
+        [CanBeNull]
+        [Resolved(typeof(Room), CanBeNull = true)]
+        protected IBindable<PlaylistItem> SelectedItem { get; private set; }
     }
 }

From 3ff9e14e35f851b32f40eb2339b6652beea37c2c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 18:56:13 +0900
Subject: [PATCH 08180/10326] Make StatefulMultiplayerClient control current
 playlist item

---
 .../Multiplayer/MultiplayerRoomSettings.cs    | 12 +++++--
 .../Multiplayer/StatefulMultiplayerClient.cs  | 35 ++++++++++---------
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  4 ---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 13 ++++---
 .../Playlists/PlaylistsRoomSubScreen.cs       |  7 ++--
 5 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 4fb9d724b5..04752f4e6f 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -36,18 +36,26 @@ namespace osu.Game.Online.Multiplayer
         [Key(5)]
         public IEnumerable<APIMod> AllowedMods { get; set; } = Enumerable.Empty<APIMod>();
 
+        /// <summary>
+        /// Only used for client-side mutation.
+        /// </summary>
+        [Key(6)]
+        public int PlaylistItemId { get; set; }
+
         public bool Equals(MultiplayerRoomSettings other)
             => BeatmapID == other.BeatmapID
                && BeatmapChecksum == other.BeatmapChecksum
                && RequiredMods.SequenceEqual(other.RequiredMods)
                && AllowedMods.SequenceEqual(other.AllowedMods)
                && RulesetID == other.RulesetID
-               && Name.Equals(other.Name, StringComparison.Ordinal);
+               && Name.Equals(other.Name, StringComparison.Ordinal)
+               && PlaylistItemId == other.PlaylistItemId;
 
         public override string ToString() => $"Name:{Name}"
                                              + $" Beatmap:{BeatmapID} ({BeatmapChecksum})"
                                              + $" RequiredMods:{string.Join(',', RequiredMods)}"
                                              + $" AllowedMods:{string.Join(',', AllowedMods)}"
-                                             + $" Ruleset:{RulesetID}";
+                                             + $" Ruleset:{RulesetID}"
+                                             + $" Item:{PlaylistItemId}";
     }
 }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 18464a5f61..f5f4c3a8ba 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -66,6 +66,8 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
 
+        public readonly Bindable<PlaylistItem?> CurrentMatchPlayingItem = new Bindable<PlaylistItem?>();
+
         /// <summary>
         /// The <see cref="MultiplayerRoomUser"/> corresponding to the local player, if available.
         /// </summary>
@@ -94,9 +96,6 @@ namespace osu.Game.Online.Multiplayer
 
         private Room? apiRoom;
 
-        // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
-        private int playlistItemId;
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -142,7 +141,6 @@ namespace osu.Game.Online.Multiplayer
                 {
                     Room = joinedRoom;
                     apiRoom = room;
-                    playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
                 }, cancellationSource.Token);
 
                 // Update room settings.
@@ -218,7 +216,8 @@ namespace osu.Game.Online.Multiplayer
                 BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
                 RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
                 RequiredMods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.RequiredMods,
-                AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods
+                AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods,
+                PlaylistItemId = Room.Settings.PlaylistItemId,
             });
         }
 
@@ -506,14 +505,13 @@ namespace osu.Game.Online.Multiplayer
             Room.Settings = settings;
             apiRoom.Name.Value = Room.Settings.Name;
 
-            // The playlist update is delayed until an online beatmap lookup (below) succeeds.
-            // In-order for the client to not display an outdated beatmap, the playlist is forcefully cleared here.
-            apiRoom.Playlist.Clear();
+            // The current item update is delayed until an online beatmap lookup (below) succeeds.
+            // In-order for the client to not display an outdated beatmap, the current item is forcefully cleared here.
+            CurrentMatchPlayingItem.Value = null;
 
             RoomUpdated?.Invoke();
 
             var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-
             req.Success += res =>
             {
                 if (cancellationToken.IsCancellationRequested)
@@ -540,18 +538,21 @@ namespace osu.Game.Online.Multiplayer
             var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
             var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
-            PlaylistItem playlistItem = new PlaylistItem
-            {
-                ID = playlistItemId,
-                Beatmap = { Value = beatmap },
-                Ruleset = { Value = ruleset.RulesetInfo },
-            };
+            // Update an existing playlist item from the API room, or create a new item.
+            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId);
 
+            if (playlistItem == null)
+                apiRoom.Playlist.Add(playlistItem = new PlaylistItem());
+
+            playlistItem.ID = settings.PlaylistItemId;
+            playlistItem.Beatmap.Value = beatmap;
+            playlistItem.Ruleset.Value = ruleset.RulesetInfo;
+            playlistItem.RequiredMods.Clear();
             playlistItem.RequiredMods.AddRange(mods);
+            playlistItem.AllowedMods.Clear();
             playlistItem.AllowedMods.AddRange(allowedMods);
 
-            apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
-            apiRoom.Playlist.Add(playlistItem);
+            CurrentMatchPlayingItem.Value = playlistItem;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 6a2844fa74..7740af9f63 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -28,9 +28,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         private Sample sampleStart;
 
-        [Resolved(typeof(Room), nameof(Room.Playlist))]
-        protected BindableList<PlaylistItem> Playlist { get; private set; }
-
         /// <summary>
         /// Any mods applied by/to the local user.
         /// </summary>
@@ -74,7 +71,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
             base.LoadComplete();
 
             SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(selectedItemChanged));
-            SelectedItem.Value = Playlist.FirstOrDefault();
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 76608fb5c1..f55b5b9713 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
@@ -269,7 +268,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            SelectedItem.BindValueChanged(onSelectedItemChanged);
+            SelectedItem.BindTo(client.CurrentMatchPlayingItem);
+
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
             UserMods.BindValueChanged(onUserModsChanged);
 
@@ -300,11 +301,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             return base.OnBackButton();
         }
 
-        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
+        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> item)
         {
-            SelectedItem.Value = Playlist.LastOrDefault();
-
-            if (SelectedItem.Value?.AllowedMods.Any() != true)
+            if (item.NewValue?.AllowedMods.Any() != true)
             {
                 userModsSection.Hide();
                 userModsSelectOverlay.Hide();
@@ -313,7 +312,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             else
             {
                 userModsSection.Show();
-                userModsSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
+                userModsSelectOverlay.IsValidMod = m => item.NewValue.AllowedMods.Any(a => a.GetType() == m.GetType());
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 88731a10bc..b4870ab580 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -27,6 +27,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
 
+        [Resolved(typeof(Room), nameof(Room.Playlist))]
+        private BindableList<PlaylistItem> playlist { get; set; }
+
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;
 
@@ -117,7 +120,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                                         new DrawableRoomPlaylistWithResults
                                                                         {
                                                                             RelativeSizeAxes = Axes.Both,
-                                                                            Items = { BindTarget = Playlist },
+                                                                            Items = { BindTarget = playlist },
                                                                             SelectedItem = { BindTarget = SelectedItem },
                                                                             RequestShowResults = item =>
                                                                             {
@@ -222,7 +225,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
                     // 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());
+                    Schedule(() => SelectedItem.Value = playlist.FirstOrDefault());
                 }
             }, true);
         }

From 2a1096a3c8ca7a3c5f656963dcbcb2c6e7770eed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 19:02:16 +0900
Subject: [PATCH 08181/10326] Make BeatmapSelectionControl use the selected
 item

---
 .../Match/BeatmapSelectionControl.cs            | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index f17e04d4d4..769596956b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -1,14 +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.Collections.Specialized;
-using System.Linq;
+using System.Diagnostics;
 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.Screens;
 using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
@@ -60,7 +61,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             base.LoadComplete();
 
-            Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            Debug.Assert(SelectedItem != null);
+            SelectedItem.BindValueChanged(onSelectedItemChanged, true);
+
             Host.BindValueChanged(host =>
             {
                 if (RoomID.Value == null || host.NewValue?.Equals(api.LocalUser.Value) == true)
@@ -70,12 +73,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             }, true);
         }
 
-        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
+        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> selectedItem)
         {
-            if (Playlist.Any())
-                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(Playlist.Single(), false, false);
-            else
+            if (selectedItem.NewValue == null)
                 beatmapPanelContainer.Clear();
+            else
+                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(selectedItem.NewValue, false, false);
         }
     }
 }

From e24a5949c5a61c105e9f4670c07cdbccf0d7def6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 19:26:51 +0900
Subject: [PATCH 08182/10326] Fix resolve

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

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index c1aa93526f..4c4b1ff6d0 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.OnlinePlay
         /// May be null if this <see cref="OnlinePlayComposite"/> is not inside a <see cref="RoomSubScreen"/>.
         /// </summary>
         [CanBeNull]
-        [Resolved(typeof(Room), CanBeNull = true)]
+        [Resolved(CanBeNull = true)]
         protected IBindable<PlaylistItem> SelectedItem { get; private set; }
     }
 }

From 3e802531d384761c0be4eeabed1d9c923ada7fc0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 19:29:40 +0900
Subject: [PATCH 08183/10326] Use long type where required in multiplayer

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs  | 2 +-
 osu.Game/Online/Rooms/CreateRoomScoreRequest.cs           | 6 +++---
 osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs        | 4 ++--
 osu.Game/Online/Rooms/GetRoomRequest.cs                   | 4 ++--
 osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs       | 8 ++++----
 osu.Game/Online/Rooms/MultiplayerScore.cs                 | 2 +-
 osu.Game/Online/Rooms/PlaylistItem.cs                     | 2 +-
 osu.Game/Online/Rooms/Room.cs                             | 2 +-
 osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs     | 6 +++---
 osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs           | 8 ++++----
 osu.Game/Screens/OnlinePlay/Components/RoomManager.cs     | 2 +-
 .../OnlinePlay/Match/Components/MatchChatDisplay.cs       | 2 +-
 .../OnlinePlay/Match/Components/MatchLeaderboard.cs       | 2 +-
 .../Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs  | 2 +-
 .../OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs    | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs        | 2 +-
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs  | 2 +-
 .../OnlinePlay/Playlists/PlaylistsResultsScreen.cs        | 4 ++--
 .../OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs        | 2 +-
 19 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 18464a5f61..639dce9230 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Online.Multiplayer
         private Room? apiRoom;
 
         // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
-        private int playlistItemId;
+        private long playlistItemId;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs b/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
index afd0dadc7e..d4303e77df 100644
--- a/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
+++ b/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
@@ -9,11 +9,11 @@ namespace osu.Game.Online.Rooms
 {
     public class CreateRoomScoreRequest : APIRequest<APIScoreToken>
     {
-        private readonly int roomId;
-        private readonly int playlistItemId;
+        private readonly long roomId;
+        private readonly long playlistItemId;
         private readonly string versionHash;
 
-        public CreateRoomScoreRequest(int roomId, int playlistItemId, string versionHash)
+        public CreateRoomScoreRequest(long roomId, long playlistItemId, string versionHash)
         {
             this.roomId = roomId;
             this.playlistItemId = playlistItemId;
diff --git a/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs b/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
index 15f1221a00..67e2a2b27f 100644
--- a/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
@@ -7,9 +7,9 @@ namespace osu.Game.Online.Rooms
 {
     public class GetRoomLeaderboardRequest : APIRequest<APILeaderboard>
     {
-        private readonly int roomId;
+        private readonly long roomId;
 
-        public GetRoomLeaderboardRequest(int roomId)
+        public GetRoomLeaderboardRequest(long roomId)
         {
             this.roomId = roomId;
         }
diff --git a/osu.Game/Online/Rooms/GetRoomRequest.cs b/osu.Game/Online/Rooms/GetRoomRequest.cs
index ce117075c7..853873901e 100644
--- a/osu.Game/Online/Rooms/GetRoomRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomRequest.cs
@@ -7,9 +7,9 @@ namespace osu.Game.Online.Rooms
 {
     public class GetRoomRequest : APIRequest<Room>
     {
-        public readonly int RoomId;
+        public readonly long RoomId;
 
-        public GetRoomRequest(int roomId)
+        public GetRoomRequest(long roomId)
         {
             RoomId = roomId;
         }
diff --git a/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs b/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
index 43f80a2dc4..abce2093e3 100644
--- a/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
@@ -15,8 +15,8 @@ namespace osu.Game.Online.Rooms
     /// </summary>
     public class IndexPlaylistScoresRequest : APIRequest<IndexedMultiplayerScores>
     {
-        public readonly int RoomId;
-        public readonly int PlaylistItemId;
+        public readonly long RoomId;
+        public readonly long PlaylistItemId;
 
         [CanBeNull]
         public readonly Cursor Cursor;
@@ -24,13 +24,13 @@ namespace osu.Game.Online.Rooms
         [CanBeNull]
         public readonly IndexScoresParams IndexParams;
 
-        public IndexPlaylistScoresRequest(int roomId, int playlistItemId)
+        public IndexPlaylistScoresRequest(long roomId, long playlistItemId)
         {
             RoomId = roomId;
             PlaylistItemId = playlistItemId;
         }
 
-        public IndexPlaylistScoresRequest(int roomId, int playlistItemId, [NotNull] Cursor cursor, [NotNull] IndexScoresParams indexParams)
+        public IndexPlaylistScoresRequest(long roomId, long playlistItemId, [NotNull] Cursor cursor, [NotNull] IndexScoresParams indexParams)
             : this(roomId, playlistItemId)
         {
             Cursor = cursor;
diff --git a/osu.Game/Online/Rooms/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs
index 677a3d3026..30c1d2f826 100644
--- a/osu.Game/Online/Rooms/MultiplayerScore.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScore.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Online.Rooms
     public class MultiplayerScore
     {
         [JsonProperty("id")]
-        public int ID { get; set; }
+        public long ID { get; set; }
 
         [JsonProperty("user")]
         public User User { get; set; }
diff --git a/osu.Game/Online/Rooms/PlaylistItem.cs b/osu.Game/Online/Rooms/PlaylistItem.cs
index ada2140ca6..61982101c1 100644
--- a/osu.Game/Online/Rooms/PlaylistItem.cs
+++ b/osu.Game/Online/Rooms/PlaylistItem.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online.Rooms
     public class PlaylistItem : IEquatable<PlaylistItem>
     {
         [JsonProperty("id")]
-        public int ID { get; set; }
+        public long ID { get; set; }
 
         [JsonProperty("beatmap_id")]
         public int BeatmapID { get; set; }
diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index 763ba25d52..997f45ce52 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Online.Rooms
     {
         [Cached]
         [JsonProperty("id")]
-        public readonly Bindable<int?> RoomID = new Bindable<int?>();
+        public readonly Bindable<long?> RoomID = new Bindable<long?>();
 
         [Cached]
         [JsonProperty("name")]
diff --git a/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs b/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
index 3f728a5417..ba3e3c6349 100644
--- a/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
+++ b/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
@@ -7,11 +7,11 @@ namespace osu.Game.Online.Rooms
 {
     public class ShowPlaylistUserScoreRequest : APIRequest<MultiplayerScore>
     {
-        private readonly int roomId;
-        private readonly int playlistItemId;
+        private readonly long roomId;
+        private readonly long playlistItemId;
         private readonly long userId;
 
-        public ShowPlaylistUserScoreRequest(int roomId, int playlistItemId, long userId)
+        public ShowPlaylistUserScoreRequest(long roomId, long playlistItemId, long userId)
         {
             this.roomId = roomId;
             this.playlistItemId = playlistItemId;
diff --git a/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs b/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
index 5a78b9fabd..9e432fa99e 100644
--- a/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
+++ b/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
@@ -11,12 +11,12 @@ namespace osu.Game.Online.Rooms
 {
     public class SubmitRoomScoreRequest : APIRequest<MultiplayerScore>
     {
-        private readonly int scoreId;
-        private readonly int roomId;
-        private readonly int playlistItemId;
+        private readonly long scoreId;
+        private readonly long roomId;
+        private readonly long playlistItemId;
         private readonly ScoreInfo scoreInfo;
 
-        public SubmitRoomScoreRequest(int scoreId, int roomId, int playlistItemId, ScoreInfo scoreInfo)
+        public SubmitRoomScoreRequest(long scoreId, long roomId, long playlistItemId, ScoreInfo scoreInfo)
         {
             this.scoreId = scoreId;
             this.roomId = roomId;
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
index 2ed259e2b8..227a772b2d 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
             joinedRoom.Value = null;
         }
 
-        private readonly HashSet<int> ignoredRooms = new HashSet<int>();
+        private readonly HashSet<long> ignoredRooms = new HashSet<long>();
 
         private void onRoomsReceived(List<Room> received)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
index 6da2866236..a96d64cb5d 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
     public class MatchChatDisplay : StandAloneChatDisplay
     {
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
+        private Bindable<long?> roomId { get; set; }
 
         [Resolved(typeof(Room), nameof(Room.ChannelId))]
         private Bindable<int> channelId { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
index 50869f42ff..134e083c42 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
     public class MatchLeaderboard : Leaderboard<MatchLeaderboardScope, APIUserScoreAggregate>
     {
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
+        private Bindable<long?> roomId { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index f0064ae0b4..3199232f6f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -357,7 +357,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         public class CreateOrUpdateButton : TriangleButton
         {
             [Resolved(typeof(Room), nameof(Room.RoomID))]
-            private Bindable<int?> roomId { get; set; }
+            private Bindable<long?> roomId { get; set; }
 
             protected override void LoadComplete()
             {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
index e3b47b3254..140b3c45d8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerResultsScreen : PlaylistsResultsScreen
     {
-        public MultiplayerResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
+        public MultiplayerResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem)
             : base(score, roomId, playlistItem, false, false)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index b2f3e4a1d9..239db18a07 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.OnlinePlay
     public class OnlinePlayComposite : CompositeDrawable
     {
         [Resolved(typeof(Room))]
-        protected Bindable<int?> RoomID { get; private set; }
+        protected Bindable<long?> RoomID { get; private set; }
 
         [Resolved(typeof(Room), nameof(Room.Name))]
         protected Bindable<string> RoomName { get; private set; }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 38eae2346a..ddc88261f7 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         public Action Exited;
 
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        protected Bindable<int?> RoomId { get; private set; }
+        protected Bindable<long?> RoomId { get; private set; }
 
         protected readonly PlaylistItem PlaylistItem;
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
index e13c8a9f82..2b252f9db7 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsResultsScreen : ResultsScreen
     {
-        private readonly int roomId;
+        private readonly long roomId;
         private readonly PlaylistItem playlistItem;
 
         protected LoadingSpinner LeftSpinner { get; private set; }
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public PlaylistsResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
+        public PlaylistsResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
             : base(score, allowRetry, allowWatchingReplay)
         {
             this.roomId = roomId;
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 88731a10bc..9ccf4775d0 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         public override string ShortTitle => "playlist";
 
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
+        private Bindable<long?> roomId { get; set; }
 
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;

From ffa90c1a2373b7d1c774f5d355a43452c9d19667 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 20:23:19 +0900
Subject: [PATCH 08184/10326] Remove whitespace

---
 osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
index c7d4ccd12e..1fcf7f2277 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
@@ -56,7 +56,6 @@ namespace osu.Game.Screens.OnlinePlay.Components
                     attemptDisplay.Text += $" ({remaining} remaining)";
                 }
             }
-
             else
             {
                 attemptDisplay.Text = string.Empty;

From 100097d78f0b28c66a86d9d8a4b8bbe309964429 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 21:32:35 +0900
Subject: [PATCH 08185/10326] Fix playlist not being handled correctly for
 non-joined cases

---
 .../Multiplayer/StatefulMultiplayerClient.cs       |  8 ++++----
 .../Multiplayer/Match/BeatmapSelectionControl.cs   | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f5f4c3a8ba..e9eb80e6a1 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -539,10 +539,7 @@ namespace osu.Game.Online.Multiplayer
             var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
             // Update an existing playlist item from the API room, or create a new item.
-            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId);
-
-            if (playlistItem == null)
-                apiRoom.Playlist.Add(playlistItem = new PlaylistItem());
+            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId) ?? new PlaylistItem();
 
             playlistItem.ID = settings.PlaylistItemId;
             playlistItem.Beatmap.Value = beatmap;
@@ -552,6 +549,9 @@ namespace osu.Game.Online.Multiplayer
             playlistItem.AllowedMods.Clear();
             playlistItem.AllowedMods.AddRange(allowedMods);
 
+            if (!apiRoom.Playlist.Contains(playlistItem))
+                apiRoom.Playlist.Add(playlistItem);
+
             CurrentMatchPlayingItem.Value = playlistItem;
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index 769596956b..8d394f2c2b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -2,8 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
+using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
@@ -62,7 +62,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             base.LoadComplete();
 
             Debug.Assert(SelectedItem != null);
-            SelectedItem.BindValueChanged(onSelectedItemChanged, true);
+            SelectedItem.BindValueChanged(_ => updateBeatmap());
+            Playlist.BindCollectionChanged((_, __) => updateBeatmap(), true);
 
             Host.BindValueChanged(host =>
             {
@@ -73,12 +74,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             }, true);
         }
 
-        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> selectedItem)
+        private void updateBeatmap()
         {
-            if (selectedItem.NewValue == null)
+            Debug.Assert(SelectedItem != null);
+            PlaylistItem item = SelectedItem.Value ?? Playlist.FirstOrDefault();
+
+            if (item == null)
                 beatmapPanelContainer.Clear();
             else
-                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(selectedItem.NewValue, false, false);
+                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(item, false, false);
         }
     }
 }

From f61b8e6154c596a33f43dceed8f55b35ce479f58 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 21:32:38 +0900
Subject: [PATCH 08186/10326] Change to long

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

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 04752f4e6f..473382cf5f 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Online.Multiplayer
         /// Only used for client-side mutation.
         /// </summary>
         [Key(6)]
-        public int PlaylistItemId { get; set; }
+        public long PlaylistItemId { get; set; }
 
         public bool Equals(MultiplayerRoomSettings other)
             => BeatmapID == other.BeatmapID

From 8f72631c314f576fb5e9b8ff0473ca23906a4f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 16 Feb 2021 21:48:19 +0100
Subject: [PATCH 08187/10326] Fix typo in comment

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 2f50bee677..3f3fee1b79 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -290,7 +290,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return;
 
             // update local mods based on room's reported status for the local user (omitting the base call implementation).
-            // this makes the server authoritative, and avoids the local user potentially settings mods that the server is not aware of (ie. if the match was started during the selection being changed).
+            // this makes the server authoritative, and avoids the local user potentially setting mods that the server is not aware of (ie. if the match was started during the selection being changed).
             var ruleset = Ruleset.Value.CreateInstance();
             Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
         }

From 3b4e02e5c78fd77325f188c0379785e47b61d6aa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 17 Feb 2021 07:29:45 +0300
Subject: [PATCH 08188/10326] Fix user population not immediate on bracket
 loading

---
 osu.Game.Tournament/TournamentGameBase.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 4224da4bbe..327d8f67b8 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Tournament
                 {
                     if (string.IsNullOrEmpty(p.Username) || p.Statistics == null)
                     {
-                        PopulateUser(p);
+                        PopulateUser(p, immediate: true);
                         addedInfo = true;
                     }
                 }
@@ -211,7 +211,7 @@ namespace osu.Game.Tournament
             return addedInfo;
         }
 
-        public void PopulateUser(User user, Action success = null, Action failure = null)
+        public void PopulateUser(User user, Action success = null, Action failure = null, bool immediate = false)
         {
             var req = new GetUserRequest(user.Id, Ruleset.Value);
 
@@ -231,7 +231,10 @@ namespace osu.Game.Tournament
                 failure?.Invoke();
             };
 
-            API.Queue(req);
+            if (immediate)
+                API.Perform(req);
+            else
+                API.Queue(req);
         }
 
         protected override void LoadComplete()

From 705e9267497bc1eec01da9d73ec2630ad2be327d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 17 Feb 2021 07:48:23 +0300
Subject: [PATCH 08189/10326] Fix attempting to populate users with invalid IDs

---
 osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 582f72429b..263bbc533c 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -277,7 +277,8 @@ namespace osu.Game.Tournament.Screens.Editors
                         userId.Value = user.Id.ToString();
                         userId.BindValueChanged(idString =>
                         {
-                            int.TryParse(idString.NewValue, out var parsed);
+                            if (!(int.TryParse(idString.NewValue, out var parsed)))
+                                return;
 
                             user.Id = parsed;
 

From 85ebc8e06cd45be8e66f40c059dac6b20c926cc8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 17 Feb 2021 07:49:28 +0300
Subject: [PATCH 08190/10326] Fix potentially overwriting user ID from failed
 request

---
 osu.Game.Tournament/TournamentGameBase.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 327d8f67b8..0b101f050f 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -225,11 +225,7 @@ namespace osu.Game.Tournament
                 success?.Invoke();
             };
 
-            req.Failure += _ =>
-            {
-                user.Id = 1;
-                failure?.Invoke();
-            };
+            req.Failure += _ => failure?.Invoke();
 
             if (immediate)
                 API.Perform(req);

From 9a7b6ebe5058ea4afb2fc17ad6b62b838caff187 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 14:30:52 +0900
Subject: [PATCH 08191/10326] Fix missed occurrence

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

diff --git a/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs b/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
index bcc8721400..172fa3a583 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Online.API.Requests.Responses
         public double? PP { get; set; }
 
         [JsonProperty(@"room_id")]
-        public int RoomID { get; set; }
+        public long RoomID { get; set; }
 
         [JsonProperty("total_score")]
         public long TotalScore { get; set; }

From a845e96b7a8a6eb55615c38567e5a1716b334008 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 17 Feb 2021 08:50:48 +0300
Subject: [PATCH 08192/10326] Replace `Ranks.Global` completely with a
 `GlobalRank` property

---
 osu.Desktop/DiscordRichPresence.cs               |  2 +-
 .../TestSceneMultiplayerParticipantsList.cs      | 10 ++--------
 .../Visual/Online/TestSceneRankGraph.cs          | 10 +++++-----
 .../Visual/Online/TestSceneUserProfileOverlay.cs |  3 ++-
 osu.Game.Tournament.Tests/TournamentTestScene.cs | 10 +++++-----
 osu.Game.Tournament/Models/TournamentTeam.cs     |  2 +-
 .../Screens/TeamIntro/SeedingScreen.cs           |  2 +-
 osu.Game.Tournament/TournamentGameBase.cs        |  2 +-
 .../Profile/Header/CentreHeaderContainer.cs      |  2 +-
 .../Profile/Header/DetailHeaderContainer.cs      |  2 +-
 .../Multiplayer/Participants/ParticipantPanel.cs |  2 +-
 osu.Game/Users/UserStatistics.cs                 | 16 +++++-----------
 12 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index 63b12fb84b..832d26b0ef 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -105,7 +105,7 @@ namespace osu.Desktop
             if (privacyMode.Value == DiscordRichPresenceMode.Limited)
                 presence.Assets.LargeImageText = string.Empty;
             else
-                presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.Ranks.Global > 0 ? $" (rank #{user.Value.Statistics.Ranks.Global:N0})" : string.Empty);
+                presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.GlobalRank > 0 ? $" (rank #{user.Value.Statistics.GlobalRank:N0})" : string.Empty);
 
             // update ruleset
             presence.Assets.SmallImageKey = ruleset.Value.ID <= 3 ? $"mode_{ruleset.Value.ID}" : "mode_custom";
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 1e14bbbbea..e713cff233 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -160,10 +160,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         {
                             {
                                 Ruleset.Value.ShortName,
-                                new UserStatistics
-                                {
-                                    Ranks = new UserStatistics.UserRanks { Global = RNG.Next(1, 100000) }
-                                }
+                                new UserStatistics { GlobalRank = RNG.Next(1, 100000), }
                             }
                         },
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
@@ -207,10 +204,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     {
                         {
                             Ruleset.Value.ShortName,
-                            new UserStatistics
-                            {
-                                Ranks = new UserStatistics.UserRanks { Global = RNG.Next(1, 100000) }
-                            }
+                            new UserStatistics { GlobalRank = RNG.Next(1, 100000), }
                         }
                     },
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
index 3b31192259..5bf9e31309 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 graph.Statistics.Value = new UserStatistics
                 {
-                    Ranks = new UserStatistics.UserRanks { Global = 123456 },
+                    GlobalRank = 123456,
                     PP = 12345,
                 };
             });
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 graph.Statistics.Value = new UserStatistics
                 {
-                    Ranks = new UserStatistics.UserRanks { Global = 89000 },
+                    GlobalRank = 89000,
                     PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 graph.Statistics.Value = new UserStatistics
                 {
-                    Ranks = new UserStatistics.UserRanks { Global = 89000 },
+                    GlobalRank = 89000,
                     PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
@@ -105,7 +105,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 graph.Statistics.Value = new UserStatistics
                 {
-                    Ranks = new UserStatistics.UserRanks { Global = 12000 },
+                    GlobalRank = 12000,
                     PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 graph.Statistics.Value = new UserStatistics
                 {
-                    Ranks = new UserStatistics.UserRanks { Global = 12000 },
+                    GlobalRank = 12000,
                     PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index 7ade24f4de..b52cc6edb6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -33,7 +33,8 @@ namespace osu.Game.Tests.Visual.Online
             ProfileOrder = new[] { "me" },
             Statistics = new UserStatistics
             {
-                Ranks = new UserStatistics.UserRanks { Global = 2148, Country = 1 },
+                GlobalRank = 2148,
+                Ranks = new UserStatistics.UserRanks { Country = 1, },
                 PP = 4567.89m,
                 Level = new UserStatistics.LevelInfo
                 {
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 47d2160561..cdfd19c157 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -113,11 +113,11 @@ namespace osu.Game.Tournament.Tests
                     },
                     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 } } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 12 } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 16 } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 20 } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 24 } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 30 } },
                     }
                 }
             },
diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index 7fca75cea4..7074ae413c 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Tournament.Models
         {
             get
             {
-                var ranks = Players.Select(p => p.Statistics?.Ranks.Global)
+                var ranks = Players.Select(p => p.Statistics?.GlobalRank)
                                    .Where(i => i.HasValue)
                                    .Select(i => i.Value)
                                    .ToArray();
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index 55fc80dba2..4f66d89b7f 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                 };
 
                 foreach (var p in team.Players)
-                    fill.Add(new RowDisplay(p.Username, p.Statistics?.Ranks.Global?.ToString("\\##,0") ?? "-"));
+                    fill.Add(new RowDisplay(p.Username, p.Statistics?.GlobalRank?.ToString("\\##,0") ?? "-"));
             }
 
             internal class RowDisplay : CompositeDrawable
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 0b101f050f..3a2a880811 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Tournament
             {
                 foreach (var p in t.Players)
                 {
-                    if (string.IsNullOrEmpty(p.Username) || p.Statistics == null)
+                    if (string.IsNullOrEmpty(p.Username) || p.Statistics?.GlobalRank == null)
                     {
                         PopulateUser(p, immediate: true);
                         addedInfo = true;
diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 04a1040e06..9285e2d875 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Overlays.Profile.Header
 
         private void updateDisplay(User user)
         {
-            hiddenDetailGlobal.Content = user?.Statistics?.Ranks.Global?.ToString("\\##,##0") ?? "-";
+            hiddenDetailGlobal.Content = user?.Statistics?.GlobalRank?.ToString("\\##,##0") ?? "-";
             hiddenDetailCountry.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
         }
     }
diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
index cf6ae1a3fc..05a0508e1f 100644
--- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Overlays.Profile.Header
             foreach (var scoreRankInfo in scoreRankInfos)
                 scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0;
 
-            detailGlobalRank.Content = user?.Statistics?.Ranks.Global?.ToString("\\##,##0") ?? "-";
+            detailGlobalRank.Content = user?.Statistics?.GlobalRank?.ToString("\\##,##0") ?? "-";
             detailCountryRank.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
 
             rankGraph.Statistics.Value = user?.Statistics;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index c4d11676e7..25bc314f1b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
 
-            var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.Ranks.Global;
+            var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 1fed908c39..e50ca57d90 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -26,17 +26,14 @@ namespace osu.Game.Users
             public int Progress;
         }
 
+        [JsonProperty(@"global_rank")]
+        public int? GlobalRank;
+
+        // eventually UserRanks object will be completely replaced with separate global rank (exists) and country rank properties
+        // see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
         [JsonProperty(@"rank")]
         public UserRanks Ranks;
 
-        // eventually UserRanks object will be completely replaced with separate global and country rank properties, see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
-        // but for now, always point UserRanks.Global to the global_rank property, as that is included solely for requests like GetUsersRequest.
-        [JsonProperty(@"global_rank")]
-        private int? globalRank
-        {
-            set => Ranks.Global = value;
-        }
-
         [JsonProperty(@"pp")]
         public decimal? PP;
 
@@ -120,9 +117,6 @@ namespace osu.Game.Users
 
         public struct UserRanks
         {
-            [JsonProperty(@"global")]
-            public int? Global;
-
             [JsonProperty(@"country")]
             public int? Country;
         }

From fb0e9d6760c2877ae97b40ad62d601b9e6774369 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 16:44:39 +0900
Subject: [PATCH 08193/10326] Add played property to playlist item

---
 osu.Game/Online/Rooms/PlaylistItem.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/Rooms/PlaylistItem.cs b/osu.Game/Online/Rooms/PlaylistItem.cs
index 61982101c1..1d409d4b56 100644
--- a/osu.Game/Online/Rooms/PlaylistItem.cs
+++ b/osu.Game/Online/Rooms/PlaylistItem.cs
@@ -23,6 +23,12 @@ namespace osu.Game.Online.Rooms
         [JsonProperty("ruleset_id")]
         public int RulesetID { get; set; }
 
+        /// <summary>
+        /// Whether this <see cref="PlaylistItem"/> is still a valid selection for the <see cref="Room"/>.
+        /// </summary>
+        [JsonProperty("expired")]
+        public bool Expired { get; set; }
+
         [JsonIgnore]
         public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
 

From 61bf9a64bb117483093318b99ce135cd50a2e8c0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 17 Feb 2021 11:21:33 +0300
Subject: [PATCH 08194/10326] Revert failed user requests changes with
 returning user ID instead

---
 osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs | 3 +--
 osu.Game.Tournament/TournamentGameBase.cs               | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 263bbc533c..582f72429b 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -277,8 +277,7 @@ namespace osu.Game.Tournament.Screens.Editors
                         userId.Value = user.Id.ToString();
                         userId.BindValueChanged(idString =>
                         {
-                            if (!(int.TryParse(idString.NewValue, out var parsed)))
-                                return;
+                            int.TryParse(idString.NewValue, out var parsed);
 
                             user.Id = parsed;
 
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 0b101f050f..ffda101ee0 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -217,6 +217,8 @@ namespace osu.Game.Tournament
 
             req.Success += res =>
             {
+                user.Id = res.Id;
+
                 user.Username = res.Username;
                 user.Statistics = res.Statistics;
                 user.Country = res.Country;
@@ -225,7 +227,11 @@ namespace osu.Game.Tournament
                 success?.Invoke();
             };
 
-            req.Failure += _ => failure?.Invoke();
+            req.Failure += _ =>
+            {
+                user.Id = 1;
+                failure?.Invoke();
+            };
 
             if (immediate)
                 API.Perform(req);

From 0d1149911c44f16b1017c96ed79638fbcfe00a5c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 17:33:10 +0900
Subject: [PATCH 08195/10326] Don't display expired playlist items

---
 osu.Game/Online/Rooms/Room.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index 997f45ce52..aaaa712860 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -148,6 +148,12 @@ namespace osu.Game.Online.Rooms
             if (EndDate.Value != null && DateTimeOffset.Now >= EndDate.Value)
                 Status.Value = new RoomStatusEnded();
 
+            // Todo: This is not the best way/place to do this, but the intention is to display all playlist items when the room has ended,
+            // and display only the non-expired playlist items while the room is still active.
+            // In order to achieve this, all expired items are removed from the source Room.
+            if (!(Status.Value is RoomStatusEnded))
+                other.Playlist.RemoveAll(i => i.Expired);
+
             if (!Playlist.SequenceEqual(other.Playlist))
             {
                 Playlist.Clear();

From 70a995919cde7ae34501afac229872cf7317e693 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 17:58:24 +0900
Subject: [PATCH 08196/10326] Update comments

---
 osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs        | 3 ---
 osu.Game/Online/Rooms/Room.cs                                 | 4 ++--
 .../OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs   | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 473382cf5f..7d6c76bc2f 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -36,9 +36,6 @@ namespace osu.Game.Online.Multiplayer
         [Key(5)]
         public IEnumerable<APIMod> AllowedMods { get; set; } = Enumerable.Empty<APIMod>();
 
-        /// <summary>
-        /// Only used for client-side mutation.
-        /// </summary>
         [Key(6)]
         public long PlaylistItemId { get; set; }
 
diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index aaaa712860..00a7979f2c 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -149,8 +149,8 @@ namespace osu.Game.Online.Rooms
                 Status.Value = new RoomStatusEnded();
 
             // Todo: This is not the best way/place to do this, but the intention is to display all playlist items when the room has ended,
-            // and display only the non-expired playlist items while the room is still active.
-            // In order to achieve this, all expired items are removed from the source Room.
+            // and display only the non-expired playlist items while the room is still active. In order to achieve this, all expired items are removed from the source Room.
+            // More refactoring is required before this can be done locally instead - DrawableRoomPlaylist is currently directly bound to the playlist to display items in the room.
             if (!(Status.Value is RoomStatusEnded))
                 other.Playlist.RemoveAll(i => i.Expired);
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index 8d394f2c2b..3cf0767cf8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -77,6 +77,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         private void updateBeatmap()
         {
             Debug.Assert(SelectedItem != null);
+
+            // When the selected item is null, the match hasn't yet been created. Use the playlist directly, which is mutated by song selection.
             PlaylistItem item = SelectedItem.Value ?? Playlist.FirstOrDefault();
 
             if (item == null)

From 604add04e495cbed44991962f3fa4e1bcb8b1451 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 19:06:37 +0900
Subject: [PATCH 08197/10326] Fix song select mods being reset incorrectly

---
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index b201c62b7f..c60743a226 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Humanizer;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -31,6 +32,10 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
+        [CanBeNull]
+        [Resolved(CanBeNull = true)]
+        private IBindable<PlaylistItem> selectedItem { get; set; }
+
         private readonly Bindable<IReadOnlyList<Mod>> freeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
         private readonly FreeModSelectOverlay freeModSelectOverlay;
 
@@ -66,8 +71,8 @@ namespace osu.Game.Screens.OnlinePlay
 
             // At this point, Mods contains both the required and allowed mods. For selection purposes, it should only contain the required mods.
             // Similarly, freeMods is currently empty but should only contain the allowed mods.
-            Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
-            freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            Mods.Value = selectedItem?.Value?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            freeMods.Value = selectedItem?.Value?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
 
             Ruleset.BindValueChanged(onRulesetChanged);
         }

From c1620ce21b6e3194a200e980bb79891c0406be24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 19:19:49 +0900
Subject: [PATCH 08198/10326] Fix intro beatmap always being imported even if
 already in a good state

---
 osu.Game/Screens/Menu/IntroScreen.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index b8b962be6c..71b83d4aab 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -111,12 +111,10 @@ namespace osu.Game.Screens.Menu
             {
                 setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == BeatmapHash);
 
-                if (setInfo != null)
-                {
-                    initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-                }
+                if (setInfo == null)
+                    return false;
 
-                return UsingThemedIntro;
+                return (initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0])) != null;
             }
         }
 

From c1db33e0753e665334abd833330e13e5c3ee5c74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 17:04:43 +0900
Subject: [PATCH 08199/10326] Improve some xmldoc on ArchiveModelManager for
 methods which are not going to trigger user interactive flow

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

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 232acba4a3..cc107d61c6 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Database
         public Action<IEnumerable<TModel>> PresentImport;
 
         /// <summary>
-        /// Import an item from an <see cref="ArchiveReader"/>.
+        /// Silently import an item from an <see cref="ArchiveReader"/>.
         /// </summary>
         /// <param name="archive">The archive to be imported.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
@@ -303,7 +303,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Import an item from a <typeparamref name="TModel"/>.
+        /// Silently import an item from a <typeparamref name="TModel"/>.
         /// </summary>
         /// <param name="item">The model to be imported.</param>
         /// <param name="archive">An optional archive to use for model population.</param>

From 0196ee882a5c6a956827e84fc79fb824de51a07c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 19:09:38 +0900
Subject: [PATCH 08200/10326] Redirect batch imports to a separate task
 scheduler to avoid contention with interactive actions

---
 ...eneOnlinePlayBeatmapAvailabilityTracker.cs |  4 +--
 osu.Game/Database/ArchiveModelManager.cs      | 36 ++++++++++++++-----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
index d3475de157..3ffb512b7f 100644
--- a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
@@ -165,10 +165,10 @@ namespace osu.Game.Tests.Online
             {
             }
 
-            public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
+            public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, bool lowPriority = false, CancellationToken cancellationToken = default)
             {
                 await AllowImport.Task;
-                return await (CurrentImportTask = base.Import(item, archive, cancellationToken));
+                return await (CurrentImportTask = base.Import(item, archive, lowPriority, cancellationToken));
             }
         }
 
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index cc107d61c6..03b8db2cb8 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -38,6 +38,11 @@ namespace osu.Game.Database
     {
         private const int import_queue_request_concurrency = 1;
 
+        /// <summary>
+        /// The size of a batch import operation before considering it a lower priority operation.
+        /// </summary>
+        private const int low_priority_import_batch_size = 1;
+
         /// <summary>
         /// A singleton scheduler shared by all <see cref="ArchiveModelManager{TModel,TFileModel}"/>.
         /// </summary>
@@ -47,6 +52,13 @@ namespace osu.Game.Database
         /// </remarks>
         private static readonly ThreadedTaskScheduler import_scheduler = new ThreadedTaskScheduler(import_queue_request_concurrency, nameof(ArchiveModelManager<TModel, TFileModel>));
 
+        /// <summary>
+        /// A second scheduler for lower priority imports.
+        /// For simplicity, these will just run in parallel with normal priority imports, but a future refactor would see this implemented via a custom scheduler/queue.
+        /// See https://gist.github.com/peppy/f0e118a14751fc832ca30dd48ba3876b for an incomplete version of this.
+        /// </summary>
+        private static readonly ThreadedTaskScheduler import_scheduler_low_priority = new ThreadedTaskScheduler(import_queue_request_concurrency, nameof(ArchiveModelManager<TModel, TFileModel>));
+
         /// <summary>
         /// Set an endpoint for notifications to be posted to.
         /// </summary>
@@ -103,8 +115,11 @@ namespace osu.Game.Database
 
         /// <summary>
         /// Import one or more <typeparamref name="TModel"/> items from filesystem <paramref name="paths"/>.
-        /// This will post notifications tracking progress.
         /// </summary>
+        /// <remarks>
+        /// This will be treated as a low priority import if more than one path is specified; use <see cref="Import(ImportTask[])"/> to always import at standard priority.
+        /// This will post notifications tracking progress.
+        /// </remarks>
         /// <param name="paths">One or more archive locations on disk.</param>
         public Task Import(params string[] paths)
         {
@@ -133,13 +148,15 @@ namespace osu.Game.Database
 
             var imported = new List<TModel>();
 
+            bool isLowPriorityImport = tasks.Length > low_priority_import_batch_size;
+
             await Task.WhenAll(tasks.Select(async task =>
             {
                 notification.CancellationToken.ThrowIfCancellationRequested();
 
                 try
                 {
-                    var model = await Import(task, notification.CancellationToken);
+                    var model = await Import(task, isLowPriorityImport, notification.CancellationToken);
 
                     lock (imported)
                     {
@@ -193,15 +210,16 @@ namespace osu.Game.Database
         /// Note that this bypasses the UI flow and should only be used for special cases or testing.
         /// </summary>
         /// <param name="task">The <see cref="ImportTask"/> containing data about the <typeparamref name="TModel"/> to import.</param>
+        /// <param name="lowPriority">Whether this is a low priority import.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
         /// <returns>The imported model, if successful.</returns>
-        internal async Task<TModel> Import(ImportTask task, CancellationToken cancellationToken = default)
+        internal async Task<TModel> Import(ImportTask task, bool lowPriority = false, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
             TModel import;
             using (ArchiveReader reader = task.GetReader())
-                import = await Import(reader, cancellationToken);
+                import = await Import(reader, lowPriority, cancellationToken);
 
             // We may or may not want to delete the file depending on where it is stored.
             //  e.g. reconstructing/repairing database with items from default storage.
@@ -229,8 +247,9 @@ namespace osu.Game.Database
         /// Silently import an item from an <see cref="ArchiveReader"/>.
         /// </summary>
         /// <param name="archive">The archive to be imported.</param>
+        /// <param name="lowPriority">Whether this is a low priority import.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
-        public Task<TModel> Import(ArchiveReader archive, CancellationToken cancellationToken = default)
+        public Task<TModel> Import(ArchiveReader archive, bool lowPriority = false, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -253,7 +272,7 @@ namespace osu.Game.Database
                 return null;
             }
 
-            return Import(model, archive, cancellationToken);
+            return Import(model, archive, lowPriority, cancellationToken);
         }
 
         /// <summary>
@@ -307,8 +326,9 @@ namespace osu.Game.Database
         /// </summary>
         /// <param name="item">The model to be imported.</param>
         /// <param name="archive">An optional archive to use for model population.</param>
+        /// <param name="lowPriority">Whether this is a low priority import.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
-        public virtual async Task<TModel> Import(TModel item, ArchiveReader archive = null, CancellationToken cancellationToken = default) => await Task.Factory.StartNew(async () =>
+        public virtual async Task<TModel> Import(TModel item, ArchiveReader archive = null, bool lowPriority = false, CancellationToken cancellationToken = default) => await Task.Factory.StartNew(async () =>
         {
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -383,7 +403,7 @@ namespace osu.Game.Database
 
             flushEvents(true);
             return item;
-        }, cancellationToken, TaskCreationOptions.HideScheduler, import_scheduler).Unwrap();
+        }, cancellationToken, TaskCreationOptions.HideScheduler, lowPriority ? import_scheduler_low_priority : import_scheduler).Unwrap();
 
         /// <summary>
         /// Exports an item to a legacy (.zip based) package.

From 172e2e9b3ffabfcc7fb7017529f9eecd103e2d62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 20:40:15 +0900
Subject: [PATCH 08201/10326] Fix audio previews not being adjusted in volume
 correctly

---
 osu.Game/Audio/PreviewTrackManager.cs | 3 +++
 osu.Game/OsuGameBase.cs               | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Audio/PreviewTrackManager.cs b/osu.Game/Audio/PreviewTrackManager.cs
index 8d02af6574..d88fd1e62b 100644
--- a/osu.Game/Audio/PreviewTrackManager.cs
+++ b/osu.Game/Audio/PreviewTrackManager.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Audio
 
         protected TrackManagerPreviewTrack CurrentTrack;
 
+        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(OsuGameBase.GLOBAL_TRACK_VOLUME_ADJUST);
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -35,6 +37,7 @@ namespace osu.Game.Audio
             trackStore = new PreviewTrackStore(new OnlineStore());
 
             audio.AddItem(trackStore);
+            trackStore.AddAdjustment(AdjustableProperty.Volume, globalTrackVolumeAdjust);
             trackStore.AddAdjustment(AdjustableProperty.Volume, audio.VolumeTrack);
         }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 00b436931a..3d24f245f9 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -156,7 +156,12 @@ namespace osu.Game
 
         protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
 
-        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(0.5f);
+        /// <summary>
+        /// The maximum volume at which audio tracks should playback. This can be set lower than 1 to create some head-room for sound effects.
+        /// </summary>
+        internal const double GLOBAL_TRACK_VOLUME_ADJUST = 0.5;
+
+        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(GLOBAL_TRACK_VOLUME_ADJUST);
 
         [BackgroundDependencyLoader]
         private void load()

From 403536ef80c64d475f56bb6fc290d849b49a491c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 21:09:20 +0900
Subject: [PATCH 08202/10326] Fix ModDisplay potentially being operated on
 before loaded completely

Closes https://github.com/ppy/osu/issues/11810.
---
 osu.Game/Screens/Play/HUD/ModDisplay.cs | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 68d019bf71..7359f04dcf 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -72,19 +72,6 @@ namespace osu.Game.Screens.Play.HUD
                     }
                 },
             };
-
-            Current.ValueChanged += mods =>
-            {
-                iconsContainer.Clear();
-
-                foreach (Mod mod in mods.NewValue)
-                {
-                    iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
-                }
-
-                if (IsLoaded)
-                    appearTransform();
-            };
         }
 
         protected override void Dispose(bool isDisposing)
@@ -97,7 +84,16 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            appearTransform();
+            Current.BindValueChanged(mods =>
+            {
+                iconsContainer.Clear();
+
+                foreach (Mod mod in mods.NewValue)
+                    iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
+
+                appearTransform();
+            }, true);
+
             iconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint);
         }
 

From 2a1bb2f578ac8b74e6a7d5e7a949a7e995acc6c1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 21:38:01 +0900
Subject: [PATCH 08203/10326] Fix selected item potentially changing during
 gameplay

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 51 ++++++++++++-------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index c1930c525c..b5eff04532 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -46,7 +46,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private MultiplayerMatchSettingsOverlay settingsOverlay;
         private Drawable userModsSection;
 
-        private IBindable<bool> isConnected;
+        private readonly IBindable<bool> isConnected = new Bindable<bool>();
+        private readonly IBindable<PlaylistItem> matchCurrentItem = new Bindable<PlaylistItem>();
 
         [CanBeNull]
         private IDisposable readyClickOperation;
@@ -268,8 +269,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            SelectedItem.BindValueChanged(onSelectedItemChanged);
-            SelectedItem.BindTo(client.CurrentMatchPlayingItem);
+            matchCurrentItem.BindTo(client.CurrentMatchPlayingItem);
+            matchCurrentItem.BindValueChanged(onCurrentItemChanged, true);
 
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
             UserMods.BindValueChanged(onUserModsChanged);
@@ -277,7 +278,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             client.LoadRequested += onLoadRequested;
             client.RoomUpdated += onRoomUpdated;
 
-            isConnected = client.IsConnected.GetBoundCopy();
+            isConnected.BindTo(client.IsConnected);
             isConnected.BindValueChanged(connected =>
             {
                 if (!connected.NewValue)
@@ -285,6 +286,33 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }, true);
         }
 
+        private void onCurrentItemChanged(ValueChangedEvent<PlaylistItem> item)
+        {
+            if (client?.LocalUser == null)
+                return;
+
+            // If we're about to enter gameplay, schedule the item to be set at a later time.
+            if (client.LocalUser.State > MultiplayerUserState.Ready)
+            {
+                Schedule(() => onCurrentItemChanged(item));
+                return;
+            }
+
+            SelectedItem.Value = item.NewValue;
+
+            if (item.NewValue?.AllowedMods.Any() != true)
+            {
+                userModsSection.Hide();
+                userModsSelectOverlay.Hide();
+                userModsSelectOverlay.IsValidMod = _ => false;
+            }
+            else
+            {
+                userModsSection.Show();
+                userModsSelectOverlay.IsValidMod = m => item.NewValue.AllowedMods.Any(a => a.GetType() == m.GetType());
+            }
+        }
+
         protected override void UpdateMods()
         {
             if (SelectedItem.Value == null || client.LocalUser == null)
@@ -313,21 +341,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             return base.OnBackButton();
         }
 
-        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> item)
-        {
-            if (item.NewValue?.AllowedMods.Any() != true)
-            {
-                userModsSection.Hide();
-                userModsSelectOverlay.Hide();
-                userModsSelectOverlay.IsValidMod = _ => false;
-            }
-            else
-            {
-                userModsSection.Show();
-                userModsSelectOverlay.IsValidMod = m => item.NewValue.AllowedMods.Any(a => a.GetType() == m.GetType());
-            }
-        }
-
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedModSettingsUpdate;
 

From 6ef235c4c5290f3254ed247b2f20054dde1aceaf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 21:42:22 +0900
Subject: [PATCH 08204/10326] Fix beatmap panel flickering multiple times

---
 .../Match/BeatmapSelectionControl.cs          | 17 ++------
 .../Screens/OnlinePlay/OnlinePlayComposite.cs | 41 +++++++++++++++++--
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index 3cf0767cf8..3af0d5b715 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.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 System.Diagnostics;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
-using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
@@ -61,10 +58,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             base.LoadComplete();
 
-            Debug.Assert(SelectedItem != null);
-            SelectedItem.BindValueChanged(_ => updateBeatmap());
-            Playlist.BindCollectionChanged((_, __) => updateBeatmap(), true);
-
+            SelectedItem.BindValueChanged(_ => updateBeatmap(), true);
             Host.BindValueChanged(host =>
             {
                 if (RoomID.Value == null || host.NewValue?.Equals(api.LocalUser.Value) == true)
@@ -76,15 +70,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         private void updateBeatmap()
         {
-            Debug.Assert(SelectedItem != null);
-
-            // When the selected item is null, the match hasn't yet been created. Use the playlist directly, which is mutated by song selection.
-            PlaylistItem item = SelectedItem.Value ?? Playlist.FirstOrDefault();
-
-            if (item == null)
+            if (SelectedItem.Value == null)
                 beatmapPanelContainer.Clear();
             else
-                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(item, false, false);
+                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(SelectedItem.Value, false, false);
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index a7058d0ede..f203ef927c 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Specialized;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -57,11 +59,44 @@ namespace osu.Game.Screens.OnlinePlay
         protected Bindable<TimeSpan?> Duration { get; private set; }
 
         /// <summary>
-        /// The currently selected item in the <see cref="RoomSubScreen"/>.
-        /// May be null if this <see cref="OnlinePlayComposite"/> is not inside a <see cref="RoomSubScreen"/>.
+        /// The currently selected item in the <see cref="RoomSubScreen"/>, or the first item from <see cref="Playlist"/>
+        /// if this <see cref="OnlinePlayComposite"/> is not within a <see cref="RoomSubScreen"/>.
         /// </summary>
+        protected IBindable<PlaylistItem> SelectedItem => selectedItem;
+
+        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
+
         [CanBeNull]
         [Resolved(CanBeNull = true)]
-        protected IBindable<PlaylistItem> SelectedItem { get; private set; }
+        private IBindable<PlaylistItem> subScreenSelectedItem { get; set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (subScreenSelectedItem != null)
+                subScreenSelectedItem.BindValueChanged(onSelectedItemChanged, true);
+            else
+                Playlist.BindCollectionChanged(onPlaylistChanged, true);
+        }
+
+        /// <summary>
+        /// Invoked when the selected item from within a <see cref="RoomSubScreen"/> changes.
+        /// Does not occur when this <see cref="OnlinePlayComposite"/> is outside a <see cref="RoomSubScreen"/>.
+        /// </summary>
+        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> item)
+        {
+            // If the room hasn't been created yet, fall-back to the first item from the playlist.
+            selectedItem.Value = RoomID.Value == null ? Playlist.FirstOrDefault() : item.NewValue;
+        }
+
+        /// <summary>
+        /// Invoked when the playlist changes.
+        /// Does not occur when this <see cref="OnlinePlayComposite"/> is inside a <see cref="RoomSubScreen"/>.
+        /// </summary>
+        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            selectedItem.Value = Playlist.FirstOrDefault();
+        }
     }
 }

From 3208b2c5bf096bb25eab7946fb8475a1113b81e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 23:13:51 +0900
Subject: [PATCH 08205/10326] Fix potential nullref if mods are never set

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

diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 7359f04dcf..cffdb21fb8 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -88,10 +88,13 @@ namespace osu.Game.Screens.Play.HUD
             {
                 iconsContainer.Clear();
 
-                foreach (Mod mod in mods.NewValue)
-                    iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
+                if (mods.NewValue != null)
+                {
+                    foreach (Mod mod in mods.NewValue)
+                        iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
 
-                appearTransform();
+                    appearTransform();
+                }
             }, true);
 
             iconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint);

From e7308193e7bd33a8c6e38f90d7dca112bda6e084 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 13:03:29 +0900
Subject: [PATCH 08206/10326] Add xmldoc explaining how PreviewTime is intended
 to work

---
 osu.Game/Beatmaps/BeatmapMetadata.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 39b3c23ddd..367f612dc8 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -51,7 +51,12 @@ namespace osu.Game.Beatmaps
         [JsonProperty(@"tags")]
         public string Tags { get; set; }
 
+        /// <summary>
+        /// The time in milliseconds to begin playing the track for preview purposes.
+        /// If -1, the track should begin playing at 40% of its length.
+        /// </summary>
         public int PreviewTime { get; set; }
+
         public string AudioFile { get; set; }
         public string BackgroundFile { get; set; }
 

From 90dce5204218ac9132e929d374a123f3da7abe34 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 14:10:28 +0900
Subject: [PATCH 08207/10326] Fix potential crash from cross-thread drawable
 manipulation in CollectionFilterDropdown

---
 osu.Game/Collections/CollectionFilterDropdown.cs | 13 ++++++-------
 osu.Game/Screens/Select/FilterControl.cs         |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Collections/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
index ec0e9d5a89..3e55ecb084 100644
--- a/osu.Game/Collections/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -41,19 +41,18 @@ namespace osu.Game.Collections
             ItemSource = filters;
         }
 
-        [BackgroundDependencyLoader(permitNulls: true)]
-        private void load([CanBeNull] CollectionManager collectionManager)
+        [Resolved(CanBeNull = true)]
+        private CollectionManager collectionManager { get; set; }
+
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             if (collectionManager != null)
                 collections.BindTo(collectionManager.Collections);
 
             collections.CollectionChanged += (_, __) => collectionsChanged();
             collectionsChanged();
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
 
             Current.BindValueChanged(filterChanged, true);
         }
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 952a5d1eaa..eafd8a87d1 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Select
                 Sort = sortMode.Value,
                 AllowConvertedBeatmaps = showConverted.Value,
                 Ruleset = ruleset.Value,
-                Collection = collectionDropdown?.Current.Value.Collection
+                Collection = collectionDropdown?.Current.Value?.Collection
             };
 
             if (!minimumStars.IsDefault)

From 49589b64c34792ac07d19f8f3d4efb97fd4c7aad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 14:55:15 +0900
Subject: [PATCH 08208/10326] Intro track should not restart from preview point

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

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 71b83d4aab..71f3b60026 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Screens.Menu
         {
             // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
             if (UsingThemedIntro)
-                Track.Restart();
+                Track.Start();
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)

From dfedea9ea2abf6c09dead571889915a37570c0ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 14:55:44 +0900
Subject: [PATCH 08209/10326] Move preview point logic to a specific method in
 WorkingBeatmap

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 30382c444f..aab8ff6bd6 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -266,6 +266,26 @@ namespace osu.Game.Beatmaps
         [NotNull]
         public Track LoadTrack() => loadedTrack = GetBeatmapTrack() ?? GetVirtualTrack(1000);
 
+        /// <summary>
+        /// Reads the correct track restart point from beatmap metadata and sets looping to enabled.
+        /// </summary>
+        public void PrepareTrackForPreviewLooping()
+        {
+            Track.Looping = true;
+            Track.RestartPoint = Metadata.PreviewTime;
+
+            if (Track.RestartPoint == -1)
+            {
+                if (!Track.IsLoaded)
+                {
+                    // force length to be populated (https://github.com/ppy/osu-framework/issues/4202)
+                    Track.Seek(Track.CurrentTime);
+                }
+
+                Track.RestartPoint = 0.4f * Track.Length;
+            }
+        }
+
         /// <summary>
         /// Transfer a valid audio track into this working beatmap. Used as an optimisation to avoid reload / track swap
         /// across difficulties in the same beatmap set.

From 421cdb6650246d249d685812c8ea7dbd3c07a015 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 15:01:11 +0900
Subject: [PATCH 08210/10326] Consume new method in existing usages (and remove
 some unnecessary set/unset code)

---
 osu.Game/Screens/Menu/MainMenu.cs                  | 11 ++++++-----
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs |  7 +------
 osu.Game/Screens/Select/SongSelect.cs              |  7 +++----
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 97fd58318b..424e6d2cd5 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -179,14 +179,15 @@ namespace osu.Game.Screens.Menu
             base.OnEntering(last);
             buttons.FadeInFromZero(500);
 
-            var metadata = Beatmap.Value.Metadata;
-
             if (last is IntroScreen && musicController.TrackLoaded)
             {
-                if (!musicController.CurrentTrack.IsRunning)
+                var track = musicController.CurrentTrack;
+
+                // presume the track is the current beatmap's track. not sure how correct this assumption is but it has worked until now.
+                if (!track.IsRunning)
                 {
-                    musicController.CurrentTrack.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * musicController.CurrentTrack.Length);
-                    musicController.CurrentTrack.Start();
+                    Beatmap.Value.PrepareTrackForPreviewLooping();
+                    track.Restart();
                 }
             }
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index e755f8c405..86422085a1 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -173,9 +173,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
             if (track != null)
             {
-                track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-                track.Looping = true;
-
+                Beatmap.Value.PrepareTrackForPreviewLooping();
                 music?.EnsurePlayingSomething();
             }
         }
@@ -185,10 +183,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             var track = Beatmap?.Value?.Track;
 
             if (track != null)
-            {
                 track.Looping = false;
-                track.RestartPoint = 0;
-            }
         }
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index edbab083cd..b7f7c40539 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -648,8 +648,9 @@ namespace osu.Game.Screens.Select
         {
             Debug.Assert(!isHandlingLooping);
 
-            music.CurrentTrack.Looping = isHandlingLooping = true;
+            isHandlingLooping = true;
 
+            ensureTrackLooping(Beatmap.Value, TrackChangeDirection.None);
             music.TrackChanged += ensureTrackLooping;
         }
 
@@ -665,7 +666,7 @@ namespace osu.Game.Screens.Select
         }
 
         private void ensureTrackLooping(WorkingBeatmap beatmap, TrackChangeDirection changeDirection)
-            => music.CurrentTrack.Looping = true;
+            => beatmap.PrepareTrackForPreviewLooping();
 
         public override bool OnBackButton()
         {
@@ -719,8 +720,6 @@ namespace osu.Game.Screens.Select
 
             bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;
 
-            track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-
             if (!track.IsRunning && (music.UserPauseRequested != true || isNewTrack))
                 music.Play(true);
 

From 56e9e10ff584742f80c21971771874c7f21ab745 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Feb 2021 15:30:31 +0900
Subject: [PATCH 08211/10326] Make server authoritative in playlist item id

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index e9eb80e6a1..416162779d 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -217,7 +217,6 @@ namespace osu.Game.Online.Multiplayer
                 RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
                 RequiredMods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.RequiredMods,
                 AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods,
-                PlaylistItemId = Room.Settings.PlaylistItemId,
             });
         }
 

From 143e1456701ad4808c55cbb75788e81dc3df9c9a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 15:42:26 +0900
Subject: [PATCH 08212/10326] Update implementation of
 AdjustableAudioComponents

---
 .../Rulesets/TestSceneDrawableRulesetDependencies.cs          | 4 ++--
 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs           | 4 ++--
 osu.Game/Skinning/PoolableSkinnableSample.cs                  | 4 ++--
 osu.Game/Skinning/SkinnableSound.cs                           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index 787f72ba79..4aebed0d31 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -118,9 +118,9 @@ namespace osu.Game.Tests.Rulesets
             public BindableNumber<double> Frequency => throw new NotImplementedException();
             public BindableNumber<double> Tempo => throw new NotImplementedException();
 
-            public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotImplementedException();
+            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
 
-            public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotImplementedException();
+            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
 
             public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotImplementedException();
 
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index deec948d14..bbaca7c80f 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -110,9 +110,9 @@ namespace osu.Game.Rulesets.UI
 
             public IEnumerable<string> GetAvailableResources() => throw new NotSupportedException();
 
-            public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
+            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotSupportedException();
 
-            public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
+            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotSupportedException();
 
             public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotSupportedException();
 
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 9025fdbd0f..abff57091b 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -165,9 +165,9 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => sampleContainer.Tempo;
 
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
+        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
 
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => sampleContainer.RemoveAdjustment(type, adjustBindable);
+        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.RemoveAdjustment(type, adjustBindable);
 
         public void RemoveAllAdjustments(AdjustableProperty type) => sampleContainer.RemoveAllAdjustments(type);
 
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index b3db2d6558..d3dfcb1dc0 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -176,10 +176,10 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => samplesContainer.Tempo;
 
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
             => samplesContainer.AddAdjustment(type, adjustBindable);
 
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
             => samplesContainer.RemoveAdjustment(type, adjustBindable);
 
         public void RemoveAllAdjustments(AdjustableProperty type)

From e911760318edfb87b86bd6f5b74da4e285c441f5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Feb 2021 15:47:33 +0900
Subject: [PATCH 08213/10326] Split OnlinePlayComposite to remove if-statement

---
 .../Match/BeatmapSelectionControl.cs          |  2 +-
 .../Screens/OnlinePlay/OnlinePlayComposite.cs | 36 ++++--------------
 .../OnlinePlay/RoomSubScreenComposite.cs      | 38 +++++++++++++++++++
 3 files changed, 46 insertions(+), 30 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/RoomSubScreenComposite.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index 3af0d5b715..ebe63e26d6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.OnlinePlay.Match.Components;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
-    public class BeatmapSelectionControl : OnlinePlayComposite
+    public class BeatmapSelectionControl : RoomSubScreenComposite
     {
         [Resolved]
         private MultiplayerMatchSubScreen matchSubScreen { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index f203ef927c..eb0b23f13f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -2,9 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Specialized;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
@@ -14,6 +12,9 @@ using osu.Game.Users;
 
 namespace osu.Game.Screens.OnlinePlay
 {
+    /// <summary>
+    /// A <see cref="CompositeDrawable"/> that exposes bindables for <see cref="Room"/> properties.
+    /// </summary>
     public class OnlinePlayComposite : CompositeDrawable
     {
         [Resolved(typeof(Room))]
@@ -62,41 +63,18 @@ namespace osu.Game.Screens.OnlinePlay
         /// The currently selected item in the <see cref="RoomSubScreen"/>, or the first item from <see cref="Playlist"/>
         /// if this <see cref="OnlinePlayComposite"/> is not within a <see cref="RoomSubScreen"/>.
         /// </summary>
-        protected IBindable<PlaylistItem> SelectedItem => selectedItem;
-
-        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
-
-        [CanBeNull]
-        [Resolved(CanBeNull = true)]
-        private IBindable<PlaylistItem> subScreenSelectedItem { get; set; }
+        protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            if (subScreenSelectedItem != null)
-                subScreenSelectedItem.BindValueChanged(onSelectedItemChanged, true);
-            else
-                Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            Playlist.BindCollectionChanged((_, __) => UpdateSelectedItem(), true);
         }
 
-        /// <summary>
-        /// Invoked when the selected item from within a <see cref="RoomSubScreen"/> changes.
-        /// Does not occur when this <see cref="OnlinePlayComposite"/> is outside a <see cref="RoomSubScreen"/>.
-        /// </summary>
-        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> item)
+        protected virtual void UpdateSelectedItem()
         {
-            // If the room hasn't been created yet, fall-back to the first item from the playlist.
-            selectedItem.Value = RoomID.Value == null ? Playlist.FirstOrDefault() : item.NewValue;
-        }
-
-        /// <summary>
-        /// Invoked when the playlist changes.
-        /// Does not occur when this <see cref="OnlinePlayComposite"/> is inside a <see cref="RoomSubScreen"/>.
-        /// </summary>
-        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            selectedItem.Value = Playlist.FirstOrDefault();
+            SelectedItem.Value = Playlist.FirstOrDefault();
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/RoomSubScreenComposite.cs b/osu.Game/Screens/OnlinePlay/RoomSubScreenComposite.cs
new file mode 100644
index 0000000000..4cfd881aa3
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/RoomSubScreenComposite.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.Rooms;
+using osu.Game.Screens.OnlinePlay.Match;
+
+namespace osu.Game.Screens.OnlinePlay
+{
+    /// <summary>
+    /// An <see cref="OnlinePlayComposite"/> with additional logic tracking the currently-selected <see cref="PlaylistItem"/> inside a <see cref="RoomSubScreen"/>.
+    /// </summary>
+    public class RoomSubScreenComposite : OnlinePlayComposite
+    {
+        [Resolved]
+        private IBindable<PlaylistItem> subScreenSelectedItem { get; set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            subScreenSelectedItem.BindValueChanged(_ => UpdateSelectedItem(), true);
+        }
+
+        protected override void UpdateSelectedItem()
+        {
+            if (RoomID.Value == null)
+            {
+                // If the room hasn't been created yet, fall-back to the base logic.
+                base.UpdateSelectedItem();
+                return;
+            }
+
+            SelectedItem.Value = subScreenSelectedItem.Value;
+        }
+    }
+}

From 46ba5de32c5e0dc63d94ab618121a61df655c2a9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Feb 2021 16:19:36 +0900
Subject: [PATCH 08214/10326] Fix collections being imported from BDL thread

---
 osu.Game/Collections/CollectionManager.cs | 48 +++++++++++++----------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 569ac749a4..a65d9a415d 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -139,35 +139,43 @@ namespace osu.Game.Collections
             PostNotification?.Invoke(notification);
 
             var collection = readCollections(stream, notification);
-            bool importCompleted = false;
-
-            Schedule(() =>
-            {
-                importCollections(collection);
-                importCompleted = true;
-            });
-
-            while (!IsDisposed && !importCompleted)
-                await Task.Delay(10);
+            await importCollections(collection);
 
             notification.CompletionText = $"Imported {collection.Count} collections";
             notification.State = ProgressNotificationState.Completed;
         }
 
-        private void importCollections(List<BeatmapCollection> newCollections)
+        private Task importCollections(List<BeatmapCollection> newCollections)
         {
-            foreach (var newCol in newCollections)
-            {
-                var existing = Collections.FirstOrDefault(c => c.Name == newCol.Name);
-                if (existing == null)
-                    Collections.Add(existing = new BeatmapCollection { Name = { Value = newCol.Name.Value } });
+            var tcs = new TaskCompletionSource<bool>();
 
-                foreach (var newBeatmap in newCol.Beatmaps)
+            Schedule(() =>
+            {
+                try
                 {
-                    if (!existing.Beatmaps.Contains(newBeatmap))
-                        existing.Beatmaps.Add(newBeatmap);
+                    foreach (var newCol in newCollections)
+                    {
+                        var existing = Collections.FirstOrDefault(c => c.Name == newCol.Name);
+                        if (existing == null)
+                            Collections.Add(existing = new BeatmapCollection { Name = { Value = newCol.Name.Value } });
+
+                        foreach (var newBeatmap in newCol.Beatmaps)
+                        {
+                            if (!existing.Beatmaps.Contains(newBeatmap))
+                                existing.Beatmaps.Add(newBeatmap);
+                        }
+                    }
+
+                    tcs.SetResult(true);
                 }
-            }
+                catch (Exception e)
+                {
+                    Logger.Error(e, "Failed to import collection.");
+                    tcs.SetException(e);
+                }
+            });
+
+            return tcs.Task;
         }
 
         private List<BeatmapCollection> readCollections(Stream stream, ProgressNotification notification = null)

From c3a98b6ad15475a86565c2501fe0faeb2e898b14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 16:59:43 +0900
Subject: [PATCH 08215/10326] Fix carousel items' borders getting blown out
 when selected and hovered

I tried restructuring the hierarchy to avoid needing this added property
(moving the hover layer out of the border container) but this leads to
some subpixel leakage outside the borders which looks even worse.

Closes #6915.
---
 .../Screens/Select/Carousel/CarouselHeader.cs | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index 947334c747..73324894ee 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -24,9 +24,13 @@ namespace osu.Game.Screens.Select.Carousel
         public Container BorderContainer;
 
         public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
+        private HoverLayer hoverLayer;
 
         protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
+        private const float corner_radius = 10;
+        private const float border_thickness = 2.5f;
+
         public CarouselHeader()
         {
             RelativeSizeAxes = Axes.X;
@@ -36,12 +40,12 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
-                CornerRadius = 10,
+                CornerRadius = corner_radius,
                 BorderColour = new Color4(221, 255, 255, 255),
                 Children = new Drawable[]
                 {
                     Content,
-                    new HoverLayer()
+                    hoverLayer = new HoverLayer()
                 }
             };
         }
@@ -59,6 +63,8 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 case CarouselItemState.Collapsed:
                 case CarouselItemState.NotSelected:
+                    hoverLayer.InsetForBorder = false;
+
                     BorderContainer.BorderThickness = 0;
                     BorderContainer.EdgeEffect = new EdgeEffectParameters
                     {
@@ -70,7 +76,9 @@ namespace osu.Game.Screens.Select.Carousel
                     break;
 
                 case CarouselItemState.Selected:
-                    BorderContainer.BorderThickness = 2.5f;
+                    hoverLayer.InsetForBorder = true;
+
+                    BorderContainer.BorderThickness = border_thickness;
                     BorderContainer.EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
@@ -107,6 +115,26 @@ namespace osu.Game.Screens.Select.Carousel
                 sampleHover = audio.Samples.Get("SongSelect/song-ping");
             }
 
+            public bool InsetForBorder
+            {
+                set
+                {
+                    if (value)
+                    {
+                        // apply same border as above to avoid applying additive overlay to it (and blowing out the colour).
+                        Masking = true;
+                        CornerRadius = corner_radius;
+                        BorderThickness = border_thickness;
+                    }
+                    else
+                    {
+                        BorderThickness = 0;
+                        CornerRadius = 0;
+                        Masking = false;
+                    }
+                }
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 box.FadeIn(100, Easing.OutQuint);

From b713eb2eae259e086ca3b62ff6e3d7b79bed06a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 17:13:48 +0900
Subject: [PATCH 08216/10326] Make field readonly

---
 osu.Game/Screens/Select/Carousel/CarouselHeader.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index 73324894ee..2fbf64de29 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Screens.Select.Carousel
         public Container BorderContainer;
 
         public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
-        private HoverLayer hoverLayer;
+
+        private readonly HoverLayer hoverLayer;
 
         protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
 

From 668cc144f68c339ab03a4601c4d36faae86b051e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Feb 2021 17:39:01 +0900
Subject: [PATCH 08217/10326] Fix test failures + multiple filter operations
 firing

---
 .../Collections/CollectionFilterDropdown.cs   | 22 ++++++++++++++-----
 .../Collections/CollectionFilterMenuItem.cs   |  8 ++++++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Collections/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
index 3e55ecb084..aad8400faa 100644
--- a/osu.Game/Collections/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -29,6 +29,14 @@ namespace osu.Game.Collections
         /// </summary>
         protected virtual bool ShowManageCollectionsItem => true;
 
+        private readonly BindableWithCurrent<CollectionFilterMenuItem> current = new BindableWithCurrent<CollectionFilterMenuItem>();
+
+        public new Bindable<CollectionFilterMenuItem> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
         private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
         private readonly IBindableList<BeatmapInfo> beatmaps = new BindableList<BeatmapInfo>();
         private readonly BindableList<CollectionFilterMenuItem> filters = new BindableList<CollectionFilterMenuItem>();
@@ -36,14 +44,15 @@ namespace osu.Game.Collections
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private CollectionManager collectionManager { get; set; }
+
         public CollectionFilterDropdown()
         {
             ItemSource = filters;
+            Current.Value = new AllBeatmapsCollectionFilterMenuItem();
         }
 
-        [Resolved(CanBeNull = true)]
-        private CollectionManager collectionManager { get; set; }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -51,9 +60,12 @@ namespace osu.Game.Collections
             if (collectionManager != null)
                 collections.BindTo(collectionManager.Collections);
 
-            collections.CollectionChanged += (_, __) => collectionsChanged();
-            collectionsChanged();
+            // Dropdown has logic which triggers a change on the bindable with every change to the contained items.
+            // This is not desirable here, as it leads to multiple filter operations running even though nothing has changed.
+            // An extra bindable is enough to subvert this behaviour.
+            base.Current.BindTo(Current);
 
+            collections.BindCollectionChanged((_, __) => collectionsChanged(), true);
             Current.BindValueChanged(filterChanged, true);
         }
 
diff --git a/osu.Game/Collections/CollectionFilterMenuItem.cs b/osu.Game/Collections/CollectionFilterMenuItem.cs
index 4a489d2945..fe79358223 100644
--- a/osu.Game/Collections/CollectionFilterMenuItem.cs
+++ b/osu.Game/Collections/CollectionFilterMenuItem.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.Bindables;
 
@@ -9,7 +10,7 @@ namespace osu.Game.Collections
     /// <summary>
     /// A <see cref="BeatmapCollection"/> filter.
     /// </summary>
-    public class CollectionFilterMenuItem
+    public class CollectionFilterMenuItem : IEquatable<CollectionFilterMenuItem>
     {
         /// <summary>
         /// The collection to filter beatmaps from.
@@ -33,6 +34,11 @@ namespace osu.Game.Collections
             Collection = collection;
             CollectionName = Collection?.Name.GetBoundCopy() ?? new Bindable<string>("All beatmaps");
         }
+
+        public bool Equals(CollectionFilterMenuItem other)
+            => other != null && CollectionName.Value == other.CollectionName.Value;
+
+        public override int GetHashCode() => CollectionName.Value.GetHashCode();
     }
 
     public class AllBeatmapsCollectionFilterMenuItem : CollectionFilterMenuItem

From 71316bbee568c7ded598d502204054db85ffbb53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 17:45:58 +0900
Subject: [PATCH 08218/10326] Allow using OnlineViewContainer without deriving
 it

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

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index c9fb70f0cc..8868f90524 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online
     /// 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
+    public class OnlineViewContainer : Container
     {
         protected LoadingSpinner LoadingSpinner { get; private set; }
 
@@ -30,7 +30,7 @@ namespace osu.Game.Online
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        protected OnlineViewContainer(string placeholderMessage)
+        public OnlineViewContainer(string placeholderMessage)
         {
             this.placeholderMessage = placeholderMessage;
         }

From c3f66a0c745ce7c53fbf948625f5ad620dd2d730 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 17:46:07 +0900
Subject: [PATCH 08219/10326] Add login placeholder for chat overlay

---
 osu.Game/Overlays/ChatOverlay.cs | 73 ++++++++++++++++----------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 8bc7e21047..f5dd4fae2c 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -24,6 +24,7 @@ using osu.Game.Overlays.Chat.Tabs;
 using osuTK.Input;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Online;
 
 namespace osu.Game.Overlays
 {
@@ -118,40 +119,47 @@ namespace osu.Game.Overlays
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                 },
-                                currentChannelContainer = new Container<DrawableChannel>
+                                new OnlineViewContainer("Sign in to chat")
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Padding = new MarginPadding
-                                    {
-                                        Bottom = textbox_height
-                                    },
-                                },
-                                new Container
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    RelativeSizeAxes = Axes.X,
-                                    Height = textbox_height,
-                                    Padding = new MarginPadding
-                                    {
-                                        Top = padding * 2,
-                                        Bottom = padding * 2,
-                                        Left = ChatLine.LEFT_PADDING + padding * 2,
-                                        Right = padding * 2,
-                                    },
                                     Children = new Drawable[]
                                     {
-                                        textbox = new FocusedTextBox
+                                        currentChannelContainer = new Container<DrawableChannel>
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Height = 1,
-                                            PlaceholderText = "type your message",
-                                            ReleaseFocusOnCommit = false,
-                                            HoldFocus = true,
-                                        }
-                                    }
-                                },
-                                loading = new LoadingSpinner(),
+                                            Padding = new MarginPadding
+                                            {
+                                                Bottom = textbox_height
+                                            },
+                                        },
+                                        new Container
+                                        {
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft,
+                                            RelativeSizeAxes = Axes.X,
+                                            Height = textbox_height,
+                                            Padding = new MarginPadding
+                                            {
+                                                Top = padding * 2,
+                                                Bottom = padding * 2,
+                                                Left = ChatLine.LEFT_PADDING + padding * 2,
+                                                Right = padding * 2,
+                                            },
+                                            Children = new Drawable[]
+                                            {
+                                                textbox = new FocusedTextBox
+                                                {
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Height = 1,
+                                                    PlaceholderText = "type your message",
+                                                    ReleaseFocusOnCommit = false,
+                                                    HoldFocus = true,
+                                                }
+                                            }
+                                        },
+                                        loading = new LoadingSpinner(),
+                                    },
+                                }
                             }
                         },
                         tabsArea = new TabsArea
@@ -184,9 +192,7 @@ namespace osu.Game.Overlays
                     },
                 },
             };
-
             textbox.OnCommit += postMessage;
-
             ChannelTabControl.Current.ValueChanged += current => channelManager.CurrentChannel.Value = current.NewValue;
             ChannelTabControl.ChannelSelectorActive.ValueChanged += active => ChannelSelectionOverlay.State.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
             ChannelSelectionOverlay.State.ValueChanged += state =>
@@ -203,10 +209,8 @@ namespace osu.Game.Overlays
                 else
                     textbox.HoldFocus = true;
             };
-
             ChannelSelectionOverlay.OnRequestJoin = channel => channelManager.JoinChannel(channel);
             ChannelSelectionOverlay.OnRequestLeave = channelManager.LeaveChannel;
-
             ChatHeight = config.GetBindable<float>(OsuSetting.ChatDisplayHeight);
             ChatHeight.BindValueChanged(height =>
             {
@@ -214,9 +218,7 @@ namespace osu.Game.Overlays
                 channelSelectionContainer.Height = 1f - height.NewValue;
                 tabBackground.FadeTo(height.NewValue == 1f ? 1f : 0.8f, 200);
             }, true);
-
             chatBackground.Colour = colours.ChatBlue;
-
             loading.Show();
 
             // This is a relatively expensive (and blocking) operation.
@@ -226,13 +228,10 @@ namespace osu.Game.Overlays
             {
                 // TODO: consider scheduling bindable callbacks to not perform when overlay is not present.
                 channelManager.JoinedChannels.CollectionChanged += joinedChannelsChanged;
-
                 foreach (Channel channel in channelManager.JoinedChannels)
                     ChannelTabControl.AddChannel(channel);
-
                 channelManager.AvailableChannels.CollectionChanged += availableChannelsChanged;
                 availableChannelsChanged(null, null);
-
                 currentChannel = channelManager.CurrentChannel.GetBoundCopy();
                 currentChannel.BindValueChanged(currentChannelChanged, true);
             });

From 58d8f0733cfed3f432879263e827fc4cc1128162 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 17:45:58 +0900
Subject: [PATCH 08220/10326] Allow using OnlineViewContainer without deriving
 it

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

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index c9fb70f0cc..8868f90524 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online
     /// 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
+    public class OnlineViewContainer : Container
     {
         protected LoadingSpinner LoadingSpinner { get; private set; }
 
@@ -30,7 +30,7 @@ namespace osu.Game.Online
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        protected OnlineViewContainer(string placeholderMessage)
+        public OnlineViewContainer(string placeholderMessage)
         {
             this.placeholderMessage = placeholderMessage;
         }

From 0bd1964d8e7db31f84374aa079c16e43b2c33a24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:04:41 +0900
Subject: [PATCH 08221/10326] Add login placeholder logic to OnlineOverlay

A perfect implementation of this would probably leave the filter/header
content visible, but that requires some re-thinking and restructuring to
how the content is displayed in these overlays (ie. the header
component shouldn't be inside the `ScrollContainer` as it is fixed).

Supersedes and closes #10774.
Closes #933.
Addresses most pieces of #7417.
---
 osu.Game/Overlays/ChangelogOverlay.cs      |  2 +-
 osu.Game/Overlays/NewsOverlay.cs           |  2 +-
 osu.Game/Overlays/OnlineOverlay.cs         | 15 ++++++++++++---
 osu.Game/Overlays/TabbableOnlineOverlay.cs |  3 +--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 593f59555a..537dd00727 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays
         protected List<APIUpdateStream> Streams;
 
         public ChangelogOverlay()
-            : base(OverlayColourScheme.Purple)
+            : base(OverlayColourScheme.Purple, false)
         {
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 08e8331dd3..5beb285216 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays
         private readonly Bindable<string> article = new Bindable<string>(null);
 
         public NewsOverlay()
-            : base(OverlayColourScheme.Purple)
+            : base(OverlayColourScheme.Purple, false)
         {
         }
 
diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 7c9f751d3b..0a5ceb1993 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
 
 namespace osu.Game.Overlays
 {
@@ -16,10 +17,16 @@ namespace osu.Game.Overlays
         protected readonly LoadingLayer Loading;
         private readonly Container content;
 
-        protected OnlineOverlay(OverlayColourScheme colourScheme)
+        protected OnlineOverlay(OverlayColourScheme colourScheme, bool requiresSignIn = true)
             : base(colourScheme)
         {
-            base.Content.AddRange(new Drawable[]
+            var mainContent = requiresSignIn
+                ? new OnlineViewContainer($"Sign in to view the {Header.Title.Title}")
+                : new Container();
+
+            mainContent.RelativeSizeAxes = Axes.Both;
+
+            mainContent.AddRange(new Drawable[]
             {
                 ScrollFlow = new OverlayScrollContainer
                 {
@@ -41,8 +48,10 @@ namespace osu.Game.Overlays
                         }
                     }
                 },
-                Loading = new LoadingLayer(true)
+                Loading = new LoadingLayer()
             });
+
+            base.Content.Add(mainContent);
         }
     }
 }
diff --git a/osu.Game/Overlays/TabbableOnlineOverlay.cs b/osu.Game/Overlays/TabbableOnlineOverlay.cs
index 8172e99c1b..9ceab12d3d 100644
--- a/osu.Game/Overlays/TabbableOnlineOverlay.cs
+++ b/osu.Game/Overlays/TabbableOnlineOverlay.cs
@@ -61,8 +61,7 @@ namespace osu.Game.Overlays
 
             LoadComponentAsync(display, loaded =>
             {
-                if (API.IsLoggedIn)
-                    Loading.Hide();
+                Loading.Hide();
 
                 Child = loaded;
             }, (cancellationToken = new CancellationTokenSource()).Token);

From 990c1b1d6ef118c755b8cdff7150601542f47535 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:19:57 +0900
Subject: [PATCH 08222/10326] Revert accidental removal of newlines

---
 osu.Game/Overlays/ChatOverlay.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index f5dd4fae2c..28f2287514 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -192,7 +192,9 @@ namespace osu.Game.Overlays
                     },
                 },
             };
+
             textbox.OnCommit += postMessage;
+
             ChannelTabControl.Current.ValueChanged += current => channelManager.CurrentChannel.Value = current.NewValue;
             ChannelTabControl.ChannelSelectorActive.ValueChanged += active => ChannelSelectionOverlay.State.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
             ChannelSelectionOverlay.State.ValueChanged += state =>
@@ -209,8 +211,10 @@ namespace osu.Game.Overlays
                 else
                     textbox.HoldFocus = true;
             };
+
             ChannelSelectionOverlay.OnRequestJoin = channel => channelManager.JoinChannel(channel);
             ChannelSelectionOverlay.OnRequestLeave = channelManager.LeaveChannel;
+
             ChatHeight = config.GetBindable<float>(OsuSetting.ChatDisplayHeight);
             ChatHeight.BindValueChanged(height =>
             {
@@ -218,7 +222,9 @@ namespace osu.Game.Overlays
                 channelSelectionContainer.Height = 1f - height.NewValue;
                 tabBackground.FadeTo(height.NewValue == 1f ? 1f : 0.8f, 200);
             }, true);
+
             chatBackground.Colour = colours.ChatBlue;
+
             loading.Show();
 
             // This is a relatively expensive (and blocking) operation.
@@ -228,10 +234,13 @@ namespace osu.Game.Overlays
             {
                 // TODO: consider scheduling bindable callbacks to not perform when overlay is not present.
                 channelManager.JoinedChannels.CollectionChanged += joinedChannelsChanged;
+
                 foreach (Channel channel in channelManager.JoinedChannels)
                     ChannelTabControl.AddChannel(channel);
+
                 channelManager.AvailableChannels.CollectionChanged += availableChannelsChanged;
                 availableChannelsChanged(null, null);
+
                 currentChannel = channelManager.CurrentChannel.GetBoundCopy();
                 currentChannel.BindValueChanged(currentChannelChanged, true);
             });

From 00574a528868d1ef31907484e71623969c0cfeaf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:32:28 +0900
Subject: [PATCH 08223/10326] Use ISample everywhere in Skin GetSample lookup
 path

---
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs           | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs         | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs       | 2 +-
 .../Skinning/Legacy/TaikoLegacySkinTransformer.cs           | 2 +-
 osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs   | 2 +-
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs       | 4 ++--
 .../NonVisual/Skinning/LegacySkinAnimationTest.cs           | 2 +-
 osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs    | 2 +-
 .../Visual/Gameplay/TestSceneSkinnableDrawable.cs           | 6 +++---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs   | 2 +-
 osu.Game/Skinning/DefaultSkin.cs                            | 2 +-
 osu.Game/Skinning/ISkin.cs                                  | 2 +-
 osu.Game/Skinning/LegacyBeatmapSkin.cs                      | 2 +-
 osu.Game/Skinning/LegacySkin.cs                             | 2 +-
 osu.Game/Skinning/LegacySkinTransformer.cs                  | 2 +-
 osu.Game/Skinning/Skin.cs                                   | 2 +-
 osu.Game/Skinning/SkinManager.cs                            | 2 +-
 osu.Game/Skinning/SkinProvidingContainer.cs                 | 4 ++--
 18 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index cbbbacfe19..24ccae895d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             return animation == null ? null : new LegacyManiaJudgementPiece(result, animation);
         }
 
-        public override Sample GetSample(ISampleInfo sampleInfo)
+        public override ISample GetSample(ISampleInfo sampleInfo)
         {
             // layered hit sounds never play in mania
             if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample && legacySample.IsLayered)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index e2d9f144c0..8fd13c7417 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 return null;
             }
 
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 8dbb48c048..19b6779619 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
-            public Sample GetSample(ISampleInfo sampleInfo) => null;
+            public ISample GetSample(ISampleInfo sampleInfo) => null;
 
             public TValue GetValue<TConfiguration, TValue>(Func<TConfiguration, TValue> query) where TConfiguration : SkinConfiguration => default;
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => null;
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index 9f29675230..d1214d3456 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             throw new ArgumentOutOfRangeException(nameof(component), $"Invalid component type: {component}");
         }
 
-        public override Sample GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
+        public override ISample GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => Source.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index 3ded3009bd..883791c35c 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
             {
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 7a0dd5b719..6fa1839556 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestRetrieveTopLevelSample()
         {
             ISkin skin = null;
-            Sample channel = null;
+            ISample channel = null;
 
             AddStep("create skin", () => skin = new TestSkin("test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("test-sample")));
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestRetrieveSampleInSubFolder()
         {
             ISkin skin = null;
-            Sample channel = null;
+            ISample channel = null;
 
             AddStep("create skin", () => skin = new TestSkin("folder/test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("folder/test-sample")));
diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
index da004b9088..b08a228de3 100644
--- a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
             }
 
             public Drawable GetDrawableComponent(ISkinComponent component) => throw new NotSupportedException();
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotSupportedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotSupportedException();
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotSupportedException();
         }
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index 414f7d3f88..732a3f3f42 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Tests.Skins
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
-            public Sample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
+            public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => skin.GetConfig<TLookup, TValue>(lookup);
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index 44142b69d7..7a6e2f54c2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -298,7 +298,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
         }
@@ -309,7 +309,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
         }
@@ -321,7 +321,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index d688e9cb21..d792405eeb 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Drawable GetDrawableComponent(ISkinComponent component) => source?.GetDrawableComponent(component);
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source?.GetTexture(componentName, wrapModeS, wrapModeT);
-            public Sample GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);
+            public ISample GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => source?.GetConfig<TLookup, TValue>(lookup);
 
             public void TriggerSourceChanged()
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 346c7b3c65..0b3f5f3cde 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Skinning
 
         public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
-        public override Sample GetSample(ISampleInfo sampleInfo) => null;
+        public override ISample GetSample(ISampleInfo sampleInfo) => null;
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index ef8de01042..73f7cf6d39 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Skinning
         /// <param name="sampleInfo">The requested sample.</param>
         /// <returns>A matching sample channel, or null if unavailable.</returns>
         [CanBeNull]
-        Sample GetSample(ISampleInfo sampleInfo);
+        ISample GetSample(ISampleInfo sampleInfo);
 
         /// <summary>
         /// Retrieve a configuration value.
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index fb4207b647..3ec205e897 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
             return base.GetConfig<TLookup, TValue>(lookup);
         }
 
-        public override Sample GetSample(ISampleInfo sampleInfo)
+        public override ISample GetSample(ISampleInfo sampleInfo)
         {
             if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy && legacy.CustomSampleBank == 0)
             {
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e5d0217671..1ee797098c 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -452,7 +452,7 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        public override Sample GetSample(ISampleInfo sampleInfo)
+        public override ISample GetSample(ISampleInfo sampleInfo)
         {
             IEnumerable<string> lookupNames;
 
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index e2f4a82a54..ae8faf1a3b 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Skinning
         public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             => Source.GetTexture(componentName, wrapModeS, wrapModeT);
 
-        public virtual Sample GetSample(ISampleInfo sampleInfo)
+        public virtual ISample GetSample(ISampleInfo sampleInfo)
         {
             if (!(sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample))
                 return Source.GetSample(sampleInfo);
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index e8d84b49f9..13f5385c20 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Skinning
 
         public abstract Drawable GetDrawableComponent(ISkinComponent componentName);
 
-        public abstract Sample GetSample(ISampleInfo sampleInfo);
+        public abstract ISample GetSample(ISampleInfo sampleInfo);
 
         public Texture GetTexture(string componentName) => GetTexture(componentName, default, default);
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 2826c826a5..9e730b2ce1 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Skinning
 
         public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => CurrentSkin.Value.GetTexture(componentName, wrapModeS, wrapModeT);
 
-        public Sample GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
+        public ISample GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => CurrentSkin.Value.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index ba67d0a678..cf22b2e820 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -59,9 +59,9 @@ namespace osu.Game.Skinning
             return fallbackSource?.GetTexture(componentName, wrapModeS, wrapModeT);
         }
 
-        public Sample GetSample(ISampleInfo sampleInfo)
+        public ISample GetSample(ISampleInfo sampleInfo)
         {
-            Sample sourceChannel;
+            ISample sourceChannel;
             if (AllowSampleLookup(sampleInfo) && (sourceChannel = skin?.GetSample(sampleInfo)) != null)
                 return sourceChannel;
 

From 4aff54412a0a23707b4284510705dd2b2c91492d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:32:39 +0900
Subject: [PATCH 08224/10326] Move dispose method to end of file

---
 osu.Game/Skinning/LegacySkin.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 1ee797098c..12abc4d867 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -100,13 +100,6 @@ namespace osu.Game.Skinning
                 true) != null);
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            Textures?.Dispose();
-            Samples?.Dispose();
-        }
-
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             switch (lookup)
@@ -504,5 +497,12 @@ namespace osu.Game.Skinning
             string lastPiece = componentName.Split('/').Last();
             yield return componentName.StartsWith("Gameplay/taiko/", StringComparison.Ordinal) ? "taiko-" + lastPiece : lastPiece;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            Textures?.Dispose();
+            Samples?.Dispose();
+        }
     }
 }

From 880fe820733d9159c6eb866f85336b01081ea1c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:32:51 +0900
Subject: [PATCH 08225/10326] Add sample wrapper in LegacySkin to keep a
 reference and avoid GC death

---
 osu.Game/Skinning/LegacySkin.cs | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 12abc4d867..5d015ca5ab 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -461,12 +461,43 @@ namespace osu.Game.Skinning
                 var sample = Samples?.Get(lookup);
 
                 if (sample != null)
-                    return sample;
+                    return new LegacySkinSample(sample, this);
             }
 
             return null;
         }
 
+        /// <summary>
+        /// A sample wrapper which keeps a reference to the contained skin to avoid finalizer garbage collection of the managing SampleStore.
+        /// </summary>
+        private class LegacySkinSample : ISample
+        {
+            private readonly Sample sample;
+
+            [UsedImplicitly]
+            private readonly LegacySkin skin;
+
+            public LegacySkinSample(Sample sample, LegacySkin skin)
+            {
+                this.sample = sample;
+                this.skin = skin;
+            }
+
+            public SampleChannel Play()
+            {
+                return sample.Play();
+            }
+
+            public SampleChannel GetChannel()
+            {
+                return sample.GetChannel();
+            }
+
+            public double Length => sample.Length;
+
+            public Bindable<int> PlaybackConcurrency => sample.PlaybackConcurrency;
+        }
+
         private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
         {
             var lookupNames = hitSample.LookupNames.SelectMany(getFallbackNames);

From 487a39eea95a5215d5aec323c923a600144ba51a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:52:34 +0900
Subject: [PATCH 08226/10326] Update interface implementations with framework
 changes

---
 .../TestSceneDrawableRulesetDependencies.cs   |  6 ++--
 .../UI/DrawableRulesetDependencies.cs         | 11 +++++++
 osu.Game/Skinning/LegacySkin.cs               | 33 +++++++++++++++++++
 osu.Game/Skinning/PoolableSkinnableSample.cs  |  8 +++++
 osu.Game/Skinning/SkinnableSound.cs           | 17 ++++++----
 5 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index 787f72ba79..a2f2c5e41f 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -118,9 +118,11 @@ namespace osu.Game.Tests.Rulesets
             public BindableNumber<double> Frequency => throw new NotImplementedException();
             public BindableNumber<double> Tempo => throw new NotImplementedException();
 
-            public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotImplementedException();
+            public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+            public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
 
-            public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotImplementedException();
+            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
+            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
 
             public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotImplementedException();
 
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index deec948d14..6c31f05337 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -114,6 +114,11 @@ namespace osu.Game.Rulesets.UI
 
             public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
 
+            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+            {
+                throw new NotImplementedException();
+            }
+
             public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotSupportedException();
 
             public BindableNumber<double> Volume => throw new NotSupportedException();
@@ -124,6 +129,12 @@ namespace osu.Game.Rulesets.UI
 
             public BindableNumber<double> Tempo => throw new NotSupportedException();
 
+            public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
+            public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
+            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
+
             public IBindable<double> GetAggregate(AdjustableProperty type) => throw new NotSupportedException();
 
             public IBindable<double> AggregateVolume => throw new NotSupportedException();
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 5d015ca5ab..2edc36a770 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using JetBrains.Annotations;
+using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -496,6 +497,38 @@ namespace osu.Game.Skinning
             public double Length => sample.Length;
 
             public Bindable<int> PlaybackConcurrency => sample.PlaybackConcurrency;
+            public BindableNumber<double> Volume => sample.Volume;
+
+            public BindableNumber<double> Balance => sample.Balance;
+
+            public BindableNumber<double> Frequency => sample.Frequency;
+
+            public BindableNumber<double> Tempo => sample.Tempo;
+
+            public void BindAdjustments(IAggregateAudioAdjustment component)
+            {
+                sample.BindAdjustments(component);
+            }
+
+            public void UnbindAdjustments(IAggregateAudioAdjustment component)
+            {
+                sample.UnbindAdjustments(component);
+            }
+
+            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+            {
+                sample.AddAdjustment(type, adjustBindable);
+            }
+
+            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+            {
+                sample.RemoveAdjustment(type, adjustBindable);
+            }
+
+            public void RemoveAllAdjustments(AdjustableProperty type)
+            {
+                sample.RemoveAllAdjustments(type);
+            }
         }
 
         private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 9025fdbd0f..b12fbf90f3 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -165,6 +165,14 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => sampleContainer.Tempo;
 
+        public void BindAdjustments(IAggregateAudioAdjustment component) => sampleContainer.BindAdjustments(component);
+
+        public void UnbindAdjustments(IAggregateAudioAdjustment component) => sampleContainer.UnbindAdjustments(component);
+
+        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
+
+        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.RemoveAdjustment(type, adjustBindable);
+
         public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
 
         public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => sampleContainer.RemoveAdjustment(type, adjustBindable);
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index b3db2d6558..c971517c7f 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -176,14 +176,19 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => samplesContainer.Tempo;
 
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => samplesContainer.AddAdjustment(type, adjustBindable);
+        public void BindAdjustments(IAggregateAudioAdjustment component) => samplesContainer.BindAdjustments(component);
 
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => samplesContainer.RemoveAdjustment(type, adjustBindable);
+        public void UnbindAdjustments(IAggregateAudioAdjustment component) => samplesContainer.UnbindAdjustments(component);
 
-        public void RemoveAllAdjustments(AdjustableProperty type)
-            => samplesContainer.RemoveAllAdjustments(type);
+        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => samplesContainer.AddAdjustment(type, adjustBindable);
+
+        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => samplesContainer.RemoveAdjustment(type, adjustBindable);
+
+        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => samplesContainer.AddAdjustment(type, adjustBindable);
+
+        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => samplesContainer.RemoveAdjustment(type, adjustBindable);
+
+        public void RemoveAllAdjustments(AdjustableProperty type) => samplesContainer.RemoveAllAdjustments(type);
 
         /// <summary>
         /// Whether any samples are currently playing.

From a01896a652ee042cc66149a99ccf5b76dddef535 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 18 Feb 2021 13:04:22 +0300
Subject: [PATCH 08227/10326] Fix misordered hit error in score meter types

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

diff --git a/osu.Game/Configuration/ScoreMeterType.cs b/osu.Game/Configuration/ScoreMeterType.cs
index b9499c758e..ddbd2327c2 100644
--- a/osu.Game/Configuration/ScoreMeterType.cs
+++ b/osu.Game/Configuration/ScoreMeterType.cs
@@ -16,12 +16,12 @@ namespace osu.Game.Configuration
         [Description("Hit Error (right)")]
         HitErrorRight,
 
-        [Description("Hit Error (bottom)")]
-        HitErrorBottom,
-
         [Description("Hit Error (left+right)")]
         HitErrorBoth,
 
+        [Description("Hit Error (bottom)")]
+        HitErrorBottom,
+
         [Description("Colour (left)")]
         ColourLeft,
 

From d85a4a22e525cc4914c12bbe067e79f7ef8ba8cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 19:19:28 +0900
Subject: [PATCH 08228/10326] Allow beatmap imports from any derived version of
 SongSelect, rather than only PlaySongSelect

---
 osu.Game/OsuGame.cs               | 2 +-
 osu.Game/PerformFromMenuRunner.cs | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 15785ea6bd..771bcd2310 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -383,7 +383,7 @@ namespace osu.Game
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
-            }, validScreens: new[] { typeof(PlaySongSelect) });
+            }, validScreens: new[] { typeof(SongSelect) });
         }
 
         /// <summary>
diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 7999023998..3df9ca5305 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -82,7 +82,9 @@ namespace osu.Game
             game?.CloseAllOverlays(false);
 
             // we may already be at the target screen type.
-            if (validScreens.Contains(current.GetType()) && !beatmap.Disabled)
+            var type = current.GetType();
+
+            if (validScreens.Any(t => type.IsAssignableFrom(t)) && !beatmap.Disabled)
             {
                 finalAction(current);
                 Cancel();
@@ -91,13 +93,14 @@ namespace osu.Game
 
             while (current != null)
             {
-                if (validScreens.Contains(current.GetType()))
+                if (validScreens.Any(t => type.IsAssignableFrom(t)))
                 {
                     current.MakeCurrent();
                     break;
                 }
 
                 current = current.GetParentScreen();
+                type = current?.GetType();
             }
         }
 

From 8a1a4ea2d42874d1dc752d4ec6a3371d02940054 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Feb 2021 19:33:04 +0900
Subject: [PATCH 08229/10326] Set Current directly

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

diff --git a/osu.Game/Collections/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
index aad8400faa..bb743d4ccc 100644
--- a/osu.Game/Collections/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Collections
             // Dropdown has logic which triggers a change on the bindable with every change to the contained items.
             // This is not desirable here, as it leads to multiple filter operations running even though nothing has changed.
             // An extra bindable is enough to subvert this behaviour.
-            base.Current.BindTo(Current);
+            base.Current = Current;
 
             collections.BindCollectionChanged((_, __) => collectionsChanged(), true);
             Current.BindValueChanged(filterChanged, true);

From e14a59f272f7c5feaab972493c2fc8cf1a91c3e6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 18 Feb 2021 15:26:59 +0300
Subject: [PATCH 08230/10326] Fix creating ruleset instances per LINQ select

---
 .../OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 25bc314f1b..5bef934e6a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             const double fade_time = 50;
 
-            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
+            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
 
             var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
@@ -177,7 +177,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             // If the mods are updated at the end of the frame, the flow container will skip a reflow cycle: https://github.com/ppy/osu-framework/issues/4187
             // This looks particularly jarring here, so re-schedule the update to that start of our frame as a fix.
-            Schedule(() => userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset.CreateInstance())).ToList());
+            Schedule(() => userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList());
         }
 
         public MenuItem[] ContextMenuItems

From a407bfe73bc0e4aefce7a30a00a4daf6cb30c481 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 18 Feb 2021 15:37:52 +0300
Subject: [PATCH 08231/10326] Privatize `UserRanks` and expose a similar
 `CountryRank` field instead

---
 .../Visual/Online/TestSceneUserProfileOverlay.cs    |  2 +-
 .../Profile/Header/CentreHeaderContainer.cs         |  2 +-
 .../Profile/Header/DetailHeaderContainer.cs         |  2 +-
 osu.Game/Users/UserStatistics.cs                    | 13 +++++++++----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index b52cc6edb6..03d079261d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Online
             Statistics = new UserStatistics
             {
                 GlobalRank = 2148,
-                Ranks = new UserStatistics.UserRanks { Country = 1, },
+                CountryRank = 1,
                 PP = 4567.89m,
                 Level = new UserStatistics.LevelInfo
                 {
diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 9285e2d875..62ebee7677 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Profile.Header
         private void updateDisplay(User user)
         {
             hiddenDetailGlobal.Content = user?.Statistics?.GlobalRank?.ToString("\\##,##0") ?? "-";
-            hiddenDetailCountry.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
+            hiddenDetailCountry.Content = user?.Statistics?.CountryRank?.ToString("\\##,##0") ?? "-";
         }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
index 05a0508e1f..574aef02fd 100644
--- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Overlays.Profile.Header
                 scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0;
 
             detailGlobalRank.Content = user?.Statistics?.GlobalRank?.ToString("\\##,##0") ?? "-";
-            detailCountryRank.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
+            detailCountryRank.Content = user?.Statistics?.CountryRank?.ToString("\\##,##0") ?? "-";
 
             rankGraph.Statistics.Value = user?.Statistics;
         }
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index e50ca57d90..90c1d40848 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -29,10 +29,15 @@ namespace osu.Game.Users
         [JsonProperty(@"global_rank")]
         public int? GlobalRank;
 
-        // eventually UserRanks object will be completely replaced with separate global rank (exists) and country rank properties
-        // see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
+        public int? CountryRank;
+
         [JsonProperty(@"rank")]
-        public UserRanks Ranks;
+        private UserRanks ranks
+        {
+            // eventually that will also become an own json property instead of reading from a `rank` object.
+            // see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
+            set => CountryRank = value.Country;
+        }
 
         [JsonProperty(@"pp")]
         public decimal? PP;
@@ -115,7 +120,7 @@ namespace osu.Game.Users
             }
         }
 
-        public struct UserRanks
+        private struct UserRanks
         {
             [JsonProperty(@"country")]
             public int? Country;

From f6df5a9d2b67272e6a1e42a6cd71dad5777c0e02 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 18 Feb 2021 15:55:45 +0300
Subject: [PATCH 08232/10326] Suppress false warning

---
 osu.Game/Users/UserStatistics.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 90c1d40848..4b1e46d51a 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -122,8 +122,10 @@ namespace osu.Game.Users
 
         private struct UserRanks
         {
+#pragma warning disable 649
             [JsonProperty(@"country")]
             public int? Country;
+#pragma warning restore 649
         }
 
         public RankHistoryData RankHistory;

From 10ec4cd8e07950b8a48e8da8931e3e39b16559b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 22:38:17 +0900
Subject: [PATCH 08233/10326] Revert change to loading layer's default state

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

diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 0a5ceb1993..de33e4a1bc 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays
                         }
                     }
                 },
-                Loading = new LoadingLayer()
+                Loading = new LoadingLayer(true)
             });
 
             base.Content.Add(mainContent);

From 4caca9653ab02ddbb9dea6105bb5cbeb807fae2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 10:39:56 +0900
Subject: [PATCH 08234/10326] 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 e30416bc1c..bc5ba57d71 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.215.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.219.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 72f680f6f8..fef2f567df 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.215.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.219.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 137c96a72d..0d473290e6 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.Framework.iOS" Version="2021.215.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.219.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,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="2021.215.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.219.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From bc10fcafae2d57b6bb07d6bf666ee72577e5b8f9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Feb 2021 13:23:01 +0900
Subject: [PATCH 08235/10326] Remove now unnecessary schedule

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index b5eff04532..cb2b6dda95 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -47,7 +47,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private Drawable userModsSection;
 
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
-        private readonly IBindable<PlaylistItem> matchCurrentItem = new Bindable<PlaylistItem>();
 
         [CanBeNull]
         private IDisposable readyClickOperation;
@@ -269,8 +268,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            matchCurrentItem.BindTo(client.CurrentMatchPlayingItem);
-            matchCurrentItem.BindValueChanged(onCurrentItemChanged, true);
+            SelectedItem.BindTo(client.CurrentMatchPlayingItem);
+            SelectedItem.BindValueChanged(onSelectedItemChanged, true);
 
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
             UserMods.BindValueChanged(onUserModsChanged);
@@ -286,20 +285,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }, true);
         }
 
-        private void onCurrentItemChanged(ValueChangedEvent<PlaylistItem> item)
+        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> item)
         {
             if (client?.LocalUser == null)
                 return;
 
-            // If we're about to enter gameplay, schedule the item to be set at a later time.
-            if (client.LocalUser.State > MultiplayerUserState.Ready)
-            {
-                Schedule(() => onCurrentItemChanged(item));
-                return;
-            }
-
-            SelectedItem.Value = item.NewValue;
-
             if (item.NewValue?.AllowedMods.Any() != true)
             {
                 userModsSection.Hide();

From 841c2c56d961e7eb76cb48f4fe2686f9250e6e7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 13:30:42 +0900
Subject: [PATCH 08236/10326] Remove confusing pp_rank include (will be removed
 osu-web side too)

---
 osu.Game/Users/UserStatistics.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 4b1e46d51a..70969ea737 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -42,9 +42,6 @@ namespace osu.Game.Users
         [JsonProperty(@"pp")]
         public decimal? PP;
 
-        [JsonProperty(@"pp_rank")]
-        public int PPRank;
-
         [JsonProperty(@"ranked_score")]
         public long RankedScore;
 

From 183a481a345ea4fff4b55dd6df7fcdbc4e1dad4b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Feb 2021 13:32:32 +0900
Subject: [PATCH 08237/10326] Refactor playlist update to remove .Contains()
 check

---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 416162779d..ed97307c95 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -537,21 +537,30 @@ namespace osu.Game.Online.Multiplayer
             var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
             var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
-            // Update an existing playlist item from the API room, or create a new item.
-            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId) ?? new PlaylistItem();
+            // Try to retrieve the existing playlist item from the API room.
+            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId);
 
-            playlistItem.ID = settings.PlaylistItemId;
-            playlistItem.Beatmap.Value = beatmap;
-            playlistItem.Ruleset.Value = ruleset.RulesetInfo;
-            playlistItem.RequiredMods.Clear();
-            playlistItem.RequiredMods.AddRange(mods);
-            playlistItem.AllowedMods.Clear();
-            playlistItem.AllowedMods.AddRange(allowedMods);
-
-            if (!apiRoom.Playlist.Contains(playlistItem))
+            if (playlistItem != null)
+                updateItem(playlistItem);
+            else
+            {
+                // An existing playlist item does not exist, so append a new one.
+                updateItem(playlistItem = new PlaylistItem());
                 apiRoom.Playlist.Add(playlistItem);
+            }
 
             CurrentMatchPlayingItem.Value = playlistItem;
+
+            void updateItem(PlaylistItem item)
+            {
+                item.ID = settings.PlaylistItemId;
+                item.Beatmap.Value = beatmap;
+                item.Ruleset.Value = ruleset.RulesetInfo;
+                item.RequiredMods.Clear();
+                item.RequiredMods.AddRange(mods);
+                item.AllowedMods.Clear();
+                item.AllowedMods.AddRange(allowedMods);
+            }
         }
 
         /// <summary>

From 85a844a37820425e05df93d2d615593dbcc1989f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 13:40:12 +0900
Subject: [PATCH 08238/10326] Restructure class slightly

---
 osu.Game/Users/UserStatistics.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 70969ea737..78e6f5a05a 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Users
             set => CountryRank = value.Country;
         }
 
+        // populated via User model, as that's where the data currently lives.
+        public RankHistoryData RankHistory;
+
         [JsonProperty(@"pp")]
         public decimal? PP;
 
@@ -117,14 +120,12 @@ namespace osu.Game.Users
             }
         }
 
+#pragma warning disable 649
         private struct UserRanks
         {
-#pragma warning disable 649
             [JsonProperty(@"country")]
             public int? Country;
-#pragma warning restore 649
         }
-
-        public RankHistoryData RankHistory;
+#pragma warning restore 649
     }
 }

From c0e0bd4f421764ae6418597ed30bb64d501a69e8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Feb 2021 13:57:04 +0900
Subject: [PATCH 08239/10326] Add compatibility with old server build

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index ed97307c95..bfd505fb19 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -94,6 +94,10 @@ namespace osu.Game.Online.Multiplayer
         [Resolved]
         private RulesetStore rulesets { get; set; } = null!;
 
+        // Only exists for compatibility with old osu-server-spectator build.
+        // Todo: Can be removed on 2021/02/26.
+        private long defaultPlaylistItemId;
+
         private Room? apiRoom;
 
         [BackgroundDependencyLoader]
@@ -141,6 +145,7 @@ namespace osu.Game.Online.Multiplayer
                 {
                     Room = joinedRoom;
                     apiRoom = room;
+                    defaultPlaylistItemId = apiRoom.Playlist.FirstOrDefault()?.ID ?? 0;
                 }, cancellationSource.Token);
 
                 // Update room settings.
@@ -553,7 +558,7 @@ namespace osu.Game.Online.Multiplayer
 
             void updateItem(PlaylistItem item)
             {
-                item.ID = settings.PlaylistItemId;
+                item.ID = settings.PlaylistItemId == 0 ? defaultPlaylistItemId : settings.PlaylistItemId;
                 item.Beatmap.Value = beatmap;
                 item.Ruleset.Value = ruleset.RulesetInfo;
                 item.RequiredMods.Clear();

From 87edf6787981a49c7160dac2d26beebf8b404416 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 14:07:39 +0900
Subject: [PATCH 08240/10326] 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 bc5ba57d71..bfdc8f6b3c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.219.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.219.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fef2f567df..4138fc8d6c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.219.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.219.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 0d473290e6..783b638aa0 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.Framework.iOS" Version="2021.219.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.219.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,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="2021.219.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.219.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1701d69a602520fb75c7f39f5c3fe7ad7d9f641d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 14:33:08 +0900
Subject: [PATCH 08241/10326] Fix calls to IsAssignableFrom being back-to-front

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

diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 3df9ca5305..a4179c94da 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -84,7 +84,7 @@ namespace osu.Game
             // we may already be at the target screen type.
             var type = current.GetType();
 
-            if (validScreens.Any(t => type.IsAssignableFrom(t)) && !beatmap.Disabled)
+            if (validScreens.Any(t => t.IsAssignableFrom(type)) && !beatmap.Disabled)
             {
                 finalAction(current);
                 Cancel();
@@ -93,7 +93,7 @@ namespace osu.Game
 
             while (current != null)
             {
-                if (validScreens.Any(t => type.IsAssignableFrom(t)))
+                if (validScreens.Any(t => t.IsAssignableFrom(type)))
                 {
                     current.MakeCurrent();
                     break;

From 39059ed82d57fa526018371089dc609c1fc0b7b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 14:36:51 +0900
Subject: [PATCH 08242/10326] Remove unnecessary null coalesce check

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 15e12eac40..da516798c8 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -166,19 +166,21 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             updateWorkingBeatmap();
 
-            if (SelectedItem.Value == null)
+            var selected = SelectedItem.Value;
+
+            if (selected == null)
                 return;
 
             // Remove any user mods that are no longer allowed.
             UserMods.Value = UserMods.Value
-                                     .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
+                                     .Where(m => selected.AllowedMods.Any(a => m.GetType() == a.GetType()))
                                      .ToList();
 
             UpdateMods();
 
-            Ruleset.Value = SelectedItem.Value.Ruleset.Value;
+            Ruleset.Value = selected.Ruleset.Value;
 
-            if (SelectedItem.Value?.AllowedMods.Any() != true)
+            if (selected.AllowedMods.Any() != true)
             {
                 UserModsSection?.Hide();
                 userModsSelectOverlay.Hide();
@@ -187,7 +189,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             else
             {
                 UserModsSection?.Show();
-                userModsSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
+                userModsSelectOverlay.IsValidMod = m => selected.AllowedMods.Any(a => a.GetType() == m.GetType());
             }
         }
 

From 484968d797852ce71cb412ade2e43e11b267cd0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 14:46:10 +0900
Subject: [PATCH 08243/10326] Fix weird bool check

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 52705302aa..4a689314db 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
             Ruleset.Value = selected.Ruleset.Value;
 
-            if (selected.AllowedMods.Any() != true)
+            if (!selected.AllowedMods.Any())
             {
                 UserModsSection?.Hide();
                 userModsSelectOverlay.Hide();

From ee9e6fff402b146f2c99b8a872f3fe3f5cfc703f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 15:09:41 +0900
Subject: [PATCH 08244/10326] Add bindable flow for expanded leaderboard state

---
 .../Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs    | 1 +
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs              | 4 ++++
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs         | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index aab69d687a..026c302642 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -85,6 +85,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public void TestScoreUpdates()
         {
             AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 100);
+            AddToggleStep("switch compact mode", expanded => leaderboard.Expanded.Value = expanded);
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 7b94bf19ec..20e24ed945 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using JetBrains.Annotations;
+using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -16,6 +17,8 @@ namespace osu.Game.Screens.Play.HUD
     {
         private readonly Cached sorting = new Cached();
 
+        public Bindable<bool> Expanded = new Bindable<bool>();
+
         public GameplayLeaderboard()
         {
             Width = GameplayLeaderboardScore.EXTENDED_WIDTH + GameplayLeaderboardScore.SHEAR_WIDTH;
@@ -49,6 +52,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
+                Expanded = { BindTarget = Expanded },
             };
 
             base.Add(drawable);
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index cb20deb272..f738f91e63 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Play.HUD
 
         private const float panel_shear = 0.15f;
 
+        public Bindable<bool> Expanded = new Bindable<bool>();
+
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
         public BindableDouble TotalScore { get; } = new BindableDouble();

From 43c35c5118045f9c52a1755698073415f455d03b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 15:15:31 +0900
Subject: [PATCH 08245/10326] Show local user in test scene

---
 .../Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 026c302642..1ee848b902 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -13,6 +13,7 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -50,6 +51,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUpSteps]
         public override void SetUpSteps()
         {
+            AddStep("set local user", () => ((DummyAPIAccess)API).LocalUser.Value = lookupCache.GetUserAsync(1).Result);
+
             AddStep("create leaderboard", () =>
             {
                 leaderboard?.Expire();

From 691cfa5bc3bdceda779441dcd99a2437bd2beee8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 16:46:30 +0900
Subject: [PATCH 08246/10326] Add expanded/compact display modes for
 GameplayLeaderboard

---
 .../Screens/Play/HUD/GameplayLeaderboard.cs   |   2 -
 .../Play/HUD/GameplayLeaderboardScore.cs      | 347 +++++++++++-------
 2 files changed, 210 insertions(+), 139 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 20e24ed945..34efeab54c 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -50,8 +50,6 @@ namespace osu.Game.Screens.Play.HUD
         {
             var drawable = new GameplayLeaderboardScore(user, isTracked)
             {
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
                 Expanded = { BindTarget = Expanded },
             };
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index f738f91e63..10476e5565 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -20,16 +20,31 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
-        public const float EXTENDED_WIDTH = 255f;
+        public const float EXTENDED_WIDTH = regular_width + top_player_left_width_extension;
 
         private const float regular_width = 235f;
 
+        // a bit hand-wavy, but there's a lot of hard-coded paddings in each of the grid's internals.
+        private const float compact_width = 77.5f;
+
+        private const float top_player_left_width_extension = 20f;
+
         public const float PANEL_HEIGHT = 35f;
 
         public const float SHEAR_WIDTH = PANEL_HEIGHT * panel_shear;
 
         private const float panel_shear = 0.15f;
 
+        private const float rank_text_width = 35f;
+
+        private const float score_components_width = 85f;
+
+        private const float avatar_size = 25f;
+
+        private const double panel_transition_duration = 500;
+
+        private const double text_transition_duration = 200;
+
         public Bindable<bool> Expanded = new Bindable<bool>();
 
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
@@ -65,8 +80,15 @@ namespace osu.Game.Screens.Play.HUD
         private readonly bool trackedPlayer;
 
         private Container mainFillContainer;
+
         private Box centralFill;
 
+        private Container backgroundPaddingAdjustContainer;
+
+        private GridContainer gridContainer;
+
+        private Container scoreComponents;
+
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
         /// </summary>
@@ -77,7 +99,8 @@ namespace osu.Game.Screens.Play.HUD
             User = user;
             this.trackedPlayer = trackedPlayer;
 
-            Size = new Vector2(EXTENDED_WIDTH, PANEL_HEIGHT);
+            AutoSizeAxes = Axes.X;
+            Height = PANEL_HEIGHT;
         }
 
         [BackgroundDependencyLoader]
@@ -87,147 +110,167 @@ namespace osu.Game.Screens.Play.HUD
 
             InternalChildren = new Drawable[]
             {
-                mainFillContainer = new Container
+                new Container
                 {
-                    Width = regular_width,
+                    AutoSizeAxes = Axes.X,
                     RelativeSizeAxes = Axes.Y,
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    Masking = true,
-                    CornerRadius = 5f,
-                    Shear = new Vector2(panel_shear, 0f),
-                    Child = new Box
+                    Margin = new MarginPadding { Left = top_player_left_width_extension },
+                    Children = new Drawable[]
                     {
-                        Alpha = 0.5f,
-                        RelativeSizeAxes = Axes.Both,
-                    }
-                },
-                new GridContainer
-                {
-                    Width = regular_width,
-                    RelativeSizeAxes = Axes.Y,
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    ColumnDimensions = new[]
-                    {
-                        new Dimension(GridSizeMode.Absolute, 35f),
-                        new Dimension(),
-                        new Dimension(GridSizeMode.Absolute, 85f),
-                    },
-                    Content = new[]
-                    {
-                        new Drawable[]
+                        backgroundPaddingAdjustContainer = new Container
                         {
-                            positionText = new OsuSpriteText
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
                             {
-                                Padding = new MarginPadding { Right = SHEAR_WIDTH / 2 },
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Colour = Color4.White,
-                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.Bold),
-                                Shadow = false,
-                            },
-                            new Container
-                            {
-                                Padding = new MarginPadding { Horizontal = SHEAR_WIDTH / 3 },
-                                RelativeSizeAxes = Axes.Both,
-                                Children = new Drawable[]
+                                mainFillContainer = new Container
                                 {
-                                    new Container
+                                    Anchor = Anchor.TopRight,
+                                    Origin = Anchor.TopRight,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Masking = true,
+                                    CornerRadius = 5f,
+                                    Shear = new Vector2(panel_shear, 0f),
+                                    Children = new Drawable[]
                                     {
-                                        Masking = true,
-                                        CornerRadius = 5f,
-                                        Shear = new Vector2(panel_shear, 0f),
-                                        RelativeSizeAxes = Axes.Both,
-                                        Children = new[]
+                                        new Box
                                         {
-                                            centralFill = new Box
-                                            {
-                                                Alpha = 0.5f,
-                                                RelativeSizeAxes = Axes.Both,
-                                                Colour = Color4Extensions.FromHex("3399cc"),
-                                            },
-                                        }
-                                    },
-                                    new FillFlowContainer
-                                    {
-                                        Padding = new MarginPadding { Left = SHEAR_WIDTH },
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
-                                        RelativeSizeAxes = Axes.Both,
-                                        Direction = FillDirection.Horizontal,
-                                        Spacing = new Vector2(4f, 0f),
-                                        Children = new Drawable[]
-                                        {
-                                            avatarContainer = new CircularContainer
-                                            {
-                                                Masking = true,
-                                                Anchor = Anchor.CentreLeft,
-                                                Origin = Anchor.CentreLeft,
-                                                Size = new Vector2(25f),
-                                                Children = new Drawable[]
-                                                {
-                                                    new Box
-                                                    {
-                                                        Name = "Placeholder while avatar loads",
-                                                        Alpha = 0.3f,
-                                                        RelativeSizeAxes = Axes.Both,
-                                                        Colour = colours.Gray4,
-                                                    }
-                                                }
-                                            },
-                                            usernameText = new OsuSpriteText
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                Width = 0.6f,
-                                                Anchor = Anchor.CentreLeft,
-                                                Origin = Anchor.CentreLeft,
-                                                Colour = Color4.White,
-                                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
-                                                Text = User?.Username,
-                                                Truncate = true,
-                                                Shadow = false,
-                                            }
-                                        }
-                                    },
-                                }
-                            },
-                            new Container
-                            {
-                                Padding = new MarginPadding { Top = 2f, Right = 17.5f, Bottom = 5f },
-                                RelativeSizeAxes = Axes.Both,
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.CentreLeft,
-                                Colour = Color4.White,
-                                Children = new Drawable[]
-                                {
-                                    scoreText = new OsuSpriteText
-                                    {
-                                        Spacing = new Vector2(-1f, 0f),
-                                        Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold, fixedWidth: true),
-                                        Shadow = false,
-                                    },
-                                    accuracyText = new OsuSpriteText
-                                    {
-                                        Anchor = Anchor.BottomLeft,
-                                        Origin = Anchor.BottomLeft,
-                                        Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
-                                        Spacing = new Vector2(-1f, 0f),
-                                        Shadow = false,
-                                    },
-                                    comboText = new OsuSpriteText
-                                    {
-                                        Anchor = Anchor.BottomRight,
-                                        Origin = Anchor.BottomRight,
-                                        Spacing = new Vector2(-1f, 0f),
-                                        Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
-                                        Shadow = false,
+                                            Alpha = 0.5f,
+                                            RelativeSizeAxes = Axes.Both,
+                                        },
                                     },
                                 },
                             }
+                        },
+                        gridContainer = new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.Y,
+                            Width = compact_width, // will be updated by expanded state.
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            ColumnDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.Absolute, rank_text_width),
+                                new Dimension(),
+                                new Dimension(GridSizeMode.AutoSize, maxSize: score_components_width),
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    positionText = new OsuSpriteText
+                                    {
+                                        Padding = new MarginPadding { Right = SHEAR_WIDTH / 2 },
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Colour = Color4.White,
+                                        Font = OsuFont.Torus.With(size: 14, weight: FontWeight.Bold),
+                                        Shadow = false,
+                                    },
+                                    new Container
+                                    {
+                                        Padding = new MarginPadding { Horizontal = SHEAR_WIDTH / 3 },
+                                        RelativeSizeAxes = Axes.Both,
+                                        Children = new Drawable[]
+                                        {
+                                            new Container
+                                            {
+                                                Masking = true,
+                                                CornerRadius = 5f,
+                                                Shear = new Vector2(panel_shear, 0f),
+                                                RelativeSizeAxes = Axes.Both,
+                                                Children = new[]
+                                                {
+                                                    centralFill = new Box
+                                                    {
+                                                        Alpha = 0.5f,
+                                                        RelativeSizeAxes = Axes.Both,
+                                                        Colour = Color4Extensions.FromHex("3399cc"),
+                                                    },
+                                                }
+                                            },
+                                            new FillFlowContainer
+                                            {
+                                                Padding = new MarginPadding { Left = SHEAR_WIDTH },
+                                                Anchor = Anchor.CentreLeft,
+                                                Origin = Anchor.CentreLeft,
+                                                RelativeSizeAxes = Axes.Both,
+                                                Direction = FillDirection.Horizontal,
+                                                Spacing = new Vector2(4f, 0f),
+                                                Children = new Drawable[]
+                                                {
+                                                    avatarContainer = new CircularContainer
+                                                    {
+                                                        Masking = true,
+                                                        Anchor = Anchor.CentreLeft,
+                                                        Origin = Anchor.CentreLeft,
+                                                        Size = new Vector2(avatar_size),
+                                                        Children = new Drawable[]
+                                                        {
+                                                            new Box
+                                                            {
+                                                                Name = "Placeholder while avatar loads",
+                                                                Alpha = 0.3f,
+                                                                RelativeSizeAxes = Axes.Both,
+                                                                Colour = colours.Gray4,
+                                                            }
+                                                        }
+                                                    },
+                                                    usernameText = new OsuSpriteText
+                                                    {
+                                                        RelativeSizeAxes = Axes.X,
+                                                        Width = 0.6f,
+                                                        Anchor = Anchor.CentreLeft,
+                                                        Origin = Anchor.CentreLeft,
+                                                        Colour = Color4.White,
+                                                        Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
+                                                        Text = User?.Username,
+                                                        Truncate = true,
+                                                        Shadow = false,
+                                                    }
+                                                }
+                                            },
+                                        }
+                                    },
+                                    scoreComponents = new Container
+                                    {
+                                        Padding = new MarginPadding { Top = 2f, Right = 17.5f, Bottom = 5f },
+                                        AlwaysPresent = true, // required to smoothly animate autosize after hidden early.
+                                        Masking = true,
+                                        RelativeSizeAxes = Axes.Y,
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Colour = Color4.White,
+                                        Children = new Drawable[]
+                                        {
+                                            scoreText = new OsuSpriteText
+                                            {
+                                                Spacing = new Vector2(-1f, 0f),
+                                                Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold, fixedWidth: true),
+                                                Shadow = false,
+                                            },
+                                            accuracyText = new OsuSpriteText
+                                            {
+                                                Anchor = Anchor.BottomLeft,
+                                                Origin = Anchor.BottomLeft,
+                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
+                                                Spacing = new Vector2(-1f, 0f),
+                                                Shadow = false,
+                                            },
+                                            comboText = new OsuSpriteText
+                                            {
+                                                Anchor = Anchor.BottomRight,
+                                                Origin = Anchor.BottomRight,
+                                                Spacing = new Vector2(-1f, 0f),
+                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
+                                                Shadow = false,
+                                            },
+                                        },
+                                    }
+                                }
+                            }
                         }
                     }
-                }
+                },
             };
 
             LoadComponentAsync(new DrawableAvatar(User), avatarContainer.Add);
@@ -243,18 +286,43 @@ namespace osu.Game.Screens.Play.HUD
             base.LoadComplete();
 
             updateState();
+            Expanded.BindValueChanged(changeExpandedState, true);
+
             FinishTransforms(true);
         }
 
-        private const double panel_transition_duration = 500;
+        private void changeExpandedState(ValueChangedEvent<bool> expanded)
+        {
+            scoreComponents.ClearTransforms();
+
+            if (expanded.NewValue)
+            {
+                gridContainer.ResizeWidthTo(regular_width, panel_transition_duration, Easing.OutQuint);
+
+                scoreComponents.ResizeWidthTo(score_components_width, panel_transition_duration, Easing.OutQuint);
+                scoreComponents.FadeIn(panel_transition_duration, Easing.OutQuint);
+
+                usernameText.FadeIn(panel_transition_duration, Easing.OutQuint);
+            }
+            else
+            {
+                gridContainer.ResizeWidthTo(compact_width, panel_transition_duration, Easing.OutQuint);
+
+                scoreComponents.ResizeWidthTo(0, panel_transition_duration, Easing.OutQuint);
+                scoreComponents.FadeOut(text_transition_duration, Easing.OutQuint);
+
+                usernameText.FadeOut(text_transition_duration, Easing.OutQuint);
+            }
+        }
 
         private void updateState()
         {
+            bool widthExtension = false;
+
             if (HasQuit.Value)
             {
                 // we will probably want to display this in a better way once we have a design.
                 // and also show states other than quit.
-                mainFillContainer.ResizeWidthTo(regular_width, panel_transition_duration, Easing.OutElastic);
                 panelColour = Color4.Gray;
                 textColour = Color4.White;
                 return;
@@ -262,22 +330,29 @@ namespace osu.Game.Screens.Play.HUD
 
             if (scorePosition == 1)
             {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, panel_transition_duration, Easing.OutElastic);
+                widthExtension = true;
                 panelColour = Color4Extensions.FromHex("7fcc33");
                 textColour = Color4.White;
             }
             else if (trackedPlayer)
             {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, panel_transition_duration, Easing.OutElastic);
+                widthExtension = true;
                 panelColour = Color4Extensions.FromHex("ffd966");
                 textColour = Color4Extensions.FromHex("2e576b");
             }
             else
             {
-                mainFillContainer.ResizeWidthTo(regular_width, panel_transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("3399cc");
                 textColour = Color4.White;
             }
+
+            this.TransformTo(nameof(SizeContainerLeftPadding), widthExtension ? -top_player_left_width_extension : 0, panel_transition_duration, Easing.OutElastic);
+        }
+
+        public float SizeContainerLeftPadding
+        {
+            get => backgroundPaddingAdjustContainer.Padding.Left;
+            set => backgroundPaddingAdjustContainer.Padding = new MarginPadding { Left = value };
         }
 
         private Color4 panelColour
@@ -289,8 +364,6 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private const double text_transition_duration = 200;
-
         private Color4 textColour
         {
             set

From 772471a6d826a730ca17176f2c542b7e4d2ba44a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 09:34:39 +0300
Subject: [PATCH 08247/10326] Add failing test case

---
 .../Gameplay/TestScenePauseWhenInactive.cs    | 63 ++++++++++++++++---
 osu.Game/Screens/Play/Player.cs               | 10 +--
 2 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
index e43e5ba3ce..15412fea00 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
@@ -1,28 +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.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Storyboards;
+using osu.Game.Tests.Beatmaps;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [HeadlessTest] // we alter unsafe properties on the game host to test inactive window state.
     public class TestScenePauseWhenInactive : OsuPlayerTestScene
     {
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
-        {
-            var beatmap = (Beatmap)base.CreateBeatmap(ruleset);
-
-            beatmap.HitObjects.RemoveAll(h => h.StartTime < 30000);
-
-            return beatmap;
-        }
-
         [Resolved]
         private GameHost host { get; set; }
 
@@ -33,10 +33,53 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("resume player", () => Player.GameplayClockContainer.Start());
             AddAssert("ensure not paused", () => !Player.GameplayClockContainer.IsPaused.Value);
+
+            AddStep("progress time to gameplay", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.GameplayStartTime));
+            AddUntilStep("wait for pause", () => Player.GameplayClockContainer.IsPaused.Value);
+        }
+
+        /// <summary>
+        /// Tests that if a pause from focus lose is performed while in pause cooldown,
+        /// the player will still pause after the cooldown is finished.
+        /// </summary>
+        [Test]
+        public void TestPauseWhileInCooldown()
+        {
+            AddStep("resume player", () => Player.GameplayClockContainer.Start());
+            AddStep("skip to gameplay", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.GameplayStartTime));
+
+            AddStep("set inactive", () => ((Bindable<bool>)host.IsActive).Value = false);
+            AddUntilStep("wait for pause", () => Player.GameplayClockContainer.IsPaused.Value);
+
+            AddStep("set active", () => ((Bindable<bool>)host.IsActive).Value = true);
+
+            AddStep("resume player", () => Player.Resume());
+            AddStep("click resume overlay", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<OsuResumeOverlay.OsuClickToResumeCursor>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("pause cooldown active", () => Player.PauseCooldownActive);
+            AddStep("set inactive again", () => ((Bindable<bool>)host.IsActive).Value = false);
             AddUntilStep("wait for pause", () => Player.GameplayClockContainer.IsPaused.Value);
-            AddAssert("time of pause is after gameplay start time", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= Player.DrawableRuleset.GameplayStartTime);
         }
 
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(true, true, true);
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            return new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle { StartTime = 30000 },
+                    new HitCircle { StartTime = 35000 },
+                },
+            };
+        }
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+            => new TestWorkingBeatmap(beatmap, storyboard, Audio);
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 74059da21a..a7acda926b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -667,6 +667,9 @@ namespace osu.Game.Screens.Play
 
         private double? lastPauseActionTime;
 
+        public bool PauseCooldownActive =>
+            lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
+
         private bool canPause =>
             // must pass basic screen conditions (beatmap loaded, instance allows pause)
             LoadedBeatmapSuccessfully && Configuration.AllowPause && ValidForResume
@@ -675,10 +678,7 @@ namespace osu.Game.Screens.Play
             // cannot pause if we are already in a fail state
             && !HasFailed
             // cannot pause if already paused (or in a cooldown state) unless we are in a resuming state.
-            && (IsResuming || (GameplayClockContainer.IsPaused.Value == false && !pauseCooldownActive));
-
-        private bool pauseCooldownActive =>
-            lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
+            && (IsResuming || (GameplayClockContainer.IsPaused.Value == false && !PauseCooldownActive));
 
         private bool canResume =>
             // cannot resume from a non-paused state
@@ -812,7 +812,7 @@ namespace osu.Game.Screens.Play
             // ValidForResume is false when restarting
             if (ValidForResume)
             {
-                if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
+                if (PauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
                     // still want to block if we are within the cooldown period and not already paused.
                     return true;
             }

From 4436585aa4dea5bec025e5bf816ed23008b4c87e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 09:35:29 +0300
Subject: [PATCH 08248/10326] Keep attempting to pause gameplay while window
 not active

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a7acda926b..72d9a60c91 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -427,11 +427,16 @@ namespace osu.Game.Screens.Play
 
         private void updatePauseOnFocusLostState()
         {
-            if (!PauseOnFocusLost || breakTracker.IsBreakTime.Value)
+            if (!PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
                 return;
 
             if (gameActive.Value == false)
-                Pause();
+            {
+                if (canPause)
+                    Pause();
+                else
+                    Scheduler.AddDelayed(updatePauseOnFocusLostState, 200);
+            }
         }
 
         private IBeatmap loadPlayableBeatmap()

From 9d02f589fe70bfa9b3d1b2ed9f46400b497250a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 16:51:34 +0900
Subject: [PATCH 08249/10326] Compact leaderboard during gameplay

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 04d9e0a72a..ffcf248575 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -89,6 +89,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Debug.Assert(client.Room != null);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ((IBindable<bool>)leaderboard.Expanded).BindTo(IsBreakTime);
+        }
+
         protected override void StartGameplay()
         {
             // block base call, but let the server know we are ready to start.

From 52ebe343473007a06436cfe4c3969a129ef6c287 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 17:15:38 +0900
Subject: [PATCH 08250/10326] Update TestScenePause exit from fail test to
 actually fail

---
 .../Visual/Gameplay/TestScenePause.cs         | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index aa56c636ab..1214a33084 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             confirmClockRunning(false);
 
-            pauseFromUserExitKey();
+            AddStep("pause via forced pause", () => Player.Pause());
 
             confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
@@ -149,11 +149,28 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestExitFromFailedGameplay()
+        public void TestExitFromFailedGameplayAfterFailAnimation()
         {
             AddUntilStep("wait for fail", () => Player.HasFailed);
-            AddStep("exit", () => Player.Exit());
+            AddUntilStep("wait for fail overlay shown", () => Player.FailOverlayVisible);
 
+            confirmClockRunning(false);
+
+            AddStep("exit via user pause", () => Player.ExitViaPause());
+            confirmExited();
+        }
+
+        [Test]
+        public void TestExitFromFailedGameplayDuringFailAnimation()
+        {
+            AddUntilStep("wait for fail", () => Player.HasFailed);
+
+            // will finish the fail animation and show the fail/pause screen.
+            AddStep("attempt exit via pause key", () => Player.ExitViaPause());
+            AddAssert("fail overlay shown", () => Player.FailOverlayVisible);
+
+            // will actually exit.
+            AddStep("exit via pause key", () => Player.ExitViaPause());
             confirmExited();
         }
 

From 82cc06ca57d1b8ba63739799c7db5120cfe3ae7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 17:26:54 +0900
Subject: [PATCH 08251/10326] Fix new logic not considering fail overlay
 correctly

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8f2c1d1b92..e4fc92b5f2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -496,12 +496,13 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            bool pauseDialogShown = PauseOverlay.State.Value == Visibility.Visible;
+            bool pauseOrFailDialogVisible =
+                PauseOverlay.State.Value == Visibility.Visible || FailOverlay.State.Value == Visibility.Visible;
 
-            if (showDialogFirst && !pauseDialogShown)
+            if (showDialogFirst && !pauseOrFailDialogVisible)
             {
                 // if the fail animation is currently in progress, accelerate it (it will show the pause dialog on completion).
-                if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
+                if (ValidForResume && HasFailed)
                 {
                     failAnimation.FinishTransforms(true);
                     return;

From ddd1dcff88428460cfcde74c963196a0518924fe Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 11:33:26 +0300
Subject: [PATCH 08252/10326] Attempt pausing every single frame

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 72d9a60c91..fa545859d4 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -435,7 +435,7 @@ namespace osu.Game.Screens.Play
                 if (canPause)
                     Pause();
                 else
-                    Scheduler.AddDelayed(updatePauseOnFocusLostState, 200);
+                    Scheduler.AddOnce(updatePauseOnFocusLostState);
             }
         }
 

From 0771154dd2831f4d7de9d28913965f49df8909ce Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 11:42:30 +0300
Subject: [PATCH 08253/10326] Make `PauseCooldownActive` protected and expose
 on test class

---
 osu.Game/Screens/Play/Player.cs     | 2 +-
 osu.Game/Tests/Visual/TestPlayer.cs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index fa545859d4..8c816e8030 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -672,7 +672,7 @@ namespace osu.Game.Screens.Play
 
         private double? lastPauseActionTime;
 
-        public bool PauseCooldownActive =>
+        protected bool PauseCooldownActive =>
             lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
 
         private bool canPause =>
diff --git a/osu.Game/Tests/Visual/TestPlayer.cs b/osu.Game/Tests/Visual/TestPlayer.cs
index f47391ce6a..0addc9de75 100644
--- a/osu.Game/Tests/Visual/TestPlayer.cs
+++ b/osu.Game/Tests/Visual/TestPlayer.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Tests.Visual
 
         public new HealthProcessor HealthProcessor => base.HealthProcessor;
 
+        public new bool PauseCooldownActive => base.PauseCooldownActive;
+
         public readonly List<JudgementResult> Results = new List<JudgementResult>();
 
         public TestPlayer(bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)

From fe5e45ea8180931f1c4c8d02a162e50b0000f186 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 11:43:33 +0300
Subject: [PATCH 08254/10326] Move gameplay cursor outside instead and fix
 potential failure

---
 .../Gameplay/TestScenePauseWhenInactive.cs    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
index 15412fea00..fa596c4823 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
@@ -2,21 +2,18 @@
 // 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.Framework.Bindables;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Beatmaps;
-using osuTK.Input;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -45,6 +42,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestPauseWhileInCooldown()
         {
+            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
+
             AddStep("resume player", () => Player.GameplayClockContainer.Start());
             AddStep("skip to gameplay", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.GameplayStartTime));
 
@@ -54,14 +53,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("set active", () => ((Bindable<bool>)host.IsActive).Value = true);
 
             AddStep("resume player", () => Player.Resume());
-            AddStep("click resume overlay", () =>
-            {
-                InputManager.MoveMouseTo(this.ChildrenOfType<OsuResumeOverlay.OsuClickToResumeCursor>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
 
-            AddAssert("pause cooldown active", () => Player.PauseCooldownActive);
-            AddStep("set inactive again", () => ((Bindable<bool>)host.IsActive).Value = false);
+            bool pauseCooldownActive = false;
+
+            AddStep("set inactive again", () =>
+            {
+                pauseCooldownActive = Player.PauseCooldownActive;
+                ((Bindable<bool>)host.IsActive).Value = false;
+            });
+            AddAssert("pause cooldown active", () => pauseCooldownActive);
             AddUntilStep("wait for pause", () => Player.GameplayClockContainer.IsPaused.Value);
         }
 

From f6c279ab00d6af3231e09332e4d35b4c2ce7e106 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 11:45:45 +0300
Subject: [PATCH 08255/10326] Add assert ensuring player resumed properly

---
 osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
index fa596c4823..49c1163c6c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
@@ -53,6 +53,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("set active", () => ((Bindable<bool>)host.IsActive).Value = true);
 
             AddStep("resume player", () => Player.Resume());
+            AddAssert("unpaused", () => !Player.GameplayClockContainer.IsPaused.Value);
 
             bool pauseCooldownActive = false;
 

From 362e4802f761980213893e30c2de0c038b1463db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 17:58:04 +0900
Subject: [PATCH 08256/10326] Add the ability for PerformFromMenuRunner to
 inspect nested screen stacks

---
 osu.Game/PerformFromMenuRunner.cs             | 21 ++++++++++++++++---
 osu.Game/Screens/IHasSubScreenStack.cs        | 15 +++++++++++++
 .../Screens/OnlinePlay/OnlinePlayScreen.cs    |  4 +++-
 3 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Screens/IHasSubScreenStack.cs

diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index a4179c94da..39889ea7fc 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 
 namespace osu.Game
@@ -81,27 +82,41 @@ namespace osu.Game
 
             game?.CloseAllOverlays(false);
 
-            // we may already be at the target screen type.
+            findValidTarget(current);
+        }
+
+        private bool findValidTarget(IScreen current)
+        {
             var type = current.GetType();
 
+            // check if we are already at a valid target screen.
             if (validScreens.Any(t => t.IsAssignableFrom(type)) && !beatmap.Disabled)
             {
                 finalAction(current);
                 Cancel();
-                return;
+                return true;
             }
 
             while (current != null)
             {
+                // if this has a sub stack, recursively check the screens within it.
+                if (current is IHasSubScreenStack currentSubScreen)
+                {
+                    if (findValidTarget(currentSubScreen.SubScreenStack.CurrentScreen))
+                        return true;
+                }
+
                 if (validScreens.Any(t => t.IsAssignableFrom(type)))
                 {
                     current.MakeCurrent();
-                    break;
+                    return true;
                 }
 
                 current = current.GetParentScreen();
                 type = current?.GetType();
             }
+
+            return false;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/IHasSubScreenStack.cs b/osu.Game/Screens/IHasSubScreenStack.cs
new file mode 100644
index 0000000000..c5e2015109
--- /dev/null
+++ b/osu.Game/Screens/IHasSubScreenStack.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.Screens;
+
+namespace osu.Game.Screens
+{
+    /// <summary>
+    /// A screen which manages a nested stack of screens within itself.
+    /// </summary>
+    public interface IHasSubScreenStack
+    {
+        ScreenStack SubScreenStack { get; }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 71fd0d5c76..90e499c67f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -28,7 +28,7 @@ using osuTK;
 namespace osu.Game.Screens.OnlinePlay
 {
     [Cached]
-    public abstract class OnlinePlayScreen : OsuScreen
+    public abstract class OnlinePlayScreen : OsuScreen, IHasSubScreenStack
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IOnlinePlaySubScreen)?.CursorVisible ?? true;
 
@@ -355,5 +355,7 @@ namespace osu.Game.Screens.OnlinePlay
                 protected override double TransformDuration => 200;
             }
         }
+
+        ScreenStack IHasSubScreenStack.SubScreenStack => screenStack;
     }
 }

From 5eee46074cbe5821394539ed4812c3d1cc8af844 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 19:45:29 +0900
Subject: [PATCH 08257/10326] Ensure the current screen is current when a sub
 screen is found as the target

---
 osu.Game/PerformFromMenuRunner.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 39889ea7fc..fe75a3a607 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -103,7 +103,11 @@ namespace osu.Game
                 if (current is IHasSubScreenStack currentSubScreen)
                 {
                     if (findValidTarget(currentSubScreen.SubScreenStack.CurrentScreen))
+                    {
+                        // should be correct in theory, but currently untested/unused in existing implementations.
+                        current.MakeCurrent();
                         return true;
+                    }
                 }
 
                 if (validScreens.Any(t => t.IsAssignableFrom(type)))

From 32556b1898cfb65e652a9bae2dabe827d663d27b Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Sat, 20 Feb 2021 02:32:44 +0100
Subject: [PATCH 08258/10326] add `Exported = true` to Activity manifest

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index ad929bbac3..d087c6218d 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -17,7 +17,7 @@ using osu.Game.Database;
 
 namespace osu.Android
 {
-    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
+    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance, Exported = true)]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream", "application/download", "application/x-zip", "application/x-zip-compressed" })]

From d2ec151c67d09a8a442960ffce216ac5f04a81e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 20 Feb 2021 14:19:44 +0900
Subject: [PATCH 08259/10326] Add failing test for pausing when pause support
 is disabled

---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 1214a33084..bddc7ab731 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -90,6 +90,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             resumeAndConfirm();
         }
 
+        [Test]
+        public void TestUserPauseWhenPauseNotAllowed()
+        {
+            AddStep("disable pause support", () => Player.Configuration.AllowPause = false);
+
+            pauseFromUserExitKey();
+            confirmExited();
+        }
+
         [Test]
         public void TestUserPauseDuringCooldownTooSoon()
         {

From 38a21249213912af02c88c08037026e94ab11de3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 20 Feb 2021 13:35:25 +0900
Subject: [PATCH 08260/10326] Support instant exit if pausing is not allowed in
 the current game mode

---
 osu.Game/Screens/Play/Player.cs | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e4fc92b5f2..1e130b7f88 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -508,10 +508,14 @@ namespace osu.Game.Screens.Play
                     return;
                 }
 
-                // in the case a dialog needs to be shown, attempt to pause and show it.
-                // this may fail (see internal checks in Pause()) at which point the exit attempt will be aborted.
-                Pause();
-                return;
+                // there's a chance the pausing is not supported in the current state, at which point immediate exit should be preferred.
+                if (pausingSupportedByCurrentState)
+                {
+                    // in the case a dialog needs to be shown, attempt to pause and show it.
+                    // this may fail (see internal checks in Pause()) but the fail cases are temporary, so don't fall through to Exit().
+                    Pause();
+                    return;
+                }
             }
 
             this.Exit();
@@ -670,15 +674,17 @@ namespace osu.Game.Screens.Play
 
         private double? lastPauseActionTime;
 
-        private bool canPause =>
+        /// <summary>
+        /// A set of conditionals which defines whether the current game state and configuration allows for
+        /// pausing to be attempted via <see cref="Pause"/>. If false, the game should generally exit if a user pause
+        /// is attempted.
+        /// </summary>
+        private bool pausingSupportedByCurrentState =>
             // must pass basic screen conditions (beatmap loaded, instance allows pause)
             LoadedBeatmapSuccessfully && Configuration.AllowPause && ValidForResume
             // replays cannot be paused and exit immediately
             && !DrawableRuleset.HasReplayLoaded.Value
-            // cannot pause if we are already in a fail state
-            && !HasFailed
-            // cannot pause if already paused (or in a cooldown state) unless we are in a resuming state.
-            && (IsResuming || (GameplayClockContainer.IsPaused.Value == false && !pauseCooldownActive));
+            && !HasFailed;
 
         private bool pauseCooldownActive =>
             lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
@@ -693,7 +699,10 @@ namespace osu.Game.Screens.Play
 
         public void Pause()
         {
-            if (!canPause) return;
+            if (!pausingSupportedByCurrentState) return;
+
+            if (!IsResuming && pauseCooldownActive)
+                return;
 
             if (IsResuming)
             {

From 9d229a5ec2ae17f70f68ec9d77fb99b2a6ebeaf4 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 20 Feb 2021 16:27:58 +1100
Subject: [PATCH 08261/10326] Add tests for clockrate adjusted difficulty
 calculations

---
 .../CatchDifficultyCalculatorTest.cs                        | 5 +++++
 .../ManiaDifficultyCalculatorTest.cs                        | 5 +++++
 osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs  | 6 ++++++
 .../TaikoDifficultyCalculatorTest.cs                        | 6 ++++++
 4 files changed, 22 insertions(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
index ee416e5a38..f4ee3f5a42 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty;
+using osu.Game.Rulesets.Catch.Mods;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Tests.Beatmaps;
 
@@ -17,6 +18,10 @@ namespace osu.Game.Rulesets.Catch.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
+        [TestCase(5.0565038923984691d, "diffcalc-test")]
+        public void TestClockRateAdjusted(double expected, string name)
+            => Test(expected, name, new CatchModDoubleTime());
+
         protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new CatchDifficultyCalculator(new CatchRuleset(), beatmap);
 
         protected override Ruleset CreateRuleset() => new CatchRuleset();
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
index a25551f854..09ca04be8a 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mania.Difficulty;
+using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -17,6 +18,10 @@ namespace osu.Game.Rulesets.Mania.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
+        [TestCase(2.7646128945056723d, "diffcalc-test")]
+        public void TestClockRateAdjusted(double expected, string name)
+            => Test(expected, name, new ManiaModDoubleTime());
+
         protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new ManiaDifficultyCalculator(new ManiaRuleset(), beatmap);
 
         protected override Ruleset CreateRuleset() => new ManiaRuleset();
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index 85a41137d4..a365ea10d4 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Osu.Difficulty;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -19,6 +20,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
+        [TestCase(8.6228371119393064d, "diffcalc-test")]
+        [TestCase(1.2864585434597433d, "zero-length-sliders")]
+        public void TestClockRateAdjusted(double expected, string name)
+            => Test(expected, name, new OsuModDoubleTime());
+
         protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new OsuDifficultyCalculator(new OsuRuleset(), beatmap);
 
         protected override Ruleset CreateRuleset() => new OsuRuleset();
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
index 71b3c23b50..eb21c02d5f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Taiko.Difficulty;
+using osu.Game.Rulesets.Taiko.Mods;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Rulesets.Taiko.Tests
@@ -18,6 +19,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
+        [TestCase(3.1473940254109078d, "diffcalc-test")]
+        [TestCase(3.1473940254109078d, "diffcalc-test-strong")]
+        public void TestClockRateAdjusted(double expected, string name)
+            => Test(expected, name, new TaikoModDoubleTime());
+
         protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new TaikoDifficultyCalculator(new TaikoRuleset(), beatmap);
 
         protected override Ruleset CreateRuleset() => new TaikoRuleset();

From 3b7ebfa2acad63c3a426610450d681eab9947450 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 20 Feb 2021 17:17:31 +0900
Subject: [PATCH 08262/10326] 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 bfdc8f6b3c..1513f6444d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.219.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.220.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4138fc8d6c..9c3d0c2020 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.219.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.220.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 783b638aa0..99ab88a064 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.Framework.iOS" Version="2021.219.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.220.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,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="2021.219.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.220.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 442347df8eee74c903a4564ab8ec92a8b20c7964 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Fri, 19 Feb 2021 18:04:25 +1100
Subject: [PATCH 08263/10326] Fix clockrate adjusted difficulty calculations
 bug in strain decay

When starting a new section, the starting strain value was calculated using the unadjusted timing value, meaning decay curves were essentially being stretched or squashed according to the clockrate.

This caused incorrect strain peaks for any section where the peak occurs at the start of the section (none of the objects in the section added enough strain after decay to exceed the starting strain).

This bug caused star ratings with clockrates above 1 to be lower than they should and below 1 to be higher than they should.
---
 osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs         | 4 ++--
 osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs        | 2 +-
 .../Difficulty/Preprocessing/DifficultyHitObject.cs         | 6 ++++++
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs                | 6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 7ebc1ff752..56fb138b1f 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -71,8 +71,8 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
         }
 
         protected override double GetPeakStrain(double offset)
-            => applyDecay(individualStrain, offset - Previous[0].BaseObject.StartTime, individual_decay_base)
-               + applyDecay(overallStrain, offset - Previous[0].BaseObject.StartTime, overall_decay_base);
+            => applyDecay(individualStrain, offset - Previous[0].StartTime, individual_decay_base)
+               + applyDecay(overallStrain, offset - Previous[0].StartTime, overall_decay_base);
 
         private double applyDecay(double value, double deltaTime, double decayBase)
             => value * Math.Pow(decayBase, deltaTime / 1000);
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index f15e5e1df0..8c2292dcaa 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Difficulty
                     foreach (Skill s in skills)
                     {
                         s.SaveCurrentPeak();
-                        s.StartNewSectionFrom(currentSectionEnd);
+                        s.StartNewSectionFrom(currentSectionEnd / clockRate);
                     }
 
                     currentSectionEnd += sectionLength;
diff --git a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
index ebbffb5143..fa578d55f0 100644
--- a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
+++ b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
@@ -25,6 +25,11 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
         /// </summary>
         public readonly double DeltaTime;
 
+        /// <summary>
+        /// Start time of <see cref="BaseObject"/>.
+        /// </summary>
+        public readonly double StartTime;
+
         /// <summary>
         /// Creates a new <see cref="DifficultyHitObject"/>.
         /// </summary>
@@ -36,6 +41,7 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
             BaseObject = hitObject;
             LastObject = lastObject;
             DeltaTime = (hitObject.StartTime - lastObject.StartTime) / clockRate;
+            StartTime = hitObject.StartTime / clockRate;
         }
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 1063a24b27..44ce78c8e3 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <summary>
         /// Sets the initial strain level for a new section.
         /// </summary>
-        /// <param name="time">The beginning of the new section in milliseconds.</param>
+        /// <param name="time">The beginning of the new section in milliseconds, adjusted by clockrate.</param>
         public void StartNewSectionFrom(double time)
         {
             // The maximum strain of the new section is not zero by default, strain decays as usual regardless of section boundaries.
@@ -87,9 +87,9 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <summary>
         /// Retrieves the peak strain at a point in time.
         /// </summary>
-        /// <param name="time">The time to retrieve the peak strain at.</param>
+        /// <param name="time">The time to retrieve the peak strain at, adjusted by clockrate.</param>
         /// <returns>The peak strain.</returns>
-        protected virtual double GetPeakStrain(double time) => CurrentStrain * strainDecay(time - Previous[0].BaseObject.StartTime);
+        protected virtual double GetPeakStrain(double time) => CurrentStrain * strainDecay(time - Previous[0].StartTime);
 
         /// <summary>
         /// Returns the calculated difficulty value representing all processed <see cref="DifficultyHitObject"/>s.

From 417bb07b366394a41bef13dcc2a1c2a79891bfbd Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 20 Feb 2021 16:52:19 +1100
Subject: [PATCH 08264/10326] Update tests with fixed diffcalc values

---
 .../CatchDifficultyCalculatorTest.cs                          | 2 +-
 .../ManiaDifficultyCalculatorTest.cs                          | 2 +-
 osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs    | 4 ++--
 .../TaikoDifficultyCalculatorTest.cs                          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
index f4ee3f5a42..5580358f89 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(5.0565038923984691d, "diffcalc-test")]
+        [TestCase(5.169743871843191d, "diffcalc-test")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new CatchModDoubleTime());
 
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
index 09ca04be8a..6e6500a339 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(2.7646128945056723d, "diffcalc-test")]
+        [TestCase(2.7879104989252959d, "diffcalc-test")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new ManiaModDoubleTime());
 
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index a365ea10d4..b6db989231 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(8.6228371119393064d, "diffcalc-test")]
-        [TestCase(1.2864585434597433d, "zero-length-sliders")]
+        [TestCase(8.7212283220504574d, "diffcalc-test")]
+        [TestCase(1.3212137310562277d, "zero-length-sliders")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new OsuModDoubleTime());
 
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
index eb21c02d5f..dd3c6b317a 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(3.1473940254109078d, "diffcalc-test")]
-        [TestCase(3.1473940254109078d, "diffcalc-test-strong")]
+        [TestCase(3.1704781712282624d, "diffcalc-test")]
+        [TestCase(3.1704781712282624d, "diffcalc-test-strong")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new TaikoModDoubleTime());
 

From 66643a97b0af5b90793435d5b6abefae582ca163 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 6 Feb 2021 15:06:16 +1100
Subject: [PATCH 08265/10326] Add a list of mods to Skill class

Although this isn't necessary for existing official rulesets and calculators, custom calculators can have use cases for accessing mods in difficulty calculation.
For example, accounting for the effects of visual mods.
---
 .../Difficulty/CatchDifficultyCalculator.cs         |  4 ++--
 .../Difficulty/Skills/Movement.cs                   |  4 +++-
 .../Difficulty/ManiaDifficultyCalculator.cs         |  4 ++--
 osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs |  4 +++-
 .../Difficulty/OsuDifficultyCalculator.cs           |  6 +++---
 osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs      |  6 ++++++
 osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs    |  6 ++++++
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs |  6 ++++++
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs |  6 ++++++
 .../Difficulty/Skills/Stamina.cs                    |  5 ++++-
 .../Difficulty/TaikoDifficultyCalculator.cs         | 10 +++++-----
 .../DifficultyAdjustmentModCombinationsTest.cs      |  2 +-
 .../Rulesets/Difficulty/DifficultyCalculator.cs     |  5 +++--
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs        | 13 +++++++++++++
 14 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index a317ef252d..10aae70722 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             }
         }
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap)
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods)
         {
             halfCatcherWidth = Catcher.CalculateCatchWidth(beatmap.BeatmapInfo.BaseDifficulty) * 0.5f;
 
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             return new Skill[]
             {
-                new Movement(halfCatcherWidth),
+                new Movement(mods, halfCatcherWidth),
             };
         }
 
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index e679231638..9ad719be1a 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 {
@@ -25,7 +26,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
         private float lastDistanceMoved;
         private double lastStrainTime;
 
-        public Movement(float halfCatcherWidth)
+        public Movement(Mod[] mods, float halfCatcherWidth)
+            : base(mods)
         {
             HalfCatcherWidth = halfCatcherWidth;
         }
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index ade830764d..8c0b9ed8b7 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -68,9 +68,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         // Sorting is done in CreateDifficultyHitObjects, since the full list of hitobjects is required.
         protected override IEnumerable<DifficultyHitObject> SortObjects(IEnumerable<DifficultyHitObject> input) => input;
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[]
         {
-            new Strain(((ManiaBeatmap)beatmap).TotalColumns)
+            new Strain(mods, ((ManiaBeatmap)beatmap).TotalColumns)
         };
 
         protected override Mod[] DifficultyAdjustmentMods
diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 7ebc1ff752..d6ea58ee78 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -6,6 +6,7 @@ using osu.Framework.Utils;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mania.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Mania.Difficulty.Skills
@@ -24,7 +25,8 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
         private double individualStrain;
         private double overallStrain;
 
-        public Strain(int totalColumns)
+        public Strain(Mod[] mods, int totalColumns)
+            : base(mods)
         {
             holdEndTimes = new double[totalColumns];
             individualStrains = new double[totalColumns];
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 6a7d76151c..75d6786d95 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -79,10 +79,10 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             }
         }
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[]
         {
-            new Aim(),
-            new Speed()
+            new Aim(mods),
+            new Speed(mods)
         };
 
         protected override Mod[] DifficultyAdjustmentMods => new Mod[]
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
index e74f4933b2..90cba13c7c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Objects;
 
@@ -17,6 +18,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
         private const double angle_bonus_begin = Math.PI / 3;
         private const double timing_threshold = 107;
 
+        public Aim(Mod[] mods)
+            : base(mods)
+        {
+        }
+
         protected override double SkillMultiplier => 26.25;
         protected override double StrainDecayBase => 0.15;
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
index 01f2fb8dc8..200bc7997d 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Objects;
 
@@ -27,6 +28,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
         private const double max_speed_bonus = 45; // ~330BPM
         private const double speed_balancing_factor = 40;
 
+        public Speed(Mod[] mods)
+            : base(mods)
+        {
+        }
+
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             if (current.BaseObject is Spinner)
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index 32421ee00a..cc0738e252 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Difficulty.Utils;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Taiko.Objects;
 
@@ -39,6 +40,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         /// </summary>
         private int currentMonoLength;
 
+        public Colour(Mod[] mods)
+            : base(mods)
+        {
+        }
+
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             // changing from/to a drum roll or a swell does not constitute a colour change.
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index 5569b27ad5..f2b8309ac5 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Difficulty.Utils;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Taiko.Objects;
 
@@ -47,6 +48,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         /// </summary>
         private int notesSinceRhythmChange;
 
+        public Rhythm(Mod[] mods)
+            : base(mods)
+        {
+        }
+
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             // drum rolls and swells are exempt.
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index 0b61eb9930..c34cce0cd6 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Difficulty.Utils;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Taiko.Objects;
 
@@ -48,8 +49,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         /// <summary>
         /// Creates a <see cref="Stamina"/> skill.
         /// </summary>
+        /// <param name="mods">Mods for use in skill calculations.</param>
         /// <param name="rightHand">Whether this instance is performing calculations for the right hand.</param>
-        public Stamina(bool rightHand)
+        public Stamina(Mod[] mods, bool rightHand)
+            : base(mods)
         {
             hand = rightHand ? 1 : 0;
         }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index e5485db4df..fc198d2493 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -29,12 +29,12 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         {
         }
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[]
         {
-            new Colour(),
-            new Rhythm(),
-            new Stamina(true),
-            new Stamina(false),
+            new Colour(mods),
+            new Rhythm(mods),
+            new Stamina(mods, true),
+            new Stamina(mods, false),
         };
 
         protected override Mod[] DifficultyAdjustmentMods => new Mod[]
diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index 5c7adb3f49..1c0bfd56dd 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -212,7 +212,7 @@ namespace osu.Game.Tests.NonVisual
                 throw new NotImplementedException();
             }
 
-            protected override Skill[] CreateSkills(IBeatmap beatmap)
+            protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods)
             {
                 throw new NotImplementedException();
             }
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index f15e5e1df0..a25dc3e6db 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Difficulty
 
         private DifficultyAttributes calculate(IBeatmap beatmap, Mod[] mods, double clockRate)
         {
-            var skills = CreateSkills(beatmap);
+            var skills = CreateSkills(beatmap, mods);
 
             if (!beatmap.HitObjects.Any())
                 return CreateDifficultyAttributes(beatmap, mods, skills, clockRate);
@@ -202,7 +202,8 @@ namespace osu.Game.Rulesets.Difficulty
         /// Creates the <see cref="Skill"/>s to calculate the difficulty of an <see cref="IBeatmap"/>.
         /// </summary>
         /// <param name="beatmap">The <see cref="IBeatmap"/> whose difficulty will be calculated.</param>
+        /// <param name="mods">Mods to calculate difficulty with.</param>
         /// <returns>The <see cref="Skill"/>s.</returns>
-        protected abstract Skill[] CreateSkills(IBeatmap beatmap);
+        protected abstract Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods);
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 1063a24b27..95117be073 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Utils;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Difficulty.Skills
 {
@@ -46,10 +47,22 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected double CurrentStrain { get; private set; } = 1;
 
+        /// <summary>
+        /// Mods for use in skill calculations.
+        /// </summary>
+        protected IReadOnlyList<Mod> Mods => mods;
+
         private double currentSectionPeak = 1; // We also keep track of the peak strain level in the current section.
 
         private readonly List<double> strainPeaks = new List<double>();
 
+        private readonly Mod[] mods;
+
+        protected Skill(Mod[] mods)
+        {
+            this.mods = mods;
+        }
+
         /// <summary>
         /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
         /// </summary>

From cc4c5f72d893bc014d4172b1e2ba1c0930165aa4 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Sat, 20 Feb 2021 21:48:31 +0100
Subject: [PATCH 08266/10326] Move logic to keep selection in bounds into it's
 own method

---
 .../Edit/OsuSelectionHandler.cs               | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 871339ae7b..51e0e80e30 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -211,26 +211,35 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             var hitObjects = selectedMovableObjects;
 
-            Quad quad = getSurroundingQuad(hitObjects);
-
-            Vector2 newTopLeft = quad.TopLeft + delta;
-            if (newTopLeft.X < 0)
-                delta.X -= newTopLeft.X;
-            if (newTopLeft.Y < 0)
-                delta.Y -= newTopLeft.Y;
-
-            Vector2 newBottomRight = quad.BottomRight + delta;
-            if (newBottomRight.X > DrawWidth)
-                delta.X -= newBottomRight.X - DrawWidth;
-            if (newBottomRight.Y > DrawHeight)
-                delta.Y -= newBottomRight.Y - DrawHeight;
-
             foreach (var h in hitObjects)
                 h.Position += delta;
 
+            moveSelectionInBounds();
+
             return true;
         }
 
+        private void moveSelectionInBounds()
+        {
+            var hitObjects = selectedMovableObjects;
+
+            Quad quad = getSurroundingQuad(hitObjects);
+            Vector2 delta = new Vector2(0);
+
+            if (quad.TopLeft.X < 0)
+                delta.X -= quad.TopLeft.X;
+            if (quad.TopLeft.Y < 0)
+                delta.Y -= quad.TopLeft.Y;
+
+            if (quad.BottomRight.X > DrawWidth)
+                delta.X -= quad.BottomRight.X - DrawWidth;
+            if (quad.BottomRight.Y > DrawHeight)
+                delta.Y -= quad.BottomRight.Y - DrawHeight;
+
+            foreach (var h in hitObjects)
+                h.Position += delta;
+        }
+
         /// <summary>
         /// Returns a gamefield-space quad surrounding the provided hit objects.
         /// </summary>

From 0b8009938a4c6c84b406cf6fd15ccd76e150935f Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Sat, 20 Feb 2021 21:50:30 +0100
Subject: [PATCH 08267/10326] Prevent selection from breaking playfield bounds
 when scaling

---
 .../Edit/OsuSelectionHandler.cs               | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 51e0e80e30..6c62bdd922 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -135,14 +135,21 @@ namespace osu.Game.Rulesets.Osu.Edit
             adjustScaleFromAnchor(ref scale, reference);
 
             var hitObjects = selectedMovableObjects;
+            Quad selectionQuad = getSurroundingQuad(hitObjects);
+
+            float newWidth = selectionQuad.Width + scale.X;
+            float newHeight = selectionQuad.Height + scale.Y;
+
+            if ((newHeight > DrawHeight) || (newWidth > DrawWidth))
+                return false;
 
             // for the time being, allow resizing of slider paths only if the slider is
             // the only hit object selected. with a group selection, it's likely the user
             // is not looking to change the duration of the slider but expand the whole pattern.
             if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
             {
-                Quad quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
-                Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / quad.Width, 1 + scale.Y / quad.Height);
+                Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+                Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
 
                 foreach (var point in slider.Path.ControlPoints)
                     point.Position.Value *= pathRelativeDeltaScale;
@@ -153,23 +160,23 @@ namespace osu.Game.Rulesets.Osu.Edit
                 if ((reference & Anchor.x0) > 0 && !moveSelection(new Vector2(-scale.X, 0))) return false;
                 if ((reference & Anchor.y0) > 0 && !moveSelection(new Vector2(0, -scale.Y))) return false;
 
-                Quad quad = getSurroundingQuad(hitObjects);
-
                 foreach (var h in hitObjects)
                 {
                     var newPosition = h.Position;
 
                     // guard against no-ops and NaN.
-                    if (scale.X != 0 && quad.Width > 0)
-                        newPosition.X = quad.TopLeft.X + (h.X - quad.TopLeft.X) / quad.Width * (quad.Width + scale.X);
+                    if (scale.X != 0 && selectionQuad.Width > 0)
+                        newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
 
-                    if (scale.Y != 0 && quad.Height > 0)
-                        newPosition.Y = quad.TopLeft.Y + (h.Y - quad.TopLeft.Y) / quad.Height * (quad.Height + scale.Y);
+                    if (scale.Y != 0 && selectionQuad.Height > 0)
+                        newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
 
                     h.Position = newPosition;
                 }
             }
 
+            moveSelectionInBounds();
+
             return true;
         }
 

From 562a4cefdb952b54d3b6c20eda47e13b78378010 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Sun, 21 Feb 2021 12:12:32 +0100
Subject: [PATCH 08268/10326] Simplify HandleScale by extracting methods

---
 .../Edit/OsuSelectionHandler.cs               | 67 +++++++++++--------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 6c62bdd922..9418752745 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -143,41 +143,18 @@ namespace osu.Game.Rulesets.Osu.Edit
             if ((newHeight > DrawHeight) || (newWidth > DrawWidth))
                 return false;
 
+            bool result;
             // for the time being, allow resizing of slider paths only if the slider is
             // the only hit object selected. with a group selection, it's likely the user
             // is not looking to change the duration of the slider but expand the whole pattern.
             if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
-            {
-                Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
-                Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
-
-                foreach (var point in slider.Path.ControlPoints)
-                    point.Position.Value *= pathRelativeDeltaScale;
-            }
+                result = scaleSlider(slider, scale);
             else
-            {
-                // move the selection before scaling if dragging from top or left anchors.
-                if ((reference & Anchor.x0) > 0 && !moveSelection(new Vector2(-scale.X, 0))) return false;
-                if ((reference & Anchor.y0) > 0 && !moveSelection(new Vector2(0, -scale.Y))) return false;
-
-                foreach (var h in hitObjects)
-                {
-                    var newPosition = h.Position;
-
-                    // guard against no-ops and NaN.
-                    if (scale.X != 0 && selectionQuad.Width > 0)
-                        newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
-
-                    if (scale.Y != 0 && selectionQuad.Height > 0)
-                        newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
-
-                    h.Position = newPosition;
-                }
-            }
+                result = scaleHitObjects(hitObjects, reference, scale);
 
             moveSelectionInBounds();
 
-            return true;
+            return result;
         }
 
         private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
@@ -214,6 +191,42 @@ namespace osu.Game.Rulesets.Osu.Edit
             return true;
         }
 
+        private bool scaleSlider(Slider slider, Vector2 scale)
+        {
+            Quad quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+            Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / quad.Width, 1 + scale.Y / quad.Height);
+
+            foreach (var point in slider.Path.ControlPoints)
+                point.Position.Value *= pathRelativeDeltaScale;
+
+            return true;
+        }
+
+        private bool scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
+        {
+            // move the selection before scaling if dragging from top or left anchors.
+            if ((reference & Anchor.x0) > 0 && !moveSelection(new Vector2(-scale.X, 0))) return false;
+            if ((reference & Anchor.y0) > 0 && !moveSelection(new Vector2(0, -scale.Y))) return false;
+
+            Quad selectionQuad = getSurroundingQuad(hitObjects);
+
+            foreach (var h in hitObjects)
+            {
+                var newPosition = h.Position;
+
+                // guard against no-ops and NaN.
+                if (scale.X != 0 && selectionQuad.Width > 0)
+                    newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
+
+                if (scale.Y != 0 && selectionQuad.Height > 0)
+                    newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
+
+                h.Position = newPosition;
+            }
+
+            return true;
+        }
+
         private bool moveSelection(Vector2 delta)
         {
             var hitObjects = selectedMovableObjects;

From 2c6f92d12fb2d2a55ad8bb9f28e4f32634aadf8b Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Sun, 21 Feb 2021 17:38:50 +0100
Subject: [PATCH 08269/10326] Move bounds check from moveSelection to
 HandleMovement

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 9418752745..9ca8404a26 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -35,8 +35,12 @@ namespace osu.Game.Rulesets.Osu.Edit
             referenceOrigin = null;
         }
 
-        public override bool HandleMovement(MoveSelectionEvent moveEvent) =>
-            moveSelection(moveEvent.InstantDelta);
+        public override bool HandleMovement(MoveSelectionEvent moveEvent)
+        {
+            bool result = moveSelection(moveEvent.InstantDelta);
+            moveSelectionInBounds();
+            return result;
+        }
 
         /// <summary>
         /// During a transform, the initial origin is stored so it can be used throughout the operation.
@@ -234,8 +238,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             foreach (var h in hitObjects)
                 h.Position += delta;
 
-            moveSelectionInBounds();
-
             return true;
         }
 

From 33985d9e7c27a3d2ec58e5a2cd6f3068e50be7ab Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Sun, 21 Feb 2021 17:40:57 +0100
Subject: [PATCH 08270/10326] Rewrite scaling bounds check to behave more
 intuively

---
 .../Edit/OsuSelectionHandler.cs               | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 9ca8404a26..64dbe20c58 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -139,15 +139,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             adjustScaleFromAnchor(ref scale, reference);
 
             var hitObjects = selectedMovableObjects;
-            Quad selectionQuad = getSurroundingQuad(hitObjects);
-
-            float newWidth = selectionQuad.Width + scale.X;
-            float newHeight = selectionQuad.Height + scale.Y;
-
-            if ((newHeight > DrawHeight) || (newWidth > DrawWidth))
-                return false;
-
             bool result;
+
             // for the time being, allow resizing of slider paths only if the slider is
             // the only hit object selected. with a group selection, it's likely the user
             // is not looking to change the duration of the slider but expand the whole pattern.
@@ -197,8 +190,18 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private bool scaleSlider(Slider slider, Vector2 scale)
         {
-            Quad quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
-            Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / quad.Width, 1 + scale.Y / quad.Height);
+            Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+            Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
+
+            Quad selectionQuad = getSurroundingQuad(new OsuHitObject[] { slider });
+            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
+            (bool X, bool Y) inBounds = isQuadInBounds(scaledQuad);
+
+            if (!inBounds.X)
+                pathRelativeDeltaScale.X = 1;
+
+            if (!inBounds.Y)
+                pathRelativeDeltaScale.Y = 1;
 
             foreach (var point in slider.Path.ControlPoints)
                 point.Position.Value *= pathRelativeDeltaScale;
@@ -213,16 +216,18 @@ namespace osu.Game.Rulesets.Osu.Edit
             if ((reference & Anchor.y0) > 0 && !moveSelection(new Vector2(0, -scale.Y))) return false;
 
             Quad selectionQuad = getSurroundingQuad(hitObjects);
+            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
+            (bool X, bool Y) inBounds = isQuadInBounds(scaledQuad);
 
             foreach (var h in hitObjects)
             {
                 var newPosition = h.Position;
 
                 // guard against no-ops and NaN.
-                if (scale.X != 0 && selectionQuad.Width > 0)
+                if (scale.X != 0 && selectionQuad.Width > 0 && inBounds.X)
                     newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
 
-                if (scale.Y != 0 && selectionQuad.Height > 0)
+                if (scale.Y != 0 && selectionQuad.Height > 0 && inBounds.Y)
                     newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
 
                 h.Position = newPosition;
@@ -231,6 +236,16 @@ namespace osu.Game.Rulesets.Osu.Edit
             return true;
         }
 
+        private (bool X, bool Y) isQuadInBounds(Quad quad)
+        {
+            (bool X, bool Y) result;
+
+            result.X = (quad.TopLeft.X >= 0) && (quad.BottomRight.X < DrawWidth);
+            result.Y = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y < DrawHeight);
+
+            return result;
+        }
+
         private bool moveSelection(Vector2 delta)
         {
             var hitObjects = selectedMovableObjects;

From 8d463987dd6c7260f25c90a31804d180c147b5df Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 13:21:50 +0900
Subject: [PATCH 08271/10326] Fix being able to select incompatible freemods

---
 .../Screens/OnlinePlay/OnlinePlaySongSelect.cs    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index f0c77b79bf..3f30ef1176 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -75,9 +75,18 @@ namespace osu.Game.Screens.OnlinePlay
             Mods.Value = selectedItem?.Value?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
             FreeMods.Value = selectedItem?.Value?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
 
+            Mods.BindValueChanged(onModsChanged);
             Ruleset.BindValueChanged(onRulesetChanged);
         }
 
+        private void onModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
+        {
+            FreeMods.Value = FreeMods.Value.Where(checkCompatibleFreeMod).ToList();
+
+            // Reset the validity delegate to update the overlay's display.
+            freeModSelectOverlay.IsValidMod = IsValidFreeMod;
+        }
+
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
         {
             FreeMods.Value = Array.Empty<Mod>();
@@ -155,6 +164,10 @@ namespace osu.Game.Screens.OnlinePlay
         /// </summary>
         /// <param name="mod">The <see cref="Mod"/> to check.</param>
         /// <returns>Whether <paramref name="mod"/> is a selectable free-mod.</returns>
-        protected virtual bool IsValidFreeMod(Mod mod) => IsValidMod(mod);
+        protected virtual bool IsValidFreeMod(Mod mod) => IsValidMod(mod) && checkCompatibleFreeMod(mod);
+
+        private bool checkCompatibleFreeMod(Mod mod)
+            => Mods.Value.All(m => m.Acronym != mod.Acronym) // Mod must not be contained in the required mods.
+               && ModUtils.CheckCompatibleSet(Mods.Value.Append(mod).ToArray()); // Mod must be compatible with all the required mods.
     }
 }

From ca92ad715a9a11bd772b2f53d04f3cb5a8e13431 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 13:32:54 +0900
Subject: [PATCH 08272/10326] Add test

---
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs |  2 +-
 .../TestSceneMultiplayerMatchSongSelect.cs    | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index df0a41455f..4b0939db16 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Osu.Skinning.Default;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    internal class OsuModTraceable : ModWithVisibilityAdjustment
+    public class OsuModTraceable : ModWithVisibilityAdjustment
     {
         public override string Name => "Traceable";
         public override string Acronym => "TC";
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index 95c333e9f4..faa5d9e6fc 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -7,17 +7,23 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Rulesets.Taiko.Mods;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.Select;
 
@@ -137,8 +143,30 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("mods not changed", () => SelectedMods.Value.Single() is TaikoModDoubleTime);
         }
 
+        [TestCase(typeof(OsuModHidden), typeof(OsuModHidden))] // Same mod.
+        [TestCase(typeof(OsuModHidden), typeof(OsuModTraceable))] // Incompatible.
+        public void TestAllowedModDeselectedWhenRequired(Type allowedMod, Type requiredMod)
+        {
+            AddStep($"select {allowedMod.ReadableName()} as allowed", () => songSelect.FreeMods.Value = new[] { (Mod)Activator.CreateInstance(allowedMod) });
+            AddStep($"select {requiredMod.ReadableName()} as required", () => songSelect.Mods.Value = new[] { (Mod)Activator.CreateInstance(requiredMod) });
+
+            AddAssert("freemods empty", () => songSelect.FreeMods.Value.Count == 0);
+            assertHasFreeModButton(allowedMod, false);
+            assertHasFreeModButton(requiredMod, false);
+        }
+
+        private void assertHasFreeModButton(Type type, bool hasButton = true)
+        {
+            AddAssert($"{type.ReadableName()} {(hasButton ? "displayed" : "not displayed")} in freemod overlay",
+                () => songSelect.ChildrenOfType<FreeModSelectOverlay>().Single().ChildrenOfType<ModButton>().All(b => b.Mod.GetType() != type));
+        }
+
         private class TestMultiplayerMatchSongSelect : MultiplayerMatchSongSelect
         {
+            public new Bindable<IReadOnlyList<Mod>> Mods => base.Mods;
+
+            public new Bindable<IReadOnlyList<Mod>> FreeMods => base.FreeMods;
+
             public new BeatmapCarousel Carousel => base.Carousel;
         }
     }

From e2c5dded7f4e5b4ac1a5123e70e54728f251bb2a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 14:14:36 +0900
Subject: [PATCH 08273/10326] 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 1513f6444d..183ac61c90 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.220.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.222.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9c3d0c2020..37d730bf42 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.220.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.222.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 99ab88a064..ca11952cc8 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.Framework.iOS" Version="2021.220.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.222.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,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="2021.220.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.222.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 63dd55c92c9f725926f89dfa14b4ba84d65760a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 14:18:52 +0900
Subject: [PATCH 08274/10326] Add missing methods from updated audio component
 interface implementation

---
 .../TestSceneDrawableRulesetDependencies.cs    |  4 ++++
 .../Rulesets/UI/DrawableRulesetDependencies.cs |  4 ++++
 osu.Game/Skinning/PoolableSkinnableSample.cs   |  4 ++++
 osu.Game/Skinning/SkinnableSound.cs            | 18 ++++++++++++++++++
 4 files changed, 30 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index 4aebed0d31..f421a30283 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -118,6 +118,10 @@ namespace osu.Game.Tests.Rulesets
             public BindableNumber<double> Frequency => throw new NotImplementedException();
             public BindableNumber<double> Tempo => throw new NotImplementedException();
 
+            public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
+            public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
             public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
 
             public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index bbaca7c80f..b31884d246 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -134,6 +134,10 @@ namespace osu.Game.Rulesets.UI
 
             public IBindable<double> AggregateTempo => throw new NotSupportedException();
 
+            public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
+            public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
             public int PlaybackConcurrency
             {
                 get => throw new NotSupportedException();
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index abff57091b..5a0cf94d6a 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -165,6 +165,10 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => sampleContainer.Tempo;
 
+        public void BindAdjustments(IAggregateAudioAdjustment component) => sampleContainer.BindAdjustments(component);
+
+        public void UnbindAdjustments(IAggregateAudioAdjustment component) => sampleContainer.UnbindAdjustments(component);
+
         public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
 
         public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.RemoveAdjustment(type, adjustBindable);
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index d3dfcb1dc0..57e20a8d31 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -176,6 +176,16 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => samplesContainer.Tempo;
 
+        public void BindAdjustments(IAggregateAudioAdjustment component)
+        {
+            samplesContainer.BindAdjustments(component);
+        }
+
+        public void UnbindAdjustments(IAggregateAudioAdjustment component)
+        {
+            samplesContainer.UnbindAdjustments(component);
+        }
+
         public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
             => samplesContainer.AddAdjustment(type, adjustBindable);
 
@@ -192,6 +202,14 @@ namespace osu.Game.Skinning
 
         public bool IsPlayed => samplesContainer.Any(s => s.Played);
 
+        public IBindable<double> AggregateVolume => samplesContainer.AggregateVolume;
+
+        public IBindable<double> AggregateBalance => samplesContainer.AggregateBalance;
+
+        public IBindable<double> AggregateFrequency => samplesContainer.AggregateFrequency;
+
+        public IBindable<double> AggregateTempo => samplesContainer.AggregateTempo;
+
         #endregion
     }
 }

From 541237ef16c62d259e4e84fa13943c32a7a54be0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 14:48:04 +0900
Subject: [PATCH 08275/10326] Use a shorter test beatmap for tests which need
 to run to completion

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          |  15 +++++++++++
 ...241526 Soleily - Renatus_virtual_quick.osz | Bin 0 -> 89215 bytes
 osu.Game.Tests/Resources/TestResources.cs     |  25 +++++++++++++++++-
 .../Navigation/TestSceneScreenNavigation.cs   |   2 +-
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/Archives/241526 Soleily - Renatus_virtual_quick.osz

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index c32e359de6..0c35e9471d 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -852,6 +852,21 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
+        public static async Task<BeatmapSetInfo> LoadQuickOszIntoOsu(OsuGameBase osu)
+        {
+            var temp = TestResources.GetQuickTestBeatmapForImport();
+
+            var manager = osu.Dependencies.Get<BeatmapManager>();
+
+            var importedSet = await manager.Import(new ImportTask(temp));
+
+            ensureLoaded(osu);
+
+            waitForOrAssert(() => !File.Exists(temp), "Temporary file still exists after standard import", 5000);
+
+            return manager.GetAllUsableBeatmapSets().Find(beatmapSet => beatmapSet.ID == importedSet.ID);
+        }
+
         public static async Task<BeatmapSetInfo> LoadOszIntoOsu(OsuGameBase osu, string path = null, bool virtualTrack = false)
         {
             var temp = path ?? TestResources.GetTestBeatmapForImport(virtualTrack);
diff --git a/osu.Game.Tests/Resources/Archives/241526 Soleily - Renatus_virtual_quick.osz b/osu.Game.Tests/Resources/Archives/241526 Soleily - Renatus_virtual_quick.osz
new file mode 100644
index 0000000000000000000000000000000000000000..e9f5fb03282e189ffc23d77a0db40b3fa2488850
GIT binary patch
literal 89215
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
Ni{DEH3<&Xe{{o+^{JH=D

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index e882229570..14bc2c8733 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -13,8 +13,31 @@ namespace osu.Game.Tests.Resources
 
         public static Stream OpenResource(string name) => GetStore().GetStream($"Resources/{name}");
 
-        public static Stream GetTestBeatmapStream(bool virtualTrack = false) => OpenResource($"Archives/241526 Soleily - Renatus{(virtualTrack ? "_virtual" : "")}.osz");
+        public static Stream GetTestBeatmapStream(bool virtualTrack = false, bool quick = false) => OpenResource($"Archives/241526 Soleily - Renatus{(virtualTrack ? "_virtual" : "")}{(quick ? "_quick" : "")}.osz");
 
+        /// <summary>
+        /// Retrieve a path to a copy of a shortened (~10 second) beatmap archive with a virtual track.
+        /// </summary>
+        /// <remarks>
+        /// This is intended for use in tests which need to run to completion as soon as possible and don't need to test a full length beatmap.</remarks>
+        /// <returns>A path to a copy of a beatmap archive (osz). Should be deleted after use.</returns>
+        public static string GetQuickTestBeatmapForImport()
+        {
+            var tempPath = Path.GetTempFileName() + ".osz";
+
+            using (var stream = GetTestBeatmapStream(true, true))
+            using (var newFile = File.Create(tempPath))
+                stream.CopyTo(newFile);
+
+            Assert.IsTrue(File.Exists(tempPath));
+            return tempPath;
+        }
+
+        /// <summary>
+        /// Retrieve a path to a copy of a full-fledged beatmap archive.
+        /// </summary>
+        /// <param name="virtualTrack">Whether the audio track should be virtual.</param>
+        /// <returns>A path to a copy of a beatmap archive (osz). Should be deleted after use.</returns>
         public static string GetTestBeatmapForImport(bool virtualTrack = false)
         {
             var tempPath = Path.GetTempFileName() + ".osz";
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index d8380b2dd3..e5959a3edf 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             PushAndConfirm(() => new TestSongSelect());
 
-            AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(Game, virtualTrack: true).Wait());
+            AddStep("import beatmap", () => ImportBeatmapTest.LoadQuickOszIntoOsu(Game).Wait());
 
             AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
 

From cdbf8de29db80994e903c1e92837d6208e78312f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 14:53:32 +0900
Subject: [PATCH 08276/10326] Update other tests which can benefit from using a
 shorter beatmap

---
 .../Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs     | 2 +-
 osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs | 2 +-
 .../Visual/Collections/TestSceneManageCollectionsDialog.cs      | 2 +-
 .../Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs       | 2 +-
 osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs   | 2 +-
 osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs      | 2 +-
 .../Visual/UserInterface/TestSceneDeleteLocalScore.cs           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
index 3ffb512b7f..8c30802ce3 100644
--- a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Tests.Online
         {
             beatmaps.AllowImport = new TaskCompletionSource<bool>();
 
-            testBeatmapFile = TestResources.GetTestBeatmapForImport();
+            testBeatmapFile = TestResources.GetQuickTestBeatmapForImport();
 
             testBeatmapInfo = getTestBeatmapInfo(testBeatmapFile);
             testBeatmapSet = testBeatmapInfo.BeatmapSet;
diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 7ade7725d9..ba4d12b19f 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Visual.Background
             Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
             Dependencies.Cache(new OsuConfigManager(LocalStorage));
 
-            manager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+            manager.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
 
             Beatmap.SetDefault();
         }
diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index fef1605f0c..1655adf811 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Collections
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
 
-            beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+            beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
 
             base.Content.AddRange(new Drawable[]
             {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 3b3b1bee86..b44e5b1e5b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
-            beatmaps.Import(TestResources.GetTestBeatmapForImport(true)).Wait();
+            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
 
             Add(beatmapTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
index 63bda08c88..0c199bfb62 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Online
             ensureSoleilyRemoved();
             createButtonWithBeatmap(createSoleily());
             AddAssert("button state not downloaded", () => downloadButton.DownloadState == DownloadState.NotDownloaded);
-            AddStep("import soleily", () => beatmaps.Import(TestResources.GetTestBeatmapForImport()));
+            AddStep("import soleily", () => beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()));
             AddUntilStep("wait for beatmap import", () => beatmaps.GetAllUsableBeatmapSets().Any(b => b.OnlineBeatmapSetID == 241526));
             createButtonWithBeatmap(createSoleily());
             AddAssert("button state downloaded", () => downloadButton.DownloadState == DownloadState.LocallyAvailable);
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 5d0fb248df..c13bdf0955 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
 
-            beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+            beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
 
             base.Content.AddRange(new Drawable[]
             {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index 81862448a8..d615f1f440 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesetStore, null, dependencies.Get<AudioManager>(), dependencies.Get<GameHost>(), Beatmap.Default));
             dependencies.Cache(scoreManager = new ScoreManager(rulesetStore, () => beatmapManager, LocalStorage, null, ContextFactory));
 
-            beatmap = beatmapManager.Import(new ImportTask(TestResources.GetTestBeatmapForImport())).Result.Beatmaps[0];
+            beatmap = beatmapManager.Import(new ImportTask(TestResources.GetQuickTestBeatmapForImport())).Result.Beatmaps[0];
 
             for (int i = 0; i < 50; i++)
             {

From fde026d44342534f7d06ddc0873e18f3f24e7070 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 14:54:48 +0900
Subject: [PATCH 08277/10326] Remove redundant interface specification

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

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 5a0cf94d6a..9103a6a960 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Skinning
     /// <summary>
     /// A sample corresponding to an <see cref="ISampleInfo"/> that supports being pooled and responding to skin changes.
     /// </summary>
-    public class PoolableSkinnableSample : SkinReloadableDrawable, IAggregateAudioAdjustment, IAdjustableAudioComponent
+    public class PoolableSkinnableSample : SkinReloadableDrawable, IAdjustableAudioComponent
     {
         /// <summary>
         /// The currently-loaded <see cref="DrawableSample"/>.

From adf2dc36c9112200699ac8680b81a32bda9b937f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 15:43:58 +0900
Subject: [PATCH 08278/10326] Fix PlaylistResults tests performing delays in
 real-time when headless

---
 .../TestScenePlaylistsResultsScreen.cs        | 87 +++++++------------
 1 file changed, 32 insertions(+), 55 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index cdcded8f61..e34da1ef0c 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.Playlists
             AddStep("bind user score info handler", () =>
             {
                 userScore = new TestScoreInfo(new OsuRuleset().RulesetInfo) { OnlineScoreID = currentScoreId++ };
-                bindHandler(3000, userScore);
+                bindHandler(true, userScore);
             });
 
             createResults(() => userScore);
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Playlists
         [Test]
         public void TestShowNullUserScoreWithDelay()
         {
-            AddStep("bind delayed handler", () => bindHandler(3000));
+            AddStep("bind delayed handler", () => bindHandler(true));
 
             createResults();
             waitForDisplay();
@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.Playlists
             createResults();
             waitForDisplay();
 
-            AddStep("bind delayed handler", () => bindHandler(3000));
+            AddStep("bind delayed handler", () => bindHandler(true));
 
             for (int i = 0; i < 2; i++)
             {
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Visual.Playlists
             createResults(() => userScore);
             waitForDisplay();
 
-            AddStep("bind delayed handler", () => bindHandler(3000));
+            AddStep("bind delayed handler", () => bindHandler(true));
 
             for (int i = 0; i < 2; i++)
             {
@@ -169,70 +169,47 @@ namespace osu.Game.Tests.Visual.Playlists
             AddWaitStep("wait for display", 5);
         }
 
-        private void bindHandler(double delay = 0, ScoreInfo userScore = null, bool failRequests = false) => ((DummyAPIAccess)API).HandleRequest = request =>
+        private void bindHandler(bool delayed = false, ScoreInfo userScore = null, bool failRequests = false) => ((DummyAPIAccess)API).HandleRequest = request =>
         {
             requestComplete = false;
 
-            if (failRequests)
-            {
-                triggerFail(request, delay);
-                return;
-            }
+            double delay = delayed ? 3000 : 0;
 
-            switch (request)
+            Scheduler.AddDelayed(() =>
             {
-                case ShowPlaylistUserScoreRequest s:
-                    if (userScore == null)
-                        triggerFail(s, delay);
-                    else
-                        triggerSuccess(s, createUserResponse(userScore), delay);
-                    break;
+                if (failRequests)
+                {
+                    triggerFail(request);
+                    return;
+                }
 
-                case IndexPlaylistScoresRequest i:
-                    triggerSuccess(i, createIndexResponse(i), delay);
-                    break;
-            }
+                switch (request)
+                {
+                    case ShowPlaylistUserScoreRequest s:
+                        if (userScore == null)
+                            triggerFail(s);
+                        else
+                            triggerSuccess(s, createUserResponse(userScore));
+                        break;
+
+                    case IndexPlaylistScoresRequest i:
+                        triggerSuccess(i, createIndexResponse(i));
+                        break;
+                }
+            }, delay);
         };
 
-        private void triggerSuccess<T>(APIRequest<T> req, T result, double delay)
+        private void triggerSuccess<T>(APIRequest<T> req, T result)
             where T : class
         {
-            if (delay == 0)
-                success();
-            else
-            {
-                Task.Run(async () =>
-                {
-                    await Task.Delay(TimeSpan.FromMilliseconds(delay));
-                    Schedule(success);
-                });
-            }
-
-            void success()
-            {
-                requestComplete = true;
-                req.TriggerSuccess(result);
-            }
+            requestComplete = true;
+            req.TriggerSuccess(result);
         }
 
-        private void triggerFail(APIRequest req, double delay)
+        private void triggerFail(APIRequest req)
         {
-            if (delay == 0)
-                fail();
-            else
-            {
-                Task.Run(async () =>
-                {
-                    await Task.Delay(TimeSpan.FromMilliseconds(delay));
-                    Schedule(fail);
-                });
-            }
-
-            void fail()
-            {
-                requestComplete = true;
-                req.TriggerFailure(new WebException("Failed."));
-            }
+            requestComplete = true;
+            req.TriggerFailure(new WebException("Failed."));
         }
 
         private MultiplayerScore createUserResponse([NotNull] ScoreInfo userScore)

From ccb83ef3a374f173b18473665c06c5002d68aecb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 15:47:47 +0900
Subject: [PATCH 08279/10326] Fix checkbox not being updated

---
 osu.Game/Overlays/Mods/ModSection.cs          | 20 +++++++++----------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  8 ++++++++
 .../OnlinePlay/FreeModSelectOverlay.cs        | 14 ++++++++++++-
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index c3e56abd05..aa8a5efd39 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -23,13 +23,15 @@ namespace osu.Game.Overlays.Mods
 
         public FillFlowContainer<ModButtonEmpty> ButtonsContainer { get; }
 
+        protected IReadOnlyList<ModButton> Buttons { get; private set; } = Array.Empty<ModButton>();
+
         public Action<Mod> Action;
 
         public Key[] ToggleKeys;
 
         public readonly ModType ModType;
 
-        public IEnumerable<Mod> SelectedMods => buttons.Select(b => b.SelectedMod).Where(m => m != null);
+        public IEnumerable<Mod> SelectedMods => Buttons.Select(b => b.SelectedMod).Where(m => m != null);
 
         private CancellationTokenSource modsLoadCts;
 
@@ -77,7 +79,7 @@ namespace osu.Game.Overlays.Mods
                     ButtonsContainer.ChildrenEnumerable = c;
                 }, (modsLoadCts = new CancellationTokenSource()).Token);
 
-                buttons = modContainers.OfType<ModButton>().ToArray();
+                Buttons = modContainers.OfType<ModButton>().ToArray();
 
                 header.FadeIn(200);
                 this.FadeIn(200);
@@ -88,8 +90,6 @@ namespace osu.Game.Overlays.Mods
         {
         }
 
-        private ModButton[] buttons = Array.Empty<ModButton>();
-
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (e.ControlPressed) return false;
@@ -97,8 +97,8 @@ namespace osu.Game.Overlays.Mods
             if (ToggleKeys != null)
             {
                 var index = Array.IndexOf(ToggleKeys, e.Key);
-                if (index > -1 && index < buttons.Length)
-                    buttons[index].SelectNext(e.ShiftPressed ? -1 : 1);
+                if (index > -1 && index < Buttons.Count)
+                    Buttons[index].SelectNext(e.ShiftPressed ? -1 : 1);
             }
 
             return base.OnKeyDown(e);
@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.Mods
         {
             pendingSelectionOperations.Clear();
 
-            foreach (var button in buttons.Where(b => !b.Selected))
+            foreach (var button in Buttons.Where(b => !b.Selected))
                 pendingSelectionOperations.Enqueue(() => button.SelectAt(0));
         }
 
@@ -151,7 +151,7 @@ namespace osu.Game.Overlays.Mods
         public void DeselectAll()
         {
             pendingSelectionOperations.Clear();
-            DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
+            DeselectTypes(Buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
         }
 
         /// <summary>
@@ -161,7 +161,7 @@ namespace osu.Game.Overlays.Mods
         /// <param name="immediate">Whether the deselection should happen immediately. Should only be used when required to ensure correct selection flow.</param>
         public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false)
         {
-            foreach (var button in buttons)
+            foreach (var button in Buttons)
             {
                 if (button.SelectedMod == null) continue;
 
@@ -184,7 +184,7 @@ namespace osu.Game.Overlays.Mods
         /// <param name="newSelectedMods">The new list of selected mods to select.</param>
         public void UpdateSelectedButtons(IReadOnlyList<Mod> newSelectedMods)
         {
-            foreach (var button in buttons)
+            foreach (var button in Buttons)
                 updateButtonSelection(button, newSelectedMods);
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index eef91deb4c..26b8632d7f 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -456,6 +456,7 @@ namespace osu.Game.Overlays.Mods
             }
 
             updateSelectedButtons();
+            OnAvailableModsChanged();
         }
 
         /// <summary>
@@ -533,6 +534,13 @@ namespace osu.Game.Overlays.Mods
         private void playSelectedSound() => sampleOn?.Play();
         private void playDeselectedSound() => sampleOff?.Play();
 
+        /// <summary>
+        /// Invoked after <see cref="availableMods"/> has changed.
+        /// </summary>
+        protected virtual void OnAvailableModsChanged()
+        {
+        }
+
         /// <summary>
         /// Invoked when a new <see cref="Mod"/> has been selected.
         /// </summary>
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index ab7be13479..66262e7dc4 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -75,6 +75,14 @@ namespace osu.Game.Screens.OnlinePlay
                 section.DeselectAll();
         }
 
+        protected override void OnAvailableModsChanged()
+        {
+            base.OnAvailableModsChanged();
+
+            foreach (var section in ModSectionsContainer.Children)
+                ((FreeModSection)section).UpdateCheckboxState();
+        }
+
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
         private class FreeModSection : ModSection
@@ -108,10 +116,14 @@ namespace osu.Game.Screens.OnlinePlay
             protected override void ModButtonStateChanged(Mod mod)
             {
                 base.ModButtonStateChanged(mod);
+                UpdateCheckboxState();
+            }
 
+            public void UpdateCheckboxState()
+            {
                 if (!SelectionAnimationRunning)
                 {
-                    var validButtons = ButtonsContainer.OfType<ModButton>().Where(b => b.Mod.HasImplementation);
+                    var validButtons = Buttons.Where(b => b.Mod.HasImplementation);
                     checkbox.Current.Value = validButtons.All(b => b.Selected);
                 }
             }

From d985b8ab2aafd86c9f4d24fdcd39634de8a0b10c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 17:14:39 +0900
Subject: [PATCH 08280/10326] Increase beatmapset download timeout

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

diff --git a/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs b/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
index 707c59436d..e8871bef05 100644
--- a/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
+++ b/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.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.IO.Network;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Online.API.Requests
@@ -15,6 +16,13 @@ namespace osu.Game.Online.API.Requests
             this.noVideo = noVideo;
         }
 
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.Timeout = 60000;
+            return req;
+        }
+
         protected override string Target => $@"beatmapsets/{Model.OnlineBeatmapSetID}/download{(noVideo ? "?noVideo=1" : "")}";
     }
 }

From 0bda9e4b794f16d108f234563746202bf3b8a160 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 18:31:33 +0900
Subject: [PATCH 08281/10326] Implement some new methods

---
 osu.Game/Skinning/LegacySkin.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 2edc36a770..6bdc4575c9 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -529,6 +529,14 @@ namespace osu.Game.Skinning
             {
                 sample.RemoveAllAdjustments(type);
             }
+
+            public IBindable<double> AggregateVolume => sample.AggregateVolume;
+
+            public IBindable<double> AggregateBalance => sample.AggregateBalance;
+
+            public IBindable<double> AggregateFrequency => sample.AggregateFrequency;
+
+            public IBindable<double> AggregateTempo => sample.AggregateTempo;
         }
 
         private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)

From f48e017ac901bcd5387a87d53b2a5ab5dc771d06 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 18:34:05 +0900
Subject: [PATCH 08282/10326] Move nested class to bottom of file

---
 osu.Game/Skinning/LegacySkin.cs | 78 ++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 6bdc4575c9..571d65e28b 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -468,7 +468,45 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        /// <summary>
+        private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
+        {
+            var lookupNames = hitSample.LookupNames.SelectMany(getFallbackNames);
+
+            if (!UseCustomSampleBanks && !string.IsNullOrEmpty(hitSample.Suffix))
+            {
+                // for compatibility with stable, exclude the lookup names with the custom sample bank suffix, if they are not valid for use in this skin.
+                // using .EndsWith() is intentional as it ensures parity in all edge cases
+                // (see LegacyTaikoSampleInfo for an example of one - prioritising the taiko prefix should still apply, but the sample bank should not).
+                lookupNames = lookupNames.Where(name => !name.EndsWith(hitSample.Suffix, StringComparison.Ordinal));
+            }
+
+            foreach (var l in lookupNames)
+                yield return l;
+
+            // also for compatibility, try falling back to non-bank samples (so-called "universal" samples) as the last resort.
+            // going forward specifying banks shall always be required, even for elements that wouldn't require it on stable,
+            // which is why this is done locally here.
+            yield return hitSample.Name;
+        }
+
+        private IEnumerable<string> getFallbackNames(string componentName)
+        {
+            // May be something like "Gameplay/osu/approachcircle" from lazer, or "Arrows/note1" from a user skin.
+            yield return componentName;
+
+            // Fall back to using the last piece for components coming from lazer (e.g. "Gameplay/osu/approachcircle" -> "approachcircle").
+            string lastPiece = componentName.Split('/').Last();
+            yield return componentName.StartsWith("Gameplay/taiko/", StringComparison.Ordinal) ? "taiko-" + lastPiece : lastPiece;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            Textures?.Dispose();
+            Samples?.Dispose();
+        }
+
+          /// <summary>
         /// A sample wrapper which keeps a reference to the contained skin to avoid finalizer garbage collection of the managing SampleStore.
         /// </summary>
         private class LegacySkinSample : ISample
@@ -538,43 +576,5 @@ namespace osu.Game.Skinning
 
             public IBindable<double> AggregateTempo => sample.AggregateTempo;
         }
-
-        private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
-        {
-            var lookupNames = hitSample.LookupNames.SelectMany(getFallbackNames);
-
-            if (!UseCustomSampleBanks && !string.IsNullOrEmpty(hitSample.Suffix))
-            {
-                // for compatibility with stable, exclude the lookup names with the custom sample bank suffix, if they are not valid for use in this skin.
-                // using .EndsWith() is intentional as it ensures parity in all edge cases
-                // (see LegacyTaikoSampleInfo for an example of one - prioritising the taiko prefix should still apply, but the sample bank should not).
-                lookupNames = lookupNames.Where(name => !name.EndsWith(hitSample.Suffix, StringComparison.Ordinal));
-            }
-
-            foreach (var l in lookupNames)
-                yield return l;
-
-            // also for compatibility, try falling back to non-bank samples (so-called "universal" samples) as the last resort.
-            // going forward specifying banks shall always be required, even for elements that wouldn't require it on stable,
-            // which is why this is done locally here.
-            yield return hitSample.Name;
-        }
-
-        private IEnumerable<string> getFallbackNames(string componentName)
-        {
-            // May be something like "Gameplay/osu/approachcircle" from lazer, or "Arrows/note1" from a user skin.
-            yield return componentName;
-
-            // Fall back to using the last piece for components coming from lazer (e.g. "Gameplay/osu/approachcircle" -> "approachcircle").
-            string lastPiece = componentName.Split('/').Last();
-            yield return componentName.StartsWith("Gameplay/taiko/", StringComparison.Ordinal) ? "taiko-" + lastPiece : lastPiece;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            Textures?.Dispose();
-            Samples?.Dispose();
-        }
     }
 }

From 1fd76ea3fb9db1d7e80e92fbd9e9cdb40353683c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 17:14:00 +0900
Subject: [PATCH 08283/10326] Apply changes to UI components overriding
 functions with changing signatures

---
 osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs    | 2 +-
 .../Ranking/TestSceneExpandedPanelMiddleContent.cs       | 2 +-
 .../Visual/Settings/TestSceneKeyBindingPanel.cs          | 4 ++--
 .../Visual/SongSelect/TestSceneBeatmapInfoWedge.cs       | 2 +-
 .../Visual/UserInterface/TestSceneDeleteLocalScore.cs    | 2 +-
 osu.Game/Collections/CollectionFilterDropdown.cs         | 5 +++--
 osu.Game/Graphics/Sprites/GlowingSpriteText.cs           | 3 ++-
 osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs   | 3 ++-
 osu.Game/Graphics/UserInterface/OsuButton.cs             | 5 +++--
 osu.Game/Graphics/UserInterface/OsuDropdown.cs           | 5 +++--
 osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs | 3 ++-
 osu.Game/Graphics/UserInterface/ShowMoreButton.cs        | 3 ++-
 osu.Game/Graphics/UserInterface/TriangleButton.cs        | 2 +-
 .../Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs   | 1 -
 .../Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs   | 1 -
 osu.Game/Overlays/BeatmapSet/BasicStats.cs               | 3 ++-
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs       | 1 -
 osu.Game/Overlays/Chat/Selection/ChannelSection.cs       | 9 ++-------
 .../Overlays/Chat/Selection/ChannelSelectionOverlay.cs   | 6 +-----
 .../Overlays/Comments/Buttons/CommentRepliesButton.cs    | 3 ++-
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs            | 2 +-
 osu.Game/Overlays/Notifications/NotificationSection.cs   | 7 ++++---
 osu.Game/Overlays/NowPlayingOverlay.cs                   | 1 -
 osu.Game/Overlays/OverlaySortTabControl.cs               | 3 ++-
 .../Sections/Historical/DrawableMostPlayedBeatmap.cs     | 1 -
 .../Profile/Sections/Ranks/DrawableProfileScore.cs       | 1 -
 .../Settings/Sections/Audio/AudioDevicesSettings.cs      | 3 ++-
 .../Settings/Sections/Graphics/LayoutSettings.cs         | 3 ++-
 osu.Game/Overlays/Settings/Sections/SkinSection.cs       | 2 +-
 osu.Game/Overlays/Settings/SettingsCheckbox.cs           | 8 +++++---
 osu.Game/Overlays/Settings/SettingsItem.cs               | 5 +++--
 osu.Game/Overlays/Toolbar/ToolbarButton.cs               | 7 ++++---
 osu.Game/Screens/Menu/SongTicker.cs                      | 1 -
 osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs   | 1 -
 .../Playlists/PlaylistsMatchSettingsOverlay.cs           | 3 ++-
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs          | 1 -
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs       | 1 -
 osu.Game/Screens/Select/Carousel/SetPanelContent.cs      | 1 -
 osu.Game/Screens/Select/Details/AdvancedStats.cs         | 3 ++-
 osu.Game/Screens/Select/FooterButton.cs                  | 5 +++--
 osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs  | 5 +++--
 osu.Game/Skinning/SkinnableSpriteText.cs                 | 5 +++--
 42 files changed, 68 insertions(+), 66 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs
index bea6186501..43d8d1e27f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         public string Text
         {
-            get => number.Text;
+            get => number.Text.ToString();
             set => number.Text = value;
         }
 
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 7be44a62de..f9fe42131f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual.Ranking
             }));
 
             AddAssert("mapped by text not present", () =>
-                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text, "mapped", "by")));
+                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text.ToString(), "mapped", "by")));
         }
 
         private void showPanel(ScoreInfo score) => Child = new ExpandedPanelMiddleContentContainer(score);
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 8330b9b360..f495e0fb23 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Settings
 
             clickClearButton();
 
-            AddAssert("first binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().Text.Text));
+            AddAssert("first binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().Text.Text.ToString()));
 
             AddStep("click second binding", () =>
             {
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Settings
 
             clickClearButton();
 
-            AddAssert("second binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).Text.Text));
+            AddAssert("second binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).Text.Text.ToString()));
 
             void clickClearButton()
             {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 0b2c0ce63b..fff4a9ba61 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         public void TestNullBeatmap()
         {
             selectBeatmap(null);
-            AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Text));
+            AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Text.ToString()));
             AddAssert("check default title", () => infoWedge.Info.TitleLabel.Text == Beatmap.Default.BeatmapInfo.Metadata.Title);
             AddAssert("check default artist", () => infoWedge.Info.ArtistLabel.Text == Beatmap.Default.BeatmapInfo.Metadata.Artist);
             AddAssert("check empty author", () => !infoWedge.Info.MapperContainer.Children.Any());
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index 81862448a8..1516a7d621 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("click delete option", () =>
             {
-                InputManager.MoveMouseTo(contextMenuContainer.ChildrenOfType<DrawableOsuMenuItem>().First(i => i.Item.Text.Value.ToLowerInvariant() == "delete"));
+                InputManager.MoveMouseTo(contextMenuContainer.ChildrenOfType<DrawableOsuMenuItem>().First(i => i.Item.Text.Value.ToString().ToLowerInvariant() == "delete"));
                 InputManager.Click(MouseButton.Left);
             });
 
diff --git a/osu.Game/Collections/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
index bb743d4ccc..1eceb56e33 100644
--- a/osu.Game/Collections/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -121,7 +122,7 @@ namespace osu.Game.Collections
             Current.TriggerChange();
         }
 
-        protected override string GenerateItemText(CollectionFilterMenuItem item) => item.CollectionName.Value;
+        protected override LocalisableString GenerateItemText(CollectionFilterMenuItem item) => item.CollectionName.Value;
 
         protected sealed override DropdownHeader CreateHeader() => CreateCollectionHeader().With(d =>
         {
@@ -139,7 +140,7 @@ namespace osu.Game.Collections
             public readonly Bindable<CollectionFilterMenuItem> SelectedItem = new Bindable<CollectionFilterMenuItem>();
             private readonly Bindable<string> collectionName = new Bindable<string>();
 
-            protected override string Label
+            protected override LocalisableString Label
             {
                 get => base.Label;
                 set { } // See updateText().
diff --git a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
index 85df2d167f..fb273d7293 100644
--- a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osuTK;
 
 namespace osu.Game.Graphics.Sprites
@@ -14,7 +15,7 @@ namespace osu.Game.Graphics.Sprites
     {
         private readonly OsuSpriteText spriteText, blurredText;
 
-        public string Text
+        public LocalisableString Text
         {
             get => spriteText.Text;
             set => blurredText.Text = spriteText.Text = value;
diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index b499b26f38..8df2c1c2fd 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osuTK.Graphics;
 
@@ -105,7 +106,7 @@ namespace osu.Game.Graphics.UserInterface
 
         protected class TextContainer : Container, IHasText
         {
-            public string Text
+            public LocalisableString Text
             {
                 get => NormalText.Text;
                 set
diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs
index 9cf8f02024..d2114134cf 100644
--- a/osu.Game/Graphics/UserInterface/OsuButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuButton.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osuTK.Graphics;
 
@@ -21,9 +22,9 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class OsuButton : Button
     {
-        public string Text
+        public LocalisableString Text
         {
-            get => SpriteText?.Text;
+            get => SpriteText.Text;
             set
             {
                 if (SpriteText != null)
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index cc76c12975..15fb00ccb0 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
@@ -168,7 +169,7 @@ namespace osu.Game.Graphics.UserInterface
 
                 protected new class Content : FillFlowContainer, IHasText
                 {
-                    public string Text
+                    public LocalisableString Text
                     {
                         get => Label.Text;
                         set => Label.Text = value;
@@ -215,7 +216,7 @@ namespace osu.Game.Graphics.UserInterface
         {
             protected readonly SpriteText Text;
 
-            protected override string Label
+            protected override LocalisableString Label
             {
                 get => Text.Text;
                 set => Text.Text = value;
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
index bdc95ee048..b66a4a58ce 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -35,7 +36,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public string Text
+        public LocalisableString Text
         {
             get => text.Text;
             set => text.Text = value;
diff --git a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
index 924c7913f3..615895074c 100644
--- a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osuTK;
 using System.Collections.Generic;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -18,7 +19,7 @@ namespace osu.Game.Graphics.UserInterface
     {
         private const int duration = 200;
 
-        public string Text
+        public LocalisableString Text
         {
             get => text.Text;
             set => text.Text = value;
diff --git a/osu.Game/Graphics/UserInterface/TriangleButton.cs b/osu.Game/Graphics/UserInterface/TriangleButton.cs
index 5baf794227..003a81f562 100644
--- a/osu.Game/Graphics/UserInterface/TriangleButton.cs
+++ b/osu.Game/Graphics/UserInterface/TriangleButton.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Graphics.UserInterface
             });
         }
 
-        public virtual IEnumerable<string> FilterTerms => new[] { Text };
+        public virtual IEnumerable<string> FilterTerms => new[] { Text.ToString() };
 
         public bool MatchingFilter
         {
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index c1d366bb82..97e7ce83a5 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 76a30d1c11..4a887ed571 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Colour;
 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.Beatmaps.Drawables;
 using osu.Game.Graphics;
diff --git a/osu.Game/Overlays/BeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
index a2464bef09..cf74c0d4d3 100644
--- a/osu.Game/Overlays/BeatmapSet/BasicStats.cs
+++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -96,7 +97,7 @@ namespace osu.Game.Overlays.BeatmapSet
 
             public string TooltipText { get; }
 
-            public string Value
+            public LocalisableString Value
             {
                 get => value.Text;
                 set => this.value.Text = value;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 93744dd6a3..c281d7b432 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 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;
diff --git a/osu.Game/Overlays/Chat/Selection/ChannelSection.cs b/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
index eac48ca5cb..e18302770c 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
@@ -4,12 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Chat;
+using osuTK;
 
 namespace osu.Game.Overlays.Chat.Selection
 {
@@ -29,12 +29,6 @@ namespace osu.Game.Overlays.Chat.Selection
 
         public bool FilteringActive { get; set; }
 
-        public string Header
-        {
-            get => header.Text;
-            set => header.Text = value.ToUpperInvariant();
-        }
-
         public IEnumerable<Channel> Channels
         {
             set => ChannelFlow.ChildrenEnumerable = value.Select(c => new ChannelListItem(c));
@@ -50,6 +44,7 @@ namespace osu.Game.Overlays.Chat.Selection
                 header = new OsuSpriteText
                 {
                     Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold),
+                    Text = "All Channels".ToUpperInvariant()
                 },
                 ChannelFlow = new FillFlowContainer<ChannelListItem>
                 {
diff --git a/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs b/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
index be9ecc6746..231d7ca63c 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
@@ -131,11 +131,7 @@ namespace osu.Game.Overlays.Chat.Selection
             {
                 sectionsFlow.ChildrenEnumerable = new[]
                 {
-                    new ChannelSection
-                    {
-                        Header = "All Channels",
-                        Channels = channels,
-                    },
+                    new ChannelSection { Channels = channels, },
                 };
 
                 foreach (ChannelSection s in sectionsFlow.Children)
diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index 57bf2af4d2..2f7f16dd6f 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -16,7 +17,7 @@ namespace osu.Game.Overlays.Comments.Buttons
 {
     public abstract class CommentRepliesButton : CompositeDrawable
     {
-        protected string Text
+        protected LocalisableString Text
         {
             get => text.Text;
             set => text.Text = value;
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index b808d49fa2..300fce962a 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Overlays.KeyBinding
         private FillFlowContainer cancelAndClearButtons;
         private FillFlowContainer<KeyButton> buttons;
 
-        public IEnumerable<string> FilterTerms => bindings.Select(b => b.KeyCombination.ReadableString()).Prepend((string)text.Text);
+        public IEnumerable<string> FilterTerms => bindings.Select(b => b.KeyCombination.ReadableString()).Prepend(text.Text.ToString());
 
         public KeyBindingRow(object action, IEnumerable<Framework.Input.Bindings.KeyBinding> bindings)
         {
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 38ba712254..bc41311a6d 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
@@ -37,7 +38,7 @@ namespace osu.Game.Overlays.Notifications
 
         public NotificationSection(string title, string clearButtonText)
         {
-            this.clearButtonText = clearButtonText;
+            this.clearButtonText = clearButtonText.ToUpperInvariant();
             titleText = title;
         }
 
@@ -138,10 +139,10 @@ namespace osu.Game.Overlays.Notifications
                 };
             }
 
-            public string Text
+            public LocalisableString Text
             {
                 get => text.Text;
-                set => text.Text = value.ToUpperInvariant();
+                set => text.Text = value;
             }
         }
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 2866d2ad6d..74317a143c 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
diff --git a/osu.Game/Overlays/OverlaySortTabControl.cs b/osu.Game/Overlays/OverlaySortTabControl.cs
index b2212336ef..0ebabd424f 100644
--- a/osu.Game/Overlays/OverlaySortTabControl.cs
+++ b/osu.Game/Overlays/OverlaySortTabControl.cs
@@ -17,6 +17,7 @@ using osu.Game.Overlays.Comments;
 using JetBrains.Annotations;
 using System;
 using osu.Framework.Extensions;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Overlays
 {
@@ -30,7 +31,7 @@ namespace osu.Game.Overlays
             set => current.Current = value;
         }
 
-        public string Title
+        public LocalisableString Title
         {
             get => text.Text;
             set => text.Text = value;
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index 5b7c5efbe2..e485802095 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 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.Beatmaps.Drawables;
 using osu.Game.Graphics;
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 2c20dcc0ef..859637485f 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
index bed74542c9..b31e7dc45b 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
@@ -6,6 +6,7 @@ using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings.Sections.Audio
@@ -76,7 +77,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
 
             private class AudioDeviceDropdownControl : DropdownControl
             {
-                protected override string GenerateItemText(string item)
+                protected override LocalisableString GenerateItemText(string item)
                     => string.IsNullOrEmpty(item) ? "Default" : base.GenerateItemText(item);
             }
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 7acbf038d8..4d5c2e06eb 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -11,6 +11,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
@@ -234,7 +235,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             private class ResolutionDropdownControl : DropdownControl
             {
-                protected override string GenerateItemText(Size item)
+                protected override LocalisableString GenerateItemText(Size item)
                 {
                     if (item == new Size(9999, 9999))
                         return "Default";
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 7c8309fd56..75068bd611 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
             private class SkinDropdownControl : DropdownControl
             {
-                protected override string GenerateItemText(SkinInfo item) => item.ToString();
+                protected override LocalisableString GenerateItemText(SkinInfo item) => item.ToString();
             }
         }
 
diff --git a/osu.Game/Overlays/Settings/SettingsCheckbox.cs b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
index 437b2e45b3..8b7ac80a5b 100644
--- a/osu.Game/Overlays/Settings/SettingsCheckbox.cs
+++ b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
@@ -2,20 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings
 {
     public class SettingsCheckbox : SettingsItem<bool>
     {
-        private string labelText;
+        private LocalisableString labelText;
 
         protected override Drawable CreateControl() => new OsuCheckbox();
 
-        public override string LabelText
+        public override LocalisableString LabelText
         {
             get => labelText;
-            set => ((OsuCheckbox)Control).LabelText = labelText = value;
+            // checkbox doesn't properly support localisation yet.
+            set => ((OsuCheckbox)Control).LabelText = (labelText = value).ToString();
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index af225889da..aafd7463a6 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
@@ -39,7 +40,7 @@ namespace osu.Game.Overlays.Settings
 
         public string TooltipText { get; set; }
 
-        public virtual string LabelText
+        public virtual LocalisableString LabelText
         {
             get => labelText?.Text ?? string.Empty;
             set
@@ -69,7 +70,7 @@ namespace osu.Game.Overlays.Settings
             set => controlWithCurrent.Current = value;
         }
 
-        public virtual IEnumerable<string> FilterTerms => Keywords == null ? new[] { LabelText } : new List<string>(Keywords) { LabelText }.ToArray();
+        public virtual IEnumerable<string> FilterTerms => Keywords == null ? new[] { LabelText.ToString() } : new List<string>(Keywords) { LabelText.ToString() }.ToArray();
 
         public IEnumerable<string> Keywords { get; set; }
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 83f2bdf6cb..7790a21e0a 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
@@ -43,19 +44,19 @@ namespace osu.Game.Overlays.Toolbar
                 Texture = textures.Get(texture),
             });
 
-        public string Text
+        public LocalisableString Text
         {
             get => DrawableText.Text;
             set => DrawableText.Text = value;
         }
 
-        public string TooltipMain
+        public LocalisableString TooltipMain
         {
             get => tooltip1.Text;
             set => tooltip1.Text = value;
         }
 
-        public string TooltipSub
+        public LocalisableString TooltipSub
         {
             get => tooltip2.Text;
             set => tooltip2.Text = value;
diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index c4943e77d5..fd9d9a3fac 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -9,7 +9,6 @@ using osuTK;
 using osu.Game.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
-using osu.Framework.Localisation;
 
 namespace osu.Game.Screens.Menu
 {
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index acb82360b3..b64ea37a59 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index 2a1efbc040..5062a296a8 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -362,7 +363,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 Menu.MaxHeight = 100;
             }
 
-            protected override string GenerateItemText(TimeSpan item) => item.Humanize();
+            protected override LocalisableString GenerateItemText(TimeSpan item) => item.Humanize();
         }
     }
 }
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index eff06e26ee..bb82b00100 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -7,7 +7,6 @@ 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;
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index ff6203bc25..85a9b06a70 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 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;
diff --git a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
index 4e8d27f14d..82704c24fb 100644
--- a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
+++ b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index ab4f3f4796..1627d3ddfc 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -15,6 +15,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Mods;
 using System.Linq;
 using System.Threading;
+using osu.Framework.Localisation;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
@@ -180,7 +181,7 @@ namespace osu.Game.Screens.Select.Details
             [Resolved]
             private OsuColour colours { get; set; }
 
-            public string Title
+            public LocalisableString Title
             {
                 get => name.Text;
                 set => name.Text = value;
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 35970cd960..7bdeacc91a 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.Containers;
 
@@ -21,9 +22,9 @@ namespace osu.Game.Screens.Select
 
         protected static readonly Vector2 SHEAR = new Vector2(SHEAR_WIDTH / Footer.HEIGHT, 0);
 
-        public string Text
+        public LocalisableString Text
         {
-            get => SpriteText?.Text;
+            get => SpriteText.Text;
             set
             {
                 if (SpriteText != null)
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
index 6e2f3cc9df..845c0a914e 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
@@ -39,13 +40,13 @@ namespace osu.Game.Screens.Select.Options
             set => iconText.Icon = value;
         }
 
-        public string FirstLineText
+        public LocalisableString FirstLineText
         {
             get => firstLine.Text;
             set => firstLine.Text = value;
         }
 
-        public string SecondLineText
+        public LocalisableString SecondLineText
         {
             get => secondLine.Text;
             set => secondLine.Text = value;
diff --git a/osu.Game/Skinning/SkinnableSpriteText.cs b/osu.Game/Skinning/SkinnableSpriteText.cs
index 567dd348e1..06461127b1 100644
--- a/osu.Game/Skinning/SkinnableSpriteText.cs
+++ b/osu.Game/Skinning/SkinnableSpriteText.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Skinning
 {
@@ -21,9 +22,9 @@ namespace osu.Game.Skinning
                 textDrawable.Text = Text;
         }
 
-        private string text;
+        private LocalisableString text;
 
-        public string Text
+        public LocalisableString Text
         {
             get => text;
             set

From 8a97e2e28da1f7ad257c3bdf28c98f7c6bfe826f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 17:14:13 +0900
Subject: [PATCH 08284/10326] Update LocalisedString usages to RomanisedString

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 4 ++--
 .../Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs   | 5 +++--
 .../Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs   | 5 +++--
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs       | 2 +-
 osu.Game/Overlays/Music/PlaylistItem.cs                  | 4 ++--
 osu.Game/Overlays/NowPlayingOverlay.cs                   | 5 +++--
 .../Sections/Historical/DrawableMostPlayedBeatmap.cs     | 9 +++++----
 .../Profile/Sections/Ranks/DrawableProfileScore.cs       | 9 +++++----
 osu.Game/Overlays/Settings/Sections/SkinSection.cs       | 1 +
 osu.Game/Screens/Menu/SongTicker.cs                      | 5 +++--
 osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs   | 5 +++--
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs          | 5 +++--
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs       | 5 +++--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs              | 4 ++--
 osu.Game/Screens/Select/Carousel/SetPanelContent.cs      | 5 +++--
 15 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index d1197b1a61..e6d73c6e83 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -74,9 +74,9 @@ namespace osu.Game.Tournament.Components
                     {
                         new TournamentSpriteText
                         {
-                            Text = new LocalisedString((
+                            Text = new RomanisableString(
                                 $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
-                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}")),
+                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}"),
                             Font = OsuFont.Torus.With(weight: FontWeight.Bold),
                         },
                         new FillFlowContainer
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index 97e7ce83a5..ba4725b49a 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
@@ -83,14 +84,14 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                     {
                                         new OsuSpriteText
                                         {
-                                            Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
+                                            Text = new RomanisableString(SetInfo.Metadata.Title, SetInfo.Metadata.TitleUnicode),
                                             Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
                                         },
                                     }
                                 },
                                 new OsuSpriteText
                                 {
-                                    Text = new LocalisedString((SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist)),
+                                    Text = new RomanisableString(SetInfo.Metadata.Artist, SetInfo.Metadata.ArtistUnicode),
                                     Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
                                 },
                             },
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 4a887ed571..624cb89d1e 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Colour;
 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.Beatmaps.Drawables;
 using osu.Game.Graphics;
@@ -106,14 +107,14 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                                             {
                                                                 new OsuSpriteText
                                                                 {
-                                                                    Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
+                                                                    Text = new RomanisableString(SetInfo.Metadata.Title, SetInfo.Metadata.TitleUnicode),
                                                                     Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
                                                                 },
                                                             }
                                                         },
                                                         new OsuSpriteText
                                                         {
-                                                            Text = new LocalisedString((SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist)),
+                                                            Text = new RomanisableString(SetInfo.Metadata.Artist, SetInfo.Metadata.ArtistUnicode),
                                                             Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
                                                         },
                                                     }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index c281d7b432..5cb834b510 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 this.text = text;
             }
 
-            public LocalisedString Text
+            public string Text
             {
                 set => text.Text = value;
             }
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 96dff39fae..dab9bc9629 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -48,8 +48,8 @@ namespace osu.Game.Overlays.Music
             artistColour = colours.Gray9;
             HandleColour = colours.Gray5;
 
-            title = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.TitleUnicode, Model.Metadata.Title)));
-            artist = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.ArtistUnicode, Model.Metadata.Artist)));
+            title = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.Title, Model.Metadata.TitleUnicode));
+            artist = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.Artist, Model.Metadata.ArtistUnicode));
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 74317a143c..9c17392e25 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -292,8 +293,8 @@ namespace osu.Game.Overlays
                     else
                     {
                         BeatmapMetadata metadata = beatmap.Metadata;
-                        title.Text = new LocalisedString((metadata.TitleUnicode, metadata.Title));
-                        artist.Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist));
+                        title.Text = new RomanisableString(metadata.Title, metadata.TitleUnicode);
+                        artist.Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode);
                     }
                 });
 
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index e485802095..48a0481b9e 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
@@ -128,14 +129,14 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             {
                 new OsuSpriteText
                 {
-                    Text = new LocalisedString((
-                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] ",
-                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] ")),
+                    Text = new RomanisableString(
+                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] ",
+                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] "),
                     Font = OsuFont.GetFont(weight: FontWeight.Bold)
                 },
                 new OsuSpriteText
                 {
-                    Text = "by " + new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
+                    Text = "by " + new RomanisableString(beatmap.Metadata.Artist, beatmap.Metadata.ArtistUnicode),
                     Font = OsuFont.GetFont(weight: FontWeight.Regular)
                 },
             };
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 859637485f..ca9e19cd56 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -255,16 +256,16 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
-                    Text = new LocalisedString((
-                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} ",
-                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} ")),
+                    Text = new RomanisableString(
+                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} ",
+                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} "),
                     Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold, italics: true)
                 },
                 new OsuSpriteText
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
-                    Text = "by " + new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
+                    Text = "by " + new RomanisableString(beatmap.Metadata.Artist, beatmap.Metadata.ArtistUnicode),
                     Font = OsuFont.GetFont(size: 12, italics: true)
                 },
             };
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 75068bd611..316837d27d 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index fd9d9a3fac..2be446d71a 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -8,6 +8,7 @@ using osu.Game.Graphics.Sprites;
 using osuTK;
 using osu.Game.Graphics;
 using osu.Framework.Bindables;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Screens.Menu
@@ -60,8 +61,8 @@ namespace osu.Game.Screens.Menu
         {
             var metadata = beatmap.Value.Metadata;
 
-            title.Text = new LocalisedString((metadata.TitleUnicode, metadata.Title));
-            artist.Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist));
+            title.Text = new RomanisableString(metadata.Title, metadata.TitleUnicode);
+            artist.Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode);
 
             this.FadeInFromZero(fade_duration / 2f)
                 .Delay(4000)
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index b64ea37a59..299e3e3768 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -72,7 +73,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                 {
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmap.Value.Metadata.ArtistUnicode, beatmap.Value.Metadata.Artist)),
+                        Text = new RomanisableString(beatmap.Value.Metadata.Artist, beatmap.Value.Metadata.ArtistUnicode),
                         Font = OsuFont.GetFont(size: TextSize),
                     },
                     new OsuSpriteText
@@ -82,7 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                     },
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmap.Value.Metadata.TitleUnicode, beatmap.Value.Metadata.Title)),
+                        Text = new RomanisableString(beatmap.Value.Metadata.Title, beatmap.Value.Metadata.TitleUnicode),
                         Font = OsuFont.GetFont(size: TextSize),
                     }
                 }, LinkAction.OpenBeatmap, beatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap");
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index bb82b00100..0779a9c637 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -7,6 +7,7 @@ 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;
@@ -72,7 +73,7 @@ namespace osu.Game.Screens.Play
                         }),
                         new OsuSpriteText
                         {
-                            Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
+                            Text = new RomanisableString(metadata.Title, metadata.TitleUnicode),
                             Font = OsuFont.GetFont(size: 36, italics: true),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
@@ -80,7 +81,7 @@ namespace osu.Game.Screens.Play
                         },
                         new OsuSpriteText
                         {
-                            Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
+                            Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode),
                             Font = OsuFont.GetFont(size: 26, italics: true),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 85a9b06a70..234e4f2023 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 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;
@@ -100,7 +101,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 {
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
-                                    Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
+                                    Text = new RomanisableString(metadata.Title, metadata.TitleUnicode),
                                     Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                     MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
                                     Truncate = true,
@@ -109,7 +110,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 {
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
-                                    Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
+                                    Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode),
                                     Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
                                     MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
                                     Truncate = true,
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 86cb561bc7..0c5b67026c 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -187,8 +187,8 @@ namespace osu.Game.Screens.Select
 
                 RelativeSizeAxes = Axes.Both;
 
-                titleBinding = localisation.GetLocalisedString(new LocalisedString((metadata.TitleUnicode, metadata.Title)));
-                artistBinding = localisation.GetLocalisedString(new LocalisedString((metadata.ArtistUnicode, metadata.Artist)));
+                titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.Title, metadata.TitleUnicode));
+                artistBinding = localisation.GetLocalisedString(new RomanisableString(metadata.Artist, metadata.ArtistUnicode));
 
                 Children = new Drawable[]
                 {
diff --git a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
index 82704c24fb..0e99a4ce70 100644
--- a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
+++ b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -40,13 +41,13 @@ namespace osu.Game.Screens.Select.Carousel
                 {
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmapSet.Metadata.TitleUnicode, beatmapSet.Metadata.Title)),
+                        Text = new RomanisableString(beatmapSet.Metadata.Title, beatmapSet.Metadata.TitleUnicode),
                         Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 22, italics: true),
                         Shadow = true,
                     },
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmapSet.Metadata.ArtistUnicode, beatmapSet.Metadata.Artist)),
+                        Text = new RomanisableString(beatmapSet.Metadata.Artist, beatmapSet.Metadata.ArtistUnicode),
                         Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
                         Shadow = true,
                     },

From 5e9040c29108cf423ddcf0d6ea418f4aa6690b46 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 22 Feb 2021 16:26:35 +0300
Subject: [PATCH 08285/10326] Use "pausing supported" conditional instead

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 5a86ac646a..0046eea91c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -427,7 +427,7 @@ namespace osu.Game.Screens.Play
 
         private void updatePauseOnFocusLostState()
         {
-            if (!PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
+            if (!PauseOnFocusLost || pausingSupportedByCurrentState || breakTracker.IsBreakTime.Value)
                 return;
 
             if (gameActive.Value == false)

From 5493c55da7287bea7f77651ea0474587cc426626 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 22 Feb 2021 16:59:35 +0300
Subject: [PATCH 08286/10326] Fix silly mistake

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 0046eea91c..2ded1752da 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -427,7 +427,7 @@ namespace osu.Game.Screens.Play
 
         private void updatePauseOnFocusLostState()
         {
-            if (!PauseOnFocusLost || pausingSupportedByCurrentState || breakTracker.IsBreakTime.Value)
+            if (!PauseOnFocusLost || !pausingSupportedByCurrentState || breakTracker.IsBreakTime.Value)
                 return;
 
             if (gameActive.Value == false)

From f62120c66b6cbb852f96d2ede5e60b933214f08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 Feb 2021 22:45:55 +0100
Subject: [PATCH 08287/10326] Remove unused using directive

---
 .../Visual/Playlists/TestScenePlaylistsResultsScreen.cs          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index e34da1ef0c..be8032cde8 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;

From 6a5c6febc56567cd5acb43fdb274f9918c8ef230 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 13:23:32 +0900
Subject: [PATCH 08288/10326] Add inline comment explaining the retry loop

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 2ded1752da..e81efdac78 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -434,6 +434,8 @@ namespace osu.Game.Screens.Play
             {
                 bool paused = Pause();
 
+                // if the initial pause could not be satisfied, the pause cooldown may be active.
+                // reschedule the pause attempt until it can be achieved.
                 if (!paused)
                     Scheduler.AddOnce(updatePauseOnFocusLostState);
             }

From 996c0897d1faa058fa12ea07b13799e01b67aab9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 13:40:21 +0900
Subject: [PATCH 08289/10326] Seek via GameplayClockContainer for better
 reliability

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

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index e5959a3edf..5d070b424a 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             AddStep("press enter", () => InputManager.Key(Key.Enter));
             AddUntilStep("wait for player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
-            AddStep("seek to end", () => beatmap().Track.Seek(beatmap().Track.Length));
+            AddStep("seek to end", () => player.ChildrenOfType<GameplayClockContainer>().First().Seek(beatmap().Track.Length));
             AddUntilStep("wait for pass", () => (results = Game.ScreenStack.CurrentScreen as ResultsScreen) != null && results.IsLoaded);
             AddStep("attempt to retry", () => results.ChildrenOfType<HotkeyRetryOverlay>().First().Action());
             AddUntilStep("wait for player", () => Game.ScreenStack.CurrentScreen != player && Game.ScreenStack.CurrentScreen is Player);

From 672fd3f9d2935099f24ffa5f2a879295c6970f77 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 14:24:24 +0900
Subject: [PATCH 08290/10326] When disable mouse buttons during gameplay is
 selected, disable more globally

Until now the disable setting would only apply to left/right buttons,
and only in gameplay. This change will cause any global actions bound to
mouse buttons to also not work during gameplay.

Closes #11879.
---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 07de2bf601..963c3427d0 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -109,9 +109,9 @@ namespace osu.Game.Rulesets.UI
         {
             switch (e)
             {
-                case MouseDownEvent mouseDown when mouseDown.Button == MouseButton.Left || mouseDown.Button == MouseButton.Right:
+                case MouseDownEvent _:
                     if (mouseDisabled.Value)
-                        return false;
+                        return true; // importantly, block upwards propagation so global bindings also don't fire.
 
                     break;
 

From ec4b770cbac2260bfb731c64d8ba4f7990c9c02a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 14:56:03 +0900
Subject: [PATCH 08291/10326] Remove unused using statement

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 963c3427d0..d6f002ea2c 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -16,7 +16,6 @@ using osu.Game.Configuration;
 using osu.Game.Input.Bindings;
 using osu.Game.Input.Handlers;
 using osu.Game.Screens.Play;
-using osuTK.Input;
 using static osu.Game.Input.Handlers.ReplayInputHandler;
 
 namespace osu.Game.Rulesets.UI

From 664d243003b3fab7d4d6b008302b95fdf7ac12c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 15:22:46 +0900
Subject: [PATCH 08292/10326] Disable multiplayer/spectator on iOS until it can
 be supported again

---
 osu.Game/Online/API/APIAccess.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 8ffa0221c8..ce01378b17 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -10,6 +10,7 @@ using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
@@ -246,7 +247,14 @@ namespace osu.Game.Online.API
             this.password = password;
         }
 
-        public IHubClientConnector GetHubConnector(string clientName, string endpoint) => new HubClientConnector(clientName, endpoint, this, versionHash);
+        public IHubClientConnector GetHubConnector(string clientName, string endpoint)
+        {
+            // disabled until the underlying runtime issue is resolved, see https://github.com/mono/mono/issues/20805.
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
+                return null;
+
+            return new HubClientConnector(clientName, endpoint, this, versionHash);
+        }
 
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
         {

From c514233141756f9700bb3b51881480ddba98f8ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 15:57:41 +0900
Subject: [PATCH 08293/10326] Fix importing collections twice from stable
 causing a hard crash

Somehow a bindable equality check failure got through review. Not sure
if there's some way to protect against this going forward, but we may
want to.
---
 osu.Game/Collections/CollectionManager.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index a65d9a415d..fb9c230c7a 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -138,10 +138,10 @@ namespace osu.Game.Collections
 
             PostNotification?.Invoke(notification);
 
-            var collection = readCollections(stream, notification);
-            await importCollections(collection);
+            var collections = readCollections(stream, notification);
+            await importCollections(collections);
 
-            notification.CompletionText = $"Imported {collection.Count} collections";
+            notification.CompletionText = $"Imported {collections.Count} collections";
             notification.State = ProgressNotificationState.Completed;
         }
 
@@ -155,7 +155,7 @@ namespace osu.Game.Collections
                 {
                     foreach (var newCol in newCollections)
                     {
-                        var existing = Collections.FirstOrDefault(c => c.Name == newCol.Name);
+                        var existing = Collections.FirstOrDefault(c => c.Name.Value == newCol.Name.Value);
                         if (existing == null)
                             Collections.Add(existing = new BeatmapCollection { Name = { Value = newCol.Name.Value } });
 

From f45cedeb8524206a37f7dd7a59cadf5ed20fde21 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:38:09 +0000
Subject: [PATCH 08294/10326] Adjust initial and final rate ranges and prevent
 them from overlapping

---
 osu.Game/Rulesets/Mods/ModWindDown.cs | 13 +++++++++++--
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index 679b50057b..c47ec5fbde 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Initial rate", "The starting speed of the track")]
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
-            MinValue = 1,
+            MinValue = 0.5,
             MaxValue = 2,
             Default = 1,
             Value = 1,
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mods
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 0.99,
+            MaxValue = 2,
             Default = 0.75,
             Value = 0.75,
             Precision = 0.01,
@@ -45,5 +45,14 @@ namespace osu.Game.Rulesets.Mods
         };
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindUp)).ToArray();
+
+        public ModWindDown()
+        {
+            InitialRate.BindValueChanged(val =>
+                InitialRate.Value = Math.Max(val.NewValue, FinalRate.Value + 0.01));
+
+            FinalRate.BindValueChanged(val =>
+                FinalRate.Value = Math.Min(val.NewValue, InitialRate.Value - 0.01));
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index b733bf423e..5a0fab5e67 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 1,
+            MaxValue = 2,
             Default = 1,
             Value = 1,
             Precision = 0.01,
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
-            MinValue = 1.01,
+            MinValue = 0.5,
             MaxValue = 2,
             Default = 1.5,
             Value = 1.5,
@@ -45,5 +45,14 @@ namespace osu.Game.Rulesets.Mods
         };
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindDown)).ToArray();
+
+        public ModWindUp()
+        {
+            InitialRate.BindValueChanged(val =>
+                InitialRate.Value = Math.Min(val.NewValue, FinalRate.Value - 0.01));
+
+            FinalRate.BindValueChanged(val =>
+                FinalRate.Value = Math.Max(val.NewValue, InitialRate.Value + 0.01));
+        }
     }
 }

From a6e840634b255ea86e21cfa8140df3794965ebe6 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:52:53 +0000
Subject: [PATCH 08295/10326] Adjust scrubbing behaviour to allow dragging
 through rate values

---
 osu.Game/Rulesets/Mods/ModWindDown.cs | 8 ++++----
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index c47ec5fbde..f9e6854dd4 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Initial rate", "The starting speed of the track")]
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
-            MinValue = 0.5,
+            MinValue = 0.51,
             MaxValue = 2,
             Default = 1,
             Value = 1,
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mods
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 2,
+            MaxValue = 1.99,
             Default = 0.75,
             Value = 0.75,
             Precision = 0.01,
@@ -49,10 +49,10 @@ namespace osu.Game.Rulesets.Mods
         public ModWindDown()
         {
             InitialRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Max(val.NewValue, FinalRate.Value + 0.01));
+                FinalRate.Value = Math.Min(FinalRate.Value, val.NewValue - 0.01));
 
             FinalRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Min(val.NewValue, InitialRate.Value - 0.01));
+                InitialRate.Value = Math.Max(InitialRate.Value, val.NewValue + 0.01));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 5a0fab5e67..0d57bbb52d 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 2,
+            MaxValue = 1.99,
             Default = 1,
             Value = 1,
             Precision = 0.01,
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
-            MinValue = 0.5,
+            MinValue = 0.51,
             MaxValue = 2,
             Default = 1.5,
             Value = 1.5,
@@ -49,10 +49,10 @@ namespace osu.Game.Rulesets.Mods
         public ModWindUp()
         {
             InitialRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Min(val.NewValue, FinalRate.Value - 0.01));
+                FinalRate.Value = Math.Max(FinalRate.Value, val.NewValue + 0.01));
 
             FinalRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Max(val.NewValue, InitialRate.Value + 0.01));
+                InitialRate.Value = Math.Min(InitialRate.Value, val.NewValue - 0.01));
         }
     }
 }

From 7394c62cc8ee4c30ce12543fa7c6609d7ee9dc58 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 18:10:03 +0000
Subject: [PATCH 08296/10326] Make ModTimeRamp and ModRateAdjust incompatible

---
 osu.Game/Rulesets/Mods/ModRateAdjust.cs | 3 +++
 osu.Game/Rulesets/Mods/ModTimeRamp.cs   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index b016a6d43b..e66650f7b4 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.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.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
@@ -24,6 +25,8 @@ namespace osu.Game.Rulesets.Mods
 
         public double ApplyToRate(double time, double rate) => rate * SpeedChange.Value;
 
+        public override Type[] IncompatibleMods => new[] { typeof(ModTimeRamp) };
+
         public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N2}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 330945d3d3..b5cd64dafa 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
         public abstract BindableBool AdjustPitch { get; }
 
+        public override Type[] IncompatibleMods => new[] { typeof(ModRateAdjust) };
+
         public override string SettingDescription => $"{InitialRate.Value:N2}x to {FinalRate.Value:N2}x";
 
         private double finalRateTime;

From dbde47fe94e5c26270e4b124f7539c953f32b5b4 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 19:43:04 +0000
Subject: [PATCH 08297/10326] Fix test failure

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

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 7a0dd5b719..650ae68ffc 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Tests.Gameplay
                     break;
 
                 case ModTimeRamp m:
-                    m.InitialRate.Value = m.FinalRate.Value = expectedRate;
+                    m.FinalRate.Value = m.InitialRate.Value = expectedRate;
                     break;
             }
 

From 3491021f72a00eb5f4471dd6828678d2e6017315 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Feb 2021 20:58:46 +0100
Subject: [PATCH 08298/10326] Move moveSelection into HandleMovement

---
 .../Edit/OsuSelectionHandler.cs                | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 64dbe20c58..03c1676982 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -37,9 +37,13 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         public override bool HandleMovement(MoveSelectionEvent moveEvent)
         {
-            bool result = moveSelection(moveEvent.InstantDelta);
+            var hitObjects = selectedMovableObjects;
+
+            foreach (var h in hitObjects)
+                h.Position += moveEvent.InstantDelta;
+
             moveSelectionInBounds();
-            return result;
+            return true;
         }
 
         /// <summary>
@@ -246,16 +250,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             return result;
         }
 
-        private bool moveSelection(Vector2 delta)
-        {
-            var hitObjects = selectedMovableObjects;
-
-            foreach (var h in hitObjects)
-                h.Position += delta;
-
-            return true;
-        }
-
         private void moveSelectionInBounds()
         {
             var hitObjects = selectedMovableObjects;

From 71b30bdbbb7de4988ca31afe8110a477f98ab4b2 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Feb 2021 00:16:35 +0100
Subject: [PATCH 08299/10326] Adjust tuple usage

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 03c1676982..e1ee0612fa 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -199,12 +199,12 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             Quad selectionQuad = getSurroundingQuad(new OsuHitObject[] { slider });
             Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
-            (bool X, bool Y) inBounds = isQuadInBounds(scaledQuad);
+            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
-            if (!inBounds.X)
+            if (!xInBounds)
                 pathRelativeDeltaScale.X = 1;
 
-            if (!inBounds.Y)
+            if (!yInBounds)
                 pathRelativeDeltaScale.Y = 1;
 
             foreach (var point in slider.Path.ControlPoints)
@@ -221,17 +221,17 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             Quad selectionQuad = getSurroundingQuad(hitObjects);
             Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
-            (bool X, bool Y) inBounds = isQuadInBounds(scaledQuad);
+            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
             foreach (var h in hitObjects)
             {
                 var newPosition = h.Position;
 
                 // guard against no-ops and NaN.
-                if (scale.X != 0 && selectionQuad.Width > 0 && inBounds.X)
+                if (scale.X != 0 && selectionQuad.Width > 0 && xInBounds)
                     newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
 
-                if (scale.Y != 0 && selectionQuad.Height > 0 && inBounds.Y)
+                if (scale.Y != 0 && selectionQuad.Height > 0 && yInBounds)
                     newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
 
                 h.Position = newPosition;

From 2a4139a2070df2f324526c651f9844fa58be1288 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Feb 2021 00:25:40 +0100
Subject: [PATCH 08300/10326] Refactor isQuadInBounds

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index e1ee0612fa..ede756ab47 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -242,12 +242,10 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private (bool X, bool Y) isQuadInBounds(Quad quad)
         {
-            (bool X, bool Y) result;
+            bool xInBounds = (quad.TopLeft.X >= 0) && (quad.BottomRight.X < DrawWidth);
+            bool yInBounds = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y < DrawHeight);
 
-            result.X = (quad.TopLeft.X >= 0) && (quad.BottomRight.X < DrawWidth);
-            result.Y = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y < DrawHeight);
-
-            return result;
+            return (xInBounds, yInBounds);
         }
 
         private void moveSelectionInBounds()

From 877e19421bfd44426bfcb15956fd75cc2dfabea0 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Feb 2021 16:36:51 +0100
Subject: [PATCH 08301/10326] Refactor movement while scaling

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index ede756ab47..28e6347f4f 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -216,11 +216,11 @@ namespace osu.Game.Rulesets.Osu.Edit
         private bool scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
         {
             // move the selection before scaling if dragging from top or left anchors.
-            if ((reference & Anchor.x0) > 0 && !moveSelection(new Vector2(-scale.X, 0))) return false;
-            if ((reference & Anchor.y0) > 0 && !moveSelection(new Vector2(0, -scale.Y))) return false;
+            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
+            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
 
             Quad selectionQuad = getSurroundingQuad(hitObjects);
-            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
+            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X + xOffset, selectionQuad.TopLeft.Y + yOffset, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
             (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
             foreach (var h in hitObjects)
@@ -229,10 +229,10 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 // guard against no-ops and NaN.
                 if (scale.X != 0 && selectionQuad.Width > 0 && xInBounds)
-                    newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
+                    newPosition.X = selectionQuad.TopLeft.X + xOffset + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
 
                 if (scale.Y != 0 && selectionQuad.Height > 0 && yInBounds)
-                    newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
+                    newPosition.Y = selectionQuad.TopLeft.Y + yOffset + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
 
                 h.Position = newPosition;
             }

From f6d3cd6413e55eb4f44dc87d66644da55ecb0699 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 21:25:59 +0000
Subject: [PATCH 08302/10326] Change SamplePlaybackWithRateMods to use rate
 calulated from the sample Replace hardcoded numbers

---
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs | 9 +++++++--
 osu.Game/Rulesets/Mods/ModWindDown.cs                 | 4 ++--
 osu.Game/Rulesets/Mods/ModWindUp.cs                   | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 650ae68ffc..10a1a13ba0 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.IO;
 using osu.Game.Rulesets;
@@ -90,6 +91,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestSamplePlaybackWithRateMods(Type expectedMod, double expectedRate)
         {
             GameplayClockContainer gameplayContainer = null;
+            StoryboardSampleInfo sampleInfo = null;
             TestDrawableStoryboardSample sample = null;
 
             Mod testedMod = Activator.CreateInstance(expectedMod) as Mod;
@@ -117,7 +119,7 @@ namespace osu.Game.Tests.Gameplay
                     Child = beatmapSkinSourceContainer
                 });
 
-                beatmapSkinSourceContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
+                beatmapSkinSourceContainer.Add(sample = new TestDrawableStoryboardSample(sampleInfo = new StoryboardSampleInfo("test-sample", 1, 1))
                 {
                     Clock = gameplayContainer.GameplayClock
                 });
@@ -125,7 +127,10 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("start", () => gameplayContainer.Start());
 
-            AddAssert("sample playback rate matches mod rates", () => sample.ChildrenOfType<DrawableSample>().First().AggregateFrequency.Value == expectedRate);
+            AddAssert("sample playback rate matches mod rates", () =>
+                testedMod != null && Precision.AlmostEquals(
+                    sample.ChildrenOfType<DrawableSample>().First().AggregateFrequency.Value,
+                    ((IApplicableToRate)testedMod).ApplyToRate(sampleInfo.StartTime)));
         }
 
         private class TestSkin : LegacySkin
diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index f9e6854dd4..9bd5b5eefd 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -49,10 +49,10 @@ namespace osu.Game.Rulesets.Mods
         public ModWindDown()
         {
             InitialRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Min(FinalRate.Value, val.NewValue - 0.01));
+                FinalRate.Value = Math.Min(FinalRate.Value, val.NewValue - FinalRate.Precision));
 
             FinalRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Max(InitialRate.Value, val.NewValue + 0.01));
+                InitialRate.Value = Math.Max(InitialRate.Value, val.NewValue + InitialRate.Precision));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 0d57bbb52d..39d3c9c5d5 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -49,10 +49,10 @@ namespace osu.Game.Rulesets.Mods
         public ModWindUp()
         {
             InitialRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Max(FinalRate.Value, val.NewValue + 0.01));
+                FinalRate.Value = Math.Max(FinalRate.Value, val.NewValue + FinalRate.Precision));
 
             FinalRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Min(InitialRate.Value, val.NewValue - 0.01));
+                InitialRate.Value = Math.Min(InitialRate.Value, val.NewValue - InitialRate.Precision));
         }
     }
 }

From 71182347d677be782005acaf1e227c6cd21a0275 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 11:30:13 +0900
Subject: [PATCH 08303/10326] Also add a notifiation when trying to enter the
 multiplayer screen

Turns out the only check required to get into this screen was that the
API was online, which it always is even if the multiplayer component
isn't.

This provides a better end-user experience.
---
 osu.Game/Screens/Menu/ButtonSystem.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 81b1cb0bf1..dd1e318aa0 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -172,6 +172,23 @@ namespace osu.Game.Screens.Menu
                 return;
             }
 
+            // disabled until the underlying runtime issue is resolved, see https://github.com/mono/mono/issues/20805.
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
+            {
+                notifications?.Post(new SimpleNotification
+                {
+                    Text = "Multiplayer is temporarily unavailable on iOS as we figure out some low level issues.",
+                    Icon = FontAwesome.Solid.AppleAlt,
+                    Activated = () =>
+                    {
+                        loginOverlay?.Show();
+                        return true;
+                    }
+                });
+
+                return;
+            }
+
             OnMultiplayer?.Invoke();
         }
 

From e1f71038e39b09134ae2587692f7a9b9fa884d75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 12:13:55 +0900
Subject: [PATCH 08304/10326] Remove unncessary action

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index dd1e318aa0..f93bfd7705 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -179,11 +179,6 @@ namespace osu.Game.Screens.Menu
                 {
                     Text = "Multiplayer is temporarily unavailable on iOS as we figure out some low level issues.",
                     Icon = FontAwesome.Solid.AppleAlt,
-                    Activated = () =>
-                    {
-                        loginOverlay?.Show();
-                        return true;
-                    }
                 });
 
                 return;

From 7000132d034c6cf012b475ec44178c7202ca4c3a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 12:45:00 +0900
Subject: [PATCH 08305/10326] Specify full filename inline for quick beatmap

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

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index 14bc2c8733..c979b5c695 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Tests.Resources
 
         public static Stream OpenResource(string name) => GetStore().GetStream($"Resources/{name}");
 
-        public static Stream GetTestBeatmapStream(bool virtualTrack = false, bool quick = false) => OpenResource($"Archives/241526 Soleily - Renatus{(virtualTrack ? "_virtual" : "")}{(quick ? "_quick" : "")}.osz");
+        public static Stream GetTestBeatmapStream(bool virtualTrack = false) => OpenResource($"Archives/241526 Soleily - Renatus{(virtualTrack ? "_virtual" : "")}.osz");
 
         /// <summary>
         /// Retrieve a path to a copy of a shortened (~10 second) beatmap archive with a virtual track.
@@ -24,8 +24,7 @@ namespace osu.Game.Tests.Resources
         public static string GetQuickTestBeatmapForImport()
         {
             var tempPath = Path.GetTempFileName() + ".osz";
-
-            using (var stream = GetTestBeatmapStream(true, true))
+            using (var stream = OpenResource($"Archives/241526 Soleily - Renatus_virtual_quick.osz"))
             using (var newFile = File.Create(tempPath))
                 stream.CopyTo(newFile);
 

From 59e6bad0b9cf128c4f208a67fface6ad82ff48bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 12:46:35 +0900
Subject: [PATCH 08306/10326] Remove unnecessary interpolated string
 specification

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

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index c979b5c695..cef0532f9d 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Resources
         public static string GetQuickTestBeatmapForImport()
         {
             var tempPath = Path.GetTempFileName() + ".osz";
-            using (var stream = OpenResource($"Archives/241526 Soleily - Renatus_virtual_quick.osz"))
+            using (var stream = OpenResource("Archives/241526 Soleily - Renatus_virtual_quick.osz"))
             using (var newFile = File.Create(tempPath))
                 stream.CopyTo(newFile);
 

From dd702ccfd22ef251000985bdb72e71812855893e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 24 Feb 2021 13:39:15 +0900
Subject: [PATCH 08307/10326] Make mania FI/HD incompatible with each other

---
 .../Mods/ManiaModFadeIn.cs                    | 10 +++--
 .../Mods/ManiaModHidden.cs                    | 33 +-------------
 .../Mods/ManiaModPlayfieldCover.cs            | 43 +++++++++++++++++++
 3 files changed, 51 insertions(+), 35 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index cbdcd49c5b..f80c9e1f7c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -1,18 +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.Sprites;
-using osu.Game.Graphics;
+using System;
+using System.Linq;
 using osu.Game.Rulesets.Mania.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModFadeIn : ManiaModHidden
+    public class ManiaModFadeIn : ManiaModPlayfieldCover
     {
         public override string Name => "Fade In";
         public override string Acronym => "FI";
-        public override IconUsage? Icon => OsuIcon.ModHidden;
         public override string Description => @"Keys appear out of nowhere!";
+        public override double ScoreMultiplier => 1;
+
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ManiaModHidden)).ToArray();
 
         protected override CoverExpandDirection ExpandDirection => CoverExpandDirection.AlongScroll;
     }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 4bdb15526f..a68f12cb84 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -3,43 +3,14 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModHidden : ModHidden, IApplicableToDrawableRuleset<ManiaHitObject>
+    public class ManiaModHidden : ManiaModPlayfieldCover
     {
         public override string Description => @"Keys fade out before you hit them!";
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
 
-        /// <summary>
-        /// The direction in which the cover should expand.
-        /// </summary>
-        protected virtual CoverExpandDirection ExpandDirection => CoverExpandDirection.AgainstScroll;
-
-        public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
-        {
-            ManiaPlayfield maniaPlayfield = (ManiaPlayfield)drawableRuleset.Playfield;
-
-            foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
-            {
-                HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
-                Container hocParent = (Container)hoc.Parent;
-
-                hocParent.Remove(hoc);
-                hocParent.Add(new PlayfieldCoveringWrapper(hoc).With(c =>
-                {
-                    c.RelativeSizeAxes = Axes.Both;
-                    c.Direction = ExpandDirection;
-                    c.Coverage = 0.5f;
-                }));
-            }
-        }
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ManiaModFadeIn)).ToArray();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
new file mode 100644
index 0000000000..78c3331fbf
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.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.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public abstract class ManiaModPlayfieldCover : ModHidden, IApplicableToDrawableRuleset<ManiaHitObject>
+    {
+        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
+
+        /// <summary>
+        /// The direction in which the cover should expand.
+        /// </summary>
+        protected virtual CoverExpandDirection ExpandDirection => CoverExpandDirection.AgainstScroll;
+
+        public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
+        {
+            ManiaPlayfield maniaPlayfield = (ManiaPlayfield)drawableRuleset.Playfield;
+
+            foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
+            {
+                HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
+                Container hocParent = (Container)hoc.Parent;
+
+                hocParent.Remove(hoc);
+                hocParent.Add(new PlayfieldCoveringWrapper(hoc).With(c =>
+                {
+                    c.RelativeSizeAxes = Axes.Both;
+                    c.Direction = ExpandDirection;
+                    c.Coverage = 0.5f;
+                }));
+            }
+        }
+    }
+}

From 30a58691f04b48126fb8714331a6d84cf88b6cd6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 24 Feb 2021 14:32:50 +0900
Subject: [PATCH 08308/10326] Make SD and PF incompatible with each other

---
 osu.Game/Rulesets/Mods/ModFailCondition.cs | 25 ++++++++++++++++++++++
 osu.Game/Rulesets/Mods/ModPerfect.cs       |  9 +++++++-
 osu.Game/Rulesets/Mods/ModSuddenDeath.cs   | 15 ++++---------
 3 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/ModFailCondition.cs

diff --git a/osu.Game/Rulesets/Mods/ModFailCondition.cs b/osu.Game/Rulesets/Mods/ModFailCondition.cs
new file mode 100644
index 0000000000..40a0843e06
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModFailCondition.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 System;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModFailCondition : Mod, IApplicableToHealthProcessor, IApplicableFailOverride
+    {
+        public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
+
+        public bool PerformFail() => true;
+
+        public bool RestartOnFail => true;
+
+        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
+        {
+            healthProcessor.FailConditions += FailCondition;
+        }
+
+        protected abstract bool FailCondition(HealthProcessor healthProcessor, JudgementResult result);
+    }
+}
diff --git a/osu.Game/Rulesets/Mods/ModPerfect.cs b/osu.Game/Rulesets/Mods/ModPerfect.cs
index df0fc9c4b6..d0b09b50f2 100644
--- a/osu.Game/Rulesets/Mods/ModPerfect.cs
+++ b/osu.Game/Rulesets/Mods/ModPerfect.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.Linq;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
@@ -8,13 +10,18 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModPerfect : ModSuddenDeath
+    public abstract class ModPerfect : ModFailCondition
     {
         public override string Name => "Perfect";
         public override string Acronym => "PF";
         public override IconUsage? Icon => OsuIcon.ModPerfect;
+        public override ModType Type => ModType.DifficultyIncrease;
+        public override bool Ranked => true;
+        public override double ScoreMultiplier => 1;
         public override string Description => "SS or quit.";
 
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModSuddenDeath)).ToArray();
+
         protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
             => result.Type.AffectsAccuracy()
                && result.Type != result.Judgement.MaxResult;
diff --git a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
index ae71041a64..617ae38feb 100644
--- a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
+++ b/osu.Game/Rulesets/Mods/ModSuddenDeath.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.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
@@ -9,7 +10,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModSuddenDeath : Mod, IApplicableToHealthProcessor, IApplicableFailOverride
+    public abstract class ModSuddenDeath : ModFailCondition
     {
         public override string Name => "Sudden Death";
         public override string Acronym => "SD";
@@ -18,18 +19,10 @@ namespace osu.Game.Rulesets.Mods
         public override string Description => "Miss and fail.";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
 
-        public bool PerformFail() => true;
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModPerfect)).ToArray();
 
-        public bool RestartOnFail => true;
-
-        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
-        {
-            healthProcessor.FailConditions += FailCondition;
-        }
-
-        protected virtual bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
+        protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
             => result.Type.AffectsCombo()
                && !result.IsHit;
     }

From 14160b897e238ebcba242f5fa09f6b237066c960 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 24 Feb 2021 14:42:04 +0900
Subject: [PATCH 08309/10326] Fix references to ModSuddenDeath

---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs | 2 +-
 osu.Game/Rulesets/Mods/ModAutoplay.cs         | 2 +-
 osu.Game/Rulesets/Mods/ModNoFail.cs           | 2 +-
 osu.Game/Rulesets/Mods/ModRelax.cs            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 77de0cb45b..aac830801b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override ModType Type => ModType.Automation;
         public override string Description => @"Automatic cursor movement - just follow the rhythm.";
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModFailCondition), typeof(ModNoFail), typeof(ModAutoplay) };
 
         public bool PerformFail() => false;
 
diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index d1d23def67..d6e1d46b06 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Mods
 
         public bool RestartOnFail => false;
 
-        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModFailCondition), typeof(ModNoFail) };
 
         public override bool HasImplementation => GetType().GenericTypeArguments.Length == 0;
 
diff --git a/osu.Game/Rulesets/Mods/ModNoFail.cs b/osu.Game/Rulesets/Mods/ModNoFail.cs
index b95ec7490e..c0f24e116a 100644
--- a/osu.Game/Rulesets/Mods/ModNoFail.cs
+++ b/osu.Game/Rulesets/Mods/ModNoFail.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Mods
         public override string Description => "You can't fail, no matter what.";
         public override double ScoreMultiplier => 0.5;
         public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModAutoplay) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModFailCondition), typeof(ModAutoplay) };
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModRelax.cs b/osu.Game/Rulesets/Mods/ModRelax.cs
index b6fec42f43..e5995ff180 100644
--- a/osu.Game/Rulesets/Mods/ModRelax.cs
+++ b/osu.Game/Rulesets/Mods/ModRelax.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => OsuIcon.ModRelax;
         public override ModType Type => ModType.Automation;
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModSuddenDeath) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModFailCondition) };
     }
 }

From 0b44d2483b6f02dd415c461ab6d3081e96cd9971 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 24 Feb 2021 15:03:37 +0900
Subject: [PATCH 08310/10326] Make some properties virtual

I think they were intended to be this way from the beginning.
---
 osu.Game/Rulesets/Mods/ModFailCondition.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFailCondition.cs b/osu.Game/Rulesets/Mods/ModFailCondition.cs
index 40a0843e06..c0d7bae2b2 100644
--- a/osu.Game/Rulesets/Mods/ModFailCondition.cs
+++ b/osu.Game/Rulesets/Mods/ModFailCondition.cs
@@ -11,9 +11,9 @@ namespace osu.Game.Rulesets.Mods
     {
         public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
 
-        public bool PerformFail() => true;
+        public virtual bool PerformFail() => true;
 
-        public bool RestartOnFail => true;
+        public virtual bool RestartOnFail => true;
 
         public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
         {

From 6b6811063b617b3cf5c0e38a6eae95193759dd18 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 24 Feb 2021 15:05:12 +0900
Subject: [PATCH 08311/10326] Make ExpandDirection abstract

---
 osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs         | 3 +++
 osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index a68f12cb84..e3ac624a6e 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Game.Rulesets.Mania.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
@@ -12,5 +13,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override double ScoreMultiplier => 1;
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ManiaModFadeIn)).ToArray();
+
+        protected override CoverExpandDirection ExpandDirection => CoverExpandDirection.AgainstScroll;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
index 78c3331fbf..87501d07a5 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         /// <summary>
         /// The direction in which the cover should expand.
         /// </summary>
-        protected virtual CoverExpandDirection ExpandDirection => CoverExpandDirection.AgainstScroll;
+        protected abstract CoverExpandDirection ExpandDirection { get; }
 
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
         {

From 165da3204454999cd8497d0f55987d871774b34c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 18:41:42 +0900
Subject: [PATCH 08312/10326] Fix dropdown crash on collection name collisions

---
 osu.Game/Collections/CollectionFilterMenuItem.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Collections/CollectionFilterMenuItem.cs b/osu.Game/Collections/CollectionFilterMenuItem.cs
index fe79358223..0617996872 100644
--- a/osu.Game/Collections/CollectionFilterMenuItem.cs
+++ b/osu.Game/Collections/CollectionFilterMenuItem.cs
@@ -36,7 +36,19 @@ namespace osu.Game.Collections
         }
 
         public bool Equals(CollectionFilterMenuItem other)
-            => other != null && CollectionName.Value == other.CollectionName.Value;
+        {
+            if (other == null)
+                return false;
+
+            // collections may have the same name, so compare first on reference equality.
+            // this relies on the assumption that only one instance of the BeatmapCollection exists game-wide, managed by CollectionManager.
+            if (Collection != null)
+                return Collection == other.Collection;
+
+            // fallback to name-based comparison.
+            // this is required for special dropdown items which don't have a collection (all beatmaps / manage collections items below).
+            return CollectionName.Value == other.CollectionName.Value;
+        }
 
         public override int GetHashCode() => CollectionName.Value.GetHashCode();
     }

From 6e6fb31c050ad03ce1f064fb8077f8df4d0f7027 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 18:42:26 +0900
Subject: [PATCH 08313/10326] Add test coverage

---
 .../TestSceneManageCollectionsDialog.cs       | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index 1655adf811..eca857f9e5 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Collections
             {
                 manager = new CollectionManager(LocalStorage),
                 Content,
-                dialogOverlay = new DialogOverlay()
+                dialogOverlay = new DialogOverlay(),
             });
 
             Dependencies.Cache(manager);
@@ -134,6 +134,27 @@ namespace osu.Game.Tests.Visual.Collections
             assertCollectionName(0, "2");
         }
 
+        [Test]
+        public void TestCollectionNameCollisions()
+        {
+            AddStep("add dropdown", () =>
+            {
+                Add(new CollectionFilterDropdown
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        RelativeSizeAxes = Axes.X,
+                        Width = 0.4f,
+                    }
+                );
+            });
+            AddStep("add two collections with same name", () => manager.Collections.AddRange(new[]
+            {
+                new BeatmapCollection { Name = { Value = "1" } },
+                new BeatmapCollection { Name = { Value = "1" }, Beatmaps = { beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0] } },
+            }));
+        }
+
         [Test]
         public void TestRemoveCollectionViaButton()
         {

From 5dc0aefb2bf36f7ab18e8c41a1643bcc31b05c98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 19:54:52 +0900
Subject: [PATCH 08314/10326] Cancel request on leaving results screen

---
 osu.Game/Screens/Ranking/SoloResultsScreen.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index 76b549da1a..4c35096910 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Screens.Ranking
 {
     public class SoloResultsScreen : ResultsScreen
     {
+        private GetScoresRequest getScoreRequest;
+
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
@@ -28,9 +30,16 @@ namespace osu.Game.Screens.Ranking
             if (Score.Beatmap.OnlineBeatmapID == null || Score.Beatmap.Status <= BeatmapSetOnlineStatus.Pending)
                 return null;
 
-            var req = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
-            req.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
-            return req;
+            getScoreRequest = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
+            getScoreRequest.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != this.Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
+            return getScoreRequest;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            getScoreRequest?.Cancel();
         }
     }
 }

From 9ed8d902f7ca20f47179d5f6387e0c9583b8b320 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 19:57:42 +0900
Subject: [PATCH 08315/10326] Fix requests being indefinitely queued when user
 is offline

---
 osu.Game/Online/API/APIAccess.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index ce01378b17..569481d491 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -381,7 +381,13 @@ namespace osu.Game.Online.API
 
         public void Queue(APIRequest request)
         {
-            lock (queue) queue.Enqueue(request);
+            lock (queue)
+            {
+                if (state.Value == APIState.Offline)
+                    return;
+
+                queue.Enqueue(request);
+            }
         }
 
         private void flushQueue(bool failOldRequests = true)
@@ -402,8 +408,6 @@ namespace osu.Game.Online.API
 
         public void Logout()
         {
-            flushQueue();
-
             password = null;
             authentication.Clear();
 
@@ -415,6 +419,7 @@ namespace osu.Game.Online.API
             });
 
             state.Value = APIState.Offline;
+            flushQueue();
         }
 
         private static User createGuestUser() => new GuestUser();

From fa6d797adf9860bbde472efffcca6fa77256fb14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 20:30:17 +0900
Subject: [PATCH 08316/10326] Remove redundant prefix

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

diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index 4c35096910..9bc696948f 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Ranking
                 return null;
 
             getScoreRequest = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
-            getScoreRequest.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != this.Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
+            getScoreRequest.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
             return getScoreRequest;
         }
 

From 73d6a3687eacd25e26501cc2b9ea061b86512c38 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Wed, 24 Feb 2021 14:40:56 +0000
Subject: [PATCH 08317/10326] Change rate correction logic to be more explicit

---
 osu.Game/Rulesets/Mods/ModWindDown.cs | 10 ++++++++--
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index 9bd5b5eefd..c8d79325a3 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -49,10 +49,16 @@ namespace osu.Game.Rulesets.Mods
         public ModWindDown()
         {
             InitialRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Min(FinalRate.Value, val.NewValue - FinalRate.Precision));
+            {
+                if (val.NewValue <= FinalRate.Value)
+                    FinalRate.Value = val.NewValue - FinalRate.Precision;
+            });
 
             FinalRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Max(InitialRate.Value, val.NewValue + InitialRate.Precision));
+            {
+                if (val.NewValue >= InitialRate.Value)
+                    InitialRate.Value = val.NewValue + FinalRate.Precision;
+            });
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 39d3c9c5d5..4fc1f61e02 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -49,10 +49,16 @@ namespace osu.Game.Rulesets.Mods
         public ModWindUp()
         {
             InitialRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Max(FinalRate.Value, val.NewValue + FinalRate.Precision));
+            {
+                if (val.NewValue >= FinalRate.Value)
+                    FinalRate.Value = val.NewValue + FinalRate.Precision;
+            });
 
             FinalRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Min(InitialRate.Value, val.NewValue - InitialRate.Precision));
+            {
+                if (val.NewValue <= InitialRate.Value)
+                    InitialRate.Value = val.NewValue - FinalRate.Precision;
+            });
         }
     }
 }

From 421b7877d4eb9eed06942666c37d60d962d78b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 24 Feb 2021 19:16:10 +0100
Subject: [PATCH 08318/10326] Avoid mixing precision across time ramp bindables

Bears no functional difference, it's just a bit less of an eyesore.
---
 osu.Game/Rulesets/Mods/ModWindDown.cs | 2 +-
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index c8d79325a3..08bd44f7bd 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Mods
             FinalRate.BindValueChanged(val =>
             {
                 if (val.NewValue >= InitialRate.Value)
-                    InitialRate.Value = val.NewValue + FinalRate.Precision;
+                    InitialRate.Value = val.NewValue + InitialRate.Precision;
             });
         }
     }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 4fc1f61e02..df8f781148 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Mods
             FinalRate.BindValueChanged(val =>
             {
                 if (val.NewValue <= InitialRate.Value)
-                    InitialRate.Value = val.NewValue - FinalRate.Precision;
+                    InitialRate.Value = val.NewValue - InitialRate.Precision;
             });
         }
     }

From a362382d381e6128b2eabc55ff7a6717eb1722ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:06:21 +0900
Subject: [PATCH 08319/10326] Add back more correct null checks

---
 osu.Game/Graphics/UserInterface/OsuButton.cs | 2 +-
 osu.Game/Screens/Select/FooterButton.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs
index d2114134cf..a22c837080 100644
--- a/osu.Game/Graphics/UserInterface/OsuButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuButton.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface
     {
         public LocalisableString Text
         {
-            get => SpriteText.Text;
+            get => SpriteText?.Text ?? default;
             set
             {
                 if (SpriteText != null)
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 7bdeacc91a..cd7c1c449f 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Select
 
         public LocalisableString Text
         {
-            get => SpriteText.Text;
+            get => SpriteText?.Text ?? default;
             set
             {
                 if (SpriteText != null)

From 63d48f0c7d786ea069da6ac88fcc1d7e053356e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:06:29 +0900
Subject: [PATCH 08320/10326] Fix incorrect unicode/romanised string order

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index e6d73c6e83..a86699a9b5 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -75,8 +75,8 @@ namespace osu.Game.Tournament.Components
                         new TournamentSpriteText
                         {
                             Text = new RomanisableString(
-                                $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
-                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}"),
+                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}",
+                                $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}"),
                             Font = OsuFont.Torus.With(weight: FontWeight.Bold),
                         },
                         new FillFlowContainer

From 4cdde422280004f4013124ba29a78cf871f52bc0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:08:01 +0900
Subject: [PATCH 08321/10326] Remove unnecessary backing field

---
 osu.Game/Overlays/Chat/Selection/ChannelSection.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Chat/Selection/ChannelSection.cs b/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
index e18302770c..537ac975ac 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
@@ -15,8 +15,6 @@ namespace osu.Game.Overlays.Chat.Selection
 {
     public class ChannelSection : Container, IHasFilterableChildren
     {
-        private readonly OsuSpriteText header;
-
         public readonly FillFlowContainer<ChannelListItem> ChannelFlow;
 
         public IEnumerable<IFilterable> FilterableChildren => ChannelFlow.Children;
@@ -41,7 +39,7 @@ namespace osu.Game.Overlays.Chat.Selection
 
             Children = new Drawable[]
             {
-                header = new OsuSpriteText
+                new OsuSpriteText
                 {
                     Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold),
                     Text = "All Channels".ToUpperInvariant()

From e82eaffaed6097e59262aa6106b4784edcb29157 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:12:59 +0900
Subject: [PATCH 08322/10326] Flip order back to original for romanisable
 strings

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs    | 4 ++--
 osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs | 4 ++--
 osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs | 4 ++--
 osu.Game/Overlays/Music/PlaylistItem.cs                     | 4 ++--
 osu.Game/Overlays/NowPlayingOverlay.cs                      | 4 ++--
 .../Sections/Historical/DrawableMostPlayedBeatmap.cs        | 6 +++---
 .../Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs | 6 +++---
 osu.Game/Screens/Menu/SongTicker.cs                         | 4 ++--
 osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs      | 4 ++--
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs             | 4 ++--
 .../Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs  | 4 ++--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs                 | 4 ++--
 osu.Game/Screens/Select/Carousel/SetPanelContent.cs         | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index a86699a9b5..e6d73c6e83 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -75,8 +75,8 @@ namespace osu.Game.Tournament.Components
                         new TournamentSpriteText
                         {
                             Text = new RomanisableString(
-                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}",
-                                $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}"),
+                                $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
+                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}"),
                             Font = OsuFont.Torus.With(weight: FontWeight.Bold),
                         },
                         new FillFlowContainer
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index ba4725b49a..4d5c387c4a 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -84,14 +84,14 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                     {
                                         new OsuSpriteText
                                         {
-                                            Text = new RomanisableString(SetInfo.Metadata.Title, SetInfo.Metadata.TitleUnicode),
+                                            Text = new RomanisableString(SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title),
                                             Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
                                         },
                                     }
                                 },
                                 new OsuSpriteText
                                 {
-                                    Text = new RomanisableString(SetInfo.Metadata.Artist, SetInfo.Metadata.ArtistUnicode),
+                                    Text = new RomanisableString(SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist),
                                     Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
                                 },
                             },
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 624cb89d1e..00ffd168c1 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -107,14 +107,14 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                                             {
                                                                 new OsuSpriteText
                                                                 {
-                                                                    Text = new RomanisableString(SetInfo.Metadata.Title, SetInfo.Metadata.TitleUnicode),
+                                                                    Text = new RomanisableString(SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title),
                                                                     Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
                                                                 },
                                                             }
                                                         },
                                                         new OsuSpriteText
                                                         {
-                                                            Text = new RomanisableString(SetInfo.Metadata.Artist, SetInfo.Metadata.ArtistUnicode),
+                                                            Text = new RomanisableString(SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist),
                                                             Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
                                                         },
                                                     }
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index dab9bc9629..571b14428e 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -48,8 +48,8 @@ namespace osu.Game.Overlays.Music
             artistColour = colours.Gray9;
             HandleColour = colours.Gray5;
 
-            title = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.Title, Model.Metadata.TitleUnicode));
-            artist = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.Artist, Model.Metadata.ArtistUnicode));
+            title = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.TitleUnicode, Model.Metadata.Title));
+            artist = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.ArtistUnicode, Model.Metadata.Artist));
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 9c17392e25..81bf71cdec 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -293,8 +293,8 @@ namespace osu.Game.Overlays
                     else
                     {
                         BeatmapMetadata metadata = beatmap.Metadata;
-                        title.Text = new RomanisableString(metadata.Title, metadata.TitleUnicode);
-                        artist.Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode);
+                        title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
+                        artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
                     }
                 });
 
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index 48a0481b9e..20e40569e8 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -130,13 +130,13 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 new OsuSpriteText
                 {
                     Text = new RomanisableString(
-                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] ",
-                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] "),
+                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] ",
+                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] "),
                     Font = OsuFont.GetFont(weight: FontWeight.Bold)
                 },
                 new OsuSpriteText
                 {
-                    Text = "by " + new RomanisableString(beatmap.Metadata.Artist, beatmap.Metadata.ArtistUnicode),
+                    Text = "by " + new RomanisableString(beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist),
                     Font = OsuFont.GetFont(weight: FontWeight.Regular)
                 },
             };
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index ca9e19cd56..713303285a 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -257,15 +257,15 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     Text = new RomanisableString(
-                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} ",
-                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} "),
+                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} ",
+                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} "),
                     Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold, italics: true)
                 },
                 new OsuSpriteText
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
-                    Text = "by " + new RomanisableString(beatmap.Metadata.Artist, beatmap.Metadata.ArtistUnicode),
+                    Text = "by " + new RomanisableString(beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist),
                     Font = OsuFont.GetFont(size: 12, italics: true)
                 },
             };
diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index 2be446d71a..237fe43168 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -61,8 +61,8 @@ namespace osu.Game.Screens.Menu
         {
             var metadata = beatmap.Value.Metadata;
 
-            title.Text = new RomanisableString(metadata.Title, metadata.TitleUnicode);
-            artist.Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode);
+            title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
+            artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
 
             this.FadeInFromZero(fade_duration / 2f)
                 .Delay(4000)
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index 299e3e3768..e5a5e35897 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                 {
                     new OsuSpriteText
                     {
-                        Text = new RomanisableString(beatmap.Value.Metadata.Artist, beatmap.Value.Metadata.ArtistUnicode),
+                        Text = new RomanisableString(beatmap.Value.Metadata.ArtistUnicode, beatmap.Value.Metadata.Artist),
                         Font = OsuFont.GetFont(size: TextSize),
                     },
                     new OsuSpriteText
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                     },
                     new OsuSpriteText
                     {
-                        Text = new RomanisableString(beatmap.Value.Metadata.Title, beatmap.Value.Metadata.TitleUnicode),
+                        Text = new RomanisableString(beatmap.Value.Metadata.TitleUnicode, beatmap.Value.Metadata.Title),
                         Font = OsuFont.GetFont(size: TextSize),
                     }
                 }, LinkAction.OpenBeatmap, beatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap");
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 0779a9c637..c56344a8fb 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Play
                         }),
                         new OsuSpriteText
                         {
-                            Text = new RomanisableString(metadata.Title, metadata.TitleUnicode),
+                            Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
                             Font = OsuFont.GetFont(size: 36, italics: true),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Play
                         },
                         new OsuSpriteText
                         {
-                            Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode),
+                            Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
                             Font = OsuFont.GetFont(size: 26, italics: true),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 234e4f2023..6a6b39b61c 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 {
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
-                                    Text = new RomanisableString(metadata.Title, metadata.TitleUnicode),
+                                    Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
                                     Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                     MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
                                     Truncate = true,
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 {
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
-                                    Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode),
+                                    Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
                                     Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
                                     MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
                                     Truncate = true,
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 0c5b67026c..1c1623e334 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -187,8 +187,8 @@ namespace osu.Game.Screens.Select
 
                 RelativeSizeAxes = Axes.Both;
 
-                titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.Title, metadata.TitleUnicode));
-                artistBinding = localisation.GetLocalisedString(new RomanisableString(metadata.Artist, metadata.ArtistUnicode));
+                titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
+                artistBinding = localisation.GetLocalisedString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
 
                 Children = new Drawable[]
                 {
diff --git a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
index 0e99a4ce70..23a02547b2 100644
--- a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
+++ b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
@@ -41,13 +41,13 @@ namespace osu.Game.Screens.Select.Carousel
                 {
                     new OsuSpriteText
                     {
-                        Text = new RomanisableString(beatmapSet.Metadata.Title, beatmapSet.Metadata.TitleUnicode),
+                        Text = new RomanisableString(beatmapSet.Metadata.TitleUnicode, beatmapSet.Metadata.Title),
                         Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 22, italics: true),
                         Shadow = true,
                     },
                     new OsuSpriteText
                     {
-                        Text = new RomanisableString(beatmapSet.Metadata.Artist, beatmapSet.Metadata.ArtistUnicode),
+                        Text = new RomanisableString(beatmapSet.Metadata.ArtistUnicode, beatmapSet.Metadata.Artist),
                         Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
                         Shadow = true,
                     },

From a08a3d44c796bafb3fac49b8612869b3f8131bd8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:51:23 +0900
Subject: [PATCH 08323/10326] Add failing test coverage for using hotkeys from
 main menu before toolbar displayed

---
 .../Navigation/TestSceneScreenNavigation.cs       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 5d070b424a..fc49517cdf 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -214,6 +214,21 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("Options overlay still visible", () => songSelect.BeatmapOptionsOverlay.State.Value == Visibility.Visible);
         }
 
+        [Test]
+        public void TestSettingsViaHotkeyFromMainMenu()
+        {
+            AddAssert("toolbar not displayed", () => Game.Toolbar.State.Value == Visibility.Hidden);
+
+            AddStep("press settings hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.O);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+
+            AddUntilStep("settings displayed", () => Game.Settings.State.Value == Visibility.Visible);
+        }
+
         private void pushEscape() =>
             AddStep("Press escape", () => InputManager.Key(Key.Escape));
 

From 2c8e62ae3589a28fd00dd68a72c20e38f53ca60b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:52:51 +0900
Subject: [PATCH 08324/10326] Fix toolbar not completing enough of layout to
 propagate hotkeys to buttons before initial display

---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 393e349bd0..0ccb22df3a 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -37,6 +37,15 @@ namespace osu.Game.Overlays.Toolbar
         {
             RelativeSizeAxes = Axes.X;
             Size = new Vector2(1, HEIGHT);
+            AlwaysPresent = true;
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            // this only needed to be set for the initial LoadComplete/Update, so layout completes and gets buttons in a state they can correctly handle keyboard input for hotkeys.
+            AlwaysPresent = false;
         }
 
         [BackgroundDependencyLoader(true)]

From 154dc03a8c9f3c0eb4b880cc9c25f0baaf0939a0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 15:31:50 +0900
Subject: [PATCH 08325/10326] Update analyser package

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 2e1873a9ed..53ad973e47 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,7 +18,7 @@
   <ItemGroup Label="Code Analysis">
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup Label="Code Analysis">
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis\osu.ruleset</CodeAnalysisRuleSet>

From 996b6a1e57c639617fa4f6d897b75dd3fbe47845 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 15:38:43 +0900
Subject: [PATCH 08326/10326] Add Enum.HasFlag to banned symbols

---
 .editorconfig                  | 5 ++++-
 CodeAnalysis/BannedSymbols.txt | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index a5f7795882..0cdf3b92d3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -194,4 +194,7 @@ dotnet_diagnostic.IDE0068.severity = none
 dotnet_diagnostic.IDE0069.severity = none
 
 #Disable operator overloads requiring alternate named methods
-dotnet_diagnostic.CA2225.severity = none
\ No newline at end of file
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
\ No newline at end of file
diff --git a/CodeAnalysis/BannedSymbols.txt b/CodeAnalysis/BannedSymbols.txt
index 47839608c9..60cce39176 100644
--- a/CodeAnalysis/BannedSymbols.txt
+++ b/CodeAnalysis/BannedSymbols.txt
@@ -7,3 +7,4 @@ M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
 M:osu.Framework.Bindables.IBindableList`1.GetBoundCopy();Fails on iOS. Use manual ctor + BindTo instead. (see https://github.com/mono/mono/issues/19900)
 T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
 T:Microsoft.EntityFrameworkCore.Internal.TypeExtensions;Don't use internal extension methods.
+M:System.Enum.HasFlagFast(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
\ No newline at end of file

From dff1d80f3943c705cb4dfdb8b67123b5e80e1592 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 15:38:56 +0900
Subject: [PATCH 08327/10326] Update HasFlag usages to HasFlagFast

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       | 27 +++++-----
 .../TestSceneNotes.cs                         |  3 +-
 .../Legacy/DistanceObjectPatternGenerator.cs  | 17 ++++---
 .../Legacy/HitObjectPatternGenerator.cs       | 33 ++++++------
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 51 ++++++++++---------
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 35 ++++++-------
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       | 29 ++++++-----
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  |  5 +-
 osu.Game/Graphics/UserInterface/BarGraph.cs   |  9 ++--
 .../Graphics/UserInterface/TwoLayerButton.cs  | 11 ++--
 osu.Game/Overlays/Toolbar/ToolbarButton.cs    |  5 +-
 osu.Game/Replays/Legacy/LegacyReplayFrame.cs  |  9 ++--
 .../Objects/Legacy/ConvertHitObjectParser.cs  | 19 +++----
 .../Drawables/DrawableStoryboardAnimation.cs  |  9 ++--
 .../Drawables/DrawableStoryboardSprite.cs     |  9 ++--
 15 files changed, 143 insertions(+), 128 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 0a817eca0d..f4ddbd3021 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using System;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Rulesets.Catch.Skinning.Legacy;
 using osu.Game.Skinning;
 
@@ -50,40 +51,40 @@ namespace osu.Game.Rulesets.Catch
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
-            if (mods.HasFlag(LegacyMods.Nightcore))
+            if (mods.HasFlagFast(LegacyMods.Nightcore))
                 yield return new CatchModNightcore();
-            else if (mods.HasFlag(LegacyMods.DoubleTime))
+            else if (mods.HasFlagFast(LegacyMods.DoubleTime))
                 yield return new CatchModDoubleTime();
 
-            if (mods.HasFlag(LegacyMods.Perfect))
+            if (mods.HasFlagFast(LegacyMods.Perfect))
                 yield return new CatchModPerfect();
-            else if (mods.HasFlag(LegacyMods.SuddenDeath))
+            else if (mods.HasFlagFast(LegacyMods.SuddenDeath))
                 yield return new CatchModSuddenDeath();
 
-            if (mods.HasFlag(LegacyMods.Cinema))
+            if (mods.HasFlagFast(LegacyMods.Cinema))
                 yield return new CatchModCinema();
-            else if (mods.HasFlag(LegacyMods.Autoplay))
+            else if (mods.HasFlagFast(LegacyMods.Autoplay))
                 yield return new CatchModAutoplay();
 
-            if (mods.HasFlag(LegacyMods.Easy))
+            if (mods.HasFlagFast(LegacyMods.Easy))
                 yield return new CatchModEasy();
 
-            if (mods.HasFlag(LegacyMods.Flashlight))
+            if (mods.HasFlagFast(LegacyMods.Flashlight))
                 yield return new CatchModFlashlight();
 
-            if (mods.HasFlag(LegacyMods.HalfTime))
+            if (mods.HasFlagFast(LegacyMods.HalfTime))
                 yield return new CatchModHalfTime();
 
-            if (mods.HasFlag(LegacyMods.HardRock))
+            if (mods.HasFlagFast(LegacyMods.HardRock))
                 yield return new CatchModHardRock();
 
-            if (mods.HasFlag(LegacyMods.Hidden))
+            if (mods.HasFlagFast(LegacyMods.Hidden))
                 yield return new CatchModHidden();
 
-            if (mods.HasFlag(LegacyMods.NoFail))
+            if (mods.HasFlagFast(LegacyMods.NoFail))
                 yield return new CatchModNoFail();
 
-            if (mods.HasFlag(LegacyMods.Relax))
+            if (mods.HasFlagFast(LegacyMods.Relax))
                 yield return new CatchModRelax();
         }
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 6b8f5d5d9d..706268e478 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -97,7 +98,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         }
 
         private bool verifyAnchors(DrawableHitObject hitObject, Anchor expectedAnchor)
-            => hitObject.Anchor.HasFlag(expectedAnchor) && hitObject.Origin.HasFlag(expectedAnchor);
+            => hitObject.Anchor.HasFlagFast(expectedAnchor) && hitObject.Origin.HasFlagFast(expectedAnchor);
 
         private bool verifyAnchors(DrawableHoldNote holdNote, Anchor expectedAnchor)
             => verifyAnchors((DrawableHitObject)holdNote, expectedAnchor) && holdNote.NestedHitObjects.All(n => verifyAnchors(n, expectedAnchor));
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 30d33de06e..c81710ed18 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.MathUtils;
@@ -141,7 +142,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (ConversionDifficulty > 6.5)
             {
-                if (convertType.HasFlag(PatternType.LowProbability))
+                if (convertType.HasFlagFast(PatternType.LowProbability))
                     return generateNRandomNotes(StartTime, 0.78, 0.3, 0);
 
                 return generateNRandomNotes(StartTime, 0.85, 0.36, 0.03);
@@ -149,7 +150,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (ConversionDifficulty > 4)
             {
-                if (convertType.HasFlag(PatternType.LowProbability))
+                if (convertType.HasFlagFast(PatternType.LowProbability))
                     return generateNRandomNotes(StartTime, 0.43, 0.08, 0);
 
                 return generateNRandomNotes(StartTime, 0.56, 0.18, 0);
@@ -157,13 +158,13 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (ConversionDifficulty > 2.5)
             {
-                if (convertType.HasFlag(PatternType.LowProbability))
+                if (convertType.HasFlagFast(PatternType.LowProbability))
                     return generateNRandomNotes(StartTime, 0.3, 0, 0);
 
                 return generateNRandomNotes(StartTime, 0.37, 0.08, 0);
             }
 
-            if (convertType.HasFlag(PatternType.LowProbability))
+            if (convertType.HasFlagFast(PatternType.LowProbability))
                 return generateNRandomNotes(StartTime, 0.17, 0, 0);
 
             return generateNRandomNotes(StartTime, 0.27, 0, 0);
@@ -221,7 +222,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             var pattern = new Pattern();
 
             int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
-            if (convertType.HasFlag(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
+            if (convertType.HasFlagFast(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
                 nextColumn = FindAvailableColumn(nextColumn, PreviousPattern);
 
             int lastColumn = nextColumn;
@@ -373,7 +374,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             static bool isDoubleSample(HitSampleInfo sample) => sample.Name == HitSampleInfo.HIT_CLAP || sample.Name == HitSampleInfo.HIT_FINISH;
 
-            bool canGenerateTwoNotes = !convertType.HasFlag(PatternType.LowProbability);
+            bool canGenerateTwoNotes = !convertType.HasFlagFast(PatternType.LowProbability);
             canGenerateTwoNotes &= HitObject.Samples.Any(isDoubleSample) || sampleInfoListAt(StartTime).Any(isDoubleSample);
 
             if (canGenerateTwoNotes)
@@ -406,7 +407,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             int endTime = startTime + SegmentDuration * SpanCount;
 
             int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
-            if (convertType.HasFlag(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
+            if (convertType.HasFlagFast(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
                 nextColumn = FindAvailableColumn(nextColumn, PreviousPattern);
 
             for (int i = 0; i < columnRepeat; i++)
@@ -435,7 +436,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             var pattern = new Pattern();
 
             int holdColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
-            if (convertType.HasFlag(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
+            if (convertType.HasFlagFast(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
                 holdColumn = FindAvailableColumn(holdColumn, PreviousPattern);
 
             // Create the hold note
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index bc4ab55767..8e9020ee13 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osuTK;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -78,7 +79,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             else
                 convertType |= PatternType.LowProbability;
 
-            if (!convertType.HasFlag(PatternType.KeepSingle))
+            if (!convertType.HasFlagFast(PatternType.KeepSingle))
             {
                 if (HitObject.Samples.Any(s => s.Name == HitSampleInfo.HIT_FINISH) && TotalColumns != 8)
                     convertType |= PatternType.Mirror;
@@ -101,7 +102,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 int lastColumn = PreviousPattern.HitObjects.FirstOrDefault()?.Column ?? 0;
 
-                if (convertType.HasFlag(PatternType.Reverse) && PreviousPattern.HitObjects.Any())
+                if (convertType.HasFlagFast(PatternType.Reverse) && PreviousPattern.HitObjects.Any())
                 {
                     // Generate a new pattern by copying the last hit objects in reverse-column order
                     for (int i = RandomStart; i < TotalColumns; i++)
@@ -113,7 +114,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     return pattern;
                 }
 
-                if (convertType.HasFlag(PatternType.Cycle) && PreviousPattern.HitObjects.Count() == 1
+                if (convertType.HasFlagFast(PatternType.Cycle) && PreviousPattern.HitObjects.Count() == 1
                                                            // If we convert to 7K + 1, let's not overload the special key
                                                            && (TotalColumns != 8 || lastColumn != 0)
                                                            // Make sure the last column was not the centre column
@@ -126,7 +127,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     return pattern;
                 }
 
-                if (convertType.HasFlag(PatternType.ForceStack) && PreviousPattern.HitObjects.Any())
+                if (convertType.HasFlagFast(PatternType.ForceStack) && PreviousPattern.HitObjects.Any())
                 {
                     // Generate a new pattern by placing on the already filled columns
                     for (int i = RandomStart; i < TotalColumns; i++)
@@ -140,7 +141,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 if (PreviousPattern.HitObjects.Count() == 1)
                 {
-                    if (convertType.HasFlag(PatternType.Stair))
+                    if (convertType.HasFlagFast(PatternType.Stair))
                     {
                         // Generate a new pattern by placing on the next column, cycling back to the start if there is no "next"
                         int targetColumn = lastColumn + 1;
@@ -151,7 +152,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                         return pattern;
                     }
 
-                    if (convertType.HasFlag(PatternType.ReverseStair))
+                    if (convertType.HasFlagFast(PatternType.ReverseStair))
                     {
                         // Generate a new pattern by placing on the previous column, cycling back to the end if there is no "previous"
                         int targetColumn = lastColumn - 1;
@@ -163,10 +164,10 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     }
                 }
 
-                if (convertType.HasFlag(PatternType.KeepSingle))
+                if (convertType.HasFlagFast(PatternType.KeepSingle))
                     return generateRandomNotes(1);
 
-                if (convertType.HasFlag(PatternType.Mirror))
+                if (convertType.HasFlagFast(PatternType.Mirror))
                 {
                     if (ConversionDifficulty > 6.5)
                         return generateRandomPatternWithMirrored(0.12, 0.38, 0.12);
@@ -178,7 +179,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 if (ConversionDifficulty > 6.5)
                 {
-                    if (convertType.HasFlag(PatternType.LowProbability))
+                    if (convertType.HasFlagFast(PatternType.LowProbability))
                         return generateRandomPattern(0.78, 0.42, 0, 0);
 
                     return generateRandomPattern(1, 0.62, 0, 0);
@@ -186,7 +187,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 if (ConversionDifficulty > 4)
                 {
-                    if (convertType.HasFlag(PatternType.LowProbability))
+                    if (convertType.HasFlagFast(PatternType.LowProbability))
                         return generateRandomPattern(0.35, 0.08, 0, 0);
 
                     return generateRandomPattern(0.52, 0.15, 0, 0);
@@ -194,7 +195,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 if (ConversionDifficulty > 2)
                 {
-                    if (convertType.HasFlag(PatternType.LowProbability))
+                    if (convertType.HasFlagFast(PatternType.LowProbability))
                         return generateRandomPattern(0.18, 0, 0, 0);
 
                     return generateRandomPattern(0.45, 0, 0, 0);
@@ -207,9 +208,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             foreach (var obj in p.HitObjects)
             {
-                if (convertType.HasFlag(PatternType.Stair) && obj.Column == TotalColumns - 1)
+                if (convertType.HasFlagFast(PatternType.Stair) && obj.Column == TotalColumns - 1)
                     StairType = PatternType.ReverseStair;
-                if (convertType.HasFlag(PatternType.ReverseStair) && obj.Column == RandomStart)
+                if (convertType.HasFlagFast(PatternType.ReverseStair) && obj.Column == RandomStart)
                     StairType = PatternType.Stair;
             }
 
@@ -229,7 +230,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         {
             var pattern = new Pattern();
 
-            bool allowStacking = !convertType.HasFlag(PatternType.ForceNotStack);
+            bool allowStacking = !convertType.HasFlagFast(PatternType.ForceNotStack);
 
             if (!allowStacking)
                 noteCount = Math.Min(noteCount, TotalColumns - RandomStart - PreviousPattern.ColumnWithObjects);
@@ -249,7 +250,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             int getNextColumn(int last)
             {
-                if (convertType.HasFlag(PatternType.Gathered))
+                if (convertType.HasFlagFast(PatternType.Gathered))
                 {
                     last++;
                     if (last == TotalColumns)
@@ -296,7 +297,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
         private Pattern generateRandomPatternWithMirrored(double centreProbability, double p2, double p3)
         {
-            if (convertType.HasFlag(PatternType.ForceNotStack))
+            if (convertType.HasFlagFast(PatternType.ForceNotStack))
                 return generateRandomPattern(1 / 2f + p2 / 2, p2, (p2 + p3) / 2, p3);
 
             var pattern = new Pattern();
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 4c729fef83..d624e094ad 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
@@ -59,76 +60,76 @@ namespace osu.Game.Rulesets.Mania
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
-            if (mods.HasFlag(LegacyMods.Nightcore))
+            if (mods.HasFlagFast(LegacyMods.Nightcore))
                 yield return new ManiaModNightcore();
-            else if (mods.HasFlag(LegacyMods.DoubleTime))
+            else if (mods.HasFlagFast(LegacyMods.DoubleTime))
                 yield return new ManiaModDoubleTime();
 
-            if (mods.HasFlag(LegacyMods.Perfect))
+            if (mods.HasFlagFast(LegacyMods.Perfect))
                 yield return new ManiaModPerfect();
-            else if (mods.HasFlag(LegacyMods.SuddenDeath))
+            else if (mods.HasFlagFast(LegacyMods.SuddenDeath))
                 yield return new ManiaModSuddenDeath();
 
-            if (mods.HasFlag(LegacyMods.Cinema))
+            if (mods.HasFlagFast(LegacyMods.Cinema))
                 yield return new ManiaModCinema();
-            else if (mods.HasFlag(LegacyMods.Autoplay))
+            else if (mods.HasFlagFast(LegacyMods.Autoplay))
                 yield return new ManiaModAutoplay();
 
-            if (mods.HasFlag(LegacyMods.Easy))
+            if (mods.HasFlagFast(LegacyMods.Easy))
                 yield return new ManiaModEasy();
 
-            if (mods.HasFlag(LegacyMods.FadeIn))
+            if (mods.HasFlagFast(LegacyMods.FadeIn))
                 yield return new ManiaModFadeIn();
 
-            if (mods.HasFlag(LegacyMods.Flashlight))
+            if (mods.HasFlagFast(LegacyMods.Flashlight))
                 yield return new ManiaModFlashlight();
 
-            if (mods.HasFlag(LegacyMods.HalfTime))
+            if (mods.HasFlagFast(LegacyMods.HalfTime))
                 yield return new ManiaModHalfTime();
 
-            if (mods.HasFlag(LegacyMods.HardRock))
+            if (mods.HasFlagFast(LegacyMods.HardRock))
                 yield return new ManiaModHardRock();
 
-            if (mods.HasFlag(LegacyMods.Hidden))
+            if (mods.HasFlagFast(LegacyMods.Hidden))
                 yield return new ManiaModHidden();
 
-            if (mods.HasFlag(LegacyMods.Key1))
+            if (mods.HasFlagFast(LegacyMods.Key1))
                 yield return new ManiaModKey1();
 
-            if (mods.HasFlag(LegacyMods.Key2))
+            if (mods.HasFlagFast(LegacyMods.Key2))
                 yield return new ManiaModKey2();
 
-            if (mods.HasFlag(LegacyMods.Key3))
+            if (mods.HasFlagFast(LegacyMods.Key3))
                 yield return new ManiaModKey3();
 
-            if (mods.HasFlag(LegacyMods.Key4))
+            if (mods.HasFlagFast(LegacyMods.Key4))
                 yield return new ManiaModKey4();
 
-            if (mods.HasFlag(LegacyMods.Key5))
+            if (mods.HasFlagFast(LegacyMods.Key5))
                 yield return new ManiaModKey5();
 
-            if (mods.HasFlag(LegacyMods.Key6))
+            if (mods.HasFlagFast(LegacyMods.Key6))
                 yield return new ManiaModKey6();
 
-            if (mods.HasFlag(LegacyMods.Key7))
+            if (mods.HasFlagFast(LegacyMods.Key7))
                 yield return new ManiaModKey7();
 
-            if (mods.HasFlag(LegacyMods.Key8))
+            if (mods.HasFlagFast(LegacyMods.Key8))
                 yield return new ManiaModKey8();
 
-            if (mods.HasFlag(LegacyMods.Key9))
+            if (mods.HasFlagFast(LegacyMods.Key9))
                 yield return new ManiaModKey9();
 
-            if (mods.HasFlag(LegacyMods.KeyCoop))
+            if (mods.HasFlagFast(LegacyMods.KeyCoop))
                 yield return new ManiaModDualStages();
 
-            if (mods.HasFlag(LegacyMods.NoFail))
+            if (mods.HasFlagFast(LegacyMods.NoFail))
                 yield return new ManiaModNoFail();
 
-            if (mods.HasFlag(LegacyMods.Random))
+            if (mods.HasFlagFast(LegacyMods.Random))
                 yield return new ManiaModRandom();
 
-            if (mods.HasFlag(LegacyMods.Mirror))
+            if (mods.HasFlagFast(LegacyMods.Mirror))
                 yield return new ManiaModMirror();
         }
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 18324a18a8..838d707d64 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -29,6 +29,7 @@ using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Rulesets.Osu.Statistics;
@@ -58,52 +59,52 @@ namespace osu.Game.Rulesets.Osu
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
-            if (mods.HasFlag(LegacyMods.Nightcore))
+            if (mods.HasFlagFast(LegacyMods.Nightcore))
                 yield return new OsuModNightcore();
-            else if (mods.HasFlag(LegacyMods.DoubleTime))
+            else if (mods.HasFlagFast(LegacyMods.DoubleTime))
                 yield return new OsuModDoubleTime();
 
-            if (mods.HasFlag(LegacyMods.Perfect))
+            if (mods.HasFlagFast(LegacyMods.Perfect))
                 yield return new OsuModPerfect();
-            else if (mods.HasFlag(LegacyMods.SuddenDeath))
+            else if (mods.HasFlagFast(LegacyMods.SuddenDeath))
                 yield return new OsuModSuddenDeath();
 
-            if (mods.HasFlag(LegacyMods.Autopilot))
+            if (mods.HasFlagFast(LegacyMods.Autopilot))
                 yield return new OsuModAutopilot();
 
-            if (mods.HasFlag(LegacyMods.Cinema))
+            if (mods.HasFlagFast(LegacyMods.Cinema))
                 yield return new OsuModCinema();
-            else if (mods.HasFlag(LegacyMods.Autoplay))
+            else if (mods.HasFlagFast(LegacyMods.Autoplay))
                 yield return new OsuModAutoplay();
 
-            if (mods.HasFlag(LegacyMods.Easy))
+            if (mods.HasFlagFast(LegacyMods.Easy))
                 yield return new OsuModEasy();
 
-            if (mods.HasFlag(LegacyMods.Flashlight))
+            if (mods.HasFlagFast(LegacyMods.Flashlight))
                 yield return new OsuModFlashlight();
 
-            if (mods.HasFlag(LegacyMods.HalfTime))
+            if (mods.HasFlagFast(LegacyMods.HalfTime))
                 yield return new OsuModHalfTime();
 
-            if (mods.HasFlag(LegacyMods.HardRock))
+            if (mods.HasFlagFast(LegacyMods.HardRock))
                 yield return new OsuModHardRock();
 
-            if (mods.HasFlag(LegacyMods.Hidden))
+            if (mods.HasFlagFast(LegacyMods.Hidden))
                 yield return new OsuModHidden();
 
-            if (mods.HasFlag(LegacyMods.NoFail))
+            if (mods.HasFlagFast(LegacyMods.NoFail))
                 yield return new OsuModNoFail();
 
-            if (mods.HasFlag(LegacyMods.Relax))
+            if (mods.HasFlagFast(LegacyMods.Relax))
                 yield return new OsuModRelax();
 
-            if (mods.HasFlag(LegacyMods.SpunOut))
+            if (mods.HasFlagFast(LegacyMods.SpunOut))
                 yield return new OsuModSpunOut();
 
-            if (mods.HasFlag(LegacyMods.Target))
+            if (mods.HasFlagFast(LegacyMods.Target))
                 yield return new OsuModTarget();
 
-            if (mods.HasFlag(LegacyMods.TouchDevice))
+            if (mods.HasFlagFast(LegacyMods.TouchDevice))
                 yield return new OsuModTouchDevice();
         }
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index f2b5d195b4..56f58f404b 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Scoring;
 using System;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Taiko.Edit;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -57,43 +58,43 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
-            if (mods.HasFlag(LegacyMods.Nightcore))
+            if (mods.HasFlagFast(LegacyMods.Nightcore))
                 yield return new TaikoModNightcore();
-            else if (mods.HasFlag(LegacyMods.DoubleTime))
+            else if (mods.HasFlagFast(LegacyMods.DoubleTime))
                 yield return new TaikoModDoubleTime();
 
-            if (mods.HasFlag(LegacyMods.Perfect))
+            if (mods.HasFlagFast(LegacyMods.Perfect))
                 yield return new TaikoModPerfect();
-            else if (mods.HasFlag(LegacyMods.SuddenDeath))
+            else if (mods.HasFlagFast(LegacyMods.SuddenDeath))
                 yield return new TaikoModSuddenDeath();
 
-            if (mods.HasFlag(LegacyMods.Cinema))
+            if (mods.HasFlagFast(LegacyMods.Cinema))
                 yield return new TaikoModCinema();
-            else if (mods.HasFlag(LegacyMods.Autoplay))
+            else if (mods.HasFlagFast(LegacyMods.Autoplay))
                 yield return new TaikoModAutoplay();
 
-            if (mods.HasFlag(LegacyMods.Easy))
+            if (mods.HasFlagFast(LegacyMods.Easy))
                 yield return new TaikoModEasy();
 
-            if (mods.HasFlag(LegacyMods.Flashlight))
+            if (mods.HasFlagFast(LegacyMods.Flashlight))
                 yield return new TaikoModFlashlight();
 
-            if (mods.HasFlag(LegacyMods.HalfTime))
+            if (mods.HasFlagFast(LegacyMods.HalfTime))
                 yield return new TaikoModHalfTime();
 
-            if (mods.HasFlag(LegacyMods.HardRock))
+            if (mods.HasFlagFast(LegacyMods.HardRock))
                 yield return new TaikoModHardRock();
 
-            if (mods.HasFlag(LegacyMods.Hidden))
+            if (mods.HasFlagFast(LegacyMods.Hidden))
                 yield return new TaikoModHidden();
 
-            if (mods.HasFlag(LegacyMods.NoFail))
+            if (mods.HasFlagFast(LegacyMods.NoFail))
                 yield return new TaikoModNoFail();
 
-            if (mods.HasFlag(LegacyMods.Relax))
+            if (mods.HasFlagFast(LegacyMods.Relax))
                 yield return new TaikoModRelax();
 
-            if (mods.HasFlag(LegacyMods.Random))
+            if (mods.HasFlagFast(LegacyMods.Random))
                 yield return new TaikoModRandom();
         }
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 37ab489da5..99dffa7041 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Beatmaps.Timing;
@@ -348,8 +349,8 @@ namespace osu.Game.Beatmaps.Formats
             if (split.Length >= 8)
             {
                 LegacyEffectFlags effectFlags = (LegacyEffectFlags)Parsing.ParseInt(split[7]);
-                kiaiMode = effectFlags.HasFlag(LegacyEffectFlags.Kiai);
-                omitFirstBarSignature = effectFlags.HasFlag(LegacyEffectFlags.OmitFirstBarLine);
+                kiaiMode = effectFlags.HasFlagFast(LegacyEffectFlags.Kiai);
+                omitFirstBarSignature = effectFlags.HasFlagFast(LegacyEffectFlags.OmitFirstBarLine);
             }
 
             string stringSampleSet = sampleSet.ToString().ToLowerInvariant();
diff --git a/osu.Game/Graphics/UserInterface/BarGraph.cs b/osu.Game/Graphics/UserInterface/BarGraph.cs
index 953f3985f9..407bf6a923 100644
--- a/osu.Game/Graphics/UserInterface/BarGraph.cs
+++ b/osu.Game/Graphics/UserInterface/BarGraph.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -24,11 +25,11 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 direction = value;
-                base.Direction = direction.HasFlag(BarDirection.Horizontal) ? FillDirection.Vertical : FillDirection.Horizontal;
+                base.Direction = direction.HasFlagFast(BarDirection.Horizontal) ? FillDirection.Vertical : FillDirection.Horizontal;
 
                 foreach (var bar in Children)
                 {
-                    bar.Size = direction.HasFlag(BarDirection.Horizontal) ? new Vector2(1, 1.0f / Children.Count) : new Vector2(1.0f / Children.Count, 1);
+                    bar.Size = direction.HasFlagFast(BarDirection.Horizontal) ? new Vector2(1, 1.0f / Children.Count) : new Vector2(1.0f / Children.Count, 1);
                     bar.Direction = direction;
                 }
             }
@@ -56,14 +57,14 @@ namespace osu.Game.Graphics.UserInterface
                     if (bar.Bar != null)
                     {
                         bar.Bar.Length = length;
-                        bar.Bar.Size = direction.HasFlag(BarDirection.Horizontal) ? new Vector2(1, size) : new Vector2(size, 1);
+                        bar.Bar.Size = direction.HasFlagFast(BarDirection.Horizontal) ? new Vector2(1, size) : new Vector2(size, 1);
                     }
                     else
                     {
                         Add(new Bar
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Size = direction.HasFlag(BarDirection.Horizontal) ? new Vector2(1, size) : new Vector2(size, 1),
+                            Size = direction.HasFlagFast(BarDirection.Horizontal) ? new Vector2(1, size) : new Vector2(size, 1),
                             Length = length,
                             Direction = Direction,
                         });
diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
index 120149d8c1..8f03c7073c 100644
--- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
+++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Framework.Audio.Track;
 using System;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
@@ -56,15 +57,15 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 base.Origin = value;
-                c1.Origin = c1.Anchor = value.HasFlag(Anchor.x2) ? Anchor.TopLeft : Anchor.TopRight;
-                c2.Origin = c2.Anchor = value.HasFlag(Anchor.x2) ? Anchor.TopRight : Anchor.TopLeft;
+                c1.Origin = c1.Anchor = value.HasFlagFast(Anchor.x2) ? Anchor.TopLeft : Anchor.TopRight;
+                c2.Origin = c2.Anchor = value.HasFlagFast(Anchor.x2) ? Anchor.TopRight : Anchor.TopLeft;
 
-                X = value.HasFlag(Anchor.x2) ? SIZE_RETRACTED.X * shear.X * 0.5f : 0;
+                X = value.HasFlagFast(Anchor.x2) ? SIZE_RETRACTED.X * shear.X * 0.5f : 0;
 
                 Remove(c1);
                 Remove(c2);
-                c1.Depth = value.HasFlag(Anchor.x2) ? 0 : 1;
-                c2.Depth = value.HasFlag(Anchor.x2) ? 1 : 0;
+                c1.Depth = value.HasFlagFast(Anchor.x2) ? 0 : 1;
+                c2.Depth = value.HasFlagFast(Anchor.x2) ? 1 : 0;
                 Add(c1);
                 Add(c2);
             }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 83f2bdf6cb..5939f7a42f 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Caching;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
@@ -127,9 +128,9 @@ namespace osu.Game.Overlays.Toolbar
                 {
                     Direction = FillDirection.Vertical,
                     RelativeSizeAxes = Axes.Both, // stops us being considered in parent's autosize
-                    Anchor = TooltipAnchor.HasFlag(Anchor.x0) ? Anchor.BottomLeft : Anchor.BottomRight,
+                    Anchor = TooltipAnchor.HasFlagFast(Anchor.x0) ? Anchor.BottomLeft : Anchor.BottomRight,
                     Origin = TooltipAnchor,
-                    Position = new Vector2(TooltipAnchor.HasFlag(Anchor.x0) ? 5 : -5, 5),
+                    Position = new Vector2(TooltipAnchor.HasFlagFast(Anchor.x0) ? 5 : -5, 5),
                     Alpha = 0,
                     Children = new Drawable[]
                     {
diff --git a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
index ab9ccda9b9..f6abf259e8 100644
--- a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
+++ b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
@@ -3,6 +3,7 @@
 
 using MessagePack;
 using Newtonsoft.Json;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Rulesets.Replays;
 using osuTK;
 
@@ -31,19 +32,19 @@ namespace osu.Game.Replays.Legacy
 
         [JsonIgnore]
         [IgnoreMember]
-        public bool MouseLeft1 => ButtonState.HasFlag(ReplayButtonState.Left1);
+        public bool MouseLeft1 => ButtonState.HasFlagFast(ReplayButtonState.Left1);
 
         [JsonIgnore]
         [IgnoreMember]
-        public bool MouseRight1 => ButtonState.HasFlag(ReplayButtonState.Right1);
+        public bool MouseRight1 => ButtonState.HasFlagFast(ReplayButtonState.Right1);
 
         [JsonIgnore]
         [IgnoreMember]
-        public bool MouseLeft2 => ButtonState.HasFlag(ReplayButtonState.Left2);
+        public bool MouseLeft2 => ButtonState.HasFlagFast(ReplayButtonState.Left2);
 
         [JsonIgnore]
         [IgnoreMember]
-        public bool MouseRight2 => ButtonState.HasFlag(ReplayButtonState.Right2);
+        public bool MouseRight2 => ButtonState.HasFlagFast(ReplayButtonState.Right2);
 
         [Key(3)]
         public ReplayButtonState ButtonState;
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 72025de131..8419dd66de 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -10,6 +10,7 @@ using osu.Game.Beatmaps.Formats;
 using osu.Game.Audio;
 using System.Linq;
 using JetBrains.Annotations;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Skinning;
@@ -54,7 +55,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             int comboOffset = (int)(type & LegacyHitObjectType.ComboOffset) >> 4;
             type &= ~LegacyHitObjectType.ComboOffset;
 
-            bool combo = type.HasFlag(LegacyHitObjectType.NewCombo);
+            bool combo = type.HasFlagFast(LegacyHitObjectType.NewCombo);
             type &= ~LegacyHitObjectType.NewCombo;
 
             var soundType = (LegacyHitSoundType)Parsing.ParseInt(split[4]);
@@ -62,14 +63,14 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             HitObject result = null;
 
-            if (type.HasFlag(LegacyHitObjectType.Circle))
+            if (type.HasFlagFast(LegacyHitObjectType.Circle))
             {
                 result = CreateHit(pos, combo, comboOffset);
 
                 if (split.Length > 5)
                     readCustomSampleBanks(split[5], bankInfo);
             }
-            else if (type.HasFlag(LegacyHitObjectType.Slider))
+            else if (type.HasFlagFast(LegacyHitObjectType.Slider))
             {
                 double? length = null;
 
@@ -141,7 +142,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
                 result = CreateSlider(pos, combo, comboOffset, convertPathString(split[5], pos), length, repeatCount, nodeSamples);
             }
-            else if (type.HasFlag(LegacyHitObjectType.Spinner))
+            else if (type.HasFlagFast(LegacyHitObjectType.Spinner))
             {
                 double duration = Math.Max(0, Parsing.ParseDouble(split[5]) + Offset - startTime);
 
@@ -150,7 +151,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 if (split.Length > 6)
                     readCustomSampleBanks(split[6], bankInfo);
             }
-            else if (type.HasFlag(LegacyHitObjectType.Hold))
+            else if (type.HasFlagFast(LegacyHitObjectType.Hold))
             {
                 // Note: Hold is generated by BMS converts
 
@@ -436,16 +437,16 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 new LegacyHitSampleInfo(HitSampleInfo.HIT_NORMAL, bankInfo.Normal, bankInfo.Volume, bankInfo.CustomSampleBank,
                     // if the sound type doesn't have the Normal flag set, attach it anyway as a layered sample.
                     // None also counts as a normal non-layered sample: https://osu.ppy.sh/help/wiki/osu!_File_Formats/Osu_(file_format)#hitsounds
-                    type != LegacyHitSoundType.None && !type.HasFlag(LegacyHitSoundType.Normal))
+                    type != LegacyHitSoundType.None && !type.HasFlagFast(LegacyHitSoundType.Normal))
             };
 
-            if (type.HasFlag(LegacyHitSoundType.Finish))
+            if (type.HasFlagFast(LegacyHitSoundType.Finish))
                 soundTypes.Add(new LegacyHitSampleInfo(HitSampleInfo.HIT_FINISH, bankInfo.Add, bankInfo.Volume, bankInfo.CustomSampleBank));
 
-            if (type.HasFlag(LegacyHitSoundType.Whistle))
+            if (type.HasFlagFast(LegacyHitSoundType.Whistle))
                 soundTypes.Add(new LegacyHitSampleInfo(HitSampleInfo.HIT_WHISTLE, bankInfo.Add, bankInfo.Volume, bankInfo.CustomSampleBank));
 
-            if (type.HasFlag(LegacyHitSoundType.Clap))
+            if (type.HasFlagFast(LegacyHitSoundType.Clap))
                 soundTypes.Add(new LegacyHitSampleInfo(HitSampleInfo.HIT_CLAP, bankInfo.Add, bankInfo.Volume, bankInfo.CustomSampleBank));
 
             return soundTypes;
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 7eac994e07..81623a9307 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Textures;
@@ -80,17 +81,17 @@ namespace osu.Game.Storyboards.Drawables
 
                 if (FlipH)
                 {
-                    if (origin.HasFlag(Anchor.x0))
+                    if (origin.HasFlagFast(Anchor.x0))
                         origin = Anchor.x2 | (origin & (Anchor.y0 | Anchor.y1 | Anchor.y2));
-                    else if (origin.HasFlag(Anchor.x2))
+                    else if (origin.HasFlagFast(Anchor.x2))
                         origin = Anchor.x0 | (origin & (Anchor.y0 | Anchor.y1 | Anchor.y2));
                 }
 
                 if (FlipV)
                 {
-                    if (origin.HasFlag(Anchor.y0))
+                    if (origin.HasFlagFast(Anchor.y0))
                         origin = Anchor.y2 | (origin & (Anchor.x0 | Anchor.x1 | Anchor.x2));
-                    else if (origin.HasFlag(Anchor.y2))
+                    else if (origin.HasFlagFast(Anchor.y2))
                         origin = Anchor.y0 | (origin & (Anchor.x0 | Anchor.x1 | Anchor.x2));
                 }
 
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 7b1a6d54da..eb877f3dff 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
@@ -80,17 +81,17 @@ namespace osu.Game.Storyboards.Drawables
 
                 if (FlipH)
                 {
-                    if (origin.HasFlag(Anchor.x0))
+                    if (origin.HasFlagFast(Anchor.x0))
                         origin = Anchor.x2 | (origin & (Anchor.y0 | Anchor.y1 | Anchor.y2));
-                    else if (origin.HasFlag(Anchor.x2))
+                    else if (origin.HasFlagFast(Anchor.x2))
                         origin = Anchor.x0 | (origin & (Anchor.y0 | Anchor.y1 | Anchor.y2));
                 }
 
                 if (FlipV)
                 {
-                    if (origin.HasFlag(Anchor.y0))
+                    if (origin.HasFlagFast(Anchor.y0))
                         origin = Anchor.y2 | (origin & (Anchor.x0 | Anchor.x1 | Anchor.x2));
-                    else if (origin.HasFlag(Anchor.y2))
+                    else if (origin.HasFlagFast(Anchor.y2))
                         origin = Anchor.y0 | (origin & (Anchor.x0 | Anchor.x1 | Anchor.x2));
                 }
 

From 9f3ceb99eba64a20a600474963b84ac35b256147 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 16:05:08 +0900
Subject: [PATCH 08328/10326] Fix the star rating display at song select
 flashing to zero when changing mods

Due to the use of bindable flow provided by `BeatmapDifficultyCache` in
this usage, the display would briefly flash to zero while difficulty
calculation was still running (as there is no way for a consumer of the
provided bindable to know whether the returned 0 is an actual 0 SR or a
"pending" calculation).

While I hope to fix this by making the bindable flow return nullable
values, I think this particular use case works better with non-bindable
flow so have switched across to that.
---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index ab4f3f4796..0c2cce0bb1 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -15,6 +15,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Mods;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
@@ -137,8 +138,6 @@ namespace osu.Game.Screens.Select.Details
             updateStarDifficulty();
         }
 
-        private IBindable<StarDifficulty> normalStarDifficulty;
-        private IBindable<StarDifficulty> moddedStarDifficulty;
         private CancellationTokenSource starDifficultyCancellationSource;
 
         private void updateStarDifficulty()
@@ -150,13 +149,13 @@ namespace osu.Game.Screens.Select.Details
 
             starDifficultyCancellationSource = new CancellationTokenSource();
 
-            normalStarDifficulty = difficultyCache.GetBindableDifficulty(Beatmap, ruleset.Value, null, starDifficultyCancellationSource.Token);
-            moddedStarDifficulty = difficultyCache.GetBindableDifficulty(Beatmap, ruleset.Value, mods.Value, starDifficultyCancellationSource.Token);
+            var normalStarDifficulty = difficultyCache.GetDifficultyAsync(Beatmap, ruleset.Value, null, starDifficultyCancellationSource.Token);
+            var moddedStarDifficulty = difficultyCache.GetDifficultyAsync(Beatmap, ruleset.Value, mods.Value, starDifficultyCancellationSource.Token);
 
-            normalStarDifficulty.BindValueChanged(_ => updateDisplay());
-            moddedStarDifficulty.BindValueChanged(_ => updateDisplay(), true);
-
-            void updateDisplay() => starDifficulty.Value = ((float)normalStarDifficulty.Value.Stars, (float)moddedStarDifficulty.Value.Stars);
+            Task.WhenAll(normalStarDifficulty, moddedStarDifficulty).ContinueWith(_ => Schedule(() =>
+            {
+                starDifficulty.Value = ((float)normalStarDifficulty.Result.Stars, (float)moddedStarDifficulty.Result.Stars);
+            }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         }
 
         protected override void Dispose(bool isDisposing)

From dcda7f62dff49a69cd1c0fdc8e38c937a490c02b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 16:10:27 +0900
Subject: [PATCH 08329/10326] Fix incorrect banned symbol

---
 CodeAnalysis/BannedSymbols.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CodeAnalysis/BannedSymbols.txt b/CodeAnalysis/BannedSymbols.txt
index 60cce39176..46c50dbfa2 100644
--- a/CodeAnalysis/BannedSymbols.txt
+++ b/CodeAnalysis/BannedSymbols.txt
@@ -7,4 +7,4 @@ M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
 M:osu.Framework.Bindables.IBindableList`1.GetBoundCopy();Fails on iOS. Use manual ctor + BindTo instead. (see https://github.com/mono/mono/issues/19900)
 T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
 T:Microsoft.EntityFrameworkCore.Internal.TypeExtensions;Don't use internal extension methods.
-M:System.Enum.HasFlagFast(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
\ No newline at end of file
+M:System.Enum.HasFlag(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
\ No newline at end of file

From 03771ce8ecedc5adcf405e28f7b07531f5da8f1c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 16:19:01 +0900
Subject: [PATCH 08330/10326] Allow determining a BeatmapDifficultyCache's
 bindable return's completion state via nullability

---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs               | 8 ++++----
 osu.Game/Beatmaps/Drawables/DifficultyIcon.cs             | 8 ++++++--
 osu.Game/Scoring/ScoreManager.cs                          | 8 ++++++--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs               | 4 ++--
 .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs    | 7 +++++--
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 37d262abe5..72a9b36c6f 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Beatmaps
         /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
         /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
-        public IBindable<StarDifficulty> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
+        public IBindable<StarDifficulty?> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
         {
             var bindable = createBindable(beatmapInfo, currentRuleset.Value, currentMods.Value, cancellationToken);
 
@@ -91,8 +91,8 @@ namespace osu.Game.Beatmaps
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with. If <c>null</c>, no mods will be assumed.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
         /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
-        public IBindable<StarDifficulty> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods,
-                                                               CancellationToken cancellationToken = default)
+        public IBindable<StarDifficulty?> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods,
+                                                                CancellationToken cancellationToken = default)
             => createBindable(beatmapInfo, rulesetInfo, mods, cancellationToken);
 
         /// <summary>
@@ -313,7 +313,7 @@ namespace osu.Game.Beatmaps
             }
         }
 
-        private class BindableStarDifficulty : Bindable<StarDifficulty>
+        private class BindableStarDifficulty : Bindable<StarDifficulty?>
         {
             public readonly BeatmapInfo Beatmap;
             public readonly CancellationToken CancellationToken;
diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index 96e18f120a..c62b803d1a 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Beatmaps.Drawables
                 this.mods = mods;
             }
 
-            private IBindable<StarDifficulty> localStarDifficulty;
+            private IBindable<StarDifficulty?> localStarDifficulty;
 
             [BackgroundDependencyLoader]
             private void load()
@@ -160,7 +160,11 @@ namespace osu.Game.Beatmaps.Drawables
                 localStarDifficulty = ruleset != null
                     ? difficultyCache.GetBindableDifficulty(beatmap, ruleset, mods, difficultyCancellation.Token)
                     : difficultyCache.GetBindableDifficulty(beatmap, difficultyCancellation.Token);
-                localStarDifficulty.BindValueChanged(difficulty => StarDifficulty.Value = difficulty.NewValue);
+                localStarDifficulty.BindValueChanged(d =>
+                {
+                    if (d.NewValue is StarDifficulty diff)
+                        StarDifficulty.Value = diff;
+                });
             }
 
             protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index a6beb19876..96ec9644b5 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Scoring
                 ScoringMode.BindValueChanged(onScoringModeChanged, true);
             }
 
-            private IBindable<StarDifficulty> difficultyBindable;
+            private IBindable<StarDifficulty?> difficultyBindable;
             private CancellationTokenSource difficultyCancellationSource;
 
             private void onScoringModeChanged(ValueChangedEvent<ScoringMode> mode)
@@ -168,7 +168,11 @@ namespace osu.Game.Scoring
 
                         // We can compute the max combo locally after the async beatmap difficulty computation.
                         difficultyBindable = difficulties().GetBindableDifficulty(score.Beatmap, score.Ruleset, score.Mods, (difficultyCancellationSource = new CancellationTokenSource()).Token);
-                        difficultyBindable.BindValueChanged(d => updateScore(d.NewValue.MaxCombo), true);
+                        difficultyBindable.BindValueChanged(d =>
+                        {
+                            if (d.NewValue is StarDifficulty diff)
+                                updateScore(diff.MaxCombo);
+                        }, true);
 
                         return;
                     }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 86cb561bc7..3b3ed88ccb 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
 
-        private IBindable<StarDifficulty> beatmapDifficulty;
+        private IBindable<StarDifficulty?> beatmapDifficulty;
 
         protected BufferedWedgeInfo Info;
 
@@ -132,7 +132,7 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, beatmapDifficulty.Value)
+                LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, beatmapDifficulty.Value ?? new StarDifficulty())
                 {
                     Shear = -Shear,
                     Depth = Info?.Depth + 1 ?? 0
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index e66469ff8d..633ef9297e 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
 
-        private IBindable<StarDifficulty> starDifficultyBindable;
+        private IBindable<StarDifficulty?> starDifficultyBindable;
         private CancellationTokenSource starDifficultyCancellationSource;
 
         public DrawableCarouselBeatmap(CarouselBeatmap panel)
@@ -217,7 +217,10 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 // We've potentially cancelled the computation above so a new bindable is required.
                 starDifficultyBindable = difficultyCache.GetBindableDifficulty(beatmap, (starDifficultyCancellationSource = new CancellationTokenSource()).Token);
-                starDifficultyBindable.BindValueChanged(d => starCounter.Current = (float)d.NewValue.Stars, true);
+                starDifficultyBindable.BindValueChanged(d =>
+                {
+                    starCounter.Current = (float)(d.NewValue?.Stars ?? 0);
+                }, true);
             }
 
             base.ApplyState();

From 5fa9bf61b6a8d2abfd374759da0553d8e807bc27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 16:22:40 +0900
Subject: [PATCH 08331/10326] Update xmldoc

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

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 72a9b36c6f..53d82c385d 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
-        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
+        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available. Will be null while in an initial calculating state (but not during updates to ruleset and mods if a stale value is already propagated).</returns>
         public IBindable<StarDifficulty?> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
         {
             var bindable = createBindable(beatmapInfo, currentRuleset.Value, currentMods.Value, cancellationToken);
@@ -90,7 +90,7 @@ namespace osu.Game.Beatmaps
         /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with. If <c>null</c>, the <paramref name="beatmapInfo"/>'s ruleset is used.</param>
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with. If <c>null</c>, no mods will be assumed.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
-        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
+        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available. Will be null while in an initial calculating state.</returns>
         public IBindable<StarDifficulty?> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods,
                                                                 CancellationToken cancellationToken = default)
             => createBindable(beatmapInfo, rulesetInfo, mods, cancellationToken);

From 31c52bd585a55f925676313671c23c437aff28e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 17:00:42 +0900
Subject: [PATCH 08332/10326] Update the displayed BPM at song select with rate
 adjust mods

This only covers constant rate rate adjust mods. Mods like wind up/wind
down will need a more complex implementation which we haven't really
planned yet.
---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 86cb561bc7..13ec106694 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -383,10 +383,18 @@ namespace osu.Game.Screens.Select
                 return labels.ToArray();
             }
 
+            [Resolved]
+            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+
             private string getBPMRange(IBeatmap beatmap)
             {
-                double bpmMax = beatmap.ControlPointInfo.BPMMaximum;
-                double bpmMin = beatmap.ControlPointInfo.BPMMinimum;
+                // this doesn't consider mods which apply variable rates, yet.
+                double rate = 1;
+                foreach (var mod in mods.Value.OfType<IApplicableToRate>())
+                    rate = mod.ApplyToRate(0, rate);
+
+                double bpmMax = beatmap.ControlPointInfo.BPMMaximum * rate;
+                double bpmMin = beatmap.ControlPointInfo.BPMMinimum * rate;
 
                 if (Precision.AlmostEquals(bpmMin, bpmMax))
                     return $"{bpmMin:0}";

From 2db4b793d7ab2c064c1a6a1b924ef379b71a86ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 17:04:39 +0900
Subject: [PATCH 08333/10326] Also handle most common BPM display

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 13ec106694..311ed6ffb9 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -395,11 +395,12 @@ namespace osu.Game.Screens.Select
 
                 double bpmMax = beatmap.ControlPointInfo.BPMMaximum * rate;
                 double bpmMin = beatmap.ControlPointInfo.BPMMinimum * rate;
+                double mostCommonBPM = 60000 / beatmap.GetMostCommonBeatLength() * rate;
 
                 if (Precision.AlmostEquals(bpmMin, bpmMax))
                     return $"{bpmMin:0}";
 
-                return $"{bpmMin:0}-{bpmMax:0} (mostly {60000 / beatmap.GetMostCommonBeatLength():0})";
+                return $"{bpmMin:0}-{bpmMax:0} (mostly {mostCommonBPM:0})";
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)

From 6d1c5979eafaf2dac1182b49c79c0e3a9e369c4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 17:28:59 +0900
Subject: [PATCH 08334/10326] 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 183ac61c90..8ea7cfac5b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.222.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.225.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 37d730bf42..6ff08ae63c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.222.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.225.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ca11952cc8..d7a1b7d692 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.Framework.iOS" Version="2021.222.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.225.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,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="2021.222.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.225.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3802cb29a42056927da2f2c5535cd55bbfc5cf0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 17:46:35 +0900
Subject: [PATCH 08335/10326] Fix failing tests doing reference comparisons
 between string and LocalisedString

---
 .../Ranking/TestSceneExpandedPanelMiddleContent.cs |  4 ++--
 .../Visual/SongSelect/TestSceneBeatmapInfoWedge.cs | 14 +++++++-------
 .../UserInterface/TestSceneFooterButtonMods.cs     |  2 +-
 osu.Game/Configuration/SettingSourceAttribute.cs   |  3 ++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index f9fe42131f..2f558a6379 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 Beatmap = createTestBeatmap(author)
             }));
 
-            AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Text == "mapper_name"));
+            AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Current.Value == "mapper_name"));
         }
 
         [Test]
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual.Ranking
             }));
 
             AddAssert("mapped by text not present", () =>
-                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text.ToString(), "mapped", "by")));
+                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Current.Value, "mapped", "by")));
         }
 
         private void showPanel(ScoreInfo score) => Child = new ExpandedPanelMiddleContentContainer(score);
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index fff4a9ba61..07b67ca3ad 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -103,10 +103,10 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void testBeatmapLabels(Ruleset ruleset)
         {
-            AddAssert("check version", () => infoWedge.Info.VersionLabel.Text == $"{ruleset.ShortName}Version");
-            AddAssert("check title", () => infoWedge.Info.TitleLabel.Text == $"{ruleset.ShortName}Source — {ruleset.ShortName}Title");
-            AddAssert("check artist", () => infoWedge.Info.ArtistLabel.Text == $"{ruleset.ShortName}Artist");
-            AddAssert("check author", () => infoWedge.Info.MapperContainer.Children.OfType<OsuSpriteText>().Any(s => s.Text == $"{ruleset.ShortName}Author"));
+            AddAssert("check version", () => infoWedge.Info.VersionLabel.Current.Value == $"{ruleset.ShortName}Version");
+            AddAssert("check title", () => infoWedge.Info.TitleLabel.Current.Value == $"{ruleset.ShortName}Source — {ruleset.ShortName}Title");
+            AddAssert("check artist", () => infoWedge.Info.ArtistLabel.Current.Value == $"{ruleset.ShortName}Artist");
+            AddAssert("check author", () => infoWedge.Info.MapperContainer.Children.OfType<OsuSpriteText>().Any(s => s.Current.Value == $"{ruleset.ShortName}Author"));
         }
 
         private void testInfoLabels(int expectedCount)
@@ -119,9 +119,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         public void TestNullBeatmap()
         {
             selectBeatmap(null);
-            AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Text.ToString()));
-            AddAssert("check default title", () => infoWedge.Info.TitleLabel.Text == Beatmap.Default.BeatmapInfo.Metadata.Title);
-            AddAssert("check default artist", () => infoWedge.Info.ArtistLabel.Text == Beatmap.Default.BeatmapInfo.Metadata.Artist);
+            AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Current.Value));
+            AddAssert("check default title", () => infoWedge.Info.TitleLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Title);
+            AddAssert("check default artist", () => infoWedge.Info.ArtistLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Artist);
             AddAssert("check empty author", () => !infoWedge.Info.MapperContainer.Children.Any());
             AddAssert("check no info labels", () => !infoWedge.Info.InfoLabelContainer.Children.Any());
         }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
index 1e3b1c2ffd..546e905ded 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             var multiplier = mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
             var expectedValue = multiplier.Equals(1.0) ? string.Empty : $"{multiplier:N2}x";
 
-            return expectedValue == footerButtonMods.MultiplierText.Text;
+            return expectedValue == footerButtonMods.MultiplierText.Current.Value;
         }
 
         private class TestFooterButtonMods : FooterButtonMods
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 70d67aaaa0..65a5a6d1b4 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -8,6 +8,7 @@ using System.Reflection;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Configuration
@@ -24,7 +25,7 @@ namespace osu.Game.Configuration
     [AttributeUsage(AttributeTargets.Property)]
     public class SettingSourceAttribute : Attribute
     {
-        public string Label { get; }
+        public LocalisableString Label { get; }
 
         public string Description { get; }
 

From cf4c88c647f2bbfc03984218b01d8dc81d396bbe Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 21:38:21 +0900
Subject: [PATCH 08336/10326] Fix spacing

---
 .../Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index 8e9020ee13..54c37e9742 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -115,10 +115,10 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 }
 
                 if (convertType.HasFlagFast(PatternType.Cycle) && PreviousPattern.HitObjects.Count() == 1
-                                                           // If we convert to 7K + 1, let's not overload the special key
-                                                           && (TotalColumns != 8 || lastColumn != 0)
-                                                           // Make sure the last column was not the centre column
-                                                           && (TotalColumns % 2 == 0 || lastColumn != TotalColumns / 2))
+                                                               // If we convert to 7K + 1, let's not overload the special key
+                                                               && (TotalColumns != 8 || lastColumn != 0)
+                                                               // Make sure the last column was not the centre column
+                                                               && (TotalColumns % 2 == 0 || lastColumn != TotalColumns / 2))
                 {
                     // Generate a new pattern by cycling backwards (similar to Reverse but for only one hit object)
                     int column = RandomStart + TotalColumns - lastColumn - 1;

From 98313a98bf4e0b89deb9b47219fc4e0fd3aaef4a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 21:48:02 +0900
Subject: [PATCH 08337/10326] DI mods in parent class and pass them down

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 311ed6ffb9..37808f6e94 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Screens.Select
         private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGE_HEIGHT, 0);
 
         private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+        private readonly IBindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
@@ -64,9 +65,11 @@ namespace osu.Game.Screens.Select
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load([CanBeNull] Bindable<RulesetInfo> parentRuleset)
+        private void load([CanBeNull] Bindable<RulesetInfo> parentRuleset, [CanBeNull] Bindable<IReadOnlyList<Mod>> parentMods)
         {
             ruleset.BindTo(parentRuleset);
+            mods.BindTo(parentMods);
+
             ruleset.ValueChanged += _ => updateDisplay();
         }
 
@@ -132,7 +135,7 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, beatmapDifficulty.Value)
+                LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value)
                 {
                     Shear = -Shear,
                     Depth = Info?.Depth + 1 ?? 0
@@ -167,13 +170,15 @@ namespace osu.Game.Screens.Select
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
+            private readonly IReadOnlyList<Mod> mods;
             private readonly StarDifficulty starDifficulty;
 
-            public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset, StarDifficulty difficulty)
+            public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
                 : base(pixelSnapping: true)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
+                this.mods = mods;
                 starDifficulty = difficulty;
             }
 
@@ -383,14 +388,11 @@ namespace osu.Game.Screens.Select
                 return labels.ToArray();
             }
 
-            [Resolved]
-            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
-
             private string getBPMRange(IBeatmap beatmap)
             {
                 // this doesn't consider mods which apply variable rates, yet.
                 double rate = 1;
-                foreach (var mod in mods.Value.OfType<IApplicableToRate>())
+                foreach (var mod in mods.OfType<IApplicableToRate>())
                     rate = mod.ApplyToRate(0, rate);
 
                 double bpmMax = beatmap.ControlPointInfo.BPMMaximum * rate;

From de417a660d7121589abb9c0b0fe635f4e2f44eb0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 21:51:32 +0900
Subject: [PATCH 08338/10326] Make BPM update with changes in mod settings

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 113 ++++++++++++--------
 1 file changed, 68 insertions(+), 45 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 37808f6e94..9084435f44 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -25,6 +25,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
+using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -167,12 +168,15 @@ namespace osu.Game.Screens.Select
 
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
+            private Container bpmLabelContainer;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
             private readonly IReadOnlyList<Mod> mods;
             private readonly StarDifficulty starDifficulty;
 
+            private ModSettingChangeTracker settingChangeTracker;
+
             public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
                 : base(pixelSnapping: true)
             {
@@ -189,9 +193,11 @@ namespace osu.Game.Screens.Select
                 var metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
                 CacheDrawnFrameBuffer = true;
-
                 RelativeSizeAxes = Axes.Both;
 
+                settingChangeTracker = new ModSettingChangeTracker(mods);
+                settingChangeTracker.SettingChanged += _ => updateBPM();
+
                 titleBinding = localisation.GetLocalisedString(new LocalisedString((metadata.TitleUnicode, metadata.Title)));
                 artistBinding = localisation.GetLocalisedString(new LocalisedString((metadata.ArtistUnicode, metadata.Artist)));
 
@@ -312,7 +318,25 @@ namespace osu.Game.Screens.Select
                                 Margin = new MarginPadding { Top = 20 },
                                 Spacing = new Vector2(20, 0),
                                 AutoSizeAxes = Axes.Both,
-                                Children = getInfoLabels()
+                                Children = new Drawable[]
+                                {
+                                    new InfoLabel(new BeatmapStatistic
+                                    {
+                                        Name = "Length",
+                                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
+                                        Content = TimeSpan.FromMilliseconds(beatmapInfo.Length).ToString(@"m\:ss"),
+                                    }),
+                                    bpmLabelContainer = new Container
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                    },
+                                    new FillFlowContainer
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                        Spacing = new Vector2(20, 0),
+                                        Children = getRulesetInfoLabels()
+                                    }
+                                }
                             }
                         }
                     }
@@ -324,6 +348,8 @@ namespace osu.Game.Screens.Select
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
+
+                updateBPM();
             }
 
             private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
@@ -340,69 +366,60 @@ namespace osu.Game.Screens.Select
                 ForceRedraw();
             }
 
-            private InfoLabel[] getInfoLabels()
+            private InfoLabel[] getRulesetInfoLabels()
             {
-                var b = beatmap.Beatmap;
-
-                List<InfoLabel> labels = new List<InfoLabel>();
-
-                if (b?.HitObjects?.Any() == true)
+                try
                 {
-                    labels.Add(new InfoLabel(new BeatmapStatistic
-                    {
-                        Name = "Length",
-                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
-                        Content = TimeSpan.FromMilliseconds(b.BeatmapInfo.Length).ToString(@"m\:ss"),
-                    }));
-
-                    labels.Add(new InfoLabel(new BeatmapStatistic
-                    {
-                        Name = "BPM",
-                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Bpm),
-                        Content = getBPMRange(b),
-                    }));
+                    IBeatmap playableBeatmap;
 
                     try
                     {
-                        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>());
-                        }
-
-                        labels.AddRange(playableBeatmap.GetStatistics().Select(s => new InfoLabel(s)));
+                        // Try to get the beatmap with the user's ruleset
+                        playableBeatmap = beatmap.GetPlayableBeatmap(ruleset, Array.Empty<Mod>());
                     }
-                    catch (Exception e)
+                    catch (BeatmapInvalidForRulesetException)
                     {
-                        Logger.Error(e, "Could not load beatmap successfully!");
+                        // 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>());
                     }
+
+                    return playableBeatmap.GetStatistics().Select(s => new InfoLabel(s)).ToArray();
+                }
+                catch (Exception e)
+                {
+                    Logger.Error(e, "Could not load beatmap successfully!");
                 }
 
-                return labels.ToArray();
+                return Array.Empty<InfoLabel>();
             }
 
-            private string getBPMRange(IBeatmap beatmap)
+            private void updateBPM()
             {
+                var b = beatmap.Beatmap;
+                if (b == null)
+                    return;
+
                 // this doesn't consider mods which apply variable rates, yet.
                 double rate = 1;
                 foreach (var mod in mods.OfType<IApplicableToRate>())
                     rate = mod.ApplyToRate(0, rate);
 
-                double bpmMax = beatmap.ControlPointInfo.BPMMaximum * rate;
-                double bpmMin = beatmap.ControlPointInfo.BPMMinimum * rate;
-                double mostCommonBPM = 60000 / beatmap.GetMostCommonBeatLength() * rate;
+                double bpmMax = b.ControlPointInfo.BPMMaximum * rate;
+                double bpmMin = b.ControlPointInfo.BPMMinimum * rate;
+                double mostCommonBPM = 60000 / b.GetMostCommonBeatLength() * rate;
 
-                if (Precision.AlmostEquals(bpmMin, bpmMax))
-                    return $"{bpmMin:0}";
+                string labelText = Precision.AlmostEquals(bpmMin, bpmMax)
+                    ? $"{bpmMin:0}"
+                    : $"{bpmMin:0}-{bpmMax:0} (mostly {mostCommonBPM:0})";
 
-                return $"{bpmMin:0}-{bpmMax:0} (mostly {mostCommonBPM:0})";
+                bpmLabelContainer.Child = new InfoLabel(new BeatmapStatistic
+                {
+                    Name = "BPM",
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Bpm),
+                    Content = labelText
+                });
+
+                ForceRedraw();
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)
@@ -425,6 +442,12 @@ namespace osu.Game.Screens.Select
                 };
             }
 
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+                settingChangeTracker?.Dispose();
+            }
+
             public class InfoLabel : Container, IHasTooltip
             {
                 public string TooltipText { get; }

From 649ce20e354b2f30b08a3c60db94695e24aa5e34 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 22:01:53 +0900
Subject: [PATCH 08339/10326] Fix up super weird and super wrong DI

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index d1b28e6607..97fe099975 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using JetBrains.Annotations;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
@@ -39,8 +38,11 @@ namespace osu.Game.Screens.Select
 
         private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGE_HEIGHT, 0);
 
-        private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
-        private readonly IBindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
+        [Resolved]
+        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
@@ -65,13 +67,10 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        [BackgroundDependencyLoader(true)]
-        private void load([CanBeNull] Bindable<RulesetInfo> parentRuleset, [CanBeNull] Bindable<IReadOnlyList<Mod>> parentMods)
+        protected override void LoadComplete()
         {
-            ruleset.BindTo(parentRuleset);
-            mods.BindTo(parentMods);
-
-            ruleset.ValueChanged += _ => updateDisplay();
+            base.LoadComplete();
+            ruleset.BindValueChanged(_ => updateDisplay(), true);
         }
 
         protected override void PopIn()

From c3eb44137bfd109006f826fc196a2394a2675196 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 22:09:41 +0900
Subject: [PATCH 08340/10326] Move ValueChanged bind back to load()

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 97fe099975..fe2b7b7525 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -67,10 +67,10 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            base.LoadComplete();
-            ruleset.BindValueChanged(_ => updateDisplay(), true);
+            ruleset.BindValueChanged(_ => updateDisplay());
         }
 
         protected override void PopIn()

From 01a48154126fbc2ca75cea6632349689ea41ce4f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 23:36:02 +0900
Subject: [PATCH 08341/10326] Make labels disappear on null beatmap/no
 hitobjects

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   |  7 ++-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 61 +++++++++++--------
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 07b67ca3ad..7ea6373763 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -7,6 +7,7 @@ using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
@@ -111,8 +112,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void testInfoLabels(int expectedCount)
         {
-            AddAssert("check info labels exists", () => infoWedge.Info.InfoLabelContainer.Children.Any());
-            AddAssert("check info labels count", () => infoWedge.Info.InfoLabelContainer.Children.Count == expectedCount);
+            AddAssert("check info labels exists", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Any());
+            AddAssert("check info labels count", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Count() == expectedCount);
         }
 
         [Test]
@@ -123,7 +124,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("check default title", () => infoWedge.Info.TitleLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Title);
             AddAssert("check default artist", () => infoWedge.Info.ArtistLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Artist);
             AddAssert("check empty author", () => !infoWedge.Info.MapperContainer.Children.Any());
-            AddAssert("check no info labels", () => !infoWedge.Info.InfoLabelContainer.Children.Any());
+            AddAssert("check no info labels", () => !infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Any());
         }
 
         [Test]
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index fe2b7b7525..36cc19cce3 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -163,10 +163,10 @@ namespace osu.Game.Screens.Select
             public OsuSpriteText ArtistLabel { get; private set; }
             public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
             public FillFlowContainer MapperContainer { get; private set; }
-            public FillFlowContainer InfoLabelContainer { get; private set; }
 
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
+            private FillFlowContainer infoLabelContainer;
             private Container bpmLabelContainer;
 
             private readonly WorkingBeatmap beatmap;
@@ -194,9 +194,6 @@ namespace osu.Game.Screens.Select
                 CacheDrawnFrameBuffer = true;
                 RelativeSizeAxes = Axes.Both;
 
-                settingChangeTracker = new ModSettingChangeTracker(mods);
-                settingChangeTracker.SettingChanged += _ => updateBPM();
-
                 titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
                 artistBinding = localisation.GetLocalisedString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
 
@@ -312,30 +309,11 @@ namespace osu.Game.Screens.Select
                                 AutoSizeAxes = Axes.Both,
                                 Children = getMapper(metadata)
                             },
-                            InfoLabelContainer = new FillFlowContainer
+                            infoLabelContainer = new FillFlowContainer
                             {
                                 Margin = new MarginPadding { Top = 20 },
                                 Spacing = new Vector2(20, 0),
                                 AutoSizeAxes = Axes.Both,
-                                Children = new Drawable[]
-                                {
-                                    new InfoLabel(new BeatmapStatistic
-                                    {
-                                        Name = "Length",
-                                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
-                                        Content = TimeSpan.FromMilliseconds(beatmapInfo.Length).ToString(@"m\:ss"),
-                                    }),
-                                    bpmLabelContainer = new Container
-                                    {
-                                        AutoSizeAxes = Axes.Both,
-                                    },
-                                    new FillFlowContainer
-                                    {
-                                        AutoSizeAxes = Axes.Both,
-                                        Spacing = new Vector2(20, 0),
-                                        Children = getRulesetInfoLabels()
-                                    }
-                                }
                             }
                         }
                     }
@@ -348,7 +326,7 @@ namespace osu.Game.Screens.Select
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
 
-                updateBPM();
+                addInfoLabels();
             }
 
             private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
@@ -365,6 +343,37 @@ namespace osu.Game.Screens.Select
                 ForceRedraw();
             }
 
+            private void addInfoLabels()
+            {
+                if (beatmap.Beatmap?.HitObjects?.Any() != true)
+                    return;
+
+                infoLabelContainer.Children = new Drawable[]
+                {
+                    new InfoLabel(new BeatmapStatistic
+                    {
+                        Name = "Length",
+                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
+                        Content = TimeSpan.FromMilliseconds(beatmap.BeatmapInfo.Length).ToString(@"m\:ss"),
+                    }),
+                    bpmLabelContainer = new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(20, 0),
+                        Children = getRulesetInfoLabels()
+                    }
+                };
+
+                settingChangeTracker = new ModSettingChangeTracker(mods);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
+
+                refreshBPMLabel();
+            }
+
             private InfoLabel[] getRulesetInfoLabels()
             {
                 try
@@ -392,7 +401,7 @@ namespace osu.Game.Screens.Select
                 return Array.Empty<InfoLabel>();
             }
 
-            private void updateBPM()
+            private void refreshBPMLabel()
             {
                 var b = beatmap.Beatmap;
                 if (b == null)

From 254f9bb58be27c0981dd32df8a1d6038a6a090fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 13:37:58 +0900
Subject: [PATCH 08342/10326] Show API human readable error message when chat
 posting fails

Closes #11902.
---
 osu.Game/Online/Chat/ChannelManager.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 036ec4d0f3..a980f4c54b 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Online.Chat
 
                     createNewPrivateMessageRequest.Failure += exception =>
                     {
-                        Logger.Error(exception, "Posting message failed.");
+                        handlePostException(exception);
                         target.ReplaceMessage(message, null);
                         dequeueAndRun();
                     };
@@ -171,7 +171,7 @@ namespace osu.Game.Online.Chat
 
                 req.Failure += exception =>
                 {
-                    Logger.Error(exception, "Posting message failed.");
+                    handlePostException(exception);
                     target.ReplaceMessage(message, null);
                     dequeueAndRun();
                 };
@@ -184,6 +184,14 @@ namespace osu.Game.Online.Chat
                 dequeueAndRun();
         }
 
+        private static void handlePostException(Exception exception)
+        {
+            if (exception is APIException apiException)
+                Logger.Log(apiException.Message, level: LogLevel.Important);
+            else
+                Logger.Error(exception, "Posting message failed.");
+        }
+
         /// <summary>
         /// Posts a command locally. Commands like /help will result in a help message written in the current channel.
         /// </summary>

From cd1c1bf534947585db53eb6b4641acef41f1a12f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 14:15:12 +0900
Subject: [PATCH 08343/10326] Centralise cases of performing actions on the
 current selection

By moving this to a central location, we can avoid invoking the
EditorChangeHandler when there is no selection made. This helps
alleviate the issue pointed out in
https://github.com/ppy/osu/issues/11901, but not fix it completely.
---
 .../Edit/ManiaSelectionHandler.cs             |  8 +++--
 .../Edit/TaikoSelectionHandler.cs             | 32 +++++++------------
 .../Compose/Components/BlueprintContainer.cs  |  3 +-
 .../Compose/Components/SelectionHandler.cs    | 27 ++++------------
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 16 ++++++++++
 5 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 50629f41a9..2689ed4112 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             int minColumn = int.MaxValue;
             int maxColumn = int.MinValue;
 
+            // find min/max in an initial pass before actually performing the movement.
             foreach (var obj in EditorBeatmap.SelectedHitObjects.OfType<ManiaHitObject>())
             {
                 if (obj.Column < minColumn)
@@ -55,8 +56,11 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             columnDelta = Math.Clamp(columnDelta, -minColumn, maniaPlayfield.TotalColumns - 1 - maxColumn);
 
-            foreach (var obj in EditorBeatmap.SelectedHitObjects.OfType<ManiaHitObject>())
-                obj.Column += columnDelta;
+            EditorBeatmap.PerformOnSelection(h =>
+            {
+                if (h is ManiaHitObject maniaObj)
+                    maniaObj.Column += columnDelta;
+            });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index 3fbcee44af..ac2dd4bdb6 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -52,32 +52,24 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
         public void SetStrongState(bool state)
         {
-            var hits = EditorBeatmap.SelectedHitObjects.OfType<Hit>();
-
-            EditorBeatmap.BeginChange();
-
-            foreach (var h in hits)
+            EditorBeatmap.PerformOnSelection(h =>
             {
-                if (h.IsStrong != state)
-                {
-                    h.IsStrong = state;
-                    EditorBeatmap.Update(h);
-                }
-            }
+                if (!(h is Hit taikoHit)) return;
 
-            EditorBeatmap.EndChange();
+                if (taikoHit.IsStrong != state)
+                {
+                    taikoHit.IsStrong = state;
+                    EditorBeatmap.Update(taikoHit);
+                }
+            });
         }
 
         public void SetRimState(bool state)
         {
-            var hits = EditorBeatmap.SelectedHitObjects.OfType<Hit>();
-
-            EditorBeatmap.BeginChange();
-
-            foreach (var h in hits)
-                h.Type = state ? HitType.Rim : HitType.Centre;
-
-            EditorBeatmap.EndChange();
+            EditorBeatmap.PerformOnSelection(h =>
+            {
+                if (h is Hit taikoHit) taikoHit.Type = state ? HitType.Rim : HitType.Centre;
+            });
         }
 
         protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 5371beac60..051d0766bf 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -495,8 +495,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 // Apply the start time at the newly snapped-to position
                 double offset = result.Time.Value - movementBlueprints.First().HitObject.StartTime;
 
-                foreach (HitObject obj in Beatmap.SelectedHitObjects)
-                    obj.StartTime += offset;
+                Beatmap.PerformOnSelection(obj => obj.StartTime += offset);
             }
 
             return true;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 788b485449..018d4d081c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -320,18 +320,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void AddHitSample(string sampleName)
         {
-            EditorBeatmap.BeginChange();
-
-            foreach (var h in EditorBeatmap.SelectedHitObjects)
+            EditorBeatmap.PerformOnSelection(h =>
             {
                 // Make sure there isn't already an existing sample
                 if (h.Samples.Any(s => s.Name == sampleName))
-                    continue;
+                    return;
 
                 h.Samples.Add(new HitSampleInfo(sampleName));
-            }
-
-            EditorBeatmap.EndChange();
+            });
         }
 
         /// <summary>
@@ -341,19 +337,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
         public void SetNewCombo(bool state)
         {
-            EditorBeatmap.BeginChange();
-
-            foreach (var h in EditorBeatmap.SelectedHitObjects)
+            EditorBeatmap.PerformOnSelection(h =>
             {
                 var comboInfo = h as IHasComboInformation;
 
-                if (comboInfo == null || comboInfo.NewCombo == state) continue;
+                if (comboInfo == null || comboInfo.NewCombo == state) return;
 
                 comboInfo.NewCombo = state;
                 EditorBeatmap.Update(h);
-            }
-
-            EditorBeatmap.EndChange();
+            });
         }
 
         /// <summary>
@@ -362,12 +354,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void RemoveHitSample(string sampleName)
         {
-            EditorBeatmap.BeginChange();
-
-            foreach (var h in EditorBeatmap.SelectedHitObjects)
-                h.SamplesBindable.RemoveAll(s => s.Name == sampleName);
-
-            EditorBeatmap.EndChange();
+            EditorBeatmap.PerformOnSelection(h => h.SamplesBindable.RemoveAll(s => s.Name == sampleName));
         }
 
         #endregion
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 174ff1478b..4f1b0484d2 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -100,6 +100,22 @@ namespace osu.Game.Screens.Edit
 
         private readonly HashSet<HitObject> batchPendingUpdates = new HashSet<HitObject>();
 
+        /// <summary>
+        /// Perform the provided action on every selected hitobject.
+        /// Changes will be grouped as one history action.
+        /// </summary>
+        /// <param name="action">The action to perform.</param>
+        public void PerformOnSelection(Action<HitObject> action)
+        {
+            if (SelectedHitObjects.Count == 0)
+                return;
+
+            BeginChange();
+            foreach (var h in SelectedHitObjects)
+                action(h);
+            EndChange();
+        }
+
         /// <summary>
         /// Adds a collection of <see cref="HitObject"/>s to this <see cref="EditorBeatmap"/>.
         /// </summary>

From 3e65dfb9e7df4fe11c7d884e85efb30e461041b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 17:11:47 +0900
Subject: [PATCH 08344/10326] Reduce allocation overhead when notification
 overlay has visible notifications

---
 .../Notifications/NotificationSection.cs        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index bc41311a6d..2316199049 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -10,9 +10,9 @@ 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 osuTK;
-using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Notifications
 {
@@ -122,7 +122,20 @@ namespace osu.Game.Overlays.Notifications
         {
             base.Update();
 
-            countDrawable.Text = notifications.Children.Count(c => c.Alpha > 0.99f).ToString();
+            countDrawable.Text = getVisibleCount().ToString();
+        }
+
+        private int getVisibleCount()
+        {
+            int count = 0;
+
+            foreach (var c in notifications)
+            {
+                if (c.Alpha > 0.99f)
+                    count++;
+            }
+
+            return count;
         }
 
         private class ClearAllButton : OsuClickableContainer

From 7e6bd0e995fe8ec1f33b5cbfa510ad7cac69c04e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 17:30:59 +0900
Subject: [PATCH 08345/10326] Fix "failed to import" message showing when
 importing from a stable install with no beatmaps

---
 osu.Game/Database/ArchiveModelManager.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 03b8db2cb8..daaba9098e 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -141,6 +141,13 @@ namespace osu.Game.Database
 
         protected async Task<IEnumerable<TModel>> Import(ProgressNotification notification, params ImportTask[] tasks)
         {
+            if (tasks.Length == 0)
+            {
+                notification.CompletionText = $"No {HumanisedModelName}s were found to import!";
+                notification.State = ProgressNotificationState.Completed;
+                return Enumerable.Empty<TModel>();
+            }
+
             notification.Progress = 0;
             notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import is initialising...";
 

From 1ab449b73e081284f88125c696845c51c35ae984 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 17:54:51 +0900
Subject: [PATCH 08346/10326] Add test scene for drawings screen

---
 .../Screens/TestSceneDrawingsScreen.cs        | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs
new file mode 100644
index 0000000000..e2954c8f10
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.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.IO;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+using osu.Game.Graphics.Cursor;
+using osu.Game.Tournament.Screens.Drawings;
+
+namespace osu.Game.Tournament.Tests.Screens
+{
+    public class TestSceneDrawingsScreen : TournamentTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(Storage storage)
+        {
+            using (var stream = storage.GetStream("drawings.txt", FileAccess.Write))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("KR : South Korea : KOR");
+                writer.WriteLine("US : United States : USA");
+                writer.WriteLine("PH : Philippines : PHL");
+                writer.WriteLine("BR : Brazil : BRA");
+                writer.WriteLine("JP : Japan : JPN");
+            }
+
+            Add(new OsuContextMenuContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new DrawingsScreen()
+            });
+        }
+    }
+}

From 1ac82af19abce0e1e2ce97facf22808652d9d305 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 17:58:21 +0900
Subject: [PATCH 08347/10326] Adjust flag size to fit again

---
 .../Screens/Drawings/Components/ScrollingTeamContainer.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
index 3ff4718b75..c7060bd538 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
@@ -345,7 +345,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
                 Flag.Anchor = Anchor.Centre;
                 Flag.Origin = Anchor.Centre;
-                Flag.Scale = new Vector2(0.9f);
+                Flag.Scale = new Vector2(0.7f);
 
                 InternalChildren = new Drawable[]
                 {

From 98d525d1dbb6f8b854b682a45d5ba600f30da6ea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 19:56:10 +0900
Subject: [PATCH 08348/10326] 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 8ea7cfac5b..5d83bb9583 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.225.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.226.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6ff08ae63c..84a74502c2 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.225.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index d7a1b7d692..2cea2e4b13 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.Framework.iOS" Version="2021.225.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.226.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,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="2021.225.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 4fd8501c860989e09f1fdfedc9405bdde39aa70c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 20:03:03 +0900
Subject: [PATCH 08349/10326] Remove unnecessary using (underlying enumerator
 change)

---
 osu.Game/Screens/Play/PlayerLoader.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 5b4bd11216..7d906cdc5b 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;

From 52e81385a6ba594cd325e24cf71c6580a7922727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 11:33:08 +0100
Subject: [PATCH 08350/10326] Fix restore default button mutating transforms
 during load

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

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index aafd7463a6..4cb8d7f83c 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -207,7 +207,9 @@ namespace osu.Game.Overlays.Settings
                 UpdateState();
             }
 
-            public void UpdateState()
+            public void UpdateState() => Scheduler.AddOnce(updateState);
+
+            private void updateState()
             {
                 if (bindable == null)
                     return;

From 87b73da73edddc47f93d5c1a5edc6f8bae3ce6fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 14:46:48 +0100
Subject: [PATCH 08351/10326] Add failing test case

---
 .../Mods/SettingsSourceAttributeTest.cs       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs

diff --git a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
new file mode 100644
index 0000000000..240d617dc7
--- /dev/null
+++ b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
@@ -0,0 +1,36 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+
+namespace osu.Game.Tests.Mods
+{
+    [TestFixture]
+    public class SettingsSourceAttributeTest
+    {
+        [Test]
+        public void TestOrdering()
+        {
+            var objectWithSettings = new ClassWithSettings();
+
+            var orderedSettings = objectWithSettings.GetOrderedSettingsSourceProperties().ToArray();
+
+            Assert.That(orderedSettings, Has.Length.EqualTo(3));
+        }
+
+        private class ClassWithSettings
+        {
+            [SettingSource("Second setting", "Another description", 2)]
+            public BindableBool SecondSetting { get; set; } = new BindableBool();
+
+            [SettingSource("First setting", "A description", 1)]
+            public BindableDouble FirstSetting { get; set; } = new BindableDouble();
+
+            [SettingSource("Third setting", "Yet another description", 3)]
+            public BindableInt ThirdSetting { get; set; } = new BindableInt();
+        }
+    }
+}

From 528de5869e305ec377d75098496ecaeadb949b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 14:47:09 +0100
Subject: [PATCH 08352/10326] Fix multiple enumerations when ordering setting
 sources

This was not spotted previously, because the base `Attribute` overrides
`Equals()` to have semantics similar to structs (per-field equality) by
using reflection. That masked the issue when strings were used, and
migrating to `LocalisableString` revealed it, as that struct's
implementation of equality currently uses instance checks.

Whether `LocalisableString.Equals()` is the correct implementation may
still be up for discussion, but allowing multiple enumeration is wrong
anyway, since the underlying enumerables are live (one especially is a
yield iterator, causing new object instances to be allocated).
---
 osu.Game/Configuration/SettingSourceAttribute.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 65a5a6d1b4..d0d2480e62 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -139,9 +139,12 @@ namespace osu.Game.Configuration
 
         public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetOrderedSettingsSourceProperties(this object obj)
         {
-            var original = obj.GetSettingsSourceProperties();
+            var original = obj.GetSettingsSourceProperties().ToArray();
 
-            var orderedRelative = original.Where(attr => attr.Item1.OrderPosition != null).OrderBy(attr => attr.Item1.OrderPosition);
+            var orderedRelative = original
+                                  .Where(attr => attr.Item1.OrderPosition != null)
+                                  .OrderBy(attr => attr.Item1.OrderPosition)
+                                  .ToArray();
             var unordered = original.Except(orderedRelative);
 
             return orderedRelative.Concat(unordered);

From dd2f63f3137c8a9923509f04b2bb5656eda0093a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 14:57:37 +0100
Subject: [PATCH 08353/10326] Add assertions to actually check order

---
 osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
index 240d617dc7..7fce1a6ce5 100644
--- a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
+++ b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
@@ -19,6 +19,10 @@ namespace osu.Game.Tests.Mods
             var orderedSettings = objectWithSettings.GetOrderedSettingsSourceProperties().ToArray();
 
             Assert.That(orderedSettings, Has.Length.EqualTo(3));
+
+            Assert.That(orderedSettings[0].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.FirstSetting)));
+            Assert.That(orderedSettings[1].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.SecondSetting)));
+            Assert.That(orderedSettings[2].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.ThirdSetting)));
         }
 
         private class ClassWithSettings

From 7b6e53680c6035f6b7843f3ac5bd65b90e41128d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 15:14:25 +0100
Subject: [PATCH 08354/10326] Add coverage for the unordered case

---
 osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
index 7fce1a6ce5..883c9d1ac2 100644
--- a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
+++ b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
@@ -18,15 +18,19 @@ namespace osu.Game.Tests.Mods
 
             var orderedSettings = objectWithSettings.GetOrderedSettingsSourceProperties().ToArray();
 
-            Assert.That(orderedSettings, Has.Length.EqualTo(3));
+            Assert.That(orderedSettings, Has.Length.EqualTo(4));
 
             Assert.That(orderedSettings[0].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.FirstSetting)));
             Assert.That(orderedSettings[1].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.SecondSetting)));
             Assert.That(orderedSettings[2].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.ThirdSetting)));
+            Assert.That(orderedSettings[3].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.UnorderedSetting)));
         }
 
         private class ClassWithSettings
         {
+            [SettingSource("Unordered setting", "Should be last")]
+            public BindableFloat UnorderedSetting { get; set; } = new BindableFloat();
+
             [SettingSource("Second setting", "Another description", 2)]
             public BindableBool SecondSetting { get; set; } = new BindableBool();
 

From 1e56d2cbba16edec86632b5c1f780f1abaac2d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 15:30:05 +0100
Subject: [PATCH 08355/10326] Make `SettingSourceAttribute` implement
 `IComparable`

---
 .../Configuration/SettingSourceAttribute.cs   | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index d0d2480e62..4cc31e14ac 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Configuration
     /// </remarks>
     [MeansImplicitUse]
     [AttributeUsage(AttributeTargets.Property)]
-    public class SettingSourceAttribute : Attribute
+    public class SettingSourceAttribute : Attribute, IComparable<SettingSourceAttribute>
     {
         public LocalisableString Label { get; }
 
@@ -42,6 +42,21 @@ namespace osu.Game.Configuration
         {
             OrderPosition = orderPosition;
         }
+
+        public int CompareTo(SettingSourceAttribute other)
+        {
+            if (OrderPosition == other.OrderPosition)
+                return 0;
+
+            // unordered items come last (are greater than any ordered items).
+            if (OrderPosition == null)
+                return 1;
+            if (other.OrderPosition == null)
+                return -1;
+
+            // ordered items are sorted by the order value.
+            return OrderPosition.Value.CompareTo(other.OrderPosition);
+        }
     }
 
     public static class SettingSourceExtensions
@@ -137,17 +152,13 @@ namespace osu.Game.Configuration
             }
         }
 
-        public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetOrderedSettingsSourceProperties(this object obj)
+        public static ICollection<(SettingSourceAttribute, PropertyInfo)> GetOrderedSettingsSourceProperties(this object obj)
         {
             var original = obj.GetSettingsSourceProperties().ToArray();
 
-            var orderedRelative = original
-                                  .Where(attr => attr.Item1.OrderPosition != null)
-                                  .OrderBy(attr => attr.Item1.OrderPosition)
-                                  .ToArray();
-            var unordered = original.Except(orderedRelative);
-
-            return orderedRelative.Concat(unordered);
+            return original
+                   .OrderBy(attr => attr.Item1)
+                   .ToArray();
         }
     }
 }

From 7e17c5ab7180c460f6fe142a37a2b0fdf3b8c987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 15:46:18 +0100
Subject: [PATCH 08356/10326] Trim yet another array copy

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 4cc31e14ac..cfce615130 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -153,12 +153,8 @@ namespace osu.Game.Configuration
         }
 
         public static ICollection<(SettingSourceAttribute, PropertyInfo)> GetOrderedSettingsSourceProperties(this object obj)
-        {
-            var original = obj.GetSettingsSourceProperties().ToArray();
-
-            return original
-                   .OrderBy(attr => attr.Item1)
-                   .ToArray();
-        }
+            => obj.GetSettingsSourceProperties()
+                  .OrderBy(attr => attr.Item1)
+                  .ToArray();
     }
 }

From 41b43dd39a8b0b5e76a0f82e2d06b19ee633d696 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 28 Feb 2021 21:32:56 +0300
Subject: [PATCH 08357/10326] Add nested legacy-simulating coordinates
 container

---
 .../Skinning/Legacy/LegacySpinner.cs          | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index ec7ecb0d28..94b6a906d0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -127,5 +127,33 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             if (DrawableSpinner != null)
                 DrawableSpinner.ApplyCustomUpdateState -= UpdateStateTransforms;
         }
+
+        /// <summary>
+        /// A <see cref="Container"/> simulating osu!stable's absolute screen-space,
+        /// for perfect placements of legacy spinner components with legacy coordinates.
+        /// </summary>
+        protected class LegacyCoordinatesContainer : Container
+        {
+            /// <summary>
+            /// An offset that simulates stable's spinner top offset,
+            /// for positioning some legacy spinner components perfectly as in stable.
+            /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
+            /// </summary>
+            public const float SPINNER_TOP_OFFSET = 29f;
+
+            public LegacyCoordinatesContainer()
+            {
+                // legacy spinners relied heavily on absolute screen-space coordinate values.
+                // wrap everything in a container simulating absolute coords to preserve alignment
+                // as there are skins that depend on it.
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                Size = new Vector2(640, 480);
+
+                // since legacy coordinates were on screen-space, they were accounting for the playfield shift offset.
+                // therefore cancel it from here.
+                Position = new Vector2(0, -8f);
+            }
+        }
     }
 }

From d528ef426fac4f30f380e35d12a2b4a99f59b69f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 28 Feb 2021 21:41:11 +0300
Subject: [PATCH 08358/10326] Reposition legacy spinner components in-line with
 osu!stable

---
 .../Skinning/Legacy/LegacyOldStyleSpinner.cs  | 44 ++++++++-----------
 .../Skinning/Legacy/LegacySpinner.cs          | 40 +++++++++--------
 2 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
index 4e07cb60b3..7e9f73a89b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
@@ -33,39 +33,31 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             spinnerBlink = source.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerNoBlink)?.Value != true;
 
-            AddInternal(new Container
+            AddRangeInternal(new Drawable[]
             {
-                // the old-style spinner relied heavily on absolute screen-space coordinate values.
-                // wrap everything in a container simulating absolute coords to preserve alignment
-                // as there are skins that depend on it.
-                Width = 640,
-                Height = 480,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Children = new Drawable[]
+                new Sprite
                 {
-                    new Sprite
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Texture = source.GetTexture("spinner-background"),
-                        Scale = new Vector2(SPRITE_SCALE)
-                    },
-                    disc = new Sprite
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Texture = source.GetTexture("spinner-circle"),
-                        Scale = new Vector2(SPRITE_SCALE)
-                    },
-                    metre = new Container
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = source.GetTexture("spinner-background"),
+                    Scale = new Vector2(SPRITE_SCALE)
+                },
+                disc = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = source.GetTexture("spinner-circle"),
+                    Scale = new Vector2(SPRITE_SCALE)
+                },
+                new LegacyCoordinatesContainer
+                {
+                    Child = metre = new Container
                     {
                         AutoSizeAxes = Axes.Both,
                         // this anchor makes no sense, but that's what stable uses.
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.TopLeft,
-                        // adjustment for stable (metre has additional offset)
-                        Margin = new MarginPadding { Top = 20 },
+                        Margin = new MarginPadding { Top = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET },
                         Masking = true,
                         Child = metreSprite = new Sprite
                         {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 94b6a906d0..1f1fd1fbd9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -30,27 +30,29 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            AddRangeInternal(new[]
+            AddInternal(new LegacyCoordinatesContainer
             {
-                spin = new Sprite
+                Depth = float.MinValue,
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Depth = float.MinValue,
-                    Texture = source.GetTexture("spinner-spin"),
-                    Scale = new Vector2(SPRITE_SCALE),
-                    Y = 120 - 45 // offset temporarily to avoid overlapping default spin counter
-                },
-                clear = new Sprite
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Depth = float.MinValue,
-                    Alpha = 0,
-                    Texture = source.GetTexture("spinner-clear"),
-                    Scale = new Vector2(SPRITE_SCALE),
-                    Y = -60
-                },
+                    spin = new Sprite
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-spin"),
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 335,
+                    },
+                    clear = new Sprite
+                    {
+                        Alpha = 0,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-clear"),
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 115,
+                    },
+                }
             });
         }
 

From 97bb217830e2f2e28942bb04083d3682c0c31c31 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Mar 2021 17:24:05 +0900
Subject: [PATCH 08359/10326] Fix test room playlist items not getting ids

---
 .../Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
index 5e12156f3c..022c297ccd 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             int currentScoreId = 0;
             int currentRoomId = 0;
+            int currentPlaylistItemId = 0;
 
             ((DummyAPIAccess)api).HandleRequest = req =>
             {
@@ -46,6 +47,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         createdRoom.CopyFrom(createRoomRequest.Room);
                         createdRoom.RoomID.Value ??= currentRoomId++;
 
+                        for (int i = 0; i < createdRoom.Playlist.Count; i++)
+                            createdRoom.Playlist[i].ID = currentPlaylistItemId++;
+
                         rooms.Add(createdRoom);
                         createRoomRequest.TriggerSuccess(createdRoom);
                         break;

From f7e4cfa4d0dce04258aad29b03917048954b93c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Mar 2021 17:24:32 +0900
Subject: [PATCH 08360/10326] Fix initial room settings not being returned
 correctly

---
 .../Multiplayer/TestMultiplayerClient.cs      | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 379bb758c5..67679b2659 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
+        [Resolved]
+        private Room apiRoom { get; set; } = null!;
+
         public void Connect() => isConnected.Value = true;
 
         public void Disconnect() => isConnected.Value = false;
@@ -89,13 +92,28 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
         {
-            var user = new MultiplayerRoomUser(api.LocalUser.Value.Id) { User = api.LocalUser.Value };
+            Debug.Assert(apiRoom != null);
 
-            var room = new MultiplayerRoom(roomId);
-            room.Users.Add(user);
+            var user = new MultiplayerRoomUser(api.LocalUser.Value.Id)
+            {
+                User = api.LocalUser.Value
+            };
 
-            if (room.Users.Count == 1)
-                room.Host = user;
+            var room = new MultiplayerRoom(roomId)
+            {
+                Settings =
+                {
+                    Name = apiRoom.Name.Value,
+                    BeatmapID = apiRoom.Playlist.Last().BeatmapID,
+                    RulesetID = apiRoom.Playlist.Last().RulesetID,
+                    BeatmapChecksum = apiRoom.Playlist.Last().Beatmap.Value.MD5Hash,
+                    RequiredMods = apiRoom.Playlist.Last().RequiredMods.Select(m => new APIMod(m)).ToArray(),
+                    AllowedMods = apiRoom.Playlist.Last().AllowedMods.Select(m => new APIMod(m)).ToArray(),
+                    PlaylistItemId = apiRoom.Playlist.Last().ID
+                },
+                Users = { user },
+                Host = user
+            };
 
             return Task.FromResult(room);
         }

From 7adb33f40e352137e26b9cb82fc1ad675da881af Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Mar 2021 17:24:54 +0900
Subject: [PATCH 08361/10326] Fix beatmap getting nulled due to failing web
 request

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 25 ++++++++++++
 .../Multiplayer/StatefulMultiplayerClient.cs  | 38 ++++++++++---------
 .../Multiplayer/TestMultiplayerClient.cs      | 20 ++++++++++
 3 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 95d76f384f..4529dfd0a7 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -9,7 +9,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
@@ -121,6 +123,29 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
         }
 
+        protected override Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
+        {
+            var tcs = new TaskCompletionSource<BeatmapSetInfo>();
+            var req = new GetBeatmapSetRequest(beatmapId, BeatmapSetLookupType.BeatmapId);
+
+            req.Success += res =>
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    tcs.SetCanceled();
+                    return;
+                }
+
+                tcs.SetResult(res.ToBeatmapSet(Rulesets));
+            };
+
+            req.Failure += e => tcs.SetException(e);
+
+            API.Queue(req);
+
+            return tcs.Task;
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index bfd505fb19..73100be505 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -17,8 +17,6 @@ using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Rulesets;
@@ -71,7 +69,7 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// The <see cref="MultiplayerRoomUser"/> corresponding to the local player, if available.
         /// </summary>
-        public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
+        public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == API.LocalUser.Value.Id);
 
         /// <summary>
         /// Whether the <see cref="LocalUser"/> is the host in <see cref="Room"/>.
@@ -85,15 +83,15 @@ namespace osu.Game.Online.Multiplayer
             }
         }
 
+        [Resolved]
+        protected IAPIProvider API { get; private set; } = null!;
+
+        [Resolved]
+        protected RulesetStore Rulesets { get; private set; } = null!;
+
         [Resolved]
         private UserLookupCache userLookupCache { get; set; } = null!;
 
-        [Resolved]
-        private IAPIProvider api { get; set; } = null!;
-
-        [Resolved]
-        private RulesetStore rulesets { get; set; } = null!;
-
         // Only exists for compatibility with old osu-server-spectator build.
         // Todo: Can be removed on 2021/02/26.
         private long defaultPlaylistItemId;
@@ -515,30 +513,26 @@ namespace osu.Game.Online.Multiplayer
 
             RoomUpdated?.Invoke();
 
-            var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-            req.Success += res =>
+            GetOnlineBeatmapSet(settings.BeatmapID, cancellationToken).ContinueWith(set => Schedule(() =>
             {
                 if (cancellationToken.IsCancellationRequested)
                     return;
 
-                updatePlaylist(settings, res);
-            };
-
-            api.Queue(req);
+                updatePlaylist(settings, set.Result);
+            }), TaskContinuationOptions.OnlyOnRanToCompletion);
         }, cancellationToken);
 
-        private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)
+        private void updatePlaylist(MultiplayerRoomSettings settings, BeatmapSetInfo beatmapSet)
         {
             if (Room == null || !Room.Settings.Equals(settings))
                 return;
 
             Debug.Assert(apiRoom != null);
 
-            var beatmapSet = onlineSet.ToBeatmapSet(rulesets);
             var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
             beatmap.MD5Hash = settings.BeatmapChecksum;
 
-            var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
+            var ruleset = Rulesets.GetRuleset(settings.RulesetID).CreateInstance();
             var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
             var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
@@ -568,6 +562,14 @@ namespace osu.Game.Online.Multiplayer
             }
         }
 
+        /// <summary>
+        /// Retrieves a <see cref="BeatmapSetInfo"/> from an online source.
+        /// </summary>
+        /// <param name="beatmapId">The beatmap set ID.</param>
+        /// <param name="cancellationToken">A token to cancel the request.</param>
+        /// <returns>The <see cref="BeatmapSetInfo"/> retrieval task.</returns>
+        protected abstract Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default);
+
         /// <summary>
         /// For the provided user ID, update whether the user is included in <see cref="CurrentMatchPlayingUserIds"/>.
         /// </summary>
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 67679b2659..6a901fc45b 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -3,12 +3,15 @@
 
 #nullable enable
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
@@ -28,6 +31,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Resolved]
         private Room apiRoom { get; set; } = null!;
 
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; } = null!;
+
         public void Connect() => isConnected.Value = true;
 
         public void Disconnect() => isConnected.Value = false;
@@ -168,5 +174,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             return ((IMultiplayerClient)this).LoadRequested();
         }
+
+        protected override Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
+        {
+            Debug.Assert(Room != null);
+            Debug.Assert(apiRoom != null);
+
+            var set = apiRoom.Playlist.FirstOrDefault(p => p.BeatmapID == beatmapId)?.Beatmap.Value.BeatmapSet
+                      ?? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId)?.BeatmapSet;
+
+            if (set == null)
+                throw new InvalidOperationException("Beatmap not found.");
+
+            return Task.FromResult(set);
+        }
     }
 }

From 5cfaf1de1b6d72cbbf900d0667bf2c2e48e6f77c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Mar 2021 17:43:03 +0900
Subject: [PATCH 08362/10326] Fix duplicate ongoing operation tracker

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 2344ebea0e..8869718fd1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -3,12 +3,10 @@
 
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
@@ -20,9 +18,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         private MultiplayerMatchSubScreen screen;
 
-        [Cached]
-        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
-
         public TestSceneMultiplayerMatchSubScreen()
             : base(false)
         {

From fe54a51b5a9c5995db488e1c8873fd1691463a3a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Mar 2021 22:41:09 +0300
Subject: [PATCH 08363/10326] Remove `UserRanks` object and move to outer
 `country_rank` property

---
 osu.Game/Users/UserStatistics.cs | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 78e6f5a05a..dc926898fc 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -29,16 +29,9 @@ namespace osu.Game.Users
         [JsonProperty(@"global_rank")]
         public int? GlobalRank;
 
+        [JsonProperty(@"country_rank")]
         public int? CountryRank;
 
-        [JsonProperty(@"rank")]
-        private UserRanks ranks
-        {
-            // eventually that will also become an own json property instead of reading from a `rank` object.
-            // see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
-            set => CountryRank = value.Country;
-        }
-
         // populated via User model, as that's where the data currently lives.
         public RankHistoryData RankHistory;
 
@@ -119,13 +112,5 @@ namespace osu.Game.Users
                 }
             }
         }
-
-#pragma warning disable 649
-        private struct UserRanks
-        {
-            [JsonProperty(@"country")]
-            public int? Country;
-        }
-#pragma warning restore 649
     }
 }

From 51a5652666d7d5e653fa28ddc0c74e23ddafe0f6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Mar 2021 22:42:53 +0300
Subject: [PATCH 08364/10326] Refetch tournament users on null country rank

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

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index d506724017..2ee52c35aa 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -150,7 +150,9 @@ namespace osu.Game.Tournament
             {
                 foreach (var p in t.Players)
                 {
-                    if (string.IsNullOrEmpty(p.Username) || p.Statistics?.GlobalRank == null)
+                    if (string.IsNullOrEmpty(p.Username)
+                        || p.Statistics?.GlobalRank == null
+                        || p.Statistics?.CountryRank == null)
                     {
                         PopulateUser(p, immediate: true);
                         addedInfo = true;

From 2d3c3c18d4c1c3e1174079f2363a5d2e03b29c16 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Mar 2021 20:05:35 +0000
Subject: [PATCH 08365/10326] Bump SharpCompress from 0.27.1 to 0.28.1

Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.27.1 to 0.28.1.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.27.1...0.28.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 84a74502c2..4d086844e4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -32,7 +32,7 @@
     <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
-    <PackageReference Include="SharpCompress" Version="0.27.1" />
+    <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index 2cea2e4b13..c0cfb7a96d 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -92,7 +92,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
-    <PackageReference Include="SharpCompress" Version="0.27.1" />
+    <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 9db37e62d8dc33bd19ef35861dab19b5f861af86 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Mar 2021 20:05:53 +0000
Subject: [PATCH 08366/10326] Bump
 Microsoft.AspNetCore.SignalR.Protocols.MessagePack

Bumps [Microsoft.AspNetCore.SignalR.Protocols.MessagePack](https://github.com/dotnet/aspnetcore) from 5.0.2 to 5.0.3.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.2...v5.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 84a74502c2..ca39c160a4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 2cea2e4b13..c854ae7dff 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -80,7 +80,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
     <PackageReference Include="MessagePack" Version="1.7.3.7" />
     <PackageReference Include="MessagePack.Annotations" Version="2.2.85" />
   </ItemGroup>

From 2609b22d53626ff13206a88e70714b952ff5ff35 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Mar 2021 23:07:25 +0300
Subject: [PATCH 08367/10326] Replace usage of `CurrentModeRank` in line with
 API change

---
 osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs       | 4 ++--
 .../Visual/Playlists/TestScenePlaylistsParticipantsList.cs   | 2 +-
 osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs         | 2 +-
 osu.Game/Users/User.cs                                       | 5 +----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
index 9bece39ca0..e8d9ff72af 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Visual.Online
                 Username = "flyte",
                 Id = 3103765,
                 IsOnline = true,
-                CurrentModeRank = 1111,
+                Statistics = new UserStatistics { GlobalRank = 1111 },
                 Country = new Country { FlagName = "JP" },
                 CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
             },
@@ -60,7 +60,7 @@ namespace osu.Game.Tests.Visual.Online
                 Username = "peppy",
                 Id = 2,
                 IsOnline = false,
-                CurrentModeRank = 2222,
+                Statistics = new UserStatistics { GlobalRank = 2222 },
                 Country = new Country { FlagName = "AU" },
                 CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 IsSupporter = true,
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
index 8dd81e02e2..255f147ec9 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Playlists
                 Room.RecentParticipants.Add(new User
                 {
                     Username = "peppy",
-                    CurrentModeRank = 1234,
+                    Statistics = new UserStatistics { GlobalRank = 1234 },
                     Id = 2
                 });
             }
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index e6fe6ac749..0922ce5ecc 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -244,7 +244,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
                     return unsorted.OrderByDescending(u => u.LastVisit).ToList();
 
                 case UserSortCriteria.Rank:
-                    return unsorted.OrderByDescending(u => u.CurrentModeRank.HasValue).ThenBy(u => u.CurrentModeRank ?? 0).ToList();
+                    return unsorted.OrderByDescending(u => u.Statistics.GlobalRank.HasValue).ThenBy(u => u.Statistics.GlobalRank ?? 0).ToList();
 
                 case UserSortCriteria.Username:
                     return unsorted.OrderBy(u => u.Username).ToList();
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 4a6fd540c7..4d537b91bd 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -72,9 +72,6 @@ namespace osu.Game.Users
         [JsonProperty(@"support_level")]
         public int SupportLevel;
 
-        [JsonProperty(@"current_mode_rank")]
-        public int? CurrentModeRank;
-
         [JsonProperty(@"is_gmt")]
         public bool IsGMT;
 
@@ -182,7 +179,7 @@ namespace osu.Game.Users
         private UserStatistics statistics;
 
         /// <summary>
-        /// User statistics for the requested ruleset (in the case of a <see cref="GetUserRequest"/> response).
+        /// User statistics for the requested ruleset (in the case of a <see cref="GetUserRequest"/> or <see cref="GetFriendsRequest"/> response).
         /// Otherwise empty.
         /// </summary>
         [JsonProperty(@"statistics")]

From d6925d09609c81bc8b8dc426d66440f7f25cedad Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 2 Mar 2021 00:43:44 +0000
Subject: [PATCH 08368/10326] Bump Moq from 4.16.0 to 4.16.1

Bumps [Moq](https://github.com/moq/moq4) from 4.16.0 to 4.16.1.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/main/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.16.0...v4.16.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game.Tests.Android/osu.Game.Tests.Android.csproj | 2 +-
 osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj         | 2 +-
 osu.Game.Tests/osu.Game.Tests.csproj                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index 19e36a63f1..543f2f35a7 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.16.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
index 67b2298f4c..e83bef4a95 100644
--- a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
+++ b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
@@ -45,7 +45,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.16.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 7e3868bd3b..877f41fbff 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -7,7 +7,7 @@
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
-    <PackageReference Include="Moq" Version="4.16.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

From b03efd69402995a6bc4ce62cf3b903ace5de396b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 2 Mar 2021 00:43:45 +0000
Subject: [PATCH 08369/10326] Bump Microsoft.NET.Test.Sdk from 16.8.3 to 16.9.1

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.3 to 16.9.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.3...v16.9.1)

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 bf3aba5859..728af5124e 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.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 fcc0cafefc..af16f39563 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.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 b4c686ccea..3d2d1f3fec 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.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 2b084f3bee..fa00922706 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.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 7e3868bd3b..6c5ca937e2 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.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 77ae06d89c..b20583dd7e 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.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>

From 7829a0636e5c021db48d058df16a6554313182d6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 2 Mar 2021 00:43:47 +0000
Subject: [PATCH 08370/10326] Bump Sentry from 3.0.1 to 3.0.7

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.0.1 to 3.0.7.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/3.0.1...3.0.7)

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 5ec7fb81fc..9916122a2a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="Sentry" Version="3.0.1" />
+    <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From fa959291216feeb9e24174d74f9c3bc9a3882f36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Mar 2021 16:07:09 +0900
Subject: [PATCH 08371/10326] Remove easy to remove finalizers

---
 osu.Game/Database/DatabaseWriteUsage.cs | 5 -----
 osu.Game/Utils/SentryLogger.cs          | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/osu.Game/Database/DatabaseWriteUsage.cs b/osu.Game/Database/DatabaseWriteUsage.cs
index ddafd77066..84c39e3532 100644
--- a/osu.Game/Database/DatabaseWriteUsage.cs
+++ b/osu.Game/Database/DatabaseWriteUsage.cs
@@ -54,10 +54,5 @@ namespace osu.Game.Database
             Dispose(true);
             GC.SuppressFinalize(this);
         }
-
-        ~DatabaseWriteUsage()
-        {
-            Dispose(false);
-        }
     }
 }
diff --git a/osu.Game/Utils/SentryLogger.cs b/osu.Game/Utils/SentryLogger.cs
index be9d01cde6..8f12760a6b 100644
--- a/osu.Game/Utils/SentryLogger.cs
+++ b/osu.Game/Utils/SentryLogger.cs
@@ -86,11 +86,6 @@ namespace osu.Game.Utils
 
         #region Disposal
 
-        ~SentryLogger()
-        {
-            Dispose(false);
-        }
-
         public void Dispose()
         {
             Dispose(true);

From c4ba045df158275175e0a84675106986ae96b946 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Mar 2021 16:07:51 +0900
Subject: [PATCH 08372/10326] Add note about finalizers required for audio
 store clean-up

---
 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs | 1 +
 osu.Game/Skinning/Skin.cs                           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index b31884d246..14aa3fe99a 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -63,6 +63,7 @@ namespace osu.Game.Rulesets.UI
 
         ~DrawableRulesetDependencies()
         {
+            // required to potentially clean up sample store from audio hierarchy.
             Dispose(false);
         }
 
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index e8d84b49f9..6b435cff0f 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -36,6 +36,7 @@ namespace osu.Game.Skinning
 
         ~Skin()
         {
+            // required to potentially clean up sample store from audio hierarchy.
             Dispose(false);
         }
 

From 103dd4a6cea72ec399ac995acfe5270bd1da0de7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Mar 2021 16:14:43 +0900
Subject: [PATCH 08373/10326] Remove WorkingBeatmap's finalizer

---
 osu.Game/Beatmaps/BeatmapManager.cs |  4 ++++
 osu.Game/Beatmaps/WorkingBeatmap.cs | 10 ----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 3c6a6ba302..d653e5386b 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -20,6 +20,7 @@ using osu.Framework.IO.Stores;
 using osu.Framework.Lists;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
+using osu.Framework.Statistics;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
@@ -311,6 +312,9 @@ namespace osu.Game.Beatmaps
 
                 workingCache.Add(working = new BeatmapManagerWorkingBeatmap(beatmapInfo, this));
 
+                // best effort; may be higher than expected.
+                GlobalStatistics.Get<int>(nameof(Beatmaps), $"Cached {nameof(WorkingBeatmap)}s").Value = workingCache.Count();
+
                 return working;
             }
         }
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index aab8ff6bd6..f7f276230f 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -12,7 +12,6 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
-using osu.Framework.Statistics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -34,8 +33,6 @@ namespace osu.Game.Beatmaps
 
         protected AudioManager AudioManager { get; }
 
-        private static readonly GlobalStatistic<int> total_count = GlobalStatistics.Get<int>(nameof(Beatmaps), $"Total {nameof(WorkingBeatmap)}s");
-
         protected WorkingBeatmap(BeatmapInfo beatmapInfo, AudioManager audioManager)
         {
             AudioManager = audioManager;
@@ -47,8 +44,6 @@ namespace osu.Game.Beatmaps
             waveform = new RecyclableLazy<Waveform>(GetWaveform);
             storyboard = new RecyclableLazy<Storyboard>(GetStoryboard);
             skin = new RecyclableLazy<ISkin>(GetSkin);
-
-            total_count.Value++;
         }
 
         protected virtual Track GetVirtualTrack(double emptyLength = 0)
@@ -331,11 +326,6 @@ namespace osu.Game.Beatmaps
         protected virtual ISkin GetSkin() => new DefaultSkin();
         private readonly RecyclableLazy<ISkin> skin;
 
-        ~WorkingBeatmap()
-        {
-            total_count.Value--;
-        }
-
         public class RecyclableLazy<T>
         {
             private Lazy<T> lazy;

From 6372a0265af98f48afa15d4c4499a1a33250db6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Mar 2021 17:44:56 +0900
Subject: [PATCH 08374/10326] Fix confine mode dropdown becoming visible again
 after filtering

Changes from a hidden to a disabled state, with a tooltip explaining
why.

Closes #11851.
---
 .../Settings/Sections/Input/MouseSettings.cs     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 455e13711d..768a18cca0 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -68,7 +68,21 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             };
 
             windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            windowMode.BindValueChanged(mode => confineMouseModeSetting.Alpha = mode.NewValue == WindowMode.Fullscreen ? 0 : 1, true);
+            windowMode.BindValueChanged(mode =>
+            {
+                var isFullscreen = mode.NewValue == WindowMode.Fullscreen;
+
+                if (isFullscreen)
+                {
+                    confineMouseModeSetting.Current.Disabled = true;
+                    confineMouseModeSetting.TooltipText = "Not applicable in full screen mode";
+                }
+                else
+                {
+                    confineMouseModeSetting.Current.Disabled = false;
+                    confineMouseModeSetting.TooltipText = string.Empty;
+                }
+            }, true);
 
             if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
             {

From 0300a554476c72fb0e07774350f0fc79687718c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Mar 2021 18:00:50 +0900
Subject: [PATCH 08375/10326] 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 5d83bb9583..c428cd2546 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.226.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.302.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9916122a2a..2528292e17 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.302.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index b4f981162a..56a24bea12 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.Framework.iOS" Version="2021.226.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.302.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,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="2021.226.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.302.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 30ff0b83c199a20ddcd2e86beb643842f1263daf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Mar 2021 19:06:21 +0900
Subject: [PATCH 08376/10326] Fix test failures due to unpopulated room

---
 .../Tests/Visual/Multiplayer/MultiplayerTestScene.cs  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 2e8c834c65..7775c2bd24 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -7,8 +7,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -48,7 +50,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             RoomManager.Schedule(() => RoomManager.PartRoom());
 
             if (joinRoom)
+            {
+                Room.Name.Value = "test name";
+                Room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = new TestBeatmap(Ruleset.Value).BeatmapInfo },
+                    Ruleset = { Value = Ruleset.Value }
+                });
+
                 RoomManager.Schedule(() => RoomManager.CreateRoom(Room));
+            }
         });
 
         public override void SetUpSteps()

From 711cf3e5111e46f293b8aba2216c082378944eb3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 17:25:36 +0300
Subject: [PATCH 08377/10326] Add mobile logs location to issue templates

---
 .github/ISSUE_TEMPLATE/01-bug-issues.md   | 2 ++
 .github/ISSUE_TEMPLATE/02-crash-issues.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/01-bug-issues.md b/.github/ISSUE_TEMPLATE/01-bug-issues.md
index 0b80ce44dd..6050036cbf 100644
--- a/.github/ISSUE_TEMPLATE/01-bug-issues.md
+++ b/.github/ISSUE_TEMPLATE/01-bug-issues.md
@@ -13,4 +13,6 @@ about: Issues regarding encountered bugs.
 *please attach logs here, which are located at:*
 - `%AppData%/osu/logs` *(on Windows),*
 - `~/.local/share/osu/logs` *(on Linux & macOS).*
+- `Android/Data/sh.ppy.osulazer/logs` *(on Android)*,
+- on iOS they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes. (https://support.apple.com/en-us/HT201301#copy-to-computer)
 -->
diff --git a/.github/ISSUE_TEMPLATE/02-crash-issues.md b/.github/ISSUE_TEMPLATE/02-crash-issues.md
index ada8de73c0..04170312d1 100644
--- a/.github/ISSUE_TEMPLATE/02-crash-issues.md
+++ b/.github/ISSUE_TEMPLATE/02-crash-issues.md
@@ -13,6 +13,8 @@ about: Issues regarding crashes or permanent freezes.
 *please attach logs here, which are located at:*
 - `%AppData%/osu/logs` *(on Windows),*
 - `~/.local/share/osu/logs` *(on Linux & macOS).*
+- `Android/Data/sh.ppy.osulazer/logs` *(on Android)*,
+- on iOS they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes. (https://support.apple.com/en-us/HT201301#copy-to-computer)
 -->
 
 **Computer Specifications:** 

From 40a28367c63a2cf7e3c87eeccaf617b1f25564a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 18:50:33 +0100
Subject: [PATCH 08378/10326] Fix restore-to-default buttons never showing if
 initially hidden

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

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 4cb8d7f83c..c5890a6fbb 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -147,6 +147,7 @@ namespace osu.Game.Overlays.Settings
                 RelativeSizeAxes = Axes.Y;
                 Width = SettingsPanel.CONTENT_MARGINS;
                 Alpha = 0f;
+                AlwaysPresent = true;
             }
 
             [BackgroundDependencyLoader]

From 3b125a26a863e61d20a9a5018ab10383c2486611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 19:18:01 +0100
Subject: [PATCH 08379/10326] Add test coverage

---
 .../Visual/Settings/TestSceneSettingsItem.cs  | 43 +++++++++++++++++++
 osu.Game/Overlays/Settings/SettingsItem.cs    |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
new file mode 100644
index 0000000000..8f1c17ed29
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    [TestFixture]
+    public class TestSceneSettingsItem : OsuTestScene
+    {
+        [Test]
+        public void TestRestoreDefaultValueButtonVisibility()
+        {
+            TestSettingsTextBox textBox = null;
+
+            AddStep("create settings item", () => Child = textBox = new TestSettingsTextBox
+            {
+                Current = new Bindable<string>
+                {
+                    Default = "test",
+                    Value = "test"
+                }
+            });
+            AddAssert("restore button hidden", () => textBox.RestoreDefaultValueButton.Alpha == 0);
+
+            AddStep("change value from default", () => textBox.Current.Value = "non-default");
+            AddUntilStep("restore button shown", () => textBox.RestoreDefaultValueButton.Alpha > 0);
+
+            AddStep("restore default", () => textBox.Current.SetDefault());
+            AddUntilStep("restore button hidden", () => textBox.RestoreDefaultValueButton.Alpha == 0);
+        }
+
+        private class TestSettingsTextBox : SettingsTextBox
+        {
+            public new Drawable RestoreDefaultValueButton => this.ChildrenOfType<RestoreDefaultValueButton>().Single();
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index c5890a6fbb..8631b8ac7b 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Overlays.Settings
                 labelText.Alpha = controlWithCurrent.Current.Disabled ? 0.3f : 1;
         }
 
-        private class RestoreDefaultValueButton : Container, IHasTooltip
+        protected internal class RestoreDefaultValueButton : Container, IHasTooltip
         {
             private Bindable<T> bindable;
 

From 26736d990f792f15bd0c92f7f5a100a8f800816d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 19:42:47 +0100
Subject: [PATCH 08380/10326] Enable filter parsing extensibility

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 4b6b3be45c..3f1b80ee1c 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.Select
     internal static class FilterQueryParser
     {
         private static readonly Regex query_syntax_regex = new Regex(
-            @"\b(?<key>stars|ar|dr|hp|cs|divisor|length|objects|bpm|status|creator|artist)(?<op>[=:><]+)(?<value>("".*"")|(\S*))",
+            @"\b(?<key>\w+)(?<op>[=:><]+)(?<value>("".*"")|(\S*))",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         internal static void ApplyQueries(FilterCriteria criteria, string query)
@@ -22,15 +22,14 @@ namespace osu.Game.Screens.Select
                 var op = match.Groups["op"].Value;
                 var value = match.Groups["value"].Value;
 
-                parseKeywordCriteria(criteria, key, value, op);
-
-                query = query.Replace(match.ToString(), "");
+                if (tryParseKeywordCriteria(criteria, key, value, op))
+                    query = query.Replace(match.ToString(), "");
             }
 
             criteria.SearchText = query;
         }
 
-        private static void parseKeywordCriteria(FilterCriteria criteria, string key, string value, string op)
+        private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key, string value, string op)
         {
             switch (key)
             {
@@ -75,7 +74,12 @@ namespace osu.Game.Screens.Select
                 case "artist":
                     updateCriteriaText(ref criteria.Artist, op, value);
                     break;
+
+                default:
+                    return false;
             }
+
+            return true;
         }
 
         private static int getLengthScale(string value) =>

From e46543a4a924d6bab3b7ef67fa8d3d992d6504bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 19:56:36 +0100
Subject: [PATCH 08381/10326] Constrain operator parsing better

---
 .../Filtering/FilterQueryParserTest.cs        |   9 ++
 osu.Game/Screens/Select/Filter/Operator.cs    |  17 +++
 osu.Game/Screens/Select/FilterQueryParser.cs  | 131 ++++++++++--------
 3 files changed, 99 insertions(+), 58 deletions(-)
 create mode 100644 osu.Game/Screens/Select/Filter/Operator.cs

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index d15682b1eb..e121cb835c 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -194,5 +194,14 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual(1, filterCriteria.SearchTerms.Length);
             Assert.AreEqual("double\"quote", filterCriteria.Artist.SearchTerm);
         }
+
+        [Test]
+        public void TestOperatorParsing()
+        {
+            const string query = "artist=><something";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("><something", filterCriteria.Artist.SearchTerm);
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/Filter/Operator.cs b/osu.Game/Screens/Select/Filter/Operator.cs
new file mode 100644
index 0000000000..706daf631f
--- /dev/null
+++ b/osu.Game/Screens/Select/Filter/Operator.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Screens.Select.Filter
+{
+    /// <summary>
+    /// Defines logical operators that can be used in the song select search box keyword filters.
+    /// </summary>
+    public enum Operator
+    {
+        Less,
+        LessOrEqual,
+        Equal,
+        GreaterOrEqual,
+        Greater
+    }
+}
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 3f1b80ee1c..d2d33b13f5 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -5,13 +5,14 @@ using System;
 using System.Globalization;
 using System.Text.RegularExpressions;
 using osu.Game.Beatmaps;
+using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Screens.Select
 {
     internal static class FilterQueryParser
     {
         private static readonly Regex query_syntax_regex = new Regex(
-            @"\b(?<key>\w+)(?<op>[=:><]+)(?<value>("".*"")|(\S*))",
+            @"\b(?<key>\w+)(?<op>(:|=|(>|<)(:|=)?))(?<value>("".*"")|(\S*))",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         internal static void ApplyQueries(FilterCriteria criteria, string query)
@@ -19,7 +20,7 @@ namespace osu.Game.Screens.Select
             foreach (Match match in query_syntax_regex.Matches(query))
             {
                 var key = match.Groups["key"].Value.ToLower();
-                var op = match.Groups["op"].Value;
+                var op = parseOperator(match.Groups["op"].Value);
                 var value = match.Groups["value"].Value;
 
                 if (tryParseKeywordCriteria(criteria, key, value, op))
@@ -29,57 +30,72 @@ namespace osu.Game.Screens.Select
             criteria.SearchText = query;
         }
 
-        private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key, string value, string op)
+        private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key, string value, Operator op)
         {
             switch (key)
             {
                 case "stars" when parseFloatWithPoint(value, out var stars):
-                    updateCriteriaRange(ref criteria.StarDifficulty, op, stars, 0.01f / 2);
-                    break;
+                    return updateCriteriaRange(ref criteria.StarDifficulty, op, stars, 0.01f / 2);
 
                 case "ar" when parseFloatWithPoint(value, out var ar):
-                    updateCriteriaRange(ref criteria.ApproachRate, op, ar, 0.1f / 2);
-                    break;
+                    return updateCriteriaRange(ref criteria.ApproachRate, op, ar, 0.1f / 2);
 
                 case "dr" when parseFloatWithPoint(value, out var dr):
                 case "hp" when parseFloatWithPoint(value, out dr):
-                    updateCriteriaRange(ref criteria.DrainRate, op, dr, 0.1f / 2);
-                    break;
+                    return updateCriteriaRange(ref criteria.DrainRate, op, dr, 0.1f / 2);
 
                 case "cs" when parseFloatWithPoint(value, out var cs):
-                    updateCriteriaRange(ref criteria.CircleSize, op, cs, 0.1f / 2);
-                    break;
+                    return updateCriteriaRange(ref criteria.CircleSize, op, cs, 0.1f / 2);
 
                 case "bpm" when parseDoubleWithPoint(value, out var bpm):
-                    updateCriteriaRange(ref criteria.BPM, op, bpm, 0.01d / 2);
-                    break;
+                    return updateCriteriaRange(ref criteria.BPM, op, bpm, 0.01d / 2);
 
                 case "length" when parseDoubleWithPoint(value.TrimEnd('m', 's', 'h'), out var length):
                     var scale = getLengthScale(value);
-                    updateCriteriaRange(ref criteria.Length, op, length * scale, scale / 2.0);
-                    break;
+                    return updateCriteriaRange(ref criteria.Length, op, length * scale, scale / 2.0);
 
                 case "divisor" when parseInt(value, out var divisor):
-                    updateCriteriaRange(ref criteria.BeatDivisor, op, divisor);
-                    break;
+                    return updateCriteriaRange(ref criteria.BeatDivisor, op, divisor);
 
                 case "status" when Enum.TryParse<BeatmapSetOnlineStatus>(value, true, out var statusValue):
-                    updateCriteriaRange(ref criteria.OnlineStatus, op, statusValue);
-                    break;
+                    return updateCriteriaRange(ref criteria.OnlineStatus, op, statusValue);
 
                 case "creator":
-                    updateCriteriaText(ref criteria.Creator, op, value);
-                    break;
+                    return updateCriteriaText(ref criteria.Creator, op, value);
 
                 case "artist":
-                    updateCriteriaText(ref criteria.Artist, op, value);
-                    break;
+                    return updateCriteriaText(ref criteria.Artist, op, value);
 
                 default:
                     return false;
             }
+        }
 
-            return true;
+        private static Operator parseOperator(string value)
+        {
+            switch (value)
+            {
+                case "=":
+                case ":":
+                    return Operator.Equal;
+
+                case "<":
+                    return Operator.Less;
+
+                case "<=":
+                case "<:":
+                    return Operator.LessOrEqual;
+
+                case ">":
+                    return Operator.Greater;
+
+                case ">=":
+                case ">:":
+                    return Operator.GreaterOrEqual;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(value), $"Unsupported operator {value}");
+            }
         }
 
         private static int getLengthScale(string value) =>
@@ -97,120 +113,119 @@ namespace osu.Game.Screens.Select
         private static bool parseInt(string value, out int result) =>
             int.TryParse(value, NumberStyles.None, CultureInfo.InvariantCulture, out result);
 
-        private static void updateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, string op, string value)
+        private static bool updateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, Operator op, string value)
         {
             switch (op)
             {
-                case "=":
-                case ":":
+                case Operator.Equal:
                     textFilter.SearchTerm = value.Trim('"');
-                    break;
+                    return true;
+
+                default:
+                    return false;
             }
         }
 
-        private static void updateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, string op, float value, float tolerance = 0.05f)
+        private static bool updateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, float value, float tolerance = 0.05f)
         {
             switch (op)
             {
                 default:
-                    return;
+                    return false;
 
-                case "=":
-                case ":":
+                case Operator.Equal:
                     range.Min = value - tolerance;
                     range.Max = value + tolerance;
                     break;
 
-                case ">":
+                case Operator.Greater:
                     range.Min = value + tolerance;
                     break;
 
-                case ">=":
-                case ">:":
+                case Operator.GreaterOrEqual:
                     range.Min = value - tolerance;
                     break;
 
-                case "<":
+                case Operator.Less:
                     range.Max = value - tolerance;
                     break;
 
-                case "<=":
-                case "<:":
+                case Operator.LessOrEqual:
                     range.Max = value + tolerance;
                     break;
             }
+
+            return true;
         }
 
-        private static void updateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, string op, double value, double tolerance = 0.05)
+        private static bool updateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, double value, double tolerance = 0.05)
         {
             switch (op)
             {
                 default:
-                    return;
+                    return false;
 
-                case "=":
-                case ":":
+                case Operator.Equal:
                     range.Min = value - tolerance;
                     range.Max = value + tolerance;
                     break;
 
-                case ">":
+                case Operator.Greater:
                     range.Min = value + tolerance;
                     break;
 
-                case ">=":
-                case ">:":
+                case Operator.GreaterOrEqual:
                     range.Min = value - tolerance;
                     break;
 
-                case "<":
+                case Operator.Less:
                     range.Max = value - tolerance;
                     break;
 
-                case "<=":
-                case "<:":
+                case Operator.LessOrEqual:
                     range.Max = value + tolerance;
                     break;
             }
+
+            return true;
         }
 
-        private static void updateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, string op, T value)
+        private static bool updateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, T value)
             where T : struct
         {
             switch (op)
             {
                 default:
-                    return;
+                    return false;
 
-                case "=":
-                case ":":
+                case Operator.Equal:
                     range.IsLowerInclusive = range.IsUpperInclusive = true;
                     range.Min = value;
                     range.Max = value;
                     break;
 
-                case ">":
+                case Operator.Greater:
                     range.IsLowerInclusive = false;
                     range.Min = value;
                     break;
 
-                case ">=":
-                case ">:":
+                case Operator.GreaterOrEqual:
                     range.IsLowerInclusive = true;
                     range.Min = value;
                     break;
 
-                case "<":
+                case Operator.Less:
                     range.IsUpperInclusive = false;
                     range.Max = value;
                     break;
 
-                case "<=":
-                case "<:":
+                case Operator.LessOrEqual:
                     range.IsUpperInclusive = true;
                     range.Max = value;
                     break;
             }
+
+            return true;
         }
     }
 }

From 14e249a13405e834a7ea90b32cc3e8246efc37be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 20:07:11 +0100
Subject: [PATCH 08382/10326] Add ruleset interface for extending filter
 criteria

---
 .../Rulesets/Filter/IRulesetFilterCriteria.cs | 44 +++++++++++++++++++
 osu.Game/Rulesets/Ruleset.cs                  |  7 +++
 2 files changed, 51 insertions(+)
 create mode 100644 osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs

diff --git a/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs b/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
new file mode 100644
index 0000000000..a83f87d72b
--- /dev/null
+++ b/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.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.Game.Beatmaps;
+using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Filter;
+
+namespace osu.Game.Rulesets.Filter
+{
+    /// <summary>
+    /// Allows for extending the beatmap filtering capabilities of song select (as implemented in <see cref="FilterCriteria"/>)
+    /// with ruleset-specific criteria.
+    /// </summary>
+    public interface IRulesetFilterCriteria
+    {
+        /// <summary>
+        /// Checks whether the supplied <paramref name="beatmap"/> satisfies ruleset-specific custom criteria,
+        /// in addition to the ones mandated by song select.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to test the criteria against.</param>
+        /// <returns>
+        /// <c>true</c> if the beatmap matches the ruleset-specific custom filtering criteria,
+        /// <c>false</c> otherwise.
+        /// </returns>
+        bool Matches(BeatmapInfo beatmap);
+
+        /// <summary>
+        /// Attempts to parse a single custom keyword criterion, given by the user via the song select search box.
+        /// The format of the criterion is:
+        /// <code>
+        /// {key}{op}{value}
+        /// </code>
+        /// </summary>
+        /// <param name="key">The key (name) of the criterion.</param>
+        /// <param name="op">The operator in the criterion.</param>
+        /// <param name="value">The value of the criterion.</param>
+        /// <returns>
+        /// <c>true</c> if the keyword criterion is valid, <c>false</c> if it has been ignored.
+        /// Valid criteria are stripped from <see cref="FilterCriteria.SearchText"/>,
+        /// while ignored criteria are included in <see cref="FilterCriteria.SearchText"/>.
+        /// </returns>
+        bool TryParseCustomKeywordCriteria(string key, Operator op, string value);
+    }
+}
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index dbc2bd4d01..38d30a2e31 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -26,6 +26,7 @@ using JetBrains.Annotations;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Testing;
+using osu.Game.Rulesets.Filter;
 using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets
@@ -306,5 +307,11 @@ namespace osu.Game.Rulesets
         /// <param name="result">The result type to get the name for.</param>
         /// <returns>The display name.</returns>
         public virtual string GetDisplayNameForHitResult(HitResult result) => result.GetDescription();
+
+        /// <summary>
+        /// Creates ruleset-specific beatmap filter criteria to be used on the song select screen.
+        /// </summary>
+        [CanBeNull]
+        public virtual IRulesetFilterCriteria CreateRulesetFilterCriteria() => null;
     }
 }

From c375be6b07b7d4bc19d29683c61a9f4da6529d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 20:10:03 +0100
Subject: [PATCH 08383/10326] Instantiate ruleset criteria

---
 osu.Game/Screens/Select/FilterControl.cs  | 8 ++++++++
 osu.Game/Screens/Select/FilterCriteria.cs | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index eafd8a87d1..983928ac51 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -34,8 +35,13 @@ namespace osu.Game.Screens.Select
 
         private Bindable<GroupMode> groupMode;
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
         public FilterCriteria CreateCriteria()
         {
+            Debug.Assert(ruleset.Value.ID != null);
+
             var query = searchTextBox.Text;
 
             var criteria = new FilterCriteria
@@ -53,6 +59,8 @@ namespace osu.Game.Screens.Select
             if (!maximumStars.IsDefault)
                 criteria.UserStarDifficulty.Max = maximumStars.Value;
 
+            criteria.RulesetCriteria = rulesets.GetRuleset(ruleset.Value.ID.Value).CreateInstance().CreateRulesetFilterCriteria();
+
             FilterQueryParser.ApplyQueries(criteria, query);
             return criteria;
         }
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 7bddb3e51b..208048380a 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -8,6 +8,7 @@ using JetBrains.Annotations;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Filter;
 using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Screens.Select
@@ -69,6 +70,9 @@ namespace osu.Game.Screens.Select
         [CanBeNull]
         public BeatmapCollection Collection;
 
+        [CanBeNull]
+        public IRulesetFilterCriteria RulesetCriteria { get; set; }
+
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct
         {

From 42c3309d4918db8044c312d28f3efbc7422caae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 20:11:21 +0100
Subject: [PATCH 08384/10326] Use ruleset criteria in parsing and filtering

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 3 +++
 osu.Game/Screens/Select/FilterQueryParser.cs        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 1aab50037a..521b90202d 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -73,6 +73,9 @@ namespace osu.Game.Screens.Select.Carousel
             if (match)
                 match &= criteria.Collection?.Beatmaps.Contains(Beatmap) ?? true;
 
+            if (match && criteria.RulesetCriteria != null)
+                match &= criteria.RulesetCriteria.Matches(Beatmap);
+
             Filtered.Value = !match;
         }
 
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index d2d33b13f5..c81a72d938 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Select
                     return updateCriteriaText(ref criteria.Artist, op, value);
 
                 default:
-                    return false;
+                    return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
             }
         }
 

From bf72f9ad1e988f14dbd8ca5b87f55c64b52d9c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 20:22:56 +0100
Subject: [PATCH 08385/10326] Add tests for custom parsing logic

---
 .../Filtering/FilterQueryParserTest.cs        | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index e121cb835c..d835e58b29 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -4,7 +4,9 @@
 using System;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Filter;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Tests.NonVisual.Filtering
 {
@@ -203,5 +205,43 @@ namespace osu.Game.Tests.NonVisual.Filtering
             FilterQueryParser.ApplyQueries(filterCriteria, query);
             Assert.AreEqual("><something", filterCriteria.Artist.SearchTerm);
         }
+
+        [Test]
+        public void TestUnrecognisedKeywordIsIgnored()
+        {
+            const string query = "unrecognised=keyword";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("unrecognised=keyword", filterCriteria.SearchText);
+        }
+
+        [Test]
+        public void TestCustomKeywordIsParsed()
+        {
+            var customCriteria = new CustomFilterCriteria();
+            const string query = "custom=readme unrecognised=keyword";
+            var filterCriteria = new FilterCriteria { RulesetCriteria = customCriteria };
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("readme", customCriteria.CustomValue);
+            Assert.AreEqual("unrecognised=keyword", filterCriteria.SearchText.Trim());
+        }
+
+        private class CustomFilterCriteria : IRulesetFilterCriteria
+        {
+            public string CustomValue { get; set; }
+
+            public bool Matches(BeatmapInfo beatmap) => true;
+
+            public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
+            {
+                if (key == "custom" && op == Operator.Equal)
+                {
+                    CustomValue = value;
+                    return true;
+                }
+
+                return false;
+            }
+        }
     }
 }

From faf5fbf49b5a940b41ba3e7b1336fbefd868895a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 20:27:50 +0100
Subject: [PATCH 08386/10326] Add tests for custom matching logic

---
 .../NonVisual/Filtering/FilterMatchingTest.cs | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
index 24a0a662ba..8ff2743b6a 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
@@ -4,8 +4,10 @@
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Filter;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Carousel;
+using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Tests.NonVisual.Filtering
 {
@@ -214,5 +216,31 @@ namespace osu.Game.Tests.NonVisual.Filtering
 
             Assert.AreEqual(filtered, carouselItem.Filtered.Value);
         }
+
+        [Test]
+        public void TestCustomRulesetCriteria([Values(null, true, false)] bool? matchCustomCriteria)
+        {
+            var beatmap = getExampleBeatmap();
+
+            var customCriteria = matchCustomCriteria is bool match ? new CustomCriteria(match) : null;
+            var criteria = new FilterCriteria { RulesetCriteria = customCriteria };
+            var carouselItem = new CarouselBeatmap(beatmap);
+            carouselItem.Filter(criteria);
+
+            Assert.AreEqual(matchCustomCriteria == false, carouselItem.Filtered.Value);
+        }
+
+        private class CustomCriteria : IRulesetFilterCriteria
+        {
+            private readonly bool match;
+
+            public CustomCriteria(bool shouldMatch)
+            {
+                match = shouldMatch;
+            }
+
+            public bool Matches(BeatmapInfo beatmap) => match;
+            public bool TryParseCustomKeywordCriteria(string key, Operator op, string value) => false;
+        }
     }
 }

From 6e75ebbb06fb6bf394e257bc44877b3f7171923f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:02:01 +0900
Subject: [PATCH 08387/10326] Add interface to handle local beatmap
 presentation logic

---
 osu.Game/Screens/IHandlePresentBeatmap.cs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 osu.Game/Screens/IHandlePresentBeatmap.cs

diff --git a/osu.Game/Screens/IHandlePresentBeatmap.cs b/osu.Game/Screens/IHandlePresentBeatmap.cs
new file mode 100644
index 0000000000..b94df630ef
--- /dev/null
+++ b/osu.Game/Screens/IHandlePresentBeatmap.cs
@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Screens
+{
+    /// <summary>
+    /// Denotes a screen which can handle beatmap / ruleset selection via local logic.
+    /// This is used in the <see cref="OsuGame.PresentBeatmap"/> flow to handle cases which require custom logic,
+    /// for instance, if a lease is held on the Beatmap.
+    /// </summary>
+    public interface IHandlePresentBeatmap
+    {
+        /// <summary>
+        /// Invoked with a requested beatmap / ruleset for selection.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to be selected.</param>
+        /// <param name="ruleset">The ruleset to be selected.</param>
+        public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset);
+    }
+}

From 36e1fb6da80a1416900d07ae9c69c9b12e8876ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:04:00 +0900
Subject: [PATCH 08388/10326] Add flow to allow MatchSubScreen to handle
 beatmap presentation locally

---
 osu.Game/OsuGame.cs                           | 13 ++++++++++---
 osu.Game/PerformFromMenuRunner.cs             |  7 +------
 .../Multiplayer/MultiplayerMatchSongSelect.cs | 19 +++++++++++++++++++
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 12 +++++++++++-
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 771bcd2310..1e0cb587e9 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -381,9 +381,16 @@ namespace osu.Game
                                 ?? beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value))
                                 ?? beatmaps.First();
 
-                Ruleset.Value = selection.Ruleset;
-                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
-            }, validScreens: new[] { typeof(SongSelect) });
+                if (screen is IHandlePresentBeatmap presentableScreen)
+                {
+                    presentableScreen.PresentBeatmap(BeatmapManager.GetWorkingBeatmap(selection), selection.Ruleset);
+                }
+                else
+                {
+                    Ruleset.Value = selection.Ruleset;
+                    Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
+                }
+            }, validScreens: new[] { typeof(SongSelect), typeof(IHandlePresentBeatmap) });
         }
 
         /// <summary>
diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index fe75a3a607..6f979b8dc8 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -5,11 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
-using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Overlays.Notifications;
@@ -30,9 +28,6 @@ namespace osu.Game
         [Resolved]
         private DialogOverlay dialogOverlay { get; set; }
 
-        [Resolved]
-        private IBindable<WorkingBeatmap> beatmap { get; set; }
-
         [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
 
@@ -90,7 +85,7 @@ namespace osu.Game
             var type = current.GetType();
 
             // check if we are already at a valid target screen.
-            if (validScreens.Any(t => t.IsAssignableFrom(type)) && !beatmap.Disabled)
+            if (validScreens.Any(t => t.IsAssignableFrom(type)))
             {
                 finalAction(current);
                 Cancel();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index f17d97c3fd..c9f0f6de90 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -4,9 +4,11 @@
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
 
@@ -19,6 +21,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private LoadingLayer loadingLayer;
 
+        /// <summary>
+        /// Construct a new instance of multiplayer song select.
+        /// </summary>
+        /// <param name="beatmap">An optional initial beatmap selection to perform.</param>
+        /// <param name="ruleset">An optional initial ruleset selection to perform.</param>
+        public MultiplayerMatchSongSelect(WorkingBeatmap beatmap = null, RulesetInfo ruleset = null)
+        {
+            if (beatmap != null || ruleset != null)
+            {
+                Schedule(() =>
+                {
+                    if (beatmap != null) Beatmap.Value = beatmap;
+                    if (ruleset != null) Ruleset.Value = ruleset;
+                });
+            }
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 4fbea4e3be..06d83e495c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -12,9 +12,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
@@ -29,7 +31,7 @@ using ParticipantsList = osu.Game.Screens.OnlinePlay.Multiplayer.Participants.Pa
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     [Cached]
-    public class MultiplayerMatchSubScreen : RoomSubScreen
+    public class MultiplayerMatchSubScreen : RoomSubScreen, IHandlePresentBeatmap
     {
         public override string Title { get; }
 
@@ -394,5 +396,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             modSettingChangeTracker?.Dispose();
         }
+
+        public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset)
+        {
+            if (!this.IsCurrentScreen())
+                return;
+
+            this.Push(new MultiplayerMatchSongSelect(beatmap, ruleset));
+        }
     }
 }

From fcea900a5327cc3d421c7332ed001026f6521388 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:06:39 +0900
Subject: [PATCH 08389/10326] Move main menu (song select) presentation logic
 to a local implementation

Reduces cross-dependencies between OsuGame and MainMenu.
---
 osu.Game/OsuGame.cs               |  4 ----
 osu.Game/Screens/Menu/MainMenu.cs | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1e0cb587e9..6f760a1aa7 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -361,10 +361,6 @@ namespace osu.Game
 
             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 && (difficultyCriteria?.Invoke(Beatmap.Value.BeatmapInfo) ?? true))
                     return;
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 424e6d2cd5..baeb86c976 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -9,12 +9,14 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.IO;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
@@ -23,7 +25,7 @@ using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.Menu
 {
-    public class MainMenu : OsuScreen
+    public class MainMenu : OsuScreen, IHandlePresentBeatmap
     {
         public const float FADE_IN_DURATION = 300;
 
@@ -104,7 +106,7 @@ namespace osu.Game.Screens.Menu
                                 Beatmap.SetDefault();
                                 this.Push(new Editor());
                             },
-                            OnSolo = onSolo,
+                            OnSolo = loadSoloSongSelect,
                             OnMultiplayer = () => this.Push(new Multiplayer()),
                             OnPlaylists = () => this.Push(new Playlists()),
                             OnExit = confirmAndExit,
@@ -160,9 +162,7 @@ namespace osu.Game.Screens.Menu
                 LoadComponentAsync(songSelect = new PlaySongSelect());
         }
 
-        public void LoadToSolo() => Schedule(onSolo);
-
-        private void onSolo() => this.Push(consumeSongSelect());
+        private void loadSoloSongSelect() => this.Push(consumeSongSelect());
 
         private Screen consumeSongSelect()
         {
@@ -289,5 +289,13 @@ namespace osu.Game.Screens.Menu
             this.FadeOut(3000);
             return base.OnExiting(next);
         }
+
+        public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset)
+        {
+            Beatmap.Value = beatmap;
+            Ruleset.Value = ruleset;
+
+            Schedule(loadSoloSongSelect);
+        }
     }
 }

From 7c5904008247a113525396f9c4e1603ef470a464 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:17:06 +0900
Subject: [PATCH 08390/10326] Re-present even when already the current beatmap

This feels better and closer to what a user would expect.
---
 osu.Game/OsuGame.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6f760a1aa7..7db85d0d66 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -361,10 +361,6 @@ namespace osu.Game
 
             PerformFromScreen(screen =>
             {
-                // we might even already be at the song
-                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && (difficultyCriteria?.Invoke(Beatmap.Value.BeatmapInfo) ?? true))
-                    return;
-
                 // Find beatmaps that match our predicate.
                 var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria?.Invoke(b) ?? true).ToList();
 

From 7dce9b04fa0a7870d7576c803c8130a095124484 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:50:45 +0900
Subject: [PATCH 08391/10326] Add a more basic ConfirmDialog implementation

---
 osu.Game/Overlays/Dialog/ConfirmDialog.cs  | 45 ++++++++++++++++++++++
 osu.Game/Screens/Menu/ConfirmExitDialog.cs | 26 +++----------
 2 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 osu.Game/Overlays/Dialog/ConfirmDialog.cs

diff --git a/osu.Game/Overlays/Dialog/ConfirmDialog.cs b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
new file mode 100644
index 0000000000..6f160daf97
--- /dev/null
+++ b/osu.Game/Overlays/Dialog/ConfirmDialog.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 System;
+using osu.Framework.Graphics.Sprites;
+
+namespace osu.Game.Overlays.Dialog
+{
+    /// <summary>
+    /// A dialog which confirms a user action.
+    /// </summary>
+    public class ConfirmDialog : PopupDialog
+    {
+        protected PopupDialogOkButton ButtonConfirm;
+        protected PopupDialogCancelButton ButtonCancel;
+
+        /// <summary>
+        /// Construct a new dialog.
+        /// </summary>
+        /// <param name="description">The description of the action to be displayed to the user.</param>
+        /// <param name="onConfirm">An action to perform on confirmation.</param>
+        /// <param name="onCancel">An optional action to perform on cancel.</param>
+        public ConfirmDialog(string description, Action onConfirm, Action onCancel = null)
+        {
+            HeaderText = $"Are you sure you want to {description}?";
+            BodyText = "Last chance to back out.";
+
+            Icon = FontAwesome.Solid.ExclamationTriangle;
+
+            Buttons = new PopupDialogButton[]
+            {
+                ButtonConfirm = new PopupDialogOkButton
+                {
+                    Text = @"Yes",
+                    Action = onConfirm
+                },
+                ButtonCancel = new PopupDialogCancelButton
+                {
+                    Text = @"Cancel",
+                    Action = onCancel
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/ConfirmExitDialog.cs b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
index d120eb21a8..41cc7b480c 100644
--- a/osu.Game/Screens/Menu/ConfirmExitDialog.cs
+++ b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
@@ -2,33 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Screens.Menu
 {
-    public class ConfirmExitDialog : PopupDialog
+    public class ConfirmExitDialog : ConfirmDialog
     {
-        public ConfirmExitDialog(Action confirm, Action cancel)
+        public ConfirmExitDialog(Action confirm, Action onCancel = null)
+            : base("exit osu!", confirm, onCancel)
         {
-            HeaderText = "Are you sure you want to exit?";
-            BodyText = "Last chance to back out.";
-
-            Icon = FontAwesome.Solid.ExclamationTriangle;
-
-            Buttons = new PopupDialogButton[]
-            {
-                new PopupDialogOkButton
-                {
-                    Text = @"Goodbye",
-                    Action = confirm
-                },
-                new PopupDialogCancelButton
-                {
-                    Text = @"Just a little more",
-                    Action = cancel
-                },
-            };
+            ButtonConfirm.Text = "Let me out!";
+            ButtonCancel.Text = "Just a little more...";
         }
     }
 }

From d332fd2414c131a363437e1c71fb27047eaa48c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:53:47 +0900
Subject: [PATCH 08392/10326] Handle case where local user tries to change
 beatmap while not the host

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 06d83e495c..e09e1fc3d4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -402,6 +402,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
                 return;
 
+            if (!client.IsHost)
+            {
+                // todo: should handle this when the request queue is implemented.
+                // if we decide that the presentation should exit the user from the multiplayer game, the PresentBeatmap
+                // flow may need to change to support an "unable to present" return value.
+                return;
+            }
+
             this.Push(new MultiplayerMatchSongSelect(beatmap, ruleset));
         }
     }

From cb4c3503a01da92d0a68222702fa3b958da05fe1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:50:54 +0900
Subject: [PATCH 08393/10326] Confirm exiting a multiplayer match

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 4fbea4e3be..51445b0668 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -15,6 +15,8 @@ using osu.Framework.Threading;
 using osu.Game.Configuration;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
@@ -279,14 +281,36 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
         }
 
+        [Resolved]
+        private DialogOverlay dialogOverlay { get; set; }
+
+        private bool exitConfirmed;
+
         public override bool OnBackButton()
         {
-            if (client.Room != null && settingsOverlay.State.Value == Visibility.Visible)
+            if (client.Room == null)
+            {
+                // room has not been created yet; exit immediately.
+                return base.OnBackButton();
+            }
+
+            if (settingsOverlay.State.Value == Visibility.Visible)
             {
                 settingsOverlay.Hide();
                 return true;
             }
 
+            if (!exitConfirmed)
+            {
+                dialogOverlay.Push(new ConfirmDialog("leave this multiplayer match", () =>
+                {
+                    exitConfirmed = true;
+                    this.Exit();
+                }));
+
+                return true;
+            }
+
             return base.OnBackButton();
         }
 

From 0ede28da2f0f79b11cf2355cda4264f4d686ad12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 15:24:55 +0900
Subject: [PATCH 08394/10326] Fix test failures due to missing dependency

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 51445b0668..f1d8bf97fd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -281,7 +281,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
         }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private DialogOverlay dialogOverlay { get; set; }
 
         private bool exitConfirmed;
@@ -300,7 +300,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return true;
             }
 
-            if (!exitConfirmed)
+            if (!exitConfirmed && dialogOverlay != null)
             {
                 dialogOverlay.Push(new ConfirmDialog("leave this multiplayer match", () =>
                 {

From 002646370ccd589f94bf1d6947982961393003e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 16:47:42 +0900
Subject: [PATCH 08395/10326] Move bindable logic in MouseSettings to
 LoadComplete

---
 .../Settings/Sections/Input/MouseSettings.cs  | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 768a18cca0..7599a748ab 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -17,7 +17,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         protected override string Header => "Mouse";
 
         private readonly BindableBool rawInputToggle = new BindableBool();
-        private Bindable<double> sensitivityBindable = new BindableDouble();
+
+        private Bindable<double> configSensitivity;
+
+        private Bindable<double> localSensitivity = new BindableDouble();
+
         private Bindable<string> ignoredInputHandlers;
 
         private Bindable<WindowMode> windowMode;
@@ -26,12 +30,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
         {
-            var configSensitivity = config.GetBindable<double>(FrameworkSetting.CursorSensitivity);
-
             // use local bindable to avoid changing enabled state of game host's bindable.
-            sensitivityBindable = configSensitivity.GetUnboundCopy();
-            configSensitivity.BindValueChanged(val => sensitivityBindable.Value = val.NewValue);
-            sensitivityBindable.BindValueChanged(val => configSensitivity.Value = val.NewValue);
+            configSensitivity = config.GetBindable<double>(FrameworkSetting.CursorSensitivity);
+            localSensitivity = configSensitivity.GetUnboundCopy();
+
+            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            ignoredInputHandlers = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
 
             Children = new Drawable[]
             {
@@ -43,7 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 new SensitivitySetting
                 {
                     LabelText = "Cursor sensitivity",
-                    Current = sensitivityBindable
+                    Current = localSensitivity
                 },
                 new SettingsCheckbox
                 {
@@ -66,8 +70,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
                 },
             };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            configSensitivity.BindValueChanged(val => localSensitivity.Value = val.NewValue, true);
+            localSensitivity.BindValueChanged(val => configSensitivity.Value = val.NewValue);
 
-            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
             windowMode.BindValueChanged(mode =>
             {
                 var isFullscreen = mode.NewValue == WindowMode.Fullscreen;
@@ -87,7 +98,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
             {
                 rawInputToggle.Disabled = true;
-                sensitivityBindable.Disabled = true;
+                localSensitivity.Disabled = true;
             }
             else
             {
@@ -100,12 +111,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     ignoredInputHandlers.Value = enabled.NewValue ? standard_mouse_handlers : raw_mouse_handler;
                 };
 
-                ignoredInputHandlers = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
                 ignoredInputHandlers.ValueChanged += handler =>
                 {
                     bool raw = !handler.NewValue.Contains("Raw");
                     rawInputToggle.Value = raw;
-                    sensitivityBindable.Disabled = !raw;
+                    localSensitivity.Disabled = !raw;
                 };
 
                 ignoredInputHandlers.TriggerChange();

From 012b48dbe51e972b291f37f88dfe0788cd9adb84 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Mar 2021 19:03:44 +0900
Subject: [PATCH 08396/10326] Remove explicit public definition

Interface members are public by default.
---
 osu.Game/Screens/IHandlePresentBeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/IHandlePresentBeatmap.cs b/osu.Game/Screens/IHandlePresentBeatmap.cs
index b94df630ef..60801fb3eb 100644
--- a/osu.Game/Screens/IHandlePresentBeatmap.cs
+++ b/osu.Game/Screens/IHandlePresentBeatmap.cs
@@ -18,6 +18,6 @@ namespace osu.Game.Screens
         /// </summary>
         /// <param name="beatmap">The beatmap to be selected.</param>
         /// <param name="ruleset">The ruleset to be selected.</param>
-        public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset);
+        void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset);
     }
 }

From 6affe33fb275acb9d3feee55d08433f88fb1e25a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Mar 2021 19:40:19 +0900
Subject: [PATCH 08397/10326] Fix another test scene

---
 .../TestSceneMultiplayerRoomManager.cs        | 46 +++++++++++++------
 .../Multiplayer/TestMultiplayerClient.cs      | 14 ++++--
 .../TestMultiplayerRoomContainer.cs           | 10 ++--
 .../Multiplayer/TestMultiplayerRoomManager.cs |  8 ++--
 4 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 6de5704410..91c15de69f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -1,10 +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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Online.Rooms;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -21,15 +24,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room { Name = { Value = "1" } });
+                    roomManager.CreateRoom(createRoom(r => r.Name.Value = "1"));
                     roomManager.PartRoom();
-                    roomManager.CreateRoom(new Room { Name = { Value = "2" } });
+                    roomManager.CreateRoom(createRoom(r => r.Name.Value = "2"));
                     roomManager.PartRoom();
                     roomManager.ClearRooms();
                 });
             });
 
-            AddAssert("manager polled for rooms", () => roomManager.Rooms.Count == 2);
+            AddAssert("manager polled for rooms", () => ((RoomManager)roomManager).Rooms.Count == 2);
             AddAssert("initial rooms received", () => roomManager.InitialRoomsReceived.Value);
         }
 
@@ -40,16 +43,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.PartRoom();
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.PartRoom();
                 });
             });
 
             AddStep("disconnect", () => roomContainer.Client.Disconnect());
 
-            AddAssert("rooms cleared", () => roomManager.Rooms.Count == 0);
+            AddAssert("rooms cleared", () => ((RoomManager)roomManager).Rooms.Count == 0);
             AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
         }
 
@@ -60,9 +63,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.PartRoom();
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.PartRoom();
                 });
             });
@@ -70,7 +73,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("disconnect", () => roomContainer.Client.Disconnect());
             AddStep("connect", () => roomContainer.Client.Connect());
 
-            AddAssert("manager polled for rooms", () => roomManager.Rooms.Count == 2);
+            AddAssert("manager polled for rooms", () => ((RoomManager)roomManager).Rooms.Count == 2);
             AddAssert("initial rooms received", () => roomManager.InitialRoomsReceived.Value);
         }
 
@@ -81,12 +84,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.ClearRooms();
                 });
             });
 
-            AddAssert("manager not polled for rooms", () => roomManager.Rooms.Count == 0);
+            AddAssert("manager not polled for rooms", () => ((RoomManager)roomManager).Rooms.Count == 0);
             AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
         }
 
@@ -97,7 +100,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                 });
             });
 
@@ -111,7 +114,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.PartRoom();
                 });
             });
@@ -126,7 +129,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    var r = new Room();
+                    var r = createRoom();
                     roomManager.CreateRoom(r);
                     roomManager.PartRoom();
                     roomManager.JoinRoom(r);
@@ -136,6 +139,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("multiplayer room joined", () => roomContainer.Client.Room != null);
         }
 
+        private Room createRoom(Action<Room> initFunc = null)
+        {
+            var room = new Room();
+
+            room.Name.Value = "test room";
+            room.Playlist.Add(new PlaylistItem
+            {
+                Beatmap = { Value = new TestBeatmap(Ruleset.Value).BeatmapInfo },
+                Ruleset = { Value = Ruleset.Value }
+            });
+
+            initFunc?.Invoke(room);
+            return room;
+        }
+
         private TestMultiplayerRoomManager createRoomManager()
         {
             Child = roomContainer = new TestMultiplayerRoomContainer
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 6a901fc45b..c03364a391 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -28,12 +28,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
-        [Resolved]
-        private Room apiRoom { get; set; } = null!;
-
         [Resolved]
         private BeatmapManager beatmaps { get; set; } = null!;
 
+        private readonly TestMultiplayerRoomManager roomManager;
+
+        public TestMultiplayerClient(TestMultiplayerRoomManager roomManager)
+        {
+            this.roomManager = roomManager;
+        }
+
         public void Connect() => isConnected.Value = true;
 
         public void Disconnect() => isConnected.Value = false;
@@ -98,7 +102,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
         {
-            Debug.Assert(apiRoom != null);
+            var apiRoom = roomManager.Rooms.Single(r => r.RoomID.Value == roomId);
 
             var user = new MultiplayerRoomUser(api.LocalUser.Value.Id)
             {
@@ -178,8 +182,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         protected override Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
         {
             Debug.Assert(Room != null);
-            Debug.Assert(apiRoom != null);
 
+            var apiRoom = roomManager.Rooms.Single(r => r.RoomID.Value == Room.RoomID);
             var set = apiRoom.Playlist.FirstOrDefault(p => p.BeatmapID == beatmapId)?.Beatmap.Value.BeatmapSet
                       ?? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId)?.BeatmapSet;
 
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
index 860caef071..e57411d04d 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
@@ -32,11 +32,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             RelativeSizeAxes = Axes.Both;
 
+            RoomManager = new TestMultiplayerRoomManager();
+            Client = new TestMultiplayerClient(RoomManager);
+            OngoingOperationTracker = new OngoingOperationTracker();
+
             AddRangeInternal(new Drawable[]
             {
-                Client = new TestMultiplayerClient(),
-                RoomManager = new TestMultiplayerRoomManager(),
-                OngoingOperationTracker = new OngoingOperationTracker(),
+                Client,
+                RoomManager,
+                OngoingOperationTracker,
                 content = new Container { RelativeSizeAxes = Axes.Both }
             });
         }
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
index 022c297ccd..7e824c4d7c 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached]
         public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
 
-        private readonly List<Room> rooms = new List<Room>();
+        public new readonly List<Room> Rooms = new List<Room>();
 
         protected override void LoadComplete()
         {
@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         for (int i = 0; i < createdRoom.Playlist.Count; i++)
                             createdRoom.Playlist[i].ID = currentPlaylistItemId++;
 
-                        rooms.Add(createdRoom);
+                        Rooms.Add(createdRoom);
                         createRoomRequest.TriggerSuccess(createdRoom);
                         break;
 
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     case GetRoomsRequest getRoomsRequest:
                         var roomsWithoutParticipants = new List<Room>();
 
-                        foreach (var r in rooms)
+                        foreach (var r in Rooms)
                         {
                             var newRoom = new Room();
 
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         break;
 
                     case GetRoomRequest getRoomRequest:
-                        getRoomRequest.TriggerSuccess(rooms.Single(r => r.RoomID.Value == getRoomRequest.RoomId));
+                        getRoomRequest.TriggerSuccess(Rooms.Single(r => r.RoomID.Value == getRoomRequest.RoomId));
                         break;
 
                     case GetBeatmapSetRequest getBeatmapSetRequest:

From 0f5bce70ad4eec310f54113341e747e552b2a4e4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 20:34:36 +0900
Subject: [PATCH 08398/10326] Split confirmation dialog classes apart

---
 osu.Game/Overlays/Dialog/ConfirmDialog.cs     | 17 +++++-----
 osu.Game/Screens/Menu/ConfirmExitDialog.cs    | 31 ++++++++++++++++---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  2 +-
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Dialog/ConfirmDialog.cs b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
index 6f160daf97..a87c06ffdf 100644
--- a/osu.Game/Overlays/Dialog/ConfirmDialog.cs
+++ b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
@@ -11,30 +11,27 @@ namespace osu.Game.Overlays.Dialog
     /// </summary>
     public class ConfirmDialog : PopupDialog
     {
-        protected PopupDialogOkButton ButtonConfirm;
-        protected PopupDialogCancelButton ButtonCancel;
-
         /// <summary>
-        /// Construct a new dialog.
+        /// Construct a new confirmation dialog.
         /// </summary>
-        /// <param name="description">The description of the action to be displayed to the user.</param>
+        /// <param name="message">The description of the action to be displayed to the user.</param>
         /// <param name="onConfirm">An action to perform on confirmation.</param>
         /// <param name="onCancel">An optional action to perform on cancel.</param>
-        public ConfirmDialog(string description, Action onConfirm, Action onCancel = null)
+        public ConfirmDialog(string message, Action onConfirm, Action onCancel = null)
         {
-            HeaderText = $"Are you sure you want to {description}?";
-            BodyText = "Last chance to back out.";
+            HeaderText = message;
+            BodyText = "Last chance to turn back";
 
             Icon = FontAwesome.Solid.ExclamationTriangle;
 
             Buttons = new PopupDialogButton[]
             {
-                ButtonConfirm = new PopupDialogOkButton
+                new PopupDialogOkButton
                 {
                     Text = @"Yes",
                     Action = onConfirm
                 },
-                ButtonCancel = new PopupDialogCancelButton
+                new PopupDialogCancelButton
                 {
                     Text = @"Cancel",
                     Action = onCancel
diff --git a/osu.Game/Screens/Menu/ConfirmExitDialog.cs b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
index 41cc7b480c..6488a2fd63 100644
--- a/osu.Game/Screens/Menu/ConfirmExitDialog.cs
+++ b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
@@ -2,17 +2,38 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Screens.Menu
 {
-    public class ConfirmExitDialog : ConfirmDialog
+    public class ConfirmExitDialog : PopupDialog
     {
-        public ConfirmExitDialog(Action confirm, Action onCancel = null)
-            : base("exit osu!", confirm, onCancel)
+        /// <summary>
+        /// Construct a new exit confirmation dialog.
+        /// </summary>
+        /// <param name="onConfirm">An action to perform on confirmation.</param>
+        /// <param name="onCancel">An optional action to perform on cancel.</param>
+        public ConfirmExitDialog(Action onConfirm, Action onCancel = null)
         {
-            ButtonConfirm.Text = "Let me out!";
-            ButtonCancel.Text = "Just a little more...";
+            HeaderText = "Are you sure you want to exit osu!?";
+            BodyText = "Last chance to turn back";
+
+            Icon = FontAwesome.Solid.ExclamationTriangle;
+
+            Buttons = new PopupDialogButton[]
+            {
+                new PopupDialogOkButton
+                {
+                    Text = @"Let me out!",
+                    Action = onConfirm
+                },
+                new PopupDialogCancelButton
+                {
+                    Text = @"Just a little more...",
+                    Action = onCancel
+                },
+            };
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index f1d8bf97fd..5a9a26d997 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -302,7 +302,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             if (!exitConfirmed && dialogOverlay != null)
             {
-                dialogOverlay.Push(new ConfirmDialog("leave this multiplayer match", () =>
+                dialogOverlay.Push(new ConfirmDialog("Are you sure you want to leave this multiplayer match?", () =>
                 {
                     exitConfirmed = true;
                     this.Exit();

From 534e16237a5e74dd448af1d37e72d580393e5ba3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 20:36:41 +0900
Subject: [PATCH 08399/10326] Remove unnecessary intial construction of
 bindable

---
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 7599a748ab..c3deb385cd 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private Bindable<double> configSensitivity;
 
-        private Bindable<double> localSensitivity = new BindableDouble();
+        private Bindable<double> localSensitivity;
 
         private Bindable<string> ignoredInputHandlers;
 

From 1ecb1d122a55500204eaea01d2321a1a9c71c707 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Mar 2021 21:54:34 +0900
Subject: [PATCH 08400/10326] Fix up TestSceneMultiplayer

---
 .../Multiplayer/TestSceneMultiplayer.cs       | 36 ++++++-------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 2e39471dc0..bb5db5b803 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -1,13 +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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Components;
-using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMultiplayer : MultiplayerTestScene
+    public class TestSceneMultiplayer : ScreenTestScene
     {
         public TestSceneMultiplayer()
         {
@@ -17,30 +17,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
         }
 
-        [Test]
-        public void TestOneUserJoinedMultipleTimes()
-        {
-            var user = new User { Id = 33 };
-
-            AddRepeatStep("add user multiple times", () => Client.AddUser(user), 3);
-
-            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
-        }
-
-        [Test]
-        public void TestOneUserLeftMultipleTimes()
-        {
-            var user = new User { Id = 44 };
-
-            AddStep("add user", () => Client.AddUser(user));
-            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
-
-            AddRepeatStep("remove user multiple times", () => Client.RemoveUser(user), 3);
-            AddAssert("room has 1 user", () => Client.Room?.Users.Count == 1);
-        }
-
         private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer
         {
+            [Cached(typeof(StatefulMultiplayerClient))]
+            public readonly TestMultiplayerClient Client;
+
+            public TestMultiplayer()
+            {
+                AddInternal(Client = new TestMultiplayerClient((TestMultiplayerRoomManager)RoomManager));
+            }
+
             protected override RoomManager CreateRoomManager() => new TestMultiplayerRoomManager();
         }
     }

From 0f83b66cdabb1aad42d7f9d1c205b38089d7b2c2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Mar 2021 22:01:03 +0900
Subject: [PATCH 08401/10326] Add separate test for stateful multiplayer client

---
 .../StatefulMultiplayerClientTest.cs          | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 osu.Game.Tests/OnlinePlay/StatefulMultiplayerClientTest.cs

diff --git a/osu.Game.Tests/OnlinePlay/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/OnlinePlay/StatefulMultiplayerClientTest.cs
new file mode 100644
index 0000000000..82ce588c6f
--- /dev/null
+++ b/osu.Game.Tests/OnlinePlay/StatefulMultiplayerClientTest.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 NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Tests.Visual.Multiplayer;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.OnlinePlay
+{
+    [HeadlessTest]
+    public class StatefulMultiplayerClientTest : MultiplayerTestScene
+    {
+        [Test]
+        public void TestUserAddedOnJoin()
+        {
+            var user = new User { Id = 33 };
+
+            AddRepeatStep("add user multiple times", () => Client.AddUser(user), 3);
+            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
+        }
+
+        [Test]
+        public void TestUserRemovedOnLeave()
+        {
+            var user = new User { Id = 44 };
+
+            AddStep("add user", () => Client.AddUser(user));
+            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
+
+            AddRepeatStep("remove user multiple times", () => Client.RemoveUser(user), 3);
+            AddAssert("room has 1 user", () => Client.Room?.Users.Count == 1);
+        }
+    }
+}

From 77607c06eba37de48cb0670a4e7e09d9a9c8e4ae Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Mar 2021 22:07:39 +0900
Subject: [PATCH 08402/10326] Fix not being able to enter gameplay in
 TestSceneMultiplayer

---
 .../Visual/Multiplayer/TestSceneMultiplayer.cs  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index bb5db5b803..78bc51e47b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -9,12 +9,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiplayer : ScreenTestScene
     {
+        private TestMultiplayer multiplayerScreen;
+
         public TestSceneMultiplayer()
         {
-            var multi = new TestMultiplayer();
+            AddStep("show", () =>
+            {
+                multiplayerScreen = new TestMultiplayer();
 
-            AddStep("show", () => LoadScreen(multi));
-            AddUntilStep("wait for loaded", () => multi.IsLoaded);
+                // Needs to be added at a higher level since the multiplayer screen becomes non-current.
+                Child = multiplayerScreen.Client;
+
+                LoadScreen(multiplayerScreen);
+            });
+
+            AddUntilStep("wait for loaded", () => multiplayerScreen.IsLoaded);
         }
 
         private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer
@@ -24,7 +33,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             public TestMultiplayer()
             {
-                AddInternal(Client = new TestMultiplayerClient((TestMultiplayerRoomManager)RoomManager));
+                Client = new TestMultiplayerClient((TestMultiplayerRoomManager)RoomManager);
             }
 
             protected override RoomManager CreateRoomManager() => new TestMultiplayerRoomManager();

From f9148eec206b1126ed0af01f24610d2eca2ab00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Mar 2021 21:33:41 +0100
Subject: [PATCH 08403/10326] Refactor filter query parsing helper methods

In preparation for exposition as public.
---
 .../Filtering/FilterQueryParserTest.cs        | 11 +++
 osu.Game/Screens/Select/FilterQueryParser.cs  | 75 ++++++++++++-------
 2 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index d835e58b29..49389e67aa 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -215,6 +215,17 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual("unrecognised=keyword", filterCriteria.SearchText);
         }
 
+        [TestCase("cs=nope")]
+        [TestCase("bpm>=bad")]
+        [TestCase("divisor<nah")]
+        [TestCase("status=noidea")]
+        public void TestInvalidKeywordValueIsIgnored(string query)
+        {
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(query, filterCriteria.SearchText);
+        }
+
         [Test]
         public void TestCustomKeywordIsParsed()
         {
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index c81a72d938..ce937d07b1 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -34,37 +34,37 @@ namespace osu.Game.Screens.Select
         {
             switch (key)
             {
-                case "stars" when parseFloatWithPoint(value, out var stars):
-                    return updateCriteriaRange(ref criteria.StarDifficulty, op, stars, 0.01f / 2);
+                case "stars":
+                    return tryUpdateCriteriaRange(ref criteria.StarDifficulty, op, value, 0.01d / 2);
 
-                case "ar" when parseFloatWithPoint(value, out var ar):
-                    return updateCriteriaRange(ref criteria.ApproachRate, op, ar, 0.1f / 2);
+                case "ar":
+                    return tryUpdateCriteriaRange(ref criteria.ApproachRate, op, value);
 
-                case "dr" when parseFloatWithPoint(value, out var dr):
-                case "hp" when parseFloatWithPoint(value, out dr):
-                    return updateCriteriaRange(ref criteria.DrainRate, op, dr, 0.1f / 2);
+                case "dr":
+                case "hp":
+                    return tryUpdateCriteriaRange(ref criteria.DrainRate, op, value);
 
-                case "cs" when parseFloatWithPoint(value, out var cs):
-                    return updateCriteriaRange(ref criteria.CircleSize, op, cs, 0.1f / 2);
+                case "cs":
+                    return tryUpdateCriteriaRange(ref criteria.CircleSize, op, value);
 
-                case "bpm" when parseDoubleWithPoint(value, out var bpm):
-                    return updateCriteriaRange(ref criteria.BPM, op, bpm, 0.01d / 2);
+                case "bpm":
+                    return tryUpdateCriteriaRange(ref criteria.BPM, op, value, 0.01d / 2);
 
-                case "length" when parseDoubleWithPoint(value.TrimEnd('m', 's', 'h'), out var length):
-                    var scale = getLengthScale(value);
-                    return updateCriteriaRange(ref criteria.Length, op, length * scale, scale / 2.0);
+                case "length":
+                    return tryUpdateLengthRange(criteria, op, value);
 
-                case "divisor" when parseInt(value, out var divisor):
-                    return updateCriteriaRange(ref criteria.BeatDivisor, op, divisor);
+                case "divisor":
+                    return tryUpdateCriteriaRange(ref criteria.BeatDivisor, op, value, tryParseInt);
 
-                case "status" when Enum.TryParse<BeatmapSetOnlineStatus>(value, true, out var statusValue):
-                    return updateCriteriaRange(ref criteria.OnlineStatus, op, statusValue);
+                case "status":
+                    return tryUpdateCriteriaRange(ref criteria.OnlineStatus, op, value,
+                        (string s, out BeatmapSetOnlineStatus val) => Enum.TryParse(value, true, out val));
 
                 case "creator":
-                    return updateCriteriaText(ref criteria.Creator, op, value);
+                    return tryUpdateCriteriaText(ref criteria.Creator, op, value);
 
                 case "artist":
-                    return updateCriteriaText(ref criteria.Artist, op, value);
+                    return tryUpdateCriteriaText(ref criteria.Artist, op, value);
 
                 default:
                     return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
@@ -104,16 +104,16 @@ namespace osu.Game.Screens.Select
             value.EndsWith('m') ? 60000 :
             value.EndsWith('h') ? 3600000 : 1000;
 
-        private static bool parseFloatWithPoint(string value, out float result) =>
+        private static bool tryParseFloatWithPoint(string value, out float result) =>
             float.TryParse(value, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
 
-        private static bool parseDoubleWithPoint(string value, out double result) =>
+        private static bool tryParseDoubleWithPoint(string value, out double result) =>
             double.TryParse(value, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
 
-        private static bool parseInt(string value, out int result) =>
+        private static bool tryParseInt(string value, out int result) =>
             int.TryParse(value, NumberStyles.None, CultureInfo.InvariantCulture, out result);
 
-        private static bool updateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, Operator op, string value)
+        private static bool tryUpdateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, Operator op, string value)
         {
             switch (op)
             {
@@ -126,7 +126,10 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private static bool updateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, float value, float tolerance = 0.05f)
+        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, string val, float tolerance = 0.05f)
+            => tryParseFloatWithPoint(val, out float value) && tryUpdateCriteriaRange(ref range, op, value, tolerance);
+
+        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, float value, float tolerance = 0.05f)
         {
             switch (op)
             {
@@ -158,7 +161,10 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
-        private static bool updateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, double value, double tolerance = 0.05)
+        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, string val, double tolerance = 0.05)
+            => tryParseDoubleWithPoint(val, out double value) && tryUpdateCriteriaRange(ref range, op, value, tolerance);
+
+        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, double value, double tolerance = 0.05)
         {
             switch (op)
             {
@@ -190,7 +196,13 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
-        private static bool updateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, T value)
+        private delegate bool TryParseFunction<T>(string val, out T value);
+
+        private static bool tryUpdateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, string value, TryParseFunction<T> conversionFunc)
+            where T : struct
+            => conversionFunc.Invoke(value, out var converted) && tryUpdateCriteriaRange(ref range, op, converted);
+
+        private static bool tryUpdateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, T value)
             where T : struct
         {
             switch (op)
@@ -227,5 +239,14 @@ namespace osu.Game.Screens.Select
 
             return true;
         }
+
+        private static bool tryUpdateLengthRange(FilterCriteria criteria, Operator op, string val)
+        {
+            if (!tryParseDoubleWithPoint(val.TrimEnd('m', 's', 'h'), out var length))
+                return false;
+
+            var scale = getLengthScale(val);
+            return tryUpdateCriteriaRange(ref criteria.Length, op, length * scale, scale / 2.0);
+        }
     }
 }

From f733d1ec1fcf08a147d24aeab20d3e8187936c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Mar 2021 21:58:34 +0100
Subject: [PATCH 08404/10326] Expose and document query parser and helpers

---
 .../Rulesets/Filter/IRulesetFilterCriteria.cs | 11 +++
 osu.Game/Screens/Select/FilterQueryParser.cs  | 89 +++++++++++++++----
 2 files changed, 84 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs b/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
index a83f87d72b..13cc41f8e0 100644
--- a/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
+++ b/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
@@ -31,6 +31,17 @@ namespace osu.Game.Rulesets.Filter
         /// {key}{op}{value}
         /// </code>
         /// </summary>
+        /// <remarks>
+        /// <para>
+        /// For adding optional string criteria, <see cref="FilterCriteria.OptionalTextFilter"/> can be used for matching,
+        /// along with <see cref="FilterQueryParser.TryUpdateCriteriaText"/> for parsing.
+        /// </para>
+        /// <para>
+        /// For adding numerical-type range criteria, <see cref="FilterCriteria.OptionalRange{T}"/> can be used for matching,
+        /// along with <see cref="FilterQueryParser.TryUpdateCriteriaRange{T}(ref osu.Game.Screens.Select.FilterCriteria.OptionalRange{T},osu.Game.Screens.Select.Filter.Operator,string,FilterQueryParser.TryParseFunction{T})"/>
+        /// and <see cref="float"/>- and <see cref="double"/>-typed overloads for parsing.
+        /// </para>
+        /// </remarks>
         /// <param name="key">The key (name) of the criterion.</param>
         /// <param name="op">The operator in the criterion.</param>
         /// <param name="value">The value of the criterion.</param>
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index ce937d07b1..ea7f233bea 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -9,7 +9,10 @@ using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Screens.Select
 {
-    internal static class FilterQueryParser
+    /// <summary>
+    /// Utility class used for parsing song select filter queries entered via the search box.
+    /// </summary>
+    public static class FilterQueryParser
     {
         private static readonly Regex query_syntax_regex = new Regex(
             @"\b(?<key>\w+)(?<op>(:|=|(>|<)(:|=)?))(?<value>("".*"")|(\S*))",
@@ -35,36 +38,36 @@ namespace osu.Game.Screens.Select
             switch (key)
             {
                 case "stars":
-                    return tryUpdateCriteriaRange(ref criteria.StarDifficulty, op, value, 0.01d / 2);
+                    return TryUpdateCriteriaRange(ref criteria.StarDifficulty, op, value, 0.01d / 2);
 
                 case "ar":
-                    return tryUpdateCriteriaRange(ref criteria.ApproachRate, op, value);
+                    return TryUpdateCriteriaRange(ref criteria.ApproachRate, op, value);
 
                 case "dr":
                 case "hp":
-                    return tryUpdateCriteriaRange(ref criteria.DrainRate, op, value);
+                    return TryUpdateCriteriaRange(ref criteria.DrainRate, op, value);
 
                 case "cs":
-                    return tryUpdateCriteriaRange(ref criteria.CircleSize, op, value);
+                    return TryUpdateCriteriaRange(ref criteria.CircleSize, op, value);
 
                 case "bpm":
-                    return tryUpdateCriteriaRange(ref criteria.BPM, op, value, 0.01d / 2);
+                    return TryUpdateCriteriaRange(ref criteria.BPM, op, value, 0.01d / 2);
 
                 case "length":
                     return tryUpdateLengthRange(criteria, op, value);
 
                 case "divisor":
-                    return tryUpdateCriteriaRange(ref criteria.BeatDivisor, op, value, tryParseInt);
+                    return TryUpdateCriteriaRange(ref criteria.BeatDivisor, op, value, tryParseInt);
 
                 case "status":
-                    return tryUpdateCriteriaRange(ref criteria.OnlineStatus, op, value,
+                    return TryUpdateCriteriaRange(ref criteria.OnlineStatus, op, value,
                         (string s, out BeatmapSetOnlineStatus val) => Enum.TryParse(value, true, out val));
 
                 case "creator":
-                    return tryUpdateCriteriaText(ref criteria.Creator, op, value);
+                    return TryUpdateCriteriaText(ref criteria.Creator, op, value);
 
                 case "artist":
-                    return tryUpdateCriteriaText(ref criteria.Artist, op, value);
+                    return TryUpdateCriteriaText(ref criteria.Artist, op, value);
 
                 default:
                     return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
@@ -113,7 +116,18 @@ namespace osu.Game.Screens.Select
         private static bool tryParseInt(string value, out int result) =>
             int.TryParse(value, NumberStyles.None, CultureInfo.InvariantCulture, out result);
 
-        private static bool tryUpdateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, Operator op, string value)
+        /// <summary>
+        /// Attempts to parse a keyword filter with the specified <paramref name="op"/> and textual <paramref name="value"/>.
+        /// If the value indicates a valid textual filter, the function returns <c>true</c> and the resulting data is stored into
+        /// <paramref name="textFilter"/>.
+        /// </summary>
+        /// <param name="textFilter">The <see cref="FilterCriteria.OptionalTextFilter"/> to store the parsed data into, if successful.</param>
+        /// <param name="op">
+        /// The operator for the keyword filter.
+        /// Only <see cref="Operator.Equal"/> is valid for textual filters.
+        /// </param>
+        /// <param name="value">The value of the keyword filter.</param>
+        public static bool TryUpdateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, Operator op, string value)
         {
             switch (op)
             {
@@ -126,7 +140,20 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, string val, float tolerance = 0.05f)
+        /// <summary>
+        /// Attempts to parse a keyword filter of type <see cref="float"/>
+        /// from the specified <paramref name="op"/> and <paramref name="val"/>.
+        /// If <paramref name="val"/> can be parsed as a <see cref="float"/>, the function returns <c>true</c>
+        /// and the resulting range constraint is stored into <paramref name="range"/>.
+        /// </summary>
+        /// <param name="range">
+        /// The <see cref="float"/>-typed <see cref="FilterCriteria.OptionalRange{T}"/>
+        /// to store the parsed data into, if successful.
+        /// </param>
+        /// <param name="op">The operator for the keyword filter.</param>
+        /// <param name="val">The value of the keyword filter.</param>
+        /// <param name="tolerance">Allowed tolerance of the parsed range boundary value.</param>
+        public static bool TryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, string val, float tolerance = 0.05f)
             => tryParseFloatWithPoint(val, out float value) && tryUpdateCriteriaRange(ref range, op, value, tolerance);
 
         private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, float value, float tolerance = 0.05f)
@@ -161,7 +188,20 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
-        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, string val, double tolerance = 0.05)
+        /// <summary>
+        /// Attempts to parse a keyword filter of type <see cref="double"/>
+        /// from the specified <paramref name="op"/> and <paramref name="val"/>.
+        /// If <paramref name="val"/> can be parsed as a <see cref="double"/>, the function returns <c>true</c>
+        /// and the resulting range constraint is stored into <paramref name="range"/>.
+        /// </summary>
+        /// <param name="range">
+        /// The <see cref="double"/>-typed <see cref="FilterCriteria.OptionalRange{T}"/>
+        /// to store the parsed data into, if successful.
+        /// </param>
+        /// <param name="op">The operator for the keyword filter.</param>
+        /// <param name="val">The value of the keyword filter.</param>
+        /// <param name="tolerance">Allowed tolerance of the parsed range boundary value.</param>
+        public static bool TryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, string val, double tolerance = 0.05)
             => tryParseDoubleWithPoint(val, out double value) && tryUpdateCriteriaRange(ref range, op, value, tolerance);
 
         private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, double value, double tolerance = 0.05)
@@ -196,11 +236,28 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
-        private delegate bool TryParseFunction<T>(string val, out T value);
+        /// <summary>
+        /// Used to determine whether the string value <paramref name="val"/> can be converted to type <typeparamref name="T"/>.
+        /// If conversion can be performed, the delegate returns <c>true</c>
+        /// and the conversion result is returned in the <c>out</c> parameter <paramref name="parsed"/>.
+        /// </summary>
+        /// <param name="val">The string value to attempt parsing for.</param>
+        /// <param name="parsed">The parsed value, if conversion is possible.</param>
+        public delegate bool TryParseFunction<T>(string val, out T parsed);
 
-        private static bool tryUpdateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, string value, TryParseFunction<T> conversionFunc)
+        /// <summary>
+        /// Attempts to parse a keyword filter of type <typeparamref name="T"/>,
+        /// from the specified <paramref name="op"/> and <paramref name="val"/>.
+        /// If <paramref name="val"/> can be parsed into <typeparamref name="T"/> using <paramref name="parseFunction"/>, the function returns <c>true</c>
+        /// and the resulting range constraint is stored into <paramref name="range"/>.
+        /// </summary>
+        /// <param name="range">The <see cref="FilterCriteria.OptionalRange{T}"/> to store the parsed data into, if successful.</param>
+        /// <param name="op">The operator for the keyword filter.</param>
+        /// <param name="val">The value of the keyword filter.</param>
+        /// <param name="parseFunction">Function used to determine if <paramref name="val"/> can be converted to type <typeparamref name="T"/>.</param>
+        public static bool TryUpdateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, string val, TryParseFunction<T> parseFunction)
             where T : struct
-            => conversionFunc.Invoke(value, out var converted) && tryUpdateCriteriaRange(ref range, op, converted);
+            => parseFunction.Invoke(val, out var converted) && tryUpdateCriteriaRange(ref range, op, converted);
 
         private static bool tryUpdateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, T value)
             where T : struct

From fe64c3dbd4de6ada5be2ca5112c65c2f17abb607 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 4 Mar 2021 14:59:08 +0300
Subject: [PATCH 08405/10326] Refrain from disabling cursor sensitivity at
 config-level

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 7db85d0d66..203cc458e0 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -880,13 +880,8 @@ namespace osu.Game
             switch (action)
             {
                 case GlobalAction.ResetInputSettings:
-                    var sensitivity = frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity);
-
-                    sensitivity.Disabled = false;
-                    sensitivity.Value = 1;
-                    sensitivity.Disabled = true;
-
-                    frameworkConfig.Set(FrameworkSetting.IgnoredInputHandlers, string.Empty);
+                    frameworkConfig.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers).SetDefault();
+                    frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity).SetDefault();
                     frameworkConfig.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode).SetDefault();
                     return true;
 

From 132fcda08987f880767bf20d2eb4a785f09dd9dd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 4 Mar 2021 15:00:46 +0300
Subject: [PATCH 08406/10326] Force config sensitivity value to local setting
 bindable

Re-enable the local bindable to update the sensitivity value then change back to whatever state it was in previously.
---
 .../Overlays/Settings/Sections/Input/MouseSettings.cs  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index c3deb385cd..3a78cff890 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -76,7 +76,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             base.LoadComplete();
 
-            configSensitivity.BindValueChanged(val => localSensitivity.Value = val.NewValue, true);
+            configSensitivity.BindValueChanged(val =>
+            {
+                var disabled = localSensitivity.Disabled;
+
+                localSensitivity.Disabled = false;
+                localSensitivity.Value = val.NewValue;
+                localSensitivity.Disabled = disabled;
+            }, true);
+
             localSensitivity.BindValueChanged(val => configSensitivity.Value = val.NewValue);
 
             windowMode.BindValueChanged(mode =>

From 12b7d9e06d16b52a600c5506913c5569ee12b2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 Mar 2021 12:16:01 +0100
Subject: [PATCH 08407/10326] Simplify custom filter criteria retrieval

---
 osu.Game/Screens/Select/FilterControl.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 983928ac51..298b6e49bd 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -35,9 +35,6 @@ namespace osu.Game.Screens.Select
 
         private Bindable<GroupMode> groupMode;
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         public FilterCriteria CreateCriteria()
         {
             Debug.Assert(ruleset.Value.ID != null);
@@ -59,7 +56,7 @@ namespace osu.Game.Screens.Select
             if (!maximumStars.IsDefault)
                 criteria.UserStarDifficulty.Max = maximumStars.Value;
 
-            criteria.RulesetCriteria = rulesets.GetRuleset(ruleset.Value.ID.Value).CreateInstance().CreateRulesetFilterCriteria();
+            criteria.RulesetCriteria = ruleset.Value.CreateInstance().CreateRulesetFilterCriteria();
 
             FilterQueryParser.ApplyQueries(criteria, query);
             return criteria;

From 06e42b4b4c2bab783e277fcbc86ef5f26efc50aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 Mar 2021 16:02:20 +0100
Subject: [PATCH 08408/10326] Fix taiko leaving behind empty judgements on
 legacy skins

---
 .../Skinning/Legacy/TaikoLegacySkinTransformer.cs  |  2 +-
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs  | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index 9f29675230..40dc149ec9 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             {
                 // if a taiko skin is providing explosion sprites, hide the judgements completely
                 if (hasExplosion.Value)
-                    return Drawable.Empty();
+                    return Drawable.Empty().With(d => d.LifetimeEnd = double.MinValue);
             }
 
             if (!(component is TaikoSkinComponent taikoComponent))
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index da9bb8a09d..feeafb7151 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -150,17 +150,13 @@ namespace osu.Game.Rulesets.Judgements
                 }
 
                 if (JudgementBody.Drawable is IAnimatableJudgement animatable)
-                {
-                    var drawableAnimation = (Drawable)animatable;
-
                     animatable.PlayAnimation();
 
-                    // a derived version of DrawableJudgement may be proposing a lifetime.
-                    // if not adjusted (or the skinned portion requires greater bounds than calculated) use the skinned source's lifetime.
-                    double lastTransformTime = drawableAnimation.LatestTransformEndTime;
-                    if (LifetimeEnd == double.MaxValue || lastTransformTime > LifetimeEnd)
-                        LifetimeEnd = lastTransformTime;
-                }
+                // a derived version of DrawableJudgement may be proposing a lifetime.
+                // if not adjusted (or the skinned portion requires greater bounds than calculated) use the skinned source's lifetime.
+                double lastTransformTime = JudgementBody.Drawable.LatestTransformEndTime;
+                if (LifetimeEnd == double.MaxValue || lastTransformTime > LifetimeEnd)
+                    LifetimeEnd = lastTransformTime;
             }
         }
 

From 1525480e73196e9cbbef3128b012e04e130c84b6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 6 Mar 2021 19:18:40 +0300
Subject: [PATCH 08409/10326] Demonstrate value of `SPINNER_TOP_OFFSET` to
 being more sensible

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 1f1fd1fbd9..5df8f8a485 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             /// for positioning some legacy spinner components perfectly as in stable.
             /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
             /// </summary>
-            public const float SPINNER_TOP_OFFSET = 29f;
+            public static readonly float SPINNER_TOP_OFFSET = (float)Math.Ceiling(45f * SPRITE_SCALE);
 
             public LegacyCoordinatesContainer()
             {

From 8f4dadb06a393f760565ee61c3066644975b8c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 Mar 2021 15:06:16 +0100
Subject: [PATCH 08410/10326] Enable pooling for taiko judgements

---
 .../UI/DrawableTaikoJudgement.cs              | 11 --------
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 25 ++++++++++++++-----
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
index b5e35f88b5..1ad1e4495c 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -12,16 +11,6 @@ namespace osu.Game.Rulesets.Taiko.UI
     /// </summary>
     public class DrawableTaikoJudgement : DrawableJudgement
     {
-        /// <summary>
-        /// Creates a new judgement text.
-        /// </summary>
-        /// <param name="judgedObject">The object which is being judged.</param>
-        /// <param name="result">The judgement to visualise.</param>
-        public DrawableTaikoJudgement(JudgementResult result, DrawableHitObject judgedObject)
-            : base(result, judgedObject)
-        {
-        }
-
         protected override void ApplyHitAnimations()
         {
             this.MoveToY(-100, 500);
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 148ec7755e..d2e7b604bb 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -17,6 +19,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -38,6 +41,8 @@ namespace osu.Game.Rulesets.Taiko.UI
         internal Drawable HitTarget;
         private SkinnableDrawable mascot;
 
+        private readonly IDictionary<HitResult, DrawablePool<DrawableTaikoJudgement>> judgementPools = new Dictionary<HitResult, DrawablePool<DrawableTaikoJudgement>>();
+
         private ProxyContainer topLevelHitContainer;
         private Container rightArea;
         private Container leftArea;
@@ -159,6 +164,12 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             RegisterPool<Swell, DrawableSwell>(5);
             RegisterPool<SwellTick, DrawableSwellTick>(100);
+
+            var hitWindows = new TaikoHitWindows();
+            foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => hitWindows.IsHitResultAllowed(r)))
+                judgementPools.Add(result, new DrawablePool<DrawableTaikoJudgement>(15));
+
+            AddRangeInternal(judgementPools.Values);
         }
 
         protected override void LoadComplete()
@@ -283,13 +294,15 @@ namespace osu.Game.Rulesets.Taiko.UI
                     break;
 
                 default:
-                    judgementContainer.Add(new DrawableTaikoJudgement(result, judgedObject)
+                    judgementContainer.Add(judgementPools[result.Type].Get(j =>
                     {
-                        Anchor = result.IsHit ? Anchor.TopLeft : Anchor.CentreLeft,
-                        Origin = result.IsHit ? Anchor.BottomCentre : Anchor.Centre,
-                        RelativePositionAxes = Axes.X,
-                        X = result.IsHit ? judgedObject.Position.X : 0,
-                    });
+                        j.Apply(result, judgedObject);
+
+                        j.Anchor = result.IsHit ? Anchor.TopLeft : Anchor.CentreLeft;
+                        j.Origin = result.IsHit ? Anchor.BottomCentre : Anchor.Centre;
+                        j.RelativePositionAxes = Axes.X;
+                        j.X = result.IsHit ? judgedObject.Position.X : 0;
+                    }));
 
                     var type = (judgedObject.HitObject as Hit)?.Type ?? HitType.Centre;
                     addExplosion(judgedObject, result.Type, type);

From 97f56340af36e85a13d85b02d477edee596f7f34 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Mar 2021 20:57:25 +0300
Subject: [PATCH 08411/10326] Add legacy score font to testing old skin

---
 .../Resources/old-skin/score-0.png               | Bin 0 -> 3092 bytes
 .../Resources/old-skin/score-1.png               | Bin 0 -> 1237 bytes
 .../Resources/old-skin/score-2.png               | Bin 0 -> 3134 bytes
 .../Resources/old-skin/score-3.png               | Bin 0 -> 3712 bytes
 .../Resources/old-skin/score-4.png               | Bin 0 -> 2395 bytes
 .../Resources/old-skin/score-5.png               | Bin 0 -> 3067 bytes
 .../Resources/old-skin/score-6.png               | Bin 0 -> 3337 bytes
 .../Resources/old-skin/score-7.png               | Bin 0 -> 1910 bytes
 .../Resources/old-skin/score-8.png               | Bin 0 -> 3652 bytes
 .../Resources/old-skin/score-9.png               | Bin 0 -> 3561 bytes
 .../Resources/old-skin/score-comma.png           | Bin 0 -> 865 bytes
 .../Resources/old-skin/score-dot.png             | Bin 0 -> 771 bytes
 .../Resources/old-skin/score-percent.png         | Bin 0 -> 4904 bytes
 .../Resources/old-skin/score-x.png               | Bin 0 -> 2536 bytes
 .../Resources/old-skin/skin.ini                  |   6 +++++-
 15 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-0.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-1.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-2.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-3.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-4.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-5.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-6.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-7.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-8.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-9.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-comma.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-dot.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-percent.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-x.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-0.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..8304617d8c94a8400b50a90f364941bb02983065
GIT binary patch
literal 3092
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-1.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3b85eb873a9f46dcc300d92afda6155353bab39
GIT binary patch
literal 1237
zcmV;`1S<Q9P)<h;3K|Lk000e1NJLTq001HY002A)1^@s61Dj|m0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$cS%G+RCwC#Sx-wFK@^|eO?GXqjnxSK
zM@tc;77>wp5aXdYkHvliKZD@OPa^24A3!|xAgxEeM50JaMX=Hu|InJ&7&j)_-M*K+
zDPx*sXOc}TGy^|Y;_STN{N}wkGjBD|^Vm&jI=dk)RQZFZX^l)q6P~=G)UNPk_0<1^
z$ol$v&CcWF<DyZ6-VYN(g2E0UFQ5qHI!cNNMm51`hzz4aQ$U9Ri~8d1bASxsC*T5b
z3FCnvo~uNJX3h<xf!hK)g(t@yz%3$jMFfrkhcp?7;HoNO5CJq00rV1j0Qcy(yYws}
z7K=R`92~q2uykFwmzS5{t*x!ShyN7-HmM}PG^9qDW*P-N20R5k0XzcSpO~0<*5BXX
zJ1{WNH8eD2j*gBp%d(hhnk*Cwv0N_4Iy*aG1CdYA{|u0(rBd<{oz@>``VcTUGc)t%
zdAW6ujEorEXgD1HZCs2t{QWL8__GhtMdRtJL^OI42YN6yHT7zKetx2_udk}nY7N6Q
zpU?9#ELv)<5k<n}eBIO2(__(S6s49<EX87x?d<HhL?Yxz!Y{LyA}11wn1*2}WjNP$
z+4=doCnPrUDNV!^64GTNkw{%!TrkIRR5PwCgsj^rkpg-7>Ehzz>eABEX)2Y%S(ap%
zY2Zg_yeN=SCgKW7>G0&_WOHtA?(O8{WPEmZmhJ8Bp(FY(O%)<c)mdFy7F6Vf6FxXN
z&=(dKym&nRa&>i;_4M@A92A#vcX#))BBQD)0-F=}5t|Ybrs+MvM?i9ObMx4?ZC^#Q
z*=(K^;UtuohS5%mesW2f5%-O+fG>a)8j|o4M@5mEyDyL_c{`+hhjvi(nI8n1<}@2M
z)d+Eg`1!&&vyvjsElrJ(_QcbcpO0iRnVih_-{_gucV;|lwzjr@HWf8K1YB7~DoM~1
z2cifk;h-UjYltK3AB`&FY;SMN>^)uu0wcns$2mJYQy~)Q1xqPvT7A>=WRuh1x^jB|
zT9N<b65b}#CekL->ddONf3$*#cy09H7$`$V6YjiPD->}RCaKAgXyh1BItqB@CNs9d
z2~kZhuwy{!Jd#W%i}minx~?;!%BWW<eFmclT*jSxmn<yi#A30iP>l?X$hA`%U9kNW
z(Pc?AdP0*5VelbCAQGq|s^?InLXkk1hAAkb3uLrb_=s;p!>S_@(PVRpYSduN=D-;X
zbxRBoHDhCA9kTacRU$ZOsn~CtX0~2J!>9o=IjXM|g1m%#RF233zNgda6xPvdk-=nV
zSyqN>DK;tDSfQpyUF{rjw7<Wf*x1;3F+4mRp`3B89UUDNR#sL%Pz^3as?_(Z%2|Pd
zKRVHe0{k@64Y<$B9|@kZ@<#&9pk34z75heYw|&58Dtloq&IVgfvx@NAE0(ZM$zM>N
z16KZ&(n0;Mh)kLYeW!PP{X~igRvJN-A~~yAheZOWFb=O+=ZKI^eT!7BY}!Xkl}7v=
zM#iparj>iiwW<M!Uy-J&kF*cZZ6X!zmjD9*_`52{RF+Q&00000NkvXXu0mjf@8UPi

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-2.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f65eb7ca7e52a69d645d3550d932ec55c44acd7
GIT binary patch
literal 3134
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
Y0OO;-v8NaCZ2$lO07*qoM6N<$f&jDokN^Mx

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-3.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..82bec3babebd59263dc486e5900a3a01ea4aaed7
GIT binary patch
literal 3712
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-4.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e38c75a9ddf9dc183531b5332ecede96a3f0053
GIT binary patch
literal 2395
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
N002ovPDHLkV1f?Fo=yM&

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-5.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..a562d9f2accc9592595b3b07669195d5b75406f8
GIT binary patch
literal 3067
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
JPDHLkV1kmK?iT<6

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-6.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4cf81f26e5cab5a068ce282ee22b15b92d0df12
GIT binary patch
literal 3337
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
TZ*tsI00000NkvXXu0mjfuoP_o

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-7.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..a23f5379b223d61079e055162fdd93f107f0ec02
GIT binary patch
literal 1910
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-8.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-8.png
new file mode 100644
index 0000000000000000000000000000000000000000..430b18509d3b38dba358be5c825d62b5e3e96134
GIT binary patch
literal 3652
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
WlYXW<G5A^l0000<MNUMnLSTZTCi=1f

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-9.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-9.png
new file mode 100644
index 0000000000000000000000000000000000000000..add1202c31255cdf492a9f8bcdfeb21d105e8ef9
GIT binary patch
literal 3561
zcmV<F4Hoi=P)<h;3K|Lk000e1NJLTq001oj002A)1^@s6@{lv60000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU<i%CR5RCwC#T6t_$RUW=?>Asgzx<f&r
zK&h0avJ{3*K_@kgppq~FH98@}KPE&&h%qL_FdD~+F`9^EG$v$p%ovTRGhq=hV1N<m
z0A-P_ETwecU*FO@-*@vn&EazIZN<qXCUcT6ukZEUcfa#HzvcU#bA6_18o##TH-3e~
zcMsq9YY5ohbC`kwAZB}2|GTH5ydrq`@L|s{&Y3gErxA<;;(-J~ydWsw@d+uCi~?bx
zUl0~V)g*B5dzwIS7-WM&FbPNj(gdmUK1qlNG|~|v*a!3g-9VST_Q>a9+#?F&vHuEb
z{FqKQ8OQ*#fE*23@;S*T$}0H84HRLL>;T$;7NA+c_nkm5?!{Gzf&9Qdlg5uIHz3(`
zU?h+S6amG2EiEk_yKv#cvE#>&&nPS`OvuX03RF~77=FLsh{a;Y_uqeS4h#&$>gwwH
zE?&IYx_kHTpW52m>T&IL;2LlPxFr)H`99n?GF;+5-KT|cf-L(8pa2*Rj3-vDTJ^x1
zHERm0s;UA>Nl8Y0e7q4128}=<V8Q3}86ayBCnAxE5e|oq-ring-@bj(UAuN&|Mb&O
zf52~@2Yv#s01aY!x=qB(U1raoeJ5!l954PlQpipO${&9C;RP?g_~N*!Q>Xe;Q&TOn
zBsko`iI9AEcQ;od_U4;!*5UOa{&iX=P%l;|@vxi4?;tHctO(}<V@WnUJA3w~O`8@!
z^UO1;nVFeCo2*mH>hJG2;3~%3Z@=BPZQHh8`1nWQj99%%v-p4;Y30)a$pQ?n5?~4l
zSMS)d<Do^176oZtF8?ns3Yc(WVxp0on`^)rS!ro$zuU59i{cQ|^7#M^X}YDvpv^7v
z#D6P4_~3(wmM&cyOi4-cv@Wej-=*J%LLnm>jauK2i;FYp_XPc3A2a}0ZvFc8jGY<~
z*K@kc<*Fz-j(AC7(}3Rt?`__^87tVv3}AW<kTqLdTTKL+SyNLJDk>`C5}%~6PMS2S
z`MKwwGjH6uVPZ0l*JFZaQ&W?<apOk%^LxNrU<NQs5`yKv3N(<aikxjJunc&4{`~nT
zc_aSdP=p&A8qC$JSJNs-ft|pgfUUqbU^}p<tgNi9wzk%lIDd!ttFEp-E!Wln6Ql+N
z-AHGPl{w45eDu*rVJx*LVNR&AvC(|=(MNl6%|C!Y0)GHj0Ly{j%BsB#d`7F27zsKJ
zPH6Amy>y4qfDOQ0Am46nMcOX`n8`2QfB*gE4?g%{TtY&EXF&Dz^cb(d{`$a|Uw+B7
z#hiHrI1ZeWOhBvE0{`MFpvWA0_0?CSyw1@-k(F?7-_uV&Jx^ABloYlECnc&#b18C>
zkH<4pu(G)g2HoY$mkneV`tAuKcUDr?O{sLZr1D(^>VSWvsMKD)desV4r>w&Ju3fv9
ziC~;qIaB08z>PF#H3FF=Z8%nb<&{^u+uPeuNnyAO+?H}2!ZNBX&?9<-CHoS-U-$02
z@AfmxI1Of-^73*6RhNNSC>1$HGMvv&I#EPV=Co<k{Jhw!vUPQJ8T<F|C)vwFsKs6o
zB)`(6y;7nZsXM;;=9?>=v{Sc4Ycst<)8vVK7$Lmk?Ydu8!XyyRAFAT96o3Bt=LW2H
zMO>goB<EeFSKfzZLhY<}_4W1F&YwST=@O^GRYq{fL4Xwt=``Wzx0ALcD10i}%a=J=
zJdPec+9l<-RS5Tc6oCQFRVYzg4<0;da`KM7AMT%=oNO#vvSflr`Yyj7Y@4uTfuVE-
zgOE~Fmb^<ebHuIOinU{6@es*hzkWU9W@(j4#*G`7Es{c!4%$f%TLF<Y(pQW4YQJ<S
zLv<c{zi4R-uN?rAo-$>M%4jKWmbQKnRvuD-GZ5j=eL^;>HLJsE*@!q0_Vhs}f&~i}
z_$8yINUjcw5*;MXn@8YJVUil=wu4$Bp9kT=AXnLmOAgZUUT#RgrnSe68Iz;+pF#az
ze&ufm4jj0_0P$Kn{$NH%M!Kz`9n7PArD_D?rCrOE>Q*F8MF}*9MapYX1wwqO;-WXr
zgQQh-cV4=5$s8(3CQh7~FA_Fa)FFR7orOu3G)w+hD9uC}8wz5^j2TmwFJEqW)dFQ4
zu80thb0Xa*)vWc<p+kM_EZhbKJXBz|Xl|yZ`=soS7L>|+wrNvEX3hcT&73*28e%Mt
zI(n$o%Kzu*=O=5f;YgY}^fq$nb(UE-7a{3qpM93ro{qOOfm!leDd6W-qSAf?EG;Q1
zc?4o<$yZ-}m4fblNY_yAk(Za3XxqW^>01bWQn4CQW>20zeR}-dxpRF^Kh6#W0b-!5
zNqOOg7Zx5nb}UzfQHP{6MtT~oISOrBDUkixV~_a|2UZ6&+?I`j3d8wqWbYu|FE?db
zzWnjWA2*=uE<lgySkhT)XU&>reEs#;@o=YUc%4RxjU_b;3k!o46%{`Cu2tDcl;0o9
z9h_P?+}pnIcgON4NMNzmT@U;f`XV}1BfwS+{%=A+nH?P+W@l%o2{FVH?b@ax$gM_z
zuU>;K+*40I)hHd%BN8tOdJ~}3ShL8?Gw{J5QLe2D=(U7&A?o1t^mGHAwPjsq2B#Hb
zIt3X6jf16OyaqEEgjJWV$sMp)MCBqB@#jvQIB{U>)~%Or-@a|QiJRdLihitwfmktC
zu3TxXTer?|)6{z9#l-Eqtfnq%)V@cG<kkm(b-<s|$(%iT@}$|_-96-zI=K!zdR~vN
zJc5;=<;>~Rr<=EK-SWKt=FOWX0{#%bzX_<8ydO~R5ftJv6o;@Vw+6KW$R?q4=gvKV
zPGt^yN6J?#u$)|gOG>M9>HGTnjI(FYnje1nVe=PXd{GCz(k`(>ojlnqi>Q5+D_5>G
zOJ?gAYnylMnrdQ1xk{U)G9RjBAC~kQ8c$ZU`;ZP(Rfi*$%Ocy-(qh!s)<%yUInoJ9
za20=FkX_Oixgqxlje>%L3Airk<xX%<Qwm;>((8JYp>~*pQhky&IcUg5OodS_b2D&K
zG;UI9X=z4rad9%TMi@6ya<$80FFGW@No$pWv}YM-44pc4DkL%1qgncn{pp~HpES`C
z*-B4n6Nm@_Wwilx<R+jrazxWG-D0IKc^}aBx8tx<L9ePv8FBph@fNMo2-!7zPy|Ve
zh@WD?C?TFCBtu%S*CJNvR>u%Z-U{)MpkJ=dkb7|zvrr{nEzPXK#&`Gb-50cW&XqK+
zoR8jY(dyN!S0e9bz_;R%SN-Tz`cb}n5ge`i_U${006QkBu~DqitEHuw_O~iraq2_?
z!F(Tcxm$&#l@Yj6#O*b$Y3|o^wC*03rRU9?S6x$6Q%ohMG6IkQ3#5Z|9$b3d(xpq4
zo7~bG*1PtTMN=n=r7ca3j${-`yA9^={rmSfN(O6@)eJk4_Ny}%1VIv0n$w02vqX7$
zc>*#=H3F|)tlXhlS|=P7!kOaFqoMXDp)~v5HiMWo(DWL6_Ut(=E7>YWiP{_IpjIMH
z<m3+3z1Z`x+DuusYSlE5z9g3D6u%yjJa1|nKv}ZsV(IHAo_Jy+)t+09rY~>bzP%j<
z>4J6+6LM;tmG-a#4MM5z%$YMWx6(~Ly<)|R1l*jud5SaxC1TAS*{jGEvTO(@0Tq)c
zPp*QL4Z67ot;~JCojZ5_D0_mp-TYaVZxxJI+G}cRDp<B`Sq^2TJz&&k3P|UC`|Y=?
z82Ocs7VC}@RYt;<`0m_y-g&1Ka@Vl|;Hq+~?Tt6yXhTujD?6`O#63cKte|fkB(1mk
z@fR*!Fh`6SF##1Yf&OQA6E*^6Wo0B^_}zEkC2Hr5IW`Md;wE$7fB*fl2wqEDyQx1k
z6Xu2u8~!PWM(4#nXz3_ACDVztepqh-!4Rsds+x%E6;S2cE=emZD-A4r9x7rficF3a
z5B7|c@#9rbKKbNKSU3~Cp|v_rgy|N|&CSO1&p%&RUtfPvtX!}B*?y*|NGqbMz>E}2
zRj}84?X}k)fkI1W3bY^gsIx%^5P_w&K4Uw^UXVdcvi9qAfyJXaX!mAJ?r-?$2ic6j
zE?McWO-;9R#8e?ZMgpyJ<Hn84HgDcMg6)@+yQm3}gw<7GRn+ONmnfp}gX?r|*|O#D
za*}XLnh^SOpVP^$BJI~U3L}yin`G~qJN$=e1uXSx1YV3vj#bOvt&=F-NF6)75$5D5
zTN@f0jF(<|=_Uw&CPy6SBsX`uWsITD#+9pN$uYthwa@YR<B!i?vt~_^IvZySBv~(g
zOrq4soGg!-p)0~~z4aDS{fWbJKBG%m*V9_ZvvJ!VT%2~Skt5`bBqxtXW+_8uELpsG
zaTfj#BHI}DfaPk?W$5?t_Zaej=O>?hat1-mGnh+)Ya$2QrLu;-o<wjZtq~7s&wHec
zWF0BRW28(bTRrnJfByV@5Djuyl<hwdLs{+s$tF!5Hfje+w{1#p$VVqUN!#2-f3hZ3
zCZLd}ZAL0Z=hq$y>en7t=@jzqn%-91#>09@#eSe~xa{P!cO1}4eYfP$L>rto3I{Ze
zt;qLj8ayImXxLBG-0Ra~YMUycNdW!TZ`%>l^>x&?9q_Zss;qVI4{tbBQkx-68-DQ^
jB>n#<Apb|>KLQK@`Y9D2Zm_ee00000NkvXXu0mjf72dv#

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-comma.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-comma.png
new file mode 100644
index 0000000000000000000000000000000000000000..f68d32957ff8dc2e6e26e2b739eab85385548faf
GIT binary patch
literal 865
zcmV-n1D^beP)<h;3K|Lk000e1NJLTq000vJ002A)1^@s6gsOor0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#14%?dRCwC#m`zUGKorNvj_nX=O4AUM
zHmRaYfI`Iq2=p4<pi;M-g41w_?t;_}0;O5eC=gZoE-g?8C${^4?we@hIILK7;gSB>
z8ION{U-N9C`MxinYv|$`M+}Q$F)W6~uoxD@Vpt6OzhDOaIXgR>o2*u=8V;)D@TF?C
z+T17S{{H?ym;%w+TADXmhT?$-O-NWvN0;UR_GXqT)+8VcT7_OfX+F1jnFIZS?x8!#
zh8}URz_+nygyLs1<TaFs3VgoGYX~%gdQgYY$=&gsWeiI~>rfHeIXpZ(*xcNFpGu`(
zwcG8nVHo$9mzUrA{eGSAow*&jOrP%XnP4jnsY0KQkB@6tS64o6^aq1MaO`wCezV#1
zPfkt<_8IyJm7o-H)Y71MrP!@^ySuwPg+f7WY;1^ZHX9uC`MfBVO5*6~=mXZgWiM7_
zg2J#BUQj3&i!V*nT&N{Y(}Zo?<X(njY0B~m!;+kU?B3oULS!t!T-OyB7Z)CTVXAeg
zEA^$8MLLm41XhH{bUGEI(a2W|m^HIZ))+l0SuU3|1dAF3Ycv{TE{8{&;;b&f$S(^)
zPCo_f^?DCnbB|mWb1+@8%tD$iUDubwP$Ivcf@#WrOm1&)FSTqknTUG5-ecG}%FQ{;
z*4EY{Eu%~hheL6T!TZu-*g^u-Zec{h$i?&XbDuZ5EfXNSMmPb1b(KoRigJ@+H#avF
zqX)$@H{5B}g7Pw%j93Ok@X0EffJm6nlXTIBi_>M9#738`=bqh+giU0>f>loV9|82+
zaU80#CVuw0IXW_vYCm)NDP(>JPj7d--Su=j9k?q&C<*&31~<mve9sJ~(L(G&lUsBS
zDnk|Q*MqICt({yhm%(+f)oNXzo}PZewFdMZ`T_l<TBDZ>y-*}fwjTm!p*P&Jvpnyz
z)m?^=o3|X6i423GymcH7s?X++lz!!LDcrGp4_y83T(4ux)LkG8*W#nj518@;Wz|pB
rcm*5<CX||!J0kK0tU^@SUjYUHNv2`hoe|eD00000NkvXXu0mjf`J|EL

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-dot.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..80c39b874533f1996978af8ada97133b743870a8
GIT binary patch
literal 771
zcmV+e1N{7nP)<h;3K|Lk000e1NJLTq000sI002A)1^@s6YiQ~b0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!rAb6VRCwC#n7@w_K@`V#*;_mj;;F2}
zKtgfXoSGO53StEfv9_@@v7z!mkb+L+Pq3Ae%8G=71PPSHXtWRvM#STX5JZmKU3UDw
z&0DkHp_iDebSL>_XP0^3eKYf&7eE$5NN3S}(it^R$P@B}JRwiW6Y_*SAy4SP5!!0C
zTE9F<CX+HQGQY&>JKtC>>NlHB>x7U?fC3eMrUE}-6&6|p1Lzp5^Zgp4;-?Tka0Ir&
z1rTBaEJ%Zoz;`eQ3$UbTh&3rgX9|7}x(Kd<2wyLO^E@RI`3er0F^e8jrdymkWwHaJ
zU>EG6-At#`*8_n7WhgqG&Jb^YGairM;r=~O+gUez%_x%?%@8~chr`cux!mVouO}vx
ziI~l1Vmh6Q;czJ0?Y5Q8W=ZG?xDRe~_LPX7{ta*sJS`LoBN8x8Qyg!)u8YB7AXw}%
zxJ%jddP>*89q=fXO1<p&`x`~vVw4#&e~y?3oYfUt=yR;7WipxlP$(oRit=0Isj4bP
zqfr@SZ{hYb@3QK1ZF?vdiv?)lX^qBcnzrMzhvIX&*zTkK^;si_>TEF6vaC~s48xE{
zqtTROY?u4ELr$I4>-A5|<x=|7k3kZ_hFFzKrA;wxRD*<8U<L-|a=G4UG**knLfVuW
zXCf7gMaP&2>~39QXWMIpY}VCkbsmq$cd@;G3M5vml{BBvrEa%t<@5R1rBdky#=iw0
zIjg12+aCmBcDQpy_7jQ3UL+DBYmj&PwOZ{J`d!cgAHWx$%}VBs{OkvExyH8F_z-XN
zhAjBd4tYuwo)#^QA>$xAWkltmAR9EuCtu}5>6DRg%ppIcnq=Aa2%R;=oZ@xF169W7
zDr`CzH^QVBIE8JK`;M1drwJD)wp9Li|3LU5zyS0^RhH-3lmq|(002ovPDHLkV1mea
BUy%R+

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-percent.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc750abc7e80287192efb65633e58b6b19e47125
GIT binary patch
literal 4904
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
aBftRVw!D&5)M2&&0000<MNUMnLSTaY-$WSz

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-x.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-x.png
new file mode 100644
index 0000000000000000000000000000000000000000..779773f8bdedd6c382b39e66b967b206cc5cdbda
GIT binary patch
literal 2536
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/skin.ini b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/skin.ini
index 5369de24e9..89bcd68343 100644
--- a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/skin.ini
+++ b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/skin.ini
@@ -1,2 +1,6 @@
 [General]
-Version: 1.0
\ No newline at end of file
+Version: 1.0
+
+[Fonts]
+HitCircleOverlap: 3
+ScoreOverlap: 3
\ No newline at end of file

From e4afe717d5b569fe9a6a7bca1bb8891b2cffee62 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 21:23:38 +0300
Subject: [PATCH 08412/10326] Publicize legacy coordinates container and sprite
 scale

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

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 5df8f8a485..06443ca8b8 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public abstract class LegacySpinner : CompositeDrawable
     {
-        protected const float SPRITE_SCALE = 0.625f;
+        public const float SPRITE_SCALE = 0.625f;
 
         protected DrawableSpinner DrawableSpinner { get; private set; }
 
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         /// A <see cref="Container"/> simulating osu!stable's absolute screen-space,
         /// for perfect placements of legacy spinner components with legacy coordinates.
         /// </summary>
-        protected class LegacyCoordinatesContainer : Container
+        public class LegacyCoordinatesContainer : Container
         {
             /// <summary>
             /// An offset that simulates stable's spinner top offset,

From 1841a4d1c977e04377d7427681a93ad09d8c293d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 21:37:25 +0300
Subject: [PATCH 08413/10326] Extract legacy spinner presence to lazy field

---
 .../Legacy/OsuLegacySkinTransformer.cs        | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index d74f885573..d4a403fbd2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -13,6 +13,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
     {
         private Lazy<bool> hasHitCircle;
 
+        private Lazy<SpinnerStyle> spinnerStyle;
+
+        private bool hasSpinner => spinnerStyle.Value != SpinnerStyle.Modern;
+
         /// <summary>
         /// On osu-stable, hitcircles have 5 pixels of transparent padding on each side to allow for shadows etc.
         /// Their hittable area is 128px, but the actual circle portion is 118px.
@@ -30,6 +34,19 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private void sourceChanged()
         {
             hasHitCircle = new Lazy<bool>(() => Source.GetTexture("hitcircle") != null);
+
+            spinnerStyle = new Lazy<SpinnerStyle>(() =>
+            {
+                bool hasBackground = Source.GetTexture("spinner-background") != null;
+
+                if (Source.GetTexture("spinner-top") != null && !hasBackground)
+                    return SpinnerStyle.NewLegacy;
+
+                if (hasBackground)
+                    return SpinnerStyle.OldLegacy;
+
+                return SpinnerStyle.Modern;
+            });
         }
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
@@ -110,11 +127,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         };
 
                 case OsuSkinComponents.SpinnerBody:
-                    bool hasBackground = Source.GetTexture("spinner-background") != null;
-
-                    if (Source.GetTexture("spinner-top") != null && !hasBackground)
+                    if (spinnerStyle.Value == SpinnerStyle.NewLegacy)
                         return new LegacyNewStyleSpinner();
-                    else if (hasBackground)
+                    else if (spinnerStyle.Value == SpinnerStyle.OldLegacy)
                         return new LegacyOldStyleSpinner();
 
                     return null;
@@ -151,5 +166,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             return Source.GetConfig<TLookup, TValue>(lookup);
         }
+
+        private enum SpinnerStyle
+        {
+            NewLegacy,
+            OldLegacy,
+            Modern,
+        }
     }
 }

From c441e993ff5961cba259e56b162c7ee384f0afc7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 21:43:32 +0300
Subject: [PATCH 08414/10326] Separate "gained bonus" to a read-only bindable

---
 .../Objects/Drawables/DrawableSpinner.cs      | 17 +++----
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs    |  3 +-
 .../Skinning/Default/SpinnerBonusDisplay.cs   | 47 -------------------
 3 files changed, 11 insertions(+), 56 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index d02376b6c3..f16c1fc9d9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -33,12 +33,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public SpinnerSpmCounter SpmCounter { get; private set; }
 
         private Container<DrawableSpinnerTick> ticks;
-        private SpinnerBonusDisplay bonusDisplay;
         private PausableSkinnableSound spinningSample;
 
         private Bindable<bool> isSpinning;
         private bool spinnerFrequencyModulate;
 
+        /// <summary>
+        /// The amount of bonus score gained from spinning after the required number of spins, for display purposes.
+        /// </summary>
+        public IBindable<double> GainedBonus => gainedBonus;
+
+        private readonly Bindable<double> gainedBonus = new Bindable<double>();
+
         public DrawableSpinner()
             : this(null)
         {
@@ -76,12 +82,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Y = 120,
                     Alpha = 0
                 },
-                bonusDisplay = new SpinnerBonusDisplay
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Y = -120,
-                },
                 spinningSample = new PausableSkinnableSound
                 {
                     Volume = { Value = 0 },
@@ -293,8 +293,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 if (tick != null)
                 {
                     tick.TriggerResult(true);
+
                     if (tick is DrawableSpinnerBonusTick)
-                        bonusDisplay.SetBonusCount(spins - HitObject.SpinsRequired);
+                        gainedBonus.Value = tick.Result.Judgement.MaxNumericResult * (spins - HitObject.SpinsRequired);
                 }
 
                 wholeSpins++;
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index 2883f0c187..131645406e 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Rulesets.Osu
         SliderFollowCircle,
         SliderBall,
         SliderBody,
-        SpinnerBody
+        SpinnerBody,
+        SpinnerBonusCounter,
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs
deleted file mode 100644
index c0db6228ef..0000000000
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets.Osu.Objects;
-
-namespace osu.Game.Rulesets.Osu.Skinning.Default
-{
-    /// <summary>
-    /// Shows incremental bonus score achieved for a spinner.
-    /// </summary>
-    public class SpinnerBonusDisplay : CompositeDrawable
-    {
-        private static readonly int score_per_tick = new SpinnerBonusTick().CreateJudgement().MaxNumericResult;
-
-        private readonly OsuSpriteText bonusCounter;
-
-        public SpinnerBonusDisplay()
-        {
-            AutoSizeAxes = Axes.Both;
-
-            InternalChild = bonusCounter = new OsuSpriteText
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Font = OsuFont.Numeric.With(size: 24),
-                Alpha = 0,
-            };
-        }
-
-        private int displayedCount;
-
-        public void SetBonusCount(int count)
-        {
-            if (displayedCount == count)
-                return;
-
-            displayedCount = count;
-            bonusCounter.Text = $"{score_per_tick * count}";
-            bonusCounter.FadeOutFromOne(1500);
-            bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
-        }
-    }
-}

From 3f1d36ee6bced20b47a167b8780d2a736001c282 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 21:49:38 +0300
Subject: [PATCH 08415/10326] Add default spinner bonus counter piece

---
 .../Objects/Drawables/DrawableSpinner.cs      |  1 +
 .../Default/DefaultSpinnerBonusCounter.cs     | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index f16c1fc9d9..4f5afc85ab 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -82,6 +82,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Y = 120,
                     Alpha = 0
                 },
+                new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBonusCounter), _ => new DefaultSpinnerBonusCounter()),
                 spinningSample = new PausableSkinnableSound
                 {
                     Volume = { Value = 0 },
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs
new file mode 100644
index 0000000000..633766290f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.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.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.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Default
+{
+    public class DefaultSpinnerBonusCounter : CompositeDrawable
+    {
+        private OsuSpriteText bonusCounter;
+
+        private DrawableSpinner drawableSpinner;
+
+        private IBindable<double> gainedBonus;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableHitObject)
+        {
+            drawableSpinner = (DrawableSpinner)drawableHitObject;
+
+            InternalChild = bonusCounter = new OsuSpriteText
+            {
+                Alpha = 0,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Font = OsuFont.Numeric.With(size: 24),
+                Y = -120,
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
+            gainedBonus.BindValueChanged(bonus =>
+            {
+                bonusCounter.Text = $"{bonus.NewValue}";
+                bonusCounter.FadeOutFromOne(1500);
+                bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+            });
+        }
+    }
+}

From 30f07aa9fcc22167e429be3bb798309ab3964ec4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 21:49:46 +0300
Subject: [PATCH 08416/10326] Add legacy spinner bonus counter piece

---
 .../Legacy/LegacySpinnerBonusCounter.cs       | 56 +++++++++++++++++++
 .../Legacy/OsuLegacySkinTransformer.cs        |  9 +++
 2 files changed, 65 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs
new file mode 100644
index 0000000000..3c4a6be4dd
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.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.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Skinning;
+using osuTK;
+using static osu.Game.Rulesets.Osu.Skinning.Legacy.LegacySpinner;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
+{
+    public class LegacySpinnerBonusCounter : CompositeDrawable
+    {
+        private LegacySpriteText bonusCounter;
+
+        private DrawableSpinner drawableSpinner;
+
+        private IBindable<double> gainedBonus;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableHitObject, ISkinSource source)
+        {
+            drawableSpinner = (DrawableSpinner)drawableHitObject;
+
+            InternalChild = new LegacyCoordinatesContainer
+            {
+                Child = bonusCounter = ((LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))).With(s =>
+                {
+                    s.Alpha = 0f;
+                    s.Anchor = Anchor.TopCentre;
+                    s.Origin = Anchor.Centre;
+                    s.Font = s.Font.With(fixedWidth: false);
+                    s.Scale = new Vector2(SPRITE_SCALE);
+                    s.Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 299;
+                }),
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
+            gainedBonus.BindValueChanged(bonus =>
+            {
+                bonusCounter.Text = $"{bonus.NewValue}";
+                bonusCounter.FadeOutFromOne(800, Easing.Out);
+                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index d4a403fbd2..ed09031fc1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
@@ -17,6 +18,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private bool hasSpinner => spinnerStyle.Value != SpinnerStyle.Modern;
 
+        private bool hasScoreFont => this.HasFont(GetConfig<LegacySetting, string>(LegacySetting.ScorePrefix)?.Value ?? "score");
+
         /// <summary>
         /// On osu-stable, hitcircles have 5 pixels of transparent padding on each side to allow for shadows etc.
         /// Their hittable area is 128px, but the actual circle portion is 118px.
@@ -133,6 +136,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return new LegacyOldStyleSpinner();
 
                     return null;
+
+                case OsuSkinComponents.SpinnerBonusCounter:
+                    if (hasSpinner && hasScoreFont)
+                        return new LegacySpinnerBonusCounter();
+
+                    return null;
             }
 
             return null;

From ad1b86e33a566b009ee115812c72461d87388669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 Mar 2021 18:54:25 +0100
Subject: [PATCH 08417/10326] Change `LifetimeEnd` idiom to `Expire()` for
 readability

---
 .../Skinning/Legacy/TaikoLegacySkinTransformer.cs             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index 40dc149ec9..d97da40ef2 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             {
                 // if a taiko skin is providing explosion sprites, hide the judgements completely
                 if (hasExplosion.Value)
-                    return Drawable.Empty().With(d => d.LifetimeEnd = double.MinValue);
+                    return Drawable.Empty().With(d => d.Expire());
             }
 
             if (!(component is TaikoSkinComponent taikoComponent))
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     // suppress the default kiai explosion if the skin brings its own sprites.
                     // the drawable needs to expire as soon as possible to avoid accumulating empty drawables on the playfield.
                     if (hasExplosion.Value)
-                        return Drawable.Empty().With(d => d.LifetimeEnd = double.MinValue);
+                        return Drawable.Empty().With(d => d.Expire());
 
                     return null;
 

From 3e4dfdb6755f7ea4bb721deb22029edb3dd408d0 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 6 Mar 2021 20:37:27 -0800
Subject: [PATCH 08418/10326] Fix pop out count being above displayed count on
 legacy combo counter

---
 osu.Game/Screens/Play/HUD/LegacyComboCounter.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 4784bca7dd..81b22b68b2 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -84,14 +84,14 @@ namespace osu.Game.Screens.Play.HUD
         {
             InternalChildren = new[]
             {
-                displayedCountSpriteText = createSpriteText().With(s =>
-                {
-                    s.Alpha = 0;
-                }),
                 popOutCount = createSpriteText().With(s =>
                 {
                     s.Alpha = 0;
                     s.Margin = new MarginPadding(0.05f);
+                }),
+                displayedCountSpriteText = createSpriteText().With(s =>
+                {
+                    s.Alpha = 0;
                 })
             };
 

From 413cbb30a0f45b757941c053db0e983d1053d83f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 13:39:46 +0300
Subject: [PATCH 08419/10326] Reword playfield shift counteract 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.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 5df8f8a485..9ce9fb9fd0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -152,8 +152,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 Origin = Anchor.Centre;
                 Size = new Vector2(640, 480);
 
-                // since legacy coordinates were on screen-space, they were accounting for the playfield shift offset.
-                // therefore cancel it from here.
+                // counteracts the playfield shift from OsuPlayfieldAdjustmentContainer.
                 Position = new Vector2(0, -8f);
             }
         }

From 503f29609a69451ee2cf0de0f5473bd1939495dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 7 Mar 2021 23:40:09 +0900
Subject: [PATCH 08420/10326] Also set additive mode to match stable

---
 osu.Game/Screens/Play/HUD/LegacyComboCounter.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 81b22b68b2..81183a425a 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -88,6 +88,7 @@ namespace osu.Game.Screens.Play.HUD
                 {
                     s.Alpha = 0;
                     s.Margin = new MarginPadding(0.05f);
+                    s.Blending = BlendingParameters.Additive;
                 }),
                 displayedCountSpriteText = createSpriteText().With(s =>
                 {

From fbfaa378fc25ce640eb809a0b3817511edb1042e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 20:47:16 +0300
Subject: [PATCH 08421/10326] Move spinner top offset constant outside

---
 .../Skinning/Legacy/LegacyOldStyleSpinner.cs   |  2 +-
 .../Skinning/Legacy/LegacySpinner.cs           | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
index 7e9f73a89b..5c25c38504 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         // this anchor makes no sense, but that's what stable uses.
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.TopLeft,
-                        Margin = new MarginPadding { Top = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET },
+                        Margin = new MarginPadding { Top = SPINNER_TOP_OFFSET },
                         Masking = true,
                         Child = metreSprite = new Sprite
                         {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 9ce9fb9fd0..421c43fd7a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -16,6 +16,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public abstract class LegacySpinner : CompositeDrawable
     {
+        /// <summary>
+        /// An offset that simulates stable's spinner top offset, can be used with <see cref="LegacyCoordinatesContainer"/>
+        /// for positioning some legacy spinner components perfectly as in stable.
+        /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
+        /// </summary>
+        public static readonly float SPINNER_TOP_OFFSET = (float)Math.Ceiling(45f * SPRITE_SCALE);
+
         protected const float SPRITE_SCALE = 0.625f;
 
         protected DrawableSpinner DrawableSpinner { get; private set; }
@@ -41,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Origin = Anchor.Centre,
                         Texture = source.GetTexture("spinner-spin"),
                         Scale = new Vector2(SPRITE_SCALE),
-                        Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 335,
+                        Y = SPINNER_TOP_OFFSET + 335,
                     },
                     clear = new Sprite
                     {
@@ -50,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Origin = Anchor.Centre,
                         Texture = source.GetTexture("spinner-clear"),
                         Scale = new Vector2(SPRITE_SCALE),
-                        Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 115,
+                        Y = SPINNER_TOP_OFFSET + 115,
                     },
                 }
             });
@@ -136,13 +143,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         /// </summary>
         protected class LegacyCoordinatesContainer : Container
         {
-            /// <summary>
-            /// An offset that simulates stable's spinner top offset,
-            /// for positioning some legacy spinner components perfectly as in stable.
-            /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
-            /// </summary>
-            public static readonly float SPINNER_TOP_OFFSET = (float)Math.Ceiling(45f * SPRITE_SCALE);
-
             public LegacyCoordinatesContainer()
             {
                 // legacy spinners relied heavily on absolute screen-space coordinate values.

From 0ad3073c1aa3863edbfb4c4f485ad970e507127e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 21:21:44 +0300
Subject: [PATCH 08422/10326] Use MathF utility class instead

Co-authored-by: Berkan Diler <b.diler@gmx.de>
---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 421c43fd7a..406c19e76a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         /// for positioning some legacy spinner components perfectly as in stable.
         /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
         /// </summary>
-        public static readonly float SPINNER_TOP_OFFSET = (float)Math.Ceiling(45f * SPRITE_SCALE);
+        public static readonly float SPINNER_TOP_OFFSET = MathF.Ceiling(45f * SPRITE_SCALE);
 
         protected const float SPRITE_SCALE = 0.625f;
 

From d961d110bf5294e26d7d51987dce30098a53e168 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 8 Mar 2021 02:58:52 +0000
Subject: [PATCH 08423/10326] Bump
 Microsoft.Extensions.Configuration.Abstractions from 2.2.0 to 5.0.0

Bumps [Microsoft.Extensions.Configuration.Abstractions](https://github.com/dotnet/runtime) from 2.2.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits/v5.0.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 2528292e17..c7aa6a8e11 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.302.0" />

From 74fc5d5b8cdb3452a69b70c59fa9c8c394103d3d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 13:29:09 +0900
Subject: [PATCH 08424/10326] Fix potential cross-thread drawable mutation in
 IntroTriangles

---
 osu.Game/Screens/BackgroundScreen.cs    | 2 ++
 osu.Game/Screens/Menu/IntroTriangles.cs | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index 48c5523883..a6fb94b151 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Screens
     {
         private readonly bool animateOnEnter;
 
+        public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
+
         protected BackgroundScreen(bool animateOnEnter = true)
         {
             this.animateOnEnter = animateOnEnter;
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index ffe6882a72..abe6c62461 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -170,7 +170,7 @@ namespace osu.Game.Screens.Menu
 
                 rulesets.Hide();
                 lazerLogo.Hide();
-                background.Hide();
+                background.ApplyToBackground(b => b.Hide());
 
                 using (BeginAbsoluteSequence(0, true))
                 {
@@ -231,7 +231,8 @@ namespace osu.Game.Screens.Menu
                             lazerLogo.Dispose(); // explicit disposal as we are pushing a new screen and the expire may not get run.
 
                             logo.FadeIn();
-                            background.FadeIn();
+
+                            background.ApplyToBackground(b => b.Show());
 
                             game.Add(new GameWideFlash());
 

From 7763e1dbe130233a61493ddf1cfacab1be0f3063 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 7 Mar 2021 12:39:46 +0900
Subject: [PATCH 08425/10326] Apply workaround for runtime iOS failures

See https://github.com/mono/mono/issues/20805#issuecomment-791440473.
---
 osu.iOS.props | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index 56a24bea12..729d692e0e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -77,12 +77,14 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>
+  <!-- Workaround to make SignalR 5.x work properly, avoiding a runtime error (https://github.com/mono/mono/issues/20805#issuecomment-791440473) -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
-    <PackageReference Include="MessagePack" Version="1.7.3.7" />
-    <PackageReference Include="MessagePack.Annotations" Version="2.2.85" />
+    <PackageReference Include="System.Memory" Version="4.5.4">
+      <IncludeAssets>none</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Buffers" Version="4.5.1">
+      <IncludeAssets>none</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 765cc5cf37120b9892e9233127573c5189b92456 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 13:29:47 +0900
Subject: [PATCH 08426/10326] Remove iOS multiplayer blocking code

---
 osu.Game/Online/API/APIAccess.cs      | 11 ++---------
 osu.Game/Screens/Menu/ButtonSystem.cs | 12 ------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 569481d491..ede64c0340 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -10,7 +10,6 @@ using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
-using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
@@ -247,14 +246,8 @@ namespace osu.Game.Online.API
             this.password = password;
         }
 
-        public IHubClientConnector GetHubConnector(string clientName, string endpoint)
-        {
-            // disabled until the underlying runtime issue is resolved, see https://github.com/mono/mono/issues/20805.
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
-                return null;
-
-            return new HubClientConnector(clientName, endpoint, this, versionHash);
-        }
+        public IHubClientConnector GetHubConnector(string clientName, string endpoint) =>
+            new HubClientConnector(clientName, endpoint, this, versionHash);
 
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
         {
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index f93bfd7705..81b1cb0bf1 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -172,18 +172,6 @@ namespace osu.Game.Screens.Menu
                 return;
             }
 
-            // disabled until the underlying runtime issue is resolved, see https://github.com/mono/mono/issues/20805.
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
-            {
-                notifications?.Post(new SimpleNotification
-                {
-                    Text = "Multiplayer is temporarily unavailable on iOS as we figure out some low level issues.",
-                    Icon = FontAwesome.Solid.AppleAlt,
-                });
-
-                return;
-            }
-
             OnMultiplayer?.Invoke();
         }
 

From b1cd01ceb82b9d04ea0c20b6a15392b2413f6bc4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 12:57:16 +0900
Subject: [PATCH 08427/10326] Apply ConfigureAwait changes to game side

---
 CodeAnalysis/osu.ruleset                      |  2 +-
 osu.Desktop/Updater/SquirrelUpdateManager.cs  | 14 ++++++------
 osu.Game/Beatmaps/BeatmapManager.cs           |  2 +-
 osu.Game/Collections/CollectionManager.cs     |  4 ++--
 osu.Game/Database/ArchiveModelManager.cs      | 15 ++++++-------
 .../DownloadableArchiveModelManager.cs        |  2 +-
 osu.Game/Database/MemoryCachingComponent.cs   |  2 +-
 osu.Game/Database/UserLookupCache.cs          |  2 +-
 osu.Game/Graphics/ScreenshotManager.cs        |  6 ++---
 osu.Game/IO/Archives/ArchiveReader.cs         |  2 +-
 osu.Game/IPC/ArchiveImportIPCChannel.cs       |  4 ++--
 osu.Game/Online/HubClientConnector.cs         | 12 +++++-----
 .../Multiplayer/StatefulMultiplayerClient.cs  | 22 +++++++++----------
 osu.Game/OsuGame.cs                           |  8 +++----
 osu.Game/OsuGameBase.cs                       |  4 ++--
 osu.Game/Overlays/ChangelogOverlay.cs         |  4 ++--
 osu.Game/Scoring/ScorePerformanceCache.cs     |  2 +-
 osu.Game/Screens/Import/FileImportScreen.cs   |  2 +-
 .../Multiplayer/MultiplayerPlayer.cs          |  6 ++---
 .../OnlinePlay/Playlists/PlaylistsPlayer.cs   |  4 ++--
 osu.Game/Screens/Play/Player.cs               |  4 ++--
 osu.Game/Skinning/SkinManager.cs              |  2 +-
 .../Multiplayer/TestMultiplayerClient.cs      |  2 +-
 osu.Game/Updater/SimpleUpdateManager.cs       |  2 +-
 osu.Game/Updater/UpdateManager.cs             |  2 +-
 25 files changed, 65 insertions(+), 66 deletions(-)

diff --git a/CodeAnalysis/osu.ruleset b/CodeAnalysis/osu.ruleset
index d497365f87..6a99e230d1 100644
--- a/CodeAnalysis/osu.ruleset
+++ b/CodeAnalysis/osu.ruleset
@@ -30,7 +30,7 @@
     <Rule Id="CA1819" Action="None" />
     <Rule Id="CA1822" Action="None" />
     <Rule Id="CA1823" Action="None" />
-    <Rule Id="CA2007" Action="None" />
+    <Rule Id="CA2007" Action="Warning" />
     <Rule Id="CA2214" Action="None" />
     <Rule Id="CA2227" Action="None" />
   </Rules>
diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 71f9fafe57..47cd39dc5a 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -42,7 +42,7 @@ namespace osu.Desktop.Updater
             Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
         }
 
-        protected override async Task<bool> PerformUpdateCheck() => await checkForUpdateAsync();
+        protected override async Task<bool> PerformUpdateCheck() => await checkForUpdateAsync().ConfigureAwait(false);
 
         private async Task<bool> checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
         {
@@ -51,9 +51,9 @@ namespace osu.Desktop.Updater
 
             try
             {
-                updateManager ??= await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
+                updateManager ??= await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true).ConfigureAwait(false);
 
-                var info = await updateManager.CheckForUpdate(!useDeltaPatching);
+                var info = await updateManager.CheckForUpdate(!useDeltaPatching).ConfigureAwait(false);
 
                 if (info.ReleasesToApply.Count == 0)
                 {
@@ -79,12 +79,12 @@ namespace osu.Desktop.Updater
 
                 try
                 {
-                    await updateManager.DownloadReleases(info.ReleasesToApply, p => notification.Progress = p / 100f);
+                    await updateManager.DownloadReleases(info.ReleasesToApply, p => notification.Progress = p / 100f).ConfigureAwait(false);
 
                     notification.Progress = 0;
                     notification.Text = @"Installing update...";
 
-                    await updateManager.ApplyReleases(info, p => notification.Progress = p / 100f);
+                    await updateManager.ApplyReleases(info, p => notification.Progress = p / 100f).ConfigureAwait(false);
 
                     notification.State = ProgressNotificationState.Completed;
                     updatePending = true;
@@ -97,7 +97,7 @@ namespace osu.Desktop.Updater
 
                         // could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
                         // try again without deltas.
-                        await checkForUpdateAsync(false, notification);
+                        await checkForUpdateAsync(false, notification).ConfigureAwait(false);
                         scheduleRecheck = false;
                     }
                     else
@@ -116,7 +116,7 @@ namespace osu.Desktop.Updater
                 if (scheduleRecheck)
                 {
                     // check again in 30 minutes.
-                    Scheduler.AddDelayed(async () => await checkForUpdateAsync(), 60000 * 30);
+                    Scheduler.AddDelayed(async () => await checkForUpdateAsync().ConfigureAwait(false), 60000 * 30);
                 }
             }
 
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index d653e5386b..29b3f5d3a3 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Beatmaps
             bool hadOnlineBeatmapIDs = beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0);
 
             if (onlineLookupQueue != null)
-                await onlineLookupQueue.UpdateAsync(beatmapSet, cancellationToken);
+                await onlineLookupQueue.UpdateAsync(beatmapSet, cancellationToken).ConfigureAwait(false);
 
             // ensure at least one beatmap was able to retrieve or keep an online ID, else drop the set ID.
             if (hadOnlineBeatmapIDs && !beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0))
diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index fb9c230c7a..9723409c79 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Collections
             return Task.Run(async () =>
             {
                 using (var stream = stable.GetStream(database_name))
-                    await Import(stream);
+                    await Import(stream).ConfigureAwait(false);
             });
         }
 
@@ -139,7 +139,7 @@ namespace osu.Game.Collections
             PostNotification?.Invoke(notification);
 
             var collections = readCollections(stream, notification);
-            await importCollections(collections);
+            await importCollections(collections).ConfigureAwait(false);
 
             notification.CompletionText = $"Imported {collections.Count} collections";
             notification.State = ProgressNotificationState.Completed;
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index daaba9098e..d809dbcb01 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -22,7 +22,6 @@ using osu.Game.IO.Archives;
 using osu.Game.IPC;
 using osu.Game.Overlays.Notifications;
 using SharpCompress.Archives.Zip;
-using FileInfo = osu.Game.IO.FileInfo;
 
 namespace osu.Game.Database
 {
@@ -163,7 +162,7 @@ namespace osu.Game.Database
 
                 try
                 {
-                    var model = await Import(task, isLowPriorityImport, notification.CancellationToken);
+                    var model = await Import(task, isLowPriorityImport, notification.CancellationToken).ConfigureAwait(false);
 
                     lock (imported)
                     {
@@ -183,7 +182,7 @@ namespace osu.Game.Database
                 {
                     Logger.Error(e, $@"Could not import ({task})", LoggingTarget.Database);
                 }
-            }));
+            })).ConfigureAwait(false);
 
             if (imported.Count == 0)
             {
@@ -226,7 +225,7 @@ namespace osu.Game.Database
 
             TModel import;
             using (ArchiveReader reader = task.GetReader())
-                import = await Import(reader, lowPriority, cancellationToken);
+                import = await Import(reader, lowPriority, cancellationToken).ConfigureAwait(false);
 
             // We may or may not want to delete the file depending on where it is stored.
             //  e.g. reconstructing/repairing database with items from default storage.
@@ -358,7 +357,7 @@ namespace osu.Game.Database
                 item.Files = archive != null ? createFileInfos(archive, Files) : new List<TFileModel>();
                 item.Hash = ComputeHash(item, archive);
 
-                await Populate(item, archive, cancellationToken);
+                await Populate(item, archive, cancellationToken).ConfigureAwait(false);
 
                 using (var write = ContextFactory.GetForWrite()) // used to share a context for full import. keep in mind this will block all writes.
                 {
@@ -410,7 +409,7 @@ namespace osu.Game.Database
 
             flushEvents(true);
             return item;
-        }, cancellationToken, TaskCreationOptions.HideScheduler, lowPriority ? import_scheduler_low_priority : import_scheduler).Unwrap();
+        }, cancellationToken, TaskCreationOptions.HideScheduler, lowPriority ? import_scheduler_low_priority : import_scheduler).Unwrap().ConfigureAwait(false);
 
         /// <summary>
         /// Exports an item to a legacy (.zip based) package.
@@ -621,7 +620,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Create all required <see cref="FileInfo"/>s for the provided archive, adding them to the global file store.
+        /// Create all required <see cref="IO.FileInfo"/>s for the provided archive, adding them to the global file store.
         /// </summary>
         private List<TFileModel> createFileInfos(ArchiveReader reader, FileStore files)
         {
@@ -699,7 +698,7 @@ namespace osu.Game.Database
                 return Task.CompletedTask;
             }
 
-            return Task.Run(async () => await Import(GetStableImportPaths(storage).ToArray()));
+            return Task.Run(async () => await Import(GetStableImportPaths(storage).ToArray()).ConfigureAwait(false));
         }
 
         /// <summary>
diff --git a/osu.Game/Database/DownloadableArchiveModelManager.cs b/osu.Game/Database/DownloadableArchiveModelManager.cs
index 50b022f9ff..da3144e8d0 100644
--- a/osu.Game/Database/DownloadableArchiveModelManager.cs
+++ b/osu.Game/Database/DownloadableArchiveModelManager.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Database
                 Task.Factory.StartNew(async () =>
                 {
                     // This gets scheduled back to the update thread, but we want the import to run in the background.
-                    var imported = await Import(notification, new ImportTask(filename));
+                    var imported = await Import(notification, new ImportTask(filename)).ConfigureAwait(false);
 
                     // for now a failed import will be marked as a failed download for simplicity.
                     if (!imported.Any())
diff --git a/osu.Game/Database/MemoryCachingComponent.cs b/osu.Game/Database/MemoryCachingComponent.cs
index d913e66428..a1a1279d71 100644
--- a/osu.Game/Database/MemoryCachingComponent.cs
+++ b/osu.Game/Database/MemoryCachingComponent.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Database
             if (CheckExists(lookup, out TValue performance))
                 return performance;
 
-            var computed = await ComputeValueAsync(lookup, token);
+            var computed = await ComputeValueAsync(lookup, token).ConfigureAwait(false);
 
             if (computed != null || CacheNullValues)
                 cache[lookup] = computed;
diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index 568726199c..19cc211709 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Database
         public Task<User> GetUserAsync(int userId, CancellationToken token = default) => GetAsync(userId, token);
 
         protected override async Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
-            => await queryUser(lookup);
+            => await queryUser(lookup).ConfigureAwait(false);
 
         private readonly Queue<(int id, TaskCompletionSource<User>)> pendingUserTasks = new Queue<(int, TaskCompletionSource<User>)>();
         private Task pendingRequestTask;
diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index f7914cbbca..fb7fe4947b 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Graphics
                 }
             }
 
-            using (var image = await host.TakeScreenshotAsync())
+            using (var image = await host.TakeScreenshotAsync().ConfigureAwait(false))
             {
                 if (Interlocked.Decrement(ref screenShotTasks) == 0 && cursorVisibility.Value == false)
                     cursorVisibility.Value = true;
@@ -116,13 +116,13 @@ namespace osu.Game.Graphics
                 switch (screenshotFormat.Value)
                 {
                     case ScreenshotFormat.Png:
-                        await image.SaveAsPngAsync(stream);
+                        await image.SaveAsPngAsync(stream).ConfigureAwait(false);
                         break;
 
                     case ScreenshotFormat.Jpg:
                         const int jpeg_quality = 92;
 
-                        await image.SaveAsJpegAsync(stream, new JpegEncoder { Quality = jpeg_quality });
+                        await image.SaveAsJpegAsync(stream, new JpegEncoder { Quality = jpeg_quality }).ConfigureAwait(false);
                         break;
 
                     default:
diff --git a/osu.Game/IO/Archives/ArchiveReader.cs b/osu.Game/IO/Archives/ArchiveReader.cs
index f74574e60c..679ab40402 100644
--- a/osu.Game/IO/Archives/ArchiveReader.cs
+++ b/osu.Game/IO/Archives/ArchiveReader.cs
@@ -41,7 +41,7 @@ namespace osu.Game.IO.Archives
                     return null;
 
                 byte[] buffer = new byte[input.Length];
-                await input.ReadAsync(buffer);
+                await input.ReadAsync(buffer).ConfigureAwait(false);
                 return buffer;
             }
         }
diff --git a/osu.Game/IPC/ArchiveImportIPCChannel.cs b/osu.Game/IPC/ArchiveImportIPCChannel.cs
index 029908ec9d..d9d0e4c0ea 100644
--- a/osu.Game/IPC/ArchiveImportIPCChannel.cs
+++ b/osu.Game/IPC/ArchiveImportIPCChannel.cs
@@ -33,12 +33,12 @@ namespace osu.Game.IPC
             if (importer == null)
             {
                 // we want to contact a remote osu! to handle the import.
-                await SendMessageAsync(new ArchiveImportMessage { Path = path });
+                await SendMessageAsync(new ArchiveImportMessage { Path = path }).ConfigureAwait(false);
                 return;
             }
 
             if (importer.HandledExtensions.Contains(Path.GetExtension(path)?.ToLowerInvariant()))
-                await importer.Import(path);
+                await importer.Import(path).ConfigureAwait(false);
         }
     }
 
diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index fdb21c5000..3839762e46 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Online
         {
             cancelExistingConnect();
 
-            if (!await connectionLock.WaitAsync(10000))
+            if (!await connectionLock.WaitAsync(10000).ConfigureAwait(false))
                 throw new TimeoutException("Could not obtain a lock to connect. A previous attempt is likely stuck.");
 
             try
@@ -88,7 +88,7 @@ namespace osu.Game.Online
                 {
                     // ensure any previous connection was disposed.
                     // this will also create a new cancellation token source.
-                    await disconnect(false);
+                    await disconnect(false).ConfigureAwait(false);
 
                     // this token will be valid for the scope of this connection.
                     // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
@@ -103,7 +103,7 @@ namespace osu.Game.Online
                         // importantly, rebuild the connection each attempt to get an updated access token.
                         CurrentConnection = buildConnection(cancellationToken);
 
-                        await CurrentConnection.StartAsync(cancellationToken);
+                        await CurrentConnection.StartAsync(cancellationToken).ConfigureAwait(false);
 
                         Logger.Log($"{clientName} connected!", LoggingTarget.Network);
                         isConnected.Value = true;
@@ -119,7 +119,7 @@ namespace osu.Game.Online
                         Logger.Log($"{clientName} connection error: {e}", LoggingTarget.Network);
 
                         // retry on any failure.
-                        await Task.Delay(5000, cancellationToken);
+                        await Task.Delay(5000, cancellationToken).ConfigureAwait(false);
                     }
                 }
             }
@@ -174,14 +174,14 @@ namespace osu.Game.Online
 
             if (takeLock)
             {
-                if (!await connectionLock.WaitAsync(10000))
+                if (!await connectionLock.WaitAsync(10000).ConfigureAwait(false))
                     throw new TimeoutException("Could not obtain a lock to disconnect. A previous attempt is likely stuck.");
             }
 
             try
             {
                 if (CurrentConnection != null)
-                    await CurrentConnection.DisposeAsync();
+                    await CurrentConnection.DisposeAsync().ConfigureAwait(false);
             }
             finally
             {
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 73100be505..0f7050596f 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -131,12 +131,12 @@ namespace osu.Game.Online.Multiplayer
                 Debug.Assert(room.RoomID.Value != null);
 
                 // Join the server-side room.
-                var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
+                var joinedRoom = await JoinRoom(room.RoomID.Value.Value).ConfigureAwait(false);
                 Debug.Assert(joinedRoom != null);
 
                 // Populate users.
                 Debug.Assert(joinedRoom.Users != null);
-                await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
+                await Task.WhenAll(joinedRoom.Users.Select(PopulateUser)).ConfigureAwait(false);
 
                 // Update the stored room (must be done on update thread for thread-safety).
                 await scheduleAsync(() =>
@@ -144,11 +144,11 @@ namespace osu.Game.Online.Multiplayer
                     Room = joinedRoom;
                     apiRoom = room;
                     defaultPlaylistItemId = apiRoom.Playlist.FirstOrDefault()?.ID ?? 0;
-                }, cancellationSource.Token);
+                }, cancellationSource.Token).ConfigureAwait(false);
 
                 // Update room settings.
-                await updateLocalRoomSettings(joinedRoom.Settings, cancellationSource.Token);
-            }, cancellationSource.Token);
+                await updateLocalRoomSettings(joinedRoom.Settings, cancellationSource.Token).ConfigureAwait(false);
+            }, cancellationSource.Token).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -178,8 +178,8 @@ namespace osu.Game.Online.Multiplayer
 
             return joinOrLeaveTaskChain.Add(async () =>
             {
-                await scheduledReset;
-                await LeaveRoomInternal();
+                await scheduledReset.ConfigureAwait(false);
+                await LeaveRoomInternal().ConfigureAwait(false);
             });
         }
 
@@ -237,11 +237,11 @@ namespace osu.Game.Online.Multiplayer
             switch (localUser.State)
             {
                 case MultiplayerUserState.Idle:
-                    await ChangeState(MultiplayerUserState.Ready);
+                    await ChangeState(MultiplayerUserState.Ready).ConfigureAwait(false);
                     return;
 
                 case MultiplayerUserState.Ready:
-                    await ChangeState(MultiplayerUserState.Idle);
+                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
                     return;
 
                 default:
@@ -307,7 +307,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return;
 
-            await PopulateUser(user);
+            await PopulateUser(user).ConfigureAwait(false);
 
             Scheduler.Add(() =>
             {
@@ -486,7 +486,7 @@ namespace osu.Game.Online.Multiplayer
         /// Populates the <see cref="User"/> for a given <see cref="MultiplayerRoomUser"/>.
         /// </summary>
         /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
-        protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID);
+        protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID).ConfigureAwait(false);
 
         /// <summary>
         /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 203cc458e0..b7398efdc2 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -440,7 +440,7 @@ namespace osu.Game
         public override Task Import(params ImportTask[] imports)
         {
             // encapsulate task as we don't want to begin the import process until in a ready state.
-            var importTask = new Task(async () => await base.Import(imports));
+            var importTask = new Task(async () => await base.Import(imports).ConfigureAwait(false));
 
             waitForReady(() => this, _ => importTask.Start());
 
@@ -831,7 +831,7 @@ namespace osu.Game
                 asyncLoadStream = Task.Run(async () =>
                 {
                     if (previousLoadStream != null)
-                        await previousLoadStream;
+                        await previousLoadStream.ConfigureAwait(false);
 
                     try
                     {
@@ -845,7 +845,7 @@ namespace osu.Game
 
                         // The delegate won't complete if OsuGame has been disposed in the meantime
                         while (!IsDisposed && !del.Completed)
-                            await Task.Delay(10);
+                            await Task.Delay(10).ConfigureAwait(false);
 
                         // Either we're disposed or the load process has started successfully
                         if (IsDisposed)
@@ -853,7 +853,7 @@ namespace osu.Game
 
                         Debug.Assert(task != null);
 
-                        await task;
+                        await task.ConfigureAwait(false);
 
                         Logger.Log($"Loaded {component}!", level: LogLevel.Debug);
                     }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 3d24f245f9..e1c7b67a8c 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -434,7 +434,7 @@ namespace osu.Game
             foreach (var importer in fileImporters)
             {
                 if (importer.HandledExtensions.Contains(extension))
-                    await importer.Import(paths);
+                    await importer.Import(paths).ConfigureAwait(false);
             }
         }
 
@@ -445,7 +445,7 @@ namespace osu.Game
             {
                 var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(taskGroup.Key));
                 return importer?.Import(taskGroup.ToArray()) ?? Task.CompletedTask;
-            }));
+            })).ConfigureAwait(false);
         }
 
         public IEnumerable<string> HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions);
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 537dd00727..2da5be5e6c 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -160,9 +160,9 @@ namespace osu.Game.Overlays
                     tcs.SetException(e);
                 };
 
-                await API.PerformAsync(req);
+                await API.PerformAsync(req).ConfigureAwait(false);
 
-                await tcs.Task;
+                return tcs.Task;
             });
         }
 
diff --git a/osu.Game/Scoring/ScorePerformanceCache.cs b/osu.Game/Scoring/ScorePerformanceCache.cs
index 5f66c13d2f..bb15983de3 100644
--- a/osu.Game/Scoring/ScorePerformanceCache.cs
+++ b/osu.Game/Scoring/ScorePerformanceCache.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Scoring
         {
             var score = lookup.ScoreInfo;
 
-            var attributes = await difficultyCache.GetDifficultyAsync(score.Beatmap, score.Ruleset, score.Mods, token);
+            var attributes = await difficultyCache.GetDifficultyAsync(score.Beatmap, score.Ruleset, score.Mods, token).ConfigureAwait(false);
 
             // Performance calculation requires the beatmap and ruleset to be locally available. If not, return a default value.
             if (attributes.Attributes == null)
diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 329623e03a..ee8ef6926d 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Screens.Import
 
             Task.Factory.StartNew(async () =>
             {
-                await game.Import(path);
+                await game.Import(path).ConfigureAwait(false);
 
                 // some files will be deleted after successful import, so we want to refresh the view.
                 Schedule(() =>
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index ffcf248575..b3cd44d55a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -137,13 +137,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override async Task SubmitScore(Score score)
         {
-            await base.SubmitScore(score);
+            await base.SubmitScore(score).ConfigureAwait(false);
 
-            await client.ChangeState(MultiplayerUserState.FinishedPlay);
+            await client.ChangeState(MultiplayerUserState.FinishedPlay).ConfigureAwait(false);
 
             // Await up to 60 seconds for results to become available (6 api request timeouts).
             // This is arbitrary just to not leave the player in an essentially deadlocked state if any connection issues occur.
-            await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(60)));
+            await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(60))).ConfigureAwait(false);
         }
 
         protected override ResultsScreen CreateResults(ScoreInfo score)
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index ddc88261f7..a75e4bdc07 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         protected override async Task SubmitScore(Score score)
         {
-            await base.SubmitScore(score);
+            await base.SubmitScore(score).ConfigureAwait(false);
 
             Debug.Assert(Token != null);
 
@@ -128,7 +128,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             };
 
             api.Queue(request);
-            await tcs.Task;
+            await tcs.Task.ConfigureAwait(false);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e81efdac78..0e221351aa 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -592,7 +592,7 @@ namespace osu.Game.Screens.Play
 
                 try
                 {
-                    await SubmitScore(score);
+                    await SubmitScore(score).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {
@@ -601,7 +601,7 @@ namespace osu.Game.Screens.Play
 
                 try
                 {
-                    await ImportScore(score);
+                    await ImportScore(score).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 2826c826a5..fcde9f041b 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Skinning
 
         protected override async Task Populate(SkinInfo model, ArchiveReader archive, CancellationToken cancellationToken = default)
         {
-            await base.Populate(model, archive, cancellationToken);
+            await base.Populate(model, archive, cancellationToken).ConfigureAwait(false);
 
             if (model.Name?.Contains(".osk") == true)
                 populateMetadata(model);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index c03364a391..09fcc1ff47 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             Debug.Assert(Room != null);
 
-            await ((IMultiplayerClient)this).SettingsChanged(settings);
+            await ((IMultiplayerClient)this).SettingsChanged(settings).ConfigureAwait(false);
 
             foreach (var user in Room.Users.Where(u => u.State == MultiplayerUserState.Ready))
                 ChangeUserState(user.UserID, MultiplayerUserState.Idle);
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 4ebf2a7368..6eded7ce53 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Updater
             {
                 var releases = new OsuJsonWebRequest<GitHubRelease>("https://api.github.com/repos/ppy/osu/releases/latest");
 
-                await releases.PerformAsync();
+                await releases.PerformAsync().ConfigureAwait(false);
 
                 var latest = releases.ResponseObject;
 
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index f772c6d282..9a0454bc95 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Updater
             lock (updateTaskLock)
                 waitTask = (updateCheckTask ??= PerformUpdateCheck());
 
-            bool hasUpdates = await waitTask;
+            bool hasUpdates = await waitTask.ConfigureAwait(false);
 
             lock (updateTaskLock)
                 updateCheckTask = null;

From d2bc48e57650d0ff2c1ec9cf840f4258f90b786b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 12:57:30 +0900
Subject: [PATCH 08428/10326] Exclude tests from ConfigureAwait rule

---
 osu.Game.Tests/osu.Game.Tests.csproj | 3 +++
 osu.Game.Tests/tests.ruleset         | 6 ++++++
 2 files changed, 9 insertions(+)
 create mode 100644 osu.Game.Tests/tests.ruleset

diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 32ccb5b699..e36b3cdc74 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -13,6 +13,9 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
+  <PropertyGroup Label="Code Analysis">
+    <CodeAnalysisRuleSet>tests.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
diff --git a/osu.Game.Tests/tests.ruleset b/osu.Game.Tests/tests.ruleset
new file mode 100644
index 0000000000..a0abb781d3
--- /dev/null
+++ b/osu.Game.Tests/tests.ruleset
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="osu! Rule Set" Description=" " ToolsVersion="16.0">
+    <Rules AnalyzerId="Microsoft.CodeQuality.Analyzers" RuleNamespace="Microsoft.CodeQuality.Analyzers">
+        <Rule Id="CA2007" Action="None" />
+    </Rules>
+</RuleSet>

From 6cb0db9c33c41312e9a380168d41327794a2288c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 14:45:11 +0900
Subject: [PATCH 08429/10326] Apply override rules to iOS/Android test projects

---
 osu.Game.Tests.Android/osu.Game.Tests.Android.csproj | 5 ++++-
 osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj         | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index 543f2f35a7..c3d9cb5875 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -20,6 +20,9 @@
   <ItemGroup>
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);CA2007</NoWarn>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\osu.Game.Tests\**\Beatmaps\**\*.cs">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
@@ -74,4 +77,4 @@
     <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
index e83bef4a95..97df9b2cd5 100644
--- a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
+++ b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
@@ -21,6 +21,9 @@
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>
   </ItemGroup>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);CA2007</NoWarn>
+  </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj">
       <Project>{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}</Project>
@@ -48,4 +51,4 @@
     <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>

From 02194a93cb324e9a3781e82a73ce47ae6ce40f45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 15:17:10 +0900
Subject: [PATCH 08430/10326] Apply missing additions to android project

---
 osu.Android/OsuGameActivity.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index d087c6218d..cffcea22c2 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -100,15 +100,15 @@ namespace osu.Android
                 // copy to an arbitrary-access memory stream to be able to proceed with the import.
                 var copy = new MemoryStream();
                 using (var stream = ContentResolver.OpenInputStream(uri))
-                    await stream.CopyToAsync(copy);
+                    await stream.CopyToAsync(copy).ConfigureAwait(false);
 
                 lock (tasks)
                 {
                     tasks.Add(new ImportTask(copy, filename));
                 }
-            }));
+            })).ConfigureAwait(false);
 
-            await game.Import(tasks.ToArray());
+            await game.Import(tasks.ToArray()).ConfigureAwait(false);
         }, TaskCreationOptions.LongRunning);
     }
 }

From bb79da1aacfd45dc73d1f493bd5e0400327dc61f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Mar 2021 00:33:43 +0300
Subject: [PATCH 08431/10326] Correct playfield shift counteract 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.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 406c19e76a..896c3f4a3e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -152,7 +152,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 Origin = Anchor.Centre;
                 Size = new Vector2(640, 480);
 
-                // counteracts the playfield shift from OsuPlayfieldAdjustmentContainer.
+                // stable applies this adjustment conditionally, locally in the spinner.
+                // in lazer this is handled at a higher level in OsuPlayfieldAdjustmentContainer,
+                // therefore it's safe to apply it unconditionally in this component.
                 Position = new Vector2(0, -8f);
             }
         }

From dc9028d24acd3df3152057f36f0aa0217b9c954a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Mar 2021 14:27:20 +0900
Subject: [PATCH 08432/10326] Update framework

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

diff --git a/osu.Android.props b/osu.Android.props
index c428cd2546..5b700224db 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.302.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.309.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 6eded7ce53..50572a7867 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Updater
                     bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".exe", StringComparison.Ordinal));
                     break;
 
-                case RuntimeInfo.Platform.MacOsx:
+                case RuntimeInfo.Platform.macOS:
                     bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".app.zip", StringComparison.Ordinal));
                     break;
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c7aa6a8e11..90c8b98f42 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.302.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 729d692e0e..ccd33bf88c 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.Framework.iOS" Version="2021.302.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.302.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 05493958696d488c4a8b76582ee0f92d5e7cf75b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Mar 2021 08:55:32 +0300
Subject: [PATCH 08433/10326] Inline "legacy coordinates container" and add
 "spinner Y centre" const

---
 .../Skinning/Legacy/LegacyNewStyleSpinner.cs  |  3 +-
 .../Skinning/Legacy/LegacyOldStyleSpinner.cs  | 33 ++++----
 .../Skinning/Legacy/LegacySpinner.cs          | 82 ++++++++-----------
 3 files changed, 50 insertions(+), 68 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
index efeca53969..22fb3aab86 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
@@ -37,9 +37,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             AddInternal(scaleContainer = new Container
             {
                 Scale = new Vector2(SPRITE_SCALE),
-                Anchor = Anchor.Centre,
+                Anchor = Anchor.TopCentre,
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
+                Y = SPINNER_Y_CENTRE,
                 Children = new Drawable[]
                 {
                     glow = new Sprite
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
index 5c25c38504..19cb55c16e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
@@ -37,35 +37,34 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             {
                 new Sprite
                 {
-                    Anchor = Anchor.Centre,
+                    Anchor = Anchor.TopCentre,
                     Origin = Anchor.Centre,
                     Texture = source.GetTexture("spinner-background"),
-                    Scale = new Vector2(SPRITE_SCALE)
+                    Scale = new Vector2(SPRITE_SCALE),
+                    Y = SPINNER_Y_CENTRE,
                 },
                 disc = new Sprite
                 {
-                    Anchor = Anchor.Centre,
+                    Anchor = Anchor.TopCentre,
                     Origin = Anchor.Centre,
                     Texture = source.GetTexture("spinner-circle"),
-                    Scale = new Vector2(SPRITE_SCALE)
+                    Scale = new Vector2(SPRITE_SCALE),
+                    Y = SPINNER_Y_CENTRE,
                 },
-                new LegacyCoordinatesContainer
+                metre = new Container
                 {
-                    Child = metre = new Container
+                    AutoSizeAxes = Axes.Both,
+                    // this anchor makes no sense, but that's what stable uses.
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Margin = new MarginPadding { Top = SPINNER_TOP_OFFSET },
+                    Masking = true,
+                    Child = metreSprite = new Sprite
                     {
-                        AutoSizeAxes = Axes.Both,
-                        // this anchor makes no sense, but that's what stable uses.
+                        Texture = source.GetTexture("spinner-metre"),
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.TopLeft,
-                        Margin = new MarginPadding { Top = SPINNER_TOP_OFFSET },
-                        Masking = true,
-                        Child = metreSprite = new Sprite
-                        {
-                            Texture = source.GetTexture("spinner-metre"),
-                            Anchor = Anchor.TopLeft,
-                            Origin = Anchor.TopLeft,
-                            Scale = new Vector2(SPRITE_SCALE)
-                        }
+                        Scale = new Vector2(SPRITE_SCALE)
                     }
                 }
             });
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 896c3f4a3e..1738003390 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -16,12 +16,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public abstract class LegacySpinner : CompositeDrawable
     {
-        /// <summary>
-        /// An offset that simulates stable's spinner top offset, can be used with <see cref="LegacyCoordinatesContainer"/>
-        /// for positioning some legacy spinner components perfectly as in stable.
-        /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
-        /// </summary>
-        public static readonly float SPINNER_TOP_OFFSET = MathF.Ceiling(45f * SPRITE_SCALE);
+        protected static readonly float SPINNER_TOP_OFFSET = MathF.Ceiling(45f * SPRITE_SCALE);
+        protected static readonly float SPINNER_Y_CENTRE = SPINNER_TOP_OFFSET + 219f;
 
         protected const float SPRITE_SCALE = 0.625f;
 
@@ -33,33 +29,41 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject, ISkinSource source)
         {
-            RelativeSizeAxes = Axes.Both;
+            // legacy spinners relied heavily on absolute screen-space coordinate values.
+            // wrap everything in a container simulating absolute coords to preserve alignment
+            // as there are skins that depend on it.
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+            Size = new Vector2(640, 480);
+
+            // stable applies this adjustment conditionally, locally in the spinner.
+            // in lazer this is handled at a higher level in OsuPlayfieldAdjustmentContainer,
+            // therefore it's safe to apply it unconditionally in this component.
+            Position = new Vector2(0, -8f);
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            AddInternal(new LegacyCoordinatesContainer
+            AddRangeInternal(new[]
             {
-                Depth = float.MinValue,
-                Children = new Drawable[]
+                spin = new Sprite
                 {
-                    spin = new Sprite
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.Centre,
-                        Texture = source.GetTexture("spinner-spin"),
-                        Scale = new Vector2(SPRITE_SCALE),
-                        Y = SPINNER_TOP_OFFSET + 335,
-                    },
-                    clear = new Sprite
-                    {
-                        Alpha = 0,
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.Centre,
-                        Texture = source.GetTexture("spinner-clear"),
-                        Scale = new Vector2(SPRITE_SCALE),
-                        Y = SPINNER_TOP_OFFSET + 115,
-                    },
-                }
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.Centre,
+                    Depth = float.MinValue,
+                    Texture = source.GetTexture("spinner-spin"),
+                    Scale = new Vector2(SPRITE_SCALE),
+                    Y = SPINNER_TOP_OFFSET + 335,
+                },
+                clear = new Sprite
+                {
+                    Alpha = 0,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.Centre,
+                    Depth = float.MinValue,
+                    Texture = source.GetTexture("spinner-clear"),
+                    Scale = new Vector2(SPRITE_SCALE),
+                    Y = SPINNER_TOP_OFFSET + 115,
+                },
             });
         }
 
@@ -136,27 +140,5 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             if (DrawableSpinner != null)
                 DrawableSpinner.ApplyCustomUpdateState -= UpdateStateTransforms;
         }
-
-        /// <summary>
-        /// A <see cref="Container"/> simulating osu!stable's absolute screen-space,
-        /// for perfect placements of legacy spinner components with legacy coordinates.
-        /// </summary>
-        protected class LegacyCoordinatesContainer : Container
-        {
-            public LegacyCoordinatesContainer()
-            {
-                // legacy spinners relied heavily on absolute screen-space coordinate values.
-                // wrap everything in a container simulating absolute coords to preserve alignment
-                // as there are skins that depend on it.
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-                Size = new Vector2(640, 480);
-
-                // stable applies this adjustment conditionally, locally in the spinner.
-                // in lazer this is handled at a higher level in OsuPlayfieldAdjustmentContainer,
-                // therefore it's safe to apply it unconditionally in this component.
-                Position = new Vector2(0, -8f);
-            }
-        }
     }
 }

From a5b3ac7ef8101c867bec8c1188ec4595ccb1c919 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Mar 2021 15:45:03 +0900
Subject: [PATCH 08434/10326] Add failing test covering alpha commands
 proceeding non-alpha (but ignored) commands

---
 .../Visual/Gameplay/TestSceneLeadIn.cs        | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
index 563d6be0da..dccde366c2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
@@ -46,11 +46,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         [TestCase(0, 0)]
         [TestCase(-1000, -1000)]
         [TestCase(-10000, -10000)]
-        public void TestStoryboardProducesCorrectStartTime(double firstStoryboardEvent, double expectedStartTime)
+        public void TestStoryboardProducesCorrectStartTimeSimpleAlpha(double firstStoryboardEvent, double expectedStartTime)
         {
             var storyboard = new Storyboard();
 
             var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
+
             sprite.TimelineGroup.Alpha.Add(Easing.None, firstStoryboardEvent, firstStoryboardEvent + 500, 0, 1);
 
             storyboard.GetLayer("Background").Add(sprite);
@@ -64,6 +65,43 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
         }
 
+        [TestCase(1000, 0, false)]
+        [TestCase(0, 0, false)]
+        [TestCase(-1000, -1000, false)]
+        [TestCase(-10000, -10000, false)]
+        [TestCase(1000, 0, true)]
+        [TestCase(0, 0, true)]
+        [TestCase(-1000, -1000, true)]
+        [TestCase(-10000, -10000, true)]
+        public void TestStoryboardProducesCorrectStartTimeFadeInAfterOtherEvents(double firstStoryboardEvent, double expectedStartTime, bool addEventToLoop)
+        {
+            var storyboard = new Storyboard();
+
+            var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
+
+            // these should be ignored as we have an alpha visibility blocker proceeding this command.
+            sprite.TimelineGroup.Scale.Add(Easing.None, -20000, -18000, 0, 1);
+            var loopGroup = sprite.AddLoop(-20000, 50);
+            loopGroup.Scale.Add(Easing.None, -20000, -18000, 0, 1);
+
+            var target = addEventToLoop ? loopGroup : sprite.TimelineGroup;
+            target.Alpha.Add(Easing.None, firstStoryboardEvent, firstStoryboardEvent + 500, 0, 1);
+
+            // these should be ignored due to being in the future.
+            sprite.TimelineGroup.Alpha.Add(Easing.None, 18000, 20000, 0, 1);
+            loopGroup.Alpha.Add(Easing.None, 18000, 20000, 0, 1);
+
+            storyboard.GetLayer("Background").Add(sprite);
+
+            loadPlayerWithBeatmap(new TestBeatmap(new OsuRuleset().RulesetInfo), storyboard);
+
+            AddAssert($"first frame is {expectedStartTime}", () =>
+            {
+                Debug.Assert(player.FirstFrameClockTime != null);
+                return Precision.AlmostEquals(player.FirstFrameClockTime.Value, expectedStartTime, lenience_ms);
+            });
+        }
+
         private void loadPlayerWithBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
         {
             AddStep("create player", () =>

From 8aaba324314c4cfc628de35a3b6ab438227103a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Mar 2021 15:55:05 +0900
Subject: [PATCH 08435/10326] Fix storyboard commands occurring before the
 earliest point of visibility delaying gameplay

In osu-stable, storyboard intros start from the first command, but in
the case of storyboard drawables which have an initial hidden state, all
commands before the time at which they become visible (ie. the first
command where `Alpha` increases to a non-zero value) are ignored.

This brings lazer in line with that behaviour. It also removes several
unnecessary LINQ calls.

Note that the alpha check being done in its own pass is important, as
it must be the "minimum present alpha across all command groups,
including loops". This is what makes the implementation slightly
complex.

Closes #11981.
---
 osu.Game/Storyboards/CommandTimelineGroup.cs | 19 +++++++++
 osu.Game/Storyboards/StoryboardSprite.cs     | 45 +++++++++++++++++---
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Storyboards/CommandTimelineGroup.cs b/osu.Game/Storyboards/CommandTimelineGroup.cs
index 6ce3b617e9..617455cf0b 100644
--- a/osu.Game/Storyboards/CommandTimelineGroup.cs
+++ b/osu.Game/Storyboards/CommandTimelineGroup.cs
@@ -45,11 +45,30 @@ namespace osu.Game.Storyboards
             };
         }
 
+        /// <summary>
+        /// Returns the earliest visible time. Will be null unless this group has an <see cref="Alpha"/> command with a start value of zero.
+        /// </summary>
+        public double? EarliestDisplayedTime
+        {
+            get
+            {
+                var first = Alpha.Commands.FirstOrDefault();
+
+                return first?.StartValue == 0 ? first.StartTime : (double?)null;
+            }
+        }
+
         [JsonIgnore]
         public double CommandsStartTime
         {
             get
             {
+                // if the first alpha command starts at zero it should be given priority over anything else.
+                // this is due to it creating a state where the target is not present before that time, causing any other events to not be visible.
+                var earliestDisplay = EarliestDisplayedTime;
+                if (earliestDisplay != null)
+                    return earliestDisplay.Value;
+
                 double min = double.MaxValue;
 
                 for (int i = 0; i < timelines.Length; i++)
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index f411ad04f3..fdaa59d7d9 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -24,13 +24,46 @@ namespace osu.Game.Storyboards
 
         public readonly CommandTimelineGroup TimelineGroup = new CommandTimelineGroup();
 
-        public double StartTime => Math.Min(
-            TimelineGroup.HasCommands ? TimelineGroup.CommandsStartTime : double.MaxValue,
-            loops.Any(l => l.HasCommands) ? loops.Where(l => l.HasCommands).Min(l => l.StartTime) : double.MaxValue);
+        public double StartTime
+        {
+            get
+            {
+                // check for presence affecting commands as an initial pass.
+                double earliestStartTime = TimelineGroup.EarliestDisplayedTime ?? double.MaxValue;
 
-        public double EndTime => Math.Max(
-            TimelineGroup.HasCommands ? TimelineGroup.CommandsEndTime : double.MinValue,
-            loops.Any(l => l.HasCommands) ? loops.Where(l => l.HasCommands).Max(l => l.EndTime) : double.MinValue);
+                foreach (var l in loops)
+                {
+                    if (!(l.EarliestDisplayedTime is double lEarliest))
+                        continue;
+
+                    earliestStartTime = Math.Min(earliestStartTime, lEarliest);
+                }
+
+                if (earliestStartTime < double.MaxValue)
+                    return earliestStartTime;
+
+                // if an alpha-affecting command was not found, use the earliest of any command.
+                earliestStartTime = TimelineGroup.StartTime;
+
+                foreach (var l in loops)
+                    earliestStartTime = Math.Min(earliestStartTime, l.StartTime);
+
+                return earliestStartTime;
+            }
+        }
+
+        public double EndTime
+        {
+            get
+            {
+                double latestEndTime = TimelineGroup.EndTime;
+
+                foreach (var l in loops)
+                    latestEndTime = Math.Max(latestEndTime, l.EndTime);
+
+                return latestEndTime;
+            }
+        }
 
         public bool HasCommands => TimelineGroup.HasCommands || loops.Any(l => l.HasCommands);
 

From 5a6864eb7826502cc74132275206834bf81532fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Mar 2021 16:43:44 +0900
Subject: [PATCH 08436/10326] Fix SPM counter immediately disappearing on
 completion of spinners

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs  | 3 +++
 osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index d02376b6c3..69095fd160 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -109,6 +109,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.OnFree();
 
             spinningSample.Samples = null;
+
+            // the counter handles its own fade in (when spinning begins) so we should only be responsible for resetting it here, for pooling.
+            SpmCounter.Hide();
         }
 
         protected override void LoadSamples()
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
index 69355f624b..f3e013c759 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
@@ -21,6 +21,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private readonly OsuSpriteText spmText;
 
+        public override void ApplyTransformsAt(double time, bool propagateChildren = false)
+        {
+            // handles own fade in state.
+        }
+
         public SpinnerSpmCounter()
         {
             Children = new Drawable[]

From 4e8bcc92659b47bb1223e43458f8159475e78209 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Mar 2021 16:15:44 +0900
Subject: [PATCH 08437/10326] Fix SPM counter decreasing after spinner has
 already been completed

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 69095fd160..e6940f0985 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -267,7 +267,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (!SpmCounter.IsPresent && RotationTracker.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
-            SpmCounter.SetRotation(Result.RateAdjustedRotation);
+            // don't update after end time to avoid the rate display dropping during fade out.
+            // this shouldn't be limited to StartTime as it causes weirdness with the underlying calculation, which is expecting updates during that period.
+            if (Time.Current <= HitObject.EndTime)
+                SpmCounter.SetRotation(Result.RateAdjustedRotation);
 
             updateBonusScore();
         }

From 3f349816649689b519f3ed93942c311c3881a90e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Mar 2021 05:40:18 +0300
Subject: [PATCH 08438/10326] Fix incorrect spinner top offset calculation with
 clarification

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 1738003390..ab7d265f67 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -16,7 +17,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public abstract class LegacySpinner : CompositeDrawable
     {
-        protected static readonly float SPINNER_TOP_OFFSET = MathF.Ceiling(45f * SPRITE_SCALE);
+        /// <remarks>
+        /// osu!stable applies this adjustment conditionally, locally in the spinner.
+        /// in lazer this is handled at a higher level in <see cref="OsuPlayfieldAdjustmentContainer"/>,
+        /// therefore it's safe to apply it unconditionally in this component.
+        /// </remarks>
+        protected static readonly float SPINNER_TOP_OFFSET = 45f - 16f;
+
         protected static readonly float SPINNER_Y_CENTRE = SPINNER_TOP_OFFSET + 219f;
 
         protected const float SPRITE_SCALE = 0.625f;

From efb4a366d42600b5217e574f40c5d53438a8d3c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Mar 2021 12:15:59 +0900
Subject: [PATCH 08439/10326] Fix xmldoc explaining incorrect 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/Storyboards/CommandTimelineGroup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/CommandTimelineGroup.cs b/osu.Game/Storyboards/CommandTimelineGroup.cs
index 617455cf0b..c478b91c22 100644
--- a/osu.Game/Storyboards/CommandTimelineGroup.cs
+++ b/osu.Game/Storyboards/CommandTimelineGroup.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Storyboards
         }
 
         /// <summary>
-        /// Returns the earliest visible time. Will be null unless this group has an <see cref="Alpha"/> command with a start value of zero.
+        /// Returns the earliest visible time. Will be null unless this group's first <see cref="Alpha"/> command has a start value of zero.
         /// </summary>
         public double? EarliestDisplayedTime
         {

From 1591d593e26095201cedb9d2e1fde2f2761a09a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Mar 2021 12:58:15 +0900
Subject: [PATCH 08440/10326] Move spin start time to inside result and switch
 to standard state handling

---
 .../Judgements/OsuSpinnerJudgementResult.cs   |  5 +++++
 .../Objects/Drawables/DrawableSpinner.cs      | 21 +++++++++++++++----
 .../Skinning/Default/SpinnerSpmCounter.cs     |  5 -----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
index e58aacd86e..9f77175398 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
@@ -38,6 +38,11 @@ namespace osu.Game.Rulesets.Osu.Judgements
         /// </example>
         public float RateAdjustedRotation;
 
+        /// <summary>
+        /// Time instant at which the spin was started (the first user input which caused an increase in spin).
+        /// </summary>
+        public double? TimeStarted;
+
         /// <summary>
         /// Time instant at which the spinner has been completed (the user has executed all required spins).
         /// Will be null if all required spins haven't been completed.
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index e6940f0985..3d614c2dbd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -109,9 +109,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.OnFree();
 
             spinningSample.Samples = null;
-
-            // the counter handles its own fade in (when spinning begins) so we should only be responsible for resetting it here, for pooling.
-            SpmCounter.Hide();
         }
 
         protected override void LoadSamples()
@@ -161,6 +158,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        protected override void UpdateStartTimeStateTransforms()
+        {
+            base.UpdateStartTimeStateTransforms();
+
+            if (Result?.TimeStarted is double startTime)
+            {
+                using (BeginAbsoluteSequence(startTime))
+                    fadeInCounter();
+            }
+        }
+
         protected override void UpdateHitStateTransforms(ArmedState state)
         {
             base.UpdateHitStateTransforms(state);
@@ -265,7 +273,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.UpdateAfterChildren();
 
             if (!SpmCounter.IsPresent && RotationTracker.Tracking)
-                SpmCounter.FadeIn(HitObject.TimeFadeIn);
+            {
+                Result.TimeStarted ??= Time.Current;
+                fadeInCounter();
+            }
 
             // don't update after end time to avoid the rate display dropping during fade out.
             // this shouldn't be limited to StartTime as it causes weirdness with the underlying calculation, which is expecting updates during that period.
@@ -275,6 +286,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             updateBonusScore();
         }
 
+        private void fadeInCounter() => SpmCounter.FadeIn(HitObject.TimeFadeIn);
+
         private int wholeSpins;
 
         private void updateBonusScore()
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
index f3e013c759..69355f624b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
@@ -21,11 +21,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private readonly OsuSpriteText spmText;
 
-        public override void ApplyTransformsAt(double time, bool propagateChildren = false)
-        {
-            // handles own fade in state.
-        }
-
         public SpinnerSpmCounter()
         {
             Children = new Drawable[]

From 8bc494b224639f79ab4bb6f0a31e18d89da5cfcf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 11 Mar 2021 20:57:00 +0900
Subject: [PATCH 08441/10326] Adjust explanatory comments

---
 .../Skinning/Legacy/LegacySpinner.cs              | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index ab7d265f67..acaec9cbc0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -18,13 +18,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
     public abstract class LegacySpinner : CompositeDrawable
     {
         /// <remarks>
-        /// osu!stable applies this adjustment conditionally, locally in the spinner.
-        /// in lazer this is handled at a higher level in <see cref="OsuPlayfieldAdjustmentContainer"/>,
-        /// therefore it's safe to apply it unconditionally in this component.
+        /// All constant spinner coordinates are in osu!stable's gamefield space, which is shifted 16px downwards.
+        /// This offset is negated in both osu!stable and osu!lazer to bring all constant coordinates into window-space.
+        /// Note: SPINNER_Y_CENTRE + SPINNER_TOP_OFFSET - Position.Y = 240 (=480/2, or half the window-space in osu!stable)
         /// </remarks>
-        protected static readonly float SPINNER_TOP_OFFSET = 45f - 16f;
+        protected const float SPINNER_TOP_OFFSET = 45f - 16f;
 
-        protected static readonly float SPINNER_Y_CENTRE = SPINNER_TOP_OFFSET + 219f;
+        protected const float SPINNER_Y_CENTRE = SPINNER_TOP_OFFSET + 219f;
 
         protected const float SPRITE_SCALE = 0.625f;
 
@@ -43,9 +43,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             Origin = Anchor.Centre;
             Size = new Vector2(640, 480);
 
-            // stable applies this adjustment conditionally, locally in the spinner.
-            // in lazer this is handled at a higher level in OsuPlayfieldAdjustmentContainer,
-            // therefore it's safe to apply it unconditionally in this component.
+            // osu!stable positions components of the spinner in window-space (as opposed to gamefield-space).
+            // in lazer, the gamefield-space transformation is applied in OsuPlayfieldAdjustmentContainer, which is inverted here to bring coordinates back into window-space.
             Position = new Vector2(0, -8f);
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;

From b5bdf235cad7a638ad0fc8ce62fd7f6a31edf094 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 11 Mar 2021 21:21:44 +0900
Subject: [PATCH 08442/10326] Slightly improve comments more

---
 .../Skinning/Legacy/LegacySpinner.cs                | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index acaec9cbc0..1cc25bf053 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
     public abstract class LegacySpinner : CompositeDrawable
     {
         /// <remarks>
-        /// All constant spinner coordinates are in osu!stable's gamefield space, which is shifted 16px downwards.
-        /// This offset is negated in both osu!stable and osu!lazer to bring all constant coordinates into window-space.
+        /// All constants are in osu!stable's gamefield space, which is shifted 16px downwards.
+        /// This offset is negated in both osu!stable and osu!lazer to bring all constants into window-space.
         /// Note: SPINNER_Y_CENTRE + SPINNER_TOP_OFFSET - Position.Y = 240 (=480/2, or half the window-space in osu!stable)
         /// </remarks>
         protected const float SPINNER_TOP_OFFSET = 45f - 16f;
@@ -36,15 +36,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject, ISkinSource source)
         {
-            // legacy spinners relied heavily on absolute screen-space coordinate values.
-            // wrap everything in a container simulating absolute coords to preserve alignment
-            // as there are skins that depend on it.
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
-            Size = new Vector2(640, 480);
 
-            // osu!stable positions components of the spinner in window-space (as opposed to gamefield-space).
-            // in lazer, the gamefield-space transformation is applied in OsuPlayfieldAdjustmentContainer, which is inverted here to bring coordinates back into window-space.
+            // osu!stable positions spinner components in window-space (as opposed to gamefield-space). This is a 640x480 area taking up the entire screen.
+            // In lazer, the gamefield-space positional transformation is applied in OsuPlayfieldAdjustmentContainer, which is inverted here to make this area take up the entire window space.
+            Size = new Vector2(640, 480);
             Position = new Vector2(0, -8f);
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;

From ea9b48d17d08444c2e7e458fd874cac580ec388c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 11 Mar 2021 21:21:48 +0900
Subject: [PATCH 08443/10326] Remove unused using

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 1cc25bf053..513888db53 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Skinning;
 using osuTK;
 

From f1302d16006b567343c12a2624eeb544c7eae9bf Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Thu, 11 Mar 2021 19:23:56 +0300
Subject: [PATCH 08444/10326] Update Microsoft.EntityFrameworkCore

---
 osu.Desktop/osu.Desktop.csproj    | 7 +++++--
 osu.Game/Database/OsuDbContext.cs | 3 ---
 osu.Game/osu.Game.csproj          | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 3e0f0cb7f6..4af69c573d 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -27,8 +27,11 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>
diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index 2aae62edea..d27da50448 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -111,9 +111,6 @@ namespace osu.Game.Database
         {
             base.OnConfiguring(optionsBuilder);
             optionsBuilder
-                // this is required for the time being due to the way we are querying in places like BeatmapStore.
-                // if we ever move to having consumers file their own .Includes, or get eager loading support, this could be re-enabled.
-                .ConfigureWarnings(warnings => warnings.Ignore(CoreEventId.IncludeIgnoredWarning))
                 .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10))
                 .UseLoggerFactory(logger.Value);
         }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 90c8b98f42..fa1b0a95c3 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,10 +24,10 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />

From 47b80d2474f6c2a371dd91aa48fda003a60e808e Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Thu, 11 Mar 2021 20:51:54 +0300
Subject: [PATCH 08445/10326] Workaround InvalidOperation exceptions

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 16 ++++++++++++++++
 osu.Game/Database/ArchiveModelManager.cs |  8 +++++++-
 osu.Game/Skinning/SkinManager.cs         | 12 ++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 29b3f5d3a3..3254f53574 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -174,6 +174,22 @@ namespace osu.Game.Beatmaps
             if (beatmapSet.Beatmaps.Any(b => b.BaseDifficulty == null))
                 throw new InvalidOperationException($"Cannot import {nameof(BeatmapInfo)} with null {nameof(BeatmapInfo.BaseDifficulty)}.");
 
+            var dbContext = ContextFactory.Get();
+
+            // Workaround System.InvalidOperationException
+            // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+            foreach (var beatmap in beatmapSet.Beatmaps)
+            {
+                beatmap.Ruleset = dbContext.RulesetInfo.Find(beatmap.RulesetID);
+            }
+
+            // Workaround System.InvalidOperationException
+            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+            foreach (var file in beatmapSet.Files)
+            {
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+
             // check if a set already exists with the same online id, delete if it does.
             if (beatmapSet.OnlineBeatmapSetID != null)
             {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index d809dbcb01..fe2caaa0b7 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -462,6 +462,10 @@ namespace osu.Game.Database
                 // Dereference the existing file info, since the file model will be removed.
                 if (file.FileInfo != null)
                 {
+                    // Workaround System.InvalidOperationException
+                    // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+                    file.FileInfo = usage.Context.FileInfo.Find(file.FileInfoID);
+
                     Files.Dereference(file.FileInfo);
 
                     // This shouldn't be required, but here for safety in case the provided TModel is not being change tracked
@@ -635,10 +639,12 @@ namespace osu.Game.Database
             {
                 using (Stream s = reader.GetStream(file))
                 {
+                    var fileInfo = files.Add(s);
                     fileInfos.Add(new TFileModel
                     {
                         Filename = file.Substring(prefix.Length).ToStandardisedPath(),
-                        FileInfo = files.Add(s)
+                        FileInfo = fileInfo,
+                        FileInfoID = fileInfo.ID
                     });
                 }
             }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index fcde9f041b..2bb27b60d6 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -142,6 +142,18 @@ namespace osu.Game.Skinning
             }
         }
 
+        protected override void PreImport(SkinInfo model)
+        {
+            var dbContext = ContextFactory.Get();
+
+            // Workaround System.InvalidOperationException
+            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+            foreach (var file in model.Files)
+            {
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+        }
+
         /// <summary>
         /// Retrieve a <see cref="Skin"/> instance for the provided <see cref="SkinInfo"/>
         /// </summary>

From c6c616f244eb08e664c04937234ffcd6dd84b9c0 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Thu, 11 Mar 2021 21:02:40 +0300
Subject: [PATCH 08446/10326] Actualize tests

---
 .../Multiplayer/TestSceneMultiplayerMatchSongSelect.cs |  1 +
 .../SongSelect/TestSceneBeatmapRecommendations.cs      |  1 +
 .../Visual/SongSelect/TestScenePlaySongSelect.cs       |  4 +++-
 osu.Game/Scoring/ScoreInfo.cs                          | 10 ++--------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index faa5d9e6fc..4a9eaa1842 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 beatmaps.Add(new BeatmapInfo
                 {
                     Ruleset = rulesets.GetRuleset(i % 4),
+                    RulesetID = i % 4,
                     OnlineBeatmapID = beatmapId,
                     Length = length,
                     BPM = bpm,
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 53a956c77c..223ace6ca5 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -186,6 +186,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Metadata = metadata,
                     BaseDifficulty = new BeatmapDifficulty(),
                     Ruleset = ruleset,
+                    RulesetID = ruleset.ID.GetValueOrDefault(),
                     StarDifficulty = difficultyIndex + 1,
                     Version = $"SR{difficultyIndex + 1}"
                 }).ToList()
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 35c6d62cb7..4b402d0c54 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -911,9 +911,11 @@ namespace osu.Game.Tests.Visual.SongSelect
                 int length = RNG.Next(30000, 200000);
                 double bpm = RNG.NextSingle(80, 200);
 
+                var ruleset = getRuleset();
                 beatmaps.Add(new BeatmapInfo
                 {
-                    Ruleset = getRuleset(),
+                    Ruleset = ruleset,
+                    RulesetID = ruleset.ID.GetValueOrDefault(),
                     OnlineBeatmapID = beatmapId,
                     Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss}, bpm {bpm:0.#})",
                     Length = length,
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index f5192f3a40..c5ad43abba 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Scoring
             }
             set
             {
-                modsJson = null;
+                modsJson = JsonConvert.SerializeObject(value.Select(m => new DeserializedMod { Acronym = m.Acronym }));
                 mods = value;
             }
         }
@@ -88,13 +88,7 @@ namespace osu.Game.Scoring
         {
             get
             {
-                if (modsJson != null)
-                    return modsJson;
-
-                if (mods == null)
-                    return null;
-
-                return modsJson = JsonConvert.SerializeObject(mods.Select(m => new DeserializedMod { Acronym = m.Acronym }));
+                return modsJson;
             }
             set
             {

From d2f943395d349e08ae8e5a72b1f2996ea0d1d539 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Thu, 11 Mar 2021 22:12:47 +0300
Subject: [PATCH 08447/10326] Hotfix importing scores from stable

---
 osu.Game/Scoring/ScoreManager.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 96ec9644b5..a97c516a1b 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -52,6 +52,23 @@ namespace osu.Game.Scoring
             this.configManager = configManager;
         }
 
+        protected override void PreImport(ScoreInfo model)
+        {
+            var dbContext = ContextFactory.Get();
+
+            // Workaround System.InvalidOperationException
+            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+            foreach (var file in model.Files)
+            {
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+
+            foreach (var file in model.Beatmap.BeatmapSet.Files)
+            {
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+        }
+
         protected override ScoreInfo CreateModel(ArchiveReader archive)
         {
             if (archive == null)

From 5a4b0174b187e649b9fb739fafd076ea19817f23 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Thu, 11 Mar 2021 22:40:35 +0300
Subject: [PATCH 08448/10326] Ignore MultipleCollectionIncludeWarning

---
 osu.Game/Database/OsuDbContext.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index d27da50448..689f248de8 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -112,6 +112,7 @@ namespace osu.Game.Database
             base.OnConfiguring(optionsBuilder);
             optionsBuilder
                 .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10))
+                .ConfigureWarnings(w => w.Ignore(RelationalEventId.MultipleCollectionIncludeWarning))
                 .UseLoggerFactory(logger.Value);
         }
 

From a60ff80c04850c1f09ad9f741197378e691fc78d Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 12 Mar 2021 00:02:29 +0300
Subject: [PATCH 08449/10326] Use expression body in ModsJson get accessor

---
 osu.Game/Scoring/ScoreInfo.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index c5ad43abba..78101991f6 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -86,10 +86,7 @@ namespace osu.Game.Scoring
         [Column("Mods")]
         public string ModsJson
         {
-            get
-            {
-                return modsJson;
-            }
+            get => modsJson;
             set
             {
                 modsJson = value;

From e7707eee94335149c2c284dfba421a93b11c0f69 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 15:23:11 +0900
Subject: [PATCH 08450/10326] Switch RestoreDefaultsValueButton to use
 HasPendingTasks to avoid tooltip always showing

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

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 8631b8ac7b..85765bf991 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -123,6 +123,8 @@ namespace osu.Game.Overlays.Settings
 
         protected internal class RestoreDefaultValueButton : Container, IHasTooltip
         {
+            public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
+
             private Bindable<T> bindable;
 
             public Bindable<T> Bindable
@@ -147,7 +149,6 @@ namespace osu.Game.Overlays.Settings
                 RelativeSizeAxes = Axes.Y;
                 Width = SettingsPanel.CONTENT_MARGINS;
                 Alpha = 0f;
-                AlwaysPresent = true;
             }
 
             [BackgroundDependencyLoader]

From b9b095ee75c960287a8636d06c07afddade6865f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Mar 2021 14:49:38 +0900
Subject: [PATCH 08451/10326] Local framework

---
 osu.Desktop.slnf         |  6 ++++--
 osu.Game/osu.Game.csproj |  4 +++-
 osu.iOS.props            |  4 ++--
 osu.sln                  | 42 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/osu.Desktop.slnf b/osu.Desktop.slnf
index d2c14d321a..1e41d0af0e 100644
--- a/osu.Desktop.slnf
+++ b/osu.Desktop.slnf
@@ -15,7 +15,9 @@
       "osu.Game.Tests\\osu.Game.Tests.csproj",
       "osu.Game.Tournament.Tests\\osu.Game.Tournament.Tests.csproj",
       "osu.Game.Tournament\\osu.Game.Tournament.csproj",
-      "osu.Game\\osu.Game.csproj"
+      "osu.Game\\osu.Game.csproj",
+      "../osu-framework/osu.Framework/osu.Framework.csproj",
+      "../osu-framework/osu.Framework/osu.Framework.NativeLibs.csproj"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 90c8b98f42..f2fc1726cd 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,11 +29,13 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\osu-framework\osu.Framework\osu.Framework.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/osu.iOS.props b/osu.iOS.props
index ccd33bf88c..30df8c423e 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.Framework.iOS" Version="2021.309.0" />
+    <ProjectReference Include="../../osu-framework/osu.Framework.iOS/osu.Framework.iOS.csproj" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.309.0" />
+    <ProjectReference Include="../../osu-framework/osu.Framework/osu.Framework.csproj" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
diff --git a/osu.sln b/osu.sln
index c9453359b1..4d0b3656e7 100644
--- a/osu.sln
+++ b/osu.sln
@@ -66,6 +66,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Benchmarks", "osu.Game.Benchmarks\osu.Game.Benchmarks.csproj", "{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework", "..\osu-framework\osu.Framework\osu.Framework.csproj", "{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.iOS", "..\osu-framework\osu.Framework.iOS\osu.Framework.iOS.csproj", "{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.NativeLibs", "..\osu-framework\osu.Framework.NativeLibs\osu.Framework.NativeLibs.csproj", "{500039B3-0706-40C3-B6E7-1FD9187644A5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -412,6 +418,42 @@ Global
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhone.Build.0 = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhone.Build.0 = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhone.Build.0 = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhone.Build.0 = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From a33ffd56b80878e02a0cf03cac93a22869af4787 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Mar 2021 12:43:04 +0900
Subject: [PATCH 08452/10326] Allow CreateSettingsControls to work with all
 bindables in target class

---
 .../Configuration/SettingSourceAttribute.cs   | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index cfce615130..a8cebb97b4 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;
@@ -61,9 +62,13 @@ namespace osu.Game.Configuration
 
     public static class SettingSourceExtensions
     {
-        public static IEnumerable<Drawable> CreateSettingsControls(this object obj)
+        public static IEnumerable<Drawable> CreateSettingsControls(this object obj) => createSettingsControls(obj, obj.GetOrderedSettingsSourceProperties());
+
+        public static IEnumerable<Drawable> CreateSettingsControlsFromAllBindables(this object obj) => createSettingsControls(obj, obj.GetSettingsSourcePropertiesFromBindables());
+
+        private static IEnumerable<Drawable> createSettingsControls(object obj, IEnumerable<(SettingSourceAttribute, PropertyInfo)> sourceAttribs)
         {
-            foreach (var (attr, property) in obj.GetOrderedSettingsSourceProperties())
+            foreach (var (attr, property) in sourceAttribs)
             {
                 object value = property.GetValue(obj);
 
@@ -139,6 +144,30 @@ namespace osu.Game.Configuration
             }
         }
 
+        public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourcePropertiesFromBindables(this object obj)
+        {
+            HashSet<string> handledProperties = new HashSet<string>();
+
+            // reverse and de-dupe properties to surface base class settings to the top of return order.
+            foreach (var type in obj.GetType().EnumerateBaseTypes().Reverse())
+            {
+                foreach (var property in type.GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))
+                {
+                    if (handledProperties.Contains(property.Name))
+                        continue;
+
+                    handledProperties.Add(property.Name);
+
+                    if (typeof(IBindable).IsAssignableFrom(property.PropertyType))
+                    {
+                        var val = property.GetValue(obj);
+                        string description = (val as IHasDescription)?.Description ?? string.Empty;
+                        yield return (new SettingSourceAttribute(property.Name, description), property);
+                    }
+                }
+            }
+        }
+
         public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourceProperties(this object obj)
         {
             foreach (var property in obj.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))

From 4374e7da81cbece7dfed94b3478e22b19b5b49ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Mar 2021 15:26:18 +0900
Subject: [PATCH 08453/10326] Convert bindable names to human readable
 sentences

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index a8cebb97b4..fe8886b52e 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Humanizer;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
@@ -162,7 +163,7 @@ namespace osu.Game.Configuration
                     {
                         var val = property.GetValue(obj);
                         string description = (val as IHasDescription)?.Description ?? string.Empty;
-                        yield return (new SettingSourceAttribute(property.Name, description), property);
+                        yield return (new SettingSourceAttribute(property.Name.Humanize(), description), property);
                     }
                 }
             }

From 6eadae8aaf56831d4ecfc19fb0f4dd1c0fdab2ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:35:42 +0900
Subject: [PATCH 08454/10326] Remove remnants of OsuTK

---
 osu.Desktop/OsuGameDesktop.cs | 22 +++++-----------------
 osu.Desktop/Program.cs        |  2 +-
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 5909b82c8f..b2487568ce 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -136,24 +136,12 @@ namespace osu.Desktop
 
             var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
 
-            switch (host.Window)
-            {
-                // Legacy osuTK DesktopGameWindow
-                case OsuTKDesktopWindow desktopGameWindow:
-                    desktopGameWindow.CursorState |= CursorState.Hidden;
-                    desktopGameWindow.SetIconFromStream(iconStream);
-                    desktopGameWindow.Title = Name;
-                    desktopGameWindow.FileDrop += (_, e) => fileDrop(e.FileNames);
-                    break;
+            var desktopWindow = (SDL2DesktopWindow)host.Window;
 
-                // SDL2 DesktopWindow
-                case SDL2DesktopWindow desktopWindow:
-                    desktopWindow.CursorState |= CursorState.Hidden;
-                    desktopWindow.SetIconFromStream(iconStream);
-                    desktopWindow.Title = Name;
-                    desktopWindow.DragDrop += f => fileDrop(new[] { f });
-                    break;
-            }
+            desktopWindow.CursorState |= CursorState.Hidden;
+            desktopWindow.SetIconFromStream(iconStream);
+            desktopWindow.Title = Name;
+            desktopWindow.DragDrop += f => fileDrop(new[] { f });
         }
 
         private void fileDrop(string[] filePaths)
diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index 6ca7079654..0c527ba881 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -24,7 +24,7 @@ namespace osu.Desktop
             var cwd = Environment.CurrentDirectory;
             bool useOsuTK = args.Contains("--tk");
 
-            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true, useOsuTK: useOsuTK))
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
             {
                 host.ExceptionThrown += handleException;
 

From 3c21c83cc88e8a0613aeda4f6cb04069172c6777 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:36:28 +0900
Subject: [PATCH 08455/10326] Rename KeyboardSection to BindingSection

---
 .../Input/{KeyboardSettings.cs => BindingSettings.cs}     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Overlays/Settings/Sections/Input/{KeyboardSettings.cs => BindingSettings.cs} (70%)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
similarity index 70%
rename from osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs
rename to osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
index db6f24a954..79c73863cf 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
@@ -5,17 +5,17 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
-    public class KeyboardSettings : SettingsSubsection
+    public class BindingSettings : SettingsSubsection
     {
-        protected override string Header => "Keyboard";
+        protected override string Header => "Shortcut and gameplay bindings";
 
-        public KeyboardSettings(KeyBindingPanel keyConfig)
+        public BindingSettings(KeyBindingPanel keyConfig)
         {
             Children = new Drawable[]
             {
                 new SettingsButton
                 {
-                    Text = "Key configuration",
+                    Text = "Configure",
                     TooltipText = "change global shortcut keys and gameplay bindings",
                     Action = keyConfig.ToggleVisibility
                 },

From 8635abbc4a616771e7ed702140109737919a4dd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:37:55 +0900
Subject: [PATCH 08456/10326] Add the ability to not get controls for disabled
 bindables

---
 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 fe8886b52e..39d7fba32b 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -63,16 +63,21 @@ namespace osu.Game.Configuration
 
     public static class SettingSourceExtensions
     {
-        public static IEnumerable<Drawable> CreateSettingsControls(this object obj) => createSettingsControls(obj, obj.GetOrderedSettingsSourceProperties());
+        public static IReadOnlyList<Drawable> CreateSettingsControls(this object obj, bool includeDisabled = true) =>
+            createSettingsControls(obj, obj.GetOrderedSettingsSourceProperties(), includeDisabled).ToArray();
 
-        public static IEnumerable<Drawable> CreateSettingsControlsFromAllBindables(this object obj) => createSettingsControls(obj, obj.GetSettingsSourcePropertiesFromBindables());
+        public static IReadOnlyList<Drawable> CreateSettingsControlsFromAllBindables(this object obj, bool includeDisabled = true) =>
+            createSettingsControls(obj, obj.GetSettingsSourcePropertiesFromBindables(), includeDisabled).ToArray();
 
-        private static IEnumerable<Drawable> createSettingsControls(object obj, IEnumerable<(SettingSourceAttribute, PropertyInfo)> sourceAttribs)
+        private static IEnumerable<Drawable> createSettingsControls(object obj, IEnumerable<(SettingSourceAttribute, PropertyInfo)> sourceAttribs, bool includeDisabled = true)
         {
             foreach (var (attr, property) in sourceAttribs)
             {
                 object value = property.GetValue(obj);
 
+                if ((value as IBindable)?.Disabled == true)
+                    continue;
+
                 switch (value)
                 {
                     case BindableNumber<float> bNumber:

From 03230edcb11760ff457ce3667b3377e6aea30660 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:38:16 +0900
Subject: [PATCH 08457/10326] Update bindings settings to handle the new
 structure and show all handlers

---
 .../Settings/Sections/Input/MouseSettings.cs  | 60 ++++++-----------
 .../Settings/Sections/InputSection.cs         | 64 ++++++++++++++++++-
 2 files changed, 82 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 3a78cff890..036c4edfba 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.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 osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Handlers.Mouse;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
@@ -14,35 +14,39 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public class MouseSettings : SettingsSubsection
     {
+        private readonly MouseHandler mouseHandler;
+
         protected override string Header => "Mouse";
 
-        private readonly BindableBool rawInputToggle = new BindableBool();
-
-        private Bindable<double> configSensitivity;
+        private Bindable<double> handlerSensitivity;
 
         private Bindable<double> localSensitivity;
 
-        private Bindable<string> ignoredInputHandlers;
-
         private Bindable<WindowMode> windowMode;
         private SettingsEnumDropdown<OsuConfineMouseMode> confineMouseModeSetting;
+        private Bindable<bool> relativeMode;
+
+        public MouseSettings(MouseHandler mouseHandler)
+        {
+            this.mouseHandler = mouseHandler;
+        }
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
         {
             // use local bindable to avoid changing enabled state of game host's bindable.
-            configSensitivity = config.GetBindable<double>(FrameworkSetting.CursorSensitivity);
-            localSensitivity = configSensitivity.GetUnboundCopy();
+            handlerSensitivity = mouseHandler.Sensitivity.GetBoundCopy();
+            localSensitivity = handlerSensitivity.GetUnboundCopy();
 
+            relativeMode = mouseHandler.UseRelativeMode.GetBoundCopy();
             windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            ignoredInputHandlers = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
 
             Children = new Drawable[]
             {
                 new SettingsCheckbox
                 {
-                    LabelText = "Raw input",
-                    Current = rawInputToggle
+                    LabelText = "High precision mouse",
+                    Current = relativeMode
                 },
                 new SensitivitySetting
                 {
@@ -76,7 +80,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             base.LoadComplete();
 
-            configSensitivity.BindValueChanged(val =>
+            relativeMode.BindValueChanged(relative => localSensitivity.Disabled = !relative.NewValue, true);
+
+            handlerSensitivity.BindValueChanged(val =>
             {
                 var disabled = localSensitivity.Disabled;
 
@@ -85,7 +91,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 localSensitivity.Disabled = disabled;
             }, true);
 
-            localSensitivity.BindValueChanged(val => configSensitivity.Value = val.NewValue);
+            localSensitivity.BindValueChanged(val => handlerSensitivity.Value = val.NewValue);
 
             windowMode.BindValueChanged(mode =>
             {
@@ -102,32 +108,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     confineMouseModeSetting.TooltipText = string.Empty;
                 }
             }, true);
-
-            if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
-            {
-                rawInputToggle.Disabled = true;
-                localSensitivity.Disabled = true;
-            }
-            else
-            {
-                rawInputToggle.ValueChanged += enabled =>
-                {
-                    // this is temporary until we support per-handler settings.
-                    const string raw_mouse_handler = @"OsuTKRawMouseHandler";
-                    const string standard_mouse_handlers = @"OsuTKMouseHandler MouseHandler";
-
-                    ignoredInputHandlers.Value = enabled.NewValue ? standard_mouse_handlers : raw_mouse_handler;
-                };
-
-                ignoredInputHandlers.ValueChanged += handler =>
-                {
-                    bool raw = !handler.NewValue.Contains("Raw");
-                    rawInputToggle.Value = raw;
-                    localSensitivity.Disabled = !raw;
-                };
-
-                ignoredInputHandlers.TriggerChange();
-            }
         }
 
         private class SensitivitySetting : SettingsSlider<double, SensitivitySlider>
@@ -141,7 +121,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private class SensitivitySlider : OsuSliderBar<double>
         {
-            public override string TooltipText => Current.Disabled ? "enable raw input to adjust sensitivity" : $"{base.TooltipText}x";
+            public override string TooltipText => Current.Disabled ? "enable high precision mouse to adjust sensitivity" : $"{base.TooltipText}x";
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index b43453f53d..107e37909c 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -1,28 +1,88 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Handlers;
+using osu.Framework.Input.Handlers.Mouse;
+using osu.Framework.Platform;
+using osu.Game.Configuration;
 using osu.Game.Overlays.Settings.Sections.Input;
 
 namespace osu.Game.Overlays.Settings.Sections
 {
     public class InputSection : SettingsSection
     {
+        private readonly KeyBindingPanel keyConfig;
+
         public override string Header => "Input";
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         public override Drawable CreateIcon() => new SpriteIcon
         {
             Icon = FontAwesome.Solid.Keyboard
         };
 
         public InputSection(KeyBindingPanel keyConfig)
+        {
+            this.keyConfig = keyConfig;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
             Children = new Drawable[]
             {
-                new MouseSettings(),
-                new KeyboardSettings(keyConfig),
+                new BindingSettings(keyConfig),
             };
+
+            foreach (var handler in host.AvailableInputHandlers)
+            {
+                var handlerSection = createSectionFor(handler);
+
+                if (handlerSection != null)
+                    Add(handlerSection);
+            }
+        }
+
+        private SettingsSubsection createSectionFor(InputHandler handler)
+        {
+            var settingsControls = handler.CreateSettingsControlsFromAllBindables(false);
+
+            if (settingsControls.Count == 0)
+                return null;
+
+            SettingsSubsection section;
+
+            switch (handler)
+            {
+                case MouseHandler mh:
+                    section = new MouseSettings(mh);
+                    break;
+
+                default:
+                    section = new HandlerSection(handler);
+                    break;
+            }
+
+            section.AddRange(settingsControls);
+
+            return section;
+        }
+
+        private class HandlerSection : SettingsSubsection
+        {
+            private readonly InputHandler handler;
+
+            public HandlerSection(InputHandler handler)
+            {
+                this.handler = handler;
+            }
+
+            protected override string Header => handler.Description;
         }
     }
 }

From 3458dcc33aa07615dad66ba2b2ee643f874b5f22 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:40:38 +0900
Subject: [PATCH 08458/10326] Use whitelist to avoid exposing settings to user
 that shouldn't be

---
 .../Settings/Sections/InputSection.cs         | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index 107e37909c..e6aaa1ade9 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -5,6 +5,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Handlers;
+using osu.Framework.Input.Handlers.Joystick;
+using osu.Framework.Input.Handlers.Midi;
 using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
@@ -50,11 +52,6 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private SettingsSubsection createSectionFor(InputHandler handler)
         {
-            var settingsControls = handler.CreateSettingsControlsFromAllBindables(false);
-
-            if (settingsControls.Count == 0)
-                return null;
-
             SettingsSubsection section;
 
             switch (handler)
@@ -63,11 +60,21 @@ namespace osu.Game.Overlays.Settings.Sections
                     section = new MouseSettings(mh);
                     break;
 
-                default:
+                // whitelist the handlers which should be displayed to avoid any weird cases of users touching settings they shouldn't.
+                case JoystickHandler _:
+                case MidiHandler _:
                     section = new HandlerSection(handler);
                     break;
+
+                default:
+                    return null;
             }
 
+            var settingsControls = handler.CreateSettingsControlsFromAllBindables(false);
+
+            if (settingsControls.Count == 0)
+                return null;
+
             section.AddRange(settingsControls);
 
             return section;

From 86164c027a052af679caeb9d1937828bde61df8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:44:10 +0900
Subject: [PATCH 08459/10326] Update the method we use to reset input settings

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index b7398efdc2..4dd7f97a72 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -880,8 +880,7 @@ namespace osu.Game
             switch (action)
             {
                 case GlobalAction.ResetInputSettings:
-                    frameworkConfig.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers).SetDefault();
-                    frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity).SetDefault();
+                    Host.ResetInputHandlers();
                     frameworkConfig.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode).SetDefault();
                     return true;
 

From d0644221ff74801457b2b17efa728de723ddea20 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 9 Nov 2020 14:43:06 -0800
Subject: [PATCH 08460/10326] Add test showing toolbar behavior change

---
 .../Navigation/TestSceneScreenNavigation.cs   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index fc49517cdf..f2bb518b2e 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -229,6 +229,35 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("settings displayed", () => Game.Settings.State.Value == Visibility.Visible);
         }
 
+        [Test]
+        public void TestToolbarHiddenByUser()
+        {
+            AddStep("Enter menu", () => InputManager.Key(Key.Enter));
+
+            AddUntilStep("Wait for toolbar to load", () => Game.Toolbar.IsLoaded);
+
+            AddStep("Hide toolbar", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.T);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+
+            pushEscape();
+
+            AddStep("Enter menu", () => InputManager.Key(Key.Enter));
+
+            AddAssert("Toolbar is hidden", () => Game.Toolbar.State.Value == Visibility.Hidden);
+
+            AddStep("Enter song select", () =>
+            {
+                InputManager.Key(Key.Enter);
+                InputManager.Key(Key.Enter);
+            });
+
+            AddAssert("Toolbar is hidden", () => Game.Toolbar.State.Value == Visibility.Hidden);
+        }
+
         private void pushEscape() =>
             AddStep("Press escape", () => InputManager.Key(Key.Escape));
 

From 6c0734a09ff87754eb91917623f717476ee400e6 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 9 Nov 2020 14:45:20 -0800
Subject: [PATCH 08461/10326] Handle global action in toolbar instead of
 osugame

---
 osu.Game/OsuGame.cs                  |  4 ----
 osu.Game/Overlays/Toolbar/Toolbar.cs | 22 ++++++++++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index b7398efdc2..dd775888a1 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -885,10 +885,6 @@ namespace osu.Game
                     frameworkConfig.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode).SetDefault();
                     return true;
 
-                case GlobalAction.ToggleToolbar:
-                    Toolbar.ToggleVisibility();
-                    return true;
-
                 case GlobalAction.ToggleGameplayMouseButtons:
                     LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
                     return true;
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 0ccb22df3a..011f5a03c9 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -13,10 +13,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets;
+using osu.Framework.Input.Bindings;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class Toolbar : VisibilityContainer
+    public class Toolbar : VisibilityContainer, IKeyBindingHandler<GlobalAction>
     {
         public const float HEIGHT = 40;
         public const float TOOLTIP_HEIGHT = 30;
@@ -30,7 +32,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected readonly IBindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
-        // Toolbar components like RulesetSelector should receive keyboard input events even when the toolbar is hidden.
+        // Toolbar and its components need keyboard input even when hidden.
         public override bool PropagateNonPositionalInputSubTree => true;
 
         public Toolbar()
@@ -164,5 +166,21 @@ namespace osu.Game.Overlays.Toolbar
             this.MoveToY(-DrawSize.Y, transition_time, Easing.OutQuint);
             this.FadeOut(transition_time, Easing.InQuint);
         }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.ToggleToolbar:
+                    ToggleVisibility();
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
     }
 }

From 62f2a823f6be7d27ec7c6db751193023927bb130 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 9 Nov 2020 14:46:08 -0800
Subject: [PATCH 08462/10326] Hide toolbar forever when the user hides it

---
 osu.Game/OsuGame.cs                   | 2 +-
 osu.Game/Overlays/Toolbar/Toolbar.cs  | 6 ++++++
 osu.Game/Screens/Menu/ButtonSystem.cs | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index dd775888a1..fa9a0d4eb5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -983,7 +983,7 @@ namespace osu.Game
 
                 if (newOsuScreen.HideOverlaysOnEnter)
                     CloseAllOverlays();
-                else
+                else if (!Toolbar.HiddenByUser)
                     Toolbar.Show();
 
                 if (newOsuScreen.AllowBackButton)
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 011f5a03c9..7f77e5add9 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Overlays.Toolbar
         public const float HEIGHT = 40;
         public const float TOOLTIP_HEIGHT = 30;
 
+        public bool HiddenByUser;
+
         public Action OnHome;
 
         private ToolbarUserButton userButton;
@@ -169,10 +171,14 @@ namespace osu.Game.Overlays.Toolbar
 
         public bool OnPressed(GlobalAction action)
         {
+            if (OverlayActivationMode.Value == OverlayActivation.Disabled)
+                return false;
+
             switch (action)
             {
                 case GlobalAction.ToggleToolbar:
                     ToggleVisibility();
+                    HiddenByUser = State.Value == Visibility.Hidden;
                     return true;
             }
 
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 81b1cb0bf1..8f1fd627f5 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -352,7 +352,8 @@ namespace osu.Game.Screens.Menu
                                 if (impact)
                                     logo.Impact();
 
-                                game?.Toolbar.Show();
+                                if (game?.Toolbar.HiddenByUser == false)
+                                    game.Toolbar.Show();
                             }, 200);
                             break;
 

From 020a03e01ee7284d37359a67704b3e72ed8ff50a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 13 Mar 2021 05:22:20 +0300
Subject: [PATCH 08463/10326] Use sensible "score per tick" constant

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 8534cd89d7..1ec3c877e9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -289,6 +289,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private void fadeInCounter() => SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
+        private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
+
         private int wholeSpins;
 
         private void updateBonusScore()
@@ -315,7 +317,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     tick.TriggerResult(true);
 
                     if (tick is DrawableSpinnerBonusTick)
-                        gainedBonus.Value = tick.Result.Judgement.MaxNumericResult * (spins - HitObject.SpinsRequired);
+                        gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequired);
                 }
 
                 wholeSpins++;

From 8fdab5a7de4a881604ebb5da7547106a153bf9dc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 12 Mar 2021 02:37:07 +0300
Subject: [PATCH 08464/10326] Revert legacy spinner presence changes and bonus
 counter component

No longer necessary, after inlining legacy coordinates logic to `LegacySpinner` and limiting precisely-positioned legacy components there
---
 .../Objects/Drawables/DrawableSpinner.cs      |  1 -
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs    |  1 -
 .../Legacy/OsuLegacySkinTransformer.cs        | 39 ++-----------------
 3 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 1ec3c877e9..a4919d5061 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -82,7 +82,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Y = 120,
                     Alpha = 0
                 },
-                new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBonusCounter), _ => new DefaultSpinnerBonusCounter()),
                 spinningSample = new PausableSkinnableSound
                 {
                     Volume = { Value = 0 },
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index 131645406e..fcb544fa5b 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -19,6 +19,5 @@ namespace osu.Game.Rulesets.Osu
         SliderBall,
         SliderBody,
         SpinnerBody,
-        SpinnerBonusCounter,
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index ed09031fc1..d74f885573 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK;
-using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
@@ -14,12 +13,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
     {
         private Lazy<bool> hasHitCircle;
 
-        private Lazy<SpinnerStyle> spinnerStyle;
-
-        private bool hasSpinner => spinnerStyle.Value != SpinnerStyle.Modern;
-
-        private bool hasScoreFont => this.HasFont(GetConfig<LegacySetting, string>(LegacySetting.ScorePrefix)?.Value ?? "score");
-
         /// <summary>
         /// On osu-stable, hitcircles have 5 pixels of transparent padding on each side to allow for shadows etc.
         /// Their hittable area is 128px, but the actual circle portion is 118px.
@@ -37,19 +30,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private void sourceChanged()
         {
             hasHitCircle = new Lazy<bool>(() => Source.GetTexture("hitcircle") != null);
-
-            spinnerStyle = new Lazy<SpinnerStyle>(() =>
-            {
-                bool hasBackground = Source.GetTexture("spinner-background") != null;
-
-                if (Source.GetTexture("spinner-top") != null && !hasBackground)
-                    return SpinnerStyle.NewLegacy;
-
-                if (hasBackground)
-                    return SpinnerStyle.OldLegacy;
-
-                return SpinnerStyle.Modern;
-            });
         }
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
@@ -130,18 +110,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         };
 
                 case OsuSkinComponents.SpinnerBody:
-                    if (spinnerStyle.Value == SpinnerStyle.NewLegacy)
+                    bool hasBackground = Source.GetTexture("spinner-background") != null;
+
+                    if (Source.GetTexture("spinner-top") != null && !hasBackground)
                         return new LegacyNewStyleSpinner();
-                    else if (spinnerStyle.Value == SpinnerStyle.OldLegacy)
+                    else if (hasBackground)
                         return new LegacyOldStyleSpinner();
 
                     return null;
-
-                case OsuSkinComponents.SpinnerBonusCounter:
-                    if (hasSpinner && hasScoreFont)
-                        return new LegacySpinnerBonusCounter();
-
-                    return null;
             }
 
             return null;
@@ -175,12 +151,5 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             return Source.GetConfig<TLookup, TValue>(lookup);
         }
-
-        private enum SpinnerStyle
-        {
-            NewLegacy,
-            OldLegacy,
-            Modern,
-        }
     }
 }

From 774ebf50bca5d5c0022c824db4e0d5d50e60281b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 12 Mar 2021 02:38:25 +0300
Subject: [PATCH 08465/10326] Move legacy spinner bonus counter to
 `LegacySpinner`

---
 .../Skinning/Legacy/LegacySpinner.cs          | 62 +++++++++++++------
 .../Legacy/LegacySpinnerBonusCounter.cs       | 56 -----------------
 2 files changed, 43 insertions(+), 75 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 513888db53..b0b9cba2bd 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private Sprite spin;
         private Sprite clear;
 
+        private LegacySpriteText bonusCounter;
+
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject, ISkinSource source)
         {
@@ -45,36 +47,58 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            AddRangeInternal(new[]
+            AddInternal(new Container
             {
-                spin = new Sprite
+                Depth = float.MinValue,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.Centre,
-                    Depth = float.MinValue,
-                    Texture = source.GetTexture("spinner-spin"),
-                    Scale = new Vector2(SPRITE_SCALE),
-                    Y = SPINNER_TOP_OFFSET + 335,
-                },
-                clear = new Sprite
-                {
-                    Alpha = 0,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.Centre,
-                    Depth = float.MinValue,
-                    Texture = source.GetTexture("spinner-clear"),
-                    Scale = new Vector2(SPRITE_SCALE),
-                    Y = SPINNER_TOP_OFFSET + 115,
-                },
+                    spin = new Sprite
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-spin"),
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Y = SPINNER_TOP_OFFSET + 335,
+                    },
+                    clear = new Sprite
+                    {
+                        Alpha = 0,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-clear"),
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Y = SPINNER_TOP_OFFSET + 115,
+                    },
+                    bonusCounter = ((LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))).With(s =>
+                    {
+                        s.Alpha = 0f;
+                        s.Anchor = Anchor.TopCentre;
+                        s.Origin = Anchor.Centre;
+                        s.Font = s.Font.With(fixedWidth: false);
+                        s.Scale = new Vector2(SPRITE_SCALE);
+                        s.Y = SPINNER_TOP_OFFSET + 299;
+                    }),
+                }
             });
         }
 
+        private IBindable<double> gainedBonus;
+
         private readonly Bindable<bool> completed = new Bindable<bool>();
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
+            gainedBonus.BindValueChanged(bonus =>
+            {
+                bonusCounter.Text = $"{bonus.NewValue}";
+                bonusCounter.FadeOutFromOne(800, Easing.Out);
+                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+            });
+
             completed.BindValueChanged(onCompletedChanged, true);
 
             DrawableSpinner.ApplyCustomUpdateState += UpdateStateTransforms;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs
deleted file mode 100644
index 3c4a6be4dd..0000000000
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.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.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Skinning;
-using osuTK;
-using static osu.Game.Rulesets.Osu.Skinning.Legacy.LegacySpinner;
-
-namespace osu.Game.Rulesets.Osu.Skinning.Legacy
-{
-    public class LegacySpinnerBonusCounter : CompositeDrawable
-    {
-        private LegacySpriteText bonusCounter;
-
-        private DrawableSpinner drawableSpinner;
-
-        private IBindable<double> gainedBonus;
-
-        [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableHitObject, ISkinSource source)
-        {
-            drawableSpinner = (DrawableSpinner)drawableHitObject;
-
-            InternalChild = new LegacyCoordinatesContainer
-            {
-                Child = bonusCounter = ((LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))).With(s =>
-                {
-                    s.Alpha = 0f;
-                    s.Anchor = Anchor.TopCentre;
-                    s.Origin = Anchor.Centre;
-                    s.Font = s.Font.With(fixedWidth: false);
-                    s.Scale = new Vector2(SPRITE_SCALE);
-                    s.Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 299;
-                }),
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
-            gainedBonus.BindValueChanged(bonus =>
-            {
-                bonusCounter.Text = $"{bonus.NewValue}";
-                bonusCounter.FadeOutFromOne(800, Easing.Out);
-                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
-            });
-        }
-    }
-}

From 98f6e16113debd5a4890d7e6eb6aad4a70226bad Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 12 Mar 2021 02:38:40 +0300
Subject: [PATCH 08466/10326] Move default spinner bonus counter to new
 `DefaultSpinner`

---
 .../Objects/Drawables/DrawableSpinner.cs      |  2 +-
 ...innerBonusCounter.cs => DefaultSpinner.cs} | 38 +++++++++++++------
 .../Skinning/Default/DefaultSpinnerDisc.cs    |  5 ---
 3 files changed, 28 insertions(+), 17 deletions(-)
 rename osu.Game.Rulesets.Osu/Skinning/Default/{DefaultSpinnerBonusCounter.cs => DefaultSpinner.cs} (62%)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index a4919d5061..f995140123 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     RelativeSizeAxes = Axes.Y,
                     Children = new Drawable[]
                     {
-                        new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBody), _ => new DefaultSpinnerDisc()),
+                        new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBody), _ => new DefaultSpinner()),
                         RotationTracker = new SpinnerRotationTracker(this)
                     }
                 },
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
similarity index 62%
rename from osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
index 633766290f..83676d3784 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
@@ -12,29 +12,45 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public class DefaultSpinnerBonusCounter : CompositeDrawable
+    public class DefaultSpinner : CompositeDrawable
     {
-        private OsuSpriteText bonusCounter;
-
         private DrawableSpinner drawableSpinner;
 
-        private IBindable<double> gainedBonus;
+        private OsuSpriteText bonusCounter;
+
+        public DefaultSpinner()
+        {
+            RelativeSizeAxes = Axes.Both;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+        }
 
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject)
         {
             drawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            InternalChild = bonusCounter = new OsuSpriteText
+            AddRangeInternal(new Drawable[]
             {
-                Alpha = 0,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Font = OsuFont.Numeric.With(size: 24),
-                Y = -120,
-            };
+                new DefaultSpinnerDisc
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                bonusCounter = new OsuSpriteText
+                {
+                    Alpha = 0,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Font = OsuFont.Numeric.With(size: 24),
+                    Y = -120,
+                }
+            });
         }
 
+        private IBindable<double> gainedBonus;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
index 667fee1495..542f3eff0d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
@@ -40,14 +40,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         public DefaultSpinnerDisc()
         {
-            RelativeSizeAxes = Axes.Both;
-
             // we are slightly bigger than our parent, to clip the top and bottom of the circle
             // this should probably be revisited when scaled spinners are a thing.
             Scale = new Vector2(initial_scale);
-
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
         }
 
         [BackgroundDependencyLoader]

From 115c186cb7a624065620391a83be90c502827bb2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 02:16:10 +0300
Subject: [PATCH 08467/10326] Move hit circle font from osu! ruleset

---
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs | 2 --
 osu.Game/Skinning/LegacySkinConfiguration.cs           | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index 63c9b53278..75a62a6f8e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -5,8 +5,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 {
     public enum OsuSkinConfiguration
     {
-        HitCirclePrefix,
-        HitCircleOverlap,
         SliderBorderSize,
         SliderPathRadius,
         AllowSliderBallTint,
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
index 84a834ec22..20d1da8aaa 100644
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacySkinConfiguration.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Skinning
             ComboOverlap,
             ScorePrefix,
             ScoreOverlap,
+            HitCirclePrefix,
+            HitCircleOverlap,
             AnimationFramerate,
             LayeredHitSounds
         }

From 91741564e8e06926a36b49f1c15dba97a03564da Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 02:15:23 +0300
Subject: [PATCH 08468/10326] Add legacy font enum and extensions

---
 osu.Game/Skinning/LegacyFont.cs           | 15 +++++++
 osu.Game/Skinning/LegacySkinExtensions.cs | 48 ++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Skinning/LegacyFont.cs

diff --git a/osu.Game/Skinning/LegacyFont.cs b/osu.Game/Skinning/LegacyFont.cs
new file mode 100644
index 0000000000..d1971cb84c
--- /dev/null
+++ b/osu.Game/Skinning/LegacyFont.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.
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// The type of legacy font to use for <see cref="LegacySpriteText"/>s.
+    /// </summary>
+    public enum LegacyFont
+    {
+        Score,
+        Combo,
+        HitCircle,
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index a7c084998d..d08f50bccb 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -63,8 +64,51 @@ namespace osu.Game.Skinning
             }
         }
 
-        public static bool HasFont(this ISkin source, string fontPrefix)
-            => source.GetTexture($"{fontPrefix}-0") != null;
+        public static bool HasFont(this ISkin source, LegacyFont font)
+        {
+            return source.GetTexture($"{source.GetFontPrefix(font)}-0") != null;
+        }
+
+        public static string GetFontPrefix(this ISkin source, LegacyFont font)
+        {
+            switch (font)
+            {
+                case LegacyFont.Score:
+                    return source.GetConfig<LegacySetting, string>(LegacySetting.ScorePrefix)?.Value ?? "score";
+
+                case LegacyFont.Combo:
+                    return source.GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
+
+                case LegacyFont.HitCircle:
+                    return source.GetConfig<LegacySetting, string>(LegacySetting.HitCirclePrefix)?.Value ?? "default";
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(font));
+            }
+        }
+
+        /// <summary>
+        /// Returns the numeric overlap of number sprites to use.
+        /// A positive number will bring the number sprites closer together, while a negative number
+        /// will split them apart more.
+        /// </summary>
+        public static float GetFontOverlap(this ISkin source, LegacyFont font)
+        {
+            switch (font)
+            {
+                case LegacyFont.Score:
+                    return source.GetConfig<LegacySetting, float>(LegacySetting.ScoreOverlap)?.Value ?? -2f;
+
+                case LegacyFont.Combo:
+                    return source.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
+
+                case LegacyFont.HitCircle:
+                    return source.GetConfig<LegacySetting, float>(LegacySetting.HitCircleOverlap)?.Value ?? -2f;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(font));
+            }
+        }
 
         public class SkinnableTextureAnimation : TextureAnimation
         {

From 64d1cb519324df2663aa85502ba6bed305ae1b0f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 02:30:16 +0300
Subject: [PATCH 08469/10326] Remove text skin components in favour of plain
 `LegacySpriteText`s

---
 osu.Game/Skinning/HUDSkinComponents.cs |  2 --
 osu.Game/Skinning/LegacySkin.cs        | 21 +--------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index b01be2d5a0..a345e060e5 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -9,7 +9,5 @@ namespace osu.Game.Skinning
         ScoreCounter,
         AccuracyCounter,
         HealthDisplay,
-        ScoreText,
-        ComboText,
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e5d0217671..83854c592b 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -18,7 +18,6 @@ using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -327,19 +326,13 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        private string scorePrefix => GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score";
-
-        private string comboPrefix => GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ComboPrefix)?.Value ?? "score";
-
-        private bool hasScoreFont => this.HasFont(scorePrefix);
-
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             switch (component)
             {
                 case HUDSkinComponent hudComponent:
                 {
-                    if (!hasScoreFont)
+                    if (!this.HasFont(LegacyFont.Score))
                         return null;
 
                     switch (hudComponent.Component)
@@ -355,18 +348,6 @@ namespace osu.Game.Skinning
 
                         case HUDSkinComponents.HealthDisplay:
                             return new LegacyHealthDisplay(this);
-
-                        case HUDSkinComponents.ComboText:
-                            return new LegacySpriteText(this, comboPrefix)
-                            {
-                                Spacing = new Vector2(-(GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ComboOverlap)?.Value ?? -2), 0)
-                            };
-
-                        case HUDSkinComponents.ScoreText:
-                            return new LegacySpriteText(this, scorePrefix)
-                            {
-                                Spacing = new Vector2(-(GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ScoreOverlap)?.Value ?? -2), 0)
-                            };
                     }
 
                     return null;

From 2a2ee3fa5ea86bbfc875f5659c01b3463adb93fb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 02:28:08 +0300
Subject: [PATCH 08470/10326] Update legacy sprite text constructor

---
 osu.Game/Skinning/LegacyRollingCounter.cs | 23 +++++------------------
 osu.Game/Skinning/LegacySpriteText.cs     |  7 +++++--
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Skinning/LegacyRollingCounter.cs b/osu.Game/Skinning/LegacyRollingCounter.cs
index 8aa9d4e9af..0261db0e64 100644
--- a/osu.Game/Skinning/LegacyRollingCounter.cs
+++ b/osu.Game/Skinning/LegacyRollingCounter.cs
@@ -4,7 +4,6 @@
 using System;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -14,9 +13,7 @@ namespace osu.Game.Skinning
     public class LegacyRollingCounter : RollingCounter<int>
     {
         private readonly ISkin skin;
-
-        private readonly string fontName;
-        private readonly float fontOverlap;
+        private readonly LegacyFont font;
 
         protected override bool IsRollingProportional => true;
 
@@ -24,17 +21,11 @@ namespace osu.Game.Skinning
         /// Creates a new <see cref="LegacyRollingCounter"/>.
         /// </summary>
         /// <param name="skin">The <see cref="ISkin"/> from which to get counter number sprites.</param>
-        /// <param name="fontName">The name of the legacy font to use.</param>
-        /// <param name="fontOverlap">
-        /// The numeric overlap of number sprites to use.
-        /// A positive number will bring the number sprites closer together, while a negative number
-        /// will split them apart more.
-        /// </param>
-        public LegacyRollingCounter(ISkin skin, string fontName, float fontOverlap)
+        /// <param name="font">The legacy font to use for the counter.</param>
+        public LegacyRollingCounter(ISkin skin, LegacyFont font)
         {
             this.skin = skin;
-            this.fontName = fontName;
-            this.fontOverlap = fontOverlap;
+            this.font = font;
         }
 
         protected override double GetProportionalDuration(int currentValue, int newValue)
@@ -42,10 +33,6 @@ namespace osu.Game.Skinning
             return Math.Abs(newValue - currentValue) * 75.0;
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() =>
-            new LegacySpriteText(skin, fontName)
-            {
-                Spacing = new Vector2(-fontOverlap, 0f)
-            };
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, font);
     }
 }
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index 5d0e312f7c..c55400e219 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Text;
 using osu.Game.Graphics.Sprites;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -16,12 +17,14 @@ namespace osu.Game.Skinning
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
-        public LegacySpriteText(ISkin skin, string font = "score")
+        public LegacySpriteText(ISkin skin, LegacyFont font)
         {
             Shadow = false;
             UseFullGlyphHeight = false;
 
-            Font = new FontUsage(font, 1, fixedWidth: true);
+            Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
+            Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
+
             glyphStore = new LegacyGlyphStore(skin);
         }
 

From 43c1e1d217388f56fe5e1e616fb000c65f7d2382 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 02:18:31 +0300
Subject: [PATCH 08471/10326] Update existing usages

Resolve post-conflict issues
---
 .../Legacy/CatchLegacySkinTransformer.cs      |  4 +---
 .../Legacy/LegacyCatchComboCounter.cs         |  8 ++------
 .../Legacy/OsuLegacySkinTransformer.cs        | 17 +++++++----------
 .../Screens/Play/HUD/LegacyComboCounter.cs    | 19 ++++++++-----------
 osu.Game/Skinning/LegacyAccuracyCounter.cs    |  8 +++++---
 osu.Game/Skinning/LegacyScoreCounter.cs       |  8 +++++---
 6 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
index 41fd0fe776..1b48832ed6 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
@@ -5,7 +5,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK.Graphics;
-using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
@@ -14,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         /// <summary>
         /// For simplicity, let's use legacy combo font texture existence as a way to identify legacy skins from default.
         /// </summary>
-        private bool providesComboCounter => this.HasFont(GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score");
+        private bool providesComboCounter => this.HasFont(LegacyFont.Combo);
 
         public CatchLegacySkinTransformer(ISkinSource source)
             : base(source)
@@ -69,7 +68,6 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                            this.GetAnimation("fruit-ryuuta", true, true, true);
 
                 case CatchSkinComponents.CatchComboCounter:
-
                     if (providesComboCounter)
                         return new LegacyCatchComboCounter(Source);
 
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
index f797ae75c2..28ee7bd813 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
@@ -7,7 +7,6 @@ using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
-using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
@@ -22,9 +21,6 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
         public LegacyCatchComboCounter(ISkin skin)
         {
-            var fontName = skin.GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
-            var fontOverlap = skin.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
-
             AutoSizeAxes = Axes.Both;
 
             Alpha = 0f;
@@ -34,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
             InternalChildren = new Drawable[]
             {
-                explosion = new LegacyRollingCounter(skin, fontName, fontOverlap)
+                explosion = new LegacyRollingCounter(skin, LegacyFont.Combo)
                 {
                     Alpha = 0.65f,
                     Blending = BlendingParameters.Additive,
@@ -42,7 +38,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                     Origin = Anchor.Centre,
                     Scale = new Vector2(1.5f),
                 },
-                counter = new LegacyRollingCounter(skin, fontName, fontOverlap)
+                counter = new LegacyRollingCounter(skin, LegacyFont.Combo)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index d74f885573..ffe238c507 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -97,17 +97,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     return null;
 
                 case OsuSkinComponents.HitCircleText:
-                    var font = GetConfig<OsuSkinConfiguration, string>(OsuSkinConfiguration.HitCirclePrefix)?.Value ?? "default";
-                    var overlap = GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.HitCircleOverlap)?.Value ?? -2;
+                    if (!this.HasFont(LegacyFont.HitCircle))
+                        return null;
 
-                    return !this.HasFont(font)
-                        ? null
-                        : new LegacySpriteText(Source, font)
-                        {
-                            // stable applies a blanket 0.8x scale to hitcircle fonts
-                            Scale = new Vector2(0.8f),
-                            Spacing = new Vector2(-overlap, 0)
-                        };
+                    return new LegacySpriteText(Source, LegacyFont.HitCircle)
+                    {
+                        // stable applies a blanket 0.8x scale to hitcircle fonts
+                        Scale = new Vector2(0.8f),
+                    };
 
                 case OsuSkinComponents.SpinnerBody:
                     bool hasBackground = Source.GetTexture("spinner-background") != null;
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 81183a425a..b4604c0d01 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -84,16 +83,16 @@ namespace osu.Game.Screens.Play.HUD
         {
             InternalChildren = new[]
             {
-                popOutCount = createSpriteText().With(s =>
+                popOutCount = new LegacySpriteText(skin, LegacyFont.Combo)
                 {
-                    s.Alpha = 0;
-                    s.Margin = new MarginPadding(0.05f);
-                    s.Blending = BlendingParameters.Additive;
-                }),
-                displayedCountSpriteText = createSpriteText().With(s =>
+                    Alpha = 0,
+                    Margin = new MarginPadding(0.05f),
+                    Blending = BlendingParameters.Additive,
+                },
+                displayedCountSpriteText = new LegacySpriteText(skin, LegacyFont.Combo)
                 {
-                    s.Alpha = 0;
-                })
+                    Alpha = 0,
+                },
             };
 
             Current.ValueChanged += combo => updateCount(combo.NewValue == 0);
@@ -247,7 +246,5 @@ namespace osu.Game.Screens.Play.HUD
             double difference = currentValue > newValue ? currentValue - newValue : newValue - currentValue;
             return difference * rolling_duration;
         }
-
-        private OsuSpriteText createSpriteText() => (OsuSpriteText)skin.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ComboText));
     }
 }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 5eda374337..7d6f1dc916 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -29,9 +29,11 @@ namespace osu.Game.Skinning
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
-        protected sealed override OsuSpriteText CreateSpriteText()
-            => (OsuSpriteText)skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))
-                                  ?.With(s => s.Anchor = s.Origin = Anchor.TopRight);
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, LegacyFont.Score)
+        {
+            Anchor = Anchor.TopRight,
+            Origin = Anchor.TopRight,
+        };
 
         protected override void Update()
         {
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 5bffeff5a8..1d330ef495 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -33,8 +33,10 @@ namespace osu.Game.Skinning
             Margin = new MarginPadding(10);
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText()
-            => (OsuSpriteText)skin.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))
-                                  .With(s => s.Anchor = s.Origin = Anchor.TopRight);
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, LegacyFont.Score)
+        {
+            Anchor = Anchor.TopRight,
+            Origin = Anchor.TopRight,
+        };
     }
 }

From 5999e4ba3361f54828eaa25f1539ca0e2b991279 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 9 Nov 2020 15:16:35 -0800
Subject: [PATCH 08472/10326] Add xmldoc for hiddenbyuser bool

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 7f77e5add9..483d82200b 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Overlays.Toolbar
         public const float HEIGHT = 40;
         public const float TOOLTIP_HEIGHT = 30;
 
+        /// <summary>
+        /// Whether the user hid this <see cref="Toolbar"/> with <see cref="GlobalAction.ToggleToolbar"/>.
+        /// </summary>
         public bool HiddenByUser;
 
         public Action OnHome;

From 0ba5312a4063e3308c666e17ab4590bfe2f38267 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 13 Mar 2021 00:05:26 -0800
Subject: [PATCH 08473/10326] Move blocking show logic to UpdateState

---
 osu.Game/OsuGame.cs                   |  2 +-
 osu.Game/Overlays/Toolbar/Toolbar.cs  | 12 +++++++++---
 osu.Game/Screens/Menu/ButtonSystem.cs |  3 +--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index fa9a0d4eb5..dd775888a1 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -983,7 +983,7 @@ namespace osu.Game
 
                 if (newOsuScreen.HideOverlaysOnEnter)
                     CloseAllOverlays();
-                else if (!Toolbar.HiddenByUser)
+                else
                     Toolbar.Show();
 
                 if (newOsuScreen.AllowBackButton)
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 483d82200b..7497f4d210 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -26,7 +26,9 @@ namespace osu.Game.Overlays.Toolbar
         /// <summary>
         /// Whether the user hid this <see cref="Toolbar"/> with <see cref="GlobalAction.ToggleToolbar"/>.
         /// </summary>
-        public bool HiddenByUser;
+        private bool hiddenByUser;
+
+        private bool userToggled;
 
         public Action OnHome;
 
@@ -149,7 +151,9 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override void UpdateState(ValueChangedEvent<Visibility> state)
         {
-            if (state.NewValue == Visibility.Visible && OverlayActivationMode.Value == OverlayActivation.Disabled)
+            var blockShow = !userToggled && hiddenByUser;
+
+            if (state.NewValue == Visibility.Visible && (OverlayActivationMode.Value == OverlayActivation.Disabled || blockShow))
             {
                 State.Value = Visibility.Hidden;
                 return;
@@ -180,8 +184,10 @@ namespace osu.Game.Overlays.Toolbar
             switch (action)
             {
                 case GlobalAction.ToggleToolbar:
+                    userToggled = true;
                     ToggleVisibility();
-                    HiddenByUser = State.Value == Visibility.Hidden;
+                    hiddenByUser = State.Value == Visibility.Hidden;
+                    userToggled = false;
                     return true;
             }
 
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 8f1fd627f5..81b1cb0bf1 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -352,8 +352,7 @@ namespace osu.Game.Screens.Menu
                                 if (impact)
                                     logo.Impact();
 
-                                if (game?.Toolbar.HiddenByUser == false)
-                                    game.Toolbar.Show();
+                                game?.Toolbar.Show();
                             }, 200);
                             break;
 

From b13f193c8dd60573aa579bb47b06d1d02ed0b5ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Mar 2021 19:26:38 +0900
Subject: [PATCH 08474/10326] Fix incorrect task being returned for changelog
 continuations

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

diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 2da5be5e6c..eda7748367 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Overlays
                 await API.PerformAsync(req).ConfigureAwait(false);
 
                 return tcs.Task;
-            });
+            }).Unwrap();
         }
 
         private CancellationTokenSource loadContentCancellation;

From 4afbccfcff2544fa4a4e80d765a2bccb270c1658 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Mar 2021 19:30:40 +0900
Subject: [PATCH 08475/10326] Fix initial operation potentially running before
 DI is completed

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

diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index eda7748367..e7d68853ad 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Overlays
 {
     public class ChangelogOverlay : OnlineOverlay<ChangelogHeader>
     {
+        public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
+
         public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
 
         private Sample sampleBack;
@@ -126,8 +128,11 @@ namespace osu.Game.Overlays
 
         private Task initialFetchTask;
 
-        private void performAfterFetch(Action action) => fetchListing()?.ContinueWith(_ =>
-            Schedule(action), TaskContinuationOptions.OnlyOnRanToCompletion);
+        private void performAfterFetch(Action action) => Schedule(() =>
+        {
+            fetchListing()?.ContinueWith(_ =>
+                Schedule(action), TaskContinuationOptions.OnlyOnRanToCompletion);
+        });
 
         private Task fetchListing()
         {

From e70ba2d005c45bb485d3c985873fbecf99a1c71c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Mar 2021 23:29:01 +0900
Subject: [PATCH 08476/10326] Remove unnecessary second variable

---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 7497f4d210..5e2280e2fc 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -28,8 +28,6 @@ namespace osu.Game.Overlays.Toolbar
         /// </summary>
         private bool hiddenByUser;
 
-        private bool userToggled;
-
         public Action OnHome;
 
         private ToolbarUserButton userButton;
@@ -151,9 +149,9 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override void UpdateState(ValueChangedEvent<Visibility> state)
         {
-            var blockShow = !userToggled && hiddenByUser;
+            bool blockShow = hiddenByUser || OverlayActivationMode.Value == OverlayActivation.Disabled;
 
-            if (state.NewValue == Visibility.Visible && (OverlayActivationMode.Value == OverlayActivation.Disabled || blockShow))
+            if (state.NewValue == Visibility.Visible && blockShow)
             {
                 State.Value = Visibility.Hidden;
                 return;
@@ -184,10 +182,8 @@ namespace osu.Game.Overlays.Toolbar
             switch (action)
             {
                 case GlobalAction.ToggleToolbar:
-                    userToggled = true;
+                    hiddenByUser = State.Value == Visibility.Visible; // set before toggling to allow the operation to always succeed.
                     ToggleVisibility();
-                    hiddenByUser = State.Value == Visibility.Hidden;
-                    userToggled = false;
                     return true;
             }
 

From a227b0a581103004c10e767f0511f01bb8af2fbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Mar 2021 23:29:47 +0900
Subject: [PATCH 08477/10326] Build on xmldoc with rationale

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 5e2280e2fc..d049c2d3ec 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Overlays.Toolbar
 
         /// <summary>
         /// Whether the user hid this <see cref="Toolbar"/> with <see cref="GlobalAction.ToggleToolbar"/>.
+        /// In this state, automatic toggles should not occur, respecting the user's preference to have no toolbar.
         /// </summary>
         private bool hiddenByUser;
 

From 779c55d768a6723c1735ef92a26fedaec1dd6760 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 13 Mar 2021 06:05:08 +0300
Subject: [PATCH 08478/10326] Fix potentially adding null legacy text to
 hierarchy

---
 .../Skinning/Legacy/LegacySpinner.cs          | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index b0b9cba2bd..610eb54316 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -47,7 +47,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            AddInternal(new Container
+            Container overlayContainer;
+
+            AddInternal(overlayContainer = new Container
             {
                 Depth = float.MinValue,
                 RelativeSizeAxes = Axes.Both,
@@ -70,17 +72,21 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Scale = new Vector2(SPRITE_SCALE),
                         Y = SPINNER_TOP_OFFSET + 115,
                     },
-                    bonusCounter = ((LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))).With(s =>
-                    {
-                        s.Alpha = 0f;
-                        s.Anchor = Anchor.TopCentre;
-                        s.Origin = Anchor.Centre;
-                        s.Font = s.Font.With(fixedWidth: false);
-                        s.Scale = new Vector2(SPRITE_SCALE);
-                        s.Y = SPINNER_TOP_OFFSET + 299;
-                    }),
                 }
             });
+
+            bonusCounter = (LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText));
+
+            if (bonusCounter != null)
+            {
+                bonusCounter.Alpha = 0f;
+                bonusCounter.Anchor = Anchor.TopCentre;
+                bonusCounter.Origin = Anchor.Centre;
+                bonusCounter.Font = bonusCounter.Font.With(fixedWidth: false);
+                bonusCounter.Scale = new Vector2(SPRITE_SCALE);
+                bonusCounter.Y = SPINNER_TOP_OFFSET + 299;
+                overlayContainer.Add(bonusCounter);
+            }
         }
 
         private IBindable<double> gainedBonus;
@@ -91,13 +97,16 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             base.LoadComplete();
 
-            gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
-            gainedBonus.BindValueChanged(bonus =>
+            if (bonusCounter != null)
             {
-                bonusCounter.Text = $"{bonus.NewValue}";
-                bonusCounter.FadeOutFromOne(800, Easing.Out);
-                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
-            });
+                gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
+                gainedBonus.BindValueChanged(bonus =>
+                {
+                    bonusCounter.Text = $"{bonus.NewValue}";
+                    bonusCounter.FadeOutFromOne(800, Easing.Out);
+                    bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+                });
+            }
 
             completed.BindValueChanged(onCompletedChanged, true);
 

From 8b74666cc339416b2b3f443c8dfdbb518c2f2148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 14 Mar 2021 15:51:38 +0100
Subject: [PATCH 08479/10326] Add support for pooling explosions in taiko

---
 .../Skinning/TestSceneHitExplosion.cs         |  4 +-
 .../Skinning/Legacy/LegacyHitExplosion.cs     | 51 +++++-------
 .../UI/DefaultHitExplosion.cs                 | 41 +++++++---
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs    | 80 ++++++++++++++-----
 .../UI/HitExplosionPool.cs                    | 24 ++++++
 osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs   | 23 ++++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 11 ++-
 7 files changed, 170 insertions(+), 64 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/UI/HitExplosionPool.cs
 create mode 100644 osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index fecb5d4a74..ba6e04c92e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -38,11 +38,11 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     // the hit needs to be added to hierarchy in order for nested objects to be created correctly.
                     // setting zero alpha is supposed to prevent the test from looking broken.
                     hit.With(h => h.Alpha = 0),
-                    new HitExplosion(hit, hit.Type)
+                    new HitExplosion(hit.Type)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                    }
+                    }.With(explosion => explosion.Apply(hit))
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
index 651cdd6438..9734e12413 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
@@ -1,22 +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 System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.UI;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
-    public class LegacyHitExplosion : CompositeDrawable
+    public class LegacyHitExplosion : CompositeDrawable, IHitExplosion
     {
-        private readonly Drawable sprite;
-        private readonly Drawable strongSprite;
+        public override bool RemoveWhenNotAlive => false;
 
-        private DrawableStrongNestedHit nestedStrongHit;
-        private bool switchedToStrongSprite;
+        private readonly Drawable sprite;
+
+        [CanBeNull]
+        private readonly Drawable strongSprite;
 
         /// <summary>
         /// Creates a new legacy hit explosion.
@@ -27,14 +29,14 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         /// </remarks>
         /// <param name="sprite">The normal legacy explosion sprite.</param>
         /// <param name="strongSprite">The strong legacy explosion sprite.</param>
-        public LegacyHitExplosion(Drawable sprite, Drawable strongSprite = null)
+        public LegacyHitExplosion(Drawable sprite, [CanBeNull] Drawable strongSprite = null)
         {
             this.sprite = sprite;
             this.strongSprite = strongSprite;
         }
 
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject judgedObject)
+        private void load()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -56,17 +58,15 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     s.Origin = Anchor.Centre;
                 }));
             }
-
-            if (judgedObject is DrawableHit hit)
-                nestedStrongHit = hit.NestedHitObjects.SingleOrDefault() as DrawableStrongNestedHit;
         }
 
-        protected override void LoadComplete()
+        public void Animate(DrawableHitObject drawableHitObject)
         {
-            base.LoadComplete();
-
             const double animation_time = 120;
 
+            (sprite as IFramedAnimation)?.GotoFrame(0);
+            (strongSprite as IFramedAnimation)?.GotoFrame(0);
+
             this.FadeInFromZero(animation_time).Then().FadeOut(animation_time * 1.5);
 
             this.ScaleTo(0.6f)
@@ -77,24 +77,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             Expire(true);
         }
 
-        protected override void Update()
+        public void AnimateSecondHit()
         {
-            base.Update();
+            if (strongSprite == null)
+                return;
 
-            if (shouldSwitchToStrongSprite() && !switchedToStrongSprite)
-            {
-                sprite.FadeOut(50, Easing.OutQuint);
-                strongSprite.FadeIn(50, Easing.OutQuint);
-                switchedToStrongSprite = true;
-            }
-        }
-
-        private bool shouldSwitchToStrongSprite()
-        {
-            if (nestedStrongHit == null || strongSprite == null)
-                return false;
-
-            return nestedStrongHit.IsHit;
+            sprite.FadeOut(50, Easing.OutQuint);
+            strongSprite.FadeIn(50, Easing.OutQuint);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
index 3bd20e4bb4..2519573ce9 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -13,19 +14,25 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    internal class DefaultHitExplosion : CircularContainer
+    internal class DefaultHitExplosion : CircularContainer, IHitExplosion
     {
-        private readonly DrawableHitObject judgedObject;
+        public override bool RemoveWhenNotAlive => false;
+
         private readonly HitResult result;
 
-        public DefaultHitExplosion(DrawableHitObject judgedObject, HitResult result)
+        [CanBeNull]
+        private Box body;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public DefaultHitExplosion(HitResult result)
         {
-            this.judgedObject = judgedObject;
             this.result = result;
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -40,26 +47,38 @@ namespace osu.Game.Rulesets.Taiko.UI
             if (!result.IsHit())
                 return;
 
-            bool isRim = (judgedObject.HitObject as Hit)?.Type == HitType.Rim;
-
             InternalChildren = new[]
             {
-                new Box
+                body = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = isRim ? colours.BlueDarker : colours.PinkDarker,
                 }
             };
+
+            updateColour();
         }
 
-        protected override void LoadComplete()
+        private void updateColour([CanBeNull] DrawableHitObject judgedObject = null)
         {
-            base.LoadComplete();
+            if (body == null)
+                return;
+
+            bool isRim = (judgedObject?.HitObject as Hit)?.Type == HitType.Rim;
+            body.Colour = isRim ? colours.BlueDarker : colours.PinkDarker;
+        }
+
+        public void Animate(DrawableHitObject drawableHitObject)
+        {
+            updateColour(drawableHitObject);
 
             this.ScaleTo(3f, 1000, Easing.OutQuint);
             this.FadeOut(500);
 
             Expire(true);
         }
+
+        public void AnimateSecondHit()
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index d1fb3348b9..d2ae36a03e 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -16,31 +18,35 @@ namespace osu.Game.Rulesets.Taiko.UI
     /// <summary>
     /// A circle explodes from the hit target to indicate a hitobject has been hit.
     /// </summary>
-    internal class HitExplosion : CircularContainer
+    internal class HitExplosion : PoolableDrawable
     {
         public override bool RemoveWhenNotAlive => true;
-
-        [Cached(typeof(DrawableHitObject))]
-        public readonly DrawableHitObject JudgedObject;
+        public override bool RemoveCompletedTransforms => false;
 
         private readonly HitResult result;
 
+        [CanBeNull]
+        public DrawableHitObject JudgedObject;
+
         private SkinnableDrawable skinnable;
 
-        public override double LifetimeStart => skinnable.Drawable.LifetimeStart;
-
-        public override double LifetimeEnd => skinnable.Drawable.LifetimeEnd;
-
-        public HitExplosion(DrawableHitObject judgedObject, HitResult result)
+        /// <summary>
+        /// This constructor only exists to meet the <c>new()</c> type constraint of <see cref="DrawablePool{T}"/>.
+        /// </summary>
+        public HitExplosion()
+            : this(HitResult.Great)
+        {
+        }
+
+        public HitExplosion(HitResult result)
         {
-            JudgedObject = judgedObject;
             this.result = result;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            RelativeSizeAxes = Axes.Both;
             Size = new Vector2(TaikoHitObject.DEFAULT_SIZE);
+            RelativeSizeAxes = Axes.Both;
 
             RelativePositionAxes = Axes.Both;
         }
@@ -48,7 +54,44 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(result)), _ => new DefaultHitExplosion(JudgedObject, result));
+            InternalChild = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(result)), _ => new DefaultHitExplosion(result));
+            skinnable.OnSkinChanged += runAnimation;
+        }
+
+        public void Apply([CanBeNull] DrawableHitObject drawableHitObject)
+        {
+            JudgedObject = drawableHitObject;
+        }
+
+        protected override void PrepareForUse()
+        {
+            base.PrepareForUse();
+            runAnimation();
+        }
+
+        protected override void FreeAfterUse()
+        {
+            base.FreeAfterUse();
+
+            // clean up transforms on free instead of on prepare as is usually the case
+            // to avoid potentially overriding the effects of VisualiseSecondHit() in the case it is called before PrepareForUse().
+            ApplyTransformsAt(double.MinValue, true);
+            ClearTransforms(true);
+        }
+
+        private void runAnimation()
+        {
+            if (JudgedObject?.Result == null)
+                return;
+
+            double resultTime = JudgedObject.Result.TimeAbsolute;
+
+            LifetimeStart = resultTime;
+
+            using (BeginAbsoluteSequence(resultTime))
+                (skinnable.Drawable as IHitExplosion)?.Animate(JudgedObject);
+
+            LifetimeEnd = skinnable.Drawable.LatestTransformEndTime;
         }
 
         private static TaikoSkinComponents getComponentName(HitResult result)
@@ -68,12 +111,13 @@ namespace osu.Game.Rulesets.Taiko.UI
             throw new ArgumentOutOfRangeException(nameof(result), $"Invalid result type: {result}");
         }
 
-        /// <summary>
-        /// Transforms this hit explosion to visualise a secondary hit.
-        /// </summary>
-        public void VisualiseSecondHit()
+        public void VisualiseSecondHit(JudgementResult judgementResult)
         {
-            this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
+            using (BeginAbsoluteSequence(judgementResult.TimeAbsolute))
+            {
+                this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
+                (skinnable.Drawable as IHitExplosion)?.AnimateSecondHit();
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosionPool.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosionPool.cs
new file mode 100644
index 0000000000..badf34554c
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosionPool.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.Pooling;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    /// <summary>
+    /// Pool for hit explosions of a specific type.
+    /// </summary>
+    internal class HitExplosionPool : DrawablePool<HitExplosion>
+    {
+        private readonly HitResult hitResult;
+
+        public HitExplosionPool(HitResult hitResult)
+            : base(15)
+        {
+            this.hitResult = hitResult;
+        }
+
+        protected override HitExplosion CreateNewDrawable() => new HitExplosion(hitResult);
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs
new file mode 100644
index 0000000000..7af941d1ba
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs
@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    /// <summary>
+    /// Interface for hit explosions shown on the playfield's hit target in taiko.
+    /// </summary>
+    public interface IHitExplosion
+    {
+        /// <summary>
+        /// Shows the hit explosion for the supplied <paramref name="drawableHitObject"/>.
+        /// </summary>
+        void Animate(DrawableHitObject drawableHitObject);
+
+        /// <summary>
+        /// Transforms the hit explosion to visualise a secondary hit.
+        /// </summary>
+        void AnimateSecondHit();
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index d2e7b604bb..46dafc3a30 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private SkinnableDrawable mascot;
 
         private readonly IDictionary<HitResult, DrawablePool<DrawableTaikoJudgement>> judgementPools = new Dictionary<HitResult, DrawablePool<DrawableTaikoJudgement>>();
+        private readonly IDictionary<HitResult, HitExplosionPool> explosionPools = new Dictionary<HitResult, HitExplosionPool>();
 
         private ProxyContainer topLevelHitContainer;
         private Container rightArea;
@@ -166,10 +167,15 @@ namespace osu.Game.Rulesets.Taiko.UI
             RegisterPool<SwellTick, DrawableSwellTick>(100);
 
             var hitWindows = new TaikoHitWindows();
+
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => hitWindows.IsHitResultAllowed(r)))
+            {
                 judgementPools.Add(result, new DrawablePool<DrawableTaikoJudgement>(15));
+                explosionPools.Add(result, new HitExplosionPool(result));
+            }
 
             AddRangeInternal(judgementPools.Values);
+            AddRangeInternal(explosionPools.Values);
         }
 
         protected override void LoadComplete()
@@ -281,7 +287,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             {
                 case TaikoStrongJudgement _:
                     if (result.IsHit)
-                        hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongNestedHit)judgedObject).ParentHitObject)?.VisualiseSecondHit();
+                        hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongNestedHit)judgedObject).ParentHitObject)?.VisualiseSecondHit(result);
                     break;
 
                 case TaikoDrumRollTickJudgement _:
@@ -315,7 +321,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private void addExplosion(DrawableHitObject drawableObject, HitResult result, HitType type)
         {
-            hitExplosionContainer.Add(new HitExplosion(drawableObject, result));
+            hitExplosionContainer.Add(explosionPools[result]
+                .Get(explosion => explosion.Apply(drawableObject)));
             if (drawableObject.HitObject.Kiai)
                 kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
         }

From 00306c007529f176d92666f445a8ef7219787cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 14 Mar 2021 15:56:34 +0100
Subject: [PATCH 08480/10326] Adjust test code after explosion pooling changes

---
 .../Skinning/TestSceneHitExplosion.cs         | 19 ++++++++++++++-----
 .../TestSceneHits.cs                          | 10 +++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index ba6e04c92e..61ea8b664d 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -2,8 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.UI;
@@ -13,6 +17,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     [TestFixture]
     public class TestSceneHitExplosion : TaikoSkinnableTestScene
     {
+        protected override double TimePerAction => 100;
+
         [Test]
         public void TestNormalHit()
         {
@@ -21,11 +27,14 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             AddStep("Miss", () => SetContents(() => getContentFor(createHit(HitResult.Miss))));
         }
 
-        [Test]
-        public void TestStrongHit([Values(false, true)] bool hitBoth)
+        [TestCase(HitResult.Great)]
+        [TestCase(HitResult.Ok)]
+        public void TestStrongHit(HitResult type)
         {
-            AddStep("Great", () => SetContents(() => getContentFor(createStrongHit(HitResult.Great, hitBoth))));
-            AddStep("Good", () => SetContents(() => getContentFor(createStrongHit(HitResult.Ok, hitBoth))));
+            AddStep("create hit", () => SetContents(() => getContentFor(createStrongHit(type))));
+            AddStep("visualise second hit",
+                () => this.ChildrenOfType<HitExplosion>()
+                          .ForEach(e => e.VisualiseSecondHit(new JudgementResult(new HitObject { StartTime = Time.Current }, new Judgement()))));
         }
 
         private Drawable getContentFor(DrawableTestHit hit)
@@ -49,6 +58,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         private DrawableTestHit createHit(HitResult type) => new DrawableTestHit(new Hit { StartTime = Time.Current }, type);
 
-        private DrawableTestHit createStrongHit(HitResult type, bool hitBoth) => new DrawableTestStrongHit(Time.Current, type, hitBoth);
+        private DrawableTestHit createStrongHit(HitResult type) => new DrawableTestStrongHit(Time.Current, type);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 7695ca067b..87c936d386 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -11,7 +11,6 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -108,12 +107,12 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Ok : HitResult.Great;
 
-            Hit hit = new Hit();
+            Hit hit = new Hit { StartTime = DrawableRuleset.Playfield.Time.Current };
             var h = new DrawableTestHit(hit, kiai: kiai) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
 
             DrawableRuleset.Playfield.Add(h);
 
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
         }
 
         private void addStrongHitJudgement(bool kiai)
@@ -122,6 +121,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             Hit hit = new Hit
             {
+                StartTime = DrawableRuleset.Playfield.Time.Current,
                 IsStrong = true,
                 Samples = createSamples(strong: true)
             };
@@ -129,8 +129,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableRuleset.Playfield.Add(h);
 
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(), new JudgementResult(new HitObject(), new TaikoStrongJudgement()) { Type = HitResult.Great });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(), new JudgementResult(hit.NestedHitObjects.Single(), new TaikoStrongJudgement()) { Type = HitResult.Great });
         }
 
         private void addMissJudgement()

From 0a1e325fc774f371785ba95b618f71bd0637bb2e Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Sun, 14 Mar 2021 19:34:53 +0300
Subject: [PATCH 08481/10326] Extract requerying of navigational properties
 from DbContext

---
 osu.Game/Beatmaps/BeatmapManager.cs | 16 +----------
 osu.Game/Database/Extensions.cs     | 44 +++++++++++++++++++++++++++++
 osu.Game/Scoring/ScoreManager.cs    | 14 +--------
 osu.Game/Skinning/SkinManager.cs    |  9 +-----
 4 files changed, 47 insertions(+), 36 deletions(-)
 create mode 100644 osu.Game/Database/Extensions.cs

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 3254f53574..f42fba79cb 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -174,21 +174,7 @@ namespace osu.Game.Beatmaps
             if (beatmapSet.Beatmaps.Any(b => b.BaseDifficulty == null))
                 throw new InvalidOperationException($"Cannot import {nameof(BeatmapInfo)} with null {nameof(BeatmapInfo.BaseDifficulty)}.");
 
-            var dbContext = ContextFactory.Get();
-
-            // Workaround System.InvalidOperationException
-            // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-            foreach (var beatmap in beatmapSet.Beatmaps)
-            {
-                beatmap.Ruleset = dbContext.RulesetInfo.Find(beatmap.RulesetID);
-            }
-
-            // Workaround System.InvalidOperationException
-            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-            foreach (var file in beatmapSet.Files)
-            {
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
+            beatmapSet.Requery(ContextFactory);
 
             // check if a set already exists with the same online id, delete if it does.
             if (beatmapSet.OnlineBeatmapSetID != null)
diff --git a/osu.Game/Database/Extensions.cs b/osu.Game/Database/Extensions.cs
new file mode 100644
index 0000000000..3af26c348e
--- /dev/null
+++ b/osu.Game/Database/Extensions.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 System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Scoring;
+
+namespace osu.Game.Database
+{
+    public static class Extensions
+    {
+        public static void Requery(this BeatmapSetInfo beatmapSetInfo, IDatabaseContextFactory databaseContextFactory)
+        {
+            var dbContext = databaseContextFactory.Get();
+
+            foreach (var beatmap in beatmapSetInfo.Beatmaps)
+            {
+                // Workaround System.InvalidOperationException
+                // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+                beatmap.Ruleset = dbContext.RulesetInfo.Find(beatmap.RulesetID);
+            }
+
+            beatmapSetInfo.Files.Requery(databaseContextFactory);
+        }
+
+        public static void Requery(this ScoreInfo scoreInfo, IDatabaseContextFactory databaseContextFactory)
+        {
+            scoreInfo.Files.Requery(databaseContextFactory);
+            scoreInfo.Beatmap.BeatmapSet.Files.Requery(databaseContextFactory);
+        }
+
+        public static void Requery<T>(this List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+        {
+            var dbContext = databaseContextFactory.Get();
+
+            foreach (var file in files)
+            {
+                // Workaround System.InvalidOperationException
+                // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index a97c516a1b..1e90ee1ac7 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -54,19 +54,7 @@ namespace osu.Game.Scoring
 
         protected override void PreImport(ScoreInfo model)
         {
-            var dbContext = ContextFactory.Get();
-
-            // Workaround System.InvalidOperationException
-            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-            foreach (var file in model.Files)
-            {
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
-
-            foreach (var file in model.Beatmap.BeatmapSet.Files)
-            {
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
+            model.Requery(ContextFactory);
         }
 
         protected override ScoreInfo CreateModel(ArchiveReader archive)
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 2bb27b60d6..c25f00eccb 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -144,14 +144,7 @@ namespace osu.Game.Skinning
 
         protected override void PreImport(SkinInfo model)
         {
-            var dbContext = ContextFactory.Get();
-
-            // Workaround System.InvalidOperationException
-            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-            foreach (var file in model.Files)
-            {
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
+            model.Files.Requery(ContextFactory);
         }
 
         /// <summary>

From 61d5a6cc57941cab31e2abb0acee00c8fad3f80f Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Sun, 14 Mar 2021 19:47:14 +0300
Subject: [PATCH 08482/10326] Simplify Microsoft.EntityFrameworkCore.Design
 PackageReference

---
 osu.Desktop/osu.Desktop.csproj | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 4af69c573d..d9d23dea6b 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -28,10 +28,7 @@
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.4" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>

From 28ef64b62a5d873110a163c4275fb48c9c47b262 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Sun, 14 Mar 2021 21:43:27 +0300
Subject: [PATCH 08483/10326] Explicitly specify SingleQuery behavior

---
 osu.Game/Database/OsuDbContext.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index 689f248de8..e5ae530018 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -3,7 +3,6 @@
 
 using System;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Logging;
 using osu.Framework.Logging;
 using osu.Framework.Statistics;
@@ -111,8 +110,7 @@ namespace osu.Game.Database
         {
             base.OnConfiguring(optionsBuilder);
             optionsBuilder
-                .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10))
-                .ConfigureWarnings(w => w.Ignore(RelationalEventId.MultipleCollectionIncludeWarning))
+                .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10).UseQuerySplittingBehavior(QuerySplittingBehavior.SingleQuery))
                 .UseLoggerFactory(logger.Value);
         }
 

From 900da7b891c3a74faa3ebbe0f030e9cf3350b273 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 12:42:41 +0900
Subject: [PATCH 08484/10326] Rename and refactor extenion methods to be easier
 to read

---
 .../Database/DatabaseWorkaroundExtensions.cs  | 48 +++++++++++++++++++
 osu.Game/Database/Extensions.cs               | 44 -----------------
 2 files changed, 48 insertions(+), 44 deletions(-)
 create mode 100644 osu.Game/Database/DatabaseWorkaroundExtensions.cs
 delete mode 100644 osu.Game/Database/Extensions.cs

diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
new file mode 100644
index 0000000000..07ce7e8529
--- /dev/null
+++ b/osu.Game/Database/DatabaseWorkaroundExtensions.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.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Scoring;
+
+namespace osu.Game.Database
+{
+    public static class DatabaseWorkaroundExtensions
+    {
+        public static void Requery(this IHasPrimaryKey model, IDatabaseContextFactory contextFactory)
+        {
+            switch (model)
+            {
+                case ScoreInfo scoreInfo:
+                    scoreInfo.Beatmap.BeatmapSet.Requery(contextFactory);
+                    scoreInfo.Files.RequeryFiles(contextFactory);
+                    break;
+
+                case BeatmapSetInfo beatmapSetInfo:
+                    var context = contextFactory.Get();
+
+                    foreach (var beatmap in beatmapSetInfo.Beatmaps)
+                    {
+                        // Workaround System.InvalidOperationException
+                        // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+                        beatmap.Ruleset = context.RulesetInfo.Find(beatmap.RulesetID);
+                    }
+
+                    requeryFiles(beatmapSetInfo.Files, contextFactory);
+                    break;
+            }
+        }
+
+        public static void RequeryFiles<T>(this List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+        {
+            var dbContext = databaseContextFactory.Get();
+
+            foreach (var file in files)
+            {
+                // Workaround System.InvalidOperationException
+                // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Database/Extensions.cs b/osu.Game/Database/Extensions.cs
deleted file mode 100644
index 3af26c348e..0000000000
--- a/osu.Game/Database/Extensions.cs
+++ /dev/null
@@ -1,44 +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.Beatmaps;
-using osu.Game.Scoring;
-
-namespace osu.Game.Database
-{
-    public static class Extensions
-    {
-        public static void Requery(this BeatmapSetInfo beatmapSetInfo, IDatabaseContextFactory databaseContextFactory)
-        {
-            var dbContext = databaseContextFactory.Get();
-
-            foreach (var beatmap in beatmapSetInfo.Beatmaps)
-            {
-                // Workaround System.InvalidOperationException
-                // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                beatmap.Ruleset = dbContext.RulesetInfo.Find(beatmap.RulesetID);
-            }
-
-            beatmapSetInfo.Files.Requery(databaseContextFactory);
-        }
-
-        public static void Requery(this ScoreInfo scoreInfo, IDatabaseContextFactory databaseContextFactory)
-        {
-            scoreInfo.Files.Requery(databaseContextFactory);
-            scoreInfo.Beatmap.BeatmapSet.Files.Requery(databaseContextFactory);
-        }
-
-        public static void Requery<T>(this List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
-        {
-            var dbContext = databaseContextFactory.Get();
-
-            foreach (var file in files)
-            {
-                // Workaround System.InvalidOperationException
-                // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
-        }
-    }
-}

From 2bdffd10044984ea0a5639754b8ecff8f4fc979b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 12:47:58 +0900
Subject: [PATCH 08485/10326] Move skin requery logic into extension methods

---
 .../Database/DatabaseWorkaroundExtensions.cs  | 19 +++++++++++++++++--
 osu.Game/Skinning/SkinManager.cs              |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
index 07ce7e8529..39bf358071 100644
--- a/osu.Game/Database/DatabaseWorkaroundExtensions.cs
+++ b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
@@ -1,21 +1,36 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
+using osu.Game.Skinning;
 
 namespace osu.Game.Database
 {
+    /// <summary>
+    /// Extension methods which contain workarounds to make EFcore 5.x work with our existing (incorrect) thread safety.
+    /// The intention is to avoid blocking package updates while we consider the future of the database backend, with a potential backend switch imminent.
+    /// </summary>
     public static class DatabaseWorkaroundExtensions
     {
+        /// <summary>
+        /// Re-query the provided model to ensure it is in a sane state. This method requires explicit implementation per model type.
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="contextFactory"></param>
         public static void Requery(this IHasPrimaryKey model, IDatabaseContextFactory contextFactory)
         {
             switch (model)
             {
+                case SkinInfo skinInfo:
+                    requeryFiles(skinInfo.Files, contextFactory);
+                    break;
+
                 case ScoreInfo scoreInfo:
                     scoreInfo.Beatmap.BeatmapSet.Requery(contextFactory);
-                    scoreInfo.Files.RequeryFiles(contextFactory);
+                    requeryFiles(scoreInfo.Files, contextFactory);
                     break;
 
                 case BeatmapSetInfo beatmapSetInfo:
@@ -33,7 +48,7 @@ namespace osu.Game.Database
             }
         }
 
-        public static void RequeryFiles<T>(this List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+        private static void requeryFiles<T>(List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
         {
             var dbContext = databaseContextFactory.Get();
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index c25f00eccb..601b77e782 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Skinning
 
         protected override void PreImport(SkinInfo model)
         {
-            model.Files.Requery(ContextFactory);
+            model.Requery(ContextFactory);
         }
 
         /// <summary>

From 8a3553388972349a6833afcf915f44a7dae19995 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 12:48:23 +0900
Subject: [PATCH 08486/10326] Add fall-through case to catch a potential
 requery for unsupported model type

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

diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
index 39bf358071..1d5c98ed8d 100644
--- a/osu.Game/Database/DatabaseWorkaroundExtensions.cs
+++ b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
@@ -45,6 +45,9 @@ namespace osu.Game.Database
 
                     requeryFiles(beatmapSetInfo.Files, contextFactory);
                     break;
+
+                default:
+                    throw new ArgumentException($"{nameof(Requery)} does not have support for the provided model type", nameof(model));
             }
         }
 

From 1573298e682329d133059a74dd56c8c849b86bba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 13:12:10 +0900
Subject: [PATCH 08487/10326] Update remaining package references to point to
 efcore5

---
 .../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.iOS.props                                                   | 2 --
 6 files changed, 5 insertions(+), 7 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 728af5124e..42f70151ac 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
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 af16f39563..e51b20c9fe 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
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 3d2d1f3fec..f1f75148ef 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
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 fa00922706..c9a320bdd5 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index e36b3cdc74..6f8e0fac6f 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -6,7 +6,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
     <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.iOS.props b/osu.iOS.props
index ccd33bf88c..71fcdd45f3 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -90,8 +90,6 @@
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
-    <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="2021.309.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />

From 79d3379f55b2b23dbfdd613c58adc8a8b3259768 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 13:20:22 +0900
Subject: [PATCH 08488/10326] Reformat application of configuration

---
 osu.Game/Database/OsuDbContext.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index e5ae530018..2342ab07d4 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -110,7 +110,10 @@ namespace osu.Game.Database
         {
             base.OnConfiguring(optionsBuilder);
             optionsBuilder
-                .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10).UseQuerySplittingBehavior(QuerySplittingBehavior.SingleQuery))
+                .UseSqlite(connectionString,
+                    sqliteOptions => sqliteOptions
+                                     .CommandTimeout(10)
+                                     .UseQuerySplittingBehavior(QuerySplittingBehavior.SingleQuery))
                 .UseLoggerFactory(logger.Value);
         }
 

From 2904f479c65bf9f2cd76a3164ab51d13ff53dc96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 13:26:14 +0900
Subject: [PATCH 08489/10326] Share file lookup workaround in
 ArchiveModelManager with workaround extensions class

---
 osu.Game/Database/ArchiveModelManager.cs      |  4 +---
 .../Database/DatabaseWorkaroundExtensions.cs  | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index fe2caaa0b7..31c365b478 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -462,9 +462,7 @@ namespace osu.Game.Database
                 // Dereference the existing file info, since the file model will be removed.
                 if (file.FileInfo != null)
                 {
-                    // Workaround System.InvalidOperationException
-                    // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                    file.FileInfo = usage.Context.FileInfo.Find(file.FileInfoID);
+                    file.Requery(usage.Context);
 
                     Files.Dereference(file.FileInfo);
 
diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
index 1d5c98ed8d..8ac05f78e0 100644
--- a/osu.Game/Database/DatabaseWorkaroundExtensions.cs
+++ b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
@@ -49,18 +49,23 @@ namespace osu.Game.Database
                 default:
                     throw new ArgumentException($"{nameof(Requery)} does not have support for the provided model type", nameof(model));
             }
+
+            void requeryFiles<T>(List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+            {
+                var dbContext = databaseContextFactory.Get();
+
+                foreach (var file in files)
+                {
+                    Requery(file, dbContext);
+                }
+            }
         }
 
-        private static void requeryFiles<T>(List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+        public static void Requery(this INamedFileInfo file, OsuDbContext dbContext)
         {
-            var dbContext = databaseContextFactory.Get();
-
-            foreach (var file in files)
-            {
-                // Workaround System.InvalidOperationException
-                // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
+            // Workaround System.InvalidOperationException
+            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+            file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
         }
     }
 }

From fce21f23d687ab72be391c23987ad1edff8740f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 13:29:26 +0900
Subject: [PATCH 08490/10326] Add comments marking workarounds required for
 EFcore 5

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs   | 2 +-
 .../Visual/SongSelect/TestSceneBeatmapRecommendations.cs        | 2 +-
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs     | 2 +-
 osu.Game/Database/ArchiveModelManager.cs                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index 4a9eaa1842..8cfe5d8af2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 beatmaps.Add(new BeatmapInfo
                 {
                     Ruleset = rulesets.GetRuleset(i % 4),
-                    RulesetID = i % 4,
+                    RulesetID = i % 4, // workaround for efcore 5 compatibility.
                     OnlineBeatmapID = beatmapId,
                     Length = length,
                     BPM = bpm,
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 223ace6ca5..9b8b74e6f6 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -186,7 +186,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Metadata = metadata,
                     BaseDifficulty = new BeatmapDifficulty(),
                     Ruleset = ruleset,
-                    RulesetID = ruleset.ID.GetValueOrDefault(),
+                    RulesetID = ruleset.ID.GetValueOrDefault(), // workaround for efcore 5 compatibility.
                     StarDifficulty = difficultyIndex + 1,
                     Version = $"SR{difficultyIndex + 1}"
                 }).ToList()
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 4b402d0c54..2d192ae207 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -915,7 +915,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 beatmaps.Add(new BeatmapInfo
                 {
                     Ruleset = ruleset,
-                    RulesetID = ruleset.ID.GetValueOrDefault(),
+                    RulesetID = ruleset.ID.GetValueOrDefault(), // workaround for efcore 5 compatibility.
                     OnlineBeatmapID = beatmapId,
                     Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss}, bpm {bpm:0.#})",
                     Length = length,
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 31c365b478..64428882ac 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -642,7 +642,7 @@ namespace osu.Game.Database
                     {
                         Filename = file.Substring(prefix.Length).ToStandardisedPath(),
                         FileInfo = fileInfo,
-                        FileInfoID = fileInfo.ID
+                        FileInfoID = fileInfo.ID // workaround for efcore 5 compatibility.
                     });
                 }
             }

From 6d4c1ba2aee43c9fdab49f83ba16c0bcdedcce78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 13:35:08 +0900
Subject: [PATCH 08491/10326] Fix a couple of new inspections introduced in
 Rider EAPs

---
 osu.Game/Beatmaps/BeatmapConverter.cs             | 10 +++++-----
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs |  3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapConverter.cs b/osu.Game/Beatmaps/BeatmapConverter.cs
index cb0b3a8d09..b291edd19d 100644
--- a/osu.Game/Beatmaps/BeatmapConverter.cs
+++ b/osu.Game/Beatmaps/BeatmapConverter.cs
@@ -17,12 +17,12 @@ namespace osu.Game.Beatmaps
     public abstract class BeatmapConverter<T> : IBeatmapConverter
         where T : HitObject
     {
-        private event Action<HitObject, IEnumerable<HitObject>> ObjectConverted;
+        private event Action<HitObject, IEnumerable<HitObject>> objectConverted;
 
         event Action<HitObject, IEnumerable<HitObject>> IBeatmapConverter.ObjectConverted
         {
-            add => ObjectConverted += value;
-            remove => ObjectConverted -= value;
+            add => objectConverted += value;
+            remove => objectConverted -= value;
         }
 
         public IBeatmap Beatmap { get; }
@@ -92,10 +92,10 @@ namespace osu.Game.Beatmaps
 
                 var converted = ConvertHitObject(obj, beatmap, cancellationToken);
 
-                if (ObjectConverted != null)
+                if (objectConverted != null)
                 {
                     converted = converted.ToList();
-                    ObjectConverted.Invoke(obj, converted);
+                    objectConverted.Invoke(obj, converted);
                 }
 
                 foreach (var c in converted)
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index df940e8c8e..d06478b9de 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -471,9 +471,6 @@ namespace osu.Game.Beatmaps.Formats
 
         private string toLegacyCustomSampleBank(HitSampleInfo hitSampleInfo)
         {
-            if (hitSampleInfo == null)
-                return "0";
-
             if (hitSampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy)
                 return legacy.CustomSampleBank.ToString(CultureInfo.InvariantCulture);
 

From 1e519f0d31125a3bb508be2dd97777556f69f0b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 14:20:59 +0900
Subject: [PATCH 08492/10326] Fix seemingly innocent logic change causing
 breakage in score imports

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

diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
index 8ac05f78e0..a3a982f232 100644
--- a/osu.Game/Database/DatabaseWorkaroundExtensions.cs
+++ b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Database
                     break;
 
                 case ScoreInfo scoreInfo:
-                    scoreInfo.Beatmap.BeatmapSet.Requery(contextFactory);
+                    requeryFiles(scoreInfo.Beatmap.BeatmapSet.Files, contextFactory);
                     requeryFiles(scoreInfo.Files, contextFactory);
                     break;
 

From 3dd72d6f7d229bd7cb8311e707ace797fed31d3e Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 14 Mar 2021 22:47:05 -0700
Subject: [PATCH 08493/10326] Fix disable mouse buttons setting not showing
 default indicator when using keybind

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index dd775888a1..eb34ba4a37 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -886,7 +886,9 @@ namespace osu.Game
                     return true;
 
                 case GlobalAction.ToggleGameplayMouseButtons:
-                    LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
+                    var mouseDisableButtons = LocalConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons);
+
+                    mouseDisableButtons.Value = !mouseDisableButtons.Value;
                     return true;
 
                 case GlobalAction.RandomSkin:

From 848adddd9285c3b22c93e6fa06f12c2e9f825c48 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 15 Mar 2021 11:05:29 +0300
Subject: [PATCH 08494/10326] Use `double.ToString(InvariantInfo)` instead

---
 osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs | 3 ++-
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
index 83676d3784..891821fe2f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.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.Globalization;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -58,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
             gainedBonus.BindValueChanged(bonus =>
             {
-                bonusCounter.Text = $"{bonus.NewValue}";
+                bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
                 bonusCounter.FadeOutFromOne(1500);
                 bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
             });
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 610eb54316..6d4fbd7445 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Globalization;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -102,7 +103,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
                 gainedBonus.BindValueChanged(bonus =>
                 {
-                    bonusCounter.Text = $"{bonus.NewValue}";
+                    bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
                     bonusCounter.FadeOutFromOne(800, Easing.Out);
                     bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
                 });

From 393f1fbd3f7f4169fefb1df16b689e66314e6fdf Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 15 Mar 2021 10:07:50 -0700
Subject: [PATCH 08495/10326] Remove skype

---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 1 -
 osu.Game/Users/User.cs                                    | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 2925107766..662f55317b 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -138,7 +138,6 @@ namespace osu.Game.Overlays.Profile.Header
             if (!string.IsNullOrEmpty(user.Twitter))
                 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.Solid.Link, websiteWithoutProtocol, user.Website);
 
             // If no information was added to the bottomLinkContainer, hide it to avoid unwanted padding
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 4d537b91bd..6c45417db0 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -111,9 +111,6 @@ namespace osu.Game.Users
         [JsonProperty(@"twitter")]
         public string Twitter;
 
-        [JsonProperty(@"skype")]
-        public string Skype;
-
         [JsonProperty(@"discord")]
         public string Discord;
 

From 58220481dbd71edf491a56494bafa302f8250915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 15 Mar 2021 20:38:11 +0100
Subject: [PATCH 08496/10326] Rename `I{-> Animatable}HitExplosion`

---
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs | 2 +-
 osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs             | 2 +-
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs                    | 4 ++--
 .../UI/{IHitExplosion.cs => IAnimatableHitExplosion.cs}       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game.Rulesets.Taiko/UI/{IHitExplosion.cs => IAnimatableHitExplosion.cs} (79%)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
index 9734e12413..aad9f53b93 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Taiko.UI;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
-    public class LegacyHitExplosion : CompositeDrawable, IHitExplosion
+    public class LegacyHitExplosion : CompositeDrawable, IAnimatableHitExplosion
     {
         public override bool RemoveWhenNotAlive => false;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
index 2519573ce9..5bb463353d 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
@@ -14,7 +14,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    internal class DefaultHitExplosion : CircularContainer, IHitExplosion
+    internal class DefaultHitExplosion : CircularContainer, IAnimatableHitExplosion
     {
         public override bool RemoveWhenNotAlive => false;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index d2ae36a03e..bdebe9da17 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             LifetimeStart = resultTime;
 
             using (BeginAbsoluteSequence(resultTime))
-                (skinnable.Drawable as IHitExplosion)?.Animate(JudgedObject);
+                (skinnable.Drawable as IAnimatableHitExplosion)?.Animate(JudgedObject);
 
             LifetimeEnd = skinnable.Drawable.LatestTransformEndTime;
         }
@@ -116,7 +116,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             using (BeginAbsoluteSequence(judgementResult.TimeAbsolute))
             {
                 this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
-                (skinnable.Drawable as IHitExplosion)?.AnimateSecondHit();
+                (skinnable.Drawable as IAnimatableHitExplosion)?.AnimateSecondHit();
             }
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/IAnimatableHitExplosion.cs
similarity index 79%
rename from osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs
rename to osu.Game.Rulesets.Taiko/UI/IAnimatableHitExplosion.cs
index 7af941d1ba..cf0f5f9fb6 100644
--- a/osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/IAnimatableHitExplosion.cs
@@ -6,9 +6,9 @@ using osu.Game.Rulesets.Objects.Drawables;
 namespace osu.Game.Rulesets.Taiko.UI
 {
     /// <summary>
-    /// Interface for hit explosions shown on the playfield's hit target in taiko.
+    /// A skinnable element of a hit explosion that supports playing an animation from the current point in time.
     /// </summary>
-    public interface IHitExplosion
+    public interface IAnimatableHitExplosion
     {
         /// <summary>
         /// Shows the hit explosion for the supplied <paramref name="drawableHitObject"/>.

From f4e508b57051e887a00a8f4649e4616b762a8c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 15 Mar 2021 20:43:30 +0100
Subject: [PATCH 08497/10326] Remove unnecessary overrides

---
 osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs             | 2 --
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs | 2 --
 2 files changed, 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index 69b81d6d5c..1b5d576c1e 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Rulesets.Mania.UI
     {
         private const float default_large_faint_size = 0.8f;
 
-        public override bool RemoveWhenNotAlive => true;
-
         [Resolved]
         private Column column { get; set; }
 
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
index aad9f53b93..bef9279bac 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
@@ -13,8 +13,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyHitExplosion : CompositeDrawable, IAnimatableHitExplosion
     {
-        public override bool RemoveWhenNotAlive => false;
-
         private readonly Drawable sprite;
 
         [CanBeNull]

From 72c18fbdfe8f91798a1adf16ca1f92ecbc593ae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 15 Mar 2021 20:48:19 +0100
Subject: [PATCH 08498/10326] Restructure explosion animation to avoid
 resetting transforms on free

---
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index bdebe9da17..8f5e9e54ab 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private readonly HitResult result;
 
+        private double? secondHitTime;
+
         [CanBeNull]
         public DrawableHitObject JudgedObject;
 
@@ -61,6 +63,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         public void Apply([CanBeNull] DrawableHitObject drawableHitObject)
         {
             JudgedObject = drawableHitObject;
+            secondHitTime = null;
         }
 
         protected override void PrepareForUse()
@@ -69,16 +72,6 @@ namespace osu.Game.Rulesets.Taiko.UI
             runAnimation();
         }
 
-        protected override void FreeAfterUse()
-        {
-            base.FreeAfterUse();
-
-            // clean up transforms on free instead of on prepare as is usually the case
-            // to avoid potentially overriding the effects of VisualiseSecondHit() in the case it is called before PrepareForUse().
-            ApplyTransformsAt(double.MinValue, true);
-            ClearTransforms(true);
-        }
-
         private void runAnimation()
         {
             if (JudgedObject?.Result == null)
@@ -88,9 +81,21 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             LifetimeStart = resultTime;
 
+            ApplyTransformsAt(double.MinValue, true);
+            ClearTransforms(true);
+
             using (BeginAbsoluteSequence(resultTime))
                 (skinnable.Drawable as IAnimatableHitExplosion)?.Animate(JudgedObject);
 
+            if (secondHitTime != null)
+            {
+                using (BeginAbsoluteSequence(secondHitTime.Value))
+                {
+                    this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
+                    (skinnable.Drawable as IAnimatableHitExplosion)?.AnimateSecondHit();
+                }
+            }
+
             LifetimeEnd = skinnable.Drawable.LatestTransformEndTime;
         }
 
@@ -113,11 +118,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public void VisualiseSecondHit(JudgementResult judgementResult)
         {
-            using (BeginAbsoluteSequence(judgementResult.TimeAbsolute))
-            {
-                this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
-                (skinnable.Drawable as IAnimatableHitExplosion)?.AnimateSecondHit();
-            }
+            secondHitTime = judgementResult.TimeAbsolute;
+            runAnimation();
         }
     }
 }

From da3dc61aae29202b7a0ebb498c274852c1d955ab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Mar 2021 10:58:42 +0900
Subject: [PATCH 08499/10326] Remove newline

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index eb34ba4a37..7d11029a9c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -887,7 +887,6 @@ namespace osu.Game
 
                 case GlobalAction.ToggleGameplayMouseButtons:
                     var mouseDisableButtons = LocalConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons);
-
                     mouseDisableButtons.Value = !mouseDisableButtons.Value;
                     return true;
 

From c7740d1181a165466b9960ed54f10c7e14e85075 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 15:52:24 +0900
Subject: [PATCH 08500/10326] Fix opening the editor occasionally causing a
 hard crash due to incorrect threading logic

Setting one of the global screen `Bindable`s (in this case, `Beatmap`)
is not valid from anywhere but the update thread. This changes the order
in which things happen during the editor startup process to ensure
correctness.

Closes #11968.
---
 osu.Game/Screens/Edit/Editor.cs | 67 +++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 0ba202b082..3a4c3491ff 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -106,26 +106,29 @@ namespace osu.Game.Screens.Edit
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, GameHost host, OsuConfigManager config)
         {
-            if (Beatmap.Value is DummyWorkingBeatmap)
+            var loadableBeatmap = Beatmap.Value;
+
+            if (loadableBeatmap is DummyWorkingBeatmap)
             {
                 isNewBeatmap = true;
 
-                var newBeatmap = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
+                loadableBeatmap = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
+
+                // required so we can get the track length in EditorClock.
+                // this is safe as nothing has yet got a reference to this new beatmap.
+                loadableBeatmap.LoadTrack();
 
                 // this is a bit haphazard, but guards against setting the lease Beatmap bindable if
                 // the editor has already been exited.
                 if (!ValidForPush)
                     return;
-
-                // this probably shouldn't be set in the asynchronous load method, but everything following relies on it.
-                Beatmap.Value = newBeatmap;
             }
 
-            beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;
-            beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
+            beatDivisor.Value = loadableBeatmap.BeatmapInfo.BeatDivisor;
+            beatDivisor.BindValueChanged(divisor => loadableBeatmap.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
-            clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
+            clock = new EditorClock(loadableBeatmap, beatDivisor) { IsCoupled = false };
 
             UpdateClockSource();
 
@@ -139,7 +142,7 @@ namespace osu.Game.Screens.Edit
 
             try
             {
-                playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
+                playableBeatmap = loadableBeatmap.GetPlayableBeatmap(loadableBeatmap.BeatmapInfo.Ruleset);
 
                 // clone these locally for now to avoid incurring overhead on GetPlayableBeatmap usages.
                 // eventually we will want to improve how/where this is done as there are issues with *not* cloning it in all cases.
@@ -153,13 +156,21 @@ namespace osu.Game.Screens.Edit
                 return;
             }
 
-            AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap, Beatmap.Value.Skin));
+            AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap, loadableBeatmap.Skin));
             dependencies.CacheAs(editorBeatmap);
             changeHandler = new EditorChangeHandler(editorBeatmap);
             dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
 
             updateLastSavedHash();
 
+            Schedule(() =>
+            {
+                // we need to avoid changing the beatmap from an asynchronous load thread. it can potentially cause weirdness including crashes.
+                // this assumes that nothing during the rest of this load() method is accessing Beatmap.Value (loadableBeatmap should be preferred).
+                // generally this is quite safe, as the actual load of editor content comes after menuBar.Mode.ValueChanged is fired in its own LoadComplete.
+                Beatmap.Value = loadableBeatmap;
+            });
+
             OsuMenuItem undoMenuItem;
             OsuMenuItem redoMenuItem;
 
@@ -167,17 +178,6 @@ namespace osu.Game.Screens.Edit
             EditorMenuItem copyMenuItem;
             EditorMenuItem pasteMenuItem;
 
-            var fileMenuItems = new List<MenuItem>
-            {
-                new EditorMenuItem("Save", MenuItemType.Standard, Save)
-            };
-
-            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,
@@ -209,7 +209,7 @@ namespace osu.Game.Screens.Edit
                             {
                                 new MenuItem("File")
                                 {
-                                    Items = fileMenuItems
+                                    Items = createFileMenuItems()
                                 },
                                 new MenuItem("Edit")
                                 {
@@ -242,7 +242,11 @@ namespace osu.Game.Screens.Edit
                         Height = 60,
                         Children = new Drawable[]
                         {
-                            bottomBackground = new Box { RelativeSizeAxes = Axes.Both },
+                            bottomBackground = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = colours.Gray2
+                            },
                             new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
@@ -299,8 +303,6 @@ namespace osu.Game.Screens.Edit
             clipboard.BindValueChanged(content => pasteMenuItem.Action.Disabled = string.IsNullOrEmpty(content.NewValue));
 
             menuBar.Mode.ValueChanged += onModeChanged;
-
-            bottomBackground.Colour = colours.Gray2;
         }
 
         /// <summary>
@@ -681,6 +683,21 @@ namespace osu.Game.Screens.Edit
             lastSavedHash = changeHandler.CurrentStateHash;
         }
 
+        private List<MenuItem> createFileMenuItems()
+        {
+            var fileMenuItems = new List<MenuItem>
+            {
+                new EditorMenuItem("Save", MenuItemType.Standard, Save)
+            };
+
+            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));
+            return fileMenuItems;
+        }
+
         public double SnapTime(double time, double? referenceTime) => editorBeatmap.SnapTime(time, referenceTime);
 
         public double GetBeatLengthAtTime(double referenceTime) => editorBeatmap.GetBeatLengthAtTime(referenceTime);

From 7fa5fd56475124fa78c84cbb18e3c19838d98e5a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Mar 2021 16:10:16 +0900
Subject: [PATCH 08501/10326] Update usages of config with framework changes

---
 .../TestSceneCatchModHidden.cs                |   2 +-
 .../TestSceneCatcher.cs                       |   4 +-
 .../ManiaRulesetConfigManager.cs              |   4 +-
 .../TestSceneDrawableJudgement.cs             |   4 +-
 .../TestSceneGameplayCursor.cs                |  12 +-
 .../TestSceneSkinFallbacks.cs                 |  20 +--
 .../Configuration/OsuRulesetConfigManager.cs  |   8 +-
 .../Input/ConfineMouseTrackerTest.cs          |   2 +-
 .../NonVisual/CustomDataDirectoryTest.cs      |   4 +-
 .../TestSceneSeasonalBackgroundLoader.cs      |   4 +-
 .../Visual/Gameplay/TestSceneFailingLayer.cs  |  12 +-
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    |   8 +-
 .../TestSceneStoryboardSamplePlayback.cs      |   2 +-
 .../Visual/Navigation/OsuGameTestScene.cs     |   4 +-
 .../Navigation/TestSettingsMigration.cs       |   6 +-
 .../SongSelect/TestScenePlaySongSelect.cs     |  24 +--
 .../TestSceneBeatmapListingSearchControl.cs   |   4 +-
 .../UserInterface/TestSceneOnScreenDisplay.cs |  12 +-
 .../NonVisual/CustomTourneyDirectoryTest.cs   |   2 +-
 osu.Game.Tournament/IO/TournamentStorage.cs   |   2 +-
 .../Components/DrawingsConfigManager.cs       |   4 +-
 osu.Game/Configuration/OsuConfigManager.cs    | 142 +++++++++---------
 osu.Game/Configuration/SessionStatics.cs      |   8 +-
 .../Configuration/StorageConfigManager.cs     |   2 +-
 osu.Game/IO/OsuStorage.cs                     |   4 +-
 osu.Game/Online/API/APIAccess.cs              |   4 +-
 osu.Game/Updater/UpdateManager.cs             |   2 +-
 27 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
index f15da29993..1248409b2a 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [BackgroundDependencyLoader]
         private void load()
         {
-            LocalConfig.Set(OsuSetting.IncreaseFirstObjectVisibility, false);
+            LocalConfig.SetValue(OsuSetting.IncreaseFirstObjectVisibility, false);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index e8bb57cdf3..48efd73222 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         public void TestHitLightingColour()
         {
             var fruitColour = SkinConfiguration.DefaultComboColours[1];
-            AddStep("enable hit lighting", () => config.Set(OsuSetting.HitLighting, true));
+            AddStep("enable hit lighting", () => config.SetValue(OsuSetting.HitLighting, true));
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             AddAssert("correct hit lighting colour", () =>
                 catcher.ChildrenOfType<HitExplosion>().First()?.ObjectColour == fruitColour);
@@ -211,7 +211,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Test]
         public void TestHitLightingDisabled()
         {
-            AddStep("disable hit lighting", () => config.Set(OsuSetting.HitLighting, false));
+            AddStep("disable hit lighting", () => config.SetValue(OsuSetting.HitLighting, false));
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             AddAssert("no hit lighting", () => !catcher.ChildrenOfType<HitExplosion>().Any());
         }
diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 756f2b7b2f..39d0f4bae4 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Rulesets.Mania.Configuration
         {
             base.InitialiseDefaults();
 
-            Set(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
-            Set(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
+            SetDefault(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
+            SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index e4158d8f07..4395ca6281 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestHitLightingDisabled()
         {
-            AddStep("hit lighting disabled", () => config.Set(OsuSetting.HitLighting, false));
+            AddStep("hit lighting disabled", () => config.SetValue(OsuSetting.HitLighting, false));
 
             showResult(HitResult.Great);
 
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestHitLightingEnabled()
         {
-            AddStep("hit lighting enabled", () => config.Set(OsuSetting.HitLighting, true));
+            AddStep("hit lighting enabled", () => config.SetValue(OsuSetting.HitLighting, true));
 
             showResult(HitResult.Great);
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index 461779b185..e3ccf83715 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddSliderStep("circle size", 0f, 10f, 0f, val =>
             {
-                config.Set(OsuSetting.AutoCursorSize, true);
+                config.SetValue(OsuSetting.AutoCursorSize, true);
                 gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = val;
                 Scheduler.AddOnce(recreate);
             });
@@ -64,21 +64,21 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(10, 1.5f)]
         public void TestSizing(int circleSize, float userScale)
         {
-            AddStep($"set user scale to {userScale}", () => config.Set(OsuSetting.GameplayCursorSize, userScale));
+            AddStep($"set user scale to {userScale}", () => config.SetValue(OsuSetting.GameplayCursorSize, userScale));
             AddStep($"adjust cs to {circleSize}", () => gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = circleSize);
-            AddStep("turn on autosizing", () => config.Set(OsuSetting.AutoCursorSize, true));
+            AddStep("turn on autosizing", () => config.SetValue(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));
+            AddStep("set user scale to 1", () => config.SetValue(OsuSetting.GameplayCursorSize, 1f));
             AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == OsuCursorContainer.GetScaleForCircleSize(circleSize));
 
-            AddStep("turn off autosizing", () => config.Set(OsuSetting.AutoCursorSize, false));
+            AddStep("turn off autosizing", () => config.SetValue(OsuSetting.AutoCursorSize, false));
             AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == 1);
 
-            AddStep($"set user scale to {userScale}", () => config.Set(OsuSetting.GameplayCursorSize, userScale));
+            AddStep($"set user scale to {userScale}", () => config.SetValue(OsuSetting.GameplayCursorSize, userScale));
             AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == userScale);
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 8dbb48c048..56f6fb85fa 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -42,10 +42,10 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("enable user provider", () => testUserSkin.Enabled = true);
 
-            AddStep("enable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, true));
+            AddStep("enable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, true));
             checkNextHitObject("beatmap");
 
-            AddStep("disable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, false));
+            AddStep("disable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, false));
             checkNextHitObject("user");
 
             AddStep("disable user provider", () => testUserSkin.Enabled = false);
@@ -57,20 +57,20 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("enable user provider", () => testUserSkin.Enabled = true);
 
-            AddStep("enable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, true));
-            AddStep("enable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, true));
+            AddStep("enable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, true));
+            AddStep("enable beatmap colours", () => LocalConfig.SetValue(OsuSetting.BeatmapColours, true));
             checkNextHitObject("beatmap");
 
-            AddStep("enable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, true));
-            AddStep("disable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, false));
+            AddStep("enable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, true));
+            AddStep("disable beatmap colours", () => LocalConfig.SetValue(OsuSetting.BeatmapColours, false));
             checkNextHitObject("beatmap");
 
-            AddStep("disable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, false));
-            AddStep("enable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, true));
+            AddStep("disable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, false));
+            AddStep("enable beatmap colours", () => LocalConfig.SetValue(OsuSetting.BeatmapColours, true));
             checkNextHitObject("user");
 
-            AddStep("disable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, false));
-            AddStep("disable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, false));
+            AddStep("disable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, false));
+            AddStep("disable beatmap colours", () => LocalConfig.SetValue(OsuSetting.BeatmapColours, false));
             checkNextHitObject("user");
 
             AddStep("disable user provider", () => testUserSkin.Enabled = false);
diff --git a/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs b/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
index e8272057f3..9589fd576f 100644
--- a/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
@@ -17,10 +17,10 @@ namespace osu.Game.Rulesets.Osu.Configuration
         protected override void InitialiseDefaults()
         {
             base.InitialiseDefaults();
-            Set(OsuRulesetSetting.SnakingInSliders, true);
-            Set(OsuRulesetSetting.SnakingOutSliders, true);
-            Set(OsuRulesetSetting.ShowCursorTrail, true);
-            Set(OsuRulesetSetting.PlayfieldBorderStyle, PlayfieldBorderStyle.None);
+            SetDefault(OsuRulesetSetting.SnakingInSliders, true);
+            SetDefault(OsuRulesetSetting.SnakingOutSliders, true);
+            SetDefault(OsuRulesetSetting.ShowCursorTrail, true);
+            SetDefault(OsuRulesetSetting.PlayfieldBorderStyle, PlayfieldBorderStyle.None);
         }
     }
 
diff --git a/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs b/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
index b90382488f..27cece42e8 100644
--- a/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
+++ b/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Tests.Input
             => AddStep($"make window {mode}", () => frameworkConfigManager.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = mode);
 
         private void setGameSideModeTo(OsuConfineMouseMode mode)
-            => AddStep($"set {mode} game-side", () => Game.LocalConfig.Set(OsuSetting.ConfineMouseMode, mode));
+            => AddStep($"set {mode} game-side", () => Game.LocalConfig.SetValue(OsuSetting.ConfineMouseMode, mode));
 
         private void setLocalUserPlayingTo(bool playing)
             => AddStep($"local user {(playing ? "playing" : "not playing")}", () => Game.LocalUserPlaying.Value = playing);
diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 045246e5ed..a763544c37 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.NonVisual
             using (var host = new CustomTestHeadlessGameHost())
             {
                 using (var storageConfig = new StorageConfigManager(host.InitialStorage))
-                    storageConfig.Set(StorageConfig.FullPath, customPath);
+                    storageConfig.SetValue(StorageConfig.FullPath, customPath);
 
                 try
                 {
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.NonVisual
             using (var host = new CustomTestHeadlessGameHost())
             {
                 using (var storageConfig = new StorageConfigManager(host.InitialStorage))
-                    storageConfig.Set(StorageConfig.FullPath, customPath);
+                    storageConfig.SetValue(StorageConfig.FullPath, customPath);
 
                 try
                 {
diff --git a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
index fba0d92d4b..e7cf830db0 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.Background
         public void SetUp() => Schedule(() =>
         {
             // reset API response in statics to avoid test crosstalk.
-            statics.Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
+            statics.SetValue<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
             textureStore.PerformedLookups.Clear();
             dummyAPI.SetState(APIState.Online);
 
@@ -146,7 +146,7 @@ namespace osu.Game.Tests.Visual.Background
             });
 
         private void setSeasonalBackgroundMode(SeasonalBackgroundMode mode)
-            => AddStep($"set seasonal mode to {mode}", () => config.Set(OsuSetting.SeasonalBackgroundMode, mode));
+            => AddStep($"set seasonal mode to {mode}", () => config.SetValue(OsuSetting.SeasonalBackgroundMode, mode));
 
         private void createLoader()
             => AddStep("create loader", () =>
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 1c55595c97..5a1a9d3d87 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("show health", () => showHealth.Value = true);
-            AddStep("enable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddStep("enable layer", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer is visible", () => layer.IsPresent);
         }
 
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerDisabledViaConfig()
         {
-            AddStep("disable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddStep("disable layer", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddUntilStep("layer is not visible", () => !layer.IsPresent);
         }
@@ -81,19 +81,19 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
 
             AddStep("don't show health", () => showHealth.Value = false);
-            AddStep("disable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddStep("disable FadePlayfieldWhenHealthLow", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
 
             AddStep("don't show health", () => showHealth.Value = false);
-            AddStep("enable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddStep("enable FadePlayfieldWhenHealthLow", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
 
             AddStep("show health", () => showHealth.Value = true);
-            AddStep("disable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddStep("disable FadePlayfieldWhenHealthLow", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
 
             AddStep("show health", () => showHealth.Value = true);
-            AddStep("enable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddStep("enable FadePlayfieldWhenHealthLow", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer fade is visible", () => layer.IsPresent);
         }
     }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index f9914e0193..3cefb8623f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("get original config value", () => originalConfigValue = config.Get<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode));
 
-            AddStep("set hud to never show", () => config.Set(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Never));
+            AddStep("set hud to never show", () => config.SetValue(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Never));
 
             AddUntilStep("wait for fade", () => !hideTarget.IsPresent);
 
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("stop trigering", () => InputManager.ReleaseKey(Key.ControlLeft));
             AddUntilStep("wait for fade", () => !hideTarget.IsPresent);
 
-            AddStep("set original config value", () => config.Set(OsuSetting.HUDVisibilityMode, originalConfigValue));
+            AddStep("set original config value", () => config.SetValue(OsuSetting.HUDVisibilityMode, originalConfigValue));
         }
 
         [Test]
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("set keycounter visible false", () =>
             {
-                config.Set<bool>(OsuSetting.KeyOverlay, false);
+                config.SetValue(OsuSetting.KeyOverlay, false);
                 hudOverlay.KeyCounter.AlwaysVisible.Value = false;
             });
 
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("hidetarget is visible", () => hideTarget.IsPresent);
             AddAssert("key counters still hidden", () => !keyCounterFlow.IsPresent);
 
-            AddStep("return value", () => config.Set<bool>(OsuSetting.KeyOverlay, keyCounterVisibleValue));
+            AddStep("return value", () => config.SetValue(OsuSetting.KeyOverlay, keyCounterVisibleValue));
         }
 
         private void createNew(Action<HUDOverlay> action = null)
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
index 1544f8fd35..a718a98aa6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            config.Set(OsuSetting.ShowStoryboard, true);
+            config.SetValue(OsuSetting.ShowStoryboard, true);
 
             storyboard = new Storyboard();
             var backgroundLayer = storyboard.GetLayer("Background");
diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 96393cc4c3..6ca7707906 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             // 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);
+            Game.LocalConfig.SetValue(OsuSetting.IntroSequence, IntroSequence.Circles);
 
             Add(Game);
         }
@@ -136,7 +136,7 @@ namespace osu.Game.Tests.Visual.Navigation
                 base.LoadComplete();
                 API.Login("Rhythm Champion", "osu!");
 
-                Dependencies.Get<SessionStatics>().Set(Static.MutedAudioNotificationShownOnce, true);
+                Dependencies.Get<SessionStatics>().SetValue(Static.MutedAudioNotificationShownOnce, true);
             }
         }
 
diff --git a/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
index c0b77b580e..768f2057a2 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
@@ -15,8 +15,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             using (var config = new OsuConfigManager(LocalStorage))
             {
-                config.Set(OsuSetting.Version, "2020.101.0");
-                config.Set(OsuSetting.DisplayStarsMaximum, 10.0);
+                config.SetValue(OsuSetting.Version, "2020.101.0");
+                config.SetValue(OsuSetting.DisplayStarsMaximum, 10.0);
             }
         }
 
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             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("set value again", () => Game.LocalConfig.SetValue(OsuSetting.DisplayStarsMaximum, 10));
 
             AddStep("force save config", () => Game.LocalConfig.Save());
 
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 2d192ae207..057b539e44 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -207,14 +207,14 @@ namespace osu.Game.Tests.Visual.SongSelect
             addRulesetImportStep(0);
             addRulesetImportStep(0);
 
-            AddStep("change convert setting", () => config.Set(OsuSetting.ShowConvertedBeatmaps, false));
+            AddStep("change convert setting", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, false));
 
             createSongSelect();
 
             AddStep("push child screen", () => Stack.Push(new TestSceneOsuScreenStack.TestScreen("test child")));
             AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
 
-            AddStep("change convert setting", () => config.Set(OsuSetting.ShowConvertedBeatmaps, true));
+            AddStep("change convert setting", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
 
             AddStep("return", () => songSelect.MakeCurrent());
             AddUntilStep("wait for current", () => songSelect.IsCurrentScreen());
@@ -297,13 +297,13 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddAssert("random map selected", () => songSelect.CurrentBeatmap != defaultBeatmap);
 
-            AddStep(@"Sort by Artist", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Artist));
-            AddStep(@"Sort by Title", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Title));
-            AddStep(@"Sort by Author", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Author));
-            AddStep(@"Sort by DateAdded", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.DateAdded));
-            AddStep(@"Sort by BPM", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.BPM));
-            AddStep(@"Sort by Length", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Length));
-            AddStep(@"Sort by Difficulty", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Difficulty));
+            AddStep(@"Sort by Artist", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Artist));
+            AddStep(@"Sort by Title", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Title));
+            AddStep(@"Sort by Author", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Author));
+            AddStep(@"Sort by DateAdded", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.DateAdded));
+            AddStep(@"Sort by BPM", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.BPM));
+            AddStep(@"Sort by Length", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Length));
+            AddStep(@"Sort by Difficulty", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Difficulty));
         }
 
         [Test]
@@ -470,7 +470,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             changeRuleset(0);
 
             // used for filter check below
-            AddStep("allow convert display", () => config.Set(OsuSetting.ShowConvertedBeatmaps, true));
+            AddStep("allow convert display", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
 
             AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap != null);
 
@@ -648,7 +648,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             int changeCount = 0;
 
-            AddStep("change convert setting", () => config.Set(OsuSetting.ShowConvertedBeatmaps, false));
+            AddStep("change convert setting", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, false));
             AddStep("bind beatmap changed", () =>
             {
                 Beatmap.ValueChanged += onChange;
@@ -686,7 +686,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("selection changed only fired twice", () => changeCount == 2);
 
             AddStep("unbind beatmap changed", () => Beatmap.ValueChanged -= onChange);
-            AddStep("change convert setting", () => config.Set(OsuSetting.ShowConvertedBeatmaps, true));
+            AddStep("change convert setting", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
 
             // ReSharper disable once AccessToModifiedClosure
             void onChange(ValueChangedEvent<WorkingBeatmap> valueChangedEvent) => changeCount++;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index a9747e73f9..9602758ffc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -92,10 +92,10 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestExplicitConfig()
         {
-            AddStep("configure explicit content to allowed", () => localConfig.Set(OsuSetting.ShowOnlineExplicitContent, true));
+            AddStep("configure explicit content to allowed", () => localConfig.SetValue(OsuSetting.ShowOnlineExplicitContent, true));
             AddAssert("explicit control set to show", () => control.ExplicitContent.Value == SearchExplicit.Show);
 
-            AddStep("configure explicit content to disallowed", () => localConfig.Set(OsuSetting.ShowOnlineExplicitContent, false));
+            AddStep("configure explicit content to disallowed", () => localConfig.SetValue(OsuSetting.ShowOnlineExplicitContent, false));
             AddAssert("explicit control set to hide", () => control.ExplicitContent.Value == SearchExplicit.Hide);
         }
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
index 45720548c8..493e2f54e5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
@@ -44,22 +44,22 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             protected override void InitialiseDefaults()
             {
-                Set(TestConfigSetting.ToggleSettingNoKeybind, false);
-                Set(TestConfigSetting.EnumSettingNoKeybind, EnumSetting.Setting1);
-                Set(TestConfigSetting.ToggleSettingWithKeybind, false);
-                Set(TestConfigSetting.EnumSettingWithKeybind, EnumSetting.Setting1);
+                SetDefault(TestConfigSetting.ToggleSettingNoKeybind, false);
+                SetDefault(TestConfigSetting.EnumSettingNoKeybind, EnumSetting.Setting1);
+                SetDefault(TestConfigSetting.ToggleSettingWithKeybind, false);
+                SetDefault(TestConfigSetting.EnumSettingWithKeybind, EnumSetting.Setting1);
 
                 base.InitialiseDefaults();
             }
 
-            public void ToggleSetting(TestConfigSetting setting) => Set(setting, !Get<bool>(setting));
+            public void ToggleSetting(TestConfigSetting setting) => SetValue(setting, !Get<bool>(setting));
 
             public void IncrementEnumSetting(TestConfigSetting setting)
             {
                 var nextValue = Get<EnumSetting>(setting) + 1;
                 if (nextValue > EnumSetting.Setting4)
                     nextValue = EnumSetting.Setting1;
-                Set(setting, nextValue);
+                SetValue(setting, nextValue);
             }
 
             public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 567d9f0d62..46c3b8bc3b 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 storage.DeleteDirectory(string.Empty);
 
                 using (var storageConfig = new TournamentStorageManager(storage))
-                    storageConfig.Set(StorageConfig.CurrentTournament, custom_tournament);
+                    storageConfig.SetValue(StorageConfig.CurrentTournament, custom_tournament);
 
                 try
                 {
diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 2ba1b6be8f..5d9fed6288 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Tournament.IO
             moveFileIfExists("drawings.ini", destination);
 
             ChangeTargetStorage(newStorage);
-            storageConfig.Set(StorageConfig.CurrentTournament, default_tournament);
+            storageConfig.SetValue(StorageConfig.CurrentTournament, default_tournament);
             storageConfig.Save();
         }
 
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs b/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs
index d197c0f5d9..1a2f5a1ff4 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs
@@ -12,8 +12,8 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
         protected override void InitialiseDefaults()
         {
-            Set(DrawingsConfig.Groups, 8, 1, 8);
-            Set(DrawingsConfig.TeamsPerGroup, 8, 1, 8);
+            SetDefault(DrawingsConfig.Groups, 8, 1, 8);
+            SetDefault(DrawingsConfig.TeamsPerGroup, 8, 1, 8);
         }
 
         public DrawingsConfigManager(Storage storage)
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index d0fa45bb7a..387cfbb193 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -24,126 +24,126 @@ namespace osu.Game.Configuration
         protected override void InitialiseDefaults()
         {
             // UI/selection defaults
-            Set(OsuSetting.Ruleset, 0, 0, int.MaxValue);
-            Set(OsuSetting.Skin, 0, -1, int.MaxValue);
+            SetDefault(OsuSetting.Ruleset, 0, 0, int.MaxValue);
+            SetDefault(OsuSetting.Skin, 0, -1, int.MaxValue);
 
-            Set(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
-            Set(OsuSetting.BeatmapDetailModsFilter, false);
+            SetDefault(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
+            SetDefault(OsuSetting.BeatmapDetailModsFilter, false);
 
-            Set(OsuSetting.ShowConvertedBeatmaps, true);
-            Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);
-            Set(OsuSetting.DisplayStarsMaximum, 10.1, 0, 10.1, 0.1);
+            SetDefault(OsuSetting.ShowConvertedBeatmaps, true);
+            SetDefault(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);
+            SetDefault(OsuSetting.DisplayStarsMaximum, 10.1, 0, 10.1, 0.1);
 
-            Set(OsuSetting.SongSelectGroupingMode, GroupMode.All);
-            Set(OsuSetting.SongSelectSortingMode, SortMode.Title);
+            SetDefault(OsuSetting.SongSelectGroupingMode, GroupMode.All);
+            SetDefault(OsuSetting.SongSelectSortingMode, SortMode.Title);
 
-            Set(OsuSetting.RandomSelectAlgorithm, RandomSelectAlgorithm.RandomPermutation);
+            SetDefault(OsuSetting.RandomSelectAlgorithm, RandomSelectAlgorithm.RandomPermutation);
 
-            Set(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2f, 1f);
+            SetDefault(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2f, 1f);
 
             // Online settings
-            Set(OsuSetting.Username, string.Empty);
-            Set(OsuSetting.Token, string.Empty);
+            SetDefault(OsuSetting.Username, string.Empty);
+            SetDefault(OsuSetting.Token, string.Empty);
 
-            Set(OsuSetting.AutomaticallyDownloadWhenSpectating, false);
+            SetDefault(OsuSetting.AutomaticallyDownloadWhenSpectating, false);
 
-            Set(OsuSetting.SavePassword, false).ValueChanged += enabled =>
+            SetDefault(OsuSetting.SavePassword, false).ValueChanged += enabled =>
             {
-                if (enabled.NewValue) Set(OsuSetting.SaveUsername, true);
+                if (enabled.NewValue) SetValue(OsuSetting.SaveUsername, true);
             };
 
-            Set(OsuSetting.SaveUsername, true).ValueChanged += enabled =>
+            SetDefault(OsuSetting.SaveUsername, true).ValueChanged += enabled =>
             {
-                if (!enabled.NewValue) Set(OsuSetting.SavePassword, false);
+                if (!enabled.NewValue) SetValue(OsuSetting.SavePassword, false);
             };
 
-            Set(OsuSetting.ExternalLinkWarning, true);
-            Set(OsuSetting.PreferNoVideo, false);
+            SetDefault(OsuSetting.ExternalLinkWarning, true);
+            SetDefault(OsuSetting.PreferNoVideo, false);
 
-            Set(OsuSetting.ShowOnlineExplicitContent, false);
+            SetDefault(OsuSetting.ShowOnlineExplicitContent, false);
 
             // Audio
-            Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
+            SetDefault(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
 
-            Set(OsuSetting.MenuVoice, true);
-            Set(OsuSetting.MenuMusic, true);
+            SetDefault(OsuSetting.MenuVoice, true);
+            SetDefault(OsuSetting.MenuMusic, true);
 
-            Set(OsuSetting.AudioOffset, 0, -500.0, 500.0, 1);
+            SetDefault(OsuSetting.AudioOffset, 0, -500.0, 500.0, 1);
 
             // Input
-            Set(OsuSetting.MenuCursorSize, 1.0f, 0.5f, 2f, 0.01f);
-            Set(OsuSetting.GameplayCursorSize, 1.0f, 0.1f, 2f, 0.01f);
-            Set(OsuSetting.AutoCursorSize, false);
+            SetDefault(OsuSetting.MenuCursorSize, 1.0f, 0.5f, 2f, 0.01f);
+            SetDefault(OsuSetting.GameplayCursorSize, 1.0f, 0.1f, 2f, 0.01f);
+            SetDefault(OsuSetting.AutoCursorSize, false);
 
-            Set(OsuSetting.MouseDisableButtons, false);
-            Set(OsuSetting.MouseDisableWheel, false);
-            Set(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay);
+            SetDefault(OsuSetting.MouseDisableButtons, false);
+            SetDefault(OsuSetting.MouseDisableWheel, false);
+            SetDefault(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay);
 
             // Graphics
-            Set(OsuSetting.ShowFpsDisplay, false);
+            SetDefault(OsuSetting.ShowFpsDisplay, false);
 
-            Set(OsuSetting.ShowStoryboard, true);
-            Set(OsuSetting.BeatmapSkins, true);
-            Set(OsuSetting.BeatmapColours, true);
-            Set(OsuSetting.BeatmapHitsounds, true);
+            SetDefault(OsuSetting.ShowStoryboard, true);
+            SetDefault(OsuSetting.BeatmapSkins, true);
+            SetDefault(OsuSetting.BeatmapColours, true);
+            SetDefault(OsuSetting.BeatmapHitsounds, true);
 
-            Set(OsuSetting.CursorRotation, true);
+            SetDefault(OsuSetting.CursorRotation, true);
 
-            Set(OsuSetting.MenuParallax, true);
+            SetDefault(OsuSetting.MenuParallax, true);
 
             // Gameplay
-            Set(OsuSetting.DimLevel, 0.8, 0, 1, 0.01);
-            Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
-            Set(OsuSetting.LightenDuringBreaks, true);
+            SetDefault(OsuSetting.DimLevel, 0.8, 0, 1, 0.01);
+            SetDefault(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
+            SetDefault(OsuSetting.LightenDuringBreaks, true);
 
-            Set(OsuSetting.HitLighting, true);
+            SetDefault(OsuSetting.HitLighting, true);
 
-            Set(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Always);
-            Set(OsuSetting.ShowProgressGraph, true);
-            Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
-            Set(OsuSetting.FadePlayfieldWhenHealthLow, true);
-            Set(OsuSetting.KeyOverlay, false);
-            Set(OsuSetting.PositionalHitSounds, true);
-            Set(OsuSetting.AlwaysPlayFirstComboBreak, true);
-            Set(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
+            SetDefault(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Always);
+            SetDefault(OsuSetting.ShowProgressGraph, true);
+            SetDefault(OsuSetting.ShowHealthDisplayWhenCantFail, true);
+            SetDefault(OsuSetting.FadePlayfieldWhenHealthLow, true);
+            SetDefault(OsuSetting.KeyOverlay, false);
+            SetDefault(OsuSetting.PositionalHitSounds, true);
+            SetDefault(OsuSetting.AlwaysPlayFirstComboBreak, true);
+            SetDefault(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
-            Set(OsuSetting.FloatingComments, false);
+            SetDefault(OsuSetting.FloatingComments, false);
 
-            Set(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised);
+            SetDefault(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised);
 
-            Set(OsuSetting.IncreaseFirstObjectVisibility, true);
-            Set(OsuSetting.GameplayDisableWinKey, true);
+            SetDefault(OsuSetting.IncreaseFirstObjectVisibility, true);
+            SetDefault(OsuSetting.GameplayDisableWinKey, true);
 
             // Update
-            Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
+            SetDefault(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
 
-            Set(OsuSetting.Version, string.Empty);
+            SetDefault(OsuSetting.Version, string.Empty);
 
-            Set(OsuSetting.ScreenshotFormat, ScreenshotFormat.Jpg);
-            Set(OsuSetting.ScreenshotCaptureMenuCursor, false);
+            SetDefault(OsuSetting.ScreenshotFormat, ScreenshotFormat.Jpg);
+            SetDefault(OsuSetting.ScreenshotCaptureMenuCursor, false);
 
-            Set(OsuSetting.SongSelectRightMouseScroll, false);
+            SetDefault(OsuSetting.SongSelectRightMouseScroll, false);
 
-            Set(OsuSetting.Scaling, ScalingMode.Off);
+            SetDefault(OsuSetting.Scaling, ScalingMode.Off);
 
-            Set(OsuSetting.ScalingSizeX, 0.8f, 0.2f, 1f);
-            Set(OsuSetting.ScalingSizeY, 0.8f, 0.2f, 1f);
+            SetDefault(OsuSetting.ScalingSizeX, 0.8f, 0.2f, 1f);
+            SetDefault(OsuSetting.ScalingSizeY, 0.8f, 0.2f, 1f);
 
-            Set(OsuSetting.ScalingPositionX, 0.5f, 0f, 1f);
-            Set(OsuSetting.ScalingPositionY, 0.5f, 0f, 1f);
+            SetDefault(OsuSetting.ScalingPositionX, 0.5f, 0f, 1f);
+            SetDefault(OsuSetting.ScalingPositionY, 0.5f, 0f, 1f);
 
-            Set(OsuSetting.UIScale, 1f, 0.8f, 1.6f, 0.01f);
+            SetDefault(OsuSetting.UIScale, 1f, 0.8f, 1.6f, 0.01f);
 
-            Set(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f);
+            SetDefault(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f);
 
-            Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
+            SetDefault(OsuSetting.IntroSequence, IntroSequence.Triangles);
 
-            Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
-            Set(OsuSetting.SeasonalBackgroundMode, SeasonalBackgroundMode.Sometimes);
+            SetDefault(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
+            SetDefault(OsuSetting.SeasonalBackgroundMode, SeasonalBackgroundMode.Sometimes);
 
-            Set(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
+            SetDefault(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
 
-            Set(OsuSetting.EditorWaveformOpacity, 1f);
+            SetDefault(OsuSetting.EditorWaveformOpacity, 1f);
         }
 
         public OsuConfigManager(Storage storage)
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index fd401119ff..36eb6964dd 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -14,10 +14,10 @@ namespace osu.Game.Configuration
     {
         protected override void InitialiseDefaults()
         {
-            Set(Static.LoginOverlayDisplayed, false);
-            Set(Static.MutedAudioNotificationShownOnce, false);
-            Set(Static.LastHoverSoundPlaybackTime, (double?)null);
-            Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
+            SetDefault(Static.LoginOverlayDisplayed, false);
+            SetDefault(Static.MutedAudioNotificationShownOnce, false);
+            SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
+            SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
     }
 
diff --git a/osu.Game/Configuration/StorageConfigManager.cs b/osu.Game/Configuration/StorageConfigManager.cs
index 929f8f22ad..90ea42b638 100644
--- a/osu.Game/Configuration/StorageConfigManager.cs
+++ b/osu.Game/Configuration/StorageConfigManager.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Configuration
         {
             base.InitialiseDefaults();
 
-            Set(StorageConfig.FullPath, string.Empty);
+            SetDefault(StorageConfig.FullPath, string.Empty);
         }
     }
 
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 8097f61ea4..7df5d820ee 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -58,7 +58,7 @@ namespace osu.Game.IO
         /// </summary>
         public void ResetCustomStoragePath()
         {
-            storageConfig.Set(StorageConfig.FullPath, string.Empty);
+            storageConfig.SetValue(StorageConfig.FullPath, string.Empty);
             storageConfig.Save();
 
             ChangeTargetStorage(defaultStorage);
@@ -103,7 +103,7 @@ namespace osu.Game.IO
         public override void Migrate(Storage newStorage)
         {
             base.Migrate(newStorage);
-            storageConfig.Set(StorageConfig.FullPath, newStorage.GetFullPath("."));
+            storageConfig.SetValue(StorageConfig.FullPath, newStorage.GetFullPath("."));
             storageConfig.Save();
         }
     }
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index ede64c0340..944525c119 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Online.API
             thread.Start();
         }
 
-        private void onTokenChanged(ValueChangedEvent<OAuthToken> e) => config.Set(OsuSetting.Token, config.Get<bool>(OsuSetting.SavePassword) ? authentication.TokenString : string.Empty);
+        private void onTokenChanged(ValueChangedEvent<OAuthToken> e) => config.SetValue(OsuSetting.Token, config.Get<bool>(OsuSetting.SavePassword) ? authentication.TokenString : string.Empty);
 
         internal new void Schedule(Action action) => base.Schedule(action);
 
@@ -134,7 +134,7 @@ namespace osu.Game.Online.API
                         state.Value = APIState.Connecting;
 
                         // save the username at this point, if the user requested for it to be.
-                        config.Set(OsuSetting.Username, config.Get<bool>(OsuSetting.SaveUsername) ? ProvidedUsername : string.Empty);
+                        config.SetValue(OsuSetting.Username, config.Get<bool>(OsuSetting.SaveUsername) ? ProvidedUsername : string.Empty);
 
                         if (!authentication.HasValidAccessToken && !authentication.AuthenticateWithLogin(ProvidedUsername, password))
                         {
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 9a0454bc95..1c72f3ebe2 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Updater
 
             // 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);
+            config.SetValue(OsuSetting.Version, version);
         }
 
         private readonly object updateTaskLock = new object();

From eda891223c469cdb23a07fa8faeac7331db2aa33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 16:47:12 +0900
Subject: [PATCH 08502/10326] Start the editor with empty
 artist/creator/difficulty name fields

---
 osu.Game/Beatmaps/BeatmapManager.cs            | 3 ---
 osu.Game/Screens/Edit/Setup/MetadataSection.cs | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index f42fba79cb..115d1b33bb 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -113,8 +113,6 @@ namespace osu.Game.Beatmaps
         {
             var metadata = new BeatmapMetadata
             {
-                Artist = "artist",
-                Title = "title",
                 Author = user,
             };
 
@@ -128,7 +126,6 @@ namespace osu.Game.Beatmaps
                         BaseDifficulty = new BeatmapDifficulty(),
                         Ruleset = ruleset,
                         Metadata = metadata,
-                        Version = "difficulty"
                     }
                 }
             };
diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index e812c042fb..2b10be0423 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -28,25 +28,25 @@ namespace osu.Game.Screens.Edit.Setup
                 },
                 artistTextBox = new LabelledTextBox
                 {
-                    Label = "Artist",
+                    PlaceholderText = "Artist",
                     Current = { Value = Beatmap.Metadata.Artist },
                     TabbableContentContainer = this
                 },
                 titleTextBox = new LabelledTextBox
                 {
-                    Label = "Title",
+                    PlaceholderText = "Title",
                     Current = { Value = Beatmap.Metadata.Title },
                     TabbableContentContainer = this
                 },
                 creatorTextBox = new LabelledTextBox
                 {
-                    Label = "Creator",
+                    PlaceholderText = "Creator",
                     Current = { Value = Beatmap.Metadata.AuthorString },
                     TabbableContentContainer = this
                 },
                 difficultyTextBox = new LabelledTextBox
                 {
-                    Label = "Difficulty Name",
+                    PlaceholderText = "Difficulty Name",
                     Current = { Value = Beatmap.BeatmapInfo.Version },
                     TabbableContentContainer = this
                 },

From 26d6f96c4e2decdba1836a98280a2ba6381c379d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 16:56:58 +0900
Subject: [PATCH 08503/10326] Fix LabelledTextBox not correctly forwarding
 focus to its underlying TextBox component

---
 osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
index 4aeda74be8..266eb11319 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterfaceV2
@@ -53,6 +54,14 @@ namespace osu.Game.Graphics.UserInterfaceV2
             CornerRadius = CORNER_RADIUS,
         };
 
+        public override bool AcceptsFocus => true;
+
+        protected override void OnFocus(FocusEvent e)
+        {
+            base.OnFocus(e);
+            GetContainingInputManager().ChangeFocus(Component);
+        }
+
         protected override OsuTextBox CreateComponent() => CreateTextBox().With(t =>
         {
             t.OnCommit += (sender, newText) => OnCommit?.Invoke(sender, newText);

From 5adc675862afb015ad737db47ebda917fc24c2f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 16:57:14 +0900
Subject: [PATCH 08504/10326] Focus artist textbox on entering song setup if
 fields are empty

---
 osu.Game/Screens/Edit/Setup/MetadataSection.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index 2b10be0423..c5a2b77ab4 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -56,6 +56,14 @@ namespace osu.Game.Screens.Edit.Setup
                 item.OnCommit += onCommit;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (string.IsNullOrEmpty(artistTextBox.Current.Value))
+                GetContainingInputManager().ChangeFocus(artistTextBox);
+        }
+
         private void onCommit(TextBox sender, bool newText)
         {
             if (!newText) return;

From 3b6a1180b68515b82a9e970f84a3e51d5f908f4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 17:02:11 +0900
Subject: [PATCH 08505/10326] Remove non-accessed field

---
 osu.Game/Screens/Edit/Editor.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 3a4c3491ff..0c24eb6a4d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -74,7 +74,6 @@ namespace osu.Game.Screens.Edit
 
         private string lastSavedHash;
 
-        private Box bottomBackground;
         private Container<EditorScreen> screenContainer;
 
         private EditorScreen currentScreen;
@@ -242,7 +241,7 @@ namespace osu.Game.Screens.Edit
                         Height = 60,
                         Children = new Drawable[]
                         {
-                            bottomBackground = new Box
+                            new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Colour = colours.Gray2

From d0e61e5b4d609c342e55e2b8a2ed86c66977d11e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 17:14:04 +0900
Subject: [PATCH 08506/10326] Put back the label

---
 osu.Game/Screens/Edit/Setup/MetadataSection.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index c5a2b77ab4..f429164ece 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -28,25 +28,25 @@ namespace osu.Game.Screens.Edit.Setup
                 },
                 artistTextBox = new LabelledTextBox
                 {
-                    PlaceholderText = "Artist",
+                    Label = "Artist",
                     Current = { Value = Beatmap.Metadata.Artist },
                     TabbableContentContainer = this
                 },
                 titleTextBox = new LabelledTextBox
                 {
-                    PlaceholderText = "Title",
+                    Label = "Title",
                     Current = { Value = Beatmap.Metadata.Title },
                     TabbableContentContainer = this
                 },
                 creatorTextBox = new LabelledTextBox
                 {
-                    PlaceholderText = "Creator",
+                    Label = "Creator",
                     Current = { Value = Beatmap.Metadata.AuthorString },
                     TabbableContentContainer = this
                 },
                 difficultyTextBox = new LabelledTextBox
                 {
-                    PlaceholderText = "Difficulty Name",
+                    Label = "Difficulty Name",
                     Current = { Value = Beatmap.BeatmapInfo.Version },
                     TabbableContentContainer = this
                 },

From a1a0074c3203e4f259fde9f87f9516acca239cf2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 18:05:11 +0900
Subject: [PATCH 08507/10326] Revert "Local framework"

This reverts commit b9b095ee75c960287a8636d06c07afddade6865f.
---
 osu.Desktop.slnf         |  6 ++----
 osu.Game/osu.Game.csproj |  4 +---
 osu.iOS.props            |  4 ++--
 osu.sln                  | 42 ----------------------------------------
 4 files changed, 5 insertions(+), 51 deletions(-)

diff --git a/osu.Desktop.slnf b/osu.Desktop.slnf
index 1e41d0af0e..d2c14d321a 100644
--- a/osu.Desktop.slnf
+++ b/osu.Desktop.slnf
@@ -15,9 +15,7 @@
       "osu.Game.Tests\\osu.Game.Tests.csproj",
       "osu.Game.Tournament.Tests\\osu.Game.Tournament.Tests.csproj",
       "osu.Game.Tournament\\osu.Game.Tournament.csproj",
-      "osu.Game\\osu.Game.csproj",
-      "../osu-framework/osu.Framework/osu.Framework.csproj",
-      "../osu-framework/osu.Framework/osu.Framework.NativeLibs.csproj"
+      "osu.Game\\osu.Game.csproj"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f2fc1726cd..90c8b98f42 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,13 +29,11 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\osu-framework\osu.Framework\osu.Framework.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/osu.iOS.props b/osu.iOS.props
index 30df8c423e..ccd33bf88c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <ProjectReference Include="../../osu-framework/osu.Framework.iOS/osu.Framework.iOS.csproj" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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" />
-    <ProjectReference Include="../../osu-framework/osu.Framework/osu.Framework.csproj" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
diff --git a/osu.sln b/osu.sln
index 4d0b3656e7..c9453359b1 100644
--- a/osu.sln
+++ b/osu.sln
@@ -66,12 +66,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Benchmarks", "osu.Game.Benchmarks\osu.Game.Benchmarks.csproj", "{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework", "..\osu-framework\osu.Framework\osu.Framework.csproj", "{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.iOS", "..\osu-framework\osu.Framework.iOS\osu.Framework.iOS.csproj", "{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.NativeLibs", "..\osu-framework\osu.Framework.NativeLibs\osu.Framework.NativeLibs.csproj", "{500039B3-0706-40C3-B6E7-1FD9187644A5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -418,42 +412,6 @@ Global
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhone.Build.0 = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhone.Build.0 = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhone.Build.0 = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhone.Build.0 = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 577d40d8d155daf4af76278b7dce81df355eef59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 18:05:18 +0900
Subject: [PATCH 08508/10326] 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 5b700224db..e0392bd687 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.309.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.317.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fa1b0a95c3..360c522193 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.317.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 71fcdd45f3..b763a91dfb 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.Framework.iOS" Version="2021.309.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.317.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,7 @@
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.317.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 79041c1c4b7a386781a4c01cd2d56a1e74f601eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 18:07:42 +0900
Subject: [PATCH 08509/10326] Remove osuTK reference

---
 osu.Desktop/Program.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index 0c527ba881..d06c4b6746 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -22,7 +22,6 @@ namespace osu.Desktop
         {
             // Back up the cwd before DesktopGameHost changes it
             var cwd = Environment.CurrentDirectory;
-            bool useOsuTK = args.Contains("--tk");
 
             using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
             {

From fccd495f27e3955f33b4a2f3fd5258fffd7b5faa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 18:07:51 +0900
Subject: [PATCH 08510/10326] Remove obsoleted setting for now

---
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 036c4edfba..fb908a7669 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -53,11 +53,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     LabelText = "Cursor sensitivity",
                     Current = localSensitivity
                 },
-                new SettingsCheckbox
-                {
-                    LabelText = "Map absolute input to window",
-                    Current = config.GetBindable<bool>(FrameworkSetting.MapAbsoluteInputToWindow)
-                },
                 confineMouseModeSetting = new SettingsEnumDropdown<OsuConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor to window",

From 4bf57ad86080133e9d437a0079eb3255c8e9c789 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 18:24:24 +0900
Subject: [PATCH 08511/10326] Remove remaining reference to obsolete value

---
 osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 6ca7707906..bf5338d81a 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Platform;
@@ -62,10 +61,6 @@ namespace osu.Game.Tests.Visual.Navigation
 
                 RecycleLocalStorage();
 
-                // see MouseSettings
-                var frameworkConfig = host.Dependencies.Get<FrameworkConfigManager>();
-                frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity).Disabled = false;
-
                 CreateGame();
             });
 

From 8046b5a818f8d2a69d7199e6cff6fa2a1db024d8 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Wed, 17 Mar 2021 17:35:49 +0800
Subject: [PATCH 08512/10326] set text to platform clipboard on copy

---
 osu.Game/Screens/Edit/Editor.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 0ba202b082..88383bd3ed 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -21,6 +21,7 @@ using osu.Framework.Screens;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
@@ -29,6 +30,7 @@ using osu.Game.IO.Serialization;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
@@ -60,6 +62,9 @@ namespace osu.Game.Screens.Edit
 
         protected bool HasUnsavedChanges => lastSavedHash != changeHandler.CurrentStateHash;
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -104,7 +109,7 @@ namespace osu.Game.Screens.Edit
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, GameHost host, OsuConfigManager config)
+        private void load(OsuColour colours, OsuConfigManager config)
         {
             if (Beatmap.Value is DummyWorkingBeatmap)
             {
@@ -542,8 +547,12 @@ namespace osu.Game.Screens.Edit
         protected void Copy()
         {
             if (editorBeatmap.SelectedHitObjects.Count == 0)
+            {
+                host.GetClipboard()?.SetText($"{clock.CurrentTime.ToEditorFormattedString()} - ");
                 return;
+            }
 
+            host.GetClipboard()?.SetText($"{editorBeatmap.SelectedHitObjects.FirstOrDefault().StartTime.ToEditorFormattedString()} ({string.Join(',', editorBeatmap.SelectedHitObjects.Select(h => ((h as IHasComboInformation)?.IndexInCurrentCombo + 1 ?? 0).ToString()))}) - ");
             clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
         }
 

From f7ec79c5f42cd90f3201ae8855bc4d53fc5594fc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Mar 2021 19:02:25 +0900
Subject: [PATCH 08513/10326] Fix incorrect generic type

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

diff --git a/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
index 768f2057a2..c1c968e862 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             AddAssert("config has migrated value", () => Precision.AlmostEquals(Game.LocalConfig.Get<double>(OsuSetting.DisplayStarsMaximum), 10.1));
 
-            AddStep("set value again", () => Game.LocalConfig.SetValue(OsuSetting.DisplayStarsMaximum, 10));
+            AddStep("set value again", () => Game.LocalConfig.SetValue(OsuSetting.DisplayStarsMaximum, 10.0));
 
             AddStep("force save config", () => Game.LocalConfig.Save());
 

From 133ff085a53711229834c0c3b3944f1c29d91b73 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Wed, 17 Mar 2021 18:06:40 +0800
Subject: [PATCH 08514/10326] refactor code

---
 osu.Game/Screens/Edit/Editor.cs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 88383bd3ed..fdb31a8b8c 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Text;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -546,14 +547,24 @@ namespace osu.Game.Screens.Edit
 
         protected void Copy()
         {
+            var builder = new StringBuilder();
+            const string suffix = " - ";
+
             if (editorBeatmap.SelectedHitObjects.Count == 0)
             {
-                host.GetClipboard()?.SetText($"{clock.CurrentTime.ToEditorFormattedString()} - ");
-                return;
+                builder.Append(clock.CurrentTime.ToEditorFormattedString());
+            }
+            else
+            {
+                var orderedHitObjects = editorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime);
+                builder.Append(orderedHitObjects.FirstOrDefault().StartTime.ToEditorFormattedString());
+                builder.Append($" ({string.Join(',', orderedHitObjects.Cast<IHasComboInformation>().Select(h => h.IndexInCurrentCombo + 1))})");
+
+                clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
             }
 
-            host.GetClipboard()?.SetText($"{editorBeatmap.SelectedHitObjects.FirstOrDefault().StartTime.ToEditorFormattedString()} ({string.Join(',', editorBeatmap.SelectedHitObjects.Select(h => ((h as IHasComboInformation)?.IndexInCurrentCombo + 1 ?? 0).ToString()))}) - ");
-            clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
+            builder.Append(suffix);
+            host.GetClipboard()?.SetText(builder.ToString());
         }
 
         protected void Paste()

From e59b8b4ce66a6b30057add268d1620d5af8be231 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Mar 2021 19:07:29 +0900
Subject: [PATCH 08515/10326] Fix test checking nullable string

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

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 2f558a6379..591095252f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual.Ranking
             }));
 
             AddAssert("mapped by text not present", () =>
-                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Current.Value, "mapped", "by")));
+                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text.ToString(), "mapped", "by")));
         }
 
         private void showPanel(ScoreInfo score) => Child = new ExpandedPanelMiddleContentContainer(score);

From 51e0304c54a604bab6d6c8007c59ec755b115b2d Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Wed, 17 Mar 2021 18:31:09 +0800
Subject: [PATCH 08516/10326] properly format strings per ruleset

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 2 ++
 osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs | 2 ++
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs     | 2 ++
 osu.Game/Rulesets/Objects/HitObject.cs            | 2 ++
 osu.Game/Screens/Edit/Editor.cs                   | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index ae45182960..631b50d686 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -120,5 +120,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        public override string ToEditorString() => (IndexInCurrentCombo + 1).ToString();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
index 27bf50493d..c43d223335 100644
--- a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Mania.Objects
 
         protected override HitWindows CreateHitWindows() => new ManiaHitWindows();
 
+        public override string ToEditorString() => $"{StartTime}|{Column}";
+
         #region LegacyBeatmapEncoder
 
         float IHasXPosition.X => Column;
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 22b64af3df..e784d13084 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -130,5 +130,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         }
 
         protected override HitWindows CreateHitWindows() => new OsuHitWindows();
+
+        public override string ToEditorString() => (IndexInCurrentCombo + 1).ToString();
     }
 }
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 826d411822..fa7b2811cc 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -168,6 +168,8 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         [NotNull]
         protected virtual HitWindows CreateHitWindows() => new HitWindows();
+
+        public virtual string ToEditorString() => string.Empty;
     }
 
     public static class HitObjectExtensions
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index fdb31a8b8c..a6e84d59a7 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -558,7 +558,7 @@ namespace osu.Game.Screens.Edit
             {
                 var orderedHitObjects = editorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime);
                 builder.Append(orderedHitObjects.FirstOrDefault().StartTime.ToEditorFormattedString());
-                builder.Append($" ({string.Join(',', orderedHitObjects.Cast<IHasComboInformation>().Select(h => h.IndexInCurrentCombo + 1))})");
+                builder.Append($" ({string.Join(',', orderedHitObjects.Select(h => h.ToEditorString()))})");
 
                 clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
             }

From 3bfde7341f25b9fb06213426fed89a9e5accda0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 17:14:53 +0100
Subject: [PATCH 08517/10326] Revert "Remove unnecessary overrides"

This reverts commit f4e508b57051e887a00a8f4649e4616b762a8c8c.
---
 osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs             | 2 ++
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index 1b5d576c1e..69b81d6d5c 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Rulesets.Mania.UI
     {
         private const float default_large_faint_size = 0.8f;
 
+        public override bool RemoveWhenNotAlive => true;
+
         [Resolved]
         private Column column { get; set; }
 
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
index bef9279bac..aad9f53b93 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyHitExplosion : CompositeDrawable, IAnimatableHitExplosion
     {
+        public override bool RemoveWhenNotAlive => false;
+
         private readonly Drawable sprite;
 
         [CanBeNull]

From f1e66cc420ce69e133f08068fdc2c1affd3e02cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 18:37:11 +0100
Subject: [PATCH 08518/10326] Adjust test namespace

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

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index a824696022..aafd0ee32b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Edit.Components;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorClock : EditorClockTestScene

From 3b55eeb416c01f1f2ba5d2fa0a8ce0d7a25d6bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 18:39:48 +0100
Subject: [PATCH 08519/10326] Fix test failure by setting beatmap

Post-merge, it was failing because somewhere along the way
`EditorClockTestScene` started expecting inheritors to set the beatmap
themselves explicitly in BDL.
---
 osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index aafd0ee32b..63d7dbc2b5 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -2,8 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit.Components;
 using osuTK;
 
@@ -35,6 +37,12 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+        }
+
         [Test]
         public void TestStopAtTrackEnd()
         {

From 21e18c9f6eae256c894ec81ff00dc529dc7762fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 18:44:21 +0100
Subject: [PATCH 08520/10326] Fix test hangs in browser due to changing tracks
 via music controller

---
 osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index 63d7dbc2b5..58375f295b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -41,6 +41,9 @@ namespace osu.Game.Tests.Visual.Editing
         private void load()
         {
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+            // ensure that music controller does not change this beatmap due to it
+            // completing naturally as part of the test.
+            Beatmap.Disabled = true;
         }
 
         [Test]

From 6cea74f0fada8f90bf27e3005cccd2ca5dc42706 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 17 Mar 2021 13:13:13 -0700
Subject: [PATCH 08521/10326] Remove available kudosu section from user profile
 overlay in line with web

---
 .../Profile/Sections/Kudosu/KudosuInfo.cs     | 34 ++-----------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
index d4d0976724..e5b4193f3b 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
@@ -23,44 +23,17 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
         {
             this.user.BindTo(user);
             CountSection total;
-            CountSection avaliable;
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Masking = true;
             CornerRadius = 3;
-            Children = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(5, 0),
-                    Children = new[]
-                    {
-                        total = new CountTotal(),
-                        avaliable = new CountAvailable()
-                    }
-                }
-            };
-            this.user.ValueChanged += u =>
-            {
-                total.Count = u.NewValue?.Kudosu.Total ?? 0;
-                avaliable.Count = u.NewValue?.Kudosu.Available ?? 0;
-            };
+            Child = total = new CountTotal();
+
+            this.user.ValueChanged += u => total.Count = u.NewValue?.Kudosu.Total ?? 0;
         }
 
         protected override bool OnClick(ClickEvent e) => true;
 
-        private class CountAvailable : CountSection
-        {
-            public CountAvailable()
-                : base("Kudosu Avaliable")
-            {
-                DescriptionText.Text = "Kudosu can be traded for kudosu stars, which will help your beatmap get more attention. This is the number of kudosu you haven't traded in yet.";
-            }
-        }
-
         private class CountTotal : CountSection
         {
             public CountTotal()
@@ -86,7 +59,6 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
             public CountSection(string header)
             {
                 RelativeSizeAxes = Axes.X;
-                Width = 0.5f;
                 AutoSizeAxes = Axes.Y;
                 Padding = new MarginPadding { Top = 10, Bottom = 20 };
                 Child = new FillFlowContainer

From 599c55fca5d08f0f2a30cde6be78273b6ad24404 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 17 Mar 2021 13:14:18 -0700
Subject: [PATCH 08522/10326] Update total kudosu earned description text in
 line with web

---
 osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
index e5b4193f3b..87622939e2 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
                 : base("Total Kudosu Earned")
             {
                 DescriptionText.AddText("Based on how much of a contribution the user has made to beatmap moderation. See ");
-                DescriptionText.AddLink("this link", "https://osu.ppy.sh/wiki/Kudosu");
+                DescriptionText.AddLink("this page", "https://osu.ppy.sh/wiki/Kudosu");
                 DescriptionText.AddText(" for more information.");
             }
         }

From 2e63c2ce20ef4c707150f2eaf3c5a640a9c963c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 21:50:45 +0100
Subject: [PATCH 08523/10326] Fix selection box operation hotkeys not
 registering in change handler

Could lead to crashes after reversing a note cluster and playing it
back.

The root cause of the crash was that the hotkey operations were not ran
inside of an editor change handler operation. This, in turn, caused the
autoplay replay to not be regenerated after flipping an object cluster,
therefore finally manifesting as a hard crash due to negative time
offsets appearing in judgement results, which interfered with the
default implementation of note lock.

Note that this incidentally also fixes the fact that selection box
hotkey operations (reverse and flip) did not handle undo/redo.
---
 .../Edit/Compose/Components/SelectionBox.cs       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 2f4721f63e..9d6b44e207 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -113,16 +113,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (e.Repeat || !e.ControlPressed)
                 return false;
 
+            bool runOperationFromHotkey(Func<bool> operation)
+            {
+                operationStarted();
+                bool result = operation?.Invoke() ?? false;
+                operationEnded();
+
+                return result;
+            }
+
             switch (e.Key)
             {
                 case Key.G:
-                    return CanReverse && OnReverse?.Invoke() == true;
+                    return CanReverse && runOperationFromHotkey(OnReverse);
 
                 case Key.H:
-                    return CanScaleX && OnFlip?.Invoke(Direction.Horizontal) == true;
+                    return CanScaleX && runOperationFromHotkey(() => OnFlip?.Invoke(Direction.Horizontal) ?? false);
 
                 case Key.J:
-                    return CanScaleY && OnFlip?.Invoke(Direction.Vertical) == true;
+                    return CanScaleY && runOperationFromHotkey(() => OnFlip?.Invoke(Direction.Vertical) ?? false);
             }
 
             return base.OnKeyDown(e);

From 08ffe425f9b9a1cd9eba6c3cd903264680244090 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 17 Mar 2021 14:46:23 -0700
Subject: [PATCH 08524/10326] Update kudosu description color in line with web

---
 osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
index 87622939e2..115d705766 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
@@ -103,7 +103,6 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
             private void load(OverlayColourProvider colourProvider)
             {
                 lineBackground.Colour = colourProvider.Highlight1;
-                DescriptionText.Colour = colourProvider.Foreground1;
             }
         }
     }

From f95ce90c95495691e1d7c57e10a8c456ffbfc82c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 23:32:08 +0100
Subject: [PATCH 08525/10326] Adjust kudosu count formatting

---
 osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
index 115d705766..cdb24b784c 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
 
             public new int Count
             {
-                set => valueText.Text = value.ToString();
+                set => valueText.Text = value.ToString("N0");
             }
 
             public CountSection(string header)

From df6570ebf544dd6157e14376055ec271fd9c132c Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Wed, 17 Mar 2021 15:31:16 -0700
Subject: [PATCH 08526/10326] Improve logic and add previously failing test
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>
---
 .../Visual/Editing/TestSceneEditorClock.cs    | 35 ++++++++++++++-----
 osu.Game/Screens/Edit/EditorClock.cs          | 26 +++++++-------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index 58375f295b..390198be04 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -49,14 +49,33 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestStopAtTrackEnd()
         {
-            AddStep("Reset clock", () => Clock.Seek(0));
-            AddStep("Start clock", Clock.Start);
-            AddAssert("Clock running", () => Clock.IsRunning);
-            AddStep("Seek near end", () => Clock.Seek(Clock.TrackLength - 250));
-            AddUntilStep("Clock stops", () => !Clock.IsRunning);
-            AddAssert("Clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
-            AddStep("Start clock again", Clock.Start);
-            AddAssert("Clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
+            AddStep("reset clock", () => Clock.Seek(0));
+
+            AddStep("start clock", Clock.Start);
+            AddAssert("clock running", () => Clock.IsRunning);
+
+            AddStep("seek near end", () => Clock.Seek(Clock.TrackLength - 250));
+            AddUntilStep("clock stops", () => !Clock.IsRunning);
+
+            AddAssert("clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
+
+            AddStep("start clock again", Clock.Start);
+            AddAssert("clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
+        }
+
+        [Test]
+        public void TestWrapWhenStoppedAtTrackEnd()
+        {
+            AddStep("reset clock", () => Clock.Seek(0));
+
+            AddStep("stop clock", Clock.Stop);
+            AddAssert("clock stopped", () => !Clock.IsRunning);
+
+            AddStep("seek exactly to end", () => Clock.Seek(Clock.TrackLength));
+            AddAssert("clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
+
+            AddStep("start clock again", Clock.Start);
+            AddAssert("clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 94bb4f5228..e227bd29bf 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -172,6 +172,10 @@ namespace osu.Game.Screens.Edit
         public void Start()
         {
             ClearTransforms();
+
+            if (playbackFinished)
+                underlyingClock.Seek(0);
+
             underlyingClock.Start();
         }
 
@@ -222,21 +226,15 @@ namespace osu.Game.Screens.Edit
         {
             underlyingClock.ProcessFrame();
 
-            if (IsRunning)
-            {
-                var playbackAlreadyStopped = playbackFinished;
-                playbackFinished = CurrentTime >= TrackLength;
+            var playbackAlreadyStopped = playbackFinished;
+            playbackFinished = CurrentTime >= TrackLength;
 
-                if (playbackFinished)
-                {
-                    if (!playbackAlreadyStopped)
-                    {
-                        underlyingClock.Stop();
-                        underlyingClock.Seek(TrackLength);
-                    }
-                    else
-                        underlyingClock.Seek(0);
-                }
+            if (playbackFinished && !playbackAlreadyStopped)
+            {
+                if (IsRunning)
+                    underlyingClock.Stop();
+
+                underlyingClock.Seek(TrackLength);
             }
         }
 

From bb3c3f302aa4b0cd2f0e5e8a9d80235fc7d810fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Mar 2021 15:36:07 +0900
Subject: [PATCH 08527/10326] Fix skin parser not stripping whitespace before
 parsing

---
 osu.Game.Tests/Resources/skin-with-space.ini  | 2 ++
 osu.Game.Tests/Skins/LegacySkinDecoderTest.cs | 9 +++++++++
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    | 2 ++
 3 files changed, 13 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/skin-with-space.ini

diff --git a/osu.Game.Tests/Resources/skin-with-space.ini b/osu.Game.Tests/Resources/skin-with-space.ini
new file mode 100644
index 0000000000..3e64257a3e
--- /dev/null
+++ b/osu.Game.Tests/Resources/skin-with-space.ini
@@ -0,0 +1,2 @@
+[General] 
+Version: 2
\ No newline at end of file
diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
index aedf26ee75..dcb866c99f 100644
--- a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
@@ -91,6 +91,15 @@ namespace osu.Game.Tests.Skins
                 Assert.AreEqual(2.0m, decoder.Decode(stream).LegacyVersion);
         }
 
+        [Test]
+        public void TestStripWhitespace()
+        {
+            var decoder = new LegacySkinDecoder();
+            using (var resStream = TestResources.OpenResource("skin-with-space.ini"))
+            using (var stream = new LineBufferedReader(resStream))
+                Assert.AreEqual(2.0m, decoder.Decode(stream).LegacyVersion);
+        }
+
         [Test]
         public void TestDecodeLatestVersion()
         {
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 2fb24c24e0..bd1b6627b4 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -36,6 +36,8 @@ namespace osu.Game.Beatmaps.Formats
                 if (ShouldSkipLine(line))
                     continue;
 
+                line = line.Trim();
+
                 if (line.StartsWith('[') && line.EndsWith(']'))
                 {
                     if (!Enum.TryParse(line[1..^1], out section))

From 5b0d75ee56690dbb3a121d741768515417f51ee8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Mar 2021 16:30:30 +0900
Subject: [PATCH 08528/10326] Only trim trailing spaces to avoid breakage in
 storyboard parsing

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs  | 14 ++++++--------
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs         |  4 +---
 .../Beatmaps/Formats/LegacyStoryboardDecoder.cs    |  2 --
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs        |  2 --
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 99dffa7041..40bc75e847 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -67,16 +67,14 @@ namespace osu.Game.Beatmaps.Formats
 
         protected override void ParseLine(Beatmap beatmap, Section section, string line)
         {
-            var strippedLine = StripComments(line);
-
             switch (section)
             {
                 case Section.General:
-                    handleGeneral(strippedLine);
+                    handleGeneral(line);
                     return;
 
                 case Section.Editor:
-                    handleEditor(strippedLine);
+                    handleEditor(line);
                     return;
 
                 case Section.Metadata:
@@ -84,19 +82,19 @@ namespace osu.Game.Beatmaps.Formats
                     return;
 
                 case Section.Difficulty:
-                    handleDifficulty(strippedLine);
+                    handleDifficulty(line);
                     return;
 
                 case Section.Events:
-                    handleEvent(strippedLine);
+                    handleEvent(line);
                     return;
 
                 case Section.TimingPoints:
-                    handleTimingPoint(strippedLine);
+                    handleTimingPoint(line);
                     return;
 
                 case Section.HitObjects:
-                    handleHitObject(strippedLine);
+                    handleHitObject(line);
                     return;
             }
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index bd1b6627b4..10a716963e 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Beatmaps.Formats
                 if (ShouldSkipLine(line))
                     continue;
 
-                line = line.Trim();
+                line = StripComments(line).TrimEnd();
 
                 if (line.StartsWith('[') && line.EndsWith(']'))
                 {
@@ -73,8 +73,6 @@ namespace osu.Game.Beatmaps.Formats
 
         protected virtual void ParseLine(T output, Section section, string line)
         {
-            line = StripComments(line);
-
             switch (section)
             {
                 case Section.Colours:
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index b9bf6823b5..6301c42deb 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -45,8 +45,6 @@ namespace osu.Game.Beatmaps.Formats
 
         protected override void ParseLine(Storyboard storyboard, Section section, string line)
         {
-            line = StripComments(line);
-
             switch (section)
             {
                 case Section.General:
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 0a1de461ea..5308640bdd 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Skinning
 
         protected override void ParseLine(List<LegacyManiaSkinConfiguration> output, Section section, string line)
         {
-            line = StripComments(line);
-
             switch (section)
             {
                 case Section.Mania:

From b68dc686ee9bf7c978fd746248403a6decbf18a4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Mar 2021 19:19:53 +0900
Subject: [PATCH 08529/10326] Fix converted mania scores not accounting for
 GREATs

---
 osu.Game/Scoring/ScoreManager.cs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 1e90ee1ac7..5fa971ce80 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -20,6 +20,7 @@ using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring.Legacy;
 
@@ -157,9 +158,19 @@ namespace osu.Game.Scoring
                 }
 
                 int beatmapMaxCombo;
+                double accuracy = score.Accuracy;
 
                 if (score.IsLegacyScore)
                 {
+                    if (score.RulesetID == 3)
+                    {
+                        // Recalculate mania's accuracy based on hit statistics.
+                        double maxBaseScore = score.Statistics.Select(kvp => kvp.Value).Sum() * Judgement.ToNumericResult(HitResult.Perfect);
+                        double baseScore = score.Statistics.Select(kvp => Judgement.ToNumericResult(kvp.Key) * kvp.Value).Sum();
+                        if (maxBaseScore > 0)
+                            accuracy = baseScore / maxBaseScore;
+                    }
+
                     // This score is guaranteed to be an osu!stable score.
                     // The combo must be determined through either the beatmap's max combo value or the difficulty calculator, as lazer's scoring has changed and the score statistics cannot be used.
                     if (score.Beatmap.MaxCombo == null)
@@ -176,7 +187,7 @@ namespace osu.Game.Scoring
                         difficultyBindable.BindValueChanged(d =>
                         {
                             if (d.NewValue is StarDifficulty diff)
-                                updateScore(diff.MaxCombo);
+                                updateScore(diff.MaxCombo, accuracy);
                         }, true);
 
                         return;
@@ -191,10 +202,10 @@ namespace osu.Game.Scoring
                     beatmapMaxCombo = Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r.AffectsCombo()).Select(r => score.Statistics.GetOrDefault(r)).Sum();
                 }
 
-                updateScore(beatmapMaxCombo);
+                updateScore(beatmapMaxCombo, accuracy);
             }
 
-            private void updateScore(int beatmapMaxCombo)
+            private void updateScore(int beatmapMaxCombo, double accuracy)
             {
                 if (beatmapMaxCombo == 0)
                 {
@@ -207,7 +218,7 @@ namespace osu.Game.Scoring
 
                 scoreProcessor.Mods.Value = score.Mods;
 
-                Value = (long)Math.Round(scoreProcessor.GetScore(ScoringMode.Value, beatmapMaxCombo, score.Accuracy, (double)score.MaxCombo / beatmapMaxCombo, score.Statistics));
+                Value = (long)Math.Round(scoreProcessor.GetScore(ScoringMode.Value, beatmapMaxCombo, accuracy, (double)score.MaxCombo / beatmapMaxCombo, score.Statistics));
             }
         }
 

From 917717686a6bef391d86cb4a92683e9442ac8c78 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Mar 2021 19:26:29 +0900
Subject: [PATCH 08530/10326] Expand explanatory comment

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

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 5fa971ce80..7d0abc5996 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -164,7 +164,9 @@ namespace osu.Game.Scoring
                 {
                     if (score.RulesetID == 3)
                     {
-                        // Recalculate mania's accuracy based on hit statistics.
+                        // In osu!stable, a full-GREAT score has 100% accuracy in mania. Along with a full combo, the score becomes indistinguishable from a full-PERFECT score.
+                        // To get around this, recalculate accuracy based on the hit statistics.
+                        // Note: This cannot be applied universally to all legacy scores, as some rulesets (e.g. catch) group multiple judgements together.
                         double maxBaseScore = score.Statistics.Select(kvp => kvp.Value).Sum() * Judgement.ToNumericResult(HitResult.Perfect);
                         double baseScore = score.Statistics.Select(kvp => Judgement.ToNumericResult(kvp.Key) * kvp.Value).Sum();
                         if (maxBaseScore > 0)

From 0c3c8141dac75fbc7ccd5c8d79746dc413c8df21 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Mar 2021 19:39:42 +0900
Subject: [PATCH 08531/10326] Remove Expires and RemoveWhenNotAlive override

---
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs | 4 ----
 osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs             | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
index aad9f53b93..21bd35ad22 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
@@ -13,8 +13,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyHitExplosion : CompositeDrawable, IAnimatableHitExplosion
     {
-        public override bool RemoveWhenNotAlive => false;
-
         private readonly Drawable sprite;
 
         [CanBeNull]
@@ -73,8 +71,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 .Then().ScaleTo(1.1f, animation_time * 0.8)
                 .Then().ScaleTo(0.9f, animation_time * 0.4)
                 .Then().ScaleTo(1f, animation_time * 0.2);
-
-            Expire(true);
         }
 
         public void AnimateSecondHit()
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
index 5bb463353d..91e844187a 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 {
     internal class DefaultHitExplosion : CircularContainer, IAnimatableHitExplosion
     {
-        public override bool RemoveWhenNotAlive => false;
-
         private readonly HitResult result;
 
         [CanBeNull]
@@ -73,8 +71,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             this.ScaleTo(3f, 1000, Easing.OutQuint);
             this.FadeOut(500);
-
-            Expire(true);
         }
 
         public void AnimateSecondHit()

From c694deb7d605759a3d7c6b7877d85bf422be4425 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Mar 2021 21:16:50 +0900
Subject: [PATCH 08532/10326] Revert changes to SettingsSourceAttribute class

---
 .../Configuration/SettingSourceAttribute.cs   | 39 +------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 39d7fba32b..cfce615130 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -5,10 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Humanizer;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;
@@ -63,21 +61,12 @@ namespace osu.Game.Configuration
 
     public static class SettingSourceExtensions
     {
-        public static IReadOnlyList<Drawable> CreateSettingsControls(this object obj, bool includeDisabled = true) =>
-            createSettingsControls(obj, obj.GetOrderedSettingsSourceProperties(), includeDisabled).ToArray();
-
-        public static IReadOnlyList<Drawable> CreateSettingsControlsFromAllBindables(this object obj, bool includeDisabled = true) =>
-            createSettingsControls(obj, obj.GetSettingsSourcePropertiesFromBindables(), includeDisabled).ToArray();
-
-        private static IEnumerable<Drawable> createSettingsControls(object obj, IEnumerable<(SettingSourceAttribute, PropertyInfo)> sourceAttribs, bool includeDisabled = true)
+        public static IEnumerable<Drawable> CreateSettingsControls(this object obj)
         {
-            foreach (var (attr, property) in sourceAttribs)
+            foreach (var (attr, property) in obj.GetOrderedSettingsSourceProperties())
             {
                 object value = property.GetValue(obj);
 
-                if ((value as IBindable)?.Disabled == true)
-                    continue;
-
                 switch (value)
                 {
                     case BindableNumber<float> bNumber:
@@ -150,30 +139,6 @@ namespace osu.Game.Configuration
             }
         }
 
-        public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourcePropertiesFromBindables(this object obj)
-        {
-            HashSet<string> handledProperties = new HashSet<string>();
-
-            // reverse and de-dupe properties to surface base class settings to the top of return order.
-            foreach (var type in obj.GetType().EnumerateBaseTypes().Reverse())
-            {
-                foreach (var property in type.GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))
-                {
-                    if (handledProperties.Contains(property.Name))
-                        continue;
-
-                    handledProperties.Add(property.Name);
-
-                    if (typeof(IBindable).IsAssignableFrom(property.PropertyType))
-                    {
-                        var val = property.GetValue(obj);
-                        string description = (val as IHasDescription)?.Description ?? string.Empty;
-                        yield return (new SettingSourceAttribute(property.Name.Humanize(), description), property);
-                    }
-                }
-            }
-        }
-
         public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourceProperties(this object obj)
         {
             foreach (var property in obj.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))

From a8cc3a3b4468c885504c69ef9fbdb0dc62df059c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Mar 2021 21:17:04 +0900
Subject: [PATCH 08533/10326] Implement enable state changes locally for
 InputHandlers which should be toggleable

---
 .../Settings/Sections/InputSection.cs         | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index e6aaa1ade9..8d5944f5bf 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -9,7 +9,6 @@ using osu.Framework.Input.Handlers.Joystick;
 using osu.Framework.Input.Handlers.Midi;
 using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Platform;
-using osu.Game.Configuration;
 using osu.Game.Overlays.Settings.Sections.Input;
 
 namespace osu.Game.Overlays.Settings.Sections
@@ -70,13 +69,6 @@ namespace osu.Game.Overlays.Settings.Sections
                     return null;
             }
 
-            var settingsControls = handler.CreateSettingsControlsFromAllBindables(false);
-
-            if (settingsControls.Count == 0)
-                return null;
-
-            section.AddRange(settingsControls);
-
             return section;
         }
 
@@ -89,6 +81,19 @@ namespace osu.Game.Overlays.Settings.Sections
                 this.handler = handler;
             }
 
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Children = new Drawable[]
+                {
+                    new SettingsCheckbox
+                    {
+                        LabelText = "Enabled",
+                        Current = handler.Enabled
+                    },
+                };
+            }
+
             protected override string Header => handler.Description;
         }
     }

From b419d2c2e27762af7701c1823ae9e7786a730e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 18 Mar 2021 19:52:38 +0100
Subject: [PATCH 08534/10326] Fix invalid xmldoc indent

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

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 571d65e28b..b69e99773c 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -506,7 +506,7 @@ namespace osu.Game.Skinning
             Samples?.Dispose();
         }
 
-          /// <summary>
+        /// <summary>
         /// A sample wrapper which keeps a reference to the contained skin to avoid finalizer garbage collection of the managing SampleStore.
         /// </summary>
         private class LegacySkinSample : ISample

From b9761c819629f64d647d6178e7bbd7c9987b2b28 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Thu, 18 Mar 2021 16:20:31 -0700
Subject: [PATCH 08535/10326] Further simplify logic

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

diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index e227bd29bf..d0197ce1ec 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -226,15 +226,15 @@ namespace osu.Game.Screens.Edit
         {
             underlyingClock.ProcessFrame();
 
-            var playbackAlreadyStopped = playbackFinished;
             playbackFinished = CurrentTime >= TrackLength;
 
-            if (playbackFinished && !playbackAlreadyStopped)
+            if (playbackFinished)
             {
                 if (IsRunning)
                     underlyingClock.Stop();
 
-                underlyingClock.Seek(TrackLength);
+                if (CurrentTime > TrackLength)
+                    underlyingClock.Seek(TrackLength);
             }
         }
 

From 5f31304d05fa71b356651643608aa34f8207e323 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 14:00:26 +0900
Subject: [PATCH 08536/10326] Give each type of slider path type a unique
 colour to help visually distinguish them

---
 .../Components/PathControlPointPiece.cs       | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index e9838de63d..311ab8ee62 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -12,6 +12,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
 using osuTK;
@@ -195,7 +196,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             markerRing.Alpha = IsSelected.Value ? 1 : 0;
 
-            Color4 colour = ControlPoint.Type.Value != null ? colours.Red : colours.Yellow;
+            Color4 colour = getColourFromNodeType();
 
             if (IsHovered || IsSelected.Value)
                 colour = colour.Lighten(1);
@@ -203,5 +204,26 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             marker.Colour = colour;
             marker.Scale = new Vector2(slider.Scale);
         }
+
+        private Color4 getColourFromNodeType()
+        {
+            if (!(ControlPoint.Type.Value is PathType pathType))
+                return colours.Yellow;
+
+            switch (pathType)
+            {
+                case PathType.Catmull:
+                    return colours.Seafoam;
+
+                case PathType.Bezier:
+                    return colours.Pink;
+
+                case PathType.PerfectCurve:
+                    return colours.PurpleDark;
+
+                default:
+                    return colours.Red;
+            }
+        }
     }
 }

From 0e821e857e34f810e1ede0c9f28df6678602caf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 15:23:31 +0900
Subject: [PATCH 08537/10326] Remove unnecessary duplicated skin changed
 handling

For some reason we were handling this both in `DrawableSkinnableSound`
and `PoolableSkinnableSample` in very similar ways. Only one seems
required.
---
 osu.Game/Skinning/SkinnableSound.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index edd3a2cdd3..e447f9c44c 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -139,12 +139,6 @@ namespace osu.Game.Skinning
             samplesContainer.ForEach(c => c.Stop());
         }
 
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-            updateSamples();
-        }
-
         private void updateSamples()
         {
             bool wasPlaying = IsPlaying;

From bf4317d3f06ecd3ba29c2f43c33561e5557c3b24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 15:34:19 +0900
Subject: [PATCH 08538/10326] Ensure looping is disabled on old samples when
 switching skins

---
 osu.Game/Skinning/PoolableSkinnableSample.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 9103a6a960..09e087d0f2 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -83,6 +83,14 @@ namespace osu.Game.Skinning
 
             bool wasPlaying = Playing;
 
+            if (activeChannel != null)
+            {
+                // when switching away from previous samples, we don't want to call Stop() on them as it sounds better to let them play out.
+                // this may change in the future if we use PoolableSkinSample in more locations than gameplay.
+                // we *do* want to turn off looping, else we end up with an infinite looping sample running in the background.
+                activeChannel.Looping = false;
+            }
+
             sampleContainer.Clear();
             Sample = null;
 

From 9491e6394a65de287bb05c96188db69ca7837158 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 15:46:43 +0900
Subject: [PATCH 08539/10326] Include the bundled skins when selecting a random
 skin

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

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 601b77e782..752c742a45 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Skinning
         public void SelectRandomSkin()
         {
             // choose from only user skins, removing the current selection to ensure a new one is chosen.
-            var randomChoices = GetAllUsableSkins().Where(s => s.ID > 0 && s.ID != CurrentSkinInfo.Value.ID).ToArray();
+            var randomChoices = GetAllUsableSkins().Where(s => s.ID != CurrentSkinInfo.Value.ID).ToArray();
 
             if (randomChoices.Length == 0)
             {

From a9c4fa442a983534897b6d91e3fe9dd60d97dead Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 16:47:39 +0900
Subject: [PATCH 08540/10326] Avoid potential crash if an overlay is toggled
 before it has been loaded

---
 osu.Game/OsuGame.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 66b9141ce8..e5e1f6946e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -756,6 +756,10 @@ namespace osu.Game
 
         private void showOverlayAboveOthers(OverlayContainer overlay, OverlayContainer[] otherOverlays)
         {
+            // generally shouldn't ever hit this state, but protects against a crash on attempting to change ChildDepth.
+            if (overlay.LoadState < LoadState.Ready)
+                return;
+
             otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
 
             // show above others if not visible at all, else leave at current depth.

From 27c38db14dee71d4f5a40300acbe90eb84d8bf3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 16:58:08 +0900
Subject: [PATCH 08541/10326] Add tooltips for slider path nodes which aren't
 inheriting

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 311ab8ee62..1390675a1a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 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.Input.Events;
 using osu.Game.Graphics;
@@ -24,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
     /// <summary>
     /// A visualisation of a single <see cref="PathControlPoint"/> in a <see cref="Slider"/>.
     /// </summary>
-    public class PathControlPointPiece : BlueprintPiece<Slider>
+    public class PathControlPointPiece : BlueprintPiece<Slider>, IHasTooltip
     {
         public Action<PathControlPointPiece, MouseButtonEvent> RequestSelection;
 
@@ -225,5 +226,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     return colours.Red;
             }
         }
+
+        public string TooltipText => ControlPoint.Type.Value.ToString() ?? string.Empty;
     }
 }

From 0195d654cacb2e496ce7cc2b3c3b3991111eabb3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 17:09:49 +0900
Subject: [PATCH 08542/10326] Increase the precision of speed multiplier to
 match osu-stable

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

diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 0bc5605051..73337ab6f5 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         public readonly BindableDouble SpeedMultiplierBindable = new BindableDouble(1)
         {
-            Precision = 0.1,
+            Precision = 0.01,
             Default = 1,
             MinValue = 0.1,
             MaxValue = 10

From 32c571fc94a0ca6521b25226670f79238dc9bf98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 17:13:30 +0900
Subject: [PATCH 08543/10326] Adjust keyboard step to be something sensible

---
 osu.Game/Screens/Edit/Timing/DifficultySection.cs      | 3 ++-
 osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/DifficultySection.cs b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
index b87b8961f8..9d80ca0b14 100644
--- a/osu.Game/Screens/Edit/Timing/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
@@ -18,7 +18,8 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 multiplierSlider = new SliderWithTextBoxInput<double>("Speed Multiplier")
                 {
-                    Current = new DifficultyControlPoint().SpeedMultiplierBindable
+                    Current = new DifficultyControlPoint().SpeedMultiplierBindable,
+                    KeyboardStep = 0.1f
                 }
             });
         }
diff --git a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
index f2f9f76143..10a5771520 100644
--- a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
+++ b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
@@ -69,6 +69,15 @@ namespace osu.Game.Screens.Edit.Timing
             }, true);
         }
 
+        /// <summary>
+        /// A custom step value for each key press which actuates a change on this control.
+        /// </summary>
+        public float KeyboardStep
+        {
+            get => slider.KeyboardStep;
+            set => slider.KeyboardStep = value;
+        }
+
         public Bindable<T> Current
         {
             get => slider.Current;

From 563a0584d589bf0dce7c29fffc03268b097db485 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 18:48:51 +0900
Subject: [PATCH 08544/10326] Implement editor timeline stacking support

---
 .../Timeline/TimelineBlueprintContainer.cs    | 50 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 1fc529910b..4522418e87 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -121,6 +123,46 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
 
             base.Update();
+
+            updateStacking();
+        }
+
+        private void updateStacking()
+        {
+            // because only blueprints of objects which are alive (via pooling) are displayed in the timeline, it's feasible to do this every-update.
+
+            const int stack_offset = 5;
+
+            // after the stack gets this tall, we can presume there is space underneath to draw subsequent blueprints.
+            const int stack_reset_count = 3;
+
+            Stack<double> currentConcurrentObjects = new Stack<double>();
+
+            foreach (var b in SelectionBlueprints.Reverse())
+            {
+                while (currentConcurrentObjects.TryPeek(out double stackEndTime))
+                {
+                    if (Precision.AlmostBigger(stackEndTime, b.HitObject.StartTime, 1))
+                        break;
+
+                    currentConcurrentObjects.Pop();
+                }
+
+                b.Y = -(stack_offset * currentConcurrentObjects.Count);
+
+                var bEndTime = b.HitObject.GetEndTime();
+
+                // if the stack gets too high, we should have space below it to display the next batch of objects.
+                // importantly, we only do this if time has incremented, else a stack of hitobjects all at the same time value would start to overlap themselves.
+                if (!currentConcurrentObjects.TryPeek(out double nextStackEndTime) ||
+                    !Precision.AlmostEquals(nextStackEndTime, bEndTime, 1))
+                {
+                    if (currentConcurrentObjects.Count >= stack_reset_count)
+                        currentConcurrentObjects.Clear();
+                }
+
+                currentConcurrentObjects.Push(bEndTime);
+            }
         }
 
         protected override SelectionHandler CreateSelectionHandler() => new TimelineSelectionHandler();
@@ -203,7 +245,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 Box.X = Math.Min(rescaledStart, rescaledEnd);
                 Box.Width = Math.Abs(rescaledStart - rescaledEnd);
 
-                PerformSelection?.Invoke(Box.ScreenSpaceDrawQuad.AABBFloat);
+                var boxScreenRect = Box.ScreenSpaceDrawQuad.AABBFloat;
+
+                // we don't care about where the hitobjects are vertically. in cases like stacking display, they may be outside the box without this adjustment.
+                boxScreenRect.Y -= boxScreenRect.Height;
+                boxScreenRect.Height *= 2;
+
+                PerformSelection?.Invoke(boxScreenRect);
             }
 
             public override void Hide()

From 1c865682ae3b0d4116fa8483b1e173c67ab079a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 16:25:50 +0900
Subject: [PATCH 08545/10326] Add tablet configuration tests

---
 .../Settings/TestSceneTabletAreaSelection.cs  | 104 ++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs
new file mode 100644
index 0000000000..30e265baaa
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.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 NUnit.Framework;
+using OpenTabletDriver.Plugin.Tablet;
+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;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    [TestFixture]
+    public class TestSceneTabletAreaSelection : OsuTestScene
+    {
+        private TabletAreaSelection areaSelection;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            DigitizerIdentifier testTablet = new DigitizerIdentifier
+            {
+                // size specifications in millimetres.
+                Width = 160,
+                Height = 100,
+            };
+
+            AddRange(new[]
+            {
+                areaSelection = new TabletAreaSelection(testTablet)
+                {
+                    State = { Value = Visibility.Visible }
+                }
+            });
+        }
+    }
+
+    public class TabletAreaSelection : OsuFocusedOverlayContainer
+    {
+        private readonly DigitizerIdentifier tablet;
+
+        private readonly Container tabletContainer;
+        private readonly Container usableAreaContainer;
+
+        public TabletAreaSelection(DigitizerIdentifier tablet)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            this.tablet = tablet;
+
+            InternalChildren = new Drawable[]
+            {
+                tabletContainer = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(3),
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.White,
+                        },
+                        usableAreaContainer = new Container
+                        {
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4.Yellow,
+                                },
+                                new OsuSpriteText
+                                {
+                                    Text = "usable area",
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Colour = Color4.Black,
+                                    Font = OsuFont.Default.With(size: 12)
+                                }
+                            }
+                        },
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            // TODO: handle tablet device changes etc.
+            tabletContainer.Size = new Vector2(tablet.Width, tablet.Height);
+
+            usableAreaContainer.Position = new Vector2(10, 30);
+            usableAreaContainer.Size = new Vector2(80, 60);
+        }
+    }
+}

From d026c8da851a5fbd399206b8efff28b76c09c643 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 18:37:46 +0900
Subject: [PATCH 08546/10326] Initial pass of configuration interface

---
 .../Settings/TestSceneTabletSettings.cs       |  40 +++++++
 .../Sections/Input/TabletAreaSelection.cs     |  79 ++++++-------
 .../Settings/Sections/Input/TabletSettings.cs | 111 ++++++++++++++++++
 .../Settings/Sections/InputSection.cs         |   6 +
 4 files changed, 194 insertions(+), 42 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
 rename osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs => osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs (55%)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
new file mode 100644
index 0000000000..be5b355e06
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.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.Drawing;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Handlers.Tablet;
+using osu.Framework.Platform;
+using osu.Game.Overlays.Settings.Sections.Input;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    [TestFixture]
+    public class TestSceneTabletSettings : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
+        {
+            var tabletHandler = host.AvailableInputHandlers.OfType<ITabletHandler>().FirstOrDefault();
+
+            if (tabletHandler == null)
+                return;
+
+            tabletHandler.AreaOffset.MinValue = new Size(0, 0);
+            tabletHandler.AreaOffset.MaxValue = new Size(160, 100);
+            tabletHandler.AreaOffset.Value = new Size(10, 10);
+
+            tabletHandler.AreaSize.MinValue = new Size(0, 0);
+            tabletHandler.AreaSize.MaxValue = new Size(160, 100);
+            tabletHandler.AreaSize.Value = new Size(100, 80);
+
+            AddRange(new Drawable[]
+            {
+                new TabletSettings(tabletHandler),
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
similarity index 55%
rename from osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs
rename to osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 30e265baaa..31a2768735 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -1,65 +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 NUnit.Framework;
-using OpenTabletDriver.Plugin.Tablet;
+using System.Drawing;
 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.Handlers.Tablet;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
+
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Settings
+namespace osu.Game.Overlays.Settings.Sections.Input
 {
-    [TestFixture]
-    public class TestSceneTabletAreaSelection : OsuTestScene
+    public class TabletAreaSelection : CompositeDrawable
     {
-        private TabletAreaSelection areaSelection;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            DigitizerIdentifier testTablet = new DigitizerIdentifier
-            {
-                // size specifications in millimetres.
-                Width = 160,
-                Height = 100,
-            };
-
-            AddRange(new[]
-            {
-                areaSelection = new TabletAreaSelection(testTablet)
-                {
-                    State = { Value = Visibility.Visible }
-                }
-            });
-        }
-    }
-
-    public class TabletAreaSelection : OsuFocusedOverlayContainer
-    {
-        private readonly DigitizerIdentifier tablet;
+        private readonly ITabletHandler handler;
 
         private readonly Container tabletContainer;
         private readonly Container usableAreaContainer;
 
-        public TabletAreaSelection(DigitizerIdentifier tablet)
-        {
-            RelativeSizeAxes = Axes.Both;
+        private readonly Bindable<Size> areaOffset = new BindableSize();
+        private readonly Bindable<Size> areaSize = new BindableSize();
+        private readonly Bindable<Size> tabletSize = new BindableSize();
 
-            this.tablet = tablet;
+        public TabletAreaSelection(ITabletHandler handler)
+        {
+            this.handler = handler;
+
+            Padding = new MarginPadding(5);
 
             InternalChildren = new Drawable[]
             {
                 tabletContainer = new Container
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(3),
+                    Masking = true,
+                    CornerRadius = 5,
+                    BorderThickness = 2,
+                    BorderColour = Color4.Black,
                     Children = new Drawable[]
                     {
                         new Box
@@ -69,6 +50,8 @@ namespace osu.Game.Tests.Visual.Settings
                         },
                         usableAreaContainer = new Container
                         {
+                            Masking = true,
+                            CornerRadius = 5,
                             Children = new Drawable[]
                             {
                                 new Box
@@ -94,11 +77,23 @@ namespace osu.Game.Tests.Visual.Settings
         [BackgroundDependencyLoader]
         private void load()
         {
-            // TODO: handle tablet device changes etc.
-            tabletContainer.Size = new Vector2(tablet.Width, tablet.Height);
+            areaOffset.BindTo(handler.AreaOffset);
+            areaOffset.BindValueChanged(val =>
+            {
+                usableAreaContainer.MoveTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
+            }, true);
 
-            usableAreaContainer.Position = new Vector2(10, 30);
-            usableAreaContainer.Size = new Vector2(80, 60);
+            areaSize.BindTo(handler.AreaSize);
+            areaSize.BindValueChanged(val =>
+            {
+                usableAreaContainer.ResizeTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
+            }, true);
+
+            ((IBindable<Size>)tabletSize).BindTo(handler.TabletSize);
+            tabletSize.BindValueChanged(val =>
+            {
+                tabletContainer.ResizeTo(new Vector2(tabletSize.Value.Width, tabletSize.Value.Height), 100, Easing.OutQuint);
+            }, true);
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
new file mode 100644
index 0000000000..5df9c879eb
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -0,0 +1,111 @@
+// Copyright (c) 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.Drawing;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Handlers.Tablet;
+using osu.Game.Configuration;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public class TabletSettings : SettingsSubsection
+    {
+        private readonly ITabletHandler tabletHandler;
+
+        private readonly BindableSize areaOffset = new BindableSize();
+        private readonly BindableSize areaSize = new BindableSize();
+        private readonly BindableSize tabletSize = new BindableSize();
+
+        private readonly BindableNumber<int> offsetX = new BindableNumber<int> { MinValue = 0 };
+        private readonly BindableNumber<int> offsetY = new BindableNumber<int> { MinValue = 0 };
+
+        private readonly BindableNumber<int> sizeX = new BindableNumber<int> { MinValue = 0 };
+        private readonly BindableNumber<int> sizeY = new BindableNumber<int> { MinValue = 0 };
+
+        protected override string Header => "Tablet";
+
+        public TabletSettings(ITabletHandler tabletHandler)
+        {
+            this.tabletHandler = tabletHandler;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
+        {
+            // TODO: this should all eventually be replaced with a control that handles BindableSize.
+            areaOffset.BindTo(tabletHandler.AreaOffset);
+            areaOffset.BindValueChanged(val =>
+            {
+                offsetX.Value = val.NewValue.Width;
+                offsetY.Value = val.NewValue.Height;
+            }, true);
+
+            offsetX.BindValueChanged(val => areaOffset.Value = new Size(val.NewValue, areaOffset.Value.Height));
+            offsetY.BindValueChanged(val => areaOffset.Value = new Size(areaOffset.Value.Width, val.NewValue));
+
+            areaSize.BindTo(tabletHandler.AreaSize);
+            areaSize.BindValueChanged(val =>
+            {
+                sizeX.Value = val.NewValue.Width;
+                sizeY.Value = val.NewValue.Height;
+            }, true);
+
+            sizeX.BindValueChanged(val => areaSize.Value = new Size(val.NewValue, areaSize.Value.Height));
+            sizeY.BindValueChanged(val => areaSize.Value = new Size(areaSize.Value.Width, val.NewValue));
+
+            ((IBindable<Size>)tabletSize).BindTo(tabletHandler.TabletSize);
+            tabletSize.BindValueChanged(val =>
+            {
+                // todo: these should propagate from a TabletChanged event or similar.
+                offsetX.MaxValue = val.NewValue.Width;
+                sizeX.Default = sizeX.MaxValue = val.NewValue.Width;
+
+                offsetY.MaxValue = val.NewValue.Height;
+                sizeY.Default = sizeY.MaxValue = val.NewValue.Height;
+
+                updateDisplay();
+            }, true);
+        }
+
+        private void updateDisplay()
+        {
+            if (tabletSize.Value == System.Drawing.Size.Empty)
+            {
+                Clear();
+                return;
+            }
+
+            Children = new Drawable[]
+            {
+                new SettingsSlider<int>
+                {
+                    LabelText = "Offset X",
+                    Current = offsetX
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Offset Y",
+                    Current = offsetY
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Size X",
+                    Current = sizeX
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Size Y",
+                    Current = sizeY
+                },
+                new TabletAreaSelection(tabletHandler)
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 100,
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index 8d5944f5bf..6e99891794 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -8,6 +8,7 @@ using osu.Framework.Input.Handlers;
 using osu.Framework.Input.Handlers.Joystick;
 using osu.Framework.Input.Handlers.Midi;
 using osu.Framework.Input.Handlers.Mouse;
+using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
 using osu.Game.Overlays.Settings.Sections.Input;
 
@@ -55,6 +56,11 @@ namespace osu.Game.Overlays.Settings.Sections
 
             switch (handler)
             {
+                // ReSharper disable once SuspiciousTypeConversion.Global (net standard fuckery)
+                case ITabletHandler th:
+                    section = new TabletSettings(th);
+                    break;
+
                 case MouseHandler mh:
                     section = new MouseSettings(mh);
                     break;

From 3b7edf13337a26a9d358b2dd70eef5773ba73332 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 14:45:21 +0900
Subject: [PATCH 08547/10326] Make tablet display always fit to size of
 settings area

---
 .../Settings/TestSceneTabletSettings.cs       |  26 ++++-
 .../Sections/Input/TabletAreaSelection.cs     | 105 ++++++++++--------
 2 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index be5b355e06..6455f51ab9 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Drawing;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
@@ -18,16 +18,13 @@ namespace osu.Game.Tests.Visual.Settings
         [BackgroundDependencyLoader]
         private void load(GameHost host)
         {
-            var tabletHandler = host.AvailableInputHandlers.OfType<ITabletHandler>().FirstOrDefault();
-
-            if (tabletHandler == null)
-                return;
+            var tabletHandler = new TestTabletHandler();
 
             tabletHandler.AreaOffset.MinValue = new Size(0, 0);
             tabletHandler.AreaOffset.MaxValue = new Size(160, 100);
             tabletHandler.AreaOffset.Value = new Size(10, 10);
 
-            tabletHandler.AreaSize.MinValue = new Size(0, 0);
+            tabletHandler.AreaSize.MinValue = new Size(10, 10);
             tabletHandler.AreaSize.MaxValue = new Size(160, 100);
             tabletHandler.AreaSize.Value = new Size(100, 80);
 
@@ -35,6 +32,23 @@ namespace osu.Game.Tests.Visual.Settings
             {
                 new TabletSettings(tabletHandler),
             });
+
+            AddStep("Test with wide tablet", () => tabletHandler.SetTabletSize(new Size(160, 100)));
+            AddStep("Test with square tablet", () => tabletHandler.SetTabletSize(new Size(300, 300)));
+            AddStep("Test with tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 300)));
+            AddStep("Test with very tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 700)));
+        }
+
+        public class TestTabletHandler : ITabletHandler
+        {
+            private readonly Bindable<Size> tabletSize = new Bindable<Size>();
+
+            public BindableSize AreaOffset { get; } = new BindableSize();
+            public BindableSize AreaSize { get; } = new BindableSize();
+            public IBindable<Size> TabletSize => tabletSize;
+            public BindableBool Enabled { get; } = new BindableBool(true);
+
+            public void SetTabletSize(Size size) => tabletSize.Value = size;
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 31a2768735..775aceb5f9 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.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.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,7 +12,6 @@ using osu.Framework.Input.Handlers.Tablet;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
-
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
@@ -20,8 +20,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
     {
         private readonly ITabletHandler handler;
 
-        private readonly Container tabletContainer;
-        private readonly Container usableAreaContainer;
+        private Container tabletContainer;
+        private Container usableAreaContainer;
 
         private readonly Bindable<Size> areaOffset = new BindableSize();
         private readonly Bindable<Size> areaSize = new BindableSize();
@@ -30,53 +30,50 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         public TabletAreaSelection(ITabletHandler handler)
         {
             this.handler = handler;
-
-            Padding = new MarginPadding(5);
-
-            InternalChildren = new Drawable[]
-            {
-                tabletContainer = new Container
-                {
-                    Masking = true,
-                    CornerRadius = 5,
-                    BorderThickness = 2,
-                    BorderColour = Color4.Black,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.White,
-                        },
-                        usableAreaContainer = new Container
-                        {
-                            Masking = true,
-                            CornerRadius = 5,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Color4.Yellow,
-                                },
-                                new OsuSpriteText
-                                {
-                                    Text = "usable area",
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Colour = Color4.Black,
-                                    Font = OsuFont.Default.With(size: 12)
-                                }
-                            }
-                        },
-                    }
-                }
-            };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
+            Padding = new MarginPadding(5);
+
+            InternalChild = tabletContainer = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Masking = true,
+                CornerRadius = 5,
+                BorderThickness = 2,
+                BorderColour = Color4.Black,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.White,
+                    },
+                    usableAreaContainer = new Container
+                    {
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4.Yellow,
+                            },
+                            new OsuSpriteText
+                            {
+                                Text = "usable area",
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Colour = Color4.Black,
+                                Font = OsuFont.Default.With(size: 12)
+                            }
+                        }
+                    },
+                }
+            };
+
             areaOffset.BindTo(handler.AreaOffset);
             areaOffset.BindValueChanged(val =>
             {
@@ -92,8 +89,22 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             ((IBindable<Size>)tabletSize).BindTo(handler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
-                tabletContainer.ResizeTo(new Vector2(tabletSize.Value.Width, tabletSize.Value.Height), 100, Easing.OutQuint);
-            }, true);
+                tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
+            });
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            var size = tabletSize.Value;
+
+            float fitX = size.Width / DrawWidth;
+            float fitY = size.Height / DrawHeight;
+
+            float adjust = MathF.Max(fitX, fitY);
+
+            tabletContainer.Scale = new Vector2(1 / adjust);
         }
     }
 }

From 926e40925ef0ba15bb6a3994f71e291dfd7196c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 15:57:06 +0900
Subject: [PATCH 08548/10326] Add exclude rule to fix dynamic compilations
 issues with settings sections

---
 osu.Game/Overlays/Settings/SettingsSubsection.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Settings/SettingsSubsection.cs b/osu.Game/Overlays/Settings/SettingsSubsection.cs
index 1b82d973e9..6abf6283b9 100644
--- a/osu.Game/Overlays/Settings/SettingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSubsection.cs
@@ -8,10 +8,12 @@ using osu.Game.Graphics.Sprites;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Settings
 {
+    [ExcludeFromDynamicCompile]
     public abstract class SettingsSubsection : FillFlowContainer, IHasFilterableChildren
     {
         protected override Container<Drawable> Content => FlowContent;

From 0a6525baee8afa45b44432e8acc0e13fb0ca1be7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 15:57:29 +0900
Subject: [PATCH 08549/10326] Fix slider bars reloading each time the tablet
 size is changed

---
 .../Settings/Sections/Input/TabletSettings.cs     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 5df9c879eb..ac4a42e984 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -4,10 +4,8 @@
 using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Handlers.Tablet;
-using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -33,9 +31,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
+        private void load()
         {
-            // TODO: this should all eventually be replaced with a control that handles BindableSize.
             areaOffset.BindTo(tabletHandler.AreaOffset);
             areaOffset.BindValueChanged(val =>
             {
@@ -59,6 +56,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             ((IBindable<Size>)tabletSize).BindTo(tabletHandler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
+                if (tabletSize.Value == System.Drawing.Size.Empty)
+                    return;
+
                 // todo: these should propagate from a TabletChanged event or similar.
                 offsetX.MaxValue = val.NewValue.Width;
                 sizeX.Default = sizeX.MaxValue = val.NewValue.Width;
@@ -72,11 +72,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private void updateDisplay()
         {
-            if (tabletSize.Value == System.Drawing.Size.Empty)
-            {
-                Clear();
+            if (Children.Count > 0)
                 return;
-            }
 
             Children = new Drawable[]
             {
@@ -103,7 +100,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 new TabletAreaSelection(tabletHandler)
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = 100,
+                    Height = 300,
                 }
             };
         }

From 94f184d113200bdca2c7c89496948a9e2e3d9990 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:02:39 +0900
Subject: [PATCH 08550/10326] Add feedback when area extends beyond tablet size

---
 .../Sections/Input/TabletAreaSelection.cs      | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 775aceb5f9..77b16a970d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.Yellow,
+                                Colour = Color4.White,
                             },
                             new OsuSpriteText
                             {
@@ -78,21 +78,37 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             areaOffset.BindValueChanged(val =>
             {
                 usableAreaContainer.MoveTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
+                checkBounds();
             }, true);
 
             areaSize.BindTo(handler.AreaSize);
             areaSize.BindValueChanged(val =>
             {
                 usableAreaContainer.ResizeTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
+                checkBounds();
             }, true);
 
             ((IBindable<Size>)tabletSize).BindTo(handler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
                 tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
+                checkBounds();
             });
         }
 
+        [Resolved]
+        private OsuColour colour { get; set; }
+
+        private void checkBounds()
+        {
+            Size areaExtent = areaOffset.Value + areaSize.Value;
+
+            bool isWithinBounds = areaExtent.Width < tabletSize.Value.Width
+                                  && areaExtent.Height < tabletSize.Value.Height;
+
+            usableAreaContainer.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
+        }
+
         protected override void Update()
         {
             base.Update();

From 464702182d6064023064720824403e8277bd19a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:23:46 +0900
Subject: [PATCH 08551/10326] Consume device name

---
 .../Visual/Settings/TestSceneTabletSettings.cs     |  1 +
 .../Settings/Sections/Input/TabletAreaSelection.cs | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index 6455f51ab9..1c9cd6c2ba 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Tests.Visual.Settings
             public BindableSize AreaOffset { get; } = new BindableSize();
             public BindableSize AreaSize { get; } = new BindableSize();
             public IBindable<Size> TabletSize => tabletSize;
+            public string DeviceName => "test tablet T-421";
             public BindableBool Enabled { get; } = new BindableBool(true);
 
             public void SetTabletSize(Size size) => tabletSize.Value = size;
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 77b16a970d..54a14cd822 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly Bindable<Size> areaSize = new BindableSize();
         private readonly Bindable<Size> tabletSize = new BindableSize();
 
+        private OsuSpriteText tabletName;
+
         public TabletAreaSelection(ITabletHandler handler)
         {
             this.handler = handler;
@@ -44,13 +46,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 Masking = true,
                 CornerRadius = 5,
                 BorderThickness = 2,
-                BorderColour = Color4.Black,
+                BorderColour = colour.Gray3,
                 Children = new Drawable[]
                 {
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.White,
+                        Colour = colour.Gray1,
                     },
                     usableAreaContainer = new Container
                     {
@@ -59,7 +61,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.White,
+                                Alpha = 0.6f,
                             },
                             new OsuSpriteText
                             {
@@ -71,6 +73,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             }
                         }
                     },
+                    tabletName = new OsuSpriteText
+                    {
+                        Padding = new MarginPadding(3),
+                        Font = OsuFont.Default.With(size: 8)
+                    },
                 }
             };
 
@@ -92,6 +99,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             tabletSize.BindValueChanged(val =>
             {
                 tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
+                tabletName.Text = handler.DeviceName;
                 checkBounds();
             });
         }

From 382109c7a221f83b02b00a70e002551e7244157f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:24:08 +0900
Subject: [PATCH 08552/10326] Make test scene feel more like settings
 (width-wise)

---
 .../Visual/Settings/TestSceneTabletSettings.cs           | 9 ++++++++-
 osu.Game/Overlays/SettingsPanel.cs                       | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index 1c9cd6c2ba..3d65db9420 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -8,6 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Settings.Sections.Input;
 
 namespace osu.Game.Tests.Visual.Settings
@@ -30,7 +31,13 @@ namespace osu.Game.Tests.Visual.Settings
 
             AddRange(new Drawable[]
             {
-                new TabletSettings(tabletHandler),
+                new TabletSettings(tabletHandler)
+                {
+                    RelativeSizeAxes = Axes.None,
+                    Width = SettingsPanel.WIDTH,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                }
             });
 
             AddStep("Test with wide tablet", () => tabletHandler.SetTabletSize(new Size(160, 100)));
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index f1270f750e..8f3274b2b5 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays
 
         private const float sidebar_width = Sidebar.DEFAULT_WIDTH;
 
-        protected const float WIDTH = 400;
+        public const float WIDTH = 400;
 
         protected Container<Drawable> ContentContainer;
 

From 2dc2cb04c317de94a762dbdb74dfede0a91b33ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:24:20 +0900
Subject: [PATCH 08553/10326] Fix bounds check becoming false when using full
 area

---
 .../Overlays/Settings/Sections/Input/TabletAreaSelection.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 54a14cd822..6a3cc46e2b 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -111,8 +111,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             Size areaExtent = areaOffset.Value + areaSize.Value;
 
-            bool isWithinBounds = areaExtent.Width < tabletSize.Value.Width
-                                  && areaExtent.Height < tabletSize.Value.Height;
+            bool isWithinBounds = areaExtent.Width <= tabletSize.Value.Width
+                                  && areaExtent.Height <= tabletSize.Value.Height;
 
             usableAreaContainer.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
         }

From 9b70f0ee1fca97f9d8d686c131dd66f5a8be20ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:24:51 +0900
Subject: [PATCH 08554/10326] Tidy up visual appearance of settings and add a
 reset button

---
 .../Settings/Sections/Input/TabletSettings.cs | 57 ++++++++++++-------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index ac4a42e984..ca0a0349ab 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -66,6 +66,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 offsetY.MaxValue = val.NewValue.Height;
                 sizeY.Default = sizeY.MaxValue = val.NewValue.Height;
 
+                areaSize.Default = new Size(sizeX.Default, sizeY.Default);
+
                 updateDisplay();
             }, true);
         }
@@ -77,31 +79,44 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             Children = new Drawable[]
             {
-                new SettingsSlider<int>
-                {
-                    LabelText = "Offset X",
-                    Current = offsetX
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Offset Y",
-                    Current = offsetY
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Size X",
-                    Current = sizeX
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Size Y",
-                    Current = sizeY
-                },
                 new TabletAreaSelection(tabletHandler)
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = 300,
-                }
+                },
+                new SettingsButton
+                {
+                    Text = "Reset to full area",
+                    Action = () =>
+                    {
+                        areaOffset.SetDefault();
+                        areaSize.SetDefault();
+                    },
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Lock aspect ratio",
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "X Offset",
+                    Current = offsetX
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Y Offset",
+                    Current = offsetY
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Width",
+                    Current = sizeX
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Height",
+                    Current = sizeY
+                },
             };
         }
     }

From 43359553c1a3f6326ce13c0080440667ff13548e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 17:04:22 +0900
Subject: [PATCH 08555/10326] Add aspect ratio display and limiting

---
 .../Settings/Sections/Input/TabletSettings.cs | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index ca0a0349ab..5d85ecf138 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.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.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -23,6 +24,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly BindableNumber<int> sizeX = new BindableNumber<int> { MinValue = 0 };
         private readonly BindableNumber<int> sizeY = new BindableNumber<int> { MinValue = 0 };
 
+        private SettingsButton aspectResetButton;
+
+        private readonly BindableNumber<float> aspectRatio = new BindableFloat(1)
+        {
+            MinValue = 0.5f,
+            MaxValue = 2,
+            Precision = 0.01f,
+        };
+
         protected override string Header => "Tablet";
 
         public TabletSettings(ITabletHandler tabletHandler)
@@ -48,6 +58,33 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 sizeX.Value = val.NewValue.Width;
                 sizeY.Value = val.NewValue.Height;
+
+                float proposedAspectRatio = (float)sizeX.Value / sizeY.Value;
+
+                aspectRatio.Value = proposedAspectRatio;
+
+                if (proposedAspectRatio < aspectRatio.MinValue || proposedAspectRatio > aspectRatio.MaxValue)
+                {
+                    // apply aspect ratio restrictions to keep things in a usable state.
+
+                    // correction is always going to be below 1.
+                    float correction = proposedAspectRatio > aspectRatio.Value
+                        ? aspectRatio.Value / proposedAspectRatio
+                        : proposedAspectRatio / aspectRatio.Value;
+
+                    if (val.NewValue.Width != val.OldValue.Width)
+                    {
+                        if (val.NewValue.Width > val.OldValue.Width)
+                            correction = 1 / correction;
+                        areaSize.Value = new Size(areaSize.Value.Width, (int)(val.NewValue.Height * correction));
+                    }
+                    else
+                    {
+                        if (val.NewValue.Height > val.OldValue.Height)
+                            correction = 1 / correction;
+                        areaSize.Value = new Size((int)(val.NewValue.Width * correction), areaSize.Value.Height);
+                    }
+                }
             }, true);
 
             sizeX.BindValueChanged(val => areaSize.Value = new Size(val.NewValue, areaSize.Value.Height));
@@ -97,6 +134,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 {
                     LabelText = "Lock aspect ratio",
                 },
+                aspectResetButton = new SettingsButton
+                {
+                    Text = "Take aspect ratio from screen size",
+                },
+                new SettingsSlider<float>
+                {
+                    LabelText = "Aspect Ratio",
+                    Current = aspectRatio
+                },
                 new SettingsSlider<int>
                 {
                     LabelText = "X Offset",

From e3bed4c97dff26b9af05609fa100c2d748956b3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 17:57:50 +0900
Subject: [PATCH 08556/10326] Simplify aspect ratio application, add window
 conforming and direct adjustment

---
 .../Settings/Sections/Input/TabletSettings.cs | 120 ++++++++++++------
 1 file changed, 81 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 5d85ecf138..9fa74eda18 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -1,12 +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;
+using System.ComponentModel;
 using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Handlers.Tablet;
+using osu.Framework.Platform;
+using osu.Framework.Threading;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -21,18 +23,28 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly BindableNumber<int> offsetX = new BindableNumber<int> { MinValue = 0 };
         private readonly BindableNumber<int> offsetY = new BindableNumber<int> { MinValue = 0 };
 
-        private readonly BindableNumber<int> sizeX = new BindableNumber<int> { MinValue = 0 };
-        private readonly BindableNumber<int> sizeY = new BindableNumber<int> { MinValue = 0 };
+        private readonly BindableNumber<int> sizeX = new BindableNumber<int> { MinValue = 10 };
+        private readonly BindableNumber<int> sizeY = new BindableNumber<int> { MinValue = 10 };
 
-        private SettingsButton aspectResetButton;
+        [Resolved]
+        private GameHost host { get; set; }
+
+        /// <summary>
+        /// Based on the longest available smartphone.
+        /// </summary>
+        private const float largest_feasible_aspect_ratio = 20f / 9;
 
         private readonly BindableNumber<float> aspectRatio = new BindableFloat(1)
         {
-            MinValue = 0.5f,
-            MaxValue = 2,
+            MinValue = 1 / largest_feasible_aspect_ratio,
+            MaxValue = largest_feasible_aspect_ratio,
             Precision = 0.01f,
         };
 
+        private readonly BindableBool aspectLock = new BindableBool();
+
+        private ScheduledDelegate aspectRatioApplication;
+
         protected override string Header => "Tablet";
 
         public TabletSettings(ITabletHandler tabletHandler)
@@ -59,37 +71,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 sizeX.Value = val.NewValue.Width;
                 sizeY.Value = val.NewValue.Height;
 
-                float proposedAspectRatio = (float)sizeX.Value / sizeY.Value;
-
-                aspectRatio.Value = proposedAspectRatio;
-
-                if (proposedAspectRatio < aspectRatio.MinValue || proposedAspectRatio > aspectRatio.MaxValue)
-                {
-                    // apply aspect ratio restrictions to keep things in a usable state.
-
-                    // correction is always going to be below 1.
-                    float correction = proposedAspectRatio > aspectRatio.Value
-                        ? aspectRatio.Value / proposedAspectRatio
-                        : proposedAspectRatio / aspectRatio.Value;
-
-                    if (val.NewValue.Width != val.OldValue.Width)
-                    {
-                        if (val.NewValue.Width > val.OldValue.Width)
-                            correction = 1 / correction;
-                        areaSize.Value = new Size(areaSize.Value.Width, (int)(val.NewValue.Height * correction));
-                    }
-                    else
-                    {
-                        if (val.NewValue.Height > val.OldValue.Height)
-                            correction = 1 / correction;
-                        areaSize.Value = new Size((int)(val.NewValue.Width * correction), areaSize.Value.Height);
-                    }
-                }
+                aspectRatioApplication?.Cancel();
+                aspectRatioApplication = Schedule(() => applyAspectRatio(val));
             }, true);
 
             sizeX.BindValueChanged(val => areaSize.Value = new Size(val.NewValue, areaSize.Value.Height));
             sizeY.BindValueChanged(val => areaSize.Value = new Size(areaSize.Value.Width, val.NewValue));
 
+            aspectRatio.BindValueChanged(aspect =>
+            {
+                forceAspectRatio(aspect.NewValue);
+            });
+
             ((IBindable<Size>)tabletSize).BindTo(tabletHandler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
@@ -109,6 +102,33 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }, true);
         }
 
+        private void applyAspectRatio(ValueChangedEvent<Size> sizeChanged)
+        {
+            float proposedAspectRatio = (float)sizeX.Value / sizeY.Value;
+
+            if (!aspectLock.Value)
+            {
+                aspectRatio.Value = proposedAspectRatio;
+
+                // aspect ratio was in a valid range.
+                if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
+                    return;
+            }
+
+            if (sizeChanged.NewValue.Width != sizeChanged.OldValue.Width)
+            {
+                areaSize.Value = new Size(areaSize.Value.Width, (int)(areaSize.Value.Width / aspectRatio.Value));
+            }
+            else
+            {
+                areaSize.Value = new Size((int)(areaSize.Value.Height * aspectRatio.Value), areaSize.Value.Height);
+            }
+
+            // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
+            // this avoids a potential feedback loop.
+            aspectRatioApplication?.Cancel();
+        }
+
         private void updateDisplay()
         {
             if (Children.Count > 0)
@@ -121,22 +141,24 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     RelativeSizeAxes = Axes.X,
                     Height = 300,
                 },
-                new SettingsButton
+                new DangerousSettingsButton
                 {
                     Text = "Reset to full area",
                     Action = () =>
                     {
+                        aspectLock.Value = false;
+
                         areaOffset.SetDefault();
                         areaSize.SetDefault();
                     },
                 },
-                new SettingsCheckbox
+                new SettingsButton
                 {
-                    LabelText = "Lock aspect ratio",
-                },
-                aspectResetButton = new SettingsButton
-                {
-                    Text = "Take aspect ratio from screen size",
+                    Text = "Conform to current game aspect ratio",
+                    Action = () =>
+                    {
+                        forceAspectRatio((float)host.Window.ClientSize.Width / host.Window.ClientSize.Height);
+                    }
                 },
                 new SettingsSlider<float>
                 {
@@ -153,6 +175,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     LabelText = "Y Offset",
                     Current = offsetY
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Lock aspect ratio",
+                    Current = aspectLock
+                },
                 new SettingsSlider<int>
                 {
                     LabelText = "Width",
@@ -165,5 +192,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 },
             };
         }
+
+        private void forceAspectRatio(float aspectRatio)
+        {
+            aspectLock.Value = false;
+
+            int proposedHeight = (int)(sizeX.Value / aspectRatio);
+
+            if (proposedHeight < sizeY.MaxValue)
+                sizeY.Value = proposedHeight;
+            else
+                sizeX.Value = (int)(sizeY.Value * aspectRatio);
+
+            aspectRatioApplication?.Cancel();
+            aspectLock.Value = true;
+        }
     }
 }

From 932745e5c4049e8cf15074f5ecca437364d18fd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 18:14:29 +0900
Subject: [PATCH 08557/10326] Fix remaining feedback loops

---
 .../Settings/Sections/Input/TabletSettings.cs | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 9fa74eda18..e94df7dc1b 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.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.ComponentModel;
 using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -80,7 +79,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             aspectRatio.BindValueChanged(aspect =>
             {
-                forceAspectRatio(aspect.NewValue);
+                aspectRatioApplication?.Cancel();
+                aspectRatioApplication = Schedule(() => forceAspectRatio(aspect.NewValue));
             });
 
             ((IBindable<Size>)tabletSize).BindTo(tabletHandler.TabletSize);
@@ -102,31 +102,44 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }, true);
         }
 
+        private float curentAspectRatio => (float)sizeX.Value / sizeY.Value;
+
         private void applyAspectRatio(ValueChangedEvent<Size> sizeChanged)
         {
-            float proposedAspectRatio = (float)sizeX.Value / sizeY.Value;
+            float proposedAspectRatio = curentAspectRatio;
 
-            if (!aspectLock.Value)
+            try
             {
-                aspectRatio.Value = proposedAspectRatio;
+                if (!aspectLock.Value)
+                {
+                    // aspect ratio was in a valid range.
+                    if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
+                    {
+                        updateAspectRatio();
+                        return;
+                    }
+                }
 
-                // aspect ratio was in a valid range.
-                if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
-                    return;
+                if (sizeChanged.NewValue.Width != sizeChanged.OldValue.Width)
+                {
+                    areaSize.Value = new Size(areaSize.Value.Width, (int)(areaSize.Value.Width / aspectRatio.Value));
+                }
+                else
+                {
+                    areaSize.Value = new Size((int)(areaSize.Value.Height * aspectRatio.Value), areaSize.Value.Height);
+                }
             }
-
-            if (sizeChanged.NewValue.Width != sizeChanged.OldValue.Width)
+            finally
             {
-                areaSize.Value = new Size(areaSize.Value.Width, (int)(areaSize.Value.Width / aspectRatio.Value));
-            }
-            else
-            {
-                areaSize.Value = new Size((int)(areaSize.Value.Height * aspectRatio.Value), areaSize.Value.Height);
+                // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
+                // this avoids a potential feedback loop.
+                aspectRatioApplication?.Cancel();
             }
+        }
 
-            // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
-            // this avoids a potential feedback loop.
-            aspectRatioApplication?.Cancel();
+        private void updateAspectRatio()
+        {
+            aspectRatio.Value = curentAspectRatio;
         }
 
         private void updateDisplay()
@@ -204,6 +217,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             else
                 sizeX.Value = (int)(sizeY.Value * aspectRatio);
 
+            updateAspectRatio();
+
             aspectRatioApplication?.Cancel();
             aspectLock.Value = true;
         }

From bba25a0182660443283b91c01356742cae676e56 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 18:40:21 +0900
Subject: [PATCH 08558/10326] Tidy up draw hierarchy and bindable logic

---
 .../Sections/Input/TabletAreaSelection.cs     |   7 +-
 .../Settings/Sections/Input/TabletSettings.cs | 184 +++++++++---------
 2 files changed, 95 insertions(+), 96 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 6a3cc46e2b..3a278820f0 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private readonly Bindable<Size> areaOffset = new BindableSize();
         private readonly Bindable<Size> areaSize = new BindableSize();
-        private readonly Bindable<Size> tabletSize = new BindableSize();
+        private readonly IBindable<Size> tabletSize = new BindableSize();
 
         private OsuSpriteText tabletName;
 
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 checkBounds();
             }, true);
 
-            ((IBindable<Size>)tabletSize).BindTo(handler.TabletSize);
+            tabletSize.BindTo(handler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
                 tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
@@ -123,6 +123,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             var size = tabletSize.Value;
 
+            if (size == System.Drawing.Size.Empty)
+                return;
+
             float fitX = size.Width / DrawWidth;
             float fitY = size.Height / DrawHeight;
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index e94df7dc1b..3f8723025f 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private readonly BindableSize areaOffset = new BindableSize();
         private readonly BindableSize areaSize = new BindableSize();
-        private readonly BindableSize tabletSize = new BindableSize();
+        private readonly IBindable<Size> tabletSize = new BindableSize();
 
         private readonly BindableNumber<int> offsetX = new BindableNumber<int> { MinValue = 0 };
         private readonly BindableNumber<int> offsetY = new BindableNumber<int> { MinValue = 0 };
@@ -54,99 +54,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [BackgroundDependencyLoader]
         private void load()
         {
-            areaOffset.BindTo(tabletHandler.AreaOffset);
-            areaOffset.BindValueChanged(val =>
-            {
-                offsetX.Value = val.NewValue.Width;
-                offsetY.Value = val.NewValue.Height;
-            }, true);
-
-            offsetX.BindValueChanged(val => areaOffset.Value = new Size(val.NewValue, areaOffset.Value.Height));
-            offsetY.BindValueChanged(val => areaOffset.Value = new Size(areaOffset.Value.Width, val.NewValue));
-
-            areaSize.BindTo(tabletHandler.AreaSize);
-            areaSize.BindValueChanged(val =>
-            {
-                sizeX.Value = val.NewValue.Width;
-                sizeY.Value = val.NewValue.Height;
-
-                aspectRatioApplication?.Cancel();
-                aspectRatioApplication = Schedule(() => applyAspectRatio(val));
-            }, true);
-
-            sizeX.BindValueChanged(val => areaSize.Value = new Size(val.NewValue, areaSize.Value.Height));
-            sizeY.BindValueChanged(val => areaSize.Value = new Size(areaSize.Value.Width, val.NewValue));
-
-            aspectRatio.BindValueChanged(aspect =>
-            {
-                aspectRatioApplication?.Cancel();
-                aspectRatioApplication = Schedule(() => forceAspectRatio(aspect.NewValue));
-            });
-
-            ((IBindable<Size>)tabletSize).BindTo(tabletHandler.TabletSize);
-            tabletSize.BindValueChanged(val =>
-            {
-                if (tabletSize.Value == System.Drawing.Size.Empty)
-                    return;
-
-                // todo: these should propagate from a TabletChanged event or similar.
-                offsetX.MaxValue = val.NewValue.Width;
-                sizeX.Default = sizeX.MaxValue = val.NewValue.Width;
-
-                offsetY.MaxValue = val.NewValue.Height;
-                sizeY.Default = sizeY.MaxValue = val.NewValue.Height;
-
-                areaSize.Default = new Size(sizeX.Default, sizeY.Default);
-
-                updateDisplay();
-            }, true);
-        }
-
-        private float curentAspectRatio => (float)sizeX.Value / sizeY.Value;
-
-        private void applyAspectRatio(ValueChangedEvent<Size> sizeChanged)
-        {
-            float proposedAspectRatio = curentAspectRatio;
-
-            try
-            {
-                if (!aspectLock.Value)
-                {
-                    // aspect ratio was in a valid range.
-                    if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
-                    {
-                        updateAspectRatio();
-                        return;
-                    }
-                }
-
-                if (sizeChanged.NewValue.Width != sizeChanged.OldValue.Width)
-                {
-                    areaSize.Value = new Size(areaSize.Value.Width, (int)(areaSize.Value.Width / aspectRatio.Value));
-                }
-                else
-                {
-                    areaSize.Value = new Size((int)(areaSize.Value.Height * aspectRatio.Value), areaSize.Value.Height);
-                }
-            }
-            finally
-            {
-                // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
-                // this avoids a potential feedback loop.
-                aspectRatioApplication?.Cancel();
-            }
-        }
-
-        private void updateAspectRatio()
-        {
-            aspectRatio.Value = curentAspectRatio;
-        }
-
-        private void updateDisplay()
-        {
-            if (Children.Count > 0)
-                return;
-
             Children = new Drawable[]
             {
                 new TabletAreaSelection(tabletHandler)
@@ -204,6 +111,91 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     Current = sizeY
                 },
             };
+
+            areaOffset.BindTo(tabletHandler.AreaOffset);
+            areaOffset.BindValueChanged(val =>
+            {
+                offsetX.Value = val.NewValue.Width;
+                offsetY.Value = val.NewValue.Height;
+            }, true);
+
+            offsetX.BindValueChanged(val => areaOffset.Value = new Size(val.NewValue, areaOffset.Value.Height));
+            offsetY.BindValueChanged(val => areaOffset.Value = new Size(areaOffset.Value.Width, val.NewValue));
+
+            areaSize.BindTo(tabletHandler.AreaSize);
+            areaSize.BindValueChanged(val =>
+            {
+                sizeX.Value = val.NewValue.Width;
+                sizeY.Value = val.NewValue.Height;
+            }, true);
+
+            sizeX.BindValueChanged(val =>
+            {
+                areaSize.Value = new Size(val.NewValue, areaSize.Value.Height);
+
+                aspectRatioApplication?.Cancel();
+                aspectRatioApplication = Schedule(() => applyAspectRatio(sizeX));
+            });
+
+            sizeY.BindValueChanged(val =>
+            {
+                areaSize.Value = new Size(areaSize.Value.Width, val.NewValue);
+
+                aspectRatioApplication?.Cancel();
+                aspectRatioApplication = Schedule(() => applyAspectRatio(sizeY));
+            });
+
+            aspectRatio.BindValueChanged(aspect =>
+            {
+                aspectRatioApplication?.Cancel();
+                aspectRatioApplication = Schedule(() => forceAspectRatio(aspect.NewValue));
+            });
+
+            tabletSize.BindTo(tabletHandler.TabletSize);
+            tabletSize.BindValueChanged(val =>
+            {
+                if (tabletSize.Value == System.Drawing.Size.Empty)
+                    return;
+
+                // todo: these should propagate from a TabletChanged event or similar.
+                offsetX.MaxValue = val.NewValue.Width;
+                sizeX.Default = sizeX.MaxValue = val.NewValue.Width;
+
+                offsetY.MaxValue = val.NewValue.Height;
+                sizeY.Default = sizeY.MaxValue = val.NewValue.Height;
+
+                areaSize.Default = new Size(sizeX.Default, sizeY.Default);
+            }, true);
+        }
+
+        private void applyAspectRatio(BindableNumber<int> sizeChanged)
+        {
+            try
+            {
+                if (!aspectLock.Value)
+                {
+                    float proposedAspectRatio = curentAspectRatio;
+
+                    if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
+                    {
+                        // aspect ratio was in a valid range.
+                        updateAspectRatio();
+                        return;
+                    }
+                }
+
+                // if lock is applied (or the specified values were out of range) aim to adjust the axis the user was not adjusting to conform.
+                if (sizeChanged == sizeX)
+                    sizeY.Value = (int)(areaSize.Value.Width / aspectRatio.Value);
+                else
+                    sizeX.Value = (int)(areaSize.Value.Height * aspectRatio.Value);
+            }
+            finally
+            {
+                // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
+                // this avoids a potential feedback loop.
+                aspectRatioApplication?.Cancel();
+            }
         }
 
         private void forceAspectRatio(float aspectRatio)
@@ -222,5 +214,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             aspectRatioApplication?.Cancel();
             aspectLock.Value = true;
         }
+
+        private void updateAspectRatio() => aspectRatio.Value = curentAspectRatio;
+
+        private float curentAspectRatio => (float)sizeX.Value / sizeY.Value;
     }
 }

From a8e319a320a1aae74a29432b0794a16ce869330a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 18:51:43 +0900
Subject: [PATCH 08559/10326] Remove min/max from test scene to fix weirdness
 when switching test sizings

---
 osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index 3d65db9420..aaf2f13953 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -21,12 +21,7 @@ namespace osu.Game.Tests.Visual.Settings
         {
             var tabletHandler = new TestTabletHandler();
 
-            tabletHandler.AreaOffset.MinValue = new Size(0, 0);
-            tabletHandler.AreaOffset.MaxValue = new Size(160, 100);
             tabletHandler.AreaOffset.Value = new Size(10, 10);
-
-            tabletHandler.AreaSize.MinValue = new Size(10, 10);
-            tabletHandler.AreaSize.MaxValue = new Size(160, 100);
             tabletHandler.AreaSize.Value = new Size(100, 80);
 
             AddRange(new Drawable[]

From 9a6a0f3df5e8a2d4a67f4bc567ba3e5db8a76a2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 23:47:08 +0900
Subject: [PATCH 08560/10326] Add test coverage and better UI handling of no
 tablet connected scenario

---
 .../Settings/TestSceneTabletSettings.cs       |  10 +-
 .../Settings/Sections/Input/TabletSettings.cs | 130 +++++++++++-------
 2 files changed, 89 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index aaf2f13953..2baeadddc0 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -8,6 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
+using osu.Framework.Utils;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings.Sections.Input;
 
@@ -39,6 +40,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddStep("Test with square tablet", () => tabletHandler.SetTabletSize(new Size(300, 300)));
             AddStep("Test with tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 300)));
             AddStep("Test with very tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 700)));
+            AddStep("Test no tablet present", () => tabletHandler.SetTabletSize(System.Drawing.Size.Empty));
         }
 
         public class TestTabletHandler : ITabletHandler
@@ -48,10 +50,14 @@ namespace osu.Game.Tests.Visual.Settings
             public BindableSize AreaOffset { get; } = new BindableSize();
             public BindableSize AreaSize { get; } = new BindableSize();
             public IBindable<Size> TabletSize => tabletSize;
-            public string DeviceName => "test tablet T-421";
+            public string DeviceName { get; private set; }
             public BindableBool Enabled { get; } = new BindableBool(true);
 
-            public void SetTabletSize(Size size) => tabletSize.Value = size;
+            public void SetTabletSize(Size size)
+            {
+                DeviceName = size != System.Drawing.Size.Empty ? $"test tablet T-{RNG.Next(999):000}" : string.Empty;
+                tabletSize.Value = size;
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 3f8723025f..7da61cf192 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -5,9 +5,11 @@ using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -44,6 +46,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private ScheduledDelegate aspectRatioApplication;
 
+        private FillFlowContainer mainSettings;
+
+        private OsuSpriteText noTabletMessage;
+
         protected override string Header => "Tablet";
 
         public TabletSettings(ITabletHandler tabletHandler)
@@ -56,60 +62,77 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             Children = new Drawable[]
             {
-                new TabletAreaSelection(tabletHandler)
+                noTabletMessage = new OsuSpriteText
                 {
+                    Text = "No tablet detected!",
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                mainSettings = new FillFlowContainer
+                {
+                    Alpha = 0,
                     RelativeSizeAxes = Axes.X,
-                    Height = 300,
-                },
-                new DangerousSettingsButton
-                {
-                    Text = "Reset to full area",
-                    Action = () =>
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
                     {
-                        aspectLock.Value = false;
+                        new TabletAreaSelection(tabletHandler)
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 300,
+                            Margin = new MarginPadding(10)
+                        },
+                        new DangerousSettingsButton
+                        {
+                            Text = "Reset to full area",
+                            Action = () =>
+                            {
+                                aspectLock.Value = false;
 
-                        areaOffset.SetDefault();
-                        areaSize.SetDefault();
-                    },
-                },
-                new SettingsButton
-                {
-                    Text = "Conform to current game aspect ratio",
-                    Action = () =>
-                    {
-                        forceAspectRatio((float)host.Window.ClientSize.Width / host.Window.ClientSize.Height);
+                                areaOffset.SetDefault();
+                                areaSize.SetDefault();
+                            },
+                        },
+                        new SettingsButton
+                        {
+                            Text = "Conform to current game aspect ratio",
+                            Action = () =>
+                            {
+                                forceAspectRatio((float)host.Window.ClientSize.Width / host.Window.ClientSize.Height);
+                            }
+                        },
+                        new SettingsSlider<float>
+                        {
+                            LabelText = "Aspect Ratio",
+                            Current = aspectRatio
+                        },
+                        new SettingsSlider<int>
+                        {
+                            LabelText = "X Offset",
+                            Current = offsetX
+                        },
+                        new SettingsSlider<int>
+                        {
+                            LabelText = "Y Offset",
+                            Current = offsetY
+                        },
+                        new SettingsCheckbox
+                        {
+                            LabelText = "Lock aspect ratio",
+                            Current = aspectLock
+                        },
+                        new SettingsSlider<int>
+                        {
+                            LabelText = "Width",
+                            Current = sizeX
+                        },
+                        new SettingsSlider<int>
+                        {
+                            LabelText = "Height",
+                            Current = sizeY
+                        },
                     }
                 },
-                new SettingsSlider<float>
-                {
-                    LabelText = "Aspect Ratio",
-                    Current = aspectRatio
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "X Offset",
-                    Current = offsetX
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Y Offset",
-                    Current = offsetY
-                },
-                new SettingsCheckbox
-                {
-                    LabelText = "Lock aspect ratio",
-                    Current = aspectLock
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Width",
-                    Current = sizeX
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Height",
-                    Current = sizeY
-                },
             };
 
             areaOffset.BindTo(tabletHandler.AreaOffset);
@@ -154,8 +177,17 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             tabletSize.BindTo(tabletHandler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
-                if (tabletSize.Value == System.Drawing.Size.Empty)
+                bool tabletFound = tabletSize.Value != System.Drawing.Size.Empty;
+
+                if (!tabletFound)
+                {
+                    mainSettings.Hide();
+                    noTabletMessage.Show();
                     return;
+                }
+
+                mainSettings.Show();
+                noTabletMessage.Hide();
 
                 // todo: these should propagate from a TabletChanged event or similar.
                 offsetX.MaxValue = val.NewValue.Width;

From d422a6590036dc26a881fa2519da4d09111ac479 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 23:47:18 +0900
Subject: [PATCH 08561/10326] Fix initial tablet size not being initialised

---
 .../Settings/Sections/Input/TabletAreaSelection.cs         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 3a278820f0..af144c8102 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -80,6 +80,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     },
                 }
             };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             areaOffset.BindTo(handler.AreaOffset);
             areaOffset.BindValueChanged(val =>
@@ -101,7 +106,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
                 tabletName.Text = handler.DeviceName;
                 checkBounds();
-            });
+            }, true);
         }
 
         [Resolved]

From 9d0c8902a6e6dcc1edc369b8ebf768089f22c8a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 23:57:05 +0900
Subject: [PATCH 08562/10326] Fix margins and spacing between sub flowed items

---
 .../Overlays/Settings/Sections/Input/TabletAreaSelection.cs | 6 +++---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index af144c8102..3b1bae7cf0 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -32,13 +32,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         public TabletAreaSelection(ITabletHandler handler)
         {
             this.handler = handler;
+
+            Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Padding = new MarginPadding(5);
-
             InternalChild = tabletContainer = new Container
             {
                 Anchor = Anchor.Centre,
@@ -131,7 +131,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (size == System.Drawing.Size.Empty)
                 return;
 
-            float fitX = size.Width / DrawWidth;
+            float fitX = size.Width / (DrawWidth - Padding.Left - Padding.Right);
             float fitY = size.Height / DrawHeight;
 
             float adjust = MathF.Max(fitX, fitY);
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 7da61cf192..b17cfced95 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -10,6 +10,7 @@ using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
+using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -67,12 +68,14 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     Text = "No tablet detected!",
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS }
                 },
                 mainSettings = new FillFlowContainer
                 {
                     Alpha = 0,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
+                    Spacing = new Vector2(0, 8),
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
@@ -80,7 +83,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         {
                             RelativeSizeAxes = Axes.X,
                             Height = 300,
-                            Margin = new MarginPadding(10)
                         },
                         new DangerousSettingsButton
                         {

From 196f95ae545853c00e3da66ba9bc20e4871c75a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 12:50:02 +0900
Subject: [PATCH 08563/10326] Update to use new bindables and centered area
 offset

---
 .../Settings/TestSceneTabletSettings.cs       | 44 +++++++-----
 .../Sections/Input/TabletAreaSelection.cs     | 49 ++++++++------
 .../Settings/Sections/Input/TabletSettings.cs | 67 ++++++++++---------
 3 files changed, 89 insertions(+), 71 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index 2baeadddc0..a7f6c8c0d3 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.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.Drawing;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,6 +10,7 @@ using osu.Framework.Platform;
 using osu.Framework.Utils;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings.Sections.Input;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Settings
 {
@@ -22,9 +22,6 @@ namespace osu.Game.Tests.Visual.Settings
         {
             var tabletHandler = new TestTabletHandler();
 
-            tabletHandler.AreaOffset.Value = new Size(10, 10);
-            tabletHandler.AreaSize.Value = new Size(100, 80);
-
             AddRange(new Drawable[]
             {
                 new TabletSettings(tabletHandler)
@@ -36,27 +33,40 @@ namespace osu.Game.Tests.Visual.Settings
                 }
             });
 
-            AddStep("Test with wide tablet", () => tabletHandler.SetTabletSize(new Size(160, 100)));
-            AddStep("Test with square tablet", () => tabletHandler.SetTabletSize(new Size(300, 300)));
-            AddStep("Test with tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 300)));
-            AddStep("Test with very tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 700)));
-            AddStep("Test no tablet present", () => tabletHandler.SetTabletSize(System.Drawing.Size.Empty));
+            AddStep("Test with wide tablet", () => tabletHandler.SetTabletSize(new Vector2(160, 100)));
+            AddStep("Test with square tablet", () => tabletHandler.SetTabletSize(new Vector2(300, 300)));
+            AddStep("Test with tall tablet", () => tabletHandler.SetTabletSize(new Vector2(100, 300)));
+            AddStep("Test with very tall tablet", () => tabletHandler.SetTabletSize(new Vector2(100, 700)));
+            AddStep("Test no tablet present", () => tabletHandler.SetTabletSize(Vector2.Zero));
         }
 
         public class TestTabletHandler : ITabletHandler
         {
-            private readonly Bindable<Size> tabletSize = new Bindable<Size>();
+            public Bindable<Vector2> AreaOffset { get; } = new Bindable<Vector2>();
+            public Bindable<Vector2> AreaSize { get; } = new Bindable<Vector2>();
+
+            public IBindable<TabletInfo> Tablet => tablet;
+
+            private readonly Bindable<TabletInfo> tablet = new Bindable<TabletInfo>();
 
-            public BindableSize AreaOffset { get; } = new BindableSize();
-            public BindableSize AreaSize { get; } = new BindableSize();
-            public IBindable<Size> TabletSize => tabletSize;
-            public string DeviceName { get; private set; }
             public BindableBool Enabled { get; } = new BindableBool(true);
 
-            public void SetTabletSize(Size size)
+            public void SetTabletSize(Vector2 size)
             {
-                DeviceName = size != System.Drawing.Size.Empty ? $"test tablet T-{RNG.Next(999):000}" : string.Empty;
-                tabletSize.Value = size;
+                tablet.Value = size != Vector2.Zero ? new TabletInfo($"test tablet T-{RNG.Next(999):000}", size) : null;
+
+                AreaSize.Default = new Vector2(size.X, size.Y);
+
+                // if it's clear the user has not configured the area, take the full area from the tablet that was just found.
+                if (AreaSize.Value == Vector2.Zero)
+                    AreaSize.SetDefault();
+
+                AreaOffset.Default = new Vector2(size.X / 2, size.Y / 2);
+
+                // likewise with the position, use the centre point if it has not been configured.
+                // it's safe to assume no user would set their centre point to 0,0 for now.
+                if (AreaOffset.Value == Vector2.Zero)
+                    AreaOffset.SetDefault();
             }
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 3b1bae7cf0..c0412fb99d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -23,9 +22,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private Container tabletContainer;
         private Container usableAreaContainer;
 
-        private readonly Bindable<Size> areaOffset = new BindableSize();
-        private readonly Bindable<Size> areaSize = new BindableSize();
-        private readonly IBindable<Size> tabletSize = new BindableSize();
+        private readonly Bindable<Vector2> areaOffset = new Bindable<Vector2>();
+        private readonly Bindable<Vector2> areaSize = new Bindable<Vector2>();
+
+        private readonly IBindable<TabletInfo> tablet = new Bindable<TabletInfo>();
 
         private OsuSpriteText tabletName;
 
@@ -56,6 +56,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     },
                     usableAreaContainer = new Container
                     {
+                        Origin = Anchor.Centre,
                         Children = new Drawable[]
                         {
                             new Box
@@ -89,24 +90,27 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             areaOffset.BindTo(handler.AreaOffset);
             areaOffset.BindValueChanged(val =>
             {
-                usableAreaContainer.MoveTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
-                checkBounds();
+                usableAreaContainer.MoveTo(val.NewValue, 100, Easing.OutQuint)
+                                   .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
             }, true);
 
             areaSize.BindTo(handler.AreaSize);
             areaSize.BindValueChanged(val =>
             {
-                usableAreaContainer.ResizeTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
+                usableAreaContainer.ResizeTo(val.NewValue, 100, Easing.OutQuint)
+                                   .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
+            }, true);
+
+            tablet.BindTo(handler.Tablet);
+            tablet.BindValueChanged(val =>
+            {
+                tabletContainer.Size = val.NewValue?.Size ?? Vector2.Zero;
+                tabletName.Text = val.NewValue?.Name ?? string.Empty;
                 checkBounds();
             }, true);
 
-            tabletSize.BindTo(handler.TabletSize);
-            tabletSize.BindValueChanged(val =>
-            {
-                tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
-                tabletName.Text = handler.DeviceName;
-                checkBounds();
-            }, true);
+            // initial animation should be instant.
+            FinishTransforms(true);
         }
 
         [Resolved]
@@ -114,10 +118,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private void checkBounds()
         {
-            Size areaExtent = areaOffset.Value + areaSize.Value;
+            if (tablet.Value == null)
+                return;
 
-            bool isWithinBounds = areaExtent.Width <= tabletSize.Value.Width
-                                  && areaExtent.Height <= tabletSize.Value.Height;
+            var usableSsdq = usableAreaContainer.ScreenSpaceDrawQuad;
+
+            bool isWithinBounds = tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.TopLeft) &&
+                                  tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.BottomRight);
 
             usableAreaContainer.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
         }
@@ -126,13 +133,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             base.Update();
 
-            var size = tabletSize.Value;
-
-            if (size == System.Drawing.Size.Empty)
+            if (!(tablet.Value?.Size is Vector2 size))
                 return;
 
-            float fitX = size.Width / (DrawWidth - Padding.Left - Padding.Right);
-            float fitY = size.Height / DrawHeight;
+            float fitX = size.X / (DrawWidth - Padding.Left - Padding.Right);
+            float fitY = size.Y / DrawHeight;
 
             float adjust = MathF.Max(fitX, fitY);
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index b17cfced95..9f81391434 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.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.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -18,15 +17,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
     {
         private readonly ITabletHandler tabletHandler;
 
-        private readonly BindableSize areaOffset = new BindableSize();
-        private readonly BindableSize areaSize = new BindableSize();
-        private readonly IBindable<Size> tabletSize = new BindableSize();
+        private readonly Bindable<Vector2> areaOffset = new Bindable<Vector2>();
+        private readonly Bindable<Vector2> areaSize = new Bindable<Vector2>();
+        private readonly IBindable<TabletInfo> tablet = new Bindable<TabletInfo>();
 
-        private readonly BindableNumber<int> offsetX = new BindableNumber<int> { MinValue = 0 };
-        private readonly BindableNumber<int> offsetY = new BindableNumber<int> { MinValue = 0 };
+        private readonly BindableNumber<float> offsetX = new BindableNumber<float> { MinValue = 0 };
+        private readonly BindableNumber<float> offsetY = new BindableNumber<float> { MinValue = 0 };
 
-        private readonly BindableNumber<int> sizeX = new BindableNumber<int> { MinValue = 10 };
-        private readonly BindableNumber<int> sizeY = new BindableNumber<int> { MinValue = 10 };
+        private readonly BindableNumber<float> sizeX = new BindableNumber<float> { MinValue = 10 };
+        private readonly BindableNumber<float> sizeY = new BindableNumber<float> { MinValue = 10 };
 
         [Resolved]
         private GameHost host { get; set; }
@@ -108,12 +107,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             LabelText = "Aspect Ratio",
                             Current = aspectRatio
                         },
-                        new SettingsSlider<int>
+                        new SettingsSlider<float>
                         {
                             LabelText = "X Offset",
                             Current = offsetX
                         },
-                        new SettingsSlider<int>
+                        new SettingsSlider<float>
                         {
                             LabelText = "Y Offset",
                             Current = offsetY
@@ -123,12 +122,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             LabelText = "Lock aspect ratio",
                             Current = aspectLock
                         },
-                        new SettingsSlider<int>
+                        new SettingsSlider<float>
                         {
                             LabelText = "Width",
                             Current = sizeX
                         },
-                        new SettingsSlider<int>
+                        new SettingsSlider<float>
                         {
                             LabelText = "Height",
                             Current = sizeY
@@ -140,23 +139,23 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             areaOffset.BindTo(tabletHandler.AreaOffset);
             areaOffset.BindValueChanged(val =>
             {
-                offsetX.Value = val.NewValue.Width;
-                offsetY.Value = val.NewValue.Height;
+                offsetX.Value = val.NewValue.X;
+                offsetY.Value = val.NewValue.Y;
             }, true);
 
-            offsetX.BindValueChanged(val => areaOffset.Value = new Size(val.NewValue, areaOffset.Value.Height));
-            offsetY.BindValueChanged(val => areaOffset.Value = new Size(areaOffset.Value.Width, val.NewValue));
+            offsetX.BindValueChanged(val => areaOffset.Value = new Vector2(val.NewValue, areaOffset.Value.Y));
+            offsetY.BindValueChanged(val => areaOffset.Value = new Vector2(areaOffset.Value.X, val.NewValue));
 
             areaSize.BindTo(tabletHandler.AreaSize);
             areaSize.BindValueChanged(val =>
             {
-                sizeX.Value = val.NewValue.Width;
-                sizeY.Value = val.NewValue.Height;
+                sizeX.Value = val.NewValue.X;
+                sizeY.Value = val.NewValue.Y;
             }, true);
 
             sizeX.BindValueChanged(val =>
             {
-                areaSize.Value = new Size(val.NewValue, areaSize.Value.Height);
+                areaSize.Value = new Vector2(val.NewValue, areaSize.Value.Y);
 
                 aspectRatioApplication?.Cancel();
                 aspectRatioApplication = Schedule(() => applyAspectRatio(sizeX));
@@ -164,7 +163,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             sizeY.BindValueChanged(val =>
             {
-                areaSize.Value = new Size(areaSize.Value.Width, val.NewValue);
+                areaSize.Value = new Vector2(areaSize.Value.X, val.NewValue);
 
                 aspectRatioApplication?.Cancel();
                 aspectRatioApplication = Schedule(() => applyAspectRatio(sizeY));
@@ -176,10 +175,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 aspectRatioApplication = Schedule(() => forceAspectRatio(aspect.NewValue));
             });
 
-            tabletSize.BindTo(tabletHandler.TabletSize);
-            tabletSize.BindValueChanged(val =>
+            tablet.BindTo(tabletHandler.Tablet);
+            tablet.BindValueChanged(val =>
             {
-                bool tabletFound = tabletSize.Value != System.Drawing.Size.Empty;
+                var tab = val.NewValue;
+
+                bool tabletFound = tab != null;
 
                 if (!tabletFound)
                 {
@@ -192,17 +193,19 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 noTabletMessage.Hide();
 
                 // todo: these should propagate from a TabletChanged event or similar.
-                offsetX.MaxValue = val.NewValue.Width;
-                sizeX.Default = sizeX.MaxValue = val.NewValue.Width;
+                offsetX.MaxValue = tab.Size.X;
+                offsetX.Default = tab.Size.X / 2;
+                sizeX.Default = sizeX.MaxValue = tab.Size.X;
 
-                offsetY.MaxValue = val.NewValue.Height;
-                sizeY.Default = sizeY.MaxValue = val.NewValue.Height;
+                offsetY.MaxValue = tab.Size.Y;
+                offsetY.Default = tab.Size.Y / 2;
+                sizeY.Default = sizeY.MaxValue = tab.Size.Y;
 
-                areaSize.Default = new Size(sizeX.Default, sizeY.Default);
+                areaSize.Default = new Vector2(sizeX.Default, sizeY.Default);
             }, true);
         }
 
-        private void applyAspectRatio(BindableNumber<int> sizeChanged)
+        private void applyAspectRatio(BindableNumber<float> sizeChanged)
         {
             try
             {
@@ -220,9 +223,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
                 // if lock is applied (or the specified values were out of range) aim to adjust the axis the user was not adjusting to conform.
                 if (sizeChanged == sizeX)
-                    sizeY.Value = (int)(areaSize.Value.Width / aspectRatio.Value);
+                    sizeY.Value = (int)(areaSize.Value.X / aspectRatio.Value);
                 else
-                    sizeX.Value = (int)(areaSize.Value.Height * aspectRatio.Value);
+                    sizeX.Value = (int)(areaSize.Value.Y * aspectRatio.Value);
             }
             finally
             {
@@ -251,6 +254,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private void updateAspectRatio() => aspectRatio.Value = curentAspectRatio;
 
-        private float curentAspectRatio => (float)sizeX.Value / sizeY.Value;
+        private float curentAspectRatio => sizeX.Value / sizeY.Value;
     }
 }

From fb7d095e4a0a934664db0a5cbc7585eea55b46da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 13:03:06 +0900
Subject: [PATCH 08564/10326] Show aspect ratio for current usable area

---
 .../Sections/Input/TabletAreaSelection.cs     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index c0412fb99d..ba219cfe7d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -29,6 +29,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private OsuSpriteText tabletName;
 
+        private Box usableFill;
+        private OsuSpriteText usableAreaText;
+
         public TabletAreaSelection(ITabletHandler handler)
         {
             this.handler = handler;
@@ -59,17 +62,16 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         Origin = Anchor.Centre,
                         Children = new Drawable[]
                         {
-                            new Box
+                            usableFill = new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Alpha = 0.6f,
                             },
-                            new OsuSpriteText
+                            usableAreaText = new OsuSpriteText
                             {
-                                Text = "usable area",
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Colour = Color4.Black,
+                                Colour = Color4.White,
                                 Font = OsuFont.Default.With(size: 12)
                             }
                         }
@@ -99,6 +101,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 usableAreaContainer.ResizeTo(val.NewValue, 100, Easing.OutQuint)
                                    .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
+
+                int x = (int)val.NewValue.X;
+                int y = (int)val.NewValue.Y;
+                int commonDivider = greatestCommonDivider(x, y);
+
+                usableAreaText.Text = $"{(float)x / commonDivider}:{(float)y / commonDivider}";
             }, true);
 
             tablet.BindTo(handler.Tablet);
@@ -113,6 +121,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             FinishTransforms(true);
         }
 
+        private static int greatestCommonDivider(int a, int b)
+        {
+            while (b != 0)
+            {
+                int remainder = a % b;
+                a = b;
+                b = remainder;
+            }
+
+            return a;
+        }
+
         [Resolved]
         private OsuColour colour { get; set; }
 
@@ -126,7 +146,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             bool isWithinBounds = tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.TopLeft) &&
                                   tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.BottomRight);
 
-            usableAreaContainer.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
+            usableFill.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
         }
 
         protected override void Update()

From e8c20bdcb12a3a1f513a6fa63f72511630799afe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 13:05:43 +0900
Subject: [PATCH 08565/10326] Add centre crosshair

---
 .../Sections/Input/TabletAreaSelection.cs       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index ba219cfe7d..0a44b1a44d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -67,12 +67,27 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                                 RelativeSizeAxes = Axes.Both,
                                 Alpha = 0.6f,
                             },
+                            new Box
+                            {
+                                Colour = Color4.White,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Height = 5,
+                            },
+                            new Box
+                            {
+                                Colour = Color4.White,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Width = 5,
+                            },
                             usableAreaText = new OsuSpriteText
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
                                 Colour = Color4.White,
-                                Font = OsuFont.Default.With(size: 12)
+                                Font = OsuFont.Default.With(size: 12),
+                                Y = 10
                             }
                         }
                     },

From 6285dcd1a1d9989dd9daeeb685102b48472e4ba6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 13:09:15 +0900
Subject: [PATCH 08566/10326] Add arbitrary value to fix FP contains check
 failures

---
 .../Overlays/Settings/Sections/Input/TabletAreaSelection.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 0a44b1a44d..df25668411 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -158,8 +158,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             var usableSsdq = usableAreaContainer.ScreenSpaceDrawQuad;
 
-            bool isWithinBounds = tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.TopLeft) &&
-                                  tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.BottomRight);
+            bool isWithinBounds = tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.TopLeft + new Vector2(1)) &&
+                                  tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.BottomRight - new Vector2(1));
 
             usableFill.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
         }

From c624aa939774cc3f783eb2a588d96c8afefc37f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 13:23:23 +0900
Subject: [PATCH 08567/10326] Only update tablet values on commit

---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 9f81391434..b2d37e345f 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -104,16 +104,19 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         },
                         new SettingsSlider<float>
                         {
+                            TransferValueOnCommit = true,
                             LabelText = "Aspect Ratio",
                             Current = aspectRatio
                         },
                         new SettingsSlider<float>
                         {
+                            TransferValueOnCommit = true,
                             LabelText = "X Offset",
                             Current = offsetX
                         },
                         new SettingsSlider<float>
                         {
+                            TransferValueOnCommit = true,
                             LabelText = "Y Offset",
                             Current = offsetY
                         },
@@ -124,11 +127,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         },
                         new SettingsSlider<float>
                         {
+                            TransferValueOnCommit = true,
                             LabelText = "Width",
                             Current = sizeX
                         },
                         new SettingsSlider<float>
                         {
+                            TransferValueOnCommit = true,
                             LabelText = "Height",
                             Current = sizeY
                         },

From b1c4ac9f42842943d451f13b57da44231b34431d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 14:13:53 +0900
Subject: [PATCH 08568/10326] Remove local implementation of Vector2Converter

This has been moved to framework in
https://github.com/ppy/osu-framework/pull/4285.
---
 .../Converters/Vector2Converter.cs            | 34 -------------------
 .../IO/Serialization/IJsonSerializable.cs     |  2 --
 2 files changed, 36 deletions(-)
 delete mode 100644 osu.Game/IO/Serialization/Converters/Vector2Converter.cs

diff --git a/osu.Game/IO/Serialization/Converters/Vector2Converter.cs b/osu.Game/IO/Serialization/Converters/Vector2Converter.cs
deleted file mode 100644
index 46447b607b..0000000000
--- a/osu.Game/IO/Serialization/Converters/Vector2Converter.cs
+++ /dev/null
@@ -1,34 +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 Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using osuTK;
-
-namespace osu.Game.IO.Serialization.Converters
-{
-    /// <summary>
-    /// A type of <see cref="JsonConverter"/> that serializes only the X and Y coordinates of a <see cref="Vector2"/>.
-    /// </summary>
-    public class Vector2Converter : JsonConverter<Vector2>
-    {
-        public override Vector2 ReadJson(JsonReader reader, Type objectType, Vector2 existingValue, bool hasExistingValue, JsonSerializer serializer)
-        {
-            var obj = JObject.Load(reader);
-            return new Vector2((float)obj["x"], (float)obj["y"]);
-        }
-
-        public override void WriteJson(JsonWriter writer, Vector2 value, JsonSerializer serializer)
-        {
-            writer.WriteStartObject();
-
-            writer.WritePropertyName("x");
-            writer.WriteValue(value.X);
-            writer.WritePropertyName("y");
-            writer.WriteValue(value.Y);
-
-            writer.WriteEndObject();
-        }
-    }
-}
diff --git a/osu.Game/IO/Serialization/IJsonSerializable.cs b/osu.Game/IO/Serialization/IJsonSerializable.cs
index ac95d47c4b..30430e6f7f 100644
--- a/osu.Game/IO/Serialization/IJsonSerializable.cs
+++ b/osu.Game/IO/Serialization/IJsonSerializable.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Newtonsoft.Json;
-using osu.Game.IO.Serialization.Converters;
 
 namespace osu.Game.IO.Serialization
 {
@@ -28,7 +27,6 @@ namespace osu.Game.IO.Serialization
             Formatting = Formatting.Indented,
             ObjectCreationHandling = ObjectCreationHandling.Replace,
             DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate,
-            Converters = new JsonConverter[] { new Vector2Converter() },
             ContractResolver = new KeyContractResolver()
         };
     }

From 1e82033c840725d4facd32a95be7d7ebe682e908 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 14:18:56 +0900
Subject: [PATCH 08569/10326] Move bindings to LoadComplete to avoid
 cross-thread issues

---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index b2d37e345f..19a3c5b6f2 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -140,6 +140,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     }
                 },
             };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             areaOffset.BindTo(tabletHandler.AreaOffset);
             areaOffset.BindValueChanged(val =>

From fefb0078056fcfada6602ca1396318b618767bde Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 14:19:15 +0900
Subject: [PATCH 08570/10326] Remove no longer relevant comment

---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 19a3c5b6f2..d0e3ddbd91 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -202,7 +202,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 mainSettings.Show();
                 noTabletMessage.Hide();
 
-                // todo: these should propagate from a TabletChanged event or similar.
                 offsetX.MaxValue = tab.Size.X;
                 offsetX.Default = tab.Size.X / 2;
                 sizeX.Default = sizeX.MaxValue = tab.Size.X;

From bd1e2da1c2260457234bf40d16af2f130f68765a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 19:09:39 +0900
Subject: [PATCH 08571/10326] Always hide other overlays, even if the new one
 is not loaded

---
 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 e5e1f6946e..e2f0f0c05b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -756,12 +756,12 @@ namespace osu.Game
 
         private void showOverlayAboveOthers(OverlayContainer overlay, OverlayContainer[] otherOverlays)
         {
+            otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
+
             // generally shouldn't ever hit this state, but protects against a crash on attempting to change ChildDepth.
             if (overlay.LoadState < LoadState.Ready)
                 return;
 
-            otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
-
             // show above others if not visible at all, else leave at current depth.
             if (!overlay.IsPresent)
                 overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime);

From c0c8b3e46c49290709a8c9948693c72857404704 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 19:22:47 +0900
Subject: [PATCH 08572/10326] Fix regression meaning `SkinnableSound`
 initialisation may never happen

---
 osu.Game/Skinning/SkinnableSound.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index e447f9c44c..9c6a4f7970 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -131,6 +131,14 @@ namespace osu.Game.Skinning
             });
         }
 
+        protected override void LoadAsyncComplete()
+        {
+            base.LoadAsyncComplete();
+
+            if (!samplesContainer.Any())
+                updateSamples();
+        }
+
         /// <summary>
         /// Stops the samples.
         /// </summary>

From 9be7981e0d981cea5ed9b605ab9423e77877b7f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 19:45:00 +0900
Subject: [PATCH 08573/10326] Adjust timeline ticks to be more visible

---
 osu.Game/Screens/Edit/BindableBeatDivisor.cs        |  3 +--
 .../Edit/Compose/Components/DistanceSnapGrid.cs     |  2 +-
 .../Components/Timeline/TimelineTickDisplay.cs      | 13 +++++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/BindableBeatDivisor.cs b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
index d9477dd4bc..ff33f0c70d 100644
--- a/osu.Game/Screens/Edit/BindableBeatDivisor.cs
+++ b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Colour;
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
@@ -48,7 +47,7 @@ namespace osu.Game.Screens.Edit
         /// <param name="beatDivisor">The beat divisor.</param>
         /// <param name="colours">The set of colours.</param>
         /// <returns>The applicable colour from <paramref name="colours"/> for <paramref name="beatDivisor"/>.</returns>
-        public static ColourInfo GetColourFor(int beatDivisor, OsuColour colours)
+        public static Color4 GetColourFor(int beatDivisor, OsuColour colours)
         {
             switch (beatDivisor)
             {
diff --git a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
index 8a92a2011d..59f88ac641 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             var colour = BindableBeatDivisor.GetColourFor(BindableBeatDivisor.GetDivisorForBeatIndex(beatIndex + placementIndex + 1, beatDivisor.Value), Colours);
 
             int repeatIndex = placementIndex / beatDivisor.Value;
-            return colour.MultiplyAlpha(0.5f / (repeatIndex + 1));
+            return ColourInfo.SingleColour(colour).MultiplyAlpha(0.5f / (repeatIndex + 1));
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index fb11b859a7..c070c833f8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -6,7 +6,9 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -124,25 +126,28 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         if (beat == 0 && i == 0)
                             nextMinTick = float.MinValue;
 
-                        var indexInBar = beat % ((int)point.TimeSignature * beatDivisor.Value);
+                        int indexInBar = beat % ((int)point.TimeSignature * beatDivisor.Value);
 
                         var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
                         var colour = BindableBeatDivisor.GetColourFor(divisor, colours);
 
+                        bool isMainBeat = indexInBar == 0;
+
                         // even though "bar lines" take up the full vertical space, we render them in two pieces because it allows for less anchor/origin churn.
-                        var height = indexInBar == 0 ? 0.5f : 0.1f - (float)divisor / highestDivisor * 0.08f;
+                        float height = isMainBeat ? 0.5f : 0.4f - (float)divisor / highestDivisor * 0.2f;
+                        float gradientOpacity = isMainBeat ? 1 : 0;
 
                         var topPoint = getNextUsablePoint();
                         topPoint.X = xPos;
-                        topPoint.Colour = colour;
                         topPoint.Height = height;
+                        topPoint.Colour = ColourInfo.GradientVertical(colour, colour.Opacity(gradientOpacity));
                         topPoint.Anchor = Anchor.TopLeft;
                         topPoint.Origin = Anchor.TopCentre;
 
                         var bottomPoint = getNextUsablePoint();
                         bottomPoint.X = xPos;
-                        bottomPoint.Colour = colour;
                         bottomPoint.Anchor = Anchor.BottomLeft;
+                        bottomPoint.Colour = ColourInfo.GradientVertical(colour.Opacity(gradientOpacity), colour);
                         bottomPoint.Origin = Anchor.BottomCentre;
                         bottomPoint.Height = height;
                     }

From 8955071703d40ed9f0210a45def45546bf1c19cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:01:45 +0900
Subject: [PATCH 08574/10326] Change editor speed adjust to adjust frequency

---
 osu.Game/Screens/Edit/Components/PlaybackControl.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 9739f2876a..bdc6e238c8 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Edit.Components
         [Resolved]
         private EditorClock editorClock { get; set; }
 
-        private readonly BindableNumber<double> tempo = new BindableDouble(1);
+        private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
 
         [BackgroundDependencyLoader]
         private void load()
@@ -58,16 +58,16 @@ namespace osu.Game.Screens.Edit.Components
                     RelativeSizeAxes = Axes.Both,
                     Height = 0.5f,
                     Padding = new MarginPadding { Left = 45 },
-                    Child = new PlaybackTabControl { Current = tempo },
+                    Child = new PlaybackTabControl { Current = freqAdjust },
                 }
             };
 
-            Track.BindValueChanged(tr => tr.NewValue?.AddAdjustment(AdjustableProperty.Tempo, tempo), true);
+            Track.BindValueChanged(tr => tr.NewValue?.AddAdjustment(AdjustableProperty.Frequency, freqAdjust), true);
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            Track.Value?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
+            Track.Value?.RemoveAdjustment(AdjustableProperty.Frequency, freqAdjust);
 
             base.Dispose(isDisposing);
         }
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.Edit.Components
 
         private class PlaybackTabControl : OsuTabControl<double>
         {
-            private static readonly double[] tempo_values = { 0.5, 0.75, 1 };
+            private static readonly double[] tempo_values = { 0.25, 0.5, 0.75, 1 };
 
             protected override TabItem<double> CreateTabItem(double value) => new PlaybackTabItem(value);
 

From 86b229b1c94a1e0e3379b4e013206fd5ac996771 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:05:18 +0900
Subject: [PATCH 08575/10326] Increase maximum usable aspect ratio to account
 for ultrawide monitors

---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index d0e3ddbd91..73ac8e4f35 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -31,9 +31,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private GameHost host { get; set; }
 
         /// <summary>
-        /// Based on the longest available smartphone.
+        /// Based on ultrawide monitor configurations.
         /// </summary>
-        private const float largest_feasible_aspect_ratio = 20f / 9;
+        private const float largest_feasible_aspect_ratio = 21f / 9;
 
         private readonly BindableNumber<float> aspectRatio = new BindableFloat(1)
         {

From 4795170c6044bc7092b4c78b687f5a5bdc880088 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:07:13 +0900
Subject: [PATCH 08576/10326] Add back the default json converter locally to
 ensure it's actually used

---
 osu.Game/IO/Serialization/IJsonSerializable.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/IO/Serialization/IJsonSerializable.cs b/osu.Game/IO/Serialization/IJsonSerializable.cs
index 30430e6f7f..ba188963ea 100644
--- a/osu.Game/IO/Serialization/IJsonSerializable.cs
+++ b/osu.Game/IO/Serialization/IJsonSerializable.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Framework.IO.Serialization;
 
 namespace osu.Game.IO.Serialization
 {
@@ -27,6 +29,7 @@ namespace osu.Game.IO.Serialization
             Formatting = Formatting.Indented,
             ObjectCreationHandling = ObjectCreationHandling.Replace,
             DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate,
+            Converters = new List<JsonConverter> { new Vector2Converter() },
             ContractResolver = new KeyContractResolver()
         };
     }

From 095b7f86685799249f5427ba7010f55a6a7e6646 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:09:12 +0900
Subject: [PATCH 08577/10326] Rewrite code to account for non-loaded edge case

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e2f0f0c05b..be919d60ca 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -758,13 +758,15 @@ namespace osu.Game
         {
             otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
 
-            // generally shouldn't ever hit this state, but protects against a crash on attempting to change ChildDepth.
-            if (overlay.LoadState < LoadState.Ready)
+            // Partially visible so leave it at the current depth.
+            if (overlay.IsPresent)
                 return;
 
-            // show above others if not visible at all, else leave at current depth.
-            if (!overlay.IsPresent)
+            // Show above all other overlays.
+            if (overlay.IsLoaded)
                 overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime);
+            else
+                overlay.Depth = (float)-Clock.CurrentTime;
         }
 
         private void forwardLoggedErrorsToNotifications()

From 6f32c302eb692f2a8c7bf6122149a28d96672446 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:13:51 +0900
Subject: [PATCH 08578/10326] Add checkbox to optionally disable tablet
 handling

---
 .../Settings/Sections/Input/TabletSettings.cs         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 73ac8e4f35..893fe575cd 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -62,11 +62,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             Children = new Drawable[]
             {
+                new SettingsCheckbox
+                {
+                    LabelText = "Enabled",
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    Current = tabletHandler.Enabled
+                },
                 noTabletMessage = new OsuSpriteText
                 {
                     Text = "No tablet detected!",
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
                     Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS }
                 },
                 mainSettings = new FillFlowContainer

From 63cbac3bd059778a8b94ad0d5e5b47beab637f33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:15:29 +0900
Subject: [PATCH 08579/10326] Ensure aspect ratio slider gets an initial value

---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 893fe575cd..b06b148984 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -186,6 +186,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 aspectRatioApplication = Schedule(() => applyAspectRatio(sizeY));
             });
 
+            updateAspectRatio();
             aspectRatio.BindValueChanged(aspect =>
             {
                 aspectRatioApplication?.Cancel();

From b2d8db3a92d65c2db7a26d08f276a30fef82c7c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:25:21 +0900
Subject: [PATCH 08580/10326] Rename incorrect variable

---
 osu.Game/Skinning/PoolableSkinnableSample.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 09e087d0f2..c01a6d20cc 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -94,21 +94,21 @@ namespace osu.Game.Skinning
             sampleContainer.Clear();
             Sample = null;
 
-            var ch = CurrentSkin.GetSample(sampleInfo);
+            var sample = CurrentSkin.GetSample(sampleInfo);
 
-            if (ch == null && AllowDefaultFallback)
+            if (sample == null && AllowDefaultFallback)
             {
                 foreach (var lookup in sampleInfo.LookupNames)
                 {
-                    if ((ch = sampleStore.Get(lookup)) != null)
+                    if ((sample = sampleStore.Get(lookup)) != null)
                         break;
                 }
             }
 
-            if (ch == null)
+            if (sample == null)
                 return;
 
-            sampleContainer.Add(Sample = new DrawableSample(ch));
+            sampleContainer.Add(Sample = new DrawableSample(sample));
 
             // Start playback internally for the new sample if the previous one was playing beforehand.
             if (wasPlaying && Looping)

From 68aaf90702458f288913e191c4d27c342aa7a358 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:30:52 +0900
Subject: [PATCH 08581/10326] Fix disposal rather than performing some weird
 hack

---
 osu.Game/Skinning/LegacySkin.cs              | 4 +++-
 osu.Game/Skinning/PoolableSkinnableSample.cs | 8 --------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index b69e99773c..ec49d43c67 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -509,7 +509,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// A sample wrapper which keeps a reference to the contained skin to avoid finalizer garbage collection of the managing SampleStore.
         /// </summary>
-        private class LegacySkinSample : ISample
+        private class LegacySkinSample : ISample, IDisposable
         {
             private readonly Sample sample;
 
@@ -575,6 +575,8 @@ namespace osu.Game.Skinning
             public IBindable<double> AggregateFrequency => sample.AggregateFrequency;
 
             public IBindable<double> AggregateTempo => sample.AggregateTempo;
+
+            public void Dispose() => sample.Dispose();
         }
     }
 }
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index c01a6d20cc..b04158a58f 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -83,14 +83,6 @@ namespace osu.Game.Skinning
 
             bool wasPlaying = Playing;
 
-            if (activeChannel != null)
-            {
-                // when switching away from previous samples, we don't want to call Stop() on them as it sounds better to let them play out.
-                // this may change in the future if we use PoolableSkinSample in more locations than gameplay.
-                // we *do* want to turn off looping, else we end up with an infinite looping sample running in the background.
-                activeChannel.Looping = false;
-            }
-
             sampleContainer.Clear();
             Sample = null;
 

From 71a361337da8ee2ddac2feeb8af3e9644248c3d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 21:57:48 +0900
Subject: [PATCH 08582/10326] Add comment regarding usage of `Reverse()`

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 .../Compose/Components/Timeline/TimelineBlueprintContainer.cs    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 4522418e87..3526f264a7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -138,6 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             Stack<double> currentConcurrentObjects = new Stack<double>();
 
+            // Reversing is done to enumerate in order of increasing StartTime.
             foreach (var b in SelectionBlueprints.Reverse())
             {
                 while (currentConcurrentObjects.TryPeek(out double stackEndTime))

From 9634560d4b761a2a3aa90d78ffb1933e2c96c7c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Mar 2021 21:36:28 +0100
Subject: [PATCH 08583/10326] Fix control point visualiser crashing after
 deselections

`SliderSelectionBlueprint.OnDeselected()` would expire the
`ControlPointVisualiser` on deselection, leading to its removal from the
blueprint and eventual disposal, but still kept a separate reference to
said visualiser in another field.

This could lead to that stale reference to a disposed child getting read
in `ReceivePositionalInputAt()`, crashing quite a ways down over at the
framework side on futilely trying to compute the bounding box of a
drawable with no parent.
---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 3d3dff653a..befe3c6695 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -114,6 +114,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             // throw away frame buffers on deselection.
             ControlPointVisualiser?.Expire();
+            ControlPointVisualiser = null;
+
             BodyPiece.RecyclePath();
         }
 

From e67c759eef36a409e4b57ab1c7643eb307280cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Mar 2021 22:44:31 +0100
Subject: [PATCH 08584/10326] Mark control point visualiser as possibly-null

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index befe3c6695..ba9bb3c485 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -28,6 +29,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         protected SliderBodyPiece BodyPiece { get; private set; }
         protected SliderCircleSelectionBlueprint HeadBlueprint { get; private set; }
         protected SliderCircleSelectionBlueprint TailBlueprint { get; private set; }
+
+        [CanBeNull]
         protected PathControlPointVisualiser ControlPointVisualiser { get; private set; }
 
         private readonly DrawableSlider slider;

From 8e0536e1e2d2eb66a7572dcf27f19d65cb4f5e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Mar 2021 22:20:26 +0100
Subject: [PATCH 08585/10326] Add failing test scene

---
 .../Editing/TestSceneBlueprintSelection.cs    | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs
new file mode 100644
index 0000000000..fd9c09fd5f
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneBlueprintSelection : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
+
+        private BlueprintContainer blueprintContainer
+            => Editor.ChildrenOfType<BlueprintContainer>().First();
+
+        [Test]
+        public void TestSelectedObjectHasPriorityWhenOverlapping()
+        {
+            var firstSlider = new Slider
+            {
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(new Vector2()),
+                    new PathControlPoint(new Vector2(150, -50)),
+                    new PathControlPoint(new Vector2(300, 0))
+                }),
+                Position = new Vector2(0, 100)
+            };
+            var secondSlider = new Slider
+            {
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(new Vector2()),
+                    new PathControlPoint(new Vector2(-50, 50)),
+                    new PathControlPoint(new Vector2(-100, 100))
+                }),
+                Position = new Vector2(200, 0)
+            };
+
+            AddStep("add overlapping sliders", () =>
+            {
+                EditorBeatmap.Add(firstSlider);
+                EditorBeatmap.Add(secondSlider);
+            });
+            AddStep("select first slider", () => EditorBeatmap.SelectedHitObjects.Add(firstSlider));
+
+            AddStep("move mouse to common point", () =>
+            {
+                var pos = blueprintContainer.ChildrenOfType<PathControlPointPiece>().ElementAt(1).ScreenSpaceDrawQuad.Centre;
+                InputManager.MoveMouseTo(pos);
+            });
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
+
+            AddAssert("selection is unchanged", () => EditorBeatmap.SelectedHitObjects.Single() == firstSlider);
+        }
+    }
+}

From dd48b68f8ad6fc513d17f9847d0863df2c90dc1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Mar 2021 22:20:40 +0100
Subject: [PATCH 08586/10326] Ensure selected blueprints are given selection
 priority

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 051d0766bf..7def7e1d16 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -338,7 +338,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private bool beginClickSelection(MouseButtonEvent e)
         {
             // Iterate from the top of the input stack (blueprints closest to the front of the screen first).
-            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren.Reverse())
+            // Priority is given to already-selected blueprints.
+            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
             {
                 if (!blueprint.IsHovered) continue;
 

From ca943a897a387e7a7f7d8a934aee7125f262f698 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 20 Mar 2021 10:51:58 +0900
Subject: [PATCH 08587/10326] Fix back to front initialisation order

---
 osu.Game/Skinning/SkinnableSound.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 9c6a4f7970..f935adf7a5 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -133,10 +133,11 @@ namespace osu.Game.Skinning
 
         protected override void LoadAsyncComplete()
         {
-            base.LoadAsyncComplete();
-
+            // ensure samples are constructed before SkinChanged() is called via base.LoadAsyncComplete().
             if (!samplesContainer.Any())
                 updateSamples();
+
+            base.LoadAsyncComplete();
         }
 
         /// <summary>

From d28bed6ed29f9aeea901ccbec2c075367007fb47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 20 Mar 2021 12:29:24 +0100
Subject: [PATCH 08588/10326] Schedule adding transforms on tablet changes

Fixes `InvalidThreadForMutationException`s that pop up when
disconnecting/reconnecting tablets during the game's operation. In those
cases the value change callback executes from  an OpenTabletDriver
thread.
---
 .../Sections/Input/TabletAreaSelection.cs     | 15 ++++++-----
 .../Settings/Sections/Input/TabletSettings.cs | 25 +++++++++++++------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index df25668411..ecb8acce54 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -125,17 +125,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }, true);
 
             tablet.BindTo(handler.Tablet);
-            tablet.BindValueChanged(val =>
-            {
-                tabletContainer.Size = val.NewValue?.Size ?? Vector2.Zero;
-                tabletName.Text = val.NewValue?.Name ?? string.Empty;
-                checkBounds();
-            }, true);
+            tablet.BindValueChanged(_ => Scheduler.AddOnce(updateTabletDetails));
 
+            updateTabletDetails();
             // initial animation should be instant.
             FinishTransforms(true);
         }
 
+        private void updateTabletDetails()
+        {
+            tabletContainer.Size = tablet.Value?.Size ?? Vector2.Zero;
+            tabletName.Text = tablet.Value?.Name ?? string.Empty;
+            checkBounds();
+        }
+
         private static int greatestCommonDivider(int a, int b)
         {
             while (b != 0)
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index b06b148984..4baf43783d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -196,19 +196,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             tablet.BindTo(tabletHandler.Tablet);
             tablet.BindValueChanged(val =>
             {
+                Scheduler.AddOnce(toggleVisibility);
+
                 var tab = val.NewValue;
 
                 bool tabletFound = tab != null;
-
                 if (!tabletFound)
-                {
-                    mainSettings.Hide();
-                    noTabletMessage.Show();
                     return;
-                }
-
-                mainSettings.Show();
-                noTabletMessage.Hide();
 
                 offsetX.MaxValue = tab.Size.X;
                 offsetX.Default = tab.Size.X / 2;
@@ -222,6 +216,21 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }, true);
         }
 
+        private void toggleVisibility()
+        {
+            bool tabletFound = tablet.Value != null;
+
+            if (!tabletFound)
+            {
+                mainSettings.Hide();
+                noTabletMessage.Show();
+                return;
+            }
+
+            mainSettings.Show();
+            noTabletMessage.Hide();
+        }
+
         private void applyAspectRatio(BindableNumber<float> sizeChanged)
         {
             try

From 86b569f5f7a13700b7ef728fafb6fe1c014ea8d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 20 Mar 2021 12:34:41 +0100
Subject: [PATCH 08589/10326] Fix typo in identifier

---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 4baf43783d..bd0f7ddc4c 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -237,7 +237,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 if (!aspectLock.Value)
                 {
-                    float proposedAspectRatio = curentAspectRatio;
+                    float proposedAspectRatio = currentAspectRatio;
 
                     if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
                     {
@@ -278,8 +278,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             aspectLock.Value = true;
         }
 
-        private void updateAspectRatio() => aspectRatio.Value = curentAspectRatio;
+        private void updateAspectRatio() => aspectRatio.Value = currentAspectRatio;
 
-        private float curentAspectRatio => sizeX.Value / sizeY.Value;
+        private float currentAspectRatio => sizeX.Value / sizeY.Value;
     }
 }

From a294f328fb4f1471273b5ebe2e49b8e7e2003f21 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 21 Mar 2021 06:30:17 +0100
Subject: [PATCH 08590/10326] Add linear circular arc test

---
 .../TestSceneSliderPlacementBlueprint.cs       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 67a2e5a47c..f9b6fb924e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -276,6 +276,24 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.Linear);
         }
 
+        [Test]
+        public void TestPlacePerfectCurveSegmentAlmostLinearly()
+        {
+            addMovementStep(new Vector2(0));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(61.382935f, 6.423767f));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(217.69522f, 22.84021f));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            // Will be > 10000 if not falling back to Bezier path calc.
+            assertLength(218.8901f);
+        }
+
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
 
         private void addClickStep(MouseButton button)

From fcd1f4930f9118445a0976a785db75282bf9763b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 21 Mar 2021 06:34:55 +0100
Subject: [PATCH 08591/10326] Fix freeze due to large circular arc radius

Seems to stem from the osu!framework's PathApproximator not catching a few edge cases wherein the radius approaches infinity.
---
 osu.Game/Rulesets/Objects/SliderPath.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 3083fcfccb..94815fe0ea 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -219,8 +219,10 @@ namespace osu.Game.Rulesets.Objects
 
                     List<Vector2> subpath = PathApproximator.ApproximateCircularArc(subControlPoints);
 
-                    // If for some reason a circular arc could not be fit to the 3 given points, fall back to a numerically stable bezier approximation.
-                    if (subpath.Count == 0)
+                    // If for some reason a circular arc could not be fit to the 3 given points, or the
+                    // resulting radius is too large (e.g. points arranged almost linearly), fall back
+                    // to a numerically stable bezier approximation.
+                    if (subpath.Count == 0 || subpath.Count > 400)
                         break;
 
                     return subpath;

From a16c0641b27ab69f59c56a4cf96f388e941affa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Mar 2021 11:01:06 +0100
Subject: [PATCH 08592/10326] Revert EF Core to version 2.2

This reverts commit f3faad74d587bbbd104395f5072723203c9d54aa, reversing
changes made to 712e7bc7bfaa94dd8c7248d9e800e7bc916476c0.

Several issues arose after migrating to 5.0, including, but possibly not
limited to, performance regressions in song select, as well as failures
when attempting to save beatmaps after metadata changes in the editor.
---
 osu.Desktop/osu.Desktop.csproj                |  4 +-
 .../osu.Game.Rulesets.Catch.Tests.csproj      |  2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj      |  2 +-
 .../osu.Game.Rulesets.Osu.Tests.csproj        |  2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj      |  2 +-
 .../TestSceneMultiplayerMatchSongSelect.cs    |  1 -
 .../TestSceneBeatmapRecommendations.cs        |  1 -
 .../SongSelect/TestScenePlaySongSelect.cs     |  4 +-
 osu.Game.Tests/osu.Game.Tests.csproj          |  2 +-
 osu.Game/Beatmaps/BeatmapManager.cs           |  2 -
 osu.Game/Database/ArchiveModelManager.cs      |  6 +-
 .../Database/DatabaseWorkaroundExtensions.cs  | 71 -------------------
 osu.Game/Database/OsuDbContext.cs             |  9 +--
 osu.Game/Scoring/ScoreInfo.cs                 | 13 +++-
 osu.Game/Scoring/ScoreManager.cs              |  5 --
 osu.Game/Skinning/SkinManager.cs              |  5 --
 osu.Game/osu.Game.csproj                      |  6 +-
 osu.iOS.props                                 |  2 +
 18 files changed, 30 insertions(+), 109 deletions(-)
 delete mode 100644 osu.Game/Database/DatabaseWorkaroundExtensions.cs

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index d9d23dea6b..3e0f0cb7f6 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -27,8 +27,8 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>
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 42f70151ac..728af5124e 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
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 e51b20c9fe..af16f39563 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
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 f1f75148ef..3d2d1f3fec 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
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 c9a320bdd5..fa00922706 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index 8cfe5d8af2..faa5d9e6fc 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -56,7 +56,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 beatmaps.Add(new BeatmapInfo
                 {
                     Ruleset = rulesets.GetRuleset(i % 4),
-                    RulesetID = i % 4, // workaround for efcore 5 compatibility.
                     OnlineBeatmapID = beatmapId,
                     Length = length,
                     BPM = bpm,
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 9b8b74e6f6..53a956c77c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -186,7 +186,6 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Metadata = metadata,
                     BaseDifficulty = new BeatmapDifficulty(),
                     Ruleset = ruleset,
-                    RulesetID = ruleset.ID.GetValueOrDefault(), // workaround for efcore 5 compatibility.
                     StarDifficulty = difficultyIndex + 1,
                     Version = $"SR{difficultyIndex + 1}"
                 }).ToList()
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 057b539e44..5731b1ac2c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -911,11 +911,9 @@ namespace osu.Game.Tests.Visual.SongSelect
                 int length = RNG.Next(30000, 200000);
                 double bpm = RNG.NextSingle(80, 200);
 
-                var ruleset = getRuleset();
                 beatmaps.Add(new BeatmapInfo
                 {
-                    Ruleset = ruleset,
-                    RulesetID = ruleset.ID.GetValueOrDefault(), // workaround for efcore 5 compatibility.
+                    Ruleset = getRuleset(),
                     OnlineBeatmapID = beatmapId,
                     Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss}, bpm {bpm:0.#})",
                     Length = length,
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 6f8e0fac6f..e36b3cdc74 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -6,7 +6,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 115d1b33bb..b4ea898b7d 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -171,8 +171,6 @@ namespace osu.Game.Beatmaps
             if (beatmapSet.Beatmaps.Any(b => b.BaseDifficulty == null))
                 throw new InvalidOperationException($"Cannot import {nameof(BeatmapInfo)} with null {nameof(BeatmapInfo.BaseDifficulty)}.");
 
-            beatmapSet.Requery(ContextFactory);
-
             // check if a set already exists with the same online id, delete if it does.
             if (beatmapSet.OnlineBeatmapSetID != null)
             {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 64428882ac..d809dbcb01 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -462,8 +462,6 @@ namespace osu.Game.Database
                 // Dereference the existing file info, since the file model will be removed.
                 if (file.FileInfo != null)
                 {
-                    file.Requery(usage.Context);
-
                     Files.Dereference(file.FileInfo);
 
                     // This shouldn't be required, but here for safety in case the provided TModel is not being change tracked
@@ -637,12 +635,10 @@ namespace osu.Game.Database
             {
                 using (Stream s = reader.GetStream(file))
                 {
-                    var fileInfo = files.Add(s);
                     fileInfos.Add(new TFileModel
                     {
                         Filename = file.Substring(prefix.Length).ToStandardisedPath(),
-                        FileInfo = fileInfo,
-                        FileInfoID = fileInfo.ID // workaround for efcore 5 compatibility.
+                        FileInfo = files.Add(s)
                     });
                 }
             }
diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
deleted file mode 100644
index a3a982f232..0000000000
--- a/osu.Game/Database/DatabaseWorkaroundExtensions.cs
+++ /dev/null
@@ -1,71 +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.Scoring;
-using osu.Game.Skinning;
-
-namespace osu.Game.Database
-{
-    /// <summary>
-    /// Extension methods which contain workarounds to make EFcore 5.x work with our existing (incorrect) thread safety.
-    /// The intention is to avoid blocking package updates while we consider the future of the database backend, with a potential backend switch imminent.
-    /// </summary>
-    public static class DatabaseWorkaroundExtensions
-    {
-        /// <summary>
-        /// Re-query the provided model to ensure it is in a sane state. This method requires explicit implementation per model type.
-        /// </summary>
-        /// <param name="model"></param>
-        /// <param name="contextFactory"></param>
-        public static void Requery(this IHasPrimaryKey model, IDatabaseContextFactory contextFactory)
-        {
-            switch (model)
-            {
-                case SkinInfo skinInfo:
-                    requeryFiles(skinInfo.Files, contextFactory);
-                    break;
-
-                case ScoreInfo scoreInfo:
-                    requeryFiles(scoreInfo.Beatmap.BeatmapSet.Files, contextFactory);
-                    requeryFiles(scoreInfo.Files, contextFactory);
-                    break;
-
-                case BeatmapSetInfo beatmapSetInfo:
-                    var context = contextFactory.Get();
-
-                    foreach (var beatmap in beatmapSetInfo.Beatmaps)
-                    {
-                        // Workaround System.InvalidOperationException
-                        // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                        beatmap.Ruleset = context.RulesetInfo.Find(beatmap.RulesetID);
-                    }
-
-                    requeryFiles(beatmapSetInfo.Files, contextFactory);
-                    break;
-
-                default:
-                    throw new ArgumentException($"{nameof(Requery)} does not have support for the provided model type", nameof(model));
-            }
-
-            void requeryFiles<T>(List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
-            {
-                var dbContext = databaseContextFactory.Get();
-
-                foreach (var file in files)
-                {
-                    Requery(file, dbContext);
-                }
-            }
-        }
-
-        public static void Requery(this INamedFileInfo file, OsuDbContext dbContext)
-        {
-            // Workaround System.InvalidOperationException
-            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-            file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-        }
-    }
-}
diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index 2342ab07d4..2aae62edea 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Logging;
 using osu.Framework.Logging;
 using osu.Framework.Statistics;
@@ -110,10 +111,10 @@ namespace osu.Game.Database
         {
             base.OnConfiguring(optionsBuilder);
             optionsBuilder
-                .UseSqlite(connectionString,
-                    sqliteOptions => sqliteOptions
-                                     .CommandTimeout(10)
-                                     .UseQuerySplittingBehavior(QuerySplittingBehavior.SingleQuery))
+                // this is required for the time being due to the way we are querying in places like BeatmapStore.
+                // if we ever move to having consumers file their own .Includes, or get eager loading support, this could be re-enabled.
+                .ConfigureWarnings(warnings => warnings.Ignore(CoreEventId.IncludeIgnoredWarning))
+                .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10))
                 .UseLoggerFactory(logger.Value);
         }
 
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 78101991f6..f5192f3a40 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Scoring
             }
             set
             {
-                modsJson = JsonConvert.SerializeObject(value.Select(m => new DeserializedMod { Acronym = m.Acronym }));
+                modsJson = null;
                 mods = value;
             }
         }
@@ -86,7 +86,16 @@ namespace osu.Game.Scoring
         [Column("Mods")]
         public string ModsJson
         {
-            get => modsJson;
+            get
+            {
+                if (modsJson != null)
+                    return modsJson;
+
+                if (mods == null)
+                    return null;
+
+                return modsJson = JsonConvert.SerializeObject(mods.Select(m => new DeserializedMod { Acronym = m.Acronym }));
+            }
             set
             {
                 modsJson = value;
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 7d0abc5996..c7ee26c248 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -53,11 +53,6 @@ namespace osu.Game.Scoring
             this.configManager = configManager;
         }
 
-        protected override void PreImport(ScoreInfo model)
-        {
-            model.Requery(ContextFactory);
-        }
-
         protected override ScoreInfo CreateModel(ArchiveReader archive)
         {
             if (archive == null)
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 894a068b7f..9257636301 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -142,11 +142,6 @@ namespace osu.Game.Skinning
             }
         }
 
-        protected override void PreImport(SkinInfo model)
-        {
-            model.Requery(ContextFactory);
-        }
-
         /// <summary>
         /// Retrieve a <see cref="Skin"/> instance for the provided <see cref="SkinInfo"/>
         /// </summary>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 360c522193..9731c1d5ea 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,10 +24,10 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.317.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index b763a91dfb..11677d345e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -90,6 +90,8 @@
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
+    <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="2021.317.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />

From c4f3714385c411dca8092f3163aad2817ff7f62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Mar 2021 18:39:52 +0100
Subject: [PATCH 08593/10326] Make hold note input tests fail due to head
 hiding

---
 .../TestSceneHoldNoteInput.cs                        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 596430f9e5..7ae69bf7d7 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -5,11 +5,13 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Objects;
@@ -345,6 +347,14 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+
+            AddUntilStep("wait for head", () => currentPlayer.GameplayClockContainer.GameplayClock.CurrentTime >= time_head);
+            AddAssert("head is visible",
+                () => currentPlayer.ChildrenOfType<DrawableHoldNote>()
+                                   .Single(note => note.HitObject == beatmap.HitObjects[0])
+                                   .Head
+                                   .Alpha == 1);
+
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
@@ -352,6 +362,8 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
 
+            public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
+
             protected override bool PauseOnFocusLost => false;
 
             public ScoreAccessibleReplayPlayer(Score score)

From 9a330c4c56aeeda049cfccdd6a15f10c1966758c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Mar 2021 18:34:31 +0100
Subject: [PATCH 08594/10326] Fix mania hold note heads hiding when frozen

This was an insidious regression from a3dc1d5. Prior to that commit,
`DrawableHoldNoteHead` had `UpdateStateTransforms()` overridden, to set
the hold note head's lifetime. When that method was split into
`UpdateInitialStateTransforms()` and `UpdateHitStateTransforms()`, the
lifetime set was moved to the former.

Unfortunately, that override served two purposes: both to set the
lifetime, and to suppress hit animations which would normally be added
by the base `DrawableManiaHitObject`. That fact being missed led to
`UpdateHitStateTransforms()` hiding the hold note head immediately on
hit and with a slight delay on miss.

To resolve, explicitly override `UpdateHitStateTransforms()` and
suppress the base call, with an explanatory comment.
---
 .../Objects/Drawables/DrawableHoldNoteHead.cs          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
index 75dcf0e55e..35ba2465fa 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.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.Objects.Drawables;
+
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
     /// <summary>
@@ -25,6 +27,14 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             LifetimeEnd = LifetimeStart + 30000;
         }
 
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            // suppress the base call explicitly.
+            // the hold note head should never change its visual state on its own due to the "freezing" mechanic
+            // (when hit, it remains visible in place at the judgement line; when dropped, it will scroll past the line).
+            // it will be hidden along with its parenting hold note when required.
+        }
+
         public override bool OnPressed(ManiaAction action) => false; // Handled by the hold note
 
         public override void OnReleased(ManiaAction action)

From e31d583a7f468853844bb1e8aa38f2d70225f122 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 21 Mar 2021 11:16:59 -0700
Subject: [PATCH 08595/10326] Add comments count to user profile overlay

---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 6 ++++++
 osu.Game/Users/User.cs                                    | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 662f55317b..e73579fad0 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -115,6 +116,11 @@ namespace osu.Game.Overlays.Profile.Header
             topLinkContainer.AddText("Contributed ");
             topLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"{api.WebsiteRootUrl}/users/{user.Id}/posts", creationParameters: embolden);
 
+            addSpacer(topLinkContainer);
+
+            topLinkContainer.AddText("Posted ");
+            topLinkContainer.AddLink("comment".ToQuantity(user.CommentsCount, "#,##0"), $"{api.WebsiteRootUrl}/comments?user_id={user.Id}", creationParameters: embolden);
+
             string websiteWithoutProtocol = user.Website;
 
             if (!string.IsNullOrEmpty(websiteWithoutProtocol))
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 6c45417db0..74ffb7c457 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -120,6 +120,9 @@ namespace osu.Game.Users
         [JsonProperty(@"post_count")]
         public int PostCount;
 
+        [JsonProperty(@"comments_count")]
+        public int CommentsCount;
+
         [JsonProperty(@"follower_count")]
         public int FollowerCount;
 

From 9bc6cdf042317265f7e37b3feaf58f10770d6fac Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 21 Mar 2021 11:19:07 -0700
Subject: [PATCH 08596/10326] Fix singular format regression on forum post text

---
 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 e73579fad0..fe61e532e1 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Overlays.Profile.Header
             }
 
             topLinkContainer.AddText("Contributed ");
-            topLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"{api.WebsiteRootUrl}/users/{user.Id}/posts", creationParameters: embolden);
+            topLinkContainer.AddLink("forum post".ToQuantity(user.PostCount, "#,##0"), $"{api.WebsiteRootUrl}/users/{user.Id}/posts", creationParameters: embolden);
 
             addSpacer(topLinkContainer);
 

From f7bf23dbe9b51fa6f2a8168efdf4ce1b081e8874 Mon Sep 17 00:00:00 2001
From: owen-young <owen.young8699@gmail.com>
Date: Sun, 21 Mar 2021 21:50:19 -0500
Subject: [PATCH 08597/10326] first attempt at changing windowMode to be
 fullscreen on default

---
 osu.Game/OsuGame.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index dd775888a1..2fd6331c86 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -126,6 +126,8 @@ namespace osu.Game
 
         private Bindable<int> configSkin;
 
+        private Bindable<WindowMode> windowMode;
+
         private readonly string[] args;
 
         private readonly List<OverlayContainer> overlays = new List<OverlayContainer>();
@@ -631,6 +633,12 @@ namespace osu.Game
 
             loadComponentSingleFile(volume = new VolumeOverlay(), leftFloatingOverlayContent.Add, true);
 
+            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            windowMode.BindValueChanged(mode => ScheduleAfterChildren(() =>
+            {
+                    windowMode.Value = WindowMode.Windowed;
+            }), true);
+
             var onScreenDisplay = new OnScreenDisplay();
 
             onScreenDisplay.BeginTracking(this, frameworkConfig);

From 073dba5330663073433b38798626ae0d6781d971 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Mar 2021 14:05:37 +0900
Subject: [PATCH 08598/10326] Remove local workarounds to attempt to avoid
 crashes on skin change

---
 osu.Game/Skinning/LegacySkin.cs | 76 +--------------------------------
 1 file changed, 1 insertion(+), 75 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index ec49d43c67..12abc4d867 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using JetBrains.Annotations;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -462,7 +461,7 @@ namespace osu.Game.Skinning
                 var sample = Samples?.Get(lookup);
 
                 if (sample != null)
-                    return new LegacySkinSample(sample, this);
+                    return sample;
             }
 
             return null;
@@ -505,78 +504,5 @@ namespace osu.Game.Skinning
             Textures?.Dispose();
             Samples?.Dispose();
         }
-
-        /// <summary>
-        /// A sample wrapper which keeps a reference to the contained skin to avoid finalizer garbage collection of the managing SampleStore.
-        /// </summary>
-        private class LegacySkinSample : ISample, IDisposable
-        {
-            private readonly Sample sample;
-
-            [UsedImplicitly]
-            private readonly LegacySkin skin;
-
-            public LegacySkinSample(Sample sample, LegacySkin skin)
-            {
-                this.sample = sample;
-                this.skin = skin;
-            }
-
-            public SampleChannel Play()
-            {
-                return sample.Play();
-            }
-
-            public SampleChannel GetChannel()
-            {
-                return sample.GetChannel();
-            }
-
-            public double Length => sample.Length;
-
-            public Bindable<int> PlaybackConcurrency => sample.PlaybackConcurrency;
-            public BindableNumber<double> Volume => sample.Volume;
-
-            public BindableNumber<double> Balance => sample.Balance;
-
-            public BindableNumber<double> Frequency => sample.Frequency;
-
-            public BindableNumber<double> Tempo => sample.Tempo;
-
-            public void BindAdjustments(IAggregateAudioAdjustment component)
-            {
-                sample.BindAdjustments(component);
-            }
-
-            public void UnbindAdjustments(IAggregateAudioAdjustment component)
-            {
-                sample.UnbindAdjustments(component);
-            }
-
-            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
-            {
-                sample.AddAdjustment(type, adjustBindable);
-            }
-
-            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
-            {
-                sample.RemoveAdjustment(type, adjustBindable);
-            }
-
-            public void RemoveAllAdjustments(AdjustableProperty type)
-            {
-                sample.RemoveAllAdjustments(type);
-            }
-
-            public IBindable<double> AggregateVolume => sample.AggregateVolume;
-
-            public IBindable<double> AggregateBalance => sample.AggregateBalance;
-
-            public IBindable<double> AggregateFrequency => sample.AggregateFrequency;
-
-            public IBindable<double> AggregateTempo => sample.AggregateTempo;
-
-            public void Dispose() => sample.Dispose();
-        }
     }
 }

From db64fac8241710308f02399909ec7f6f05be6251 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Mar 2021 15:26:22 +0900
Subject: [PATCH 08599/10326] Delay key fade in legacy mania skins

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
index 78ccb83a8c..174324f5f6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
@@ -101,8 +101,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         {
             if (action == column.Action.Value)
             {
-                upSprite.FadeTo(1);
-                downSprite.FadeTo(0);
+                upSprite.Delay(80).FadeTo(1);
+                downSprite.Delay(80).FadeTo(0);
             }
         }
     }

From fc632fd48aae56b1045a1955b035d8ac574609d8 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Mon, 22 Mar 2021 01:30:20 -0500
Subject: [PATCH 08600/10326] Added WindowSetting setting to OsuSetting enum so
 that it can be set by default at startup. Modified LayoutSettings.cs so that
 when it is changed in the settings, it is written to the local settings as
 well.

---
 osu.Game/Configuration/OsuConfigManager.cs               | 3 +++
 osu.Game/OsuGame.cs                                      | 9 +++------
 .../Settings/Sections/Graphics/LayoutSettings.cs         | 7 ++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index d0fa45bb7a..cd74fe25f4 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -91,6 +91,8 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.MenuParallax, true);
 
+            Set(OsuSetting.WindowSetting, WindowMode.Fullscreen);
+
             // Gameplay
             Set(OsuSetting.DimLevel, 0.8, 0, 1, 0.01);
             Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
@@ -233,6 +235,7 @@ namespace osu.Game.Configuration
         MenuVoice,
         CursorRotation,
         MenuParallax,
+        WindowSetting,
         BeatmapDetailTab,
         BeatmapDetailModsFilter,
         Username,
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 2fd6331c86..84737a56e4 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -234,6 +234,9 @@ namespace osu.Game
 
             SelectedMods.BindValueChanged(modsChanged);
             Beatmap.BindValueChanged(beatmapChanged, true);
+
+            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
         }
 
         private ExternalLinkOpener externalLinkOpener;
@@ -633,12 +636,6 @@ namespace osu.Game
 
             loadComponentSingleFile(volume = new VolumeOverlay(), leftFloatingOverlayContent.Add, true);
 
-            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            windowMode.BindValueChanged(mode => ScheduleAfterChildren(() =>
-            {
-                    windowMode.Value = WindowMode.Windowed;
-            }), true);
-
             var onScreenDisplay = new OnScreenDisplay();
 
             onScreenDisplay.BeginTracking(this, frameworkConfig);
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 4d5c2e06eb..ab662cb9a0 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
         private Bindable<ScalingMode> scalingMode;
         private Bindable<Size> sizeFullscreen;
+        private Bindable<WindowMode> windowMode;
 
         private readonly BindableList<Size> resolutions = new BindableList<Size>(new[] { new Size(9999, 9999) });
 
@@ -56,6 +57,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             scalingSizeY = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
             scalingPositionX = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
             scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
+            windowMode = osuConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
 
             if (host.Window != null)
             {
@@ -141,7 +143,10 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
 
-            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
+            windowModeDropdown.Current.ValueChanged += mode => {
+                windowMode.Value = mode.NewValue;
+                updateResolutionDropdown();
+            };
 
             windowModes.BindCollectionChanged((sender, args) =>
             {

From c4d08463addcf532926308dc319eebb981d530a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Mar 2021 16:04:51 +0900
Subject: [PATCH 08601/10326] Fix spinners playing looping sound too long in
 the editor

The `OnComplete` event was never being run due to the transform playing
out longer than the spinner's lifetime. I've matched the durations, but
also moved the `Stop()` call to what I deem a safer place to run it (I
did notice that without this it would still potentially never fire).

Note that this is more noticeable in the editor because of lifetime
extension. In gameplay, the returning of a spinner to the pool will
clean things up (but in the editor that can take longer, depending on
timeline zoom level).

Another thing worth mentioning is that the fade doesn't actually work.
This is due to https://github.com/ppy/osu-framework/pull/4212.

Closes #12119.
---
 .../Objects/Drawables/DrawableSpinner.cs         | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 3d614c2dbd..d92f63eb89 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Bindable<bool> isSpinning;
         private bool spinnerFrequencyModulate;
 
+        private const double fade_out_duration = 160;
+
         public DrawableSpinner()
             : this(null)
         {
@@ -136,7 +138,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
             else
             {
-                spinningSample?.VolumeTo(0, 300).OnComplete(_ => spinningSample.Stop());
+                if (spinningSample != null)
+                    spinningSample.Volume.Value = 0;
+
+                spinningSample?.VolumeTo(0, fade_out_duration);
             }
         }
 
@@ -173,7 +178,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateHitStateTransforms(state);
 
-            this.FadeOut(160).Expire();
+            this.FadeOut(fade_out_duration).OnComplete(_ =>
+            {
+                // looping sample should be stopped here as it is safer than running in the OnComplete
+                // of the volume transition above.
+                spinningSample.Stop();
+            });
+
+            Expire();
 
             // skin change does a rewind of transforms, which will stop the spinning sound from playing if it's currently in playback.
             isSpinning?.TriggerChange();

From 690fb9224aaee2d2d4930de181992eb53970b32d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Mar 2021 16:18:31 +0900
Subject: [PATCH 08602/10326] Combine constants for readability

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs | 4 +++-
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs      | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
index 73aece1ed4..9ec122a12c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyHitExplosion : LegacyManiaColumnElement, IHitExplosion
     {
+        public const double FADE_IN_DURATION = 80;
+
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private Drawable explosion;
@@ -72,7 +74,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
             (explosion as IFramedAnimation)?.GotoFrame(0);
 
-            explosion?.FadeInFromZero(80)
+            explosion?.FadeInFromZero(fade_in_duration)
                      .Then().FadeOut(120);
         }
     }
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
index 174324f5f6..10319a7d4d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
@@ -101,8 +101,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         {
             if (action == column.Action.Value)
             {
-                upSprite.Delay(80).FadeTo(1);
-                downSprite.Delay(80).FadeTo(0);
+                upSprite.Delay(LegacyHitExplosion.FADE_IN_DURATION).FadeTo(1);
+                downSprite.Delay(LegacyHitExplosion.FADE_IN_DURATION).FadeTo(0);
             }
         }
     }

From 5b1d9f4cf07abd14860bc9ecf887fa98e55b4dc6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Mar 2021 16:19:29 +0900
Subject: [PATCH 08603/10326] Fix constant case

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
index 9ec122a12c..e4d466dca5 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
             (explosion as IFramedAnimation)?.GotoFrame(0);
 
-            explosion?.FadeInFromZero(fade_in_duration)
+            explosion?.FadeInFromZero(FADE_IN_DURATION)
                      .Then().FadeOut(120);
         }
     }

From e60ff45b73a2e236eed250f869a3b4afbafd3292 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Mar 2021 16:57:40 +0900
Subject: [PATCH 08604/10326] Add another test for colinear perfect curves

---
 .../colinear-perfect-curve-expected-conversion.json | 13 +++++++++++++
 .../Testing/Beatmaps/colinear-perfect-curve.osu     |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json
index 96e4bf1637..1a0bd66246 100644
--- a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json
@@ -1,5 +1,18 @@
 {
     "Mappings": [{
+        "StartTime": 114993,
+        "Objects": [{
+            "StartTime": 114993,
+            "EndTime": 114993,
+            "X": 493,
+            "Y": 92
+        }, {
+            "StartTime": 115290,
+            "EndTime": 115290,
+            "X": 451.659241,
+            "Y": 267.188
+        }]
+    }, {
         "StartTime": 118858.0,
         "Objects": [{
             "StartTime": 118858.0,
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve.osu b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve.osu
index 8c3edc9571..dd35098502 100644
--- a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve.osu
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve.osu
@@ -9,7 +9,9 @@ SliderMultiplier:1.87
 SliderTickRate:1
 
 [TimingPoints]
-49051,230.769230769231,4,2,1,15,1,0
+114000,346.820809248555,4,2,1,71,1,0
+118000,230.769230769231,4,2,1,15,1,0
 
 [HitObjects]
+493,92,114993,2,0,P|472:181|442:308,1,180,12|0,0:0|0:0,0:0:0:0:
 219,215,118858,2,0,P|224:170|244:-10,1,187,8|2,0:0|0:0,0:0:0:0:

From bee2f55d007bad3e83fd2d010f709ff720242784 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:54:33 +0100
Subject: [PATCH 08605/10326] Undo subpath limiting

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 94815fe0ea..3083fcfccb 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -219,10 +219,8 @@ namespace osu.Game.Rulesets.Objects
 
                     List<Vector2> subpath = PathApproximator.ApproximateCircularArc(subControlPoints);
 
-                    // If for some reason a circular arc could not be fit to the 3 given points, or the
-                    // resulting radius is too large (e.g. points arranged almost linearly), fall back
-                    // to a numerically stable bezier approximation.
-                    if (subpath.Count == 0 || subpath.Count > 400)
+                    // If for some reason a circular arc could not be fit to the 3 given points, fall back to a numerically stable bezier approximation.
+                    if (subpath.Count == 0)
                         break;
 
                     return subpath;

From 7a2cb526e4bd9e04f5e0720336cf278551d4efac Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:55:30 +0100
Subject: [PATCH 08606/10326] Add PointsInSegment method

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 32 +++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 3083fcfccb..e76699ac04 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -156,6 +156,38 @@ namespace osu.Game.Rulesets.Objects
             return interpolateVertices(indexOfDistance(d), d);
         }
 
+        /// <summary>
+        /// Returns the control points belonging to the same segment as the one given.
+        /// The first point has a PathType which all other points inherit.
+        /// </summary>
+        /// <param name="controlPoint">One of the control points in the segment.</param>
+        /// <returns></returns>
+        public List<PathControlPoint> PointsInSegment(PathControlPoint controlPoint)
+        {
+            bool found = false;
+            List<PathControlPoint> pointsInCurrentSegment = new List<PathControlPoint>();
+            foreach (PathControlPoint point in ControlPoints)
+            {
+                if (point.Type.Value is PathType)
+                {
+                    if (!found)
+                        pointsInCurrentSegment.Clear();
+                    else
+                    {
+                        pointsInCurrentSegment.Add(point);
+                        break;
+                    }
+                }
+
+                pointsInCurrentSegment.Add(point);
+
+                if (point == controlPoint)
+                    found = true;
+            }
+
+            return pointsInCurrentSegment;
+        }
+
         private void invalidate()
         {
             pathCache.Invalidate();

From c82218627f914ca51875422de48811dacb136c14 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:57:57 +0100
Subject: [PATCH 08607/10326] Add path type update logic

Only attempts to change points to bezier if points in the slider are modified.
---
 osu.Game/Rulesets/Objects/SliderPath.cs | 53 +++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index e76699ac04..42f1a33dfc 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -54,13 +54,19 @@ namespace osu.Game.Rulesets.Objects
                 {
                     case NotifyCollectionChangedAction.Add:
                         foreach (var c in args.NewItems.Cast<PathControlPoint>())
+                        {
                             c.Changed += invalidate;
+                            c.Changed += updatePathTypes;
+                        }
                         break;
 
                     case NotifyCollectionChangedAction.Reset:
                     case NotifyCollectionChangedAction.Remove:
                         foreach (var c in args.OldItems.Cast<PathControlPoint>())
+                        {
                             c.Changed -= invalidate;
+                            c.Changed -= updatePathTypes;
+                        }
                         break;
                 }
 
@@ -188,6 +194,53 @@ namespace osu.Game.Rulesets.Objects
             return pointsInCurrentSegment;
         }
 
+        private void updatePathTypes()
+        {
+            // Updates each segment of the slider once
+            foreach (PathControlPoint controlPoint in ControlPoints.Where(p => p.Type.Value is PathType))
+                updatePathType(controlPoint);
+        }
+
+        private void updatePathType(PathControlPoint controlPoint)
+        {
+            List<PathControlPoint> pointsInSegment = PointsInSegment(controlPoint);
+            PathType? pathType = pointsInSegment[0].Type.Value;
+
+            // An almost linear arrangement of points results in radius approaching infinity,
+            // we should prevent that to avoid memory exhaustion when drawing / approximating
+            if (pathType == PathType.PerfectCurve)
+            {
+                Vector2[] points = pointsInSegment.Select(point => point.Position.Value).ToArray();
+                if (points.Length < 3)
+                    return;
+
+                Vector2 a = points[0];
+                Vector2 b = points[1];
+                Vector2 c = points[2];
+
+                float maxLength = points.Max(p => p.Length);
+
+                Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
+                Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
+                Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
+
+                float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
+
+                float acSq = (a - c).LengthSquared;
+                float abSq = (a - b).LengthSquared;
+                float bcSq = (b - c).LengthSquared;
+
+                // Exterior = curve wraps around the long way between end-points
+                // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
+                // where the latter is much faster, hence differing thresholds
+                bool exterior = abSq > acSq || bcSq > acSq;
+                float threshold = exterior ? 0.05f : 0.001f;
+
+                if (Math.Abs(det) < threshold)
+                    pointsInSegment[0].Type.Value = PathType.Bezier;
+            }
+        }
+
         private void invalidate()
         {
             pathCache.Invalidate();

From 067178e53779be114ffd067a28144bb6dee94dd4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:59:06 +0100
Subject: [PATCH 08608/10326] Maintain path type when dragging/placing

---
 .../Sliders/Components/PathControlPointPiece.cs        | 10 ++++++++++
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs     |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 1390675a1a..42a7d246ea 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -2,6 +2,7 @@
 // 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.Extensions.Color4Extensions;
@@ -31,6 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         public readonly BindableBool IsSelected = new BindableBool();
         public readonly PathControlPoint ControlPoint;
+        public readonly List<PathControlPoint> PointsInSegment;
 
         private readonly Slider slider;
         private readonly Container marker;
@@ -53,6 +55,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
+            PointsInSegment = slider.Path.PointsInSegment(controlPoint);
 
             controlPoint.Type.BindValueChanged(_ => updateMarkerDisplay());
 
@@ -150,6 +153,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         protected override bool OnClick(ClickEvent e) => RequestSelection != null;
 
         private Vector2 dragStartPosition;
+        private PathType? dragPathType;
 
         protected override bool OnDragStart(DragStartEvent e)
         {
@@ -159,6 +163,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             if (e.Button == MouseButton.Left)
             {
                 dragStartPosition = ControlPoint.Position.Value;
+                dragPathType = PointsInSegment[0].Type.Value;
+
                 changeHandler?.BeginChange();
                 return true;
             }
@@ -184,6 +190,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
             else
                 ControlPoint.Position.Value = dragStartPosition + (e.MousePosition - e.MouseDownPosition);
+
+            // Maintain the path type in case it got defaulted to bezier at some point during the drag.
+            if (PointsInSegment[0].Type.Value != dragPathType)
+                PointsInSegment[0].Type.Value = dragPathType;
         }
 
         protected override void OnDragEnd(DragEndEvent e) => changeHandler?.EndChange();
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index b71e1914f7..16e2a52279 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -142,6 +142,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             base.Update();
             updateSlider();
+
+            // Maintain the path type in case it got defaulted to bezier at some point during the drag.
+            updatePathType();
         }
 
         private void updatePathType()

From 3bddc4a75d2f312541aad38e6408d956c32f9d81 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:59:45 +0100
Subject: [PATCH 08609/10326] Add path type test

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index f9b6fb924e..4f716a31b7 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -290,6 +290,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
+            assertControlPointType(0, PathType.Bezier);
             // Will be > 10000 if not falling back to Bezier path calc.
             assertLength(218.8901f);
         }

From 15af57de95ec260afef3a59bedc736202c06f297 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:59:59 +0100
Subject: [PATCH 08610/10326] Add path type recovery test

---
 .../TestSceneSliderPlacementBlueprint.cs      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 4f716a31b7..db7b3aa973 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -295,6 +295,25 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertLength(218.8901f);
         }
 
+        [Test]
+        public void TestPlacePerfectCurveSegmentAlmostLinearlyRecovery()
+        {
+            addMovementStep(new Vector2(0));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(61.382935f, 6.423767f));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(217.69522f, 22.84021f));  // Should convert to bezier
+            addMovementStep(new Vector2(210.0f, 30.0f));          // Should convert back to perfect
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointType(0, PathType.PerfectCurve);
+            assertLength(212.2276f);
+        }
+
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
 
         private void addClickStep(MouseButton button)

From 323b875cea686e080c3b58fc04de91e73d24b437 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 17:32:40 +0100
Subject: [PATCH 08611/10326] Fix newlines/spaces

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs               | 4 ++--
 osu.Game/Rulesets/Objects/SliderPath.cs                       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index db7b3aa973..e7ea12e538 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -304,8 +304,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(new Vector2(61.382935f, 6.423767f));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(217.69522f, 22.84021f));  // Should convert to bezier
-            addMovementStep(new Vector2(210.0f, 30.0f));          // Should convert back to perfect
+            addMovementStep(new Vector2(217.69522f, 22.84021f)); // Should convert to bezier
+            addMovementStep(new Vector2(210.0f, 30.0f)); // Should convert back to perfect
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 42f1a33dfc..639cd4c72e 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -58,6 +58,7 @@ namespace osu.Game.Rulesets.Objects
                             c.Changed += invalidate;
                             c.Changed += updatePathTypes;
                         }
+
                         break;
 
                     case NotifyCollectionChangedAction.Reset:
@@ -67,6 +68,7 @@ namespace osu.Game.Rulesets.Objects
                             c.Changed -= invalidate;
                             c.Changed -= updatePathTypes;
                         }
+
                         break;
                 }
 

From a7076c329c66752955ee7501b09a1a17b7554b30 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 17:32:55 +0100
Subject: [PATCH 08612/10326] Fix null checks

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 639cd4c72e..47cc2c6044 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Rulesets.Objects
             List<PathControlPoint> pointsInCurrentSegment = new List<PathControlPoint>();
             foreach (PathControlPoint point in ControlPoints)
             {
-                if (point.Type.Value is PathType)
+                if (point.Type.Value != null)
                 {
                     if (!found)
                         pointsInCurrentSegment.Clear();
@@ -199,7 +199,7 @@ namespace osu.Game.Rulesets.Objects
         private void updatePathTypes()
         {
             // Updates each segment of the slider once
-            foreach (PathControlPoint controlPoint in ControlPoints.Where(p => p.Type.Value is PathType))
+            foreach (PathControlPoint controlPoint in ControlPoints.Where(p => p.Type.Value != null))
                 updatePathType(controlPoint);
         }
 

From 6911a1b41546c04252b4d9e92bcbbf511befbf2a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:03:55 +0100
Subject: [PATCH 08613/10326] Fix missing newline

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 47cc2c6044..d8fbb46b76 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -174,6 +174,7 @@ namespace osu.Game.Rulesets.Objects
         {
             bool found = false;
             List<PathControlPoint> pointsInCurrentSegment = new List<PathControlPoint>();
+
             foreach (PathControlPoint point in ControlPoints)
             {
                 if (point.Type.Value != null)
@@ -241,6 +242,12 @@ namespace osu.Game.Rulesets.Objects
                 if (Math.Abs(det) < threshold)
                     pointsInSegment[0].Type.Value = PathType.Bezier;
             }
+            // where the latter is much faster, hence differing thresholds
+            bool exterior = abSq > acSq || bcSq > acSq;
+            float threshold = exterior ? 0.05f : 0.001f;
+
+            if (Math.Abs(det) < threshold)
+                pointsInSegment[0].Type.Value = PathType.Bezier;
         }
 
         private void invalidate()

From 80e7c3aba7e804ae1f1696219ee8c9a48871abb0 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:09:28 +0100
Subject: [PATCH 08614/10326] Invert if statement

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 42 +++++++++++--------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index d8fbb46b76..767f7909d5 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -211,37 +211,31 @@ namespace osu.Game.Rulesets.Objects
 
             // An almost linear arrangement of points results in radius approaching infinity,
             // we should prevent that to avoid memory exhaustion when drawing / approximating
-            if (pathType == PathType.PerfectCurve)
-            {
-                Vector2[] points = pointsInSegment.Select(point => point.Position.Value).ToArray();
-                if (points.Length < 3)
-                    return;
+            if (pathType != PathType.PerfectCurve)
+                return;
 
-                Vector2 a = points[0];
-                Vector2 b = points[1];
-                Vector2 c = points[2];
+            Vector2[] points = pointsInSegment.Select(point => point.Position.Value).ToArray();
+            if (points.Length < 3)
+                return;
 
-                float maxLength = points.Max(p => p.Length);
+            Vector2 a = points[0];
+            Vector2 b = points[1];
+            Vector2 c = points[2];
 
-                Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
-                Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
-                Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
+            float maxLength = points.Max(p => p.Length);
 
-                float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
+            Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
+            Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
+            Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
 
-                float acSq = (a - c).LengthSquared;
-                float abSq = (a - b).LengthSquared;
-                float bcSq = (b - c).LengthSquared;
+            float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
 
-                // Exterior = curve wraps around the long way between end-points
-                // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
-                // where the latter is much faster, hence differing thresholds
-                bool exterior = abSq > acSq || bcSq > acSq;
-                float threshold = exterior ? 0.05f : 0.001f;
+            float acSq = (a - c).LengthSquared;
+            float abSq = (a - b).LengthSquared;
+            float bcSq = (b - c).LengthSquared;
 
-                if (Math.Abs(det) < threshold)
-                    pointsInSegment[0].Type.Value = PathType.Bezier;
-            }
+            // Exterior = curve wraps around the long way between end-points
+            // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
             // where the latter is much faster, hence differing thresholds
             bool exterior = abSq > acSq || bcSq > acSq;
             float threshold = exterior ? 0.05f : 0.001f;

From 92f713a30e57d86b9c6408004be911f8c40755ca Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:10:56 +0100
Subject: [PATCH 08615/10326] Improve fallback conditions

It's possible to create a `PerfectCurve` type path with more than 3 points currently, so this accounts for that.
---
 osu.Game/Rulesets/Objects/SliderPath.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 767f7909d5..23511be5e4 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -211,12 +211,10 @@ namespace osu.Game.Rulesets.Objects
 
             // An almost linear arrangement of points results in radius approaching infinity,
             // we should prevent that to avoid memory exhaustion when drawing / approximating
-            if (pathType != PathType.PerfectCurve)
+            if (pathType != PathType.PerfectCurve || pointsInSegment.Count != 3)
                 return;
 
             Vector2[] points = pointsInSegment.Select(point => point.Position.Value).ToArray();
-            if (points.Length < 3)
-                return;
 
             Vector2 a = points[0];
             Vector2 b = points[1];

From b11fd7972aafea70905a1f0f73addffe82442d91 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:41:48 +0100
Subject: [PATCH 08616/10326] Separate condition logic from math logic

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 27 ++++++++++---------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 23511be5e4..ae08660404 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -199,23 +199,19 @@ namespace osu.Game.Rulesets.Objects
 
         private void updatePathTypes()
         {
-            // Updates each segment of the slider once
-            foreach (PathControlPoint controlPoint in ControlPoints.Where(p => p.Type.Value != null))
-                updatePathType(controlPoint);
+            foreach (PathControlPoint segmentStartPoint in ControlPoints.Where(p => p.Type.Value != null))
+            {
+                if (segmentStartPoint.Type.Value != PathType.PerfectCurve)
+                    continue;
+
+                Vector2[] points = PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
+                if (points.Length == 3 && !validCircularArcSegment(points))
+                    segmentStartPoint.Type.Value = PathType.Bezier;
+            }
         }
 
-        private void updatePathType(PathControlPoint controlPoint)
+        private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
         {
-            List<PathControlPoint> pointsInSegment = PointsInSegment(controlPoint);
-            PathType? pathType = pointsInSegment[0].Type.Value;
-
-            // An almost linear arrangement of points results in radius approaching infinity,
-            // we should prevent that to avoid memory exhaustion when drawing / approximating
-            if (pathType != PathType.PerfectCurve || pointsInSegment.Count != 3)
-                return;
-
-            Vector2[] points = pointsInSegment.Select(point => point.Position.Value).ToArray();
-
             Vector2 a = points[0];
             Vector2 b = points[1];
             Vector2 c = points[2];
@@ -238,8 +234,7 @@ namespace osu.Game.Rulesets.Objects
             bool exterior = abSq > acSq || bcSq > acSq;
             float threshold = exterior ? 0.05f : 0.001f;
 
-            if (Math.Abs(det) < threshold)
-                pointsInSegment[0].Type.Value = PathType.Bezier;
+            return Math.Abs(det) < threshold;
         }
 
         private void invalidate()

From 3fa5852e00cbb6d43e0383e5044dcd487ab43b2a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:42:27 +0100
Subject: [PATCH 08617/10326] Add method documentation

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index ae08660404..b048bf2a84 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -197,6 +197,9 @@ namespace osu.Game.Rulesets.Objects
             return pointsInCurrentSegment;
         }
 
+        /// <summary>
+        /// Handles correction of invalid path types.
+        /// </summary>
         private void updatePathTypes()
         {
             foreach (PathControlPoint segmentStartPoint in ControlPoints.Where(p => p.Type.Value != null))
@@ -210,6 +213,13 @@ namespace osu.Game.Rulesets.Objects
             }
         }
 
+        /// <summary>
+        /// Returns whether the given points are arranged in a valid way. Invalid if points
+        /// are almost entirely linear - as this causes the radius to approach infinity,
+        /// which would exhaust memory when drawing / approximating.
+        /// </summary>
+        /// <param name="points">The three points that make up this circular arc segment.</param>
+        /// <returns></returns>
         private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
         {
             Vector2 a = points[0];

From e922e67c9847b8dfea62bed7c85d673acd6278bd Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:48:21 +0100
Subject: [PATCH 08618/10326] Fix inverted return statement

Forgot to run tests, all passing now.
---
 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 b048bf2a84..c7931b440b 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -244,7 +244,7 @@ namespace osu.Game.Rulesets.Objects
             bool exterior = abSq > acSq || bcSq > acSq;
             float threshold = exterior ? 0.05f : 0.001f;
 
-            return Math.Abs(det) < threshold;
+            return Math.Abs(det) >= threshold;
         }
 
         private void invalidate()

From a65e491768441017e9cfe7e2e4fec2d15e57d708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 Mar 2021 20:00:36 +0100
Subject: [PATCH 08619/10326] Remove osuTK desktop rider run config

No longer operational since 6eadae8.
---
 .../runConfigurations/osu___legacy_osuTK_.xml | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 .idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml

diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
deleted file mode 100644
index 9ece926b34..0000000000
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu! (legacy osuTK)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0/osu!.dll" />
-    <option name="PROGRAM_PARAMETERS" value="--tk" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Desktop/osu.Desktop.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
-    <method v="2">
-      <option name="Build" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file

From d85929d721254391d5e7e23d2e81d56180ee07f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 Mar 2021 22:45:18 +0100
Subject: [PATCH 08620/10326] Adjust autoplay generation tests to match
 expected behaviour

---
 .../TestSceneAutoGeneration.cs                         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
index a5248c7712..399a46aa77 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
-            Assert.AreEqual(3000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
+            Assert.AreEqual(3000, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Special1), "Special1 has not been pressed");
             Assert.IsFalse(checkContains(generated.Frames[frame_offset + 1], ManiaAction.Special1), "Special1 has not been released");
         }
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
 
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
-            Assert.AreEqual(3000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
+            Assert.AreEqual(3000, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
 
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Key1, ManiaAction.Key2), "Key1 & Key2 have not been pressed");
             Assert.IsFalse(checkContains(generated.Frames[frame_offset + 1], ManiaAction.Key1, ManiaAction.Key2), "Key1 & Key2 have not been released");
@@ -148,9 +148,9 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             Assert.IsTrue(generated.Frames.Count == frame_offset + 4, "Replay must have 4 generated frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect first note hit time");
-            Assert.AreEqual(3000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 2].Time, "Incorrect first note release time");
+            Assert.AreEqual(3000, generated.Frames[frame_offset + 2].Time, "Incorrect first note release time");
             Assert.AreEqual(2000, generated.Frames[frame_offset + 1].Time, "Incorrect second note hit time");
-            Assert.AreEqual(4000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 3].Time, "Incorrect second note release time");
+            Assert.AreEqual(4000, generated.Frames[frame_offset + 3].Time, "Incorrect second note release time");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Key1), "Key1 has not been pressed");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset + 1], ManiaAction.Key1, ManiaAction.Key2), "Key1 & Key2 have not been pressed");
             Assert.IsFalse(checkContains(generated.Frames[frame_offset + 2], ManiaAction.Key1), "Key1 has not been released");
@@ -168,7 +168,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 - ManiaAutoGenerator.RELEASE_DELAY });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
             beatmap.HitObjects.Add(new Note { StartTime = 3000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();

From 29d4162e4e2110973571a8fcfe83509e3586d50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 Mar 2021 22:38:51 +0100
Subject: [PATCH 08621/10326] Remove release delay for hold notes when
 generating autoplay

It was more intended for normal notes anyway (as they would be released
pretty much instantaneously, if it weren't for the delay).
---
 .../Replays/ManiaAutoGenerator.cs             | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index 3ebbe5af8e..7c51d58b74 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Replays;
 
@@ -85,20 +86,28 @@ namespace osu.Game.Rulesets.Mania.Replays
             {
                 var currentObject = Beatmap.HitObjects[i];
                 var nextObjectInColumn = GetNextObject(i); // Get the next object that requires pressing the same button
-
-                double endTime = currentObject.GetEndTime();
-
-                bool canDelayKeyUp = nextObjectInColumn == null ||
-                                     nextObjectInColumn.StartTime > endTime + RELEASE_DELAY;
-
-                double calculatedDelay = canDelayKeyUp ? RELEASE_DELAY : (nextObjectInColumn.StartTime - endTime) * 0.9;
+                var releaseTime = calculateReleaseTime(currentObject, nextObjectInColumn);
 
                 yield return new HitPoint { Time = currentObject.StartTime, Column = currentObject.Column };
 
-                yield return new ReleasePoint { Time = endTime + calculatedDelay, Column = currentObject.Column };
+                yield return new ReleasePoint { Time = releaseTime, Column = currentObject.Column };
             }
         }
 
+        private double calculateReleaseTime(HitObject currentObject, HitObject nextObject)
+        {
+            double endTime = currentObject.GetEndTime();
+
+            if (currentObject is HoldNote)
+                // hold note releases must be timed exactly.
+                return endTime;
+
+            bool canDelayKeyUpFully = nextObject == null ||
+                                      nextObject.StartTime > endTime + RELEASE_DELAY;
+
+            return endTime + (canDelayKeyUpFully ? RELEASE_DELAY : (nextObject.StartTime - endTime) * 0.9);
+        }
+
         protected override HitObject GetNextObject(int currentIndex)
         {
             int desiredColumn = Beatmap.HitObjects[currentIndex].Column;

From 8ea7271d5c96b062bebcb8b702da739d9ef4dac1 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Mon, 22 Mar 2021 19:48:52 -0500
Subject: [PATCH 08622/10326] moved windowmode code to LoadComplete (?)

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 84737a56e4..ff215b63e5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -234,9 +234,6 @@ namespace osu.Game
 
             SelectedMods.BindValueChanged(modsChanged);
             Beatmap.BindValueChanged(beatmapChanged, true);
-
-            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
-            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
         }
 
         private ExternalLinkOpener externalLinkOpener;
@@ -576,6 +573,9 @@ namespace osu.Game
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
 
+            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
+
             AddRange(new Drawable[]
             {
                 new VolumeControlReceptor

From bdcb9451f79798197825106a0762a0c823b771c7 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Mon, 22 Mar 2021 20:17:05 -0500
Subject: [PATCH 08623/10326] added code to OsuGameBase to default to
 fullscreen, but that might not be a good place to put it.

---
 osu.Game/OsuGameBase.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e1c7b67a8c..bcd384604f 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -21,6 +21,7 @@ using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Online.API;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
@@ -119,6 +120,7 @@ namespace osu.Game
         protected Bindable<WorkingBeatmap> Beatmap { get; private set; } // cached via load() method
 
         private Bindable<bool> fpsDisplayVisible;
+        private Bindable<WindowMode> windowMode;
 
         public virtual Version AssemblyVersion => Assembly.GetEntryAssembly()?.GetName().Version ?? new Version();
 
@@ -361,6 +363,9 @@ namespace osu.Game
             fpsDisplayVisible.ValueChanged += visible => { FrameStatistics.Value = visible.NewValue ? FrameStatisticsMode.Minimal : FrameStatisticsMode.None; };
             fpsDisplayVisible.TriggerChange();
 
+            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            windowMode.Value = WindowMode.Fullscreen;
+
             FrameStatistics.ValueChanged += e => fpsDisplayVisible.Value = e.NewValue != FrameStatisticsMode.None;
         }
 

From 098005393e999f5623769adc9e5458bb86e37513 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 10:38:37 +0900
Subject: [PATCH 08624/10326] Remove unnecessary null checks and debug code

---
 .../Objects/Drawables/DrawableSpinner.cs               | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index d92f63eb89..32a0a14dc0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -133,15 +133,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (tracking.NewValue)
             {
                 if (!spinningSample.IsPlaying)
-                    spinningSample?.Play();
-                spinningSample?.VolumeTo(1, 300);
+                    spinningSample.Play();
+
+                spinningSample.VolumeTo(1, 300);
             }
             else
             {
-                if (spinningSample != null)
-                    spinningSample.Volume.Value = 0;
-
-                spinningSample?.VolumeTo(0, fade_out_duration);
+                spinningSample.VolumeTo(0, fade_out_duration);
             }
         }
 

From 16b3f22caf2754d97aacbf40f0d429e8b3cecdce Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 22 Mar 2021 19:32:17 -0700
Subject: [PATCH 08625/10326] Fix incorrect trash icon being used on deleted
 comments counter

---
 osu.Game/Overlays/Comments/DeletedCommentsCounter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs b/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
index 56588ef0a8..8c40d79f7a 100644
--- a/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
+++ b/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Comments
                 {
                     new SpriteIcon
                     {
-                        Icon = FontAwesome.Solid.Trash,
+                        Icon = FontAwesome.Regular.TrashAlt,
                         Size = new Vector2(14),
                     },
                     countText = new OsuSpriteText

From 9f788f58548d629144c4b8946b74542b424ea7a4 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Mon, 22 Mar 2021 22:52:16 -0500
Subject: [PATCH 08626/10326] removed code from OsuGameBase for
 fullscreen.....OsuSetting still exists but cannot figure out a way to set it
 to a default and have it actually work

---
 osu.Game/OsuGame.cs                                         | 6 +++---
 osu.Game/OsuGameBase.cs                                     | 4 ----
 .../Overlays/Settings/Sections/Graphics/LayoutSettings.cs   | 6 ++++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ff215b63e5..2f2428e781 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -126,7 +126,7 @@ namespace osu.Game
 
         private Bindable<int> configSkin;
 
-        private Bindable<WindowMode> windowMode;
+        // private Bindable<WindowMode> windowMode;
 
         private readonly string[] args;
 
@@ -573,8 +573,8 @@ namespace osu.Game
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
 
-            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
-            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
+            // windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            // frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
 
             AddRange(new Drawable[]
             {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index bcd384604f..8b1fe20708 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -120,7 +120,6 @@ namespace osu.Game
         protected Bindable<WorkingBeatmap> Beatmap { get; private set; } // cached via load() method
 
         private Bindable<bool> fpsDisplayVisible;
-        private Bindable<WindowMode> windowMode;
 
         public virtual Version AssemblyVersion => Assembly.GetEntryAssembly()?.GetName().Version ?? new Version();
 
@@ -363,9 +362,6 @@ namespace osu.Game
             fpsDisplayVisible.ValueChanged += visible => { FrameStatistics.Value = visible.NewValue ? FrameStatisticsMode.Minimal : FrameStatisticsMode.None; };
             fpsDisplayVisible.TriggerChange();
 
-            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
-            windowMode.Value = WindowMode.Fullscreen;
-
             FrameStatistics.ValueChanged += e => fpsDisplayVisible.Value = e.NewValue != FrameStatisticsMode.None;
         }
 
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index ab662cb9a0..a0cb8fc2de 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
@@ -57,7 +58,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             scalingSizeY = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
             scalingPositionX = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
             scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
-            windowMode = osuConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            Logger.Log($"windowMode {windowMode.Value}");
 
             if (host.Window != null)
             {
@@ -71,7 +73,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 {
                     LabelText = "Screen mode",
                     ItemSource = windowModes,
-                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
+                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode)
                 },
                 resolutionDropdown = new ResolutionSettingsDropdown
                 {

From d9e2c44a34c17d9ed0f93587460fd506480ad478 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Mon, 22 Mar 2021 23:36:55 -0500
Subject: [PATCH 08627/10326] implemented GetFrameworkConfigDefaults for
 overriding framework default, removed previous code that added a new
 OsuSetting and modified settings layout.

---
 osu.Game/Configuration/OsuConfigManager.cs            |  3 ---
 osu.Game/OsuGame.cs                                   | 11 ++++++-----
 osu.Game/OsuGameBase.cs                               |  1 -
 .../Settings/Sections/Graphics/LayoutSettings.cs      | 11 ++---------
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index cd74fe25f4..d0fa45bb7a 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -91,8 +91,6 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.MenuParallax, true);
 
-            Set(OsuSetting.WindowSetting, WindowMode.Fullscreen);
-
             // Gameplay
             Set(OsuSetting.DimLevel, 0.8, 0, 1, 0.01);
             Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
@@ -235,7 +233,6 @@ namespace osu.Game.Configuration
         MenuVoice,
         CursorRotation,
         MenuParallax,
-        WindowSetting,
         BeatmapDetailTab,
         BeatmapDetailModsFilter,
         Username,
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 2f2428e781..ffb694c27e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -126,8 +126,6 @@ namespace osu.Game
 
         private Bindable<int> configSkin;
 
-        // private Bindable<WindowMode> windowMode;
-
         private readonly string[] args;
 
         private readonly List<OverlayContainer> overlays = new List<OverlayContainer>();
@@ -573,9 +571,6 @@ namespace osu.Game
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
 
-            // windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
-            // frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
-
             AddRange(new Drawable[]
             {
                 new VolumeControlReceptor
@@ -1012,5 +1007,11 @@ namespace osu.Game
             if (newScreen == null)
                 Exit();
         }
+
+        protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults() {
+            IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
+            defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);
+            return defaultOverrides;
+        }
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 8b1fe20708..e1c7b67a8c 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -21,7 +21,6 @@ using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Online.API;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index a0cb8fc2de..4d5c2e06eb 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -12,7 +12,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
-using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
@@ -32,7 +31,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
         private Bindable<ScalingMode> scalingMode;
         private Bindable<Size> sizeFullscreen;
-        private Bindable<WindowMode> windowMode;
 
         private readonly BindableList<Size> resolutions = new BindableList<Size>(new[] { new Size(9999, 9999) });
 
@@ -58,8 +56,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             scalingSizeY = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
             scalingPositionX = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
             scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
-            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            Logger.Log($"windowMode {windowMode.Value}");
 
             if (host.Window != null)
             {
@@ -73,7 +69,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 {
                     LabelText = "Screen mode",
                     ItemSource = windowModes,
-                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode)
+                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
                 },
                 resolutionDropdown = new ResolutionSettingsDropdown
                 {
@@ -145,10 +141,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
 
-            windowModeDropdown.Current.ValueChanged += mode => {
-                windowMode.Value = mode.NewValue;
-                updateResolutionDropdown();
-            };
+            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
 
             windowModes.BindCollectionChanged((sender, args) =>
             {

From 58c60100b431e6ce6ee720ff72206e9f9071d070 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 14:04:47 +0900
Subject: [PATCH 08628/10326] Fix APIScoreToken's data type not matching server
 side

---
 osu.Game/Online/Rooms/APIScoreToken.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/APIScoreToken.cs b/osu.Game/Online/Rooms/APIScoreToken.cs
index f652c1720d..6b559876de 100644
--- a/osu.Game/Online/Rooms/APIScoreToken.cs
+++ b/osu.Game/Online/Rooms/APIScoreToken.cs
@@ -8,6 +8,6 @@ namespace osu.Game.Online.Rooms
     public class APIScoreToken
     {
         [JsonProperty("id")]
-        public int ID { get; set; }
+        public long ID { get; set; }
     }
 }

From 9c690f9545959c117b4358e391333b3882abb34c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 14:08:00 +0900
Subject: [PATCH 08629/10326] Fix second usage

---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index a75e4bdc07..2b6dbd9dcb 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         protected readonly PlaylistItem PlaylistItem;
 
-        protected int? Token { get; private set; }
+        protected long? Token { get; private set; }
 
         [Resolved]
         private IAPIProvider api { get; set; }

From 254b0f5dc3b2469fdccf6baf0231af30baf11c9b Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Tue, 23 Mar 2021 00:24:33 -0500
Subject: [PATCH 08630/10326] removed line (?) - tried doing testing to see if
 it launched in fullscreen (i.e., overriding the method ppy mentioned), but to
 no avail :(

---
 osu.Game/OsuGame.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ffb694c27e..a52899433a 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1007,7 +1007,6 @@ namespace osu.Game
             if (newScreen == null)
                 Exit();
         }
-
         protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults() {
             IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
             defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);

From 1171214541361b72ae23405a3549fd918af16fed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 14:51:22 +0900
Subject: [PATCH 08631/10326] 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 e0392bd687..75ac298626 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.317.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.323.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9731c1d5ea..b90c938a8b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.317.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.323.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 11677d345e..ce182a3054 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.Framework.iOS" Version="2021.317.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.323.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.317.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.323.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 08fcdc8ee46748eee4c8d66d5842b57f16d9d896 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 15:38:00 +0900
Subject: [PATCH 08632/10326] Update difficulty calculator tests with floating
 point differences

---
 .../OsuDifficultyCalculatorTest.cs                        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index a365ea10d4..c2119585ab 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -15,13 +15,13 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
 
-        [TestCase(6.9311451172608853d, "diffcalc-test")]
-        [TestCase(1.0736587013228804d, "zero-length-sliders")]
+        [TestCase(6.9311451172574934d, "diffcalc-test")]
+        [TestCase(1.0736586907780401d, "zero-length-sliders")]
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(8.6228371119393064d, "diffcalc-test")]
-        [TestCase(1.2864585434597433d, "zero-length-sliders")]
+        [TestCase(8.6228371119271454d, "diffcalc-test")]
+        [TestCase(1.2864585280364178d, "zero-length-sliders")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new OsuModDoubleTime());
 

From f5ba746ae5522e6c1ba34f6a34218491ff4aa626 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 17:31:28 +0900
Subject: [PATCH 08633/10326] Fail all API requests sent to DummyAPIAccess

Until now, API requests sent to dummy API were just lost in the void. In most cases this somehow worked as expected, but any logic which is waiting on a request to finish will potentially never get a response.

Going forward, I'm not 100% sure that every `Wait` on a web response will have local timeout logic (I think there is a certain amount of assumption that this is being managed for us by `APIAccess`), so I've made this change to better handle such cases going forward. Now, rather than nothing happening, requests will trigger a failure via the existing exception logic rather than silently pretending the request never arrived.
---
 osu.Game/Online/API/APIRequest.cs     | 8 ++++++--
 osu.Game/Online/API/DummyAPIAccess.cs | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index a7174324d8..16d1b3ab17 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -181,9 +181,13 @@ namespace osu.Game.Online.API
         /// <returns>Whether we are in a failed or cancelled state.</returns>
         private bool checkAndScheduleFailure()
         {
-            if (API == null || pendingFailure == null) return cancelled;
+            if (pendingFailure == null) return cancelled;
+
+            if (API == null)
+                pendingFailure();
+            else
+                API.Schedule(pendingFailure);
 
-            API.Schedule(pendingFailure);
             pendingFailure = null;
             return true;
         }
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 943b52db88..3cb22381c1 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -55,7 +55,12 @@ namespace osu.Game.Online.API
 
         public virtual void Queue(APIRequest request)
         {
-            HandleRequest?.Invoke(request);
+            if (HandleRequest != null)
+                HandleRequest.Invoke(request);
+            else
+                // this will fail due to not receiving an APIAccess, and trigger a failure on the request.
+                // this is intended - any request in testing that needs non-failures should use HandleRequest.
+                request.Perform(this);
         }
 
         public void Perform(APIRequest request) => HandleRequest?.Invoke(request);

From ce452565f45bba3106ffe89a21c63d4662e8a40e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 17:50:31 +0900
Subject: [PATCH 08634/10326] Avoid firing any kind of failures after success

---
 osu.Game/Online/API/APIRequest.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 16d1b3ab17..1a6868cfa4 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -131,8 +131,11 @@ namespace osu.Game.Online.API
         {
         }
 
+        private bool succeeded;
+
         internal virtual void TriggerSuccess()
         {
+            succeeded = true;
             Success?.Invoke();
         }
 
@@ -145,10 +148,7 @@ namespace osu.Game.Online.API
 
         public void Fail(Exception e)
         {
-            if (WebRequest?.Completed == true)
-                return;
-
-            if (cancelled)
+            if (succeeded || cancelled)
                 return;
 
             cancelled = true;

From aeff9bd8531962e7d509623407a819f3c7f69ae8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 18:08:32 +0900
Subject: [PATCH 08635/10326] Add return bool to HandleRequest to better
 trigger failures

---
 .../Online/TestDummyAPIRequestHandling.cs     |  8 ++++++--
 .../TestSceneSeasonalBackgroundLoader.cs      |  4 +++-
 .../Online/TestSceneBeatmapListingOverlay.cs  | 13 ++++++------
 .../Online/TestSceneChangelogOverlay.cs       |  6 ++++--
 .../Visual/Online/TestSceneChatOverlay.cs     | 20 +++++++++++++++++++
 .../Online/TestSceneCommentsContainer.cs      |  3 ++-
 .../Visual/Online/TestSceneNewsOverlay.cs     |  3 ++-
 .../TestScenePlaylistsResultsScreen.cs        | 13 ++++++++++++
 .../TestSceneBeatmapRecommendations.cs        |  4 +++-
 osu.Game/Online/API/DummyAPIAccess.cs         |  9 +++++----
 .../Multiplayer/TestMultiplayerRoomManager.cs | 18 +++++++++--------
 11 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
index 42948c3731..aa29d76843 100644
--- a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
+++ b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
@@ -23,8 +23,10 @@ namespace osu.Game.Tests.Online
                 {
                     case CommentVoteRequest cRequest:
                         cRequest.TriggerSuccess(new CommentBundle());
-                        break;
+                        return true;
                 }
+
+                return false;
             });
 
             CommentVoteRequest request = null;
@@ -108,8 +110,10 @@ namespace osu.Game.Tests.Online
                 {
                     case LeaveChannelRequest cRequest:
                         cRequest.TriggerSuccess();
-                        break;
+                        return true;
                 }
+
+                return false;
             });
         }
     }
diff --git a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
index e7cf830db0..dc5a4f4a3e 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
@@ -135,13 +135,15 @@ namespace osu.Game.Tests.Visual.Background
                 dummyAPI.HandleRequest = request =>
                 {
                     if (dummyAPI.State.Value != APIState.Online || !(request is GetSeasonalBackgroundsRequest backgroundsRequest))
-                        return;
+                        return false;
 
                     backgroundsRequest.TriggerSuccess(new APISeasonalBackgrounds
                     {
                         Backgrounds = seasonal_background_urls.Select(url => new APISeasonalBackground { Url = url }).ToList(),
                         EndDate = endDate
                     });
+
+                    return true;
                 };
             });
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 1349264bf9..156d6b744e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -30,13 +30,14 @@ namespace osu.Game.Tests.Visual.Online
 
             ((DummyAPIAccess)API).HandleRequest = req =>
             {
-                if (req is SearchBeatmapSetsRequest searchBeatmapSetsRequest)
+                if (!(req is SearchBeatmapSetsRequest searchBeatmapSetsRequest)) return false;
+
+                searchBeatmapSetsRequest.TriggerSuccess(new SearchBeatmapSetsResponse
                 {
-                    searchBeatmapSetsRequest.TriggerSuccess(new SearchBeatmapSetsResponse
-                    {
-                        BeatmapSets = setsForResponse,
-                    });
-                }
+                    BeatmapSets = setsForResponse,
+                });
+
+                return true;
             };
         }
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index cd2c4e9346..8818ac75b1 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -63,13 +63,15 @@ namespace osu.Game.Tests.Visual.Online
                             Builds = builds.Values.ToList()
                         };
                         changelogRequest.TriggerSuccess(changelogResponse);
-                        break;
+                        return true;
 
                     case GetChangelogBuildRequest buildRequest:
                         if (requestedBuild != null)
                             buildRequest.TriggerSuccess(requestedBuild);
-                        break;
+                        return true;
                 }
+
+                return false;
             };
 
             Child = changelog = new TestChangelogOverlay();
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index fca642ad6c..b13dd34ebc 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -11,6 +11,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Chat.Selection;
@@ -64,6 +66,24 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("register request handling", () =>
+            {
+                ((DummyAPIAccess)API).HandleRequest = req =>
+                {
+                    switch (req)
+                    {
+                        case JoinChannelRequest _:
+                            return true;
+                    }
+
+                    return false;
+                };
+            });
+        }
+
         [Test]
         public void TestHideOverlay()
         {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index c2a18330c9..cd22bb2513 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -85,9 +85,10 @@ namespace osu.Game.Tests.Visual.Online
                 dummyAPI.HandleRequest = request =>
                 {
                     if (!(request is GetCommentsRequest getCommentsRequest))
-                        return;
+                        return false;
 
                     getCommentsRequest.TriggerSuccess(commentBundle);
+                    return true;
                 };
             });
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index 37d51c16d2..6ebe8fcc07 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -33,9 +33,10 @@ namespace osu.Game.Tests.Visual.Online
                 dummyAPI.HandleRequest = request =>
                 {
                     if (!(request is GetNewsRequest getNewsRequest))
-                        return;
+                        return false;
 
                     getNewsRequest.TriggerSuccess(r);
+                    return true;
                 };
             });
 
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index be8032cde8..61d49e4018 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -170,6 +170,17 @@ namespace osu.Game.Tests.Visual.Playlists
 
         private void bindHandler(bool delayed = false, ScoreInfo userScore = null, bool failRequests = false) => ((DummyAPIAccess)API).HandleRequest = request =>
         {
+            // pre-check for requests we should be handling (as they are scheduled below).
+            switch (request)
+            {
+                case ShowPlaylistUserScoreRequest _:
+                case IndexPlaylistScoresRequest _:
+                    break;
+
+                default:
+                    return false;
+            }
+
             requestComplete = false;
 
             double delay = delayed ? 3000 : 0;
@@ -196,6 +207,8 @@ namespace osu.Game.Tests.Visual.Playlists
                         break;
                 }
             }, delay);
+
+            return true;
         };
 
         private void triggerSuccess<T>(APIRequest<T> req, T result)
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 53a956c77c..5e2d5eba5d 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -32,8 +32,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         case GetUserRequest userRequest:
                             userRequest.TriggerSuccess(getUser(userRequest.Ruleset.ID));
-                            break;
+                            return true;
                     }
+
+                    return false;
                 };
             });
 
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 3cb22381c1..52f2365165 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -34,8 +34,9 @@ namespace osu.Game.Online.API
 
         /// <summary>
         /// Provide handling logic for an arbitrary API request.
+        /// Should return true is a request was handled. If null or false return, the request will be failed with a <see cref="NotSupportedException"/>.
         /// </summary>
-        public Action<APIRequest> HandleRequest;
+        public Func<APIRequest, bool> HandleRequest;
 
         private readonly Bindable<APIState> state = new Bindable<APIState>(APIState.Online);
 
@@ -55,12 +56,12 @@ namespace osu.Game.Online.API
 
         public virtual void Queue(APIRequest request)
         {
-            if (HandleRequest != null)
-                HandleRequest.Invoke(request);
-            else
+            if (HandleRequest?.Invoke(request) != true)
+            {
                 // this will fail due to not receiving an APIAccess, and trigger a failure on the request.
                 // this is intended - any request in testing that needs non-failures should use HandleRequest.
                 request.Perform(this);
+            }
         }
 
         public void Perform(APIRequest request) => HandleRequest?.Invoke(request);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
index 7e824c4d7c..315be510a3 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
@@ -52,15 +52,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                         Rooms.Add(createdRoom);
                         createRoomRequest.TriggerSuccess(createdRoom);
-                        break;
+                        return true;
 
                     case JoinRoomRequest joinRoomRequest:
                         joinRoomRequest.TriggerSuccess();
-                        break;
+                        return true;
 
                     case PartRoomRequest partRoomRequest:
                         partRoomRequest.TriggerSuccess();
-                        break;
+                        return true;
 
                     case GetRoomsRequest getRoomsRequest:
                         var roomsWithoutParticipants = new List<Room>();
@@ -76,11 +76,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         }
 
                         getRoomsRequest.TriggerSuccess(roomsWithoutParticipants);
-                        break;
+                        return true;
 
                     case GetRoomRequest getRoomRequest:
                         getRoomRequest.TriggerSuccess(Rooms.Single(r => r.RoomID.Value == getRoomRequest.RoomId));
-                        break;
+                        return true;
 
                     case GetBeatmapSetRequest getBeatmapSetRequest:
                         var onlineReq = new GetBeatmapSetRequest(getBeatmapSetRequest.ID, getBeatmapSetRequest.Type);
@@ -89,11 +89,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                         // Get the online API from the game's dependencies.
                         game.Dependencies.Get<IAPIProvider>().Queue(onlineReq);
-                        break;
+                        return true;
 
                     case CreateRoomScoreRequest createRoomScoreRequest:
                         createRoomScoreRequest.TriggerSuccess(new APIScoreToken { ID = 1 });
-                        break;
+                        return true;
 
                     case SubmitRoomScoreRequest submitRoomScoreRequest:
                         submitRoomScoreRequest.TriggerSuccess(new MultiplayerScore
@@ -108,8 +108,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                             User = api.LocalUser.Value,
                             Statistics = new Dictionary<HitResult, int>()
                         });
-                        break;
+                        return true;
                 }
+
+                return false;
             };
         }
 

From 5267fb74c441c1c7f6ba48637f6981876ae5227e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 14:44:06 +0900
Subject: [PATCH 08636/10326] Add submission requests

---
 .../Online/Solo/CreateSoloScoreRequest.cs     | 32 +++++++++++++
 .../Online/Solo/SubmitSoloScoreRequest.cs     | 45 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 osu.Game/Online/Solo/CreateSoloScoreRequest.cs
 create mode 100644 osu.Game/Online/Solo/SubmitSoloScoreRequest.cs

diff --git a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs b/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
new file mode 100644
index 0000000000..ae5ac5e26c
--- /dev/null
+++ b/osu.Game/Online/Solo/CreateSoloScoreRequest.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 System.Net.Http;
+using osu.Framework.IO.Network;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+
+namespace osu.Game.Online.Solo
+{
+    public class CreateSoloScoreRequest : APIRequest<APIScoreToken>
+    {
+        private readonly int beatmapId;
+        private readonly string versionHash;
+
+        public CreateSoloScoreRequest(int beatmapId, string versionHash)
+        {
+            this.beatmapId = beatmapId;
+            this.versionHash = versionHash;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.Method = HttpMethod.Post;
+            req.AddParameter("version_hash", versionHash);
+            return req;
+        }
+
+        protected override string Target => $@"solo/{beatmapId}/scores";
+    }
+}
diff --git a/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs b/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
new file mode 100644
index 0000000000..98ba4fa052
--- /dev/null
+++ b/osu.Game/Online/Solo/SubmitSoloScoreRequest.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 System.Net.Http;
+using Newtonsoft.Json;
+using osu.Framework.IO.Network;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Scoring;
+
+namespace osu.Game.Online.Solo
+{
+    public class SubmitSoloScoreRequest : APIRequest<MultiplayerScore>
+    {
+        private readonly long scoreId;
+
+        private readonly int beatmapId;
+
+        private readonly ScoreInfo scoreInfo;
+
+        public SubmitSoloScoreRequest(int beatmapId, long scoreId, ScoreInfo scoreInfo)
+        {
+            this.beatmapId = beatmapId;
+            this.scoreId = scoreId;
+            this.scoreInfo = scoreInfo;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+
+            req.ContentType = "application/json";
+            req.Method = HttpMethod.Put;
+
+            req.AddRaw(JsonConvert.SerializeObject(scoreInfo, new JsonSerializerSettings
+            {
+                ReferenceLoopHandling = ReferenceLoopHandling.Ignore
+            }));
+
+            return req;
+        }
+
+        protected override string Target => $@"solo/{beatmapId}/scores/{scoreId}";
+    }
+}

From 6cb14e91c91043e1e3ddf0d2c999b9665def1d65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 14:47:15 +0900
Subject: [PATCH 08637/10326] Make Player abstract and introduce SoloPlayer

---
 .../Visual/Navigation/TestScenePerformFromScreen.cs      | 4 ++--
 osu.Game/Screens/Play/Player.cs                          | 4 ++--
 osu.Game/Screens/Play/SoloPlayer.cs                      | 9 +++++++++
 osu.Game/Screens/Select/PlaySongSelect.cs                | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Screens/Play/SoloPlayer.cs

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
index 21d3bdaae3..2791952b66 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.Navigation
         public void TestPerformAtSongSelectFromPlayerLoader()
         {
             PushAndConfirm(() => new PlaySongSelect());
-            PushAndConfirm(() => new PlayerLoader(() => new Player()));
+            PushAndConfirm(() => new PlayerLoader(() => new SoloPlayer()));
 
             AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) }));
             AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.Navigation
         public void TestPerformAtMenuFromPlayerLoader()
         {
             PushAndConfirm(() => new PlaySongSelect());
-            PushAndConfirm(() => new PlayerLoader(() => new Player()));
+            PushAndConfirm(() => new PlayerLoader(() => new SoloPlayer()));
 
             AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
             AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is MainMenu);
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 0e221351aa..4cf0274614 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Play
 {
     [Cached]
     [Cached(typeof(ISamplePlaybackDisabler))]
-    public class Player : ScreenWithBeatmapBackground, ISamplePlaybackDisabler
+    public abstract class Player : ScreenWithBeatmapBackground, ISamplePlaybackDisabler
     {
         /// <summary>
         /// The delay upon completion of the beatmap before displaying the results screen.
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Create a new player instance.
         /// </summary>
-        public Player(PlayerConfiguration configuration = null)
+        protected Player(PlayerConfiguration configuration = null)
         {
             Configuration = configuration ?? new PlayerConfiguration();
         }
diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
new file mode 100644
index 0000000000..79860f3eda
--- /dev/null
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -0,0 +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.
+
+namespace osu.Game.Screens.Play
+{
+    public class SoloPlayer : Player
+    {
+    }
+}
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index e61d5cce85..dfb4b59060 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Select
 
             SampleConfirm?.Play();
 
-            this.Push(player = new PlayerLoader(() => new Player()));
+            this.Push(player = new PlayerLoader(() => new SoloPlayer()));
 
             return true;
         }

From 7045fce55542b0f56a5907f0a87532bfef0728f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 15:00:02 +0900
Subject: [PATCH 08638/10326] Move score submission logic in general out to its
 own Player type

---
 .../Multiplayer/MultiplayerPlayer.cs          |   1 -
 .../OnlinePlay/Playlists/PlaylistsPlayer.cs   |  74 ++-----------
 osu.Game/Screens/Play/SubmittingPlayer.cs     | 100 ++++++++++++++++++
 3 files changed, 106 insertions(+), 69 deletions(-)
 create mode 100644 osu.Game/Screens/Play/SubmittingPlayer.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index b3cd44d55a..ef34d40497 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -19,7 +19,6 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    // Todo: The "room" part of PlaylistsPlayer should be split out into an abstract player class to be inherited instead.
     public class MultiplayerPlayer : PlaylistsPlayer
     {
         protected override bool PauseOnFocusLost => false;
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 2b6dbd9dcb..a6aff5e43f 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -4,11 +4,8 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
@@ -19,23 +16,12 @@ using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
 {
-    public class PlaylistsPlayer : Player
+    public class PlaylistsPlayer : RoomSubmittingPlayer
     {
         public Action Exited;
 
-        [Resolved(typeof(Room), nameof(Room.RoomID))]
-        protected Bindable<long?> RoomId { get; private set; }
-
         protected readonly PlaylistItem PlaylistItem;
 
-        protected long? Token { get; private set; }
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
-
         public PlaylistsPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
             : base(configuration)
         {
@@ -43,12 +29,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(IBindable<RulesetInfo> ruleset)
         {
-            Token = null;
-
-            bool failed = false;
-
             // Sanity checks to ensure that PlaylistsPlayer matches the settings for the current PlaylistItem
             if (Beatmap.Value.BeatmapInfo.OnlineBeatmapID != PlaylistItem.Beatmap.Value.OnlineBeatmapID)
                 throw new InvalidOperationException("Current Beatmap does not match PlaylistItem's Beatmap");
@@ -58,31 +40,12 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
             if (!PlaylistItem.RequiredMods.All(m => Mods.Value.Any(m.Equals)))
                 throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods");
-
-            var req = new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
-            req.Success += r => Token = r.ID;
-            req.Failure += e =>
-            {
-                failed = true;
-
-                if (string.IsNullOrEmpty(e.Message))
-                    Logger.Error(e, "Failed to retrieve a score submission token.");
-                else
-                    Logger.Log($"You are not able to submit a score: {e.Message}", level: LogLevel.Important);
-
-                Schedule(() =>
-                {
-                    ValidForResume = false;
-                    this.Exit();
-                });
-            };
-
-            api.Queue(req);
-
-            while (!failed && !Token.HasValue)
-                Thread.Sleep(1000);
         }
 
+        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
+
+        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
+
         public override bool OnExiting(IScreen next)
         {
             if (base.OnExiting(next))
@@ -106,31 +69,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             return score;
         }
 
-        protected override async Task SubmitScore(Score score)
-        {
-            await base.SubmitScore(score).ConfigureAwait(false);
-
-            Debug.Assert(Token != null);
-
-            var tcs = new TaskCompletionSource<bool>();
-            var request = new SubmitRoomScoreRequest(Token.Value, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
-
-            request.Success += s =>
-            {
-                score.ScoreInfo.OnlineScoreID = s.ID;
-                tcs.SetResult(true);
-            };
-
-            request.Failure += e =>
-            {
-                Logger.Error(e, "Failed to submit score");
-                tcs.SetResult(false);
-            };
-
-            api.Queue(request);
-            await tcs.Task.ConfigureAwait(false);
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
new file mode 100644
index 0000000000..250e308b3c
--- /dev/null
+++ b/osu.Game/Screens/Play/SubmittingPlayer.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 System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Logging;
+using osu.Framework.Screens;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Play
+{
+    public abstract class RoomSubmittingPlayer : SubmittingPlayer
+    {
+        [Resolved(typeof(Room), nameof(Room.RoomID))]
+        protected Bindable<long?> RoomId { get; private set; }
+
+        protected RoomSubmittingPlayer(PlayerConfiguration configuration)
+            : base(configuration)
+        {
+        }
+    }
+
+    public abstract class SubmittingPlayer : Player
+    {
+        protected long? Token { get; private set; }
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        protected SubmittingPlayer(PlayerConfiguration configuration)
+            : base(configuration)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Token = null;
+
+            bool failed = false;
+
+            var req = CreateTokenRequestRequest();
+            req.Success += r => Token = r.ID;
+            req.Failure += e =>
+            {
+                failed = true;
+
+                if (string.IsNullOrEmpty(e.Message))
+                    Logger.Error(e, "Failed to retrieve a score submission token.");
+                else
+                    Logger.Log($"You are not able to submit a score: {e.Message}", level: LogLevel.Important);
+
+                Schedule(() =>
+                {
+                    ValidForResume = false;
+                    this.Exit();
+                });
+            };
+
+            api.Queue(req);
+
+            while (!failed && !Token.HasValue)
+                Thread.Sleep(1000);
+        }
+
+        protected override async Task SubmitScore(Score score)
+        {
+            await base.SubmitScore(score).ConfigureAwait(false);
+
+            Debug.Assert(Token != null);
+
+            var tcs = new TaskCompletionSource<bool>();
+            var request = CreateSubmissionRequest(score, Token.Value);
+
+            request.Success += s =>
+            {
+                score.ScoreInfo.OnlineScoreID = s.ID;
+                tcs.SetResult(true);
+            };
+
+            request.Failure += e =>
+            {
+                Logger.Error(e, "Failed to submit score");
+                tcs.SetResult(false);
+            };
+
+            api.Queue(request);
+            await tcs.Task.ConfigureAwait(false);
+        }
+
+        protected abstract APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token);
+
+        protected abstract APIRequest<APIScoreToken> CreateTokenRequestRequest();
+    }
+}

From 12f050264aa31af09089a32d23472defe67a0ec5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 15:33:31 +0900
Subject: [PATCH 08639/10326] Further split out a player class which submits to
 "rooms"

---
 .../Multiplayer/MultiplayerPlayer.cs          |  3 +-
 .../OnlinePlay/Playlists/PlaylistsPlayer.cs   | 10 +-----
 osu.Game/Screens/Play/RoomSubmittingPlayer.cs | 32 +++++++++++++++++++
 osu.Game/Screens/Play/SubmittingPlayer.cs     | 15 ++-------
 4 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Screens/Play/RoomSubmittingPlayer.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index ef34d40497..2ba04b75d6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -11,7 +11,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
-using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
@@ -19,7 +18,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public class MultiplayerPlayer : PlaylistsPlayer
+    public class MultiplayerPlayer : RoomSubmittingPlayer
     {
         protected override bool PauseOnFocusLost => false;
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index a6aff5e43f..260d4961ff 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Screens;
-using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
@@ -20,12 +19,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
     {
         public Action Exited;
 
-        protected readonly PlaylistItem PlaylistItem;
-
         public PlaylistsPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
-            : base(configuration)
+            : base(playlistItem, configuration)
         {
-            PlaylistItem = playlistItem;
         }
 
         [BackgroundDependencyLoader]
@@ -42,10 +38,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods");
         }
 
-        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
-
-        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
-
         public override bool OnExiting(IScreen next)
         {
             if (base.OnExiting(next))
diff --git a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
new file mode 100644
index 0000000000..c695e99874
--- /dev/null
+++ b/osu.Game/Screens/Play/RoomSubmittingPlayer.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Play
+{
+    /// <summary>
+    /// A player instance which submits to a room backing. This is generally used by playlists and multiplayer.
+    /// </summary>
+    public abstract class RoomSubmittingPlayer : SubmittingPlayer
+    {
+        [Resolved(typeof(Room), nameof(Room.RoomID))]
+        protected Bindable<long?> RoomId { get; private set; }
+
+        protected readonly PlaylistItem PlaylistItem;
+
+        protected RoomSubmittingPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
+            : base(configuration)
+        {
+            PlaylistItem = playlistItem;
+        }
+
+        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
+
+        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
+    }
+}
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 250e308b3c..5577683f05 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -5,7 +5,6 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
@@ -14,17 +13,9 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Play
 {
-    public abstract class RoomSubmittingPlayer : SubmittingPlayer
-    {
-        [Resolved(typeof(Room), nameof(Room.RoomID))]
-        protected Bindable<long?> RoomId { get; private set; }
-
-        protected RoomSubmittingPlayer(PlayerConfiguration configuration)
-            : base(configuration)
-        {
-        }
-    }
-
+    /// <summary>
+    /// A player instance which supports submitting scores to an online store.
+    /// </summary>
     public abstract class SubmittingPlayer : Player
     {
         protected long? Token { get; private set; }

From 194b2d05d3749b6b60796c699490df6320c62d59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 15:35:06 +0900
Subject: [PATCH 08640/10326] Update SoloPlayer to derive SubmittingPlayer

---
 osu.Game/Screens/Play/SoloPlayer.cs       | 15 ++++++++++++++-
 osu.Game/Screens/Play/SubmittingPlayer.cs |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index 79860f3eda..f2f97c5d0d 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -1,9 +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.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Scoring;
+
 namespace osu.Game.Screens.Play
 {
-    public class SoloPlayer : Player
+    public class SoloPlayer : SubmittingPlayer
     {
+        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest()
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 5577683f05..e7847a9902 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        protected SubmittingPlayer(PlayerConfiguration configuration)
+        protected SubmittingPlayer(PlayerConfiguration configuration = null)
             : base(configuration)
         {
         }

From 571124669daf940ef35bc5a6a81cd8b64fa02bc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 15:45:22 +0900
Subject: [PATCH 08641/10326] Remove all references to "score submission" from
 Player

---
 .../Multiplayer/MultiplayerPlayer.cs          |  4 ++--
 osu.Game/Screens/Play/Player.cs               | 20 +++++++++----------
 osu.Game/Screens/Play/SubmittingPlayer.cs     |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 2ba04b75d6..3797adf360 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -133,9 +133,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onResultsReady() => resultsReady.SetResult(true);
 
-        protected override async Task SubmitScore(Score score)
+        protected override async Task PrepareScoreForResultsAsync(Score score)
         {
-            await base.SubmitScore(score).ConfigureAwait(false);
+            await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
 
             await client.ChangeState(MultiplayerUserState.FinishedPlay).ConfigureAwait(false);
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4cf0274614..efe5d26409 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -559,7 +559,7 @@ namespace osu.Game.Screens.Play
         }
 
         private ScheduledDelegate completionProgressDelegate;
-        private Task<ScoreInfo> scoreSubmissionTask;
+        private Task<ScoreInfo> prepareScoreForDisplayTask;
 
         private void updateCompletionState(ValueChangedEvent<bool> completionState)
         {
@@ -586,17 +586,17 @@ namespace osu.Game.Screens.Play
 
             if (!Configuration.ShowResults) return;
 
-            scoreSubmissionTask ??= Task.Run(async () =>
+            prepareScoreForDisplayTask ??= Task.Run(async () =>
             {
                 var score = CreateScore();
 
                 try
                 {
-                    await SubmitScore(score).ConfigureAwait(false);
+                    await PrepareScoreForResultsAsync(score).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {
-                    Logger.Error(ex, "Score submission failed!");
+                    Logger.Error(ex, "Score preparation failed!");
                 }
 
                 try
@@ -617,7 +617,7 @@ namespace osu.Game.Screens.Play
 
         private void scheduleCompletion() => completionProgressDelegate = Schedule(() =>
         {
-            if (!scoreSubmissionTask.IsCompleted)
+            if (!prepareScoreForDisplayTask.IsCompleted)
             {
                 scheduleCompletion();
                 return;
@@ -625,7 +625,7 @@ namespace osu.Game.Screens.Play
 
             // screen may be in the exiting transition phase.
             if (this.IsCurrentScreen())
-                this.Push(CreateResults(scoreSubmissionTask.Result));
+                this.Push(CreateResults(prepareScoreForDisplayTask.Result));
         });
 
         protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
@@ -895,11 +895,11 @@ namespace osu.Game.Screens.Play
         }
 
         /// <summary>
-        /// Submits the player's <see cref="Score"/>.
+        /// Prepare the <see cref="Score"/> for display at results.
         /// </summary>
-        /// <param name="score">The <see cref="Score"/> to submit.</param>
-        /// <returns>The submitted score.</returns>
-        protected virtual Task SubmitScore(Score score) => Task.CompletedTask;
+        /// <param name="score">The <see cref="Score"/> to prepare.</param>
+        /// <returns>A task that prepares the provided score. On completion, the score is assumed to be ready for display.</returns>
+        protected virtual Task PrepareScoreForResultsAsync(Score score) => Task.CompletedTask;
 
         /// <summary>
         /// Creates the <see cref="ResultsScreen"/> for a <see cref="ScoreInfo"/>.
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index e7847a9902..d876cad941 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -59,9 +59,9 @@ namespace osu.Game.Screens.Play
                 Thread.Sleep(1000);
         }
 
-        protected override async Task SubmitScore(Score score)
+        protected override async Task PrepareScoreForResultsAsync(Score score)
         {
-            await base.SubmitScore(score).ConfigureAwait(false);
+            await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
 
             Debug.Assert(Token != null);
 

From 3cd8bf2d7f30d2be87d7e67acdcae1a4cfef69f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 16:05:40 +0900
Subject: [PATCH 08642/10326] Move token request construction to
 LoadAsyncComplete to better allow DI usage

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs     | 5 +++++
 osu.Game/Screens/Play/SubmittingPlayer.cs                   | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 3797adf360..a5adcdb8ad 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -61,6 +61,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
 
             HUDOverlay.Add(loadingDisplay = new LoadingLayer(true) { Depth = float.MaxValue });
+        }
+
+        protected override void LoadAsyncComplete()
+        {
+            base.LoadAsyncComplete();
 
             if (Token == null)
                 return; // Todo: Somehow handle token retrieval failure.
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index d876cad941..356f70f4bf 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -28,11 +28,11 @@ namespace osu.Game.Screens.Play
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void LoadAsyncComplete()
         {
-            Token = null;
+            base.LoadAsyncComplete();
 
+            // Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
             bool failed = false;
 
             var req = CreateTokenRequestRequest();

From 242b847516cdf53f4f2c54fdd7097b9ec862f9a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 16:41:36 +0900
Subject: [PATCH 08643/10326] Add flow for allowing gameplay to continue even
 when an error occurs with token retrieval

---
 osu.Game/Screens/Play/RoomSubmittingPlayer.cs |  2 +-
 osu.Game/Screens/Play/SubmittingPlayer.cs     | 71 +++++++++++++------
 2 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
index c695e99874..6ef39e4b75 100644
--- a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
@@ -27,6 +27,6 @@ namespace osu.Game.Screens.Play
 
         protected override APIRequest<APIScoreToken> CreateTokenRequestRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
 
-        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
+        protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
     }
 }
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 356f70f4bf..55f4ba4b9b 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.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.Diagnostics;
-using System.Threading;
+using System;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
@@ -30,40 +29,70 @@ namespace osu.Game.Screens.Play
 
         protected override void LoadAsyncComplete()
         {
-            base.LoadAsyncComplete();
-
             // Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
-            bool failed = false;
+            var tcs = new TaskCompletionSource<bool>();
+
+            if (!api.IsLoggedIn)
+            {
+                fail(new InvalidOperationException("API is not online."));
+                return;
+            }
 
             var req = CreateTokenRequestRequest();
-            req.Success += r => Token = r.ID;
-            req.Failure += e =>
+
+            if (req == null)
             {
-                failed = true;
+                fail(new InvalidOperationException("Request could not be constructed."));
+                return;
+            }
 
-                if (string.IsNullOrEmpty(e.Message))
-                    Logger.Error(e, "Failed to retrieve a score submission token.");
-                else
-                    Logger.Log($"You are not able to submit a score: {e.Message}", level: LogLevel.Important);
-
-                Schedule(() =>
-                {
-                    ValidForResume = false;
-                    this.Exit();
-                });
+            req.Success += r =>
+            {
+                Token = r.ID;
+                tcs.SetResult(true);
             };
+            req.Failure += fail;
 
             api.Queue(req);
 
-            while (!failed && !Token.HasValue)
-                Thread.Sleep(1000);
+            tcs.Task.Wait();
+
+            void fail(Exception exception)
+            {
+                if (HandleTokenRetrievalFailure(exception))
+                {
+                    if (string.IsNullOrEmpty(exception.Message))
+                        Logger.Error(exception, "Failed to retrieve a score submission token.");
+                    else
+                        Logger.Log($"You are not able to submit a score: {exception.Message}", level: LogLevel.Important);
+
+                    Schedule(() =>
+                    {
+                        ValidForResume = false;
+                        this.Exit();
+                    });
+                }
+
+                tcs.SetResult(false);
+            }
+
+            base.LoadAsyncComplete();
         }
 
+        /// <summary>
+        /// Called when a token could not be retrieved for submission.
+        /// </summary>
+        /// <param name="exception">The error causing the failure.</param>
+        /// <returns>Whether gameplay should be immediately exited as a result. Returning false allows the gameplay session to continue. Defaults to true.</returns>
+        protected virtual bool HandleTokenRetrievalFailure(Exception exception) => true;
+
         protected override async Task PrepareScoreForResultsAsync(Score score)
         {
             await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
 
-            Debug.Assert(Token != null);
+            // token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure).
+            if (Token == null)
+                return;
 
             var tcs = new TaskCompletionSource<bool>();
             var request = CreateSubmissionRequest(score, Token.Value);

From e649a330a405d7d58490e50ea8c7f3b17cb3e27c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 16:41:52 +0900
Subject: [PATCH 08644/10326] Implement SoloPlayer's request construction

---
 osu.Game/Screens/Play/SoloPlayer.cs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index f2f97c5d0d..3dc9df146e 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -1,22 +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 System.Diagnostics;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
+using osu.Game.Online.Solo;
 using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Play
 {
     public class SoloPlayer : SubmittingPlayer
     {
-        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token)
+        protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)
         {
-            throw new System.NotImplementedException();
+            Debug.Assert(Beatmap.Value.BeatmapInfo.OnlineBeatmapID != null);
+
+            int beatmapId = Beatmap.Value.BeatmapInfo.OnlineBeatmapID.Value;
+
+            return new SubmitSoloScoreRequest(beatmapId, token, score.ScoreInfo);
         }
 
         protected override APIRequest<APIScoreToken> CreateTokenRequestRequest()
         {
-            throw new System.NotImplementedException();
+            if (!(Beatmap.Value.BeatmapInfo.OnlineBeatmapID is int beatmapId))
+                return null;
+
+            return new CreateSoloScoreRequest(beatmapId, Game.VersionHash);
         }
+
+        protected override bool HandleTokenRetrievalFailure(Exception exception) => false;
     }
 }

From 64e85ba995a20dcf1cd3eb6f95fc65ae1a47a0cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 19:19:07 +0900
Subject: [PATCH 08645/10326] Always fade out approach circles at a HitObject's
 start time to better match stable

---
 .../Objects/Drawables/DrawableHitCircle.cs    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 77094f928b..189003875d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -164,28 +164,29 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ApproachCircle.Expire(true);
         }
 
+        protected override void UpdateStartTimeStateTransforms()
+        {
+            base.UpdateStartTimeStateTransforms();
+
+            ApproachCircle.FadeOut(50);
+        }
+
         protected override void UpdateHitStateTransforms(ArmedState state)
         {
             Debug.Assert(HitObject.HitWindows != null);
 
+            // todo: temporary / arbitrary, used for lifetime optimisation.
+            this.Delay(800).FadeOut();
+
             switch (state)
             {
                 case ArmedState.Idle:
-                    this.Delay(HitObject.TimePreempt).FadeOut(500);
                     HitArea.HitAction = null;
                     break;
 
                 case ArmedState.Miss:
-                    ApproachCircle.FadeOut(50);
                     this.FadeOut(100);
                     break;
-
-                case ArmedState.Hit:
-                    ApproachCircle.FadeOut(50);
-
-                    // todo: temporary / arbitrary
-                    this.Delay(800).FadeOut();
-                    break;
             }
 
             Expire();

From d10ff615feeadb9ece5d1f67863ddb9d26152bdc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 19:22:37 +0900
Subject: [PATCH 08646/10326] Fix default skin's glow resetting fade on miss

---
 osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
index fcbe4c1b28..46aeadc59b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
@@ -74,10 +74,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private void updateState(DrawableHitObject drawableObject, ArmedState state)
         {
-            using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime, true))
-            {
+            using (BeginAbsoluteSequence(drawableObject.StateUpdateTime))
                 glow.FadeOut(400);
 
+            using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime))
+            {
                 switch (state)
                 {
                     case ArmedState.Hit:

From d17c431faf92affd103a85b46f0a79fdf633040e Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 23 Mar 2021 23:22:17 +0100
Subject: [PATCH 08647/10326] Disable relative mode for TournamentGame

---
 osu.Game.Tournament/TournamentGame.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index fadb821bef..bf43b198c4 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -2,18 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Drawing;
-using osu.Framework.Extensions.Color4Extensions;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
+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.Colour;
-using osu.Game.Graphics.Cursor;
-using osu.Game.Tournament.Models;
+using osu.Framework.Input.Handlers.Mouse;
+using osu.Framework.Platform;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 
@@ -36,7 +39,7 @@ namespace osu.Game.Tournament
         private LoadingSpinner loadingSpinner;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkConfigManager frameworkConfig, GameHost host)
         {
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
             windowMode = frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
@@ -48,6 +51,9 @@ namespace osu.Game.Tournament
                 Margin = new MarginPadding(40),
             });
 
+            var m = (MouseHandler)host.AvailableInputHandlers.Single(t => t is MouseHandler);
+            m.UseRelativeMode.Value = false;
+
             loadingSpinner.Show();
 
             BracketLoadTask.ContinueWith(_ => LoadComponentsAsync(new[]

From fbb992fc7e432900ce9090d98446e6e3e18588ae Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Tue, 23 Mar 2021 19:18:32 -0500
Subject: [PATCH 08648/10326] Added a comment to new method

---
 osu.Game/OsuGame.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a52899433a..e8284c0bad 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1008,6 +1008,7 @@ namespace osu.Game
                 Exit();
         }
         protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults() {
+            // Overriding settings determined by Framework
             IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
             defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);
             return defaultOverrides;

From 67a03ebc2371c2bb6c14b721fd03f2627cb58b92 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Tue, 23 Mar 2021 19:31:16 -0500
Subject: [PATCH 08649/10326] Fixed formatting issues to be in line with osu
 coding standards

---
 osu.Game/OsuGame.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e8284c0bad..ca8fa9f1f6 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1007,7 +1007,9 @@ namespace osu.Game
             if (newScreen == null)
                 Exit();
         }
-        protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults() {
+
+        protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults()
+        {
             // Overriding settings determined by Framework
             IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
             defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);

From 437dadc85f0927936004abc72bc5331289d7e333 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Tue, 23 Mar 2021 19:37:55 -0500
Subject: [PATCH 08650/10326] Changed comment on GetFrameworkConfigDefaults()
 to be more accurate

---
 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 ca8fa9f1f6..f211723c59 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1010,7 +1010,7 @@ namespace osu.Game
 
         protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults()
         {
-            // Overriding settings determined by Framework
+            // Overriding config defaults determined by Framework
             IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
             defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);
             return defaultOverrides;

From 5ee280f941b5738adf98211646b8f12cc3719702 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 02:56:32 +0100
Subject: [PATCH 08651/10326] Update PointsInSegment when adding/removing
 points

There was a bug where if you created a slider, moved the last point, and then added a point such that it became a PerfectCurve, it would fail to recover after becoming a Bezier.

This fixes that.
---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 42a7d246ea..f34403b377 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -29,10 +29,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
     public class PathControlPointPiece : BlueprintPiece<Slider>, IHasTooltip
     {
         public Action<PathControlPointPiece, MouseButtonEvent> RequestSelection;
+        public List<PathControlPoint> PointsInSegment;
 
         public readonly BindableBool IsSelected = new BindableBool();
         public readonly PathControlPoint ControlPoint;
-        public readonly List<PathControlPoint> PointsInSegment;
 
         private readonly Slider slider;
         private readonly Container marker;
@@ -55,7 +55,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
-            PointsInSegment = slider.Path.PointsInSegment(controlPoint);
+            slider.Path.ControlPoints.BindCollectionChanged((_, args) =>
+            {
+                PointsInSegment = slider.Path.PointsInSegment(controlPoint);
+            }, runOnceImmediately: true);
 
             controlPoint.Type.BindValueChanged(_ => updateMarkerDisplay());
 

From 0bcd38e6613fff3009a7e59f55c422751cf9e6e5 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 02:57:47 +0100
Subject: [PATCH 08652/10326] Simplify path type maintenance when dragging

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index f34403b377..4459308ea5 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -195,8 +195,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 ControlPoint.Position.Value = dragStartPosition + (e.MousePosition - e.MouseDownPosition);
 
             // Maintain the path type in case it got defaulted to bezier at some point during the drag.
-            if (PointsInSegment[0].Type.Value != dragPathType)
-                PointsInSegment[0].Type.Value = dragPathType;
+            PointsInSegment[0].Type.Value = dragPathType;
         }
 
         protected override void OnDragEnd(DragEndEvent e) => changeHandler?.EndChange();

From 4ae3eaaac6265b54c649fc64789c84ebd87f4400 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 03:02:19 +0100
Subject: [PATCH 08653/10326] Move path type correction

This is better because `PathControlPointVisualizer` is local to the editor, meaning there is no chance that this could affect gameplay.
---
 .../Components/PathControlPointVisualiser.cs  | 54 +++++++++++++++++
 osu.Game/Rulesets/Objects/PathControlPoint.cs |  2 +-
 osu.Game/Rulesets/Objects/SliderPath.cs       | 58 -------------------
 3 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index ce5dc4855e..0c9163ae41 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -91,6 +91,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                         }));
 
                         Connections.Add(new PathControlPointConnectionPiece(slider, e.NewStartingIndex + i));
+
+                        point.Changed += updatePathTypes;
                     }
 
                     break;
@@ -100,6 +102,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     {
                         Pieces.RemoveAll(p => p.ControlPoint == point);
                         Connections.RemoveAll(c => c.ControlPoint == point);
+
+                        point.Changed -= updatePathTypes;
                     }
 
                     // If removing before the end of the path,
@@ -142,6 +146,56 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
         }
 
+        /// <summary>
+        /// Handles correction of invalid path types.
+        /// </summary>
+        private void updatePathTypes()
+        {
+            foreach (PathControlPoint segmentStartPoint in slider.Path.ControlPoints.Where(p => p.Type.Value != null))
+            {
+                if (segmentStartPoint.Type.Value != PathType.PerfectCurve)
+                    continue;
+
+                Vector2[] points = slider.Path.PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
+                if (points.Length == 3 && !validCircularArcSegment(points))
+                    segmentStartPoint.Type.Value = PathType.Bezier;
+            }
+        }
+
+        /// <summary>
+        /// Returns whether the given points are arranged in a valid way. Invalid if points
+        /// are almost entirely linear - as this causes the radius to approach infinity,
+        /// which would exhaust memory when drawing / approximating.
+        /// </summary>
+        /// <param name="points">The three points that make up this circular arc segment.</param>
+        /// <returns></returns>
+        private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
+        {
+            Vector2 a = points[0];
+            Vector2 b = points[1];
+            Vector2 c = points[2];
+
+            float maxLength = points.Max(p => p.Length);
+
+            Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
+            Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
+            Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
+
+            float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
+
+            float acSq = (a - c).LengthSquared;
+            float abSq = (a - b).LengthSquared;
+            float bcSq = (b - c).LengthSquared;
+
+            // Exterior = curve wraps around the long way between end-points
+            // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
+            // where the latter is much faster, hence differing thresholds
+            bool exterior = abSq > acSq || bcSq > acSq;
+            float threshold = exterior ? 0.05f : 0.001f;
+
+            return Math.Abs(det) >= threshold;
+        }
+
         private void selectPiece(PathControlPointPiece piece, MouseButtonEvent e)
         {
             if (e.Button == MouseButton.Left && inputManager.CurrentState.Keyboard.ControlPressed)
diff --git a/osu.Game/Rulesets/Objects/PathControlPoint.cs b/osu.Game/Rulesets/Objects/PathControlPoint.cs
index f11917f4f4..2e4100ee0b 100644
--- a/osu.Game/Rulesets/Objects/PathControlPoint.cs
+++ b/osu.Game/Rulesets/Objects/PathControlPoint.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Objects
         /// <summary>
         /// Invoked when any property of this <see cref="PathControlPoint"/> is changed.
         /// </summary>
-        internal event Action Changed;
+        public event Action Changed;
 
         /// <summary>
         /// Creates a new <see cref="PathControlPoint"/>.
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index c7931b440b..61f5f94142 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -54,21 +54,13 @@ namespace osu.Game.Rulesets.Objects
                 {
                     case NotifyCollectionChangedAction.Add:
                         foreach (var c in args.NewItems.Cast<PathControlPoint>())
-                        {
                             c.Changed += invalidate;
-                            c.Changed += updatePathTypes;
-                        }
-
                         break;
 
                     case NotifyCollectionChangedAction.Reset:
                     case NotifyCollectionChangedAction.Remove:
                         foreach (var c in args.OldItems.Cast<PathControlPoint>())
-                        {
                             c.Changed -= invalidate;
-                            c.Changed -= updatePathTypes;
-                        }
-
                         break;
                 }
 
@@ -197,56 +189,6 @@ namespace osu.Game.Rulesets.Objects
             return pointsInCurrentSegment;
         }
 
-        /// <summary>
-        /// Handles correction of invalid path types.
-        /// </summary>
-        private void updatePathTypes()
-        {
-            foreach (PathControlPoint segmentStartPoint in ControlPoints.Where(p => p.Type.Value != null))
-            {
-                if (segmentStartPoint.Type.Value != PathType.PerfectCurve)
-                    continue;
-
-                Vector2[] points = PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
-                if (points.Length == 3 && !validCircularArcSegment(points))
-                    segmentStartPoint.Type.Value = PathType.Bezier;
-            }
-        }
-
-        /// <summary>
-        /// Returns whether the given points are arranged in a valid way. Invalid if points
-        /// are almost entirely linear - as this causes the radius to approach infinity,
-        /// which would exhaust memory when drawing / approximating.
-        /// </summary>
-        /// <param name="points">The three points that make up this circular arc segment.</param>
-        /// <returns></returns>
-        private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
-        {
-            Vector2 a = points[0];
-            Vector2 b = points[1];
-            Vector2 c = points[2];
-
-            float maxLength = points.Max(p => p.Length);
-
-            Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
-            Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
-            Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
-
-            float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
-
-            float acSq = (a - c).LengthSquared;
-            float abSq = (a - b).LengthSquared;
-            float bcSq = (b - c).LengthSquared;
-
-            // Exterior = curve wraps around the long way between end-points
-            // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
-            // where the latter is much faster, hence differing thresholds
-            bool exterior = abSq > acSq || bcSq > acSq;
-            float threshold = exterior ? 0.05f : 0.001f;
-
-            return Math.Abs(det) >= threshold;
-        }
-
         private void invalidate()
         {
             pathCache.Invalidate();

From a1c35677efb5e68f5691896b8ca6dfb3763b12e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:02:17 +0900
Subject: [PATCH 08654/10326] Add more xmldoc

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 55f4ba4b9b..24d540fbf3 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -17,6 +17,9 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public abstract class SubmittingPlayer : Player
     {
+        /// <summary>
+        /// The token to be used for the current submission. This is fetched via a request created by <see cref="CreateTokenRequestRequest"/>.
+        /// </summary>
         protected long? Token { get; private set; }
 
         [Resolved]

From 8bed7748d696666bfe0023f78710cf84440bc244 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:02:37 +0900
Subject: [PATCH 08655/10326] Rename token request method to avoid double
 Request terminology

---
 osu.Game/Screens/Play/RoomSubmittingPlayer.cs | 2 +-
 osu.Game/Screens/Play/SoloPlayer.cs           | 2 +-
 osu.Game/Screens/Play/SubmittingPlayer.cs     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
index 6ef39e4b75..d7b49bf2cb 100644
--- a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Play
             PlaylistItem = playlistItem;
         }
 
-        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
+        protected override APIRequest<APIScoreToken> CreateTokenRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
 
         protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
     }
diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index 3dc9df146e..5c465b6d8f 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Play
             return new SubmitSoloScoreRequest(beatmapId, token, score.ScoreInfo);
         }
 
-        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest()
+        protected override APIRequest<APIScoreToken> CreateTokenRequest()
         {
             if (!(Beatmap.Value.BeatmapInfo.OnlineBeatmapID is int beatmapId))
                 return null;
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 24d540fbf3..55b10abd5c 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play
     public abstract class SubmittingPlayer : Player
     {
         /// <summary>
-        /// The token to be used for the current submission. This is fetched via a request created by <see cref="CreateTokenRequestRequest"/>.
+        /// The token to be used for the current submission. This is fetched via a request created by <see cref="CreateTokenRequest"/>.
         /// </summary>
         protected long? Token { get; private set; }
 
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            var req = CreateTokenRequestRequest();
+            var req = CreateTokenRequest();
 
             if (req == null)
             {
@@ -118,6 +118,6 @@ namespace osu.Game.Screens.Play
 
         protected abstract APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token);
 
-        protected abstract APIRequest<APIScoreToken> CreateTokenRequestRequest();
+        protected abstract APIRequest<APIScoreToken> CreateTokenRequest();
     }
 }

From 7bae4ff43d1d90c30dd874e54183e60934dd7fd3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:06:04 +0100
Subject: [PATCH 08656/10326] Add control point dragging tests

---
 .../TestSceneSliderControlPointPiece.cs       | 170 ++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
new file mode 100644
index 0000000000..c4f103e40c
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -0,0 +1,170 @@
+// Copyright (c) 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.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    public class TestSceneSliderControlPointPiece : SelectionBlueprintTestScene
+    {
+        private Slider slider;
+        private DrawableSlider drawableObject;
+        private TestSliderBlueprint blueprint;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Clear();
+
+            slider = new Slider
+            {
+                Position = new Vector2(256, 192),
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(Vector2.Zero, PathType.PerfectCurve),
+                    new PathControlPoint(new Vector2(150, 150)),
+                    new PathControlPoint(new Vector2(300, 0), PathType.PerfectCurve),
+                    new PathControlPoint(new Vector2(400, 0)),
+                    new PathControlPoint(new Vector2(400, 150))
+                })
+            };
+
+            slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
+
+            Add(drawableObject = new DrawableSlider(slider));
+            AddBlueprint(blueprint = new TestSliderBlueprint(drawableObject));
+        });
+
+        [Test]
+        public void TestDragControlPoint()
+        {
+            moveMouseToControlPoint(1);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(150, 50));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(1, new Vector2(150, 50));
+            assertControlPointType(0, PathType.PerfectCurve);
+        }
+
+        [Test]
+        public void TestDragControlPointAlmostLinearly()
+        {
+            moveMouseToControlPoint(1);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(150, 0.01f));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(1, new Vector2(150, 0.01f));
+            assertControlPointType(0, PathType.Bezier);
+        }
+
+        [Test]
+        public void TestDragControlPointAlmostLinearlyExterior()
+        {
+            moveMouseToControlPoint(1);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(400, 0.01f));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(1, new Vector2(400, 0.01f));
+            assertControlPointType(0, PathType.Bezier);
+        }
+
+        [Test]
+        public void TestDragControlPointPathRecovery()
+        {
+            moveMouseToControlPoint(1);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(150, 0.01f));
+            assertControlPointType(0, PathType.Bezier);
+
+            addMovementStep(new Vector2(150, 50));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(1, new Vector2(150, 50));
+            assertControlPointType(0, PathType.PerfectCurve);
+        }
+
+        [Test]
+        public void TestDragControlPointPathRecoveryOtherSegment()
+        {
+            moveMouseToControlPoint(4);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(350, 0));
+            assertControlPointType(2, PathType.Bezier);
+
+            addMovementStep(new Vector2(150, 150));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(1, new Vector2(150, 150));
+            assertControlPointType(2, PathType.PerfectCurve);
+        }
+
+        private void addMovementStep(Vector2 relativePosition)
+        {
+            AddStep($"move mouse to {relativePosition}", () =>
+            {
+                Vector2 position = slider.Position + relativePosition;
+                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+            });
+        }
+
+        private void moveMouseToControlPoint(int index)
+        {
+            AddStep($"move mouse to control point {index}", () =>
+            {
+                Vector2 position = slider.Position + slider.Path.ControlPoints[index].Position.Value;
+                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+            });
+        }
+
+        private void assertControlPointType(int index, PathType type) => AddAssert($"control point {index} is {type}", () => slider.Path.ControlPoints[index].Type.Value == type);
+
+        private void assertControlPointPosition(int index, Vector2 position) =>
+            AddAssert($"control point {index} at {position}", () => Precision.AlmostEquals(position, slider.Path.ControlPoints[index].Position.Value, 1));
+
+        private class TestSliderBlueprint : SliderSelectionBlueprint
+        {
+            public new SliderBodyPiece BodyPiece => base.BodyPiece;
+            public new TestSliderCircleBlueprint HeadBlueprint => (TestSliderCircleBlueprint)base.HeadBlueprint;
+            public new TestSliderCircleBlueprint TailBlueprint => (TestSliderCircleBlueprint)base.TailBlueprint;
+            public new PathControlPointVisualiser ControlPointVisualiser => base.ControlPointVisualiser;
+
+            public TestSliderBlueprint(DrawableSlider slider)
+                : base(slider)
+            {
+            }
+
+            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
+        }
+
+        private class TestSliderCircleBlueprint : SliderCircleSelectionBlueprint
+        {
+            public new HitCirclePiece CirclePiece => base.CirclePiece;
+
+            public TestSliderCircleBlueprint(DrawableSlider slider, SliderPosition position)
+                : base(slider, position)
+            {
+            }
+        }
+    }
+}

From e372e355efba030da6866f61fad35abca462cd6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:12:51 +0900
Subject: [PATCH 08657/10326] Reorder overrides in SoloPlayer to better follow
 chronological request order

---
 osu.Game/Screens/Play/SoloPlayer.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index 5c465b6d8f..ee1ccdc5b3 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -12,15 +12,6 @@ namespace osu.Game.Screens.Play
 {
     public class SoloPlayer : SubmittingPlayer
     {
-        protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)
-        {
-            Debug.Assert(Beatmap.Value.BeatmapInfo.OnlineBeatmapID != null);
-
-            int beatmapId = Beatmap.Value.BeatmapInfo.OnlineBeatmapID.Value;
-
-            return new SubmitSoloScoreRequest(beatmapId, token, score.ScoreInfo);
-        }
-
         protected override APIRequest<APIScoreToken> CreateTokenRequest()
         {
             if (!(Beatmap.Value.BeatmapInfo.OnlineBeatmapID is int beatmapId))
@@ -30,5 +21,14 @@ namespace osu.Game.Screens.Play
         }
 
         protected override bool HandleTokenRetrievalFailure(Exception exception) => false;
+
+        protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)
+        {
+            Debug.Assert(Beatmap.Value.BeatmapInfo.OnlineBeatmapID != null);
+
+            int beatmapId = Beatmap.Value.BeatmapInfo.OnlineBeatmapID.Value;
+
+            return new SubmitSoloScoreRequest(beatmapId, token, score.ScoreInfo);
+        }
     }
 }

From 847d44c7d9998b9d2429fcc9bcef967004d314d4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:13:37 +0100
Subject: [PATCH 08658/10326] Remove unnecessary length asserts

We don't actually care about the length (as this isn't what we're testing), just the type of the slider.
---
 .../Editor/TestSceneSliderPlacementBlueprint.cs                | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index e7ea12e538..e47d86428b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -291,8 +291,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertControlPointCount(3);
             assertControlPointType(0, PathType.Bezier);
-            // Will be > 10000 if not falling back to Bezier path calc.
-            assertLength(218.8901f);
         }
 
         [Test]
@@ -311,7 +309,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertControlPointCount(3);
             assertControlPointType(0, PathType.PerfectCurve);
-            assertLength(212.2276f);
         }
 
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));

From 6fbe5300163bea139a466c1be2bb09a63e2bd830 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:14:35 +0100
Subject: [PATCH 08659/10326] Fix coordinates

---
 .../TestSceneSliderPlacementBlueprint.cs       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index e47d86428b..6eec5edfbe 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -279,13 +279,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [Test]
         public void TestPlacePerfectCurveSegmentAlmostLinearly()
         {
-            addMovementStep(new Vector2(0));
+            Vector2 startPosition = new Vector2(200);
+
+            addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(61.382935f, 6.423767f));
+            addMovementStep(startPosition + new Vector2(300, 0));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(217.69522f, 22.84021f));
+            addMovementStep(startPosition + new Vector2(150, 0.1f));
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);
@@ -296,14 +298,16 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [Test]
         public void TestPlacePerfectCurveSegmentAlmostLinearlyRecovery()
         {
-            addMovementStep(new Vector2(0));
+            Vector2 startPosition = new Vector2(200);
+
+            addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(61.382935f, 6.423767f));
+            addMovementStep(startPosition + new Vector2(61.382935f, 6.423767f));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(217.69522f, 22.84021f)); // Should convert to bezier
-            addMovementStep(new Vector2(210.0f, 30.0f)); // Should convert back to perfect
+            addMovementStep(startPosition + new Vector2(217.69522f, 22.84021f)); // Should convert to bezier
+            addMovementStep(startPosition + new Vector2(210.0f, 0.0f)); // Should convert back to perfect
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);

From 23a4d1c1350ef03a05b3c53b2c73be37ef18a4a7 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:15:28 +0100
Subject: [PATCH 08660/10326] Shorten recovery test name

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 6eec5edfbe..e42ceaa4ac 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -296,7 +296,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         }
 
         [Test]
-        public void TestPlacePerfectCurveSegmentAlmostLinearlyRecovery()
+        public void TestPlacePerfectCurveSegmentRecovery()
         {
             Vector2 startPosition = new Vector2(200);
 

From 7b395ed783e2811e9e29f73e287965b9bafe8b57 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:15:50 +0100
Subject: [PATCH 08661/10326] Add exterior arc test

---
 .../TestSceneSliderPlacementBlueprint.cs      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index e42ceaa4ac..0433acb25c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -284,6 +284,25 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
+            addMovementStep(startPosition + new Vector2(61.382935f, 6.423767f));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(startPosition + new Vector2(217.69522f, 22.84021f));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointType(0, PathType.Bezier);
+        }
+
+        [Test]
+        public void TestPlacePerfectCurveSegmentAlmostLinearlyExterior()
+        {
+            Vector2 startPosition = new Vector2(200);
+
+            addMovementStep(startPosition);
+            addClickStep(MouseButton.Left);
+
             addMovementStep(startPosition + new Vector2(300, 0));
             addClickStep(MouseButton.Left);
 

From a0c6c4da35dfe5cf2a28efa20da64acab28f25ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:17:13 +0900
Subject: [PATCH 08662/10326] Rename and refactor token request process to be
 easier to understand

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 24 +++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 55b10abd5c..5d087c212d 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
@@ -37,7 +38,7 @@ namespace osu.Game.Screens.Play
 
             if (!api.IsLoggedIn)
             {
-                fail(new InvalidOperationException("API is not online."));
+                handleFailure(new InvalidOperationException("API is not online."));
                 return;
             }
 
@@ -45,7 +46,7 @@ namespace osu.Game.Screens.Play
 
             if (req == null)
             {
-                fail(new InvalidOperationException("Request could not be constructed."));
+                handleFailure(new InvalidOperationException("Request could not be constructed."));
                 return;
             }
 
@@ -54,13 +55,13 @@ namespace osu.Game.Screens.Play
                 Token = r.ID;
                 tcs.SetResult(true);
             };
-            req.Failure += fail;
+            req.Failure += handleFailure;
 
             api.Queue(req);
 
             tcs.Task.Wait();
 
-            void fail(Exception exception)
+            void handleFailure(Exception exception)
             {
                 if (HandleTokenRetrievalFailure(exception))
                 {
@@ -116,8 +117,19 @@ namespace osu.Game.Screens.Play
             await tcs.Task.ConfigureAwait(false);
         }
 
-        protected abstract APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token);
-
+        /// <summary>
+        /// Construct a request to be used for retrieval of the score token.
+        /// Can return null, at which point <see cref="HandleTokenRetrievalFailure"/> will be fired.
+        /// </summary>
+        [CanBeNull]
         protected abstract APIRequest<APIScoreToken> CreateTokenRequest();
+
+        /// <summary>
+        /// Construct a request to submit the score.
+        /// Will only be invoked if the request constructed via <see cref="CreateTokenRequest"/> was successful.
+        /// </summary>
+        /// <param name="score">The score to be submitted.</param>
+        /// <param name="token">The submission token.</param>
+        protected abstract APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token);
     }
 }

From 84b2f9a848c0c61b047f5eb463e7848cdbd9b03a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:20:44 +0900
Subject: [PATCH 08663/10326] Make token private

---
 .../Multiplayer/MultiplayerPlayer.cs          |  4 ++--
 osu.Game/Screens/Play/SubmittingPlayer.cs     | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index a5adcdb8ad..aaacf891bb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -67,8 +67,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadAsyncComplete();
 
-            if (Token == null)
-                return; // Todo: Somehow handle token retrieval failure.
+            if (!ValidForResume)
+                return; // token retrieval may have failed.
 
             client.MatchStarted += onMatchStarted;
             client.ResultsReady += onResultsReady;
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 5d087c212d..87a4eb5efe 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// The token to be used for the current submission. This is fetched via a request created by <see cref="CreateTokenRequest"/>.
         /// </summary>
-        protected long? Token { get; private set; }
+        private long? token;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Play
 
             if (!api.IsLoggedIn)
             {
-                handleFailure(new InvalidOperationException("API is not online."));
+                handleTokenFailure(new InvalidOperationException("API is not online."));
                 return;
             }
 
@@ -46,22 +46,24 @@ namespace osu.Game.Screens.Play
 
             if (req == null)
             {
-                handleFailure(new InvalidOperationException("Request could not be constructed."));
+                handleTokenFailure(new InvalidOperationException("Request could not be constructed."));
                 return;
             }
 
             req.Success += r =>
             {
-                Token = r.ID;
+                token = r.ID;
                 tcs.SetResult(true);
             };
-            req.Failure += handleFailure;
+            req.Failure += handleTokenFailure;
 
             api.Queue(req);
 
             tcs.Task.Wait();
 
-            void handleFailure(Exception exception)
+            base.LoadAsyncComplete();
+
+            void handleTokenFailure(Exception exception)
             {
                 if (HandleTokenRetrievalFailure(exception))
                 {
@@ -79,8 +81,6 @@ namespace osu.Game.Screens.Play
 
                 tcs.SetResult(false);
             }
-
-            base.LoadAsyncComplete();
         }
 
         /// <summary>
@@ -95,11 +95,11 @@ namespace osu.Game.Screens.Play
             await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
 
             // token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure).
-            if (Token == null)
+            if (token == null)
                 return;
 
             var tcs = new TaskCompletionSource<bool>();
-            var request = CreateSubmissionRequest(score, Token.Value);
+            var request = CreateSubmissionRequest(score, token.Value);
 
             request.Success += s =>
             {

From d55324585d678603435adcaed815d3d85186037b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:23:23 +0900
Subject: [PATCH 08664/10326] Change RoomSubmittingPlayer's request
 implementation to return null on RoomID missing, rather than silently
 succeeding

---
 osu.Game/Screens/Play/RoomSubmittingPlayer.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
index d7b49bf2cb..7ba12f5db6 100644
--- a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
@@ -25,7 +25,13 @@ namespace osu.Game.Screens.Play
             PlaylistItem = playlistItem;
         }
 
-        protected override APIRequest<APIScoreToken> CreateTokenRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
+        protected override APIRequest<APIScoreToken> CreateTokenRequest()
+        {
+            if (!(RoomId.Value is long roomId))
+                return null;
+
+            return new CreateRoomScoreRequest(roomId, PlaylistItem.ID, Game.VersionHash);
+        }
 
         protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
     }

From f95175983ae6f4f79a2a27877467e8ef40f5cb22 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:37:37 +0900
Subject: [PATCH 08665/10326] Make code more concise and move method to a more
 appropriate place

---
 osu.Game/OsuGame.cs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 53dc900254..dd1fa32ad9 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -531,6 +531,13 @@ namespace osu.Game
             SentryLogger.Dispose();
         }
 
+        protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults()
+            => new Dictionary<FrameworkSetting, object>
+            {
+                // General expectation that osu! starts in fullscreen by default (also gives the most predictable performance)
+                { FrameworkSetting.WindowMode, WindowMode.Fullscreen }
+            };
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -1013,13 +1020,5 @@ namespace osu.Game
             if (newScreen == null)
                 Exit();
         }
-
-        protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults()
-        {
-            // Overriding config defaults determined by Framework
-            IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
-            defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);
-            return defaultOverrides;
-        }
     }
 }

From f80b3ada25f1fe688262c95df3dc65f7862479ce Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:54:48 +0100
Subject: [PATCH 08666/10326] Add circular arc size tests

---
 .../TestSceneSliderPlacementBlueprint.cs      | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 0433acb25c..20df46cd2c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -334,6 +334,40 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.PerfectCurve);
         }
 
+        [Test]
+        public void TestPlacePerfectCurveSegmentLarge()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(200, 800));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(600, 200));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointType(0, PathType.PerfectCurve);
+        }
+
+        [Test]
+        public void TestPlacePerfectCurveSegmentTooLarge()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(200, 800));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400, 200));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointType(0, PathType.Bezier);
+        }
+
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
 
         private void addClickStep(MouseButton button)

From e0240ab9d93db5e4d2467c4002e9a2784ff0e1a1 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:55:34 +0100
Subject: [PATCH 08667/10326] Increase exterior threshold

---
 .../Blueprints/Sliders/Components/PathControlPointVisualiser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 0c9163ae41..c4a16f9c2a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -191,7 +191,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
             // where the latter is much faster, hence differing thresholds
             bool exterior = abSq > acSq || bcSq > acSq;
-            float threshold = exterior ? 0.05f : 0.001f;
+            float threshold = exterior ? 0.35f : 0.001f;
 
             return Math.Abs(det) >= threshold;
         }

From 415797aadd3c77de155ebdefc53d1c22cb83a723 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 06:01:12 +0100
Subject: [PATCH 08668/10326] Fix broken control point drag test

Broken for 2 reasons:
- Assert checks the wrong control point.
- The exterior arc is now too big.

This fixes both.
---
 .../Editor/TestSceneSliderControlPointPiece.cs                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index c4f103e40c..c3492fc843 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -112,10 +112,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(new Vector2(350, 0));
             assertControlPointType(2, PathType.Bezier);
 
-            addMovementStep(new Vector2(150, 150));
+            addMovementStep(new Vector2(400, 50));
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
-            assertControlPointPosition(1, new Vector2(150, 150));
+            assertControlPointPosition(4, new Vector2(400, 50));
             assertControlPointType(2, PathType.PerfectCurve);
         }
 

From 5ad8dc316fa1aeed2f2dc194c2f9520b7f93ba09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 14:09:15 +0900
Subject: [PATCH 08669/10326] Add inline comment and improve linq robustness

---
 osu.Game.Tournament/TournamentGame.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index bf43b198c4..87e23e3404 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -51,8 +51,12 @@ namespace osu.Game.Tournament
                 Margin = new MarginPadding(40),
             });
 
-            var m = (MouseHandler)host.AvailableInputHandlers.Single(t => t is MouseHandler);
-            m.UseRelativeMode.Value = false;
+            // in order to have the OS mouse cursor visible, relative mode needs to be disabled.
+            // can potentially be removed when https://github.com/ppy/osu-framework/issues/4309 is resolved.
+            var mouseHandler = host.AvailableInputHandlers.OfType<MouseHandler>().FirstOrDefault();
+
+            if (mouseHandler != null)
+                mouseHandler.UseRelativeMode.Value = false;
 
             loadingSpinner.Show();
 

From def0e5c42e90e5e8eb984c794a31eee0567caee4 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Mar 2021 17:21:42 +0100
Subject: [PATCH 08670/10326] Fix off-by-one error in isQuadInBounds

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 28e6347f4f..0418aa1925 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -242,8 +242,8 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private (bool X, bool Y) isQuadInBounds(Quad quad)
         {
-            bool xInBounds = (quad.TopLeft.X >= 0) && (quad.BottomRight.X < DrawWidth);
-            bool yInBounds = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y < DrawHeight);
+            bool xInBounds = (quad.TopLeft.X >= 0) && (quad.BottomRight.X <= DrawWidth);
+            bool yInBounds = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y <= DrawHeight);
 
             return (xInBounds, yInBounds);
         }

From 3d471d239f2007c05e7af3bf417bae1c89b1d910 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Mar 2021 12:41:43 +0100
Subject: [PATCH 08671/10326] Clamp multi-object scale instead of cancelling it

---
 .../Edit/OsuSelectionHandler.cs               | 45 +++++++++++++++++--
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 0418aa1925..595357ee65 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -215,23 +215,23 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private bool scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
         {
+            scale = getClampedScale(hitObjects, reference, scale);
+
             // move the selection before scaling if dragging from top or left anchors.
             float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
             float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
 
             Quad selectionQuad = getSurroundingQuad(hitObjects);
-            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X + xOffset, selectionQuad.TopLeft.Y + yOffset, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
-            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
             foreach (var h in hitObjects)
             {
                 var newPosition = h.Position;
 
                 // guard against no-ops and NaN.
-                if (scale.X != 0 && selectionQuad.Width > 0 && xInBounds)
+                if (scale.X != 0 && selectionQuad.Width > 0)
                     newPosition.X = selectionQuad.TopLeft.X + xOffset + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
 
-                if (scale.Y != 0 && selectionQuad.Height > 0 && yInBounds)
+                if (scale.Y != 0 && selectionQuad.Height > 0)
                     newPosition.Y = selectionQuad.TopLeft.Y + yOffset + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
 
                 h.Position = newPosition;
@@ -269,6 +269,43 @@ namespace osu.Game.Rulesets.Osu.Edit
                 h.Position += delta;
         }
 
+        /// <summary>
+        /// Clamp scale where selection does not exceed playfield bounds or flip.
+        /// </summary>
+        /// <param name="hitObjects">The hitobjects to be scaled</param>
+        /// <param name="reference">The anchor from which the scale operation is performed</param>
+        /// <param name="scale">The scale to be clamped</param>
+        /// <returns>The clamped scale vector</returns>
+        private Vector2 getClampedScale(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
+        {
+            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
+            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
+
+            Quad selectionQuad = getSurroundingQuad(hitObjects);
+
+            //todo: this is not always correct for selections involving sliders
+            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X + xOffset, selectionQuad.TopLeft.Y + yOffset, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
+
+            //max Size -> playfield bounds
+            if (scaledQuad.TopLeft.X < 0)
+                scale.X += scaledQuad.TopLeft.X;
+            if (scaledQuad.TopLeft.Y < 0)
+                scale.Y += scaledQuad.TopLeft.Y;
+
+            if (scaledQuad.BottomRight.X > DrawWidth)
+                scale.X -= scaledQuad.BottomRight.X - DrawWidth;
+            if (scaledQuad.BottomRight.Y > DrawHeight)
+                scale.Y -= scaledQuad.BottomRight.Y - DrawHeight;
+
+            //min Size -> almost 0. Less than 0 causes the quad to flip, exactly 0 causes scaling to get stuck at minimum scale.
+            Vector2 scaledSize = selectionQuad.Size + scale;
+            Vector2 minSize = new Vector2(Precision.FLOAT_EPSILON);
+
+            scale = Vector2.ComponentMax(minSize, scaledSize) - selectionQuad.Size;
+
+            return scale;
+        }
+
         /// <summary>
         /// Returns a gamefield-space quad surrounding the provided hit objects.
         /// </summary>

From e67ab3cca7cb55383a82769499686a37e09f82e6 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Mar 2021 16:09:44 +0100
Subject: [PATCH 08672/10326] Change single slider scaling to a method that
 works

---
 .../Edit/OsuSelectionHandler.cs               | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 595357ee65..ae92b12fd2 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -197,19 +197,19 @@ namespace osu.Game.Rulesets.Osu.Edit
             Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
             Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
 
-            Quad selectionQuad = getSurroundingQuad(new OsuHitObject[] { slider });
-            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
-            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
-
-            if (!xInBounds)
-                pathRelativeDeltaScale.X = 1;
-
-            if (!yInBounds)
-                pathRelativeDeltaScale.Y = 1;
-
             foreach (var point in slider.Path.ControlPoints)
                 point.Position.Value *= pathRelativeDeltaScale;
 
+            //if sliderhead or sliderend end up outside playfield, revert scaling.
+            Quad scaledQuad = getSurroundingQuad(new OsuHitObject[] { slider });
+            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
+
+            if (xInBounds && yInBounds)
+                return true;
+
+            foreach (var point in slider.Path.ControlPoints)
+                point.Position.Value *= new Vector2(1 / pathRelativeDeltaScale.X, 1 / pathRelativeDeltaScale.Y);
+
             return true;
         }
 

From b4dc35f66ba3c8c6761fdb8dc381057bb13ce73a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 17:24:05 +0100
Subject: [PATCH 08673/10326] Update large arc tests

Should now be more robust and readable.
---
 .../TestSceneSliderControlPointPiece.cs       |  4 ++--
 .../TestSceneSliderPlacementBlueprint.cs      | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index c3492fc843..7ca86335ce 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -112,10 +112,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(new Vector2(350, 0));
             assertControlPointType(2, PathType.Bezier);
 
-            addMovementStep(new Vector2(400, 50));
+            addMovementStep(new Vector2(150, 150));
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
-            assertControlPointPosition(4, new Vector2(400, 50));
+            assertControlPointPosition(4, new Vector2(150, 150));
             assertControlPointType(2, PathType.PerfectCurve);
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 20df46cd2c..46fe7b7576 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -337,13 +337,17 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [Test]
         public void TestPlacePerfectCurveSegmentLarge()
         {
-            addMovementStep(new Vector2(200));
+            Vector2 startPosition = new Vector2(400);
+
+            addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(200, 800));
+            addMovementStep(startPosition + new Vector2(240, 240));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(600, 200));
+            // Playfield dimensions are 640 x 480.
+            // So a 480 * 480 bounding box area should be ok.
+            addMovementStep(startPosition + new Vector2(-240, 240));
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);
@@ -354,13 +358,17 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [Test]
         public void TestPlacePerfectCurveSegmentTooLarge()
         {
-            addMovementStep(new Vector2(200));
+            Vector2 startPosition = new Vector2(480, 200);
+
+            addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(200, 800));
+            addMovementStep(startPosition + new Vector2(400, 400));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(400, 200));
+            // Playfield dimensions are 640 x 480.
+            // So an 800 * 800 bounding box area should not be ok.
+            addMovementStep(startPosition + new Vector2(-400, 400));
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);

From 0f4314c1d8e6741037df4407326d186fb8c3210b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 17:24:33 +0100
Subject: [PATCH 08674/10326] Add complete arc test

Ensures we can still make smaller circles properly.
---
 .../Editor/TestSceneSliderPlacementBlueprint.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 46fe7b7576..937034fc23 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -376,6 +376,23 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.Bezier);
         }
 
+        [Test]
+        public void TestPlacePerfectCurveSegmentCompleteArc()
+        {
+            addMovementStep(new Vector2(400));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(600, 400));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400, 410));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointType(0, PathType.PerfectCurve);
+        }
+
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
 
         private void addClickStep(MouseButton button)

From 9df059b01decf63403094a3c071a6f54bea7fe7b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 17:25:28 +0100
Subject: [PATCH 08675/10326] Add bounding box limit

---
 .../Components/PathControlPointVisualiser.cs  | 101 ++++++++++++++++--
 1 file changed, 90 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index c4a16f9c2a..0270485f31 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -165,11 +166,26 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         /// <summary>
         /// Returns whether the given points are arranged in a valid way. Invalid if points
         /// are almost entirely linear - as this causes the radius to approach infinity,
-        /// which would exhaust memory when drawing / approximating.
+        /// or if the bounding box of the arc is too large.
         /// </summary>
         /// <param name="points">The three points that make up this circular arc segment.</param>
         /// <returns></returns>
         private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
+        {
+            float det = circularArcDeterminant(points);
+            RectangleF boundingBox = circularArcBoundingBox(points);
+
+            // Determinant limit prevents memory exhaustion as a result of approximating the subpath.
+            // Bounding box area limit prevents memory exhaustion as a result of drawing the texture.
+            return Math.Abs(det) > 0.001f && boundingBox.Area < 640 * 480;
+        }
+
+        /// <summary>
+        /// Computes the determinant of the circular arc segment defined by the given points.
+        /// </summary>
+        /// <param name="points">The three points defining the circular arc.</param>
+        /// <returns></returns>
+        private float circularArcDeterminant(IReadOnlyList<Vector2> points)
         {
             Vector2 a = points[0];
             Vector2 b = points[1];
@@ -181,19 +197,82 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
             Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
 
-            float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
+            return (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
+        }
 
-            float acSq = (a - c).LengthSquared;
-            float abSq = (a - b).LengthSquared;
-            float bcSq = (b - c).LengthSquared;
+        /// <summary>
+        /// Computes the bounding box of the circular arc segment defined by the given points.
+        /// </summary>
+        /// <param name="points">The three points defining the circular arc.</param>
+        /// <returns></returns>
+        private RectangleF circularArcBoundingBox(IReadOnlyList<Vector2> points)
+        {
+            Vector2 a = points[0];
+            Vector2 b = points[1];
+            Vector2 c = points[2];
 
-            // Exterior = curve wraps around the long way between end-points
-            // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
-            // where the latter is much faster, hence differing thresholds
-            bool exterior = abSq > acSq || bcSq > acSq;
-            float threshold = exterior ? 0.35f : 0.001f;
+            // See: https://en.wikipedia.org/wiki/Circumscribed_circle#Cartesian_coordinates_2
+            float d = 2 * (a.X * (b - c).Y + b.X * (c - a).Y + c.X * (a - b).Y);
+            float aSq = a.LengthSquared;
+            float bSq = b.LengthSquared;
+            float cSq = c.LengthSquared;
 
-            return Math.Abs(det) >= threshold;
+            Vector2 center = new Vector2(
+                aSq * (b - c).Y + bSq * (c - a).Y + cSq * (a - b).Y,
+                aSq * (c - b).X + bSq * (a - c).X + cSq * (b - a).X) / d;
+
+            Vector2 dA = a - center;
+            Vector2 dC = c - center;
+
+            float r = dA.Length;
+
+            double thetaStart = Math.Atan2(dA.Y, dA.X);
+            double thetaEnd = Math.Atan2(dC.Y, dC.X);
+
+            while (thetaEnd < thetaStart)
+                thetaEnd += 2 * Math.PI;
+
+            // Decide in which direction to draw the circle, depending on which side of
+            // AC B lies.
+            Vector2 orthoAtoC = c - a;
+            orthoAtoC = new Vector2(orthoAtoC.Y, -orthoAtoC.X);
+            bool clockwise = Vector2.Dot(orthoAtoC, b - a) >= 0;
+
+            if (clockwise)
+            {
+                if (thetaEnd < thetaStart)
+                    thetaEnd += Math.PI * 2;
+            }
+            else
+            {
+                if (thetaStart < thetaEnd)
+                    thetaStart += Math.PI * 2;
+            }
+
+            List<Vector2> boundingBoxPoints = new List<Vector2>(points);
+
+            bool includes0Degrees = 0 > thetaStart && 0 < thetaEnd;
+            bool includes90Degrees = Math.PI / 2 > thetaStart && Math.PI / 2 < thetaEnd;
+            bool includes180Degrees = Math.PI > thetaStart && Math.PI < thetaEnd;
+            bool includes270Degrees = Math.PI * 1.5f > thetaStart && Math.PI * 1.5f < thetaEnd;
+
+            if (!clockwise)
+            {
+                includes0Degrees = 0 < thetaStart && 0 > thetaEnd;
+                includes90Degrees = Math.PI / 2 < thetaStart && Math.PI / 2 > thetaEnd;
+                includes180Degrees = Math.PI < thetaStart && Math.PI > thetaEnd;
+                includes270Degrees = Math.PI * 1.5f < thetaStart && Math.PI * 1.5f > thetaEnd;
+            }
+
+            if (includes0Degrees) boundingBoxPoints.Add(center + new Vector2(1, 0) * r);
+            if (includes90Degrees) boundingBoxPoints.Add(center + new Vector2(0, 1) * r);
+            if (includes180Degrees) boundingBoxPoints.Add(center + new Vector2(-1, 0) * r);
+            if (includes270Degrees) boundingBoxPoints.Add(center + new Vector2(0, -1) * r);
+
+            float width = Math.Abs(boundingBoxPoints.Max(p => p.X) - boundingBoxPoints.Min(p => p.X));
+            float height = Math.Abs(boundingBoxPoints.Max(p => p.Y) - boundingBoxPoints.Min(p => p.Y));
+
+            return new RectangleF(slider.Position, new Vector2(width, height));
         }
 
         private void selectPiece(PathControlPointPiece piece, MouseButtonEvent e)

From fc5719e445750c10ddad28ead84239a9cb0f519d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 24 Mar 2021 21:31:53 +0300
Subject: [PATCH 08676/10326] Fix SkinManager not handling extensions casing
 comparsion properly

---
 osu.Game/Skinning/SkinManager.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 9257636301..dfc2981c6f 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Skinning
         protected override string ComputeHash(SkinInfo item, ArchiveReader reader = null)
         {
             // we need to populate early to create a hash based off skin.ini contents
-            if (item.Name?.Contains(".osk") == true)
+            if (item.Name?.EndsWith(".osk", StringComparison.OrdinalIgnoreCase) == true)
                 populateMetadata(item);
 
             if (item.Creator != null && item.Creator != unknown_creator_string)
@@ -122,7 +122,7 @@ namespace osu.Game.Skinning
         {
             await base.Populate(model, archive, cancellationToken).ConfigureAwait(false);
 
-            if (model.Name?.Contains(".osk") == true)
+            if (model.Name?.EndsWith(".osk", StringComparison.OrdinalIgnoreCase) == true)
                 populateMetadata(model);
         }
 
@@ -137,7 +137,7 @@ namespace osu.Game.Skinning
             }
             else
             {
-                item.Name = item.Name.Replace(".osk", "");
+                item.Name = item.Name.Replace(".osk", "", StringComparison.OrdinalIgnoreCase);
                 item.Creator ??= unknown_creator_string;
             }
         }

From 35810bb2fb98b7f310d2e19b29a8369e1ddb99a8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 24 Mar 2021 22:55:15 +0300
Subject: [PATCH 08677/10326] Add test coverage

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index a5b4b04ef5..8124bd4199 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -113,6 +113,31 @@ namespace osu.Game.Tests.Skins.IO
             }
         }
 
+        [Test]
+        public async Task TestImportUpperCasedOskArchive()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportSkinTest)))
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host);
+
+                    var imported = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("name 1", "author 1"), "skin1.OsK"));
+
+                    Assert.That(imported.Name, Is.EqualTo("name 1"));
+                    Assert.That(imported.Creator, Is.EqualTo("author 1"));
+
+                    var imported2 = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("name 1", "author 1"), "skin1.oSK"));
+
+                    Assert.That(imported2.Hash, Is.EqualTo(imported.Hash));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         private MemoryStream createOsk(string name, string author)
         {
             var zipStream = new MemoryStream();

From 8753d45b71baab76b83f6245e5e8ad98c3ea3e92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 12:32:51 +0900
Subject: [PATCH 08678/10326] Remove duplicate crash report issue template

---
 .github/ISSUE_TEMPLATE/02-crash-issues.md     | 20 -------------------
 ...issues.md => 02-feature-request-issues.md} |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/02-crash-issues.md
 rename .github/ISSUE_TEMPLATE/{03-feature-request-issues.md => 02-feature-request-issues.md} (62%)

diff --git a/.github/ISSUE_TEMPLATE/02-crash-issues.md b/.github/ISSUE_TEMPLATE/02-crash-issues.md
deleted file mode 100644
index 04170312d1..0000000000
--- a/.github/ISSUE_TEMPLATE/02-crash-issues.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Crash Report
-about: Issues regarding crashes or permanent freezes.
----
-**Describe the crash:** 
-
-**Screenshots or videos showing encountered issue:** 
-
-**osu!lazer version:** 
-
-**Logs:**
-<!--
-*please attach logs here, which are located at:*
-- `%AppData%/osu/logs` *(on Windows),*
-- `~/.local/share/osu/logs` *(on Linux & macOS).*
-- `Android/Data/sh.ppy.osulazer/logs` *(on Android)*,
-- on iOS they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes. (https://support.apple.com/en-us/HT201301#copy-to-computer)
--->
-
-**Computer Specifications:** 
diff --git a/.github/ISSUE_TEMPLATE/03-feature-request-issues.md b/.github/ISSUE_TEMPLATE/02-feature-request-issues.md
similarity index 62%
rename from .github/ISSUE_TEMPLATE/03-feature-request-issues.md
rename to .github/ISSUE_TEMPLATE/02-feature-request-issues.md
index 54c4ff94e5..c3357dd780 100644
--- a/.github/ISSUE_TEMPLATE/03-feature-request-issues.md
+++ b/.github/ISSUE_TEMPLATE/02-feature-request-issues.md
@@ -1,6 +1,6 @@
 ---
 name: Feature Request
-about: Features you would like to see in the game!
+about: Propose a feature you would like to see in the game!
 ---
 **Describe the new feature:** 
 

From f8f461a7a4b2c50edca8d0a2f3c9318d244394a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 12:33:07 +0900
Subject: [PATCH 08679/10326] Include blurb in issue template to hopefully help
 people find existing reports

---
 .github/ISSUE_TEMPLATE/01-bug-issues.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/01-bug-issues.md b/.github/ISSUE_TEMPLATE/01-bug-issues.md
index 6050036cbf..e45893b97a 100644
--- a/.github/ISSUE_TEMPLATE/01-bug-issues.md
+++ b/.github/ISSUE_TEMPLATE/01-bug-issues.md
@@ -1,7 +1,18 @@
 ---
 name: Bug Report
-about: Issues regarding encountered bugs.
+about: Report a bug or crash to desktop
 ---
+
+<!--
+IMPORTANT: Your issue may already be reported.
+
+Please check:
+- Pinned issues, at the top of https://github.com/ppy/osu/issues
+- Current priority 0 issues at https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Apriority%3A0
+- Search for your issue. If you find that it already exists, please respond with a reaction or add any further information that may be helpful.
+-->
+
+
 **Describe the bug:** 
 
 **Screenshots or videos showing encountered issue:** 
@@ -9,6 +20,7 @@ about: Issues regarding encountered bugs.
 **osu!lazer version:** 
 
 **Logs:**
+
 <!--
 *please attach logs here, which are located at:*
 - `%AppData%/osu/logs` *(on Windows),*

From e22650293dda921827d34f8beb49b12ea7ab04ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 13:35:42 +0900
Subject: [PATCH 08680/10326] Remove unnecessary second call to StripComments
 in skin parsing logic

---
 osu.Game/Skinning/LegacySkinDecoder.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkinDecoder.cs b/osu.Game/Skinning/LegacySkinDecoder.cs
index 75b7ba28b9..2700f84815 100644
--- a/osu.Game/Skinning/LegacySkinDecoder.cs
+++ b/osu.Game/Skinning/LegacySkinDecoder.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Skinning
         {
             if (section != Section.Colours)
             {
-                line = StripComments(line);
-
                 var pair = SplitKeyVal(line);
 
                 switch (section)

From 4f8edcd336c31694ad04c75d661f5c1873f0cf14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 13:35:54 +0900
Subject: [PATCH 08681/10326] Don't strip comments from metadata during parsin

---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 10a716963e..b39890084f 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -36,7 +36,13 @@ namespace osu.Game.Beatmaps.Formats
                 if (ShouldSkipLine(line))
                     continue;
 
-                line = StripComments(line).TrimEnd();
+                if (section != Section.Metadata)
+                {
+                    // comments should not be stripped from metadata lines, as the song metadata may contain "//" as valid data.
+                    line = StripComments(line);
+                }
+
+                line = line.TrimEnd();
 
                 if (line.StartsWith('[') && line.EndsWith(']'))
                 {

From 4269cb7124804eae7364a6efccf0f33c2265912d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 13:48:41 +0900
Subject: [PATCH 08682/10326] Extract majority of token retrieval code out of
 LoadComponentAsync for legibility

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 87a4eb5efe..d22199447d 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -32,6 +32,13 @@ namespace osu.Game.Screens.Play
         }
 
         protected override void LoadAsyncComplete()
+        {
+            if (!handleTokenRetrieval()) return;
+
+            base.LoadAsyncComplete();
+        }
+
+        private bool handleTokenRetrieval()
         {
             // Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
             var tcs = new TaskCompletionSource<bool>();
@@ -39,7 +46,7 @@ namespace osu.Game.Screens.Play
             if (!api.IsLoggedIn)
             {
                 handleTokenFailure(new InvalidOperationException("API is not online."));
-                return;
+                return false;
             }
 
             var req = CreateTokenRequest();
@@ -47,7 +54,7 @@ namespace osu.Game.Screens.Play
             if (req == null)
             {
                 handleTokenFailure(new InvalidOperationException("Request could not be constructed."));
-                return;
+                return false;
             }
 
             req.Success += r =>
@@ -60,8 +67,7 @@ namespace osu.Game.Screens.Play
             api.Queue(req);
 
             tcs.Task.Wait();
-
-            base.LoadAsyncComplete();
+            return true;
 
             void handleTokenFailure(Exception exception)
             {

From 0324bfa857efcc4ac3b4b019e41da300d6e92edd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 14:14:38 +0900
Subject: [PATCH 08683/10326] Change checks back to `Contains`

---
 osu.Game/Skinning/SkinManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index dfc2981c6f..ac4d63159a 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Skinning
         protected override string ComputeHash(SkinInfo item, ArchiveReader reader = null)
         {
             // we need to populate early to create a hash based off skin.ini contents
-            if (item.Name?.EndsWith(".osk", StringComparison.OrdinalIgnoreCase) == true)
+            if (item.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
                 populateMetadata(item);
 
             if (item.Creator != null && item.Creator != unknown_creator_string)
@@ -122,7 +122,7 @@ namespace osu.Game.Skinning
         {
             await base.Populate(model, archive, cancellationToken).ConfigureAwait(false);
 
-            if (model.Name?.EndsWith(".osk", StringComparison.OrdinalIgnoreCase) == true)
+            if (model.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
                 populateMetadata(model);
         }
 

From 7b3336783fb3e4864680fa69d2ea8240d3ac93b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 15:24:59 +0900
Subject: [PATCH 08684/10326] Stabilise ordering instead of simple reversing
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>
---
 .../Compose/Components/Timeline/TimelineBlueprintContainer.cs  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 3526f264a7..09da613a04 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -138,8 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             Stack<double> currentConcurrentObjects = new Stack<double>();
 
-            // Reversing is done to enumerate in order of increasing StartTime.
-            foreach (var b in SelectionBlueprints.Reverse())
+            foreach (var b in SelectionBlueprints.OrderBy(b => b.HitObject.StartTime).ThenBy(b => b.HitObject.GetEndTime()))
             {
                 while (currentConcurrentObjects.TryPeek(out double stackEndTime))
                 {

From 9fdd23b134744140c66a5e8595fb1d655c038f83 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 16:28:30 +0900
Subject: [PATCH 08685/10326] Fix various issues with stacking

---
 .../Timeline/TimelineBlueprintContainer.cs    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 09da613a04..cec851b5bb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -136,41 +136,42 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             // after the stack gets this tall, we can presume there is space underneath to draw subsequent blueprints.
             const int stack_reset_count = 3;
 
-            Stack<double> currentConcurrentObjects = new Stack<double>();
+            Stack<HitObject> currentConcurrentObjects = new Stack<HitObject>();
 
             foreach (var b in SelectionBlueprints.OrderBy(b => b.HitObject.StartTime).ThenBy(b => b.HitObject.GetEndTime()))
             {
-                while (currentConcurrentObjects.TryPeek(out double stackEndTime))
+                // remove objects from the stack as long as their end time is in the past.
+                while (currentConcurrentObjects.TryPeek(out HitObject hitObject))
                 {
-                    if (Precision.AlmostBigger(stackEndTime, b.HitObject.StartTime, 1))
+                    if (Precision.AlmostBigger(hitObject.GetEndTime(), b.HitObject.StartTime, 1))
                         break;
 
                     currentConcurrentObjects.Pop();
                 }
 
-                b.Y = -(stack_offset * currentConcurrentObjects.Count);
-
-                var bEndTime = b.HitObject.GetEndTime();
-
                 // if the stack gets too high, we should have space below it to display the next batch of objects.
                 // importantly, we only do this if time has incremented, else a stack of hitobjects all at the same time value would start to overlap themselves.
-                if (!currentConcurrentObjects.TryPeek(out double nextStackEndTime) ||
-                    !Precision.AlmostEquals(nextStackEndTime, bEndTime, 1))
+                if (currentConcurrentObjects.TryPeek(out HitObject h) && !Precision.AlmostEquals(h.StartTime, b.HitObject.StartTime, 1))
                 {
                     if (currentConcurrentObjects.Count >= stack_reset_count)
                         currentConcurrentObjects.Clear();
                 }
 
-                currentConcurrentObjects.Push(bEndTime);
+                b.Y = -(stack_offset * currentConcurrentObjects.Count);
+
+                currentConcurrentObjects.Push(b.HitObject);
             }
         }
 
         protected override SelectionHandler CreateSelectionHandler() => new TimelineSelectionHandler();
 
-        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => new TimelineHitObjectBlueprint(hitObject)
+        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
         {
-            OnDragHandled = handleScrollViaDrag
-        };
+            return new TimelineHitObjectBlueprint(hitObject)
+            {
+                OnDragHandled = handleScrollViaDrag
+            };
+        }
 
         protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect);
 

From 8d4ff867bfe7000b08e0abbe0966a1aa9045a72e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 16:30:31 +0900
Subject: [PATCH 08686/10326] Fix barlines showing up in the osu!mania editor's
 timeline

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7def7e1d16..5699be4560 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -268,6 +268,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void addBlueprintFor(HitObject hitObject)
         {
+            if (hitObject is IBarLine)
+                return;
+
             if (blueprintMap.ContainsKey(hitObject))
                 return;
 

From 013ddc734c09c110b9590b71cd1f04aa1a5bf021 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:04:35 +0900
Subject: [PATCH 08687/10326] Fix osu!catch fruit showing on plate when hidden
 mod is enabled

Closes https://github.com/ppy/osu/issues/12065.
---
 osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs | 13 ++++++++++++-
 osu.Game.Rulesets.Catch/UI/Catcher.cs          |  5 +++--
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs      |  7 ++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index 4b008d2734..5c5e41234d 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -3,13 +3,16 @@
 
 using System.Linq;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
-    public class CatchModHidden : ModHidden
+    public class CatchModHidden : ModHidden, IApplicableToDrawableRuleset<CatchHitObject>
     {
         public override string Description => @"Play with fading fruits.";
         public override double ScoreMultiplier => 1.06;
@@ -17,6 +20,14 @@ namespace osu.Game.Rulesets.Catch.Mods
         private const double fade_out_offset_multiplier = 0.6;
         private const double fade_out_duration_multiplier = 0.44;
 
+        public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
+        {
+            var drawableCatchRuleset = (DrawableCatchRuleset)drawableRuleset;
+            var catchPlayfield = (CatchPlayfield)drawableCatchRuleset.Playfield;
+
+            catchPlayfield.CatcherArea.CatchFruitOnPlate = false;
+        }
+
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
             base.ApplyNormalVisibilityState(hitObject, state);
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index ed875e7002..42be745c2e 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.Catch.UI
                    catchObjectPosition <= catcherPosition + halfCatchWidth;
         }
 
-        public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result)
+        public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result, bool placeOnPlate)
         {
             var catchResult = (CatchJudgementResult)result;
             catchResult.CatcherAnimationState = CurrentState;
@@ -237,7 +237,8 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplaySize.X / 2);
 
-                placeCaughtObject(palpableObject, positionInStack);
+                if (placeOnPlate)
+                    placeCaughtObject(palpableObject, positionInStack);
 
                 if (hitLighting.Value)
                     addLighting(hitObject, positionInStack.X, drawableObject.AccentColour.Value);
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 44adbd5512..29c95ec61c 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -21,6 +21,11 @@ namespace osu.Game.Rulesets.Catch.UI
         public readonly Catcher MovableCatcher;
         private readonly CatchComboDisplay comboDisplay;
 
+        /// <summary>
+        /// Whether <see cref="DrawablePalpableCatchHitObject"/> fruit should appear on the plate.
+        /// </summary>
+        public bool CatchFruitOnPlate { get; set; } = true;
+
         public CatcherArea(Container<CaughtObject> droppedObjectContainer, BeatmapDifficulty difficulty = null)
         {
             Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
@@ -41,7 +46,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void OnNewResult(DrawableCatchHitObject hitObject, JudgementResult result)
         {
-            MovableCatcher.OnNewResult(hitObject, result);
+            MovableCatcher.OnNewResult(hitObject, result, CatchFruitOnPlate);
 
             if (!result.Type.IsScorable())
                 return;

From 6808719efabe9cd5997e51f916ecd9f56535b1f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:05:28 +0900
Subject: [PATCH 08688/10326] Update test scene

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 48efd73222..ddb6194899 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             Add(drawableObject);
             drawableObject.OnLoadComplete += _ =>
             {
-                catcher.OnNewResult(drawableObject, result);
+                catcher.OnNewResult(drawableObject, result, true);
                 drawableObject.Expire();
             };
         }

From cb4ae6e61a87745a3204baa7459c5f895dc5b9e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:34:29 +0900
Subject: [PATCH 08689/10326] Fix very high accuracies feigning as "perfect"
 100% plays when actually below

---
 osu.Game/Users/UserStatistics.cs |  2 +-
 osu.Game/Utils/FormatUtils.cs    | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index dc926898fc..04a358436e 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Users
         public long RankedScore;
 
         [JsonProperty(@"hit_accuracy")]
-        public decimal Accuracy;
+        public double Accuracy;
 
         [JsonIgnore]
         public string DisplayAccuracy => Accuracy.FormatAccuracy();
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index 2578d8d835..70a96367be 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.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 Humanizer;
 
 namespace osu.Game.Utils
@@ -12,14 +13,14 @@ namespace osu.Game.Utils
         /// </summary>
         /// <param name="accuracy">The accuracy to be formatted</param>
         /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this double accuracy) => $"{accuracy:0.00%}";
+        public static string FormatAccuracy(this double accuracy)
+        {
+            // we don't ever want to show 100% when the accuracy is below perfect, even if it rounds to 100%.
+            if (accuracy < 1 && accuracy > 0.9999)
+                accuracy = 0.9999;
 
-        /// <summary>
-        /// Turns the provided accuracy into a percentage with 2 decimal places.
-        /// </summary>
-        /// <param name="accuracy">The accuracy to be formatted</param>
-        /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this decimal accuracy) => $"{accuracy:0.00}%";
+            return $"{accuracy:0.00%}";
+        }
 
         /// <summary>
         /// Formats the supplied rank/leaderboard position in a consistent, simplified way.

From 544117a49495a97c297f0253b0fcfa1725b9ce74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:34:41 +0900
Subject: [PATCH 08690/10326] Add test coverage of accuracy formatting function

---
 osu.Game.Tests/NonVisual/FormatUtilsTest.cs | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/FormatUtilsTest.cs

diff --git a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs b/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
new file mode 100644
index 0000000000..eb738f5f67
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/FormatUtilsTest.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 NUnit.Framework;
+using osu.Game.Utils;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class FormatUtilsTest
+    {
+        [TestCase(0, "0.00%")]
+        [TestCase(0.01, "1.00%")]
+        [TestCase(0.9899, "98.99%")]
+        [TestCase(0.989999, "99.00%")]
+        [TestCase(0.99, "99.00%")]
+        [TestCase(0.9999, "99.99%")]
+        [TestCase(0.999999, "99.99%")]
+        [TestCase(1, "100.00%")]
+        public void TestAccuracyFormatting(double input, string expectedOutput)
+        {
+            Assert.AreEqual(expectedOutput, input.FormatAccuracy());
+        }
+    }
+}

From 701342e03673b4e9d647484a4193418fbf64d107 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:43:51 +0900
Subject: [PATCH 08691/10326] Remove accuracy rounding at a ScoreProcessor
 level

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 2024290460..b81fa79345 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -337,7 +337,7 @@ namespace osu.Game.Rulesets.Scoring
             score.TotalScore = (long)Math.Round(GetStandardisedScore());
             score.Combo = Combo.Value;
             score.MaxCombo = HighestCombo.Value;
-            score.Accuracy = Math.Round(Accuracy.Value, 4);
+            score.Accuracy = Accuracy.Value;
             score.Rank = Rank.Value;
             score.Date = DateTimeOffset.Now;
 

From 630faa3b56e5a3b36577c695f906d006088e61e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:50:21 +0900
Subject: [PATCH 08692/10326] Add TODO marking incorrect EF core data type

As mentioned in the comment, we probably don't need to be storing this
in the database in the first place (as it should be able to be
calculated from the other statistics we have available to us). Something
to consider when we refactor the database backend.
---
 osu.Game/Scoring/ScoreInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index f5192f3a40..ef11c19e3f 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Scoring
         public long TotalScore { get; set; }
 
         [JsonProperty("accuracy")]
-        [Column(TypeName = "DECIMAL(1,4)")]
+        [Column(TypeName = "DECIMAL(1,4)")] // TODO: This data type is wrong (should contain more precision). But at the same time, we probably don't need to be storing this in the database.
         public double Accuracy { get; set; }
 
         [JsonIgnore]

From 77888ae6402c669a0f6330d698b6794bc9ff5539 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:51:20 +0900
Subject: [PATCH 08693/10326] Remove unnecessary using

---
 osu.Game/Utils/FormatUtils.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index 70a96367be..4c7702f04e 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.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 Humanizer;
 
 namespace osu.Game.Utils

From b4bccc19baaddaaa2c3f643da5ff15eb822b9c7d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 18:37:13 +0900
Subject: [PATCH 08694/10326] Refactor LegacySpriteText initialisation

---
 .../Skinning/Legacy/LegacySpinner.cs           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 6d4fbd7445..dd1c6cad77 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -76,18 +76,18 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 }
             });
 
-            bonusCounter = (LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText));
+            bonusCounter = (source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) as LegacySpriteText)?.With(c =>
+            {
+                c.Alpha = 0f;
+                c.Anchor = Anchor.TopCentre;
+                c.Origin = Anchor.Centre;
+                c.Font = c.Font.With(fixedWidth: false);
+                c.Scale = new Vector2(SPRITE_SCALE);
+                c.Y = SPINNER_TOP_OFFSET + 299;
+            });
 
             if (bonusCounter != null)
-            {
-                bonusCounter.Alpha = 0f;
-                bonusCounter.Anchor = Anchor.TopCentre;
-                bonusCounter.Origin = Anchor.Centre;
-                bonusCounter.Font = bonusCounter.Font.With(fixedWidth: false);
-                bonusCounter.Scale = new Vector2(SPRITE_SCALE);
-                bonusCounter.Y = SPINNER_TOP_OFFSET + 299;
                 overlayContainer.Add(bonusCounter);
-            }
         }
 
         private IBindable<double> gainedBonus;

From f6647de7693de11ad68b8316eb17483bd9bb3126 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 19:56:26 +0900
Subject: [PATCH 08695/10326] Add support for nudging objects in the editor
 using ctrl+arrow keys

Closes #12042.
---
 .../Components/ComposeBlueprintContainer.cs   | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 79f457c050..5ab557804e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
+using osu.Framework.Input.Events;
 using osu.Game.Audio;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
@@ -19,6 +20,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
@@ -70,6 +72,50 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (e.ControlPressed)
+            {
+                switch (e.Key)
+                {
+                    case Key.Left:
+                        moveSelection(new Vector2(-1, 0));
+                        return true;
+
+                    case Key.Right:
+                        moveSelection(new Vector2(1, 0));
+                        return true;
+
+                    case Key.Up:
+                        moveSelection(new Vector2(0, -1));
+                        return true;
+
+                    case Key.Down:
+                        moveSelection(new Vector2(0, 1));
+                        return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Move the current selection spatially by the specified delta, in gamefield coordinates (ie. the same coordinates as the blueprints).
+        /// </summary>
+        /// <param name="delta"></param>
+        private void moveSelection(Vector2 delta)
+        {
+            var firstBlueprint = SelectionHandler.SelectedBlueprints.FirstOrDefault();
+
+            if (firstBlueprint == null)
+                return;
+
+            // convert to game space coordinates
+            delta = firstBlueprint.ToScreenSpace(delta) - firstBlueprint.ToScreenSpace(Vector2.Zero);
+
+            SelectionHandler.HandleMovement(new MoveSelectionEvent(firstBlueprint, firstBlueprint.ScreenSpaceSelectionPoint + delta));
+        }
+
         private void updatePlacementNewCombo()
         {
             if (currentPlacement?.HitObject is IHasComboInformation c)

From bada1e7189973f09452ad51419abbb79650f9972 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 25 Mar 2021 15:00:06 +0300
Subject: [PATCH 08696/10326] Update legacy spinner bonus counter usage

---
 .../Skinning/Legacy/LegacySpinner.cs          | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index dd1c6cad77..064b7a4680 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -48,9 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            Container overlayContainer;
-
-            AddInternal(overlayContainer = new Container
+            AddInternal(new Container
             {
                 Depth = float.MinValue,
                 RelativeSizeAxes = Axes.Both,
@@ -73,21 +71,16 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Scale = new Vector2(SPRITE_SCALE),
                         Y = SPINNER_TOP_OFFSET + 115,
                     },
+                    bonusCounter = new LegacySpriteText(source, LegacyFont.Score)
+                    {
+                        Alpha = 0f,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Y = SPINNER_TOP_OFFSET + 299,
+                    }.With(s => s.Font = s.Font.With(fixedWidth: false)),
                 }
             });
-
-            bonusCounter = (source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) as LegacySpriteText)?.With(c =>
-            {
-                c.Alpha = 0f;
-                c.Anchor = Anchor.TopCentre;
-                c.Origin = Anchor.Centre;
-                c.Font = c.Font.With(fixedWidth: false);
-                c.Scale = new Vector2(SPRITE_SCALE);
-                c.Y = SPINNER_TOP_OFFSET + 299;
-            });
-
-            if (bonusCounter != null)
-                overlayContainer.Add(bonusCounter);
         }
 
         private IBindable<double> gainedBonus;
@@ -98,16 +91,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             base.LoadComplete();
 
-            if (bonusCounter != null)
+            gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
+            gainedBonus.BindValueChanged(bonus =>
             {
-                gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
-                gainedBonus.BindValueChanged(bonus =>
-                {
-                    bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
-                    bonusCounter.FadeOutFromOne(800, Easing.Out);
-                    bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
-                });
-            }
+                bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
+                bonusCounter.FadeOutFromOne(800, Easing.Out);
+                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+            });
 
             completed.BindValueChanged(onCompletedChanged, true);
 

From ce9130ca5065f4278af498e3949049c03d43dbbe Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 25 Mar 2021 17:38:55 +0100
Subject: [PATCH 08697/10326] Remove determinant limit

This has since been added into the framework through https://github.com/ppy/osu-framework/pull/4302
---
 .../Components/PathControlPointVisualiser.cs  | 39 +------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 0270485f31..348ec30266 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -158,48 +158,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     continue;
 
                 Vector2[] points = slider.Path.PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
-                if (points.Length == 3 && !validCircularArcSegment(points))
+                if (points.Length == 3 && circularArcBoundingBox(points).Area >= 640 * 480)
                     segmentStartPoint.Type.Value = PathType.Bezier;
             }
         }
 
-        /// <summary>
-        /// Returns whether the given points are arranged in a valid way. Invalid if points
-        /// are almost entirely linear - as this causes the radius to approach infinity,
-        /// or if the bounding box of the arc is too large.
-        /// </summary>
-        /// <param name="points">The three points that make up this circular arc segment.</param>
-        /// <returns></returns>
-        private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
-        {
-            float det = circularArcDeterminant(points);
-            RectangleF boundingBox = circularArcBoundingBox(points);
-
-            // Determinant limit prevents memory exhaustion as a result of approximating the subpath.
-            // Bounding box area limit prevents memory exhaustion as a result of drawing the texture.
-            return Math.Abs(det) > 0.001f && boundingBox.Area < 640 * 480;
-        }
-
-        /// <summary>
-        /// Computes the determinant of the circular arc segment defined by the given points.
-        /// </summary>
-        /// <param name="points">The three points defining the circular arc.</param>
-        /// <returns></returns>
-        private float circularArcDeterminant(IReadOnlyList<Vector2> points)
-        {
-            Vector2 a = points[0];
-            Vector2 b = points[1];
-            Vector2 c = points[2];
-
-            float maxLength = points.Max(p => p.Length);
-
-            Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
-            Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
-            Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
-
-            return (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
-        }
-
         /// <summary>
         /// Computes the bounding box of the circular arc segment defined by the given points.
         /// </summary>

From aa2c1ee85ed80ff380b8868606a12169dcbfe758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 25 Mar 2021 23:20:10 +0100
Subject: [PATCH 08698/10326] Add new beatmap search filter row "General"

---
 .../API/Requests/SearchBeatmapSetsRequest.cs  |  8 ++++++++
 .../BeatmapListingFilterControl.cs            |  2 ++
 .../BeatmapListingSearchControl.cs            |  4 ++++
 .../Overlays/BeatmapListing/SearchGeneral.cs  | 19 +++++++++++++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 osu.Game/Overlays/BeatmapListing/SearchGeneral.cs

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 5360d36f3d..f1cb02fb10 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -15,6 +15,9 @@ namespace osu.Game.Online.API.Requests
 {
     public class SearchBeatmapSetsRequest : APIRequest<SearchBeatmapSetsResponse>
     {
+        [CanBeNull]
+        public IReadOnlyCollection<SearchGeneral> General { get; }
+
         public SearchCategory SearchCategory { get; }
 
         public SortCriteria SortCriteria { get; }
@@ -45,6 +48,7 @@ namespace osu.Game.Online.API.Requests
             string query,
             RulesetInfo ruleset,
             Cursor cursor = null,
+            IReadOnlyCollection<SearchGeneral> general = null,
             SearchCategory searchCategory = SearchCategory.Any,
             SortCriteria sortCriteria = SortCriteria.Ranked,
             SortDirection sortDirection = SortDirection.Descending,
@@ -59,6 +63,7 @@ namespace osu.Game.Online.API.Requests
             this.ruleset = ruleset;
             this.cursor = cursor;
 
+            General = general;
             SearchCategory = searchCategory;
             SortCriteria = sortCriteria;
             SortDirection = sortDirection;
@@ -75,6 +80,9 @@ namespace osu.Game.Online.API.Requests
             var req = base.CreateWebRequest();
             req.AddParameter("q", query);
 
+            if (General != null && General.Any())
+                req.AddParameter("c", string.Join('.', General.Select(e => e.ToString().ToLowerInvariant())));
+
             if (ruleset.ID.HasValue)
                 req.AddParameter("m", ruleset.ID.Value.ToString());
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index bcc5a91677..1935a250b7 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -134,6 +134,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 queueUpdateSearch(true);
             });
 
+            searchControl.General.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Ruleset.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Category.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Genre.BindValueChanged(_ => queueUpdateSearch());
@@ -187,6 +188,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 searchControl.Query.Value,
                 searchControl.Ruleset.Value,
                 lastResponse?.Cursor,
+                searchControl.General,
                 searchControl.Category.Value,
                 sortControl.Current.Value,
                 sortControl.SortDirection.Value,
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index b138a5ac52..1576431d40 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<string> Query => textBox.Current;
 
+        public BindableList<SearchGeneral> General => generalFilter.Current;
+
         public Bindable<RulesetInfo> Ruleset => modeFilter.Current;
 
         public Bindable<SearchCategory> Category => categoryFilter.Current;
@@ -61,6 +63,7 @@ namespace osu.Game.Overlays.BeatmapListing
         }
 
         private readonly BeatmapSearchTextBox textBox;
+        private readonly BeatmapSearchMultipleSelectionFilterRow<SearchGeneral> generalFilter;
         private readonly BeatmapSearchRulesetFilterRow modeFilter;
         private readonly BeatmapSearchFilterRow<SearchCategory> categoryFilter;
         private readonly BeatmapSearchFilterRow<SearchGenre> genreFilter;
@@ -123,6 +126,7 @@ namespace osu.Game.Overlays.BeatmapListing
                                 Padding = new MarginPadding { Horizontal = 10 },
                                 Children = new Drawable[]
                                 {
+                                    generalFilter = new BeatmapSearchMultipleSelectionFilterRow<SearchGeneral>(@"General"),
                                     modeFilter = new BeatmapSearchRulesetFilterRow(),
                                     categoryFilter = new BeatmapSearchFilterRow<SearchCategory>(@"Categories"),
                                     genreFilter = new BeatmapSearchFilterRow<SearchGenre>(@"Genre"),
diff --git a/osu.Game/Overlays/BeatmapListing/SearchGeneral.cs b/osu.Game/Overlays/BeatmapListing/SearchGeneral.cs
new file mode 100644
index 0000000000..175942c626
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SearchGeneral.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.BeatmapListing
+{
+    public enum SearchGeneral
+    {
+        [Description("Recommended difficulty")]
+        Recommended,
+
+        [Description("Include converted beatmaps")]
+        Converts,
+
+        [Description("Subscribed mappers")]
+        Follows
+    }
+}

From 558f8fa51e2480b0db48dfa5285541992b7c5414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 25 Mar 2021 23:20:26 +0100
Subject: [PATCH 08699/10326] Adjust testscene

---
 .../UserInterface/TestSceneBeatmapListingSearchControl.cs      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index 9602758ffc..abd1baf0ac 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         public void SetUp() => Schedule(() =>
         {
             OsuSpriteText query;
+            OsuSpriteText general;
             OsuSpriteText ruleset;
             OsuSpriteText category;
             OsuSpriteText genre;
@@ -58,6 +59,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Children = new Drawable[]
                     {
                         query = new OsuSpriteText(),
+                        general = new OsuSpriteText(),
                         ruleset = new OsuSpriteText(),
                         category = new OsuSpriteText(),
                         genre = new OsuSpriteText(),
@@ -71,6 +73,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
 
             control.Query.BindValueChanged(q => query.Text = $"Query: {q.NewValue}", true);
+            control.General.BindCollectionChanged((u, v) => general.Text = $"General: {(control.General.Any() ? string.Join('.', control.General.Select(i => i.ToString().ToLowerInvariant())) : "")}", true);
             control.Ruleset.BindValueChanged(r => ruleset.Text = $"Ruleset: {r.NewValue}", true);
             control.Category.BindValueChanged(c => category.Text = $"Category: {c.NewValue}", true);
             control.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);

From 1c1af981443df917fe27ace265c41c9f6a515760 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 26 Mar 2021 11:47:41 +0900
Subject: [PATCH 08700/10326] Update values

---
 osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index ab9b7f4847..afd94f4570 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(8.7212283220504574d, "diffcalc-test")]
-        [TestCase(1.3212137310562277d, "zero-length-sliders")]
+        [TestCase(8.7212283220412345d, "diffcalc-test")]
+        [TestCase(1.3212137158641493d, "zero-length-sliders")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new OsuModDoubleTime());
 

From 51f0477df4744b6702dff18740974e3a17913be3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 26 Mar 2021 04:42:46 +0100
Subject: [PATCH 08701/10326] Move bounding box logic to framework

---
 .../Components/PathControlPointVisualiser.cs  | 81 +------------------
 1 file changed, 4 insertions(+), 77 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 348ec30266..dd39014bb6 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -16,6 +16,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -157,87 +158,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 if (segmentStartPoint.Type.Value != PathType.PerfectCurve)
                     continue;
 
-                Vector2[] points = slider.Path.PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
-                if (points.Length == 3 && circularArcBoundingBox(points).Area >= 640 * 480)
+                ReadOnlySpan<Vector2> points = slider.Path.PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
+                RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
+                if (points.Length == 3 && boundingBox.Area >= 640 * 480)
                     segmentStartPoint.Type.Value = PathType.Bezier;
             }
         }
 
-        /// <summary>
-        /// Computes the bounding box of the circular arc segment defined by the given points.
-        /// </summary>
-        /// <param name="points">The three points defining the circular arc.</param>
-        /// <returns></returns>
-        private RectangleF circularArcBoundingBox(IReadOnlyList<Vector2> points)
-        {
-            Vector2 a = points[0];
-            Vector2 b = points[1];
-            Vector2 c = points[2];
-
-            // See: https://en.wikipedia.org/wiki/Circumscribed_circle#Cartesian_coordinates_2
-            float d = 2 * (a.X * (b - c).Y + b.X * (c - a).Y + c.X * (a - b).Y);
-            float aSq = a.LengthSquared;
-            float bSq = b.LengthSquared;
-            float cSq = c.LengthSquared;
-
-            Vector2 center = new Vector2(
-                aSq * (b - c).Y + bSq * (c - a).Y + cSq * (a - b).Y,
-                aSq * (c - b).X + bSq * (a - c).X + cSq * (b - a).X) / d;
-
-            Vector2 dA = a - center;
-            Vector2 dC = c - center;
-
-            float r = dA.Length;
-
-            double thetaStart = Math.Atan2(dA.Y, dA.X);
-            double thetaEnd = Math.Atan2(dC.Y, dC.X);
-
-            while (thetaEnd < thetaStart)
-                thetaEnd += 2 * Math.PI;
-
-            // Decide in which direction to draw the circle, depending on which side of
-            // AC B lies.
-            Vector2 orthoAtoC = c - a;
-            orthoAtoC = new Vector2(orthoAtoC.Y, -orthoAtoC.X);
-            bool clockwise = Vector2.Dot(orthoAtoC, b - a) >= 0;
-
-            if (clockwise)
-            {
-                if (thetaEnd < thetaStart)
-                    thetaEnd += Math.PI * 2;
-            }
-            else
-            {
-                if (thetaStart < thetaEnd)
-                    thetaStart += Math.PI * 2;
-            }
-
-            List<Vector2> boundingBoxPoints = new List<Vector2>(points);
-
-            bool includes0Degrees = 0 > thetaStart && 0 < thetaEnd;
-            bool includes90Degrees = Math.PI / 2 > thetaStart && Math.PI / 2 < thetaEnd;
-            bool includes180Degrees = Math.PI > thetaStart && Math.PI < thetaEnd;
-            bool includes270Degrees = Math.PI * 1.5f > thetaStart && Math.PI * 1.5f < thetaEnd;
-
-            if (!clockwise)
-            {
-                includes0Degrees = 0 < thetaStart && 0 > thetaEnd;
-                includes90Degrees = Math.PI / 2 < thetaStart && Math.PI / 2 > thetaEnd;
-                includes180Degrees = Math.PI < thetaStart && Math.PI > thetaEnd;
-                includes270Degrees = Math.PI * 1.5f < thetaStart && Math.PI * 1.5f > thetaEnd;
-            }
-
-            if (includes0Degrees) boundingBoxPoints.Add(center + new Vector2(1, 0) * r);
-            if (includes90Degrees) boundingBoxPoints.Add(center + new Vector2(0, 1) * r);
-            if (includes180Degrees) boundingBoxPoints.Add(center + new Vector2(-1, 0) * r);
-            if (includes270Degrees) boundingBoxPoints.Add(center + new Vector2(0, -1) * r);
-
-            float width = Math.Abs(boundingBoxPoints.Max(p => p.X) - boundingBoxPoints.Min(p => p.X));
-            float height = Math.Abs(boundingBoxPoints.Max(p => p.Y) - boundingBoxPoints.Min(p => p.Y));
-
-            return new RectangleF(slider.Position, new Vector2(width, height));
-        }
-
         private void selectPiece(PathControlPointPiece piece, MouseButtonEvent e)
         {
             if (e.Button == MouseButton.Left && inputManager.CurrentState.Keyboard.ControlPressed)

From 6a7f9261684602ab3b4633839a1bea1e0acd035c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 13:06:30 +0900
Subject: [PATCH 08702/10326] Change rounding to use a more general flooring
 approach

---
 osu.Game.Tests/NonVisual/FormatUtilsTest.cs | 2 +-
 osu.Game/Utils/FormatUtils.cs               | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs b/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
index eb738f5f67..46d8f4fec4 100644
--- a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
+++ b/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Tests.NonVisual
         [TestCase(0, "0.00%")]
         [TestCase(0.01, "1.00%")]
         [TestCase(0.9899, "98.99%")]
-        [TestCase(0.989999, "99.00%")]
+        [TestCase(0.989999, "98.99%")]
         [TestCase(0.99, "99.00%")]
         [TestCase(0.9999, "99.99%")]
         [TestCase(0.999999, "99.99%")]
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index 4c7702f04e..8312b9e756 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.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 Humanizer;
 
 namespace osu.Game.Utils
@@ -14,9 +15,11 @@ namespace osu.Game.Utils
         /// <returns>formatted accuracy in percentage</returns>
         public static string FormatAccuracy(this double accuracy)
         {
-            // we don't ever want to show 100% when the accuracy is below perfect, even if it rounds to 100%.
-            if (accuracy < 1 && accuracy > 0.9999)
-                accuracy = 0.9999;
+            // for the sake of display purposes, we don't want to show a user a "rounded up" percentage to the next whole number.
+            // ie. a score which gets 89.99999% shouldn't ever show as 90%.
+            // the reasoning for this is that cutoffs for grade increases are at whole numbers and displaying the required
+            // percentile with a non-matching grade is confusing.
+            accuracy = Math.Floor(accuracy * 10000) / 10000;
 
             return $"{accuracy:0.00%}";
         }

From 4909eaf890715b10a6728270673a7c629f4a7493 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 13:09:53 +0900
Subject: [PATCH 08703/10326] Add the ability to specify format provider (to
 make tests culture invariant)

---
 osu.Game.Tests/NonVisual/FormatUtilsTest.cs | 3 ++-
 osu.Game/Utils/FormatUtils.cs               | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs b/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
index 46d8f4fec4..df095ddee3 100644
--- a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
+++ b/osu.Game.Tests/NonVisual/FormatUtilsTest.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.Globalization;
 using NUnit.Framework;
 using osu.Game.Utils;
 
@@ -19,7 +20,7 @@ namespace osu.Game.Tests.NonVisual
         [TestCase(1, "100.00%")]
         public void TestAccuracyFormatting(double input, string expectedOutput)
         {
-            Assert.AreEqual(expectedOutput, input.FormatAccuracy());
+            Assert.AreEqual(expectedOutput, input.FormatAccuracy(CultureInfo.InvariantCulture));
         }
     }
 }
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index 8312b9e756..df1b6cf00d 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Globalization;
 using Humanizer;
 
 namespace osu.Game.Utils
@@ -11,9 +12,10 @@ namespace osu.Game.Utils
         /// <summary>
         /// Turns the provided accuracy into a percentage with 2 decimal places.
         /// </summary>
-        /// <param name="accuracy">The accuracy to be formatted</param>
+        /// <param name="accuracy">The accuracy to be formatted.</param>
+        /// <param name="formatProvider">An optional format provider.</param>
         /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this double accuracy)
+        public static string FormatAccuracy(this double accuracy, IFormatProvider formatProvider = null)
         {
             // for the sake of display purposes, we don't want to show a user a "rounded up" percentage to the next whole number.
             // ie. a score which gets 89.99999% shouldn't ever show as 90%.
@@ -21,7 +23,7 @@ namespace osu.Game.Utils
             // percentile with a non-matching grade is confusing.
             accuracy = Math.Floor(accuracy * 10000) / 10000;
 
-            return $"{accuracy:0.00%}";
+            return accuracy.ToString("0.00%", formatProvider ?? CultureInfo.CurrentCulture);
         }
 
         /// <summary>

From 17a0b19ee71c09f52baafabdadec7bd71aaafee8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 14:04:09 +0900
Subject: [PATCH 08704/10326] Always set progress before updating download
 state

Without doing so, a state change may read from an old progress value.
---
 osu.Game/Online/DownloadTrackingComposite.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 52042c266b..d9599481e7 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -123,13 +123,13 @@ namespace osu.Game.Online
             {
                 if (attachedRequest.Progress == 1)
                 {
-                    State.Value = DownloadState.Importing;
                     Progress.Value = 1;
+                    State.Value = DownloadState.Importing;
                 }
                 else
                 {
-                    State.Value = DownloadState.Downloading;
                     Progress.Value = attachedRequest.Progress;
+                    State.Value = DownloadState.Downloading;
 
                     attachedRequest.Failure += onRequestFailure;
                     attachedRequest.DownloadProgressed += onRequestProgress;

From 0a889fafc4fe0df932aeca07939cf4a6cc34c1f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 14:04:39 +0900
Subject: [PATCH 08705/10326] Don't send progress updates when not in a
 downloading state

This is mostly just a sanity/debounce check.
---
 osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
index d6f4c45a75..8278162353 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
@@ -45,6 +45,9 @@ namespace osu.Game.Online.Rooms
 
             Progress.BindValueChanged(_ =>
             {
+                if (State.Value != DownloadState.Downloading)
+                    return;
+
                 // incoming progress changes are going to be at a very high rate.
                 // we don't want to flood the network with this, so rate limit how often we send progress updates.
                 if (progressUpdate?.Completed != false)

From 7faca766e45b0d369326a9bdc26422bb065c825c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 14:49:02 +0900
Subject: [PATCH 08706/10326] Fix crash on attempting to join lobby using key
 press during a pending join

Closes https://github.com/ppy/osu/issues/12040.
---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index f13d623eae..5a28d0f968 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -170,7 +170,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
         private void joinRequested(Room room)
         {
-            Debug.Assert(joiningRoomOperation == null);
+            if (joiningRoomOperation != null)
+                return;
+
             joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
 
             RoomManager?.JoinRoom(room, r =>

From 6a4157d1939f513d0ed1167192b9b7007e8db1d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 16:13:43 +0900
Subject: [PATCH 08707/10326] Remove unused using statement

---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 5a28d0f968..f24577a8a5 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;

From 2bea69456e8bfbcdf780bd6e8adab5002913f3e3 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Fri, 26 Mar 2021 15:24:33 +0800
Subject: [PATCH 08708/10326] remove implementations

---
 .../Objects/CatchHitObject.cs                 |  2 --
 .../Objects/ManiaHitObject.cs                 |  2 --
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs |  2 --
 osu.Game/Rulesets/Objects/HitObject.cs        |  2 --
 osu.Game/Screens/Edit/Editor.cs               | 23 +++----------------
 5 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 631b50d686..ae45182960 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -120,7 +120,5 @@ namespace osu.Game.Rulesets.Catch.Objects
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
-
-        public override string ToEditorString() => (IndexInCurrentCombo + 1).ToString();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
index c43d223335..27bf50493d 100644
--- a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Rulesets.Mania.Objects
 
         protected override HitWindows CreateHitWindows() => new ManiaHitWindows();
 
-        public override string ToEditorString() => $"{StartTime}|{Column}";
-
         #region LegacyBeatmapEncoder
 
         float IHasXPosition.X => Column;
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index e784d13084..22b64af3df 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -130,7 +130,5 @@ namespace osu.Game.Rulesets.Osu.Objects
         }
 
         protected override HitWindows CreateHitWindows() => new OsuHitWindows();
-
-        public override string ToEditorString() => (IndexInCurrentCombo + 1).ToString();
     }
 }
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index fa7b2811cc..826d411822 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -168,8 +168,6 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         [NotNull]
         protected virtual HitWindows CreateHitWindows() => new HitWindows();
-
-        public virtual string ToEditorString() => string.Empty;
     }
 
     public static class HitObjectExtensions
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index a6e84d59a7..c2a9fd49b1 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -63,9 +63,6 @@ namespace osu.Game.Screens.Edit
 
         protected bool HasUnsavedChanges => lastSavedHash != changeHandler.CurrentStateHash;
 
-        [Resolved]
-        private GameHost host { get; set; }
-
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -110,7 +107,7 @@ namespace osu.Game.Screens.Edit
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OsuConfigManager config)
+        private void load(OsuColour colours, GameHost host, OsuConfigManager config)
         {
             if (Beatmap.Value is DummyWorkingBeatmap)
             {
@@ -547,24 +544,10 @@ namespace osu.Game.Screens.Edit
 
         protected void Copy()
         {
-            var builder = new StringBuilder();
-            const string suffix = " - ";
-
             if (editorBeatmap.SelectedHitObjects.Count == 0)
-            {
-                builder.Append(clock.CurrentTime.ToEditorFormattedString());
-            }
-            else
-            {
-                var orderedHitObjects = editorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime);
-                builder.Append(orderedHitObjects.FirstOrDefault().StartTime.ToEditorFormattedString());
-                builder.Append($" ({string.Join(',', orderedHitObjects.Select(h => h.ToEditorString()))})");
+                return;
 
-                clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
-            }
-
-            builder.Append(suffix);
-            host.GetClipboard()?.SetText(builder.ToString());
+            clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
         }
 
         protected void Paste()

From b8b7eb4c4b8e0af156ebdad46a83ecbe3427b0b2 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Fri, 26 Mar 2021 15:25:20 +0800
Subject: [PATCH 08709/10326] refactor logic to its own component and handle
 hit object to string conversion to its ruleset-specific composers

---
 .../Edit/ManiaHitObjectComposer.cs            |  3 ++
 .../Edit/OsuHitObjectComposer.cs              |  3 ++
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  2 +
 .../Screens/Edit/Compose/ComposeScreen.cs     | 23 +++++++++-
 osu.Game/Screens/Edit/SelectionHelper.cs      | 46 +++++++++++++++++++
 5 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Edit/SelectionHelper.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 324670c4b2..4cb34a217c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -119,5 +119,8 @@ namespace osu.Game.Rulesets.Mania.Edit
                     beatSnapGrid.SelectionTimeRange = null;
             }
         }
+
+        public override IEnumerable<string> ConvertSelectionToString()
+            => EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().Select(h => $"{h.StartTime}|{h.Column}");
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 0490e8b8ce..1943f52c73 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -82,6 +82,9 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new OsuBlueprintContainer(this);
 
+        public override IEnumerable<string> ConvertSelectionToString()
+            => selectedHitObjects.Cast<OsuHitObject>().Select(h => (h.IndexInCurrentCombo + 1).ToString());
+
         private DistanceSnapGrid distanceSnapGrid;
         private Container distanceSnapGridContainer;
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index e927951d0a..eee16043e4 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -438,6 +438,8 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public abstract bool CursorInPlacementArea { get; }
 
+        public virtual IEnumerable<string> ConvertSelectionToString() => Array.Empty<string>();
+
         #region IPositionSnapProvider
 
         public abstract SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 81b1195a40..c63ef11c74 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -6,6 +6,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
@@ -14,16 +16,19 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Edit.Compose
 {
-    public class ComposeScreen : EditorScreenWithTimeline
+    public class ComposeScreen : EditorScreenWithTimeline, IKeyBindingHandler<PlatformAction>
     {
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
 
         private HitObjectComposer composer;
 
+        private SelectionHelper helper;
+
         public ComposeScreen()
             : base(EditorScreenMode.Compose)
         {
+            Add(helper = new SelectionHelper());
         }
 
         private Ruleset ruleset;
@@ -72,5 +77,21 @@ namespace osu.Game.Screens.Edit.Compose
             // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
             return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(content));
         }
+
+        public bool OnPressed(PlatformAction action)
+        {
+            switch (action.ActionType)
+            {
+                case PlatformActionType.Copy:
+                    helper.CopySelectionToClipboard();
+                    return false;
+                default:
+                    return false;
+            };
+        }
+
+        public void OnReleased(PlatformAction action)
+        {
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/SelectionHelper.cs b/osu.Game/Screens/Edit/SelectionHelper.cs
new file mode 100644
index 0000000000..e0eb868c9f
--- /dev/null
+++ b/osu.Game/Screens/Edit/SelectionHelper.cs
@@ -0,0 +1,46 @@
+using System.Linq;
+using System.Text;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+using osu.Game.Extensions;
+using osu.Game.Rulesets.Edit;
+
+namespace osu.Game.Screens.Edit
+{
+    public class SelectionHelper : Component
+    {
+        [Resolved]
+        private GameHost host { get; set; }
+
+        [Resolved]
+        private EditorClock clock { get; set; }
+
+        [Resolved]
+        private EditorBeatmap editorBeatmap { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private HitObjectComposer composer { get; set; }
+
+        public void CopySelectionToClipboard()
+        {
+            host.GetClipboard().SetText(formatSelectionAsString());
+        }
+
+        private string formatSelectionAsString()
+        {
+            const string separator = " - ";
+            var builder = new StringBuilder();
+
+            if (!editorBeatmap.SelectedHitObjects.Any())
+            {
+                builder.Append($"{clock.CurrentTime.ToEditorFormattedString()}{separator}");
+                return builder.ToString();
+            };
+
+            builder.Append(editorBeatmap.SelectedHitObjects.First().StartTime.ToEditorFormattedString());
+            builder.Append($" ({string.Join(',', composer.ConvertSelectionToString())}){separator}");
+            return builder.ToString();
+        }
+    }
+}

From cb48e5f15822a7aab53317bc8a1b938c777f8544 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 16:33:16 +0900
Subject: [PATCH 08710/10326] Fix timeline not visually ordering hitobjects in
 a stable way

---
 .../Components/HitObjectOrderedSelectionContainer.cs      | 8 +++++++-
 .../Components/Timeline/TimelineBlueprintContainer.cs     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
index 9e95fe4fa1..d612cf3fe0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
@@ -71,7 +71,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // Put earlier blueprints towards the end of the list, so they handle input first
             int i = yObj.HitObject.StartTime.CompareTo(xObj.HitObject.StartTime);
-            return i == 0 ? CompareReverseChildID(x, y) : i;
+
+            if (i != 0) return i;
+
+            // Fall back to end time if the start time is equal.
+            i = yObj.HitObject.GetEndTime().CompareTo(xObj.HitObject.GetEndTime());
+
+            return i == 0 ? CompareReverseChildID(y, x) : i;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index cec851b5bb..3623f8ad8e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             Stack<HitObject> currentConcurrentObjects = new Stack<HitObject>();
 
-            foreach (var b in SelectionBlueprints.OrderBy(b => b.HitObject.StartTime).ThenBy(b => b.HitObject.GetEndTime()))
+            foreach (var b in SelectionBlueprints.Reverse())
             {
                 // remove objects from the stack as long as their end time is in the past.
                 while (currentConcurrentObjects.TryPeek(out HitObject hitObject))

From 374f8c5e229b314a2f7cf1de9b29285cccbff0d2 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Fri, 26 Mar 2021 15:33:28 +0800
Subject: [PATCH 08711/10326] move to compose namespace and add license header

---
 osu.Game/Screens/Edit/{ => Compose}/SelectionHelper.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename osu.Game/Screens/Edit/{ => Compose}/SelectionHelper.cs (85%)

diff --git a/osu.Game/Screens/Edit/SelectionHelper.cs b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
similarity index 85%
rename from osu.Game/Screens/Edit/SelectionHelper.cs
rename to osu.Game/Screens/Edit/Compose/SelectionHelper.cs
index e0eb868c9f..39d6d57a2a 100644
--- a/osu.Game/Screens/Edit/SelectionHelper.cs
+++ b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
@@ -1,4 +1,7 @@
-using System.Linq;
+// Copyright (c) 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.Text;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -6,7 +9,7 @@ using osu.Framework.Platform;
 using osu.Game.Extensions;
 using osu.Game.Rulesets.Edit;
 
-namespace osu.Game.Screens.Edit
+namespace osu.Game.Screens.Edit.Compose
 {
     public class SelectionHelper : Component
     {

From 71a0616861916129456e0a301d0386269c51cd6c Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Fri, 26 Mar 2021 15:34:45 +0800
Subject: [PATCH 08712/10326] remove extra semi colons

---
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs   | 2 +-
 osu.Game/Screens/Edit/Compose/SelectionHelper.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index c63ef11c74..b249ae9bcd 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Screens.Edit.Compose
                     return false;
                 default:
                     return false;
-            };
+            }
         }
 
         public void OnReleased(PlatformAction action)
diff --git a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
index 39d6d57a2a..2e172c12dc 100644
--- a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
+++ b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Edit.Compose
             {
                 builder.Append($"{clock.CurrentTime.ToEditorFormattedString()}{separator}");
                 return builder.ToString();
-            };
+            }
 
             builder.Append(editorBeatmap.SelectedHitObjects.First().StartTime.ToEditorFormattedString());
             builder.Append($" ({string.Join(',', composer.ConvertSelectionToString())}){separator}");

From 1b6e08b3eb34f80afc5126c2af1efb7ba16d8d19 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 26 Mar 2021 10:35:46 +0300
Subject: [PATCH 08713/10326] Fix incorrect default font overlap for score and
 combo

---
 osu.Game/Skinning/LegacySkinExtensions.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index d08f50bccb..d8fb1fa664 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -97,10 +97,10 @@ namespace osu.Game.Skinning
             switch (font)
             {
                 case LegacyFont.Score:
-                    return source.GetConfig<LegacySetting, float>(LegacySetting.ScoreOverlap)?.Value ?? -2f;
+                    return source.GetConfig<LegacySetting, float>(LegacySetting.ScoreOverlap)?.Value ?? 0f;
 
                 case LegacyFont.Combo:
-                    return source.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
+                    return source.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? 0f;
 
                 case LegacyFont.HitCircle:
                     return source.GetConfig<LegacySetting, float>(LegacySetting.HitCircleOverlap)?.Value ?? -2f;

From c96321206a0e5157d8864e5d84204706f918ce30 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Fri, 26 Mar 2021 16:17:24 +0800
Subject: [PATCH 08714/10326] fix appveyor complaints

---
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs | 3 ++-
 osu.Game/Screens/Edit/Editor.cs                | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index b249ae9bcd..16043ff64b 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Edit.Compose
 
         private HitObjectComposer composer;
 
-        private SelectionHelper helper;
+        private readonly SelectionHelper helper;
 
         public ComposeScreen()
             : base(EditorScreenMode.Compose)
@@ -85,6 +85,7 @@ namespace osu.Game.Screens.Edit.Compose
                 case PlatformActionType.Copy:
                     helper.CopySelectionToClipboard();
                     return false;
+
                 default:
                     return false;
             }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index c2a9fd49b1..d9ba12d331 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -17,12 +16,10 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
-using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
@@ -31,7 +28,6 @@ using osu.Game.IO.Serialization;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
@@ -107,7 +103,7 @@ namespace osu.Game.Screens.Edit
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, GameHost host, OsuConfigManager config)
+        private void load(OsuColour colours, OsuConfigManager config)
         {
             if (Beatmap.Value is DummyWorkingBeatmap)
             {

From 5d272bef9778d590b84e1e97edfde3d64a8b68de Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Fri, 26 Mar 2021 16:28:04 +0100
Subject: [PATCH 08715/10326] Remember ContolPoint positions instead of
 recalculating them

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index ae92b12fd2..b9578b4ae9 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -197,8 +197,13 @@ namespace osu.Game.Rulesets.Osu.Edit
             Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
             Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
 
+            Queue<Vector2> oldControlPoints = new Queue<Vector2>();
+
             foreach (var point in slider.Path.ControlPoints)
+            {
+                oldControlPoints.Enqueue(point.Position.Value);
                 point.Position.Value *= pathRelativeDeltaScale;
+            }
 
             //if sliderhead or sliderend end up outside playfield, revert scaling.
             Quad scaledQuad = getSurroundingQuad(new OsuHitObject[] { slider });
@@ -207,8 +212,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             if (xInBounds && yInBounds)
                 return true;
 
-            foreach (var point in slider.Path.ControlPoints)
-                point.Position.Value *= new Vector2(1 / pathRelativeDeltaScale.X, 1 / pathRelativeDeltaScale.Y);
+            foreach(var point in slider.Path.ControlPoints)
+                point.Position.Value = oldControlPoints.Dequeue();
 
             return true;
         }

From 25ea60cb92c6d4e40b7c442d68d2fd17b4a7056d Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Fri, 26 Mar 2021 16:39:13 +0100
Subject: [PATCH 08716/10326] Remove return values from HandleScale submethods

---
 .../Edit/OsuSelectionHandler.cs                 | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index b9578b4ae9..8a657d0f9b 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -143,19 +143,18 @@ namespace osu.Game.Rulesets.Osu.Edit
             adjustScaleFromAnchor(ref scale, reference);
 
             var hitObjects = selectedMovableObjects;
-            bool result;
 
             // for the time being, allow resizing of slider paths only if the slider is
             // the only hit object selected. with a group selection, it's likely the user
             // is not looking to change the duration of the slider but expand the whole pattern.
             if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
-                result = scaleSlider(slider, scale);
+                scaleSlider(slider, scale);
             else
-                result = scaleHitObjects(hitObjects, reference, scale);
+                scaleHitObjects(hitObjects, reference, scale);
 
             moveSelectionInBounds();
 
-            return result;
+            return true;
         }
 
         private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
@@ -192,7 +191,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             return true;
         }
 
-        private bool scaleSlider(Slider slider, Vector2 scale)
+        private void scaleSlider(Slider slider, Vector2 scale)
         {
             Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
             Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
@@ -210,15 +209,13 @@ namespace osu.Game.Rulesets.Osu.Edit
             (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
             if (xInBounds && yInBounds)
-                return true;
+                return;
 
             foreach(var point in slider.Path.ControlPoints)
                 point.Position.Value = oldControlPoints.Dequeue();
-
-            return true;
         }
 
-        private bool scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
+        private void scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
         {
             scale = getClampedScale(hitObjects, reference, scale);
 
@@ -241,8 +238,6 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 h.Position = newPosition;
             }
-
-            return true;
         }
 
         private (bool X, bool Y) isQuadInBounds(Quad quad)

From 305c2e31cfc7f7e6e30f94d561415619b37c87e0 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Fri, 26 Mar 2021 16:45:05 +0100
Subject: [PATCH 08717/10326] Clarify todo comment

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 8a657d0f9b..24b0d22c1a 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -283,7 +283,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             Quad selectionQuad = getSurroundingQuad(hitObjects);
 
-            //todo: this is not always correct for selections involving sliders
+            //todo: this is not always correct for selections involving sliders. This approximation assumes each point is scaled independently, but sliderends move with the sliderhead.
             Quad scaledQuad = new Quad(selectionQuad.TopLeft.X + xOffset, selectionQuad.TopLeft.Y + yOffset, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
 
             //max Size -> playfield bounds

From a50c4be8ab806e4f8875cd286a01d6cf5a3a2a7f Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Fri, 26 Mar 2021 17:41:36 +0100
Subject: [PATCH 08718/10326] Add missing space

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 24b0d22c1a..3a4a37c8cc 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             if (xInBounds && yInBounds)
                 return;
 
-            foreach(var point in slider.Path.ControlPoints)
+            foreach (var point in slider.Path.ControlPoints)
                 point.Position.Value = oldControlPoints.Dequeue();
         }
 

From 21398e25b5b939ae40e15be42bb6ffb93365d315 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Sat, 27 Mar 2021 10:02:21 +0800
Subject: [PATCH 08719/10326] null check composer and ensure the correct start
 time from selected hit objects

---
 osu.Game/Screens/Edit/Compose/SelectionHelper.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
index 2e172c12dc..a01a9e0144 100644
--- a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
+++ b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
@@ -41,8 +41,10 @@ namespace osu.Game.Screens.Edit.Compose
                 return builder.ToString();
             }
 
-            builder.Append(editorBeatmap.SelectedHitObjects.First().StartTime.ToEditorFormattedString());
-            builder.Append($" ({string.Join(',', composer.ConvertSelectionToString())}){separator}");
+            string hitObjects = composer != null ? string.Join(',', composer.ConvertSelectionToString()) : string.Empty;
+
+            builder.Append(editorBeatmap.SelectedHitObjects.Min(h => h.StartTime).ToEditorFormattedString());
+            builder.Append($" ({hitObjects}){separator}");
             return builder.ToString();
         }
     }

From 010db8968fa664cb7d0a44ec0da727c3a9776773 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 27 Mar 2021 18:38:23 +1100
Subject: [PATCH 08720/10326] Adjust wording of xmldoc

---
 .../Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
index fa578d55f0..1bf0d8a222 100644
--- a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
+++ b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
         public readonly double DeltaTime;
 
         /// <summary>
-        /// Start time of <see cref="BaseObject"/>.
+        /// Clockrate adjusted start time of <see cref="BaseObject"/>.
         /// </summary>
         public readonly double StartTime;
 

From 068f00d8a035834b7e21bec15318b6aafd48f9fc Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 27 Mar 2021 18:38:43 +1100
Subject: [PATCH 08721/10326] Add EndTime to DifficultyHitObject for future
 convenience

---
 .../Difficulty/Preprocessing/DifficultyHitObject.cs         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
index 1bf0d8a222..ece8219071 100644
--- a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
+++ b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
@@ -30,6 +30,11 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
         /// </summary>
         public readonly double StartTime;
 
+        /// <summary>
+        /// Clockrate adjusted start time of <see cref="BaseObject"/>.
+        /// </summary>
+        public readonly double EndTime;
+
         /// <summary>
         /// Creates a new <see cref="DifficultyHitObject"/>.
         /// </summary>
@@ -42,6 +47,7 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
             LastObject = lastObject;
             DeltaTime = (hitObject.StartTime - lastObject.StartTime) / clockRate;
             StartTime = hitObject.StartTime / clockRate;
+            EndTime = hitObject.GetEndTime() / clockRate;
         }
     }
 }

From d58ef5310bf534f76a8d10170cdd71cd098bace0 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 28 Mar 2021 17:36:22 +0200
Subject: [PATCH 08722/10326] Add verify tab

Currently empty, but works.
---
 .../Input/Bindings/GlobalActionContainer.cs   |   3 +
 osu.Game/Screens/Edit/Editor.cs               |   9 +
 osu.Game/Screens/Edit/EditorScreenMode.cs     |   3 +
 osu.Game/Screens/Edit/Verify/Issue.cs         |  10 +
 osu.Game/Screens/Edit/Verify/IssueTable.cs    | 191 ++++++++++++++++++
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  |  68 +++++++
 6 files changed, 284 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Verify/Issue.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/IssueTable.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/VerifyScreen.cs

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 8ccdb9249e..6705d3ee61 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -193,6 +193,9 @@ namespace osu.Game.Input.Bindings
         [Description("Timing mode")]
         EditorTimingMode,
 
+        [Description("Verify mode")]
+        EditorVerifyMode,
+
         [Description("Hold for HUD")]
         HoldForHUD,
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 0c24eb6a4d..57499bf219 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -36,6 +36,7 @@ using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Design;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Edit.Timing;
+using osu.Game.Screens.Edit.Verify;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
 using osuTK.Graphics;
@@ -445,6 +446,10 @@ namespace osu.Game.Screens.Edit
                     menuBar.Mode.Value = EditorScreenMode.SongSetup;
                     return true;
 
+                case GlobalAction.EditorVerifyMode:
+                    menuBar.Mode.Value = EditorScreenMode.Verify;
+                    return true;
+
                 default:
                     return false;
             }
@@ -632,6 +637,10 @@ namespace osu.Game.Screens.Edit
                     case EditorScreenMode.Timing:
                         currentScreen = new TimingScreen();
                         break;
+
+                    case EditorScreenMode.Verify:
+                        currentScreen = new VerifyScreen();
+                        break;
                 }
 
                 LoadComponentAsync(currentScreen, newScreen =>
diff --git a/osu.Game/Screens/Edit/EditorScreenMode.cs b/osu.Game/Screens/Edit/EditorScreenMode.cs
index 12cfcc605b..ecd39f9b57 100644
--- a/osu.Game/Screens/Edit/EditorScreenMode.cs
+++ b/osu.Game/Screens/Edit/EditorScreenMode.cs
@@ -18,5 +18,8 @@ namespace osu.Game.Screens.Edit
 
         [Description("timing")]
         Timing,
+
+        [Description("verify")]
+        Verify,
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/Issue.cs b/osu.Game/Screens/Edit/Verify/Issue.cs
new file mode 100644
index 0000000000..25e913d819
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Issue.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.Edit.Verify
+{
+    public class Issue
+    {
+        public readonly double Time;
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
new file mode 100644
index 0000000000..6476cebe48
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -0,0 +1,191 @@
+// Copyright (c) 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.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
+using osu.Game.Extensions;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public class IssueTable : TableContainer
+    {
+        private const float horizontal_inset = 20;
+        private const float row_height = 25;
+        private const int text_size = 14;
+
+        private readonly FillFlowContainer backgroundFlow;
+
+        public IssueTable()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Padding = new MarginPadding { Horizontal = horizontal_inset };
+            RowSize = new Dimension(GridSizeMode.Absolute, row_height);
+
+            AddInternal(backgroundFlow = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Depth = 1f,
+                Padding = new MarginPadding { Horizontal = -horizontal_inset },
+                Margin = new MarginPadding { Top = row_height }
+            });
+        }
+
+        public IEnumerable<Issue> Issues
+        {
+            set
+            {
+                Content = null;
+                backgroundFlow.Clear();
+
+                if (value?.Any() != true)
+                    return;
+
+                foreach (var issue in value)
+                {
+                    backgroundFlow.Add(new IssueTable.RowBackground(issue));
+                }
+
+                Columns = createHeaders();
+                Content = value.Select((g, i) => createContent(i, g)).ToArray().ToRectangular();
+            }
+        }
+
+        private TableColumn[] createHeaders()
+        {
+            var columns = new List<TableColumn>
+            {
+                new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn("Time", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn(),
+                new TableColumn("Attributes", Anchor.CentreLeft),
+            };
+
+            return columns.ToArray();
+        }
+
+        private Drawable[] createContent(int index, Issue issue) => new Drawable[]
+        {
+            new OsuSpriteText
+            {
+                Text = $"#{index + 1}",
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Margin = new MarginPadding(10)
+            },
+            new OsuSpriteText
+            {
+                Text = issue.Time.ToEditorFormattedString(),
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
+            },
+            null,
+            null //new ControlGroupAttributes(issue),
+        };
+
+        public class RowBackground : OsuClickableContainer
+        {
+            private readonly Issue issue;
+            private const int fade_duration = 100;
+
+            private readonly Box hoveredBackground;
+
+            [Resolved]
+            private EditorClock clock { get; set; }
+
+            [Resolved]
+            private Bindable<Issue> selectedIssue { get; set; }
+
+            public RowBackground(Issue issue)
+            {
+                this.issue = issue;
+                RelativeSizeAxes = Axes.X;
+                Height = 25;
+
+                AlwaysPresent = true;
+
+                CornerRadius = 3;
+                Masking = true;
+
+                Children = new Drawable[]
+                {
+                    hoveredBackground = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                    },
+                };
+
+                Action = () =>
+                {
+                    selectedIssue.Value = issue;
+                    clock.SeekSmoothlyTo(issue.Time);
+                };
+            }
+
+            private Color4 colourHover;
+            private Color4 colourSelected;
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                hoveredBackground.Colour = colourHover = colours.BlueDarker;
+                colourSelected = colours.YellowDarker;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                selectedIssue.BindValueChanged(group => { Selected = issue == group.NewValue; }, true);
+            }
+
+            private bool selected;
+
+            protected bool Selected
+            {
+                get => selected;
+                set
+                {
+                    if (value == selected)
+                        return;
+
+                    selected = value;
+                    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()
+            {
+                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
+
+                if (selected || IsHovered)
+                    hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
+                else
+                    hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
new file mode 100644
index 0000000000..c15cefae83
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -0,0 +1,68 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public class VerifyScreen : EditorScreenWithTimeline
+    {
+        public VerifyScreen()
+            : base(EditorScreenMode.Verify)
+        {
+        }
+
+        protected override Drawable CreateMainContent() => new GridContainer
+        {
+            RelativeSizeAxes = Axes.Both,
+            ColumnDimensions = new[]
+            {
+                new Dimension(),
+                new Dimension(GridSizeMode.Absolute, 200),
+            },
+            Content = new[]
+            {
+                new Drawable[]
+                {
+                    new ControlPointList()
+                },
+            }
+        };
+
+        public class ControlPointList : CompositeDrawable
+        {
+            private IssueTable table;
+
+            [Resolved]
+            private EditorClock clock { get; set; }
+
+            [Resolved]
+            protected EditorBeatmap Beatmap { get; private set; }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = colours.Gray0,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new OsuScrollContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Child = table = new IssueTable(),
+                    }
+                };
+            }
+        }
+    }
+}

From f49481e308b68176e560a283870d6dbcbd43c581 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 26 Mar 2021 12:48:21 +0300
Subject: [PATCH 08723/10326] Add old skin spinner SPM background for testing

---
 .../Resources/old-skin/spinner-rpm.png          | Bin 0 -> 10583 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-rpm.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-rpm.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-rpm.png
new file mode 100644
index 0000000000000000000000000000000000000000..73753554f74fab988c7e5d8c7722d22928120682
GIT binary patch
literal 10583
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
OL~0}S;k9ZGvHt_&ZUYhk

literal 0
HcmV?d00001


From ecb66ad2e2213e52f3460964be7a2c8f21c69a08 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 29 Mar 2021 15:33:54 +0900
Subject: [PATCH 08724/10326] Fix up xmldoc

---
 .../Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
index ece8219071..576fbb2af0 100644
--- a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
+++ b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
         public readonly double StartTime;
 
         /// <summary>
-        /// Clockrate adjusted start time of <see cref="BaseObject"/>.
+        /// Clockrate adjusted end time of <see cref="BaseObject"/>.
         /// </summary>
         public readonly double EndTime;
 

From 699a317b445ff557163d91143682ab6f6c5faf8d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 18:07:47 +0900
Subject: [PATCH 08725/10326] Fix chat scroll sticking visually when scrolling
 beyond bottom extent

---
 osu.Game/Overlays/Chat/DrawableChannel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 86ce724390..5f9c00b36a 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -275,7 +275,8 @@ namespace osu.Game.Overlays.Chat
                     {
                         if (!UserScrolling)
                         {
-                            ScrollToEnd();
+                            if (Current < ScrollableExtent)
+                                ScrollToEnd();
                             lastExtent = ScrollableExtent;
                         }
                     });

From 9a02f3868c2105e51dbd7e64ce4443d08938d02e Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Mon, 29 Mar 2021 17:29:05 +0800
Subject: [PATCH 08726/10326] return a string instead

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 4 ++--
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs     | 4 ++--
 osu.Game/Rulesets/Edit/HitObjectComposer.cs            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 4cb34a217c..d9570bf8be 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             }
         }
 
-        public override IEnumerable<string> ConvertSelectionToString()
-            => EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().Select(h => $"{h.StartTime}|{h.Column}");
+        public override string ConvertSelectionToString()
+            => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().OrderBy(h => h.StartTime).Select(h => $"{h.StartTime}|{h.Column}"));
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 1943f52c73..396fd41377 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -82,8 +82,8 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new OsuBlueprintContainer(this);
 
-        public override IEnumerable<string> ConvertSelectionToString()
-            => selectedHitObjects.Cast<OsuHitObject>().Select(h => (h.IndexInCurrentCombo + 1).ToString());
+        public override string ConvertSelectionToString()
+            => string.Join(',', selectedHitObjects.Cast<OsuHitObject>().OrderBy(h => h.StartTime).Select(h => (h.IndexInCurrentCombo + 1).ToString()));
 
         private DistanceSnapGrid distanceSnapGrid;
         private Container distanceSnapGridContainer;
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index eee16043e4..736fc47dee 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -438,7 +438,7 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public abstract bool CursorInPlacementArea { get; }
 
-        public virtual IEnumerable<string> ConvertSelectionToString() => Array.Empty<string>();
+        public virtual string ConvertSelectionToString() => string.Empty;
 
         #region IPositionSnapProvider
 

From cdb779f764bb09dcba1784f66fc87aab9debfd8b Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Mon, 29 Mar 2021 17:30:23 +0800
Subject: [PATCH 08727/10326] move copy logic inside ComposeScreen

---
 .../Screens/Edit/Compose/ComposeScreen.cs     | 37 ++++++++++----
 .../Screens/Edit/Compose/SelectionHelper.cs   | 51 -------------------
 2 files changed, 26 insertions(+), 62 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Compose/SelectionHelper.cs

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 16043ff64b..f6ce5a4e3d 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -2,13 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
+using System.Linq;
+using System.Text;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Platform;
 using osu.Game.Beatmaps;
+using osu.Game.Extensions;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
@@ -21,14 +25,17 @@ namespace osu.Game.Screens.Edit.Compose
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
 
-        private HitObjectComposer composer;
+        [Resolved]
+        private GameHost host { get; set; }
 
-        private readonly SelectionHelper helper;
+        [Resolved]
+        private EditorClock clock { get; set; }
+
+        private HitObjectComposer composer;
 
         public ComposeScreen()
             : base(EditorScreenMode.Compose)
         {
-            Add(helper = new SelectionHelper());
         }
 
         private Ruleset ruleset;
@@ -78,17 +85,25 @@ namespace osu.Game.Screens.Edit.Compose
             return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(content));
         }
 
+        private string formatSelectionAsString()
+        {
+            var builder = new StringBuilder();
+            builder.Append(EditorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime).FirstOrDefault()?.StartTime.ToEditorFormattedString() ?? clock.CurrentTime.ToEditorFormattedString());
+
+            if (EditorBeatmap.SelectedHitObjects.Any() && composer != null)
+                builder.Append($" ({composer.ConvertSelectionToString()})");
+
+            builder.Append(" - ");
+
+            return builder.ToString();
+        }
+
         public bool OnPressed(PlatformAction action)
         {
-            switch (action.ActionType)
-            {
-                case PlatformActionType.Copy:
-                    helper.CopySelectionToClipboard();
-                    return false;
+            if (action.ActionType == PlatformActionType.Copy)
+                host.GetClipboard().SetText(formatSelectionAsString());
 
-                default:
-                    return false;
-            }
+            return false;
         }
 
         public void OnReleased(PlatformAction action)
diff --git a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
deleted file mode 100644
index a01a9e0144..0000000000
--- a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
+++ /dev/null
@@ -1,51 +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.Text;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Platform;
-using osu.Game.Extensions;
-using osu.Game.Rulesets.Edit;
-
-namespace osu.Game.Screens.Edit.Compose
-{
-    public class SelectionHelper : Component
-    {
-        [Resolved]
-        private GameHost host { get; set; }
-
-        [Resolved]
-        private EditorClock clock { get; set; }
-
-        [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; }
-
-        [Resolved(CanBeNull = true)]
-        private HitObjectComposer composer { get; set; }
-
-        public void CopySelectionToClipboard()
-        {
-            host.GetClipboard().SetText(formatSelectionAsString());
-        }
-
-        private string formatSelectionAsString()
-        {
-            const string separator = " - ";
-            var builder = new StringBuilder();
-
-            if (!editorBeatmap.SelectedHitObjects.Any())
-            {
-                builder.Append($"{clock.CurrentTime.ToEditorFormattedString()}{separator}");
-                return builder.ToString();
-            }
-
-            string hitObjects = composer != null ? string.Join(',', composer.ConvertSelectionToString()) : string.Empty;
-
-            builder.Append(editorBeatmap.SelectedHitObjects.Min(h => h.StartTime).ToEditorFormattedString());
-            builder.Append($" ({hitObjects}){separator}");
-            return builder.ToString();
-        }
-    }
-}

From 90ab765cf519be8be956175f492f3c7aff4e0f0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 18:46:32 +0900
Subject: [PATCH 08728/10326] Reorder methods and surround with region

---
 .../Screens/Edit/Compose/ComposeScreen.cs     | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index f6ce5a4e3d..1d52cc60fd 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -85,6 +85,20 @@ namespace osu.Game.Screens.Edit.Compose
             return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(content));
         }
 
+        #region Input Handling
+
+        public bool OnPressed(PlatformAction action)
+        {
+            if (action.ActionType == PlatformActionType.Copy)
+                host.GetClipboard().SetText(formatSelectionAsString());
+
+            return false;
+        }
+
+        public void OnReleased(PlatformAction action)
+        {
+        }
+
         private string formatSelectionAsString()
         {
             var builder = new StringBuilder();
@@ -98,16 +112,6 @@ namespace osu.Game.Screens.Edit.Compose
             return builder.ToString();
         }
 
-        public bool OnPressed(PlatformAction action)
-        {
-            if (action.ActionType == PlatformActionType.Copy)
-                host.GetClipboard().SetText(formatSelectionAsString());
-
-            return false;
-        }
-
-        public void OnReleased(PlatformAction action)
-        {
-        }
+        #endregion
     }
 }

From 3909eda095ce5f6fcfdc7afa7e3ea4fdaf826540 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 18:51:28 +0900
Subject: [PATCH 08729/10326] Avoid using a StringBuilder

---
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 1d52cc60fd..61056aeced 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -101,15 +100,15 @@ namespace osu.Game.Screens.Edit.Compose
 
         private string formatSelectionAsString()
         {
-            var builder = new StringBuilder();
-            builder.Append(EditorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime).FirstOrDefault()?.StartTime.ToEditorFormattedString() ?? clock.CurrentTime.ToEditorFormattedString());
+            if (composer == null)
+                return string.Empty;
 
-            if (EditorBeatmap.SelectedHitObjects.Any() && composer != null)
-                builder.Append($" ({composer.ConvertSelectionToString()})");
+            double displayTime = EditorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime).FirstOrDefault()?.StartTime ?? clock.CurrentTime;
+            string selectionAsString = composer.ConvertSelectionToString();
 
-            builder.Append(" - ");
-
-            return builder.ToString();
+            return !string.IsNullOrEmpty(selectionAsString)
+                ? $"{displayTime.ToEditorFormattedString()} ({selectionAsString}) - "
+                : $"{displayTime.ToEditorFormattedString()} - ";
         }
 
         #endregion

From 1d99a63f17f8e339097552dc51fbc27bef00b5c7 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 29 Mar 2021 14:02:53 +0200
Subject: [PATCH 08730/10326] Limit minimum size for single slider scaling

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 3a4a37c8cc..6350bd7190 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -194,6 +194,10 @@ namespace osu.Game.Rulesets.Osu.Edit
         private void scaleSlider(Slider slider, Vector2 scale)
         {
             Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+
+            // Limit minimum distance between control points  after scaling to almost 0. Less than 0 causes the slider to flip, exactly 0 causes a crash through division by 0.
+            scale = Vector2.ComponentMax(new Vector2(Precision.FLOAT_EPSILON), sliderQuad.Size + scale) - sliderQuad.Size;
+
             Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
 
             Queue<Vector2> oldControlPoints = new Queue<Vector2>();

From 17b16d4f8914b9989b2f116e334e26fd0a4c39fe Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 29 Mar 2021 14:17:30 +0200
Subject: [PATCH 08731/10326] Clarify purpose of getClampedScale()

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 6350bd7190..07643bd75e 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -274,7 +274,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         }
 
         /// <summary>
-        /// Clamp scale where selection does not exceed playfield bounds or flip.
+        /// Clamp scale for multi-object-scaling where selection does not exceed playfield bounds or flip.
         /// </summary>
         /// <param name="hitObjects">The hitobjects to be scaled</param>
         /// <param name="reference">The anchor from which the scale operation is performed</param>

From badf5ee4a2403998b4508907425630b21ea9e392 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Mar 2021 15:03:10 +0200
Subject: [PATCH 08732/10326] Fix stable.json file directory location due to
 the change of how TournamentStorage works

---
 .../NonVisual/IPCLocationTest.cs              | 68 +++++++++++++++++++
 osu.Game.Tournament/IO/TournamentStorage.cs   | 21 +++---
 osu.Game.Tournament/Models/StableInfo.cs      |  6 +-
 3 files changed, 85 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs

diff --git a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
new file mode 100644
index 0000000000..29586dfdec
--- /dev/null
+++ b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
@@ -0,0 +1,68 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Platform;
+using osu.Game.Tournament.IO;
+using osu.Game.Tournament.IPC;
+
+namespace osu.Game.Tournament.Tests.NonVisual
+{
+    [TestFixture]
+    public class IPCLocationTest
+    {
+        [Test]
+        public void CheckIPCLocation()
+        {
+            // don't use clean run because files are being written before osu! launches.
+            using (HeadlessGameHost host = new HeadlessGameHost(nameof(CheckIPCLocation)))
+            {
+                string basePath = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(CheckIPCLocation));
+
+                // Set up a fake IPC client for the IPC Storage to switch to.
+                string testCeDir = Path.Combine(basePath, "stable-ce");
+                Directory.CreateDirectory(testCeDir);
+
+                string ipcFile = Path.Combine(testCeDir, "ipc.txt");
+                File.WriteAllText(ipcFile, string.Empty);
+
+                try
+                {
+                    var osu = loadOsu(host);
+                    TournamentStorage storage = (TournamentStorage)osu.Dependencies.Get<Storage>();
+                    FileBasedIPC ipc = (FileBasedIPC)osu.Dependencies.Get<MatchIPCInfo>();
+
+                    Assert.True(ipc.SetIPCLocation(testCeDir));
+                    Assert.True(storage.AllTournaments.Exists("stable.json"));
+                }
+                finally
+                {
+                    host.Storage.DeleteDirectory(testCeDir);
+                    host.Storage.DeleteDirectory("tournaments");
+                    host.Exit();
+                }
+            }
+        }
+
+        private TournamentGameBase loadOsu(GameHost host)
+        {
+            var osu = new TournamentGameBase();
+            Task.Run(() => host.Run(osu));
+            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
+            return osu;
+        }
+
+        private static void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 90000)
+        {
+            Task task = Task.Run(() =>
+            {
+                while (!result()) Thread.Sleep(200);
+            });
+
+            Assert.IsTrue(task.Wait(timeout), failureMessage);
+        }
+    }
+}
diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 5d9fed6288..044b60bbd5 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.IO;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.IO;
-using System.IO;
-using System.Collections.Generic;
 using osu.Game.Tournament.Configuration;
 
 namespace osu.Game.Tournament.IO
@@ -15,7 +15,12 @@ namespace osu.Game.Tournament.IO
     {
         private const string default_tournament = "default";
         private readonly Storage storage;
-        private readonly Storage allTournaments;
+
+        /// <summary>
+        /// The storage where all tournaments are located.
+        /// </summary>
+        public readonly Storage AllTournaments;
+
         private readonly TournamentStorageManager storageConfig;
         public readonly Bindable<string> CurrentTournament;
 
@@ -23,16 +28,16 @@ namespace osu.Game.Tournament.IO
             : base(storage.GetStorageForDirectory("tournaments"), string.Empty)
         {
             this.storage = storage;
-            allTournaments = UnderlyingStorage;
+            AllTournaments = UnderlyingStorage;
 
             storageConfig = new TournamentStorageManager(storage);
 
             if (storage.Exists("tournament.ini"))
             {
-                ChangeTargetStorage(allTournaments.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
+                ChangeTargetStorage(AllTournaments.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
             }
             else
-                Migrate(allTournaments.GetStorageForDirectory(default_tournament));
+                Migrate(AllTournaments.GetStorageForDirectory(default_tournament));
 
             CurrentTournament = storageConfig.GetBindable<string>(StorageConfig.CurrentTournament);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
@@ -42,11 +47,11 @@ namespace osu.Game.Tournament.IO
 
         private void updateTournament(ValueChangedEvent<string> newTournament)
         {
-            ChangeTargetStorage(allTournaments.GetStorageForDirectory(newTournament.NewValue));
+            ChangeTargetStorage(AllTournaments.GetStorageForDirectory(newTournament.NewValue));
             Logger.Log("Changing tournament storage: " + GetFullPath(string.Empty));
         }
 
-        public IEnumerable<string> ListTournaments() => allTournaments.GetDirectories(string.Empty);
+        public IEnumerable<string> ListTournaments() => AllTournaments.GetDirectories(string.Empty);
 
         public override void Migrate(Storage newStorage)
         {
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 0b0050a245..d390f88d59 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using Newtonsoft.Json;
 using osu.Framework.Platform;
+using osu.Game.Tournament.IO;
 
 namespace osu.Game.Tournament.Models
 {
@@ -24,13 +25,14 @@ namespace osu.Game.Tournament.Models
         /// </summary>
         public event Action OnStableInfoSaved;
 
-        private const string config_path = "tournament/stable.json";
+        private const string config_path = "stable.json";
 
         private readonly Storage storage;
 
         public StableInfo(Storage storage)
         {
-            this.storage = storage;
+            TournamentStorage tStorage = (TournamentStorage)storage;
+            this.storage = tStorage.AllTournaments;
 
             if (!storage.Exists(config_path))
                 return;

From 36364a449249fb42289e82e1e8d6c05105a43885 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 22:12:49 +0900
Subject: [PATCH 08733/10326] Update framework

---
 osu.Android.props                             | 2 +-
 osu.Game/Input/Handlers/ReplayInputHandler.cs | 2 --
 osu.Game/osu.Game.csproj                      | 2 +-
 osu.iOS.props                                 | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 75ac298626..3682a44b9f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.323.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.329.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/Input/Handlers/ReplayInputHandler.cs b/osu.Game/Input/Handlers/ReplayInputHandler.cs
index 93ed3ca884..fba1bee0b8 100644
--- a/osu.Game/Input/Handlers/ReplayInputHandler.cs
+++ b/osu.Game/Input/Handlers/ReplayInputHandler.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Input.Handlers
 
         public override bool IsActive => true;
 
-        public override int Priority => 0;
-
         public class ReplayState<T> : IInput
             where T : struct
         {
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b90c938a8b..35b0827715 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.323.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.329.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ce182a3054..ceb46eae87 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.Framework.iOS" Version="2021.323.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.329.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.323.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.329.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From d84c9251e6d4d6569e5f895a7cf6943c2c722467 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 22:17:24 +0900
Subject: [PATCH 08734/10326] Update nuget packages

---
 osu.Game/osu.Game.csproj | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 35b0827715..6d571218fc 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,20 +18,20 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="DiffPlex" Version="1.6.3" />
+    <PackageReference Include="DiffPlex" Version="1.7.0" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.329.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="Sentry" Version="3.0.7" />
+    <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 6c5a10a7449a24fdd6932c6cb8ba99c7d98affd6 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Mar 2021 15:27:25 +0200
Subject: [PATCH 08735/10326] Add missing license header

---
 osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
index 29586dfdec..086ed54435 100644
--- a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.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.
+
 using System;
 using System.IO;
 using System.Threading;

From 70d5b616f28bb8916bb9dda0a9e1810b942d8afb Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 29 Mar 2021 15:49:49 +0200
Subject: [PATCH 08736/10326] Add scaling path type recovery

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 871339ae7b..da484b9782 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             base.OnOperationEnded();
             referenceOrigin = null;
+            referencePathTypes = null;
         }
 
         public override bool HandleMovement(MoveSelectionEvent moveEvent) =>
@@ -43,6 +44,12 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </summary>
         private Vector2? referenceOrigin;
 
+        /// <summary>
+        /// During a transform, the initial path types of a single selected slider are stored so they
+        /// can be maintained throughout the operation.
+        /// </summary>
+        private List<PathType?> referencePathTypes;
+
         public override bool HandleReverse()
         {
             var hitObjects = EditorBeatmap.SelectedHitObjects;
@@ -141,11 +148,17 @@ namespace osu.Game.Rulesets.Osu.Edit
             // is not looking to change the duration of the slider but expand the whole pattern.
             if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
             {
+                referencePathTypes ??= slider.Path.ControlPoints.Select(p => p.Type.Value).ToList();
+
                 Quad quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
                 Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / quad.Width, 1 + scale.Y / quad.Height);
 
                 foreach (var point in slider.Path.ControlPoints)
                     point.Position.Value *= pathRelativeDeltaScale;
+
+                // Maintain the path types in case they were defaulted to bezier at some point during scaling
+                for (int i = 0; i < slider.Path.ControlPoints.Count; ++i)
+                    slider.Path.ControlPoints[i].Type.Value = referencePathTypes[i];
             }
             else
             {

From 6f01070408fb5fad37d33765a22997d1189d9cc8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 23:06:29 +0900
Subject: [PATCH 08737/10326] Add weird android package requirements

---
 osu.Android/osu.Android.csproj                               | 5 +++++
 .../osu.Game.Rulesets.Catch.Tests.Android.csproj             | 5 +++++
 .../osu.Game.Rulesets.Mania.Tests.Android.csproj             | 5 +++++
 .../osu.Game.Rulesets.Osu.Tests.Android.csproj               | 5 +++++
 .../osu.Game.Rulesets.Taiko.Tests.Android.csproj             | 5 +++++
 osu.Game.Tests.Android/osu.Game.Tests.Android.csproj         | 3 +++
 6 files changed, 28 insertions(+)

diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index a2638e95c8..2051beae21 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -53,5 +53,10 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\lazer.png" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
index 88b420ffad..2e6c10a02e 100644
--- a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
@@ -35,5 +35,10 @@
       <Name>osu.Game</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
index 0e557cb260..8c134c7114 100644
--- a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
@@ -35,5 +35,10 @@
       <Name>osu.Game</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
index dcf1573522..22fa605176 100644
--- a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
@@ -35,5 +35,10 @@
       <Name>osu.Game</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
index 392442b713..a48110b354 100644
--- a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
@@ -35,5 +35,10 @@
       <Name>osu.Game</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index c3d9cb5875..bf256f486c 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -75,6 +75,9 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="DeepEqual" Version="2.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

From 2d344ae6ffd9a5dee8e47096060a1c4f949b677e Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Mar 2021 16:16:50 +0200
Subject: [PATCH 08738/10326] wait for IPC to be populated in the test

Did not see this when locally running test until after a couple of subsequent runs.
---
 osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
index 086ed54435..4791da93c6 100644
--- a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Tournament.Tests.NonVisual
                     TournamentStorage storage = (TournamentStorage)osu.Dependencies.Get<Storage>();
                     FileBasedIPC ipc = (FileBasedIPC)osu.Dependencies.Get<MatchIPCInfo>();
 
+                    waitForOrAssert(() => ipc != null, @"ipc could not be populated in a reasonable amount of time");
+
                     Assert.True(ipc.SetIPCLocation(testCeDir));
                     Assert.True(storage.AllTournaments.Exists("stable.json"));
                 }

From 804ffe9f48954378ef688bd9d3d58120d0ccbf21 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 30 Mar 2021 09:00:09 +0900
Subject: [PATCH 08739/10326] Fix inspections

---
 .../Online/TestAPIModJsonSerialization.cs     | 22 +++++++++----------
 .../Screens/Editors/TeamEditorScreen.cs       |  8 +++++--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index ab24a72a12..77f910c144 100644
--- a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Online
 
             var deserialized = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
 
-            Assert.That(deserialized.Acronym, Is.EqualTo(apiMod.Acronym));
+            Assert.That(deserialized?.Acronym, Is.EqualTo(apiMod.Acronym));
         }
 
         [Test]
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Online
 
             var deserialized = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
 
-            Assert.That(deserialized.Settings, Contains.Key("test_setting").With.ContainValue(2.0));
+            Assert.That(deserialized?.Settings, Contains.Key("test_setting").With.ContainValue(2.0));
         }
 
         [Test]
@@ -44,9 +44,9 @@ namespace osu.Game.Tests.Online
             var apiMod = new APIMod(new TestMod { TestSetting = { Value = 2 } });
 
             var deserialized = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
-            var converted = (TestMod)deserialized.ToMod(new TestRuleset());
+            var converted = (TestMod)deserialized?.ToMod(new TestRuleset());
 
-            Assert.That(converted.TestSetting.Value, Is.EqualTo(2));
+            Assert.That(converted?.TestSetting.Value, Is.EqualTo(2));
         }
 
         [Test]
@@ -61,11 +61,11 @@ namespace osu.Game.Tests.Online
             });
 
             var deserialised = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
-            var converted = (TestModTimeRamp)deserialised.ToMod(new TestRuleset());
+            var converted = (TestModTimeRamp)deserialised?.ToMod(new TestRuleset());
 
-            Assert.That(converted.AdjustPitch.Value, Is.EqualTo(false));
-            Assert.That(converted.InitialRate.Value, Is.EqualTo(1.25));
-            Assert.That(converted.FinalRate.Value, Is.EqualTo(0.25));
+            Assert.That(converted?.AdjustPitch.Value, Is.EqualTo(false));
+            Assert.That(converted?.InitialRate.Value, Is.EqualTo(1.25));
+            Assert.That(converted?.FinalRate.Value, Is.EqualTo(0.25));
         }
 
         [Test]
@@ -78,10 +78,10 @@ namespace osu.Game.Tests.Online
             });
 
             var deserialised = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
-            var converted = (TestModDifficultyAdjust)deserialised.ToMod(new TestRuleset());
+            var converted = (TestModDifficultyAdjust)deserialised?.ToMod(new TestRuleset());
 
-            Assert.That(converted.ExtendedLimits.Value, Is.True);
-            Assert.That(converted.OverallDifficulty.Value, Is.EqualTo(11));
+            Assert.That(converted?.ExtendedLimits.Value, Is.True);
+            Assert.That(converted?.OverallDifficulty.Value, Is.EqualTo(11));
         }
 
         private class TestRuleset : Ruleset
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 582f72429b..f051823541 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -43,12 +43,16 @@ namespace osu.Game.Tournament.Screens.Editors
         private void addAllCountries()
         {
             List<TournamentTeam> countries;
+
             using (Stream stream = game.Resources.GetStream("Resources/countries.json"))
             using (var sr = new StreamReader(stream))
                 countries = JsonConvert.DeserializeObject<List<TournamentTeam>>(sr.ReadToEnd());
 
-            foreach (var c in countries)
-                Storage.Add(c);
+            if (countries != null)
+            {
+                foreach (var c in countries)
+                    Storage.Add(c);
+            }
         }
 
         public class TeamRow : CompositeDrawable, IModelBacked<TournamentTeam>

From 69db0a55938176ca9ad4b67cb2922c00d896f934 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 30 Mar 2021 09:03:32 +0900
Subject: [PATCH 08740/10326] Countries should not be null (internal game
 resource)

---
 .../Screens/Editors/TeamEditorScreen.cs                | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index f051823541..aa1be143ea 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Newtonsoft.Json;
@@ -48,11 +49,10 @@ namespace osu.Game.Tournament.Screens.Editors
             using (var sr = new StreamReader(stream))
                 countries = JsonConvert.DeserializeObject<List<TournamentTeam>>(sr.ReadToEnd());
 
-            if (countries != null)
-            {
-                foreach (var c in countries)
-                    Storage.Add(c);
-            }
+            Debug.Assert(countries != null);
+
+            foreach (var c in countries)
+                Storage.Add(c);
         }
 
         public class TeamRow : CompositeDrawable, IModelBacked<TournamentTeam>

From 0bf84e473d9b83a0cce1b6ba15831901baedcbc5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 26 Mar 2021 13:09:44 +0300
Subject: [PATCH 08741/10326] Refactor spinner SPM counter for skinning
 purposes

---
 .../Mods/TestSceneOsuModAutoplay.cs           | 10 +--
 .../Mods/TestSceneOsuModSpunOut.cs            |  4 +-
 .../TestSceneSpinnerRotation.cs               | 10 +--
 .../Objects/Drawables/DrawableSpinner.cs      | 48 +++++-------
 .../Skinning/Default/DefaultSpinner.cs        | 64 ++++++++++++++++
 ...rSpmCounter.cs => SpinnerSpmCalculator.cs} | 74 +++++--------------
 6 files changed, 114 insertions(+), 96 deletions(-)
 rename osu.Game.Rulesets.Osu/Skinning/Default/{SpinnerSpmCounter.cs => SpinnerSpmCalculator.cs} (61%)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
index 856b6554b9..0ba775e5c7 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 
         private void runSpmTest(Mod mod)
         {
-            SpinnerSpmCounter spmCounter = null;
+            SpinnerSpmCalculator spmCalculator = null;
 
             CreateModTest(new ModTestData
             {
@@ -53,13 +53,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 PassCondition = () => Player.ScoreProcessor.JudgedHits >= 1
             });
 
-            AddUntilStep("fetch SPM counter", () =>
+            AddUntilStep("fetch SPM calculator", () =>
             {
-                spmCounter = this.ChildrenOfType<SpinnerSpmCounter>().SingleOrDefault();
-                return spmCounter != null;
+                spmCalculator = this.ChildrenOfType<SpinnerSpmCalculator>().SingleOrDefault();
+                return spmCalculator != null;
             });
 
-            AddUntilStep("SPM is correct", () => Precision.AlmostEquals(spmCounter.SpinsPerMinute, 477, 5));
+            AddUntilStep("SPM is correct", () => Precision.AlmostEquals(spmCalculator.Result.Value, 477, 5));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
index 7df5ca0f7c..24e69703a6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
@@ -47,8 +47,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 Beatmap = singleSpinnerBeatmap,
                 PassCondition = () =>
                 {
-                    var counter = Player.ChildrenOfType<SpinnerSpmCounter>().SingleOrDefault();
-                    return counter != null && Precision.AlmostEquals(counter.SpinsPerMinute, 286, 1);
+                    var counter = Player.ChildrenOfType<SpinnerSpmCalculator>().SingleOrDefault();
+                    return counter != null && Precision.AlmostEquals(counter.Result.Value, 286, 1);
                 }
             });
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index ac8d5c81bc..14c709cae1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -168,13 +168,13 @@ namespace osu.Game.Rulesets.Osu.Tests
             double estimatedSpm = 0;
 
             addSeekStep(1000);
-            AddStep("retrieve spm", () => estimatedSpm = drawableSpinner.SpmCounter.SpinsPerMinute);
+            AddStep("retrieve spm", () => estimatedSpm = drawableSpinner.SpinsPerMinute.Value);
 
             addSeekStep(2000);
-            AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpmCounter.SpinsPerMinute, estimatedSpm, 1.0));
+            AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpinsPerMinute.Value, estimatedSpm, 1.0));
 
             addSeekStep(1000);
-            AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpmCounter.SpinsPerMinute, estimatedSpm, 1.0));
+            AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpinsPerMinute.Value, estimatedSpm, 1.0));
         }
 
         [TestCase(0.5)]
@@ -188,7 +188,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("retrieve spinner state", () =>
             {
                 expectedProgress = drawableSpinner.Progress;
-                expectedSpm = drawableSpinner.SpmCounter.SpinsPerMinute;
+                expectedSpm = drawableSpinner.SpinsPerMinute.Value;
             });
 
             addSeekStep(0);
@@ -197,7 +197,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addSeekStep(1000);
             AddAssert("progress almost same", () => Precision.AlmostEquals(expectedProgress, drawableSpinner.Progress, 0.05));
-            AddAssert("spm almost same", () => Precision.AlmostEquals(expectedSpm, drawableSpinner.SpmCounter.SpinsPerMinute, 2.0));
+            AddAssert("spm almost same", () => Precision.AlmostEquals(expectedSpm, drawableSpinner.SpinsPerMinute.Value, 2.0));
         }
 
         private Replay applyRateAdjustment(Replay scoreReplay, double rate) => new Replay
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 39e78a14aa..1a89fc308e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public new OsuSpinnerJudgementResult Result => (OsuSpinnerJudgementResult)base.Result;
 
         public SpinnerRotationTracker RotationTracker { get; private set; }
-        public SpinnerSpmCounter SpmCounter { get; private set; }
+
+        private SpinnerSpmCalculator spmCalculator;
 
         private Container<DrawableSpinnerTick> ticks;
         private PausableSkinnableSound spinningSample;
@@ -43,7 +44,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         public IBindable<double> GainedBonus => gainedBonus;
 
-        private readonly Bindable<double> gainedBonus = new Bindable<double>();
+        private readonly Bindable<double> gainedBonus = new BindableDouble();
+
+        /// <summary>
+        /// The number of spins per minute this spinner is spinning at, for display purposes.
+        /// </summary>
+        public readonly IBindable<double> SpinsPerMinute = new BindableDouble();
 
         private const double fade_out_duration = 160;
 
@@ -63,7 +69,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Origin = Anchor.Centre;
             RelativeSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
+            AddInternal(spmCalculator = new SpinnerSpmCalculator
+            {
+                Result = { BindTarget = SpinsPerMinute },
+            });
+
+            AddRangeInternal(new Drawable[]
             {
                 ticks = new Container<DrawableSpinnerTick>(),
                 new AspectContainer
@@ -77,20 +88,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                         RotationTracker = new SpinnerRotationTracker(this)
                     }
                 },
-                SpmCounter = new SpinnerSpmCounter
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Y = 120,
-                    Alpha = 0
-                },
                 spinningSample = new PausableSkinnableSound
                 {
                     Volume = { Value = 0 },
                     Looping = true,
                     Frequency = { Value = spinning_sample_initial_frequency }
                 }
-            };
+            });
 
             PositionBindable.BindValueChanged(pos => Position = pos.NewValue);
         }
@@ -161,17 +165,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        protected override void UpdateStartTimeStateTransforms()
-        {
-            base.UpdateStartTimeStateTransforms();
-
-            if (Result?.TimeStarted is double startTime)
-            {
-                using (BeginAbsoluteSequence(startTime))
-                    fadeInCounter();
-            }
-        }
-
         protected override void UpdateHitStateTransforms(ArmedState state)
         {
             base.UpdateHitStateTransforms(state);
@@ -282,22 +275,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateAfterChildren();
 
-            if (!SpmCounter.IsPresent && RotationTracker.Tracking)
-            {
-                Result.TimeStarted ??= Time.Current;
-                fadeInCounter();
-            }
+            if (Result.TimeStarted == null && RotationTracker.Tracking)
+                Result.TimeStarted = Time.Current;
 
             // don't update after end time to avoid the rate display dropping during fade out.
             // this shouldn't be limited to StartTime as it causes weirdness with the underlying calculation, which is expecting updates during that period.
             if (Time.Current <= HitObject.EndTime)
-                SpmCounter.SetRotation(Result.RateAdjustedRotation);
+                spmCalculator.SetRotation(Result.RateAdjustedRotation);
 
             updateBonusScore();
         }
 
-        private void fadeInCounter() => SpmCounter.FadeIn(HitObject.TimeFadeIn);
-
         private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
 
         private int wholeSpins;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
index 891821fe2f..ae8c03dad1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.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.Globalization;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -19,6 +20,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private OsuSpriteText bonusCounter;
 
+        private Container spmContainer;
+        private OsuSpriteText spmCounter;
+
         public DefaultSpinner()
         {
             RelativeSizeAxes = Axes.Both;
@@ -46,11 +50,37 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                     Origin = Anchor.Centre,
                     Font = OsuFont.Numeric.With(size: 24),
                     Y = -120,
+                },
+                spmContainer = new Container
+                {
+                    Alpha = 0f,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Y = 120,
+                    Children = new[]
+                    {
+                        spmCounter = new OsuSpriteText
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Text = @"0",
+                            Font = OsuFont.Numeric.With(size: 24)
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Text = @"SPINS PER MINUTE",
+                            Font = OsuFont.Numeric.With(size: 12),
+                            Y = 30
+                        }
+                    }
                 }
             });
         }
 
         private IBindable<double> gainedBonus;
+        private IBindable<double> spinsPerMinute;
 
         protected override void LoadComplete()
         {
@@ -63,6 +93,40 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 bonusCounter.FadeOutFromOne(1500);
                 bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
             });
+
+            spinsPerMinute = drawableSpinner.SpinsPerMinute.GetBoundCopy();
+            spinsPerMinute.BindValueChanged(spm =>
+            {
+                spmCounter.Text = Math.Truncate(spm.NewValue).ToString(@"#0");
+            }, true);
+
+            drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
+            updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!spmContainer.IsPresent && drawableSpinner.Result?.TimeStarted != null)
+                fadeCounterOnTimeStart();
+        }
+
+        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
+        {
+            if (!(drawableHitObject is DrawableSpinner))
+                return;
+
+            fadeCounterOnTimeStart();
+        }
+
+        private void fadeCounterOnTimeStart()
+        {
+            if (drawableSpinner.Result?.TimeStarted is double startTime)
+            {
+                using (BeginAbsoluteSequence(startTime))
+                    spmContainer.FadeIn(drawableSpinner.HitObject.TimeFadeIn);
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCalculator.cs
similarity index 61%
rename from osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCalculator.cs
index 69355f624b..a5205bbb8c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCalculator.cs
@@ -1,77 +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 System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public class SpinnerSpmCounter : Container
+    public class SpinnerSpmCalculator : Component
     {
+        private readonly Queue<RotationRecord> records = new Queue<RotationRecord>();
+        private const double spm_count_duration = 595; // not using hundreds to avoid frame rounding issues
+
+        /// <summary>
+        /// The resultant spins per minute value, which is updated via <see cref="SetRotation"/>.
+        /// </summary>
+        public IBindable<double> Result => result;
+
+        private readonly Bindable<double> result = new BindableDouble();
+
         [Resolved]
         private DrawableHitObject drawableSpinner { get; set; }
 
-        private readonly OsuSpriteText spmText;
-
-        public SpinnerSpmCounter()
-        {
-            Children = new Drawable[]
-            {
-                spmText = new OsuSpriteText
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Text = @"0",
-                    Font = OsuFont.Numeric.With(size: 24)
-                },
-                new OsuSpriteText
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Text = @"SPINS PER MINUTE",
-                    Font = OsuFont.Numeric.With(size: 12),
-                    Y = 30
-                }
-            };
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
             drawableSpinner.HitObjectApplied += resetState;
         }
 
-        private double spm;
-
-        public double SpinsPerMinute
-        {
-            get => spm;
-            private set
-            {
-                if (value == spm) return;
-
-                spm = value;
-                spmText.Text = Math.Truncate(value).ToString(@"#0");
-            }
-        }
-
-        private struct RotationRecord
-        {
-            public float Rotation;
-            public double Time;
-        }
-
-        private readonly Queue<RotationRecord> records = new Queue<RotationRecord>();
-        private const double spm_count_duration = 595; // not using hundreds to avoid frame rounding issues
-
         public void SetRotation(float currentRotation)
         {
             // Never calculate SPM by same time of record to avoid 0 / 0 = NaN or X / 0 = Infinity result.
@@ -88,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 while (records.Count > 0 && Time.Current - records.Peek().Time > spm_count_duration)
                     record = records.Dequeue();
 
-                SpinsPerMinute = (currentRotation - record.Rotation) / (Time.Current - record.Time) * 1000 * 60 / 360;
+                result.Value = (currentRotation - record.Rotation) / (Time.Current - record.Time) * 1000 * 60 / 360;
             }
 
             records.Enqueue(new RotationRecord { Rotation = currentRotation, Time = Time.Current });
@@ -96,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private void resetState(DrawableHitObject hitObject)
         {
-            SpinsPerMinute = 0;
+            result.Value = 0;
             records.Clear();
         }
 
@@ -107,5 +67,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             if (drawableSpinner != null)
                 drawableSpinner.HitObjectApplied -= resetState;
         }
+
+        private struct RotationRecord
+        {
+            public float Rotation;
+            public double Time;
+        }
     }
 }

From f848ef534747babe4c020e3b1a759b2fc42d259d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 26 Mar 2021 13:10:04 +0300
Subject: [PATCH 08742/10326] Add legacy spinner SPM counter support

---
 .../Skinning/Legacy/LegacySpinner.cs          | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 064b7a4680..7eb6898abc 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         protected const float SPRITE_SCALE = 0.625f;
 
+        private const float spm_hide_offset = 50f;
+
         protected DrawableSpinner DrawableSpinner { get; private set; }
 
         private Sprite spin;
@@ -35,6 +37,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private LegacySpriteText bonusCounter;
 
+        private Sprite spmBackground;
+        private LegacySpriteText spmCounter;
+
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject, ISkinSource source)
         {
@@ -79,11 +84,27 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Scale = new Vector2(SPRITE_SCALE),
                         Y = SPINNER_TOP_OFFSET + 299,
                     }.With(s => s.Font = s.Font.With(fixedWidth: false)),
+                    spmBackground = new Sprite
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopLeft,
+                        Texture = source.GetTexture("spinner-rpm"),
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Position = new Vector2(-87, 445 + spm_hide_offset),
+                    },
+                    spmCounter = new LegacySpriteText(source, LegacyFont.Score)
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopRight,
+                        Scale = new Vector2(SPRITE_SCALE * 0.9f),
+                        Position = new Vector2(80, 448 + spm_hide_offset),
+                    }.With(s => s.Font = s.Font.With(fixedWidth: false)),
                 }
             });
         }
 
         private IBindable<double> gainedBonus;
+        private IBindable<double> spinsPerMinute;
 
         private readonly Bindable<bool> completed = new Bindable<bool>();
 
@@ -99,6 +120,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
             });
 
+            spinsPerMinute = DrawableSpinner.SpinsPerMinute.GetBoundCopy();
+            spinsPerMinute.BindValueChanged(spm =>
+            {
+                spmCounter.Text = Math.Truncate(spm.NewValue).ToString(@"#0");
+            }, true);
+
             completed.BindValueChanged(onCompletedChanged, true);
 
             DrawableSpinner.ApplyCustomUpdateState += UpdateStateTransforms;
@@ -142,10 +169,16 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             switch (drawableHitObject)
             {
                 case DrawableSpinner d:
-                    double fadeOutLength = Math.Min(400, d.HitObject.Duration);
+                    using (BeginAbsoluteSequence(d.HitObject.StartTime - d.HitObject.TimeFadeIn))
+                    {
+                        spmBackground.MoveToOffset(new Vector2(0, -spm_hide_offset), d.HitObject.TimeFadeIn, Easing.Out);
+                        spmCounter.MoveToOffset(new Vector2(0, -spm_hide_offset), d.HitObject.TimeFadeIn, Easing.Out);
+                    }
 
-                    using (BeginAbsoluteSequence(drawableHitObject.HitStateUpdateTime - fadeOutLength, true))
-                        spin.FadeOutFromOne(fadeOutLength);
+                    double spinFadeOutLength = Math.Min(400, d.HitObject.Duration);
+
+                    using (BeginAbsoluteSequence(drawableHitObject.HitStateUpdateTime - spinFadeOutLength, true))
+                        spin.FadeOutFromOne(spinFadeOutLength);
                     break;
 
                 case DrawableSpinnerTick d:

From 8a0fcf20ede3a63a074072899b33cb02cd83fdec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 12:32:42 +0900
Subject: [PATCH 08743/10326] Move offset settings up for more logical ordering

---
 .../Settings/Sections/Input/TabletSettings.cs        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index bd0f7ddc4c..571d79baf8 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -110,12 +110,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             }
                         },
                         new SettingsSlider<float>
-                        {
-                            TransferValueOnCommit = true,
-                            LabelText = "Aspect Ratio",
-                            Current = aspectRatio
-                        },
-                        new SettingsSlider<float>
                         {
                             TransferValueOnCommit = true,
                             LabelText = "X Offset",
@@ -127,6 +121,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             LabelText = "Y Offset",
                             Current = offsetY
                         },
+                        new SettingsSlider<float>
+                        {
+                            TransferValueOnCommit = true,
+                            LabelText = "Aspect Ratio",
+                            Current = aspectRatio
+                        },
                         new SettingsCheckbox
                         {
                             LabelText = "Lock aspect ratio",

From 8dfff999f9ced7f2e550df44fcf3c76e871055fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 12:40:50 +0900
Subject: [PATCH 08744/10326] Add rotation slider

---
 .../Visual/Settings/TestSceneTabletSettings.cs         |  2 ++
 .../Settings/Sections/Input/TabletAreaSelection.cs     |  9 +++++++++
 .../Overlays/Settings/Sections/Input/TabletSettings.cs | 10 ++++++++++
 3 files changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index a7f6c8c0d3..a62980addf 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -45,6 +45,8 @@ namespace osu.Game.Tests.Visual.Settings
             public Bindable<Vector2> AreaOffset { get; } = new Bindable<Vector2>();
             public Bindable<Vector2> AreaSize { get; } = new Bindable<Vector2>();
 
+            public Bindable<float> Rotation { get; } = new Bindable<float>();
+
             public IBindable<TabletInfo> Tablet => tablet;
 
             private readonly Bindable<TabletInfo> tablet = new Bindable<TabletInfo>();
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index ecb8acce54..f61742093c 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly Bindable<Vector2> areaOffset = new Bindable<Vector2>();
         private readonly Bindable<Vector2> areaSize = new Bindable<Vector2>();
 
+        private readonly BindableNumber<float> rotation = new BindableNumber<float>();
+
         private readonly IBindable<TabletInfo> tablet = new Bindable<TabletInfo>();
 
         private OsuSpriteText tabletName;
@@ -124,6 +126,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 usableAreaText.Text = $"{(float)x / commonDivider}:{(float)y / commonDivider}";
             }, true);
 
+            rotation.BindTo(handler.Rotation);
+            rotation.BindValueChanged(val =>
+            {
+                usableAreaContainer.RotateTo(val.NewValue, 100, Easing.OutQuint)
+                                   .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
+            });
+
             tablet.BindTo(handler.Tablet);
             tablet.BindValueChanged(_ => Scheduler.AddOnce(updateTabletDetails));
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 571d79baf8..9d128f8db3 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly BindableNumber<float> sizeX = new BindableNumber<float> { MinValue = 10 };
         private readonly BindableNumber<float> sizeY = new BindableNumber<float> { MinValue = 10 };
 
+        private readonly BindableNumber<float> rotation = new BindableNumber<float> { MinValue = 0, MaxValue = 360 };
+
         [Resolved]
         private GameHost host { get; set; }
 
@@ -122,6 +124,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             Current = offsetY
                         },
                         new SettingsSlider<float>
+                        {
+                            TransferValueOnCommit = true,
+                            LabelText = "Rotation",
+                            Current = rotation
+                        },
+                        new SettingsSlider<float>
                         {
                             TransferValueOnCommit = true,
                             LabelText = "Aspect Ratio",
@@ -153,6 +161,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             base.LoadComplete();
 
+            rotation.BindTo(tabletHandler.Rotation);
+
             areaOffset.BindTo(tabletHandler.AreaOffset);
             areaOffset.BindValueChanged(val =>
             {

From 1dfd08eded521c40576cc746216f3b487e239e9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 13:01:48 +0900
Subject: [PATCH 08745/10326] Add tablet rotation configuration

---
 .../Sections/Input/RotationPresetButtons.cs   | 109 ++++++++++++++++++
 .../Settings/Sections/Input/TabletSettings.cs |   1 +
 2 files changed, 110 insertions(+)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs

diff --git a/osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs b/osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs
new file mode 100644
index 0000000000..3e8da9f7d0
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs
@@ -0,0 +1,109 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Handlers.Tablet;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    internal class RotationPresetButtons : FillFlowContainer
+    {
+        private readonly ITabletHandler tabletHandler;
+
+        private Bindable<float> rotation;
+
+        private const int height = 50;
+
+        public RotationPresetButtons(ITabletHandler tabletHandler)
+        {
+            this.tabletHandler = tabletHandler;
+
+            RelativeSizeAxes = Axes.X;
+            Height = height;
+
+            for (int i = 0; i < 360; i += 90)
+            {
+                var presetRotation = i;
+
+                Add(new RotationButton(i)
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = height,
+                    Width = 0.25f,
+                    Text = $"{presetRotation}º",
+                    Action = () => tabletHandler.Rotation.Value = presetRotation,
+                });
+            }
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            rotation = tabletHandler.Rotation.GetBoundCopy();
+            rotation.BindValueChanged(val =>
+            {
+                foreach (var b in Children.OfType<RotationButton>())
+                    b.IsSelected = b.Preset == val.NewValue;
+            }, true);
+        }
+
+        public class RotationButton : TriangleButton
+        {
+            [Resolved]
+            private OsuColour colours { get; set; }
+
+            public readonly int Preset;
+
+            public RotationButton(int preset)
+            {
+                Preset = preset;
+            }
+
+            private bool isSelected;
+
+            public bool IsSelected
+            {
+                get => isSelected;
+                set
+                {
+                    if (value == isSelected)
+                        return;
+
+                    isSelected = value;
+
+                    if (IsLoaded)
+                        updateColour();
+                }
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                updateColour();
+            }
+
+            private void updateColour()
+            {
+                if (isSelected)
+                {
+                    BackgroundColour = colours.BlueDark;
+                    Triangles.ColourDark = colours.BlueDarker;
+                    Triangles.ColourLight = colours.Blue;
+                }
+                else
+                {
+                    BackgroundColour = colours.Gray4;
+                    Triangles.ColourDark = colours.Gray5;
+                    Triangles.ColourLight = colours.Gray6;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 9d128f8db3..d770c18878 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -129,6 +129,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             LabelText = "Rotation",
                             Current = rotation
                         },
+                        new RotationPresetButtons(tabletHandler),
                         new SettingsSlider<float>
                         {
                             TransferValueOnCommit = true,

From 9504fe3f3c1fb78b8b4f6510ec988933f26bd71d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 13:43:05 +0900
Subject: [PATCH 08746/10326] Inline add of spm calculation (no need for it to
 be a separate call)

---
 .../Objects/Drawables/DrawableSpinner.cs                 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 1a89fc308e..3a4753761a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -69,13 +69,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Origin = Anchor.Centre;
             RelativeSizeAxes = Axes.Both;
 
-            AddInternal(spmCalculator = new SpinnerSpmCalculator
-            {
-                Result = { BindTarget = SpinsPerMinute },
-            });
-
             AddRangeInternal(new Drawable[]
             {
+                spmCalculator = new SpinnerSpmCalculator
+                {
+                    Result = { BindTarget = SpinsPerMinute },
+                },
                 ticks = new Container<DrawableSpinnerTick>(),
                 new AspectContainer
                 {

From b82247aabec2ee10c12105701d1c0e073a775e6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 14:13:16 +0900
Subject: [PATCH 08747/10326] Add inline comments and use Vector2.Zero

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 07643bd75e..82301bd37f 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -39,9 +39,11 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             var hitObjects = selectedMovableObjects;
 
+            // this will potentially move the selection out of bounds...
             foreach (var h in hitObjects)
                 h.Position += moveEvent.InstantDelta;
 
+            // but this will be corrected.
             moveSelectionInBounds();
             return true;
         }
@@ -153,7 +155,6 @@ namespace osu.Game.Rulesets.Osu.Edit
                 scaleHitObjects(hitObjects, reference, scale);
 
             moveSelectionInBounds();
-
             return true;
         }
 
@@ -257,7 +258,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             var hitObjects = selectedMovableObjects;
 
             Quad quad = getSurroundingQuad(hitObjects);
-            Vector2 delta = new Vector2(0);
+
+            Vector2 delta = Vector2.Zero;
 
             if (quad.TopLeft.X < 0)
                 delta.X -= quad.TopLeft.X;

From 88035f73e00229ca5587adb916dc36716da29fb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 14:23:46 +0900
Subject: [PATCH 08748/10326] Fix incorrect wait logic in IPC location test

Not really willing to put more effort into fixing this one. Should do the job.
---
 .../NonVisual/IPCLocationTest.cs                   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
index 4791da93c6..4c5f5a7a1a 100644
--- a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
@@ -26,26 +26,26 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 string basePath = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(CheckIPCLocation));
 
                 // Set up a fake IPC client for the IPC Storage to switch to.
-                string testCeDir = Path.Combine(basePath, "stable-ce");
-                Directory.CreateDirectory(testCeDir);
+                string testStableInstallDirectory = Path.Combine(basePath, "stable-ce");
+                Directory.CreateDirectory(testStableInstallDirectory);
 
-                string ipcFile = Path.Combine(testCeDir, "ipc.txt");
+                string ipcFile = Path.Combine(testStableInstallDirectory, "ipc.txt");
                 File.WriteAllText(ipcFile, string.Empty);
 
                 try
                 {
                     var osu = loadOsu(host);
                     TournamentStorage storage = (TournamentStorage)osu.Dependencies.Get<Storage>();
-                    FileBasedIPC ipc = (FileBasedIPC)osu.Dependencies.Get<MatchIPCInfo>();
+                    FileBasedIPC ipc = null;
 
-                    waitForOrAssert(() => ipc != null, @"ipc could not be populated in a reasonable amount of time");
+                    waitForOrAssert(() => (ipc = osu.Dependencies.Get<MatchIPCInfo>() as FileBasedIPC) != null, @"ipc could not be populated in a reasonable amount of time");
 
-                    Assert.True(ipc.SetIPCLocation(testCeDir));
+                    Assert.True(ipc.SetIPCLocation(testStableInstallDirectory));
                     Assert.True(storage.AllTournaments.Exists("stable.json"));
                 }
                 finally
                 {
-                    host.Storage.DeleteDirectory(testCeDir);
+                    host.Storage.DeleteDirectory(testStableInstallDirectory);
                     host.Storage.DeleteDirectory("tournaments");
                     host.Exit();
                 }

From 89bea2868a9ca68a8c09a9c93db6f504e9022a96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 14:33:55 +0900
Subject: [PATCH 08749/10326] Move bool one level down

---
 osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs | 2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs          | 9 +++++++--
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs      | 7 +------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index 5c5e41234d..bba42dea97 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Catch.Mods
             var drawableCatchRuleset = (DrawableCatchRuleset)drawableRuleset;
             var catchPlayfield = (CatchPlayfield)drawableCatchRuleset.Playfield;
 
-            catchPlayfield.CatcherArea.CatchFruitOnPlate = false;
+            catchPlayfield.CatcherArea.MovableCatcher.CatchFruitOnPlate = false;
         }
 
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 42be745c2e..5d57e84b75 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -43,6 +43,11 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public bool HyperDashing => hyperDashModifier != 1;
 
+        /// <summary>
+        /// Whether <see cref="DrawablePalpableCatchHitObject"/> fruit should appear on the plate.
+        /// </summary>
+        public bool CatchFruitOnPlate { get; set; } = true;
+
         /// <summary>
         /// The relative space to cover in 1 millisecond. based on 1 game pixel per millisecond as in osu-stable.
         /// </summary>
@@ -223,7 +228,7 @@ namespace osu.Game.Rulesets.Catch.UI
                    catchObjectPosition <= catcherPosition + halfCatchWidth;
         }
 
-        public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result, bool placeOnPlate)
+        public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result)
         {
             var catchResult = (CatchJudgementResult)result;
             catchResult.CatcherAnimationState = CurrentState;
@@ -237,7 +242,7 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplaySize.X / 2);
 
-                if (placeOnPlate)
+                if (CatchFruitOnPlate)
                     placeCaughtObject(palpableObject, positionInStack);
 
                 if (hitLighting.Value)
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 29c95ec61c..44adbd5512 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -21,11 +21,6 @@ namespace osu.Game.Rulesets.Catch.UI
         public readonly Catcher MovableCatcher;
         private readonly CatchComboDisplay comboDisplay;
 
-        /// <summary>
-        /// Whether <see cref="DrawablePalpableCatchHitObject"/> fruit should appear on the plate.
-        /// </summary>
-        public bool CatchFruitOnPlate { get; set; } = true;
-
         public CatcherArea(Container<CaughtObject> droppedObjectContainer, BeatmapDifficulty difficulty = null)
         {
             Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
@@ -46,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void OnNewResult(DrawableCatchHitObject hitObject, JudgementResult result)
         {
-            MovableCatcher.OnNewResult(hitObject, result, CatchFruitOnPlate);
+            MovableCatcher.OnNewResult(hitObject, result);
 
             if (!result.Type.IsScorable())
                 return;

From f12353a99e5b38c57d1578460b542b27d07a1cec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 14:57:06 +0900
Subject: [PATCH 08750/10326] Update forgotten test scene usage

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index ddb6194899..48efd73222 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             Add(drawableObject);
             drawableObject.OnLoadComplete += _ =>
             {
-                catcher.OnNewResult(drawableObject, result, true);
+                catcher.OnNewResult(drawableObject, result);
                 drawableObject.Expire();
             };
         }

From 90c75a64cf9e30e213821706e8d54de262d2b629 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 15:24:11 +0900
Subject: [PATCH 08751/10326] Fix legacy control point precision having an
 adverse effect on the editor

---
 osu.Game/Screens/Edit/Timing/DifficultySection.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/DifficultySection.cs b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
index 9d80ca0b14..97d110c502 100644
--- a/osu.Game/Screens/Edit/Timing/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
@@ -28,7 +28,16 @@ namespace osu.Game.Screens.Edit.Timing
         {
             if (point.NewValue != null)
             {
-                multiplierSlider.Current = point.NewValue.SpeedMultiplierBindable;
+                var selectedPointBindable = point.NewValue.SpeedMultiplierBindable;
+
+                // there may be legacy control points, which contain infinite precision for compatibility reasons (see LegacyDifficultyControlPoint).
+                // generally that level of precision could only be set by externally editing the .osu file, so at the point
+                // a user is looking to update this within the editor it should be safe to obliterate this additional precision.
+                double expectedPrecision = new DifficultyControlPoint().SpeedMultiplierBindable.Precision;
+                if (selectedPointBindable.Precision < expectedPrecision)
+                    selectedPointBindable.Precision = expectedPrecision;
+
+                multiplierSlider.Current = selectedPointBindable;
                 multiplierSlider.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }

From 1d968009c2c329a1abd107409c9e37c302ae36c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 16:07:04 +0900
Subject: [PATCH 08752/10326] Add osu!mania key filtering using "keys=4" at
 song select

---
 .../Beatmaps/ManiaBeatmapConverter.cs         |  8 ++++-
 .../ManiaFilterCriteria.cs                    | 33 +++++++++++++++++++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  6 ++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 7a0e3b2b76..756207a201 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
             if (IsForCurrentRuleset)
             {
-                TargetColumns = (int)Math.Max(1, roundedCircleSize);
+                TargetColumns = GetColumnCountForNonConvert(beatmap.BeatmapInfo);
 
                 if (TargetColumns > ManiaRuleset.MAX_STAGE_KEYS)
                 {
@@ -71,6 +71,12 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             originalTargetColumns = TargetColumns;
         }
 
+        internal static int GetColumnCountForNonConvert(BeatmapInfo beatmap)
+        {
+            var roundedCircleSize = Math.Round(beatmap.BaseDifficulty.CircleSize);
+            return (int)Math.Max(1, roundedCircleSize);
+        }
+
         public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition);
 
         protected override Beatmap<ManiaHitObject> ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
diff --git a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
new file mode 100644
index 0000000000..c9a1ae84d4
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.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.Game.Beatmaps;
+using osu.Game.Rulesets.Filter;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Filter;
+
+namespace osu.Game.Rulesets.Mania
+{
+    public class ManiaFilterCriteria : IRulesetFilterCriteria
+    {
+        private FilterCriteria.OptionalRange<float> keys;
+
+        public bool Matches(BeatmapInfo beatmap)
+        {
+            return !keys.HasFilter || (beatmap.RulesetID == new ManiaRuleset().LegacyID) && keys.IsInRange(ManiaBeatmapConverter.GetColumnCountForNonConvert(beatmap));
+        }
+
+        public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
+        {
+            switch (key)
+            {
+                case "key":
+                case "keys":
+                    return FilterQueryParser.TryUpdateCriteriaRange(ref keys, op, value);
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index d624e094ad..88b63606b9 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -22,6 +22,7 @@ using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Filter;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Difficulty;
@@ -382,6 +383,11 @@ namespace osu.Game.Rulesets.Mania
                 }
             }
         };
+
+        public override IRulesetFilterCriteria CreateRulesetFilterCriteria()
+        {
+            return new ManiaFilterCriteria();
+        }
     }
 
     public enum PlayfieldType

From e769ef45be36d1bf700969bf76bcab5c0dac2f99 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 16:55:39 +0900
Subject: [PATCH 08753/10326] Fix misplaced parenthesis

---
 osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
index c9a1ae84d4..d9a278ef29 100644
--- a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
+++ b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mania
 
         public bool Matches(BeatmapInfo beatmap)
         {
-            return !keys.HasFilter || (beatmap.RulesetID == new ManiaRuleset().LegacyID) && keys.IsInRange(ManiaBeatmapConverter.GetColumnCountForNonConvert(beatmap));
+            return !keys.HasFilter || (beatmap.RulesetID == new ManiaRuleset().LegacyID && keys.IsInRange(ManiaBeatmapConverter.GetColumnCountForNonConvert(beatmap)));
         }
 
         public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)

From 56428a027e53e9e89dcb321a5f58eb32c899d52d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 16:56:19 +0900
Subject: [PATCH 08754/10326] Change static method to public

---
 osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 756207a201..26393c8edb 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             originalTargetColumns = TargetColumns;
         }
 
-        internal static int GetColumnCountForNonConvert(BeatmapInfo beatmap)
+        public static int GetColumnCountForNonConvert(BeatmapInfo beatmap)
         {
             var roundedCircleSize = Math.Round(beatmap.BaseDifficulty.CircleSize);
             return (int)Math.Max(1, roundedCircleSize);

From 05961e98d5e3ac0b36f936d0f09ed62896b19093 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 19:03:15 +0900
Subject: [PATCH 08755/10326] Ensure GlobalActions are handled before anything
 else game-wide

---
 .../Input/Bindings/GlobalActionContainer.cs   |  9 +++--
 osu.Game/Input/Bindings/GlobalInputManager.cs | 33 +++++++++++++++++++
 osu.Game/OsuGameBase.cs                       |  8 ++---
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Input/Bindings/GlobalInputManager.cs

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 8ccdb9249e..6d038c43cf 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.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.ComponentModel;
 using System.Linq;
@@ -14,11 +15,13 @@ namespace osu.Game.Input.Bindings
     {
         private readonly Drawable handler;
 
-        public GlobalActionContainer(OsuGameBase game)
+        public GlobalActionContainer(OsuGameBase game, bool nested = false)
             : base(matchingMode: KeyCombinationMatchingMode.Modifiers)
         {
             if (game is IKeyBindingHandler<GlobalAction>)
                 handler = game;
+
+            GetInputQueue = () => base.KeyBindingInputQueue.ToArray();
         }
 
         public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings).Concat(EditorKeyBindings);
@@ -91,8 +94,10 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
         };
 
+        public Func<Drawable[]> GetInputQueue { get; set; }
+
         protected override IEnumerable<Drawable> KeyBindingInputQueue =>
-            handler == null ? base.KeyBindingInputQueue : base.KeyBindingInputQueue.Prepend(handler);
+            handler == null ? GetInputQueue() : GetInputQueue().Prepend(handler);
     }
 
     public enum GlobalAction
diff --git a/osu.Game/Input/Bindings/GlobalInputManager.cs b/osu.Game/Input/Bindings/GlobalInputManager.cs
new file mode 100644
index 0000000000..475397408a
--- /dev/null
+++ b/osu.Game/Input/Bindings/GlobalInputManager.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.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+
+namespace osu.Game.Input.Bindings
+{
+    public class GlobalInputManager : PassThroughInputManager
+    {
+        public readonly GlobalActionContainer GlobalBindings;
+
+        protected override Container<Drawable> Content { get; }
+
+        public GlobalInputManager(OsuGameBase game)
+        {
+            InternalChildren = new Drawable[]
+            {
+                Content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                // to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
+                GlobalBindings = new GlobalActionContainer(game, true)
+                {
+                    GetInputQueue = () => NonPositionalInputQueue.ToArray()
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e1c7b67a8c..bff3e15bfb 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -310,9 +310,9 @@ namespace osu.Game
 
             MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both };
 
-            GlobalActionContainer globalBindings;
+            GlobalInputManager globalInput;
 
-            MenuCursorContainer.Child = globalBindings = new GlobalActionContainer(this)
+            MenuCursorContainer.Child = globalInput = new GlobalInputManager(this)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }
@@ -320,8 +320,8 @@ namespace osu.Game
 
             base.Content.Add(CreateScalingContainer().WithChild(MenuCursorContainer));
 
-            KeyBindingStore.Register(globalBindings);
-            dependencies.Cache(globalBindings);
+            KeyBindingStore.Register(globalInput.GlobalBindings);
+            dependencies.Cache(globalInput.GlobalBindings);
 
             PreviewTrackManager previewTrackManager;
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());

From a2f50af4243dfde95ec556859666b65e34f3007b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 19:42:40 +0900
Subject: [PATCH 08756/10326] Fix fall-through scroll redirection

---
 osu.Game/OsuGame.cs                               | 7 -------
 osu.Game/Overlays/Volume/VolumeControlReceptor.cs | 8 ++++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index dd1fa32ad9..5fa315a464 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -879,13 +879,6 @@ namespace osu.Game
             return component;
         }
 
-        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;
diff --git a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
index 3478f18a40..3b39b74e00 100644
--- a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Volume
@@ -17,6 +18,13 @@ namespace osu.Game.Overlays.Volume
         public bool OnPressed(GlobalAction action) =>
             ActionRequested?.Invoke(action) ?? false;
 
+        protected override bool OnScroll(ScrollEvent e)
+        {
+            // forward any unhandled mouse scroll events to the volume control.
+            ScrollActionRequested?.Invoke(GlobalAction.IncreaseVolume, e.ScrollDelta.Y, e.IsPrecise);
+            return true;
+        }
+
         public bool OnScroll(GlobalAction action, float amount, bool isPrecise) =>
             ScrollActionRequested?.Invoke(action, amount, isPrecise) ?? false;
 

From 633e6130bf434c628d7be98eeba0f0fff9d30cf8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 19:45:22 +0900
Subject: [PATCH 08757/10326] 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 3682a44b9f..5b65670869 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.329.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.330.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6d571218fc..6a7f7e7026 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.329.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.330.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ceb46eae87..4aa3ad1c61 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.Framework.iOS" Version="2021.329.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.330.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.329.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.330.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From fb0079fb9f641c7a7c769a3144684cb90c0320a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 22:42:31 +0900
Subject: [PATCH 08758/10326] Fix accuracy displaying incorrectly in online
 contexts

Closes #12221.
---
 osu.Game/Users/UserStatistics.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 04a358436e..5ddcd86d28 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Users
         public double Accuracy;
 
         [JsonIgnore]
-        public string DisplayAccuracy => Accuracy.FormatAccuracy();
+        public string DisplayAccuracy => (Accuracy / 100).FormatAccuracy();
 
         [JsonProperty(@"play_count")]
         public int PlayCount;

From ded91b32a4facc2e55d909428999401ffec0ac80 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 31 Mar 2021 12:11:43 +0900
Subject: [PATCH 08759/10326] Add failing test

---
 .../TestSceneHoldNoteInput.cs                 | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 7ae69bf7d7..2357778948 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -288,6 +288,42 @@ namespace osu.Game.Rulesets.Mania.Tests
                                                                        .All(j => j.Type.IsHit()));
         }
 
+        [Test]
+        public void TestHitTailBeforeLastTick()
+        {
+            const int tick_rate = 8;
+            const double tick_spacing = TimingControlPoint.DEFAULT_BEAT_LENGTH / tick_rate;
+            const double time_last_tick = time_head + tick_spacing * (int)((time_tail - time_head) / tick_spacing - 1);
+
+            var beatmap = new Beatmap<ManiaHitObject>
+            {
+                HitObjects =
+                {
+                    new HoldNote
+                    {
+                        StartTime = time_head,
+                        Duration = time_tail - time_head,
+                        Column = 0,
+                    }
+                },
+                BeatmapInfo =
+                {
+                    BaseDifficulty = new BeatmapDifficulty { SliderTickRate = tick_rate },
+                    Ruleset = new ManiaRuleset().RulesetInfo
+                },
+            };
+
+            performTest(new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(time_head, ManiaAction.Key1),
+                new ManiaReplayFrame(time_last_tick - 5)
+            }, beatmap);
+
+            assertHeadJudgement(HitResult.Perfect);
+            AddAssert("one tick missed", () => judgementResults.Where(j => j.HitObject is HoldNoteTick).Count(j => j.Type == HitResult.LargeTickMiss) == 1);
+            assertTailJudgement(HitResult.Ok);
+        }
+
         private void assertHeadJudgement(HitResult result)
             => AddAssert($"head judged as {result}", () => judgementResults[0].Type == result);
 

From f78d628878a0244c1de1b0efa26d9e206d593771 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 31 Mar 2021 12:21:07 +0900
Subject: [PATCH 08760/10326] Improve assertions

---
 .../TestSceneHoldNoteInput.cs                       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 2357778948..42ea12214f 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -320,21 +320,24 @@ namespace osu.Game.Rulesets.Mania.Tests
             }, beatmap);
 
             assertHeadJudgement(HitResult.Perfect);
-            AddAssert("one tick missed", () => judgementResults.Where(j => j.HitObject is HoldNoteTick).Count(j => j.Type == HitResult.LargeTickMiss) == 1);
+            assertLastTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Ok);
         }
 
         private void assertHeadJudgement(HitResult result)
-            => AddAssert($"head judged as {result}", () => judgementResults[0].Type == result);
+            => AddAssert($"head judged as {result}", () => judgementResults.First(j => j.HitObject is Note).Type == result);
 
         private void assertTailJudgement(HitResult result)
-            => AddAssert($"tail judged as {result}", () => judgementResults[^2].Type == result);
+            => AddAssert($"tail judged as {result}", () => judgementResults.Single(j => j.HitObject is TailNote).Type == result);
 
         private void assertNoteJudgement(HitResult result)
-            => AddAssert($"hold note judged as {result}", () => judgementResults[^1].Type == result);
+            => AddAssert($"hold note judged as {result}", () => judgementResults.Single(j => j.HitObject is HoldNote).Type == result);
 
         private void assertTickJudgement(HitResult result)
-            => AddAssert($"tick judged as {result}", () => judgementResults[6].Type == result); // arbitrary tick
+            => AddAssert($"any tick judged as {result}", () => judgementResults.Where(j => j.HitObject is HoldNoteTick).Any(j => j.Type == result));
+
+        private void assertLastTickJudgement(HitResult result)
+            => AddAssert($"last tick judged as {result}", () => judgementResults.Last(j => j.HitObject is HoldNoteTick).Type == result);
 
         private ScoreAccessibleReplayPlayer currentPlayer;
 

From 43e48406caa2253ccdc580c53ad22d0b39ad7ebf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 31 Mar 2021 12:21:14 +0900
Subject: [PATCH 08761/10326] Miss all ticks when hold note is hit

---
 .../Objects/Drawables/DrawableHoldNote.cs                   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 4f062753a6..828ee7b03e 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -233,6 +233,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             if (Tail.AllJudged)
             {
+                foreach (var tick in tickContainer)
+                {
+                    if (!tick.Judged)
+                        tick.MissForcefully();
+                }
+
                 ApplyResult(r => r.Type = r.Judgement.MaxResult);
                 endHold();
             }

From e0c61f4dc556189de3e841242568df93269aafdd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 31 Mar 2021 13:57:57 +0900
Subject: [PATCH 08762/10326] Fix retry count not updating correctly

Regressed with changes to player reference retention logic. Could add a
test but the logic is so local now it seems quite redundant.
---
 osu.Game/Screens/Play/PlayerLoader.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 7d906cdc5b..2bbc4a0469 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -309,10 +309,8 @@ namespace osu.Game.Screens.Play
             if (!this.IsCurrentScreen())
                 return;
 
-            var restartCount = player?.RestartCount + 1 ?? 0;
-
             player = createPlayer();
-            player.RestartCount = restartCount;
+            player.RestartCount = ++restartCount;
             player.RestartRequested = restartRequested;
 
             LoadTask = LoadComponentAsync(player, _ => MetadataInfo.Loading = false);
@@ -428,6 +426,8 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> muteWarningShownOnce;
 
+        private int restartCount;
+
         private void showMuteWarningIfNeeded()
         {
             if (!muteWarningShownOnce.Value)

From 0c53b4eb938a2770c5b2420dcf646cce0bd16c23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 31 Mar 2021 14:09:38 +0900
Subject: [PATCH 08763/10326] Fix wrong counting and add test

---
 .../Navigation/TestSceneScreenNavigation.cs   | 23 +++++++++++++++++++
 osu.Game/Screens/Play/PlayerLoader.cs         |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index f2bb518b2e..3e25e22b5f 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -43,6 +43,29 @@ namespace osu.Game.Tests.Visual.Navigation
             exitViaEscapeAndConfirm();
         }
 
+        [Test]
+        public void TestRetryCountIncrements()
+        {
+            Player player = null;
+
+            PushAndConfirm(() => new TestSongSelect());
+
+            AddStep("import beatmap", () => ImportBeatmapTest.LoadQuickOszIntoOsu(Game).Wait());
+
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
+
+            AddUntilStep("wait for player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
+            AddAssert("retry count is 0", () => player.RestartCount == 0);
+
+            AddStep("attempt to retry", () => player.ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddUntilStep("wait for old player gone", () => Game.ScreenStack.CurrentScreen != player);
+
+            AddUntilStep("get new player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
+            AddAssert("retry count is 1", () => player.RestartCount == 1);
+        }
+
         [Test]
         public void TestRetryFromResults()
         {
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 2bbc4a0469..679b3c7313 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -310,7 +310,7 @@ namespace osu.Game.Screens.Play
                 return;
 
             player = createPlayer();
-            player.RestartCount = ++restartCount;
+            player.RestartCount = restartCount++;
             player.RestartRequested = restartRequested;
 
             LoadTask = LoadComponentAsync(player, _ => MetadataInfo.Loading = false);

From 30cae46cbdf44021e850f63122d90d803052ca9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 31 Mar 2021 14:57:28 +0900
Subject: [PATCH 08764/10326] Group large drag drop imports into a single
 operation

---
 osu.Desktop/OsuGameDesktop.cs | 34 +++++++++++++++++++++++++++++++---
 osu.Game/OsuGameBase.cs       |  3 +++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index b2487568ce..0c21c75290 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.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.IO;
 using System.Linq;
 using System.Reflection;
@@ -18,6 +19,7 @@ using osu.Framework.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
+using osu.Framework.Threading;
 using osu.Game.IO;
 
 namespace osu.Desktop
@@ -144,13 +146,39 @@ namespace osu.Desktop
             desktopWindow.DragDrop += f => fileDrop(new[] { f });
         }
 
+        private readonly List<string> importableFiles = new List<string>();
+        private ScheduledDelegate importSchedule;
+
         private void fileDrop(string[] filePaths)
         {
-            var firstExtension = Path.GetExtension(filePaths.First());
+            lock (importableFiles)
+            {
+                var firstExtension = Path.GetExtension(filePaths.First());
 
-            if (filePaths.Any(f => Path.GetExtension(f) != firstExtension)) return;
+                if (filePaths.Any(f => Path.GetExtension(f) != firstExtension)) return;
 
-            Task.Factory.StartNew(() => Import(filePaths), TaskCreationOptions.LongRunning);
+                importableFiles.AddRange(filePaths);
+
+                Logger.Log($"Adding {filePaths.Length} files for import");
+
+                // File drag drop operations can potentially trigger hundreds or thousands of these calls on some platforms.
+                // In order to avoid spawning multiple import tasks for a single drop operation, debounce a touch.
+                importSchedule?.Cancel();
+                importSchedule = Scheduler.AddDelayed(handlePendingImports, 100);
+            }
+        }
+
+        private void handlePendingImports()
+        {
+            lock (importableFiles)
+            {
+                Logger.Log($"Handling batch import of {importableFiles.Count} files");
+
+                var paths = importableFiles.ToArray();
+                importableFiles.Clear();
+
+                Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
+            }
         }
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e1c7b67a8c..7eef0f7158 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -429,6 +429,9 @@ namespace osu.Game
 
         public async Task Import(params string[] paths)
         {
+            if (paths.Length == 0)
+                return;
+
             var extension = Path.GetExtension(paths.First())?.ToLowerInvariant();
 
             foreach (var importer in fileImporters)

From 1718084dbc55761c9f0a2cc49bccde6d88ccb3f3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:08:39 +0200
Subject: [PATCH 08765/10326] Update/remove determinant tests

We now only change the path type based on the bounding box.

If the control points are too linear, the framework now handles the fallback to Bezier.
---
 .../TestSceneSliderControlPointPiece.cs       | 17 ++-----------
 .../TestSceneSliderPlacementBlueprint.cs      | 25 +++----------------
 2 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index 7ca86335ce..b4eba7070b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -61,19 +61,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.PerfectCurve);
         }
 
-        [Test]
-        public void TestDragControlPointAlmostLinearly()
-        {
-            moveMouseToControlPoint(1);
-            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
-
-            addMovementStep(new Vector2(150, 0.01f));
-            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
-
-            assertControlPointPosition(1, new Vector2(150, 0.01f));
-            assertControlPointType(0, PathType.Bezier);
-        }
-
         [Test]
         public void TestDragControlPointAlmostLinearlyExterior()
         {
@@ -93,7 +80,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             moveMouseToControlPoint(1);
             AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
 
-            addMovementStep(new Vector2(150, 0.01f));
+            addMovementStep(new Vector2(400, 0.01f));
             assertControlPointType(0, PathType.Bezier);
 
             addMovementStep(new Vector2(150, 50));
@@ -109,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             moveMouseToControlPoint(4);
             AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
 
-            addMovementStep(new Vector2(350, 0));
+            addMovementStep(new Vector2(350, 0.01f));
             assertControlPointType(2, PathType.Bezier);
 
             addMovementStep(new Vector2(150, 150));
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 937034fc23..24382d2c65 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -276,25 +276,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.Linear);
         }
 
-        [Test]
-        public void TestPlacePerfectCurveSegmentAlmostLinearly()
-        {
-            Vector2 startPosition = new Vector2(200);
-
-            addMovementStep(startPosition);
-            addClickStep(MouseButton.Left);
-
-            addMovementStep(startPosition + new Vector2(61.382935f, 6.423767f));
-            addClickStep(MouseButton.Left);
-
-            addMovementStep(startPosition + new Vector2(217.69522f, 22.84021f));
-            addClickStep(MouseButton.Right);
-
-            assertPlaced(true);
-            assertControlPointCount(3);
-            assertControlPointType(0, PathType.Bezier);
-        }
-
         [Test]
         public void TestPlacePerfectCurveSegmentAlmostLinearlyExterior()
         {
@@ -322,10 +303,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(startPosition + new Vector2(61.382935f, 6.423767f));
+            addMovementStep(startPosition + new Vector2(300, 0));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(startPosition + new Vector2(217.69522f, 22.84021f)); // Should convert to bezier
+            addMovementStep(startPosition + new Vector2(150, 0.1f)); // Should convert to bezier
             addMovementStep(startPosition + new Vector2(210.0f, 0.0f)); // Should convert back to perfect
             addClickStep(MouseButton.Right);
 
@@ -346,7 +327,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addClickStep(MouseButton.Left);
 
             // Playfield dimensions are 640 x 480.
-            // So a 480 * 480 bounding box area should be ok.
+            // So a 480 x 480 bounding box should be ok.
             addMovementStep(startPosition + new Vector2(-240, 240));
             addClickStep(MouseButton.Right);
 

From 75b8f2535ff3c024b1cc4ab219989658c7003f1e Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:09:56 +0200
Subject: [PATCH 08766/10326] Move updatePathTypes to PathControlPointPiece

Here we produce a local bound copy of the path version, and bind it to update the path type.

This way, if the path version updates (i.e. any control point changes type or position), we check that all control points have a well-defined path.

Additionally, if the control point piece is disposed of, the GB should also swoop up the subscription because of the local bound copy.
---
 .../Components/PathControlPointPiece.cs       | 24 +++++++++++++++++++
 .../Components/PathControlPointVisualiser.cs  | 23 ------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 4459308ea5..8059fc910c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -3,14 +3,17 @@
 
 using System;
 using System.Collections.Generic;
+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.Cursor;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -47,6 +50,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private IBindable<int> sliderVersion;
         private IBindable<Vector2> sliderPosition;
         private IBindable<float> sliderScale;
         private IBindable<Vector2> controlPointPosition;
@@ -105,6 +109,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             base.LoadComplete();
 
+            sliderVersion = slider.Path.Version.GetBoundCopy();
+            sliderVersion.BindValueChanged(_ => updatePathType());
+
             sliderPosition = slider.PositionBindable.GetBoundCopy();
             sliderPosition.BindValueChanged(_ => updateMarkerDisplay());
 
@@ -200,6 +207,23 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override void OnDragEnd(DragEndEvent e) => changeHandler?.EndChange();
 
+        /// <summary>
+        /// Handles correction of invalid path types.
+        /// </summary>
+        private void updatePathType()
+        {
+            if (PointsInSegment[0].Type.Value != PathType.PerfectCurve)
+                return;
+
+            ReadOnlySpan<Vector2> points = PointsInSegment.Select(p => p.Position.Value).ToArray();
+            if (points.Length != 3)
+                return;
+
+            RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
+            if (boundingBox.Width >= 640 || boundingBox.Height >= 480)
+                PointsInSegment[0].Type.Value = PathType.Bezier;
+        }
+
         /// <summary>
         /// Updates the state of the circular control point marker.
         /// </summary>
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index dd39014bb6..ce5dc4855e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -11,12 +11,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Utils;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -93,8 +91,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                         }));
 
                         Connections.Add(new PathControlPointConnectionPiece(slider, e.NewStartingIndex + i));
-
-                        point.Changed += updatePathTypes;
                     }
 
                     break;
@@ -104,8 +100,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     {
                         Pieces.RemoveAll(p => p.ControlPoint == point);
                         Connections.RemoveAll(c => c.ControlPoint == point);
-
-                        point.Changed -= updatePathTypes;
                     }
 
                     // If removing before the end of the path,
@@ -148,23 +142,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
         }
 
-        /// <summary>
-        /// Handles correction of invalid path types.
-        /// </summary>
-        private void updatePathTypes()
-        {
-            foreach (PathControlPoint segmentStartPoint in slider.Path.ControlPoints.Where(p => p.Type.Value != null))
-            {
-                if (segmentStartPoint.Type.Value != PathType.PerfectCurve)
-                    continue;
-
-                ReadOnlySpan<Vector2> points = slider.Path.PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
-                RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
-                if (points.Length == 3 && boundingBox.Area >= 640 * 480)
-                    segmentStartPoint.Type.Value = PathType.Bezier;
-            }
-        }
-
         private void selectPiece(PathControlPointPiece piece, MouseButtonEvent e)
         {
             if (e.Button == MouseButton.Left && inputManager.CurrentState.Keyboard.ControlPressed)

From 5022a78e80b1a07c54ab55176570a7e4be2debaa Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:25:46 +0200
Subject: [PATCH 08767/10326] Check current point instead of start point

Since each control point will call this when the path updates, the previous would correct the start segment 3 times instead of just once.

This fixes that.
---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 8059fc910c..394d2b039d 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -212,7 +212,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         /// </summary>
         private void updatePathType()
         {
-            if (PointsInSegment[0].Type.Value != PathType.PerfectCurve)
+            if (ControlPoint.Type.Value != PathType.PerfectCurve)
                 return;
 
             ReadOnlySpan<Vector2> points = PointsInSegment.Select(p => p.Position.Value).ToArray();
@@ -221,7 +221,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
             if (boundingBox.Width >= 640 || boundingBox.Height >= 480)
-                PointsInSegment[0].Type.Value = PathType.Bezier;
+                ControlPoint.Type.Value = PathType.Bezier;
         }
 
         /// <summary>

From 7b684339ed64703c169dfccc27c3abfec521e586 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:32:49 +0200
Subject: [PATCH 08768/10326] Undo public -> internal for
 `PathControlPoint.Changed`

No longer used.
---
 osu.Game/Rulesets/Objects/PathControlPoint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/PathControlPoint.cs b/osu.Game/Rulesets/Objects/PathControlPoint.cs
index 2e4100ee0b..f11917f4f4 100644
--- a/osu.Game/Rulesets/Objects/PathControlPoint.cs
+++ b/osu.Game/Rulesets/Objects/PathControlPoint.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Objects
         /// <summary>
         /// Invoked when any property of this <see cref="PathControlPoint"/> is changed.
         /// </summary>
-        public event Action Changed;
+        internal event Action Changed;
 
         /// <summary>
         /// Creates a new <see cref="PathControlPoint"/>.

From 25afae5671514f88966f06b59eda1ef82b824ecf Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:48:17 +0200
Subject: [PATCH 08769/10326] Fix broken test case

Seems this technically works, but only because of the edge case of being entirely linear, which the framework catches.

This fixes that.
---
 .../Editor/TestSceneSliderPlacementBlueprint.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 24382d2c65..462abf2edb 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -307,7 +307,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addClickStep(MouseButton.Left);
 
             addMovementStep(startPosition + new Vector2(150, 0.1f)); // Should convert to bezier
-            addMovementStep(startPosition + new Vector2(210.0f, 0.0f)); // Should convert back to perfect
+            addMovementStep(startPosition + new Vector2(400.0f, 50.0f)); // Should convert back to perfect
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);

From af478fb2eb6052ddfcc0b99137d9605d2ff06681 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Apr 2021 22:02:32 +0900
Subject: [PATCH 08770/10326] Add abstract spectator screen class

---
 osu.Game/Screens/Spectate/GameplayState.cs   |  37 +++
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 237 +++++++++++++++++++
 2 files changed, 274 insertions(+)
 create mode 100644 osu.Game/Screens/Spectate/GameplayState.cs
 create mode 100644 osu.Game/Screens/Spectate/SpectatorScreen.cs

diff --git a/osu.Game/Screens/Spectate/GameplayState.cs b/osu.Game/Screens/Spectate/GameplayState.cs
new file mode 100644
index 0000000000..4579b9c07c
--- /dev/null
+++ b/osu.Game/Screens/Spectate/GameplayState.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.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Spectate
+{
+    /// <summary>
+    /// The gameplay state of a spectated user. This class is immutable.
+    /// </summary>
+    public class GameplayState
+    {
+        /// <summary>
+        /// The score which the user is playing.
+        /// </summary>
+        public readonly Score Score;
+
+        /// <summary>
+        /// The ruleset which the user is playing.
+        /// </summary>
+        public readonly Ruleset Ruleset;
+
+        /// <summary>
+        /// The beatmap which the user is playing.
+        /// </summary>
+        public readonly WorkingBeatmap Beatmap;
+
+        public GameplayState(Score score, Ruleset ruleset, WorkingBeatmap beatmap)
+        {
+            Score = score;
+            Ruleset = ruleset;
+            Beatmap = beatmap;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
new file mode 100644
index 0000000000..a534581807
--- /dev/null
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -0,0 +1,237 @@
+// Copyright (c) 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.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.Online.Spectator;
+using osu.Game.Replays;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Replays.Types;
+using osu.Game.Scoring;
+using osu.Game.Users;
+
+namespace osu.Game.Screens.Spectate
+{
+    /// <summary>
+    /// A <see cref="OsuScreen"/> which spectates one or more users.
+    /// </summary>
+    public abstract class SpectatorScreen : OsuScreen
+    {
+        private readonly int[] userIds;
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        [Resolved]
+        private SpectatorStreamingClient spectatorClient { get; set; }
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; }
+
+        private readonly object stateLock = new object();
+
+        private readonly Dictionary<int, User> userMap = new Dictionary<int, User>();
+        private readonly Dictionary<int, SpectatorState> spectatorStates = new Dictionary<int, SpectatorState>();
+        private readonly Dictionary<int, GameplayState> gameplayStates = new Dictionary<int, GameplayState>();
+
+        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
+
+        /// <summary>
+        /// Creates a new <see cref="SpectatorScreen"/>.
+        /// </summary>
+        /// <param name="userIds">The users to spectate.</param>
+        protected SpectatorScreen(params int[] userIds)
+        {
+            this.userIds = userIds;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            spectatorClient.OnUserBeganPlaying += userBeganPlaying;
+            spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
+            spectatorClient.OnNewFrames += userSentFrames;
+
+            foreach (var id in userIds)
+            {
+                userLookupCache.GetUserAsync(id).ContinueWith(u => Schedule(() =>
+                {
+                    if (u.Result == null)
+                        return;
+
+                    lock (stateLock)
+                        userMap[id] = u.Result;
+
+                    spectatorClient.WatchUser(id);
+                }), TaskContinuationOptions.OnlyOnRanToCompletion);
+            }
+
+            managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
+            managerUpdated.BindValueChanged(beatmapUpdated);
+        }
+
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> beatmap)
+        {
+            if (!beatmap.NewValue.TryGetTarget(out var beatmapSet))
+                return;
+
+            lock (stateLock)
+            {
+                foreach (var (userId, state) in spectatorStates)
+                {
+                    if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == state.BeatmapID))
+                        updateGameplayState(userId);
+                }
+            }
+        }
+
+        private void userBeganPlaying(int userId, SpectatorState state)
+        {
+            if (state.RulesetID == null || state.BeatmapID == null)
+                return;
+
+            lock (stateLock)
+            {
+                if (!userMap.ContainsKey(userId))
+                    return;
+
+                spectatorStates[userId] = state;
+                OnUserStateChanged(userId, state);
+
+                updateGameplayState(userId);
+            }
+        }
+
+        private void updateGameplayState(int userId)
+        {
+            lock (stateLock)
+            {
+                Debug.Assert(userMap.ContainsKey(userId));
+
+                var spectatorState = spectatorStates[userId];
+                var user = userMap[userId];
+
+                var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == spectatorState.RulesetID)?.CreateInstance();
+                if (resolvedRuleset == null)
+                    return;
+
+                var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == spectatorState.BeatmapID);
+                if (resolvedBeatmap == null)
+                    return;
+
+                var score = new Score
+                {
+                    ScoreInfo = new ScoreInfo
+                    {
+                        Beatmap = resolvedBeatmap,
+                        User = user,
+                        Mods = spectatorState.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
+                        Ruleset = resolvedRuleset.RulesetInfo,
+                    },
+                    Replay = new Replay { HasReceivedAllFrames = false },
+                };
+
+                var gameplayState = new GameplayState(score, resolvedRuleset, beatmaps.GetWorkingBeatmap(resolvedBeatmap));
+
+                gameplayStates[userId] = gameplayState;
+                StartGameplay(userId, gameplayState);
+            }
+        }
+
+        private void userSentFrames(int userId, FrameDataBundle bundle)
+        {
+            lock (stateLock)
+            {
+                if (!userMap.ContainsKey(userId))
+                    return;
+
+                if (!gameplayStates.TryGetValue(userId, out var gameplayState))
+                    return;
+
+                // The ruleset instance should be guaranteed to be in sync with the score via ScoreLock.
+                Debug.Assert(gameplayState.Ruleset != null && gameplayState.Ruleset.RulesetInfo.Equals(gameplayState.Score.ScoreInfo.Ruleset));
+
+                foreach (var frame in bundle.Frames)
+                {
+                    IConvertibleReplayFrame convertibleFrame = gameplayState.Ruleset.CreateConvertibleReplayFrame();
+                    convertibleFrame.FromLegacy(frame, gameplayState.Beatmap.Beatmap);
+
+                    var convertedFrame = (ReplayFrame)convertibleFrame;
+                    convertedFrame.Time = frame.Time;
+
+                    gameplayState.Score.Replay.Frames.Add(convertedFrame);
+                }
+            }
+        }
+
+        private void userFinishedPlaying(int userId, SpectatorState state)
+        {
+            lock (stateLock)
+            {
+                if (!userMap.ContainsKey(userId))
+                    return;
+
+                if (!gameplayStates.TryGetValue(userId, out var gameplayState))
+                    return;
+
+                gameplayState.Score.Replay.HasReceivedAllFrames = true;
+
+                gameplayStates.Remove(userId);
+                EndGameplay(userId);
+            }
+        }
+
+        /// <summary>
+        /// Invoked when a spectated user's state has changed.
+        /// </summary>
+        /// <param name="userId">The user whose state has changed.</param>
+        /// <param name="spectatorState">The new state.</param>
+        protected abstract void OnUserStateChanged(int userId, [NotNull] SpectatorState spectatorState);
+
+        /// <summary>
+        /// Starts gameplay for a user.
+        /// </summary>
+        /// <param name="userId">The user to start gameplay for.</param>
+        /// <param name="gameplayState">The gameplay state.</param>
+        protected abstract void StartGameplay(int userId, [NotNull] GameplayState gameplayState);
+
+        /// <summary>
+        /// Ends gameplay for a user.
+        /// </summary>
+        /// <param name="userId">The user to end gameplay for.</param>
+        protected abstract void EndGameplay(int userId);
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (spectatorClient != null)
+            {
+                spectatorClient.OnUserBeganPlaying -= userBeganPlaying;
+                spectatorClient.OnUserFinishedPlaying -= userFinishedPlaying;
+                spectatorClient.OnNewFrames -= userSentFrames;
+
+                lock (stateLock)
+                {
+                    foreach (var (userId, _) in userMap)
+                        spectatorClient.StopWatchingUser(userId);
+                }
+            }
+
+            managerUpdated?.UnbindAll();
+        }
+    }
+}

From 9e95441aa63ef92065204aa349cbd7abe2f44f62 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Apr 2021 22:08:52 +0900
Subject: [PATCH 08771/10326] Rename Spectator -> SoloSpectator

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs     | 8 ++++----
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs   | 2 +-
 osu.Game/Screens/Play/{Spectator.cs => SoloSpectator.cs} | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game/Screens/Play/{Spectator.cs => SoloSpectator.cs} (99%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 4a0e1282c4..b59f6a4eb7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         // used just to show beatmap card for the time being.
         protected override bool UseOnlineAPI => true;
 
-        private Spectator spectatorScreen;
+        private SoloSpectator spectatorScreen;
 
         [Resolved]
         private OsuGameBase game { get; set; }
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             loadSpectatingScreen();
 
-            AddAssert("screen hasn't changed", () => Stack.CurrentScreen is Spectator);
+            AddAssert("screen hasn't changed", () => Stack.CurrentScreen is SoloSpectator);
 
             start();
             sendFrames();
@@ -195,7 +195,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             start(-1234);
             sendFrames();
 
-            AddAssert("screen didn't change", () => Stack.CurrentScreen is Spectator);
+            AddAssert("screen didn't change", () => Stack.CurrentScreen is SoloSpectator);
         }
 
         private OsuFramedReplayInputHandler replayHandler =>
@@ -226,7 +226,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void loadSpectatingScreen()
         {
-            AddStep("load screen", () => LoadScreen(spectatorScreen = new Spectator(testSpectatorStreamingClient.StreamingUser)));
+            AddStep("load screen", () => LoadScreen(spectatorScreen = new SoloSpectator(testSpectatorStreamingClient.StreamingUser)));
             AddUntilStep("wait for screen load", () => spectatorScreen.LoadState == LoadState.Loaded);
         }
 
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index c89699f2ee..336430fd9b 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Overlays.Dashboard
                                 Text = "Watch",
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
-                                Action = () => game?.PerformFromScreen(s => s.Push(new Spectator(User))),
+                                Action = () => game?.PerformFromScreen(s => s.Push(new SoloSpectator(User))),
                                 Enabled = { Value = User.Id != api.LocalUser.Value.Id }
                             }
                         }
diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/SoloSpectator.cs
similarity index 99%
rename from osu.Game/Screens/Play/Spectator.cs
rename to osu.Game/Screens/Play/SoloSpectator.cs
index 28311f5113..9be42b52b3 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/SoloSpectator.cs
@@ -37,7 +37,7 @@ using osuTK;
 namespace osu.Game.Screens.Play
 {
     [Cached(typeof(IPreviewTrackOwner))]
-    public class Spectator : OsuScreen, IPreviewTrackOwner
+    public class SoloSpectator : OsuScreen, IPreviewTrackOwner
     {
         private readonly User targetUser;
 
@@ -88,7 +88,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         private bool newStatePending;
 
-        public Spectator([NotNull] User targetUser)
+        public SoloSpectator([NotNull] User targetUser)
         {
             this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
         }

From 9bc2a486e0c40baf2db334f6ef4cf1fdc5977a0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Apr 2021 22:09:51 +0900
Subject: [PATCH 08772/10326] Make SoloSpectator use the new SpectatorScreen
 class

---
 osu.Game/Screens/Play/SoloSpectator.cs | 233 ++++++-------------------
 1 file changed, 53 insertions(+), 180 deletions(-)

diff --git a/osu.Game/Screens/Play/SoloSpectator.cs b/osu.Game/Screens/Play/SoloSpectator.cs
index 9be42b52b3..f8ed7b585f 100644
--- a/osu.Game/Screens/Play/SoloSpectator.cs
+++ b/osu.Game/Screens/Play/SoloSpectator.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;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 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;
@@ -24,73 +20,54 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Overlays.Settings;
-using osu.Game.Replays;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Replays;
-using osu.Game.Rulesets.Replays.Types;
-using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.Spectate;
 using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Screens.Play
 {
     [Cached(typeof(IPreviewTrackOwner))]
-    public class SoloSpectator : OsuScreen, IPreviewTrackOwner
+    public class SoloSpectator : SpectatorScreen, IPreviewTrackOwner
     {
+        [NotNull]
         private readonly User targetUser;
 
-        [Resolved]
-        private Bindable<WorkingBeatmap> beatmap { get; set; }
-
-        [Resolved]
-        private Bindable<RulesetInfo> ruleset { get; set; }
-
-        private Ruleset rulesetInstance;
-
-        [Resolved]
-        private Bindable<IReadOnlyList<Mod>> mods { get; set; }
-
         [Resolved]
         private IAPIProvider api { get; set; }
 
         [Resolved]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
+        private PreviewTrackManager previewTrackManager { get; set; }
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
         [Resolved]
-        private PreviewTrackManager previewTrackManager { get; set; }
-
-        private Score score;
-
-        private readonly object scoreLock = new object();
+        private BeatmapManager beatmaps { get; set; }
 
         private Container beatmapPanelContainer;
-
-        private SpectatorState state;
-
-        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
-
         private TriangleButton watchButton;
-
         private SettingsCheckbox automaticDownload;
-
         private BeatmapSetInfo onlineBeatmap;
 
         /// <summary>
-        /// Becomes true if a new state is waiting to be loaded (while this screen was not active).
+        /// The player's immediate online gameplay state.
+        /// This doesn't reflect the gameplay state being watched by the user if <see cref="pendingGameplayState"/> is non-null.
         /// </summary>
-        private bool newStatePending;
+        private GameplayState immediateGameplayState;
+
+        /// <summary>
+        /// The gameplay state that is pending to be watched, upon this screen becoming current.
+        /// </summary>
+        private GameplayState pendingGameplayState;
+
+        private GetBeatmapSetRequest onlineBeatmapRequest;
 
         public SoloSpectator([NotNull] User targetUser)
+            : base(targetUser.Id)
         {
-            this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
+            this.targetUser = targetUser;
         }
 
         [BackgroundDependencyLoader]
@@ -173,7 +150,7 @@ namespace osu.Game.Screens.Play
                                 Width = 250,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Action = attemptStart,
+                                Action = () => attemptStart(immediateGameplayState),
                                 Enabled = { Value = false }
                             }
                         }
@@ -185,169 +162,81 @@ namespace osu.Game.Screens.Play
         protected override void LoadComplete()
         {
             base.LoadComplete();
-
-            spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
-            spectatorStreaming.OnUserFinishedPlaying += userFinishedPlaying;
-            spectatorStreaming.OnNewFrames += userSentFrames;
-
-            spectatorStreaming.WatchUser(targetUser.Id);
-
-            managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
-            managerUpdated.BindValueChanged(beatmapUpdated);
-
             automaticDownload.Current.BindValueChanged(_ => checkForAutomaticDownload());
         }
 
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> beatmap)
+        protected override void OnUserStateChanged(int userId, SpectatorState spectatorState) => Schedule(() =>
         {
-            if (beatmap.NewValue.TryGetTarget(out var beatmapSet) && beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == state.BeatmapID))
-                Schedule(attemptStart);
-        }
+            clearDisplay();
+            showBeatmapPanel(spectatorState);
+        });
 
-        private void userSentFrames(int userId, FrameDataBundle data)
+        protected override void StartGameplay(int userId, GameplayState gameplayState) => Schedule(() =>
         {
-            // this is not scheduled as it handles propagation of frames even when in a child screen (at which point we are not alive).
-            // probably not the safest way to handle this.
-
-            if (userId != targetUser.Id)
-                return;
-
-            lock (scoreLock)
-            {
-                // this should never happen as the server sends the user's state on watching,
-                // but is here as a safety measure.
-                if (score == null)
-                    return;
-
-                // rulesetInstance should be guaranteed to be in sync with the score via scoreLock.
-                Debug.Assert(rulesetInstance != null && rulesetInstance.RulesetInfo.Equals(score.ScoreInfo.Ruleset));
-
-                foreach (var frame in data.Frames)
-                {
-                    IConvertibleReplayFrame convertibleFrame = rulesetInstance.CreateConvertibleReplayFrame();
-                    convertibleFrame.FromLegacy(frame, beatmap.Value.Beatmap);
-
-                    var convertedFrame = (ReplayFrame)convertibleFrame;
-                    convertedFrame.Time = frame.Time;
-
-                    score.Replay.Frames.Add(convertedFrame);
-                }
-            }
-        }
-
-        private void userBeganPlaying(int userId, SpectatorState state)
-        {
-            if (userId != targetUser.Id)
-                return;
-
-            this.state = state;
+            pendingGameplayState = null;
+            immediateGameplayState = gameplayState;
 
             if (this.IsCurrentScreen())
-                Schedule(attemptStart);
+                attemptStart(gameplayState);
             else
-                newStatePending = true;
-        }
+                pendingGameplayState = gameplayState;
+
+            watchButton.Enabled.Value = true;
+        });
+
+        protected override void EndGameplay(int userId) => Schedule(() =>
+        {
+            pendingGameplayState = null;
+            immediateGameplayState = null;
+
+            Schedule(clearDisplay);
+
+            watchButton.Enabled.Value = false;
+        });
 
         public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
 
-            if (newStatePending)
+            if (pendingGameplayState != null)
             {
-                attemptStart();
-                newStatePending = false;
+                attemptStart(pendingGameplayState);
+                pendingGameplayState = null;
             }
         }
 
-        private void userFinishedPlaying(int userId, SpectatorState state)
-        {
-            if (userId != targetUser.Id)
-                return;
-
-            lock (scoreLock)
-            {
-                if (score != null)
-                {
-                    score.Replay.HasReceivedAllFrames = true;
-                    score = null;
-                }
-            }
-
-            Schedule(clearDisplay);
-        }
-
         private void clearDisplay()
         {
             watchButton.Enabled.Value = false;
+            onlineBeatmapRequest?.Cancel();
             beatmapPanelContainer.Clear();
             previewTrackManager.StopAnyPlaying(this);
         }
 
-        private void attemptStart()
+        private void attemptStart(GameplayState gameplayState)
         {
-            clearDisplay();
-            showBeatmapPanel(state);
-
-            var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == state.RulesetID)?.CreateInstance();
-
-            // ruleset not available
-            if (resolvedRuleset == null)
+            if (gameplayState == null)
                 return;
 
-            if (state.BeatmapID == null)
-                return;
+            Beatmap.Value = gameplayState.Beatmap;
+            Ruleset.Value = gameplayState.Ruleset.RulesetInfo;
 
-            var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == state.BeatmapID);
-
-            if (resolvedBeatmap == null)
-            {
-                return;
-            }
-
-            lock (scoreLock)
-            {
-                score = new Score
-                {
-                    ScoreInfo = new ScoreInfo
-                    {
-                        Beatmap = resolvedBeatmap,
-                        User = targetUser,
-                        Mods = state.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
-                        Ruleset = resolvedRuleset.RulesetInfo,
-                    },
-                    Replay = new Replay { HasReceivedAllFrames = false },
-                };
-
-                ruleset.Value = resolvedRuleset.RulesetInfo;
-                rulesetInstance = resolvedRuleset;
-
-                beatmap.Value = beatmaps.GetWorkingBeatmap(resolvedBeatmap);
-                watchButton.Enabled.Value = true;
-
-                this.Push(new SpectatorPlayerLoader(score));
-            }
+            this.Push(new SpectatorPlayerLoader(gameplayState.Score));
         }
 
         private void showBeatmapPanel(SpectatorState state)
         {
-            if (state?.BeatmapID == null)
-            {
-                onlineBeatmap = null;
-                return;
-            }
+            Debug.Assert(state.BeatmapID != null);
 
-            var req = new GetBeatmapSetRequest(state.BeatmapID.Value, BeatmapSetLookupType.BeatmapId);
-            req.Success += res => Schedule(() =>
+            onlineBeatmapRequest = new GetBeatmapSetRequest(state.BeatmapID.Value, BeatmapSetLookupType.BeatmapId);
+            onlineBeatmapRequest.Success += res => Schedule(() =>
             {
-                if (state != this.state)
-                    return;
-
                 onlineBeatmap = res.ToBeatmapSet(rulesets);
                 beatmapPanelContainer.Child = new GridBeatmapPanel(onlineBeatmap);
                 checkForAutomaticDownload();
             });
 
-            api.Queue(req);
+            api.Queue(onlineBeatmapRequest);
         }
 
         private void checkForAutomaticDownload()
@@ -369,21 +258,5 @@ namespace osu.Game.Screens.Play
             previewTrackManager.StopAnyPlaying(this);
             return base.OnExiting(next);
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (spectatorStreaming != null)
-            {
-                spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
-                spectatorStreaming.OnUserFinishedPlaying -= userFinishedPlaying;
-                spectatorStreaming.OnNewFrames -= userSentFrames;
-
-                spectatorStreaming.StopWatchingUser(targetUser.Id);
-            }
-
-            managerUpdated?.UnbindAll();
-        }
     }
 }

From c3c7c18549e281503d3225db9bc0d3fbc85c1511 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Apr 2021 23:48:26 +0900
Subject: [PATCH 08773/10326] Fix tests

---
 .../Visual/Gameplay/TestSceneSpectator.cs         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index b59f6a4eb7..9d85a9995d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -3,6 +3,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,6 +13,7 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Online;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
@@ -29,6 +32,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(SpectatorStreamingClient))]
         private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
 
+        [Cached(typeof(UserLookupCache))]
+        private UserLookupCache lookupCache = new TestUserLookupCache();
+
         // used just to show beatmap card for the time being.
         protected override bool UseOnlineAPI => true;
 
@@ -301,5 +307,14 @@ namespace osu.Game.Tests.Visual.Gameplay
                 });
             }
         }
+
+        internal class TestUserLookupCache : UserLookupCache
+        {
+            protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default) => Task.FromResult(new User
+            {
+                Id = lookup,
+                Username = $"User {lookup}"
+            });
+        }
     }
 }

From b8479a979f1ae1453e4488ec555a3cdc0e49f082 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 1 Apr 2021 18:06:12 +0200
Subject: [PATCH 08774/10326] Remove unused blueprint variable

---
 .../Editor/TestSceneSliderControlPointPiece.cs                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index b4eba7070b..9b67d18db6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
     {
         private Slider slider;
         private DrawableSlider drawableObject;
-        private TestSliderBlueprint blueprint;
 
         [SetUp]
         public void Setup() => Schedule(() =>
@@ -45,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
 
             Add(drawableObject = new DrawableSlider(slider));
-            AddBlueprint(blueprint = new TestSliderBlueprint(drawableObject));
+            AddBlueprint(new TestSliderBlueprint(drawableObject));
         });
 
         [Test]

From 6a286c5e2128c3103bd36548434f29260aec806d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 1 Apr 2021 17:16:02 +0000
Subject: [PATCH 08775/10326] Bump Microsoft.NET.Test.Sdk from 16.9.1 to 16.9.4

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.1 to 16.9.4.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.9.1...v16.9.4)

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 728af5124e..c2d9a923d9 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.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 af16f39563..64e934efd2 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.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 3d2d1f3fec..f743d65db3 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.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 fa00922706..eab144592f 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.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 e36b3cdc74..0e1f6f6b0c 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.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <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 b20583dd7e..a4e52f8cd4 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.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>

From 8621a6b4fe8b84e50e2a1d56b25e3bed9824be6f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 1 Apr 2021 20:34:04 +0200
Subject: [PATCH 08776/10326] Add margin to large segment test

Test ran fine on my end, but apparently not on the CI. This should make results a bit more consistent, hopefully.
---
 .../Editor/TestSceneSliderPlacementBlueprint.cs             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 462abf2edb..d2c37061f0 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -323,12 +323,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(startPosition + new Vector2(240, 240));
+            addMovementStep(startPosition + new Vector2(220, 220));
             addClickStep(MouseButton.Left);
 
             // Playfield dimensions are 640 x 480.
-            // So a 480 x 480 bounding box should be ok.
-            addMovementStep(startPosition + new Vector2(-240, 240));
+            // So a 440 x 440 bounding box should be ok.
+            addMovementStep(startPosition + new Vector2(-220, 220));
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);

From fcd56dba44a84e3e752e97f0eb3ed6409407f5ac Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 2 Apr 2021 01:38:10 +0300
Subject: [PATCH 08777/10326] Guard against same ruleset file with loaded
 assembly filenames instead

---
 osu.Game/Rulesets/RulesetStore.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index deabea57ef..eb5271aa17 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -173,7 +174,7 @@ namespace osu.Game.Rulesets
         {
             var filename = Path.GetFileNameWithoutExtension(file);
 
-            if (loadedAssemblies.Values.Any(t => t.Namespace == filename))
+            if (loadedAssemblies.Values.Any(t => Path.GetFileNameWithoutExtension(t.Assembly.Location) == filename))
                 return;
 
             try

From 5b1dc7d2b426e505da4b67cf8876404078a7f72f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 2 Apr 2021 02:45:26 +0300
Subject: [PATCH 08778/10326] Remove unused using directive

---
 osu.Game/Rulesets/RulesetStore.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index eb5271aa17..4261ee3d47 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;

From e1aa9278272eabe7f6a975f3c78f4c03fca9122c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 2 Apr 2021 13:20:15 +0900
Subject: [PATCH 08779/10326] Add dropdown option to export score

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 5608002513..da1bbd18c7 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -61,6 +61,9 @@ namespace osu.Game.Online.Leaderboards
         [Resolved(CanBeNull = true)]
         private SongSelect songSelect { get; set; }
 
+        [Resolved]
+        private ScoreManager scoreManager { get; set; }
+
         public LeaderboardScore(ScoreInfo score, int? rank, bool allowHighlight = true)
         {
             this.score = score;
@@ -388,6 +391,9 @@ namespace osu.Game.Online.Leaderboards
                 if (score.Mods.Length > 0 && modsContainer.Any(s => s.IsHovered) && songSelect != null)
                     items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, () => songSelect.Mods.Value = score.Mods));
 
+                if (score.Files.Count > 0)
+                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => scoreManager.Export(score)));
+
                 if (score.ID != 0)
                     items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(score))));
 

From 6d4d574a659c5148a7400003c6896990b2b689aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Apr 2021 14:10:25 +0900
Subject: [PATCH 08780/10326] Fix exported replay filenames not having full
 metadata

---
 osu.Game/Beatmaps/BeatmapInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index a898e10e4f..bf7906bd5c 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Beatmaps
         {
             string version = string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
 
-            return $"{Metadata} {version}".Trim();
+            return $"{Metadata ?? BeatmapSet?.Metadata} {version}".Trim();
         }
 
         public bool Equals(BeatmapInfo other)

From 5063cd957f8013c060aff0d5bc14b6a4ec58a9e1 Mon Sep 17 00:00:00 2001
From: Amber <amberkowalski03@gmail.com>
Date: Fri, 2 Apr 2021 02:54:35 -0500
Subject: [PATCH 08781/10326] Force hit sample to play when Classic mod is
 enabled

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs                 | 4 ++++
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs   | 2 +-
 .../Objects/Drawables/DrawableSliderTail.cs                 | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 5470d0fcb4..21fde7cdc7 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -79,6 +79,10 @@ namespace osu.Game.Rulesets.Osu.Mods
                     case DrawableSliderHead head:
                         head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                         break;
+
+                    case DrawableSliderTail tail:
+                        tail.AlwaysPlaySample = true;
+                        break;
                 }
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 9122f347d0..4288f00e3a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -280,7 +280,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             // rather than doing it this way, we should probably attach the sample to the tail circle.
             // this can only be done after we stop using LegacyLastTick.
-            if (TailCircle.IsHit)
+            if (TailCircle.IsHit || TailCircle.AlwaysPlaySample)
                 base.PlaySamples();
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 6a8e02e886..ad6b98cba8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -26,6 +26,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         public override bool DisplayResult => false;
 
+        /// <summary>
+        /// Whether the hit sample should always be played, regardless of whether the tail was actually hit.
+        /// </summary>
+        public bool AlwaysPlaySample { get; set; }
+
         public bool Tracking { get; set; }
 
         private SkinnableDrawable circlePiece;
@@ -44,6 +49,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
+            AlwaysPlaySample = false;
             Origin = Anchor.Centre;
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 

From 45d16fb9164014de9990b6342f2a2d04b3805ba8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Apr 2021 16:56:47 +0900
Subject: [PATCH 08782/10326] Rename event parameter for clarity

---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index a534581807..25dd482112 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -83,9 +83,9 @@ namespace osu.Game.Screens.Spectate
             managerUpdated.BindValueChanged(beatmapUpdated);
         }
 
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> beatmap)
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> e)
         {
-            if (!beatmap.NewValue.TryGetTarget(out var beatmapSet))
+            if (!e.NewValue.TryGetTarget(out var beatmapSet))
                 return;
 
             lock (stateLock)

From 48e9985782cb5537b1053d6beb05342409a7a921 Mon Sep 17 00:00:00 2001
From: Amber <amberkowalski03@gmail.com>
Date: Fri, 2 Apr 2021 03:10:28 -0500
Subject: [PATCH 08783/10326] Make "AlwaysPlayTailSample" a mod setting rather
 than a hardcoded constant.

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 21fde7cdc7..ec74225774 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -44,6 +44,9 @@ namespace osu.Game.Rulesets.Osu.Mods
         [SettingSource("Use fixed slider follow circle hit area", "Makes the slider follow circle track its final size at all times.")]
         public Bindable<bool> FixedFollowCircleHitArea { get; } = new BindableBool(true);
 
+        [SettingSource("Always play a slider's tail sample", "Always plays a slider's tail sample regardless of whether it was hit or not.")]
+        public Bindable<bool> AlwaysPlayTailSample { get; } = new BindableBool(true);
+
         public void ApplyToHitObject(HitObject hitObject)
         {
             switch (hitObject)
@@ -81,7 +84,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                         break;
 
                     case DrawableSliderTail tail:
-                        tail.AlwaysPlaySample = true;
+                        tail.AlwaysPlaySample = AlwaysPlayTailSample.Value;
                         break;
                 }
             }

From 5ac36a24625eb80c5f897ed7929788e08bb988c4 Mon Sep 17 00:00:00 2001
From: Amber <amberkowalski03@gmail.com>
Date: Fri, 2 Apr 2021 03:56:23 -0500
Subject: [PATCH 08784/10326] Switch AlwaysPlaySample to SamplePlaysOnlyOnHit
 in DrawableSliderTail for conformity

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs                   | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs     | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index ec74225774..882f848190 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                         break;
 
                     case DrawableSliderTail tail:
-                        tail.AlwaysPlaySample = AlwaysPlayTailSample.Value;
+                        tail.SamplePlaysOnlyOnHit = !AlwaysPlayTailSample.Value;
                         break;
                 }
             }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 4288f00e3a..04708a5ece 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -280,7 +280,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             // rather than doing it this way, we should probably attach the sample to the tail circle.
             // this can only be done after we stop using LegacyLastTick.
-            if (TailCircle.IsHit || TailCircle.AlwaysPlaySample)
+            if (!TailCircle.SamplePlaysOnlyOnHit || TailCircle.IsHit)
                 base.PlaySamples();
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index ad6b98cba8..4b9c10ab67 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// Whether the hit sample should always be played, regardless of whether the tail was actually hit.
         /// </summary>
-        public bool AlwaysPlaySample { get; set; }
+        public bool SamplePlaysOnlyOnHit { get; set; } = true;
 
         public bool Tracking { get; set; }
 
@@ -49,7 +49,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            AlwaysPlaySample = false;
             Origin = Anchor.Centre;
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 

From 9c3d15171c6ba033970550e6e158a3fce750c3f6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 2 Apr 2021 18:00:28 +0900
Subject: [PATCH 08785/10326] Reword xmldoc slightly

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 4b9c10ab67..87f098dd29 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -27,7 +27,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public override bool DisplayResult => false;
 
         /// <summary>
-        /// Whether the hit sample should always be played, regardless of whether the tail was actually hit.
+        /// Whether the hit samples only play on successful hits.
+        /// If <c>false</c>, the hit samples will also play on misses.
         /// </summary>
         public bool SamplePlaysOnlyOnHit { get; set; } = true;
 

From d2950105fb391fffe4463248ca3d172286b54d09 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 2 Apr 2021 20:31:34 +0900
Subject: [PATCH 08786/10326] Add comment explaining use of lock

---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 25dd482112..4d285d519e 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Screens.Spectate
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
 
+        // A lock is used to synchronise access to spectator/gameplay states, since this class is a screen which may become non-current and stop receiving updates at any point.
         private readonly object stateLock = new object();
 
         private readonly Dictionary<int, User> userMap = new Dictionary<int, User>();

From 1ff77754fd9f1e40709b3a547ca090fcef07ef76 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 2 Apr 2021 20:14:31 +0800
Subject: [PATCH 08787/10326] Use OnlineViewContainer

---
 .../Visual/SongSelect/TestSceneBeatmapDetails.cs   |  5 +++++
 osu.Game/Screens/Select/BeatmapDetails.cs          | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs
index acf037198f..06572f66bf 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Tests.Visual.SongSelect
@@ -14,6 +15,8 @@ namespace osu.Game.Tests.Visual.SongSelect
     {
         private BeatmapDetails details;
 
+        private DummyAPIAccess api => (DummyAPIAccess)API;
+
         [SetUp]
         public void Setup() => Schedule(() =>
         {
@@ -173,6 +176,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 OnlineBeatmapID = 162,
             });
+            AddStep("set online", () => api.SetState(APIState.Online));
+            AddStep("set offline", () => api.SetState(APIState.Offline));
         }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 8a1c291fca..55616b1640 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
+using osu.Game.Online;
 
 namespace osu.Game.Screens.Select
 {
@@ -136,7 +137,7 @@ namespace osu.Game.Screens.Select
                                 },
                             },
                         },
-                        failRetryContainer = new Container
+                        failRetryContainer = new OnlineViewContainer("Sign in to view more details")
                         {
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft,
@@ -153,11 +154,11 @@ namespace osu.Game.Screens.Select
                                     RelativeSizeAxes = Axes.Both,
                                     Padding = new MarginPadding { Top = 14 + spacing / 2 },
                                 },
+                                loading = new LoadingLayer(true)
                             },
                         },
                     },
                 },
-                loading = new LoadingLayer(true),
             };
         }
 
@@ -222,11 +223,9 @@ namespace osu.Game.Screens.Select
                     if (beatmap != requestedBeatmap)
                         // the beatmap has been changed since we started the lookup.
                         return;
-
                     updateMetrics();
                 });
             };
-
             api.Queue(lookup);
             loading.Show();
         }
@@ -236,7 +235,9 @@ namespace osu.Game.Screens.Select
             var hasRatings = beatmap?.BeatmapSet?.Metrics?.Ratings?.Any() ?? false;
             var hasRetriesFails = (beatmap?.Metrics?.Retries?.Any() ?? false) || (beatmap?.Metrics?.Fails?.Any() ?? false);
 
-            if (hasRatings)
+            bool isOnline = api.State.Value == APIState.Online;
+
+            if (hasRatings && isOnline)
             {
                 ratings.Metrics = beatmap.BeatmapSet.Metrics;
                 ratingsContainer.FadeIn(transition_duration);
@@ -244,7 +245,7 @@ namespace osu.Game.Screens.Select
             else
             {
                 ratings.Metrics = new BeatmapSetMetrics { Ratings = new int[10] };
-                ratingsContainer.FadeTo(0.25f, transition_duration);
+                ratingsContainer.FadeTo(isOnline ? 0.25f : 0, transition_duration);
             }
 
             if (hasRetriesFails)
@@ -259,7 +260,6 @@ namespace osu.Game.Screens.Select
                     Fails = new int[100],
                     Retries = new int[100],
                 };
-                failRetryContainer.FadeOut(transition_duration);
             }
 
             loading.Hide();

From cd53074941d864e0e1eaa33d8008f1730e8339a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 2 Apr 2021 21:27:20 +0900
Subject: [PATCH 08788/10326] Schedule spectator callbacks

---
 osu.Game/Screens/Play/SoloSpectator.cs       | 69 +++++++++-----------
 osu.Game/Screens/Spectate/SpectatorScreen.cs |  6 +-
 2 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Screens/Play/SoloSpectator.cs b/osu.Game/Screens/Play/SoloSpectator.cs
index f8ed7b585f..820d776e63 100644
--- a/osu.Game/Screens/Play/SoloSpectator.cs
+++ b/osu.Game/Screens/Play/SoloSpectator.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Screens;
+using osu.Framework.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -53,15 +54,10 @@ namespace osu.Game.Screens.Play
 
         /// <summary>
         /// The player's immediate online gameplay state.
-        /// This doesn't reflect the gameplay state being watched by the user if <see cref="pendingGameplayState"/> is non-null.
+        /// This doesn't always reflect the gameplay state being watched.
         /// </summary>
         private GameplayState immediateGameplayState;
 
-        /// <summary>
-        /// The gameplay state that is pending to be watched, upon this screen becoming current.
-        /// </summary>
-        private GameplayState pendingGameplayState;
-
         private GetBeatmapSetRequest onlineBeatmapRequest;
 
         public SoloSpectator([NotNull] User targetUser)
@@ -150,7 +146,7 @@ namespace osu.Game.Screens.Play
                                 Width = 250,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Action = () => attemptStart(immediateGameplayState),
+                                Action = () => scheduleStart(immediateGameplayState),
                                 Enabled = { Value = false }
                             }
                         }
@@ -165,44 +161,27 @@ namespace osu.Game.Screens.Play
             automaticDownload.Current.BindValueChanged(_ => checkForAutomaticDownload());
         }
 
-        protected override void OnUserStateChanged(int userId, SpectatorState spectatorState) => Schedule(() =>
+        protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
         {
             clearDisplay();
             showBeatmapPanel(spectatorState);
-        });
+        }
 
-        protected override void StartGameplay(int userId, GameplayState gameplayState) => Schedule(() =>
+        protected override void StartGameplay(int userId, GameplayState gameplayState)
         {
-            pendingGameplayState = null;
             immediateGameplayState = gameplayState;
-
-            if (this.IsCurrentScreen())
-                attemptStart(gameplayState);
-            else
-                pendingGameplayState = gameplayState;
-
             watchButton.Enabled.Value = true;
-        });
 
-        protected override void EndGameplay(int userId) => Schedule(() =>
+            scheduleStart(gameplayState);
+        }
+
+        protected override void EndGameplay(int userId)
         {
-            pendingGameplayState = null;
+            scheduledStart?.Cancel();
             immediateGameplayState = null;
-
-            Schedule(clearDisplay);
-
             watchButton.Enabled.Value = false;
-        });
 
-        public override void OnResuming(IScreen last)
-        {
-            base.OnResuming(last);
-
-            if (pendingGameplayState != null)
-            {
-                attemptStart(pendingGameplayState);
-                pendingGameplayState = null;
-            }
+            clearDisplay();
         }
 
         private void clearDisplay()
@@ -213,15 +192,27 @@ namespace osu.Game.Screens.Play
             previewTrackManager.StopAnyPlaying(this);
         }
 
-        private void attemptStart(GameplayState gameplayState)
+        private ScheduledDelegate scheduledStart;
+
+        private void scheduleStart(GameplayState gameplayState)
         {
-            if (gameplayState == null)
-                return;
+            // This function may be called multiple times in quick succession once the screen becomes current again.
+            scheduledStart?.Cancel();
+            scheduledStart = Schedule(() =>
+            {
+                if (this.IsCurrentScreen())
+                    start();
+                else
+                    scheduleStart(gameplayState);
+            });
 
-            Beatmap.Value = gameplayState.Beatmap;
-            Ruleset.Value = gameplayState.Ruleset.RulesetInfo;
+            void start()
+            {
+                Beatmap.Value = gameplayState.Beatmap;
+                Ruleset.Value = gameplayState.Ruleset.RulesetInfo;
 
-            this.Push(new SpectatorPlayerLoader(gameplayState.Score));
+                this.Push(new SpectatorPlayerLoader(gameplayState.Score));
+            }
         }
 
         private void showBeatmapPanel(SpectatorState state)
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 4d285d519e..6dd3144fc8 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Spectate
                     return;
 
                 spectatorStates[userId] = state;
-                OnUserStateChanged(userId, state);
+                Schedule(() => OnUserStateChanged(userId, state));
 
                 updateGameplayState(userId);
             }
@@ -148,7 +148,7 @@ namespace osu.Game.Screens.Spectate
                 var gameplayState = new GameplayState(score, resolvedRuleset, beatmaps.GetWorkingBeatmap(resolvedBeatmap));
 
                 gameplayStates[userId] = gameplayState;
-                StartGameplay(userId, gameplayState);
+                Schedule(() => StartGameplay(userId, gameplayState));
             }
         }
 
@@ -191,7 +191,7 @@ namespace osu.Game.Screens.Spectate
                 gameplayState.Score.Replay.HasReceivedAllFrames = true;
 
                 gameplayStates.Remove(userId);
-                EndGameplay(userId);
+                Schedule(() => EndGameplay(userId));
             }
         }
 

From a5a19319cc6682e8380b8bee725657b64c5ee66e Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 2 Apr 2021 21:15:28 +0800
Subject: [PATCH 08789/10326] Fix code style

---
 osu.Game/Screens/Select/BeatmapDetails.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 55616b1640..40029cc19a 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -223,9 +223,11 @@ namespace osu.Game.Screens.Select
                     if (beatmap != requestedBeatmap)
                         // the beatmap has been changed since we started the lookup.
                         return;
+
                     updateMetrics();
                 });
             };
+
             api.Queue(lookup);
             loading.Show();
         }

From 438f3e63499528226d13e21dac77880dc118a67a Mon Sep 17 00:00:00 2001
From: hbnrmx <dev@hbnr.mx>
Date: Fri, 2 Apr 2021 17:57:21 +0200
Subject: [PATCH 08790/10326] move fallback text to PlaceholderText

---
 osu.Game/Screens/Edit/Setup/ResourcesSection.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 1b841775e2..e00eaf9aa2 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -73,7 +73,8 @@ namespace osu.Game.Screens.Edit.Setup
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",
-                    Current = { Value = working.Value.Metadata.AudioFile ?? "Click to select a track" },
+                    PlaceholderText = "Click to select a track",
+                    Current = { Value = working.Value.Metadata.AudioFile },
                     Target = audioTrackFileChooserContainer,
                     TabbableContentContainer = this
                 },

From 824fb9f3987817585365e45ed01642b21573f387 Mon Sep 17 00:00:00 2001
From: hbnrmx <dev@hbnr.mx>
Date: Fri, 2 Apr 2021 18:01:26 +0200
Subject: [PATCH 08791/10326] reopen FileSelector in the directory of the
 previous selection

---
 osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
index 6e2737256a..70876bf26c 100644
--- a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
+++ b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Edit.Setup
         {
             FileSelector fileSelector;
 
-            Target.Child = fileSelector = new FileSelector(validFileExtensions: ResourcesSection.AudioExtensions)
+            Target.Child = fileSelector = new FileSelector(currentFile.Value?.DirectoryName, ResourcesSection.AudioExtensions)
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 400,

From 0dce4b8894a55d9d6295673476557fd8041b6b6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 3 Apr 2021 13:01:08 +0900
Subject: [PATCH 08792/10326] 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 5b65670869..73ee1d9d10 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.330.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.402.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6a7f7e7026..931b55222a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.330.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.402.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 4aa3ad1c61..64e9a01a92 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.Framework.iOS" Version="2021.330.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.402.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.330.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.402.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From bd7da9eb39703e033c0ffa5b30563659f505efc2 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 3 Apr 2021 12:43:17 +0800
Subject: [PATCH 08793/10326] Make beatmap title use unicode

---
 osu.Game/Beatmaps/BeatmapMetadata.cs                    | 2 ++
 osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 367f612dc8..eea9bdd976 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -19,8 +19,10 @@ namespace osu.Game.Beatmaps
         public int ID { get; set; }
 
         public string Title { get; set; }
+        [JsonProperty("title_unicode")]
         public string TitleUnicode { get; set; }
         public string Artist { get; set; }
+        [JsonProperty("artist_unicode")]
         public string ArtistUnicode { get; set; }
 
         [JsonIgnore]
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
index 153aa41582..a61640a02e 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -228,8 +229,8 @@ namespace osu.Game.Overlays.BeatmapSet
 
                     loading.Hide();
 
-                    title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
-                    artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
+                    title.Text = new RomanisableString(setInfo.NewValue.Metadata.TitleUnicode, setInfo.NewValue.Metadata.Title);
+                    artist.Text = new RomanisableString(setInfo.NewValue.Metadata.ArtistUnicode, setInfo.NewValue.Metadata.Artist);
 
                     explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
 

From dde255980b9aa24bfe95764e20f811fca6b757f7 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 3 Apr 2021 12:44:51 +0800
Subject: [PATCH 08794/10326] Fix formatting

---
 osu.Game/Beatmaps/BeatmapMetadata.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index eea9bdd976..858da8e602 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -19,9 +19,12 @@ namespace osu.Game.Beatmaps
         public int ID { get; set; }
 
         public string Title { get; set; }
+
         [JsonProperty("title_unicode")]
         public string TitleUnicode { get; set; }
+
         public string Artist { get; set; }
+
         [JsonProperty("artist_unicode")]
         public string ArtistUnicode { get; set; }
 

From fe66b84bede18b7a2148c5c4ae1fdea948cad717 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 6 Feb 2021 15:48:14 +1100
Subject: [PATCH 08795/10326] Implement dynamic previous hitobject retention
 for Skill class

There is no reason we should be limiting skills to knowing only the previous 2 objects. This originally existed as an angle implementation detail of the original pp+ codebase which made its way here, but didn't get used in the same way.
---
 .../NonVisual/LimitedCapacityStackTest.cs     | 115 --------------
 osu.Game.Tests/NonVisual/ReverseQueueTest.cs  | 143 ++++++++++++++++++
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs  |  33 +++-
 .../Difficulty/Utils/LimitedCapacityStack.cs  |  92 -----------
 .../Rulesets/Difficulty/Utils/ReverseQueue.cs | 110 ++++++++++++++
 5 files changed, 284 insertions(+), 209 deletions(-)
 delete mode 100644 osu.Game.Tests/NonVisual/LimitedCapacityStackTest.cs
 create mode 100644 osu.Game.Tests/NonVisual/ReverseQueueTest.cs
 delete mode 100644 osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs
 create mode 100644 osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs

diff --git a/osu.Game.Tests/NonVisual/LimitedCapacityStackTest.cs b/osu.Game.Tests/NonVisual/LimitedCapacityStackTest.cs
deleted file mode 100644
index d5ac38008e..0000000000
--- a/osu.Game.Tests/NonVisual/LimitedCapacityStackTest.cs
+++ /dev/null
@@ -1,115 +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 NUnit.Framework;
-using osu.Game.Rulesets.Difficulty.Utils;
-
-namespace osu.Game.Tests.NonVisual
-{
-    [TestFixture]
-    public class LimitedCapacityStackTest
-    {
-        private const int capacity = 3;
-
-        private LimitedCapacityStack<int> stack;
-
-        [SetUp]
-        public void Setup()
-        {
-            stack = new LimitedCapacityStack<int>(capacity);
-        }
-
-        [Test]
-        public void TestEmptyStack()
-        {
-            Assert.AreEqual(0, stack.Count);
-
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-            {
-                int unused = stack[0];
-            });
-
-            int count = 0;
-            foreach (var unused in stack)
-                count++;
-
-            Assert.AreEqual(0, count);
-        }
-
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        public void TestInRangeElements(int count)
-        {
-            // e.g. 0 -> 1 -> 2
-            for (int i = 0; i < count; i++)
-                stack.Push(i);
-
-            Assert.AreEqual(count, stack.Count);
-
-            // e.g. 2 -> 1 -> 0 (reverse order)
-            for (int i = 0; i < stack.Count; i++)
-                Assert.AreEqual(count - 1 - i, stack[i]);
-
-            // e.g. indices 3, 4, 5, 6 (out of range)
-            for (int i = stack.Count; i < stack.Count + capacity; i++)
-            {
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    int unused = stack[i];
-                });
-            }
-        }
-
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        public void TestOverflowElements(int count)
-        {
-            // e.g. 0 -> 1 -> 2 -> 3
-            for (int i = 0; i < count; i++)
-                stack.Push(i);
-
-            Assert.AreEqual(capacity, stack.Count);
-
-            // e.g. 3 -> 2 -> 1 (reverse order)
-            for (int i = 0; i < stack.Count; i++)
-                Assert.AreEqual(count - 1 - i, stack[i]);
-
-            // e.g. indices 3, 4, 5, 6 (out of range)
-            for (int i = stack.Count; i < stack.Count + capacity; i++)
-            {
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    int unused = stack[i];
-                });
-            }
-        }
-
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        public void TestEnumerator(int count)
-        {
-            // e.g. 0 -> 1 -> 2 -> 3
-            for (int i = 0; i < count; i++)
-                stack.Push(i);
-
-            int enumeratorCount = 0;
-            int expectedValue = count - 1;
-
-            foreach (var item in stack)
-            {
-                Assert.AreEqual(expectedValue, item);
-                enumeratorCount++;
-                expectedValue--;
-            }
-
-            Assert.AreEqual(stack.Count, enumeratorCount);
-        }
-    }
-}
diff --git a/osu.Game.Tests/NonVisual/ReverseQueueTest.cs b/osu.Game.Tests/NonVisual/ReverseQueueTest.cs
new file mode 100644
index 0000000000..93cd9403ce
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/ReverseQueueTest.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 NUnit.Framework;
+using osu.Game.Rulesets.Difficulty.Utils;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class ReverseQueueTest
+    {
+        private ReverseQueue<char> queue;
+
+        [SetUp]
+        public void Setup()
+        {
+            queue = new ReverseQueue<char>(4);
+        }
+
+        [Test]
+        public void TestEmptyQueue()
+        {
+            Assert.AreEqual(0, queue.Count);
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                char unused = queue[0];
+            });
+
+            int count = 0;
+            foreach (var unused in queue)
+                count++;
+
+            Assert.AreEqual(0, count);
+        }
+
+        [Test]
+        public void TestEnqueue()
+        {
+            // Assert correct values and reverse index after enqueueing
+            queue.Enqueue('a');
+            queue.Enqueue('b');
+            queue.Enqueue('c');
+
+            Assert.AreEqual('c', queue[0]);
+            Assert.AreEqual('b', queue[1]);
+            Assert.AreEqual('a', queue[2]);
+
+            // Assert correct values and reverse index after enqueueing beyond initial capacity of 4
+            queue.Enqueue('d');
+            queue.Enqueue('e');
+            queue.Enqueue('f');
+
+            Assert.AreEqual('f', queue[0]);
+            Assert.AreEqual('e', queue[1]);
+            Assert.AreEqual('d', queue[2]);
+            Assert.AreEqual('c', queue[3]);
+            Assert.AreEqual('b', queue[4]);
+            Assert.AreEqual('a', queue[5]);
+        }
+
+        [Test]
+        public void TestDequeue()
+        {
+            queue.Enqueue('a');
+            queue.Enqueue('b');
+            queue.Enqueue('c');
+            queue.Enqueue('d');
+            queue.Enqueue('e');
+            queue.Enqueue('f');
+
+            // Assert correct item return and no longer in queue after dequeueing
+            Assert.AreEqual('a', queue[5]);
+            var dequeuedItem = queue.Dequeue();
+
+            Assert.AreEqual('a', dequeuedItem);
+            Assert.AreEqual(5, queue.Count);
+            Assert.AreEqual('f', queue[0]);
+            Assert.AreEqual('b', queue[4]);
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                char unused = queue[5];
+            });
+
+            // Assert correct state after enough enqueues and dequeues to wrap around array (queue.start = 0 again)
+            queue.Enqueue('g');
+            queue.Enqueue('h');
+            queue.Enqueue('i');
+            queue.Dequeue();
+            queue.Dequeue();
+            queue.Dequeue();
+            queue.Dequeue();
+            queue.Dequeue();
+            queue.Dequeue();
+            queue.Dequeue();
+
+            Assert.AreEqual(1, queue.Count);
+            Assert.AreEqual('i', queue[0]);
+        }
+
+        [Test]
+        public void TestClear()
+        {
+            queue.Enqueue('a');
+            queue.Enqueue('b');
+            queue.Enqueue('c');
+            queue.Enqueue('d');
+            queue.Enqueue('e');
+            queue.Enqueue('f');
+
+            // Assert queue is empty after clearing
+            queue.Clear();
+
+            Assert.AreEqual(0, queue.Count);
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                char unused = queue[0];
+            });
+        }
+
+        [Test]
+        public void TestEnumerator()
+        {
+            queue.Enqueue('a');
+            queue.Enqueue('b');
+            queue.Enqueue('c');
+            queue.Enqueue('d');
+            queue.Enqueue('e');
+            queue.Enqueue('f');
+
+            char[] expectedValues = { 'f', 'e', 'd', 'c', 'b', 'a' };
+            int expectedValueIndex = 0;
+
+            // Assert items are enumerated in correct order
+            foreach (var item in queue)
+            {
+                Assert.AreEqual(expectedValues[expectedValueIndex], item);
+                expectedValueIndex++;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 126e30ed73..caa94a5355 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -40,7 +40,14 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <summary>
         /// <see cref="DifficultyHitObject"/>s that were processed previously. They can affect the strain values of the following objects.
         /// </summary>
-        protected readonly LimitedCapacityStack<DifficultyHitObject> Previous = new LimitedCapacityStack<DifficultyHitObject>(2); // Contained objects not used yet
+        protected readonly ReverseQueue<DifficultyHitObject> Previous;
+
+        /// <summary>
+        /// Soft capacity of the <see cref="Previous"/> queue.
+        /// <see cref="Previous"/> will automatically resize if it exceeds capacity, but will do so at a very slight performance impact.
+        /// The actual capacity will be set to this value + 1 to allow for storage of the current object before the next can be processed.
+        /// </summary>
+        protected virtual int PreviousCollectionSoftCapacity => 1;
 
         /// <summary>
         /// The current strain level.
@@ -61,6 +68,7 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected Skill(Mod[] mods)
         {
             this.mods = mods;
+            Previous = new ReverseQueue<DifficultyHitObject>(PreviousCollectionSoftCapacity + 1);
         }
 
         /// <summary>
@@ -68,12 +76,33 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         public void Process(DifficultyHitObject current)
         {
+            RemoveExtraneousHistory(current);
+
             CurrentStrain *= strainDecay(current.DeltaTime);
             CurrentStrain += StrainValueOf(current) * SkillMultiplier;
 
             currentSectionPeak = Math.Max(CurrentStrain, currentSectionPeak);
 
-            Previous.Push(current);
+            AddToHistory(current);
+        }
+
+        /// <summary>
+        /// Remove objects from <see cref="Previous"/> that are no longer needed for calculations from the current object onwards.
+        /// </summary>
+        /// <param name="current">The <see cref="DifficultyHitObject"/> to be processed.</param>
+        protected virtual void RemoveExtraneousHistory(DifficultyHitObject current)
+        {
+            while (Previous.Count > 1)
+                Previous.Dequeue();
+        }
+
+        /// <summary>
+        /// Add the current <see cref="DifficultyHitObject"/> to the <see cref="Previous"/> queue (if required).
+        /// </summary>
+        /// <param name="current">The <see cref="DifficultyHitObject"/> that was just processed.</param>
+        protected virtual void AddToHistory(DifficultyHitObject current)
+        {
+            Previous.Enqueue(current);
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs b/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs
deleted file mode 100644
index 1fc5abce90..0000000000
--- a/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.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 System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace osu.Game.Rulesets.Difficulty.Utils
-{
-    /// <summary>
-    /// An indexed stack with limited depth. Indexing starts at the top of the stack.
-    /// </summary>
-    public class LimitedCapacityStack<T> : IEnumerable<T>
-    {
-        /// <summary>
-        /// The number of elements in the stack.
-        /// </summary>
-        public int Count { get; private set; }
-
-        private readonly T[] array;
-        private readonly int capacity;
-        private int marker; // Marks the position of the most recently added item.
-
-        /// <summary>
-        /// Constructs a new <see cref="LimitedCapacityStack{T}"/>.
-        /// </summary>
-        /// <param name="capacity">The number of items the stack can hold.</param>
-        public LimitedCapacityStack(int capacity)
-        {
-            if (capacity < 0)
-                throw new ArgumentOutOfRangeException(nameof(capacity));
-
-            this.capacity = capacity;
-            array = new T[capacity];
-            marker = capacity; // Set marker to the end of the array, outside of the indexed range by one.
-        }
-
-        /// <summary>
-        /// Retrieves the item at an index in the stack.
-        /// </summary>
-        /// <param name="i">The index of the item to retrieve. The top of the stack is returned at index 0.</param>
-        public T this[int i]
-        {
-            get
-            {
-                if (i < 0 || i > Count - 1)
-                    throw new ArgumentOutOfRangeException(nameof(i));
-
-                i += marker;
-                if (i > capacity - 1)
-                    i -= capacity;
-
-                return array[i];
-            }
-        }
-
-        /// <summary>
-        /// Pushes an item to this <see cref="LimitedCapacityStack{T}"/>.
-        /// </summary>
-        /// <param name="item">The item to push.</param>
-        public void Push(T item)
-        {
-            // Overwrite the oldest item instead of shifting every item by one with every addition.
-            if (marker == 0)
-                marker = capacity - 1;
-            else
-                --marker;
-
-            array[marker] = item;
-
-            if (Count < capacity)
-                ++Count;
-        }
-
-        /// <summary>
-        /// Returns an enumerator which enumerates items in the history starting from the most recently added one.
-        /// </summary>
-        public IEnumerator<T> GetEnumerator()
-        {
-            for (int i = marker; i < capacity; ++i)
-                yield return array[i];
-
-            if (Count == capacity)
-            {
-                for (int i = 0; i < marker; ++i)
-                    yield return array[i];
-            }
-        }
-
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-    }
-}
diff --git a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
new file mode 100644
index 0000000000..08b2936876
--- /dev/null
+++ b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
@@ -0,0 +1,110 @@
+// Copyright (c) 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;
+using System.Collections.Generic;
+
+namespace osu.Game.Rulesets.Difficulty.Utils
+{
+    /// <summary>
+    /// An indexed queue where items are indexed beginning from the end instead of the start.
+    /// </summary>
+    public class ReverseQueue<T> : IEnumerable<T>
+    {
+        /// <summary>
+        /// The number of elements in the <see cref="ReverseQueue{T}"/>.
+        /// </summary>
+        public int Count { get; private set; }
+
+        private T[] items;
+        private int capacity;
+        private int start;
+
+        public ReverseQueue(int initialCapacity)
+        {
+            if (initialCapacity <= 0)
+                throw new ArgumentOutOfRangeException(nameof(initialCapacity));
+
+            items = new T[initialCapacity];
+            capacity = initialCapacity;
+            start = 0;
+            Count = 0;
+        }
+
+        /// <summary>
+        /// Retrieves the item at an index in the <see cref="ReverseQueue{T}"/>.
+        /// </summary>
+        /// <param name="index">The index of the item to retrieve. The most recently enqueued item is at index 0.</param>
+        public T this[int index]
+        {
+            get
+            {
+                if (index < 0 || index > Count - 1)
+                    throw new ArgumentOutOfRangeException(nameof(index));
+
+                int reverseIndex = Count - 1 - index;
+                return items[(start + reverseIndex) % capacity];
+            }
+        }
+
+        /// <summary>
+        /// Enqueues an item to this <see cref="ReverseQueue{T}"/>.
+        /// </summary>
+        /// <param name="item">The item to enqueue.</param>
+        public void Enqueue(T item)
+        {
+            if (Count == capacity)
+            {
+                // Double the buffer size
+                var buffer = new T[capacity * 2];
+
+                // Copy items to new queue
+                for (int i = 0; i < Count; i++)
+                {
+                    buffer[i] = items[(start + i) % capacity];
+                }
+
+                // Replace array with new buffer
+                items = buffer;
+                capacity *= 2;
+                start = 0;
+            }
+
+            items[(start + Count) % capacity] = item;
+            Count++;
+        }
+
+        /// <summary>
+        /// Dequeues an item from the <see cref="ReverseQueue{T}"/> and returns it.
+        /// </summary>
+        /// <returns>The item dequeued from the <see cref="ReverseQueue{T}"/>.</returns>
+        public T Dequeue()
+        {
+            var item = items[start];
+            start = (start + 1) % capacity;
+            Count--;
+            return item;
+        }
+
+        /// <summary>
+        /// Clears the <see cref="ReverseQueue{T}"/> of all items.
+        /// </summary>
+        public void Clear()
+        {
+            start = 0;
+            Count = 0;
+        }
+
+        /// <summary>
+        /// Returns an enumerator which enumerates items in the <see cref="ReverseQueue{T}"/> starting from the most recently enqueued one.
+        /// </summary>
+        public IEnumerator<T> GetEnumerator()
+        {
+            for (int i = Count - 1; i >= 0; i--)
+                yield return items[(start + i) % capacity];
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+}

From 5b2dcea8a85b9655fc24f5419c5c19c7b93eb61c Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 3 Apr 2021 20:47:39 +1100
Subject: [PATCH 08796/10326] Refactor to encapsulate strain logic into Skill
 class

As strains are an implementation detail of the current Skill calculations, it makes sense that strain related logic should be encapsulated within the Skill class.
---
 .../Difficulty/CatchDifficultyCalculator.cs   |  2 -
 .../Difficulty/Skills/Movement.cs             |  2 +
 .../Difficulty/Skills/Strain.cs               |  5 +-
 .../Difficulty/TaikoDifficultyCalculator.cs   | 13 +++--
 .../Difficulty/DifficultyCalculator.cs        | 29 ++----------
 .../Preprocessing/DifficultyHitObject.cs      |  2 +-
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs  | 47 +++++++++++++------
 7 files changed, 49 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 10aae70722..f5cce47186 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty
     {
         private const double star_scaling_factor = 0.153;
 
-        protected override int SectionLength => 750;
-
         private float halfCatcherWidth;
 
         public CatchDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 9ad719be1a..7222166535 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 
         protected override double DecayWeight => 0.94;
 
+        protected override int SectionLength => 750;
+
         protected readonly float HalfCatcherWidth;
 
         private float? lastPlayerPosition;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 830b6004a6..0761724e83 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -7,7 +7,6 @@ using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mania.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Mania.Difficulty.Skills
 {
@@ -36,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             var maniaCurrent = (ManiaDifficultyHitObject)current;
-            var endTime = maniaCurrent.BaseObject.GetEndTime();
+            var endTime = maniaCurrent.EndTime;
             var column = maniaCurrent.BaseObject.Column;
 
             double holdFactor = 1.0; // Factor to all additional strains in case something else is held
@@ -46,7 +45,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
             for (int i = 0; i < holdEndTimes.Length; ++i)
             {
                 // If there is at least one other overlapping end or note, then we get an addition, buuuuuut...
-                if (Precision.DefinitelyBigger(holdEndTimes[i], maniaCurrent.BaseObject.StartTime, 1) && Precision.DefinitelyBigger(endTime, holdEndTimes[i], 1))
+                if (Precision.DefinitelyBigger(holdEndTimes[i], maniaCurrent.StartTime, 1) && Precision.DefinitelyBigger(endTime, holdEndTimes[i], 1))
                     holdAddition = 1.0;
 
                 // ... this addition only is valid if there is _no_ other note with the same ending. Releasing multiple notes at the same time is just as easy as releasing 1
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index fc198d2493..6b3e31c5d5 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -133,11 +133,16 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         {
             List<double> peaks = new List<double>();
 
-            for (int i = 0; i < colour.StrainPeaks.Count; i++)
+            var colourPeaks = colour.GetCurrentStrainPeaks().ToList();
+            var rhythmPeaks = rhythm.GetCurrentStrainPeaks().ToList();
+            var staminaRightPeaks = staminaRight.GetCurrentStrainPeaks().ToList();
+            var staminaLeftPeaks = staminaLeft.GetCurrentStrainPeaks().ToList();
+
+            for (int i = 0; i < colourPeaks.Count; i++)
             {
-                double colourPeak = colour.StrainPeaks[i] * colour_skill_multiplier;
-                double rhythmPeak = rhythm.StrainPeaks[i] * rhythm_skill_multiplier;
-                double staminaPeak = (staminaRight.StrainPeaks[i] + staminaLeft.StrainPeaks[i]) * stamina_skill_multiplier * staminaPenalty;
+                double colourPeak = colourPeaks[i] * colour_skill_multiplier;
+                double rhythmPeak = rhythmPeaks[i] * rhythm_skill_multiplier;
+                double staminaPeak = (staminaRightPeaks[i] + staminaLeftPeaks[i]) * stamina_skill_multiplier * staminaPenalty;
                 peaks.Add(norm(2, colourPeak, rhythmPeak, staminaPeak));
             }
 
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 9d06f960b7..14ada8ca09 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -16,11 +16,6 @@ namespace osu.Game.Rulesets.Difficulty
 {
     public abstract class DifficultyCalculator
     {
-        /// <summary>
-        /// The length of each strain section.
-        /// </summary>
-        protected virtual int SectionLength => 400;
-
         private readonly Ruleset ruleset;
         private readonly WorkingBeatmap beatmap;
 
@@ -71,32 +66,14 @@ namespace osu.Game.Rulesets.Difficulty
 
             var difficultyHitObjects = SortObjects(CreateDifficultyHitObjects(beatmap, clockRate)).ToList();
 
-            double sectionLength = SectionLength * clockRate;
-
-            // The first object doesn't generate a strain, so we begin with an incremented section end
-            double currentSectionEnd = Math.Ceiling(beatmap.HitObjects.First().StartTime / sectionLength) * sectionLength;
-
-            foreach (DifficultyHitObject h in difficultyHitObjects)
+            foreach (var hitObject in difficultyHitObjects)
             {
-                while (h.BaseObject.StartTime > currentSectionEnd)
+                foreach (var skill in skills)
                 {
-                    foreach (Skill s in skills)
-                    {
-                        s.SaveCurrentPeak();
-                        s.StartNewSectionFrom(currentSectionEnd / clockRate);
-                    }
-
-                    currentSectionEnd += sectionLength;
+                    skill.Process(hitObject);
                 }
-
-                foreach (Skill s in skills)
-                    s.Process(h);
             }
 
-            // The peak strain will not be saved for the last section in the above loop
-            foreach (Skill s in skills)
-                s.SaveCurrentPeak();
-
             return CreateDifficultyAttributes(beatmap, mods, skills, clockRate);
         }
 
diff --git a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
index 576fbb2af0..5edfb2207b 100644
--- a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
+++ b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
         public readonly HitObject LastObject;
 
         /// <summary>
-        /// Amount of time elapsed between <see cref="BaseObject"/> and <see cref="LastObject"/>.
+        /// Amount of time elapsed between <see cref="BaseObject"/> and <see cref="LastObject"/>, adjusted by clockrate.
         /// </summary>
         public readonly double DeltaTime;
 
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 126e30ed73..aa187c6afd 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.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;
@@ -16,11 +16,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
     /// </summary>
     public abstract class Skill
     {
-        /// <summary>
-        /// The peak strain for each <see cref="DifficultyCalculator.SectionLength"/> section of the beatmap.
-        /// </summary>
-        public IReadOnlyList<double> StrainPeaks => strainPeaks;
-
         /// <summary>
         /// Strain values are multiplied by this number for the given skill. Used to balance the value of different skills between each other.
         /// </summary>
@@ -47,6 +42,11 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected double CurrentStrain { get; private set; } = 1;
 
+        /// <summary>
+        /// The length of each strain section.
+        /// </summary>
+        protected virtual int SectionLength => 400;
+
         /// <summary>
         /// Mods for use in skill calculations.
         /// </summary>
@@ -54,6 +54,8 @@ namespace osu.Game.Rulesets.Difficulty.Skills
 
         private double currentSectionPeak = 1; // We also keep track of the peak strain level in the current section.
 
+        private double currentSectionEnd;
+
         private readonly List<double> strainPeaks = new List<double>();
 
         private readonly Mod[] mods;
@@ -68,6 +70,17 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         public void Process(DifficultyHitObject current)
         {
+            // The first object doesn't generate a strain, so we begin with an incremented section end
+            if (Previous.Count == 0)
+                currentSectionEnd = Math.Ceiling(current.StartTime / SectionLength) * SectionLength;
+
+            while (current.StartTime > currentSectionEnd)
+            {
+                saveCurrentPeak();
+                startNewSectionFrom(currentSectionEnd);
+                currentSectionEnd += SectionLength;
+            }
+
             CurrentStrain *= strainDecay(current.DeltaTime);
             CurrentStrain += StrainValueOf(current) * SkillMultiplier;
 
@@ -79,22 +92,20 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <summary>
         /// Saves the current peak strain level to the list of strain peaks, which will be used to calculate an overall difficulty.
         /// </summary>
-        public void SaveCurrentPeak()
+        private void saveCurrentPeak()
         {
-            if (Previous.Count > 0)
-                strainPeaks.Add(currentSectionPeak);
+            strainPeaks.Add(currentSectionPeak);
         }
 
         /// <summary>
         /// Sets the initial strain level for a new section.
         /// </summary>
-        /// <param name="time">The beginning of the new section in milliseconds, adjusted by clockrate.</param>
-        public void StartNewSectionFrom(double time)
+        /// <param name="time">The beginning of the new section in milliseconds.</param>
+        private void startNewSectionFrom(double time)
         {
             // The maximum strain of the new section is not zero by default, strain decays as usual regardless of section boundaries.
             // This means we need to capture the strain level at the beginning of the new section, and use that as the initial peak level.
-            if (Previous.Count > 0)
-                currentSectionPeak = GetPeakStrain(time);
+            currentSectionPeak = GetPeakStrain(time);
         }
 
         /// <summary>
@@ -105,7 +116,13 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected virtual double GetPeakStrain(double time) => CurrentStrain * strainDecay(time - Previous[0].StartTime);
 
         /// <summary>
-        /// Returns the calculated difficulty value representing all processed <see cref="DifficultyHitObject"/>s.
+        /// Returns a live enumerable of the peak strains for each <see cref="SectionLength"/> section of the beatmap,
+        /// including the peak of the current section.
+        /// </summary>
+        public IEnumerable<double> GetCurrentStrainPeaks() => strainPeaks.Append(currentSectionPeak);
+
+        /// <summary>
+        /// Returns the calculated difficulty value representing all <see cref="DifficultyHitObject"/>s that have been processed up to this point.
         /// </summary>
         public double DifficultyValue()
         {
@@ -114,7 +131,7 @@ namespace osu.Game.Rulesets.Difficulty.Skills
 
             // Difficulty is the weighted sum of the highest strains from every section.
             // We're sorting from highest to lowest strain.
-            foreach (double strain in strainPeaks.OrderByDescending(d => d))
+            foreach (double strain in GetCurrentStrainPeaks().OrderByDescending(d => d))
             {
                 difficulty += strain * weight;
                 weight *= DecayWeight;

From 85d2b1232a22f900187731033a7b753ea1429225 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 3 Apr 2021 20:52:36 +1100
Subject: [PATCH 08797/10326] Refactor to abstract out strain logic into
 StrainSkill class

While it is the case for the existing official Skills, Skill implementations shouldn't be required to conform to a strain based approach.
There are other valid approaches to calculating skill difficulty that can be supported by abstracting the strain logic into its own StrainSkill class.
---
 .../Difficulty/Skills/Movement.cs             |   2 +-
 .../Difficulty/Skills/Strain.cs               |   2 +-
 .../Difficulty/Skills/Aim.cs                  |   2 +-
 .../Difficulty/Skills/Speed.cs                |   2 +-
 .../Difficulty/Skills/Colour.cs               |   2 +-
 .../Difficulty/Skills/Rhythm.cs               |   2 +-
 .../Difficulty/Skills/Stamina.cs              |   2 +-
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs  | 115 +--------------
 .../Rulesets/Difficulty/Skills/StrainSkill.cs | 137 ++++++++++++++++++
 9 files changed, 150 insertions(+), 116 deletions(-)
 create mode 100644 osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs

diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 7222166535..75e17f6c48 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 {
-    public class Movement : Skill
+    public class Movement : StrainSkill
     {
         private const float absolute_player_positioning_error = 16f;
         private const float normalized_hitobject_radius = 41.0f;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 0761724e83..2ba2ee6b4a 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Mania.Difficulty.Skills
 {
-    public class Strain : Skill
+    public class Strain : StrainSkill
     {
         private const double individual_decay_base = 0.125;
         private const double overall_decay_base = 0.30;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
index 90cba13c7c..cb819ec090 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
     /// <summary>
     /// Represents the skill required to correctly aim at every object in the map with a uniform CircleSize and normalized distances.
     /// </summary>
-    public class Aim : Skill
+    public class Aim : StrainSkill
     {
         private const double angle_bonus_begin = Math.PI / 3;
         private const double timing_threshold = 107;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
index 200bc7997d..fbac080fc6 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
     /// <summary>
     /// Represents the skill required to press keys with regards to keeping up with the speed at which objects need to be hit.
     /// </summary>
-    public class Speed : Skill
+    public class Speed : StrainSkill
     {
         private const double single_spacing_threshold = 125;
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index cc0738e252..769d021362 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
     /// <summary>
     /// Calculates the colour coefficient of taiko difficulty.
     /// </summary>
-    public class Colour : Skill
+    public class Colour : StrainSkill
     {
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0.4;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index f2b8309ac5..a32f6ebe0d 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
     /// <summary>
     /// Calculates the rhythm coefficient of taiko difficulty.
     /// </summary>
-    public class Rhythm : Skill
+    public class Rhythm : StrainSkill
     {
         protected override double SkillMultiplier => 10;
         protected override double StrainDecayBase => 0;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index c34cce0cd6..4cceadb23f 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
     /// <remarks>
     /// The reference play style chosen uses two hands, with full alternating (the hand changes after every hit).
     /// </remarks>
-    public class Stamina : Skill
+    public class Stamina : StrainSkill
     {
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0.4;
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index aa187c6afd..b3d7ce3c40 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Mods;
@@ -11,140 +9,39 @@ using osu.Game.Rulesets.Mods;
 namespace osu.Game.Rulesets.Difficulty.Skills
 {
     /// <summary>
-    /// Used to processes strain values of <see cref="DifficultyHitObject"/>s, keep track of strain levels caused by the processed objects
-    /// and to calculate a final difficulty value representing the difficulty of hitting all the processed objects.
+    /// A bare minimal abstract skill for fully custom skill implementations.
     /// </summary>
     public abstract class Skill
     {
-        /// <summary>
-        /// Strain values are multiplied by this number for the given skill. Used to balance the value of different skills between each other.
-        /// </summary>
-        protected abstract double SkillMultiplier { get; }
-
-        /// <summary>
-        /// Determines how quickly strain decays for the given skill.
-        /// For example a value of 0.15 indicates that strain decays to 15% of its original value in one second.
-        /// </summary>
-        protected abstract double StrainDecayBase { get; }
-
-        /// <summary>
-        /// The weight by which each strain value decays.
-        /// </summary>
-        protected virtual double DecayWeight => 0.9;
-
         /// <summary>
         /// <see cref="DifficultyHitObject"/>s that were processed previously. They can affect the strain values of the following objects.
         /// </summary>
         protected readonly LimitedCapacityStack<DifficultyHitObject> Previous = new LimitedCapacityStack<DifficultyHitObject>(2); // Contained objects not used yet
 
-        /// <summary>
-        /// The current strain level.
-        /// </summary>
-        protected double CurrentStrain { get; private set; } = 1;
-
-        /// <summary>
-        /// The length of each strain section.
-        /// </summary>
-        protected virtual int SectionLength => 400;
-
+        
         /// <summary>
         /// Mods for use in skill calculations.
         /// </summary>
         protected IReadOnlyList<Mod> Mods => mods;
 
-        private double currentSectionPeak = 1; // We also keep track of the peak strain level in the current section.
-
-        private double currentSectionEnd;
-
-        private readonly List<double> strainPeaks = new List<double>();
-
         private readonly Mod[] mods;
-
         protected Skill(Mod[] mods)
         {
             this.mods = mods;
         }
 
         /// <summary>
-        /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
+        /// Process a <see cref="DifficultyHitObject"/>.
         /// </summary>
-        public void Process(DifficultyHitObject current)
+        /// <param name="current">The <see cref="DifficultyHitObject"/> to process.</param>
+        public virtual void Process(DifficultyHitObject current)
         {
-            // The first object doesn't generate a strain, so we begin with an incremented section end
-            if (Previous.Count == 0)
-                currentSectionEnd = Math.Ceiling(current.StartTime / SectionLength) * SectionLength;
-
-            while (current.StartTime > currentSectionEnd)
-            {
-                saveCurrentPeak();
-                startNewSectionFrom(currentSectionEnd);
-                currentSectionEnd += SectionLength;
-            }
-
-            CurrentStrain *= strainDecay(current.DeltaTime);
-            CurrentStrain += StrainValueOf(current) * SkillMultiplier;
-
-            currentSectionPeak = Math.Max(CurrentStrain, currentSectionPeak);
-
             Previous.Push(current);
         }
 
-        /// <summary>
-        /// Saves the current peak strain level to the list of strain peaks, which will be used to calculate an overall difficulty.
-        /// </summary>
-        private void saveCurrentPeak()
-        {
-            strainPeaks.Add(currentSectionPeak);
-        }
-
-        /// <summary>
-        /// Sets the initial strain level for a new section.
-        /// </summary>
-        /// <param name="time">The beginning of the new section in milliseconds.</param>
-        private void startNewSectionFrom(double time)
-        {
-            // The maximum strain of the new section is not zero by default, strain decays as usual regardless of section boundaries.
-            // This means we need to capture the strain level at the beginning of the new section, and use that as the initial peak level.
-            currentSectionPeak = GetPeakStrain(time);
-        }
-
-        /// <summary>
-        /// Retrieves the peak strain at a point in time.
-        /// </summary>
-        /// <param name="time">The time to retrieve the peak strain at, adjusted by clockrate.</param>
-        /// <returns>The peak strain.</returns>
-        protected virtual double GetPeakStrain(double time) => CurrentStrain * strainDecay(time - Previous[0].StartTime);
-
-        /// <summary>
-        /// Returns a live enumerable of the peak strains for each <see cref="SectionLength"/> section of the beatmap,
-        /// including the peak of the current section.
-        /// </summary>
-        public IEnumerable<double> GetCurrentStrainPeaks() => strainPeaks.Append(currentSectionPeak);
-
         /// <summary>
         /// Returns the calculated difficulty value representing all <see cref="DifficultyHitObject"/>s that have been processed up to this point.
         /// </summary>
-        public double DifficultyValue()
-        {
-            double difficulty = 0;
-            double weight = 1;
-
-            // Difficulty is the weighted sum of the highest strains from every section.
-            // We're sorting from highest to lowest strain.
-            foreach (double strain in GetCurrentStrainPeaks().OrderByDescending(d => d))
-            {
-                difficulty += strain * weight;
-                weight *= DecayWeight;
-            }
-
-            return difficulty;
-        }
-
-        /// <summary>
-        /// Calculates the strain value of a <see cref="DifficultyHitObject"/>. This value is affected by previously processed objects.
-        /// </summary>
-        protected abstract double StrainValueOf(DifficultyHitObject current);
-
-        private double strainDecay(double ms) => Math.Pow(StrainDecayBase, ms / 1000);
+        public abstract double DifficultyValue();
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
new file mode 100644
index 0000000000..c324f8e414
--- /dev/null
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
@@ -0,0 +1,137 @@
+// Copyright (c) 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.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Difficulty.Skills
+{
+    /// <summary>
+    /// Used to processes strain values of <see cref="DifficultyHitObject"/>s, keep track of strain levels caused by the processed objects
+    /// and to calculate a final difficulty value representing the difficulty of hitting all the processed objects.
+    /// </summary>
+    public abstract class StrainSkill : Skill
+    {
+        /// <summary>
+        /// Strain values are multiplied by this number for the given skill. Used to balance the value of different skills between each other.
+        /// </summary>
+        protected abstract double SkillMultiplier { get; }
+
+        /// <summary>
+        /// Determines how quickly strain decays for the given skill.
+        /// For example a value of 0.15 indicates that strain decays to 15% of its original value in one second.
+        /// </summary>
+        protected abstract double StrainDecayBase { get; }
+
+        /// <summary>
+        /// The weight by which each strain value decays.
+        /// </summary>
+        protected virtual double DecayWeight => 0.9;
+
+        /// <summary>
+        /// The current strain level.
+        /// </summary>
+        protected double CurrentStrain { get; private set; } = 1;
+
+        /// <summary>
+        /// The length of each strain section.
+        /// </summary>
+        protected virtual int SectionLength => 400;
+
+        private double currentSectionPeak = 1; // We also keep track of the peak strain level in the current section.
+
+        private double currentSectionEnd;
+
+        private readonly List<double> strainPeaks = new List<double>();
+
+        protected StrainSkill(Mod[] mods)
+            : base(mods)
+        {
+        }
+
+        /// <summary>
+        /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
+        /// </summary>
+        public sealed override void Process(DifficultyHitObject current)
+        {
+            // The first object doesn't generate a strain, so we begin with an incremented section end
+            if (Previous.Count == 0)
+                currentSectionEnd = Math.Ceiling(current.StartTime / SectionLength) * SectionLength;
+
+            while (current.StartTime > currentSectionEnd)
+            {
+                saveCurrentPeak();
+                startNewSectionFrom(currentSectionEnd);
+                currentSectionEnd += SectionLength;
+            }
+
+            CurrentStrain *= strainDecay(current.DeltaTime);
+            CurrentStrain += StrainValueOf(current) * SkillMultiplier;
+
+            currentSectionPeak = Math.Max(CurrentStrain, currentSectionPeak);
+
+            base.Process(current);
+        }
+
+        /// <summary>
+        /// Saves the current peak strain level to the list of strain peaks, which will be used to calculate an overall difficulty.
+        /// </summary>
+        private void saveCurrentPeak()
+        {
+            strainPeaks.Add(currentSectionPeak);
+        }
+
+        /// <summary>
+        /// Sets the initial strain level for a new section.
+        /// </summary>
+        /// <param name="time">The beginning of the new section in milliseconds.</param>
+        private void startNewSectionFrom(double time)
+        {
+            // The maximum strain of the new section is not zero by default, strain decays as usual regardless of section boundaries.
+            // This means we need to capture the strain level at the beginning of the new section, and use that as the initial peak level.
+            currentSectionPeak = GetPeakStrain(time);
+        }
+
+        /// <summary>
+        /// Retrieves the peak strain at a point in time.
+        /// </summary>
+        /// <param name="time">The time to retrieve the peak strain at.</param>
+        /// <returns>The peak strain.</returns>
+        protected virtual double GetPeakStrain(double time) => CurrentStrain * strainDecay(time - Previous[0].StartTime);
+
+        /// <summary>
+        /// Returns a live enumerable of the peak strains for each <see cref="SectionLength"/> section of the beatmap,
+        /// including the peak of the current section.
+        /// </summary>
+        public IEnumerable<double> GetCurrentStrainPeaks() => strainPeaks.Append(currentSectionPeak);
+
+        /// <summary>
+        /// Returns the calculated difficulty value representing all <see cref="DifficultyHitObject"/>s that have been processed up to this point.
+        /// </summary>
+        public sealed override double DifficultyValue()
+        {
+            double difficulty = 0;
+            double weight = 1;
+
+            // Difficulty is the weighted sum of the highest strains from every section.
+            // We're sorting from highest to lowest strain.
+            foreach (double strain in GetCurrentStrainPeaks().OrderByDescending(d => d))
+            {
+                difficulty += strain * weight;
+                weight *= DecayWeight;
+            }
+
+            return difficulty;
+        }
+
+        /// <summary>
+        /// Calculates the strain value of a <see cref="DifficultyHitObject"/>. This value is affected by previously processed objects.
+        /// </summary>
+        protected abstract double StrainValueOf(DifficultyHitObject current);
+
+        private double strainDecay(double ms) => Math.Pow(StrainDecayBase, ms / 1000);
+    }
+}

From 7d4b0e3f0afde6f3046ce3d0eecdddfaf90561e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 12:34:48 +0200
Subject: [PATCH 08798/10326] Fix editor clock scene not re-enabling beatmap

Could interfere with other tests due to causing crashes on attempts to
change `Beatmap.Value`.
---
 osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index 390198be04..0b1617b6a6 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -77,5 +77,11 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("start clock again", Clock.Start);
             AddAssert("clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            Beatmap.Disabled = false;
+            base.Dispose(isDisposing);
+        }
     }
 }

From b66ba43bc56f27a096912255c147d31453dba659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 14:02:15 +0200
Subject: [PATCH 08799/10326] Add failing test scene

---
 .../Visual/Editing/TestSceneEditorSeeking.cs  | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
new file mode 100644
index 0000000000..96ce418851
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
@@ -0,0 +1,79 @@
+// Copyright (c) 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.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneEditorSeeking : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            var beatmap = base.CreateBeatmap(ruleset);
+
+            beatmap.BeatmapInfo.BeatDivisor = 1;
+
+            beatmap.ControlPointInfo = new ControlPointInfo();
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 1000 });
+            beatmap.ControlPointInfo.Add(2000, new TimingControlPoint { BeatLength = 500 });
+
+            return beatmap;
+        }
+
+        [Test]
+        public void TestSnappedSeeking()
+        {
+            AddStep("seek to 0", () => EditorClock.Seek(0));
+            AddAssert("time is 0", () => EditorClock.CurrentTime == 0);
+
+            pressAndCheckTime(Key.Right, 1000);
+            pressAndCheckTime(Key.Right, 2000);
+            pressAndCheckTime(Key.Right, 2500);
+            pressAndCheckTime(Key.Right, 3000);
+
+            pressAndCheckTime(Key.Left, 2500);
+            pressAndCheckTime(Key.Left, 2000);
+            pressAndCheckTime(Key.Left, 1000);
+        }
+
+        [Test]
+        public void TestSnappedSeekingAfterControlPointChange()
+        {
+            AddStep("seek to 0", () => EditorClock.Seek(0));
+            AddAssert("time is 0", () => EditorClock.CurrentTime == 0);
+
+            pressAndCheckTime(Key.Right, 1000);
+            pressAndCheckTime(Key.Right, 2000);
+            pressAndCheckTime(Key.Right, 2500);
+            pressAndCheckTime(Key.Right, 3000);
+
+            AddStep("remove 2nd timing point", () =>
+            {
+                EditorBeatmap.BeginChange();
+                var group = EditorBeatmap.ControlPointInfo.GroupAt(2000);
+                EditorBeatmap.ControlPointInfo.RemoveGroup(group);
+                EditorBeatmap.EndChange();
+            });
+
+            pressAndCheckTime(Key.Left, 2000);
+            pressAndCheckTime(Key.Left, 1000);
+
+            pressAndCheckTime(Key.Right, 2000);
+            pressAndCheckTime(Key.Right, 3000);
+        }
+
+        private void pressAndCheckTime(Key key, double expectedTime)
+        {
+            AddStep($"press {key}", () => InputManager.Key(key));
+            AddUntilStep($"time is {expectedTime}", () => Precision.AlmostEquals(expectedTime, EditorClock.CurrentTime, 1));
+        }
+    }
+}

From 4df7ff21c787fc3ebad631fb8d93331903b9c908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 11:43:47 +0200
Subject: [PATCH 08800/10326] Fix editor arrow seek snapping not updating after
 control point changes

The editor clock, which is responsible for performing the seek, was not
aware of changes in control points due to reading from the wrong
beatmap. `loadableBeatmap` is not actually changed by any of the editor
components; `playableBeatmap` and `editorBeatmap` are.

For now this is changed to use `playableBeatmap`. A better follow-up
would be to use `editorBeatmap`, but it would probably be best to move
the beat snap bindable into `EditorBeatmap` first.
---
 osu.Game/Screens/Edit/Editor.cs               | 32 +++++++++----------
 osu.Game/Screens/Edit/EditorClock.cs          |  8 ++---
 osu.Game/Tests/Visual/EditorClockTestScene.cs |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 389eb79797..0759e21382 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -122,22 +122,6 @@ namespace osu.Game.Screens.Edit
                     return;
             }
 
-            beatDivisor.Value = loadableBeatmap.BeatmapInfo.BeatDivisor;
-            beatDivisor.BindValueChanged(divisor => loadableBeatmap.BeatmapInfo.BeatDivisor = divisor.NewValue);
-
-            // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
-            clock = new EditorClock(loadableBeatmap, beatDivisor) { IsCoupled = false };
-
-            UpdateClockSource();
-
-            dependencies.CacheAs(clock);
-            AddInternal(clock);
-
-            clock.SeekingOrStopped.BindValueChanged(_ => updateSampleDisabledState());
-
-            // todo: remove caching of this and consume via editorBeatmap?
-            dependencies.Cache(beatDivisor);
-
             try
             {
                 playableBeatmap = loadableBeatmap.GetPlayableBeatmap(loadableBeatmap.BeatmapInfo.Ruleset);
@@ -154,6 +138,22 @@ namespace osu.Game.Screens.Edit
                 return;
             }
 
+            beatDivisor.Value = playableBeatmap.BeatmapInfo.BeatDivisor;
+            beatDivisor.BindValueChanged(divisor => playableBeatmap.BeatmapInfo.BeatDivisor = divisor.NewValue);
+
+            // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
+            clock = new EditorClock(playableBeatmap, beatDivisor) { IsCoupled = false };
+
+            UpdateClockSource();
+
+            dependencies.CacheAs(clock);
+            AddInternal(clock);
+
+            clock.SeekingOrStopped.BindValueChanged(_ => updateSampleDisabledState());
+
+            // todo: remove caching of this and consume via editorBeatmap?
+            dependencies.Cache(beatDivisor);
+
             AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap, loadableBeatmap.Skin));
             dependencies.CacheAs(editorBeatmap);
             changeHandler = new EditorChangeHandler(editorBeatmap);
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index d0197ce1ec..772f6ea192 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -42,12 +42,12 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         public bool IsSeeking { get; private set; }
 
-        public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
-            : this(beatmap.Beatmap.ControlPointInfo, beatmap.Track.Length, beatDivisor)
+        public EditorClock(IBeatmap beatmap, BindableBeatDivisor beatDivisor)
+            : this(beatmap.ControlPointInfo, beatDivisor)
         {
         }
 
-        public EditorClock(ControlPointInfo controlPointInfo, double trackLength, BindableBeatDivisor beatDivisor)
+        public EditorClock(ControlPointInfo controlPointInfo, BindableBeatDivisor beatDivisor)
         {
             this.beatDivisor = beatDivisor;
 
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Edit
         }
 
         public EditorClock()
-            : this(new ControlPointInfo(), 1000, new BindableBeatDivisor())
+            : this(new ControlPointInfo(), new BindableBeatDivisor())
         {
         }
 
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 693c9cb792..79cfee8518 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual
 
         protected EditorClockTestScene()
         {
-            Clock = new EditorClock(new ControlPointInfo(), 5000, BeatDivisor) { IsCoupled = false };
+            Clock = new EditorClock(new ControlPointInfo(), BeatDivisor) { IsCoupled = false };
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)

From bdd1072dcebf7fd88af0198645bcaa98c4218416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 18:52:50 +0200
Subject: [PATCH 08801/10326] Adjust colours and spacing to be closer to design

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs  | 4 ++--
 osu.Game/Screens/Edit/Setup/SetupSection.cs | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 1c3cbb7206..de09347d0a 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Edit.Setup
         public SetupScreen()
             : base(EditorScreenMode.SongSetup)
         {
-            ColourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+            ColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
         }
 
         [BackgroundDependencyLoader]
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Edit.Setup
                     {
                         new Box
                         {
-                            Colour = colours.GreySeafoamDark,
+                            Colour = ColourProvider.Dark4,
                             RelativeSizeAxes = Axes.Both,
                         },
                         new SectionsContainer<SetupSection>
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index 88521a8fb0..8347ca1157 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -33,6 +33,10 @@ namespace osu.Game.Screens.Edit.Setup
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Spacing = new Vector2(20),
+                Padding = new MarginPadding
+                {
+                    Horizontal = 90
+                },
                 Direction = FillDirection.Vertical,
             };
         }

From 95d7e6c74b579c4049b0eec9c34b9ad451835a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 19:02:33 +0200
Subject: [PATCH 08802/10326] Explicitly associate setup sections with titles

---
 .../Screens/Edit/Setup/DifficultySection.cs   |  8 ++---
 .../Screens/Edit/Setup/MetadataSection.cs     |  8 ++---
 .../Screens/Edit/Setup/ResourcesSection.cs    |  8 ++---
 osu.Game/Screens/Edit/Setup/SetupSection.cs   | 35 ++++++++++++++-----
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 36fb0191b0..493d3ed20c 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -5,8 +5,8 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
 
 namespace osu.Game.Screens.Edit.Setup
@@ -18,15 +18,13 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledSliderBar<float> approachRateSlider;
         private LabelledSliderBar<float> overallDifficultySlider;
 
+        public override LocalisableString Title => "Difficulty";
+
         [BackgroundDependencyLoader]
         private void load()
         {
             Children = new Drawable[]
             {
-                new OsuSpriteText
-                {
-                    Text = "Difficulty settings"
-                },
                 circleSizeSlider = new LabelledSliderBar<float>
                 {
                     Label = "Object Size",
diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index f429164ece..889a5eab5e 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterfaceV2;
 
 namespace osu.Game.Screens.Edit.Setup
@@ -17,15 +17,13 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox creatorTextBox;
         private LabelledTextBox difficultyTextBox;
 
+        public override LocalisableString Title => "Metadata";
+
         [BackgroundDependencyLoader]
         private void load()
         {
             Children = new Drawable[]
             {
-                new OsuSpriteText
-                {
-                    Text = "Beatmap metadata"
-                },
                 artistTextBox = new LabelledTextBox
                 {
                     Label = "Artist",
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index e00eaf9aa2..be8efa18f4 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -11,12 +11,12 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox audioTrackTextBox;
         private Container backgroundSpriteContainer;
 
+        public override LocalisableString Title => "Resources";
+
         public IEnumerable<string> HandledExtensions => ImageExtensions.Concat(AudioExtensions);
 
         public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
@@ -66,10 +68,6 @@ namespace osu.Game.Screens.Edit.Setup
                     Masking = true,
                     CornerRadius = 10,
                 },
-                new OsuSpriteText
-                {
-                    Text = "Resources"
-                },
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index 8347ca1157..fb697eacc6 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -4,12 +4,14 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    internal class SetupSection : Container
+    internal abstract class SetupSection : Container
     {
         private readonly FillFlowContainer flow;
 
@@ -21,23 +23,40 @@ namespace osu.Game.Screens.Edit.Setup
 
         protected override Container<Drawable> Content => flow;
 
-        public SetupSection()
+        public abstract LocalisableString Title { get; }
+
+        protected SetupSection()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            Padding = new MarginPadding(10);
+            Padding = new MarginPadding
+            {
+                Vertical = 10,
+                Horizontal = 90
+            };
 
-            InternalChild = flow = new FillFlowContainer
+            InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Spacing = new Vector2(20),
-                Padding = new MarginPadding
-                {
-                    Horizontal = 90
-                },
                 Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                        Text = Title
+                    },
+                    flow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(20),
+                        Direction = FillDirection.Vertical,
+                    }
+                }
             };
         }
     }

From 3572178bdcfbe917ca1ea15dc9b238a340d0734d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 20:02:26 +0200
Subject: [PATCH 08803/10326] Add tab control to setup screen header

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    |  22 +---
 .../Screens/Edit/Setup/SetupScreenHeader.cs   | 106 ++++++++++++++++++
 osu.Game/Screens/Edit/Setup/SetupSection.cs   |   2 +-
 3 files changed, 113 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index de09347d0a..dccc69039c 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -13,12 +13,17 @@ namespace osu.Game.Screens.Edit.Setup
 {
     public class SetupScreen : EditorScreen
     {
+        public const int HORIZONTAL_PADDING = 100;
+
         [Resolved]
         private OsuColour colours { get; set; }
 
         [Cached]
         protected readonly OverlayColourProvider ColourProvider;
 
+        [Cached]
+        private SectionsContainer<SetupSection> sections = new SectionsContainer<SetupSection>();
+
         public SetupScreen()
             : base(EditorScreenMode.SongSetup)
         {
@@ -44,7 +49,7 @@ namespace osu.Game.Screens.Edit.Setup
                             Colour = ColourProvider.Dark4,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        new SectionsContainer<SetupSection>
+                        sections = new SectionsContainer<SetupSection>
                         {
                             FixedHeader = new SetupScreenHeader(),
                             RelativeSizeAxes = Axes.Both,
@@ -60,19 +65,4 @@ namespace osu.Game.Screens.Edit.Setup
             };
         }
     }
-
-    internal class SetupScreenHeader : OverlayHeader
-    {
-        protected override OverlayTitle CreateTitle() => new SetupScreenTitle();
-
-        private class SetupScreenTitle : OverlayTitle
-        {
-            public SetupScreenTitle()
-            {
-                Title = "beatmap setup";
-                Description = "change general settings of your beatmap";
-                IconTexture = "Icons/Hexacons/social";
-            }
-        }
-    }
 }
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
new file mode 100644
index 0000000000..1be833cb9d
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -0,0 +1,106 @@
+// Copyright (c) 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.UserInterface;
+using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    internal class SetupScreenHeader : OverlayHeader
+    {
+        [Resolved]
+        private SectionsContainer<SetupSection> sections { get; set; }
+
+        private SetupScreenTabControl tabControl;
+
+        protected override OverlayTitle CreateTitle() => new SetupScreenTitle();
+
+        protected override Drawable CreateContent() => new Container
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Children = new Drawable[]
+            {
+                tabControl = new SetupScreenTabControl
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 30
+                }
+            }
+        };
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            tabControl.AccentColour = colourProvider.Highlight1;
+            tabControl.BackgroundColour = colourProvider.Dark5;
+
+            foreach (var section in sections)
+                tabControl.AddItem(section);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            sections.SelectedSection.BindValueChanged(section => tabControl.Current.Value = section.NewValue);
+            tabControl.Current.BindValueChanged(section =>
+            {
+                if (section.NewValue != sections.SelectedSection.Value)
+                    sections.ScrollTo(section.NewValue);
+            });
+        }
+
+        private class SetupScreenTitle : OverlayTitle
+        {
+            public SetupScreenTitle()
+            {
+                Title = "beatmap setup";
+                Description = "change general settings of your beatmap";
+                IconTexture = "Icons/Hexacons/social";
+            }
+        }
+
+        internal class SetupScreenTabControl : OverlayTabControl<SetupSection>
+        {
+            private readonly Box background;
+
+            public Color4 BackgroundColour
+            {
+                get => background.Colour;
+                set => background.Colour = value;
+            }
+
+            public SetupScreenTabControl()
+            {
+                TabContainer.Margin = new MarginPadding { Horizontal = SetupScreen.HORIZONTAL_PADDING };
+
+                AddInternal(background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = 1
+                });
+            }
+
+            protected override TabItem<SetupSection> CreateTabItem(SetupSection value) => new SetupScreenTabItem(value)
+            {
+                AccentColour = AccentColour
+            };
+
+            private class SetupScreenTabItem : OverlayTabItem
+            {
+                public SetupScreenTabItem(SetupSection value)
+                    : base(value)
+                {
+                    Text.Text = value.Title;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index fb697eacc6..de62c3a468 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Edit.Setup
             Padding = new MarginPadding
             {
                 Vertical = 10,
-                Horizontal = 90
+                Horizontal = SetupScreen.HORIZONTAL_PADDING
             };
 
             InternalChild = new FillFlowContainer

From 61f9eb51c474e2573bc49f55d6a435f75d598792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 18:20:40 +0200
Subject: [PATCH 08804/10326] Split background chooser to own component

---
 .../Screens/Edit/Setup/BackgroundChooser.cs   | 145 ++++++++++++++++++
 .../Screens/Edit/Setup/ResourcesSection.cs    |  86 +----------
 2 files changed, 148 insertions(+), 83 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Setup/BackgroundChooser.cs

diff --git a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
new file mode 100644
index 0000000000..7bdd962ec8
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
@@ -0,0 +1,145 @@
+// Copyright (c) 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;
+using System.Threading.Tasks;
+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.Beatmaps.Drawables;
+using osu.Game.Database;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    public class BackgroundChooser : CompositeDrawable, ICanAcceptFiles
+    {
+        public IEnumerable<string> HandledExtensions => ImageExtensions;
+
+        public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
+
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Resolved]
+        private IBindable<WorkingBeatmap> working { get; set; }
+
+        private readonly Container content;
+
+        public BackgroundChooser()
+        {
+            InternalChild = content = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                CornerRadius = 10,
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            updateBackgroundSprite();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            game.RegisterImportHandler(this);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            game?.UnregisterImportHandler(this);
+        }
+
+        Task ICanAcceptFiles.Import(params string[] paths)
+        {
+            Schedule(() =>
+            {
+                var firstFile = new FileInfo(paths.First());
+
+                ChangeBackgroundImage(firstFile.FullName);
+            });
+            return Task.CompletedTask;
+        }
+
+        Task ICanAcceptFiles.Import(params ImportTask[] tasks) => throw new NotImplementedException();
+
+        public bool ChangeBackgroundImage(string path)
+        {
+            var info = new FileInfo(path);
+
+            if (!info.Exists)
+                return false;
+
+            var set = working.Value.BeatmapSetInfo;
+
+            // remove the previous background for now.
+            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
+
+            using (var stream = info.OpenRead())
+            {
+                if (oldFile != null)
+                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
+                else
+                    beatmaps.AddFile(set, stream, info.Name);
+            }
+
+            working.Value.Metadata.BackgroundFile = info.Name;
+            updateBackgroundSprite();
+
+            return true;
+        }
+
+        private void updateBackgroundSprite()
+        {
+            LoadComponentAsync(new BeatmapBackgroundSprite(working.Value)
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                FillMode = FillMode.Fill,
+            }, background =>
+            {
+                if (background.Texture != null)
+                    content.Child = background;
+                else
+                {
+                    content.Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colours.GreySeafoamDarker,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 24))
+                        {
+                            Text = "Drag image here to set beatmap background!",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            AutoSizeAxes = Axes.X,
+                        }
+                    };
+                }
+
+                background.FadeInFromZero(500);
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index be8efa18f4..523ded7aec 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -10,13 +10,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.Localisation;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
 using osu.Game.Database;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 
@@ -25,13 +21,10 @@ namespace osu.Game.Screens.Edit.Setup
     internal class ResourcesSection : SetupSection, ICanAcceptFiles
     {
         private LabelledTextBox audioTrackTextBox;
-        private Container backgroundSpriteContainer;
 
         public override LocalisableString Title => "Resources";
 
-        public IEnumerable<string> HandledExtensions => ImageExtensions.Concat(AudioExtensions);
-
-        public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
+        public IEnumerable<string> HandledExtensions => AudioExtensions;
 
         public static string[] AudioExtensions { get; } = { ".mp3", ".ogg" };
 
@@ -61,12 +54,10 @@ namespace osu.Game.Screens.Edit.Setup
 
             Children = new Drawable[]
             {
-                backgroundSpriteContainer = new Container
+                new BackgroundChooser
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = 250,
-                    Masking = true,
-                    CornerRadius = 10,
                 },
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
@@ -79,8 +70,6 @@ namespace osu.Game.Screens.Edit.Setup
                 audioTrackFileChooserContainer,
             };
 
-            updateBackgroundSprite();
-
             audioTrackTextBox.Current.BindValueChanged(audioTrackChanged);
         }
 
@@ -90,14 +79,7 @@ namespace osu.Game.Screens.Edit.Setup
             {
                 var firstFile = new FileInfo(paths.First());
 
-                if (ImageExtensions.Contains(firstFile.Extension))
-                {
-                    ChangeBackgroundImage(firstFile.FullName);
-                }
-                else if (AudioExtensions.Contains(firstFile.Extension))
-                {
-                    audioTrackTextBox.Text = firstFile.FullName;
-                }
+                audioTrackTextBox.Text = firstFile.FullName;
             });
             return Task.CompletedTask;
         }
@@ -110,33 +92,6 @@ namespace osu.Game.Screens.Edit.Setup
             game.RegisterImportHandler(this);
         }
 
-        public bool ChangeBackgroundImage(string path)
-        {
-            var info = new FileInfo(path);
-
-            if (!info.Exists)
-                return false;
-
-            var set = working.Value.BeatmapSetInfo;
-
-            // remove the previous background for now.
-            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
-
-            using (var stream = info.OpenRead())
-            {
-                if (oldFile != null)
-                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
-                else
-                    beatmaps.AddFile(set, stream, info.Name);
-            }
-
-            working.Value.Metadata.BackgroundFile = info.Name;
-            updateBackgroundSprite();
-
-            return true;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -177,40 +132,5 @@ namespace osu.Game.Screens.Edit.Setup
             if (!ChangeAudioTrack(filePath.NewValue))
                 audioTrackTextBox.Current.Value = filePath.OldValue;
         }
-
-        private void updateBackgroundSprite()
-        {
-            LoadComponentAsync(new BeatmapBackgroundSprite(working.Value)
-            {
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                FillMode = FillMode.Fill,
-            }, background =>
-            {
-                if (background.Texture != null)
-                    backgroundSpriteContainer.Child = background;
-                else
-                {
-                    backgroundSpriteContainer.Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = Colours.GreySeafoamDarker,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 24))
-                        {
-                            Text = "Drag image here to set beatmap background!",
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.X,
-                        }
-                    };
-                }
-
-                background.FadeInFromZero(500);
-            });
-        }
     }
 }

From 294d9114260af37de1aced94d4120096144188c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 20:21:36 +0200
Subject: [PATCH 08805/10326] Move background chooser to header

---
 .../Screens/Edit/Setup/BackgroundChooser.cs   |  5 ++---
 .../Screens/Edit/Setup/ResourcesSection.cs    |  5 -----
 .../Screens/Edit/Setup/SetupScreenHeader.cs   | 20 +++++++++++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
index 7bdd962ec8..9137eca334 100644
--- a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
+++ b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
@@ -44,8 +44,7 @@ namespace osu.Game.Screens.Edit.Setup
             InternalChild = content = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                Masking = true,
-                CornerRadius = 10,
+                Masking = true
             };
         }
 
@@ -133,7 +132,7 @@ namespace osu.Game.Screens.Edit.Setup
                             Text = "Drag image here to set beatmap background!",
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Both
                         }
                     };
                 }
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 523ded7aec..3058f99fce 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -54,11 +54,6 @@ namespace osu.Game.Screens.Edit.Setup
 
             Children = new Drawable[]
             {
-                new BackgroundChooser
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 250,
-                },
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index 1be833cb9d..b0533e6f00 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -25,12 +25,24 @@ namespace osu.Game.Screens.Edit.Setup
         {
             RelativeSizeAxes = Axes.X,
             AutoSizeAxes = Axes.Y,
-            Children = new Drawable[]
+            // reverse flow is used to ensure that the tab control's expandable bars extend over the background chooser.
+            Child = new ReverseChildIDFillFlowContainer<Drawable>
             {
-                tabControl = new SetupScreenTabControl
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 30
+                    tabControl = new SetupScreenTabControl
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 30
+                    },
+                    new BackgroundChooser
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 120
+                    }
                 }
             }
         };

From eb26f6f4273c638fac4be82a7a8535bcdf42a820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 21:45:11 +0200
Subject: [PATCH 08806/10326] Add failing test case

---
 .../Screens/TestSceneGameplayScreen.cs        | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index c1159dc000..522567584d 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.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.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Testing;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Screens.Gameplay;
+using osu.Game.Tournament.Screens.Gameplay.Components;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
@@ -18,5 +22,24 @@ namespace osu.Game.Tournament.Tests.Screens
             Add(new GameplayScreen());
             Add(chat);
         }
+
+        [Test]
+        public void TestWarmup()
+        {
+            checkScoreVisibility(false);
+
+            toggleWarmup();
+            checkScoreVisibility(true);
+
+            toggleWarmup();
+            checkScoreVisibility(false);
+        }
+
+        private void checkScoreVisibility(bool visible)
+            => AddUntilStep($"scores {(visible ? "shown" : "hidden")}",
+                () => this.ChildrenOfType<TeamScore>().All(score => score.Alpha == (visible ? 1 : 0)));
+
+        private void toggleWarmup()
+            => AddStep("toggle warmup", () => this.ChildrenOfType<TourneyButton>().First().Click());
     }
 }

From 0d9793797ff07ceb9d9046eaa184e9863010967e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 21:46:34 +0200
Subject: [PATCH 08807/10326] Fix scores being initially visible incorrectly in
 gameplay screen

---
 .../Screens/Gameplay/Components/MatchHeader.cs                | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index d790f4b754..8048425ce1 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -95,7 +95,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                     Origin = Anchor.TopRight,
                 },
             };
+        }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
             updateDisplay();
         }
 

From 0febefd8eb187dc1f9e79d210ffd89dd17bac569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 22:24:55 +0200
Subject: [PATCH 08808/10326] Fix scores fading out on entering gameplay screen

---
 .../Gameplay/Components/TeamDisplay.cs        | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 4ba86dcefc..59132bfd2d 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -14,9 +14,21 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
     {
         private readonly TeamScore score;
 
+        private bool showScore;
+
         public bool ShowScore
         {
-            set => score.FadeTo(value ? 1 : 0, 200);
+            get => showScore;
+            set
+            {
+                if (showScore == value)
+                    return;
+
+                showScore = value;
+
+                if (IsLoaded)
+                    score.FadeTo(value ? 1 : 0, 200);
+            }
         }
 
         public TeamDisplay(TournamentTeam team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
@@ -92,5 +104,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 }
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            score.Alpha = ShowScore ? 1 : 0;
+        }
     }
 }

From d4724f4494e8184c4ad3d9ae6e262fe6f8da69b1 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 4 Apr 2021 09:44:45 +0800
Subject: [PATCH 08809/10326] Fix crash

---
 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 da1bbd18c7..795540b65d 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -391,7 +391,7 @@ namespace osu.Game.Online.Leaderboards
                 if (score.Mods.Length > 0 && modsContainer.Any(s => s.IsHovered) && songSelect != null)
                     items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, () => songSelect.Mods.Value = score.Mods));
 
-                if (score.Files.Count > 0)
+                if (score.Files?.Count > 0)
                     items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => scoreManager.Export(score)));
 
                 if (score.ID != 0)

From 5df27ce3d4e1131bcb8567626582bb256ee9b096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Apr 2021 11:41:40 +0200
Subject: [PATCH 08810/10326] Split out score transform logic to method

---
 .../Screens/Gameplay/Components/TeamDisplay.cs        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 59132bfd2d..33658115cc 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 showScore = value;
 
                 if (IsLoaded)
-                    score.FadeTo(value ? 1 : 0, 200);
+                    updateDisplay();
             }
         }
 
@@ -108,7 +108,14 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            score.Alpha = ShowScore ? 1 : 0;
+
+            updateDisplay();
+            FinishTransforms(true);
+        }
+
+        private void updateDisplay()
+        {
+            score.FadeTo(ShowScore ? 1 : 0, 200);
         }
     }
 }

From 9394af32f5150ecbc911ee2191cf571a824033e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Apr 2021 12:34:52 +0200
Subject: [PATCH 08811/10326] Move drag & drop support logic to chooser
 component

---
 .../Edit/Setup/FileChooserLabelledTextBox.cs  | 63 ++++++++++++++-----
 .../Screens/Edit/Setup/ResourcesSection.cs    | 40 +-----------
 2 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
index 70876bf26c..a33a70af65 100644
--- a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
+++ b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
@@ -2,12 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
+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.Input.Events;
+using osu.Game.Database;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
@@ -17,27 +21,27 @@ namespace osu.Game.Screens.Edit.Setup
     /// <summary>
     /// A labelled textbox which reveals an inline file chooser when clicked.
     /// </summary>
-    internal class FileChooserLabelledTextBox : LabelledTextBox
+    internal class FileChooserLabelledTextBox : LabelledTextBox, ICanAcceptFiles
     {
+        private readonly string[] handledExtensions;
+        public IEnumerable<string> HandledExtensions => handledExtensions;
+
+        /// <summary>
+        /// The target container to display the file chooser in.
+        /// </summary>
         public Container Target;
 
-        private readonly IBindable<FileInfo> currentFile = new Bindable<FileInfo>();
+        private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
+
+        [Resolved]
+        private OsuGameBase game { get; set; }
 
         [Resolved]
         private SectionsContainer<SetupSection> sectionsContainer { get; set; }
 
-        public FileChooserLabelledTextBox()
+        public FileChooserLabelledTextBox(params string[] handledExtensions)
         {
-            currentFile.BindValueChanged(onFileSelected);
-        }
-
-        private void onFileSelected(ValueChangedEvent<FileInfo> file)
-        {
-            if (file.NewValue == null)
-                return;
-
-            Target.Clear();
-            Current.Value = file.NewValue.FullName;
+            this.handledExtensions = handledExtensions;
         }
 
         protected override OsuTextBox CreateTextBox() =>
@@ -54,7 +58,7 @@ namespace osu.Game.Screens.Edit.Setup
         {
             FileSelector fileSelector;
 
-            Target.Child = fileSelector = new FileSelector(currentFile.Value?.DirectoryName, ResourcesSection.AudioExtensions)
+            Target.Child = fileSelector = new FileSelector(currentFile.Value?.DirectoryName, handledExtensions)
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 400,
@@ -64,6 +68,37 @@ namespace osu.Game.Screens.Edit.Setup
             sectionsContainer.ScrollTo(fileSelector);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            game.RegisterImportHandler(this);
+            currentFile.BindValueChanged(onFileSelected);
+        }
+
+        private void onFileSelected(ValueChangedEvent<FileInfo> file)
+        {
+            if (file.NewValue == null)
+                return;
+
+            Target.Clear();
+            Current.Value = file.NewValue.FullName;
+        }
+
+        Task ICanAcceptFiles.Import(params string[] paths)
+        {
+            Schedule(() => currentFile.Value = new FileInfo(paths.First()));
+            return Task.CompletedTask;
+        }
+
+        Task ICanAcceptFiles.Import(params ImportTask[] tasks) => throw new NotImplementedException();
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            game.UnregisterImportHandler(this);
+        }
+
         internal class FileChooserOsuTextBox : OsuTextBox
         {
             public Action OnFocused;
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 3058f99fce..b4c7c865e2 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -1,36 +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;
-using System.Collections.Generic;
 using System.IO;
 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.Localisation;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    internal class ResourcesSection : SetupSection, ICanAcceptFiles
+    internal class ResourcesSection : SetupSection
     {
         private LabelledTextBox audioTrackTextBox;
 
         public override LocalisableString Title => "Resources";
 
-        public IEnumerable<string> HandledExtensions => AudioExtensions;
-
-        public static string[] AudioExtensions { get; } = { ".mp3", ".ogg" };
-
-        [Resolved]
-        private OsuGameBase game { get; set; }
-
         [Resolved]
         private MusicController music { get; set; }
 
@@ -54,7 +43,7 @@ namespace osu.Game.Screens.Edit.Setup
 
             Children = new Drawable[]
             {
-                audioTrackTextBox = new FileChooserLabelledTextBox
+                audioTrackTextBox = new FileChooserLabelledTextBox(".mp3", ".ogg")
                 {
                     Label = "Audio Track",
                     PlaceholderText = "Click to select a track",
@@ -68,31 +57,6 @@ namespace osu.Game.Screens.Edit.Setup
             audioTrackTextBox.Current.BindValueChanged(audioTrackChanged);
         }
 
-        Task ICanAcceptFiles.Import(params string[] paths)
-        {
-            Schedule(() =>
-            {
-                var firstFile = new FileInfo(paths.First());
-
-                audioTrackTextBox.Text = firstFile.FullName;
-            });
-            return Task.CompletedTask;
-        }
-
-        Task ICanAcceptFiles.Import(params ImportTask[] tasks) => throw new NotImplementedException();
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            game.RegisterImportHandler(this);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            game?.UnregisterImportHandler(this);
-        }
-
         public bool ChangeAudioTrack(string path)
         {
             var info = new FileInfo(path);

From f2d4ca7676b5f3524a241d07b3c6c661dc553b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Apr 2021 12:50:50 +0200
Subject: [PATCH 08812/10326] Add background chooser text box

---
 .../Screens/Edit/Setup/BackgroundChooser.cs   | 144 ------------------
 .../Screens/Edit/Setup/ResourcesSection.cs    |  61 +++++++-
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    |   5 +-
 .../Screens/Edit/Setup/SetupScreenHeader.cs   |   4 +-
 .../Edit/Setup/SetupScreenHeaderBackground.cs |  76 +++++++++
 5 files changed, 139 insertions(+), 151 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
 create mode 100644 osu.Game/Screens/Edit/Setup/SetupScreenHeaderBackground.cs

diff --git a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
deleted file mode 100644
index 9137eca334..0000000000
--- a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
+++ /dev/null
@@ -1,144 +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.IO;
-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.Graphics.Shapes;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
-using osu.Game.Database;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-
-namespace osu.Game.Screens.Edit.Setup
-{
-    public class BackgroundChooser : CompositeDrawable, ICanAcceptFiles
-    {
-        public IEnumerable<string> HandledExtensions => ImageExtensions;
-
-        public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
-
-        [Resolved]
-        private OsuGameBase game { get; set; }
-
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        [Resolved]
-        private IBindable<WorkingBeatmap> working { get; set; }
-
-        private readonly Container content;
-
-        public BackgroundChooser()
-        {
-            InternalChild = content = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Masking = true
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            updateBackgroundSprite();
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            game.RegisterImportHandler(this);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            game?.UnregisterImportHandler(this);
-        }
-
-        Task ICanAcceptFiles.Import(params string[] paths)
-        {
-            Schedule(() =>
-            {
-                var firstFile = new FileInfo(paths.First());
-
-                ChangeBackgroundImage(firstFile.FullName);
-            });
-            return Task.CompletedTask;
-        }
-
-        Task ICanAcceptFiles.Import(params ImportTask[] tasks) => throw new NotImplementedException();
-
-        public bool ChangeBackgroundImage(string path)
-        {
-            var info = new FileInfo(path);
-
-            if (!info.Exists)
-                return false;
-
-            var set = working.Value.BeatmapSetInfo;
-
-            // remove the previous background for now.
-            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
-
-            using (var stream = info.OpenRead())
-            {
-                if (oldFile != null)
-                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
-                else
-                    beatmaps.AddFile(set, stream, info.Name);
-            }
-
-            working.Value.Metadata.BackgroundFile = info.Name;
-            updateBackgroundSprite();
-
-            return true;
-        }
-
-        private void updateBackgroundSprite()
-        {
-            LoadComponentAsync(new BeatmapBackgroundSprite(working.Value)
-            {
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                FillMode = FillMode.Fill,
-            }, background =>
-            {
-                if (background.Texture != null)
-                    content.Child = background;
-                else
-                {
-                    content.Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = colours.GreySeafoamDarker,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 24))
-                        {
-                            Text = "Drag image here to set beatmap background!",
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.Both
-                        }
-                    };
-                }
-
-                background.FadeInFromZero(500);
-            });
-        }
-    }
-}
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index b4c7c865e2..dda6d79919 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Screens.Edit.Setup
     internal class ResourcesSection : SetupSection
     {
         private LabelledTextBox audioTrackTextBox;
+        private LabelledTextBox backgroundTextBox;
 
         public override LocalisableString Title => "Resources";
 
@@ -32,17 +33,26 @@ namespace osu.Game.Screens.Edit.Setup
         [Resolved(canBeNull: true)]
         private Editor editor { get; set; }
 
+        [Resolved]
+        private SetupScreenHeader header { get; set; }
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            Container audioTrackFileChooserContainer = new Container
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-            };
+            Container audioTrackFileChooserContainer = createFileChooserContainer();
+            Container backgroundFileChooserContainer = createFileChooserContainer();
 
             Children = new Drawable[]
             {
+                backgroundTextBox = new FileChooserLabelledTextBox(".jpg", ".jpeg", ".png")
+                {
+                    Label = "Background",
+                    PlaceholderText = "Click to select a background image",
+                    Current = { Value = working.Value.Metadata.BackgroundFile },
+                    Target = backgroundFileChooserContainer,
+                    TabbableContentContainer = this
+                },
+                backgroundFileChooserContainer,
                 audioTrackTextBox = new FileChooserLabelledTextBox(".mp3", ".ogg")
                 {
                     Label = "Audio Track",
@@ -54,9 +64,17 @@ namespace osu.Game.Screens.Edit.Setup
                 audioTrackFileChooserContainer,
             };
 
+            backgroundTextBox.Current.BindValueChanged(backgroundChanged);
             audioTrackTextBox.Current.BindValueChanged(audioTrackChanged);
         }
 
+        private static Container createFileChooserContainer() =>
+            new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+            };
+
         public bool ChangeAudioTrack(string path)
         {
             var info = new FileInfo(path);
@@ -86,6 +104,39 @@ namespace osu.Game.Screens.Edit.Setup
             return true;
         }
 
+        public bool ChangeBackgroundImage(string path)
+        {
+            var info = new FileInfo(path);
+
+            if (!info.Exists)
+                return false;
+
+            var set = working.Value.BeatmapSetInfo;
+
+            // remove the previous background for now.
+            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
+
+            using (var stream = info.OpenRead())
+            {
+                if (oldFile != null)
+                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
+                else
+                    beatmaps.AddFile(set, stream, info.Name);
+            }
+
+            working.Value.Metadata.BackgroundFile = info.Name;
+            header.Background.UpdateBackground();
+
+            return true;
+        }
+
+        private void backgroundChanged(ValueChangedEvent<string> filePath)
+        {
+            if (!ChangeBackgroundImage(filePath.NewValue))
+                backgroundTextBox.Current.Value = filePath.OldValue;
+        }
+
         private void audioTrackChanged(ValueChangedEvent<string> filePath)
         {
             if (!ChangeAudioTrack(filePath.NewValue))
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index dccc69039c..70671b487c 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Screens.Edit.Setup
         [Cached]
         private SectionsContainer<SetupSection> sections = new SectionsContainer<SetupSection>();
 
+        [Cached]
+        private SetupScreenHeader header = new SetupScreenHeader();
+
         public SetupScreen()
             : base(EditorScreenMode.SongSetup)
         {
@@ -51,7 +54,7 @@ namespace osu.Game.Screens.Edit.Setup
                         },
                         sections = new SectionsContainer<SetupSection>
                         {
-                            FixedHeader = new SetupScreenHeader(),
+                            FixedHeader = header,
                             RelativeSizeAxes = Axes.Both,
                             Children = new SetupSection[]
                             {
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index b0533e6f00..06aad69afa 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Screens.Edit.Setup
 {
     internal class SetupScreenHeader : OverlayHeader
     {
+        public SetupScreenHeaderBackground Background { get; private set; }
+
         [Resolved]
         private SectionsContainer<SetupSection> sections { get; set; }
 
@@ -38,7 +40,7 @@ namespace osu.Game.Screens.Edit.Setup
                         RelativeSizeAxes = Axes.X,
                         Height = 30
                     },
-                    new BackgroundChooser
+                    Background = new SetupScreenHeaderBackground
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 120
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeaderBackground.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeaderBackground.cs
new file mode 100644
index 0000000000..7304323004
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeaderBackground.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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    public class SetupScreenHeaderBackground : CompositeDrawable
+    {
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Resolved]
+        private IBindable<WorkingBeatmap> working { get; set; }
+
+        private readonly Container content;
+
+        public SetupScreenHeaderBackground()
+        {
+            InternalChild = content = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Masking = true
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            UpdateBackground();
+        }
+
+        public void UpdateBackground()
+        {
+            LoadComponentAsync(new BeatmapBackgroundSprite(working.Value)
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                FillMode = FillMode.Fill,
+            }, background =>
+            {
+                if (background.Texture != null)
+                    content.Child = background;
+                else
+                {
+                    content.Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colours.GreySeafoamDarker,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 24))
+                        {
+                            Text = "Drag image here to set beatmap background!",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            AutoSizeAxes = Axes.Both
+                        }
+                    };
+                }
+
+                background.FadeInFromZero(500);
+            });
+        }
+    }
+}

From a0f0ae7979727baa1eae01895e7e3606c526eb31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Apr 2021 12:53:51 +0200
Subject: [PATCH 08813/10326] Adjust spacings in resources section

---
 .../Screens/Edit/Setup/ResourcesSection.cs    | 48 +++++++++++++------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index dda6d79919..74002b3b1c 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -44,24 +44,42 @@ namespace osu.Game.Screens.Edit.Setup
 
             Children = new Drawable[]
             {
-                backgroundTextBox = new FileChooserLabelledTextBox(".jpg", ".jpeg", ".png")
+                new FillFlowContainer
                 {
-                    Label = "Background",
-                    PlaceholderText = "Click to select a background image",
-                    Current = { Value = working.Value.Metadata.BackgroundFile },
-                    Target = backgroundFileChooserContainer,
-                    TabbableContentContainer = this
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        backgroundTextBox = new FileChooserLabelledTextBox(".jpg", ".jpeg", ".png")
+                        {
+                            Label = "Background",
+                            PlaceholderText = "Click to select a background image",
+                            Current = { Value = working.Value.Metadata.BackgroundFile },
+                            Target = backgroundFileChooserContainer,
+                            TabbableContentContainer = this
+                        },
+                        backgroundFileChooserContainer,
+                    }
                 },
-                backgroundFileChooserContainer,
-                audioTrackTextBox = new FileChooserLabelledTextBox(".mp3", ".ogg")
+                new FillFlowContainer
                 {
-                    Label = "Audio Track",
-                    PlaceholderText = "Click to select a track",
-                    Current = { Value = working.Value.Metadata.AudioFile },
-                    Target = audioTrackFileChooserContainer,
-                    TabbableContentContainer = this
-                },
-                audioTrackFileChooserContainer,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        audioTrackTextBox = new FileChooserLabelledTextBox(".mp3", ".ogg")
+                        {
+                            Label = "Audio Track",
+                            PlaceholderText = "Click to select a track",
+                            Current = { Value = working.Value.Metadata.AudioFile },
+                            Target = audioTrackFileChooserContainer,
+                            TabbableContentContainer = this
+                        },
+                        audioTrackFileChooserContainer,
+                    }
+                }
             };
 
             backgroundTextBox.Current.BindValueChanged(backgroundChanged);

From 0a1417bc6731bdbddbeb6791b7dfcaf9d2d1c1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Apr 2021 13:10:12 +0200
Subject: [PATCH 08814/10326] Swap order of background/audio track changing
 methods

Mostly for quality of reviewing (restores previous order) and more
consistency overall.
---
 .../Screens/Edit/Setup/ResourcesSection.cs    | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 74002b3b1c..12270f2aa4 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -93,6 +93,33 @@ namespace osu.Game.Screens.Edit.Setup
                 AutoSizeAxes = Axes.Y,
             };
 
+        public bool ChangeBackgroundImage(string path)
+        {
+            var info = new FileInfo(path);
+
+            if (!info.Exists)
+                return false;
+
+            var set = working.Value.BeatmapSetInfo;
+
+            // remove the previous background for now.
+            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
+
+            using (var stream = info.OpenRead())
+            {
+                if (oldFile != null)
+                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
+                else
+                    beatmaps.AddFile(set, stream, info.Name);
+            }
+
+            working.Value.Metadata.BackgroundFile = info.Name;
+            header.Background.UpdateBackground();
+
+            return true;
+        }
+
         public bool ChangeAudioTrack(string path)
         {
             var info = new FileInfo(path);
@@ -122,33 +149,6 @@ namespace osu.Game.Screens.Edit.Setup
             return true;
         }
 
-        public bool ChangeBackgroundImage(string path)
-        {
-            var info = new FileInfo(path);
-
-            if (!info.Exists)
-                return false;
-
-            var set = working.Value.BeatmapSetInfo;
-
-            // remove the previous background for now.
-            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
-
-            using (var stream = info.OpenRead())
-            {
-                if (oldFile != null)
-                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
-                else
-                    beatmaps.AddFile(set, stream, info.Name);
-            }
-
-            working.Value.Metadata.BackgroundFile = info.Name;
-            header.Background.UpdateBackground();
-
-            return true;
-        }
-
         private void backgroundChanged(ValueChangedEvent<string> filePath)
         {
             if (!ChangeBackgroundImage(filePath.NewValue))

From 5f1f8ec0ef9d666fafa109196644691be877e713 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 4 Apr 2021 14:10:07 +0200
Subject: [PATCH 08815/10326] Fix IPC Source getting read from the incorrect
 location

---
 osu.Game.Tournament/Models/StableInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index d390f88d59..2dc47db26d 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -34,10 +34,10 @@ namespace osu.Game.Tournament.Models
             TournamentStorage tStorage = (TournamentStorage)storage;
             this.storage = tStorage.AllTournaments;
 
-            if (!storage.Exists(config_path))
+            if (!this.storage.Exists(config_path))
                 return;
 
-            using (Stream stream = storage.GetStream(config_path, FileAccess.Read, FileMode.Open))
+            using (Stream stream = this.storage.GetStream(config_path, FileAccess.Read, FileMode.Open))
             using (var sr = new StreamReader(stream))
             {
                 JsonConvert.PopulateObject(sr.ReadToEnd(), this);

From 4ee8224f8b624320b52743c2e68986b795002388 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 4 Apr 2021 14:31:08 +0200
Subject: [PATCH 08816/10326] change naming to be less confusing

---
 osu.Game.Tournament/Models/StableInfo.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 2dc47db26d..c0538ca587 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -27,17 +27,17 @@ namespace osu.Game.Tournament.Models
 
         private const string config_path = "stable.json";
 
-        private readonly Storage storage;
+        private readonly Storage configStorage;
 
         public StableInfo(Storage storage)
         {
             TournamentStorage tStorage = (TournamentStorage)storage;
-            this.storage = tStorage.AllTournaments;
+            configStorage = tStorage.AllTournaments;
 
-            if (!this.storage.Exists(config_path))
+            if (!configStorage.Exists(config_path))
                 return;
 
-            using (Stream stream = this.storage.GetStream(config_path, FileAccess.Read, FileMode.Open))
+            using (Stream stream = configStorage.GetStream(config_path, FileAccess.Read, FileMode.Open))
             using (var sr = new StreamReader(stream))
             {
                 JsonConvert.PopulateObject(sr.ReadToEnd(), this);
@@ -46,7 +46,7 @@ namespace osu.Game.Tournament.Models
 
         public void SaveChanges()
         {
-            using (var stream = storage.GetStream(config_path, FileAccess.Write, FileMode.Create))
+            using (var stream = configStorage.GetStream(config_path, FileAccess.Write, FileMode.Create))
             using (var sw = new StreamWriter(stream))
             {
                 sw.Write(JsonConvert.SerializeObject(this,

From 879b1ab046eefd501e82a8d4d4ce4baa124872ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 4 Apr 2021 21:58:25 +0900
Subject: [PATCH 08817/10326] Avoid unnecessary casts

---
 osu.Game.Tournament.Tests/TournamentTestScene.cs | 3 ++-
 osu.Game.Tournament/Models/StableInfo.cs         | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index cdfd19c157..1fa0ffc8e9 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -10,6 +10,7 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Tests.Visual;
+using osu.Game.Tournament.IO;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osu.Game.Users;
@@ -28,7 +29,7 @@ namespace osu.Game.Tournament.Tests
         protected MatchIPCInfo IPCInfo { get; private set; } = new MatchIPCInfo();
 
         [BackgroundDependencyLoader]
-        private void load(Storage storage)
+        private void load(TournamentStorage storage)
         {
             Ladder.Ruleset.Value ??= rulesetStore.AvailableRulesets.First();
 
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index c0538ca587..1ebc81c773 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -29,10 +29,9 @@ namespace osu.Game.Tournament.Models
 
         private readonly Storage configStorage;
 
-        public StableInfo(Storage storage)
+        public StableInfo(TournamentStorage storage)
         {
-            TournamentStorage tStorage = (TournamentStorage)storage;
-            configStorage = tStorage.AllTournaments;
+            configStorage = storage.AllTournaments;
 
             if (!configStorage.Exists(config_path))
                 return;

From 37f8b6220067a03615cb7d487e8429eb9822dbd4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 11:41:40 +0900
Subject: [PATCH 08818/10326] Add ruleset templates structure

---
 Templates/LICENSE                             |  21 +
 Templates/README.md                           |  21 +
 .../Rulesets/ruleset-empty/.editorconfig      |  27 +
 Templates/Rulesets/ruleset-empty/.gitignore   | 288 ++++++
 .../.template.config/template.json            |  16 +
 .../.vscode/launch.json                       |  31 +
 .../.vscode/tasks.json                        |  47 +
 .../TestSceneOsuGame.cs                       |  32 +
 .../TestSceneOsuPlayer.cs                     |  14 +
 .../VisualTestRunner.cs                       |  23 +
 ...u.Game.Rulesets.EmptyFreeform.Tests.csproj |  26 +
 .../osu.Game.Rulesets.EmptyFreeform.sln       |  96 ++
 ...ame.Rulesets.EmptyFreeform.sln.DotSettings | 877 ++++++++++++++++++
 .../Beatmaps/EmptyFreeformBeatmapConverter.cs |  35 +
 .../EmptyFreeformDifficultyCalculator.cs      |  30 +
 .../EmptyFreeformInputManager.cs              |  26 +
 .../EmptyFreeformRuleset.cs                   |  80 ++
 .../Mods/EmptyFreeformModAutoplay.cs          |  25 +
 .../DrawableEmptyFreeformHitObject.cs         |  49 +
 .../Objects/EmptyFreeformHitObject.cs         |  20 +
 .../Replays/EmptyFreeformAutoGenerator.cs     |  42 +
 .../EmptyFreeformFramedReplayInputHandler.cs  |  51 +
 .../Replays/EmptyFreeformReplayFrame.cs       |  21 +
 .../UI/DrawableEmptyFreeformRuleset.cs        |  35 +
 .../UI/EmptyFreeformPlayfield.cs              |  22 +
 .../osu.Game.Rulesets.EmptyFreeform.csproj    |  15 +
 .../Rulesets/ruleset-example/.editorconfig    |  27 +
 Templates/Rulesets/ruleset-example/.gitignore | 288 ++++++
 .../.template.config/template.json            |  17 +
 .../.vscode/launch.json                       |  31 +
 .../.vscode/tasks.json                        |  47 +
 .../TestSceneOsuGame.cs                       |  32 +
 .../TestSceneOsuPlayer.cs                     |  14 +
 .../VisualTestRunner.cs                       |  23 +
 .../osu.Game.Rulesets.Pippidon.Tests.csproj   |  26 +
 .../osu.Game.Rulesets.Pippidon.sln            |  96 ++
 ...osu.Game.Rulesets.Pippidon.sln.DotSettings | 877 ++++++++++++++++++
 .../Beatmaps/PippidonBeatmapConverter.cs      |  34 +
 .../Mods/PippidonModAutoplay.cs               |  25 +
 .../Drawables/DrawablePippidonHitObject.cs    |  78 ++
 .../Objects/PippidonHitObject.cs              |  20 +
 .../PippidonDifficultyCalculator.cs           |  30 +
 .../PippidonInputManager.cs                   |  26 +
 .../PippidonRuleset.cs                        |  57 ++
 .../Replays/PippidonAutoGenerator.cs          |  41 +
 .../PippidonFramedReplayInputHandler.cs       |  46 +
 .../Replays/PippidonReplayFrame.cs            |  13 +
 .../Samples/Gameplay/normal-hitnormal.mp3     | Bin 0 -> 8022 bytes
 .../Resources/Textures/character.png          | Bin 0 -> 78937 bytes
 .../Resources/Textures/coin.png               | Bin 0 -> 3141 bytes
 .../Scoring/PippidonScoreProcessor.cs         |  11 +
 .../UI/DrawablePippidonRuleset.cs             |  37 +
 .../UI/PippidonCursorContainer.cs             |  34 +
 .../UI/PippidonPlayfield.cs                   |  24 +
 .../PippidonPlayfieldAdjustmentContainer.cs   |  20 +
 .../osu.Game.Rulesets.Pippidon.csproj         |  15 +
 .../ruleset-scrolling-empty/.editorconfig     |  27 +
 .../ruleset-scrolling-empty/.gitignore        | 288 ++++++
 .../.template.config/template.json            |  16 +
 .../.vscode/launch.json                       |  31 +
 .../.vscode/tasks.json                        |  47 +
 .../TestSceneOsuGame.cs                       |  32 +
 .../TestSceneOsuPlayer.cs                     |  14 +
 .../VisualTestRunner.cs                       |  23 +
 ....Game.Rulesets.EmptyScrolling.Tests.csproj |  26 +
 .../osu.Game.Rulesets.EmptyScrolling.sln      |  96 ++
 ...me.Rulesets.EmptyScrolling.sln.DotSettings | 877 ++++++++++++++++++
 .../EmptyScrollingBeatmapConverter.cs         |  32 +
 .../EmptyScrollingDifficultyCalculator.cs     |  30 +
 .../EmptyScrollingInputManager.cs             |  26 +
 .../EmptyScrollingRuleset.cs                  |  57 ++
 .../Mods/EmptyScrollingModAutoplay.cs         |  25 +
 .../DrawableEmptyScrollingHitObject.cs        |  48 +
 .../Objects/EmptyScrollingHitObject.cs        |  13 +
 .../Replays/EmptyScrollingAutoGenerator.cs    |  41 +
 .../EmptyScrollingFramedReplayInputHandler.cs |  29 +
 .../Replays/EmptyScrollingReplayFrame.cs      |  19 +
 .../UI/DrawableEmptyScrollingRuleset.cs       |  38 +
 .../UI/EmptyScrollingPlayfield.cs             |  22 +
 .../osu.Game.Rulesets.EmptyScrolling.csproj   |  15 +
 .../ruleset-scrolling-example/.editorconfig   |  27 +
 .../ruleset-scrolling-example/.gitignore      | 288 ++++++
 .../.template.config/template.json            |  16 +
 .../.vscode/launch.json                       |  31 +
 .../.vscode/tasks.json                        |  47 +
 .../TestSceneOsuGame.cs                       |  32 +
 .../TestSceneOsuPlayer.cs                     |  14 +
 .../VisualTestRunner.cs                       |  23 +
 .../osu.Game.Rulesets.Pippidon.Tests.csproj   |  26 +
 .../osu.Game.Rulesets.Pippidon.sln            |  96 ++
 ...osu.Game.Rulesets.Pippidon.sln.DotSettings | 877 ++++++++++++++++++
 .../Beatmaps/PippidonBeatmapConverter.cs      |  45 +
 .../Mods/PippidonModAutoplay.cs               |  25 +
 .../Drawables/DrawablePippidonHitObject.cs    |  75 ++
 .../Objects/PippidonHitObject.cs              |  18 +
 .../PippidonDifficultyCalculator.cs           |  30 +
 .../PippidonInputManager.cs                   |  26 +
 .../PippidonRuleset.cs                        |  55 ++
 .../Replays/PippidonAutoGenerator.cs          |  68 ++
 .../PippidonFramedReplayInputHandler.cs       |  29 +
 .../Replays/PippidonReplayFrame.cs            |  19 +
 .../Samples/Gameplay/normal-hitnormal.mp3     | Bin 0 -> 8022 bytes
 .../Resources/Textures/character.png          | Bin 0 -> 78937 bytes
 .../Resources/Textures/coin.png               | Bin 0 -> 3141 bytes
 .../UI/DrawablePippidonRuleset.cs             |  38 +
 .../UI/PippidonCharacter.cs                   |  87 ++
 .../UI/PippidonPlayfield.cs                   | 128 +++
 .../osu.Game.Rulesets.Pippidon.csproj         |  15 +
 Templates/osu.Game.Templates.csproj           |  24 +
 109 files changed, 7990 insertions(+)
 create mode 100644 Templates/LICENSE
 create mode 100644 Templates/README.md
 create mode 100644 Templates/Rulesets/ruleset-empty/.editorconfig
 create mode 100644 Templates/Rulesets/ruleset-empty/.gitignore
 create mode 100644 Templates/Rulesets/ruleset-empty/.template.config/template.json
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/tasks.json
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuGame.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuPlayer.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/VisualTestRunner.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Beatmaps/EmptyFreeformBeatmapConverter.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformDifficultyCalculator.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformInputManager.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Mods/EmptyFreeformModAutoplay.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/Drawables/DrawableEmptyFreeformHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/EmptyFreeformHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformReplayFrame.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/EmptyFreeformPlayfield.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
 create mode 100644 Templates/Rulesets/ruleset-example/.editorconfig
 create mode 100644 Templates/Rulesets/ruleset-example/.gitignore
 create mode 100644 Templates/Rulesets/ruleset-example/.template.config/template.json
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonCursorContainer.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfieldAdjustmentContainer.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/.gitignore
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/.template.config/template.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/tasks.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuGame.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuPlayer.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/VisualTestRunner.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Beatmaps/EmptyScrollingBeatmapConverter.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingDifficultyCalculator.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingInputManager.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Mods/EmptyScrollingModAutoplay.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/Drawables/DrawableEmptyScrollingHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/EmptyScrollingHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingFramedReplayInputHandler.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingReplayFrame.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/EmptyScrollingPlayfield.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/.editorconfig
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/.gitignore
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/.template.config/template.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonCharacter.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
 create mode 100644 Templates/osu.Game.Templates.csproj

diff --git a/Templates/LICENSE b/Templates/LICENSE
new file mode 100644
index 0000000000..3abffc40a7
--- /dev/null
+++ b/Templates/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 ppy Pty Ltd <contact@ppy.sh>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/Templates/README.md b/Templates/README.md
new file mode 100644
index 0000000000..75ee76ddba
--- /dev/null
+++ b/Templates/README.md
@@ -0,0 +1,21 @@
+# osu-templates
+
+Templates for use when creating osu! dependent projects. Create a fully-testable (and ready for git) custom ruleset in just two lines.
+
+## Usage
+
+```bash
+# install (or update) templates package.
+# this only needs to be done once
+dotnet new -i ppy.osu.Game.Templates
+
+# create an empty freeform ruleset
+dotnet new ruleset -n MyCoolRuleset
+# create an empty scrolling ruleset (which provides the basics for a scrolling ←↑→↓ ruleset)
+dotnet new ruleset-scrolling -n MyCoolRuleset
+
+# ..or start with a working sample freeform game
+dotnet new ruleset-example -n MyCoolWorkingRuleset
+# ..or a working sample scrolling game
+dotnet new ruleset-scrolling-example -n MyCoolWorkingRuleset
+```
diff --git a/Templates/Rulesets/ruleset-empty/.editorconfig b/Templates/Rulesets/ruleset-empty/.editorconfig
new file mode 100644
index 0000000000..24825b7c42
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/.editorconfig
@@ -0,0 +1,27 @@
+# EditorConfig is awesome: http://editorconfig.org
+root = true
+
+[*.cs]
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+#Roslyn naming styles
+
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-empty/.gitignore b/Templates/Rulesets/ruleset-empty/.gitignore
new file mode 100644
index 0000000000..940794e60f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/.gitignore
@@ -0,0 +1,288 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
diff --git a/Templates/Rulesets/ruleset-empty/.template.config/template.json b/Templates/Rulesets/ruleset-empty/.template.config/template.json
new file mode 100644
index 0000000000..6bfe2e19dc
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/.template.config/template.json
@@ -0,0 +1,16 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "ppy Pty Ltd",
+    "classifications": [
+        "Console"
+    ],
+    "name": "osu! ruleset",
+    "identity": "ppy.osu.Game.Templates.Rulesets",
+    "shortName": "ruleset",
+    "tags": {
+        "language": "C#",
+        "type": "project"
+    },
+    "sourceName": "EmptyFreeform",
+    "preferNameDirectory": true
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json
new file mode 100644
index 0000000000..fd03878699
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "VisualTests (Debug)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug)",
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "env": {},
+            "console": "internalConsole"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/tasks.json b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/tasks.json
new file mode 100644
index 0000000000..509df6a510
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/tasks.json
@@ -0,0 +1,47 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build (Debug)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.EmptyFreeformRuleset.Tests.csproj",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.EmptyFreeformRuleset.Tests.csproj",
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Restore",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuGame.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuGame.cs
new file mode 100644
index 0000000000..9c512a01ea
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuGame.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Platform;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Tests
+{
+    public class TestSceneOsuGame : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, OsuGameBase gameBase)
+        {
+            OsuGame game = new OsuGame();
+            game.SetHost(host);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                game
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuPlayer.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuPlayer.cs
new file mode 100644
index 0000000000..0f2ddf82a5
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuPlayer.cs
@@ -0,0 +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 NUnit.Framework;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Tests
+{
+    [TestFixture]
+    public class TestSceneOsuPlayer : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new EmptyFreeformRuleset();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/VisualTestRunner.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/VisualTestRunner.cs
new file mode 100644
index 0000000000..4f810ce17f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/VisualTestRunner.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 System;
+using osu.Framework;
+using osu.Framework.Platform;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Tests
+{
+    public static class VisualTestRunner
+    {
+        [STAThread]
+        public static int Main(string[] args)
+        {
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
+            {
+                host.Run(new OsuTestBrowser());
+                return 0;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
new file mode 100644
index 0000000000..98a32f9b3a
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+      <StartupObject>osu.Game.Rulesets.EmptyFreeform.Tests.VisualTestRunner</StartupObject>
+    </PropertyGroup>
+    <ItemGroup Label="Service">
+      <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+    </ItemGroup>
+    <PropertyGroup>
+      <GenerateProgramFile>false</GenerateProgramFile>
+    </PropertyGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />
+  </ItemGroup>
+  <PropertyGroup Label="Project">
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>osu.Game.Rulesets.EmptyFreeform.Tests</RootNamespace>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln
new file mode 100644
index 0000000000..706df08472
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln
@@ -0,0 +1,96 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.EmptyFreeform", "osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyFreeform.Tests", "osu.Game.Rulesets.EmptyFreeform.Tests\osu.Game.Rulesets.EmptyFreeform.Tests.csproj", "{B4577C85-CB83-462A-BCE3-22FFEB16311D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		VisualTests|Any CPU = VisualTests|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {671B0BEC-2403-45B0-9357-2C97CC517668}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+EndGlobal
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
new file mode 100644
index 0000000000..1cbe36794a
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
@@ -0,0 +1,877 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ewav/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=2A66DD92_002DADB1_002D4994_002D89E2_002DC94E04ACDA0D_002Fd_003AMigrations/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=D9A367C9_002D4C1A_002D489F_002D9B05_002DA0CEA2B53B58/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeAccessorOwnerBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMissingParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeConstructorOrDestructorBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadColonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadCommaSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyFreeformScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadLinqLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadListLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadMemberAccessSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadNamespaceBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPreprocessorIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSemicolonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSpacesAfterKeyword/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSquareBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSwitchBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSymbolSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CanBeReplacedWithTryCastAndCheckForNull/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassWithVirtualMembersNeverInherited_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002EGlobal/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IncorrectBlankLinesNearBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InheritdocConsiderUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InlineOutVariableDeclaration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvertIf/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinDeclarationAndInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinNullCheckWithUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeProtected_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MoreSpecificForeachVariableTypeAvailable/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleStatementsOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleTypeMembersOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NestedStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=OutdentIsOffPrevLevel/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeUsageProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyFreeformScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimPrefix/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimStringPrefix/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELongCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EWhere/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingleOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAndSpacesMismatch/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAreDisallowed/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsOutsideIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberHierarchy_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberInSuper_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UsePatternMatching/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VariableCanBeMadeConst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberCallInConstructor/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyFreeformScrollingTags&gt;False&lt;/XAMLCollapseEmptyFreeformScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/MakeFieldPrivate/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/UseAutoProperty/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPM/@EntryIndexedValue">BPM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GC/@EntryIndexedValue">GC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LTRB/@EntryIndexedValue">LTRB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NS/@EntryIndexedValue">NS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PM/@EntryIndexedValue">PM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGB/@EntryIndexedValue">RGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RNG/@EntryIndexedValue">RNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
+&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;Or&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Interface" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+        &lt;Kind Is="Struct" /&gt;&#xD;
+      &lt;/Or&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+      &lt;Group DisplayName="Public Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Public" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Internal" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Protected" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Private Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Private" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+      &lt;Entry DisplayName="Ctor"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;Kind Is="Constructor" /&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Region Name="Disposal"&gt;&#xD;
+        &lt;Entry DisplayName="Dtor"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;Kind Is="Destructor" /&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Virtual /&gt;&#xD;
+                &lt;Override /&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Region&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Methods"&gt;&#xD;
+      &lt;Group DisplayName="Public"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Internal"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Protected"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Private"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&lt;/Patterns&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
+See the LICENCE file in the repository root for full licence text.&#xD;
+</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalFunctions/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9d1af99b_002Dbefe_002D48a4_002D9eb3_002D661384e29869/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9ffbe43b_002Dc610_002D411b_002D9839_002D1416a146d9b0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4c2df6c_002Db202_002D48d5_002Db077_002De678cb548c25/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=fd562728_002Dc23d_002D417f_002Da19f_002D9d854247fbea/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMIXED_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Expression/@EntryValue">constant("Centre")</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Shortcut/@EntryValue">ofao</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Text/@EntryValue">Anchor = Anchor.$anchor$,
+Origin = Anchor.$anchor$,</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Description/@EntryValue">o!f – InternalChildren = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Shortcut/@EntryValue">ofic</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Description/@EntryValue">o!f – new GridContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Shortcut/@EntryValue">ofgc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Content = new[]
+    {
+        new Drawable[] { $END$ },
+        new Drawable[] { }
+    }
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Description/@EntryValue">o!f – new FillFlowContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Shortcut/@EntryValue">offf</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Direction = FillDirection.Vertical,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Description/@EntryValue">o!f – new Container { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Shortcut/@EntryValue">ofcont</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
+{
+    RelativeSizeAxes = Axes.Both,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Description/@EntryValue">o!f – BackgroundDependencyLoader load()</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Shortcut/@EntryValue">ofbdl</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
+private void load()
+{
+    $END$
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Description/@EntryValue">o!f – new Box { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Shortcut/@EntryValue">ofbox</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
+{
+    Colour = Color4.Black,
+    RelativeSizeAxes = Axes.Both,
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Description/@EntryValue">o!f – Children = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Shortcut/@EntryValue">ofc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Beatmaps/EmptyFreeformBeatmapConverter.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Beatmaps/EmptyFreeformBeatmapConverter.cs
new file mode 100644
index 0000000000..a441438d80
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Beatmaps/EmptyFreeformBeatmapConverter.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.Collections.Generic;
+using System.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.EmptyFreeform.Objects;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Beatmaps
+{
+    public class EmptyFreeformBeatmapConverter : BeatmapConverter<EmptyFreeformHitObject>
+    {
+        public EmptyFreeformBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
+            : base(beatmap, ruleset)
+        {
+        }
+
+        // todo: Check for conversion types that should be supported (ie. Beatmap.HitObjects.Any(h => h is IHasXPosition))
+        // https://github.com/ppy/osu/tree/master/osu.Game/Rulesets/Objects/Types
+        public override bool CanConvert() => true;
+
+        protected override IEnumerable<EmptyFreeformHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
+        {
+            yield return new EmptyFreeformHitObject
+            {
+                Samples = original.Samples,
+                StartTime = original.StartTime,
+                Position = (original as IHasPosition)?.Position ?? Vector2.Zero,
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformDifficultyCalculator.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformDifficultyCalculator.cs
new file mode 100644
index 0000000000..59a68245a6
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformDifficultyCalculator.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.EmptyFreeform
+{
+    public class EmptyFreeformDifficultyCalculator : DifficultyCalculator
+    {
+        public EmptyFreeformDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
+            : base(ruleset, beatmap)
+        {
+        }
+
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
+        {
+            return new DifficultyAttributes(mods, skills, 0);
+        }
+
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();
+
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[0];
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformInputManager.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformInputManager.cs
new file mode 100644
index 0000000000..b292a28c0d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformInputManager.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 System.ComponentModel;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.EmptyFreeform
+{
+    public class EmptyFreeformInputManager : RulesetInputManager<EmptyFreeformAction>
+    {
+        public EmptyFreeformInputManager(RulesetInfo ruleset)
+            : base(ruleset, 0, SimultaneousBindingMode.Unique)
+        {
+        }
+    }
+
+    public enum EmptyFreeformAction
+    {
+        [Description("Button 1")]
+        Button1,
+
+        [Description("Button 2")]
+        Button2,
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs
new file mode 100644
index 0000000000..96675e3e99
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.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.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.EmptyFreeform.Beatmaps;
+using osu.Game.Rulesets.EmptyFreeform.Mods;
+using osu.Game.Rulesets.EmptyFreeform.UI;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.EmptyFreeform
+{
+    public class EmptyFreeformRuleset : Ruleset
+    {
+        public override string Description => "a very emptyfreeformruleset ruleset";
+
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) =>
+            new DrawableEmptyFreeformRuleset(this, beatmap, mods);
+
+        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) =>
+            new EmptyFreeformBeatmapConverter(beatmap, this);
+
+        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) =>
+            new EmptyFreeformDifficultyCalculator(this, beatmap);
+
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.Automation:
+                    return new[] { new EmptyFreeformModAutoplay() };
+
+                default:
+                    return new Mod[] { null };
+            }
+        }
+
+        public override string ShortName => "emptyfreeformruleset";
+
+        public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
+        {
+            new KeyBinding(InputKey.Z, EmptyFreeformAction.Button1),
+            new KeyBinding(InputKey.X, EmptyFreeformAction.Button2),
+        };
+
+        public override Drawable CreateIcon() => new Icon(ShortName[0]);
+
+        public class Icon : CompositeDrawable
+        {
+            public Icon(char c)
+            {
+                InternalChildren = new Drawable[]
+                {
+                    new Circle
+                    {
+                        Size = new Vector2(20),
+                        Colour = Color4.White,
+                    },
+                    new SpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Text = c.ToString(),
+                        Font = OsuFont.Default.With(size: 18)
+                    }
+                };
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Mods/EmptyFreeformModAutoplay.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Mods/EmptyFreeformModAutoplay.cs
new file mode 100644
index 0000000000..d5c1e9bd15
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Mods/EmptyFreeformModAutoplay.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 System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.EmptyFreeform.Objects;
+using osu.Game.Rulesets.EmptyFreeform.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Scoring;
+using osu.Game.Users;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Mods
+{
+    public class EmptyFreeformModAutoplay : ModAutoplay<EmptyFreeformHitObject>
+    {
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
+        {
+            ScoreInfo = new ScoreInfo
+            {
+                User = new User { Username = "sample" },
+            },
+            Replay = new EmptyFreeformAutoGenerator(beatmap).Generate(),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/Drawables/DrawableEmptyFreeformHitObject.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/Drawables/DrawableEmptyFreeformHitObject.cs
new file mode 100644
index 0000000000..0f38e9fdf8
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/Drawables/DrawableEmptyFreeformHitObject.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.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Objects.Drawables
+{
+    public class DrawableEmptyFreeformHitObject : DrawableHitObject<EmptyFreeformHitObject>
+    {
+        public DrawableEmptyFreeformHitObject(EmptyFreeformHitObject hitObject)
+            : base(hitObject)
+        {
+            Size = new Vector2(40);
+            Origin = Anchor.Centre;
+
+            Position = hitObject.Position;
+
+            // todo: add visuals.
+        }
+
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            if (timeOffset >= 0)
+                // todo: implement judgement logic
+                ApplyResult(r => r.Type = HitResult.Perfect);
+        }
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            const double duration = 1000;
+
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    this.FadeOut(duration, Easing.OutQuint).Expire();
+                    break;
+
+                case ArmedState.Miss:
+                    this.FadeColour(Color4.Red, duration);
+                    this.FadeOut(duration, Easing.InQuint).Expire();
+                    break;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/EmptyFreeformHitObject.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/EmptyFreeformHitObject.cs
new file mode 100644
index 0000000000..9cd18d2d9f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/EmptyFreeformHitObject.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.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Objects
+{
+    public class EmptyFreeformHitObject : HitObject, IHasPosition
+    {
+        public override Judgement CreateJudgement() => new Judgement();
+
+        public Vector2 Position { get; set; }
+
+        public float X => Position.X;
+        public float Y => Position.Y;
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
new file mode 100644
index 0000000000..6d8d4215a2
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.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.Game.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.EmptyFreeform.Objects;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Replays
+{
+    public class EmptyFreeformAutoGenerator : AutoGenerator
+    {
+        protected Replay Replay;
+        protected List<ReplayFrame> Frames => Replay.Frames;
+
+        public new Beatmap<EmptyFreeformHitObject> Beatmap => (Beatmap<EmptyFreeformHitObject>)base.Beatmap;
+
+        public EmptyFreeformAutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+            Replay = new Replay();
+        }
+
+        public override Replay Generate()
+        {
+            Frames.Add(new EmptyFreeformReplayFrame());
+
+            foreach (EmptyFreeformHitObject hitObject in Beatmap.HitObjects)
+            {
+                Frames.Add(new EmptyFreeformReplayFrame
+                {
+                    Time = hitObject.StartTime,
+                    Position = hitObject.Position,
+                    // todo: add required inputs and extra frames.
+                });
+            }
+
+            return Replay;
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
new file mode 100644
index 0000000000..f25ea6ec62
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.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 System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using osu.Framework.Input.StateChanges;
+using osu.Framework.Utils;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Replays;
+using osuTK;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Replays
+{
+    public class EmptyFreeformFramedReplayInputHandler : FramedReplayInputHandler<EmptyFreeformReplayFrame>
+    {
+        public EmptyFreeformFramedReplayInputHandler(Replay replay)
+            : base(replay)
+        {
+        }
+
+        protected override bool IsImportant(EmptyFreeformReplayFrame frame) => frame.Actions.Any();
+
+        protected Vector2 Position
+        {
+            get
+            {
+                var frame = CurrentFrame;
+
+                if (frame == null)
+                    return Vector2.Zero;
+
+                Debug.Assert(CurrentTime != null);
+
+                return Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time);
+            }
+        }
+
+        public override void CollectPendingInputs(List<IInput> inputs)
+        {
+            inputs.Add(new MousePositionAbsoluteInput
+            {
+                Position = GamefieldToScreenSpace(Position),
+            });
+            inputs.Add(new ReplayState<EmptyFreeformAction>
+            {
+                PressedActions = CurrentFrame?.Actions ?? new List<EmptyFreeformAction>(),
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformReplayFrame.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformReplayFrame.cs
new file mode 100644
index 0000000000..c84101ca70
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformReplayFrame.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.Game.Rulesets.Replays;
+using osuTK;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Replays
+{
+    public class EmptyFreeformReplayFrame : ReplayFrame
+    {
+        public List<EmptyFreeformAction> Actions = new List<EmptyFreeformAction>();
+        public Vector2 Position;
+
+        public EmptyFreeformReplayFrame(EmptyFreeformAction? button = null)
+        {
+            if (button.HasValue)
+                Actions.Add(button.Value);
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs
new file mode 100644
index 0000000000..290f35f516
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.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.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Input;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Handlers;
+using osu.Game.Replays;
+using osu.Game.Rulesets.EmptyFreeform.Objects;
+using osu.Game.Rulesets.EmptyFreeform.Objects.Drawables;
+using osu.Game.Rulesets.EmptyFreeform.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.EmptyFreeform.UI
+{
+    [Cached]
+    public class DrawableEmptyFreeformRuleset : DrawableRuleset<EmptyFreeformHitObject>
+    {
+        public DrawableEmptyFreeformRuleset(EmptyFreeformRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+            : base(ruleset, beatmap, mods)
+        {
+        }
+
+        protected override Playfield CreatePlayfield() => new EmptyFreeformPlayfield();
+
+        protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new EmptyFreeformFramedReplayInputHandler(replay);
+
+        public override DrawableHitObject<EmptyFreeformHitObject> CreateDrawableRepresentation(EmptyFreeformHitObject h) => new DrawableEmptyFreeformHitObject(h);
+
+        protected override PassThroughInputManager CreateInputManager() => new EmptyFreeformInputManager(Ruleset?.RulesetInfo);
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/EmptyFreeformPlayfield.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/EmptyFreeformPlayfield.cs
new file mode 100644
index 0000000000..9df5935c45
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/EmptyFreeformPlayfield.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;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.EmptyFreeform.UI
+{
+    [Cached]
+    public class EmptyFreeformPlayfield : Playfield
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRangeInternal(new Drawable[]
+            {
+                HitObjectContainer,
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
new file mode 100644
index 0000000000..26349ed34f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <AssemblyTitle>osu.Game.Rulesets.Sample</AssemblyTitle>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.EmptyFreeform</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/.editorconfig b/Templates/Rulesets/ruleset-example/.editorconfig
new file mode 100644
index 0000000000..24825b7c42
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/.editorconfig
@@ -0,0 +1,27 @@
+# EditorConfig is awesome: http://editorconfig.org
+root = true
+
+[*.cs]
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+#Roslyn naming styles
+
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/.gitignore b/Templates/Rulesets/ruleset-example/.gitignore
new file mode 100644
index 0000000000..940794e60f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/.gitignore
@@ -0,0 +1,288 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
diff --git a/Templates/Rulesets/ruleset-example/.template.config/template.json b/Templates/Rulesets/ruleset-example/.template.config/template.json
new file mode 100644
index 0000000000..5d2f6f1ebd
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/.template.config/template.json
@@ -0,0 +1,17 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "ppy Pty Ltd",
+    "classifications": [
+        "Console"
+    ],
+    "name": "osu! ruleset (pippidon example)",
+    "identity": "ppy.osu.Game.Templates.Rulesets.Pippidon",
+    "shortName": "ruleset-example",
+    "tags": {
+        "language": "C#",
+        "type": "project"
+    },
+    "sourceName": "Pippidon",
+    "preferNameDirectory": true
+}
+
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
new file mode 100644
index 0000000000..bd9db14259
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "VisualTests (Debug)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug)",
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "env": {},
+            "console": "internalConsole"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
new file mode 100644
index 0000000000..0ee07c1036
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
@@ -0,0 +1,47 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build (Debug)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Pippidon.Tests.csproj",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Pippidon.Tests.csproj",
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Restore",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs
new file mode 100644
index 0000000000..270d906b01
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Platform;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    public class TestSceneOsuGame : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, OsuGameBase gameBase)
+        {
+            OsuGame game = new OsuGame();
+            game.SetHost(host);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                game
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
new file mode 100644
index 0000000000..f00528900c
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
@@ -0,0 +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 NUnit.Framework;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    [TestFixture]
+    public class TestSceneOsuPlayer : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new PippidonRuleset();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs
new file mode 100644
index 0000000000..fd6bd9b714
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.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 System;
+using osu.Framework;
+using osu.Framework.Platform;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    public static class VisualTestRunner
+    {
+        [STAThread]
+        public static int Main(string[] args)
+        {
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
+            {
+                host.Run(new OsuTestBrowser());
+                return 0;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
new file mode 100644
index 0000000000..afa7b03536
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <StartupObject>osu.Game.Rulesets.Pippidon.Tests.VisualTestRunner</StartupObject>
+  </PropertyGroup>
+  <ItemGroup Label="Service">
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <PropertyGroup>
+    <GenerateProgramFile>false</GenerateProgramFile>
+  </PropertyGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
+  </ItemGroup>
+  <PropertyGroup Label="Project">
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>osu.Game.Rulesets.Pippidon.Tests</RootNamespace>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln
new file mode 100644
index 0000000000..bccffcd7ff
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln
@@ -0,0 +1,96 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Pippidon", "osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon.Tests", "osu.Game.Rulesets.Pippidon.Tests\osu.Game.Rulesets.Pippidon.Tests.csproj", "{B4577C85-CB83-462A-BCE3-22FFEB16311D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		VisualTests|Any CPU = VisualTests|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {671B0BEC-2403-45B0-9357-2C97CC517668}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+EndGlobal
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
new file mode 100644
index 0000000000..190a1046f5
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
@@ -0,0 +1,877 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ewav/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=2A66DD92_002DADB1_002D4994_002D89E2_002DC94E04ACDA0D_002Fd_003AMigrations/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=D9A367C9_002D4C1A_002D489F_002D9B05_002DA0CEA2B53B58/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeAccessorOwnerBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMissingParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeConstructorOrDestructorBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadColonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadCommaSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPippidonScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadLinqLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadListLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadMemberAccessSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadNamespaceBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPreprocessorIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSemicolonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSpacesAfterKeyword/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSquareBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSwitchBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSymbolSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CanBeReplacedWithTryCastAndCheckForNull/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassWithVirtualMembersNeverInherited_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002EGlobal/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PippidonScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IncorrectBlankLinesNearBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InheritdocConsiderUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InlineOutVariableDeclaration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvertIf/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinDeclarationAndInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinNullCheckWithUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeProtected_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MoreSpecificForeachVariableTypeAvailable/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleStatementsOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleTypeMembersOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NestedStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=OutdentIsOffPrevLevel/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeUsageProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantPippidonScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimPrefix/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimStringPrefix/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELongCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EWhere/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingleOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAndSpacesMismatch/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAreDisallowed/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsOutsideIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberHierarchy_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberInSuper_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UsePatternMatching/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VariableCanBeMadeConst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberCallInConstructor/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapsePippidonScrollingTags&gt;False&lt;/XAMLCollapsePippidonScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/MakeFieldPrivate/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/UseAutoProperty/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPM/@EntryIndexedValue">BPM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GC/@EntryIndexedValue">GC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LTRB/@EntryIndexedValue">LTRB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NS/@EntryIndexedValue">NS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PM/@EntryIndexedValue">PM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGB/@EntryIndexedValue">RGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RNG/@EntryIndexedValue">RNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
+&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;Or&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Interface" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+        &lt;Kind Is="Struct" /&gt;&#xD;
+      &lt;/Or&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+      &lt;Group DisplayName="Public Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Public" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Internal" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Protected" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Private Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Private" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+      &lt;Entry DisplayName="Ctor"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;Kind Is="Constructor" /&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Region Name="Disposal"&gt;&#xD;
+        &lt;Entry DisplayName="Dtor"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;Kind Is="Destructor" /&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Virtual /&gt;&#xD;
+                &lt;Override /&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Region&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Methods"&gt;&#xD;
+      &lt;Group DisplayName="Public"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Internal"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Protected"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Private"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&lt;/Patterns&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
+See the LICENCE file in the repository root for full licence text.&#xD;
+</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalFunctions/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9d1af99b_002Dbefe_002D48a4_002D9eb3_002D661384e29869/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9ffbe43b_002Dc610_002D411b_002D9839_002D1416a146d9b0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4c2df6c_002Db202_002D48d5_002Db077_002De678cb548c25/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=fd562728_002Dc23d_002D417f_002Da19f_002D9d854247fbea/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMIXED_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Expression/@EntryValue">constant("Centre")</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Shortcut/@EntryValue">ofao</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Text/@EntryValue">Anchor = Anchor.$anchor$,
+Origin = Anchor.$anchor$,</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Description/@EntryValue">o!f – InternalChildren = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Shortcut/@EntryValue">ofic</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Description/@EntryValue">o!f – new GridContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Shortcut/@EntryValue">ofgc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Content = new[]
+    {
+        new Drawable[] { $END$ },
+        new Drawable[] { }
+    }
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Description/@EntryValue">o!f – new FillFlowContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Shortcut/@EntryValue">offf</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Direction = FillDirection.Vertical,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Description/@EntryValue">o!f – new Container { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Shortcut/@EntryValue">ofcont</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
+{
+    RelativeSizeAxes = Axes.Both,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Description/@EntryValue">o!f – BackgroundDependencyLoader load()</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Shortcut/@EntryValue">ofbdl</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
+private void load()
+{
+    $END$
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Description/@EntryValue">o!f – new Box { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Shortcut/@EntryValue">ofbox</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
+{
+    Colour = Color4.Black,
+    RelativeSizeAxes = Axes.Both,
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Description/@EntryValue">o!f – Children = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Shortcut/@EntryValue">ofc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs
new file mode 100644
index 0000000000..a2a4784603
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.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.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.Beatmaps
+{
+    public class PippidonBeatmapConverter : BeatmapConverter<PippidonHitObject>
+    {
+        public PippidonBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
+            : base(beatmap, ruleset)
+        {
+        }
+
+        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasPosition);
+
+        protected override IEnumerable<PippidonHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
+        {
+            yield return new PippidonHitObject
+            {
+                Samples = original.Samples,
+                StartTime = original.StartTime,
+                Position = (original as IHasPosition)?.Position ?? Vector2.Zero,
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs
new file mode 100644
index 0000000000..8ea334c99c
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.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 System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.Replays;
+using osu.Game.Scoring;
+using osu.Game.Users;
+
+namespace osu.Game.Rulesets.Pippidon.Mods
+{
+    public class PippidonModAutoplay : ModAutoplay<PippidonHitObject>
+    {
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
+        {
+            ScoreInfo = new ScoreInfo
+            {
+                User = new User { Username = "sample" },
+            },
+            Replay = new PippidonAutoGenerator(beatmap).Generate(),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
new file mode 100644
index 0000000000..399d6adda2
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
@@ -0,0 +1,78 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Audio;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Pippidon.Objects.Drawables
+{
+    public class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
+    {
+        private const double time_preempt = 600;
+        private const double time_fadein = 400;
+
+        public override bool HandlePositionalInput => true;
+
+        public DrawablePippidonHitObject(PippidonHitObject hitObject)
+            : base(hitObject)
+        {
+            Size = new Vector2(80);
+
+            Origin = Anchor.Centre;
+            Position = hitObject.Position;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            AddInternal(new Sprite
+            {
+                RelativeSizeAxes = Axes.Both,
+                Texture = textures.Get("coin"),
+            });
+        }
+
+        public override IEnumerable<HitSampleInfo> GetSamples() => new[]
+        {
+            new HitSampleInfo(HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK)
+        };
+
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            if (timeOffset >= 0)
+                ApplyResult(r => r.Type = IsHovered ? HitResult.Perfect : HitResult.Miss);
+        }
+
+        protected override double InitialLifetimeOffset => time_preempt;
+
+        protected override void UpdateInitialTransforms() => this.FadeInFromZero(time_fadein);
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    this.ScaleTo(5, 1500, Easing.OutQuint).FadeOut(1500, Easing.OutQuint).Expire();
+                    break;
+
+                case ArmedState.Miss:
+                    const double duration = 1000;
+
+                    this.ScaleTo(0.8f, duration, Easing.OutQuint);
+                    this.MoveToOffset(new Vector2(0, 10), duration, Easing.In);
+                    this.FadeColour(Color4.Red.Opacity(0.5f), duration / 2, Easing.OutQuint).Then().FadeOut(duration / 2, Easing.InQuint).Expire();
+                    break;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs
new file mode 100644
index 0000000000..0c22554e82
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.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.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.Objects
+{
+    public class PippidonHitObject : HitObject, IHasPosition
+    {
+        public override Judgement CreateJudgement() => new Judgement();
+
+        public Vector2 Position { get; set; }
+
+        public float X => Position.X;
+        public float Y => Position.Y;
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs
new file mode 100644
index 0000000000..f6340f6c25
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonDifficultyCalculator : DifficultyCalculator
+    {
+        public PippidonDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
+            : base(ruleset, beatmap)
+        {
+        }
+
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
+        {
+            return new DifficultyAttributes(mods, skills, 0);
+        }
+
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();
+
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[0];
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs
new file mode 100644
index 0000000000..aa7fa3188b
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.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 System.ComponentModel;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonInputManager : RulesetInputManager<PippidonAction>
+    {
+        public PippidonInputManager(RulesetInfo ruleset)
+            : base(ruleset, 0, SimultaneousBindingMode.Unique)
+        {
+        }
+    }
+
+    public enum PippidonAction
+    {
+        [Description("Button 1")]
+        Button1,
+
+        [Description("Button 2")]
+        Button2,
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs
new file mode 100644
index 0000000000..89fed791cd
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.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.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Pippidon.Beatmaps;
+using osu.Game.Rulesets.Pippidon.Mods;
+using osu.Game.Rulesets.Pippidon.UI;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonRuleset : Ruleset
+    {
+        public override string Description => "gather the osu!coins";
+
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) =>
+            new DrawablePippidonRuleset(this, beatmap, mods);
+
+        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) =>
+            new PippidonBeatmapConverter(beatmap, this);
+
+        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) =>
+            new PippidonDifficultyCalculator(this, beatmap);
+
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.Automation:
+                    return new[] { new PippidonModAutoplay() };
+
+                default:
+                    return new Mod[] { null };
+            }
+        }
+
+        public override string ShortName => "pippidon";
+
+        public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
+        {
+            new KeyBinding(InputKey.Z, PippidonAction.Button1),
+            new KeyBinding(InputKey.X, PippidonAction.Button2),
+        };
+
+        public override Drawable CreateIcon() => new Sprite
+        {
+            Texture = new TextureStore(new TextureLoaderStore(CreateResourceStore()), false).Get("Textures/coin"),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
new file mode 100644
index 0000000000..9c54b82e38
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.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.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonAutoGenerator : AutoGenerator
+    {
+        protected Replay Replay;
+        protected List<ReplayFrame> Frames => Replay.Frames;
+
+        public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
+
+        public PippidonAutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+            Replay = new Replay();
+        }
+
+        public override Replay Generate()
+        {
+            Frames.Add(new PippidonReplayFrame());
+
+            foreach (PippidonHitObject hitObject in Beatmap.HitObjects)
+            {
+                Frames.Add(new PippidonReplayFrame
+                {
+                    Time = hitObject.StartTime,
+                    Position = hitObject.Position,
+                });
+            }
+
+            return Replay;
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
new file mode 100644
index 0000000000..18efa6b885
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.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.Collections.Generic;
+using System.Diagnostics;
+using osu.Framework.Input.StateChanges;
+using osu.Framework.Utils;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Replays;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonFramedReplayInputHandler : FramedReplayInputHandler<PippidonReplayFrame>
+    {
+        public PippidonFramedReplayInputHandler(Replay replay)
+            : base(replay)
+        {
+        }
+
+        protected override bool IsImportant(PippidonReplayFrame frame) => true;
+
+        protected Vector2 Position
+        {
+            get
+            {
+                var frame = CurrentFrame;
+
+                if (frame == null)
+                    return Vector2.Zero;
+
+                Debug.Assert(CurrentTime != null);
+
+                return NextFrame != null ? Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
+            }
+        }
+
+        public override void CollectPendingInputs(List<IInput> inputs)
+        {
+            inputs.Add(new MousePositionAbsoluteInput
+            {
+                Position = GamefieldToScreenSpace(Position)
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs
new file mode 100644
index 0000000000..949ca160be
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.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 osu.Game.Rulesets.Replays;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonReplayFrame : ReplayFrame
+    {
+        public Vector2 Position;
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3 b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..90b13d1f734a4020945bed6706f6a86228b87938
GIT binary patch
literal 8022
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

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png
new file mode 100644
index 0000000000000000000000000000000000000000..e79d2528ecec4793705ba5bd9bd8e715fb36c36c
GIT binary patch
literal 78937
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
D=3DJh

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cd89c6ce6cc5729af435691e9784161b1d3a474
GIT binary patch
literal 3141
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

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs
new file mode 100644
index 0000000000..1c4fe698c2
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.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.
+
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Pippidon.Scoring
+{
+    public class PippidonScoreProcessor : ScoreProcessor
+    {
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs
new file mode 100644
index 0000000000..d923963bef
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.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.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Input;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Handlers;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.Objects.Drawables;
+using osu.Game.Rulesets.Pippidon.Replays;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    [Cached]
+    public class DrawablePippidonRuleset : DrawableRuleset<PippidonHitObject>
+    {
+        public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+            : base(ruleset, beatmap, mods)
+        {
+        }
+
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new PippidonPlayfieldAdjustmentContainer();
+
+        protected override Playfield CreatePlayfield() => new PippidonPlayfield();
+
+        protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new PippidonFramedReplayInputHandler(replay);
+
+        public override DrawableHitObject<PippidonHitObject> CreateDrawableRepresentation(PippidonHitObject h) => new DrawablePippidonHitObject(h);
+
+        protected override PassThroughInputManager CreateInputManager() => new PippidonInputManager(Ruleset?.RulesetInfo);
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonCursorContainer.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonCursorContainer.cs
new file mode 100644
index 0000000000..9de3f4ba14
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonCursorContainer.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    public class PippidonCursorContainer : GameplayCursorContainer
+    {
+        private Sprite cursorSprite;
+        private Texture cursorTexture;
+
+        protected override Drawable CreateCursor() => cursorSprite = new Sprite
+        {
+            Scale = new Vector2(0.5f),
+            Origin = Anchor.Centre,
+            Texture = cursorTexture,
+        };
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            cursorTexture = textures.Get("character");
+
+            if (cursorSprite != null)
+                cursorSprite.Texture = cursorTexture;
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs
new file mode 100644
index 0000000000..b5a97c5ea3
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    [Cached]
+    public class PippidonPlayfield : Playfield
+    {
+        protected override GameplayCursorContainer CreateCursor() => new PippidonCursorContainer();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRangeInternal(new Drawable[]
+            {
+                HitObjectContainer,
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfieldAdjustmentContainer.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfieldAdjustmentContainer.cs
new file mode 100644
index 0000000000..9236683827
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfieldAdjustmentContainer.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.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    public class PippidonPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
+    {
+        public PippidonPlayfieldAdjustmentContainer()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Size = new Vector2(0.8f);
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
new file mode 100644
index 0000000000..e4a3d39d6d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <AssemblyTitle>osu.Game.Rulesets.Sample</AssemblyTitle>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.Pippidon</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig b/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
new file mode 100644
index 0000000000..24825b7c42
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
@@ -0,0 +1,27 @@
+# EditorConfig is awesome: http://editorconfig.org
+root = true
+
+[*.cs]
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+#Roslyn naming styles
+
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/.gitignore b/Templates/Rulesets/ruleset-scrolling-empty/.gitignore
new file mode 100644
index 0000000000..940794e60f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/.gitignore
@@ -0,0 +1,288 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/.template.config/template.json b/Templates/Rulesets/ruleset-scrolling-empty/.template.config/template.json
new file mode 100644
index 0000000000..3eb99a1f9d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/.template.config/template.json
@@ -0,0 +1,16 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "ppy Pty Ltd",
+    "classifications": [
+        "Console"
+    ],
+    "name": "osu! ruleset (scrolling)",
+    "identity": "ppy.osu.Game.Templates.Rulesets.Scrolling",
+    "shortName": "ruleset-scrolling",
+    "tags": {
+        "language": "C#",
+        "type": "project"
+    },
+    "sourceName": "EmptyScrolling",
+    "preferNameDirectory": true
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json
new file mode 100644
index 0000000000..24e4873ed6
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "VisualTests (Debug)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug)",
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "env": {},
+            "console": "internalConsole"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/tasks.json b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/tasks.json
new file mode 100644
index 0000000000..00d0dc7d9b
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/tasks.json
@@ -0,0 +1,47 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build (Debug)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.EmptyScrolling.Tests.csproj",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.EmptyScrolling.Tests.csproj",
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Restore",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuGame.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuGame.cs
new file mode 100644
index 0000000000..aed6abb6bf
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuGame.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Platform;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Tests
+{
+    public class TestSceneOsuGame : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, OsuGameBase gameBase)
+        {
+            OsuGame game = new OsuGame();
+            game.SetHost(host);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                game
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuPlayer.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuPlayer.cs
new file mode 100644
index 0000000000..9460576196
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuPlayer.cs
@@ -0,0 +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 NUnit.Framework;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Tests
+{
+    [TestFixture]
+    public class TestSceneOsuPlayer : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new EmptyScrollingRuleset();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/VisualTestRunner.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/VisualTestRunner.cs
new file mode 100644
index 0000000000..65cfb2bff4
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/VisualTestRunner.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 System;
+using osu.Framework;
+using osu.Framework.Platform;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Tests
+{
+    public static class VisualTestRunner
+    {
+        [STAThread]
+        public static int Main(string[] args)
+        {
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
+            {
+                host.Run(new OsuTestBrowser());
+                return 0;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
new file mode 100644
index 0000000000..c9f87a8551
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <StartupObject>osu.Game.Rulesets.EmptyScrolling.Tests.VisualTestRunner</StartupObject>
+  </PropertyGroup>
+  <ItemGroup Label="Service">
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <PropertyGroup>
+    <GenerateProgramFile>false</GenerateProgramFile>
+  </PropertyGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj" />
+  </ItemGroup>
+  <PropertyGroup Label="Project">
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>osu.Game.Rulesets.EmptyScrolling.Tests</RootNamespace>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln
new file mode 100644
index 0000000000..97361e1a7b
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln
@@ -0,0 +1,96 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.EmptyScrolling", "osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyScrolling.Tests", "osu.Game.Rulesets.EmptyScrolling.Tests\osu.Game.Rulesets.EmptyScrolling.Tests.csproj", "{B4577C85-CB83-462A-BCE3-22FFEB16311D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		VisualTests|Any CPU = VisualTests|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {671B0BEC-2403-45B0-9357-2C97CC517668}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+EndGlobal
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
new file mode 100644
index 0000000000..1ceac22be9
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
@@ -0,0 +1,877 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ewav/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=2A66DD92_002DADB1_002D4994_002D89E2_002DC94E04ACDA0D_002Fd_003AMigrations/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=D9A367C9_002D4C1A_002D489F_002D9B05_002DA0CEA2B53B58/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeAccessorOwnerBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMissingParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeConstructorOrDestructorBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadColonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadCommaSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadLinqLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadListLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadMemberAccessSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadNamespaceBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPreprocessorIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSemicolonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSpacesAfterKeyword/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSquareBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSwitchBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSymbolSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CanBeReplacedWithTryCastAndCheckForNull/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassWithVirtualMembersNeverInherited_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002EGlobal/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IncorrectBlankLinesNearBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InheritdocConsiderUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InlineOutVariableDeclaration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvertIf/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinDeclarationAndInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinNullCheckWithUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeProtected_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MoreSpecificForeachVariableTypeAvailable/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleStatementsOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleTypeMembersOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NestedStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=OutdentIsOffPrevLevel/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeUsageProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimPrefix/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimStringPrefix/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELongCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EWhere/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingleOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAndSpacesMismatch/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAreDisallowed/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsOutsideIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberHierarchy_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberInSuper_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UsePatternMatching/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VariableCanBeMadeConst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberCallInConstructor/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyScrollingTags&gt;False&lt;/XAMLCollapseEmptyScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/MakeFieldPrivate/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/UseAutoProperty/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPM/@EntryIndexedValue">BPM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GC/@EntryIndexedValue">GC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LTRB/@EntryIndexedValue">LTRB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NS/@EntryIndexedValue">NS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PM/@EntryIndexedValue">PM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGB/@EntryIndexedValue">RGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RNG/@EntryIndexedValue">RNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
+&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;Or&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Interface" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+        &lt;Kind Is="Struct" /&gt;&#xD;
+      &lt;/Or&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+      &lt;Group DisplayName="Public Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Public" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Internal" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Protected" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Private Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Private" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+      &lt;Entry DisplayName="Ctor"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;Kind Is="Constructor" /&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Region Name="Disposal"&gt;&#xD;
+        &lt;Entry DisplayName="Dtor"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;Kind Is="Destructor" /&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Virtual /&gt;&#xD;
+                &lt;Override /&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Region&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Methods"&gt;&#xD;
+      &lt;Group DisplayName="Public"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Internal"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Protected"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Private"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&lt;/Patterns&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
+See the LICENCE file in the repository root for full licence text.&#xD;
+</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalFunctions/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9d1af99b_002Dbefe_002D48a4_002D9eb3_002D661384e29869/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9ffbe43b_002Dc610_002D411b_002D9839_002D1416a146d9b0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4c2df6c_002Db202_002D48d5_002Db077_002De678cb548c25/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=fd562728_002Dc23d_002D417f_002Da19f_002D9d854247fbea/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMIXED_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Expression/@EntryValue">constant("Centre")</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Shortcut/@EntryValue">ofao</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Text/@EntryValue">Anchor = Anchor.$anchor$,
+Origin = Anchor.$anchor$,</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Description/@EntryValue">o!f – InternalChildren = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Shortcut/@EntryValue">ofic</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Description/@EntryValue">o!f – new GridContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Shortcut/@EntryValue">ofgc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Content = new[]
+    {
+        new Drawable[] { $END$ },
+        new Drawable[] { }
+    }
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Description/@EntryValue">o!f – new FillFlowContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Shortcut/@EntryValue">offf</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Direction = FillDirection.Vertical,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Description/@EntryValue">o!f – new Container { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Shortcut/@EntryValue">ofcont</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
+{
+    RelativeSizeAxes = Axes.Both,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Description/@EntryValue">o!f – BackgroundDependencyLoader load()</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Shortcut/@EntryValue">ofbdl</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
+private void load()
+{
+    $END$
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Description/@EntryValue">o!f – new Box { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Shortcut/@EntryValue">ofbox</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
+{
+    Colour = Color4.Black,
+    RelativeSizeAxes = Axes.Both,
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Description/@EntryValue">o!f – Children = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Shortcut/@EntryValue">ofc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Beatmaps/EmptyScrollingBeatmapConverter.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Beatmaps/EmptyScrollingBeatmapConverter.cs
new file mode 100644
index 0000000000..02fb9a9dd5
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Beatmaps/EmptyScrollingBeatmapConverter.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 System.Collections.Generic;
+using System.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.EmptyScrolling.Objects;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Beatmaps
+{
+    public class EmptyScrollingBeatmapConverter : BeatmapConverter<EmptyScrollingHitObject>
+    {
+        public EmptyScrollingBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
+            : base(beatmap, ruleset)
+        {
+        }
+
+        // todo: Check for conversion types that should be supported (ie. Beatmap.HitObjects.Any(h => h is IHasXPosition))
+        // https://github.com/ppy/osu/tree/master/osu.Game/Rulesets/Objects/Types
+        public override bool CanConvert() => true;
+
+        protected override IEnumerable<EmptyScrollingHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
+        {
+            yield return new EmptyScrollingHitObject
+            {
+                Samples = original.Samples,
+                StartTime = original.StartTime,
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingDifficultyCalculator.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingDifficultyCalculator.cs
new file mode 100644
index 0000000000..7f29c4e712
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingDifficultyCalculator.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.EmptyScrolling
+{
+    public class EmptyScrollingDifficultyCalculator : DifficultyCalculator
+    {
+        public EmptyScrollingDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
+            : base(ruleset, beatmap)
+        {
+        }
+
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
+        {
+            return new DifficultyAttributes(mods, skills, 0);
+        }
+
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();
+
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[0];
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingInputManager.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingInputManager.cs
new file mode 100644
index 0000000000..632e04f301
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingInputManager.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 System.ComponentModel;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.EmptyScrolling
+{
+    public class EmptyScrollingInputManager : RulesetInputManager<EmptyScrollingAction>
+    {
+        public EmptyScrollingInputManager(RulesetInfo ruleset)
+            : base(ruleset, 0, SimultaneousBindingMode.Unique)
+        {
+        }
+    }
+
+    public enum EmptyScrollingAction
+    {
+        [Description("Button 1")]
+        Button1,
+
+        [Description("Button 2")]
+        Button2,
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs
new file mode 100644
index 0000000000..c1d4de52b7
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.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.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.EmptyScrolling.Beatmaps;
+using osu.Game.Rulesets.EmptyScrolling.Mods;
+using osu.Game.Rulesets.EmptyScrolling.UI;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.EmptyScrolling
+{
+    public class EmptyScrollingRuleset : Ruleset
+    {
+        public override string Description => "a very emptyscrolling ruleset";
+
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableEmptyScrollingRuleset(this, beatmap, mods);
+
+        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new EmptyScrollingBeatmapConverter(beatmap, this);
+
+        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new EmptyScrollingDifficultyCalculator(this, beatmap);
+
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.Automation:
+                    return new[] { new EmptyScrollingModAutoplay() };
+
+                default:
+                    return new Mod[] { null };
+            }
+        }
+
+        public override string ShortName => "emptyscrolling";
+
+        public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
+        {
+            new KeyBinding(InputKey.Z, EmptyScrollingAction.Button1),
+            new KeyBinding(InputKey.X, EmptyScrollingAction.Button2),
+        };
+
+        public override Drawable CreateIcon() => new SpriteText
+        {
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre,
+            Text = ShortName[0].ToString(),
+            Font = OsuFont.Default.With(size: 18),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Mods/EmptyScrollingModAutoplay.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Mods/EmptyScrollingModAutoplay.cs
new file mode 100644
index 0000000000..6dad1ff43b
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Mods/EmptyScrollingModAutoplay.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.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.EmptyScrolling.Objects;
+using osu.Game.Rulesets.EmptyScrolling.Replays;
+using osu.Game.Scoring;
+using osu.Game.Users;
+using System.Collections.Generic;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Mods
+{
+    public class EmptyScrollingModAutoplay : ModAutoplay<EmptyScrollingHitObject>
+    {
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
+        {
+            ScoreInfo = new ScoreInfo
+            {
+                User = new User { Username = "sample" },
+            },
+            Replay = new EmptyScrollingAutoGenerator(beatmap).Generate(),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/Drawables/DrawableEmptyScrollingHitObject.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/Drawables/DrawableEmptyScrollingHitObject.cs
new file mode 100644
index 0000000000..b5ff0cde7c
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/Drawables/DrawableEmptyScrollingHitObject.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.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Objects.Drawables
+{
+    public class DrawableEmptyScrollingHitObject : DrawableHitObject<EmptyScrollingHitObject>
+    {
+        public DrawableEmptyScrollingHitObject(EmptyScrollingHitObject hitObject)
+            : base(hitObject)
+        {
+            Size = new Vector2(40);
+            Origin = Anchor.Centre;
+
+            // todo: add visuals.
+        }
+
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            if (timeOffset >= 0)
+                // todo: implement judgement logic
+                ApplyResult(r => r.Type = HitResult.Perfect);
+        }
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            const double duration = 1000;
+
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    this.FadeOut(duration, Easing.OutQuint).Expire();
+                    break;
+
+                case ArmedState.Miss:
+
+                    this.FadeColour(Color4.Red, duration);
+                    this.FadeOut(duration, Easing.InQuint).Expire();
+                    break;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/EmptyScrollingHitObject.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/EmptyScrollingHitObject.cs
new file mode 100644
index 0000000000..9b469be496
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/EmptyScrollingHitObject.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 osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Objects
+{
+    public class EmptyScrollingHitObject : HitObject
+    {
+        public override Judgement CreateJudgement() => new Judgement();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
new file mode 100644
index 0000000000..7923918842
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.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.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.EmptyScrolling.Objects;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Replays
+{
+    public class EmptyScrollingAutoGenerator : AutoGenerator
+    {
+        protected Replay Replay;
+        protected List<ReplayFrame> Frames => Replay.Frames;
+
+        public new Beatmap<EmptyScrollingHitObject> Beatmap => (Beatmap<EmptyScrollingHitObject>)base.Beatmap;
+
+        public EmptyScrollingAutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+            Replay = new Replay();
+        }
+
+        public override Replay Generate()
+        {
+            Frames.Add(new EmptyScrollingReplayFrame());
+
+            foreach (EmptyScrollingHitObject hitObject in Beatmap.HitObjects)
+            {
+                Frames.Add(new EmptyScrollingReplayFrame
+                {
+                    Time = hitObject.StartTime
+                    // todo: add required inputs and extra frames.
+                });
+            }
+
+            return Replay;
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingFramedReplayInputHandler.cs
new file mode 100644
index 0000000000..4b998cfca3
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingFramedReplayInputHandler.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 System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Input.StateChanges;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Replays
+{
+    public class EmptyScrollingFramedReplayInputHandler : FramedReplayInputHandler<EmptyScrollingReplayFrame>
+    {
+        public EmptyScrollingFramedReplayInputHandler(Replay replay)
+            : base(replay)
+        {
+        }
+
+        protected override bool IsImportant(EmptyScrollingReplayFrame frame) => frame.Actions.Any();
+
+        public override void CollectPendingInputs(List<IInput> inputs)
+        {
+            inputs.Add(new ReplayState<EmptyScrollingAction>
+            {
+                PressedActions = CurrentFrame?.Actions ?? new List<EmptyScrollingAction>(),
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingReplayFrame.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingReplayFrame.cs
new file mode 100644
index 0000000000..2f19cffd2a
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingReplayFrame.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.Collections.Generic;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Replays
+{
+    public class EmptyScrollingReplayFrame : ReplayFrame
+    {
+        public List<EmptyScrollingAction> Actions = new List<EmptyScrollingAction>();
+
+        public EmptyScrollingReplayFrame(EmptyScrollingAction? button = null)
+        {
+            if (button.HasValue)
+                Actions.Add(button.Value);
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs
new file mode 100644
index 0000000000..620a4abc51
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.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 System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Input;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Handlers;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.EmptyScrolling.Objects;
+using osu.Game.Rulesets.EmptyScrolling.Objects.Drawables;
+using osu.Game.Rulesets.EmptyScrolling.Replays;
+using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.EmptyScrolling.UI
+{
+    [Cached]
+    public class DrawableEmptyScrollingRuleset : DrawableScrollingRuleset<EmptyScrollingHitObject>
+    {
+        public DrawableEmptyScrollingRuleset(EmptyScrollingRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+            : base(ruleset, beatmap, mods)
+        {
+            Direction.Value = ScrollingDirection.Left;
+            TimeRange.Value = 6000;
+        }
+
+        protected override Playfield CreatePlayfield() => new EmptyScrollingPlayfield();
+
+        protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new EmptyScrollingFramedReplayInputHandler(replay);
+
+        public override DrawableHitObject<EmptyScrollingHitObject> CreateDrawableRepresentation(EmptyScrollingHitObject h) => new DrawableEmptyScrollingHitObject(h);
+
+        protected override PassThroughInputManager CreateInputManager() => new EmptyScrollingInputManager(Ruleset?.RulesetInfo);
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/EmptyScrollingPlayfield.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/EmptyScrollingPlayfield.cs
new file mode 100644
index 0000000000..56620e44b3
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/EmptyScrollingPlayfield.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;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.EmptyScrolling.UI
+{
+    [Cached]
+    public class EmptyScrollingPlayfield : ScrollingPlayfield
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRangeInternal(new Drawable[]
+            {
+                HitObjectContainer,
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
new file mode 100644
index 0000000000..ce0ada6b6e
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <AssemblyTitle>osu.Game.Rulesets.Sample</AssemblyTitle>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.EmptyScrolling</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/.editorconfig b/Templates/Rulesets/ruleset-scrolling-example/.editorconfig
new file mode 100644
index 0000000000..24825b7c42
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/.editorconfig
@@ -0,0 +1,27 @@
+# EditorConfig is awesome: http://editorconfig.org
+root = true
+
+[*.cs]
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+#Roslyn naming styles
+
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/.gitignore b/Templates/Rulesets/ruleset-scrolling-example/.gitignore
new file mode 100644
index 0000000000..940794e60f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/.gitignore
@@ -0,0 +1,288 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
diff --git a/Templates/Rulesets/ruleset-scrolling-example/.template.config/template.json b/Templates/Rulesets/ruleset-scrolling-example/.template.config/template.json
new file mode 100644
index 0000000000..a1c097f1c8
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/.template.config/template.json
@@ -0,0 +1,16 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "ppy Pty Ltd",
+    "classifications": [
+        "Console"
+    ],
+    "name": "osu! ruleset (scrolling pippidon example)",
+    "identity": "ppy.osu.Game.Templates.Rulesets.Scrolling.Pippidon",
+    "shortName": "ruleset-scrolling-example",
+    "tags": {
+        "language": "C#",
+        "type": "project"
+    },
+    "sourceName": "Pippidon",
+    "preferNameDirectory": true
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
new file mode 100644
index 0000000000..bd9db14259
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "VisualTests (Debug)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug)",
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "env": {},
+            "console": "internalConsole"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
new file mode 100644
index 0000000000..0ee07c1036
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
@@ -0,0 +1,47 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build (Debug)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Pippidon.Tests.csproj",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Pippidon.Tests.csproj",
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Restore",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs
new file mode 100644
index 0000000000..270d906b01
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Platform;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    public class TestSceneOsuGame : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, OsuGameBase gameBase)
+        {
+            OsuGame game = new OsuGame();
+            game.SetHost(host);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                game
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
new file mode 100644
index 0000000000..f00528900c
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
@@ -0,0 +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 NUnit.Framework;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    [TestFixture]
+    public class TestSceneOsuPlayer : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new PippidonRuleset();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs
new file mode 100644
index 0000000000..fd6bd9b714
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.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 System;
+using osu.Framework;
+using osu.Framework.Platform;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    public static class VisualTestRunner
+    {
+        [STAThread]
+        public static int Main(string[] args)
+        {
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
+            {
+                host.Run(new OsuTestBrowser());
+                return 0;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
new file mode 100644
index 0000000000..afa7b03536
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <StartupObject>osu.Game.Rulesets.Pippidon.Tests.VisualTestRunner</StartupObject>
+  </PropertyGroup>
+  <ItemGroup Label="Service">
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <PropertyGroup>
+    <GenerateProgramFile>false</GenerateProgramFile>
+  </PropertyGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
+  </ItemGroup>
+  <PropertyGroup Label="Project">
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>osu.Game.Rulesets.Pippidon.Tests</RootNamespace>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln
new file mode 100644
index 0000000000..bccffcd7ff
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln
@@ -0,0 +1,96 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Pippidon", "osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon.Tests", "osu.Game.Rulesets.Pippidon.Tests\osu.Game.Rulesets.Pippidon.Tests.csproj", "{B4577C85-CB83-462A-BCE3-22FFEB16311D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		VisualTests|Any CPU = VisualTests|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {671B0BEC-2403-45B0-9357-2C97CC517668}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+EndGlobal
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
new file mode 100644
index 0000000000..c3e274569d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
@@ -0,0 +1,877 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ewav/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=2A66DD92_002DADB1_002D4994_002D89E2_002DC94E04ACDA0D_002Fd_003AMigrations/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=D9A367C9_002D4C1A_002D489F_002D9B05_002DA0CEA2B53B58/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeAccessorOwnerBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMissingParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeConstructorOrDestructorBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadColonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadCommaSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadLinqLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadListLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadMemberAccessSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadNamespaceBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPreprocessorIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSemicolonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSpacesAfterKeyword/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSquareBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSwitchBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSymbolSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CanBeReplacedWithTryCastAndCheckForNull/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassWithVirtualMembersNeverInherited_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002EGlobal/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IncorrectBlankLinesNearBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InheritdocConsiderUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InlineOutVariableDeclaration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvertIf/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinDeclarationAndInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinNullCheckWithUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeProtected_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MoreSpecificForeachVariableTypeAvailable/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleStatementsOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleTypeMembersOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NestedStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=OutdentIsOffPrevLevel/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeUsageProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimPrefix/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimStringPrefix/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELongCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EWhere/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingleOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAndSpacesMismatch/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAreDisallowed/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsOutsideIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberHierarchy_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberInSuper_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UsePatternMatching/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VariableCanBeMadeConst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberCallInConstructor/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/MakeFieldPrivate/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/UseAutoProperty/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPM/@EntryIndexedValue">BPM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GC/@EntryIndexedValue">GC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LTRB/@EntryIndexedValue">LTRB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NS/@EntryIndexedValue">NS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PM/@EntryIndexedValue">PM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGB/@EntryIndexedValue">RGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RNG/@EntryIndexedValue">RNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
+&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;Or&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Interface" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+        &lt;Kind Is="Struct" /&gt;&#xD;
+      &lt;/Or&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+      &lt;Group DisplayName="Public Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Public" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Internal" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Protected" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Private Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Private" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+      &lt;Entry DisplayName="Ctor"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;Kind Is="Constructor" /&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Region Name="Disposal"&gt;&#xD;
+        &lt;Entry DisplayName="Dtor"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;Kind Is="Destructor" /&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Virtual /&gt;&#xD;
+                &lt;Override /&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Region&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Methods"&gt;&#xD;
+      &lt;Group DisplayName="Public"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Internal"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Protected"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Private"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&lt;/Patterns&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
+See the LICENCE file in the repository root for full licence text.&#xD;
+</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalFunctions/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9d1af99b_002Dbefe_002D48a4_002D9eb3_002D661384e29869/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9ffbe43b_002Dc610_002D411b_002D9839_002D1416a146d9b0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4c2df6c_002Db202_002D48d5_002Db077_002De678cb548c25/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=fd562728_002Dc23d_002D417f_002Da19f_002D9d854247fbea/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMIXED_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Expression/@EntryValue">constant("Centre")</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Shortcut/@EntryValue">ofao</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Text/@EntryValue">Anchor = Anchor.$anchor$,
+Origin = Anchor.$anchor$,</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Description/@EntryValue">o!f – InternalChildren = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Shortcut/@EntryValue">ofic</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Description/@EntryValue">o!f – new GridContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Shortcut/@EntryValue">ofgc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Content = new[]
+    {
+        new Drawable[] { $END$ },
+        new Drawable[] { }
+    }
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Description/@EntryValue">o!f – new FillFlowContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Shortcut/@EntryValue">offf</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Direction = FillDirection.Vertical,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Description/@EntryValue">o!f – new Container { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Shortcut/@EntryValue">ofcont</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
+{
+    RelativeSizeAxes = Axes.Both,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Description/@EntryValue">o!f – BackgroundDependencyLoader load()</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Shortcut/@EntryValue">ofbdl</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
+private void load()
+{
+    $END$
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Description/@EntryValue">o!f – new Box { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Shortcut/@EntryValue">ofbox</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
+{
+    Colour = Color4.Black,
+    RelativeSizeAxes = Axes.Both,
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Description/@EntryValue">o!f – Children = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Shortcut/@EntryValue">ofc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs
new file mode 100644
index 0000000000..8f0b31ef1b
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.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 System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.Beatmaps
+{
+    public class PippidonBeatmapConverter : BeatmapConverter<PippidonHitObject>
+    {
+        private readonly float minPosition;
+        private readonly float maxPosition;
+
+        public PippidonBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
+            : base(beatmap, ruleset)
+        {
+            minPosition = beatmap.HitObjects.Min(getUsablePosition);
+            maxPosition = beatmap.HitObjects.Max(getUsablePosition);
+        }
+
+        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition && h is IHasYPosition);
+
+        protected override IEnumerable<PippidonHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
+        {
+            yield return new PippidonHitObject
+            {
+                Samples = original.Samples,
+                StartTime = original.StartTime,
+                Lane = getLane(original)
+            };
+        }
+
+        private int getLane(HitObject hitObject) => (int)MathHelper.Clamp(
+            (getUsablePosition(hitObject) - minPosition) / (maxPosition - minPosition) * PippidonPlayfield.LANE_COUNT, 0, PippidonPlayfield.LANE_COUNT - 1);
+
+        private float getUsablePosition(HitObject h) => (h as IHasYPosition)?.Y ?? ((IHasXPosition)h).X;
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs
new file mode 100644
index 0000000000..8ea334c99c
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.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 System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.Replays;
+using osu.Game.Scoring;
+using osu.Game.Users;
+
+namespace osu.Game.Rulesets.Pippidon.Mods
+{
+    public class PippidonModAutoplay : ModAutoplay<PippidonHitObject>
+    {
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
+        {
+            ScoreInfo = new ScoreInfo
+            {
+                User = new User { Username = "sample" },
+            },
+            Replay = new PippidonAutoGenerator(beatmap).Generate(),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
new file mode 100644
index 0000000000..e458cacef9
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.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.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Audio;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Pippidon.UI;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Pippidon.Objects.Drawables
+{
+    public class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
+    {
+        private BindableNumber<int> currentLane;
+
+        public DrawablePippidonHitObject(PippidonHitObject hitObject)
+            : base(hitObject)
+        {
+            Size = new Vector2(40);
+
+            Origin = Anchor.Centre;
+            Y = hitObject.Lane * PippidonPlayfield.LANE_HEIGHT;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(PippidonPlayfield playfield, TextureStore textures)
+        {
+            AddInternal(new Sprite
+            {
+                RelativeSizeAxes = Axes.Both,
+                Texture = textures.Get("coin"),
+            });
+
+            currentLane = playfield.CurrentLane.GetBoundCopy();
+        }
+
+        public override IEnumerable<HitSampleInfo> GetSamples() => new[]
+        {
+            new HitSampleInfo(HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK)
+        };
+
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            if (timeOffset >= 0)
+                ApplyResult(r => r.Type = currentLane.Value == HitObject.Lane ? HitResult.Perfect : HitResult.Miss);
+        }
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    this.ScaleTo(5, 1500, Easing.OutQuint).FadeOut(1500, Easing.OutQuint).Expire();
+                    break;
+
+                case ArmedState.Miss:
+
+                    const double duration = 1000;
+
+                    this.ScaleTo(0.8f, duration, Easing.OutQuint);
+                    this.MoveToOffset(new Vector2(0, 10), duration, Easing.In);
+                    this.FadeColour(Color4.Red, duration / 2, Easing.OutQuint).Then().FadeOut(duration / 2, Easing.InQuint).Expire();
+                    break;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs
new file mode 100644
index 0000000000..9dd135479f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.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.Objects;
+
+namespace osu.Game.Rulesets.Pippidon.Objects
+{
+    public class PippidonHitObject : HitObject
+    {
+        /// <summary>
+        /// Range = [-1,1]
+        /// </summary>
+        public int Lane;
+
+        public override Judgement CreateJudgement() => new Judgement();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs
new file mode 100644
index 0000000000..f6340f6c25
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonDifficultyCalculator : DifficultyCalculator
+    {
+        public PippidonDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
+            : base(ruleset, beatmap)
+        {
+        }
+
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
+        {
+            return new DifficultyAttributes(mods, skills, 0);
+        }
+
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();
+
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[0];
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs
new file mode 100644
index 0000000000..c9e6e6faaa
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.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 System.ComponentModel;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonInputManager : RulesetInputManager<PippidonAction>
+    {
+        public PippidonInputManager(RulesetInfo ruleset)
+            : base(ruleset, 0, SimultaneousBindingMode.Unique)
+        {
+        }
+    }
+
+    public enum PippidonAction
+    {
+        [Description("Move up")]
+        MoveUp,
+
+        [Description("Move down")]
+        MoveDown,
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs
new file mode 100644
index 0000000000..ede00f1510
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Pippidon.Beatmaps;
+using osu.Game.Rulesets.Pippidon.Mods;
+using osu.Game.Rulesets.Pippidon.UI;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonRuleset : Ruleset
+    {
+        public override string Description => "gather the osu!coins";
+
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawablePippidonRuleset(this, beatmap, mods);
+
+        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new PippidonBeatmapConverter(beatmap, this);
+
+        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new PippidonDifficultyCalculator(this, beatmap);
+
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.Automation:
+                    return new[] { new PippidonModAutoplay() };
+
+                default:
+                    return new Mod[] { null };
+            }
+        }
+
+        public override string ShortName => "pippidon";
+
+        public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
+        {
+            new KeyBinding(InputKey.W, PippidonAction.MoveUp),
+            new KeyBinding(InputKey.S, PippidonAction.MoveDown),
+        };
+
+        public override Drawable CreateIcon() => new Sprite
+        {
+            Margin = new MarginPadding { Top = 3 },
+            Texture = new TextureStore(new TextureLoaderStore(CreateResourceStore()), false).Get("Textures/coin"),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
new file mode 100644
index 0000000000..bd99cdcdbd
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.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 System;
+using System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.UI;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonAutoGenerator : AutoGenerator
+    {
+        protected Replay Replay;
+        protected List<ReplayFrame> Frames => Replay.Frames;
+
+        public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
+
+        public PippidonAutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+            Replay = new Replay();
+        }
+
+        public override Replay Generate()
+        {
+            int currentLane = 0;
+
+            Frames.Add(new PippidonReplayFrame());
+
+            foreach (PippidonHitObject hitObject in Beatmap.HitObjects)
+            {
+                if (currentLane == hitObject.Lane)
+                    continue;
+
+                int totalTravel = Math.Abs(hitObject.Lane - currentLane);
+                var direction = hitObject.Lane > currentLane ? PippidonAction.MoveDown : PippidonAction.MoveUp;
+
+                double time = hitObject.StartTime - 5;
+
+                if (totalTravel == PippidonPlayfield.LANE_COUNT - 1)
+                    addFrame(time, direction == PippidonAction.MoveDown ? PippidonAction.MoveUp : PippidonAction.MoveDown);
+                else
+                {
+                    time -= totalTravel * KEY_UP_DELAY;
+
+                    for (int i = 0; i < totalTravel; i++)
+                    {
+                        addFrame(time, direction);
+                        time += KEY_UP_DELAY;
+                    }
+                }
+
+                currentLane = hitObject.Lane;
+            }
+
+            return Replay;
+        }
+
+        private void addFrame(double time, PippidonAction direction)
+        {
+            Frames.Add(new PippidonReplayFrame(direction) { Time = time });
+            Frames.Add(new PippidonReplayFrame { Time = time + KEY_UP_DELAY }); //Release the keys as well
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
new file mode 100644
index 0000000000..7652357b4d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.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 System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Input.StateChanges;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonFramedReplayInputHandler : FramedReplayInputHandler<PippidonReplayFrame>
+    {
+        public PippidonFramedReplayInputHandler(Replay replay)
+            : base(replay)
+        {
+        }
+
+        protected override bool IsImportant(PippidonReplayFrame frame) => frame.Actions.Any();
+
+        public override void CollectPendingInputs(List<IInput> inputs)
+        {
+            inputs.Add(new ReplayState<PippidonAction>
+            {
+                PressedActions = CurrentFrame?.Actions ?? new List<PippidonAction>(),
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs
new file mode 100644
index 0000000000..468ac9c725
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.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.Collections.Generic;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonReplayFrame : ReplayFrame
+    {
+        public List<PippidonAction> Actions = new List<PippidonAction>();
+
+        public PippidonReplayFrame(PippidonAction? button = null)
+        {
+            if (button.HasValue)
+                Actions.Add(button.Value);
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3 b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..90b13d1f734a4020945bed6706f6a86228b87938
GIT binary patch
literal 8022
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

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png
new file mode 100644
index 0000000000000000000000000000000000000000..e79d2528ecec4793705ba5bd9bd8e715fb36c36c
GIT binary patch
literal 78937
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
D=3DJh

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cd89c6ce6cc5729af435691e9784161b1d3a474
GIT binary patch
literal 3141
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

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs
new file mode 100644
index 0000000000..9a73dd7790
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.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 System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Input;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Handlers;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.Objects.Drawables;
+using osu.Game.Rulesets.Pippidon.Replays;
+using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    [Cached]
+    public class DrawablePippidonRuleset : DrawableScrollingRuleset<PippidonHitObject>
+    {
+        public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+            : base(ruleset, beatmap, mods)
+        {
+            Direction.Value = ScrollingDirection.Left;
+            TimeRange.Value = 6000;
+        }
+
+        protected override Playfield CreatePlayfield() => new PippidonPlayfield();
+
+        protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new PippidonFramedReplayInputHandler(replay);
+
+        public override DrawableHitObject<PippidonHitObject> CreateDrawableRepresentation(PippidonHitObject h) => new DrawablePippidonHitObject(h);
+
+        protected override PassThroughInputManager CreateInputManager() => new PippidonInputManager(Ruleset?.RulesetInfo);
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonCharacter.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonCharacter.cs
new file mode 100644
index 0000000000..dd0a20f1b4
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonCharacter.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.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    public class PippidonCharacter : BeatSyncedContainer, IKeyBindingHandler<PippidonAction>
+    {
+        public readonly BindableInt LanePosition = new BindableInt
+        {
+            Value = 0,
+            MinValue = 0,
+            MaxValue = PippidonPlayfield.LANE_COUNT - 1,
+        };
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            Size = new Vector2(PippidonPlayfield.LANE_HEIGHT);
+
+            Child = new Sprite
+            {
+                FillMode = FillMode.Fit,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(1.2f),
+                RelativeSizeAxes = Axes.Both,
+                Texture = textures.Get("character")
+            };
+
+            LanePosition.BindValueChanged(e => { this.MoveToY(e.NewValue * PippidonPlayfield.LANE_HEIGHT); });
+        }
+
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+        {
+            if (effectPoint.KiaiMode)
+            {
+                bool direction = beatIndex % 2 == 1;
+                double duration = timingPoint.BeatLength / 2;
+
+                Child.RotateTo(direction ? 10 : -10, duration * 2, Easing.InOutSine);
+
+                Child.Animate(i => i.MoveToY(-10, duration, Easing.Out))
+                     .Then(i => i.MoveToY(0, duration, Easing.In));
+            }
+            else
+            {
+                Child.ClearTransforms();
+                Child.RotateTo(0, 500, Easing.Out);
+                Child.MoveTo(Vector2.Zero, 500, Easing.Out);
+            }
+        }
+
+        public bool OnPressed(PippidonAction action)
+        {
+            switch (action)
+            {
+                case PippidonAction.MoveUp:
+                    changeLane(-1);
+                    return true;
+
+                case PippidonAction.MoveDown:
+                    changeLane(1);
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
+        public void OnReleased(PippidonAction action)
+        {
+        }
+
+        private void changeLane(int change) => LanePosition.Value = (LanePosition.Value + change + PippidonPlayfield.LANE_COUNT) % PippidonPlayfield.LANE_COUNT;
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs
new file mode 100644
index 0000000000..0e50030162
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs
@@ -0,0 +1,128 @@
+// Copyright (c) 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.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    [Cached]
+    public class PippidonPlayfield : ScrollingPlayfield
+    {
+        public const float LANE_HEIGHT = 70;
+
+        public const int LANE_COUNT = 6;
+
+        public BindableInt CurrentLane => pippidon.LanePosition;
+
+        private PippidonCharacter pippidon;
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            AddRangeInternal(new Drawable[]
+            {
+                new LaneContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Child = new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding
+                        {
+                            Left = 200,
+                            Top = LANE_HEIGHT / 2,
+                            Bottom = LANE_HEIGHT / 2
+                        },
+                        Children = new Drawable[]
+                        {
+                            HitObjectContainer,
+                            pippidon = new PippidonCharacter
+                            {
+                                Origin = Anchor.Centre,
+                            },
+                        }
+                    },
+                },
+            });
+        }
+
+        private class LaneContainer : BeatSyncedContainer
+        {
+            private OsuColour colours;
+            private FillFlowContainer fill;
+
+            private readonly Container content = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+            };
+
+            protected override Container<Drawable> Content => content;
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                this.colours = colours;
+
+                InternalChildren = new Drawable[]
+                {
+                    fill = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Colour = colours.BlueLight,
+                        Direction = FillDirection.Vertical,
+                    },
+                    content,
+                };
+
+                for (int i = 0; i < LANE_COUNT; i++)
+                {
+                    fill.Add(new Lane
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = LANE_HEIGHT,
+                    });
+                }
+            }
+
+            private class Lane : CompositeDrawable
+            {
+                public Lane()
+                {
+                    InternalChildren = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.White,
+                            RelativeSizeAxes = Axes.Both,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Height = 0.95f,
+                        },
+                    };
+                }
+            }
+
+            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+            {
+                if (effectPoint.KiaiMode)
+                    fill.FlashColour(colours.PinkLight, 800, Easing.In);
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
new file mode 100644
index 0000000000..e4a3d39d6d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <AssemblyTitle>osu.Game.Rulesets.Sample</AssemblyTitle>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.Pippidon</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/osu.Game.Templates.csproj b/Templates/osu.Game.Templates.csproj
new file mode 100644
index 0000000000..3894bf2166
--- /dev/null
+++ b/Templates/osu.Game.Templates.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <PackageType>Template</PackageType>
+    <PackageId>ppy.osu.Game.Templates</PackageId>
+    <Title>osu! templates</Title>
+    <Authors>ppy Pty Ltd</Authors>
+    <PackageLicenseUrl>https://github.com/ppy/osu-templates/blob/master/LICENCE.md</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/ppy/osu-templates</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/ppy/osu-templates</RepositoryUrl>
+    <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
+    <copyright>Copyright (c) 2021 ppy Pty Ltd</copyright>
+    <Description>Templates to use when creating a ruleset for consumption in osu!.</Description>
+    <PackageTags>dotnet-new;templates;osu</PackageTags>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <IncludeContentInPack>true</IncludeContentInPack>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <ContentTargetFolders>content</ContentTargetFolders>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="Templates\**\*" Exclude="Templates\**\bin\**;templates\**\obj\**" />
+    <Compile Remove="**\*" />
+  </ItemGroup>
+</Project>

From 3c3980b6bf7b32a750783143f282af22d2431725 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 11:41:48 +0900
Subject: [PATCH 08819/10326] Update links

---
 Templates/osu.Game.Templates.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Templates/osu.Game.Templates.csproj b/Templates/osu.Game.Templates.csproj
index 3894bf2166..38789e3246 100644
--- a/Templates/osu.Game.Templates.csproj
+++ b/Templates/osu.Game.Templates.csproj
@@ -4,9 +4,9 @@
     <PackageId>ppy.osu.Game.Templates</PackageId>
     <Title>osu! templates</Title>
     <Authors>ppy Pty Ltd</Authors>
-    <PackageLicenseUrl>https://github.com/ppy/osu-templates/blob/master/LICENCE.md</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/ppy/osu-templates</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/ppy/osu-templates</RepositoryUrl>
+    <PackageLicenseUrl>https://github.com/ppy/osu/blob/master/LICENCE.md</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/ppy/osu/blob/master/Templates</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/ppy/osu</RepositoryUrl>
     <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
     <copyright>Copyright (c) 2021 ppy Pty Ltd</copyright>
     <Description>Templates to use when creating a ruleset for consumption in osu!.</Description>

From d1504e1b3e2d4d6aaf1f9b8fc5ee4e1840ef1d41 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 11:47:37 +0900
Subject: [PATCH 08820/10326] Remove license file, fix link

---
 Templates/LICENSE                   | 21 ---------------------
 Templates/osu.Game.Templates.csproj |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 Templates/LICENSE

diff --git a/Templates/LICENSE b/Templates/LICENSE
deleted file mode 100644
index 3abffc40a7..0000000000
--- a/Templates/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 ppy Pty Ltd <contact@ppy.sh>.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/Templates/osu.Game.Templates.csproj b/Templates/osu.Game.Templates.csproj
index 38789e3246..ebde5f70a5 100644
--- a/Templates/osu.Game.Templates.csproj
+++ b/Templates/osu.Game.Templates.csproj
@@ -4,7 +4,7 @@
     <PackageId>ppy.osu.Game.Templates</PackageId>
     <Title>osu! templates</Title>
     <Authors>ppy Pty Ltd</Authors>
-    <PackageLicenseUrl>https://github.com/ppy/osu/blob/master/LICENCE.md</PackageLicenseUrl>
+    <PackageLicenseUrl>https://github.com/ppy/osu/blob/master/LICENCE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/ppy/osu/blob/master/Templates</PackageProjectUrl>
     <RepositoryUrl>https://github.com/ppy/osu</RepositoryUrl>
     <PackageReleaseNotes>Automated release.</PackageReleaseNotes>

From 4d9b886c07d1c6b641dc3927ffe5571892ba1921 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 12:04:02 +0900
Subject: [PATCH 08821/10326] Add ruleset examples to solution

---
 .../osu.Game.Rulesets.EmptyFreeform.csproj    |   2 +-
 .../osu.Game.Rulesets.Pippidon.csproj         |   2 +-
 .../osu.Game.Rulesets.EmptyScrolling.csproj   |   2 +-
 .../osu.Game.Rulesets.Pippidon.csproj         |   2 +-
 osu.sln                                       | 154 ++++++++++++++++++
 5 files changed, 158 insertions(+), 4 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
index 26349ed34f..cfe2bd1cb2 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
@@ -10,6 +10,6 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+    <ProjectReference Include="..\..\..\..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
index e4a3d39d6d..61b859f45b 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
@@ -10,6 +10,6 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+    <ProjectReference Include="..\..\..\..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
index ce0ada6b6e..9dce3c9a0a 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
@@ -10,6 +10,6 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+    <ProjectReference Include="..\..\..\..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
index e4a3d39d6d..61b859f45b 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
@@ -10,6 +10,6 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+    <ProjectReference Include="..\..\..\..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/osu.sln b/osu.sln
index c9453359b1..5a251cb727 100644
--- a/osu.sln
+++ b/osu.sln
@@ -66,6 +66,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Benchmarks", "osu.Game.Benchmarks\osu.Game.Benchmarks.csproj", "{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{70CFC05F-CF79-4A7F-81EC-B32F1E564480}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Rulesets", "Rulesets", "{CA1DD4A8-FA22-48E0-860F-D57A7ED7D426}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ruleset-empty", "ruleset-empty", "{6E22BB20-901E-49B3-90A1-B0E6377FE568}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ruleset-example", "ruleset-example", "{7DBBBA73-6D84-4EBA-8711-EBC2939B04B5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ruleset-scrolling-empty", "ruleset-scrolling-empty", "{5CB72FDE-BA77-47D1-A556-FEB15AAD4523}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ruleset-scrolling-example", "ruleset-scrolling-example", "{0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyFreeform", "Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj", "{9014CA66-5217-49F6-8C1E-3430FD08EF61}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyFreeform.Tests", "Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform.Tests\osu.Game.Rulesets.EmptyFreeform.Tests.csproj", "{561DFD5E-5896-40D1-9708-4D692F5BAE66}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon", "Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj", "{B325271C-85E7-4DB3-8BBB-B70F242954F8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon.Tests", "Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon.Tests\osu.Game.Rulesets.Pippidon.Tests.csproj", "{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyScrolling", "Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj", "{AD923016-F318-49B7-B08B-89DED6DC2422}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyScrolling.Tests", "Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling.Tests\osu.Game.Rulesets.EmptyScrolling.Tests.csproj", "{B9B92246-02EB-4118-9C6F-85A0D726AA70}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon", "Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj", "{B9022390-8184-4548-9DB1-50EB8878D20A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon.Tests", "Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon.Tests\osu.Game.Rulesets.Pippidon.Tests.csproj", "{1743BF7C-E6AE-4A06-BAD9-166D62894303}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Templates", "Templates\osu.Game.Templates.csproj", "{7526A36E-09B9-4342-88CF-25969CF4158C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -412,6 +442,114 @@ Global
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhone.Build.0 = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|iPhone.Build.0 = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|iPhone.Build.0 = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|iPhone.Build.0 = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|iPhone.Build.0 = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|iPhone.Build.0 = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|iPhone.Build.0 = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|iPhone.Build.0 = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhone.Build.0 = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhone.Build.0 = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -448,4 +586,20 @@ Global
 		$2.inheritsScope = text/x-csharp
 		$2.scope = text/x-csharp
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{CA1DD4A8-FA22-48E0-860F-D57A7ED7D426} = {70CFC05F-CF79-4A7F-81EC-B32F1E564480}
+		{6E22BB20-901E-49B3-90A1-B0E6377FE568} = {CA1DD4A8-FA22-48E0-860F-D57A7ED7D426}
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61} = {6E22BB20-901E-49B3-90A1-B0E6377FE568}
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66} = {6E22BB20-901E-49B3-90A1-B0E6377FE568}
+		{7DBBBA73-6D84-4EBA-8711-EBC2939B04B5} = {CA1DD4A8-FA22-48E0-860F-D57A7ED7D426}
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8} = {7DBBBA73-6D84-4EBA-8711-EBC2939B04B5}
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738} = {7DBBBA73-6D84-4EBA-8711-EBC2939B04B5}
+		{5CB72FDE-BA77-47D1-A556-FEB15AAD4523} = {CA1DD4A8-FA22-48E0-860F-D57A7ED7D426}
+		{0E0EDD4C-1E45-4E03-BC08-0102C98D34B3} = {CA1DD4A8-FA22-48E0-860F-D57A7ED7D426}
+		{AD923016-F318-49B7-B08B-89DED6DC2422} = {5CB72FDE-BA77-47D1-A556-FEB15AAD4523}
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70} = {5CB72FDE-BA77-47D1-A556-FEB15AAD4523}
+		{B9022390-8184-4548-9DB1-50EB8878D20A} = {0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303} = {0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}
+		{7526A36E-09B9-4342-88CF-25969CF4158C} = {70CFC05F-CF79-4A7F-81EC-B32F1E564480}
+	EndGlobalSection
 EndGlobal

From 33d16a4b544b68ba444ddca8938a9b9c693c6fc4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 12:22:38 +0900
Subject: [PATCH 08822/10326] Isolate rulesets subtree

---
 Templates/Directory.Build.props | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Templates/Directory.Build.props

diff --git a/Templates/Directory.Build.props b/Templates/Directory.Build.props
new file mode 100644
index 0000000000..0e470106e8
--- /dev/null
+++ b/Templates/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+  <!-- Isolated subtree -->
+</Project>

From 73c59c4e1bfa4f8922271f3adebc6c2bc269862c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 12:23:03 +0900
Subject: [PATCH 08823/10326] Fix ruleset templates not being included

---
 Templates/osu.Game.Templates.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/osu.Game.Templates.csproj b/Templates/osu.Game.Templates.csproj
index ebde5f70a5..31a24a301f 100644
--- a/Templates/osu.Game.Templates.csproj
+++ b/Templates/osu.Game.Templates.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="Templates\**\*" Exclude="Templates\**\bin\**;templates\**\obj\**" />
+    <Content Include="Rulesets\**\*" Exclude="Rulesets\**\bin\**;Rulesets\**\obj\**" />
     <Compile Remove="**\*" />
   </ItemGroup>
 </Project>

From b6681d01e55c65a13cdf3f2908a11adbff43cafe Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 12:23:06 +0900
Subject: [PATCH 08824/10326] Add appveyor matrix

---
 appveyor_deploy.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/appveyor_deploy.yml b/appveyor_deploy.yml
index 737e5c43ab..adf98848bc 100644
--- a/appveyor_deploy.yml
+++ b/appveyor_deploy.yml
@@ -16,6 +16,8 @@ environment:
       job_depends_on: osu-game
     - job_name: mania-ruleset
       job_depends_on: osu-game
+    - job_name: templates
+      job_depends_on: osu-game
 
 nuget:
   project_feed: true
@@ -59,6 +61,22 @@ for:
       - cmd: dotnet remove osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj reference osu.Game\osu.Game.csproj
       - cmd: dotnet add osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
       - cmd: dotnet pack osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: templates
+    build_script:
+      - cmd: dotnet remove Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj reference osu.Game\osu.Game.csproj
+
+      - cmd: dotnet add Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+
+      - cmd: dotnet pack Templates\osu.Game.Templates.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
 
 artifacts:
   - path: '**\*.nupkg'

From 3acc612a6702e9e7d7553fcec5fc6a53eaa0ee92 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 13:28:46 +0900
Subject: [PATCH 08825/10326] Adjust scoring values to better fit osu!mania

---
 osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs | 4 ++--
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs  | 4 ++--
 osu.Game/Rulesets/Judgements/Judgement.cs              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 71cc0bdf1f..48b377c794 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -7,8 +7,8 @@ namespace osu.Game.Rulesets.Mania.Scoring
 {
     internal class ManiaScoreProcessor : ScoreProcessor
     {
-        protected override double DefaultAccuracyPortion => 0.95;
+        protected override double DefaultAccuracyPortion => 0.99;
 
-        protected override double DefaultComboPortion => 0.05;
+        protected override double DefaultComboPortion => 0.01;
     }
 }
diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 9f16312121..20fa0732b9 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)] // (3 * 0) / (4 * 300) * 300_000 + (0 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 387_500)] // (3 * 50) / (4 * 300) * 300_000 + (2 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 425_000)] // (3 * 100) / (4 * 300) * 300_000 + (2 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 478_571)] // (3 * 200) / (4 * 350) * 300_000 + (2 / 4) * 700_000
+        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 492_857)] // (3 * 200) / (4 * 350) * 300_000 + (2 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 575_000)] // (3 * 300) / (4 * 300) * 300_000 + (2 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 575_000)] // (3 * 350) / (4 * 350) * 300_000 + (2 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 700_000)] // (3 * 0) / (4 * 10) * 300_000 + 700_000 (max combo 0)
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 156)] // (((3 * 50) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 312)] // (((3 * 100) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
-        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 535)] // (((3 * 200) / (4 * 350)) * 4 * 300) * (1 + 1 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 594)] // (((3 * 200) / (4 * 350)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 936)] // (((3 * 300) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 936)] // (((3 * 350) / (4 * 350)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)] // (0 * 1 * 300) * (1 + 0 / 25)
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 89a3a2b855..b1ca72b1c0 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Judgements
                     return 300;
 
                 case HitResult.Perfect:
-                    return 350;
+                    return 315;
 
                 case HitResult.SmallBonus:
                     return SMALL_BONUS_SCORE;

From fe9efc277d38e9df9819be91b07be73c86a30b29 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 13:56:04 +0900
Subject: [PATCH 08826/10326] Rename README header

---
 Templates/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/README.md b/Templates/README.md
index 75ee76ddba..cf25a89273 100644
--- a/Templates/README.md
+++ b/Templates/README.md
@@ -1,4 +1,4 @@
-# osu-templates
+# Templates
 
 Templates for use when creating osu! dependent projects. Create a fully-testable (and ready for git) custom ruleset in just two lines.
 

From 0f171f092f0fa12a9f600437ce751d235c2436ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 14:24:47 +0900
Subject: [PATCH 08827/10326] Add template projects to desktop slnf

---
 osu.Desktop.slnf | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Desktop.slnf b/osu.Desktop.slnf
index d2c14d321a..68541dbcfc 100644
--- a/osu.Desktop.slnf
+++ b/osu.Desktop.slnf
@@ -15,7 +15,16 @@
       "osu.Game.Tests\\osu.Game.Tests.csproj",
       "osu.Game.Tournament.Tests\\osu.Game.Tournament.Tests.csproj",
       "osu.Game.Tournament\\osu.Game.Tournament.csproj",
-      "osu.Game\\osu.Game.csproj"
+      "osu.Game\\osu.Game.csproj",
+
+      "Templates\\Rulesets\\ruleset-empty\\osu.Game.Rulesets.EmptyFreeform\\osu.Game.Rulesets.EmptyFreeform.csproj",
+      "Templates\\Rulesets\\ruleset-empty\\osu.Game.Rulesets.EmptyFreeform.Tests\\osu.Game.Rulesets.EmptyFreeform.Tests.csproj",
+      "Templates\\Rulesets\\ruleset-example\\osu.Game.Rulesets.Pippidon\\osu.Game.Rulesets.Pippidon.csproj",
+      "Templates\\Rulesets\\ruleset-example\\osu.Game.Rulesets.Pippidon.Tests\\osu.Game.Rulesets.Pippidon.Tests.csproj",
+      "Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling\\osu.Game.Rulesets.EmptyScrolling.csproj",
+      "Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling.Tests\\osu.Game.Rulesets.EmptyScrolling.Tests.csproj",
+      "Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon\\osu.Game.Rulesets.Pippidon.csproj",
+      "Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon.Tests\\osu.Game.Rulesets.Pippidon.Tests.csproj",
     ]
   }
 }
\ No newline at end of file

From d3f61b4aab145b35621622767ff54257f97ddbc4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 14:42:15 +0900
Subject: [PATCH 08828/10326] Remove templates project from sln

---
 osu.sln | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/osu.sln b/osu.sln
index 5a251cb727..b5018db362 100644
--- a/osu.sln
+++ b/osu.sln
@@ -94,8 +94,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon.Tests", "Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon.Tests\osu.Game.Rulesets.Pippidon.Tests.csproj", "{1743BF7C-E6AE-4A06-BAD9-166D62894303}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Templates", "Templates\osu.Game.Templates.csproj", "{7526A36E-09B9-4342-88CF-25969CF4158C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -538,18 +536,6 @@ Global
 		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhone.Build.0 = Release|Any CPU
 		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhone.Build.0 = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -600,6 +586,5 @@ Global
 		{B9B92246-02EB-4118-9C6F-85A0D726AA70} = {5CB72FDE-BA77-47D1-A556-FEB15AAD4523}
 		{B9022390-8184-4548-9DB1-50EB8878D20A} = {0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}
 		{1743BF7C-E6AE-4A06-BAD9-166D62894303} = {0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}
-		{7526A36E-09B9-4342-88CF-25969CF4158C} = {70CFC05F-CF79-4A7F-81EC-B32F1E564480}
 	EndGlobalSection
 EndGlobal

From 85e1bc85bfe56f45702f06eb416d57d58b61a879 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 15:21:53 +0900
Subject: [PATCH 08829/10326] Update DotSettings and .editorconfig

---
 .../Rulesets/ruleset-empty/.editorconfig      | 185 +++-
 ...ame.Rulesets.EmptyFreeform.sln.DotSettings | 897 ++++++++++--------
 .../Rulesets/ruleset-example/.editorconfig    | 185 +++-
 ...osu.Game.Rulesets.Pippidon.sln.DotSettings | 897 ++++++++++--------
 .../ruleset-scrolling-empty/.editorconfig     | 185 +++-
 ...me.Rulesets.EmptyScrolling.sln.DotSettings | 897 ++++++++++--------
 .../ruleset-scrolling-example/.editorconfig   | 185 +++-
 ...osu.Game.Rulesets.Pippidon.sln.DotSettings | 889 +++++++++--------
 8 files changed, 2620 insertions(+), 1700 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/.editorconfig b/Templates/Rulesets/ruleset-empty/.editorconfig
index 24825b7c42..f3badda9b3 100644
--- a/Templates/Rulesets/ruleset-empty/.editorconfig
+++ b/Templates/Rulesets/ruleset-empty/.editorconfig
@@ -12,16 +12,189 @@ trim_trailing_whitespace = true
 
 #PascalCase for public and protected members
 dotnet_naming_style.pascalcase.capitalization = pascal_case
-dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
-dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.public_members_pascalcase.severity = error
 dotnet_naming_rule.public_members_pascalcase.symbols = public_members
 dotnet_naming_rule.public_members_pascalcase.style = pascalcase
 
 #camelCase for private members
 dotnet_naming_style.camelcase.capitalization = camel_case
+
 dotnet_naming_symbols.private_members.applicable_accessibilities = private
-dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.private_members_camelcase.severity = warning
 dotnet_naming_rule.private_members_camelcase.symbols = private_members
-dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
+dotnet_naming_rule.private_members_camelcase.style = camelcase
+
+dotnet_naming_symbols.local_function.applicable_kinds = local_function
+dotnet_naming_rule.local_function_camelcase.severity = warning
+dotnet_naming_rule.local_function_camelcase.symbols = local_function
+dotnet_naming_rule.local_function_camelcase.style = camelcase
+
+#all_lower for private and local constants/static readonlys
+dotnet_naming_style.all_lower.capitalization = all_lower
+dotnet_naming_style.all_lower.word_separator = _
+
+dotnet_naming_symbols.private_constants.applicable_accessibilities = private
+dotnet_naming_symbols.private_constants.required_modifiers = const
+dotnet_naming_symbols.private_constants.applicable_kinds = field
+dotnet_naming_rule.private_const_all_lower.severity = warning
+dotnet_naming_rule.private_const_all_lower.symbols = private_constants
+dotnet_naming_rule.private_const_all_lower.style = all_lower
+
+dotnet_naming_symbols.private_static_readonly.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly.applicable_kinds = field
+dotnet_naming_rule.private_static_readonly_all_lower.severity = warning
+dotnet_naming_rule.private_static_readonly_all_lower.symbols = private_static_readonly
+dotnet_naming_rule.private_static_readonly_all_lower.style = all_lower
+
+dotnet_naming_symbols.local_constants.applicable_kinds = local
+dotnet_naming_symbols.local_constants.required_modifiers = const
+dotnet_naming_rule.local_const_all_lower.severity = warning
+dotnet_naming_rule.local_const_all_lower.symbols = local_constants
+dotnet_naming_rule.local_const_all_lower.style = all_lower
+
+#ALL_UPPER for non private constants/static readonlys
+dotnet_naming_style.all_upper.capitalization = all_upper
+dotnet_naming_style.all_upper.word_separator = _
+
+dotnet_naming_symbols.public_constants.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_constants.required_modifiers = const
+dotnet_naming_symbols.public_constants.applicable_kinds = field
+dotnet_naming_rule.public_const_all_upper.severity = warning
+dotnet_naming_rule.public_const_all_upper.symbols = public_constants
+dotnet_naming_rule.public_const_all_upper.style = all_upper
+
+dotnet_naming_symbols.public_static_readonly.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.public_static_readonly.applicable_kinds = field
+dotnet_naming_rule.public_static_readonly_all_upper.severity = warning
+dotnet_naming_rule.public_static_readonly_all_upper.symbols = public_static_readonly
+dotnet_naming_rule.public_static_readonly_all_upper.style = all_upper
+
+#Roslyn formating options
+
+#Formatting - indentation options
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+#Formatting - new line options
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_open_brace = all
+#csharp_new_line_before_members_in_anonymous_types = true
+#csharp_new_line_before_members_in_object_initializers = true # Currently no effect in VS/dotnet format (16.4), and makes Rider confusing
+csharp_new_line_between_query_expression_clauses = true
+
+#Formatting - organize using options
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#Roslyn language styles
+
+#Style - this. qualification
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
+
+#Style - type names
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_for_built_in_types = true:none
+csharp_style_var_elsewhere = true:silent
+
+#Style - modifiers
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
+csharp_preferred_modifier_order = public,private,protected,internal,new,abstract,virtual,sealed,override,static,readonly,extern,unsafe,volatile,async:warning
+
+#Style - parentheses
+# Skipped because roslyn cannot separate +-*/ with << >>
+
+#Style - expression bodies
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_local_functions = true:silent
+
+#Style - expression preferences
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_compound_assignment = true:warning
+
+#Style - null/type checks
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_throw_expression = true:silent
+csharp_style_conditional_delegate_call = true:warning
+
+#Style - unused
+dotnet_style_readonly_field = true:silent
+dotnet_code_quality_unused_parameters = non_public:silent
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_unused_value_assignment_preference = discard_variable:warning
+
+#Style - variable declaration
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+
+#Style - other C# 7.x features
+dotnet_style_prefer_inferred_tuple_names = true:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_pattern_local_over_anonymous_function = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+
+#Style - C# 8 features
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:silent
+csharp_style_prefer_index_operator = true:warning
+csharp_style_prefer_range_operator = true:warning
+csharp_style_prefer_switch_expression = false:none
+
+#Supressing roslyn built-in analyzers
+# Suppress: EC112
+
+#Private method is unused
+dotnet_diagnostic.IDE0051.severity = silent
+#Private member is unused
+dotnet_diagnostic.IDE0052.severity = silent
+
+#Rules for disposable
+dotnet_diagnostic.IDE0067.severity = none
+dotnet_diagnostic.IDE0068.severity = none
+dotnet_diagnostic.IDE0069.severity = none
+
+#Disable operator overloads requiring alternate named methods
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
index 1cbe36794a..aa8f8739c1 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
@@ -12,14 +12,15 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentIsFullyDiscarded/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
@@ -29,7 +30,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyFreeformScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
@@ -59,22 +60,35 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingAssignment/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWhenPossible/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWithPrivateSetter/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceDoWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceFixedStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForeachStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceIfStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceLockStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceUsingStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForStatementConditionIsTrue/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
@@ -92,6 +106,9 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
@@ -107,6 +124,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PatternAlwaysOfType/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
@@ -120,11 +138,12 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyFreeformScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
-	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantReadonlyModifier/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeSpecificationInDefaultExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
@@ -171,7 +190,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
@@ -181,7 +200,10 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringStartsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StructCanBeMadeReadOnly/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -199,12 +221,16 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
-	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedType_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseAwaitUsing/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseIndexFromEndExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameOfInsteadOfTypeOf/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
@@ -216,11 +242,21 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyFreeformScrollingTags&gt;False&lt;/XAMLCollapseEmptyFreeformScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_DOWHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FIXED/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_LOCK/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_USING/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">BlockBody</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
@@ -232,14 +268,24 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">MULTILINE</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOREACH_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_LOCK_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_WHILE_STMT/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CATCH_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ELSE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
@@ -247,6 +293,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
@@ -260,9 +307,11 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTML/@EntryIndexedValue">HTML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IOS/@EntryIndexedValue">IOS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
@@ -276,397 +325,397 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
-  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;Or&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Interface" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-        &lt;Kind Is="Struct" /&gt;&#xD;
-      &lt;/Or&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;And&gt;&#xD;
-        &lt;Kind Is="Class" /&gt;&#xD;
-        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
-      &lt;/And&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="All other members" /&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
-    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
-      &lt;Group DisplayName="Public Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Public" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Internal" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Protected" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Private Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Private" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
-      &lt;Entry DisplayName="Ctor"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;Kind Is="Constructor" /&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Region Name="Disposal"&gt;&#xD;
-        &lt;Entry DisplayName="Dtor"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;Kind Is="Destructor" /&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Virtual /&gt;&#xD;
-                &lt;Override /&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Region&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Methods"&gt;&#xD;
-      &lt;Group DisplayName="Public"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Internal"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Protected"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Private"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;Or&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Interface" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;Kind Is="Struct" /&gt;&#xD;
+		&lt;/Or&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+		&lt;Kind Is="Class" /&gt;&#xD;
+		&lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;Entry DisplayName="All other members" /&gt;&#xD;
+	&lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;Entry.SortBy&gt;&#xD;
+		&lt;Name /&gt;&#xD;
+		&lt;/Entry.SortBy&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+	&lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+		&lt;Group DisplayName="Public Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Public Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Public" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Internal Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Internal" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Protected Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Protected" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Private Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Private Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Private" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+		&lt;Entry DisplayName="Ctor"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Constructor" /&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Region Name="Disposal"&gt;&#xD;
+		&lt;Entry DisplayName="Dtor"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Destructor" /&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose()"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Virtual /&gt;&#xD;
+				&lt;Override /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Region&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Methods"&gt;&#xD;
+		&lt;Group DisplayName="Public"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Internal"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Protected"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Private"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
 &lt;/Patterns&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
 See the LICENCE file in the repository root for full licence text.&#xD;
@@ -726,6 +775,8 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -736,6 +787,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/UnitTesting/NUnitProvider/SetCurrentDirectoryTo/@EntryValue">TestFolder</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
@@ -761,7 +813,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -774,12 +826,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Content = new[]
-    {
-        new Drawable[] { $END$ },
-        new Drawable[] { }
-    }
+	RelativeSizeAxes = Axes.Both,
+	Content = new[]
+	{
+		new Drawable[] { $END$ },
+		new Drawable[] { }
+	}
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -792,12 +844,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Direction = FillDirection.Vertical,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Direction = FillDirection.Vertical,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -810,11 +862,11 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
 {
-    RelativeSizeAxes = Axes.Both,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -828,7 +880,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
 private void load()
 {
-    $END$
+	$END$
 }</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -841,8 +893,8 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
 {
-    Colour = Color4.Black,
-    RelativeSizeAxes = Axes.Both,
+	Colour = Color4.Black,
+	RelativeSizeAxes = Axes.Both,
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -855,23 +907,28 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobject/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=playfields/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strongable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-example/.editorconfig b/Templates/Rulesets/ruleset-example/.editorconfig
index 24825b7c42..f3badda9b3 100644
--- a/Templates/Rulesets/ruleset-example/.editorconfig
+++ b/Templates/Rulesets/ruleset-example/.editorconfig
@@ -12,16 +12,189 @@ trim_trailing_whitespace = true
 
 #PascalCase for public and protected members
 dotnet_naming_style.pascalcase.capitalization = pascal_case
-dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
-dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.public_members_pascalcase.severity = error
 dotnet_naming_rule.public_members_pascalcase.symbols = public_members
 dotnet_naming_rule.public_members_pascalcase.style = pascalcase
 
 #camelCase for private members
 dotnet_naming_style.camelcase.capitalization = camel_case
+
 dotnet_naming_symbols.private_members.applicable_accessibilities = private
-dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.private_members_camelcase.severity = warning
 dotnet_naming_rule.private_members_camelcase.symbols = private_members
-dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
+dotnet_naming_rule.private_members_camelcase.style = camelcase
+
+dotnet_naming_symbols.local_function.applicable_kinds = local_function
+dotnet_naming_rule.local_function_camelcase.severity = warning
+dotnet_naming_rule.local_function_camelcase.symbols = local_function
+dotnet_naming_rule.local_function_camelcase.style = camelcase
+
+#all_lower for private and local constants/static readonlys
+dotnet_naming_style.all_lower.capitalization = all_lower
+dotnet_naming_style.all_lower.word_separator = _
+
+dotnet_naming_symbols.private_constants.applicable_accessibilities = private
+dotnet_naming_symbols.private_constants.required_modifiers = const
+dotnet_naming_symbols.private_constants.applicable_kinds = field
+dotnet_naming_rule.private_const_all_lower.severity = warning
+dotnet_naming_rule.private_const_all_lower.symbols = private_constants
+dotnet_naming_rule.private_const_all_lower.style = all_lower
+
+dotnet_naming_symbols.private_static_readonly.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly.applicable_kinds = field
+dotnet_naming_rule.private_static_readonly_all_lower.severity = warning
+dotnet_naming_rule.private_static_readonly_all_lower.symbols = private_static_readonly
+dotnet_naming_rule.private_static_readonly_all_lower.style = all_lower
+
+dotnet_naming_symbols.local_constants.applicable_kinds = local
+dotnet_naming_symbols.local_constants.required_modifiers = const
+dotnet_naming_rule.local_const_all_lower.severity = warning
+dotnet_naming_rule.local_const_all_lower.symbols = local_constants
+dotnet_naming_rule.local_const_all_lower.style = all_lower
+
+#ALL_UPPER for non private constants/static readonlys
+dotnet_naming_style.all_upper.capitalization = all_upper
+dotnet_naming_style.all_upper.word_separator = _
+
+dotnet_naming_symbols.public_constants.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_constants.required_modifiers = const
+dotnet_naming_symbols.public_constants.applicable_kinds = field
+dotnet_naming_rule.public_const_all_upper.severity = warning
+dotnet_naming_rule.public_const_all_upper.symbols = public_constants
+dotnet_naming_rule.public_const_all_upper.style = all_upper
+
+dotnet_naming_symbols.public_static_readonly.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.public_static_readonly.applicable_kinds = field
+dotnet_naming_rule.public_static_readonly_all_upper.severity = warning
+dotnet_naming_rule.public_static_readonly_all_upper.symbols = public_static_readonly
+dotnet_naming_rule.public_static_readonly_all_upper.style = all_upper
+
+#Roslyn formating options
+
+#Formatting - indentation options
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+#Formatting - new line options
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_open_brace = all
+#csharp_new_line_before_members_in_anonymous_types = true
+#csharp_new_line_before_members_in_object_initializers = true # Currently no effect in VS/dotnet format (16.4), and makes Rider confusing
+csharp_new_line_between_query_expression_clauses = true
+
+#Formatting - organize using options
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#Roslyn language styles
+
+#Style - this. qualification
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
+
+#Style - type names
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_for_built_in_types = true:none
+csharp_style_var_elsewhere = true:silent
+
+#Style - modifiers
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
+csharp_preferred_modifier_order = public,private,protected,internal,new,abstract,virtual,sealed,override,static,readonly,extern,unsafe,volatile,async:warning
+
+#Style - parentheses
+# Skipped because roslyn cannot separate +-*/ with << >>
+
+#Style - expression bodies
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_local_functions = true:silent
+
+#Style - expression preferences
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_compound_assignment = true:warning
+
+#Style - null/type checks
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_throw_expression = true:silent
+csharp_style_conditional_delegate_call = true:warning
+
+#Style - unused
+dotnet_style_readonly_field = true:silent
+dotnet_code_quality_unused_parameters = non_public:silent
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_unused_value_assignment_preference = discard_variable:warning
+
+#Style - variable declaration
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+
+#Style - other C# 7.x features
+dotnet_style_prefer_inferred_tuple_names = true:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_pattern_local_over_anonymous_function = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+
+#Style - C# 8 features
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:silent
+csharp_style_prefer_index_operator = true:warning
+csharp_style_prefer_range_operator = true:warning
+csharp_style_prefer_switch_expression = false:none
+
+#Supressing roslyn built-in analyzers
+# Suppress: EC112
+
+#Private method is unused
+dotnet_diagnostic.IDE0051.severity = silent
+#Private member is unused
+dotnet_diagnostic.IDE0052.severity = silent
+
+#Rules for disposable
+dotnet_diagnostic.IDE0067.severity = none
+dotnet_diagnostic.IDE0068.severity = none
+dotnet_diagnostic.IDE0069.severity = none
+
+#Disable operator overloads requiring alternate named methods
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
index 190a1046f5..aa8f8739c1 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
@@ -12,14 +12,15 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentIsFullyDiscarded/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
@@ -29,7 +30,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPippidonScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
@@ -59,22 +60,35 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingAssignment/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWhenPossible/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWithPrivateSetter/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PippidonScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceDoWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceFixedStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForeachStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceIfStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceLockStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceUsingStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForStatementConditionIsTrue/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
@@ -92,6 +106,9 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
@@ -107,6 +124,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PatternAlwaysOfType/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
@@ -120,11 +138,12 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantPippidonScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
-	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantReadonlyModifier/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeSpecificationInDefaultExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
@@ -171,7 +190,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
@@ -181,7 +200,10 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringStartsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StructCanBeMadeReadOnly/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -199,12 +221,16 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
-	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedType_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseAwaitUsing/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseIndexFromEndExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameOfInsteadOfTypeOf/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
@@ -216,11 +242,21 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapsePippidonScrollingTags&gt;False&lt;/XAMLCollapsePippidonScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_DOWHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FIXED/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_LOCK/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_USING/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">BlockBody</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
@@ -232,14 +268,24 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">MULTILINE</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOREACH_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_LOCK_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_WHILE_STMT/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CATCH_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ELSE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
@@ -247,6 +293,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
@@ -260,9 +307,11 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTML/@EntryIndexedValue">HTML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IOS/@EntryIndexedValue">IOS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
@@ -276,397 +325,397 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
-  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;Or&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Interface" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-        &lt;Kind Is="Struct" /&gt;&#xD;
-      &lt;/Or&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;And&gt;&#xD;
-        &lt;Kind Is="Class" /&gt;&#xD;
-        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
-      &lt;/And&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="All other members" /&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
-    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
-      &lt;Group DisplayName="Public Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Public" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Internal" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Protected" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Private Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Private" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
-      &lt;Entry DisplayName="Ctor"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;Kind Is="Constructor" /&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Region Name="Disposal"&gt;&#xD;
-        &lt;Entry DisplayName="Dtor"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;Kind Is="Destructor" /&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Virtual /&gt;&#xD;
-                &lt;Override /&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Region&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Methods"&gt;&#xD;
-      &lt;Group DisplayName="Public"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Internal"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Protected"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Private"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;Or&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Interface" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;Kind Is="Struct" /&gt;&#xD;
+		&lt;/Or&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+		&lt;Kind Is="Class" /&gt;&#xD;
+		&lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;Entry DisplayName="All other members" /&gt;&#xD;
+	&lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;Entry.SortBy&gt;&#xD;
+		&lt;Name /&gt;&#xD;
+		&lt;/Entry.SortBy&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+	&lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+		&lt;Group DisplayName="Public Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Public Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Public" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Internal Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Internal" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Protected Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Protected" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Private Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Private Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Private" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+		&lt;Entry DisplayName="Ctor"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Constructor" /&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Region Name="Disposal"&gt;&#xD;
+		&lt;Entry DisplayName="Dtor"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Destructor" /&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose()"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Virtual /&gt;&#xD;
+				&lt;Override /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Region&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Methods"&gt;&#xD;
+		&lt;Group DisplayName="Public"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Internal"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Protected"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Private"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
 &lt;/Patterns&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
 See the LICENCE file in the repository root for full licence text.&#xD;
@@ -726,6 +775,8 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -736,6 +787,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/UnitTesting/NUnitProvider/SetCurrentDirectoryTo/@EntryValue">TestFolder</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
@@ -761,7 +813,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -774,12 +826,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Content = new[]
-    {
-        new Drawable[] { $END$ },
-        new Drawable[] { }
-    }
+	RelativeSizeAxes = Axes.Both,
+	Content = new[]
+	{
+		new Drawable[] { $END$ },
+		new Drawable[] { }
+	}
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -792,12 +844,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Direction = FillDirection.Vertical,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Direction = FillDirection.Vertical,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -810,11 +862,11 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
 {
-    RelativeSizeAxes = Axes.Both,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -828,7 +880,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
 private void load()
 {
-    $END$
+	$END$
 }</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -841,8 +893,8 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
 {
-    Colour = Color4.Black,
-    RelativeSizeAxes = Axes.Both,
+	Colour = Color4.Black,
+	RelativeSizeAxes = Axes.Both,
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -855,23 +907,28 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobject/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=playfields/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strongable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig b/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
index 24825b7c42..f3badda9b3 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
+++ b/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
@@ -12,16 +12,189 @@ trim_trailing_whitespace = true
 
 #PascalCase for public and protected members
 dotnet_naming_style.pascalcase.capitalization = pascal_case
-dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
-dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.public_members_pascalcase.severity = error
 dotnet_naming_rule.public_members_pascalcase.symbols = public_members
 dotnet_naming_rule.public_members_pascalcase.style = pascalcase
 
 #camelCase for private members
 dotnet_naming_style.camelcase.capitalization = camel_case
+
 dotnet_naming_symbols.private_members.applicable_accessibilities = private
-dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.private_members_camelcase.severity = warning
 dotnet_naming_rule.private_members_camelcase.symbols = private_members
-dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
+dotnet_naming_rule.private_members_camelcase.style = camelcase
+
+dotnet_naming_symbols.local_function.applicable_kinds = local_function
+dotnet_naming_rule.local_function_camelcase.severity = warning
+dotnet_naming_rule.local_function_camelcase.symbols = local_function
+dotnet_naming_rule.local_function_camelcase.style = camelcase
+
+#all_lower for private and local constants/static readonlys
+dotnet_naming_style.all_lower.capitalization = all_lower
+dotnet_naming_style.all_lower.word_separator = _
+
+dotnet_naming_symbols.private_constants.applicable_accessibilities = private
+dotnet_naming_symbols.private_constants.required_modifiers = const
+dotnet_naming_symbols.private_constants.applicable_kinds = field
+dotnet_naming_rule.private_const_all_lower.severity = warning
+dotnet_naming_rule.private_const_all_lower.symbols = private_constants
+dotnet_naming_rule.private_const_all_lower.style = all_lower
+
+dotnet_naming_symbols.private_static_readonly.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly.applicable_kinds = field
+dotnet_naming_rule.private_static_readonly_all_lower.severity = warning
+dotnet_naming_rule.private_static_readonly_all_lower.symbols = private_static_readonly
+dotnet_naming_rule.private_static_readonly_all_lower.style = all_lower
+
+dotnet_naming_symbols.local_constants.applicable_kinds = local
+dotnet_naming_symbols.local_constants.required_modifiers = const
+dotnet_naming_rule.local_const_all_lower.severity = warning
+dotnet_naming_rule.local_const_all_lower.symbols = local_constants
+dotnet_naming_rule.local_const_all_lower.style = all_lower
+
+#ALL_UPPER for non private constants/static readonlys
+dotnet_naming_style.all_upper.capitalization = all_upper
+dotnet_naming_style.all_upper.word_separator = _
+
+dotnet_naming_symbols.public_constants.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_constants.required_modifiers = const
+dotnet_naming_symbols.public_constants.applicable_kinds = field
+dotnet_naming_rule.public_const_all_upper.severity = warning
+dotnet_naming_rule.public_const_all_upper.symbols = public_constants
+dotnet_naming_rule.public_const_all_upper.style = all_upper
+
+dotnet_naming_symbols.public_static_readonly.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.public_static_readonly.applicable_kinds = field
+dotnet_naming_rule.public_static_readonly_all_upper.severity = warning
+dotnet_naming_rule.public_static_readonly_all_upper.symbols = public_static_readonly
+dotnet_naming_rule.public_static_readonly_all_upper.style = all_upper
+
+#Roslyn formating options
+
+#Formatting - indentation options
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+#Formatting - new line options
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_open_brace = all
+#csharp_new_line_before_members_in_anonymous_types = true
+#csharp_new_line_before_members_in_object_initializers = true # Currently no effect in VS/dotnet format (16.4), and makes Rider confusing
+csharp_new_line_between_query_expression_clauses = true
+
+#Formatting - organize using options
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#Roslyn language styles
+
+#Style - this. qualification
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
+
+#Style - type names
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_for_built_in_types = true:none
+csharp_style_var_elsewhere = true:silent
+
+#Style - modifiers
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
+csharp_preferred_modifier_order = public,private,protected,internal,new,abstract,virtual,sealed,override,static,readonly,extern,unsafe,volatile,async:warning
+
+#Style - parentheses
+# Skipped because roslyn cannot separate +-*/ with << >>
+
+#Style - expression bodies
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_local_functions = true:silent
+
+#Style - expression preferences
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_compound_assignment = true:warning
+
+#Style - null/type checks
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_throw_expression = true:silent
+csharp_style_conditional_delegate_call = true:warning
+
+#Style - unused
+dotnet_style_readonly_field = true:silent
+dotnet_code_quality_unused_parameters = non_public:silent
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_unused_value_assignment_preference = discard_variable:warning
+
+#Style - variable declaration
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+
+#Style - other C# 7.x features
+dotnet_style_prefer_inferred_tuple_names = true:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_pattern_local_over_anonymous_function = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+
+#Style - C# 8 features
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:silent
+csharp_style_prefer_index_operator = true:warning
+csharp_style_prefer_range_operator = true:warning
+csharp_style_prefer_switch_expression = false:none
+
+#Supressing roslyn built-in analyzers
+# Suppress: EC112
+
+#Private method is unused
+dotnet_diagnostic.IDE0051.severity = silent
+#Private member is unused
+dotnet_diagnostic.IDE0052.severity = silent
+
+#Rules for disposable
+dotnet_diagnostic.IDE0067.severity = none
+dotnet_diagnostic.IDE0068.severity = none
+dotnet_diagnostic.IDE0069.severity = none
+
+#Disable operator overloads requiring alternate named methods
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
index 1ceac22be9..aa8f8739c1 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
@@ -12,14 +12,15 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentIsFullyDiscarded/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
@@ -29,7 +30,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
@@ -59,22 +60,35 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingAssignment/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWhenPossible/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWithPrivateSetter/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceDoWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceFixedStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForeachStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceIfStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceLockStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceUsingStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForStatementConditionIsTrue/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
@@ -92,6 +106,9 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
@@ -107,6 +124,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PatternAlwaysOfType/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
@@ -120,11 +138,12 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
-	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantReadonlyModifier/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeSpecificationInDefaultExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
@@ -171,7 +190,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
@@ -181,7 +200,10 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringStartsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StructCanBeMadeReadOnly/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -199,12 +221,16 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
-	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedType_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseAwaitUsing/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseIndexFromEndExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameOfInsteadOfTypeOf/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
@@ -216,11 +242,21 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyScrollingTags&gt;False&lt;/XAMLCollapseEmptyScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_DOWHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FIXED/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_LOCK/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_USING/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">BlockBody</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
@@ -232,14 +268,24 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">MULTILINE</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOREACH_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_LOCK_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_WHILE_STMT/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CATCH_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ELSE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
@@ -247,6 +293,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
@@ -260,9 +307,11 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTML/@EntryIndexedValue">HTML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IOS/@EntryIndexedValue">IOS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
@@ -276,397 +325,397 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
-  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;Or&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Interface" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-        &lt;Kind Is="Struct" /&gt;&#xD;
-      &lt;/Or&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;And&gt;&#xD;
-        &lt;Kind Is="Class" /&gt;&#xD;
-        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
-      &lt;/And&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="All other members" /&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
-    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
-      &lt;Group DisplayName="Public Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Public" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Internal" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Protected" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Private Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Private" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
-      &lt;Entry DisplayName="Ctor"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;Kind Is="Constructor" /&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Region Name="Disposal"&gt;&#xD;
-        &lt;Entry DisplayName="Dtor"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;Kind Is="Destructor" /&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Virtual /&gt;&#xD;
-                &lt;Override /&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Region&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Methods"&gt;&#xD;
-      &lt;Group DisplayName="Public"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Internal"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Protected"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Private"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;Or&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Interface" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;Kind Is="Struct" /&gt;&#xD;
+		&lt;/Or&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+		&lt;Kind Is="Class" /&gt;&#xD;
+		&lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;Entry DisplayName="All other members" /&gt;&#xD;
+	&lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;Entry.SortBy&gt;&#xD;
+		&lt;Name /&gt;&#xD;
+		&lt;/Entry.SortBy&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+	&lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+		&lt;Group DisplayName="Public Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Public Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Public" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Internal Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Internal" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Protected Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Protected" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Private Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Private Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Private" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+		&lt;Entry DisplayName="Ctor"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Constructor" /&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Region Name="Disposal"&gt;&#xD;
+		&lt;Entry DisplayName="Dtor"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Destructor" /&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose()"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Virtual /&gt;&#xD;
+				&lt;Override /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Region&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Methods"&gt;&#xD;
+		&lt;Group DisplayName="Public"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Internal"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Protected"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Private"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
 &lt;/Patterns&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
 See the LICENCE file in the repository root for full licence text.&#xD;
@@ -726,6 +775,8 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -736,6 +787,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/UnitTesting/NUnitProvider/SetCurrentDirectoryTo/@EntryValue">TestFolder</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
@@ -761,7 +813,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -774,12 +826,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Content = new[]
-    {
-        new Drawable[] { $END$ },
-        new Drawable[] { }
-    }
+	RelativeSizeAxes = Axes.Both,
+	Content = new[]
+	{
+		new Drawable[] { $END$ },
+		new Drawable[] { }
+	}
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -792,12 +844,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Direction = FillDirection.Vertical,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Direction = FillDirection.Vertical,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -810,11 +862,11 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
 {
-    RelativeSizeAxes = Axes.Both,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -828,7 +880,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
 private void load()
 {
-    $END$
+	$END$
 }</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -841,8 +893,8 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
 {
-    Colour = Color4.Black,
-    RelativeSizeAxes = Axes.Both,
+	Colour = Color4.Black,
+	RelativeSizeAxes = Axes.Both,
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -855,23 +907,28 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobject/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=playfields/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strongable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-scrolling-example/.editorconfig b/Templates/Rulesets/ruleset-scrolling-example/.editorconfig
index 24825b7c42..f3badda9b3 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/.editorconfig
+++ b/Templates/Rulesets/ruleset-scrolling-example/.editorconfig
@@ -12,16 +12,189 @@ trim_trailing_whitespace = true
 
 #PascalCase for public and protected members
 dotnet_naming_style.pascalcase.capitalization = pascal_case
-dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
-dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.public_members_pascalcase.severity = error
 dotnet_naming_rule.public_members_pascalcase.symbols = public_members
 dotnet_naming_rule.public_members_pascalcase.style = pascalcase
 
 #camelCase for private members
 dotnet_naming_style.camelcase.capitalization = camel_case
+
 dotnet_naming_symbols.private_members.applicable_accessibilities = private
-dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.private_members_camelcase.severity = warning
 dotnet_naming_rule.private_members_camelcase.symbols = private_members
-dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
+dotnet_naming_rule.private_members_camelcase.style = camelcase
+
+dotnet_naming_symbols.local_function.applicable_kinds = local_function
+dotnet_naming_rule.local_function_camelcase.severity = warning
+dotnet_naming_rule.local_function_camelcase.symbols = local_function
+dotnet_naming_rule.local_function_camelcase.style = camelcase
+
+#all_lower for private and local constants/static readonlys
+dotnet_naming_style.all_lower.capitalization = all_lower
+dotnet_naming_style.all_lower.word_separator = _
+
+dotnet_naming_symbols.private_constants.applicable_accessibilities = private
+dotnet_naming_symbols.private_constants.required_modifiers = const
+dotnet_naming_symbols.private_constants.applicable_kinds = field
+dotnet_naming_rule.private_const_all_lower.severity = warning
+dotnet_naming_rule.private_const_all_lower.symbols = private_constants
+dotnet_naming_rule.private_const_all_lower.style = all_lower
+
+dotnet_naming_symbols.private_static_readonly.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly.applicable_kinds = field
+dotnet_naming_rule.private_static_readonly_all_lower.severity = warning
+dotnet_naming_rule.private_static_readonly_all_lower.symbols = private_static_readonly
+dotnet_naming_rule.private_static_readonly_all_lower.style = all_lower
+
+dotnet_naming_symbols.local_constants.applicable_kinds = local
+dotnet_naming_symbols.local_constants.required_modifiers = const
+dotnet_naming_rule.local_const_all_lower.severity = warning
+dotnet_naming_rule.local_const_all_lower.symbols = local_constants
+dotnet_naming_rule.local_const_all_lower.style = all_lower
+
+#ALL_UPPER for non private constants/static readonlys
+dotnet_naming_style.all_upper.capitalization = all_upper
+dotnet_naming_style.all_upper.word_separator = _
+
+dotnet_naming_symbols.public_constants.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_constants.required_modifiers = const
+dotnet_naming_symbols.public_constants.applicable_kinds = field
+dotnet_naming_rule.public_const_all_upper.severity = warning
+dotnet_naming_rule.public_const_all_upper.symbols = public_constants
+dotnet_naming_rule.public_const_all_upper.style = all_upper
+
+dotnet_naming_symbols.public_static_readonly.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.public_static_readonly.applicable_kinds = field
+dotnet_naming_rule.public_static_readonly_all_upper.severity = warning
+dotnet_naming_rule.public_static_readonly_all_upper.symbols = public_static_readonly
+dotnet_naming_rule.public_static_readonly_all_upper.style = all_upper
+
+#Roslyn formating options
+
+#Formatting - indentation options
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+#Formatting - new line options
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_open_brace = all
+#csharp_new_line_before_members_in_anonymous_types = true
+#csharp_new_line_before_members_in_object_initializers = true # Currently no effect in VS/dotnet format (16.4), and makes Rider confusing
+csharp_new_line_between_query_expression_clauses = true
+
+#Formatting - organize using options
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#Roslyn language styles
+
+#Style - this. qualification
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
+
+#Style - type names
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_for_built_in_types = true:none
+csharp_style_var_elsewhere = true:silent
+
+#Style - modifiers
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
+csharp_preferred_modifier_order = public,private,protected,internal,new,abstract,virtual,sealed,override,static,readonly,extern,unsafe,volatile,async:warning
+
+#Style - parentheses
+# Skipped because roslyn cannot separate +-*/ with << >>
+
+#Style - expression bodies
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_local_functions = true:silent
+
+#Style - expression preferences
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_compound_assignment = true:warning
+
+#Style - null/type checks
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_throw_expression = true:silent
+csharp_style_conditional_delegate_call = true:warning
+
+#Style - unused
+dotnet_style_readonly_field = true:silent
+dotnet_code_quality_unused_parameters = non_public:silent
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_unused_value_assignment_preference = discard_variable:warning
+
+#Style - variable declaration
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+
+#Style - other C# 7.x features
+dotnet_style_prefer_inferred_tuple_names = true:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_pattern_local_over_anonymous_function = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+
+#Style - C# 8 features
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:silent
+csharp_style_prefer_index_operator = true:warning
+csharp_style_prefer_range_operator = true:warning
+csharp_style_prefer_switch_expression = false:none
+
+#Supressing roslyn built-in analyzers
+# Suppress: EC112
+
+#Private method is unused
+dotnet_diagnostic.IDE0051.severity = silent
+#Private member is unused
+dotnet_diagnostic.IDE0052.severity = silent
+
+#Rules for disposable
+dotnet_diagnostic.IDE0067.severity = none
+dotnet_diagnostic.IDE0068.severity = none
+dotnet_diagnostic.IDE0069.severity = none
+
+#Disable operator overloads requiring alternate named methods
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
index c3e274569d..aa8f8739c1 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
@@ -12,14 +12,15 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentIsFullyDiscarded/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
@@ -59,22 +60,35 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingAssignment/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWhenPossible/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWithPrivateSetter/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceDoWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceFixedStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForeachStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceIfStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceLockStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceUsingStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForStatementConditionIsTrue/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
@@ -92,6 +106,9 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
@@ -107,6 +124,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PatternAlwaysOfType/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
@@ -121,10 +139,11 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
-	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantReadonlyModifier/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeSpecificationInDefaultExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
@@ -171,7 +190,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
@@ -181,7 +200,10 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringStartsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StructCanBeMadeReadOnly/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -199,12 +221,16 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
-	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedType_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseAwaitUsing/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseIndexFromEndExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameOfInsteadOfTypeOf/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
@@ -218,9 +244,19 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_DOWHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FIXED/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_LOCK/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_USING/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">BlockBody</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
@@ -232,14 +268,24 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">MULTILINE</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOREACH_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_LOCK_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_WHILE_STMT/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CATCH_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ELSE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
@@ -247,6 +293,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
@@ -260,9 +307,11 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTML/@EntryIndexedValue">HTML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IOS/@EntryIndexedValue">IOS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
@@ -276,397 +325,397 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
-  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;Or&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Interface" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-        &lt;Kind Is="Struct" /&gt;&#xD;
-      &lt;/Or&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;And&gt;&#xD;
-        &lt;Kind Is="Class" /&gt;&#xD;
-        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
-      &lt;/And&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="All other members" /&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
-    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
-      &lt;Group DisplayName="Public Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Public" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Internal" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Protected" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Private Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Private" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
-      &lt;Entry DisplayName="Ctor"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;Kind Is="Constructor" /&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Region Name="Disposal"&gt;&#xD;
-        &lt;Entry DisplayName="Dtor"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;Kind Is="Destructor" /&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Virtual /&gt;&#xD;
-                &lt;Override /&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Region&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Methods"&gt;&#xD;
-      &lt;Group DisplayName="Public"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Internal"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Protected"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Private"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;Or&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Interface" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;Kind Is="Struct" /&gt;&#xD;
+		&lt;/Or&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+		&lt;Kind Is="Class" /&gt;&#xD;
+		&lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;Entry DisplayName="All other members" /&gt;&#xD;
+	&lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;Entry.SortBy&gt;&#xD;
+		&lt;Name /&gt;&#xD;
+		&lt;/Entry.SortBy&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+	&lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+		&lt;Group DisplayName="Public Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Public Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Public" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Internal Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Internal" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Protected Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Protected" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Private Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Private Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Private" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+		&lt;Entry DisplayName="Ctor"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Constructor" /&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Region Name="Disposal"&gt;&#xD;
+		&lt;Entry DisplayName="Dtor"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Destructor" /&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose()"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Virtual /&gt;&#xD;
+				&lt;Override /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Region&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Methods"&gt;&#xD;
+		&lt;Group DisplayName="Public"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Internal"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Protected"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Private"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
 &lt;/Patterns&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
 See the LICENCE file in the repository root for full licence text.&#xD;
@@ -726,6 +775,8 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -736,6 +787,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/UnitTesting/NUnitProvider/SetCurrentDirectoryTo/@EntryValue">TestFolder</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
@@ -761,7 +813,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -774,12 +826,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Content = new[]
-    {
-        new Drawable[] { $END$ },
-        new Drawable[] { }
-    }
+	RelativeSizeAxes = Axes.Both,
+	Content = new[]
+	{
+		new Drawable[] { $END$ },
+		new Drawable[] { }
+	}
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -792,12 +844,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Direction = FillDirection.Vertical,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Direction = FillDirection.Vertical,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -810,11 +862,11 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
 {
-    RelativeSizeAxes = Axes.Both,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -828,7 +880,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
 private void load()
 {
-    $END$
+	$END$
 }</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -841,8 +893,8 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
 {
-    Colour = Color4.Black,
-    RelativeSizeAxes = Axes.Both,
+	Colour = Color4.Black,
+	RelativeSizeAxes = Axes.Both,
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -855,23 +907,28 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobject/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=playfields/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strongable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

From 78759ceb6c3abfb870ec39b668e7f776300ade00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Apr 2021 16:06:31 +0900
Subject: [PATCH 08830/10326] Update link to templates

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e09b4d86a5..0d6af2aeba 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If your platform is not listed above, there is still a chance you can manually b
 
 ## Developing a custom ruleset
 
-osu! is designed to have extensible modular gameplay modes, called "rulesets". Building one of these allows a developer to harness the power of osu! for their own game style. To get started working on a ruleset, we have some templates available [here](https://github.com/ppy/osu-templates).
+osu! is designed to have extensible modular gameplay modes, called "rulesets". Building one of these allows a developer to harness the power of osu! for their own game style. To get started working on a ruleset, we have some templates available [here](https://github.com/ppy/osu/tree/master/Templates).
 
 You can see some examples of custom rulesets by visiting the [custom ruleset directory](https://github.com/ppy/osu/issues/5852).
 

From 42e816fcae108ac2b4a3e6e92f87035e46dd965f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 17:47:12 +0900
Subject: [PATCH 08831/10326] Add failing tests

---
 .../OsuBeatmapConversionTest.cs               |  1 +
 ...ti-segment-slider-expected-conversion.json | 36 +++++++++++++++++++
 .../Testing/Beatmaps/multi-segment-slider.osu | 17 +++++++++
 .../Formats/LegacyBeatmapDecoderTest.cs       | 33 +++++++++++++++++
 .../Resources/multi-segment-slider.osu        |  6 ++++
 5 files changed, 93 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider.osu

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index 7d32895083..5f44e1b6b6 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase("repeat-slider")]
         [TestCase("uneven-repeat-slider")]
         [TestCase("old-stacking")]
+        [TestCase("multi-segment-slider")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json
new file mode 100644
index 0000000000..8a056b3039
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json
@@ -0,0 +1,36 @@
+{
+    "Mappings": [{
+        "StartTime": 347893,
+        "Objects": [{
+                "StartTime": 347893,
+                "EndTime": 347893,
+                "X": 329,
+                "Y": 245,
+                "StackOffset": {
+                    "X": 0,
+                    "Y": 0
+                }
+            },
+            {
+                "StartTime": 348193,
+                "EndTime": 348193,
+                "X": 183.0447,
+                "Y": 245.24292,
+                "StackOffset": {
+                    "X": 0,
+                    "Y": 0
+                }
+            },
+            {
+                "StartTime": 348457,
+                "EndTime": 348457,
+                "X": 329,
+                "Y": 245,
+                "StackOffset": {
+                    "X": 0,
+                    "Y": 0
+                }
+            }
+        ]
+    }]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider.osu b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider.osu
new file mode 100644
index 0000000000..843c32b8ef
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider.osu
@@ -0,0 +1,17 @@
+osu file format v14
+
+[General]
+Mode: 0
+
+[Difficulty]
+CircleSize:4
+OverallDifficulty:7
+ApproachRate:8
+SliderMultiplier:2
+SliderTickRate:1
+
+[TimingPoints]
+337093,300,4,2,1,40,1,0
+
+[HitObjects]
+329,245,347893,2,0,B|319:311|199:343|183:245|183:245,2,200,8|8|8,0:0|0:0|0:0,0:0:0:0:
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 4b9e9dd88c..fb18be3ae1 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -707,6 +707,39 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(third.ControlPoints[5].Type.Value, Is.EqualTo(null));
                 Assert.That(third.ControlPoints[6].Position.Value, Is.EqualTo(new Vector2(480, 0)));
                 Assert.That(third.ControlPoints[6].Type.Value, Is.EqualTo(null));
+
+                // Last control point duplicated
+                var fourth = ((IHasPath)decoded.HitObjects[3]).Path;
+
+                Assert.That(fourth.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(fourth.ControlPoints[0].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(fourth.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(1, 1)));
+                Assert.That(fourth.ControlPoints[1].Type.Value, Is.EqualTo(null));
+                Assert.That(fourth.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(2, 2)));
+                Assert.That(fourth.ControlPoints[2].Type.Value, Is.EqualTo(null));
+                Assert.That(fourth.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fourth.ControlPoints[3].Type.Value, Is.EqualTo(null));
+                Assert.That(fourth.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fourth.ControlPoints[4].Type.Value, Is.EqualTo(null));
+
+                // Last control point in segment duplicated
+                var fifth = ((IHasPath)decoded.HitObjects[4]).Path;
+
+                Assert.That(fifth.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(fifth.ControlPoints[0].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(fifth.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(1, 1)));
+                Assert.That(fifth.ControlPoints[1].Type.Value, Is.EqualTo(null));
+                Assert.That(fifth.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(2, 2)));
+                Assert.That(fifth.ControlPoints[2].Type.Value, Is.EqualTo(null));
+                Assert.That(fifth.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fifth.ControlPoints[3].Type.Value, Is.EqualTo(null));
+                Assert.That(fifth.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fifth.ControlPoints[4].Type.Value, Is.EqualTo(null));
+
+                Assert.That(fifth.ControlPoints[5].Position.Value, Is.EqualTo(new Vector2(4, 4)));
+                Assert.That(fifth.ControlPoints[5].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(fifth.ControlPoints[6].Position.Value, Is.EqualTo(new Vector2(5, 5)));
+                Assert.That(fifth.ControlPoints[6].Type.Value, Is.EqualTo(null));
             }
         }
     }
diff --git a/osu.Game.Tests/Resources/multi-segment-slider.osu b/osu.Game.Tests/Resources/multi-segment-slider.osu
index 6eabe640e4..504a6c3c24 100644
--- a/osu.Game.Tests/Resources/multi-segment-slider.osu
+++ b/osu.Game.Tests/Resources/multi-segment-slider.osu
@@ -9,3 +9,9 @@ osu file format v128
 
 // Implicit multi-segment
 32,192,3000,6,0,B|32:384|256:384|256:192|256:192|256:0|512:0|512:192,1,800
+
+// Last control point duplicated
+0,0,4000,2,0,B|1:1|2:2|3:3|3:3,2,200
+
+// Last control point in segment duplicated
+0,0,4000,2,0,B|1:1|2:2|3:3|3:3|B|4:4|5:5,2,200

From 4b29d0ebe2eee8475170d35540a5ebe95dbbe0d1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 17:49:36 +0900
Subject: [PATCH 08832/10326] Fix last control point starting new segment

---
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 8419dd66de..e8a5463cce 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -336,9 +336,14 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             while (++endIndex < vertices.Length - endPointLength)
             {
+                // Keep incrementing while an implicit segment doesn't need to be started
                 if (vertices[endIndex].Position.Value != vertices[endIndex - 1].Position.Value)
                     continue;
 
+                // The last control point of each segment is not allowed to start a new implicit segment.
+                if (endIndex == vertices.Length - endPointLength - 1)
+                    continue;
+
                 // Force a type on the last point, and return the current control point set as a segment.
                 vertices[endIndex - 1].Type.Value = type;
                 yield return vertices.AsMemory().Slice(startIndex, endIndex - startIndex);

From a3faf0a28e12528dae79108b1ad4b83f920303f7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 18:07:07 +0900
Subject: [PATCH 08833/10326] Increment start time

---
 osu.Game.Tests/Resources/multi-segment-slider.osu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Resources/multi-segment-slider.osu b/osu.Game.Tests/Resources/multi-segment-slider.osu
index 504a6c3c24..cc86710067 100644
--- a/osu.Game.Tests/Resources/multi-segment-slider.osu
+++ b/osu.Game.Tests/Resources/multi-segment-slider.osu
@@ -14,4 +14,4 @@ osu file format v128
 0,0,4000,2,0,B|1:1|2:2|3:3|3:3,2,200
 
 // Last control point in segment duplicated
-0,0,4000,2,0,B|1:1|2:2|3:3|3:3|B|4:4|5:5,2,200
+0,0,5000,2,0,B|1:1|2:2|3:3|3:3|B|4:4|5:5,2,200

From eee3d83ed25375fa58b262cfc48ecc3548b3138a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Apr 2021 19:36:18 +0900
Subject: [PATCH 08834/10326] Disable sdk linker for android debug releases

Aimed to improve build time (especially for CI builds).

The additional lines come from visual studio. I'm intentionally
committing its output so it doesn't cause a diff on further csproj
changes.
---
 osu.Android/osu.Android.csproj                               | 5 +++++
 .../osu.Game.Rulesets.Catch.Tests.Android.csproj             | 5 +++++
 .../osu.Game.Rulesets.Mania.Tests.Android.csproj             | 5 +++++
 .../osu.Game.Rulesets.Osu.Tests.Android.csproj               | 5 +++++
 .../osu.Game.Rulesets.Taiko.Tests.Android.csproj             | 5 +++++
 osu.Game.Tests.Android/osu.Game.Tests.Android.csproj         | 5 +++++
 6 files changed, 30 insertions(+)

diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index 2051beae21..54857ac87d 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -20,6 +20,11 @@
     <AndroidDexTool>d8</AndroidDexTool>
     <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="GameplayScreenRotationLocker.cs" />
     <Compile Include="OsuGameActivity.cs" />
diff --git a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
index 2e6c10a02e..94fdba4a3e 100644
--- a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
@@ -14,6 +14,11 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
index 8c134c7114..9674186039 100644
--- a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
@@ -14,6 +14,11 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
index 22fa605176..f4b673f10b 100644
--- a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
@@ -14,6 +14,11 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
index a48110b354..4d4dabebe6 100644
--- a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
@@ -14,6 +14,11 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
   </ItemGroup>
diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index bf256f486c..b45a3249ff 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -23,6 +23,11 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);CA2007</NoWarn>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\osu.Game.Tests\**\Beatmaps\**\*.cs">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>

From d0510222aeec68a7984dcb42411bff0a5fff3241 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 19:59:54 +0900
Subject: [PATCH 08835/10326] Fix legacy beatmap encoding

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index d06478b9de..b581c46ec5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -329,7 +329,13 @@ namespace osu.Game.Beatmaps.Formats
 
                 if (point.Type.Value != null)
                 {
-                    if (point.Type.Value != lastType)
+                    // We've reached a new segment!
+
+                    // To preserve compatibility with osu-stable as much as possible, segments with the same type are converted to use implicit segments by duplicating the control point.
+                    // One exception to this is when the last control point of the last segment was itself a duplicate, which can't be supported by osu-stable.
+                    bool lastPointWasDuplicate = i > 1 && pathData.Path.ControlPoints[i - 1].Position.Value == pathData.Path.ControlPoints[i - 2].Position.Value;
+
+                    if (lastPointWasDuplicate || point.Type.Value != lastType)
                     {
                         switch (point.Type.Value)
                         {

From 57983ae61f665229cbf8445d76d3f1ad9386a95e Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Mon, 5 Apr 2021 22:14:31 +1000
Subject: [PATCH 08836/10326] Fix whitespace

---
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index b3d7ce3c40..b317c140d8 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -18,13 +18,13 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected readonly LimitedCapacityStack<DifficultyHitObject> Previous = new LimitedCapacityStack<DifficultyHitObject>(2); // Contained objects not used yet
 
-        
         /// <summary>
         /// Mods for use in skill calculations.
         /// </summary>
         protected IReadOnlyList<Mod> Mods => mods;
 
         private readonly Mod[] mods;
+
         protected Skill(Mod[] mods)
         {
             this.mods = mods;

From 5bdd15f7468a2319a3370850d966458e0936b232 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Mon, 5 Apr 2021 22:14:37 +1000
Subject: [PATCH 08837/10326] Refactor Skill.Process() to not require calling
 base.Process()

---
 osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs |  2 +-
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs         | 11 +++++++----
 osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs   |  4 +---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 14ada8ca09..5780fe39fa 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Difficulty
             {
                 foreach (var skill in skills)
                 {
-                    skill.Process(hitObject);
+                    skill.ProcessInternal(hitObject);
                 }
             }
 
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index b317c140d8..534dee3ba8 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -30,14 +30,17 @@ namespace osu.Game.Rulesets.Difficulty.Skills
             this.mods = mods;
         }
 
+        internal void ProcessInternal(DifficultyHitObject current)
+        {
+            Process(current);
+            Previous.Push(current);
+        }
+
         /// <summary>
         /// Process a <see cref="DifficultyHitObject"/>.
         /// </summary>
         /// <param name="current">The <see cref="DifficultyHitObject"/> to process.</param>
-        public virtual void Process(DifficultyHitObject current)
-        {
-            Previous.Push(current);
-        }
+        protected abstract void Process(DifficultyHitObject current);
 
         /// <summary>
         /// Returns the calculated difficulty value representing all <see cref="DifficultyHitObject"/>s that have been processed up to this point.
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
index c324f8e414..71cee36812 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <summary>
         /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
         /// </summary>
-        public sealed override void Process(DifficultyHitObject current)
+        protected sealed override void Process(DifficultyHitObject current)
         {
             // The first object doesn't generate a strain, so we begin with an incremented section end
             if (Previous.Count == 0)
@@ -72,8 +72,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
             CurrentStrain += StrainValueOf(current) * SkillMultiplier;
 
             currentSectionPeak = Math.Max(CurrentStrain, currentSectionPeak);
-
-            base.Process(current);
         }
 
         /// <summary>

From beebdb073471fdd6bf075fdb1a3d243018e8c8e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Apr 2021 22:30:51 +0900
Subject: [PATCH 08838/10326] Clean up implementation

---
 .../Gameplay/TestSceneGameplayMenuOverlay.cs  |  2 +-
 .../Input/Bindings/GlobalActionContainer.cs   | 20 ++++++++++++-------
 osu.Game/Input/Bindings/GlobalInputManager.cs |  6 +-----
 osu.Game/OsuGame.cs                           |  1 -
 .../Visual/OsuManualInputManagerTestScene.cs  |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
index d69ac665cc..75e8194708 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game)
         {
-            Child = globalActionContainer = new GlobalActionContainer(game);
+            Child = globalActionContainer = new GlobalActionContainer(game, null);
         }
 
         [SetUp]
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 6d038c43cf..ab8a40dbe3 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.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.ComponentModel;
 using System.Linq;
@@ -13,15 +12,17 @@ namespace osu.Game.Input.Bindings
 {
     public class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput
     {
+        private readonly GlobalInputManager globalInputManager;
+
         private readonly Drawable handler;
 
-        public GlobalActionContainer(OsuGameBase game, bool nested = false)
+        public GlobalActionContainer(OsuGameBase game, GlobalInputManager globalInputManager)
             : base(matchingMode: KeyCombinationMatchingMode.Modifiers)
         {
+            this.globalInputManager = globalInputManager;
+
             if (game is IKeyBindingHandler<GlobalAction>)
                 handler = game;
-
-            GetInputQueue = () => base.KeyBindingInputQueue.ToArray();
         }
 
         public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings).Concat(EditorKeyBindings);
@@ -94,10 +95,15 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
         };
 
-        public Func<Drawable[]> GetInputQueue { get; set; }
+        protected override IEnumerable<Drawable> KeyBindingInputQueue
+        {
+            get
+            {
+                var inputQueue = globalInputManager?.NonPositionalInputQueue ?? base.KeyBindingInputQueue;
 
-        protected override IEnumerable<Drawable> KeyBindingInputQueue =>
-            handler == null ? GetInputQueue() : GetInputQueue().Prepend(handler);
+                return handler != null ? inputQueue.Prepend(handler) : inputQueue;
+            }
+        }
     }
 
     public enum GlobalAction
diff --git a/osu.Game/Input/Bindings/GlobalInputManager.cs b/osu.Game/Input/Bindings/GlobalInputManager.cs
index 475397408a..91373712fb 100644
--- a/osu.Game/Input/Bindings/GlobalInputManager.cs
+++ b/osu.Game/Input/Bindings/GlobalInputManager.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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
@@ -23,10 +22,7 @@ namespace osu.Game.Input.Bindings
                     RelativeSizeAxes = Axes.Both,
                 },
                 // to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
-                GlobalBindings = new GlobalActionContainer(game, true)
-                {
-                    GetInputQueue = () => NonPositionalInputQueue.ToArray()
-                },
+                GlobalBindings = new GlobalActionContainer(game, this)
             };
         }
     }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5fa315a464..809e5d3c1b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -27,7 +27,6 @@ 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.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index 64f4d7b95b..b3073c8bea 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual
                 InputManager = new ManualInputManager
                 {
                     UseParentInput = true,
-                    Child = new GlobalActionContainer(null)
+                    Child = new GlobalActionContainer(null, null)
                         .WithChild((cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both })
                             .WithChild(content = new OsuTooltipContainer(cursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }))
                 },

From e486e521ffcea5d099f5563af6cbba98dd2a1bbb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Apr 2021 22:46:01 +0900
Subject: [PATCH 08839/10326] Fix regressed test

---
 osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 3e25e22b5f..00f9bf3432 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
@@ -146,7 +147,7 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("Move mouse to backButton", () => InputManager.MoveMouseTo(backButtonPosition));
 
             // BackButton handles hover using its child button, so this checks whether or not any of BackButton's children are hovered.
-            AddUntilStep("Back button is hovered", () => InputManager.HoveredDrawables.Any(d => d.Parent == Game.BackButton));
+            AddUntilStep("Back button is hovered", () => Game.ChildrenOfType<BackButton>().First().Children.Any(c => c.IsHovered));
 
             AddStep("Click back button", () => InputManager.Click(MouseButton.Left));
             AddUntilStep("Overlay was hidden", () => songSelect.ModSelectOverlay.State.Value == Visibility.Hidden);

From ffe7edc16ac13f4460d3dbfc327d1622bfb7e32e Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Tue, 6 Apr 2021 11:06:10 +1000
Subject: [PATCH 08840/10326] Update xmldocs

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
index 08b2936876..e94fbd4e0f 100644
--- a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
+++ b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 namespace osu.Game.Rulesets.Difficulty.Utils
 {
     /// <summary>
-    /// An indexed queue where items are indexed beginning from the end instead of the start.
+    /// An indexed queue where items are indexed beginning from the most recently enqueued item.
     /// </summary>
     public class ReverseQueue<T> : IEnumerable<T>
     {
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Difficulty.Utils
         }
 
         /// <summary>
-        /// Dequeues an item from the <see cref="ReverseQueue{T}"/> and returns it.
+        /// Dequeues the least recently enqueued item from the <see cref="ReverseQueue{T}"/> and returns it.
         /// </summary>
         /// <returns>The item dequeued from the <see cref="ReverseQueue{T}"/>.</returns>
         public T Dequeue()
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Difficulty.Utils
         }
 
         /// <summary>
-        /// Returns an enumerator which enumerates items in the <see cref="ReverseQueue{T}"/> starting from the most recently enqueued one.
+        /// Returns an enumerator which enumerates items in the <see cref="ReverseQueue{T}"/> starting from the most recently enqueued item.
         /// </summary>
         public IEnumerator<T> GetEnumerator()
         {

From 65f93d6f9d9fbc8a9b3c68b10e6303ed425aaf71 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Tue, 6 Apr 2021 11:30:58 +1000
Subject: [PATCH 08841/10326] Add more descriptive xmldoc for ReverseQueue

---
 osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
index e94fbd4e0f..f104b8105a 100644
--- a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
+++ b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Rulesets.Difficulty.Utils
 {
     /// <summary>
     /// An indexed queue where items are indexed beginning from the most recently enqueued item.
+    /// Enqueuing an item pushes all existing indexes up by one and inserts the item at index 0.
+    /// Dequeuing an item removes the item from the highest index and returns it.
     /// </summary>
     public class ReverseQueue<T> : IEnumerable<T>
     {

From 5cd43b3a7fc2f267628e5b1b979affa52d4f9e2d Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Tue, 6 Apr 2021 11:53:31 +1000
Subject: [PATCH 08842/10326] Set default history retention to 0 for Skill and
 override in StrainSkill

Some skills might not even require history retention, so why waste the allocations?
---
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs       | 10 +++++-----
 osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs | 13 +++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 94d823f2ad..ebd389d823 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -22,8 +22,9 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// Soft capacity of the <see cref="Previous"/> queue.
         /// <see cref="Previous"/> will automatically resize if it exceeds capacity, but will do so at a very slight performance impact.
         /// The actual capacity will be set to this value + 1 to allow for storage of the current object before the next can be processed.
+        /// Setting to zero (default) will cause <see cref="Previous"/> to be uninstanciated.
         /// </summary>
-        protected virtual int PreviousCollectionSoftCapacity => 1;
+        protected virtual int PreviousCollectionSoftCapacity => 0;
 
         /// <summary>
         /// Mods for use in skill calculations.
@@ -35,7 +36,9 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected Skill(Mod[] mods)
         {
             this.mods = mods;
-            Previous = new ReverseQueue<DifficultyHitObject>(PreviousCollectionSoftCapacity + 1);
+
+            if (PreviousCollectionSoftCapacity > 0)
+                Previous = new ReverseQueue<DifficultyHitObject>(PreviousCollectionSoftCapacity + 1);
         }
 
         internal void ProcessInternal(DifficultyHitObject current)
@@ -51,8 +54,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <param name="current">The <see cref="DifficultyHitObject"/> to be processed.</param>
         protected virtual void RemoveExtraneousHistory(DifficultyHitObject current)
         {
-            while (Previous.Count > 1)
-                Previous.Dequeue();
         }
 
         /// <summary>
@@ -61,7 +62,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <param name="current">The <see cref="DifficultyHitObject"/> that was just processed.</param>
         protected virtual void AddToHistory(DifficultyHitObject current)
         {
-            Previous.Enqueue(current);
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
index 71cee36812..16816be35c 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected abstract double SkillMultiplier { get; }
 
+        protected override int PreviousCollectionSoftCapacity => 1;
+
         /// <summary>
         /// Determines how quickly strain decays for the given skill.
         /// For example a value of 0.15 indicates that strain decays to 15% of its original value in one second.
@@ -52,6 +54,17 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         {
         }
 
+        protected override void RemoveExtraneousHistory(DifficultyHitObject current)
+        {
+            while (Previous.Count > 1)
+                Previous.Dequeue();
+        }
+
+        protected override void AddToHistory(DifficultyHitObject current)
+        {
+            Previous.Enqueue(current);
+        }
+
         /// <summary>
         /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
         /// </summary>

From a2544100d418cdbe3b7de383d9dfb2a2e2a95f38 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 6 Apr 2021 14:10:59 +0900
Subject: [PATCH 08843/10326] Fix floating point error in slider path encoding

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index b581c46ec5..5eb5fcdfa0 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -329,13 +329,25 @@ namespace osu.Game.Beatmaps.Formats
 
                 if (point.Type.Value != null)
                 {
-                    // We've reached a new segment!
+                    // We've reached a new (explicit) segment!
 
-                    // To preserve compatibility with osu-stable as much as possible, segments with the same type are converted to use implicit segments by duplicating the control point.
-                    // One exception to this is when the last control point of the last segment was itself a duplicate, which can't be supported by osu-stable.
-                    bool lastPointWasDuplicate = i > 1 && pathData.Path.ControlPoints[i - 1].Position.Value == pathData.Path.ControlPoints[i - 2].Position.Value;
+                    // Explicit segments have a new format in which the type is injected into the middle of the control point string.
+                    // To preserve compatibility with osu-stable as much as possible, explicit segments with the same type are converted to use implicit segments by duplicating the control point.
+                    bool needsExplicitSegment = point.Type.Value != lastType;
 
-                    if (lastPointWasDuplicate || point.Type.Value != lastType)
+                    // One exception to this is when the last two control points of the last segment were duplicated. This is not a scenario supported by osu!stable.
+                    // Lazer does not add implicit segments for the last two control points of _any_ explicit segment, so an explicit segment is forced in order to maintain consistency with the decoder.
+                    if (i > 1)
+                    {
+                        // We need to use the absolute control point position to determine equality, otherwise floating point issues may arise.
+                        Vector2 p1 = position + pathData.Path.ControlPoints[i - 1].Position.Value;
+                        Vector2 p2 = position + pathData.Path.ControlPoints[i - 2].Position.Value;
+
+                        if ((int)p1.X == (int)p2.X && (int)p1.Y == (int)p2.Y)
+                            needsExplicitSegment = true;
+                    }
+
+                    if (needsExplicitSegment)
                     {
                         switch (point.Type.Value)
                         {

From 8ff13845d1b911031fef877656337bba471a3b0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 14:24:22 +0900
Subject: [PATCH 08844/10326] Add marker showing where 00:00:000 is

---
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 0697dbb392..86a30b7e2d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -9,6 +9,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -91,6 +92,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         },
                         ticks = new TimelineTickDisplay(),
                         controlPoints = new TimelineControlPointDisplay(),
+                        new Box
+                        {
+                            Name = "zero marker",
+                            RelativeSizeAxes = Axes.Y,
+                            Width = 2,
+                            Origin = Anchor.TopCentre,
+                            Colour = colours.YellowDarker,
+                        },
                     }
                 },
             });

From 35dd1c68aab5084a5bb0e3a0b984d0847fefd390 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 14:27:45 +0900
Subject: [PATCH 08845/10326] Fix drag/selection events not propagating
 correctly to TimelineBlueprintContainer when before time zero

---
 .../Components/Timeline/TimelineBlueprintContainer.cs      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 3623f8ad8e..e94634e6c4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -36,6 +36,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private SelectionBlueprint placementBlueprint;
 
         private readonly Box backgroundBox;
+        // we only care about checking vertical validity.
+        // this allows selecting and dragging selections before time=0.
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
+        {
+            float localY = ToLocalSpace(screenSpacePos).Y;
+            return DrawRectangle.Top <= localY && DrawRectangle.Bottom >= localY;
+        }
 
         public TimelineBlueprintContainer(HitObjectComposer composer)
             : base(composer)

From 7d301a633639e9856ad0e05014f2ccbbde1e7f10 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 14:28:10 +0900
Subject: [PATCH 08846/10326] Improve timeline hover display before time zero
 with a gradient fade

---
 .../Timeline/TimelineBlueprintContainer.cs    | 49 ++++++++++++++++---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index e94634e6c4..d17a7551dd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -7,6 +7,7 @@ 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.Primitives;
 using osu.Framework.Graphics.Shapes;
@@ -16,6 +17,7 @@ using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
@@ -35,7 +37,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Bindable<HitObject> placement;
         private SelectionBlueprint placementBlueprint;
 
-        private readonly Box backgroundBox;
+        private Box backgroundBox;
+        private Box backgroundBoxIntro;
+
         // we only care about checking vertical validity.
         // this allows selecting and dragging selections before time=0.
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
@@ -52,12 +56,26 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             Origin = Anchor.Centre;
 
             Height = 0.6f;
+        }
 
-            AddInternal(backgroundBox = new Box
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRangeInternal(new[]
             {
-                Colour = Color4.Black,
-                RelativeSizeAxes = Axes.Both,
-                Alpha = 0.1f,
+                backgroundBoxIntro = new Box
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 200,
+                    Origin = Anchor.TopRight,
+                    Alpha = 0.1f,
+                },
+                backgroundBox = new Box
+                {
+                    Colour = Color4.Black,
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.1f,
+                }
             });
         }
 
@@ -68,6 +86,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             placement = beatmap.PlacementObject.GetBoundCopy();
             placement.ValueChanged += placementChanged;
+
+            updateHoverState();
+            FinishTransforms(true);
         }
 
         private void placementChanged(ValueChangedEvent<HitObject> obj)
@@ -94,13 +115,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool OnHover(HoverEvent e)
         {
-            backgroundBox.FadeColour(colours.BlueLighter, 120, Easing.OutQuint);
+            updateHoverState();
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            backgroundBox.FadeColour(Color4.Black, 600, Easing.OutQuint);
+            updateHoverState();
             base.OnHoverLost(e);
         }
 
@@ -134,6 +155,20 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             updateStacking();
         }
 
+        private void updateHoverState()
+        {
+            if (IsHovered)
+            {
+                backgroundBox.FadeColour(colours.BlueLighter, 120, Easing.OutQuint);
+                backgroundBoxIntro.FadeColour(ColourInfo.GradientHorizontal(Color4.Black, colours.BlueLighter), 120, Easing.OutQuint);
+            }
+            else
+            {
+                backgroundBox.FadeColour(Color4.Black, 600, Easing.OutQuint);
+                backgroundBoxIntro.FadeColour(Color4.Black, 600, Easing.OutQuint);
+            }
+        }
+
         private void updateStacking()
         {
             // because only blueprints of objects which are alive (via pooling) are displayed in the timeline, it's feasible to do this every-update.

From 9c1320e18ba20c94637e35994d4ae526f3321f76 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 6 Apr 2021 14:33:46 +0900
Subject: [PATCH 08847/10326] Add test

---
 .../Formats/LegacyBeatmapEncoderTest.cs       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 0784109158..920cc36776 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -18,10 +18,14 @@ using osu.Game.IO;
 using osu.Game.IO.Serialization;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
+using osuTK;
 
 namespace osu.Game.Tests.Beatmaps.Formats
 {
@@ -45,6 +49,33 @@ namespace osu.Game.Tests.Beatmaps.Formats
             Assert.IsTrue(areComboColoursEqual(decodedAfterEncode.beatmapSkin.Configuration, decoded.beatmapSkin.Configuration));
         }
 
+        [Test]
+        public void TestEncodeMultiSegmentSliderWithFloatingPointError()
+        {
+            var beatmap = new Beatmap
+            {
+                HitObjects =
+                {
+                    new Slider
+                    {
+                        Position = new Vector2(0.6f),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(Vector2.Zero, PathType.Bezier),
+                            new PathControlPoint(new Vector2(0.5f)),
+                            new PathControlPoint(new Vector2(0.51f)), // This is actually on the same position as the previous one in legacy beatmaps (truncated to int).
+                            new PathControlPoint(new Vector2(1f), PathType.Bezier),
+                            new PathControlPoint(new Vector2(2f))
+                        })
+                    },
+                }
+            };
+
+            var decodedAfterEncode = decodeFromLegacy(encodeToLegacy((beatmap, new TestLegacySkin(beatmaps_resource_store, string.Empty))), string.Empty);
+            var decodedSlider = (Slider)decodedAfterEncode.beatmap.HitObjects[0];
+            Assert.That(decodedSlider.Path.ControlPoints.Count, Is.EqualTo(5));
+        }
+
         private bool areComboColoursEqual(IHasComboColours a, IHasComboColours b)
         {
             // equal to null, no need to SequenceEqual

From 53c1bc666cde003e07fd396d49a0b75ec77358f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 15:05:34 +0900
Subject: [PATCH 08848/10326] Make addition of nested GlobalActionContainer in
 OsuGameTestScene optional

---
 .../Visual/Navigation/OsuGameTestScene.cs     |  2 ++
 .../Visual/OsuManualInputManagerTestScene.cs  | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index bf5338d81a..f9a991f756 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -36,6 +36,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
         protected override bool UseFreshStoragePerRun => true;
 
+        protected override bool CreateNestedActionContainer => false;
+
         [BackgroundDependencyLoader]
         private void load(GameHost host)
         {
diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index b3073c8bea..7dad636da7 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -24,18 +24,31 @@ namespace osu.Game.Tests.Visual
         private readonly TriangleButton buttonTest;
         private readonly TriangleButton buttonLocal;
 
+        /// <summary>
+        /// Whether to create a nested container to handle <see cref="GlobalAction"/>s that result from local (manual) test input.
+        /// This should be disabled when instantiating an <see cref="OsuGame"/> instance else actions will be lost.
+        /// </summary>
+        protected virtual bool CreateNestedActionContainer => true;
+
         protected OsuManualInputManagerTestScene()
         {
             MenuCursorContainer cursorContainer;
 
+            CompositeDrawable mainContent =
+                (cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both })
+                .WithChild(content = new OsuTooltipContainer(cursorContainer.Cursor) { RelativeSizeAxes = Axes.Both });
+
+            if (CreateNestedActionContainer)
+            {
+                mainContent = new GlobalActionContainer(null, null).WithChild(mainContent);
+            }
+
             base.Content.AddRange(new Drawable[]
             {
                 InputManager = new ManualInputManager
                 {
                     UseParentInput = true,
-                    Child = new GlobalActionContainer(null, null)
-                        .WithChild((cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both })
-                            .WithChild(content = new OsuTooltipContainer(cursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }))
+                    Child = mainContent
                 },
                 new Container
                 {

From 316a557a99d159b1887508e353dd610be4f9053f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 15:34:34 +0900
Subject: [PATCH 08849/10326] Split select area background into own class to
 reduce hover state complexity

---
 .../Timeline/TimelineBlueprintContainer.cs    | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index d17a7551dd..eb26a0d16f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 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;
@@ -37,8 +38,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Bindable<HitObject> placement;
         private SelectionBlueprint placementBlueprint;
 
-        private Box backgroundBox;
-        private Box backgroundBoxIntro;
+        private SelectableAreaBackground backgroundBox;
 
         // we only care about checking vertical validity.
         // this allows selecting and dragging selections before time=0.
@@ -61,21 +61,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddRangeInternal(new[]
+            AddInternal(backgroundBox = new SelectableAreaBackground
             {
-                backgroundBoxIntro = new Box
-                {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 200,
-                    Origin = Anchor.TopRight,
-                    Alpha = 0.1f,
-                },
-                backgroundBox = new Box
-                {
-                    Colour = Color4.Black,
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0.1f,
-                }
+                Colour = Color4.Black
             });
         }
 
@@ -87,7 +75,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             placement = beatmap.PlacementObject.GetBoundCopy();
             placement.ValueChanged += placementChanged;
 
-            updateHoverState();
             FinishTransforms(true);
         }
 
@@ -115,13 +102,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool OnHover(HoverEvent e)
         {
-            updateHoverState();
+            backgroundBox.FadeColour(colours.BlueLighter, 120, Easing.OutQuint);
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            updateHoverState();
+            backgroundBox.FadeColour(Color4.Black, 600, Easing.OutQuint);
             base.OnHoverLost(e);
         }
 
@@ -155,20 +142,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             updateStacking();
         }
 
-        private void updateHoverState()
-        {
-            if (IsHovered)
-            {
-                backgroundBox.FadeColour(colours.BlueLighter, 120, Easing.OutQuint);
-                backgroundBoxIntro.FadeColour(ColourInfo.GradientHorizontal(Color4.Black, colours.BlueLighter), 120, Easing.OutQuint);
-            }
-            else
-            {
-                backgroundBox.FadeColour(Color4.Black, 600, Easing.OutQuint);
-                backgroundBoxIntro.FadeColour(Color4.Black, 600, Easing.OutQuint);
-            }
-        }
-
         private void updateStacking()
         {
             // because only blueprints of objects which are alive (via pooling) are displayed in the timeline, it's feasible to do this every-update.
@@ -237,6 +210,33 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
+        private class SelectableAreaBackground : CompositeDrawable
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                RelativeSizeAxes = Axes.Both;
+                Alpha = 0.1f;
+
+                AddRangeInternal(new[]
+                {
+                    // fade out over intro time, outside the valid time bounds.
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 200,
+                        Origin = Anchor.TopRight,
+                        Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0), Color4.White),
+                    },
+                    new Box
+                    {
+                        Colour = Color4.White,
+                        RelativeSizeAxes = Axes.Both,
+                    }
+                });
+            }
+        }
+
         internal class TimelineSelectionHandler : SelectionHandler
         {
             // for now we always allow movement. snapping is provided by the Timeline's "distance" snap implementation

From 9d0839be8ff83793883386c0701da939a5f7d954 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 15:35:07 +0900
Subject: [PATCH 08850/10326] Remove no longer necessary FinishTranforms call

---
 .../Compose/Components/Timeline/TimelineBlueprintContainer.cs   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index eb26a0d16f..be34c8d57e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -74,8 +74,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             placement = beatmap.PlacementObject.GetBoundCopy();
             placement.ValueChanged += placementChanged;
-
-            FinishTransforms(true);
         }
 
         private void placementChanged(ValueChangedEvent<HitObject> obj)

From 933c4010da4cf1f23d27326fca1c7ad9288ec1bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 16:17:20 +0900
Subject: [PATCH 08851/10326] Allow creating OnlineViewContainers with no
 placeholder button

---
 osu.Game/Online/OnlineViewContainer.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 8868f90524..4955aa9058 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -23,13 +23,17 @@ namespace osu.Game.Online
 
         private readonly string placeholderMessage;
 
-        private Placeholder placeholder;
+        private Drawable placeholder;
 
         private const double transform_duration = 300;
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
+        /// <summary>
+        /// Construct a new instance of an online view container.
+        /// </summary>
+        /// <param name="placeholderMessage">The message to display when not logged in. If empty, no button will display.</param>
         public OnlineViewContainer(string placeholderMessage)
         {
             this.placeholderMessage = placeholderMessage;
@@ -40,10 +44,10 @@ namespace osu.Game.Online
         [BackgroundDependencyLoader]
         private void load(IAPIProvider api)
         {
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 Content,
-                placeholder = new LoginPlaceholder(placeholderMessage),
+                placeholder = string.IsNullOrEmpty(placeholderMessage) ? Empty() : new LoginPlaceholder(placeholderMessage),
                 LoadingSpinner = new LoadingSpinner
                 {
                     Alpha = 0,

From dafa8bbe4e51935b5b7264e134018d064fd42503 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 16:17:38 +0900
Subject: [PATCH 08852/10326] Refactor BeatmapDetails to use GridContainer to
 keep a consistent layout

---
 osu.Game/Screens/Select/BeatmapDetails.cs | 173 ++++++++++++----------
 1 file changed, 91 insertions(+), 82 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 40029cc19a..41bde40221 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -8,8 +8,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Game.Online.API;
-using osu.Framework.Threading;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Screens.Select.Details;
@@ -28,11 +28,8 @@ namespace osu.Game.Screens.Select
         private const float spacing = 10;
         private const float transition_duration = 250;
 
-        private readonly FillFlowContainer top, statsFlow;
         private readonly AdvancedStats advanced;
-        private readonly DetailBox ratingsContainer;
         private readonly UserRatings ratings;
-        private readonly OsuScrollContainer metadataScroll;
         private readonly MetadataSection description, source, tags;
         private readonly Container failRetryContainer;
         private readonly FailRetryGraph failRetryGraph;
@@ -41,8 +38,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private ScheduledDelegate pendingBeatmapSwitch;
-
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
@@ -57,8 +52,7 @@ namespace osu.Game.Screens.Select
 
                 beatmap = value;
 
-                pendingBeatmapSwitch?.Cancel();
-                pendingBeatmapSwitch = Schedule(updateStatistics);
+                Scheduler.AddOnce(updateStatistics);
             }
         }
 
@@ -75,99 +69,115 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Horizontal = spacing },
-                    Children = new Drawable[]
+                    Child = new GridContainer
                     {
-                        top = new FillFlowContainer
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
                         {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Horizontal,
-                            Children = new Drawable[]
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension()
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
                             {
-                                statsFlow = new FillFlowContainer
+                                new FillFlowContainer
                                 {
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
-                                    Width = 0.5f,
-                                    Spacing = new Vector2(spacing),
-                                    Padding = new MarginPadding { Right = spacing / 2 },
-                                    Children = new[]
+                                    Direction = FillDirection.Horizontal,
+                                    Children = new Drawable[]
                                     {
-                                        new DetailBox
+                                        new FillFlowContainer
                                         {
-                                            Child = advanced = new AdvancedStats
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Width = 0.5f,
+                                            Spacing = new Vector2(spacing),
+                                            Padding = new MarginPadding { Right = spacing / 2 },
+                                            Children = new[]
+                                            {
+                                                new DetailBox().WithChild(advanced = new AdvancedStats
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Padding = new MarginPadding { Horizontal = spacing, Top = spacing * 2, Bottom = spacing },
+                                                }),
+                                                new DetailBox().WithChild(new OnlineViewContainer(string.Empty)
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    Height = 134,
+                                                    Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
+                                                    Child = ratings = new UserRatings
+                                                    {
+                                                        RelativeSizeAxes = Axes.Both,
+                                                    },
+                                                }),
+                                            },
+                                        },
+                                        new OsuScrollContainer
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Width = 0.5f,
+                                            ScrollbarVisible = false,
+                                            Padding = new MarginPadding { Left = spacing / 2 },
+                                            Child = new FillFlowContainer
                                             {
                                                 RelativeSizeAxes = Axes.X,
                                                 AutoSizeAxes = Axes.Y,
-                                                Padding = new MarginPadding { Horizontal = spacing, Top = spacing * 2, Bottom = spacing },
+                                                LayoutDuration = transition_duration,
+                                                LayoutEasing = Easing.OutQuad,
+                                                Spacing = new Vector2(spacing * 2),
+                                                Margin = new MarginPadding { Top = spacing * 2 },
+                                                Children = new[]
+                                                {
+                                                    description = new MetadataSection("Description"),
+                                                    source = new MetadataSection("Source"),
+                                                    tags = new MetadataSection("Tags"),
+                                                },
                                             },
                                         },
-                                        ratingsContainer = new DetailBox
-                                        {
-                                            Child = ratings = new UserRatings
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                Height = 134,
-                                                Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
-                                            },
-                                        },
-                                    },
-                                },
-                                metadataScroll = new OsuScrollContainer
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    Width = 0.5f,
-                                    ScrollbarVisible = false,
-                                    Padding = new MarginPadding { Left = spacing / 2 },
-                                    Child = new FillFlowContainer
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        LayoutDuration = transition_duration,
-                                        LayoutEasing = Easing.OutQuad,
-                                        Spacing = new Vector2(spacing * 2),
-                                        Margin = new MarginPadding { Top = spacing * 2 },
-                                        Children = new[]
-                                        {
-                                            description = new MetadataSection("Description"),
-                                            source = new MetadataSection("Source"),
-                                            tags = new MetadataSection("Tags"),
-                                        },
                                     },
                                 },
                             },
-                        },
-                        failRetryContainer = new OnlineViewContainer("Sign in to view more details")
-                        {
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            RelativeSizeAxes = Axes.X,
-                            Children = new Drawable[]
+                            new Drawable[]
                             {
-                                new OsuSpriteText
-                                {
-                                    Text = "Points of Failure",
-                                    Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
-                                },
-                                failRetryGraph = new FailRetryGraph
+                                failRetryContainer = new OnlineViewContainer("Sign in to view more details")
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Padding = new MarginPadding { Top = 14 + spacing / 2 },
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Text = "Points of Failure",
+                                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
+                                        },
+                                        failRetryGraph = new FailRetryGraph
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Padding = new MarginPadding { Top = 14 + spacing / 2 },
+                                        },
+                                        loading = new LoadingLayer(true)
+                                    },
                                 },
-                                loading = new LoadingLayer(true)
-                            },
-                        },
-                    },
+                            }
+                        }
+                    }
                 },
             };
         }
 
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
+        private IBindable<APIState> apiOnlineState;
 
-            metadataScroll.Height = statsFlow.DrawHeight;
-            failRetryContainer.Height = DrawHeight - Padding.TotalVertical - (top.DrawHeight + spacing / 2);
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            apiOnlineState = api.State.GetBoundCopy();
+            apiOnlineState.BindValueChanged(state =>
+            {
+                Scheduler.AddOnce(updateStatistics);
+            });
         }
 
         private void updateStatistics()
@@ -185,7 +195,7 @@ namespace osu.Game.Screens.Select
             }
 
             // for now, let's early abort if an OnlineBeatmapID is not present (should have been populated at import time).
-            if (Beatmap?.OnlineBeatmapID == null)
+            if (Beatmap?.OnlineBeatmapID == null || apiOnlineState.Value != APIState.Online)
             {
                 updateMetrics();
                 return;
@@ -237,17 +247,16 @@ namespace osu.Game.Screens.Select
             var hasRatings = beatmap?.BeatmapSet?.Metrics?.Ratings?.Any() ?? false;
             var hasRetriesFails = (beatmap?.Metrics?.Retries?.Any() ?? false) || (beatmap?.Metrics?.Fails?.Any() ?? false);
 
-            bool isOnline = api.State.Value == APIState.Online;
-
-            if (hasRatings && isOnline)
+            if (hasRatings)
             {
                 ratings.Metrics = beatmap.BeatmapSet.Metrics;
-                ratingsContainer.FadeIn(transition_duration);
+                ratings.FadeIn(transition_duration);
             }
             else
             {
+                // loading or just has no data server-side.
                 ratings.Metrics = new BeatmapSetMetrics { Ratings = new int[10] };
-                ratingsContainer.FadeTo(isOnline ? 0.25f : 0, transition_duration);
+                ratings.FadeTo(0.25f, transition_duration);
             }
 
             if (hasRetriesFails)

From 59e6c46644d89d19ad1915db2d657367153246fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 16:23:27 +0900
Subject: [PATCH 08853/10326] Remove unnecessary online state logic

---
 osu.Game/Screens/Select/BeatmapDetails.cs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 41bde40221..86a21dcc42 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using System.Linq;
-using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Extensions.Color4Extensions;
@@ -167,19 +166,6 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        private IBindable<APIState> apiOnlineState;
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            apiOnlineState = api.State.GetBoundCopy();
-            apiOnlineState.BindValueChanged(state =>
-            {
-                Scheduler.AddOnce(updateStatistics);
-            });
-        }
-
         private void updateStatistics()
         {
             advanced.Beatmap = Beatmap;
@@ -195,7 +181,7 @@ namespace osu.Game.Screens.Select
             }
 
             // for now, let's early abort if an OnlineBeatmapID is not present (should have been populated at import time).
-            if (Beatmap?.OnlineBeatmapID == null || apiOnlineState.Value != APIState.Online)
+            if (Beatmap?.OnlineBeatmapID == null)
             {
                 updateMetrics();
                 return;

From 1934e8e1fe0c2c66cecbacba3db59299f839a915 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 16:29:07 +0900
Subject: [PATCH 08854/10326] Fix loading layer being in the wrong place

---
 osu.Game/Screens/Select/BeatmapDetails.cs | 145 +++++++++++-----------
 1 file changed, 74 insertions(+), 71 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 86a21dcc42..46aa568039 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -68,99 +68,102 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Horizontal = spacing },
-                    Child = new GridContainer
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        RowDimensions = new[]
+                        new GridContainer
                         {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension()
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
+                            RelativeSizeAxes = Axes.Both,
+                            RowDimensions = new[]
                             {
-                                new FillFlowContainer
+                                new Dimension(GridSizeMode.AutoSize),
+                                new Dimension()
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Direction = FillDirection.Horizontal,
-                                    Children = new Drawable[]
+                                    new FillFlowContainer
                                     {
-                                        new FillFlowContainer
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Direction = FillDirection.Horizontal,
+                                        Children = new Drawable[]
                                         {
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Width = 0.5f,
-                                            Spacing = new Vector2(spacing),
-                                            Padding = new MarginPadding { Right = spacing / 2 },
-                                            Children = new[]
-                                            {
-                                                new DetailBox().WithChild(advanced = new AdvancedStats
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Padding = new MarginPadding { Horizontal = spacing, Top = spacing * 2, Bottom = spacing },
-                                                }),
-                                                new DetailBox().WithChild(new OnlineViewContainer(string.Empty)
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    Height = 134,
-                                                    Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
-                                                    Child = ratings = new UserRatings
-                                                    {
-                                                        RelativeSizeAxes = Axes.Both,
-                                                    },
-                                                }),
-                                            },
-                                        },
-                                        new OsuScrollContainer
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Width = 0.5f,
-                                            ScrollbarVisible = false,
-                                            Padding = new MarginPadding { Left = spacing / 2 },
-                                            Child = new FillFlowContainer
+                                            new FillFlowContainer
                                             {
                                                 RelativeSizeAxes = Axes.X,
                                                 AutoSizeAxes = Axes.Y,
-                                                LayoutDuration = transition_duration,
-                                                LayoutEasing = Easing.OutQuad,
-                                                Spacing = new Vector2(spacing * 2),
-                                                Margin = new MarginPadding { Top = spacing * 2 },
+                                                Width = 0.5f,
+                                                Spacing = new Vector2(spacing),
+                                                Padding = new MarginPadding { Right = spacing / 2 },
                                                 Children = new[]
                                                 {
-                                                    description = new MetadataSection("Description"),
-                                                    source = new MetadataSection("Source"),
-                                                    tags = new MetadataSection("Tags"),
+                                                    new DetailBox().WithChild(advanced = new AdvancedStats
+                                                    {
+                                                        RelativeSizeAxes = Axes.X,
+                                                        AutoSizeAxes = Axes.Y,
+                                                        Padding = new MarginPadding { Horizontal = spacing, Top = spacing * 2, Bottom = spacing },
+                                                    }),
+                                                    new DetailBox().WithChild(new OnlineViewContainer(string.Empty)
+                                                    {
+                                                        RelativeSizeAxes = Axes.X,
+                                                        Height = 134,
+                                                        Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
+                                                        Child = ratings = new UserRatings
+                                                        {
+                                                            RelativeSizeAxes = Axes.Both,
+                                                        },
+                                                    }),
+                                                },
+                                            },
+                                            new OsuScrollContainer
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Width = 0.5f,
+                                                ScrollbarVisible = false,
+                                                Padding = new MarginPadding { Left = spacing / 2 },
+                                                Child = new FillFlowContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    LayoutDuration = transition_duration,
+                                                    LayoutEasing = Easing.OutQuad,
+                                                    Spacing = new Vector2(spacing * 2),
+                                                    Margin = new MarginPadding { Top = spacing * 2 },
+                                                    Children = new[]
+                                                    {
+                                                        description = new MetadataSection("Description"),
+                                                        source = new MetadataSection("Source"),
+                                                        tags = new MetadataSection("Tags"),
+                                                    },
                                                 },
                                             },
                                         },
                                     },
                                 },
-                            },
-                            new Drawable[]
-                            {
-                                failRetryContainer = new OnlineViewContainer("Sign in to view more details")
+                                new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Children = new Drawable[]
+                                    failRetryContainer = new OnlineViewContainer("Sign in to view more details")
                                     {
-                                        new OsuSpriteText
+                                        RelativeSizeAxes = Axes.Both,
+                                        Children = new Drawable[]
                                         {
-                                            Text = "Points of Failure",
-                                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
+                                            new OsuSpriteText
+                                            {
+                                                Text = "Points of Failure",
+                                                Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
+                                            },
+                                            failRetryGraph = new FailRetryGraph
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Padding = new MarginPadding { Top = 14 + spacing / 2 },
+                                            },
                                         },
-                                        failRetryGraph = new FailRetryGraph
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Padding = new MarginPadding { Top = 14 + spacing / 2 },
-                                        },
-                                        loading = new LoadingLayer(true)
                                     },
-                                },
+                                }
                             }
-                        }
+                        },
+                        loading = new LoadingLayer(true)
                     }
                 },
             };

From 37e30b00bf6d6a494847565036d3538fb1f1e939 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 6 Apr 2021 16:39:02 +0900
Subject: [PATCH 08855/10326] Refactor to keep a consistent API

---
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs  | 32 ++++---------------
 .../Rulesets/Difficulty/Skills/StrainSkill.cs | 13 --------
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index ebd389d823..9f0fb987a7 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -19,12 +19,9 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected readonly ReverseQueue<DifficultyHitObject> Previous;
 
         /// <summary>
-        /// Soft capacity of the <see cref="Previous"/> queue.
-        /// <see cref="Previous"/> will automatically resize if it exceeds capacity, but will do so at a very slight performance impact.
-        /// The actual capacity will be set to this value + 1 to allow for storage of the current object before the next can be processed.
-        /// Setting to zero (default) will cause <see cref="Previous"/> to be uninstanciated.
+        /// Number of previous <see cref="DifficultyHitObject"/>s to keep inside the <see cref="Previous"/> queue.
         /// </summary>
-        protected virtual int PreviousCollectionSoftCapacity => 0;
+        protected virtual int HistoryLength => 1;
 
         /// <summary>
         /// Mods for use in skill calculations.
@@ -36,32 +33,17 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected Skill(Mod[] mods)
         {
             this.mods = mods;
-
-            if (PreviousCollectionSoftCapacity > 0)
-                Previous = new ReverseQueue<DifficultyHitObject>(PreviousCollectionSoftCapacity + 1);
+            Previous = new ReverseQueue<DifficultyHitObject>(HistoryLength + 1);
         }
 
         internal void ProcessInternal(DifficultyHitObject current)
         {
-            RemoveExtraneousHistory(current);
+            while (Previous.Count > HistoryLength)
+                Previous.Dequeue();
+
             Process(current);
-            AddToHistory(current);
-        }
 
-        /// <summary>
-        /// Remove objects from <see cref="Previous"/> that are no longer needed for calculations from the current object onwards.
-        /// </summary>
-        /// <param name="current">The <see cref="DifficultyHitObject"/> to be processed.</param>
-        protected virtual void RemoveExtraneousHistory(DifficultyHitObject current)
-        {
-        }
-
-        /// <summary>
-        /// Add the current <see cref="DifficultyHitObject"/> to the <see cref="Previous"/> queue (if required).
-        /// </summary>
-        /// <param name="current">The <see cref="DifficultyHitObject"/> that was just processed.</param>
-        protected virtual void AddToHistory(DifficultyHitObject current)
-        {
+            Previous.Enqueue(current);
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
index 16816be35c..71cee36812 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected abstract double SkillMultiplier { get; }
 
-        protected override int PreviousCollectionSoftCapacity => 1;
-
         /// <summary>
         /// Determines how quickly strain decays for the given skill.
         /// For example a value of 0.15 indicates that strain decays to 15% of its original value in one second.
@@ -54,17 +52,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         {
         }
 
-        protected override void RemoveExtraneousHistory(DifficultyHitObject current)
-        {
-            while (Previous.Count > 1)
-                Previous.Dequeue();
-        }
-
-        protected override void AddToHistory(DifficultyHitObject current)
-        {
-            Previous.Enqueue(current);
-        }
-
         /// <summary>
         /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
         /// </summary>

From f08b340e811ba6fd7ec5cfcc3f8b854002ab62bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 16:49:13 +0900
Subject: [PATCH 08856/10326] Add nullability hinting

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index ab8a40dbe3..cda962f0ab 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -12,11 +13,12 @@ namespace osu.Game.Input.Bindings
 {
     public class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput
     {
+        [CanBeNull]
         private readonly GlobalInputManager globalInputManager;
 
         private readonly Drawable handler;
 
-        public GlobalActionContainer(OsuGameBase game, GlobalInputManager globalInputManager)
+        public GlobalActionContainer(OsuGameBase game, [CanBeNull] GlobalInputManager globalInputManager)
             : base(matchingMode: KeyCombinationMatchingMode.Modifiers)
         {
             this.globalInputManager = globalInputManager;

From 899d708dacf0394ee116931b5425fbce05cb93cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 17:09:51 +0900
Subject: [PATCH 08857/10326] Move loading layer up one level to correct
 padding

---
 osu.Game/Screens/Select/BeatmapDetails.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 46aa568039..ca0af2f3f5 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -163,9 +163,9 @@ namespace osu.Game.Screens.Select
                                 }
                             }
                         },
-                        loading = new LoadingLayer(true)
-                    }
+                    },
                 },
+                loading = new LoadingLayer(true)
             };
         }
 

From 3113eefcf6ab960fcde6a9aff369591dc3f129ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 17:12:00 +0900
Subject: [PATCH 08858/10326] Don't attempt to load content when not online

---
 osu.Game/Screens/Select/BeatmapDetails.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index ca0af2f3f5..26da4279f0 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Select
             }
 
             // for now, let's early abort if an OnlineBeatmapID is not present (should have been populated at import time).
-            if (Beatmap?.OnlineBeatmapID == null)
+            if (Beatmap?.OnlineBeatmapID == null || api.State.Value == APIState.Offline)
             {
                 updateMetrics();
                 return;

From d81f270e21f81f5ff91f5a5d27a04e30687d2543 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 5 Apr 2021 18:01:16 +0200
Subject: [PATCH 08859/10326] Always encode perfect curves as explicit segments

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 5eb5fcdfa0..0bb1aa873f 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -333,9 +333,10 @@ namespace osu.Game.Beatmaps.Formats
 
                     // Explicit segments have a new format in which the type is injected into the middle of the control point string.
                     // To preserve compatibility with osu-stable as much as possible, explicit segments with the same type are converted to use implicit segments by duplicating the control point.
-                    bool needsExplicitSegment = point.Type.Value != lastType;
+                    // One exception are consecutive perfect curves, which aren't supported in osu-stable
+                    bool needsExplicitSegment = point.Type.Value != lastType || point.Type.Value == PathType.PerfectCurve;
 
-                    // One exception to this is when the last two control points of the last segment were duplicated. This is not a scenario supported by osu!stable.
+                    // Another exception to this is when the last two control points of the last segment were duplicated. This is not a scenario supported by osu!stable.
                     // Lazer does not add implicit segments for the last two control points of _any_ explicit segment, so an explicit segment is forced in order to maintain consistency with the decoder.
                     if (i > 1)
                     {

From dd902441b098983802cb1bbda3fae0ad8c86fa5f Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 5 Apr 2021 17:21:45 +0200
Subject: [PATCH 08860/10326] Add tests for consecutive perfect-curve segments

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 30 +++++++++++++++++++
 .../Resources/multi-segment-slider.osu        |  7 +++++
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index fb18be3ae1..0f82492e51 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -740,6 +740,36 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(fifth.ControlPoints[5].Type.Value, Is.EqualTo(PathType.Bezier));
                 Assert.That(fifth.ControlPoints[6].Position.Value, Is.EqualTo(new Vector2(5, 5)));
                 Assert.That(fifth.ControlPoints[6].Type.Value, Is.EqualTo(null));
+
+                // Implicit perfect-curve multi-segment(Should convert to bezier to match stable)
+                var sixth = ((IHasPath)decoded.HitObjects[5]).Path;
+
+                Assert.That(sixth.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(sixth.ControlPoints[0].Type.Value == PathType.Bezier);
+                Assert.That(sixth.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(75, 145)));
+                Assert.That(sixth.ControlPoints[1].Type.Value == null);
+                Assert.That(sixth.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(170, 75)));
+
+                Assert.That(sixth.ControlPoints[2].Type.Value == PathType.Bezier);
+                Assert.That(sixth.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(300, 145)));
+                Assert.That(sixth.ControlPoints[3].Type.Value == null);
+                Assert.That(sixth.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(410, 20)));
+                Assert.That(sixth.ControlPoints[4].Type.Value == null);
+
+                // Explicit perfect-curve multi-segment(Should not convert to bezier)
+                var seventh = ((IHasPath)decoded.HitObjects[6]).Path;
+
+                Assert.That(seventh.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(seventh.ControlPoints[0].Type.Value == PathType.PerfectCurve);
+                Assert.That(seventh.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(75, 145)));
+                Assert.That(seventh.ControlPoints[1].Type.Value == null);
+                Assert.That(seventh.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(170, 75)));
+
+                Assert.That(seventh.ControlPoints[2].Type.Value == PathType.PerfectCurve);
+                Assert.That(seventh.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(300, 145)));
+                Assert.That(seventh.ControlPoints[3].Type.Value == null);
+                Assert.That(seventh.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(410, 20)));
+                Assert.That(seventh.ControlPoints[4].Type.Value == null);
             }
         }
     }
diff --git a/osu.Game.Tests/Resources/multi-segment-slider.osu b/osu.Game.Tests/Resources/multi-segment-slider.osu
index cc86710067..135132e35c 100644
--- a/osu.Game.Tests/Resources/multi-segment-slider.osu
+++ b/osu.Game.Tests/Resources/multi-segment-slider.osu
@@ -15,3 +15,10 @@ osu file format v128
 
 // Last control point in segment duplicated
 0,0,5000,2,0,B|1:1|2:2|3:3|3:3|B|4:4|5:5,2,200
+
+// Implicit perfect-curve multi-segment (Should convert to bezier to match stable)
+0,0,6000,2,0,P|75:145|170:75|170:75|300:145|410:20,1,475,0:0:0:0:
+
+// Explicit perfect-curve multi-segment (Should not convert to bezier)
+0,0,7000,2,0,P|75:145|P|170:75|300:145|410:20,1,650,0:0:0:0:
+
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 0bb1aa873f..da44b96ed3 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -333,7 +333,7 @@ namespace osu.Game.Beatmaps.Formats
 
                     // Explicit segments have a new format in which the type is injected into the middle of the control point string.
                     // To preserve compatibility with osu-stable as much as possible, explicit segments with the same type are converted to use implicit segments by duplicating the control point.
-                    // One exception are consecutive perfect curves, which aren't supported in osu-stable
+                    // One exception are consecutive perfect curves, which aren't supported in osu!stable and can lead to decoding issues if encoded as implicit segments
                     bool needsExplicitSegment = point.Type.Value != lastType || point.Type.Value == PathType.PerfectCurve;
 
                     // Another exception to this is when the last two control points of the last segment were duplicated. This is not a scenario supported by osu!stable.

From d5ba77b2c2b5984b279c7809a1f58878c92e0936 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 6 Apr 2021 21:22:28 +0900
Subject: [PATCH 08861/10326] Add spectating user state

---
 osu.Game/Online/Multiplayer/MultiplayerUserState.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerUserState.cs b/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
index e54c71cd85..c467ff84bb 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
@@ -55,5 +55,10 @@ namespace osu.Game.Online.Multiplayer
         /// The user is currently viewing results. This is a reserved state, and is set by the server.
         /// </summary>
         Results,
+
+        /// <summary>
+        /// The user is currently spectating this room.
+        /// </summary>
+        Spectating
     }
 }

From 6de91d7b6bb38caa25ea455a2868b548b083d5ab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 6 Apr 2021 21:37:21 +0900
Subject: [PATCH 08862/10326] Add spectate button + test

---
 .../TestSceneMultiplayerSpectateButton.cs     | 53 +++++++++++
 .../Multiplayer/StatefulMultiplayerClient.cs  | 27 ++++++
 .../Match/MultiplayerSpectateButton.cs        | 92 +++++++++++++++++++
 3 files changed, 172 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
new file mode 100644
index 0000000000..730fee2fba
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerSpectateButton : MultiplayerTestScene
+    {
+        private MultiplayerSpectateButton button;
+        private IDisposable readyClickOperation;
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Child = button = new MultiplayerSpectateButton
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(200, 50),
+                OnSpectateClick = async () =>
+                {
+                    readyClickOperation = OngoingOperationTracker.BeginOperation();
+                    await Client.ToggleSpectate();
+                    readyClickOperation.Dispose();
+                }
+            };
+        });
+
+        [TestCase(MultiplayerUserState.Idle)]
+        [TestCase(MultiplayerUserState.Ready)]
+        public void TestToggleWhenIdle(MultiplayerUserState initialState)
+        {
+            addClickButtonStep();
+            AddAssert("user is spectating", () => Client.Room?.Users[0].State == MultiplayerUserState.Spectating);
+
+            addClickButtonStep();
+            AddAssert("user is idle", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
+        }
+
+        private void addClickButtonStep() => AddStep("click button", () =>
+        {
+            InputManager.MoveMouseTo(button);
+            InputManager.Click(MouseButton.Left);
+        });
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 0f7050596f..2ddc10db0f 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -249,6 +249,33 @@ namespace osu.Game.Online.Multiplayer
             }
         }
 
+        /// <summary>
+        /// Toggles the <see cref="LocalUser"/>'s spectating state.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">If a toggle of the spectating state is not valid at this time.</exception>
+        public async Task ToggleSpectate()
+        {
+            var localUser = LocalUser;
+
+            if (localUser == null)
+                return;
+
+            switch (localUser.State)
+            {
+                case MultiplayerUserState.Idle:
+                case MultiplayerUserState.Ready:
+                    await ChangeState(MultiplayerUserState.Spectating).ConfigureAwait(false);
+                    return;
+
+                case MultiplayerUserState.Spectating:
+                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
+                    return;
+
+                default:
+                    throw new InvalidOperationException($"Cannot toggle spectate when in {localUser.State}");
+            }
+        }
+
         public abstract Task TransferHost(int userId);
 
         public abstract Task ChangeSettings(MultiplayerRoomSettings settings);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
new file mode 100644
index 0000000000..50be7719d9
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
@@ -0,0 +1,92 @@
+// Copyright (c) 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.Diagnostics;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Backgrounds;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+using osuTK;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
+{
+    public class MultiplayerSpectateButton : MultiplayerRoomComposite
+    {
+        public Action OnSpectateClick
+        {
+            set => button.Action = value;
+        }
+
+        [Resolved]
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private IBindable<bool> operationInProgress;
+
+        private readonly ButtonWithTrianglesExposed button;
+
+        public MultiplayerSpectateButton()
+        {
+            InternalChild = button = new ButtonWithTrianglesExposed
+            {
+                RelativeSizeAxes = Axes.Both,
+                Size = Vector2.One,
+                Enabled = { Value = true },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            operationInProgress = ongoingOperationTracker.InProgress.GetBoundCopy();
+            operationInProgress.BindValueChanged(_ => updateState());
+        }
+
+        protected override void OnRoomUpdated()
+        {
+            base.OnRoomUpdated();
+
+            updateState();
+        }
+
+        private void updateState()
+        {
+            var localUser = Client.LocalUser;
+
+            if (localUser == null)
+                return;
+
+            Debug.Assert(Room != null);
+
+            switch (localUser.State)
+            {
+                default:
+                    button.Text = "Spectate";
+                    button.BackgroundColour = colours.Blue;
+                    button.Triangles.ColourDark = colours.Blue;
+                    button.Triangles.ColourLight = colours.BlueLight;
+                    break;
+
+                case MultiplayerUserState.Spectating:
+                    button.Text = "Stop spectating";
+                    button.BackgroundColour = colours.Red;
+                    button.Triangles.ColourDark = colours.Red;
+                    button.Triangles.ColourLight = colours.RedLight;
+                    break;
+            }
+
+            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
+        }
+
+        private class ButtonWithTrianglesExposed : TriangleButton
+        {
+            public new Triangles Triangles => base.Triangles;
+        }
+    }
+}

From ef658e9597484f008119240601b5921e6713b563 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 15:54:16 +0900
Subject: [PATCH 08863/10326] Fix invalid array definition in slnf

---
 osu.Desktop.slnf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop.slnf b/osu.Desktop.slnf
index 68541dbcfc..503e5935f5 100644
--- a/osu.Desktop.slnf
+++ b/osu.Desktop.slnf
@@ -24,7 +24,7 @@
       "Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling\\osu.Game.Rulesets.EmptyScrolling.csproj",
       "Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling.Tests\\osu.Game.Rulesets.EmptyScrolling.Tests.csproj",
       "Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon\\osu.Game.Rulesets.Pippidon.csproj",
-      "Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon.Tests\\osu.Game.Rulesets.Pippidon.Tests.csproj",
+      "Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon.Tests\\osu.Game.Rulesets.Pippidon.Tests.csproj"
     ]
   }
-}
\ No newline at end of file
+}

From 1f57b6884d0e944907cf4ce6f2cc12c157fc32c6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 16:19:10 +0900
Subject: [PATCH 08864/10326] Add ready button to test scene

---
 .../TestSceneMultiplayerSpectateButton.cs     | 121 ++++++++++++++++--
 1 file changed, 108 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index 730fee2fba..52a1909396 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -2,10 +2,22 @@
 // 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;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Platform;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
+using osu.Game.Tests.Resources;
 using osuTK;
 using osuTK.Input;
 
@@ -13,22 +25,96 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiplayerSpectateButton : MultiplayerTestScene
     {
-        private MultiplayerSpectateButton button;
+        private MultiplayerSpectateButton spectateButton;
+        private MultiplayerReadyButton readyButton;
+
+        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
+
+        private BeatmapSetInfo importedSet;
+        private BeatmapManager beatmaps;
+        private RulesetStore rulesets;
+
         private IDisposable readyClickOperation;
 
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        public TestSceneMultiplayerSpectateButton()
+        {
+            base.Content.Add(content = new Container
+            {
+                RelativeSizeAxes = Axes.Both
+            });
+        }
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+            return dependencies;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, AudioManager audio)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+
+            var beatmapTracker = new OnlinePlayBeatmapAvailablilityTracker { SelectedItem = { BindTarget = selectedItem } };
+            base.Content.Add(beatmapTracker);
+            Dependencies.Cache(beatmapTracker);
+
+            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
+        }
+
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
-            Child = button = new MultiplayerSpectateButton
+            importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+            Beatmap.Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First());
+            selectedItem.Value = new PlaylistItem
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(200, 50),
-                OnSpectateClick = async () =>
+                Beatmap = { Value = Beatmap.Value.BeatmapInfo },
+                Ruleset = { Value = Beatmap.Value.BeatmapInfo.Ruleset },
+            };
+
+            Child = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
                 {
-                    readyClickOperation = OngoingOperationTracker.BeginOperation();
-                    await Client.ToggleSpectate();
-                    readyClickOperation.Dispose();
+                    spectateButton = new MultiplayerSpectateButton
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(200, 50),
+                        OnSpectateClick = async () =>
+                        {
+                            readyClickOperation = OngoingOperationTracker.BeginOperation();
+                            await Client.ToggleSpectate();
+                            readyClickOperation.Dispose();
+                        }
+                    },
+                    readyButton = new MultiplayerReadyButton
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(200, 50),
+                        OnReadyClick = async () =>
+                        {
+                            readyClickOperation = OngoingOperationTracker.BeginOperation();
+
+                            if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
+                            {
+                                await Client.StartMatch();
+                                return;
+                            }
+
+                            await Client.ToggleReady();
+                            readyClickOperation.Dispose();
+                        }
+                    }
                 }
             };
         });
@@ -37,17 +123,26 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [TestCase(MultiplayerUserState.Ready)]
         public void TestToggleWhenIdle(MultiplayerUserState initialState)
         {
-            addClickButtonStep();
+            addClickSpectateButtonStep();
             AddAssert("user is spectating", () => Client.Room?.Users[0].State == MultiplayerUserState.Spectating);
 
-            addClickButtonStep();
+            addClickSpectateButtonStep();
             AddAssert("user is idle", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
         }
 
-        private void addClickButtonStep() => AddStep("click button", () =>
+        private void addClickSpectateButtonStep() => AddStep("click spectate button", () =>
         {
-            InputManager.MoveMouseTo(button);
+            InputManager.MoveMouseTo(spectateButton);
             InputManager.Click(MouseButton.Left);
         });
+
+        private void addClickReadyButtonStep() => AddStep("click ready button", () =>
+        {
+            InputManager.MoveMouseTo(readyButton);
+            InputManager.Click(MouseButton.Left);
+        });
+
+        private void assertReadyButtonEnablement(bool shouldBeEnabled)
+            => AddAssert($"ready button {(shouldBeEnabled ? "is" : "is not")} enabled", () => readyButton.ChildrenOfType<OsuButton>().Single().Enabled.Value == shouldBeEnabled);
     }
 }

From 6be9c9f0f4e8188d4e50b55e26f0025cc2d06292 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 16:35:36 +0900
Subject: [PATCH 08865/10326] Link up ready button to spectate state

---
 .../TestSceneMultiplayerSpectateButton.cs     | 51 +++++++++++++++++++
 .../Match/MultiplayerReadyButton.cs           | 11 +++-
 .../Multiplayer/TestMultiplayerClient.cs      |  6 +++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index 52a1909396..631511eac5 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -18,6 +18,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
+using osu.Game.Users;
 using osuTK;
 using osuTK.Input;
 
@@ -119,6 +120,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             };
         });
 
+        [Test]
+        public void TestEnabledWhenRoomOpen()
+        {
+            assertSpectateButtonEnablement(true);
+        }
+
         [TestCase(MultiplayerUserState.Idle)]
         [TestCase(MultiplayerUserState.Ready)]
         public void TestToggleWhenIdle(MultiplayerUserState initialState)
@@ -130,6 +137,47 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("user is idle", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
         }
 
+        [TestCase(MultiplayerRoomState.WaitingForLoad)]
+        [TestCase(MultiplayerRoomState.Playing)]
+        [TestCase(MultiplayerRoomState.Closed)]
+        public void TestDisabledDuringGameplayOrClosed(MultiplayerRoomState roomState)
+        {
+            AddStep($"change user to {roomState}", () => Client.ChangeRoomState(roomState));
+            assertSpectateButtonEnablement(false);
+        }
+
+        [Test]
+        public void TestReadyButtonDisabledWhenHostAndNoReadyUsers()
+        {
+            addClickSpectateButtonStep();
+            assertReadyButtonEnablement(false);
+        }
+
+        [Test]
+        public void TestReadyButtonEnabledWhenHostAndUsersReady()
+        {
+            AddStep("add user", () => Client.AddUser(new User { Id = 55 }));
+            AddStep("set user ready", () => Client.ChangeUserState(55, MultiplayerUserState.Ready));
+
+            addClickSpectateButtonStep();
+            assertReadyButtonEnablement(true);
+        }
+
+        [Test]
+        public void TestReadyButtonDisabledWhenNotHostAndUsersReady()
+        {
+            AddStep("add user and transfer host", () =>
+            {
+                Client.AddUser(new User { Id = 55 });
+                Client.TransferHost(55);
+            });
+
+            AddStep("set user ready", () => Client.ChangeUserState(55, MultiplayerUserState.Ready));
+
+            addClickSpectateButtonStep();
+            assertReadyButtonEnablement(false);
+        }
+
         private void addClickSpectateButtonStep() => AddStep("click spectate button", () =>
         {
             InputManager.MoveMouseTo(spectateButton);
@@ -142,6 +190,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             InputManager.Click(MouseButton.Left);
         });
 
+        private void assertSpectateButtonEnablement(bool shouldBeEnabled)
+            => AddAssert($"spectate button {(shouldBeEnabled ? "is" : "is not")} enabled", () => spectateButton.ChildrenOfType<OsuButton>().Single().Enabled.Value == shouldBeEnabled);
+
         private void assertReadyButtonEnablement(bool shouldBeEnabled)
             => AddAssert($"ready button {(shouldBeEnabled ? "is" : "is not")} enabled", () => readyButton.ChildrenOfType<OsuButton>().Single().Enabled.Value == shouldBeEnabled);
     }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index c9fb234ccc..6919be2d56 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -78,8 +78,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             Debug.Assert(Room != null);
 
             int newCountReady = Room.Users.Count(u => u.State == MultiplayerUserState.Ready);
+            int newCountTotal = Room.Users.Count(u => u.State != MultiplayerUserState.Spectating);
 
-            string countText = $"({newCountReady} / {Room.Users.Count} ready)";
+            string countText = $"({newCountReady} / {newCountTotal} ready)";
 
             switch (localUser.State)
             {
@@ -88,6 +89,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     updateButtonColour(true);
                     break;
 
+                case MultiplayerUserState.Spectating:
                 case MultiplayerUserState.Ready:
                     if (Room?.Host?.Equals(localUser) == true)
                     {
@@ -105,6 +107,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
 
+            // When the local user is the host and spectating the match, the "start match" state should be enabled.
+            if (localUser.State == MultiplayerUserState.Spectating)
+            {
+                button.Enabled.Value &= Room?.Host?.Equals(localUser) == true;
+                button.Enabled.Value &= newCountReady > 0;
+            }
+
             if (newCountReady != countReady)
             {
                 countReady = newCountReady;
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 09fcc1ff47..4c954c7d27 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -58,6 +58,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
         }
 
+        public void ChangeRoomState(MultiplayerRoomState newState)
+        {
+            Debug.Assert(Room != null);
+            ((IMultiplayerClient)this).RoomStateChanged(newState);
+        }
+
         public void ChangeUserState(int userId, MultiplayerUserState newState)
         {
             Debug.Assert(Room != null);

From f5667125a017e56d153c388638c2f2a13d624389 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 16:37:43 +0900
Subject: [PATCH 08866/10326] Remove unnecessary method

---
 .../Multiplayer/TestSceneMultiplayerSpectateButton.cs       | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index 631511eac5..8fe1f99e1d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -184,12 +184,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             InputManager.Click(MouseButton.Left);
         });
 
-        private void addClickReadyButtonStep() => AddStep("click ready button", () =>
-        {
-            InputManager.MoveMouseTo(readyButton);
-            InputManager.Click(MouseButton.Left);
-        });
-
         private void assertSpectateButtonEnablement(bool shouldBeEnabled)
             => AddAssert($"spectate button {(shouldBeEnabled ? "is" : "is not")} enabled", () => spectateButton.ChildrenOfType<OsuButton>().Single().Enabled.Value == shouldBeEnabled);
 

From c744f77cfafdab402bbc1e34793402baf6c0995c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 16:40:24 +0900
Subject: [PATCH 08867/10326] Add participant panel state

---
 .../Multiplayer/TestSceneMultiplayerParticipantsList.cs    | 7 +++++++
 .../OnlinePlay/Multiplayer/Participants/StateDisplay.cs    | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index e713cff233..7f8f04b718 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -126,6 +126,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("ready mark invisible", () => !this.ChildrenOfType<StateDisplay>().Single().IsPresent);
         }
 
+        [Test]
+        public void TestToggleSpectateState()
+        {
+            AddStep("make user spectating", () => Client.ChangeState(MultiplayerUserState.Spectating));
+            AddStep("make user idle", () => Client.ChangeState(MultiplayerUserState.Idle));
+        }
+
         [Test]
         public void TestCrownChangesStateWhenHostTransferred()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index c571b51c83..e6a407acec 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
@@ -135,6 +135,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                     icon.Colour = colours.BlueLighter;
                     break;
 
+                case MultiplayerUserState.Spectating:
+                    text.Text = "spectating";
+                    icon.Icon = FontAwesome.Solid.Eye;
+                    icon.Colour = colours.BlueLight;
+                    break;
+
                 default:
                     throw new ArgumentOutOfRangeException(nameof(state), state, null);
             }

From 56c13148f1861b38b71cd87fdcaf5619b6527c1d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 16:45:06 +0900
Subject: [PATCH 08868/10326] Fix typo in class name

---
 .../TestSceneOnlinePlayBeatmapAvailabilityTracker.cs      | 8 ++++----
 .../Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs | 4 ++--
 ...Tracker.cs => OnlinePlayBeatmapAvailabilityTracker.cs} | 2 +-
 osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs     | 2 +-
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs        | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename osu.Game/Online/Rooms/{OnlinePlayBeatmapAvailablilityTracker.cs => OnlinePlayBeatmapAvailabilityTracker.cs} (97%)

diff --git a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
index 8c30802ce3..8dab570e30 100644
--- a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Online
         private BeatmapSetInfo testBeatmapSet;
 
         private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
-        private OnlinePlayBeatmapAvailablilityTracker availablilityTracker;
+        private OnlinePlayBeatmapAvailabilityTracker availabilityTracker;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, GameHost host)
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Online
                 Ruleset = { Value = testBeatmapInfo.Ruleset },
             };
 
-            Child = availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+            Child = availabilityTracker = new OnlinePlayBeatmapAvailabilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem, }
             };
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Online
             });
             addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
 
-            AddStep("recreate tracker", () => Child = availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+            AddStep("recreate tracker", () => Child = availabilityTracker = new OnlinePlayBeatmapAvailabilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem }
             });
@@ -127,7 +127,7 @@ namespace osu.Game.Tests.Online
 
         private void addAvailabilityCheckStep(string description, Func<BeatmapAvailability> expected)
         {
-            AddAssert(description, () => availablilityTracker.Availability.Value.Equals(expected.Invoke()));
+            AddAssert(description, () => availabilityTracker.Availability.Value.Equals(expected.Invoke()));
         }
 
         private static BeatmapInfo getTestBeatmapInfo(string archiveFile)
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index b44e5b1e5b..dad1237991 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerReadyButton : MultiplayerTestScene
     {
         private MultiplayerReadyButton button;
-        private OnlinePlayBeatmapAvailablilityTracker beatmapTracker;
+        private OnlinePlayBeatmapAvailabilityTracker beatmapTracker;
         private BeatmapSetInfo importedSet;
 
         private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
             beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
 
-            Add(beatmapTracker = new OnlinePlayBeatmapAvailablilityTracker
+            Add(beatmapTracker = new OnlinePlayBeatmapAvailabilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem }
             });
diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
similarity index 97%
rename from osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
rename to osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
index 8278162353..72ea84d4a8 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Online.Rooms
     /// This differs from a regular download tracking composite as this accounts for the
     /// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
     /// </summary>
-    public class OnlinePlayBeatmapAvailablilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    public class OnlinePlayBeatmapAvailabilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
         public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 6eb675976a..8f85608b29 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
         private IBindable<BeatmapAvailability> availability;
 
         [BackgroundDependencyLoader]
-        private void load(OnlinePlayBeatmapAvailablilityTracker beatmapTracker)
+        private void load(OnlinePlayBeatmapAvailabilityTracker beatmapTracker)
         {
             availability = beatmapTracker.Availability.GetBoundCopy();
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 4a689314db..706da05d15 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -56,15 +56,15 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         [Cached]
-        protected OnlinePlayBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
+        protected OnlinePlayBeatmapAvailabilityTracker BeatmapAvailabilityTracker { get; }
 
-        protected IBindable<BeatmapAvailability> BeatmapAvailability => BeatmapAvailablilityTracker.Availability;
+        protected IBindable<BeatmapAvailability> BeatmapAvailability => BeatmapAvailabilityTracker.Availability;
 
         protected RoomSubScreen()
         {
             AddRangeInternal(new Drawable[]
             {
-                BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+                BeatmapAvailabilityTracker = new OnlinePlayBeatmapAvailabilityTracker
                 {
                     SelectedItem = { BindTarget = SelectedItem }
                 },

From abd637ffaa5345f71f248823de47a3d5d4e805f3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 17:35:18 +0900
Subject: [PATCH 08869/10326] Add button to footer

---
 .../TestSceneMultiplayerMatchFooter.cs        | 27 +++++++++++++
 .../Match/MultiplayerMatchFooter.cs           | 40 ++++++++++++++++---
 2 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
new file mode 100644
index 0000000000..08c94b8135
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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.Online.Rooms;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerMatchFooter : MultiplayerTestScene
+    {
+        [Cached]
+        private readonly OnlinePlayBeatmapAvailablilityTracker availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new MultiplayerMatchFooter
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Height = 50
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index fdc1ae9d3c..d4f5428bfb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -8,21 +8,28 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerMatchFooter : CompositeDrawable
     {
         public const float HEIGHT = 50;
+        private const float ready_button_width = 600;
+        private const float spectate_button_width = 200;
 
         public Action OnReadyClick
         {
             set => readyButton.OnReadyClick = value;
         }
 
+        public Action OnSpectateClick
+        {
+            set => spectateButton.OnSpectateClick = value;
+        }
+
         private readonly Drawable background;
         private readonly MultiplayerReadyButton readyButton;
+        private readonly MultiplayerSpectateButton spectateButton;
 
         public MultiplayerMatchFooter()
         {
@@ -32,11 +39,34 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             InternalChildren = new[]
             {
                 background = new Box { RelativeSizeAxes = Axes.Both },
-                readyButton = new MultiplayerReadyButton
+                new GridContainer
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(600, 50),
+                    RelativeSizeAxes = Axes.Both,
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            null,
+                            spectateButton = new MultiplayerSpectateButton
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            null,
+                            readyButton = new MultiplayerReadyButton
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            null
+                        }
+                    },
+                    ColumnDimensions = new[]
+                    {
+                        new Dimension(),
+                        new Dimension(maxSize: spectate_button_width),
+                        new Dimension(GridSizeMode.Absolute, 10),
+                        new Dimension(maxSize: ready_button_width),
+                        new Dimension()
+                    }
                 }
             };
         }

From 08858e6426c520bb038ca774da64902dc21e70e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 17:41:05 +0900
Subject: [PATCH 08870/10326] Reorder defaults to give non-global areas
 priority for global actions

---
 .../Input/Bindings/DatabasedKeyBindingContainer.cs   | 12 ++++++++++--
 osu.Game/Input/Bindings/GlobalActionContainer.cs     |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index d12eaa10f6..cd8b486f23 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -64,12 +64,20 @@ namespace osu.Game.Input.Bindings
 
         protected override void ReloadMappings()
         {
+            var defaults = DefaultKeyBindings.ToList();
+
             if (ruleset != null && !ruleset.ID.HasValue)
                 // if the provided ruleset is not stored to the database, we have no way to retrieve custom bindings.
                 // fallback to defaults instead.
-                KeyBindings = DefaultKeyBindings;
+                KeyBindings = defaults;
             else
-                KeyBindings = store.Query(ruleset?.ID, variant).ToList();
+            {
+                KeyBindings = store.Query(ruleset?.ID, variant)
+                                   // this ordering is important to ensure that we read entries from the database in the order
+                                   // enforced by DefaultKeyBindings. allow for song select to handle actions that may otherwise
+                                   // have been eaten by the music controller due to query order.
+                                   .OrderBy(b => defaults.FindIndex(d => (int)d.Action == b.IntAction)).ToList();
+            }
         }
     }
 }
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index c2f707a4e8..042960d54c 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -28,10 +28,10 @@ namespace osu.Game.Input.Bindings
         }
 
         public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings
+                                                                       .Concat(EditorKeyBindings)
                                                                        .Concat(InGameKeyBindings)
-                                                                       .Concat(AudioControlKeyBindings)
                                                                        .Concat(SongSelectKeyBindings)
-                                                                       .Concat(EditorKeyBindings);
+                                                                       .Concat(AudioControlKeyBindings);
 
         public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {

From b4c6894d13d96a9ba65162492459a2fe0a46de3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 18:29:31 +0900
Subject: [PATCH 08871/10326] Add test coverage for song select footer area

---
 .../SongSelect/TestSceneSongSelectFooter.cs   | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooter.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooter.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooter.cs
new file mode 100644
index 0000000000..0ac65b357c
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooter.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.Screens.Select;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    public class TestSceneSongSelectFooter : OsuManualInputManagerTestScene
+    {
+        public TestSceneSongSelectFooter()
+        {
+            AddStep("Create footer", () =>
+            {
+                Footer footer;
+                AddRange(new Drawable[]
+                {
+                    footer = new Footer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                });
+
+                footer.AddButton(new FooterButtonMods(), null);
+                footer.AddButton(new FooterButtonRandom
+                {
+                    NextRandom = () => { },
+                    PreviousRandom = () => { },
+                }, null);
+                footer.AddButton(new FooterButtonOptions(), null);
+            });
+        }
+    }
+}

From 0f2c03d54bb19c36ccc85bead76f4ce574ac7af9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 18:29:45 +0900
Subject: [PATCH 08872/10326] Add back "rewind" text, showing temporarily after
 a rewind occurs

---
 osu.Game/Screens/Select/FooterButton.cs       |  1 +
 osu.Game/Screens/Select/FooterButtonRandom.cs | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index dfcdd1b45f..7528651fd9 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -106,6 +106,7 @@ namespace osu.Game.Screens.Select
                                     AutoSizeAxes = Axes.Both,
                                     Child = SpriteText = new OsuSpriteText
                                     {
+                                        AlwaysPresent = true,
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
                                     }
diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index b314971cb3..2d14111137 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -4,8 +4,11 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
+using osuTK;
 
 namespace osu.Game.Screens.Select
 {
@@ -22,10 +25,30 @@ namespace osu.Game.Screens.Select
             SelectedColour = colours.Green;
             DeselectedColour = SelectedColour.Opacity(0.5f);
             Text = @"random";
+
             Action = () =>
             {
                 if (rewindSearch)
                 {
+                    const double fade_time = 500;
+
+                    OsuSpriteText rewindSpriteText;
+
+                    TextContainer.Add(rewindSpriteText = new OsuSpriteText
+                    {
+                        Alpha = 0,
+                        Text = @"rewind",
+                        AlwaysPresent = true, // make sure the button is sized large enough to always show this
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    });
+
+                    rewindSpriteText.FadeOutFromOne(fade_time, Easing.In);
+                    rewindSpriteText.MoveTo(Vector2.Zero).MoveTo(new Vector2(0, 10), fade_time, Easing.In);
+                    rewindSpriteText.Expire();
+
+                    SpriteText.FadeInFromZero(fade_time, Easing.In);
+
                     PreviousRandom.Invoke();
                 }
                 else

From aa424165b3790cdccd6d094b7310d68de6a16e6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 18:45:57 +0900
Subject: [PATCH 08873/10326] Fix broken taiko test

---
 osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
index fa6c9da174..9b36b064bc 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new TaikoInputManager(new RulesetInfo { ID = 1 })
+            SetContents(() => new TaikoInputManager(new TaikoRuleset().RulesetInfo)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = new Container

From e7f47c635fdbad79b71831e8d4b86b0708138440 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 19:00:04 +0900
Subject: [PATCH 08874/10326] Fix gameplay mouse cursor being overridden by
 menu cursor

Closes https://github.com/ppy/osu/issues/12313.
---
 osu.Game/OsuGameBase.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index b2bbd0b48b..21313d0596 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -308,17 +308,15 @@ namespace osu.Game
 
             AddInternal(RulesetConfigCache);
 
-            MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both };
-
-            GlobalInputManager globalInput;
-
-            MenuCursorContainer.Child = globalInput = new GlobalInputManager(this)
+            var globalInput = new GlobalInputManager(this)
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }
+                Child = MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both }
             };
 
-            base.Content.Add(CreateScalingContainer().WithChild(MenuCursorContainer));
+            MenuCursorContainer.Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both };
+
+            base.Content.Add(CreateScalingContainer().WithChild(globalInput));
 
             KeyBindingStore.Register(globalInput.GlobalBindings);
             dependencies.Cache(globalInput.GlobalBindings);

From 7d37c4df8cc6d1e043b06cb1b887bc443b7ad5c2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 20:17:20 +0900
Subject: [PATCH 08875/10326] Fix broken osu tests

---
 osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
index cad98185ce..233aaf2ed9 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             get
             {
                 if (content == null)
-                    base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
+                    base.Content.Add(content = new OsuInputManager(new OsuRuleset().RulesetInfo));
 
                 return content;
             }

From 93c5935ebc4adc5989122b0f502fab6c44dd5064 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 20:46:30 +0900
Subject: [PATCH 08876/10326] Add match subscreen support + test

---
 .../TestSceneMultiplayerMatchSubScreen.cs     | 61 +++++++++++++++++++
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 19 +++++-
 .../Multiplayer/TestMultiplayerClient.cs      |  3 +
 3 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 8869718fd1..6f8ec7fcfb 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -3,13 +3,21 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Resources;
+using osu.Game.Users;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -18,11 +26,25 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         private MultiplayerMatchSubScreen screen;
 
+        private BeatmapManager beatmaps;
+        private RulesetStore rulesets;
+        private BeatmapSetInfo importedSet;
+
         public TestSceneMultiplayerMatchSubScreen()
             : base(false)
         {
         }
 
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, AudioManager audio)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
+
+            importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+        }
+
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
@@ -73,5 +95,44 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddWaitStep("wait", 10);
         }
+
+        [Test]
+        public void TestStartMatchWhileSpectating()
+        {
+            AddStep("set playlist", () =>
+            {
+                Room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First()).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                });
+            });
+
+            AddStep("click create button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("join other user (ready)", () =>
+            {
+                Client.AddUser(new User { Id = 55 });
+                Client.ChangeUserState(55, MultiplayerUserState.Ready);
+            });
+
+            AddStep("click spectate button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerSpectateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("click ready button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerReadyButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("match started", () => Client.Room?.State == MultiplayerRoomState.WaitingForLoad);
+        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index ceeee67806..90cef0107c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -221,7 +221,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         {
                             new MultiplayerMatchFooter
                             {
-                                OnReadyClick = onReadyClick
+                                OnReadyClick = onReadyClick,
+                                OnSpectateClick = onSpectateClick
                             }
                         }
                     },
@@ -363,7 +364,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Debug.Assert(readyClickOperation == null);
             readyClickOperation = ongoingOperationTracker.BeginOperation();
 
-            if (client.IsHost && client.LocalUser?.State == MultiplayerUserState.Ready)
+            if (client.IsHost && (client.LocalUser?.State == MultiplayerUserState.Ready || client.LocalUser?.State == MultiplayerUserState.Spectating))
             {
                 client.StartMatch()
                       .ContinueWith(t =>
@@ -390,6 +391,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
+        private void onSpectateClick()
+        {
+            Debug.Assert(readyClickOperation == null);
+            readyClickOperation = ongoingOperationTracker.BeginOperation();
+
+            client.ToggleSpectate().ContinueWith(t => endOperation());
+
+            void endOperation()
+            {
+                readyClickOperation?.Dispose();
+                readyClickOperation = null;
+            }
+        }
+
         private void onRoomUpdated()
         {
             // user mods may have changed.
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 4c954c7d27..b5cd3dad02 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -77,6 +77,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     case MultiplayerUserState.Loaded:
                         if (Room.Users.All(u => u.State != MultiplayerUserState.WaitingForLoad))
                         {
+                            ChangeRoomState(MultiplayerRoomState.Playing);
                             foreach (var u in Room.Users.Where(u => u.State == MultiplayerUserState.Loaded))
                                 ChangeUserState(u.UserID, MultiplayerUserState.Playing);
 
@@ -88,6 +89,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     case MultiplayerUserState.FinishedPlay:
                         if (Room.Users.All(u => u.State != MultiplayerUserState.Playing))
                         {
+                            ChangeRoomState(MultiplayerRoomState.Open);
                             foreach (var u in Room.Users.Where(u => u.State == MultiplayerUserState.FinishedPlay))
                                 ChangeUserState(u.UserID, MultiplayerUserState.Results);
 
@@ -179,6 +181,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             Debug.Assert(Room != null);
 
+            ChangeRoomState(MultiplayerRoomState.WaitingForLoad);
             foreach (var user in Room.Users.Where(u => u.State == MultiplayerUserState.Ready))
                 ChangeUserState(user.UserID, MultiplayerUserState.WaitingForLoad);
 

From 1f4c17b8f856a1d010fd2e45345d199c51dfba14 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 21:20:44 +0900
Subject: [PATCH 08877/10326] Apply changes to AllowScreenSuspension bindable

---
 .../Screens/Play/ScreenSuspensionHandler.cs   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
index 8585a5c309..30ca15c311 100644
--- a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
+++ b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -19,6 +18,8 @@ namespace osu.Game.Screens.Play
         private readonly GameplayClockContainer gameplayClockContainer;
         private Bindable<bool> isPaused;
 
+        private readonly Bindable<bool> disableSuspensionBindable = new Bindable<bool>();
+
         [Resolved]
         private GameHost host { get; set; }
 
@@ -31,12 +32,14 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            // This is the only usage game-wide of suspension changes.
-            // Assert to ensure we don't accidentally forget this in the future.
-            Debug.Assert(host.AllowScreenSuspension.Value);
-
             isPaused = gameplayClockContainer.IsPaused.GetBoundCopy();
-            isPaused.BindValueChanged(paused => host.AllowScreenSuspension.Value = paused.NewValue, true);
+            isPaused.BindValueChanged(paused =>
+            {
+                if (paused.NewValue)
+                    host.AllowScreenSuspension.RemoveSource(disableSuspensionBindable);
+                else
+                    host.AllowScreenSuspension.AddSource(disableSuspensionBindable);
+            }, true);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -44,9 +47,7 @@ namespace osu.Game.Screens.Play
             base.Dispose(isDisposing);
 
             isPaused?.UnbindAll();
-
-            if (host != null)
-                host.AllowScreenSuspension.Value = true;
+            host?.AllowScreenSuspension.RemoveSource(disableSuspensionBindable);
         }
     }
 }

From b24ce66a0d4bfcc9f53d84fe998b6d4027ef8a5a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 14:35:33 +0200
Subject: [PATCH 08878/10326] Add check/issue classes

---
 osu.Game/Rulesets/Edit/Checker.cs             | 25 ++++++
 .../Edit/Verify/Components/BeatmapCheck.cs    | 19 +++++
 .../Screens/Edit/Verify/Components/Check.cs   | 41 +++++++++
 .../Edit/Verify/Components/CheckMetadata.cs   | 62 ++++++++++++++
 .../Screens/Edit/Verify/Components/Issue.cs   | 83 ++++++++++++++++++
 .../Edit/Verify/Components/IssueTemplate.cs   | 84 +++++++++++++++++++
 osu.Game/Screens/Edit/Verify/Issue.cs         | 10 ---
 7 files changed, 314 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/Checker.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/Components/Check.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/Components/Issue.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs
 delete mode 100644 osu.Game/Screens/Edit/Verify/Issue.cs

diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/Checker.cs
new file mode 100644
index 0000000000..1c267c3435
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checker.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 System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Checks;
+using osu.Game.Screens.Edit.Verify.Components;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public abstract class Checker
+    {
+        // These are all mode-invariant, hence here instead of in e.g. `OsuChecker`.
+        private readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
+        {
+            new CheckMetadataVowels()
+        };
+
+        public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            return beatmapChecks.SelectMany(check => check.Run(beatmap));
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs b/osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs
new file mode 100644
index 0000000000..7297dab60d
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.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.Collections.Generic;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Screens.Edit.Verify.Components
+{
+    public abstract class BeatmapCheck : Check<IBeatmap>
+    {
+        /// <summary>
+        /// Returns zero, one, or several issues detected by this
+        /// check on the given beatmap.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to run the check on.</param>
+        /// <returns></returns>
+        public abstract override IEnumerable<Issue> Run(IBeatmap beatmap);
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Components/Check.cs b/osu.Game/Screens/Edit/Verify/Components/Check.cs
new file mode 100644
index 0000000000..2ae21fd350
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Components/Check.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.Collections.Generic;
+
+namespace osu.Game.Screens.Edit.Verify.Components
+{
+    public abstract class Check
+    {
+        /// <summary>
+        /// Returns the <see cref="CheckMetadata"/> for this check.
+        /// Basically, its information.
+        /// </summary>
+        /// <returns></returns>
+        public abstract CheckMetadata Metadata();
+
+        /// <summary>
+        /// The templates for issues that this check may use.
+        /// Basically, what issues this check can detect.
+        /// </summary>
+        /// <returns></returns>
+        public abstract IEnumerable<IssueTemplate> Templates();
+
+        protected Check()
+        {
+            foreach (var template in Templates())
+                template.Origin = this;
+        }
+    }
+
+    public abstract class Check<T> : Check
+    {
+        /// <summary>
+        /// Returns zero, one, or several issues detected by
+        /// this check on the given object.
+        /// </summary>
+        /// <param name="obj">The object to run the check on.</param>
+        /// <returns></returns>
+        public abstract IEnumerable<Issue> Run(T obj);
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs b/osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs
new file mode 100644
index 0000000000..1cac99d47d
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs
@@ -0,0 +1,62 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public class CheckMetadata
+    {
+        /// <summary>
+        /// The category of an issue.
+        /// </summary>
+        public enum CheckCategory
+        {
+            /// <summary> Anything to do with control points. </summary>
+            Timing,
+
+            /// <summary> Anything to do with artist, title, creator, etc. </summary>
+            Metadata,
+
+            /// <summary> Anything to do with non-audio files, e.g. background, skin, sprites, and video. </summary>
+            Resources,
+
+            /// <summary> Anything to do with audio files, e.g. song and hitsounds. </summary>
+            Audio,
+
+            /// <summary> Anything to do with files that don't fit into the above, e.g. unused, osu, or osb. </summary>
+            Files,
+
+            /// <summary> Anything to do with hitobjects unrelated to spread. </summary>
+            Compose,
+
+            /// <summary> Anything to do with difficulty levels or their progression. </summary>
+            Spread,
+
+            /// <summary> Anything to do with variables like CS, OD, AR, HP, and global SV. </summary>
+            Settings,
+
+            /// <summary> Anything to do with hitobject feedback. </summary>
+            Hitsounds,
+
+            /// <summary> Anything to do with storyboarding, breaks, video offset, etc. </summary>
+            Events
+        }
+
+        /// <summary>
+        /// The category this check belongs to. E.g. <see cref="CheckCategory.Metadata"/>,
+        /// <see cref="CheckCategory.Timing"/>, or <see cref="CheckCategory.Compose"/>.
+        /// </summary>
+        public readonly CheckCategory Category;
+
+        /// <summary>
+        /// Describes the issue(s) that this check looks for. Keep this brief, such that
+        /// it fits into "No {description}". E.g. "Offscreen objects" / "Too short sliders".
+        /// </summary>
+        public readonly string Description;
+
+        public CheckMetadata(CheckCategory category, string description)
+        {
+            Category = category;
+            Description = description;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Components/Issue.cs b/osu.Game/Screens/Edit/Verify/Components/Issue.cs
new file mode 100644
index 0000000000..fe81cb9335
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Components/Issue.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Extensions;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Screens.Edit.Verify.Components
+{
+    public class Issue
+    {
+        /// <summary>
+        /// The time which this issue is associated with, if any, otherwise null.
+        /// </summary>
+        public double? Time;
+
+        /// <summary>
+        /// The hitobjects which this issue is associated with. Empty by default.
+        /// </summary>
+        public IReadOnlyList<HitObject> HitObjects;
+
+        /// <summary>
+        /// The template which this issue is using. This provides properties
+        /// such as the <see cref="IssueTemplate.IssueType"/>, and the
+        /// <see cref="IssueTemplate.UnformattedMessage"/>.
+        /// </summary>
+        public IssueTemplate Template;
+
+        /// <summary>
+        /// The arguments that give this issue its context, based on the
+        /// <see cref="IssueTemplate"/>. These are then substituted into the
+        /// <see cref="IssueTemplate.UnformattedMessage"/>.
+        /// E.g. timestamps, which diff is being compared to, what some volume is, etc.
+        /// </summary>
+        public object[] Arguments;
+
+        public Issue(IssueTemplate template, params object[] args)
+        {
+            Time = null;
+            HitObjects = System.Array.Empty<HitObject>();
+            Template = template;
+            Arguments = args;
+
+            if (template.Origin == null)
+            {
+                throw new ArgumentException(
+                    "A template had no origin. Make sure the `Templates()` method contains all templates used."
+                );
+            }
+        }
+
+        public Issue(double? time, IssueTemplate template, params object[] args)
+            : this(template, args)
+        {
+            Time = time;
+        }
+
+        public Issue(IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
+            : this(template, args)
+        {
+            Time = hitObjects.FirstOrDefault()?.StartTime;
+            HitObjects = hitObjects.ToArray();
+        }
+
+        public override string ToString()
+        {
+            return Template.Message(Arguments);
+        }
+
+        public string GetEditorTimestamp()
+        {
+            // TODO: Editor timestamp formatting is handled in https://github.com/ppy/osu/pull/12030
+            // We may be able to use that here too (if we decouple it from the HitObjectComposer class).
+
+            if (Time == null)
+                return string.Empty;
+
+            return Time.Value.ToEditorFormattedString();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs b/osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs
new file mode 100644
index 0000000000..b178fa7122
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs
@@ -0,0 +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 Humanizer;
+using osu.Framework.Graphics;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Verify.Components
+{
+    public class IssueTemplate
+    {
+        /// <summary>
+        /// The type, or severity, of an issue. This decides its priority.
+        /// </summary>
+        public enum IssueType
+        {
+            /// <summary> A must-fix in the vast majority of cases. </summary>
+            Problem = 3,
+
+            /// <summary> A possible mistake. Often requires critical thinking.  </summary>
+            Warning = 2,
+
+            // TODO: Try/catch all checks run and return error templates if exceptions occur.
+            /// <summary> An error occurred and a complete check could not be made. </summary>
+            Error = 1,
+
+            // TODO: Negligible issues should be hidden by default.
+            /// <summary> A possible mistake so minor/unlikely that it can often be safely ignored. </summary>
+            Negligible = 0,
+        }
+
+        /// <summary>
+        /// The check that this template originates from.
+        /// </summary>
+        public Check Origin;
+
+        /// <summary>
+        /// The type of the issue. E.g. <see cref="IssueType.Problem"/>,
+        /// <see cref="IssueType.Warning"/>, or <see cref="IssueType.Negligible"/>.
+        /// </summary>
+        public readonly IssueType Type;
+
+        /// <summary>
+        /// The unformatted message given when this issue is detected.
+        /// This gets populated later when an issue is constructed with this template.
+        /// E.g. "Inconsistent snapping (1/{0}) with [{1}] (1/{2})."
+        /// </summary>
+        public readonly string UnformattedMessage;
+
+        public IssueTemplate(IssueType type, string unformattedMessage)
+        {
+            Type = type;
+            UnformattedMessage = unformattedMessage;
+        }
+
+        /// <summary>
+        /// Returns the formatted message given the arguments used to format it.
+        /// </summary>
+        /// <param name="args">The arguments used to format the message.</param>
+        /// <returns></returns>
+        public string Message(params object[] args) => UnformattedMessage.FormatWith(args);
+
+        public static readonly Color4 PROBLEM_RED = new Colour4(1.0f, 0.4f, 0.4f, 1.0f);
+        public static readonly Color4 WARNING_YELLOW = new Colour4(1.0f, 0.8f, 0.2f, 1.0f);
+        public static readonly Color4 NEGLIGIBLE_GREEN = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
+        public static readonly Color4 ERROR_GRAY = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
+
+        /// <summary>
+        /// Returns the colour corresponding to the type of this issue.
+        /// </summary>
+        /// <returns></returns>
+        public Colour4 TypeColour()
+        {
+            return Type switch
+            {
+                IssueType.Problem => PROBLEM_RED,
+                IssueType.Warning => WARNING_YELLOW,
+                IssueType.Negligible => NEGLIGIBLE_GREEN,
+                IssueType.Error => ERROR_GRAY,
+                _ => Color4.White
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Issue.cs b/osu.Game/Screens/Edit/Verify/Issue.cs
deleted file mode 100644
index 25e913d819..0000000000
--- a/osu.Game/Screens/Edit/Verify/Issue.cs
+++ /dev/null
@@ -1,10 +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.Edit.Verify
-{
-    public class Issue
-    {
-        public readonly double Time;
-    }
-}

From 0343ef7f147b12a8bd71dfced08c6b503b6b8b79 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 14:36:43 +0200
Subject: [PATCH 08879/10326] Add ruleset-specific checker

---
 osu.Game.Rulesets.Osu/Edit/OsuChecker.cs | 30 ++++++++++++++++++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs      |  2 ++
 osu.Game/Rulesets/Ruleset.cs             |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/OsuChecker.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
new file mode 100644
index 0000000000..9918b53c85
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Osu.Edit.Checks;
+using osu.Game.Screens.Edit.Verify.Components;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public class OsuChecker : Checker
+    {
+        public readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
+        {
+            new CheckConsecutiveCircles()
+        };
+
+        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            // Also run mode-invariant checks.
+            foreach (var issue in base.Run(beatmap))
+                yield return issue;
+
+            foreach (var issue in beatmapChecks.SelectMany(check => check.Run(beatmap)))
+                yield return issue;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 838d707d64..74679bd578 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -206,6 +206,8 @@ namespace osu.Game.Rulesets.Osu
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
+        public override Checker CreateChecker() => new OsuChecker();
+
         public override string Description => "osu!";
 
         public override string ShortName => SHORT_NAME;
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 38d30a2e31..71f80c9982 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -202,6 +202,8 @@ namespace osu.Game.Rulesets
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
+        public virtual Checker CreateChecker() => null;
+
         public virtual Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.QuestionCircle };
 
         public virtual IResourceStore<byte[]> CreateResourceStore() => new NamespacedResourceStore<byte[]>(new DllResourceStore(GetType().Assembly), @"Resources");

From 9c4604e3c5fdbfa9f5201f39ee41584fa5b47d18 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 14:36:53 +0200
Subject: [PATCH 08880/10326] Add example checks

---
 .../Edit/Checks/CheckConsecutiveCircles.cs    | 86 +++++++++++++++++++
 osu.Game/Checks/CheckMetadataVowels.cs        | 65 ++++++++++++++
 2 files changed, 151 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs
 create mode 100644 osu.Game/Checks/CheckMetadataVowels.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs
new file mode 100644
index 0000000000..c41c0dac2b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.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.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit.Verify;
+using osu.Game.Screens.Edit.Verify.Components;
+
+namespace osu.Game.Rulesets.Osu.Edit.Checks
+{
+    public class CheckConsecutiveCircles : BeatmapCheck
+    {
+        private const double consecutive_threshold = 3;
+        private const double delta_time_min_expected = 300;
+        private const double delta_time_min_threshold = 100;
+
+        public override CheckMetadata Metadata() => new CheckMetadata
+        (
+            category: CheckMetadata.CheckCategory.Spread,
+            description: "Too many or fast consecutive circles."
+        );
+
+        private IssueTemplate templateManyInARow = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Problem,
+            unformattedMessage: "There are {0} circles in a row here, expected at most {1}."
+        );
+
+        private IssueTemplate templateTooFast = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Warning,
+            unformattedMessage: "These circles are too fast ({0:0} ms), expected at least {1:0} ms."
+        );
+
+        private IssueTemplate templateAlmostTooFast = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Negligible,
+            unformattedMessage: "These circles are almost too fast ({0:0} ms), expected at least {1:0} ms."
+        );
+
+        public override IEnumerable<IssueTemplate> Templates() => new[]
+        {
+            templateManyInARow,
+            templateTooFast,
+            templateAlmostTooFast
+        };
+
+        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            List<HitCircle> prevCircles = new List<HitCircle>();
+
+            foreach (HitObject hitobject in beatmap.HitObjects)
+            {
+                if (!(hitobject is HitCircle circle) || hitobject == beatmap.HitObjects.Last())
+                {
+                    if (prevCircles.Count > consecutive_threshold)
+                    {
+                        yield return new Issue(
+                            prevCircles,
+                            templateManyInARow,
+                            prevCircles.Count, consecutive_threshold
+                        );
+                    }
+
+                    prevCircles.Clear();
+                    continue;
+                }
+
+                double? prevDeltaTime = circle.StartTime - prevCircles.LastOrDefault()?.StartTime;
+                prevCircles.Add(circle);
+
+                if (prevDeltaTime == null || prevDeltaTime >= delta_time_min_expected)
+                    continue;
+
+                yield return new Issue(
+                    prevCircles.TakeLast(2),
+                    prevDeltaTime < delta_time_min_threshold ? templateTooFast : templateAlmostTooFast,
+                    prevDeltaTime, delta_time_min_expected
+                );
+            }
+        }
+    }
+}
diff --git a/osu.Game/Checks/CheckMetadataVowels.cs b/osu.Game/Checks/CheckMetadataVowels.cs
new file mode 100644
index 0000000000..8bcfe89c3a
--- /dev/null
+++ b/osu.Game/Checks/CheckMetadataVowels.cs
@@ -0,0 +1,65 @@
+// Copyright (c) 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.Beatmaps;
+using osu.Game.Screens.Edit.Verify;
+using osu.Game.Screens.Edit.Verify.Components;
+
+namespace osu.Game.Checks
+{
+    public class CheckMetadataVowels : BeatmapCheck
+    {
+        private static readonly char[] vowels = { 'a', 'e', 'i', 'o', 'u' };
+
+        public override CheckMetadata Metadata() => new CheckMetadata
+        (
+            category: CheckMetadata.CheckCategory.Metadata,
+            description: "Metadata fields contain vowels"
+        );
+
+        public override IEnumerable<IssueTemplate> Templates() => new[]
+        {
+            templateArtistHasVowels
+        };
+
+        private IssueTemplate templateArtistHasVowels = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Warning,
+            unformattedMessage: "The {0} field \"{1}\" contains the vowel(s) {2}."
+        );
+
+        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            foreach (var issue in GetVowelIssues("artist", beatmap.Metadata.Artist))
+                yield return issue;
+
+            foreach (var issue in GetVowelIssues("unicode artist", beatmap.Metadata.ArtistUnicode))
+                yield return issue;
+
+            foreach (var issue in GetVowelIssues("title", beatmap.Metadata.Title))
+                yield return issue;
+
+            foreach (var issue in GetVowelIssues("unicode title", beatmap.Metadata.TitleUnicode))
+                yield return issue;
+        }
+
+        private IEnumerable<Issue> GetVowelIssues(string fieldName, string fieldValue)
+        {
+            if (fieldValue == null)
+                // Unicode fields can be null if same as respective romanized fields.
+                yield break;
+
+            List<char> matches = vowels.Where(c => fieldValue.ToLower().Contains(c)).ToList();
+
+            if (!matches.Any())
+                yield break;
+
+            yield return new Issue(
+                templateArtistHasVowels,
+                fieldName, fieldValue, string.Join(", ", matches)
+            );
+        }
+    }
+}

From bab36e529a5b9e1ff5b2300e9def2b5bc11687a7 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 14:38:43 +0200
Subject: [PATCH 08881/10326] Update UI with new components

---
 osu.Game/Screens/Edit/Verify/IssueSettings.cs | 47 +++++++++
 osu.Game/Screens/Edit/Verify/IssueTable.cs    | 91 +++++++++--------
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  | 98 +++++++++++++++----
 .../Screens/Edit/Verify/VisibilitySettings.cs | 52 ++++++++++
 4 files changed, 229 insertions(+), 59 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Verify/IssueSettings.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/VisibilitySettings.cs

diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
new file mode 100644
index 0000000000..608be877de
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.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 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;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public class IssueSettings : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colours.Gray3,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new OsuScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Children = createSections()
+                    },
+                }
+            };
+        }
+
+        private IReadOnlyList<Drawable> createSections() => new Drawable[]
+        {
+            new VisibilitySettings()
+        };
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 6476cebe48..c70695a849 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -4,16 +4,16 @@
 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;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
+using osu.Game.Screens.Edit.Verify.Components;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify
@@ -34,6 +34,9 @@ namespace osu.Game.Screens.Edit.Verify
             Padding = new MarginPadding { Horizontal = horizontal_inset };
             RowSize = new Dimension(GridSizeMode.Absolute, row_height);
 
+            Masking = true;
+            CornerRadius = 6;
+
             AddInternal(backgroundFlow = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -55,7 +58,7 @@ namespace osu.Game.Screens.Edit.Verify
 
                 foreach (var issue in value)
                 {
-                    backgroundFlow.Add(new IssueTable.RowBackground(issue));
+                    backgroundFlow.Add(new RowBackground(issue));
                 }
 
                 Columns = createHeaders();
@@ -68,9 +71,10 @@ namespace osu.Game.Screens.Edit.Verify
             var columns = new List<TableColumn>
             {
                 new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn("Type", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
                 new TableColumn("Time", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn(),
-                new TableColumn("Attributes", Anchor.CentreLeft),
+                new TableColumn("Message", Anchor.CentreLeft),
+                new TableColumn("Category", Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize)),
             };
 
             return columns.ToArray();
@@ -81,21 +85,36 @@ namespace osu.Game.Screens.Edit.Verify
             new OsuSpriteText
             {
                 Text = $"#{index + 1}",
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium)
+            },
+            new OsuSpriteText
+            {
+                Text = issue.Template.Type.ToString(),
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Margin = new MarginPadding { Left = 10 },
+                Colour = issue.Template.TypeColour()
+            },
+            new OsuSpriteText
+            {
+                Text = issue.GetEditorTimestamp(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
                 Margin = new MarginPadding(10)
             },
             new OsuSpriteText
             {
-                Text = issue.Time.ToEditorFormattedString(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
+                Text = issue.ToString(),
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium)
             },
-            null,
-            null //new ControlGroupAttributes(issue),
+            new OsuSpriteText
+            {
+                Text = issue.Template.Origin.Metadata().Category.ToString(),
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Margin = new MarginPadding(10)
+            }
         };
 
         public class RowBackground : OsuClickableContainer
         {
-            private readonly Issue issue;
             private const int fade_duration = 100;
 
             private readonly Box hoveredBackground;
@@ -104,13 +123,15 @@ namespace osu.Game.Screens.Edit.Verify
             private EditorClock clock { get; set; }
 
             [Resolved]
-            private Bindable<Issue> selectedIssue { get; set; }
+            private Editor editor { get; set; }
+
+            [Resolved]
+            private EditorBeatmap editorBeatmap { get; set; }
 
             public RowBackground(Issue issue)
             {
-                this.issue = issue;
                 RelativeSizeAxes = Axes.X;
-                Height = 25;
+                Height = row_height;
 
                 AlwaysPresent = true;
 
@@ -128,41 +149,29 @@ namespace osu.Game.Screens.Edit.Verify
 
                 Action = () =>
                 {
-                    selectedIssue.Value = issue;
-                    clock.SeekSmoothlyTo(issue.Time);
+                    // Supposed to work like clicking timestamps outside of the game.
+                    // TODO: Is there already defined behaviour for this I may be able to call?
+
+                    if (issue.Time != null)
+                    {
+                        clock.Seek(issue.Time.Value);
+                        editor.OnPressed(GlobalAction.EditorComposeMode);
+                    }
+
+                    if (!issue.HitObjects.Any())
+                        return;
+
+                    editorBeatmap.SelectedHitObjects.Clear();
+                    editorBeatmap.SelectedHitObjects.AddRange(issue.HitObjects);
                 };
             }
 
             private Color4 colourHover;
-            private Color4 colourSelected;
 
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
                 hoveredBackground.Colour = colourHover = colours.BlueDarker;
-                colourSelected = colours.YellowDarker;
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                selectedIssue.BindValueChanged(group => { Selected = issue == group.NewValue; }, true);
-            }
-
-            private bool selected;
-
-            protected bool Selected
-            {
-                get => selected;
-                set
-                {
-                    if (value == selected)
-                        return;
-
-                    selected = value;
-                    updateState();
-                }
             }
 
             protected override bool OnHover(HoverEvent e)
@@ -179,9 +188,9 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void updateState()
             {
-                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
+                hoveredBackground.FadeColour(colourHover, 450, Easing.OutQuint);
 
-                if (selected || IsHovered)
+                if (IsHovered)
                     hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
                 else
                     hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index c15cefae83..88397fdbff 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -1,40 +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 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.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Edit;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class VerifyScreen : EditorScreenWithTimeline
+    public class VerifyScreen : EditorScreen
     {
+        private Ruleset ruleset;
+        private static Checker checker; // TODO: Should not be static, but apparently needs to be?
+
         public VerifyScreen()
             : base(EditorScreenMode.Verify)
         {
         }
 
-        protected override Drawable CreateMainContent() => new GridContainer
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
-            RelativeSizeAxes = Axes.Both,
-            ColumnDimensions = new[]
-            {
-                new Dimension(),
-                new Dimension(GridSizeMode.Absolute, 200),
-            },
-            Content = new[]
-            {
-                new Drawable[]
-                {
-                    new ControlPointList()
-                },
-            }
-        };
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-        public class ControlPointList : CompositeDrawable
+            ruleset = parent.Get<IBindable<WorkingBeatmap>>().Value.BeatmapInfo.Ruleset?.CreateInstance();
+            checker = ruleset?.CreateChecker();
+
+            return dependencies;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding(20),
+                Child = new GridContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    ColumnDimensions = new[]
+                    {
+                        new Dimension(),
+                        new Dimension(GridSizeMode.Absolute, 200),
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            new IssueList(),
+                            new IssueSettings(),
+                        },
+                    }
+                }
+            };
+        }
+
+        public class IssueList : CompositeDrawable
         {
             private IssueTable table;
 
@@ -60,9 +90,41 @@ namespace osu.Game.Screens.Edit.Verify
                     {
                         RelativeSizeAxes = Axes.Both,
                         Child = table = new IssueTable(),
-                    }
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Anchor = Anchor.BottomRight,
+                        Origin = Anchor.BottomRight,
+                        Margin = new MarginPadding(20),
+                        Children = new Drawable[]
+                        {
+                            new TriangleButton
+                            {
+                                Text = "Refresh",
+                                Action = refresh,
+                                Size = new Vector2(120, 40),
+                                Anchor = Anchor.BottomRight,
+                                Origin = Anchor.BottomRight,
+                            },
+                        }
+                    },
                 };
             }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                refresh();
+            }
+
+            private void refresh()
+            {
+                table.Issues = checker.Run(Beatmap)
+                                      .OrderByDescending(issue => issue.Template.Type)
+                                      .ThenByDescending(issue => issue.Template.Origin.Metadata().Category);
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySettings.cs b/osu.Game/Screens/Edit/Verify/VisibilitySettings.cs
new file mode 100644
index 0000000000..6488c616e4
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySettings.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    internal class VisibilitySettings : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Padding = new MarginPadding(10);
+
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Spacing = new Vector2(10),
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new LabelledSwitchButton
+                        {
+                            Label = "Show problems",
+                            Current = new Bindable<bool>(true)
+                        },
+                        new LabelledSwitchButton
+                        {
+                            Label = "Show warnings",
+                            Current = new Bindable<bool>(true)
+                        },
+                        new LabelledSwitchButton
+                        {
+                            Label = "Show negligibles"
+                        }
+                    }
+                },
+            };
+        }
+    }
+}

From 2791d454d22a8d61e254531635d7a6d7c8bb746e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 22:21:22 +0900
Subject: [PATCH 08882/10326] Don't send spectating user state yet

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 4529dfd0a7..37e11cc576 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -96,6 +96,9 @@ namespace osu.Game.Online.Multiplayer
             if (!IsConnected.Value)
                 return Task.CompletedTask;
 
+            if (newState == MultiplayerUserState.Spectating)
+                return Task.CompletedTask; // Not supported yet.
+
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
         }
 

From 214813154b775f1fa8c3a075e55690ce8ef2ee0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 22:28:22 +0900
Subject: [PATCH 08883/10326] Fix class name

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs       | 2 +-
 .../Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
index 08c94b8135..6b03b53b4b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerMatchFooter : MultiplayerTestScene
     {
         [Cached]
-        private readonly OnlinePlayBeatmapAvailablilityTracker availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker();
+        private readonly OnlinePlayBeatmapAvailabilityTracker availablilityTracker = new OnlinePlayBeatmapAvailabilityTracker();
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index 8fe1f99e1d..e65e4a68a7 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
 
-            var beatmapTracker = new OnlinePlayBeatmapAvailablilityTracker { SelectedItem = { BindTarget = selectedItem } };
+            var beatmapTracker = new OnlinePlayBeatmapAvailabilityTracker { SelectedItem = { BindTarget = selectedItem } };
             base.Content.Add(beatmapTracker);
             Dependencies.Cache(beatmapTracker);
 

From 6fe1b68510397ccccaf4339d2974784864ad02bb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 22:30:40 +0900
Subject: [PATCH 08884/10326] Add a way to retrieve new WorkingBeatmap
 instances

---
 osu.Game/Beatmaps/BeatmapManager.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b4ea898b7d..69b513d256 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -281,8 +281,9 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="beatmapInfo">The beatmap to lookup.</param>
         /// <param name="previous">The currently loaded <see cref="WorkingBeatmap"/>. Allows for optimisation where elements are shared with the new beatmap. May be returned if beatmapInfo requested matches</param>
+        /// <param name="bypassCache">Whether to bypass the cache and return a new <see cref="WorkingBeatmap"/> instance.</param>
         /// <returns>A <see cref="WorkingBeatmap"/> instance correlating to the provided <see cref="BeatmapInfo"/>.</returns>
-        public WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo, WorkingBeatmap previous = null)
+        public WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo, WorkingBeatmap previous = null, bool bypassCache = false)
         {
             if (beatmapInfo?.ID > 0 && previous != null && previous.BeatmapInfo?.ID == beatmapInfo.ID)
                 return previous;
@@ -301,9 +302,14 @@ namespace osu.Game.Beatmaps
 
             lock (workingCache)
             {
-                var working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == beatmapInfo.ID);
-                if (working != null)
-                    return working;
+                BeatmapManagerWorkingBeatmap working;
+
+                if (!bypassCache)
+                {
+                    working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == beatmapInfo.ID);
+                    if (working != null)
+                        return working;
+                }
 
                 beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 

From 8cc1e8b8b0605e981b1d0be53cb9a0590383e532 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 23:11:01 +0900
Subject: [PATCH 08885/10326] Update framework

---
 .idea/.idea.osu.Desktop/.idea/indexLayout.xml | 2 +-
 osu.Android.props                             | 2 +-
 osu.Game/osu.Game.csproj                      | 2 +-
 osu.iOS.props                                 | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
index 27ba142e96..7b08163ceb 100644
--- a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
+++ b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ContentModelUserStore">
+  <component name="UserContentModel">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />
diff --git a/osu.Android.props b/osu.Android.props
index 73ee1d9d10..cba3975209 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.407.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 931b55222a..292e5b932f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.407.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 64e9a01a92..36e581a80c 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.Framework.iOS" Version="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.407.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.407.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 544fff5af6f9fa20e1aa04e5aaa0a5ea3865b220 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 23:18:45 +0900
Subject: [PATCH 08886/10326] Undo rider EAP changes for the time being

---
 .idea/.idea.osu.Desktop/.idea/indexLayout.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
index 7b08163ceb..27ba142e96 100644
--- a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
+++ b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="UserContentModel">
+  <component name="ContentModelUserStore">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />

From 648a9d52584896db0cd3ce3cc7b5bb350bb46d32 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 23:15:09 +0900
Subject: [PATCH 08887/10326] Add multiplayer spectator player grid

---
 .../Multiplayer/Spectate/PlayerGrid.cs        | 142 ++++++++++++++++++
 .../Multiplayer/Spectate/PlayerGrid_Cell.cs   |  78 ++++++++++
 .../Multiplayer/Spectate/PlayerGrid_Facade.cs |  19 +++
 3 files changed, 239 insertions(+)
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
new file mode 100644
index 0000000000..a8bd1db9dc
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -0,0 +1,142 @@
+// Copyright (c) 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;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public partial class PlayerGrid : CompositeDrawable
+    {
+        private const float player_spacing = 5;
+
+        public Drawable MaximisedFacade => maximisedFacade;
+
+        private readonly PlayerGridFacade maximisedFacade;
+        private readonly Container paddingContainer;
+        private readonly FillFlowContainer<PlayerGridFacade> facadeContainer;
+        private readonly Container<Cell> cellContainer;
+
+        public PlayerGrid()
+        {
+            InternalChildren = new Drawable[]
+            {
+                paddingContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding(player_spacing),
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Child = facadeContainer = new FillFlowContainer<PlayerGridFacade>
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Spacing = new Vector2(player_spacing),
+                            }
+                        },
+                        maximisedFacade = new PlayerGridFacade { RelativeSizeAxes = Axes.Both }
+                    }
+                },
+                cellContainer = new Container<Cell> { RelativeSizeAxes = Axes.Both }
+            };
+        }
+
+        public void AddContent(Drawable content)
+        {
+            var facade = new PlayerGridFacade();
+            facadeContainer.Add(facade);
+
+            var cell = new Cell(content) { ToggleMaximisationState = toggleMaximisationState };
+            cell.SetFacade(facade);
+
+            cellContainer.Add(cell);
+        }
+
+        // A depth value that gets decremented every time a new instance is maximised in order to reduce underlaps.
+        private float maximisedInstanceDepth;
+
+        private void toggleMaximisationState(Cell target)
+        {
+            // Iterate through all cells to ensure only one is maximised at any time.
+            foreach (var i in cellContainer)
+            {
+                if (i == target)
+                    i.IsMaximised = !i.IsMaximised;
+                else
+                    i.IsMaximised = false;
+
+                if (i.IsMaximised)
+                {
+                    // Transfer cell to the maximised facade.
+                    i.SetFacade(maximisedFacade);
+                    cellContainer.ChangeChildDepth(i, maximisedInstanceDepth -= 0.001f);
+                }
+                else
+                {
+                    // Transfer cell back to its original facade.
+                    i.SetFacade(facadeContainer[cellContainer.IndexOf(target)]);
+                }
+            }
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            Vector2 cellsPerDimension;
+
+            switch (facadeContainer.Count)
+            {
+                case 1:
+                    cellsPerDimension = Vector2.One;
+                    break;
+
+                case 2:
+                    cellsPerDimension = new Vector2(2, 1);
+                    break;
+
+                case 3:
+                case 4:
+                    cellsPerDimension = new Vector2(2);
+                    break;
+
+                case 5:
+                case 6:
+                    cellsPerDimension = new Vector2(3, 2);
+                    break;
+
+                case 7:
+                case 8:
+                case 9:
+                    // 3 rows / 3 cols.
+                    cellsPerDimension = new Vector2(3);
+                    break;
+
+                case 10:
+                case 11:
+                case 12:
+                    // 3 rows / 4 cols.
+                    cellsPerDimension = new Vector2(4, 3);
+                    break;
+
+                default:
+                    // 4 rows / 4 cols.
+                    cellsPerDimension = new Vector2(4);
+                    break;
+            }
+
+            // Total spacing between cells
+            Vector2 totalCellSpacing = player_spacing * (cellsPerDimension - Vector2.One);
+
+            Vector2 fullSize = paddingContainer.ChildSize - totalCellSpacing;
+            Vector2 cellSize = Vector2.Divide(fullSize, new Vector2(cellsPerDimension.X, cellsPerDimension.Y));
+
+            foreach (var cell in facadeContainer)
+                cell.Size = cellSize;
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
new file mode 100644
index 0000000000..1f6e718aa7
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -0,0 +1,78 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using JetBrains.Annotations;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osuTK;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public partial class PlayerGrid
+    {
+        private class Cell : CompositeDrawable
+        {
+            public Action<Cell> ToggleMaximisationState;
+            public bool IsMaximised;
+
+            private PlayerGridFacade facade;
+            private bool isTracking = true;
+
+            public Cell(Drawable content)
+            {
+                Origin = Anchor.Centre;
+
+                InternalChild = content;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                if (isTracking)
+                {
+                    Position = getFinalPosition();
+                    Size = getFinalSize();
+                }
+            }
+
+            public void SetFacade([NotNull] PlayerGridFacade newFacade)
+            {
+                PlayerGridFacade lastFacade = facade;
+                facade = newFacade;
+
+                if (lastFacade == null || lastFacade == newFacade)
+                    return;
+
+                isTracking = false;
+
+                this.MoveTo(getFinalPosition(), 400, Easing.OutQuint).ResizeTo(getFinalSize(), 400, Easing.OutQuint)
+                    .Then()
+                    .OnComplete(_ =>
+                    {
+                        if (facade == newFacade)
+                            isTracking = true;
+                    });
+            }
+
+            private Vector2 getFinalPosition()
+            {
+                var topLeft = Parent.ToLocalSpace(facade.ToScreenSpace(Vector2.Zero));
+                return topLeft + facade.DrawSize / 2;
+            }
+
+            private Vector2 getFinalSize() => facade.DrawSize;
+
+            // Todo: Temporary?
+            protected override bool ShouldBeConsideredForInput(Drawable child) => false;
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                ToggleMaximisationState(this);
+                return true;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
new file mode 100644
index 0000000000..c565e2fec6
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public partial class PlayerGrid
+    {
+        private class PlayerGridFacade : Drawable
+        {
+            public PlayerGridFacade()
+            {
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+            }
+        }
+    }
+}

From 024adb699c44b5748eebc77a33c2010eb841f562 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 00:06:14 +0900
Subject: [PATCH 08888/10326] Add test and fix several issues

---
 ...TestSceneMultiplayerSpectatorPlayerGrid.cs | 115 ++++++++++++++++++
 .../Multiplayer/Spectate/PlayerGrid.cs        |  30 +++--
 .../Multiplayer/Spectate/PlayerGrid_Cell.cs   |  26 +++-
 .../Multiplayer/Spectate/PlayerGrid_Facade.cs |   7 +-
 4 files changed, 161 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorPlayerGrid.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorPlayerGrid.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorPlayerGrid.cs
new file mode 100644
index 0000000000..c0958c7fe8
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorPlayerGrid.cs
@@ -0,0 +1,115 @@
+// Copyright (c) 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;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osuTK.Graphics;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerSpectatorPlayerGrid : OsuManualInputManagerTestScene
+    {
+        private PlayerGrid grid;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Child = grid = new PlayerGrid { RelativeSizeAxes = Axes.Both };
+        });
+
+        [Test]
+        public void TestMaximiseAndMinimise()
+        {
+            addCells(2);
+
+            assertMaximisation(0, false, true);
+            assertMaximisation(1, false, true);
+
+            clickCell(0);
+            assertMaximisation(0, true);
+            assertMaximisation(1, false, true);
+            clickCell(0);
+            assertMaximisation(0, false);
+            assertMaximisation(1, false, true);
+
+            clickCell(1);
+            assertMaximisation(1, true);
+            assertMaximisation(0, false, true);
+            clickCell(1);
+            assertMaximisation(1, false);
+            assertMaximisation(0, false, true);
+        }
+
+        [Test]
+        public void TestClickBothCellsSimultaneously()
+        {
+            addCells(2);
+
+            AddStep("click cell 0 then 1", () =>
+            {
+                InputManager.MoveMouseTo(grid.Content.ElementAt(0));
+                InputManager.Click(MouseButton.Left);
+
+                InputManager.MoveMouseTo(grid.Content.ElementAt(1));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            assertMaximisation(1, true);
+            assertMaximisation(0, false);
+        }
+
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(3)]
+        [TestCase(4)]
+        [TestCase(5)]
+        [TestCase(9)]
+        [TestCase(11)]
+        [TestCase(12)]
+        [TestCase(15)]
+        [TestCase(16)]
+        public void TestCellCount(int count)
+        {
+            addCells(count);
+            AddWaitStep("wait for display", 2);
+        }
+
+        private void addCells(int count) => AddStep($"add {count} grid cells", () =>
+        {
+            for (int i = 0; i < count; i++)
+                grid.Add(new GridContent());
+        });
+
+        private void clickCell(int index) => AddStep($"click cell index {index}", () =>
+        {
+            InputManager.MoveMouseTo(grid.Content.ElementAt(index));
+            InputManager.Click(MouseButton.Left);
+        });
+
+        private void assertMaximisation(int index, bool shouldBeMaximised, bool instant = false)
+        {
+            string assertionText = $"cell index {index} {(shouldBeMaximised ? "is" : "is not")} maximised";
+
+            if (instant)
+                AddAssert(assertionText, checkAction);
+            else
+                AddUntilStep(assertionText, checkAction);
+
+            bool checkAction() => Precision.AlmostEquals(grid.MaximisedFacade.DrawSize, grid.Content.ElementAt(index).DrawSize, 10) == shouldBeMaximised;
+        }
+
+        private class GridContent : Box
+        {
+            public GridContent()
+            {
+                RelativeSizeAxes = Axes.Both;
+                Colour = new Color4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1f);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index a8bd1db9dc..f41948217c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -13,9 +13,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         public Drawable MaximisedFacade => maximisedFacade;
 
-        private readonly PlayerGridFacade maximisedFacade;
+        private readonly Facade maximisedFacade;
         private readonly Container paddingContainer;
-        private readonly FillFlowContainer<PlayerGridFacade> facadeContainer;
+        private readonly FillFlowContainer<Facade> facadeContainer;
         private readonly Container<Cell> cellContainer;
 
         public PlayerGrid()
@@ -31,38 +31,50 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                         new Container
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Child = facadeContainer = new FillFlowContainer<PlayerGridFacade>
+                            Child = facadeContainer = new FillFlowContainer<Facade>
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Spacing = new Vector2(player_spacing),
                             }
                         },
-                        maximisedFacade = new PlayerGridFacade { RelativeSizeAxes = Axes.Both }
+                        maximisedFacade = new Facade { RelativeSizeAxes = Axes.Both }
                     }
                 },
                 cellContainer = new Container<Cell> { RelativeSizeAxes = Axes.Both }
             };
         }
 
-        public void AddContent(Drawable content)
+        /// <summary>
+        /// Adds a new cell with content to this grid.
+        /// </summary>
+        /// <param name="content">The content the cell should contain.</param>
+        /// <exception cref="InvalidOperationException">If more than 16 cells are added.</exception>
+        public void Add(Drawable content)
         {
-            var facade = new PlayerGridFacade();
+            int index = cellContainer.Count;
+
+            var facade = new Facade();
             facadeContainer.Add(facade);
 
-            var cell = new Cell(content) { ToggleMaximisationState = toggleMaximisationState };
+            var cell = new Cell(index, content) { ToggleMaximisationState = toggleMaximisationState };
             cell.SetFacade(facade);
 
             cellContainer.Add(cell);
         }
 
+        /// <summary>
+        /// The content added to this grid.
+        /// </summary>
+        public IEnumerable<Drawable> Content => cellContainer.OrderBy(c => c.FacadeIndex).Select(c => c.Content);
+
         // A depth value that gets decremented every time a new instance is maximised in order to reduce underlaps.
         private float maximisedInstanceDepth;
 
         private void toggleMaximisationState(Cell target)
         {
             // Iterate through all cells to ensure only one is maximised at any time.
-            foreach (var i in cellContainer)
+            foreach (var i in cellContainer.ToList())
             {
                 if (i == target)
                     i.IsMaximised = !i.IsMaximised;
@@ -78,7 +90,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 else
                 {
                     // Transfer cell back to its original facade.
-                    i.SetFacade(facadeContainer[cellContainer.IndexOf(target)]);
+                    i.SetFacade(facadeContainer[i.FacadeIndex]);
                 }
             }
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index 1f6e718aa7..c2ac190d40 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -14,17 +14,28 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         private class Cell : CompositeDrawable
         {
+            /// <summary>
+            /// The index of the original facade of this cell.
+            /// </summary>
+            public readonly int FacadeIndex;
+
+            /// <summary>
+            /// The contained content.
+            /// </summary>
+            public readonly Drawable Content;
+
             public Action<Cell> ToggleMaximisationState;
             public bool IsMaximised;
 
-            private PlayerGridFacade facade;
+            private Facade facade;
             private bool isTracking = true;
 
-            public Cell(Drawable content)
+            public Cell(int facadeIndex, Drawable content)
             {
-                Origin = Anchor.Centre;
+                FacadeIndex = facadeIndex;
 
-                InternalChild = content;
+                Origin = Anchor.Centre;
+                InternalChild = Content = content;
             }
 
             protected override void Update()
@@ -38,9 +49,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 }
             }
 
-            public void SetFacade([NotNull] PlayerGridFacade newFacade)
+            /// <summary>
+            /// Makes this cell track a new facade.
+            /// </summary>
+            public void SetFacade([NotNull] Facade newFacade)
             {
-                PlayerGridFacade lastFacade = facade;
+                Facade lastFacade = facade;
                 facade = newFacade;
 
                 if (lastFacade == null || lastFacade == newFacade)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
index c565e2fec6..6b363c6040 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
@@ -7,9 +7,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public partial class PlayerGrid
     {
-        private class PlayerGridFacade : Drawable
+        /// <summary>
+        /// A facade of the grid which is used as a dummy object to store the required position/size of cells.
+        /// </summary>
+        private class Facade : Drawable
         {
-            public PlayerGridFacade()
+            public Facade()
             {
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;

From 5dc939c2f365d09395f0fe1880bb88a3d8dbda21 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 00:06:32 +0900
Subject: [PATCH 08889/10326] More documentation

---
 .../OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs | 15 ++++++++++++++-
 .../Multiplayer/Spectate/PlayerGrid_Cell.cs       | 10 ++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index f41948217c..830378f129 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -1,16 +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;
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
+    /// <summary>
+    /// A grid of players playing the multiplayer match.
+    /// </summary>
     public partial class PlayerGrid : CompositeDrawable
     {
         private const float player_spacing = 5;
 
+        /// <summary>
+        /// The currently-maximised facade.
+        /// </summary>
         public Drawable MaximisedFacade => maximisedFacade;
 
         private readonly Facade maximisedFacade;
@@ -52,6 +61,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// <exception cref="InvalidOperationException">If more than 16 cells are added.</exception>
         public void Add(Drawable content)
         {
+            if (cellContainer.Count == 16)
+                throw new InvalidOperationException("Only 16 cells are supported.");
+
             int index = cellContainer.Count;
 
             var facade = new Facade();
@@ -99,6 +111,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
             base.Update();
 
+            // Different layouts are used for varying cell counts in order to maximise dimensions.
             Vector2 cellsPerDimension;
 
             switch (facadeContainer.Count)
@@ -141,7 +154,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                     break;
             }
 
-            // Total spacing between cells
+            // Total inter-cell spacing.
             Vector2 totalCellSpacing = player_spacing * (cellsPerDimension - Vector2.One);
 
             Vector2 fullSize = paddingContainer.ChildSize - totalCellSpacing;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index c2ac190d40..37d88693ee 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -12,6 +12,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public partial class PlayerGrid
     {
+        /// <summary>
+        /// A cell of the grid. Contains the content and tracks to the linked facade.
+        /// </summary>
         private class Cell : CompositeDrawable
         {
             /// <summary>
@@ -24,7 +27,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             /// </summary>
             public readonly Drawable Content;
 
+            /// <summary>
+            /// An action that toggles the maximisation state of this cell.
+            /// </summary>
             public Action<Cell> ToggleMaximisationState;
+
+            /// <summary>
+            /// Whether this cell is currently maximised.
+            /// </summary>
             public bool IsMaximised;
 
             private Facade facade;

From 9d0293070971e17132b201448afbb42c5f40b295 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 17:18:55 +0200
Subject: [PATCH 08890/10326] Add regression test for type changes

---
 .../TestSceneSliderControlPointPiece.cs       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index 9b67d18db6..d7dfc3bd42 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -105,6 +105,25 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(2, PathType.PerfectCurve);
         }
 
+        [Test]
+        public void TestDragControlPointPathAfterChangingType()
+        {
+            AddStep("change type to bezier", () => slider.Path.ControlPoints[2].Type.Value = PathType.Bezier);
+            AddStep("add point", () => slider.Path.ControlPoints.Add(new PathControlPoint(new Vector2(500, 10))));
+            AddStep("change type to perfect", () => slider.Path.ControlPoints[3].Type.Value = PathType.PerfectCurve);
+
+            moveMouseToControlPoint(4);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            assertControlPointType(3, PathType.PerfectCurve);
+
+            addMovementStep(new Vector2(350, 0.01f));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(4, new Vector2(350, 0.01f));
+            assertControlPointType(3, PathType.Bezier);
+        }
+
         private void addMovementStep(Vector2 relativePosition)
         {
             AddStep($"move mouse to {relativePosition}", () =>

From b8ab1c768253402bdfb3644808cbfde05234ef07 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 17:19:12 +0200
Subject: [PATCH 08891/10326] Track path type changes for `PointsInSegment`

---
 .../Sliders/Components/PathControlPointPiece.cs     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 394d2b039d..5fcf0656c5 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -50,6 +50,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private readonly List<IBindable<PathType?>> pathTypes;
+
         private IBindable<int> sliderVersion;
         private IBindable<Vector2> sliderPosition;
         private IBindable<float> sliderScale;
@@ -59,8 +61,19 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
+            pathTypes = new List<IBindable<PathType?>>();
+
             slider.Path.ControlPoints.BindCollectionChanged((_, args) =>
             {
+                pathTypes.Clear();
+
+                foreach (var point in slider.Path.ControlPoints)
+                {
+                    IBindable<PathType?> boundTypeCopy = point.Type.GetBoundCopy();
+                    pathTypes.Add(boundTypeCopy);
+                    boundTypeCopy.BindValueChanged(_ => PointsInSegment = slider.Path.PointsInSegment(controlPoint));
+                }
+
                 PointsInSegment = slider.Path.PointsInSegment(controlPoint);
             }, runOnceImmediately: true);
 

From 0a6baf670eff5a90704b95277cf8a8b89dd44375 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Wed, 7 Apr 2021 14:41:21 -0400
Subject: [PATCH 08892/10326] Send a warning notification if device is
 unplugged and low battery - Uses Xamarin.Essentials in osu.Game.PlayerLoader
 to check battery level - Encapsulated battery checking in the public
 BatteryManager class so battery level and plugged in status can be accessed
 and edited in TestPlayerLoader - When checking battery level, catch
 NotImplementedException thrown by Xamarin.Essentials.Battery on non-mobile
 platforms - Added visual unit tests for battery notification   To mock
 battery status and level, we had to define a batteryManager object in
 TestPlayerLoader and add a new function ResetPlayerWithBattery()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Marlina José <marlina@umich.edu>
---
 osu.Android/Properties/AndroidManifest.xml    |  1 +
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 48 +++++++++++++
 osu.Game.Tests/osu.Game.Tests.csproj          |  2 +-
 osu.Game/Configuration/SessionStatics.cs      |  2 +
 osu.Game/Screens/Play/PlayerLoader.cs         | 71 +++++++++++++++++++
 osu.Game/osu.Game.csproj                      |  3 +-
 6 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/osu.Android/Properties/AndroidManifest.xml b/osu.Android/Properties/AndroidManifest.xml
index 770eaf2222..e717bab310 100644
--- a/osu.Android/Properties/AndroidManifest.xml
+++ b/osu.Android/Properties/AndroidManifest.xml
@@ -6,5 +6,6 @@
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.READ_FRAME_BUFFER" />
 	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.BATTERY_STATS" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!" android:icon="@drawable/lazer" />
 </manifest>
\ No newline at end of file
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 88fbf09ef4..a31d53e3b6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -93,6 +93,26 @@ namespace osu.Game.Tests.Visual.Gameplay
             LoadScreen(loader = new TestPlayerLoader(() => player = new TestPlayer(interactive, interactive)));
         }
 
+        /// <summary>
+        /// Sets the input manager child to a new test player loader container instance with a custom battery level
+        /// </summary>
+        /// <param name="interactive">If the test player should behave like the production one.</param>
+        /// <param name="pluggedIn">If the player's device is plugged in.</param>
+        /// <param name="batteryLevel">A custom battery level for the test player.</param>
+        private void resetPlayerWithBattery(bool interactive, bool pluggedIn, double batteryLevel)
+        {
+            Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+            Beatmap.Value.BeatmapInfo.EpilepsyWarning = epilepsyWarning;
+
+            foreach (var mod in SelectedMods.Value.OfType<IApplicableToTrack>())
+                mod.ApplyToTrack(Beatmap.Value.Track);
+
+            loader = new TestPlayerLoader(() => player = new TestPlayer(interactive, interactive));
+            loader.batteryManager.ChargeLevel = batteryLevel;
+            loader.batteryManager.PluggedIn = pluggedIn;
+            LoadScreen(loader);
+        }
+
         [Test]
         public void TestEarlyExitBeforePlayerConstruction()
         {
@@ -270,6 +290,32 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for player load", () => player.IsLoaded);
         }
 
+        [TestCase(false, 1.0)] // not plugged in, full battery, no notification
+        [TestCase(false, 0.2)] // not plugged in, at warning level, no notification
+        [TestCase(true, 0.1)] // plugged in, charging, below warning level, no notification
+        [TestCase(false, 0.1)] // not plugged in, below warning level, notification
+        public void TestLowBatteryNotification(bool pluggedIn, double batteryLevel)
+        {
+            AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce).Value = false);
+
+            // mock phone on battery
+            AddStep("load player", () => resetPlayerWithBattery(false, pluggedIn, batteryLevel));
+            AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
+            int notificationCount = !pluggedIn && batteryLevel < PlayerLoader.battery_tolerance ? 1 : 0;
+            AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
+            AddStep("click notification", () =>
+                {
+                    var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
+                    var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
+                    var notification = flowContainer.First();
+
+                    InputManager.MoveMouseTo(notification);
+                    InputManager.Click(MouseButton.Left);
+                });
+
+            AddUntilStep("wait for player load", () => player.IsLoaded);
+        }
+
         [TestCase(true)]
         [TestCase(false)]
         public void TestEpilepsyWarning(bool warning)
@@ -310,6 +356,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public IReadOnlyList<Mod> DisplayedMods => MetadataInfo.Mods.Value;
 
+            public new BatteryManager batteryManager => base.batteryManager;
+
             public TestPlayerLoader(Func<Player> createPlayer)
                 : base(createPlayer)
             {
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 0e1f6f6b0c..df6d17f615 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -22,4 +22,4 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj" />
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 36eb6964dd..e8ee04731c 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -16,6 +16,7 @@ namespace osu.Game.Configuration
         {
             SetDefault(Static.LoginOverlayDisplayed, false);
             SetDefault(Static.MutedAudioNotificationShownOnce, false);
+            SetDefault(Static.BatteryLowNotificationShownOnce, false);
             SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
             SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
@@ -25,6 +26,7 @@ namespace osu.Game.Configuration
     {
         LoginOverlayDisplayed,
         MutedAudioNotificationShownOnce,
+        BatteryLowNotificationShownOnce,
 
         /// <summary>
         /// Info about seasonal backgrounds available fetched from API - see <see cref="APISeasonalBackgrounds"/>.
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 679b3c7313..01a51e6e7a 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -26,6 +26,7 @@ using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
+using Xamarin.Essentials;
 
 namespace osu.Game.Screens.Play
 {
@@ -121,6 +122,7 @@ namespace osu.Game.Screens.Play
         private void load(SessionStatics sessionStatics)
         {
             muteWarningShownOnce = sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce);
+            batteryWarningShownOnce = sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce);
 
             InternalChild = (content = new LogoTrackingContainer
             {
@@ -196,6 +198,7 @@ namespace osu.Game.Screens.Play
             Scheduler.Add(new ScheduledDelegate(pushWhenLoaded, Clock.CurrentTime + 1800, 0));
 
             showMuteWarningIfNeeded();
+            showBatteryWarningIfNeeded();
         }
 
         public override void OnResuming(IScreen last)
@@ -470,5 +473,73 @@ namespace osu.Game.Screens.Play
         }
 
         #endregion
+
+        #region Low battery warning
+        private Bindable<bool> batteryWarningShownOnce;
+
+        // Send a warning if battery is less than 20%
+        public const double battery_tolerance = 0.2;
+
+        private void showBatteryWarningIfNeeded()
+        {
+            if (!batteryWarningShownOnce.Value)
+            {
+                // Checks if the notification has not been shown yet, device is unplugged and if device battery is low.
+                if (!batteryManager.PluggedIn && batteryManager.ChargeLevel < battery_tolerance)
+                {
+                    Console.WriteLine("Battery level: {0}", batteryManager.ChargeLevel);
+                    notificationOverlay?.Post(new BatteryWarningNotification());
+                    batteryWarningShownOnce.Value = true;
+                }
+            }
+        }
+        public BatteryManager batteryManager = new BatteryManager();
+        public class BatteryManager
+        {
+            public double ChargeLevel;
+            public bool PluggedIn;
+            public BatteryManager()
+            {
+                // Attempt to get battery information using Xamarin.Essentials
+                // Xamarin.Essentials throws a NotSupportedOrImplementedException on .NET standard so this only works on iOS/Android
+                // https://github.com/xamarin/Essentials/blob/7218ab88f7fbe00ec3379bd54e6c0ce35ffc0c22/Xamarin.Essentials/Battery/Battery.netstandard.tvos.cs
+                try
+                {
+                    ChargeLevel = Battery.ChargeLevel;
+                    PluggedIn = Battery.PowerSource == BatteryPowerSource.Battery;
+                }
+                catch (NotImplementedException e)
+                {
+                    Console.WriteLine("Could not access battery info: {0}", e);
+                    ChargeLevel = 1.0;
+                    PluggedIn = false;
+                }
+            }
+        }
+
+        private class BatteryWarningNotification : SimpleNotification
+        {
+            public override bool IsImportant => true;
+
+            public BatteryWarningNotification()
+            {
+                Text = "Your battery level is low! Charge your device to prevent interruptions.";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours, NotificationOverlay notificationOverlay)
+            {
+                Icon = FontAwesome.Solid.BatteryQuarter;
+                IconBackgound.Colour = colours.RedDark;
+
+                Activated = delegate
+                {
+                    notificationOverlay.Hide();
+                    return true;
+                };
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 292e5b932f..c68be5313d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
     <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
@@ -35,5 +35,6 @@
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
 </Project>

From d1d56c636a04a48e5cafdc3cf0cb1d1996d2162e Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 01:43:06 +0200
Subject: [PATCH 08893/10326] Convert `pathTypes` to local variable

Not entirely sure what holds the reference to pathTypes now (the binding to`slider.Path.ControlPoints` maybe?), but this does seem to work still.
---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 5fcf0656c5..bb50fec5dc 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -50,8 +50,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private readonly List<IBindable<PathType?>> pathTypes;
-
         private IBindable<int> sliderVersion;
         private IBindable<Vector2> sliderPosition;
         private IBindable<float> sliderScale;
@@ -61,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
-            pathTypes = new List<IBindable<PathType?>>();
+            var pathTypes = new List<IBindable<PathType?>>();
 
             slider.Path.ControlPoints.BindCollectionChanged((_, args) =>
             {

From d6490899e2946294bbdab7f0d0db6a5bd014ce5d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 03:21:56 +0200
Subject: [PATCH 08894/10326] Simplify slider path bindings

Adds a slight performance overhead, but solves the memory leak and makes the code much easier to follow.
---
 .../Components/PathControlPointPiece.cs       | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index bb50fec5dc..20d4fe4ea9 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -50,7 +50,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private IBindable<int> sliderVersion;
         private IBindable<Vector2> sliderPosition;
         private IBindable<float> sliderScale;
         private IBindable<Vector2> controlPointPosition;
@@ -59,20 +58,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
-            var pathTypes = new List<IBindable<PathType?>>();
 
-            slider.Path.ControlPoints.BindCollectionChanged((_, args) =>
+            slider.Path.Version.BindValueChanged(_ =>
             {
-                pathTypes.Clear();
-
-                foreach (var point in slider.Path.ControlPoints)
-                {
-                    IBindable<PathType?> boundTypeCopy = point.Type.GetBoundCopy();
-                    pathTypes.Add(boundTypeCopy);
-                    boundTypeCopy.BindValueChanged(_ => PointsInSegment = slider.Path.PointsInSegment(controlPoint));
-                }
-
-                PointsInSegment = slider.Path.PointsInSegment(controlPoint);
+                PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
+                updatePathType();
             }, runOnceImmediately: true);
 
             controlPoint.Type.BindValueChanged(_ => updateMarkerDisplay());
@@ -120,9 +110,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             base.LoadComplete();
 
-            sliderVersion = slider.Path.Version.GetBoundCopy();
-            sliderVersion.BindValueChanged(_ => updatePathType());
-
             sliderPosition = slider.PositionBindable.GetBoundCopy();
             sliderPosition.BindValueChanged(_ => updateMarkerDisplay());
 

From 8aff53172de5f153b5926926bc0bf1c8e75f3ef5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 15:17:53 +0900
Subject: [PATCH 08895/10326] Remove necessity for nested
 PassThroughInputManger

---
 .../Gameplay/TestSceneGameplayMenuOverlay.cs  |  2 +-
 .../Input/Bindings/GlobalActionContainer.cs   | 23 ++++++++++-----
 osu.Game/Input/Bindings/GlobalInputManager.cs | 29 -------------------
 osu.Game/OsuGameBase.cs                       | 15 ++++++----
 .../Visual/OsuManualInputManagerTestScene.cs  |  2 +-
 5 files changed, 26 insertions(+), 45 deletions(-)
 delete mode 100644 osu.Game/Input/Bindings/GlobalInputManager.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
index 75e8194708..d69ac665cc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game)
         {
-            Child = globalActionContainer = new GlobalActionContainer(game, null);
+            Child = globalActionContainer = new GlobalActionContainer(game);
         }
 
         [SetUp]
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 042960d54c..671c3bc8bc 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -13,20 +12,23 @@ namespace osu.Game.Input.Bindings
 {
     public class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput
     {
-        [CanBeNull]
-        private readonly GlobalInputManager globalInputManager;
-
         private readonly Drawable handler;
+        private InputManager parentInputManager;
 
-        public GlobalActionContainer(OsuGameBase game, [CanBeNull] GlobalInputManager globalInputManager)
+        public GlobalActionContainer(OsuGameBase game)
             : base(matchingMode: KeyCombinationMatchingMode.Modifiers)
         {
-            this.globalInputManager = globalInputManager;
-
             if (game is IKeyBindingHandler<GlobalAction>)
                 handler = game;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            parentInputManager = GetContainingInputManager();
+        }
+
         public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings
                                                                        .Concat(EditorKeyBindings)
                                                                        .Concat(InGameKeyBindings)
@@ -113,7 +115,12 @@ namespace osu.Game.Input.Bindings
         {
             get
             {
-                var inputQueue = globalInputManager?.NonPositionalInputQueue ?? base.KeyBindingInputQueue;
+                // To ensure the global actions are handled with priority, this GlobalActionContainer is actually placed after game content.
+                // It does not contain children as expected, so we need to forward the NonPositionalInputQueue from the parent input manager to correctly
+                // allow the whole game to handle these actions.
+
+                // An eventual solution to this hack is to create localised action containers for individual components like SongSelect, but this will take some rearranging.
+                var inputQueue = parentInputManager?.NonPositionalInputQueue ?? base.KeyBindingInputQueue;
 
                 return handler != null ? inputQueue.Prepend(handler) : inputQueue;
             }
diff --git a/osu.Game/Input/Bindings/GlobalInputManager.cs b/osu.Game/Input/Bindings/GlobalInputManager.cs
deleted file mode 100644
index 91373712fb..0000000000
--- a/osu.Game/Input/Bindings/GlobalInputManager.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;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Input;
-
-namespace osu.Game.Input.Bindings
-{
-    public class GlobalInputManager : PassThroughInputManager
-    {
-        public readonly GlobalActionContainer GlobalBindings;
-
-        protected override Container<Drawable> Content { get; }
-
-        public GlobalInputManager(OsuGameBase game)
-        {
-            InternalChildren = new Drawable[]
-            {
-                Content = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                },
-                // to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
-                GlobalBindings = new GlobalActionContainer(game, this)
-            };
-        }
-    }
-}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 21313d0596..ca132df552 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -308,18 +308,21 @@ namespace osu.Game
 
             AddInternal(RulesetConfigCache);
 
-            var globalInput = new GlobalInputManager(this)
+            GlobalActionContainer globalBindings;
+
+            var mainContent = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Child = MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both }
+                MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both },
+                // to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
+                globalBindings = new GlobalActionContainer(this)
             };
 
             MenuCursorContainer.Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both };
 
-            base.Content.Add(CreateScalingContainer().WithChild(globalInput));
+            base.Content.Add(CreateScalingContainer().WithChildren(mainContent));
 
-            KeyBindingStore.Register(globalInput.GlobalBindings);
-            dependencies.Cache(globalInput.GlobalBindings);
+            KeyBindingStore.Register(globalBindings);
+            dependencies.Cache(globalBindings);
 
             PreviewTrackManager previewTrackManager;
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());
diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index 7dad636da7..01dd7a25c8 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Tests.Visual
 
             if (CreateNestedActionContainer)
             {
-                mainContent = new GlobalActionContainer(null, null).WithChild(mainContent);
+                mainContent = new GlobalActionContainer(null).WithChild(mainContent);
             }
 
             base.Content.AddRange(new Drawable[]

From 545156d15ca19a67bc22c43aa6dded4cee3cd877 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 15:20:53 +0900
Subject: [PATCH 08896/10326] Add regression test coverage

---
 .../Visual/Navigation/TestSceneScreenNavigation.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 00f9bf3432..859cefe3a9 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -44,6 +44,20 @@ namespace osu.Game.Tests.Visual.Navigation
             exitViaEscapeAndConfirm();
         }
 
+        /// <summary>
+        /// This tests that the F1 key will open the mod select overlay, and not be handled / blocked by the music controller (which has the same default binding
+        /// but should be handled *after* song select).
+        /// </summary>
+        [Test]
+        public void TestOpenModSelectOverlayUsingAction()
+        {
+            TestSongSelect songSelect = null;
+
+            PushAndConfirm(() => songSelect = new TestSongSelect());
+            AddStep("Show mods overlay", () => InputManager.Key(Key.F1));
+            AddAssert("Overlay was shown", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
+        }
+
         [Test]
         public void TestRetryCountIncrements()
         {

From b73860cb5f6de153df50f3dc64b067dd611a6f40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 15:47:55 +0900
Subject: [PATCH 08897/10326] Slightly alter button colour scheme to make text
 more legible and reduce saturation

---
 .../Multiplayer/Match/MultiplayerSpectateButton.cs   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
index 50be7719d9..4b3fb5d00f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
@@ -68,16 +68,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             {
                 default:
                     button.Text = "Spectate";
-                    button.BackgroundColour = colours.Blue;
-                    button.Triangles.ColourDark = colours.Blue;
-                    button.Triangles.ColourLight = colours.BlueLight;
+                    button.BackgroundColour = colours.BlueDark;
+                    button.Triangles.ColourDark = colours.BlueDarker;
+                    button.Triangles.ColourLight = colours.Blue;
                     break;
 
                 case MultiplayerUserState.Spectating:
                     button.Text = "Stop spectating";
-                    button.BackgroundColour = colours.Red;
-                    button.Triangles.ColourDark = colours.Red;
-                    button.Triangles.ColourLight = colours.RedLight;
+                    button.BackgroundColour = colours.Gray4;
+                    button.Triangles.ColourDark = colours.Gray5;
+                    button.Triangles.ColourLight = colours.Gray6;
                     break;
             }
 

From a55e62188ebe87648bcc1ffe9f6af93f167072a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 15:54:58 +0900
Subject: [PATCH 08898/10326] Change state icon to binoculars so the eye isn't
 staring at me

---
 .../Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index e6a407acec..2616b07c1f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
                 case MultiplayerUserState.Spectating:
                     text.Text = "spectating";
-                    icon.Icon = FontAwesome.Solid.Eye;
+                    icon.Icon = FontAwesome.Solid.Binoculars;
                     icon.Colour = colours.BlueLight;
                     break;
 

From 725edfcbf35bdbdca7f1e277722ed7d749e5f8f2 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 09:05:35 +0200
Subject: [PATCH 08899/10326] Add path type menu change method

---
 .../Components/PathControlPointVisualiser.cs       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index ce5dc4855e..ff2e4ea152 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -153,6 +153,18 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
         }
 
+        /// <summary>
+        /// Attempts to set the given control point piece to the given path type.
+        /// If that would fail, try to change the path such that it instead succeeds
+        /// in a UX-friendly way.
+        /// </summary>
+        /// <param name="piece">The control point piece that we want to change the path type of.</param>
+        /// <param name="type">The path type we want to assign to the given control point piece.</param>
+        private void updatePathType(PathControlPointPiece piece, PathType? type)
+        {
+            piece.ControlPoint.Type.Value = type;
+        }
+
         [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }
 
@@ -218,7 +230,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             var item = new PathTypeMenuItem(type, () =>
             {
                 foreach (var p in Pieces.Where(p => p.IsSelected.Value))
-                    p.ControlPoint.Type.Value = type;
+                    updatePathType(p, type);
             });
 
             if (countOfState == totalCount)

From 0341023d13cf7926a04d67852ec995874e10e79f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 09:06:28 +0200
Subject: [PATCH 08900/10326] Improve UX of selecting PerfectCurve

---
 .../Components/PathControlPointVisualiser.cs     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index ff2e4ea152..0b163cbc44 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -162,6 +162,22 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         /// <param name="type">The path type we want to assign to the given control point piece.</param>
         private void updatePathType(PathControlPointPiece piece, PathType? type)
         {
+            int indexInSegment = piece.PointsInSegment.IndexOf(piece.ControlPoint);
+
+            switch (type)
+            {
+                case PathType.PerfectCurve:
+                    if (piece.PointsInSegment.Count > 3)
+                    {
+                        // Can't always create a circular arc out of 4 or more points,
+                        // so we split the segment into one 3-point circular arc segment
+                        // and one bezier segment.
+                        piece.PointsInSegment[indexInSegment + 2].Type.Value = PathType.Bezier;
+                    }
+
+                    break;
+            }
+
             piece.ControlPoint.Type.Value = type;
         }
 

From b38d332268bf678cda1746bb264a7adb32d7a7e5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 16:29:11 +0900
Subject: [PATCH 08901/10326] Fix broken test

---
 .../Multiplayer/TestSceneMultiplayerReadyButton.cs       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index dad1237991..dfb4306e67 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -209,9 +209,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             addClickButtonStep();
             AddAssert("user waiting for load", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
-            AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
 
+            AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
             AddStep("transitioned to gameplay", () => readyClickOperation.Dispose());
+
+            AddStep("finish gameplay", () =>
+            {
+                Client.ChangeUserState(Client.Room?.Users[0].UserID ?? 0, MultiplayerUserState.Loaded);
+                Client.ChangeUserState(Client.Room?.Users[0].UserID ?? 0, MultiplayerUserState.FinishedPlay);
+            });
+
             AddAssert("ready button enabled", () => button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
         }
     }

From fd2a14a0bf07fd5e8b940f2f666455fc4eb923ba Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 16:30:48 +0900
Subject: [PATCH 08902/10326] Only set button state once

---
 .../Multiplayer/Match/MultiplayerReadyButton.cs       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 6919be2d56..f2dd9a6f25 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -105,14 +105,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     break;
             }
 
-            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
+            bool enableButton = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
 
-            // When the local user is the host and spectating the match, the "start match" state should be enabled.
+            // When the local user is the host and spectating the match, the "start match" state should be enabled if any users are ready.
             if (localUser.State == MultiplayerUserState.Spectating)
-            {
-                button.Enabled.Value &= Room?.Host?.Equals(localUser) == true;
-                button.Enabled.Value &= newCountReady > 0;
-            }
+                enableButton &= Room?.Host?.Equals(localUser) == true && newCountReady > 0;
+
+            button.Enabled.Value = enableButton;
 
             if (newCountReady != countReady)
             {

From be4520fe33ff6ec67367ef207a59a00fa47b8d61 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 11:46:00 +0200
Subject: [PATCH 08903/10326] Fix index out of range possibility

---
 .../Components/PathControlPointVisualiser.cs       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 0b163cbc44..1dfbf97682 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -167,13 +167,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             switch (type)
             {
                 case PathType.PerfectCurve:
-                    if (piece.PointsInSegment.Count > 3)
-                    {
-                        // Can't always create a circular arc out of 4 or more points,
-                        // so we split the segment into one 3-point circular arc segment
-                        // and one bezier segment.
-                        piece.PointsInSegment[indexInSegment + 2].Type.Value = PathType.Bezier;
-                    }
+                    // Can't always create a circular arc out of 4 or more points,
+                    // so we split the segment into one 3-point circular arc segment
+                    // and one bezier segment.
+                    int thirdPointIndex = indexInSegment + 2;
+
+                    if (piece.PointsInSegment.Count > thirdPointIndex + 1)
+                        piece.PointsInSegment[thirdPointIndex].Type.Value = PathType.Bezier;
 
                     break;
             }

From 4110d1675d001919dca028a51f5e92b19eb5d611 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 11:46:52 +0200
Subject: [PATCH 08904/10326] Add path type menu test cases

---
 .../TestScenePathControlPointVisualiser.cs    | 101 +++++++++++++++++-
 1 file changed, 99 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 738a21b17e..3e2d1cff0e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -4,9 +4,11 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Visual;
@@ -14,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
-    public class TestScenePathControlPointVisualiser : OsuTestScene
+    public class TestScenePathControlPointVisualiser : OsuManualInputManagerTestScene
     {
         private Slider slider;
         private PathControlPointVisualiser visualiser;
@@ -43,12 +45,107 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
         }
 
+        [Test]
+        public void TestPerfectCurveTooManyPoints()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200), PathType.Bezier);
+            addControlPointStep(new Vector2(300));
+            addControlPointStep(new Vector2(500, 300));
+            addControlPointStep(new Vector2(700, 200));
+            addControlPointStep(new Vector2(500, 100));
+
+            // Must be both hovering and selecting the control point for the context menu to work.
+            moveMouseToControlPoint(1);
+            AddStep("select control point", () => visualiser.Pieces[1].IsSelected.Value = true);
+            addContextMenuItemStep("Perfect curve");
+
+            assertControlPointPathType(0, PathType.Bezier);
+            assertControlPointPathType(1, PathType.PerfectCurve);
+            AddAssert("point 3 is not inherited", () => slider.Path.ControlPoints[3].Type != null);
+        }
+
+        [Test]
+        public void TestPerfectCurveLastThreePoints()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200), PathType.Bezier);
+            addControlPointStep(new Vector2(300));
+            addControlPointStep(new Vector2(500, 300));
+            addControlPointStep(new Vector2(700, 200));
+            addControlPointStep(new Vector2(500, 100));
+
+            moveMouseToControlPoint(2);
+            AddStep("select control point", () => visualiser.Pieces[2].IsSelected.Value = true);
+            addContextMenuItemStep("Perfect curve");
+
+            assertControlPointPathType(0, PathType.Bezier);
+            assertControlPointPathType(2, PathType.PerfectCurve);
+            assertControlPointPathType(4, null);
+        }
+
+        [Test]
+        public void TestPerfectCurveLastTwoPoints()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200), PathType.Bezier);
+            addControlPointStep(new Vector2(300));
+            addControlPointStep(new Vector2(500, 300));
+            addControlPointStep(new Vector2(700, 200));
+            addControlPointStep(new Vector2(500, 100));
+
+            moveMouseToControlPoint(3);
+            AddStep("select control point", () => visualiser.Pieces[3].IsSelected.Value = true);
+            addContextMenuItemStep("Perfect curve");
+
+            assertControlPointPathType(0, PathType.Bezier);
+            AddAssert("point 3 is not inherited", () => slider.Path.ControlPoints[3].Type != null);
+        }
+
         private void createVisualiser(bool allowSelection) => AddStep("create visualiser", () => Child = visualiser = new PathControlPointVisualiser(slider, allowSelection)
         {
             Anchor = Anchor.Centre,
             Origin = Anchor.Centre
         });
 
-        private void addControlPointStep(Vector2 position) => AddStep($"add control point {position}", () => slider.Path.ControlPoints.Add(new PathControlPoint(position)));
+        private void addControlPointStep(Vector2 position) => addControlPointStep(position, null);
+
+        private void addControlPointStep(Vector2 position, PathType? type)
+        {
+            AddStep($"add {type} control point at {position}", () =>
+            {
+                slider.Path.ControlPoints.Add(new PathControlPoint(position, type));
+            });
+        }
+
+        private void moveMouseToControlPoint(int index)
+        {
+            AddStep($"move mouse to control point {index}", () =>
+            {
+                Vector2 position = slider.Path.ControlPoints[index].Position.Value;
+                InputManager.MoveMouseTo(visualiser.Pieces[0].Parent.ToScreenSpace(position));
+            });
+        }
+
+        private void assertControlPointPathType(int controlPointIndex, PathType? type)
+        {
+            AddAssert($"point {controlPointIndex} is {type}", () =>
+            {
+                return slider.Path.ControlPoints[controlPointIndex].Type.Value == type;
+            });
+        }
+
+        private void addContextMenuItemStep(string contextMenuText)
+        {
+            AddStep($"click context menu item \"{contextMenuText}\"", () =>
+            {
+                MenuItem item = visualiser.ContextMenuItems[1].Items.FirstOrDefault(menuItem => menuItem.Text.Value == contextMenuText);
+
+                item?.Action?.Value();
+            });
+        }
     }
 }

From 7d2b54ca42b5d98ffaf69b5bbaba2cbf5f8059df Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 12:32:45 +0200
Subject: [PATCH 08905/10326] Add change to Bezier test

---
 .../TestScenePathControlPointVisualiser.cs    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 3e2d1cff0e..1d5a175a26 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -105,6 +105,26 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("point 3 is not inherited", () => slider.Path.ControlPoints[3].Type != null);
         }
 
+        [Test]
+        public void TestPerfectCurveChangeToBezier()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200), PathType.Bezier);
+            addControlPointStep(new Vector2(300), PathType.PerfectCurve);
+            addControlPointStep(new Vector2(500, 300));
+            addControlPointStep(new Vector2(700, 200), PathType.Bezier);
+            addControlPointStep(new Vector2(500, 100));
+
+            moveMouseToControlPoint(3);
+            AddStep("select control point", () => visualiser.Pieces[3].IsSelected.Value = true);
+            addContextMenuItemStep("Inherit");
+
+            assertControlPointPathType(0, PathType.Bezier);
+            assertControlPointPathType(1, PathType.Bezier);
+            assertControlPointPathType(3, null);
+        }
+
         private void createVisualiser(bool allowSelection) => AddStep("create visualiser", () => Child = visualiser = new PathControlPointVisualiser(slider, allowSelection)
         {
             Anchor = Anchor.Centre,

From 9a675a22195fe0d24576dbffec32285282f3209c Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 12:33:43 +0200
Subject: [PATCH 08906/10326] Correct 4+ point perfect curves to Bezier

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 20d4fe4ea9..6b78cff33e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -213,10 +213,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             if (ControlPoint.Type.Value != PathType.PerfectCurve)
                 return;
 
-            ReadOnlySpan<Vector2> points = PointsInSegment.Select(p => p.Position.Value).ToArray();
-            if (points.Length != 3)
+            if (PointsInSegment.Count > 3)
+                ControlPoint.Type.Value = PathType.Bezier;
+
+            if (PointsInSegment.Count != 3)
                 return;
 
+            ReadOnlySpan<Vector2> points = PointsInSegment.Select(p => p.Position.Value).ToArray();
             RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
             if (boundingBox.Width >= 640 || boundingBox.Height >= 480)
                 ControlPoint.Type.Value = PathType.Bezier;

From 2d9448456671c8b7e1966341af66338f45923f85 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 12:49:46 +0200
Subject: [PATCH 08907/10326] Use lambda expression

Apparently CI dislikes this not being a lambda.
---
 .../Editor/TestScenePathControlPointVisualiser.cs            | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 1d5a175a26..440ab7c889 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -152,10 +152,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         private void assertControlPointPathType(int controlPointIndex, PathType? type)
         {
-            AddAssert($"point {controlPointIndex} is {type}", () =>
-            {
-                return slider.Path.ControlPoints[controlPointIndex].Type.Value == type;
-            });
+            AddAssert($"point {controlPointIndex} is {type}", () => slider.Path.ControlPoints[controlPointIndex].Type.Value == type);
         }
 
         private void addContextMenuItemStep(string contextMenuText)

From 7713c8a45f0763a7aff7b24622e58a203c7d1c4b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 20:19:41 +0900
Subject: [PATCH 08908/10326] Add support for sliderwhistle

---
 .../Objects/Drawables/DrawableSlider.cs                | 10 +++++++---
 osu.Game.Rulesets.Osu/Objects/Slider.cs                |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 04708a5ece..8167a9f243 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.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 JetBrains.Annotations;
 using osuTK;
@@ -110,13 +111,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.LoadSamples();
 
-            var firstSample = HitObject.Samples.FirstOrDefault();
+            var firstSample = HitObject.OriginalSamples.FirstOrDefault();
 
             if (firstSample != null)
             {
-                var clone = HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderslide");
+                var samples = new List<ISampleInfo> { HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderslide") };
 
-                slidingSample.Samples = new ISampleInfo[] { clone };
+                if (HitObject.OriginalSamples.Any(s => s.Name == HitSampleInfo.HIT_WHISTLE))
+                    samples.Add(HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderwhistle"));
+
+                slidingSample.Samples = samples.ToArray();
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index e2b6c84896..54e781bbe9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -81,6 +81,8 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public List<IList<HitSampleInfo>> NodeSamples { get; set; } = new List<IList<HitSampleInfo>>();
 
+        public IList<HitSampleInfo> OriginalSamples { get; private set; }
+
         private int repeatCount;
 
         public int RepeatCount
@@ -147,6 +149,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             // The samples should be attached to the slider tail, however this can only be done after LegacyLastTick is removed otherwise they would play earlier than they're intended to.
             // For now, the samples are attached to and played by the slider itself at the correct end time.
             // ToArray call is required as GetNodeSamples may fallback to Samples itself (without it it will get cleared due to the list reference being live).
+            OriginalSamples = Samples.ToList();
             Samples = this.GetNodeSamples(repeatCount + 1).ToArray();
         }
 

From 7d291ed7d73f18bcb9bdac5f1aa26f511ee6ecf6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 20:57:50 +0900
Subject: [PATCH 08909/10326] Don't serialise OriginalSamples

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 54e781bbe9..4e71d82cab 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -81,6 +81,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public List<IList<HitSampleInfo>> NodeSamples { get; set; } = new List<IList<HitSampleInfo>>();
 
+        [JsonIgnore]
         public IList<HitSampleInfo> OriginalSamples { get; private set; }
 
         private int repeatCount;

From d64b236f8619451b3827b3dd1ca6a263ee9c7ea9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 21:27:16 +0900
Subject: [PATCH 08910/10326] Add a container that provides an isolated
 gameplay context

---
 .../Spectate/GameplayIsolationContainer.cs    | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
new file mode 100644
index 0000000000..3ccb67d342
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.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.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class GameplayIsolationContainer : Container
+    {
+        [Cached]
+        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+
+        [Cached]
+        private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+
+        [Cached]
+        private readonly Bindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>();
+
+        public GameplayIsolationContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods)
+        {
+            this.beatmap.Value = beatmap;
+            this.ruleset.Value = ruleset;
+            this.mods.Value = mods;
+
+            beatmap.LoadTrack();
+        }
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies.CacheAs(ruleset.BeginLease(false));
+            dependencies.CacheAs(beatmap.BeginLease(false));
+            dependencies.CacheAs(mods.BeginLease(false));
+            return dependencies;
+        }
+    }
+}

From 70cd018a984cf2c80e354b367ffe5698e6dda39b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 21:38:58 +0900
Subject: [PATCH 08911/10326] Fix intermittent test failure

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 6f8ec7fcfb..839118de2f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddWaitStep("wait", 10);
+            AddUntilStep("wait for join", () => Client.Room != null);
         }
 
         [Test]
@@ -114,6 +114,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
+            AddUntilStep("wait for room join", () => Client.Room != null);
+
             AddStep("join other user (ready)", () =>
             {
                 Client.AddUser(new User { Id = 55 });

From 709016f0d639f6899de78d5b2e153ec3775d829a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 22:07:00 +0900
Subject: [PATCH 08912/10326] Add initial multiplayer screen implementation

---
 .../Spectate/MultiplayerSpectator.cs          | 146 ++++++++++++++++++
 .../Spectate/MultiplayerSpectatorPlayer.cs    |  19 +++
 .../MultiplayerSpectatorPlayerLoader.cs       |  26 ++++
 .../Multiplayer/Spectate/PlayerGrid.cs        |  13 ++
 .../Multiplayer/Spectate/PlayerInstance.cs    |  55 +++++++
 .../Screens/Play/SpectatorPlayerLoader.cs     |   7 +-
 6 files changed, 265 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
new file mode 100644
index 0000000000..6b8249eae0
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -0,0 +1,146 @@
+// Copyright (c) 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.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Spectator;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Spectate;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSpectator : SpectatorScreen
+    {
+        private const double min_duration_to_allow_playback = 50;
+        private const double max_sync_offset = 2;
+
+        // Isolates beatmap/ruleset to this screen.
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        public bool AllPlayersLoaded => instances.All(p => p?.PlayerLoaded == true);
+
+        [Resolved]
+        private SpectatorStreamingClient spectatorClient { get; set; }
+
+        private readonly int[] userIds;
+        private readonly PlayerInstance[] instances;
+
+        private PlayerGrid grid;
+
+        public MultiplayerSpectator(PlaylistItem playlistItem, int[] userIds)
+            : this(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
+        {
+        }
+
+        private MultiplayerSpectator(int[] userIds)
+            : base(userIds)
+        {
+            this.userIds = userIds;
+            instances = new PlayerInstance[userIds.Length];
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = grid = new PlayerGrid
+            {
+                RelativeSizeAxes = Axes.Both
+            };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            updatePlayTime();
+        }
+
+        private bool gameplayStarted;
+
+        private void updatePlayTime()
+        {
+            if (gameplayStarted)
+            {
+                ensurePlaying(instances.Select(i => i.Beatmap.Track.CurrentTime).Max());
+                return;
+            }
+
+            // Make sure all players are loaded.
+            if (!AllPlayersLoaded)
+            {
+                ensureAllStopped();
+                return;
+            }
+
+            if (!instances.All(i => i.Score.Replay.Frames.Count > 0))
+            {
+                ensureAllStopped();
+                return;
+            }
+
+            gameplayStarted = true;
+        }
+
+        private void ensureAllStopped()
+        {
+            foreach (var inst in instances)
+                inst.ChildrenOfType<GameplayClockContainer>().SingleOrDefault()?.Stop();
+        }
+
+        private readonly BindableDouble catchupFrequencyAdjustment = new BindableDouble(2.0);
+
+        private void ensurePlaying(double targetTime)
+        {
+            foreach (var inst in instances)
+            {
+                double lastFrameTime = inst.Score.Replay.Frames.Select(f => f.Time).Last();
+                double currentTime = inst.Beatmap.Track.CurrentTime;
+
+                // If we have enough frames to play back, start playback.
+                if (Precision.DefinitelyBigger(lastFrameTime, currentTime, min_duration_to_allow_playback))
+                {
+                    inst.ChildrenOfType<GameplayClockContainer>().Single().Start();
+
+                    if (targetTime < lastFrameTime && targetTime > currentTime + 16)
+                        inst.Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                    else
+                        inst.Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                }
+                else
+                    inst.Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+            }
+        }
+
+        protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
+        {
+        }
+
+        protected override void StartGameplay(int userId, GameplayState gameplayState)
+        {
+            int userIndex = getIndexForUser(userId);
+            var existingInstance = instances[userIndex];
+
+            if (existingInstance != null)
+                grid.Remove(existingInstance);
+
+            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score), d =>
+            {
+                if (instances[userIndex] == d)
+                    grid.Add(d);
+            });
+        }
+
+        protected override void EndGameplay(int userId)
+        {
+            spectatorClient.StopWatchingUser(userId);
+        }
+
+        private int getIndexForUser(int userId) => Array.IndexOf(userIds, userId);
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
new file mode 100644
index 0000000000..bad093f666
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.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.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSpectatorPlayer : SpectatorPlayer
+    {
+        public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+        public MultiplayerSpectatorPlayer(Score score)
+            : base(score)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs
new file mode 100644
index 0000000000..c8f16b5e90
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.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 System;
+using osu.Game.Scoring;
+using osu.Game.Screens.Menu;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSpectatorPlayerLoader : SpectatorPlayerLoader
+    {
+        public MultiplayerSpectatorPlayerLoader(Score score, Func<MultiplayerSpectatorPlayer> createPlayer)
+            : base(score, createPlayer)
+        {
+        }
+
+        protected override void LogoArriving(OsuLogo logo, bool resuming)
+        {
+        }
+
+        protected override void LogoExiting(OsuLogo logo)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index 830378f129..b2d114d9cc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -75,6 +75,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             cellContainer.Add(cell);
         }
 
+        public void Remove(Drawable content)
+        {
+            var cell = cellContainer.FirstOrDefault(c => c.Content == content);
+            if (cell == null)
+                return;
+
+            if (cell.IsMaximised)
+                toggleMaximisationState(cell);
+
+            cellContainer.Remove(cell);
+            facadeContainer.Remove(facadeContainer[cell.FacadeIndex]);
+        }
+
         /// <summary>
         /// The content added to this grid.
         /// </summary>
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
new file mode 100644
index 0000000000..ab7d3e2502
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Users;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class PlayerInstance : CompositeDrawable
+    {
+        public bool PlayerLoaded => stack?.CurrentScreen is Player;
+
+        public User User => Score.ScoreInfo.User;
+        public ScoreProcessor ScoreProcessor => player?.ScoreProcessor;
+
+        public WorkingBeatmap Beatmap { get; private set; }
+        public Ruleset Ruleset { get; private set; }
+
+        public readonly Score Score;
+
+        private OsuScreenStack stack;
+        private MultiplayerSpectatorPlayer player;
+
+        public PlayerInstance(Score score)
+        {
+            Score = score;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(BeatmapManager beatmapManager)
+        {
+            Beatmap = beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true);
+            Ruleset = Score.ScoreInfo.Ruleset.CreateInstance();
+
+            InternalChild = new GameplayIsolationContainer(Beatmap, Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new DrawSizePreservingFillContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = stack = new OsuScreenStack()
+                }
+            };
+
+            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => player = new MultiplayerSpectatorPlayer(Score)));
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/SpectatorPlayerLoader.cs b/osu.Game/Screens/Play/SpectatorPlayerLoader.cs
index 580af81166..bdd23962dc 100644
--- a/osu.Game/Screens/Play/SpectatorPlayerLoader.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayerLoader.cs
@@ -12,7 +12,12 @@ namespace osu.Game.Screens.Play
         public readonly ScoreInfo Score;
 
         public SpectatorPlayerLoader(Score score)
-            : base(() => new SpectatorPlayer(score))
+            : this(score, () => new SpectatorPlayer(score))
+        {
+        }
+
+        public SpectatorPlayerLoader(Score score, Func<Player> createPlayer)
+            : base(createPlayer)
         {
             if (score.Replay == null)
                 throw new ArgumentException($"{nameof(score)} must have a non-null {nameof(score.Replay)}.", nameof(score));

From 7d276144b871f219d07321480aea1852e9aa7d44 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 22:13:54 +0900
Subject: [PATCH 08913/10326] Fix player sizing + masking

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index ab7d3e2502..5689a3222a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -31,6 +31,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public PlayerInstance(Score score)
         {
             Score = score;
+
+            RelativeSizeAxes = Axes.Both;
+            Masking = true;
         }
 
         [BackgroundDependencyLoader]

From 1b5679b0d75509eae6ba24761965ec5904020fbd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 22:14:26 +0900
Subject: [PATCH 08914/10326] Refactor ctor

---
 .../Multiplayer/Spectate/MultiplayerSpectator.cs  | 15 +++------------
 osu.Game/Screens/Spectate/SpectatorScreen.cs      |  6 +++---
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 6b8249eae0..8fa9dcf3af 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -9,7 +9,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osu.Game.Online.Rooms;
 using osu.Game.Online.Spectator;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
@@ -29,20 +28,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private SpectatorStreamingClient spectatorClient { get; set; }
 
-        private readonly int[] userIds;
         private readonly PlayerInstance[] instances;
-
         private PlayerGrid grid;
 
-        public MultiplayerSpectator(PlaylistItem playlistItem, int[] userIds)
-            : this(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
+        public MultiplayerSpectator(int[] userIds)
+            : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
         {
-        }
-
-        private MultiplayerSpectator(int[] userIds)
-            : base(userIds)
-        {
-            this.userIds = userIds;
             instances = new PlayerInstance[userIds.Length];
         }
 
@@ -141,6 +132,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             spectatorClient.StopWatchingUser(userId);
         }
 
-        private int getIndexForUser(int userId) => Array.IndexOf(userIds, userId);
+        private int getIndexForUser(int userId) => Array.IndexOf(UserIds, userId);
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 6dd3144fc8..b7e1b8496c 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Spectate
     /// </summary>
     public abstract class SpectatorScreen : OsuScreen
     {
-        private readonly int[] userIds;
+        protected readonly int[] UserIds;
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userIds">The users to spectate.</param>
         protected SpectatorScreen(params int[] userIds)
         {
-            this.userIds = userIds;
+            this.UserIds = userIds;
         }
 
         protected override void LoadComplete()
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Spectate
             spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
             spectatorClient.OnNewFrames += userSentFrames;
 
-            foreach (var id in userIds)
+            foreach (var id in UserIds)
             {
                 userLookupCache.GetUserAsync(id).ContinueWith(u => Schedule(() =>
                 {

From 7958a257e88d04a97e9b72e4a4493eb67dc28141 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 22:14:30 +0900
Subject: [PATCH 08915/10326] Add tests

---
 .../Multiplayer/TestSceneMultiplayerScreen.cs | 327 ++++++++++++++++++
 1 file changed, 327 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
new file mode 100644
index 0000000000..d085827986
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
@@ -0,0 +1,327 @@
+// Copyright (c) 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 System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.Online;
+using osu.Game.Online.Spectator;
+using osu.Game.Replays.Legacy;
+using osu.Game.Scoring;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Beatmaps.IO;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerSpectator : MultiplayerTestScene
+    {
+        [Cached(typeof(SpectatorStreamingClient))]
+        private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
+
+        [Cached(typeof(UserLookupCache))]
+        private UserLookupCache lookupCache = new TestUserLookupCache();
+
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
+        private MultiplayerSpectator spectator;
+
+        private readonly List<int> playingUserIds = new List<int>();
+        private readonly Dictionary<int, int> nextFrame = new Dictionary<int, int>();
+
+        private BeatmapSetInfo importedSet;
+        private BeatmapInfo importedBeatmap;
+        private int importedBeatmapId;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            importedSet = ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).Result;
+            importedBeatmap = importedSet.Beatmaps.First(b => b.RulesetID == 0);
+            importedBeatmapId = importedBeatmap.OnlineBeatmapID ?? -1;
+        }
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("reset sent frames", () => nextFrame.Clear());
+
+            AddStep("add streaming client", () =>
+            {
+                Remove(testSpectatorStreamingClient);
+                Add(testSpectatorStreamingClient);
+            });
+
+            AddStep("finish previous gameplay", () =>
+            {
+                foreach (var id in playingUserIds)
+                    testSpectatorStreamingClient.EndPlay(id, importedBeatmapId);
+                playingUserIds.Clear();
+            });
+        }
+
+        [Test]
+        public void TestGeneral()
+        {
+            int[] userIds = Enumerable.Range(0, 4).Select(i => 55 + i).ToArray();
+
+            start(userIds);
+            loadSpectateScreen();
+
+            sendFrames(userIds, 1000);
+            AddWaitStep("wait a bit", 20);
+        }
+
+        [Test]
+        public void TestPlayersMustStartSimultaneously()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            // Send frames for one player only, both should remain paused.
+            sendFrames(55, 20);
+            checkPausedInstant(55, true);
+            checkPausedInstant(56, true);
+
+            // Send frames for the other player, both should now start playing.
+            sendFrames(56, 20);
+            checkPausedInstant(55, false);
+            checkPausedInstant(56, false);
+        }
+
+        [Test]
+        public void TestPlayersDoNotStartSimultaneouslyIfBufferingFor15Seconds()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            // Send frames for one player only, both should remain paused.
+            sendFrames(55, 20);
+            checkPausedInstant(55, true);
+            checkPausedInstant(56, true);
+
+            // Wait 15 seconds...
+            AddWaitStep("wait 15 seconds", (int)(15000 / TimePerAction));
+
+            // Player 1 should start playing by itself, player 2 should remain paused.
+            checkPausedInstant(55, false);
+            checkPausedInstant(56, true);
+        }
+
+        [Test]
+        public void TestPlayersContinueWhileOthersBuffer()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            // Send initial frames for both players. A few more for player 1.
+            sendFrames(55, 20);
+            sendFrames(56, 10);
+            checkPausedInstant(55, false);
+            checkPausedInstant(56, false);
+
+            // Eventually player 2 will pause, player 1 must remain running.
+            checkPaused(56, true);
+            checkPausedInstant(55, false);
+
+            // Eventually both players will run out of frames and should pause.
+            checkPaused(55, true);
+            checkPausedInstant(56, true);
+
+            // Send more frames for the first player only. Player 1 should start playing with player 2 remaining paused.
+            sendFrames(55, 20);
+            checkPausedInstant(56, true);
+            checkPausedInstant(55, false);
+
+            // Send more frames for the second player. Both should be playing
+            sendFrames(56, 20);
+            checkPausedInstant(56, false);
+            checkPausedInstant(55, false);
+        }
+
+        [Test]
+        public void TestPlayersCatchUpAfterFallingBehind()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            // Send initial frames for both players. A few more for player 1.
+            sendFrames(55, 100);
+            sendFrames(56, 10);
+            checkPausedInstant(55, false);
+            checkPausedInstant(56, false);
+
+            // Eventually player 2 will run out of frames and should pause.
+            checkPaused(56, true);
+            AddWaitStep("wait a few more frames", 10);
+
+            // Send more frames for player 2. It should unpause.
+            sendFrames(56, 100);
+            checkPausedInstant(56, false);
+
+            // Player 2 should catch up to player 1 after unpausing.
+            AddUntilStep("player 1 time == player 2 time", () => Precision.AlmostEquals(getGameplayTime(55), getGameplayTime(56), 16));
+        }
+
+        private void loadSpectateScreen()
+        {
+            AddStep("load screen", () =>
+            {
+                Beatmap.Value = beatmapManager.GetWorkingBeatmap(importedBeatmap);
+                Ruleset.Value = importedBeatmap.Ruleset;
+
+                LoadScreen(spectator = new MultiplayerSpectator(playingUserIds.ToArray()));
+            });
+
+            AddUntilStep("wait for screen load", () => spectator.LoadState == LoadState.Loaded && spectator.AllPlayersLoaded);
+        }
+
+        private void start(int userId, int? beatmapId = null) => start(new[] { userId }, beatmapId);
+
+        private void start(int[] userIds, int? beatmapId = null)
+        {
+            AddStep("start play", () =>
+            {
+                foreach (int id in userIds)
+                {
+                    Client.CurrentMatchPlayingUserIds.Add(id);
+                    testSpectatorStreamingClient.StartPlay(id, beatmapId ?? importedBeatmapId);
+                    playingUserIds.Add(id);
+                    nextFrame[id] = 0;
+                }
+            });
+        }
+
+        private void finish(int userId, int? beatmapId = null)
+        {
+            AddStep("end play", () =>
+            {
+                testSpectatorStreamingClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
+                playingUserIds.Remove(userId);
+                nextFrame.Remove(userId);
+            });
+        }
+
+        private void sendFrames(int userId, int count = 10) => sendFrames(new[] { userId }, count);
+
+        private void sendFrames(int[] userIds, int count = 10)
+        {
+            AddStep("send frames", () =>
+            {
+                foreach (int id in userIds)
+                {
+                    testSpectatorStreamingClient.SendFrames(id, nextFrame[id], count);
+                    nextFrame[id] += count;
+                }
+            });
+        }
+
+        private void checkPaused(int userId, bool state) =>
+            AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().IsPaused.Value == state);
+
+        private void checkPausedInstant(int userId, bool state) =>
+            AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().IsPaused.Value == state);
+
+        private double getGameplayTime(int userId) => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().Single().GameplayClock.CurrentTime;
+
+        private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
+
+        private PlayerInstance getInstance(int userId) => spectator.ChildrenOfType<PlayerInstance>().Single(p => p.User.Id == userId);
+
+        public class TestSpectatorStreamingClient : SpectatorStreamingClient
+        {
+            private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
+            private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
+
+            public TestSpectatorStreamingClient()
+                : base(new DevelopmentEndpointConfiguration())
+            {
+            }
+
+            public void StartPlay(int userId, int beatmapId)
+            {
+                userBeatmapDictionary[userId] = beatmapId;
+                userSentStateDictionary[userId] = false;
+
+                sendState(userId, beatmapId);
+            }
+
+            public void EndPlay(int userId, int beatmapId)
+            {
+                ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
+                {
+                    BeatmapID = beatmapId,
+                    RulesetID = 0,
+                });
+
+                userSentStateDictionary[userId] = false;
+            }
+
+            public void SendFrames(int userId, int index, int count)
+            {
+                var frames = new List<LegacyReplayFrame>();
+
+                for (int i = index; i < index + count; i++)
+                {
+                    var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
+
+                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
+                }
+
+                var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
+                ((ISpectatorClient)this).UserSentFrames(userId, bundle);
+
+                if (!userSentStateDictionary[userId])
+                    sendState(userId, userBeatmapDictionary[userId]);
+            }
+
+            public override void WatchUser(int userId)
+            {
+                if (userSentStateDictionary[userId])
+                {
+                    // usually the server would do this.
+                    sendState(userId, userBeatmapDictionary[userId]);
+                }
+
+                base.WatchUser(userId);
+            }
+
+            private void sendState(int userId, int beatmapId)
+            {
+                ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
+                {
+                    BeatmapID = beatmapId,
+                    RulesetID = 0,
+                });
+
+                userSentStateDictionary[userId] = true;
+            }
+        }
+
+        internal class TestUserLookupCache : UserLookupCache
+        {
+            protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
+            {
+                return Task.FromResult(new User
+                {
+                    Id = lookup,
+                    Username = $"User {lookup}"
+                });
+            }
+        }
+    }
+}

From ecd0b84d944ed82e9de9e244c32230918846055b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 22:15:07 +0900
Subject: [PATCH 08916/10326] Use max_sync_offset constant

---
 .../OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 8fa9dcf3af..90cf031584 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 {
                     inst.ChildrenOfType<GameplayClockContainer>().Single().Start();
 
-                    if (targetTime < lastFrameTime && targetTime > currentTime + 16)
+                    if (targetTime < lastFrameTime && targetTime > currentTime + max_sync_offset)
                         inst.Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
                     else
                         inst.Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);

From 8efa381d3a1f71eb8e169495bf5a54f99a4a751c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 23:13:16 +0900
Subject: [PATCH 08917/10326] Actually use whistle sample for sliderwhistle

---
 .../Objects/Drawables/DrawableSlider.cs          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 8167a9f243..e29e28b1fa 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -111,17 +111,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.LoadSamples();
 
-            var firstSample = HitObject.OriginalSamples.FirstOrDefault();
+            var slidingSamples = new List<ISampleInfo>();
 
-            if (firstSample != null)
-            {
-                var samples = new List<ISampleInfo> { HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderslide") };
+            var normalSample = HitObject.OriginalSamples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
+            if (normalSample != null)
+                slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(normalSample).With("sliderslide"));
 
-                if (HitObject.OriginalSamples.Any(s => s.Name == HitSampleInfo.HIT_WHISTLE))
-                    samples.Add(HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderwhistle"));
+            var whistleSample = HitObject.OriginalSamples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_WHISTLE);
+            if (whistleSample != null)
+                slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(whistleSample).With("sliderwhistle"));
 
-                slidingSample.Samples = samples.ToArray();
-            }
+            slidingSample.Samples = slidingSamples.ToArray();
         }
 
         public override void StopAllSamples()

From 24ae5b91696c8141588ba379081d075196fe7e6b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 23:15:08 +0900
Subject: [PATCH 08918/10326] Fix slightly incorrect solo score submission
 routes

---
 osu.Game/Online/Solo/CreateSoloScoreRequest.cs | 2 +-
 osu.Game/Online/Solo/SubmitSoloScoreRequest.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs b/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
index ae5ac5e26c..dea5a77496 100644
--- a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
+++ b/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
@@ -27,6 +27,6 @@ namespace osu.Game.Online.Solo
             return req;
         }
 
-        protected override string Target => $@"solo/{beatmapId}/scores";
+        protected override string Target => $@"beatmaps/{beatmapId}/solo/scores";
     }
 }
diff --git a/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs b/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
index 98ba4fa052..85fa3eeb34 100644
--- a/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
+++ b/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
@@ -40,6 +40,6 @@ namespace osu.Game.Online.Solo
             return req;
         }
 
-        protected override string Target => $@"solo/{beatmapId}/scores/{scoreId}";
+        protected override string Target => $@"beatmaps/{beatmapId}/solo/scores/{scoreId}";
     }
 }

From 5dd6f19ec5b74b9f0b68802562ad858b8b374434 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 23:15:34 +0900
Subject: [PATCH 08919/10326] Update rider metadata files for 2021.1

---
 .idea/.idea.osu.Desktop/.idea/indexLayout.xml | 2 +-
 .idea/.idea.osu.Desktop/.idea/modules.xml     | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 .idea/.idea.osu.Desktop/.idea/modules.xml

diff --git a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
index 27ba142e96..7b08163ceb 100644
--- a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
+++ b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ContentModelUserStore">
+  <component name="UserContentModel">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />
diff --git a/.idea/.idea.osu.Desktop/.idea/modules.xml b/.idea/.idea.osu.Desktop/.idea/modules.xml
deleted file mode 100644
index 680312ad27..0000000000
--- a/.idea/.idea.osu.Desktop/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.osu.Desktop/.idea/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.osu.Desktop/.idea/riderModule.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

From 6bccb3aab6487e0edd0d8030378c2f18c2868194 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Thu, 8 Apr 2021 19:34:35 -0400
Subject: [PATCH 08920/10326] Use DI to implement battery detection, add
 BatteryCutoff property

- Removed the Xamarin.Essentials package from osu.Game and added it to osu.iOS and osu.Android only.
- iOS and Android implementations use Xamarin.Essentials.Battery, while the Desktop implementation
only returns 100% battery for now.
- Added a BatteryCutoff property to PowerStatus so it can be different for each platform (default 20%, 25% on iOS)
---
 osu.Android/OsuGameAndroid.cs                 |  9 +++
 osu.Android/osu.Android.csproj                |  4 +
 osu.Desktop/OsuGameDesktop.cs                 |  3 +
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 76 +++++++------------
 osu.Game/OsuGameBase.cs                       |  5 ++
 osu.Game/Screens/Play/PlayerLoader.cs         | 37 ++-------
 osu.Game/Tests/OsuTestBrowser.cs              |  5 ++
 osu.Game/Utils/PowerStatus.cs                 | 22 ++++++
 osu.iOS/OsuGameIOS.cs                         | 17 +++++
 osu.iOS/osu.iOS.csproj                        |  4 +
 10 files changed, 103 insertions(+), 79 deletions(-)
 create mode 100644 osu.Game/Utils/PowerStatus.cs

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 21d6336b2c..4c82a175fc 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -7,6 +7,8 @@ using Android.OS;
 using osu.Framework.Allocation;
 using osu.Game;
 using osu.Game.Updater;
+using osu.Game.Utils;
+using Xamarin.Essentials;
 
 namespace osu.Android
 {
@@ -19,6 +21,7 @@ namespace osu.Android
             : base(null)
         {
             gameActivity = activity;
+            powerStatus = new AndroidPowerStatus();
         }
 
         public override Version AssemblyVersion
@@ -72,5 +75,11 @@ namespace osu.Android
         }
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
+        public class AndroidPowerStatus : PowerStatus
+        {
+            public override double ChargeLevel => Battery.ChargeLevel;
+
+            public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;
+        }
     }
 }
diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index 54857ac87d..64d5e5b1c8 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -63,5 +63,9 @@
       <Version>5.0.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <!-- Used for obtaining battery info. -->
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 0c21c75290..b6c57b219d 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -21,6 +21,8 @@ using osu.Game.Updater;
 using osu.Desktop.Windows;
 using osu.Framework.Threading;
 using osu.Game.IO;
+using osu.Game.Utils;
+using osu.Framework.Allocation;
 
 namespace osu.Desktop
 {
@@ -33,6 +35,7 @@ namespace osu.Desktop
             : base(args)
         {
             noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
+            powerStatus = new DefaultPowerStatus();
         }
 
         public override StableStorage GetStorageForStableInstall()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index a31d53e3b6..c5cc10993c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -25,6 +25,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.PlayerSettings;
+using osu.Game.Utils;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -48,6 +49,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private readonly VolumeOverlay volumeOverlay;
 
+        [Resolved]
+        private PowerStatus powerStatus { get; set; }
+
         private readonly ChangelogOverlay changelogOverlay;
 
         public TestScenePlayerLoader()
@@ -93,26 +97,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             LoadScreen(loader = new TestPlayerLoader(() => player = new TestPlayer(interactive, interactive)));
         }
 
-        /// <summary>
-        /// Sets the input manager child to a new test player loader container instance with a custom battery level
-        /// </summary>
-        /// <param name="interactive">If the test player should behave like the production one.</param>
-        /// <param name="pluggedIn">If the player's device is plugged in.</param>
-        /// <param name="batteryLevel">A custom battery level for the test player.</param>
-        private void resetPlayerWithBattery(bool interactive, bool pluggedIn, double batteryLevel)
-        {
-            Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
-            Beatmap.Value.BeatmapInfo.EpilepsyWarning = epilepsyWarning;
-
-            foreach (var mod in SelectedMods.Value.OfType<IApplicableToTrack>())
-                mod.ApplyToTrack(Beatmap.Value.Track);
-
-            loader = new TestPlayerLoader(() => player = new TestPlayer(interactive, interactive));
-            loader.batteryManager.ChargeLevel = batteryLevel;
-            loader.batteryManager.PluggedIn = pluggedIn;
-            LoadScreen(loader);
-        }
-
         [Test]
         public void TestEarlyExitBeforePlayerConstruction()
         {
@@ -290,32 +274,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for player load", () => player.IsLoaded);
         }
 
-        [TestCase(false, 1.0)] // not plugged in, full battery, no notification
-        [TestCase(false, 0.2)] // not plugged in, at warning level, no notification
-        [TestCase(true, 0.1)] // plugged in, charging, below warning level, no notification
-        [TestCase(false, 0.1)] // not plugged in, below warning level, notification
-        public void TestLowBatteryNotification(bool pluggedIn, double batteryLevel)
-        {
-            AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce).Value = false);
-
-            // mock phone on battery
-            AddStep("load player", () => resetPlayerWithBattery(false, pluggedIn, batteryLevel));
-            AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
-            int notificationCount = !pluggedIn && batteryLevel < PlayerLoader.battery_tolerance ? 1 : 0;
-            AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
-            AddStep("click notification", () =>
-                {
-                    var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
-                    var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
-                    var notification = flowContainer.First();
-
-                    InputManager.MoveMouseTo(notification);
-                    InputManager.Click(MouseButton.Left);
-                });
-
-            AddUntilStep("wait for player load", () => player.IsLoaded);
-        }
-
         [TestCase(true)]
         [TestCase(false)]
         public void TestEpilepsyWarning(bool warning)
@@ -334,6 +292,30 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
+        [TestCase(false, 1.0)] // not charging, full battery --> no warning
+        [TestCase(false, 0.2)] // not charging, at cutoff --> warning
+        [TestCase(false, 0.1)] // charging, below cutoff --> warning
+        public void TestLowBatteryNotification(bool isCharging, double chargeLevel)
+        {
+            AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce).Value = false);
+
+            // set charge status and level
+            AddStep("load player", () => resetPlayer(false, () => { powerStatus.IsCharging = isCharging; powerStatus.ChargeLevel = chargeLevel; }));
+            AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
+            int notificationCount = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
+            AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
+            AddStep("click notification", () =>
+                {
+                    var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
+                    var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
+                    var notification = flowContainer.First();
+
+                    InputManager.MoveMouseTo(notification);
+                    InputManager.Click(MouseButton.Left);
+                });
+            AddUntilStep("wait for player load", () => player.IsLoaded);
+        }
+
         [Test]
         public void TestEpilepsyWarningEarlyExit()
         {
@@ -356,8 +338,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public IReadOnlyList<Mod> DisplayedMods => MetadataInfo.Mods.Value;
 
-            public new BatteryManager batteryManager => base.batteryManager;
-
             public TestPlayerLoader(Func<Player> createPlayer)
                 : base(createPlayer)
             {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 21313d0596..53873b0127 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -40,6 +40,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
+using osu.Game.Utils;
 using osuTK.Input;
 using RuntimeInfo = osu.Framework.RuntimeInfo;
 
@@ -95,6 +96,8 @@ namespace osu.Game
 
         protected Storage Storage { get; set; }
 
+        protected PowerStatus powerStatus;
+
         [Cached]
         [Cached(typeof(IBindable<RulesetInfo>))]
         protected readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
@@ -329,6 +332,8 @@ namespace osu.Game
             dependencies.CacheAs(MusicController);
 
             Ruleset.BindValueChanged(onRulesetChanged);
+
+            dependencies.CacheAs(powerStatus);
         }
 
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> r)
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 01a51e6e7a..9710fa7e46 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -24,9 +24,9 @@ using osu.Game.Overlays.Notifications;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Users;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
-using Xamarin.Essentials;
 
 namespace osu.Game.Screens.Play
 {
@@ -113,6 +113,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private AudioManager audioManager { get; set; }
 
+        [Resolved]
+        private PowerStatus powerStatus { get; set; }
+
         public PlayerLoader(Func<Player> createPlayer)
         {
             this.createPlayer = createPlayer;
@@ -265,7 +268,6 @@ namespace osu.Game.Screens.Play
         }
 
         #endregion
-
         protected override void Update()
         {
             base.Update();
@@ -477,45 +479,18 @@ namespace osu.Game.Screens.Play
         #region Low battery warning
         private Bindable<bool> batteryWarningShownOnce;
 
-        // Send a warning if battery is less than 20%
-        public const double battery_tolerance = 0.2;
-
         private void showBatteryWarningIfNeeded()
         {
             if (!batteryWarningShownOnce.Value)
             {
-                // Checks if the notification has not been shown yet, device is unplugged and if device battery is low.
-                if (!batteryManager.PluggedIn && batteryManager.ChargeLevel < battery_tolerance)
+                // Checks if the notification has not been shown yet, device is unplugged and if device battery is at or below the cutoff
+                if (!powerStatus.IsCharging && powerStatus.ChargeLevel <= powerStatus.BatteryCutoff)
                 {
-                    Console.WriteLine("Battery level: {0}", batteryManager.ChargeLevel);
                     notificationOverlay?.Post(new BatteryWarningNotification());
                     batteryWarningShownOnce.Value = true;
                 }
             }
         }
-        public BatteryManager batteryManager = new BatteryManager();
-        public class BatteryManager
-        {
-            public double ChargeLevel;
-            public bool PluggedIn;
-            public BatteryManager()
-            {
-                // Attempt to get battery information using Xamarin.Essentials
-                // Xamarin.Essentials throws a NotSupportedOrImplementedException on .NET standard so this only works on iOS/Android
-                // https://github.com/xamarin/Essentials/blob/7218ab88f7fbe00ec3379bd54e6c0ce35ffc0c22/Xamarin.Essentials/Battery/Battery.netstandard.tvos.cs
-                try
-                {
-                    ChargeLevel = Battery.ChargeLevel;
-                    PluggedIn = Battery.PowerSource == BatteryPowerSource.Battery;
-                }
-                catch (NotImplementedException e)
-                {
-                    Console.WriteLine("Could not access battery info: {0}", e);
-                    ChargeLevel = 1.0;
-                    PluggedIn = false;
-                }
-            }
-        }
 
         private class BatteryWarningNotification : SimpleNotification
         {
diff --git a/osu.Game/Tests/OsuTestBrowser.cs b/osu.Game/Tests/OsuTestBrowser.cs
index 71b0b02fa6..afce7dd38b 100644
--- a/osu.Game/Tests/OsuTestBrowser.cs
+++ b/osu.Game/Tests/OsuTestBrowser.cs
@@ -7,11 +7,16 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Screens.Backgrounds;
+using osu.Game.Utils;
 
 namespace osu.Game.Tests
 {
     public class OsuTestBrowser : OsuGameBase
     {
+        public OsuTestBrowser()
+        {
+            powerStatus = new DefaultPowerStatus();
+        }
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/PowerStatus.cs
new file mode 100644
index 0000000000..0657c98af1
--- /dev/null
+++ b/osu.Game/Utils/PowerStatus.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.
+
+namespace osu.Game.Utils
+{
+    public abstract class PowerStatus
+    {
+        /// <summary>
+        /// The maximum battery level before a warning notification
+        /// is sent.
+        /// </summary>
+        public virtual double BatteryCutoff { get; } = 0.2;
+        public virtual double ChargeLevel { get; set; }
+        public virtual bool IsCharging { get; set; }
+    }
+
+    public class DefaultPowerStatus : PowerStatus
+    {
+        public override double ChargeLevel { get; set; } = 1;
+        public override bool IsCharging { get; set; } = true;
+    }
+}
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index 5125ad81e0..21dce338dc 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -5,13 +5,30 @@ using System;
 using Foundation;
 using osu.Game;
 using osu.Game.Updater;
+using osu.Game.Utils;
+using Xamarin.Essentials;
 
 namespace osu.iOS
 {
     public class OsuGameIOS : OsuGame
     {
+        public OsuGameIOS()
+            : base(null)
+        {
+            powerStatus = new IOSPowerStatus();
+        }
         public override Version AssemblyVersion => new Version(NSBundle.MainBundle.InfoDictionary["CFBundleVersion"].ToString());
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
+
+        public class IOSPowerStatus : PowerStatus
+        {
+            // The low battery alert appears at 20% on iOS
+            // https://github.com/ppy/osu/issues/12239
+            public override double BatteryCutoff => 0.25;
+            public override double ChargeLevel => Battery.ChargeLevel;
+
+            public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;
+        }
     }
 }
diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj
index 1e9a21865d..ed6f52c60e 100644
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@@ -116,5 +116,9 @@
       <Visible>false</Visible>
     </ImageAsset>
   </ItemGroup>
+  <ItemGroup>
+  <!-- Used for obtaining battery info. -->
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>

From 493c095535c3acdddfada39ab29ecfd430c7afe9 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Thu, 8 Apr 2021 20:28:23 -0400
Subject: [PATCH 08921/10326] Fixed code style

---
 osu.Android/OsuGameAndroid.cs                           | 2 +-
 osu.Desktop/OsuGameDesktop.cs                           | 3 +--
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs | 6 +++++-
 osu.Game/OsuGameBase.cs                                 | 4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs                   | 1 +
 osu.Game/Tests/OsuTestBrowser.cs                        | 3 ++-
 osu.Game/Utils/PowerStatus.cs                           | 1 +
 osu.iOS/OsuGameIOS.cs                                   | 2 +-
 8 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 4c82a175fc..eb0d499c8f 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -21,7 +21,7 @@ namespace osu.Android
             : base(null)
         {
             gameActivity = activity;
-            powerStatus = new AndroidPowerStatus();
+            PowerStatus = new AndroidPowerStatus();
         }
 
         public override Version AssemblyVersion
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index b6c57b219d..48e28fa251 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -22,7 +22,6 @@ using osu.Desktop.Windows;
 using osu.Framework.Threading;
 using osu.Game.IO;
 using osu.Game.Utils;
-using osu.Framework.Allocation;
 
 namespace osu.Desktop
 {
@@ -35,7 +34,7 @@ namespace osu.Desktop
             : base(args)
         {
             noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
-            powerStatus = new DefaultPowerStatus();
+            PowerStatus = new DefaultPowerStatus();
         }
 
         public override StableStorage GetStorageForStableInstall()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index c5cc10993c..b885f0a9be 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -300,7 +300,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce).Value = false);
 
             // set charge status and level
-            AddStep("load player", () => resetPlayer(false, () => { powerStatus.IsCharging = isCharging; powerStatus.ChargeLevel = chargeLevel; }));
+            AddStep("load player", () => resetPlayer(false, () =>
+            { 
+                    powerStatus.IsCharging = isCharging;
+                    powerStatus.ChargeLevel = chargeLevel;
+            }));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
             int notificationCount = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
             AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 53873b0127..a907afd8af 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -96,7 +96,7 @@ namespace osu.Game
 
         protected Storage Storage { get; set; }
 
-        protected PowerStatus powerStatus;
+        protected PowerStatus PowerStatus;
 
         [Cached]
         [Cached(typeof(IBindable<RulesetInfo>))]
@@ -333,7 +333,7 @@ namespace osu.Game
 
             Ruleset.BindValueChanged(onRulesetChanged);
 
-            dependencies.CacheAs(powerStatus);
+            dependencies.CacheAs(PowerStatus);
         }
 
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> r)
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 9710fa7e46..6ba99d65d5 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -477,6 +477,7 @@ namespace osu.Game.Screens.Play
         #endregion
 
         #region Low battery warning
+
         private Bindable<bool> batteryWarningShownOnce;
 
         private void showBatteryWarningIfNeeded()
diff --git a/osu.Game/Tests/OsuTestBrowser.cs b/osu.Game/Tests/OsuTestBrowser.cs
index afce7dd38b..d4fa2a11d3 100644
--- a/osu.Game/Tests/OsuTestBrowser.cs
+++ b/osu.Game/Tests/OsuTestBrowser.cs
@@ -15,8 +15,9 @@ namespace osu.Game.Tests
     {
         public OsuTestBrowser()
         {
-            powerStatus = new DefaultPowerStatus();
+            PowerStatus = new DefaultPowerStatus();
         }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/PowerStatus.cs
index 0657c98af1..1caed5b6fa 100644
--- a/osu.Game/Utils/PowerStatus.cs
+++ b/osu.Game/Utils/PowerStatus.cs
@@ -10,6 +10,7 @@ namespace osu.Game.Utils
         /// is sent.
         /// </summary>
         public virtual double BatteryCutoff { get; } = 0.2;
+
         public virtual double ChargeLevel { get; set; }
         public virtual bool IsCharging { get; set; }
     }
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index 21dce338dc..d417fa8f8d 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -15,7 +15,7 @@ namespace osu.iOS
         public OsuGameIOS()
             : base(null)
         {
-            powerStatus = new IOSPowerStatus();
+            PowerStatus = new IOSPowerStatus();
         }
         public override Version AssemblyVersion => new Version(NSBundle.MainBundle.InfoDictionary["CFBundleVersion"].ToString());
 

From 6b6a71d3c38e47f2e6441cb6a03dcb04c43b51ac Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Thu, 8 Apr 2021 20:38:16 -0400
Subject: [PATCH 08922/10326] trim whitespace

---
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index b885f0a9be..2a0f46f5ff 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -301,7 +301,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             // set charge status and level
             AddStep("load player", () => resetPlayer(false, () =>
-            { 
+            {
                     powerStatus.IsCharging = isCharging;
                     powerStatus.ChargeLevel = chargeLevel;
             }));

From 59d13b0dd3faa9baca04c6664437294a2ed820f6 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Thu, 8 Apr 2021 21:53:42 -0400
Subject: [PATCH 08923/10326] Fixed indentation

sorry about the style fixes... I'm using JetBrains Rider from now on.
---
 osu.Android/OsuGameAndroid.cs                  |  1 +
 .../Visual/Gameplay/TestScenePlayerLoader.cs   | 18 +++++++++---------
 osu.Game/Screens/Play/PlayerLoader.cs          |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index eb0d499c8f..a0c6a1e354 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -75,6 +75,7 @@ namespace osu.Android
         }
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
+
         public class AndroidPowerStatus : PowerStatus
         {
             public override double ChargeLevel => Battery.ChargeLevel;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 2a0f46f5ff..1377459c62 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -302,21 +302,21 @@ namespace osu.Game.Tests.Visual.Gameplay
             // set charge status and level
             AddStep("load player", () => resetPlayer(false, () =>
             {
-                    powerStatus.IsCharging = isCharging;
-                    powerStatus.ChargeLevel = chargeLevel;
+                powerStatus.IsCharging = isCharging;
+                powerStatus.ChargeLevel = chargeLevel;
             }));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
             int notificationCount = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
             AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
             AddStep("click notification", () =>
-                {
-                    var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
-                    var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
-                    var notification = flowContainer.First();
+            {
+                var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
+                var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
+                var notification = flowContainer.First();
 
-                    InputManager.MoveMouseTo(notification);
-                    InputManager.Click(MouseButton.Left);
-                });
+                InputManager.MoveMouseTo(notification);
+                InputManager.Click(MouseButton.Left);
+            });
             AddUntilStep("wait for player load", () => player.IsLoaded);
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 6ba99d65d5..e1ab0b8ef5 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -268,6 +268,7 @@ namespace osu.Game.Screens.Play
         }
 
         #endregion
+
         protected override void Update()
         {
             base.Update();

From 8293b06c0afe9dfe16e1340f9ffab8ca1e737fd5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 13:56:55 +0900
Subject: [PATCH 08924/10326] Remove obsolete code

---
 osu.Game/Beatmaps/BeatmapConverter.cs         | 34 +------------------
 osu.Game/Beatmaps/BeatmapStatistic.cs         | 12 -------
 osu.Game/Overlays/Settings/SettingsItem.cs    |  7 ----
 osu.Game/Rulesets/Judgements/Judgement.cs     | 12 -------
 .../Objects/Drawables/DrawableHitObject.cs    | 18 ----------
 osu.Game/Rulesets/Objects/HitObject.cs        |  9 -----
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   |  6 ----
 7 files changed, 1 insertion(+), 97 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapConverter.cs b/osu.Game/Beatmaps/BeatmapConverter.cs
index b291edd19d..f3434c5153 100644
--- a/osu.Game/Beatmaps/BeatmapConverter.cs
+++ b/osu.Game/Beatmaps/BeatmapConverter.cs
@@ -27,8 +27,6 @@ namespace osu.Game.Beatmaps
 
         public IBeatmap Beatmap { get; }
 
-        private CancellationToken cancellationToken;
-
         protected BeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
         {
             Beatmap = beatmap;
@@ -41,8 +39,6 @@ namespace osu.Game.Beatmaps
 
         public IBeatmap Convert(CancellationToken cancellationToken = default)
         {
-            this.cancellationToken = cancellationToken;
-
             // We always operate on a clone of the original beatmap, to not modify it game-wide
             return ConvertBeatmap(Beatmap.Clone(), cancellationToken);
         }
@@ -55,19 +51,6 @@ namespace osu.Game.Beatmaps
         /// <returns>The converted Beatmap.</returns>
         protected virtual Beatmap<T> ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
         {
-#pragma warning disable 618
-            return ConvertBeatmap(original);
-#pragma warning restore 618
-        }
-
-        /// <summary>
-        /// Performs the conversion of a Beatmap using this Beatmap Converter.
-        /// </summary>
-        /// <param name="original">The un-converted Beatmap.</param>
-        /// <returns>The converted Beatmap.</returns>
-        [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
-        protected virtual Beatmap<T> ConvertBeatmap(IBeatmap original)
-        {
             var beatmap = CreateBeatmap();
 
             beatmap.BeatmapInfo = original.BeatmapInfo;
@@ -121,21 +104,6 @@ namespace osu.Game.Beatmaps
         /// <param name="beatmap">The un-converted Beatmap.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The converted hit object.</returns>
-        protected virtual IEnumerable<T> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
-        {
-#pragma warning disable 618
-            return ConvertHitObject(original, beatmap);
-#pragma warning restore 618
-        }
-
-        /// <summary>
-        /// Performs the conversion of a hit object.
-        /// This method is generally executed sequentially for all objects in a beatmap.
-        /// </summary>
-        /// <param name="original">The hit object to convert.</param>
-        /// <param name="beatmap">The un-converted Beatmap.</param>
-        /// <returns>The converted hit object.</returns>
-        [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
-        protected virtual IEnumerable<T> ConvertHitObject(HitObject original, IBeatmap beatmap) => Enumerable.Empty<T>();
+        protected virtual IEnumerable<T> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken) => Enumerable.Empty<T>();
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapStatistic.cs b/osu.Game/Beatmaps/BeatmapStatistic.cs
index 9d87a20d60..7d7ba09fcf 100644
--- a/osu.Game/Beatmaps/BeatmapStatistic.cs
+++ b/osu.Game/Beatmaps/BeatmapStatistic.cs
@@ -3,16 +3,11 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osuTK;
 
 namespace osu.Game.Beatmaps
 {
     public class BeatmapStatistic
     {
-        [Obsolete("Use CreateIcon instead")] // can be removed 20210203
-        public IconUsage Icon = FontAwesome.Regular.QuestionCircle;
-
         /// <summary>
         /// A function to create the icon for display purposes. Use default icons available via <see cref="BeatmapStatisticIcon"/> whenever possible for conformity.
         /// </summary>
@@ -20,12 +15,5 @@ namespace osu.Game.Beatmaps
 
         public string Content;
         public string Name;
-
-        public BeatmapStatistic()
-        {
-#pragma warning disable 618
-            CreateIcon = () => new SpriteIcon { Icon = Icon, Scale = new Vector2(0.7f) };
-#pragma warning restore 618
-        }
     }
 }
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 85765bf991..0bd9750b0b 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -57,13 +57,6 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
-        [Obsolete("Use Current instead")] // Can be removed 20210406
-        public Bindable<T> Bindable
-        {
-            get => Current;
-            set => Current = value;
-        }
-
         public virtual Bindable<T> Current
         {
             get => controlWithCurrent.Current;
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index b1ca72b1c0..be69db5ca8 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -28,18 +28,6 @@ namespace osu.Game.Rulesets.Judgements
         /// </summary>
         protected const double DEFAULT_MAX_HEALTH_INCREASE = 0.05;
 
-        /// <summary>
-        /// Whether this <see cref="Judgement"/> should affect the current combo.
-        /// </summary>
-        [Obsolete("Has no effect. Use HitResult members instead (e.g. use small-tick or bonus to not affect combo).")] // Can be removed 20210328
-        public virtual bool AffectsCombo => true;
-
-        /// <summary>
-        /// Whether this <see cref="Judgement"/> should be counted as base (combo) or bonus score.
-        /// </summary>
-        [Obsolete("Has no effect. Use HitResult members instead (e.g. use small-tick or bonus to not affect combo).")] // Can be removed 20210328
-        public virtual bool IsBonus => !AffectsCombo;
-
         /// <summary>
         /// The maximum <see cref="HitResult"/> that can be achieved.
         /// </summary>
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e5eaf5db88..e69c4e2d91 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -736,24 +736,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (!Result.HasResult)
                 throw new InvalidOperationException($"{GetType().ReadableName()} applied a {nameof(JudgementResult)} but did not update {nameof(JudgementResult.Type)}.");
 
-            // Some (especially older) rulesets use scorable judgements instead of the newer ignorehit/ignoremiss judgements.
-            // Can be removed 20210328
-            if (Result.Judgement.MaxResult == HitResult.IgnoreHit)
-            {
-                HitResult originalType = Result.Type;
-
-                if (Result.Type == HitResult.Miss)
-                    Result.Type = HitResult.IgnoreMiss;
-                else if (Result.Type >= HitResult.Meh && Result.Type <= HitResult.Perfect)
-                    Result.Type = HitResult.IgnoreHit;
-
-                if (Result.Type != originalType)
-                {
-                    Logger.Log($"{GetType().ReadableName()} applied an invalid hit result ({originalType}) when {nameof(HitResult.IgnoreMiss)} or {nameof(HitResult.IgnoreHit)} is expected.\n"
-                               + $"This has been automatically adjusted to {Result.Type}, and support will be removed from 2021-03-28 onwards.", level: LogLevel.Important);
-                }
-            }
-
             if (!Result.Type.IsValidHitResult(Result.Judgement.MinResult, Result.Judgement.MaxResult))
             {
                 throw new InvalidOperationException(
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 826d411822..db02eafa92 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -139,15 +139,6 @@ namespace osu.Game.Rulesets.Objects
         }
 
         protected virtual void CreateNestedHitObjects(CancellationToken cancellationToken)
-        {
-            // ReSharper disable once MethodSupportsCancellation (https://youtrack.jetbrains.com/issue/RIDER-44520)
-#pragma warning disable 618
-            CreateNestedHitObjects();
-#pragma warning restore 618
-        }
-
-        [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
-        protected virtual void CreateNestedHitObjects()
         {
         }
 
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index b81fa79345..0fb5c2f4b5 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -346,12 +346,6 @@ namespace osu.Game.Rulesets.Scoring
 
             score.HitEvents = hitEvents;
         }
-
-        /// <summary>
-        /// Create a <see cref="HitWindows"/> for this processor.
-        /// </summary>
-        [Obsolete("Method is now unused.")] // Can be removed 20210328
-        public virtual HitWindows CreateHitWindows() => new HitWindows();
     }
 
     public enum ScoringMode

From 76981f25478029cf948324f9e4c2e9e780ce57e1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 13:58:24 +0900
Subject: [PATCH 08925/10326] Remove unused using

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e69c4e2d91..6da9f12b50 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -11,7 +11,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
-using osu.Framework.Logging;
 using osu.Framework.Threading;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Judgements;

From 51fee79ef19946f48262bd14fce5c7bc5254bcdb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Apr 2021 15:18:02 +0900
Subject: [PATCH 08926/10326] Fix scores not being accepted due to missing
 ruleset ID

---
 osu.Game/Online/Solo/CreateSoloScoreRequest.cs | 6 +++++-
 osu.Game/Screens/Play/SoloPlayer.cs            | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs b/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
index dea5a77496..0d2bea1f2a 100644
--- a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
+++ b/osu.Game/Online/Solo/CreateSoloScoreRequest.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.Globalization;
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
@@ -11,11 +12,13 @@ namespace osu.Game.Online.Solo
     public class CreateSoloScoreRequest : APIRequest<APIScoreToken>
     {
         private readonly int beatmapId;
+        private readonly int rulesetId;
         private readonly string versionHash;
 
-        public CreateSoloScoreRequest(int beatmapId, string versionHash)
+        public CreateSoloScoreRequest(int beatmapId, int rulesetId, string versionHash)
         {
             this.beatmapId = beatmapId;
+            this.rulesetId = rulesetId;
             this.versionHash = versionHash;
         }
 
@@ -24,6 +27,7 @@ namespace osu.Game.Online.Solo
             var req = base.CreateWebRequest();
             req.Method = HttpMethod.Post;
             req.AddParameter("version_hash", versionHash);
+            req.AddParameter("ruleset_id", rulesetId.ToString(CultureInfo.InvariantCulture));
             return req;
         }
 
diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index ee1ccdc5b3..d0ef4131dc 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -17,7 +17,10 @@ namespace osu.Game.Screens.Play
             if (!(Beatmap.Value.BeatmapInfo.OnlineBeatmapID is int beatmapId))
                 return null;
 
-            return new CreateSoloScoreRequest(beatmapId, Game.VersionHash);
+            if (!(Ruleset.Value.ID is int rulesetId))
+                return null;
+
+            return new CreateSoloScoreRequest(beatmapId, rulesetId, Game.VersionHash);
         }
 
         protected override bool HandleTokenRetrievalFailure(Exception exception) => false;

From f2e811928bb30d2b4c5a69bfcce67f5dbac7a68e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 15:28:08 +0900
Subject: [PATCH 08927/10326] Rework slider hackery to not overwrite Samples

---
 .../Objects/Drawables/DrawableSlider.cs            | 14 +++++++++++---
 osu.Game.Rulesets.Osu/Objects/Slider.cs            | 12 +++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index e29e28b1fa..82b5492de6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -109,15 +109,23 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void LoadSamples()
         {
-            base.LoadSamples();
+            // Note: base.LoadSamples() isn't called since the slider plays the tail's hitsounds for the time being.
+
+            if (HitObject.SampleControlPoint == null)
+            {
+                throw new InvalidOperationException($"{nameof(HitObject)}s must always have an attached {nameof(HitObject.SampleControlPoint)}."
+                                                    + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
+            }
+
+            Samples.Samples = HitObject.TailSamples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
 
             var slidingSamples = new List<ISampleInfo>();
 
-            var normalSample = HitObject.OriginalSamples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
+            var normalSample = HitObject.Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
             if (normalSample != null)
                 slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(normalSample).With("sliderslide"));
 
-            var whistleSample = HitObject.OriginalSamples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_WHISTLE);
+            var whistleSample = HitObject.Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_WHISTLE);
             if (whistleSample != null)
                 slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(whistleSample).With("sliderwhistle"));
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 4e71d82cab..8ba9597dc3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         public List<IList<HitSampleInfo>> NodeSamples { get; set; } = new List<IList<HitSampleInfo>>();
 
         [JsonIgnore]
-        public IList<HitSampleInfo> OriginalSamples { get; private set; }
+        public IList<HitSampleInfo> TailSamples { get; private set; }
 
         private int repeatCount;
 
@@ -146,12 +146,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             Velocity = scoringDistance / timingPoint.BeatLength;
             TickDistance = scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier;
-
-            // The samples should be attached to the slider tail, however this can only be done after LegacyLastTick is removed otherwise they would play earlier than they're intended to.
-            // For now, the samples are attached to and played by the slider itself at the correct end time.
-            // ToArray call is required as GetNodeSamples may fallback to Samples itself (without it it will get cleared due to the list reference being live).
-            OriginalSamples = Samples.ToList();
-            Samples = this.GetNodeSamples(repeatCount + 1).ToArray();
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
@@ -242,6 +236,10 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             if (HeadCircle != null)
                 HeadCircle.Samples = this.GetNodeSamples(0);
+
+            // The samples should be attached to the slider tail, however this can only be done after LegacyLastTick is removed otherwise they would play earlier than they're intended to.
+            // For now, the samples are played by the slider itself at the correct end time.
+            TailSamples = this.GetNodeSamples(repeatCount + 1);
         }
 
         public override Judgement CreateJudgement() => OnlyJudgeNestedObjects ? new OsuIgnoreJudgement() : new OsuJudgement();

From 9b0ce2999ffe05292826c048942058da5d1679d4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 15:28:42 +0900
Subject: [PATCH 08928/10326] Fix legacy encoder

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index da44b96ed3..acbf57d25f 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -273,7 +273,7 @@ namespace osu.Game.Beatmaps.Formats
             if (hitObject is IHasPath path)
             {
                 addPathData(writer, path, position);
-                writer.Write(getSampleBank(hitObject.Samples, zeroBanks: true));
+                writer.Write(getSampleBank(hitObject.Samples));
             }
             else
             {
@@ -420,15 +420,15 @@ namespace osu.Game.Beatmaps.Formats
             writer.Write(FormattableString.Invariant($"{endTimeData.EndTime}{suffix}"));
         }
 
-        private string getSampleBank(IList<HitSampleInfo> samples, bool banksOnly = false, bool zeroBanks = false)
+        private string getSampleBank(IList<HitSampleInfo> samples, bool banksOnly = false)
         {
             LegacySampleBank normalBank = toLegacySampleBank(samples.SingleOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)?.Bank);
             LegacySampleBank addBank = toLegacySampleBank(samples.FirstOrDefault(s => !string.IsNullOrEmpty(s.Name) && s.Name != HitSampleInfo.HIT_NORMAL)?.Bank);
 
             StringBuilder sb = new StringBuilder();
 
-            sb.Append(FormattableString.Invariant($"{(zeroBanks ? 0 : (int)normalBank)}:"));
-            sb.Append(FormattableString.Invariant($"{(zeroBanks ? 0 : (int)addBank)}"));
+            sb.Append(FormattableString.Invariant($"{(int)normalBank}:"));
+            sb.Append(FormattableString.Invariant($"{(int)addBank}"));
 
             if (!banksOnly)
             {

From b10ee7482d8b72986448b2c33ec81d898df16556 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 25 Dec 2020 15:43:50 +0900
Subject: [PATCH 08929/10326] Add a failing test to check catch replay accuracy

---
 .../TestSceneCatchReplay.cs                   | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs
new file mode 100644
index 0000000000..a10371b0f7
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.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 NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.UI;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public class TestSceneCatchReplay : TestSceneCatchPlayer
+    {
+        protected override bool Autoplay => true;
+
+        private const int object_count = 10;
+
+        [Test]
+        public void TestReplayCatcherPositionIsFramePerfect()
+        {
+            AddUntilStep("caught all fruits", () => Player.ScoreProcessor.Combo.Value == object_count);
+        }
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            var beatmap = new Beatmap
+            {
+                BeatmapInfo =
+                {
+                    Ruleset = ruleset,
+                }
+            };
+
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint());
+
+            for (int i = 0; i < object_count / 2; i++)
+            {
+                beatmap.HitObjects.Add(new Fruit
+                {
+                    StartTime = (i + 1) * 1000,
+                    X = 0
+                });
+                beatmap.HitObjects.Add(new Fruit
+                {
+                    StartTime = (i + 1) * 1000 + 1,
+                    X = CatchPlayfield.WIDTH
+                });
+            }
+
+            return beatmap;
+        }
+    }
+}

From 6d0dc62502ecd82dd409b85ffcfdb6bee1a61f2a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 9 Apr 2021 16:04:45 +0900
Subject: [PATCH 08930/10326] Make sure latest catcher position is used for
 catching logic

A replay frame processed in CatchInputManager is applied to catcher in `CatcherArea`.
The catcher position is then used for the catching logic for each hit object under `HitObjectContainer`.
Thus, if `HitObjectContainer` came before `CatcherArea`, the replay input is delayed one frame.
That was one reason why the catch autoplay misses hit objects (especially when fast-forwarded).
---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 73420a9eda..0e1ef90737 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -51,8 +51,11 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 droppedObjectContainer,
                 CatcherArea.MovableCatcher.CreateProxiedContent(),
-                HitObjectContainer,
+                HitObjectContainer.CreateProxy(),
+                // This ordering (`CatcherArea` before `HitObjectContainer`) is important to
+                // make sure the up-to-date catcher position is used for the catcher catching logic of hit objects.
                 CatcherArea,
+                HitObjectContainer,
             };
         }
 

From bb15baf118f6e49306acc9688cd6790b39dc102c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 17:31:14 +0900
Subject: [PATCH 08931/10326] Add initial multiplayer spectator leaderboard

---
 .../MultiplayerSpectatorLeaderboard.cs        | 82 +++++++++++++++++++
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 19 +++--
 2 files changed, 94 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
new file mode 100644
index 0000000000..35c3471ce2
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Timing;
+using osu.Game.Online.Spectator;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSpectatorLeaderboard : MultiplayerGameplayLeaderboard
+    {
+        private readonly Dictionary<int, TrackedUserData> trackedData = new Dictionary<int, TrackedUserData>();
+
+        public MultiplayerSpectatorLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
+            : base(scoreProcessor, userIds)
+        {
+        }
+
+        public void AddSource(int userId, IClock source) => trackedData[userId] = new TrackedUserData(source);
+
+        public void RemoveSource(int userId, IClock source) => trackedData.Remove(userId);
+
+        protected override void OnIncomingFrames(int userId, FrameDataBundle bundle)
+        {
+            if (!trackedData.TryGetValue(userId, out var data))
+                return;
+
+            data.Frames.Add(new TimedFrameHeader(bundle.Frames.First().Time, bundle.Header));
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            foreach (var (userId, data) in trackedData)
+            {
+                var targetTime = data.Clock.CurrentTime;
+
+                int frameIndex = data.Frames.BinarySearch(new TimedFrameHeader(targetTime));
+                if (frameIndex < 0)
+                    frameIndex = ~frameIndex;
+                frameIndex = Math.Clamp(frameIndex - 1, 0, data.Frames.Count - 1);
+
+                SetCurrentFrame(userId, data.Frames[frameIndex].Header);
+            }
+        }
+
+        private class TrackedUserData
+        {
+            public readonly IClock Clock;
+            public readonly List<TimedFrameHeader> Frames = new List<TimedFrameHeader>();
+
+            public TrackedUserData(IClock clock)
+            {
+                Clock = clock;
+            }
+        }
+
+        private class TimedFrameHeader : IComparable<TimedFrameHeader>
+        {
+            public readonly double Time;
+            public readonly FrameHeader Header;
+
+            public TimedFrameHeader(double time)
+            {
+                Time = time;
+            }
+
+            public TimedFrameHeader(double time, FrameHeader header)
+            {
+                Time = time;
+                Header = header;
+            }
+
+            public int CompareTo(TimedFrameHeader other) => Time.CompareTo(other.Time);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index a3d27c4e71..65ad8be3f0 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Screens.Play.HUD
     public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
     {
         private readonly ScoreProcessor scoreProcessor;
-
         private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
 
         [Resolved]
@@ -116,13 +115,19 @@ namespace osu.Game.Screens.Play.HUD
                 trackedData.UpdateScore(scoreProcessor, mode.NewValue);
         }
 
-        private void handleIncomingFrames(int userId, FrameDataBundle bundle)
+        private void handleIncomingFrames(int userId, FrameDataBundle bundle) => Schedule(() =>
         {
-            if (userScores.TryGetValue(userId, out var trackedData))
-            {
-                trackedData.LastHeader = bundle.Header;
-                trackedData.UpdateScore(scoreProcessor, scoringMode.Value);
-            }
+            if (userScores.ContainsKey(userId))
+                OnIncomingFrames(userId, bundle);
+        });
+
+        protected virtual void OnIncomingFrames(int userId, FrameDataBundle bundle) => SetCurrentFrame(userId, bundle.Header);
+
+        protected void SetCurrentFrame(int userId, FrameHeader header)
+        {
+            var trackedScore = userScores[userId];
+            trackedScore.LastHeader = header;
+            trackedScore.UpdateScore(scoreProcessor, scoringMode.Value);
         }
 
         protected override void Dispose(bool isDisposing)

From 0af6d77192e3af39430098a2dc35c26cdde55d69 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 9 Apr 2021 11:03:38 +0200
Subject: [PATCH 08932/10326] Test for path type transfer

---
 .../TestScenePathControlPointVisualiser.cs    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 440ab7c889..35b79aa8ac 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertControlPointPathType(0, PathType.Bezier);
             assertControlPointPathType(1, PathType.PerfectCurve);
-            AddAssert("point 3 is not inherited", () => slider.Path.ControlPoints[3].Type != null);
+            assertControlPointPathType(3, PathType.Bezier);
         }
 
         [Test]
@@ -105,6 +105,27 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("point 3 is not inherited", () => slider.Path.ControlPoints[3].Type != null);
         }
 
+        [Test]
+        public void TestPerfectCurveTooManyPointsLinear()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200), PathType.Linear);
+            addControlPointStep(new Vector2(300));
+            addControlPointStep(new Vector2(500, 300));
+            addControlPointStep(new Vector2(700, 200));
+            addControlPointStep(new Vector2(500, 100));
+
+            // Must be both hovering and selecting the control point for the context menu to work.
+            moveMouseToControlPoint(1);
+            AddStep("select control point", () => visualiser.Pieces[1].IsSelected.Value = true);
+            addContextMenuItemStep("Perfect curve");
+
+            assertControlPointPathType(0, PathType.Linear);
+            assertControlPointPathType(1, PathType.PerfectCurve);
+            assertControlPointPathType(3, PathType.Linear);
+        }
+
         [Test]
         public void TestPerfectCurveChangeToBezier()
         {

From f64b2095bf6c06de31b2cc0ca7d9b888dc101347 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 9 Apr 2021 11:04:00 +0200
Subject: [PATCH 08933/10326] Carry over the previous path type

---
 .../Sliders/Components/PathControlPointVisualiser.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 1dfbf97682..44c3056910 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -169,11 +169,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 case PathType.PerfectCurve:
                     // Can't always create a circular arc out of 4 or more points,
                     // so we split the segment into one 3-point circular arc segment
-                    // and one bezier segment.
+                    // and one segment of the previous type.
                     int thirdPointIndex = indexInSegment + 2;
 
                     if (piece.PointsInSegment.Count > thirdPointIndex + 1)
-                        piece.PointsInSegment[thirdPointIndex].Type.Value = PathType.Bezier;
+                        piece.PointsInSegment[thirdPointIndex].Type.Value = piece.PointsInSegment[0].Type.Value;
 
                     break;
             }

From 3b86f0eb2f55839c4301cba1aefcc971ba205149 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:15:23 +0900
Subject: [PATCH 08934/10326] Fix exception with 0 frames

---
 .../Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
index 35c3471ce2..08db5befa4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
@@ -40,6 +40,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             {
                 var targetTime = data.Clock.CurrentTime;
 
+                if (data.Frames.Count == 0)
+                    continue;
+
                 int frameIndex = data.Frames.BinarySearch(new TimedFrameHeader(targetTime));
                 if (frameIndex < 0)
                     frameIndex = ~frameIndex;

From 90e243eea5404e1632fc3f63c679c8fc38874c60 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:15:27 +0900
Subject: [PATCH 08935/10326] Rename methods

---
 .../Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
index 08db5befa4..f16869b43d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
@@ -20,9 +20,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
         }
 
-        public void AddSource(int userId, IClock source) => trackedData[userId] = new TrackedUserData(source);
+        public void AddClock(int userId, IClock source) => trackedData[userId] = new TrackedUserData(source);
 
-        public void RemoveSource(int userId, IClock source) => trackedData.Remove(userId);
+        public void RemoveClock(int userId, IClock source) => trackedData.Remove(userId);
 
         protected override void OnIncomingFrames(int userId, FrameDataBundle bundle)
         {

From 589ce4bdc2b09c7f96d99582aea7e7f8ef430eb8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:16:10 +0900
Subject: [PATCH 08936/10326] Add test

---
 ...estSceneMultiplayerSpectatorLeaderboard.cs | 207 ++++++++++++++++++
 1 file changed, 207 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
new file mode 100644
index 0000000000..57e9fb37cc
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
@@ -0,0 +1,207 @@
+// Copyright (c) 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 System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Framework.Utils;
+using osu.Game.Database;
+using osu.Game.Online;
+using osu.Game.Online.Spectator;
+using osu.Game.Replays.Legacy;
+using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerSpectatorLeaderboard : MultiplayerTestScene
+    {
+        [Cached(typeof(SpectatorStreamingClient))]
+        private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();
+
+        [Cached(typeof(UserLookupCache))]
+        private UserLookupCache lookupCache = new TestUserLookupCache();
+
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        private readonly Dictionary<int, ManualClock> clocks = new Dictionary<int, ManualClock>
+        {
+            { 55, new ManualClock() },
+            { 56, new ManualClock() }
+        };
+
+        public TestSceneMultiplayerSpectatorLeaderboard()
+        {
+            base.Content.AddRange(new Drawable[]
+            {
+                streamingClient,
+                lookupCache,
+                content = new Container { RelativeSizeAxes = Axes.Both }
+            });
+        }
+
+        [SetUpSteps]
+        public new void SetUpSteps()
+        {
+            MultiplayerSpectatorLeaderboard leaderboard = null;
+
+            AddStep("reset", () =>
+            {
+                Clear();
+
+                foreach (var (userId, clock) in clocks)
+                {
+                    streamingClient.EndPlay(userId, 0);
+                    clock.CurrentTime = 0;
+                }
+            });
+
+            AddStep("create leaderboard", () =>
+            {
+                foreach (var (userId, _) in clocks)
+                    streamingClient.StartPlay(userId, 0);
+
+                Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
+
+                var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
+                var scoreProcessor = new OsuScoreProcessor();
+                scoreProcessor.ApplyBeatmap(playable);
+
+                LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, clocks.Keys.ToArray()) { Expanded = { Value = true } }, Add);
+            });
+
+            AddUntilStep("wait for load", () => leaderboard.IsLoaded);
+
+            AddStep("add clock sources", () =>
+            {
+                foreach (var (userId, clock) in clocks)
+                    leaderboard.AddClock(userId, clock);
+            });
+        }
+
+        [Test]
+        public void TestLeaderboardTracksCurrentTime()
+        {
+            AddStep("send frames", () =>
+            {
+                // For user 55, send 100 frames in sets of 1.
+                // For user 56, send 100 frames in sets of 10.
+                for (int i = 0; i < 100; i++)
+                {
+                    streamingClient.SendFrames(55, i, 1);
+
+                    if (i % 10 == 0)
+                        streamingClient.SendFrames(56, i, 10);
+                }
+            });
+
+            assertCombo(55, 1);
+            assertCombo(56, 10);
+
+            setTime(500);
+            assertCombo(55, 5);
+            assertCombo(56, 10);
+
+            setTime(1100);
+            assertCombo(55, 11);
+            assertCombo(56, 20);
+        }
+
+        private void setTime(double time) => AddStep($"set time {time}", () =>
+        {
+            foreach (var (_, clock) in clocks)
+                clock.CurrentTime = time;
+        });
+
+        private void assertCombo(int userId, int expectedCombo)
+            => AddUntilStep($"player {userId} has {expectedCombo} combo", () => this.ChildrenOfType<GameplayLeaderboardScore>().Single(s => s.User?.Id == userId).Combo.Value == expectedCombo);
+
+        private class TestSpectatorStreamingClient : SpectatorStreamingClient
+        {
+            private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
+            private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
+
+            public TestSpectatorStreamingClient()
+                : base(new DevelopmentEndpointConfiguration())
+            {
+            }
+
+            public void StartPlay(int userId, int beatmapId)
+            {
+                userBeatmapDictionary[userId] = beatmapId;
+                userSentStateDictionary[userId] = false;
+                sendState(userId, beatmapId);
+            }
+
+            public void EndPlay(int userId, int beatmapId)
+            {
+                ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
+                {
+                    BeatmapID = beatmapId,
+                    RulesetID = 0,
+                });
+                userSentStateDictionary[userId] = false;
+            }
+
+            public void SendFrames(int userId, int index, int count)
+            {
+                var frames = new List<LegacyReplayFrame>();
+
+                for (int i = index; i < index + count; i++)
+                {
+                    var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
+                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
+                }
+
+                var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
+                ((ISpectatorClient)this).UserSentFrames(userId, bundle);
+                if (!userSentStateDictionary[userId])
+                    sendState(userId, userBeatmapDictionary[userId]);
+            }
+
+            public override void WatchUser(int userId)
+            {
+                if (userSentStateDictionary[userId])
+                {
+                    // usually the server would do this.
+                    sendState(userId, userBeatmapDictionary[userId]);
+                }
+
+                base.WatchUser(userId);
+            }
+
+            private void sendState(int userId, int beatmapId)
+            {
+                ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
+                {
+                    BeatmapID = beatmapId,
+                    RulesetID = 0,
+                });
+                userSentStateDictionary[userId] = true;
+            }
+        }
+
+        private class TestUserLookupCache : UserLookupCache
+        {
+            protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
+            {
+                return Task.FromResult(new User
+                {
+                    Id = lookup,
+                    Username = $"User {lookup}"
+                });
+            }
+        }
+    }
+}

From b49997f531dad5e80f50fa6cbe1f4349a99be38f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:18:23 +0900
Subject: [PATCH 08937/10326] Add test for no frames

---
 .../TestSceneMultiplayerSpectatorLeaderboard.cs            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
index 57e9fb37cc..53efb4392f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
@@ -118,6 +118,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             assertCombo(56, 20);
         }
 
+        [Test]
+        public void TestNoFrames()
+        {
+            assertCombo(55, 0);
+            assertCombo(56, 1);
+        }
+
         private void setTime(double time) => AddStep($"set time {time}", () =>
         {
             foreach (var (_, clock) in clocks)

From 9ddcd686ac09e3f0aa35c0f5a9c9ae01e7e44f0e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:23:38 +0900
Subject: [PATCH 08938/10326] Fix incorrect assert

---
 .../Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
index 53efb4392f..8589cffcc9 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public void TestNoFrames()
         {
             assertCombo(55, 0);
-            assertCombo(56, 1);
+            assertCombo(56, 0);
         }
 
         private void setTime(double time) => AddStep($"set time {time}", () =>

From e73f3f52d7730854a9f360dc2f1ae7df0ec834ea Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:23:41 +0900
Subject: [PATCH 08939/10326] Add some more asserts

---
 ...estSceneMultiplayerSpectatorLeaderboard.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
index 8589cffcc9..3b2cfb1c7b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
@@ -95,8 +95,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("send frames", () =>
             {
-                // For user 55, send 100 frames in sets of 1.
-                // For user 56, send 100 frames in sets of 10.
+                // For user 55, send frames in sets of 1.
+                // For user 56, send frames in sets of 10.
                 for (int i = 0; i < 100; i++)
                 {
                     streamingClient.SendFrames(55, i, 1);
@@ -109,13 +109,25 @@ namespace osu.Game.Tests.Visual.Multiplayer
             assertCombo(55, 1);
             assertCombo(56, 10);
 
+            // Advance to a point where only user 55's frame changes.
             setTime(500);
             assertCombo(55, 5);
             assertCombo(56, 10);
 
+            // Advance to a point where both user's frame changes.
             setTime(1100);
             assertCombo(55, 11);
             assertCombo(56, 20);
+
+            // Advance user 56 only to a point where its frame changes.
+            setTime(56, 2100);
+            assertCombo(55, 11);
+            assertCombo(56, 30);
+
+            // Advance both users beyond their last frame
+            setTime(101 * 100);
+            assertCombo(55, 100);
+            assertCombo(56, 100);
         }
 
         [Test]
@@ -131,6 +143,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 clock.CurrentTime = time;
         });
 
+        private void setTime(int userId, double time)
+            => AddStep($"set user {userId} time {time}", () => clocks[userId].CurrentTime = time);
+
         private void assertCombo(int userId, int expectedCombo)
             => AddUntilStep($"player {userId} has {expectedCombo} combo", () => this.ChildrenOfType<GameplayLeaderboardScore>().Single(s => s.User?.Id == userId).Combo.Value == expectedCombo);
 

From 7cbc8f2695b4868fa4be7a9b41ebd8ef42b1b0d4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:29:02 +0900
Subject: [PATCH 08940/10326] Add some xmldocs

---
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 65ad8be3f0..f0d2ac4b7f 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -121,8 +121,21 @@ namespace osu.Game.Screens.Play.HUD
                 OnIncomingFrames(userId, bundle);
         });
 
+        /// <summary>
+        /// Invoked when new frames have arrived for a user.
+        /// </summary>
+        /// <remarks>
+        /// By default, this immediately sets the current frame to be displayed for the user.
+        /// </remarks>
+        /// <param name="userId">The user which the frames arrived for.</param>
+        /// <param name="bundle">The bundle of frames.</param>
         protected virtual void OnIncomingFrames(int userId, FrameDataBundle bundle) => SetCurrentFrame(userId, bundle.Header);
 
+        /// <summary>
+        /// Sets the current frame to be displayed for a user.
+        /// </summary>
+        /// <param name="userId">The user to set the frame of.</param>
+        /// <param name="header">The frame to set.</param>
         protected void SetCurrentFrame(int userId, FrameHeader header)
         {
             var trackedScore = userScores[userId];

From 8005f146a914b26bbe87d763d8ee7d073101711c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:37:11 +0900
Subject: [PATCH 08941/10326] Fix inspection

---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index b7e1b8496c..6fa045c962 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userIds">The users to spectate.</param>
         protected SpectatorScreen(params int[] userIds)
         {
-            this.UserIds = userIds;
+            UserIds = userIds;
         }
 
         protected override void LoadComplete()

From 4fa51d5ec87a9b5592968737c7e908cfaa0da10b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:41:48 +0900
Subject: [PATCH 08942/10326] Add leaderboard to multiplayer spectate screen

---
 .../Spectate/MultiplayerSpectator.cs          | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 90cf031584..d415669cb1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
@@ -30,6 +31,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly PlayerInstance[] instances;
         private PlayerGrid grid;
+        private MultiplayerSpectatorLeaderboard leaderboard;
 
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
@@ -40,10 +42,35 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = grid = new PlayerGrid
+            Container leaderboardContainer;
+
+            InternalChild = new GridContainer
             {
-                RelativeSizeAxes = Axes.Both
+                RelativeSizeAxes = Axes.Both,
+                ColumnDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        leaderboardContainer = new Container
+                        {
+                            RelativeSizeAxes = Axes.Y,
+                            AutoSizeAxes = Axes.X
+                        },
+                        grid = new PlayerGrid { RelativeSizeAxes = Axes.Both }
+                    }
+                }
             };
+
+            // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
+            var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
+            var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
+            scoreProcessor.ApplyBeatmap(playableBeatmap);
+
+            LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
         protected override void Update()
@@ -118,18 +145,25 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var existingInstance = instances[userIndex];
 
             if (existingInstance != null)
+            {
                 grid.Remove(existingInstance);
+                leaderboard.RemoveClock(existingInstance.User.Id);
+            }
 
             LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score), d =>
             {
                 if (instances[userIndex] == d)
+                {
                     grid.Add(d);
+                    leaderboard.AddClock(d.User.Id, d.Beatmap.Track);
+                }
             });
         }
 
         protected override void EndGameplay(int userId)
         {
             spectatorClient.StopWatchingUser(userId);
+            leaderboard.RemoveClock(userId);
         }
 
         private int getIndexForUser(int userId) => Array.IndexOf(UserIds, userId);

From d2c37e6cf8828e5793c9aef36b76fd6ce986b537 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:41:58 +0900
Subject: [PATCH 08943/10326] Remove unnecessary parameter

---
 .../Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
index f16869b43d..aa9f162036 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         public void AddClock(int userId, IClock source) => trackedData[userId] = new TrackedUserData(source);
 
-        public void RemoveClock(int userId, IClock source) => trackedData.Remove(userId);
+        public void RemoveClock(int userId) => trackedData.Remove(userId);
 
         protected override void OnIncomingFrames(int userId, FrameDataBundle bundle)
         {

From c93ce73123c142499f554fa77b752ec668573876 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 19:58:24 +0900
Subject: [PATCH 08944/10326] Move catchup logic inside PlayerInstance, fixup
 some edge cases

---
 .../Spectate/MultiplayerSpectator.cs          | 37 +++------
 .../Spectate/MultiplayerSpectatorPlayer.cs    |  2 +
 .../Multiplayer/Spectate/PlayerInstance.cs    | 79 ++++++++++++++++++-
 3 files changed, 93 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index d415669cb1..19c0d4e742 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -2,16 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
-using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
@@ -19,7 +16,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     public class MultiplayerSpectator : SpectatorScreen
     {
         private const double min_duration_to_allow_playback = 50;
-        private const double max_sync_offset = 2;
 
         // Isolates beatmap/ruleset to this screen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
@@ -73,9 +69,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
-        protected override void Update()
+        protected override void UpdateAfterChildren()
         {
-            base.Update();
+            base.UpdateAfterChildren();
             updatePlayTime();
         }
 
@@ -85,7 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
             if (gameplayStarted)
             {
-                ensurePlaying(instances.Select(i => i.Beatmap.Track.CurrentTime).Max());
+                ensurePlaying(instances.Select(i => i.GetCurrentTrackTime()).Max());
                 return;
             }
 
@@ -108,30 +104,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private void ensureAllStopped()
         {
             foreach (var inst in instances)
-                inst.ChildrenOfType<GameplayClockContainer>().SingleOrDefault()?.Stop();
+                inst?.PauseGameplay();
         }
 
-        private readonly BindableDouble catchupFrequencyAdjustment = new BindableDouble(2.0);
-
-        private void ensurePlaying(double targetTime)
+        private void ensurePlaying(double targetTrackTime)
         {
             foreach (var inst in instances)
             {
+                Debug.Assert(inst != null);
+
                 double lastFrameTime = inst.Score.Replay.Frames.Select(f => f.Time).Last();
-                double currentTime = inst.Beatmap.Track.CurrentTime;
+                double currentTime = inst.GetCurrentGameplayTime();
 
-                // If we have enough frames to play back, start playback.
-                if (Precision.DefinitelyBigger(lastFrameTime, currentTime, min_duration_to_allow_playback))
-                {
-                    inst.ChildrenOfType<GameplayClockContainer>().Single().Start();
+                bool canContinuePlayback = Precision.DefinitelyBigger(lastFrameTime, currentTime, min_duration_to_allow_playback);
+                if (!canContinuePlayback)
+                    continue;
 
-                    if (targetTime < lastFrameTime && targetTime > currentTime + max_sync_offset)
-                        inst.Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                    else
-                        inst.Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                }
-                else
-                    inst.Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                inst.ContinueGameplay(targetTrackTime);
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index bad093f666..1634438850 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
 
+        public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
+
         public MultiplayerSpectatorPlayer(Score score)
             : base(score)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 5689a3222a..acac753fe2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
@@ -15,10 +17,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class PlayerInstance : CompositeDrawable
     {
+        private const double catchup_rate = 2;
+        private const double max_sync_offset = catchup_rate * 2; // Double the catchup rate to prevent ringing.
+
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
         public User User => Score.ScoreInfo.User;
-        public ScoreProcessor ScoreProcessor => player?.ScoreProcessor;
 
         public WorkingBeatmap Beatmap { get; private set; }
         public Ruleset Ruleset { get; private set; }
@@ -54,5 +58,78 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => player = new MultiplayerSpectatorPlayer(Score)));
         }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+            updateCatchup();
+        }
+
+        private readonly BindableDouble catchupFrequencyAdjustment = new BindableDouble(catchup_rate);
+        private double targetTrackTime;
+        private bool isCatchingUp;
+
+        private void updateCatchup()
+        {
+            if (player?.IsLoaded != true)
+                return;
+
+            if (Score.Replay.Frames.Count == 0)
+                return;
+
+            if (player.GameplayClockContainer.IsPaused.Value)
+                return;
+
+            double currentTime = Beatmap.Track.CurrentTime;
+            bool catchupRequired = targetTrackTime > currentTime + max_sync_offset;
+
+            // Skip catchup if nothing needs to be done.
+            if (catchupRequired == isCatchingUp)
+                return;
+
+            if (catchupRequired)
+            {
+                Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                isCatchingUp = true;
+            }
+            else
+            {
+                Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                isCatchingUp = false;
+            }
+        }
+
+        public double GetCurrentGameplayTime()
+        {
+            if (player?.IsLoaded != true)
+                return 0;
+
+            return player.GameplayClockContainer.GameplayClock.CurrentTime;
+        }
+
+        public double GetCurrentTrackTime()
+        {
+            if (player?.IsLoaded != true)
+                return 0;
+
+            return Beatmap.Track.CurrentTime;
+        }
+
+        public void ContinueGameplay(double targetTrackTime)
+        {
+            if (player?.IsLoaded != true)
+                return;
+
+            player.GameplayClockContainer.Start();
+            this.targetTrackTime = targetTrackTime;
+        }
+
+        public void PauseGameplay()
+        {
+            if (player?.IsLoaded != true)
+                return;
+
+            player.GameplayClockContainer.Stop();
+        }
     }
 }

From 49b7519c53a765d9bb4576dd1f0c529a0027fd24 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 20:03:34 +0900
Subject: [PATCH 08945/10326] Refactor gameplay starting logic

---
 .../Spectate/MultiplayerSpectator.cs          | 36 ++++---------------
 .../Multiplayer/Spectate/PlayerInstance.cs    |  1 -
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 19c0d4e742..b0747f5027 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -72,43 +72,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
-            updatePlayTime();
+            updateGameplayPlayingState();
         }
 
-        private bool gameplayStarted;
-
-        private void updatePlayTime()
+        private void updateGameplayPlayingState()
         {
-            if (gameplayStarted)
+            // Make sure all players are loaded and have frames before starting any.
+            if (!AllPlayersLoaded || !instances.All(i => i.Score.Replay.Frames.Count > 0))
             {
-                ensurePlaying(instances.Select(i => i.GetCurrentTrackTime()).Max());
+                foreach (var inst in instances)
+                    inst?.PauseGameplay();
                 return;
             }
 
-            // Make sure all players are loaded.
-            if (!AllPlayersLoaded)
-            {
-                ensureAllStopped();
-                return;
-            }
+            double targetTrackTime = instances.Select(i => i.GetCurrentGameplayTime()).Max();
 
-            if (!instances.All(i => i.Score.Replay.Frames.Count > 0))
-            {
-                ensureAllStopped();
-                return;
-            }
-
-            gameplayStarted = true;
-        }
-
-        private void ensureAllStopped()
-        {
-            foreach (var inst in instances)
-                inst?.PauseGameplay();
-        }
-
-        private void ensurePlaying(double targetTrackTime)
-        {
             foreach (var inst in instances)
             {
                 Debug.Assert(inst != null);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index acac753fe2..ca58d888fa 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Users;

From eccd269ccee483973c260daa44a0dddc7740f9c0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 20:17:57 +0900
Subject: [PATCH 08946/10326] Implement maximum start delay

---
 .../Multiplayer/TestSceneMultiplayerScreen.cs |  2 +-
 .../Spectate/MultiplayerSpectator.cs          | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
index d085827986..897219dbad 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             loadSpectateScreen();
 
             // Send frames for one player only, both should remain paused.
-            sendFrames(55, 20);
+            sendFrames(55, 1000);
             checkPausedInstant(55, true);
             checkPausedInstant(56, true);
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index b0747f5027..d8ec25fedb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.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.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -16,6 +17,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     public class MultiplayerSpectator : SpectatorScreen
     {
         private const double min_duration_to_allow_playback = 50;
+        private const double maximum_start_delay = 15000;
 
         // Isolates beatmap/ruleset to this screen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
@@ -28,6 +30,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly PlayerInstance[] instances;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
+        private double? loadStartTime;
 
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
@@ -72,22 +75,39 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
+
+            loadStartTime ??= Time.Current;
+
             updateGameplayPlayingState();
         }
 
+        private bool canStartGameplay =>
+            // All players must be loaded.
+            AllPlayersLoaded
+            && (
+                // All players have frames...
+                instances.All(i => i.Score.Replay.Frames.Count > 0)
+                // Or any player has frames and the maximum start delay has been exceeded.
+                || (Time.Current - loadStartTime > maximum_start_delay
+                    && instances.Any(i => i.Score.Replay.Frames.Count > 0))
+            );
+
         private void updateGameplayPlayingState()
         {
             // Make sure all players are loaded and have frames before starting any.
-            if (!AllPlayersLoaded || !instances.All(i => i.Score.Replay.Frames.Count > 0))
+            if (!canStartGameplay)
             {
                 foreach (var inst in instances)
                     inst?.PauseGameplay();
                 return;
             }
 
-            double targetTrackTime = instances.Select(i => i.GetCurrentGameplayTime()).Max();
+            // Not all instances may be in a valid gameplay state (see canStartGameplay). Only control the ones that are.
+            IEnumerable<PlayerInstance> validInstances = instances.Where(i => i.Score.Replay.Frames.Count > 0);
 
-            foreach (var inst in instances)
+            double targetTrackTime = validInstances.Select(i => i.GetCurrentTrackTime()).Max();
+
+            foreach (var inst in validInstances)
             {
                 Debug.Assert(inst != null);
 

From 61c400b1a1187a17a17467a02a061fb87dca65f4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 20:18:26 +0900
Subject: [PATCH 08947/10326] Fix filename

---
 ...SceneMultiplayerScreen.cs => TestSceneMultiplayerSpectator.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneMultiplayerScreen.cs => TestSceneMultiplayerSpectator.cs} (100%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
similarity index 100%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs

From 3e46d6401eeaef7a63ed6506f8b8d2840b53767c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 20:22:30 +0900
Subject: [PATCH 08948/10326] Remove some unnecessary code

---
 .../Multiplayer/Spectate/MultiplayerSpectator.cs      |  2 +-
 .../OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index d8ec25fedb..db5de45f72 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         private bool canStartGameplay =>
-            // All players must be loaded.
+            // All players must be loaded, and...
             AllPlayersLoaded
             && (
                 // All players have frames...
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index ca58d888fa..6b5f102543 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
@@ -24,7 +23,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public User User => Score.ScoreInfo.User;
 
         public WorkingBeatmap Beatmap { get; private set; }
-        public Ruleset Ruleset { get; private set; }
 
         public readonly Score Score;
 
@@ -43,7 +41,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private void load(BeatmapManager beatmapManager)
         {
             Beatmap = beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true);
-            Ruleset = Score.ScoreInfo.Ruleset.CreateInstance();
 
             InternalChild = new GameplayIsolationContainer(Beatmap, Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
             {
@@ -87,15 +84,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return;
 
             if (catchupRequired)
-            {
                 Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                isCatchingUp = true;
-            }
             else
-            {
                 Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                isCatchingUp = false;
-            }
+
+            isCatchingUp = catchupRequired;
         }
 
         public double GetCurrentGameplayTime()

From 6eddc6c59e6c63c219798bc0fb92a59e0d3c3b96 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 21:03:45 +0900
Subject: [PATCH 08949/10326] Enable spectating multiplayer matches

---
 .../Online/Multiplayer/MultiplayerClient.cs   |  3 ---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  6 ++++--
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 20 +++++++++++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 37e11cc576..4529dfd0a7 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -96,9 +96,6 @@ namespace osu.Game.Online.Multiplayer
             if (!IsConnected.Value)
                 return Task.CompletedTask;
 
-            if (newState == MultiplayerUserState.Spectating)
-                return Task.CompletedTask; // Not supported yet.
-
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 706da05d15..0d1ed5d88e 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -148,10 +148,12 @@ namespace osu.Game.Screens.OnlinePlay.Match
             return base.OnExiting(next);
         }
 
-        protected void StartPlay(Func<Player> player)
+        protected void StartPlay(Func<Player> player) => PushTopLevelScreen(() => new PlayerLoader(player));
+
+        protected void PushTopLevelScreen(Func<Screen> screen)
         {
             sampleStart?.Play();
-            ParentScreen?.Push(new PlayerLoader(player));
+            ParentScreen?.Push(screen());
         }
 
         private void selectedItemChanged()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 90cef0107c..035eba4f30 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -25,6 +25,7 @@ using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
@@ -405,11 +406,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
-        private void onRoomUpdated()
+        private void onRoomUpdated() => Scheduler.Add(() =>
         {
-            // user mods may have changed.
-            Scheduler.AddOnce(UpdateMods);
-        }
+            if (client.Room == null)
+                return;
+
+            Debug.Assert(client.LocalUser != null);
+
+            UpdateMods();
+
+            if (client.LocalUser.State == MultiplayerUserState.Spectating
+                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad)
+                && ParentScreen.IsCurrentScreen())
+            {
+                PushTopLevelScreen(() => new MultiplayerSpectator(client.CurrentMatchPlayingUserIds.ToArray()));
+            }
+        });
 
         private void onLoadRequested()
         {

From 4409c1a36f18dbae1484dd6ef65413a275e0b57b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 22:01:21 +0900
Subject: [PATCH 08950/10326] Increase sync offset to prevent constant catchups

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 6b5f102543..f0994ec375 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     public class PlayerInstance : CompositeDrawable
     {
         private const double catchup_rate = 2;
-        private const double max_sync_offset = catchup_rate * 2; // Double the catchup rate to prevent ringing.
+        private const double max_sync_offset = 50;
 
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 

From 8a0da06e89eed9d93c32db7b045e6bd3c021853b Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 9 Apr 2021 22:40:21 +0900
Subject: [PATCH 08951/10326] Add a hover sample type for SongSelect buttons

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 5 ++++-
 osu.Game/Screens/Select/FooterButton.cs        | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 00cf5798e7..49bcc3759b 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -53,6 +53,9 @@ namespace osu.Game.Graphics.UserInterface
         Soft,
 
         [Description("-toolbar")]
-        Toolbar
+        Toolbar,
+
+        [Description("-songselect")]
+        SongSelect
     }
 }
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 7528651fd9..afb3943a09 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -14,6 +14,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input.Bindings;
 using osu.Framework.Input.Bindings;
+using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Select
 {
@@ -65,6 +66,7 @@ namespace osu.Game.Screens.Select
         private readonly Box light;
 
         public FooterButton()
+            : base(HoverSampleSet.SongSelect)
         {
             AutoSizeAxes = Axes.Both;
             Shear = SHEAR;

From ffacd38e573bb0f7b01a531bfde6c1ca9383ac96 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 9 Apr 2021 22:41:51 +0900
Subject: [PATCH 08952/10326] Reduce the randomised pitch range of hover sounds

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs     | 2 +-
 osu.Game/Screens/Select/Carousel/CarouselHeader.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 00cf5798e7..4ba79236d9 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Graphics.UserInterface
 
         public override void PlayHoverSample()
         {
-            sampleHover.Frequency.Value = 0.96 + RNG.NextDouble(0.08);
+            sampleHover.Frequency.Value = 0.98 + RNG.NextDouble(0.04);
             sampleHover.Play();
         }
     }
diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index 2fbf64de29..40ca3e0764 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 if (sampleHover == null) return;
 
-                sampleHover.Frequency.Value = 0.90 + RNG.NextDouble(0.2);
+                sampleHover.Frequency.Value = 0.99 + RNG.NextDouble(0.02);
                 sampleHover.Play();
             }
         }

From bfd3d0cce978c77d4bfa7bbe1a15262e4cc23c80 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 10 Apr 2021 01:16:54 +1000
Subject: [PATCH 08953/10326] Implement custom enumerator for ReverseQueue to
 avoid allocations

---
 .../Rulesets/Difficulty/Utils/ReverseQueue.cs | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
index f104b8105a..57db9df3ca 100644
--- a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
+++ b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
@@ -101,12 +101,33 @@ namespace osu.Game.Rulesets.Difficulty.Utils
         /// <summary>
         /// Returns an enumerator which enumerates items in the <see cref="ReverseQueue{T}"/> starting from the most recently enqueued item.
         /// </summary>
-        public IEnumerator<T> GetEnumerator()
-        {
-            for (int i = Count - 1; i >= 0; i--)
-                yield return items[(start + i) % capacity];
-        }
+        public IEnumerator<T> GetEnumerator() => new Enumerator(this);
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        public struct Enumerator : IEnumerator<T>
+        {
+            private ReverseQueue<T> reverseQueue;
+            private int currentIndex;
+
+            internal Enumerator(ReverseQueue<T> reverseQueue)
+            {
+                this.reverseQueue = reverseQueue;
+                currentIndex = -1; // The first MoveNext() should bring the iterator to 0
+            }
+
+            public bool MoveNext() => ++currentIndex < reverseQueue.Count;
+
+            public void Reset() => currentIndex = -1;
+
+            public readonly T Current => reverseQueue[currentIndex];
+
+            readonly object IEnumerator.Current => Current;
+
+            public void Dispose()
+            {
+                reverseQueue = null;
+            }
+        }
     }
 }

From affc878db9ff3a0e322dc5d25c8bfcbb76d98a33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 10 Apr 2021 01:03:15 +0900
Subject: [PATCH 08954/10326] 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 cba3975209..31308b80d8 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="2021.211.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.407.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 292e5b932f..16b888a064 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.407.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 36e581a80c..f72a1eb256 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.407.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From b66ef2fdec193cc0227e974c56de92937aabf73b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 10 Apr 2021 02:14:28 +0900
Subject: [PATCH 08955/10326] 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 31308b80d8..196d122a2a 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.407.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.410.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 16b888a064..71a6f0e5cd 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.407.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.410.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f72a1eb256..a389cc13dd 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.Framework.iOS" Version="2021.407.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.410.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.407.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.410.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 08311abc5ec93907337976e0d8ae0209684ef769 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Fri, 9 Apr 2021 17:55:41 -0400
Subject: [PATCH 08956/10326] Remove setters, cache CreatePowerStatus() and use
 a dummy LocalPowerStatus class in test scene

---
 osu.Android/OsuGameAndroid.cs                 |  7 ++-
 osu.Desktop/OsuGameDesktop.cs                 |  2 -
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 44 +++++++++++++++----
 osu.Game/Configuration/SessionStatics.cs      |  4 +-
 osu.Game/OsuGame.cs                           |  5 +++
 osu.Game/OsuGameBase.cs                       |  4 +-
 osu.Game/Screens/Play/PlayerLoader.cs         | 11 ++---
 osu.Game/Tests/OsuTestBrowser.cs              |  6 ---
 osu.Game/Utils/PowerStatus.cs                 | 26 ++++++-----
 osu.iOS/OsuGameIOS.cs                         | 12 ++---
 10 files changed, 74 insertions(+), 47 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index a0c6a1e354..02f4fa1ad6 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -21,7 +21,6 @@ namespace osu.Android
             : base(null)
         {
             gameActivity = activity;
-            PowerStatus = new AndroidPowerStatus();
         }
 
         public override Version AssemblyVersion
@@ -76,8 +75,12 @@ namespace osu.Android
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
 
-        public class AndroidPowerStatus : PowerStatus
+        protected override PowerStatus CreatePowerStatus() => new AndroidPowerStatus();
+
+        private class AndroidPowerStatus : PowerStatus
         {
+            public override double BatteryCutoff => 0.20;
+
             public override double ChargeLevel => Battery.ChargeLevel;
 
             public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 48e28fa251..0c21c75290 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -21,7 +21,6 @@ using osu.Game.Updater;
 using osu.Desktop.Windows;
 using osu.Framework.Threading;
 using osu.Game.IO;
-using osu.Game.Utils;
 
 namespace osu.Desktop
 {
@@ -34,7 +33,6 @@ namespace osu.Desktop
             : base(args)
         {
             noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
-            PowerStatus = new DefaultPowerStatus();
         }
 
         public override StableStorage GetStorageForStableInstall()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 1377459c62..36958b0741 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private readonly VolumeOverlay volumeOverlay;
 
-        [Resolved]
-        private PowerStatus powerStatus { get; set; }
+        [Cached(typeof(PowerStatus))]
+        private readonly LocalPowerStatus powerStatus = new LocalPowerStatus();
 
         private readonly ChangelogOverlay changelogOverlay;
 
@@ -292,22 +292,22 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
-        [TestCase(false, 1.0)] // not charging, full battery --> no warning
+        [TestCase(false, 1.0)] // not charging, above cutoff --> no warning
         [TestCase(false, 0.2)] // not charging, at cutoff --> warning
-        [TestCase(false, 0.1)] // charging, below cutoff --> warning
+        [TestCase(true, 0.1)] // charging, below cutoff --> no warning
         public void TestLowBatteryNotification(bool isCharging, double chargeLevel)
         {
-            AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce).Value = false);
+            AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.LowBatteryNotificationShownOnce).Value = false);
 
             // set charge status and level
             AddStep("load player", () => resetPlayer(false, () =>
             {
-                powerStatus.IsCharging = isCharging;
-                powerStatus.ChargeLevel = chargeLevel;
+                powerStatus.SetCharging(isCharging);
+                powerStatus.SetChargeLevel(chargeLevel);
             }));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
-            int notificationCount = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
-            AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
+            int warning = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
+            AddAssert($"notification {(warning == 1 ? "triggered" : "not triggered")}", () => notificationOverlay.UnreadCount.Value == warning);
             AddStep("click notification", () =>
             {
                 var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
@@ -380,5 +380,31 @@ namespace osu.Game.Tests.Visual.Gameplay
                     throw new TimeoutException();
             }
         }
+
+        /// <summary>
+        /// Mutable dummy PowerStatus class for <see cref="TestScenePlayerLoader.TestLowBatteryNotification"/>
+        /// </summary>
+        /// <inheritdoc/>
+        private class LocalPowerStatus : PowerStatus
+        {
+            private bool isCharging = true;
+            private double chargeLevel = 1;
+
+            public override double BatteryCutoff => 0.2;
+
+            public override bool IsCharging => isCharging;
+
+            public override double ChargeLevel => chargeLevel;
+
+            public void SetCharging(bool value)
+            {
+                isCharging = value;
+            }
+
+            public void SetChargeLevel(double value)
+            {
+                chargeLevel = value;
+            }
+        }
     }
 }
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index e8ee04731c..71e1a1efcc 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Configuration
         {
             SetDefault(Static.LoginOverlayDisplayed, false);
             SetDefault(Static.MutedAudioNotificationShownOnce, false);
-            SetDefault(Static.BatteryLowNotificationShownOnce, false);
+            SetDefault(Static.LowBatteryNotificationShownOnce, false);
             SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
             SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
@@ -26,7 +26,7 @@ namespace osu.Game.Configuration
     {
         LoginOverlayDisplayed,
         MutedAudioNotificationShownOnce,
-        BatteryLowNotificationShownOnce,
+        LowBatteryNotificationShownOnce,
 
         /// <summary>
         /// Info about seasonal backgrounds available fetched from API - see <see cref="APISeasonalBackgrounds"/>.
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 809e5d3c1b..277455b7d3 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -694,6 +694,11 @@ namespace osu.Game
             loadComponentSingleFile(new AccountCreationOverlay(), topMostOverlayContent.Add, true);
             loadComponentSingleFile(new DialogOverlay(), topMostOverlayContent.Add, true);
 
+            if (CreatePowerStatus() != null)
+            {
+                dependencies.CacheAs(CreatePowerStatus());
+            }
+
             chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible;
 
             Add(externalLinkOpener = new ExternalLinkOpener());
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index a907afd8af..1b10de614a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -96,7 +96,7 @@ namespace osu.Game
 
         protected Storage Storage { get; set; }
 
-        protected PowerStatus PowerStatus;
+        protected virtual PowerStatus CreatePowerStatus() => null;
 
         [Cached]
         [Cached(typeof(IBindable<RulesetInfo>))]
@@ -332,8 +332,6 @@ namespace osu.Game
             dependencies.CacheAs(MusicController);
 
             Ruleset.BindValueChanged(onRulesetChanged);
-
-            dependencies.CacheAs(PowerStatus);
         }
 
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> r)
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index e1ab0b8ef5..d342bf8273 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private AudioManager audioManager { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private PowerStatus powerStatus { get; set; }
 
         public PlayerLoader(Func<Player> createPlayer)
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.Play
         private void load(SessionStatics sessionStatics)
         {
             muteWarningShownOnce = sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce);
-            batteryWarningShownOnce = sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce);
+            batteryWarningShownOnce = sessionStatics.GetBindable<bool>(Static.LowBatteryNotificationShownOnce);
 
             InternalChild = (content = new LogoTrackingContainer
             {
@@ -483,10 +483,11 @@ namespace osu.Game.Screens.Play
 
         private void showBatteryWarningIfNeeded()
         {
+            if (powerStatus == null) return;
+
             if (!batteryWarningShownOnce.Value)
             {
-                // Checks if the notification has not been shown yet, device is unplugged and if device battery is at or below the cutoff
-                if (!powerStatus.IsCharging && powerStatus.ChargeLevel <= powerStatus.BatteryCutoff)
+                if (powerStatus.IsLowBattery)
                 {
                     notificationOverlay?.Post(new BatteryWarningNotification());
                     batteryWarningShownOnce.Value = true;
@@ -500,7 +501,7 @@ namespace osu.Game.Screens.Play
 
             public BatteryWarningNotification()
             {
-                Text = "Your battery level is low! Charge your device to prevent interruptions.";
+                Text = "Your battery level is low! Charge your device to prevent interruptions during gameplay.";
             }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Game/Tests/OsuTestBrowser.cs b/osu.Game/Tests/OsuTestBrowser.cs
index d4fa2a11d3..71b0b02fa6 100644
--- a/osu.Game/Tests/OsuTestBrowser.cs
+++ b/osu.Game/Tests/OsuTestBrowser.cs
@@ -7,17 +7,11 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Screens.Backgrounds;
-using osu.Game.Utils;
 
 namespace osu.Game.Tests
 {
     public class OsuTestBrowser : OsuGameBase
     {
-        public OsuTestBrowser()
-        {
-            PowerStatus = new DefaultPowerStatus();
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/PowerStatus.cs
index 1caed5b6fa..77d531710e 100644
--- a/osu.Game/Utils/PowerStatus.cs
+++ b/osu.Game/Utils/PowerStatus.cs
@@ -3,21 +3,27 @@
 
 namespace osu.Game.Utils
 {
+    /// <summary>
+    /// Provides access to the system's power status.
+    /// Currently implemented on iOS and Android only.
+    /// </summary>
     public abstract class PowerStatus
     {
         /// <summary>
-        /// The maximum battery level before a warning notification
-        /// is sent.
+        /// The maximum battery level considered as low, from 0 to 1.
         /// </summary>
-        public virtual double BatteryCutoff { get; } = 0.2;
+        public virtual double BatteryCutoff { get; } = 0;
 
-        public virtual double ChargeLevel { get; set; }
-        public virtual bool IsCharging { get; set; }
-    }
+        /// <summary>
+        /// The charge level of the battery, from 0 to 1.
+        /// </summary>
+        public virtual double ChargeLevel { get; } = 0;
 
-    public class DefaultPowerStatus : PowerStatus
-    {
-        public override double ChargeLevel { get; set; } = 1;
-        public override bool IsCharging { get; set; } = true;
+        public virtual bool IsCharging { get; } = false;
+
+        /// <summary>
+        /// Returns true if <see cref="IsCharging"/> = false and <see cref="ChargeLevel"/> &lt;= <see cref="BatteryCutoff"/>.
+        /// </summary>
+        public bool IsLowBattery => !IsCharging && ChargeLevel <= BatteryCutoff;
     }
 }
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index d417fa8f8d..b53b594eae 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -12,20 +12,16 @@ namespace osu.iOS
 {
     public class OsuGameIOS : OsuGame
     {
-        public OsuGameIOS()
-            : base(null)
-        {
-            PowerStatus = new IOSPowerStatus();
-        }
         public override Version AssemblyVersion => new Version(NSBundle.MainBundle.InfoDictionary["CFBundleVersion"].ToString());
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
 
-        public class IOSPowerStatus : PowerStatus
+        protected override PowerStatus CreatePowerStatus() => new IOSPowerStatus();
+
+        private class IOSPowerStatus : PowerStatus
         {
-            // The low battery alert appears at 20% on iOS
-            // https://github.com/ppy/osu/issues/12239
             public override double BatteryCutoff => 0.25;
+
             public override double ChargeLevel => Battery.ChargeLevel;
 
             public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;

From 43174b708c007e7bf8156fd3f6a01a6f8313a024 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 12:58:40 +0200
Subject: [PATCH 08957/10326] Remove visibility settings

Can look into this later, not really important for a first iteration.
---
 osu.Game/Screens/Edit/Verify/IssueSettings.cs |  1 -
 .../Screens/Edit/Verify/VisibilitySettings.cs | 52 -------------------
 2 files changed, 53 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Verify/VisibilitySettings.cs

diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 608be877de..4519231cd2 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -41,7 +41,6 @@ namespace osu.Game.Screens.Edit.Verify
 
         private IReadOnlyList<Drawable> createSections() => new Drawable[]
         {
-            new VisibilitySettings()
         };
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySettings.cs b/osu.Game/Screens/Edit/Verify/VisibilitySettings.cs
deleted file mode 100644
index 6488c616e4..0000000000
--- a/osu.Game/Screens/Edit/Verify/VisibilitySettings.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 osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.UserInterfaceV2;
-using osuTK;
-
-namespace osu.Game.Screens.Edit.Verify
-{
-    internal class VisibilitySettings : CompositeDrawable
-    {
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            Padding = new MarginPadding(10);
-
-            InternalChildren = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Spacing = new Vector2(10),
-                    Direction = FillDirection.Vertical,
-                    Children = new Drawable[]
-                    {
-                        new LabelledSwitchButton
-                        {
-                            Label = "Show problems",
-                            Current = new Bindable<bool>(true)
-                        },
-                        new LabelledSwitchButton
-                        {
-                            Label = "Show warnings",
-                            Current = new Bindable<bool>(true)
-                        },
-                        new LabelledSwitchButton
-                        {
-                            Label = "Show negligibles"
-                        }
-                    }
-                },
-            };
-        }
-    }
-}

From d1007ff26aa9b2f9827e666125d0161dba6fd35f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:02:22 +0200
Subject: [PATCH 08958/10326] Move components to more appropriate spot

---
 osu.Game.Rulesets.Osu/Edit/OsuChecker.cs      |  2 +-
 osu.Game/Rulesets/Edit/Checker.cs             |  4 +--
 .../Edit/Checks}/Components/BeatmapCheck.cs   |  2 +-
 .../Edit/Checks}/Components/Check.cs          |  2 +-
 .../Edit/Checks}/Components/CheckMetadata.cs  |  2 +-
 .../Edit/Checks}/Components/Issue.cs          | 25 +++++++++++--------
 .../Edit/Checks}/Components/IssueTemplate.cs  |  2 +-
 osu.Game/Screens/Edit/Verify/IssueTable.cs    |  2 +-
 8 files changed, 22 insertions(+), 19 deletions(-)
 rename osu.Game/{Screens/Edit/Verify => Rulesets/Edit/Checks}/Components/BeatmapCheck.cs (92%)
 rename osu.Game/{Screens/Edit/Verify => Rulesets/Edit/Checks}/Components/Check.cs (96%)
 rename osu.Game/{Screens/Edit/Verify => Rulesets/Edit/Checks}/Components/CheckMetadata.cs (97%)
 rename osu.Game/{Screens/Edit/Verify => Rulesets/Edit/Checks}/Components/Issue.cs (79%)
 rename osu.Game/{Screens/Edit/Verify => Rulesets/Edit/Checks}/Components/IssueTemplate.cs (98%)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
index 9918b53c85..df3847f2fe 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
@@ -5,8 +5,8 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Osu.Edit.Checks;
-using osu.Game.Screens.Edit.Verify.Components;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/Checker.cs
index 1c267c3435..9bebfc0668 100644
--- a/osu.Game/Rulesets/Edit/Checker.cs
+++ b/osu.Game/Rulesets/Edit/Checker.cs
@@ -4,8 +4,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Checks;
-using osu.Game.Screens.Edit.Verify.Components;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit
 {
diff --git a/osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs
similarity index 92%
rename from osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs
index 7297dab60d..d0f93b5eef 100644
--- a/osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using osu.Game.Beatmaps;
 
-namespace osu.Game.Screens.Edit.Verify.Components
+namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public abstract class BeatmapCheck : Check<IBeatmap>
     {
diff --git a/osu.Game/Screens/Edit/Verify/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
similarity index 96%
rename from osu.Game/Screens/Edit/Verify/Components/Check.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 2ae21fd350..228c11f0f3 100644
--- a/osu.Game/Screens/Edit/Verify/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace osu.Game.Screens.Edit.Verify.Components
+namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public abstract class Check
     {
diff --git a/osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
similarity index 97%
rename from osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
index 1cac99d47d..5a226729ad 100644
--- a/osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.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.
 
-namespace osu.Game.Screens.Edit.Verify
+namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public class CheckMetadata
     {
diff --git a/osu.Game/Screens/Edit/Verify/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
similarity index 79%
rename from osu.Game/Screens/Edit/Verify/Components/Issue.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index fe81cb9335..0f835202e7 100644
--- a/osu.Game/Screens/Edit/Verify/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using osu.Game.Extensions;
 using osu.Game.Rulesets.Objects;
 
-namespace osu.Game.Screens.Edit.Verify.Components
+namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public class Issue
     {
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Edit.Verify.Components
         public Issue(IssueTemplate template, params object[] args)
         {
             Time = null;
-            HitObjects = System.Array.Empty<HitObject>();
+            HitObjects = Array.Empty<HitObject>();
             Template = template;
             Arguments = args;
 
@@ -57,11 +57,20 @@ namespace osu.Game.Screens.Edit.Verify.Components
             Time = time;
         }
 
+        public Issue(HitObject hitObject, IssueTemplate template, params object[] args)
+            : this(template, args)
+        {
+            Time = hitObject.StartTime;
+            HitObjects = new[] { hitObject };
+        }
+
         public Issue(IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
             : this(template, args)
         {
-            Time = hitObjects.FirstOrDefault()?.StartTime;
-            HitObjects = hitObjects.ToArray();
+            var hitObjectList = hitObjects.ToList();
+
+            Time = hitObjectList.FirstOrDefault()?.StartTime;
+            HitObjects = hitObjectList;
         }
 
         public override string ToString()
@@ -71,13 +80,7 @@ namespace osu.Game.Screens.Edit.Verify.Components
 
         public string GetEditorTimestamp()
         {
-            // TODO: Editor timestamp formatting is handled in https://github.com/ppy/osu/pull/12030
-            // We may be able to use that here too (if we decouple it from the HitObjectComposer class).
-
-            if (Time == null)
-                return string.Empty;
-
-            return Time.Value.ToEditorFormattedString();
+            return Time == null ? string.Empty : Time.Value.ToEditorFormattedString();
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
similarity index 98%
rename from osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index b178fa7122..7eaabdc59b 100644
--- a/osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -5,7 +5,7 @@ using Humanizer;
 using osu.Framework.Graphics;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Verify.Components
+namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public class IssueTemplate
     {
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index c70695a849..20dceb5333 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -13,7 +13,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
-using osu.Game.Screens.Edit.Verify.Components;
+using osu.Game.Rulesets.Edit.Checks.Components;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify

From b30e41b805ffb7196851c42fc7c8b36c2828df0d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:02:36 +0200
Subject: [PATCH 08959/10326] Fix comment; mode -> ruleset

---
 osu.Game/Rulesets/Edit/Checker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/Checker.cs
index 9bebfc0668..6687160b10 100644
--- a/osu.Game/Rulesets/Edit/Checker.cs
+++ b/osu.Game/Rulesets/Edit/Checker.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Edit
 {
     public abstract class Checker
     {
-        // These are all mode-invariant, hence here instead of in e.g. `OsuChecker`.
+        // These are all ruleset-invariant, hence here instead of in e.g. `OsuChecker`.
         private readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
         {
             new CheckMetadataVowels()

From bc4f3351f38bdf5d7e5812db554ceceeaa6ec2cc Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:03:16 +0200
Subject: [PATCH 08960/10326] Replace checks with realistic ones

---
 .../Edit/Checks/CheckConsecutiveCircles.cs    |  86 --------------
 .../Edit/Checks/CheckOffscreenObjects.cs      | 110 ++++++++++++++++++
 osu.Game.Rulesets.Osu/Edit/OsuChecker.cs      |   2 +-
 osu.Game/Checks/CheckMetadataVowels.cs        |  65 -----------
 osu.Game/Rulesets/Edit/Checker.cs             |   2 +-
 .../Rulesets/Edit/Checks/CheckBackground.cs   |  57 +++++++++
 6 files changed, 169 insertions(+), 153 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs
 create mode 100644 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
 delete mode 100644 osu.Game/Checks/CheckMetadataVowels.cs
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs
deleted file mode 100644
index c41c0dac2b..0000000000
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs
+++ /dev/null
@@ -1,86 +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.Game.Beatmaps;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Screens.Edit.Verify;
-using osu.Game.Screens.Edit.Verify.Components;
-
-namespace osu.Game.Rulesets.Osu.Edit.Checks
-{
-    public class CheckConsecutiveCircles : BeatmapCheck
-    {
-        private const double consecutive_threshold = 3;
-        private const double delta_time_min_expected = 300;
-        private const double delta_time_min_threshold = 100;
-
-        public override CheckMetadata Metadata() => new CheckMetadata
-        (
-            category: CheckMetadata.CheckCategory.Spread,
-            description: "Too many or fast consecutive circles."
-        );
-
-        private IssueTemplate templateManyInARow = new IssueTemplate
-        (
-            type: IssueTemplate.IssueType.Problem,
-            unformattedMessage: "There are {0} circles in a row here, expected at most {1}."
-        );
-
-        private IssueTemplate templateTooFast = new IssueTemplate
-        (
-            type: IssueTemplate.IssueType.Warning,
-            unformattedMessage: "These circles are too fast ({0:0} ms), expected at least {1:0} ms."
-        );
-
-        private IssueTemplate templateAlmostTooFast = new IssueTemplate
-        (
-            type: IssueTemplate.IssueType.Negligible,
-            unformattedMessage: "These circles are almost too fast ({0:0} ms), expected at least {1:0} ms."
-        );
-
-        public override IEnumerable<IssueTemplate> Templates() => new[]
-        {
-            templateManyInARow,
-            templateTooFast,
-            templateAlmostTooFast
-        };
-
-        public override IEnumerable<Issue> Run(IBeatmap beatmap)
-        {
-            List<HitCircle> prevCircles = new List<HitCircle>();
-
-            foreach (HitObject hitobject in beatmap.HitObjects)
-            {
-                if (!(hitobject is HitCircle circle) || hitobject == beatmap.HitObjects.Last())
-                {
-                    if (prevCircles.Count > consecutive_threshold)
-                    {
-                        yield return new Issue(
-                            prevCircles,
-                            templateManyInARow,
-                            prevCircles.Count, consecutive_threshold
-                        );
-                    }
-
-                    prevCircles.Clear();
-                    continue;
-                }
-
-                double? prevDeltaTime = circle.StartTime - prevCircles.LastOrDefault()?.StartTime;
-                prevCircles.Add(circle);
-
-                if (prevDeltaTime == null || prevDeltaTime >= delta_time_min_expected)
-                    continue;
-
-                yield return new Issue(
-                    prevCircles.TakeLast(2),
-                    prevDeltaTime < delta_time_min_threshold ? templateTooFast : templateAlmostTooFast,
-                    prevDeltaTime, delta_time_min_expected
-                );
-            }
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
new file mode 100644
index 0000000000..c47864855b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -0,0 +1,110 @@
+// Copyright (c) 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.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit.Checks
+{
+    public class CheckOffscreenObjects : BeatmapCheck
+    {
+        // These are close approximates to the edges of the screen
+        // in gameplay on a 4:3 aspect ratio for osu!stable.
+        private const int min_x = -67;
+        private const int min_y = -60;
+        private const int max_x = 579;
+        private const int max_y = 428;
+
+        // The amount of milliseconds to step through a slider path at a time
+        // (higher = more performant, but higher false-negative chance).
+        private const int path_step_size = 5;
+
+        public override CheckMetadata Metadata() => new CheckMetadata
+        (
+            category: CheckMetadata.CheckCategory.Compose,
+            description: "Offscreen hitobjects."
+        );
+
+        public override IEnumerable<IssueTemplate> Templates() => new[]
+        {
+            templateOffscreen,
+            templateOffscreenSliderPath
+        };
+
+        private readonly IssueTemplate templateOffscreen = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Problem,
+            unformattedMessage: "This object goes offscreen on a 4:3 aspect ratio."
+        );
+
+        private readonly IssueTemplate templateOffscreenSliderPath = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Problem,
+            unformattedMessage: "This slider goes offscreen here on a 4:3 aspect ratio."
+        );
+
+        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            foreach (var hitobject in beatmap.HitObjects)
+            {
+                switch (hitobject)
+                {
+                    case Slider slider:
+                    {
+                        foreach (var issue in sliderIssues(slider))
+                            yield return issue;
+
+                        break;
+                    }
+
+                    case HitCircle circle:
+                    {
+                        if (isOffscreen(circle.StackedPosition, circle.Radius))
+                            yield return new Issue(circle, templateOffscreen);
+
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Steps through points on the slider to ensure the entire path is on-screen.
+        /// Returns at most one issue.
+        /// </summary>
+        /// <param name="slider">The slider whose path to check.</param>
+        /// <returns></returns>
+        private IEnumerable<Issue> sliderIssues(Slider slider)
+        {
+            for (int i = 0; i < slider.Distance; i += path_step_size)
+            {
+                double progress = i / slider.Distance;
+                Vector2 position = slider.StackedPositionAt(progress);
+
+                if (!isOffscreen(position, slider.Radius))
+                    continue;
+
+                // `SpanDuration` ensures we don't include reverses.
+                double time = slider.StartTime + progress * slider.SpanDuration;
+                yield return new Issue(slider, templateOffscreenSliderPath) { Time = time };
+
+                yield break;
+            }
+
+            // Above loop may skip the last position in the slider due to step size.
+            if (!isOffscreen(slider.StackedEndPosition, slider.Radius))
+                yield break;
+
+            yield return new Issue(slider, templateOffscreenSliderPath) { Time = slider.EndTime };
+        }
+
+        private bool isOffscreen(Vector2 position, double radius)
+        {
+            return position.X - radius < min_x || position.X + radius > max_x ||
+                   position.Y - radius < min_y || position.Y + radius > max_y;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
index df3847f2fe..ee3b230679 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Edit
     {
         public readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
         {
-            new CheckConsecutiveCircles()
+            new CheckOffscreenObjects()
         };
 
         public override IEnumerable<Issue> Run(IBeatmap beatmap)
diff --git a/osu.Game/Checks/CheckMetadataVowels.cs b/osu.Game/Checks/CheckMetadataVowels.cs
deleted file mode 100644
index 8bcfe89c3a..0000000000
--- a/osu.Game/Checks/CheckMetadataVowels.cs
+++ /dev/null
@@ -1,65 +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.Game.Beatmaps;
-using osu.Game.Screens.Edit.Verify;
-using osu.Game.Screens.Edit.Verify.Components;
-
-namespace osu.Game.Checks
-{
-    public class CheckMetadataVowels : BeatmapCheck
-    {
-        private static readonly char[] vowels = { 'a', 'e', 'i', 'o', 'u' };
-
-        public override CheckMetadata Metadata() => new CheckMetadata
-        (
-            category: CheckMetadata.CheckCategory.Metadata,
-            description: "Metadata fields contain vowels"
-        );
-
-        public override IEnumerable<IssueTemplate> Templates() => new[]
-        {
-            templateArtistHasVowels
-        };
-
-        private IssueTemplate templateArtistHasVowels = new IssueTemplate
-        (
-            type: IssueTemplate.IssueType.Warning,
-            unformattedMessage: "The {0} field \"{1}\" contains the vowel(s) {2}."
-        );
-
-        public override IEnumerable<Issue> Run(IBeatmap beatmap)
-        {
-            foreach (var issue in GetVowelIssues("artist", beatmap.Metadata.Artist))
-                yield return issue;
-
-            foreach (var issue in GetVowelIssues("unicode artist", beatmap.Metadata.ArtistUnicode))
-                yield return issue;
-
-            foreach (var issue in GetVowelIssues("title", beatmap.Metadata.Title))
-                yield return issue;
-
-            foreach (var issue in GetVowelIssues("unicode title", beatmap.Metadata.TitleUnicode))
-                yield return issue;
-        }
-
-        private IEnumerable<Issue> GetVowelIssues(string fieldName, string fieldValue)
-        {
-            if (fieldValue == null)
-                // Unicode fields can be null if same as respective romanized fields.
-                yield break;
-
-            List<char> matches = vowels.Where(c => fieldValue.ToLower().Contains(c)).ToList();
-
-            if (!matches.Any())
-                yield break;
-
-            yield return new Issue(
-                templateArtistHasVowels,
-                fieldName, fieldValue, string.Join(", ", matches)
-            );
-        }
-    }
-}
diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/Checker.cs
index 6687160b10..65d7fc5913 100644
--- a/osu.Game/Rulesets/Edit/Checker.cs
+++ b/osu.Game/Rulesets/Edit/Checker.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Edit
         // These are all ruleset-invariant, hence here instead of in e.g. `OsuChecker`.
         private readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
         {
-            new CheckMetadataVowels()
+            new CheckBackground()
         };
 
         public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
new file mode 100644
index 0000000000..9376f9568a
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.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.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckBackground : BeatmapCheck
+    {
+        public override CheckMetadata Metadata() => new CheckMetadata
+        (
+            category: CheckMetadata.CheckCategory.Resources,
+            description: "Missing background."
+        );
+
+        public override IEnumerable<IssueTemplate> Templates() => new[]
+        {
+            templateNoneSet,
+            templateDoesNotExist
+        };
+
+        private readonly IssueTemplate templateNoneSet = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Problem,
+            unformattedMessage: "No background has been set."
+        );
+
+        private readonly IssueTemplate templateDoesNotExist = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Problem,
+            unformattedMessage: "The background file \"{0}\" is does not exist."
+        );
+
+        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            if (beatmap.Metadata.BackgroundFile == null)
+            {
+                yield return new Issue(templateNoneSet);
+
+                yield break;
+            }
+
+            // If the background is set, also make sure it still exists.
+
+            var set = beatmap.BeatmapInfo.BeatmapSet;
+            var file = set.Files.FirstOrDefault(f => f.Filename == beatmap.Metadata.BackgroundFile);
+
+            if (file != null)
+                yield break;
+
+            yield return new Issue(templateDoesNotExist, beatmap.Metadata.BackgroundFile);
+        }
+    }
+}

From 6d3cf78e4a4e50bd40c2b5f667d7e805e5bb93e5 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:04:39 +0200
Subject: [PATCH 08961/10326] Add issue selection

This mainly helps with keeping track of which issue was clicked, since doing so switches tab.
---
 osu.Game/Screens/Edit/Verify/IssueTable.cs   | 42 ++++++++++++++++++--
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs |  7 ++++
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 20dceb5333..458b0184b6 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.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;
@@ -26,6 +27,9 @@ namespace osu.Game.Screens.Edit.Verify
 
         private readonly FillFlowContainer backgroundFlow;
 
+        [Resolved]
+        private Bindable<Issue> selectedIssue { get; set; }
+
         public IssueTable()
         {
             RelativeSizeAxes = Axes.X;
@@ -115,6 +119,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         public class RowBackground : OsuClickableContainer
         {
+            private readonly Issue issue;
             private const int fade_duration = 100;
 
             private readonly Box hoveredBackground;
@@ -128,13 +133,16 @@ namespace osu.Game.Screens.Edit.Verify
             [Resolved]
             private EditorBeatmap editorBeatmap { get; set; }
 
+            [Resolved]
+            private Bindable<Issue> selectedIssue { get; set; }
+
             public RowBackground(Issue issue)
             {
+                this.issue = issue;
+
                 RelativeSizeAxes = Axes.X;
                 Height = row_height;
-
                 AlwaysPresent = true;
-
                 CornerRadius = 3;
                 Masking = true;
 
@@ -152,6 +160,8 @@ namespace osu.Game.Screens.Edit.Verify
                     // Supposed to work like clicking timestamps outside of the game.
                     // TODO: Is there already defined behaviour for this I may be able to call?
 
+                    selectedIssue.Value = issue;
+
                     if (issue.Time != null)
                     {
                         clock.Seek(issue.Time.Value);
@@ -167,11 +177,35 @@ namespace osu.Game.Screens.Edit.Verify
             }
 
             private Color4 colourHover;
+            private Color4 colourSelected;
 
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
                 hoveredBackground.Colour = colourHover = colours.BlueDarker;
+                colourSelected = colours.YellowDarker;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                selectedIssue.BindValueChanged(change => { Selected = issue == change.NewValue; }, true);
+            }
+
+            private bool selected;
+
+            protected bool Selected
+            {
+                get => selected;
+                set
+                {
+                    if (value == selected)
+                        return;
+
+                    selected = value;
+                    updateState();
+                }
             }
 
             protected override bool OnHover(HoverEvent e)
@@ -188,9 +222,9 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void updateState()
             {
-                hoveredBackground.FadeColour(colourHover, 450, Easing.OutQuint);
+                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
 
-                if (IsHovered)
+                if (selected || IsHovered)
                     hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
                 else
                     hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 88397fdbff..ea9f986eb6 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks.Components;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Verify
@@ -22,6 +23,9 @@ namespace osu.Game.Screens.Edit.Verify
         private Ruleset ruleset;
         private static Checker checker; // TODO: Should not be static, but apparently needs to be?
 
+        [Cached]
+        private Bindable<Issue> selectedIssue = new Bindable<Issue>();
+
         public VerifyScreen()
             : base(EditorScreenMode.Verify)
         {
@@ -74,6 +78,9 @@ namespace osu.Game.Screens.Edit.Verify
             [Resolved]
             protected EditorBeatmap Beatmap { get; private set; }
 
+            [Resolved]
+            private Bindable<Issue> selectedIssue { get; set; }
+
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {

From c995eca029f5f126e734507018b62fb3ea717bb5 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:05:24 +0200
Subject: [PATCH 08962/10326] Remove todo

Doesn't really matter in the end, as only one checker will run at a time in this case.
---
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index ea9f986eb6..b9fd93ac19 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit.Verify
     public class VerifyScreen : EditorScreen
     {
         private Ruleset ruleset;
-        private static Checker checker; // TODO: Should not be static, but apparently needs to be?
+        private static Checker checker;
 
         [Cached]
         private Bindable<Issue> selectedIssue = new Bindable<Issue>();

From 3a4f2e3d7e393d29d1f0f4ad8dcbf989f4f19073 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:09:16 +0200
Subject: [PATCH 08963/10326] Show table even if no issues

---
 osu.Game/Screens/Edit/Verify/IssueTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 458b0184b6..e4612927fd 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Edit.Verify
                 Content = null;
                 backgroundFlow.Clear();
 
-                if (value?.Any() != true)
+                if (value == null)
                     return;
 
                 foreach (var issue in value)

From 747e0f00dc63e060feb246f69a5ffe6c33249604 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:10:05 +0200
Subject: [PATCH 08964/10326] Improve table formatting

---
 osu.Game/Screens/Edit/Verify/IssueTable.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index e4612927fd..40bd134551 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -74,9 +74,9 @@ namespace osu.Game.Screens.Edit.Verify
         {
             var columns = new List<TableColumn>
             {
-                new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn("Type", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn("Time", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn("Type", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)),
+                new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)),
                 new TableColumn("Message", Anchor.CentreLeft),
                 new TableColumn("Category", Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize)),
             };
@@ -89,20 +89,21 @@ namespace osu.Game.Screens.Edit.Verify
             new OsuSpriteText
             {
                 Text = $"#{index + 1}",
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium)
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium),
+                Margin = new MarginPadding { Right = 10 }
             },
             new OsuSpriteText
             {
                 Text = issue.Template.Type.ToString(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
-                Margin = new MarginPadding { Left = 10 },
+                Margin = new MarginPadding { Right = 10 },
                 Colour = issue.Template.TypeColour()
             },
             new OsuSpriteText
             {
                 Text = issue.GetEditorTimestamp(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
-                Margin = new MarginPadding(10)
+                Margin = new MarginPadding { Right = 10 },
             },
             new OsuSpriteText
             {

From 3289bb03791a11f0181d86a4c21ce13d1e214c2b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 14:56:30 +0200
Subject: [PATCH 08965/10326] Merge `Check` and `BeatmapCheck`

We're probably not going to need GeneralChecks or BeatmapsetChecks.

The verify tab is only available to a single difficulty at a time, and we already have access to the rest of the set through `IBeatmap`.
---
 .../Edit/Checks/CheckOffscreenObjects.cs      |  2 +-
 osu.Game.Rulesets.Osu/Edit/OsuChecker.cs      |  2 +-
 osu.Game/Rulesets/Edit/Checker.cs             |  4 ++--
 .../Rulesets/Edit/Checks/CheckBackground.cs   |  2 +-
 .../Edit/Checks/Components/BeatmapCheck.cs    | 19 ------------------
 .../Rulesets/Edit/Checks/Components/Check.cs  | 20 +++++++++----------
 6 files changed, 14 insertions(+), 35 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index c47864855b..3d411d6e12 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -9,7 +9,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Checks
 {
-    public class CheckOffscreenObjects : BeatmapCheck
+    public class CheckOffscreenObjects : Check
     {
         // These are close approximates to the edges of the screen
         // in gameplay on a 4:3 aspect ratio for osu!stable.
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
index ee3b230679..d0dbc043d4 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuChecker : Checker
     {
-        public readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
+        public readonly List<Check> beatmapChecks = new List<Check>
         {
             new CheckOffscreenObjects()
         };
diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/Checker.cs
index 65d7fc5913..6ab6ed75e8 100644
--- a/osu.Game/Rulesets/Edit/Checker.cs
+++ b/osu.Game/Rulesets/Edit/Checker.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Rulesets.Edit
     public abstract class Checker
     {
         // These are all ruleset-invariant, hence here instead of in e.g. `OsuChecker`.
-        private readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
+        private readonly IReadOnlyList<Check> checks = new List<Check>
         {
             new CheckBackground()
         };
 
         public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
         {
-            return beatmapChecks.SelectMany(check => check.Run(beatmap));
+            return checks.SelectMany(check => check.Run(beatmap));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 9376f9568a..aa10fad77b 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit.Checks
 {
-    public class CheckBackground : BeatmapCheck
+    public class CheckBackground : Check
     {
         public override CheckMetadata Metadata() => new CheckMetadata
         (
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs
deleted file mode 100644
index d0f93b5eef..0000000000
--- a/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs
+++ /dev/null
@@ -1,19 +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.Beatmaps;
-
-namespace osu.Game.Rulesets.Edit.Checks.Components
-{
-    public abstract class BeatmapCheck : Check<IBeatmap>
-    {
-        /// <summary>
-        /// Returns zero, one, or several issues detected by this
-        /// check on the given beatmap.
-        /// </summary>
-        /// <param name="beatmap">The beatmap to run the check on.</param>
-        /// <returns></returns>
-        public abstract override IEnumerable<Issue> Run(IBeatmap beatmap);
-    }
-}
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 228c11f0f3..4e444cacbf 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Edit.Checks.Components
 {
@@ -21,21 +22,18 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <returns></returns>
         public abstract IEnumerable<IssueTemplate> Templates();
 
+        /// <summary>
+        /// Returns zero, one, or several issues detected by this
+        /// check on the given beatmap.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to run the check on.</param>
+        /// <returns></returns>
+        public abstract IEnumerable<Issue> Run(IBeatmap beatmap);
+
         protected Check()
         {
             foreach (var template in Templates())
                 template.Origin = this;
         }
     }
-
-    public abstract class Check<T> : Check
-    {
-        /// <summary>
-        /// Returns zero, one, or several issues detected by
-        /// this check on the given object.
-        /// </summary>
-        /// <param name="obj">The object to run the check on.</param>
-        /// <returns></returns>
-        public abstract IEnumerable<Issue> Run(T obj);
-    }
 }

From 7d40b017223a008e17cf53cf0b05006e8dfe288f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 15:18:15 +0200
Subject: [PATCH 08966/10326] Remove old todo

---
 osu.Game/Screens/Edit/Verify/IssueTable.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 40bd134551..5f04c7c4e8 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -158,9 +158,6 @@ namespace osu.Game.Screens.Edit.Verify
 
                 Action = () =>
                 {
-                    // Supposed to work like clicking timestamps outside of the game.
-                    // TODO: Is there already defined behaviour for this I may be able to call?
-
                     selectedIssue.Value = issue;
 
                     if (issue.Time != null)

From dac733cced62e30089f52fa6147f5210197b3e20 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 15:49:57 +0200
Subject: [PATCH 08967/10326] Fix field name and accessibility

---
 osu.Game.Rulesets.Osu/Edit/OsuChecker.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
index d0dbc043d4..10f0ecf0cf 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuChecker : Checker
     {
-        public readonly List<Check> beatmapChecks = new List<Check>
+        private readonly List<Check> checks = new List<Check>
         {
             new CheckOffscreenObjects()
         };
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             foreach (var issue in base.Run(beatmap))
                 yield return issue;
 
-            foreach (var issue in beatmapChecks.SelectMany(check => check.Run(beatmap)))
+            foreach (var issue in checks.SelectMany(check => check.Run(beatmap)))
                 yield return issue;
         }
     }

From a42714540b6c24385042725540bd6b85a53ebdda Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 10 Apr 2021 23:04:15 -0700
Subject: [PATCH 08968/10326] Add follow delay setting to osu! flashlight mod

---
 .../Mods/OsuModFlashlight.cs                  | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index 20c0818d03..683b35f282 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -9,10 +9,12 @@ using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 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 osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
@@ -23,6 +25,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private const float default_flashlight_size = 180;
 
+        private const double default_follow_delay = 120;
+
         private OsuFlashlight flashlight;
 
         public override Flashlight CreateFlashlight() => flashlight = new OsuFlashlight();
@@ -35,8 +39,25 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
         }
 
+        public override void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
+        {
+            base.ApplyToDrawableRuleset(drawableRuleset);
+
+            flashlight.FollowDelay = FollowDelay.Value;
+        }
+
+        [SettingSource("Follow delay", "Milliseconds until the flashlight reaches the cursor")]
+        public BindableNumber<double> FollowDelay { get; } = new BindableDouble(default_follow_delay)
+        {
+            MinValue = default_follow_delay,
+            MaxValue = default_follow_delay * 10,
+            Precision = default_follow_delay,
+        };
+
         private class OsuFlashlight : Flashlight, IRequireHighFrequencyMousePosition
         {
+            public double FollowDelay { private get; set; }
+
             public OsuFlashlight()
             {
                 FlashlightSize = new Vector2(0, getSizeFor(0));
@@ -50,13 +71,11 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             protected override bool OnMouseMove(MouseMoveEvent e)
             {
-                const double follow_delay = 120;
-
                 var position = FlashlightPosition;
                 var destination = e.MousePosition;
 
                 FlashlightPosition = Interpolation.ValueAt(
-                    Math.Min(Math.Abs(Clock.ElapsedFrameTime), follow_delay), position, destination, 0, follow_delay, Easing.Out);
+                    Math.Min(Math.Abs(Clock.ElapsedFrameTime), FollowDelay), position, destination, 0, FollowDelay, Easing.Out);
 
                 return base.OnMouseMove(e);
             }

From 2b947a44da2d320669f61d13d6c1ee8c7c660001 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 11 Apr 2021 09:00:37 +0300
Subject: [PATCH 08969/10326] Cache power status at base instead

---
 osu.Game/OsuGame.cs     | 5 -----
 osu.Game/OsuGameBase.cs | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 277455b7d3..809e5d3c1b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -694,11 +694,6 @@ namespace osu.Game
             loadComponentSingleFile(new AccountCreationOverlay(), topMostOverlayContent.Add, true);
             loadComponentSingleFile(new DialogOverlay(), topMostOverlayContent.Add, true);
 
-            if (CreatePowerStatus() != null)
-            {
-                dependencies.CacheAs(CreatePowerStatus());
-            }
-
             chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible;
 
             Add(externalLinkOpener = new ExternalLinkOpener());
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 41d790ea4a..fec8272076 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -284,6 +284,11 @@ namespace osu.Game
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
             dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore));
+
+            var powerStatus = CreatePowerStatus();
+            if (powerStatus != null)
+                dependencies.CacheAs(powerStatus);
+
             dependencies.Cache(new SessionStatics());
             dependencies.Cache(new OsuColour());
 

From 3d85dc11c62aedccda43b373326463c9d5be5162 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 11 Apr 2021 09:02:32 +0300
Subject: [PATCH 08970/10326] Adjust documentation

---
 osu.Game/Utils/PowerStatus.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/PowerStatus.cs
index 77d531710e..a53f50b620 100644
--- a/osu.Game/Utils/PowerStatus.cs
+++ b/osu.Game/Utils/PowerStatus.cs
@@ -22,7 +22,8 @@ namespace osu.Game.Utils
         public virtual bool IsCharging { get; } = false;
 
         /// <summary>
-        /// Returns true if <see cref="IsCharging"/> = false and <see cref="ChargeLevel"/> &lt;= <see cref="BatteryCutoff"/>.
+        /// Whether the battery is currently low in charge.
+        /// Returns true if not charging and current charge level is lower than or equal to <see cref="BatteryCutoff"/>.
         /// </summary>
         public bool IsLowBattery => !IsCharging && ChargeLevel <= BatteryCutoff;
     }

From 07ee1b4d0b73edebaaffc632acd13dc993f0871c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 11 Apr 2021 09:11:28 +0300
Subject: [PATCH 08971/10326] Make power status properties abstract

---
 osu.Game/Utils/PowerStatus.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/PowerStatus.cs
index a53f50b620..46f7e32b9e 100644
--- a/osu.Game/Utils/PowerStatus.cs
+++ b/osu.Game/Utils/PowerStatus.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Utils
         /// <summary>
         /// The maximum battery level considered as low, from 0 to 1.
         /// </summary>
-        public virtual double BatteryCutoff { get; } = 0;
+        public abstract double BatteryCutoff { get; }
 
         /// <summary>
         /// The charge level of the battery, from 0 to 1.
         /// </summary>
-        public virtual double ChargeLevel { get; } = 0;
+        public abstract double ChargeLevel { get; }
 
-        public virtual bool IsCharging { get; } = false;
+        public abstract bool IsCharging { get; }
 
         /// <summary>
         /// Whether the battery is currently low in charge.

From cb947a3b2710d1c22a55a1ac91262c83bc68591c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 11 Apr 2021 10:02:51 +0300
Subject: [PATCH 08972/10326] Add expected output in test case rather than
 determining internally

---
 .../Visual/Gameplay/TestScenePlayerLoader.cs          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 36958b0741..657c1dd47e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -292,10 +292,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
-        [TestCase(false, 1.0)] // not charging, above cutoff --> no warning
-        [TestCase(false, 0.2)] // not charging, at cutoff --> warning
-        [TestCase(true, 0.1)] // charging, below cutoff --> no warning
-        public void TestLowBatteryNotification(bool isCharging, double chargeLevel)
+        [TestCase(false, 1.0, false)] // not charging, above cutoff --> no warning
+        [TestCase(true, 0.1, false)] // charging, below cutoff --> no warning
+        [TestCase(false, 0.2, true)] // not charging, at cutoff --> warning
+        public void TestLowBatteryNotification(bool isCharging, double chargeLevel, bool shouldWarn)
         {
             AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.LowBatteryNotificationShownOnce).Value = false);
 
@@ -306,8 +306,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 powerStatus.SetChargeLevel(chargeLevel);
             }));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
-            int warning = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
-            AddAssert($"notification {(warning == 1 ? "triggered" : "not triggered")}", () => notificationOverlay.UnreadCount.Value == warning);
+            AddAssert($"notification {(shouldWarn ? "triggered" : "not triggered")}", () => notificationOverlay.UnreadCount.Value == (shouldWarn ? 1 : 0));
             AddStep("click notification", () =>
             {
                 var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();

From 419fd4470cbb818298cd5fe324d8ff528b2f3901 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 11 Apr 2021 08:57:44 +0300
Subject: [PATCH 08973/10326] Reorder method declaration

---
 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 fec8272076..96aabf0024 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -96,8 +96,6 @@ namespace osu.Game
 
         protected Storage Storage { get; set; }
 
-        protected virtual PowerStatus CreatePowerStatus() => null;
-
         [Cached]
         [Cached(typeof(IBindable<RulesetInfo>))]
         protected readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
@@ -159,6 +157,8 @@ namespace osu.Game
 
         protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
 
+        protected virtual PowerStatus CreatePowerStatus() => null;
+
         /// <summary>
         /// The maximum volume at which audio tracks should playback. This can be set lower than 1 to create some head-room for sound effects.
         /// </summary>

From b7e16c2fcc8cad36ab2f40cc59c3f254088624e9 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sun, 11 Apr 2021 15:47:38 -0400
Subject: [PATCH 08974/10326] Remove Xamarin.Essentials package from main
 project

---
 osu.Game/osu.Game.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d0a918a8f5..471eced55a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,6 +35,5 @@
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
 </Project>

From fbd5195738bdd9843434ea7462a906e928285d5a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 12 Apr 2021 03:37:03 +0300
Subject: [PATCH 08975/10326] Extract mod setting value handling to utils class

---
 .../API/ModSettingsDictionaryFormatter.cs     | 34 ++----------------
 osu.Game/Utils/ModUtils.cs                    | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index dd854acc32..81ecc74ddb 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -3,11 +3,10 @@
 
 using System.Buffers;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Text;
 using MessagePack;
 using MessagePack.Formatters;
-using osu.Framework.Bindables;
+using osu.Game.Utils;
 
 namespace osu.Game.Online.API
 {
@@ -24,36 +23,7 @@ namespace osu.Game.Online.API
                 var stringBytes = new ReadOnlySequence<byte>(Encoding.UTF8.GetBytes(kvp.Key));
                 writer.WriteString(in stringBytes);
 
-                switch (kvp.Value)
-                {
-                    case Bindable<double> d:
-                        primitiveFormatter.Serialize(ref writer, d.Value, options);
-                        break;
-
-                    case Bindable<int> i:
-                        primitiveFormatter.Serialize(ref writer, i.Value, options);
-                        break;
-
-                    case Bindable<float> f:
-                        primitiveFormatter.Serialize(ref writer, f.Value, options);
-                        break;
-
-                    case Bindable<bool> b:
-                        primitiveFormatter.Serialize(ref writer, b.Value, options);
-                        break;
-
-                    case IBindable u:
-                        // A mod with unknown (e.g. enum) generic type.
-                        var valueMethod = u.GetType().GetProperty(nameof(IBindable<int>.Value));
-                        Debug.Assert(valueMethod != null);
-                        primitiveFormatter.Serialize(ref writer, valueMethod.GetValue(u), options);
-                        break;
-
-                    default:
-                        // fall back for non-bindable cases.
-                        primitiveFormatter.Serialize(ref writer, kvp.Value, options);
-                        break;
-                }
+                primitiveFormatter.Serialize(ref writer, ModUtils.GetSettingUnderlyingValue(kvp.Value), options);
             }
         }
 
diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index c12b5a9fd4..596880f2e7 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using osu.Framework.Bindables;
+using osu.Game.Online.API;
 using osu.Game.Rulesets.Mods;
 
 #nullable enable
@@ -129,5 +132,38 @@ namespace osu.Game.Utils
             else
                 yield return mod;
         }
+
+        /// <summary>
+        /// Returns the underlying value of the given mod setting object.
+        /// Used in <see cref="APIMod"/> for serialization and equality comparison purposes.
+        /// </summary>
+        /// <param name="setting">The mod setting.</param>
+        public static object GetSettingUnderlyingValue(object setting)
+        {
+            switch (setting)
+            {
+                case Bindable<double> d:
+                    return d.Value;
+
+                case Bindable<int> i:
+                    return i.Value;
+
+                case Bindable<float> f:
+                    return f.Value;
+
+                case Bindable<bool> b:
+                    return b.Value;
+
+                case IBindable u:
+                    // A mod with unknown (e.g. enum) generic type.
+                    var valueMethod = u.GetType().GetProperty(nameof(IBindable<int>.Value));
+                    Debug.Assert(valueMethod != null);
+                    return valueMethod.GetValue(u);
+
+                default:
+                    // fall back for non-bindable cases.
+                    return setting;
+            }
+        }
     }
 }

From d6d8ea5b6b5ce956d81863136f5eff3f62bf5cd6 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 11:17:56 +0900
Subject: [PATCH 08976/10326] Throw when getting a frame of an empty replay

---
 .../Gameplay/TestSceneSpectatorPlayback.cs    | 30 +++++++++----------
 osu.Game/Input/Handlers/ReplayInputHandler.cs |  2 --
 .../Replays/FramedReplayInputHandler.cs       |  9 ++++--
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 10 +++++++
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 35b3bfc1f8..9c763814f3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -204,27 +204,27 @@ namespace osu.Game.Tests.Visual.Gameplay
                 return;
             }
 
-            if (replayHandler.NextFrame != null)
-            {
-                var lastFrame = replay.Frames.LastOrDefault();
+            if (!replayHandler.HasFrames)
+                return;
 
-                // this isn't perfect as we basically can't be aware of the rate-of-send here (the streamer is not sending data when not being moved).
-                // in gameplay playback, the case where NextFrame is null would pause gameplay and handle this correctly; it's strictly a test limitation / best effort implementation.
-                if (lastFrame != null)
-                    latency = Math.Max(latency, Time.Current - lastFrame.Time);
+            var lastFrame = replay.Frames.LastOrDefault();
 
-                latencyDisplay.Text = $"latency: {latency:N1}";
+            // this isn't perfect as we basically can't be aware of the rate-of-send here (the streamer is not sending data when not being moved).
+            // in gameplay playback, the case where NextFrame is null would pause gameplay and handle this correctly; it's strictly a test limitation / best effort implementation.
+            if (lastFrame != null)
+                latency = Math.Max(latency, Time.Current - lastFrame.Time);
 
-                double proposedTime = Time.Current - latency + Time.Elapsed;
+            latencyDisplay.Text = $"latency: {latency:N1}";
 
-                // this will either advance by one or zero frames.
-                double? time = replayHandler.SetFrameFromTime(proposedTime);
+            double proposedTime = Time.Current - latency + Time.Elapsed;
 
-                if (time == null)
-                    return;
+            // this will either advance by one or zero frames.
+            double? time = replayHandler.SetFrameFromTime(proposedTime);
 
-                manualClock.CurrentTime = time.Value;
-            }
+            if (time == null)
+                return;
+
+            manualClock.CurrentTime = time.Value;
         }
 
         [TearDownSteps]
diff --git a/osu.Game/Input/Handlers/ReplayInputHandler.cs b/osu.Game/Input/Handlers/ReplayInputHandler.cs
index fba1bee0b8..cd76000f98 100644
--- a/osu.Game/Input/Handlers/ReplayInputHandler.cs
+++ b/osu.Game/Input/Handlers/ReplayInputHandler.cs
@@ -32,8 +32,6 @@ namespace osu.Game.Input.Handlers
 
         public override bool Initialize(GameHost host) => true;
 
-        public override bool IsActive => true;
-
         public class ReplayState<T> : IInput
             where T : struct
         {
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 0b41ca31ea..5eaccc766e 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Replays
     public abstract class FramedReplayInputHandler<TFrame> : ReplayInputHandler
         where TFrame : ReplayFrame
     {
+        public override bool IsActive => HasFrames;
+
         private readonly Replay replay;
 
         protected List<ReplayFrame> Frames => replay.Frames;
@@ -25,7 +27,10 @@ namespace osu.Game.Rulesets.Replays
         {
             get
             {
-                if (!HasFrames || !currentFrameIndex.HasValue)
+                if (!HasFrames)
+                    throw new InvalidOperationException($"Cannot get {nameof(CurrentFrame)} of the empty replay");
+
+                if (!currentFrameIndex.HasValue)
                     return null;
 
                 return (TFrame)Frames[currentFrameIndex.Value];
@@ -37,7 +42,7 @@ namespace osu.Game.Rulesets.Replays
             get
             {
                 if (!HasFrames)
-                    return null;
+                    throw new InvalidOperationException($"Cannot get {nameof(NextFrame)} of the empty replay");
 
                 if (!currentFrameIndex.HasValue)
                     return currentDirection > 0 ? (TFrame)Frames[0] : null;
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index d6f002ea2c..fb56a5d93d 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -10,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Input.StateChanges;
 using osu.Framework.Input.StateChanges.Events;
 using osu.Framework.Input.States;
 using osu.Game.Configuration;
@@ -100,6 +102,14 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
+        protected override List<IInput> GetPendingInputs()
+        {
+            if (replayInputHandler != null && !replayInputHandler.IsActive)
+                return new List<IInput>();
+
+            return base.GetPendingInputs();
+        }
+
         #region Setting application (disables etc.)
 
         private Bindable<bool> mouseDisabled;

From 4fcddfb44b7284dcf39720a685d2f34813e56ecd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 13:42:14 +0900
Subject: [PATCH 08977/10326] Fix multiplayer test failure

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 839118de2f..caa731f985 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("match started", () => Client.Room?.State == MultiplayerRoomState.WaitingForLoad);
+            AddUntilStep("match started", () => Client.Room?.State == MultiplayerRoomState.WaitingForLoad);
         }
     }
 }

From 995c244ceef985c3b381b6ec6af54f8d5d940b0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 14:00:26 +0900
Subject: [PATCH 08978/10326] Remove alt-mousewheel bindings for volume
 adjustment

With the recent changes to the order of processing key bindings
(`GlobalAction`s are handled first), having the alt-wheel bindings in here causes a
regression as they are handled before `OnScroll` events.

Specifically, this means editor alt-scroll functionality no longer works
with the default bindings.

Removing the bindings fixes this, while also still allowing alt-wheel
adjustment of the volume via `VolumeControlReceptor`:

https://github.com/ppy/osu/blob/a2f50af4243dfde95ec556859666b65e34f3007b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs#L21-L26

In conjunction with the special case in `OsuScrollContainer`:

https://github.com/ppy/osu/blob/02d5b1352b6c9971ea83a131c0d2637e167b56b3/osu.Game/Graphics/Containers/OsuScrollContainer.cs#L103-L105
---
 .../Input/Bindings/GlobalActionContainer.cs   |   2 -
 ...700_RefreshVolumeBindingsAgain.Designer.cs | 506 ++++++++++++++++++
 ...210412045700_RefreshVolumeBindingsAgain.cs |  16 +
 3 files changed, 522 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs
 create mode 100644 osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 671c3bc8bc..ba4d757cd7 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -97,9 +97,7 @@ namespace osu.Game.Input.Bindings
         public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
         {
             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(new[] { InputKey.Control, InputKey.F4 }, GlobalAction.ToggleMute),
 
diff --git a/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs
new file mode 100644
index 0000000000..2c100d39b9
--- /dev/null
+++ b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.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("20210412045700_RefreshVolumeBindingsAgain")]
+    partial class RefreshVolumeBindingsAgain
+    {
+        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/20210412045700_RefreshVolumeBindingsAgain.cs b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs
new file mode 100644
index 0000000000..155d6670a8
--- /dev/null
+++ b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs
@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace osu.Game.Migrations
+{
+    public partial class RefreshVolumeBindingsAgain : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("DELETE FROM KeyBinding WHERE action in (6,7)");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

From dd1925aaedc756a57e1aecadbe2e36992bd17e8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 14:29:27 +0900
Subject: [PATCH 08979/10326] Remove temporary input ignore

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index 37d88693ee..2df05cb5ed 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -89,9 +89,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             private Vector2 getFinalSize() => facade.DrawSize;
 
-            // Todo: Temporary?
-            protected override bool ShouldBeConsideredForInput(Drawable child) => false;
-
             protected override bool OnClick(ClickEvent e)
             {
                 ToggleMaximisationState(this);

From 1c553b5d481d21186eed0498160f90a6e51eedee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:14:53 +0900
Subject: [PATCH 08980/10326] Checker -> BeatmapVerifier

---
 .../Edit/{OsuChecker.cs => OsuBeatmapVerifier.cs}      |  2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs                    |  2 +-
 .../Rulesets/Edit/{Checker.cs => BeatmapVerifier.cs}   |  2 +-
 osu.Game/Rulesets/Ruleset.cs                           |  2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs           | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename osu.Game.Rulesets.Osu/Edit/{OsuChecker.cs => OsuBeatmapVerifier.cs} (94%)
 rename osu.Game/Rulesets/Edit/{Checker.cs => BeatmapVerifier.cs} (94%)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
similarity index 94%
rename from osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
rename to osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 10f0ecf0cf..272612dbaf 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Osu.Edit.Checks;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class OsuChecker : Checker
+    public class OsuBeatmapVerifier : BeatmapVerifier
     {
         private readonly List<Check> checks = new List<Check>
         {
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 74679bd578..1658846e98 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
-        public override Checker CreateChecker() => new OsuChecker();
+        public override BeatmapVerifier CreateChecker() => new OsuBeatmapVerifier();
 
         public override string Description => "osu!";
 
diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
similarity index 94%
rename from osu.Game/Rulesets/Edit/Checker.cs
rename to osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 6ab6ed75e8..230b128cc1 100644
--- a/osu.Game/Rulesets/Edit/Checker.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public abstract class Checker
+    public abstract class BeatmapVerifier
     {
         // These are all ruleset-invariant, hence here instead of in e.g. `OsuChecker`.
         private readonly IReadOnlyList<Check> checks = new List<Check>
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 71f80c9982..088bcc7712 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
-        public virtual Checker CreateChecker() => null;
+        public virtual BeatmapVerifier CreateChecker() => null;
 
         public virtual Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.QuestionCircle };
 
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index b9fd93ac19..7a520826f5 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit.Verify
     public class VerifyScreen : EditorScreen
     {
         private Ruleset ruleset;
-        private static Checker checker;
+        private static BeatmapVerifier beatmapVerifier;
 
         [Cached]
         private Bindable<Issue> selectedIssue = new Bindable<Issue>();
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Edit.Verify
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
             ruleset = parent.Get<IBindable<WorkingBeatmap>>().Value.BeatmapInfo.Ruleset?.CreateInstance();
-            checker = ruleset?.CreateChecker();
+            beatmapVerifier = ruleset?.CreateChecker();
 
             return dependencies;
         }
@@ -128,9 +128,9 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void refresh()
             {
-                table.Issues = checker.Run(Beatmap)
-                                      .OrderByDescending(issue => issue.Template.Type)
-                                      .ThenByDescending(issue => issue.Template.Origin.Metadata().Category);
+                table.Issues = beatmapVerifier.Run(Beatmap)
+                                              .OrderByDescending(issue => issue.Template.Type)
+                                              .ThenByDescending(issue => issue.Template.Origin.Metadata().Category);
             }
         }
     }

From 136627b9ac59697129ccd1ae94a67e50442d3d61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:27:12 +0900
Subject: [PATCH 08981/10326] Wrap xmldoc less and make a few fixes

---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs            |  9 ++++++---
 osu.Game/Rulesets/Edit/Checks/Components/Check.cs    | 12 +++---------
 .../Rulesets/Edit/Checks/Components/CheckMetadata.cs |  6 ++----
 osu.Game/Rulesets/Edit/Checks/Components/Issue.cs    | 10 +++-------
 .../Rulesets/Edit/Checks/Components/IssueTemplate.cs |  5 +----
 5 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 230b128cc1..f67a068525 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -11,15 +11,18 @@ namespace osu.Game.Rulesets.Edit
 {
     public abstract class BeatmapVerifier
     {
-        // These are all ruleset-invariant, hence here instead of in e.g. `OsuChecker`.
-        private readonly IReadOnlyList<Check> checks = new List<Check>
+        /// <summary>
+        /// Checks which are performed regardless of ruleset.
+        /// These handle things like beatmap metadata, timing, and other ruleset agnostic elements.
+        /// </summary>
+        private readonly IReadOnlyList<Check> generalChecks = new List<Check>
         {
             new CheckBackground()
         };
 
         public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
         {
-            return checks.SelectMany(check => check.Run(beatmap));
+            return generalChecks.SelectMany(check => check.Run(beatmap));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 4e444cacbf..5a922fde56 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -9,25 +9,19 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
     public abstract class Check
     {
         /// <summary>
-        /// Returns the <see cref="CheckMetadata"/> for this check.
-        /// Basically, its information.
+        /// The metadata for this check.
         /// </summary>
-        /// <returns></returns>
         public abstract CheckMetadata Metadata();
 
         /// <summary>
-        /// The templates for issues that this check may use.
-        /// Basically, what issues this check can detect.
+        /// All possible templates for issues that this check may return.
         /// </summary>
-        /// <returns></returns>
         public abstract IEnumerable<IssueTemplate> Templates();
 
         /// <summary>
-        /// Returns zero, one, or several issues detected by this
-        /// check on the given beatmap.
+        /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
         /// <param name="beatmap">The beatmap to run the check on.</param>
-        /// <returns></returns>
         public abstract IEnumerable<Issue> Run(IBeatmap beatmap);
 
         protected Check()
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
index 5a226729ad..38a9a16325 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
@@ -42,14 +42,12 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         }
 
         /// <summary>
-        /// The category this check belongs to. E.g. <see cref="CheckCategory.Metadata"/>,
-        /// <see cref="CheckCategory.Timing"/>, or <see cref="CheckCategory.Compose"/>.
+        /// The category this check belongs to. E.g. <see cref="CheckCategory.Metadata"/>, <see cref="CheckCategory.Timing"/>, or <see cref="CheckCategory.Compose"/>.
         /// </summary>
         public readonly CheckCategory Category;
 
         /// <summary>
-        /// Describes the issue(s) that this check looks for. Keep this brief, such that
-        /// it fits into "No {description}". E.g. "Offscreen objects" / "Too short sliders".
+        /// Describes the issue(s) that this check looks for. Keep this brief, such that it fits into "No {description}". E.g. "Offscreen objects" / "Too short sliders".
         /// </summary>
         public readonly string Description;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index 0f835202e7..6f6ba2a323 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -22,17 +22,13 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         public IReadOnlyList<HitObject> HitObjects;
 
         /// <summary>
-        /// The template which this issue is using. This provides properties
-        /// such as the <see cref="IssueTemplate.IssueType"/>, and the
-        /// <see cref="IssueTemplate.UnformattedMessage"/>.
+        /// The template which this issue is using. This provides properties such as the <see cref="IssueTemplate.IssueType"/>, and the <see cref="IssueTemplate.UnformattedMessage"/>.
         /// </summary>
         public IssueTemplate Template;
 
         /// <summary>
-        /// The arguments that give this issue its context, based on the
-        /// <see cref="IssueTemplate"/>. These are then substituted into the
-        /// <see cref="IssueTemplate.UnformattedMessage"/>.
-        /// E.g. timestamps, which diff is being compared to, what some volume is, etc.
+        /// The arguments that give this issue its context, based on the <see cref="IssueTemplate"/>. These are then substituted into the <see cref="IssueTemplate.UnformattedMessage"/>.
+        /// This could for instance include timestamps, which diff is being compared to, what some volume is, etc.
         /// </summary>
         public object[] Arguments;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 7eaabdc59b..69c421140b 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -35,8 +35,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         public Check Origin;
 
         /// <summary>
-        /// The type of the issue. E.g. <see cref="IssueType.Problem"/>,
-        /// <see cref="IssueType.Warning"/>, or <see cref="IssueType.Negligible"/>.
+        /// The type of the issue.
         /// </summary>
         public readonly IssueType Type;
 
@@ -57,7 +56,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// Returns the formatted message given the arguments used to format it.
         /// </summary>
         /// <param name="args">The arguments used to format the message.</param>
-        /// <returns></returns>
         public string Message(params object[] args) => UnformattedMessage.FormatWith(args);
 
         public static readonly Color4 PROBLEM_RED = new Colour4(1.0f, 0.4f, 0.4f, 1.0f);
@@ -68,7 +66,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Returns the colour corresponding to the type of this issue.
         /// </summary>
-        /// <returns></returns>
         public Colour4 TypeColour()
         {
             return Type switch

From 257acf9cd88f3826e6da336fe66e71d3a7834c60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:28:13 +0900
Subject: [PATCH 08982/10326] Colour constants to private

---
 .../Edit/Checks/Components/IssueTemplate.cs    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 69c421140b..5381d54600 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -9,6 +9,11 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public class IssueTemplate
     {
+        private static readonly Color4 problem_red = new Colour4(1.0f, 0.4f, 0.4f, 1.0f);
+        private static readonly Color4 warning_yellow = new Colour4(1.0f, 0.8f, 0.2f, 1.0f);
+        private static readonly Color4 negligible_green = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
+        private static readonly Color4 error_gray = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
+
         /// <summary>
         /// The type, or severity, of an issue. This decides its priority.
         /// </summary>
@@ -58,11 +63,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <param name="args">The arguments used to format the message.</param>
         public string Message(params object[] args) => UnformattedMessage.FormatWith(args);
 
-        public static readonly Color4 PROBLEM_RED = new Colour4(1.0f, 0.4f, 0.4f, 1.0f);
-        public static readonly Color4 WARNING_YELLOW = new Colour4(1.0f, 0.8f, 0.2f, 1.0f);
-        public static readonly Color4 NEGLIGIBLE_GREEN = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
-        public static readonly Color4 ERROR_GRAY = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
-
         /// <summary>
         /// Returns the colour corresponding to the type of this issue.
         /// </summary>
@@ -70,10 +70,10 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         {
             return Type switch
             {
-                IssueType.Problem => PROBLEM_RED,
-                IssueType.Warning => WARNING_YELLOW,
-                IssueType.Negligible => NEGLIGIBLE_GREEN,
-                IssueType.Error => ERROR_GRAY,
+                IssueType.Problem => problem_red,
+                IssueType.Warning => warning_yellow,
+                IssueType.Negligible => negligible_green,
+                IssueType.Error => error_gray,
                 _ => Color4.White
             };
         }

From 3551322f1d95738e09c9e5f9c847abf0163d1d3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:30:33 +0900
Subject: [PATCH 08983/10326] Fix formatting of colour getter

---
 .../Edit/Checks/Components/IssueTemplate.cs   | 28 +++++++++++++------
 osu.Game/Screens/Edit/Verify/IssueTable.cs    |  2 +-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 5381d54600..6fe8b8de87 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -66,16 +66,28 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Returns the colour corresponding to the type of this issue.
         /// </summary>
-        public Colour4 TypeColour()
+        public Colour4 Colour
         {
-            return Type switch
+            get
             {
-                IssueType.Problem => problem_red,
-                IssueType.Warning => warning_yellow,
-                IssueType.Negligible => negligible_green,
-                IssueType.Error => error_gray,
-                _ => Color4.White
-            };
+                switch (Type)
+                {
+                    case IssueType.Problem:
+                        return problem_red;
+
+                    case IssueType.Warning:
+                        return warning_yellow;
+
+                    case IssueType.Negligible:
+                        return negligible_green;
+
+                    case IssueType.Error:
+                        return error_gray;
+
+                    default:
+                        return Color4.White;
+                }
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 5f04c7c4e8..1f275ca537 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Edit.Verify
                 Text = issue.Template.Type.ToString(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
                 Margin = new MarginPadding { Right = 10 },
-                Colour = issue.Template.TypeColour()
+                Colour = issue.Template.Colour
             },
             new OsuSpriteText
             {

From f78239c7f238bd64a6272de1c3b5648511f8c581 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:32:52 +0900
Subject: [PATCH 08984/10326] Move enums out of nesting

---
 .../Edit/Checks/CheckOffscreenObjects.cs      |  6 +--
 .../Rulesets/Edit/Checks/CheckBackground.cs   |  6 +--
 .../Edit/Checks/Components/CheckCategory.cs   | 41 +++++++++++++++++++
 .../Edit/Checks/Components/CheckMetadata.cs   | 36 ----------------
 .../Rulesets/Edit/Checks/Components/Issue.cs  |  2 +-
 .../Edit/Checks/Components/IssueTemplate.cs   | 20 ---------
 .../Edit/Checks/Components/IssueType.cs       | 25 +++++++++++
 7 files changed, 73 insertions(+), 63 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs
 create mode 100644 osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 3d411d6e12..910de76c5f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
         public override CheckMetadata Metadata() => new CheckMetadata
         (
-            category: CheckMetadata.CheckCategory.Compose,
+            category: CheckCategory.Compose,
             description: "Offscreen hitobjects."
         );
 
@@ -36,13 +36,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
         private readonly IssueTemplate templateOffscreen = new IssueTemplate
         (
-            type: IssueTemplate.IssueType.Problem,
+            type: IssueType.Problem,
             unformattedMessage: "This object goes offscreen on a 4:3 aspect ratio."
         );
 
         private readonly IssueTemplate templateOffscreenSliderPath = new IssueTemplate
         (
-            type: IssueTemplate.IssueType.Problem,
+            type: IssueType.Problem,
             unformattedMessage: "This slider goes offscreen here on a 4:3 aspect ratio."
         );
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index aa10fad77b..2de9d9daae 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         public override CheckMetadata Metadata() => new CheckMetadata
         (
-            category: CheckMetadata.CheckCategory.Resources,
+            category: CheckCategory.Resources,
             description: "Missing background."
         );
 
@@ -24,13 +24,13 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         private readonly IssueTemplate templateNoneSet = new IssueTemplate
         (
-            type: IssueTemplate.IssueType.Problem,
+            type: IssueType.Problem,
             unformattedMessage: "No background has been set."
         );
 
         private readonly IssueTemplate templateDoesNotExist = new IssueTemplate
         (
-            type: IssueTemplate.IssueType.Problem,
+            type: IssueType.Problem,
             unformattedMessage: "The background file \"{0}\" is does not exist."
         );
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs b/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs
new file mode 100644
index 0000000000..c37a580dd8
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.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.
+
+namespace osu.Game.Rulesets.Edit.Checks.Components
+{
+    /// <summary>
+    /// The category of an issue.
+    /// </summary>
+    public enum CheckCategory
+    {
+        /// <summary> Anything to do with control points. </summary>
+        Timing,
+
+        /// <summary> Anything to do with artist, title, creator, etc. </summary>
+        Metadata,
+
+        /// <summary> Anything to do with non-audio files, e.g. background, skin, sprites, and video. </summary>
+        Resources,
+
+        /// <summary> Anything to do with audio files, e.g. song and hitsounds. </summary>
+        Audio,
+
+        /// <summary> Anything to do with files that don't fit into the above, e.g. unused, osu, or osb. </summary>
+        Files,
+
+        /// <summary> Anything to do with hitobjects unrelated to spread. </summary>
+        Compose,
+
+        /// <summary> Anything to do with difficulty levels or their progression. </summary>
+        Spread,
+
+        /// <summary> Anything to do with variables like CS, OD, AR, HP, and global SV. </summary>
+        Settings,
+
+        /// <summary> Anything to do with hitobject feedback. </summary>
+        Hitsounds,
+
+        /// <summary> Anything to do with storyboarding, breaks, video offset, etc. </summary>
+        Events
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
index 38a9a16325..cebb2f5455 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
@@ -5,42 +5,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public class CheckMetadata
     {
-        /// <summary>
-        /// The category of an issue.
-        /// </summary>
-        public enum CheckCategory
-        {
-            /// <summary> Anything to do with control points. </summary>
-            Timing,
-
-            /// <summary> Anything to do with artist, title, creator, etc. </summary>
-            Metadata,
-
-            /// <summary> Anything to do with non-audio files, e.g. background, skin, sprites, and video. </summary>
-            Resources,
-
-            /// <summary> Anything to do with audio files, e.g. song and hitsounds. </summary>
-            Audio,
-
-            /// <summary> Anything to do with files that don't fit into the above, e.g. unused, osu, or osb. </summary>
-            Files,
-
-            /// <summary> Anything to do with hitobjects unrelated to spread. </summary>
-            Compose,
-
-            /// <summary> Anything to do with difficulty levels or their progression. </summary>
-            Spread,
-
-            /// <summary> Anything to do with variables like CS, OD, AR, HP, and global SV. </summary>
-            Settings,
-
-            /// <summary> Anything to do with hitobject feedback. </summary>
-            Hitsounds,
-
-            /// <summary> Anything to do with storyboarding, breaks, video offset, etc. </summary>
-            Events
-        }
-
         /// <summary>
         /// The category this check belongs to. E.g. <see cref="CheckCategory.Metadata"/>, <see cref="CheckCategory.Timing"/>, or <see cref="CheckCategory.Compose"/>.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index 6f6ba2a323..f392fa8ef4 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         public IReadOnlyList<HitObject> HitObjects;
 
         /// <summary>
-        /// The template which this issue is using. This provides properties such as the <see cref="IssueTemplate.IssueType"/>, and the <see cref="IssueTemplate.UnformattedMessage"/>.
+        /// The template which this issue is using. This provides properties such as the <see cref="IssueType"/>, and the <see cref="IssueTemplate.UnformattedMessage"/>.
         /// </summary>
         public IssueTemplate Template;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 6fe8b8de87..976341e41c 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -14,26 +14,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         private static readonly Color4 negligible_green = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
         private static readonly Color4 error_gray = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
 
-        /// <summary>
-        /// The type, or severity, of an issue. This decides its priority.
-        /// </summary>
-        public enum IssueType
-        {
-            /// <summary> A must-fix in the vast majority of cases. </summary>
-            Problem = 3,
-
-            /// <summary> A possible mistake. Often requires critical thinking.  </summary>
-            Warning = 2,
-
-            // TODO: Try/catch all checks run and return error templates if exceptions occur.
-            /// <summary> An error occurred and a complete check could not be made. </summary>
-            Error = 1,
-
-            // TODO: Negligible issues should be hidden by default.
-            /// <summary> A possible mistake so minor/unlikely that it can often be safely ignored. </summary>
-            Negligible = 0,
-        }
-
         /// <summary>
         /// The check that this template originates from.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
new file mode 100644
index 0000000000..be43060cfc
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.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.
+
+namespace osu.Game.Rulesets.Edit.Checks.Components
+{
+    /// <summary>
+    /// The type, or severity, of an issue. This decides its priority.
+    /// </summary>
+    public enum IssueType
+    {
+        /// <summary> A must-fix in the vast majority of cases. </summary>
+        Problem = 3,
+
+        /// <summary> A possible mistake. Often requires critical thinking.  </summary>
+        Warning = 2,
+
+        // TODO: Try/catch all checks run and return error templates if exceptions occur.
+        /// <summary> An error occurred and a complete check could not be made. </summary>
+        Error = 1,
+
+        // TODO: Negligible issues should be hidden by default.
+        /// <summary> A possible mistake so minor/unlikely that it can often be safely ignored. </summary>
+        Negligible = 0,
+    }
+}

From 8c31e96cdfd657c537dce50a722438fdad7b63dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:37:41 +0900
Subject: [PATCH 08985/10326] Change some methods to get properties

---
 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs           | 2 +-
 osu.Game/Rulesets/Edit/Checks/Components/Check.cs          | 4 ++--
 osu.Game/Rulesets/Edit/Checks/Components/Issue.cs          | 5 +----
 osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs  | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 910de76c5f..b2a00da12a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             description: "Offscreen hitobjects."
         );
 
-        public override IEnumerable<IssueTemplate> Templates() => new[]
+        public override IEnumerable<IssueTemplate> PossibleTemplates => new[]
         {
             templateOffscreen,
             templateOffscreenSliderPath
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 2de9d9daae..89b2e8293c 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             description: "Missing background."
         );
 
-        public override IEnumerable<IssueTemplate> Templates() => new[]
+        public override IEnumerable<IssueTemplate> PossibleTemplates => new[]
         {
             templateNoneSet,
             templateDoesNotExist
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 5a922fde56..550d2ea0a2 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// All possible templates for issues that this check may return.
         /// </summary>
-        public abstract IEnumerable<IssueTemplate> Templates();
+        public abstract IEnumerable<IssueTemplate> PossibleTemplates { get; }
 
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
 
         protected Check()
         {
-            foreach (var template in Templates())
+            foreach (var template in PossibleTemplates)
                 template.Origin = this;
         }
     }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index f392fa8ef4..0d5c5411fd 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -69,10 +69,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
             HitObjects = hitObjectList;
         }
 
-        public override string ToString()
-        {
-            return Template.Message(Arguments);
-        }
+        public override string ToString() => Template.GetMessage(Arguments);
 
         public string GetEditorTimestamp()
         {
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 976341e41c..a1156c7c72 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// Returns the formatted message given the arguments used to format it.
         /// </summary>
         /// <param name="args">The arguments used to format the message.</param>
-        public string Message(params object[] args) => UnformattedMessage.FormatWith(args);
+        public string GetMessage(params object[] args) => UnformattedMessage.FormatWith(args);
 
         /// <summary>
         /// Returns the colour corresponding to the type of this issue.

From 78bbc8f5c824ffd35a8dab92ca0082c4e7244d7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:47:32 +0900
Subject: [PATCH 08986/10326] Tidy some remaining code

---
 .../Edit/Checks/Components/CheckCategory.cs   | 42 ++++++++++++++-----
 .../Rulesets/Edit/Checks/Components/Issue.cs  |  6 +--
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs b/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs
index c37a580dd8..ae943cfda9 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs
@@ -8,34 +8,54 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
     /// </summary>
     public enum CheckCategory
     {
-        /// <summary> Anything to do with control points. </summary>
+        /// <summary>
+        /// Anything to do with control points.
+        /// </summary>
         Timing,
 
-        /// <summary> Anything to do with artist, title, creator, etc. </summary>
+        /// <summary>
+        /// Anything to do with artist, title, creator, etc.
+        /// </summary>
         Metadata,
 
-        /// <summary> Anything to do with non-audio files, e.g. background, skin, sprites, and video. </summary>
+        /// <summary>
+        /// Anything to do with non-audio files, e.g. background, skin, sprites, and video.
+        /// </summary>
         Resources,
 
-        /// <summary> Anything to do with audio files, e.g. song and hitsounds. </summary>
+        /// <summary>
+        /// Anything to do with audio files, e.g. song and hitsounds.
+        /// </summary>
         Audio,
 
-        /// <summary> Anything to do with files that don't fit into the above, e.g. unused, osu, or osb. </summary>
+        /// <summary>
+        /// Anything to do with files that don't fit into the above, e.g. unused, osu, or osb.
+        /// </summary>
         Files,
 
-        /// <summary> Anything to do with hitobjects unrelated to spread. </summary>
+        /// <summary>
+        /// Anything to do with hitobjects unrelated to spread.
+        /// </summary>
         Compose,
 
-        /// <summary> Anything to do with difficulty levels or their progression. </summary>
+        /// <summary>
+        /// Anything to do with difficulty levels or their progression.
+        /// </summary>
         Spread,
 
-        /// <summary> Anything to do with variables like CS, OD, AR, HP, and global SV. </summary>
+        /// <summary>
+        /// Anything to do with variables like CS, OD, AR, HP, and global SV.
+        /// </summary>
         Settings,
 
-        /// <summary> Anything to do with hitobject feedback. </summary>
-        Hitsounds,
+        /// <summary>
+        /// Anything to do with hitobject feedback.
+        /// </summary>
+        HitObjects,
 
-        /// <summary> Anything to do with storyboarding, breaks, video offset, etc. </summary>
+        /// <summary>
+        /// Anything to do with storyboarding, breaks, video offset, etc.
+        /// </summary>
         Events
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index 0d5c5411fd..7241fabf5b 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -40,11 +40,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
             Arguments = args;
 
             if (template.Origin == null)
-            {
-                throw new ArgumentException(
-                    "A template had no origin. Make sure the `Templates()` method contains all templates used."
-                );
-            }
+                throw new ArgumentException("A template had no origin. Make sure the `Templates()` method contains all templates used.");
         }
 
         public Issue(double? time, IssueTemplate template, params object[] args)

From 8bf85d737c75a71ba9e388842770cfc987f2bed7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:52:29 +0900
Subject: [PATCH 08987/10326] Change Metadata into a get property

---
 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs           | 2 +-
 osu.Game/Rulesets/Edit/Checks/Components/Check.cs          | 2 +-
 osu.Game/Screens/Edit/Verify/IssueTable.cs                 | 2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index b2a00da12a..252f65ab5a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
         // (higher = more performant, but higher false-negative chance).
         private const int path_step_size = 5;
 
-        public override CheckMetadata Metadata() => new CheckMetadata
+        public override CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Compose,
             description: "Offscreen hitobjects."
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 89b2e8293c..22f98b6fd7 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 {
     public class CheckBackground : Check
     {
-        public override CheckMetadata Metadata() => new CheckMetadata
+        public override CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Resources,
             description: "Missing background."
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 550d2ea0a2..7c039d1572 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// The metadata for this check.
         /// </summary>
-        public abstract CheckMetadata Metadata();
+        public abstract CheckMetadata Metadata { get; }
 
         /// <summary>
         /// All possible templates for issues that this check may return.
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 1f275ca537..84dbabf300 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Edit.Verify
             },
             new OsuSpriteText
             {
-                Text = issue.Template.Origin.Metadata().Category.ToString(),
+                Text = issue.Template.Origin.Metadata.Category.ToString(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
                 Margin = new MarginPadding(10)
             }
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 7a520826f5..0c4aa04ff3 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Edit.Verify
             {
                 table.Issues = beatmapVerifier.Run(Beatmap)
                                               .OrderByDescending(issue => issue.Template.Type)
-                                              .ThenByDescending(issue => issue.Template.Origin.Metadata().Category);
+                                              .ThenByDescending(issue => issue.Template.Origin.Metadata.Category);
             }
         }
     }

From 42604afcdcf9ed0ae922b07434b4587ad4b4c85d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 16:15:27 +0900
Subject: [PATCH 08988/10326] Add binding for verify mode (and move enum entry
 to end)

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 3ea7f5f5fa..36e465720a 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -70,6 +70,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.F2 }, GlobalAction.EditorDesignMode),
             new KeyBinding(new[] { InputKey.F3 }, GlobalAction.EditorTimingMode),
             new KeyBinding(new[] { InputKey.F4 }, GlobalAction.EditorSetupMode),
+            new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.A }, GlobalAction.EditorVerifyMode),
         };
 
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]
@@ -225,9 +226,6 @@ namespace osu.Game.Input.Bindings
         [Description("Timing mode")]
         EditorTimingMode,
 
-        [Description("Verify mode")]
-        EditorVerifyMode,
-
         [Description("Hold for HUD")]
         HoldForHUD,
 
@@ -252,5 +250,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Beatmap Options")]
         ToggleBeatmapOptions,
+
+        [Description("Verify mode")]
+        EditorVerifyMode,
     }
 }

From e19e8ff2a3252b9adde46dae589ce8d2a134f4dc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 15:52:43 +0900
Subject: [PATCH 08989/10326] Rewrite FramedReplayInputHandler for robustness

This commit changes the semantics of `CurrentFrame` and `NextFrame` of the class.
The ordering of `NextFrame.Time` and `CurrentFrame.Time` was dependent on the current direction.
Now, it should always satisfy `CurrentFrame.Time <= CurrentTime <= NextFrame.Time` except at the start/end.
This change, however, doesn't break existing deriving classes if the template code pattern usage of interpolation is used.
The deriving class code can be simplified due to the elimination of nullable types. I didn't include those changes in this commit.

I removed `StreamingFramedReplayInputHandlerTest` for now, as it is almost-duplicate of `FramedReplayInputHandlerTest`. I'll include more tests in later commits.

This commit fixes #6150.
---
 .../NonVisual/FramedReplayInputHandlerTest.cs |  81 ++---
 .../StreamingFramedReplayInputHandlerTest.cs  | 296 ------------------
 .../Visual/Gameplay/TestSceneSpectator.cs     |   4 +-
 .../Replays/FramedReplayInputHandler.cs       | 167 +++++-----
 4 files changed, 109 insertions(+), 439 deletions(-)
 delete mode 100644 osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index 92a60663de..b4fc081a2a 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -37,11 +37,6 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestNormalPlayback()
         {
-            Assert.IsNull(handler.CurrentFrame);
-
-            confirmCurrentFrame(null);
-            confirmNextFrame(0);
-
             setTime(0, 0);
             confirmCurrentFrame(0);
             confirmNextFrame(1);
@@ -97,22 +92,22 @@ namespace osu.Game.Tests.NonVisual
             // exited important section
             setTime(8200, 8000);
             confirmCurrentFrame(7);
-            confirmNextFrame(null);
+            confirmNextFrame(7);
 
             setTime(8200, 8200);
             confirmCurrentFrame(7);
-            confirmNextFrame(null);
+            confirmNextFrame(7);
         }
 
         [Test]
         public void TestIntroTime()
         {
             setTime(-1000, -1000);
-            confirmCurrentFrame(null);
+            confirmCurrentFrame(0);
             confirmNextFrame(0);
 
             setTime(-500, -500);
-            confirmCurrentFrame(null);
+            confirmCurrentFrame(0);
             confirmNextFrame(0);
 
             setTime(0, 0);
@@ -133,29 +128,29 @@ namespace osu.Game.Tests.NonVisual
             // pivot without crossing a frame boundary
             setTime(2700, 2700);
             confirmCurrentFrame(2);
-            confirmNextFrame(1);
+            confirmNextFrame(3);
 
-            // cross current frame boundary; should not yet update frame
-            setTime(1980, 1980);
+            // cross current frame boundary
+            setTime(1980, 2000);
             confirmCurrentFrame(2);
-            confirmNextFrame(1);
+            confirmNextFrame(3);
 
             setTime(1200, 1200);
-            confirmCurrentFrame(2);
-            confirmNextFrame(1);
+            confirmCurrentFrame(1);
+            confirmNextFrame(2);
 
             // ensure each frame plays out until start
             setTime(-500, 1000);
             confirmCurrentFrame(1);
-            confirmNextFrame(0);
+            confirmNextFrame(2);
 
             setTime(-500, 0);
             confirmCurrentFrame(0);
-            confirmNextFrame(null);
+            confirmNextFrame(1);
 
             setTime(-500, -500);
             confirmCurrentFrame(0);
-            confirmNextFrame(null);
+            confirmNextFrame(0);
         }
 
         [Test]
@@ -168,12 +163,12 @@ namespace osu.Game.Tests.NonVisual
             confirmNextFrame(5);
 
             setTime(3500, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(3);
+            confirmCurrentFrame(3);
+            confirmNextFrame(4);
 
             setTime(3000, 3000);
             confirmCurrentFrame(3);
-            confirmNextFrame(2);
+            confirmNextFrame(4);
 
             setTime(3500, null);
             confirmCurrentFrame(3);
@@ -187,17 +182,17 @@ namespace osu.Game.Tests.NonVisual
             confirmCurrentFrame(4);
             confirmNextFrame(5);
 
-            setTime(4000, null);
+            setTime(4000, 4000);
             confirmCurrentFrame(4);
             confirmNextFrame(5);
 
             setTime(3500, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(3);
+            confirmCurrentFrame(3);
+            confirmNextFrame(4);
 
             setTime(3000, 3000);
             confirmCurrentFrame(3);
-            confirmNextFrame(2);
+            confirmNextFrame(4);
         }
 
         [Test]
@@ -209,24 +204,24 @@ namespace osu.Game.Tests.NonVisual
             confirmNextFrame(4);
 
             setTime(3200, null);
-            // next frame doesn't change even though direction reversed, because of important section.
             confirmCurrentFrame(3);
             confirmNextFrame(4);
 
-            setTime(3000, null);
+            setTime(3000, 3000);
             confirmCurrentFrame(3);
             confirmNextFrame(4);
 
             setTime(2800, 2800);
-            confirmCurrentFrame(3);
-            confirmNextFrame(2);
+            confirmCurrentFrame(2);
+            confirmNextFrame(3);
         }
 
         private void fastForwardToPoint(double destination)
         {
             for (int i = 0; i < 1000; i++)
             {
-                if (handler.SetFrameFromTime(destination) == null)
+                var time = handler.SetFrameFromTime(destination);
+                if (time == null || time == destination)
                     return;
             }
 
@@ -235,33 +230,17 @@ namespace osu.Game.Tests.NonVisual
 
         private void setTime(double set, double? expect)
         {
-            Assert.AreEqual(expect, handler.SetFrameFromTime(set));
+            Assert.AreEqual(expect, handler.SetFrameFromTime(set), "Unexpected return value");
         }
 
-        private void confirmCurrentFrame(int? frame)
+        private void confirmCurrentFrame(int frame)
         {
-            if (frame.HasValue)
-            {
-                Assert.IsNotNull(handler.CurrentFrame);
-                Assert.AreEqual(replay.Frames[frame.Value].Time, handler.CurrentFrame.Time);
-            }
-            else
-            {
-                Assert.IsNull(handler.CurrentFrame);
-            }
+            Assert.AreEqual(replay.Frames[frame].Time, handler.CurrentFrame.Time, "Unexpected current frame");
         }
 
-        private void confirmNextFrame(int? frame)
+        private void confirmNextFrame(int frame)
         {
-            if (frame.HasValue)
-            {
-                Assert.IsNotNull(handler.NextFrame);
-                Assert.AreEqual(replay.Frames[frame.Value].Time, handler.NextFrame.Time);
-            }
-            else
-            {
-                Assert.IsNull(handler.NextFrame);
-            }
+            Assert.AreEqual(replay.Frames[frame].Time, handler.NextFrame.Time, "Unexpected next frame");
         }
 
         private class TestReplayFrame : ReplayFrame
diff --git a/osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs
deleted file mode 100644
index 21ec29b10b..0000000000
--- a/osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs
+++ /dev/null
@@ -1,296 +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.Game.Replays;
-using osu.Game.Rulesets.Replays;
-
-namespace osu.Game.Tests.NonVisual
-{
-    [TestFixture]
-    public class StreamingFramedReplayInputHandlerTest
-    {
-        private Replay replay;
-        private TestInputHandler handler;
-
-        [SetUp]
-        public void SetUp()
-        {
-            handler = new TestInputHandler(replay = new Replay
-            {
-                HasReceivedAllFrames = false,
-                Frames = new List<ReplayFrame>
-                {
-                    new TestReplayFrame(0),
-                    new TestReplayFrame(1000),
-                    new TestReplayFrame(2000),
-                    new TestReplayFrame(3000, true),
-                    new TestReplayFrame(4000, true),
-                    new TestReplayFrame(5000, true),
-                    new TestReplayFrame(7000, true),
-                    new TestReplayFrame(8000),
-                }
-            });
-        }
-
-        [Test]
-        public void TestNormalPlayback()
-        {
-            Assert.IsNull(handler.CurrentFrame);
-
-            confirmCurrentFrame(null);
-            confirmNextFrame(0);
-
-            setTime(0, 0);
-            confirmCurrentFrame(0);
-            confirmNextFrame(1);
-
-            // if we hit the first frame perfectly, time should progress to it.
-            setTime(1000, 1000);
-            confirmCurrentFrame(1);
-            confirmNextFrame(2);
-
-            // in between non-important frames should progress based on input.
-            setTime(1200, 1200);
-            confirmCurrentFrame(1);
-
-            setTime(1400, 1400);
-            confirmCurrentFrame(1);
-
-            // progressing beyond the next frame should force time to that frame once.
-            setTime(2200, 2000);
-            confirmCurrentFrame(2);
-
-            // second attempt should progress to input time
-            setTime(2200, 2200);
-            confirmCurrentFrame(2);
-
-            // entering important section
-            setTime(3000, 3000);
-            confirmCurrentFrame(3);
-
-            // cannot progress within
-            setTime(3500, null);
-            confirmCurrentFrame(3);
-
-            setTime(4000, 4000);
-            confirmCurrentFrame(4);
-
-            // still cannot progress
-            setTime(4500, null);
-            confirmCurrentFrame(4);
-
-            setTime(5200, 5000);
-            confirmCurrentFrame(5);
-
-            // important section AllowedImportantTimeSpan allowance
-            setTime(5200, 5200);
-            confirmCurrentFrame(5);
-
-            setTime(7200, 7000);
-            confirmCurrentFrame(6);
-
-            setTime(7200, null);
-            confirmCurrentFrame(6);
-
-            // exited important section
-            setTime(8200, 8000);
-            confirmCurrentFrame(7);
-            confirmNextFrame(null);
-
-            setTime(8200, null);
-            confirmCurrentFrame(7);
-            confirmNextFrame(null);
-
-            setTime(8400, null);
-            confirmCurrentFrame(7);
-            confirmNextFrame(null);
-        }
-
-        [Test]
-        public void TestIntroTime()
-        {
-            setTime(-1000, -1000);
-            confirmCurrentFrame(null);
-            confirmNextFrame(0);
-
-            setTime(-500, -500);
-            confirmCurrentFrame(null);
-            confirmNextFrame(0);
-
-            setTime(0, 0);
-            confirmCurrentFrame(0);
-            confirmNextFrame(1);
-        }
-
-        [Test]
-        public void TestBasicRewind()
-        {
-            setTime(2800, 0);
-            setTime(2800, 1000);
-            setTime(2800, 2000);
-            setTime(2800, 2800);
-            confirmCurrentFrame(2);
-            confirmNextFrame(3);
-
-            // pivot without crossing a frame boundary
-            setTime(2700, 2700);
-            confirmCurrentFrame(2);
-            confirmNextFrame(1);
-
-            // cross current frame boundary; should not yet update frame
-            setTime(1980, 1980);
-            confirmCurrentFrame(2);
-            confirmNextFrame(1);
-
-            setTime(1200, 1200);
-            confirmCurrentFrame(2);
-            confirmNextFrame(1);
-
-            // ensure each frame plays out until start
-            setTime(-500, 1000);
-            confirmCurrentFrame(1);
-            confirmNextFrame(0);
-
-            setTime(-500, 0);
-            confirmCurrentFrame(0);
-            confirmNextFrame(null);
-
-            setTime(-500, -500);
-            confirmCurrentFrame(0);
-            confirmNextFrame(null);
-        }
-
-        [Test]
-        public void TestRewindInsideImportantSection()
-        {
-            fastForwardToPoint(3000);
-
-            setTime(4000, 4000);
-            confirmCurrentFrame(4);
-            confirmNextFrame(5);
-
-            setTime(3500, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(3);
-
-            setTime(3000, 3000);
-            confirmCurrentFrame(3);
-            confirmNextFrame(2);
-
-            setTime(3500, null);
-            confirmCurrentFrame(3);
-            confirmNextFrame(4);
-
-            setTime(4000, 4000);
-            confirmCurrentFrame(4);
-            confirmNextFrame(5);
-
-            setTime(4500, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(5);
-
-            setTime(4000, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(5);
-
-            setTime(3500, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(3);
-
-            setTime(3000, 3000);
-            confirmCurrentFrame(3);
-            confirmNextFrame(2);
-        }
-
-        [Test]
-        public void TestRewindOutOfImportantSection()
-        {
-            fastForwardToPoint(3500);
-
-            confirmCurrentFrame(3);
-            confirmNextFrame(4);
-
-            setTime(3200, null);
-            // next frame doesn't change even though direction reversed, because of important section.
-            confirmCurrentFrame(3);
-            confirmNextFrame(4);
-
-            setTime(3000, null);
-            confirmCurrentFrame(3);
-            confirmNextFrame(4);
-
-            setTime(2800, 2800);
-            confirmCurrentFrame(3);
-            confirmNextFrame(2);
-        }
-
-        private void fastForwardToPoint(double destination)
-        {
-            for (int i = 0; i < 1000; i++)
-            {
-                if (handler.SetFrameFromTime(destination) == null)
-                    return;
-            }
-
-            throw new TimeoutException("Seek was never fulfilled");
-        }
-
-        private void setTime(double set, double? expect)
-        {
-            Assert.AreEqual(expect, handler.SetFrameFromTime(set));
-        }
-
-        private void confirmCurrentFrame(int? frame)
-        {
-            if (frame.HasValue)
-            {
-                Assert.IsNotNull(handler.CurrentFrame);
-                Assert.AreEqual(replay.Frames[frame.Value].Time, handler.CurrentFrame.Time);
-            }
-            else
-            {
-                Assert.IsNull(handler.CurrentFrame);
-            }
-        }
-
-        private void confirmNextFrame(int? frame)
-        {
-            if (frame.HasValue)
-            {
-                Assert.IsNotNull(handler.NextFrame);
-                Assert.AreEqual(replay.Frames[frame.Value].Time, handler.NextFrame.Time);
-            }
-            else
-            {
-                Assert.IsNull(handler.NextFrame);
-            }
-        }
-
-        private class TestReplayFrame : ReplayFrame
-        {
-            public readonly bool IsImportant;
-
-            public TestReplayFrame(double time, bool isImportant = false)
-                : base(time)
-            {
-                IsImportant = isImportant;
-            }
-        }
-
-        private class TestInputHandler : FramedReplayInputHandler<TestReplayFrame>
-        {
-            public TestInputHandler(Replay replay)
-                : base(replay)
-            {
-                FrameAccuratePlayback = true;
-            }
-
-            protected override double AllowedImportantTimeSpan => 1000;
-
-            protected override bool IsImportant(TestReplayFrame frame) => frame.IsImportant;
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 9d85a9995d..9f1faa8e26 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             waitForPlayer();
             AddAssert("ensure frames arrived", () => replayHandler.HasFrames);
 
-            AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
+            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingNextFrame);
             checkPaused(true);
 
             double? pausedTime = null;
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             sendFrames();
 
-            AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
+            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingNextFrame);
             checkPaused(true);
 
             AddAssert("time advanced", () => currentFrameStableTime > pausedTime);
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 5eaccc766e..f527c0e105 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -1,9 +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.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
@@ -17,70 +18,80 @@ namespace osu.Game.Rulesets.Replays
     public abstract class FramedReplayInputHandler<TFrame> : ReplayInputHandler
         where TFrame : ReplayFrame
     {
-        public override bool IsActive => HasFrames;
+        /// <summary>
+        /// Whether we have at least one replay frame.
+        /// </summary>
+        public bool HasFrames => Frames.Count != 0;
 
-        private readonly Replay replay;
-
-        protected List<ReplayFrame> Frames => replay.Frames;
+        /// <summary>
+        /// Whether we are waiting for new frames to be received.
+        /// </summary>
+        public bool WaitingNextFrame => !replay.HasReceivedAllFrames && currentFrameIndex == Frames.Count - 1;
 
+        /// <summary>
+        /// The current frame of the replay.
+        /// The current time is always between the start and the end time of the current frame.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">The replay is empty.</exception>
         public TFrame CurrentFrame
         {
             get
             {
                 if (!HasFrames)
-                    throw new InvalidOperationException($"Cannot get {nameof(CurrentFrame)} of the empty replay");
+                    throw new InvalidOperationException($"Attempted to get {nameof(CurrentFrame)} of an empty replay");
 
-                if (!currentFrameIndex.HasValue)
-                    return null;
-
-                return (TFrame)Frames[currentFrameIndex.Value];
+                return (TFrame)Frames[Math.Max(0, currentFrameIndex)];
             }
         }
 
+        /// <summary>
+        /// The next frame of the replay.
+        /// The start time is always greater or equals to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
+        /// If it is before the first frame of the replay or the after the last frame of the replay, <see cref="CurrentFrame"/> and <see cref="NextFrame"/> agree.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">The replay is empty.</exception>
         public TFrame NextFrame
         {
             get
             {
                 if (!HasFrames)
-                    throw new InvalidOperationException($"Cannot get {nameof(NextFrame)} of the empty replay");
+                    throw new InvalidOperationException($"Attempted to get {nameof(NextFrame)} of an empty replay");
 
-                if (!currentFrameIndex.HasValue)
-                    return currentDirection > 0 ? (TFrame)Frames[0] : null;
-
-                int nextFrame = clampedNextFrameIndex;
-
-                if (nextFrame == currentFrameIndex.Value)
-                    return null;
-
-                return (TFrame)Frames[clampedNextFrameIndex];
+                return (TFrame)Frames[Math.Min(currentFrameIndex + 1, Frames.Count - 1)];
             }
         }
 
-        private int? currentFrameIndex;
-
-        private int clampedNextFrameIndex =>
-            currentFrameIndex.HasValue ? Math.Clamp(currentFrameIndex.Value + currentDirection, 0, Frames.Count - 1) : 0;
-
-        protected FramedReplayInputHandler(Replay replay)
-        {
-            this.replay = replay;
-        }
-
-        private const double sixty_frame_time = 1000.0 / 60;
-
-        protected virtual double AllowedImportantTimeSpan => sixty_frame_time * 1.2;
-
-        protected double? CurrentTime { get; private set; }
-
-        private int currentDirection = 1;
-
         /// <summary>
         /// When set, we will ensure frames executed by nested drawables are frame-accurate to replay data.
         /// Disabling this can make replay playback smoother (useful for autoplay, currently).
         /// </summary>
         public bool FrameAccuratePlayback;
 
-        public bool HasFrames => Frames.Count > 0;
+        // This input handler should be enabled only if there is at least one replay frame.
+        public override bool IsActive => HasFrames;
+
+        // Can make it non-null but that is a breaking change.
+        protected double? CurrentTime { get; private set; }
+
+        protected virtual double AllowedImportantTimeSpan => sixty_frame_time * 1.2;
+
+        protected List<ReplayFrame> Frames => replay.Frames;
+
+        private readonly Replay replay;
+
+        private int currentFrameIndex;
+
+        private const double sixty_frame_time = 1000.0 / 60;
+
+        protected FramedReplayInputHandler(Replay replay)
+        {
+            // This replay frame ordering should be enforced on the Replay type
+            replay.Frames.Sort((x, y) => x.Time.CompareTo(y.Time));
+
+            this.replay = replay;
+            currentFrameIndex = -1;
+            CurrentTime = double.NegativeInfinity;
+        }
 
         private bool inImportantSection
         {
@@ -89,13 +100,8 @@ namespace osu.Game.Rulesets.Replays
                 if (!HasFrames || !FrameAccuratePlayback)
                     return false;
 
-                var frame = currentDirection > 0 ? CurrentFrame : NextFrame;
-
-                if (frame == null)
-                    return false;
-
-                return IsImportant(frame) && // a button is in a pressed state
-                       Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
+                return IsImportant(CurrentFrame) && // a button is in a pressed state
+                       Math.Abs(CurrentTime - NextFrame.Time ?? 0) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
             }
         }
 
@@ -110,71 +116,52 @@ namespace osu.Game.Rulesets.Replays
         /// <returns>The usable time value. If null, we should not advance time as we do not have enough data.</returns>
         public override double? SetFrameFromTime(double time)
         {
-            updateDirection(time);
-
-            Debug.Assert(currentDirection != 0);
-
             if (!HasFrames)
             {
-                // in the case all frames are received, allow time to progress regardless.
+                // In the case all frames are received, allow time to progress regardless.
                 if (replay.HasReceivedAllFrames)
                     return CurrentTime = time;
 
                 return null;
             }
 
-            TFrame next = NextFrame;
+            double frameStart = getFrameTime(currentFrameIndex);
+            double frameEnd = getFrameTime(currentFrameIndex + 1);
 
-            // if we have a next frame, check if it is before or at the current time in playback, and advance time to it if so.
-            if (next != null)
+            // If the proposed time is after the current frame end time, we progress forwards.
+            // If the proposed time is before the current frame start time, and we are at the frame boundary, we progress backwards.
+            if (frameEnd <= time)
             {
-                int compare = time.CompareTo(next.Time);
-
-                if (compare == 0 || compare == currentDirection)
-                {
-                    currentFrameIndex = clampedNextFrameIndex;
-                    return CurrentTime = CurrentFrame.Time;
-                }
+                time = frameEnd;
+                currentFrameIndex++;
             }
+            else if (time < frameStart && CurrentTime == frameStart)
+                currentFrameIndex--;
 
-            // at this point, the frame index can't be advanced.
-            // even so, we may be able to propose the clock progresses forward due to being at an extent of the replay,
-            // or moving towards the next valid frame (ie. interpolating in a non-important section).
+            frameStart = getFrameTime(currentFrameIndex);
+            frameEnd = getFrameTime(currentFrameIndex + 1);
 
-            // the exception is if currently in an important section, which is respected above all.
-            if (inImportantSection)
+            // Pause until more frames are arrived.
+            if (WaitingNextFrame && frameStart < time)
             {
-                Debug.Assert(next != null || !replay.HasReceivedAllFrames);
+                CurrentTime = frameStart;
                 return null;
             }
 
-            // if a next frame does exist, allow interpolation.
-            if (next != null)
-                return CurrentTime = time;
+            CurrentTime = Math.Clamp(time, frameStart, frameEnd);
 
-            // if all frames have been received, allow playing beyond extents.
-            if (replay.HasReceivedAllFrames)
-                return CurrentTime = time;
-
-            // if not all frames are received but we are before the first frame, allow playing.
-            if (time < Frames[0].Time)
-                return CurrentTime = time;
-
-            // in the case we have no next frames and haven't received enough frame data, block.
-            return null;
+            // In an important section, a mid-frame time cannot be used and a null is returned instead.
+            return inImportantSection && frameStart < time && time < frameEnd ? null : CurrentTime;
         }
 
-        private void updateDirection(double time)
+        private double getFrameTime(int index)
         {
-            if (!CurrentTime.HasValue)
-            {
-                currentDirection = 1;
-            }
-            else
-            {
-                currentDirection = time.CompareTo(CurrentTime);
-                if (currentDirection == 0) currentDirection = 1;
-            }
+            if (index < 0)
+                return double.NegativeInfinity;
+            if (index >= Frames.Count)
+                return double.PositiveInfinity;
+
+            return Frames[index].Time;
         }
     }
 }

From 3c28c09ab5073c20a8eaebb8ce043a6cdc16b77f Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 16:18:35 +0900
Subject: [PATCH 08990/10326] Add more FramedReplayInputHandler tests

---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 100 ++++++++++++++++--
 1 file changed, 89 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index b4fc081a2a..64af4b6db6 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -20,23 +20,15 @@ namespace osu.Game.Tests.NonVisual
         {
             handler = new TestInputHandler(replay = new Replay
             {
-                Frames = new List<ReplayFrame>
-                {
-                    new TestReplayFrame(0),
-                    new TestReplayFrame(1000),
-                    new TestReplayFrame(2000),
-                    new TestReplayFrame(3000, true),
-                    new TestReplayFrame(4000, true),
-                    new TestReplayFrame(5000, true),
-                    new TestReplayFrame(7000, true),
-                    new TestReplayFrame(8000),
-                }
+                HasReceivedAllFrames = false
             });
         }
 
         [Test]
         public void TestNormalPlayback()
         {
+            setReplayFrames();
+
             setTime(0, 0);
             confirmCurrentFrame(0);
             confirmNextFrame(1);
@@ -102,6 +94,8 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestIntroTime()
         {
+            setReplayFrames();
+
             setTime(-1000, -1000);
             confirmCurrentFrame(0);
             confirmNextFrame(0);
@@ -118,6 +112,8 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestBasicRewind()
         {
+            setReplayFrames();
+
             setTime(2800, 0);
             setTime(2800, 1000);
             setTime(2800, 2000);
@@ -156,6 +152,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestRewindInsideImportantSection()
         {
+            setReplayFrames();
             fastForwardToPoint(3000);
 
             setTime(4000, 4000);
@@ -198,6 +195,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestRewindOutOfImportantSection()
         {
+            setReplayFrames();
             fastForwardToPoint(3500);
 
             confirmCurrentFrame(3);
@@ -216,6 +214,86 @@ namespace osu.Game.Tests.NonVisual
             confirmNextFrame(3);
         }
 
+        [Test]
+        public void TestReplayStreaming()
+        {
+            // no frames are arrived yet
+            setTime(0, null);
+            setTime(1000, null);
+            Assert.IsTrue(handler.WaitingNextFrame, "Should be waiting for the first frame");
+
+            replay.Frames.Add(new TestReplayFrame(0));
+            replay.Frames.Add(new TestReplayFrame(1000));
+
+            // should always play from beginning
+            setTime(1000, 0);
+            confirmCurrentFrame(0);
+            Assert.IsFalse(handler.WaitingNextFrame, "Should not be waiting yet");
+            setTime(1000, 1000);
+            confirmCurrentFrame(1);
+            confirmNextFrame(1);
+            Assert.IsTrue(handler.WaitingNextFrame, "Should be waiting");
+
+            // cannot seek beyond the last frame
+            setTime(1500, null);
+            confirmCurrentFrame(1);
+
+            setTime(-100, 0);
+            confirmCurrentFrame(0);
+
+            // can seek to the point before the first frame, however
+            setTime(-100, -100);
+            confirmCurrentFrame(0);
+            confirmNextFrame(0);
+
+            fastForwardToPoint(1000);
+            setTime(3000, null);
+            replay.Frames.Add(new TestReplayFrame(2000));
+            confirmCurrentFrame(1);
+            setTime(1000, 1000);
+            setTime(3000, 2000);
+        }
+
+        [Test]
+        public void TestMultipleFramesSameTime()
+        {
+            replay.Frames.Add(new TestReplayFrame(0));
+            replay.Frames.Add(new TestReplayFrame(0));
+            replay.Frames.Add(new TestReplayFrame(1000));
+            replay.Frames.Add(new TestReplayFrame(1000));
+            replay.Frames.Add(new TestReplayFrame(2000));
+
+            // forward direction is prioritized when multiple frames have the same time.
+            setTime(0, 0);
+            setTime(0, 0);
+
+            setTime(2000, 1000);
+            setTime(2000, 1000);
+
+            setTime(1000, 1000);
+            setTime(1000, 1000);
+            setTime(-100, 1000);
+            setTime(-100, 0);
+            setTime(-100, 0);
+            setTime(-100, -100);
+        }
+
+        private void setReplayFrames()
+        {
+            replay.Frames = new List<ReplayFrame>
+            {
+                new TestReplayFrame(0),
+                new TestReplayFrame(1000),
+                new TestReplayFrame(2000),
+                new TestReplayFrame(3000, true),
+                new TestReplayFrame(4000, true),
+                new TestReplayFrame(5000, true),
+                new TestReplayFrame(7000, true),
+                new TestReplayFrame(8000),
+            };
+            replay.HasReceivedAllFrames = true;
+        }
+
         private void fastForwardToPoint(double destination)
         {
             for (int i = 0; i < 1000; i++)

From 0eab9daf13bb406d2b82c1f624dbb7e483f0ab40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 16:41:36 +0900
Subject: [PATCH 08991/10326] Update existing overlay containers to not block
 scroll input

---
 osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs      | 2 ++
 .../Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs | 2 ++
 osu.Game/Screens/Play/GameplayMenuOverlay.cs                    | 2 ++
 osu.Game/Screens/Play/SongProgress.cs                           | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index fbf2ffd4bd..e168f265dd 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Graphics.Containers
         protected virtual string PopInSampleName => "UI/overlay-pop-in";
         protected virtual string PopOutSampleName => "UI/overlay-pop-out";
 
+        protected override bool BlockScrollInput => false;
+
         protected override bool BlockNonPositionalInput => true;
 
         /// <summary>
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
index ea3951fc3b..5699da740c 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
         protected OnlinePlayComposite Settings { get; set; }
 
+        protected override bool BlockScrollInput => false;
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index f938839be3..4a28da0dde 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Screens.Play
 
         protected override bool BlockNonPositionalInput => true;
 
+        protected override bool BlockScrollInput => false;
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         public Action OnRetry;
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index acf4640aa4..6c7cb9376c 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -45,6 +45,8 @@ namespace osu.Game.Screens.Play
         public override bool HandleNonPositionalInput => AllowSeeking.Value;
         public override bool HandlePositionalInput => AllowSeeking.Value;
 
+        protected override bool BlockScrollInput => false;
+
         private double firstHitTime => objects.First().StartTime;
 
         private IEnumerable<HitObject> objects;

From 65ebdd8f7a48c57f31e46acd21ac3369f8521be9 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:08:08 +0200
Subject: [PATCH 08992/10326] Move check origin from `IssueTemplate` to `Issue`

As a result we can also make check an interface, and need to provide the check itself when constructing an issue.
---
 .../Edit/Checks/CheckOffscreenObjects.cs      | 14 +++++------
 .../Edit/OsuBeatmapVerifier.cs                |  2 +-
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  2 +-
 .../Rulesets/Edit/Checks/CheckBackground.cs   | 12 +++++-----
 .../Rulesets/Edit/Checks/Components/Check.cs  | 14 ++++-------
 .../Rulesets/Edit/Checks/Components/Issue.cs  | 23 +++++++++++--------
 .../Edit/Checks/Components/IssueTemplate.cs   |  5 ----
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  |  2 +-
 8 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 252f65ab5a..b34c9966a4 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -9,7 +9,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Checks
 {
-    public class CheckOffscreenObjects : Check
+    public class CheckOffscreenObjects : ICheck
     {
         // These are close approximates to the edges of the screen
         // in gameplay on a 4:3 aspect ratio for osu!stable.
@@ -22,13 +22,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
         // (higher = more performant, but higher false-negative chance).
         private const int path_step_size = 5;
 
-        public override CheckMetadata Metadata { get; } = new CheckMetadata
+        public CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Compose,
             description: "Offscreen hitobjects."
         );
 
-        public override IEnumerable<IssueTemplate> PossibleTemplates => new[]
+        public IEnumerable<IssueTemplate> PossibleTemplates => new[]
         {
             templateOffscreen,
             templateOffscreenSliderPath
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             unformattedMessage: "This slider goes offscreen here on a 4:3 aspect ratio."
         );
 
-        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
             foreach (var hitobject in beatmap.HitObjects)
             {
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
                     case HitCircle circle:
                     {
                         if (isOffscreen(circle.StackedPosition, circle.Radius))
-                            yield return new Issue(circle, templateOffscreen);
+                            yield return new Issue(this, circle, templateOffscreen);
 
                         break;
                     }
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
                 // `SpanDuration` ensures we don't include reverses.
                 double time = slider.StartTime + progress * slider.SpanDuration;
-                yield return new Issue(slider, templateOffscreenSliderPath) { Time = time };
+                yield return new Issue(this, slider, templateOffscreenSliderPath) { Time = time };
 
                 yield break;
             }
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             if (!isOffscreen(slider.StackedEndPosition, slider.Radius))
                 yield break;
 
-            yield return new Issue(slider, templateOffscreenSliderPath) { Time = slider.EndTime };
+            yield return new Issue(this, slider, templateOffscreenSliderPath) { Time = slider.EndTime };
         }
 
         private bool isOffscreen(Vector2 position, double radius)
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 272612dbaf..2faa239720 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuBeatmapVerifier : BeatmapVerifier
     {
-        private readonly List<Check> checks = new List<Check>
+        private readonly List<ICheck> checks = new List<ICheck>
         {
             new CheckOffscreenObjects()
         };
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index f67a068525..1d0508705a 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Edit
         /// Checks which are performed regardless of ruleset.
         /// These handle things like beatmap metadata, timing, and other ruleset agnostic elements.
         /// </summary>
-        private readonly IReadOnlyList<Check> generalChecks = new List<Check>
+        private readonly IReadOnlyList<ICheck> generalChecks = new List<ICheck>
         {
             new CheckBackground()
         };
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 22f98b6fd7..c922aa03c0 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -8,15 +8,15 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit.Checks
 {
-    public class CheckBackground : Check
+    public class CheckBackground : ICheck
     {
-        public override CheckMetadata Metadata { get; } = new CheckMetadata
+        public CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Resources,
             description: "Missing background."
         );
 
-        public override IEnumerable<IssueTemplate> PossibleTemplates => new[]
+        public IEnumerable<IssueTemplate> PossibleTemplates => new[]
         {
             templateNoneSet,
             templateDoesNotExist
@@ -34,11 +34,11 @@ namespace osu.Game.Rulesets.Edit.Checks
             unformattedMessage: "The background file \"{0}\" is does not exist."
         );
 
-        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
             if (beatmap.Metadata.BackgroundFile == null)
             {
-                yield return new Issue(templateNoneSet);
+                yield return new Issue(this, templateNoneSet);
 
                 yield break;
             }
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             if (file != null)
                 yield break;
 
-            yield return new Issue(templateDoesNotExist, beatmap.Metadata.BackgroundFile);
+            yield return new Issue(this, templateDoesNotExist, beatmap.Metadata.BackgroundFile);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 7c039d1572..f355ae734e 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -6,28 +6,22 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Edit.Checks.Components
 {
-    public abstract class Check
+    public interface ICheck
     {
         /// <summary>
         /// The metadata for this check.
         /// </summary>
-        public abstract CheckMetadata Metadata { get; }
+        public CheckMetadata Metadata { get; }
 
         /// <summary>
         /// All possible templates for issues that this check may return.
         /// </summary>
-        public abstract IEnumerable<IssueTemplate> PossibleTemplates { get; }
+        public IEnumerable<IssueTemplate> PossibleTemplates { get; }
 
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
         /// <param name="beatmap">The beatmap to run the check on.</param>
-        public abstract IEnumerable<Issue> Run(IBeatmap beatmap);
-
-        protected Check()
-        {
-            foreach (var template in PossibleTemplates)
-                template.Origin = this;
-        }
+        public IEnumerable<Issue> Run(IBeatmap beatmap);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index 7241fabf5b..d0f7df857b 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -26,38 +26,41 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// </summary>
         public IssueTemplate Template;
 
+        /// <summary>
+        /// The check that this issue originates from.
+        /// </summary>
+        public ICheck Check;
+
         /// <summary>
         /// The arguments that give this issue its context, based on the <see cref="IssueTemplate"/>. These are then substituted into the <see cref="IssueTemplate.UnformattedMessage"/>.
         /// This could for instance include timestamps, which diff is being compared to, what some volume is, etc.
         /// </summary>
         public object[] Arguments;
 
-        public Issue(IssueTemplate template, params object[] args)
+        public Issue(ICheck check, IssueTemplate template, params object[] args)
         {
+            Check = check;
             Time = null;
             HitObjects = Array.Empty<HitObject>();
             Template = template;
             Arguments = args;
-
-            if (template.Origin == null)
-                throw new ArgumentException("A template had no origin. Make sure the `Templates()` method contains all templates used.");
         }
 
-        public Issue(double? time, IssueTemplate template, params object[] args)
-            : this(template, args)
+        public Issue(ICheck check, double? time, IssueTemplate template, params object[] args)
+            : this(check, template, args)
         {
             Time = time;
         }
 
-        public Issue(HitObject hitObject, IssueTemplate template, params object[] args)
-            : this(template, args)
+        public Issue(ICheck check, HitObject hitObject, IssueTemplate template, params object[] args)
+            : this(check, template, args)
         {
             Time = hitObject.StartTime;
             HitObjects = new[] { hitObject };
         }
 
-        public Issue(IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
-            : this(template, args)
+        public Issue(ICheck check, IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
+            : this(check, template, args)
         {
             var hitObjectList = hitObjects.ToList();
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index a1156c7c72..4a5f98ca5f 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -14,11 +14,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         private static readonly Color4 negligible_green = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
         private static readonly Color4 error_gray = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
 
-        /// <summary>
-        /// The check that this template originates from.
-        /// </summary>
-        public Check Origin;
-
         /// <summary>
         /// The type of the issue.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 0c4aa04ff3..c0c4a040f6 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Edit.Verify
             {
                 table.Issues = beatmapVerifier.Run(Beatmap)
                                               .OrderByDescending(issue => issue.Template.Type)
-                                              .ThenByDescending(issue => issue.Template.Origin.Metadata.Category);
+                                              .ThenByDescending(issue => issue.Check.Metadata.Category);
             }
         }
     }

From a2fc9c398fc731e36c3472bc37a5c153af7d5378 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:08:30 +0200
Subject: [PATCH 08993/10326] Rename `CreateChecker` -> `CreateBeatmapVerifier`

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs          | 2 +-
 osu.Game/Rulesets/Ruleset.cs                 | 2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 1658846e98..63da100a04 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
-        public override BeatmapVerifier CreateChecker() => new OsuBeatmapVerifier();
+        public override BeatmapVerifier CreateBeatmapVerifier() => new OsuBeatmapVerifier();
 
         public override string Description => "osu!";
 
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 088bcc7712..2a29d88c89 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
-        public virtual BeatmapVerifier CreateChecker() => null;
+        public virtual BeatmapVerifier CreateBeatmapVerifier() => null;
 
         public virtual Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.QuestionCircle };
 
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index c0c4a040f6..806029df4d 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Edit.Verify
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
             ruleset = parent.Get<IBindable<WorkingBeatmap>>().Value.BeatmapInfo.Ruleset?.CreateInstance();
-            beatmapVerifier = ruleset?.CreateChecker();
+            beatmapVerifier = ruleset?.CreateBeatmapVerifier();
 
             return dependencies;
         }

From f1b8171e389e5df4eb67b567d4e48586a3001c73 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 17:13:48 +0900
Subject: [PATCH 08994/10326] Remove `#nullable true` for now to suppress
 inspector

---
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index f527c0e105..45bcd0bc19 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.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.
 
-#nullable enable
-
 using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;

From b5954a55adc3af47c27ea4c2b354e320d9b6cf4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 17:46:14 +0900
Subject: [PATCH 08995/10326] Remove empty <returns> xmldoc

---
 osu.Desktop/Program.cs                                          | 1 -
 .../Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs  | 1 -
 osu.Game.Tournament/TournamentGameBase.cs                       | 1 -
 osu.Game/Beatmaps/IBeatmap.cs                                   | 1 -
 osu.Game/Configuration/SettingsStore.cs                         | 1 -
 osu.Game/Graphics/Backgrounds/Triangles.cs                      | 1 -
 osu.Game/IO/Serialization/IJsonSerializable.cs                  | 1 -
 osu.Game/Input/KeyBindingStore.cs                               | 1 -
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs        | 1 -
 osu.Game/Rulesets/Objects/SliderPath.cs                         | 2 --
 osu.Game/Rulesets/Ruleset.cs                                    | 1 -
 osu.Game/Rulesets/Scoring/HitWindows.cs                         | 1 -
 osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs    | 1 -
 osu.Game/Screens/Ranking/ScorePanelList.cs                      | 1 -
 osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs                | 1 -
 osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs              | 1 -
 osu.Game/Utils/Optional.cs                                      | 1 -
 17 files changed, 18 deletions(-)

diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index d06c4b6746..5fb09c0cef 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -69,7 +69,6 @@ namespace osu.Desktop
         /// Allow a maximum of one unhandled exception, per second of execution.
         /// </summary>
         /// <param name="arg"></param>
-        /// <returns></returns>
         private static bool handleException(Exception arg)
         {
             bool continueExecution = Interlocked.Decrement(ref allowableExceptions) >= 0;
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index c81710ed18..26e5d381e2 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -482,7 +482,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// Retrieves the sample info list at a point in time.
         /// </summary>
         /// <param name="time">The time to retrieve the sample info list from.</param>
-        /// <returns></returns>
         private IList<HitSampleInfo> sampleInfoListAt(int time) => nodeSamplesAt(time)?.First() ?? HitObject.Samples;
 
         /// <summary>
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 2ee52c35aa..92eb7ac713 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -141,7 +141,6 @@ namespace osu.Game.Tournament
         /// <summary>
         /// Add missing player info based on user IDs.
         /// </summary>
-        /// <returns></returns>
         private bool addPlayers()
         {
             bool addedInfo = false;
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 9847ea020a..769b33009a 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Returns statistics for the <see cref="HitObjects"/> contained in this beatmap.
         /// </summary>
-        /// <returns></returns>
         IEnumerable<BeatmapStatistic> GetStatistics();
 
         /// <summary>
diff --git a/osu.Game/Configuration/SettingsStore.cs b/osu.Game/Configuration/SettingsStore.cs
index f8c9bdeaf8..86e84b0732 100644
--- a/osu.Game/Configuration/SettingsStore.cs
+++ b/osu.Game/Configuration/SettingsStore.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Configuration
         /// </summary>
         /// <param name="rulesetId">The ruleset's internal ID.</param>
         /// <param name="variant">An optional variant.</param>
-        /// <returns></returns>
         public List<DatabasedSetting> Query(int? rulesetId = null, int? variant = null) =>
             ContextFactory.Get().DatabasedSetting.Where(b => b.RulesetID == rulesetId && b.Variant == variant).ToList();
 
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index 0e9382279a..67cee883c8 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -346,7 +346,6 @@ namespace osu.Game.Graphics.Backgrounds
             /// such that the smaller triangles appear on top.
             /// </summary>
             /// <param name="other"></param>
-            /// <returns></returns>
             public int CompareTo(TriangleParticle other) => other.Scale.CompareTo(Scale);
         }
     }
diff --git a/osu.Game/IO/Serialization/IJsonSerializable.cs b/osu.Game/IO/Serialization/IJsonSerializable.cs
index ba188963ea..c8d5ce39a6 100644
--- a/osu.Game/IO/Serialization/IJsonSerializable.cs
+++ b/osu.Game/IO/Serialization/IJsonSerializable.cs
@@ -22,7 +22,6 @@ namespace osu.Game.IO.Serialization
         /// <summary>
         /// Creates the default <see cref="JsonSerializerSettings"/> that should be used for all <see cref="IJsonSerializable"/>s.
         /// </summary>
-        /// <returns></returns>
         public static JsonSerializerSettings CreateGlobalSettings() => new JsonSerializerSettings
         {
             ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index b25b00eb84..9d0cfedc03 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -85,7 +85,6 @@ namespace osu.Game.Input
         /// </summary>
         /// <param name="rulesetId">The ruleset's internal ID.</param>
         /// <param name="variant">An optional variant.</param>
-        /// <returns></returns>
         public List<DatabasedKeyBinding> Query(int? rulesetId = null, int? variant = null) =>
             ContextFactory.Get().DatabasedKeyBinding.Where(b => b.RulesetID == rulesetId && b.Variant == variant).ToList();
 
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 6da9f12b50..d95b246c96 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -574,7 +574,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Calculate the position to be used for sample playback at a specified X position (0..1).
         /// </summary>
         /// <param name="position">The lookup X position. Generally should be <see cref="SamplePlaybackPosition"/>.</param>
-        /// <returns></returns>
         protected double CalculateSamplePlaybackBalance(double position)
         {
             const float balance_adjust_amount = 0.4f;
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 61f5f94142..e64298f98d 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -147,7 +147,6 @@ namespace osu.Game.Rulesets.Objects
         /// to 1 (end of the path).
         /// </summary>
         /// <param name="progress">Ranges from 0 (beginning of the path) to 1 (end of the path).</param>
-        /// <returns></returns>
         public Vector2 PositionAt(double progress)
         {
             ensureValid();
@@ -161,7 +160,6 @@ namespace osu.Game.Rulesets.Objects
         /// The first point has a PathType which all other points inherit.
         /// </summary>
         /// <param name="controlPoint">One of the control points in the segment.</param>
-        /// <returns></returns>
         public List<PathControlPoint> PointsInSegment(PathControlPoint controlPoint)
         {
             bool found = false;
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 38d30a2e31..efc8b50e3c 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -146,7 +146,6 @@ namespace osu.Game.Rulesets
         /// <param name="beatmap">The beatmap to create the hit renderer for.</param>
         /// <param name="mods">The <see cref="Mod"/>s to apply.</param>
         /// <exception cref="BeatmapInvalidForRulesetException">Unable to successfully load the beatmap to be usable with this ruleset.</exception>
-        /// <returns></returns>
         public abstract DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null);
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Scoring/HitWindows.cs b/osu.Game/Rulesets/Scoring/HitWindows.cs
index 018b50bd3d..410614de07 100644
--- a/osu.Game/Rulesets/Scoring/HitWindows.cs
+++ b/osu.Game/Rulesets/Scoring/HitWindows.cs
@@ -62,7 +62,6 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// Retrieves a mapping of <see cref="HitResult"/>s to their timing windows for all allowed <see cref="HitResult"/>s.
         /// </summary>
-        /// <returns></returns>
         public IEnumerable<(HitResult result, double length)> GetAllAvailableWindows()
         {
             for (var result = HitResult.Meh; result <= HitResult.Perfect; ++result)
diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
index a7b0fb05e3..dcf5f8a788 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
@@ -12,7 +12,6 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
         /// <summary>
         /// Whether this <see cref="RadioButton"/> is selected.
         /// </summary>
-        /// <returns></returns>
         public readonly BindableBool Selected;
 
         /// <summary>
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 77b3d8fc3b..441c9e048a 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -226,7 +226,6 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Enumerates all <see cref="ScorePanel"/>s contained in this <see cref="ScorePanelList"/>.
         /// </summary>
-        /// <returns></returns>
         public IEnumerable<ScorePanel> GetScorePanels() => flow.Select(t => t.Panel);
 
         /// <summary>
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index fcf20a2eb2..5ef2458919 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -189,7 +189,6 @@ namespace osu.Game.Tests.Beatmaps
         /// <summary>
         /// Creates the <see cref="Ruleset"/> applicable to this <see cref="BeatmapConversionTest{TConvertMapping,TConvertValue}"/>.
         /// </summary>
-        /// <returns></returns>
         protected abstract Ruleset CreateRuleset();
 
         private class ConvertResult
diff --git a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
index 76f97db59f..54a83f4305 100644
--- a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
@@ -17,7 +17,6 @@ namespace osu.Game.Tests.Beatmaps
         /// <summary>
         /// Creates the <see cref="Ruleset"/> whose legacy mod conversion is to be tested.
         /// </summary>
-        /// <returns></returns>
         protected abstract Ruleset CreateRuleset();
 
         protected void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods)
diff --git a/osu.Game/Utils/Optional.cs b/osu.Game/Utils/Optional.cs
index 9f8a1c2e62..fdb7623be5 100644
--- a/osu.Game/Utils/Optional.cs
+++ b/osu.Game/Utils/Optional.cs
@@ -37,7 +37,6 @@ namespace osu.Game.Utils
         /// Shortcase for: <c>optional.HasValue ? optional.Value : fallback</c>.
         /// </remarks>
         /// <param name="fallback">The fallback value to return if <see cref="HasValue"/> is <c>false</c>.</param>
-        /// <returns></returns>
         public T GetOr(T fallback) => HasValue ? Value : fallback;
 
         public static implicit operator Optional<T>(T value) => new Optional<T>(value);

From 6d18b3db00a5f3f045dc35cdc6a740bae7156f90 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 18:49:38 +0900
Subject: [PATCH 08996/10326] Avoid empty list allocation

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index fb56a5d93d..1c0d820a3d 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -102,10 +102,13 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
+        // to avoid allocation
+        private readonly List<IInput> emptyInputList = new List<IInput>();
+
         protected override List<IInput> GetPendingInputs()
         {
             if (replayInputHandler != null && !replayInputHandler.IsActive)
-                return new List<IInput>();
+                return emptyInputList;
 
             return base.GetPendingInputs();
         }

From 359fae895f843ff7b8775917d443a89556705d07 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 18:50:25 +0900
Subject: [PATCH 08997/10326] Rename property

---
 osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs | 6 +++---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs     | 4 ++--
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index 64af4b6db6..954871595e 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.NonVisual
             // no frames are arrived yet
             setTime(0, null);
             setTime(1000, null);
-            Assert.IsTrue(handler.WaitingNextFrame, "Should be waiting for the first frame");
+            Assert.IsTrue(handler.WaitingForFrame, "Should be waiting for the first frame");
 
             replay.Frames.Add(new TestReplayFrame(0));
             replay.Frames.Add(new TestReplayFrame(1000));
@@ -228,11 +228,11 @@ namespace osu.Game.Tests.NonVisual
             // should always play from beginning
             setTime(1000, 0);
             confirmCurrentFrame(0);
-            Assert.IsFalse(handler.WaitingNextFrame, "Should not be waiting yet");
+            Assert.IsFalse(handler.WaitingForFrame, "Should not be waiting yet");
             setTime(1000, 1000);
             confirmCurrentFrame(1);
             confirmNextFrame(1);
-            Assert.IsTrue(handler.WaitingNextFrame, "Should be waiting");
+            Assert.IsTrue(handler.WaitingForFrame, "Should be waiting");
 
             // cannot seek beyond the last frame
             setTime(1500, null);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 9f1faa8e26..397b37718d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             waitForPlayer();
             AddAssert("ensure frames arrived", () => replayHandler.HasFrames);
 
-            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingNextFrame);
+            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingForFrame);
             checkPaused(true);
 
             double? pausedTime = null;
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             sendFrames();
 
-            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingNextFrame);
+            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingForFrame);
             checkPaused(true);
 
             AddAssert("time advanced", () => currentFrameStableTime > pausedTime);
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 45bcd0bc19..23cc311d79 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Replays
         /// <summary>
         /// Whether we are waiting for new frames to be received.
         /// </summary>
-        public bool WaitingNextFrame => !replay.HasReceivedAllFrames && currentFrameIndex == Frames.Count - 1;
+        public bool WaitingForFrame => !replay.HasReceivedAllFrames && currentFrameIndex == Frames.Count - 1;
 
         /// <summary>
         /// The current frame of the replay.
@@ -140,7 +140,7 @@ namespace osu.Game.Rulesets.Replays
             frameEnd = getFrameTime(currentFrameIndex + 1);
 
             // Pause until more frames are arrived.
-            if (WaitingNextFrame && frameStart < time)
+            if (WaitingForFrame && frameStart < time)
             {
                 CurrentTime = frameStart;
                 return null;

From 31d36071052bf72f9a82256242cbb6fa7c2b0e38 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 18:50:54 +0900
Subject: [PATCH 08998/10326] Add TODO comment

---
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 23cc311d79..c3cd957f0d 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Replays
 
         /// <summary>
         /// The next frame of the replay.
-        /// The start time is always greater or equals to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
+        /// The start time is always greater or equal to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
         /// If it is before the first frame of the replay or the after the last frame of the replay, <see cref="CurrentFrame"/> and <see cref="NextFrame"/> agree.
         /// </summary>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
@@ -83,7 +83,8 @@ namespace osu.Game.Rulesets.Replays
 
         protected FramedReplayInputHandler(Replay replay)
         {
-            // This replay frame ordering should be enforced on the Replay type
+            // TODO: This replay frame ordering should be enforced on the Replay type.
+            // Currently, the ordering can be broken if the frames are added after this construction.
             replay.Frames.Sort((x, y) => x.Time.CompareTo(y.Time));
 
             this.replay = replay;

From cc2acf5e548fb11873f1d20d480b27e35ced57fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 19:05:23 +0900
Subject: [PATCH 08999/10326] Fix ctrl-dragging on an existing selection
 causing deselection of the hovered object

---
 .../Compose/Components/BlueprintContainer.cs  | 38 ++++++++++++++-----
 .../Compose/Components/SelectionHandler.cs    | 37 +++++++++++++++---
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 5699be4560..64cf0e7512 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -135,11 +135,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (!beginClickSelection(e)) return true;
+            bool selectionPerformed = beginClickSelection(e);
 
+            // even if a selection didn't occur, a drag event may still move the selection.
             prepareSelectionMovement();
 
-            return e.Button == MouseButton.Left;
+            return selectionPerformed || e.Button == MouseButton.Left;
         }
 
         private SelectionBlueprint clickedBlueprint;
@@ -154,7 +155,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // Deselection should only occur if no selected blueprints are hovered
             // A special case for when a blueprint was selected via this click is added since OnClick() may occur outside the hitobject and should not trigger deselection
-            if (endClickSelection() || clickedBlueprint != null)
+            if (endClickSelection(e) || clickedBlueprint != null)
                 return true;
 
             deselectAll();
@@ -177,7 +178,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void OnMouseUp(MouseUpEvent e)
         {
             // Special case for when a drag happened instead of a click
-            Schedule(() => endClickSelection());
+            Schedule(() =>
+            {
+                endClickSelection(e);
+                clickSelectionBegan = false;
+                isDraggingBlueprint = false;
+            });
 
             finishSelectionMovement();
         }
@@ -226,7 +232,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     Beatmap.Update(obj);
 
                 changeHandler?.EndChange();
-                isDraggingBlueprint = false;
             }
 
             if (DragBox.State == Visibility.Visible)
@@ -355,13 +360,28 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Finishes the current blueprint selection.
         /// </summary>
+        /// <param name="e">The mouse event which triggered end of selection.</param>
         /// <returns>Whether a click selection was active.</returns>
-        private bool endClickSelection()
+        private bool endClickSelection(MouseButtonEvent e)
         {
-            if (!clickSelectionBegan)
-                return false;
+            if (!clickSelectionBegan && !isDraggingBlueprint)
+            {
+                // if a selection didn't occur, we may want to trigger a deselection.
+                if (e.ControlPressed && e.Button == MouseButton.Left)
+                {
+                    // Iterate from the top of the input stack (blueprints closest to the front of the screen first).
+                    // Priority is given to already-selected blueprints.
+                    foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
+                    {
+                        if (!blueprint.IsHovered) continue;
+
+                        return clickSelectionBegan = SelectionHandler.HandleDeselectionRequested(blueprint, e);
+                    }
+                }
+
+                return false;
+            }
 
-            clickSelectionBegan = false;
             return true;
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 018d4d081c..e5e1100797 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -228,12 +228,31 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
             }
 
-            if (e.ControlPressed && e.Button == MouseButton.Left)
+            // while holding control, we only want to add to selection, not replace an existing selection.
+            if (e.ControlPressed && e.Button == MouseButton.Left && !blueprint.IsSelected)
+            {
                 blueprint.ToggleSelection();
-            else
-                ensureSelected(blueprint);
+                return true;
+            }
 
-            return true;
+            return ensureSelected(blueprint);
+        }
+
+        /// <summary>
+        /// Handle a blueprint requesting selection.
+        /// </summary>
+        /// <param name="blueprint">The blueprint.</param>
+        /// <param name="e">The mouse event responsible for deselection.</param>
+        /// <returns>Whether a deselection was performed.</returns>
+        internal bool HandleDeselectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
+        {
+            if (blueprint.IsSelected)
+            {
+                blueprint.ToggleSelection();
+                return true;
+            }
+
+            return false;
         }
 
         private void handleQuickDeletion(SelectionBlueprint blueprint)
@@ -247,13 +266,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 deleteSelected();
         }
 
-        private void ensureSelected(SelectionBlueprint blueprint)
+        /// <summary>
+        /// Ensure the blueprint is in a selected state.
+        /// </summary>
+        /// <param name="blueprint">The blueprint to select.</param>
+        /// <returns>Whether selection state was changed.</returns>
+        private bool ensureSelected(SelectionBlueprint blueprint)
         {
             if (blueprint.IsSelected)
-                return;
+                return false;
 
             DeselectAll?.Invoke();
             blueprint.Select();
+            return true;
         }
 
         private void deleteSelected()

From b4c75ba3c6eb81a8cf88f36edc8738ee7e2e09df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 19:19:25 +0900
Subject: [PATCH 09000/10326] Fix TestQuickDeleteRemovesObject failing on
 second run

---
 .../Visual/Editing/TestSceneEditorQuickDelete.cs         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
index 9efd299fba..8a0f27b851 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestQuickDeleteRemovesSliderControlPoint()
         {
-            Slider slider = new Slider { StartTime = 1000 };
+            Slider slider = null;
 
             PathControlPoint[] points =
             {
@@ -62,7 +62,12 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("add slider", () =>
             {
-                slider.Path = new SliderPath(points);
+                slider = new Slider
+                {
+                    StartTime = 1000,
+                    Path = new SliderPath(points)
+                };
+
                 EditorBeatmap.Add(slider);
             });
 

From 905cd7c8eb9e7c3785ffa88e63cce5b4b7f2c024 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 19:22:07 +0900
Subject: [PATCH 09001/10326] 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 196d122a2a..c78dfb6a55 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="2021.410.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.410.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 71a6f0e5cd..92e05cb4a6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.410.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a389cc13dd..11124730c9 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.410.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From d2d7f77430181ce55d76eb7e2ef24613cfe69ca4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 19:50:24 +0900
Subject: [PATCH 09002/10326] Fix mods not being serialised correctly in
 ScoreInfo

---
 .../Online/TestAPIModJsonSerialization.cs     | 33 +++++++++++++
 osu.Game/Scoring/ScoreInfo.cs                 | 49 +++++++++----------
 2 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index 77f910c144..3afb7481b1 100644
--- a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -11,7 +11,10 @@ using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 
 namespace osu.Game.Tests.Online
 {
@@ -84,6 +87,36 @@ namespace osu.Game.Tests.Online
             Assert.That(converted?.OverallDifficulty.Value, Is.EqualTo(11));
         }
 
+        [Test]
+        public void TestDeserialiseScoreInfoWithEmptyMods()
+        {
+            var score = new ScoreInfo { Ruleset = new OsuRuleset().RulesetInfo };
+
+            var deserialised = JsonConvert.DeserializeObject<ScoreInfo>(JsonConvert.SerializeObject(score));
+
+            if (deserialised != null)
+                deserialised.Ruleset = new OsuRuleset().RulesetInfo;
+
+            Assert.That(deserialised?.Mods.Length, Is.Zero);
+        }
+
+        [Test]
+        public void TestDeserialiseScoreInfoWithCustomModSetting()
+        {
+            var score = new ScoreInfo
+            {
+                Ruleset = new OsuRuleset().RulesetInfo,
+                Mods = new Mod[] { new OsuModDoubleTime { SpeedChange = { Value = 2 } } }
+            };
+
+            var deserialised = JsonConvert.DeserializeObject<ScoreInfo>(JsonConvert.SerializeObject(score));
+
+            if (deserialised != null)
+                deserialised.Ruleset = new OsuRuleset().RulesetInfo;
+
+            Assert.That(((OsuModDoubleTime)deserialised?.Mods[0])?.SpeedChange.Value, Is.EqualTo(2));
+        }
+
         private class TestRuleset : Ruleset
         {
             public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[]
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index ef11c19e3f..df8f309ee0 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -10,6 +10,7 @@ using Newtonsoft.Json.Converters;
 using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
+using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -55,9 +56,10 @@ namespace osu.Game.Scoring
         [JsonIgnore]
         public virtual RulesetInfo Ruleset { get; set; }
 
+        private APIMod[] localAPIMods;
         private Mod[] mods;
 
-        [JsonProperty("mods")]
+        [JsonIgnore]
         [NotMapped]
         public Mod[] Mods
         {
@@ -66,45 +68,50 @@ namespace osu.Game.Scoring
                 if (mods != null)
                     return mods;
 
-                if (modsJson == null)
+                if (apiMods == null)
                     return Array.Empty<Mod>();
 
-                return getModsFromRuleset(JsonConvert.DeserializeObject<DeserializedMod[]>(modsJson));
+                var rulesetInstance = Ruleset.CreateInstance();
+                return apiMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
             }
             set
             {
-                modsJson = null;
+                localAPIMods = null;
                 mods = value;
             }
         }
 
-        private Mod[] getModsFromRuleset(DeserializedMod[] mods) => Ruleset.CreateInstance().GetAllMods().Where(mod => mods.Any(d => d.Acronym == mod.Acronym)).ToArray();
-
-        private string modsJson;
-
-        [JsonIgnore]
-        [Column("Mods")]
-        public string ModsJson
+        // Used for API serialisation/deserialisation.
+        [JsonProperty("mods")]
+        private APIMod[] apiMods
         {
             get
             {
-                if (modsJson != null)
-                    return modsJson;
+                if (localAPIMods != null)
+                    return localAPIMods;
 
                 if (mods == null)
-                    return null;
+                    return Array.Empty<APIMod>();
 
-                return modsJson = JsonConvert.SerializeObject(mods.Select(m => new DeserializedMod { Acronym = m.Acronym }));
+                return localAPIMods = mods.Select(m => new APIMod(m)).ToArray();
             }
             set
             {
-                modsJson = value;
+                localAPIMods = value;
 
-                // we potentially can't update this yet due to Ruleset being late-bound, so instead update on read as necessary.
+                // We potentially can't update this yet due to Ruleset being late-bound, so instead update on read as necessary.
                 mods = null;
             }
         }
 
+        // Used for database serialisation/deserialisation.
+        [Column("Mods")]
+        private string modsString
+        {
+            get => JsonConvert.SerializeObject(apiMods);
+            set => apiMods = JsonConvert.DeserializeObject<APIMod[]>(value);
+        }
+
         [NotMapped]
         [JsonProperty("user")]
         public User User { get; set; }
@@ -251,14 +258,6 @@ namespace osu.Game.Scoring
             }
         }
 
-        [Serializable]
-        protected class DeserializedMod : IMod
-        {
-            public string Acronym { get; set; }
-
-            public bool Equals(IMod other) => Acronym == other?.Acronym;
-        }
-
         public override string ToString() => $"{User} playing {Beatmap}";
 
         public bool Equals(ScoreInfo other)

From 982d8fa8b1ef8ce69a4456b8a31192f948314f09 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 20:49:26 +0900
Subject: [PATCH 09003/10326] Fix incorrect reference

---
 osu.Game/Scoring/ScoreInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index df8f309ee0..1e438edeea 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Scoring
                 if (mods != null)
                     return mods;
 
-                if (apiMods == null)
+                if (localAPIMods == null)
                     return Array.Empty<Mod>();
 
                 var rulesetInstance = Ruleset.CreateInstance();

From 625484468e4ba788e04b73b0c6b55614d8e30bdf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 20:49:37 +0900
Subject: [PATCH 09004/10326] Fix DB serialisation

---
 osu.Game/Scoring/ScoreInfo.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 1e438edeea..01b62f8b4f 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -105,8 +105,9 @@ namespace osu.Game.Scoring
         }
 
         // Used for database serialisation/deserialisation.
+        [JsonIgnore]
         [Column("Mods")]
-        private string modsString
+        public string ModsString
         {
             get => JsonConvert.SerializeObject(apiMods);
             set => apiMods = JsonConvert.DeserializeObject<APIMod[]>(value);

From 8413b0a5d32a7aa159bfc971f10b2b11bd058c5c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 20:49:44 +0900
Subject: [PATCH 09005/10326] Don't map api mods to DB

---
 osu.Game/Scoring/ScoreInfo.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 01b62f8b4f..312b5f46f4 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -83,6 +83,7 @@ namespace osu.Game.Scoring
 
         // Used for API serialisation/deserialisation.
         [JsonProperty("mods")]
+        [NotMapped]
         private APIMod[] apiMods
         {
             get

From e9a114a15c37bf498ff7e1e8b24775964f01a4b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 20:50:18 +0900
Subject: [PATCH 09006/10326] Rename property back

---
 osu.Game/Scoring/ScoreInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 312b5f46f4..222f69b025 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Scoring
         // Used for database serialisation/deserialisation.
         [JsonIgnore]
         [Column("Mods")]
-        public string ModsString
+        public string ModsJson
         {
             get => JsonConvert.SerializeObject(apiMods);
             set => apiMods = JsonConvert.DeserializeObject<APIMod[]>(value);

From c531e38a369452f3be8664e0c2b6ff4bb079e64c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 22:00:27 +0900
Subject: [PATCH 09007/10326] Rework to create a derived tracked user data
 instead

---
 ...TestSceneMultiplayerGameplayLeaderboard.cs |   2 +-
 .../MultiplayerSpectatorLeaderboard.cs        |  85 +++++------
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 137 +++++++++---------
 3 files changed, 107 insertions(+), 117 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 1ee848b902..272d547505 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                             break;
                     }
 
-                    ((ISpectatorClient)this).UserSentFrames(userId, new FrameDataBundle(header, Array.Empty<LegacyReplayFrame>()));
+                    ((ISpectatorClient)this).UserSentFrames(userId, new FrameDataBundle(header, new[] { new LegacyReplayFrame(Time.Current, 0, 0, ReplayButtonState.None) }));
                 }
             }
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
index aa9f162036..1b9e2bda2d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
@@ -2,10 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Timing;
-using osu.Game.Online.Spectator;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
@@ -13,73 +11,62 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorLeaderboard : MultiplayerGameplayLeaderboard
     {
-        private readonly Dictionary<int, TrackedUserData> trackedData = new Dictionary<int, TrackedUserData>();
-
         public MultiplayerSpectatorLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
             : base(scoreProcessor, userIds)
         {
         }
 
-        public void AddClock(int userId, IClock source) => trackedData[userId] = new TrackedUserData(source);
-
-        public void RemoveClock(int userId) => trackedData.Remove(userId);
-
-        protected override void OnIncomingFrames(int userId, FrameDataBundle bundle)
+        public void AddClock(int userId, IClock clock)
         {
-            if (!trackedData.TryGetValue(userId, out var data))
+            if (!UserScores.TryGetValue(userId, out var data))
                 return;
 
-            data.Frames.Add(new TimedFrameHeader(bundle.Frames.First().Time, bundle.Header));
+            ((SpectatingTrackedUserData)data).Clock = clock;
         }
 
+        public void RemoveClock(int userId)
+        {
+            if (!UserScores.TryGetValue(userId, out var data))
+                return;
+
+            ((SpectatingTrackedUserData)data).Clock = null;
+        }
+
+        protected override TrackedUserData CreateUserData(int userId, ScoreProcessor scoreProcessor) => new SpectatingTrackedUserData(userId, scoreProcessor);
+
         protected override void Update()
         {
             base.Update();
 
-            foreach (var (userId, data) in trackedData)
+            foreach (var (_, data) in UserScores)
+                data.UpdateScore();
+        }
+
+        private class SpectatingTrackedUserData : TrackedUserData
+        {
+            [CanBeNull]
+            public IClock Clock;
+
+            public SpectatingTrackedUserData(int userId, ScoreProcessor scoreProcessor)
+                : base(userId, scoreProcessor)
             {
-                var targetTime = data.Clock.CurrentTime;
+            }
 
-                if (data.Frames.Count == 0)
-                    continue;
+            public override void UpdateScore()
+            {
+                if (Frames.Count == 0)
+                    return;
 
-                int frameIndex = data.Frames.BinarySearch(new TimedFrameHeader(targetTime));
+                if (Clock == null)
+                    return;
+
+                int frameIndex = Frames.BinarySearch(new TimedFrame(Clock.CurrentTime));
                 if (frameIndex < 0)
                     frameIndex = ~frameIndex;
-                frameIndex = Math.Clamp(frameIndex - 1, 0, data.Frames.Count - 1);
+                frameIndex = Math.Clamp(frameIndex - 1, 0, Frames.Count - 1);
 
-                SetCurrentFrame(userId, data.Frames[frameIndex].Header);
+                SetFrame(Frames[frameIndex]);
             }
         }
-
-        private class TrackedUserData
-        {
-            public readonly IClock Clock;
-            public readonly List<TimedFrameHeader> Frames = new List<TimedFrameHeader>();
-
-            public TrackedUserData(IClock clock)
-            {
-                Clock = clock;
-            }
-        }
-
-        private class TimedFrameHeader : IComparable<TimedFrameHeader>
-        {
-            public readonly double Time;
-            public readonly FrameHeader Header;
-
-            public TimedFrameHeader(double time)
-            {
-                Time = time;
-            }
-
-            public TimedFrameHeader(double time, FrameHeader header)
-            {
-                Time = time;
-                Header = header;
-            }
-
-            public int CompareTo(TimedFrameHeader other) => Time.CompareTo(other.Time);
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index f0d2ac4b7f..70de067784 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.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.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
@@ -19,8 +19,7 @@ namespace osu.Game.Screens.Play.HUD
     [LongRunningLoad]
     public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
     {
-        private readonly ScoreProcessor scoreProcessor;
-        private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
+        protected readonly Dictionary<int, TrackedUserData> UserScores = new Dictionary<int, TrackedUserData>();
 
         [Resolved]
         private SpectatorStreamingClient streamingClient { get; set; }
@@ -31,9 +30,9 @@ namespace osu.Game.Screens.Play.HUD
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
 
-        private Bindable<ScoringMode> scoringMode;
-
+        private readonly ScoreProcessor scoreProcessor;
         private readonly BindableList<int> playingUsers;
+        private Bindable<ScoringMode> scoringMode;
 
         /// <summary>
         /// Construct a new leaderboard.
@@ -52,6 +51,8 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, IAPIProvider api)
         {
+            scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
+
             foreach (var userId in playingUsers)
             {
                 streamingClient.WatchUser(userId);
@@ -59,19 +60,17 @@ namespace osu.Game.Screens.Play.HUD
                 // probably won't be required in the final implementation.
                 var resolvedUser = userLookupCache.GetUserAsync(userId).Result;
 
-                var trackedUser = new TrackedUserData();
+                var trackedUser = CreateUserData(userId, scoreProcessor);
+                trackedUser.ScoringMode.BindTo(scoringMode);
 
-                userScores[userId] = trackedUser;
                 var leaderboardScore = AddPlayer(resolvedUser, resolvedUser?.Id == api.LocalUser.Value.Id);
+                leaderboardScore.Accuracy.BindTo(trackedUser.Accuracy);
+                leaderboardScore.TotalScore.BindTo(trackedUser.Score);
+                leaderboardScore.Combo.BindTo(trackedUser.CurrentCombo);
+                leaderboardScore.HasQuit.BindTo(trackedUser.UserQuit);
 
-                ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
-                ((IBindable<double>)leaderboardScore.TotalScore).BindTo(trackedUser.Score);
-                ((IBindable<int>)leaderboardScore.Combo).BindTo(trackedUser.CurrentCombo);
-                ((IBindable<bool>)leaderboardScore.HasQuit).BindTo(trackedUser.UserQuit);
+                UserScores[userId] = trackedUser;
             }
-
-            scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
-            scoringMode.BindValueChanged(updateAllScores, true);
         }
 
         protected override void LoadComplete()
@@ -101,7 +100,7 @@ namespace osu.Game.Screens.Play.HUD
                     {
                         streamingClient.StopWatchingUser(userId);
 
-                        if (userScores.TryGetValue(userId, out var trackedData))
+                        if (UserScores.TryGetValue(userId, out var trackedData))
                             trackedData.MarkUserQuit();
                     }
 
@@ -109,39 +108,16 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private void updateAllScores(ValueChangedEvent<ScoringMode> mode)
-        {
-            foreach (var trackedData in userScores.Values)
-                trackedData.UpdateScore(scoreProcessor, mode.NewValue);
-        }
-
         private void handleIncomingFrames(int userId, FrameDataBundle bundle) => Schedule(() =>
         {
-            if (userScores.ContainsKey(userId))
-                OnIncomingFrames(userId, bundle);
+            if (!UserScores.TryGetValue(userId, out var trackedData))
+                return;
+
+            trackedData.Frames.Add(new TimedFrame(bundle.Frames.First().Time, bundle.Header));
+            trackedData.UpdateScore();
         });
 
-        /// <summary>
-        /// Invoked when new frames have arrived for a user.
-        /// </summary>
-        /// <remarks>
-        /// By default, this immediately sets the current frame to be displayed for the user.
-        /// </remarks>
-        /// <param name="userId">The user which the frames arrived for.</param>
-        /// <param name="bundle">The bundle of frames.</param>
-        protected virtual void OnIncomingFrames(int userId, FrameDataBundle bundle) => SetCurrentFrame(userId, bundle.Header);
-
-        /// <summary>
-        /// Sets the current frame to be displayed for a user.
-        /// </summary>
-        /// <param name="userId">The user to set the frame of.</param>
-        /// <param name="header">The frame to set.</param>
-        protected void SetCurrentFrame(int userId, FrameHeader header)
-        {
-            var trackedScore = userScores[userId];
-            trackedScore.LastHeader = header;
-            trackedScore.UpdateScore(scoreProcessor, scoringMode.Value);
-        }
+        protected virtual TrackedUserData CreateUserData(int userId, ScoreProcessor scoreProcessor) => new TrackedUserData(userId, scoreProcessor);
 
         protected override void Dispose(bool isDisposing)
         {
@@ -158,38 +134,65 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private class TrackedUserData
+        protected class TrackedUserData
         {
-            public IBindableNumber<double> Score => score;
+            public readonly int UserId;
+            public readonly ScoreProcessor ScoreProcessor;
 
-            private readonly BindableDouble score = new BindableDouble();
+            public readonly BindableDouble Score = new BindableDouble();
+            public readonly BindableDouble Accuracy = new BindableDouble(1);
+            public readonly BindableInt CurrentCombo = new BindableInt();
+            public readonly BindableBool UserQuit = new BindableBool();
 
-            public IBindableNumber<double> Accuracy => accuracy;
+            public readonly IBindable<ScoringMode> ScoringMode = new Bindable<ScoringMode>();
 
-            private readonly BindableDouble accuracy = new BindableDouble(1);
+            public readonly List<TimedFrame> Frames = new List<TimedFrame>();
 
-            public IBindableNumber<int> CurrentCombo => currentCombo;
-
-            private readonly BindableInt currentCombo = new BindableInt();
-
-            public IBindable<bool> UserQuit => userQuit;
-
-            private readonly BindableBool userQuit = new BindableBool();
-
-            [CanBeNull]
-            public FrameHeader LastHeader;
-
-            public void MarkUserQuit() => userQuit.Value = true;
-
-            public void UpdateScore(ScoreProcessor processor, ScoringMode mode)
+            public TrackedUserData(int userId, ScoreProcessor scoreProcessor)
             {
-                if (LastHeader == null)
+                UserId = userId;
+                ScoreProcessor = scoreProcessor;
+
+                ScoringMode.BindValueChanged(_ => UpdateScore());
+            }
+
+            public void MarkUserQuit() => UserQuit.Value = true;
+
+            public virtual void UpdateScore()
+            {
+                if (Frames.Count == 0)
                     return;
 
-                score.Value = processor.GetImmediateScore(mode, LastHeader.MaxCombo, LastHeader.Statistics);
-                accuracy.Value = LastHeader.Accuracy;
-                currentCombo.Value = LastHeader.Combo;
+                SetFrame(Frames.Last());
             }
+
+            protected void SetFrame(TimedFrame frame)
+            {
+                var header = frame.Header;
+
+                Score.Value = ScoreProcessor.GetImmediateScore(ScoringMode.Value, header.MaxCombo, header.Statistics);
+                Accuracy.Value = header.Accuracy;
+                CurrentCombo.Value = header.Combo;
+            }
+        }
+
+        protected class TimedFrame : IComparable<TimedFrame>
+        {
+            public readonly double Time;
+            public readonly FrameHeader Header;
+
+            public TimedFrame(double time)
+            {
+                Time = time;
+            }
+
+            public TimedFrame(double time, FrameHeader header)
+            {
+                Time = time;
+                Header = header;
+            }
+
+            public int CompareTo(TimedFrame other) => Time.CompareTo(other.Time);
         }
     }
 }

From 1e002841cff4ffeac18a58c57c6a0769e33b05c9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 22:03:45 +0900
Subject: [PATCH 09008/10326] Add test for scoring mode changes

---
 .../TestSceneMultiplayerGameplayLeaderboard.cs  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 272d547505..b6c06bb149 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Online;
 using osu.Game.Online.API;
@@ -38,6 +39,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
+        private OsuConfigManager config;
+
         public TestSceneMultiplayerGameplayLeaderboard()
         {
             base.Content.Children = new Drawable[]
@@ -48,6 +51,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Dependencies.Cache(config = new OsuConfigManager(LocalStorage));
+        }
+
         [SetUpSteps]
         public override void SetUpSteps()
         {
@@ -97,6 +106,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddRepeatStep("mark user quit", () => Client.CurrentMatchPlayingUserIds.RemoveAt(0), users);
         }
 
+        [Test]
+        public void TestChangeScoringMode()
+        {
+            AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 5);
+            AddStep("change to classic", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Classic));
+            AddStep("change to standardised", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised));
+        }
+
         public class TestMultiplayerStreaming : SpectatorStreamingClient
         {
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;

From 7c4f6d2b62635ef38c95754484f7bb82b2d2122d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 15:47:26 +0200
Subject: [PATCH 09009/10326] Rework template usage

Includes moving the origin check back to templates, constructing nested template classes in each check, and making parameterized template usage.
---
 .../Edit/Checks/CheckOffscreenObjects.cs      | 57 ++++++++++++-------
 .../Rulesets/Edit/Checks/CheckBackground.cs   | 55 +++++++++++-------
 .../Rulesets/Edit/Checks/Components/Issue.cs  | 17 +++---
 .../Edit/Checks/Components/IssueTemplate.cs   |  8 ++-
 4 files changed, 88 insertions(+), 49 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index b34c9966a4..c4f38e6d09 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -22,29 +22,46 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
         // (higher = more performant, but higher false-negative chance).
         private const int path_step_size = 5;
 
+        private readonly IssueTemplateOffscreenCircle templateOffscreenCircle;
+        private readonly IssueTemplateOffscreenSlider templateOffscreenSlider;
+        private readonly IssueTemplate[] templates;
+
+        private class IssueTemplateOffscreenCircle : IssueTemplate
+        {
+            public IssueTemplateOffscreenCircle(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
+            {
+            }
+
+            public Issue Create(HitCircle circle) => new Issue(circle, this);
+        }
+
+        private class IssueTemplateOffscreenSlider : IssueTemplate
+        {
+            public IssueTemplateOffscreenSlider(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
+            {
+            }
+
+            public Issue Create(Slider slider, double offscreenTime) => new Issue(slider, this) { Time = offscreenTime };
+        }
+
+        public CheckOffscreenObjects()
+        {
+            templates = new IssueTemplate[]
+            {
+                templateOffscreenCircle = new IssueTemplateOffscreenCircle(this),
+                templateOffscreenSlider = new IssueTemplateOffscreenSlider(this)
+            };
+        }
+
         public CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Compose,
             description: "Offscreen hitobjects."
         );
 
-        public IEnumerable<IssueTemplate> PossibleTemplates => new[]
-        {
-            templateOffscreen,
-            templateOffscreenSliderPath
-        };
-
-        private readonly IssueTemplate templateOffscreen = new IssueTemplate
-        (
-            type: IssueType.Problem,
-            unformattedMessage: "This object goes offscreen on a 4:3 aspect ratio."
-        );
-
-        private readonly IssueTemplate templateOffscreenSliderPath = new IssueTemplate
-        (
-            type: IssueType.Problem,
-            unformattedMessage: "This slider goes offscreen here on a 4:3 aspect ratio."
-        );
+        public IEnumerable<IssueTemplate> PossibleTemplates => templates;
 
         public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
@@ -63,7 +80,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
                     case HitCircle circle:
                     {
                         if (isOffscreen(circle.StackedPosition, circle.Radius))
-                            yield return new Issue(this, circle, templateOffscreen);
+                            yield return templateOffscreenCircle.Create(circle);
 
                         break;
                     }
@@ -89,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
                 // `SpanDuration` ensures we don't include reverses.
                 double time = slider.StartTime + progress * slider.SpanDuration;
-                yield return new Issue(this, slider, templateOffscreenSliderPath) { Time = time };
+                yield return templateOffscreenSlider.Create(slider, time);
 
                 yield break;
             }
@@ -98,7 +115,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             if (!isOffscreen(slider.StackedEndPosition, slider.Radius))
                 yield break;
 
-            yield return new Issue(this, slider, templateOffscreenSliderPath) { Time = slider.EndTime };
+            yield return templateOffscreenSlider.Create(slider, slider.EndTime);
         }
 
         private bool isOffscreen(Vector2 position, double radius)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index c922aa03c0..1e45ea261c 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -10,35 +10,52 @@ namespace osu.Game.Rulesets.Edit.Checks
 {
     public class CheckBackground : ICheck
     {
+        private readonly IssueTemplateNoneSet templateNoneSet;
+        private readonly IssueTemplateDoesNotExist templateDoesNotExist;
+        private readonly IssueTemplate[] templates;
+
+        private class IssueTemplateNoneSet : IssueTemplate
+        {
+            public IssueTemplateNoneSet(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "No background has been set")
+            {
+            }
+
+            public Issue Create() => new Issue(this);
+        }
+
+        private class IssueTemplateDoesNotExist : IssueTemplate
+        {
+            public IssueTemplateDoesNotExist(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "The background file \"{0}\" does not exist.")
+            {
+            }
+
+            public Issue Create(string filename) => new Issue(this, filename);
+        }
+
+        public CheckBackground()
+        {
+            templates = new IssueTemplate[]
+            {
+                templateNoneSet = new IssueTemplateNoneSet(this),
+                templateDoesNotExist = new IssueTemplateDoesNotExist(this)
+            };
+        }
+
         public CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Resources,
             description: "Missing background."
         );
 
-        public IEnumerable<IssueTemplate> PossibleTemplates => new[]
-        {
-            templateNoneSet,
-            templateDoesNotExist
-        };
-
-        private readonly IssueTemplate templateNoneSet = new IssueTemplate
-        (
-            type: IssueType.Problem,
-            unformattedMessage: "No background has been set."
-        );
-
-        private readonly IssueTemplate templateDoesNotExist = new IssueTemplate
-        (
-            type: IssueType.Problem,
-            unformattedMessage: "The background file \"{0}\" is does not exist."
-        );
+        public IEnumerable<IssueTemplate> PossibleTemplates => templates;
 
         public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
             if (beatmap.Metadata.BackgroundFile == null)
             {
-                yield return new Issue(this, templateNoneSet);
+                yield return templateNoneSet.Create();
 
                 yield break;
             }
@@ -51,7 +68,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             if (file != null)
                 yield break;
 
-            yield return new Issue(this, templateDoesNotExist, beatmap.Metadata.BackgroundFile);
+            yield return templateDoesNotExist.Create(beatmap.Metadata.BackgroundFile);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index d0f7df857b..2bc9930e8f 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// The check that this issue originates from.
         /// </summary>
-        public ICheck Check;
+        public ICheck Check => Template.Check;
 
         /// <summary>
         /// The arguments that give this issue its context, based on the <see cref="IssueTemplate"/>. These are then substituted into the <see cref="IssueTemplate.UnformattedMessage"/>.
@@ -37,30 +37,29 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// </summary>
         public object[] Arguments;
 
-        public Issue(ICheck check, IssueTemplate template, params object[] args)
+        public Issue(IssueTemplate template, params object[] args)
         {
-            Check = check;
             Time = null;
             HitObjects = Array.Empty<HitObject>();
             Template = template;
             Arguments = args;
         }
 
-        public Issue(ICheck check, double? time, IssueTemplate template, params object[] args)
-            : this(check, template, args)
+        public Issue(double? time, IssueTemplate template, params object[] args)
+            : this(template, args)
         {
             Time = time;
         }
 
-        public Issue(ICheck check, HitObject hitObject, IssueTemplate template, params object[] args)
-            : this(check, template, args)
+        public Issue(HitObject hitObject, IssueTemplate template, params object[] args)
+            : this(template, args)
         {
             Time = hitObject.StartTime;
             HitObjects = new[] { hitObject };
         }
 
-        public Issue(ICheck check, IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
-            : this(check, template, args)
+        public Issue(IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
+            : this(template, args)
         {
             var hitObjectList = hitObjects.ToList();
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 4a5f98ca5f..e746844879 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         private static readonly Color4 negligible_green = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
         private static readonly Color4 error_gray = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
 
+        /// <summary>
+        /// The check that this template originates from.
+        /// </summary>
+        public ICheck Check;
+
         /// <summary>
         /// The type of the issue.
         /// </summary>
@@ -26,8 +31,9 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// </summary>
         public readonly string UnformattedMessage;
 
-        public IssueTemplate(IssueType type, string unformattedMessage)
+        public IssueTemplate(ICheck check, IssueType type, string unformattedMessage)
         {
+            Check = check;
             Type = type;
             UnformattedMessage = unformattedMessage;
         }

From 1c69829ad488edf10b2aaaa347c5b3be28aeabc0 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 15:47:58 +0200
Subject: [PATCH 09010/10326] Fix `Template.Origin` -> `Check`

---
 osu.Game/Screens/Edit/Verify/IssueTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 84dbabf300..516e1adf44 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Edit.Verify
             },
             new OsuSpriteText
             {
-                Text = issue.Template.Origin.Metadata.Category.ToString(),
+                Text = issue.Check.Metadata.Category.ToString(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
                 Margin = new MarginPadding(10)
             }

From 008dbc7dd6f841ea245ec8b732696ebbbb2a73b4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 15:49:13 +0200
Subject: [PATCH 09011/10326] Reverse `IssueType` ordering

Reversed both in the enum and where it's displayed, so ends up the same in the end.
---
 osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs | 10 +++++-----
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs          |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
index be43060cfc..1241e058ad 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
@@ -4,22 +4,22 @@
 namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     /// <summary>
-    /// The type, or severity, of an issue. This decides its priority.
+    /// The type, or severity, of an issue.
     /// </summary>
     public enum IssueType
     {
         /// <summary> A must-fix in the vast majority of cases. </summary>
-        Problem = 3,
+        Problem,
 
         /// <summary> A possible mistake. Often requires critical thinking.  </summary>
-        Warning = 2,
+        Warning,
 
         // TODO: Try/catch all checks run and return error templates if exceptions occur.
         /// <summary> An error occurred and a complete check could not be made. </summary>
-        Error = 1,
+        Error,
 
         // TODO: Negligible issues should be hidden by default.
         /// <summary> A possible mistake so minor/unlikely that it can often be safely ignored. </summary>
-        Negligible = 0,
+        Negligible,
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 806029df4d..a3d808ce62 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -129,8 +129,8 @@ namespace osu.Game.Screens.Edit.Verify
             private void refresh()
             {
                 table.Issues = beatmapVerifier.Run(Beatmap)
-                                              .OrderByDescending(issue => issue.Template.Type)
-                                              .ThenByDescending(issue => issue.Check.Metadata.Category);
+                                              .OrderBy(issue => issue.Template.Type)
+                                              .ThenBy(issue => issue.Check.Metadata.Category);
             }
         }
     }

From caaaba59505f19f999a593a3c35f460c598c9065 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 16:20:53 +0200
Subject: [PATCH 09012/10326] Rename `Check` -> `ICheck`

---
 osu.Game/Rulesets/Edit/Checks/Components/{Check.cs => ICheck.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Rulesets/Edit/Checks/Components/{Check.cs => ICheck.cs} (100%)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
similarity index 100%
rename from osu.Game/Rulesets/Edit/Checks/Components/Check.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs

From 6d50d01186f24c342b0fc406803b2486cebbbf4b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 16:23:05 +0200
Subject: [PATCH 09013/10326] Make `IssueTemplate.Check` readonly

---
 osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index e746844879..97df79ecd8 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// The check that this template originates from.
         /// </summary>
-        public ICheck Check;
+        public readonly ICheck Check;
 
         /// <summary>
         /// The type of the issue.

From 36bd235021d08202dd0c489b1bc664b91a31aca1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 23:36:10 +0900
Subject: [PATCH 09014/10326] Move nested classes to bottom of file

---
 .../Edit/Checks/CheckOffscreenObjects.cs      | 40 +++++++++----------
 .../Rulesets/Edit/Checks/CheckBackground.cs   | 40 +++++++++----------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index c4f38e6d09..f2a062b6d7 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -26,26 +26,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
         private readonly IssueTemplateOffscreenSlider templateOffscreenSlider;
         private readonly IssueTemplate[] templates;
 
-        private class IssueTemplateOffscreenCircle : IssueTemplate
-        {
-            public IssueTemplateOffscreenCircle(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
-            {
-            }
-
-            public Issue Create(HitCircle circle) => new Issue(circle, this);
-        }
-
-        private class IssueTemplateOffscreenSlider : IssueTemplate
-        {
-            public IssueTemplateOffscreenSlider(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
-            {
-            }
-
-            public Issue Create(Slider slider, double offscreenTime) => new Issue(slider, this) { Time = offscreenTime };
-        }
-
         public CheckOffscreenObjects()
         {
             templates = new IssueTemplate[]
@@ -123,5 +103,25 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             return position.X - radius < min_x || position.X + radius > max_x ||
                    position.Y - radius < min_y || position.Y + radius > max_y;
         }
+
+        private class IssueTemplateOffscreenCircle : IssueTemplate
+        {
+            public IssueTemplateOffscreenCircle(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
+            {
+            }
+
+            public Issue Create(HitCircle circle) => new Issue(circle, this);
+        }
+
+        private class IssueTemplateOffscreenSlider : IssueTemplate
+        {
+            public IssueTemplateOffscreenSlider(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
+            {
+            }
+
+            public Issue Create(Slider slider, double offscreenTime) => new Issue(slider, this) { Time = offscreenTime };
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 1e45ea261c..b48d19ae29 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -14,26 +14,6 @@ namespace osu.Game.Rulesets.Edit.Checks
         private readonly IssueTemplateDoesNotExist templateDoesNotExist;
         private readonly IssueTemplate[] templates;
 
-        private class IssueTemplateNoneSet : IssueTemplate
-        {
-            public IssueTemplateNoneSet(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "No background has been set")
-            {
-            }
-
-            public Issue Create() => new Issue(this);
-        }
-
-        private class IssueTemplateDoesNotExist : IssueTemplate
-        {
-            public IssueTemplateDoesNotExist(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "The background file \"{0}\" does not exist.")
-            {
-            }
-
-            public Issue Create(string filename) => new Issue(this, filename);
-        }
-
         public CheckBackground()
         {
             templates = new IssueTemplate[]
@@ -70,5 +50,25 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             yield return templateDoesNotExist.Create(beatmap.Metadata.BackgroundFile);
         }
+
+        private class IssueTemplateNoneSet : IssueTemplate
+        {
+            public IssueTemplateNoneSet(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "No background has been set")
+            {
+            }
+
+            public Issue Create() => new Issue(this);
+        }
+
+        private class IssueTemplateDoesNotExist : IssueTemplate
+        {
+            public IssueTemplateDoesNotExist(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "The background file \"{0}\" does not exist.")
+            {
+            }
+
+            public Issue Create(string filename) => new Issue(this, filename);
+        }
     }
 }

From 62c181228284f034168b87c27879fa72b87369b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 23:37:47 +0900
Subject: [PATCH 09015/10326] Remove redundant parameter naming

---
 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs | 6 +-----
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs           | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index f2a062b6d7..8d4cf2f4f0 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -35,11 +35,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             };
         }
 
-        public CheckMetadata Metadata { get; } = new CheckMetadata
-        (
-            category: CheckCategory.Compose,
-            description: "Offscreen hitobjects."
-        );
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Offscreen hitobjects");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => templates;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index b48d19ae29..1a766798cb 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -23,11 +23,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             };
         }
 
-        public CheckMetadata Metadata { get; } = new CheckMetadata
-        (
-            category: CheckCategory.Resources,
-            description: "Missing background."
-        );
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Missing background");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => templates;
 

From 43b97fe0ad738854f1ef795bfd386db615c75458 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 12 Apr 2021 10:52:12 -0400
Subject: [PATCH 09016/10326] Refactor PowerStatus (now called BatteryInfo)

---
 osu.Android/OsuGameAndroid.cs                      |  6 ++----
 osu.Android/osu.Android.csproj                     |  1 -
 .../Visual/Gameplay/TestScenePlayerLoader.cs       | 14 ++++++--------
 osu.Game/OsuGameBase.cs                            |  4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs              |  6 +++---
 osu.Game/Utils/{PowerStatus.cs => BatteryInfo.cs}  | 12 +++---------
 osu.iOS/OsuGameIOS.cs                              |  6 ++----
 osu.iOS/osu.iOS.csproj                             |  1 -
 8 files changed, 18 insertions(+), 32 deletions(-)
 rename osu.Game/Utils/{PowerStatus.cs => BatteryInfo.cs} (68%)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 02f4fa1ad6..050bf2b787 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -75,12 +75,10 @@ namespace osu.Android
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
 
-        protected override PowerStatus CreatePowerStatus() => new AndroidPowerStatus();
+        protected override BatteryInfo CreateBatteryInfo() => new AndroidBatteryInfo();
 
-        private class AndroidPowerStatus : PowerStatus
+        private class AndroidBatteryInfo : BatteryInfo
         {
-            public override double BatteryCutoff => 0.20;
-
             public override double ChargeLevel => Battery.ChargeLevel;
 
             public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;
diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index 64d5e5b1c8..582c856a47 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -64,7 +64,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <!-- Used for obtaining battery info. -->
     <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 657c1dd47e..311448a284 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private readonly VolumeOverlay volumeOverlay;
 
-        [Cached(typeof(PowerStatus))]
-        private readonly LocalPowerStatus powerStatus = new LocalPowerStatus();
+        [Cached(typeof(BatteryInfo))]
+        private readonly LocalBatteryInfo batteryInfo = new LocalBatteryInfo();
 
         private readonly ChangelogOverlay changelogOverlay;
 
@@ -302,8 +302,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             // set charge status and level
             AddStep("load player", () => resetPlayer(false, () =>
             {
-                powerStatus.SetCharging(isCharging);
-                powerStatus.SetChargeLevel(chargeLevel);
+                batteryInfo.SetCharging(isCharging);
+                batteryInfo.SetChargeLevel(chargeLevel);
             }));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
             AddAssert($"notification {(shouldWarn ? "triggered" : "not triggered")}", () => notificationOverlay.UnreadCount.Value == (shouldWarn ? 1 : 0));
@@ -381,16 +381,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         /// <summary>
-        /// Mutable dummy PowerStatus class for <see cref="TestScenePlayerLoader.TestLowBatteryNotification"/>
+        /// Mutable dummy BatteryInfo class for <see cref="TestScenePlayerLoader.TestLowBatteryNotification"/>
         /// </summary>
         /// <inheritdoc/>
-        private class LocalPowerStatus : PowerStatus
+        private class LocalBatteryInfo : BatteryInfo
         {
             private bool isCharging = true;
             private double chargeLevel = 1;
 
-            public override double BatteryCutoff => 0.2;
-
             public override bool IsCharging => isCharging;
 
             public override double ChargeLevel => chargeLevel;
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 96aabf0024..de8ba93106 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -157,7 +157,7 @@ namespace osu.Game
 
         protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
 
-        protected virtual PowerStatus CreatePowerStatus() => null;
+        protected virtual BatteryInfo CreateBatteryInfo() => null;
 
         /// <summary>
         /// The maximum volume at which audio tracks should playback. This can be set lower than 1 to create some head-room for sound effects.
@@ -285,7 +285,7 @@ namespace osu.Game
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
             dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore));
 
-            var powerStatus = CreatePowerStatus();
+            var powerStatus = CreateBatteryInfo();
             if (powerStatus != null)
                 dependencies.CacheAs(powerStatus);
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index d342bf8273..964410f838 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Play
         private AudioManager audioManager { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private PowerStatus powerStatus { get; set; }
+        private BatteryInfo batteryInfo { get; set; }
 
         public PlayerLoader(Func<Player> createPlayer)
         {
@@ -483,11 +483,11 @@ namespace osu.Game.Screens.Play
 
         private void showBatteryWarningIfNeeded()
         {
-            if (powerStatus == null) return;
+            if (batteryInfo == null) return;
 
             if (!batteryWarningShownOnce.Value)
             {
-                if (powerStatus.IsLowBattery)
+                if (batteryInfo.IsLowBattery)
                 {
                     notificationOverlay?.Post(new BatteryWarningNotification());
                     batteryWarningShownOnce.Value = true;
diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/BatteryInfo.cs
similarity index 68%
rename from osu.Game/Utils/PowerStatus.cs
rename to osu.Game/Utils/BatteryInfo.cs
index 46f7e32b9e..1a64213d8e 100644
--- a/osu.Game/Utils/PowerStatus.cs
+++ b/osu.Game/Utils/BatteryInfo.cs
@@ -5,15 +5,9 @@ namespace osu.Game.Utils
 {
     /// <summary>
     /// Provides access to the system's power status.
-    /// Currently implemented on iOS and Android only.
     /// </summary>
-    public abstract class PowerStatus
+    public abstract class BatteryInfo
     {
-        /// <summary>
-        /// The maximum battery level considered as low, from 0 to 1.
-        /// </summary>
-        public abstract double BatteryCutoff { get; }
-
         /// <summary>
         /// The charge level of the battery, from 0 to 1.
         /// </summary>
@@ -23,8 +17,8 @@ namespace osu.Game.Utils
 
         /// <summary>
         /// Whether the battery is currently low in charge.
-        /// Returns true if not charging and current charge level is lower than or equal to <see cref="BatteryCutoff"/>.
+        /// Returns true if not charging and current charge level is lower than or equal to 25%.
         /// </summary>
-        public bool IsLowBattery => !IsCharging && ChargeLevel <= BatteryCutoff;
+        public bool IsLowBattery => !IsCharging && ChargeLevel <= 0.25;
     }
 }
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index b53b594eae..702aef45f5 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -16,12 +16,10 @@ namespace osu.iOS
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
 
-        protected override PowerStatus CreatePowerStatus() => new IOSPowerStatus();
+        protected override BatteryInfo CreateBatteryInfo() => new IOSBatteryInfo();
 
-        private class IOSPowerStatus : PowerStatus
+        private class IOSBatteryInfo : BatteryInfo
         {
-            public override double BatteryCutoff => 0.25;
-
             public override double ChargeLevel => Battery.ChargeLevel;
 
             public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;
diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj
index ed6f52c60e..1cbe4422cc 100644
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@@ -117,7 +117,6 @@
     </ImageAsset>
   </ItemGroup>
   <ItemGroup>
-  <!-- Used for obtaining battery info. -->
     <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

From bb720c23a01e6f27b376491abf29e578f4db5bc6 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 17:12:37 +0200
Subject: [PATCH 09017/10326] Remove check ctors and locals

---
 .../Edit/Checks/CheckOffscreenObjects.cs      | 25 ++++++-------------
 .../Rulesets/Edit/Checks/CheckBackground.cs   | 23 ++++++-----------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 8d4cf2f4f0..adaabc0a1d 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -22,22 +22,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
         // (higher = more performant, but higher false-negative chance).
         private const int path_step_size = 5;
 
-        private readonly IssueTemplateOffscreenCircle templateOffscreenCircle;
-        private readonly IssueTemplateOffscreenSlider templateOffscreenSlider;
-        private readonly IssueTemplate[] templates;
-
-        public CheckOffscreenObjects()
-        {
-            templates = new IssueTemplate[]
-            {
-                templateOffscreenCircle = new IssueTemplateOffscreenCircle(this),
-                templateOffscreenSlider = new IssueTemplateOffscreenSlider(this)
-            };
-        }
-
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Offscreen hitobjects");
 
-        public IEnumerable<IssueTemplate> PossibleTemplates => templates;
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateOffscreenCircle(this),
+            new IssueTemplateOffscreenSlider(this)
+        };
 
         public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
@@ -56,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
                     case HitCircle circle:
                     {
                         if (isOffscreen(circle.StackedPosition, circle.Radius))
-                            yield return templateOffscreenCircle.Create(circle);
+                            yield return new IssueTemplateOffscreenCircle(this).Create(circle);
 
                         break;
                     }
@@ -82,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
                 // `SpanDuration` ensures we don't include reverses.
                 double time = slider.StartTime + progress * slider.SpanDuration;
-                yield return templateOffscreenSlider.Create(slider, time);
+                yield return new IssueTemplateOffscreenSlider(this).Create(slider, time);
 
                 yield break;
             }
@@ -91,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             if (!isOffscreen(slider.StackedEndPosition, slider.Radius))
                 yield break;
 
-            yield return templateOffscreenSlider.Create(slider, slider.EndTime);
+            yield return new IssueTemplateOffscreenSlider(this).Create(slider, slider.EndTime);
         }
 
         private bool isOffscreen(Vector2 position, double radius)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 1a766798cb..b0c1d6eb4b 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -10,28 +10,19 @@ namespace osu.Game.Rulesets.Edit.Checks
 {
     public class CheckBackground : ICheck
     {
-        private readonly IssueTemplateNoneSet templateNoneSet;
-        private readonly IssueTemplateDoesNotExist templateDoesNotExist;
-        private readonly IssueTemplate[] templates;
-
-        public CheckBackground()
-        {
-            templates = new IssueTemplate[]
-            {
-                templateNoneSet = new IssueTemplateNoneSet(this),
-                templateDoesNotExist = new IssueTemplateDoesNotExist(this)
-            };
-        }
-
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Missing background");
 
-        public IEnumerable<IssueTemplate> PossibleTemplates => templates;
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateNoneSet(this),
+            new IssueTemplateDoesNotExist(this)
+        };
 
         public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
             if (beatmap.Metadata.BackgroundFile == null)
             {
-                yield return templateNoneSet.Create();
+                yield return new IssueTemplateNoneSet(this).Create();
 
                 yield break;
             }
@@ -44,7 +35,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             if (file != null)
                 yield break;
 
-            yield return templateDoesNotExist.Create(beatmap.Metadata.BackgroundFile);
+            yield return new IssueTemplateDoesNotExist(this).Create(beatmap.Metadata.BackgroundFile);
         }
 
         private class IssueTemplateNoneSet : IssueTemplate

From f66306a81ad70868c29bc2a56d471a08f6bebbe5 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 12 Apr 2021 11:11:22 -0400
Subject: [PATCH 09018/10326] Remove IsLowBattery

---
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs | 2 +-
 osu.Game/Screens/Play/PlayerLoader.cs                   | 2 +-
 osu.Game/Utils/BatteryInfo.cs                           | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 311448a284..c56f2db0d0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -294,7 +294,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         [TestCase(false, 1.0, false)] // not charging, above cutoff --> no warning
         [TestCase(true, 0.1, false)] // charging, below cutoff --> no warning
-        [TestCase(false, 0.2, true)] // not charging, at cutoff --> warning
+        [TestCase(false, 0.25, true)] // not charging, at cutoff --> warning
         public void TestLowBatteryNotification(bool isCharging, double chargeLevel, bool shouldWarn)
         {
             AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.LowBatteryNotificationShownOnce).Value = false);
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 964410f838..fc4659da97 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -487,7 +487,7 @@ namespace osu.Game.Screens.Play
 
             if (!batteryWarningShownOnce.Value)
             {
-                if (batteryInfo.IsLowBattery)
+                if (!batteryInfo.IsCharging && batteryInfo.ChargeLevel <= 0.25)
                 {
                     notificationOverlay?.Post(new BatteryWarningNotification());
                     batteryWarningShownOnce.Value = true;
diff --git a/osu.Game/Utils/BatteryInfo.cs b/osu.Game/Utils/BatteryInfo.cs
index 1a64213d8e..dd9b695e1f 100644
--- a/osu.Game/Utils/BatteryInfo.cs
+++ b/osu.Game/Utils/BatteryInfo.cs
@@ -14,11 +14,5 @@ namespace osu.Game.Utils
         public abstract double ChargeLevel { get; }
 
         public abstract bool IsCharging { get; }
-
-        /// <summary>
-        /// Whether the battery is currently low in charge.
-        /// Returns true if not charging and current charge level is lower than or equal to 25%.
-        /// </summary>
-        public bool IsLowBattery => !IsCharging && ChargeLevel <= 0.25;
     }
 }

From 19a154ddf15684f8a3429a642e3f71e555e0d27f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 17:28:12 +0200
Subject: [PATCH 09019/10326] Rename `checkOrigin` -> `check`

More consistent with `Issue.ctor`'s "template".
---
 .../Edit/Checks/CheckOffscreenObjects.cs                  | 8 ++++----
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs          | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index adaabc0a1d..0a682c4a83 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -93,8 +93,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
         private class IssueTemplateOffscreenCircle : IssueTemplate
         {
-            public IssueTemplateOffscreenCircle(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
+            public IssueTemplateOffscreenCircle(ICheck check)
+                : base(check, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
             {
             }
 
@@ -103,8 +103,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
         private class IssueTemplateOffscreenSlider : IssueTemplate
         {
-            public IssueTemplateOffscreenSlider(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
+            public IssueTemplateOffscreenSlider(ICheck check)
+                : base(check, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
             {
             }
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index b0c1d6eb4b..463b596120 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -40,8 +40,8 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         private class IssueTemplateNoneSet : IssueTemplate
         {
-            public IssueTemplateNoneSet(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "No background has been set")
+            public IssueTemplateNoneSet(ICheck check)
+                : base(check, IssueType.Problem, "No background has been set")
             {
             }
 
@@ -50,8 +50,8 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         private class IssueTemplateDoesNotExist : IssueTemplate
         {
-            public IssueTemplateDoesNotExist(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "The background file \"{0}\" does not exist.")
+            public IssueTemplateDoesNotExist(ICheck check)
+                : base(check, IssueType.Problem, "The background file \"{0}\" does not exist.")
             {
             }
 

From d9e3276d0edb2f163efd5dcd5894a2881b89ab78 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 19:18:22 +0200
Subject: [PATCH 09020/10326] Don't update path type once immediately

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 6b78cff33e..7686043c43 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -58,12 +58,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
+            PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
 
             slider.Path.Version.BindValueChanged(_ =>
             {
                 PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
                 updatePathType();
-            }, runOnceImmediately: true);
+            });
 
             controlPoint.Type.BindValueChanged(_ => updateMarkerDisplay());
 

From 92fab653e175b594327cbce5a7702a6068cf6a58 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 12 Apr 2021 20:10:22 +0300
Subject: [PATCH 09021/10326] Take current mod settings value into account on
 equality comparsion

---
 osu.Game/Online/API/APIMod.cs | 26 +++++++++++++++++++++++++-
 osu.Game/Rulesets/Mods/Mod.cs | 14 +++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index bad7e0af38..4427c82a8b 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
 
 namespace osu.Game.Online.API
 {
@@ -64,7 +65,15 @@ namespace osu.Game.Online.API
         }
 
         public bool Equals(IMod other) => other is APIMod them && Equals(them);
-        public bool Equals(APIMod other) => Acronym == other?.Acronym;
+
+        public bool Equals(APIMod other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return Acronym == other.Acronym &&
+                   Settings.SequenceEqual(other.Settings, ModSettingsEqualityComparer.Default);
+        }
 
         public override string ToString()
         {
@@ -73,5 +82,20 @@ namespace osu.Game.Online.API
 
             return $"{Acronym}";
         }
+
+        private class ModSettingsEqualityComparer : IEqualityComparer<KeyValuePair<string, object>>
+        {
+            public static ModSettingsEqualityComparer Default { get; } = new ModSettingsEqualityComparer();
+
+            public bool Equals(KeyValuePair<string, object> x, KeyValuePair<string, object> y)
+            {
+                object xValue = ModUtils.GetSettingUnderlyingValue(x.Value);
+                object yValue = ModUtils.GetSettingUnderlyingValue(y.Value);
+
+                return x.Key == y.Key && EqualityComparer<object>.Default.Equals(xValue, yValue);
+            }
+
+            public int GetHashCode(KeyValuePair<string, object> obj) => HashCode.Combine(obj.Key, ModUtils.GetSettingUnderlyingValue(obj.Value));
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 93a11e70f8..832a14ee1e 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -12,6 +12,7 @@ using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.IO.Serialization;
 using osu.Game.Rulesets.UI;
+using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -173,7 +174,18 @@ namespace osu.Game.Rulesets.Mods
         }
 
         public bool Equals(IMod other) => other is Mod them && Equals(them);
-        public bool Equals(Mod other) => GetType() == other?.GetType();
+
+        public bool Equals(Mod other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return GetType() == other.GetType() &&
+                   this.GetSettingsSourceProperties().All(pair =>
+                       EqualityComparer<object>.Default.Equals(
+                           ModUtils.GetSettingUnderlyingValue(pair.Item2.GetValue(this)),
+                           ModUtils.GetSettingUnderlyingValue(pair.Item2.GetValue(other))));
+        }
 
         /// <summary>
         /// Reset all custom settings for this mod back to their defaults.

From 589e1a2a471ef69c49d24d42d5b56df9362f7b6c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 12 Apr 2021 20:51:24 +0300
Subject: [PATCH 09022/10326] Add mod settings equality test

---
 .../Mods/ModSettingsEqualityComparsion.cs     | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 osu.Game.Tests/Mods/ModSettingsEqualityComparsion.cs

diff --git a/osu.Game.Tests/Mods/ModSettingsEqualityComparsion.cs b/osu.Game.Tests/Mods/ModSettingsEqualityComparsion.cs
new file mode 100644
index 0000000000..7a5789f01a
--- /dev/null
+++ b/osu.Game.Tests/Mods/ModSettingsEqualityComparsion.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 NUnit.Framework;
+using osu.Game.Online.API;
+using osu.Game.Rulesets.Osu.Mods;
+
+namespace osu.Game.Tests.Mods
+{
+    [TestFixture]
+    public class ModSettingsEqualityComparison
+    {
+        [Test]
+        public void Test()
+        {
+            var mod1 = new OsuModDoubleTime { SpeedChange = { Value = 1.25 } };
+            var mod2 = new OsuModDoubleTime { SpeedChange = { Value = 1.26 } };
+            var mod3 = new OsuModDoubleTime { SpeedChange = { Value = 1.26 } };
+            var apiMod1 = new APIMod(mod1);
+            var apiMod2 = new APIMod(mod2);
+            var apiMod3 = new APIMod(mod3);
+
+            Assert.That(mod1, Is.Not.EqualTo(mod2));
+            Assert.That(apiMod1, Is.Not.EqualTo(apiMod2));
+
+            Assert.That(mod2, Is.EqualTo(mod2));
+            Assert.That(apiMod2, Is.EqualTo(apiMod2));
+
+            Assert.That(mod2, Is.EqualTo(mod3));
+            Assert.That(apiMod2, Is.EqualTo(apiMod3));
+
+            Assert.That(mod3, Is.EqualTo(mod2));
+            Assert.That(apiMod3, Is.EqualTo(apiMod2));
+        }
+    }
+}

From 8f84abf34807bae9679b2f70cdfd8c082eb25e03 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 12 Apr 2021 21:51:04 +0300
Subject: [PATCH 09023/10326] Display "replays watched" tooltip for replays
 subsection

---
 .../Visual/Online/TestSceneUserHistoryGraph.cs       |  3 +--
 .../Sections/Historical/ChartProfileSubsection.cs    |  7 ++++++-
 .../Sections/Historical/PlayHistorySubsection.cs     |  2 ++
 .../Profile/Sections/Historical/ProfileLineChart.cs  |  4 ++--
 .../Profile/Sections/Historical/ReplaysSubsection.cs |  2 ++
 .../Profile/Sections/Historical/UserHistoryGraph.cs  | 12 +++++++-----
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
index 57ce4c41e7..484c59695e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
@@ -19,13 +19,12 @@ namespace osu.Game.Tests.Visual.Online
         {
             UserHistoryGraph graph;
 
-            Add(graph = new UserHistoryGraph
+            Add(graph = new UserHistoryGraph("Test")
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 200,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                TooltipCounterName = "Test"
             });
 
             var values = new[]
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
index b82773155d..a48036dcbb 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
@@ -15,6 +15,11 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     {
         private ProfileLineChart chart;
 
+        /// <summary>
+        /// Text describing the value being plotted on the graph, which will be displayed as a prefix to the value in the history graph tooltip.
+        /// </summary>
+        protected abstract string GraphCounterName { get; }
+
         protected ChartProfileSubsection(Bindable<User> user, string headerText)
             : base(user, headerText)
         {
@@ -30,7 +35,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 Left = 20,
                 Right = 40
             },
-            Child = chart = new ProfileLineChart()
+            Child = chart = new ProfileLineChart(GraphCounterName)
         };
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
index 2f15886c3a..dfd29db693 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 {
     public class PlayHistorySubsection : ChartProfileSubsection
     {
+        protected override string GraphCounterName => "Plays";
+
         public PlayHistorySubsection(Bindable<User> user)
             : base(user, "Play History")
         {
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index f02aa36b6c..eb5deb2802 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         private readonly Container<TickLine> rowLinesContainer;
         private readonly Container<TickLine> columnLinesContainer;
 
-        public ProfileLineChart()
+        public ProfileLineChart(string graphCounterName)
         {
             RelativeSizeAxes = Axes.X;
             Height = 250;
@@ -88,7 +88,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                                         }
                                     }
                                 },
-                                graph = new UserHistoryGraph
+                                graph = new UserHistoryGraph(graphCounterName)
                                 {
                                     RelativeSizeAxes = Axes.Both
                                 }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
index e594e8d020..1c28306f17 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 {
     public class ReplaysSubsection : ChartProfileSubsection
     {
+        protected override string GraphCounterName => "Replays Watched";
+
         public ReplaysSubsection(Bindable<User> user)
             : base(user, "Replays Watched History")
         {
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index b1e8c8f0ca..f9e5ccf618 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -11,20 +11,22 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 {
     public class UserHistoryGraph : UserGraph<DateTime, long>
     {
+        private readonly string tooltipCounterName;
+
         [CanBeNull]
         public UserHistoryCount[] Values
         {
             set => Data = value?.Select(v => new KeyValuePair<DateTime, long>(v.Date, v.Count)).ToArray();
         }
 
-        /// <summary>
-        /// Text describing the value being plotted on the graph, which will be displayed as a prefix to the value in the <see cref="HistoryGraphTooltip"/>.
-        /// </summary>
-        public string TooltipCounterName { get; set; } = "Plays";
+        public UserHistoryGraph(string tooltipCounterName)
+        {
+            this.tooltipCounterName = tooltipCounterName;
+        }
 
         protected override float GetDataPointHeight(long playCount) => playCount;
 
-        protected override UserGraphTooltip GetTooltip() => new HistoryGraphTooltip(TooltipCounterName);
+        protected override UserGraphTooltip GetTooltip() => new HistoryGraphTooltip(tooltipCounterName);
 
         protected override object GetTooltipContent(DateTime date, long playCount)
         {

From d8088777ea0a1177fb3e205530fdab7e04165458 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:21:34 +0200
Subject: [PATCH 09024/10326] Add `Equals` method to `IssueTemplate`

This will be useful in tests.
---
 osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 97df79ecd8..e21f14f4bc 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -70,5 +70,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
                 }
             }
         }
+
+        public bool Equals(IssueTemplate other) => other.Type == Type && other.UnformattedMessage == UnformattedMessage;
     }
 }

From 47cf4bcf2595c672c0f70a85da4c55a36beea182 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:22:24 +0200
Subject: [PATCH 09025/10326] Add `CheckBackground` tests

---
 .../Editing/Checks/CheckBackgroundTest.cs     | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
new file mode 100644
index 0000000000..54d1a116c7
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckBackgroundTest
+    {
+        private CheckBackground check;
+        private IBeatmap beatmap;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckBackground();
+            beatmap = new Beatmap<HitObject>
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata { BackgroundFile = "abc123.jpg" },
+                    BeatmapSet = new BeatmapSetInfo
+                    {
+                        Files = new List<BeatmapSetFileInfo>(new []
+                        {
+                            new BeatmapSetFileInfo { Filename = "abc123.jpg" }
+                        })
+                    }
+                }
+            };
+        }
+
+        [Test]
+        public void TestBackgroundSetAndInFiles()
+        {
+            var issues = check.Run(beatmap);
+
+            Assert.That(!issues.Any());
+        }
+
+        [Test]
+        public void TestBackgroundSetAndNotInFiles()
+        {
+            beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
+
+            var issues = check.Run(beatmap).ToList();
+            var issue = issues.FirstOrDefault();
+
+            Assert.That(issues.Count == 1);
+            Assert.That(issue != null);
+            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(1)));
+        }
+
+        [Test]
+        public void TestBackgroundNotSet()
+        {
+            beatmap.Metadata.BackgroundFile = null;
+
+            var issues = check.Run(beatmap).ToList();
+            var issue = issues.FirstOrDefault();
+
+            Assert.That(issues.Count == 1);
+            Assert.That(issue != null);
+            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(0)));
+        }
+    }
+}

From 8a6dfcfae1cb9c8b50e04777648098ef271a8d56 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:22:36 +0200
Subject: [PATCH 09026/10326] Add `CheckOffscreenObjects` tests

---
 .../Checks/CheckOffscreenObjectsTest.cs       | 263 ++++++++++++++++++
 1 file changed, 263 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
new file mode 100644
index 0000000000..fa7854765f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -0,0 +1,263 @@
+// Copyright (c) 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.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Edit.Checks;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
+{
+    [TestFixture]
+    public class CheckOffscreenObjectsTest
+    {
+        private CheckOffscreenObjects check;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckOffscreenObjects();
+        }
+
+        [Test]
+        public void TestCircleInCenter()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(320, 240) // Playfield is 640 x 480.
+                    }
+                }
+            };
+
+            var issues = check.Run(beatmap);
+
+            Assert.That(!issues.Any());
+        }
+
+        [Test]
+        public void TestCircleNearEdge()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(5, 5)
+                    }
+                }
+            };
+
+            var issues = check.Run(beatmap);
+
+            Assert.That(!issues.Any());
+        }
+
+        [Test]
+        public void TestCircleNearEdgeStackedOffscreen()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(5, 5),
+                        StackHeight = 5
+                    }
+                }
+            };
+
+            assertOffscreenCircle(beatmap);
+        }
+
+        [Test]
+        public void TestCircleOffscreen()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(0, 0)
+                    }
+                }
+            };
+
+            assertOffscreenCircle(beatmap);
+        }
+
+        [Test]
+        public void TestSliderInCenter()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(420, 240),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(-100, 0))
+                        }),
+                    }
+                }
+            };
+
+            var issues = check.Run(beatmap);
+
+            Assert.That(!issues.Any());
+        }
+
+        [Test]
+        public void TestSliderNearEdge()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(320, 240),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(0, -235))
+                        }),
+                    }
+                }
+            };
+
+            var issues = check.Run(beatmap);
+
+            Assert.That(!issues.Any());
+        }
+
+        [Test]
+        public void TestSliderNearEdgeStackedOffscreen()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(320, 240),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(0, -235))
+                        }),
+                        StackHeight = 5
+                    }
+                }
+            };
+
+            assertOffscreenSlider(beatmap);
+        }
+
+        [Test]
+        public void TestSliderOffscreenStart()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(0, 0),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(320, 240))
+                        }),
+                    }
+                }
+            };
+
+            assertOffscreenSlider(beatmap);
+        }
+
+        [Test]
+        public void TestSliderOffscreenEnd()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(320, 240),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(-320, -240))
+                        }),
+                    }
+                }
+            };
+
+            assertOffscreenSlider(beatmap);
+        }
+
+        [Test]
+        public void TestSliderOffscreenPath()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(320, 240),
+                        Path = new SliderPath(new[]
+                        {
+                            // Circular arc shoots over the top of the screen.
+                            new PathControlPoint(new Vector2(0, 0), PathType.PerfectCurve),
+                            new PathControlPoint(new Vector2(-100, -200)),
+                            new PathControlPoint(new Vector2(100, -200))
+                        }),
+                    }
+                }
+            };
+
+            assertOffscreenSlider(beatmap);
+        }
+
+        private void assertOneIssue(IBeatmap beatmap, int templateIndex)
+        {
+            var issues = check.Run(beatmap).ToList();
+            var issue = issues.FirstOrDefault();
+
+            Assert.That(issues.Count == 1);
+            Assert.That(issue != null);
+            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(templateIndex)));
+        }
+
+        private void assertOffscreenCircle(IBeatmap beatmap) => assertOneIssue(beatmap, 0);
+
+        private void assertOffscreenSlider(IBeatmap beatmap) => assertOneIssue(beatmap, 1);
+    }
+}

From 0bcc39bd36a9a5893f57fcaa8b94f9d3e31356e9 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 02:17:35 +0200
Subject: [PATCH 09027/10326] Remove redundant space

---
 osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
index 54d1a116c7..2f309afb6c 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Editing.Checks
                     Metadata = new BeatmapMetadata { BackgroundFile = "abc123.jpg" },
                     BeatmapSet = new BeatmapSetInfo
                     {
-                        Files = new List<BeatmapSetFileInfo>(new []
+                        Files = new List<BeatmapSetFileInfo>(new[]
                         {
                             new BeatmapSetFileInfo { Filename = "abc123.jpg" }
                         })

From 6d3f9fa9cefdd776d937e0c6b809df8624457e50 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 02:29:25 +0200
Subject: [PATCH 09028/10326] Use `is` class instead of `Equals` with template
 index

Ensures ordering of `PossibleTemplates` does not affect tests.
---
 .../Editor/Checks/CheckOffscreenObjectsTest.cs     | 14 ++++++++++----
 .../Edit/Checks/CheckOffscreenObjects.cs           |  4 ++--
 .../Editing/Checks/CheckBackgroundTest.cs          |  4 ++--
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs   |  4 ++--
 .../Edit/Checks/Components/IssueTemplate.cs        |  2 --
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index fa7854765f..33b839650f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -246,18 +246,24 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
             assertOffscreenSlider(beatmap);
         }
 
-        private void assertOneIssue(IBeatmap beatmap, int templateIndex)
+        private void assertOffscreenCircle(IBeatmap beatmap)
         {
             var issues = check.Run(beatmap).ToList();
             var issue = issues.FirstOrDefault();
 
             Assert.That(issues.Count == 1);
             Assert.That(issue != null);
-            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(templateIndex)));
+            Assert.That(issue.Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
         }
 
-        private void assertOffscreenCircle(IBeatmap beatmap) => assertOneIssue(beatmap, 0);
+        private void assertOffscreenSlider(IBeatmap beatmap)
+        {
+            var issues = check.Run(beatmap).ToList();
+            var issue = issues.FirstOrDefault();
 
-        private void assertOffscreenSlider(IBeatmap beatmap) => assertOneIssue(beatmap, 1);
+            Assert.That(issues.Count == 1);
+            Assert.That(issue != null);
+            Assert.That(issue.Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 0a682c4a83..c241db7e06 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
                    position.Y - radius < min_y || position.Y + radius > max_y;
         }
 
-        private class IssueTemplateOffscreenCircle : IssueTemplate
+        public class IssueTemplateOffscreenCircle : IssueTemplate
         {
             public IssueTemplateOffscreenCircle(ICheck check)
                 : base(check, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             public Issue Create(HitCircle circle) => new Issue(circle, this);
         }
 
-        private class IssueTemplateOffscreenSlider : IssueTemplate
+        public class IssueTemplateOffscreenSlider : IssueTemplate
         {
             public IssueTemplateOffscreenSlider(ICheck check)
                 : base(check, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
index 2f309afb6c..327abcab6c 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Editing.Checks
 
             Assert.That(issues.Count == 1);
             Assert.That(issue != null);
-            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(1)));
+            Assert.That(issue.Template is CheckBackground.IssueTemplateDoesNotExist);
         }
 
         [Test]
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Editing.Checks
 
             Assert.That(issues.Count == 1);
             Assert.That(issue != null);
-            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(0)));
+            Assert.That(issue.Template is CheckBackground.IssueTemplateNoneSet);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 463b596120..4d5069f446 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             yield return new IssueTemplateDoesNotExist(this).Create(beatmap.Metadata.BackgroundFile);
         }
 
-        private class IssueTemplateNoneSet : IssueTemplate
+        public class IssueTemplateNoneSet : IssueTemplate
         {
             public IssueTemplateNoneSet(ICheck check)
                 : base(check, IssueType.Problem, "No background has been set")
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             public Issue Create() => new Issue(this);
         }
 
-        private class IssueTemplateDoesNotExist : IssueTemplate
+        public class IssueTemplateDoesNotExist : IssueTemplate
         {
             public IssueTemplateDoesNotExist(ICheck check)
                 : base(check, IssueType.Problem, "The background file \"{0}\" does not exist.")
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index e21f14f4bc..97df79ecd8 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -70,7 +70,5 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
                 }
             }
         }
-
-        public bool Equals(IssueTemplate other) => other.Type == Type && other.UnformattedMessage == UnformattedMessage;
     }
 }

From 17c2c4e885b63761fa179ddc2ee193b6078a4b03 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 05:31:56 +0300
Subject: [PATCH 09029/10326] Fix test case filename not matching

---
 ...ingsEqualityComparsion.cs => ModSettingsEqualityComparison.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Tests/Mods/{ModSettingsEqualityComparsion.cs => ModSettingsEqualityComparison.cs} (100%)

diff --git a/osu.Game.Tests/Mods/ModSettingsEqualityComparsion.cs b/osu.Game.Tests/Mods/ModSettingsEqualityComparison.cs
similarity index 100%
rename from osu.Game.Tests/Mods/ModSettingsEqualityComparsion.cs
rename to osu.Game.Tests/Mods/ModSettingsEqualityComparison.cs

From 16d34bcc0a04b319a53d86f20a863a837eb8d73d Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 12 Apr 2021 16:02:19 -0400
Subject: [PATCH 09030/10326] Expose the latest end time of storyboard elements

Co-authored-by: Marlina Bowring <marlina@umich.edu>
---
 osu.Game/Storyboards/IStoryboardElement.cs | 2 ++
 osu.Game/Storyboards/Storyboard.cs         | 9 +++++++++
 osu.Game/Storyboards/StoryboardSample.cs   | 2 ++
 osu.Game/Storyboards/StoryboardVideo.cs    | 2 ++
 4 files changed, 15 insertions(+)

diff --git a/osu.Game/Storyboards/IStoryboardElement.cs b/osu.Game/Storyboards/IStoryboardElement.cs
index c4c150a8a4..03f8b97212 100644
--- a/osu.Game/Storyboards/IStoryboardElement.cs
+++ b/osu.Game/Storyboards/IStoryboardElement.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Storyboards
 
         double StartTime { get; }
 
+        double EndTime { get; }
+
         Drawable CreateDrawable();
     }
 }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 1ba25cc11e..41058d9cb3 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -36,6 +36,15 @@ namespace osu.Game.Storyboards
         /// </remarks>
         public double? EarliestEventTime => Layers.SelectMany(l => l.Elements).OrderBy(e => e.StartTime).FirstOrDefault()?.StartTime;
 
+        /// <summary>
+        /// Across all layers, find the latest point in time that a storyboard element ends at.
+        /// Will return null if there are no elements.
+        /// </summary>
+        /// <remarks>
+        /// This iterates all elements and as such should be used sparingly or stored locally.
+        /// Videos and samples return StartTime as their EndTIme.
+        /// </remarks>
+        public double? LatestEventTime => Layers.SelectMany(l => l.Elements).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.
         /// </summary>
diff --git a/osu.Game/Storyboards/StoryboardSample.cs b/osu.Game/Storyboards/StoryboardSample.cs
index 5d6ce215f5..d0949c93a7 100644
--- a/osu.Game/Storyboards/StoryboardSample.cs
+++ b/osu.Game/Storyboards/StoryboardSample.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
+        public double EndTime => StartTime;
+
         public int Volume { get; }
 
         public IEnumerable<string> LookupNames => new[]
diff --git a/osu.Game/Storyboards/StoryboardVideo.cs b/osu.Game/Storyboards/StoryboardVideo.cs
index 4652e45852..1314bd7cb9 100644
--- a/osu.Game/Storyboards/StoryboardVideo.cs
+++ b/osu.Game/Storyboards/StoryboardVideo.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
+        public double EndTime => StartTime;
+
         public StoryboardVideo(string path, int offset)
         {
             Path = path;

From 66e74da2b74a10ed695b073bf1a92c5c1b7b7d32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 13:03:14 +0900
Subject: [PATCH 09031/10326] Fix regression in quick delete mouse action
 blocking

---
 .../Visual/Editing/TestSceneEditorQuickDelete.cs          | 3 ++-
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs | 8 ++++----
 .../Screens/Edit/Compose/Components/SelectionHandler.cs   | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
index 8a0f27b851..25e12b7a88 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
@@ -83,8 +83,9 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("right click", () => InputManager.Click(MouseButton.Right));
             AddAssert("slider has 2 points", () => slider.Path.ControlPoints.Count == 2);
 
-            // second click should nuke the object completely.
             AddStep("right click", () => InputManager.Click(MouseButton.Right));
+
+            // second click should nuke the object completely.
             AddAssert("no hitobjects in beatmap", () => EditorBeatmap.HitObjects.Count == 0);
 
             AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 64cf0e7512..b5a28dc022 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            bool selectionPerformed = beginClickSelection(e);
+            bool selectionPerformed = performMouseDownActions(e);
 
             // even if a selection didn't occur, a drag event may still move the selection.
             prepareSelectionMovement();
@@ -343,7 +343,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         /// <param name="e">The input event that triggered this selection.</param>
         /// <returns>Whether a selection was performed.</returns>
-        private bool beginClickSelection(MouseButtonEvent e)
+        private bool performMouseDownActions(MouseButtonEvent e)
         {
             // Iterate from the top of the input stack (blueprints closest to the front of the screen first).
             // Priority is given to already-selected blueprints.
@@ -351,7 +351,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 if (!blueprint.IsHovered) continue;
 
-                return clickSelectionBegan = SelectionHandler.HandleSelectionRequested(blueprint, e);
+                return clickSelectionBegan = SelectionHandler.MouseDownSelectionRequested(blueprint, e);
             }
 
             return false;
@@ -375,7 +375,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     {
                         if (!blueprint.IsHovered) continue;
 
-                        return clickSelectionBegan = SelectionHandler.HandleDeselectionRequested(blueprint, e);
+                        return clickSelectionBegan = SelectionHandler.MouseUpSelectionRequested(blueprint, e);
                     }
                 }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index e5e1100797..389ef78ed5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -220,12 +220,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="e">The mouse event responsible for selection.</param>
         /// <returns>Whether a selection was performed.</returns>
-        internal bool HandleSelectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
+        internal bool MouseDownSelectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
         {
             if (e.ShiftPressed && e.Button == MouseButton.Right)
             {
                 handleQuickDeletion(blueprint);
-                return false;
+                return true;
             }
 
             // while holding control, we only want to add to selection, not replace an existing selection.
@@ -244,7 +244,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="e">The mouse event responsible for deselection.</param>
         /// <returns>Whether a deselection was performed.</returns>
-        internal bool HandleDeselectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
+        internal bool MouseUpSelectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
         {
             if (blueprint.IsSelected)
             {

From 05d7fe289f3e6a48b855edc629e163fe7ea26fff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 13:09:18 +0900
Subject: [PATCH 09032/10326] Rename test scene in preparation for increasing
 scope

---
 ...estSceneEditorQuickDelete.cs => TestSceneEditorSelection.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Editing/{TestSceneEditorQuickDelete.cs => TestSceneEditorSelection.cs} (98%)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 25e12b7a88..36c4357432 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -18,7 +18,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editing
 {
-    public class TestSceneEditorQuickDelete : EditorTestScene
+    public class TestSceneEditorSelection : EditorTestScene
     {
         protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
 

From 7c975359d9b6b06a797a7121c38700e09c2f08b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 13:29:37 +0900
Subject: [PATCH 09033/10326] Add basic select/deselect tests

---
 .../Editing/TestSceneEditorSelection.cs       | 98 ++++++++++++++++++-
 1 file changed, 93 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 36c4357432..4f386972fa 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -27,6 +27,97 @@ namespace osu.Game.Tests.Visual.Editing
         private BlueprintContainer blueprintContainer
             => Editor.ChildrenOfType<BlueprintContainer>().First();
 
+        private void moveMouseToObject(HitObject obj)
+        {
+            AddStep("move mouse to object", () =>
+            {
+                var pos = blueprintContainer.SelectionBlueprints
+                                            .First(s => s.HitObject == obj)
+                                            .ChildrenOfType<HitCirclePiece>()
+                                            .First().ScreenSpaceDrawQuad.Centre;
+
+                InputManager.MoveMouseTo(pos);
+            });
+        }
+
+        [Test]
+        public void TestBasicSelect()
+        {
+            var addedObject = new HitCircle { StartTime = 100 };
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            moveMouseToObject(addedObject);
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
+
+            var addedObject2 = new HitCircle
+            {
+                StartTime = 100,
+                Position = new Vector2(100),
+            };
+
+            AddStep("add one more hitobject", () => EditorBeatmap.Add(addedObject2));
+            AddAssert("selection unchanged", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
+
+            moveMouseToObject(addedObject2);
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject2);
+        }
+
+        [Test]
+        public void TestMultiSelect()
+        {
+            var addedObjects = new[]
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 200, Position = new Vector2(50) },
+                new HitCircle { StartTime = 300, Position = new Vector2(100) },
+                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+            };
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects));
+
+            moveMouseToObject(addedObjects[0]);
+            AddStep("click first", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObjects[0]);
+
+            AddStep("hold control", () => InputManager.PressKey(Key.ControlLeft));
+
+            moveMouseToObject(addedObjects[1]);
+            AddStep("click second", () => InputManager.Click(MouseButton.Left));
+            AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
+
+            moveMouseToObject(addedObjects[2]);
+            AddStep("click third", () => InputManager.Click(MouseButton.Left));
+            AddAssert("3 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 3 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[2]));
+
+            moveMouseToObject(addedObjects[1]);
+            AddStep("click second", () => InputManager.Click(MouseButton.Left));
+            AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && !EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
+        }
+
+        [Test]
+        public void TestBasicDeselect()
+        {
+            var addedObject = new HitCircle { StartTime = 100 };
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            moveMouseToObject(addedObject);
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
+
+            AddStep("click away", () =>
+            {
+                InputManager.MoveMouseTo(blueprintContainer.ScreenSpaceDrawQuad.Centre);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("selection lost", () => EditorBeatmap.SelectedHitObjects.Count == 0);
+        }
+
         [Test]
         public void TestQuickDeleteRemovesObject()
         {
@@ -36,11 +127,8 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
 
-            AddStep("move mouse to object", () =>
-            {
-                var pos = blueprintContainer.ChildrenOfType<HitCirclePiece>().First().ScreenSpaceDrawQuad.Centre;
-                InputManager.MoveMouseTo(pos);
-            });
+            moveMouseToObject(addedObject);
+
             AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
             AddStep("right click", () => InputManager.Click(MouseButton.Right));
             AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));

From 516bd138e32ba1bd3e4ae35a150d4ae1e9b0d8ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 13:46:38 +0900
Subject: [PATCH 09034/10326] Add (previously failing) test coverage of drag
 from selection

---
 .../Editing/TestSceneEditorSelection.cs       | 57 +++++++++++++++----
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 4f386972fa..99f31b0c2a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.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 NUnit.Framework;
 using osu.Framework.Testing;
@@ -27,12 +28,12 @@ namespace osu.Game.Tests.Visual.Editing
         private BlueprintContainer blueprintContainer
             => Editor.ChildrenOfType<BlueprintContainer>().First();
 
-        private void moveMouseToObject(HitObject obj)
+        private void moveMouseToObject(Func<HitObject> targetFunc)
         {
             AddStep("move mouse to object", () =>
             {
                 var pos = blueprintContainer.SelectionBlueprints
-                                            .First(s => s.HitObject == obj)
+                                            .First(s => s.HitObject == targetFunc())
                                             .ChildrenOfType<HitCirclePiece>()
                                             .First().ScreenSpaceDrawQuad.Centre;
 
@@ -46,7 +47,7 @@ namespace osu.Game.Tests.Visual.Editing
             var addedObject = new HitCircle { StartTime = 100 };
             AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
 
-            moveMouseToObject(addedObject);
+            moveMouseToObject(() => addedObject);
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
 
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
@@ -60,7 +61,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("add one more hitobject", () => EditorBeatmap.Add(addedObject2));
             AddAssert("selection unchanged", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
 
-            moveMouseToObject(addedObject2);
+            moveMouseToObject(() => addedObject2);
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject2);
         }
@@ -78,33 +79,69 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects));
 
-            moveMouseToObject(addedObjects[0]);
+            moveMouseToObject(() => addedObjects[0]);
             AddStep("click first", () => InputManager.Click(MouseButton.Left));
 
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObjects[0]);
 
             AddStep("hold control", () => InputManager.PressKey(Key.ControlLeft));
 
-            moveMouseToObject(addedObjects[1]);
+            moveMouseToObject(() => addedObjects[1]);
             AddStep("click second", () => InputManager.Click(MouseButton.Left));
             AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
 
-            moveMouseToObject(addedObjects[2]);
+            moveMouseToObject(() => addedObjects[2]);
             AddStep("click third", () => InputManager.Click(MouseButton.Left));
             AddAssert("3 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 3 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[2]));
 
-            moveMouseToObject(addedObjects[1]);
+            moveMouseToObject(() => addedObjects[1]);
             AddStep("click second", () => InputManager.Click(MouseButton.Left));
             AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && !EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
         }
 
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestMultiSelectFromDrag(bool alreadySelectedBeforeDrag)
+        {
+            HitCircle[] addedObjects = null;
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 200, Position = new Vector2(50) },
+                new HitCircle { StartTime = 300, Position = new Vector2(100) },
+                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+            }));
+
+            moveMouseToObject(() => addedObjects[0]);
+            AddStep("click first", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("hold control", () => InputManager.PressKey(Key.ControlLeft));
+
+            moveMouseToObject(() => addedObjects[1]);
+
+            if (alreadySelectedBeforeDrag)
+                AddStep("click second", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("mouse down on second", () => InputManager.PressButton(MouseButton.Left));
+
+            AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
+
+            AddStep("drag to centre", () => InputManager.MoveMouseTo(blueprintContainer.ScreenSpaceDrawQuad.Centre));
+
+            AddAssert("positions changed", () => addedObjects[0].Position != Vector2.Zero && addedObjects[1].Position != new Vector2(50));
+
+            AddStep("release control", () => InputManager.ReleaseKey(Key.ControlLeft));
+            AddStep("mouse up", () => InputManager.ReleaseButton(MouseButton.Left));
+        }
+
         [Test]
         public void TestBasicDeselect()
         {
             var addedObject = new HitCircle { StartTime = 100 };
             AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
 
-            moveMouseToObject(addedObject);
+            moveMouseToObject(() => addedObject);
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
 
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
@@ -127,7 +164,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
 
-            moveMouseToObject(addedObject);
+            moveMouseToObject(() => addedObject);
 
             AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
             AddStep("right click", () => InputManager.Click(MouseButton.Right));

From a664efe12bc4e0fb38d71a43b25e59335cb8c7c1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 07:59:13 +0300
Subject: [PATCH 09035/10326] Fix history graph tooltips leaking to others

Since there was no check about which tooltip content came from which graph, all history graphs use the "Replays Watched" tooltip, as it is the latest created one.
---
 .../Profile/Sections/Historical/UserHistoryGraph.cs        | 7 ++++++-
 osu.Game/Overlays/Profile/UserGraph.cs                     | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index f9e5ccf618..52831b4243 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         {
             return new TooltipDisplayContent
             {
+                Name = tooltipCounterName,
                 Count = playCount.ToString("N0"),
                 Date = date.ToString("MMMM yyyy")
             };
@@ -39,14 +40,17 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
         protected class HistoryGraphTooltip : UserGraphTooltip
         {
+            private readonly string tooltipCounterName;
+
             public HistoryGraphTooltip(string tooltipCounterName)
                 : base(tooltipCounterName)
             {
+                this.tooltipCounterName = tooltipCounterName;
             }
 
             public override bool SetContent(object content)
             {
-                if (!(content is TooltipDisplayContent info))
+                if (!(content is TooltipDisplayContent info) || info.Name != tooltipCounterName)
                     return false;
 
                 Counter.Text = info.Count;
@@ -57,6 +61,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
         private class TooltipDisplayContent
         {
+            public string Name;
             public string Count;
             public string Date;
         }
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index cdfd722d68..e2eb5d5180 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -208,6 +208,7 @@ namespace osu.Game.Overlays.Profile
 
         protected abstract class UserGraphTooltip : VisibilityContainer, ITooltip
         {
+            protected new readonly OsuSpriteText Name;
             protected readonly OsuSpriteText Counter, BottomText;
             private readonly Box background;
 
@@ -237,7 +238,7 @@ namespace osu.Game.Overlays.Profile
                                 Spacing = new Vector2(3, 0),
                                 Children = new Drawable[]
                                 {
-                                    new OsuSpriteText
+                                    Name = new OsuSpriteText
                                     {
                                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
                                         Text = tooltipCounterName

From 4852630c93564dd7af90ab18ea67c55b416e2655 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 14:03:42 +0900
Subject: [PATCH 09036/10326] Fix import multiple file types via drag
 potentially reaching the wrong importer

---
 osu.Game/OsuGameBase.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index ca132df552..e285faab11 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -433,12 +433,15 @@ namespace osu.Game
             if (paths.Length == 0)
                 return;
 
-            var extension = Path.GetExtension(paths.First())?.ToLowerInvariant();
+            var filesPerExtension = paths.GroupBy(p => Path.GetExtension(p).ToLowerInvariant());
 
-            foreach (var importer in fileImporters)
+            foreach (var groups in filesPerExtension)
             {
-                if (importer.HandledExtensions.Contains(extension))
-                    await importer.Import(paths).ConfigureAwait(false);
+                foreach (var importer in fileImporters)
+                {
+                    if (importer.HandledExtensions.Contains(groups.Key))
+                        await importer.Import(groups.ToArray()).ConfigureAwait(false);
+                }
             }
         }
 

From d0f30b7b422afe385fd1fc0de7a28684bf0ab7ef Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 13 Apr 2021 14:29:47 +0900
Subject: [PATCH 09037/10326] Delay map completion one frame after the last
 judgment

This is a workaround of a timing issue.
KeyCounter is disabled while break time (`HasCompleted == true`).
When the last keypress is exactly at the same time the map ends, the last frame was considered in a break time while forward play but considered not in a break time while rewinding. This inconsistency made the last keypress not decremented in the key counter when a replay is rewound.
The situation regularly happens in osu!standard because the map ends right after the player hits the last hit circle. It was caught by `TestSceneGameplayRewinding`.

This commit makes the update of the map completion delayed one frame. The problematic keypress frame is now processed strictly before the map completion, and the map completion status is correctly rewound before the keypress frame.
---
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index 8aef615b5f..201a05e569 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public int JudgedHits { get; private set; }
 
+        private JudgementResult lastAppliedResult;
+
         private readonly BindableBool hasCompleted = new BindableBool();
 
         /// <summary>
@@ -53,12 +55,11 @@ namespace osu.Game.Rulesets.Scoring
         public void ApplyResult(JudgementResult result)
         {
             JudgedHits++;
+            lastAppliedResult = result;
 
             ApplyResultInternal(result);
 
             NewJudgement?.Invoke(result);
-
-            updateHasCompleted();
         }
 
         /// <summary>
@@ -69,8 +70,6 @@ namespace osu.Game.Rulesets.Scoring
         {
             JudgedHits--;
 
-            updateHasCompleted();
-
             RevertResultInternal(result);
         }
 
@@ -134,6 +133,10 @@ namespace osu.Game.Rulesets.Scoring
             }
         }
 
-        private void updateHasCompleted() => hasCompleted.Value = JudgedHits == MaxHits;
+        protected override void Update()
+        {
+            base.Update();
+            hasCompleted.Value = JudgedHits == MaxHits && (JudgedHits == 0 || lastAppliedResult.TimeAbsolute < Clock.CurrentTime);
+        }
     }
 }

From 273099d53c6b0dfab4a694055fc12bf45d5611f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 14:31:41 +0900
Subject: [PATCH 09038/10326] Don't store online IDs from score submission
 responses for now

Closes remaining portion of https://github.com/ppy/osu/issues/12372.
---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index d22199447d..b64d835c58 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -109,7 +109,12 @@ namespace osu.Game.Screens.Play
 
             request.Success += s =>
             {
-                score.ScoreInfo.OnlineScoreID = s.ID;
+                // For the time being, online ID responses are not really useful for anything.
+                // In addition, the IDs provided via new (lazer) endpoints are based on a different autoincrement from legacy (stable) scores.
+                //
+                // Until we better define the server-side logic behind this, let's not store the online ID to avoid potential unique constraint
+                // conflicts across various systems (ie. solo and multiplayer).
+                // score.ScoreInfo.OnlineScoreID = s.ID;
                 tcs.SetResult(true);
             };
 

From 4837cef095558c2ed301881471f3eaf76d6eb209 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 14:44:52 +0900
Subject: [PATCH 09039/10326] Use static for playfield centre positioning

---
 .../Checks/CheckOffscreenObjectsTest.cs       | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 33b839650f..4a5e4e18c0 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
@@ -16,6 +17,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
     [TestFixture]
     public class CheckOffscreenObjectsTest
     {
+        private static readonly Vector2 playfield_centre = OsuPlayfield.BASE_SIZE * 0.5f;
+
         private CheckOffscreenObjects check;
 
         [SetUp]
@@ -34,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                     new HitCircle
                     {
                         StartTime = 3000,
-                        Position = new Vector2(320, 240) // Playfield is 640 x 480.
+                        Position = playfield_centre // Playfield is 640 x 480.
                     }
                 }
             };
@@ -136,11 +139,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                     new Slider
                     {
                         StartTime = 3000,
-                        Position = new Vector2(320, 240),
+                        Position = playfield_centre,
                         Path = new SliderPath(new[]
                         {
                             new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                            new PathControlPoint(new Vector2(0, -235))
+                            new PathControlPoint(new Vector2(0, -playfield_centre.Y + 5))
                         }),
                     }
                 }
@@ -161,11 +164,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                     new Slider
                     {
                         StartTime = 3000,
-                        Position = new Vector2(320, 240),
+                        Position = playfield_centre,
                         Path = new SliderPath(new[]
                         {
                             new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                            new PathControlPoint(new Vector2(0, -235))
+                            new PathControlPoint(new Vector2(0, -playfield_centre.Y + 5))
                         }),
                         StackHeight = 5
                     }
@@ -189,7 +192,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Path = new SliderPath(new[]
                         {
                             new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                            new PathControlPoint(new Vector2(320, 240))
+                            new PathControlPoint(playfield_centre)
                         }),
                     }
                 }
@@ -208,11 +211,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                     new Slider
                     {
                         StartTime = 3000,
-                        Position = new Vector2(320, 240),
+                        Position = playfield_centre,
                         Path = new SliderPath(new[]
                         {
                             new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                            new PathControlPoint(new Vector2(-320, -240))
+                            new PathControlPoint(-playfield_centre)
                         }),
                     }
                 }
@@ -231,7 +234,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                     new Slider
                     {
                         StartTime = 3000,
-                        Position = new Vector2(320, 240),
+                        Position = playfield_centre,
                         Path = new SliderPath(new[]
                         {
                             // Circular arc shoots over the top of the screen.

From b45d7de4eccbd9aecbf621afefc6661ca986fa9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 15:04:01 +0900
Subject: [PATCH 09040/10326] Update asserts to use better nunit specifications

---
 .../Checks/CheckOffscreenObjectsTest.cs       | 29 ++++++-------------
 .../Editing/Checks/CheckBackgroundTest.cs     | 16 ++++------
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 4a5e4e18c0..9f9ba0e8db 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;
@@ -42,9 +43,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -62,9 +61,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -124,9 +121,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -149,9 +144,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -252,21 +245,17 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
         }
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
         }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
index 327abcab6c..635e3bb0f3 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
@@ -39,9 +39,7 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestBackgroundSetAndInFiles()
         {
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -50,11 +48,9 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
 
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckBackground.IssueTemplateDoesNotExist);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackground.IssueTemplateDoesNotExist);
         }
 
         [Test]
@@ -63,11 +59,9 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.Metadata.BackgroundFile = null;
 
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckBackground.IssueTemplateNoneSet);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackground.IssueTemplateNoneSet);
         }
     }
 }

From 9f8af03a70633d32fa11842c69ea73b1ccf72f11 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 09:28:58 +0300
Subject: [PATCH 09041/10326] Remove irrelevant change

---
 osu.Game/Overlays/Profile/UserGraph.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index e2eb5d5180..cdfd722d68 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -208,7 +208,6 @@ namespace osu.Game.Overlays.Profile
 
         protected abstract class UserGraphTooltip : VisibilityContainer, ITooltip
         {
-            protected new readonly OsuSpriteText Name;
             protected readonly OsuSpriteText Counter, BottomText;
             private readonly Box background;
 
@@ -238,7 +237,7 @@ namespace osu.Game.Overlays.Profile
                                 Spacing = new Vector2(3, 0),
                                 Children = new Drawable[]
                                 {
-                                    Name = new OsuSpriteText
+                                    new OsuSpriteText
                                     {
                                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
                                         Text = tooltipCounterName

From fbc6fb8fc55ad431173ad61072a84e26629469e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 15:35:57 +0900
Subject: [PATCH 09042/10326] Split out common logic into private method and
 add inline comment for future visitors

---
 .../Sliders/Components/PathControlPointPiece.cs           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 7686043c43..ce9580d0f4 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -58,11 +58,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
-            PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
+
+            // we don't want to run the path type update on construction as it may inadvertently change the slider.
+            cachePoints(slider);
 
             slider.Path.Version.BindValueChanged(_ =>
             {
-                PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
+                cachePoints(slider);
                 updatePathType();
             });
 
@@ -206,6 +208,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override void OnDragEnd(DragEndEvent e) => changeHandler?.EndChange();
 
+        private void cachePoints(Slider slider) => PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
+
         /// <summary>
         /// Handles correction of invalid path types.
         /// </summary>

From 57ba7b7cbbbd93870978d047b6edb957cd49d8cf Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 13 Apr 2021 15:55:23 +0900
Subject: [PATCH 09043/10326] Partially revert the changes of `CurrentFrame`
 and `NextFrame` for compatibility

Making those always non-null is postponed as when a replay's frame contains keypress the behavior is changed.
Previously, the key is pressed at the time of the first frame. But using non-null frames means the key is pressed at negative infinity.
However, I think the new way of always using non-null frames makes the client code so I plan to bundle the change to more breaking changes.
---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 22 +++++++++----------
 .../Replays/FramedReplayInputHandler.cs       |  9 ++++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index 954871595e..a42b7d54ee 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -84,11 +84,11 @@ namespace osu.Game.Tests.NonVisual
             // exited important section
             setTime(8200, 8000);
             confirmCurrentFrame(7);
-            confirmNextFrame(7);
+            confirmNextFrame(null);
 
             setTime(8200, 8200);
             confirmCurrentFrame(7);
-            confirmNextFrame(7);
+            confirmNextFrame(null);
         }
 
         [Test]
@@ -97,11 +97,11 @@ namespace osu.Game.Tests.NonVisual
             setReplayFrames();
 
             setTime(-1000, -1000);
-            confirmCurrentFrame(0);
+            confirmCurrentFrame(null);
             confirmNextFrame(0);
 
             setTime(-500, -500);
-            confirmCurrentFrame(0);
+            confirmCurrentFrame(null);
             confirmNextFrame(0);
 
             setTime(0, 0);
@@ -145,7 +145,7 @@ namespace osu.Game.Tests.NonVisual
             confirmNextFrame(1);
 
             setTime(-500, -500);
-            confirmCurrentFrame(0);
+            confirmCurrentFrame(null);
             confirmNextFrame(0);
         }
 
@@ -231,7 +231,7 @@ namespace osu.Game.Tests.NonVisual
             Assert.IsFalse(handler.WaitingForFrame, "Should not be waiting yet");
             setTime(1000, 1000);
             confirmCurrentFrame(1);
-            confirmNextFrame(1);
+            confirmNextFrame(null);
             Assert.IsTrue(handler.WaitingForFrame, "Should be waiting");
 
             // cannot seek beyond the last frame
@@ -243,7 +243,7 @@ namespace osu.Game.Tests.NonVisual
 
             // can seek to the point before the first frame, however
             setTime(-100, -100);
-            confirmCurrentFrame(0);
+            confirmCurrentFrame(null);
             confirmNextFrame(0);
 
             fastForwardToPoint(1000);
@@ -311,14 +311,14 @@ namespace osu.Game.Tests.NonVisual
             Assert.AreEqual(expect, handler.SetFrameFromTime(set), "Unexpected return value");
         }
 
-        private void confirmCurrentFrame(int frame)
+        private void confirmCurrentFrame(int? frame)
         {
-            Assert.AreEqual(replay.Frames[frame].Time, handler.CurrentFrame.Time, "Unexpected current frame");
+            Assert.AreEqual(frame is int x ? replay.Frames[x].Time : (double?)null, handler.CurrentFrame?.Time, "Unexpected current frame");
         }
 
-        private void confirmNextFrame(int frame)
+        private void confirmNextFrame(int? frame)
         {
-            Assert.AreEqual(replay.Frames[frame].Time, handler.NextFrame.Time, "Unexpected next frame");
+            Assert.AreEqual(frame is int x ? replay.Frames[x].Time : (double?)null, handler.NextFrame?.Time, "Unexpected next frame");
         }
 
         private class TestReplayFrame : ReplayFrame
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index c3cd957f0d..a7f11b1e6f 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Rulesets.Replays
         /// The current frame of the replay.
         /// The current time is always between the start and the end time of the current frame.
         /// </summary>
+        /// <remarks>Returns null if the current time is strictly before the first frame.</remarks>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
         public TFrame CurrentFrame
         {
@@ -38,15 +39,15 @@ namespace osu.Game.Rulesets.Replays
                 if (!HasFrames)
                     throw new InvalidOperationException($"Attempted to get {nameof(CurrentFrame)} of an empty replay");
 
-                return (TFrame)Frames[Math.Max(0, currentFrameIndex)];
+                return currentFrameIndex == -1 ? null : (TFrame)Frames[currentFrameIndex];
             }
         }
 
         /// <summary>
         /// The next frame of the replay.
         /// The start time is always greater or equal to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
-        /// If it is before the first frame of the replay or the after the last frame of the replay, <see cref="CurrentFrame"/> and <see cref="NextFrame"/> agree.
         /// </summary>
+        /// <remarks>Returns null if the current frame is the last frame.</remarks>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
         public TFrame NextFrame
         {
@@ -55,7 +56,7 @@ namespace osu.Game.Rulesets.Replays
                 if (!HasFrames)
                     throw new InvalidOperationException($"Attempted to get {nameof(NextFrame)} of an empty replay");
 
-                return (TFrame)Frames[Math.Min(currentFrameIndex + 1, Frames.Count - 1)];
+                return currentFrameIndex == Frames.Count - 1 ? null : (TFrame)Frames[currentFrameIndex + 1];
             }
         }
 
@@ -96,7 +97,7 @@ namespace osu.Game.Rulesets.Replays
         {
             get
             {
-                if (!HasFrames || !FrameAccuratePlayback)
+                if (!HasFrames || !FrameAccuratePlayback || CurrentFrame == null)
                     return false;
 
                 return IsImportant(CurrentFrame) && // a button is in a pressed state

From a9652b7b259b2921648c220e1d7f2ccf98276afa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 16:05:12 +0900
Subject: [PATCH 09044/10326] Start TimelineTestScene in a more visible place

---
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 1da6433707..88b4614791 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -64,6 +64,13 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Clock.Seek(2500);
+        }
+
         public abstract Drawable CreateTestComponent();
 
         private class AudioVisualiser : CompositeDrawable

From ebf97ff48ff43a5879b19fcb9365c84c8369fe21 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 16:25:43 +0900
Subject: [PATCH 09045/10326] Update timeline ticks to use width as a
 differentiation method, rather than height

---
 .../Visualisations/PointVisualisation.cs      | 10 ++--
 .../Timeline/TimelineTickDisplay.cs           | 56 +++++++++++--------
 2 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
index b0ecffdd24..b5c4cd6dda 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
 {
@@ -12,7 +11,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     /// </summary>
     public class PointVisualisation : Box
     {
-        public const float WIDTH = 1;
+        public const float MAX_WIDTH = 5;
 
         public PointVisualisation(double startTime)
             : this()
@@ -27,8 +26,11 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
             RelativePositionAxes = Axes.X;
             RelativeSizeAxes = Axes.Y;
 
-            Width = WIDTH;
-            EdgeSmoothness = new Vector2(WIDTH, 0);
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.Centre;
+
+            Width = MAX_WIDTH;
+            Height = 0.75f;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index c070c833f8..7ec5bb7197 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -6,9 +6,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -33,6 +31,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private static readonly int highest_divisor = BindableBeatDivisor.VALID_DIVISORS.Last();
+
         public TimelineTickDisplay()
         {
             RelativeSizeAxes = Axes.Both;
@@ -80,8 +80,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (timeline != null)
             {
                 var newRange = (
-                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X - PointVisualisation.WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X,
-                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X + PointVisualisation.WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X);
+                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X - PointVisualisation.MAX_WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X,
+                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X + PointVisualisation.MAX_WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X);
 
                 if (visibleRange != newRange)
                 {
@@ -100,7 +100,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private void createTicks()
         {
             int drawableIndex = 0;
-            int highestDivisor = BindableBeatDivisor.VALID_DIVISORS.Last();
 
             nextMinTick = null;
             nextMaxTick = null;
@@ -131,25 +130,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
                         var colour = BindableBeatDivisor.GetColourFor(divisor, colours);
 
-                        bool isMainBeat = indexInBar == 0;
-
                         // even though "bar lines" take up the full vertical space, we render them in two pieces because it allows for less anchor/origin churn.
-                        float height = isMainBeat ? 0.5f : 0.4f - (float)divisor / highestDivisor * 0.2f;
-                        float gradientOpacity = isMainBeat ? 1 : 0;
 
-                        var topPoint = getNextUsablePoint();
-                        topPoint.X = xPos;
-                        topPoint.Height = height;
-                        topPoint.Colour = ColourInfo.GradientVertical(colour, colour.Opacity(gradientOpacity));
-                        topPoint.Anchor = Anchor.TopLeft;
-                        topPoint.Origin = Anchor.TopCentre;
-
-                        var bottomPoint = getNextUsablePoint();
-                        bottomPoint.X = xPos;
-                        bottomPoint.Anchor = Anchor.BottomLeft;
-                        bottomPoint.Colour = ColourInfo.GradientVertical(colour.Opacity(gradientOpacity), colour);
-                        bottomPoint.Origin = Anchor.BottomCentre;
-                        bottomPoint.Height = height;
+                        var line = getNextUsableLine();
+                        line.X = xPos;
+                        line.Width = PointVisualisation.MAX_WIDTH * getWidth(indexInBar, divisor);
+                        line.Colour = colour;
                     }
 
                     beat++;
@@ -168,7 +154,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             tickCache.Validate();
 
-            Drawable getNextUsablePoint()
+            Drawable getNextUsableLine()
             {
                 PointVisualisation point;
                 if (drawableIndex >= Count)
@@ -183,6 +169,30 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
+        private static float getWidth(int indexInBar, int divisor)
+        {
+            if (indexInBar == 0)
+                return 1;
+
+            switch (divisor)
+            {
+                case 1:
+                case 2:
+                    return 0.6f;
+
+                case 3:
+                case 4:
+                    return 0.5f;
+
+                case 6:
+                case 8:
+                    return 0.4f;
+
+                default:
+                    return 0.3f;
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 27e851c2eed2b0edc1833a620e7ec4e9e85973f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 16:41:29 +0900
Subject: [PATCH 09046/10326] Also adjust height

---
 .../Visualisations/PointVisualisation.cs      |  2 +-
 .../Timeline/TimelineTickDisplay.cs           | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
index b5c4cd6dda..53a1f94731 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     /// </summary>
     public class PointVisualisation : Box
     {
-        public const float MAX_WIDTH = 5;
+        public const float MAX_WIDTH = 4;
 
         public PointVisualisation(double startTime)
             : this()
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 7ec5bb7197..3aaf0451c8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -135,6 +135,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         var line = getNextUsableLine();
                         line.X = xPos;
                         line.Width = PointVisualisation.MAX_WIDTH * getWidth(indexInBar, divisor);
+                        line.Height = 0.9f * getHeight(indexInBar, divisor);
                         line.Colour = colour;
                     }
 
@@ -193,6 +194,30 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
+        private static float getHeight(int indexInBar, int divisor)
+        {
+            if (indexInBar == 0)
+                return 1;
+
+            switch (divisor)
+            {
+                case 1:
+                case 2:
+                    return 0.9f;
+
+                case 3:
+                case 4:
+                    return 0.8f;
+
+                case 6:
+                case 8:
+                    return 0.7f;
+
+                default:
+                    return 0.6f;
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 5a06db8a113dfd012a46b304f9967508f0ca609e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 16:48:05 +0900
Subject: [PATCH 09047/10326] Change default editor waveform opacity to 25%

The previous setting felt way too high.
---
 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 387cfbb193..0525e84077 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Configuration
 
             SetDefault(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
 
-            SetDefault(OsuSetting.EditorWaveformOpacity, 1f);
+            SetDefault(OsuSetting.EditorWaveformOpacity, 0.25f);
         }
 
         public OsuConfigManager(Storage storage)

From 0932daeaa8564fe9fd9e25560abe1bfa5a8b20b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 16:50:03 +0900
Subject: [PATCH 09048/10326] Force the new default on update

---
 osu.Game/Configuration/OsuConfigManager.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 0525e84077..21a1a1d430 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -169,14 +169,9 @@ namespace osu.Game.Configuration
 
             int combined = (year * 10000) + monthDay;
 
-            if (combined < 20200305)
+            if (combined < 20210413)
             {
-                // 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;
+                SetValue(OsuSetting.EditorWaveformOpacity, 0.25f);
             }
         }
 

From 36510309d10105ddcdbea2b45f36e941f6be5415 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 09:24:35 +0300
Subject: [PATCH 09049/10326] Merge `EnableUserDim` and `IgnoreUserSettings` to
 one bindable

---
 .../Visual/Background/TestSceneUserDimBackgrounds.cs | 12 ++++++------
 osu.Game/Graphics/Containers/UserDimContainer.cs     |  8 +-------
 osu.Game/Rulesets/Mods/ModCinema.cs                  |  3 +--
 .../Screens/Backgrounds/BackgroundScreenBeatmap.cs   |  8 ++++----
 osu.Game/Screens/Edit/Editor.cs                      |  2 +-
 osu.Game/Screens/Play/Player.cs                      |  4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs                |  6 +++---
 7 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index ba4d12b19f..a4c28651df 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -142,9 +142,9 @@ namespace osu.Game.Tests.Visual.Background
         {
             performFullSetup();
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
-            AddStep("Enable user dim", () => songSelect.DimEnabled.Value = false);
+            AddStep("Disable user dim", () => songSelect.IgnoreUserSettings.Value = true);
             AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsUserBlurDisabled());
-            AddStep("Disable user dim", () => songSelect.DimEnabled.Value = true);
+            AddStep("Enable user dim", () => songSelect.IgnoreUserSettings.Value = false);
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
         }
 
@@ -161,10 +161,10 @@ namespace osu.Game.Tests.Visual.Background
                 player.ReplacesBackground.Value = true;
                 player.StoryboardEnabled.Value = true;
             });
-            AddStep("Enable user dim", () => player.DimmableStoryboard.EnableUserDim.Value = true);
+            AddStep("Enable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = false);
             AddStep("Set dim level to 1", () => songSelect.DimLevel.Value = 1f);
             AddUntilStep("Storyboard is invisible", () => !player.IsStoryboardVisible);
-            AddStep("Disable user dim", () => player.DimmableStoryboard.EnableUserDim.Value = false);
+            AddStep("Disable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = true);
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
         }
 
@@ -281,11 +281,11 @@ namespace osu.Game.Tests.Visual.Background
             protected override BackgroundScreen CreateBackground()
             {
                 background = new FadeAccessibleBackground(Beatmap.Value);
-                DimEnabled.BindTo(background.EnableUserDim);
+                IgnoreUserSettings.BindTo(background.IgnoreUserSettings);
                 return background;
             }
 
-            public readonly Bindable<bool> DimEnabled = new Bindable<bool>();
+            public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
             public readonly Bindable<double> DimLevel = new BindableDouble();
             public readonly Bindable<double> BlurLevel = new BindableDouble();
 
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 39c1fdad52..4e555ac1eb 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -23,11 +23,6 @@ namespace osu.Game.Graphics.Containers
 
         protected const double BACKGROUND_FADE_DURATION = 800;
 
-        /// <summary>
-        /// Whether or not user-configured dim levels should be applied to the container.
-        /// </summary>
-        public readonly Bindable<bool> EnableUserDim = new Bindable<bool>(true);
-
         /// <summary>
         /// Whether or not user-configured settings relating to brightness of elements should be ignored
         /// </summary>
@@ -57,7 +52,7 @@ namespace osu.Game.Graphics.Containers
 
         private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
 
-        protected float DimLevel => Math.Max(EnableUserDim.Value && !IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
+        protected float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
 
         protected override Container<Drawable> Content => dimContent;
 
@@ -78,7 +73,6 @@ namespace osu.Game.Graphics.Containers
             LightenDuringBreaks = config.GetBindable<bool>(OsuSetting.LightenDuringBreaks);
             ShowStoryboard = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
 
-            EnableUserDim.ValueChanged += _ => UpdateVisuals();
             UserDimLevel.ValueChanged += _ => UpdateVisuals();
             LightenDuringBreaks.ValueChanged += _ => UpdateVisuals();
             IsBreakTime.ValueChanged += _ => UpdateVisuals();
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index eb0473016a..c78088ba2d 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -37,8 +37,7 @@ namespace osu.Game.Rulesets.Mods
 
         public void ApplyToPlayer(Player player)
         {
-            player.ApplyToBackground(b => b.EnableUserDim.Value = false);
-
+            player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
             player.DimmableStoryboard.IgnoreUserSettings.Value = true;
 
             player.BreakOverlay.Hide();
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index b08455be95..d27211144e 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Screens.Backgrounds
         private WorkingBeatmap beatmap;
 
         /// <summary>
-        /// Whether or not user dim settings should be applied to this Background.
+        /// Whether or not user-configured settings relating to brightness of elements should be ignored
         /// </summary>
-        public readonly Bindable<bool> EnableUserDim = new Bindable<bool>();
+        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
 
         public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
 
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
-            dimmable.EnableUserDim.BindTo(EnableUserDim);
+            dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);
 
@@ -148,7 +148,7 @@ namespace osu.Game.Screens.Backgrounds
             /// <summary>
             /// As an optimisation, we add the two blur portions to be applied rather than actually applying two separate blurs.
             /// </summary>
-            private Vector2 blurTarget => EnableUserDim.Value
+            private Vector2 blurTarget => !IgnoreUserSettings.Value
                 ? new Vector2(BlurAmount.Value + (float)userBlurLevel.Value * USER_BLUR_FACTOR)
                 : new Vector2(BlurAmount.Value);
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 0759e21382..64350fb56e 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -462,7 +462,7 @@ namespace osu.Game.Screens.Edit
                 // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
                 b.FadeColour(Color4.DarkGray, 500);
 
-                b.EnableUserDim.Value = false;
+                b.IgnoreUserSettings.Value = true;
                 b.BlurAmount.Value = 0;
             });
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index efe5d26409..dd3f58439b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -764,7 +764,7 @@ namespace osu.Game.Screens.Play
 
             ApplyToBackground(b =>
             {
-                b.EnableUserDim.Value = true;
+                b.IgnoreUserSettings.Value = false;
                 b.BlurAmount.Value = 0;
 
                 // bind component bindables.
@@ -913,7 +913,7 @@ namespace osu.Game.Screens.Play
             float fadeOutDuration = instant ? 0 : 250;
             this.FadeOut(fadeOutDuration);
 
-            ApplyToBackground(b => b.EnableUserDim.Value = false);
+            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
             storyboardReplacesBackground.Value = false;
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 679b3c7313..cf15104809 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Screens.Play
             content.ScaleTo(0.7f, 150, Easing.InQuint);
             this.FadeOut(150);
 
-            ApplyToBackground(b => b.EnableUserDim.Value = false);
+            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
 
             BackgroundBrightnessReduction = false;
             Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
@@ -277,7 +277,7 @@ namespace osu.Game.Screens.Play
                 // Preview user-defined background dim and blur when hovered on the visual settings panel.
                 ApplyToBackground(b =>
                 {
-                    b.EnableUserDim.Value = true;
+                    b.IgnoreUserSettings.Value = false;
                     b.BlurAmount.Value = 0;
                 });
 
@@ -288,7 +288,7 @@ namespace osu.Game.Screens.Play
                 ApplyToBackground(b =>
                 {
                     // Returns background dim and blur to the values specified by PlayerLoader.
-                    b.EnableUserDim.Value = false;
+                    b.IgnoreUserSettings.Value = true;
                     b.BlurAmount.Value = BACKGROUND_BLUR;
                 });
 

From 98c25b2e71c1aef8ad2973c0cb7ce96b33faff42 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:33:08 +0200
Subject: [PATCH 09050/10326] Remove unused import

---
 .../Editor/Checks/CheckOffscreenObjectsTest.cs                   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 9f9ba0e8db..f9445a9a96 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;

From c8cb4286f6e61eeba14b4b0256d5a17d781f6bd9 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:35:06 +0200
Subject: [PATCH 09051/10326] Add reference for screen bounding box numbers

---
 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index c241db7e06..27cae2ecc1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -11,8 +11,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 {
     public class CheckOffscreenObjects : ICheck
     {
-        // These are close approximates to the edges of the screen
-        // in gameplay on a 4:3 aspect ratio for osu!stable.
+        // A close approximation for the bounding box of the screen in gameplay on 4:3 aspect ratio.
+        // Uses gameplay space coordinates (512 x 384 playfield / 640 x 480 screen area).
+        // See https://github.com/ppy/osu/pull/12361#discussion_r612199777 for reference.
         private const int min_x = -67;
         private const int min_y = -60;
         private const int max_x = 579;

From b41e3a2e7a84046981007ebc6a6d2ecd85d1b42b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 17:38:13 +0900
Subject: [PATCH 09052/10326] Remove unused using statement

---
 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 21a1a1d430..f9b1c9618b 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics;
-using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Extensions;

From 60c2494b316827c691327a55793750871753a190 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:40:56 +0200
Subject: [PATCH 09053/10326] Make `BeatmapVerifier` an interface

---
 .../Edit/OsuBeatmapVerifier.cs                 | 12 ++----------
 osu.Game.Rulesets.Osu/OsuRuleset.cs            |  2 +-
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs      | 18 ++----------------
 osu.Game/Rulesets/Ruleset.cs                   |  2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs   |  2 +-
 5 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 2faa239720..1c7ab00bbb 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -10,21 +10,13 @@ using osu.Game.Rulesets.Osu.Edit.Checks;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class OsuBeatmapVerifier : BeatmapVerifier
+    public class OsuBeatmapVerifier : IBeatmapVerifier
     {
         private readonly List<ICheck> checks = new List<ICheck>
         {
             new CheckOffscreenObjects()
         };
 
-        public override IEnumerable<Issue> Run(IBeatmap beatmap)
-        {
-            // Also run mode-invariant checks.
-            foreach (var issue in base.Run(beatmap))
-                yield return issue;
-
-            foreach (var issue in checks.SelectMany(check => check.Run(beatmap)))
-                yield return issue;
-        }
+        public IEnumerable<Issue> Run(IBeatmap beatmap) => checks.SelectMany(check => check.Run(beatmap));
     }
 }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 63da100a04..d6375fa6e3 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
-        public override BeatmapVerifier CreateBeatmapVerifier() => new OsuBeatmapVerifier();
+        public override IBeatmapVerifier CreateBeatmapVerifier() => new OsuBeatmapVerifier();
 
         public override string Description => "osu!";
 
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 1d0508705a..2bafacefa3 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -2,27 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public abstract class BeatmapVerifier
+    public interface IBeatmapVerifier
     {
-        /// <summary>
-        /// Checks which are performed regardless of ruleset.
-        /// These handle things like beatmap metadata, timing, and other ruleset agnostic elements.
-        /// </summary>
-        private readonly IReadOnlyList<ICheck> generalChecks = new List<ICheck>
-        {
-            new CheckBackground()
-        };
-
-        public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
-        {
-            return generalChecks.SelectMany(check => check.Run(beatmap));
-        }
+        public IEnumerable<Issue> Run(IBeatmap beatmap);
     }
 }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 2a29d88c89..b501c55aef 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
-        public virtual BeatmapVerifier CreateBeatmapVerifier() => null;
+        public virtual IBeatmapVerifier CreateBeatmapVerifier() => null;
 
         public virtual Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.QuestionCircle };
 
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index a3d808ce62..a733c9c176 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit.Verify
     public class VerifyScreen : EditorScreen
     {
         private Ruleset ruleset;
-        private static BeatmapVerifier beatmapVerifier;
+        private static IBeatmapVerifier beatmapVerifier;
 
         [Cached]
         private Bindable<Issue> selectedIssue = new Bindable<Issue>();

From 304fe5cd341027b19da18b82f394e5fc444a2883 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:41:02 +0200
Subject: [PATCH 09054/10326] Add `CheckBackground` to `OsuBeatmapVerifier`

---
 osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 1c7ab00bbb..66ef74ab08 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Osu.Edit.Checks;
 
@@ -14,6 +15,10 @@ namespace osu.Game.Rulesets.Osu.Edit
     {
         private readonly List<ICheck> checks = new List<ICheck>
         {
+            // General checks
+            new CheckBackground(),
+
+            // Ruleset-specific checks
             new CheckOffscreenObjects()
         };
 

From 15658eda554f0574dd85f8d9e4b557ace3229c2d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 09:56:43 +0300
Subject: [PATCH 09055/10326] Add failing test case

---
 .../Background/TestSceneUserDimBackgrounds.cs | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index a4c28651df..655b426e43 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -168,6 +168,29 @@ namespace osu.Game.Tests.Visual.Background
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
         }
 
+        [Test]
+        public void TestStoryboardIgnoreUserSettings()
+        {
+            performFullSetup();
+            createFakeStoryboard();
+            AddStep("Enable replacing background", () => player.ReplacesBackground.Value = true);
+
+            AddUntilStep("Storyboard is invisible", () => !player.IsStoryboardVisible);
+            AddUntilStep("Background is visible", () => songSelect.IsBackgroundVisible());
+
+            AddStep("Ignore user settings", () =>
+            {
+                player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+                player.DimmableStoryboard.IgnoreUserSettings.Value = true;
+            });
+            AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
+            AddUntilStep("Background is invisible", () => songSelect.IsBackgroundInvisible());
+
+            AddStep("Disable background replacement", () => player.ReplacesBackground.Value = false);
+            AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
+            AddUntilStep("Background is visible", () => songSelect.IsBackgroundVisible());
+        }
+
         /// <summary>
         /// Check if the visual settings container retains dim and blur when pausing
         /// </summary>

From 7c53bebfd4a5e1ac99b62ec12f0521616b6994dd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 09:25:08 +0300
Subject: [PATCH 09056/10326] Fix beatmap background not hiding when user
 settings ignored and storyboard replaces background

---
 osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index d27211144e..10d381b8b7 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -166,7 +166,9 @@ namespace osu.Game.Screens.Backgrounds
                 BlurAmount.ValueChanged += _ => UpdateVisuals();
             }
 
-            protected override bool ShowDimContent => !ShowStoryboard.Value || !StoryboardReplacesBackground.Value; // The background needs to be hidden in the case of it being replaced by the storyboard
+            protected override bool ShowDimContent
+                // The background needs to be hidden in the case of it being replaced by the storyboard
+                => (!ShowStoryboard.Value && !IgnoreUserSettings.Value) || !StoryboardReplacesBackground.Value;
 
             protected override void UpdateVisuals()
             {

From aa5fe2e9fcdbe3f2dd6ac1d63328c4f5f4af477d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 11:02:01 +0200
Subject: [PATCH 09057/10326] Rename `BeatmapVerifier` -> `IBeatmapVerifier`

---
 .../Rulesets/Edit/{BeatmapVerifier.cs => IBeatmapVerifier.cs}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Rulesets/Edit/{BeatmapVerifier.cs => IBeatmapVerifier.cs} (100%)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
similarity index 100%
rename from osu.Game/Rulesets/Edit/BeatmapVerifier.cs
rename to osu.Game/Rulesets/Edit/IBeatmapVerifier.cs

From 4618728bf016fc3253d0cce337c230a2ed0f2fac Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 11:35:12 +0200
Subject: [PATCH 09058/10326] Add test case

---
 .../TestSceneOsuEditorSelectInvalidPath.cs    | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs
new file mode 100644
index 0000000000..d0348c1b6b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.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 NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    public class TestSceneOsuEditorSelectInvalidPath : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
+
+        [Test]
+        public void TestSelectDoesNotModify()
+        {
+            Slider slider = new Slider { StartTime = 0, Position = new Vector2(320, 40) };
+
+            PathControlPoint[] points =
+            {
+                new PathControlPoint(new Vector2(0), PathType.PerfectCurve),
+                new PathControlPoint(new Vector2(-100, 0)),
+                new PathControlPoint(new Vector2(100, 20))
+            };
+
+            int preSelectVersion = -1;
+            AddStep("add slider", () =>
+            {
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+                preSelectVersion = slider.Path.Version.Value;
+            });
+
+            AddStep("select added slider", () => EditorBeatmap.SelectedHitObjects.Add(slider));
+
+            AddAssert("slider same path", () => slider.Path.Version.Value == preSelectVersion);
+        }
+    }
+}

From fca9c70c1b47bd986fe089e675f85ea44d9b6690 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 17:39:12 +0900
Subject: [PATCH 09059/10326] Move timeline hit object test to immediately
 viewable area

---
 .../Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index 35f394fe1d..88246381bf 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual.Editing
                 EditorBeatmap.Add(new Spinner
                 {
                     Position = new Vector2(256, 256),
-                    StartTime = 150,
+                    StartTime = 2700,
                     Duration = 500
                 });
             });

From 00f235760d237e6902162c4f1675cbedbc0063ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 18:12:46 +0900
Subject: [PATCH 09060/10326] Update visual appearance of timeline blueprints
 to close match new designs

---
 .../TestSceneTimelineHitObjectBlueprint.cs    |   6 +-
 .../Timeline/TimelineBlueprintContainer.cs    |   3 +-
 .../Timeline/TimelineHitObjectBlueprint.cs    | 166 +++++++++---------
 3 files changed, 92 insertions(+), 83 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index 88246381bf..e6fad33a51 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestDisallowZeroDurationObjects()
         {
-            DragBar dragBar;
+            DragArea dragArea;
 
             AddStep("add spinner", () =>
             {
@@ -37,8 +37,8 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("hold down drag bar", () =>
             {
                 // distinguishes between the actual drag bar and its "underlay shadow".
-                dragBar = this.ChildrenOfType<DragBar>().Single(bar => bar.HandlePositionalInput);
-                InputManager.MoveMouseTo(dragBar);
+                dragArea = this.ChildrenOfType<DragArea>().Single(bar => bar.HandlePositionalInput);
+                InputManager.MoveMouseTo(dragArea);
                 InputManager.PressButton(MouseButton.Left);
             });
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index be34c8d57e..7427473a35 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -63,7 +63,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             AddInternal(backgroundBox = new SelectableAreaBackground
             {
-                Colour = Color4.Black
+                Colour = Color4.Black,
+                Depth = float.MaxValue,
             });
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index d24614299c..179abd0a26 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using JetBrains.Annotations;
 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,9 +29,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class TimelineHitObjectBlueprint : SelectionBlueprint
     {
-        private const float thickness = 5;
         private const float shadow_radius = 5;
-        private const float circle_size = 34;
+        private const float circle_size = 38;
 
         public Action<DragEvent> OnDragHandled;
 
@@ -40,8 +40,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Bindable<int> indexInCurrentComboBindable;
         private Bindable<int> comboIndexBindable;
 
-        private readonly Circle circle;
-        private readonly DragBar dragBar;
+        private readonly Container circle;
+        private readonly DragArea dragArea;
         private readonly List<Container> shadowComponents = new List<Container>();
         private readonly Container mainComponents;
         private readonly OsuSpriteText comboIndexText;
@@ -76,71 +76,27 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.Centre,
-                    Font = OsuFont.Numeric.With(size: circle_size / 2, weight: FontWeight.Black),
+                    Y = -1,
+                    Font = OsuFont.Default.With(size: circle_size * 0.5f, weight: FontWeight.Regular),
                 },
             });
 
-            circle = new Circle
+            circle = new ExtendableCircle
             {
-                Size = new Vector2(circle_size),
+                RelativeSizeAxes = Axes.X,
+                Size = new Vector2(1, circle_size),
                 Anchor = Anchor.CentreLeft,
-                Origin = Anchor.Centre,
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Shadow,
-                    Radius = shadow_radius,
-                    Colour = Color4.Black
-                },
+                Origin = Anchor.CentreLeft,
             };
 
-            shadowComponents.Add(circle);
+            mainComponents.Add(circle);
 
             if (hitObject is IHasDuration)
             {
-                DragBar dragBarUnderlay;
-                Container extensionBar;
-
-                mainComponents.AddRange(new Drawable[]
+                mainComponents.Add(dragArea = new DragArea(hitObject)
                 {
-                    extensionBar = new Container
-                    {
-                        Masking = true,
-                        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,
-                        }
-                    },
-                    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) },
+                    OnDragHandled = e => OnDragHandled?.Invoke(e)
                 });
-
-                shadowComponents.Add(dragBarUnderlay);
-                shadowComponents.Add(extensionBar);
-            }
-            else
-            {
-                mainComponents.Add(circle);
             }
 
             updateShadows();
@@ -173,7 +129,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             var comboColour = combo.GetComboColour(comboColours);
 
             if (HitObject is IHasDuration)
-                mainComponents.Colour = ColourInfo.GradientHorizontal(comboColour, Color4.White);
+                mainComponents.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
             else
                 mainComponents.Colour = comboColour;
 
@@ -227,10 +183,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool ShouldBeConsideredForInput(Drawable child) => true;
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            base.ReceivePositionalInputAt(screenSpacePos) ||
-            circle.ReceivePositionalInputAt(screenSpacePos) ||
-            dragBar?.ReceivePositionalInputAt(screenSpacePos) == true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => circle.Contains(screenSpacePos);
 
         protected override void OnSelected()
         {
@@ -256,7 +209,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     {
                         Type = EdgeEffectType.Shadow,
                         Radius = shadow_radius,
-                        Colour = State == SelectionState.Selected ? Color4.Orange : Color4.Black
+                        Colour = Color4.Black.Opacity(0.4f)
                     };
                 }
             }
@@ -267,22 +220,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             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 Quad SelectionQuad => circle.ScreenSpaceDrawQuad;
 
         public override Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.TopLeft;
 
-        public class DragBar : Container
+        public class DragArea : Container
         {
             private readonly HitObject hitObject;
 
@@ -293,13 +235,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             public override bool HandlePositionalInput => hitObject != null;
 
-            public DragBar(HitObject hitObject)
+            public DragArea(HitObject hitObject)
             {
                 this.hitObject = hitObject;
 
-                CornerRadius = 2;
+                CornerRadius = circle_size / 2;
                 Masking = true;
-                Size = new Vector2(5, 1);
+                Size = new Vector2(circle_size, 1);
                 Anchor = Anchor.CentreRight;
                 Origin = Anchor.Centre;
                 RelativePositionAxes = Axes.X;
@@ -406,5 +348,71 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 changeHandler?.EndChange();
             }
         }
+
+        /// <summary>
+        /// A circle with externalised end caps so it can take up the full width of a relative width area.
+        /// </summary>
+        public class ExtendableCircle : Container
+        {
+            private readonly Circle rightCircle;
+            private readonly Circle leftCircle;
+
+            public override Quad ScreenSpaceDrawQuad
+            {
+                get
+                {
+                    var leftQuad = leftCircle.ScreenSpaceDrawQuad;
+
+                    if (Width == 0)
+                    {
+                        return leftQuad;
+                    }
+
+                    var rightQuad = rightCircle.ScreenSpaceDrawQuad;
+
+                    return new Quad(leftQuad.TopLeft, rightQuad.TopRight, leftQuad.BottomLeft, rightQuad.BottomRight);
+                }
+            }
+
+            public ExtendableCircle()
+            {
+                var effect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Radius = shadow_radius,
+                    Colour = Color4.Black.Opacity(0.4f)
+                };
+
+                InternalChildren = new Drawable[]
+                {
+                    new Container
+                    {
+                        Height = circle_size,
+                        RelativeSizeAxes = Axes.X,
+                        Masking = true,
+                        AlwaysPresent = true,
+                        EdgeEffect = effect,
+                    },
+                    leftCircle = new Circle
+                    {
+                        EdgeEffect = effect,
+                        Origin = Anchor.TopCentre,
+                        Size = new Vector2(circle_size)
+                    },
+                    rightCircle = new Circle
+                    {
+                        EdgeEffect = effect,
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopCentre,
+                        Size = new Vector2(circle_size)
+                    },
+                    new Box
+                    {
+                        Height = circle_size,
+                        RelativeSizeAxes = Axes.X,
+                    },
+                };
+            }
+        }
     }
 }

From 109ee395bf397fc73b13e10f70bf8dedae67b20f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 18:47:07 +0900
Subject: [PATCH 09061/10326] Fix input and remove outdated hover logic

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 179abd0a26..89a9095d22 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -17,7 +17,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -40,9 +39,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Bindable<int> indexInCurrentComboBindable;
         private Bindable<int> comboIndexBindable;
 
-        private readonly Container circle;
-        private readonly DragArea dragArea;
-        private readonly List<Container> shadowComponents = new List<Container>();
+        private readonly Drawable circle;
+
         private readonly Container mainComponents;
         private readonly OsuSpriteText comboIndexText;
 
@@ -93,7 +91,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             if (hitObject is IHasDuration)
             {
-                mainComponents.Add(dragArea = new DragArea(hitObject)
+                mainComponents.Add(new DragArea(hitObject)
                 {
                     OnDragHandled = e => OnDragHandled?.Invoke(e)
                 });
@@ -183,8 +181,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool ShouldBeConsideredForInput(Drawable child) => true;
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => circle.Contains(screenSpacePos);
-
         protected override void OnSelected()
         {
             updateShadows();
@@ -192,27 +188,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         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 = Color4.Black.Opacity(0.4f)
-                    };
-                }
-            }
         }
 
         protected override void OnDeselected()
@@ -220,6 +195,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             updateShadows();
         }
 
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+            circle.ReceivePositionalInputAt(screenSpacePos);
+
         public override Quad SelectionQuad => circle.ScreenSpaceDrawQuad;
 
         public override Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.TopLeft;
@@ -351,12 +329,20 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         /// <summary>
         /// A circle with externalised end caps so it can take up the full width of a relative width area.
+        /// TODO: figure how to do this with a single circle to avoid pixel-misaligned edges.
         /// </summary>
         public class ExtendableCircle : Container
         {
             private readonly Circle rightCircle;
             private readonly Circle leftCircle;
 
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
+            {
+                return base.ReceivePositionalInputAt(screenSpacePos)
+                       || leftCircle.ReceivePositionalInputAt(screenSpacePos)
+                       || rightCircle.ReceivePositionalInputAt(screenSpacePos);
+            }
+
             public override Quad ScreenSpaceDrawQuad
             {
                 get

From 495fdd8d65d99d7818726e29829fcd6ff8fed660 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 18:58:51 +0900
Subject: [PATCH 09062/10326] Update drag area display to match new design
 logic

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 89a9095d22..493f62921b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         public override Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.TopLeft;
 
-        public class DragArea : Container
+        public class DragArea : Circle
         {
             private readonly HitObject hitObject;
 
@@ -224,6 +224,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 Origin = Anchor.Centre;
                 RelativePositionAxes = Axes.X;
                 RelativeSizeAxes = Axes.Y;
+                Colour = OsuColour.Gray(0.2f);
 
                 InternalChildren = new Drawable[]
                 {
@@ -234,6 +235,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 };
             }
 
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                updateState();
+                FinishTransforms();
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 updateState();
@@ -265,7 +274,20 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             private void updateState()
             {
-                Colour = IsHovered || hasMouseDown ? Color4.OrangeRed : Color4.White;
+                if (hasMouseDown)
+                {
+                    this.ScaleTo(0.7f, 200, Easing.OutQuint);
+                }
+                else if (IsHovered)
+                {
+                    this.ScaleTo(0.8f, 200, Easing.OutQuint);
+                }
+                else
+                {
+                    this.ScaleTo(0.6f, 200, Easing.OutQuint);
+                }
+
+                this.FadeTo(IsHovered || hasMouseDown ? 0.8f : 0.2f, 200, Easing.OutQuint);
             }
 
             [Resolved]
@@ -369,12 +391,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     Colour = Color4.Black.Opacity(0.4f)
                 };
 
+                const float fudge = 0.97f;
+
                 InternalChildren = new Drawable[]
                 {
                     new Container
                     {
-                        Height = circle_size,
-                        RelativeSizeAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Height = fudge,
                         Masking = true,
                         AlwaysPresent = true,
                         EdgeEffect = effect,
@@ -394,8 +420,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     },
                     new Box
                     {
-                        Height = circle_size,
-                        RelativeSizeAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Height = fudge,
                     },
                 };
             }

From b2c17979defca0bd018244129c9b9e1d029fdc84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 19:24:20 +0900
Subject: [PATCH 09063/10326] Update colours of all overlay components in one
 swoop (based off combo colour)

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 79 ++++++++++---------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 493f62921b..6463f1a200 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private const float shadow_radius = 5;
         private const float circle_size = 38;
 
+        private Container repeatsContainer;
+
         public Action<DragEvent> OnDragHandled;
 
         [UsedImplicitly]
@@ -41,7 +43,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private readonly Drawable circle;
 
-        private readonly Container mainComponents;
+        private readonly Container colouredComponents;
         private readonly OsuSpriteText comboIndexText;
 
         [Resolved]
@@ -59,39 +61,37 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativePositionAxes = Axes.X;
 
             RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
+            Height = circle_size;
 
-            AddRangeInternal(new Drawable[]
+            AddRangeInternal(new[]
             {
-                mainComponents = new Container
+                circle = new ExtendableCircle
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
+                colouredComponents = new Container
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                },
-                comboIndexText = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.Centre,
-                    Y = -1,
-                    Font = OsuFont.Default.With(size: circle_size * 0.5f, weight: FontWeight.Regular),
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        comboIndexText = new OsuSpriteText
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.Centre,
+                            Y = -1,
+                            Font = OsuFont.Default.With(size: circle_size * 0.5f, weight: FontWeight.Regular),
+                        },
+                    }
                 },
             });
 
-            circle = new ExtendableCircle
-            {
-                RelativeSizeAxes = Axes.X,
-                Size = new Vector2(1, circle_size),
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-            };
-
-            mainComponents.Add(circle);
-
             if (hitObject is IHasDuration)
             {
-                mainComponents.Add(new DragArea(hitObject)
+                colouredComponents.Add(new DragArea(hitObject)
                 {
                     OnDragHandled = e => OnDragHandled?.Invoke(e)
                 });
@@ -127,15 +127,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             var comboColour = combo.GetComboColour(comboColours);
 
             if (HitObject is IHasDuration)
-                mainComponents.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
+                circle.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
             else
-                mainComponents.Colour = comboColour;
+                circle.Colour = comboColour;
 
-            var col = mainComponents.Colour.TopLeft.Linear;
+            var col = circle.Colour.TopLeft.Linear;
             float brightness = col.R + col.G + col.B;
 
             // decide the combo index colour based on brightness?
-            comboIndexText.Colour = brightness > 0.5f ? Color4.Black : Color4.White;
+            colouredComponents.Colour = OsuColour.Gray(brightness > 0.5f ? 0.2f : 0.9f);
         }
 
         protected override void Update()
@@ -155,13 +155,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        private Container repeatsContainer;
-
         private void updateRepeats(IHasRepeats repeats)
         {
             repeatsContainer?.Expire();
 
-            mainComponents.Add(repeatsContainer = new Container
+            colouredComponents.Add(repeatsContainer = new Container
             {
                 RelativeSizeAxes = Axes.Both,
             });
@@ -170,7 +168,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 repeatsContainer.Add(new Circle
                 {
-                    Size = new Vector2(circle_size / 2),
+                    Size = new Vector2(circle_size / 3),
+                    Alpha = 0.2f,
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.Centre,
                     RelativePositionAxes = Axes.X,
@@ -224,7 +223,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 Origin = Anchor.Centre;
                 RelativePositionAxes = Axes.X;
                 RelativeSizeAxes = Axes.Y;
-                Colour = OsuColour.Gray(0.2f);
 
                 InternalChildren = new Drawable[]
                 {
@@ -351,7 +349,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         /// <summary>
         /// A circle with externalised end caps so it can take up the full width of a relative width area.
-        /// TODO: figure how to do this with a single circle to avoid pixel-misaligned edges.
         /// </summary>
         public class ExtendableCircle : Container
         {
@@ -391,7 +388,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     Colour = Color4.Black.Opacity(0.4f)
                 };
 
-                const float fudge = 0.97f;
+                // TODO: figure how to do this whole thing with a single circle to avoid pixel-misaligned edges.
+                // just working with what i can make work for the time being..
+                const float fudge = 0.4f;
 
                 InternalChildren = new Drawable[]
                 {
@@ -400,7 +399,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Height = fudge,
+                        Padding = new MarginPadding { Vertical = fudge },
                         Masking = true,
                         AlwaysPresent = true,
                         EdgeEffect = effect,
@@ -418,12 +417,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         Origin = Anchor.TopCentre,
                         Size = new Vector2(circle_size)
                     },
-                    new Box
+                    new Container
                     {
                         RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Vertical = fudge },
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Height = fudge,
+                        Children = new Drawable[]
+                        {
+                            new Box { RelativeSizeAxes = Axes.Both, }
+                        }
                     },
                 };
             }

From e7b0042a608d09e1f6a01e53860a01595905177f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 19:25:03 +0900
Subject: [PATCH 09064/10326] Remove unnecessary hover / shadow logic

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 6463f1a200..67be298567 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class TimelineHitObjectBlueprint : SelectionBlueprint
     {
-        private const float shadow_radius = 5;
         private const float circle_size = 38;
 
         private Container repeatsContainer;
@@ -96,8 +95,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     OnDragHandled = e => OnDragHandled?.Invoke(e)
                 });
             }
-
-            updateShadows();
         }
 
         protected override void LoadComplete()
@@ -116,6 +113,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
+        protected override void OnSelected()
+        {
+            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+        }
+
+        protected override void OnDeselected()
+        {
+            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+        }
+
         private void updateComboIndex() => comboIndexText.Text = (indexInCurrentComboBindable.Value + 1).ToString();
 
         private void updateComboColour()
@@ -180,20 +187,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool ShouldBeConsideredForInput(Drawable child) => true;
 
-        protected override void OnSelected()
-        {
-            updateShadows();
-        }
-
-        private void updateShadows()
-        {
-        }
-
-        protected override void OnDeselected()
-        {
-            updateShadows();
-        }
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             circle.ReceivePositionalInputAt(screenSpacePos);
 
@@ -384,7 +377,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 var effect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Shadow,
-                    Radius = shadow_radius,
+                    Radius = 5,
                     Colour = Color4.Black.Opacity(0.4f)
                 };
 

From bcd41417b3cb7701985d8db8614ded82cc9c7034 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 19:36:29 +0900
Subject: [PATCH 09065/10326] 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 c78dfb6a55..b5315c3616 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.413.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 92e05cb4a6..45b3d5c161 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.413.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 11124730c9..105a6e59c2 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.Framework.iOS" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.413.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.410.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.413.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 03ba04e8cec2b335355916d477712e84305ce00e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 19:50:22 +0900
Subject: [PATCH 09066/10326] Split out general checks into its own verifier
 class (and remove `static` usage)

---
 .../Edit/OsuBeatmapVerifier.cs                |  5 ---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     | 24 ++++++++++++++
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  | 32 ++++++++-----------
 3 files changed, 38 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/BeatmapVerifier.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 66ef74ab08..1c7ab00bbb 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Osu.Edit.Checks;
 
@@ -15,10 +14,6 @@ namespace osu.Game.Rulesets.Osu.Edit
     {
         private readonly List<ICheck> checks = new List<ICheck>
         {
-            // General checks
-            new CheckBackground(),
-
-            // Ruleset-specific checks
             new CheckOffscreenObjects()
         };
 
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
new file mode 100644
index 0000000000..b1d538bf04
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.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 System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit
+{
+    /// <summary>
+    /// A ruleset-agnostic beatmap converter that identifies issues in common metadata or mapping standards.
+    /// </summary>
+    public class BeatmapVerifier : IBeatmapVerifier
+    {
+        private readonly List<ICheck> checks = new List<ICheck>
+        {
+            new CheckBackground(),
+        };
+
+        public IEnumerable<Issue> Run(IBeatmap beatmap) => checks.SelectMany(check => check.Run(beatmap));
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index a733c9c176..550fbe2950 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -7,11 +7,9 @@ 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.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osuTK;
@@ -20,9 +18,6 @@ namespace osu.Game.Screens.Edit.Verify
 {
     public class VerifyScreen : EditorScreen
     {
-        private Ruleset ruleset;
-        private static IBeatmapVerifier beatmapVerifier;
-
         [Cached]
         private Bindable<Issue> selectedIssue = new Bindable<Issue>();
 
@@ -31,16 +26,6 @@ namespace osu.Game.Screens.Edit.Verify
         {
         }
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-
-            ruleset = parent.Get<IBindable<WorkingBeatmap>>().Value.BeatmapInfo.Ruleset?.CreateInstance();
-            beatmapVerifier = ruleset?.CreateBeatmapVerifier();
-
-            return dependencies;
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -81,9 +66,15 @@ namespace osu.Game.Screens.Edit.Verify
             [Resolved]
             private Bindable<Issue> selectedIssue { get; set; }
 
+            private IBeatmapVerifier rulesetVerifier;
+            private BeatmapVerifier generalVerifier;
+
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
+                generalVerifier = new BeatmapVerifier();
+                rulesetVerifier = Beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
+
                 RelativeSizeAxes = Axes.Both;
 
                 InternalChildren = new Drawable[]
@@ -128,9 +119,14 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void refresh()
             {
-                table.Issues = beatmapVerifier.Run(Beatmap)
-                                              .OrderBy(issue => issue.Template.Type)
-                                              .ThenBy(issue => issue.Check.Metadata.Category);
+                var issues = generalVerifier.Run(Beatmap);
+
+                if (rulesetVerifier != null)
+                    issues = issues.Concat(rulesetVerifier.Run(Beatmap));
+
+                table.Issues = issues
+                               .OrderBy(issue => issue.Template.Type)
+                               .ThenBy(issue => issue.Check.Metadata.Category);
             }
         }
     }

From 464fc02875f067aef4bd55f3244aa1df97cc774b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 19:55:17 +0900
Subject: [PATCH 09067/10326] Fix some styling issues with the verify screen
 layout

---
 osu.Game/Screens/Edit/Verify/IssueTable.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 516e1adf44..042d6d84e3 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -38,9 +38,6 @@ namespace osu.Game.Screens.Edit.Verify
             Padding = new MarginPadding { Horizontal = horizontal_inset };
             RowSize = new Dimension(GridSizeMode.Absolute, row_height);
 
-            Masking = true;
-            CornerRadius = 6;
-
             AddInternal(backgroundFlow = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -118,6 +115,17 @@ namespace osu.Game.Screens.Edit.Verify
             }
         };
 
+        protected override Drawable CreateHeader(int index, TableColumn column) => new HeaderText(column?.Header ?? string.Empty);
+
+        private class HeaderText : OsuSpriteText
+        {
+            public HeaderText(string text)
+            {
+                Text = text.ToUpper();
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
+            }
+        }
+
         public class RowBackground : OsuClickableContainer
         {
             private readonly Issue issue;

From 0d6890243fc7b6308ffdd87e7f87c1551d4ae2fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 20:18:18 +0900
Subject: [PATCH 09068/10326] Fix typo in xmldoc

---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index b1d538bf04..f9bced7beb 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 namespace osu.Game.Rulesets.Edit
 {
     /// <summary>
-    /// A ruleset-agnostic beatmap converter that identifies issues in common metadata or mapping standards.
+    /// A ruleset-agnostic beatmap verifier that identifies issues in common metadata or mapping standards.
     /// </summary>
     public class BeatmapVerifier : IBeatmapVerifier
     {

From 627dd960b07198135b941c1a82a70338058fd21d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 20:52:20 +0900
Subject: [PATCH 09069/10326] Disable player input for now

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index f0994ec375..32cc3b48d6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -123,5 +123,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             player.GameplayClockContainer.Stop();
         }
+
+        // Player interferes with global input, so disable input for now.
+        public override bool PropagatePositionalInputSubTree => false;
+        public override bool PropagateNonPositionalInputSubTree => false;
     }
 }

From e601141be2a70e1a1f004c205b360212a9fe2605 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 13 Apr 2021 14:57:02 +0300
Subject: [PATCH 09070/10326] Simplify ExtendableCircle component

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 83 ++++---------------
 1 file changed, 15 insertions(+), 68 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 67be298567..1c0d6e5ab6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -343,84 +343,31 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         /// <summary>
         /// A circle with externalised end caps so it can take up the full width of a relative width area.
         /// </summary>
-        public class ExtendableCircle : Container
+        public class ExtendableCircle : CompositeDrawable
         {
-            private readonly Circle rightCircle;
-            private readonly Circle leftCircle;
+            private readonly CircularContainer content;
 
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
-            {
-                return base.ReceivePositionalInputAt(screenSpacePos)
-                       || leftCircle.ReceivePositionalInputAt(screenSpacePos)
-                       || rightCircle.ReceivePositionalInputAt(screenSpacePos);
-            }
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => content.ReceivePositionalInputAt(screenSpacePos);
 
-            public override Quad ScreenSpaceDrawQuad
-            {
-                get
-                {
-                    var leftQuad = leftCircle.ScreenSpaceDrawQuad;
-
-                    if (Width == 0)
-                    {
-                        return leftQuad;
-                    }
-
-                    var rightQuad = rightCircle.ScreenSpaceDrawQuad;
-
-                    return new Quad(leftQuad.TopLeft, rightQuad.TopRight, leftQuad.BottomLeft, rightQuad.BottomRight);
-                }
-            }
+            public override Quad ScreenSpaceDrawQuad => content.ScreenSpaceDrawQuad;
 
             public ExtendableCircle()
             {
-                var effect = new EdgeEffectParameters
+                Padding = new MarginPadding { Horizontal = -circle_size / 2f };
+                InternalChild = content = new CircularContainer
                 {
-                    Type = EdgeEffectType.Shadow,
-                    Radius = 5,
-                    Colour = Color4.Black.Opacity(0.4f)
-                };
-
-                // TODO: figure how to do this whole thing with a single circle to avoid pixel-misaligned edges.
-                // just working with what i can make work for the time being..
-                const float fudge = 0.4f;
-
-                InternalChildren = new Drawable[]
-                {
-                    new Container
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Padding = new MarginPadding { Vertical = fudge },
-                        Masking = true,
-                        AlwaysPresent = true,
-                        EdgeEffect = effect,
+                        Type = EdgeEffectType.Shadow,
+                        Radius = 5,
+                        Colour = Color4.Black.Opacity(0.4f)
                     },
-                    leftCircle = new Circle
+                    Child = new Box
                     {
-                        EdgeEffect = effect,
-                        Origin = Anchor.TopCentre,
-                        Size = new Vector2(circle_size)
-                    },
-                    rightCircle = new Circle
-                    {
-                        EdgeEffect = effect,
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopCentre,
-                        Size = new Vector2(circle_size)
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Vertical = fudge },
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Children = new Drawable[]
-                        {
-                            new Box { RelativeSizeAxes = Axes.Both, }
-                        }
-                    },
+                        RelativeSizeAxes = Axes.Both
+                    }
                 };
             }
         }

From 69da804f817dac304b7bc36587070d5f129b5eae Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 13:57:56 +0200
Subject: [PATCH 09071/10326] Add missing period

---
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 4d5069f446..93da42425c 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         public class IssueTemplateNoneSet : IssueTemplate
         {
             public IssueTemplateNoneSet(ICheck check)
-                : base(check, IssueType.Problem, "No background has been set")
+                : base(check, IssueType.Problem, "No background has been set.")
             {
             }
 

From 20823abb309ac0fd908bdd03b532abfbdbd22afd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 22:10:35 +0900
Subject: [PATCH 09072/10326] Make resyncing a bit more resilient

---
 .../TestSceneMultiplayerSpectator.cs          | 33 ++++++++++++++++-
 .../Multiplayer/Spectate/PlayerInstance.cs    | 35 +++++++++++++++----
 2 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 897219dbad..1090f1d10e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.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;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 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.Testing;
 using osu.Framework.Utils;
@@ -153,6 +156,27 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkPausedInstant(55, false);
         }
 
+        [Test]
+        public void TestPlayerStartsCatchingUpOnlyAfterExceedingMaxOffset()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            sendFrames(55, 1000);
+            sendFrames(56, 1000);
+
+            Bindable<double> slowDownAdjustment;
+
+            AddStep("slow down player 2", () =>
+            {
+                slowDownAdjustment = new Bindable<double>(0.99);
+                getInstance(56).Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, slowDownAdjustment);
+            });
+
+            AddUntilStep("exceeded min offset but not catching up", () => getGameplayOffset(55, 56) > PlayerInstance.MAX_OFFSET && !getInstance(56).IsCatchingUp);
+            AddUntilStep("catching up or caught up", () => getInstance(56).IsCatchingUp || Math.Abs(getGameplayOffset(55, 56)) < PlayerInstance.SYNC_TARGET * 2);
+        }
+
         [Test]
         public void TestPlayersCatchUpAfterFallingBehind()
         {
@@ -174,7 +198,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkPausedInstant(56, false);
 
             // Player 2 should catch up to player 1 after unpausing.
-            AddUntilStep("player 1 time == player 2 time", () => Precision.AlmostEquals(getGameplayTime(55), getGameplayTime(56), 16));
+            AddUntilStep("player 2 not catching up", () => !getInstance(56).IsCatchingUp);
+            AddAssert("player 1 time == player 2 time", () => Math.Abs(getGameplayOffset(55, 56)) <= 2 * PlayerInstance.SYNC_TARGET);
+            AddWaitStep("wait a bit", 5);
         }
 
         private void loadSpectateScreen()
@@ -236,6 +262,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private void checkPausedInstant(int userId, bool state) =>
             AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().IsPaused.Value == state);
 
+        /// <summary>
+        /// Returns time(user1) - time(user2).
+        /// </summary>
+        private double getGameplayOffset(int user1, int user2) => getGameplayTime(user1) - getGameplayTime(user2);
+
         private double getGameplayTime(int userId) => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().Single().GameplayClock.CurrentTime;
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 32cc3b48d6..a4a3a0c133 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -6,6 +6,7 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -15,8 +16,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class PlayerInstance : CompositeDrawable
     {
+        /// <summary>
+        /// The rate at which a user catches up after becoming desynchronised.
+        /// </summary>
         private const double catchup_rate = 2;
-        private const double max_sync_offset = 50;
+
+        /// <summary>
+        /// The offset from the expected time at which to START synchronisation.
+        /// </summary>
+        public const double MAX_OFFSET = 50;
+
+        /// <summary>
+        /// The maximum offset from the expected time at which to STOP synchronisation.
+        /// </summary>
+        public const double SYNC_TARGET = 16;
 
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
@@ -26,6 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         public readonly Score Score;
 
+        public bool IsCatchingUp { get; private set; }
+
         private OsuScreenStack stack;
         private MultiplayerSpectatorPlayer player;
 
@@ -63,7 +78,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly BindableDouble catchupFrequencyAdjustment = new BindableDouble(catchup_rate);
         private double targetTrackTime;
-        private bool isCatchingUp;
 
         private void updateCatchup()
         {
@@ -77,18 +91,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return;
 
             double currentTime = Beatmap.Track.CurrentTime;
-            bool catchupRequired = targetTrackTime > currentTime + max_sync_offset;
+            double timeBehind = targetTrackTime - currentTime;
 
-            // Skip catchup if nothing needs to be done.
-            if (catchupRequired == isCatchingUp)
+            double offsetForCatchup = IsCatchingUp ? SYNC_TARGET : MAX_OFFSET;
+            bool catchupRequired = timeBehind > offsetForCatchup;
+
+            // Skip catchup if no work needs to be done.
+            if (catchupRequired == IsCatchingUp)
                 return;
 
             if (catchupRequired)
+            {
                 Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                Logger.Log($"{User.Id} catchup started (behind: {timeBehind})");
+            }
             else
+            {
                 Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                Logger.Log($"{User.Id} catchup finished (behind: {timeBehind})");
+            }
 
-            isCatchingUp = catchupRequired;
+            IsCatchingUp = catchupRequired;
         }
 
         public double GetCurrentGameplayTime()

From 3039b7b0f9731e881dc79f23a741d7b3b29df18d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 22:40:10 +0900
Subject: [PATCH 09073/10326] Make tests a bit more resilient

---
 .../Visual/Multiplayer/TestSceneMultiplayerSpectator.cs    | 3 +--
 .../Multiplayer/Spectate/MultiplayerSpectator.cs           | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 1090f1d10e..1ac012c0b5 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -199,8 +199,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             // Player 2 should catch up to player 1 after unpausing.
             AddUntilStep("player 2 not catching up", () => !getInstance(56).IsCatchingUp);
-            AddAssert("player 1 time == player 2 time", () => Math.Abs(getGameplayOffset(55, 56)) <= 2 * PlayerInstance.SYNC_TARGET);
-            AddWaitStep("wait a bit", 5);
+            AddWaitStep("wait a bit", 10);
         }
 
         private void loadSpectateScreen()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index db5de45f72..636e7b9a49 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly PlayerInstance[] instances;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
-        private double? loadStartTime;
+        private double? loadFinishTime;
 
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
@@ -76,7 +76,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
             base.UpdateAfterChildren();
 
-            loadStartTime ??= Time.Current;
+            if (AllPlayersLoaded)
+                loadFinishTime ??= Time.Current;
 
             updateGameplayPlayingState();
         }
@@ -88,7 +89,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 // All players have frames...
                 instances.All(i => i.Score.Replay.Frames.Count > 0)
                 // Or any player has frames and the maximum start delay has been exceeded.
-                || (Time.Current - loadStartTime > maximum_start_delay
+                || (Time.Current - loadFinishTime > maximum_start_delay
                     && instances.Any(i => i.Score.Replay.Frames.Count > 0))
             );
 

From 0edc1a850d95c1c8bd94c873f12be8b40bcb33d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 23:05:58 +0900
Subject: [PATCH 09074/10326] Split out common EditorTable base class

---
 osu.Game/Screens/Edit/EditorTable.cs          | 49 +++++++++++++++++
 .../Screens/Edit/Timing/ControlPointTable.cs  | 44 ++--------------
 osu.Game/Screens/Edit/Verify/IssueTable.cs    | 52 ++++---------------
 3 files changed, 63 insertions(+), 82 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/EditorTable.cs

diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
new file mode 100644
index 0000000000..e5e2add384
--- /dev/null
+++ b/osu.Game/Screens/Edit/EditorTable.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.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit
+{
+    public abstract class EditorTable : TableContainer
+    {
+        private const float horizontal_inset = 20;
+
+        protected const float ROW_HEIGHT = 25;
+
+        protected const int TEXT_SIZE = 14;
+
+        protected readonly FillFlowContainer BackgroundFlow;
+
+        protected EditorTable()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Padding = new MarginPadding { Horizontal = horizontal_inset };
+            RowSize = new Dimension(GridSizeMode.Absolute, ROW_HEIGHT);
+
+            AddInternal(BackgroundFlow = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Depth = 1f,
+                Padding = new MarginPadding { Horizontal = -horizontal_inset },
+                Margin = new MarginPadding { Top = ROW_HEIGHT }
+            });
+        }
+
+        protected override Drawable CreateHeader(int index, TableColumn column) => new HeaderText(column?.Header ?? string.Empty);
+
+        private class HeaderText : OsuSpriteText
+        {
+            public HeaderText(string text)
+            {
+                Text = text.ToUpper();
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index a17b431fcc..75e2bb1f5c 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -20,47 +20,24 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class ControlPointTable : TableContainer
+    public class ControlPointTable : EditorTable
     {
-        private const float horizontal_inset = 20;
-        private const float row_height = 25;
-        private const int text_size = 14;
-
-        private readonly FillFlowContainer backgroundFlow;
-
         [Resolved]
         private Bindable<ControlPointGroup> selectedGroup { get; set; }
 
-        public ControlPointTable()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            Padding = new MarginPadding { Horizontal = horizontal_inset };
-            RowSize = new Dimension(GridSizeMode.Absolute, row_height);
-
-            AddInternal(backgroundFlow = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Depth = 1f,
-                Padding = new MarginPadding { Horizontal = -horizontal_inset },
-                Margin = new MarginPadding { Top = row_height }
-            });
-        }
-
         public IEnumerable<ControlPointGroup> ControlGroups
         {
             set
             {
                 Content = null;
-                backgroundFlow.Clear();
+                BackgroundFlow.Clear();
 
                 if (value?.Any() != true)
                     return;
 
                 foreach (var group in value)
                 {
-                    backgroundFlow.Add(new RowBackground(group));
+                    BackgroundFlow.Add(new RowBackground(group));
                 }
 
                 Columns = createHeaders();
@@ -86,13 +63,13 @@ namespace osu.Game.Screens.Edit.Timing
             new OsuSpriteText
             {
                 Text = $"#{index + 1}",
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
                 Margin = new MarginPadding(10)
             },
             new OsuSpriteText
             {
                 Text = group.Time.ToEditorFormattedString(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold)
             },
             null,
             new ControlGroupAttributes(group),
@@ -164,17 +141,6 @@ namespace osu.Game.Screens.Edit.Timing
             }
         }
 
-        protected override Drawable CreateHeader(int index, TableColumn column) => new HeaderText(column?.Header ?? string.Empty);
-
-        private class HeaderText : OsuSpriteText
-        {
-            public HeaderText(string text)
-            {
-                Text = text.ToUpper();
-                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
-            }
-        }
-
         public class RowBackground : OsuClickableContainer
         {
             private readonly ControlPointGroup controlGroup;
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 042d6d84e3..00570d363b 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -19,47 +19,24 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class IssueTable : TableContainer
+    public class IssueTable : EditorTable
     {
-        private const float horizontal_inset = 20;
-        private const float row_height = 25;
-        private const int text_size = 14;
-
-        private readonly FillFlowContainer backgroundFlow;
-
         [Resolved]
         private Bindable<Issue> selectedIssue { get; set; }
 
-        public IssueTable()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            Padding = new MarginPadding { Horizontal = horizontal_inset };
-            RowSize = new Dimension(GridSizeMode.Absolute, row_height);
-
-            AddInternal(backgroundFlow = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Depth = 1f,
-                Padding = new MarginPadding { Horizontal = -horizontal_inset },
-                Margin = new MarginPadding { Top = row_height }
-            });
-        }
-
         public IEnumerable<Issue> Issues
         {
             set
             {
                 Content = null;
-                backgroundFlow.Clear();
+                BackgroundFlow.Clear();
 
                 if (value == null)
                     return;
 
                 foreach (var issue in value)
                 {
-                    backgroundFlow.Add(new RowBackground(issue));
+                    BackgroundFlow.Add(new RowBackground(issue));
                 }
 
                 Columns = createHeaders();
@@ -86,46 +63,35 @@ namespace osu.Game.Screens.Edit.Verify
             new OsuSpriteText
             {
                 Text = $"#{index + 1}",
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium),
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium),
                 Margin = new MarginPadding { Right = 10 }
             },
             new OsuSpriteText
             {
                 Text = issue.Template.Type.ToString(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
                 Margin = new MarginPadding { Right = 10 },
                 Colour = issue.Template.Colour
             },
             new OsuSpriteText
             {
                 Text = issue.GetEditorTimestamp(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
                 Margin = new MarginPadding { Right = 10 },
             },
             new OsuSpriteText
             {
                 Text = issue.ToString(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium)
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium)
             },
             new OsuSpriteText
             {
                 Text = issue.Check.Metadata.Category.ToString(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
                 Margin = new MarginPadding(10)
             }
         };
 
-        protected override Drawable CreateHeader(int index, TableColumn column) => new HeaderText(column?.Header ?? string.Empty);
-
-        private class HeaderText : OsuSpriteText
-        {
-            public HeaderText(string text)
-            {
-                Text = text.ToUpper();
-                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
-            }
-        }
-
         public class RowBackground : OsuClickableContainer
         {
             private readonly Issue issue;
@@ -150,7 +116,7 @@ namespace osu.Game.Screens.Edit.Verify
                 this.issue = issue;
 
                 RelativeSizeAxes = Axes.X;
-                Height = row_height;
+                Height = ROW_HEIGHT;
                 AlwaysPresent = true;
                 CornerRadius = 3;
                 Masking = true;

From d49b90877e906960cfc081894cc3ecd8687f35db Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 23:21:35 +0900
Subject: [PATCH 09075/10326] Fix operation remaining in progress

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 035eba4f30..9a68ff908d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -420,6 +420,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 && ParentScreen.IsCurrentScreen())
             {
                 PushTopLevelScreen(() => new MultiplayerSpectator(client.CurrentMatchPlayingUserIds.ToArray()));
+
+                // If the current user was host, they started the match and the in-progres operation needs to be stopped now.
+                readyClickOperation?.Dispose();
+                readyClickOperation = null;
             }
         });
 

From 21e8e5fbcacf799b0485ab0203e66473a5d6e881 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 23:26:19 +0900
Subject: [PATCH 09076/10326] Move common table layout logic into `EditorTable`
 abstract class

---
 osu.Game/Screens/Edit/EditorTable.cs          |  95 ++++++++++-
 .../Screens/Edit/Timing/ControlPointTable.cs  | 120 +++-----------
 osu.Game/Screens/Edit/Verify/IssueTable.cs    | 154 +++++-------------
 3 files changed, 152 insertions(+), 217 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index e5e2add384..ef1c88db9a 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -1,10 +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.Allocation;
 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.Containers;
 using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit
 {
@@ -16,7 +21,7 @@ namespace osu.Game.Screens.Edit
 
         protected const int TEXT_SIZE = 14;
 
-        protected readonly FillFlowContainer BackgroundFlow;
+        protected readonly FillFlowContainer<RowBackground> BackgroundFlow;
 
         protected EditorTable()
         {
@@ -26,7 +31,7 @@ namespace osu.Game.Screens.Edit
             Padding = new MarginPadding { Horizontal = horizontal_inset };
             RowSize = new Dimension(GridSizeMode.Absolute, ROW_HEIGHT);
 
-            AddInternal(BackgroundFlow = new FillFlowContainer
+            AddInternal(BackgroundFlow = new FillFlowContainer<RowBackground>
             {
                 RelativeSizeAxes = Axes.Both,
                 Depth = 1f,
@@ -45,5 +50,91 @@ namespace osu.Game.Screens.Edit
                 Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
             }
         }
+
+        public class RowBackground : OsuClickableContainer
+        {
+            public readonly object Item;
+
+            private const int fade_duration = 100;
+
+            private readonly Box hoveredBackground;
+
+            [Resolved]
+            private EditorClock clock { get; set; }
+
+            public RowBackground(object item)
+            {
+                Item = item;
+
+                RelativeSizeAxes = Axes.X;
+                Height = 25;
+
+                AlwaysPresent = true;
+
+                CornerRadius = 3;
+                Masking = true;
+
+                Children = new Drawable[]
+                {
+                    hoveredBackground = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                    },
+                };
+
+                // todo delete
+                Action = () =>
+                {
+                };
+            }
+
+            private Color4 colourHover;
+            private Color4 colourSelected;
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                hoveredBackground.Colour = colourHover = colours.BlueDarker;
+                colourSelected = colours.YellowDarker;
+            }
+
+            private bool selected;
+
+            public bool Selected
+            {
+                get => selected;
+                set
+                {
+                    if (value == selected)
+                        return;
+
+                    selected = value;
+                    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()
+            {
+                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
+
+                if (selected || IsHovered)
+                    hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
+                else
+                    hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 75e2bb1f5c..dd51056bf1 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -8,12 +8,9 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Extensions;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
@@ -25,6 +22,9 @@ namespace osu.Game.Screens.Edit.Timing
         [Resolved]
         private Bindable<ControlPointGroup> selectedGroup { get; set; }
 
+        [Resolved]
+        private EditorClock clock { get; set; }
+
         public IEnumerable<ControlPointGroup> ControlGroups
         {
             set
@@ -37,7 +37,14 @@ namespace osu.Game.Screens.Edit.Timing
 
                 foreach (var group in value)
                 {
-                    BackgroundFlow.Add(new RowBackground(group));
+                    BackgroundFlow.Add(new RowBackground(group)
+                    {
+                        Action = () =>
+                        {
+                            selectedGroup.Value = group;
+                            clock.SeekSmoothlyTo(group.Time);
+                        }
+                    });
                 }
 
                 Columns = createHeaders();
@@ -45,6 +52,16 @@ namespace osu.Game.Screens.Edit.Timing
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedGroup.BindValueChanged(group =>
+            {
+                foreach (var b in BackgroundFlow) b.Selected = b.Item == group.NewValue;
+            }, true);
+        }
+
         private TableColumn[] createHeaders()
         {
             var columns = new List<TableColumn>
@@ -140,100 +157,5 @@ namespace osu.Game.Screens.Edit.Timing
                 return null;
             }
         }
-
-        public class RowBackground : OsuClickableContainer
-        {
-            private readonly ControlPointGroup controlGroup;
-            private const int fade_duration = 100;
-
-            private readonly Box hoveredBackground;
-
-            [Resolved]
-            private EditorClock clock { get; set; }
-
-            [Resolved]
-            private Bindable<ControlPointGroup> selectedGroup { get; set; }
-
-            public RowBackground(ControlPointGroup controlGroup)
-            {
-                this.controlGroup = controlGroup;
-                RelativeSizeAxes = Axes.X;
-                Height = 25;
-
-                AlwaysPresent = true;
-
-                CornerRadius = 3;
-                Masking = true;
-
-                Children = new Drawable[]
-                {
-                    hoveredBackground = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                    },
-                };
-
-                Action = () =>
-                {
-                    selectedGroup.Value = controlGroup;
-                    clock.SeekSmoothlyTo(controlGroup.Time);
-                };
-            }
-
-            private Color4 colourHover;
-            private Color4 colourSelected;
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                hoveredBackground.Colour = colourHover = colours.BlueDarker;
-                colourSelected = colours.YellowDarker;
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                selectedGroup.BindValueChanged(group => { Selected = controlGroup == group.NewValue; }, true);
-            }
-
-            private bool selected;
-
-            protected bool Selected
-            {
-                get => selected;
-                set
-                {
-                    if (value == selected)
-                        return;
-
-                    selected = value;
-                    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()
-            {
-                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
-
-                if (selected || IsHovered)
-                    hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
-                else
-                    hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 00570d363b..44244028c9 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -8,14 +8,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 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.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Edit.Checks.Components;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify
 {
@@ -24,6 +20,15 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private Bindable<Issue> selectedIssue { get; set; }
 
+        [Resolved]
+        private EditorClock clock { get; set; }
+
+        [Resolved]
+        private EditorBeatmap editorBeatmap { get; set; }
+
+        [Resolved]
+        private Editor editor { get; set; }
+
         public IEnumerable<Issue> Issues
         {
             set
@@ -36,7 +41,25 @@ namespace osu.Game.Screens.Edit.Verify
 
                 foreach (var issue in value)
                 {
-                    BackgroundFlow.Add(new RowBackground(issue));
+                    BackgroundFlow.Add(new RowBackground(issue)
+                    {
+                        Action = () =>
+                        {
+                            selectedIssue.Value = issue;
+
+                            if (issue.Time != null)
+                            {
+                                clock.Seek(issue.Time.Value);
+                                editor.OnPressed(GlobalAction.EditorComposeMode);
+                            }
+
+                            if (!issue.HitObjects.Any())
+                                return;
+
+                            editorBeatmap.SelectedHitObjects.Clear();
+                            editorBeatmap.SelectedHitObjects.AddRange(issue.HitObjects);
+                        },
+                    });
                 }
 
                 Columns = createHeaders();
@@ -44,6 +67,16 @@ namespace osu.Game.Screens.Edit.Verify
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedIssue.BindValueChanged(issue =>
+            {
+                foreach (var b in BackgroundFlow) b.Selected = b.Item == issue.NewValue;
+            }, true);
+        }
+
         private TableColumn[] createHeaders()
         {
             var columns = new List<TableColumn>
@@ -91,116 +124,5 @@ namespace osu.Game.Screens.Edit.Verify
                 Margin = new MarginPadding(10)
             }
         };
-
-        public class RowBackground : OsuClickableContainer
-        {
-            private readonly Issue issue;
-            private const int fade_duration = 100;
-
-            private readonly Box hoveredBackground;
-
-            [Resolved]
-            private EditorClock clock { get; set; }
-
-            [Resolved]
-            private Editor editor { get; set; }
-
-            [Resolved]
-            private EditorBeatmap editorBeatmap { get; set; }
-
-            [Resolved]
-            private Bindable<Issue> selectedIssue { get; set; }
-
-            public RowBackground(Issue issue)
-            {
-                this.issue = issue;
-
-                RelativeSizeAxes = Axes.X;
-                Height = ROW_HEIGHT;
-                AlwaysPresent = true;
-                CornerRadius = 3;
-                Masking = true;
-
-                Children = new Drawable[]
-                {
-                    hoveredBackground = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                    },
-                };
-
-                Action = () =>
-                {
-                    selectedIssue.Value = issue;
-
-                    if (issue.Time != null)
-                    {
-                        clock.Seek(issue.Time.Value);
-                        editor.OnPressed(GlobalAction.EditorComposeMode);
-                    }
-
-                    if (!issue.HitObjects.Any())
-                        return;
-
-                    editorBeatmap.SelectedHitObjects.Clear();
-                    editorBeatmap.SelectedHitObjects.AddRange(issue.HitObjects);
-                };
-            }
-
-            private Color4 colourHover;
-            private Color4 colourSelected;
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                hoveredBackground.Colour = colourHover = colours.BlueDarker;
-                colourSelected = colours.YellowDarker;
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                selectedIssue.BindValueChanged(change => { Selected = issue == change.NewValue; }, true);
-            }
-
-            private bool selected;
-
-            protected bool Selected
-            {
-                get => selected;
-                set
-                {
-                    if (value == selected)
-                        return;
-
-                    selected = value;
-                    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()
-            {
-                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
-
-                if (selected || IsHovered)
-                    hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
-                else
-                    hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
-            }
-        }
     }
 }

From cb4f64133eedde15134e64b9b0a0c584256df3aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 23:30:20 +0900
Subject: [PATCH 09077/10326] Add xmldoc to interfaces

---
 osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs | 3 +++
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs         | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index f355ae734e..f284240092 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -6,6 +6,9 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Edit.Checks.Components
 {
+    /// <summary>
+    /// A specific check that can be run on a beatmap to verify or find issues.
+    /// </summary>
     public interface ICheck
     {
         /// <summary>
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 2bafacefa3..61d8119635 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -7,6 +7,9 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit
 {
+    /// <summary>
+    /// A class which can run against a beatmap and surface issues to the user which could go against known criteria or hinder gameplay.
+    /// </summary>
     public interface IBeatmapVerifier
     {
         public IEnumerable<Issue> Run(IBeatmap beatmap);

From 56e1bffdfd237ceb45db074982b912e27612640e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 23:40:10 +0900
Subject: [PATCH 09078/10326] Populate initial user states

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 2ddc10db0f..fe1201ef89 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -144,6 +144,9 @@ namespace osu.Game.Online.Multiplayer
                     Room = joinedRoom;
                     apiRoom = room;
                     defaultPlaylistItemId = apiRoom.Playlist.FirstOrDefault()?.ID ?? 0;
+
+                    foreach (var user in joinedRoom.Users)
+                        updateUserPlayingState(user.UserID, user.State);
                 }, cancellationSource.Token).ConfigureAwait(false);
 
                 // Update room settings.

From 77830527e7e06df39fbf8b8ae341b9847bef2795 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 23:49:23 +0900
Subject: [PATCH 09079/10326] Fix spectate button being disabled during play

---
 .../OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
index 4b3fb5d00f..465af037e2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     break;
             }
 
-            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
+            button.Enabled.Value = !operationInProgress.Value;
         }
 
         private class ButtonWithTrianglesExposed : TriangleButton

From 69b01e727008bb8dd7d15bce834e72aee9ae3ca1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 00:58:03 +0900
Subject: [PATCH 09080/10326] Add some debugging

---
 .../OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs   | 4 ++++
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 636e7b9a49..a56104439d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
 using osu.Game.Screens.Spectate;
@@ -108,6 +109,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             double targetTrackTime = validInstances.Select(i => i.GetCurrentTrackTime()).Max();
 
+            var instanceTimes = string.Join(',', validInstances.Select(i => $" {i.User.Id}: {(int)i.GetCurrentTrackTime()}"));
+            Logger.Log($"target: {(int)targetTrackTime},{instanceTimes}");
+
             foreach (var inst in validInstances)
             {
                 Debug.Assert(inst != null);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index a4a3a0c133..12a710e9f0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -103,12 +103,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             if (catchupRequired)
             {
                 Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                Logger.Log($"{User.Id} catchup started (behind: {timeBehind})");
+                Logger.Log($"{User.Id} catchup started (behind: {(int)timeBehind})");
             }
             else
             {
                 Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                Logger.Log($"{User.Id} catchup finished (behind: {timeBehind})");
+                Logger.Log($"{User.Id} catchup finished (behind: {(int)timeBehind})");
             }
 
             IsCatchingUp = catchupRequired;

From bf5ed12b757663216d7e5c1a92aa4e26e8371f2a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 06:33:53 +0300
Subject: [PATCH 09081/10326] Add support for legacy skin `CursorCentre`
 setting

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs  | 5 +++--
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
index 314139d02a..8fe40f801b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
+            bool centre = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorCentre)?.Value ?? false;
             spin = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorRotate)?.Value ?? true;
 
             InternalChildren = new[]
@@ -32,13 +33,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Texture = skin.GetTexture("cursor"),
                     Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
+                    Origin = centre ? Anchor.Centre : Anchor.TopLeft,
                 },
                 new NonPlayfieldSprite
                 {
                     Texture = skin.GetTexture("cursormiddle"),
                     Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
+                    Origin = centre ? Anchor.Centre : Anchor.TopLeft,
                 },
             };
         }
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index 75a62a6f8e..6953e66b5c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -8,6 +8,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         SliderBorderSize,
         SliderPathRadius,
         AllowSliderBallTint,
+        CursorCentre,
         CursorExpand,
         CursorRotate,
         HitCircleOverlayAboveNumber,

From df991bc0affa64d7a0deaf680e57b24cb03cbc26 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 06:36:31 +0300
Subject: [PATCH 09082/10326] Refactor gameplay cursor test scene and add
 visual coverage

---
 .../TestSceneGameplayCursor.cs                | 62 +++++++++++++++----
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index e3ccf83715..ed44bc7309 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -4,13 +4,22 @@
 using System;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Input;
 using osu.Framework.Testing.Input;
 using osu.Framework.Utils;
+using osu.Game.Audio;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Screens.Play;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -21,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Cached]
         private GameplayBeatmap gameplayBeatmap;
 
-        private ClickingCursorContainer lastContainer;
+        private OsuCursorContainer lastContainer;
 
         [Resolved]
         private OsuConfigManager config { get; set; }
@@ -48,12 +57,10 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 config.SetValue(OsuSetting.AutoCursorSize, true);
                 gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = val;
-                Scheduler.AddOnce(recreate);
+                Scheduler.AddOnce(() => loadContent(false));
             });
 
-            AddStep("test cursor container", recreate);
-
-            void recreate() => SetContents(() => new OsuInputManager(new OsuRuleset().RulesetInfo) { Child = new OsuCursorContainer() });
+            AddStep("test cursor container", () => loadContent(false));
         }
 
         [TestCase(1, 1)]
@@ -68,7 +75,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep($"adjust cs to {circleSize}", () => gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = circleSize);
             AddStep("turn on autosizing", () => config.SetValue(OsuSetting.AutoCursorSize, true));
 
-            AddStep("load content", loadContent);
+            AddStep("load content", () => loadContent());
 
             AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == OsuCursorContainer.GetScaleForCircleSize(circleSize) * userScale);
 
@@ -82,18 +89,47 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == userScale);
         }
 
-        private void loadContent()
+        [Test]
+        public void TestTopLeftOrigin()
         {
-            SetContents(() => new MovingCursorInputManager
+            AddStep("load content", () => loadContent(false, () => new SkinProvidingContainer(new TopLeftCursorSkin())));
+            AddAssert("cursor top left", () => lastContainer.ActiveCursor.Origin == Anchor.TopLeft);
+        }
+
+        private void loadContent(bool automated = true, Func<SkinProvidingContainer> skinProvider = null)
+        {
+            SetContents(() =>
             {
-                Child = lastContainer = new ClickingCursorContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                }
+                var inputManager = automated ? (InputManager)new MovingCursorInputManager() : new OsuInputManager(new OsuRuleset().RulesetInfo);
+                var skinContainer = skinProvider?.Invoke() ?? new SkinProvidingContainer(null);
+
+                lastContainer = automated ? new ClickingCursorContainer() : new OsuCursorContainer();
+
+                return inputManager.WithChild(skinContainer.WithChild(lastContainer));
             });
         }
 
+        private class TopLeftCursorSkin : ISkin
+        {
+            public Drawable GetDrawableComponent(ISkinComponent component) => null;
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
+            public ISample GetSample(ISampleInfo sampleInfo) => null;
+
+            public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
+            {
+                switch (lookup)
+                {
+                    case OsuSkinConfiguration osuLookup:
+                        if (osuLookup == OsuSkinConfiguration.CursorCentre)
+                            return SkinUtils.As<TValue>(new BindableBool(false));
+
+                        break;
+                }
+
+                return null;
+            }
+        }
+
         private class ClickingCursorContainer : OsuCursorContainer
         {
             private bool pressed;

From 89ce8f290f3e074d6b762cbd6e30aeae5d35cf9c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 12:28:37 +0900
Subject: [PATCH 09083/10326] Add simple acceleration to volume metre
 adjustments

---
 osu.Game/Overlays/Volume/VolumeMeter.cs | 34 +++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index 5b997bbd05..57485946c1 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -225,7 +226,7 @@ namespace osu.Game.Overlays.Volume
             private set => Bindable.Value = value;
         }
 
-        private const double adjust_step = 0.05;
+        private const double adjust_step = 0.01;
 
         public void Increase(double amount = 1, bool isPrecise = false) => adjust(amount, isPrecise);
         public void Decrease(double amount = 1, bool isPrecise = false) => adjust(-amount, isPrecise);
@@ -233,16 +234,39 @@ namespace osu.Game.Overlays.Volume
         // because volume precision is set to 0.01, this local is required to keep track of more precise adjustments and only apply when possible.
         private double scrollAccumulation;
 
+        private double accelerationModifier = 1;
+
+        private const double max_acceleration = 5;
+
+        private ScheduledDelegate accelerationDebounce;
+
+        private void resetAcceleration() => accelerationModifier = 1;
+
         private void adjust(double delta, bool isPrecise)
         {
-            scrollAccumulation += delta * adjust_step * (isPrecise ? 0.1 : 1);
+            // every adjust increment increases the rate at which adjustments happen up to a cutoff.
+            // this debounce will reset on inactivity.
+            accelerationDebounce?.Cancel();
+            accelerationDebounce = Scheduler.AddDelayed(resetAcceleration, 150);
+
+            delta *= accelerationModifier;
+            accelerationModifier = Math.Min(max_acceleration, accelerationModifier * 1.2f);
 
             var precision = Bindable.Precision;
 
-            while (Precision.AlmostBigger(Math.Abs(scrollAccumulation), precision))
+            if (isPrecise)
             {
-                Volume += Math.Sign(scrollAccumulation) * precision;
-                scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision);
+                scrollAccumulation += delta * adjust_step * 0.1;
+
+                while (Precision.AlmostBigger(Math.Abs(scrollAccumulation), precision))
+                {
+                    Volume += Math.Sign(scrollAccumulation) * precision;
+                    scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision);
+                }
+            }
+            else
+            {
+                Volume += Math.Sign(delta) * Math.Max(precision, Math.Abs(delta * adjust_step));
             }
         }
 

From 8282f38eb708884e765e14148aa254b21db5f4fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 13:10:45 +0900
Subject: [PATCH 09084/10326] Fix volume controls not supporting key repeat

---
 osu.Game/Extensions/DrawableExtensions.cs     |  8 +++--
 .../Overlays/Volume/VolumeControlReceptor.cs  | 32 +++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 1790eb608e..67b9e727a5 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -9,6 +9,9 @@ namespace osu.Game.Extensions
 {
     public static class DrawableExtensions
     {
+        public const double REPEAT_INTERVAL = 70;
+        public const double INITIAL_DELAY = 250;
+
         /// <summary>
         /// Helper method that is used while <see cref="IKeyBindingHandler"/> doesn't support repetitions of <see cref="IKeyBindingHandler{T}.OnPressed"/>.
         /// Simulates repetitions by continually invoking a delegate according to the default key repeat rate.
@@ -19,12 +22,13 @@ namespace osu.Game.Extensions
         /// <param name="handler">The <see cref="IKeyBindingHandler{T}"/> which is handling the repeat.</param>
         /// <param name="scheduler">The <see cref="Scheduler"/> to schedule repetitions on.</param>
         /// <param name="action">The <see cref="Action"/> to be invoked once immediately and with every repetition.</param>
+        /// <param name="initialRepeatDelay">The delay imposed on the first repeat. Defaults to <see cref="INITIAL_DELAY"/>.</param>
         /// <returns>A <see cref="ScheduledDelegate"/> which can be cancelled to stop the repeat events from firing.</returns>
-        public static ScheduledDelegate BeginKeyRepeat(this IKeyBindingHandler handler, Scheduler scheduler, Action action)
+        public static ScheduledDelegate BeginKeyRepeat(this IKeyBindingHandler handler, Scheduler scheduler, Action action, double initialRepeatDelay = INITIAL_DELAY)
         {
             action();
 
-            ScheduledDelegate repeatDelegate = new ScheduledDelegate(action, handler.Time.Current + 250, 70);
+            ScheduledDelegate repeatDelegate = new ScheduledDelegate(action, handler.Time.Current + initialRepeatDelay, REPEAT_INTERVAL);
             scheduler.Add(repeatDelegate);
             return repeatDelegate;
         }
diff --git a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
index 3b39b74e00..34b86b2f81 100644
--- a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
@@ -6,6 +6,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Threading;
+using osu.Game.Extensions;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Volume
@@ -15,8 +17,30 @@ 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;
+        private ScheduledDelegate keyRepeat;
+
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.DecreaseVolume:
+                case GlobalAction.IncreaseVolume:
+                    keyRepeat?.Cancel();
+                    keyRepeat = this.BeginKeyRepeat(Scheduler, () => ActionRequested?.Invoke(action), 150);
+                    return true;
+
+                case GlobalAction.ToggleMute:
+                    ActionRequested?.Invoke(action);
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+            keyRepeat?.Cancel();
+        }
 
         protected override bool OnScroll(ScrollEvent e)
         {
@@ -27,9 +51,5 @@ namespace osu.Game.Overlays.Volume
 
         public bool OnScroll(GlobalAction action, float amount, bool isPrecise) =>
             ScrollActionRequested?.Invoke(action, amount, isPrecise) ?? false;
-
-        public void OnReleased(GlobalAction action)
-        {
-        }
     }
 }

From 65a1270f9a4dc5d6ba1680dad869736e8714f31f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 14:16:18 +0900
Subject: [PATCH 09085/10326] Hide top-right HUD overlay elements as part of
 HUD visibility

---
 osu.Game/Screens/Play/HUDOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 3dffab8102..31b49dfbe9 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.Play
 
         private bool holdingForHUD;
 
-        private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
+        private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter, topRightElements };
 
         public HUDOverlay(ScoreProcessor scoreProcessor, HealthProcessor healthProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
         {

From ad53ababe89f49a2650a4bcd4eb5368052f9413f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 08:16:45 +0300
Subject: [PATCH 09086/10326] Fix wrong default

Ah, soz
---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
index 8fe40f801b..7a8555d991 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
-            bool centre = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorCentre)?.Value ?? false;
+            bool centre = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorCentre)?.Value ?? true;
             spin = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorRotate)?.Value ?? true;
 
             InternalChildren = new[]

From b060b59dcf0c2f0bf73979b398aa2000007d6fd7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 08:17:35 +0300
Subject: [PATCH 09087/10326] Return null values instead of throwing NIE

---
 osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index 8fd13c7417..0ba97fac54 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 RelativeSizeAxes = Axes.Both;
             }
 
-            public Drawable GetDrawableComponent(ISkinComponent component) => throw new NotImplementedException();
+            public Drawable GetDrawableComponent(ISkinComponent component) => null;
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
@@ -98,9 +98,9 @@ namespace osu.Game.Rulesets.Osu.Tests
                 return null;
             }
 
-            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => null;
 
-            public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
+            public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => null;
 
             public event Action SourceChanged
             {

From daf198fa77f18a6872213477c37abcc66f933ad2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 08:18:24 +0300
Subject: [PATCH 09088/10326] Add osu! 2007 skin cursor for testing purposes

---
 .../Resources/old-skin/cursor.png               | Bin 0 -> 10496 bytes
 .../Resources/old-skin/cursortrail.png          | Bin 0 -> 3763 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursor.png
 create mode 100755 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursortrail.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursor.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursor.png
new file mode 100755
index 0000000000000000000000000000000000000000..fe305468fe9efc47be6e9e793baabdab04aab4da
GIT binary patch
literal 10496
zcmV+bDgV}qP)<h;3K|Lk000e1NJLTq002J#002J-1^@s6S6>j{00004XF*Lt006O$
zeEU(80000WV@Og>004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U(
zX+uL$P-t&-Z*ypGa3D!TLm+T+Z)Rz1WdHz3$DNjUR8-d%htIutdZEoQ(iwV_E---f
zE+8EQQ5a?h7|H;{3{7l^s6a#!5dlSzpnw6Rp-8NVVj(D~U=K(TP+~BOsHkK{)=GSN
zdGF=r_s6~8+Gp=`_t|@&wJrc8PaiHX1(pIJnJ3@}dN|Wpg-6h_{Qw4dfB~ieFj?uT
zzCrH6KqN0W7kawL3H*!R3;{^|zGdj?Pp5<bPtvSZz5oEoU&Q8YPC84(`65or6r_sn
zGa{zOB#IeEiJ31-P{eX#j$7oVpM4hDQOxXQ9$UoXoKxA!Y%%wUczcGBBVxoy#042#
zPNs-&i&!&Bn9LRNTXAeMhnWrliX^rRIIMUPn~0di4-Rw@@p1rgq_{6Q<_i{ZvIOEo
zxum3K^SN>H0=h0sk8Wyh&7ga7GLtw0fuTQ>mB{3?=`JbBsZ3rr0E=h-EE#ca>7pWA
znp#_08k!lIeo?6Zy7)IG?(HJI3i#YJh}QRq?XUb&>HuKOifXg#4_nNB06Mk;Ab0-{
zo8}<^Bt?B|zwyO+XySQ^7YI^qjEyrhGmW?$mXWxizw3WG{0)8aJtOgUzn6#Z%86wP
zlLT~e-B>9}DMCIyJ(bDg&<+1Q#Q!+(uk%<M$cg3fIXqEBsA$T#yf{(2d2FtLo5G`W
zdH<=2|1j)NTAXW<DD|HJHOdG`-Jk;G=RSa<5CIZ-P~7$3`{siW1>&0*raG}W_n!s*
z`>t?__>s<y`yA&I7))mg`5B9A;%f=efB+-`703e>paFD&Aut10z!o?HH?RWufnX30
z)&drY2g!gBGC?lb3<^LI*ah~2N>BspK_h4ZCqM@{4K9Go;5xVo?tlki1dM~{U<SMa
z^AH4KAu>dP<RMi^3o?MrAO>U)xj{ZqAQTQoLvauf5<<Dq7N`g+g({(1s1f=WIt5*T
zu0jLQJ!lk~f_{bG!w5`*sjxDv4I9G@*a`NAgW)xB9GnK{!1?e_xB{+&kHPKm1^7CA
z2Ofc+!?OrLhzJc)LktlH;)3`g5lAe;M>ZgZNI6o6v>;tbFLDbRL8g&+C=7~%qN5B^
zwkS_j2#SSDLv276qbgBHQSGQ6)GgE~Y6kTQO-3uB4bV1dFZ3#O96A$SfG$Tjpxe-w
z(09<|=r<S)hKA9>SYbRd;g|%>I!rO<0Hzgl9y5R$!^~o_Sb3}g)(-23Wnu-`0_=Y5
zG3+_)Aa)%47DvRX;>>XFxCk5%mxn9IHQ~<U25}R(dAt-}3vYw>!?W?(_!4|Qz6*Z?
zKaQU#NE37jc7$L;0%0?ug3v;^M0iMeMI;i{iPppbBA2*{SV25ayh0o$z9Y$y^hqwH
zNRp7WlXQf1o^+4&icBVJlO4$sWC3|6xsiO4{FwY!f+Arg;U&SA*eFpY(JnD4@j?<W
zsU_(oxmGeqvRv|{<PFJbDZG@nl#3KoYJ*gj)G4W9saa`?w5hb8bh31@bd&T|=}8%^
zjJAxM3|l5&=CI5~nK24N(V)0cSd=Z4ddelrI2A+Hp?Xmhs72IosQuI#SsB@7vZ1nB
zvQ@HYWJhQSO`GOLOQMy~PSA#E@0TbqaazJzvSUfhlEEc&a*A?}avZrrxmLM5a_{Bo
z@^12p^1J0b<R2-Z6!aAW6fzYKDqK>SR-`K0DzX#{6;CMMSAv!Fl>(L4DIHeoQ<_y)
zQT9+yRo<_BQF&U0rsAlQpi-uCR%J?+qH3?oRV`CJr}~U8OLw9t(JSaZ^cgiJHBU96
zTCG~Y+Pu1sdWd?SdaL>)4T1(kBUYnKqg!J}Q&rPfGgq@&^S%~di=h>-wNI;8Yff87
zJ4}0<c8B()j+~B{PL58q&O=?Yu7hrxZk_IJJ&YbhFH!G+-c5a2-$FlLze@jx0c>Dt
zz%@8vFt8N8)OsmzY2DIcLz1DBVTNI|;iwVK$j2zpsKe-mv8Hi^@owW@<4-0QCP^ms
zCJ#(yOjnrZnRc1}YNl_-GOIGXZB90KH{WR9Y5sDV!7|RWgUjw(P%L~cwpnyre6+N(
z<Xg5_PFZPMMO#%{4Kt_=e?~FmiZ$BW*?Ob(Y3p}3mNo*L6E?rt8rmk>HrY-t*ICY4
zUcY?IPTh`aS8F$7Pq&Y@KV(1Rpyt4IsB?JYsNu+VY;c@#(sN31I_C7k*~FRe+~z#z
zV&k&j<-9B6>fu`G+V3Xg7UEXv_SjwBJ<h$^ea6GWW1Yu&Pqe4E=WfqoFJ&*5SEJX=
z3ab_CSM+$3yo0<ey`T8#`|y3bd|}@ezI%KhuGCt|TiM|U{Ji}3_&xI1@lW&rJ^&No
zA5azWG|)6KH?TK|5)>8G6!a$8Ik+VFL5OaMFr+(FGBh%@F?24>HLNsjWR>x%^{cLj
zD}-~yJ0q|Wp%D!cv#Z@!?_E6}X%SfvIkZM+P1c&LYZcZetvwSZ8O4k`8I6t(i*Abk
z!1QC*F=u1EVya_iST3x6tmkY;b{Tt$W5+4wOvKv7mc~xT*~RUNn~HacFOQ$*x^OGG
zFB3cyY7*uW{SuEPE+mB|wI<_|qmxhZWO#|Zo)ndotdxONgVci5ku;mMy=gOiZ+=5M
zl)fgtQ$Q8{O!WzMg<FNA8TJ`f8E-Q~Gf!qoXYsQ7vh}lfWKZO{=X|{mwT`u}J6A1t
zbMEMRr}ecPpbaq_x;JWU%-=Y^$z#*e&4kT~n}5hN$t%r!y(Mf*SH5!oru?z39$T9W
zBntQi!`p1P)oe#?=Wg%cVZLMkj!%W`!fQn)Mdd{widn_izB2u);;V(7u{--qEK3gV
z!tCPh8rto!`)H|jX-?_b9^XCfW%RPbve$c~_FgStR$jA@uur&eq{647bHC>PUHd;&
z##i2{a;|EvR;u1nJ$Hb8VDO;h!Im23nxdNbhq#CC)_T;o*J;<4AI2QcIQ+Cew7&Oi
z#@CGv3JpaKACK^kj2sO-+S6#&*x01hRMHGL3!A5oMIO8Pjq5j^Eru<%t+dvn<KVdP
z__J@Lza2W^eWLp$<7CTsTHjT-QQ8XIq4w<dnU465k<ReWfm16^b$8izwS8~&{gKmZ
zr>oA$o+&v?IGcZV;atwS+4HIAr!T}^80(JeesFQs#oIjrJ^h!wFI~Cpe)(drQ}4Me
zc2`bcwYhrg8sl2Wb<6AReHMLfKUn<G)^FM0e#7cU=S}OIT?5Mp&JH>ZUby9Y>+)@{
z+t=@`yfZKqGIV!1a(Lt}`|jkuq<b&#XWXBEu<0TCVc{dGN9B)|9@qV-_hajb<;a;)
z*U`QwK~ElxvBsYNl>XC)@%*Rcr{xo>6OEH*lc%TLr*1x5{cQYs>ht;Of}f>-u708W
z;=5lQf9ac9H8cK_|8n8i;#cyoj=Wy>x_j1t_VJtKH}i9aZ{^<}eaCp$`#$Xb#C+xl
z?1zevdLO$!d4GDiki4+)8~23s`{L#u!T<mO32;bRa{vGf5C8xR5CN?ty>$Qp02p*d
zSaefwW^{L9a%BK;VQFr3E^cLXAT%y8E;js(W8VM(9t}xEK~!i%?OO*}RM)mX(<oCI
zn8pkYO^PspQ~^<>ND+`O3Zh~`6ct59MFc?wQ4~dqM(h<Uhy_b90!BqFF&Z_|#QR>Z
zX(ln2X!NRa-oGZ0OY(UWljuv{_r3Fd%fl&qt^eO^?X}n5XJr2WcpZnYmZcM)cCoHz
zGm>OBW1<rdBOAeH6xkd`IsHd5D`GR26>P?CC#zk<j|b`aKXVXR%_%lxyNS)17jYTs
z5Ix2y%z!2A$!7_Cg<PSh5m)GC#1Z+6Iij9oj#01?$GESEBMud?M8SNPQLq6c?1?sg
zxacenbg&tl>c43Rba>dQ=|}HcF61)mVttlr7M~^UFJ_xW%X!9uDm~+#R(eK0wtPts
zd%ncKE5wm64RYX1dfVe{%a;aQ>4^g@^u&HDp4dmu5&0OiL_R{67@c9<S5Maw@=WT`
zzez_BY4VItig_&6Gy|4AOT?BAm+HyV%=M-H?F8~zSD|T?pRsv#pv*ElOlBDwsj`jh
zr*=r}XKvp=+T3A4U!`4QxYQ~p7|#Pt%)@;|iXeBPthbYaaZeiqV}B(_=r2L!2v|me
z`i!s#ml1feA%9^fP$-%gVZ2V{k(W8jF=DPVQ^}JJvEiGhI|~)V{3NRMP*ba631;@g
zhFCdgWOi}O%y#h3nym2~KgB(8%2dywsW|86X#6Hj!2K*+w~?9F&O?T(?UR$utm68~
zR1v{qd9b%g+RG79W5E-9Nw^{p0gLaV$LL#g7=63{<qjZkQ{pm?<}s2)Lyj!Xm@6Bi
z)K{e23C%Ly#TJ=?YR#lrJNMkdp1tzN`uCYRtyk!j*&$I=7Nn0^vSiMpeO24`eo(dJ
z!1XtFHhjEn`~K^dxUR(gMZ>Zx=7&a4oZCBWY(dZ9aZ@~dWQ?(Q8JKG65Fcrx3icB#
z{2dL&?q+&IjhM@~HDL6uxC~dyZb$Z-4@okM5e2dtQGg!HI8wxx#G3LX@d)ifo?^3%
z5V>_uQWy8a5$?eixnapGi$+bUUATV7l{c<jzqjW81MP<I9%?t=f2gf#mu+;u_dvS^
zvI&3F^K}m%YS&!*$Gz&UwHKC-npnLcJfX0_yLWbWSGTlOGwaAOsj`=cNaALtFLaP{
z46XPq18Xj0=mboGuQ3XUxWJ3U@ZI!TLLXzEagc?fET)^pA}vJSb=*K3&Dhb-UK6JW
zMb0f<_~wPm!zUiCY`vsif9(@(&E4;`yPiLPzUS%Fr~95fd7_iYk00;F^?o|zx*k%8
z>sq{5hmP9$-(P6AT)v@Q*LLaq<*PThE{uqonD6O3aFnBKOuUs{sJ~3*;~+3`HPsW?
z3t5I;dBDYaJ$ZnL8*0$Qjs{$jmqgFFmyJ*s=_@r)j<s<fJKC++oPyx!!t&kqt;@gs
z`iHe&exu#|<!$YbukSps`|9?iefREvzxV$A`*q)b`|a-Aw{O>e_0?B(IM+RV`0x;&
zaZUGk({sGH2k+N^bLUb0o%_#se|ukB^X)zD>O1#-SbE^#$vF`*Sra_{ho#zSVuBTB
zy_`i74|6?{ixF4krpE}}IgHT%6?Q;}$3dJUaFObXeeJ}`uwG_1{RcU@kIU^5QcylV
zuYTo)tB*H5daT{9)oRJZd%yqw`+AV6y>;u>j!!@Rbo2G=*VkUTa%J_!ix*d2x^!vv
zM<0E(4$tawUQgG!UybLh@ZNg7zXi`~s578vH}vg*-i`lyqOJP)lgFibMVqDt^cgkO
z*}Z?5nN^UxvBFQSCvp>WgdPSA9~~eLdj%ap$xTPx*?=o_ljs?F*^6XBK_H&)(PR9q
z$fN};x7L2J^^?!FyKmpsB9xyV0@wzCuKVn>&$eE>c5UtX^XHep^UgcvhYlT@vwQdM
z!aaNT6g4z7%xi9LUW9k{(HYls={}wp;Jvx@KH62G{c60k5&E`5Z_U5{^_23$im$%a
z&fk0RQeI?S?g$Uxv?z1y2u~xaAL<AXV??Hb4)dQL0+ie^#<@Zl6A<rWB=6nZ(k@|y
zyU&<834_Yl9e(Fd-G6<iZFu_hS>vNej~W5;0Ko3}@WT(+o<4ng$$<k0=4{xoVaC#>
zODE2nHEYzwi4)Tc3kx%sEnAjTQ&Us$`RAWE;yjbCaep*D$9tLdKH5!3`y%LB2z|?;
zcMbG!fSnD`o;_Rn#W&jdC(qx`PfDGY>ESap#?mgbyIAgz4)8(;c<2N7pGbmKNbp_t
zScXnw17mL+u_7=)Z5unhd#^ENgGMgdbngA{_kDUxd-U6T&yRoi-FHnGxBC&YThE?7
zTeWZBzS*l*t(uabpPxB$<j5i6;o(V+j*k6|jg2EhLPC<pj2SbmtgLL}&6_um;+%u)
z;dGy#(|hzj+NGiWDCn60eKVoA4En2JXASJFzyIL*N<={UmFwRZrVTI6^7bDVZ_y>v
zM=bAYWgzwtv-rpXd{<ge{LT(&PjD>0M!*xfScv5QzDmpJ!7iS|OA-f_Zfd*qpyBhc
zwM`g{r;wnI!z=qQU%tGyv9WRCx^?UF0D4SHN=mAyr)Qi%AP9%XAV^P$AFd;!qM}l!
zPMtdDpa1;lF`Tn-ol5ud+!xXd5=iaPJ{EcgLSF{-=0JZD>@0!3YS>*1`>W6ai{HKa
zU14HM!B`iMv^b?@xHs@x@I>w+mcWC@i2J@|N!(GV>)WxB;P@PYyHa4{=b=!CCA)YJ
zn-vjXu<>y7Cx?*DTfV*fv<(1GfWSVC&$aMQX=P>QM0hOS$Hyn3opd0?AL0k;4)KPB
zM?^#r`LSr*g7Y|Br{X@5r+0iH^nMRWFX#z{zF3L`=pO?+`LI`xwku(O{oVUd*L;0P
zyQJylCq;eZa>u%OrS(&&L*0Sfj3e|GFh)VNKzd2<Q=&k)bA_%FJ&}i_SQZ#<>y$h-
zEOy44^*hd!$6GKLpM~Mm0MKyZ!i9Bpb#-$~OH0QmB_$0~tJVFWB^VL_AreG}NOedD
z`SECfg3iAn-yswQ)SmPNL2qB^?+-f}us02MsRJkiHUZDtTer1KHtjrH6c&@4Y3tNK
z9Jn=lMt*XRaS#?pF&xG;`!_m(ye<yovJ72>2pdb0JgB$1ZG4uS@5p5ZbGPjK^ecG$
z-m`Paylr28`Q=;izy<&*L6RC58ylO7F&hOf<ZbdAf$vPFL%=m+(0?FL9rer3>ga^t
zloMbl3HGQ1@?d`vaI6KM&3EoUTMx%n7M5%*aQ7WH6u1LKijXcmaj+4~D1yhxNBjnP
zTAk^<?xipg_wbOZBU2naMwIr6oxbzGKYP^l{JHilvh4*Vo#PmL+Yo}~@WccF8q`jl
z#&+j0?<^g}`nHqL2Kke8rfa(2>78HefN<EO2*`x}0^nE*Jez=P8}P0D<nu=rp|MkQ
z9Xy8jm#L$?48$R39HUS}Mv5izukH(o0y!*^AH43<MJx{qGqaAK<kNfj+8uk&97T!R
zh6Hm7(@h()?p`Dx%t%Y84;(mfu&JqOG+K8M@9go;WICiX`BT3_zC(W50fDd=0lNcW
ze;jbk1)f#FwFCHeVx6#h*WR`TKE2b&scd2*jO3AyJmWAEmLx%sQBGm&c9mXu@V)f7
zB2PKi(4G=y#9#;Kg!yra8TF4I|8VNrGwnr$*L%pcjhJ@UBl{L+WMquAv$Kmu%Mgez
zn?qhiptE!)-}(~dNji5X4XHrbjfVXpz>y0)Gy_l}R0o{ffp=wm;_z7x&WULz%2<B`
zNnbTb(oeuhhj3m@o|dVGZhW4|!_r96yN}vFX|i|E;p_JuINpTP^861!{O~?{_Y?|_
zT7=soOg|Hmh5Msr7=)4%f%+xr7s($X-yt0lKph<d`|(su0MBgTS`B=4z_}NAx9&gK
zvJCih)DEf9B4vz*XA&)8B<VcHvf>5gDdY`3#Ck#xjm#oE*}*ftETrG0y3fCQ)Cy&n
z+P(gEYisLT6dnZ#yCIl{BGIxV!MzCVi{#Ic?+}VGng%KSQ-LQJxGI5fCvYAF-uf@T
zdb9!f=Q(&~4wG3X^x%mj)GToVUzgW@c2JfV`s;D|u5tsBub;VX^l0y(ac@p4Sl@_M
z)j5o%%jng!SFc{(hmvzKd0nH?B%&ovX*AAX1n@t}s~}H8b_0Qfyq^VJrNFltI1dBw
zkvrdMcTXx<_h$EyNx5qK0a5x!;SL;eKQW`o;{H_6=nh?BW3A6IbhQwf^a!<gNtzmw
zkhi7b*o_t>x(mppmr;iw$JDYFHTUfF^z>ovUhh1YzpT6}@*Upq3q0w-H52$&1LuC=
zJ$CnjwxQwJKQ>48FDmWomOfZ0iS}ZPqU4M`L+_{UblpLJ7&;4h0%tp8c|eTDJ$Y6_
z%Jf|y{^P;P2j6QiqL#jZW#$pAwyKd~^H7HmKr2dezt`&|uZlbg*$14EWZ=pLzNNsq
z2Y8zwKGMGZ!9O0>C8ZTsxp<8jW28t3<cXs#80k<x)4el!lVmoF?_#7Ua@Ck9g9kWv
zi<_4;a7;axk0<~2<oSE|?%kv5Z6B7Kl?btHM@PqawCWA{y<R7ImE_5OZ^8py6M%0K
zaP9`)<|j{{p9KDfq?EC1ySk-JH8x9*<eBudV@U=H8Hc7$Q=T!%8@iYn8oRs6Ecy<1
zaE&RSkdwC$iQ^Q;&wF2g{q;!{6FX5=m0{UAs=c83JxQ*!yh`#U{=gFrT$#XE3Y^=4
zw*|P{fdA-}+`?^+h-8UXYNEa@Uc)j;5i>SBJ571QKn_>nD&<RkJfxOU!!(|W6&p6~
zCh{kqJb7~d_U+rp-+lMpnjJfKlwsYSjW8RCu|^$0B`JY^X+hi6?Ck8UB}<m%V|<>Y
zGhNgD7rp;m0vyqVr?|LyQf+PRLXh7D^6vomS>SKlytQ_>qi5<o6YIf)3{B(RIFbPp
zM!l5#Z}OrrE?3|t<IDWLmG=Edbn{KEc<X2@kv|S4XHY&iUAlB>dqYD*#j<6~repn`
zfo13*cr3MD=<k=3oSdAj#ful`ZQHi3?29kHxJYNZru#2?|F;A<1_RHis;a7)hYufK
zij2R9oCVzH2>;v7ZS@|#MwTnOjv8*LO!DNI43IL)BCc-S>ke@;m&5mv3gm&_s;(&`
zyaPv6w4S-V2aQ`EKYrW>Wi20l^wF;7=H@qQYHDVem6c6FxQ>O4gN&!peOVz-Lq{2=
zrZ=GXDxK+??!V~$ml5EZhEAM|xqj7+8#fNzy?gf*a9;raQ)ka#-R~csy;!9gGlH+|
z@69$IAZL_iyq}X7_LK`0VczCW>BD_PvMSELdyUA`hQ-;34<DYnb?eqK6cI-es_)#q
zdGk2ND+#UVPeM+$OY3h5+MfI7n{O@>ad_tro#~qHzv%tn5VA>lP6FRK%<=Cb(_e<(
zt61i~PvkFL`shGV^pr|7=dmLNs)5}>Ucs1E=>40#ESt*~g-Hdb(O%}x8N<8-$1H^B
zYtgtFJ=h9>P4N6qc)ki=D*Bsxz7(Ec1JCb==UajMJtBYR{0IAchUY9XbIH!okvAD8
zXUwZQd0sx9#}P+M1*-nuN~f%J*B+zhA355(8;y^l7uzuA-^Q5VhB3boV}2UO*vP-x
zn9szR&u<^|_2|@-z<m+;TaPuj9q<UqTBOuW7|AzF_vT1ObRtjxs1|UM2xNS-R8OhH
z*dZF<QDy5k){^Im{AnmVhHSqD*?vB<{di>80qqqYW&7Wi@n2K6Per!RLAI|zwy#6B
zZv}3h=QnPt+pqD>D3>@)7|J&v>B*L5$r!7hoyc47<g!dgNc2_1JWL$2)9k%QmgM9X
z??Pi5^KDSp1f?~!YlHbTgXUEjrg^?&nfZI<b<FcIz%?59=C_ll`h+}xVp48VorBl#
z5)+4<G<~zt?kw3f31i#Xp6zMA>w1pElINQ6Of$QQY;sbqU56FL#1Gy^o=4(1hl;5c
zmD3(nP_(F_3NH>uslub><%<CQn!M@?FA#VVfh!02mI3E};5`T2mw^9xOnll7YuBMg
zqAoefJmolNmT9pu<Mcs$kwgD@YB`K)ftYJLQ6sdRoM_>co*x{Vu;Iaj2fDR9GU)kF
zKKbMzYUdTGp{G&U!)PDKAF1+Qb!{ICJSo7H4}7bD^C<9A$X^2fmXOf64VF%6Q^6~m
zYno$+AuiJK{fWF6E-c<OV#{;w43)Y4EH&eDLn245K6U2m(SJSBo}qm^jL#;lnl@wg
zRE$N`i1so6SFh><Xv_o8NLp<I-*(_U1-$P+d8$2o`s~%l;E41UR!$?c4V5`TY{hgd
z#&WGd$M+}l-Em>F*^sT6YsHgH4|4D*93MMq@rvRF+YjD*psVjMVh%n1;fEjAVQQjX
zoNTP4lVH4K-|j`={*$~a^12lra3llIB;cw9KKf309(XTfQPWyHf6M;p0VS38?o&tb
zOeXoV6?04(+gbx1-=E0);KJdc0V7|e;EHE@+k2G_iAvkBFm?3uT{pjc+=38#mv(Xh
z_AQ!AtE;PLw(sN+;J;!ghwRZ;ooL`l2cAOUS`U54fRo1hr7ymI)RdC3s3v0I8?)^^
z3KO{EDNc;M+=S_Rgx2%ztGXX|HQ0<(6OU1?6LTc9?UkC+X!nQ}(}Lp5s_XWjYJ{@3
zAAb1Z0<!4I_C36X<b59>pJafbvH!B0mn46dJlP?8VV<6z<n<ijSqxnDz;^~XuK@4a
zy$4Sm3W}Yz#H~;HSktaEdUH%>S}@8Ld`9yQ?c{XY%KEVbFz&bU*^0#~QI}F*bFU@o
zPCW}s5>v)+gTiJgynsaVF74i)K7D%4>eZ`fjl`i=t7-R^wzFR6?rn#35D$Ufc$m)w
zj$+{11YFI)r}H}Swj`xwZPN6}nPKKu94E5QcVf%tU^TZ<Pe=S`+gNnah3ye8W4_u*
z-=f^!*si><s_TStJpvLcTUuIZQ;^2~1&pcIk3asnzOk`!S!HGA)TE@OG|aP<{5tmY
zeyaoiD0$MW8|O5y!|u@X^784xu^e~~wU2eG=TDwEaiXqAK-@ethm64{U1s{|n-wS-
zRfPd#dys?nKOR3LPh-IK2Ak=!RiCX|s^G~>-NmY`1V`7XX)&?M8y`G)bd<u0GC#`Q
z78DcP5pD}gN=kB2Vy3i@|Cfn?KSKT|kJC7(k`{JzDcpf$H}JFp7kT|%;Cw44Ht9_#
z*YGT3ReFG)bh<TLQ7mMv*K!z_4>}S4<v|_baEQy8y(#3#%B_TEc>xyA<41V(%qTA|
zSw^*f)3ayK&LO<cBFyMp-KJf;c9mk>ji(NPM}GOq>P194lYf~nHk90S#L44CoU%LY
zE~KdqI8Ff172u+|y}7t#=?;&c>G_tL%ow36+leD7FkzGnd5mq%uMqDzoSN8-#b!OW
zyi#JQp66`pvM|oJd;XMw(4ouQ+S(4lzzM4Q+P~5s!o79W0r13x_OG-t&_YR&DnJ7M
z%PR0?$#;Y~%_d<q#-Tr*JPvycV7KPePd{w|j*IQf*H+xC4+tGH-_|>CsKU9#*U&uQ
zlr5dB&zQgYlE2maaqM##v*iMw*?cpR)m$HQO<sz3;N)3x117D%e&g057@|G0GcZhR
z`387kJwk9E#^7Wmq2b8FiS5IHqJVyEK%LML37yH)hss}mrR^Y11(Yt#p>F{6j)wjj
zuu}nhJ3+h&_AdhmW%t%=H*W2Z8<_iscTjGYxn^dN$g<d)r<yH**Z)1vU+QpqkHvIB
zW>hW~b0tN#iZ1zq?tybN`^3*KOBp%^<NpCgKr;-V1_1hHMgzv)W+b1*$i9fm{IQsS
z(@=mUa5x+yMcdrENC25ggl-y<2KjgBOxL*Iu_;RL^+CHxwC_*zI8A4i)uDeS?CgcT
z)=tDv6P}dx87sq+D{{U1EQvO?D|O&Xij9Du3mz{K?wt?vzGEYYF<)-Tk`~K^=F>D*
zF8O`kdghG|>^re!<d}kuUw-|N_V|t><W6GD9Y@kRjI6sI)6NQbrxb<9bb!vH4+^vv
zz~Up0asvHLdw^wSWm9k7ym^Aov<FA^IiB~UMGE~*B`exbgq|YkTLQgXp#KQ$oPj;s
zsnHSt{MN&UQR7P9>=QF<vS;w(7#q*U8j(e*l#wmcXVfeIz)w?&JV}?GTt-<e;F{(s
z4dvOcD%<QZ-;fzuu_?1khK`uJ`qr&mwAFP4$)*L__Bf`Sqwq>S3XUzPxR#^joR6A&
z7JX0vk#V%`jq~{B%a_y6O9|Sap&b}pQ%B+P#L+nC&>{ux=Aivj=-C2&hoJW)^uG@~
z*I<u`x1s(1VVT8MDVeJ#2gR<6Q)?=n4b2wGxaP}1yqe9}ANieL?>KbcNAk0*;xY0W
z0=DsZrARs2*|yunaNpqRBLc$4<;NzCS=w~`{8j*|hrER_JO;14jY{hXLV6EC*I<0E
z!)mLFJ}6+lJ-4>Dw*2tn!<8Ua4Kf#SUWMyrxW5?B7vQ}ryuSwR=qGK5pyvei(cauO
z=>G_Iu0l?}-F%@we!!%PkeIpI!Ex)NU3#r{7F)d`WhqvG_&Sv9Z~Z~y9S3y)Wq(x>
zkC9FgaHUxap)$i!)g`O9bN8G9!Ts`cB4bC-t*BVM5+2zCP<4<asIZQr#(o>*8nMbc
zh-Ky;th0Avyw*^CaP{idT{mvr*b73JY0nMUb+}&(sl$8peiPcAL3{d5z=zOx1A4DR
z-h-W{#fum3h)tee7L`(+=^auXVd1i-tJwNYDNnslA5|)wu{-c5iFX`+=m7e^FQ$1s
zMlzPqG0Bn|%0}5(I!*R=?^O`x;XigrcmJeG{o;nqJO0jzY5=89ph!3ZPtlJPDH@L5
zyLYb%9;B#v`}XbIEqCwUr4J%kXtNR5r*Qu?<P6>;FJDEwkI<e-UxQqR-nQe%PaKJk
zORw(UGi`=<Q1PIi(c6RVeYe>2)$2`I%B^~g<=)ry^K<%-KPvh^Gvf`|vI#~)RgRh5
zda9$^aas?1ue^S)-G>eh=pCAqn3y;Z<t0VJMu6Vg-Vq0pppJq}GYAuD+FhmHmiK6X
z9oH8jm+<@w?tR!!n8x)*=s5#@P0(8d{R>=uM`bzqE{w74w%kkQxY<(NWvda#qE?Tw
zKJc1|cO29K7E2KYGxabF@Hxgs5+lnJ3$t!ZUCkVG{48xlLp9yPQ~d+`PmGEiKC5u{
z(u&h(udMj??t}FpLfc|AEE*tGDj$cOgq()ZceOJR`pR<t&fN!XZD+5Xnl*dL+flLU
zyZr-`mO^i?rES<iGbdD?UfZ3G?P}y~`E~)LI>2RYn_p3w|JFezuw6ZiQLjQ7yh>l+
za<xEcT`d!sFSHaW^PJ?i`918qmqhvYoj<VOpo&q+>9Z%q#1EMc&&|!t%d6b9Y168U
z7cXw5G5)~^AMC~XAg&v6|1CT}i1+sNi%Z>+kUDLBWdGvj-9rmz+j`}Xk=ss<5h(LL
z1?nnGk?nR9{Vx0USyq^i?c4sBh<84^VUa+yfpsIMLjW<Y6|oh&6h`*jZPY%yTs@<9
z`9=+`3yw;u3hf>+q_3m1Z(=u(UPC>*2aoF&7(F92BB8Wzbn>FGi1^BYz^G-O-2)eO
z^XNIx(YgC9Prrm|Au)xMLXuXD?G~~k#oTjckdf_bSGHoaily8mWK>6ZOqW(R<MRGr
zK)mCiD9~JIG4@y3jO_&;V|~I<-|j6VvF3nO<-SYh;Jek*&a28sVV`R+Qm4B}ZHD;D
z?FNOYx(<p}I}J)TcS=cDI}OZGIV5K&Y?Fq|tP|73W-$p0o1u}`F4IG-yUp`cI4yBD
zvR`ARXS3aeu{>nR*tBwC?=K|%%Y&vwuX}8!+ouS_D?G;HoIYdPV#t!z^I6i3LXPqc
zG1q*)Oy8>5jBhj3R$w#5RcMp#Ewmo%2k9lS$_n6Hjq}$xAM4FC&356)Cfl*a1(s~_
zLOCN{W6Y@b@R=?r^%<9sIgID+zY+1y2Ym?epe?a)P+i^RFxFQ%jO7VPJ%_Q_$YraS
z7;@EfL_G666P{|aoTnVGgs6C`Y$aEfqhOm(ld?<;jTz-4A){Ptz?knt7C!|~U*_oa
z>OM65-4BWcI%rsU>pBF(<8vg+_t=aTR*dQzB+E@a#%!&gPE^%;jC!XYW7EiEy0#Og
zcGRA9b?Ey)f4GB)+s}lp6S_~G<O%VDyml`$%>MwG^ZCvhQu%lQ0000<MNUMnLSTZ5
Cnc(sO

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursortrail.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursortrail.png
new file mode 100755
index 0000000000000000000000000000000000000000..f3327dc92ffd234f28faba3e4b4dc28dbc9d1b35
GIT binary patch
literal 3763
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

literal 0
HcmV?d00001


From 367dafab56d3ea77804b95e42f41332d991f0603 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 08:20:18 +0300
Subject: [PATCH 09089/10326] Apply `CursorCentre` to old-style legacy cursor
 trail

---
 .../Skinning/Legacy/LegacyCursorTrail.cs      | 12 ++++++++-
 .../UI/Cursor/CursorTrail.cs                  | 25 ++++++++++++++++---
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
index af9ea99232..0025576325 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
@@ -26,7 +26,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             Texture = skin.GetTexture("cursortrail");
             disjointTrail = skin.GetTexture("cursormiddle") == null;
 
-            Blending = !disjointTrail ? BlendingParameters.Additive : BlendingParameters.Inherit;
+            if (disjointTrail)
+            {
+                bool centre = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorCentre)?.Value ?? true;
+
+                TrailOrigin = centre ? Anchor.Centre : Anchor.TopLeft;
+                Blending = BlendingParameters.Inherit;
+            }
+            else
+            {
+                Blending = BlendingParameters.Additive;
+            }
 
             if (Texture != null)
             {
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index 0b30c28b8d..b55575696e 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Batches;
 using osu.Framework.Graphics.OpenGL.Vertices;
@@ -31,6 +32,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         private double timeOffset;
         private float time;
 
+        protected Anchor TrailOrigin = Anchor.Centre;
+
         public CursorTrail()
         {
             // as we are currently very dependent on having a running clock, let's make our own clock for the time being.
@@ -197,6 +200,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             private readonly TrailPart[] parts = new TrailPart[max_sprites];
             private Vector2 size;
 
+            private Vector2 originPosition;
+
             private readonly QuadBatch<TexturedTrailVertex> vertexBatch = new QuadBatch<TexturedTrailVertex>(max_sprites, 1);
 
             public TrailDrawNode(CursorTrail source)
@@ -213,6 +218,18 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 size = Source.partSize;
                 time = Source.time;
 
+                originPosition = Vector2.Zero;
+
+                if (Source.TrailOrigin.HasFlagFast(Anchor.x1))
+                    originPosition.X = 0.5f;
+                else if (Source.TrailOrigin.HasFlagFast(Anchor.x2))
+                    originPosition.X = 1f;
+
+                if (Source.TrailOrigin.HasFlagFast(Anchor.y1))
+                    originPosition.Y = 0.5f;
+                else if (Source.TrailOrigin.HasFlagFast(Anchor.y2))
+                    originPosition.Y = 1f;
+
                 Source.parts.CopyTo(parts, 0);
             }
 
@@ -237,7 +254,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
                     vertexBatch.Add(new TexturedTrailVertex
                     {
-                        Position = new Vector2(part.Position.X - size.X / 2, part.Position.Y + size.Y / 2),
+                        Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomLeft,
                         TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.BottomLeft.Linear,
@@ -246,7 +263,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
                     vertexBatch.Add(new TexturedTrailVertex
                     {
-                        Position = new Vector2(part.Position.X + size.X / 2, part.Position.Y + size.Y / 2),
+                        Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomRight,
                         TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.BottomRight.Linear,
@@ -255,7 +272,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
                     vertexBatch.Add(new TexturedTrailVertex
                     {
-                        Position = new Vector2(part.Position.X + size.X / 2, part.Position.Y - size.Y / 2),
+                        Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopRight,
                         TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.TopRight.Linear,
@@ -264,7 +281,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
                     vertexBatch.Add(new TexturedTrailVertex
                     {
-                        Position = new Vector2(part.Position.X - size.X / 2, part.Position.Y - size.Y / 2),
+                        Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopLeft,
                         TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.TopLeft.Linear,

From 6044083cf71405f9fa0a67b0d105e32ef15861d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 14:25:16 +0900
Subject: [PATCH 09090/10326] Speed up the fade of the HUD a touch

---
 osu.Game/Screens/Play/HUDOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 31b49dfbe9..669c920017 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -24,9 +24,9 @@ namespace osu.Game.Screens.Play
     [Cached]
     public class HUDOverlay : Container, IKeyBindingHandler<GlobalAction>
     {
-        public const float FADE_DURATION = 400;
+        public const float FADE_DURATION = 300;
 
-        public const Easing FADE_EASING = Easing.Out;
+        public const Easing FADE_EASING = Easing.OutQuint;
 
         /// <summary>
         /// The total height of all the top of screen scoring elements.

From b7d2821b5514f0b3e4b76064696354a0f56ae48a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 14:51:52 +0900
Subject: [PATCH 09091/10326] Display the centre marker above the waveform

Gives it a bit more visibility. This is where it was meant to sit, but
didn't consider using a proxy drawable to make it work previously.
---
 .../Edit/Compose/Components/Timeline/Timeline.cs      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 86a30b7e2d..aa5cc46e37 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -74,13 +74,18 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours, OsuConfigManager config)
         {
+            CentreMarker centreMarker;
+
+            // We don't want the centre marker to scroll
+            AddInternal(centreMarker = new CentreMarker());
+
             AddRange(new Drawable[]
             {
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Depth = float.MaxValue,
-                    Children = new Drawable[]
+                    Children = new[]
                     {
                         waveform = new WaveformGraph
                         {
@@ -90,6 +95,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             MidColour = colours.BlueDark,
                             HighColour = colours.BlueDarker,
                         },
+                        centreMarker.CreateProxy(),
                         ticks = new TimelineTickDisplay(),
                         controlPoints = new TimelineControlPointDisplay(),
                         new Box
@@ -104,9 +110,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 },
             });
 
-            // We don't want the centre marker to scroll
-            AddInternal(new CentreMarker { Depth = float.MaxValue });
-
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
             waveformOpacity.BindValueChanged(_ => updateWaveformOpacity(), true);
 

From e543db9bee68f8d733b62f24a4c4ad8f1c046e8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 14:56:27 +0900
Subject: [PATCH 09092/10326] Use additive blending for background box

Doesn't make a huge difference but this was intended.
---
 .../Compose/Components/Timeline/TimelineBlueprintContainer.cs    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 7427473a35..7a3781a981 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -65,6 +65,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 Colour = Color4.Black,
                 Depth = float.MaxValue,
+                Blending = BlendingParameters.Additive,
             });
         }
 

From 4538e4b50357ea2b0d4f113e55b6fa3d491c32f2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 08:58:25 +0300
Subject: [PATCH 09093/10326] Remove wrong assert

---
 osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index ed44bc7309..9a77292aff 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -93,7 +93,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestTopLeftOrigin()
         {
             AddStep("load content", () => loadContent(false, () => new SkinProvidingContainer(new TopLeftCursorSkin())));
-            AddAssert("cursor top left", () => lastContainer.ActiveCursor.Origin == Anchor.TopLeft);
         }
 
         private void loadContent(bool automated = true, Func<SkinProvidingContainer> skinProvider = null)

From a2094159421cc98d47b4af23a53ae8c4358091fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 16:52:29 +0900
Subject: [PATCH 09094/10326] Add "Barrel Roll" mod

---
 .../Mods/OsuModBarrelRoll.cs                  | 30 +++++++++++++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  1 +
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  3 ++
 3 files changed, 34 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
new file mode 100644
index 0000000000..1ba6c47f4c
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.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.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield
+    {
+        [SettingSource("Roll speed", "Speed at which things rotate")]
+        public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(1)
+        {
+            MinValue = 0.1,
+            MaxValue = 20,
+            Precision = 0.1,
+        };
+
+        public override string Name => "Barrel Roll";
+        public override string Acronym => "BR";
+        public override double ScoreMultiplier => 1;
+
+        public void Update(Playfield playfield)
+        {
+            playfield.Rotation = (float)(playfield.Time.Current / 1000 * SpinSpeed.Value);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index d6375fa6e3..465d6d7155 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -185,6 +185,7 @@ namespace osu.Game.Rulesets.Osu
                         new MultiMod(new OsuModGrow(), new OsuModDeflate()),
                         new MultiMod(new ModWindUp(), new ModWindDown()),
                         new OsuModTraceable(),
+                        new OsuModBarrelRoll(),
                     };
 
                 case ModType.System:
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index b1069149f3..ea3eb5eb5c 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public OsuPlayfield()
         {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
             InternalChildren = new Drawable[]
             {
                 playfieldBorder = new PlayfieldBorder { RelativeSizeAxes = Axes.Both },

From 1aa36818df11577979863233dd0a149de582504b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 17:47:11 +0900
Subject: [PATCH 09095/10326] Abstractify GameplayClockContainer

---
 .../TestSceneSpinnerRotation.cs               |   3 +-
 .../TestSceneGameplayClockContainer.cs        |   2 +-
 .../Gameplay/TestSceneStoryboardSamples.cs    |   4 +-
 .../Visual/Gameplay/TestSceneSkipOverlay.cs   |   4 +-
 .../Screens/Play/GameplayClockContainer.cs    | 277 +++++++++---------
 osu.Game/Screens/Play/Player.cs               |  11 +-
 osu.Game/Screens/Play/SkipOverlay.cs          |   2 +-
 osu.Game/Screens/Play/SpectatorPlayer.cs      |   2 +-
 8 files changed, 156 insertions(+), 149 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 14c709cae1..8ff21057b5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Visual;
 using osuTK;
@@ -193,7 +194,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addSeekStep(0);
 
-            AddStep("adjust track rate", () => Player.GameplayClockContainer.UserPlaybackRate.Value = rate);
+            AddStep("adjust track rate", () => ((MasterGameplayClockContainer)Player.GameplayClockContainer).UserPlaybackRate.Value = rate);
 
             addSeekStep(1000);
             AddAssert("progress almost same", () => Precision.AlmostEquals(expectedProgress, drawableSpinner.Progress, 0.05));
diff --git a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
index 891537c4ad..4d5dcabbba 100644
--- a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gcc = new GameplayClockContainer(working, 0));
+                Add(gcc = new MasterGameplayClockContainer(working, 0));
             });
 
             AddStep("start track", () => gcc.Start());
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index cae5f20332..7394458482 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gameplayContainer = new GameplayClockContainer(working, 0));
+                Add(gameplayContainer = new MasterGameplayClockContainer(working, 0));
 
                 gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
                 {
@@ -114,7 +114,7 @@ namespace osu.Game.Tests.Gameplay
 
                 var beatmapSkinSourceContainer = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
 
-                Add(gameplayContainer = new GameplayClockContainer(Beatmap.Value, 0)
+                Add(gameplayContainer = new MasterGameplayClockContainer(Beatmap.Value, 0)
                 {
                     Child = beatmapSkinSourceContainer
                 });
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index 841722a8f1..e08e03b789 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             var working = CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
             working.LoadTrack();
 
-            Child = gameplayClockContainer = new GameplayClockContainer(working, 0)
+            Child = gameplayClockContainer = new MasterGameplayClockContainer(working, 0)
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
             AddStep("click", () =>
             {
-                increment = skip_time - gameplayClock.CurrentTime - GameplayClockContainer.MINIMUM_SKIP_TIME / 2;
+                increment = skip_time - gameplayClock.CurrentTime - MasterGameplayClockContainer.MINIMUM_SKIP_TIME / 2;
                 InputManager.Click(MouseButton.Left);
             });
             AddStep("click", () => InputManager.Click(MouseButton.Left));
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ddbb087962..163ed9444f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Threading.Tasks;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -19,27 +17,90 @@ using osu.Game.Configuration;
 
 namespace osu.Game.Screens.Play
 {
-    /// <summary>
-    /// Encapsulates gameplay timing logic and provides a <see cref="Play.GameplayClock"/> for children.
-    /// </summary>
-    public class GameplayClockContainer : Container
+    public abstract class GameplayClockContainer : Container
     {
-        private readonly WorkingBeatmap beatmap;
-
-        [NotNull]
-        private ITrack track;
+        /// <summary>
+        /// The final clock which is exposed to underlying components.
+        /// </summary>
+        public GameplayClock GameplayClock { get; private set; }
 
         public readonly BindableBool IsPaused = new BindableBool();
 
         /// <summary>
         /// The decoupled clock used for gameplay. Should be used for seeks and clock control.
         /// </summary>
-        private readonly DecoupleableInterpolatingFramedClock adjustableClock;
+        protected readonly DecoupleableInterpolatingFramedClock AdjustableClock;
 
-        private readonly double gameplayStartTime;
-        private readonly bool startAtGameplayStart;
+        protected readonly IClock SourceClock;
 
-        private readonly double firstHitObjectTime;
+        protected GameplayClockContainer(IClock sourceClock)
+        {
+            SourceClock = sourceClock;
+
+            RelativeSizeAxes = Axes.Both;
+
+            AdjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
+            AdjustableClock.ChangeSource(SourceClock);
+
+            IsPaused.BindValueChanged(OnPauseChanged);
+        }
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+            dependencies.CacheAs(GameplayClock = CreateGameplayClock(AdjustableClock));
+
+            return dependencies;
+        }
+
+        public virtual void Start()
+        {
+            if (!AdjustableClock.IsRunning)
+            {
+                // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
+                // This accounts for the clock source potentially taking time to enter a completely stopped state
+                Seek(GameplayClock.CurrentTime);
+
+                AdjustableClock.Start();
+            }
+
+            IsPaused.Value = false;
+        }
+
+        /// <summary>
+        /// Seek to a specific time in gameplay.
+        /// <remarks>
+        /// Adjusts for any offsets which have been applied (so the seek may not be the expected point in time on the underlying audio track).
+        /// </remarks>
+        /// </summary>
+        /// <param name="time">The destination time to seek to.</param>
+        public virtual void Seek(double time) => AdjustableClock.Seek(time);
+
+        public virtual void Stop() => IsPaused.Value = true;
+
+        public virtual void Restart()
+        {
+            AdjustableClock.Seek(0);
+            AdjustableClock.Stop();
+
+            if (!IsPaused.Value)
+                Start();
+        }
+
+        protected abstract void OnPauseChanged(ValueChangedEvent<bool> isPaused);
+
+        protected abstract GameplayClock CreateGameplayClock(IClock source);
+    }
+
+    public class MasterGameplayClockContainer : GameplayClockContainer
+    {
+        /// <summary>
+        /// Duration before gameplay start time required before skip button displays.
+        /// </summary>
+        public const double MINIMUM_SKIP_TIME = 1000;
+
+        protected new DecoupleableInterpolatingFramedClock SourceClock => (DecoupleableInterpolatingFramedClock)base.SourceClock;
 
         public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
         {
@@ -49,73 +110,32 @@ namespace osu.Game.Screens.Play
             Precision = 0.1,
         };
 
-        /// <summary>
-        /// The final clock which is exposed to underlying components.
-        /// </summary>
-        public GameplayClock GameplayClock => localGameplayClock;
+        private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
 
-        [Cached(typeof(GameplayClock))]
-        private readonly LocalGameplayClock localGameplayClock;
+        private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
 
+        private readonly WorkingBeatmap beatmap;
+        private readonly double gameplayStartTime;
+        private readonly bool startAtGameplayStart;
+        private readonly double firstHitObjectTime;
+
+        private FramedOffsetClock userOffsetClock;
+        private FramedOffsetClock platformOffsetClock;
+        private LocalGameplayClock localGameplayClock;
         private Bindable<double> userAudioOffset;
 
-        private readonly FramedOffsetClock userOffsetClock;
-
-        private readonly FramedOffsetClock platformOffsetClock;
-
-        /// <summary>
-        /// Creates a new <see cref="GameplayClockContainer"/>.
-        /// </summary>
-        /// <param name="beatmap">The beatmap being played.</param>
-        /// <param name="gameplayStartTime">The suggested time to start gameplay at.</param>
-        /// <param name="startAtGameplayStart">
-        /// Whether <paramref name="gameplayStartTime"/> should be used regardless of when storyboard events and hitobjects are supposed to start.
-        /// </param>
-        public GameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
+        public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
+            : base(new DecoupleableInterpolatingFramedClock())
         {
             this.beatmap = beatmap;
             this.gameplayStartTime = gameplayStartTime;
             this.startAtGameplayStart = startAtGameplayStart;
-            track = beatmap.Track;
 
             firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
 
-            RelativeSizeAxes = Axes.Both;
-
-            adjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
-
-            // 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 HardwareCorrectionOffsetClock(adjustableClock) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
-
-            // the final usable gameplay clock with user-set offsets applied.
-            userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
-
-            // the clock to be exposed via DI to children.
-            localGameplayClock = new LocalGameplayClock(userOffsetClock);
-
-            GameplayClock.IsPaused.BindTo(IsPaused);
-
-            IsPaused.BindValueChanged(onPauseChanged);
+            SourceClock.ChangeSource(beatmap.Track);
         }
 
-        private void onPauseChanged(ValueChangedEvent<bool> isPaused)
-        {
-            if (isPaused.NewValue)
-                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => adjustableClock.Stop());
-            else
-                this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
-        }
-
-        private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
-
-        /// <summary>
-        /// Duration before gameplay start time required before skip button displays.
-        /// </summary>
-        public const double MINIMUM_SKIP_TIME = 1000;
-
-        private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
-
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
@@ -143,39 +163,31 @@ namespace osu.Game.Screens.Play
 
             Seek(startTime);
 
-            adjustableClock.ProcessFrame();
+            AdjustableClock.ProcessFrame();
         }
 
-        public void Restart()
+        protected override void OnPauseChanged(ValueChangedEvent<bool> isPaused)
         {
-            Task.Run(() =>
-            {
-                track.Seek(0);
-                track.Stop();
-
-                Schedule(() =>
-                {
-                    adjustableClock.ChangeSource(track);
-                    updateRate();
-
-                    if (!IsPaused.Value)
-                        Start();
-                });
-            });
+            if (isPaused.NewValue)
+                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => AdjustableClock.Stop());
+            else
+                this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
         }
 
-        public void Start()
+        public override void Seek(double time)
         {
-            if (!adjustableClock.IsRunning)
-            {
-                // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
-                // This accounts for the audio clock source potentially taking time to enter a completely stopped state
-                Seek(GameplayClock.CurrentTime);
+            // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
+            // we may want to consider reversing the application of offsets in the future as it may feel more correct.
+            base.Seek(time - totalOffset);
 
-                adjustableClock.Start();
-            }
+            // manually process frame to ensure GameplayClock is correctly updated after a seek.
+            userOffsetClock.ProcessFrame();
+        }
 
-            IsPaused.Value = false;
+        public override void Restart()
+        {
+            updateRate();
+            base.Restart();
         }
 
         /// <summary>
@@ -195,26 +207,24 @@ namespace osu.Game.Screens.Play
             Seek(skipTarget);
         }
 
-        /// <summary>
-        /// Seek to a specific time in gameplay.
-        /// <remarks>
-        /// Adjusts for any offsets which have been applied (so the seek may not be the expected point in time on the underlying audio track).
-        /// </remarks>
-        /// </summary>
-        /// <param name="time">The destination time to seek to.</param>
-        public void Seek(double time)
+        protected override GameplayClock CreateGameplayClock(IClock source)
         {
-            // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
-            // we may want to consider reversing the application of offsets in the future as it may feel more correct.
-            adjustableClock.Seek(time - totalOffset);
+            // 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 HardwareCorrectionOffsetClock(source) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
 
-            // manually process frame to ensure GameplayClock is correctly updated after a seek.
-            userOffsetClock.ProcessFrame();
+            // the final usable gameplay clock with user-set offsets applied.
+            userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
+
+            return localGameplayClock = new LocalGameplayClock(userOffsetClock);
         }
 
-        public void Stop()
+        protected override void Update()
         {
-            IsPaused.Value = true;
+            if (!IsPaused.Value)
+                userOffsetClock.ProcessFrame();
+
+            base.Update();
         }
 
         /// <summary>
@@ -223,19 +233,7 @@ namespace osu.Game.Screens.Play
         public void StopUsingBeatmapClock()
         {
             removeSourceClockAdjustments();
-
-            track = new TrackVirtual(track.Length);
-            adjustableClock.ChangeSource(track);
-        }
-
-        protected override void Update()
-        {
-            if (!IsPaused.Value)
-            {
-                userOffsetClock.ProcessFrame();
-            }
-
-            base.Update();
+            SourceClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
         }
 
         private bool speedAdjustmentsApplied;
@@ -245,6 +243,8 @@ namespace osu.Game.Screens.Play
             if (speedAdjustmentsApplied)
                 return;
 
+            var track = (Track)SourceClock.Source;
+
             track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
@@ -254,15 +254,12 @@ namespace osu.Game.Screens.Play
             speedAdjustmentsApplied = true;
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            removeSourceClockAdjustments();
-        }
-
         private void removeSourceClockAdjustments()
         {
-            if (!speedAdjustmentsApplied) return;
+            if (!speedAdjustmentsApplied)
+                return;
+
+            var track = (Track)SourceClock.Source;
 
             track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
             track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
@@ -273,16 +270,10 @@ namespace osu.Game.Screens.Play
             speedAdjustmentsApplied = false;
         }
 
-        private class LocalGameplayClock : GameplayClock
+        protected override void Dispose(bool isDisposing)
         {
-            public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
-
-            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
-
-            public LocalGameplayClock(FramedOffsetClock underlyingClock)
-                : base(underlyingClock)
-            {
-            }
+            base.Dispose(isDisposing);
+            removeSourceClockAdjustments();
         }
 
         private class HardwareCorrectionOffsetClock : FramedOffsetClock
@@ -296,5 +287,17 @@ namespace osu.Game.Screens.Play
             {
             }
         }
+
+        private class LocalGameplayClock : GameplayClock
+        {
+            public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
+
+            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
+
+            public LocalGameplayClock(FramedOffsetClock underlyingClock)
+                : base(underlyingClock)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index efe5d26409..e07c40e8ff 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -295,7 +295,7 @@ namespace osu.Game.Screens.Play
             IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
         }
 
-        protected virtual GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart) => new GameplayClockContainer(beatmap, gameplayStart);
+        protected virtual GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart) => new MasterGameplayClockContainer(beatmap, gameplayStart);
 
         private Drawable createUnderlayComponents() =>
             DimmableStoryboard = new DimmableStoryboard(Beatmap.Value.Storyboard) { RelativeSizeAxes = Axes.Both };
@@ -342,7 +342,6 @@ namespace osu.Game.Screens.Play
                             Action = () => PerformExit(true),
                             IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
                         },
-                        PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
                         KeyCounter =
                         {
                             AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded },
@@ -386,6 +385,9 @@ namespace osu.Game.Screens.Play
                 }
             };
 
+            if (GameplayClockContainer is MasterGameplayClockContainer master)
+                HUDOverlay.PlayerSettingsOverlay.PlaybackSettings.UserPlaybackRate.BindTarget = master.UserPlaybackRate;
+
             if (!Configuration.AllowSkippingIntro)
                 skipOverlay.Expire();
 
@@ -533,7 +535,8 @@ namespace osu.Game.Screens.Play
             // user requested skip
             // disable sample playback to stop currently playing samples and perform skip
             samplePlaybackDisabled.Value = true;
-            GameplayClockContainer.Skip();
+
+            (GameplayClockContainer as MasterGameplayClockContainer)?.Skip();
 
             // return samplePlaybackDisabled.Value to what is defined by the beatmap's current state
             updateSampleDisabledState();
@@ -832,7 +835,7 @@ namespace osu.Game.Screens.Play
 
             // GameplayClockContainer performs seeks / start / stop operations on the beatmap's track.
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
-            GameplayClockContainer?.StopUsingBeatmapClock();
+            (GameplayClockContainer as MasterGameplayClockContainer)?.StopUsingBeatmapClock();
 
             musicController.ResetTrackAdjustments();
 
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 3f214e49d9..ddb78dfb67 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Screens.Play
 
         private const double fade_time = 300;
 
-        private double fadeOutBeginTime => startTime - GameplayClockContainer.MINIMUM_SKIP_TIME;
+        private double fadeOutBeginTime => startTime - MasterGameplayClockContainer.MINIMUM_SKIP_TIME;
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index fdf996150f..9822f62dd8 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Play
             if (firstFrameTime == null || firstFrameTime <= gameplayStart + 5000)
                 return base.CreateGameplayClockContainer(beatmap, gameplayStart);
 
-            return new GameplayClockContainer(beatmap, firstFrameTime.Value, true);
+            return new MasterGameplayClockContainer(beatmap, firstFrameTime.Value, true);
         }
 
         public override bool OnExiting(IScreen next)

From a314f90d3732a0852edcd89fc8c1970012a6071f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 16:00:49 +0900
Subject: [PATCH 09096/10326] Allow timeline to govern the size of the rest of
 the editor content

---
 .../Compose/Components/Timeline/Timeline.cs   |   5 +
 .../Components/Timeline/TimelineArea.cs       |  11 +-
 .../Screens/Edit/EditorScreenWithTimeline.cs  | 117 +++++++++++-------
 3 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index aa5cc46e37..d06f977fc9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -56,8 +56,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private Track track;
 
+        private const float timeline_height = 90;
+
         public Timeline()
         {
+            RelativeSizeAxes = Axes.X;
+            Height = timeline_height;
+
             ZoomDuration = 200;
             ZoomEasing = Easing.OutQuint;
             ScrollbarVisible = false;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index 0ec48e04c6..f144fd3a65 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class TimelineArea : Container
     {
-        public readonly Timeline Timeline = new Timeline { RelativeSizeAxes = Axes.Both };
+        public readonly Timeline Timeline = new Timeline();
 
         protected override Container<Drawable> Content => Timeline;
 
@@ -37,7 +37,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 },
                 new GridContainer
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
                     Content = new[]
                     {
                         new Drawable[]
@@ -126,11 +127,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             Timeline
                         },
                     },
+                    RowDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.AutoSize),
+                    },
                     ColumnDimensions = new[]
                     {
                         new Dimension(GridSizeMode.AutoSize),
                         new Dimension(GridSizeMode.AutoSize),
-                        new Dimension(GridSizeMode.Distributed),
+                        new Dimension(),
                     }
                 }
             };
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 2d623a200c..b4b3aafc68 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -19,8 +19,6 @@ 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;
@@ -40,64 +38,86 @@ namespace osu.Game.Screens.Edit
             if (beatDivisor != null)
                 this.beatDivisor.BindTo(beatDivisor);
 
-            Children = new Drawable[]
+            Child = new GridContainer
             {
-                mainContent = new Container
+                RelativeSizeAxes = Axes.Both,
+                RowDimensions = new[]
                 {
-                    Name = "Main content",
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding
-                    {
-                        Horizontal = horizontal_margins,
-                        Top = vertical_margins + timeline_height,
-                        Bottom = vertical_margins
-                    },
-                    Child = spinner = new LoadingSpinner(true)
-                    {
-                        State = { Value = Visibility.Visible },
-                    },
+                    new Dimension(GridSizeMode.AutoSize),
+                    new Dimension(),
                 },
-                new Container
+                Content = new[]
                 {
-                    Name = "Timeline",
-                    RelativeSizeAxes = Axes.X,
-                    Height = timeline_height,
-                    Children = new Drawable[]
+                    new Drawable[]
                     {
-                        new Box
-                        {
-                            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.X,
+                            AutoSizeAxes = Axes.Y,
+                            Children = new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Content = new[]
+                                new Box
                                 {
-                                    new Drawable[]
-                                    {
-                                        timelineContainer = new Container
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Padding = new MarginPadding { Right = 5 },
-                                        },
-                                        new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
-                                    },
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4.Black.Opacity(0.5f)
                                 },
-                                ColumnDimensions = new[]
+                                new Container
                                 {
-                                    new Dimension(),
-                                    new Dimension(GridSizeMode.Absolute, 90),
+                                    Name = "Timeline content",
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
+                                    Child = new GridContainer
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Content = new[]
+                                        {
+                                            new Drawable[]
+                                            {
+                                                timelineContainer = new Container
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Padding = new MarginPadding { Right = 5 },
+                                                },
+                                                new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
+                                            },
+                                        },
+                                        RowDimensions = new[]
+                                        {
+                                            new Dimension(GridSizeMode.AutoSize),
+                                        },
+                                        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,
+                                Top = vertical_margins,
+                                Bottom = vertical_margins
                             },
-                        }
-                    }
-                },
+                            Child = spinner = new LoadingSpinner(true)
+                            {
+                                State = { Value = Visibility.Visible },
+                            },
+                        },
+                    },
+                }
             };
         }
 
@@ -114,7 +134,8 @@ namespace osu.Game.Screens.Edit
 
                 LoadComponentAsync(new TimelineArea
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
                     Children = new[]
                     {
                         CreateTimelineContent(),

From 26110cd777e3c4880adc2a10c2bb49e1b64c7947 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 18:15:11 +0900
Subject: [PATCH 09097/10326] Fix timeline not receiving input (being eaten by
 composer)

---
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index b4b3aafc68..26083e6a82 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -105,6 +105,7 @@ namespace osu.Game.Screens.Edit
                         {
                             Name = "Main content",
                             RelativeSizeAxes = Axes.Both,
+                            Depth = float.MaxValue,
                             Padding = new MarginPadding
                             {
                                 Horizontal = horizontal_margins,

From 2935f87e7082bd603c9a09aecda6ba51628a184b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 18:29:34 +0900
Subject: [PATCH 09098/10326] Fix IsPaused not being bound

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 163ed9444f..a97a87d73f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Screens.Play
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
             dependencies.CacheAs(GameplayClock = CreateGameplayClock(AdjustableClock));
+            GameplayClock.IsPaused.BindTo(IsPaused);
 
             return dependencies;
         }

From b53b30c1a97a71822359016e87d1334ce8097476 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 19:32:48 +0900
Subject: [PATCH 09099/10326] Fix incorrect offset due to another intermediate
 Decoupleable clock

---
 .../Screens/Play/GameplayClockContainer.cs    | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index a97a87d73f..36ca7415d0 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -31,16 +31,12 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected readonly DecoupleableInterpolatingFramedClock AdjustableClock;
 
-        protected readonly IClock SourceClock;
-
         protected GameplayClockContainer(IClock sourceClock)
         {
-            SourceClock = sourceClock;
-
             RelativeSizeAxes = Axes.Both;
 
             AdjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
-            AdjustableClock.ChangeSource(SourceClock);
+            AdjustableClock.ChangeSource(sourceClock);
 
             IsPaused.BindValueChanged(OnPauseChanged);
         }
@@ -101,7 +97,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public const double MINIMUM_SKIP_TIME = 1000;
 
-        protected new DecoupleableInterpolatingFramedClock SourceClock => (DecoupleableInterpolatingFramedClock)base.SourceClock;
+        protected Track Track => (Track)AdjustableClock.Source;
 
         public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
         {
@@ -126,15 +122,13 @@ namespace osu.Game.Screens.Play
         private Bindable<double> userAudioOffset;
 
         public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
-            : base(new DecoupleableInterpolatingFramedClock())
+            : base(beatmap.Track)
         {
             this.beatmap = beatmap;
             this.gameplayStartTime = gameplayStartTime;
             this.startAtGameplayStart = startAtGameplayStart;
 
             firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
-
-            SourceClock.ChangeSource(beatmap.Track);
         }
 
         [BackgroundDependencyLoader]
@@ -234,7 +228,7 @@ namespace osu.Game.Screens.Play
         public void StopUsingBeatmapClock()
         {
             removeSourceClockAdjustments();
-            SourceClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
+            AdjustableClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
         }
 
         private bool speedAdjustmentsApplied;
@@ -244,10 +238,8 @@ namespace osu.Game.Screens.Play
             if (speedAdjustmentsApplied)
                 return;
 
-            var track = (Track)SourceClock.Source;
-
-            track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+            Track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            Track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
             localGameplayClock.MutableNonGameplayAdjustments.Add(pauseFreqAdjust);
             localGameplayClock.MutableNonGameplayAdjustments.Add(UserPlaybackRate);
@@ -260,10 +252,8 @@ namespace osu.Game.Screens.Play
             if (!speedAdjustmentsApplied)
                 return;
 
-            var track = (Track)SourceClock.Source;
-
-            track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+            Track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            Track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
             localGameplayClock.MutableNonGameplayAdjustments.Remove(pauseFreqAdjust);
             localGameplayClock.MutableNonGameplayAdjustments.Remove(UserPlaybackRate);

From 18c69cdaf7bb536d22c704171ba9bd03c00689cd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 19:50:22 +0900
Subject: [PATCH 09100/10326] Split out files

---
 .../Screens/Play/GameplayClockContainer.cs    | 214 +----------------
 .../Play/MasterGameplayClockContainer.cs      | 220 ++++++++++++++++++
 2 files changed, 222 insertions(+), 212 deletions(-)
 create mode 100644 osu.Game/Screens/Play/MasterGameplayClockContainer.cs

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 36ca7415d0..d8e6fda87e 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -1,19 +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.Collections.Generic;
-using System.Linq;
-using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 
 namespace osu.Game.Screens.Play
 {
@@ -38,7 +30,7 @@ namespace osu.Game.Screens.Play
             AdjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
             AdjustableClock.ChangeSource(sourceClock);
 
-            IsPaused.BindValueChanged(OnPauseChanged);
+            IsPaused.BindValueChanged(OnIsPausedChanged);
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -85,210 +77,8 @@ namespace osu.Game.Screens.Play
                 Start();
         }
 
-        protected abstract void OnPauseChanged(ValueChangedEvent<bool> isPaused);
+        protected abstract void OnIsPausedChanged(ValueChangedEvent<bool> isPaused);
 
         protected abstract GameplayClock CreateGameplayClock(IClock source);
     }
-
-    public class MasterGameplayClockContainer : GameplayClockContainer
-    {
-        /// <summary>
-        /// Duration before gameplay start time required before skip button displays.
-        /// </summary>
-        public const double MINIMUM_SKIP_TIME = 1000;
-
-        protected Track Track => (Track)AdjustableClock.Source;
-
-        public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
-        {
-            Default = 1,
-            MinValue = 0.5,
-            MaxValue = 2,
-            Precision = 0.1,
-        };
-
-        private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
-
-        private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
-
-        private readonly WorkingBeatmap beatmap;
-        private readonly double gameplayStartTime;
-        private readonly bool startAtGameplayStart;
-        private readonly double firstHitObjectTime;
-
-        private FramedOffsetClock userOffsetClock;
-        private FramedOffsetClock platformOffsetClock;
-        private LocalGameplayClock localGameplayClock;
-        private Bindable<double> userAudioOffset;
-
-        public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
-            : base(beatmap.Track)
-        {
-            this.beatmap = beatmap;
-            this.gameplayStartTime = gameplayStartTime;
-            this.startAtGameplayStart = startAtGameplayStart;
-
-            firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
-            userAudioOffset.BindValueChanged(offset => userOffsetClock.Offset = offset.NewValue, true);
-
-            // sane default provided by ruleset.
-            double startTime = gameplayStartTime;
-
-            if (!startAtGameplayStart)
-            {
-                startTime = Math.Min(0, startTime);
-
-                // if a storyboard is present, it may dictate the appropriate start time by having events in negative time space.
-                // this is commonly used to display an intro before the audio track start.
-                double? firstStoryboardEvent = beatmap.Storyboard.EarliestEventTime;
-                if (firstStoryboardEvent != null)
-                    startTime = Math.Min(startTime, firstStoryboardEvent.Value);
-
-                // some beatmaps specify a current lead-in time which should be used instead of the ruleset-provided value when available.
-                // this is not available as an option in the live editor but can still be applied via .osu editing.
-                if (beatmap.BeatmapInfo.AudioLeadIn > 0)
-                    startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
-            }
-
-            Seek(startTime);
-
-            AdjustableClock.ProcessFrame();
-        }
-
-        protected override void OnPauseChanged(ValueChangedEvent<bool> isPaused)
-        {
-            if (isPaused.NewValue)
-                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => AdjustableClock.Stop());
-            else
-                this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
-        }
-
-        public override void Seek(double time)
-        {
-            // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
-            // we may want to consider reversing the application of offsets in the future as it may feel more correct.
-            base.Seek(time - totalOffset);
-
-            // manually process frame to ensure GameplayClock is correctly updated after a seek.
-            userOffsetClock.ProcessFrame();
-        }
-
-        public override void Restart()
-        {
-            updateRate();
-            base.Restart();
-        }
-
-        /// <summary>
-        /// Skip forward to the next valid skip point.
-        /// </summary>
-        public void Skip()
-        {
-            if (GameplayClock.CurrentTime > gameplayStartTime - MINIMUM_SKIP_TIME)
-                return;
-
-            double skipTarget = gameplayStartTime - MINIMUM_SKIP_TIME;
-
-            if (GameplayClock.CurrentTime < 0 && skipTarget > 6000)
-                // double skip exception for storyboards with very long intros
-                skipTarget = 0;
-
-            Seek(skipTarget);
-        }
-
-        protected override GameplayClock CreateGameplayClock(IClock source)
-        {
-            // 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 HardwareCorrectionOffsetClock(source) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
-
-            // the final usable gameplay clock with user-set offsets applied.
-            userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
-
-            return localGameplayClock = new LocalGameplayClock(userOffsetClock);
-        }
-
-        protected override void Update()
-        {
-            if (!IsPaused.Value)
-                userOffsetClock.ProcessFrame();
-
-            base.Update();
-        }
-
-        /// <summary>
-        /// Changes the backing clock to avoid using the originally provided track.
-        /// </summary>
-        public void StopUsingBeatmapClock()
-        {
-            removeSourceClockAdjustments();
-            AdjustableClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
-        }
-
-        private bool speedAdjustmentsApplied;
-
-        private void updateRate()
-        {
-            if (speedAdjustmentsApplied)
-                return;
-
-            Track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            Track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
-
-            localGameplayClock.MutableNonGameplayAdjustments.Add(pauseFreqAdjust);
-            localGameplayClock.MutableNonGameplayAdjustments.Add(UserPlaybackRate);
-
-            speedAdjustmentsApplied = true;
-        }
-
-        private void removeSourceClockAdjustments()
-        {
-            if (!speedAdjustmentsApplied)
-                return;
-
-            Track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            Track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
-
-            localGameplayClock.MutableNonGameplayAdjustments.Remove(pauseFreqAdjust);
-            localGameplayClock.MutableNonGameplayAdjustments.Remove(UserPlaybackRate);
-
-            speedAdjustmentsApplied = false;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            removeSourceClockAdjustments();
-        }
-
-        private class HardwareCorrectionOffsetClock : FramedOffsetClock
-        {
-            // we always want to apply the same real-time offset, so it should be adjusted by the difference in playback rate (from realtime) to achieve this.
-            // base implementation already adds offset at 1.0 rate, so we only add the difference from that here.
-            public override double CurrentTime => base.CurrentTime + Offset * (Rate - 1);
-
-            public HardwareCorrectionOffsetClock(IClock source, bool processSource = true)
-                : base(source, processSource)
-            {
-            }
-        }
-
-        private class LocalGameplayClock : GameplayClock
-        {
-            public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
-
-            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
-
-            public LocalGameplayClock(FramedOffsetClock underlyingClock)
-                : base(underlyingClock)
-            {
-            }
-        }
-    }
 }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
new file mode 100644
index 0000000000..efc8ca732e
--- /dev/null
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -0,0 +1,220 @@
+// Copyright (c) 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;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+
+namespace osu.Game.Screens.Play
+{
+    public class MasterGameplayClockContainer : GameplayClockContainer
+    {
+        /// <summary>
+        /// Duration before gameplay start time required before skip button displays.
+        /// </summary>
+        public const double MINIMUM_SKIP_TIME = 1000;
+
+        protected Track Track => (Track)AdjustableClock.Source;
+
+        public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
+        {
+            Default = 1,
+            MinValue = 0.5,
+            MaxValue = 2,
+            Precision = 0.1,
+        };
+
+        private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
+
+        private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
+
+        private readonly WorkingBeatmap beatmap;
+        private readonly double gameplayStartTime;
+        private readonly bool startAtGameplayStart;
+        private readonly double firstHitObjectTime;
+
+        private FramedOffsetClock userOffsetClock;
+        private FramedOffsetClock platformOffsetClock;
+        private LocalGameplayClock localGameplayClock;
+        private Bindable<double> userAudioOffset;
+
+        public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
+            : base(beatmap.Track)
+        {
+            this.beatmap = beatmap;
+            this.gameplayStartTime = gameplayStartTime;
+            this.startAtGameplayStart = startAtGameplayStart;
+
+            firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
+            userAudioOffset.BindValueChanged(offset => userOffsetClock.Offset = offset.NewValue, true);
+
+            // sane default provided by ruleset.
+            double startTime = gameplayStartTime;
+
+            if (!startAtGameplayStart)
+            {
+                startTime = Math.Min(0, startTime);
+
+                // if a storyboard is present, it may dictate the appropriate start time by having events in negative time space.
+                // this is commonly used to display an intro before the audio track start.
+                double? firstStoryboardEvent = beatmap.Storyboard.EarliestEventTime;
+                if (firstStoryboardEvent != null)
+                    startTime = Math.Min(startTime, firstStoryboardEvent.Value);
+
+                // some beatmaps specify a current lead-in time which should be used instead of the ruleset-provided value when available.
+                // this is not available as an option in the live editor but can still be applied via .osu editing.
+                if (beatmap.BeatmapInfo.AudioLeadIn > 0)
+                    startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
+            }
+
+            Seek(startTime);
+
+            AdjustableClock.ProcessFrame();
+        }
+
+        protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
+        {
+            if (isPaused.NewValue)
+                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => AdjustableClock.Stop());
+            else
+                this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
+        }
+
+        public override void Seek(double time)
+        {
+            // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
+            // we may want to consider reversing the application of offsets in the future as it may feel more correct.
+            base.Seek(time - totalOffset);
+
+            // manually process frame to ensure GameplayClock is correctly updated after a seek.
+            userOffsetClock.ProcessFrame();
+        }
+
+        public override void Restart()
+        {
+            updateRate();
+            base.Restart();
+        }
+
+        /// <summary>
+        /// Skip forward to the next valid skip point.
+        /// </summary>
+        public void Skip()
+        {
+            if (GameplayClock.CurrentTime > gameplayStartTime - MINIMUM_SKIP_TIME)
+                return;
+
+            double skipTarget = gameplayStartTime - MINIMUM_SKIP_TIME;
+
+            if (GameplayClock.CurrentTime < 0 && skipTarget > 6000)
+                // double skip exception for storyboards with very long intros
+                skipTarget = 0;
+
+            Seek(skipTarget);
+        }
+
+        protected override GameplayClock CreateGameplayClock(IClock source)
+        {
+            // 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 HardwareCorrectionOffsetClock(source) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
+
+            // the final usable gameplay clock with user-set offsets applied.
+            userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
+
+            return localGameplayClock = new LocalGameplayClock(userOffsetClock);
+        }
+
+        protected override void Update()
+        {
+            if (!IsPaused.Value)
+                userOffsetClock.ProcessFrame();
+
+            base.Update();
+        }
+
+        /// <summary>
+        /// Changes the backing clock to avoid using the originally provided track.
+        /// </summary>
+        public void StopUsingBeatmapClock()
+        {
+            removeSourceClockAdjustments();
+            AdjustableClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
+        }
+
+        private bool speedAdjustmentsApplied;
+
+        private void updateRate()
+        {
+            if (speedAdjustmentsApplied)
+                return;
+
+            Track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            Track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+
+            localGameplayClock.MutableNonGameplayAdjustments.Add(pauseFreqAdjust);
+            localGameplayClock.MutableNonGameplayAdjustments.Add(UserPlaybackRate);
+
+            speedAdjustmentsApplied = true;
+        }
+
+        private void removeSourceClockAdjustments()
+        {
+            if (!speedAdjustmentsApplied)
+                return;
+
+            Track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            Track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+
+            localGameplayClock.MutableNonGameplayAdjustments.Remove(pauseFreqAdjust);
+            localGameplayClock.MutableNonGameplayAdjustments.Remove(UserPlaybackRate);
+
+            speedAdjustmentsApplied = false;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            removeSourceClockAdjustments();
+        }
+
+        private class HardwareCorrectionOffsetClock : FramedOffsetClock
+        {
+            // we always want to apply the same real-time offset, so it should be adjusted by the difference in playback rate (from realtime) to achieve this.
+            // base implementation already adds offset at 1.0 rate, so we only add the difference from that here.
+            public override double CurrentTime => base.CurrentTime + Offset * (Rate - 1);
+
+            public HardwareCorrectionOffsetClock(IClock source, bool processSource = true)
+                : base(source, processSource)
+            {
+            }
+        }
+
+        private class LocalGameplayClock : GameplayClock
+        {
+            public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
+
+            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
+
+            public LocalGameplayClock(FramedOffsetClock underlyingClock)
+                : base(underlyingClock)
+            {
+            }
+        }
+    }
+}

From ff2a37b7f492b16f135c026865e410b55c1095c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 19:38:25 +0900
Subject: [PATCH 09101/10326] Add new colours for editor designs

---
 osu.Game/Graphics/OsuColour.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 466d59b08b..c3b9b6006c 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -186,6 +186,13 @@ namespace osu.Game.Graphics
         public readonly Color4 GrayE = Color4Extensions.FromHex(@"eee");
         public readonly Color4 GrayF = Color4Extensions.FromHex(@"fff");
 
+        // in latest editor design logic, need to figure out where these sit...
+        public readonly Color4 Lime1 = Color4Extensions.FromHex(@"b2ff66");
+        public readonly Color4 Orange1 = Color4Extensions.FromHex(@"ffd966");
+
+        // Content Background
+        public readonly Color4 B5 = Color4Extensions.FromHex(@"222a28");
+
         public readonly Color4 RedLighter = Color4Extensions.FromHex(@"ffeded");
         public readonly Color4 RedLight = Color4Extensions.FromHex(@"ed7787");
         public readonly Color4 Red = Color4Extensions.FromHex(@"ed1121");

From 1209c9fa32e0c0c98497748bb54f39760007408c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 19:39:12 +0900
Subject: [PATCH 09102/10326] Allow timeline to expand in height when control
 points are to be displayed

---
 .../Compose/Components/Timeline/Timeline.cs   | 39 ++++++++++++++++---
 .../Timeline/TimelineControlPointDisplay.cs   |  6 ---
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index d06f977fc9..bd7b426044 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -57,11 +57,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Track track;
 
         private const float timeline_height = 90;
+        private const float timeline_expanded_height = 180;
 
         public Timeline()
         {
             RelativeSizeAxes = Axes.X;
-            Height = timeline_height;
 
             ZoomDuration = 200;
             ZoomEasing = Easing.OutQuint;
@@ -86,9 +86,17 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             AddRange(new Drawable[]
             {
+                controlPoints = new TimelineControlPointDisplay
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = timeline_expanded_height,
+                },
                 new Container
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Height = timeline_height,
                     Depth = float.MaxValue,
                     Children = new[]
                     {
@@ -102,7 +110,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         },
                         centreMarker.CreateProxy(),
                         ticks = new TimelineTickDisplay(),
-                        controlPoints = new TimelineControlPointDisplay(),
                         new Box
                         {
                             Name = "zero marker",
@@ -116,13 +123,35 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             });
 
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
+            Beatmap.BindTo(beatmap);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
             waveformOpacity.BindValueChanged(_ => updateWaveformOpacity(), true);
 
             WaveformVisible.ValueChanged += _ => updateWaveformOpacity();
-            ControlPointsVisible.ValueChanged += visible => controlPoints.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
             TicksVisible.ValueChanged += visible => ticks.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
+            ControlPointsVisible.BindValueChanged(visible =>
+            {
+                if (visible.NewValue)
+                {
+                    this.ResizeHeightTo(timeline_expanded_height, 200, Easing.OutQuint);
+
+                    // delay the fade in else masking looks weird.
+                    controlPoints.Delay(180).FadeIn(400, Easing.OutQuint);
+                }
+                else
+                {
+                    controlPoints.FadeOut(200, Easing.OutQuint);
+
+                    // likewise, delay the resize until the fade is complete.
+                    this.Delay(180).ResizeHeightTo(timeline_height, 200, Easing.OutQuint);
+                }
+            }, true);
 
-            Beatmap.BindTo(beatmap);
             Beatmap.BindValueChanged(b =>
             {
                 waveform.Waveform = b.NewValue.Waveform;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
index 18600bcdee..8520567fa9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
@@ -4,7 +4,6 @@
 using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 
@@ -17,11 +16,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     {
         private readonly IBindableList<ControlPointGroup> controlPointGroups = new BindableList<ControlPointGroup>();
 
-        public TimelineControlPointDisplay()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-
         protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);

From a8df2388eb184c8abb47f4e841a954587d4fef25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 19:39:27 +0900
Subject: [PATCH 09103/10326] Update design for TimingControlPoint

---
 .../ControlPoints/TimingControlPoint.cs       |  2 +-
 .../Timeline/TimelineControlPointGroup.cs     |  2 ++
 .../Components/Timeline/TimingPointPiece.cs   | 20 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 580642f593..ec20328fab 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         private const double default_beat_length = 60000.0 / 60.0;
 
-        public override Color4 GetRepresentingColour(OsuColour colours) => colours.YellowDark;
+        public override Color4 GetRepresentingColour(OsuColour colours) => colours.Orange1;
 
         public static readonly TimingControlPoint DEFAULT = new TimingControlPoint
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
index fb69f16792..c4beb40f92 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.Y;
             AutoSizeAxes = Axes.X;
 
+            Origin = Anchor.TopCentre;
+
             X = (float)group.Time;
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
index ba94916458..cd1470aa0a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
@@ -3,15 +3,12 @@
 
 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.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
@@ -31,26 +28,27 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Origin = Anchor.CentreLeft;
-            Anchor = Anchor.CentreLeft;
+            Margin = new MarginPadding { Vertical = 10 };
+
+            const float corner_radius = 5;
 
             AutoSizeAxes = Axes.Both;
-
-            Color4 colour = point.GetRepresentingColour(colours);
+            Masking = true;
+            CornerRadius = corner_radius;
 
             InternalChildren = new Drawable[]
             {
                 new Box
                 {
-                    Alpha = 0.9f,
-                    Colour = ColourInfo.GradientHorizontal(colour, colour.Opacity(0.5f)),
+                    Colour = point.GetRepresentingColour(colours),
                     RelativeSizeAxes = Axes.Both,
                 },
                 bpmText = new OsuSpriteText
                 {
                     Alpha = 0.9f,
-                    Padding = new MarginPadding(3),
-                    Font = OsuFont.Default.With(size: 40)
+                    Padding = new MarginPadding { Vertical = 3, Horizontal = 6 },
+                    Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold),
+                    Colour = colours.B5,
                 }
             };
 

From 774cca38c4c66627c3f501712f9e40cba1ef8474 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 20:39:14 +0900
Subject: [PATCH 09104/10326] Make spectating instances use custom GCC

---
 .../Spectate/MultiplayerSpectator.cs          | 48 ++++++++++++-------
 .../Spectate/MultiplayerSpectatorPlayer.cs    | 33 ++++++++++++-
 .../Multiplayer/Spectate/PlayerInstance.cs    | 29 ++++++-----
 3 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index a56104439d..931d13942b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
 using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
@@ -29,6 +30,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private SpectatorStreamingClient spectatorClient { get; set; }
 
         private readonly PlayerInstance[] instances;
+        private GameplayClockContainer gameplayClockContainer;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
         private double? loadFinishTime;
@@ -44,23 +46,26 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
             Container leaderboardContainer;
 
-            InternalChild = new GridContainer
+            InternalChild = gameplayClockContainer = new MasterGameplayClockContainer(Beatmap.Value, 0)
             {
-                RelativeSizeAxes = Axes.Both,
-                ColumnDimensions = new[]
+                Child = new GridContainer
                 {
-                    new Dimension(GridSizeMode.AutoSize)
-                },
-                Content = new[]
-                {
-                    new Drawable[]
+                    RelativeSizeAxes = Axes.Both,
+                    ColumnDimensions = new[]
                     {
-                        leaderboardContainer = new Container
+                        new Dimension(GridSizeMode.AutoSize)
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
                         {
-                            RelativeSizeAxes = Axes.Y,
-                            AutoSizeAxes = Axes.X
-                        },
-                        grid = new PlayerGrid { RelativeSizeAxes = Axes.Both }
+                            leaderboardContainer = new Container
+                            {
+                                RelativeSizeAxes = Axes.Y,
+                                AutoSizeAxes = Axes.X
+                            },
+                            grid = new PlayerGrid { RelativeSizeAxes = Axes.Both }
+                        }
                     }
                 }
             };
@@ -94,6 +99,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                     && instances.Any(i => i.Score.Replay.Frames.Count > 0))
             );
 
+        private bool firstStartFrame = true;
+
         private void updateGameplayPlayingState()
         {
             // Make sure all players are loaded and have frames before starting any.
@@ -104,13 +111,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return;
             }
 
+            if (firstStartFrame)
+                gameplayClockContainer.Restart();
+
             // Not all instances may be in a valid gameplay state (see canStartGameplay). Only control the ones that are.
             IEnumerable<PlayerInstance> validInstances = instances.Where(i => i.Score.Replay.Frames.Count > 0);
 
-            double targetTrackTime = validInstances.Select(i => i.GetCurrentTrackTime()).Max();
+            double targetGameplayTime = gameplayClockContainer.GameplayClock.CurrentTime;
 
-            var instanceTimes = string.Join(',', validInstances.Select(i => $" {i.User.Id}: {(int)i.GetCurrentTrackTime()}"));
-            Logger.Log($"target: {(int)targetTrackTime},{instanceTimes}");
+            var instanceTimes = string.Join(',', validInstances.Select(i => $" {i.User.Id}: {(int)i.GetCurrentGameplayTime()}"));
+            Logger.Log($"target: {(int)targetGameplayTime},{instanceTimes}");
 
             foreach (var inst in validInstances)
             {
@@ -123,8 +133,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 if (!canContinuePlayback)
                     continue;
 
-                inst.ContinueGameplay(targetTrackTime);
+                inst.ContinueGameplay(targetGameplayTime);
             }
+
+            firstStartFrame = false;
         }
 
         protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
@@ -142,7 +154,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 leaderboard.RemoveClock(existingInstance.User.Id);
             }
 
-            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score), d =>
+            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, gameplayClockContainer.GameplayClock), d =>
             {
                 if (instances[userIndex] == d)
                 {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 1634438850..abb7ec83d8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -1,6 +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.Bindables;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -11,11 +14,37 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
 
-        public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
+        public new SubGameplayClockContainer GameplayClockContainer => (SubGameplayClockContainer)base.GameplayClockContainer;
 
-        public MultiplayerSpectatorPlayer(Score score)
+        private readonly GameplayClock gameplayClock;
+
+        public MultiplayerSpectatorPlayer(Score score, GameplayClock gameplayClock)
             : base(score)
         {
+            this.gameplayClock = gameplayClock;
         }
+
+        protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
+            => new SubGameplayClockContainer(gameplayClock);
+    }
+
+    public class SubGameplayClockContainer : GameplayClockContainer
+    {
+        public new DecoupleableInterpolatingFramedClock AdjustableClock => base.AdjustableClock;
+
+        public SubGameplayClockContainer(IClock sourceClock)
+            : base(sourceClock)
+        {
+        }
+
+        protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
+        {
+            if (isPaused.NewValue)
+                AdjustableClock.Stop();
+            else
+                AdjustableClock.Start();
+        }
+
+        protected override GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 12a710e9f0..724a685cb7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
@@ -38,15 +36,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public WorkingBeatmap Beatmap { get; private set; }
 
         public readonly Score Score;
+        private readonly GameplayClock gameplayClock;
 
         public bool IsCatchingUp { get; private set; }
 
         private OsuScreenStack stack;
         private MultiplayerSpectatorPlayer player;
 
-        public PlayerInstance(Score score)
+        public PlayerInstance(Score score, GameplayClock gameplayClock)
         {
             Score = score;
+            this.gameplayClock = gameplayClock;
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 }
             };
 
-            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => player = new MultiplayerSpectatorPlayer(Score)));
+            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => player = new MultiplayerSpectatorPlayer(Score, gameplayClock)));
         }
 
         protected override void UpdateAfterChildren()
@@ -76,8 +76,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             updateCatchup();
         }
 
-        private readonly BindableDouble catchupFrequencyAdjustment = new BindableDouble(catchup_rate);
-        private double targetTrackTime;
+        private double targetGameplayTime;
 
         private void updateCatchup()
         {
@@ -91,7 +90,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return;
 
             double currentTime = Beatmap.Track.CurrentTime;
-            double timeBehind = targetTrackTime - currentTime;
+            double timeBehind = targetGameplayTime - currentTime;
 
             double offsetForCatchup = IsCatchingUp ? SYNC_TARGET : MAX_OFFSET;
             bool catchupRequired = timeBehind > offsetForCatchup;
@@ -102,12 +101,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             if (catchupRequired)
             {
-                Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                // player.GameplayClockContainer.AdjustableClock.Rate = catchup_rate;
                 Logger.Log($"{User.Id} catchup started (behind: {(int)timeBehind})");
             }
             else
             {
-                Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                // player.GameplayClockContainer.AdjustableClock.Rate = 1;
                 Logger.Log($"{User.Id} catchup finished (behind: {(int)timeBehind})");
             }
 
@@ -122,21 +121,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             return player.GameplayClockContainer.GameplayClock.CurrentTime;
         }
 
-        public double GetCurrentTrackTime()
+        public bool IsPlaying()
         {
-            if (player?.IsLoaded != true)
-                return 0;
+            if (player.IsLoaded != true)
+                return false;
 
-            return Beatmap.Track.CurrentTime;
+            return player.GameplayClockContainer.GameplayClock.IsRunning;
         }
 
-        public void ContinueGameplay(double targetTrackTime)
+        public void ContinueGameplay(double targetGameplayTime)
         {
             if (player?.IsLoaded != true)
                 return;
 
             player.GameplayClockContainer.Start();
-            this.targetTrackTime = targetTrackTime;
+            this.targetGameplayTime = targetGameplayTime;
         }
 
         public void PauseGameplay()

From f9b1b7fe255370fb502aebaea0fb5c5327e569b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:10:58 +0900
Subject: [PATCH 09105/10326] Update SamplePointPiece design

---
 .../Components/Timeline/SamplePointPiece.cs   | 61 ++++++++++---------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index 0f11fb1126..9461f5e885 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@@ -3,9 +3,7 @@
 
 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.ControlPoints;
@@ -23,7 +21,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private readonly BindableNumber<int> volume;
 
         private OsuSpriteText text;
-        private Box volumeBox;
+        private Container volumeBox;
+
+        private const int max_volume_height = 22;
 
         public SamplePointPiece(SampleControlPoint samplePoint)
         {
@@ -35,8 +35,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Origin = Anchor.TopLeft;
-            Anchor = Anchor.TopLeft;
+            Margin = new MarginPadding { Vertical = 5 };
+
+            Origin = Anchor.BottomCentre;
+            Anchor = Anchor.BottomCentre;
 
             AutoSizeAxes = Axes.X;
             RelativeSizeAxes = Axes.Y;
@@ -45,40 +47,43 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             InternalChildren = new Drawable[]
             {
+                volumeBox = new Circle
+                {
+                    CornerRadius = 5,
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Y = -20,
+                    Width = 10,
+                    Colour = colour,
+                },
                 new Container
                 {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 20,
+                    AutoSizeAxes = Axes.X,
+                    Height = 16,
+                    Masking = true,
+                    CornerRadius = 8,
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
                     Children = new Drawable[]
                     {
-                        volumeBox = new Box
-                        {
-                            X = 2,
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            Colour = ColourInfo.GradientVertical(colour, Color4.Black),
-                            RelativeSizeAxes = Axes.Both,
-                        },
                         new Box
                         {
-                            Colour = colour.Lighten(0.2f),
-                            Width = 2,
-                            RelativeSizeAxes = Axes.Y,
+                            Colour = colour,
+                            RelativeSizeAxes = Axes.Both,
                         },
+                        text = new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Padding = new MarginPadding(5),
+                            Font = OsuFont.Default.With(size: 12, weight: FontWeight.SemiBold),
+                            Colour = colours.B5,
+                        }
                     }
                 },
-                text = new OsuSpriteText
-                {
-                    X = 2,
-                    Y = -5,
-                    Anchor = Anchor.BottomLeft,
-                    Alpha = 0.9f,
-                    Rotation = -90,
-                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold)
-                }
             };
 
-            volume.BindValueChanged(volume => volumeBox.Height = volume.NewValue / 100f, true);
+            volume.BindValueChanged(volume => volumeBox.Height = max_volume_height * volume.NewValue / 100f, true);
             bank.BindValueChanged(bank => text.Text = bank.NewValue, true);
         }
     }

From 99f05253fd2f0cc7634e06571666af28b24b3e2a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:11:16 +0900
Subject: [PATCH 09106/10326] Adjust timeline sizing to closer match designs
 (but not 1:1 yet)

---
 .../Edit/Compose/Components/Timeline/Timeline.cs     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index bd7b426044..d688ad511f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -56,8 +56,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private Track track;
 
-        private const float timeline_height = 90;
-        private const float timeline_expanded_height = 180;
+        private const float timeline_height = 72;
+        private const float timeline_expanded_height = 150;
 
         public Timeline()
         {
@@ -74,6 +74,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private TimelineControlPointDisplay controlPoints;
 
+        private Container mainContent;
+
         private Bindable<float> waveformOpacity;
 
         [BackgroundDependencyLoader]
@@ -91,11 +93,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     RelativeSizeAxes = Axes.X,
                     Height = timeline_expanded_height,
                 },
-                new Container
+                mainContent = new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
                     Height = timeline_height,
                     Depth = float.MaxValue,
                     Children = new[]
@@ -139,6 +139,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 if (visible.NewValue)
                 {
                     this.ResizeHeightTo(timeline_expanded_height, 200, Easing.OutQuint);
+                    mainContent.MoveToY(36, 200, Easing.OutQuint);
 
                     // delay the fade in else masking looks weird.
                     controlPoints.Delay(180).FadeIn(400, Easing.OutQuint);
@@ -149,6 +150,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                     // likewise, delay the resize until the fade is complete.
                     this.Delay(180).ResizeHeightTo(timeline_height, 200, Easing.OutQuint);
+                    mainContent.Delay(180).MoveToY(0, 200, Easing.OutQuint);
                 }
             }, true);
 

From afbb674e526a12148e4c328e5b5a5618720fe081 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:11:32 +0900
Subject: [PATCH 09107/10326] TopLeft align check buttons so they don't move
 while interacting with them

---
 .../Screens/Edit/Compose/Components/Timeline/TimelineArea.cs  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index f144fd3a65..ee3543354f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -56,11 +56,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     },
                                     new FillFlowContainer
                                     {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
                                         AutoSizeAxes = Axes.Y,
                                         Width = 160,
-                                        Padding = new MarginPadding { Horizontal = 10 },
+                                        Padding = new MarginPadding(10),
                                         Direction = FillDirection.Vertical,
                                         Spacing = new Vector2(0, 4),
                                         Children = new[]

From be08b9d1eff63dd7ec47c9e26323b90c3e63d208 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:54:29 +0900
Subject: [PATCH 09108/10326] Combine logic of Difficulty and Timing pieces
 where feasible

---
 .../ControlPoints/DifficultyControlPoint.cs   |  2 +-
 .../Timeline/DifficultyPointPiece.cs          | 58 +++----------------
 .../Components/Timeline/TimingPointPiece.cs   | 37 +-----------
 .../Components/Timeline/TopPointPiece.cs      | 55 ++++++++++++++++++
 4 files changed, 68 insertions(+), 84 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.cs

diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 73337ab6f5..8a6cfaf688 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             MaxValue = 10
         };
 
-        public override Color4 GetRepresentingColour(OsuColour colours) => colours.GreenDark;
+        public override Color4 GetRepresentingColour(OsuColour colours) => colours.Lime1;
 
         /// <summary>
         /// The speed multiplier at this control point.
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 510ba8c094..3248936765 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -1,67 +1,27 @@
 // Copyright (c) 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.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    public class DifficultyPointPiece : CompositeDrawable
+    public class DifficultyPointPiece : TopPointPiece
     {
-        private readonly DifficultyControlPoint difficultyPoint;
-
-        private OsuSpriteText speedMultiplierText;
         private readonly BindableNumber<double> speedMultiplier;
 
-        public DifficultyPointPiece(DifficultyControlPoint difficultyPoint)
+        public DifficultyPointPiece(DifficultyControlPoint point)
+            : base(point)
         {
-            this.difficultyPoint = difficultyPoint;
-            speedMultiplier = difficultyPoint.SpeedMultiplierBindable.GetBoundCopy();
+            speedMultiplier = point.SpeedMultiplierBindable.GetBoundCopy();
+
+            Y = Height;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        protected override void LoadComplete()
         {
-            RelativeSizeAxes = Axes.Y;
-            AutoSizeAxes = Axes.X;
-
-            Color4 colour = difficultyPoint.GetRepresentingColour(colours);
-
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = colour,
-                    Width = 2,
-                    RelativeSizeAxes = Axes.Y,
-                },
-                new Container
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = colour,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        speedMultiplierText = new OsuSpriteText
-                        {
-                            Font = OsuFont.Default.With(weight: FontWeight.Bold),
-                            Colour = Color4.White,
-                        }
-                    }
-                },
-            };
-
-            speedMultiplier.BindValueChanged(multiplier => speedMultiplierText.Text = $"{multiplier.NewValue:n2}x", true);
+            base.LoadComplete();
+            speedMultiplier.BindValueChanged(multiplier => Label.Text = $"{multiplier.NewValue:n2}x", true);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
index cd1470aa0a..fa51281c55 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
@@ -3,58 +3,27 @@
 
 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.ControlPoints;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    public class TimingPointPiece : CompositeDrawable
+    public class TimingPointPiece : TopPointPiece
     {
-        private readonly TimingControlPoint point;
-
         private readonly BindableNumber<double> beatLength;
-        private OsuSpriteText bpmText;
 
         public TimingPointPiece(TimingControlPoint point)
+            : base(point)
         {
-            this.point = point;
             beatLength = point.BeatLengthBindable.GetBoundCopy();
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Margin = new MarginPadding { Vertical = 10 };
-
-            const float corner_radius = 5;
-
-            AutoSizeAxes = Axes.Both;
-            Masking = true;
-            CornerRadius = corner_radius;
-
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = point.GetRepresentingColour(colours),
-                    RelativeSizeAxes = Axes.Both,
-                },
-                bpmText = new OsuSpriteText
-                {
-                    Alpha = 0.9f,
-                    Padding = new MarginPadding { Vertical = 3, Horizontal = 6 },
-                    Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold),
-                    Colour = colours.B5,
-                }
-            };
-
             beatLength.BindValueChanged(beatLength =>
             {
-                bpmText.Text = $"{60000 / beatLength.NewValue:n1} BPM";
+                Label.Text = $"{60000 / beatLength.NewValue:n1} BPM";
             }, true);
         }
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.cs
new file mode 100644
index 0000000000..60a9e1ed66
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
+{
+    public class TopPointPiece : CompositeDrawable
+    {
+        private readonly ControlPoint point;
+
+        protected OsuSpriteText Label { get; private set; }
+
+        public TopPointPiece(ControlPoint point)
+        {
+            this.point = point;
+            AutoSizeAxes = Axes.X;
+            Height = 16;
+            Margin = new MarginPadding(4);
+
+            Masking = true;
+            CornerRadius = Height / 2;
+
+            Origin = Anchor.TopCentre;
+            Anchor = Anchor.TopCentre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = point.GetRepresentingColour(colours),
+                    RelativeSizeAxes = Axes.Both,
+                },
+                Label = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Padding = new MarginPadding(3),
+                    Font = OsuFont.Default.With(size: 14, weight: FontWeight.SemiBold),
+                    Colour = colours.B5,
+                }
+            };
+        }
+    }
+}

From d1c68cb92b0efe025fcaadd28f9c61ea4f4a17bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:55:12 +0900
Subject: [PATCH 09109/10326] Simplify content creation of Timeline /
 TimelineArea

---
 .../Edit/Compose/Components/Timeline/Timeline.cs |  8 ++++++--
 .../Compose/Components/Timeline/TimelineArea.cs  | 16 ++++++++++++----
 .../Screens/Edit/EditorScreenWithTimeline.cs     | 10 +---------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index d688ad511f..55fb557474 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     [Cached]
     public class Timeline : ZoomableScrollContainer, IPositionSnapProvider
     {
+        private readonly Drawable userContent;
         public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
 
         public readonly Bindable<bool> ControlPointsVisible = new Bindable<bool>();
@@ -57,10 +58,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Track track;
 
         private const float timeline_height = 72;
-        private const float timeline_expanded_height = 150;
+        private const float timeline_expanded_height = 156;
 
-        public Timeline()
+        public Timeline(Drawable userContent)
         {
+            this.userContent = userContent;
+
             RelativeSizeAxes = Axes.X;
 
             ZoomDuration = 200;
@@ -118,6 +121,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             Origin = Anchor.TopCentre,
                             Colour = colours.YellowDarker,
                         },
+                        userContent,
                     }
                 },
             });
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index ee3543354f..1541ceade5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -12,11 +12,19 @@ using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    public class TimelineArea : Container
+    public class TimelineArea : CompositeDrawable
     {
-        public readonly Timeline Timeline = new Timeline();
+        public Timeline Timeline;
 
-        protected override Container<Drawable> Content => Timeline;
+        private readonly Drawable userContent;
+
+        public TimelineArea(Drawable content = null)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            userContent = content ?? Drawable.Empty();
+        }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -122,7 +130,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     }
                                 }
                             },
-                            Timeline
+                            Timeline = new Timeline(userContent),
                         },
                     },
                     RowDimensions = new[]
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 26083e6a82..0d59a7a1a8 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -133,15 +133,7 @@ namespace osu.Game.Screens.Edit
                 mainContent.Add(content);
                 content.FadeInFromZero(300, Easing.OutQuint);
 
-                LoadComponentAsync(new TimelineArea
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Children = new[]
-                    {
-                        CreateTimelineContent(),
-                    }
-                }, t =>
+                LoadComponentAsync(new TimelineArea(CreateTimelineContent()), t =>
                 {
                     timelineContainer.Add(t);
                     OnTimelineLoaded(t);

From 9dea0ae935ac4d4464bfc31a49ac42a4fe86f817 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:55:23 +0900
Subject: [PATCH 09110/10326] Update test scene to be able to see a bit more

---
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 88b4614791..4aed445d9d 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -53,13 +53,10 @@ namespace osu.Game.Tests.Visual.Editing
                         new AudioVisualiser(),
                     }
                 },
-                TimelineArea = new TimelineArea
+                TimelineArea = new TimelineArea(CreateTestComponent())
                 {
-                    Child = CreateTestComponent(),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.X,
-                    Size = new Vector2(0.8f, 100),
                 }
             });
         }

From f56125bd682b68df3c3a6a20e3c24b6d758486ee Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 21:15:14 +0900
Subject: [PATCH 09111/10326] Update clock from base class

---
 osu.Game/Screens/Play/GameplayClockContainer.cs      | 12 +++++++++++-
 .../Screens/Play/MasterGameplayClockContainer.cs     | 12 +++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index d8e6fda87e..6d863f0094 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -77,8 +77,18 @@ namespace osu.Game.Screens.Play
                 Start();
         }
 
+        protected override void Update()
+        {
+            if (!IsPaused.Value)
+                ClockToProcess.ProcessFrame();
+
+            base.Update();
+        }
+
         protected abstract void OnIsPausedChanged(ValueChangedEvent<bool> isPaused);
 
-        protected abstract GameplayClock CreateGameplayClock(IClock source);
+        protected virtual IFrameBasedClock ClockToProcess => AdjustableClock;
+
+        protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
     }
 }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index efc8ca732e..83e21f3c1d 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -128,7 +128,9 @@ namespace osu.Game.Screens.Play
             Seek(skipTarget);
         }
 
-        protected override GameplayClock CreateGameplayClock(IClock source)
+        protected override IFrameBasedClock ClockToProcess => userOffsetClock;
+
+        protected override GameplayClock CreateGameplayClock(IFrameBasedClock source)
         {
             // 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.
@@ -140,14 +142,6 @@ namespace osu.Game.Screens.Play
             return localGameplayClock = new LocalGameplayClock(userOffsetClock);
         }
 
-        protected override void Update()
-        {
-            if (!IsPaused.Value)
-                userOffsetClock.ProcessFrame();
-
-            base.Update();
-        }
-
         /// <summary>
         /// Changes the backing clock to avoid using the originally provided track.
         /// </summary>

From 505dc15e0389efb9586ac655f682b727e991dd30 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 23:22:38 +0300
Subject: [PATCH 09112/10326] Add failing test case

---
 .../Background/TestSceneUserDimBackgrounds.cs | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 655b426e43..c0aab1b7ef 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -65,6 +65,21 @@ namespace osu.Game.Tests.Visual.Background
             stack.Push(songSelect = new DummySongSelect());
         });
 
+        /// <summary>
+        /// User settings should always be ignored on song select screen.
+        /// </summary>
+        [Test]
+        public void TestUserSettingsIgnoredOnSongSelect()
+        {
+            setupUserSettings();
+            AddAssert("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());
+            AddAssert("Screen using background blur", () => songSelect.IsBackgroundBlur());
+            performFullSetup();
+            AddStep("Exit to song select", () => player.Exit());
+            AddUntilStep("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());
+            AddUntilStep("Screen using background blur", () => songSelect.IsBackgroundBlur());
+        }
+
         /// <summary>
         /// Check if <see cref="PlayerLoader"/> properly triggers the visual settings preview when a user hovers over the visual settings panel.
         /// </summary>
@@ -227,17 +242,6 @@ namespace osu.Game.Tests.Visual.Background
                 songSelect.IsBackgroundUndimmed() && songSelect.IsBackgroundCurrent() && songSelect.CheckBackgroundBlur(results.ExpectedBackgroundBlur));
         }
 
-        /// <summary>
-        /// Check if background gets undimmed and unblurred when leaving <see cref="Player"/>  for <see cref="PlaySongSelect"/>
-        /// </summary>
-        [Test]
-        public void TestTransitionOut()
-        {
-            performFullSetup();
-            AddStep("Exit to song select", () => player.Exit());
-            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsBlurCorrect());
-        }
-
         /// <summary>
         /// Check if hovering on the visual settings dialogue after resuming from player still previews the background dim.
         /// </summary>
@@ -333,7 +337,7 @@ namespace osu.Game.Tests.Visual.Background
 
             public bool IsBackgroundVisible() => background.CurrentAlpha == 1;
 
-            public bool IsBlurCorrect() => background.CurrentBlur == new Vector2(BACKGROUND_BLUR);
+            public bool IsBackgroundBlur() => background.CurrentBlur == new Vector2(BACKGROUND_BLUR);
 
             public bool CheckBackgroundBlur(Vector2 expected) => background.CurrentBlur == expected;
 

From a5fa14ac4ae010b77a66edd79fe394aeddbad022 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 23:17:06 +0300
Subject: [PATCH 09113/10326] Ignore user settings on background screen beatmap
 by default

---
 osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 10d381b8b7..02166644ab 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -50,6 +50,9 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
+            // Beatmap background screens should not apply user settings by default.
+            IgnoreUserSettings.Value = true;
+
             dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);

From 7a9ff2ab380030871d434a1af6b0ae5c34ad9436 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Apr 2021 00:48:15 +0300
Subject: [PATCH 09114/10326] Use until steps instead

Ah..
---
 .../Visual/Background/TestSceneUserDimBackgrounds.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index c0aab1b7ef..f89988cd1a 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -72,8 +72,8 @@ namespace osu.Game.Tests.Visual.Background
         public void TestUserSettingsIgnoredOnSongSelect()
         {
             setupUserSettings();
-            AddAssert("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());
-            AddAssert("Screen using background blur", () => songSelect.IsBackgroundBlur());
+            AddUntilStep("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());
+            AddUntilStep("Screen using background blur", () => songSelect.IsBackgroundBlur());
             performFullSetup();
             AddStep("Exit to song select", () => player.Exit());
             AddUntilStep("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());

From 362a5a39d0068d3a143fd245ef80a053995c6a8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 13:06:52 +0900
Subject: [PATCH 09115/10326] Scale the playfield to avoid off-screen objects

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index 1ba6c47f4c..d646f41588 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -4,11 +4,14 @@
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield
+    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>
     {
         [SettingSource("Roll speed", "Speed at which things rotate")]
         public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(1)
@@ -26,5 +29,11 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             playfield.Rotation = (float)(playfield.Time.Current / 1000 * SpinSpeed.Value);
         }
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
+        {
+            // scale the playfield to allow all hitobjects to stay within the visible region.
+            drawableRuleset.Playfield.Scale = new Vector2(OsuPlayfield.BASE_SIZE.Y / OsuPlayfield.BASE_SIZE.X);
+        }
     }
 }

From 0d32290cd529cceb63e0fed31b3d46aeb4b2bca4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 13:15:52 +0900
Subject: [PATCH 09116/10326] Show roll speed in rotations-per-minute

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index d646f41588..7cdfdb3c4a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -13,12 +13,12 @@ namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>
     {
-        [SettingSource("Roll speed", "Speed at which things rotate")]
-        public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(1)
+        [SettingSource("Roll speed", "Rotations per minute")]
+        public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
         {
-            MinValue = 0.1,
-            MaxValue = 20,
-            Precision = 0.1,
+            MinValue = 0.02,
+            MaxValue = 4,
+            Precision = 0.01,
         };
 
         public override string Name => "Barrel Roll";
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void Update(Playfield playfield)
         {
-            playfield.Rotation = (float)(playfield.Time.Current / 1000 * SpinSpeed.Value);
+            playfield.Rotation = 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)

From 175b8da2b27002c262d53cfa5c8f44d46034abbf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Apr 2021 00:04:38 +0300
Subject: [PATCH 09117/10326] Inverse ignore user settings bindable to "apply
 user settings" instead

---
 .../Background/TestSceneUserDimBackgrounds.cs    | 16 ++++++++--------
 .../Background/TestSceneUserDimContainer.cs      |  2 +-
 osu.Game/Graphics/Containers/UserDimContainer.cs |  8 ++++----
 osu.Game/Rulesets/Mods/ModCinema.cs              |  4 ++--
 .../Backgrounds/BackgroundScreenBeatmap.cs       | 15 ++++++---------
 osu.Game/Screens/Edit/Editor.cs                  |  2 +-
 osu.Game/Screens/Play/DimmableStoryboard.cs      |  4 ++--
 osu.Game/Screens/Play/Player.cs                  |  4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs            |  6 +++---
 9 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index f89988cd1a..d915442570 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -157,9 +157,9 @@ namespace osu.Game.Tests.Visual.Background
         {
             performFullSetup();
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
-            AddStep("Disable user dim", () => songSelect.IgnoreUserSettings.Value = true);
+            AddStep("Disable user dim", () => songSelect.ApplyUserSettings.Value = false);
             AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsUserBlurDisabled());
-            AddStep("Enable user dim", () => songSelect.IgnoreUserSettings.Value = false);
+            AddStep("Enable user dim", () => songSelect.ApplyUserSettings.Value = true);
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
         }
 
@@ -176,10 +176,10 @@ namespace osu.Game.Tests.Visual.Background
                 player.ReplacesBackground.Value = true;
                 player.StoryboardEnabled.Value = true;
             });
-            AddStep("Enable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = false);
+            AddStep("Enable user dim", () => player.DimmableStoryboard.ApplyUserSettings.Value = true);
             AddStep("Set dim level to 1", () => songSelect.DimLevel.Value = 1f);
             AddUntilStep("Storyboard is invisible", () => !player.IsStoryboardVisible);
-            AddStep("Disable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = true);
+            AddStep("Disable user dim", () => player.DimmableStoryboard.ApplyUserSettings.Value = false);
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
         }
 
@@ -195,8 +195,8 @@ namespace osu.Game.Tests.Visual.Background
 
             AddStep("Ignore user settings", () =>
             {
-                player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
-                player.DimmableStoryboard.IgnoreUserSettings.Value = true;
+                player.ApplyToBackground(b => b.ApplyUserSettings.Value = false);
+                player.DimmableStoryboard.ApplyUserSettings.Value = false;
             });
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
             AddUntilStep("Background is invisible", () => songSelect.IsBackgroundInvisible());
@@ -308,11 +308,11 @@ namespace osu.Game.Tests.Visual.Background
             protected override BackgroundScreen CreateBackground()
             {
                 background = new FadeAccessibleBackground(Beatmap.Value);
-                IgnoreUserSettings.BindTo(background.IgnoreUserSettings);
+                ApplyUserSettings.BindTo(background.ApplyUserSettings);
                 return background;
             }
 
-            public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
+            public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>();
             public readonly Bindable<double> DimLevel = new BindableDouble();
             public readonly Bindable<double> BlurLevel = new BindableDouble();
 
diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
index fede99f450..9c3a044f18 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual.Background
             AddStep("set dim level 0.6", () => userDimContainer.UserDimLevel.Value = test_user_dim);
             AddUntilStep("dim reached", () => userDimContainer.DimEqual(test_user_dim));
 
-            AddStep("ignore settings", () => userDimContainer.IgnoreUserSettings.Value = true);
+            AddStep("ignore settings", () => userDimContainer.ApplyUserSettings.Value = false);
             AddUntilStep("no dim", () => userDimContainer.DimEqual(0));
             AddStep("set break", () => isBreakTime.Value = true);
             AddAssert("no dim", () => userDimContainer.DimEqual(0));
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 4e555ac1eb..a3d59da961 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -24,9 +24,9 @@ namespace osu.Game.Graphics.Containers
         protected const double BACKGROUND_FADE_DURATION = 800;
 
         /// <summary>
-        /// Whether or not user-configured settings relating to brightness of elements should be ignored
+        /// Whether or not user-configured effect settings should be applied to this container.
         /// </summary>
-        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
+        public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>(true);
 
         /// <summary>
         /// Whether or not the storyboard loaded should completely hide the background behind it.
@@ -52,7 +52,7 @@ namespace osu.Game.Graphics.Containers
 
         private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
 
-        protected float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
+        protected float DimLevel => Math.Max(ApplyUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
 
         protected override Container<Drawable> Content => dimContent;
 
@@ -78,7 +78,7 @@ namespace osu.Game.Graphics.Containers
             IsBreakTime.ValueChanged += _ => UpdateVisuals();
             ShowStoryboard.ValueChanged += _ => UpdateVisuals();
             StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
-            IgnoreUserSettings.ValueChanged += _ => UpdateVisuals();
+            ApplyUserSettings.ValueChanged += _ => UpdateVisuals();
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index c78088ba2d..93062218fe 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Rulesets.Mods
 
         public void ApplyToPlayer(Player player)
         {
-            player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
-            player.DimmableStoryboard.IgnoreUserSettings.Value = true;
+            player.ApplyToBackground(b => b.ApplyUserSettings.Value = false);
+            player.DimmableStoryboard.ApplyUserSettings.Value = false;
 
             player.BreakOverlay.Hide();
         }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 02166644ab..553a8f3689 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Screens.Backgrounds
         private WorkingBeatmap beatmap;
 
         /// <summary>
-        /// Whether or not user-configured settings relating to brightness of elements should be ignored
+        /// Whether or not user-configured effect settings should be applied to this background screen.
         /// </summary>
-        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
+        public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>();
 
         public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
 
@@ -50,10 +50,7 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
-            // Beatmap background screens should not apply user settings by default.
-            IgnoreUserSettings.Value = true;
-
-            dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
+            dimmable.ApplyUserSettings.BindTo(ApplyUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);
 
@@ -151,7 +148,7 @@ namespace osu.Game.Screens.Backgrounds
             /// <summary>
             /// As an optimisation, we add the two blur portions to be applied rather than actually applying two separate blurs.
             /// </summary>
-            private Vector2 blurTarget => !IgnoreUserSettings.Value
+            private Vector2 blurTarget => ApplyUserSettings.Value
                 ? new Vector2(BlurAmount.Value + (float)userBlurLevel.Value * USER_BLUR_FACTOR)
                 : new Vector2(BlurAmount.Value);
 
@@ -170,8 +167,8 @@ namespace osu.Game.Screens.Backgrounds
             }
 
             protected override bool ShowDimContent
-                // The background needs to be hidden in the case of it being replaced by the storyboard
-                => (!ShowStoryboard.Value && !IgnoreUserSettings.Value) || !StoryboardReplacesBackground.Value;
+                // The background needs to be hidden in the case of it being replaced by the storyboard.
+                => (ApplyUserSettings.Value && !ShowStoryboard.Value) || !StoryboardReplacesBackground.Value;
 
             protected override void UpdateVisuals()
             {
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index fffea65456..99c6cce26f 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -467,7 +467,7 @@ namespace osu.Game.Screens.Edit
                 // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
                 b.FadeColour(Color4.DarkGray, 500);
 
-                b.IgnoreUserSettings.Value = true;
+                b.ApplyUserSettings.Value = false;
                 b.BlurAmount.Value = 0;
             });
 
diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index 58eb95b7c6..105f672847 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -38,14 +38,14 @@ namespace osu.Game.Screens.Play
             base.LoadComplete();
         }
 
-        protected override bool ShowDimContent => IgnoreUserSettings.Value || (ShowStoryboard.Value && DimLevel < 1);
+        protected override bool ShowDimContent => !ApplyUserSettings.Value || (ShowStoryboard.Value && DimLevel < 1);
 
         private void initializeStoryboard(bool async)
         {
             if (drawableStoryboard != null)
                 return;
 
-            if (!ShowStoryboard.Value && !IgnoreUserSettings.Value)
+            if (ApplyUserSettings.Value && !ShowStoryboard.Value)
                 return;
 
             drawableStoryboard = storyboard.CreateDrawable();
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dd3f58439b..1c71305baf 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -764,7 +764,7 @@ namespace osu.Game.Screens.Play
 
             ApplyToBackground(b =>
             {
-                b.IgnoreUserSettings.Value = false;
+                b.ApplyUserSettings.Value = true;
                 b.BlurAmount.Value = 0;
 
                 // bind component bindables.
@@ -913,7 +913,7 @@ namespace osu.Game.Screens.Play
             float fadeOutDuration = instant ? 0 : 250;
             this.FadeOut(fadeOutDuration);
 
-            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+            ApplyToBackground(b => b.ApplyUserSettings.Value = false);
             storyboardReplacesBackground.Value = false;
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index cf15104809..8627432c11 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Screens.Play
             content.ScaleTo(0.7f, 150, Easing.InQuint);
             this.FadeOut(150);
 
-            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+            ApplyToBackground(b => b.ApplyUserSettings.Value = false);
 
             BackgroundBrightnessReduction = false;
             Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
@@ -277,7 +277,7 @@ namespace osu.Game.Screens.Play
                 // Preview user-defined background dim and blur when hovered on the visual settings panel.
                 ApplyToBackground(b =>
                 {
-                    b.IgnoreUserSettings.Value = false;
+                    b.ApplyUserSettings.Value = true;
                     b.BlurAmount.Value = 0;
                 });
 
@@ -288,7 +288,7 @@ namespace osu.Game.Screens.Play
                 ApplyToBackground(b =>
                 {
                     // Returns background dim and blur to the values specified by PlayerLoader.
-                    b.IgnoreUserSettings.Value = true;
+                    b.ApplyUserSettings.Value = false;
                     b.BlurAmount.Value = BACKGROUND_BLUR;
                 });
 

From 92fd34cea99c659155089ef828f54a65e620989b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Apr 2021 08:02:12 +0300
Subject: [PATCH 09118/10326] Revert "Inverse ignore user settings bindable to
 "apply user settings" instead"

This reverts commit 175b8da2b27002c262d53cfa5c8f44d46034abbf.
---
 .../Background/TestSceneUserDimBackgrounds.cs    | 16 ++++++++--------
 .../Background/TestSceneUserDimContainer.cs      |  2 +-
 osu.Game/Graphics/Containers/UserDimContainer.cs |  8 ++++----
 osu.Game/Rulesets/Mods/ModCinema.cs              |  4 ++--
 .../Backgrounds/BackgroundScreenBeatmap.cs       | 15 +++++++++------
 osu.Game/Screens/Edit/Editor.cs                  |  2 +-
 osu.Game/Screens/Play/DimmableStoryboard.cs      |  4 ++--
 osu.Game/Screens/Play/Player.cs                  |  4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs            |  6 +++---
 9 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index d915442570..f89988cd1a 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -157,9 +157,9 @@ namespace osu.Game.Tests.Visual.Background
         {
             performFullSetup();
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
-            AddStep("Disable user dim", () => songSelect.ApplyUserSettings.Value = false);
+            AddStep("Disable user dim", () => songSelect.IgnoreUserSettings.Value = true);
             AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsUserBlurDisabled());
-            AddStep("Enable user dim", () => songSelect.ApplyUserSettings.Value = true);
+            AddStep("Enable user dim", () => songSelect.IgnoreUserSettings.Value = false);
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
         }
 
@@ -176,10 +176,10 @@ namespace osu.Game.Tests.Visual.Background
                 player.ReplacesBackground.Value = true;
                 player.StoryboardEnabled.Value = true;
             });
-            AddStep("Enable user dim", () => player.DimmableStoryboard.ApplyUserSettings.Value = true);
+            AddStep("Enable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = false);
             AddStep("Set dim level to 1", () => songSelect.DimLevel.Value = 1f);
             AddUntilStep("Storyboard is invisible", () => !player.IsStoryboardVisible);
-            AddStep("Disable user dim", () => player.DimmableStoryboard.ApplyUserSettings.Value = false);
+            AddStep("Disable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = true);
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
         }
 
@@ -195,8 +195,8 @@ namespace osu.Game.Tests.Visual.Background
 
             AddStep("Ignore user settings", () =>
             {
-                player.ApplyToBackground(b => b.ApplyUserSettings.Value = false);
-                player.DimmableStoryboard.ApplyUserSettings.Value = false;
+                player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+                player.DimmableStoryboard.IgnoreUserSettings.Value = true;
             });
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
             AddUntilStep("Background is invisible", () => songSelect.IsBackgroundInvisible());
@@ -308,11 +308,11 @@ namespace osu.Game.Tests.Visual.Background
             protected override BackgroundScreen CreateBackground()
             {
                 background = new FadeAccessibleBackground(Beatmap.Value);
-                ApplyUserSettings.BindTo(background.ApplyUserSettings);
+                IgnoreUserSettings.BindTo(background.IgnoreUserSettings);
                 return background;
             }
 
-            public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>();
+            public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
             public readonly Bindable<double> DimLevel = new BindableDouble();
             public readonly Bindable<double> BlurLevel = new BindableDouble();
 
diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
index 9c3a044f18..fede99f450 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual.Background
             AddStep("set dim level 0.6", () => userDimContainer.UserDimLevel.Value = test_user_dim);
             AddUntilStep("dim reached", () => userDimContainer.DimEqual(test_user_dim));
 
-            AddStep("ignore settings", () => userDimContainer.ApplyUserSettings.Value = false);
+            AddStep("ignore settings", () => userDimContainer.IgnoreUserSettings.Value = true);
             AddUntilStep("no dim", () => userDimContainer.DimEqual(0));
             AddStep("set break", () => isBreakTime.Value = true);
             AddAssert("no dim", () => userDimContainer.DimEqual(0));
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index a3d59da961..4e555ac1eb 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -24,9 +24,9 @@ namespace osu.Game.Graphics.Containers
         protected const double BACKGROUND_FADE_DURATION = 800;
 
         /// <summary>
-        /// Whether or not user-configured effect settings should be applied to this container.
+        /// Whether or not user-configured settings relating to brightness of elements should be ignored
         /// </summary>
-        public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>(true);
+        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
 
         /// <summary>
         /// Whether or not the storyboard loaded should completely hide the background behind it.
@@ -52,7 +52,7 @@ namespace osu.Game.Graphics.Containers
 
         private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
 
-        protected float DimLevel => Math.Max(ApplyUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
+        protected float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
 
         protected override Container<Drawable> Content => dimContent;
 
@@ -78,7 +78,7 @@ namespace osu.Game.Graphics.Containers
             IsBreakTime.ValueChanged += _ => UpdateVisuals();
             ShowStoryboard.ValueChanged += _ => UpdateVisuals();
             StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
-            ApplyUserSettings.ValueChanged += _ => UpdateVisuals();
+            IgnoreUserSettings.ValueChanged += _ => UpdateVisuals();
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index 93062218fe..c78088ba2d 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Rulesets.Mods
 
         public void ApplyToPlayer(Player player)
         {
-            player.ApplyToBackground(b => b.ApplyUserSettings.Value = false);
-            player.DimmableStoryboard.ApplyUserSettings.Value = false;
+            player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+            player.DimmableStoryboard.IgnoreUserSettings.Value = true;
 
             player.BreakOverlay.Hide();
         }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 553a8f3689..02166644ab 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Screens.Backgrounds
         private WorkingBeatmap beatmap;
 
         /// <summary>
-        /// Whether or not user-configured effect settings should be applied to this background screen.
+        /// Whether or not user-configured settings relating to brightness of elements should be ignored
         /// </summary>
-        public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>();
+        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
 
         public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
 
@@ -50,7 +50,10 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
-            dimmable.ApplyUserSettings.BindTo(ApplyUserSettings);
+            // Beatmap background screens should not apply user settings by default.
+            IgnoreUserSettings.Value = true;
+
+            dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);
 
@@ -148,7 +151,7 @@ namespace osu.Game.Screens.Backgrounds
             /// <summary>
             /// As an optimisation, we add the two blur portions to be applied rather than actually applying two separate blurs.
             /// </summary>
-            private Vector2 blurTarget => ApplyUserSettings.Value
+            private Vector2 blurTarget => !IgnoreUserSettings.Value
                 ? new Vector2(BlurAmount.Value + (float)userBlurLevel.Value * USER_BLUR_FACTOR)
                 : new Vector2(BlurAmount.Value);
 
@@ -167,8 +170,8 @@ namespace osu.Game.Screens.Backgrounds
             }
 
             protected override bool ShowDimContent
-                // The background needs to be hidden in the case of it being replaced by the storyboard.
-                => (ApplyUserSettings.Value && !ShowStoryboard.Value) || !StoryboardReplacesBackground.Value;
+                // The background needs to be hidden in the case of it being replaced by the storyboard
+                => (!ShowStoryboard.Value && !IgnoreUserSettings.Value) || !StoryboardReplacesBackground.Value;
 
             protected override void UpdateVisuals()
             {
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 99c6cce26f..fffea65456 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -467,7 +467,7 @@ namespace osu.Game.Screens.Edit
                 // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
                 b.FadeColour(Color4.DarkGray, 500);
 
-                b.ApplyUserSettings.Value = false;
+                b.IgnoreUserSettings.Value = true;
                 b.BlurAmount.Value = 0;
             });
 
diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index 105f672847..58eb95b7c6 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -38,14 +38,14 @@ namespace osu.Game.Screens.Play
             base.LoadComplete();
         }
 
-        protected override bool ShowDimContent => !ApplyUserSettings.Value || (ShowStoryboard.Value && DimLevel < 1);
+        protected override bool ShowDimContent => IgnoreUserSettings.Value || (ShowStoryboard.Value && DimLevel < 1);
 
         private void initializeStoryboard(bool async)
         {
             if (drawableStoryboard != null)
                 return;
 
-            if (ApplyUserSettings.Value && !ShowStoryboard.Value)
+            if (!ShowStoryboard.Value && !IgnoreUserSettings.Value)
                 return;
 
             drawableStoryboard = storyboard.CreateDrawable();
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1c71305baf..dd3f58439b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -764,7 +764,7 @@ namespace osu.Game.Screens.Play
 
             ApplyToBackground(b =>
             {
-                b.ApplyUserSettings.Value = true;
+                b.IgnoreUserSettings.Value = false;
                 b.BlurAmount.Value = 0;
 
                 // bind component bindables.
@@ -913,7 +913,7 @@ namespace osu.Game.Screens.Play
             float fadeOutDuration = instant ? 0 : 250;
             this.FadeOut(fadeOutDuration);
 
-            ApplyToBackground(b => b.ApplyUserSettings.Value = false);
+            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
             storyboardReplacesBackground.Value = false;
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 8627432c11..cf15104809 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Screens.Play
             content.ScaleTo(0.7f, 150, Easing.InQuint);
             this.FadeOut(150);
 
-            ApplyToBackground(b => b.ApplyUserSettings.Value = false);
+            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
 
             BackgroundBrightnessReduction = false;
             Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
@@ -277,7 +277,7 @@ namespace osu.Game.Screens.Play
                 // Preview user-defined background dim and blur when hovered on the visual settings panel.
                 ApplyToBackground(b =>
                 {
-                    b.ApplyUserSettings.Value = true;
+                    b.IgnoreUserSettings.Value = false;
                     b.BlurAmount.Value = 0;
                 });
 
@@ -288,7 +288,7 @@ namespace osu.Game.Screens.Play
                 ApplyToBackground(b =>
                 {
                     // Returns background dim and blur to the values specified by PlayerLoader.
-                    b.ApplyUserSettings.Value = false;
+                    b.IgnoreUserSettings.Value = true;
                     b.BlurAmount.Value = BACKGROUND_BLUR;
                 });
 

From 6c5234f8daa605ffb936b492edd0e247ee71351a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Apr 2021 08:04:03 +0300
Subject: [PATCH 09119/10326] Move default `IgnoreUserSettings` value to
 construction

---
 .../Screens/Backgrounds/BackgroundScreenBeatmap.cs     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 02166644ab..65bc9cfaea 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -27,9 +27,12 @@ namespace osu.Game.Screens.Backgrounds
         private WorkingBeatmap beatmap;
 
         /// <summary>
-        /// Whether or not user-configured settings relating to brightness of elements should be ignored
+        /// Whether or not user-configured settings relating to brightness of elements should be ignored.
         /// </summary>
-        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
+        /// <remarks>
+        /// Beatmap background screens should not apply user settings by default.
+        /// </remarks>
+        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>(true);
 
         public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
 
@@ -50,9 +53,6 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
-            // Beatmap background screens should not apply user settings by default.
-            IgnoreUserSettings.Value = true;
-
             dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);

From 5eaf3ea5765e21a0137b983fa586651d0228ffc5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:19:06 +0900
Subject: [PATCH 09120/10326] Reorganise and reword comments to make time
 override behaviour a bit clearer

---
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index a7f11b1e6f..279087ead9 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -128,13 +128,13 @@ namespace osu.Game.Rulesets.Replays
             double frameStart = getFrameTime(currentFrameIndex);
             double frameEnd = getFrameTime(currentFrameIndex + 1);
 
-            // If the proposed time is after the current frame end time, we progress forwards.
-            // If the proposed time is before the current frame start time, and we are at the frame boundary, we progress backwards.
+            // If the proposed time is after the current frame end time, we progress forwards to precisely the new frame's time (regardless of incoming time).
             if (frameEnd <= time)
             {
                 time = frameEnd;
                 currentFrameIndex++;
             }
+            // If the proposed time is before the current frame start time, and we are at the frame boundary, we progress backwards.
             else if (time < frameStart && CurrentTime == frameStart)
                 currentFrameIndex--;
 

From ba325de5959bb83828fc222b359fcb9f9c846236 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:19:59 +0900
Subject: [PATCH 09121/10326] Merge conditionals for readability

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 1c0d820a3d..5ab09f9516 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.UI
 
         protected override List<IInput> GetPendingInputs()
         {
-            if (replayInputHandler != null && !replayInputHandler.IsActive)
+            if (replayInputHandler?.IsActive == false)
                 return emptyInputList;
 
             return base.GetPendingInputs();

From 346e36d32a09ebdafb1c902f4eb0b03e45fddf42 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:32:01 +0900
Subject: [PATCH 09122/10326] Make `Mod.Description` abstract and add missing
 descriptions

---
 osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs               | 1 +
 osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs              | 1 +
 .../NonVisual/DifficultyAdjustmentModCombinationsTest.cs     | 5 +++++
 osu.Game.Tests/Online/TestAPIModJsonSerialization.cs         | 2 ++
 osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs  | 3 +++
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs      | 1 +
 osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs    | 2 ++
 osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs  | 2 ++
 osu.Game/Rulesets/Mods/Mod.cs                                | 2 +-
 osu.Game/Rulesets/Mods/ModNoMod.cs                           | 1 +
 10 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
index 485595cea9..fa1eb10f5e 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
@@ -15,6 +15,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Mirror";
         public override string Acronym => "MR";
         public override ModType Type => ModType.Conversion;
+        public override string Description => "Notes are flipped horizontally";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
index f0db548e74..3b16e9d2b7 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
@@ -9,6 +9,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Touch Device";
         public override string Acronym => "TD";
+        public override string Description => "Automatically applied to plays on devices with a touchscreen.";
         public override double ScoreMultiplier => 1;
 
         public override ModType Type => ModType.System;
diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index 1c0bfd56dd..16c1004f37 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -144,6 +144,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => nameof(ModA);
             public override string Acronym => nameof(ModA);
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModIncompatibleWithA), typeof(ModIncompatibleWithAAndB) };
@@ -152,6 +153,7 @@ namespace osu.Game.Tests.NonVisual
         private class ModB : Mod
         {
             public override string Name => nameof(ModB);
+            public override string Description => string.Empty;
             public override string Acronym => nameof(ModB);
             public override double ScoreMultiplier => 1;
 
@@ -162,6 +164,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => nameof(ModC);
             public override string Acronym => nameof(ModC);
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
         }
 
@@ -169,6 +172,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => $"Incompatible With {nameof(ModA)}";
             public override string Acronym => $"Incompatible With {nameof(ModA)}";
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModA) };
@@ -187,6 +191,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => $"Incompatible With {nameof(ModA)} and {nameof(ModB)}";
             public override string Acronym => $"Incompatible With {nameof(ModA)} and {nameof(ModB)}";
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModA), typeof(ModB) };
diff --git a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index 3afb7481b1..ad2007f202 100644
--- a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -140,6 +140,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
@@ -156,6 +157,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TMTR";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Initial rate", "The starting speed of the track")]
diff --git a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
index 74db477cfc..0462e9feb5 100644
--- a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
@@ -100,6 +100,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
@@ -116,6 +117,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TMTR";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Initial rate", "The starting speed of the track")]
@@ -150,6 +152,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 88fbf09ef4..280c182259 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -321,6 +321,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             public override string Name => string.Empty;
             public override string Acronym => string.Empty;
             public override double ScoreMultiplier => 1;
+            public override string Description => string.Empty;
 
             public bool Applied { get; private set; }
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
index 443cf59003..fdc21d80ff 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
@@ -57,6 +57,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         private abstract class TestMod : Mod, IApplicableMod
         {
             public override double ScoreMultiplier => 1.0;
+
+            public override string Description => "This is a test mod.";
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 89f9b7381b..2158cf77e5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -226,6 +226,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             public override double ScoreMultiplier => 1.0;
 
+            public override string Description => "This is a customisable test mod.";
+
             public override ModType Type => ModType.Conversion;
 
             [SettingSource("Sample float", "Change something for a mod")]
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 832a14ee1e..4879590e24 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mods
         /// The user readable description of this mod.
         /// </summary>
         [JsonIgnore]
-        public virtual string Description => string.Empty;
+        public abstract string Description { get; }
 
         /// <summary>
         /// The tooltip to display for this mod when used in a <see cref="ModIcon"/>.
diff --git a/osu.Game/Rulesets/Mods/ModNoMod.cs b/osu.Game/Rulesets/Mods/ModNoMod.cs
index 379a2122f2..1009c5bc42 100644
--- a/osu.Game/Rulesets/Mods/ModNoMod.cs
+++ b/osu.Game/Rulesets/Mods/ModNoMod.cs
@@ -12,6 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "No Mod";
         public override string Acronym => "NM";
+        public override string Description => "No mods applied.";
         public override double ScoreMultiplier => 1;
         public override IconUsage? Icon => FontAwesome.Solid.Ban;
         public override ModType Type => ModType.System;

From 23eb1c655ce3b2dd5f6bea7e5f68bdc4d111fe8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:37:47 +0900
Subject: [PATCH 09123/10326] Add missing description

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index 7cdfdb3c4a..3a61968075 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Name => "Barrel Roll";
         public override string Acronym => "BR";
+        public override string Description => "The whole playfield is on a wheel!";
         public override double ScoreMultiplier => 1;
 
         public void Update(Playfield playfield)

From 698a9d3feddddbb80fc9a483f02160446b985993 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:40:03 +0900
Subject: [PATCH 09124/10326] Add rotation direction setting

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index 3a61968075..b6cfa514a1 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
@@ -21,6 +22,9 @@ namespace osu.Game.Rulesets.Osu.Mods
             Precision = 0.01,
         };
 
+        [SettingSource("Direction", "The direction of rotation")]
+        public Bindable<RotationDirection> Direction { get; } = new Bindable<RotationDirection>(RotationDirection.Clockwise);
+
         public override string Name => "Barrel Roll";
         public override string Acronym => "BR";
         public override string Description => "The whole playfield is on a wheel!";
@@ -28,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void Update(Playfield playfield)
         {
-            playfield.Rotation = 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
+            playfield.Rotation = (Direction.Value == RotationDirection.CounterClockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)

From 55421b0065a8e22b66e260ae594463a04d1bdbf5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:41:10 +0900
Subject: [PATCH 09125/10326] Add missing full stop

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
index fa1eb10f5e..12f379bddb 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Mirror";
         public override string Acronym => "MR";
         public override ModType Type => ModType.Conversion;
-        public override string Description => "Notes are flipped horizontally";
+        public override string Description => "Notes are flipped horizontally.";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
 

From bc3b2af39d5d391e3bf0c95a5514193e6853faf2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 15:29:22 +0900
Subject: [PATCH 09126/10326] Add rounded corners to timeline ticks display

---
 .../Timelines/Summary/Visualisations/PointVisualisation.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
index 53a1f94731..d647c6bfe8 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     /// <summary>
     /// Represents a singular point on a timeline part.
     /// </summary>
-    public class PointVisualisation : Box
+    public class PointVisualisation : Circle
     {
         public const float MAX_WIDTH = 4;
 

From 6fc7488a67ddf580358369327c78ddea5d7aab8d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 16:33:59 +0900
Subject: [PATCH 09127/10326] Reimplement syncing logic as a new component

---
 .../OnlinePlay/MultiplayerSyncManagerTest.cs  | 213 ++++++++++++++++++
 .../Spectate/IMultiplayerSlaveClock.cs        |  17 ++
 .../Spectate/IMultiplayerSyncManager.cs       |  16 ++
 .../Spectate/MultiplayerSyncManager.cs        | 162 +++++++++++++
 4 files changed, 408 insertions(+)
 create mode 100644 osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs

diff --git a/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs b/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
new file mode 100644
index 0000000000..2a6dfa9c8d
--- /dev/null
+++ b/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
@@ -0,0 +1,213 @@
+// Copyright (c) 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.Testing;
+using osu.Framework.Timing;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.OnlinePlay
+{
+    [HeadlessTest]
+    public class MultiplayerSyncManagerTest : OsuTestScene
+    {
+        private TestManualClock master;
+        private MultiplayerSyncManager syncManager;
+
+        private TestSlaveClock slave1;
+        private TestSlaveClock slave2;
+
+        [SetUp]
+        public void Setup()
+        {
+            syncManager = new MultiplayerSyncManager(master = new TestManualClock());
+            syncManager.AddSlave(slave1 = new TestSlaveClock(1));
+            syncManager.AddSlave(slave2 = new TestSlaveClock(2));
+
+            Schedule(() => Child = syncManager);
+        }
+
+        [Test]
+        public void TestMasterClockStartsWhenAllSlavesHaveFrames()
+        {
+            setWaiting(() => slave1, false);
+            assertMasterState(false);
+            assertSlaveState(() => slave1, false);
+            assertSlaveState(() => slave2, false);
+
+            setWaiting(() => slave2, false);
+            assertMasterState(true);
+            assertSlaveState(() => slave1, true);
+            assertSlaveState(() => slave2, true);
+        }
+
+        [Test]
+        public void TestMasterClockDoesNotStartWhenNoneReadyForMaximumDelayTime()
+        {
+            AddWaitStep($"wait {MultiplayerSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            assertMasterState(false);
+        }
+
+        [Test]
+        public void TestMasterClockStartsWhenAnyReadyForMaximumDelayTime()
+        {
+            setWaiting(() => slave1, false);
+            AddWaitStep($"wait {MultiplayerSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            assertMasterState(true);
+        }
+
+        [Test]
+        public void TestSlaveDoesNotCatchUpWhenSlightlyOutOfSync()
+        {
+            setAllWaiting(false);
+
+            setMasterTime(MultiplayerSyncManager.SYNC_TARGET + 1);
+            assertCatchingUp(() => slave1, false);
+        }
+
+        [Test]
+        public void TestSlaveStartsCatchingUpWhenTooFarBehind()
+        {
+            setAllWaiting(false);
+
+            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 1);
+            assertCatchingUp(() => slave1, true);
+            assertCatchingUp(() => slave2, true);
+        }
+
+        [Test]
+        public void TestSlaveKeepsCatchingUpWhenSlightlyOutOfSync()
+        {
+            setAllWaiting(false);
+
+            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 1);
+            setSlaveTime(() => slave1, MultiplayerSyncManager.SYNC_TARGET + 1);
+            assertCatchingUp(() => slave1, true);
+        }
+
+        [Test]
+        public void TestSlaveStopsCatchingUpWhenInSync()
+        {
+            setAllWaiting(false);
+
+            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 2);
+            setSlaveTime(() => slave1, MultiplayerSyncManager.SYNC_TARGET);
+            assertCatchingUp(() => slave1, false);
+            assertCatchingUp(() => slave2, true);
+        }
+
+        [Test]
+        public void TestSlaveDoesNotStopWhenSlightlyAhead()
+        {
+            setAllWaiting(false);
+
+            setSlaveTime(() => slave1, -MultiplayerSyncManager.SYNC_TARGET);
+            assertCatchingUp(() => slave1, false);
+            assertSlaveState(() => slave1, true);
+        }
+
+        [Test]
+        public void TestSlaveStopsWhenTooFarAheadAndStartsWhenBackInSync()
+        {
+            setAllWaiting(false);
+
+            setSlaveTime(() => slave1, -MultiplayerSyncManager.SYNC_TARGET - 1);
+
+            // This is a silent catchup, where IsCatchingUp = false but IsRunning = false also.
+            assertCatchingUp(() => slave1, false);
+            assertSlaveState(() => slave1, false);
+
+            setMasterTime(1);
+            assertCatchingUp(() => slave1, false);
+            assertSlaveState(() => slave1, true);
+        }
+
+        [Test]
+        public void TestInSyncSlaveDoesNotStartIfWaitingOnFrames()
+        {
+            setAllWaiting(false);
+
+            assertSlaveState(() => slave1, true);
+            setWaiting(() => slave1, true);
+            assertSlaveState(() => slave1, false);
+        }
+
+        private void setWaiting(Func<TestSlaveClock> slave, bool waiting)
+            => AddStep($"set slave {slave().Id} waiting = {waiting}", () => slave().WaitingOnFrames.Value = waiting);
+
+        private void setAllWaiting(bool waiting) => AddStep($"set all slaves waiting = {waiting}", () =>
+        {
+            slave1.WaitingOnFrames.Value = waiting;
+            slave2.WaitingOnFrames.Value = waiting;
+        });
+
+        private void setMasterTime(double time)
+            => AddStep($"set master = {time}", () => master.Seek(time));
+
+        /// <summary>
+        /// slave.Time = master.Time - offsetFromMaster
+        /// </summary>
+        private void setSlaveTime(Func<TestSlaveClock> slave, double offsetFromMaster)
+            => AddStep($"set slave {slave().Id} = master - {offsetFromMaster}", () => slave().Seek(master.CurrentTime - offsetFromMaster));
+
+        private void assertMasterState(bool running)
+            => AddAssert($"master clock {(running ? "is" : "is not")} running", () => master.IsRunning == running);
+
+        private void assertCatchingUp(Func<TestSlaveClock> slave, bool catchingUp) =>
+            AddAssert($"slave {slave().Id} {(catchingUp ? "is" : "is not")} catching up", () => slave().IsCatchingUp == catchingUp);
+
+        private void assertSlaveState(Func<TestSlaveClock> slave, bool running)
+            => AddAssert($"slave {slave().Id} {(running ? "is" : "is not")} running", () => slave().IsRunning == running);
+
+        private class TestSlaveClock : TestManualClock, IMultiplayerSlaveClock
+        {
+            public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
+            IBindable<bool> IMultiplayerSlaveClock.WaitingOnFrames => WaitingOnFrames;
+
+            public double LastFrameTime => 0;
+
+            double IMultiplayerSlaveClock.LastFrameTime => LastFrameTime;
+
+            public bool IsCatchingUp { get; set; }
+
+            public readonly int Id;
+
+            public TestSlaveClock(int id)
+            {
+                Id = id;
+
+                WaitingOnFrames.BindValueChanged(waiting =>
+                {
+                    if (waiting.NewValue)
+                        Stop();
+                    else
+                        Start();
+                });
+            }
+        }
+
+        private class TestManualClock : ManualClock, IAdjustableClock
+        {
+            public void Start() => IsRunning = true;
+
+            public void Stop() => IsRunning = false;
+
+            public bool Seek(double position)
+            {
+                CurrentTime = position;
+                return true;
+            }
+
+            public void Reset()
+            {
+            }
+
+            public void ResetSpeedAdjustments()
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
new file mode 100644
index 0000000000..e0fca45bdd
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Framework.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public interface IMultiplayerSlaveClock : IAdjustableClock
+    {
+        IBindable<bool> WaitingOnFrames { get; }
+
+        double LastFrameTime { get; }
+
+        bool IsCatchingUp { get; set; }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs
new file mode 100644
index 0000000000..2c50596823
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.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.Framework.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public interface IMultiplayerSyncManager
+    {
+        IAdjustableClock Master { get; }
+
+        void AddSlave(IMultiplayerSlaveClock clock);
+
+        void RemoveSlave(IMultiplayerSlaveClock clock);
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
new file mode 100644
index 0000000000..42f6536e90
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
@@ -0,0 +1,162 @@
+// Copyright (c) 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.Logging;
+using osu.Framework.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSyncManager : Component, IMultiplayerSyncManager
+    {
+        /// <summary>
+        /// The offset from the master clock to which slaves should be synchronised to.
+        /// </summary>
+        public const double SYNC_TARGET = 16;
+
+        /// <summary>
+        /// The offset from the master clock at which slaves begin resynchronising.
+        /// </summary>
+        public const double MAX_SYNC_OFFSET = 50;
+
+        /// <summary>
+        /// The maximum delay to start gameplay, if any (but not all) slaves are ready.
+        /// </summary>
+        public const double MAXIMUM_START_DELAY = 15000;
+
+        /// <summary>
+        /// The catchup rate.
+        /// </summary>
+        public const double CATCHUP_RATE = 2;
+
+        /// <summary>
+        /// The master clock which is used to control the timing of all slave clocks.
+        /// </summary>
+        public IAdjustableClock Master { get; }
+
+        /// <summary>
+        /// The slave clocks.
+        /// </summary>
+        private readonly List<IMultiplayerSlaveClock> slaves = new List<IMultiplayerSlaveClock>();
+
+        private bool hasStarted;
+        private double? firstStartAttemptTime;
+
+        public MultiplayerSyncManager(IAdjustableClock master)
+        {
+            Master = master;
+        }
+
+        public void AddSlave(IMultiplayerSlaveClock clock) => slaves.Add(clock);
+
+        public void RemoveSlave(IMultiplayerSlaveClock clock) => slaves.Remove(clock);
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!attemptStart())
+            {
+                // Ensure all slaves are stopped until the start succeeds.
+                foreach (var slave in slaves)
+                    slave.Stop();
+                return;
+            }
+
+            updateCatchup();
+            updateMasterClock();
+        }
+
+        /// <summary>
+        /// Attempts to start playback. Awaits for all slaves to have available frames for up to <see cref="MAXIMUM_START_DELAY"/> milliseconds.
+        /// </summary>
+        /// <returns>Whether playback was started and syncing should occur.</returns>
+        private bool attemptStart()
+        {
+            if (hasStarted)
+                return true;
+
+            if (slaves.Count == 0)
+                return false;
+
+            firstStartAttemptTime ??= Time.Current;
+
+            int readyCount = slaves.Count(s => !s.WaitingOnFrames.Value);
+
+            if (readyCount == slaves.Count)
+            {
+                Logger.Log("Gameplay started (all ready).");
+                return hasStarted = true;
+            }
+
+            if (readyCount > 0 && (Time.Current - firstStartAttemptTime) > MAXIMUM_START_DELAY)
+            {
+                Logger.Log($"Gameplay started (maximum delay exceeded, {readyCount}/{slaves.Count} ready).");
+                return hasStarted = true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Updates the catchup states of all slave clocks.
+        /// </summary>
+        private void updateCatchup()
+        {
+            for (int i = 0; i < slaves.Count; i++)
+            {
+                var slave = slaves[i];
+                double timeDelta = Master.CurrentTime - slave.CurrentTime;
+
+                // Check that the slave isn't too far ahead.
+                // This is a quiet case in which the catchup is done by the master clock, so IsCatchingUp is not set on the slave.
+                if (timeDelta < -SYNC_TARGET)
+                {
+                    slave.Stop();
+                    continue;
+                }
+
+                // Make sure the slave is running if it can.
+                if (!slave.WaitingOnFrames.Value)
+                    slave.Start();
+
+                if (slave.IsCatchingUp)
+                {
+                    // Stop the slave from catching up if it's within the sync target.
+                    if (timeDelta <= SYNC_TARGET)
+                    {
+                        slave.IsCatchingUp = false;
+                        Logger.Log($"Slave {i} catchup finished (delta = {timeDelta})");
+                    }
+                }
+                else
+                {
+                    // Make the slave start catching up if it's exceeded the maximum allowable sync offset.
+                    if (timeDelta > MAX_SYNC_OFFSET)
+                    {
+                        slave.IsCatchingUp = true;
+                        Logger.Log($"Slave {i} catchup started (too far behind, delta = {timeDelta})");
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the master clock's running state.
+        /// </summary>
+        private void updateMasterClock()
+        {
+            bool anyInSync = slaves.Any(s => !s.IsCatchingUp);
+
+            if (Master.IsRunning != anyInSync)
+            {
+                if (anyInSync)
+                    Master.Start();
+                else
+                    Master.Stop();
+            }
+        }
+    }
+}

From 66bb5766b9486bd06b6059007cde79680e4fcc2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:32:01 +0900
Subject: [PATCH 09128/10326] Make `Mod.Description` abstract and add missing
 descriptions

---
 osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs               | 1 +
 osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs              | 1 +
 .../NonVisual/DifficultyAdjustmentModCombinationsTest.cs     | 5 +++++
 osu.Game.Tests/Online/TestAPIModJsonSerialization.cs         | 2 ++
 osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs  | 3 +++
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs      | 1 +
 osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs    | 2 ++
 osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs  | 2 ++
 osu.Game/Rulesets/Mods/Mod.cs                                | 2 +-
 osu.Game/Rulesets/Mods/ModNoMod.cs                           | 1 +
 10 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
index 485595cea9..fa1eb10f5e 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
@@ -15,6 +15,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Mirror";
         public override string Acronym => "MR";
         public override ModType Type => ModType.Conversion;
+        public override string Description => "Notes are flipped horizontally";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
index f0db548e74..3b16e9d2b7 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
@@ -9,6 +9,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Touch Device";
         public override string Acronym => "TD";
+        public override string Description => "Automatically applied to plays on devices with a touchscreen.";
         public override double ScoreMultiplier => 1;
 
         public override ModType Type => ModType.System;
diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index 1c0bfd56dd..16c1004f37 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -144,6 +144,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => nameof(ModA);
             public override string Acronym => nameof(ModA);
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModIncompatibleWithA), typeof(ModIncompatibleWithAAndB) };
@@ -152,6 +153,7 @@ namespace osu.Game.Tests.NonVisual
         private class ModB : Mod
         {
             public override string Name => nameof(ModB);
+            public override string Description => string.Empty;
             public override string Acronym => nameof(ModB);
             public override double ScoreMultiplier => 1;
 
@@ -162,6 +164,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => nameof(ModC);
             public override string Acronym => nameof(ModC);
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
         }
 
@@ -169,6 +172,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => $"Incompatible With {nameof(ModA)}";
             public override string Acronym => $"Incompatible With {nameof(ModA)}";
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModA) };
@@ -187,6 +191,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => $"Incompatible With {nameof(ModA)} and {nameof(ModB)}";
             public override string Acronym => $"Incompatible With {nameof(ModA)} and {nameof(ModB)}";
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModA), typeof(ModB) };
diff --git a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index 3afb7481b1..ad2007f202 100644
--- a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -140,6 +140,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
@@ -156,6 +157,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TMTR";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Initial rate", "The starting speed of the track")]
diff --git a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
index 74db477cfc..0462e9feb5 100644
--- a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
@@ -100,6 +100,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
@@ -116,6 +117,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TMTR";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Initial rate", "The starting speed of the track")]
@@ -150,6 +152,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 88fbf09ef4..280c182259 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -321,6 +321,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             public override string Name => string.Empty;
             public override string Acronym => string.Empty;
             public override double ScoreMultiplier => 1;
+            public override string Description => string.Empty;
 
             public bool Applied { get; private set; }
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
index 443cf59003..fdc21d80ff 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
@@ -57,6 +57,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         private abstract class TestMod : Mod, IApplicableMod
         {
             public override double ScoreMultiplier => 1.0;
+
+            public override string Description => "This is a test mod.";
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 89f9b7381b..2158cf77e5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -226,6 +226,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             public override double ScoreMultiplier => 1.0;
 
+            public override string Description => "This is a customisable test mod.";
+
             public override ModType Type => ModType.Conversion;
 
             [SettingSource("Sample float", "Change something for a mod")]
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 832a14ee1e..4879590e24 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mods
         /// The user readable description of this mod.
         /// </summary>
         [JsonIgnore]
-        public virtual string Description => string.Empty;
+        public abstract string Description { get; }
 
         /// <summary>
         /// The tooltip to display for this mod when used in a <see cref="ModIcon"/>.
diff --git a/osu.Game/Rulesets/Mods/ModNoMod.cs b/osu.Game/Rulesets/Mods/ModNoMod.cs
index 379a2122f2..1009c5bc42 100644
--- a/osu.Game/Rulesets/Mods/ModNoMod.cs
+++ b/osu.Game/Rulesets/Mods/ModNoMod.cs
@@ -12,6 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "No Mod";
         public override string Acronym => "NM";
+        public override string Description => "No mods applied.";
         public override double ScoreMultiplier => 1;
         public override IconUsage? Icon => FontAwesome.Solid.Ban;
         public override ModType Type => ModType.System;

From ed14e014015042a2527210fab3af73c060677f88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:41:10 +0900
Subject: [PATCH 09129/10326] Add missing full stop

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
index fa1eb10f5e..12f379bddb 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Mirror";
         public override string Acronym => "MR";
         public override ModType Type => ModType.Conversion;
-        public override string Description => "Notes are flipped horizontally";
+        public override string Description => "Notes are flipped horizontally.";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
 

From dd9a142e899030c6a53d0fd0275af6a57efd34f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 16:30:02 +0900
Subject: [PATCH 09130/10326] Fix `TestSceneEditorSummaryTimeline` not
 displaying actual beatmap content

---
 .../Editing/TestSceneEditorSummaryTimeline.cs | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
index 94a9fd7b35..ba57eeacbe 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
@@ -16,18 +17,28 @@ namespace osu.Game.Tests.Visual.Editing
     public class TestSceneEditorSummaryTimeline : EditorClockTestScene
     {
         [Cached(typeof(EditorBeatmap))]
-        private readonly EditorBeatmap editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+        private readonly EditorBeatmap editorBeatmap;
 
-        [BackgroundDependencyLoader]
-        private void load()
+        public TestSceneEditorSummaryTimeline()
         {
-            Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+            editorBeatmap = new EditorBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
+        }
 
-            Add(new SummaryTimeline
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            AddStep("create timeline", () =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(500, 50)
+                // required for track
+                Beatmap.Value = CreateWorkingBeatmap(editorBeatmap.PlayableBeatmap);
+
+                Add(new SummaryTimeline
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(500, 50)
+                });
             });
         }
     }

From 73821beb1d8d127be59f77c9fa980259b3081a5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 16:30:20 +0900
Subject: [PATCH 09131/10326] Fix break display looking bad on very long
 beatmaps due to fixed corner radius

---
 .../Edit/Components/Timelines/Summary/SummaryTimeline.cs  | 2 +-
 .../Summary/Visualisations/DurationVisualisation.cs       | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
index 02cd4bccb4..e1a1eff0cb 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Height = 0.25f
+                    Height = 0.10f
                 }
             };
         }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs
index de63df5463..86e6446555 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs
@@ -10,19 +10,15 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     /// <summary>
     /// Represents a spanning point on a timeline part.
     /// </summary>
-    public class DurationVisualisation : Container
+    public class DurationVisualisation : Circle
     {
         protected DurationVisualisation(double startTime, double endTime)
         {
-            Masking = true;
-            CornerRadius = 5;
-
             RelativePositionAxes = Axes.X;
             RelativeSizeAxes = Axes.Both;
+
             X = (float)startTime;
             Width = (float)(endTime - startTime);
-
-            AddInternal(new Box { RelativeSizeAxes = Axes.Both });
         }
     }
 }

From da6f9060fa2eb98c982367ec2a0ef00fcf1edf26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 16:30:56 +0900
Subject: [PATCH 09132/10326] Centre end circles to avoid visual gaps

---
 .../Edit/Components/Timelines/Summary/SummaryTimeline.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
index e1a1eff0cb..ada7810599 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                         new Circle
                         {
                             Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreRight,
+                            Origin = Anchor.Centre,
                             Size = new Vector2(5)
                         },
                         new Box
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                         new Circle
                         {
                             Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreLeft,
+                            Origin = Anchor.Centre,
                             Size = new Vector2(5)
                         },
                     }

From 757475e6d4c3f300684d46f5f3c860f73ecd66e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 16:33:29 +0900
Subject: [PATCH 09133/10326] Use correct representation colours

---
 .../Components/Timelines/Summary/Parts/GroupVisualisation.cs    | 2 +-
 .../Edit/Components/Timelines/Summary/SummaryTimeline.cs        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
index 93fe6f9989..8bc8618479 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                     return;
                 }
 
-                Colour = controlPoints.Any(c => c is TimingControlPoint) ? colours.YellowDark : colours.Green;
+                Colour = Group.ControlPoints.First().GetRepresentingColour(colours);
             }, true);
         }
     }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
index ada7810599..ae60cd4dd3 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                 },
                 new Container
                 {
+                    Name = "centre line",
                     RelativeSizeAxes = Axes.Both,
                     Colour = colours.Gray5,
                     Children = new Drawable[]

From 33ad7850cb432a2f2d7cfbbe60ae302f353443a4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 16:45:59 +0900
Subject: [PATCH 09134/10326] Remove LastFrameTime

---
 osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs       | 4 ----
 .../OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs | 2 --
 2 files changed, 6 deletions(-)

diff --git a/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs b/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
index 2a6dfa9c8d..6ee867c6f8 100644
--- a/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
+++ b/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
@@ -167,10 +167,6 @@ namespace osu.Game.Tests.OnlinePlay
             public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
             IBindable<bool> IMultiplayerSlaveClock.WaitingOnFrames => WaitingOnFrames;
 
-            public double LastFrameTime => 0;
-
-            double IMultiplayerSlaveClock.LastFrameTime => LastFrameTime;
-
             public bool IsCatchingUp { get; set; }
 
             public readonly int Id;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
index e0fca45bdd..e90eed68ab 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
@@ -10,8 +10,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         IBindable<bool> WaitingOnFrames { get; }
 
-        double LastFrameTime { get; }
-
         bool IsCatchingUp { get; set; }
     }
 }

From 18e8682f391ea78fa40487af2d813fe6b6fe77b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 17:01:25 +0900
Subject: [PATCH 09135/10326] Remove unused using statements

---
 osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs | 2 --
 .../Timelines/Summary/Visualisations/DurationVisualisation.cs   | 1 -
 2 files changed, 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
index ba57eeacbe..da0c83bb11 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
@@ -4,9 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
 using osuTK;
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs
index 86e6446555..ec68bf9c00 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.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.Framework.Graphics.Shapes;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations

From bf5af3310aa1d643e08a0135531fff7b9aff9416 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 17:04:11 +0900
Subject: [PATCH 09136/10326] Update break colour to not look like kiai time

---
 .../Edit/Components/Timelines/Summary/Parts/BreakPart.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
index e8a4b5c8c7..3d535ec915 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours) => Colour = colours.Yellow;
+            private void load(OsuColour colours) => Colour = colours.GreyCarmineLight;
         }
     }
 }

From 50fad47ebc45d744dcd2f0005a9a66aa80639e63 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 15 Apr 2021 18:06:45 +0900
Subject: [PATCH 09137/10326] Remove usage of Lazy<List<...>> for
 NestedHitObjects

---
 .../Objects/Drawables/DrawableHitObject.cs    | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index d95b246c96..669e4cecbe 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -56,8 +56,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         public virtual IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples;
 
-        private readonly Lazy<List<DrawableHitObject>> nestedHitObjects = new Lazy<List<DrawableHitObject>>();
-        public IReadOnlyList<DrawableHitObject> NestedHitObjects => nestedHitObjects.IsValueCreated ? nestedHitObjects.Value : (IReadOnlyList<DrawableHitObject>)Array.Empty<DrawableHitObject>();
+        private readonly List<DrawableHitObject> nestedHitObjects = new List<DrawableHitObject>();
+        public IReadOnlyList<DrawableHitObject> NestedHitObjects => nestedHitObjects;
 
         /// <summary>
         /// Whether this object should handle any user input events.
@@ -249,7 +249,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 // Must be done before the nested DHO is added to occur before the nested Apply()!
                 drawableNested.ParentHitObject = this;
 
-                nestedHitObjects.Value.Add(drawableNested);
+                nestedHitObjects.Add(drawableNested);
                 AddNestedHitObject(drawableNested);
             }
 
@@ -305,19 +305,16 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (Samples != null)
                 Samples.Samples = null;
 
-            if (nestedHitObjects.IsValueCreated)
+            foreach (var obj in nestedHitObjects)
             {
-                foreach (var obj in nestedHitObjects.Value)
-                {
-                    obj.OnNewResult -= onNewResult;
-                    obj.OnRevertResult -= onRevertResult;
-                    obj.ApplyCustomUpdateState -= onApplyCustomUpdateState;
-                }
-
-                nestedHitObjects.Value.Clear();
-                ClearNestedHitObjects();
+                obj.OnNewResult -= onNewResult;
+                obj.OnRevertResult -= onRevertResult;
+                obj.ApplyCustomUpdateState -= onApplyCustomUpdateState;
             }
 
+            nestedHitObjects.Clear();
+            ClearNestedHitObjects();
+
             HitObject.DefaultsApplied -= onDefaultsApplied;
 
             OnFree();

From d8aa436e81a1f70160983c882cf2b94d83063677 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 15 Apr 2021 18:11:47 +0900
Subject: [PATCH 09138/10326] Remove usage of Lazy<List<...>> in
 NestedPlayfields

---
 osu.Game/Rulesets/UI/Playfield.cs | 35 ++++++++-----------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index c40ab4bd94..d55005363c 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.UI
 
                 var enumerable = HitObjectContainer.Objects;
 
-                if (nestedPlayfields.IsValueCreated)
+                if (nestedPlayfields.Count != 0)
                     enumerable = enumerable.Concat(NestedPlayfields.SelectMany(p => p.AllHitObjects));
 
                 return enumerable;
@@ -76,9 +76,9 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// All <see cref="Playfield"/>s nested inside this <see cref="Playfield"/>.
         /// </summary>
-        public IEnumerable<Playfield> NestedPlayfields => nestedPlayfields.IsValueCreated ? nestedPlayfields.Value : Enumerable.Empty<Playfield>();
+        public IEnumerable<Playfield> NestedPlayfields => nestedPlayfields;
 
-        private readonly Lazy<List<Playfield>> nestedPlayfields = new Lazy<List<Playfield>>();
+        private readonly List<Playfield> nestedPlayfields = new List<Playfield>();
 
         /// <summary>
         /// Whether judgements should be displayed by this and and all nested <see cref="Playfield"/>s.
@@ -217,7 +217,7 @@ namespace osu.Game.Rulesets.UI
             otherPlayfield.HitObjectUsageBegan += h => HitObjectUsageBegan?.Invoke(h);
             otherPlayfield.HitObjectUsageFinished += h => HitObjectUsageFinished?.Invoke(h);
 
-            nestedPlayfields.Value.Add(otherPlayfield);
+            nestedPlayfields.Add(otherPlayfield);
         }
 
         protected override void LoadComplete()
@@ -279,12 +279,7 @@ namespace osu.Game.Rulesets.UI
                 return true;
             }
 
-            bool removedFromNested = false;
-
-            if (nestedPlayfields.IsValueCreated)
-                removedFromNested = nestedPlayfields.Value.Any(p => p.Remove(hitObject));
-
-            return removedFromNested;
+            return nestedPlayfields.Any(p => p.Remove(hitObject));
         }
 
         /// <summary>
@@ -429,10 +424,7 @@ namespace osu.Game.Rulesets.UI
                 return;
             }
 
-            if (!nestedPlayfields.IsValueCreated)
-                return;
-
-            foreach (var p in nestedPlayfields.Value)
+            foreach (var p in nestedPlayfields)
                 p.SetKeepAlive(hitObject, keepAlive);
         }
 
@@ -444,10 +436,7 @@ namespace osu.Game.Rulesets.UI
             foreach (var (_, entry) in lifetimeEntryMap)
                 entry.KeepAlive = true;
 
-            if (!nestedPlayfields.IsValueCreated)
-                return;
-
-            foreach (var p in nestedPlayfields.Value)
+            foreach (var p in nestedPlayfields)
                 p.KeepAllAlive();
         }
 
@@ -461,10 +450,7 @@ namespace osu.Game.Rulesets.UI
             {
                 HitObjectContainer.PastLifetimeExtension = value;
 
-                if (!nestedPlayfields.IsValueCreated)
-                    return;
-
-                foreach (var nested in nestedPlayfields.Value)
+                foreach (var nested in nestedPlayfields)
                     nested.PastLifetimeExtension = value;
             }
         }
@@ -479,10 +465,7 @@ namespace osu.Game.Rulesets.UI
             {
                 HitObjectContainer.FutureLifetimeExtension = value;
 
-                if (!nestedPlayfields.IsValueCreated)
-                    return;
-
-                foreach (var nested in nestedPlayfields.Value)
+                foreach (var nested in nestedPlayfields)
                     nested.FutureLifetimeExtension = value;
             }
         }

From 153ee2551048cbbd25bf1c83856adb3adaa154f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 18:42:07 +0900
Subject: [PATCH 09139/10326] Update base specifications to a more sane default

---
 .../Timelines/Summary/Visualisations/PointVisualisation.cs    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
index d647c6bfe8..a4b6b0c392 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
@@ -21,9 +21,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
 
         public PointVisualisation()
         {
-            Origin = Anchor.TopCentre;
-
-            RelativePositionAxes = Axes.X;
+            RelativePositionAxes = Axes.Both;
             RelativeSizeAxes = Axes.Y;
 
             Anchor = Anchor.CentreLeft;

From 0dc1577f6804a0b7c3863abfe3db39411ab2b980 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 18:42:30 +0900
Subject: [PATCH 09140/10326] Split out control point visualisation logic and
 add special kiai duration handling

---
 .../Parts/ControlPointVisualisation.cs        | 30 ++++++++
 .../Summary/Parts/EffectPointVisualisation.cs | 72 +++++++++++++++++++
 .../Summary/Parts/GroupVisualisation.cs       | 51 +++++++++----
 .../Timelines/Summary/SummaryTimeline.cs      |  1 +
 4 files changed, 140 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointVisualisation.cs
 create mode 100644 osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/EffectPointVisualisation.cs

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointVisualisation.cs
new file mode 100644
index 0000000000..a8e41d220a
--- /dev/null
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointVisualisation.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
+
+namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
+{
+    public class ControlPointVisualisation : PointVisualisation
+    {
+        protected readonly ControlPoint Point;
+
+        public ControlPointVisualisation(ControlPoint point)
+        {
+            Point = point;
+
+            Height = 0.25f;
+            Origin = Anchor.TopCentre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Colour = Point.GetRepresentingColour(colours);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/EffectPointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/EffectPointVisualisation.cs
new file mode 100644
index 0000000000..801372305b
--- /dev/null
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/EffectPointVisualisation.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 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.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
+
+namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
+{
+    public class EffectPointVisualisation : CompositeDrawable
+    {
+        private readonly EffectControlPoint effect;
+        private Bindable<bool> kiai;
+
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public EffectPointVisualisation(EffectControlPoint point)
+        {
+            RelativePositionAxes = Axes.Both;
+            RelativeSizeAxes = Axes.Y;
+
+            effect = point;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            kiai = effect.KiaiModeBindable.GetBoundCopy();
+            kiai.BindValueChanged(_ =>
+            {
+                ClearInternal();
+
+                AddInternal(new ControlPointVisualisation(effect));
+
+                if (!kiai.Value)
+                    return;
+
+                var endControlPoint = beatmap.ControlPointInfo.EffectPoints.FirstOrDefault(c => c.Time > effect.Time && !c.KiaiMode);
+
+                // handle kiai duration
+                // eventually this will be simpler when we have control points with durations.
+                if (endControlPoint != null)
+                {
+                    RelativeSizeAxes = Axes.Both;
+                    Origin = Anchor.TopLeft;
+
+                    Width = (float)(endControlPoint.Time - effect.Time);
+
+                    AddInternal(new PointVisualisation
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Origin = Anchor.TopLeft,
+                        Width = 1,
+                        Height = 0.25f,
+                        Depth = float.MaxValue,
+                        Colour = effect.GetRepresentingColour(colours).Darken(0.5f),
+                    });
+                }
+            }, true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
index 8bc8618479..4629f9b540 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
@@ -1,29 +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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
-using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 {
-    public class GroupVisualisation : PointVisualisation
+    public class GroupVisualisation : CompositeDrawable
     {
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         public readonly ControlPointGroup Group;
 
         private readonly IBindableList<ControlPoint> controlPoints = new BindableList<ControlPoint>();
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         public GroupVisualisation(ControlPointGroup group)
-            : base(group.Time)
         {
+            RelativePositionAxes = Axes.X;
+
+            RelativeSizeAxes = Axes.Both;
+            Origin = Anchor.TopLeft;
+
             Group = group;
+            X = (float)group.Time;
         }
 
         protected override void LoadComplete()
@@ -33,13 +37,32 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
             controlPoints.BindTo(Group.ControlPoints);
             controlPoints.BindCollectionChanged((_, __) =>
             {
-                if (controlPoints.Count == 0)
-                {
-                    Colour = Color4.Transparent;
-                    return;
-                }
+                ClearInternal();
 
-                Colour = Group.ControlPoints.First().GetRepresentingColour(colours);
+                if (controlPoints.Count == 0)
+                    return;
+
+                foreach (var point in Group.ControlPoints)
+                {
+                    switch (point)
+                    {
+                        case TimingControlPoint _:
+                            AddInternal(new ControlPointVisualisation(point) { Y = 0, });
+                            break;
+
+                        case DifficultyControlPoint _:
+                            AddInternal(new ControlPointVisualisation(point) { Y = 0.25f, });
+                            break;
+
+                        case SampleControlPoint _:
+                            AddInternal(new ControlPointVisualisation(point) { Y = 0.5f, });
+                            break;
+
+                        case EffectControlPoint effect:
+                            AddInternal(new EffectPointVisualisation(effect) { Y = 0.75f });
+                            break;
+                    }
+                }
             }, true);
         }
     }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
index ae60cd4dd3..e90ae411de 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                     Anchor = Anchor.Centre,
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Both,
+                    Y = -10,
                     Height = 0.35f
                 },
                 new BookmarkPart

From 17e021c549f424e9151eefe2351395925e08d365 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 18:45:52 +0900
Subject: [PATCH 09141/10326] 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 b5315c3616..32e236ccd5 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.413.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.415.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 45b3d5c161..954cf511b6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.413.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.415.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 105a6e59c2..09f6033bfe 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.Framework.iOS" Version="2021.413.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.415.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.413.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.415.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From fe3ba2b80ee1ad0034217ec1693646a6f5d31d95 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:07:25 +0900
Subject: [PATCH 09142/10326] Implement IAdjustableClock on
 GameplayClockContainer

---
 .../Screens/Play/GameplayClockContainer.cs    | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6d863f0094..bbffdc2325 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -9,7 +10,7 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.Play
 {
-    public abstract class GameplayClockContainer : Container
+    public abstract class GameplayClockContainer : Container, IAdjustableClock
     {
         /// <summary>
         /// The final clock which is exposed to underlying components.
@@ -90,5 +91,37 @@ namespace osu.Game.Screens.Play
         protected virtual IFrameBasedClock ClockToProcess => AdjustableClock;
 
         protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
+
+        #region IAdjustableClock
+
+        bool IAdjustableClock.Seek(double position)
+        {
+            Seek(position);
+            return true;
+        }
+
+        void IAdjustableClock.Reset()
+        {
+            Restart();
+            Stop();
+        }
+
+        public void ResetSpeedAdjustments()
+        {
+        }
+
+        double IAdjustableClock.Rate
+        {
+            get => GameplayClock.Rate;
+            set => throw new NotSupportedException();
+        }
+
+        double IClock.Rate => GameplayClock.Rate;
+
+        public double CurrentTime => GameplayClock.CurrentTime;
+
+        public bool IsRunning => GameplayClock.IsRunning;
+
+        #endregion
     }
 }

From 1705d472b5ff9a6194e0b18ddae14f01c1b91286 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:12:52 +0900
Subject: [PATCH 09143/10326] Reimplement multiplayer syncing using new
 master/slave clocks

---
 .../TestSceneMultiplayerSpectator.cs          |  30 +----
 .../Spectate/MultiplayerSlaveClock.cs         |  78 +++++++++++++
 .../Spectate/MultiplayerSpectator.cs          |  86 +++------------
 .../Spectate/MultiplayerSpectatorPlayer.cs    |   9 +-
 .../Spectate/MultiplayerSyncManager.cs        |   5 -
 .../Multiplayer/Spectate/PlayerInstance.cs    | 103 +-----------------
 6 files changed, 104 insertions(+), 207 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 1ac012c0b5..ab6324df2d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.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 System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 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.Testing;
 using osu.Framework.Utils;
@@ -156,27 +153,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkPausedInstant(55, false);
         }
 
-        [Test]
-        public void TestPlayerStartsCatchingUpOnlyAfterExceedingMaxOffset()
-        {
-            start(new[] { 55, 56 });
-            loadSpectateScreen();
-
-            sendFrames(55, 1000);
-            sendFrames(56, 1000);
-
-            Bindable<double> slowDownAdjustment;
-
-            AddStep("slow down player 2", () =>
-            {
-                slowDownAdjustment = new Bindable<double>(0.99);
-                getInstance(56).Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, slowDownAdjustment);
-            });
-
-            AddUntilStep("exceeded min offset but not catching up", () => getGameplayOffset(55, 56) > PlayerInstance.MAX_OFFSET && !getInstance(56).IsCatchingUp);
-            AddUntilStep("catching up or caught up", () => getInstance(56).IsCatchingUp || Math.Abs(getGameplayOffset(55, 56)) < PlayerInstance.SYNC_TARGET * 2);
-        }
-
         [Test]
         public void TestPlayersCatchUpAfterFallingBehind()
         {
@@ -184,7 +160,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             loadSpectateScreen();
 
             // Send initial frames for both players. A few more for player 1.
-            sendFrames(55, 100);
+            sendFrames(55, 1000);
             sendFrames(56, 10);
             checkPausedInstant(55, false);
             checkPausedInstant(56, false);
@@ -194,11 +170,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddWaitStep("wait a few more frames", 10);
 
             // Send more frames for player 2. It should unpause.
-            sendFrames(56, 100);
+            sendFrames(56, 1000);
             checkPausedInstant(56, false);
 
             // Player 2 should catch up to player 1 after unpausing.
-            AddUntilStep("player 2 not catching up", () => !getInstance(56).IsCatchingUp);
+            AddUntilStep("player 2 not catching up", () => !getInstance(56).GameplayClock.IsCatchingUp);
             AddWaitStep("wait a bit", 10);
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs
new file mode 100644
index 0000000000..84a87271a2
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs
@@ -0,0 +1,78 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Bindables;
+using osu.Framework.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSlaveClock : IFrameBasedClock, IMultiplayerSlaveClock
+    {
+        /// <summary>
+        /// The catchup rate.
+        /// </summary>
+        public const double CATCHUP_RATE = 2;
+
+        private readonly IFrameBasedClock masterClock;
+
+        public MultiplayerSlaveClock(IFrameBasedClock masterClock)
+        {
+            this.masterClock = masterClock;
+        }
+
+        public double CurrentTime { get; private set; }
+
+        public bool IsRunning { get; private set; }
+
+        public void Reset() => CurrentTime = 0;
+
+        public void Start() => IsRunning = true;
+
+        public void Stop() => IsRunning = false;
+
+        public bool Seek(double position) => true;
+
+        public void ResetSpeedAdjustments()
+        {
+        }
+
+        public double Rate => IsCatchingUp ? CATCHUP_RATE : 1;
+
+        double IAdjustableClock.Rate
+        {
+            get => Rate;
+            set => throw new NotSupportedException();
+        }
+
+        double IClock.Rate => Rate;
+
+        public void ProcessFrame()
+        {
+            masterClock.ProcessFrame();
+
+            ElapsedFrameTime = 0;
+            FramesPerSecond = 0;
+
+            if (IsRunning)
+            {
+                double elapsedSource = masterClock.ElapsedFrameTime;
+                double elapsed = elapsedSource * Rate;
+
+                CurrentTime += elapsed;
+                ElapsedFrameTime = elapsed;
+                FramesPerSecond = masterClock.FramesPerSecond;
+            }
+        }
+
+        public double ElapsedFrameTime { get; private set; }
+
+        public double FramesPerSecond { get; private set; }
+
+        public FrameTimeInfo TimeInfo => new FrameTimeInfo { Elapsed = ElapsedFrameTime, Current = CurrentTime };
+
+        public IBindable<bool> WaitingOnFrames { get; } = new Bindable<bool>();
+
+        public bool IsCatchingUp { get; set; }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 931d13942b..be5a8cf8c0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -2,14 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
-using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
@@ -18,9 +14,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectator : SpectatorScreen
     {
-        private const double min_duration_to_allow_playback = 50;
-        private const double maximum_start_delay = 15000;
-
         // Isolates beatmap/ruleset to this screen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
@@ -30,10 +23,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private SpectatorStreamingClient spectatorClient { get; set; }
 
         private readonly PlayerInstance[] instances;
-        private GameplayClockContainer gameplayClockContainer;
+        private MasterGameplayClockContainer masterClockContainer;
+        private IMultiplayerSyncManager syncManager;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
-        private double? loadFinishTime;
 
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
@@ -46,7 +39,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
             Container leaderboardContainer;
 
-            InternalChild = gameplayClockContainer = new MasterGameplayClockContainer(Beatmap.Value, 0)
+            masterClockContainer = new MasterGameplayClockContainer(Beatmap.Value, 0)
             {
                 Child = new GridContainer
                 {
@@ -70,6 +63,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 }
             };
 
+            InternalChildren = new[]
+            {
+                (Drawable)(syncManager = new MultiplayerSyncManager(masterClockContainer)),
+                masterClockContainer
+            };
+
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
@@ -78,65 +77,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
-        protected override void UpdateAfterChildren()
+        protected override void LoadComplete()
         {
-            base.UpdateAfterChildren();
+            base.LoadComplete();
 
-            if (AllPlayersLoaded)
-                loadFinishTime ??= Time.Current;
-
-            updateGameplayPlayingState();
-        }
-
-        private bool canStartGameplay =>
-            // All players must be loaded, and...
-            AllPlayersLoaded
-            && (
-                // All players have frames...
-                instances.All(i => i.Score.Replay.Frames.Count > 0)
-                // Or any player has frames and the maximum start delay has been exceeded.
-                || (Time.Current - loadFinishTime > maximum_start_delay
-                    && instances.Any(i => i.Score.Replay.Frames.Count > 0))
-            );
-
-        private bool firstStartFrame = true;
-
-        private void updateGameplayPlayingState()
-        {
-            // Make sure all players are loaded and have frames before starting any.
-            if (!canStartGameplay)
-            {
-                foreach (var inst in instances)
-                    inst?.PauseGameplay();
-                return;
-            }
-
-            if (firstStartFrame)
-                gameplayClockContainer.Restart();
-
-            // Not all instances may be in a valid gameplay state (see canStartGameplay). Only control the ones that are.
-            IEnumerable<PlayerInstance> validInstances = instances.Where(i => i.Score.Replay.Frames.Count > 0);
-
-            double targetGameplayTime = gameplayClockContainer.GameplayClock.CurrentTime;
-
-            var instanceTimes = string.Join(',', validInstances.Select(i => $" {i.User.Id}: {(int)i.GetCurrentGameplayTime()}"));
-            Logger.Log($"target: {(int)targetGameplayTime},{instanceTimes}");
-
-            foreach (var inst in validInstances)
-            {
-                Debug.Assert(inst != null);
-
-                double lastFrameTime = inst.Score.Replay.Frames.Select(f => f.Time).Last();
-                double currentTime = inst.GetCurrentGameplayTime();
-
-                bool canContinuePlayback = Precision.DefinitelyBigger(lastFrameTime, currentTime, min_duration_to_allow_playback);
-                if (!canContinuePlayback)
-                    continue;
-
-                inst.ContinueGameplay(targetGameplayTime);
-            }
-
-            firstStartFrame = false;
+            masterClockContainer.Stop();
+            masterClockContainer.Restart();
         }
 
         protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
@@ -151,15 +97,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             if (existingInstance != null)
             {
                 grid.Remove(existingInstance);
+                syncManager.RemoveSlave(existingInstance.GameplayClock);
                 leaderboard.RemoveClock(existingInstance.User.Id);
             }
 
-            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, gameplayClockContainer.GameplayClock), d =>
+            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new MultiplayerSlaveClock(masterClockContainer.GameplayClock)), d =>
             {
                 if (instances[userIndex] == d)
                 {
                     grid.Add(d);
-                    leaderboard.AddClock(d.User.Id, d.Beatmap.Track);
+                    syncManager.AddSlave(d.GameplayClock);
+                    leaderboard.AddClock(d.User.Id, d.GameplayClock);
                 }
             });
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index abb7ec83d8..c82c407c2c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 
@@ -12,13 +11,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+        private readonly MultiplayerSlaveClock gameplayClock;
 
-        public new SubGameplayClockContainer GameplayClockContainer => (SubGameplayClockContainer)base.GameplayClockContainer;
-
-        private readonly GameplayClock gameplayClock;
-
-        public MultiplayerSpectatorPlayer(Score score, GameplayClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, MultiplayerSlaveClock gameplayClock)
             : base(score)
         {
             this.gameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
index 42f6536e90..8cbfa823cf 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
@@ -26,11 +26,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// </summary>
         public const double MAXIMUM_START_DELAY = 15000;
 
-        /// <summary>
-        /// The catchup rate.
-        /// </summary>
-        public const double CATCHUP_RATE = 2;
-
         /// <summary>
         /// The master clock which is used to control the timing of all slave clocks.
         /// </summary>
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 724a685cb7..631ac2d52e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -14,21 +13,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class PlayerInstance : CompositeDrawable
     {
-        /// <summary>
-        /// The rate at which a user catches up after becoming desynchronised.
-        /// </summary>
-        private const double catchup_rate = 2;
-
-        /// <summary>
-        /// The offset from the expected time at which to START synchronisation.
-        /// </summary>
-        public const double MAX_OFFSET = 50;
-
-        /// <summary>
-        /// The maximum offset from the expected time at which to STOP synchronisation.
-        /// </summary>
-        public const double SYNC_TARGET = 16;
-
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
         public User User => Score.ScoreInfo.User;
@@ -36,17 +20,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public WorkingBeatmap Beatmap { get; private set; }
 
         public readonly Score Score;
-        private readonly GameplayClock gameplayClock;
-
-        public bool IsCatchingUp { get; private set; }
+        public readonly MultiplayerSlaveClock GameplayClock;
 
         private OsuScreenStack stack;
-        private MultiplayerSpectatorPlayer player;
 
-        public PlayerInstance(Score score, GameplayClock gameplayClock)
+        public PlayerInstance(Score score, MultiplayerSlaveClock gameplayClock)
         {
             Score = score;
-            this.gameplayClock = gameplayClock;
+            GameplayClock = gameplayClock;
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
@@ -67,83 +48,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 }
             };
 
-            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => player = new MultiplayerSpectatorPlayer(Score, gameplayClock)));
-        }
-
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-            updateCatchup();
-        }
-
-        private double targetGameplayTime;
-
-        private void updateCatchup()
-        {
-            if (player?.IsLoaded != true)
-                return;
-
-            if (Score.Replay.Frames.Count == 0)
-                return;
-
-            if (player.GameplayClockContainer.IsPaused.Value)
-                return;
-
-            double currentTime = Beatmap.Track.CurrentTime;
-            double timeBehind = targetGameplayTime - currentTime;
-
-            double offsetForCatchup = IsCatchingUp ? SYNC_TARGET : MAX_OFFSET;
-            bool catchupRequired = timeBehind > offsetForCatchup;
-
-            // Skip catchup if no work needs to be done.
-            if (catchupRequired == IsCatchingUp)
-                return;
-
-            if (catchupRequired)
-            {
-                // player.GameplayClockContainer.AdjustableClock.Rate = catchup_rate;
-                Logger.Log($"{User.Id} catchup started (behind: {(int)timeBehind})");
-            }
-            else
-            {
-                // player.GameplayClockContainer.AdjustableClock.Rate = 1;
-                Logger.Log($"{User.Id} catchup finished (behind: {(int)timeBehind})");
-            }
-
-            IsCatchingUp = catchupRequired;
-        }
-
-        public double GetCurrentGameplayTime()
-        {
-            if (player?.IsLoaded != true)
-                return 0;
-
-            return player.GameplayClockContainer.GameplayClock.CurrentTime;
-        }
-
-        public bool IsPlaying()
-        {
-            if (player.IsLoaded != true)
-                return false;
-
-            return player.GameplayClockContainer.GameplayClock.IsRunning;
-        }
-
-        public void ContinueGameplay(double targetGameplayTime)
-        {
-            if (player?.IsLoaded != true)
-                return;
-
-            player.GameplayClockContainer.Start();
-            this.targetGameplayTime = targetGameplayTime;
-        }
-
-        public void PauseGameplay()
-        {
-            if (player?.IsLoaded != true)
-                return;
-
-            player.GameplayClockContainer.Stop();
+            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => new MultiplayerSpectatorPlayer(Score, GameplayClock)));
         }
 
         // Player interferes with global input, so disable input for now.

From df4fce2c570b885176cb70f1f2232610ad2a7848 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:16:00 +0900
Subject: [PATCH 09144/10326] Rename classes

---
 ...s => MultiplayerCatchupSyncManagerTest.cs} | 50 +++++++++----------
 ....cs => IMultiplayerSpectatorSlaveClock.cs} |  2 +-
 ...cs => IMultiplayerSpectatorSyncManager.cs} |  6 +--
 ...er.cs => MultiplayerCatchupSyncManager.cs} | 10 ++--
 .../Spectate/MultiplayerSpectator.cs          |  6 +--
 .../Spectate/MultiplayerSpectatorPlayer.cs    |  4 +-
 ...k.cs => MultiplayerSpectatorSlaveClock.cs} |  4 +-
 .../Multiplayer/Spectate/PlayerInstance.cs    |  4 +-
 8 files changed, 43 insertions(+), 43 deletions(-)
 rename osu.Game.Tests/OnlinePlay/{MultiplayerSyncManagerTest.cs => MultiplayerCatchupSyncManagerTest.cs} (70%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{IMultiplayerSlaveClock.cs => IMultiplayerSpectatorSlaveClock.cs} (83%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{IMultiplayerSyncManager.cs => IMultiplayerSpectatorSyncManager.cs} (62%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSyncManager.cs => MultiplayerCatchupSyncManager.cs} (91%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSlaveClock.cs => MultiplayerSpectatorSlaveClock.cs} (91%)

diff --git a/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs b/osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs
similarity index 70%
rename from osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
rename to osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs
index 6ee867c6f8..f15fb5cfd1 100644
--- a/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
+++ b/osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs
@@ -12,22 +12,22 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.OnlinePlay
 {
     [HeadlessTest]
-    public class MultiplayerSyncManagerTest : OsuTestScene
+    public class MultiplayerCatchupSyncManagerTest : OsuTestScene
     {
         private TestManualClock master;
-        private MultiplayerSyncManager syncManager;
+        private MultiplayerCatchupSyncManager catchupSyncManager;
 
-        private TestSlaveClock slave1;
-        private TestSlaveClock slave2;
+        private TestSpectatorSlaveClock slave1;
+        private TestSpectatorSlaveClock slave2;
 
         [SetUp]
         public void Setup()
         {
-            syncManager = new MultiplayerSyncManager(master = new TestManualClock());
-            syncManager.AddSlave(slave1 = new TestSlaveClock(1));
-            syncManager.AddSlave(slave2 = new TestSlaveClock(2));
+            catchupSyncManager = new MultiplayerCatchupSyncManager(master = new TestManualClock());
+            catchupSyncManager.AddSlave(slave1 = new TestSpectatorSlaveClock(1));
+            catchupSyncManager.AddSlave(slave2 = new TestSpectatorSlaveClock(2));
 
-            Schedule(() => Child = syncManager);
+            Schedule(() => Child = catchupSyncManager);
         }
 
         [Test]
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.OnlinePlay
         [Test]
         public void TestMasterClockDoesNotStartWhenNoneReadyForMaximumDelayTime()
         {
-            AddWaitStep($"wait {MultiplayerSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(false);
         }
 
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.OnlinePlay
         public void TestMasterClockStartsWhenAnyReadyForMaximumDelayTime()
         {
             setWaiting(() => slave1, false);
-            AddWaitStep($"wait {MultiplayerSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(true);
         }
 
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerSyncManager.SYNC_TARGET + 1);
+            setMasterTime(MultiplayerCatchupSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, false);
         }
 
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 1);
+            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 1);
             assertCatchingUp(() => slave1, true);
             assertCatchingUp(() => slave2, true);
         }
@@ -83,8 +83,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 1);
-            setSlaveTime(() => slave1, MultiplayerSyncManager.SYNC_TARGET + 1);
+            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 1);
+            setSlaveTime(() => slave1, MultiplayerCatchupSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, true);
         }
 
@@ -93,8 +93,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 2);
-            setSlaveTime(() => slave1, MultiplayerSyncManager.SYNC_TARGET);
+            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 2);
+            setSlaveTime(() => slave1, MultiplayerCatchupSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertCatchingUp(() => slave2, true);
         }
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -MultiplayerSyncManager.SYNC_TARGET);
+            setSlaveTime(() => slave1, -MultiplayerCatchupSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertSlaveState(() => slave1, true);
         }
@@ -114,7 +114,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -MultiplayerSyncManager.SYNC_TARGET - 1);
+            setSlaveTime(() => slave1, -MultiplayerCatchupSyncManager.SYNC_TARGET - 1);
 
             // This is a silent catchup, where IsCatchingUp = false but IsRunning = false also.
             assertCatchingUp(() => slave1, false);
@@ -135,7 +135,7 @@ namespace osu.Game.Tests.OnlinePlay
             assertSlaveState(() => slave1, false);
         }
 
-        private void setWaiting(Func<TestSlaveClock> slave, bool waiting)
+        private void setWaiting(Func<TestSpectatorSlaveClock> slave, bool waiting)
             => AddStep($"set slave {slave().Id} waiting = {waiting}", () => slave().WaitingOnFrames.Value = waiting);
 
         private void setAllWaiting(bool waiting) => AddStep($"set all slaves waiting = {waiting}", () =>
@@ -150,28 +150,28 @@ namespace osu.Game.Tests.OnlinePlay
         /// <summary>
         /// slave.Time = master.Time - offsetFromMaster
         /// </summary>
-        private void setSlaveTime(Func<TestSlaveClock> slave, double offsetFromMaster)
+        private void setSlaveTime(Func<TestSpectatorSlaveClock> slave, double offsetFromMaster)
             => AddStep($"set slave {slave().Id} = master - {offsetFromMaster}", () => slave().Seek(master.CurrentTime - offsetFromMaster));
 
         private void assertMasterState(bool running)
             => AddAssert($"master clock {(running ? "is" : "is not")} running", () => master.IsRunning == running);
 
-        private void assertCatchingUp(Func<TestSlaveClock> slave, bool catchingUp) =>
+        private void assertCatchingUp(Func<TestSpectatorSlaveClock> slave, bool catchingUp) =>
             AddAssert($"slave {slave().Id} {(catchingUp ? "is" : "is not")} catching up", () => slave().IsCatchingUp == catchingUp);
 
-        private void assertSlaveState(Func<TestSlaveClock> slave, bool running)
+        private void assertSlaveState(Func<TestSpectatorSlaveClock> slave, bool running)
             => AddAssert($"slave {slave().Id} {(running ? "is" : "is not")} running", () => slave().IsRunning == running);
 
-        private class TestSlaveClock : TestManualClock, IMultiplayerSlaveClock
+        private class TestSpectatorSlaveClock : TestManualClock, IMultiplayerSpectatorSlaveClock
         {
             public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
-            IBindable<bool> IMultiplayerSlaveClock.WaitingOnFrames => WaitingOnFrames;
+            IBindable<bool> IMultiplayerSpectatorSlaveClock.WaitingOnFrames => WaitingOnFrames;
 
             public bool IsCatchingUp { get; set; }
 
             public readonly int Id;
 
-            public TestSlaveClock(int id)
+            public TestSpectatorSlaveClock(int id)
             {
                 Id = id;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs
similarity index 83%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs
index e90eed68ab..fe2c2dfec9 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs
@@ -6,7 +6,7 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public interface IMultiplayerSlaveClock : IAdjustableClock
+    public interface IMultiplayerSpectatorSlaveClock : IAdjustableClock
     {
         IBindable<bool> WaitingOnFrames { get; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs
similarity index 62%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs
index 2c50596823..5643bde68f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs
@@ -5,12 +5,12 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public interface IMultiplayerSyncManager
+    public interface IMultiplayerSpectatorSyncManager
     {
         IAdjustableClock Master { get; }
 
-        void AddSlave(IMultiplayerSlaveClock clock);
+        void AddSlave(IMultiplayerSpectatorSlaveClock clock);
 
-        void RemoveSlave(IMultiplayerSlaveClock clock);
+        void RemoveSlave(IMultiplayerSpectatorSlaveClock clock);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs
similarity index 91%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs
index 8cbfa823cf..873f34626d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs
@@ -9,7 +9,7 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSyncManager : Component, IMultiplayerSyncManager
+    public class MultiplayerCatchupSyncManager : Component, IMultiplayerSpectatorSyncManager
     {
         /// <summary>
         /// The offset from the master clock to which slaves should be synchronised to.
@@ -34,19 +34,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// <summary>
         /// The slave clocks.
         /// </summary>
-        private readonly List<IMultiplayerSlaveClock> slaves = new List<IMultiplayerSlaveClock>();
+        private readonly List<IMultiplayerSpectatorSlaveClock> slaves = new List<IMultiplayerSpectatorSlaveClock>();
 
         private bool hasStarted;
         private double? firstStartAttemptTime;
 
-        public MultiplayerSyncManager(IAdjustableClock master)
+        public MultiplayerCatchupSyncManager(IAdjustableClock master)
         {
             Master = master;
         }
 
-        public void AddSlave(IMultiplayerSlaveClock clock) => slaves.Add(clock);
+        public void AddSlave(IMultiplayerSpectatorSlaveClock clock) => slaves.Add(clock);
 
-        public void RemoveSlave(IMultiplayerSlaveClock clock) => slaves.Remove(clock);
+        public void RemoveSlave(IMultiplayerSpectatorSlaveClock clock) => slaves.Remove(clock);
 
         protected override void Update()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index be5a8cf8c0..3dade4d32c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly PlayerInstance[] instances;
         private MasterGameplayClockContainer masterClockContainer;
-        private IMultiplayerSyncManager syncManager;
+        private IMultiplayerSpectatorSyncManager syncManager;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
 
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             InternalChildren = new[]
             {
-                (Drawable)(syncManager = new MultiplayerSyncManager(masterClockContainer)),
+                (Drawable)(syncManager = new MultiplayerCatchupSyncManager(masterClockContainer)),
                 masterClockContainer
             };
 
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 leaderboard.RemoveClock(existingInstance.User.Id);
             }
 
-            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new MultiplayerSlaveClock(masterClockContainer.GameplayClock)), d =>
+            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new MultiplayerSpectatorSlaveClock(masterClockContainer.GameplayClock)), d =>
             {
                 if (instances[userIndex] == d)
                 {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index c82c407c2c..7fe1416224 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -11,9 +11,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        private readonly MultiplayerSlaveClock gameplayClock;
+        private readonly MultiplayerSpectatorSlaveClock gameplayClock;
 
-        public MultiplayerSpectatorPlayer(Score score, MultiplayerSlaveClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, MultiplayerSpectatorSlaveClock gameplayClock)
             : base(score)
         {
             this.gameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs
similarity index 91%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs
index 84a87271a2..6960d24295 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs
@@ -7,7 +7,7 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSlaveClock : IFrameBasedClock, IMultiplayerSlaveClock
+    public class MultiplayerSpectatorSlaveClock : IFrameBasedClock, IMultiplayerSpectatorSlaveClock
     {
         /// <summary>
         /// The catchup rate.
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly IFrameBasedClock masterClock;
 
-        public MultiplayerSlaveClock(IFrameBasedClock masterClock)
+        public MultiplayerSpectatorSlaveClock(IFrameBasedClock masterClock)
         {
             this.masterClock = masterClock;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 631ac2d52e..384c1f1f2b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -20,11 +20,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public WorkingBeatmap Beatmap { get; private set; }
 
         public readonly Score Score;
-        public readonly MultiplayerSlaveClock GameplayClock;
+        public readonly MultiplayerSpectatorSlaveClock GameplayClock;
 
         private OsuScreenStack stack;
 
-        public PlayerInstance(Score score, MultiplayerSlaveClock gameplayClock)
+        public PlayerInstance(Score score, MultiplayerSpectatorSlaveClock gameplayClock)
         {
             Score = score;
             GameplayClock = gameplayClock;

From 82fcabb8f0d94b083b25306d1647c1925c598f5c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:32:55 +0900
Subject: [PATCH 09145/10326] More refactorings/renamespacings/xmldocs

---
 ...s => MultiplayerCatchUpSyncManagerTest.cs} | 48 +++++++++++--------
 .../IMultiplayerSpectatorSlaveClock.cs        | 15 ------
 .../IMultiplayerSpectatorSyncManager.cs       | 16 -------
 .../Spectate/MultiplayerSpectator.cs          |  7 +--
 .../Spectate/MultiplayerSpectatorPlayer.cs    |  5 +-
 .../Multiplayer/Spectate/PlayerInstance.cs    |  5 +-
 .../Spectate/Sync/ISpectatorSlaveClock.cs     | 24 ++++++++++
 .../Spectate/Sync/ISpectatorSyncManager.cs    | 30 ++++++++++++
 .../SpectatorCatchUpSlaveClock.cs}            |  6 +--
 .../SpectatorCatchUpSyncManager.cs}           | 15 +++---
 10 files changed, 105 insertions(+), 66 deletions(-)
 rename osu.Game.Tests/OnlinePlay/{MultiplayerCatchupSyncManagerTest.cs => MultiplayerCatchUpSyncManagerTest.cs} (76%)
 delete mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs
 delete mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSpectatorSlaveClock.cs => Sync/SpectatorCatchUpSlaveClock.cs} (89%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerCatchupSyncManager.cs => Sync/SpectatorCatchUpSyncManager.cs} (88%)

diff --git a/osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs b/osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs
similarity index 76%
rename from osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs
rename to osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs
index f15fb5cfd1..6aa1219d53 100644
--- a/osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs
+++ b/osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs
@@ -6,16 +6,16 @@ using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.OnlinePlay
 {
     [HeadlessTest]
-    public class MultiplayerCatchupSyncManagerTest : OsuTestScene
+    public class MultiplayerCatchUpSyncManagerTest : OsuTestScene
     {
         private TestManualClock master;
-        private MultiplayerCatchupSyncManager catchupSyncManager;
+        private SpectatorCatchUpSyncManager syncManager;
 
         private TestSpectatorSlaveClock slave1;
         private TestSpectatorSlaveClock slave2;
@@ -23,11 +23,11 @@ namespace osu.Game.Tests.OnlinePlay
         [SetUp]
         public void Setup()
         {
-            catchupSyncManager = new MultiplayerCatchupSyncManager(master = new TestManualClock());
-            catchupSyncManager.AddSlave(slave1 = new TestSpectatorSlaveClock(1));
-            catchupSyncManager.AddSlave(slave2 = new TestSpectatorSlaveClock(2));
+            syncManager = new SpectatorCatchUpSyncManager(master = new TestManualClock());
+            syncManager.AddSlave(slave1 = new TestSpectatorSlaveClock(1));
+            syncManager.AddSlave(slave2 = new TestSpectatorSlaveClock(2));
 
-            Schedule(() => Child = catchupSyncManager);
+            Schedule(() => Child = syncManager);
         }
 
         [Test]
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.OnlinePlay
         [Test]
         public void TestMasterClockDoesNotStartWhenNoneReadyForMaximumDelayTime()
         {
-            AddWaitStep($"wait {MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(false);
         }
 
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.OnlinePlay
         public void TestMasterClockStartsWhenAnyReadyForMaximumDelayTime()
         {
             setWaiting(() => slave1, false);
-            AddWaitStep($"wait {MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(true);
         }
 
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerCatchupSyncManager.SYNC_TARGET + 1);
+            setMasterTime(SpectatorCatchUpSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, false);
         }
 
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 1);
+            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 1);
             assertCatchingUp(() => slave1, true);
             assertCatchingUp(() => slave2, true);
         }
@@ -83,8 +83,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 1);
-            setSlaveTime(() => slave1, MultiplayerCatchupSyncManager.SYNC_TARGET + 1);
+            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 1);
+            setSlaveTime(() => slave1, SpectatorCatchUpSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, true);
         }
 
@@ -93,8 +93,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 2);
-            setSlaveTime(() => slave1, MultiplayerCatchupSyncManager.SYNC_TARGET);
+            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 2);
+            setSlaveTime(() => slave1, SpectatorCatchUpSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertCatchingUp(() => slave2, true);
         }
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -MultiplayerCatchupSyncManager.SYNC_TARGET);
+            setSlaveTime(() => slave1, -SpectatorCatchUpSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertSlaveState(() => slave1, true);
         }
@@ -114,7 +114,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -MultiplayerCatchupSyncManager.SYNC_TARGET - 1);
+            setSlaveTime(() => slave1, -SpectatorCatchUpSyncManager.SYNC_TARGET - 1);
 
             // This is a silent catchup, where IsCatchingUp = false but IsRunning = false also.
             assertCatchingUp(() => slave1, false);
@@ -162,10 +162,10 @@ namespace osu.Game.Tests.OnlinePlay
         private void assertSlaveState(Func<TestSpectatorSlaveClock> slave, bool running)
             => AddAssert($"slave {slave().Id} {(running ? "is" : "is not")} running", () => slave().IsRunning == running);
 
-        private class TestSpectatorSlaveClock : TestManualClock, IMultiplayerSpectatorSlaveClock
+        private class TestSpectatorSlaveClock : TestManualClock, ISpectatorSlaveClock
         {
             public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
-            IBindable<bool> IMultiplayerSpectatorSlaveClock.WaitingOnFrames => WaitingOnFrames;
+            IBindable<bool> ISpectatorSlaveClock.WaitingOnFrames => WaitingOnFrames;
 
             public bool IsCatchingUp { get; set; }
 
@@ -183,6 +183,16 @@ namespace osu.Game.Tests.OnlinePlay
                         Start();
                 });
             }
+
+            public void ProcessFrame()
+            {
+            }
+
+            public double ElapsedFrameTime => 0;
+
+            public double FramesPerSecond => 0;
+
+            public FrameTimeInfo TimeInfo => default;
         }
 
         private class TestManualClock : ManualClock, IAdjustableClock
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs
deleted file mode 100644
index fe2c2dfec9..0000000000
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs
+++ /dev/null
@@ -1,15 +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.Timing;
-
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
-{
-    public interface IMultiplayerSpectatorSlaveClock : IAdjustableClock
-    {
-        IBindable<bool> WaitingOnFrames { get; }
-
-        bool IsCatchingUp { get; set; }
-    }
-}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs
deleted file mode 100644
index 5643bde68f..0000000000
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.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.Timing;
-
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
-{
-    public interface IMultiplayerSpectatorSyncManager
-    {
-        IAdjustableClock Master { get; }
-
-        void AddSlave(IMultiplayerSpectatorSlaveClock clock);
-
-        void RemoveSlave(IMultiplayerSpectatorSlaveClock clock);
-    }
-}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 3dade4d32c..441839b401 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Spectator;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
 
@@ -24,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly PlayerInstance[] instances;
         private MasterGameplayClockContainer masterClockContainer;
-        private IMultiplayerSpectatorSyncManager syncManager;
+        private ISpectatorSyncManager syncManager;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
 
@@ -65,7 +66,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             InternalChildren = new[]
             {
-                (Drawable)(syncManager = new MultiplayerCatchupSyncManager(masterClockContainer)),
+                (Drawable)(syncManager = new SpectatorCatchUpSyncManager(masterClockContainer)),
                 masterClockContainer
             };
 
@@ -101,7 +102,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 leaderboard.RemoveClock(existingInstance.User.Id);
             }
 
-            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new MultiplayerSpectatorSlaveClock(masterClockContainer.GameplayClock)), d =>
+            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new SpectatorCatchUpSlaveClock(masterClockContainer.GameplayClock)), d =>
             {
                 if (instances[userIndex] == d)
                 {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 7fe1416224..1a7e0dd36a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -5,15 +5,16 @@ using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        private readonly MultiplayerSpectatorSlaveClock gameplayClock;
+        private readonly SpectatorCatchUpSlaveClock gameplayClock;
 
-        public MultiplayerSpectatorPlayer(Score score, MultiplayerSpectatorSlaveClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, SpectatorCatchUpSlaveClock gameplayClock)
             : base(score)
         {
             this.gameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 384c1f1f2b..401732f7fb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
 
@@ -20,11 +21,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public WorkingBeatmap Beatmap { get; private set; }
 
         public readonly Score Score;
-        public readonly MultiplayerSpectatorSlaveClock GameplayClock;
+        public readonly SpectatorCatchUpSlaveClock GameplayClock;
 
         private OsuScreenStack stack;
 
-        public PlayerInstance(Score score, MultiplayerSpectatorSlaveClock gameplayClock)
+        public PlayerInstance(Score score, SpectatorCatchUpSlaveClock gameplayClock)
         {
             Score = score;
             GameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs
new file mode 100644
index 0000000000..d8733d4322
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.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.Bindables;
+using osu.Framework.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+{
+    /// <summary>
+    /// A clock which is used by <see cref="MultiplayerSpectatorPlayer"/>s and managed by an <see cref="ISpectatorSyncManager"/>.
+    /// </summary>
+    public interface ISpectatorSlaveClock : IFrameBasedClock, IAdjustableClock
+    {
+        /// <summary>
+        /// Whether this clock is waiting on frames to continue playback.
+        /// </summary>
+        IBindable<bool> WaitingOnFrames { get; }
+
+        /// <summary>
+        /// Whether this clock is resynchronising to the master clock.
+        /// </summary>
+        bool IsCatchingUp { get; set; }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
new file mode 100644
index 0000000000..107f9637a3
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.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.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+{
+    /// <summary>
+    /// Manages the synchronisation between one or more slave clocks in relation to a master clock.
+    /// </summary>
+    public interface ISpectatorSyncManager
+    {
+        /// <summary>
+        /// The master clock which slaves should synchronise to.
+        /// </summary>
+        IAdjustableClock Master { get; }
+
+        /// <summary>
+        /// Adds a slave clock.
+        /// </summary>
+        /// <param name="clock">The clock to add.</param>
+        void AddSlave(ISpectatorSlaveClock clock);
+
+        /// <summary>
+        /// Removes a slave clock.
+        /// </summary>
+        /// <param name="clock">The clock to remove.</param>
+        void RemoveSlave(ISpectatorSlaveClock clock);
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
similarity index 89%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
index 6960d24295..e4d25894c8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
@@ -5,9 +5,9 @@ using System;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
-    public class MultiplayerSpectatorSlaveClock : IFrameBasedClock, IMultiplayerSpectatorSlaveClock
+    public class SpectatorCatchUpSlaveClock : ISpectatorSlaveClock
     {
         /// <summary>
         /// The catchup rate.
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly IFrameBasedClock masterClock;
 
-        public MultiplayerSpectatorSlaveClock(IFrameBasedClock masterClock)
+        public SpectatorCatchUpSlaveClock(IFrameBasedClock masterClock)
         {
             this.masterClock = masterClock;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs
similarity index 88%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs
index 873f34626d..46e86177ca 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs
@@ -7,9 +7,12 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
-    public class MultiplayerCatchupSyncManager : Component, IMultiplayerSpectatorSyncManager
+    /// <summary>
+    /// A <see cref="ISpectatorSyncManager"/> which synchronises de-synced slave clocks through catchup.
+    /// </summary>
+    public class SpectatorCatchUpSyncManager : Component, ISpectatorSyncManager
     {
         /// <summary>
         /// The offset from the master clock to which slaves should be synchronised to.
@@ -34,19 +37,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// <summary>
         /// The slave clocks.
         /// </summary>
-        private readonly List<IMultiplayerSpectatorSlaveClock> slaves = new List<IMultiplayerSpectatorSlaveClock>();
+        private readonly List<ISpectatorSlaveClock> slaves = new List<ISpectatorSlaveClock>();
 
         private bool hasStarted;
         private double? firstStartAttemptTime;
 
-        public MultiplayerCatchupSyncManager(IAdjustableClock master)
+        public SpectatorCatchUpSyncManager(IAdjustableClock master)
         {
             Master = master;
         }
 
-        public void AddSlave(IMultiplayerSpectatorSlaveClock clock) => slaves.Add(clock);
+        public void AddSlave(ISpectatorSlaveClock clock) => slaves.Add(clock);
 
-        public void RemoveSlave(IMultiplayerSpectatorSlaveClock clock) => slaves.Remove(clock);
+        public void RemoveSlave(ISpectatorSlaveClock clock) => slaves.Remove(clock);
 
         protected override void Update()
         {

From 33cc5c5cb36456479bacf67ccdb4e585ce8e7ca5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:35:57 +0900
Subject: [PATCH 09146/10326] A few more xmldocs

---
 .../Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs | 10 +++++-----
 .../Spectate/Sync/SpectatorCatchUpSlaveClock.cs        |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
index 107f9637a3..5edbb3bc2c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
@@ -6,7 +6,7 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// Manages the synchronisation between one or more slave clocks in relation to a master clock.
+    /// Manages the synchronisation between one or more <see cref="ISpectatorSlaveClock"/>s in relation to a master clock.
     /// </summary>
     public interface ISpectatorSyncManager
     {
@@ -16,15 +16,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         IAdjustableClock Master { get; }
 
         /// <summary>
-        /// Adds a slave clock.
+        /// Adds an <see cref="ISpectatorSlaveClock"/> to manage.
         /// </summary>
-        /// <param name="clock">The clock to add.</param>
+        /// <param name="clock">The <see cref="ISpectatorSlaveClock"/> to add.</param>
         void AddSlave(ISpectatorSlaveClock clock);
 
         /// <summary>
-        /// Removes a slave clock.
+        /// Removes an <see cref="ISpectatorSlaveClock"/>, stopping it from being managed by this <see cref="ISpectatorSyncManager"/>.
         /// </summary>
-        /// <param name="clock">The clock to remove.</param>
+        /// <param name="clock">The <see cref="ISpectatorSlaveClock"/> to remove.</param>
         void RemoveSlave(ISpectatorSlaveClock clock);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
index e4d25894c8..4b529021de 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
@@ -7,10 +7,13 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
+    /// <summary>
+    /// A <see cref="ISpectatorSlaveClock"/> which catches up using rate adjustment.
+    /// </summary>
     public class SpectatorCatchUpSlaveClock : ISpectatorSlaveClock
     {
         /// <summary>
-        /// The catchup rate.
+        /// The catch up rate.
         /// </summary>
         public const double CATCHUP_RATE = 2;
 

From b391a8f94e23b66a82825fc180a8fd10db0ffba3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:37:45 +0900
Subject: [PATCH 09147/10326] Properly bind WaitingOnFrames

---
 .../Spectate/MultiplayerSpectatorPlayer.cs            | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 1a7e0dd36a..19cc9f18ad 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.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.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
@@ -12,14 +13,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        private readonly SpectatorCatchUpSlaveClock gameplayClock;
+        private readonly ISpectatorSlaveClock gameplayClock;
 
-        public MultiplayerSpectatorPlayer(Score score, SpectatorCatchUpSlaveClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, ISpectatorSlaveClock gameplayClock)
             : base(score)
         {
             this.gameplayClock = gameplayClock;
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            gameplayClock.WaitingOnFrames.BindTo(DrawableRuleset.FrameStableClock.WaitingOnFrames);
+        }
+
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
             => new SubGameplayClockContainer(gameplayClock);
     }

From 1a987dfbc0712b5ee54ba35de6a88a54fb0aa20e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 21:16:38 +0900
Subject: [PATCH 09148/10326] Fix gameplay cursor showing offscreen

---
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index ec7751d2b4..44ca5e850f 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -33,7 +33,6 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             Add(cursorScaleContainer = new Container
             {
-                RelativePositionAxes = Axes.Both,
                 Child = clickToResumeCursor = new OsuClickToResumeCursor { ResumeRequested = Resume }
             });
         }

From 71b06d7e61024503a7e983860ecfd07412d8585f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 15 Apr 2021 15:53:21 +0300
Subject: [PATCH 09149/10326] Simplify ExtendableCircle even more

---
 .../Components/Timeline/TimelineHitObjectBlueprint.cs    | 9 ++-------
 1 file changed, 2 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 1c0d6e5ab6..23069f6079 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -345,7 +345,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         /// </summary>
         public class ExtendableCircle : CompositeDrawable
         {
-            private readonly CircularContainer content;
+            private readonly Circle content;
 
             public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => content.ReceivePositionalInputAt(screenSpacePos);
 
@@ -354,19 +354,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             public ExtendableCircle()
             {
                 Padding = new MarginPadding { Horizontal = -circle_size / 2f };
-                InternalChild = content = new CircularContainer
+                InternalChild = content = new Circle
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Masking = true,
                     EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Shadow,
                         Radius = 5,
                         Colour = Color4.Black.Opacity(0.4f)
-                    },
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both
                     }
                 };
             }

From 6f3158e8c88b0d82541b9990965756ddc74cdaf6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 23:24:13 +0900
Subject: [PATCH 09150/10326] Increase multiplier to 1.8

---
 osu.Game/Overlays/Volume/VolumeMeter.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index 57485946c1..202eac93ea 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -237,6 +237,7 @@ namespace osu.Game.Overlays.Volume
         private double accelerationModifier = 1;
 
         private const double max_acceleration = 5;
+        private const double acceleration_multiplier = 1.8;
 
         private ScheduledDelegate accelerationDebounce;
 
@@ -250,7 +251,7 @@ namespace osu.Game.Overlays.Volume
             accelerationDebounce = Scheduler.AddDelayed(resetAcceleration, 150);
 
             delta *= accelerationModifier;
-            accelerationModifier = Math.Min(max_acceleration, accelerationModifier * 1.2f);
+            accelerationModifier = Math.Min(max_acceleration, accelerationModifier * acceleration_multiplier);
 
             var precision = Bindable.Precision;
 

From 34859a476012ca6895a4e0216ff06f85f48a074f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 23:37:05 +0900
Subject: [PATCH 09151/10326] Invalidate drawnode on change

---
 osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index b55575696e..7f86e9daf7 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -32,7 +32,17 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         private double timeOffset;
         private float time;
 
-        protected Anchor TrailOrigin = Anchor.Centre;
+        private Anchor trailOrigin = Anchor.Centre;
+
+        protected Anchor TrailOrigin
+        {
+            get => trailOrigin;
+            set
+            {
+                trailOrigin = value;
+                Invalidate(Invalidation.DrawNode);
+            }
+        }
 
         public CursorTrail()
         {

From 15d48a924b996871ac51e4b23f1a555f343e281e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 00:58:28 +0900
Subject: [PATCH 09152/10326] Set the timeline's height to a sane non-zero
 default

This isn't required but makes the initial appearance animation nicer.
---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 55fb557474..7e11cfb271 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -65,6 +65,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             this.userContent = userContent;
 
             RelativeSizeAxes = Axes.X;
+            Height = timeline_height;
 
             ZoomDuration = 200;
             ZoomEasing = Easing.OutQuint;

From c2340f1fe886ef77f3afa5a72f0b18c675f5807c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 00:59:01 +0900
Subject: [PATCH 09153/10326] Move zoom settings back to run in a non-loaded
 state

---
 .../Compose/Components/Timeline/Timeline.cs   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 7e11cfb271..621a24c67d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -128,7 +128,21 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             });
 
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
+
             Beatmap.BindTo(beatmap);
+            Beatmap.BindValueChanged(b =>
+            {
+                waveform.Waveform = b.NewValue.Waveform;
+                track = b.NewValue.Track;
+
+                // todo: i don't think this is safe, the track may not be loaded yet.
+                if (track.Length > 0)
+                {
+                    MaxZoom = getZoomLevelForVisibleMilliseconds(500);
+                    MinZoom = getZoomLevelForVisibleMilliseconds(10000);
+                    Zoom = getZoomLevelForVisibleMilliseconds(2000);
+                }
+            }, true);
         }
 
         protected override void LoadComplete()
@@ -158,20 +172,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     mainContent.Delay(180).MoveToY(0, 200, Easing.OutQuint);
                 }
             }, true);
-
-            Beatmap.BindValueChanged(b =>
-            {
-                waveform.Waveform = b.NewValue.Waveform;
-                track = b.NewValue.Track;
-
-                // todo: i don't think this is safe, the track may not be loaded yet.
-                if (track.Length > 0)
-                {
-                    MaxZoom = getZoomLevelForVisibleMilliseconds(500);
-                    MinZoom = getZoomLevelForVisibleMilliseconds(10000);
-                    Zoom = getZoomLevelForVisibleMilliseconds(2000);
-                }
-            }, true);
         }
 
         private void updateWaveformOpacity() =>

From 25b8c2f257f8a52aba5761b819ea0ee7f62b86a4 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Wed, 14 Apr 2021 00:04:03 -0400
Subject: [PATCH 09154/10326] Allow skipping storyboard outro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reuses SkipOverlay by calculating the endtime of the storyboard and using that as a "start point". Upon skipping the outro the score is instantly shown.
When the end of the storyboard is reached the score screen automatically shows up. If the player holds ESC (pause) during the outro, the score is displayed

The storyboard endtime is calculated by getting the latest endtime of the storyboard's elements, or simply returning 0 if there is no storyboard.

Co-Authored-By: Marlina José <marlina@umich.edu>
---
 .../Gameplay/TestSceneStoryboardWithOutro.cs  | 100 ++++++++++++++++++
 .../Multiplayer/MultiplayerPlayer.cs          |   1 +
 .../Screens/Play/GameplayClockContainer.cs    |  25 +++++
 osu.Game/Screens/Play/Player.cs               |  34 ++++++
 osu.Game/Screens/Play/PlayerConfiguration.cs  |   5 +
 osu.Game/Storyboards/Storyboard.cs            |   1 +
 6 files changed, 166 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
new file mode 100644
index 0000000000..1c8b33bb09
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.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 System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
+using osu.Game.Storyboards;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneStoryboardWithOutro : PlayerTestScene
+    {
+        protected new OutroPlayer Player => (OutroPlayer)base.Player;
+
+        private Storyboard storyboard;
+
+        private const double storyboard_duration = 2000;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.SetValue(OsuSetting.ShowStoryboard, true);
+            storyboard = new Storyboard();
+            var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
+            sprite.TimelineGroup.Alpha.Add(Easing.None, 0, storyboard_duration, 1, 0);
+            storyboard.GetLayer("Background").Add(sprite);
+        }
+
+        [Test]
+        public void TestStoryboardSkipOutro()
+        {
+            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddStep("skip outro", () => InputManager.Key(osuTK.Input.Key.Space));
+            AddAssert("score shown", () => Player.IsScoreShown);
+        }
+
+        [Test]
+        public void TestStoryboardNoSkipOutro()
+        {
+            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
+            AddUntilStep("storyboard ends", () => Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= storyboard_duration);
+            AddWaitStep("wait for score", 10);
+            AddAssert("score shown", () => Player.IsScoreShown);
+        }
+
+        [Test]
+        public void TestStoryboardExitToSkipOutro()
+        {
+            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddStep("exit via pause", () => Player.ExitViaPause());
+            AddAssert("score shown", () => Player.IsScoreShown);
+        }
+
+        protected override bool AllowFail => false;
+
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new OutroPlayer();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            var beatmap = new Beatmap();
+            beatmap.HitObjects.Add(new HitCircle());
+            return beatmap;
+        }
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) =>
+            new ClockBackedTestWorkingBeatmap(beatmap, storyboard ?? this.storyboard, Clock, Audio);
+
+        protected class OutroPlayer : TestPlayer
+        {
+            public void ExitViaPause() => PerformExit(true);
+
+            public bool IsScoreShown => !this.IsCurrentScreen() && this.GetChildScreen() is ResultsScreen;
+
+            public OutroPlayer()
+                : base(false)
+            {
+            }
+
+            protected override Task ImportScore(Score score)
+            {
+                // avoid database errors from trying to store the score
+                return Task.CompletedTask;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index aaacf891bb..b4e8c13e83 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -49,6 +49,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 AllowPause = false,
                 AllowRestart = false,
                 AllowSkippingIntro = false,
+                AllowSkippingOutro = false,
             })
         {
             this.userIds = userIds;
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ddbb087962..fc45d661cf 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -228,6 +228,11 @@ namespace osu.Game.Screens.Play
             adjustableClock.ChangeSource(track);
         }
 
+        /// <summary>
+        /// Gets the endtime of the last element in the storyboard in ms, or start time of the last hitobject if there's no storyboard.
+        /// </summary>
+        public double StoryboardEndTime => beatmap.Storyboard.LatestEventTime ?? 0;
+
         protected override void Update()
         {
             if (!IsPaused.Value)
@@ -235,6 +240,8 @@ namespace osu.Game.Screens.Play
                 userOffsetClock.ProcessFrame();
             }
 
+            updateHasStoryboardEnded();
+
             base.Update();
         }
 
@@ -296,5 +303,23 @@ namespace osu.Game.Screens.Play
             {
             }
         }
+
+        # region Storyboard outro logic
+
+        public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
+
+        public bool HasTimeLeftInStoryboard => GameplayClock.CurrentTime <= StoryboardEndTime;
+
+        private readonly BindableBool hasStoryboardEnded = new BindableBool(true);
+
+        private void updateHasStoryboardEnded()
+        {
+            if (StoryboardEndTime == 0)
+                return;
+
+            hasStoryboardEnded.Value = GameplayClock.CurrentTime >= StoryboardEndTime;
+        }
+
+        # endregion
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index efe5d26409..13820738c7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -74,6 +74,8 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> mouseWheelDisabled;
 
+        private Bindable<bool> storyboardEnabled;
+
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
         protected readonly Bindable<bool> LocalUserPlaying = new Bindable<bool>();
@@ -106,6 +108,8 @@ namespace osu.Game.Screens.Play
 
         private SkipOverlay skipOverlay;
 
+        private SkipOverlay skipOutroOverlay;
+
         protected ScoreProcessor ScoreProcessor { get; private set; }
 
         protected HealthProcessor HealthProcessor { get; private set; }
@@ -190,6 +194,8 @@ namespace osu.Game.Screens.Play
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
+            storyboardEnabled = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
+
             if (game != null)
                 gameActive.BindTo(game.IsActive);
 
@@ -285,6 +291,9 @@ namespace osu.Game.Screens.Play
             ScoreProcessor.HasCompleted.ValueChanged += updateCompletionState;
             HealthProcessor.Failed += onFail;
 
+            // Keep track of whether the storyboard ended after the playable portion
+            GameplayClockContainer.HasStoryboardEnded.ValueChanged += updateCompletionState;
+
             foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
                 mod.ApplyToScoreProcessor(ScoreProcessor);
 
@@ -360,6 +369,10 @@ namespace osu.Game.Screens.Play
                     {
                         RequestSkip = performUserRequestedSkip
                     },
+                    skipOutroOverlay = new SkipOverlay(GameplayClockContainer.StoryboardEndTime)
+                    {
+                        RequestSkip = scheduleCompletion
+                    },
                     FailOverlay = new FailOverlay
                     {
                         OnRetry = Restart,
@@ -389,6 +402,9 @@ namespace osu.Game.Screens.Play
             if (!Configuration.AllowSkippingIntro)
                 skipOverlay.Expire();
 
+            if (!Configuration.AllowSkippingOutro)
+                skipOutroOverlay.Expire();
+
             if (Configuration.AllowRestart)
             {
                 container.Add(new HotkeyRetryOverlay
@@ -403,6 +419,8 @@ namespace osu.Game.Screens.Play
                 });
             }
 
+            skipOutroOverlay.Hide();
+
             return container;
         }
 
@@ -523,6 +541,14 @@ namespace osu.Game.Screens.Play
                     Pause();
                     return;
                 }
+
+                // show the score if in storyboard outro (score has been set)
+                bool scoreReady = prepareScoreForDisplayTask != null && prepareScoreForDisplayTask.IsCompleted;
+
+                if (scoreReady)
+                {
+                    scheduleCompletion();
+                }
             }
 
             this.Exit();
@@ -611,6 +637,14 @@ namespace osu.Game.Screens.Play
                 return score.ScoreInfo;
             });
 
+            // show skip overlay if storyboard is enabled and has an outro
+            if (storyboardEnabled.Value && GameplayClockContainer.HasTimeLeftInStoryboard)
+            {
+                skipOutroOverlay.Show();
+                completionProgressDelegate = null;
+                return;
+            }
+
             using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
                 scheduleCompletion();
         }
diff --git a/osu.Game/Screens/Play/PlayerConfiguration.cs b/osu.Game/Screens/Play/PlayerConfiguration.cs
index cd30ead638..ad29563d54 100644
--- a/osu.Game/Screens/Play/PlayerConfiguration.cs
+++ b/osu.Game/Screens/Play/PlayerConfiguration.cs
@@ -24,5 +24,10 @@ namespace osu.Game.Screens.Play
         /// Whether the player should be allowed to skip the intro, advancing to the start of gameplay.
         /// </summary>
         public bool AllowSkippingIntro { get; set; } = true;
+
+        /// <summary>
+        /// Whether the player should be allowed to skip the outro, advancing to the end of a storyboard.
+        /// </summary>
+        public bool AllowSkippingOutro { get; set; } = true;
     }
 }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 41058d9cb3..e22c586048 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Storyboards
         /// Videos and samples return StartTime as their EndTIme.
         /// </remarks>
         public double? LatestEventTime => Layers.SelectMany(l => l.Elements).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
+
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.
         /// </summary>

From 0e545e1ed9df1d33e0d6506a9edc3a053d6aeb7a Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Thu, 15 Apr 2021 17:17:02 -0400
Subject: [PATCH 09155/10326] Add IHasDuration interface with EndTime for
 storyboard elements to implement

---
 osu.Game/Storyboards/IHasDuration.cs       | 10 ++++++++++
 osu.Game/Storyboards/IStoryboardElement.cs |  2 --
 osu.Game/Storyboards/Storyboard.cs         |  6 +-----
 osu.Game/Storyboards/StoryboardSample.cs   |  2 --
 osu.Game/Storyboards/StoryboardSprite.cs   |  2 +-
 osu.Game/Storyboards/StoryboardVideo.cs    |  2 --
 6 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game/Storyboards/IHasDuration.cs

diff --git a/osu.Game/Storyboards/IHasDuration.cs b/osu.Game/Storyboards/IHasDuration.cs
new file mode 100644
index 0000000000..98f75b8ee2
--- /dev/null
+++ b/osu.Game/Storyboards/IHasDuration.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.Storyboards
+{
+    public interface IHasDuration
+    {
+        double EndTime { get; }
+    }
+}
diff --git a/osu.Game/Storyboards/IStoryboardElement.cs b/osu.Game/Storyboards/IStoryboardElement.cs
index 03f8b97212..c4c150a8a4 100644
--- a/osu.Game/Storyboards/IStoryboardElement.cs
+++ b/osu.Game/Storyboards/IStoryboardElement.cs
@@ -12,8 +12,6 @@ namespace osu.Game.Storyboards
 
         double StartTime { get; }
 
-        double EndTime { get; }
-
         Drawable CreateDrawable();
     }
 }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index e22c586048..669f6ccc43 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -40,11 +40,7 @@ namespace osu.Game.Storyboards
         /// Across all layers, find the latest point in time that a storyboard element ends at.
         /// Will return null if there are no elements.
         /// </summary>
-        /// <remarks>
-        /// This iterates all elements and as such should be used sparingly or stored locally.
-        /// Videos and samples return StartTime as their EndTIme.
-        /// </remarks>
-        public double? LatestEventTime => Layers.SelectMany(l => l.Elements).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
+        public double? LatestEventTime => Layers.SelectMany(l => l.Elements.OfType<IHasDuration>()).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
 
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.
diff --git a/osu.Game/Storyboards/StoryboardSample.cs b/osu.Game/Storyboards/StoryboardSample.cs
index d0949c93a7..5d6ce215f5 100644
--- a/osu.Game/Storyboards/StoryboardSample.cs
+++ b/osu.Game/Storyboards/StoryboardSample.cs
@@ -15,8 +15,6 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
-        public double EndTime => StartTime;
-
         public int Volume { get; }
 
         public IEnumerable<string> LookupNames => new[]
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index fdaa59d7d9..8f2c1e9e0c 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -11,7 +11,7 @@ using JetBrains.Annotations;
 
 namespace osu.Game.Storyboards
 {
-    public class StoryboardSprite : IStoryboardElement
+    public class StoryboardSprite : IStoryboardElement, IHasDuration
     {
         private readonly List<CommandLoop> loops = new List<CommandLoop>();
         private readonly List<CommandTrigger> triggers = new List<CommandTrigger>();
diff --git a/osu.Game/Storyboards/StoryboardVideo.cs b/osu.Game/Storyboards/StoryboardVideo.cs
index 1314bd7cb9..4652e45852 100644
--- a/osu.Game/Storyboards/StoryboardVideo.cs
+++ b/osu.Game/Storyboards/StoryboardVideo.cs
@@ -14,8 +14,6 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
-        public double EndTime => StartTime;
-
         public StoryboardVideo(string path, int offset)
         {
             Path = path;

From 5ac0eb02cd0bffd1c7876178c5b8ad50bad3b165 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 12:25:29 +0900
Subject: [PATCH 09156/10326] Always add player instances at first, populate
 later

---
 .../TestSceneMultiplayerSpectator.cs          | 46 ++++++++++++++-----
 .../Spectate/MultiplayerSpectator.cs          | 27 ++++-------
 .../Multiplayer/Spectate/PlayerInstance.cs    | 23 +++++-----
 3 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index ab6324df2d..4026258830 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerSpectator : MultiplayerTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
-        private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
+        private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestUserLookupCache();
@@ -62,18 +62,42 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("add streaming client", () =>
             {
-                Remove(testSpectatorStreamingClient);
-                Add(testSpectatorStreamingClient);
+                Remove(streamingClient);
+                Add(streamingClient);
             });
 
             AddStep("finish previous gameplay", () =>
             {
                 foreach (var id in playingUserIds)
-                    testSpectatorStreamingClient.EndPlay(id, importedBeatmapId);
+                    streamingClient.EndPlay(id, importedBeatmapId);
                 playingUserIds.Clear();
             });
         }
 
+        [Test]
+        public void TestDelayedStart()
+        {
+            AddStep("start players silently", () =>
+            {
+                Client.CurrentMatchPlayingUserIds.Add(55);
+                Client.CurrentMatchPlayingUserIds.Add(56);
+                playingUserIds.Add(55);
+                playingUserIds.Add(56);
+                nextFrame[55] = 0;
+                nextFrame[56] = 0;
+            });
+
+            loadSpectateScreen(false);
+
+            AddWaitStep("wait a bit", 10);
+            AddStep("load player 55", () => streamingClient.StartPlay(55, importedBeatmapId));
+            AddUntilStep("one player added", () => spectator.ChildrenOfType<Player>().Count() == 1);
+
+            AddWaitStep("wait a bit", 10);
+            AddStep("load player 56", () => streamingClient.StartPlay(56, importedBeatmapId));
+            AddUntilStep("two players added", () => spectator.ChildrenOfType<Player>().Count() == 2);
+        }
+
         [Test]
         public void TestGeneral()
         {
@@ -178,7 +202,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddWaitStep("wait a bit", 10);
         }
 
-        private void loadSpectateScreen()
+        private void loadSpectateScreen(bool waitForPlayerLoad = true)
         {
             AddStep("load screen", () =>
             {
@@ -188,7 +212,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 LoadScreen(spectator = new MultiplayerSpectator(playingUserIds.ToArray()));
             });
 
-            AddUntilStep("wait for screen load", () => spectator.LoadState == LoadState.Loaded && spectator.AllPlayersLoaded);
+            AddUntilStep("wait for screen load", () => spectator.LoadState == LoadState.Loaded && (!waitForPlayerLoad || spectator.AllPlayersLoaded));
         }
 
         private void start(int userId, int? beatmapId = null) => start(new[] { userId }, beatmapId);
@@ -200,7 +224,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 foreach (int id in userIds)
                 {
                     Client.CurrentMatchPlayingUserIds.Add(id);
-                    testSpectatorStreamingClient.StartPlay(id, beatmapId ?? importedBeatmapId);
+                    streamingClient.StartPlay(id, beatmapId ?? importedBeatmapId);
                     playingUserIds.Add(id);
                     nextFrame[id] = 0;
                 }
@@ -211,7 +235,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("end play", () =>
             {
-                testSpectatorStreamingClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
+                streamingClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
                 playingUserIds.Remove(userId);
                 nextFrame.Remove(userId);
             });
@@ -225,7 +249,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 foreach (int id in userIds)
                 {
-                    testSpectatorStreamingClient.SendFrames(id, nextFrame[id], count);
+                    streamingClient.SendFrames(id, nextFrame[id], count);
                     nextFrame[id] += count;
                 }
             });
@@ -246,7 +270,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
 
-        private PlayerInstance getInstance(int userId) => spectator.ChildrenOfType<PlayerInstance>().Single(p => p.User.Id == userId);
+        private PlayerInstance getInstance(int userId) => spectator.ChildrenOfType<PlayerInstance>().Single(p => p.UserId == userId);
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
@@ -297,7 +321,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             public override void WatchUser(int userId)
             {
-                if (userSentStateDictionary[userId])
+                if (userSentStateDictionary.TryGetValue(userId, out var sent) && sent)
                 {
                     // usually the server would do this.
                     sendState(userId, userBeatmapDictionary[userId]);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 441839b401..08b9938e79 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
         {
-            instances = new PlayerInstance[userIds.Length];
+            instances = new PlayerInstance[UserIds.Length];
         }
 
         [BackgroundDependencyLoader]
@@ -70,6 +70,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 masterClockContainer
             };
 
+            for (int i = 0; i < UserIds.Length; i++)
+                grid.Add(instances[i] = new PlayerInstance(UserIds[i], new SpectatorCatchUpSlaveClock(masterClockContainer.GameplayClock)));
+
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
@@ -93,24 +96,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         protected override void StartGameplay(int userId, GameplayState gameplayState)
         {
             int userIndex = getIndexForUser(userId);
-            var existingInstance = instances[userIndex];
 
-            if (existingInstance != null)
-            {
-                grid.Remove(existingInstance);
-                syncManager.RemoveSlave(existingInstance.GameplayClock);
-                leaderboard.RemoveClock(existingInstance.User.Id);
-            }
+            var instance = instances[userIndex];
+            syncManager.RemoveSlave(instance.GameplayClock);
+            leaderboard.RemoveClock(instance.UserId);
 
-            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new SpectatorCatchUpSlaveClock(masterClockContainer.GameplayClock)), d =>
-            {
-                if (instances[userIndex] == d)
-                {
-                    grid.Add(d);
-                    syncManager.AddSlave(d.GameplayClock);
-                    leaderboard.AddClock(d.User.Id, d.GameplayClock);
-                }
-            });
+            instance.LoadPlayer(gameplayState.Score);
+            syncManager.AddSlave(instance.GameplayClock);
+            leaderboard.AddClock(instance.UserId, instance.GameplayClock);
         }
 
         protected override void EndGameplay(int userId)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 401732f7fb..8c54fc9ec2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -8,7 +8,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
-using osu.Game.Users;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
@@ -16,30 +15,30 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
-        public User User => Score.ScoreInfo.User;
-
-        public WorkingBeatmap Beatmap { get; private set; }
-
-        public readonly Score Score;
+        public readonly int UserId;
         public readonly SpectatorCatchUpSlaveClock GameplayClock;
 
+        public Score Score { get; private set; }
+
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
         private OsuScreenStack stack;
 
-        public PlayerInstance(Score score, SpectatorCatchUpSlaveClock gameplayClock)
+        public PlayerInstance(int userId, SpectatorCatchUpSlaveClock gameplayClock)
         {
-            Score = score;
+            UserId = userId;
             GameplayClock = gameplayClock;
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmapManager)
+        public void LoadPlayer(Score score)
         {
-            Beatmap = beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true);
+            Score = score;
 
-            InternalChild = new GameplayIsolationContainer(Beatmap, Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
+            InternalChild = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = new DrawSizePreservingFillContainer

From 1c086d99deae8c03b1412b13ec6f5c00e0abfe94 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 13:28:32 +0900
Subject: [PATCH 09157/10326] Add loading spinner

---
 .../Spectate/MultiplayerSpectator.cs          |  8 ++-----
 .../Multiplayer/Spectate/PlayerInstance.cs    | 24 +++++++++++++------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 08b9938e79..e1af95b870 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -95,13 +95,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         protected override void StartGameplay(int userId, GameplayState gameplayState)
         {
-            int userIndex = getIndexForUser(userId);
+            var instance = instances[getIndexForUser(userId)];
+            instance.LoadScore(gameplayState.Score);
 
-            var instance = instances[userIndex];
-            syncManager.RemoveSlave(instance.GameplayClock);
-            leaderboard.RemoveClock(instance.UserId);
-
-            instance.LoadPlayer(gameplayState.Score);
             syncManager.AddSlave(instance.GameplayClock);
             leaderboard.AddClock(instance.UserId, instance.GameplayClock);
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 8c54fc9ec2..31d2d458df 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -1,10 +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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
@@ -23,6 +25,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        private readonly Container content;
+        private readonly LoadingLayer loadingLayer;
         private OsuScreenStack stack;
 
         public PlayerInstance(int userId, SpectatorCatchUpSlaveClock gameplayClock)
@@ -32,23 +36,29 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
+
+            InternalChildren = new Drawable[]
+            {
+                content = new DrawSizePreservingFillContainer { RelativeSizeAxes = Axes.Both },
+                loadingLayer = new LoadingLayer(true) { State = { Value = Visibility.Visible } }
+            };
         }
 
-        public void LoadPlayer(Score score)
+        public void LoadScore(Score score)
         {
+            if (Score != null)
+                throw new InvalidOperationException($"Cannot load a new score on a {nameof(PlayerInstance)} with an existing score.");
+
             Score = score;
 
-            InternalChild = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
+            content.Child = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = new DrawSizePreservingFillContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = stack = new OsuScreenStack()
-                }
+                Child = stack = new OsuScreenStack()
             };
 
             stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => new MultiplayerSpectatorPlayer(Score, GameplayClock)));
+            loadingLayer.Hide();
         }
 
         // Player interferes with global input, so disable input for now.

From 42c066e6f2491f539534c02ef44e2760f9e19f19 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 13:38:55 +0900
Subject: [PATCH 09158/10326] Fix slider not displaying in timeline during
 zero-duration placement

---
 .../Compose/Components/Timeline/TimelineHitObjectBlueprint.cs   | 2 +-
 1 file changed, 1 insertion(+), 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 23069f6079..bea1aa2e3a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             var comboColours = skin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value ?? Array.Empty<Color4>();
             var comboColour = combo.GetComboColour(comboColours);
 
-            if (HitObject is IHasDuration)
+            if (HitObject is IHasDuration duration && duration.Duration > 0)
                 circle.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
             else
                 circle.Colour = comboColour;

From b15838b22027746fd9174e5fb72e10ade6a68cd2 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Fri, 16 Apr 2021 00:59:10 -0400
Subject: [PATCH 09159/10326] Move storyboard outro logic to DrawableStoryboard

---
 .../Gameplay/TestSceneStoryboardWithOutro.cs  | 17 +++++++++++--
 .../Multiplayer/MultiplayerPlayer.cs          |  3 +--
 osu.Game/Screens/Play/DimmableStoryboard.cs   |  3 +++
 .../Screens/Play/GameplayClockContainer.cs    | 20 ---------------
 osu.Game/Screens/Play/Player.cs               | 25 ++++++++-----------
 osu.Game/Screens/Play/PlayerConfiguration.cs  |  9 ++-----
 .../Drawables/DrawableStoryboard.cs           | 23 +++++++++++++++++
 ...on.cs => IStoryboardElementHasDuration.cs} |  2 +-
 osu.Game/Storyboards/Storyboard.cs            |  2 +-
 osu.Game/Storyboards/StoryboardSprite.cs      |  2 +-
 10 files changed, 57 insertions(+), 49 deletions(-)
 rename osu.Game/Storyboards/{IHasDuration.cs => IStoryboardElementHasDuration.cs} (81%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 1c8b33bb09..27d203d5d6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -6,12 +6,14 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Storyboards;
 using osuTK;
@@ -36,6 +38,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboard.GetLayer("Background").Add(sprite);
         }
 
+        [SetUpSteps]
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("ignore user settings", () =>
+            {
+                Player.DimmableStoryboard.IgnoreUserSettings.Value = true;
+            });
+        }
+
         [Test]
         public void TestStoryboardSkipOutro()
         {
@@ -50,8 +62,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
             AddUntilStep("storyboard ends", () => Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= storyboard_duration);
-            AddWaitStep("wait for score", 10);
-            AddAssert("score shown", () => Player.IsScoreShown);
+            AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 
         [Test]
@@ -85,6 +96,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public bool IsScoreShown => !this.IsCurrentScreen() && this.GetChildScreen() is ResultsScreen;
 
+            public new DimmableStoryboard DimmableStoryboard => base.DimmableStoryboard;
+
             public OutroPlayer()
                 : base(false)
             {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index b4e8c13e83..ae2042fbe8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -48,8 +48,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             {
                 AllowPause = false,
                 AllowRestart = false,
-                AllowSkippingIntro = false,
-                AllowSkippingOutro = false,
+                AllowSkipping = false,
             })
         {
             this.userIds = userIds;
diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index 58eb95b7c6..bebde1b15b 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
 using osu.Game.Storyboards;
@@ -61,5 +62,7 @@ namespace osu.Game.Screens.Play
             Add(storyboard);
             OverlayLayerContainer.Add(storyboard.OverlayLayer.CreateProxy());
         }
+
+        public IBindable<bool> HasStoryboardEnded => drawableStoryboard?.HasStoryboardEnded;
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index fc45d661cf..95419c0b35 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -240,8 +240,6 @@ namespace osu.Game.Screens.Play
                 userOffsetClock.ProcessFrame();
             }
 
-            updateHasStoryboardEnded();
-
             base.Update();
         }
 
@@ -303,23 +301,5 @@ namespace osu.Game.Screens.Play
             {
             }
         }
-
-        # region Storyboard outro logic
-
-        public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
-
-        public bool HasTimeLeftInStoryboard => GameplayClock.CurrentTime <= StoryboardEndTime;
-
-        private readonly BindableBool hasStoryboardEnded = new BindableBool(true);
-
-        private void updateHasStoryboardEnded()
-        {
-            if (StoryboardEndTime == 0)
-                return;
-
-            hasStoryboardEnded.Value = GameplayClock.CurrentTime >= StoryboardEndTime;
-        }
-
-        # endregion
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 14ba9e7e02..81d2621647 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -74,8 +74,6 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> mouseWheelDisabled;
 
-        private Bindable<bool> storyboardEnabled;
-
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
         protected readonly Bindable<bool> LocalUserPlaying = new Bindable<bool>();
@@ -106,7 +104,7 @@ namespace osu.Game.Screens.Play
 
         private BreakTracker breakTracker;
 
-        private SkipOverlay skipOverlay;
+        private SkipOverlay skipIntroOverlay;
 
         private SkipOverlay skipOutroOverlay;
 
@@ -194,8 +192,6 @@ namespace osu.Game.Screens.Play
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
-            storyboardEnabled = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
-
             if (game != null)
                 gameActive.BindTo(game.IsActive);
 
@@ -250,7 +246,7 @@ namespace osu.Game.Screens.Play
                 HUDOverlay.ShowHud.Value = false;
                 HUDOverlay.ShowHud.Disabled = true;
                 BreakOverlay.Hide();
-                skipOverlay.Hide();
+                skipIntroOverlay.Hide();
             }
 
             DrawableRuleset.FrameStableClock.WaitingOnFrames.BindValueChanged(waiting =>
@@ -292,7 +288,8 @@ namespace osu.Game.Screens.Play
             HealthProcessor.Failed += onFail;
 
             // Keep track of whether the storyboard ended after the playable portion
-            GameplayClockContainer.HasStoryboardEnded.ValueChanged += updateCompletionState;
+            if (DimmableStoryboard.HasStoryboardEnded != null)
+                DimmableStoryboard.HasStoryboardEnded.ValueChanged += updateCompletionState;
 
             foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
                 mod.ApplyToScoreProcessor(ScoreProcessor);
@@ -365,7 +362,7 @@ namespace osu.Game.Screens.Play
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre
                     },
-                    skipOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
+                    skipIntroOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
                     {
                         RequestSkip = performUserRequestedSkip
                     },
@@ -399,11 +396,8 @@ namespace osu.Game.Screens.Play
                 }
             };
 
-            if (!Configuration.AllowSkippingIntro)
-                skipOverlay.Expire();
-
-            if (!Configuration.AllowSkippingOutro)
-                skipOutroOverlay.Expire();
+            if (!Configuration.AllowSkipping)
+                skipIntroOverlay.Expire();
 
             if (Configuration.AllowRestart)
             {
@@ -637,8 +631,9 @@ namespace osu.Game.Screens.Play
                 return score.ScoreInfo;
             });
 
-            // show skip overlay if storyboard is enabled and has an outro
-            if (storyboardEnabled.Value && GameplayClockContainer.HasTimeLeftInStoryboard)
+            var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && (!DimmableStoryboard.HasStoryboardEnded?.Value ?? false);
+
+            if (storyboardHasOutro)
             {
                 skipOutroOverlay.Show();
                 completionProgressDelegate = null;
diff --git a/osu.Game/Screens/Play/PlayerConfiguration.cs b/osu.Game/Screens/Play/PlayerConfiguration.cs
index ad29563d54..18ee73374f 100644
--- a/osu.Game/Screens/Play/PlayerConfiguration.cs
+++ b/osu.Game/Screens/Play/PlayerConfiguration.cs
@@ -21,13 +21,8 @@ namespace osu.Game.Screens.Play
         public bool AllowRestart { get; set; } = true;
 
         /// <summary>
-        /// Whether the player should be allowed to skip the intro, advancing to the start of gameplay.
+        /// Whether the player should be allowed to skip intros/outros, advancing to the start of gameplay or the end of a storyboard.
         /// </summary>
-        public bool AllowSkippingIntro { get; set; } = true;
-
-        /// <summary>
-        /// Whether the player should be allowed to skip the outro, advancing to the end of a storyboard.
-        /// </summary>
-        public bool AllowSkippingOutro { get; set; } = true;
+        public bool AllowSkipping { get; set; } = true;
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index af4615c895..08c2bf1b4a 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using osuTK;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
@@ -82,5 +83,27 @@ namespace osu.Game.Storyboards.Drawables
             foreach (var layer in Children)
                 layer.Enabled = passing ? layer.Layer.VisibleWhenPassing : layer.Layer.VisibleWhenFailing;
         }
+
+        protected override void Update()
+        {
+            base.Update();
+            updateHasStoryboardEnded();
+        }
+
+        /// <summary>
+        /// Whether the storyboard has ended after the gameplay portion of the beatmap.
+        /// </summary>
+        public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
+
+        private readonly BindableBool hasStoryboardEnded = new BindableBool(true);
+
+        private void updateHasStoryboardEnded()
+        {
+            if (Storyboard.LatestEventTime == null)
+                return;
+
+            var time = Clock.CurrentTime;
+            hasStoryboardEnded.Value = time >= Storyboard.LatestEventTime;
+        }
     }
 }
diff --git a/osu.Game/Storyboards/IHasDuration.cs b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
similarity index 81%
rename from osu.Game/Storyboards/IHasDuration.cs
rename to osu.Game/Storyboards/IStoryboardElementHasDuration.cs
index 98f75b8ee2..e6ee373812 100644
--- a/osu.Game/Storyboards/IHasDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Storyboards
 {
-    public interface IHasDuration
+    public interface IStoryboardElementHasDuration
     {
         double EndTime { get; }
     }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 669f6ccc43..4fa64b7c34 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Storyboards
         /// Across all layers, find the latest point in time that a storyboard element ends at.
         /// Will return null if there are no elements.
         /// </summary>
-        public double? LatestEventTime => Layers.SelectMany(l => l.Elements.OfType<IHasDuration>()).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
+        public double? LatestEventTime => Layers.SelectMany(l => l.Elements.OfType<IStoryboardElementHasDuration>()).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
 
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 8f2c1e9e0c..51bdce3321 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -11,7 +11,7 @@ using JetBrains.Annotations;
 
 namespace osu.Game.Storyboards
 {
-    public class StoryboardSprite : IStoryboardElement, IHasDuration
+    public class StoryboardSprite : IStoryboardElement, IStoryboardElementHasDuration
     {
         private readonly List<CommandLoop> loops = new List<CommandLoop>();
         private readonly List<CommandTrigger> triggers = new List<CommandTrigger>();

From 33a665224e6c1f77846e9f03927fa72b4cd3859f Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Fri, 16 Apr 2021 01:03:15 -0400
Subject: [PATCH 09160/10326] Clean up skipOutroOverlay if skipping is disabled

---
 osu.Game/Screens/Play/Player.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 81d2621647..7ad9c1a8af 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -397,7 +397,10 @@ namespace osu.Game.Screens.Play
             };
 
             if (!Configuration.AllowSkipping)
+            {
                 skipIntroOverlay.Expire();
+                skipOutroOverlay.Expire();
+            }
 
             if (Configuration.AllowRestart)
             {

From 5c0ef55691f4debd21c0b2c1c094ec9a73ad7642 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 14:09:35 +0900
Subject: [PATCH 09161/10326] Rename `SliderPlacementState` to make way for
 more generic version

---
 .../Sliders/SliderPlacementBlueprint.cs       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 16e2a52279..efa249694a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private InputManager inputManager;
 
-        private PlacementState state;
+        private SliderPlacementState state;
         private PathControlPoint segmentStart;
         private PathControlPoint cursor;
         private int currentSegmentLength;
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 controlPointVisualiser = new PathControlPointVisualiser(HitObject, false)
             };
 
-            setState(PlacementState.Initial);
+            setState(SliderPlacementState.Initial);
         }
 
         protected override void LoadComplete()
@@ -73,12 +73,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             switch (state)
             {
-                case PlacementState.Initial:
+                case SliderPlacementState.Initial:
                     BeginPlacement();
                     HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
                     break;
 
-                case PlacementState.Body:
+                case SliderPlacementState.Body:
                     updateCursor();
                     break;
             }
@@ -91,11 +91,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             switch (state)
             {
-                case PlacementState.Initial:
+                case SliderPlacementState.Initial:
                     beginCurve();
                     break;
 
-                case PlacementState.Body:
+                case SliderPlacementState.Body:
                     if (canPlaceNewControlPoint(out var lastPoint))
                     {
                         // Place a new point by detatching the current cursor.
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            if (state == PlacementState.Body && e.Button == MouseButton.Right)
+            if (state == SliderPlacementState.Body && e.Button == MouseButton.Right)
                 endCurve();
             base.OnMouseUp(e);
         }
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void beginCurve()
         {
             BeginPlacement(commitStart: true);
-            setState(PlacementState.Body);
+            setState(SliderPlacementState.Body);
         }
 
         private void endCurve()
@@ -219,12 +219,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             tailCirclePiece.UpdateFrom(HitObject.TailCircle);
         }
 
-        private void setState(PlacementState newState)
+        private void setState(SliderPlacementState newState)
         {
             state = newState;
         }
 
-        private enum PlacementState
+        private enum SliderPlacementState
         {
             Initial,
             Body,

From 119c9b4294a2b5574b6f57bec7620562b4ae19ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 14:10:21 +0900
Subject: [PATCH 09162/10326] Fix placement blueprints not being correctly
 removed after a rolled back placement

---
 .../Blueprints/HoldNotePlacementBlueprint.cs  |  2 +-
 .../Blueprints/ManiaPlacementBlueprint.cs     |  2 +-
 .../Blueprints/TaikoSpanPlacementBlueprint.cs |  2 +-
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs  | 29 +++++++++++++++----
 .../Components/ComposeBlueprintContainer.cs   | 27 ++++++++++++-----
 5 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 1f92929392..a13afdfffe 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         {
             base.UpdateTimeAndPosition(result);
 
-            if (PlacementActive)
+            if (PlacementActive == PlacementState.Active)
             {
                 if (result.Time is double endTime)
                 {
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 5e09054667..8f25668dd0 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         {
             base.UpdateTimeAndPosition(result);
 
-            if (!PlacementActive)
+            if (PlacementActive == PlacementState.Waiting)
                 Column = result.Playfield as Column;
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
index e53b331f46..59249e6bf4 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
         {
             base.UpdateTimeAndPosition(result);
 
-            if (PlacementActive)
+            if (PlacementActive == PlacementState.Active)
             {
                 if (result.Time is double dragTime)
                 {
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index bfff93e7c5..6c1cd01796 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Whether the <see cref="HitObject"/> is currently mid-placement, but has not necessarily finished being placed.
         /// </summary>
-        public bool PlacementActive { get; private set; }
+        public PlacementState PlacementActive { get; private set; }
 
         /// <summary>
         /// The <see cref="HitObject"/> that is being placed.
@@ -72,7 +72,8 @@ namespace osu.Game.Rulesets.Edit
         protected void BeginPlacement(bool commitStart = false)
         {
             placementHandler.BeginPlacement(HitObject);
-            PlacementActive |= commitStart;
+            if (commitStart)
+                PlacementActive = PlacementState.Active;
         }
 
         /// <summary>
@@ -82,10 +83,19 @@ namespace osu.Game.Rulesets.Edit
         /// <param name="commit">Whether the object should be committed.</param>
         public void EndPlacement(bool commit)
         {
-            if (!PlacementActive)
-                BeginPlacement();
+            switch (PlacementActive)
+            {
+                case PlacementState.Finished:
+                    return;
+
+                case PlacementState.Waiting:
+                    // ensure placement was started before ending to make state handling simpler.
+                    BeginPlacement();
+                    break;
+            }
+
             placementHandler.EndPlacement(HitObject, commit);
-            PlacementActive = false;
+            PlacementActive = PlacementState.Finished;
         }
 
         /// <summary>
@@ -94,7 +104,7 @@ namespace osu.Game.Rulesets.Edit
         /// <param name="result">The snap result information.</param>
         public virtual void UpdateTimeAndPosition(SnapResult result)
         {
-            if (!PlacementActive)
+            if (PlacementActive == PlacementState.Waiting)
                 HitObject.StartTime = result.Time ?? EditorClock?.CurrentTime ?? Time.Current;
         }
 
@@ -125,5 +135,12 @@ namespace osu.Game.Rulesets.Edit
                     return false;
             }
         }
+
+        public enum PlacementState
+        {
+            Waiting,
+            Active,
+            Finished
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 5ab557804e..b0a6a091f0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void refreshTool()
         {
             removePlacement();
-            createPlacement();
+            ensurePlacementCreated();
         }
 
         private void updatePlacementPosition()
@@ -215,15 +215,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.Update();
 
-            if (Composer.CursorInPlacementArea)
-                createPlacement();
-            else if (currentPlacement?.PlacementActive == false)
-                removePlacement();
-
             if (currentPlacement != null)
             {
-                updatePlacementPosition();
+                switch (currentPlacement.PlacementActive)
+                {
+                    case PlacementBlueprint.PlacementState.Waiting:
+                        if (!Composer.CursorInPlacementArea)
+                            removePlacement();
+                        break;
+
+                    case PlacementBlueprint.PlacementState.Finished:
+                        removePlacement();
+                        break;
+                }
             }
+
+            if (Composer.CursorInPlacementArea)
+                ensurePlacementCreated();
+
+            if (currentPlacement != null)
+                updatePlacementPosition();
         }
 
         protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
@@ -249,7 +260,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 NewCombo.Value = TernaryState.False;
         }
 
-        private void createPlacement()
+        private void ensurePlacementCreated()
         {
             if (currentPlacement != null) return;
 

From 5652490d61c4ee2c5b046e8baf7e5524303a1a31 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 14:11:55 +0900
Subject: [PATCH 09163/10326] Fix OnUserBeganPlaying not being invoked if
 already watching

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 24 ++++++++++++++++
 .../Spectator/SpectatorStreamingClient.cs     | 28 +++++++++++++++++--
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 397b37718d..ea66144b21 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -204,6 +205,29 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("screen didn't change", () => Stack.CurrentScreen is SoloSpectator);
         }
 
+        [Test]
+        public void OnUserBeganPlayingCallbackInvokedOnNewAdd()
+        {
+            bool callbackInvoked = false;
+            Action<int, SpectatorState> callbackAction = (_, __) => callbackInvoked = true;
+
+            AddStep("bind first event", () => testSpectatorStreamingClient.OnUserBeganPlaying += callbackAction);
+            start();
+            AddAssert("callback invoked", () => callbackInvoked);
+
+            AddStep("reset", () =>
+            {
+                testSpectatorStreamingClient.OnUserBeganPlaying -= callbackAction;
+                callbackInvoked = false;
+            });
+
+            AddStep("bind event again", () => testSpectatorStreamingClient.OnUserBeganPlaying += callbackAction);
+            AddAssert("callback invoked", () => callbackInvoked);
+
+            // Don't leave the event bound if test run succeeded.
+            AddStep("reset", () => testSpectatorStreamingClient.OnUserBeganPlaying -= callbackAction);
+        }
+
         private OsuFramedReplayInputHandler replayHandler =>
             (OsuFramedReplayInputHandler)Stack.ChildrenOfType<OsuInputManager>().First().ReplayInputHandler;
 
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 3a586874fe..7bea49e102 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -60,6 +60,7 @@ namespace osu.Game.Online.Spectator
         private IBindable<IReadOnlyList<Mod>> currentMods { get; set; }
 
         private readonly SpectatorState currentState = new SpectatorState();
+        private readonly Dictionary<int, SpectatorState> currentUserStates = new Dictionary<int, SpectatorState>();
 
         private bool isPlaying;
 
@@ -68,10 +69,25 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, FrameDataBundle> OnNewFrames;
 
+        private event Action<int, SpectatorState> onUserBeganPlaying;
+
         /// <summary>
-        /// Called whenever a user starts a play session.
+        /// Called whenever a user starts a play session, or immediately if the user is being watched and currently in a play session.
         /// </summary>
-        public event Action<int, SpectatorState> OnUserBeganPlaying;
+        public event Action<int, SpectatorState> OnUserBeganPlaying
+        {
+            add
+            {
+                onUserBeganPlaying += value;
+
+                lock (userLock)
+                {
+                    foreach (var (userId, state) in currentUserStates)
+                        value?.Invoke(userId, state);
+                }
+            }
+            remove => onUserBeganPlaying -= value;
+        }
 
         /// <summary>
         /// Called whenever a user finishes a play session.
@@ -134,7 +150,10 @@ namespace osu.Game.Online.Spectator
             if (!playingUsers.Contains(userId))
                 playingUsers.Add(userId);
 
-            OnUserBeganPlaying?.Invoke(userId, state);
+            lock (userLock)
+                currentUserStates[userId] = state;
+
+            onUserBeganPlaying?.Invoke(userId, state);
 
             return Task.CompletedTask;
         }
@@ -143,6 +162,9 @@ namespace osu.Game.Online.Spectator
         {
             playingUsers.Remove(userId);
 
+            lock (userLock)
+                currentUserStates.Remove(userId);
+
             OnUserFinishedPlaying?.Invoke(userId, state);
 
             return Task.CompletedTask;

From 936bde28a35ef8ea0ba9f4af801c09e8ea6b4bcc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 16 Apr 2021 13:59:11 +0900
Subject: [PATCH 09164/10326] Remove manual handling of IsActive in
 RulesetInputManager

Now it is supported in framework
---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 5ab09f9516..d6f002ea2c 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Input.StateChanges;
 using osu.Framework.Input.StateChanges.Events;
 using osu.Framework.Input.States;
 using osu.Game.Configuration;
@@ -102,17 +100,6 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
-        // to avoid allocation
-        private readonly List<IInput> emptyInputList = new List<IInput>();
-
-        protected override List<IInput> GetPendingInputs()
-        {
-            if (replayInputHandler?.IsActive == false)
-                return emptyInputList;
-
-            return base.GetPendingInputs();
-        }
-
         #region Setting application (disables etc.)
 
         private Bindable<bool> mouseDisabled;

From 84bc81a6deda614ce407730d62750c7a52195671 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 16 Apr 2021 12:31:32 +0900
Subject: [PATCH 09165/10326] Make FramedReplayInputHandler.CurrentTime
 non-null

---
 .../EmptyFreeformFramedReplayInputHandler.cs        |  5 +----
 .../Replays/PippidonFramedReplayInputHandler.cs     |  5 +----
 .../Replays/CatchFramedReplayInputHandler.cs        |  5 +----
 .../Replays/OsuFramedReplayInputHandler.cs          |  5 +----
 .../Rulesets/Replays/FramedReplayInputHandler.cs    | 13 +++++++------
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
index f25ea6ec62..b7e2031bb9 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Utils;
@@ -30,9 +29,7 @@ namespace osu.Game.Rulesets.EmptyFreeform.Replays
                 if (frame == null)
                     return Vector2.Zero;
 
-                Debug.Assert(CurrentTime != null);
-
-                return Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time);
+                return Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time);
             }
         }
 
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
index 18efa6b885..69c7df5fac 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Utils;
 using osu.Game.Replays;
@@ -29,9 +28,7 @@ namespace osu.Game.Rulesets.Pippidon.Replays
                 if (frame == null)
                     return Vector2.Zero;
 
-                Debug.Assert(CurrentTime != null);
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
+                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
             }
         }
 
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
index 99d899db80..5fea855a16 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Utils;
@@ -29,9 +28,7 @@ namespace osu.Game.Rulesets.Catch.Replays
                 if (frame == null)
                     return null;
 
-                Debug.Assert(CurrentTime != null);
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
+                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
index cf48dc053f..6ac0bbd045 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Utils;
@@ -30,9 +29,7 @@ namespace osu.Game.Rulesets.Osu.Replays
                 if (frame == null)
                     return null;
 
-                Debug.Assert(CurrentTime != null);
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
+                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
             }
         }
 
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 279087ead9..0442acebe5 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.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.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
@@ -32,7 +34,7 @@ namespace osu.Game.Rulesets.Replays
         /// </summary>
         /// <remarks>Returns null if the current time is strictly before the first frame.</remarks>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
-        public TFrame CurrentFrame
+        public TFrame? CurrentFrame
         {
             get
             {
@@ -49,7 +51,7 @@ namespace osu.Game.Rulesets.Replays
         /// </summary>
         /// <remarks>Returns null if the current frame is the last frame.</remarks>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
-        public TFrame NextFrame
+        public TFrame? NextFrame
         {
             get
             {
@@ -69,8 +71,7 @@ namespace osu.Game.Rulesets.Replays
         // This input handler should be enabled only if there is at least one replay frame.
         public override bool IsActive => HasFrames;
 
-        // Can make it non-null but that is a breaking change.
-        protected double? CurrentTime { get; private set; }
+        protected double CurrentTime { get; private set; }
 
         protected virtual double AllowedImportantTimeSpan => sixty_frame_time * 1.2;
 
@@ -101,7 +102,7 @@ namespace osu.Game.Rulesets.Replays
                     return false;
 
                 return IsImportant(CurrentFrame) && // a button is in a pressed state
-                       Math.Abs(CurrentTime - NextFrame.Time ?? 0) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
+                       Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
             }
         }
 
@@ -151,7 +152,7 @@ namespace osu.Game.Rulesets.Replays
             CurrentTime = Math.Clamp(time, frameStart, frameEnd);
 
             // In an important section, a mid-frame time cannot be used and a null is returned instead.
-            return inImportantSection && frameStart < time && time < frameEnd ? null : CurrentTime;
+            return inImportantSection && frameStart < time && time < frameEnd ? null : (double?)CurrentTime;
         }
 
         private double getFrameTime(int index)

From 91c7d8d26cf2143cb85c53cf9770676947ab57e4 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 16 Apr 2021 12:53:58 +0900
Subject: [PATCH 09166/10326] Introduce `StartFrame` and `EndFrame` to simplify
 the replay interpolation code

---
 .../EmptyFreeformFramedReplayInputHandler.cs  | 18 ++--------
 .../PippidonFramedReplayInputHandler.cs       | 18 ++--------
 .../Replays/CatchFramedReplayInputHandler.cs  | 17 ++--------
 .../Replays/OsuFramedReplayInputHandler.cs    | 18 ++--------
 .../Replays/FramedReplayInputHandler.cs       | 34 ++++++++++++-------
 5 files changed, 33 insertions(+), 72 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
index b7e2031bb9..cc4483de31 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
@@ -7,7 +7,6 @@ using osu.Framework.Input.StateChanges;
 using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
-using osuTK;
 
 namespace osu.Game.Rulesets.EmptyFreeform.Replays
 {
@@ -20,24 +19,13 @@ namespace osu.Game.Rulesets.EmptyFreeform.Replays
 
         protected override bool IsImportant(EmptyFreeformReplayFrame frame) => frame.Actions.Any();
 
-        protected Vector2 Position
-        {
-            get
-            {
-                var frame = CurrentFrame;
-
-                if (frame == null)
-                    return Vector2.Zero;
-
-                return Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time);
-            }
-        }
-
         public override void CollectPendingInputs(List<IInput> inputs)
         {
+            var position = Interpolation.ValueAt(CurrentTime, StartFrame.Position, EndFrame.Position, StartFrame.Time, EndFrame.Time);
+
             inputs.Add(new MousePositionAbsoluteInput
             {
-                Position = GamefieldToScreenSpace(Position),
+                Position = GamefieldToScreenSpace(position),
             });
             inputs.Add(new ReplayState<EmptyFreeformAction>
             {
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
index 69c7df5fac..e005346e1e 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
@@ -6,7 +6,6 @@ using osu.Framework.Input.StateChanges;
 using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
-using osuTK;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {
@@ -19,24 +18,13 @@ namespace osu.Game.Rulesets.Pippidon.Replays
 
         protected override bool IsImportant(PippidonReplayFrame frame) => true;
 
-        protected Vector2 Position
-        {
-            get
-            {
-                var frame = CurrentFrame;
-
-                if (frame == null)
-                    return Vector2.Zero;
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
-            }
-        }
-
         public override void CollectPendingInputs(List<IInput> inputs)
         {
+            var position = Interpolation.ValueAt(CurrentTime, StartFrame.Position, EndFrame.Position, StartFrame.Time, EndFrame.Time);
+
             inputs.Add(new MousePositionAbsoluteInput
             {
-                Position = GamefieldToScreenSpace(Position)
+                Position = GamefieldToScreenSpace(position)
             });
         }
     }
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
index 5fea855a16..137328b1c3 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
@@ -19,27 +19,14 @@ namespace osu.Game.Rulesets.Catch.Replays
 
         protected override bool IsImportant(CatchReplayFrame frame) => frame.Actions.Any();
 
-        protected float? Position
-        {
-            get
-            {
-                var frame = CurrentFrame;
-
-                if (frame == null)
-                    return null;
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
-            }
-        }
-
         public override void CollectPendingInputs(List<IInput> inputs)
         {
-            if (!Position.HasValue) return;
+            var position = Interpolation.ValueAt(CurrentTime, StartFrame.Position, EndFrame.Position, StartFrame.Time, EndFrame.Time);
 
             inputs.Add(new CatchReplayState
             {
                 PressedActions = CurrentFrame?.Actions ?? new List<CatchAction>(),
-                CatcherX = Position.Value
+                CatcherX = position
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
index 6ac0bbd045..7d696dfb79 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
@@ -7,7 +7,6 @@ using osu.Framework.Input.StateChanges;
 using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Replays
 {
@@ -20,22 +19,11 @@ namespace osu.Game.Rulesets.Osu.Replays
 
         protected override bool IsImportant(OsuReplayFrame frame) => frame.Actions.Any();
 
-        protected Vector2? Position
-        {
-            get
-            {
-                var frame = CurrentFrame;
-
-                if (frame == null)
-                    return null;
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
-            }
-        }
-
         public override void CollectPendingInputs(List<IInput> inputs)
         {
-            inputs.Add(new MousePositionAbsoluteInput { Position = GamefieldToScreenSpace(Position ?? Vector2.Zero) });
+            var position = Interpolation.ValueAt(CurrentTime, StartFrame.Position, EndFrame.Position, StartFrame.Time, EndFrame.Time);
+
+            inputs.Add(new MousePositionAbsoluteInput { Position = GamefieldToScreenSpace(position) });
             inputs.Add(new ReplayState<OsuAction> { PressedActions = CurrentFrame?.Actions ?? new List<OsuAction>() });
         }
     }
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 0442acebe5..0f25a45177 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -33,32 +33,42 @@ namespace osu.Game.Rulesets.Replays
         /// The current time is always between the start and the end time of the current frame.
         /// </summary>
         /// <remarks>Returns null if the current time is strictly before the first frame.</remarks>
+        public TFrame? CurrentFrame => currentFrameIndex == -1 ? null : (TFrame)Frames[currentFrameIndex];
+
+        /// <summary>
+        /// The next frame of the replay.
+        /// The start time of <see cref="NextFrame"/> is always greater or equal to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
+        /// </summary>
+        /// <remarks>Returns null if the current frame is the last frame.</remarks>
+        public TFrame? NextFrame => currentFrameIndex == Frames.Count - 1 ? null : (TFrame)Frames[currentFrameIndex + 1];
+
+        /// <summary>
+        /// The frame for the start value of the interpolation of the replay movement.
+        /// </summary>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
-        public TFrame? CurrentFrame
+        public TFrame StartFrame
         {
             get
             {
                 if (!HasFrames)
-                    throw new InvalidOperationException($"Attempted to get {nameof(CurrentFrame)} of an empty replay");
+                    throw new InvalidOperationException($"Attempted to get {nameof(StartFrame)} of an empty replay");
 
-                return currentFrameIndex == -1 ? null : (TFrame)Frames[currentFrameIndex];
+                return (TFrame)Frames[Math.Max(0, currentFrameIndex)];
             }
         }
 
         /// <summary>
-        /// The next frame of the replay.
-        /// The start time is always greater or equal to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
+        /// The frame for the end value of the interpolation of the replay movement.
         /// </summary>
-        /// <remarks>Returns null if the current frame is the last frame.</remarks>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
-        public TFrame? NextFrame
+        public TFrame EndFrame
         {
             get
             {
                 if (!HasFrames)
-                    throw new InvalidOperationException($"Attempted to get {nameof(NextFrame)} of an empty replay");
+                    throw new InvalidOperationException($"Attempted to get {nameof(EndFrame)} of an empty replay");
 
-                return currentFrameIndex == Frames.Count - 1 ? null : (TFrame)Frames[currentFrameIndex + 1];
+                return (TFrame)Frames[Math.Min(currentFrameIndex + 1, Frames.Count - 1)];
             }
         }
 
@@ -98,11 +108,11 @@ namespace osu.Game.Rulesets.Replays
         {
             get
             {
-                if (!HasFrames || !FrameAccuratePlayback || CurrentFrame == null)
+                if (!HasFrames || !FrameAccuratePlayback || currentFrameIndex == -1)
                     return false;
 
-                return IsImportant(CurrentFrame) && // a button is in a pressed state
-                       Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
+                return IsImportant(StartFrame) && // a button is in a pressed state
+                       Math.Abs(CurrentTime - EndFrame.Time) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
             }
         }
 

From a965e8a75d1ae770d6e3d1a4548132e3b6abc2ce Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 16 Apr 2021 13:06:02 +0900
Subject: [PATCH 09167/10326] Remove AutoGenerator workaround of now-fixed
 issue

---
 .../Replays/CatchAutoGenerator.cs                |  4 ----
 .../TestSceneAutoGeneration.cs                   | 16 ++++++++--------
 .../Replays/ManiaAutoGenerator.cs                |  4 ----
 .../Replays/OsuAutoGenerator.cs                  |  2 --
 .../Replays/TaikoAutoGenerator.cs                |  1 -
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index 64ded8e94f..10230b6b78 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -125,10 +125,6 @@ namespace osu.Game.Rulesets.Catch.Replays
 
         private void addFrame(double time, float? position = null, bool dashing = false)
         {
-            // todo: can be removed once FramedReplayInputHandler correctly handles rewinding before first frame.
-            if (Replay.Frames.Count == 0)
-                Replay.Frames.Add(new CatchReplayFrame(time - 1, position, false, null));
-
             var last = currentFrame;
             currentFrame = new CatchReplayFrame(time, position, dashing, last);
             Replay.Frames.Add(currentFrame);
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
index 399a46aa77..cffec3dfd5 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         /// <summary>
         /// The number of frames which are generated at the start of a replay regardless of hitobject content.
         /// </summary>
-        private const int frame_offset = 1;
+        private const int frame_offset = 0;
 
         [Test]
         public void TestSingleNote()
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 2, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
             Assert.AreEqual(1000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Special1), "Special1 has not been pressed");
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 2, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
             Assert.AreEqual(3000, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Special1), "Special1 has not been pressed");
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 2, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
             Assert.AreEqual(1000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Key1, ManiaAction.Key2), "Key1 & Key2 have not been pressed");
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 2, "Incorrect number of frames");
 
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
             Assert.AreEqual(3000, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
@@ -119,7 +119,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 4, "Replay must have 4 generated frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 4, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect first note hit time");
             Assert.AreEqual(1000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 1].Time, "Incorrect first note release time");
             Assert.AreEqual(2000, generated.Frames[frame_offset + 2].Time, "Incorrect second note hit time");
@@ -146,7 +146,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 4, "Replay must have 4 generated frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 4, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect first note hit time");
             Assert.AreEqual(3000, generated.Frames[frame_offset + 2].Time, "Incorrect first note release time");
             Assert.AreEqual(2000, generated.Frames[frame_offset + 1].Time, "Incorrect second note hit time");
@@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 3, "Replay must have 3 generated frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 3, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect first note hit time");
             Assert.AreEqual(3000, generated.Frames[frame_offset + 1].Time, "Incorrect second note press time + first note release time");
             Assert.AreEqual(3000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 2].Time, "Incorrect second note release time");
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index 7c51d58b74..ada84dfac2 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -70,10 +70,6 @@ namespace osu.Game.Rulesets.Mania.Replays
                     }
                 }
 
-                // todo: can be removed once FramedReplayInputHandler correctly handles rewinding before first frame.
-                if (Replay.Frames.Count == 0)
-                    Replay.Frames.Add(new ManiaReplayFrame(group.First().Time - 1));
-
                 Replay.Frames.Add(new ManiaReplayFrame(group.First().Time, actions.ToArray()));
             }
 
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index 693943a08a..7b0cf651c8 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -71,8 +71,6 @@ namespace osu.Game.Rulesets.Osu.Replays
 
             buttonIndex = 0;
 
-            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)));
 
             for (int i = 0; i < Beatmap.HitObjects.Count; i++)
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index a3dbe672a4..fa0134aa94 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -35,7 +35,6 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
             bool hitButton = true;
 
-            Frames.Add(new TaikoReplayFrame(-100000));
             Frames.Add(new TaikoReplayFrame(Beatmap.HitObjects[0].StartTime - 1000));
 
             for (int i = 0; i < Beatmap.HitObjects.Count; i++)

From 965a1ead36c845a332ed03113717e3a116e0d0a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 14:38:30 +0900
Subject: [PATCH 09168/10326] Disallow zero-length slider blueprint placements

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs               | 4 +---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs       | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index d2c37061f0..8235e1bc79 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -41,9 +41,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addClickStep(MouseButton.Left);
             addClickStep(MouseButton.Right);
 
-            assertPlaced(true);
-            assertLength(0);
-            assertControlPointType(0, PathType.Linear);
+            assertPlaced(false);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index efa249694a..07166a4b74 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void endCurve()
         {
             updateSlider();
-            EndPlacement(true);
+            EndPlacement(HitObject.Path.ExpectedDistance?.Value > 0);
         }
 
         protected override void Update()

From d1c72f5e133cad392580c9dcd80f8fe2c9987816 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 15:10:53 +0900
Subject: [PATCH 09169/10326] Apply changes resulting from IBindable interface
 updates

---
 osu.Game/Rulesets/Mods/Mod.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 4879590e24..eab886c86e 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Reflection;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
@@ -170,7 +171,12 @@ namespace osu.Game.Rulesets.Mods
                 target.UnbindFrom(sourceBindable);
             }
             else
-                target.Parse(source);
+            {
+                if (!(target is IParseable parseable))
+                    throw new InvalidOperationException($"Bindable type {target.GetType().ReadableName()} is not IParseable.");
+
+                parseable.Parse(source);
+            }
         }
 
         public bool Equals(IMod other) => other is Mod them && Equals(them);

From 8c4804dd7a63e69540dcb22c1e800d9dc9917d39 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 15:40:06 +0900
Subject: [PATCH 09170/10326] Use nameof

---
 osu.Game/Rulesets/Mods/Mod.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index eab886c86e..7f48888abe 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.Mods
             else
             {
                 if (!(target is IParseable parseable))
-                    throw new InvalidOperationException($"Bindable type {target.GetType().ReadableName()} is not IParseable.");
+                    throw new InvalidOperationException($"Bindable type {target.GetType().ReadableName()} is not {nameof(IParseable)}.");
 
                 parseable.Parse(source);
             }

From d38e294d96e8a887ab188578925195f159c52ed6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 15:22:32 +0900
Subject: [PATCH 09171/10326] Centralise length validation function

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs         | 2 +-
 osu.Game/Rulesets/Objects/SliderPath.cs                         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 07166a4b74..77ea3b05dc 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void endCurve()
         {
             updateSlider();
-            EndPlacement(HitObject.Path.ExpectedDistance?.Value > 0);
+            EndPlacement(HitObject.Path.HasValidLength);
         }
 
         protected override void Update()
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index e64298f98d..55ef0bc5f6 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public readonly Bindable<double?> ExpectedDistance = new Bindable<double?>();
 
+        public bool HasValidLength => Distance > 0;
+
         /// <summary>
         /// The control points of the path.
         /// </summary>

From 2949a6bbdc1574473aee2d86eabd3534e46c32e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 15:22:58 +0900
Subject: [PATCH 09172/10326] Handle control point drag revert

---
 .../Sliders/Components/PathControlPointPiece.cs    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index ce9580d0f4..48e4db11ca 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -185,6 +185,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override void OnDrag(DragEvent e)
         {
+            Vector2[] oldControlPoints = slider.Path.ControlPoints.Select(cp => cp.Position.Value).ToArray();
+            var oldPosition = slider.Position;
+            var oldStartTime = slider.StartTime;
+
             if (ControlPoint == slider.Path.ControlPoints[0])
             {
                 // Special handling for the head control point - the position of the slider changes which means the snapped position and time have to be taken into account
@@ -202,6 +206,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             else
                 ControlPoint.Position.Value = dragStartPosition + (e.MousePosition - e.MouseDownPosition);
 
+            if (!slider.Path.HasValidLength)
+            {
+                for (var i = 0; i < slider.Path.ControlPoints.Count; i++)
+                    slider.Path.ControlPoints[i].Position.Value = oldControlPoints[i];
+
+                slider.Position = oldPosition;
+                slider.StartTime = oldStartTime;
+                return;
+            }
+
             // Maintain the path type in case it got defaulted to bezier at some point during the drag.
             PointsInSegment[0].Type.Value = dragPathType;
         }

From 89373638be7c1b17e119e0a5a43d8c83a3798e65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 15:23:16 +0900
Subject: [PATCH 09173/10326] Handle control point deletion when the resulting
 slider would be too short to be useful

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index ba9bb3c485..88fcb1e715 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             }
 
             // If there are 0 or 1 remaining control points, the slider is in a degenerate (single point) form and should be deleted
-            if (controlPoints.Count <= 1)
+            if (controlPoints.Count <= 1 || !slider.HitObject.Path.HasValidLength)
             {
                 placementHandler?.Delete(HitObject);
                 return;

From ff408b852e6f616c8ee1a1ead405f1b76489e713 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 15:23:27 +0900
Subject: [PATCH 09174/10326] Handle scaling a slider below minimum length

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 5a84bd6163..941cde5540 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             Quad scaledQuad = getSurroundingQuad(new OsuHitObject[] { slider });
             (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
-            if (xInBounds && yInBounds)
+            if (xInBounds && yInBounds && slider.Path.HasValidLength)
                 return;
 
             foreach (var point in slider.Path.ControlPoints)

From c59906e9253fefed8c72c17b8434c3089c3cb44f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 15:55:33 +0900
Subject: [PATCH 09175/10326] Fix an occasional crash when deleting a HitObject
 via internal means

---
 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 b5a28dc022..b1afbe0d61 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -438,8 +438,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void onBlueprintDeselected(SelectionBlueprint blueprint)
         {
-            SelectionHandler.HandleDeselected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 0);
+            SelectionHandler.HandleDeselected(blueprint);
 
             Composer.Playfield.SetKeepAlive(blueprint.HitObject, false);
         }

From 25f0f17766bffceb205a6f162aa621d7e35970ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 16:16:28 +0900
Subject: [PATCH 09176/10326] Attempt to fix match subscreen test failure

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index caa731f985..7c6c158b5a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -13,6 +13,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
@@ -128,6 +129,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
+            AddUntilStep("wait for ready button to be enabled", () => this.ChildrenOfType<MultiplayerReadyButton>().Single().ChildrenOfType<ReadyButton>().Single().Enabled.Value);
+
             AddStep("click ready button", () =>
             {
                 InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerReadyButton>().Single());

From ab1a1a1df4da3504a215b4acd22e39e88dca3b60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 16:55:17 +0900
Subject: [PATCH 09177/10326] Add failing test case due to div by zero

---
 .../Editor/TestSliderScaling.cs               | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestSliderScaling.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSliderScaling.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSliderScaling.cs
new file mode 100644
index 0000000000..e29a67c770
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSliderScaling.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    [TestFixture]
+    public class TestSliderScaling : TestSceneOsuEditor
+    {
+        private OsuPlayfield playfield;
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(Ruleset.Value, false);
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("get playfield", () => playfield = Editor.ChildrenOfType<OsuPlayfield>().First());
+            AddStep("seek to first timing point", () => EditorClock.Seek(Beatmap.Value.Beatmap.ControlPointInfo.TimingPoints.First().Time));
+        }
+
+        [Test]
+        public void TestScalingLinearSlider()
+        {
+            Slider slider = null;
+
+            AddStep("Add slider", () =>
+            {
+                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+
+                PathControlPoint[] points =
+                {
+                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(100, 0)),
+                };
+
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+            });
+
+            AddAssert("ensure object placed", () => EditorBeatmap.HitObjects.Count == 1);
+
+            moveMouse(new Vector2(300));
+            AddStep("select slider", () => InputManager.Click(MouseButton.Left));
+
+            double distanceBefore = 0;
+
+            AddStep("store distance", () => distanceBefore = slider.Path.Distance);
+
+            AddStep("move mouse to handle", () => InputManager.MoveMouseTo(Editor.ChildrenOfType<SelectionBoxDragHandle>().Skip(1).First()));
+            AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
+            moveMouse(new Vector2(300, 300));
+            AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            AddAssert("slider length shrunk", () => slider.Path.Distance < distanceBefore);
+        }
+
+        private void moveMouse(Vector2 pos) =>
+            AddStep($"move mouse to {pos}", () => InputManager.MoveMouseTo(playfield.ToScreenSpace(pos)));
+    }
+}

From 8de68e0ebf11ba4c39438e4c7ff051ff53bfbb53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 16:55:24 +0900
Subject: [PATCH 09178/10326] Fix div-by-zero when scaling a 1-dimensional
 slider

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 5a84bd6163..047634a3ab 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -205,10 +205,12 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
 
-            // Limit minimum distance between control points  after scaling to almost 0. Less than 0 causes the slider to flip, exactly 0 causes a crash through division by 0.
+            // Limit minimum distance between control points after scaling to almost 0. Less than 0 causes the slider to flip, exactly 0 causes a crash through division by 0.
             scale = Vector2.ComponentMax(new Vector2(Precision.FLOAT_EPSILON), sliderQuad.Size + scale) - sliderQuad.Size;
 
-            Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
+            Vector2 pathRelativeDeltaScale = new Vector2(
+                sliderQuad.Width == 0 ? 0 : 1 + scale.X / sliderQuad.Width,
+                sliderQuad.Height == 0 ? 0 : 1 + scale.Y / sliderQuad.Height);
 
             Queue<Vector2> oldControlPoints = new Queue<Vector2>();
 

From 30e00cc4aa8228e458979b135c8c2aa8213143b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 16:38:20 +0900
Subject: [PATCH 09179/10326] Add test coverage of selection / scaling
 scenarios

---
 .../Editor/TestSceneSliderLengthValidity.cs   | 198 ++++++++++++++++++
 1 file changed, 198 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
new file mode 100644
index 0000000000..74560ad15d
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
@@ -0,0 +1,198 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    [TestFixture]
+    public class TestSceneSliderLengthValidity : TestSceneOsuEditor
+    {
+        private OsuPlayfield playfield;
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(Ruleset.Value, false);
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("get playfield", () => playfield = Editor.ChildrenOfType<OsuPlayfield>().First());
+            AddStep("seek to first timing point", () => EditorClock.Seek(Beatmap.Value.Beatmap.ControlPointInfo.TimingPoints.First().Time));
+        }
+
+        [Test]
+        public void TestDraggingStartingPointRemainsValid()
+        {
+            Slider slider = null;
+
+            AddStep("Add slider", () =>
+            {
+                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+
+                PathControlPoint[] points =
+                {
+                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(100, 0)),
+                };
+
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+            });
+
+            AddAssert("ensure object placed", () => EditorBeatmap.HitObjects.Count == 1);
+
+            moveMouse(new Vector2(300));
+            AddStep("select slider", () => InputManager.Click(MouseButton.Left));
+
+            double distanceBefore = 0;
+
+            AddStep("store distance", () => distanceBefore = slider.Path.Distance);
+
+            moveMouse(new Vector2(300, 300));
+
+            AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
+            moveMouse(new Vector2(350, 300));
+            moveMouse(new Vector2(400, 300));
+            AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            AddAssert("slider length shrunk", () => slider.Path.Distance < distanceBefore);
+            AddAssert("ensure slider still has valid length", () => slider.Path.Distance > 0);
+        }
+
+        [Test]
+        public void TestDraggingEndingPointRemainsValid()
+        {
+            Slider slider = null;
+
+            AddStep("Add slider", () =>
+            {
+                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+
+                PathControlPoint[] points =
+                {
+                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(100, 0)),
+                };
+
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+            });
+
+            AddAssert("ensure object placed", () => EditorBeatmap.HitObjects.Count == 1);
+
+            moveMouse(new Vector2(300));
+            AddStep("select slider", () => InputManager.Click(MouseButton.Left));
+
+            double distanceBefore = 0;
+
+            AddStep("store distance", () => distanceBefore = slider.Path.Distance);
+
+            moveMouse(new Vector2(400, 300));
+
+            AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
+            moveMouse(new Vector2(350, 300));
+            moveMouse(new Vector2(300, 300));
+            AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            AddAssert("slider length shrunk", () => slider.Path.Distance < distanceBefore);
+            AddAssert("ensure slider still has valid length", () => slider.Path.Distance > 0);
+        }
+
+        /// <summary>
+        /// If a control point is deleted which results in the slider becoming so short it can't exist,
+        /// for simplicity delete the slider rather than having it in an invalid state.
+        ///
+        /// Eventually we may need to change this, based on user feedback. I think it's likely enough of
+        /// an edge case that we won't get many complaints, though (and there's always the undo button).
+        /// </summary>
+        [Test]
+        public void TestDeletingPointCausesSliderDeletion()
+        {
+            AddStep("Add slider", () =>
+            {
+                Slider slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+
+                PathControlPoint[] points =
+                {
+                    new PathControlPoint(new Vector2(0), PathType.PerfectCurve),
+                    new PathControlPoint(new Vector2(100, 0)),
+                    new PathControlPoint(new Vector2(0, 10))
+                };
+
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+            });
+
+            AddAssert("ensure object placed", () => EditorBeatmap.HitObjects.Count == 1);
+
+            AddStep("select slider", () => InputManager.Click(MouseButton.Left));
+
+            moveMouse(new Vector2(400, 300));
+            AddStep("delete second point", () =>
+            {
+                InputManager.PressKey(Key.ShiftLeft);
+                InputManager.Click(MouseButton.Right);
+                InputManager.ReleaseKey(Key.ShiftLeft);
+            });
+
+            AddAssert("ensure object deleted", () => EditorBeatmap.HitObjects.Count == 0);
+        }
+
+        /// <summary>
+        /// If a scale operation is performed where a single slider is the only thing selected, the path's shape will change.
+        /// If the scale results in the path becoming too short, further mouse movement in the same direction will not change the shape.
+        /// </summary>
+        [Test]
+        public void TestScalingSliderTooSmallRemainsValid()
+        {
+            Slider slider = null;
+
+            AddStep("Add slider", () =>
+            {
+                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+
+                PathControlPoint[] points =
+                {
+                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(0, 50)),
+                    new PathControlPoint(new Vector2(0, 100))
+                };
+
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+            });
+
+            AddAssert("ensure object placed", () => EditorBeatmap.HitObjects.Count == 1);
+
+            moveMouse(new Vector2(300));
+            AddStep("select slider", () => InputManager.Click(MouseButton.Left));
+
+            double distanceBefore = 0;
+
+            AddStep("store distance", () => distanceBefore = slider.Path.Distance);
+
+            AddStep("move mouse to handle", () => InputManager.MoveMouseTo(Editor.ChildrenOfType<SelectionBoxDragHandle>().Skip(1).First()));
+            AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
+            moveMouse(new Vector2(350, 400));
+            moveMouse(new Vector2(350, 350));
+            moveMouse(new Vector2(350, 300));
+            AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            AddAssert("slider length shrunk", () => slider.Path.Distance < distanceBefore);
+            AddAssert("ensure slider still has valid length", () => slider.Path.Distance > 0);
+        }
+
+        private void moveMouse(Vector2 pos) =>
+            AddStep($"move mouse to {pos}", () => InputManager.MoveMouseTo(playfield.ToScreenSpace(pos)));
+    }
+}

From fbf7d838da12f3a2b6d0c576b64558ec30a114d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 17:30:39 +0900
Subject: [PATCH 09180/10326] 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 32e236ccd5..0bb0bf171c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.415.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.416.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b5405f6262..e0a267241d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.415.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.416.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 09f6033bfe..bcd953c0bd 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.Framework.iOS" Version="2021.415.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.416.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.415.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.416.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From ca74f413cd10ccaee2dd1e51c5190019262b76c8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 17:29:42 +0900
Subject: [PATCH 09181/10326] Change to explicit method instead

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  2 +-
 .../Spectator/SpectatorStreamingClient.cs     | 38 ++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index ea66144b21..def662d3ea 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -221,7 +221,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 callbackInvoked = false;
             });
 
-            AddStep("bind event again", () => testSpectatorStreamingClient.OnUserBeganPlaying += callbackAction);
+            AddStep("bind event with run once immediately", () => testSpectatorStreamingClient.BindUserBeganPlaying(callbackAction, true));
             AddAssert("callback invoked", () => callbackInvoked);
 
             // Don't leave the event bound if test run succeeded.
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 7bea49e102..4bbc420223 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -69,25 +69,10 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, FrameDataBundle> OnNewFrames;
 
-        private event Action<int, SpectatorState> onUserBeganPlaying;
-
         /// <summary>
         /// Called whenever a user starts a play session, or immediately if the user is being watched and currently in a play session.
         /// </summary>
-        public event Action<int, SpectatorState> OnUserBeganPlaying
-        {
-            add
-            {
-                onUserBeganPlaying += value;
-
-                lock (userLock)
-                {
-                    foreach (var (userId, state) in currentUserStates)
-                        value?.Invoke(userId, state);
-                }
-            }
-            remove => onUserBeganPlaying -= value;
-        }
+        public event Action<int, SpectatorState> OnUserBeganPlaying;
 
         /// <summary>
         /// Called whenever a user finishes a play session.
@@ -153,7 +138,7 @@ namespace osu.Game.Online.Spectator
             lock (userLock)
                 currentUserStates[userId] = state;
 
-            onUserBeganPlaying?.Invoke(userId, state);
+            OnUserBeganPlaying?.Invoke(userId, state);
 
             return Task.CompletedTask;
         }
@@ -290,5 +275,24 @@ namespace osu.Game.Online.Spectator
 
             lastSendTime = Time.Current;
         }
+
+        /// <summary>
+        /// Bind an action to <see cref="OnUserBeganPlaying"/> with the option of running the bound action once immediately.
+        /// </summary>
+        /// <param name="callback">The action to perform when a user begins playing.</param>
+        /// <param name="runOnceImmediately">Whether the action provided in <paramref name="callback"/> should be run once immediately for all users currently playing.</param>
+        public void BindUserBeganPlaying(Action<int, SpectatorState> callback, bool runOnceImmediately = false)
+        {
+            OnUserBeganPlaying += callback;
+
+            if (!runOnceImmediately)
+                return;
+
+            lock (userLock)
+            {
+                foreach (var (userId, state) in currentUserStates)
+                    callback(userId, state);
+            }
+        }
     }
 }

From 7d23973ef8aa53c77b09201b829800060c61f401 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 05:01:58 -0400
Subject: [PATCH 09182/10326] Reset SessionStatics on activity

Closes #12424
---
 .../Visual/Components/TestSceneIdleTracker.cs | 39 +++++++++++++++----
 osu.Game/Configuration/SessionStatics.cs      |  8 ++++
 osu.Game/Input/GameIdleTracker.cs             | 11 +++++-
 osu.Game/OsuGame.cs                           |  2 +-
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index 4d64c7d35d..794f6ae83f 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Configuration;
 using osu.Game.Input;
 using osuTK;
 using osuTK.Graphics;
@@ -21,14 +22,17 @@ namespace osu.Game.Tests.Visual.Components
 
         private IdleTrackingBox[] boxes;
 
+        public SessionStatics sessionStatics;
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            sessionStatics = new SessionStatics();
             InputManager.MoveMouseTo(Vector2.Zero);
 
             Children = boxes = new[]
             {
-                box1 = new IdleTrackingBox(2000)
+                box1 = new IdleTrackingBox(2000, sessionStatics)
                 {
                     Name = "TopLeft",
                     RelativeSizeAxes = Axes.Both,
@@ -36,7 +40,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.TopLeft,
                 },
-                box2 = new IdleTrackingBox(4000)
+                box2 = new IdleTrackingBox(4000, sessionStatics)
                 {
                     Name = "TopRight",
                     RelativeSizeAxes = Axes.Both,
@@ -44,7 +48,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                 },
-                box3 = new IdleTrackingBox(6000)
+                box3 = new IdleTrackingBox(6000, sessionStatics)
                 {
                     Name = "BottomLeft",
                     RelativeSizeAxes = Axes.Both,
@@ -52,7 +56,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                 },
-                box4 = new IdleTrackingBox(8000)
+                box4 = new IdleTrackingBox(8000, sessionStatics)
                 {
                     Name = "BottomRight",
                     RelativeSizeAxes = Axes.Both,
@@ -61,6 +65,7 @@ namespace osu.Game.Tests.Visual.Components
                     Origin = Anchor.BottomRight,
                 },
             };
+
         });
 
         [Test]
@@ -133,6 +138,26 @@ namespace osu.Game.Tests.Visual.Components
             waitForAllIdle();
         }
 
+        [Test]
+        public void TestSessionStaticsReset()
+        {
+            AddStep("move to top left", () => InputManager.MoveMouseTo(box1));
+            AddStep("set session statics", () =>
+            {
+                sessionStatics.SetValue(Static.LoginOverlayDisplayed, true);
+                sessionStatics.SetValue(Static.MutedAudioNotificationShownOnce, true);
+                sessionStatics.SetValue(Static.LowBatteryNotificationShownOnce, true);
+                sessionStatics.SetValue(Static.LastHoverSoundPlaybackTime, (double?)1d);
+            });
+
+            AddStep("move away from box1", () => InputManager.MoveMouseTo(box4));
+            AddUntilStep("Wait for idle", () => box1.IsIdle);
+            AddAssert("LoginOverlayDisplayed is default", () => sessionStatics.Get<bool>(Static.LoginOverlayDisplayed) == false);
+            AddAssert("MutedAudioNotificationShownOnce is default", () => sessionStatics.Get<bool>(Static.MutedAudioNotificationShownOnce) == false);
+            AddAssert("LowBatteryNotificationShownOnce is default", () => sessionStatics.Get<bool>(Static.LowBatteryNotificationShownOnce) == false);
+            AddAssert("LastHoverSoundPlaybackTime is default", () => sessionStatics.Get<double?>(Static.LastHoverSoundPlaybackTime) == null);
+        }
+
         private void checkIdleStatus(int box, bool expectedIdle)
         {
             AddAssert($"box {box} is {(expectedIdle ? "idle" : "active")}", () => boxes[box - 1].IsIdle == expectedIdle);
@@ -140,7 +165,7 @@ namespace osu.Game.Tests.Visual.Components
 
         private void waitForAllIdle()
         {
-            AddUntilStep("Wait for all idle", () => box1.IsIdle && box2.IsIdle && box3.IsIdle && box4.IsIdle);
+            AddUntilStep("wait for all idle", () => box1.IsIdle && box2.IsIdle && box3.IsIdle && box4.IsIdle);
         }
 
         private class IdleTrackingBox : CompositeDrawable
@@ -149,7 +174,7 @@ namespace osu.Game.Tests.Visual.Components
 
             public bool IsIdle => idleTracker.IsIdle.Value;
 
-            public IdleTrackingBox(double timeToIdle)
+            public IdleTrackingBox(int timeToIdle, SessionStatics statics)
             {
                 Box box;
 
@@ -158,7 +183,7 @@ namespace osu.Game.Tests.Visual.Components
 
                 InternalChildren = new Drawable[]
                 {
-                    idleTracker = new IdleTracker(timeToIdle),
+                    idleTracker = new GameIdleTracker(timeToIdle, statics),
                     box = new Box
                     {
                         Colour = Color4.White,
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 71e1a1efcc..c960409de8 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -20,6 +20,14 @@ namespace osu.Game.Configuration
             SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
             SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
+
+        public void ResetValues()
+        {
+            SetValue(Static.LoginOverlayDisplayed, false);
+            SetValue(Static.MutedAudioNotificationShownOnce, false);
+            SetValue(Static.LowBatteryNotificationShownOnce, false);
+            SetValue(Static.LastHoverSoundPlaybackTime, (double?)null);
+        }
     }
 
     public enum Static
diff --git a/osu.Game/Input/GameIdleTracker.cs b/osu.Game/Input/GameIdleTracker.cs
index 260be7e5c9..53dab0c07b 100644
--- a/osu.Game/Input/GameIdleTracker.cs
+++ b/osu.Game/Input/GameIdleTracker.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
 using osu.Framework.Input;
+using osu.Game.Configuration;
 
 namespace osu.Game.Input
 {
@@ -9,9 +11,16 @@ namespace osu.Game.Input
     {
         private InputManager inputManager;
 
-        public GameIdleTracker(int time)
+        public GameIdleTracker(int time, SessionStatics statics)
             : base(time)
         {
+            IsIdle.ValueChanged += _ => UpdateStatics(_, statics);
+        }
+
+        protected static void UpdateStatics(ValueChangedEvent<bool> e, SessionStatics statics)
+        {
+            if (e.OldValue != e.NewValue && e.NewValue)
+                statics.ResetValues();
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 809e5d3c1b..97d4011607 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -575,7 +575,7 @@ namespace osu.Game
             Container logoContainer;
             BackButton.Receptor receptor;
 
-            dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
+            dependencies.CacheAs(idleTracker = new GameIdleTracker(6000, Dependencies.Get<SessionStatics>()));
 
             AddRange(new Drawable[]
             {

From 43e6e5e049a99ef85678cc4953a3f08335a6afdf Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 05:15:58 -0400
Subject: [PATCH 09183/10326] increase GameIdleTracker time to 5 minutes

---
 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 97d4011607..3930db01b9 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -575,7 +575,7 @@ namespace osu.Game
             Container logoContainer;
             BackButton.Receptor receptor;
 
-            dependencies.CacheAs(idleTracker = new GameIdleTracker(6000, Dependencies.Get<SessionStatics>()));
+            dependencies.CacheAs(idleTracker = new GameIdleTracker(300_000, Dependencies.Get<SessionStatics>()));
 
             AddRange(new Drawable[]
             {

From d9d50f0e88abae5d25c694036ae3ec9dc717dcc2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 18:16:22 +0900
Subject: [PATCH 09184/10326] Add border showing selected blueprints in
 timeline

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 47 ++++++++++++++++---
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index bea1aa2e3a..105e04d441 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -40,7 +40,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Bindable<int> indexInCurrentComboBindable;
         private Bindable<int> comboIndexBindable;
 
-        private readonly Drawable circle;
+        private readonly ExtendableCircle circle;
+        private readonly Border border;
 
         private readonly Container colouredComponents;
         private readonly OsuSpriteText comboIndexText;
@@ -62,7 +63,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.X;
             Height = circle_size;
 
-            AddRangeInternal(new[]
+            AddRangeInternal(new Drawable[]
             {
                 circle = new ExtendableCircle
                 {
@@ -70,6 +71,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                 },
+                border = new Border
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
                 colouredComponents = new Container
                 {
                     Anchor = Anchor.CentreLeft,
@@ -116,11 +123,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         protected override void OnSelected()
         {
             // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            updateComboColour();
         }
 
         protected override void OnDeselected()
         {
             // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            updateComboColour();
         }
 
         private void updateComboIndex() => comboIndexText.Text = (indexInCurrentComboBindable.Value + 1).ToString();
@@ -133,6 +142,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             var comboColours = skin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value ?? Array.Empty<Color4>();
             var comboColour = combo.GetComboColour(comboColours);
 
+            if (IsSelected)
+            {
+                border.Show();
+                comboColour = comboColour.Lighten(0.3f);
+            }
+            else
+            {
+                border.Hide();
+            }
+
             if (HitObject is IHasDuration duration && duration.Duration > 0)
                 circle.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
             else
@@ -340,22 +359,38 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
+        public class Border : ExtendableCircle
+        {
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Content.Child.Alpha = 0;
+                Content.Child.AlwaysPresent = true;
+
+                Content.BorderColour = colours.Yellow;
+                Content.EdgeEffect = new EdgeEffectParameters();
+            }
+        }
+
         /// <summary>
         /// A circle with externalised end caps so it can take up the full width of a relative width area.
         /// </summary>
         public class ExtendableCircle : CompositeDrawable
         {
-            private readonly Circle content;
+            protected readonly Circle Content;
 
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => content.ReceivePositionalInputAt(screenSpacePos);
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Content.ReceivePositionalInputAt(screenSpacePos);
 
-            public override Quad ScreenSpaceDrawQuad => content.ScreenSpaceDrawQuad;
+            public override Quad ScreenSpaceDrawQuad => Content.ScreenSpaceDrawQuad;
 
             public ExtendableCircle()
             {
                 Padding = new MarginPadding { Horizontal = -circle_size / 2f };
-                InternalChild = content = new Circle
+                InternalChild = Content = new Circle
                 {
+                    BorderColour = OsuColour.Gray(0.75f),
+                    BorderThickness = 4,
+                    Masking = true,
                     RelativeSizeAxes = Axes.Both,
                     EdgeEffect = new EdgeEffectParameters
                     {

From 377e5ce6b396c585a0652cf63253966c59c06948 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 18:21:35 +0900
Subject: [PATCH 09185/10326] Fix test incorrect sending state too often

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index def662d3ea..392419649b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -312,7 +312,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public override void WatchUser(int userId)
             {
-                if (sentState)
+                if (!PlayingUsers.Contains(userId) && sentState)
                 {
                     // usually the server would do this.
                     sendState(beatmapId);

From 46d2181d42930ac61f6da22f8146ba2b74357929 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 18:21:56 +0900
Subject: [PATCH 09186/10326] Remove now unnecessary (duplicating) test

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 392419649b..74ce66096e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.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.Linq;
 using System.Threading;
@@ -205,29 +204,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("screen didn't change", () => Stack.CurrentScreen is SoloSpectator);
         }
 
-        [Test]
-        public void OnUserBeganPlayingCallbackInvokedOnNewAdd()
-        {
-            bool callbackInvoked = false;
-            Action<int, SpectatorState> callbackAction = (_, __) => callbackInvoked = true;
-
-            AddStep("bind first event", () => testSpectatorStreamingClient.OnUserBeganPlaying += callbackAction);
-            start();
-            AddAssert("callback invoked", () => callbackInvoked);
-
-            AddStep("reset", () =>
-            {
-                testSpectatorStreamingClient.OnUserBeganPlaying -= callbackAction;
-                callbackInvoked = false;
-            });
-
-            AddStep("bind event with run once immediately", () => testSpectatorStreamingClient.BindUserBeganPlaying(callbackAction, true));
-            AddAssert("callback invoked", () => callbackInvoked);
-
-            // Don't leave the event bound if test run succeeded.
-            AddStep("reset", () => testSpectatorStreamingClient.OnUserBeganPlaying -= callbackAction);
-        }
-
         private OsuFramedReplayInputHandler replayHandler =>
             (OsuFramedReplayInputHandler)Stack.ChildrenOfType<OsuInputManager>().First().ReplayInputHandler;
 

From 274e33184b8afb9d10ef8b2d380edc8b742ee2ab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 18:22:22 +0900
Subject: [PATCH 09187/10326] Fix SpectatorScreen potentially missing user
 playing callbacks

---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 42 ++++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 6dd3144fc8..7be6c6183b 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -62,26 +62,42 @@ namespace osu.Game.Screens.Spectate
         {
             base.LoadComplete();
 
-            spectatorClient.OnUserBeganPlaying += userBeganPlaying;
-            spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
-            spectatorClient.OnNewFrames += userSentFrames;
-
-            foreach (var id in userIds)
+            populateAllUsers().ContinueWith(_ => Schedule(() =>
             {
-                userLookupCache.GetUserAsync(id).ContinueWith(u => Schedule(() =>
+                spectatorClient.BindUserBeganPlaying(userBeganPlaying, true);
+                spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
+                spectatorClient.OnNewFrames += userSentFrames;
+
+                managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
+                managerUpdated.BindValueChanged(beatmapUpdated);
+
+                lock (stateLock)
                 {
-                    if (u.Result == null)
+                    foreach (var (id, _) in userMap)
+                        spectatorClient.WatchUser(id);
+                }
+            }));
+        }
+
+        private Task populateAllUsers()
+        {
+            var userLookupTasks = new Task[userIds.Length];
+
+            for (int i = 0; i < userIds.Length; i++)
+            {
+                var userId = userIds[i];
+
+                userLookupTasks[i] = userLookupCache.GetUserAsync(userId).ContinueWith(task =>
+                {
+                    if (!task.IsCompletedSuccessfully)
                         return;
 
                     lock (stateLock)
-                        userMap[id] = u.Result;
-
-                    spectatorClient.WatchUser(id);
-                }), TaskContinuationOptions.OnlyOnRanToCompletion);
+                        userMap[userId] = task.Result;
+                });
             }
 
-            managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
-            managerUpdated.BindValueChanged(beatmapUpdated);
+            return Task.WhenAll(userLookupTasks);
         }
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> e)

From d760e81a9130e5e9ea484e9a77225e743d4c900f Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 05:22:41 -0400
Subject: [PATCH 09188/10326] Fix lint

---
 osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index 794f6ae83f..61efc61537 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -65,7 +65,6 @@ namespace osu.Game.Tests.Visual.Components
                     Origin = Anchor.BottomRight,
                 },
             };
-
         });
 
         [Test]

From ec0211809f145e203408523de7b7f94f0d4ca6fd Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 05:53:27 -0400
Subject: [PATCH 09189/10326] Apply peppy's suggestions

---
 .../Visual/Components/TestSceneIdleTracker.cs         | 11 ++++++++---
 osu.Game/Configuration/SessionStatics.cs              |  6 ++----
 osu.Game/Input/GameIdleTracker.cs                     | 11 +----------
 osu.Game/OsuGame.cs                                   | 11 ++++++++++-
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index 61efc61537..be8e50d649 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Components
 
         private IdleTrackingBox[] boxes;
 
-        public SessionStatics sessionStatics;
+        private SessionStatics sessionStatics;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
@@ -175,6 +175,7 @@ namespace osu.Game.Tests.Visual.Components
 
             public IdleTrackingBox(int timeToIdle, SessionStatics statics)
             {
+
                 Box box;
 
                 Alpha = 0.6f;
@@ -182,7 +183,7 @@ namespace osu.Game.Tests.Visual.Components
 
                 InternalChildren = new Drawable[]
                 {
-                    idleTracker = new GameIdleTracker(timeToIdle, statics),
+                    idleTracker = new GameIdleTracker(timeToIdle),
                     box = new Box
                     {
                         Colour = Color4.White,
@@ -190,7 +191,11 @@ namespace osu.Game.Tests.Visual.Components
                     },
                 };
 
-                idleTracker.IsIdle.BindValueChanged(idle => box.Colour = idle.NewValue ? Color4.White : Color4.Black, true);
+                idleTracker.IsIdle.BindValueChanged(idle =>
+                {
+                    box.Colour = idle.NewValue ? Color4.White : Color4.Black;
+                    if (idle.NewValue) statics.ResetValues();
+                }, true);
             }
         }
     }
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index c960409de8..99089dd076 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -23,10 +23,8 @@ namespace osu.Game.Configuration
 
         public void ResetValues()
         {
-            SetValue(Static.LoginOverlayDisplayed, false);
-            SetValue(Static.MutedAudioNotificationShownOnce, false);
-            SetValue(Static.LowBatteryNotificationShownOnce, false);
-            SetValue(Static.LastHoverSoundPlaybackTime, (double?)null);
+            ConfigStore.Clear();
+            InitialiseDefaults();
         }
     }
 
diff --git a/osu.Game/Input/GameIdleTracker.cs b/osu.Game/Input/GameIdleTracker.cs
index 53dab0c07b..260be7e5c9 100644
--- a/osu.Game/Input/GameIdleTracker.cs
+++ b/osu.Game/Input/GameIdleTracker.cs
@@ -1,9 +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.Input;
-using osu.Game.Configuration;
 
 namespace osu.Game.Input
 {
@@ -11,16 +9,9 @@ namespace osu.Game.Input
     {
         private InputManager inputManager;
 
-        public GameIdleTracker(int time, SessionStatics statics)
+        public GameIdleTracker(int time)
             : base(time)
         {
-            IsIdle.ValueChanged += _ => UpdateStatics(_, statics);
-        }
-
-        protected static void UpdateStatics(ValueChangedEvent<bool> e, SessionStatics statics)
-        {
-            if (e.OldValue != e.NewValue && e.NewValue)
-                statics.ResetValues();
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 3930db01b9..0abb0373fa 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -575,7 +575,16 @@ namespace osu.Game
             Container logoContainer;
             BackButton.Receptor receptor;
 
-            dependencies.CacheAs(idleTracker = new GameIdleTracker(300_000, Dependencies.Get<SessionStatics>()));
+            dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
+
+            GameIdleTracker sessionIdleTracker = new GameIdleTracker(300_000);
+            Add(sessionIdleTracker);
+
+            sessionIdleTracker.IsIdle.BindValueChanged((e) =>
+            {
+                if (e.NewValue)
+                    Dependencies.Get<SessionStatics>().ResetValues();
+            });
 
             AddRange(new Drawable[]
             {

From b413ffae3e883384b236b0a3c9a1c27e5ff0f843 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 18:54:33 +0900
Subject: [PATCH 09190/10326] Fix test going offscreen in headless execution

---
 .../Editor/TestSceneSliderLengthValidity.cs               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
index 74560ad15d..ce529f2a88 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("Add slider", () =>
             {
-                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300, 200) };
 
                 PathControlPoint[] points =
                 {
@@ -183,9 +183,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("move mouse to handle", () => InputManager.MoveMouseTo(Editor.ChildrenOfType<SelectionBoxDragHandle>().Skip(1).First()));
             AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
-            moveMouse(new Vector2(350, 400));
-            moveMouse(new Vector2(350, 350));
-            moveMouse(new Vector2(350, 300));
+            moveMouse(new Vector2(300, 300));
+            moveMouse(new Vector2(300, 250));
+            moveMouse(new Vector2(300, 200));
             AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
 
             AddAssert("slider length shrunk", () => slider.Path.Distance < distanceBefore);

From 8d6c30c73bb39b5383a9119ea351a760e3b48722 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 05:57:36 -0400
Subject: [PATCH 09191/10326] Fix lint

---
 osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index be8e50d649..0bc0fbf5d4 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -175,7 +175,6 @@ namespace osu.Game.Tests.Visual.Components
 
             public IdleTrackingBox(int timeToIdle, SessionStatics statics)
             {
-
                 Box box;
 
                 Alpha = 0.6f;

From 9c6914d29ded9af216b56e6bcacb19ec2c71f88e Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 06:26:45 -0400
Subject: [PATCH 09192/10326] Fix redundant lambda parentheses

---
 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 0abb0373fa..898a2baccf 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -580,7 +580,7 @@ namespace osu.Game
             GameIdleTracker sessionIdleTracker = new GameIdleTracker(300_000);
             Add(sessionIdleTracker);
 
-            sessionIdleTracker.IsIdle.BindValueChanged((e) =>
+            sessionIdleTracker.IsIdle.BindValueChanged(e =>
             {
                 if (e.NewValue)
                     Dependencies.Get<SessionStatics>().ResetValues();

From a4e3e53a63788fdd09029836c779b94ff7389fd3 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 06:34:57 -0400
Subject: [PATCH 09193/10326] Revert back to hardcoded SessionStatics reset
 values

---
 osu.Game/Configuration/SessionStatics.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 99089dd076..872a910837 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -23,8 +23,11 @@ namespace osu.Game.Configuration
 
         public void ResetValues()
         {
-            ConfigStore.Clear();
-            InitialiseDefaults();
+            SetValue(Static.LoginOverlayDisplayed, false);
+            SetValue(Static.MutedAudioNotificationShownOnce, false);
+            SetValue(Static.LowBatteryNotificationShownOnce, false);
+            SetValue(Static.LastHoverSoundPlaybackTime, (double?)null);
+            SetValue<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
     }
 

From d26fa46ef2a9f80cfbd2c93d54b6572727f4d080 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 19:40:56 +0900
Subject: [PATCH 09194/10326] Record every 60fps interval

---
 osu.Game/Rulesets/UI/ReplayRecorder.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index a4d46e3888..643ded4cad 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -58,6 +58,12 @@ namespace osu.Game.Rulesets.UI
             spectatorStreaming?.EndPlaying();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            recordFrame(false);
+        }
+
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
             recordFrame(false);

From f98ffbb1b365294b424ee28938072ba59b9cf1e2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:15:42 +0900
Subject: [PATCH 09195/10326] Remove ClockToProcess, always process underlying
 clock

---
 osu.Game/Screens/Play/GameplayClock.cs         | 18 +++++++++---------
 .../Screens/Play/GameplayClockContainer.cs     |  4 +---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index db4b5d300b..54aa395f5f 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public class GameplayClock : IFrameBasedClock
     {
-        private readonly IFrameBasedClock underlyingClock;
+        internal readonly IFrameBasedClock UnderlyingClock;
 
         public readonly BindableBool IsPaused = new BindableBool();
 
@@ -30,12 +30,12 @@ namespace osu.Game.Screens.Play
 
         public GameplayClock(IFrameBasedClock underlyingClock)
         {
-            this.underlyingClock = underlyingClock;
+            UnderlyingClock = underlyingClock;
         }
 
-        public double CurrentTime => underlyingClock.CurrentTime;
+        public double CurrentTime => UnderlyingClock.CurrentTime;
 
-        public double Rate => underlyingClock.Rate;
+        public double Rate => UnderlyingClock.Rate;
 
         /// <summary>
         /// The rate of gameplay when playback is at 100%.
@@ -59,19 +59,19 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public bool IsRunning => underlyingClock.IsRunning;
+        public bool IsRunning => UnderlyingClock.IsRunning;
 
         public void ProcessFrame()
         {
             // intentionally not updating the underlying clock (handled externally).
         }
 
-        public double ElapsedFrameTime => underlyingClock.ElapsedFrameTime;
+        public double ElapsedFrameTime => UnderlyingClock.ElapsedFrameTime;
 
-        public double FramesPerSecond => underlyingClock.FramesPerSecond;
+        public double FramesPerSecond => UnderlyingClock.FramesPerSecond;
 
-        public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
+        public FrameTimeInfo TimeInfo => UnderlyingClock.TimeInfo;
 
-        public IClock Source => underlyingClock;
+        public IClock Source => UnderlyingClock;
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6d863f0094..b7dc55277f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -80,15 +80,13 @@ namespace osu.Game.Screens.Play
         protected override void Update()
         {
             if (!IsPaused.Value)
-                ClockToProcess.ProcessFrame();
+                GameplayClock.UnderlyingClock.ProcessFrame();
 
             base.Update();
         }
 
         protected abstract void OnIsPausedChanged(ValueChangedEvent<bool> isPaused);
 
-        protected virtual IFrameBasedClock ClockToProcess => AdjustableClock;
-
         protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
     }
 }

From 6301111fa3c1d274c68766d3c1456ebd74d95138 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:15:42 +0900
Subject: [PATCH 09196/10326] Remove ClockToProcess, always process underlying
 clock

---
 osu.Game/Screens/Play/GameplayClock.cs         | 18 +++++++++---------
 .../Screens/Play/GameplayClockContainer.cs     |  4 +---
 .../Play/MasterGameplayClockContainer.cs       |  2 --
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index db4b5d300b..54aa395f5f 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public class GameplayClock : IFrameBasedClock
     {
-        private readonly IFrameBasedClock underlyingClock;
+        internal readonly IFrameBasedClock UnderlyingClock;
 
         public readonly BindableBool IsPaused = new BindableBool();
 
@@ -30,12 +30,12 @@ namespace osu.Game.Screens.Play
 
         public GameplayClock(IFrameBasedClock underlyingClock)
         {
-            this.underlyingClock = underlyingClock;
+            UnderlyingClock = underlyingClock;
         }
 
-        public double CurrentTime => underlyingClock.CurrentTime;
+        public double CurrentTime => UnderlyingClock.CurrentTime;
 
-        public double Rate => underlyingClock.Rate;
+        public double Rate => UnderlyingClock.Rate;
 
         /// <summary>
         /// The rate of gameplay when playback is at 100%.
@@ -59,19 +59,19 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public bool IsRunning => underlyingClock.IsRunning;
+        public bool IsRunning => UnderlyingClock.IsRunning;
 
         public void ProcessFrame()
         {
             // intentionally not updating the underlying clock (handled externally).
         }
 
-        public double ElapsedFrameTime => underlyingClock.ElapsedFrameTime;
+        public double ElapsedFrameTime => UnderlyingClock.ElapsedFrameTime;
 
-        public double FramesPerSecond => underlyingClock.FramesPerSecond;
+        public double FramesPerSecond => UnderlyingClock.FramesPerSecond;
 
-        public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
+        public FrameTimeInfo TimeInfo => UnderlyingClock.TimeInfo;
 
-        public IClock Source => underlyingClock;
+        public IClock Source => UnderlyingClock;
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6d863f0094..b7dc55277f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -80,15 +80,13 @@ namespace osu.Game.Screens.Play
         protected override void Update()
         {
             if (!IsPaused.Value)
-                ClockToProcess.ProcessFrame();
+                GameplayClock.UnderlyingClock.ProcessFrame();
 
             base.Update();
         }
 
         protected abstract void OnIsPausedChanged(ValueChangedEvent<bool> isPaused);
 
-        protected virtual IFrameBasedClock ClockToProcess => AdjustableClock;
-
         protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
     }
 }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 83e21f3c1d..5eb82bf0fa 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -128,8 +128,6 @@ namespace osu.Game.Screens.Play
             Seek(skipTarget);
         }
 
-        protected override IFrameBasedClock ClockToProcess => userOffsetClock;
-
         protected override GameplayClock CreateGameplayClock(IFrameBasedClock source)
         {
             // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.

From 3a78c19f9695ad5519e8494e8e888f25d50998b9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:33:29 +0900
Subject: [PATCH 09197/10326] More refactoring/xmldocs

---
 .../Screens/Play/GameplayClockContainer.cs    | 64 ++++++++++++++-----
 .../Play/MasterGameplayClockContainer.cs      | 16 +++--
 2 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index b7dc55277f..642ede5f1c 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -9,26 +9,36 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.Play
 {
+    /// <summary>
+    /// Encapsulates gameplay timing logic and provides a <see cref="GameplayClock"/> via DI for gameplay components to use.
+    /// </summary>
     public abstract class GameplayClockContainer : Container
     {
         /// <summary>
-        /// The final clock which is exposed to underlying components.
+        /// The final clock which is exposed to gameplay components.
         /// </summary>
         public GameplayClock GameplayClock { get; private set; }
 
+        /// <summary>
+        /// Whether gameplay is paused.
+        /// </summary>
         public readonly BindableBool IsPaused = new BindableBool();
 
         /// <summary>
-        /// The decoupled clock used for gameplay. Should be used for seeks and clock control.
+        /// The adjustable source clock used for gameplay. Should be used for seeks and clock control.
         /// </summary>
-        protected readonly DecoupleableInterpolatingFramedClock AdjustableClock;
+        protected readonly DecoupleableInterpolatingFramedClock AdjustableSource;
 
+        /// <summary>
+        /// Creates a new <see cref="GameplayClockContainer"/>.
+        /// </summary>
+        /// <param name="sourceClock">The source <see cref="IClock"/> used for timing.</param>
         protected GameplayClockContainer(IClock sourceClock)
         {
             RelativeSizeAxes = Axes.Both;
 
-            AdjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
-            AdjustableClock.ChangeSource(sourceClock);
+            AdjustableSource = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
+            AdjustableSource.ChangeSource(sourceClock);
 
             IsPaused.BindValueChanged(OnIsPausedChanged);
         }
@@ -37,21 +47,24 @@ namespace osu.Game.Screens.Play
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-            dependencies.CacheAs(GameplayClock = CreateGameplayClock(AdjustableClock));
+            dependencies.CacheAs(GameplayClock = CreateGameplayClock(AdjustableSource));
             GameplayClock.IsPaused.BindTo(IsPaused);
 
             return dependencies;
         }
 
+        /// <summary>
+        /// Starts gameplay.
+        /// </summary>
         public virtual void Start()
         {
-            if (!AdjustableClock.IsRunning)
+            if (!AdjustableSource.IsRunning)
             {
                 // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
                 // This accounts for the clock source potentially taking time to enter a completely stopped state
                 Seek(GameplayClock.CurrentTime);
 
-                AdjustableClock.Start();
+                AdjustableSource.Start();
             }
 
             IsPaused.Value = false;
@@ -59,19 +72,22 @@ namespace osu.Game.Screens.Play
 
         /// <summary>
         /// Seek to a specific time in gameplay.
-        /// <remarks>
-        /// Adjusts for any offsets which have been applied (so the seek may not be the expected point in time on the underlying audio track).
-        /// </remarks>
         /// </summary>
         /// <param name="time">The destination time to seek to.</param>
-        public virtual void Seek(double time) => AdjustableClock.Seek(time);
+        public virtual void Seek(double time) => AdjustableSource.Seek(time);
 
+        /// <summary>
+        /// Stops gameplay.
+        /// </summary>
         public virtual void Stop() => IsPaused.Value = true;
 
+        /// <summary>
+        /// Restarts gameplay.
+        /// </summary>
         public virtual void Restart()
         {
-            AdjustableClock.Seek(0);
-            AdjustableClock.Stop();
+            AdjustableSource.Seek(0);
+            AdjustableSource.Stop();
 
             if (!IsPaused.Value)
                 Start();
@@ -85,8 +101,26 @@ namespace osu.Game.Screens.Play
             base.Update();
         }
 
-        protected abstract void OnIsPausedChanged(ValueChangedEvent<bool> isPaused);
+        /// <summary>
+        /// Invoked when the value of <see cref="IsPaused"/> is changed to start or stop the <see cref="AdjustableSource"/> clock.
+        /// </summary>
+        /// <param name="isPaused">Whether the clock should now be paused.</param>
+        protected virtual void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
+        {
+            if (isPaused.NewValue)
+                AdjustableSource.Stop();
+            else
+                AdjustableSource.Start();
+        }
 
+        /// <summary>
+        /// Creates the final <see cref="GameplayClock"/> which is exposed via DI to be used by gameplay components.
+        /// </summary>
+        /// <remarks>
+        /// Any intermediate clocks such as platform offsets should be applied here.
+        /// </remarks>
+        /// <param name="source">The <see cref="IFrameBasedClock"/> providing the source time.</param>
+        /// <returns>The final <see cref="GameplayClock"/>.</returns>
         protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
     }
 }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 5eb82bf0fa..e7b4645734 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public const double MINIMUM_SKIP_TIME = 1000;
 
-        protected Track Track => (Track)AdjustableClock.Source;
+        protected Track Track => (Track)AdjustableSource.Source;
 
         public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
         {
@@ -84,17 +84,25 @@ namespace osu.Game.Screens.Play
 
             Seek(startTime);
 
-            AdjustableClock.ProcessFrame();
+            AdjustableSource.ProcessFrame();
         }
 
         protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
         {
+            // The source is stopped by a frequency fade first.
             if (isPaused.NewValue)
-                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => AdjustableClock.Stop());
+                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => AdjustableSource.Stop());
             else
                 this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
         }
 
+        /// <summary>
+        /// Seek to a specific time in gameplay.
+        /// </summary>
+        /// <remarks>
+        /// Adjusts for any offsets which have been applied (so the seek may not be the expected point in time on the underlying audio track).
+        /// </remarks>
+        /// <param name="time">The destination time to seek to.</param>
         public override void Seek(double time)
         {
             // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
@@ -146,7 +154,7 @@ namespace osu.Game.Screens.Play
         public void StopUsingBeatmapClock()
         {
             removeSourceClockAdjustments();
-            AdjustableClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
+            AdjustableSource.ChangeSource(new TrackVirtual(beatmap.Track.Length));
         }
 
         private bool speedAdjustmentsApplied;

From 314b1646bd22db171ecf35c805860dd578394b41 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:47:09 +0900
Subject: [PATCH 09198/10326] Add xmldoc to MasterGameplayClockContainer

---
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index e7b4645734..db0aa23001 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -16,6 +16,16 @@ using osu.Game.Configuration;
 
 namespace osu.Game.Screens.Play
 {
+    /// <summary>
+    /// A <see cref="GameplayClockContainer"/> which uses a <see cref="WorkingBeatmap"/> as a source.
+    /// <para>
+    /// This is the most complete <see cref="GameplayClockContainer"/> which takes into account all user and platform offsets,
+    /// and provides implementations for user actions such as skipping or adjusting playback rates that may occur during gameplay.
+    /// </para>
+    /// </summary>
+    /// <remarks>
+    /// This is intended to be used as a single controller for gameplay, or as a reference source for other <see cref="GameplayClockContainer"/>s.
+    /// </remarks>
     public class MasterGameplayClockContainer : GameplayClockContainer
     {
         /// <summary>

From 7d5d7088cd4dd1be6a0c1ec5f7a8113a2ab68aa4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:51:07 +0900
Subject: [PATCH 09199/10326] Remove now unnecessary override

---
 .../Spectate/MultiplayerSpectatorPlayer.cs            | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 19cc9f18ad..d4ff65cd01 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
@@ -33,21 +32,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
     public class SubGameplayClockContainer : GameplayClockContainer
     {
-        public new DecoupleableInterpolatingFramedClock AdjustableClock => base.AdjustableClock;
-
         public SubGameplayClockContainer(IClock sourceClock)
             : base(sourceClock)
         {
         }
 
-        protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
-        {
-            if (isPaused.NewValue)
-                AdjustableClock.Stop();
-            else
-                AdjustableClock.Start();
-        }
-
         protected override GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
     }
 }

From 44e13a91ade2e0aa18fb8d159eebed51e9b30787 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:51:42 +0900
Subject: [PATCH 09200/10326] Rename test scene to match class

---
 ...ockContainer.cs => TestSceneMasterGameplayClockContainer.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Gameplay/{TestSceneGameplayClockContainer.cs => TestSceneMasterGameplayClockContainer.cs} (92%)

diff --git a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
similarity index 92%
rename from osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
rename to osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
index 4d5dcabbba..77ada958d7 100644
--- a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
@@ -10,7 +10,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Gameplay
 {
     [HeadlessTest]
-    public class TestSceneGameplayClockContainer : OsuTestScene
+    public class TestSceneMasterGameplayClockContainer : OsuTestScene
     {
         [Test]
         public void TestStartThenElapsedTime()

From 4c5d4752b13807081be44f17a736822f6f57e3dc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 22:47:52 +0900
Subject: [PATCH 09201/10326] Rename classes to reduce redundant naming

---
 ...rTest.cs => TestCaseCatchUpSyncManager.cs} | 48 +++++++++----------
 .../Spectate/MultiplayerSpectator.cs          |  6 +--
 .../Spectate/MultiplayerSpectatorPlayer.cs    |  4 +-
 .../Multiplayer/Spectate/PlayerInstance.cs    |  4 +-
 ...chUpSlaveClock.cs => CatchUpSlaveClock.cs} |  6 +--
 ...UpSyncManager.cs => CatchUpSyncManager.cs} | 12 ++---
 ...ISpectatorSlaveClock.cs => ISlaveClock.cs} |  4 +-
 ...pectatorSyncManager.cs => ISyncManager.cs} | 16 +++----
 8 files changed, 50 insertions(+), 50 deletions(-)
 rename osu.Game.Tests/OnlinePlay/{MultiplayerCatchUpSyncManagerTest.cs => TestCaseCatchUpSyncManager.cs} (73%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{SpectatorCatchUpSlaveClock.cs => CatchUpSlaveClock.cs} (90%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{SpectatorCatchUpSyncManager.cs => CatchUpSyncManager.cs} (90%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{ISpectatorSlaveClock.cs => ISlaveClock.cs} (83%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{ISpectatorSyncManager.cs => ISyncManager.cs} (50%)

diff --git a/osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs b/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
similarity index 73%
rename from osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs
rename to osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
index 6aa1219d53..a8c0a763e9 100644
--- a/osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs
+++ b/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
@@ -12,20 +12,20 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.OnlinePlay
 {
     [HeadlessTest]
-    public class MultiplayerCatchUpSyncManagerTest : OsuTestScene
+    public class TestCaseCatchUpSyncManager : OsuTestScene
     {
         private TestManualClock master;
-        private SpectatorCatchUpSyncManager syncManager;
+        private CatchUpSyncManager syncManager;
 
-        private TestSpectatorSlaveClock slave1;
-        private TestSpectatorSlaveClock slave2;
+        private TestSlaveClock slave1;
+        private TestSlaveClock slave2;
 
         [SetUp]
         public void Setup()
         {
-            syncManager = new SpectatorCatchUpSyncManager(master = new TestManualClock());
-            syncManager.AddSlave(slave1 = new TestSpectatorSlaveClock(1));
-            syncManager.AddSlave(slave2 = new TestSpectatorSlaveClock(2));
+            syncManager = new CatchUpSyncManager(master = new TestManualClock());
+            syncManager.AddSlave(slave1 = new TestSlaveClock(1));
+            syncManager.AddSlave(slave2 = new TestSlaveClock(2));
 
             Schedule(() => Child = syncManager);
         }
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.OnlinePlay
         [Test]
         public void TestMasterClockDoesNotStartWhenNoneReadyForMaximumDelayTime()
         {
-            AddWaitStep($"wait {SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {CatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(false);
         }
 
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.OnlinePlay
         public void TestMasterClockStartsWhenAnyReadyForMaximumDelayTime()
         {
             setWaiting(() => slave1, false);
-            AddWaitStep($"wait {SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {CatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(true);
         }
 
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(SpectatorCatchUpSyncManager.SYNC_TARGET + 1);
+            setMasterTime(CatchUpSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, false);
         }
 
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 1);
+            setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 1);
             assertCatchingUp(() => slave1, true);
             assertCatchingUp(() => slave2, true);
         }
@@ -83,8 +83,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 1);
-            setSlaveTime(() => slave1, SpectatorCatchUpSyncManager.SYNC_TARGET + 1);
+            setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 1);
+            setSlaveTime(() => slave1, CatchUpSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, true);
         }
 
@@ -93,8 +93,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 2);
-            setSlaveTime(() => slave1, SpectatorCatchUpSyncManager.SYNC_TARGET);
+            setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 2);
+            setSlaveTime(() => slave1, CatchUpSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertCatchingUp(() => slave2, true);
         }
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -SpectatorCatchUpSyncManager.SYNC_TARGET);
+            setSlaveTime(() => slave1, -CatchUpSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertSlaveState(() => slave1, true);
         }
@@ -114,7 +114,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -SpectatorCatchUpSyncManager.SYNC_TARGET - 1);
+            setSlaveTime(() => slave1, -CatchUpSyncManager.SYNC_TARGET - 1);
 
             // This is a silent catchup, where IsCatchingUp = false but IsRunning = false also.
             assertCatchingUp(() => slave1, false);
@@ -135,7 +135,7 @@ namespace osu.Game.Tests.OnlinePlay
             assertSlaveState(() => slave1, false);
         }
 
-        private void setWaiting(Func<TestSpectatorSlaveClock> slave, bool waiting)
+        private void setWaiting(Func<TestSlaveClock> slave, bool waiting)
             => AddStep($"set slave {slave().Id} waiting = {waiting}", () => slave().WaitingOnFrames.Value = waiting);
 
         private void setAllWaiting(bool waiting) => AddStep($"set all slaves waiting = {waiting}", () =>
@@ -150,28 +150,28 @@ namespace osu.Game.Tests.OnlinePlay
         /// <summary>
         /// slave.Time = master.Time - offsetFromMaster
         /// </summary>
-        private void setSlaveTime(Func<TestSpectatorSlaveClock> slave, double offsetFromMaster)
+        private void setSlaveTime(Func<TestSlaveClock> slave, double offsetFromMaster)
             => AddStep($"set slave {slave().Id} = master - {offsetFromMaster}", () => slave().Seek(master.CurrentTime - offsetFromMaster));
 
         private void assertMasterState(bool running)
             => AddAssert($"master clock {(running ? "is" : "is not")} running", () => master.IsRunning == running);
 
-        private void assertCatchingUp(Func<TestSpectatorSlaveClock> slave, bool catchingUp) =>
+        private void assertCatchingUp(Func<TestSlaveClock> slave, bool catchingUp) =>
             AddAssert($"slave {slave().Id} {(catchingUp ? "is" : "is not")} catching up", () => slave().IsCatchingUp == catchingUp);
 
-        private void assertSlaveState(Func<TestSpectatorSlaveClock> slave, bool running)
+        private void assertSlaveState(Func<TestSlaveClock> slave, bool running)
             => AddAssert($"slave {slave().Id} {(running ? "is" : "is not")} running", () => slave().IsRunning == running);
 
-        private class TestSpectatorSlaveClock : TestManualClock, ISpectatorSlaveClock
+        private class TestSlaveClock : TestManualClock, ISlaveClock
         {
             public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
-            IBindable<bool> ISpectatorSlaveClock.WaitingOnFrames => WaitingOnFrames;
+            IBindable<bool> ISlaveClock.WaitingOnFrames => WaitingOnFrames;
 
             public bool IsCatchingUp { get; set; }
 
             public readonly int Id;
 
-            public TestSpectatorSlaveClock(int id)
+            public TestSlaveClock(int id)
             {
                 Id = id;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index e1af95b870..23cc787e20 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly PlayerInstance[] instances;
         private MasterGameplayClockContainer masterClockContainer;
-        private ISpectatorSyncManager syncManager;
+        private ISyncManager syncManager;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
 
@@ -66,12 +66,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             InternalChildren = new[]
             {
-                (Drawable)(syncManager = new SpectatorCatchUpSyncManager(masterClockContainer)),
+                (Drawable)(syncManager = new CatchUpSyncManager(masterClockContainer)),
                 masterClockContainer
             };
 
             for (int i = 0; i < UserIds.Length; i++)
-                grid.Add(instances[i] = new PlayerInstance(UserIds[i], new SpectatorCatchUpSlaveClock(masterClockContainer.GameplayClock)));
+                grid.Add(instances[i] = new PlayerInstance(UserIds[i], new CatchUpSlaveClock(masterClockContainer.GameplayClock)));
 
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index d4ff65cd01..55f483586c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -12,9 +12,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        private readonly ISpectatorSlaveClock gameplayClock;
+        private readonly ISlaveClock gameplayClock;
 
-        public MultiplayerSpectatorPlayer(Score score, ISpectatorSlaveClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, ISlaveClock gameplayClock)
             : base(score)
         {
             this.gameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 31d2d458df..407732ee2e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
         public readonly int UserId;
-        public readonly SpectatorCatchUpSlaveClock GameplayClock;
+        public readonly CatchUpSlaveClock GameplayClock;
 
         public Score Score { get; private set; }
 
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly LoadingLayer loadingLayer;
         private OsuScreenStack stack;
 
-        public PlayerInstance(int userId, SpectatorCatchUpSlaveClock gameplayClock)
+        public PlayerInstance(int userId, CatchUpSlaveClock gameplayClock)
         {
             UserId = userId;
             GameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
similarity index 90%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
index 4b529021de..f128ea619b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
@@ -8,9 +8,9 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A <see cref="ISpectatorSlaveClock"/> which catches up using rate adjustment.
+    /// A <see cref="ISlaveClock"/> which catches up using rate adjustment.
     /// </summary>
-    public class SpectatorCatchUpSlaveClock : ISpectatorSlaveClock
+    public class CatchUpSlaveClock : ISlaveClock
     {
         /// <summary>
         /// The catch up rate.
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
         private readonly IFrameBasedClock masterClock;
 
-        public SpectatorCatchUpSlaveClock(IFrameBasedClock masterClock)
+        public CatchUpSlaveClock(IFrameBasedClock masterClock)
         {
             this.masterClock = masterClock;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
similarity index 90%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
index 46e86177ca..68bfef6500 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
@@ -10,9 +10,9 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A <see cref="ISpectatorSyncManager"/> which synchronises de-synced slave clocks through catchup.
+    /// A <see cref="ISyncManager"/> which synchronises de-synced slave clocks through catchup.
     /// </summary>
-    public class SpectatorCatchUpSyncManager : Component, ISpectatorSyncManager
+    public class CatchUpSyncManager : Component, ISyncManager
     {
         /// <summary>
         /// The offset from the master clock to which slaves should be synchronised to.
@@ -37,19 +37,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         /// <summary>
         /// The slave clocks.
         /// </summary>
-        private readonly List<ISpectatorSlaveClock> slaves = new List<ISpectatorSlaveClock>();
+        private readonly List<ISlaveClock> slaves = new List<ISlaveClock>();
 
         private bool hasStarted;
         private double? firstStartAttemptTime;
 
-        public SpectatorCatchUpSyncManager(IAdjustableClock master)
+        public CatchUpSyncManager(IAdjustableClock master)
         {
             Master = master;
         }
 
-        public void AddSlave(ISpectatorSlaveClock clock) => slaves.Add(clock);
+        public void AddSlave(ISlaveClock clock) => slaves.Add(clock);
 
-        public void RemoveSlave(ISpectatorSlaveClock clock) => slaves.Remove(clock);
+        public void RemoveSlave(ISlaveClock clock) => slaves.Remove(clock);
 
         protected override void Update()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
similarity index 83%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
index d8733d4322..f45cb1fde6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
@@ -7,9 +7,9 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A clock which is used by <see cref="MultiplayerSpectatorPlayer"/>s and managed by an <see cref="ISpectatorSyncManager"/>.
+    /// A clock which is used by <see cref="MultiplayerSpectatorPlayer"/>s and managed by an <see cref="ISyncManager"/>.
     /// </summary>
-    public interface ISpectatorSlaveClock : IFrameBasedClock, IAdjustableClock
+    public interface ISlaveClock : IFrameBasedClock, IAdjustableClock
     {
         /// <summary>
         /// Whether this clock is waiting on frames to continue playback.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
similarity index 50%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
index 5edbb3bc2c..d63ac7e1ca 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
@@ -6,9 +6,9 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// Manages the synchronisation between one or more <see cref="ISpectatorSlaveClock"/>s in relation to a master clock.
+    /// Manages the synchronisation between one or more <see cref="ISlaveClock"/>s in relation to a master clock.
     /// </summary>
-    public interface ISpectatorSyncManager
+    public interface ISyncManager
     {
         /// <summary>
         /// The master clock which slaves should synchronise to.
@@ -16,15 +16,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         IAdjustableClock Master { get; }
 
         /// <summary>
-        /// Adds an <see cref="ISpectatorSlaveClock"/> to manage.
+        /// Adds an <see cref="ISlaveClock"/> to manage.
         /// </summary>
-        /// <param name="clock">The <see cref="ISpectatorSlaveClock"/> to add.</param>
-        void AddSlave(ISpectatorSlaveClock clock);
+        /// <param name="clock">The <see cref="ISlaveClock"/> to add.</param>
+        void AddSlave(ISlaveClock clock);
 
         /// <summary>
-        /// Removes an <see cref="ISpectatorSlaveClock"/>, stopping it from being managed by this <see cref="ISpectatorSyncManager"/>.
+        /// Removes an <see cref="ISlaveClock"/>, stopping it from being managed by this <see cref="ISyncManager"/>.
         /// </summary>
-        /// <param name="clock">The <see cref="ISpectatorSlaveClock"/> to remove.</param>
-        void RemoveSlave(ISpectatorSlaveClock clock);
+        /// <param name="clock">The <see cref="ISlaveClock"/> to remove.</param>
+        void RemoveSlave(ISlaveClock clock);
     }
 }

From 72ebcb157f585869b5b41593d0d262561ffa7369 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 22:57:27 +0900
Subject: [PATCH 09202/10326] Dispose track on dispose

---
 .../Spectate/GameplayIsolationContainer.cs            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
index 3ccb67d342..7b6a544084 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
@@ -22,13 +23,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Cached]
         private readonly Bindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>();
 
+        private readonly Track track;
+
         public GameplayIsolationContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods)
         {
             this.beatmap.Value = beatmap;
             this.ruleset.Value = ruleset;
             this.mods.Value = mods;
 
-            beatmap.LoadTrack();
+            track = beatmap.LoadTrack();
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -39,5 +42,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             dependencies.CacheAs(mods.BeginLease(false));
             return dependencies;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            track?.Dispose();
+        }
     }
 }

From 724fe3d37847ee70044e90c21c219ff79da03cc4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 22:57:34 +0900
Subject: [PATCH 09203/10326] Remove unnecessary method

---
 .../OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs   | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index b2d114d9cc..830378f129 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -75,19 +75,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             cellContainer.Add(cell);
         }
 
-        public void Remove(Drawable content)
-        {
-            var cell = cellContainer.FirstOrDefault(c => c.Content == content);
-            if (cell == null)
-                return;
-
-            if (cell.IsMaximised)
-                toggleMaximisationState(cell);
-
-            cellContainer.Remove(cell);
-            facadeContainer.Remove(facadeContainer[cell.FacadeIndex]);
-        }
-
         /// <summary>
         /// The content added to this grid.
         /// </summary>

From d5b26b0ab506a62ececcf94781df307023ca0362 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 23:01:34 +0900
Subject: [PATCH 09204/10326] Fix incorrect test spectator client
 implementation

---
 .../Visual/Multiplayer/TestSceneMultiplayerSpectator.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 4026258830..e395ebd29d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -321,7 +321,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             public override void WatchUser(int userId)
             {
-                if (userSentStateDictionary.TryGetValue(userId, out var sent) && sent)
+                if (!PlayingUsers.Contains(userId) && userSentStateDictionary.TryGetValue(userId, out var sent) && sent)
                 {
                     // usually the server would do this.
                     sendState(userId, userBeatmapDictionary[userId]);

From dc899515ec7ffd460edd3a148a651c344daaf74f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 17 Apr 2021 00:56:53 +0900
Subject: [PATCH 09205/10326] Empty commit


From d5a1e00feb34dbfe3ec6a67ba5a64d51df47c905 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 17 Apr 2021 03:32:47 +0300
Subject: [PATCH 09206/10326] Improve "barrel roll" mod settings description

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index b6cfa514a1..edf846e6ec 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
@@ -30,6 +32,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Description => "The whole playfield is on a wheel!";
         public override double ScoreMultiplier => 1;
 
+        public override string SettingDescription => $"{SpinSpeed.Value}rpm, {Direction.Value.GetDescription().ToLowerInvariant()}";
+
         public void Update(Playfield playfield)
         {
             playfield.Rotation = (Direction.Value == RotationDirection.CounterClockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);

From 78c850878486280548694a5641b29bbf59e50a71 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 17 Apr 2021 03:52:07 +0300
Subject: [PATCH 09207/10326] Remove unused using directive

gotta git gud
---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index edf846e6ec..af3986aceb 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.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;
 using osu.Framework.Graphics;

From 892a8a7cd2e2305dbfa159b0044333aa61e34507 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 17 Apr 2021 04:23:48 +0300
Subject: [PATCH 09208/10326] Remove unnecessary comma

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index af3986aceb..00596e1486 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Description => "The whole playfield is on a wheel!";
         public override double ScoreMultiplier => 1;
 
-        public override string SettingDescription => $"{SpinSpeed.Value}rpm, {Direction.Value.GetDescription().ToLowerInvariant()}";
+        public override string SettingDescription => $"{SpinSpeed.Value}rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
 
         public void Update(Playfield playfield)
         {

From c1082ddb9a7e03ac420a4cb7aa5e468dde614b22 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 17 Apr 2021 06:28:07 +0300
Subject: [PATCH 09209/10326] Add space before the unit

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index 00596e1486..bcbb0f4366 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Description => "The whole playfield is on a wheel!";
         public override double ScoreMultiplier => 1;
 
-        public override string SettingDescription => $"{SpinSpeed.Value}rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
+        public override string SettingDescription => $"{SpinSpeed.Value} rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
 
         public void Update(Playfield playfield)
         {

From 250c7403e87f88c65139a55792902dc8d173a995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 17 Apr 2021 13:50:00 +0200
Subject: [PATCH 09210/10326] Fix idle tracker assuming time starts at 0

`IdleTracker` in its construction quietly assumed that the clock it
receives from its parent starts ticking from 0 at the point at which it
is passed down. This is not necessarily the case when headless
executions are involved, which means that the initial state of the
tracker could be computed as idle incorrectly.

Resolve by explicitly reading the clock time at the point of
`LoadComplete()`.
---
 osu.Game/Input/IdleTracker.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Input/IdleTracker.cs b/osu.Game/Input/IdleTracker.cs
index 63a6348b57..2d6a21d1cf 100644
--- a/osu.Game/Input/IdleTracker.cs
+++ b/osu.Game/Input/IdleTracker.cs
@@ -42,6 +42,12 @@ namespace osu.Game.Input
             RelativeSizeAxes = Axes.Both;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateLastInteractionTime();
+        }
+
         protected override void Update()
         {
             base.Update();

From f3ea51eeedc8113ac83c79e5f0daaa241e755f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 17 Apr 2021 14:23:32 +0200
Subject: [PATCH 09211/10326] Adjust tests to not rely on invalid assumption

---
 osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index 4d64c7d35d..fdee53f0be 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -81,6 +81,13 @@ namespace osu.Game.Tests.Visual.Components
         [Test]
         public void TestMovement()
         {
+            checkIdleStatus(1, false);
+            checkIdleStatus(2, false);
+            checkIdleStatus(3, false);
+            checkIdleStatus(4, false);
+
+            waitForAllIdle();
+
             AddStep("move to top right", () => InputManager.MoveMouseTo(box2));
 
             checkIdleStatus(1, true);
@@ -102,6 +109,8 @@ namespace osu.Game.Tests.Visual.Components
         [Test]
         public void TestTimings()
         {
+            waitForAllIdle();
+
             AddStep("move to centre", () => InputManager.MoveMouseTo(Content));
 
             checkIdleStatus(1, false);

From 6773162f17bab34cb88272d915d07b19bfab7f47 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sat, 17 Apr 2021 08:47:27 -0400
Subject: [PATCH 09212/10326] Implicitly set defaults when resetting values

---
 osu.Game/Configuration/SessionStatics.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 872a910837..e57b1c2fdf 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -23,11 +23,11 @@ namespace osu.Game.Configuration
 
         public void ResetValues()
         {
-            SetValue(Static.LoginOverlayDisplayed, false);
-            SetValue(Static.MutedAudioNotificationShownOnce, false);
-            SetValue(Static.LowBatteryNotificationShownOnce, false);
-            SetValue(Static.LastHoverSoundPlaybackTime, (double?)null);
-            SetValue<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
+            GetOriginalBindable<bool>(Static.LoginOverlayDisplayed).SetDefault();
+            GetOriginalBindable<bool>(Static.MutedAudioNotificationShownOnce).SetDefault();
+            GetOriginalBindable<bool>(Static.LowBatteryNotificationShownOnce).SetDefault();
+            GetOriginalBindable<double?>(Static.LastHoverSoundPlaybackTime).SetDefault();
+            GetOriginalBindable<APISeasonalBackgrounds>(Static.SeasonalBackgrounds).SetDefault();
         }
     }
 

From cf3aaff7bd1bf796f826d18f8a56c7a07d1359c6 Mon Sep 17 00:00:00 2001
From: Fabian <lindgrenfabian@gmail.com>
Date: Sat, 17 Apr 2021 16:01:23 +0200
Subject: [PATCH 09213/10326] Add floating fruits mod

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |  3 ++-
 .../Mods/CatchModFloatingFruits.cs            | 23 +++++++++++++++++++
 osu.Game/Screens/Play/Player.cs               |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index f4ddbd3021..6206815728 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -126,7 +126,8 @@ namespace osu.Game.Rulesets.Catch
                 case ModType.Fun:
                     return new Mod[]
                     {
-                        new MultiMod(new ModWindUp(), new ModWindDown())
+                        new MultiMod(new ModWindUp(), new ModWindDown()),
+                        new CatchModFloatingFruits()
                     };
 
                 default:
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
new file mode 100644
index 0000000000..4e25739521
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -0,0 +1,23 @@
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModFloatingFruits : Mod, IApplicableToPlayer
+    {
+        public override string Name => "Floating Fruits";
+        public override string Acronym => "FF";
+        public override string Description => "The fruits are... floating?";
+        public override double ScoreMultiplier => 1;
+        public override IconUsage? Icon => FontAwesome.Brands.Fly;
+
+        public void ApplyToPlayer(Player player)
+        {
+            player.DrawableRuleset.Anchor = Anchor.Centre;
+            player.DrawableRuleset.Origin = Anchor.Centre;
+            player.DrawableRuleset.Scale = new osuTK.Vector2(1, -1);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dd3f58439b..59231a1c30 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Play
 
         protected HealthProcessor HealthProcessor { get; private set; }
 
-        protected DrawableRuleset DrawableRuleset { get; private set; }
+        public DrawableRuleset DrawableRuleset { get; set; }
 
         protected HUDOverlay HUDOverlay { get; private set; }
 

From 5d274dbce86b3b8b03abb72f176e57a4209c4576 Mon Sep 17 00:00:00 2001
From: Fabian <lindgrenfabian@gmail.com>
Date: Sat, 17 Apr 2021 16:38:28 +0200
Subject: [PATCH 09214/10326] replace IApplicableToPlayer with
 IApplicableToDrawableRuleset

---
 .../Mods/CatchModFloatingFruits.cs                  | 13 ++++++++-----
 osu.Game/Screens/Play/Player.cs                     |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index 4e25739521..4e34cbe9e2 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -1,11 +1,13 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
-    public class CatchModFloatingFruits : Mod, IApplicableToPlayer
+    public class CatchModFloatingFruits : Mod, IApplicableToDrawableRuleset<CatchHitObject>
     {
         public override string Name => "Floating Fruits";
         public override string Acronym => "FF";
@@ -13,11 +15,12 @@ namespace osu.Game.Rulesets.Catch.Mods
         public override double ScoreMultiplier => 1;
         public override IconUsage? Icon => FontAwesome.Brands.Fly;
 
-        public void ApplyToPlayer(Player player)
+        public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
         {
-            player.DrawableRuleset.Anchor = Anchor.Centre;
-            player.DrawableRuleset.Origin = Anchor.Centre;
-            player.DrawableRuleset.Scale = new osuTK.Vector2(1, -1);
+            drawableRuleset.Anchor = Anchor.Centre;
+            drawableRuleset.Origin = Anchor.Centre;
+            drawableRuleset.Scale = new osuTK.Vector2(1, -1);
         }
+
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 59231a1c30..dd3f58439b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Play
 
         protected HealthProcessor HealthProcessor { get; private set; }
 
-        public DrawableRuleset DrawableRuleset { get; set; }
+        protected DrawableRuleset DrawableRuleset { get; private set; }
 
         protected HUDOverlay HUDOverlay { get; private set; }
 

From 448574e7e67cba8ead7bf1c27e0b892d9fec3754 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 17 Apr 2021 17:33:53 +0200
Subject: [PATCH 09215/10326] Use `WorkingBeatmap` instead of `IBeatmap`

This lets us access things like the background, track, etc. which are necessary for quality and filesize checks.

Also improves the structure of the `CheckBackgroundTest` class in the process.
---
 .../Checks/CheckOffscreenObjectsTest.cs       | 70 ++++++++-----------
 .../Edit/Checks/CheckOffscreenObjects.cs      |  4 +-
 .../Edit/OsuBeatmapVerifier.cs                |  2 +-
 .../Editing/Checks/CheckBackgroundTest.cs     |  7 +-
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  2 +-
 .../Rulesets/Edit/Checks/CheckBackground.cs   | 10 +--
 .../Rulesets/Edit/Checks/Components/ICheck.cs |  4 +-
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs    |  2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  |  3 +-
 9 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index f9445a9a96..db347960ef 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
@@ -30,25 +31,23 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
         [Test]
         public void TestCircleInCenter()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
                     new HitCircle
                     {
                         StartTime = 3000,
-                        Position = playfield_centre // Playfield is 640 x 480.
+                        Position = playfield_centre
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestCircleNearEdge()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -58,15 +57,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Position = new Vector2(5, 5)
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestCircleNearEdgeStackedOffscreen()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenCircle(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -77,15 +74,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         StackHeight = 5
                     }
                 }
-            };
-
-            assertOffscreenCircle(beatmap);
+            });
         }
 
         [Test]
         public void TestCircleOffscreen()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenCircle(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -95,15 +90,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Position = new Vector2(0, 0)
                     }
                 }
-            };
-
-            assertOffscreenCircle(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderInCenter()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -118,15 +111,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestSliderNearEdge()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -141,15 +132,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestSliderNearEdgeStackedOffscreen()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -165,15 +154,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         StackHeight = 5
                     }
                 }
-            };
-
-            assertOffscreenSlider(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderOffscreenStart()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenSlider(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -188,15 +175,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            assertOffscreenSlider(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderOffscreenEnd()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenSlider(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -211,15 +196,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            assertOffscreenSlider(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderOffscreenPath()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenSlider(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -236,14 +219,17 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
+            });
+        }
 
-            assertOffscreenSlider(beatmap);
+        private void assertOk(IBeatmap beatmap)
+        {
+            Assert.That(check.Run(new TestWorkingBeatmap(beatmap)), Is.Empty);
         }
 
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
-            var issues = check.Run(beatmap).ToList();
+            var issues = check.Run(new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
@@ -251,7 +237,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
-            var issues = check.Run(beatmap).ToList();
+            var issues = check.Run(new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 27cae2ecc1..54b167aaf3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -31,9 +31,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap)
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
         {
-            foreach (var hitobject in beatmap.HitObjects)
+            foreach (var hitobject in workingBeatmap.Beatmap.HitObjects)
             {
                 switch (hitobject)
                 {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 1c7ab00bbb..9b9383d547 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -17,6 +17,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             new CheckOffscreenObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap) => checks.SelectMany(check => check.Run(beatmap));
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
index 635e3bb0f3..d61f0989a6 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Editing.Checks
 {
@@ -14,13 +15,13 @@ namespace osu.Game.Tests.Editing.Checks
     public class CheckBackgroundTest
     {
         private CheckBackground check;
-        private IBeatmap beatmap;
+        private WorkingBeatmap beatmap;
 
         [SetUp]
         public void Setup()
         {
             check = new CheckBackground();
-            beatmap = new Beatmap<HitObject>
+            beatmap = new TestWorkingBeatmap(new Beatmap<HitObject>
             {
                 BeatmapInfo = new BeatmapInfo
                 {
@@ -33,7 +34,7 @@ namespace osu.Game.Tests.Editing.Checks
                         })
                     }
                 }
-            };
+            });
         }
 
         [Test]
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index f9bced7beb..40714e8c7e 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -19,6 +19,6 @@ namespace osu.Game.Rulesets.Edit
             new CheckBackground(),
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap) => checks.SelectMany(check => check.Run(beatmap));
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 93da42425c..d2fffeea4e 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -18,9 +18,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap)
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
         {
-            if (beatmap.Metadata.BackgroundFile == null)
+            if (workingBeatmap.Metadata?.BackgroundFile == null)
             {
                 yield return new IssueTemplateNoneSet(this).Create();
 
@@ -29,13 +29,13 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             // If the background is set, also make sure it still exists.
 
-            var set = beatmap.BeatmapInfo.BeatmapSet;
-            var file = set.Files.FirstOrDefault(f => f.Filename == beatmap.Metadata.BackgroundFile);
+            var set = workingBeatmap.BeatmapInfo.BeatmapSet;
+            var file = set.Files.FirstOrDefault(f => f.Filename == workingBeatmap.Metadata.BackgroundFile);
 
             if (file != null)
                 yield break;
 
-            yield return new IssueTemplateDoesNotExist(this).Create(beatmap.Metadata.BackgroundFile);
+            yield return new IssueTemplateDoesNotExist(this).Create(workingBeatmap.Metadata.BackgroundFile);
         }
 
         public class IssueTemplateNoneSet : IssueTemplate
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index f284240092..a2814ee603 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
-        /// <param name="beatmap">The beatmap to run the check on.</param>
-        public IEnumerable<Issue> Run(IBeatmap beatmap);
+        /// <param name="workingBeatmap">The beatmap to run the check on.</param>
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 61d8119635..12be8815e1 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -12,6 +12,6 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public interface IBeatmapVerifier
     {
-        public IEnumerable<Issue> Run(IBeatmap beatmap);
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap);
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 550fbe2950..160a14caac 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.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.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
@@ -61,7 +62,7 @@ namespace osu.Game.Screens.Edit.Verify
             private EditorClock clock { get; set; }
 
             [Resolved]
-            protected EditorBeatmap Beatmap { get; private set; }
+            protected WorkingBeatmap Beatmap { get; private set; }
 
             [Resolved]
             private Bindable<Issue> selectedIssue { get; set; }

From 400f8b3938428d22ca25d5760214045f42b3328d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 17 Apr 2021 17:47:13 +0200
Subject: [PATCH 09216/10326] Add `GetStream` to `IWorkingBeatmap`

This is necessary to obtain the filesize of the audio and background files.
---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 2 ++
 osu.Game.Tests/WaveformTestBeatmap.cs                       | 2 ++
 osu.Game/Beatmaps/BeatmapManager.cs                         | 1 +
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs          | 3 +++
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs                    | 3 +++
 osu.Game/Beatmaps/WorkingBeatmap.cs                         | 3 +++
 osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs         | 2 ++
 osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs            | 2 ++
 osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs               | 3 +++
 9 files changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 920cc36776..a18f82fe4a 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -168,6 +168,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
             protected override Texture GetBackground() => throw new NotImplementedException();
 
             protected override Track GetBeatmapTrack() => throw new NotImplementedException();
+
+            public override Stream GetStream(string storagePath) => throw new NotImplementedException();
         }
     }
 }
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index 8c8c827404..cbed28641c 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -52,6 +52,8 @@ namespace osu.Game.Tests
 
         protected override Waveform GetWaveform() => new Waveform(trackStore.GetStream(firstAudioFile));
 
+        public override Stream GetStream(string storagePath) => null;
+
         protected override Track GetBeatmapTrack() => trackStore.Get(firstAudioFile);
 
         private string firstAudioFile
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b4ea898b7d..5e975de77c 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -526,6 +526,7 @@ namespace osu.Game.Beatmaps
             protected override IBeatmap GetBeatmap() => beatmap;
             protected override Texture GetBackground() => null;
             protected override Track GetBeatmapTrack() => null;
+            public override Stream GetStream(string storagePath) => null;
         }
     }
 
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 62cf29dc03..c1fc7a72e2 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.IO;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
@@ -142,6 +143,8 @@ namespace osu.Game.Beatmaps
                     return null;
                 }
             }
+
+            public override Stream GetStream(string storagePath) => resources.Files.GetStream(storagePath);
         }
     }
 }
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index c114358771..6922d1c286 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading;
 using JetBrains.Annotations;
 using osu.Framework.Audio;
@@ -48,6 +49,8 @@ namespace osu.Game.Beatmaps
 
         protected override Track GetBeatmapTrack() => GetVirtualTrack();
 
+        public override Stream GetStream(string storagePath) => null;
+
         private class DummyRulesetInfo : RulesetInfo
         {
             public override Ruleset CreateInstance() => new DummyRuleset();
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index f7f276230f..e0eeaf6db0 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -326,6 +327,8 @@ namespace osu.Game.Beatmaps
         protected virtual ISkin GetSkin() => new DefaultSkin();
         private readonly RecyclableLazy<ISkin> skin;
 
+        public abstract Stream GetStream(string storagePath);
+
         public class RecyclableLazy<T>
         {
             private Lazy<T> lazy;
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index f2e0320ce3..66784fda54 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -116,6 +116,8 @@ namespace osu.Game.Screens.Edit
             protected override Texture GetBackground() => throw new NotImplementedException();
 
             protected override Track GetBeatmapTrack() => throw new NotImplementedException();
+
+            public override Stream GetStream(string storagePath) => throw new NotImplementedException();
         }
     }
 }
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index 5ef2458919..1c5e551042 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -215,6 +215,8 @@ namespace osu.Game.Tests.Beatmaps
 
             protected override Track GetBeatmapTrack() => throw new NotImplementedException();
 
+            public override Stream GetStream(string storagePath) => throw new NotImplementedException();
+
             protected override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
             {
                 var converter = base.CreateBeatmapConverter(beatmap, ruleset);
diff --git a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
index bfcb2403c1..852006bc9b 100644
--- a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.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.IO;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
@@ -35,6 +36,8 @@ namespace osu.Game.Tests.Beatmaps
 
         protected override Storyboard GetStoryboard() => storyboard ?? base.GetStoryboard();
 
+        public override Stream GetStream(string storagePath) => null;
+
         protected override Texture GetBackground() => null;
 
         protected override Track GetBeatmapTrack() => null;

From b36da2664c2be2e9be6a2c69383dc3b95d459080 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 17 Apr 2021 17:49:10 +0200
Subject: [PATCH 09217/10326] Add `GetPathForFile` to `BeatmapSetInfo`

This is used in several places, and so should probably have a function rather than remaining as duplicated code.

Also applies this together with the previous commit to `BeatmapManagerWorkingBeatmap`.
---
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs     | 15 ++++++---------
 osu.Game/Beatmaps/BeatmapSetInfo.cs               |  2 ++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index c1fc7a72e2..d78ffbbfb6 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.IO;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
@@ -37,7 +36,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    using (var stream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(GetStream(BeatmapSetInfo.GetPathForFile(BeatmapInfo.Path))))
                         return Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
                 }
                 catch (Exception e)
@@ -47,8 +46,6 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            private string getPathForFile(string filename) => BeatmapSetInfo.Files.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
-
             protected override bool BackgroundStillValid(Texture b) => false; // bypass lazy logic. we want to return a new background each time for refcounting purposes.
 
             protected override Texture GetBackground()
@@ -58,7 +55,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return resources.LargeTextureStore.Get(getPathForFile(Metadata.BackgroundFile));
+                    return resources.LargeTextureStore.Get(BeatmapSetInfo.GetPathForFile(Metadata.BackgroundFile));
                 }
                 catch (Exception e)
                 {
@@ -74,7 +71,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return resources.Tracks.Get(getPathForFile(Metadata.AudioFile));
+                    return resources.Tracks.Get(BeatmapSetInfo.GetPathForFile(Metadata.AudioFile));
                 }
                 catch (Exception e)
                 {
@@ -90,7 +87,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    var trackData = resources.Files.GetStream(getPathForFile(Metadata.AudioFile));
+                    var trackData = GetStream(BeatmapSetInfo.GetPathForFile(Metadata.AudioFile));
                     return trackData == null ? null : new Waveform(trackData);
                 }
                 catch (Exception e)
@@ -106,7 +103,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    using (var stream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(GetStream(BeatmapSetInfo.GetPathForFile(BeatmapInfo.Path))))
                     {
                         var decoder = Decoder.GetDecoder<Storyboard>(stream);
 
@@ -115,7 +112,7 @@ namespace osu.Game.Beatmaps
                             storyboard = decoder.Decode(stream);
                         else
                         {
-                            using (var secondaryStream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
+                            using (var secondaryStream = new LineBufferedReader(GetStream(BeatmapSetInfo.GetPathForFile(BeatmapSetInfo.StoryboardFile))))
                                 storyboard = decoder.Decode(stream, secondaryStream);
                         }
                     }
diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index 7bc1c8c7b9..774bd0bc62 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -59,6 +59,8 @@ namespace osu.Game.Beatmaps
 
         public string StoryboardFile => Files?.Find(f => f.Filename.EndsWith(".osb", StringComparison.OrdinalIgnoreCase))?.Filename;
 
+        public string GetPathForFile(string filename) => Files?.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+
         public List<BeatmapSetFileInfo> Files { get; set; }
 
         public override string ToString() => Metadata?.ToString() ?? base.ToString();

From 62c54e00cb7eee3b424e965a09462431ab03cf9c Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 17 Apr 2021 18:01:04 +0200
Subject: [PATCH 09218/10326] Add check for background resolution and filesize

---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  1 +
 .../Edit/Checks/CheckBackgroundQuality.cs     | 98 +++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 40714e8c7e..24a4f473de 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Edit
         private readonly List<ICheck> checks = new List<ICheck>
         {
             new CheckBackground(),
+            new CheckBackgroundQuality()
         };
 
         public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
new file mode 100644
index 0000000000..ed504f52ed
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.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.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckBackgroundQuality : ICheck
+    {
+        // These are the requirements as stated in the Ranking Criteria.
+        // See https://osu.ppy.sh/wiki/en/Ranking_Criteria#rules.5
+        private const int min_width = 160;
+        private const int max_width = 2560;
+        private const int min_height = 120;
+        private const int max_height = 1440;
+        private const double max_filesize_mb = 2.5d;
+
+        // It's usually possible to find a higher resolution of the same image if lower than these.
+        private const int low_width = 960;
+        private const int low_height = 540;
+
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Too high or low background resolution");
+
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateTooHighResolution(this),
+            new IssueTemplateTooLowResolution(this),
+            new IssueTemplateTooUncompressed(this)
+        };
+
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
+        {
+            if (workingBeatmap.Metadata?.BackgroundFile == null)
+                yield break;
+
+            var texture = workingBeatmap.Background;
+            if (texture == null)
+                yield break;
+
+            if (texture.Width > max_width || texture.Height > max_height)
+                yield return new IssueTemplateTooHighResolution(this).Create(texture.Width, texture.Height);
+
+            if (texture.Width < min_width || texture.Height < min_height)
+                yield return new IssueTemplateTooLowResolution(this).Create(texture.Width, texture.Height);
+
+            if (texture.Width < low_width || texture.Height < low_height)
+                yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
+
+            string storagePath = workingBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(workingBeatmap.Metadata.BackgroundFile);
+            double filesizeMb = workingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
+
+            if (filesizeMb > max_filesize_mb)
+                yield return new IssueTemplateTooUncompressed(this).Create(filesizeMb);
+        }
+
+        public class IssueTemplateTooHighResolution : IssueTemplate
+        {
+            public IssueTemplateTooHighResolution(ICheck check)
+                : base(check, IssueType.Problem, "The background resolution ({0} x {1}) exceeds {2} x {3}.")
+            {
+            }
+
+            public Issue Create(double width, double height) => new Issue(this, width, height, max_width, max_height);
+        }
+
+        public class IssueTemplateTooLowResolution : IssueTemplate
+        {
+            public IssueTemplateTooLowResolution(ICheck check)
+                : base(check, IssueType.Problem, "The background resolution ({0} x {1}) is lower than {2} x {3}.")
+            {
+            }
+
+            public Issue Create(double width, double height) => new Issue(this, width, height, min_width, min_height);
+        }
+
+        public class IssueTemplateLowResolution : IssueTemplate
+        {
+            public IssueTemplateLowResolution(ICheck check)
+                : base(check, IssueType.Warning, "The background resolution ({0} x {1}) is lower than {2} x {3}.")
+            {
+            }
+
+            public Issue Create(double width, double height) => new Issue(this, width, height, low_width, low_height);
+        }
+
+        public class IssueTemplateTooUncompressed : IssueTemplate
+        {
+            public IssueTemplateTooUncompressed(ICheck check)
+                : base(check, IssueType.Problem, "The background filesize ({0:0.#} MB) exceeds {1} MB.")
+            {
+            }
+
+            public Issue Create(double actualMb) => new Issue(this, actualMb, max_filesize_mb);
+        }
+    }
+}

From 512cec3458f53c29b135d65d49a4af8b86be8fe2 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 00:08:16 +0800
Subject: [PATCH 09219/10326] Use unicode for playlists

---
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 23c713a2c1..4fccf45fda 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -13,11 +13,13 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 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.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.Chat;
@@ -105,10 +107,18 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void refresh()
         {
+            var beatmapMetadata = Item.Beatmap.Value.Metadata ?? Item.Beatmap.Value.BeatmapSet?.Metadata;
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(Item.Beatmap.ToString(), LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            var text = new List<SpriteText>
+            {
+                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.ArtistUnicode, beatmapMetadata.Artist) },
+                new OsuSpriteText { Text = " - " },
+                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.TitleUnicode, beatmapMetadata.Title) },
+                new OsuSpriteText { Text = $" ({beatmapMetadata.Author}) [{Item.Beatmap.Value.Version}]" }
+            };
+            beatmapText.AddLink(text, LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From 81be562379d5bb60023be3f20ecb1f8990993ef9 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 12:28:31 -0400
Subject: [PATCH 09220/10326] Read StoryboardEndTime directly from Beatmap

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 5 -----
 osu.Game/Screens/Play/Player.cs                 | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 95419c0b35..ddbb087962 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -228,11 +228,6 @@ namespace osu.Game.Screens.Play
             adjustableClock.ChangeSource(track);
         }
 
-        /// <summary>
-        /// Gets the endtime of the last element in the storyboard in ms, or start time of the last hitobject if there's no storyboard.
-        /// </summary>
-        public double StoryboardEndTime => beatmap.Storyboard.LatestEventTime ?? 0;
-
         protected override void Update()
         {
             if (!IsPaused.Value)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7ad9c1a8af..e998f33cc1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -366,7 +366,7 @@ namespace osu.Game.Screens.Play
                     {
                         RequestSkip = performUserRequestedSkip
                     },
-                    skipOutroOverlay = new SkipOverlay(GameplayClockContainer.StoryboardEndTime)
+                    skipOutroOverlay = new SkipOverlay(Beatmap.Value.Storyboard.LatestEventTime ?? 0)
                     {
                         RequestSkip = scheduleCompletion
                     },

From 5a015290b9721e151a689abd29162d2deab1ad18 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 12:34:38 -0400
Subject: [PATCH 09221/10326] Add remarks back to LatestEventTime

---
 osu.Game/Storyboards/Storyboard.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 4fa64b7c34..0b02a4921b 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -40,6 +40,10 @@ namespace osu.Game.Storyboards
         /// Across all layers, find the latest point in time that a storyboard element ends at.
         /// Will return null if there are no elements.
         /// </summary>
+        /// <remarks>
+        /// This iterates all elements and as such should be used sparingly or stored locally.
+        /// Videos and samples return StartTime as their EndTIme.
+        /// </remarks>
         public double? LatestEventTime => Layers.SelectMany(l => l.Elements.OfType<IStoryboardElementHasDuration>()).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
 
         /// <summary>

From 7f5b1e84a16d42763f20ecb69359213e4d6868c9 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 13:57:32 -0400
Subject: [PATCH 09222/10326] Update TestSceneStoryboardWithOutro.cs

- Construct storyboard in CreateWorkingBeatmap()
- Use GameplayClockContainer.GameplayClock.CurrentTime
- Remove unnecessary lines
---
 .../Gameplay/TestSceneStoryboardWithOutro.cs  | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 27d203d5d6..16474d23ea 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -3,7 +3,6 @@
 
 using System.Threading.Tasks;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
@@ -13,7 +12,6 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
-using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Storyboards;
 using osuTK;
@@ -24,28 +22,14 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         protected new OutroPlayer Player => (OutroPlayer)base.Player;
 
-        private Storyboard storyboard;
-
         private const double storyboard_duration = 2000;
 
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            config.SetValue(OsuSetting.ShowStoryboard, true);
-            storyboard = new Storyboard();
-            var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
-            sprite.TimelineGroup.Alpha.Add(Easing.None, 0, storyboard_duration, 1, 0);
-            storyboard.GetLayer("Background").Add(sprite);
-        }
-
         [SetUpSteps]
         public override void SetUpSteps()
         {
             base.SetUpSteps();
-            AddStep("ignore user settings", () =>
-            {
-                Player.DimmableStoryboard.IgnoreUserSettings.Value = true;
-            });
+            AddStep("enable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, true));
+            AddStep("set dim level to 0", () => LocalConfig.SetValue<double>(OsuSetting.DimLevel, 0));
         }
 
         [Test]
@@ -61,7 +45,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestStoryboardNoSkipOutro()
         {
             AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
-            AddUntilStep("storyboard ends", () => Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= storyboard_duration);
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= storyboard_duration);
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 
@@ -87,8 +71,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             return beatmap;
         }
 
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) =>
-            new ClockBackedTestWorkingBeatmap(beatmap, storyboard ?? this.storyboard, Clock, Audio);
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+        {
+            if (storyboard == null)
+            {
+                storyboard = new Storyboard();
+                var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
+                sprite.TimelineGroup.Alpha.Add(Easing.None, 0, storyboard_duration, 1, 0);
+                storyboard.GetLayer("Background").Add(sprite);
+            }
+
+            return base.CreateWorkingBeatmap(beatmap, storyboard);
+        }
 
         protected class OutroPlayer : TestPlayer
         {
@@ -96,8 +90,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public bool IsScoreShown => !this.IsCurrentScreen() && this.GetChildScreen() is ResultsScreen;
 
-            public new DimmableStoryboard DimmableStoryboard => base.DimmableStoryboard;
-
             public OutroPlayer()
                 : base(false)
             {
@@ -105,7 +97,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             protected override Task ImportScore(Score score)
             {
-                // avoid database errors from trying to store the score
                 return Task.CompletedTask;
             }
         }

From cb41c89935a4e7b0e76865efd6e8dd36ceb22124 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 17 Apr 2021 20:10:07 +0200
Subject: [PATCH 09223/10326] Don't return low res and too low res at the same
 time

---
 osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index ed504f52ed..a3f363554e 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -44,8 +44,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             if (texture.Width < min_width || texture.Height < min_height)
                 yield return new IssueTemplateTooLowResolution(this).Create(texture.Width, texture.Height);
-
-            if (texture.Width < low_width || texture.Height < low_height)
+            else if (texture.Width < low_width || texture.Height < low_height)
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
             string storagePath = workingBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(workingBeatmap.Metadata.BackgroundFile);

From e40cb6797df3896d6179dc0f85edef8168c5ee09 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 15:27:22 -0400
Subject: [PATCH 09224/10326] Use GetEndTime() to get storyboard endtime

---
 osu.Game/Storyboards/IStoryboardElement.cs          | 13 +++++++++++++
 .../Storyboards/IStoryboardElementHasDuration.cs    |  3 +++
 osu.Game/Storyboards/Storyboard.cs                  |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/IStoryboardElement.cs b/osu.Game/Storyboards/IStoryboardElement.cs
index c4c150a8a4..377ad57ab2 100644
--- a/osu.Game/Storyboards/IStoryboardElement.cs
+++ b/osu.Game/Storyboards/IStoryboardElement.cs
@@ -14,4 +14,17 @@ namespace osu.Game.Storyboards
 
         Drawable CreateDrawable();
     }
+
+    public static class StoryboardElementExtensions
+    {
+        /// <summary>
+        /// Returns the end time of this object.
+        /// </summary>
+        /// <remarks>
+        /// This returns the <see cref="IStoryboardElementHasDuration.EndTime"/> where available, falling back to <see cref="IStoryboardElement.StartTime"/> otherwise.
+        /// </remarks>
+        /// <param name="storyboardElement">The object.</param>
+        /// <returns>The end time of this object.</returns>
+        public static double GetEndTime(this IStoryboardElement storyboardElement) => (storyboardElement as IStoryboardElementHasDuration)?.EndTime ?? storyboardElement.StartTime;
+    }
 }
diff --git a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
index e6ee373812..daa0c55704 100644
--- a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
@@ -3,6 +3,9 @@
 
 namespace osu.Game.Storyboards
 {
+    /// <summary>
+    /// A StoryboardElement that ends at a different time than its start time.
+    /// </summary>
     public interface IStoryboardElementHasDuration
     {
         double EndTime { get; }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 0b02a4921b..bc61f704dd 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Storyboards
         /// This iterates all elements and as such should be used sparingly or stored locally.
         /// Videos and samples return StartTime as their EndTIme.
         /// </remarks>
-        public double? LatestEventTime => Layers.SelectMany(l => l.Elements.OfType<IStoryboardElementHasDuration>()).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
+        public double? LatestEventTime => Layers.SelectMany(l => l.Elements).OrderBy(e => e.GetEndTime()).LastOrDefault()?.GetEndTime();
 
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.

From fdcb5e924c9153de2065731689d902d887652bca Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 17:45:38 -0400
Subject: [PATCH 09225/10326] Initialize skipOutroOverlay with alpha 0, other
 small changes

---
 osu.Game/Screens/Play/Player.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e998f33cc1..ef0caa2fa3 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -247,6 +247,7 @@ namespace osu.Game.Screens.Play
                 HUDOverlay.ShowHud.Disabled = true;
                 BreakOverlay.Hide();
                 skipIntroOverlay.Hide();
+                skipOutroOverlay.Hide();
             }
 
             DrawableRuleset.FrameStableClock.WaitingOnFrames.BindValueChanged(waiting =>
@@ -368,7 +369,8 @@ namespace osu.Game.Screens.Play
                     },
                     skipOutroOverlay = new SkipOverlay(Beatmap.Value.Storyboard.LatestEventTime ?? 0)
                     {
-                        RequestSkip = scheduleCompletion
+                        RequestSkip = scheduleCompletion,
+                        Alpha = 0
                     },
                     FailOverlay = new FailOverlay
                     {
@@ -416,8 +418,6 @@ namespace osu.Game.Screens.Play
                 });
             }
 
-            skipOutroOverlay.Hide();
-
             return container;
         }
 
@@ -539,13 +539,9 @@ namespace osu.Game.Screens.Play
                     return;
                 }
 
-                // show the score if in storyboard outro (score has been set)
-                bool scoreReady = prepareScoreForDisplayTask != null && prepareScoreForDisplayTask.IsCompleted;
-
-                if (scoreReady)
-                {
+                // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
+                if (prepareScoreForDisplayTask != null)
                     scheduleCompletion();
-                }
             }
 
             this.Exit();
@@ -639,7 +635,6 @@ namespace osu.Game.Screens.Play
             if (storyboardHasOutro)
             {
                 skipOutroOverlay.Show();
-                completionProgressDelegate = null;
                 return;
             }
 

From eec77b052790f720fa716d10b96aad540b9cb083 Mon Sep 17 00:00:00 2001
From: Fabian <lindgrenfabian@gmail.com>
Date: Sat, 17 Apr 2021 23:55:39 +0200
Subject: [PATCH 09226/10326] replace icon

---
 osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index 4e34cbe9e2..4c46e24f1b 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Mods
         public override string Acronym => "FF";
         public override string Description => "The fruits are... floating?";
         public override double ScoreMultiplier => 1;
-        public override IconUsage? Icon => FontAwesome.Brands.Fly;
+        public override IconUsage? Icon => FontAwesome.Solid.Cloud;
 
         public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
         {

From 97bacbdc760942ccb7052441b249f6a1c87ce2bd Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 17:55:46 -0400
Subject: [PATCH 09227/10326] Show score after the end of the storyboard after
 it was toggled

---
 osu.Game/Screens/Play/DimmableStoryboard.cs          |  3 ++-
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs | 10 ++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index bebde1b15b..73b4153601 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Screens.Play
                 return;
 
             drawableStoryboard = storyboard.CreateDrawable();
+            HasStoryboardEnded.BindTo(drawableStoryboard.HasStoryboardEnded);
 
             if (async)
                 LoadComponentAsync(drawableStoryboard, onStoryboardCreated);
@@ -63,6 +64,6 @@ namespace osu.Game.Screens.Play
             OverlayLayerContainer.Add(storyboard.OverlayLayer.CreateProxy());
         }
 
-        public IBindable<bool> HasStoryboardEnded => drawableStoryboard?.HasStoryboardEnded;
+        public IBindable<bool> HasStoryboardEnded = new BindableBool(true);
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 08c2bf1b4a..abfb4598ec 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -95,15 +95,13 @@ namespace osu.Game.Storyboards.Drawables
         /// </summary>
         public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
 
-        private readonly BindableBool hasStoryboardEnded = new BindableBool(true);
+        private readonly BindableBool hasStoryboardEnded = new BindableBool();
 
         private void updateHasStoryboardEnded()
         {
-            if (Storyboard.LatestEventTime == null)
-                return;
-
-            var time = Clock.CurrentTime;
-            hasStoryboardEnded.Value = time >= Storyboard.LatestEventTime;
+            hasStoryboardEnded.Value =
+                Storyboard.LatestEventTime == null ||
+                Time.Current >= Storyboard.LatestEventTime;
         }
     }
 }

From bf8789528ae81cd332416ab0ed11572c53693a4a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 01:13:57 +0200
Subject: [PATCH 09228/10326] Add `GetStream` to `IWorkingBeatmap`

---
 osu.Game/Beatmaps/IWorkingBeatmap.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index bcd94d76fd..f1bf6f48ef 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets;
@@ -67,5 +68,7 @@ namespace osu.Game.Beatmaps
         /// </remarks>
         /// <returns>A fresh track instance, which will also be available via <see cref="Track"/>.</returns>
         Track LoadTrack();
+
+        Stream GetStream(string storagePath);
     }
 }

From ef65c8910f0a6a9d76327810c70733630aed8c25 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 01:15:13 +0200
Subject: [PATCH 09229/10326] Fix resolved fields

---
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 160a14caac..6aa479b38d 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -62,7 +62,10 @@ namespace osu.Game.Screens.Edit.Verify
             private EditorClock clock { get; set; }
 
             [Resolved]
-            protected WorkingBeatmap Beatmap { get; private set; }
+            private BeatmapManager beatmapManager { get; set; }
+
+            [Resolved]
+            private EditorBeatmap beatmap { get; set; }
 
             [Resolved]
             private Bindable<Issue> selectedIssue { get; set; }
@@ -74,7 +77,7 @@ namespace osu.Game.Screens.Edit.Verify
             private void load(OsuColour colours)
             {
                 generalVerifier = new BeatmapVerifier();
-                rulesetVerifier = Beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
+                rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
                 RelativeSizeAxes = Axes.Both;
 
@@ -120,10 +123,11 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void refresh()
             {
-                var issues = generalVerifier.Run(Beatmap);
+                var workingBeatmap = beatmapManager.GetWorkingBeatmap(beatmap.BeatmapInfo);
+                var issues = generalVerifier.Run(workingBeatmap);
 
                 if (rulesetVerifier != null)
-                    issues = issues.Concat(rulesetVerifier.Run(Beatmap));
+                    issues = issues.Concat(rulesetVerifier.Run(workingBeatmap));
 
                 table.Issues = issues
                                .OrderBy(issue => issue.Template.Type)

From abf512532e2f8d7e79d8b8fafe419b651fb1f896 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 01:19:25 +0200
Subject: [PATCH 09230/10326] Clean up check logic

Makes use of the new `BeatmapSet.GetPathForFile` method and removes dependency on `WorkingBeatmap` specifically, allowing us to switch to `IWorkingBeatmap` later.
---
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs   | 14 ++++++--------
 .../Rulesets/Edit/Checks/CheckBackgroundQuality.cs |  5 +++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index d2fffeea4e..637e603e17 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
@@ -20,7 +19,9 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
         {
-            if (workingBeatmap.Metadata?.BackgroundFile == null)
+            string backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+
+            if (backgroundFile == null)
             {
                 yield return new IssueTemplateNoneSet(this).Create();
 
@@ -28,14 +29,11 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
 
             // If the background is set, also make sure it still exists.
-
-            var set = workingBeatmap.BeatmapInfo.BeatmapSet;
-            var file = set.Files.FirstOrDefault(f => f.Filename == workingBeatmap.Metadata.BackgroundFile);
-
-            if (file != null)
+            var storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
+            if (storagePath != null)
                 yield break;
 
-            yield return new IssueTemplateDoesNotExist(this).Create(workingBeatmap.Metadata.BackgroundFile);
+            yield return new IssueTemplateDoesNotExist(this).Create(backgroundFile);
         }
 
         public class IssueTemplateNoneSet : IssueTemplate
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index a3f363554e..48d536079a 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -32,7 +32,8 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
         {
-            if (workingBeatmap.Metadata?.BackgroundFile == null)
+            var backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+            if (backgroundFile == null)
                 yield break;
 
             var texture = workingBeatmap.Background;
@@ -47,7 +48,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             else if (texture.Width < low_width || texture.Height < low_height)
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
-            string storagePath = workingBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(workingBeatmap.Metadata.BackgroundFile);
+            string storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
             double filesizeMb = workingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
 
             if (filesizeMb > max_filesize_mb)

From 56bf49c85c525547c6ebe8bb1656b69e1cd2b0ec Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 01:21:20 +0200
Subject: [PATCH 09231/10326] Take `IWorkingBeatmap` instead of
 `WorkingBeatmap`

This makes testing much easier, and allows for checking of any class deriving from that interface, including `WorkingBeatmap`.
---
 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs           | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs    | 2 +-
 osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 54b167aaf3..c210f73b5f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
         {
             foreach (var hitobject in workingBeatmap.Beatmap.HitObjects)
             {
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 637e603e17..71821b8073 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
         {
             string backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 48d536079a..1494ae5da4 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateTooUncompressed(this)
         };
 
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
         {
             var backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
             if (backgroundFile == null)
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index a2814ee603..c3a64b58e9 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -25,6 +25,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
         /// <param name="workingBeatmap">The beatmap to run the check on.</param>
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap);
+        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap);
     }
 }

From 0502fbb4296e103d4841ce86becb57aef38e73a1 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 01:21:51 +0200
Subject: [PATCH 09232/10326] Add background quality check tests

---
 .../Checks/CheckBackgroundQualityTest.cs      | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
new file mode 100644
index 0000000000..8dad5bbf34
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -0,0 +1,130 @@
+// Copyright (c) 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.IO;
+using System.Linq;
+using JetBrains.Annotations;
+using Moq;
+using NUnit.Framework;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+using FileInfo = osu.Game.IO.FileInfo;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckBackgroundQualityTest
+    {
+        private CheckBackgroundQuality check;
+        private IBeatmap beatmap;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckBackgroundQuality();
+            beatmap = new Beatmap<HitObject>
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata { BackgroundFile = "abc123.jpg" },
+                    BeatmapSet = new BeatmapSetInfo
+                    {
+                        Files = new List<BeatmapSetFileInfo>(new[]
+                        {
+                            new BeatmapSetFileInfo
+                            {
+                                Filename = "abc123.jpg",
+                                FileInfo = new FileInfo
+                                {
+                                    Hash = "abcdef"
+                                }
+                            }
+                        })
+                    }
+                }
+            };
+        }
+
+        [Test]
+        public void TestBackgroundMissing()
+        {
+            // While this is a problem, it is out of scope for this check and is caught by a different one.
+            beatmap.Metadata.BackgroundFile = null;
+            var mock = getMockWorkingBeatmap(null, System.Array.Empty<byte>());
+
+            Assert.That(check.Run(mock.Object), Is.Empty);
+        }
+
+        [Test]
+        public void TestBackgroundAcceptable()
+        {
+            var mock = getMockWorkingBeatmap(new Texture(1920, 1080));
+
+            Assert.That(check.Run(mock.Object), Is.Empty);
+        }
+
+        [Test]
+        public void TestBackgroundTooHighResolution()
+        {
+            var mock = getMockWorkingBeatmap(new Texture(3840, 2160));
+
+            var issues = check.Run(mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooHighResolution);
+        }
+
+        [Test]
+        public void TestBackgroundLowResolution()
+        {
+            var mock = getMockWorkingBeatmap(new Texture(640, 480));
+
+            var issues = check.Run(mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateLowResolution);
+        }
+
+        [Test]
+        public void TestBackgroundTooLowResolution()
+        {
+            var mock = getMockWorkingBeatmap(new Texture(100, 100));
+
+            var issues = check.Run(mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooLowResolution);
+        }
+
+        [Test]
+        public void TestBackgroundTooUncompressed()
+        {
+            var mock = getMockWorkingBeatmap(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
+
+            var issues = check.Run(mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooUncompressed);
+        }
+
+        /// <summary>
+        /// Returns the mock of the working beatmap with the given background and filesize.
+        /// </summary>
+        /// <param name="background">The texture of the background.</param>
+        /// <param name="fileBytes">The bytes that represent the background file.</param>
+        private Mock<IWorkingBeatmap> getMockWorkingBeatmap(Texture background, [CanBeNull] byte[] fileBytes = null)
+        {
+            var stream = new MemoryStream(fileBytes ?? new byte[1024 * 1024]);
+
+            var mock = new Mock<IWorkingBeatmap>();
+            mock.SetupGet(_ => _.Beatmap).Returns(beatmap);
+            mock.SetupGet(_ => _.Background).Returns(background);
+            mock.Setup(_ => _.GetStream(It.IsAny<string>())).Returns(stream);
+
+            return mock;
+        }
+    }
+}

From 010720de74c67df74f140aa2263cb85c4054b563 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 02:07:33 +0200
Subject: [PATCH 09233/10326] Factor out general file presence checking

This allows us to use the same method of checking for other files that should exist, for example the audio file.

By using the same method, they all share test cases too.
---
 ...groundTest.cs => CheckFilePresenceTest.cs} | 10 +++----
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  7 +++--
 .../Edit/Checks/CheckBackgroundPresence.cs    | 15 ++++++++++
 ...heckBackground.cs => CheckFilePresence.cs} | 28 +++++++++++--------
 4 files changed, 41 insertions(+), 19 deletions(-)
 rename osu.Game.Tests/Editing/Checks/{CheckBackgroundTest.cs => CheckFilePresenceTest.cs} (84%)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
 rename osu.Game/Rulesets/Edit/Checks/{CheckBackground.cs => CheckFilePresence.cs} (57%)

diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
similarity index 84%
rename from osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
rename to osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
index d61f0989a6..1149115b55 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
@@ -12,15 +12,15 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Tests.Editing.Checks
 {
     [TestFixture]
-    public class CheckBackgroundTest
+    public class CheckFilePresenceTest
     {
-        private CheckBackground check;
+        private CheckBackgroundPresence check;
         private WorkingBeatmap beatmap;
 
         [SetUp]
         public void Setup()
         {
-            check = new CheckBackground();
+            check = new CheckBackgroundPresence();
             beatmap = new TestWorkingBeatmap(new Beatmap<HitObject>
             {
                 BeatmapInfo = new BeatmapInfo
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(beatmap).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckBackground.IssueTemplateDoesNotExist);
+            Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateDoesNotExist);
         }
 
         [Test]
@@ -62,7 +62,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(beatmap).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckBackground.IssueTemplateNoneSet);
+            Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateNoneSet);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 24a4f473de..90447049f8 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -16,8 +16,11 @@ namespace osu.Game.Rulesets.Edit
     {
         private readonly List<ICheck> checks = new List<ICheck>
         {
-            new CheckBackground(),
-            new CheckBackgroundQuality()
+            // Resources
+            new CheckBackgroundPresence(),
+            new CheckBackgroundQuality(),
+            // Audio
+            new CheckAudioPresence(),
         };
 
         public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
new file mode 100644
index 0000000000..3a229b889b
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.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.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckBackgroundPresence : CheckFilePresence
+    {
+        protected override CheckCategory Category => CheckCategory.Resources;
+        protected override string TypeOfFile => "background";
+        protected override string GetFilename(IWorkingBeatmap workingBeatmap) => workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
similarity index 57%
rename from osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
rename to osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index 71821b8073..37fa79568f 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -7,9 +7,13 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit.Checks
 {
-    public class CheckBackground : ICheck
+    public abstract class CheckFilePresence : ICheck
     {
-        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Missing background");
+        protected abstract CheckCategory Category { get; }
+        protected abstract string TypeOfFile { get; }
+        protected abstract string GetFilename(IWorkingBeatmap workingBeatmap);
+
+        public CheckMetadata Metadata => new CheckMetadata(Category, $"Missing {TypeOfFile}");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {
@@ -19,41 +23,41 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
         {
-            string backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+            var filename = GetFilename(workingBeatmap);
 
-            if (backgroundFile == null)
+            if (filename == null)
             {
-                yield return new IssueTemplateNoneSet(this).Create();
+                yield return new IssueTemplateNoneSet(this).Create(TypeOfFile);
 
                 yield break;
             }
 
-            // If the background is set, also make sure it still exists.
-            var storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
+            // If the file is set, also make sure it still exists.
+            var storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
             if (storagePath != null)
                 yield break;
 
-            yield return new IssueTemplateDoesNotExist(this).Create(backgroundFile);
+            yield return new IssueTemplateDoesNotExist(this).Create(TypeOfFile, filename);
         }
 
         public class IssueTemplateNoneSet : IssueTemplate
         {
             public IssueTemplateNoneSet(ICheck check)
-                : base(check, IssueType.Problem, "No background has been set.")
+                : base(check, IssueType.Problem, "No {0} has been set.")
             {
             }
 
-            public Issue Create() => new Issue(this);
+            public Issue Create(string typeOfFile) => new Issue(this, typeOfFile);
         }
 
         public class IssueTemplateDoesNotExist : IssueTemplate
         {
             public IssueTemplateDoesNotExist(ICheck check)
-                : base(check, IssueType.Problem, "The background file \"{0}\" does not exist.")
+                : base(check, IssueType.Problem, "The {0} file \"{1}\" does not exist.")
             {
             }
 
-            public Issue Create(string filename) => new Issue(this, filename);
+            public Issue Create(string typeOfFile, string filename) => new Issue(this, typeOfFile, filename);
         }
     }
 }

From 9a69ca34a6ec004e6b336826f5623cbcd1c33a35 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 02:07:57 +0200
Subject: [PATCH 09234/10326] Add audio presence check

---
 .../Rulesets/Edit/Checks/CheckAudioPresence.cs    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
new file mode 100644
index 0000000000..55e53ef519
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.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.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckAudioPresence : CheckFilePresence
+    {
+        protected override CheckCategory Category => CheckCategory.Audio;
+        protected override string TypeOfFile => "audio";
+        protected override string GetFilename(IWorkingBeatmap workingBeatmap) => workingBeatmap.Beatmap.Metadata?.AudioFile;
+    }
+}

From c77f838fb051a4edaf2de036438045d489c10db2 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 21:49:07 -0400
Subject: [PATCH 09235/10326] HasStoryboardEnded doesn't trigger
 updateCompletionState()

Scores won't be shown prematurely if the storyboard ends before the playable portion of the beatmap.
---
 osu.Game/Screens/Play/Player.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ef0caa2fa3..622d99f078 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -284,14 +284,16 @@ namespace osu.Game.Screens.Play
                 ScoreProcessor.RevertResult(r);
             };
 
+            DimmableStoryboard.HasStoryboardEnded.ValueChanged += _ =>
+            {
+                if (ScoreProcessor.HasCompleted.Value)
+                    scheduleCompletion();
+            };
+
             // Bind the judgement processors to ourselves
             ScoreProcessor.HasCompleted.ValueChanged += updateCompletionState;
             HealthProcessor.Failed += onFail;
 
-            // Keep track of whether the storyboard ended after the playable portion
-            if (DimmableStoryboard.HasStoryboardEnded != null)
-                DimmableStoryboard.HasStoryboardEnded.ValueChanged += updateCompletionState;
-
             foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
                 mod.ApplyToScoreProcessor(ScoreProcessor);
 
@@ -630,7 +632,7 @@ namespace osu.Game.Screens.Play
                 return score.ScoreInfo;
             });
 
-            var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && (!DimmableStoryboard.HasStoryboardEnded?.Value ?? false);
+            var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
 
             if (storyboardHasOutro)
             {

From e9f8fa64b88b49c50c2ac9284e8d048034269e4d Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 21:49:29 -0400
Subject: [PATCH 09236/10326] Added a test for toggling the storyboard after
 the map is loaded

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 16474d23ea..e86b7591c6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -58,6 +58,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("score shown", () => Player.IsScoreShown);
         }
 
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestStoryboardToggle(bool enabledAtBeginning)
+        {
+            AddStep($"{(enabledAtBeginning ? "enable" : "disable")} storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, enabledAtBeginning));
+            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
+            AddStep($"toggle storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, !enabledAtBeginning));
+            AddUntilStep("wait for score shown", () => Player.IsScoreShown);
+        }
+
         protected override bool AllowFail => false;
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();

From cfaaf2e83e3112ea16e786c9a7487a58e794cd17 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 09:52:25 +0800
Subject: [PATCH 09237/10326] Add ToRomanisableString()

---
 osu.Game/Beatmaps/BeatmapInfo.cs                     | 12 ++++++++----
 osu.Game/Beatmaps/BeatmapMetadata.cs                 |  7 +++++++
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs   | 11 ++---------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index bf7906bd5c..c5c5bd208c 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -7,6 +7,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Newtonsoft.Json;
+using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.IO.Serialization;
@@ -127,6 +128,8 @@ namespace osu.Game.Beatmaps
         // Metadata
         public string Version { get; set; }
 
+        public string VersionString => string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
+
         [JsonProperty("difficulty_rating")]
         public double StarDifficulty { get; set; }
 
@@ -143,11 +146,12 @@ namespace osu.Game.Beatmaps
             Version
         }.Concat(Metadata?.SearchableTerms ?? Enumerable.Empty<string>()).Where(s => !string.IsNullOrEmpty(s)).ToArray();
 
-        public override string ToString()
-        {
-            string version = string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
+        public override string ToString() => $"{Metadata ?? BeatmapSet?.Metadata} {VersionString}".Trim();
 
-            return $"{Metadata ?? BeatmapSet?.Metadata} {version}".Trim();
+        public RomanisableString ToRomanisableString()
+        {
+            var metadata = (Metadata ?? BeatmapSet?.Metadata).ToRomanisableString() ?? new RomanisableString(null, null);
+            return new RomanisableString($"{metadata.GetPreferred(true)} {VersionString}".Trim(), $"{metadata.GetPreferred(false)} {VersionString}".Trim());
         }
 
         public bool Equals(BeatmapInfo other)
diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 858da8e602..02d1349794 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Newtonsoft.Json;
+using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.Users;
@@ -71,6 +72,12 @@ namespace osu.Game.Beatmaps
             return $"{Artist} - {Title} {author}".Trim();
         }
 
+        public RomanisableString ToRomanisableString()
+        {
+            string author = Author == null ? string.Empty : $"({Author})";
+            return new RomanisableString($"{ArtistUnicode} - {TitleUnicode} {author}".Trim(), $"{Artist} - {Title} {author}".Trim());
+        }
+
         [JsonIgnore]
         public string[] SearchableTerms => new[]
         {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 4fccf45fda..69173bd53b 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -107,18 +107,11 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void refresh()
         {
-            var beatmapMetadata = Item.Beatmap.Value.Metadata ?? Item.Beatmap.Value.BeatmapSet?.Metadata;
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            var text = new List<SpriteText>
-            {
-                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.ArtistUnicode, beatmapMetadata.Artist) },
-                new OsuSpriteText { Text = " - " },
-                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.TitleUnicode, beatmapMetadata.Title) },
-                new OsuSpriteText { Text = $" ({beatmapMetadata.Author}) [{Item.Beatmap.Value.Version}]" }
-            };
-            beatmapText.AddLink(text, LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            beatmapText.AddLink(new List<SpriteText>{ new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } }
+            , LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From 1339c126a49d9d52def6ef031959812f3ea48794 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 09:54:50 +0800
Subject: [PATCH 09238/10326] Remove unused using

---
 osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 69173bd53b..ca8e13d10a 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;

From 7b1d40db7de4fc6544ebc1f4070d600a024df488 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 22:13:28 -0400
Subject: [PATCH 09239/10326] Remove redundant string interpolation

---
 osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index e86b7591c6..59d543d686 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep($"{(enabledAtBeginning ? "enable" : "disable")} storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, enabledAtBeginning));
             AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
-            AddStep($"toggle storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, !enabledAtBeginning));
+            AddStep("toggle storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, !enabledAtBeginning));
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 

From 646403b826da7d5b3e2600ea93ac2ab2c01e9346 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 10:00:17 +0800
Subject: [PATCH 09240/10326] Fix CI errors

---
 osu.Game/Beatmaps/BeatmapInfo.cs                        | 2 +-
 osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index c5c5bd208c..d5a1e2491b 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Beatmaps
 
         public RomanisableString ToRomanisableString()
         {
-            var metadata = (Metadata ?? BeatmapSet?.Metadata).ToRomanisableString() ?? new RomanisableString(null, null);
+            var metadata = (Metadata ?? BeatmapSet?.Metadata)?.ToRomanisableString() ?? new RomanisableString(null, null);
             return new RomanisableString($"{metadata.GetPreferred(true)} {VersionString}".Trim(), $"{metadata.GetPreferred(false)} {VersionString}".Trim());
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index ca8e13d10a..fe5876e732 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -109,8 +109,8 @@ namespace osu.Game.Screens.OnlinePlay
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(new List<SpriteText>{ new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } }
-            , LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            beatmapText.AddLink(new List<SpriteText> { new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } },
+                LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From a73bae7a66889f22f8a321745baf25eafafd3efe Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 18 Apr 2021 06:35:43 +0300
Subject: [PATCH 09241/10326] Schedule completion when storyboard has actually
 ended

---
 osu.Game/Screens/Play/Player.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 622d99f078..cb8ebdcce7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -284,9 +284,9 @@ namespace osu.Game.Screens.Play
                 ScoreProcessor.RevertResult(r);
             };
 
-            DimmableStoryboard.HasStoryboardEnded.ValueChanged += _ =>
+            DimmableStoryboard.HasStoryboardEnded.ValueChanged += storyboardEnded =>
             {
-                if (ScoreProcessor.HasCompleted.Value)
+                if (storyboardEnded.NewValue && ScoreProcessor.HasCompleted.Value)
                     scheduleCompletion();
             };
 

From f6a09be62d4a88ec2f15a4040c3b1e1d9e0e2329 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 18 Apr 2021 06:35:54 +0300
Subject: [PATCH 09242/10326] Add further xmldoc

---
 osu.Game/Screens/Play/DimmableStoryboard.cs           | 10 ++++++++--
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs  |  2 +-
 osu.Game/Storyboards/IStoryboardElement.cs            |  8 ++++----
 osu.Game/Storyboards/IStoryboardElementHasDuration.cs |  5 ++++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index 73b4153601..f8cedddfbe 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -20,6 +20,14 @@ namespace osu.Game.Screens.Play
         private readonly Storyboard storyboard;
         private DrawableStoryboard drawableStoryboard;
 
+        /// <summary>
+        /// Whether the storyboard is considered finished.
+        /// </summary>
+        /// <remarks>
+        /// This is true by default in here, until an actual drawable storyboard is loaded, in which case it'll bind to it.
+        /// </remarks>
+        public IBindable<bool> HasStoryboardEnded = new BindableBool(true);
+
         public DimmableStoryboard(Storyboard storyboard)
         {
             this.storyboard = storyboard;
@@ -63,7 +71,5 @@ namespace osu.Game.Screens.Play
             Add(storyboard);
             OverlayLayerContainer.Add(storyboard.OverlayLayer.CreateProxy());
         }
-
-        public IBindable<bool> HasStoryboardEnded = new BindableBool(true);
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index abfb4598ec..a9a8b8a4ac 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         /// <summary>
-        /// Whether the storyboard has ended after the gameplay portion of the beatmap.
+        /// Whether the storyboard is considered finished.
         /// </summary>
         public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
 
diff --git a/osu.Game/Storyboards/IStoryboardElement.cs b/osu.Game/Storyboards/IStoryboardElement.cs
index 377ad57ab2..2f05e92070 100644
--- a/osu.Game/Storyboards/IStoryboardElement.cs
+++ b/osu.Game/Storyboards/IStoryboardElement.cs
@@ -18,13 +18,13 @@ namespace osu.Game.Storyboards
     public static class StoryboardElementExtensions
     {
         /// <summary>
-        /// Returns the end time of this object.
+        /// Returns the end time of this storyboard element.
         /// </summary>
         /// <remarks>
         /// This returns the <see cref="IStoryboardElementHasDuration.EndTime"/> where available, falling back to <see cref="IStoryboardElement.StartTime"/> otherwise.
         /// </remarks>
-        /// <param name="storyboardElement">The object.</param>
-        /// <returns>The end time of this object.</returns>
-        public static double GetEndTime(this IStoryboardElement storyboardElement) => (storyboardElement as IStoryboardElementHasDuration)?.EndTime ?? storyboardElement.StartTime;
+        /// <param name="element">The storyboard element.</param>
+        /// <returns>The end time of this element.</returns>
+        public static double GetEndTime(this IStoryboardElement element) => (element as IStoryboardElementHasDuration)?.EndTime ?? element.StartTime;
     }
 }
diff --git a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
index daa0c55704..b8d3b66694 100644
--- a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
@@ -4,10 +4,13 @@
 namespace osu.Game.Storyboards
 {
     /// <summary>
-    /// A StoryboardElement that ends at a different time than its start time.
+    /// A <see cref="IStoryboardElement"/> that ends at a different time than its start time.
     /// </summary>
     public interface IStoryboardElementHasDuration
     {
+        /// <summary>
+        /// The time at which the <see cref="IStoryboardElement"/> ends.
+        /// </summary>
         double EndTime { get; }
     }
 }

From f45aed125903673a1eaa27484bce71c5026d61e8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 18 Apr 2021 07:16:00 +0300
Subject: [PATCH 09243/10326] Remove new line between skip overlay fields

---
 osu.Game/Screens/Play/Player.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index cb8ebdcce7..da877fcd22 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -105,7 +105,6 @@ namespace osu.Game.Screens.Play
         private BreakTracker breakTracker;
 
         private SkipOverlay skipIntroOverlay;
-
         private SkipOverlay skipOutroOverlay;
 
         protected ScoreProcessor ScoreProcessor { get; private set; }

From 2678089e0b0610ea78afb373a36f81d54af171cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Apr 2021 20:18:30 +0900
Subject: [PATCH 09244/10326] Add test case failing on selection after paste

---
 .../Editing/TestSceneEditorClipboard.cs       | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
index 29046c82a6..01d9966736 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -3,12 +3,16 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osu.Game.Tests.Beatmaps;
 using osuTK;
 
@@ -110,8 +114,9 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("duration matches", () => ((Spinner)EditorBeatmap.HitObjects.Single()).Duration == 5000);
         }
 
-        [Test]
-        public void TestCopyPaste()
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestCopyPaste(bool deselectAfterCopy)
         {
             var addedObject = new HitCircle { StartTime = 1000 };
 
@@ -123,11 +128,22 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("move forward in time", () => EditorClock.Seek(2000));
 
+            if (deselectAfterCopy)
+            {
+                AddStep("deselect", () => EditorBeatmap.SelectedHitObjects.Clear());
+
+                AddUntilStep("timeline selection box is not visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<SelectionHandler>().First().Alpha == 0);
+                AddUntilStep("composer selection box is not visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<SelectionHandler>().First().Alpha == 0);
+            }
+
             AddStep("paste hitobject", () => Editor.Paste());
 
             AddAssert("are two objects", () => EditorBeatmap.HitObjects.Count == 2);
 
             AddAssert("new object selected", () => EditorBeatmap.SelectedHitObjects.Single().StartTime == 2000);
+
+            AddUntilStep("timeline selection box is visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<SelectionHandler>().First().Alpha > 0);
+            AddUntilStep("composer selection box is visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<SelectionHandler>().First().Alpha > 0);
         }
 
         [Test]

From e76565dbc57f874fd4143d5d8717aeeb99e5a5eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Apr 2021 20:11:05 +0900
Subject: [PATCH 09245/10326] Fix selection box not displaying after pasting a
 selection in the editor

Closes #12471.
---
 .../Edit/Compose/Components/SelectionHandler.cs        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 389ef78ed5..40641ee41f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -33,10 +33,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public class SelectionHandler : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
     {
+        /// <summary>
+        /// The currently selected blueprints.
+        /// Should be used when operations are dealing directly with the visible blueprints.
+        /// For more general selection operations, use EditorBeatmap.SelectedHitObjects instead.
+        /// </summary>
         public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
-        private readonly List<SelectionBlueprint> selectedBlueprints;
 
-        public int SelectedCount => selectedBlueprints.Count;
+        private readonly List<SelectionBlueprint> selectedBlueprints;
 
         private Drawable content;
 
@@ -295,7 +299,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private void updateVisibility()
         {
-            int count = selectedBlueprints.Count;
+            int count = EditorBeatmap.SelectedHitObjects.Count;
 
             selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
 

From cfc76640941f5dcb41dc4e5b319b207be7e85214 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Apr 2021 21:05:23 +0900
Subject: [PATCH 09246/10326] Use full path

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 40641ee41f..b06e982859 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// The currently selected blueprints.
         /// Should be used when operations are dealing directly with the visible blueprints.
-        /// For more general selection operations, use EditorBeatmap.SelectedHitObjects instead.
+        /// For more general selection operations, use <see cref="osu.Game.Screens.Edit.EditorBeatmap.SelectedHitObjects"/> instead.
         /// </summary>
         public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
 

From 38a7c590c4d07ac17c9746c8feac2aa4a59c63af Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 20:57:25 +0800
Subject: [PATCH 09247/10326] Make versionString private

---
 osu.Game/Beatmaps/BeatmapInfo.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index d5a1e2491b..36cb97e8d7 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Beatmaps
         // Metadata
         public string Version { get; set; }
 
-        public string VersionString => string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
+        private string versionString => string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
 
         [JsonProperty("difficulty_rating")]
         public double StarDifficulty { get; set; }
@@ -146,12 +146,12 @@ namespace osu.Game.Beatmaps
             Version
         }.Concat(Metadata?.SearchableTerms ?? Enumerable.Empty<string>()).Where(s => !string.IsNullOrEmpty(s)).ToArray();
 
-        public override string ToString() => $"{Metadata ?? BeatmapSet?.Metadata} {VersionString}".Trim();
+        public override string ToString() => $"{Metadata ?? BeatmapSet?.Metadata} {versionString}".Trim();
 
         public RomanisableString ToRomanisableString()
         {
             var metadata = (Metadata ?? BeatmapSet?.Metadata)?.ToRomanisableString() ?? new RomanisableString(null, null);
-            return new RomanisableString($"{metadata.GetPreferred(true)} {VersionString}".Trim(), $"{metadata.GetPreferred(false)} {VersionString}".Trim());
+            return new RomanisableString($"{metadata.GetPreferred(true)} {versionString}".Trim(), $"{metadata.GetPreferred(false)} {versionString}".Trim());
         }
 
         public bool Equals(BeatmapInfo other)

From 488001d5701b51db7405e5ebd7c3ab4174e9a699 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 20:58:08 +0800
Subject: [PATCH 09248/10326] Support SpriteText for LinkFlowContainer

---
 .../Graphics/Containers/LinkFlowContainer.cs  | 23 +++++++++++++++++++
 osu.Game/Online/Chat/DrawableLinkCompiler.cs  |  5 ++++
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 914c8ff78d..32efcce80c 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -67,6 +67,13 @@ namespace osu.Game.Graphics.Containers
             createLink(text, new LinkDetails(action, linkArgument), tooltipText);
         }
 
+        public void AddLink(SpriteText text, LinkAction action = LinkAction.External, string linkArgument = null, string tooltipText = null)
+        {
+            AddArbitraryDrawable(text);
+
+            createLink(text, new LinkDetails(action, linkArgument), tooltipText);
+        }
+
         public void AddUserLink(User user, Action<SpriteText> creationParameters = null)
             => createLink(AddText(user.Username, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user.Id.ToString()), "view profile");
 
@@ -86,6 +93,22 @@ namespace osu.Game.Graphics.Containers
             });
         }
 
+        private void createLink(Drawable drawable, LinkDetails link, string tooltipText, Action action = null)
+        {
+            AddInternal(new DrawableLinkCompiler(drawable)
+            {
+                RelativeSizeAxes = Axes.Both,
+                TooltipText = tooltipText,
+                Action = () =>
+                {
+                    if (action != null)
+                        action();
+                    else
+                        game?.HandleLink(link);
+                },
+            });
+        }
+
         // We want the compilers to always be visible no matter where they are, so RelativeSizeAxes is used.
         // However due to https://github.com/ppy/osu-framework/issues/2073, it's possible for the compilers to be relative size in the flow's auto-size axes - an unsupported operation.
         // Since the compilers don't display any content and don't affect the layout, it's simplest to exclude them from the flow.
diff --git a/osu.Game/Online/Chat/DrawableLinkCompiler.cs b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
index d27a3fbffe..7675eab4c0 100644
--- a/osu.Game/Online/Chat/DrawableLinkCompiler.cs
+++ b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
@@ -31,6 +31,11 @@ namespace osu.Game.Online.Chat
             Parts = parts.ToList();
         }
 
+        public DrawableLinkCompiler(Drawable part)
+        {
+            Parts = new List<Drawable> { part };
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index fe5876e732..a92ca610f3 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.OnlinePlay
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(new List<SpriteText> { new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } },
+            beatmapText.AddLink(new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() },
                 LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();

From e63edf5b4914ec04f55b2de779709e2120d93315 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Apr 2021 23:50:09 +0900
Subject: [PATCH 09249/10326] Fix volume control displaying on non-vertical
 scroll events

Closes #12475.
---
 osu.Game/Overlays/Volume/VolumeControlReceptor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
index 34b86b2f81..ae9c2eb394 100644
--- a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
@@ -44,6 +44,9 @@ namespace osu.Game.Overlays.Volume
 
         protected override bool OnScroll(ScrollEvent e)
         {
+            if (e.ScrollDelta.Y == 0)
+                return false;
+
             // forward any unhandled mouse scroll events to the volume control.
             ScrollActionRequested?.Invoke(GlobalAction.IncreaseVolume, e.ScrollDelta.Y, e.IsPrecise);
             return true;

From af79ad537c048891659eaabadaa3a1877b7aae89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Apr 2021 23:51:37 +0900
Subject: [PATCH 09250/10326] Avoid unnecessary debounce triggers on zero-delta
 scrolls

---
 osu.Game/Overlays/Volume/VolumeMeter.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index 202eac93ea..f1f21bec49 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -245,6 +245,9 @@ namespace osu.Game.Overlays.Volume
 
         private void adjust(double delta, bool isPrecise)
         {
+            if (delta == 0)
+                return;
+
             // every adjust increment increases the rate at which adjustments happen up to a cutoff.
             // this debounce will reset on inactivity.
             accelerationDebounce?.Cancel();

From 1b2c43b92cab2badef24f03755e3d8b282cfc04d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 19:29:04 +0200
Subject: [PATCH 09251/10326] Add basic structure of colour palette

---
 .../TestSceneLabelledColourPalette.cs         |  49 +++++++++
 .../Graphics/UserInterfaceV2/ColourDisplay.cs | 103 ++++++++++++++++++
 .../Graphics/UserInterfaceV2/ColourPalette.cs |  67 ++++++++++++
 .../UserInterfaceV2/LabelledColourPalette.cs  |  20 ++++
 4 files changed, 239 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
new file mode 100644
index 0000000000..afe95a3745
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneLabelledColourPalette : OsuTestScene
+    {
+        private LabelledColourPalette component;
+
+        [Test]
+        public void TestPalette([Values] bool hasDescription) => createColourPalette(hasDescription);
+
+        private void createColourPalette(bool hasDescription = false)
+        {
+            AddStep("create component", () =>
+            {
+                Child = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 500,
+                    AutoSizeAxes = Axes.Y,
+                    Child = component = new LabelledColourPalette
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                };
+
+                component.Label = "a sample component";
+                component.Description = hasDescription ? "this text describes the component" : string.Empty;
+
+                component.Colours.AddRange(new[]
+                {
+                    Color4.DarkRed,
+                    Color4.Aquamarine,
+                    Color4.Goldenrod,
+                    Color4.Gainsboro
+                });
+            });
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
new file mode 100644
index 0000000000..ef5be62a37
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
@@ -0,0 +1,103 @@
+// Copyright (c) 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.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    public class ColourDisplay : CompositeDrawable, IHasCurrentValue<Color4>
+    {
+        private readonly BindableWithCurrent<Color4> current = new BindableWithCurrent<Color4>();
+
+        private Box fill;
+        private OsuSpriteText colourHexCode;
+        private OsuSpriteText colourName;
+
+        public Bindable<Color4> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
+        private LocalisableString name;
+
+        public LocalisableString ColourName
+        {
+            get => name;
+            set
+            {
+                if (name == value)
+                    return;
+
+                name = value;
+
+                colourName.Text = name;
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Y;
+            Width = 100;
+
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new Drawable[]
+                {
+                    new CircularContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 100,
+                        Masking = true,
+                        Children = new Drawable[]
+                        {
+                            fill = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both
+                            },
+                            colourHexCode = new OsuSpriteText
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Font = OsuFont.Default.With(size: 12)
+                            }
+                        }
+                    },
+                    colourName = new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            current.BindValueChanged(_ => updateColour(), true);
+        }
+
+        private void updateColour()
+        {
+            fill.Colour = current.Value;
+            colourHexCode.Text = current.Value.ToHex();
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
new file mode 100644
index 0000000000..8fa76a017c
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    public class ColourPalette : CompositeDrawable
+    {
+        public BindableList<Color4> Colours { get; } = new BindableList<Color4>();
+
+        private FillFlowContainer<ColourDisplay> palette;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            InternalChild = palette = new FillFlowContainer<ColourDisplay>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(10),
+                Direction = FillDirection.Full
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Colours.BindCollectionChanged((_, __) => updatePalette(), true);
+        }
+
+        private void updatePalette()
+        {
+            palette.Clear();
+
+            foreach (var item in Colours)
+            {
+                palette.Add(new ColourDisplay
+                {
+                    Current = { Value = item }
+                });
+            }
+
+            reindexItems();
+        }
+
+        private void reindexItems()
+        {
+            int index = 1;
+
+            foreach (var colour in palette)
+            {
+                colour.ColourName = $"Colour {index}";
+                index += 1;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
new file mode 100644
index 0000000000..f6f2d92d01
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.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.Bindables;
+using osuTK.Graphics;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    public class LabelledColourPalette : LabelledDrawable<ColourPalette>
+    {
+        public LabelledColourPalette()
+            : base(true)
+        {
+        }
+
+        public BindableList<Color4> Colours => Component.Colours;
+
+        protected override ColourPalette CreateComponent() => new ColourPalette();
+    }
+}

From 67c19df00050c9d0f6fef7f69e9dc98edb2f4c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 19:35:42 +0200
Subject: [PATCH 09252/10326] Add test coverage for adding/removing colours

---
 .../TestSceneLabelledColourPalette.cs         | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
index afe95a3745..77d313e6ee 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK.Graphics;
 
@@ -14,7 +15,17 @@ namespace osu.Game.Tests.Visual.UserInterface
         private LabelledColourPalette component;
 
         [Test]
-        public void TestPalette([Values] bool hasDescription) => createColourPalette(hasDescription);
+        public void TestPalette([Values] bool hasDescription)
+        {
+            createColourPalette(hasDescription);
+
+            AddRepeatStep("add random colour", () => component.Colours.Add(randomColour()), 4);
+            AddRepeatStep("remove random colour", () =>
+            {
+                if (component.Colours.Count > 0)
+                    component.Colours.RemoveAt(RNG.Next(component.Colours.Count));
+            }, 5);
+        }
 
         private void createColourPalette(bool hasDescription = false)
         {
@@ -45,5 +56,11 @@ namespace osu.Game.Tests.Visual.UserInterface
                 });
             });
         }
+
+        private Color4 randomColour() => new Color4(
+            RNG.NextSingle(),
+            RNG.NextSingle(),
+            RNG.NextSingle(),
+            1);
     }
 }

From a8027d87b6c9bd31c895d1eb243fdf6af689567e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 19:46:54 +0200
Subject: [PATCH 09253/10326] Fix unreadable colour hex code text due to low
 contrast

Logic is shared with the timeline blueprints which also have the same
problem of displaying text on top of a combo colour.

Slightly modified the formula. Seems to yield better results on a
subjective check.
---
 .../Graphics/UserInterfaceV2/ColourDisplay.cs |  2 ++
 .../Timeline/TimelineHitObjectBlueprint.cs    |  6 ++---
 osu.Game/Utils/ColourUtils.cs                 | 23 +++++++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Utils/ColourUtils.cs

diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
index ef5be62a37..5d9d2521cb 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -98,6 +99,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         {
             fill.Colour = current.Value;
             colourHexCode.Text = current.Value.ToHex();
+            colourHexCode.Colour = ColourUtils.ForegroundTextColourFor(current.Value);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 105e04d441..dc67009d08 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -158,10 +159,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 circle.Colour = comboColour;
 
             var col = circle.Colour.TopLeft.Linear;
-            float brightness = col.R + col.G + col.B;
-
-            // decide the combo index colour based on brightness?
-            colouredComponents.Colour = OsuColour.Gray(brightness > 0.5f ? 0.2f : 0.9f);
+            colouredComponents.Colour = ColourUtils.ForegroundTextColourFor(col);
         }
 
         protected override void Update()
diff --git a/osu.Game/Utils/ColourUtils.cs b/osu.Game/Utils/ColourUtils.cs
new file mode 100644
index 0000000000..33f6f5981f
--- /dev/null
+++ b/osu.Game/Utils/ColourUtils.cs
@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Graphics;
+using osuTK.Graphics;
+
+namespace osu.Game.Utils
+{
+    public static class ColourUtils
+    {
+        /// <summary>
+        /// Returns a foreground text colour that is supposed to contrast well on top of
+        /// the supplied <paramref name="backgroundColour"/>.
+        /// </summary>
+        public static Color4 ForegroundTextColourFor(Color4 backgroundColour)
+        {
+            // formula taken from the RGB->YIQ conversions: https://en.wikipedia.org/wiki/YIQ
+            // brightness here is equivalent to the Y component in the above colour model, which is a rough estimate of lightness.
+            float brightness = 0.299f * backgroundColour.R + 0.587f * backgroundColour.G + 0.114f * backgroundColour.B;
+            return OsuColour.Gray(brightness > 0.5f ? 0.2f : 0.9f);
+        }
+    }
+}

From 0cd1aa8c1cca9a984968a6c84ae25a5b55ee2cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 19:56:03 +0200
Subject: [PATCH 09254/10326] Add support for custom colour prefixes

---
 .../TestSceneLabelledColourPalette.cs         |  3 +++
 .../Graphics/UserInterfaceV2/ColourPalette.cs | 19 ++++++++++++++++++-
 .../UserInterfaceV2/LabelledColourPalette.cs  |  6 ++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
index 77d313e6ee..325e71f76a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 if (component.Colours.Count > 0)
                     component.Colours.RemoveAt(RNG.Next(component.Colours.Count));
             }, 5);
+
+            AddStep("set custom prefix", () => component.ColourNamePrefix = "Combo");
         }
 
         private void createColourPalette(bool hasDescription = false)
@@ -41,6 +43,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
+                        ColourNamePrefix = "My colour #"
                     }
                 };
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
index 8fa76a017c..38ac51b955 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
@@ -14,6 +14,23 @@ namespace osu.Game.Graphics.UserInterfaceV2
     {
         public BindableList<Color4> Colours { get; } = new BindableList<Color4>();
 
+        private string colourNamePrefix = "Colour";
+
+        public string ColourNamePrefix
+        {
+            get => colourNamePrefix;
+            set
+            {
+                if (colourNamePrefix == value)
+                    return;
+
+                colourNamePrefix = value;
+
+                if (IsLoaded)
+                    reindexItems();
+            }
+        }
+
         private FillFlowContainer<ColourDisplay> palette;
 
         [BackgroundDependencyLoader]
@@ -59,7 +76,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
             foreach (var colour in palette)
             {
-                colour.ColourName = $"Colour {index}";
+                colour.ColourName = $"{colourNamePrefix} {index}";
                 index += 1;
             }
         }
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
index f6f2d92d01..58443953bc 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
@@ -15,6 +15,12 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
         public BindableList<Color4> Colours => Component.Colours;
 
+        public string ColourNamePrefix
+        {
+            get => Component.ColourNamePrefix;
+            set => Component.ColourNamePrefix = value;
+        }
+
         protected override ColourPalette CreateComponent() => new ColourPalette();
     }
 }

From 577755ee1943c65b4e26dfa7cef7c39a43896a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 20:15:30 +0200
Subject: [PATCH 09255/10326] Add placeholder when no colours are visible

Will be removed once combo colours are mutable.
---
 .../TestSceneLabelledColourPalette.cs         |  7 ++--
 .../Graphics/UserInterfaceV2/ColourPalette.cs | 42 ++++++++++++++++---
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
index 325e71f76a..826da17ca8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
@@ -20,13 +20,14 @@ namespace osu.Game.Tests.Visual.UserInterface
             createColourPalette(hasDescription);
 
             AddRepeatStep("add random colour", () => component.Colours.Add(randomColour()), 4);
+
+            AddStep("set custom prefix", () => component.ColourNamePrefix = "Combo");
+
             AddRepeatStep("remove random colour", () =>
             {
                 if (component.Colours.Count > 0)
                     component.Colours.RemoveAt(RNG.Next(component.Colours.Count));
-            }, 5);
-
-            AddStep("set custom prefix", () => component.ColourNamePrefix = "Combo");
+            }, 8);
         }
 
         private void createColourPalette(bool hasDescription = false)
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
index 38ac51b955..3ca5c2d8d1 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
@@ -1,10 +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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -32,6 +34,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         }
 
         private FillFlowContainer<ColourDisplay> palette;
+        private Container placeholder;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -39,12 +42,27 @@ namespace osu.Game.Graphics.UserInterfaceV2
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChild = palette = new FillFlowContainer<ColourDisplay>
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Spacing = new Vector2(10),
-                Direction = FillDirection.Full
+                palette = new FillFlowContainer<ColourDisplay>
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Spacing = new Vector2(10),
+                    Direction = FillDirection.Full
+                },
+                placeholder = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Child = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Text = "(none)",
+                        Font = OsuFont.Default.With(weight: FontWeight.Bold)
+                    }
+                }
             };
         }
 
@@ -53,12 +71,26 @@ namespace osu.Game.Graphics.UserInterfaceV2
             base.LoadComplete();
 
             Colours.BindCollectionChanged((_, __) => updatePalette(), true);
+            FinishTransforms(true);
         }
 
+        private const int fade_duration = 200;
+
         private void updatePalette()
         {
             palette.Clear();
 
+            if (Colours.Any())
+            {
+                palette.FadeIn(fade_duration, Easing.OutQuint);
+                placeholder.FadeOut(fade_duration, Easing.OutQuint);
+            }
+            else
+            {
+                palette.FadeOut(fade_duration, Easing.OutQuint);
+                placeholder.FadeIn(fade_duration, Easing.OutQuint);
+            }
+
             foreach (var item in Colours)
             {
                 palette.Add(new ColourDisplay

From 07a00cd68130e973de37e68f119191c8bc971f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 20:16:17 +0200
Subject: [PATCH 09256/10326] Add colours section with combo colour display

---
 osu.Game/Screens/Edit/Setup/ColoursSection.cs | 37 +++++++++++++++++++
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Setup/ColoursSection.cs

diff --git a/osu.Game/Screens/Edit/Setup/ColoursSection.cs b/osu.Game/Screens/Edit/Setup/ColoursSection.cs
new file mode 100644
index 0000000000..91dfd74a78
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/ColoursSection.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.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    internal class ColoursSection : SetupSection
+    {
+        public override LocalisableString Title => "Colours";
+
+        private LabelledColourPalette comboColours;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Children = new Drawable[]
+            {
+                comboColours = new LabelledColourPalette
+                {
+                    Label = "Hitcircle / Slider Combos",
+                    ColourNamePrefix = "Combo"
+                }
+            };
+
+            var colours = Beatmap.BeatmapSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+            if (colours != null)
+                comboColours.Colours.AddRange(colours);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 70671b487c..dc81b31f65 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -61,6 +61,7 @@ namespace osu.Game.Screens.Edit.Setup
                                 new ResourcesSection(),
                                 new MetadataSection(),
                                 new DifficultySection(),
+                                new ColoursSection()
                             }
                         },
                     }

From 6f2ebb20a7fedc0d02037540b3610e7e64288239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 20:29:09 +0200
Subject: [PATCH 09257/10326] Fix test failing due to null beatmap skin

Also annotate the field on `EditorBeatmap` as nullable for future
travelers.
---
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 1 +
 osu.Game/Screens/Edit/Setup/ColoursSection.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 4f1b0484d2..4bf4a3b8f3 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Screens.Edit
 
         public readonly IBeatmap PlayableBeatmap;
 
+        [CanBeNull]
         public readonly ISkin BeatmapSkin;
 
         [Resolved]
diff --git a/osu.Game/Screens/Edit/Setup/ColoursSection.cs b/osu.Game/Screens/Edit/Setup/ColoursSection.cs
index 91dfd74a78..cb7deadcb7 100644
--- a/osu.Game/Screens/Edit/Setup/ColoursSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ColoursSection.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Edit.Setup
                 }
             };
 
-            var colours = Beatmap.BeatmapSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+            var colours = Beatmap.BeatmapSkin?.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
             if (colours != null)
                 comboColours.Colours.AddRange(colours);
         }

From 98460c8febc37c17acb949a864f528c32ef637cb Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sun, 18 Apr 2021 00:45:24 -0400
Subject: [PATCH 09258/10326] Rename IStoryboardElementHasDuration, remove
 unnecessary step in tests, add Duration field

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs        | 4 ----
 osu.Game/Storyboards/IStoryboardElement.cs                 | 4 ++--
 ...entHasDuration.cs => IStoryboardElementWithDuration.cs} | 7 ++++++-
 osu.Game/Storyboards/StoryboardSprite.cs                   | 4 +++-
 4 files changed, 11 insertions(+), 8 deletions(-)
 rename osu.Game/Storyboards/{IStoryboardElementHasDuration.cs => IStoryboardElementWithDuration.cs} (70%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 59d543d686..fa1c4aa0d1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -35,7 +35,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardSkipOutro()
         {
-            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("skip outro", () => InputManager.Key(osuTK.Input.Key.Space));
             AddAssert("score shown", () => Player.IsScoreShown);
@@ -44,7 +43,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardNoSkipOutro()
         {
-            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
             AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= storyboard_duration);
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
@@ -52,7 +50,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardExitToSkipOutro()
         {
-            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());
             AddAssert("score shown", () => Player.IsScoreShown);
@@ -63,7 +60,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestStoryboardToggle(bool enabledAtBeginning)
         {
             AddStep($"{(enabledAtBeginning ? "enable" : "disable")} storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, enabledAtBeginning));
-            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
             AddStep("toggle storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, !enabledAtBeginning));
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
diff --git a/osu.Game/Storyboards/IStoryboardElement.cs b/osu.Game/Storyboards/IStoryboardElement.cs
index 2f05e92070..9a059991e6 100644
--- a/osu.Game/Storyboards/IStoryboardElement.cs
+++ b/osu.Game/Storyboards/IStoryboardElement.cs
@@ -21,10 +21,10 @@ namespace osu.Game.Storyboards
         /// Returns the end time of this storyboard element.
         /// </summary>
         /// <remarks>
-        /// This returns the <see cref="IStoryboardElementHasDuration.EndTime"/> where available, falling back to <see cref="IStoryboardElement.StartTime"/> otherwise.
+        /// This returns the <see cref="IStoryboardElementWithDuration.EndTime"/> where available, falling back to <see cref="IStoryboardElement.StartTime"/> otherwise.
         /// </remarks>
         /// <param name="element">The storyboard element.</param>
         /// <returns>The end time of this element.</returns>
-        public static double GetEndTime(this IStoryboardElement element) => (element as IStoryboardElementHasDuration)?.EndTime ?? element.StartTime;
+        public static double GetEndTime(this IStoryboardElement element) => (element as IStoryboardElementWithDuration)?.EndTime ?? element.StartTime;
     }
 }
diff --git a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
similarity index 70%
rename from osu.Game/Storyboards/IStoryboardElementHasDuration.cs
rename to osu.Game/Storyboards/IStoryboardElementWithDuration.cs
index b8d3b66694..02b438cb76 100644
--- a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
@@ -6,11 +6,16 @@ namespace osu.Game.Storyboards
     /// <summary>
     /// A <see cref="IStoryboardElement"/> that ends at a different time than its start time.
     /// </summary>
-    public interface IStoryboardElementHasDuration
+    public interface IStoryboardElementWithDuration : IStoryboardElement
     {
         /// <summary>
         /// The time at which the <see cref="IStoryboardElement"/> ends.
         /// </summary>
         double EndTime { get; }
+
+        /// <summary>
+        /// The duration of the StoryboardElement.
+        /// </summary>
+        double Duration { get; }
     }
 }
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 51bdce3321..0aaf264341 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -11,7 +11,7 @@ using JetBrains.Annotations;
 
 namespace osu.Game.Storyboards
 {
-    public class StoryboardSprite : IStoryboardElement, IStoryboardElementHasDuration
+    public class StoryboardSprite : IStoryboardElementWithDuration
     {
         private readonly List<CommandLoop> loops = new List<CommandLoop>();
         private readonly List<CommandTrigger> triggers = new List<CommandTrigger>();
@@ -65,6 +65,8 @@ namespace osu.Game.Storyboards
             }
         }
 
+        public double Duration => EndTime - StartTime;
+
         public bool HasCommands => TimelineGroup.HasCommands || loops.Any(l => l.HasCommands);
 
         private delegate void DrawablePropertyInitializer<in T>(Drawable drawable, T value);

From 89940e7bb9fc9330eb3ad3e13a4602f04b4912d8 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 18 Apr 2021 18:35:44 -0700
Subject: [PATCH 09259/10326] Fix download button check icon not scaling on
 mouse down

---
 osu.Game/Graphics/UserInterface/DownloadButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/DownloadButton.cs b/osu.Game/Graphics/UserInterface/DownloadButton.cs
index 7a8db158c1..af270f30ae 100644
--- a/osu.Game/Graphics/UserInterface/DownloadButton.cs
+++ b/osu.Game/Graphics/UserInterface/DownloadButton.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(checkmark = new SpriteIcon
+            Add(checkmark = new SpriteIcon
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

From 2b6caf9b650fd5cfc5af4e168d1d794322ceb4a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 11:25:43 +0900
Subject: [PATCH 09260/10326] Fix duplicate code in setting default logic

---
 osu.Game/Configuration/SessionStatics.cs | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index e57b1c2fdf..ac94c39bd2 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.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.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
@@ -12,23 +13,18 @@ namespace osu.Game.Configuration
     /// </summary>
     public class SessionStatics : InMemoryConfigManager<Static>
     {
-        protected override void InitialiseDefaults()
-        {
-            SetDefault(Static.LoginOverlayDisplayed, false);
-            SetDefault(Static.MutedAudioNotificationShownOnce, false);
-            SetDefault(Static.LowBatteryNotificationShownOnce, false);
-            SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
-            SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
-        }
+        protected override void InitialiseDefaults() => ResetValues();
 
         public void ResetValues()
         {
-            GetOriginalBindable<bool>(Static.LoginOverlayDisplayed).SetDefault();
-            GetOriginalBindable<bool>(Static.MutedAudioNotificationShownOnce).SetDefault();
-            GetOriginalBindable<bool>(Static.LowBatteryNotificationShownOnce).SetDefault();
-            GetOriginalBindable<double?>(Static.LastHoverSoundPlaybackTime).SetDefault();
-            GetOriginalBindable<APISeasonalBackgrounds>(Static.SeasonalBackgrounds).SetDefault();
+            ensureDefault(SetDefault(Static.LoginOverlayDisplayed, false));
+            ensureDefault(SetDefault(Static.MutedAudioNotificationShownOnce, false));
+            ensureDefault(SetDefault(Static.LowBatteryNotificationShownOnce, false));
+            ensureDefault(SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null));
+            ensureDefault(SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null));
         }
+
+        private void ensureDefault<T>(Bindable<T> bindable) => bindable.SetDefault();
     }
 
     public enum Static

From dbb8f7f4a95523e7770391f9a6c8578d39eae84a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 11:30:55 +0900
Subject: [PATCH 09261/10326] Tidy up initialisation code and avoid using DI on
 inherited class

---
 osu.Game/OsuGame.cs     | 12 ++++++------
 osu.Game/OsuGameBase.cs |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 898a2baccf..1a2555f3f1 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -577,15 +577,15 @@ namespace osu.Game
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
 
-            GameIdleTracker sessionIdleTracker = new GameIdleTracker(300_000);
-            Add(sessionIdleTracker);
-
-            sessionIdleTracker.IsIdle.BindValueChanged(e =>
+            var sessionIdleTracker = new GameIdleTracker(300000);
+            sessionIdleTracker.IsIdle.BindValueChanged(idle =>
             {
-                if (e.NewValue)
-                    Dependencies.Get<SessionStatics>().ResetValues();
+                if (idle.NewValue)
+                    SessionStatics.ResetValues();
             });
 
+            Add(new GameIdleTracker(300000));
+
             AddRange(new Drawable[]
             {
                 new VolumeControlReceptor
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 406819cbd2..fbe4022cc1 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -61,6 +61,8 @@ namespace osu.Game
 
         protected OsuConfigManager LocalConfig;
 
+        protected SessionStatics SessionStatics { get; private set; }
+
         protected BeatmapManager BeatmapManager;
 
         protected ScoreManager ScoreManager;
@@ -289,7 +291,7 @@ namespace osu.Game
             if (powerStatus != null)
                 dependencies.CacheAs(powerStatus);
 
-            dependencies.Cache(new SessionStatics());
+            dependencies.Cache(SessionStatics = new SessionStatics());
             dependencies.Cache(new OsuColour());
 
             RegisterImportHandler(BeatmapManager);

From b727faace38e51a056c4131443fbf3a5356fbd71 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sun, 18 Apr 2021 23:03:43 -0400
Subject: [PATCH 09262/10326] Revert changes to IdleTracker

---
 .../Visual/Components/TestSceneIdleTracker.cs | 41 +++----------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index c3ea63ea65..d888f6a01e 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -5,7 +5,6 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Configuration;
 using osu.Game.Input;
 using osuTK;
 using osuTK.Graphics;
@@ -22,17 +21,14 @@ namespace osu.Game.Tests.Visual.Components
 
         private IdleTrackingBox[] boxes;
 
-        private SessionStatics sessionStatics;
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            sessionStatics = new SessionStatics();
             InputManager.MoveMouseTo(Vector2.Zero);
 
             Children = boxes = new[]
             {
-                box1 = new IdleTrackingBox(2000, sessionStatics)
+                box1 = new IdleTrackingBox(2000)
                 {
                     Name = "TopLeft",
                     RelativeSizeAxes = Axes.Both,
@@ -40,7 +36,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.TopLeft,
                 },
-                box2 = new IdleTrackingBox(4000, sessionStatics)
+                box2 = new IdleTrackingBox(4000)
                 {
                     Name = "TopRight",
                     RelativeSizeAxes = Axes.Both,
@@ -48,7 +44,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                 },
-                box3 = new IdleTrackingBox(6000, sessionStatics)
+                box3 = new IdleTrackingBox(6000)
                 {
                     Name = "BottomLeft",
                     RelativeSizeAxes = Axes.Both,
@@ -56,7 +52,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                 },
-                box4 = new IdleTrackingBox(8000, sessionStatics)
+                box4 = new IdleTrackingBox(8000)
                 {
                     Name = "BottomRight",
                     RelativeSizeAxes = Axes.Both,
@@ -145,27 +141,6 @@ namespace osu.Game.Tests.Visual.Components
 
             waitForAllIdle();
         }
-
-        [Test]
-        public void TestSessionStaticsReset()
-        {
-            AddStep("move to top left", () => InputManager.MoveMouseTo(box1));
-            AddStep("set session statics", () =>
-            {
-                sessionStatics.SetValue(Static.LoginOverlayDisplayed, true);
-                sessionStatics.SetValue(Static.MutedAudioNotificationShownOnce, true);
-                sessionStatics.SetValue(Static.LowBatteryNotificationShownOnce, true);
-                sessionStatics.SetValue(Static.LastHoverSoundPlaybackTime, (double?)1d);
-            });
-
-            AddStep("move away from box1", () => InputManager.MoveMouseTo(box4));
-            AddUntilStep("Wait for idle", () => box1.IsIdle);
-            AddAssert("LoginOverlayDisplayed is default", () => sessionStatics.Get<bool>(Static.LoginOverlayDisplayed) == false);
-            AddAssert("MutedAudioNotificationShownOnce is default", () => sessionStatics.Get<bool>(Static.MutedAudioNotificationShownOnce) == false);
-            AddAssert("LowBatteryNotificationShownOnce is default", () => sessionStatics.Get<bool>(Static.LowBatteryNotificationShownOnce) == false);
-            AddAssert("LastHoverSoundPlaybackTime is default", () => sessionStatics.Get<double?>(Static.LastHoverSoundPlaybackTime) == null);
-        }
-
         private void checkIdleStatus(int box, bool expectedIdle)
         {
             AddAssert($"box {box} is {(expectedIdle ? "idle" : "active")}", () => boxes[box - 1].IsIdle == expectedIdle);
@@ -182,7 +157,7 @@ namespace osu.Game.Tests.Visual.Components
 
             public bool IsIdle => idleTracker.IsIdle.Value;
 
-            public IdleTrackingBox(int timeToIdle, SessionStatics statics)
+            public IdleTrackingBox(int timeToIdle)
             {
                 Box box;
 
@@ -198,12 +173,6 @@ namespace osu.Game.Tests.Visual.Components
                         RelativeSizeAxes = Axes.Both,
                     },
                 };
-
-                idleTracker.IsIdle.BindValueChanged(idle =>
-                {
-                    box.Colour = idle.NewValue ? Color4.White : Color4.Black;
-                    if (idle.NewValue) statics.ResetValues();
-                }, true);
             }
         }
     }

From c39ab2c69219ff8d47337993597d56fc51fd01ab Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sun, 18 Apr 2021 23:04:28 -0400
Subject: [PATCH 09263/10326] Add SessionStaticsTest

---
 .../NonVisual/SessionStaticsTest.cs           | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/SessionStaticsTest.cs

diff --git a/osu.Game.Tests/NonVisual/SessionStaticsTest.cs b/osu.Game.Tests/NonVisual/SessionStaticsTest.cs
new file mode 100644
index 0000000000..d5fd803986
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/SessionStaticsTest.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 NUnit.Framework;
+using osu.Game.Configuration;
+using osu.Game.Input;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class SessionStaticsTest
+    {
+        private SessionStatics sessionStatics;
+        private IdleTracker sessionIdleTracker;
+
+        [SetUp]
+        public void SetUp()
+        {
+            sessionStatics = new SessionStatics();
+            sessionIdleTracker = new GameIdleTracker(1000);
+
+            sessionStatics.SetValue(Static.LoginOverlayDisplayed, true);
+            sessionStatics.SetValue(Static.MutedAudioNotificationShownOnce, true);
+            sessionStatics.SetValue(Static.LowBatteryNotificationShownOnce, true);
+            sessionStatics.SetValue(Static.LastHoverSoundPlaybackTime, (double?)1d);
+
+            sessionIdleTracker.IsIdle.BindValueChanged(e =>
+            {
+                if (e.NewValue)
+                    sessionStatics.ResetValues();
+            });
+        }
+
+        [Test]
+        [Timeout(2000)]
+        public void TestSessionStaticsReset()
+        {
+            sessionIdleTracker.IsIdle.BindValueChanged(e =>
+            {
+                Assert.IsTrue(sessionStatics.GetBindable<bool>(Static.LoginOverlayDisplayed).IsDefault);
+                Assert.IsTrue(sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce).IsDefault);
+                Assert.IsTrue(sessionStatics.GetBindable<bool>(Static.LowBatteryNotificationShownOnce).IsDefault);
+                Assert.IsTrue(sessionStatics.GetBindable<double?>(Static.LastHoverSoundPlaybackTime).IsDefault);
+            });
+        }
+    }
+}

From 99fab456b57adb11d4bbb6a92b959633fb33c21c Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sun, 18 Apr 2021 23:25:20 -0400
Subject: [PATCH 09264/10326] Storyboard completion calls updateCompletionState
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- If the storyboard ends after the beatmap, call updateCompletionState as if the score processor has completed at that time. (completionProgressDelegate is null here since earlier when the score processor actually completed, updateCompletionState returned after showing the skip overlay.)

- If the storyboard ends before the beatmap does, updateCompletionState simply returns and waits until the score processor is completed.

- If the storyboard and beatmap end at the exact same time, make sure updateCompletionState() is called only once by the score processor completion.

Co-Authored-By: Marlina José <marlina@umich.edu>
---
 osu.Game/Screens/Play/Player.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index da877fcd22..231fcbc174 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -285,8 +285,8 @@ namespace osu.Game.Screens.Play
 
             DimmableStoryboard.HasStoryboardEnded.ValueChanged += storyboardEnded =>
             {
-                if (storyboardEnded.NewValue && ScoreProcessor.HasCompleted.Value)
-                    scheduleCompletion();
+                if (storyboardEnded.NewValue && completionProgressDelegate == null)
+                    updateCompletionState(new ValueChangedEvent<bool>(true, ScoreProcessor.HasCompleted.Value));
             };
 
             // Bind the judgement processors to ourselves

From fd1241cc8513c72674f723a4c8767d9d5672430d Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sun, 18 Apr 2021 23:26:50 -0400
Subject: [PATCH 09265/10326] Added tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

New tests:
- storyboard ending during the failing animation
- showResults = false
- storyboard ending before score processor completion

Co-Authored-By: Marlina José <marlina@umich.edu>
---
 .../Gameplay/TestSceneStoryboardWithOutro.cs  | 92 ++++++++++++++++---
 1 file changed, 78 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index fa1c4aa0d1..8326063f81 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -1,17 +1,22 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 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.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Storyboards;
 using osuTK;
@@ -20,9 +25,15 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneStoryboardWithOutro : PlayerTestScene
     {
+        protected override bool HasCustomSteps => true;
+
         protected new OutroPlayer Player => (OutroPlayer)base.Player;
 
-        private const double storyboard_duration = 2000;
+        private double currentStoryboardDuration;
+
+        private bool showResults = true;
+
+        private event Func<HealthProcessor, JudgementResult, bool> currentFailConditions;
 
         [SetUpSteps]
         public override void SetUpSteps()
@@ -30,11 +41,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             base.SetUpSteps();
             AddStep("enable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, true));
             AddStep("set dim level to 0", () => LocalConfig.SetValue<double>(OsuSetting.DimLevel, 0));
+            AddStep("reset fail conditions", () => currentFailConditions = (_, __) => false);
+            AddStep("set storyboard duration to 2s", () => currentStoryboardDuration = 2000);
+            AddStep("set ShowResults = true", () => showResults = true);
         }
 
         [Test]
         public void TestStoryboardSkipOutro()
         {
+            CreateTest(null);
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("skip outro", () => InputManager.Key(osuTK.Input.Key.Space));
             AddAssert("score shown", () => Player.IsScoreShown);
@@ -43,13 +58,15 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardNoSkipOutro()
         {
-            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= storyboard_duration);
+            CreateTest(null);
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 
         [Test]
         public void TestStoryboardExitToSkipOutro()
         {
+            CreateTest(null);
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());
             AddAssert("score shown", () => Player.IsScoreShown);
@@ -59,16 +76,51 @@ namespace osu.Game.Tests.Visual.Gameplay
         [TestCase(true)]
         public void TestStoryboardToggle(bool enabledAtBeginning)
         {
+            CreateTest(null);
             AddStep($"{(enabledAtBeginning ? "enable" : "disable")} storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, enabledAtBeginning));
             AddStep("toggle storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, !enabledAtBeginning));
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 
-        protected override bool AllowFail => false;
+        [Test]
+        public void TestOutroEndsDuringFailAnimation()
+        {
+            CreateTest(() =>
+            {
+                AddStep("fail on first judgement", () => currentFailConditions = (_, __) => true);
+                AddStep("set storyboard duration to 1.3s", () => currentStoryboardDuration = 1300);
+            });
+            AddUntilStep("wait for fail", () => Player.HasFailed);
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+            AddUntilStep("wait for fail overlay", () => Player.FailOverlay.State.Value == Visibility.Visible);
+        }
+
+        [Test]
+        public void TestShowResultsFalse()
+        {
+            CreateTest(() =>
+            {
+                AddStep("set ShowResults = false", () => showResults = false);
+            });
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+            AddWaitStep("wait", 10);
+            AddAssert("no score shown", () => !Player.IsScoreShown);
+        }
+
+        [Test]
+        public void TestStoryboardEndsBeforeCompletion()
+        {
+            CreateTest(() => AddStep("set storyboard duration to .1s", () => currentStoryboardDuration = 100));
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddUntilStep("wait for score shown", () => Player.IsScoreShown);
+        }
+
+        protected override bool AllowFail => true;
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
 
-        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new OutroPlayer();
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new OutroPlayer(currentFailConditions, showResults);
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
@@ -79,26 +131,38 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
         {
-            if (storyboard == null)
-            {
-                storyboard = new Storyboard();
-                var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
-                sprite.TimelineGroup.Alpha.Add(Easing.None, 0, storyboard_duration, 1, 0);
-                storyboard.GetLayer("Background").Add(sprite);
-            }
+            return base.CreateWorkingBeatmap(beatmap, createStoryboard(currentStoryboardDuration));
+        }
 
-            return base.CreateWorkingBeatmap(beatmap, storyboard);
+        private Storyboard createStoryboard(double duration)
+        {
+            var storyboard = new Storyboard();
+            var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
+            sprite.TimelineGroup.Alpha.Add(Easing.None, 0, duration, 1, 0);
+            storyboard.GetLayer("Background").Add(sprite);
+            return storyboard;
         }
 
         protected class OutroPlayer : TestPlayer
         {
             public void ExitViaPause() => PerformExit(true);
 
+            public new FailOverlay FailOverlay => base.FailOverlay;
+
             public bool IsScoreShown => !this.IsCurrentScreen() && this.GetChildScreen() is ResultsScreen;
 
-            public OutroPlayer()
-                : base(false)
+            private event Func<HealthProcessor, JudgementResult, bool> failConditions;
+
+            public OutroPlayer(Func<HealthProcessor, JudgementResult, bool> failConditions, bool showResults = true)
+                : base(false, showResults)
             {
+                this.failConditions = failConditions;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                HealthProcessor.FailConditions += failConditions;
             }
 
             protected override Task ImportScore(Score score)

From 999f2d810caba2e15d720aebcfdc1e2e47fcdf8b Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sun, 18 Apr 2021 23:30:07 -0400
Subject: [PATCH 09266/10326] Fix accidentally removed code

---
 osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index d888f6a01e..77eadc14be 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -173,6 +173,8 @@ namespace osu.Game.Tests.Visual.Components
                         RelativeSizeAxes = Axes.Both,
                     },
                 };
+
+                idleTracker.IsIdle.BindValueChanged(idle => box.Colour = idle.NewValue ? Color4.White : Color4.Black, true);
             }
         }
     }

From f9f514ffec646a245d8c310594c4bae619b4a0c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 12:37:56 +0900
Subject: [PATCH 09267/10326] Add basic xmldoc to show how the two colour
 classes interact

---
 osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs | 3 +++
 osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
index 5d9d2521cb..c07e5d5bf7 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
@@ -16,6 +16,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterfaceV2
 {
+    /// <summary>
+    /// A component which displays a colour along with related description text.
+    /// </summary>
     public class ColourDisplay : CompositeDrawable, IHasCurrentValue<Color4>
     {
         private readonly BindableWithCurrent<Color4> current = new BindableWithCurrent<Color4>();
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
index 3ca5c2d8d1..ba950048dc 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
@@ -12,6 +12,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterfaceV2
 {
+    /// <summary>
+    /// A component which displays a collection of colours in individual <see cref="ColourDisplay"/>s.
+    /// </summary>
     public class ColourPalette : CompositeDrawable
     {
         public BindableList<Color4> Colours { get; } = new BindableList<Color4>();

From a854ce429a8a30f042d98521248a0b7b99456f19 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sun, 18 Apr 2021 23:49:13 -0400
Subject: [PATCH 09268/10326] add blank line between method

---
 osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index 77eadc14be..86a9d555a3 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -141,6 +141,7 @@ namespace osu.Game.Tests.Visual.Components
 
             waitForAllIdle();
         }
+
         private void checkIdleStatus(int box, bool expectedIdle)
         {
             AddAssert($"box {box} is {(expectedIdle ? "idle" : "active")}", () => boxes[box - 1].IsIdle == expectedIdle);

From 658c23c92522cc634063b012062ffad85b8e5b6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 13:15:17 +0900
Subject: [PATCH 09269/10326] Give more space to the parameter adjustment area

---
 osu.Game/Screens/Edit/Timing/TimingScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index c5d2dd756a..74ca6bc6f9 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Timing
             ColumnDimensions = new[]
             {
                 new Dimension(),
-                new Dimension(GridSizeMode.Absolute, 200),
+                new Dimension(GridSizeMode.Absolute, 350),
             },
             Content = new[]
             {

From 0c918410d07026a9b9bfd145ce1eb6ef0ed30a0a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 13:15:24 +0900
Subject: [PATCH 09270/10326] Make "add" button more visible

---
 osu.Game/Screens/Edit/Timing/TimingScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 74ca6bc6f9..d7a5442de1 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -106,9 +106,9 @@ namespace osu.Game.Screens.Edit.Timing
                             },
                             new OsuButton
                             {
-                                Text = "+",
+                                Text = "+ Add at current time",
                                 Action = addNew,
-                                Size = new Vector2(30, 30),
+                                Size = new Vector2(160, 30),
                                 Anchor = Anchor.BottomRight,
                                 Origin = Anchor.BottomRight,
                             },

From 513e470b525c4948d793555beb0df0928b3b9019 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 13:24:53 +0900
Subject: [PATCH 09271/10326] Adjust grid spacing to allow attributes to use
 more width

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index dd51056bf1..6d4f3d1b3a 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -66,9 +66,7 @@ namespace osu.Game.Screens.Edit.Timing
         {
             var columns = new List<TableColumn>
             {
-                new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn("Time", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn(),
+                new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 120)),
                 new TableColumn("Attributes", Anchor.CentreLeft),
             };
 
@@ -77,18 +75,11 @@ namespace osu.Game.Screens.Edit.Timing
 
         private Drawable[] createContent(int index, ControlPointGroup group) => new Drawable[]
         {
-            new OsuSpriteText
-            {
-                Text = $"#{index + 1}",
-                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
-                Margin = new MarginPadding(10)
-            },
             new OsuSpriteText
             {
                 Text = group.Time.ToEditorFormattedString(),
                 Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold)
             },
-            null,
             new ControlGroupAttributes(group),
         };
 

From ffc1e841e045270e0d28c670778b516264f7db08 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Mon, 19 Apr 2021 01:06:26 -0400
Subject: [PATCH 09272/10326] Fix sessionIdleTracker not being properly added
 to OsuGame

---
 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 1a2555f3f1..28f32ba455 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -584,7 +584,7 @@ namespace osu.Game
                     SessionStatics.ResetValues();
             });
 
-            Add(new GameIdleTracker(300000));
+            Add(sessionIdleTracker);
 
             AddRange(new Drawable[]
             {

From 0b36dd9bce6e4f958b51e91d52c7fd650abf2673 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 19 Apr 2021 01:23:21 -0400
Subject: [PATCH 09273/10326] Skip outro overlay and PerformExit() call
 updateCompletionState() instead of scheduleCompletion()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Marlina José <marlina@umich.edu>
---
 osu.Game/Screens/Play/Player.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 231fcbc174..ef2e042260 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -290,7 +290,7 @@ namespace osu.Game.Screens.Play
             };
 
             // Bind the judgement processors to ourselves
-            ScoreProcessor.HasCompleted.ValueChanged += updateCompletionState;
+            ScoreProcessor.HasCompleted.BindValueChanged(e => updateCompletionState(e));
             HealthProcessor.Failed += onFail;
 
             foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
@@ -370,7 +370,7 @@ namespace osu.Game.Screens.Play
                     },
                     skipOutroOverlay = new SkipOverlay(Beatmap.Value.Storyboard.LatestEventTime ?? 0)
                     {
-                        RequestSkip = scheduleCompletion,
+                        RequestSkip = () => updateCompletionState(new ValueChangedEvent<bool>(true, true), true),
                         Alpha = 0
                     },
                     FailOverlay = new FailOverlay
@@ -542,7 +542,7 @@ namespace osu.Game.Screens.Play
 
                 // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
                 if (prepareScoreForDisplayTask != null)
-                    scheduleCompletion();
+                    updateCompletionState(new ValueChangedEvent<bool>(true, true), true);
             }
 
             this.Exit();
@@ -581,7 +581,7 @@ namespace osu.Game.Screens.Play
         private ScheduledDelegate completionProgressDelegate;
         private Task<ScoreInfo> prepareScoreForDisplayTask;
 
-        private void updateCompletionState(ValueChangedEvent<bool> completionState)
+        private void updateCompletionState(ValueChangedEvent<bool> completionState, bool skipStoryboardOutro = false)
         {
             // screen may be in the exiting transition phase.
             if (!this.IsCurrentScreen())
@@ -631,6 +631,12 @@ namespace osu.Game.Screens.Play
                 return score.ScoreInfo;
             });
 
+            if (skipStoryboardOutro)
+            {
+                scheduleCompletion();
+                return;
+            }
+
             var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
 
             if (storyboardHasOutro)

From e143afb598c3d3c8c688f2341ef8320d03e91018 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 13:57:46 +0900
Subject: [PATCH 09274/10326] Split out rounded content screen from SetupScreen
 for use in other places

---
 .../Edit/RoundedContentEditorScreen.cs        | 61 +++++++++++++++++++
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    | 49 +++------------
 .../Screens/Edit/Setup/SetupScreenHeader.cs   |  2 +-
 osu.Game/Screens/Edit/Setup/SetupSection.cs   |  2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  |  9 ++-
 5 files changed, 77 insertions(+), 46 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/RoundedContentEditorScreen.cs

diff --git a/osu.Game/Screens/Edit/RoundedContentEditorScreen.cs b/osu.Game/Screens/Edit/RoundedContentEditorScreen.cs
new file mode 100644
index 0000000000..a55ae3f635
--- /dev/null
+++ b/osu.Game/Screens/Edit/RoundedContentEditorScreen.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Overlays;
+
+namespace osu.Game.Screens.Edit
+{
+    public class RoundedContentEditorScreen : EditorScreen
+    {
+        public const int HORIZONTAL_PADDING = 100;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Cached]
+        protected readonly OverlayColourProvider ColourProvider;
+
+        private Container roundedContent;
+
+        protected override Container<Drawable> Content => roundedContent;
+
+        public RoundedContentEditorScreen(EditorScreenMode mode)
+            : base(mode)
+        {
+            ColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            base.Content.Add(new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding(50),
+                Child = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    CornerRadius = 10,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = ColourProvider.Dark4,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        roundedContent = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 70671b487c..15cb384573 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -3,24 +3,12 @@
 
 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.Overlays;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    public class SetupScreen : EditorScreen
+    public class SetupScreen : RoundedContentEditorScreen
     {
-        public const int HORIZONTAL_PADDING = 100;
-
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        [Cached]
-        protected readonly OverlayColourProvider ColourProvider;
-
         [Cached]
         private SectionsContainer<SetupSection> sections = new SectionsContainer<SetupSection>();
 
@@ -30,42 +18,25 @@ namespace osu.Game.Screens.Edit.Setup
         public SetupScreen()
             : base(EditorScreenMode.SongSetup)
         {
-            ColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new Container
+            AddRange(new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Padding = new MarginPadding(50),
-                Child = new Container
+                sections = new SectionsContainer<SetupSection>
                 {
+                    FixedHeader = header,
                     RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    CornerRadius = 10,
-                    Children = new Drawable[]
+                    Children = new SetupSection[]
                     {
-                        new Box
-                        {
-                            Colour = ColourProvider.Dark4,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        sections = new SectionsContainer<SetupSection>
-                        {
-                            FixedHeader = header,
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new SetupSection[]
-                            {
-                                new ResourcesSection(),
-                                new MetadataSection(),
-                                new DifficultySection(),
-                            }
-                        },
+                        new ResourcesSection(),
+                        new MetadataSection(),
+                        new DifficultySection(),
                     }
-                }
-            };
+                },
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index 06aad69afa..10daacc359 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Edit.Setup
 
             public SetupScreenTabControl()
             {
-                TabContainer.Margin = new MarginPadding { Horizontal = SetupScreen.HORIZONTAL_PADDING };
+                TabContainer.Margin = new MarginPadding { Horizontal = RoundedContentEditorScreen.HORIZONTAL_PADDING };
 
                 AddInternal(background = new Box
                 {
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index de62c3a468..b3ae15900f 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Edit.Setup
             Padding = new MarginPadding
             {
                 Vertical = 10,
-                Horizontal = SetupScreen.HORIZONTAL_PADDING
+                Horizontal = RoundedContentEditorScreen.HORIZONTAL_PADDING
             };
 
             InternalChild = new FillFlowContainer
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 550fbe2950..a2ee153951 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -7,16 +7,16 @@ 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.Graphics.UserInterface;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class VerifyScreen : EditorScreen
+    public class VerifyScreen : RoundedContentEditorScreen
     {
         [Cached]
         private Bindable<Issue> selectedIssue = new Bindable<Issue>();
@@ -32,7 +32,6 @@ namespace osu.Game.Screens.Edit.Verify
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                Padding = new MarginPadding(20),
                 Child = new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -70,7 +69,7 @@ namespace osu.Game.Screens.Edit.Verify
             private BeatmapVerifier generalVerifier;
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colours)
             {
                 generalVerifier = new BeatmapVerifier();
                 rulesetVerifier = Beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
@@ -81,7 +80,7 @@ namespace osu.Game.Screens.Edit.Verify
                 {
                     new Box
                     {
-                        Colour = colours.Gray0,
+                        Colour = colours.Background2,
                         RelativeSizeAxes = Axes.Both,
                     },
                     new OsuScrollContainer

From f4baff9e0495b3939b5970bdcdbc6f32fc114088 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 14:11:26 +0900
Subject: [PATCH 09275/10326] Make `TimingScreen` use rounded screen and adjust
 spacing/padding

---
 osu.Game/Screens/Edit/EditorTable.cs          |  7 +--
 .../Edit/Timing/ControlPointSettings.cs       |  6 +--
 osu.Game/Screens/Edit/Timing/Section.cs       | 20 ++++-----
 osu.Game/Screens/Edit/Timing/TimingScreen.cs  | 43 +++++++++----------
 4 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index ef1c88db9a..9a793c8c97 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -9,6 +9,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit
@@ -93,10 +94,10 @@ namespace osu.Game.Screens.Edit
             private Color4 colourSelected;
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colours)
             {
-                hoveredBackground.Colour = colourHover = colours.BlueDarker;
-                colourSelected = colours.YellowDarker;
+                hoveredBackground.Colour = colourHover = colours.Background3;
+                colourSelected = colours.Background1;
             }
 
             private bool selected;
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
index c40061b97c..921fa675b3 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
@@ -6,15 +6,15 @@ 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.Overlays;
 
 namespace osu.Game.Screens.Edit.Timing
 {
     public class ControlPointSettings : CompositeDrawable
     {
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colours)
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 new Box
                 {
-                    Colour = colours.Gray3,
+                    Colour = colours.Background4,
                     RelativeSizeAxes = Axes.Both,
                 },
                 new OsuScrollContainer
diff --git a/osu.Game/Screens/Edit/Timing/Section.cs b/osu.Game/Screens/Edit/Timing/Section.cs
index 5269fa9774..8659b7aff6 100644
--- a/osu.Game/Screens/Edit/Timing/Section.cs
+++ b/osu.Game/Screens/Edit/Timing/Section.cs
@@ -8,8 +8,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Timing
 {
@@ -23,7 +24,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         protected Bindable<T> ControlPoint { get; } = new Bindable<T>();
 
-        private const float header_height = 20;
+        private const float header_height = 50;
 
         [Resolved]
         protected EditorBeatmap Beatmap { get; private set; }
@@ -35,7 +36,7 @@ namespace osu.Game.Screens.Edit.Timing
         protected IEditorChangeHandler ChangeHandler { get; private set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colours)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeDuration = 200;
@@ -46,19 +47,17 @@ namespace osu.Game.Screens.Edit.Timing
 
             InternalChildren = new Drawable[]
             {
-                new Box
-                {
-                    Colour = colours.Gray1,
-                    RelativeSizeAxes = Axes.Both,
-                },
                 new Container
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = header_height,
+                    Padding = new MarginPadding { Horizontal = 10 },
                     Children = new Drawable[]
                     {
                         checkbox = new OsuCheckbox
                         {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
                             LabelText = typeof(T).Name.Replace(nameof(Beatmaps.ControlPoints.ControlPoint), string.Empty)
                         }
                     }
@@ -72,12 +71,13 @@ namespace osu.Game.Screens.Edit.Timing
                     {
                         new Box
                         {
-                            Colour = colours.Gray2,
+                            Colour = colours.Background3,
                             RelativeSizeAxes = Axes.Both,
                         },
                         Flow = new FillFlowContainer
                         {
-                            Padding = new MarginPadding(10),
+                            Padding = new MarginPadding(20),
+                            Spacing = new Vector2(20),
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Direction = FillDirection.Vertical,
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index d7a5442de1..0b446314e8 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -8,15 +8,14 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Edit.Compose.Components.Timeline;
+using osu.Game.Overlays;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class TimingScreen : EditorScreenWithTimeline
+    public class TimingScreen : RoundedContentEditorScreen
     {
         [Cached]
         private Bindable<ControlPointGroup> selectedGroup = new Bindable<ControlPointGroup>();
@@ -26,28 +25,26 @@ namespace osu.Game.Screens.Edit.Timing
         {
         }
 
-        protected override Drawable CreateMainContent() => new GridContainer
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            RelativeSizeAxes = Axes.Both,
-            ColumnDimensions = new[]
+            Add(new GridContainer
             {
-                new Dimension(),
-                new Dimension(GridSizeMode.Absolute, 350),
-            },
-            Content = new[]
-            {
-                new Drawable[]
+                RelativeSizeAxes = Axes.Both,
+                ColumnDimensions = new[]
                 {
-                    new ControlPointList(),
-                    new ControlPointSettings(),
+                    new Dimension(),
+                    new Dimension(GridSizeMode.Absolute, 350),
                 },
-            }
-        };
-
-        protected override void OnTimelineLoaded(TimelineArea timelineArea)
-        {
-            base.OnTimelineLoaded(timelineArea);
-            timelineArea.Timeline.Zoom = timelineArea.Timeline.MinZoom;
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        new ControlPointList(),
+                        new ControlPointSettings(),
+                    },
+                }
+            });
         }
 
         public class ControlPointList : CompositeDrawable
@@ -70,7 +67,7 @@ namespace osu.Game.Screens.Edit.Timing
             private IEditorChangeHandler changeHandler { get; set; }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colours)
             {
                 RelativeSizeAxes = Axes.Both;
 
@@ -78,7 +75,7 @@ namespace osu.Game.Screens.Edit.Timing
                 {
                     new Box
                     {
-                        Colour = colours.Gray0,
+                        Colour = colours.Background2,
                         RelativeSizeAxes = Axes.Both,
                     },
                     new OsuScrollContainer

From abfa6aec87047027380c54f75fcba502da3941df Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 19 Apr 2021 01:58:19 -0400
Subject: [PATCH 09276/10326] Remove completionState parameter

---
 osu.Game/Screens/Play/Player.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ef2e042260..dd7cf944f7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -286,11 +286,11 @@ namespace osu.Game.Screens.Play
             DimmableStoryboard.HasStoryboardEnded.ValueChanged += storyboardEnded =>
             {
                 if (storyboardEnded.NewValue && completionProgressDelegate == null)
-                    updateCompletionState(new ValueChangedEvent<bool>(true, ScoreProcessor.HasCompleted.Value));
+                    updateCompletionState();
             };
 
             // Bind the judgement processors to ourselves
-            ScoreProcessor.HasCompleted.BindValueChanged(e => updateCompletionState(e));
+            ScoreProcessor.HasCompleted.BindValueChanged(_ => updateCompletionState());
             HealthProcessor.Failed += onFail;
 
             foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
@@ -370,7 +370,7 @@ namespace osu.Game.Screens.Play
                     },
                     skipOutroOverlay = new SkipOverlay(Beatmap.Value.Storyboard.LatestEventTime ?? 0)
                     {
-                        RequestSkip = () => updateCompletionState(new ValueChangedEvent<bool>(true, true), true),
+                        RequestSkip = () => updateCompletionState(true),
                         Alpha = 0
                     },
                     FailOverlay = new FailOverlay
@@ -542,7 +542,7 @@ namespace osu.Game.Screens.Play
 
                 // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
                 if (prepareScoreForDisplayTask != null)
-                    updateCompletionState(new ValueChangedEvent<bool>(true, true), true);
+                    updateCompletionState(true);
             }
 
             this.Exit();
@@ -581,13 +581,13 @@ namespace osu.Game.Screens.Play
         private ScheduledDelegate completionProgressDelegate;
         private Task<ScoreInfo> prepareScoreForDisplayTask;
 
-        private void updateCompletionState(ValueChangedEvent<bool> completionState, bool skipStoryboardOutro = false)
+        private void updateCompletionState(bool skipStoryboardOutro = false)
         {
             // screen may be in the exiting transition phase.
             if (!this.IsCurrentScreen())
                 return;
 
-            if (!completionState.NewValue)
+            if (!ScoreProcessor.HasCompleted.Value)
             {
                 completionProgressDelegate?.Cancel();
                 completionProgressDelegate = null;

From ef3801b5dd619d1fb0c5edf32c4d683ad26bd4ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 15:29:26 +0900
Subject: [PATCH 09277/10326] Add helper method supporting RomanisableString

---
 .../Graphics/Containers/LinkFlowContainer.cs  | 34 ++++++-------------
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    |  4 +--
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 32efcce80c..3a2f9d5a78 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -7,7 +7,10 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using System.Collections.Generic;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
 
 namespace osu.Game.Graphics.Containers
@@ -59,6 +62,14 @@ namespace osu.Game.Graphics.Containers
         public void AddLink(string text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
             => createLink(AddText(text, creationParameters), new LinkDetails(action, argument), tooltipText);
 
+        public void AddLink(RomanisableString text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
+        {
+            var spriteText = new OsuSpriteText { Text = text };
+
+            AddText(spriteText, creationParameters);
+            createLink(spriteText.Yield(), new LinkDetails(action, argument), tooltipText);
+        }
+
         public void AddLink(IEnumerable<SpriteText> text, LinkAction action = LinkAction.External, string linkArgument = null, string tooltipText = null)
         {
             foreach (var t in text)
@@ -67,13 +78,6 @@ namespace osu.Game.Graphics.Containers
             createLink(text, new LinkDetails(action, linkArgument), tooltipText);
         }
 
-        public void AddLink(SpriteText text, LinkAction action = LinkAction.External, string linkArgument = null, string tooltipText = null)
-        {
-            AddArbitraryDrawable(text);
-
-            createLink(text, new LinkDetails(action, linkArgument), tooltipText);
-        }
-
         public void AddUserLink(User user, Action<SpriteText> creationParameters = null)
             => createLink(AddText(user.Username, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user.Id.ToString()), "view profile");
 
@@ -93,22 +97,6 @@ namespace osu.Game.Graphics.Containers
             });
         }
 
-        private void createLink(Drawable drawable, LinkDetails link, string tooltipText, Action action = null)
-        {
-            AddInternal(new DrawableLinkCompiler(drawable)
-            {
-                RelativeSizeAxes = Axes.Both,
-                TooltipText = tooltipText,
-                Action = () =>
-                {
-                    if (action != null)
-                        action();
-                    else
-                        game?.HandleLink(link);
-                },
-            });
-        }
-
         // We want the compilers to always be visible no matter where they are, so RelativeSizeAxes is used.
         // However due to https://github.com/ppy/osu-framework/issues/2073, it's possible for the compilers to be relative size in the flow's auto-size axes - an unsupported operation.
         // Since the compilers don't display any content and don't affect the layout, it's simplest to exclude them from the flow.
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index a92ca610f3..38a9ace619 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -18,7 +18,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.Chat;
@@ -109,8 +108,7 @@ namespace osu.Game.Screens.OnlinePlay
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() },
-                LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            beatmapText.AddLink(Item.Beatmap.Value.ToRomanisableString(), LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From 25c7dc9ef0f7716a08878733b9cba18063cfef48 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 15:30:11 +0900
Subject: [PATCH 09278/10326] Revert unnecessary change

---
 osu.Game/Online/Chat/DrawableLinkCompiler.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Online/Chat/DrawableLinkCompiler.cs b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
index 7675eab4c0..d27a3fbffe 100644
--- a/osu.Game/Online/Chat/DrawableLinkCompiler.cs
+++ b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
@@ -31,11 +31,6 @@ namespace osu.Game.Online.Chat
             Parts = parts.ToList();
         }
 
-        public DrawableLinkCompiler(Drawable part)
-        {
-            Parts = new List<Drawable> { part };
-        }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {

From 5885c24e003bd02c2ad1d1d01756e2dc513b9850 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 16:00:56 +0900
Subject: [PATCH 09279/10326] Clear current user states on disconnect

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 4bbc420223..03387cfb9f 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -125,6 +125,7 @@ namespace osu.Game.Online.Spectator
                     else
                     {
                         playingUsers.Clear();
+                        currentUserStates.Clear();
                     }
                 }, true);
             }

From de9e37857ee380e203668841daecd4c11ae1d839 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 16:06:40 +0900
Subject: [PATCH 09280/10326] Lock around playingUsers

---
 .../Spectator/SpectatorStreamingClient.cs     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 03387cfb9f..10a707a4ce 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -47,6 +47,8 @@ namespace osu.Game.Online.Spectator
 
         private readonly BindableList<int> playingUsers = new BindableList<int>();
 
+        private readonly Dictionary<int, SpectatorState> currentUserStates = new Dictionary<int, SpectatorState>();
+
         [CanBeNull]
         private IBeatmap currentBeatmap;
 
@@ -60,7 +62,6 @@ namespace osu.Game.Online.Spectator
         private IBindable<IReadOnlyList<Mod>> currentMods { get; set; }
 
         private readonly SpectatorState currentState = new SpectatorState();
-        private readonly Dictionary<int, SpectatorState> currentUserStates = new Dictionary<int, SpectatorState>();
 
         private bool isPlaying;
 
@@ -124,8 +125,11 @@ namespace osu.Game.Online.Spectator
                     }
                     else
                     {
-                        playingUsers.Clear();
-                        currentUserStates.Clear();
+                        lock (userLock)
+                        {
+                            playingUsers.Clear();
+                            currentUserStates.Clear();
+                        }
                     }
                 }, true);
             }
@@ -133,11 +137,13 @@ namespace osu.Game.Online.Spectator
 
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
         {
-            if (!playingUsers.Contains(userId))
-                playingUsers.Add(userId);
-
             lock (userLock)
+            {
+                if (!playingUsers.Contains(userId))
+                    playingUsers.Add(userId);
+
                 currentUserStates[userId] = state;
+            }
 
             OnUserBeganPlaying?.Invoke(userId, state);
 
@@ -146,10 +152,11 @@ namespace osu.Game.Online.Spectator
 
         Task ISpectatorClient.UserFinishedPlaying(int userId, SpectatorState state)
         {
-            playingUsers.Remove(userId);
-
             lock (userLock)
+            {
+                playingUsers.Remove(userId);
                 currentUserStates.Remove(userId);
+            }
 
             OnUserFinishedPlaying?.Invoke(userId, state);
 

From 83716ddb089a2e9ac43026aa6440998ccbc0e6ad Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 16:07:00 +0900
Subject: [PATCH 09281/10326] Rename currentUserStates -> playingUserStates

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 10a707a4ce..9def009469 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Online.Spectator
 
         private readonly BindableList<int> playingUsers = new BindableList<int>();
 
-        private readonly Dictionary<int, SpectatorState> currentUserStates = new Dictionary<int, SpectatorState>();
+        private readonly Dictionary<int, SpectatorState> playingUserStates = new Dictionary<int, SpectatorState>();
 
         [CanBeNull]
         private IBeatmap currentBeatmap;
@@ -128,7 +128,7 @@ namespace osu.Game.Online.Spectator
                         lock (userLock)
                         {
                             playingUsers.Clear();
-                            currentUserStates.Clear();
+                            playingUserStates.Clear();
                         }
                     }
                 }, true);
@@ -142,7 +142,7 @@ namespace osu.Game.Online.Spectator
                 if (!playingUsers.Contains(userId))
                     playingUsers.Add(userId);
 
-                currentUserStates[userId] = state;
+                playingUserStates[userId] = state;
             }
 
             OnUserBeganPlaying?.Invoke(userId, state);
@@ -155,7 +155,7 @@ namespace osu.Game.Online.Spectator
             lock (userLock)
             {
                 playingUsers.Remove(userId);
-                currentUserStates.Remove(userId);
+                playingUserStates.Remove(userId);
             }
 
             OnUserFinishedPlaying?.Invoke(userId, state);
@@ -298,7 +298,7 @@ namespace osu.Game.Online.Spectator
 
             lock (userLock)
             {
-                foreach (var (userId, state) in currentUserStates)
+                foreach (var (userId, state) in playingUserStates)
                     callback(userId, state);
             }
         }

From a10a8680d0cedbb71666c6883f6ea4082997c48c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 15:06:07 +0900
Subject: [PATCH 09282/10326] Add new display for timing row attributes

---
 osu.Game/Beatmaps/Timing/TimeSignatures.cs    |  5 ++
 osu.Game/Screens/Edit/EditorTable.cs          |  2 +-
 .../Screens/Edit/Timing/ControlPointTable.cs  | 17 +++--
 osu.Game/Screens/Edit/Timing/RowAttribute.cs  | 68 ++++++++++++-------
 .../Timing/RowAttributes/EmptyRowAttribute.cs | 63 +++++++++++++++++
 .../RowAttributes/TimingRowAttribute.cs       | 45 ++++++++++++
 6 files changed, 170 insertions(+), 30 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs

diff --git a/osu.Game/Beatmaps/Timing/TimeSignatures.cs b/osu.Game/Beatmaps/Timing/TimeSignatures.cs
index 147f6239b4..33e6342ae6 100644
--- a/osu.Game/Beatmaps/Timing/TimeSignatures.cs
+++ b/osu.Game/Beatmaps/Timing/TimeSignatures.cs
@@ -1,11 +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.ComponentModel;
+
 namespace osu.Game.Beatmaps.Timing
 {
     public enum TimeSignatures
     {
+        [Description("4/4")]
         SimpleQuadruple = 4,
+
+        [Description("3/4")]
         SimpleTriple = 3
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index 9a793c8c97..5a34a79726 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Edit
 
         protected const float ROW_HEIGHT = 25;
 
-        protected const int TEXT_SIZE = 14;
+        public const int TEXT_SIZE = 14;
 
         protected readonly FillFlowContainer<RowBackground> BackgroundFlow;
 
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 6d4f3d1b3a..a680a087b8 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -12,6 +12,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Edit.Timing.RowAttributes;
 using osuTK;
 using osuTK.Graphics;
 
@@ -119,7 +120,12 @@ namespace osu.Game.Screens.Edit.Timing
 
             private void createChildren()
             {
-                fill.ChildrenEnumerable = controlPoints.Select(createAttribute).Where(c => c != null);
+                fill.ChildrenEnumerable = controlPoints
+                                          .Select(createAttribute)
+                                          .Where(c => c != null)
+                                          // arbitrary ordering to make timing points first.
+                                          // probably want to explicitly define order in the future.
+                                          .OrderByDescending(c => c.GetType().Name);
             }
 
             private Drawable createAttribute(ControlPoint controlPoint)
@@ -129,20 +135,19 @@ namespace osu.Game.Screens.Edit.Timing
                 switch (controlPoint)
                 {
                     case TimingControlPoint timing:
-                        return new RowAttribute("timing", () => $"{60000 / timing.BeatLength:n1}bpm {timing.TimeSignature}", colour);
+                        return new TimingRowAttribute(timing);
 
                     case DifficultyControlPoint difficulty:
-
-                        return new RowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x", colour);
+                        return new EmptyRowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x", colour);
 
                     case EffectControlPoint effect:
-                        return new RowAttribute("effect", () => string.Join(" ",
+                        return new EmptyRowAttribute("effect", () => string.Join(" ",
                             effect.KiaiMode ? "Kiai" : string.Empty,
                             effect.OmitFirstBarLine ? "NoBarLine" : string.Empty
                         ).Trim(), colour);
 
                     case SampleControlPoint sample:
-                        return new RowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);
+                        return new EmptyRowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);
                 }
 
                 return null;
diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index 2757e08026..55051a1bb2 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -1,33 +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 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.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
+using osu.Game.Overlays;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class RowAttribute : CompositeDrawable, IHasTooltip
+    public class RowAttribute : CompositeDrawable
     {
-        private readonly string header;
-        private readonly Func<string> content;
-        private readonly Color4 colour;
+        private readonly ControlPoint point;
 
-        public RowAttribute(string header, Func<string> content, Color4 colour)
+        protected FillFlowContainer Content { get; private set; }
+
+        public RowAttribute(ControlPoint point)
         {
-            this.header = header;
-            this.content = content;
-            this.colour = colour;
+            this.point = point;
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, OverlayColourProvider overlayColours)
         {
             AutoSizeAxes = Axes.X;
 
@@ -43,21 +41,45 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 new Box
                 {
-                    Colour = colour,
+                    Colour = overlayColours.Background4,
                     RelativeSizeAxes = Axes.Both,
                 },
-                new OsuSpriteText
+                Content = new FillFlowContainer
                 {
-                    Padding = new MarginPadding(2),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
-                    Text = header,
-                    Colour = colours.Gray0
-                },
+                    RelativeSizeAxes = Axes.Y,
+                    AutoSizeAxes = Axes.X,
+                    Direction = FillDirection.Horizontal,
+                    Margin = new MarginPadding { Right = 5 },
+                    Spacing = new Vector2(5),
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Y,
+                            AutoSizeAxes = Axes.X,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    Colour = point.GetRepresentingColour(colours),
+                                    RelativeSizeAxes = Axes.Both,
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    Padding = new MarginPadding(3),
+                                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
+                                    Text = point.GetType().Name.Replace("ControlPoint", string.Empty).ToLowerInvariant(),
+                                    Colour = colours.Gray0
+                                },
+                            },
+                        },
+                    },
+                }
             };
         }
-
-        public string TooltipText => content();
     }
 }
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs
new file mode 100644
index 0000000000..8a73853eb3
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs
@@ -0,0 +1,63 @@
+// Copyright (c) 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.Sprites;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class EmptyRowAttribute : CompositeDrawable, IHasTooltip
+    {
+        private readonly string header;
+        private readonly Func<string> content;
+        private readonly Color4 colour;
+
+        public EmptyRowAttribute(string header, Func<string> content, Color4 colour)
+        {
+            this.header = header;
+            this.content = content;
+            this.colour = colour;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AutoSizeAxes = Axes.X;
+
+            Height = 20;
+
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+
+            Masking = true;
+            CornerRadius = 5;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colour,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new OsuSpriteText
+                {
+                    Padding = new MarginPadding(2),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
+                    Text = header,
+                    Colour = colours.Gray0
+                },
+            };
+        }
+
+        public string TooltipText => content();
+    }
+}
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
new file mode 100644
index 0000000000..07e041650c
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    internal class TimingRowAttribute : RowAttribute
+    {
+        private readonly BindableNumber<double> beatLength;
+        private readonly Bindable<TimeSignatures> timeSignature;
+        private OsuSpriteText text;
+
+        public TimingRowAttribute(TimingControlPoint timing)
+            : base(timing)
+        {
+            timeSignature = timing.TimeSignatureBindable.GetBoundCopy();
+            beatLength = timing.BeatLengthBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Content.Add(text = new OsuSpriteText
+            {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
+            });
+
+            timeSignature.BindValueChanged(_ => updateText());
+            beatLength.BindValueChanged(_ => updateText(), true);
+        }
+
+        private void updateText() =>
+            text.Text = $"{60000 / beatLength.Value:n1}bpm {timeSignature.Value.GetDescription()}";
+    }
+}

From d3cebfb6fb63d0dabd62f695f58ce41e241b5b27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 15:27:38 +0900
Subject: [PATCH 09283/10326] Use explicit label

---
 osu.Game/Screens/Edit/Timing/RowAttribute.cs                | 6 ++++--
 .../Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index 55051a1bb2..4cfdeb06c3 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -16,12 +16,14 @@ namespace osu.Game.Screens.Edit.Timing
     public class RowAttribute : CompositeDrawable
     {
         private readonly ControlPoint point;
+        private readonly string label;
 
         protected FillFlowContainer Content { get; private set; }
 
-        public RowAttribute(ControlPoint point)
+        public RowAttribute(ControlPoint point, string label)
         {
             this.point = point;
+            this.label = label;
         }
 
         [BackgroundDependencyLoader]
@@ -72,7 +74,7 @@ namespace osu.Game.Screens.Edit.Timing
                                     Origin = Anchor.CentreLeft,
                                     Padding = new MarginPadding(3),
                                     Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
-                                    Text = point.GetType().Name.Replace("ControlPoint", string.Empty).ToLowerInvariant(),
+                                    Text = label,
                                     Colour = colours.Gray0
                                 },
                             },
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
index 07e041650c..c6e2649f8e 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
@@ -12,14 +12,14 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Edit.Timing.RowAttributes
 {
-    internal class TimingRowAttribute : RowAttribute
+    public class TimingRowAttribute : RowAttribute
     {
         private readonly BindableNumber<double> beatLength;
         private readonly Bindable<TimeSignatures> timeSignature;
         private OsuSpriteText text;
 
         public TimingRowAttribute(TimingControlPoint timing)
-            : base(timing)
+            : base(timing, "timing")
         {
             timeSignature = timing.TimeSignatureBindable.GetBoundCopy();
             beatLength = timing.BeatLengthBindable.GetBoundCopy();

From 3aad0a8b9c6df9efe7381a5050fbd42c34ce8d37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 15:57:27 +0900
Subject: [PATCH 09284/10326] Add new display for difficulty row attribute

---
 .../Screens/Edit/Timing/ControlPointTable.cs  |  2 +-
 osu.Game/Screens/Edit/Timing/RowAttribute.cs  |  8 ++--
 .../RowAttributes/AttributeProgressBar.cs     | 41 ++++++++++++++++
 .../RowAttributes/DifficultyRowAttribute.cs   | 48 +++++++++++++++++++
 4 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index a680a087b8..f71f31acb7 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Screens.Edit.Timing
                         return new TimingRowAttribute(timing);
 
                     case DifficultyControlPoint difficulty:
-                        return new EmptyRowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x", colour);
+                        return new DifficultyRowAttribute(difficulty);
 
                     case EffectControlPoint effect:
                         return new EmptyRowAttribute("effect", () => string.Join(" ",
diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index 4cfdeb06c3..e46459892c 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -15,14 +15,16 @@ namespace osu.Game.Screens.Edit.Timing
 {
     public class RowAttribute : CompositeDrawable
     {
-        private readonly ControlPoint point;
+        protected readonly ControlPoint Point;
+
         private readonly string label;
 
         protected FillFlowContainer Content { get; private set; }
 
         public RowAttribute(ControlPoint point, string label)
         {
-            this.point = point;
+            Point = point;
+
             this.label = label;
         }
 
@@ -65,7 +67,7 @@ namespace osu.Game.Screens.Edit.Timing
                             {
                                 new Box
                                 {
-                                    Colour = point.GetRepresentingColour(colours),
+                                    Colour = Point.GetRepresentingColour(colours),
                                     RelativeSizeAxes = Axes.Both,
                                 },
                                 new OsuSpriteText
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs
new file mode 100644
index 0000000000..9d7def4c33
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class AttributeProgressBar : ProgressBar
+    {
+        private readonly ControlPoint controlPoint;
+
+        public AttributeProgressBar(ControlPoint controlPoint)
+            : base(false)
+        {
+            this.controlPoint = controlPoint;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, OverlayColourProvider overlayColours)
+        {
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+
+            Masking = true;
+
+            RelativeSizeAxes = Axes.None;
+
+            Size = new Vector2(80, 8);
+            CornerRadius = Height / 2;
+
+            BackgroundColour = overlayColours.Background6;
+            Colour = controlPoint.GetRepresentingColour(colours);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs
new file mode 100644
index 0000000000..1fdd8c2708
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class DifficultyRowAttribute : RowAttribute
+    {
+        private readonly BindableNumber<double> speedMultiplier;
+
+        private OsuSpriteText text;
+
+        public DifficultyRowAttribute(DifficultyControlPoint difficulty)
+            : base(difficulty, "difficulty")
+        {
+            speedMultiplier = difficulty.SpeedMultiplierBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Content.AddRange(new Drawable[]
+            {
+                text = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Width = 40,
+                    Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
+                },
+                new AttributeProgressBar(Point)
+                {
+                    Current = speedMultiplier,
+                }
+            });
+
+            speedMultiplier.BindValueChanged(_ => updateText(), true);
+        }
+
+        private void updateText() => text.Text = $"{speedMultiplier.Value:n2}x";
+    }
+}

From 6465a72060ab9cf3b7515bc288f56576b415bd1f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 16:23:26 +0900
Subject: [PATCH 09285/10326] Add bubbled word class for use in attribute rows

---
 .../RowAttributes/AttributeBubbledWord.cs     | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs

diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
new file mode 100644
index 0000000000..3e956cbe92
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class AttributeBubbledWord : CompositeDrawable
+    {
+        private readonly ControlPoint controlPoint;
+
+        private OsuSpriteText textDrawable;
+
+        private string text;
+
+        public string Text
+        {
+            get => text;
+            set
+            {
+                if (value == text)
+                    return;
+
+                text = value;
+                if (textDrawable != null)
+                    textDrawable.Text = text;
+            }
+        }
+
+        public AttributeBubbledWord(ControlPoint controlPoint)
+        {
+            this.controlPoint = controlPoint;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, OverlayColourProvider overlayColours)
+        {
+            AutoSizeAxes = Axes.X;
+
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+
+            Height = 12;
+
+            InternalChildren = new Drawable[]
+            {
+                new Circle
+                {
+                    Colour = controlPoint.GetRepresentingColour(colours),
+                    RelativeSizeAxes = Axes.Both,
+                },
+                textDrawable = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Padding = new MarginPadding(3),
+                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
+                    Text = text,
+                    Colour = colours.Gray0
+                },
+            };
+        }
+    }
+}

From ec249a0edbf40c694f905539ddf03691a463d222 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 16:10:37 +0900
Subject: [PATCH 09286/10326] Add new display for sample row attribute

---
 .../Screens/Edit/Timing/ControlPointTable.cs  |  2 +-
 .../RowAttributes/SampleRowAttribute.cs       | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index f71f31acb7..17aa5bbefa 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Edit.Timing
                         ).Trim(), colour);
 
                     case SampleControlPoint sample:
-                        return new EmptyRowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);
+                        return new SampleRowAttribute(sample);
                 }
 
                 return null;
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs
new file mode 100644
index 0000000000..066b180423
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class SampleRowAttribute : RowAttribute
+    {
+        private AttributeBubbledWord sampleText;
+        private OsuSpriteText volumeText;
+
+        private readonly Bindable<string> sampleBank;
+        private readonly BindableNumber<int> volume;
+
+        public SampleRowAttribute(SampleControlPoint sample)
+            : base(sample, "sample")
+        {
+            sampleBank = sample.SampleBankBindable.GetBoundCopy();
+            volume = sample.SampleVolumeBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AttributeProgressBar progress;
+
+            Content.AddRange(new Drawable[]
+            {
+                volumeText = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Width = 30,
+                    Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
+                },
+                progress = new AttributeProgressBar(Point),
+                sampleText = new AttributeBubbledWord(Point),
+            });
+
+            volume.BindValueChanged(vol =>
+            {
+                progress.Current.Value = vol.NewValue / 100f;
+                updateText();
+            }, true);
+
+            sampleBank.BindValueChanged(_ => updateText(), true);
+        }
+
+        private void updateText()
+        {
+            volumeText.Text = $"{volume.Value}%";
+            sampleText.Text = $"{sampleBank.Value}";
+        }
+    }
+}

From f8b20ca8aa16a302c4cfaaeea318db7c4201c1aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 16:28:18 +0900
Subject: [PATCH 09287/10326] Add new display for effect row attribute

---
 .../Screens/Edit/Timing/ControlPointTable.cs  |  8 +---
 .../RowAttributes/EffectRowAttribute.cs       | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 17aa5bbefa..1f06bc5bc7 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -14,7 +14,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Edit.Timing.RowAttributes;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Timing
 {
@@ -130,8 +129,6 @@ namespace osu.Game.Screens.Edit.Timing
 
             private Drawable createAttribute(ControlPoint controlPoint)
             {
-                Color4 colour = controlPoint.GetRepresentingColour(colours);
-
                 switch (controlPoint)
                 {
                     case TimingControlPoint timing:
@@ -141,10 +138,7 @@ namespace osu.Game.Screens.Edit.Timing
                         return new DifficultyRowAttribute(difficulty);
 
                     case EffectControlPoint effect:
-                        return new EmptyRowAttribute("effect", () => string.Join(" ",
-                            effect.KiaiMode ? "Kiai" : string.Empty,
-                            effect.OmitFirstBarLine ? "NoBarLine" : string.Empty
-                        ).Trim(), colour);
+                        return new EffectRowAttribute(effect);
 
                     case SampleControlPoint sample:
                         return new SampleRowAttribute(sample);
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs
new file mode 100644
index 0000000000..e7fc57e2c9
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class EffectRowAttribute : RowAttribute
+    {
+        private readonly Bindable<bool> kiaiMode;
+        private readonly Bindable<bool> omitBarLine;
+        private AttributeBubbledWord kiaiModeBubble;
+        private AttributeBubbledWord omitBarLineBubble;
+
+        public EffectRowAttribute(EffectControlPoint effect)
+            : base(effect, "effect")
+        {
+            kiaiMode = effect.KiaiModeBindable.GetBoundCopy();
+            omitBarLine = effect.OmitFirstBarLineBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Content.AddRange(new Drawable[]
+            {
+                kiaiModeBubble = new AttributeBubbledWord(Point) { Text = "kiai" },
+                omitBarLineBubble = new AttributeBubbledWord(Point) { Text = "no barline" },
+            });
+
+            kiaiMode.BindValueChanged(enabled => kiaiModeBubble.FadeTo(enabled.NewValue ? 1 : 0), true);
+            omitBarLine.BindValueChanged(enabled => omitBarLineBubble.FadeTo(enabled.NewValue ? 1 : 0), true);
+        }
+    }
+}

From 8da561a2a637582248b3309f41b63cc0a61b2ca9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 16:35:13 +0900
Subject: [PATCH 09288/10326] Soften colours and adjust padding slightly

---
 osu.Game/Screens/Edit/Timing/RowAttribute.cs                  | 2 +-
 .../Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs | 4 ++--
 .../Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index e46459892c..e184907751 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Edit.Timing
                                     Padding = new MarginPadding(3),
                                     Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
                                     Text = label,
-                                    Colour = colours.Gray0
+                                    Colour = overlayColours.Background5,
                                 },
                             },
                         },
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
index 3e956cbe92..7d7ad61de2 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
@@ -60,10 +60,10 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    Padding = new MarginPadding(3),
+                    Padding = new MarginPadding(6),
                     Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
                     Text = text,
-                    Colour = colours.Gray0
+                    Colour = overlayColours.Background5,
                 },
             };
         }
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs
index 9d7def4c33..6f7e790489 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
             CornerRadius = Height / 2;
 
             BackgroundColour = overlayColours.Background6;
-            Colour = controlPoint.GetRepresentingColour(colours);
+            FillColour = controlPoint.GetRepresentingColour(colours);
         }
     }
 }

From 1ebc5ac5cc2d33abb3233ca60e51f988f133d319 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 16:36:00 +0900
Subject: [PATCH 09289/10326] Remove unused legacy class

---
 .../Timing/RowAttributes/EmptyRowAttribute.cs | 63 -------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs

diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs
deleted file mode 100644
index 8a73853eb3..0000000000
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs
+++ /dev/null
@@ -1,63 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
-
-namespace osu.Game.Screens.Edit.Timing.RowAttributes
-{
-    public class EmptyRowAttribute : CompositeDrawable, IHasTooltip
-    {
-        private readonly string header;
-        private readonly Func<string> content;
-        private readonly Color4 colour;
-
-        public EmptyRowAttribute(string header, Func<string> content, Color4 colour)
-        {
-            this.header = header;
-            this.content = content;
-            this.colour = colour;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            AutoSizeAxes = Axes.X;
-
-            Height = 20;
-
-            Anchor = Anchor.CentreLeft;
-            Origin = Anchor.CentreLeft;
-
-            Masking = true;
-            CornerRadius = 5;
-
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = colour,
-                    RelativeSizeAxes = Axes.Both,
-                },
-                new OsuSpriteText
-                {
-                    Padding = new MarginPadding(2),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
-                    Text = header,
-                    Colour = colours.Gray0
-                },
-            };
-        }
-
-        public string TooltipText => content();
-    }
-}

From c50b526ba09fa2fe98f2d1d43d822a38dc8237f2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 16:48:55 +0900
Subject: [PATCH 09290/10326] Remove local state dictionary from
 SpectatorScreen

---
 .../Online/Spectator/SpectatorStreamingClient.cs   | 12 ++++++++++++
 osu.Game/Screens/Spectate/SpectatorScreen.cs       | 14 +++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 9def009469..13b12d9add 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -284,6 +284,18 @@ namespace osu.Game.Online.Spectator
             lastSendTime = Time.Current;
         }
 
+        /// <summary>
+        /// Attempts to retrieve the <see cref="SpectatorState"/> for a currently-playing user.
+        /// </summary>
+        /// <param name="userId">The user.</param>
+        /// <param name="state">The current <see cref="SpectatorState"/> for the user, if they're playing. <c>null</c> if the user is not playing.</param>
+        /// <returns><c>true</c> if successful (the user is playing), <c>false</c> otherwise.</returns>
+        public bool TryGetPlayingUserState(int userId, out SpectatorState state)
+        {
+            lock (userLock)
+                return playingUserStates.TryGetValue(userId, out state);
+        }
+
         /// <summary>
         /// Bind an action to <see cref="OnUserBeganPlaying"/> with the option of running the bound action once immediately.
         /// </summary>
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 7be6c6183b..f554b15abf 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Screens.Spectate
         private readonly object stateLock = new object();
 
         private readonly Dictionary<int, User> userMap = new Dictionary<int, User>();
-        private readonly Dictionary<int, SpectatorState> spectatorStates = new Dictionary<int, SpectatorState>();
         private readonly Dictionary<int, GameplayState> gameplayStates = new Dictionary<int, GameplayState>();
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
@@ -107,9 +106,12 @@ namespace osu.Game.Screens.Spectate
 
             lock (stateLock)
             {
-                foreach (var (userId, state) in spectatorStates)
+                foreach (var (userId, _) in userMap)
                 {
-                    if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == state.BeatmapID))
+                    if (!spectatorClient.TryGetPlayingUserState(userId, out var userState))
+                        continue;
+
+                    if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == userState.BeatmapID))
                         updateGameplayState(userId);
                 }
             }
@@ -125,7 +127,6 @@ namespace osu.Game.Screens.Spectate
                 if (!userMap.ContainsKey(userId))
                     return;
 
-                spectatorStates[userId] = state;
                 Schedule(() => OnUserStateChanged(userId, state));
 
                 updateGameplayState(userId);
@@ -138,7 +139,10 @@ namespace osu.Game.Screens.Spectate
             {
                 Debug.Assert(userMap.ContainsKey(userId));
 
-                var spectatorState = spectatorStates[userId];
+                // The user may have stopped playing.
+                if (!spectatorClient.TryGetPlayingUserState(userId, out var spectatorState))
+                    return;
+
                 var user = userMap[userId];
 
                 var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == spectatorState.RulesetID)?.CreateInstance();

From c12848ce4dc62749a77cd0e927c0ad43020cfa08 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 17:02:59 +0900
Subject: [PATCH 09291/10326] Apply fixes to tests

---
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index 802dbf2021..b38f7a998d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -118,8 +118,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestBasic()
         {
             AddStep("move to center", () => InputManager.MoveMouseTo(recordingManager.ScreenSpaceDrawQuad.Centre));
-            AddUntilStep("one frame recorded", () => replay.Frames.Count == 1);
-            AddAssert("position matches", () => playbackManager.ChildrenOfType<Box>().First().Position == recordingManager.ChildrenOfType<Box>().First().Position);
+            AddUntilStep("at least one frame recorded", () => replay.Frames.Count > 0);
+            AddUntilStep("position matches", () => playbackManager.ChildrenOfType<Box>().First().Position == recordingManager.ChildrenOfType<Box>().First().Position);
         }
 
         [Test]
@@ -139,14 +139,16 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestLimitedFrameRate()
         {
             ScheduledDelegate moveFunction = null;
+            int initialFrameCount = 0;
 
             AddStep("lower rate", () => recorder.RecordFrameRate = 2);
+            AddStep("count frames", () => initialFrameCount = replay.Frames.Count);
             AddStep("move to center", () => InputManager.MoveMouseTo(recordingManager.ScreenSpaceDrawQuad.Centre));
             AddStep("much move", () => moveFunction = Scheduler.AddDelayed(() =>
                 InputManager.MoveMouseTo(InputManager.CurrentState.Mouse.Position + new Vector2(-1, 0)), 10, true));
             AddWaitStep("move", 10);
             AddStep("stop move", () => moveFunction.Cancel());
-            AddAssert("less than 10 frames recorded", () => replay.Frames.Count < 10);
+            AddAssert("less than 10 frames recorded", () => replay.Frames.Count - initialFrameCount < 10);
         }
 
         [Test]

From 5bce5d2057eebe74115edb5f1dbc53ceaf6e3738 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 17:57:07 +0900
Subject: [PATCH 09292/10326] Update design logic

---
 osu.Game/Screens/Edit/Timing/RowAttribute.cs  | 36 ++++------
 .../RowAttributes/AttributeBubbledWord.cs     | 71 -------------------
 .../Timing/RowAttributes/AttributeText.cs     | 32 +++++++++
 .../RowAttributes/DifficultyRowAttribute.cs   | 14 ++--
 .../RowAttributes/EffectRowAttribute.cs       |  8 +--
 .../RowAttributes/SampleRowAttribute.cs       | 16 ++---
 .../RowAttributes/TimingRowAttribute.cs       |  9 +--
 7 files changed, 62 insertions(+), 124 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/AttributeText.cs

diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index e184907751..74d43628e1 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Edit.Timing
             Origin = Anchor.CentreLeft;
 
             Masking = true;
-            CornerRadius = 5;
+            CornerRadius = 3;
 
             InternalChildren = new Drawable[]
             {
@@ -53,33 +53,25 @@ namespace osu.Game.Screens.Edit.Timing
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
                     Direction = FillDirection.Horizontal,
-                    Margin = new MarginPadding { Right = 5 },
+                    Margin = new MarginPadding { Horizontal = 5 },
                     Spacing = new Vector2(5),
                     Children = new Drawable[]
                     {
-                        new Container
+                        new Circle
                         {
-                            RelativeSizeAxes = Axes.Y,
-                            AutoSizeAxes = Axes.X,
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    Colour = Point.GetRepresentingColour(colours),
-                                    RelativeSizeAxes = Axes.Both,
-                                },
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    Padding = new MarginPadding(3),
-                                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
-                                    Text = label,
-                                    Colour = overlayColours.Background5,
-                                },
-                            },
+                            Colour = Point.GetRepresentingColour(colours),
+                            RelativeSizeAxes = Axes.Y,
+                            Size = new Vector2(4, 0.6f),
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Padding = new MarginPadding(3),
+                            Font = OsuFont.Default.With(weight: FontWeight.Bold, size: 12),
+                            Text = label,
                         },
                     },
                 }
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
deleted file mode 100644
index 7d7ad61de2..0000000000
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Overlays;
-
-namespace osu.Game.Screens.Edit.Timing.RowAttributes
-{
-    public class AttributeBubbledWord : CompositeDrawable
-    {
-        private readonly ControlPoint controlPoint;
-
-        private OsuSpriteText textDrawable;
-
-        private string text;
-
-        public string Text
-        {
-            get => text;
-            set
-            {
-                if (value == text)
-                    return;
-
-                text = value;
-                if (textDrawable != null)
-                    textDrawable.Text = text;
-            }
-        }
-
-        public AttributeBubbledWord(ControlPoint controlPoint)
-        {
-            this.controlPoint = controlPoint;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OverlayColourProvider overlayColours)
-        {
-            AutoSizeAxes = Axes.X;
-
-            Anchor = Anchor.CentreLeft;
-            Origin = Anchor.CentreLeft;
-
-            Height = 12;
-
-            InternalChildren = new Drawable[]
-            {
-                new Circle
-                {
-                    Colour = controlPoint.GetRepresentingColour(colours),
-                    RelativeSizeAxes = Axes.Both,
-                },
-                textDrawable = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    Padding = new MarginPadding(6),
-                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
-                    Text = text,
-                    Colour = overlayColours.Background5,
-                },
-            };
-        }
-    }
-}
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeText.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeText.cs
new file mode 100644
index 0000000000..d0a51f9faa
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeText.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class AttributeText : OsuSpriteText
+    {
+        private readonly ControlPoint controlPoint;
+
+        public AttributeText(ControlPoint controlPoint)
+        {
+            this.controlPoint = controlPoint;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+
+            Padding = new MarginPadding(6);
+            Font = OsuFont.Default.With(weight: FontWeight.Bold, size: 12);
+            Colour = controlPoint.GetRepresentingColour(colours);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs
index 1fdd8c2708..7b553ac7ad 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Edit.Timing.RowAttributes
@@ -27,17 +26,14 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
         {
             Content.AddRange(new Drawable[]
             {
-                text = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    Width = 40,
-                    Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
-                },
                 new AttributeProgressBar(Point)
                 {
                     Current = speedMultiplier,
-                }
+                },
+                text = new AttributeText(Point)
+                {
+                    Width = 40,
+                },
             });
 
             speedMultiplier.BindValueChanged(_ => updateText(), true);
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs
index e7fc57e2c9..812407d6da 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs
@@ -12,8 +12,8 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
     {
         private readonly Bindable<bool> kiaiMode;
         private readonly Bindable<bool> omitBarLine;
-        private AttributeBubbledWord kiaiModeBubble;
-        private AttributeBubbledWord omitBarLineBubble;
+        private AttributeText kiaiModeBubble;
+        private AttributeText omitBarLineBubble;
 
         public EffectRowAttribute(EffectControlPoint effect)
             : base(effect, "effect")
@@ -27,8 +27,8 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
         {
             Content.AddRange(new Drawable[]
             {
-                kiaiModeBubble = new AttributeBubbledWord(Point) { Text = "kiai" },
-                omitBarLineBubble = new AttributeBubbledWord(Point) { Text = "no barline" },
+                kiaiModeBubble = new AttributeText(Point) { Text = "kiai" },
+                omitBarLineBubble = new AttributeText(Point) { Text = "no barline" },
             });
 
             kiaiMode.BindValueChanged(enabled => kiaiModeBubble.FadeTo(enabled.NewValue ? 1 : 0), true);
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs
index 066b180423..ac0797dba1 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs
@@ -5,14 +5,13 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Edit.Timing.RowAttributes
 {
     public class SampleRowAttribute : RowAttribute
     {
-        private AttributeBubbledWord sampleText;
+        private AttributeText sampleText;
         private OsuSpriteText volumeText;
 
         private readonly Bindable<string> sampleBank;
@@ -32,15 +31,12 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
 
             Content.AddRange(new Drawable[]
             {
-                volumeText = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    Width = 30,
-                    Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
-                },
+                sampleText = new AttributeText(Point),
                 progress = new AttributeProgressBar(Point),
-                sampleText = new AttributeBubbledWord(Point),
+                volumeText = new AttributeText(Point)
+                {
+                    Width = 40,
+                },
             });
 
             volume.BindValueChanged(vol =>
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
index c6e2649f8e..ab840e56a7 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
@@ -4,10 +4,8 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Edit.Timing.RowAttributes
@@ -28,12 +26,7 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
         [BackgroundDependencyLoader]
         private void load()
         {
-            Content.Add(text = new OsuSpriteText
-            {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
-            });
+            Content.Add(text = new AttributeText(Point));
 
             timeSignature.BindValueChanged(_ => updateText());
             beatLength.BindValueChanged(_ => updateText(), true);

From 097a3475337df9ae869bd576886b79c675b8f2c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 18:25:30 +0900
Subject: [PATCH 09293/10326] Adjust Add different background colour for timing
 area

---
 osu.Game/Screens/Edit/EditorTable.cs          |  4 +-
 .../Screens/Edit/Timing/ControlPointTable.cs  | 53 +++++++++++++++----
 osu.Game/Screens/Edit/Timing/TimingScreen.cs  | 11 +++-
 3 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index 5a34a79726..815f3ed0ea 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -96,8 +96,8 @@ namespace osu.Game.Screens.Edit
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colours)
             {
-                hoveredBackground.Colour = colourHover = colours.Background3;
-                colourSelected = colours.Background1;
+                hoveredBackground.Colour = colourHover = colours.Background1;
+                colourSelected = colours.Colour3;
             }
 
             private bool selected;
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 1f06bc5bc7..26efe0a5ea 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -25,6 +26,8 @@ namespace osu.Game.Screens.Edit.Timing
         [Resolved]
         private EditorClock clock { get; set; }
 
+        public const float TIMING_COLUMN_WIDTH = 210;
+
         public IEnumerable<ControlPointGroup> ControlGroups
         {
             set
@@ -66,35 +69,62 @@ namespace osu.Game.Screens.Edit.Timing
         {
             var columns = new List<TableColumn>
             {
-                new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 120)),
+                new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, TIMING_COLUMN_WIDTH)),
                 new TableColumn("Attributes", Anchor.CentreLeft),
             };
 
             return columns.ToArray();
         }
 
-        private Drawable[] createContent(int index, ControlPointGroup group) => new Drawable[]
+        private Drawable[] createContent(int index, ControlPointGroup group)
         {
-            new OsuSpriteText
+            return new Drawable[]
             {
-                Text = group.Time.ToEditorFormattedString(),
-                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold)
-            },
-            new ControlGroupAttributes(group),
-        };
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = TIMING_COLUMN_WIDTH,
+                    Spacing = new Vector2(5),
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Text = group.Time.ToEditorFormattedString(),
+                            Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
+                            Width = 60,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                        },
+                        new ControlGroupAttributes(group, c => c is TimingControlPoint)
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                        }
+                    }
+                },
+                new ControlGroupAttributes(group, c => !(c is TimingControlPoint))
+            };
+        }
 
         private class ControlGroupAttributes : CompositeDrawable
         {
+            private readonly Func<ControlPoint, bool> matchFunction;
+
             private readonly IBindableList<ControlPoint> controlPoints = new BindableList<ControlPoint>();
 
             private readonly FillFlowContainer fill;
 
-            public ControlGroupAttributes(ControlPointGroup group)
+            public ControlGroupAttributes(ControlPointGroup group, Func<ControlPoint, bool> matchFunction)
             {
-                RelativeSizeAxes = Axes.Both;
+                this.matchFunction = matchFunction;
+
+                AutoSizeAxes = Axes.X;
+                RelativeSizeAxes = Axes.Y;
+
                 InternalChild = fill = new FillFlowContainer
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    AutoSizeAxes = Axes.X,
+                    RelativeSizeAxes = Axes.Y,
                     Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(2)
                 };
@@ -120,6 +150,7 @@ namespace osu.Game.Screens.Edit.Timing
             private void createChildren()
             {
                 fill.ChildrenEnumerable = controlPoints
+                                          .Where(matchFunction)
                                           .Select(createAttribute)
                                           .Where(c => c != null)
                                           // arbitrary ordering to make timing points first.
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 0b446314e8..9f26dece08 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -71,13 +71,20 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 RelativeSizeAxes = Axes.Both;
 
+                const float margins = 10;
                 InternalChildren = new Drawable[]
                 {
                     new Box
                     {
-                        Colour = colours.Background2,
+                        Colour = colours.Background3,
                         RelativeSizeAxes = Axes.Both,
                     },
+                    new Box
+                    {
+                        Colour = colours.Background2,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = ControlPointTable.TIMING_COLUMN_WIDTH + margins,
+                    },
                     new OsuScrollContainer
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -89,7 +96,7 @@ namespace osu.Game.Screens.Edit.Timing
                         Anchor = Anchor.BottomRight,
                         Origin = Anchor.BottomRight,
                         Direction = FillDirection.Horizontal,
-                        Margin = new MarginPadding(10),
+                        Margin = new MarginPadding(margins),
                         Spacing = new Vector2(5),
                         Children = new Drawable[]
                         {

From a40dcd4b8dd3a8403e208cc7de62dd66181386d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 18:53:06 +0900
Subject: [PATCH 09294/10326] Add a touch more space in the timing column

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 26efe0a5ea..fe63138d28 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Edit.Timing
         [Resolved]
         private EditorClock clock { get; set; }
 
-        public const float TIMING_COLUMN_WIDTH = 210;
+        public const float TIMING_COLUMN_WIDTH = 220;
 
         public IEnumerable<ControlPointGroup> ControlGroups
         {

From 5afdc3ff66f39eb34bc8359e715f6719da8c038a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 19 Apr 2021 19:56:17 +0900
Subject: [PATCH 09295/10326] Make DHO application logic clearer with
 Entry/HitObject separation

---
 .../Objects/Drawables/DrawableHitObject.cs    | 57 ++++++++++++++-----
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 669e4cecbe..dfeb87de88 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -204,23 +204,27 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <param name="lifetimeEntry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of <paramref name="hitObject"/>.</param>
         public void Apply([NotNull] HitObject hitObject, [CanBeNull] HitObjectLifetimeEntry lifetimeEntry)
         {
-            free();
-
-            HitObject = hitObject ?? throw new InvalidOperationException($"Cannot apply a null {nameof(HitObject)}.");
-
-            this.lifetimeEntry = lifetimeEntry;
+            if (hitObject == null)
+                throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
             if (lifetimeEntry != null)
             {
-                // Transfer lifetime from the entry.
-                LifetimeStart = lifetimeEntry.LifetimeStart;
-                LifetimeEnd = lifetimeEntry.LifetimeEnd;
-
-                // Copy any existing result from the entry (required for rewind / judgement revert).
-                Result = lifetimeEntry.Result;
+                applyEntry(lifetimeEntry);
             }
             else
-                LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
+            {
+                applyHitObject(hitObject);
+
+                // Set default lifetime for a non-pooled DHO
+                LifetimeStart = hitObject.StartTime - InitialLifetimeOffset;
+            }
+        }
+
+        private void applyHitObject([NotNull] HitObject hitObject)
+        {
+            freeHitObject();
+
+            HitObject = hitObject;
 
             // Ensure this DHO has a result.
             Result ??= CreateResult(HitObject.CreateJudgement())
@@ -281,10 +285,23 @@ namespace osu.Game.Rulesets.Objects.Drawables
             hasHitObjectApplied = true;
         }
 
+        private void applyEntry([NotNull] HitObjectLifetimeEntry entry)
+        {
+            freeEntry();
+
+            setLifetime(entry.LifetimeStart, entry.LifetimeEnd);
+            lifetimeEntry = entry;
+
+            // Copy any existing result from the entry (required for rewind / judgement revert).
+            Result = entry.Result;
+
+            applyHitObject(entry.HitObject);
+        }
+
         /// <summary>
         /// Removes the currently applied <see cref="HitObject"/>
         /// </summary>
-        private void free()
+        private void freeHitObject()
         {
             if (!hasHitObjectApplied)
                 return;
@@ -322,13 +339,23 @@ namespace osu.Game.Rulesets.Objects.Drawables
             HitObject = null;
             ParentHitObject = null;
             Result = null;
-            lifetimeEntry = null;
 
             clearExistingStateTransforms();
 
             hasHitObjectApplied = false;
         }
 
+        private void freeEntry()
+        {
+            freeHitObject();
+
+            if (lifetimeEntry == null) return;
+
+            lifetimeEntry = null;
+
+            setLifetime(double.MaxValue, double.MaxValue);
+        }
+
         protected sealed override void FreeAfterUse()
         {
             base.FreeAfterUse();
@@ -337,7 +364,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (!IsInPool)
                 return;
 
-            free();
+            freeEntry();
         }
 
         /// <summary>

From c7183f92f79efe7855fb4b4defacb9224659e3e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 19:53:55 +0900
Subject: [PATCH 09296/10326] Rename Restart() -> Reset()

---
 osu.Game/Screens/Play/GameplayClockContainer.cs       | 4 ++--
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 4 ++--
 osu.Game/Screens/Play/Player.cs                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 642ede5f1c..ee65384bc9 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -82,9 +82,9 @@ namespace osu.Game.Screens.Play
         public virtual void Stop() => IsPaused.Value = true;
 
         /// <summary>
-        /// Restarts gameplay.
+        /// Resets this <see cref="GameplayClockContainer"/> and the source to an initial state ready for gameplay.
         /// </summary>
-        public virtual void Restart()
+        public virtual void Reset()
         {
             AdjustableSource.Seek(0);
             AdjustableSource.Stop();
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index db0aa23001..5ea50cbdc7 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -123,10 +123,10 @@ namespace osu.Game.Screens.Play
             userOffsetClock.ProcessFrame();
         }
 
-        public override void Restart()
+        public override void Reset()
         {
             updateRate();
-            base.Restart();
+            base.Reset();
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 841f906b05..27a4fcc291 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -811,7 +811,7 @@ namespace osu.Game.Screens.Play
             if (GameplayClockContainer.GameplayClock.IsRunning)
                 throw new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running");
 
-            GameplayClockContainer.Restart();
+            GameplayClockContainer.Reset();
         }
 
         public override void OnSuspending(IScreen next)

From acbf4580a412772b6be6d8e3d60446bbe35b9003 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 19:55:59 +0900
Subject: [PATCH 09297/10326] Only set initial source in Reset()

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 17 +++++++++++++++--
 .../Play/MasterGameplayClockContainer.cs        |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ee65384bc9..3da28f3560 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -29,17 +29,22 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected readonly DecoupleableInterpolatingFramedClock AdjustableSource;
 
+        /// <summary>
+        /// The source clock.
+        /// </summary>
+        protected IClock SourceClock { get; private set; }
+
         /// <summary>
         /// Creates a new <see cref="GameplayClockContainer"/>.
         /// </summary>
         /// <param name="sourceClock">The source <see cref="IClock"/> used for timing.</param>
         protected GameplayClockContainer(IClock sourceClock)
         {
+            SourceClock = sourceClock;
+
             RelativeSizeAxes = Axes.Both;
 
             AdjustableSource = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
-            AdjustableSource.ChangeSource(sourceClock);
-
             IsPaused.BindValueChanged(OnIsPausedChanged);
         }
 
@@ -86,6 +91,8 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
+            ChangeSource(SourceClock);
+
             AdjustableSource.Seek(0);
             AdjustableSource.Stop();
 
@@ -93,6 +100,12 @@ namespace osu.Game.Screens.Play
                 Start();
         }
 
+        /// <summary>
+        /// Changes the source clock.
+        /// </summary>
+        /// <param name="sourceClock">The new source.</param>
+        protected void ChangeSource(IClock sourceClock) => AdjustableSource.ChangeSource(SourceClock = sourceClock);
+
         protected override void Update()
         {
             if (!IsPaused.Value)
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 5ea50cbdc7..f019e50b60 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public const double MINIMUM_SKIP_TIME = 1000;
 
-        protected Track Track => (Track)AdjustableSource.Source;
+        protected Track Track => (Track)SourceClock;
 
         public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
         {
@@ -164,7 +164,7 @@ namespace osu.Game.Screens.Play
         public void StopUsingBeatmapClock()
         {
             removeSourceClockAdjustments();
-            AdjustableSource.ChangeSource(new TrackVirtual(beatmap.Track.Length));
+            ChangeSource(new TrackVirtual(beatmap.Track.Length));
         }
 
         private bool speedAdjustmentsApplied;

From 2c487ddb70bf4078422fba8e772e5e564e582d36 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 19 Apr 2021 20:37:06 +0900
Subject: [PATCH 09298/10326] Create synthetic LifetimeEntry for a DHO when not
 supplied

Now, a DHO is always associated with a HitObjectLifetimeEntry while used.
Result is always stored in the entry, and not in the DHO.
---
 .../Objects/Drawables/DrawableHitObject.cs    | 87 ++++++++-----------
 .../Objects/UnmanagedHitObjectEntry.cs        | 20 +++++
 2 files changed, 55 insertions(+), 52 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index dfeb87de88..9b132ea932 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -39,7 +39,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The <see cref="HitObject"/> currently represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        public HitObject HitObject { get; private set; }
+        public HitObject HitObject => lifetimeEntry?.HitObject ?? initialHitObject;
+
+        /// <summary>
+        /// The <see cref="HitObject"/> given in the constructor that will be applied when loaded.
+        /// </summary>
+        private HitObject initialHitObject;
 
         /// <summary>
         /// The parenting <see cref="DrawableHitObject"/>, if any.
@@ -108,7 +113,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The scoring result of this <see cref="DrawableHitObject"/>.
         /// </summary>
-        public JudgementResult Result { get; private set; }
+        public JudgementResult Result => lifetimeEntry?.Result;
 
         /// <summary>
         /// The relative X position of this hit object for sample playback balance adjustment.
@@ -140,11 +145,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         public IBindable<ArmedState> State => state;
 
-        /// <summary>
-        /// Whether <see cref="HitObject"/> is currently applied.
-        /// </summary>
-        private bool hasHitObjectApplied;
-
         /// <summary>
         /// The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the currently-attached <see cref="HitObject"/>.
         /// </summary>
@@ -168,7 +168,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </param>
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
         {
-            HitObject = initialHitObject;
+            this.initialHitObject = initialHitObject;
         }
 
         [BackgroundDependencyLoader]
@@ -184,8 +184,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.LoadAsyncComplete();
 
-            if (HitObject != null)
-                Apply(HitObject, lifetimeEntry);
+            if (initialHitObject != null)
+            {
+                Apply(initialHitObject, null);
+                initialHitObject = null;
+            }
         }
 
         protected override void LoadComplete()
@@ -209,26 +212,36 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             if (lifetimeEntry != null)
             {
-                applyEntry(lifetimeEntry);
+                if (lifetimeEntry.HitObject != hitObject)
+                    throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
+
+                apply(lifetimeEntry);
             }
             else
             {
-                applyHitObject(hitObject);
+                var unmanagedEntry = new UnmanagedHitObjectEntry(hitObject, this);
+                apply(unmanagedEntry);
 
                 // Set default lifetime for a non-pooled DHO
                 LifetimeStart = hitObject.StartTime - InitialLifetimeOffset;
             }
         }
 
-        private void applyHitObject([NotNull] HitObject hitObject)
+        /// <summary>
+        /// Applies a new <see cref="HitObjectLifetimeEntry"/> to be represented by this <see cref="DrawableHitObject"/>.
+        /// </summary>
+        private void apply([NotNull] HitObjectLifetimeEntry entry)
         {
-            freeHitObject();
+            free();
 
-            HitObject = hitObject;
+            lifetimeEntry = entry;
+
+            LifetimeStart = entry.LifetimeStart;
+            LifetimeEnd = entry.LifetimeEnd;
 
             // Ensure this DHO has a result.
-            Result ??= CreateResult(HitObject.CreateJudgement())
-                       ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
+            entry.Result ??= CreateResult(HitObject.CreateJudgement())
+                             ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
             // Copy back the result to the entry for potential future retrieval.
             if (lifetimeEntry != null)
@@ -281,30 +294,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 else
                     updateState(ArmedState.Idle, true);
             }
-
-            hasHitObjectApplied = true;
-        }
-
-        private void applyEntry([NotNull] HitObjectLifetimeEntry entry)
-        {
-            freeEntry();
-
-            setLifetime(entry.LifetimeStart, entry.LifetimeEnd);
-            lifetimeEntry = entry;
-
-            // Copy any existing result from the entry (required for rewind / judgement revert).
-            Result = entry.Result;
-
-            applyHitObject(entry.HitObject);
         }
 
         /// <summary>
-        /// Removes the currently applied <see cref="HitObject"/>
+        /// Removes the currently applied <see cref="lifetimeEntry"/>
         /// </summary>
-        private void freeHitObject()
+        private void free()
         {
-            if (!hasHitObjectApplied)
-                return;
+            if (lifetimeEntry == null) return;
 
             StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
@@ -336,24 +333,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             OnFree();
 
-            HitObject = null;
             ParentHitObject = null;
-            Result = null;
-
-            clearExistingStateTransforms();
-
-            hasHitObjectApplied = false;
-        }
-
-        private void freeEntry()
-        {
-            freeHitObject();
-
-            if (lifetimeEntry == null) return;
-
             lifetimeEntry = null;
 
-            setLifetime(double.MaxValue, double.MaxValue);
+            clearExistingStateTransforms();
         }
 
         protected sealed override void FreeAfterUse()
@@ -364,7 +347,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (!IsInPool)
                 return;
 
-            freeEntry();
+            free();
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
new file mode 100644
index 0000000000..507cad15d3
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.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.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Objects
+{
+    internal class UnmanagedHitObjectEntry : HitObjectLifetimeEntry
+    {
+        public readonly DrawableHitObject DrawableHitObject;
+
+        public UnmanagedHitObjectEntry(HitObject hitObject, DrawableHitObject drawableHitObject)
+            : base(hitObject)
+        {
+            DrawableHitObject = drawableHitObject;
+            LifetimeStart = DrawableHitObject.LifetimeStart;
+            LifetimeEnd = DrawableHitObject.LifetimeEnd;
+        }
+    }
+}

From 510e54ff5405a944344412fbd72b9c3418e4d28e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 23:29:14 +0900
Subject: [PATCH 09299/10326] Update framework

---
 osu.Android.props                              | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 2 +-
 osu.Game/osu.Game.csproj                       | 2 +-
 osu.iOS.props                                  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 0bb0bf171c..ed2b27e1c7 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.416.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.419.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index bcbb0f4366..aee431284e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void Update(Playfield playfield)
         {
-            playfield.Rotation = (Direction.Value == RotationDirection.CounterClockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
+            playfield.Rotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e0a267241d..509cb3ddad 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.416.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.419.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index bcd953c0bd..4b67bd78a1 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.Framework.iOS" Version="2021.416.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.419.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.416.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.419.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 9f24cdb355bff38f788c6b2cb6e1f8bfce0b7e5b Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Mon, 19 Apr 2021 16:53:44 +0200
Subject: [PATCH 09300/10326] Added Author Link in BeatmapInfoWedge

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 29 +++++++++------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 4069dc82ed..14e5831ef9 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -29,6 +29,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Ranking.Expanded;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Select
 {
@@ -307,7 +308,7 @@ namespace osu.Game.Screens.Select
                                 Margin = new MarginPadding { Top = 10 },
                                 Direction = FillDirection.Horizontal,
                                 AutoSizeAxes = Axes.Both,
-                                Children = getMapper(metadata)
+                                Children = new[] { getMapper(metadata) },
                             },
                             infoLabelContainer = new FillFlowContainer
                             {
@@ -430,24 +431,20 @@ namespace osu.Game.Screens.Select
                 ForceRedraw();
             }
 
-            private OsuSpriteText[] getMapper(BeatmapMetadata metadata)
+            private LinkFlowContainer getMapper(BeatmapMetadata metadata)
             {
-                if (string.IsNullOrEmpty(metadata.Author?.Username))
-                    return Array.Empty<OsuSpriteText>();
+                if (metadata.Author == null)
+                    return new LinkFlowContainer();
 
-                return new[]
+                return new LinkFlowContainer(s =>
                 {
-                    new OsuSpriteText
-                    {
-                        Text = "mapped by ",
-                        Font = OsuFont.GetFont(size: 15),
-                    },
-                    new OsuSpriteText
-                    {
-                        Text = metadata.Author.Username,
-                        Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 15),
-                    }
-                };
+                    s.Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 15);
+                }).With(d =>
+                {
+                    d.AutoSizeAxes = Axes.Both;
+                    d.AddText("mapped by ");
+                    d.AddUserLink(metadata.Author);
+                });
             }
 
             protected override void Dispose(bool isDisposing)

From eb977312ed71bee57676714afb2a81c0522bdd9d Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Mon, 19 Apr 2021 16:54:29 +0200
Subject: [PATCH 09301/10326] Added Author link in BeatmapSet Overlay

---
 osu.Game/Overlays/BeatmapSet/AuthorInfo.cs | 23 +++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
index 31c1439c8f..1ffcf9722a 100644
--- a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
+++ b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
@@ -13,6 +13,8 @@ using osuTK.Graphics;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
+using osu.Game.Users;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
@@ -50,7 +52,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("mapped by", BeatmapSet.Metadata.Author, OsuFont.GetFont(weight: FontWeight.Regular, italics: true)),
                 new Field("submitted", online.Submitted, OsuFont.GetFont(weight: FontWeight.Bold))
                 {
                     Margin = new MarginPadding { Top = 5 },
@@ -146,6 +148,25 @@ namespace osu.Game.Overlays.BeatmapSet
                     }
                 };
             }
+
+            public Field(string first, User second, FontUsage secondFont)
+            {
+                AutoSizeAxes = Axes.Both;
+                Direction = FillDirection.Horizontal;
+
+                Children = new[]
+                {
+                    new LinkFlowContainer(s =>
+                    {
+                        s.Font = OsuFont.GetFont(size: 11);
+                    }).With(d =>
+                    {
+                        d.AutoSizeAxes = Axes.Both;
+                        d.AddText($"{first} ");
+                        d.AddUserLink(second, s => s.Font = secondFont.With(size: 11));
+                    }),
+                };
+            }
         }
     }
 }

From 0825fc57a9f50a86594b4090954366d47aa82725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Apr 2021 18:24:15 +0200
Subject: [PATCH 09302/10326] Move foreground colour helper into `OsuColour`

---
 osu.Game/Graphics/OsuColour.cs                | 12 ++++++++++
 .../Graphics/UserInterfaceV2/ColourDisplay.cs |  3 +--
 .../Timeline/TimelineHitObjectBlueprint.cs    |  3 +--
 osu.Game/Utils/ColourUtils.cs                 | 23 -------------------
 4 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 osu.Game/Utils/ColourUtils.cs

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index c3b9b6006c..15967c37c2 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -94,6 +94,18 @@ namespace osu.Game.Graphics
             }
         }
 
+        /// <summary>
+        /// Returns a foreground text colour that is supposed to contrast well with
+        /// the supplied <paramref name="backgroundColour"/>.
+        /// </summary>
+        public static Color4 ForegroundTextColourFor(Color4 backgroundColour)
+        {
+            // formula taken from the RGB->YIQ conversions: https://en.wikipedia.org/wiki/YIQ
+            // brightness here is equivalent to the Y component in the above colour model, which is a rough estimate of lightness.
+            float brightness = 0.299f * backgroundColour.R + 0.587f * backgroundColour.G + 0.114f * backgroundColour.B;
+            return Gray(brightness > 0.5f ? 0.2f : 0.9f);
+        }
+
         // 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/Graphics/UserInterfaceV2/ColourDisplay.cs b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
index c07e5d5bf7..01d91f7cfd 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -102,7 +101,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         {
             fill.Colour = current.Value;
             colourHexCode.Text = current.Value.ToHex();
-            colourHexCode.Colour = ColourUtils.ForegroundTextColourFor(current.Value);
+            colourHexCode.Colour = OsuColour.ForegroundTextColourFor(current.Value);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index dc67009d08..0425370ae5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -21,7 +21,6 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
-using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -159,7 +158,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 circle.Colour = comboColour;
 
             var col = circle.Colour.TopLeft.Linear;
-            colouredComponents.Colour = ColourUtils.ForegroundTextColourFor(col);
+            colouredComponents.Colour = OsuColour.ForegroundTextColourFor(col);
         }
 
         protected override void Update()
diff --git a/osu.Game/Utils/ColourUtils.cs b/osu.Game/Utils/ColourUtils.cs
deleted file mode 100644
index 33f6f5981f..0000000000
--- a/osu.Game/Utils/ColourUtils.cs
+++ /dev/null
@@ -1,23 +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;
-using osuTK.Graphics;
-
-namespace osu.Game.Utils
-{
-    public static class ColourUtils
-    {
-        /// <summary>
-        /// Returns a foreground text colour that is supposed to contrast well on top of
-        /// the supplied <paramref name="backgroundColour"/>.
-        /// </summary>
-        public static Color4 ForegroundTextColourFor(Color4 backgroundColour)
-        {
-            // formula taken from the RGB->YIQ conversions: https://en.wikipedia.org/wiki/YIQ
-            // brightness here is equivalent to the Y component in the above colour model, which is a rough estimate of lightness.
-            float brightness = 0.299f * backgroundColour.R + 0.587f * backgroundColour.G + 0.114f * backgroundColour.B;
-            return OsuColour.Gray(brightness > 0.5f ? 0.2f : 0.9f);
-        }
-    }
-}

From 6bf6084ae9c3129d8a5672946e33205e8eabfcd3 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Mon, 19 Apr 2021 19:24:46 +0200
Subject: [PATCH 09303/10326] fixed according to suggestions

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 14e5831ef9..deb77c27de 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -308,7 +308,7 @@ namespace osu.Game.Screens.Select
                                 Margin = new MarginPadding { Top = 10 },
                                 Direction = FillDirection.Horizontal,
                                 AutoSizeAxes = Axes.Both,
-                                Children = new[] { getMapper(metadata) },
+                                Child = getMapper(metadata),
                             },
                             infoLabelContainer = new FillFlowContainer
                             {
@@ -431,10 +431,10 @@ namespace osu.Game.Screens.Select
                 ForceRedraw();
             }
 
-            private LinkFlowContainer getMapper(BeatmapMetadata metadata)
+            private Drawable getMapper(BeatmapMetadata metadata)
             {
                 if (metadata.Author == null)
-                    return new LinkFlowContainer();
+                    return Empty();
 
                 return new LinkFlowContainer(s =>
                 {

From c73bbf0aa7566c1bf33784caacb91fc786a7a2cc Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Mon, 19 Apr 2021 19:24:58 +0200
Subject: [PATCH 09304/10326] Fixed Tests

---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 7ea6373763..16afc5ace7 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("check version", () => infoWedge.Info.VersionLabel.Current.Value == $"{ruleset.ShortName}Version");
             AddAssert("check title", () => infoWedge.Info.TitleLabel.Current.Value == $"{ruleset.ShortName}Source — {ruleset.ShortName}Title");
             AddAssert("check artist", () => infoWedge.Info.ArtistLabel.Current.Value == $"{ruleset.ShortName}Artist");
-            AddAssert("check author", () => infoWedge.Info.MapperContainer.Children.OfType<OsuSpriteText>().Any(s => s.Current.Value == $"{ruleset.ShortName}Author"));
+            AddAssert("check author", () => infoWedge.Info.MapperContainer.ChildrenOfType<OsuSpriteText>().Any(s => s.Current.Value == $"{ruleset.ShortName}Author"));
         }
 
         private void testInfoLabels(int expectedCount)
@@ -123,7 +123,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Current.Value));
             AddAssert("check default title", () => infoWedge.Info.TitleLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Title);
             AddAssert("check default artist", () => infoWedge.Info.ArtistLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Artist);
-            AddAssert("check empty author", () => !infoWedge.Info.MapperContainer.Children.Any());
+            AddAssert("check empty author", () => !infoWedge.Info.MapperContainer.ChildrenOfType<OsuSpriteText>().Any());
             AddAssert("check no info labels", () => !infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Any());
         }
 

From 2a7ef1f80f037cbf393acbf23f1bd06ee4cbc4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Apr 2021 19:27:35 +0200
Subject: [PATCH 09305/10326] Use more general type

---
 osu.Game/Graphics/Containers/LinkFlowContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 3a2f9d5a78..054febeec3 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Graphics.Containers
         public void AddLink(string text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
             => createLink(AddText(text, creationParameters), new LinkDetails(action, argument), tooltipText);
 
-        public void AddLink(RomanisableString text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
+        public void AddLink(LocalisableString text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
         {
             var spriteText = new OsuSpriteText { Text = text };
 

From 8656176ab8e09b14737212846fdeed787a3f7bc4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:31:51 +0200
Subject: [PATCH 09306/10326] Add the playable beatmap as check argument

This is different from the working beatmap's `.Beatmap` property in that it is mutated by the ruleset/editor.

So hit objects, for example, are actually of type `Slider` and such instead of the legacy `ConvertSlider`.

This should be preferred over `workingBeatmap.Beatmap`.
---
 .../Editor/Checks/CheckOffscreenObjectsTest.cs       |  6 +++---
 .../Edit/Checks/CheckOffscreenObjects.cs             |  4 ++--
 osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs     |  5 ++++-
 .../Editing/Checks/CheckBackgroundQualityTest.cs     | 12 ++++++------
 .../Editing/Checks/CheckFilePresenceTest.cs          | 12 ++++++------
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs            |  5 ++++-
 .../Rulesets/Edit/Checks/CheckBackgroundQuality.cs   |  6 +++---
 osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs   |  4 ++--
 osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs   |  5 +++--
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs           |  2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs         |  4 ++--
 11 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index db347960ef..3a4817398c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -224,12 +224,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOk(IBeatmap beatmap)
         {
-            Assert.That(check.Run(new TestWorkingBeatmap(beatmap)), Is.Empty);
+            Assert.That(check.Run(beatmap, new TestWorkingBeatmap(beatmap)), Is.Empty);
         }
 
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
-            var issues = check.Run(new TestWorkingBeatmap(beatmap)).ToList();
+            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
@@ -237,7 +237,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
-            var issues = check.Run(new TestWorkingBeatmap(beatmap)).ToList();
+            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index c210f73b5f..4b0a7531a1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -31,9 +31,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
-            foreach (var hitobject in workingBeatmap.Beatmap.HitObjects)
+            foreach (var hitobject in playableBeatmap.HitObjects)
             {
                 switch (hitobject)
                 {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 9b9383d547..dab6483179 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -17,6 +17,9 @@ namespace osu.Game.Rulesets.Osu.Edit
             new CheckOffscreenObjects()
         };
 
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
+        {
+            return checks.SelectMany(check => check.Run(playableBeatmap, workingBeatmap));
+        }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index 8dad5bbf34..42d143cc04 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.Metadata.BackgroundFile = null;
             var mock = getMockWorkingBeatmap(null, System.Array.Empty<byte>());
 
-            Assert.That(check.Run(mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
         }
 
         [Test]
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var mock = getMockWorkingBeatmap(new Texture(1920, 1080));
 
-            Assert.That(check.Run(mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
         }
 
         [Test]
@@ -71,7 +71,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var mock = getMockWorkingBeatmap(new Texture(3840, 2160));
 
-            var issues = check.Run(mock.Object).ToList();
+            var issues = check.Run(beatmap, mock.Object).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooHighResolution);
@@ -82,7 +82,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var mock = getMockWorkingBeatmap(new Texture(640, 480));
 
-            var issues = check.Run(mock.Object).ToList();
+            var issues = check.Run(beatmap, mock.Object).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateLowResolution);
@@ -93,7 +93,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var mock = getMockWorkingBeatmap(new Texture(100, 100));
 
-            var issues = check.Run(mock.Object).ToList();
+            var issues = check.Run(beatmap, mock.Object).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooLowResolution);
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var mock = getMockWorkingBeatmap(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
 
-            var issues = check.Run(mock.Object).ToList();
+            var issues = check.Run(beatmap, mock.Object).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooUncompressed);
diff --git a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
index 1149115b55..fe2e16ffd8 100644
--- a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
@@ -15,13 +15,13 @@ namespace osu.Game.Tests.Editing.Checks
     public class CheckFilePresenceTest
     {
         private CheckBackgroundPresence check;
-        private WorkingBeatmap beatmap;
+        private IBeatmap beatmap;
 
         [SetUp]
         public void Setup()
         {
             check = new CheckBackgroundPresence();
-            beatmap = new TestWorkingBeatmap(new Beatmap<HitObject>
+            beatmap = new Beatmap<HitObject>
             {
                 BeatmapInfo = new BeatmapInfo
                 {
@@ -34,13 +34,13 @@ namespace osu.Game.Tests.Editing.Checks
                         })
                     }
                 }
-            });
+            };
         }
 
         [Test]
         public void TestBackgroundSetAndInFiles()
         {
-            Assert.That(check.Run(beatmap), Is.Empty);
+            Assert.That(check.Run(beatmap, new TestWorkingBeatmap(beatmap)), Is.Empty);
         }
 
         [Test]
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
 
-            var issues = check.Run(beatmap).ToList();
+            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateDoesNotExist);
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.Metadata.BackgroundFile = null;
 
-            var issues = check.Run(beatmap).ToList();
+            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateNoneSet);
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 90447049f8..9efaa94b40 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Rulesets.Edit
             new CheckAudioPresence(),
         };
 
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
+        {
+            return checks.SelectMany(check => check.Run(playableBeatmap, workingBeatmap));
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 1494ae5da4..767c2b94b5 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -30,9 +30,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateTooUncompressed(this)
         };
 
-        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
-            var backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+            var backgroundFile = playableBeatmap.Metadata?.BackgroundFile;
             if (backgroundFile == null)
                 yield break;
 
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             else if (texture.Width < low_width || texture.Height < low_height)
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
-            string storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
+            string storagePath = playableBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
             double filesizeMb = workingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
 
             if (filesizeMb > max_filesize_mb)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index 37fa79568f..340b053fdb 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
             var filename = GetFilename(workingBeatmap);
 
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
 
             // If the file is set, also make sure it still exists.
-            var storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
+            var storagePath = playableBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
             if (storagePath != null)
                 yield break;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index c3a64b58e9..31a7583941 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
-        /// <param name="workingBeatmap">The beatmap to run the check on.</param>
-        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap);
+        /// <param name="playableBeatmap">The playable beatmap of the beatmap to run the check on.</param>
+        /// <param name="workingBeatmap">The working beatmap of the beatmap to run the check on.</param>
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 12be8815e1..b598176a35 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -12,6 +12,6 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public interface IBeatmapVerifier
     {
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap);
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap);
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 6aa479b38d..393c89fe52 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -124,10 +124,10 @@ namespace osu.Game.Screens.Edit.Verify
             private void refresh()
             {
                 var workingBeatmap = beatmapManager.GetWorkingBeatmap(beatmap.BeatmapInfo);
-                var issues = generalVerifier.Run(workingBeatmap);
+                var issues = generalVerifier.Run(beatmap.PlayableBeatmap, workingBeatmap);
 
                 if (rulesetVerifier != null)
-                    issues = issues.Concat(rulesetVerifier.Run(workingBeatmap));
+                    issues = issues.Concat(rulesetVerifier.Run(beatmap.PlayableBeatmap, workingBeatmap));
 
                 table.Issues = issues
                                .OrderBy(issue => issue.Template.Type)

From be6a02a17e3f5621d7f6942678d278748cd88cec Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:32:22 +0200
Subject: [PATCH 09307/10326] Simplify background quality test names

---
 .../Editing/Checks/CheckBackgroundQualityTest.cs     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index 42d143cc04..b6970a99e4 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundMissing()
+        public void TestMissing()
         {
             // While this is a problem, it is out of scope for this check and is caught by a different one.
             beatmap.Metadata.BackgroundFile = null;
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundAcceptable()
+        public void TestAcceptable()
         {
             var mock = getMockWorkingBeatmap(new Texture(1920, 1080));
 
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundTooHighResolution()
+        public void TestTooHighResolution()
         {
             var mock = getMockWorkingBeatmap(new Texture(3840, 2160));
 
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundLowResolution()
+        public void TestLowResolution()
         {
             var mock = getMockWorkingBeatmap(new Texture(640, 480));
 
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundTooLowResolution()
+        public void TestTooLowResolution()
         {
             var mock = getMockWorkingBeatmap(new Texture(100, 100));
 
@@ -100,7 +100,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundTooUncompressed()
+        public void TestTooUncompressed()
         {
             var mock = getMockWorkingBeatmap(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
 

From 14c626ffcbff01f250a7008ebb8469181f5d6f95 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:33:19 +0200
Subject: [PATCH 09308/10326] Use the playable beatmap for file presence checks

---
 osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs      | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
index 55e53ef519..2d572a521e 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         protected override CheckCategory Category => CheckCategory.Audio;
         protected override string TypeOfFile => "audio";
-        protected override string GetFilename(IWorkingBeatmap workingBeatmap) => workingBeatmap.Beatmap.Metadata?.AudioFile;
+        protected override string GetFilename(IBeatmap playableBeatmap) => playableBeatmap.Metadata?.AudioFile;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
index 3a229b889b..233c708a25 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         protected override CheckCategory Category => CheckCategory.Resources;
         protected override string TypeOfFile => "background";
-        protected override string GetFilename(IWorkingBeatmap workingBeatmap) => workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+        protected override string GetFilename(IBeatmap playableBeatmap) => playableBeatmap.Metadata?.BackgroundFile;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index 340b053fdb..006fc57c04 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         protected abstract CheckCategory Category { get; }
         protected abstract string TypeOfFile { get; }
-        protected abstract string GetFilename(IWorkingBeatmap workingBeatmap);
+        protected abstract string GetFilename(IBeatmap playableBeatmap);
 
         public CheckMetadata Metadata => new CheckMetadata(Category, $"Missing {TypeOfFile}");
 
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
-            var filename = GetFilename(workingBeatmap);
+            var filename = GetFilename(playableBeatmap);
 
             if (filename == null)
             {

From 40ae856dfc4cb5006f43f10e3b1363e8434cb5ea Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:34:05 +0200
Subject: [PATCH 09309/10326] Show 2 decimals for background filesize

---
 osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 767c2b94b5..59fee74023 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         public class IssueTemplateTooUncompressed : IssueTemplate
         {
             public IssueTemplateTooUncompressed(ICheck check)
-                : base(check, IssueType.Problem, "The background filesize ({0:0.#} MB) exceeds {1} MB.")
+                : base(check, IssueType.Problem, "The background filesize ({0:0.##} MB) exceeds {1} MB.")
             {
             }
 

From f168247254424bda53e90680bfc45e83b69e7f22 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:35:41 +0200
Subject: [PATCH 09310/10326] Add `Track` as a property to `IWorkingBeatmap`

This is implemented by `WorkingBeatmap` already, and is much better to use than loading the track every time we need it.
---
 osu.Game/Beatmaps/IWorkingBeatmap.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index f1bf6f48ef..b1cf6db6fc 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -42,6 +42,11 @@ namespace osu.Game.Beatmaps
         /// </summary>
         ISkin Skin { get; }
 
+        /// <summary>
+        /// Get the loaded audio track instance.
+        /// </summary>
+        Track Track { get; }
+
         /// <summary>
         /// Constructs a playable <see cref="IBeatmap"/> from <see cref="Beatmap"/> using the applicable converters for a specific <see cref="RulesetInfo"/>.
         /// <para>

From c633f155653ef109898471b489e2ef466f1a10fc Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:36:03 +0200
Subject: [PATCH 09311/10326] Add audio quality check

---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  2 +
 .../Rulesets/Edit/Checks/CheckAudioQuality.cs | 75 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 9efaa94b40..f33feac971 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -19,8 +19,10 @@ namespace osu.Game.Rulesets.Edit
             // Resources
             new CheckBackgroundPresence(),
             new CheckBackgroundQuality(),
+
             // Audio
             new CheckAudioPresence(),
+            new CheckAudioQuality()
         };
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
new file mode 100644
index 0000000000..b67374c023
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.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.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckAudioQuality : ICheck
+    {
+        // This is a requirement as stated in the Ranking Criteria.
+        // See https://osu.ppy.sh/wiki/en/Ranking_Criteria#rules.4
+        private const int max_bitrate = 192;
+
+        // "A song's audio file /.../ must be of reasonable quality. Try to find the highest quality source file available"
+        // There not existing a version with a bitrate of 128 kbps or higher is extremely rare.
+        private const int min_bitrate = 128;
+
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Too high or low audio bitrate");
+
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateTooHighBitrate(this),
+            new IssueTemplateTooLowBitrate(this),
+            new IssueTemplateNoBitrate(this)
+        };
+
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        {
+            var audioFile = playableBeatmap.Metadata?.AudioFile;
+            if (audioFile == null)
+                yield break;
+
+            var track = workingBeatmap.Track;
+
+            if (track?.Bitrate == null || track.Bitrate.Value == 0)
+                yield return new IssueTemplateNoBitrate(this).Create();
+            else if (track.Bitrate.Value > max_bitrate)
+                yield return new IssueTemplateTooHighBitrate(this).Create(track.Bitrate.Value);
+            else if (track.Bitrate.Value < min_bitrate)
+                yield return new IssueTemplateTooLowBitrate(this).Create(track.Bitrate.Value);
+        }
+
+        public class IssueTemplateTooHighBitrate : IssueTemplate
+        {
+            public IssueTemplateTooHighBitrate(ICheck check)
+                : base(check, IssueType.Problem, "The audio bitrate ({0} kbps) exceeds {1} kbps.")
+            {
+            }
+
+            public Issue Create(int bitrate) => new Issue(this, bitrate, max_bitrate);
+        }
+
+        public class IssueTemplateTooLowBitrate : IssueTemplate
+        {
+            public IssueTemplateTooLowBitrate(ICheck check)
+                : base(check, IssueType.Problem, "The audio bitrate ({0} kbps) is lower than {1} kbps.")
+            {
+            }
+
+            public Issue Create(int bitrate) => new Issue(this, bitrate, min_bitrate);
+        }
+
+        public class IssueTemplateNoBitrate : IssueTemplate
+        {
+            public IssueTemplateNoBitrate(ICheck check)
+                : base(check, IssueType.Error, "The audio bitrate could not be retrieved.")
+            {
+            }
+
+            public Issue Create() => new Issue(this);
+        }
+    }
+}

From 2bb079ea1403479e1bf513eb63fdc3f1d98bceb3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:36:15 +0200
Subject: [PATCH 09312/10326] Add audio quality check tests

---
 .../Editing/Checks/CheckAudioQualityTest.cs   | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
new file mode 100644
index 0000000000..e73d9adfb0
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.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 System.Linq;
+using Moq;
+using NUnit.Framework;
+using osu.Framework.Audio.Track;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckAudioQualityTest
+    {
+        private CheckAudioQuality check;
+        private IBeatmap beatmap;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckAudioQuality();
+            beatmap = new Beatmap<HitObject>
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata { AudioFile = "abc123.jpg" }
+                }
+            };
+        }
+
+        [Test]
+        public void TestMissing()
+        {
+            // While this is a problem, it is out of scope for this check and is caught by a different one.
+            beatmap.Metadata.AudioFile = null;
+
+            var mock = new Mock<IWorkingBeatmap>();
+            mock.SetupGet(_ => _.Beatmap).Returns(beatmap);
+            mock.SetupGet(_ => _.Track).Returns((Track)null);
+
+            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+        }
+
+        [Test]
+        public void TestAcceptable()
+        {
+            var mock = getMockWorkingBeatmap(192);
+
+            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+        }
+
+        [Test]
+        public void TestNullBitrate()
+        {
+            var mock = getMockWorkingBeatmap(null);
+
+            var issues = check.Run(beatmap, mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
+        }
+
+        [Test]
+        public void TestZeroBitrate()
+        {
+            var mock = getMockWorkingBeatmap(0);
+
+            var issues = check.Run(beatmap, mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
+        }
+
+        [Test]
+        public void TestTooHighBitrate()
+        {
+            var mock = getMockWorkingBeatmap(320);
+
+            var issues = check.Run(beatmap, mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooHighBitrate);
+        }
+
+        [Test]
+        public void TestTooLowBitrate()
+        {
+            var mock = getMockWorkingBeatmap(64);
+
+            var issues = check.Run(beatmap, mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooLowBitrate);
+        }
+
+        /// <summary>
+        /// Returns the mock of the working beatmap with the given audio properties.
+        /// </summary>
+        /// <param name="audioBitrate">The bitrate of the audio file the beatmap uses.</param>
+        private Mock<IWorkingBeatmap> getMockWorkingBeatmap(int? audioBitrate)
+        {
+            var mockTrack = new Mock<Track>();
+            mockTrack.SetupGet(_ => _.Bitrate).Returns(audioBitrate);
+
+            var mockWorkingBeatmap = new Mock<IWorkingBeatmap>();
+            mockWorkingBeatmap.SetupGet(_ => _.Beatmap).Returns(beatmap);
+            mockWorkingBeatmap.SetupGet(_ => _.Track).Returns(mockTrack.Object);
+
+            return mockWorkingBeatmap;
+        }
+    }
+}

From c1b4aaaa03334995f4a96f223b3ce446a8ffb0dc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 08:38:02 +0900
Subject: [PATCH 09313/10326] Add doc comment

---
 osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
index 507cad15d3..86fa59f589 100644
--- a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
+++ b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
@@ -5,6 +5,10 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Objects
 {
+    /// <summary>
+    /// Created for a <see cref="DrawableHitObject"/> when only <see cref="HitObject"/> is given
+    /// to make sure a <see cref="DrawableHitObject"/> is always associated with a <see cref="HitObjectLifetimeEntry"/>.
+    /// </summary>
     internal class UnmanagedHitObjectEntry : HitObjectLifetimeEntry
     {
         public readonly DrawableHitObject DrawableHitObject;

From 4510e795e1326257168b1174a551ecf281a45563 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 02:13:26 +0200
Subject: [PATCH 09314/10326] Fix category of audio quality check

---
 osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
index b67374c023..c1074d7c74 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         // There not existing a version with a bitrate of 128 kbps or higher is extremely rare.
         private const int min_bitrate = 128;
 
-        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Too high or low audio bitrate");
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Audio, "Too high or low audio bitrate");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {

From 1bc63a4c611a99c9652743a9ba94eb6acc288e0a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 09:17:13 +0900
Subject: [PATCH 09315/10326] Now, DHO.lifetimeEntry can be non-null even it is
 not fully applied

---
 .../Objects/Drawables/DrawableHitObject.cs    | 46 ++++++++-----------
 .../Objects/UnmanagedHitObjectEntry.cs        |  7 +--
 2 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 9b132ea932..16f5ed9d17 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -39,12 +39,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The <see cref="HitObject"/> currently represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        public HitObject HitObject => lifetimeEntry?.HitObject ?? initialHitObject;
-
-        /// <summary>
-        /// The <see cref="HitObject"/> given in the constructor that will be applied when loaded.
-        /// </summary>
-        private HitObject initialHitObject;
+        public HitObject HitObject => lifetimeEntry?.HitObject;
 
         /// <summary>
         /// The parenting <see cref="DrawableHitObject"/>, if any.
@@ -145,9 +140,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         public IBindable<ArmedState> State => state;
 
+        /// <summary>
+        /// Whether a <see cref="HitObjectLifetimeEntry"/> is currently applied.
+        /// </summary>
+        private bool hasEntryApplied;
+
         /// <summary>
         /// The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the currently-attached <see cref="HitObject"/>.
         /// </summary>
+        /// <remarks>Even if it is not null, it may not be fully applied until loaded (<see cref="hasEntryApplied"/> is false).</remarks>
         [CanBeNull]
         private HitObjectLifetimeEntry lifetimeEntry;
 
@@ -168,7 +169,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </param>
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
         {
-            this.initialHitObject = initialHitObject;
+            if (initialHitObject != null)
+                lifetimeEntry = new UnmanagedHitObjectEntry(initialHitObject);
         }
 
         [BackgroundDependencyLoader]
@@ -184,11 +186,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.LoadAsyncComplete();
 
-            if (initialHitObject != null)
-            {
-                Apply(initialHitObject, null);
-                initialHitObject = null;
-            }
+            if (lifetimeEntry != null && !hasEntryApplied)
+                apply(lifetimeEntry);
         }
 
         protected override void LoadComplete()
@@ -210,21 +209,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (hitObject == null)
                 throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
-            if (lifetimeEntry != null)
-            {
-                if (lifetimeEntry.HitObject != hitObject)
-                    throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
+            if (lifetimeEntry != null && lifetimeEntry.HitObject != hitObject)
+                throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
 
-                apply(lifetimeEntry);
-            }
-            else
-            {
-                var unmanagedEntry = new UnmanagedHitObjectEntry(hitObject, this);
-                apply(unmanagedEntry);
-
-                // Set default lifetime for a non-pooled DHO
-                LifetimeStart = hitObject.StartTime - InitialLifetimeOffset;
-            }
+            apply(lifetimeEntry ?? new UnmanagedHitObjectEntry(hitObject));
         }
 
         /// <summary>
@@ -294,6 +282,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 else
                     updateState(ArmedState.Idle, true);
             }
+
+            hasEntryApplied = true;
         }
 
         /// <summary>
@@ -301,7 +291,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         private void free()
         {
-            if (lifetimeEntry == null) return;
+            if (!hasEntryApplied) return;
 
             StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
@@ -337,6 +327,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             lifetimeEntry = null;
 
             clearExistingStateTransforms();
+
+            hasEntryApplied = false;
         }
 
         protected sealed override void FreeAfterUse()
diff --git a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
index 86fa59f589..3cfa3c4d3a 100644
--- a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
+++ b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
@@ -11,14 +11,9 @@ namespace osu.Game.Rulesets.Objects
     /// </summary>
     internal class UnmanagedHitObjectEntry : HitObjectLifetimeEntry
     {
-        public readonly DrawableHitObject DrawableHitObject;
-
-        public UnmanagedHitObjectEntry(HitObject hitObject, DrawableHitObject drawableHitObject)
+        public UnmanagedHitObjectEntry(HitObject hitObject)
             : base(hitObject)
         {
-            DrawableHitObject = drawableHitObject;
-            LifetimeStart = DrawableHitObject.LifetimeStart;
-            LifetimeEnd = DrawableHitObject.LifetimeEnd;
         }
     }
 }

From 67e4fe42847fab7f6cc47b422257971b13979e06 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 02:28:38 +0200
Subject: [PATCH 09316/10326] Add xmldoc to `GetStream`

---
 osu.Game/Beatmaps/IWorkingBeatmap.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index b1cf6db6fc..053c6d373f 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -74,6 +74,10 @@ namespace osu.Game.Beatmaps
         /// <returns>A fresh track instance, which will also be available via <see cref="Track"/>.</returns>
         Track LoadTrack();
 
+        /// <summary>
+        /// Returns the stream of the file from the given storage path.
+        /// </summary>
+        /// <param name="storagePath">The storage path to the file.</param>
         Stream GetStream(string storagePath);
     }
 }

From 1478bcfa8e774dcbb3e1b785b94bae10c2d8acbd Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 02:30:27 +0200
Subject: [PATCH 09317/10326] Improve xmldoc consistency

---
 osu.Game/Beatmaps/IWorkingBeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 053c6d373f..a916b37b85 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Beatmaps
         ISkin Skin { get; }
 
         /// <summary>
-        /// Get the loaded audio track instance.
+        /// Retrieves the <see cref="Track"/> which this <see cref="WorkingBeatmap"/> has loaded.
         /// </summary>
         Track Track { get; }
 

From 496df411a7e20485adf374233f5f4d93a292d6b7 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 02:39:11 +0200
Subject: [PATCH 09318/10326] Remove now unused import

---
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 2ab529cb27..530f24300b 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -8,7 +8,6 @@ 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.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;

From 8a8b9084efa04747e8147d7602fc277359c18b43 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 10:11:36 +0900
Subject: [PATCH 09319/10326] Make single-argument overloead of DHO.Apply
 public

---
 .../Objects/Drawables/DrawableHitObject.cs    | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 16f5ed9d17..59088cffda 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -165,7 +166,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         /// <param name="initialHitObject">
         /// The <see cref="HitObject"/> to be initially applied to this <see cref="DrawableHitObject"/>.
-        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="Apply"/> (or automatically via pooling).
+        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="Apply(osu.Game.Rulesets.Objects.HitObjectLifetimeEntry)"/> (or automatically via pooling).
         /// </param>
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
         {
@@ -187,7 +188,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             base.LoadAsyncComplete();
 
             if (lifetimeEntry != null && !hasEntryApplied)
-                apply(lifetimeEntry);
+                Apply(lifetimeEntry);
         }
 
         protected override void LoadComplete()
@@ -200,36 +201,47 @@ namespace osu.Game.Rulesets.Objects.Drawables
         }
 
         /// <summary>
-        /// Applies a new <see cref="HitObject"/> to be represented by this <see cref="DrawableHitObject"/>.
+        /// Applies a hit object to be represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to apply.</param>
-        /// <param name="lifetimeEntry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of <paramref name="hitObject"/>.</param>
+        /// <remarks>This overload is semi-deprecated. Use either <see cref="Apply(osu.Game.Rulesets.Objects.HitObject)"/> or <see cref="Apply(osu.Game.Rulesets.Objects.HitObjectLifetimeEntry)"/>.</remarks>
         public void Apply([NotNull] HitObject hitObject, [CanBeNull] HitObjectLifetimeEntry lifetimeEntry)
+        {
+            if (lifetimeEntry != null && lifetimeEntry.HitObject != hitObject)
+                throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
+
+            if (lifetimeEntry != null)
+                Apply(lifetimeEntry);
+            else
+                Apply(hitObject);
+        }
+
+        /// <summary>
+        /// Applies a new <see cref="HitObject"/> to be represented by this <see cref="DrawableHitObject"/>.
+        /// A new <see cref="HitObjectLifetimeEntry"/> is automatically created and applied to this <see cref="DrawableHitObject"/>.
+        /// </summary>
+        public void Apply([NotNull] HitObject hitObject)
         {
             if (hitObject == null)
                 throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
-            if (lifetimeEntry != null && lifetimeEntry.HitObject != hitObject)
-                throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
-
-            apply(lifetimeEntry ?? new UnmanagedHitObjectEntry(hitObject));
+            Apply(new UnmanagedHitObjectEntry(hitObject));
         }
 
         /// <summary>
         /// Applies a new <see cref="HitObjectLifetimeEntry"/> to be represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        private void apply([NotNull] HitObjectLifetimeEntry entry)
+        public void Apply([NotNull] HitObjectLifetimeEntry newEntry)
         {
             free();
 
-            lifetimeEntry = entry;
+            lifetimeEntry = newEntry;
 
-            LifetimeStart = entry.LifetimeStart;
-            LifetimeEnd = entry.LifetimeEnd;
+            LifetimeStart = lifetimeEntry.LifetimeStart;
+            LifetimeEnd = lifetimeEntry.LifetimeEnd;
 
             // Ensure this DHO has a result.
-            entry.Result ??= CreateResult(HitObject.CreateJudgement())
-                             ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
+            lifetimeEntry.Result ??= CreateResult(HitObject.CreateJudgement())
+                                     ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
             // Copy back the result to the entry for potential future retrieval.
             if (lifetimeEntry != null)
@@ -387,7 +399,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void onDefaultsApplied(HitObject hitObject)
         {
-            Apply(hitObject, lifetimeEntry);
+            Debug.Assert(lifetimeEntry != null);
+            Apply(lifetimeEntry);
+
             DefaultsApplied?.Invoke(this);
         }
 

From a92ae8ce769aea4ff4d2c293ce3e825970985ba3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 13:01:42 +0900
Subject: [PATCH 09320/10326] Fix Reset() potentially not resetting to the
 intended start position

---
 osu.Game/Screens/Play/GameplayClockContainer.cs   | 10 +++++++++-
 .../Screens/Play/MasterGameplayClockContainer.cs  | 15 +++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 3da28f3560..e84f34e0d5 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -29,6 +29,11 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected readonly DecoupleableInterpolatingFramedClock AdjustableSource;
 
+        /// <summary>
+        /// The offset at which to start playing. Affects the time which the clock is reset to via <see cref="Reset"/>.
+        /// </summary>
+        protected virtual double StartOffset => 0;
+
         /// <summary>
         /// The source clock.
         /// </summary>
@@ -93,9 +98,12 @@ namespace osu.Game.Screens.Play
         {
             ChangeSource(SourceClock);
 
-            AdjustableSource.Seek(0);
+            AdjustableSource.Seek(StartOffset);
             AdjustableSource.Stop();
 
+            // Make sure the gameplay clock takes on the new time, otherwise the adjustable source will be seeked to the gameplay clock time in Start().
+            GameplayClock.UnderlyingClock.ProcessFrame();
+
             if (!IsPaused.Value)
                 Start();
         }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index f019e50b60..05d34fb8d4 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -47,6 +47,9 @@ namespace osu.Game.Screens.Play
 
         private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
 
+        protected override double StartOffset => startOffset;
+        private double startOffset;
+
         private readonly WorkingBeatmap beatmap;
         private readonly double gameplayStartTime;
         private readonly bool startAtGameplayStart;
@@ -74,27 +77,23 @@ namespace osu.Game.Screens.Play
             userAudioOffset.BindValueChanged(offset => userOffsetClock.Offset = offset.NewValue, true);
 
             // sane default provided by ruleset.
-            double startTime = gameplayStartTime;
+            startOffset = gameplayStartTime;
 
             if (!startAtGameplayStart)
             {
-                startTime = Math.Min(0, startTime);
+                startOffset = Math.Min(0, startOffset);
 
                 // if a storyboard is present, it may dictate the appropriate start time by having events in negative time space.
                 // this is commonly used to display an intro before the audio track start.
                 double? firstStoryboardEvent = beatmap.Storyboard.EarliestEventTime;
                 if (firstStoryboardEvent != null)
-                    startTime = Math.Min(startTime, firstStoryboardEvent.Value);
+                    startOffset = Math.Min(startOffset, firstStoryboardEvent.Value);
 
                 // some beatmaps specify a current lead-in time which should be used instead of the ruleset-provided value when available.
                 // this is not available as an option in the live editor but can still be applied via .osu editing.
                 if (beatmap.BeatmapInfo.AudioLeadIn > 0)
-                    startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
+                    startOffset = Math.Min(startOffset, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
             }
-
-            Seek(startTime);
-
-            AdjustableSource.ProcessFrame();
         }
 
         protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)

From 8dd9134e3d9b6304c3a3ad8d4f869ea73394d42e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 13:09:49 +0900
Subject: [PATCH 09321/10326] Move source clock adjustment application to
 Start()

---
 .../Screens/Play/MasterGameplayClockContainer.cs  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 05d34fb8d4..f1d303e245 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -105,6 +105,12 @@ namespace osu.Game.Screens.Play
                 this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
         }
 
+        public override void Start()
+        {
+            addSourceClockAdjustments();
+            base.Start();
+        }
+
         /// <summary>
         /// Seek to a specific time in gameplay.
         /// </summary>
@@ -122,12 +128,6 @@ namespace osu.Game.Screens.Play
             userOffsetClock.ProcessFrame();
         }
 
-        public override void Reset()
-        {
-            updateRate();
-            base.Reset();
-        }
-
         /// <summary>
         /// Skip forward to the next valid skip point.
         /// </summary>
@@ -164,11 +164,12 @@ namespace osu.Game.Screens.Play
         {
             removeSourceClockAdjustments();
             ChangeSource(new TrackVirtual(beatmap.Track.Length));
+            addSourceClockAdjustments();
         }
 
         private bool speedAdjustmentsApplied;
 
-        private void updateRate()
+        private void addSourceClockAdjustments()
         {
             if (speedAdjustmentsApplied)
                 return;

From 88ded95e7587c6345da8ecd186a46aba26600524 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 13:56:13 +0900
Subject: [PATCH 09322/10326] Ensure clock is set in GCC.Start()

---
 .../TestSceneMasterGameplayClockContainer.cs  | 28 ++++++++++++++++++-
 .../Screens/Play/GameplayClockContainer.cs    |  7 +++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
index 77ada958d7..935bc07733 100644
--- a/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
@@ -25,8 +25,34 @@ namespace osu.Game.Tests.Gameplay
                 Add(gcc = new MasterGameplayClockContainer(working, 0));
             });
 
-            AddStep("start track", () => gcc.Start());
+            AddStep("start clock", () => gcc.Start());
             AddUntilStep("elapsed greater than zero", () => gcc.GameplayClock.ElapsedFrameTime > 0);
         }
+
+        [Test]
+        public void TestElapseThenReset()
+        {
+            GameplayClockContainer gcc = null;
+
+            AddStep("create container", () =>
+            {
+                var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+                working.LoadTrack();
+
+                Add(gcc = new MasterGameplayClockContainer(working, 0));
+            });
+
+            AddStep("start clock", () => gcc.Start());
+            AddUntilStep("current time greater 2000", () => gcc.GameplayClock.CurrentTime > 2000);
+
+            double timeAtReset = 0;
+            AddStep("reset clock", () =>
+            {
+                timeAtReset = gcc.GameplayClock.CurrentTime;
+                gcc.Reset();
+            });
+
+            AddAssert("current time < time at reset", () => gcc.GameplayClock.CurrentTime < timeAtReset);
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index e84f34e0d5..75b27ed3f3 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -1,10 +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.Globalization;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Framework.Timing;
 
 namespace osu.Game.Screens.Play
@@ -68,6 +70,9 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Start()
         {
+            // Ensure that the source clock is set.
+            ChangeSource(SourceClock);
+
             if (!AdjustableSource.IsRunning)
             {
                 // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
@@ -96,8 +101,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
-            ChangeSource(SourceClock);
-
             AdjustableSource.Seek(StartOffset);
             AdjustableSource.Stop();
 

From 3d6d26039a0a1040964f532b57ac912fef9716c7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 14:09:54 +0900
Subject: [PATCH 09323/10326] Remove unused usings

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 75b27ed3f3..0ada6613d7 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -1,12 +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.Globalization;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
 using osu.Framework.Timing;
 
 namespace osu.Game.Screens.Play

From c6ee4e900e25201389ba194b768832e45322941f Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 15:18:36 +0900
Subject: [PATCH 09324/10326] Ensure a non-null hitobject entry has a non-null
 Result

---
 .../Objects/Drawables/DrawableHitObject.cs     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 59088cffda..d798eba4e1 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -171,7 +171,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
         {
             if (initialHitObject != null)
+            {
                 lifetimeEntry = new UnmanagedHitObjectEntry(initialHitObject);
+                ensureEntryHasResult();
+            }
         }
 
         [BackgroundDependencyLoader]
@@ -239,13 +242,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             LifetimeStart = lifetimeEntry.LifetimeStart;
             LifetimeEnd = lifetimeEntry.LifetimeEnd;
 
-            // Ensure this DHO has a result.
-            lifetimeEntry.Result ??= CreateResult(HitObject.CreateJudgement())
-                                     ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
-
-            // Copy back the result to the entry for potential future retrieval.
-            if (lifetimeEntry != null)
-                lifetimeEntry.Result = Result;
+            ensureEntryHasResult();
 
             foreach (var h in HitObject.NestedHitObjects)
             {
@@ -799,6 +796,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <param name="judgement">The <see cref="Judgement"/> that provides the scoring information.</param>
         protected virtual JudgementResult CreateResult(Judgement judgement) => new JudgementResult(HitObject, judgement);
 
+        private void ensureEntryHasResult()
+        {
+            Debug.Assert(lifetimeEntry != null);
+            lifetimeEntry.Result ??= CreateResult(HitObject.CreateJudgement())
+                                     ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 281c2041b23bdbce8859f9027220eb4b06fb908d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 16:51:00 +0900
Subject: [PATCH 09325/10326] Add failing test

---
 .../Gameplay/TestSceneStoryboardSamples.cs    | 28 ++++++++++++++++++-
 osu.Game/Skinning/PausableSkinnableSound.cs   |  2 +-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index cae5f20332..f2cb5f75d8 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -77,7 +77,33 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("start time", () => gameplayContainer.Start());
 
-            AddUntilStep("sample playback succeeded", () => sample.LifetimeEnd < double.MaxValue);
+            AddUntilStep("sample played", () => sample.RequestedPlaying);
+            AddUntilStep("sample has lifetime end", () => sample.LifetimeEnd < double.MaxValue);
+        }
+
+        [Test]
+        public void TestSampleHasLifetimeEndWithInitialClockTime()
+        {
+            GameplayClockContainer gameplayContainer = null;
+            DrawableStoryboardSample sample = null;
+
+            AddStep("create container", () =>
+            {
+                var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+                working.LoadTrack();
+
+                Add(gameplayContainer = new GameplayClockContainer(working, 1000, true));
+
+                gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                {
+                    Clock = gameplayContainer.GameplayClock
+                });
+            });
+
+            AddStep("start time", () => gameplayContainer.Start());
+
+            AddUntilStep("sample not played", () => !sample.RequestedPlaying);
+            AddUntilStep("sample has lifetime end", () => sample.LifetimeEnd < double.MaxValue);
         }
 
         [TestCase(typeof(OsuModDoubleTime), 1.5)]
diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index b3c7c5d6b2..10b8c47028 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Skinning
     {
         public double Length => !DrawableSamples.Any() ? 0 : DrawableSamples.Max(sample => sample.Length);
 
-        protected bool RequestedPlaying { get; private set; }
+        public bool RequestedPlaying { get; private set; }
 
         public PausableSkinnableSound()
         {

From 623eae15762f4cf796dfbd2fbab26b64a3aaa142 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 17:06:01 +0900
Subject: [PATCH 09326/10326] Add basic language switching ability

---
 .../ResourceManagerLocalisationStore.cs       | 57 +++++++++++++++++++
 osu.Game/OsuGame.cs                           |  7 +++
 .../Sections/General/LanguageSettings.cs      | 18 ++++++
 3 files changed, 82 insertions(+)
 create mode 100644 osu.Game/Localisation/ResourceManagerLocalisationStore.cs

diff --git a/osu.Game/Localisation/ResourceManagerLocalisationStore.cs b/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
new file mode 100644
index 0000000000..dd84eff55f
--- /dev/null
+++ b/osu.Game/Localisation/ResourceManagerLocalisationStore.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 System.Globalization;
+using System.IO;
+using System.Resources;
+using System.Threading.Tasks;
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public class ResourceManagerLocalisationStore : ILocalisationStore
+    {
+        private readonly Dictionary<string, ResourceManager> resourceManagers = new Dictionary<string, ResourceManager>();
+
+        public ResourceManagerLocalisationStore(string cultureCode)
+        {
+            EffectiveCulture = new CultureInfo(cultureCode);
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public string Get(string lookup)
+        {
+            var split = lookup.Split(':');
+
+            string ns = split[0];
+            string key = split[1];
+
+            if (!resourceManagers.TryGetValue(ns, out var manager))
+                resourceManagers[ns] = manager = new ResourceManager(ns, GetType().Assembly);
+
+            return manager.GetString(key, EffectiveCulture);
+        }
+
+        public Task<string> GetAsync(string lookup)
+        {
+            return Task.FromResult(Get(lookup));
+        }
+
+        public Stream GetStream(string name)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<string> GetAvailableResources()
+        {
+            throw new NotImplementedException();
+        }
+
+        public CultureInfo EffectiveCulture { get; }
+    }
+}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 28f32ba455..9af9a34b46 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -51,6 +51,7 @@ using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
 using osu.Game.Database;
 using osu.Game.IO;
+using osu.Game.Localisation;
 
 namespace osu.Game
 {
@@ -541,6 +542,12 @@ namespace osu.Game
         {
             base.LoadComplete();
 
+            foreach (var language in Enum.GetValues(typeof(Language)).OfType<Language>())
+            {
+                var cultureCode = language.ToString();
+                Localisation.AddLanguage(cultureCode, new ResourceManagerLocalisationStore(cultureCode));
+            }
+
             // The next time this is updated is in UpdateAfterChildren, which occurs too late and results
             // in the cursor being shown for a few frames during the intro.
             // This prevents the cursor from showing until we have a screen with CursorVisible = true
diff --git a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
index 44e42ecbfe..c2767f61b4 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
@@ -1,27 +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 System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Settings.Sections.General
 {
     public class LanguageSettings : SettingsSubsection
     {
+        private SettingsDropdown<Language> languageSelection;
+        private Bindable<string> frameworkLocale;
+
         protected override string Header => "Language";
 
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig)
         {
+            frameworkLocale = frameworkConfig.GetBindable<string>(FrameworkSetting.Locale);
+
             Children = new Drawable[]
             {
+                languageSelection = new SettingsEnumDropdown<Language>
+                {
+                    LabelText = "Language",
+                },
                 new SettingsCheckbox
                 {
                     LabelText = "Prefer metadata in original language",
                     Current = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowUnicode)
                 },
             };
+
+            if (!Enum.TryParse<Language>(frameworkLocale.Value, out var locale))
+                locale = Language.en;
+            languageSelection.Current.Value = locale;
+
+            languageSelection.Current.BindValueChanged(val => frameworkLocale.Value = val.NewValue.ToString());
         }
     }
 }

From db524e2395b375e6882eaef9b5424380f70eaa23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 17:06:12 +0900
Subject: [PATCH 09327/10326] Add localisation support to DialogButton's text

---
 osu.Game/Graphics/UserInterface/DialogButton.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs
index 9b53ee7b2d..1047aa4255 100644
--- a/osu.Game/Graphics/UserInterface/DialogButton.cs
+++ b/osu.Game/Graphics/UserInterface/DialogButton.cs
@@ -15,6 +15,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Effects;
 using osu.Game.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -180,9 +181,9 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        private string text;
+        private LocalisableString text;
 
-        public string Text
+        public LocalisableString Text
         {
             get => text;
             set

From d28eb399a4539c776464e99fa322a33ebf1fa654 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 16:51:24 +0900
Subject: [PATCH 09328/10326] Fix storyboard sample lifetimes not set if seeked
 past

---
 .../Drawables/DrawableStoryboardSample.cs     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 7b16009859..fbdd27e762 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -61,28 +61,32 @@ namespace osu.Game.Storyboards.Drawables
         {
             base.Update();
 
+            // Check if we've yet to pass the sample start time.
             if (Time.Current < sampleInfo.StartTime)
             {
-                // We've rewound before the start time of the sample
                 Stop();
 
-                // In the case that the user fast-forwards to a point far beyond the start time of the sample,
-                // we want to be able to fall into the if-conditional below (therefore we must not have a life time end)
+                // Playback has stopped, but if the user fast-forwards to a point after the start time of the sample then
+                // we must not have a lifetime end in order to continue receiving updates and start the sample below.
                 LifetimeStart = sampleInfo.StartTime;
                 LifetimeEnd = double.MaxValue;
+
+                return;
             }
-            else if (Time.Current - Time.Elapsed <= sampleInfo.StartTime)
+
+            // Ensure that we've elapsed from a point before the sample's start time before playing.
+            if (Time.Current - Time.Elapsed <= sampleInfo.StartTime)
             {
                 // We've passed the start time of the sample. We only play the sample if we're within an allowable range
                 // from the sample's start, to reduce layering if we've been fast-forwarded far into the future
                 if (!RequestedPlaying && Time.Current - sampleInfo.StartTime < allowable_late_start)
                     Play();
-
-                // In the case that the user rewinds to a point far behind the start time of the sample,
-                // we want to be able to fall into the if-conditional above (therefore we must not have a life time start)
-                LifetimeStart = double.MinValue;
-                LifetimeEnd = sampleInfo.StartTime;
             }
+
+            // Playback has started, but if the user rewinds to a point before the start time of the sample then
+            // we must not have a lifetime start in order to continue receiving updates and stop the sample above.
+            LifetimeStart = double.MinValue;
+            LifetimeEnd = sampleInfo.StartTime;
         }
     }
 }

From 5da18c51a49bb3669dae12f18b9af89668bf873f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 17:27:37 +0900
Subject: [PATCH 09329/10326] Fix compile error

---
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 57b3687d3a..5b8abddd3f 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gameplayContainer = new GameplayClockContainer(working, 1000, true));
+                Add(gameplayContainer = new MasterGameplayClockContainer(working, 1000, true));
 
                 gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
                 {

From 60acd824cbc0c1ce6d7d3ff95bd9759e943f2dd3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 17:06:26 +0900
Subject: [PATCH 09330/10326] Add two sample implementations

---
 osu.Game/Localisation/Common.ja.resx      | 17 ++++++++++++++++
 osu.Game/Localisation/Common.resx         | 17 ++++++++++++++++
 osu.Game/Localisation/CommonStrings.cs    | 19 ++++++++++++++++++
 osu.Game/Localisation/Language.cs         | 16 +++++++++++++++
 osu.Game/Localisation/MainMenu.ja.resx    | 17 ++++++++++++++++
 osu.Game/Localisation/MainMenu.resx       | 17 ++++++++++++++++
 osu.Game/Localisation/MainMenuStrings.cs  | 24 +++++++++++++++++++++++
 osu.Game/Overlays/Dialog/ConfirmDialog.cs |  2 +-
 osu.Game/Screens/Menu/Button.cs           |  3 ++-
 osu.Game/Screens/Menu/ButtonSystem.cs     |  8 +++++---
 10 files changed, 135 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Localisation/Common.ja.resx
 create mode 100644 osu.Game/Localisation/Common.resx
 create mode 100644 osu.Game/Localisation/CommonStrings.cs
 create mode 100644 osu.Game/Localisation/Language.cs
 create mode 100644 osu.Game/Localisation/MainMenu.ja.resx
 create mode 100644 osu.Game/Localisation/MainMenu.resx
 create mode 100644 osu.Game/Localisation/MainMenuStrings.cs

diff --git a/osu.Game/Localisation/Common.ja.resx b/osu.Game/Localisation/Common.ja.resx
new file mode 100644
index 0000000000..174751c455
--- /dev/null
+++ b/osu.Game/Localisation/Common.ja.resx
@@ -0,0 +1,17 @@
+<root>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="cancel" xml:space="preserve">
+        <value>やめとくわ</value>
+    </data>
+</root>
diff --git a/osu.Game/Localisation/Common.resx b/osu.Game/Localisation/Common.resx
new file mode 100644
index 0000000000..f63fb90086
--- /dev/null
+++ b/osu.Game/Localisation/Common.resx
@@ -0,0 +1,17 @@
+<root>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="cancel" xml:space="preserve">
+        <value>Cancel</value>
+    </data>
+</root>
diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
new file mode 100644
index 0000000000..f448158191
--- /dev/null
+++ b/osu.Game/Localisation/CommonStrings.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.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class CommonStrings
+    {
+        private const string prefix = "osu.Game.Localisation.Common";
+
+        /// <summary>
+        /// "Cancel"
+        /// </summary>
+        public static LocalisableString Cancel => new TranslatableString(getKey("cancel"), "Cancel");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Localisation/Language.cs b/osu.Game/Localisation/Language.cs
new file mode 100644
index 0000000000..edcf264c7f
--- /dev/null
+++ b/osu.Game/Localisation/Language.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 System.ComponentModel;
+
+namespace osu.Game.Localisation
+{
+    public enum Language
+    {
+        [Description("English")]
+        en,
+
+        [Description("日本語")]
+        ja
+    }
+}
diff --git a/osu.Game/Localisation/MainMenu.ja.resx b/osu.Game/Localisation/MainMenu.ja.resx
new file mode 100644
index 0000000000..20c85110ad
--- /dev/null
+++ b/osu.Game/Localisation/MainMenu.ja.resx
@@ -0,0 +1,17 @@
+<root>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="solo" xml:space="preserve">
+        <value>ソロ</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/MainMenu.resx b/osu.Game/Localisation/MainMenu.resx
new file mode 100644
index 0000000000..845b412d88
--- /dev/null
+++ b/osu.Game/Localisation/MainMenu.resx
@@ -0,0 +1,17 @@
+<root>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="solo" xml:space="preserve">
+        <value>solo</value>
+    </data>
+</root>
diff --git a/osu.Game/Localisation/MainMenuStrings.cs b/osu.Game/Localisation/MainMenuStrings.cs
new file mode 100644
index 0000000000..fd9647467a
--- /dev/null
+++ b/osu.Game/Localisation/MainMenuStrings.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.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class MainMenuStrings
+    {
+        private const string prefix = "osu.Game.Localisation.MainMenu";
+
+        /// <summary>
+        /// "solo"
+        /// </summary>
+        public static LocalisableString Solo => new TranslatableString(getKey("solo"), "solo");
+
+        /// <summary>
+        /// "multi"
+        /// </summary>
+        public static LocalisableString Multi => new TranslatableString(getKey("multi"), "multi");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Overlays/Dialog/ConfirmDialog.cs b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
index a87c06ffdf..d1c0d746d1 100644
--- a/osu.Game/Overlays/Dialog/ConfirmDialog.cs
+++ b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Dialog
                 },
                 new PopupDialogCancelButton
                 {
-                    Text = @"Cancel",
+                    Text = Localisation.CommonStrings.Cancel,
                     Action = onCancel
                 },
             };
diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs
index d956394ebb..26f26d1304 100644
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Screens.Menu
@@ -50,7 +51,7 @@ namespace osu.Game.Screens.Menu
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
-        public Button(string text, string sampleName, IconUsage symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
+        public Button(LocalisableString text, string sampleName, IconUsage symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
         {
             this.sampleName = sampleName;
             this.clickAction = clickAction;
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 81b1cb0bf1..ff5ad37b9d 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
@@ -22,6 +23,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
+using osu.Game.Localisation;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
@@ -121,10 +123,10 @@ namespace osu.Game.Screens.Menu
         private LoginOverlay loginOverlay { get; set; }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, IdleTracker idleTracker, GameHost host)
+        private void load(AudioManager audio, IdleTracker idleTracker, GameHost host, LocalisationManager strings)
         {
-            buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
+            buttonsPlay.Add(new Button(MainMenuStrings.Solo, @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
+            buttonsPlay.Add(new Button(MainMenuStrings.Multi, @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
             buttonsPlay.Add(new Button(@"playlists", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 

From 97fb90d9f45c660e4420fbf05477846e010eea35 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 17:35:59 +0900
Subject: [PATCH 09331/10326] Move clock processing to base.Seek()

---
 osu.Game/Screens/Play/GameplayClockContainer.cs       | 10 +++++++---
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs |  3 ---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 0ada6613d7..f6b99c094f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -87,7 +87,13 @@ namespace osu.Game.Screens.Play
         /// Seek to a specific time in gameplay.
         /// </summary>
         /// <param name="time">The destination time to seek to.</param>
-        public virtual void Seek(double time) => AdjustableSource.Seek(time);
+        public virtual void Seek(double time)
+        {
+            AdjustableSource.Seek(time);
+
+            // Manually process to make sure the gameplay clock is correctly updated after a seek.
+            GameplayClock.UnderlyingClock.ProcessFrame();
+        }
 
         /// <summary>
         /// Stops gameplay.
@@ -102,8 +108,6 @@ namespace osu.Game.Screens.Play
             AdjustableSource.Seek(StartOffset);
             AdjustableSource.Stop();
 
-            // Make sure the gameplay clock takes on the new time, otherwise the adjustable source will be seeked to the gameplay clock time in Start().
-            GameplayClock.UnderlyingClock.ProcessFrame();
 
             if (!IsPaused.Value)
                 Start();
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index f1d303e245..1b893a76c5 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -123,9 +123,6 @@ namespace osu.Game.Screens.Play
             // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
             // we may want to consider reversing the application of offsets in the future as it may feel more correct.
             base.Seek(time - totalOffset);
-
-            // manually process frame to ensure GameplayClock is correctly updated after a seek.
-            userOffsetClock.ProcessFrame();
         }
 
         /// <summary>

From 505a117862cce9818970a71833736c7a294b84c2 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Mon, 19 Apr 2021 23:41:51 +0200
Subject: [PATCH 09332/10326] splitted updateable part of wedge

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   |  16 +-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 261 ++++++++++--------
 2 files changed, 152 insertions(+), 125 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 7ea6373763..9c10c9751c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -112,8 +112,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void testInfoLabels(int expectedCount)
         {
-            AddAssert("check info labels exists", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Any());
-            AddAssert("check info labels count", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Count() == expectedCount);
+            AddAssert("check info labels exists", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Any());
+            AddAssert("check info labels count", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Count() == expectedCount);
         }
 
         [Test]
@@ -124,7 +124,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("check default title", () => infoWedge.Info.TitleLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Title);
             AddAssert("check default artist", () => infoWedge.Info.ArtistLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Artist);
             AddAssert("check empty author", () => !infoWedge.Info.MapperContainer.Children.Any());
-            AddAssert("check no info labels", () => !infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Any());
+            AddAssert("check no info labels", () => !infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Any());
         }
 
         [Test]
@@ -135,15 +135,15 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void selectBeatmap([CanBeNull] IBeatmap b)
         {
-            BeatmapInfoWedge.BufferedWedgeInfo infoBefore = null;
+            BeatmapInfoWedge.BufferedWedgeBackground backgroundBefore = null;
 
             AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
             {
-                infoBefore = infoWedge.Info;
+                backgroundBefore = infoWedge.Background;
                 infoWedge.Beatmap = Beatmap.Value = b == null ? Beatmap.Default : CreateWorkingBeatmap(b);
             });
 
-            AddUntilStep("wait for async load", () => infoWedge.Info != infoBefore);
+            AddUntilStep("wait for async load", () => infoWedge.Background != backgroundBefore);
         }
 
         private IBeatmap createTestBeatmap(RulesetInfo ruleset)
@@ -193,7 +193,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
-            public new BufferedWedgeInfo Info => base.Info;
+            public new BufferedWedgeBackground Background => base.Background;
+
+            public new WedgeInfoText Info => base.Info;
         }
 
         private class TestHitObject : ConvertHitObject, IHasPosition
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 4069dc82ed..0b72970bb0 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -49,7 +49,8 @@ namespace osu.Game.Screens.Select
 
         private IBindable<StarDifficulty?> beatmapDifficulty;
 
-        protected BufferedWedgeInfo Info;
+        protected BufferedWedgeBackground Background;
+        protected WedgeInfoText Info;
 
         public BeatmapInfoWedge()
         {
@@ -110,9 +111,9 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public override bool IsPresent => base.IsPresent || Info == null; // Visibility is updated in the LoadComponentAsync callback
+        public override bool IsPresent => base.IsPresent || Background == null; // Visibility is updated in the LoadComponentAsync callback
 
-        private BufferedWedgeInfo loadingInfo;
+        private BufferedWedgeBackground loadingInfo;
 
         private void updateDisplay()
         {
@@ -127,6 +128,10 @@ namespace osu.Game.Screens.Select
                     Info?.FadeOut(250);
                     Info?.Expire();
                     Info = null;
+
+                    Background?.FadeOut(250);
+                    Background?.Expire();
+                    Background = null;
                 }
 
                 if (beatmap == null)
@@ -135,17 +140,21 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
+                LoadComponentAsync(loadingInfo = new BufferedWedgeBackground(beatmap)
                 {
                     Shear = -Shear,
-                    Depth = Info?.Depth + 1 ?? 0
+                    Depth = Background?.Depth + 1 ?? 0
                 }, loaded =>
                 {
                     // ensure we are the most recent loaded wedge.
                     if (loaded != loadingInfo) return;
 
                     removeOldInfo();
-                    Add(Info = loaded);
+                    Add(Background = loaded);
+                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
+                    {
+                        Shear = -Shear
+                    });
                 });
             }
         }
@@ -156,28 +165,26 @@ namespace osu.Game.Screens.Select
             cancellationSource?.Cancel();
         }
 
-        public class BufferedWedgeInfo : BufferedContainer
+        public class WedgeInfoText : Container
         {
-            public OsuSpriteText VersionLabel { get; private set; }
+            public FillFlowContainer MapperContainer { get; private set; }
             public OsuSpriteText TitleLabel { get; private set; }
             public OsuSpriteText ArtistLabel { get; private set; }
+            public OsuSpriteText VersionLabel { get; private set; }
             public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
-            public FillFlowContainer MapperContainer { get; private set; }
 
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
             private Container bpmLabelContainer;
+            private ModSettingChangeTracker settingChangeTracker;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
             private readonly IReadOnlyList<Mod> mods;
             private readonly StarDifficulty starDifficulty;
 
-            private ModSettingChangeTracker settingChangeTracker;
-
-            public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
-                : base(pixelSnapping: true)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
@@ -191,7 +198,6 @@ namespace osu.Game.Screens.Select
                 var beatmapInfo = beatmap.BeatmapInfo;
                 var metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
-                CacheDrawnFrameBuffer = true;
                 RelativeSizeAxes = Axes.Both;
 
                 titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
@@ -199,32 +205,6 @@ namespace osu.Game.Screens.Select
 
                 Children = new Drawable[]
                 {
-                    // We will create the white-to-black gradient by modulating transparency and having
-                    // a black backdrop. This results in an sRGB-space gradient and not linear space,
-                    // transitioning from white to black more perceptually uniformly.
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
-                    },
-                    // We use a container, such that we can set the colour gradient to go across the
-                    // vertices of the masked container instead of the vertices of the (larger) sprite.
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
-                        Children = new[]
-                        {
-                            // Zoomed-in and cropped beatmap background
-                            new BeatmapBackgroundSprite(beatmap)
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                FillMode = FillMode.Fill,
-                            },
-                        },
-                    },
                     new DifficultyColourBar(starDifficulty)
                     {
                         RelativeSizeAxes = Axes.Y,
@@ -329,51 +309,6 @@ namespace osu.Game.Screens.Select
                 addInfoLabels();
             }
 
-            private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
-                ? new StarRatingDisplay(difficulty)
-                {
-                    Margin = new MarginPadding { Bottom = 5 }
-                }
-                : Empty();
-
-            private void setMetadata(string source)
-            {
-                ArtistLabel.Text = artistBinding.Value;
-                TitleLabel.Text = string.IsNullOrEmpty(source) ? titleBinding.Value : source + " — " + titleBinding.Value;
-                ForceRedraw();
-            }
-
-            private void addInfoLabels()
-            {
-                if (beatmap.Beatmap?.HitObjects?.Any() != true)
-                    return;
-
-                infoLabelContainer.Children = new Drawable[]
-                {
-                    new InfoLabel(new BeatmapStatistic
-                    {
-                        Name = "Length",
-                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
-                        Content = TimeSpan.FromMilliseconds(beatmap.BeatmapInfo.Length).ToString(@"m\:ss"),
-                    }),
-                    bpmLabelContainer = new Container
-                    {
-                        AutoSizeAxes = Axes.Both,
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Spacing = new Vector2(20, 0),
-                        Children = getRulesetInfoLabels()
-                    }
-                };
-
-                settingChangeTracker = new ModSettingChangeTracker(mods);
-                settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
-
-                refreshBPMLabel();
-            }
-
             private InfoLabel[] getRulesetInfoLabels()
             {
                 try
@@ -426,8 +361,43 @@ namespace osu.Game.Screens.Select
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Bpm),
                     Content = labelText
                 });
+            }
 
-                ForceRedraw();
+            private void setMetadata(string source)
+            {
+                ArtistLabel.Text = artistBinding.Value;
+                TitleLabel.Text = string.IsNullOrEmpty(source) ? titleBinding.Value : source + " — " + titleBinding.Value;
+            }
+
+            private void addInfoLabels()
+            {
+                if (beatmap.Beatmap?.HitObjects?.Any() != true)
+                    return;
+
+                infoLabelContainer.Children = new Drawable[]
+                {
+                    new InfoLabel(new BeatmapStatistic
+                    {
+                        Name = "Length",
+                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
+                        Content = TimeSpan.FromMilliseconds(beatmap.BeatmapInfo.Length).ToString(@"m\:ss"),
+                    }),
+                    bpmLabelContainer = new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(20, 0),
+                        Children = getRulesetInfoLabels()
+                    }
+                };
+
+                settingChangeTracker = new ModSettingChangeTracker(mods);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
+
+                refreshBPMLabel();
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)
@@ -450,10 +420,48 @@ namespace osu.Game.Screens.Select
                 };
             }
 
-            protected override void Dispose(bool isDisposing)
+            private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
+                ? new StarRatingDisplay(difficulty)
+                {
+                    Margin = new MarginPadding { Bottom = 5 }
+                }
+                : Empty();
+
+            private class DifficultyColourBar : Container
             {
-                base.Dispose(isDisposing);
-                settingChangeTracker?.Dispose();
+                private readonly StarDifficulty difficulty;
+
+                public DifficultyColourBar(StarDifficulty difficulty)
+                {
+                    this.difficulty = difficulty;
+                }
+
+                [BackgroundDependencyLoader]
+                private void load(OsuColour colours)
+                {
+                    const float full_opacity_ratio = 0.7f;
+
+                    var difficultyColour = colours.ForDifficultyRating(difficulty.DifficultyRating);
+
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = difficultyColour,
+                            Width = full_opacity_ratio,
+                        },
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            RelativePositionAxes = Axes.Both,
+                            Colour = difficultyColour,
+                            Alpha = 0.5f,
+                            X = full_opacity_ratio,
+                            Width = 1 - full_opacity_ratio,
+                        }
+                    };
+                }
             }
 
             public class InfoLabel : Container, IHasTooltip
@@ -515,41 +523,58 @@ namespace osu.Game.Screens.Select
                 }
             }
 
-            private class DifficultyColourBar : Container
+            protected override void Dispose(bool isDisposing)
             {
-                private readonly StarDifficulty difficulty;
+                base.Dispose(isDisposing);
+                settingChangeTracker?.Dispose();
+            }
+        }
 
-                public DifficultyColourBar(StarDifficulty difficulty)
+        public class BufferedWedgeBackground : BufferedContainer
+        {
+            private readonly WorkingBeatmap beatmap;
+
+            public BufferedWedgeBackground(WorkingBeatmap beatmap)
+                : base(pixelSnapping: true)
+            {
+                this.beatmap = beatmap;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(LocalisationManager localisation)
+            {
+                CacheDrawnFrameBuffer = true;
+                RelativeSizeAxes = Axes.Both;
+
+                Children = new Drawable[]
                 {
-                    this.difficulty = difficulty;
-                }
-
-                [BackgroundDependencyLoader]
-                private void load(OsuColour colours)
-                {
-                    const float full_opacity_ratio = 0.7f;
-
-                    var difficultyColour = colours.ForDifficultyRating(difficulty.DifficultyRating);
-
-                    Children = new Drawable[]
+                    // We will create the white-to-black gradient by modulating transparency and having
+                    // a black backdrop. This results in an sRGB-space gradient and not linear space,
+                    // transitioning from white to black more perceptually uniformly.
+                    new Box
                     {
-                        new Box
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black,
+                    },
+                    // We use a container, such that we can set the colour gradient to go across the
+                    // vertices of the masked container instead of the vertices of the (larger) sprite.
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
+                        Children = new[]
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = difficultyColour,
-                            Width = full_opacity_ratio,
+                            // Zoomed-in and cropped beatmap background
+                            new BeatmapBackgroundSprite(beatmap)
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                FillMode = FillMode.Fill,
+                            },
                         },
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            RelativePositionAxes = Axes.Both,
-                            Colour = difficultyColour,
-                            Alpha = 0.5f,
-                            X = full_opacity_ratio,
-                            Width = 1 - full_opacity_ratio,
-                        }
-                    };
-                }
+                    },
+                };                
             }
         }
     }

From 6e72ee5f7647eb77b2cc1447e32baeb3d4c990c4 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 10:25:12 +0200
Subject: [PATCH 09333/10326] Added bindable stardifficulty to
 StarRatingDisplay

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 79 +++++++++++++------
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 64 +++++++++------
 2 files changed, 95 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index f7e50fdc8a..081b782034 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.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.Globalization;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -22,7 +24,11 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// </summary>
     public class StarRatingDisplay : CompositeDrawable
     {
-        private readonly StarDifficulty difficulty;
+        private CircularContainer colorContainer;
+        private OsuTextFlowContainer textContainer;
+
+        private readonly StarDifficulty starDifficulty;
+        private readonly IBindable<StarDifficulty?> bindableStarDifficulty;
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
@@ -30,14 +36,21 @@ namespace osu.Game.Screens.Ranking.Expanded
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
         public StarRatingDisplay(StarDifficulty starDifficulty)
         {
-            difficulty = starDifficulty;
+            this.starDifficulty = starDifficulty;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
+        /// <summary>
+        /// Creates a new <see cref="StarRatingDisplay"/> using a binded nullable <see cref="StarDifficulty"/>.
+        /// </summary>
+        /// <param name="starDifficulty">The binded nullable <see cref="StarDifficulty"/> to display the star difficulty of. If <c>null</c>, a new instance of <see cref="StarDifficulty"/> will be created </param>
+        public StarRatingDisplay(IBindable<StarDifficulty?> starDifficulty)
         {
-            AutoSizeAxes = Axes.Both;
+            bindableStarDifficulty = starDifficulty;
+        }
 
+        private void setDifficulty(OsuColour colours)
+        {
+            var difficulty = bindableStarDifficulty == null ? starDifficulty : bindableStarDifficulty.Value ?? new StarDifficulty();
             var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
             string wholePart = starRatingParts[0];
             string fractionPart = starRatingParts[1];
@@ -47,9 +60,36 @@ namespace osu.Game.Screens.Ranking.Expanded
                 ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
                 : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
 
+            colorContainer.Colour = backgroundColour;
+
+            textContainer.Text = string.Empty;
+
+            textContainer.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;
+                });
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
+        {
+            AutoSizeAxes = Axes.Both;
+
             InternalChildren = new Drawable[]
             {
-                new CircularContainer
+                colorContainer = new CircularContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Masking = true,
@@ -58,7 +98,6 @@ namespace osu.Game.Screens.Ranking.Expanded
                         new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = backgroundColour
                         },
                     }
                 },
@@ -78,32 +117,24 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        textContainer = 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;
-                            });
-                        })
+                        },
                     }
                 }
             };
+
+            if (bindableStarDifficulty != null)
+            {
+                bindableStarDifficulty.BindValueChanged(_ => setDifficulty(colours));
+            }
+
+            setDifficulty(colours);
         }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 0b72970bb0..9dccdd2897 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -105,7 +105,6 @@ namespace osu.Game.Screens.Select
 
                 beatmapDifficulty?.UnbindAll();
                 beatmapDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, cancellationSource.Token);
-                beatmapDifficulty.BindValueChanged(_ => updateDisplay());
 
                 updateDisplay();
             }
@@ -151,7 +150,7 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     Add(Background = loaded);
-                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
+                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty)
                     {
                         Shear = -Shear
                     });
@@ -176,15 +175,16 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
+            private Drawable starRatingDisplay;
             private Container bpmLabelContainer;
             private ModSettingChangeTracker settingChangeTracker;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
             private readonly IReadOnlyList<Mod> mods;
-            private readonly StarDifficulty starDifficulty;
+            private readonly IBindable<StarDifficulty?> starDifficulty;
 
-            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, IBindable<StarDifficulty?> difficulty)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
@@ -241,12 +241,13 @@ namespace osu.Game.Screens.Select
                         Shear = wedged_container_shear,
                         Children = new[]
                         {
-                            createStarRatingDisplay(starDifficulty).With(display =>
+                            starRatingDisplay = new StarRatingDisplay(starDifficulty)
                             {
-                                display.Anchor = Anchor.TopRight;
-                                display.Origin = Anchor.TopRight;
-                                display.Shear = -wedged_container_shear;
-                            }),
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                Margin = new MarginPadding { Bottom = 5 }
+                            },
                             StatusPill = new BeatmapSetOnlineStatusPill
                             {
                                 Anchor = Anchor.TopRight,
@@ -309,6 +310,18 @@ namespace osu.Game.Screens.Select
                 addInfoLabels();
             }
 
+            private void setStarRatingDisplayVisibility()
+            {
+                if (starDifficulty.Value.HasValue && starDifficulty.Value.Value.Stars > 0)
+                {
+                    starRatingDisplay.Show();
+                }
+                else
+                {
+                    starRatingDisplay.Hide();
+                }
+            }
+
             private InfoLabel[] getRulesetInfoLabels()
             {
                 try
@@ -420,18 +433,14 @@ namespace osu.Game.Screens.Select
                 };
             }
 
-            private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
-                ? new StarRatingDisplay(difficulty)
-                {
-                    Margin = new MarginPadding { Bottom = 5 }
-                }
-                : Empty();
-
             private class DifficultyColourBar : Container
             {
-                private readonly StarDifficulty difficulty;
+                private Box solidDifficultyBox;
+                private Box transparentDifficultyBox;
 
-                public DifficultyColourBar(StarDifficulty difficulty)
+                private readonly IBindable<StarDifficulty?> difficulty;
+
+                public DifficultyColourBar(IBindable<StarDifficulty?> difficulty)
                 {
                     this.difficulty = difficulty;
                 }
@@ -441,26 +450,33 @@ namespace osu.Game.Screens.Select
                 {
                     const float full_opacity_ratio = 0.7f;
 
-                    var difficultyColour = colours.ForDifficultyRating(difficulty.DifficultyRating);
-
                     Children = new Drawable[]
                     {
-                        new Box
+                        solidDifficultyBox = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = difficultyColour,
                             Width = full_opacity_ratio,
                         },
-                        new Box
+                        transparentDifficultyBox = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
                             RelativePositionAxes = Axes.Both,
-                            Colour = difficultyColour,
                             Alpha = 0.5f,
                             X = full_opacity_ratio,
                             Width = 1 - full_opacity_ratio,
                         }
                     };
+
+                    difficulty.BindValueChanged(_ => setColour(colours));
+                    setColour(colours);
+                }
+
+                private void setColour(OsuColour colours)
+                {
+                    var difficultyColour = colours.ForDifficultyRating(difficulty.Value?.DifficultyRating ?? (new StarDifficulty()).DifficultyRating);
+
+                    solidDifficultyBox.Colour = difficultyColour;
+                    transparentDifficultyBox.Colour = difficultyColour;
                 }
             }
 

From a683e5ec34cbbbf1fe08a4eafc1cbaeac7d0969a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 17:36:24 +0900
Subject: [PATCH 09334/10326] Seek using local method

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index f6b99c094f..e9a9c83119 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -105,9 +105,10 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
-            AdjustableSource.Seek(StartOffset);
-            AdjustableSource.Stop();
+            Seek(StartOffset);
 
+            // Manually stop the source in order to not affect the IsPaused state.
+            AdjustableSource.Stop();
 
             if (!IsPaused.Value)
                 Start();

From ddf1b560f3d4ba22884020838e59c40c50d1b4a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 18:18:50 +0900
Subject: [PATCH 09335/10326] Remove catcher fade during hyperdash

Closes https://github.com/ppy/osu/issues/12472.
---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 5d57e84b75..d045dcf16a 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -384,16 +384,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             updateTrailVisibility();
 
-            if (hyperDashing)
-            {
-                this.FadeColour(hyperDashColour, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-                this.FadeTo(0.2f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-            }
-            else
-            {
-                this.FadeColour(Color4.White, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-                this.FadeTo(1f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-            }
+            this.FadeColour(hyperDashing ? hyperDashColour : Color4.White, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
         }
 
         private void updateTrailVisibility() => trails.DisplayTrail = Dashing || HyperDashing;

From f11b068dee2b58a0160c138cfcb811e6f18a2ec0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 18:22:58 +0900
Subject: [PATCH 09336/10326] Allow faster roll speed selection in "Barrel
 Roll" mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index aee431284e..1587f97f46 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
         {
             MinValue = 0.02,
-            MaxValue = 4,
+            MaxValue = 12,
             Precision = 0.01,
         };
 

From ec080fcb32fdf2fa1ca7fd4b2d8db1c7a4d2ffc7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 18:25:46 +0900
Subject: [PATCH 09337/10326] Move seekOffset back to
 MasterGameplayClockContainer

---
 osu.Game/Screens/Play/GameplayClockContainer.cs      |  7 +------
 .../Screens/Play/MasterGameplayClockContainer.cs     | 12 +++++++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index e9a9c83119..5cd17d92c4 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -29,11 +29,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected readonly DecoupleableInterpolatingFramedClock AdjustableSource;
 
-        /// <summary>
-        /// The offset at which to start playing. Affects the time which the clock is reset to via <see cref="Reset"/>.
-        /// </summary>
-        protected virtual double StartOffset => 0;
-
         /// <summary>
         /// The source clock.
         /// </summary>
@@ -105,7 +100,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
-            Seek(StartOffset);
+            Seek(0);
 
             // Manually stop the source in order to not affect the IsPaused state.
             AdjustableSource.Stop();
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 1b893a76c5..affe24069d 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -47,9 +47,6 @@ namespace osu.Game.Screens.Play
 
         private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
 
-        protected override double StartOffset => startOffset;
-        private double startOffset;
-
         private readonly WorkingBeatmap beatmap;
         private readonly double gameplayStartTime;
         private readonly bool startAtGameplayStart;
@@ -59,6 +56,7 @@ namespace osu.Game.Screens.Play
         private FramedOffsetClock platformOffsetClock;
         private LocalGameplayClock localGameplayClock;
         private Bindable<double> userAudioOffset;
+        private double startOffset;
 
         public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
             : base(beatmap.Track)
@@ -94,6 +92,8 @@ namespace osu.Game.Screens.Play
                 if (beatmap.BeatmapInfo.AudioLeadIn > 0)
                     startOffset = Math.Min(startOffset, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
             }
+
+            Seek(startOffset);
         }
 
         protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
@@ -142,6 +142,12 @@ namespace osu.Game.Screens.Play
             Seek(skipTarget);
         }
 
+        public override void Reset()
+        {
+            base.Reset();
+            Seek(startOffset);
+        }
+
         protected override GameplayClock CreateGameplayClock(IFrameBasedClock source)
         {
             // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.

From f144661c31a729b6874fad1b720035e3e95d4d23 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 18:26:30 +0900
Subject: [PATCH 09338/10326] Fix storyboard sample test scene

---
 .../Gameplay/TestSceneStoryboardSamples.cs    | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 5b8abddd3f..bbab9ae94d 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
@@ -67,15 +68,17 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gameplayContainer = new MasterGameplayClockContainer(working, 0));
-
-                gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                Add(gameplayContainer = new MasterGameplayClockContainer(working, 0)
                 {
-                    Clock = gameplayContainer.GameplayClock
+                    IsPaused = { Value = true },
+                    Child = new FrameStabilityContainer
+                    {
+                        Child = sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                    }
                 });
             });
 
-            AddStep("start time", () => gameplayContainer.Start());
+            AddStep("reset clock", () => gameplayContainer.Start());
 
             AddUntilStep("sample played", () => sample.RequestedPlaying);
             AddUntilStep("sample has lifetime end", () => sample.LifetimeEnd < double.MaxValue);
@@ -92,11 +95,13 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gameplayContainer = new MasterGameplayClockContainer(working, 1000, true));
-
-                gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                Add(gameplayContainer = new MasterGameplayClockContainer(working, 1000, true)
                 {
-                    Clock = gameplayContainer.GameplayClock
+                    IsPaused = { Value = true },
+                    Child = new FrameStabilityContainer
+                    {
+                        Child = sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                    }
                 });
             });
 

From ac0ed72d043d339a856637a0a3675fe06f5280ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 18:36:11 +0900
Subject: [PATCH 09339/10326] Keep hitcircles aligned with view in "Barrel
 Roll" mod

---
 .../Mods/OsuModBarrelRoll.cs                  | 25 +++++++++++++++++--
 .../Objects/Drawables/DrawableHitCircle.cs    |  6 ++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index aee431284e..64b87f3977 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -1,20 +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.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 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 osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>
+    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToDrawableHitObjects
     {
+        private float currentRotation;
+
         [SettingSource("Roll speed", "Rotations per minute")]
         public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
         {
@@ -35,7 +40,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void Update(Playfield playfield)
         {
-            playfield.Rotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
+            playfield.Rotation = currentRotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
@@ -43,5 +48,21 @@ namespace osu.Game.Rulesets.Osu.Mods
             // scale the playfield to allow all hitobjects to stay within the visible region.
             drawableRuleset.Playfield.Scale = new Vector2(OsuPlayfield.BASE_SIZE.Y / OsuPlayfield.BASE_SIZE.X);
         }
+
+        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        {
+            foreach (var d in drawables)
+            {
+                d.OnUpdate += _ =>
+                {
+                    switch (d)
+                    {
+                        case DrawableHitCircle circle:
+                            circle.CirclePiece.Rotation = -currentRotation;
+                            break;
+                    }
+                };
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 189003875d..df77ec2693 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -66,7 +66,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                                 return true;
                             },
                         },
-                        CirclePiece = new SkinnableDrawable(new OsuSkinComponent(CirclePieceComponent), _ => new MainCirclePiece()),
+                        CirclePiece = new SkinnableDrawable(new OsuSkinComponent(CirclePieceComponent), _ => new MainCirclePiece())
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
                         ApproachCircle = new ApproachCircle
                         {
                             Alpha = 0,

From c5d6b6ea8d05578cfac4ae8697f15e37d8d84da3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 18:41:09 +0900
Subject: [PATCH 09340/10326] Fix tests failing intermittently

This was due to this code happening in UpdateAfterChildren(), after the
GCC has processed one frame. During this time, the clock could have
advanced an arbitrary amount.

The cause of this is the removal of the Task.Run() to set the clock in
Restart() (now called Reset()) which changed the timing, so it only worked before due to pure
luck.
---
 osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
index dccde366c2..f5f17a0bc1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
@@ -130,9 +130,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public double GameplayClockTime => GameplayClockContainer.GameplayClock.CurrentTime;
 
-            protected override void UpdateAfterChildren()
+            protected override void Update()
             {
-                base.UpdateAfterChildren();
+                base.Update();
 
                 if (!FirstFrameClockTime.HasValue)
                 {

From 4e6cd8082ea784ee4223f2f36e7c05f1253aeac5 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 12:00:04 +0200
Subject: [PATCH 09341/10326] WIP refresh BPM-Label on mod change

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 27 +++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 9dccdd2897..b3aa4f0ba5 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     Add(Background = loaded);
-                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty)
+                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods, beatmapDifficulty)
                     {
                         Shear = -Shear
                     });
@@ -181,10 +181,10 @@ namespace osu.Game.Screens.Select
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
-            private readonly IReadOnlyList<Mod> mods;
+            private readonly IBindable<IReadOnlyList<Mod>> mods;
             private readonly IBindable<StarDifficulty?> starDifficulty;
 
-            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, IBindable<StarDifficulty?> difficulty)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IBindable<IReadOnlyList<Mod>> mods, IBindable<StarDifficulty?> difficulty)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
@@ -300,14 +300,16 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
+                addInfoLabels();
+
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
+                starDifficulty.BindValueChanged(_ => setStarRatingDisplayVisibility(), true);
 
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
 
-                addInfoLabels();
             }
 
             private void setStarRatingDisplayVisibility()
@@ -349,7 +351,7 @@ namespace osu.Game.Screens.Select
                 return Array.Empty<InfoLabel>();
             }
 
-            private void refreshBPMLabel()
+            private void refreshBPMLabel(IReadOnlyList<Mod> mods)
             {
                 var b = beatmap.Beatmap;
                 if (b == null)
@@ -407,10 +409,16 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
-                settingChangeTracker = new ModSettingChangeTracker(mods);
-                settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
+                // this is currently not triggering when a mod gets (de)selected
+                mods.BindValueChanged(mods => refreshModInformation(mods), true);
+            }
 
-                refreshBPMLabel();
+            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
+            {
+                settingChangeTracker?.Dispose();
+                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
+                refreshBPMLabel(mods.Value);
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)
@@ -467,8 +475,7 @@ namespace osu.Game.Screens.Select
                         }
                     };
 
-                    difficulty.BindValueChanged(_ => setColour(colours));
-                    setColour(colours);
+                    difficulty.BindValueChanged(_ => setColour(colours), true);
                 }
 
                 private void setColour(OsuColour colours)

From c5d35ab78733cdd64322467e378474e526096a83 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 12:35:31 +0200
Subject: [PATCH 09342/10326] removed mods binding passthrough

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index b3aa4f0ba5..c308f14f74 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -41,9 +41,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        [Resolved]
-        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
-
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
 
@@ -150,7 +147,7 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     Add(Background = loaded);
-                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods, beatmapDifficulty)
+                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, beatmapDifficulty)
                     {
                         Shear = -Shear
                     });
@@ -172,6 +169,9 @@ namespace osu.Game.Screens.Select
             public OsuSpriteText VersionLabel { get; private set; }
             public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
 
+            [Resolved]
+            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
@@ -181,14 +181,12 @@ namespace osu.Game.Screens.Select
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
-            private readonly IBindable<IReadOnlyList<Mod>> mods;
             private readonly IBindable<StarDifficulty?> starDifficulty;
 
-            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IBindable<IReadOnlyList<Mod>> mods, IBindable<StarDifficulty?> difficulty)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IBindable<StarDifficulty?> difficulty)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
-                this.mods = mods;
                 starDifficulty = difficulty;
             }
 
@@ -409,7 +407,6 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
-                // this is currently not triggering when a mod gets (de)selected
                 mods.BindValueChanged(mods => refreshModInformation(mods), true);
             }
 
@@ -418,7 +415,7 @@ namespace osu.Game.Screens.Select
                 settingChangeTracker?.Dispose();
                 settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
                 settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
-                refreshBPMLabel(mods.Value);
+                refreshBPMLabel(modsChangedEvent.NewValue);
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)

From 5262d94e21e630c794c8a6356d12f44f38ce33a0 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:21:57 +0200
Subject: [PATCH 09343/10326] Fix wrong assert in offscreen test

---
 .../Editor/Checks/CheckOffscreenObjectsTest.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 3a4817398c..6139b0e676 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
         [Test]
         public void TestSliderNearEdgeStackedOffscreen()
         {
-            assertOk(new Beatmap<HitObject>
+            assertOffscreenSlider(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {

From 6a1e4ff99f41091d04f82bb721525af410eb10b7 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:28:32 +0200
Subject: [PATCH 09344/10326] Add file hash to file presence test

Necessary because we now find the storage path of the file rather than just the file itself.
---
 osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
index fe2e16ffd8..f6e875a8fc 100644
--- a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.IO;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Tests.Beatmaps;
@@ -30,7 +31,11 @@ namespace osu.Game.Tests.Editing.Checks
                     {
                         Files = new List<BeatmapSetFileInfo>(new[]
                         {
-                            new BeatmapSetFileInfo { Filename = "abc123.jpg" }
+                            new BeatmapSetFileInfo
+                            {
+                                Filename = "abc123.jpg",
+                                FileInfo = new FileInfo { Hash = "abcdef" }
+                            }
                         })
                     }
                 }

From c0318a4d3ef401f4b3288d14ac4188f995a5f0d1 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:29:14 +0200
Subject: [PATCH 09345/10326] Fix usage of _ in Moq lambdas

---
 osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs | 10 +++++-----
 .../Editing/Checks/CheckBackgroundQualityTest.cs       |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
index e73d9adfb0..7658ca728d 100644
--- a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.Metadata.AudioFile = null;
 
             var mock = new Mock<IWorkingBeatmap>();
-            mock.SetupGet(_ => _.Beatmap).Returns(beatmap);
-            mock.SetupGet(_ => _.Track).Returns((Track)null);
+            mock.SetupGet(w => w.Beatmap).Returns(beatmap);
+            mock.SetupGet(w => w.Track).Returns((Track)null);
 
             Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
         }
@@ -102,11 +102,11 @@ namespace osu.Game.Tests.Editing.Checks
         private Mock<IWorkingBeatmap> getMockWorkingBeatmap(int? audioBitrate)
         {
             var mockTrack = new Mock<Track>();
-            mockTrack.SetupGet(_ => _.Bitrate).Returns(audioBitrate);
+            mockTrack.SetupGet(t => t.Bitrate).Returns(audioBitrate);
 
             var mockWorkingBeatmap = new Mock<IWorkingBeatmap>();
-            mockWorkingBeatmap.SetupGet(_ => _.Beatmap).Returns(beatmap);
-            mockWorkingBeatmap.SetupGet(_ => _.Track).Returns(mockTrack.Object);
+            mockWorkingBeatmap.SetupGet(w => w.Beatmap).Returns(beatmap);
+            mockWorkingBeatmap.SetupGet(w => w.Track).Returns(mockTrack.Object);
 
             return mockWorkingBeatmap;
         }
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index b6970a99e4..f0f972d2fa 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -120,9 +120,9 @@ namespace osu.Game.Tests.Editing.Checks
             var stream = new MemoryStream(fileBytes ?? new byte[1024 * 1024]);
 
             var mock = new Mock<IWorkingBeatmap>();
-            mock.SetupGet(_ => _.Beatmap).Returns(beatmap);
-            mock.SetupGet(_ => _.Background).Returns(background);
-            mock.Setup(_ => _.GetStream(It.IsAny<string>())).Returns(stream);
+            mock.SetupGet(w => w.Beatmap).Returns(beatmap);
+            mock.SetupGet(w => w.Background).Returns(background);
+            mock.Setup(w => w.GetStream(It.IsAny<string>())).Returns(stream);
 
             return mock;
         }

From 3e1b6b3b346ea449a3504eb71961f7446bf84379 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:34:12 +0200
Subject: [PATCH 09346/10326] Simplify verifier run call args

Uses the resolved working beatmap instead of resolving it every time.

Also uses the EditorBeatmap itself as playable beatmap, as it is of type `IBeatmap` already, and `.PlayableBeatmap` forwards everything anyway.
---
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 530f24300b..9de1f04271 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Edit.Verify
             private EditorClock clock { get; set; }
 
             [Resolved]
-            private BeatmapManager beatmapManager { get; set; }
+            private IBindable<WorkingBeatmap> workingBeatmap { get; set; }
 
             [Resolved]
             private EditorBeatmap beatmap { get; set; }
@@ -122,11 +122,10 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void refresh()
             {
-                var workingBeatmap = beatmapManager.GetWorkingBeatmap(beatmap.BeatmapInfo);
-                var issues = generalVerifier.Run(beatmap.PlayableBeatmap, workingBeatmap);
+                var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
 
                 if (rulesetVerifier != null)
-                    issues = issues.Concat(rulesetVerifier.Run(beatmap.PlayableBeatmap, workingBeatmap));
+                    issues = issues.Concat(rulesetVerifier.Run(beatmap, workingBeatmap.Value));
 
                 table.Issues = issues
                                .OrderBy(issue => issue.Template.Type)

From d7a81471c85a4aff21279974092847c4331355aa Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:40:38 +0200
Subject: [PATCH 09347/10326] Add xmldoc to `GetPathForFile`

---
 osu.Game/Beatmaps/BeatmapSetInfo.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index 774bd0bc62..d90ede5d4b 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -59,6 +59,10 @@ namespace osu.Game.Beatmaps
 
         public string StoryboardFile => Files?.Find(f => f.Filename.EndsWith(".osb", StringComparison.OrdinalIgnoreCase))?.Filename;
 
+        /// <summary>
+        /// Returns the storage path for the file in this beatmapset with the given filename, if any exists, otherwise null.
+        /// </summary>
+        /// <param name="filename">The name of the file to get the storage path of.</param>
         public string GetPathForFile(string filename) => Files?.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
 
         public List<BeatmapSetFileInfo> Files { get; set; }

From e9dfa2860a4fd63f61f0ad2a26d9677d6b4498fb Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:44:06 +0200
Subject: [PATCH 09348/10326] Add xmldoc note about path being relative

---
 osu.Game/Beatmaps/BeatmapSetInfo.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index d90ede5d4b..1ce42535a0 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -61,6 +61,7 @@ namespace osu.Game.Beatmaps
 
         /// <summary>
         /// Returns the storage path for the file in this beatmapset with the given filename, if any exists, otherwise null.
+        /// The path returned is relative to the user file storage.
         /// </summary>
         /// <param name="filename">The name of the file to get the storage path of.</param>
         public string GetPathForFile(string filename) => Files?.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;

From f799a6e733e0d2075f7feafd9333cfaf5c604fad Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 14:18:41 +0200
Subject: [PATCH 09349/10326] Removed StarDifficulty binding passthrough

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 42 +++++++----
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 69 ++++++++++---------
 2 files changed, 67 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 081b782034..1aa8f5ca73 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -24,11 +25,16 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// </summary>
     public class StarRatingDisplay : CompositeDrawable
     {
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         private CircularContainer colorContainer;
         private OsuTextFlowContainer textContainer;
+        private CancellationTokenSource cancellationTokenSource;
+        private IBindable<StarDifficulty?> bindableStarDifficulty;
 
         private readonly StarDifficulty starDifficulty;
-        private readonly IBindable<StarDifficulty?> bindableStarDifficulty;
+        private readonly BeatmapInfo beatmapInfo;
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
@@ -40,17 +46,16 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         /// <summary>
-        /// Creates a new <see cref="StarRatingDisplay"/> using a binded nullable <see cref="StarDifficulty"/>.
+        /// Creates a new <see cref="StarRatingDisplay"/> using a <see cref="BeatmapInfo"/> to use a bindable for the difficulty. 
         /// </summary>
-        /// <param name="starDifficulty">The binded nullable <see cref="StarDifficulty"/> to display the star difficulty of. If <c>null</c>, a new instance of <see cref="StarDifficulty"/> will be created </param>
-        public StarRatingDisplay(IBindable<StarDifficulty?> starDifficulty)
+        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to use to create a bindable for <see cref="StarDifficulty"/></param>
+        public StarRatingDisplay(BeatmapInfo beatmapInfo)
         {
-            bindableStarDifficulty = starDifficulty;
+            this.beatmapInfo = beatmapInfo;
         }
 
-        private void setDifficulty(OsuColour colours)
+        private void setDifficulty(StarDifficulty difficulty)
         {
-            var difficulty = bindableStarDifficulty == null ? starDifficulty : bindableStarDifficulty.Value ?? new StarDifficulty();
             var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
             string wholePart = starRatingParts[0];
             string fractionPart = starRatingParts[1];
@@ -83,8 +88,17 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
+        private void load(BeatmapDifficultyCache difficultyCache)
         {
+            if (beatmapInfo != null)
+            {
+                cancellationTokenSource?.Cancel();
+                cancellationTokenSource = new CancellationTokenSource();
+
+                bindableStarDifficulty?.UnbindAll();
+                bindableStarDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
+            }
+
             AutoSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
@@ -130,11 +144,15 @@ namespace osu.Game.Screens.Ranking.Expanded
             };
 
             if (bindableStarDifficulty != null)
-            {
-                bindableStarDifficulty.BindValueChanged(_ => setDifficulty(colours));
-            }
+                bindableStarDifficulty.BindValueChanged(valueChanged => setDifficulty(valueChanged.NewValue ?? new StarDifficulty()), true);
+            else
+                setDifficulty(starDifficulty);
+        }
 
-            setDifficulty(colours);
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            cancellationTokenSource?.Cancel();
         }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index c308f14f74..e3afd53210 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -41,11 +41,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        [Resolved]
-        private BeatmapDifficultyCache difficultyCache { get; set; }
-
-        private IBindable<StarDifficulty?> beatmapDifficulty;
-
         protected BufferedWedgeBackground Background;
         protected WedgeInfoText Info;
 
@@ -87,8 +82,6 @@ namespace osu.Game.Screens.Select
 
         private WorkingBeatmap beatmap;
 
-        private CancellationTokenSource cancellationSource;
-
         public WorkingBeatmap Beatmap
         {
             get => beatmap;
@@ -97,12 +90,6 @@ namespace osu.Game.Screens.Select
                 if (beatmap == value) return;
 
                 beatmap = value;
-                cancellationSource?.Cancel();
-                cancellationSource = new CancellationTokenSource();
-
-                beatmapDifficulty?.UnbindAll();
-                beatmapDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, cancellationSource.Token);
-
                 updateDisplay();
             }
         }
@@ -147,7 +134,7 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     Add(Background = loaded);
-                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, beatmapDifficulty)
+                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value)
                     {
                         Shear = -Shear
                     });
@@ -158,7 +145,6 @@ namespace osu.Game.Screens.Select
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            cancellationSource?.Cancel();
         }
 
         public class WedgeInfoText : Container
@@ -178,24 +164,30 @@ namespace osu.Game.Screens.Select
             private Drawable starRatingDisplay;
             private Container bpmLabelContainer;
             private ModSettingChangeTracker settingChangeTracker;
+            private CancellationTokenSource cancellationTokenSource;
+            private IBindable<StarDifficulty?> starDifficulty;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
-            private readonly IBindable<StarDifficulty?> starDifficulty;
 
-            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IBindable<StarDifficulty?> difficulty)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
-                starDifficulty = difficulty;
             }
 
             [BackgroundDependencyLoader]
-            private void load(LocalisationManager localisation)
+            private void load(LocalisationManager localisation, BeatmapDifficultyCache difficultyCache)
             {
                 var beatmapInfo = beatmap.BeatmapInfo;
                 var metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
+                cancellationTokenSource?.Cancel();
+                cancellationTokenSource = new CancellationTokenSource();
+
+                starDifficulty?.UnbindAll();
+                starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
+
                 RelativeSizeAxes = Axes.Both;
 
                 titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
@@ -203,7 +195,7 @@ namespace osu.Game.Screens.Select
 
                 Children = new Drawable[]
                 {
-                    new DifficultyColourBar(starDifficulty)
+                    new DifficultyColourBar(beatmapInfo)
                     {
                         RelativeSizeAxes = Axes.Y,
                         Width = 20,
@@ -239,7 +231,7 @@ namespace osu.Game.Screens.Select
                         Shear = wedged_container_shear,
                         Children = new[]
                         {
-                            starRatingDisplay = new StarRatingDisplay(starDifficulty)
+                            starRatingDisplay = new StarRatingDisplay(beatmapInfo)
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
@@ -313,13 +305,9 @@ namespace osu.Game.Screens.Select
             private void setStarRatingDisplayVisibility()
             {
                 if (starDifficulty.Value.HasValue && starDifficulty.Value.Value.Stars > 0)
-                {
                     starRatingDisplay.Show();
-                }
                 else
-                {
                     starRatingDisplay.Hide();
-                }
             }
 
             private InfoLabel[] getRulesetInfoLabels()
@@ -440,21 +428,32 @@ namespace osu.Game.Screens.Select
 
             private class DifficultyColourBar : Container
             {
+                [Resolved]
+                private OsuColour colours { get; set; }
+
                 private Box solidDifficultyBox;
                 private Box transparentDifficultyBox;
+                private CancellationTokenSource cancellationTokenSource;
+                private IBindable<StarDifficulty?> starDifficulty;
 
-                private readonly IBindable<StarDifficulty?> difficulty;
+                private readonly BeatmapInfo beatmapInfo;
 
-                public DifficultyColourBar(IBindable<StarDifficulty?> difficulty)
+                public DifficultyColourBar(BeatmapInfo beatmapInfo)
                 {
-                    this.difficulty = difficulty;
+                    this.beatmapInfo = beatmapInfo;
                 }
 
                 [BackgroundDependencyLoader]
-                private void load(OsuColour colours)
+                private void load(BeatmapDifficultyCache difficultyCache)
                 {
                     const float full_opacity_ratio = 0.7f;
 
+                    cancellationTokenSource?.Cancel();
+                    cancellationTokenSource = new CancellationTokenSource();
+
+                    starDifficulty?.UnbindAll();
+                    starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
+
                     Children = new Drawable[]
                     {
                         solidDifficultyBox = new Box
@@ -472,16 +471,22 @@ namespace osu.Game.Screens.Select
                         }
                     };
 
-                    difficulty.BindValueChanged(_ => setColour(colours), true);
+                    starDifficulty.BindValueChanged(valueChangedEvent => setColour(valueChangedEvent), true);
                 }
 
-                private void setColour(OsuColour colours)
+                private void setColour(ValueChangedEvent<StarDifficulty?> valueChanged)
                 {
-                    var difficultyColour = colours.ForDifficultyRating(difficulty.Value?.DifficultyRating ?? (new StarDifficulty()).DifficultyRating);
+                    var difficultyColour = colours.ForDifficultyRating(valueChanged.NewValue?.DifficultyRating ?? (new StarDifficulty()).DifficultyRating);
 
                     solidDifficultyBox.Colour = difficultyColour;
                     transparentDifficultyBox.Colour = difficultyColour;
                 }
+
+                protected override void Dispose(bool isDisposing)
+                {
+                    base.Dispose(isDisposing);
+                    cancellationTokenSource?.Cancel();
+                }
             }
 
             public class InfoLabel : Container, IHasTooltip

From a9e4a0ed50dcfbd81487afbc14ba10fd8cd7463f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 21:17:24 +0900
Subject: [PATCH 09350/10326] Fix potentially starting play when finished

The UserFinishedPlaying event may trigger before the event is subscribed
to by SpectatorScreen. For such cases, an extra check is done to make
sure the user is _actually_ playing.
---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index f554b15abf..ed01d56801 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -127,6 +127,10 @@ namespace osu.Game.Screens.Spectate
                 if (!userMap.ContainsKey(userId))
                     return;
 
+                // The user may have stopped playing.
+                if (!spectatorClient.TryGetPlayingUserState(userId, out _))
+                    return;
+
                 Schedule(() => OnUserStateChanged(userId, state));
 
                 updateGameplayState(userId);

From 4cc3321d54b2e2e57ebb09b1cb240135d421ec4d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 21:20:08 +0900
Subject: [PATCH 09351/10326] Fix potential doubling of events

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 13b12d9add..378096c7fb 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -303,13 +303,14 @@ namespace osu.Game.Online.Spectator
         /// <param name="runOnceImmediately">Whether the action provided in <paramref name="callback"/> should be run once immediately for all users currently playing.</param>
         public void BindUserBeganPlaying(Action<int, SpectatorState> callback, bool runOnceImmediately = false)
         {
-            OnUserBeganPlaying += callback;
-
-            if (!runOnceImmediately)
-                return;
-
+            // The lock is taken before the event is subscribed to to prevent doubling of events.
             lock (userLock)
             {
+                OnUserBeganPlaying += callback;
+
+                if (!runOnceImmediately)
+                    return;
+
                 foreach (var (userId, state) in playingUserStates)
                     callback(userId, state);
             }

From df29e61147fd45f0f310453c19393266d10609dd Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 14:22:49 +0200
Subject: [PATCH 09352/10326] Fix CodeFactor error

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index e3afd53210..44dbd5a5c6 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -299,7 +299,6 @@ namespace osu.Game.Screens.Select
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
-
             }
 
             private void setStarRatingDisplayVisibility()

From 583754b22a430dba73db9688d106dd7d734d6be4 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 14:29:53 +0200
Subject: [PATCH 09353/10326] Removed unnecessary whitespaces

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 44dbd5a5c6..7cb6f2caf3 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -598,7 +598,7 @@ namespace osu.Game.Screens.Select
                             },
                         },
                     },
-                };                
+                };
             }
         }
     }

From e9571b72cf149a1941717bd1a1e9a22015feca20 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 14:53:35 +0200
Subject: [PATCH 09354/10326] Fixed InspectCode

---
 osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs | 3 +--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs            | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 1aa8f5ca73..a3e9336648 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.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.Globalization;
 using System.Threading;
 using osu.Framework.Allocation;
@@ -46,7 +45,7 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         /// <summary>
-        /// Creates a new <see cref="StarRatingDisplay"/> using a <see cref="BeatmapInfo"/> to use a bindable for the difficulty. 
+        /// Creates a new <see cref="StarRatingDisplay"/> using a <see cref="BeatmapInfo"/> to use a bindable for the difficulty.
         /// </summary>
         /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to use to create a bindable for <see cref="StarDifficulty"/></param>
         public StarRatingDisplay(BeatmapInfo beatmapInfo)
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 7cb6f2caf3..9077c115d4 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -142,11 +142,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-        }
-
         public class WedgeInfoText : Container
         {
             public FillFlowContainer MapperContainer { get; private set; }
@@ -394,7 +389,7 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
-                mods.BindValueChanged(mods => refreshModInformation(mods), true);
+                mods.BindValueChanged(refreshModInformation, true);
             }
 
             private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
@@ -470,7 +465,7 @@ namespace osu.Game.Screens.Select
                         }
                     };
 
-                    starDifficulty.BindValueChanged(valueChangedEvent => setColour(valueChangedEvent), true);
+                    starDifficulty.BindValueChanged(setColour, true);
                 }
 
                 private void setColour(ValueChangedEvent<StarDifficulty?> valueChanged)

From 7fc450c620eba103fc96a716edd149c9e15e790a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 23:42:53 +0900
Subject: [PATCH 09355/10326] Fix mod settings blocking input outside its
 visible area

Closes #12502.
---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 26b8632d7f..754b260bf0 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -245,15 +245,21 @@ namespace osu.Game.Overlays.Mods
                                             },
                                         }
                                     },
-                                    ModSettingsContainer = new ModSettingsContainer
+                                    new Container
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         Anchor = Anchor.BottomRight,
                                         Origin = Anchor.BottomRight,
-                                        Width = 0.3f,
-                                        Alpha = 0,
                                         Padding = new MarginPadding(30),
-                                        SelectedMods = { BindTarget = SelectedMods },
+                                        Width = 0.3f,
+                                        Children = new Drawable[]
+                                        {
+                                            ModSettingsContainer = new ModSettingsContainer
+                                            {
+                                                Alpha = 0,
+                                                SelectedMods = { BindTarget = SelectedMods },
+                                            },
+                                        }
                                     },
                                 }
                             },

From 4910d8f56cd04339773ec2ae4ca288dcc9324839 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 23:57:12 +0900
Subject: [PATCH 09356/10326] Fix click-to-resume cursor location being
 incorrect when playfield is transformed

Closes #12501.
---
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index 44ca5e850f..27d48d1296 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Osu.UI
             base.PopIn();
 
             GameplayCursor.ActiveCursor.Hide();
-            cursorScaleContainer.MoveTo(GameplayCursor.ActiveCursor.Position);
+            cursorScaleContainer.Position = ToLocalSpace(GameplayCursor.ActiveCursor.ScreenSpaceDrawQuad.Centre);
             clickToResumeCursor.Appear();
 
             if (localCursorContainer == null)

From 881043bc5d8d8a76d3fd54c9a389adc83472ee61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Apr 2021 19:05:43 +0200
Subject: [PATCH 09357/10326] Fix failing test after mod settings layout
 changes

The slight hack which was used in the test to ensure that the mod
settings overlay covered the entire width of the mod overlay broke after
adjustments to the layout in the previous commit.

Locally adjust the hack to use the parent of the `ModSettingsContainer`
rather than the container itself.
---
 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 2158cf77e5..bda1973354 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -167,7 +167,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 GetModButton(mod).SelectNext(1);
 
             public void SetModSettingsWidth(float newWidth) =>
-                ModSettingsContainer.Width = newWidth;
+                ModSettingsContainer.Parent.Width = newWidth;
         }
 
         public class TestRulesetInfo : RulesetInfo

From e80c3c317a34b989dc18a9d904d39da724c828f3 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 09:14:22 +0900
Subject: [PATCH 09358/10326] Rename UnmanagedHitObjectEntry ->
 SyntheticHitObjectEntry

"Unmanaged" was confusing because its lifetime is still managed by the HitObjectContainer.
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs      | 4 ++--
 ...{UnmanagedHitObjectEntry.cs => SyntheticHitObjectEntry.cs} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Rulesets/Objects/{UnmanagedHitObjectEntry.cs => SyntheticHitObjectEntry.cs} (81%)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index d798eba4e1..ca1c601c1d 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             if (initialHitObject != null)
             {
-                lifetimeEntry = new UnmanagedHitObjectEntry(initialHitObject);
+                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject);
                 ensureEntryHasResult();
             }
         }
@@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (hitObject == null)
                 throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
-            Apply(new UnmanagedHitObjectEntry(hitObject));
+            Apply(new SyntheticHitObjectEntry(hitObject));
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
similarity index 81%
rename from osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
rename to osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
index 3cfa3c4d3a..76f9eaf25a 100644
--- a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
+++ b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
@@ -9,9 +9,9 @@ namespace osu.Game.Rulesets.Objects
     /// Created for a <see cref="DrawableHitObject"/> when only <see cref="HitObject"/> is given
     /// to make sure a <see cref="DrawableHitObject"/> is always associated with a <see cref="HitObjectLifetimeEntry"/>.
     /// </summary>
-    internal class UnmanagedHitObjectEntry : HitObjectLifetimeEntry
+    internal class SyntheticHitObjectEntry : HitObjectLifetimeEntry
     {
-        public UnmanagedHitObjectEntry(HitObject hitObject)
+        public SyntheticHitObjectEntry(HitObject hitObject)
             : base(hitObject)
         {
         }

From 67fcfd9dbc243a8ffe976410729efeb94c06336d Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 09:48:16 +0900
Subject: [PATCH 09359/10326] Fix wrong InitialLifetimeOffset is used for a
 non-pooled DHO.

HitObjectLifetimeEntry's InitialLifetimeOffset is different from DrawableHitObject's InitialLifetimeOffset.
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 ++--
 osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs      | 9 +++++++--
 osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs     | 6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ca1c601c1d..4eea058163 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             if (initialHitObject != null)
             {
-                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject);
+                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject, initialHitObject.StartTime - InitialLifetimeOffset);
                 ensureEntryHasResult();
             }
         }
@@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (hitObject == null)
                 throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
-            Apply(new SyntheticHitObjectEntry(hitObject));
+            Apply(new SyntheticHitObjectEntry(hitObject, hitObject.StartTime - InitialLifetimeOffset));
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 1954d7e6d2..d1d459a8f6 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -30,12 +30,17 @@ namespace osu.Game.Rulesets.Objects
         /// Creates a new <see cref="HitObjectLifetimeEntry"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to store the lifetime of.</param>
-        public HitObjectLifetimeEntry(HitObject hitObject)
+        /// <param name="lifetimeStart">The <see cref="LifetimeStart"/>.</param>
+        /// <param name="lifetimeEnd">The <see cref="LifetimeEnd"/>.</param>
+        public HitObjectLifetimeEntry(HitObject hitObject, double lifetimeStart = double.MinValue, double lifetimeEnd = double.MaxValue)
         {
             HitObject = hitObject;
 
             startTimeBindable.BindTo(HitObject.StartTimeBindable);
-            startTimeBindable.BindValueChanged(onStartTimeChanged, true);
+            // Only set initial lifetime if it is not provided
+            startTimeBindable.BindValueChanged(onStartTimeChanged, lifetimeStart == double.MinValue);
+
+            setLifetime(lifetimeStart, lifetimeEnd);
         }
 
         // The lifetime start, as set by the hitobject.
diff --git a/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
index 76f9eaf25a..c064f3ff10 100644
--- a/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
+++ b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.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.
 
+#nullable enable
+
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Objects
@@ -11,8 +13,8 @@ namespace osu.Game.Rulesets.Objects
     /// </summary>
     internal class SyntheticHitObjectEntry : HitObjectLifetimeEntry
     {
-        public SyntheticHitObjectEntry(HitObject hitObject)
-            : base(hitObject)
+        public SyntheticHitObjectEntry(HitObject hitObject, double initialLifetimeStart)
+            : base(hitObject, initialLifetimeStart)
         {
         }
     }

From 44ff08cce4675e40492364633a1917608f7c908b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 10:02:50 +0900
Subject: [PATCH 09360/10326] Revert "Fix wrong InitialLifetimeOffset is used
 for a non-pooled DHO."

This reverts commit 67fcfd9d
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 ++--
 osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs      | 9 ++-------
 osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs     | 6 ++----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 4eea058163..ca1c601c1d 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             if (initialHitObject != null)
             {
-                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject, initialHitObject.StartTime - InitialLifetimeOffset);
+                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject);
                 ensureEntryHasResult();
             }
         }
@@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (hitObject == null)
                 throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
-            Apply(new SyntheticHitObjectEntry(hitObject, hitObject.StartTime - InitialLifetimeOffset));
+            Apply(new SyntheticHitObjectEntry(hitObject));
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index d1d459a8f6..1954d7e6d2 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -30,17 +30,12 @@ namespace osu.Game.Rulesets.Objects
         /// Creates a new <see cref="HitObjectLifetimeEntry"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to store the lifetime of.</param>
-        /// <param name="lifetimeStart">The <see cref="LifetimeStart"/>.</param>
-        /// <param name="lifetimeEnd">The <see cref="LifetimeEnd"/>.</param>
-        public HitObjectLifetimeEntry(HitObject hitObject, double lifetimeStart = double.MinValue, double lifetimeEnd = double.MaxValue)
+        public HitObjectLifetimeEntry(HitObject hitObject)
         {
             HitObject = hitObject;
 
             startTimeBindable.BindTo(HitObject.StartTimeBindable);
-            // Only set initial lifetime if it is not provided
-            startTimeBindable.BindValueChanged(onStartTimeChanged, lifetimeStart == double.MinValue);
-
-            setLifetime(lifetimeStart, lifetimeEnd);
+            startTimeBindable.BindValueChanged(onStartTimeChanged, true);
         }
 
         // The lifetime start, as set by the hitobject.
diff --git a/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
index c064f3ff10..76f9eaf25a 100644
--- a/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
+++ b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.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.
 
-#nullable enable
-
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Objects
@@ -13,8 +11,8 @@ namespace osu.Game.Rulesets.Objects
     /// </summary>
     internal class SyntheticHitObjectEntry : HitObjectLifetimeEntry
     {
-        public SyntheticHitObjectEntry(HitObject hitObject, double initialLifetimeStart)
-            : base(hitObject, initialLifetimeStart)
+        public SyntheticHitObjectEntry(HitObject hitObject)
+            : base(hitObject)
         {
         }
     }

From 9d423201edb4eebdc23fe141830773db5b2729f8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 10:29:18 +0900
Subject: [PATCH 09361/10326] Fix slider tails wiggling independently

---
 osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
index 9c5e41f245..123bbe12de 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             // Wiggle the repeat points with the slider instead of independently.
             // Also fixes an issue with repeat points being positioned incorrectly.
-            if (osuObject is SliderRepeat)
+            if (osuObject is SliderRepeat || osuObject is SliderTailCircle)
                 return;
 
             Random objRand = new Random((int)osuObject.StartTime);

From e454037d82e5883e2419203ccb98a983e333cece Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 10:32:08 +0900
Subject: [PATCH 09362/10326] Add to comment

---
 osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
index 123bbe12de..a01cec4bb3 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             var osuObject = (OsuHitObject)drawable.HitObject;
             Vector2 origin = drawable.Position;
 
-            // Wiggle the repeat points with the slider instead of independently.
+            // Wiggle the repeat points and the tail with the slider instead of independently.
             // Also fixes an issue with repeat points being positioned incorrectly.
             if (osuObject is SliderRepeat || osuObject is SliderTailCircle)
                 return;

From 73d3da168769bf884ec876cdf888aa6f118a8dcb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 11:32:01 +0900
Subject: [PATCH 09363/10326] Fix wrong InitialLifetimeOffset is used for a
 non-pooled DHO.

HitObjectLifetimeEntry's InitialLifetimeOffset is different from DrawableHitObject's InitialLifetimeOffset.
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ca1c601c1d..d0fa7eb22f 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -239,6 +239,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             lifetimeEntry = newEntry;
 
+            // LifetimeStart is already computed using HitObjectLifetimeEntry's InitialLifetimeOffset.
+            // We override this with DHO's InitialLifetimeOffset for a non-pooled DHO.
+            if (newEntry is SyntheticHitObjectEntry)
+                lifetimeEntry.LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
+
             LifetimeStart = lifetimeEntry.LifetimeStart;
             LifetimeEnd = lifetimeEntry.LifetimeEnd;
 

From 3fbeadf31847cd87aef622e7ddba08cbb253f9ec Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 14:32:37 +0900
Subject: [PATCH 09364/10326] Deprecate old overload of Apply

---
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs    | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs   | 2 +-
 osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs | 4 ++--
 .../TestSceneDrumRollApplication.cs                          | 4 ++--
 osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs     | 4 ++--
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs     | 5 +----
 osu.Game/Rulesets/UI/Playfield.cs                            | 2 +-
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs
index 5fc1082743..8b3fead366 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 Position = new Vector2(128, 128),
                 ComboIndex = 1,
-            }), null));
+            })));
         }
 
         private HitCircle prepareObject(HitCircle circle)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
index aac6db60fe..e698766aac 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     new Vector2(300, 0),
                 }),
                 RepeatCount = 1
-            }), null));
+            })));
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
index d7fbc7ac48..8c97c02049 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Position = new Vector2(256, 192),
                 ComboIndex = 1,
                 Duration = 1000,
-            }), null));
+            })));
 
             AddAssert("rotation is reset", () => dho.Result.RateAdjustedRotation == 0);
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
index a970965141..f33c738b04 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             {
                 StartTime = 400,
                 Major = true
-            }), null));
+            })));
             AddHitObject(barLine);
             RemoveHitObject(barLine);
 
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             {
                 StartTime = 200,
                 Major = false
-            }), null));
+            })));
             AddHitObject(barLine);
         }
     }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs
index 54450e27db..c389a05566 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Duration = 500,
                 IsStrong = false,
                 TickRate = 2
-            }), null));
+            })));
 
             AddHitObject(drumRoll);
             RemoveHitObject(drumRoll);
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Duration = 400,
                 IsStrong = true,
                 TickRate = 16
-            }), null));
+            })));
 
             AddHitObject(drumRoll);
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs
index 52fd440857..c2f251fcb6 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Type = HitType.Rim,
                 IsStrong = false,
                 StartTime = 300
-            }), null));
+            })));
 
             AddHitObject(hit);
             RemoveHitObject(hit);
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Type = HitType.Centre,
                 IsStrong = true,
                 StartTime = 500
-            }), null));
+            })));
 
             AddHitObject(hit);
         }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index d0fa7eb22f..ba2b8423d0 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -206,12 +206,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// Applies a hit object to be represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        /// <remarks>This overload is semi-deprecated. Use either <see cref="Apply(osu.Game.Rulesets.Objects.HitObject)"/> or <see cref="Apply(osu.Game.Rulesets.Objects.HitObjectLifetimeEntry)"/>.</remarks>
+        [Obsolete("Use either overload of Apply that takes a single argument of type HitObject or HitObjectLifetimeEntry")]
         public void Apply([NotNull] HitObject hitObject, [CanBeNull] HitObjectLifetimeEntry lifetimeEntry)
         {
-            if (lifetimeEntry != null && lifetimeEntry.HitObject != hitObject)
-                throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
-
             if (lifetimeEntry != null)
                 Apply(lifetimeEntry);
             else
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index d55005363c..17d3cf01a4 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -362,7 +362,7 @@ namespace osu.Game.Rulesets.UI
                     lifetimeEntryMap[hitObject] = entry = CreateLifetimeEntry(hitObject);
 
                 dho.ParentHitObject = parent;
-                dho.Apply(hitObject, entry);
+                dho.Apply(entry);
             });
         }
 

From 5c8f5624724095c7c98961cb9a857be778aee3c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 14:37:28 +0900
Subject: [PATCH 09365/10326] Don't bail if the underlying localisation
 resourced is not embedded

---
 .../Localisation/ResourceManagerLocalisationStore.cs  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Localisation/ResourceManagerLocalisationStore.cs b/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
index dd84eff55f..e0f110aba9 100644
--- a/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
+++ b/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
@@ -34,7 +34,16 @@ namespace osu.Game.Localisation
             if (!resourceManagers.TryGetValue(ns, out var manager))
                 resourceManagers[ns] = manager = new ResourceManager(ns, GetType().Assembly);
 
-            return manager.GetString(key, EffectiveCulture);
+            try
+            {
+                return manager.GetString(key, EffectiveCulture);
+            }
+            catch (MissingManifestResourceException)
+            {
+                // in the case the manifest is missing, it is likely that the user is adding code-first implementations of new localisation namespaces.
+                // it's fine to ignore this as localisation will fallback to default values.
+                return null;
+            }
         }
 
         public Task<string> GetAsync(string lookup)

From 31c8586dacb5b5234c61d8e83f5546937df903cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 14:37:11 +0900
Subject: [PATCH 09366/10326] Add localisation support to overlay header
 title/description

---
 osu.Game/Localisation/ChatStrings.cs          | 24 +++++++++++++++++++
 osu.Game/Localisation/NotificationsStrings.cs | 24 +++++++++++++++++++
 osu.Game/Localisation/NowPlayingStrings.cs    | 24 +++++++++++++++++++
 osu.Game/Localisation/SettingsStrings.cs      | 24 +++++++++++++++++++
 osu.Game/Overlays/ChatOverlay.cs              |  6 +++--
 osu.Game/Overlays/FullscreenOverlay.cs        |  5 ++--
 osu.Game/Overlays/INamedOverlayComponent.cs   |  6 +++--
 osu.Game/Overlays/NotificationOverlay.cs      |  6 +++--
 osu.Game/Overlays/NowPlayingOverlay.cs        |  5 ++--
 osu.Game/Overlays/OverlayTitle.cs             |  7 +++---
 osu.Game/Overlays/Settings/SettingsHeader.cs  |  7 +++---
 osu.Game/Overlays/SettingsOverlay.cs          |  6 +++--
 12 files changed, 126 insertions(+), 18 deletions(-)
 create mode 100644 osu.Game/Localisation/ChatStrings.cs
 create mode 100644 osu.Game/Localisation/NotificationsStrings.cs
 create mode 100644 osu.Game/Localisation/NowPlayingStrings.cs
 create mode 100644 osu.Game/Localisation/SettingsStrings.cs

diff --git a/osu.Game/Localisation/ChatStrings.cs b/osu.Game/Localisation/ChatStrings.cs
new file mode 100644
index 0000000000..daddb602ad
--- /dev/null
+++ b/osu.Game/Localisation/ChatStrings.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.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class ChatStrings
+    {
+        private const string prefix = "osu.Game.Localisation.Chat";
+
+        /// <summary>
+        /// "chat"
+        /// </summary>
+        public static LocalisableString HeaderTitle => new TranslatableString(getKey("header_title"), "chat");
+
+        /// <summary>
+        /// "join the real-time discussion"
+        /// </summary>
+        public static LocalisableString HeaderDescription => new TranslatableString(getKey("header_description"), "join the real-time discussion");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
new file mode 100644
index 0000000000..092eec3a6b
--- /dev/null
+++ b/osu.Game/Localisation/NotificationsStrings.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.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class NotificationsStrings
+    {
+        private const string prefix = "osu.Game.Localisation.Notifications";
+
+        /// <summary>
+        /// "notifications"
+        /// </summary>
+        public static LocalisableString HeaderTitle => new TranslatableString(getKey("header_title"), "notifications");
+
+        /// <summary>
+        /// "waiting for 'ya"
+        /// </summary>
+        public static LocalisableString HeaderDescription => new TranslatableString(getKey("header_description"), "waiting for 'ya");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Localisation/NowPlayingStrings.cs b/osu.Game/Localisation/NowPlayingStrings.cs
new file mode 100644
index 0000000000..d742a56895
--- /dev/null
+++ b/osu.Game/Localisation/NowPlayingStrings.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.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class NowPlayingStrings
+    {
+        private const string prefix = "osu.Game.Localisation.NowPlaying";
+
+        /// <summary>
+        /// "now playing"
+        /// </summary>
+        public static LocalisableString HeaderTitle => new TranslatableString(getKey("header_title"), "now playing");
+
+        /// <summary>
+        /// "manage the currently playing track"
+        /// </summary>
+        public static LocalisableString HeaderDescription => new TranslatableString(getKey("header_description"), "manage the currently playing track");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Localisation/SettingsStrings.cs b/osu.Game/Localisation/SettingsStrings.cs
new file mode 100644
index 0000000000..cfbd392691
--- /dev/null
+++ b/osu.Game/Localisation/SettingsStrings.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.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class SettingsStrings
+    {
+        private const string prefix = "osu.Game.Localisation.Settings";
+
+        /// <summary>
+        /// "settings"
+        /// </summary>
+        public static LocalisableString HeaderTitle => new TranslatableString(getKey("header_title"), "settings");
+
+        /// <summary>
+        /// "change the way osu! behaves"
+        /// </summary>
+        public static LocalisableString HeaderDescription => new TranslatableString(getKey("header_description"), "change the way osu! behaves");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 28f2287514..285041800a 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -24,6 +24,8 @@ using osu.Game.Overlays.Chat.Tabs;
 using osuTK.Input;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
 using osu.Game.Online;
 
 namespace osu.Game.Overlays
@@ -31,8 +33,8 @@ namespace osu.Game.Overlays
     public class ChatOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
         public string IconTexture => "Icons/Hexacons/messaging";
-        public string Title => "chat";
-        public string Description => "join the real-time discussion";
+        public LocalisableString Title => ChatStrings.HeaderTitle;
+        public LocalisableString Description => ChatStrings.HeaderDescription;
 
         private const float textbox_height = 60;
         private const float channel_selection_min_height = 0.3f;
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 735f0bcbd4..58c41c4a4b 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
 using osuTK.Graphics;
@@ -18,8 +19,8 @@ namespace osu.Game.Overlays
         where T : OverlayHeader
     {
         public virtual string IconTexture => Header.Title.IconTexture ?? string.Empty;
-        public virtual string Title => Header.Title.Title ?? string.Empty;
-        public virtual string Description => Header.Title.Description ?? string.Empty;
+        public virtual LocalisableString Title => Header.Title.Title;
+        public virtual LocalisableString Description => Header.Title.Description;
 
         public T Header { get; }
 
diff --git a/osu.Game/Overlays/INamedOverlayComponent.cs b/osu.Game/Overlays/INamedOverlayComponent.cs
index 38fb8679a0..ca0aea041e 100644
--- a/osu.Game/Overlays/INamedOverlayComponent.cs
+++ b/osu.Game/Overlays/INamedOverlayComponent.cs
@@ -1,14 +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.Localisation;
+
 namespace osu.Game.Overlays
 {
     public interface INamedOverlayComponent
     {
         string IconTexture { get; }
 
-        string Title { get; }
+        LocalisableString Title { get; }
 
-        string Description { get; }
+        LocalisableString Description { get; }
     }
 }
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index d51d964fc4..b26e17b34c 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -11,16 +11,18 @@ using osu.Game.Graphics.Containers;
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Localisation;
 using osu.Framework.Threading;
 using osu.Game.Graphics;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays
 {
     public class NotificationOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
         public string IconTexture => "Icons/Hexacons/notification";
-        public string Title => "notifications";
-        public string Description => "waiting for 'ya";
+        public LocalisableString Title => NotificationsStrings.HeaderTitle;
+        public LocalisableString Description => NotificationsStrings.HeaderDescription;
 
         private const float width = 320;
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 81bf71cdec..f88be91c01 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Localisation;
 using osu.Game.Overlays.Music;
 using osuTK;
 using osuTK.Graphics;
@@ -28,8 +29,8 @@ namespace osu.Game.Overlays
     public class NowPlayingOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
         public string IconTexture => "Icons/Hexacons/music";
-        public string Title => "now playing";
-        public string Description => "manage the currently playing track";
+        public LocalisableString Title => NowPlayingStrings.HeaderTitle;
+        public LocalisableString Description => NowPlayingStrings.HeaderDescription;
 
         private const float player_height = 130;
         private const float transition_length = 800;
diff --git a/osu.Game/Overlays/OverlayTitle.cs b/osu.Game/Overlays/OverlayTitle.cs
index c3ea35adfc..d92979e8d4 100644
--- a/osu.Game/Overlays/OverlayTitle.cs
+++ b/osu.Game/Overlays/OverlayTitle.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
@@ -19,15 +20,15 @@ namespace osu.Game.Overlays
         private readonly OsuSpriteText titleText;
         private readonly Container icon;
 
-        private string title;
+        private LocalisableString title;
 
-        public string Title
+        public LocalisableString Title
         {
             get => title;
             protected set => titleText.Text = title = value;
         }
 
-        public string Description { get; protected set; }
+        public LocalisableString Description { get; protected set; }
 
         private string iconTexture;
 
diff --git a/osu.Game/Overlays/Settings/SettingsHeader.cs b/osu.Game/Overlays/Settings/SettingsHeader.cs
index d8ec00bd99..a7f1cef74c 100644
--- a/osu.Game/Overlays/Settings/SettingsHeader.cs
+++ b/osu.Game/Overlays/Settings/SettingsHeader.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
@@ -11,10 +12,10 @@ namespace osu.Game.Overlays.Settings
 {
     public class SettingsHeader : Container
     {
-        private readonly string heading;
-        private readonly string subheading;
+        private readonly LocalisableString heading;
+        private readonly LocalisableString subheading;
 
-        public SettingsHeader(string heading, string subheading)
+        public SettingsHeader(LocalisableString heading, LocalisableString subheading)
         {
             this.heading = heading;
             this.subheading = subheading;
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 7bd84dbc6c..8c21880cc6 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -10,14 +10,16 @@ using osuTK.Graphics;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays
 {
     public class SettingsOverlay : SettingsPanel, INamedOverlayComponent
     {
         public string IconTexture => "Icons/Hexacons/settings";
-        public string Title => "settings";
-        public string Description => "change the way osu! behaves";
+        public LocalisableString Title => SettingsStrings.HeaderTitle;
+        public LocalisableString Description => SettingsStrings.HeaderDescription;
 
         protected override IEnumerable<SettingsSection> CreateSections() => new SettingsSection[]
         {

From e536f1ad6d3bd1d00968eeddba4997ebda85218c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 14:39:36 +0900
Subject: [PATCH 09367/10326] Add simple locking of resourceManagers dictionary
 for thread safety

---
 .../ResourceManagerLocalisationStore.cs       | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Localisation/ResourceManagerLocalisationStore.cs b/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
index e0f110aba9..7b21e1af42 100644
--- a/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
+++ b/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
@@ -31,18 +31,21 @@ namespace osu.Game.Localisation
             string ns = split[0];
             string key = split[1];
 
-            if (!resourceManagers.TryGetValue(ns, out var manager))
-                resourceManagers[ns] = manager = new ResourceManager(ns, GetType().Assembly);
+            lock (resourceManagers)
+            {
+                if (!resourceManagers.TryGetValue(ns, out var manager))
+                    resourceManagers[ns] = manager = new ResourceManager(ns, GetType().Assembly);
 
-            try
-            {
-                return manager.GetString(key, EffectiveCulture);
-            }
-            catch (MissingManifestResourceException)
-            {
-                // in the case the manifest is missing, it is likely that the user is adding code-first implementations of new localisation namespaces.
-                // it's fine to ignore this as localisation will fallback to default values.
-                return null;
+                try
+                {
+                    return manager.GetString(key, EffectiveCulture);
+                }
+                catch (MissingManifestResourceException)
+                {
+                    // in the case the manifest is missing, it is likely that the user is adding code-first implementations of new localisation namespaces.
+                    // it's fine to ignore this as localisation will fallback to default values.
+                    return null;
+                }
             }
         }
 

From e90d791754776b5b5c51d42083145a665b9912c6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 21 Apr 2021 09:14:19 +0300
Subject: [PATCH 09368/10326] Add base "classic" mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs | 17 +--------------
 osu.Game/Rulesets/Mods/ModClassic.cs        | 24 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/ModClassic.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 882f848190..77dea5b0dc 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -16,22 +15,8 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModClassic : Mod, IApplicableToHitObject, IApplicableToDrawableHitObjects, IApplicableToDrawableRuleset<OsuHitObject>
+    public class OsuModClassic : ModClassic, IApplicableToHitObject, IApplicableToDrawableHitObjects, IApplicableToDrawableRuleset<OsuHitObject>
     {
-        public override string Name => "Classic";
-
-        public override string Acronym => "CL";
-
-        public override double ScoreMultiplier => 1;
-
-        public override IconUsage? Icon => FontAwesome.Solid.History;
-
-        public override string Description => "Feeling nostalgic?";
-
-        public override bool Ranked => false;
-
-        public override ModType Type => ModType.Conversion;
-
         [SettingSource("No slider head accuracy requirement", "Scores sliders proportionally to the number of ticks hit.")]
         public Bindable<bool> NoSliderHeadAccuracy { get; } = new BindableBool(true);
 
diff --git a/osu.Game/Rulesets/Mods/ModClassic.cs b/osu.Game/Rulesets/Mods/ModClassic.cs
new file mode 100644
index 0000000000..f1207ec188
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModClassic.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.Sprites;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModClassic : Mod
+    {
+        public override string Name => "Classic";
+
+        public override string Acronym => "CL";
+
+        public override double ScoreMultiplier => 1;
+
+        public override IconUsage? Icon => FontAwesome.Solid.History;
+
+        public override string Description => "Feeling nostalgic?";
+
+        public override bool Ranked => false;
+
+        public override ModType Type => ModType.Conversion;
+    }
+}

From e3398d8f1fdfbbc57b6a3ae38e4ec9648f8505f6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 21 Apr 2021 09:14:31 +0300
Subject: [PATCH 09369/10326] Implement "classic" mod for all other legacy
 rulesets

Currently empty, automatically handled in game to not be selectable (see `Mod.HasImplementation`)
---
 osu.Game.Rulesets.Catch/CatchRuleset.cs         |  1 +
 osu.Game.Rulesets.Catch/Mods/CatchModClassic.cs | 11 +++++++++++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs         |  1 +
 osu.Game.Rulesets.Mania/Mods/ManiaModClassic.cs | 11 +++++++++++
 osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs | 11 +++++++++++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs         |  1 +
 6 files changed, 36 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch/Mods/CatchModClassic.cs
 create mode 100644 osu.Game.Rulesets.Mania/Mods/ManiaModClassic.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index f4ddbd3021..ab877c21c1 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -114,6 +114,7 @@ namespace osu.Game.Rulesets.Catch
                     return new Mod[]
                     {
                         new CatchModDifficultyAdjust(),
+                        new CatchModClassic(),
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModClassic.cs b/osu.Game.Rulesets.Catch/Mods/CatchModClassic.cs
new file mode 100644
index 0000000000..9624e84018
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModClassic.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.
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModClassic : ModClassic
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 88b63606b9..b3889bc7d3 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -239,6 +239,7 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModDualStages(),
                         new ManiaModMirror(),
                         new ManiaModDifficultyAdjust(),
+                        new ManiaModClassic(),
                         new ManiaModInvert(),
                         new ManiaModConstantSpeed()
                     };
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModClassic.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModClassic.cs
new file mode 100644
index 0000000000..073dda9de8
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModClassic.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.
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModClassic : ModClassic
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs
new file mode 100644
index 0000000000..5a4d18be98
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.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.
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModClassic : ModClassic
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 56f58f404b..f4e158ec32 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -135,6 +135,7 @@ namespace osu.Game.Rulesets.Taiko
                     {
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
+                        new TaikoModClassic(),
                     };
 
                 case ModType.Automation:

From 1a715b2926de6c3a9e3322474c4fe1f20ec11a5e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 21 Apr 2021 09:16:28 +0300
Subject: [PATCH 09370/10326] Append "classic" mod to legacy scores

---
 osu.Game/Scoring/ScoreInfo.cs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 222f69b025..bf131658ea 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -65,14 +65,19 @@ namespace osu.Game.Scoring
         {
             get
             {
-                if (mods != null)
-                    return mods;
-
-                if (localAPIMods == null)
-                    return Array.Empty<Mod>();
+                Mod[] scoreMods = Array.Empty<Mod>();
 
                 var rulesetInstance = Ruleset.CreateInstance();
-                return apiMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
+
+                if (mods != null)
+                    scoreMods = mods;
+                else if (localAPIMods != null)
+                    scoreMods = apiMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
+
+                if (IsLegacyScore)
+                    scoreMods = scoreMods.Append(rulesetInstance.GetAllMods().OfType<ModClassic>().Single()).ToArray();
+
+                return scoreMods;
             }
             set
             {

From eb20865c02898b77c2ad583e80c5108ae662d177 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 15:55:13 +0900
Subject: [PATCH 09371/10326] Show tablet preview with physical tablet
 counter-rotated for supplied user area selection

Closes https://github.com/ppy/osu/issues/12399.

Rotation animation is intentionally delayed slightly to give a better sense of what is going on (or maybe just look cool).
---
 .../Settings/Sections/Input/TabletAreaSelection.cs         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index f61742093c..b670e3558c 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -129,6 +129,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             rotation.BindTo(handler.Rotation);
             rotation.BindValueChanged(val =>
             {
+                tabletContainer.RotateTo(-val.NewValue, 800, Easing.OutQuint);
                 usableAreaContainer.RotateTo(val.NewValue, 100, Easing.OutQuint)
                                    .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
             });
@@ -183,8 +184,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!(tablet.Value?.Size is Vector2 size))
                 return;
 
-            float fitX = size.X / (DrawWidth - Padding.Left - Padding.Right);
-            float fitY = size.Y / DrawHeight;
+            float maxDimension = size.LengthFast;
+
+            float fitX = maxDimension / (DrawWidth - Padding.Left - Padding.Right);
+            float fitY = maxDimension / DrawHeight;
 
             float adjust = MathF.Max(fitX, fitY);
 

From ab2a8b5c898b2f212c670ee6a3f9dd89e8fd1b53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 16:12:09 +0900
Subject: [PATCH 09372/10326] Fix initial rotation not being set

---
 .../Overlays/Settings/Sections/Input/TabletAreaSelection.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index b670e3558c..412889d210 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 tabletContainer.RotateTo(-val.NewValue, 800, Easing.OutQuint);
                 usableAreaContainer.RotateTo(val.NewValue, 100, Easing.OutQuint)
                                    .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
-            });
+            }, true);
 
             tablet.BindTo(handler.Tablet);
             tablet.BindValueChanged(_ => Scheduler.AddOnce(updateTabletDetails));

From fb848f7544435470f330aec600b2fc14e5313936 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 16:33:14 +0900
Subject: [PATCH 09373/10326] Rename to MasterGameplayClock

---
 .../Screens/Play/MasterGameplayClockContainer.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index affe24069d..fcbc6fae15 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Play
 
         private FramedOffsetClock userOffsetClock;
         private FramedOffsetClock platformOffsetClock;
-        private LocalGameplayClock localGameplayClock;
+        private MasterGameplayClock masterGameplayClock;
         private Bindable<double> userAudioOffset;
         private double startOffset;
 
@@ -157,7 +157,7 @@ namespace osu.Game.Screens.Play
             // the final usable gameplay clock with user-set offsets applied.
             userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
 
-            return localGameplayClock = new LocalGameplayClock(userOffsetClock);
+            return masterGameplayClock = new MasterGameplayClock(userOffsetClock);
         }
 
         /// <summary>
@@ -180,8 +180,8 @@ namespace osu.Game.Screens.Play
             Track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
             Track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
-            localGameplayClock.MutableNonGameplayAdjustments.Add(pauseFreqAdjust);
-            localGameplayClock.MutableNonGameplayAdjustments.Add(UserPlaybackRate);
+            masterGameplayClock.MutableNonGameplayAdjustments.Add(pauseFreqAdjust);
+            masterGameplayClock.MutableNonGameplayAdjustments.Add(UserPlaybackRate);
 
             speedAdjustmentsApplied = true;
         }
@@ -194,8 +194,8 @@ namespace osu.Game.Screens.Play
             Track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
             Track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
-            localGameplayClock.MutableNonGameplayAdjustments.Remove(pauseFreqAdjust);
-            localGameplayClock.MutableNonGameplayAdjustments.Remove(UserPlaybackRate);
+            masterGameplayClock.MutableNonGameplayAdjustments.Remove(pauseFreqAdjust);
+            masterGameplayClock.MutableNonGameplayAdjustments.Remove(UserPlaybackRate);
 
             speedAdjustmentsApplied = false;
         }
@@ -218,13 +218,13 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private class LocalGameplayClock : GameplayClock
+        private class MasterGameplayClock : GameplayClock
         {
             public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
 
             public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
 
-            public LocalGameplayClock(FramedOffsetClock underlyingClock)
+            public MasterGameplayClock(FramedOffsetClock underlyingClock)
                 : base(underlyingClock)
             {
             }

From f32d00c0d99ecccdbf1452c210f0a75769932298 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 17:13:01 +0900
Subject: [PATCH 09374/10326] Fix post-merge errors

---
 .../OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs | 2 +-
 osu.Game/Screens/Play/GameplayClockContainer.cs             | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 23cc787e20..a5bd449e7e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             base.LoadComplete();
 
             masterClockContainer.Stop();
-            masterClockContainer.Restart();
+            masterClockContainer.Reset();
         }
 
         protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index dac3dad5d2..4109fd32bc 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -154,11 +154,7 @@ namespace osu.Game.Screens.Play
             return true;
         }
 
-        void IAdjustableClock.Reset()
-        {
-            Restart();
-            Stop();
-        }
+        void IAdjustableClock.Reset() => Reset();
 
         public void ResetSpeedAdjustments()
         {

From deeb9e3765294cdaa656a664b1eee0f31a73f8f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 17:27:00 +0900
Subject: [PATCH 09375/10326] 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 ed2b27e1c7..3324af7c51 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.419.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.421.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 509cb3ddad..fcd1ed6987 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.419.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.421.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 4b67bd78a1..34810a3106 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.Framework.iOS" Version="2021.419.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.421.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.419.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.421.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From bbf2ec369b748dcb424f370178ec5402a5c46493 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 17:13:59 +0900
Subject: [PATCH 09376/10326] Remove SkinReloadableDrawable inheritance from
 DHO

---
 .../Objects/Drawables/DrawableHitObject.cs    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ba2b8423d0..1369623a62 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Threading;
 using osu.Game.Audio;
@@ -25,7 +26,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Objects.Drawables
 {
     [Cached(typeof(DrawableHitObject))]
-    public abstract class DrawableHitObject : SkinReloadableDrawable
+    public abstract class DrawableHitObject : PoolableDrawable
     {
         /// <summary>
         /// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied.
@@ -178,12 +179,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, ISkinSource skinSource)
         {
             config.BindWith(OsuSetting.PositionalHitSounds, userPositionalHitSounds);
 
             // Explicit non-virtual function call.
             base.AddInternal(Samples = new PausableSkinnableSound());
+
+            CurrentSkin = skinSource;
+            CurrentSkin.SourceChanged += onSkinSourceChanged;
         }
 
         protected override void LoadAsyncComplete()
@@ -536,17 +540,19 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         #endregion
 
-        protected sealed override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
+        #region Skinning
 
+        protected ISkinSource CurrentSkin { get; private set; }
+
+        private void onSkinSourceChanged() => Scheduler.AddOnce(() =>
+        {
             UpdateComboColour();
 
-            ApplySkin(skin, allowFallback);
+            ApplySkin(CurrentSkin, true);
 
             if (IsLoaded)
                 updateState(State.Value, true);
-        }
+        });
 
         protected void UpdateComboColour()
         {
@@ -616,6 +622,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 Samples.Stop();
         }
 
+        #endregion
+
         protected override void Update()
         {
             base.Update();
@@ -811,6 +819,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             if (HitObject != null)
                 HitObject.DefaultsApplied -= onDefaultsApplied;
+
+            CurrentSkin.SourceChanged -= onSkinSourceChanged;
         }
     }
 

From b877a2973739c4cb8a32393bbb021392f536be82 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 17:55:01 +0900
Subject: [PATCH 09377/10326] Factor out pooling and lifetime management logic
 of DHO to a base class

---
 .../Objects/Drawables/DrawableHitObject.cs    | 116 +++--------------
 .../Objects/Pooling/DrawableObject.cs         | 121 ++++++++++++++++++
 2 files changed, 141 insertions(+), 96 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 1369623a62..312ed93e45 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -11,7 +11,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Threading;
 using osu.Game.Audio;
@@ -20,13 +19,14 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Objects.Pooling;
 using osu.Game.Rulesets.UI;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Drawables
 {
     [Cached(typeof(DrawableHitObject))]
-    public abstract class DrawableHitObject : PoolableDrawable
+    public abstract class DrawableHitObject : DrawableObject<HitObjectLifetimeEntry>
     {
         /// <summary>
         /// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied.
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The <see cref="HitObject"/> currently represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        public HitObject HitObject => lifetimeEntry?.HitObject;
+        public HitObject HitObject => Entry?.HitObject;
 
         /// <summary>
         /// The parenting <see cref="DrawableHitObject"/>, if any.
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The scoring result of this <see cref="DrawableHitObject"/>.
         /// </summary>
-        public JudgementResult Result => lifetimeEntry?.Result;
+        public JudgementResult Result => Entry?.Result;
 
         /// <summary>
         /// The relative X position of this hit object for sample playback balance adjustment.
@@ -126,8 +126,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private readonly Bindable<bool> userPositionalHitSounds = new Bindable<bool>();
         private readonly Bindable<int> comboIndexBindable = new Bindable<int>();
 
-        public override bool RemoveWhenNotAlive => false;
-        public override bool RemoveCompletedTransforms => false;
         protected override bool RequiresChildrenUpdate => true;
 
         public override bool IsPresent => base.IsPresent || (State.Value == ArmedState.Idle && Clock?.CurrentTime >= LifetimeStart);
@@ -142,18 +140,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         public IBindable<ArmedState> State => state;
 
-        /// <summary>
-        /// Whether a <see cref="HitObjectLifetimeEntry"/> is currently applied.
-        /// </summary>
-        private bool hasEntryApplied;
-
-        /// <summary>
-        /// The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the currently-attached <see cref="HitObject"/>.
-        /// </summary>
-        /// <remarks>Even if it is not null, it may not be fully applied until loaded (<see cref="hasEntryApplied"/> is false).</remarks>
-        [CanBeNull]
-        private HitObjectLifetimeEntry lifetimeEntry;
-
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
@@ -167,15 +153,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         /// <param name="initialHitObject">
         /// The <see cref="HitObject"/> to be initially applied to this <see cref="DrawableHitObject"/>.
-        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="Apply(osu.Game.Rulesets.Objects.HitObjectLifetimeEntry)"/> (or automatically via pooling).
+        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="DrawableObject{TEntry}.Apply"/> (or automatically via pooling).
         /// </param>
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
+            : base(initialHitObject != null ? new SyntheticHitObjectEntry(initialHitObject) : null)
         {
-            if (initialHitObject != null)
-            {
-                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject);
+            if (Entry != null)
                 ensureEntryHasResult();
-            }
         }
 
         [BackgroundDependencyLoader]
@@ -190,14 +174,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
             CurrentSkin.SourceChanged += onSkinSourceChanged;
         }
 
-        protected override void LoadAsyncComplete()
-        {
-            base.LoadAsyncComplete();
-
-            if (lifetimeEntry != null && !hasEntryApplied)
-                Apply(lifetimeEntry);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -231,22 +207,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
             Apply(new SyntheticHitObjectEntry(hitObject));
         }
 
-        /// <summary>
-        /// Applies a new <see cref="HitObjectLifetimeEntry"/> to be represented by this <see cref="DrawableHitObject"/>.
-        /// </summary>
-        public void Apply([NotNull] HitObjectLifetimeEntry newEntry)
+        protected sealed override void OnApply(HitObjectLifetimeEntry entry)
         {
-            free();
-
-            lifetimeEntry = newEntry;
-
             // LifetimeStart is already computed using HitObjectLifetimeEntry's InitialLifetimeOffset.
             // We override this with DHO's InitialLifetimeOffset for a non-pooled DHO.
-            if (newEntry is SyntheticHitObjectEntry)
-                lifetimeEntry.LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
+            if (entry is SyntheticHitObjectEntry)
+                entry.LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
 
-            LifetimeStart = lifetimeEntry.LifetimeStart;
-            LifetimeEnd = lifetimeEntry.LifetimeEnd;
+            LifetimeStart = entry.LifetimeStart;
+            LifetimeEnd = entry.LifetimeEnd;
 
             ensureEntryHasResult();
 
@@ -297,17 +266,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 else
                     updateState(ArmedState.Idle, true);
             }
-
-            hasEntryApplied = true;
         }
 
-        /// <summary>
-        /// Removes the currently applied <see cref="lifetimeEntry"/>
-        /// </summary>
-        private void free()
+        protected sealed override void OnFree(HitObjectLifetimeEntry entry)
         {
-            if (!hasEntryApplied) return;
-
             StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
                 comboIndexBindable.UnbindFrom(combo.ComboIndexBindable);
@@ -339,22 +301,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             OnFree();
 
             ParentHitObject = null;
-            lifetimeEntry = null;
 
             clearExistingStateTransforms();
-
-            hasEntryApplied = false;
-        }
-
-        protected sealed override void FreeAfterUse()
-        {
-            base.FreeAfterUse();
-
-            // Freeing while not in a pool would cause the DHO to not be usable elsewhere in the hierarchy without being re-applied.
-            if (!IsInPool)
-                return;
-
-            free();
         }
 
         /// <summary>
@@ -402,8 +350,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void onDefaultsApplied(HitObject hitObject)
         {
-            Debug.Assert(lifetimeEntry != null);
-            Apply(lifetimeEntry);
+            Debug.Assert(Entry != null);
+            Apply(Entry);
 
             DefaultsApplied?.Invoke(this);
         }
@@ -486,7 +434,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         /// <summary>
         /// Apply (generally fade-in) transforms leading into the <see cref="HitObject"/> start time.
-        /// The local drawable hierarchy is recursively delayed to <see cref="LifetimeStart"/> for convenience.
+        /// The local drawable hierarchy is recursively delayed to <see cref="HitObjectLifetimeEntry.LifetimeStart"/> for convenience.
         ///
         /// By default this will fade in the object from zero with no duration.
         /// </summary>
@@ -661,30 +609,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         protected internal new ScheduledDelegate Schedule(Action action) => base.Schedule(action);
 
-        public override double LifetimeStart
-        {
-            get => base.LifetimeStart;
-            set => setLifetime(value, LifetimeEnd);
-        }
-
-        public override double LifetimeEnd
-        {
-            get => base.LifetimeEnd;
-            set => setLifetime(LifetimeStart, value);
-        }
-
-        private void setLifetime(double lifetimeStart, double lifetimeEnd)
-        {
-            base.LifetimeStart = lifetimeStart;
-            base.LifetimeEnd = lifetimeEnd;
-
-            if (lifetimeEntry != null)
-            {
-                lifetimeEntry.LifetimeStart = lifetimeStart;
-                lifetimeEntry.LifetimeEnd = lifetimeEnd;
-            }
-        }
-
         /// <summary>
         /// A safe offset prior to the start time of <see cref="HitObject"/> at which this <see cref="DrawableHitObject"/> may begin displaying contents.
         /// By default, <see cref="DrawableHitObject"/>s are assumed to display their contents within 10 seconds prior to the start time of <see cref="HitObject"/>.
@@ -692,7 +616,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <remarks>
         /// This is only used as an optimisation to delay the initial update of this <see cref="DrawableHitObject"/> and may be tuned more aggressively if required.
         /// It is indirectly used to decide the automatic transform offset provided to <see cref="UpdateInitialTransforms"/>.
-        /// A more accurate <see cref="LifetimeStart"/> should be set for further optimisation (in <see cref="LoadComplete"/>, for example).
+        /// A more accurate <see cref="HitObjectLifetimeEntry.LifetimeStart"/> should be set for further optimisation (in <see cref="LoadComplete"/>, for example).
         /// <para>
         /// Only has an effect if this <see cref="DrawableHitObject"/> is not being pooled.
         /// For pooled <see cref="DrawableHitObject"/>s, use <see cref="HitObjectLifetimeEntry.InitialLifetimeOffset"/> instead.
@@ -808,9 +732,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void ensureEntryHasResult()
         {
-            Debug.Assert(lifetimeEntry != null);
-            lifetimeEntry.Result ??= CreateResult(HitObject.CreateJudgement())
-                                     ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
+            Debug.Assert(Entry != null);
+            Entry.Result ??= CreateResult(HitObject.CreateJudgement())
+                             ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs b/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
new file mode 100644
index 0000000000..b29e6a6c3c
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
@@ -0,0 +1,121 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable enable
+
+using System.Diagnostics;
+using osu.Framework.Graphics.Performance;
+using osu.Framework.Graphics.Pooling;
+
+namespace osu.Game.Rulesets.Objects.Pooling
+{
+    /// <summary>
+    /// A <see cref="PoolableDrawable"/> that is controlled by <see cref="Entry"/> to implement drawable pooling and replay rewinding.
+    /// </summary>
+    /// <typeparam name="TEntry">The <see cref="LifetimeEntry"/> type storing state and controlling this drawable.</typeparam>
+    public abstract class DrawableObject<TEntry> : PoolableDrawable where TEntry : LifetimeEntry
+    {
+        /// <summary>
+        /// The entry holding essential state of this <see cref="DrawableObject{TEntry}"/>.
+        /// </summary>
+        protected TEntry? Entry { get; private set; }
+
+        /// <summary>
+        /// Whether <see cref="Entry"/> is applied to this <see cref="DrawableObject{TEntry}"/>.
+        /// When an initial entry is specified in the constructor, <see cref="Entry"/> is set but not applied until loading is completed.
+        /// </summary>
+        protected bool HasEntryApplied { get; private set; }
+
+        public override double LifetimeStart
+        {
+            get => base.LifetimeStart;
+            set => setLifetime(value, LifetimeEnd);
+        }
+
+        public override double LifetimeEnd
+        {
+            get => base.LifetimeEnd;
+            set => setLifetime(LifetimeStart, value);
+        }
+
+        public override bool RemoveWhenNotAlive => false;
+        public override bool RemoveCompletedTransforms => false;
+
+        protected DrawableObject(TEntry? initialEntry = null)
+        {
+            Entry = initialEntry;
+        }
+
+        protected override void LoadAsyncComplete()
+        {
+            base.LoadAsyncComplete();
+
+            if (Entry != null && !HasEntryApplied)
+                Apply(Entry);
+        }
+
+        /// <summary>
+        /// Applies a new entry to be represented by this drawable.
+        /// If there is an existing entry applied, the entry will be replaced.
+        /// </summary>
+        public void Apply(TEntry entry)
+        {
+            freeIfInUse();
+
+            setLifetime(entry.LifetimeStart, entry.LifetimeEnd);
+            Entry = entry;
+
+            OnApply(entry);
+
+            HasEntryApplied = true;
+        }
+
+        protected sealed override void FreeAfterUse()
+        {
+            base.FreeAfterUse();
+
+            if (IsInPool)
+                freeIfInUse();
+        }
+
+        /// <summary>
+        /// Invoked to apply a new entry to this drawable.
+        /// </summary>
+        protected virtual void OnApply(TEntry entry)
+        {
+        }
+
+        /// <summary>
+        /// Invoked to revert application of the entry to this drawable.
+        /// </summary>
+        protected virtual void OnFree(TEntry entry)
+        {
+        }
+
+        private void setLifetime(double start, double end)
+        {
+            base.LifetimeStart = start;
+            base.LifetimeEnd = end;
+
+            if (Entry != null)
+            {
+                Entry.LifetimeStart = start;
+                Entry.LifetimeEnd = end;
+            }
+        }
+
+        private void freeIfInUse()
+        {
+            if (!HasEntryApplied) return;
+
+            Debug.Assert(Entry != null);
+
+            OnFree(Entry);
+
+            Entry = null;
+            setLifetime(double.MaxValue, double.MaxValue);
+
+            HasEntryApplied = false;
+        }
+    }
+}

From c6c91cd9a5ce76554b277b0e7520e0aeb4312cef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 18:05:26 +0900
Subject: [PATCH 09378/10326] Refactor `WaveformOpacityMenuItem` to not receive
 whole config

---
 osu.Game/Screens/Edit/Editor.cs                            | 2 +-
 .../{WaveformOpacityMenu.cs => WaveformOpacityMenuItem.cs} | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename osu.Game/Screens/Edit/{WaveformOpacityMenu.cs => WaveformOpacityMenuItem.cs} (85%)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index fffea65456..360fbb36db 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Screens.Edit
                                 {
                                     Items = new[]
                                     {
-                                        new WaveformOpacityMenu(config)
+                                        new WaveformOpacityMenuItem(config.GetBindable<float>(OsuSetting.EditorWaveformOpacity)),
                                     }
                                 }
                             }
diff --git a/osu.Game/Screens/Edit/WaveformOpacityMenu.cs b/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
similarity index 85%
rename from osu.Game/Screens/Edit/WaveformOpacityMenu.cs
rename to osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
index 5d209ae141..053c2fa4b0 100644
--- a/osu.Game/Screens/Edit/WaveformOpacityMenu.cs
+++ b/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
@@ -4,18 +4,17 @@
 using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Edit
 {
-    internal class WaveformOpacityMenu : MenuItem
+    internal class WaveformOpacityMenuItem : MenuItem
     {
         private readonly Bindable<float> waveformOpacity;
 
         private readonly Dictionary<float, ToggleMenuItem> menuItemLookup = new Dictionary<float, ToggleMenuItem>();
 
-        public WaveformOpacityMenu(OsuConfigManager config)
+        public WaveformOpacityMenuItem(Bindable<float> waveformOpacity)
             : base("Waveform opacity")
         {
             Items = new[]
@@ -26,7 +25,7 @@ namespace osu.Game.Screens.Edit
                 createMenuItem(1f),
             };
 
-            waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
+            this.waveformOpacity = waveformOpacity;
             waveformOpacity.BindValueChanged(opacity =>
             {
                 foreach (var kvp in menuItemLookup)

From 9d8f0c854d1bce0763c1e7e4113321a8e0646944 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 18:05:40 +0900
Subject: [PATCH 09379/10326] Setup configuration item for editor hit
 animations

---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 ++
 osu.Game/Screens/Edit/Editor.cs               |  3 ++-
 .../Screens/Edit/HitAnimationsMenuItem.cs     | 21 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Edit/HitAnimationsMenuItem.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index f9b1c9618b..09412b1f1b 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -143,6 +143,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
 
             SetDefault(OsuSetting.EditorWaveformOpacity, 0.25f);
+            SetDefault(OsuSetting.EditorHitAnimations, false);
         }
 
         public OsuConfigManager(Storage storage)
@@ -266,6 +267,7 @@ namespace osu.Game.Configuration
         GameplayDisableWinKey,
         SeasonalBackgroundMode,
         EditorWaveformOpacity,
+        EditorHitAnimations,
         DiscordRichPresence,
         AutomaticallyDownloadWhenSpectating,
         ShowOnlineExplicitContent,
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 360fbb36db..da0e9ebbaf 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -224,9 +224,10 @@ namespace osu.Game.Screens.Edit
                                 },
                                 new MenuItem("View")
                                 {
-                                    Items = new[]
+                                    Items = new MenuItem[]
                                     {
                                         new WaveformOpacityMenuItem(config.GetBindable<float>(OsuSetting.EditorWaveformOpacity)),
+                                        new HitAnimationsMenuItem(config.GetBindable<bool>(OsuSetting.EditorHitAnimations))
                                     }
                                 }
                             }
diff --git a/osu.Game/Screens/Edit/HitAnimationsMenuItem.cs b/osu.Game/Screens/Edit/HitAnimationsMenuItem.cs
new file mode 100644
index 0000000000..fb7ab39f7a
--- /dev/null
+++ b/osu.Game/Screens/Edit/HitAnimationsMenuItem.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 JetBrains.Annotations;
+using osu.Framework.Bindables;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Edit
+{
+    internal class HitAnimationsMenuItem : ToggleMenuItem
+    {
+        [UsedImplicitly]
+        private readonly Bindable<bool> hitAnimations;
+
+        public HitAnimationsMenuItem(Bindable<bool> hitAnimations)
+            : base("Hit animations")
+        {
+            State.BindTo(this.hitAnimations = hitAnimations);
+        }
+    }
+}

From 47a4a07024b6557d475b92f1356ee15c0828376c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 19:15:10 +0900
Subject: [PATCH 09380/10326] Split out animation triggering of
 `MainCirclePiece` to be interface driven

---
 .../Objects/Drawables/DrawableHitCircle.cs      |  2 ++
 .../Skinning/Default/IMainCirclePiece.cs        | 17 +++++++++++++++++
 .../Skinning/Default/MainCirclePiece.cs         |  7 ++-----
 .../Skinning/Legacy/LegacyMainCirclePiece.cs    |  8 +++-----
 4 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Default/IMainCirclePiece.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index df77ec2693..fb6c110b3c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -182,6 +182,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             // todo: temporary / arbitrary, used for lifetime optimisation.
             this.Delay(800).FadeOut();
 
+            (CirclePiece.Drawable as IMainCirclePiece)?.Animate(state);
+
             switch (state)
             {
                 case ArmedState.Idle:
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/IMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/IMainCirclePiece.cs
new file mode 100644
index 0000000000..17a1e29094
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/IMainCirclePiece.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Default
+{
+    public interface IMainCirclePiece
+    {
+        /// <summary>
+        /// Begins animating this <see cref="IMainCirclePiece"/>.
+        /// </summary>
+        /// <param name="state">The <see cref="ArmedState"/> of the related <see cref="DrawableHitCircle"/>.</param>
+        void Animate(ArmedState state);
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
index 46aeadc59b..b46baa00ba 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
@@ -13,7 +13,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public class MainCirclePiece : CompositeDrawable
+    public class MainCirclePiece : CompositeDrawable, IMainCirclePiece
     {
         private readonly CirclePiece circle;
         private readonly RingPiece ring;
@@ -67,12 +67,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             }, true);
 
             indexInCurrentCombo.BindValueChanged(index => number.Text = (index.NewValue + 1).ToString(), true);
-
-            drawableObject.ApplyCustomUpdateState += updateState;
-            updateState(drawableObject, drawableObject.State.Value);
         }
 
-        private void updateState(DrawableHitObject drawableObject, ArmedState state)
+        public void Animate(ArmedState state)
         {
             using (BeginAbsoluteSequence(drawableObject.StateUpdateTime))
                 glow.FadeOut(400);
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 545e80a709..cf62165929 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -19,7 +20,7 @@ using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
-    public class LegacyMainCirclePiece : CompositeDrawable
+    public class LegacyMainCirclePiece : CompositeDrawable, IMainCirclePiece
     {
         private readonly string priorityLookup;
         private readonly bool hasNumber;
@@ -138,12 +139,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             accentColour.BindValueChanged(colour => hitCircleSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue), true);
             if (hasNumber)
                 indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
-
-            drawableObject.ApplyCustomUpdateState += updateState;
-            updateState(drawableObject, drawableObject.State.Value);
         }
 
-        private void updateState(DrawableHitObject drawableObject, ArmedState state)
+        public void Animate(ArmedState state)
         {
             const double legacy_fade_duration = 240;
 

From f2824a222a13f924df12f4479ccf3b8d68e5f6b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 19:41:15 +0900
Subject: [PATCH 09381/10326] Adjust existing fades to close match stable
 editor

---
 osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index 5fdb79cbbd..dfb71d1d22 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                     case DrawableHitCircle circle: // also handles slider heads
                         circle.ApproachCircle
-                              .FadeOutFromOne(editor_hit_object_fade_out_extension)
+                              .FadeOutFromOne(editor_hit_object_fade_out_extension * 4)
                               .Expire();
                         break;
                 }
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 hitObject.RemoveTransform(existing);
 
-                using (hitObject.BeginAbsoluteSequence(existing.StartTime))
+                using (hitObject.BeginAbsoluteSequence(hitObject.HitStateUpdateTime))
                     hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
             }
         }

From 0f70469d1c33f392def6ae1070f51cdad941643c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 19:44:17 +0900
Subject: [PATCH 09382/10326] Only apply custom editor overrides if hit
 animations is disabled

---
 .../Edit/DrawableOsuEditRuleset.cs            | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index dfb71d1d22..b8d0637e90 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -3,8 +3,11 @@
 
 using System.Collections.Generic;
 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.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -27,8 +30,16 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private class OsuEditPlayfield : OsuPlayfield
         {
+            private Bindable<bool> hitAnimations;
+
             protected override GameplayCursorContainer CreateCursor() => null;
 
+            [BackgroundDependencyLoader]
+            private void load(OsuConfigManager config)
+            {
+                hitAnimations = config.GetBindable<bool>(OsuSetting.EditorHitAnimations);
+            }
+
             protected override void OnNewDrawableHitObject(DrawableHitObject d)
             {
                 d.ApplyCustomUpdateState += updateState;
@@ -42,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             private void updateState(DrawableHitObject hitObject, ArmedState state)
             {
-                if (state == ArmedState.Idle)
+                if (state == ArmedState.Idle || hitAnimations.Value)
                     return;
 
                 // adjust the visuals of certain object types to make them stay on screen for longer than usual.
@@ -60,6 +71,15 @@ namespace osu.Game.Rulesets.Osu.Edit
                         circle.ApproachCircle
                               .FadeOutFromOne(editor_hit_object_fade_out_extension * 4)
                               .Expire();
+
+                        circle.ApproachCircle.ScaleTo(1.1f, 300, Easing.OutQuint);
+
+                        var circlePieceDrawable = circle.CirclePiece.Drawable;
+
+                        // clear any explode animation logic.
+                        circlePieceDrawable.ApplyTransformsAt(circle.HitStateUpdateTime, true);
+                        circlePieceDrawable.ClearTransformsAfter(circle.HitStateUpdateTime, true);
+
                         break;
                 }
 

From de04caeace220426ed615efa6d3cabe4f76c88af Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 21 Apr 2021 13:53:08 +0200
Subject: [PATCH 09383/10326] Fixed race condition in StarRatingDisplay

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index a3e9336648..8367b1fc6d 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -28,9 +29,10 @@ namespace osu.Game.Screens.Ranking.Expanded
         private OsuColour colours { get; set; }
 
         private CircularContainer colorContainer;
-        private OsuTextFlowContainer textContainer;
         private CancellationTokenSource cancellationTokenSource;
         private IBindable<StarDifficulty?> bindableStarDifficulty;
+        private OsuSpriteText wholePartText;
+        private OsuSpriteText fractionPartText;
 
         private readonly StarDifficulty starDifficulty;
         private readonly BeatmapInfo beatmapInfo;
@@ -66,24 +68,10 @@ namespace osu.Game.Screens.Ranking.Expanded
 
             colorContainer.Colour = backgroundColour;
 
-            textContainer.Text = string.Empty;
+            wholePartText.Text = $"{wholePart}";
+            fractionPartText.Text = $"{separator}{fractionPart}";
 
-            textContainer.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;
-                });
-            });
+            
         }
 
         [BackgroundDependencyLoader]
@@ -130,14 +118,28 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        textContainer = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.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(wholePartText = new OsuSpriteText(), s =>
+                            {
+                                s.Colour = Color4.Black;
+                                s.Font = s.Font.With(size:14);
+                                s.UseFullGlyphHeight = false;
+                            });
+                            t.AddText(fractionPartText = new OsuSpriteText(), s =>
+                            {
+                                s.Colour = Color4.Black;
+                                s.Font = s.Font.With(size: 7);
+                                s.UseFullGlyphHeight = false;
+                            });
+                        }),
                     }
                 }
             };

From 9fba87f67ace6c74bb452d8b8720a78dfc97b82c Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 21 Apr 2021 13:53:25 +0200
Subject: [PATCH 09384/10326] Moved Info and Background into own container

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   |  8 ++-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 58 +++++++++++++------
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 9c10c9751c..90bd4ceb88 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -135,15 +135,15 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void selectBeatmap([CanBeNull] IBeatmap b)
         {
-            BeatmapInfoWedge.BufferedWedgeBackground backgroundBefore = null;
+            BeatmapInfoWedge.BeatmapInfoWedgeContainer containerBefore = null;
 
             AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
             {
-                backgroundBefore = infoWedge.Background;
+                containerBefore = infoWedge.Container;
                 infoWedge.Beatmap = Beatmap.Value = b == null ? Beatmap.Default : CreateWorkingBeatmap(b);
             });
 
-            AddUntilStep("wait for async load", () => infoWedge.Background != backgroundBefore);
+            AddUntilStep("wait for async load", () => infoWedge.Container != containerBefore);
         }
 
         private IBeatmap createTestBeatmap(RulesetInfo ruleset)
@@ -196,6 +196,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             public new BufferedWedgeBackground Background => base.Background;
 
             public new WedgeInfoText Info => base.Info;
+
+            public new BeatmapInfoWedgeContainer Container => base.Container;
         }
 
         private class TestHitObject : ConvertHitObject, IHasPosition
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 9077c115d4..5bb7bbe9fd 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -41,8 +41,9 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        protected BufferedWedgeBackground Background;
-        protected WedgeInfoText Info;
+        protected BeatmapInfoWedgeContainer Container;
+        protected WedgeInfoText Info => Container.Info;
+        protected BufferedWedgeBackground Background => Container.Background;
 
         public BeatmapInfoWedge()
         {
@@ -94,9 +95,9 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public override bool IsPresent => base.IsPresent || Background == null; // Visibility is updated in the LoadComponentAsync callback
+        public override bool IsPresent => base.IsPresent || Container == null; // Visibility is updated in the LoadComponentAsync callback
 
-        private BufferedWedgeBackground loadingInfo;
+        private BeatmapInfoWedgeContainer loadingInfo;
 
         private void updateDisplay()
         {
@@ -108,13 +109,9 @@ namespace osu.Game.Screens.Select
                 {
                     State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
 
-                    Info?.FadeOut(250);
-                    Info?.Expire();
-                    Info = null;
-
-                    Background?.FadeOut(250);
-                    Background?.Expire();
-                    Background = null;
+                    Container?.FadeOut(250);
+                    Container?.Expire();
+                    Container = null;
                 }
 
                 if (beatmap == null)
@@ -123,25 +120,50 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BufferedWedgeBackground(beatmap)
+                LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value)
                 {
                     Shear = -Shear,
-                    Depth = Background?.Depth + 1 ?? 0
                 }, loaded =>
                 {
                     // ensure we are the most recent loaded wedge.
                     if (loaded != loadingInfo) return;
 
                     removeOldInfo();
-                    Add(Background = loaded);
-                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value)
-                    {
-                        Shear = -Shear
-                    });
+                    Add(Container = loaded);
                 });
             }
         }
 
+        public class BeatmapInfoWedgeContainer : Container
+        {
+            private readonly WorkingBeatmap beatmap;
+            private readonly RulesetInfo ruleset;
+
+            internal BufferedWedgeBackground Background;
+            internal WedgeInfoText Info;
+
+            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset)
+            {
+                this.beatmap = beatmap;
+                this.ruleset = ruleset;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                Children = new Drawable[]
+                {
+                    Background = new BufferedWedgeBackground(beatmap)
+                    {
+                        Depth = Background?.Depth + 1 ?? 0,
+                    },
+                    Info = new WedgeInfoText(beatmap, ruleset),
+                };
+            }
+        }
+
         public class WedgeInfoText : Container
         {
             public FillFlowContainer MapperContainer { get; private set; }

From d6928e91fd1046373476a3ba3a53d16ce55563b4 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 21 Apr 2021 14:02:09 +0200
Subject: [PATCH 09385/10326] Removed BeatmapInfo in StarRatingDisplay

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 45 +++++--------------
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 14 +++---
 2 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 8367b1fc6d..ea4936bd82 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -29,13 +29,19 @@ namespace osu.Game.Screens.Ranking.Expanded
         private OsuColour colours { get; set; }
 
         private CircularContainer colorContainer;
-        private CancellationTokenSource cancellationTokenSource;
-        private IBindable<StarDifficulty?> bindableStarDifficulty;
         private OsuSpriteText wholePartText;
         private OsuSpriteText fractionPartText;
+        private StarDifficulty starDifficulty;
 
-        private readonly StarDifficulty starDifficulty;
-        private readonly BeatmapInfo beatmapInfo;
+        public StarDifficulty StarDifficulty
+        {
+            get => starDifficulty;
+            set
+            {
+                starDifficulty = value;
+                setDifficulty(starDifficulty);
+            }
+        }
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
@@ -46,15 +52,6 @@ namespace osu.Game.Screens.Ranking.Expanded
             this.starDifficulty = starDifficulty;
         }
 
-        /// <summary>
-        /// Creates a new <see cref="StarRatingDisplay"/> using a <see cref="BeatmapInfo"/> to use a bindable for the difficulty.
-        /// </summary>
-        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to use to create a bindable for <see cref="StarDifficulty"/></param>
-        public StarRatingDisplay(BeatmapInfo beatmapInfo)
-        {
-            this.beatmapInfo = beatmapInfo;
-        }
-
         private void setDifficulty(StarDifficulty difficulty)
         {
             var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
@@ -71,21 +68,12 @@ namespace osu.Game.Screens.Ranking.Expanded
             wholePartText.Text = $"{wholePart}";
             fractionPartText.Text = $"{separator}{fractionPart}";
 
-            
+
         }
 
         [BackgroundDependencyLoader]
         private void load(BeatmapDifficultyCache difficultyCache)
         {
-            if (beatmapInfo != null)
-            {
-                cancellationTokenSource?.Cancel();
-                cancellationTokenSource = new CancellationTokenSource();
-
-                bindableStarDifficulty?.UnbindAll();
-                bindableStarDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
-            }
-
             AutoSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
@@ -144,16 +132,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                 }
             };
 
-            if (bindableStarDifficulty != null)
-                bindableStarDifficulty.BindValueChanged(valueChanged => setDifficulty(valueChanged.NewValue ?? new StarDifficulty()), true);
-            else
-                setDifficulty(starDifficulty);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            cancellationTokenSource?.Cancel();
+            setDifficulty(starDifficulty);
         }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 5bb7bbe9fd..7803b190e6 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
-            private Drawable starRatingDisplay;
+            private StarRatingDisplay starRatingDisplay;
             private Container bpmLabelContainer;
             private ModSettingChangeTracker settingChangeTracker;
             private CancellationTokenSource cancellationTokenSource;
@@ -246,9 +246,9 @@ namespace osu.Game.Screens.Select
                         Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
                         AutoSizeAxes = Axes.Both,
                         Shear = wedged_container_shear,
-                        Children = new[]
+                        Children = new Drawable[]
                         {
-                            starRatingDisplay = new StarRatingDisplay(beatmapInfo)
+                            starRatingDisplay = new StarRatingDisplay(starDifficulty.Value ?? new StarDifficulty())
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
@@ -311,19 +311,21 @@ namespace osu.Game.Screens.Select
 
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
-                starDifficulty.BindValueChanged(_ => setStarRatingDisplayVisibility(), true);
+                starDifficulty.BindValueChanged(updateStarRatingDisplay, true);
 
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
             }
 
-            private void setStarRatingDisplayVisibility()
+            private void updateStarRatingDisplay(ValueChangedEvent<StarDifficulty?> valueChanged)
             {
-                if (starDifficulty.Value.HasValue && starDifficulty.Value.Value.Stars > 0)
+                if (valueChanged.NewValue.HasValue && valueChanged.NewValue.Value.Stars > 0)
                     starRatingDisplay.Show();
                 else
                     starRatingDisplay.Hide();
+
+                starRatingDisplay.StarDifficulty = valueChanged.NewValue ?? new StarDifficulty();
             }
 
             private InfoLabel[] getRulesetInfoLabels()

From 0dfd0bb59d731a46419f4840883ff433b88ce5d1 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 21 Apr 2021 14:16:16 +0200
Subject: [PATCH 09386/10326] Refactored background of BeatmapInfoWedge

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   |  2 -
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 57 +---------------
 .../Select/BeatmapInfoWedgeBackground.cs      | 66 +++++++++++++++++++
 3 files changed, 68 insertions(+), 57 deletions(-)
 create mode 100644 osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 90bd4ceb88..688cc9a035 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -193,8 +193,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
-            public new BufferedWedgeBackground Background => base.Background;
-
             public new WedgeInfoText Info => base.Info;
 
             public new BeatmapInfoWedgeContainer Container => base.Container;
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 7803b190e6..b499423412 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -11,7 +11,6 @@ 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.Utils;
 using osu.Game.Beatmaps;
@@ -43,7 +42,6 @@ namespace osu.Game.Screens.Select
 
         protected BeatmapInfoWedgeContainer Container;
         protected WedgeInfoText Info => Container.Info;
-        protected BufferedWedgeBackground Background => Container.Background;
 
         public BeatmapInfoWedge()
         {
@@ -123,6 +121,7 @@ namespace osu.Game.Screens.Select
                 LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value)
                 {
                     Shear = -Shear,
+                    Depth = Container?.Depth + 1 ?? 0,
                 }, loaded =>
                 {
                     // ensure we are the most recent loaded wedge.
@@ -139,7 +138,6 @@ namespace osu.Game.Screens.Select
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
 
-            internal BufferedWedgeBackground Background;
             internal WedgeInfoText Info;
 
             public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset)
@@ -155,10 +153,7 @@ namespace osu.Game.Screens.Select
 
                 Children = new Drawable[]
                 {
-                    Background = new BufferedWedgeBackground(beatmap)
-                    {
-                        Depth = Background?.Depth + 1 ?? 0,
-                    },
+                    new BeatmapInfoWedgeBackground(beatmap),
                     Info = new WedgeInfoText(beatmap, ruleset),
                 };
             }
@@ -572,53 +567,5 @@ namespace osu.Game.Screens.Select
                 settingChangeTracker?.Dispose();
             }
         }
-
-        public class BufferedWedgeBackground : BufferedContainer
-        {
-            private readonly WorkingBeatmap beatmap;
-
-            public BufferedWedgeBackground(WorkingBeatmap beatmap)
-                : base(pixelSnapping: true)
-            {
-                this.beatmap = beatmap;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(LocalisationManager localisation)
-            {
-                CacheDrawnFrameBuffer = true;
-                RelativeSizeAxes = Axes.Both;
-
-                Children = new Drawable[]
-                {
-                    // We will create the white-to-black gradient by modulating transparency and having
-                    // a black backdrop. This results in an sRGB-space gradient and not linear space,
-                    // transitioning from white to black more perceptually uniformly.
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
-                    },
-                    // We use a container, such that we can set the colour gradient to go across the
-                    // vertices of the masked container instead of the vertices of the (larger) sprite.
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
-                        Children = new[]
-                        {
-                            // Zoomed-in and cropped beatmap background
-                            new BeatmapBackgroundSprite(beatmap)
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                FillMode = FillMode.Fill,
-                            },
-                        },
-                    },
-                };
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
new file mode 100644
index 0000000000..566f49a799
--- /dev/null
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.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 osuTK.Graphics;
+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.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Framework.Graphics.Shapes;
+
+namespace osu.Game.Screens.Select
+{
+    internal class BeatmapInfoWedgeBackground : CompositeDrawable
+    {
+        private readonly WorkingBeatmap beatmap;
+
+        public BeatmapInfoWedgeBackground(WorkingBeatmap beatmap)
+        {
+            this.beatmap = beatmap;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChild = new BufferedContainer(pixelSnapping: true)
+            {
+                CacheDrawnFrameBuffer = true,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    // We will create the white-to-black gradient by modulating transparency and having
+                    // a black backdrop. This results in an sRGB-space gradient and not linear space,
+                    // transitioning from white to black more perceptually uniformly.
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black,
+                    },
+                    // We use a container, such that we can set the colour gradient to go across the
+                    // vertices of the masked container instead of the vertices of the (larger) sprite.
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
+                        Children = new[]
+                        {
+                            // Zoomed-in and cropped beatmap background
+                            new BeatmapBackgroundSprite(beatmap)
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                FillMode = FillMode.Fill,
+                            },
+                        },
+                    },
+                }
+            };
+        }
+    }
+}

From 56a69ed95682e9096f2b8e4b518346b7a66b9308 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 21 Apr 2021 15:53:28 +0200
Subject: [PATCH 09387/10326] Codestyle fixes

---
 osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index ea4936bd82..bfc336a677 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -2,9 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Globalization;
-using System.Threading;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -67,8 +65,6 @@ namespace osu.Game.Screens.Ranking.Expanded
 
             wholePartText.Text = $"{wholePart}";
             fractionPartText.Text = $"{separator}{fractionPart}";
-
-
         }
 
         [BackgroundDependencyLoader]
@@ -118,7 +114,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                             t.AddText(wholePartText = new OsuSpriteText(), s =>
                             {
                                 s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size:14);
+                                s.Font = s.Font.With(size: 14);
                                 s.UseFullGlyphHeight = false;
                             });
                             t.AddText(fractionPartText = new OsuSpriteText(), s =>

From 2bea6256137a82375ac2e0f05a39f95b4f286503 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 23:21:03 +0900
Subject: [PATCH 09388/10326] Fix initial playback states not being correct

---
 .../TestSceneMultiplayerSpectator.cs          | 11 ++-----
 .../Spectate/MultiplayerSpectator.cs          | 14 +++------
 .../Spectate/MultiplayerSpectatorPlayer.cs    | 31 ++++++++++++++++---
 .../Spectate/Sync/CatchUpSlaveClock.cs        |  2 +-
 4 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index e395ebd29d..9ec7bfb60b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -256,17 +256,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         private void checkPaused(int userId, bool state) =>
-            AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().IsPaused.Value == state);
+            AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
 
         private void checkPausedInstant(int userId, bool state) =>
-            AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().IsPaused.Value == state);
-
-        /// <summary>
-        /// Returns time(user1) - time(user2).
-        /// </summary>
-        private double getGameplayOffset(int user1, int user2) => getGameplayTime(user1) - getGameplayTime(user2);
-
-        private double getGameplayTime(int userId) => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().Single().GameplayClock.CurrentTime;
+            AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index a5bd449e7e..2db470da67 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -39,10 +39,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private void load()
         {
             Container leaderboardContainer;
+            masterClockContainer = new MasterGameplayClockContainer(Beatmap.Value, 0);
 
-            masterClockContainer = new MasterGameplayClockContainer(Beatmap.Value, 0)
+            InternalChildren = new[]
             {
-                Child = new GridContainer
+                (Drawable)(syncManager = new CatchUpSyncManager(masterClockContainer)),
+                masterClockContainer.WithChild(new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     ColumnDimensions = new[]
@@ -61,13 +63,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                             grid = new PlayerGrid { RelativeSizeAxes = Axes.Both }
                         }
                     }
-                }
-            };
-
-            InternalChildren = new[]
-            {
-                (Drawable)(syncManager = new CatchUpSyncManager(masterClockContainer)),
-                masterClockContainer
+                })
             };
 
             for (int i = 0; i < UserIds.Length; i++)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 55f483586c..5af0d19a4d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
@@ -12,22 +13,31 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        private readonly ISlaveClock gameplayClock;
+        private readonly Bindable<bool> waitingOnFrames = new Bindable<bool>(true);
+        private readonly Score score;
+        private readonly ISlaveClock slaveClock;
 
-        public MultiplayerSpectatorPlayer(Score score, ISlaveClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, ISlaveClock slaveClock)
             : base(score)
         {
-            this.gameplayClock = gameplayClock;
+            this.score = score;
+            this.slaveClock = slaveClock;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            gameplayClock.WaitingOnFrames.BindTo(DrawableRuleset.FrameStableClock.WaitingOnFrames);
+            slaveClock.WaitingOnFrames.BindTo(waitingOnFrames);
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+            waitingOnFrames.Value = DrawableRuleset.FrameStableClock.WaitingOnFrames.Value || score.Replay.Frames.Count == 0;
         }
 
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
-            => new SubGameplayClockContainer(gameplayClock);
+            => new SubGameplayClockContainer(slaveClock);
     }
 
     public class SubGameplayClockContainer : GameplayClockContainer
@@ -37,6 +47,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
         }
 
+        protected override void Update()
+        {
+            // The slave clock's running state is controlled by the sync manager, but the local pausing state needs to be updated to stop gameplay.
+            if (SourceClock.IsRunning)
+                Start();
+            else
+                Stop();
+
+            base.Update();
+        }
+
         protected override GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
index f128ea619b..cefe5ff04f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
         public FrameTimeInfo TimeInfo => new FrameTimeInfo { Elapsed = ElapsedFrameTime, Current = CurrentTime };
 
-        public IBindable<bool> WaitingOnFrames { get; } = new Bindable<bool>();
+        public IBindable<bool> WaitingOnFrames { get; } = new Bindable<bool>(true);
 
         public bool IsCatchingUp { get; set; }
     }

From 1ca2152e6191e0da98abdf034f1d50c20734fe7b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 23:22:36 +0900
Subject: [PATCH 09389/10326] Privatise + rename to SlaveGameplayClockContainer

---
 .../Spectate/MultiplayerSpectatorPlayer.cs    | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 5af0d19a4d..69b38c61f7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -37,27 +37,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
-            => new SubGameplayClockContainer(slaveClock);
-    }
+            => new SlaveGameplayClockContainer(slaveClock);
 
-    public class SubGameplayClockContainer : GameplayClockContainer
-    {
-        public SubGameplayClockContainer(IClock sourceClock)
-            : base(sourceClock)
+        private class SlaveGameplayClockContainer : GameplayClockContainer
         {
+            public SlaveGameplayClockContainer(IClock sourceClock)
+                : base(sourceClock)
+            {
+            }
+
+            protected override void Update()
+            {
+                // The slave clock's running state is controlled by the sync manager, but the local pausing state needs to be updated to stop gameplay.
+                if (SourceClock.IsRunning)
+                    Start();
+                else
+                    Stop();
+
+                base.Update();
+            }
+
+            protected override GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
         }
-
-        protected override void Update()
-        {
-            // The slave clock's running state is controlled by the sync manager, but the local pausing state needs to be updated to stop gameplay.
-            if (SourceClock.IsRunning)
-                Start();
-            else
-                Stop();
-
-            base.Update();
-        }
-
-        protected override GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
     }
 }

From 60b702549dd2bfc42f21a73831396edf9c7dedac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 14:20:49 +0900
Subject: [PATCH 09390/10326] 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 3324af7c51..7b97103851 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.421.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.422.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fcd1ed6987..b27e00f59d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.421.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.422.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 34810a3106..d07e16ea56 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.Framework.iOS" Version="2021.421.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.422.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.421.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.422.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 21f34be19fe58a3cfaca1f2182dc1054aed0aca4 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 22 Apr 2021 14:42:10 +0900
Subject: [PATCH 09391/10326] Add support for per-ruleset sample playback when
 switching rulesets (via toolbar)

---
 .../Overlays/Toolbar/ToolbarRulesetSelector.cs     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
index 905d5b44c6..eb235632e8 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
@@ -13,6 +14,8 @@ using osu.Framework.Input.Events;
 using osuTK.Input;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -20,6 +23,8 @@ namespace osu.Game.Overlays.Toolbar
     {
         protected Drawable ModeButtonLine { get; private set; }
 
+        private readonly Dictionary<string, Sample> selectionSamples = new Dictionary<string, Sample>();
+
         public ToolbarRulesetSelector()
         {
             RelativeSizeAxes = Axes.Y;
@@ -27,7 +32,7 @@ namespace osu.Game.Overlays.Toolbar
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
             AddRangeInternal(new[]
             {
@@ -54,6 +59,9 @@ namespace osu.Game.Overlays.Toolbar
                     }
                 }
             });
+
+            foreach (var ruleset in Rulesets.AvailableRulesets)
+                selectionSamples[ruleset.ShortName] = audio.Samples.Get($"UI/ruleset-select-{ruleset.ShortName}");
         }
 
         protected override void LoadComplete()
@@ -72,6 +80,10 @@ namespace osu.Game.Overlays.Toolbar
             if (SelectedTab != null)
             {
                 ModeButtonLine.MoveToX(SelectedTab.DrawPosition.X, !hasInitialPosition ? 0 : 200, Easing.OutQuint);
+
+                if (hasInitialPosition)
+                    selectionSamples[SelectedTab.Value.ShortName]?.Play();
+
                 hasInitialPosition = true;
             }
         });

From ea3bb07924f6be8126dc8bc1894478db9f00ba82 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 14:51:14 +0900
Subject: [PATCH 09392/10326] Add test that fails on incorrect system/info
 message ordering

---
 .../Online/TestSceneStandAloneChatDisplay.cs  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 01e67b1681..165fff99dd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -83,6 +83,28 @@ namespace osu.Game.Tests.Visual.Online
             };
         });
 
+        [Test]
+        public void TestSystemMessageOrdering()
+        {
+            var standardMessage = new Message(messageIdSequence++)
+            {
+                Sender = admin,
+                Content = "I am a wang!"
+            };
+
+            var infoMessage1 = new InfoMessage($"the system is calling {messageIdSequence++}");
+            var infoMessage2 = new InfoMessage($"the system is calling {messageIdSequence++}");
+
+            AddStep("message from admin", () => testChannel.AddNewMessages(standardMessage));
+            AddStep("message from system", () => testChannel.AddNewMessages(infoMessage1));
+            AddStep("message from system", () => testChannel.AddNewMessages(infoMessage2));
+
+            AddAssert("message order is correct", () => testChannel.Messages.Count == 3
+                                                        && testChannel.Messages[0] == standardMessage
+                                                        && testChannel.Messages[1] == infoMessage1
+                                                        && testChannel.Messages[2] == infoMessage2);
+        }
+
         [Test]
         public void TestManyMessages()
         {

From 3befb49ea9e5ed6420c053ba4b07bd58f56fac75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 14:51:57 +0900
Subject: [PATCH 09393/10326] Fix system messages always being displayed above
 standard messages

Closes https://github.com/ppy/osu/issues/12509.
---
 osu.Game/Online/Chat/InfoMessage.cs | 4 +---
 osu.Game/Online/Chat/Message.cs     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Chat/InfoMessage.cs b/osu.Game/Online/Chat/InfoMessage.cs
index 8dce188804..cea336aae2 100644
--- a/osu.Game/Online/Chat/InfoMessage.cs
+++ b/osu.Game/Online/Chat/InfoMessage.cs
@@ -8,10 +8,8 @@ namespace osu.Game.Online.Chat
 {
     public class InfoMessage : LocalMessage
     {
-        private static int infoID = -1;
-
         public InfoMessage(string message)
-            : base(infoID--)
+            : base(null)
         {
             Timestamp = DateTimeOffset.Now;
             Content = message;
diff --git a/osu.Game/Online/Chat/Message.cs b/osu.Game/Online/Chat/Message.cs
index 2e41038a59..30753b3920 100644
--- a/osu.Game/Online/Chat/Message.cs
+++ b/osu.Game/Online/Chat/Message.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Online.Chat
             return Id.Value.CompareTo(other.Id.Value);
         }
 
-        public virtual bool Equals(Message other) => Id == other?.Id;
+        public virtual bool Equals(Message other) => Id.HasValue && Id == other?.Id;
 
         // ReSharper disable once ImpureMethodCallOnReadonlyValueField
         public override int GetHashCode() => Id.GetHashCode();

From b37c5a8749422ccdd93caeeea815aa5013f26353 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 14:59:57 +0900
Subject: [PATCH 09394/10326] Rollback hold note placement when length is zero

---
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index a13afdfffe..093a8da24f 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 return;
 
             base.OnMouseUp(e);
-            EndPlacement(true);
+            EndPlacement(HitObject.Duration > 0);
         }
 
         private double originalStartTime;

From cf1e3ea98873897de95984f79846ca7282a7581f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 15:41:21 +0900
Subject: [PATCH 09395/10326] Add failing test covering quick shift-rightclick
 deletion in placement mode

---
 .../Editing/TestSceneEditorSelection.cs       | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 99f31b0c2a..c9b6d2e376 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
@@ -156,9 +157,35 @@ namespace osu.Game.Tests.Visual.Editing
         }
 
         [Test]
-        public void TestQuickDeleteRemovesObject()
+        public void TestQuickDeleteRemovesObjectInPlacement()
         {
-            var addedObject = new HitCircle { StartTime = 1000 };
+            var addedObject = new HitCircle
+            {
+                StartTime = 0,
+                Position = OsuPlayfield.BASE_SIZE * 0.5f
+            };
+
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            AddStep("enter placement mode", () => InputManager.PressKey(Key.Number2));
+
+            moveMouseToObject(() => addedObject);
+
+            AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
+            AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));
+
+            AddAssert("no hitobjects in beatmap", () => EditorBeatmap.HitObjects.Count == 0);
+        }
+
+        [Test]
+        public void TestQuickDeleteRemovesObjectInSelection()
+        {
+            var addedObject = new HitCircle
+            {
+                StartTime = 0,
+                Position = OsuPlayfield.BASE_SIZE * 0.5f
+            };
 
             AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
 

From 9a7bf8109ff7029ad76e2d60b389d660d062ec57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 15:27:08 +0900
Subject: [PATCH 09396/10326] Allow certain mouse input to pass through
 `PlacementBlueprints` to the selection logic

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 6c1cd01796..4ad8c815fe 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Edit
 {
@@ -128,8 +129,11 @@ namespace osu.Game.Rulesets.Edit
                 case DoubleClickEvent _:
                     return false;
 
-                case MouseButtonEvent _:
-                    return true;
+                case MouseButtonEvent mouse:
+                    // placement blueprints should generally block mouse from reaching underlying components (ie. performing clicks on interface buttons).
+                    // for now, the one exception we want to allow is when using a non-main mouse button when shift is pressed, which is used to trigger object deletion
+                    // while in placement mode.
+                    return mouse.Button == MouseButton.Left || !mouse.ShiftPressed;
 
                 default:
                     return false;

From 3e1002fbf36650b9a91a6a04df9d15c0d220f8f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 17:06:08 +0900
Subject: [PATCH 09397/10326] Improve osu!catch caught fruit placement
 algorithm

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 29 +++++++++++++++++----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index d045dcf16a..8edc5d0eb2 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -53,6 +53,11 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public const double BASE_SPEED = 1.0;
 
+        /// <summary>
+        /// The amount by which caught fruit should be scaled down to fit on the plate.
+        /// </summary>
+        private const float caught_fruit_scale_adjust = 0.5f;
+
         [NotNull]
         private readonly Container trailsTarget;
 
@@ -240,7 +245,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (result.IsHit)
             {
-                var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplaySize.X / 2);
+                var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplaySize.X);
 
                 if (CatchFruitOnPlate)
                     placeCaughtObject(palpableObject, positionInStack);
@@ -470,7 +475,7 @@ namespace osu.Game.Rulesets.Catch.UI
             caughtObject.CopyStateFrom(drawableObject);
             caughtObject.Anchor = Anchor.TopCentre;
             caughtObject.Position = position;
-            caughtObject.Scale /= 2;
+            caughtObject.Scale *= caught_fruit_scale_adjust;
 
             caughtObjectContainer.Add(caughtObject);
 
@@ -480,19 +485,21 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private Vector2 computePositionInStack(Vector2 position, float displayRadius)
         {
-            const float radius_div_2 = CatchHitObject.OBJECT_RADIUS / 2;
-            const float allowance = 10;
+            // this is taken from osu-stable (lenience should be 10 * 10 at standard scale).
+            const float lenience_adjust = 10 / CatchHitObject.OBJECT_RADIUS;
 
-            while (caughtObjectContainer.Any(f => Vector2Extensions.Distance(f.Position, position) < (displayRadius + radius_div_2) / (allowance / 2)))
+            float adjustedRadius = displayRadius * lenience_adjust;
+            float checkDistance = MathF.Pow(adjustedRadius, 2);
+
+            // offset fruit vertically to better place "above" the plate.
+            position.Y -= 5;
+
+            while (caughtObjectContainer.Any(f => Vector2Extensions.DistanceSquared(f.Position, position) < checkDistance))
             {
-                float diff = (displayRadius + radius_div_2) / allowance;
-
-                position.X += (RNG.NextSingle() - 0.5f) * diff * 2;
-                position.Y -= RNG.NextSingle() * diff;
+                position.X += RNG.NextSingle(-adjustedRadius, adjustedRadius);
+                position.Y -= RNG.NextSingle(0, 5);
             }
 
-            position.X = Math.Clamp(position.X, -CatcherArea.CATCHER_SIZE / 2, CatcherArea.CATCHER_SIZE / 2);
-
             return position;
         }
 

From 84a713822306f5a6dd4897b58e3894f6b669190f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 16:56:23 +0900
Subject: [PATCH 09398/10326] Update tests to better support stack regeneration
 cases

---
 .../TestSceneCatcher.cs                       | 33 ++++++++++++++-----
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |  7 +++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 48efd73222..f8e278a486 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Catch.UI;
 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.Configuration;
@@ -170,16 +171,25 @@ namespace osu.Game.Rulesets.Catch.Tests
         }
 
         [Test]
-        public void TestCatcherStacking()
+        public void TestCatcherRandomStacking()
+        {
+            AddStep("catch more fruits", () => attemptCatch(() => new Fruit
+            {
+                X = (RNG.NextSingle() - 0.5f) * CatcherArea.CATCHER_SIZE
+            }, 50));
+        }
+
+        [Test]
+        public void TestCatcherStackingSameCaughtPosition()
         {
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             checkPlate(1);
-            AddStep("catch more fruits", () => attemptCatch(new Fruit(), 9));
+            AddStep("catch more fruits", () => attemptCatch(() => new Fruit(), 9));
             checkPlate(10);
             AddAssert("caught objects are stacked", () =>
-                catcher.CaughtObjects.All(obj => obj.Y <= 0) &&
-                catcher.CaughtObjects.Any(obj => obj.Y == 0) &&
-                catcher.CaughtObjects.Any(obj => obj.Y < -20));
+                catcher.CaughtObjects.All(obj => obj.Y <= Catcher.CAUGHT_FRUIT_VERTICAL_OFFSET) &&
+                catcher.CaughtObjects.Any(obj => obj.Y == Catcher.CAUGHT_FRUIT_VERTICAL_OFFSET) &&
+                catcher.CaughtObjects.Any(obj => obj.Y < -25));
         }
 
         [Test]
@@ -189,11 +199,11 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("catch tiny droplet", () => attemptCatch(new TinyDroplet()));
             AddAssert("tiny droplet is exploded", () => catcher.CaughtObjects.Count() == 1 && droppedObjectContainer.Count == 1);
             AddUntilStep("wait explosion", () => !droppedObjectContainer.Any());
-            AddStep("catch more fruits", () => attemptCatch(new Fruit(), 9));
+            AddStep("catch more fruits", () => attemptCatch(() => new Fruit(), 9));
             AddStep("explode", () => catcher.Explode());
             AddAssert("fruits are exploded", () => !catcher.CaughtObjects.Any() && droppedObjectContainer.Count == 10);
             AddUntilStep("wait explosion", () => !droppedObjectContainer.Any());
-            AddStep("catch fruits", () => attemptCatch(new Fruit(), 10));
+            AddStep("catch fruits", () => attemptCatch(() => new Fruit(), 10));
             AddStep("drop", () => catcher.Drop());
             AddAssert("fruits are dropped", () => !catcher.CaughtObjects.Any() && droppedObjectContainer.Count == 10);
         }
@@ -222,10 +232,15 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private void checkHyperDash(bool state) => AddAssert($"catcher is {(state ? "" : "not ")}hyper dashing", () => catcher.HyperDashing == state);
 
-        private void attemptCatch(CatchHitObject hitObject, int count = 1)
+        private void attemptCatch(CatchHitObject hitObject)
+        {
+            attemptCatch(() => hitObject, 1);
+        }
+
+        private void attemptCatch(Func<CatchHitObject> hitObject, int count)
         {
             for (var i = 0; i < count; i++)
-                attemptCatch(hitObject, out _, out _);
+                attemptCatch(hitObject(), out _, out _);
         }
 
         private void attemptCatch(CatchHitObject hitObject, out DrawableCatchHitObject drawableObject, out JudgementResult result)
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 8edc5d0eb2..4fc9e32a73 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -53,6 +53,11 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public const double BASE_SPEED = 1.0;
 
+        /// <summary>
+        /// The amount by which caught fruit should be offset from the plate surface to make them look visually "caught".
+        /// </summary>
+        public const float CAUGHT_FRUIT_VERTICAL_OFFSET = -5;
+
         /// <summary>
         /// The amount by which caught fruit should be scaled down to fit on the plate.
         /// </summary>
@@ -492,7 +497,7 @@ namespace osu.Game.Rulesets.Catch.UI
             float checkDistance = MathF.Pow(adjustedRadius, 2);
 
             // offset fruit vertically to better place "above" the plate.
-            position.Y -= 5;
+            position.Y += CAUGHT_FRUIT_VERTICAL_OFFSET;
 
             while (caughtObjectContainer.Any(f => Vector2Extensions.DistanceSquared(f.Position, position) < checkDistance))
             {

From dc2bc462b8c68b44b6e927ec84bbf87fc0586df3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 17:27:23 +0900
Subject: [PATCH 09399/10326] Expose internal catcher width calculation methods

---
 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 4fc9e32a73..0d6a577d1e 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -212,13 +212,13 @@ namespace osu.Game.Rulesets.Catch.UI
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
         /// <param name="scale">The scale of the catcher.</param>
-        internal static float CalculateCatchWidth(Vector2 scale) => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * ALLOWED_CATCH_RANGE;
+        public static float CalculateCatchWidth(Vector2 scale) => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * ALLOWED_CATCH_RANGE;
 
         /// <summary>
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
         /// <param name="difficulty">The beatmap difficulty.</param>
-        internal static float CalculateCatchWidth(BeatmapDifficulty difficulty) => CalculateCatchWidth(calculateScale(difficulty));
+        public static float CalculateCatchWidth(BeatmapDifficulty difficulty) => CalculateCatchWidth(calculateScale(difficulty));
 
         /// <summary>
         /// Determine if this catcher can catch a <see cref="CatchHitObject"/> in the current position.

From 2203552e9e23528e79c63024d80186e4f5034bc2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 17:32:24 +0900
Subject: [PATCH 09400/10326] Add stacking test logic to `TestSceneCatcherArea`
 for skinned testing

---
 .../TestSceneCatcher.cs                       |  3 +-
 .../TestSceneCatcherArea.cs                   | 36 +++++++++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index f8e278a486..517027a9fc 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -175,7 +176,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch more fruits", () => attemptCatch(() => new Fruit
             {
-                X = (RNG.NextSingle() - 0.5f) * CatcherArea.CATCHER_SIZE
+                X = (RNG.NextSingle() - 0.5f) * Catcher.CalculateCatchWidth(Vector2.One)
             }, 50));
         }
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 1cbfa6338e..3e4ee5ffa9 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -8,6 +8,8 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
@@ -31,12 +33,32 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private float circleSize;
 
+        private ScheduledDelegate addManyFruit;
+
+        private BeatmapDifficulty beatmapDifficulty;
+
         public TestSceneCatcherArea()
         {
             AddSliderStep<float>("circle size", 0, 8, 5, createCatcher);
             AddToggleStep("hyper dash", t => this.ChildrenOfType<TestCatcherArea>().ForEach(area => area.ToggleHyperDash(t)));
 
-            AddStep("catch fruit", () => attemptCatch(new Fruit()));
+            AddStep("catch centered fruit", () => attemptCatch(new Fruit()));
+            AddStep("catch many random fruit", () =>
+            {
+                int count = 50;
+
+                addManyFruit?.Cancel();
+                addManyFruit = Scheduler.AddDelayed(() =>
+                {
+                    attemptCatch(new Fruit
+                    {
+                        X = (RNG.NextSingle() - 0.5f) * Catcher.CalculateCatchWidth(beatmapDifficulty),
+                    });
+
+                    if (count-- == 0)
+                        addManyFruit?.Cancel();
+                }, 50, true);
+            });
             AddStep("catch fruit last in combo", () => attemptCatch(new Fruit { LastInCombo = true }));
             AddStep("catch kiai fruit", () => attemptCatch(new TestSceneCatcher.TestKiaiFruit()));
             AddStep("miss last in combo", () => attemptCatch(new Fruit { X = 100, LastInCombo = true }));
@@ -45,10 +67,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         private void attemptCatch(Fruit fruit)
         {
             fruit.X = fruit.OriginalX + catcher.X;
-            fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty
-            {
-                CircleSize = circleSize
-            });
+            fruit.ApplyDefaults(new ControlPointInfo(), beatmapDifficulty);
 
             foreach (var area in this.ChildrenOfType<CatcherArea>())
             {
@@ -71,6 +90,11 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             circleSize = size;
 
+            beatmapDifficulty = new BeatmapDifficulty
+            {
+                CircleSize = circleSize
+            };
+
             SetContents(() =>
             {
                 var droppedObjectContainer = new Container<CaughtObject>
@@ -84,7 +108,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     Children = new Drawable[]
                     {
                         droppedObjectContainer,
-                        new TestCatcherArea(droppedObjectContainer, new BeatmapDifficulty { CircleSize = size })
+                        new TestCatcherArea(droppedObjectContainer, beatmapDifficulty)
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.TopCentre,

From bdf07ad59a7cfc0abb796133001da52bd83f314b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 17:47:03 +0900
Subject: [PATCH 09401/10326] Limit catching towards the centre of the plate
 (to emulate actual gameplay)

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 3e4ee5ffa9..ad404e1f63 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 {
                     attemptCatch(new Fruit
                     {
-                        X = (RNG.NextSingle() - 0.5f) * Catcher.CalculateCatchWidth(beatmapDifficulty),
+                        X = (RNG.NextSingle() - 0.5f) * Catcher.CalculateCatchWidth(beatmapDifficulty) * 0.6f,
                     });
 
                     if (count-- == 0)

From 1884c18a2cc3d169012f89da64a16d65c7cd267f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 18:12:03 +0900
Subject: [PATCH 09402/10326] Ignore movement operations which have no offset

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index b1afbe0d61..f70e063ba9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -519,7 +519,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 // Apply the start time at the newly snapped-to position
                 double offset = result.Time.Value - movementBlueprints.First().HitObject.StartTime;
 
-                Beatmap.PerformOnSelection(obj => obj.StartTime += offset);
+                if (offset != 0)
+                    Beatmap.PerformOnSelection(obj => obj.StartTime += offset);
             }
 
             return true;

From 8a6267580a207fc63c88ed3a962037eeff7ad162 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 18:44:14 +0900
Subject: [PATCH 09403/10326] Fix nullref

---
 osu.Game/Scoring/ScoreInfo.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index bf131658ea..a6faaf6379 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -65,9 +65,11 @@ namespace osu.Game.Scoring
         {
             get
             {
-                Mod[] scoreMods = Array.Empty<Mod>();
+                var rulesetInstance = Ruleset?.CreateInstance();
+                if (rulesetInstance == null)
+                    return mods ?? Array.Empty<Mod>();
 
-                var rulesetInstance = Ruleset.CreateInstance();
+                Mod[] scoreMods = Array.Empty<Mod>();
 
                 if (mods != null)
                     scoreMods = mods;

From a5364b224f083be5d55a31c95203f7a65069f3cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 18:47:04 +0900
Subject: [PATCH 09404/10326] Add simple key based time nudging support to
 editor

---
 .../Editing/TestSceneEditorSelection.cs       | 22 ++++++++++
 .../Input/Bindings/GlobalActionContainer.cs   |  8 ++++
 .../Timeline/TimelineBlueprintContainer.cs    | 42 ++++++++++++++++++-
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 99f31b0c2a..c783ea1448 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -41,6 +41,28 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        [Test]
+        public void TestNudgeSelection()
+        {
+            HitCircle[] addedObjects = null;
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 200, Position = new Vector2(50) },
+                new HitCircle { StartTime = 300, Position = new Vector2(100) },
+                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+            }));
+
+            AddStep("select objects", () => EditorBeatmap.SelectedHitObjects.AddRange(addedObjects));
+
+            AddStep("nudge forwards", () => InputManager.Key(Key.K));
+            AddAssert("objects moved forwards in time", () => addedObjects[0].StartTime > 100);
+
+            AddStep("nudge backwards", () => InputManager.Key(Key.J));
+            AddAssert("objects reverted to original position", () => addedObjects[0].StartTime == 100);
+        }
+
         [Test]
         public void TestBasicSelect()
         {
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index e414e12dd1..6717de5658 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -71,6 +71,8 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.F3 }, GlobalAction.EditorTimingMode),
             new KeyBinding(new[] { InputKey.F4 }, GlobalAction.EditorSetupMode),
             new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.A }, GlobalAction.EditorVerifyMode),
+            new KeyBinding(new[] { InputKey.J }, GlobalAction.EditorNudgeLeft),
+            new KeyBinding(new[] { InputKey.K }, GlobalAction.EditorNudgeRight),
         };
 
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]
@@ -251,5 +253,11 @@ namespace osu.Game.Input.Bindings
 
         [Description("Verify mode")]
         EditorVerifyMode,
+
+        [Description("Nudge selection left")]
+        EditorNudgeLeft,
+
+        [Description("Nudge selection right")]
+        EditorNudgeRight
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 7a3781a981..3555bc2800 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -12,9 +12,11 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
+using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -237,10 +239,48 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        internal class TimelineSelectionHandler : SelectionHandler
+        internal class TimelineSelectionHandler : SelectionHandler, IKeyBindingHandler<GlobalAction>
         {
             // for now we always allow movement. snapping is provided by the Timeline's "distance" snap implementation
             public override bool HandleMovement(MoveSelectionEvent moveEvent) => true;
+
+            public bool OnPressed(GlobalAction action)
+            {
+                switch (action)
+                {
+                    case GlobalAction.EditorNudgeLeft:
+                        nudgeSelection(-1);
+                        return true;
+
+                    case GlobalAction.EditorNudgeRight:
+                        nudgeSelection(1);
+                        return true;
+                }
+
+                return false;
+            }
+
+            public void OnReleased(GlobalAction action)
+            {
+            }
+
+            /// <summary>
+            /// Nudge the current selection by the specified multiple of beat divisor lengths,
+            /// based on the timing at the first object in the selection.
+            /// </summary>
+            /// <param name="amount">The direction and count of beat divisor lengths to adjust.</param>
+            private void nudgeSelection(int amount)
+            {
+                var selected = EditorBeatmap.SelectedHitObjects;
+
+                if (selected.Count == 0)
+                    return;
+
+                var timingPoint = EditorBeatmap.ControlPointInfo.TimingPointAt(selected.First().StartTime);
+                double adjustment = timingPoint.BeatLength / EditorBeatmap.BeatDivisor * amount;
+
+                EditorBeatmap.PerformOnSelection(h => h.StartTime += adjustment);
+            }
         }
 
         private class TimelineDragBox : DragBox

From 30e6ea4291dd95fb87108263df1f677e151d32f4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 18:59:57 +0900
Subject: [PATCH 09405/10326] Add failing test

---
 .../TestSceneHoldNoteInput.cs                 | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 42ea12214f..668487f673 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -324,6 +324,33 @@ namespace osu.Game.Rulesets.Mania.Tests
             assertTailJudgement(HitResult.Ok);
         }
 
+        [Test]
+        public void TestZeroLength()
+        {
+            var beatmap = new Beatmap<ManiaHitObject>
+            {
+                HitObjects =
+                {
+                    new HoldNote
+                    {
+                        StartTime = 1000,
+                        Duration = 0,
+                        Column = 0,
+                    },
+                },
+                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+            };
+
+            performTest(new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(beatmap.HitObjects[0].StartTime, ManiaAction.Key1),
+                new ManiaReplayFrame(beatmap.HitObjects[0].GetEndTime() + 1),
+            }, beatmap);
+
+            AddAssert("hold note hit", () => judgementResults.Where(j => beatmap.HitObjects[0].NestedHitObjects.Contains(j.HitObject))
+                                                             .All(j => j.Type.IsHit()));
+        }
+
         private void assertHeadJudgement(HitResult result)
             => AddAssert($"head judged as {result}", () => judgementResults.First(j => j.HitObject is Note).Type == result);
 

From 4148d473e3d4c949b312abcbc915f2fd3e99e925 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 19:51:33 +0900
Subject: [PATCH 09406/10326] Fix hold note crashing with 0 length

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 828ee7b03e..02829d87bd 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -221,7 +221,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // As the note is being held, adjust the size of the sizing container. This has two effects:
             // 1. The contained masking container will mask the body and ticks.
             // 2. The head note will move along with the new "head position" in the container.
-            if (Head.IsHit && releaseTime == null)
+            if (Head.IsHit && releaseTime == null && DrawHeight > 0)
             {
                 // How far past the hit target this hold note is. Always a positive value.
                 float yOffset = Math.Max(0, Direction.Value == ScrollingDirection.Up ? -Y : Y);

From d20a8694e47264a5d6363550d8f3582d70cb8d10 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 19:55:06 +0900
Subject: [PATCH 09407/10326] 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 3324af7c51..5b779b803f 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="2021.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.421.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fcd1ed6987..da8163a971 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.421.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 34810a3106..dc7a57f905 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.421.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From 6588859c32296e9538f819a49328382f314b62bc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 22:29:18 +0900
Subject: [PATCH 09408/10326] Remove loggings

---
 .../Multiplayer/Spectate/Sync/CatchUpSyncManager.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
index 68bfef6500..1d3fcd824c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
-using osu.Framework.Logging;
 using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
@@ -84,16 +83,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
             int readyCount = slaves.Count(s => !s.WaitingOnFrames.Value);
 
             if (readyCount == slaves.Count)
-            {
-                Logger.Log("Gameplay started (all ready).");
                 return hasStarted = true;
-            }
 
             if (readyCount > 0 && (Time.Current - firstStartAttemptTime) > MAXIMUM_START_DELAY)
-            {
-                Logger.Log($"Gameplay started (maximum delay exceeded, {readyCount}/{slaves.Count} ready).");
                 return hasStarted = true;
-            }
 
             return false;
         }
@@ -124,19 +117,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
                 {
                     // Stop the slave from catching up if it's within the sync target.
                     if (timeDelta <= SYNC_TARGET)
-                    {
                         slave.IsCatchingUp = false;
-                        Logger.Log($"Slave {i} catchup finished (delta = {timeDelta})");
-                    }
                 }
                 else
                 {
                     // Make the slave start catching up if it's exceeded the maximum allowable sync offset.
                     if (timeDelta > MAX_SYNC_OFFSET)
-                    {
                         slave.IsCatchingUp = true;
-                        Logger.Log($"Slave {i} catchup started (too far behind, delta = {timeDelta})");
-                    }
                 }
             }
         }

From 64579d50ac160215d5a8f60dc5f5fa8526b27fbc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 22:59:47 +0900
Subject: [PATCH 09409/10326] Use only single PlayerInstance for hit sample
 playback

---
 .../TestSceneMultiplayerSpectator.cs          | 46 ++++++++++++--
 .../Spectate/MultiplayerSpectator.cs          | 20 +++++++
 .../Multiplayer/Spectate/PlayerInstance.cs    | 60 +++++++++++++++++--
 3 files changed, 117 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 9ec7bfb60b..cd89d3bcc1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -198,10 +198,40 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkPausedInstant(56, false);
 
             // Player 2 should catch up to player 1 after unpausing.
-            AddUntilStep("player 2 not catching up", () => !getInstance(56).GameplayClock.IsCatchingUp);
+            waitForCatchup(56);
             AddWaitStep("wait a bit", 10);
         }
 
+        [Test]
+        public void TestMostInSyncUserIsAudioSource()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            assertVolume(55, 0);
+            assertVolume(56, 0);
+
+            sendFrames(55, 10);
+            sendFrames(56, 20);
+            assertVolume(55, 1);
+            assertVolume(56, 0);
+
+            checkPaused(55, true);
+            assertVolume(55, 0);
+            assertVolume(56, 1);
+
+            sendFrames(55, 100);
+            waitForCatchup(55);
+            checkPaused(56, true);
+            assertVolume(55, 1);
+            assertVolume(56, 0);
+
+            sendFrames(56, 100);
+            waitForCatchup(56);
+            assertVolume(55, 1);
+            assertVolume(56, 0);
+        }
+
         private void loadSpectateScreen(bool waitForPlayerLoad = true)
         {
             AddStep("load screen", () =>
@@ -255,11 +285,17 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
         }
 
-        private void checkPaused(int userId, bool state) =>
-            AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
+        private void checkPaused(int userId, bool state)
+            => AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
 
-        private void checkPausedInstant(int userId, bool state) =>
-            AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
+        private void checkPausedInstant(int userId, bool state)
+            => AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
+
+        private void assertVolume(int userId, double volume)
+            => AddAssert($"{userId} volume is {volume}", () => getInstance(userId).Volume.Value == volume);
+
+        private void waitForCatchup(int userId)
+            => AddUntilStep($"{userId} not catching up", () => !getInstance(userId).GameplayClock.IsCatchingUp);
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 2db470da67..33dd57586c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -28,6 +29,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private ISyncManager syncManager;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
+        private PlayerInstance currentAudioSource;
 
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
@@ -85,6 +87,24 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             masterClockContainer.Reset();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!isCandidateAudioSource(currentAudioSource?.GameplayClock))
+            {
+                currentAudioSource = instances.Where(i => isCandidateAudioSource(i.GameplayClock))
+                                              .OrderBy(i => Math.Abs(i.GameplayClock.CurrentTime - syncManager.Master.CurrentTime))
+                                              .FirstOrDefault();
+
+                foreach (var instance in instances)
+                    instance.Volume.Value = instance == currentAudioSource ? 1 : 0;
+            }
+        }
+
+        private bool isCandidateAudioSource([CanBeNull] ISlaveClock clock)
+            => clock?.IsRunning == true && !clock.IsCatchingUp && !clock.WaitingOnFrames.Value;
+
         protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 407732ee2e..80d6727599 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -3,6 +3,8 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
@@ -13,7 +15,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class PlayerInstance : CompositeDrawable
+    public class PlayerInstance : CompositeDrawable, IAdjustableAudioComponent
     {
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
@@ -25,8 +27,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
-        private readonly Container content;
+        private readonly Container gameplayContent;
         private readonly LoadingLayer loadingLayer;
+        private readonly AudioContainer audioContainer;
         private OsuScreenStack stack;
 
         public PlayerInstance(int userId, CatchUpSlaveClock gameplayClock)
@@ -39,7 +42,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             InternalChildren = new Drawable[]
             {
-                content = new DrawSizePreservingFillContainer { RelativeSizeAxes = Axes.Both },
+                audioContainer = new AudioContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = gameplayContent = new DrawSizePreservingFillContainer { RelativeSizeAxes = Axes.Both },
+                },
                 loadingLayer = new LoadingLayer(true) { State = { Value = Visibility.Visible } }
             };
         }
@@ -51,7 +58,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             Score = score;
 
-            content.Child = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
+            gameplayContent.Child = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = stack = new OsuScreenStack()
@@ -64,5 +71,50 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         // Player interferes with global input, so disable input for now.
         public override bool PropagatePositionalInputSubTree => false;
         public override bool PropagateNonPositionalInputSubTree => false;
+
+        #region IAdjustableAudioComponent
+
+        public IBindable<double> AggregateVolume => audioContainer.AggregateVolume;
+
+        public IBindable<double> AggregateBalance => audioContainer.AggregateBalance;
+
+        public IBindable<double> AggregateFrequency => audioContainer.AggregateFrequency;
+
+        public IBindable<double> AggregateTempo => audioContainer.AggregateTempo;
+
+        public void BindAdjustments(IAggregateAudioAdjustment component)
+        {
+            audioContainer.BindAdjustments(component);
+        }
+
+        public void UnbindAdjustments(IAggregateAudioAdjustment component)
+        {
+            audioContainer.UnbindAdjustments(component);
+        }
+
+        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+        {
+            audioContainer.AddAdjustment(type, adjustBindable);
+        }
+
+        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+        {
+            audioContainer.RemoveAdjustment(type, adjustBindable);
+        }
+
+        public void RemoveAllAdjustments(AdjustableProperty type)
+        {
+            audioContainer.RemoveAllAdjustments(type);
+        }
+
+        public BindableNumber<double> Volume => audioContainer.Volume;
+
+        public BindableNumber<double> Balance => audioContainer.Balance;
+
+        public BindableNumber<double> Frequency => audioContainer.Frequency;
+
+        public BindableNumber<double> Tempo => audioContainer.Tempo;
+
+        #endregion
     }
 }

From 22a3f3ad3e9f022fb85e1258aa0a2184a58fe671 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:04:54 +0900
Subject: [PATCH 09410/10326] Revert unnecessary BeatmapManager change

---
 osu.Game/Beatmaps/BeatmapManager.cs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index abb1f5a93c..5e975de77c 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -281,9 +281,8 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="beatmapInfo">The beatmap to lookup.</param>
         /// <param name="previous">The currently loaded <see cref="WorkingBeatmap"/>. Allows for optimisation where elements are shared with the new beatmap. May be returned if beatmapInfo requested matches</param>
-        /// <param name="bypassCache">Whether to bypass the cache and return a new <see cref="WorkingBeatmap"/> instance.</param>
         /// <returns>A <see cref="WorkingBeatmap"/> instance correlating to the provided <see cref="BeatmapInfo"/>.</returns>
-        public WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo, WorkingBeatmap previous = null, bool bypassCache = false)
+        public WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo, WorkingBeatmap previous = null)
         {
             if (beatmapInfo?.ID > 0 && previous != null && previous.BeatmapInfo?.ID == beatmapInfo.ID)
                 return previous;
@@ -302,14 +301,9 @@ namespace osu.Game.Beatmaps
 
             lock (workingCache)
             {
-                BeatmapManagerWorkingBeatmap working;
-
-                if (!bypassCache)
-                {
-                    working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == beatmapInfo.ID);
-                    if (working != null)
-                        return working;
-                }
+                var working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == beatmapInfo.ID);
+                if (working != null)
+                    return working;
 
                 beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 

From b4f492ca4ce6e171bd3ff9cfd02d5a98140f0666 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 23:06:46 +0900
Subject: [PATCH 09411/10326] 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 7b97103851..140057f9cc 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.422.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.422.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b27e00f59d..532dea7ace 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.422.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.422.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index d07e16ea56..edebefa70e 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.Framework.iOS" Version="2021.422.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.422.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.422.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.422.1" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 0ee73b8e536a37d94d56fcfe4f1878716f5687bf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:22:44 +0900
Subject: [PATCH 09412/10326] Add failing test

---
 .../StatefulMultiplayerClientTest.cs          | 26 +++++++++++++++++++
 .../Multiplayer/TestMultiplayerClient.cs      | 11 +++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
index a2ad37cf4a..377a33b527 100644
--- a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
@@ -41,6 +41,32 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
             checkPlayingUserCount(0);
         }
 
+        [Test]
+        public void TestPlayingUsersUpdatedOnJoin()
+        {
+            AddStep("leave room", () => Client.LeaveRoom());
+            AddUntilStep("wait for room part", () => Client.Room == null);
+
+            AddStep("create room initially in gameplay", () =>
+            {
+                Room.RoomID.Value = null;
+                Client.RoomSetupAction = room =>
+                {
+                    room.State = MultiplayerRoomState.Playing;
+                    room.Users.Add(new MultiplayerRoomUser(55)
+                    {
+                        User = new User { Id = 55 },
+                        State = MultiplayerUserState.Playing
+                    });
+                };
+
+                RoomManager.CreateRoom(Room);
+            });
+
+            AddUntilStep("wait for room join", () => Client.Room != null);
+            checkPlayingUserCount(1);
+        }
+
         private void checkPlayingUserCount(int expectedCount)
             => AddAssert($"{"user".ToQuantity(expectedCount)} playing", () => Client.CurrentMatchPlayingUserIds.Count == expectedCount);
 
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index b5cd3dad02..de77a15da0 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public override IBindable<bool> IsConnected => isConnected;
         private readonly Bindable<bool> isConnected = new Bindable<bool>(true);
 
+        public Action<MultiplayerRoom>? RoomSetupAction;
+
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
@@ -112,7 +114,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             var apiRoom = roomManager.Rooms.Single(r => r.RoomID.Value == roomId);
 
-            var user = new MultiplayerRoomUser(api.LocalUser.Value.Id)
+            var localUser = new MultiplayerRoomUser(api.LocalUser.Value.Id)
             {
                 User = api.LocalUser.Value
             };
@@ -129,10 +131,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     AllowedMods = apiRoom.Playlist.Last().AllowedMods.Select(m => new APIMod(m)).ToArray(),
                     PlaylistItemId = apiRoom.Playlist.Last().ID
                 },
-                Users = { user },
-                Host = user
+                Users = { localUser },
+                Host = localUser
             };
 
+            RoomSetupAction?.Invoke(room);
+            RoomSetupAction = null;
+
             return Task.FromResult(room);
         }
 

From f593d9e42c3efa144dc07df35f504bd15efc41c7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:23:43 +0900
Subject: [PATCH 09413/10326] Fix playing users not being updated on room join

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 2ddc10db0f..c0706b082d 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -144,6 +144,8 @@ namespace osu.Game.Online.Multiplayer
                     Room = joinedRoom;
                     apiRoom = room;
                     defaultPlaylistItemId = apiRoom.Playlist.FirstOrDefault()?.ID ?? 0;
+                    foreach (var user in joinedRoom.Users)
+                        updateUserPlayingState(user.UserID, user.State);
                 }, cancellationSource.Token).ConfigureAwait(false);
 
                 // Update room settings.

From fd0b030cf431ecb0ab3ea45bbcac68ee0545a207 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:37:33 +0900
Subject: [PATCH 09414/10326] Refactor gameplay screen creation

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs | 13 +++++++-----
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 21 ++++++++++++-------
 .../Playlists/PlaylistsRoomSubScreen.cs       |  9 +++-----
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 0d1ed5d88e..68bdd9160e 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -17,7 +17,6 @@ using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Match
 {
@@ -148,14 +147,18 @@ namespace osu.Game.Screens.OnlinePlay.Match
             return base.OnExiting(next);
         }
 
-        protected void StartPlay(Func<Player> player) => PushTopLevelScreen(() => new PlayerLoader(player));
-
-        protected void PushTopLevelScreen(Func<Screen> screen)
+        protected void StartPlay()
         {
             sampleStart?.Play();
-            ParentScreen?.Push(screen());
+            ParentScreen?.Push(CreateGameplayScreen());
         }
 
+        /// <summary>
+        /// Creates the gameplay screen to be entered.
+        /// </summary>
+        /// <returns>The screen to enter.</returns>
+        protected abstract Screen CreateGameplayScreen();
+
         private void selectedItemChanged()
         {
             updateWorkingBeatmap();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 9a68ff908d..c5d7610b53 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -416,10 +416,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             UpdateMods();
 
             if (client.LocalUser.State == MultiplayerUserState.Spectating
-                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad)
-                && ParentScreen.IsCurrentScreen())
+                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad))
             {
-                PushTopLevelScreen(() => new MultiplayerSpectator(client.CurrentMatchPlayingUserIds.ToArray()));
+                StartPlay();
 
                 // If the current user was host, they started the match and the in-progres operation needs to be stopped now.
                 readyClickOperation?.Dispose();
@@ -429,16 +428,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onLoadRequested()
         {
-            Debug.Assert(client.Room != null);
-
-            int[] userIds = client.CurrentMatchPlayingUserIds.ToArray();
-
-            StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
+            StartPlay();
 
             readyClickOperation?.Dispose();
             readyClickOperation = null;
         }
 
+        protected override Screen CreateGameplayScreen()
+        {
+            Debug.Assert(client.LocalUser != null);
+
+            if (client.LocalUser.State == MultiplayerUserState.Spectating)
+                return new MultiSpectatorScreen(client.CurrentMatchPlayingUserIds.ToArray());
+
+            return new MultiplayerPlayer(SelectedItem.Value, client.CurrentMatchPlayingUserIds.ToArray());
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 6542d01e64..11bc55823f 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -218,10 +218,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                         },
                         new Drawable[]
                         {
-                            new Footer
-                            {
-                                OnStart = onStart,
-                            }
+                            new Footer { OnStart = StartPlay }
                         }
                     },
                     RowDimensions = new[]
@@ -274,9 +271,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             }, true);
         }
 
-        private void onStart() => StartPlay(() => new PlaylistsPlayer(SelectedItem.Value)
+        protected override Screen CreateGameplayScreen() => new PlaylistsPlayer(SelectedItem.Value)
         {
             Exited = () => leaderboard.RefreshScores()
-        });
+        };
     }
 }

From 4aceb75eb2f8c5c40ff796ecc8d8fd22c3a6ddf1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:37:45 +0900
Subject: [PATCH 09415/10326] Disable spectate button on closed rooms

Doesn't have an effect normally - only for safety purposes in case we
allow entering the match subscreen after a match has finished in the
future.
---
 .../OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
index 465af037e2..04150902bc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     break;
             }
 
-            button.Enabled.Value = !operationInProgress.Value;
+            button.Enabled.Value = Client.Room?.State != MultiplayerRoomState.Closed && !operationInProgress.Value;
         }
 
         private class ButtonWithTrianglesExposed : TriangleButton

From 8a0ba3a05557e3d1f20521e577bb61d7604c9a97 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:38:51 +0900
Subject: [PATCH 09416/10326] Merge GameplayIsolationContainer into
 PlayerInstance, remove track

---
 .../Spectate/GameplayIsolationContainer.cs    | 52 -------------------
 .../Multiplayer/Spectate/PlayerInstance.cs    | 35 ++++++++++++-
 2 files changed, 33 insertions(+), 54 deletions(-)
 delete mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
deleted file mode 100644
index 7b6a544084..0000000000
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.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 System.Collections.Generic;
-using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
-
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
-{
-    public class GameplayIsolationContainer : Container
-    {
-        [Cached]
-        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
-
-        [Cached]
-        private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
-
-        [Cached]
-        private readonly Bindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>();
-
-        private readonly Track track;
-
-        public GameplayIsolationContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods)
-        {
-            this.beatmap.Value = beatmap;
-            this.ruleset.Value = ruleset;
-            this.mods.Value = mods;
-
-            track = beatmap.LoadTrack();
-        }
-
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.CacheAs(ruleset.BeginLease(false));
-            dependencies.CacheAs(beatmap.BeginLease(false));
-            dependencies.CacheAs(mods.BeginLease(false));
-            return dependencies;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            track?.Dispose();
-        }
-    }
-}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 80d6727599..8007c9e068 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -2,6 +2,7 @@
 // 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.Audio;
 using osu.Framework.Bindables;
@@ -9,6 +10,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
@@ -58,13 +61,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             Score = score;
 
-            gameplayContent.Child = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
+            gameplayContent.Child = new PlayerIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = stack = new OsuScreenStack()
             };
 
-            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => new MultiplayerSpectatorPlayer(Score, GameplayClock)));
+            stack.Push(new MultiSpectatorPlayerLoader(Score, () => new MultiSpectatorPlayer(Score, GameplayClock)));
             loadingLayer.Hide();
         }
 
@@ -116,5 +119,33 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public BindableNumber<double> Tempo => audioContainer.Tempo;
 
         #endregion
+
+        private class PlayerIsolationContainer : Container
+        {
+            [Cached]
+            private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+
+            [Cached]
+            private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+
+            [Cached]
+            private readonly Bindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>();
+
+            public PlayerIsolationContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods)
+            {
+                this.beatmap.Value = beatmap;
+                this.ruleset.Value = ruleset;
+                this.mods.Value = mods;
+            }
+
+            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            {
+                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+                dependencies.CacheAs(ruleset.BeginLease(false));
+                dependencies.CacheAs(beatmap.BeginLease(false));
+                dependencies.CacheAs(mods.BeginLease(false));
+                return dependencies;
+            }
+        }
     }
 }

From ee259497519f71d360616b6f2dc92247bfdfe43b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:39:02 +0900
Subject: [PATCH 09417/10326] Rename classes

---
 .../Multiplayer/TestSceneMultiplayerSpectator.cs     | 12 ++++++------
 .../TestSceneMultiplayerSpectatorLeaderboard.cs      |  4 ++--
 ...orLeaderboard.cs => MultiSpectatorLeaderboard.cs} |  4 ++--
 ...yerSpectatorPlayer.cs => MultiSpectatorPlayer.cs} |  4 ++--
 ...PlayerLoader.cs => MultiSpectatorPlayerLoader.cs} |  4 ++--
 ...ltiplayerSpectator.cs => MultiSpectatorScreen.cs} |  8 ++++----
 .../Multiplayer/Spectate/Sync/ISlaveClock.cs         |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSpectatorLeaderboard.cs => MultiSpectatorLeaderboard.cs} (92%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSpectatorPlayer.cs => MultiSpectatorPlayer.cs} (93%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSpectatorPlayerLoader.cs => MultiSpectatorPlayerLoader.cs} (75%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSpectator.cs => MultiSpectatorScreen.cs} (93%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index cd89d3bcc1..0b77a1a9e2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
-        private MultiplayerSpectator spectator;
+        private MultiSpectatorScreen spectatorScreen;
 
         private readonly List<int> playingUserIds = new List<int>();
         private readonly Dictionary<int, int> nextFrame = new Dictionary<int, int>();
@@ -91,11 +91,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddWaitStep("wait a bit", 10);
             AddStep("load player 55", () => streamingClient.StartPlay(55, importedBeatmapId));
-            AddUntilStep("one player added", () => spectator.ChildrenOfType<Player>().Count() == 1);
+            AddUntilStep("one player added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 1);
 
             AddWaitStep("wait a bit", 10);
             AddStep("load player 56", () => streamingClient.StartPlay(56, importedBeatmapId));
-            AddUntilStep("two players added", () => spectator.ChildrenOfType<Player>().Count() == 2);
+            AddUntilStep("two players added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 2);
         }
 
         [Test]
@@ -239,10 +239,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Beatmap.Value = beatmapManager.GetWorkingBeatmap(importedBeatmap);
                 Ruleset.Value = importedBeatmap.Ruleset;
 
-                LoadScreen(spectator = new MultiplayerSpectator(playingUserIds.ToArray()));
+                LoadScreen(spectatorScreen = new MultiSpectatorScreen(playingUserIds.ToArray()));
             });
 
-            AddUntilStep("wait for screen load", () => spectator.LoadState == LoadState.Loaded && (!waitForPlayerLoad || spectator.AllPlayersLoaded));
+            AddUntilStep("wait for screen load", () => spectatorScreen.LoadState == LoadState.Loaded && (!waitForPlayerLoad || spectatorScreen.AllPlayersLoaded));
         }
 
         private void start(int userId, int? beatmapId = null) => start(new[] { userId }, beatmapId);
@@ -299,7 +299,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
 
-        private PlayerInstance getInstance(int userId) => spectator.ChildrenOfType<PlayerInstance>().Single(p => p.UserId == userId);
+        private PlayerInstance getInstance(int userId) => spectatorScreen.ChildrenOfType<PlayerInstance>().Single(p => p.UserId == userId);
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
index 3b2cfb1c7b..8368186219 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUpSteps]
         public new void SetUpSteps()
         {
-            MultiplayerSpectatorLeaderboard leaderboard = null;
+            MultiSpectatorLeaderboard leaderboard = null;
 
             AddStep("reset", () =>
             {
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 var scoreProcessor = new OsuScoreProcessor();
                 scoreProcessor.ApplyBeatmap(playable);
 
-                LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, clocks.Keys.ToArray()) { Expanded = { Value = true } }, Add);
+                LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, clocks.Keys.ToArray()) { Expanded = { Value = true } }, Add);
             });
 
             AddUntilStep("wait for load", () => leaderboard.IsLoaded);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
similarity index 92%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
index 1b9e2bda2d..96c7702048 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
@@ -9,9 +9,9 @@ using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSpectatorLeaderboard : MultiplayerGameplayLeaderboard
+    public class MultiSpectatorLeaderboard : MultiplayerGameplayLeaderboard
     {
-        public MultiplayerSpectatorLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
+        public MultiSpectatorLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
             : base(scoreProcessor, userIds)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
similarity index 93%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 69b38c61f7..0101c00041 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -11,13 +11,13 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSpectatorPlayer : SpectatorPlayer
+    public class MultiSpectatorPlayer : SpectatorPlayer
     {
         private readonly Bindable<bool> waitingOnFrames = new Bindable<bool>(true);
         private readonly Score score;
         private readonly ISlaveClock slaveClock;
 
-        public MultiplayerSpectatorPlayer(Score score, ISlaveClock slaveClock)
+        public MultiSpectatorPlayer(Score score, ISlaveClock slaveClock)
             : base(score)
         {
             this.score = score;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
similarity index 75%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
index c8f16b5e90..fce44296f3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
@@ -8,9 +8,9 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSpectatorPlayerLoader : SpectatorPlayerLoader
+    public class MultiSpectatorPlayerLoader : SpectatorPlayerLoader
     {
-        public MultiplayerSpectatorPlayerLoader(Score score, Func<MultiplayerSpectatorPlayer> createPlayer)
+        public MultiSpectatorPlayerLoader(Score score, Func<MultiSpectatorPlayer> createPlayer)
             : base(score, createPlayer)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
similarity index 93%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 33dd57586c..52b7898028 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -14,7 +14,7 @@ using osu.Game.Screens.Spectate;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSpectator : SpectatorScreen
+    public class MultiSpectatorScreen : SpectatorScreen
     {
         // Isolates beatmap/ruleset to this screen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
@@ -28,10 +28,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private MasterGameplayClockContainer masterClockContainer;
         private ISyncManager syncManager;
         private PlayerGrid grid;
-        private MultiplayerSpectatorLeaderboard leaderboard;
+        private MultiSpectatorLeaderboard leaderboard;
         private PlayerInstance currentAudioSource;
 
-        public MultiplayerSpectator(int[] userIds)
+        public MultiSpectatorScreen(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
         {
             instances = new PlayerInstance[UserIds.Length];
@@ -76,7 +76,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
             scoreProcessor.ApplyBeatmap(playableBeatmap);
 
-            LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
+            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
index f45cb1fde6..08d69f9560 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
@@ -7,7 +7,7 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A clock which is used by <see cref="MultiplayerSpectatorPlayer"/>s and managed by an <see cref="ISyncManager"/>.
+    /// A clock which is used by <see cref="MultiSpectatorPlayer"/>s and managed by an <see cref="ISyncManager"/>.
     /// </summary>
     public interface ISlaveClock : IFrameBasedClock, IAdjustableClock
     {

From 4f0857f946e96d5c0c9da4440587e09488ca083e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:52:22 +0900
Subject: [PATCH 09418/10326] Xmldocs and general refactorings

---
 .../TestSceneMultiplayerSpectator.cs          |  2 +-
 .../Spectate/MultiSpectatorLeaderboard.cs     |  2 +-
 .../Spectate/MultiSpectatorPlayer.cs          | 17 +++++++++--
 .../Spectate/MultiSpectatorPlayerLoader.cs    |  6 +++-
 .../Spectate/MultiSpectatorScreen.cs          | 18 +++++++++---
 .../{PlayerInstance.cs => PlayerArea.cs}      | 29 +++++++++++++++----
 6 files changed, 59 insertions(+), 15 deletions(-)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{PlayerInstance.cs => PlayerArea.cs} (83%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 0b77a1a9e2..a82dea5640 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -299,7 +299,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
 
-        private PlayerInstance getInstance(int userId) => spectatorScreen.ChildrenOfType<PlayerInstance>().Single(p => p.UserId == userId);
+        private PlayerArea getInstance(int userId) => spectatorScreen.ChildrenOfType<PlayerArea>().Single(p => p.UserId == userId);
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
index 96c7702048..ab3ead68b5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiSpectatorLeaderboard : MultiplayerGameplayLeaderboard
     {
-        public MultiSpectatorLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
+        public MultiSpectatorLeaderboard([NotNull] ScoreProcessor scoreProcessor, int[] userIds)
             : base(scoreProcessor, userIds)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 0101c00041..4ed949893c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
@@ -11,13 +12,21 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
+    /// <summary>
+    /// A single spectated player within a <see cref="MultiSpectatorScreen"/>.
+    /// </summary>
     public class MultiSpectatorPlayer : SpectatorPlayer
     {
         private readonly Bindable<bool> waitingOnFrames = new Bindable<bool>(true);
         private readonly Score score;
         private readonly ISlaveClock slaveClock;
 
-        public MultiSpectatorPlayer(Score score, ISlaveClock slaveClock)
+        /// <summary>
+        /// Creates a new <see cref="MultiSpectatorPlayer"/>.
+        /// </summary>
+        /// <param name="score">The score containing the player's replay.</param>
+        /// <param name="slaveClock">The clock controlling the gameplay running state.</param>
+        public MultiSpectatorPlayer([NotNull] Score score, [NotNull] ISlaveClock slaveClock)
             : base(score)
         {
             this.score = score;
@@ -33,6 +42,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
+
+            // This is required because the frame stable clock is set to WaitingOnFrames = false for one frame.
             waitingOnFrames.Value = DrawableRuleset.FrameStableClock.WaitingOnFrames.Value || score.Replay.Frames.Count == 0;
         }
 
@@ -41,14 +52,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private class SlaveGameplayClockContainer : GameplayClockContainer
         {
-            public SlaveGameplayClockContainer(IClock sourceClock)
+            public SlaveGameplayClockContainer([NotNull] IClock sourceClock)
                 : base(sourceClock)
             {
             }
 
             protected override void Update()
             {
-                // The slave clock's running state is controlled by the sync manager, but the local pausing state needs to be updated to stop gameplay.
+                // The slave clock's running state is controlled externally, but the local pausing state needs to be updated to stop gameplay.
                 if (SourceClock.IsRunning)
                     Start();
                 else
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
index fce44296f3..5a1d28e9c4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
@@ -2,15 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Game.Scoring;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
+    /// <summary>
+    /// Used to load a single <see cref="MultiSpectatorPlayer"/> in a <see cref="MultiSpectatorScreen"/>.
+    /// </summary>
     public class MultiSpectatorPlayerLoader : SpectatorPlayerLoader
     {
-        public MultiSpectatorPlayerLoader(Score score, Func<MultiSpectatorPlayer> createPlayer)
+        public MultiSpectatorPlayerLoader([NotNull] Score score, [NotNull] Func<MultiSpectatorPlayer> createPlayer)
             : base(score, createPlayer)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 52b7898028..609905a312 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -14,27 +14,37 @@ using osu.Game.Screens.Spectate;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
+    /// <summary>
+    /// A <see cref="SpectatorScreen"/> that spectates multiple users in a match.
+    /// </summary>
     public class MultiSpectatorScreen : SpectatorScreen
     {
         // Isolates beatmap/ruleset to this screen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        /// <summary>
+        /// Whether all spectating players have finished loading.
+        /// </summary>
         public bool AllPlayersLoaded => instances.All(p => p?.PlayerLoaded == true);
 
         [Resolved]
         private SpectatorStreamingClient spectatorClient { get; set; }
 
-        private readonly PlayerInstance[] instances;
+        private readonly PlayerArea[] instances;
         private MasterGameplayClockContainer masterClockContainer;
         private ISyncManager syncManager;
         private PlayerGrid grid;
         private MultiSpectatorLeaderboard leaderboard;
-        private PlayerInstance currentAudioSource;
+        private PlayerArea currentAudioSource;
 
+        /// <summary>
+        /// Creates a new <see cref="MultiSpectatorScreen"/>.
+        /// </summary>
+        /// <param name="userIds">The players to spectate.</param>
         public MultiSpectatorScreen(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
         {
-            instances = new PlayerInstance[UserIds.Length];
+            instances = new PlayerArea[UserIds.Length];
         }
 
         [BackgroundDependencyLoader]
@@ -69,7 +79,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             };
 
             for (int i = 0; i < UserIds.Length; i++)
-                grid.Add(instances[i] = new PlayerInstance(UserIds[i], new CatchUpSlaveClock(masterClockContainer.GameplayClock)));
+                grid.Add(instances[i] = new PlayerArea(UserIds[i], new CatchUpSlaveClock(masterClockContainer.GameplayClock)));
 
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
similarity index 83%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 8007c9e068..494f182251 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
@@ -18,13 +19,31 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class PlayerInstance : CompositeDrawable, IAdjustableAudioComponent
+    /// <summary>
+    /// Provides an area for and manages the hierarchy of a spectated player within a <see cref="MultiSpectatorScreen"/>.
+    /// </summary>
+    public class PlayerArea : CompositeDrawable, IAdjustableAudioComponent
     {
+        /// <summary>
+        /// Whether a <see cref="Player"/> is loaded in the area.
+        /// </summary>
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
+        /// <summary>
+        /// The user id this <see cref="PlayerArea"/> corresponds to.
+        /// </summary>
         public readonly int UserId;
-        public readonly CatchUpSlaveClock GameplayClock;
 
+        /// <summary>
+        /// The <see cref="ISlaveClock"/> used to control the gameplay running state of a loaded <see cref="Player"/>.
+        /// </summary>
+        [NotNull]
+        public readonly ISlaveClock GameplayClock;
+
+        /// <summary>
+        /// The currently-loaded score.
+        /// </summary>
+        [CanBeNull]
         public Score Score { get; private set; }
 
         [Resolved]
@@ -35,7 +54,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly AudioContainer audioContainer;
         private OsuScreenStack stack;
 
-        public PlayerInstance(int userId, CatchUpSlaveClock gameplayClock)
+        public PlayerArea(int userId, [NotNull] ISlaveClock gameplayClock)
         {
             UserId = userId;
             GameplayClock = gameplayClock;
@@ -54,10 +73,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             };
         }
 
-        public void LoadScore(Score score)
+        public void LoadScore([NotNull] Score score)
         {
             if (Score != null)
-                throw new InvalidOperationException($"Cannot load a new score on a {nameof(PlayerInstance)} with an existing score.");
+                throw new InvalidOperationException($"Cannot load a new score on a {nameof(PlayerArea)} that has an existing score.");
 
             Score = score;
 

From 90ecda91af351c248882469195f4a964dd2636bf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 00:06:54 +0900
Subject: [PATCH 09419/10326] Fix exception

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index c5d7610b53..aac03622e3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -416,7 +416,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             UpdateMods();
 
             if (client.LocalUser.State == MultiplayerUserState.Spectating
-                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad))
+                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad)
+                && ParentScreen.IsCurrentScreen())
             {
                 StartPlay();
 

From b25340653df7e657884cfd077c53eea43613f25b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 00:49:14 +0900
Subject: [PATCH 09420/10326] Fix failing tests

---
 .../TestSceneMultiplayerSpectateButton.cs           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index e65e4a68a7..afbc9c32b3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -120,9 +120,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             };
         });
 
-        [Test]
-        public void TestEnabledWhenRoomOpen()
+        [TestCase(MultiplayerRoomState.Open)]
+        [TestCase(MultiplayerRoomState.WaitingForLoad)]
+        [TestCase(MultiplayerRoomState.Playing)]
+        public void TestEnabledWhenRoomOpenOrInGameplay(MultiplayerRoomState roomState)
         {
+            AddStep($"change room to {roomState}", () => Client.ChangeRoomState(roomState));
             assertSpectateButtonEnablement(true);
         }
 
@@ -137,12 +140,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("user is idle", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
         }
 
-        [TestCase(MultiplayerRoomState.WaitingForLoad)]
-        [TestCase(MultiplayerRoomState.Playing)]
         [TestCase(MultiplayerRoomState.Closed)]
-        public void TestDisabledDuringGameplayOrClosed(MultiplayerRoomState roomState)
+        public void TestDisabledWhenClosed(MultiplayerRoomState roomState)
         {
-            AddStep($"change user to {roomState}", () => Client.ChangeRoomState(roomState));
+            AddStep($"change room to {roomState}", () => Client.ChangeRoomState(roomState));
             assertSpectateButtonEnablement(false);
         }
 

From fbb9cb3f6f6d0a9d6fe0d89aa66ca26b545ec982 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Apr 2021 11:01:48 +0900
Subject: [PATCH 09421/10326] Fix broken merge resolution

---
 osu.Game/osu.Game.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d3d2de4557..75a3e45941 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,6 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.422.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />

From bc0e1d8c37272acf7a75c048036c512d42777bcf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Apr 2021 15:06:39 +0900
Subject: [PATCH 09422/10326] Remove dead newline

---
 osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index 4c46e24f1b..e4c41bed6d 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -21,6 +21,5 @@ namespace osu.Game.Rulesets.Catch.Mods
             drawableRuleset.Origin = Anchor.Centre;
             drawableRuleset.Scale = new osuTK.Vector2(1, -1);
         }
-
     }
 }

From 713344ebadc752b16c83bab92331af3c5850be25 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Fri, 23 Apr 2021 10:31:49 +0200
Subject: [PATCH 09423/10326] Reorganize methods

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 214 ++++++++++----------
 1 file changed, 107 insertions(+), 107 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index b499423412..cb5a276a5d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -323,6 +323,48 @@ namespace osu.Game.Screens.Select
                 starRatingDisplay.StarDifficulty = valueChanged.NewValue ?? new StarDifficulty();
             }
 
+            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
+            {
+                settingChangeTracker?.Dispose();
+                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
+                refreshBPMLabel(modsChangedEvent.NewValue);
+            }
+
+            private void setMetadata(string source)
+            {
+                ArtistLabel.Text = artistBinding.Value;
+                TitleLabel.Text = string.IsNullOrEmpty(source) ? titleBinding.Value : source + " — " + titleBinding.Value;
+            }
+
+            private void addInfoLabels()
+            {
+                if (beatmap.Beatmap?.HitObjects?.Any() != true)
+                    return;
+
+                infoLabelContainer.Children = new Drawable[]
+                {
+                    new InfoLabel(new BeatmapStatistic
+                    {
+                        Name = "Length",
+                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
+                        Content = TimeSpan.FromMilliseconds(beatmap.BeatmapInfo.Length).ToString(@"m\:ss"),
+                    }),
+                    bpmLabelContainer = new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(20, 0),
+                        Children = getRulesetInfoLabels()
+                    }
+                };
+
+                mods.BindValueChanged(refreshModInformation, true);
+            }
+
             private InfoLabel[] getRulesetInfoLabels()
             {
                 try
@@ -377,48 +419,6 @@ namespace osu.Game.Screens.Select
                 });
             }
 
-            private void setMetadata(string source)
-            {
-                ArtistLabel.Text = artistBinding.Value;
-                TitleLabel.Text = string.IsNullOrEmpty(source) ? titleBinding.Value : source + " — " + titleBinding.Value;
-            }
-
-            private void addInfoLabels()
-            {
-                if (beatmap.Beatmap?.HitObjects?.Any() != true)
-                    return;
-
-                infoLabelContainer.Children = new Drawable[]
-                {
-                    new InfoLabel(new BeatmapStatistic
-                    {
-                        Name = "Length",
-                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
-                        Content = TimeSpan.FromMilliseconds(beatmap.BeatmapInfo.Length).ToString(@"m\:ss"),
-                    }),
-                    bpmLabelContainer = new Container
-                    {
-                        AutoSizeAxes = Axes.Both,
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Spacing = new Vector2(20, 0),
-                        Children = getRulesetInfoLabels()
-                    }
-                };
-
-                mods.BindValueChanged(refreshModInformation, true);
-            }
-
-            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
-            {
-                settingChangeTracker?.Dispose();
-                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
-                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
-                refreshBPMLabel(modsChangedEvent.NewValue);
-            }
-
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)
             {
                 if (string.IsNullOrEmpty(metadata.Author?.Username))
@@ -439,6 +439,71 @@ namespace osu.Game.Screens.Select
                 };
             }
 
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+                settingChangeTracker?.Dispose();
+            }
+
+            public class InfoLabel : Container, IHasTooltip
+            {
+                public string TooltipText { get; }
+
+                public InfoLabel(BeatmapStatistic statistic)
+                {
+                    TooltipText = statistic.Name;
+                    AutoSizeAxes = Axes.Both;
+
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Size = new Vector2(20),
+                            Children = new[]
+                            {
+                                new SpriteIcon
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4Extensions.FromHex(@"441288"),
+                                    Icon = FontAwesome.Solid.Square,
+                                    Rotation = 45,
+                                },
+                                new SpriteIcon
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4Extensions.FromHex(@"f7dd55"),
+                                    Icon = FontAwesome.Regular.Circle,
+                                    Size = new Vector2(0.8f)
+                                },
+                                statistic.CreateIcon().With(i =>
+                                {
+                                    i.Anchor = Anchor.Centre;
+                                    i.Origin = Anchor.Centre;
+                                    i.RelativeSizeAxes = Axes.Both;
+                                    i.Colour = Color4Extensions.FromHex(@"f7dd55");
+                                    i.Size = new Vector2(0.64f);
+                                }),
+                            }
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Colour = new Color4(255, 221, 85, 255),
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 17),
+                            Margin = new MarginPadding { Left = 30 },
+                            Text = statistic.Content,
+                        }
+                    };
+                }
+            }
+
             private class DifficultyColourBar : Container
             {
                 [Resolved]
@@ -501,71 +566,6 @@ namespace osu.Game.Screens.Select
                     cancellationTokenSource?.Cancel();
                 }
             }
-
-            public class InfoLabel : Container, IHasTooltip
-            {
-                public string TooltipText { get; }
-
-                public InfoLabel(BeatmapStatistic statistic)
-                {
-                    TooltipText = statistic.Name;
-                    AutoSizeAxes = Axes.Both;
-
-                    Children = new Drawable[]
-                    {
-                        new Container
-                        {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Size = new Vector2(20),
-                            Children = new[]
-                            {
-                                new SpriteIcon
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Color4Extensions.FromHex(@"441288"),
-                                    Icon = FontAwesome.Solid.Square,
-                                    Rotation = 45,
-                                },
-                                new SpriteIcon
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Color4Extensions.FromHex(@"f7dd55"),
-                                    Icon = FontAwesome.Regular.Circle,
-                                    Size = new Vector2(0.8f)
-                                },
-                                statistic.CreateIcon().With(i =>
-                                {
-                                    i.Anchor = Anchor.Centre;
-                                    i.Origin = Anchor.Centre;
-                                    i.RelativeSizeAxes = Axes.Both;
-                                    i.Colour = Color4Extensions.FromHex(@"f7dd55");
-                                    i.Size = new Vector2(0.64f);
-                                }),
-                            }
-                        },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Colour = new Color4(255, 221, 85, 255),
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 17),
-                            Margin = new MarginPadding { Left = 30 },
-                            Text = statistic.Content,
-                        }
-                    };
-                }
-            }
-
-            protected override void Dispose(bool isDisposing)
-            {
-                base.Dispose(isDisposing);
-                settingChangeTracker?.Dispose();
-            }
         }
     }
 }

From ae2fd2f2e1f4315d4c1b90a56d412fa7b54cc9f3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 18:46:59 +0900
Subject: [PATCH 09424/10326] Ensure source is set on reset

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 5cd17d92c4..6677116399 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -100,6 +100,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
+            ChangeSource(SourceClock);
             Seek(0);
 
             // Manually stop the source in order to not affect the IsPaused state.

From 575ec7c528af97d00e7aa3e3fce940ae5e64350f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 19:09:54 +0900
Subject: [PATCH 09425/10326] Document + refactor max player limitation

---
 .../Multiplayer/Spectate/MultiSpectatorScreen.cs     |  2 +-
 .../OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs    | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 609905a312..eb59d090be 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// </summary>
         /// <param name="userIds">The players to spectate.</param>
         public MultiSpectatorScreen(int[] userIds)
-            : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
+            : base(userIds.Take(PlayerGrid.MAX_PLAYERS).ToArray())
         {
             instances = new PlayerArea[UserIds.Length];
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index 830378f129..6638d47dca 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -15,6 +15,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     /// </summary>
     public partial class PlayerGrid : CompositeDrawable
     {
+        /// <summary>
+        /// A temporary limitation on the number of players, because only layouts up to 16 players are supported for a single screen.
+        /// Todo: Can be removed in the future with scrolling support + performance improvements.
+        /// </summary>
+        public const int MAX_PLAYERS = 16;
+
         private const float player_spacing = 5;
 
         /// <summary>
@@ -58,11 +64,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// Adds a new cell with content to this grid.
         /// </summary>
         /// <param name="content">The content the cell should contain.</param>
-        /// <exception cref="InvalidOperationException">If more than 16 cells are added.</exception>
+        /// <exception cref="InvalidOperationException">If more than <see cref="MAX_PLAYERS"/> cells are added.</exception>
         public void Add(Drawable content)
         {
-            if (cellContainer.Count == 16)
-                throw new InvalidOperationException("Only 16 cells are supported.");
+            if (cellContainer.Count == MAX_PLAYERS)
+                throw new InvalidOperationException($"Only {MAX_PLAYERS} cells are supported.");
 
             int index = cellContainer.Count;
 

From 63a948425513a3bba7c660850a5d562bf3efc3ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 19:11:47 +0900
Subject: [PATCH 09426/10326] Expose WaitingOnFrames as mutable bindable

---
 osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs        | 3 +--
 .../OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs  | 2 +-
 .../OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs        | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
index a8c0a763e9..2c10be9c90 100644
--- a/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
@@ -164,8 +164,7 @@ namespace osu.Game.Tests.OnlinePlay
 
         private class TestSlaveClock : TestManualClock, ISlaveClock
         {
-            public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
-            IBindable<bool> ISlaveClock.WaitingOnFrames => WaitingOnFrames;
+            public Bindable<bool> WaitingOnFrames { get; } = new Bindable<bool>(true);
 
             public bool IsCatchingUp { get; set; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
index cefe5ff04f..21241f8158 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
         public FrameTimeInfo TimeInfo => new FrameTimeInfo { Elapsed = ElapsedFrameTime, Current = CurrentTime };
 
-        public IBindable<bool> WaitingOnFrames { get; } = new Bindable<bool>(true);
+        public Bindable<bool> WaitingOnFrames { get; } = new Bindable<bool>(true);
 
         public bool IsCatchingUp { get; set; }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
index 08d69f9560..6b7a4f5221 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         /// <summary>
         /// Whether this clock is waiting on frames to continue playback.
         /// </summary>
-        IBindable<bool> WaitingOnFrames { get; }
+        Bindable<bool> WaitingOnFrames { get; }
 
         /// <summary>
         /// Whether this clock is resynchronising to the master clock.

From b18635341e7692dfbfcbc7e3b35b0efd23a409e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 19:12:30 +0900
Subject: [PATCH 09427/10326] Rename file

---
 ...CaseCatchUpSyncManager.cs => TestSceneCatchUpSyncManager.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/OnlinePlay/{TestCaseCatchUpSyncManager.cs => TestSceneCatchUpSyncManager.cs} (99%)

diff --git a/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
similarity index 99%
rename from osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
rename to osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 2c10be9c90..93801bd5d7 100644
--- a/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -12,7 +12,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.OnlinePlay
 {
     [HeadlessTest]
-    public class TestCaseCatchUpSyncManager : OsuTestScene
+    public class TestSceneCatchUpSyncManager : OsuTestScene
     {
         private TestManualClock master;
         private CatchUpSyncManager syncManager;

From b41897fd9b34e09ba252638c75d0173e61f7c94a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 19:23:52 +0900
Subject: [PATCH 09428/10326] Rename testscene to match class

---
 ...MultiplayerSpectator.cs => TestSceneMultiSpectatorScreen.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneMultiplayerSpectator.cs => TestSceneMultiSpectatorScreen.cs} (99%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index a82dea5640..9cc8eaf876 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -23,7 +23,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMultiplayerSpectator : MultiplayerTestScene
+    public class TestSceneMultiSpectatorScreen : MultiplayerTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
         private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();

From fdb5490e51f1edf5b09aed6ecaf428e7ff03e8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 23 Apr 2021 21:56:08 +0200
Subject: [PATCH 09429/10326] Attempt to explain source initialisation better

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6677116399..6d60c09521 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -63,8 +63,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Start()
         {
-            // Ensure that the source clock is set.
-            ChangeSource(SourceClock);
+            ensureSourceClockSet();
 
             if (!AdjustableSource.IsRunning)
             {
@@ -100,7 +99,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
-            ChangeSource(SourceClock);
+            ensureSourceClockSet();
             Seek(0);
 
             // Manually stop the source in order to not affect the IsPaused state.
@@ -116,6 +115,15 @@ namespace osu.Game.Screens.Play
         /// <param name="sourceClock">The new source.</param>
         protected void ChangeSource(IClock sourceClock) => AdjustableSource.ChangeSource(SourceClock = sourceClock);
 
+        /// <summary>
+        /// Ensures that the <see cref="AdjustableSource"/> is set to <see cref="SourceClock"/>.
+        /// This is usually done before a seek to avoid accidentally seeking only the adjustable source in decoupled mode,
+        /// but not the actual source clock.
+        /// That will pretty much only happen on the very first call of this method, as the source clock is passed in the constructor,
+        /// but it is not yet set on the adjustable source there.
+        /// </summary>
+        private void ensureSourceClockSet() => ChangeSource(SourceClock);
+
         protected override void Update()
         {
             if (!IsPaused.Value)

From 04958a043f8ce1f5e24a65c438f0ad4c4305e4f3 Mon Sep 17 00:00:00 2001
From: subfluid <76847113+subfluid@users.noreply.github.com>
Date: Fri, 23 Apr 2021 20:54:06 -0700
Subject: [PATCH 09430/10326] Fix Spelling Error 'passses'

line 20
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0d6af2aeba..c539f9f4d8 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Commo
 
 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.
 
-**IMPORTANT:** Gameplay mechanics (and other features which you may have come to know and love) are in a constant state of flux. Game balance and final quality-of-life passses come at the end of development, preceeded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to the stable releases of osu! (found on the website). We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
+**IMPORTANT:** Gameplay mechanics (and other features which you may have come to know and love) are in a constant state of flux. Game balance and final quality-of-life passes come at the end of development, preceeded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to the stable releases of osu! (found on the website). We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
 
 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:
 

From decd8803bc6daa0669003e22115672dbda48033f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 07:44:33 +0300
Subject: [PATCH 09431/10326] Abstract base appearence and hover update from
 drag handles

---
 .../Compose/Components/SelectionBoxControl.cs | 96 +++++++++++++++++++
 .../Components/SelectionBoxDragHandle.cs      | 77 +--------------
 .../Components/SelectionBoxScaleHandle.cs     | 17 ++++
 3 files changed, 116 insertions(+), 74 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
new file mode 100644
index 0000000000..3432334deb
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -0,0 +1,96 @@
+// Copyright (c) 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.Shapes;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    /// <summary>
+    /// Represents the base appearance for UI controls of the <see cref="SelectionBox"/>,
+    /// such as scale handles, rotation handles, buttons, etc...
+    /// </summary>
+    public abstract class SelectionBoxControl : CompositeDrawable
+    {
+        public event Action OperationStarted;
+        public event Action OperationEnded;
+
+        internal event Action HoverGained;
+        internal event Action HoverLost;
+
+        private Circle circle;
+
+        [Resolved]
+        protected OsuColour Colours { get; private set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Origin = Anchor.Centre;
+
+            InternalChildren = new Drawable[]
+            {
+                circle = new Circle
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            UpdateHoverState();
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            UpdateHoverState();
+            HoverGained?.Invoke();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            HoverLost?.Invoke();
+            UpdateHoverState();
+        }
+
+        /// <summary>
+        /// Whether this control is currently handling mouse down input.
+        /// </summary>
+        protected bool HandlingMouse { get; set; }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            HandlingMouse = true;
+            UpdateHoverState();
+            return true;
+        }
+
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            HandlingMouse = false;
+            UpdateHoverState();
+            base.OnMouseUp(e);
+        }
+
+        protected virtual void UpdateHoverState()
+        {
+            circle.Colour = HandlingMouse ? Colours.GrayF : (IsHovered ? Colours.Red : Colours.YellowDark);
+            this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, 100, Easing.OutQuint);
+        }
+
+        protected void OnOperationStarted() => OperationStarted?.Invoke();
+
+        protected void OnOperationEnded() => OperationEnded?.Invoke();
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
index 921b4eb042..ea4f9704ef 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -2,75 +2,17 @@
 // 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.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
-    public class SelectionBoxDragHandle : Container
+    public abstract class SelectionBoxDragHandle : SelectionBoxControl
     {
-        public Action OperationStarted;
-        public Action OperationEnded;
-
         public Action<DragEvent> HandleDrag { get; set; }
 
-        private Circle circle;
-
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Size = new Vector2(10);
-            Origin = Anchor.Centre;
-
-            InternalChildren = new Drawable[]
-            {
-                circle = new Circle
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            UpdateHoverState();
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            UpdateHoverState();
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            base.OnHoverLost(e);
-            UpdateHoverState();
-        }
-
-        protected bool HandlingMouse;
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            HandlingMouse = true;
-            UpdateHoverState();
-            return true;
-        }
-
         protected override bool OnDragStart(DragStartEvent e)
         {
-            OperationStarted?.Invoke();
+            OnOperationStarted();
             return true;
         }
 
@@ -83,23 +25,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void OnDragEnd(DragEndEvent e)
         {
             HandlingMouse = false;
-            OperationEnded?.Invoke();
+            OnOperationEnded();
 
             UpdateHoverState();
             base.OnDragEnd(e);
         }
-
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            HandlingMouse = false;
-            UpdateHoverState();
-            base.OnMouseUp(e);
-        }
-
-        protected virtual void UpdateHoverState()
-        {
-            circle.Colour = HandlingMouse ? colours.GrayF : (IsHovered ? colours.Red : colours.YellowDark);
-            this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, 100, Easing.OutQuint);
-        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs
new file mode 100644
index 0000000000..a87c661f45
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class SelectionBoxScaleHandle : SelectionBoxDragHandle
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Size = new Vector2(10);
+        }
+    }
+}

From 4bfa9cd6b6014a40666bf00492c95c8d888560f7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 07:46:38 +0300
Subject: [PATCH 09432/10326] Change inheritance of selection box buttons to
 base control instead

---
 ...BoxDragHandleButton.cs => SelectionBoxButton.cs} | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
 rename osu.Game/Screens/Edit/Compose/Components/{SelectionBoxDragHandleButton.cs => SelectionBoxButton.cs} (77%)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleButton.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
similarity index 77%
rename from osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleButton.cs
rename to osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
index 74ae949389..917e5189b2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
@@ -12,10 +12,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
-    /// <summary>
-    /// A drag "handle" which shares the visual appearance but behaves more like a clickable button.
-    /// </summary>
-    public sealed class SelectionBoxDragHandleButton : SelectionBoxDragHandle, IHasTooltip
+    public sealed class SelectionBoxButton : SelectionBoxControl, IHasTooltip
     {
         private SpriteIcon icon;
 
@@ -23,7 +20,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public Action Action;
 
-        public SelectionBoxDragHandleButton(IconUsage iconUsage, string tooltip)
+        public SelectionBoxButton(IconUsage iconUsage, string tooltip)
         {
             this.iconUsage = iconUsage;
 
@@ -36,7 +33,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            Size *= 2;
+            Size = new Vector2(20);
             AddInternal(icon = new SpriteIcon
             {
                 RelativeSizeAxes = Axes.Both,
@@ -49,9 +46,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnClick(ClickEvent e)
         {
-            OperationStarted?.Invoke();
+            OnOperationStarted();
             Action?.Invoke();
-            OperationEnded?.Invoke();
+            OnOperationEnded();
             return true;
         }
 

From 206fc94b8c9e71be4dc3049003f63147bf735a22 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 07:47:15 +0300
Subject: [PATCH 09433/10326] Add rotation drag handle component

---
 .../Components/SelectionBoxRotationHandle.cs  | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
new file mode 100644
index 0000000000..c4a4fafdc2
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.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 osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class SelectionBoxRotationHandle : SelectionBoxDragHandle
+    {
+        private SpriteIcon icon;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Size = new Vector2(15f);
+            AddInternal(icon = new SpriteIcon
+            {
+                RelativeSizeAxes = Axes.Both,
+                Size = new Vector2(0.5f),
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Icon = FontAwesome.Solid.Redo,
+                Scale = new Vector2
+                {
+                    X = Anchor.HasFlagFast(Anchor.x0) ? 1f : -1f,
+                    Y = Anchor.HasFlagFast(Anchor.y0) ? 1f : -1f
+                }
+            });
+        }
+
+        protected override void UpdateHoverState()
+        {
+            icon.Colour = !HandlingMouse && IsHovered ? Color4.White : Color4.Black;
+            base.UpdateHoverState();
+        }
+    }
+}

From 0ccdfeea57f3a983e1735ce1d3c0aca7b7959da2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 24 Apr 2021 14:33:56 +0900
Subject: [PATCH 09434/10326] Fix code quality issues

---
 osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index e4c41bed6d..63203dd57c 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -1,9 +1,12 @@
-using osu.Framework.Graphics;
+// Copyright (c) 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.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
@@ -19,7 +22,8 @@ namespace osu.Game.Rulesets.Catch.Mods
         {
             drawableRuleset.Anchor = Anchor.Centre;
             drawableRuleset.Origin = Anchor.Centre;
-            drawableRuleset.Scale = new osuTK.Vector2(1, -1);
+
+            drawableRuleset.Scale = new Vector2(1, -1);
         }
     }
 }

From 2ae144be8e035801a3131b90c92542f3c075c03f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 24 Apr 2021 14:38:00 +0900
Subject: [PATCH 09435/10326] 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 721e13a759..e0b07549f4 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.422.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.424.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 75a3e45941..9a43d5f031 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.422.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.424.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 69676a1aed..2c41b3ef26 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.Framework.iOS" Version="2021.422.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.424.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.422.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.424.1" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1ec99577ce48557e47ebcb510ac3894be81cd7db Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 24 Apr 2021 14:05:11 +0800
Subject: [PATCH 09436/10326] Incorrect path on Android

---
 .github/ISSUE_TEMPLATE/01-bug-issues.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/01-bug-issues.md b/.github/ISSUE_TEMPLATE/01-bug-issues.md
index e45893b97a..7026179259 100644
--- a/.github/ISSUE_TEMPLATE/01-bug-issues.md
+++ b/.github/ISSUE_TEMPLATE/01-bug-issues.md
@@ -25,6 +25,6 @@ Please check:
 *please attach logs here, which are located at:*
 - `%AppData%/osu/logs` *(on Windows),*
 - `~/.local/share/osu/logs` *(on Linux & macOS).*
-- `Android/Data/sh.ppy.osulazer/logs` *(on Android)*,
+- `Android/data/sh.ppy.osulazer/files/logs` *(on Android)*,
 - on iOS they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes. (https://support.apple.com/en-us/HT201301#copy-to-computer)
 -->

From 2e2f843e223ead183607062f4fbb43aa9b994a3e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 09:26:49 +0300
Subject: [PATCH 09437/10326] Refine android game logs path in contributing
 guidelines

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6c327f01b3..e14be20642 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,7 +24,7 @@ Issues, bug reports and feature suggestions are welcomed, though please keep in
   * the in-game logs, which are located at:
     * `%AppData%/osu/logs` (on Windows),
     * `~/.local/share/osu/logs` (on Linux and macOS),
-    * `Android/Data/sh.ppy.osulazer/logs` (on Android),
+    * `Android/data/sh.ppy.osulazer/files/logs` (on Android),
     * on iOS they can be obtained by connecting your device to your desktop and [copying the `logs` directory from the app's own document storage using iTunes](https://support.apple.com/en-us/HT201301#copy-to-computer),
   * your system specifications (including the operating system and platform you are playing on),
   * a reproduction scenario (list of steps you have performed leading up to the occurrence of the bug),

From 7e3a611f95cf9a1ec5503d692bc919c6dc6fb71c Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 16:23:52 +0800
Subject: [PATCH 09438/10326] Add snap color option for osu!mania

---
 .../ManiaPlacementBlueprintTestScene.cs       | 12 +++
 .../ManiaSelectionBlueprintTestScene.cs       | 12 +++
 .../TestSceneHoldNotePlacementBlueprint.cs    |  2 +-
 .../TestSceneHoldNoteSelectionBlueprint.cs    |  2 +-
 .../Editor/TestSceneManiaHitObjectComposer.cs |  7 +-
 .../Editor/TestSceneNotePlacementBlueprint.cs |  2 +-
 .../Editor/TestSceneNoteSelectionBlueprint.cs |  2 +-
 .../ManiaInputTestScene.cs                    | 13 +++
 .../Mods/TestSceneManiaModPerfect.cs          |  4 +-
 .../Skinning/ManiaSkinnableTestScene.cs       | 12 +++
 .../Skinning/TestSceneHoldNote.cs             |  2 +-
 .../Skinning/TestSceneNote.cs                 |  2 +-
 .../TestSceneAutoGeneration.cs                | 24 +++---
 .../TestSceneColumn.cs                        |  4 +-
 .../TestSceneHoldNoteInput.cs                 | 75 +++++++++---------
 .../TestSceneNotes.cs                         | 17 +++-
 .../TestSceneOutOfOrderHits.cs                | 10 +--
 .../TestSceneStage.cs                         |  4 +-
 .../Beatmaps/ManiaBeatmapConverter.cs         |  4 +-
 .../Legacy/DistanceObjectPatternGenerator.cs  |  4 +-
 .../Legacy/EndTimeObjectPatternGenerator.cs   |  4 +-
 .../Legacy/HitObjectPatternGenerator.cs       |  2 +-
 .../ManiaRulesetConfigManager.cs              |  4 +-
 .../Blueprints/HoldNotePlacementBlueprint.cs  |  5 +-
 .../Edit/Blueprints/NotePlacementBlueprint.cs |  5 +-
 .../Edit/HoldNoteCompositionTool.cs           |  7 +-
 .../Edit/ManiaHitObjectComposer.cs            |  4 +-
 .../Edit/NoteCompositionTool.cs               |  8 +-
 .../ManiaSettingsSubsection.cs                |  5 ++
 .../Mods/ManiaModInvert.cs                    |  2 +-
 .../Objects/Drawables/DrawableNote.cs         | 30 +++++++
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   | 11 ++-
 osu.Game.Rulesets.Mania/Objects/Note.cs       | 79 +++++++++++++++++++
 osu.Game.Rulesets.Mania/Objects/TailNote.cs   |  5 ++
 .../UI/DrawableManiaRuleset.cs                |  5 ++
 osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs | 11 +++
 .../TestSceneManageCollectionsDialog.cs       | 12 +--
 37 files changed, 314 insertions(+), 99 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index ece523e84c..8e94d6bbb6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -4,10 +4,12 @@
 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.Framework.Timing;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -28,6 +30,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(typeof(IScrollingInfo))]
         private IScrollingInfo scrollingInfo;
 
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+
         protected ManiaPlacementBlueprintTestScene()
         {
             scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
@@ -41,6 +46,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+        }
+
         protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
         {
             var time = column.TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 176fbba921..453f8e36e6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -2,8 +2,10 @@
 // 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.Timing;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
@@ -15,6 +17,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+
         protected ManiaSelectionBlueprintTestScene()
         {
             Add(new Column(0)
@@ -26,6 +31,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+        }
+
         public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
index 87c74a12cf..eb36e19048 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
@@ -13,6 +13,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
     public class TestSceneHoldNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableHoldNote((HoldNote)hitObject);
-        protected override PlacementBlueprint CreateBlueprint() => new HoldNotePlacementBlueprint();
+        protected override PlacementBlueprint CreateBlueprint() => new HoldNotePlacementBlueprint(null);
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
index 24f4c6858e..9674985d09 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
         public TestSceneHoldNoteSelectionBlueprint()
         {
-            var holdNote = new HoldNote { Column = 0, Duration = 1000 };
+            var holdNote = new HoldNote(null) { Column = 0, Duration = 1000 };
             holdNote.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             base.Content.Child = content = new ScrollingTestContainer(ScrollingDirection.Down)
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
index aaf96c63a6..1f3f4842c7 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             AddStep("setup beatmap", () =>
             {
                 composer.EditorBeatmap.Clear();
-                composer.EditorBeatmap.Add(new HoldNote
+                composer.EditorBeatmap.Add(new HoldNote(Beatmap.Value.Beatmap)
                 {
                     Column = 1,
                     EndTime = 200
@@ -201,9 +201,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
             public TestComposer()
             {
+                var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 4 });
                 InternalChildren = new Drawable[]
                 {
-                    EditorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition { Columns = 4 }))
+                    EditorBeatmap = new EditorBeatmap(beatmap)
                     {
                         BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo }
                     },
@@ -211,7 +212,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
                 };
 
                 for (int i = 0; i < 10; i++)
-                    EditorBeatmap.Add(new Note { StartTime = 125 * i });
+                    EditorBeatmap.Add(new Note(beatmap) { StartTime = 125 * i });
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
index 36c34a8fb9..08a22ea28e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
@@ -55,6 +55,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private Note getNote() => this.ChildrenOfType<DrawableNote>().FirstOrDefault()?.HitObject;
 
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableNote((Note)hitObject);
-        protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint();
+        protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint(null);
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
index 0e47a12a8e..caf89599be 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
         public TestSceneNoteSelectionBlueprint()
         {
-            var note = new Note { Column = 0 };
+            var note = new Note(null) { Column = 0 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             DrawableNote drawableObject;
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index 9049bb3a82..ea7432f3a7 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
@@ -1,15 +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.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.Mania.Configuration;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
     public abstract class ManiaInputTestScene : OsuTestScene
     {
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
         private readonly Container<Drawable> content;
         protected override Container<Drawable> Content => content ?? base.Content;
 
@@ -18,6 +24,13 @@ namespace osu.Game.Rulesets.Mania.Tests
             base.Content.Add(content = new LocalInputManager(keys));
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+        }
+
         private class LocalInputManager : ManiaInputManager
         {
             public LocalInputManager(int variant)
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index 2e3b21aed7..23d0e82439 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -19,10 +19,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Note { StartTime = 1000 }), shouldMiss);
+        public void TestNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Note(Beatmap.Value.Beatmap) { StartTime = 1000 }), shouldMiss);
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HoldNote { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+        public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HoldNote(Beatmap.Value.Beatmap) { StartTime = 1000, EndTime = 3000 }), shouldMiss);
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 1d84a2dfcb..3b19386da6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -7,6 +7,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mania.Configuration;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osu.Game.Tests.Visual;
@@ -24,6 +26,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
         protected ManiaSkinnableTestScene()
@@ -38,6 +43,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+        }
+
         [Test]
         public void TestScrollingDown()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
index e88ff8e2ac..e13d0bbd7f 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 
         protected override DrawableManiaHitObject CreateHitObject()
         {
-            var note = new HoldNote { Duration = 1000 };
+            var note = new HoldNote(Beatmap.Value.Beatmap) { Duration = 1000 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new DrawableHoldNote(note);
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
index bc3bdf0bcb..eac288872a 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
     {
         protected override DrawableManiaHitObject CreateHitObject()
         {
-            var note = new Note();
+            var note = new Note(Beatmap.Value.Beatmap);
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new DrawableNote(note);
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
index cffec3dfd5..b2b9d607c6 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 });
-            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -69,8 +69,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
-            beatmap.HitObjects.Add(new Note { StartTime = 1000, Column = 1 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -91,8 +91,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -114,8 +114,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
-            beatmap.HitObjects.Add(new Note { StartTime = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -141,8 +141,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 2000, Duration = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 2000, Duration = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -168,8 +168,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new Note { StartTime = 3000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 3000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index d9b1ad22fa..59da73a540 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             for (int i = 0; i < columns.Count; i++)
             {
-                var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
+                var obj = new Note(null) { Column = i, StartTime = Time.Current + 2000 };
                 obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                 columns[i].Add(new DrawableNote(obj));
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             for (int i = 0; i < columns.Count; i++)
             {
-                var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
+                var obj = new HoldNote(null) { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
                 obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                 columns[i].Add(new DrawableHoldNote(obj));
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 668487f673..c92fe03483 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -249,21 +249,6 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var beatmap = new Beatmap<ManiaHitObject>
             {
-                HitObjects =
-                {
-                    new HoldNote
-                    {
-                        StartTime = 1000,
-                        Duration = 500,
-                        Column = 0,
-                    },
-                    new HoldNote
-                    {
-                        StartTime = 1000 + 500 + windows.WindowFor(HitResult.Miss) + 10,
-                        Duration = 500,
-                        Column = 0,
-                    },
-                },
                 BeatmapInfo =
                 {
                     BaseDifficulty = new BeatmapDifficulty
@@ -274,6 +259,20 @@ namespace osu.Game.Rulesets.Mania.Tests
                     Ruleset = new ManiaRuleset().RulesetInfo
                 },
             };
+            beatmap.HitObjects = new List<ManiaHitObject> {
+                    new HoldNote(beatmap)
+                    {
+                        StartTime = 1000,
+                        Duration = 500,
+                        Column = 0,
+                    },
+                    new HoldNote(beatmap)
+                    {
+                        StartTime = 1000 + 500 + windows.WindowFor(HitResult.Miss) + 10,
+                        Duration = 500,
+                        Column = 0,
+                    },
+            };
 
             performTest(new List<ReplayFrame>
             {
@@ -297,21 +296,21 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var beatmap = new Beatmap<ManiaHitObject>
             {
-                HitObjects =
-                {
-                    new HoldNote
-                    {
-                        StartTime = time_head,
-                        Duration = time_tail - time_head,
-                        Column = 0,
-                    }
-                },
                 BeatmapInfo =
                 {
                     BaseDifficulty = new BeatmapDifficulty { SliderTickRate = tick_rate },
                     Ruleset = new ManiaRuleset().RulesetInfo
                 },
             };
+            beatmap.HitObjects = new List<ManiaHitObject>
+                {
+                    new HoldNote(beatmap)
+                    {
+                        StartTime = time_head,
+                        Duration = time_tail - time_head,
+                        Column = 0,
+                    }
+                };
 
             performTest(new List<ReplayFrame>
             {
@@ -329,17 +328,17 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var beatmap = new Beatmap<ManiaHitObject>
             {
-                HitObjects =
+                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+            };
+            beatmap.HitObjects = new List<ManiaHitObject>
                 {
-                    new HoldNote
+                    new HoldNote(beatmap)
                     {
                         StartTime = 1000,
                         Duration = 0,
                         Column = 0,
                     },
-                },
-                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
-            };
+                };
 
             performTest(new List<ReplayFrame>
             {
@@ -374,21 +373,21 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 beatmap = new Beatmap<ManiaHitObject>
                 {
-                    HitObjects =
-                    {
-                        new HoldNote
-                        {
-                            StartTime = time_head,
-                            Duration = time_tail - time_head,
-                            Column = 0,
-                        }
-                    },
                     BeatmapInfo =
                     {
                         BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 4 },
                         Ruleset = new ManiaRuleset().RulesetInfo
                     },
                 };
+                beatmap.HitObjects = new List<ManiaHitObject>
+                    {
+                        new HoldNote(beatmap)
+                        {
+                            StartTime = time_head,
+                            Duration = time_tail - time_head,
+                            Column = 0,
+                        }
+                    };
 
                 beatmap.ControlPointInfo.Add(0, new DifficultyControlPoint { SpeedMultiplier = 0.1f });
             }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 706268e478..3660895347 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -15,8 +15,10 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -29,6 +31,10 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class TestSceneNotes : OsuTestScene
     {
+
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+
         [Test]
         public void TestVariousNotes()
         {
@@ -63,9 +69,16 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("hold note 2 facing upwards", () => verifyAnchors(holdNote2, Anchor.y0));
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+        }
+
         private Drawable createNoteDisplay(ScrollingDirection direction, int identifier, out DrawableNote hitObject)
         {
-            var note = new Note { StartTime = 0 };
+            var note = new Note(null) { StartTime = 0 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new ScrollingTestContainer(direction)
@@ -80,7 +93,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private Drawable createHoldNoteDisplay(ScrollingDirection direction, int identifier, out DrawableHoldNote hitObject)
         {
-            var note = new HoldNote { StartTime = 0, Duration = 5000 };
+            var note = new HoldNote(null) { StartTime = 0, Duration = 5000 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new ScrollingTestContainer(direction)
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index 18891f8c58..65195fdd3f 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 double time = 1000 + i * 100;
 
-                objects.Add(new Note { StartTime = time });
+                objects.Add(new Note(Beatmap.Value.Beatmap) { StartTime = time });
 
                 // don't hit the first note
                 if (i > 0)
@@ -60,12 +60,12 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var objects = new List<ManiaHitObject>
             {
-                new HoldNote
+                new HoldNote(Beatmap.Value.Beatmap)
                 {
                     StartTime = 1000,
                     EndTime = 1010,
                 },
-                new HoldNote
+                new HoldNote(Beatmap.Value.Beatmap)
                 {
                     StartTime = 1020,
                     EndTime = 1030
@@ -83,12 +83,12 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var objects = new List<ManiaHitObject>
             {
-                new HoldNote
+                new HoldNote(Beatmap.Value.Beatmap)
                 {
                     StartTime = 1000,
                     EndTime = 1010,
                 },
-                new HoldNote
+                new HoldNote(Beatmap.Value.Beatmap)
                 {
                     StartTime = 1020,
                     EndTime = 1030
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
index 7376a90f17..777163cca7 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 for (int i = 0; i < stage.Columns.Count; i++)
                 {
-                    var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
+                    var obj = new Note(null) { Column = i, StartTime = Time.Current + 2000 };
                     obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                     stage.Add(new DrawableNote(obj));
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 for (int i = 0; i < stage.Columns.Count; i++)
                 {
-                    var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
+                    var obj = new HoldNote(null) { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
                     obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                     stage.Add(new DrawableHoldNote(obj));
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 26393c8edb..5f03c93d55 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                 if (HitObject is IHasDuration endTimeData)
                 {
-                    pattern.Add(new HoldNote
+                    pattern.Add(new HoldNote(Beatmap)
                     {
                         StartTime = HitObject.StartTime,
                         Duration = endTimeData.Duration,
@@ -258,7 +258,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 }
                 else if (HitObject is IHasXPosition)
                 {
-                    pattern.Add(new Note
+                    pattern.Add(new Note(Beatmap)
                     {
                         StartTime = HitObject.StartTime,
                         Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 26e5d381e2..a936878a38 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -512,7 +512,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (startTime == endTime)
             {
-                newObject = new Note
+                newObject = new Note(Beatmap)
                 {
                     StartTime = startTime,
                     Samples = sampleInfoListAt(startTime),
@@ -521,7 +521,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             }
             else
             {
-                newObject = new HoldNote
+                newObject = new HoldNote(Beatmap)
                 {
                     StartTime = startTime,
                     Duration = endTime - startTime,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
index f816a70ab3..9422146803 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (holdNote)
             {
-                newObject = new HoldNote
+                newObject = new HoldNote(Beatmap)
                 {
                     StartTime = HitObject.StartTime,
                     Duration = endTime - HitObject.StartTime,
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             }
             else
             {
-                newObject = new Note
+                newObject = new Note(Beatmap)
                 {
                     StartTime = HitObject.StartTime,
                     Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index 54c37e9742..bbb4d4b466 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -441,7 +441,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <param name="column">The column to add the note to.</param>
         private void addToPattern(Pattern pattern, int column)
         {
-            pattern.Add(new Note
+            pattern.Add(new Note(Beatmap)
             {
                 StartTime = HitObject.StartTime,
                 Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 39d0f4bae4..292d494d88 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
             SetDefault(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
+            SetDefault(ManiaRulesetSetting.ColourCode, ManiaColourCode.Off);
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
@@ -34,6 +35,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
     public enum ManiaRulesetSetting
     {
         ScrollTime,
-        ScrollDirection
+        ScrollDirection,
+        ColourCode
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 093a8da24f..b3902524a0 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
@@ -23,8 +24,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        public HoldNotePlacementBlueprint()
-            : base(new HoldNote())
+        public HoldNotePlacementBlueprint(IBeatmap beatmap)
+            : base(new HoldNote(beatmap))
         {
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index 3db89c8ae6..cc0ef5181a 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
@@ -14,8 +15,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
     {
         private readonly EditNotePiece piece;
 
-        public NotePlacementBlueprint()
-            : base(new Note())
+        public NotePlacementBlueprint(IBeatmap beatmap)
+            : base(new Note(beatmap))
         {
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
index a5f10ed436..696278de4d 100644
--- a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
@@ -5,19 +5,22 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
     public class HoldNoteCompositionTool : HitObjectCompositionTool
     {
-        public HoldNoteCompositionTool()
+        private ManiaBeatmap Beatmap;
+        public HoldNoteCompositionTool(ManiaBeatmap beatmap)
             : base("Hold")
         {
+            Beatmap = beatmap;
         }
 
         public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders);
 
-        public override PlacementBlueprint CreatePlacementBlueprint() => new HoldNotePlacementBlueprint();
+        public override PlacementBlueprint CreatePlacementBlueprint() => new HoldNotePlacementBlueprint(Beatmap);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index d9570bf8be..0defeb026d 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -93,8 +93,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
-            new NoteCompositionTool(),
-            new HoldNoteCompositionTool()
+            new NoteCompositionTool(drawableRuleset.Beatmap),
+            new HoldNoteCompositionTool(drawableRuleset.Beatmap)
         };
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
index 9f54152596..c77c3722c6 100644
--- a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
@@ -5,6 +5,7 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 
@@ -12,13 +13,16 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public class NoteCompositionTool : HitObjectCompositionTool
     {
-        public NoteCompositionTool()
+        private ManiaBeatmap Beatmap;
+
+        public NoteCompositionTool(ManiaBeatmap beatmap)
             : base(nameof(Note))
         {
+            Beatmap = beatmap;
         }
 
         public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles);
 
-        public override PlacementBlueprint CreatePlacementBlueprint() => new NotePlacementBlueprint();
+        public override PlacementBlueprint CreatePlacementBlueprint() => new NotePlacementBlueprint(Beatmap);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index de77af8306..d46076d3bc 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -37,6 +37,11 @@ namespace osu.Game.Rulesets.Mania
                     Current = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
                     KeyboardStep = 5
                 },
+                new SettingsEnumDropdown<ManiaColourCode>
+                {
+                    LabelText = "Colour-coded notes",
+                    Current = config.GetBindable<ManiaColourCode>(ManiaRulesetSetting.ColourCode),
+                }
             };
         }
 
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 1ea45c295c..11310c6642 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                     // Decrease the duration by at most a 1/4 beat to ensure there's no instantaneous notes.
                     duration = Math.Max(duration / 2, duration - beatLength / 4);
 
-                    newColumnObjects.Add(new HoldNote
+                    newColumnObjects.Add(new HoldNote(maniaBeatmap)
                     {
                         Column = column.Key,
                         StartTime = locations[i].startTime,
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index b512986ccb..436e0923c4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -2,12 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Skinning.Default;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Edit;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
@@ -17,6 +21,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     /// </summary>
     public class DrawableNote : DrawableManiaHitObject<Note>, IKeyBindingHandler<ManiaAction>
     {
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Resolved]
+        private Bindable<ManiaColourCode> configColourCode { get; set; }
+
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
         private readonly Drawable headPiece;
@@ -34,6 +44,26 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             });
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            HitObject.SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
+            configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, HitObject.Snap));
+        }
+
+        private void UpdateSnapColour(ManiaColourCode colourCode, int snap)
+        {
+            if (colourCode == ManiaColourCode.On)
+            {
+                Colour = BindableBeatDivisor.GetColourFor(HitObject.Snap, colours);
+            }
+            else
+            {
+                Colour = Colour4.White;
+            }
+        }
+
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
         {
             base.OnDirectionChanged(e);
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 6cc7ff92d3..bf0631170a 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Mania.Objects
     /// </summary>
     public class HoldNote : ManiaHitObject, IHasDuration
     {
+        public IBeatmap Beatmap;
+
         public double EndTime
         {
             get => StartTime + Duration;
@@ -84,6 +86,11 @@ namespace osu.Game.Rulesets.Mania.Objects
         /// </summary>
         private double tickSpacing = 50;
 
+        public HoldNote(IBeatmap beatmap) : base()
+        {
+            Beatmap = beatmap;
+        }
+
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
@@ -98,14 +105,14 @@ namespace osu.Game.Rulesets.Mania.Objects
 
             createTicks(cancellationToken);
 
-            AddNested(Head = new Note
+            AddNested(Head = new Note(Beatmap)
             {
                 StartTime = StartTime,
                 Column = Column,
                 Samples = GetNodeSamples(0),
             });
 
-            AddNested(Tail = new TailNote
+            AddNested(Tail = new TailNote(Beatmap)
             {
                 StartTime = EndTime,
                 Column = Column,
diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 0035960c63..6ee0232c5b 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.cs
@@ -1,6 +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 osu.Framework.Bindables;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
@@ -12,5 +17,79 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class Note : ManiaHitObject
     {
         public override Judgement CreateJudgement() => new ManiaJudgement();
+
+        private IBeatmap Beatmap;
+
+        public readonly Bindable<int> SnapBindable = new Bindable<int>();
+
+        public int Snap
+        {
+            get => SnapBindable.Value;
+            set => SnapBindable.Value = value;
+        }
+
+        public Note(IBeatmap beatmap) : base()
+        {
+            Beatmap = beatmap;
+            this.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
+        }
+
+        private void SnapToBeatmap()
+        {
+            if (Beatmap != null)
+            {
+                TimingControlPoint currentTimingPoint = Beatmap.ControlPointInfo.TimingPointAt(StartTime);
+                int timeSignature = (int)currentTimingPoint.TimeSignature;
+                double startTime = currentTimingPoint.Time;
+                double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
+
+                double offset = startTime % secondsPerFourCounts;
+                double snapResult = StartTime % secondsPerFourCounts - offset;
+
+                if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
+                {
+                    Snap = 1;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
+                {
+                    Snap = 2;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
+                {
+                    Snap = 3;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
+                {
+                    Snap = 4;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
+                {
+                    Snap = 6;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
+                {
+                    Snap = 8;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
+                {
+                    Snap = 12;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
+                {
+                    Snap = 16;
+                }
+                else
+                {
+                    Snap = 0;
+                }
+            }
+        }
+
+        private const double LENIENCY_MS = 1.0;
+        private static bool AlmostDivisibleBy(double dividend, double divisor)
+        {
+            double remainder = Math.Abs(dividend) % divisor;
+            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/TailNote.cs b/osu.Game.Rulesets.Mania/Objects/TailNote.cs
index 5a30fd6a12..bc56408691 100644
--- a/osu.Game.Rulesets.Mania/Objects/TailNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/TailNote.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.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
@@ -8,6 +9,10 @@ namespace osu.Game.Rulesets.Mania.Objects
 {
     public class TailNote : Note
     {
+        public TailNote(IBeatmap beatmap) : base(beatmap)
+        {
+        }
+
         public override Judgement CreateJudgement() => new ManiaJudgement();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 4ee060e91e..dc9c525cb0 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -51,6 +51,9 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+
         public ScrollVisualisationMethod ScrollMethod
         {
             get => scrollMethod;
@@ -104,6 +107,8 @@ namespace osu.Game.Rulesets.Mania.UI
             configDirection.BindValueChanged(direction => Direction.Value = (ScrollingDirection)direction.NewValue, true);
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
+
+            Config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
         }
 
         protected override void AdjustScrollSpeed(int amount)
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs b/osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs
new file mode 100644
index 0000000000..91b637b71d
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/ManiaColourCode.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.Rulesets.Mania.UI
+{
+    public enum ManiaColourCode
+    {
+        Off,
+        On
+    }
+}
diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index eca857f9e5..d8d419bceb 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -140,12 +140,12 @@ namespace osu.Game.Tests.Visual.Collections
             AddStep("add dropdown", () =>
             {
                 Add(new CollectionFilterDropdown
-                    {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        RelativeSizeAxes = Axes.X,
-                        Width = 0.4f,
-                    }
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.4f,
+                }
                 );
             });
             AddStep("add two collections with same name", () => manager.Collections.AddRange(new[]

From 59ae5ab913f74d75677576e10d3b3a9484a713a7 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Sat, 24 Apr 2021 13:25:29 +0200
Subject: [PATCH 09439/10326] Added transition in StarRatingDisplay

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 112 +++++++++---------
 1 file changed, 59 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index bfc336a677..748f58e430 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -12,7 +12,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -27,9 +26,8 @@ namespace osu.Game.Screens.Ranking.Expanded
         private OsuColour colours { get; set; }
 
         private CircularContainer colorContainer;
-        private OsuSpriteText wholePartText;
-        private OsuSpriteText fractionPartText;
         private StarDifficulty starDifficulty;
+        private FillFlowContainer foregroundContainer;
 
         public StarDifficulty StarDifficulty
         {
@@ -52,23 +50,15 @@ namespace osu.Game.Screens.Ranking.Expanded
 
         private void setDifficulty(StarDifficulty difficulty)
         {
-            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-            string wholePart = starRatingParts[0];
-            string fractionPart = starRatingParts[1];
-            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+            colorContainer.FadeColour(getDifficultyColour(difficulty), 250);
 
-            ColourInfo backgroundColour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
-
-            colorContainer.Colour = backgroundColour;
-
-            wholePartText.Text = $"{wholePart}";
-            fractionPartText.Text = $"{separator}{fractionPart}";
+            foregroundContainer.Expire();
+            foregroundContainer = null;
+            AddInternal(foregroundContainer = createForegroundContainer(difficulty));
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapDifficultyCache difficultyCache)
+        private void load()
         {
             AutoSizeAxes = Axes.Both;
 
@@ -78,6 +68,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                 {
                     RelativeSizeAxes = Axes.Both,
                     Masking = true,
+                    Colour = getDifficultyColour(starDifficulty),
                     Children = new Drawable[]
                     {
                         new Box
@@ -86,49 +77,64 @@ namespace osu.Game.Screens.Ranking.Expanded
                         },
                     }
                 },
-                new FillFlowContainer
+                foregroundContainer = createForegroundContainer(starDifficulty),
+            };
+        }
+
+        private ColourInfo getDifficultyColour(StarDifficulty difficulty)
+        {
+            return difficulty.DifficultyRating == DifficultyRating.ExpertPlus
+                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+        }
+
+        private FillFlowContainer createForegroundContainer(StarDifficulty difficulty)
+        {
+            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            string wholePart = starRatingParts[0];
+            string fractionPart = starRatingParts[1];
+            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+
+            return new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Padding = new MarginPadding { Horizontal = 8, Vertical = 4 },
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(2, 0),
+                Children = new Drawable[]
                 {
-                    AutoSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Horizontal = 8, Vertical = 4 },
-                    Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(2, 0),
-                    Children = new Drawable[]
+                    new SpriteIcon
                     {
-                        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 =>
                         {
-                            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))
+                            s.Colour = Color4.Black;
+                            s.Font = s.Font.With(size: 14);
+                            s.UseFullGlyphHeight = false;
+                        });
+                        t.AddText($"{separator}{fractionPart}", s =>
                         {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            TextAnchor = Anchor.BottomLeft,
-                        }.With(t =>
-                        {
-                            t.AddText(wholePartText = new OsuSpriteText(), s =>
-                            {
-                                s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size: 14);
-                                s.UseFullGlyphHeight = false;
-                            });
-                            t.AddText(fractionPartText = new OsuSpriteText(), s =>
-                            {
-                                s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size: 7);
-                                s.UseFullGlyphHeight = false;
-                            });
-                        }),
-                    }
+                            s.Colour = Color4.Black;
+                            s.Font = s.Font.With(size: 7);
+                            s.UseFullGlyphHeight = false;
+                        });
+                    }),
                 }
             };
-
-            setDifficulty(starDifficulty);
         }
     }
 }

From f9905ebe68352f19f6fafa981369da2a4a4faeba Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 19:30:16 +0800
Subject: [PATCH 09440/10326] Remove beatmap argument in Note

---
 .../ManiaPlacementBlueprintTestScene.cs       | 12 ---
 .../ManiaSelectionBlueprintTestScene.cs       | 12 ---
 .../TestSceneHoldNotePlacementBlueprint.cs    |  2 +-
 .../TestSceneHoldNoteSelectionBlueprint.cs    |  2 +-
 .../Editor/TestSceneManiaHitObjectComposer.cs |  7 +-
 .../Editor/TestSceneNotePlacementBlueprint.cs |  2 +-
 .../Editor/TestSceneNoteSelectionBlueprint.cs |  2 +-
 .../ManiaInputTestScene.cs                    | 13 ----
 .../Mods/TestSceneManiaModPerfect.cs          |  4 +-
 .../Skinning/ManiaSkinnableTestScene.cs       | 12 ---
 .../Skinning/TestSceneHoldNote.cs             |  2 +-
 .../Skinning/TestSceneNote.cs                 |  2 +-
 .../TestSceneAutoGeneration.cs                | 24 +++---
 .../TestSceneColumn.cs                        |  4 +-
 .../TestSceneHoldNoteInput.cs                 | 75 ++++++++++---------
 .../TestSceneNotes.cs                         | 17 +----
 .../TestSceneOutOfOrderHits.cs                | 10 +--
 .../TestSceneStage.cs                         |  4 +-
 .../Beatmaps/ManiaBeatmapConverter.cs         |  4 +-
 .../Legacy/DistanceObjectPatternGenerator.cs  |  4 +-
 .../Legacy/EndTimeObjectPatternGenerator.cs   |  4 +-
 .../Legacy/HitObjectPatternGenerator.cs       |  2 +-
 .../Blueprints/HoldNotePlacementBlueprint.cs  |  5 +-
 .../Edit/Blueprints/NotePlacementBlueprint.cs |  5 +-
 .../Edit/HoldNoteCompositionTool.cs           |  7 +-
 .../Edit/ManiaHitObjectComposer.cs            |  4 +-
 .../Edit/NoteCompositionTool.cs               |  8 +-
 .../Mods/ManiaModInvert.cs                    |  2 +-
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   | 11 +--
 osu.Game.Rulesets.Mania/Objects/Note.cs       |  3 +-
 osu.Game.Rulesets.Mania/Objects/TailNote.cs   |  5 --
 .../TestSceneManageCollectionsDialog.cs       | 12 +--
 32 files changed, 99 insertions(+), 183 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index 8e94d6bbb6..ece523e84c 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -4,12 +4,10 @@
 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.Framework.Timing;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -30,9 +28,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(typeof(IScrollingInfo))]
         private IScrollingInfo scrollingInfo;
 
-        [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
-
         protected ManiaPlacementBlueprintTestScene()
         {
             scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
@@ -46,13 +41,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
-        }
-
         protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
         {
             var time = column.TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 453f8e36e6..176fbba921 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -2,10 +2,8 @@
 // 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.Timing;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
@@ -17,9 +15,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
-        [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
-
         protected ManiaSelectionBlueprintTestScene()
         {
             Add(new Column(0)
@@ -31,13 +26,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
-        }
-
         public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
index eb36e19048..87c74a12cf 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
@@ -13,6 +13,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
     public class TestSceneHoldNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableHoldNote((HoldNote)hitObject);
-        protected override PlacementBlueprint CreateBlueprint() => new HoldNotePlacementBlueprint(null);
+        protected override PlacementBlueprint CreateBlueprint() => new HoldNotePlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
index 9674985d09..24f4c6858e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
         public TestSceneHoldNoteSelectionBlueprint()
         {
-            var holdNote = new HoldNote(null) { Column = 0, Duration = 1000 };
+            var holdNote = new HoldNote { Column = 0, Duration = 1000 };
             holdNote.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             base.Content.Child = content = new ScrollingTestContainer(ScrollingDirection.Down)
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
index 1f3f4842c7..aaf96c63a6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             AddStep("setup beatmap", () =>
             {
                 composer.EditorBeatmap.Clear();
-                composer.EditorBeatmap.Add(new HoldNote(Beatmap.Value.Beatmap)
+                composer.EditorBeatmap.Add(new HoldNote
                 {
                     Column = 1,
                     EndTime = 200
@@ -201,10 +201,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
             public TestComposer()
             {
-                var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 4 });
                 InternalChildren = new Drawable[]
                 {
-                    EditorBeatmap = new EditorBeatmap(beatmap)
+                    EditorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition { Columns = 4 }))
                     {
                         BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo }
                     },
@@ -212,7 +211,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
                 };
 
                 for (int i = 0; i < 10; i++)
-                    EditorBeatmap.Add(new Note(beatmap) { StartTime = 125 * i });
+                    EditorBeatmap.Add(new Note { StartTime = 125 * i });
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
index 08a22ea28e..36c34a8fb9 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
@@ -55,6 +55,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private Note getNote() => this.ChildrenOfType<DrawableNote>().FirstOrDefault()?.HitObject;
 
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableNote((Note)hitObject);
-        protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint(null);
+        protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
index caf89599be..0e47a12a8e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
         public TestSceneNoteSelectionBlueprint()
         {
-            var note = new Note(null) { Column = 0 };
+            var note = new Note { Column = 0 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             DrawableNote drawableObject;
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index ea7432f3a7..9049bb3a82 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
@@ -1,21 +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.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
-using osu.Game.Rulesets.Mania.Configuration;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
     public abstract class ManiaInputTestScene : OsuTestScene
     {
-        [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
         private readonly Container<Drawable> content;
         protected override Container<Drawable> Content => content ?? base.Content;
 
@@ -24,13 +18,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             base.Content.Add(content = new LocalInputManager(keys));
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
-        }
-
         private class LocalInputManager : ManiaInputManager
         {
             public LocalInputManager(int variant)
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index 23d0e82439..2e3b21aed7 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -19,10 +19,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Note(Beatmap.Value.Beatmap) { 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 HitObjectTestData(new HoldNote(Beatmap.Value.Beatmap) { 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.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 3b19386da6..1d84a2dfcb 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -7,8 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Mania.Configuration;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osu.Game.Tests.Visual;
@@ -26,9 +24,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
-        [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
         protected ManiaSkinnableTestScene()
@@ -43,13 +38,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
-        }
-
         [Test]
         public void TestScrollingDown()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
index e13d0bbd7f..e88ff8e2ac 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 
         protected override DrawableManiaHitObject CreateHitObject()
         {
-            var note = new HoldNote(Beatmap.Value.Beatmap) { Duration = 1000 };
+            var note = new HoldNote { Duration = 1000 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new DrawableHoldNote(note);
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
index eac288872a..bc3bdf0bcb 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
     {
         protected override DrawableManiaHitObject CreateHitObject()
         {
-            var note = new Note(Beatmap.Value.Beatmap);
+            var note = new Note();
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new DrawableNote(note);
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
index b2b9d607c6..cffec3dfd5 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -69,8 +69,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000, Column = 1 });
+            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note { StartTime = 1000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -91,8 +91,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -114,8 +114,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note { StartTime = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -141,8 +141,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 2000, Duration = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 2000, Duration = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -168,8 +168,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 3000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new Note { StartTime = 3000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index 59da73a540..d9b1ad22fa 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             for (int i = 0; i < columns.Count; i++)
             {
-                var obj = new Note(null) { Column = i, StartTime = Time.Current + 2000 };
+                var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
                 obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                 columns[i].Add(new DrawableNote(obj));
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             for (int i = 0; i < columns.Count; i++)
             {
-                var obj = new HoldNote(null) { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
+                var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
                 obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                 columns[i].Add(new DrawableHoldNote(obj));
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index c92fe03483..668487f673 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -249,6 +249,21 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var beatmap = new Beatmap<ManiaHitObject>
             {
+                HitObjects =
+                {
+                    new HoldNote
+                    {
+                        StartTime = 1000,
+                        Duration = 500,
+                        Column = 0,
+                    },
+                    new HoldNote
+                    {
+                        StartTime = 1000 + 500 + windows.WindowFor(HitResult.Miss) + 10,
+                        Duration = 500,
+                        Column = 0,
+                    },
+                },
                 BeatmapInfo =
                 {
                     BaseDifficulty = new BeatmapDifficulty
@@ -259,20 +274,6 @@ namespace osu.Game.Rulesets.Mania.Tests
                     Ruleset = new ManiaRuleset().RulesetInfo
                 },
             };
-            beatmap.HitObjects = new List<ManiaHitObject> {
-                    new HoldNote(beatmap)
-                    {
-                        StartTime = 1000,
-                        Duration = 500,
-                        Column = 0,
-                    },
-                    new HoldNote(beatmap)
-                    {
-                        StartTime = 1000 + 500 + windows.WindowFor(HitResult.Miss) + 10,
-                        Duration = 500,
-                        Column = 0,
-                    },
-            };
 
             performTest(new List<ReplayFrame>
             {
@@ -296,21 +297,21 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var beatmap = new Beatmap<ManiaHitObject>
             {
+                HitObjects =
+                {
+                    new HoldNote
+                    {
+                        StartTime = time_head,
+                        Duration = time_tail - time_head,
+                        Column = 0,
+                    }
+                },
                 BeatmapInfo =
                 {
                     BaseDifficulty = new BeatmapDifficulty { SliderTickRate = tick_rate },
                     Ruleset = new ManiaRuleset().RulesetInfo
                 },
             };
-            beatmap.HitObjects = new List<ManiaHitObject>
-                {
-                    new HoldNote(beatmap)
-                    {
-                        StartTime = time_head,
-                        Duration = time_tail - time_head,
-                        Column = 0,
-                    }
-                };
 
             performTest(new List<ReplayFrame>
             {
@@ -328,17 +329,17 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var beatmap = new Beatmap<ManiaHitObject>
             {
-                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
-            };
-            beatmap.HitObjects = new List<ManiaHitObject>
+                HitObjects =
                 {
-                    new HoldNote(beatmap)
+                    new HoldNote
                     {
                         StartTime = 1000,
                         Duration = 0,
                         Column = 0,
                     },
-                };
+                },
+                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+            };
 
             performTest(new List<ReplayFrame>
             {
@@ -373,21 +374,21 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 beatmap = new Beatmap<ManiaHitObject>
                 {
+                    HitObjects =
+                    {
+                        new HoldNote
+                        {
+                            StartTime = time_head,
+                            Duration = time_tail - time_head,
+                            Column = 0,
+                        }
+                    },
                     BeatmapInfo =
                     {
                         BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 4 },
                         Ruleset = new ManiaRuleset().RulesetInfo
                     },
                 };
-                beatmap.HitObjects = new List<ManiaHitObject>
-                    {
-                        new HoldNote(beatmap)
-                        {
-                            StartTime = time_head,
-                            Duration = time_tail - time_head,
-                            Column = 0,
-                        }
-                    };
 
                 beatmap.ControlPointInfo.Add(0, new DifficultyControlPoint { SpeedMultiplier = 0.1f });
             }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 3660895347..706268e478 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -15,10 +15,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -31,10 +29,6 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class TestSceneNotes : OsuTestScene
     {
-
-        [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
-
         [Test]
         public void TestVariousNotes()
         {
@@ -69,16 +63,9 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("hold note 2 facing upwards", () => verifyAnchors(holdNote2, Anchor.y0));
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
-        }
-
         private Drawable createNoteDisplay(ScrollingDirection direction, int identifier, out DrawableNote hitObject)
         {
-            var note = new Note(null) { StartTime = 0 };
+            var note = new Note { StartTime = 0 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new ScrollingTestContainer(direction)
@@ -93,7 +80,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private Drawable createHoldNoteDisplay(ScrollingDirection direction, int identifier, out DrawableHoldNote hitObject)
         {
-            var note = new HoldNote(null) { StartTime = 0, Duration = 5000 };
+            var note = new HoldNote { StartTime = 0, Duration = 5000 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new ScrollingTestContainer(direction)
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index 65195fdd3f..18891f8c58 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 double time = 1000 + i * 100;
 
-                objects.Add(new Note(Beatmap.Value.Beatmap) { StartTime = time });
+                objects.Add(new Note { StartTime = time });
 
                 // don't hit the first note
                 if (i > 0)
@@ -60,12 +60,12 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var objects = new List<ManiaHitObject>
             {
-                new HoldNote(Beatmap.Value.Beatmap)
+                new HoldNote
                 {
                     StartTime = 1000,
                     EndTime = 1010,
                 },
-                new HoldNote(Beatmap.Value.Beatmap)
+                new HoldNote
                 {
                     StartTime = 1020,
                     EndTime = 1030
@@ -83,12 +83,12 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var objects = new List<ManiaHitObject>
             {
-                new HoldNote(Beatmap.Value.Beatmap)
+                new HoldNote
                 {
                     StartTime = 1000,
                     EndTime = 1010,
                 },
-                new HoldNote(Beatmap.Value.Beatmap)
+                new HoldNote
                 {
                     StartTime = 1020,
                     EndTime = 1030
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
index 777163cca7..7376a90f17 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 for (int i = 0; i < stage.Columns.Count; i++)
                 {
-                    var obj = new Note(null) { Column = i, StartTime = Time.Current + 2000 };
+                    var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
                     obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                     stage.Add(new DrawableNote(obj));
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 for (int i = 0; i < stage.Columns.Count; i++)
                 {
-                    var obj = new HoldNote(null) { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
+                    var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
                     obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                     stage.Add(new DrawableHoldNote(obj));
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 5f03c93d55..26393c8edb 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                 if (HitObject is IHasDuration endTimeData)
                 {
-                    pattern.Add(new HoldNote(Beatmap)
+                    pattern.Add(new HoldNote
                     {
                         StartTime = HitObject.StartTime,
                         Duration = endTimeData.Duration,
@@ -258,7 +258,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 }
                 else if (HitObject is IHasXPosition)
                 {
-                    pattern.Add(new Note(Beatmap)
+                    pattern.Add(new Note
                     {
                         StartTime = HitObject.StartTime,
                         Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index a936878a38..26e5d381e2 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -512,7 +512,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (startTime == endTime)
             {
-                newObject = new Note(Beatmap)
+                newObject = new Note
                 {
                     StartTime = startTime,
                     Samples = sampleInfoListAt(startTime),
@@ -521,7 +521,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             }
             else
             {
-                newObject = new HoldNote(Beatmap)
+                newObject = new HoldNote
                 {
                     StartTime = startTime,
                     Duration = endTime - startTime,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
index 9422146803..f816a70ab3 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (holdNote)
             {
-                newObject = new HoldNote(Beatmap)
+                newObject = new HoldNote
                 {
                     StartTime = HitObject.StartTime,
                     Duration = endTime - HitObject.StartTime,
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             }
             else
             {
-                newObject = new Note(Beatmap)
+                newObject = new Note
                 {
                     StartTime = HitObject.StartTime,
                     Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index bbb4d4b466..54c37e9742 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -441,7 +441,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <param name="column">The column to add the note to.</param>
         private void addToPattern(Pattern pattern, int column)
         {
-            pattern.Add(new Note(Beatmap)
+            pattern.Add(new Note
             {
                 StartTime = HitObject.StartTime,
                 Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index b3902524a0..093a8da24f 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -5,7 +5,6 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
@@ -24,8 +23,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        public HoldNotePlacementBlueprint(IBeatmap beatmap)
-            : base(new HoldNote(beatmap))
+        public HoldNotePlacementBlueprint()
+            : base(new HoldNote())
         {
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index cc0ef5181a..3db89c8ae6 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
@@ -15,8 +14,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
     {
         private readonly EditNotePiece piece;
 
-        public NotePlacementBlueprint(IBeatmap beatmap)
-            : base(new Note(beatmap))
+        public NotePlacementBlueprint()
+            : base(new Note())
         {
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
index 696278de4d..a5f10ed436 100644
--- a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
@@ -5,22 +5,19 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
     public class HoldNoteCompositionTool : HitObjectCompositionTool
     {
-        private ManiaBeatmap Beatmap;
-        public HoldNoteCompositionTool(ManiaBeatmap beatmap)
+        public HoldNoteCompositionTool()
             : base("Hold")
         {
-            Beatmap = beatmap;
         }
 
         public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders);
 
-        public override PlacementBlueprint CreatePlacementBlueprint() => new HoldNotePlacementBlueprint(Beatmap);
+        public override PlacementBlueprint CreatePlacementBlueprint() => new HoldNotePlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 0defeb026d..d9570bf8be 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -93,8 +93,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
-            new NoteCompositionTool(drawableRuleset.Beatmap),
-            new HoldNoteCompositionTool(drawableRuleset.Beatmap)
+            new NoteCompositionTool(),
+            new HoldNoteCompositionTool()
         };
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
index c77c3722c6..9f54152596 100644
--- a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 
@@ -13,16 +12,13 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public class NoteCompositionTool : HitObjectCompositionTool
     {
-        private ManiaBeatmap Beatmap;
-
-        public NoteCompositionTool(ManiaBeatmap beatmap)
+        public NoteCompositionTool()
             : base(nameof(Note))
         {
-            Beatmap = beatmap;
         }
 
         public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles);
 
-        public override PlacementBlueprint CreatePlacementBlueprint() => new NotePlacementBlueprint(Beatmap);
+        public override PlacementBlueprint CreatePlacementBlueprint() => new NotePlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 11310c6642..1ea45c295c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                     // Decrease the duration by at most a 1/4 beat to ensure there's no instantaneous notes.
                     duration = Math.Max(duration / 2, duration - beatLength / 4);
 
-                    newColumnObjects.Add(new HoldNote(maniaBeatmap)
+                    newColumnObjects.Add(new HoldNote
                     {
                         Column = column.Key,
                         StartTime = locations[i].startTime,
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index bf0631170a..6cc7ff92d3 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Rulesets.Mania.Objects
     /// </summary>
     public class HoldNote : ManiaHitObject, IHasDuration
     {
-        public IBeatmap Beatmap;
-
         public double EndTime
         {
             get => StartTime + Duration;
@@ -86,11 +84,6 @@ namespace osu.Game.Rulesets.Mania.Objects
         /// </summary>
         private double tickSpacing = 50;
 
-        public HoldNote(IBeatmap beatmap) : base()
-        {
-            Beatmap = beatmap;
-        }
-
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
@@ -105,14 +98,14 @@ namespace osu.Game.Rulesets.Mania.Objects
 
             createTicks(cancellationToken);
 
-            AddNested(Head = new Note(Beatmap)
+            AddNested(Head = new Note
             {
                 StartTime = StartTime,
                 Column = Column,
                 Samples = GetNodeSamples(0),
             });
 
-            AddNested(Tail = new TailNote(Beatmap)
+            AddNested(Tail = new TailNote
             {
                 StartTime = EndTime,
                 Column = Column,
diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 6ee0232c5b..36f32c78af 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.cs
@@ -28,9 +28,8 @@ namespace osu.Game.Rulesets.Mania.Objects
             set => SnapBindable.Value = value;
         }
 
-        public Note(IBeatmap beatmap) : base()
+        public Note()
         {
-            Beatmap = beatmap;
             this.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
         }
 
diff --git a/osu.Game.Rulesets.Mania/Objects/TailNote.cs b/osu.Game.Rulesets.Mania/Objects/TailNote.cs
index bc56408691..5a30fd6a12 100644
--- a/osu.Game.Rulesets.Mania/Objects/TailNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/TailNote.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.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
@@ -9,10 +8,6 @@ namespace osu.Game.Rulesets.Mania.Objects
 {
     public class TailNote : Note
     {
-        public TailNote(IBeatmap beatmap) : base(beatmap)
-        {
-        }
-
         public override Judgement CreateJudgement() => new ManiaJudgement();
     }
 }
diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index d8d419bceb..eca857f9e5 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -140,12 +140,12 @@ namespace osu.Game.Tests.Visual.Collections
             AddStep("add dropdown", () =>
             {
                 Add(new CollectionFilterDropdown
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    RelativeSizeAxes = Axes.X,
-                    Width = 0.4f,
-                }
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        RelativeSizeAxes = Axes.X,
+                        Width = 0.4f,
+                    }
                 );
             });
             AddStep("add two collections with same name", () => manager.Collections.AddRange(new[]

From d6d81fb8e5a55db4f58aa4cc41d729f3e0ec3f27 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 19:53:21 +0800
Subject: [PATCH 09441/10326] Move color snap logic from Note to DrawableNote

---
 .../Objects/Drawables/DrawableNote.cs         | 102 +++++++++++++++---
 osu.Game.Rulesets.Mania/Objects/Note.cs       |  78 --------------
 .../UI/DrawableManiaRuleset.cs                |   5 +
 3 files changed, 93 insertions(+), 92 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 436e0923c4..3b2a9feee2 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -1,12 +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;
 using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
@@ -27,10 +31,21 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private Bindable<ManiaColourCode> configColourCode { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private ManiaBeatmap beatmap { get; set; }
+
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
         private readonly Drawable headPiece;
 
+        public readonly Bindable<int> SnapBindable = new Bindable<int>();
+
+        public int Snap
+        {
+            get => SnapBindable.Value;
+            set => SnapBindable.Value = value;
+        }
+
         public DrawableNote(Note hitObject)
             : base(hitObject)
         {
@@ -48,20 +63,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.LoadComplete();
 
-            HitObject.SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
-            configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, HitObject.Snap));
-        }
+            HitObject.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
 
-        private void UpdateSnapColour(ManiaColourCode colourCode, int snap)
-        {
-            if (colourCode == ManiaColourCode.On)
-            {
-                Colour = BindableBeatDivisor.GetColourFor(HitObject.Snap, colours);
-            }
-            else
-            {
-                Colour = Colour4.White;
-            }
+            SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
+            configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, Snap));
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
@@ -103,5 +108,74 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         public virtual void OnReleased(ManiaAction action)
         {
         }
+        private void SnapToBeatmap()
+        {
+            if (beatmap != null)
+            {
+                TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(HitObject.StartTime);
+                int timeSignature = (int)currentTimingPoint.TimeSignature;
+                double startTime = currentTimingPoint.Time;
+                double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
+
+                double offset = startTime % secondsPerFourCounts;
+                double snapResult = HitObject.StartTime % secondsPerFourCounts - offset;
+
+                if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
+                {
+                    Snap = 1;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
+                {
+                    Snap = 2;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
+                {
+                    Snap = 3;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
+                {
+                    Snap = 4;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
+                {
+                    Snap = 6;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
+                {
+                    Snap = 8;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
+                {
+                    Snap = 12;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
+                {
+                    Snap = 16;
+                }
+                else
+                {
+                    Snap = 0;
+                }
+            }
+        }
+
+        private const double LENIENCY_MS = 1.0;
+        private static bool AlmostDivisibleBy(double dividend, double divisor)
+        {
+            double remainder = Math.Abs(dividend) % divisor;
+            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
+        }
+
+        private void UpdateSnapColour(ManiaColourCode colourCode, int snap)
+        {
+            if (colourCode == ManiaColourCode.On)
+            {
+                Colour = BindableBeatDivisor.GetColourFor(Snap, colours);
+            }
+            else
+            {
+                Colour = Colour4.White;
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 36f32c78af..0035960c63 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.cs
@@ -1,11 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using osu.Framework.Bindables;
-using osu.Framework.Utils;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
@@ -17,78 +12,5 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class Note : ManiaHitObject
     {
         public override Judgement CreateJudgement() => new ManiaJudgement();
-
-        private IBeatmap Beatmap;
-
-        public readonly Bindable<int> SnapBindable = new Bindable<int>();
-
-        public int Snap
-        {
-            get => SnapBindable.Value;
-            set => SnapBindable.Value = value;
-        }
-
-        public Note()
-        {
-            this.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
-        }
-
-        private void SnapToBeatmap()
-        {
-            if (Beatmap != null)
-            {
-                TimingControlPoint currentTimingPoint = Beatmap.ControlPointInfo.TimingPointAt(StartTime);
-                int timeSignature = (int)currentTimingPoint.TimeSignature;
-                double startTime = currentTimingPoint.Time;
-                double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
-
-                double offset = startTime % secondsPerFourCounts;
-                double snapResult = StartTime % secondsPerFourCounts - offset;
-
-                if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
-                {
-                    Snap = 1;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
-                {
-                    Snap = 2;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
-                {
-                    Snap = 3;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
-                {
-                    Snap = 4;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
-                {
-                    Snap = 6;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
-                {
-                    Snap = 8;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
-                {
-                    Snap = 12;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
-                {
-                    Snap = 16;
-                }
-                else
-                {
-                    Snap = 0;
-                }
-            }
-        }
-
-        private const double LENIENCY_MS = 1.0;
-        private static bool AlmostDivisibleBy(double dividend, double divisor)
-        {
-            double remainder = Math.Abs(dividend) % divisor;
-            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index dc9c525cb0..850d4800cd 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -45,6 +45,9 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
 
+        [Cached(typeof(ManiaBeatmap))]
+        private ManiaBeatmap CachedBeatmap { get; }
+
         public IEnumerable<BarLine> BarLines;
 
         protected override bool RelativeScaleBeatLengths => true;
@@ -80,6 +83,8 @@ namespace osu.Game.Rulesets.Mania.UI
             : base(ruleset, beatmap, mods)
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
+
+            CachedBeatmap = Beatmap;
         }
 
         [BackgroundDependencyLoader]

From e937b778f6a5ccb4840e9561467c81edfbfb4028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Apr 2021 14:19:39 +0200
Subject: [PATCH 09442/10326] Fix potential failure in `ensureSourceClockSet()`

`ensureSourceClockSet()` was intended to only run when the adjustable
source hasn't been set at all yet. As it turns out permitting it to run
unconditionally can break the state of the underlying interpolated
clock. This is caused by the following factors:

* While the decoupleable clock is running, its `CurrentTime` does not
  come from either the source clock, or the internal stopwatch; it is
  instead calculated using the base `InterpolatingFramedClock` logic.

* A source change of a decoupleable clock seeks the provided source
  clock to the decoupleable's current time.

* When an interpolating clock is seeked (decoupleable clock is also
  an interpolating one), its interpolation state
  (`{Last,Current}InterpolatedTime`) are reset to 0.

* If the interpolating clock determines that its current time is too
  far away from the source's time (which was set when the source is
  changed), it will ignore the source and instead continue to use
  its current time until the source clock has caught up.

Overall, the source change is not really necessary if a source is
already there. The only reason to ensure it was set was to make sure
the first seek of the gameplay clock wasn't performed in decoupled
mode. Therefore, add a guard to make sure the source is only set if
there isn't one already.
---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6d60c09521..1c8a3e51ac 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -116,13 +116,17 @@ namespace osu.Game.Screens.Play
         protected void ChangeSource(IClock sourceClock) => AdjustableSource.ChangeSource(SourceClock = sourceClock);
 
         /// <summary>
-        /// Ensures that the <see cref="AdjustableSource"/> is set to <see cref="SourceClock"/>.
+        /// Ensures that the <see cref="AdjustableSource"/> is set to <see cref="SourceClock"/>, if it hasn't been given a source yet.
         /// This is usually done before a seek to avoid accidentally seeking only the adjustable source in decoupled mode,
         /// but not the actual source clock.
         /// That will pretty much only happen on the very first call of this method, as the source clock is passed in the constructor,
         /// but it is not yet set on the adjustable source there.
         /// </summary>
-        private void ensureSourceClockSet() => ChangeSource(SourceClock);
+        private void ensureSourceClockSet()
+        {
+            if (AdjustableSource.Source == null)
+                ChangeSource(SourceClock);
+        }
 
         protected override void Update()
         {

From a8b401522bf561d5a2d49567ec99a2048e56586a Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 20:39:22 +0800
Subject: [PATCH 09443/10326] Remove ManiaColourCode in favor for boolean

---
 .../Configuration/ManiaRulesetConfigManager.cs        |  2 +-
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs    |  4 ++--
 .../Objects/Drawables/DrawableNote.cs                 |  6 +++---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs    |  2 +-
 osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs         | 11 -----------
 5 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 292d494d88..f37937a736 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
             SetDefault(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
-            SetDefault(ManiaRulesetSetting.ColourCode, ManiaColourCode.Off);
+            SetDefault(ManiaRulesetSetting.ColourCode, false);
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index d46076d3bc..c0c587f67c 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -37,10 +37,10 @@ namespace osu.Game.Rulesets.Mania
                     Current = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
                     KeyboardStep = 5
                 },
-                new SettingsEnumDropdown<ManiaColourCode>
+                new SettingsCheckbox
                 {
                     LabelText = "Colour-coded notes",
-                    Current = config.GetBindable<ManiaColourCode>(ManiaRulesetSetting.ColourCode),
+                    Current = config.GetBindable<bool>(ManiaRulesetSetting.ColourCode),
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 3b2a9feee2..7cda70f2af 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private OsuColour colours { get; set; }
 
         [Resolved]
-        private Bindable<ManiaColourCode> configColourCode { get; set; }
+        private Bindable<bool> configColourCode { get; set; }
 
         [Resolved(canBeNull: true)]
         private ManiaBeatmap beatmap { get; set; }
@@ -166,9 +166,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
         }
 
-        private void UpdateSnapColour(ManiaColourCode colourCode, int snap)
+        private void UpdateSnapColour(bool colourCode, int snap)
         {
-            if (colourCode == ManiaColourCode.On)
+            if (colourCode)
             {
                 Colour = BindableBeatDivisor.GetColourFor(Snap, colours);
             }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 850d4800cd..94830adc33 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.UI
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
         [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+        protected readonly Bindable<bool> configColourCode = new Bindable<bool>();
 
         public ScrollVisualisationMethod ScrollMethod
         {
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs b/osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs
deleted file mode 100644
index 91b637b71d..0000000000
--- a/osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs
+++ /dev/null
@@ -1,11 +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.Rulesets.Mania.UI
-{
-    public enum ManiaColourCode
-    {
-        Off,
-        On
-    }
-}

From 91bf0d422d88fe519834cbe01771a20cc5a379d8 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 20:40:30 +0800
Subject: [PATCH 09444/10326] Rename ColourCode to ColourCodedNotes

---
 .../Configuration/ManiaRulesetConfigManager.cs                | 4 ++--
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs            | 2 +-
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index f37937a736..87a4689689 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
             SetDefault(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
-            SetDefault(ManiaRulesetSetting.ColourCode, false);
+            SetDefault(ManiaRulesetSetting.ColourCodedNotes, false);
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
@@ -36,6 +36,6 @@ namespace osu.Game.Rulesets.Mania.Configuration
     {
         ScrollTime,
         ScrollDirection,
-        ColourCode
+        ColourCodedNotes
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index c0c587f67c..552c793096 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania
                 new SettingsCheckbox
                 {
                     LabelText = "Colour-coded notes",
-                    Current = config.GetBindable<bool>(ManiaRulesetSetting.ColourCode),
+                    Current = config.GetBindable<bool>(ManiaRulesetSetting.ColourCodedNotes),
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 94830adc33..60e9613b71 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
 
-            Config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCode);
         }
 
         protected override void AdjustScrollSpeed(int amount)

From 3103fd8343efa3d811605ffae382da0734097dd2 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 20:54:05 +0800
Subject: [PATCH 09445/10326] Move snapping logic into SnapFinder

---
 .../Objects/Drawables/DrawableNote.cs         | 68 +----------------
 .../UI/DrawableManiaRuleset.cs                |  7 +-
 osu.Game.Rulesets.Mania/Utils/SnapFinder.cs   | 75 +++++++++++++++++++
 3 files changed, 83 insertions(+), 67 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Utils/SnapFinder.cs

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 7cda70f2af..998d9e625e 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -7,12 +7,9 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
-using osu.Framework.Utils;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Skinning.Default;
-using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Mania.Utils;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
@@ -31,8 +28,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private Bindable<bool> configColourCode { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private ManiaBeatmap beatmap { get; set; }
+        [Resolved]
+        private SnapFinder snapFinder { get; set; }
 
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
@@ -63,7 +60,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.LoadComplete();
 
-            HitObject.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
+            HitObject.StartTimeBindable.BindValueChanged(_ => Snap = snapFinder.FindSnap(HitObject), true);
 
             SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
             configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, Snap));
@@ -108,63 +105,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         public virtual void OnReleased(ManiaAction action)
         {
         }
-        private void SnapToBeatmap()
-        {
-            if (beatmap != null)
-            {
-                TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(HitObject.StartTime);
-                int timeSignature = (int)currentTimingPoint.TimeSignature;
-                double startTime = currentTimingPoint.Time;
-                double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
-
-                double offset = startTime % secondsPerFourCounts;
-                double snapResult = HitObject.StartTime % secondsPerFourCounts - offset;
-
-                if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
-                {
-                    Snap = 1;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
-                {
-                    Snap = 2;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
-                {
-                    Snap = 3;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
-                {
-                    Snap = 4;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
-                {
-                    Snap = 6;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
-                {
-                    Snap = 8;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
-                {
-                    Snap = 12;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
-                {
-                    Snap = 16;
-                }
-                else
-                {
-                    Snap = 0;
-                }
-            }
-        }
-
-        private const double LENIENCY_MS = 1.0;
-        private static bool AlmostDivisibleBy(double dividend, double divisor)
-        {
-            double remainder = Math.Abs(dividend) % divisor;
-            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
-        }
 
         private void UpdateSnapColour(bool colourCode, int snap)
         {
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 60e9613b71..99fb32f81f 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Mania.Utils;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -45,8 +46,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
 
-        [Cached(typeof(ManiaBeatmap))]
-        private ManiaBeatmap CachedBeatmap { get; }
+        [Cached]
+        private SnapFinder snapFinder { get; set; }
 
         public IEnumerable<BarLine> BarLines;
 
@@ -84,7 +85,7 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
 
-            CachedBeatmap = Beatmap;
+            snapFinder = new SnapFinder(Beatmap);
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
new file mode 100644
index 0000000000..01a9339552
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Utils/SnapFinder.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;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Mania.Utils
+{
+    public class SnapFinder
+    {
+        private ManiaBeatmap beatmap;
+        public SnapFinder(ManiaBeatmap beatmap)
+        {
+            this.beatmap = beatmap;
+        }
+
+        public int FindSnap(HitObject hitObject)
+        {
+            TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
+            int timeSignature = (int)currentTimingPoint.TimeSignature;
+            double startTime = currentTimingPoint.Time;
+            double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
+
+            double offset = startTime % secondsPerFourCounts;
+            double snapResult = hitObject.StartTime % secondsPerFourCounts - offset;
+
+            if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
+            {
+                return 1;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
+            {
+                return 2;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
+            {
+                return 3;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
+            {
+                return 4;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
+            {
+                return 6;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
+            {
+                return 8;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
+            {
+                return 12;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
+            {
+                return 16;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        private const double LENIENCY_MS = 1.0;
+        private static bool AlmostDivisibleBy(double dividend, double divisor)
+        {
+            double remainder = Math.Abs(dividend) % divisor;
+            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
+        }
+    }
+}

From 8b01082cbb3c257bd69ba6fb95cd173bce79f854 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 21:07:17 +0800
Subject: [PATCH 09446/10326] Fix visual tests missing dependency for
 ColourCodedNotes

---
 .../Editor/ManiaPlacementBlueprintTestScene.cs      | 12 ++++++++++++
 .../Editor/ManiaSelectionBlueprintTestScene.cs      | 12 ++++++++++++
 .../ManiaInputTestScene.cs                          | 13 +++++++++++++
 .../Skinning/ManiaSkinnableTestScene.cs             | 11 +++++++++++
 osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs     | 11 +++++++++++
 .../Objects/Drawables/DrawableNote.cs               | 13 ++++++++-----
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs  |  4 ++--
 7 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index ece523e84c..8a605a7ca3 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -4,10 +4,12 @@
 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.Framework.Timing;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -28,6 +30,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(typeof(IScrollingInfo))]
         private IScrollingInfo scrollingInfo;
 
+        [Cached]
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+
         protected ManiaPlacementBlueprintTestScene()
         {
             scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
@@ -41,6 +46,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
         protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
         {
             var time = column.TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 176fbba921..854d0fb14e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -2,8 +2,10 @@
 // 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.Timing;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
@@ -15,6 +17,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
+        [Cached]
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+
         protected ManiaSelectionBlueprintTestScene()
         {
             Add(new Column(0)
@@ -26,6 +31,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
         public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index 9049bb3a82..f54d90016c 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -13,11 +16,21 @@ namespace osu.Game.Rulesets.Mania.Tests
         private readonly Container<Drawable> content;
         protected override Container<Drawable> Content => content ?? base.Content;
 
+        [Cached]
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+
         protected ManiaInputTestScene(int keys)
         {
             base.Content.Add(content = new LocalInputManager(keys));
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
         private class LocalInputManager : ManiaInputManager
         {
             public LocalInputManager(int variant)
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 1d84a2dfcb..05f07bad12 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osu.Game.Tests.Visual;
@@ -24,6 +25,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
+        [Cached]
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
         protected ManiaSkinnableTestScene()
@@ -38,6 +42,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
         [Test]
         public void TestScrollingDown()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 706268e478..9828db7687 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -15,6 +15,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -29,6 +30,16 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class TestSceneNotes : OsuTestScene
     {
+        [Cached]
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
         [Test]
         public void TestVariousNotes()
         {
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 998d9e625e..cfae01f5f2 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -26,9 +26,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private OsuColour colours { get; set; }
 
         [Resolved]
-        private Bindable<bool> configColourCode { get; set; }
+        private Bindable<bool> configColourCodedNotes { get; set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private SnapFinder snapFinder { get; set; }
 
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
@@ -60,10 +60,13 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.LoadComplete();
 
-            HitObject.StartTimeBindable.BindValueChanged(_ => Snap = snapFinder.FindSnap(HitObject), true);
+            if (snapFinder != null)
+            {
+                HitObject.StartTimeBindable.BindValueChanged(_ => Snap = snapFinder.FindSnap(HitObject), true);
 
-            SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
-            configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, Snap));
+                SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCodedNotes.Value, snap.NewValue), true);
+                configColourCodedNotes.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, Snap));
+            }
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 99fb32f81f..818d6429e4 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.UI
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
         [Cached]
-        protected readonly Bindable<bool> configColourCode = new Bindable<bool>();
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
 
         public ScrollVisualisationMethod ScrollMethod
         {
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
 
-            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCode);
+            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
         }
 
         protected override void AdjustScrollSpeed(int amount)

From bedabc1ddf673aa94d7a38414cb0c710a4f9d4bb Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 22:12:07 +0800
Subject: [PATCH 09447/10326] Fix cake errors

---
 .../ManiaPlacementBlueprintTestScene.cs       |  4 +--
 .../ManiaSelectionBlueprintTestScene.cs       |  4 +--
 .../ManiaInputTestScene.cs                    |  4 +--
 .../Skinning/ManiaSkinnableTestScene.cs       |  4 +--
 .../TestSceneNotes.cs                         |  4 +--
 .../Objects/Drawables/DrawableNote.cs         |  7 +++--
 .../UI/DrawableManiaRuleset.cs                |  4 +--
 osu.Game.Rulesets.Mania/Utils/SnapFinder.cs   | 27 ++++++++++---------
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index 8a605a7ca3..c04b875245 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private IScrollingInfo scrollingInfo;
 
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         protected ManiaPlacementBlueprintTestScene()
         {
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private void load(RulesetConfigCache configCache)
         {
             var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 854d0fb14e..1c11dc397e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private readonly IAdjustableClock clock = new StopwatchClock();
 
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         protected ManiaSelectionBlueprintTestScene()
         {
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private void load(RulesetConfigCache configCache)
         {
             var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         public ManiaPlayfield Playfield => null;
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index f54d90016c..2b2db8aa96 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         protected override Container<Drawable> Content => content ?? base.Content;
 
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         protected ManiaInputTestScene(int keys)
         {
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         private void load(RulesetConfigCache configCache)
         {
             var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         private class LocalInputManager : ManiaInputManager
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 05f07bad12..941d01a1d6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         private void load(RulesetConfigCache configCache)
         {
             var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 9828db7687..1d053688a2 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -31,13 +31,13 @@ namespace osu.Game.Rulesets.Mania.Tests
     public class TestSceneNotes : OsuTestScene
     {
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         [BackgroundDependencyLoader]
         private void load(RulesetConfigCache configCache)
         {
             var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index cfae01f5f2..04c4b06c88 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.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.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -64,8 +63,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             {
                 HitObject.StartTimeBindable.BindValueChanged(_ => Snap = snapFinder.FindSnap(HitObject), true);
 
-                SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCodedNotes.Value, snap.NewValue), true);
-                configColourCodedNotes.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, Snap));
+                SnapBindable.BindValueChanged(snap => updateSnapColour(configColourCodedNotes.Value, snap.NewValue), true);
+                configColourCodedNotes.BindValueChanged(colourCode => updateSnapColour(colourCode.NewValue, Snap));
             }
         }
 
@@ -109,7 +108,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
         }
 
-        private void UpdateSnapColour(bool colourCode, int snap)
+        private void updateSnapColour(bool colourCode, int snap)
         {
             if (colourCode)
             {
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 818d6429e4..17535c9bc9 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.UI
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         public ScrollVisualisationMethod ScrollMethod
         {
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
 
-            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         protected override void AdjustScrollSpeed(int amount)
diff --git a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
index 01a9339552..83df0eb756 100644
--- a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
+++ b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
@@ -11,7 +11,8 @@ namespace osu.Game.Rulesets.Mania.Utils
 {
     public class SnapFinder
     {
-        private ManiaBeatmap beatmap;
+        private readonly ManiaBeatmap beatmap;
+
         public SnapFinder(ManiaBeatmap beatmap)
         {
             this.beatmap = beatmap;
@@ -20,42 +21,41 @@ namespace osu.Game.Rulesets.Mania.Utils
         public int FindSnap(HitObject hitObject)
         {
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
-            int timeSignature = (int)currentTimingPoint.TimeSignature;
             double startTime = currentTimingPoint.Time;
             double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
 
             double offset = startTime % secondsPerFourCounts;
             double snapResult = hitObject.StartTime % secondsPerFourCounts - offset;
 
-            if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
+            if (almostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
             {
                 return 1;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
             {
                 return 2;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
             {
                 return 3;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
             {
                 return 4;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
             {
                 return 6;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
             {
                 return 8;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
             {
                 return 12;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
             {
                 return 16;
             }
@@ -65,11 +65,12 @@ namespace osu.Game.Rulesets.Mania.Utils
             }
         }
 
-        private const double LENIENCY_MS = 1.0;
-        private static bool AlmostDivisibleBy(double dividend, double divisor)
+        private const double leniency_ms = 1.0;
+
+        private static bool almostDivisibleBy(double dividend, double divisor)
         {
             double remainder = Math.Abs(dividend) % divisor;
-            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
+            return Precision.AlmostEquals(remainder, 0, leniency_ms) || Precision.AlmostEquals(remainder - divisor, 0, leniency_ms);
         }
     }
 }

From 46c44c576d2c27218da69f4493d61ebffd8ab895 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 18 Apr 2021 19:16:20 -0700
Subject: [PATCH 09448/10326] Fix beatmap info download button content not
 scaling on mouse down

---
 .../Buttons/HeaderDownloadButton.cs           | 66 ++++++++-----------
 1 file changed, 29 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
index cffff86a64..6d27342049 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
@@ -47,52 +47,44 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
         {
             FillFlowContainer textSprites;
 
-            AddRangeInternal(new Drawable[]
+            AddInternal(shakeContainer = new ShakeContainer
             {
-                shakeContainer = new ShakeContainer
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                CornerRadius = 5,
+                Child = button = new HeaderButton { RelativeSizeAxes = Axes.Both },
+            });
+
+            button.AddRange(new Drawable[]
+            {
+                new Container
                 {
-                    Depth = -1,
+                    Padding = new MarginPadding { Horizontal = 10 },
                     RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    CornerRadius = 5,
                     Children = new Drawable[]
                     {
-                        button = new HeaderButton { RelativeSizeAxes = Axes.Both },
-                        new Container
+                        textSprites = new FillFlowContainer
                         {
-                            // cannot nest inside here due to the structure of button (putting things in its own content).
-                            // requires framework fix.
-                            Padding = new MarginPadding { Horizontal = 10 },
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
-                            {
-                                textSprites = new FillFlowContainer
-                                {
-                                    Depth = -1,
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    AutoSizeAxes = Axes.Both,
-                                    AutoSizeDuration = 500,
-                                    AutoSizeEasing = Easing.OutQuint,
-                                    Direction = FillDirection.Vertical,
-                                },
-                                new SpriteIcon
-                                {
-                                    Depth = -1,
-                                    Anchor = Anchor.CentreRight,
-                                    Origin = Anchor.CentreRight,
-                                    Icon = FontAwesome.Solid.Download,
-                                    Size = new Vector2(18),
-                                },
-                            }
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            AutoSizeAxes = Axes.Both,
+                            AutoSizeDuration = 500,
+                            AutoSizeEasing = Easing.OutQuint,
+                            Direction = FillDirection.Vertical,
                         },
-                        new DownloadProgressBar(BeatmapSet.Value)
+                        new SpriteIcon
                         {
-                            Depth = -2,
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
+                            Icon = FontAwesome.Solid.Download,
+                            Size = new Vector2(18),
                         },
-                    },
+                    }
+                },
+                new DownloadProgressBar(BeatmapSet.Value)
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
                 },
             });
 

From c9967f7b7486d5744aba911a144110811b76ef04 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 24 Apr 2021 08:37:37 -0700
Subject: [PATCH 09449/10326] Fix button being recreated on importing state

---
 osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
index a61640a02e..85ed3f8767 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
@@ -268,11 +268,13 @@ namespace osu.Game.Overlays.BeatmapSet
                     break;
 
                 case DownloadState.Downloading:
-                case DownloadState.Importing:
                     // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
                     downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
                     break;
 
+                case DownloadState.Importing:
+                    break;
+
                 default:
                     downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
                     if (BeatmapSet.Value.OnlineInfo.HasVideo)

From eaac4fe6c7b76bfef30d37bd7f15b6eb8d0cdccc Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 06:38:15 +0800
Subject: [PATCH 09450/10326] Simplify FindSnap method

---
 osu.Game.Rulesets.Mania/Utils/SnapFinder.cs | 49 ++++-----------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
index 83df0eb756..ed3bd4af05 100644
--- a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
+++ b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
@@ -18,51 +18,20 @@ namespace osu.Game.Rulesets.Mania.Utils
             this.beatmap = beatmap;
         }
 
+        private readonly static int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
+
         public int FindSnap(HitObject hitObject)
         {
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
-            double startTime = currentTimingPoint.Time;
-            double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
+            double snapResult = (hitObject.StartTime - currentTimingPoint.Time) % (currentTimingPoint.BeatLength * 4);
 
-            double offset = startTime % secondsPerFourCounts;
-            double snapResult = hitObject.StartTime % secondsPerFourCounts - offset;
+            foreach (var snap in snaps)
+            {
+                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / (double)snap))
+                    return snap;
+            }
 
-            if (almostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
-            {
-                return 1;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
-            {
-                return 2;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
-            {
-                return 3;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
-            {
-                return 4;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
-            {
-                return 6;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
-            {
-                return 8;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
-            {
-                return 12;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
-            {
-                return 16;
-            }
-            else
-            {
-                return 0;
-            }
+            return 0;
         }
 
         private const double leniency_ms = 1.0;

From e0ca44c908754b2766ac5dccce2d4d93ae2dacb0 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 07:34:17 +0800
Subject: [PATCH 09451/10326] Move SnapFinder from mania ruleset to osu.Game

---
 .../Objects/Drawables/DrawableNote.cs                    | 2 +-
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs       | 2 --
 .../Utils => osu.Game/Rulesets/Objects}/SnapFinder.cs    | 9 ++++-----
 3 files changed, 5 insertions(+), 8 deletions(-)
 rename {osu.Game.Rulesets.Mania/Utils => osu.Game/Rulesets/Objects}/SnapFinder.cs (85%)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 04c4b06c88..2a363606ab 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Skinning.Default;
-using osu.Game.Rulesets.Mania.Utils;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 17535c9bc9..c1b61aaf31 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -20,7 +20,6 @@ using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
-using osu.Game.Rulesets.Mania.Utils;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -84,7 +83,6 @@ namespace osu.Game.Rulesets.Mania.UI
             : base(ruleset, beatmap, mods)
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
-
             snapFinder = new SnapFinder(Beatmap);
         }
 
diff --git a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs b/osu.Game/Rulesets/Objects/SnapFinder.cs
similarity index 85%
rename from osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
rename to osu.Game/Rulesets/Objects/SnapFinder.cs
index ed3bd4af05..eb8f4110a2 100644
--- a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
+++ b/osu.Game/Rulesets/Objects/SnapFinder.cs
@@ -3,17 +3,16 @@
 
 using System;
 using osu.Framework.Utils;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Objects;
 
-namespace osu.Game.Rulesets.Mania.Utils
+namespace osu.Game.Rulesets.Objects
 {
     public class SnapFinder
     {
-        private readonly ManiaBeatmap beatmap;
+        private readonly IBeatmap beatmap;
 
-        public SnapFinder(ManiaBeatmap beatmap)
+        public SnapFinder(IBeatmap beatmap)
         {
             this.beatmap = beatmap;
         }

From d3db19c3ce9e0b8992be15684d9ffe3214965246 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 07:44:26 +0800
Subject: [PATCH 09452/10326] Simplify DrawableNote

---
 .../Objects/Drawables/DrawableNote.cs         | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 2a363606ab..c364b395e1 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -5,6 +5,7 @@ using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Input.Bindings;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Skinning.Default;
@@ -34,13 +35,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private readonly Drawable headPiece;
 
-        public readonly Bindable<int> SnapBindable = new Bindable<int>();
-
-        public int Snap
-        {
-            get => SnapBindable.Value;
-            set => SnapBindable.Value = value;
-        }
+        private readonly Bindable<int> Snap = new Bindable<int>();
 
         public DrawableNote(Note hitObject)
             : base(hitObject)
@@ -61,10 +56,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             if (snapFinder != null)
             {
-                HitObject.StartTimeBindable.BindValueChanged(_ => Snap = snapFinder.FindSnap(HitObject), true);
+                HitObject.StartTimeBindable.BindValueChanged(_ => Snap.Value = snapFinder.FindSnap(HitObject), true);
 
-                SnapBindable.BindValueChanged(snap => updateSnapColour(configColourCodedNotes.Value, snap.NewValue), true);
-                configColourCodedNotes.BindValueChanged(colourCode => updateSnapColour(colourCode.NewValue, Snap));
+                Snap.BindValueChanged(_ => updateSnapColour(), true);
+                configColourCodedNotes.BindValueChanged(_ => updateSnapColour());
             }
         }
 
@@ -106,18 +101,13 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public virtual void OnReleased(ManiaAction action)
         {
-        }
+        } 
 
-        private void updateSnapColour(bool colourCode, int snap)
+        private void updateSnapColour()
         {
-            if (colourCode)
-            {
-                Colour = BindableBeatDivisor.GetColourFor(Snap, colours);
-            }
-            else
-            {
-                Colour = Colour4.White;
-            }
+            Colour = configColourCodedNotes.Value
+                ? (ColourInfo)BindableBeatDivisor.GetColourFor(Snap.Value, colours)
+                : (ColourInfo)Colour4.White;
         }
     }
 }
\ No newline at end of file

From 8b9d2a6cff41601d51f4a184ee08a5869479ffb7 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 08:32:21 +0800
Subject: [PATCH 09453/10326] Remove caching for ConfigColourCodedNotes

---
 .../Editor/ManiaPlacementBlueprintTestScene.cs      | 12 ------------
 .../Editor/ManiaSelectionBlueprintTestScene.cs      | 12 ------------
 .../ManiaInputTestScene.cs                          | 13 -------------
 .../Skinning/ManiaSkinnableTestScene.cs             | 11 -----------
 osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs     | 11 -----------
 .../Objects/Drawables/DrawableNote.cs               |  9 +++++++--
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs  |  5 -----
 7 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index c04b875245..ece523e84c 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -4,12 +4,10 @@
 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.Framework.Timing;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -30,9 +28,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(typeof(IScrollingInfo))]
         private IScrollingInfo scrollingInfo;
 
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
         protected ManiaPlacementBlueprintTestScene()
         {
             scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
@@ -46,13 +41,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
-        }
-
         protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
         {
             var time = column.TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 1c11dc397e..176fbba921 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -2,10 +2,8 @@
 // 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.Timing;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
@@ -17,9 +15,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
         protected ManiaSelectionBlueprintTestScene()
         {
             Add(new Column(0)
@@ -31,13 +26,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
-        }
-
         public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index 2b2db8aa96..9049bb3a82 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
@@ -1,12 +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.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -16,21 +13,11 @@ namespace osu.Game.Rulesets.Mania.Tests
         private readonly Container<Drawable> content;
         protected override Container<Drawable> Content => content ?? base.Content;
 
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
         protected ManiaInputTestScene(int keys)
         {
             base.Content.Add(content = new LocalInputManager(keys));
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
-        }
-
         private class LocalInputManager : ManiaInputManager
         {
             public LocalInputManager(int variant)
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 941d01a1d6..1d84a2dfcb 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osu.Game.Tests.Visual;
@@ -25,9 +24,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
         protected ManiaSkinnableTestScene()
@@ -42,13 +38,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
-        }
-
         [Test]
         public void TestScrollingDown()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 1d053688a2..706268e478 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -15,7 +15,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -30,16 +29,6 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class TestSceneNotes : OsuTestScene
     {
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
-        }
-
         [Test]
         public void TestVariousNotes()
         {
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index c364b395e1..09dd0da5ac 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Input.Bindings;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -25,8 +26,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private OsuColour colours { get; set; }
 
-        [Resolved]
-        private Bindable<bool> configColourCodedNotes { get; set; }
+        [Resolved(canBeNull: true)]
+        private ManiaRulesetConfigManager config { get; set; }
+
+        private readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
 
         [Resolved(canBeNull: true)]
         private SnapFinder snapFinder { get; set; }
@@ -56,6 +59,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             if (snapFinder != null)
             {
+                config?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+
                 HitObject.StartTimeBindable.BindValueChanged(_ => Snap.Value = snapFinder.FindSnap(HitObject), true);
 
                 Snap.BindValueChanged(_ => updateSnapColour(), true);
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index c1b61aaf31..174727cc2d 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -54,9 +54,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
         public ScrollVisualisationMethod ScrollMethod
         {
             get => scrollMethod;
@@ -111,8 +108,6 @@ namespace osu.Game.Rulesets.Mania.UI
             configDirection.BindValueChanged(direction => Direction.Value = (ScrollingDirection)direction.NewValue, true);
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
-
-            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         protected override void AdjustScrollSpeed(int amount)

From 1f48378ce72b4036601eb09d0a6090ba51434d38 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 08:53:45 +0800
Subject: [PATCH 09454/10326] Add xmldoc to SnapFinder

---
 osu.Game/Rulesets/Objects/SnapFinder.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/SnapFinder.cs b/osu.Game/Rulesets/Objects/SnapFinder.cs
index eb8f4110a2..f915d41305 100644
--- a/osu.Game/Rulesets/Objects/SnapFinder.cs
+++ b/osu.Game/Rulesets/Objects/SnapFinder.cs
@@ -8,10 +8,17 @@ using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects
 {
+    /// <summary>
+    /// Used to find the lowest beat divisor that a <see cref="HitObject"/> aligns to in an <see cref="IBeatmap"/>
+    /// </summary>
     public class SnapFinder
     {
         private readonly IBeatmap beatmap;
 
+        /// <summary>
+        /// Creates a new SnapFinder instance.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to align to when evaulating.</param>
         public SnapFinder(IBeatmap beatmap)
         {
             this.beatmap = beatmap;
@@ -19,6 +26,10 @@ namespace osu.Game.Rulesets.Objects
 
         private readonly static int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
 
+        /// <summary>
+        /// Finds the lowest beat divisor that the given HitObject aligns to.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to evaluate.</param>
         public int FindSnap(HitObject hitObject)
         {
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);

From 211bff6a8f09d8379b1574dfb80d97b76e318ae3 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 09:21:25 +0800
Subject: [PATCH 09455/10326] Fix cake errors

---
 .../Objects/Drawables/DrawableNote.cs                  | 10 +++++-----
 osu.Game/Rulesets/Objects/SnapFinder.cs                |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 09dd0da5ac..9f30221fde 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private readonly Drawable headPiece;
 
-        private readonly Bindable<int> Snap = new Bindable<int>();
+        private readonly Bindable<int> snap = new Bindable<int>();
 
         public DrawableNote(Note hitObject)
             : base(hitObject)
@@ -61,9 +61,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             {
                 config?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
 
-                HitObject.StartTimeBindable.BindValueChanged(_ => Snap.Value = snapFinder.FindSnap(HitObject), true);
+                HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = snapFinder.FindSnap(HitObject), true);
 
-                Snap.BindValueChanged(_ => updateSnapColour(), true);
+                snap.BindValueChanged(_ => updateSnapColour(), true);
                 configColourCodedNotes.BindValueChanged(_ => updateSnapColour());
             }
         }
@@ -106,12 +106,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public virtual void OnReleased(ManiaAction action)
         {
-        } 
+        }
 
         private void updateSnapColour()
         {
             Colour = configColourCodedNotes.Value
-                ? (ColourInfo)BindableBeatDivisor.GetColourFor(Snap.Value, colours)
+                ? (ColourInfo)BindableBeatDivisor.GetColourFor(snap.Value, colours)
                 : (ColourInfo)Colour4.White;
         }
     }
diff --git a/osu.Game/Rulesets/Objects/SnapFinder.cs b/osu.Game/Rulesets/Objects/SnapFinder.cs
index f915d41305..3bc1d5cfb7 100644
--- a/osu.Game/Rulesets/Objects/SnapFinder.cs
+++ b/osu.Game/Rulesets/Objects/SnapFinder.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Objects
             this.beatmap = beatmap;
         }
 
-        private readonly static int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
+        private static readonly int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
 
         /// <summary>
         /// Finds the lowest beat divisor that the given HitObject aligns to.
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Objects
 
             foreach (var snap in snaps)
             {
-                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / (double)snap))
+                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / snap))
                     return snap;
             }
 

From 6fd77e536df6bfcab9a3c2ab8d8c19fdc822fb8b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 25 Apr 2021 05:34:54 +0200
Subject: [PATCH 09456/10326] Add unsnap check

---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |   5 +-
 osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs | 119 ++++++++++++++++++
 2 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index f33feac971..aa3459a01a 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -22,7 +22,10 @@ namespace osu.Game.Rulesets.Edit
 
             // Audio
             new CheckAudioPresence(),
-            new CheckAudioQuality()
+            new CheckAudioQuality(),
+
+            // Compose
+            new CheckUnsnaps()
         };
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
new file mode 100644
index 0000000000..835c4bdb69
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.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 System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Edit.Checks.Components;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckUnsnaps : ICheck
+    {
+        private const double unsnap_ms_threshold = 2;
+
+        private static readonly int[] greatest_common_divisors = { 16, 12, 9, 7, 5 };
+
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Unsnapped hitobjects");
+
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplate2MsOrMore(this),
+            new IssueTemplate1MsOrMore(this)
+        };
+
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        {
+            foreach (var hitobject in playableBeatmap.HitObjects)
+            {
+                double startUnsnap = hitobject.StartTime - closestSnapTime(playableBeatmap, hitobject.StartTime);
+                string startPostfix = hitobject is IHasDuration ? "start" : "";
+                foreach (var issue in getUnsnapIssues(hitobject, startUnsnap, hitobject.StartTime, startPostfix))
+                    yield return issue;
+
+                if (hitobject is IHasRepeats hasRepeats)
+                {
+                    for (int repeatIndex = 0; repeatIndex < hasRepeats.RepeatCount; ++repeatIndex)
+                    {
+                        double spanDuration = hasRepeats.Duration / (hasRepeats.RepeatCount + 1);
+                        double repeatTime = hitobject.StartTime + spanDuration * (repeatIndex + 1);
+                        double repeatUnsnap = repeatTime - closestSnapTime(playableBeatmap, repeatTime);
+                        foreach (var issue in getUnsnapIssues(hitobject, repeatUnsnap, repeatTime, "repeat"))
+                            yield return issue;
+                    }
+                }
+
+                if (hitobject is IHasDuration hasDuration)
+                {
+                    double endUnsnap = hasDuration.EndTime - closestSnapTime(playableBeatmap, hasDuration.EndTime);
+                    foreach (var issue in getUnsnapIssues(hitobject, endUnsnap, hasDuration.EndTime, "end"))
+                        yield return issue;
+                }
+            }
+        }
+
+        private IEnumerable<Issue> getUnsnapIssues(HitObject hitobject, double unsnap, double time, string postfix = "")
+        {
+            if (Math.Abs(unsnap) >= unsnap_ms_threshold)
+                yield return new IssueTemplate2MsOrMore(this).Create(hitobject, unsnap, time, postfix);
+            else if (Math.Abs(unsnap) >= 1)
+                yield return new IssueTemplate1MsOrMore(this).Create(hitobject, unsnap, time, postfix);
+
+            // We don't care about unsnaps < 1 ms, as all object ends have these due to the way SV works.
+        }
+
+        private int closestSnapTime(IBeatmap playableBeatmap, double time)
+        {
+            var timingPoint = playableBeatmap.ControlPointInfo.TimingPointAt(time);
+            double smallestUnsnap = greatest_common_divisors.Select(divisor => Math.Abs(time - snapTime(timingPoint, time, divisor))).Min();
+
+            return (int)Math.Round(time + smallestUnsnap);
+        }
+
+        private int snapTime(TimingControlPoint timingPoint, double time, int beatDivisor)
+        {
+            double beatLength = timingPoint.BeatLength / beatDivisor;
+            int beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
+
+            // Casting to int matches the editor in both stable and lazer.
+            return (int)(timingPoint.Time + beatLengths * beatLength);
+        }
+
+        public abstract class IssueTemplateUnsnap : IssueTemplate
+        {
+            protected IssueTemplateUnsnap(ICheck check, IssueType type)
+                : base(check, type, "{0:0.##} is unsnapped by {1:0.##} ms.")
+            {
+            }
+
+            public Issue Create(HitObject hitobject, double unsnap, double time, string postfix = "")
+            {
+                string objectName = hitobject.GetType().Name;
+                if (!string.IsNullOrEmpty(postfix))
+                    objectName += " " + postfix;
+
+                return new Issue(hitobject, this, objectName, unsnap) { Time = time };
+            }
+        }
+
+        public class IssueTemplate2MsOrMore : IssueTemplateUnsnap
+        {
+            public IssueTemplate2MsOrMore(ICheck check)
+                : base(check, IssueType.Problem)
+            {
+            }
+        }
+
+        public class IssueTemplate1MsOrMore : IssueTemplateUnsnap
+        {
+            public IssueTemplate1MsOrMore(ICheck check)
+                : base(check, IssueType.Negligible)
+            {
+            }
+        }
+    }
+}

From fa8e8ed36f3b410fc91eb07a49bcb4413e52fbce Mon Sep 17 00:00:00 2001
From: plan-do-break-fix <jeffdswan@outlook.com>
Date: Sat, 24 Apr 2021 22:57:18 -0500
Subject: [PATCH 09457/10326] fix(docs): corrects typo in project README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c539f9f4d8..eb790ca18f 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Commo
 
 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.
 
-**IMPORTANT:** Gameplay mechanics (and other features which you may have come to know and love) are in a constant state of flux. Game balance and final quality-of-life passes come at the end of development, preceeded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to the stable releases of osu! (found on the website). We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
+**IMPORTANT:** Gameplay mechanics (and other features which you may have come to know and love) are in a constant state of flux. Game balance and final quality-of-life passes come at the end of development, preceded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to the stable releases of osu! (found on the website). We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
 
 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:
 

From 62bcc5f76d891f45addc79500350be050f3b7fe9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 07:49:31 +0300
Subject: [PATCH 09458/10326] Add property for tracking whether control is
 during operation

---
 .../Compose/Components/SelectionBoxControl.cs   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 3432334deb..081848f372 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -25,6 +25,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private Circle circle;
 
+        /// <summary>
+        /// Whether an operation has began from this control.
+        /// </summary>
+        public bool InOperation { get; private set; }
+
         [Resolved]
         protected OsuColour Colours { get; private set; }
 
@@ -89,8 +94,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
             this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, 100, Easing.OutQuint);
         }
 
-        protected void OnOperationStarted() => OperationStarted?.Invoke();
+        protected void OnOperationStarted()
+        {
+            InOperation = true;
+            OperationStarted?.Invoke();
+        }
 
-        protected void OnOperationEnded() => OperationEnded?.Invoke();
+        protected void OnOperationEnded()
+        {
+            InOperation = false;
+            OperationEnded?.Invoke();
+        }
     }
 }

From ab7178267459a27b5a3a9896013cd09fe250dac9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 07:43:56 +0300
Subject: [PATCH 09459/10326] Use colour fade transform for selection box
 controls

To become harminous with the fade transforms of the rotation control
---
 .../Edit/Compose/Components/SelectionBoxButton.cs      |  2 +-
 .../Edit/Compose/Components/SelectionBoxControl.cs     | 10 ++++++++--
 .../Compose/Components/SelectionBoxRotationHandle.cs   |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
index 917e5189b2..fbbebe3288 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void UpdateHoverState()
         {
             base.UpdateHoverState();
-            icon.Colour = !HandlingMouse && IsHovered ? Color4.White : Color4.Black;
+            icon.FadeColour(!HandlingMouse && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
         }
 
         public string TooltipText { get; }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 081848f372..374af20742 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public abstract class SelectionBoxControl : CompositeDrawable
     {
+        public const double TRANSFORM_DURATION = 100;
+
         public event Action OperationStarted;
         public event Action OperationEnded;
 
@@ -90,8 +92,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected virtual void UpdateHoverState()
         {
-            circle.Colour = HandlingMouse ? Colours.GrayF : (IsHovered ? Colours.Red : Colours.YellowDark);
-            this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, 100, Easing.OutQuint);
+            if (HandlingMouse)
+                circle.FadeColour(Colours.GrayF, TRANSFORM_DURATION, Easing.OutQuint);
+            else
+                circle.FadeColour(IsHovered ? Colours.Red : Colours.YellowDark, TRANSFORM_DURATION, Easing.OutQuint);
+
+            this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, TRANSFORM_DURATION, Easing.OutQuint);
         }
 
         protected void OnOperationStarted()
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index c4a4fafdc2..6303caf9ed 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -35,8 +35,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override void UpdateHoverState()
         {
-            icon.Colour = !HandlingMouse && IsHovered ? Color4.White : Color4.Black;
             base.UpdateHoverState();
+            icon.FadeColour(!HandlingMouse && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
         }
     }
 }

From 77f7d4c9632e281d8665a81c55252f12b181e163 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 08:06:00 +0300
Subject: [PATCH 09460/10326] Add composite managing display of selection box
 drag handles

---
 .../SelectionBoxDragHandleDisplay.cs          | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs
new file mode 100644
index 0000000000..1cba8ca6b3
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs
@@ -0,0 +1,103 @@
+// Copyright (c) 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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    /// <summary>
+    /// Represents a display composite containing and managing the visibility state of the selection box's drag handles.
+    /// </summary>
+    public class SelectionBoxDragHandleDisplay : CompositeDrawable
+    {
+        private Container<SelectionBoxScaleHandle> scaleHandles;
+        private Container<SelectionBoxRotationHandle> rotationHandles;
+
+        private readonly List<SelectionBoxDragHandle> allDragHandles = new List<SelectionBoxDragHandle>();
+
+        public new MarginPadding Padding
+        {
+            get => base.Padding;
+            set => base.Padding = value;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new Drawable[]
+            {
+                scaleHandles = new Container<SelectionBoxScaleHandle>
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                rotationHandles = new Container<SelectionBoxRotationHandle>
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding(-12.5f),
+                },
+            };
+        }
+
+        public void AddScaleHandle(SelectionBoxScaleHandle handle)
+        {
+            bindDragHandle(handle);
+            scaleHandles.Add(handle);
+        }
+
+        public void AddRotationHandle(SelectionBoxRotationHandle handle)
+        {
+            handle.Alpha = 0;
+            handle.AlwaysPresent = true;
+
+            bindDragHandle(handle);
+            rotationHandles.Add(handle);
+        }
+
+        private void bindDragHandle(SelectionBoxDragHandle handle)
+        {
+            handle.HoverGained += updateRotationHandlesVisibility;
+            handle.HoverLost += updateRotationHandlesVisibility;
+            handle.OperationStarted += updateRotationHandlesVisibility;
+            handle.OperationEnded += updateRotationHandlesVisibility;
+            allDragHandles.Add(handle);
+        }
+
+        private SelectionBoxRotationHandle displayedRotationHandle;
+        private SelectionBoxDragHandle activeHandle;
+
+        private void updateRotationHandlesVisibility()
+        {
+            if (activeHandle?.InOperation == true || activeHandle?.IsHovered == true)
+                return;
+
+            displayedRotationHandle?.FadeOut(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
+            displayedRotationHandle = null;
+
+            activeHandle = allDragHandles.SingleOrDefault(h => h.InOperation);
+            activeHandle ??= allDragHandles.SingleOrDefault(h => h.IsHovered);
+
+            if (activeHandle != null)
+            {
+                displayedRotationHandle = getCorrespondingRotationHandle(activeHandle, rotationHandles);
+                displayedRotationHandle?.FadeIn(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
+            }
+        }
+
+        /// <summary>
+        /// Gets the rotation handle corresponding to the given handle.
+        /// </summary>
+        [CanBeNull]
+        private static SelectionBoxRotationHandle getCorrespondingRotationHandle(SelectionBoxDragHandle handle, IEnumerable<SelectionBoxRotationHandle> rotationHandles)
+        {
+            if (handle is SelectionBoxRotationHandle rotationHandle)
+                return rotationHandle;
+
+            return rotationHandles.SingleOrDefault(r => r.Anchor == handle.Anchor);
+        }
+    }
+}

From a8c460f7df0924830c3ad7c3b657a04eda8ed4c7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 08:18:46 +0300
Subject: [PATCH 09461/10326] Replace separated top-centered rotation button
 with rotation drag handles

---
 .../Edit/Compose/Components/SelectionBox.cs   | 87 ++++++++++---------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 9d6b44e207..d7db98f6a2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private Container dragHandles;
+        private SelectionBoxDragHandleDisplay dragHandles;
         private FillFlowContainer buttons;
 
         public const float BORDER_RADIUS = 3;
@@ -161,7 +161,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         },
                     }
                 },
-                dragHandles = new Container
+                dragHandles = new SelectionBoxDragHandleDisplay
                 {
                     RelativeSizeAxes = Axes.Both,
                     // ensures that the centres of all drag handles line up with the middle of the selection box border.
@@ -186,75 +186,76 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void addRotationComponents()
         {
-            const float separation = 40;
-
             addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise", () => OnRotation?.Invoke(-90));
             addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise", () => OnRotation?.Invoke(90));
 
-            AddRangeInternal(new Drawable[]
-            {
-                new Box
-                {
-                    Depth = float.MaxValue,
-                    Colour = colours.YellowLight,
-                    Blending = BlendingParameters.Additive,
-                    Alpha = 0.3f,
-                    Size = new Vector2(BORDER_RADIUS, separation),
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.BottomCentre,
-                },
-                new SelectionBoxDragHandleButton(FontAwesome.Solid.Redo, "Free rotate")
-                {
-                    Anchor = Anchor.TopCentre,
-                    Y = -separation,
-                    HandleDrag = e => OnRotation?.Invoke(convertDragEventToAngleOfRotation(e)),
-                    OperationStarted = operationStarted,
-                    OperationEnded = operationEnded
-                }
-            });
+            addRotateHandle(Anchor.TopLeft);
+            addRotateHandle(Anchor.TopRight);
+            addRotateHandle(Anchor.BottomLeft);
+            addRotateHandle(Anchor.BottomRight);
         }
 
         private void addYScaleComponents()
         {
             addButton(FontAwesome.Solid.ArrowsAltV, "Flip vertically (Ctrl-J)", () => OnFlip?.Invoke(Direction.Vertical));
 
-            addDragHandle(Anchor.TopCentre);
-            addDragHandle(Anchor.BottomCentre);
+            addScaleHandle(Anchor.TopCentre);
+            addScaleHandle(Anchor.BottomCentre);
         }
 
         private void addFullScaleComponents()
         {
-            addDragHandle(Anchor.TopLeft);
-            addDragHandle(Anchor.TopRight);
-            addDragHandle(Anchor.BottomLeft);
-            addDragHandle(Anchor.BottomRight);
+            addScaleHandle(Anchor.TopLeft);
+            addScaleHandle(Anchor.TopRight);
+            addScaleHandle(Anchor.BottomLeft);
+            addScaleHandle(Anchor.BottomRight);
         }
 
         private void addXScaleComponents()
         {
             addButton(FontAwesome.Solid.ArrowsAltH, "Flip horizontally (Ctrl-H)", () => OnFlip?.Invoke(Direction.Horizontal));
 
-            addDragHandle(Anchor.CentreLeft);
-            addDragHandle(Anchor.CentreRight);
+            addScaleHandle(Anchor.CentreLeft);
+            addScaleHandle(Anchor.CentreRight);
         }
 
         private void addButton(IconUsage icon, string tooltip, Action action)
         {
-            buttons.Add(new SelectionBoxDragHandleButton(icon, tooltip)
+            var button = new SelectionBoxButton(icon, tooltip)
             {
-                OperationStarted = operationStarted,
-                OperationEnded = operationEnded,
                 Action = action
-            });
+            };
+
+            button.OperationStarted += operationStarted;
+            button.OperationEnded += operationEnded;
+            buttons.Add(button);
         }
 
-        private void addDragHandle(Anchor anchor) => dragHandles.Add(new SelectionBoxDragHandle
+        private void addScaleHandle(Anchor anchor)
         {
-            Anchor = anchor,
-            HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
-            OperationStarted = operationStarted,
-            OperationEnded = operationEnded
-        });
+            var handle = new SelectionBoxScaleHandle
+            {
+                Anchor = anchor,
+                HandleDrag = e => OnScale?.Invoke(e.Delta, anchor)
+            };
+
+            handle.OperationStarted += operationStarted;
+            handle.OperationEnded += operationEnded;
+            dragHandles.AddScaleHandle(handle);
+        }
+
+        private void addRotateHandle(Anchor anchor)
+        {
+            var handle = new SelectionBoxRotationHandle
+            {
+                Anchor = anchor,
+                HandleDrag = e => OnRotation?.Invoke(convertDragEventToAngleOfRotation(e))
+            };
+
+            handle.OperationStarted += operationStarted;
+            handle.OperationEnded += operationEnded;
+            dragHandles.AddRotationHandle(handle);
+        }
 
         private int activeOperations;
 

From 11318fd9fcbf8ffc4b9830dd4285037237e0f7b8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 09:35:02 +0300
Subject: [PATCH 09462/10326] Add test coverage

---
 .../Editing/TestSceneComposeSelectBox.cs      | 98 ++++++++++++++++++-
 1 file changed, 95 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index cf5f1b8818..13b563619a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -1,21 +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 System.Linq;
+using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editing
 {
-    public class TestSceneComposeSelectBox : OsuTestScene
+    public class TestSceneComposeSelectBox : OsuManualInputManagerTestScene
     {
         private Container selectionArea;
+        private SelectionBox selectionBox;
 
         public TestSceneComposeSelectBox()
         {
-            SelectionBox selectionBox = null;
-
             AddStep("create box", () =>
                 Child = selectionArea = new Container
                 {
@@ -68,5 +71,94 @@ namespace osu.Game.Tests.Visual.Editing
             selectionArea.Rotation += angle;
             return true;
         }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            InputManager.MoveMouseTo(selectionBox);
+            selectionBox.CanRotate = true;
+            selectionBox.CanScaleX = true;
+            selectionBox.CanScaleY = true;
+        });
+
+        [Test]
+        public void TestRotationHandleShownOnHover()
+        {
+            SelectionBoxRotationHandle rotationHandle = null;
+
+            AddStep("enable rotation", () => selectionBox.CanRotate = true);
+            AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
+
+            AddAssert("handle hidden", () => rotationHandle.Alpha == 0);
+            AddStep("hover over handle", () => InputManager.MoveMouseTo(rotationHandle));
+            AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
+
+            AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox));
+            AddUntilStep("handle hidden", () => rotationHandle.Alpha == 0);
+        }
+
+        [Test]
+        public void TestRotationHandleShownOnHoveringClosestScaleHandler()
+        {
+            SelectionBoxRotationHandle rotationHandle = null;
+
+            AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
+
+            AddAssert("rotation handle hidden", () => rotationHandle.Alpha == 0);
+            AddStep("hover over closest scale handle", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == rotationHandle.Anchor));
+            });
+            AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
+
+            AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox));
+            AddUntilStep("handle hidden", () => rotationHandle.Alpha == 0);
+        }
+
+        [Test]
+        public void TestHoverRotationHandleFromScaleHandle()
+        {
+            SelectionBoxRotationHandle rotationHandle = null;
+
+            AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
+
+            AddAssert("rotation handle hidden", () => rotationHandle.Alpha == 0);
+            AddStep("hover over closest scale handle", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == rotationHandle.Anchor));
+            });
+            AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
+            AddAssert("rotation handle not hovered", () => !rotationHandle.IsHovered);
+
+            AddStep("hover over rotation handle", () => InputManager.MoveMouseTo(rotationHandle));
+            AddAssert("rotation handle still shown", () => rotationHandle.Alpha == 1);
+            AddAssert("rotation handle hovered", () => rotationHandle.IsHovered);
+
+            AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox));
+            AddUntilStep("handle hidden", () => rotationHandle.Alpha == 0);
+        }
+
+        [Test]
+        public void TestDraggingScaleHandleKeepsCorrespondingRotationHandleShown()
+        {
+            SelectionBoxRotationHandle rotationHandle = null;
+
+            AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
+
+            AddAssert("rotation handle hidden", () => rotationHandle.Alpha == 0);
+            AddStep("hover over and hold closest scale handle", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == rotationHandle.Anchor));
+                InputManager.PressButton(MouseButton.Left);
+            });
+            AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
+
+            AddStep("drag to centre", () => InputManager.MoveMouseTo(selectionBox));
+            AddAssert("rotation handle still shown", () => rotationHandle.Alpha > 0);
+
+            AddStep("unhold left", () => InputManager.ReleaseButton(MouseButton.Left));
+            AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox, new Vector2(20)));
+            AddUntilStep("handle hidden", () => rotationHandle.Alpha == 0);
+        }
     }
 }

From f9e228d6bfb4e94ded823da5ceb6434c09db6b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Apr 2021 17:40:23 +0200
Subject: [PATCH 09463/10326] Use null-permitting BDL to reduce number of
 fields

---
 .../Objects/Drawables/DrawableNote.cs             | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 9f30221fde..52e343ba25 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -26,14 +26,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private OsuColour colours { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private ManiaRulesetConfigManager config { get; set; }
-
         private readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
 
-        [Resolved(canBeNull: true)]
-        private SnapFinder snapFinder { get; set; }
-
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
         private readonly Drawable headPiece;
@@ -53,13 +47,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             });
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader(true)]
+        private void load(ManiaRulesetConfigManager rulesetConfig, SnapFinder snapFinder)
         {
-            base.LoadComplete();
-
             if (snapFinder != null)
             {
-                config?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+                rulesetConfig?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
 
                 HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = snapFinder.FindSnap(HitObject), true);
 
@@ -115,4 +108,4 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 : (ColourInfo)Colour4.White;
         }
     }
-}
\ No newline at end of file
+}

From afb67726f0057525b975bbd7b51d6e156e3316a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Apr 2021 17:40:49 +0200
Subject: [PATCH 09464/10326] Reduce casting

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 52e343ba25..a5749408af 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -5,7 +5,6 @@ using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Framework.Input.Bindings;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Configuration;
@@ -15,6 +14,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
 using osu.Game.Skinning;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -104,8 +104,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private void updateSnapColour()
         {
             Colour = configColourCodedNotes.Value
-                ? (ColourInfo)BindableBeatDivisor.GetColourFor(snap.Value, colours)
-                : (ColourInfo)Colour4.White;
+                ? BindableBeatDivisor.GetColourFor(snap.Value, colours)
+                : Color4.White;
         }
     }
 }

From e14255f39548b250d5c276663f4765cbc41d2596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Apr 2021 17:42:56 +0200
Subject: [PATCH 09465/10326] Rename {Snap -> BeatDivisor}Finder

---
 .../Objects/Drawables/DrawableNote.cs              |  6 +++---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs |  4 ++--
 .../{SnapFinder.cs => BeatDivisorFinder.cs}        | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename osu.Game/Rulesets/Objects/{SnapFinder.cs => BeatDivisorFinder.cs} (77%)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index a5749408af..2d2fba0ad5 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -48,13 +48,13 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(ManiaRulesetConfigManager rulesetConfig, SnapFinder snapFinder)
+        private void load(ManiaRulesetConfigManager rulesetConfig, BeatDivisorFinder beatDivisorFinder)
         {
-            if (snapFinder != null)
+            if (beatDivisorFinder != null)
             {
                 rulesetConfig?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
 
-                HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = snapFinder.FindSnap(HitObject), true);
+                HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = beatDivisorFinder.FindDivisor(HitObject), true);
 
                 snap.BindValueChanged(_ => updateSnapColour(), true);
                 configColourCodedNotes.BindValueChanged(_ => updateSnapColour());
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 174727cc2d..0177c01240 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
 
         [Cached]
-        private SnapFinder snapFinder { get; set; }
+        private BeatDivisorFinder beatDivisorFinder { get; set; }
 
         public IEnumerable<BarLine> BarLines;
 
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Mania.UI
             : base(ruleset, beatmap, mods)
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
-            snapFinder = new SnapFinder(Beatmap);
+            beatDivisorFinder = new BeatDivisorFinder(Beatmap);
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Rulesets/Objects/SnapFinder.cs b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
similarity index 77%
rename from osu.Game/Rulesets/Objects/SnapFinder.cs
rename to osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
index 3bc1d5cfb7..29b271a7e7 100644
--- a/osu.Game/Rulesets/Objects/SnapFinder.cs
+++ b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
@@ -9,17 +9,17 @@ using osu.Game.Beatmaps.ControlPoints;
 namespace osu.Game.Rulesets.Objects
 {
     /// <summary>
-    /// Used to find the lowest beat divisor that a <see cref="HitObject"/> aligns to in an <see cref="IBeatmap"/>
+    /// Used to find the lowest beat divisor that a <see cref="HitObject"/> aligns to in an <see cref="IBeatmap"/>.
     /// </summary>
-    public class SnapFinder
+    public class BeatDivisorFinder
     {
         private readonly IBeatmap beatmap;
 
         /// <summary>
-        /// Creates a new SnapFinder instance.
+        /// Creates a new <see cref="BeatDivisorFinder"/> instance.
         /// </summary>
-        /// <param name="beatmap">The beatmap to align to when evaulating.</param>
-        public SnapFinder(IBeatmap beatmap)
+        /// <param name="beatmap">The beatmap to use when calculating beat divisor alignment.</param>
+        public BeatDivisorFinder(IBeatmap beatmap)
         {
             this.beatmap = beatmap;
         }
@@ -27,10 +27,10 @@ namespace osu.Game.Rulesets.Objects
         private static readonly int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
 
         /// <summary>
-        /// Finds the lowest beat divisor that the given HitObject aligns to.
+        /// Finds the lowest beat divisor that the given <see cref="HitObject"/> aligns to.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to evaluate.</param>
-        public int FindSnap(HitObject hitObject)
+        public int FindDivisor(HitObject hitObject)
         {
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
             double snapResult = (hitObject.StartTime - currentTimingPoint.Time) % (currentTimingPoint.BeatLength * 4);

From 33a5c156a1e79e3ffe22f7199e9348f8f42b2464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Apr 2021 17:52:11 +0200
Subject: [PATCH 09466/10326] Use existing snap list from BindableBeatDivisor

---
 osu.Game/Rulesets/Objects/BeatDivisorFinder.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
index 29b271a7e7..63a4ff2d34 100644
--- a/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
+++ b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Screens.Edit;
 
 namespace osu.Game.Rulesets.Objects
 {
@@ -24,8 +25,6 @@ namespace osu.Game.Rulesets.Objects
             this.beatmap = beatmap;
         }
 
-        private static readonly int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
-
         /// <summary>
         /// Finds the lowest beat divisor that the given <see cref="HitObject"/> aligns to.
         /// </summary>
@@ -35,10 +34,10 @@ namespace osu.Game.Rulesets.Objects
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
             double snapResult = (hitObject.StartTime - currentTimingPoint.Time) % (currentTimingPoint.BeatLength * 4);
 
-            foreach (var snap in snaps)
+            foreach (var divisor in BindableBeatDivisor.VALID_DIVISORS)
             {
-                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / snap))
-                    return snap;
+                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / divisor))
+                    return divisor;
             }
 
             return 0;

From 79e2b232d8a18775731bd3cca9c479d787ca64b8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 19:26:53 +0300
Subject: [PATCH 09467/10326] Improve English
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/Edit/Compose/Components/SelectionBoxControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 374af20742..9ad30a366d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private Circle circle;
 
         /// <summary>
-        /// Whether an operation has began from this control.
+        /// Whether this control is currently being operated on by the user.
         /// </summary>
         public bool InOperation { get; private set; }
 

From 7490511ebf4b869a1b98793ac773fb92b1f6714e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 19:57:16 +0300
Subject: [PATCH 09468/10326] Instantiate selection box on SetUp

---
 .../Editing/TestSceneComposeSelectBox.cs      | 47 +++++++------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 13b563619a..7b939245a4 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -17,32 +17,30 @@ namespace osu.Game.Tests.Visual.Editing
         private Container selectionArea;
         private SelectionBox selectionBox;
 
-        public TestSceneComposeSelectBox()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
-            AddStep("create box", () =>
-                Child = selectionArea = new Container
+            Child = selectionArea = new Container
+            {
+                Size = new Vector2(400),
+                Position = -new Vector2(150),
+                Anchor = Anchor.Centre,
+                Children = new Drawable[]
                 {
-                    Size = new Vector2(400),
-                    Position = -new Vector2(150),
-                    Anchor = Anchor.Centre,
-                    Children = new Drawable[]
+                    selectionBox = new SelectionBox
                     {
-                        selectionBox = new SelectionBox
-                        {
-                            CanRotate = true,
-                            CanScaleX = true,
-                            CanScaleY = true,
+                        CanRotate = true,
+                        CanScaleX = true,
+                        CanScaleY = true,
 
-                            OnRotation = handleRotation,
-                            OnScale = handleScale
-                        }
+                        OnRotation = handleRotation,
+                        OnScale = handleScale
                     }
-                });
+                }
+            };
 
-            AddToggleStep("toggle rotation", state => selectionBox.CanRotate = state);
-            AddToggleStep("toggle x", state => selectionBox.CanScaleX = state);
-            AddToggleStep("toggle y", state => selectionBox.CanScaleY = state);
-        }
+            InputManager.MoveMouseTo(selectionBox);
+        });
 
         private bool handleScale(Vector2 amount, Anchor reference)
         {
@@ -72,15 +70,6 @@ namespace osu.Game.Tests.Visual.Editing
             return true;
         }
 
-        [SetUp]
-        public void SetUp() => Schedule(() =>
-        {
-            InputManager.MoveMouseTo(selectionBox);
-            selectionBox.CanRotate = true;
-            selectionBox.CanScaleX = true;
-            selectionBox.CanScaleY = true;
-        });
-
         [Test]
         public void TestRotationHandleShownOnHover()
         {

From c58ef4230da768aad729e4785a156c80e83bad54 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 19:58:50 +0300
Subject: [PATCH 09469/10326] Inherit `VisibilityContainer` and make duration
 constant protected

---
 .../Edit/Compose/Components/SelectionBoxControl.cs        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 9ad30a366d..501ce6381a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -15,9 +15,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// Represents the base appearance for UI controls of the <see cref="SelectionBox"/>,
     /// such as scale handles, rotation handles, buttons, etc...
     /// </summary>
-    public abstract class SelectionBoxControl : CompositeDrawable
+    public abstract class SelectionBoxControl : VisibilityContainer
     {
-        public const double TRANSFORM_DURATION = 100;
+        protected const double TRANSFORM_DURATION = 100;
 
         public event Action OperationStarted;
         public event Action OperationEnded;
@@ -90,6 +90,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.OnMouseUp(e);
         }
 
+        protected override void PopIn() => this.FadeIn(TRANSFORM_DURATION, Easing.OutQuint);
+
+        protected override void PopOut() => this.FadeOut(TRANSFORM_DURATION, Easing.OutQuint);
+
         protected virtual void UpdateHoverState()
         {
             if (HandlingMouse)

From 7390a12e4b9bda91f0d4f4d374094abaf3fece92 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 19:59:08 +0300
Subject: [PATCH 09470/10326] SelectionBoxDragHandleDisplay ->
 SelectionBoxDragHandleContainer

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs    | 4 ++--
 ...gHandleDisplay.cs => SelectionBoxDragHandleContainer.cs} | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game/Screens/Edit/Compose/Components/{SelectionBoxDragHandleDisplay.cs => SelectionBoxDragHandleContainer.cs} (92%)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index d7db98f6a2..774ea076a5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private SelectionBoxDragHandleDisplay dragHandles;
+        private SelectionBoxDragHandleContainer dragHandles;
         private FillFlowContainer buttons;
 
         public const float BORDER_RADIUS = 3;
@@ -161,7 +161,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         },
                     }
                 },
-                dragHandles = new SelectionBoxDragHandleDisplay
+                dragHandles = new SelectionBoxDragHandleContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     // ensures that the centres of all drag handles line up with the middle of the selection box border.
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
similarity index 92%
rename from osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs
rename to osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 1cba8ca6b3..151c169a33 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// Represents a display composite containing and managing the visibility state of the selection box's drag handles.
     /// </summary>
-    public class SelectionBoxDragHandleDisplay : CompositeDrawable
+    public class SelectionBoxDragHandleContainer : CompositeDrawable
     {
         private Container<SelectionBoxScaleHandle> scaleHandles;
         private Container<SelectionBoxRotationHandle> rotationHandles;
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (activeHandle?.InOperation == true || activeHandle?.IsHovered == true)
                 return;
 
-            displayedRotationHandle?.FadeOut(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
+            displayedRotationHandle?.Hide();
             displayedRotationHandle = null;
 
             activeHandle = allDragHandles.SingleOrDefault(h => h.InOperation);
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (activeHandle != null)
             {
                 displayedRotationHandle = getCorrespondingRotationHandle(activeHandle, rotationHandles);
-                displayedRotationHandle?.FadeIn(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
+                displayedRotationHandle?.Show();
             }
         }
 

From 334927ed35f3de3edae71467fafe69808c660008 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 20:11:41 +0300
Subject: [PATCH 09471/10326] Remove leftover step

---
 osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 7b939245a4..914b8b6f27 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -75,7 +75,6 @@ namespace osu.Game.Tests.Visual.Editing
         {
             SelectionBoxRotationHandle rotationHandle = null;
 
-            AddStep("enable rotation", () => selectionBox.CanRotate = true);
             AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
 
             AddAssert("handle hidden", () => rotationHandle.Alpha == 0);

From b252485e1ab0dd5bfa38b35ce315219869fb45b0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 20:13:21 +0300
Subject: [PATCH 09472/10326] Remove protected expose of `HandlingMouse` setter

Regardless of `OnDragEnd()`, `OnMouseUp()` will still be called resetting the value of that state back.
---
 osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs | 2 +-
 .../Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 501ce6381a..3a2fc7f83a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Whether this control is currently handling mouse down input.
         /// </summary>
-        protected bool HandlingMouse { get; set; }
+        protected bool HandlingMouse { get; private set; }
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
index ea4f9704ef..d7e58df748 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -24,7 +24,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override void OnDragEnd(DragEndEvent e)
         {
-            HandlingMouse = false;
             OnOperationEnded();
 
             UpdateHoverState();

From 485da47d89d9fa4786935fcbd64c9a1d3b6eaac4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 26 Apr 2021 01:41:36 +0300
Subject: [PATCH 09473/10326] Revert "Inherit `VisibilityContainer` and make
 duration constant protected"

This reverts commit c58ef4230da768aad729e4785a156c80e83bad54. Uhh, how did I push this..
---
 .../Edit/Compose/Components/SelectionBoxControl.cs        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 3a2fc7f83a..38ed23fa13 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -15,9 +15,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// Represents the base appearance for UI controls of the <see cref="SelectionBox"/>,
     /// such as scale handles, rotation handles, buttons, etc...
     /// </summary>
-    public abstract class SelectionBoxControl : VisibilityContainer
+    public abstract class SelectionBoxControl : CompositeDrawable
     {
-        protected const double TRANSFORM_DURATION = 100;
+        public const double TRANSFORM_DURATION = 100;
 
         public event Action OperationStarted;
         public event Action OperationEnded;
@@ -90,10 +90,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.OnMouseUp(e);
         }
 
-        protected override void PopIn() => this.FadeIn(TRANSFORM_DURATION, Easing.OutQuint);
-
-        protected override void PopOut() => this.FadeOut(TRANSFORM_DURATION, Easing.OutQuint);
-
         protected virtual void UpdateHoverState()
         {
             if (HandlingMouse)

From beee318acc92bd0831bcd19984807c7f029e54bf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 26 Apr 2021 01:45:50 +0300
Subject: [PATCH 09474/10326] Add more distance between each hit object in
 editor selection test

To avoid potentially hovering over the rotation control instead of wherever the test desired to move the mouse to.
---
 .../Visual/Editing/TestSceneEditorSelection.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index b82842e30d..4ce1d995a5 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -50,9 +50,9 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
             {
                 new HitCircle { StartTime = 100 },
-                new HitCircle { StartTime = 200, Position = new Vector2(50) },
-                new HitCircle { StartTime = 300, Position = new Vector2(100) },
-                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+                new HitCircle { StartTime = 200, Position = new Vector2(100) },
+                new HitCircle { StartTime = 300, Position = new Vector2(200) },
+                new HitCircle { StartTime = 400, Position = new Vector2(300) },
             }));
 
             AddStep("select objects", () => EditorBeatmap.SelectedHitObjects.AddRange(addedObjects));
@@ -95,9 +95,9 @@ namespace osu.Game.Tests.Visual.Editing
             var addedObjects = new[]
             {
                 new HitCircle { StartTime = 100 },
-                new HitCircle { StartTime = 200, Position = new Vector2(50) },
-                new HitCircle { StartTime = 300, Position = new Vector2(100) },
-                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+                new HitCircle { StartTime = 200, Position = new Vector2(100) },
+                new HitCircle { StartTime = 300, Position = new Vector2(200) },
+                new HitCircle { StartTime = 400, Position = new Vector2(300) },
             };
 
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects));
@@ -131,9 +131,9 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
             {
                 new HitCircle { StartTime = 100 },
-                new HitCircle { StartTime = 200, Position = new Vector2(50) },
-                new HitCircle { StartTime = 300, Position = new Vector2(100) },
-                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+                new HitCircle { StartTime = 200, Position = new Vector2(100) },
+                new HitCircle { StartTime = 300, Position = new Vector2(200) },
+                new HitCircle { StartTime = 400, Position = new Vector2(300) },
             }));
 
             moveMouseToObject(() => addedObjects[0]);

From 8bb1fcd39b29b55b693d9540777f96ecb0d8d3c6 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Mon, 26 Apr 2021 07:07:32 +0800
Subject: [PATCH 09475/10326] Add tests for BeatDivisorFinder

---
 osu.Game.Tests/NonVisual/BeatDivisorFinder.cs | 116 ++++++++++++++++++
 .../Rulesets/Objects/BeatDivisorFinder.cs     |   3 +-
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/NonVisual/BeatDivisorFinder.cs

diff --git a/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs b/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
new file mode 100644
index 0000000000..742f5790d6
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
@@ -0,0 +1,116 @@
+// Copyright (c) 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.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Tests.NonVisual
+{
+    public class BeatDivisorFinderTest
+    {
+        [Test]
+        public void TestFindDivisor()
+        {
+            const int beatLength = 1000;
+
+            var beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitObject { StartTime = -beatLength / 3 },
+                    new HitObject { StartTime = 0 },
+                    new HitObject { StartTime = beatLength / 16 },
+                    new HitObject { StartTime = beatLength / 12 },
+                    new HitObject { StartTime = beatLength / 8 },
+                    new HitObject { StartTime = beatLength / 6 },
+                    new HitObject { StartTime = beatLength / 4 },
+                    new HitObject { StartTime = beatLength / 3 },
+                    new HitObject { StartTime = beatLength / 2 },
+                    new HitObject { StartTime = beatLength },
+                    new HitObject { StartTime = beatLength + beatLength / 7 }
+                },
+                ControlPointInfo = new ControlPointInfo()
+            };
+
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint()
+                {
+                    TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                    BeatLength = beatLength
+                });
+
+            var beatDivisorFinder = new BeatDivisorFinder(beatmap);
+
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[0]), 3);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[1]), 1);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[2]), 16);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[3]), 12);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[4]), 8);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[5]), 6);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[6]), 4);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[7]), 3);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[8]), 2);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[9]), 1);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[10]), 0);
+        }
+
+        [Test]
+        public void TestFindDivisorWithTempoChanges()
+        {
+            const int firstBeatLength = 1000;
+            const int secondBeatLength = 700;
+            const int thirdBeatLength = 200;
+
+            const int firstBeatLengthStart = 0;
+            const int secondBeatLengthStart = 1000;
+            const int thirdBeatLengthStart = 2000;
+
+            var beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitObject { StartTime = firstBeatLengthStart },
+                    new HitObject { StartTime = firstBeatLengthStart + firstBeatLength / 2 },
+                    new HitObject { StartTime = secondBeatLengthStart },
+                    new HitObject { StartTime = secondBeatLengthStart + secondBeatLength / 2 },
+                    new HitObject { StartTime = thirdBeatLengthStart },
+                    new HitObject { StartTime = thirdBeatLengthStart + thirdBeatLength / 2 },
+                },
+                ControlPointInfo = new ControlPointInfo()
+            };
+
+            var firstTimingControlPoint = new TimingControlPoint()
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = firstBeatLength
+            };
+            
+            var secondTimingControlPoint = new TimingControlPoint()
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = secondBeatLength
+            };
+            
+            var thirdTimingControlPoint = new TimingControlPoint()
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = thirdBeatLength
+            };
+
+            beatmap.ControlPointInfo.Add(firstBeatLengthStart, firstTimingControlPoint);
+            beatmap.ControlPointInfo.Add(secondBeatLengthStart, secondTimingControlPoint);
+            beatmap.ControlPointInfo.Add(thirdBeatLengthStart, thirdTimingControlPoint);
+
+            var beatDivisorFinder = new BeatDivisorFinder(beatmap);
+
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[0]), 1);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[1]), 2);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[2]), 1);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[3]), 2);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[4]), 1);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[5]), 2);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
index 63a4ff2d34..1479b22942 100644
--- a/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
+++ b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
@@ -27,12 +27,13 @@ namespace osu.Game.Rulesets.Objects
 
         /// <summary>
         /// Finds the lowest beat divisor that the given <see cref="HitObject"/> aligns to.
+        /// Returns 0 if it does not align to any divisor.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to evaluate.</param>
         public int FindDivisor(HitObject hitObject)
         {
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
-            double snapResult = (hitObject.StartTime - currentTimingPoint.Time) % (currentTimingPoint.BeatLength * 4);
+            double snapResult = hitObject.StartTime - currentTimingPoint.Time;
 
             foreach (var divisor in BindableBeatDivisor.VALID_DIVISORS)
             {

From 0b9172a1dc08dfa3e432b93aa48d0a3b7862fd31 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 26 Apr 2021 02:39:18 +0300
Subject: [PATCH 09476/10326] Animate back slider repeat and tail circle pieces

---
 .../Objects/Drawables/DrawableSliderRepeat.cs              | 7 +++++--
 .../Objects/Drawables/DrawableSliderTail.cs                | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 76490e0de1..5af2a38559 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -26,7 +26,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private double animDuration;
 
-        public Drawable CirclePiece { get; private set; }
+        public SkinnableDrawable CirclePiece { get; private set; }
+
         private Drawable scaleContainer;
         private ReverseArrowPiece arrow;
 
@@ -53,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Children = new[]
+                Children = new Drawable[]
                 {
                     // no default for this; only visible in legacy skins.
                     CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty()),
@@ -91,6 +92,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateHitStateTransforms(state);
 
+            (CirclePiece.Drawable as IMainCirclePiece)?.Animate(state);
+
             switch (state)
             {
                 case ArmedState.Idle:
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 87f098dd29..84b9b881a2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -84,6 +85,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Debug.Assert(HitObject.HitWindows != null);
 
+            (circlePiece.Drawable as IMainCirclePiece)?.Animate(state);
+
             switch (state)
             {
                 case ArmedState.Idle:

From e6474e6ff73b968970dc0c9e943130a6f865af06 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 26 Apr 2021 11:47:38 +0900
Subject: [PATCH 09477/10326] Remove redundant statement (lifetime is set in
 base)

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 312ed93e45..6ab6a4b984 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -212,10 +212,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             // LifetimeStart is already computed using HitObjectLifetimeEntry's InitialLifetimeOffset.
             // We override this with DHO's InitialLifetimeOffset for a non-pooled DHO.
             if (entry is SyntheticHitObjectEntry)
-                entry.LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
-
-            LifetimeStart = entry.LifetimeStart;
-            LifetimeEnd = entry.LifetimeEnd;
+                LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
 
             ensureEntryHasResult();
 

From 9178aa1d7d745f3057f0080ec704e86ced17f534 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 04:48:56 +0200
Subject: [PATCH 09478/10326] Add unsnap check tests

---
 .../Editing/Checks/CheckUnsnapsTest.cs        | 160 ++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
new file mode 100644
index 0000000000..88939c43ce
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
@@ -0,0 +1,160 @@
+// Copyright (c) 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 Moq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckUnsnapsTest
+    {
+        private CheckUnsnaps check;
+        private ControlPointInfo cpi;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckUnsnaps();
+
+            cpi = new ControlPointInfo();
+            cpi.Add(100, new TimingControlPoint { BeatLength = 100 });
+        }
+
+        [Test]
+        public void TestCircleSnapped()
+        {
+            assertOk(new List<HitObject>
+            {
+                new HitCircle { StartTime = 100 }
+            });
+        }
+
+        [Test]
+        public void TestCircleUnsnapped1Ms()
+        {
+            assert1Ms(new List<HitObject>
+            {
+                new HitCircle { StartTime = 101 }
+            });
+
+            assert1Ms(new List<HitObject>
+            {
+                new HitCircle { StartTime = 99 }
+            });
+        }
+
+        [Test]
+        public void TestCircleUnsnapped2Ms()
+        {
+            assert2Ms(new List<HitObject>
+            {
+                new HitCircle { StartTime = 102 }
+            });
+
+            assert2Ms(new List<HitObject>
+            {
+                new HitCircle { StartTime = 98 }
+            });
+        }
+
+        [Test]
+        public void TestSliderSnapped()
+        {
+            // Slider ends are naturally < 1 ms unsnapped because of how SV works.
+            var mockSlider = new Mock<Slider>();
+            mockSlider.SetupGet(s => s.StartTime).Returns(100);
+            mockSlider.As<IHasRepeats>().Setup(r => r.RepeatCount).Returns(0);
+            mockSlider.As<IHasDuration>().Setup(d => d.Duration).Returns(400.75d);
+
+            assertOk(new List<HitObject>
+            {
+                mockSlider.Object
+            });
+        }
+
+        [Test]
+        public void TestSliderUnsnapped1Ms()
+        {
+            assert1Ms(new List<HitObject>
+            {
+                getSliderMock(startTime: 101, endTime: 401.75d).Object
+            }, count: 2);
+
+            // End is only off by 0.25 ms, hence count 1.
+            assert1Ms(new List<HitObject>
+            {
+                getSliderMock(startTime: 99, endTime: 399.75d).Object
+            }, count: 1);
+        }
+
+        [Test]
+        public void TestSliderUnsnapped2Ms()
+        {
+            assert2Ms(new List<HitObject>
+            {
+                getSliderMock(startTime: 102, endTime: 402.75d).Object
+            }, count: 2);
+
+            // Start and end are 2 ms and 1.25 ms off respectively, hence two different issues in one object.
+            var hitobjects = new List<HitObject>
+            {
+                getSliderMock(startTime: 98, endTime: 398.75d).Object
+            };
+
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(2));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnaps.IssueTemplate1MsOrMore));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnaps.IssueTemplate2MsOrMore));
+        }
+
+        private Mock<Slider> getSliderMock(double startTime, double endTime, int repeats = 0)
+        {
+            var mockSlider = new Mock<Slider>();
+            mockSlider.SetupGet(s => s.StartTime).Returns(startTime);
+            mockSlider.As<IHasRepeats>().Setup(r => r.RepeatCount).Returns(repeats);
+            mockSlider.As<IHasDuration>().Setup(d => d.EndTime).Returns(endTime);
+
+            return mockSlider;
+        }
+
+        private void assertOk(List<HitObject> hitobjects)
+        {
+            Assert.That(check.Run(getPlayableBeatmap(hitobjects), null), Is.Empty);
+        }
+
+        private void assert1Ms(List<HitObject> hitobjects, int count = 1)
+        {
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(count));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnaps.IssueTemplate1MsOrMore));
+        }
+
+        private void assert2Ms(List<HitObject> hitobjects, int count = 1)
+        {
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(count));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnaps.IssueTemplate2MsOrMore));
+        }
+
+        private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
+        {
+            return new Beatmap<HitObject>
+            {
+                ControlPointInfo = cpi,
+                HitObjects = hitobjects
+            };
+        }
+    }
+}

From 20e3cadd30e6c2e9e49b0f880915646e7caa9624 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 26 Apr 2021 12:04:59 +0900
Subject: [PATCH 09479/10326] freeIfInUse -> free, and add comments

---
 .../Rulesets/Objects/Pooling/DrawableObject.cs    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs b/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
index b29e6a6c3c..27ed4c04f2 100644
--- a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
         {
             base.LoadAsyncComplete();
 
+            // Apply the initial entry given in the constructor.
             if (Entry != null && !HasEntryApplied)
                 Apply(Entry);
         }
@@ -60,7 +61,8 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </summary>
         public void Apply(TEntry entry)
         {
-            freeIfInUse();
+            if (HasEntryApplied)
+                free();
 
             setLifetime(entry.LifetimeStart, entry.LifetimeEnd);
             Entry = entry;
@@ -74,8 +76,9 @@ namespace osu.Game.Rulesets.Objects.Pooling
         {
             base.FreeAfterUse();
 
-            if (IsInPool)
-                freeIfInUse();
+            // We preserve the existing entry in case we want to move a non-pooled drawable between different parent drawables.
+            if (HasEntryApplied && IsInPool)
+                free();
         }
 
         /// <summary>
@@ -104,11 +107,9 @@ namespace osu.Game.Rulesets.Objects.Pooling
             }
         }
 
-        private void freeIfInUse()
+        private void free()
         {
-            if (!HasEntryApplied) return;
-
-            Debug.Assert(Entry != null);
+            Debug.Assert(Entry != null && HasEntryApplied);
 
             OnFree(Entry);
 

From 6561a7c7d697dafd15d3f35b82d7ccd86552ca0b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 26 Apr 2021 12:06:21 +0900
Subject: [PATCH 09480/10326] Rename DrawableObject ->
 PoolableDrawableWithLifetime

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs  | 4 ++--
 ...{DrawableObject.cs => PoolableDrawableWithLifetime.cs} | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game/Rulesets/Objects/Pooling/{DrawableObject.cs => PoolableDrawableWithLifetime.cs} (92%)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 6ab6a4b984..7739994527 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -26,7 +26,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Objects.Drawables
 {
     [Cached(typeof(DrawableHitObject))]
-    public abstract class DrawableHitObject : DrawableObject<HitObjectLifetimeEntry>
+    public abstract class DrawableHitObject : PoolableDrawableWithLifetime<HitObjectLifetimeEntry>
     {
         /// <summary>
         /// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied.
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         /// <param name="initialHitObject">
         /// The <see cref="HitObject"/> to be initially applied to this <see cref="DrawableHitObject"/>.
-        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="DrawableObject{TEntry}.Apply"/> (or automatically via pooling).
+        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="PoolableDrawableWithLifetime{TEntry}.Apply"/> (or automatically via pooling).
         /// </param>
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
             : base(initialHitObject != null ? new SyntheticHitObjectEntry(initialHitObject) : null)
diff --git a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
similarity index 92%
rename from osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
rename to osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 27ed4c04f2..93e476be76 100644
--- a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -13,15 +13,15 @@ namespace osu.Game.Rulesets.Objects.Pooling
     /// A <see cref="PoolableDrawable"/> that is controlled by <see cref="Entry"/> to implement drawable pooling and replay rewinding.
     /// </summary>
     /// <typeparam name="TEntry">The <see cref="LifetimeEntry"/> type storing state and controlling this drawable.</typeparam>
-    public abstract class DrawableObject<TEntry> : PoolableDrawable where TEntry : LifetimeEntry
+    public abstract class PoolableDrawableWithLifetime<TEntry> : PoolableDrawable where TEntry : LifetimeEntry
     {
         /// <summary>
-        /// The entry holding essential state of this <see cref="DrawableObject{TEntry}"/>.
+        /// The entry holding essential state of this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
         /// </summary>
         protected TEntry? Entry { get; private set; }
 
         /// <summary>
-        /// Whether <see cref="Entry"/> is applied to this <see cref="DrawableObject{TEntry}"/>.
+        /// Whether <see cref="Entry"/> is applied to this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
         /// When an initial entry is specified in the constructor, <see cref="Entry"/> is set but not applied until loading is completed.
         /// </summary>
         protected bool HasEntryApplied { get; private set; }
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
 
-        protected DrawableObject(TEntry? initialEntry = null)
+        protected PoolableDrawableWithLifetime(TEntry? initialEntry = null)
         {
             Entry = initialEntry;
         }

From 049e42fa854f2ec8bb0493246d34a8d43cb9209a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 05:07:24 +0200
Subject: [PATCH 09481/10326] Move snapping responsibility to `IBeatmap`

Seems `EditorBeatmap` already implements a different kind of `SnapTime` from `IBeatSnapProvider`, so method names here aren't great.

This is very similar to what https://github.com/ppy/osu/pull/12558 is doing, so may need to do some duplicate resolution later, especially surrounding `ClosestBeatSnapDivisor`.

Worth noting that this change makes 1/7, 1/5, etc unsupported for now, as we now rely on `BindableBeatDivisor.VALID_DIVISORS`.
---
 osu.Game/Beatmaps/Beatmap.cs                  | 26 ++++++++++++++++++
 osu.Game/Beatmaps/IBeatmap.cs                 | 22 +++++++++++++++
 osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs | 27 +++----------------
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 13 +++++----
 osu.Game/Screens/Play/GameplayBeatmap.cs      |  9 +++++++
 5 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index e5b6a4bc44..1ce01aee24 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using osu.Game.Beatmaps.ControlPoints;
 using Newtonsoft.Json;
 using osu.Game.IO.Serialization.Converters;
+using osu.Game.Screens.Edit;
 
 namespace osu.Game.Beatmaps
 {
@@ -74,6 +75,31 @@ namespace osu.Game.Beatmaps
             return mostCommon.beatLength;
         }
 
+        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
+        {
+            var timingPoint = ControlPointInfo.TimingPointAt(referenceTime ?? time);
+            var beatLength = timingPoint.BeatLength / beatDivisor;
+            var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
+
+            return (int)(timingPoint.Time + beatLengths * beatLength);
+        }
+
+        public int SnapTimeAnyDivisor(double time, double? referenceTime = null)
+        {
+            return SnapTimeForDivisor(time, ClosestBeatSnapDivisor(time, referenceTime), referenceTime);
+        }
+
+        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null)
+        {
+            double getUnsnap(int divisor) => Math.Abs(time - SnapTimeForDivisor(time, divisor, referenceTime));
+
+            int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
+            double smallestUnsnap = divisors.Min(getUnsnap);
+            int closestDivisor = divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
+
+            return closestDivisor;
+        }
+
         IBeatmap IBeatmap.Clone() => Clone();
 
         public Beatmap<T> Clone() => (Beatmap<T>)MemberwiseClone();
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 769b33009a..3b043cb59b 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -51,6 +51,28 @@ namespace osu.Game.Beatmaps
         /// </summary>
         double GetMostCommonBeatLength();
 
+        /// <summary>
+        /// Returns the time on the given beat divisor closest to the given time.
+        /// </summary>
+        /// <param name="time">The time to find the closest snapped time to.</param>
+        /// <param name="beatDivisor">The beat divisor to snap to.</param>
+        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
+        int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null);
+
+        /// <summary>
+        /// Returns the time on any valid beat divisor closest to the given time.
+        /// </summary>
+        /// <param name="time">The time to find the closest snapped time to.</param>
+        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
+        int SnapTimeAnyDivisor(double time, double? referenceTime = null);
+
+        /// <summary>
+        /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest is returned.
+        /// </summary>
+        /// <param name="time">The time to find the closest beat snap divisor to.</param>
+        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
+        int ClosestBeatSnapDivisor(double time, double? referenceTime = null);
+
         /// <summary>
         /// Creates a shallow-clone of this beatmap and returns it.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
index 835c4bdb69..d15dc6f179 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -16,8 +14,6 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         private const double unsnap_ms_threshold = 2;
 
-        private static readonly int[] greatest_common_divisors = { 16, 12, 9, 7, 5 };
-
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Unsnapped hitobjects");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
@@ -30,7 +26,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         {
             foreach (var hitobject in playableBeatmap.HitObjects)
             {
-                double startUnsnap = hitobject.StartTime - closestSnapTime(playableBeatmap, hitobject.StartTime);
+                double startUnsnap = hitobject.StartTime - playableBeatmap.SnapTimeAnyDivisor(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
                 foreach (var issue in getUnsnapIssues(hitobject, startUnsnap, hitobject.StartTime, startPostfix))
                     yield return issue;
@@ -41,7 +37,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                     {
                         double spanDuration = hasRepeats.Duration / (hasRepeats.RepeatCount + 1);
                         double repeatTime = hitobject.StartTime + spanDuration * (repeatIndex + 1);
-                        double repeatUnsnap = repeatTime - closestSnapTime(playableBeatmap, repeatTime);
+                        double repeatUnsnap = repeatTime - playableBeatmap.SnapTimeAnyDivisor(repeatTime);
                         foreach (var issue in getUnsnapIssues(hitobject, repeatUnsnap, repeatTime, "repeat"))
                             yield return issue;
                     }
@@ -49,7 +45,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
                 if (hitobject is IHasDuration hasDuration)
                 {
-                    double endUnsnap = hasDuration.EndTime - closestSnapTime(playableBeatmap, hasDuration.EndTime);
+                    double endUnsnap = hasDuration.EndTime - playableBeatmap.SnapTimeAnyDivisor(hasDuration.EndTime);
                     foreach (var issue in getUnsnapIssues(hitobject, endUnsnap, hasDuration.EndTime, "end"))
                         yield return issue;
                 }
@@ -66,23 +62,6 @@ namespace osu.Game.Rulesets.Edit.Checks
             // We don't care about unsnaps < 1 ms, as all object ends have these due to the way SV works.
         }
 
-        private int closestSnapTime(IBeatmap playableBeatmap, double time)
-        {
-            var timingPoint = playableBeatmap.ControlPointInfo.TimingPointAt(time);
-            double smallestUnsnap = greatest_common_divisors.Select(divisor => Math.Abs(time - snapTime(timingPoint, time, divisor))).Min();
-
-            return (int)Math.Round(time + smallestUnsnap);
-        }
-
-        private int snapTime(TimingControlPoint timingPoint, double time, int beatDivisor)
-        {
-            double beatLength = timingPoint.BeatLength / beatDivisor;
-            int beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
-
-            // Casting to int matches the editor in both stable and lazer.
-            return (int)(timingPoint.Time + beatLengths * beatLength);
-        }
-
         public abstract class IssueTemplateUnsnap : IssueTemplate
         {
             protected IssueTemplateUnsnap(ICheck check, IssueType type)
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 4bf4a3b8f3..9334814e2a 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -301,14 +301,17 @@ namespace osu.Game.Screens.Edit
             return list.Count - 1;
         }
 
-        public double SnapTime(double time, double? referenceTime)
+        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
         {
-            var timingPoint = ControlPointInfo.TimingPointAt(referenceTime ?? time);
-            var beatLength = timingPoint.BeatLength / BeatDivisor;
-
-            return timingPoint.Time + (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero) * beatLength;
+            return PlayableBeatmap.SnapTimeForDivisor(time, beatDivisor, referenceTime);
         }
 
+        public int SnapTimeAnyDivisor(double time, double? referenceTime = null) => PlayableBeatmap.SnapTimeAnyDivisor(time, referenceTime);
+
+        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatSnapDivisor(time, referenceTime);
+
+        public double SnapTime(double time, double? referenceTime) => SnapTimeForDivisor(time, BeatDivisor, referenceTime);
+
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
 
         public int BeatDivisor => beatDivisor?.Value ?? 1;
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 74fbe540fa..a3a2bbd41b 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -45,6 +45,15 @@ namespace osu.Game.Screens.Play
 
         public double GetMostCommonBeatLength() => PlayableBeatmap.GetMostCommonBeatLength();
 
+        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
+        {
+            return PlayableBeatmap.SnapTimeForDivisor(time, beatDivisor, referenceTime);
+        }
+
+        public int SnapTimeAnyDivisor(double time, double? referenceTime = null) => PlayableBeatmap.SnapTimeAnyDivisor(time, referenceTime);
+
+        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatSnapDivisor(time, referenceTime);
+
         public IBeatmap Clone() => PlayableBeatmap.Clone();
 
         private readonly Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();

From e8d83f2f99887423d9be29ac5eea0cdb673e24b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 14:33:30 +0900
Subject: [PATCH 09482/10326] Rename "EditRuleset" and "EditPlayfield" to use
 full "Editor" keyword

---
 ...eManiaEditRuleset.cs => DrawableManiaEditorRuleset.cs} | 6 +++---
 .../{ManiaEditPlayfield.cs => ManiaEditorPlayfield.cs}    | 4 ++--
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs    | 4 ++--
 ...wableOsuEditRuleset.cs => DrawableOsuEditorRuleset.cs} | 8 ++++----
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs        | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename osu.Game.Rulesets.Mania/Edit/{DrawableManiaEditRuleset.cs => DrawableManiaEditorRuleset.cs} (78%)
 rename osu.Game.Rulesets.Mania/Edit/{ManiaEditPlayfield.cs => ManiaEditorPlayfield.cs} (75%)
 rename osu.Game.Rulesets.Osu/Edit/{DrawableOsuEditRuleset.cs => DrawableOsuEditorRuleset.cs} (93%)

diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
similarity index 78%
rename from osu.Game.Rulesets.Mania/Edit/DrawableManiaEditRuleset.cs
rename to osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index 445df79f6f..b0af8c503b 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -12,16 +12,16 @@ using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    public class DrawableManiaEditRuleset : DrawableManiaRuleset
+    public class DrawableManiaEditorRuleset : DrawableManiaRuleset
     {
         public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
 
-        public DrawableManiaEditRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
+        public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(ruleset, beatmap, mods)
         {
         }
 
-        protected override Playfield CreatePlayfield() => new ManiaEditPlayfield(Beatmap.Stages)
+        protected override Playfield CreatePlayfield() => new ManiaEditorPlayfield(Beatmap.Stages)
         {
             Anchor = Anchor.Centre,
             Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaEditPlayfield.cs b/osu.Game.Rulesets.Mania/Edit/ManiaEditorPlayfield.cs
similarity index 75%
rename from osu.Game.Rulesets.Mania/Edit/ManiaEditPlayfield.cs
rename to osu.Game.Rulesets.Mania/Edit/ManiaEditorPlayfield.cs
index a42f793a77..186d50716e 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaEditPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaEditorPlayfield.cs
@@ -7,9 +7,9 @@ using System.Collections.Generic;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    public class ManiaEditPlayfield : ManiaPlayfield
+    public class ManiaEditorPlayfield : ManiaPlayfield
     {
-        public ManiaEditPlayfield(List<StageDefinition> stages)
+        public ManiaEditorPlayfield(List<StageDefinition> stages)
             : base(stages)
         {
         }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index d9570bf8be..2baec95c94 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public class ManiaHitObjectComposer : HitObjectComposer<ManiaHitObject>
     {
-        private DrawableManiaEditRuleset drawableRuleset;
+        private DrawableManiaEditorRuleset drawableRuleset;
         private ManiaBeatSnapGrid beatSnapGrid;
         private InputManager inputManager;
 
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
         {
-            drawableRuleset = new DrawableManiaEditRuleset(ruleset, beatmap, mods);
+            drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods);
 
             // This is the earliest we can cache the scrolling info to ourselves, before masks are added to the hierarchy and inject it
             dependencies.CacheAs(drawableRuleset.ScrollingInfo);
diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
similarity index 93%
rename from osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
rename to osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
index b8d0637e90..7227e2b511 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
@@ -17,18 +17,18 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class DrawableOsuEditRuleset : DrawableOsuRuleset
+    public class DrawableOsuEditorRuleset : DrawableOsuRuleset
     {
-        public DrawableOsuEditRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
+        public DrawableOsuEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(ruleset, beatmap, mods)
         {
         }
 
-        protected override Playfield CreatePlayfield() => new OsuEditPlayfield();
+        protected override Playfield CreatePlayfield() => new OsuEditorPlayfield();
 
         public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer { Size = Vector2.One };
 
-        private class OsuEditPlayfield : OsuPlayfield
+        private class OsuEditorPlayfield : OsuPlayfield
         {
             private Bindable<bool> hitAnimations;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 396fd41377..7b67d7aaf1 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         }
 
         protected override DrawableRuleset<OsuHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
-            => new DrawableOsuEditRuleset(ruleset, beatmap, mods);
+            => new DrawableOsuEditorRuleset(ruleset, beatmap, mods);
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {

From bda8f68da45a8645a07abd6c5fc1d7e5a2478156 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 15:03:43 +0900
Subject: [PATCH 09483/10326] Add failing test

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 2cc031405e..590d159300 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -34,6 +34,18 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private List<JudgementResult> judgementResults;
 
+        [Test]
+        public void TestPressBothKeysSimultaneouslyAndReleaseOne()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
+                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.RightButton }, Time = time_during_slide_1 },
+            });
+
+            AddAssert("Tracking retained", assertMaxJudge);
+        }
+
         /// <summary>
         /// Scenario:
         /// - Press a key before a slider starts

From 6182181ea1d3f1a6809d8631341ef2addbfbd3d4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 15:20:29 +0900
Subject: [PATCH 09484/10326] Fix simultaneous slider input not allowing both
 keys

---
 .../Skinning/Default/SliderBall.cs                  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
index 82b677e12c..b85610491c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -134,6 +135,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         /// </summary>
         private double? timeToAcceptAnyKeyAfter;
 
+        /// <summary>
+        /// The actions that were pressed in the previous frame.
+        /// </summary>
+        private readonly List<OsuAction> lastPressedActions = new List<OsuAction>();
+
         protected override void Update()
         {
             base.Update();
@@ -152,8 +158,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             {
                 var otherKey = headCircleHitAction == OsuAction.RightButton ? OsuAction.LeftButton : OsuAction.RightButton;
 
-                // we can return to accepting all keys if the initial head circle key is the *only* key pressed, or all keys have been released.
-                if (actions?.Contains(otherKey) != true)
+                // we can return to accepting all other keys if they were released in the previous frame.
+                if (!lastPressedActions.Contains(otherKey))
                     timeToAcceptAnyKeyAfter = Time.Current;
             }
 
@@ -164,6 +170,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 lastScreenSpaceMousePosition.HasValue && followCircle.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action
                 (actions?.Any(isValidTrackingAction) ?? false);
+
+            lastPressedActions.Clear();
+            lastPressedActions.AddRange(actions);
         }
 
         /// <summary>

From aa7ade8186df4033412bf93db2b970c5ae18a8fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 15:22:17 +0900
Subject: [PATCH 09485/10326] Expose presence of `MainCirclePiece` via an
 interface

---
 .../Objects/Drawables/DrawableHitCircle.cs           |  2 +-
 .../Objects/Drawables/DrawableSliderRepeat.cs        |  2 +-
 .../Objects/Drawables/DrawableSliderTail.cs          | 11 ++++++-----
 .../Skinning/Default/IHasMainCirclePiece.cs          | 12 ++++++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Default/IHasMainCirclePiece.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index fb6c110b3c..1bf9e76d7d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableHitCircle : DrawableOsuHitObject
+    public class DrawableHitCircle : DrawableOsuHitObject, IHasMainCirclePiece
     {
         public OsuAction? HitAction => HitArea.HitAction;
         protected virtual OsuSkinComponents CirclePieceComponent => OsuSkinComponents.HitCircle;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 5af2a38559..cc7d9d1b23 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking
+    public class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking, IHasMainCirclePiece
     {
         public new SliderRepeat HitObject => (SliderRepeat)base.HitObject;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 84b9b881a2..d81af053d1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableSliderTail : DrawableOsuHitObject, IRequireTracking, ITrackSnaking
+    public class DrawableSliderTail : DrawableOsuHitObject, IRequireTracking, ITrackSnaking, IHasMainCirclePiece
     {
         public new SliderTailCircle HitObject => (SliderTailCircle)base.HitObject;
 
@@ -35,7 +35,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public bool Tracking { get; set; }
 
-        private SkinnableDrawable circlePiece;
+        public SkinnableDrawable CirclePiece { get; private set; }
+
         private Container scaleContainer;
 
         public DrawableSliderTail()
@@ -64,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Children = new Drawable[]
                     {
                         // no default for this; only visible in legacy skins.
-                        circlePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty())
+                        CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty())
                     }
                 },
             };
@@ -76,7 +77,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateInitialTransforms();
 
-            circlePiece.FadeInFromZero(HitObject.TimeFadeIn);
+            CirclePiece.FadeInFromZero(HitObject.TimeFadeIn);
         }
 
         protected override void UpdateHitStateTransforms(ArmedState state)
@@ -85,7 +86,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Debug.Assert(HitObject.HitWindows != null);
 
-            (circlePiece.Drawable as IMainCirclePiece)?.Animate(state);
+            (CirclePiece.Drawable as IMainCirclePiece)?.Animate(state);
 
             switch (state)
             {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/IHasMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/IHasMainCirclePiece.cs
new file mode 100644
index 0000000000..8bb7629542
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/IHasMainCirclePiece.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.Skinning;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Default
+{
+    public interface IHasMainCirclePiece
+    {
+        SkinnableDrawable CirclePiece { get; }
+    }
+}

From 4da964c3f3235661b8f4b9c9d7c32cb60f3e711b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 15:22:42 +0900
Subject: [PATCH 09486/10326] Expose `DrawableSliderRepeat`'s arrow and move
 transforms to children

---
 .../Objects/Drawables/DrawableSliderRepeat.cs | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index cc7d9d1b23..5db012c4f8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -28,8 +28,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public SkinnableDrawable CirclePiece { get; private set; }
 
+        public ReverseArrowPiece Arrow { get; private set; }
+
         private Drawable scaleContainer;
-        private ReverseArrowPiece arrow;
 
         public override bool DisplayResult => false;
 
@@ -57,8 +58,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 Children = new Drawable[]
                 {
                     // no default for this; only visible in legacy skins.
-                    CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty()),
-                    arrow = new ReverseArrowPiece(),
+                    CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty())
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
+                    Arrow = new ReverseArrowPiece(),
                 }
             };
 
@@ -105,8 +110,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     break;
 
                 case ArmedState.Hit:
-                    this.FadeOut(animDuration, Easing.Out)
-                        .ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
+                    this.FadeOut(animDuration, Easing.Out);
+
+                    Arrow.ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
+                    CirclePiece.ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
                     break;
             }
         }
@@ -142,18 +149,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
 
             float aimRotation = MathUtils.RadiansToDegrees(MathF.Atan2(aimRotationVector.Y - Position.Y, aimRotationVector.X - Position.X));
-            while (Math.Abs(aimRotation - arrow.Rotation) > 180)
-                aimRotation += aimRotation < arrow.Rotation ? 360 : -360;
+            while (Math.Abs(aimRotation - Arrow.Rotation) > 180)
+                aimRotation += aimRotation < Arrow.Rotation ? 360 : -360;
 
             if (!hasRotation)
             {
-                arrow.Rotation = aimRotation;
+                Arrow.Rotation = aimRotation;
                 hasRotation = true;
             }
             else
             {
                 // If we're already snaking, interpolate to smooth out sharp curves (linear sliders, mainly).
-                arrow.Rotation = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 100), arrow.Rotation, aimRotation, 0, 50, Easing.OutQuint);
+                Arrow.Rotation = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 100), Arrow.Rotation, aimRotation, 0, 50, Easing.OutQuint);
             }
         }
     }

From 8795c5f0824e1f1cd9b1aae00d429ac2968713f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 15:23:21 +0900
Subject: [PATCH 09487/10326] Update osu! editor transform logic to allow
 adjustments to `DrawableSliderRepeat` and `DrawableSliderTail`

---
 .../Edit/DrawableOsuEditorRuleset.cs          | 63 ++++++++++---------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
index 7227e2b511..aeeae84d14 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
@@ -11,6 +11,7 @@ using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
 using osuTK;
@@ -56,43 +57,45 @@ namespace osu.Game.Rulesets.Osu.Edit
                 if (state == ArmedState.Idle || hitAnimations.Value)
                     return;
 
-                // adjust the visuals of certain object types to make them stay on screen for longer than usual.
-                switch (hitObject)
+                if (hitObject is DrawableHitCircle circle)
                 {
-                    default:
-                        // there are quite a few drawable hit types we don't want to extend (spinners, ticks etc.)
-                        return;
+                    circle.ApproachCircle
+                          .FadeOutFromOne(editor_hit_object_fade_out_extension * 4)
+                          .Expire();
 
-                    case DrawableSlider _:
-                        // no specifics to sliders but let them fade slower below.
-                        break;
-
-                    case DrawableHitCircle circle: // also handles slider heads
-                        circle.ApproachCircle
-                              .FadeOutFromOne(editor_hit_object_fade_out_extension * 4)
-                              .Expire();
-
-                        circle.ApproachCircle.ScaleTo(1.1f, 300, Easing.OutQuint);
-
-                        var circlePieceDrawable = circle.CirclePiece.Drawable;
-
-                        // clear any explode animation logic.
-                        circlePieceDrawable.ApplyTransformsAt(circle.HitStateUpdateTime, true);
-                        circlePieceDrawable.ClearTransformsAfter(circle.HitStateUpdateTime, true);
-
-                        break;
+                    circle.ApproachCircle.ScaleTo(1.1f, 300, Easing.OutQuint);
                 }
 
-                // Get the existing fade out transform
-                var existing = hitObject.Transforms.LastOrDefault(t => t.TargetMember == nameof(Alpha));
+                if (hitObject is IHasMainCirclePiece mainPieceContainer)
+                {
+                    // clear any explode animation logic.
+                    mainPieceContainer.CirclePiece.ApplyTransformsAt(hitObject.HitStateUpdateTime, true);
+                    mainPieceContainer.CirclePiece.ClearTransformsAfter(hitObject.HitStateUpdateTime, true);
+                }
 
-                if (existing == null)
-                    return;
+                if (hitObject is DrawableSliderRepeat repeat)
+                {
+                    repeat.Arrow.ApplyTransformsAt(hitObject.HitStateUpdateTime, true);
+                    repeat.Arrow.ClearTransformsAfter(hitObject.HitStateUpdateTime, true);
+                }
 
-                hitObject.RemoveTransform(existing);
+                // adjust the visuals of top-level object types to make them stay on screen for longer than usual.
+                switch (hitObject)
+                {
+                    case DrawableSlider _:
+                    case DrawableHitCircle _:
+                        // Get the existing fade out transform
+                        var existing = hitObject.Transforms.LastOrDefault(t => t.TargetMember == nameof(Alpha));
 
-                using (hitObject.BeginAbsoluteSequence(hitObject.HitStateUpdateTime))
-                    hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
+                        if (existing == null)
+                            return;
+
+                        hitObject.RemoveTransform(existing);
+
+                        using (hitObject.BeginAbsoluteSequence(hitObject.HitStateUpdateTime))
+                            hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
+                        break;
+                }
             }
         }
     }

From d10aac851debb1a7b185a855f76c491833e193ea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 15:30:22 +0900
Subject: [PATCH 09488/10326] Extract scale constant

---
 .../Objects/Drawables/DrawableSliderRepeat.cs               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 5db012c4f8..7b4188edab 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -112,8 +112,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 case ArmedState.Hit:
                     this.FadeOut(animDuration, Easing.Out);
 
-                    Arrow.ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
-                    CirclePiece.ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
+                    const float final_scale = 1.5f;
+
+                    Arrow.ScaleTo(Scale * final_scale, animDuration, Easing.Out);
+                    CirclePiece.ScaleTo(Scale * final_scale, animDuration, Easing.Out);
                     break;
             }
         }

From f70e45b1998a97dd8421f0f046c7efcada54d40b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 15:35:08 +0900
Subject: [PATCH 09489/10326] Prevent adding null enumerable

---
 osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
index b85610491c..c5c95557e6 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
@@ -172,7 +172,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 (actions?.Any(isValidTrackingAction) ?? false);
 
             lastPressedActions.Clear();
-            lastPressedActions.AddRange(actions);
+            if (actions != null)
+                lastPressedActions.AddRange(actions);
         }
 
         /// <summary>

From fd5fbaf0dbc5dcf7d5fe475f4ac7c88fe80edbb7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 15:37:42 +0900
Subject: [PATCH 09490/10326] Rename ruleset wrapper class

---
 ...eEditRulesetWrapper.cs => DrawableEditorRulesetWrapper.cs} | 4 ++--
 osu.Game/Rulesets/Edit/HitObjectComposer.cs                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Rulesets/Edit/{DrawableEditRulesetWrapper.cs => DrawableEditorRulesetWrapper.cs} (94%)

diff --git a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
similarity index 94%
rename from osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
rename to osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
index c60d4c7834..62e2539c2a 100644
--- a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
+++ b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Edit
     /// <summary>
     /// A wrapper for a <see cref="DrawableRuleset{TObject}"/>. Handles adding visual representations of <see cref="HitObject"/>s to the underlying <see cref="DrawableRuleset{TObject}"/>.
     /// </summary>
-    internal class DrawableEditRulesetWrapper<TObject> : CompositeDrawable
+    internal class DrawableEditorRulesetWrapper<TObject> : CompositeDrawable
         where TObject : HitObject
     {
         public Playfield Playfield => drawableRuleset.Playfield;
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Edit
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
-        public DrawableEditRulesetWrapper(DrawableRuleset<TObject> drawableRuleset)
+        public DrawableEditorRulesetWrapper(DrawableRuleset<TObject> drawableRuleset)
         {
             this.drawableRuleset = drawableRuleset;
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 736fc47dee..35896d4982 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Edit
 
         protected ComposeBlueprintContainer BlueprintContainer { get; private set; }
 
-        private DrawableEditRulesetWrapper<TObject> drawableRulesetWrapper;
+        private DrawableEditorRulesetWrapper<TObject> drawableRulesetWrapper;
 
         protected readonly Container LayerBelowRuleset = new Container { RelativeSizeAxes = Axes.Both };
 
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Edit
 
             try
             {
-                drawableRulesetWrapper = new DrawableEditRulesetWrapper<TObject>(CreateDrawableRuleset(Ruleset, EditorBeatmap.PlayableBeatmap, new[] { Ruleset.GetAutoplayMod() }))
+                drawableRulesetWrapper = new DrawableEditorRulesetWrapper<TObject>(CreateDrawableRuleset(Ruleset, EditorBeatmap.PlayableBeatmap, new[] { Ruleset.GetAutoplayMod() }))
                 {
                     Clock = EditorClock,
                     ProcessCustomClock = false

From 0d0b4ea78a8a07be1ac472641f8123e26f1a4bdf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 15:47:37 +0900
Subject: [PATCH 09491/10326] Rewrite comment to hopefully be more readable

---
 osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
index c5c95557e6..8feeca56e8 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             {
                 var otherKey = headCircleHitAction == OsuAction.RightButton ? OsuAction.LeftButton : OsuAction.RightButton;
 
-                // we can return to accepting all other keys if they were released in the previous frame.
+                // we can start accepting any key once all other keys have been released in the previous frame.
                 if (!lastPressedActions.Contains(otherKey))
                     timeToAcceptAnyKeyAfter = Time.Current;
             }

From aa99c192d025240f6571eb87f856d3235e07e91c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 16:21:12 +0900
Subject: [PATCH 09492/10326] Fix type in inline comment

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index aac03622e3..0cd3b448d2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -421,7 +421,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             {
                 StartPlay();
 
-                // If the current user was host, they started the match and the in-progres operation needs to be stopped now.
+                // If the current user was host, they started the match and the in-progress operation needs to be stopped now.
                 readyClickOperation?.Dispose();
                 readyClickOperation = null;
             }

From 6d30a1a80f5f7e19893a6340c23aca44b0f20a47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 16:45:20 +0900
Subject: [PATCH 09493/10326] Reference constant for test startup delay

---
 .../Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 9cc8eaf876..82bbc7b6d3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -17,6 +17,7 @@ using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Users;
@@ -128,7 +129,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         [Test]
-        public void TestPlayersDoNotStartSimultaneouslyIfBufferingFor15Seconds()
+        public void TestPlayersDoNotStartSimultaneouslyIfBufferingForMaximumStartDelay()
         {
             start(new[] { 55, 56 });
             loadSpectateScreen();
@@ -138,8 +139,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkPausedInstant(55, true);
             checkPausedInstant(56, true);
 
-            // Wait 15 seconds...
-            AddWaitStep("wait 15 seconds", (int)(15000 / TimePerAction));
+            // Wait for the start delay seconds...
+            AddWaitStep("wait maximum start delay seconds", (int)(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
 
             // Player 1 should start playing by itself, player 2 should remain paused.
             checkPausedInstant(55, false);

From 55f383c71ea4577017c85b229bfc1127434b229a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 16:48:32 +0900
Subject: [PATCH 09494/10326] Rename test to match new
 `MultiSpectatorLeaderboard` class name

---
 ...orLeaderboard.cs => TestSceneMultiSpectatorLeaderboard.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneMultiplayerSpectatorLeaderboard.cs => TestSceneMultiSpectatorLeaderboard.cs} (98%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index 8368186219..da76adf83f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -24,7 +24,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMultiplayerSpectatorLeaderboard : MultiplayerTestScene
+    public class TestSceneMultiSpectatorLeaderboard : MultiplayerTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
         private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             { 56, new ManualClock() }
         };
 
-        public TestSceneMultiplayerSpectatorLeaderboard()
+        public TestSceneMultiSpectatorLeaderboard()
         {
             base.Content.AddRange(new Drawable[]
             {

From 737a15c2d4c549423d763f29b93680a1391606a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 17:04:39 +0900
Subject: [PATCH 09495/10326] Extract out test player IDs to constants

---
 .../TestSceneMultiSpectatorScreen.cs          | 133 +++++++++---------
 1 file changed, 68 insertions(+), 65 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 82bbc7b6d3..512311ff03 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -47,6 +47,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapInfo importedBeatmap;
         private int importedBeatmapId;
 
+        private const int player_1_id = 55;
+        private const int player_2_id = 56;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -80,29 +83,29 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("start players silently", () =>
             {
-                Client.CurrentMatchPlayingUserIds.Add(55);
-                Client.CurrentMatchPlayingUserIds.Add(56);
-                playingUserIds.Add(55);
-                playingUserIds.Add(56);
-                nextFrame[55] = 0;
-                nextFrame[56] = 0;
+                Client.CurrentMatchPlayingUserIds.Add(player_1_id);
+                Client.CurrentMatchPlayingUserIds.Add(player_2_id);
+                playingUserIds.Add(player_1_id);
+                playingUserIds.Add(player_2_id);
+                nextFrame[player_1_id] = 0;
+                nextFrame[player_2_id] = 0;
             });
 
             loadSpectateScreen(false);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player 55", () => streamingClient.StartPlay(55, importedBeatmapId));
+            AddStep("load player first_player_id", () => streamingClient.StartPlay(player_1_id, importedBeatmapId));
             AddUntilStep("one player added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 1);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player 56", () => streamingClient.StartPlay(56, importedBeatmapId));
+            AddStep("load player second_player_id", () => streamingClient.StartPlay(player_2_id, importedBeatmapId));
             AddUntilStep("two players added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 2);
         }
 
         [Test]
         public void TestGeneral()
         {
-            int[] userIds = Enumerable.Range(0, 4).Select(i => 55 + i).ToArray();
+            int[] userIds = Enumerable.Range(0, 4).Select(i => player_1_id + i).ToArray();
 
             start(userIds);
             loadSpectateScreen();
@@ -114,123 +117,123 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestPlayersMustStartSimultaneously()
         {
-            start(new[] { 55, 56 });
+            start(new[] { player_1_id, player_2_id });
             loadSpectateScreen();
 
             // Send frames for one player only, both should remain paused.
-            sendFrames(55, 20);
-            checkPausedInstant(55, true);
-            checkPausedInstant(56, true);
+            sendFrames(player_1_id, 20);
+            checkPausedInstant(player_1_id, true);
+            checkPausedInstant(player_2_id, true);
 
             // Send frames for the other player, both should now start playing.
-            sendFrames(56, 20);
-            checkPausedInstant(55, false);
-            checkPausedInstant(56, false);
+            sendFrames(player_2_id, 20);
+            checkPausedInstant(player_1_id, false);
+            checkPausedInstant(player_2_id, false);
         }
 
         [Test]
         public void TestPlayersDoNotStartSimultaneouslyIfBufferingForMaximumStartDelay()
         {
-            start(new[] { 55, 56 });
+            start(new[] { player_1_id, player_2_id });
             loadSpectateScreen();
 
             // Send frames for one player only, both should remain paused.
-            sendFrames(55, 1000);
-            checkPausedInstant(55, true);
-            checkPausedInstant(56, true);
+            sendFrames(player_1_id, 1000);
+            checkPausedInstant(player_1_id, true);
+            checkPausedInstant(player_2_id, true);
 
             // Wait for the start delay seconds...
             AddWaitStep("wait maximum start delay seconds", (int)(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
 
             // Player 1 should start playing by itself, player 2 should remain paused.
-            checkPausedInstant(55, false);
-            checkPausedInstant(56, true);
+            checkPausedInstant(player_1_id, false);
+            checkPausedInstant(player_2_id, true);
         }
 
         [Test]
         public void TestPlayersContinueWhileOthersBuffer()
         {
-            start(new[] { 55, 56 });
+            start(new[] { player_1_id, player_2_id });
             loadSpectateScreen();
 
             // Send initial frames for both players. A few more for player 1.
-            sendFrames(55, 20);
-            sendFrames(56, 10);
-            checkPausedInstant(55, false);
-            checkPausedInstant(56, false);
+            sendFrames(player_1_id, 20);
+            sendFrames(player_2_id, 10);
+            checkPausedInstant(player_1_id, false);
+            checkPausedInstant(player_2_id, false);
 
             // Eventually player 2 will pause, player 1 must remain running.
-            checkPaused(56, true);
-            checkPausedInstant(55, false);
+            checkPaused(player_2_id, true);
+            checkPausedInstant(player_1_id, false);
 
             // Eventually both players will run out of frames and should pause.
-            checkPaused(55, true);
-            checkPausedInstant(56, true);
+            checkPaused(player_1_id, true);
+            checkPausedInstant(player_2_id, true);
 
             // Send more frames for the first player only. Player 1 should start playing with player 2 remaining paused.
-            sendFrames(55, 20);
-            checkPausedInstant(56, true);
-            checkPausedInstant(55, false);
+            sendFrames(player_1_id, 20);
+            checkPausedInstant(player_2_id, true);
+            checkPausedInstant(player_1_id, false);
 
             // Send more frames for the second player. Both should be playing
-            sendFrames(56, 20);
-            checkPausedInstant(56, false);
-            checkPausedInstant(55, false);
+            sendFrames(player_2_id, 20);
+            checkPausedInstant(player_2_id, false);
+            checkPausedInstant(player_1_id, false);
         }
 
         [Test]
         public void TestPlayersCatchUpAfterFallingBehind()
         {
-            start(new[] { 55, 56 });
+            start(new[] { player_1_id, player_2_id });
             loadSpectateScreen();
 
             // Send initial frames for both players. A few more for player 1.
-            sendFrames(55, 1000);
-            sendFrames(56, 10);
-            checkPausedInstant(55, false);
-            checkPausedInstant(56, false);
+            sendFrames(player_1_id, 1000);
+            sendFrames(player_2_id, 10);
+            checkPausedInstant(player_1_id, false);
+            checkPausedInstant(player_2_id, false);
 
             // Eventually player 2 will run out of frames and should pause.
-            checkPaused(56, true);
+            checkPaused(player_2_id, true);
             AddWaitStep("wait a few more frames", 10);
 
             // Send more frames for player 2. It should unpause.
-            sendFrames(56, 1000);
-            checkPausedInstant(56, false);
+            sendFrames(player_2_id, 1000);
+            checkPausedInstant(player_2_id, false);
 
             // Player 2 should catch up to player 1 after unpausing.
-            waitForCatchup(56);
+            waitForCatchup(player_2_id);
             AddWaitStep("wait a bit", 10);
         }
 
         [Test]
         public void TestMostInSyncUserIsAudioSource()
         {
-            start(new[] { 55, 56 });
+            start(new[] { player_1_id, player_2_id });
             loadSpectateScreen();
 
-            assertVolume(55, 0);
-            assertVolume(56, 0);
+            assertVolume(player_1_id, 0);
+            assertVolume(player_2_id, 0);
 
-            sendFrames(55, 10);
-            sendFrames(56, 20);
-            assertVolume(55, 1);
-            assertVolume(56, 0);
+            sendFrames(player_1_id, 10);
+            sendFrames(player_2_id, 20);
+            assertVolume(player_1_id, 1);
+            assertVolume(player_2_id, 0);
 
-            checkPaused(55, true);
-            assertVolume(55, 0);
-            assertVolume(56, 1);
+            checkPaused(player_1_id, true);
+            assertVolume(player_1_id, 0);
+            assertVolume(player_2_id, 1);
 
-            sendFrames(55, 100);
-            waitForCatchup(55);
-            checkPaused(56, true);
-            assertVolume(55, 1);
-            assertVolume(56, 0);
+            sendFrames(player_1_id, 100);
+            waitForCatchup(player_1_id);
+            checkPaused(player_2_id, true);
+            assertVolume(player_1_id, 1);
+            assertVolume(player_2_id, 0);
 
-            sendFrames(56, 100);
-            waitForCatchup(56);
-            assertVolume(55, 1);
-            assertVolume(56, 0);
+            sendFrames(player_2_id, 100);
+            waitForCatchup(player_2_id);
+            assertVolume(player_1_id, 1);
+            assertVolume(player_2_id, 0);
         }
 
         private void loadSpectateScreen(bool waitForPlayerLoad = true)

From 5b4cb71cc782e4f8ddc2d9e1d6872ef0787f4caf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 17:19:44 +0900
Subject: [PATCH 09496/10326] Change terminology from "slave" to "player clock"

---
 .../OnlinePlay/TestSceneCatchUpSyncManager.cs | 104 +++++++++---------
 .../Spectate/MultiSpectatorPlayer.cs          |  18 +--
 .../Spectate/MultiSpectatorScreen.cs          |   8 +-
 .../Multiplayer/Spectate/PlayerArea.cs        |   6 +-
 ...lock.cs => CatchUpSpectatorPlayerClock.cs} |   6 +-
 .../Spectate/Sync/CatchUpSyncManager.cs       |  74 ++++++-------
 ...SlaveClock.cs => ISpectatorPlayerClock.cs} |   2 +-
 .../Multiplayer/Spectate/Sync/ISyncManager.cs |  18 +--
 8 files changed, 118 insertions(+), 118 deletions(-)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{CatchUpSlaveClock.cs => CatchUpSpectatorPlayerClock.cs} (90%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{ISlaveClock.cs => ISpectatorPlayerClock.cs} (90%)

diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 93801bd5d7..73ec5fb934 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -17,31 +17,31 @@ namespace osu.Game.Tests.OnlinePlay
         private TestManualClock master;
         private CatchUpSyncManager syncManager;
 
-        private TestSlaveClock slave1;
-        private TestSlaveClock slave2;
+        private TestSpectatorPlayerClock player1;
+        private TestSpectatorPlayerClock player2;
 
         [SetUp]
         public void Setup()
         {
             syncManager = new CatchUpSyncManager(master = new TestManualClock());
-            syncManager.AddSlave(slave1 = new TestSlaveClock(1));
-            syncManager.AddSlave(slave2 = new TestSlaveClock(2));
+            syncManager.AddPlayerClock(player1 = new TestSpectatorPlayerClock(1));
+            syncManager.AddPlayerClock(player2 = new TestSpectatorPlayerClock(2));
 
             Schedule(() => Child = syncManager);
         }
 
         [Test]
-        public void TestMasterClockStartsWhenAllSlavesHaveFrames()
+        public void TestMasterClockStartsWhenAllPlayerClocksHaveFrames()
         {
-            setWaiting(() => slave1, false);
+            setWaiting(() => player1, false);
             assertMasterState(false);
-            assertSlaveState(() => slave1, false);
-            assertSlaveState(() => slave2, false);
+            assertPlayerClockState(() => player1, false);
+            assertPlayerClockState(() => player2, false);
 
-            setWaiting(() => slave2, false);
+            setWaiting(() => player2, false);
             assertMasterState(true);
-            assertSlaveState(() => slave1, true);
-            assertSlaveState(() => slave2, true);
+            assertPlayerClockState(() => player1, true);
+            assertPlayerClockState(() => player2, true);
         }
 
         [Test]
@@ -54,115 +54,115 @@ namespace osu.Game.Tests.OnlinePlay
         [Test]
         public void TestMasterClockStartsWhenAnyReadyForMaximumDelayTime()
         {
-            setWaiting(() => slave1, false);
+            setWaiting(() => player1, false);
             AddWaitStep($"wait {CatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(true);
         }
 
         [Test]
-        public void TestSlaveDoesNotCatchUpWhenSlightlyOutOfSync()
+        public void TestPlayerClockDoesNotCatchUpWhenSlightlyOutOfSync()
         {
             setAllWaiting(false);
 
             setMasterTime(CatchUpSyncManager.SYNC_TARGET + 1);
-            assertCatchingUp(() => slave1, false);
+            assertCatchingUp(() => player1, false);
         }
 
         [Test]
-        public void TestSlaveStartsCatchingUpWhenTooFarBehind()
+        public void TestPlayerClockStartsCatchingUpWhenTooFarBehind()
         {
             setAllWaiting(false);
 
             setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 1);
-            assertCatchingUp(() => slave1, true);
-            assertCatchingUp(() => slave2, true);
+            assertCatchingUp(() => player1, true);
+            assertCatchingUp(() => player2, true);
         }
 
         [Test]
-        public void TestSlaveKeepsCatchingUpWhenSlightlyOutOfSync()
+        public void TestPlayerClockKeepsCatchingUpWhenSlightlyOutOfSync()
         {
             setAllWaiting(false);
 
             setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 1);
-            setSlaveTime(() => slave1, CatchUpSyncManager.SYNC_TARGET + 1);
-            assertCatchingUp(() => slave1, true);
+            setPlayerClockTime(() => player1, CatchUpSyncManager.SYNC_TARGET + 1);
+            assertCatchingUp(() => player1, true);
         }
 
         [Test]
-        public void TestSlaveStopsCatchingUpWhenInSync()
+        public void TestPlayerClockStopsCatchingUpWhenInSync()
         {
             setAllWaiting(false);
 
             setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 2);
-            setSlaveTime(() => slave1, CatchUpSyncManager.SYNC_TARGET);
-            assertCatchingUp(() => slave1, false);
-            assertCatchingUp(() => slave2, true);
+            setPlayerClockTime(() => player1, CatchUpSyncManager.SYNC_TARGET);
+            assertCatchingUp(() => player1, false);
+            assertCatchingUp(() => player2, true);
         }
 
         [Test]
-        public void TestSlaveDoesNotStopWhenSlightlyAhead()
+        public void TestPlayerClockDoesNotStopWhenSlightlyAhead()
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -CatchUpSyncManager.SYNC_TARGET);
-            assertCatchingUp(() => slave1, false);
-            assertSlaveState(() => slave1, true);
+            setPlayerClockTime(() => player1, -CatchUpSyncManager.SYNC_TARGET);
+            assertCatchingUp(() => player1, false);
+            assertPlayerClockState(() => player1, true);
         }
 
         [Test]
-        public void TestSlaveStopsWhenTooFarAheadAndStartsWhenBackInSync()
+        public void TestPlayerClockStopsWhenTooFarAheadAndStartsWhenBackInSync()
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -CatchUpSyncManager.SYNC_TARGET - 1);
+            setPlayerClockTime(() => player1, -CatchUpSyncManager.SYNC_TARGET - 1);
 
             // This is a silent catchup, where IsCatchingUp = false but IsRunning = false also.
-            assertCatchingUp(() => slave1, false);
-            assertSlaveState(() => slave1, false);
+            assertCatchingUp(() => player1, false);
+            assertPlayerClockState(() => player1, false);
 
             setMasterTime(1);
-            assertCatchingUp(() => slave1, false);
-            assertSlaveState(() => slave1, true);
+            assertCatchingUp(() => player1, false);
+            assertPlayerClockState(() => player1, true);
         }
 
         [Test]
-        public void TestInSyncSlaveDoesNotStartIfWaitingOnFrames()
+        public void TestInSyncPlayerClockDoesNotStartIfWaitingOnFrames()
         {
             setAllWaiting(false);
 
-            assertSlaveState(() => slave1, true);
-            setWaiting(() => slave1, true);
-            assertSlaveState(() => slave1, false);
+            assertPlayerClockState(() => player1, true);
+            setWaiting(() => player1, true);
+            assertPlayerClockState(() => player1, false);
         }
 
-        private void setWaiting(Func<TestSlaveClock> slave, bool waiting)
-            => AddStep($"set slave {slave().Id} waiting = {waiting}", () => slave().WaitingOnFrames.Value = waiting);
+        private void setWaiting(Func<TestSpectatorPlayerClock> playerClock, bool waiting)
+            => AddStep($"set player clock {playerClock().Id} waiting = {waiting}", () => playerClock().WaitingOnFrames.Value = waiting);
 
-        private void setAllWaiting(bool waiting) => AddStep($"set all slaves waiting = {waiting}", () =>
+        private void setAllWaiting(bool waiting) => AddStep($"set all player clocks waiting = {waiting}", () =>
         {
-            slave1.WaitingOnFrames.Value = waiting;
-            slave2.WaitingOnFrames.Value = waiting;
+            player1.WaitingOnFrames.Value = waiting;
+            player2.WaitingOnFrames.Value = waiting;
         });
 
         private void setMasterTime(double time)
             => AddStep($"set master = {time}", () => master.Seek(time));
 
         /// <summary>
-        /// slave.Time = master.Time - offsetFromMaster
+        /// clock.Time = master.Time - offsetFromMaster
         /// </summary>
-        private void setSlaveTime(Func<TestSlaveClock> slave, double offsetFromMaster)
-            => AddStep($"set slave {slave().Id} = master - {offsetFromMaster}", () => slave().Seek(master.CurrentTime - offsetFromMaster));
+        private void setPlayerClockTime(Func<TestSpectatorPlayerClock> playerClock, double offsetFromMaster)
+            => AddStep($"set player clock {playerClock().Id} = master - {offsetFromMaster}", () => playerClock().Seek(master.CurrentTime - offsetFromMaster));
 
         private void assertMasterState(bool running)
             => AddAssert($"master clock {(running ? "is" : "is not")} running", () => master.IsRunning == running);
 
-        private void assertCatchingUp(Func<TestSlaveClock> slave, bool catchingUp) =>
-            AddAssert($"slave {slave().Id} {(catchingUp ? "is" : "is not")} catching up", () => slave().IsCatchingUp == catchingUp);
+        private void assertCatchingUp(Func<TestSpectatorPlayerClock> playerClock, bool catchingUp) =>
+            AddAssert($"player clock {playerClock().Id} {(catchingUp ? "is" : "is not")} catching up", () => playerClock().IsCatchingUp == catchingUp);
 
-        private void assertSlaveState(Func<TestSlaveClock> slave, bool running)
-            => AddAssert($"slave {slave().Id} {(running ? "is" : "is not")} running", () => slave().IsRunning == running);
+        private void assertPlayerClockState(Func<TestSpectatorPlayerClock> playerClock, bool running)
+            => AddAssert($"player clock {playerClock().Id} {(running ? "is" : "is not")} running", () => playerClock().IsRunning == running);
 
-        private class TestSlaveClock : TestManualClock, ISlaveClock
+        private class TestSpectatorPlayerClock : TestManualClock, ISpectatorPlayerClock
         {
             public Bindable<bool> WaitingOnFrames { get; } = new Bindable<bool>(true);
 
@@ -170,7 +170,7 @@ namespace osu.Game.Tests.OnlinePlay
 
             public readonly int Id;
 
-            public TestSlaveClock(int id)
+            public TestSpectatorPlayerClock(int id)
             {
                 Id = id;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 4ed949893c..a17519c3aa 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -19,24 +19,24 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         private readonly Bindable<bool> waitingOnFrames = new Bindable<bool>(true);
         private readonly Score score;
-        private readonly ISlaveClock slaveClock;
+        private readonly ISpectatorPlayerClock spectatorPlayerClock;
 
         /// <summary>
         /// Creates a new <see cref="MultiSpectatorPlayer"/>.
         /// </summary>
         /// <param name="score">The score containing the player's replay.</param>
-        /// <param name="slaveClock">The clock controlling the gameplay running state.</param>
-        public MultiSpectatorPlayer([NotNull] Score score, [NotNull] ISlaveClock slaveClock)
+        /// <param name="spectatorPlayerClock">The clock controlling the gameplay running state.</param>
+        public MultiSpectatorPlayer([NotNull] Score score, [NotNull] ISpectatorPlayerClock spectatorPlayerClock)
             : base(score)
         {
             this.score = score;
-            this.slaveClock = slaveClock;
+            this.spectatorPlayerClock = spectatorPlayerClock;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            slaveClock.WaitingOnFrames.BindTo(waitingOnFrames);
+            spectatorPlayerClock.WaitingOnFrames.BindTo(waitingOnFrames);
         }
 
         protected override void UpdateAfterChildren()
@@ -48,18 +48,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
-            => new SlaveGameplayClockContainer(slaveClock);
+            => new SpectatorGameplayClockContainer(spectatorPlayerClock);
 
-        private class SlaveGameplayClockContainer : GameplayClockContainer
+        private class SpectatorGameplayClockContainer : GameplayClockContainer
         {
-            public SlaveGameplayClockContainer([NotNull] IClock sourceClock)
+            public SpectatorGameplayClockContainer([NotNull] IClock sourceClock)
                 : base(sourceClock)
             {
             }
 
             protected override void Update()
             {
-                // The slave clock's running state is controlled externally, but the local pausing state needs to be updated to stop gameplay.
+                // The player clock's running state is controlled externally, but the local pausing state needs to be updated to stop gameplay.
                 if (SourceClock.IsRunning)
                     Start();
                 else
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index eb59d090be..6a8c10e336 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             };
 
             for (int i = 0; i < UserIds.Length; i++)
-                grid.Add(instances[i] = new PlayerArea(UserIds[i], new CatchUpSlaveClock(masterClockContainer.GameplayClock)));
+                grid.Add(instances[i] = new PlayerArea(UserIds[i], new CatchUpSpectatorPlayerClock(masterClockContainer.GameplayClock)));
 
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             if (!isCandidateAudioSource(currentAudioSource?.GameplayClock))
             {
                 currentAudioSource = instances.Where(i => isCandidateAudioSource(i.GameplayClock))
-                                              .OrderBy(i => Math.Abs(i.GameplayClock.CurrentTime - syncManager.Master.CurrentTime))
+                                              .OrderBy(i => Math.Abs(i.GameplayClock.CurrentTime - syncManager.MasterClock.CurrentTime))
                                               .FirstOrDefault();
 
                 foreach (var instance in instances)
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             }
         }
 
-        private bool isCandidateAudioSource([CanBeNull] ISlaveClock clock)
+        private bool isCandidateAudioSource([CanBeNull] ISpectatorPlayerClock clock)
             => clock?.IsRunning == true && !clock.IsCatchingUp && !clock.WaitingOnFrames.Value;
 
         protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
@@ -124,7 +124,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var instance = instances[getIndexForUser(userId)];
             instance.LoadScore(gameplayState.Score);
 
-            syncManager.AddSlave(instance.GameplayClock);
+            syncManager.AddPlayerClock(instance.GameplayClock);
             leaderboard.AddClock(instance.UserId, instance.GameplayClock);
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 494f182251..2accfaec0c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -35,10 +35,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public readonly int UserId;
 
         /// <summary>
-        /// The <see cref="ISlaveClock"/> used to control the gameplay running state of a loaded <see cref="Player"/>.
+        /// The <see cref="ISpectatorPlayerClock"/> used to control the gameplay running state of a loaded <see cref="Player"/>.
         /// </summary>
         [NotNull]
-        public readonly ISlaveClock GameplayClock;
+        public readonly ISpectatorPlayerClock GameplayClock;
 
         /// <summary>
         /// The currently-loaded score.
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly AudioContainer audioContainer;
         private OsuScreenStack stack;
 
-        public PlayerArea(int userId, [NotNull] ISlaveClock gameplayClock)
+        public PlayerArea(int userId, [NotNull] ISpectatorPlayerClock gameplayClock)
         {
             UserId = userId;
             GameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
similarity index 90%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
index 21241f8158..a8ed7b415f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
@@ -8,9 +8,9 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A <see cref="ISlaveClock"/> which catches up using rate adjustment.
+    /// A <see cref="ISpectatorPlayerClock"/> which catches up using rate adjustment.
     /// </summary>
-    public class CatchUpSlaveClock : ISlaveClock
+    public class CatchUpSpectatorPlayerClock : ISpectatorPlayerClock
     {
         /// <summary>
         /// The catch up rate.
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
         private readonly IFrameBasedClock masterClock;
 
-        public CatchUpSlaveClock(IFrameBasedClock masterClock)
+        public CatchUpSpectatorPlayerClock(IFrameBasedClock masterClock)
         {
             this.masterClock = masterClock;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
index 1d3fcd824c..f5c780e8b1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
@@ -9,46 +9,46 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A <see cref="ISyncManager"/> which synchronises de-synced slave clocks through catchup.
+    /// A <see cref="ISyncManager"/> which synchronises de-synced player clocks through catchup.
     /// </summary>
     public class CatchUpSyncManager : Component, ISyncManager
     {
         /// <summary>
-        /// The offset from the master clock to which slaves should be synchronised to.
+        /// The offset from the master clock to which player clocks should be synchronised to.
         /// </summary>
         public const double SYNC_TARGET = 16;
 
         /// <summary>
-        /// The offset from the master clock at which slaves begin resynchronising.
+        /// The offset from the master clock at which player clocks begin resynchronising.
         /// </summary>
         public const double MAX_SYNC_OFFSET = 50;
 
         /// <summary>
-        /// The maximum delay to start gameplay, if any (but not all) slaves are ready.
+        /// The maximum delay to start gameplay, if any (but not all) player clocks are ready.
         /// </summary>
         public const double MAXIMUM_START_DELAY = 15000;
 
         /// <summary>
-        /// The master clock which is used to control the timing of all slave clocks.
+        /// The master clock which is used to control the timing of all player clocks clocks.
         /// </summary>
-        public IAdjustableClock Master { get; }
+        public IAdjustableClock MasterClock { get; }
 
         /// <summary>
-        /// The slave clocks.
+        /// The player clocks.
         /// </summary>
-        private readonly List<ISlaveClock> slaves = new List<ISlaveClock>();
+        private readonly List<ISpectatorPlayerClock> playerClocks = new List<ISpectatorPlayerClock>();
 
         private bool hasStarted;
         private double? firstStartAttemptTime;
 
         public CatchUpSyncManager(IAdjustableClock master)
         {
-            Master = master;
+            MasterClock = master;
         }
 
-        public void AddSlave(ISlaveClock clock) => slaves.Add(clock);
+        public void AddPlayerClock(ISpectatorPlayerClock clock) => playerClocks.Add(clock);
 
-        public void RemoveSlave(ISlaveClock clock) => slaves.Remove(clock);
+        public void RemovePlayerClock(ISpectatorPlayerClock clock) => playerClocks.Remove(clock);
 
         protected override void Update()
         {
@@ -56,9 +56,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
             if (!attemptStart())
             {
-                // Ensure all slaves are stopped until the start succeeds.
-                foreach (var slave in slaves)
-                    slave.Stop();
+                // Ensure all player clocks are stopped until the start succeeds.
+                foreach (var clock in playerClocks)
+                    clock.Stop();
                 return;
             }
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         }
 
         /// <summary>
-        /// Attempts to start playback. Awaits for all slaves to have available frames for up to <see cref="MAXIMUM_START_DELAY"/> milliseconds.
+        /// Attempts to start playback. Waits for all player clocks to have available frames for up to <see cref="MAXIMUM_START_DELAY"/> milliseconds.
         /// </summary>
         /// <returns>Whether playback was started and syncing should occur.</returns>
         private bool attemptStart()
@@ -75,14 +75,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
             if (hasStarted)
                 return true;
 
-            if (slaves.Count == 0)
+            if (playerClocks.Count == 0)
                 return false;
 
             firstStartAttemptTime ??= Time.Current;
 
-            int readyCount = slaves.Count(s => !s.WaitingOnFrames.Value);
+            int readyCount = playerClocks.Count(s => !s.WaitingOnFrames.Value);
 
-            if (readyCount == slaves.Count)
+            if (readyCount == playerClocks.Count)
                 return hasStarted = true;
 
             if (readyCount > 0 && (Time.Current - firstStartAttemptTime) > MAXIMUM_START_DELAY)
@@ -92,38 +92,38 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         }
 
         /// <summary>
-        /// Updates the catchup states of all slave clocks.
+        /// Updates the catchup states of all player clocks clocks.
         /// </summary>
         private void updateCatchup()
         {
-            for (int i = 0; i < slaves.Count; i++)
+            for (int i = 0; i < playerClocks.Count; i++)
             {
-                var slave = slaves[i];
-                double timeDelta = Master.CurrentTime - slave.CurrentTime;
+                var clock = playerClocks[i];
+                double timeDelta = MasterClock.CurrentTime - clock.CurrentTime;
 
-                // Check that the slave isn't too far ahead.
-                // This is a quiet case in which the catchup is done by the master clock, so IsCatchingUp is not set on the slave.
+                // Check that the player clock isn't too far ahead.
+                // This is a quiet case in which the catchup is done by the master clock, so IsCatchingUp is not set on the player clock.
                 if (timeDelta < -SYNC_TARGET)
                 {
-                    slave.Stop();
+                    clock.Stop();
                     continue;
                 }
 
-                // Make sure the slave is running if it can.
-                if (!slave.WaitingOnFrames.Value)
-                    slave.Start();
+                // Make sure the player clock is running if it can.
+                if (!clock.WaitingOnFrames.Value)
+                    clock.Start();
 
-                if (slave.IsCatchingUp)
+                if (clock.IsCatchingUp)
                 {
-                    // Stop the slave from catching up if it's within the sync target.
+                    // Stop the player clock from catching up if it's within the sync target.
                     if (timeDelta <= SYNC_TARGET)
-                        slave.IsCatchingUp = false;
+                        clock.IsCatchingUp = false;
                 }
                 else
                 {
-                    // Make the slave start catching up if it's exceeded the maximum allowable sync offset.
+                    // Make the player clock start catching up if it's exceeded the maximum allowable sync offset.
                     if (timeDelta > MAX_SYNC_OFFSET)
-                        slave.IsCatchingUp = true;
+                        clock.IsCatchingUp = true;
                 }
             }
         }
@@ -133,14 +133,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         /// </summary>
         private void updateMasterClock()
         {
-            bool anyInSync = slaves.Any(s => !s.IsCatchingUp);
+            bool anyInSync = playerClocks.Any(s => !s.IsCatchingUp);
 
-            if (Master.IsRunning != anyInSync)
+            if (MasterClock.IsRunning != anyInSync)
             {
                 if (anyInSync)
-                    Master.Start();
+                    MasterClock.Start();
                 else
-                    Master.Stop();
+                    MasterClock.Stop();
             }
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
similarity index 90%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
index 6b7a4f5221..46f80288c6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
     /// <summary>
     /// A clock which is used by <see cref="MultiSpectatorPlayer"/>s and managed by an <see cref="ISyncManager"/>.
     /// </summary>
-    public interface ISlaveClock : IFrameBasedClock, IAdjustableClock
+    public interface ISpectatorPlayerClock : IFrameBasedClock, IAdjustableClock
     {
         /// <summary>
         /// Whether this clock is waiting on frames to continue playback.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
index d63ac7e1ca..1b83ea8cf3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
@@ -6,25 +6,25 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// Manages the synchronisation between one or more <see cref="ISlaveClock"/>s in relation to a master clock.
+    /// Manages the synchronisation between one or more <see cref="ISpectatorPlayerClock"/>s in relation to a master clock.
     /// </summary>
     public interface ISyncManager
     {
         /// <summary>
-        /// The master clock which slaves should synchronise to.
+        /// The master clock which player clocks should synchronise to.
         /// </summary>
-        IAdjustableClock Master { get; }
+        IAdjustableClock MasterClock { get; }
 
         /// <summary>
-        /// Adds an <see cref="ISlaveClock"/> to manage.
+        /// Adds an <see cref="ISpectatorPlayerClock"/> to manage.
         /// </summary>
-        /// <param name="clock">The <see cref="ISlaveClock"/> to add.</param>
-        void AddSlave(ISlaveClock clock);
+        /// <param name="clock">The <see cref="ISpectatorPlayerClock"/> to add.</param>
+        void AddPlayerClock(ISpectatorPlayerClock clock);
 
         /// <summary>
-        /// Removes an <see cref="ISlaveClock"/>, stopping it from being managed by this <see cref="ISyncManager"/>.
+        /// Removes an <see cref="ISpectatorPlayerClock"/>, stopping it from being managed by this <see cref="ISyncManager"/>.
         /// </summary>
-        /// <param name="clock">The <see cref="ISlaveClock"/> to remove.</param>
-        void RemoveSlave(ISlaveClock clock);
+        /// <param name="clock">The <see cref="ISpectatorPlayerClock"/> to remove.</param>
+        void RemovePlayerClock(ISpectatorPlayerClock clock);
     }
 }

From 120fb8974df0c4a4fcf390e7aaf8ab94d021aa2a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 17:22:16 +0900
Subject: [PATCH 09497/10326] Combine more instances of test player IDs

---
 .../StatefulMultiplayerClientTest.cs          |   4 +-
 .../Visual/Gameplay/TestSceneSpectator.cs     |   3 +-
 .../TestSceneMultiSpectatorLeaderboard.cs     |  42 +++---
 .../TestSceneMultiSpectatorScreen.cs          | 133 +++++++++---------
 .../TestSceneMultiplayerMatchSubScreen.cs     |   4 +-
 .../TestSceneMultiplayerSpectateButton.cs     |  10 +-
 .../Multiplayer/MultiplayerTestScene.cs       |   3 +
 7 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
index 377a33b527..14589f8e6c 100644
--- a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
@@ -53,9 +53,9 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
                 Client.RoomSetupAction = room =>
                 {
                     room.State = MultiplayerRoomState.Playing;
-                    room.Users.Add(new MultiplayerRoomUser(55)
+                    room.Users.Add(new MultiplayerRoomUser(PLAYER_1_ID)
                     {
-                        User = new User { Id = 55 },
+                        User = new User { Id = PLAYER_1_ID },
                         State = MultiplayerUserState.Playing
                     });
                 };
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 74ce66096e..0777571d02 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -23,6 +23,7 @@ using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
+using osu.Game.Tests.Visual.Multiplayer;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -238,7 +239,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
-            public readonly User StreamingUser = new User { Id = 55, Username = "Test user" };
+            public readonly User StreamingUser = new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Test user" };
 
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index da76adf83f..d3a5daeac6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private readonly Dictionary<int, ManualClock> clocks = new Dictionary<int, ManualClock>
         {
-            { 55, new ManualClock() },
-            { 56, new ManualClock() }
+            { PLAYER_1_ID, new ManualClock() },
+            { PLAYER_2_ID, new ManualClock() }
         };
 
         public TestSceneMultiSpectatorLeaderboard()
@@ -95,46 +95,46 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("send frames", () =>
             {
-                // For user 55, send frames in sets of 1.
-                // For user 56, send frames in sets of 10.
+                // For player 1, send frames in sets of 1.
+                // For player 2, send frames in sets of 10.
                 for (int i = 0; i < 100; i++)
                 {
-                    streamingClient.SendFrames(55, i, 1);
+                    streamingClient.SendFrames(PLAYER_1_ID, i, 1);
 
                     if (i % 10 == 0)
-                        streamingClient.SendFrames(56, i, 10);
+                        streamingClient.SendFrames(PLAYER_2_ID, i, 10);
                 }
             });
 
-            assertCombo(55, 1);
-            assertCombo(56, 10);
+            assertCombo(PLAYER_1_ID, 1);
+            assertCombo(PLAYER_2_ID, 10);
 
-            // Advance to a point where only user 55's frame changes.
+            // Advance to a point where only user player 1's frame changes.
             setTime(500);
-            assertCombo(55, 5);
-            assertCombo(56, 10);
+            assertCombo(PLAYER_1_ID, 5);
+            assertCombo(PLAYER_2_ID, 10);
 
             // Advance to a point where both user's frame changes.
             setTime(1100);
-            assertCombo(55, 11);
-            assertCombo(56, 20);
+            assertCombo(PLAYER_1_ID, 11);
+            assertCombo(PLAYER_2_ID, 20);
 
-            // Advance user 56 only to a point where its frame changes.
-            setTime(56, 2100);
-            assertCombo(55, 11);
-            assertCombo(56, 30);
+            // Advance user player 2 only to a point where its frame changes.
+            setTime(PLAYER_2_ID, 2100);
+            assertCombo(PLAYER_1_ID, 11);
+            assertCombo(PLAYER_2_ID, 30);
 
             // Advance both users beyond their last frame
             setTime(101 * 100);
-            assertCombo(55, 100);
-            assertCombo(56, 100);
+            assertCombo(PLAYER_1_ID, 100);
+            assertCombo(PLAYER_2_ID, 100);
         }
 
         [Test]
         public void TestNoFrames()
         {
-            assertCombo(55, 0);
-            assertCombo(56, 0);
+            assertCombo(PLAYER_1_ID, 0);
+            assertCombo(PLAYER_2_ID, 0);
         }
 
         private void setTime(double time) => AddStep($"set time {time}", () =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 512311ff03..7abeed2cbf 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -47,9 +47,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapInfo importedBeatmap;
         private int importedBeatmapId;
 
-        private const int player_1_id = 55;
-        private const int player_2_id = 56;
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -83,29 +80,29 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("start players silently", () =>
             {
-                Client.CurrentMatchPlayingUserIds.Add(player_1_id);
-                Client.CurrentMatchPlayingUserIds.Add(player_2_id);
-                playingUserIds.Add(player_1_id);
-                playingUserIds.Add(player_2_id);
-                nextFrame[player_1_id] = 0;
-                nextFrame[player_2_id] = 0;
+                Client.CurrentMatchPlayingUserIds.Add(PLAYER_1_ID);
+                Client.CurrentMatchPlayingUserIds.Add(PLAYER_2_ID);
+                playingUserIds.Add(PLAYER_1_ID);
+                playingUserIds.Add(PLAYER_2_ID);
+                nextFrame[PLAYER_1_ID] = 0;
+                nextFrame[PLAYER_2_ID] = 0;
             });
 
             loadSpectateScreen(false);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player first_player_id", () => streamingClient.StartPlay(player_1_id, importedBeatmapId));
+            AddStep("load player first_player_id", () => streamingClient.StartPlay(PLAYER_1_ID, importedBeatmapId));
             AddUntilStep("one player added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 1);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player second_player_id", () => streamingClient.StartPlay(player_2_id, importedBeatmapId));
+            AddStep("load player second_player_id", () => streamingClient.StartPlay(PLAYER_2_ID, importedBeatmapId));
             AddUntilStep("two players added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 2);
         }
 
         [Test]
         public void TestGeneral()
         {
-            int[] userIds = Enumerable.Range(0, 4).Select(i => player_1_id + i).ToArray();
+            int[] userIds = Enumerable.Range(0, 4).Select(i => PLAYER_1_ID + i).ToArray();
 
             start(userIds);
             loadSpectateScreen();
@@ -117,123 +114,123 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestPlayersMustStartSimultaneously()
         {
-            start(new[] { player_1_id, player_2_id });
+            start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
             // Send frames for one player only, both should remain paused.
-            sendFrames(player_1_id, 20);
-            checkPausedInstant(player_1_id, true);
-            checkPausedInstant(player_2_id, true);
+            sendFrames(PLAYER_1_ID, 20);
+            checkPausedInstant(PLAYER_1_ID, true);
+            checkPausedInstant(PLAYER_2_ID, true);
 
             // Send frames for the other player, both should now start playing.
-            sendFrames(player_2_id, 20);
-            checkPausedInstant(player_1_id, false);
-            checkPausedInstant(player_2_id, false);
+            sendFrames(PLAYER_2_ID, 20);
+            checkPausedInstant(PLAYER_1_ID, false);
+            checkPausedInstant(PLAYER_2_ID, false);
         }
 
         [Test]
         public void TestPlayersDoNotStartSimultaneouslyIfBufferingForMaximumStartDelay()
         {
-            start(new[] { player_1_id, player_2_id });
+            start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
             // Send frames for one player only, both should remain paused.
-            sendFrames(player_1_id, 1000);
-            checkPausedInstant(player_1_id, true);
-            checkPausedInstant(player_2_id, true);
+            sendFrames(PLAYER_1_ID, 1000);
+            checkPausedInstant(PLAYER_1_ID, true);
+            checkPausedInstant(PLAYER_2_ID, true);
 
             // Wait for the start delay seconds...
             AddWaitStep("wait maximum start delay seconds", (int)(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
 
             // Player 1 should start playing by itself, player 2 should remain paused.
-            checkPausedInstant(player_1_id, false);
-            checkPausedInstant(player_2_id, true);
+            checkPausedInstant(PLAYER_1_ID, false);
+            checkPausedInstant(PLAYER_2_ID, true);
         }
 
         [Test]
         public void TestPlayersContinueWhileOthersBuffer()
         {
-            start(new[] { player_1_id, player_2_id });
+            start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
             // Send initial frames for both players. A few more for player 1.
-            sendFrames(player_1_id, 20);
-            sendFrames(player_2_id, 10);
-            checkPausedInstant(player_1_id, false);
-            checkPausedInstant(player_2_id, false);
+            sendFrames(PLAYER_1_ID, 20);
+            sendFrames(PLAYER_2_ID, 10);
+            checkPausedInstant(PLAYER_1_ID, false);
+            checkPausedInstant(PLAYER_2_ID, false);
 
             // Eventually player 2 will pause, player 1 must remain running.
-            checkPaused(player_2_id, true);
-            checkPausedInstant(player_1_id, false);
+            checkPaused(PLAYER_2_ID, true);
+            checkPausedInstant(PLAYER_1_ID, false);
 
             // Eventually both players will run out of frames and should pause.
-            checkPaused(player_1_id, true);
-            checkPausedInstant(player_2_id, true);
+            checkPaused(PLAYER_1_ID, true);
+            checkPausedInstant(PLAYER_2_ID, true);
 
             // Send more frames for the first player only. Player 1 should start playing with player 2 remaining paused.
-            sendFrames(player_1_id, 20);
-            checkPausedInstant(player_2_id, true);
-            checkPausedInstant(player_1_id, false);
+            sendFrames(PLAYER_1_ID, 20);
+            checkPausedInstant(PLAYER_2_ID, true);
+            checkPausedInstant(PLAYER_1_ID, false);
 
             // Send more frames for the second player. Both should be playing
-            sendFrames(player_2_id, 20);
-            checkPausedInstant(player_2_id, false);
-            checkPausedInstant(player_1_id, false);
+            sendFrames(PLAYER_2_ID, 20);
+            checkPausedInstant(PLAYER_2_ID, false);
+            checkPausedInstant(PLAYER_1_ID, false);
         }
 
         [Test]
         public void TestPlayersCatchUpAfterFallingBehind()
         {
-            start(new[] { player_1_id, player_2_id });
+            start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
             // Send initial frames for both players. A few more for player 1.
-            sendFrames(player_1_id, 1000);
-            sendFrames(player_2_id, 10);
-            checkPausedInstant(player_1_id, false);
-            checkPausedInstant(player_2_id, false);
+            sendFrames(PLAYER_1_ID, 1000);
+            sendFrames(PLAYER_2_ID, 10);
+            checkPausedInstant(PLAYER_1_ID, false);
+            checkPausedInstant(PLAYER_2_ID, false);
 
             // Eventually player 2 will run out of frames and should pause.
-            checkPaused(player_2_id, true);
+            checkPaused(PLAYER_2_ID, true);
             AddWaitStep("wait a few more frames", 10);
 
             // Send more frames for player 2. It should unpause.
-            sendFrames(player_2_id, 1000);
-            checkPausedInstant(player_2_id, false);
+            sendFrames(PLAYER_2_ID, 1000);
+            checkPausedInstant(PLAYER_2_ID, false);
 
             // Player 2 should catch up to player 1 after unpausing.
-            waitForCatchup(player_2_id);
+            waitForCatchup(PLAYER_2_ID);
             AddWaitStep("wait a bit", 10);
         }
 
         [Test]
         public void TestMostInSyncUserIsAudioSource()
         {
-            start(new[] { player_1_id, player_2_id });
+            start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
-            assertVolume(player_1_id, 0);
-            assertVolume(player_2_id, 0);
+            assertVolume(PLAYER_1_ID, 0);
+            assertVolume(PLAYER_2_ID, 0);
 
-            sendFrames(player_1_id, 10);
-            sendFrames(player_2_id, 20);
-            assertVolume(player_1_id, 1);
-            assertVolume(player_2_id, 0);
+            sendFrames(PLAYER_1_ID, 10);
+            sendFrames(PLAYER_2_ID, 20);
+            assertVolume(PLAYER_1_ID, 1);
+            assertVolume(PLAYER_2_ID, 0);
 
-            checkPaused(player_1_id, true);
-            assertVolume(player_1_id, 0);
-            assertVolume(player_2_id, 1);
+            checkPaused(PLAYER_1_ID, true);
+            assertVolume(PLAYER_1_ID, 0);
+            assertVolume(PLAYER_2_ID, 1);
 
-            sendFrames(player_1_id, 100);
-            waitForCatchup(player_1_id);
-            checkPaused(player_2_id, true);
-            assertVolume(player_1_id, 1);
-            assertVolume(player_2_id, 0);
+            sendFrames(PLAYER_1_ID, 100);
+            waitForCatchup(PLAYER_1_ID);
+            checkPaused(PLAYER_2_ID, true);
+            assertVolume(PLAYER_1_ID, 1);
+            assertVolume(PLAYER_2_ID, 0);
 
-            sendFrames(player_2_id, 100);
-            waitForCatchup(player_2_id);
-            assertVolume(player_1_id, 1);
-            assertVolume(player_2_id, 0);
+            sendFrames(PLAYER_2_ID, 100);
+            waitForCatchup(PLAYER_2_ID);
+            assertVolume(PLAYER_1_ID, 1);
+            assertVolume(PLAYER_2_ID, 0);
         }
 
         private void loadSpectateScreen(bool waitForPlayerLoad = true)
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 7c6c158b5a..f611d5fecf 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -119,8 +119,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("join other user (ready)", () =>
             {
-                Client.AddUser(new User { Id = 55 });
-                Client.ChangeUserState(55, MultiplayerUserState.Ready);
+                Client.AddUser(new User { Id = PLAYER_1_ID });
+                Client.ChangeUserState(PLAYER_1_ID, MultiplayerUserState.Ready);
             });
 
             AddStep("click spectate button", () =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index afbc9c32b3..e59b342176 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -157,8 +157,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestReadyButtonEnabledWhenHostAndUsersReady()
         {
-            AddStep("add user", () => Client.AddUser(new User { Id = 55 }));
-            AddStep("set user ready", () => Client.ChangeUserState(55, MultiplayerUserState.Ready));
+            AddStep("add user", () => Client.AddUser(new User { Id = PLAYER_1_ID }));
+            AddStep("set user ready", () => Client.ChangeUserState(PLAYER_1_ID, MultiplayerUserState.Ready));
 
             addClickSpectateButtonStep();
             assertReadyButtonEnablement(true);
@@ -169,11 +169,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("add user and transfer host", () =>
             {
-                Client.AddUser(new User { Id = 55 });
-                Client.TransferHost(55);
+                Client.AddUser(new User { Id = PLAYER_1_ID });
+                Client.TransferHost(PLAYER_1_ID);
             });
 
-            AddStep("set user ready", () => Client.ChangeUserState(55, MultiplayerUserState.Ready));
+            AddStep("set user ready", () => Client.ChangeUserState(PLAYER_1_ID, MultiplayerUserState.Ready));
 
             addClickSpectateButtonStep();
             assertReadyButtonEnablement(false);
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 7775c2bd24..db344b28dd 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -16,6 +16,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public abstract class MultiplayerTestScene : RoomTestScene
     {
+        public const int PLAYER_1_ID = 55;
+        public const int PLAYER_2_ID = 56;
+
         [Cached(typeof(StatefulMultiplayerClient))]
         public TestMultiplayerClient Client { get; }
 

From 6626e70c95557a17c07216b5514ae4d9440d92a3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 17:30:27 +0900
Subject: [PATCH 09498/10326] Pass in master clock instead of slave clock

---
 .../OnlinePlay/TestSceneCatchUpSyncManager.cs |  5 ++++
 .../Spectate/MultiSpectatorScreen.cs          |  5 +++-
 .../Multiplayer/Spectate/PlayerArea.cs        |  8 ++++---
 .../Sync/CatchUpSpectatorPlayerClock.cs       | 23 +++++++++++--------
 .../Spectate/Sync/ISpectatorPlayerClock.cs    |  5 ++++
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 73ec5fb934..75ba362146 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -168,6 +168,11 @@ namespace osu.Game.Tests.OnlinePlay
 
             public bool IsCatchingUp { get; set; }
 
+            public IFrameBasedClock Source
+            {
+                set => throw new NotImplementedException();
+            }
+
             public readonly int Id;
 
             public TestSpectatorPlayerClock(int id)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 6a8c10e336..86c975d12f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -79,7 +79,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             };
 
             for (int i = 0; i < UserIds.Length; i++)
-                grid.Add(instances[i] = new PlayerArea(UserIds[i], new CatchUpSpectatorPlayerClock(masterClockContainer.GameplayClock)));
+            {
+                grid.Add(instances[i] = new PlayerArea(UserIds[i], masterClockContainer.GameplayClock));
+                syncManager.AddPlayerClock(instances[i].GameplayClock);
+            }
 
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 2accfaec0c..3ef1693ca6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -9,6 +9,7 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
@@ -38,7 +39,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// The <see cref="ISpectatorPlayerClock"/> used to control the gameplay running state of a loaded <see cref="Player"/>.
         /// </summary>
         [NotNull]
-        public readonly ISpectatorPlayerClock GameplayClock;
+        public readonly ISpectatorPlayerClock GameplayClock = new CatchUpSpectatorPlayerClock();
 
         /// <summary>
         /// The currently-loaded score.
@@ -54,10 +55,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly AudioContainer audioContainer;
         private OsuScreenStack stack;
 
-        public PlayerArea(int userId, [NotNull] ISpectatorPlayerClock gameplayClock)
+        public PlayerArea(int userId, IFrameBasedClock masterClock)
         {
             UserId = userId;
-            GameplayClock = gameplayClock;
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
@@ -71,6 +71,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 },
                 loadingLayer = new LoadingLayer(true) { State = { Value = Visibility.Visible } }
             };
+
+            GameplayClock.Source = masterClock;
         }
 
         public void LoadScore([NotNull] Score score)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
index a8ed7b415f..e2a6b7c9ae 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.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.
 
+#nullable enable
+
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
@@ -17,12 +19,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         /// </summary>
         public const double CATCHUP_RATE = 2;
 
-        private readonly IFrameBasedClock masterClock;
-
-        public CatchUpSpectatorPlayerClock(IFrameBasedClock masterClock)
-        {
-            this.masterClock = masterClock;
-        }
+        /// <summary>
+        /// The source clock.
+        /// </summary>
+        public IFrameBasedClock? Source { get; set; }
 
         public double CurrentTime { get; private set; }
 
@@ -52,19 +52,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
         public void ProcessFrame()
         {
-            masterClock.ProcessFrame();
-
             ElapsedFrameTime = 0;
             FramesPerSecond = 0;
 
+            if (Source == null)
+                return;
+
+            Source.ProcessFrame();
+
             if (IsRunning)
             {
-                double elapsedSource = masterClock.ElapsedFrameTime;
+                double elapsedSource = Source.ElapsedFrameTime;
                 double elapsed = elapsedSource * Rate;
 
                 CurrentTime += elapsed;
                 ElapsedFrameTime = elapsed;
-                FramesPerSecond = masterClock.FramesPerSecond;
+                FramesPerSecond = Source.FramesPerSecond;
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
index 46f80288c6..311969c92c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
@@ -20,5 +20,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         /// Whether this clock is resynchronising to the master clock.
         /// </summary>
         bool IsCatchingUp { get; set; }
+
+        /// <summary>
+        /// The source clock
+        /// </summary>
+        IFrameBasedClock Source { set; }
     }
 }

From d7618b63fa38512a7449c65eb6d92bbca140cb54 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 17:35:13 +0900
Subject: [PATCH 09499/10326] Fix test failure

---
 .../Multiplayer/Spectate/Sync/CatchUpSyncManager.cs   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
index f5c780e8b1..5912c0803b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
@@ -78,15 +78,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
             if (playerClocks.Count == 0)
                 return false;
 
-            firstStartAttemptTime ??= Time.Current;
-
             int readyCount = playerClocks.Count(s => !s.WaitingOnFrames.Value);
 
             if (readyCount == playerClocks.Count)
                 return hasStarted = true;
 
-            if (readyCount > 0 && (Time.Current - firstStartAttemptTime) > MAXIMUM_START_DELAY)
-                return hasStarted = true;
+            if (readyCount > 0)
+            {
+                firstStartAttemptTime ??= Time.Current;
+
+                if (Time.Current - firstStartAttemptTime > MAXIMUM_START_DELAY)
+                    return hasStarted = true;
+            }
 
             return false;
         }

From 94d0b064931736c7e6947a13b35ec0f39a67889e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 19:01:30 +0900
Subject: [PATCH 09500/10326] Expose mute adjustment instead

---
 .../TestSceneMultiSpectatorScreen.cs          | 24 +++----
 .../Spectate/MultiSpectatorScreen.cs          |  2 +-
 .../Multiplayer/Spectate/PlayerArea.cs        | 64 +++++--------------
 3 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 7abeed2cbf..a4856d1ee8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -209,28 +209,28 @@ namespace osu.Game.Tests.Visual.Multiplayer
             start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
-            assertVolume(PLAYER_1_ID, 0);
-            assertVolume(PLAYER_2_ID, 0);
+            assertMuted(PLAYER_1_ID, true);
+            assertMuted(PLAYER_2_ID, true);
 
             sendFrames(PLAYER_1_ID, 10);
             sendFrames(PLAYER_2_ID, 20);
-            assertVolume(PLAYER_1_ID, 1);
-            assertVolume(PLAYER_2_ID, 0);
+            assertMuted(PLAYER_1_ID, false);
+            assertMuted(PLAYER_2_ID, true);
 
             checkPaused(PLAYER_1_ID, true);
-            assertVolume(PLAYER_1_ID, 0);
-            assertVolume(PLAYER_2_ID, 1);
+            assertMuted(PLAYER_1_ID, true);
+            assertMuted(PLAYER_2_ID, false);
 
             sendFrames(PLAYER_1_ID, 100);
             waitForCatchup(PLAYER_1_ID);
             checkPaused(PLAYER_2_ID, true);
-            assertVolume(PLAYER_1_ID, 1);
-            assertVolume(PLAYER_2_ID, 0);
+            assertMuted(PLAYER_1_ID, false);
+            assertMuted(PLAYER_2_ID, true);
 
             sendFrames(PLAYER_2_ID, 100);
             waitForCatchup(PLAYER_2_ID);
-            assertVolume(PLAYER_1_ID, 1);
-            assertVolume(PLAYER_2_ID, 0);
+            assertMuted(PLAYER_1_ID, false);
+            assertMuted(PLAYER_2_ID, true);
         }
 
         private void loadSpectateScreen(bool waitForPlayerLoad = true)
@@ -292,8 +292,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private void checkPausedInstant(int userId, bool state)
             => AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
 
-        private void assertVolume(int userId, double volume)
-            => AddAssert($"{userId} volume is {volume}", () => getInstance(userId).Volume.Value == volume);
+        private void assertMuted(int userId, bool muted)
+            => AddAssert($"{userId} {(muted ? "is" : "is not")} muted", () => getInstance(userId).Mute == muted);
 
         private void waitForCatchup(int userId)
             => AddUntilStep($"{userId} not catching up", () => !getInstance(userId).GameplayClock.IsCatchingUp);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 86c975d12f..2bd0ad8748 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                                               .FirstOrDefault();
 
                 foreach (var instance in instances)
-                    instance.Volume.Value = instance == currentAudioSource ? 1 : 0;
+                    instance.Mute = instance != currentAudioSource;
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 3ef1693ca6..89c69cc666 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     /// <summary>
     /// Provides an area for and manages the hierarchy of a spectated player within a <see cref="MultiSpectatorScreen"/>.
     /// </summary>
-    public class PlayerArea : CompositeDrawable, IAdjustableAudioComponent
+    public class PlayerArea : CompositeDrawable
     {
         /// <summary>
         /// Whether a <see cref="Player"/> is loaded in the area.
@@ -50,9 +50,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        private readonly BindableDouble volumeAdjustment = new BindableDouble();
         private readonly Container gameplayContent;
         private readonly LoadingLayer loadingLayer;
-        private readonly AudioContainer audioContainer;
         private OsuScreenStack stack;
 
         public PlayerArea(int userId, IFrameBasedClock masterClock)
@@ -62,6 +62,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             RelativeSizeAxes = Axes.Both;
             Masking = true;
 
+            AudioContainer audioContainer;
             InternalChildren = new Drawable[]
             {
                 audioContainer = new AudioContainer
@@ -72,6 +73,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 loadingLayer = new LoadingLayer(true) { State = { Value = Visibility.Visible } }
             };
 
+            audioContainer.AddAdjustment(AdjustableProperty.Volume, volumeAdjustment);
+
             GameplayClock.Source = masterClock;
         }
 
@@ -92,55 +95,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             loadingLayer.Hide();
         }
 
+        private bool mute = true;
+
+        public bool Mute
+        {
+            get => mute;
+            set
+            {
+                mute = value;
+                volumeAdjustment.Value = value ? 0 : 1;
+            }
+        }
+
         // Player interferes with global input, so disable input for now.
         public override bool PropagatePositionalInputSubTree => false;
         public override bool PropagateNonPositionalInputSubTree => false;
 
-        #region IAdjustableAudioComponent
-
-        public IBindable<double> AggregateVolume => audioContainer.AggregateVolume;
-
-        public IBindable<double> AggregateBalance => audioContainer.AggregateBalance;
-
-        public IBindable<double> AggregateFrequency => audioContainer.AggregateFrequency;
-
-        public IBindable<double> AggregateTempo => audioContainer.AggregateTempo;
-
-        public void BindAdjustments(IAggregateAudioAdjustment component)
-        {
-            audioContainer.BindAdjustments(component);
-        }
-
-        public void UnbindAdjustments(IAggregateAudioAdjustment component)
-        {
-            audioContainer.UnbindAdjustments(component);
-        }
-
-        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
-        {
-            audioContainer.AddAdjustment(type, adjustBindable);
-        }
-
-        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
-        {
-            audioContainer.RemoveAdjustment(type, adjustBindable);
-        }
-
-        public void RemoveAllAdjustments(AdjustableProperty type)
-        {
-            audioContainer.RemoveAllAdjustments(type);
-        }
-
-        public BindableNumber<double> Volume => audioContainer.Volume;
-
-        public BindableNumber<double> Balance => audioContainer.Balance;
-
-        public BindableNumber<double> Frequency => audioContainer.Frequency;
-
-        public BindableNumber<double> Tempo => audioContainer.Tempo;
-
-        #endregion
-
         private class PlayerIsolationContainer : Container
         {
             [Cached]

From 58ebec48037499b162fb5045c767812a22f82fb5 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Mon, 26 Apr 2021 19:00:40 +0800
Subject: [PATCH 09501/10326] Move BindValueChanged hooks to LoadComplete()

---
 .../Objects/Drawables/DrawableNote.cs          | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 2d2fba0ad5..49536080ab 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private OsuColour colours { get; set; }
 
+        [Resolved]
+        private BeatDivisorFinder beatDivisorFinder { get; set; }
+
         private readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
 
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
@@ -48,17 +51,20 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(ManiaRulesetConfigManager rulesetConfig, BeatDivisorFinder beatDivisorFinder)
+        private void load(ManiaRulesetConfigManager rulesetConfig)
+        {
+            rulesetConfig?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
+        protected override void LoadComplete()
         {
             if (beatDivisorFinder != null)
             {
-                rulesetConfig?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
-
                 HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = beatDivisorFinder.FindDivisor(HitObject), true);
-
-                snap.BindValueChanged(_ => updateSnapColour(), true);
-                configColourCodedNotes.BindValueChanged(_ => updateSnapColour());
             }
+
+            snap.BindValueChanged(_ => updateSnapColour());
+            configColourCodedNotes.BindValueChanged(_ => updateSnapColour(), true);
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)

From 559d403abec8046cd8331fbc45523676ae2452f0 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Mon, 26 Apr 2021 19:05:12 +0800
Subject: [PATCH 09502/10326] Rename ColourCodedNotes to
 TimingBasedNoteColouring

---
 .../Configuration/ManiaRulesetConfigManager.cs            | 4 ++--
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs        | 4 ++--
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 87a4689689..ac8168dfc9 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
             SetDefault(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
-            SetDefault(ManiaRulesetSetting.ColourCodedNotes, false);
+            SetDefault(ManiaRulesetSetting.TimingBasedNoteColouring, false);
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
@@ -36,6 +36,6 @@ namespace osu.Game.Rulesets.Mania.Configuration
     {
         ScrollTime,
         ScrollDirection,
-        ColourCodedNotes
+        TimingBasedNoteColouring
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index 552c793096..1c89d9cd00 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -39,8 +39,8 @@ namespace osu.Game.Rulesets.Mania
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = "Colour-coded notes",
-                    Current = config.GetBindable<bool>(ManiaRulesetSetting.ColourCodedNotes),
+                    LabelText = "Timing-based note colouring",
+                    Current = config.GetBindable<bool>(ManiaRulesetSetting.TimingBasedNoteColouring),
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 49536080ab..102cd485dc 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private BeatDivisorFinder beatDivisorFinder { get; set; }
 
-        private readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        private readonly Bindable<bool> configTimingBasedNoteColouring = new Bindable<bool>();
 
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [BackgroundDependencyLoader(true)]
         private void load(ManiaRulesetConfigManager rulesetConfig)
         {
-            rulesetConfig?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            rulesetConfig?.BindWith(ManiaRulesetSetting.TimingBasedNoteColouring, configTimingBasedNoteColouring);
         }
 
         protected override void LoadComplete()
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             }
 
             snap.BindValueChanged(_ => updateSnapColour());
-            configColourCodedNotes.BindValueChanged(_ => updateSnapColour(), true);
+            configTimingBasedNoteColouring.BindValueChanged(_ => updateSnapColour(), true);
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
@@ -109,7 +109,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private void updateSnapColour()
         {
-            Colour = configColourCodedNotes.Value
+            Colour = configTimingBasedNoteColouring.Value
                 ? BindableBeatDivisor.GetColourFor(snap.Value, colours)
                 : Color4.White;
         }

From 6560dc2d1f579947218d1fa88853775efb0d1792 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 20:46:44 +0900
Subject: [PATCH 09503/10326] Fix exported replays being wrapped in zip
 packages

---
 osu.Game/Database/ArchiveModelManager.cs | 20 +++++++++++++++-----
 osu.Game/Scoring/ScoreManager.cs         | 10 ++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index d809dbcb01..6719351530 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -422,15 +422,25 @@ namespace osu.Game.Database
             if (retrievedItem == null)
                 throw new ArgumentException("Specified model could not be found", nameof(item));
 
+            using (var outputStream = exportStorage.GetStream($"{getValidFilename(item.ToString())}{HandledExtensions.First()}", FileAccess.Write, FileMode.Create))
+                ExportModelTo(retrievedItem, outputStream);
+
+            exportStorage.OpenInNativeExplorer();
+        }
+
+        /// <summary>
+        /// Exports an item to the given output stream.
+        /// </summary>
+        /// <param name="model">The item to export.</param>
+        /// <param name="outputStream">The output stream to export to.</param>
+        protected virtual void ExportModelTo(TModel model, Stream outputStream)
+        {
             using (var archive = ZipArchive.Create())
             {
-                foreach (var file in retrievedItem.Files)
+                foreach (var file in model.Files)
                     archive.AddEntry(file.Filename, Files.Storage.GetStream(file.FileInfo.StoragePath));
 
-                using (var outputStream = exportStorage.GetStream($"{getValidFilename(item.ToString())}{HandledExtensions.First()}", FileAccess.Write, FileMode.Create))
-                    archive.SaveTo(outputStream);
-
-                exportStorage.OpenInNativeExplorer();
+                archive.SaveTo(outputStream);
             }
         }
 
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index c7ee26c248..9d3b952ada 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -72,6 +72,16 @@ namespace osu.Game.Scoring
             }
         }
 
+        protected override void ExportModelTo(ScoreInfo model, Stream outputStream)
+        {
+            var file = model.Files.SingleOrDefault();
+            if (file == null)
+                return;
+
+            using (var inputStream = Files.Storage.GetStream(file.FileInfo.StoragePath))
+                inputStream.CopyTo(outputStream);
+        }
+
         protected override IEnumerable<string> GetStableImportPaths(Storage storage)
             => storage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
                       .Select(path => storage.GetFullPath(path));

From 213ac88a8b34b7d1caa57183945b501b3c828e1a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 20:52:20 +0900
Subject: [PATCH 09504/10326] Fix exported scores not being compatible with
 osu-stable

---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index db7e51e833..56c4e75864 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Scoring.Legacy
 
                     foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ToLegacy(beatmap)))
                     {
-                        replayData.Append(FormattableString.Invariant($"{f.Time - lastF.Time}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
+                        replayData.Append(FormattableString.Invariant($"{(int)Math.Round(f.Time - lastF.Time)}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
                         lastF = f;
                     }
                 }

From 7e11d520d587a905f64bf25d023c5515c046b812 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 21:25:34 +0900
Subject: [PATCH 09505/10326] Remove finished players from multi spectator
 screen

---
 .../Spectate/MultiSpectatorScreen.cs          | 15 ++++----
 osu.Game/Screens/Spectate/SpectatorScreen.cs  | 35 ++++++++++++++-----
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 2bd0ad8748..c3917e321d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// </summary>
         public bool AllPlayersLoaded => instances.All(p => p?.PlayerLoaded == true);
 
+        private readonly int[] userIds;
+
         [Resolved]
         private SpectatorStreamingClient spectatorClient { get; set; }
 
@@ -44,7 +46,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public MultiSpectatorScreen(int[] userIds)
             : base(userIds.Take(PlayerGrid.MAX_PLAYERS).ToArray())
         {
-            instances = new PlayerArea[UserIds.Length];
+            this.userIds = GetUserIds().ToArray();
+            instances = new PlayerArea[this.userIds.Length];
         }
 
         [BackgroundDependencyLoader]
@@ -78,9 +81,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 })
             };
 
-            for (int i = 0; i < UserIds.Length; i++)
+            for (int i = 0; i < userIds.Length; i++)
             {
-                grid.Add(instances[i] = new PlayerArea(UserIds[i], masterClockContainer.GameplayClock));
+                grid.Add(instances[i] = new PlayerArea(userIds[i], masterClockContainer.GameplayClock));
                 syncManager.AddPlayerClock(instances[i].GameplayClock);
             }
 
@@ -89,7 +92,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
             scoreProcessor.ApplyBeatmap(playableBeatmap);
 
-            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
+            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, userIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
         protected override void LoadComplete()
@@ -133,10 +136,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         protected override void EndGameplay(int userId)
         {
-            spectatorClient.StopWatchingUser(userId);
+            RemoveUser(userId);
             leaderboard.RemoveClock(userId);
         }
 
-        private int getIndexForUser(int userId) => Array.IndexOf(UserIds, userId);
+        private int getIndexForUser(int userId) => Array.IndexOf(userIds, userId);
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 36768a512d..4aca379ebe 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using NuGet.Packaging;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -26,7 +27,8 @@ namespace osu.Game.Screens.Spectate
     /// </summary>
     public abstract class SpectatorScreen : OsuScreen
     {
-        protected readonly int[] UserIds;
+        protected IEnumerable<int> GetUserIds() => userIds;
+        private readonly HashSet<int> userIds = new HashSet<int>();
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -54,7 +56,7 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userIds">The users to spectate.</param>
         protected SpectatorScreen(params int[] userIds)
         {
-            UserIds = userIds;
+            this.userIds.AddRange(userIds);
         }
 
         protected override void LoadComplete()
@@ -80,20 +82,18 @@ namespace osu.Game.Screens.Spectate
 
         private Task populateAllUsers()
         {
-            var userLookupTasks = new Task[UserIds.Length];
+            var userLookupTasks = new List<Task>();
 
-            for (int i = 0; i < UserIds.Length; i++)
+            foreach (var u in userIds)
             {
-                var userId = UserIds[i];
-
-                userLookupTasks[i] = userLookupCache.GetUserAsync(userId).ContinueWith(task =>
+                userLookupTasks.Add(userLookupCache.GetUserAsync(u).ContinueWith(task =>
                 {
                     if (!task.IsCompletedSuccessfully)
                         return;
 
                     lock (stateLock)
-                        userMap[userId] = task.Result;
-                });
+                        userMap[u] = task.Result;
+                }));
             }
 
             return Task.WhenAll(userLookupTasks);
@@ -239,6 +239,23 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userId">The user to end gameplay for.</param>
         protected abstract void EndGameplay(int userId);
 
+        /// <summary>
+        /// Stops spectating a user.
+        /// </summary>
+        /// <param name="userId">The user to stop spectating.</param>
+        protected void RemoveUser(int userId)
+        {
+            lock (stateLock)
+            {
+                userFinishedPlaying(userId, null);
+
+                userIds.Remove(userId);
+                userMap.Remove(userId);
+
+                spectatorClient.StopWatchingUser(userId);
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From ed93e26e52b70127ff3e34db5671b25fb6172299 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 21:55:38 +0900
Subject: [PATCH 09506/10326] Use single method for starting/restarting
 spectator screen

---
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  2 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 31 +++++++------------
 .../Spectate/MultiSpectatorScreen.cs          |  7 +++++
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index ae22e1fcec..085c824bdc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.OnResuming(last);
 
-            if (client.Room != null)
+            if (client.Room != null && client.LocalUser?.State != MultiplayerUserState.Spectating)
                 client.ChangeState(MultiplayerUserState.Idle);
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 0cd3b448d2..b8347d0537 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -406,29 +406,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
-        private void onRoomUpdated() => Scheduler.Add(() =>
+        private void onRoomUpdated()
         {
-            if (client.Room == null)
-                return;
-
-            Debug.Assert(client.LocalUser != null);
-
-            UpdateMods();
-
-            if (client.LocalUser.State == MultiplayerUserState.Spectating
-                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad)
-                && ParentScreen.IsCurrentScreen())
-            {
-                StartPlay();
-
-                // If the current user was host, they started the match and the in-progress operation needs to be stopped now.
-                readyClickOperation?.Dispose();
-                readyClickOperation = null;
-            }
-        });
+            Scheduler.AddOnce(UpdateMods);
+        }
 
         private void onLoadRequested()
         {
+            // If the user is spectating, the multi-spectator screen may still be the current screen.
+            if (!ParentScreen.IsCurrentScreen())
+            {
+                ParentScreen.MakeCurrent();
+
+                Schedule(onLoadRequested);
+                return;
+            }
+
             StartPlay();
 
             readyClickOperation?.Dispose();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index c3917e321d..85ef375fae 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -140,6 +140,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             leaderboard.RemoveClock(userId);
         }
 
+        public override bool OnBackButton()
+        {
+            // On a manual exit, set the player state back to idle.
+            multiplayerClient.ChangeState(MultiplayerUserState.Idle);
+            return base.OnBackButton();
+        }
+
         private int getIndexForUser(int userId) => Array.IndexOf(userIds, userId);
     }
 }

From 630a6dc46ac262742f9a8a6c1c68e98100c789dc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 22:23:44 +0900
Subject: [PATCH 09507/10326] Fix missing dependency

---
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 85ef375fae..ef31a5a7f0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -7,6 +7,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
@@ -32,6 +33,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private SpectatorStreamingClient spectatorClient { get; set; }
 
+        [Resolved]
+        private StatefulMultiplayerClient multiplayerClient { get; set; }
+
         private readonly PlayerArea[] instances;
         private MasterGameplayClockContainer masterClockContainer;
         private ISyncManager syncManager;

From 7b9ed924be4ab084101d24fa551ddaee8297f410 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 16:07:30 +0200
Subject: [PATCH 09508/10326] Rename snapping methods

Further separates them from `IBeatSnapProvider`'s `SnapTime`, and groups them together more, to prevent confusion between the two interfaces.

Also changes the xmldoc of the reference time to that of `IBeatSnapProvider` for consistency.
---
 osu.Game/Beatmaps/Beatmap.cs                  | 10 +++++-----
 osu.Game/Beatmaps/IBeatmap.cs                 | 12 ++++++------
 osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs |  6 +++---
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 10 +++++-----
 osu.Game/Screens/Play/GameplayBeatmap.cs      |  8 ++++----
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 1ce01aee24..66b8f169ef 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Beatmaps
             return mostCommon.beatLength;
         }
 
-        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
+        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
         {
             var timingPoint = ControlPointInfo.TimingPointAt(referenceTime ?? time);
             var beatLength = timingPoint.BeatLength / beatDivisor;
@@ -84,14 +84,14 @@ namespace osu.Game.Beatmaps
             return (int)(timingPoint.Time + beatLengths * beatLength);
         }
 
-        public int SnapTimeAnyDivisor(double time, double? referenceTime = null)
+        public int ClosestSnapTime(double time, double? referenceTime = null)
         {
-            return SnapTimeForDivisor(time, ClosestBeatSnapDivisor(time, referenceTime), referenceTime);
+            return ClosestSnapTime(time, ClosestBeatDivisor(time, referenceTime), referenceTime);
         }
 
-        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null)
+        public int ClosestBeatDivisor(double time, double? referenceTime = null)
         {
-            double getUnsnap(int divisor) => Math.Abs(time - SnapTimeForDivisor(time, divisor, referenceTime));
+            double getUnsnap(int divisor) => Math.Abs(time - ClosestSnapTime(time, divisor, referenceTime));
 
             int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
             double smallestUnsnap = divisors.Min(getUnsnap);
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 3b043cb59b..679d639fd1 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -56,22 +56,22 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="time">The time to find the closest snapped time to.</param>
         /// <param name="beatDivisor">The beat divisor to snap to.</param>
-        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
-        int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null);
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null);
 
         /// <summary>
         /// Returns the time on any valid beat divisor closest to the given time.
         /// </summary>
         /// <param name="time">The time to find the closest snapped time to.</param>
-        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
-        int SnapTimeAnyDivisor(double time, double? referenceTime = null);
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        int ClosestSnapTime(double time, double? referenceTime = null);
 
         /// <summary>
         /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest is returned.
         /// </summary>
         /// <param name="time">The time to find the closest beat snap divisor to.</param>
-        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
-        int ClosestBeatSnapDivisor(double time, double? referenceTime = null);
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        int ClosestBeatDivisor(double time, double? referenceTime = null);
 
         /// <summary>
         /// Creates a shallow-clone of this beatmap and returns it.
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
index d15dc6f179..ca268652a9 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         {
             foreach (var hitobject in playableBeatmap.HitObjects)
             {
-                double startUnsnap = hitobject.StartTime - playableBeatmap.SnapTimeAnyDivisor(hitobject.StartTime);
+                double startUnsnap = hitobject.StartTime - playableBeatmap.ClosestSnapTime(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
                 foreach (var issue in getUnsnapIssues(hitobject, startUnsnap, hitobject.StartTime, startPostfix))
                     yield return issue;
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                     {
                         double spanDuration = hasRepeats.Duration / (hasRepeats.RepeatCount + 1);
                         double repeatTime = hitobject.StartTime + spanDuration * (repeatIndex + 1);
-                        double repeatUnsnap = repeatTime - playableBeatmap.SnapTimeAnyDivisor(repeatTime);
+                        double repeatUnsnap = repeatTime - playableBeatmap.ClosestSnapTime(repeatTime);
                         foreach (var issue in getUnsnapIssues(hitobject, repeatUnsnap, repeatTime, "repeat"))
                             yield return issue;
                     }
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
                 if (hitobject is IHasDuration hasDuration)
                 {
-                    double endUnsnap = hasDuration.EndTime - playableBeatmap.SnapTimeAnyDivisor(hasDuration.EndTime);
+                    double endUnsnap = hasDuration.EndTime - playableBeatmap.ClosestSnapTime(hasDuration.EndTime);
                     foreach (var issue in getUnsnapIssues(hitobject, endUnsnap, hasDuration.EndTime, "end"))
                         yield return issue;
                 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 9334814e2a..72fb0ac9e9 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -301,16 +301,16 @@ namespace osu.Game.Screens.Edit
             return list.Count - 1;
         }
 
-        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
+        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
         {
-            return PlayableBeatmap.SnapTimeForDivisor(time, beatDivisor, referenceTime);
+            return PlayableBeatmap.ClosestSnapTime(time, beatDivisor, referenceTime);
         }
 
-        public int SnapTimeAnyDivisor(double time, double? referenceTime = null) => PlayableBeatmap.SnapTimeAnyDivisor(time, referenceTime);
+        public int ClosestSnapTime(double time, double? referenceTime = null) => PlayableBeatmap.ClosestSnapTime(time, referenceTime);
 
-        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatSnapDivisor(time, referenceTime);
+        public int ClosestBeatDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatDivisor(time, referenceTime);
 
-        public double SnapTime(double time, double? referenceTime) => SnapTimeForDivisor(time, BeatDivisor, referenceTime);
+        public double SnapTime(double time, double? referenceTime) => ClosestSnapTime(time, BeatDivisor, referenceTime);
 
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
 
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index a3a2bbd41b..92f58c8759 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -45,14 +45,14 @@ namespace osu.Game.Screens.Play
 
         public double GetMostCommonBeatLength() => PlayableBeatmap.GetMostCommonBeatLength();
 
-        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
+        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
         {
-            return PlayableBeatmap.SnapTimeForDivisor(time, beatDivisor, referenceTime);
+            return PlayableBeatmap.ClosestSnapTime(time, beatDivisor, referenceTime);
         }
 
-        public int SnapTimeAnyDivisor(double time, double? referenceTime = null) => PlayableBeatmap.SnapTimeAnyDivisor(time, referenceTime);
+        public int ClosestSnapTime(double time, double? referenceTime = null) => PlayableBeatmap.ClosestSnapTime(time, referenceTime);
 
-        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatSnapDivisor(time, referenceTime);
+        public int ClosestBeatDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatDivisor(time, referenceTime);
 
         public IBeatmap Clone() => PlayableBeatmap.Clone();
 

From 9b9c473616c6d29a550881e17b9f94cc6271ade8 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 16:17:38 +0200
Subject: [PATCH 09509/10326] Remove redundant string formatting

---
 osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
index ca268652a9..ff270b6d60 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         public abstract class IssueTemplateUnsnap : IssueTemplate
         {
             protected IssueTemplateUnsnap(ICheck check, IssueType type)
-                : base(check, type, "{0:0.##} is unsnapped by {1:0.##} ms.")
+                : base(check, type, "{0} is unsnapped by {1:0.##} ms.")
             {
             }
 

From 71f880aa94eaf3f9defd3b943c1f949293c32631 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 17:44:46 +0200
Subject: [PATCH 09510/10326] Fix duplicate code in unsnap test

---
 osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
index 88939c43ce..bac3c41cb0 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
@@ -70,14 +70,9 @@ namespace osu.Game.Tests.Editing.Checks
         public void TestSliderSnapped()
         {
             // Slider ends are naturally < 1 ms unsnapped because of how SV works.
-            var mockSlider = new Mock<Slider>();
-            mockSlider.SetupGet(s => s.StartTime).Returns(100);
-            mockSlider.As<IHasRepeats>().Setup(r => r.RepeatCount).Returns(0);
-            mockSlider.As<IHasDuration>().Setup(d => d.Duration).Returns(400.75d);
-
             assertOk(new List<HitObject>
             {
-                mockSlider.Object
+                getSliderMock(startTime: 100, endTime: 400.75d).Object
             });
         }
 

From 08a232f7fad662384426f21b3131e36828b9de62 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Mon, 26 Apr 2021 20:08:40 +0200
Subject: [PATCH 09511/10326] Add method to safely refresh DrawableHitObject
 transforms

---
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 7739994527..679c86072b 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -14,13 +14,13 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Threading;
 using osu.Game.Audio;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Pooling;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Skinning;
-using osu.Game.Configuration;
-using osu.Game.Rulesets.Objects.Pooling;
 using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Drawables
@@ -429,6 +429,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
             base.ClearTransformsAfter(double.MinValue, true);
         }
 
+        /// <summary>
+        /// Removes all previously applied transforms, then reapplies a new set of transforms with potentially different parameters.
+        /// The transforms will use the current <see cref="ArmedState"/>, and they will use the appropriate start times.
+        /// This also takes in account potential overrides defined in <see cref="ApplyCustomUpdateState"/>.
+        /// </summary>
+        protected void RefreshStateTransforms() => updateState(State.Value, true);
+
         /// <summary>
         /// Apply (generally fade-in) transforms leading into the <see cref="HitObject"/> start time.
         /// The local drawable hierarchy is recursively delayed to <see cref="HitObjectLifetimeEntry.LifetimeStart"/> for convenience.

From a3570e18dd3c860b0a3942d5c0ba3cf8593471c8 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 20:17:18 +0200
Subject: [PATCH 09512/10326] Add concurrent objects check

Here we use `IHasColumn` to support rulesets with columns, and so I moved that interface out into `osu.Game` from `osu.Game.Rulesets.Mania`.

We also use the same threshold as the unsnap check to ensure that no problems slip through. Specifically where an object is simultaneously not concurrent and not unsnapped but still on the same tick.
---
 .../Objects/ManiaHitObject.cs                 |  1 -
 .../Edit/Checks/CheckConcurrentObjects.cs     | 88 +++++++++++++++++++
 osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs |  4 +-
 .../Rulesets}/Objects/Types/IHasColumn.cs     |  2 +-
 4 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
 rename {osu.Game.Rulesets.Mania => osu.Game/Rulesets}/Objects/Types/IHasColumn.cs (90%)

diff --git a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
index 27bf50493d..6289744df1 100644
--- a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Game.Rulesets.Mania.Objects.Types;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
new file mode 100644
index 0000000000..7c41569fab
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -0,0 +1,88 @@
+// Copyright (c) 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.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckConcurrentObjects : ICheck
+    {
+        // We guarantee that the objects are either treated as concurrent or unsnapped when near the same beat divisor.
+        private const double ms_leniency = CheckUnsnaps.UNSNAP_MS_THRESHOLD;
+
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Concurrent hitobjects");
+
+        public virtual IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateConcurrentSame(this),
+            new IssueTemplateConcurrentDifferent(this)
+        };
+
+        public virtual IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        {
+            for (int i = 0; i < playableBeatmap.HitObjects.Count - 1; ++i)
+            {
+                var hitobject = playableBeatmap.HitObjects[i];
+
+                for (int j = i + 1; j < playableBeatmap.HitObjects.Count; ++j)
+                {
+                    var nextHitobject = playableBeatmap.HitObjects[j];
+
+                    // Accounts for rulesets with hitobjects separated by columns, such as Mania.
+                    // In these cases we only care about concurrent objects within the same column.
+                    if ((hitobject as IHasColumn)?.Column != (nextHitobject as IHasColumn)?.Column)
+                        continue;
+
+                    // Two hitobjects cannot be concurrent without also being concurrent with all objects in between.
+                    // So if the next object is not concurrent, then we know no future objects will be either.
+                    if (!areConcurrent(hitobject, nextHitobject))
+                        break;
+
+                    if (hitobject.GetType() == nextHitobject.GetType())
+                        yield return new IssueTemplateConcurrentSame(this).Create(hitobject, nextHitobject);
+                    else
+                        yield return new IssueTemplateConcurrentDifferent(this).Create(hitobject, nextHitobject);
+                }
+            }
+        }
+
+        protected bool areConcurrent(HitObject hitobject, HitObject nextHitobject) => nextHitobject.StartTime <= hitobject.GetEndTime() + ms_leniency;
+
+        public abstract class IssueTemplateConcurrent : IssueTemplate
+        {
+            protected IssueTemplateConcurrent(ICheck check, string unformattedMessage)
+                : base(check, IssueType.Problem, unformattedMessage)
+            {
+            }
+
+            public Issue Create(HitObject hitobject, HitObject nextHitobject)
+            {
+                var hitobjects = new List<HitObject> { hitobject, nextHitobject };
+                return new Issue(hitobjects, this, hitobject.GetType().Name, nextHitobject.GetType().Name)
+                {
+                    Time = nextHitobject.StartTime
+                };
+            }
+        }
+
+        public class IssueTemplateConcurrentSame : IssueTemplateConcurrent
+        {
+            public IssueTemplateConcurrentSame(ICheck check)
+                : base(check, "{0}s are concurrent here.")
+            {
+            }
+        }
+
+        public class IssueTemplateConcurrentDifferent : IssueTemplateConcurrent
+        {
+            public IssueTemplateConcurrentDifferent(ICheck check)
+                : base(check, "{0} and {1} are concurrent here.")
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
index ff270b6d60..564ef13d8f 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 {
     public class CheckUnsnaps : ICheck
     {
-        private const double unsnap_ms_threshold = 2;
+        public const double UNSNAP_MS_THRESHOLD = 2;
 
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Unsnapped hitobjects");
 
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         private IEnumerable<Issue> getUnsnapIssues(HitObject hitobject, double unsnap, double time, string postfix = "")
         {
-            if (Math.Abs(unsnap) >= unsnap_ms_threshold)
+            if (Math.Abs(unsnap) >= UNSNAP_MS_THRESHOLD)
                 yield return new IssueTemplate2MsOrMore(this).Create(hitobject, unsnap, time, postfix);
             else if (Math.Abs(unsnap) >= 1)
                 yield return new IssueTemplate1MsOrMore(this).Create(hitobject, unsnap, time, postfix);
diff --git a/osu.Game.Rulesets.Mania/Objects/Types/IHasColumn.cs b/osu.Game/Rulesets/Objects/Types/IHasColumn.cs
similarity index 90%
rename from osu.Game.Rulesets.Mania/Objects/Types/IHasColumn.cs
rename to osu.Game/Rulesets/Objects/Types/IHasColumn.cs
index 1ea3138828..dc07cfbb6a 100644
--- a/osu.Game.Rulesets.Mania/Objects/Types/IHasColumn.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasColumn.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.
 
-namespace osu.Game.Rulesets.Mania.Objects.Types
+namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
     /// A type of hit object which lies in one of a number of predetermined columns.

From b8cdcf56c03ef5f4dc27e204c7efece3ffd4572f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 20:22:24 +0200
Subject: [PATCH 09513/10326] Add concurrent object check tests

---
 .../Checks/CheckConcurrentObjectsTest.cs      | 194 ++++++++++++++++++
 1 file changed, 194 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
new file mode 100644
index 0000000000..0f771427ee
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
@@ -0,0 +1,194 @@
+// Copyright (c) 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 Moq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckConcurrentObjectsTest
+    {
+        private CheckConcurrentObjects check;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckConcurrentObjects();
+        }
+
+        [Test]
+        public void TestCirclesSeparate()
+        {
+            assertOk(new List<HitObject>
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 150 }
+            });
+        }
+
+        [Test]
+        public void TestCirclesConcurrent()
+        {
+            assertConcurrentSame(new List<HitObject>
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 100 }
+            });
+        }
+
+        [Test]
+        public void TestCirclesAlmostConcurrent()
+        {
+            assertConcurrentSame(new List<HitObject>
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 101 }
+            });
+        }
+
+        [Test]
+        public void TestSlidersSeparate()
+        {
+            assertOk(new List<HitObject>
+            {
+                getSliderMock(startTime: 100, endTime: 400.75d).Object,
+                getSliderMock(startTime: 500, endTime: 900.75d).Object
+            });
+        }
+
+        [Test]
+        public void TestSlidersConcurrent()
+        {
+            assertConcurrentSame(new List<HitObject>
+            {
+                getSliderMock(startTime: 100, endTime: 400.75d).Object,
+                getSliderMock(startTime: 300, endTime: 700.75d).Object
+            });
+        }
+
+        [Test]
+        public void TestSlidersAlmostConcurrent()
+        {
+            assertConcurrentSame(new List<HitObject>
+            {
+                getSliderMock(startTime: 100, endTime: 400.75d).Object,
+                getSliderMock(startTime: 402, endTime: 902.75d).Object
+            });
+        }
+
+        [Test]
+        public void TestSliderAndCircleConcurrent()
+        {
+            assertConcurrentDifferent(new List<HitObject>
+            {
+                getSliderMock(startTime: 100, endTime: 400.75d).Object,
+                new HitCircle { StartTime = 300 }
+            });
+        }
+
+        [Test]
+        public void TestManyObjectsConcurrent()
+        {
+            var hitobjects = new List<HitObject>
+            {
+                getSliderMock(startTime: 100, endTime: 400.75d).Object,
+                new HitCircle { StartTime = 300 },
+                getSliderMock(startTime: 200, endTime: 500.75d).Object
+            };
+
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(3));
+            Assert.That(issues.Where(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentDifferent).ToList(), Has.Count.EqualTo(2));
+            Assert.That(issues.Any(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentSame));
+        }
+
+        [Test]
+        public void TestHoldNotesSeparateOnSameColumn()
+        {
+            assertOk(new List<HitObject>
+            {
+                getHoldNoteMock(startTime: 100, endTime: 400.75d, column: 1).Object,
+                getHoldNoteMock(startTime: 500, endTime: 900.75d, column: 1).Object
+            });
+        }
+
+        [Test]
+        public void TestHoldNotesConcurrentOnDifferentColumns()
+        {
+            assertOk(new List<HitObject>
+            {
+                getHoldNoteMock(startTime: 100, endTime: 400.75d, column: 1).Object,
+                getHoldNoteMock(startTime: 300, endTime: 700.75d, column: 2).Object
+            });
+        }
+
+        [Test]
+        public void TestHoldNotesConcurrentOnSameColumn()
+        {
+            assertConcurrentSame(new List<HitObject>
+            {
+                getHoldNoteMock(startTime: 100, endTime: 400.75d, column: 1).Object,
+                getHoldNoteMock(startTime: 300, endTime: 700.75d, column: 1).Object
+            });
+        }
+
+        private Mock<Slider> getSliderMock(double startTime, double endTime, int repeats = 0)
+        {
+            var mock = new Mock<Slider>();
+            mock.SetupGet(s => s.StartTime).Returns(startTime);
+            mock.As<IHasRepeats>().Setup(r => r.RepeatCount).Returns(repeats);
+            mock.As<IHasDuration>().Setup(d => d.EndTime).Returns(endTime);
+
+            return mock;
+        }
+
+        private Mock<HoldNote> getHoldNoteMock(double startTime, double endTime, int column)
+        {
+            var mock = new Mock<HoldNote>();
+            mock.SetupGet(s => s.StartTime).Returns(startTime);
+            mock.As<IHasDuration>().Setup(d => d.EndTime).Returns(endTime);
+            mock.As<IHasColumn>().Setup(c => c.Column).Returns(column);
+
+            return mock;
+        }
+
+        private void assertOk(List<HitObject> hitobjects)
+        {
+            Assert.That(check.Run(getPlayableBeatmap(hitobjects), null), Is.Empty);
+        }
+
+        private void assertConcurrentSame(List<HitObject> hitobjects, int count = 1)
+        {
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(count));
+            Assert.That(issues.All(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentSame));
+        }
+
+        private void assertConcurrentDifferent(List<HitObject> hitobjects, int count = 1)
+        {
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(count));
+            Assert.That(issues.All(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentDifferent));
+        }
+
+        private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
+        {
+            return new Beatmap<HitObject>
+            {
+                HitObjects = hitobjects
+            };
+        }
+    }
+}

From b9e4f73f78fa5bf3cdacefdd10d3a186079913be Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 20:28:59 +0200
Subject: [PATCH 09514/10326] Add concurrent objects check to `BeatmapVerifier`

---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index aa3459a01a..6754d62a11 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -25,7 +25,8 @@ namespace osu.Game.Rulesets.Edit
             new CheckAudioQuality(),
 
             // Compose
-            new CheckUnsnaps()
+            new CheckUnsnaps(),
+            new CheckConcurrentObjects()
         };
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)

From ce258febf6de3ec3e3e1b53cdd240107ca46028c Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 20:32:44 +0200
Subject: [PATCH 09515/10326] Rename `CheckUnsnaps` -> `CheckUnsnappedObjects`

Will potentially have `CheckUnsnappedKiai` or similar later, so this is worth specifying.

Also consistent with `CheckConcurrentObjects`, which will likely have a `CheckConcurrentLines` later.
---
 ...UnsnapsTest.cs => CheckUnsnappedObjectsTest.cs} | 14 +++++++-------
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs          |  2 +-
 .../Rulesets/Edit/Checks/CheckConcurrentObjects.cs |  2 +-
 .../{CheckUnsnaps.cs => CheckUnsnappedObjects.cs}  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename osu.Game.Tests/Editing/Checks/{CheckUnsnapsTest.cs => CheckUnsnappedObjectsTest.cs} (93%)
 rename osu.Game/Rulesets/Edit/Checks/{CheckUnsnaps.cs => CheckUnsnappedObjects.cs} (98%)

diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
similarity index 93%
rename from osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
rename to osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
index bac3c41cb0..f8cac331bc 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
@@ -15,15 +15,15 @@ using osu.Game.Rulesets.Osu.Objects;
 namespace osu.Game.Tests.Editing.Checks
 {
     [TestFixture]
-    public class CheckUnsnapsTest
+    public class CheckUnsnappedObjectsTest
     {
-        private CheckUnsnaps check;
+        private CheckUnsnappedObjects check;
         private ControlPointInfo cpi;
 
         [SetUp]
         public void Setup()
         {
-            check = new CheckUnsnaps();
+            check = new CheckUnsnappedObjects();
 
             cpi = new ControlPointInfo();
             cpi.Add(100, new TimingControlPoint { BeatLength = 100 });
@@ -108,8 +108,8 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(2));
-            Assert.That(issues.Any(issue => issue.Template is CheckUnsnaps.IssueTemplate1MsOrMore));
-            Assert.That(issues.Any(issue => issue.Template is CheckUnsnaps.IssueTemplate2MsOrMore));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate1MsOrMore));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate2MsOrMore));
         }
 
         private Mock<Slider> getSliderMock(double startTime, double endTime, int repeats = 0)
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
-            Assert.That(issues.All(issue => issue.Template is CheckUnsnaps.IssueTemplate1MsOrMore));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate1MsOrMore));
         }
 
         private void assert2Ms(List<HitObject> hitobjects, int count = 1)
@@ -140,7 +140,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
-            Assert.That(issues.All(issue => issue.Template is CheckUnsnaps.IssueTemplate2MsOrMore));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate2MsOrMore));
         }
 
         private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 6754d62a11..2f7b7b0ab8 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Edit
             new CheckAudioQuality(),
 
             // Compose
-            new CheckUnsnaps(),
+            new CheckUnsnappedObjects(),
             new CheckConcurrentObjects()
         };
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index 7c41569fab..bcc8fead18 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Edit.Checks
     public class CheckConcurrentObjects : ICheck
     {
         // We guarantee that the objects are either treated as concurrent or unsnapped when near the same beat divisor.
-        private const double ms_leniency = CheckUnsnaps.UNSNAP_MS_THRESHOLD;
+        private const double ms_leniency = CheckUnsnappedObjects.UNSNAP_MS_THRESHOLD;
 
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Concurrent hitobjects");
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
similarity index 98%
rename from osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
rename to osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index 564ef13d8f..cdcf8a6b80 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Edit.Checks
 {
-    public class CheckUnsnaps : ICheck
+    public class CheckUnsnappedObjects : ICheck
     {
         public const double UNSNAP_MS_THRESHOLD = 2;
 

From 9ad30da72943d4bae44dc82e7438d8bb84e14ce0 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 26 Apr 2021 16:41:26 -0400
Subject: [PATCH 09516/10326] Show a notification if game is run as
 administrator

---
 osu.Desktop/OsuGameDesktop.cs  |  9 ++++++
 osu.Desktop/osu.Desktop.csproj |  1 +
 osu.Game/Admin/AdminChecker.cs | 57 ++++++++++++++++++++++++++++++++++
 osu.Game/OsuGame.cs            |  5 +++
 4 files changed, 72 insertions(+)
 create mode 100644 osu.Game/Admin/AdminChecker.cs

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 0c21c75290..1ce79b3b49 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Versioning;
+using System.Security.Principal;
 using System.Threading.Tasks;
 using Microsoft.Win32;
 using osu.Desktop.Overlays;
@@ -20,6 +21,7 @@ using osu.Game.Screens.Menu;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
 using osu.Framework.Threading;
+using osu.Game.Admin;
 using osu.Game.IO;
 
 namespace osu.Desktop
@@ -102,6 +104,8 @@ namespace osu.Desktop
             }
         }
 
+        protected override AdminChecker CreateAdminChecker() => new DesktopAdminChecker();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -180,5 +184,10 @@ namespace osu.Desktop
                 Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
             }
         }
+
+        private class DesktopAdminChecker : AdminChecker
+        {
+            protected override bool IsAdmin() => OperatingSystem.IsWindows() ? new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator) : Mono.Unix.Native.Syscall.geteuid() == 0;
+        }
     }
 }
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 3e0f0cb7f6..6bd0f64218 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -25,6 +25,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
+    <PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1-preview" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
diff --git a/osu.Game/Admin/AdminChecker.cs b/osu.Game/Admin/AdminChecker.cs
new file mode 100644
index 0000000000..b81e34653e
--- /dev/null
+++ b/osu.Game/Admin/AdminChecker.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 osu.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
+
+namespace osu.Game.Admin
+{
+    /// <summary>
+    /// Checks if the game is running with elevated privileges (as admin in Windows, root in Unix) and displays a warning notification if so.
+    /// </summary>
+    public class AdminChecker : CompositeDrawable
+    {
+        [Resolved]
+        protected NotificationOverlay Notifications { get; private set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            if (IsAdmin())
+                Notifications.Post(new AdminNotification());
+        }
+
+        protected virtual bool IsAdmin() => false;
+
+        private class AdminNotification : SimpleNotification
+        {
+            public override bool IsImportant => true;
+
+            public AdminNotification()
+            {
+                bool isUnix = RuntimeInfo.IsUnix;
+                Text = $"Running osu! as {(isUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game normally.";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours, NotificationOverlay notificationOverlay)
+            {
+                Icon = FontAwesome.Solid.ShieldAlt;
+                IconBackgound.Colour = colours.YellowDark;
+
+                Activated = delegate
+                {
+                    notificationOverlay.Hide();
+                    return true;
+                };
+            }
+        }
+    }
+
+
+}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 28f32ba455..358e85b247 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -28,6 +28,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
+using osu.Game.Admin;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Graphics;
@@ -450,6 +451,8 @@ namespace osu.Game
 
         protected virtual UpdateManager CreateUpdateManager() => new UpdateManager();
 
+        protected virtual AdminChecker CreateAdminChecker() => new AdminChecker();
+
         protected override Container CreateScalingContainer() => new ScalingContainer(ScalingMode.Everything);
 
         #region Beatmap progression
@@ -673,6 +676,8 @@ namespace osu.Game
             // dependency on notification overlay, dependent by settings overlay
             loadComponentSingleFile(CreateUpdateManager(), Add, true);
 
+            loadComponentSingleFile(CreateAdminChecker(), Add, false);
+
             // overlay elements
             loadComponentSingleFile(new ManageCollectionsDialog(), overlayContent.Add, true);
             loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);

From 0f0870c8b875451c2f7ce3e724fb63ee05b776ec Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 00:36:26 +0200
Subject: [PATCH 09517/10326] Sort objects by time in concurrent check test

---
 osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
index 0f771427ee..ffe5d34e67 100644
--- a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
@@ -101,8 +101,8 @@ namespace osu.Game.Tests.Editing.Checks
             var hitobjects = new List<HitObject>
             {
                 getSliderMock(startTime: 100, endTime: 400.75d).Object,
-                new HitCircle { StartTime = 300 },
-                getSliderMock(startTime: 200, endTime: 500.75d).Object
+                getSliderMock(startTime: 200, endTime: 500.75d).Object,
+                new HitCircle { StartTime = 300 }
             };
 
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();

From 6d5883abcb6293c54a362c7e765e07a8441b70fd Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 01:19:38 +0200
Subject: [PATCH 09518/10326] Return result of local variable instead

---
 osu.Game/Beatmaps/Beatmap.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 66b8f169ef..e3a11e2326 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -95,9 +95,8 @@ namespace osu.Game.Beatmaps
 
             int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
             double smallestUnsnap = divisors.Min(getUnsnap);
-            int closestDivisor = divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
 
-            return closestDivisor;
+            return divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
         }
 
         IBeatmap IBeatmap.Clone() => Clone();

From 217ff8238ea50abeea0ccb62319cd785a91d39f3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 01:23:03 +0200
Subject: [PATCH 09519/10326] Add snapping time comment

---
 osu.Game/Beatmaps/Beatmap.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index e3a11e2326..6515540527 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -81,6 +81,7 @@ namespace osu.Game.Beatmaps
             var beatLength = timingPoint.BeatLength / beatDivisor;
             var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
 
+            // Casting to int matches stable.
             return (int)(timingPoint.Time + beatLengths * beatLength);
         }
 

From a3c1b1fd52d1a74df5df536d05df6550852c9ab5 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 01:24:38 +0200
Subject: [PATCH 09520/10326] Fix accessibility of `areConcurrent`

---
 osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index bcc8fead18..6e8355024e 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
         }
 
-        protected bool areConcurrent(HitObject hitobject, HitObject nextHitobject) => nextHitobject.StartTime <= hitobject.GetEndTime() + ms_leniency;
+        private bool areConcurrent(HitObject hitobject, HitObject nextHitobject) => nextHitobject.StartTime <= hitobject.GetEndTime() + ms_leniency;
 
         public abstract class IssueTemplateConcurrent : IssueTemplate
         {

From 260dd06f4707f378ae2fd7a6fda4852d6160105a Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 26 Apr 2021 17:41:04 -0400
Subject: [PATCH 09521/10326] Move AdminChecker to osu.Desktop.Admin

---
 {osu.Game => osu.Desktop}/Admin/AdminChecker.cs | 13 ++++++-------
 osu.Desktop/OsuGameDesktop.cs                   | 12 +++---------
 osu.Game/OsuGame.cs                             |  5 -----
 3 files changed, 9 insertions(+), 21 deletions(-)
 rename {osu.Game => osu.Desktop}/Admin/AdminChecker.cs (75%)

diff --git a/osu.Game/Admin/AdminChecker.cs b/osu.Desktop/Admin/AdminChecker.cs
similarity index 75%
rename from osu.Game/Admin/AdminChecker.cs
rename to osu.Desktop/Admin/AdminChecker.cs
index b81e34653e..b9f0d68694 100644
--- a/osu.Game/Admin/AdminChecker.cs
+++ b/osu.Desktop/Admin/AdminChecker.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.Security.Principal;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
@@ -9,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 
-namespace osu.Game.Admin
+namespace osu.Desktop.Admin
 {
     /// <summary>
     /// Checks if the game is running with elevated privileges (as admin in Windows, root in Unix) and displays a warning notification if so.
@@ -22,11 +24,11 @@ namespace osu.Game.Admin
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            if (IsAdmin())
+            if (isAdmin())
                 Notifications.Post(new AdminNotification());
         }
 
-        protected virtual bool IsAdmin() => false;
+        private bool isAdmin() => OperatingSystem.IsWindows() ? new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator) : Mono.Unix.Native.Syscall.geteuid() == 0;
 
         private class AdminNotification : SimpleNotification
         {
@@ -34,8 +36,7 @@ namespace osu.Game.Admin
 
             public AdminNotification()
             {
-                bool isUnix = RuntimeInfo.IsUnix;
-                Text = $"Running osu! as {(isUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game normally.";
+                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game normally.";
             }
 
             [BackgroundDependencyLoader]
@@ -52,6 +53,4 @@ namespace osu.Game.Admin
             }
         }
     }
-
-
 }
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 1ce79b3b49..77f968e1b6 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -7,9 +7,9 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Versioning;
-using System.Security.Principal;
 using System.Threading.Tasks;
 using Microsoft.Win32;
+using osu.Desktop.Admin;
 using osu.Desktop.Overlays;
 using osu.Framework.Platform;
 using osu.Game;
@@ -21,7 +21,6 @@ using osu.Game.Screens.Menu;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
 using osu.Framework.Threading;
-using osu.Game.Admin;
 using osu.Game.IO;
 
 namespace osu.Desktop
@@ -104,8 +103,6 @@ namespace osu.Desktop
             }
         }
 
-        protected override AdminChecker CreateAdminChecker() => new DesktopAdminChecker();
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -117,6 +114,8 @@ namespace osu.Desktop
 
             if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
                 LoadComponentAsync(new GameplayWinKeyBlocker(), Add);
+
+            LoadComponentAsync(new AdminChecker(), Add);
         }
 
         protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)
@@ -184,10 +183,5 @@ namespace osu.Desktop
                 Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
             }
         }
-
-        private class DesktopAdminChecker : AdminChecker
-        {
-            protected override bool IsAdmin() => OperatingSystem.IsWindows() ? new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator) : Mono.Unix.Native.Syscall.geteuid() == 0;
-        }
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 358e85b247..28f32ba455 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -28,7 +28,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
-using osu.Game.Admin;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Graphics;
@@ -451,8 +450,6 @@ namespace osu.Game
 
         protected virtual UpdateManager CreateUpdateManager() => new UpdateManager();
 
-        protected virtual AdminChecker CreateAdminChecker() => new AdminChecker();
-
         protected override Container CreateScalingContainer() => new ScalingContainer(ScalingMode.Everything);
 
         #region Beatmap progression
@@ -676,8 +673,6 @@ namespace osu.Game
             // dependency on notification overlay, dependent by settings overlay
             loadComponentSingleFile(CreateUpdateManager(), Add, true);
 
-            loadComponentSingleFile(CreateAdminChecker(), Add, false);
-
             // overlay elements
             loadComponentSingleFile(new ManageCollectionsDialog(), overlayContent.Add, true);
             loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);

From 9e49ecb57311b3d8e83c9c8655cca8e13e0342bb Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 02:23:06 +0200
Subject: [PATCH 09522/10326] Remove unused `virtual` keywords

Added these in a previous iteration, where I had the mania variant inherit this class.

No longer necessary as `IHasColumn` was used to make this check more generic.
---
 osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index 6e8355024e..ddebe2923a 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -16,13 +16,13 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Concurrent hitobjects");
 
-        public virtual IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {
             new IssueTemplateConcurrentSame(this),
             new IssueTemplateConcurrentDifferent(this)
         };
 
-        public virtual IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
             for (int i = 0; i < playableBeatmap.HitObjects.Count - 1; ++i)
             {

From 7a6e9e5070b63d7b1563108f170ca676994e8b5f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 02:32:57 +0200
Subject: [PATCH 09523/10326] Change category of unsnap check to timing

Makes more sense, as this is typically the result of timing changes.
---
 osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index cdcf8a6b80..74a2ce2fd7 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         public const double UNSNAP_MS_THRESHOLD = 2;
 
-        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Unsnapped hitobjects");
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Timing, "Unsnapped hitobjects");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {

From c3bad1d4c599e43846c8f0e596b370bc082ef5ed Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 26 Apr 2021 21:05:18 -0400
Subject: [PATCH 09524/10326] Rename AdminChecker to ElevatedPrivilegesChecker,
 refactor elevated check

---
 ...hecker.cs => ElevatedPrivilegesChecker.cs} | 30 ++++++++++++++-----
 osu.Desktop/OsuGameDesktop.cs                 |  2 +-
 2 files changed, 23 insertions(+), 9 deletions(-)
 rename osu.Desktop/Admin/{AdminChecker.cs => ElevatedPrivilegesChecker.cs} (64%)

diff --git a/osu.Desktop/Admin/AdminChecker.cs b/osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
similarity index 64%
rename from osu.Desktop/Admin/AdminChecker.cs
rename to osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
index b9f0d68694..ea4aab0f85 100644
--- a/osu.Desktop/Admin/AdminChecker.cs
+++ b/osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
@@ -5,7 +5,7 @@ using System;
 using System.Security.Principal;
 using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
@@ -16,7 +16,7 @@ namespace osu.Desktop.Admin
     /// <summary>
     /// Checks if the game is running with elevated privileges (as admin in Windows, root in Unix) and displays a warning notification if so.
     /// </summary>
-    public class AdminChecker : CompositeDrawable
+    public class ElevatedPrivilegesChecker : Component
     {
         [Resolved]
         protected NotificationOverlay Notifications { get; private set; }
@@ -24,17 +24,31 @@ namespace osu.Desktop.Admin
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            if (isAdmin())
-                Notifications.Post(new AdminNotification());
+
+            bool elevated = false;
+
+            if (OperatingSystem.IsWindows())
+            {
+                var windowsIdentity = WindowsIdentity.GetCurrent();
+                var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
+                elevated = windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
+            }
+            else if (RuntimeInfo.IsUnix)
+            {
+                elevated = Mono.Unix.Native.Syscall.geteuid() == 0;
+            }
+
+            if (!elevated)
+                return;
+
+            Notifications.Post(new ElevatedPrivilegesNotification());
         }
 
-        private bool isAdmin() => OperatingSystem.IsWindows() ? new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator) : Mono.Unix.Native.Syscall.geteuid() == 0;
-
-        private class AdminNotification : SimpleNotification
+        private class ElevatedPrivilegesNotification : SimpleNotification
         {
             public override bool IsImportant => true;
 
-            public AdminNotification()
+            public ElevatedPrivilegesNotification()
             {
                 Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game normally.";
             }
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 77f968e1b6..9f7854779e 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -115,7 +115,7 @@ namespace osu.Desktop
             if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
                 LoadComponentAsync(new GameplayWinKeyBlocker(), Add);
 
-            LoadComponentAsync(new AdminChecker(), Add);
+            LoadComponentAsync(new ElevatedPrivilegesChecker(), Add);
         }
 
         protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)

From a2723f3f579565b2aca0e1c6159362838c9c559b Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 26 Apr 2021 22:37:08 -0400
Subject: [PATCH 09525/10326] Perform elevated check asynchronously, use a
 separate function w/ switch statement

---
 osu.Desktop/OsuGameDesktop.cs                 |  2 +-
 .../ElevatedPrivilegesChecker.cs              | 48 +++++++++++++------
 osu.Desktop/osu.Desktop.csproj                |  2 +-
 3 files changed, 35 insertions(+), 17 deletions(-)
 rename osu.Desktop/{Admin => Security}/ElevatedPrivilegesChecker.cs (66%)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 9f7854779e..4a28ab3722 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -9,7 +9,7 @@ using System.Reflection;
 using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using Microsoft.Win32;
-using osu.Desktop.Admin;
+using osu.Desktop.Security;
 using osu.Desktop.Overlays;
 using osu.Framework.Platform;
 using osu.Game;
diff --git a/osu.Desktop/Admin/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
similarity index 66%
rename from osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
rename to osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index ea4aab0f85..a719dbf952 100644
--- a/osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 
-namespace osu.Desktop.Admin
+namespace osu.Desktop.Security
 {
     /// <summary>
     /// Checks if the game is running with elevated privileges (as admin in Windows, root in Unix) and displays a warning notification if so.
@@ -21,36 +21,54 @@ namespace osu.Desktop.Admin
         [Resolved]
         protected NotificationOverlay Notifications { get; private set; }
 
+        private bool elevated;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            bool elevated = false;
-
-            if (OperatingSystem.IsWindows())
-            {
-                var windowsIdentity = WindowsIdentity.GetCurrent();
-                var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
-                elevated = windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
-            }
-            else if (RuntimeInfo.IsUnix)
-            {
-                elevated = Mono.Unix.Native.Syscall.geteuid() == 0;
-            }
-
             if (!elevated)
                 return;
 
             Notifications.Post(new ElevatedPrivilegesNotification());
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            elevated = isElevated();
+        }
+
+        private bool isElevated()
+        {
+            switch (RuntimeInfo.OS)
+            {
+                case RuntimeInfo.Platform.Windows:
+                {
+                    if (!OperatingSystem.IsWindows()) return false;
+
+                    var windowsIdentity = WindowsIdentity.GetCurrent();
+                    var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
+
+                    return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
+                }
+
+                case RuntimeInfo.Platform.macOS:
+                case RuntimeInfo.Platform.Linux:
+                    return Mono.Unix.Native.Syscall.geteuid() == 0;
+
+                default:
+                    return false;
+            }
+        }
+
         private class ElevatedPrivilegesNotification : SimpleNotification
         {
             public override bool IsImportant => true;
 
             public ElevatedPrivilegesNotification()
             {
-                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game normally.";
+                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game as a normal user.";
             }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 6bd0f64218..ad5c323e9b 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
-    <PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1-preview" />
+    <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />

From e0f54f58424f6fc77d79fe12ef6f6a511e4b6f71 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 26 Apr 2021 22:51:03 -0400
Subject: [PATCH 09526/10326] Move load() before LoadComplete()

---
 osu.Desktop/Security/ElevatedPrivilegesChecker.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index a719dbf952..5fb8263516 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -23,6 +23,12 @@ namespace osu.Desktop.Security
 
         private bool elevated;
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            elevated = isElevated();
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -33,12 +39,6 @@ namespace osu.Desktop.Security
             Notifications.Post(new ElevatedPrivilegesNotification());
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            elevated = isElevated();
-        }
-
         private bool isElevated()
         {
             switch (RuntimeInfo.OS)

From 5a3fbef5ace66e56b2f5312aacf74a4e2ff26793 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Tue, 27 Apr 2021 00:23:08 -0400
Subject: [PATCH 09527/10326] Use a try-catch, notification activation does
 nothing

---
 .../Security/ElevatedPrivilegesChecker.cs     | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index 5fb8263516..47705eb929 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -19,7 +19,7 @@ namespace osu.Desktop.Security
     public class ElevatedPrivilegesChecker : Component
     {
         [Resolved]
-        protected NotificationOverlay Notifications { get; private set; }
+        private NotificationOverlay notifications { get; set; }
 
         private bool elevated;
 
@@ -33,32 +33,35 @@ namespace osu.Desktop.Security
         {
             base.LoadComplete();
 
-            if (!elevated)
-                return;
-
-            Notifications.Post(new ElevatedPrivilegesNotification());
+            if (elevated)
+                notifications.Post(new ElevatedPrivilegesNotification());
         }
 
         private bool isElevated()
         {
-            switch (RuntimeInfo.OS)
+            try
             {
-                case RuntimeInfo.Platform.Windows:
+                switch (RuntimeInfo.OS)
                 {
-                    if (!OperatingSystem.IsWindows()) return false;
+                    case RuntimeInfo.Platform.Windows:
+                        if (!OperatingSystem.IsWindows()) return false;
 
-                    var windowsIdentity = WindowsIdentity.GetCurrent();
-                    var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
+                        var windowsIdentity = WindowsIdentity.GetCurrent();
+                        var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
 
-                    return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
+                        return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
+
+                    case RuntimeInfo.Platform.macOS:
+                    case RuntimeInfo.Platform.Linux:
+                        return Mono.Unix.Native.Syscall.geteuid() == 0;
+
+                    default:
+                        return false;
                 }
-
-                case RuntimeInfo.Platform.macOS:
-                case RuntimeInfo.Platform.Linux:
-                    return Mono.Unix.Native.Syscall.geteuid() == 0;
-
-                default:
-                    return false;
+            }
+            catch
+            {
+                return false;
             }
         }
 
@@ -77,11 +80,7 @@ namespace osu.Desktop.Security
                 Icon = FontAwesome.Solid.ShieldAlt;
                 IconBackgound.Colour = colours.YellowDark;
 
-                Activated = delegate
-                {
-                    notificationOverlay.Hide();
-                    return true;
-                };
+                Activated = () => true;
             }
         }
     }

From ec1c336b0aca43376e853e0a4d0826368924a95d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 13:23:14 +0900
Subject: [PATCH 09528/10326] Fix a couple of inspections

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs       | 2 +-
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs                  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 77ea3b05dc..8b20df9a68 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -207,7 +207,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             var lastPiece = controlPointVisualiser.Pieces.Single(p => p.ControlPoint == last);
 
             lastPoint = last;
-            return lastPiece?.IsHovered != true;
+            return lastPiece.IsHovered != true;
         }
 
         private void updateSlider()
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 99cdca045b..337a806b6e 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -35,9 +34,6 @@ namespace osu.Game.Rulesets.Edit
         public override bool HandlePositionalInput => ShouldBeAlive;
         public override bool RemoveWhenNotAlive => false;
 
-        [Resolved(CanBeNull = true)]
-        private HitObjectComposer composer { get; set; }
-
         protected SelectionBlueprint(HitObject hitObject)
         {
             HitObject = hitObject;

From 7980d16b4c202bcb063c0569112ad76463e8a9c6 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 14:26:12 +0900
Subject: [PATCH 09529/10326] Add failing test showing the issue of DHO
 lifetime

---
 .../Gameplay/TestSceneDrawableHitObject.cs    | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
new file mode 100644
index 0000000000..d42802db91
--- /dev/null
+++ b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
@@ -0,0 +1,62 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Gameplay
+{
+    [HeadlessTest]
+    public class TestSceneDrawableHitObject : OsuTestScene
+    {
+        [Test]
+        public void TestEntryLifetime()
+        {
+            TestDrawableHitObject dho = null;
+            var initialHitObject = new HitObject
+            {
+                StartTime = 1000
+            };
+            var entry = new TestLifetimeEntry(new HitObject
+            {
+                StartTime = 2000
+            });
+
+            AddStep("Create DHO", () => Child = dho = new TestDrawableHitObject(initialHitObject));
+
+            AddAssert("Correct initial lifetime", () => dho.LifetimeStart == initialHitObject.StartTime - TestDrawableHitObject.INITIAL_LIFETIME_OFFSET);
+
+            AddStep("Apply entry", () => dho.Apply(entry));
+
+            AddAssert("Correct initial lifetime", () => dho.LifetimeStart == entry.HitObject.StartTime - TestLifetimeEntry.INITIAL_LIFETIME_OFFSET);
+
+            AddStep("Set lifetime", () => dho.LifetimeEnd = 3000);
+            AddAssert("Entry lifetime is updated", () => entry.LifetimeEnd == 3000);
+        }
+
+        private class TestDrawableHitObject : DrawableHitObject
+        {
+            public const double INITIAL_LIFETIME_OFFSET = 100;
+            protected override double InitialLifetimeOffset => INITIAL_LIFETIME_OFFSET;
+
+            public TestDrawableHitObject(HitObject hitObject)
+                : base(hitObject)
+            {
+            }
+        }
+
+        private class TestLifetimeEntry : HitObjectLifetimeEntry
+        {
+            public const double INITIAL_LIFETIME_OFFSET = 200;
+            protected override double InitialLifetimeOffset => INITIAL_LIFETIME_OFFSET;
+
+            public TestLifetimeEntry(HitObject hitObject)
+                : base(hitObject)
+            {
+            }
+        }
+    }
+}

From 2303d108bb56b8214c788c18b59424d3fe69858e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 14:35:14 +0900
Subject: [PATCH 09530/10326] Simplify false return path

---
 osu.Desktop/Security/ElevatedPrivilegesChecker.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index 47705eb929..92885ad855 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -54,15 +54,13 @@ namespace osu.Desktop.Security
                     case RuntimeInfo.Platform.macOS:
                     case RuntimeInfo.Platform.Linux:
                         return Mono.Unix.Native.Syscall.geteuid() == 0;
-
-                    default:
-                        return false;
                 }
             }
             catch
             {
-                return false;
             }
+
+            return false;
         }
 
         private class ElevatedPrivilegesNotification : SimpleNotification

From 13de571b3c690b2def91c4331b3b70bff00c4719 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 14:35:57 +0900
Subject: [PATCH 09531/10326] Rename private method

---
 osu.Desktop/Security/ElevatedPrivilegesChecker.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index 92885ad855..82e7d2a141 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -26,7 +26,7 @@ namespace osu.Desktop.Security
         [BackgroundDependencyLoader]
         private void load()
         {
-            elevated = isElevated();
+            elevated = checkElevated();
         }
 
         protected override void LoadComplete()
@@ -37,7 +37,7 @@ namespace osu.Desktop.Security
                 notifications.Post(new ElevatedPrivilegesNotification());
         }
 
-        private bool isElevated()
+        private bool checkElevated()
         {
             try
             {

From 2673cd3d9935025232453d9b371d516bc6b7de8b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 14:36:11 +0900
Subject: [PATCH 09532/10326] Remove unnecessary noop action

---
 osu.Desktop/Security/ElevatedPrivilegesChecker.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index 82e7d2a141..edd4906421 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -77,8 +77,6 @@ namespace osu.Desktop.Security
             {
                 Icon = FontAwesome.Solid.ShieldAlt;
                 IconBackgound.Colour = colours.YellowDark;
-
-                Activated = () => true;
             }
         }
     }

From dbcb1259e2c07a726b8be0b1d12aca362c43df7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 14:38:19 +0900
Subject: [PATCH 09533/10326] Add a note about elevated privileges also
 breaking integrations

---
 osu.Desktop/Security/ElevatedPrivilegesChecker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index edd4906421..01458b4c37 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -69,7 +69,7 @@ namespace osu.Desktop.Security
 
             public ElevatedPrivilegesNotification()
             {
-                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game as a normal user.";
+                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance, may break integrations and poses a security risk. Please run the game as a normal user.";
             }
 
             [BackgroundDependencyLoader]

From a2c0951d94102cee2660e65412ffb4c4850114f1 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 15:23:33 +0900
Subject: [PATCH 09534/10326] Use overriding instead of hiding in
 HitObjectLifetimeEntry

Hidden properties are used when the type is the base class. It caused issues when `DrawableHitObject` logic is factored out to `PoolableDrawableWithLifetime` because it is using the base `LifetimeEntry`, not `HitObjectLifetimeEntry`.
---
 .../Objects/Drawables/DrawableHitObject.cs    |  5 ++-
 .../Objects/HitObjectLifetimeEntry.cs         | 41 +++++--------------
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 7739994527..6431ec8980 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Threading;
 using osu.Game.Audio;
@@ -431,7 +432,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         /// <summary>
         /// Apply (generally fade-in) transforms leading into the <see cref="HitObject"/> start time.
-        /// The local drawable hierarchy is recursively delayed to <see cref="HitObjectLifetimeEntry.LifetimeStart"/> for convenience.
+        /// The local drawable hierarchy is recursively delayed to <see cref="LifetimeEntry.LifetimeStart"/> for convenience.
         ///
         /// By default this will fade in the object from zero with no duration.
         /// </summary>
@@ -613,7 +614,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <remarks>
         /// This is only used as an optimisation to delay the initial update of this <see cref="DrawableHitObject"/> and may be tuned more aggressively if required.
         /// It is indirectly used to decide the automatic transform offset provided to <see cref="UpdateInitialTransforms"/>.
-        /// A more accurate <see cref="HitObjectLifetimeEntry.LifetimeStart"/> should be set for further optimisation (in <see cref="LoadComplete"/>, for example).
+        /// A more accurate <see cref="LifetimeEntry.LifetimeStart"/> should be set for further optimisation (in <see cref="LoadComplete"/>, for example).
         /// <para>
         /// Only has an effect if this <see cref="DrawableHitObject"/> is not being pooled.
         /// For pooled <see cref="DrawableHitObject"/>s, use <see cref="HitObjectLifetimeEntry.InitialLifetimeOffset"/> instead.
diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 1954d7e6d2..23e991d00e 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -38,40 +38,19 @@ namespace osu.Game.Rulesets.Objects
             startTimeBindable.BindValueChanged(onStartTimeChanged, true);
         }
 
-        // The lifetime start, as set by the hitobject.
+        // The lifetime, as set by the hitobject.
         private double realLifetimeStart = double.MinValue;
-
-        /// <summary>
-        /// The time at which the <see cref="HitObject"/> should become alive.
-        /// </summary>
-        public new double LifetimeStart
-        {
-            get => realLifetimeStart;
-            set => setLifetime(realLifetimeStart = value, LifetimeEnd);
-        }
-
-        // The lifetime end, as set by the hitobject.
         private double realLifetimeEnd = double.MaxValue;
 
-        /// <summary>
-        /// The time at which the <see cref="HitObject"/> should become dead.
-        /// </summary>
-        public new double LifetimeEnd
+        public override void SetLifetime(double start, double end)
         {
-            get => realLifetimeEnd;
-            set => setLifetime(LifetimeStart, realLifetimeEnd = value);
-        }
+            realLifetimeStart = start;
+            realLifetimeEnd = end;
 
-        private void setLifetime(double start, double end)
-        {
             if (keepAlive)
-            {
-                start = double.MinValue;
-                end = double.MaxValue;
-            }
-
-            base.LifetimeStart = start;
-            base.LifetimeEnd = end;
+                base.SetLifetime(double.MinValue, double.MaxValue);
+            else
+                base.SetLifetime(start, end);
         }
 
         private bool keepAlive;
@@ -87,7 +66,7 @@ namespace osu.Game.Rulesets.Objects
                     return;
 
                 keepAlive = value;
-                setLifetime(realLifetimeStart, realLifetimeEnd);
+                SetLifetime(realLifetimeStart, realLifetimeEnd);
             }
         }
 
@@ -98,12 +77,12 @@ namespace osu.Game.Rulesets.Objects
         /// <remarks>
         /// This is only used as an optimisation to delay the initial update of the <see cref="HitObject"/> and may be tuned more aggressively if required.
         /// It is indirectly used to decide the automatic transform offset provided to <see cref="DrawableHitObject.UpdateInitialTransforms"/>.
-        /// A more accurate <see cref="LifetimeStart"/> should be set for further optimisation (in <see cref="DrawableHitObject.LoadComplete"/>, for example).
+        /// A more accurate <see cref="LifetimeEntry.LifetimeStart"/> should be set for further optimisation (in <see cref="DrawableHitObject.LoadComplete"/>, for example).
         /// </remarks>
         protected virtual double InitialLifetimeOffset => 10000;
 
         /// <summary>
-        /// Resets <see cref="LifetimeStart"/> according to the change in start time of the <see cref="HitObject"/>.
+        /// Resets <see cref="LifetimeEntry.LifetimeStart"/> according to the change in start time of the <see cref="HitObject"/>.
         /// </summary>
         private void onStartTimeChanged(ValueChangedEvent<double> startTime) => LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
     }

From c9e6ca537896fd7a099d2b4a4338b1ecfcda9001 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 15:24:52 +0900
Subject: [PATCH 09535/10326] Use now-public Entry.SetLifetime method

---
 .../Objects/Pooling/PoolableDrawableWithLifetime.cs         | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 93e476be76..049ff9d446 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -100,11 +100,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
             base.LifetimeStart = start;
             base.LifetimeEnd = end;
 
-            if (Entry != null)
-            {
-                Entry.LifetimeStart = start;
-                Entry.LifetimeEnd = end;
-            }
+            Entry?.SetLifetime(start, end);
         }
 
         private void free()

From b75b9a97edfcf27dd2d47dfa95cb34a1a159ae04 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 14:09:58 +0700
Subject: [PATCH 09536/10326] add OsuMarkdownContainer

All of the markdown file in osu-wiki have YAML frontmatter. This YAML is
parsed as common markdown paragraph. So we add `UseYamlFrontMatter()` in
markdown pipeline builder to parse YAML as `YamlFrontMatterBlock`.
---
 .../Markdown/OsuMarkdownContainer.cs          | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
new file mode 100644
index 0000000000..589c27f0a0
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.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 Markdig;
+using Markdig.Extensions.AutoIdentifiers;
+using Markdig.Extensions.Yaml;
+using Markdig.Syntax;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Containers.Markdown;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownContainer : MarkdownContainer
+    {
+        protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)
+        {
+            switch (markdownObject)
+            {
+                case YamlFrontMatterBlock _:
+                    // Don't parse YAML Frontmatter
+                    break;
+
+                default:
+                    base.AddMarkdownComponent(markdownObject, container, level);
+                    break;
+            }
+        }
+
+        protected override MarkdownPipeline CreateBuilder()
+            => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
+                                            .UseEmojiAndSmiley()
+                                            .UseYamlFrontMatter()
+                                            .UseAdvancedExtensions().Build();
+    }
+}

From aa07482cbb2f48a193e9afd1dda3ccbea2140170 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 14:15:19 +0700
Subject: [PATCH 09537/10326] Add OsuMarkdownLinkText

Color from
https://github.com/ppy/osu-web/blob/d56352aeefc412507c3dab7c16e3e3118421b436/resources/assets/less/functions.less#L159-L165
---
 .../Markdown/OsuMarkdownLinkText.cs           | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
new file mode 100644
index 0000000000..39b35fd84b
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.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 Markdig.Syntax.Inlines;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownLinkText : MarkdownLinkText
+    {
+        private SpriteText spriteText;
+
+        public OsuMarkdownLinkText(string text, LinkInline linkInline)
+            : base(text, linkInline)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            spriteText.Colour = colourProvider.Light2;
+        }
+
+        public override SpriteText CreateSpriteText()
+        {
+            return spriteText = base.CreateSpriteText();
+        }
+    }
+}

From c686c5224bdd8050f45c25fcf511dee0ac06f96a Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 14:17:51 +0700
Subject: [PATCH 09538/10326] add OsuMarkdownTextFlowContainer

---
 .../Markdown/OsuMarkdownTextFlowContainer.cs       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
new file mode 100644
index 0000000000..7a6818b4c2
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -0,0 +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 Markdig.Syntax.Inlines;
+using osu.Framework.Graphics.Containers.Markdown;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownTextFlowContainer : MarkdownTextFlowContainer
+    {
+        protected override void AddLinkText(string text, LinkInline linkInline)
+            => AddDrawable(new OsuMarkdownLinkText(text, linkInline));
+    }
+}

From 6cccbabad83cd5743d51f63c088db7d68ecf3cf5 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 14:19:16 +0700
Subject: [PATCH 09539/10326] override CreateTextFlow in OsuMarkdownContainer

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 589c27f0a0..fc7ced8ea7 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownContainer : MarkdownContainer
     {
+        public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
+
         protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)
         {
             switch (markdownObject)

From 65aa01866ee8fb6d14ef78ce3873e7bbad4692a8 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 14:38:21 +0700
Subject: [PATCH 09540/10326] add test scene for OsuMarkdownContainer

---
 .../TestSceneOsuMarkdownContainer.cs          | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
new file mode 100644
index 0000000000..9352404c07
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers.Markdown;
+using osu.Game.Overlays;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneOsuMarkdownContainer : OsuTestScene
+    {
+        private OsuMarkdownContainer markdownContainer;
+
+        [Cached]
+        private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Orange);
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = overlayColour.Background5,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new BasicScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding(20),
+                    Child = markdownContainer = new OsuMarkdownContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y
+                    }
+                }
+            };
+        });
+
+        [Test]
+        public void TestLink()
+        {
+            AddStep("Add Link", () =>
+            {
+                markdownContainer.Text = "[Welcome to osu!](https://osu.ppy.sh)";
+            });
+        }
+    }
+}

From 3899e500d3edf2b15622ed4e5ace339ab68fbdc0 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 17:54:18 +0900
Subject: [PATCH 09541/10326] Adopt framework change of LifetimeEntry

Override SetLifetimeStart/SetLifetimeEnd separately to track individual assignment. It is necessary to ensure real lifetime is not lost when lifetime is partially updated.
---
 .../Rulesets/Objects/HitObjectLifetimeEntry.cs    | 15 +++++++++++++--
 .../Pooling/PoolableDrawableWithLifetime.cs       |  6 +++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 23e991d00e..0181d6241b 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -42,11 +42,22 @@ namespace osu.Game.Rulesets.Objects
         private double realLifetimeStart = double.MinValue;
         private double realLifetimeEnd = double.MaxValue;
 
-        public override void SetLifetime(double start, double end)
+        // This method is called even if `start == LifetimeStart` when `KeepAlive` is true (necessary to update `realLifetimeStart`).
+        protected override void SetLifetimeStart(double start)
         {
+            // This assignment cannot be done in `SetLifetime` because otherwise setting only `LifetimeStart` will make `realLifetimeEnd` to be lost.
             realLifetimeStart = start;
-            realLifetimeEnd = end;
+            base.SetLifetimeStart(start);
+        }
 
+        protected override void SetLifetimeEnd(double end)
+        {
+            realLifetimeEnd = end;
+            base.SetLifetimeEnd(end);
+        }
+
+        protected override void SetLifetime(double start, double end)
+        {
             if (keepAlive)
                 base.SetLifetime(double.MinValue, double.MaxValue);
             else
diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 049ff9d446..93e476be76 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -100,7 +100,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             base.LifetimeStart = start;
             base.LifetimeEnd = end;
 
-            Entry?.SetLifetime(start, end);
+            if (Entry != null)
+            {
+                Entry.LifetimeStart = start;
+                Entry.LifetimeEnd = end;
+            }
         }
 
         private void free()

From 6959f2a8ccf182d2362553806f5e687a216237cd Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 16:01:32 +0700
Subject: [PATCH 09542/10326] add OsuMarkdownFencedCodeBlock

Reference :
https://github.com/ppy/osu-web/blob/d56352aeefc412507c3dab7c16e3e3118421b436/resources/assets/less/bem/osu-md.less#L41-L45
---
 .../TestSceneOsuMarkdownContainer.cs          | 13 ++++++
 .../Markdown/OsuMarkdownContainer.cs          |  6 ++-
 .../Markdown/OsuMarkdownFencedCodeBlock.cs    | 44 +++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 9352404c07..3d782ee184 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -49,5 +49,18 @@ namespace osu.Game.Tests.Visual.UserInterface
                 markdownContainer.Text = "[Welcome to osu!](https://osu.ppy.sh)";
             });
         }
+
+        [Test]
+        public void TestFencedCodeBlock()
+        {
+            AddStep("Add Code Block", () =>
+            {
+                markdownContainer.Text = @"```markdown
+# Markdown code block
+
+This is markdown code block.
+```";
+            });
+        }
     }
 }
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index fc7ced8ea7..95f538eab7 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -12,8 +12,6 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownContainer : MarkdownContainer
     {
-        public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
-
         protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)
         {
             switch (markdownObject)
@@ -28,6 +26,10 @@ namespace osu.Game.Graphics.Containers.Markdown
             }
         }
 
+        public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
+
+        protected override MarkdownFencedCodeBlock CreateFencedCodeBlock(FencedCodeBlock fencedCodeBlock) => new OsuMarkdownFencedCodeBlock(fencedCodeBlock);
+
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
                                             .UseEmojiAndSmiley()
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
new file mode 100644
index 0000000000..ddd88dd915
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.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 Markdig.Syntax;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Overlays;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownFencedCodeBlock : MarkdownFencedCodeBlock
+    {
+        private Box background;
+        private MarkdownTextFlowContainer textFlow;
+
+        public OsuMarkdownFencedCodeBlock(FencedCodeBlock fencedCodeBlock)
+            : base(fencedCodeBlock)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            // TODO : Change to monospace font to match with osu-web
+            background.Colour = colourProvider.Background6;
+            textFlow.Colour = colourProvider.Light1;
+        }
+
+        protected override Drawable CreateBackground()
+        {
+            return background = new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+            };
+        }
+
+        public override MarkdownTextFlowContainer CreateTextFlow()
+        {
+            return textFlow = base.CreateTextFlow();
+        }
+    }
+}

From 003553aba32d5af6a9decf2a7f2b8c307857ac9b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 18:10:44 +0900
Subject: [PATCH 09543/10326] Add test of HitObjectLifetimeEntry.KeepAlive
 behavior

---
 .../Gameplay/TestSceneDrawableHitObject.cs    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
index d42802db91..2e3f192f1b 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
@@ -37,6 +37,38 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("Entry lifetime is updated", () => entry.LifetimeEnd == 3000);
         }
 
+        [Test]
+        public void TestKeepAlive()
+        {
+            TestDrawableHitObject dho = null;
+            TestLifetimeEntry entry = null;
+            AddStep("Create DHO", () =>
+            {
+                dho = new TestDrawableHitObject(null);
+                dho.Apply(entry = new TestLifetimeEntry(new HitObject())
+                {
+                    LifetimeStart = 0,
+                    LifetimeEnd = 1000,
+                });
+                Child = dho;
+            });
+
+            AddStep("KeepAlive = true", () => entry.KeepAlive = true);
+            AddAssert("Lifetime is overriden", () => entry.LifetimeStart == double.MinValue && entry.LifetimeEnd == double.MaxValue);
+
+            AddStep("Set LifetimeStart", () => dho.LifetimeStart = 500);
+            AddStep("KeepAlive = false", () => entry.KeepAlive = false);
+            AddAssert("Lifetime is correct", () => entry.LifetimeStart == 500 && entry.LifetimeEnd == 1000);
+
+            AddStep("Set LifetimeStart while KeepAlive", () =>
+            {
+                entry.KeepAlive = true;
+                dho.LifetimeStart = double.MinValue;
+                entry.KeepAlive = false;
+            });
+            AddAssert("Lifetime is changed", () => entry.LifetimeStart == double.MinValue && entry.LifetimeEnd == 1000);
+        }
+
         private class TestDrawableHitObject : DrawableHitObject
         {
             public const double INITIAL_LIFETIME_OFFSET = 100;

From 3ea55314f2f11c53dc2232e4152beacf7dc7f779 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Tue, 27 Apr 2021 11:29:16 +0200
Subject: [PATCH 09544/10326] Update
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 679c86072b..e715e4aac6 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -430,9 +430,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         }
 
         /// <summary>
-        /// Removes all previously applied transforms, then reapplies a new set of transforms with potentially different parameters.
-        /// The transforms will use the current <see cref="ArmedState"/>, and they will use the appropriate start times.
-        /// This also takes in account potential overrides defined in <see cref="ApplyCustomUpdateState"/>.
+        /// Reapplies the current <see cref="ArmedState"/>.
         /// </summary>
         protected void RefreshStateTransforms() => updateState(State.Value, true);
 

From f2e56bd3060438b70105e0cdb4a630f43ea31151 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 15:40:35 +0900
Subject: [PATCH 09545/10326] Refactor editor selection/blueprint components to
 be generic

---
 .../Edit/ManiaBlueprintContainer.cs           |   3 +-
 .../Edit/ManiaSelectionHandler.cs             |   7 +-
 .../Edit/Blueprints/OsuSelectionBlueprint.cs  |   2 +-
 .../Edit/OsuBlueprintContainer.cs             |   3 +-
 .../Edit/OsuHitObjectComposer.cs              |   2 +-
 .../Edit/OsuSelectionHandler.cs               |   4 +-
 .../Edit/TaikoBlueprintContainer.cs           |   3 +-
 .../Edit/TaikoSelectionHandler.cs             |  11 +-
 .../Editing/TestSceneBlueprintSelection.cs    |   4 +-
 .../Editing/TestSceneEditorClipboard.cs       |   8 +-
 .../Editing/TestSceneEditorSelection.cs       |   6 +-
 .../Edit/OverlaySelectionBlueprint.cs         |   3 +-
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs  |  17 +-
 .../Compose/Components/BlueprintContainer.cs  | 211 +++++----------
 .../Components/ComposeBlueprintContainer.cs   |  12 +-
 .../Components/EditorBlueprintContainer.cs    | 176 +++++++++++++
 .../Components/EditorSelectionHandler.cs      | 233 +++++++++++++++++
 .../HitObjectOrderedSelectionContainer.cs     |  24 +-
 .../Compose/Components/MoveSelectionEvent.cs  |   8 +-
 .../Compose/Components/SelectionHandler.cs    | 247 ++----------------
 .../Timeline/TimelineBlueprintContainer.cs    |  31 +--
 .../Timeline/TimelineHitObjectBlueprint.cs    |  22 +-
 22 files changed, 588 insertions(+), 449 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
index 2fa3f378ff..c4429176d1 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
@@ -4,6 +4,7 @@
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -30,6 +31,6 @@ namespace osu.Game.Rulesets.Mania.Edit
             return base.CreateBlueprintFor(hitObject);
         }
 
-        protected override SelectionHandler CreateSelectionHandler() => new ManiaSelectionHandler();
+        protected override SelectionHandler<HitObject> CreateSelectionHandler() => new ManiaSelectionHandler();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 2689ed4112..dd059c967c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -7,12 +7,13 @@ using osu.Framework.Allocation;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    public class ManiaSelectionHandler : SelectionHandler
+    public class ManiaSelectionHandler : EditorSelectionHandler
     {
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
@@ -20,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         [Resolved]
         private HitObjectComposer composer { get; set; }
 
-        public override bool HandleMovement(MoveSelectionEvent moveEvent)
+        public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent)
         {
             var maniaBlueprint = (ManiaSelectionBlueprint)moveEvent.Blueprint;
             int lastColumn = maniaBlueprint.DrawableObject.HitObject.Column;
@@ -30,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             return true;
         }
 
-        private void performColumnMovement(int lastColumn, MoveSelectionEvent moveEvent)
+        private void performColumnMovement(int lastColumn, MoveSelectionEvent<HitObject> moveEvent)
         {
             var maniaPlayfield = ((ManiaHitObjectComposer)composer).Playfield;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
index 8dd550bb96..299f8fc43a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
     public abstract class OsuSelectionBlueprint<T> : OverlaySelectionBlueprint
         where T : OsuHitObject
     {
-        protected new T HitObject => (T)DrawableObject.HitObject;
+        protected T HitObject => (T)DrawableObject.HitObject;
 
         protected override bool AlwaysShowWhenSelected => true;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
index a68ed34e6b..abac5eb56e 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
@@ -18,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        protected override SelectionHandler CreateSelectionHandler() => new OsuSelectionHandler();
+        protected override SelectionHandler<HitObject> CreateSelectionHandler() => new OsuSelectionHandler();
 
         public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
         {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 7b67d7aaf1..806b7e6051 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                 if (b.IsSelected)
                     continue;
 
-                var hitObject = (OsuHitObject)b.HitObject;
+                var hitObject = (OsuHitObject)b.Item;
 
                 Vector2? snap = checkSnap(hitObject.Position);
                 if (snap == null && hitObject.Position != hitObject.EndPosition)
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index de0a4682a3..92f5254182 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class OsuSelectionHandler : SelectionHandler
+    public class OsuSelectionHandler : EditorSelectionHandler
     {
         protected override void OnSelectionChanged()
         {
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             referencePathTypes = null;
         }
 
-        public override bool HandleMovement(MoveSelectionEvent moveEvent)
+        public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent)
         {
             var hitObjects = selectedMovableObjects;
 
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
index 8b41448c9d..b1b08a9461 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -15,7 +16,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
         {
         }
 
-        protected override SelectionHandler CreateSelectionHandler() => new TaikoSelectionHandler();
+        protected override SelectionHandler<HitObject> CreateSelectionHandler() => new TaikoSelectionHandler();
 
         public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) =>
             new TaikoSelectionBlueprint(hitObject);
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index ac2dd4bdb6..20366e5b3a 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -8,12 +8,13 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Taiko.Edit
 {
-    public class TaikoSelectionHandler : SelectionHandler
+    public class TaikoSelectionHandler : EditorSelectionHandler
     {
         private readonly Bindable<TernaryState> selectionRimState = new Bindable<TernaryState>();
         private readonly Bindable<TernaryState> selectionStrongState = new Bindable<TernaryState>();
@@ -72,16 +73,16 @@ namespace osu.Game.Rulesets.Taiko.Edit
             });
         }
 
-        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)
         {
-            if (selection.All(s => s.HitObject is Hit))
+            if (selection.All(s => s.Item is Hit))
                 yield return new TernaryStateMenuItem("Rim") { State = { BindTarget = selectionRimState } };
 
-            if (selection.All(s => s.HitObject is TaikoHitObject))
+            if (selection.All(s => s.Item is TaikoHitObject))
                 yield return new TernaryStateMenuItem("Strong") { State = { BindTarget = selectionStrongState } };
         }
 
-        public override bool HandleMovement(MoveSelectionEvent moveEvent) => true;
+        public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent) => true;
 
         protected override void UpdateTernaryStates()
         {
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs
index fd9c09fd5f..976bf93c15 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs
@@ -23,8 +23,8 @@ namespace osu.Game.Tests.Visual.Editing
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
 
-        private BlueprintContainer blueprintContainer
-            => Editor.ChildrenOfType<BlueprintContainer>().First();
+        private EditorBlueprintContainer blueprintContainer
+            => Editor.ChildrenOfType<EditorBlueprintContainer>().First();
 
         [Test]
         public void TestSelectedObjectHasPriorityWhenOverlapping()
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
index 01d9966736..3a063af843 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -132,8 +132,8 @@ namespace osu.Game.Tests.Visual.Editing
             {
                 AddStep("deselect", () => EditorBeatmap.SelectedHitObjects.Clear());
 
-                AddUntilStep("timeline selection box is not visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<SelectionHandler>().First().Alpha == 0);
-                AddUntilStep("composer selection box is not visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<SelectionHandler>().First().Alpha == 0);
+                AddUntilStep("timeline selection box is not visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha == 0);
+                AddUntilStep("composer selection box is not visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha == 0);
             }
 
             AddStep("paste hitobject", () => Editor.Paste());
@@ -142,8 +142,8 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddAssert("new object selected", () => EditorBeatmap.SelectedHitObjects.Single().StartTime == 2000);
 
-            AddUntilStep("timeline selection box is visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<SelectionHandler>().First().Alpha > 0);
-            AddUntilStep("composer selection box is visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<SelectionHandler>().First().Alpha > 0);
+            AddUntilStep("timeline selection box is visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha > 0);
+            AddUntilStep("composer selection box is visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha > 0);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index b82842e30d..0758d73c2a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -26,15 +26,15 @@ namespace osu.Game.Tests.Visual.Editing
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
 
-        private BlueprintContainer blueprintContainer
-            => Editor.ChildrenOfType<BlueprintContainer>().First();
+        private EditorBlueprintContainer blueprintContainer
+            => Editor.ChildrenOfType<EditorBlueprintContainer>().First();
 
         private void moveMouseToObject(Func<HitObject> targetFunc)
         {
             AddStep("move mouse to object", () =>
             {
                 var pos = blueprintContainer.SelectionBlueprints
-                                            .First(s => s.HitObject == targetFunc())
+                                            .First(s => s.Item == targetFunc())
                                             .ChildrenOfType<HitCirclePiece>()
                                             .First().ScreenSpaceDrawQuad.Centre;
 
diff --git a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
index 75200e3027..6369112d80 100644
--- a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
@@ -3,12 +3,13 @@
 
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public abstract class OverlaySelectionBlueprint : SelectionBlueprint
+    public abstract class OverlaySelectionBlueprint : SelectionBlueprint<HitObject>
     {
         /// <summary>
         /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 337a806b6e..905e433731 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
@@ -17,26 +16,26 @@ namespace osu.Game.Rulesets.Edit
     /// <summary>
     /// A blueprint placed above a <see cref="DrawableHitObject"/> adding editing functionality.
     /// </summary>
-    public abstract class SelectionBlueprint : CompositeDrawable, IStateful<SelectionState>
+    public abstract class SelectionBlueprint<T> : CompositeDrawable, IStateful<SelectionState>
     {
-        public readonly HitObject HitObject;
+        public readonly T Item;
 
         /// <summary>
-        /// Invoked when this <see cref="SelectionBlueprint"/> has been selected.
+        /// Invoked when this <see cref="SelectionBlueprint{T}"/> has been selected.
         /// </summary>
-        public event Action<SelectionBlueprint> Selected;
+        public event Action<SelectionBlueprint<T>> Selected;
 
         /// <summary>
-        /// Invoked when this <see cref="SelectionBlueprint"/> has been deselected.
+        /// Invoked when this <see cref="SelectionBlueprint{T}"/> has been deselected.
         /// </summary>
-        public event Action<SelectionBlueprint> Deselected;
+        public event Action<SelectionBlueprint<T>> Deselected;
 
         public override bool HandlePositionalInput => ShouldBeAlive;
         public override bool RemoveWhenNotAlive => false;
 
-        protected SelectionBlueprint(HitObject hitObject)
+        protected SelectionBlueprint(T item)
         {
-            HitObject = hitObject;
+            Item = item;
 
             RelativeSizeAxes = Axes.Both;
             AlwaysPresent = true;
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index f70e063ba9..a0bb4feadc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -3,11 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -25,37 +23,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
     /// A container which provides a "blueprint" display of hitobjects.
-    /// Includes selection and manipulation support via a <see cref="Components.SelectionHandler"/>.
+    /// Includes selection and manipulation support via a <see cref="Components.SelectionHandler{T}"/>.
     /// </summary>
-    public abstract class BlueprintContainer : CompositeDrawable, IKeyBindingHandler<PlatformAction>
+    public abstract class BlueprintContainer<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
         protected DragBox DragBox { get; private set; }
 
-        public Container<SelectionBlueprint> SelectionBlueprints { get; private set; }
+        public Container<SelectionBlueprint<T>> SelectionBlueprints { get; private set; }
 
-        protected SelectionHandler SelectionHandler { get; private set; }
+        protected SelectionHandler<T> SelectionHandler { get; private set; }
 
-        protected readonly HitObjectComposer Composer;
-
-        [Resolved(CanBeNull = true)]
-        private IEditorChangeHandler changeHandler { get; set; }
-
-        [Resolved]
-        protected EditorClock EditorClock { get; private set; }
-
-        [Resolved]
-        protected EditorBeatmap Beatmap { get; private set; }
-
-        private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
-        private readonly Dictionary<HitObject, SelectionBlueprint> blueprintMap = new Dictionary<HitObject, SelectionBlueprint>();
+        private readonly Dictionary<T, SelectionBlueprint<T>> blueprintMap = new Dictionary<T, SelectionBlueprint<T>>();
 
         [Resolved(canBeNull: true)]
         private IPositionSnapProvider snapProvider { get; set; }
 
-        protected BlueprintContainer(HitObjectComposer composer)
-        {
-            Composer = composer;
+        [Resolved(CanBeNull = true)]
+        private IEditorChangeHandler changeHandler { get; set; }
 
+        protected BlueprintContainer()
+        {
             RelativeSizeAxes = Axes.Both;
         }
 
@@ -73,66 +60,28 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 SelectionHandler.CreateProxy(),
                 DragBox.CreateProxy().With(p => p.Depth = float.MinValue)
             });
-
-            // For non-pooled rulesets, hitobjects are already present in the playfield which allows the blueprints to be loaded in the async context.
-            if (Composer != null)
-            {
-                foreach (var obj in Composer.HitObjects)
-                    addBlueprintFor(obj.HitObject);
-            }
-
-            selectedHitObjects.BindTo(Beatmap.SelectedHitObjects);
-            selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
-            {
-                switch (args.Action)
-                {
-                    case NotifyCollectionChangedAction.Add:
-                        foreach (var o in args.NewItems)
-                            SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
-                        break;
-
-                    case NotifyCollectionChangedAction.Remove:
-                        foreach (var o in args.OldItems)
-                            SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
-
-                        break;
-                }
-            };
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Beatmap.HitObjectAdded += addBlueprintFor;
-            Beatmap.HitObjectRemoved += removeBlueprintFor;
-
-            if (Composer != null)
-            {
-                // For pooled rulesets, blueprints must be added for hitobjects already "current" as they would've not been "current" during the async load addition process above.
-                foreach (var obj in Composer.HitObjects)
-                    addBlueprintFor(obj.HitObject);
-
-                Composer.Playfield.HitObjectUsageBegan += addBlueprintFor;
-                Composer.Playfield.HitObjectUsageFinished += removeBlueprintFor;
-            }
-        }
-
-        protected virtual Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both };
+        protected virtual Container<SelectionBlueprint<T>> CreateSelectionBlueprintContainer() => new Container<SelectionBlueprint<T>> { RelativeSizeAxes = Axes.Both };
 
         /// <summary>
-        /// Creates a <see cref="Components.SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
+        /// Creates a <see cref="Components.SelectionHandler{T}"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
         /// </summary>
-        protected virtual SelectionHandler CreateSelectionHandler() => new SelectionHandler();
+        protected virtual SelectionHandler<T> CreateSelectionHandler() => new SelectionHandler<T>();
 
         /// <summary>
-        /// Creates a <see cref="SelectionBlueprint"/> for a specific <see cref="DrawableHitObject"/>.
+        /// Creates a <see cref="SelectionBlueprint{T}"/> for a specific <see cref="DrawableHitObject"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="DrawableHitObject"/> to create the overlay for.</param>
-        protected virtual SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => null;
+        protected virtual SelectionBlueprint<T> CreateBlueprintFor(T hitObject) => null;
 
         protected virtual DragBox CreateDragBox(Action<RectangleF> performSelect) => new DragBox(performSelect);
 
+        /// <summary>
+        /// Whether this component is in a state where deselection should be allowed. If false, selection will only be added to.
+        /// </summary>
+        protected virtual bool AllowDeselection => true;
+
         protected override bool OnMouseDown(MouseDownEvent e)
         {
             bool selectionPerformed = performMouseDownActions(e);
@@ -143,7 +92,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return selectionPerformed || e.Button == MouseButton.Left;
         }
 
-        private SelectionBlueprint clickedBlueprint;
+        protected SelectionBlueprint<T> ClickedBlueprint { get; private set; }
 
         protected override bool OnClick(ClickEvent e)
         {
@@ -151,11 +100,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
 
             // store for double-click handling
-            clickedBlueprint = SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered);
+            ClickedBlueprint = SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered);
 
             // Deselection should only occur if no selected blueprints are hovered
             // A special case for when a blueprint was selected via this click is added since OnClick() may occur outside the hitobject and should not trigger deselection
-            if (endClickSelection(e) || clickedBlueprint != null)
+            if (endClickSelection(e) || ClickedBlueprint != null)
                 return true;
 
             deselectAll();
@@ -168,10 +117,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
 
             // ensure the blueprint which was hovered for the first click is still the hovered blueprint.
-            if (clickedBlueprint == null || SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != clickedBlueprint)
+            if (ClickedBlueprint == null || SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != ClickedBlueprint)
                 return false;
 
-            EditorClock?.SeekSmoothlyTo(clickedBlueprint.HitObject.StartTime);
             return true;
         }
 
@@ -227,9 +175,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (isDraggingBlueprint)
             {
-                // handle positional change etc.
-                foreach (var obj in selectedHitObjects)
-                    Beatmap.Update(obj);
+                UpdateSelection();
 
                 changeHandler?.EndChange();
             }
@@ -238,6 +184,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DragBox.Hide();
         }
 
+        protected virtual void UpdateSelection()
+        {
+        }
+
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             switch (e.Key)
@@ -258,7 +208,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             switch (action.ActionType)
             {
                 case PlatformActionType.SelectAll:
-                    selectAll();
+                    SelectAll();
                     return true;
             }
 
@@ -271,61 +221,55 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #region Blueprint Addition/Removal
 
-        private void addBlueprintFor(HitObject hitObject)
+        protected virtual void AddBlueprintFor(T item)
         {
-            if (hitObject is IBarLine)
+            if (blueprintMap.ContainsKey(item))
                 return;
 
-            if (blueprintMap.ContainsKey(hitObject))
-                return;
-
-            var blueprint = CreateBlueprintFor(hitObject);
+            var blueprint = CreateBlueprintFor(item);
             if (blueprint == null)
                 return;
 
-            blueprintMap[hitObject] = blueprint;
+            blueprintMap[item] = blueprint;
 
-            blueprint.Selected += onBlueprintSelected;
-            blueprint.Deselected += onBlueprintDeselected;
-
-            if (Beatmap.SelectedHitObjects.Contains(hitObject))
-                blueprint.Select();
+            blueprint.Selected += OnBlueprintSelected;
+            blueprint.Deselected += OnBlueprintDeselected;
 
             SelectionBlueprints.Add(blueprint);
 
-            OnBlueprintAdded(hitObject);
+            OnBlueprintAdded(blueprint);
         }
 
-        private void removeBlueprintFor(HitObject hitObject)
+        protected void RemoveBlueprintFor(T item)
         {
-            if (!blueprintMap.Remove(hitObject, out var blueprint))
+            if (!blueprintMap.Remove(item, out var blueprint))
                 return;
 
             blueprint.Deselect();
-            blueprint.Selected -= onBlueprintSelected;
-            blueprint.Deselected -= onBlueprintDeselected;
+            blueprint.Selected -= OnBlueprintSelected;
+            blueprint.Deselected -= OnBlueprintDeselected;
 
             SelectionBlueprints.Remove(blueprint);
 
             if (movementBlueprints?.Contains(blueprint) == true)
                 finishSelectionMovement();
 
-            OnBlueprintRemoved(hitObject);
+            OnBlueprintRemoved(blueprint);
         }
 
         /// <summary>
         /// Called after a <see cref="HitObject"/> blueprint has been added.
         /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> for which the blueprint has been added.</param>
-        protected virtual void OnBlueprintAdded(HitObject hitObject)
+        /// <param name="blueprint">The <see cref="HitObject"/> for which the blueprint has been added.</param>
+        protected virtual void OnBlueprintAdded(SelectionBlueprint<T> blueprint)
         {
         }
 
         /// <summary>
         /// Called after a <see cref="HitObject"/> blueprint has been removed.
         /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> for which the blueprint has been removed.</param>
-        protected virtual void OnBlueprintRemoved(HitObject hitObject)
+        /// <param name="item">The <see cref="HitObject"/> for which the blueprint has been removed.</param>
+        protected virtual void OnBlueprintRemoved(SelectionBlueprint<T> item)
         {
         }
 
@@ -347,7 +291,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             // Iterate from the top of the input stack (blueprints closest to the front of the screen first).
             // Priority is given to already-selected blueprints.
-            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
+            foreach (SelectionBlueprint<T> blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
             {
                 if (!blueprint.IsHovered) continue;
 
@@ -371,7 +315,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 {
                     // Iterate from the top of the input stack (blueprints closest to the front of the screen first).
                     // Priority is given to already-selected blueprints.
-                    foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
+                    foreach (SelectionBlueprint<T> blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
                     {
                         if (!blueprint.IsHovered) continue;
 
@@ -405,7 +349,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                     case SelectionState.Selected:
                         // if the editor is playing, we generally don't want to deselect objects even if outside the selection area.
-                        if (!EditorClock.IsRunning && !isValidForSelection())
+                        if (AllowDeselection && !isValidForSelection())
                             blueprint.Deselect();
                         break;
                 }
@@ -413,35 +357,29 @@ namespace osu.Game.Screens.Edit.Compose.Components
         }
 
         /// <summary>
-        /// Selects all <see cref="SelectionBlueprint"/>s.
+        /// Selects all <see cref="SelectionBlueprint{T}"/>s.
         /// </summary>
-        private void selectAll()
+        protected virtual void SelectAll()
         {
-            Composer.Playfield.KeepAllAlive();
-
             // Scheduled to allow the change in lifetime to take place.
             Schedule(() => SelectionBlueprints.ToList().ForEach(m => m.Select()));
         }
 
         /// <summary>
-        /// Deselects all selected <see cref="SelectionBlueprint"/>s.
+        /// Deselects all selected <see cref="SelectionBlueprint{T}"/>s.
         /// </summary>
         private void deselectAll() => SelectionHandler.SelectedBlueprints.ToList().ForEach(m => m.Deselect());
 
-        private void onBlueprintSelected(SelectionBlueprint blueprint)
+        protected virtual void OnBlueprintSelected(SelectionBlueprint<T> blueprint)
         {
             SelectionHandler.HandleSelected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 1);
-
-            Composer.Playfield.SetKeepAlive(blueprint.HitObject, true);
         }
 
-        private void onBlueprintDeselected(SelectionBlueprint blueprint)
+        protected virtual void OnBlueprintDeselected(SelectionBlueprint<T> blueprint)
         {
             SelectionBlueprints.ChangeChildDepth(blueprint, 0);
             SelectionHandler.HandleDeselected(blueprint);
-
-            Composer.Playfield.SetKeepAlive(blueprint.HitObject, false);
         }
 
         #endregion
@@ -449,7 +387,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         #region Selection Movement
 
         private Vector2[] movementBlueprintOriginalPositions;
-        private SelectionBlueprint[] movementBlueprints;
+        private SelectionBlueprint<T>[] movementBlueprints;
         private bool isDraggingBlueprint;
 
         /// <summary>
@@ -466,10 +404,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return;
 
             // Movement is tracked from the blueprint of the earliest hitobject, since it only makes sense to distance snap from that hitobject
-            movementBlueprints = SelectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime).ToArray();
+            movementBlueprints = SortForMovement(SelectionHandler.SelectedBlueprints).ToArray();
             movementBlueprintOriginalPositions = movementBlueprints.Select(m => m.ScreenSpaceSelectionPoint).ToArray();
         }
 
+        protected virtual IEnumerable<SelectionBlueprint<T>> SortForMovement(IReadOnlyList<SelectionBlueprint<T>> blueprints) => blueprints;
+
         /// <summary>
         /// Moves the current selected blueprints.
         /// </summary>
@@ -497,7 +437,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 if (positionalResult.ScreenSpacePosition == testPosition) continue;
 
                 // attempt to move the objects, and abort any time based snapping if we can.
-                if (SelectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprints[i], positionalResult.ScreenSpacePosition)))
+                if (SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints[i], positionalResult.ScreenSpacePosition)))
                     return true;
             }
 
@@ -510,20 +450,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
             // Retrieve a snapped position.
             var result = snapProvider.SnapScreenSpacePositionToValidTime(movePosition);
 
-            // Move the hitobjects.
-            if (!SelectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprints.First(), result.ScreenSpacePosition)))
-                return true;
+            return ApplySnapResult(movementBlueprints, result);
+        }
 
-            if (result.Time.HasValue)
-            {
-                // Apply the start time at the newly snapped-to position
-                double offset = result.Time.Value - movementBlueprints.First().HitObject.StartTime;
-
-                if (offset != 0)
-                    Beatmap.PerformOnSelection(obj => obj.StartTime += offset);
-            }
-
-            return true;
+        protected virtual bool ApplySnapResult(SelectionBlueprint<T>[] blueprints, SnapResult result)
+        {
+            return !SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(blueprints.First(), result.ScreenSpacePosition));
         }
 
         /// <summary>
@@ -542,22 +474,5 @@ namespace osu.Game.Screens.Edit.Compose.Components
         }
 
         #endregion
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (Beatmap != null)
-            {
-                Beatmap.HitObjectAdded -= addBlueprintFor;
-                Beatmap.HitObjectRemoved -= removeBlueprintFor;
-            }
-
-            if (Composer != null)
-            {
-                Composer.Playfield.HitObjectUsageBegan -= addBlueprintFor;
-                Composer.Playfield.HitObjectUsageFinished -= removeBlueprintFor;
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index b0a6a091f0..994e862946 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -27,12 +27,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// A blueprint container generally displayed as an overlay to a ruleset's playfield.
     /// </summary>
-    public class ComposeBlueprintContainer : BlueprintContainer
+    public class ComposeBlueprintContainer : EditorBlueprintContainer
     {
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         private readonly Container<PlacementBlueprint> placementBlueprintContainer;
 
+        protected new EditorSelectionHandler SelectionHandler => (EditorSelectionHandler)base.SelectionHandler;
+
         private PlacementBlueprint currentPlacement;
         private InputManager inputManager;
 
@@ -113,7 +115,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             // convert to game space coordinates
             delta = firstBlueprint.ToScreenSpace(delta) - firstBlueprint.ToScreenSpace(Vector2.Zero);
 
-            SelectionHandler.HandleMovement(new MoveSelectionEvent(firstBlueprint, firstBlueprint.ScreenSpaceSelectionPoint + delta));
+            SelectionHandler.HandleMovement(new MoveSelectionEvent<HitObject>(firstBlueprint, firstBlueprint.ScreenSpaceSelectionPoint + delta));
         }
 
         private void updatePlacementNewCombo()
@@ -237,7 +239,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 updatePlacementPosition();
         }
 
-        protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
+        protected sealed override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject hitObject)
         {
             var drawable = Composer.HitObjects.FirstOrDefault(d => d.HitObject == hitObject);
 
@@ -249,9 +251,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public virtual OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
 
-        protected override void OnBlueprintAdded(HitObject hitObject)
+        protected override void OnBlueprintAdded(SelectionBlueprint<HitObject> item)
         {
-            base.OnBlueprintAdded(hitObject);
+            base.OnBlueprintAdded(item);
 
             refreshTool();
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
new file mode 100644
index 0000000000..aef02d5ffd
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -0,0 +1,176 @@
+// Copyright (c) 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class EditorBlueprintContainer : BlueprintContainer<HitObject>
+    {
+        [Resolved]
+        protected EditorClock EditorClock { get; private set; }
+
+        [Resolved]
+        protected EditorBeatmap Beatmap { get; private set; }
+
+        protected readonly HitObjectComposer Composer;
+
+        private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
+
+        protected EditorBlueprintContainer(HitObjectComposer composer)
+        {
+            Composer = composer;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            // For non-pooled rulesets, hitobjects are already present in the playfield which allows the blueprints to be loaded in the async context.
+            if (Composer != null)
+            {
+                foreach (var obj in Composer.HitObjects)
+                    AddBlueprintFor(obj.HitObject);
+            }
+
+            selectedHitObjects.BindTo(Beatmap.SelectedHitObjects);
+            selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
+            {
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (var o in args.NewItems)
+                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Select();
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (var o in args.OldItems)
+                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Deselect();
+
+                        break;
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Beatmap.HitObjectAdded += AddBlueprintFor;
+            Beatmap.HitObjectRemoved += RemoveBlueprintFor;
+
+            if (Composer != null)
+            {
+                // For pooled rulesets, blueprints must be added for hitobjects already "current" as they would've not been "current" during the async load addition process above.
+                foreach (var obj in Composer.HitObjects)
+                    AddBlueprintFor(obj.HitObject);
+
+                Composer.Playfield.HitObjectUsageBegan += AddBlueprintFor;
+                Composer.Playfield.HitObjectUsageFinished += RemoveBlueprintFor;
+            }
+        }
+
+        protected override IEnumerable<SelectionBlueprint<HitObject>> SortForMovement(IReadOnlyList<SelectionBlueprint<HitObject>> blueprints)
+            => blueprints.OrderBy(b => b.Item.StartTime);
+
+        protected override bool AllowDeselection => !EditorClock.IsRunning;
+
+        protected override bool ApplySnapResult(SelectionBlueprint<HitObject>[] blueprints, SnapResult result)
+        {
+            if (!base.ApplySnapResult(blueprints, result))
+                return false;
+
+            if (result.Time.HasValue)
+            {
+                // Apply the start time at the newly snapped-to position
+                double offset = result.Time.Value - blueprints.First().Item.StartTime;
+
+                if (offset != 0)
+                    Beatmap.PerformOnSelection(obj => obj.StartTime += offset);
+            }
+
+            return true;
+        }
+
+        protected override void AddBlueprintFor(HitObject item)
+        {
+            if (item is IBarLine)
+                return;
+
+            base.AddBlueprintFor(item);
+        }
+
+        protected override void OnBlueprintAdded(SelectionBlueprint<HitObject> blueprint)
+        {
+            base.OnBlueprintAdded(blueprint);
+            if (Beatmap.SelectedHitObjects.Contains(blueprint.Item))
+                blueprint.Select();
+        }
+
+        protected override void UpdateSelection()
+        {
+            base.UpdateSelection();
+
+            // handle positional change etc.
+            foreach (var blueprint in SelectionBlueprints)
+                Beatmap.Update(blueprint.Item);
+        }
+
+        protected override bool OnDoubleClick(DoubleClickEvent e)
+        {
+            if (!base.OnDoubleClick(e))
+                return false;
+
+            EditorClock?.SeekSmoothlyTo(ClickedBlueprint.Item.StartTime);
+            return true;
+        }
+
+        protected override Container<SelectionBlueprint<HitObject>> CreateSelectionBlueprintContainer() => new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both };
+
+        protected override void SelectAll()
+        {
+            Composer.Playfield.KeepAllAlive();
+
+            base.SelectAll();
+        }
+
+        protected override void OnBlueprintSelected(SelectionBlueprint<HitObject> blueprint)
+        {
+            base.OnBlueprintSelected(blueprint);
+
+            Composer.Playfield.SetKeepAlive(blueprint.Item, true);
+        }
+
+        protected override void OnBlueprintDeselected(SelectionBlueprint<HitObject> blueprint)
+        {
+            base.OnBlueprintDeselected(blueprint);
+
+            Composer.Playfield.SetKeepAlive(blueprint.Item, false);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (Beatmap != null)
+            {
+                Beatmap.HitObjectAdded -= AddBlueprintFor;
+                Beatmap.HitObjectRemoved -= RemoveBlueprintFor;
+            }
+
+            if (Composer != null)
+            {
+                Composer.Playfield.HitObjectUsageBegan -= AddBlueprintFor;
+                Composer.Playfield.HitObjectUsageFinished -= RemoveBlueprintFor;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
new file mode 100644
index 0000000000..a117d42574
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -0,0 +1,233 @@
+// Copyright (c) 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 Humanizer;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Audio;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class EditorSelectionHandler : SelectionHandler<HitObject>, IHasContextMenu
+    {
+        [Resolved]
+        protected EditorBeatmap EditorBeatmap { get; private set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            createStateBindables();
+
+            // bring in updates from selection changes
+            EditorBeatmap.HitObjectUpdated += _ => Scheduler.AddOnce(UpdateTernaryStates);
+            EditorBeatmap.SelectedHitObjects.BindTo(SelectedItems);
+
+            SelectedItems.CollectionChanged += (sender, args) =>
+            {
+                Scheduler.AddOnce(UpdateTernaryStates);
+            };
+        }
+
+        internal override void HandleSelected(SelectionBlueprint<HitObject> blueprint)
+        {
+            base.HandleSelected(blueprint);
+
+            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
+            if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.Item))
+                EditorBeatmap.SelectedHitObjects.Add(blueprint.Item);
+        }
+
+        internal override void HandleDeselected(SelectionBlueprint<HitObject> blueprint)
+        {
+            base.HandleDeselected(blueprint);
+
+            EditorBeatmap.SelectedHitObjects.Remove(blueprint.Item);
+        }
+
+        protected override void DeleteItems(IEnumerable<HitObject> items) => EditorBeatmap.RemoveRange(items);
+
+        #region Selection State
+
+        /// <summary>
+        /// The state of "new combo" for all selected hitobjects.
+        /// </summary>
+        public readonly Bindable<TernaryState> SelectionNewComboState = new Bindable<TernaryState>();
+
+        /// <summary>
+        /// The state of each sample type for all selected hitobjects. Keys match with <see cref="HitSampleInfo"/> constant specifications.
+        /// </summary>
+        public readonly Dictionary<string, Bindable<TernaryState>> SelectionSampleStates = new Dictionary<string, Bindable<TernaryState>>();
+
+        /// <summary>
+        /// Set up ternary state bindables and bind them to selection/hitobject changes (in both directions)
+        /// </summary>
+        private void createStateBindables()
+        {
+            foreach (var sampleName in HitSampleInfo.AllAdditions)
+            {
+                var bindable = new Bindable<TernaryState>
+                {
+                    Description = sampleName.Replace("hit", string.Empty).Titleize()
+                };
+
+                bindable.ValueChanged += state =>
+                {
+                    switch (state.NewValue)
+                    {
+                        case TernaryState.False:
+                            RemoveHitSample(sampleName);
+                            break;
+
+                        case TernaryState.True:
+                            AddHitSample(sampleName);
+                            break;
+                    }
+                };
+
+                SelectionSampleStates[sampleName] = bindable;
+            }
+
+            // new combo
+            SelectionNewComboState.ValueChanged += state =>
+            {
+                switch (state.NewValue)
+                {
+                    case TernaryState.False:
+                        SetNewCombo(false);
+                        break;
+
+                    case TernaryState.True:
+                        SetNewCombo(true);
+                        break;
+                }
+            };
+        }
+
+        /// <summary>
+        /// Called when context menu ternary states may need to be recalculated (selection changed or hitobject updated).
+        /// </summary>
+        protected virtual void UpdateTernaryStates()
+        {
+            SelectionNewComboState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
+
+            foreach (var (sampleName, bindable) in SelectionSampleStates)
+            {
+                bindable.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName));
+            }
+        }
+
+        /// <summary>
+        /// Given a selection target and a function of truth, retrieve the correct ternary state for display.
+        /// </summary>
+        protected TernaryState GetStateFromSelection<T>(IEnumerable<T> selection, Func<T, bool> func)
+        {
+            if (selection.Any(func))
+                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
+
+            return TernaryState.False;
+        }
+
+        #endregion
+
+        #region Sample Changes
+
+        /// <summary>
+        /// Adds a hit sample to all selected <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="sampleName">The name of the hit sample.</param>
+        public void AddHitSample(string sampleName)
+        {
+            EditorBeatmap.PerformOnSelection(h =>
+            {
+                // Make sure there isn't already an existing sample
+                if (h.Samples.Any(s => s.Name == sampleName))
+                    return;
+
+                h.Samples.Add(new HitSampleInfo(sampleName));
+            });
+        }
+
+        /// <summary>
+        /// Set the new combo state of all selected <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="state">Whether to set or unset.</param>
+        /// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
+        public void SetNewCombo(bool state)
+        {
+            EditorBeatmap.PerformOnSelection(h =>
+            {
+                var comboInfo = h as IHasComboInformation;
+
+                if (comboInfo == null || comboInfo.NewCombo == state) return;
+
+                comboInfo.NewCombo = state;
+                EditorBeatmap.Update(h);
+            });
+        }
+
+        /// <summary>
+        /// Removes a hit sample from all selected <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="sampleName">The name of the hit sample.</param>
+        public void RemoveHitSample(string sampleName)
+        {
+            EditorBeatmap.PerformOnSelection(h => h.SamplesBindable.RemoveAll(s => s.Name == sampleName));
+        }
+
+        #endregion
+
+        #region Context Menu
+
+        public MenuItem[] ContextMenuItems
+        {
+            get
+            {
+                if (!SelectedBlueprints.Any(b => b.IsHovered))
+                    return Array.Empty<MenuItem>();
+
+                var items = new List<MenuItem>();
+
+                items.AddRange(GetContextMenuItemsForSelection(SelectedBlueprints));
+
+                if (SelectedBlueprints.All(b => b.Item is IHasComboInformation))
+                {
+                    items.Add(new TernaryStateMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } });
+                }
+
+                if (SelectedBlueprints.Count == 1)
+                    items.AddRange(SelectedBlueprints[0].ContextMenuItems);
+
+                items.AddRange(new[]
+                {
+                    new OsuMenuItem("Sound")
+                    {
+                        Items = SelectionSampleStates.Select(kvp =>
+                            new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
+                    },
+                    new OsuMenuItem("Delete", MenuItemType.Destructive, DeleteSelected),
+                });
+
+                return items.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Provide context menu items relevant to current selection. Calling base is not required.
+        /// </summary>
+        /// <param name="selection">The current selection.</param>
+        /// <returns>The relevant menu items.</returns>
+        protected virtual IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)
+            => Enumerable.Empty<MenuItem>();
+
+        #endregion
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
index d612cf3fe0..4078661a26 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
@@ -11,17 +11,17 @@ using osu.Game.Rulesets.Objects;
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// A container for <see cref="SelectionBlueprint"/> ordered by their <see cref="HitObject"/> start times.
+    /// A container for <see cref="SelectionBlueprint{HitObject}"/> ordered by their <see cref="HitObject"/> start times.
     /// </summary>
-    public sealed class HitObjectOrderedSelectionContainer : Container<SelectionBlueprint>
+    public sealed class HitObjectOrderedSelectionContainer : Container<SelectionBlueprint<HitObject>>
     {
-        public override void Add(SelectionBlueprint drawable)
+        public override void Add(SelectionBlueprint<HitObject> drawable)
         {
             base.Add(drawable);
             bindStartTime(drawable);
         }
 
-        public override bool Remove(SelectionBlueprint drawable)
+        public override bool Remove(SelectionBlueprint<HitObject> drawable)
         {
             if (!base.Remove(drawable))
                 return false;
@@ -36,11 +36,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
             unbindAllStartTimes();
         }
 
-        private readonly Dictionary<SelectionBlueprint, IBindable> startTimeMap = new Dictionary<SelectionBlueprint, IBindable>();
+        private readonly Dictionary<SelectionBlueprint<HitObject>, IBindable> startTimeMap = new Dictionary<SelectionBlueprint<HitObject>, IBindable>();
 
-        private void bindStartTime(SelectionBlueprint blueprint)
+        private void bindStartTime(SelectionBlueprint<HitObject> blueprint)
         {
-            var bindable = blueprint.HitObject.StartTimeBindable.GetBoundCopy();
+            var bindable = blueprint.Item.StartTimeBindable.GetBoundCopy();
 
             bindable.BindValueChanged(_ =>
             {
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             startTimeMap[blueprint] = bindable;
         }
 
-        private void unbindStartTime(SelectionBlueprint blueprint)
+        private void unbindStartTime(SelectionBlueprint<HitObject> blueprint)
         {
             startTimeMap[blueprint].UnbindAll();
             startTimeMap.Remove(blueprint);
@@ -66,16 +66,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override int Compare(Drawable x, Drawable y)
         {
-            var xObj = (SelectionBlueprint)x;
-            var yObj = (SelectionBlueprint)y;
+            var xObj = (SelectionBlueprint<HitObject>)x;
+            var yObj = (SelectionBlueprint<HitObject>)y;
 
             // Put earlier blueprints towards the end of the list, so they handle input first
-            int i = yObj.HitObject.StartTime.CompareTo(xObj.HitObject.StartTime);
+            int i = yObj.Item.StartTime.CompareTo(xObj.Item.StartTime);
 
             if (i != 0) return i;
 
             // Fall back to end time if the start time is equal.
-            i = yObj.HitObject.GetEndTime().CompareTo(xObj.HitObject.GetEndTime());
+            i = yObj.Item.GetEndTime().CompareTo(xObj.Item.GetEndTime());
 
             return i == 0 ? CompareReverseChildID(y, x) : i;
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index 0792d0f80e..a07b434011 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -9,12 +9,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// An event which occurs when a <see cref="OverlaySelectionBlueprint"/> is moved.
     /// </summary>
-    public class MoveSelectionEvent
+    public class MoveSelectionEvent<T>
     {
         /// <summary>
-        /// The <see cref="SelectionBlueprint"/> that triggered this <see cref="MoveSelectionEvent"/>.
+        /// The <see cref="SelectionBlueprint{T}"/> that triggered this <see cref="MoveSelectionEvent{T}"/>.
         /// </summary>
-        public readonly SelectionBlueprint Blueprint;
+        public readonly SelectionBlueprint<T> Blueprint;
 
         /// <summary>
         /// The expected screen-space position of the hitobject at the current cursor position.
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         public readonly Vector2 InstantDelta;
 
-        public MoveSelectionEvent(SelectionBlueprint blueprint, Vector2 screenSpacePosition)
+        public MoveSelectionEvent(SelectionBlueprint<T> blueprint, Vector2 screenSpacePosition)
         {
             Blueprint = blueprint;
             ScreenSpacePosition = screenSpacePosition;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index b06e982859..1ee1de7d43 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -4,25 +4,19 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Humanizer;
 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.Shapes;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Types;
 using osuTK;
 using osuTK.Input;
 
@@ -31,16 +25,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// A component which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
     /// </summary>
-    public class SelectionHandler : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
+    public class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
         /// <summary>
         /// The currently selected blueprints.
         /// Should be used when operations are dealing directly with the visible blueprints.
         /// For more general selection operations, use <see cref="osu.Game.Screens.Edit.EditorBeatmap.SelectedHitObjects"/> instead.
         /// </summary>
-        public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
+        public IReadOnlyList<SelectionBlueprint<T>> SelectedBlueprints => selectedBlueprints;
 
-        private readonly List<SelectionBlueprint> selectedBlueprints;
+        protected BindableList<T> SelectedItems = new BindableList<T>();
+
+        private readonly List<SelectionBlueprint<T>> selectedBlueprints;
 
         private Drawable content;
 
@@ -48,15 +44,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected SelectionBox SelectionBox { get; private set; }
 
-        [Resolved]
-        protected EditorBeatmap EditorBeatmap { get; private set; }
-
         [Resolved(CanBeNull = true)]
         protected IEditorChangeHandler ChangeHandler { get; private set; }
 
         public SelectionHandler()
         {
-            selectedBlueprints = new List<SelectionBlueprint>();
+            selectedBlueprints = new List<SelectionBlueprint<T>>();
 
             RelativeSizeAxes = Axes.Both;
             AlwaysPresent = true;
@@ -66,8 +59,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            createStateBindables();
-
             InternalChild = content = new Container
             {
                 Children = new Drawable[]
@@ -95,6 +86,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     SelectionBox = CreateSelectionBox(),
                 }
             };
+
+            SelectedItems.CollectionChanged += (sender, args) =>
+            {
+                Scheduler.AddOnce(updateVisibility);
+            };
         }
 
         public SelectionBox CreateSelectionBox()
@@ -139,7 +135,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Whether any <see cref="DrawableHitObject"/>s could be moved.
         /// Returning true will also propagate StartTime changes provided by the closest <see cref="IPositionSnapProvider.SnapScreenSpacePositionToValidTime"/>.
         /// </returns>
-        public virtual bool HandleMovement(MoveSelectionEvent moveEvent) => false;
+        public virtual bool HandleMovement(MoveSelectionEvent<T> moveEvent) => false;
 
         /// <summary>
         /// Handles the selected <see cref="DrawableHitObject"/>s being rotated.
@@ -174,7 +170,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             switch (action.ActionMethod)
             {
                 case PlatformActionMethod.Delete:
-                    deleteSelected();
+                    DeleteSelected();
                     return true;
             }
 
@@ -198,24 +194,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Handle a blueprint becoming selected.
         /// </summary>
         /// <param name="blueprint">The blueprint.</param>
-        internal void HandleSelected(SelectionBlueprint blueprint)
+        internal virtual void HandleSelected(SelectionBlueprint<T> blueprint)
         {
             selectedBlueprints.Add(blueprint);
-
-            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
-            if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.HitObject))
-                EditorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
         }
 
         /// <summary>
         /// Handle a blueprint becoming deselected.
         /// </summary>
         /// <param name="blueprint">The blueprint.</param>
-        internal void HandleDeselected(SelectionBlueprint blueprint)
+        internal virtual void HandleDeselected(SelectionBlueprint<T> blueprint)
         {
             selectedBlueprints.Remove(blueprint);
-
-            EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
         }
 
         /// <summary>
@@ -224,7 +214,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="e">The mouse event responsible for selection.</param>
         /// <returns>Whether a selection was performed.</returns>
-        internal bool MouseDownSelectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
+        internal bool MouseDownSelectionRequested(SelectionBlueprint<T> blueprint, MouseButtonEvent e)
         {
             if (e.ShiftPressed && e.Button == MouseButton.Right)
             {
@@ -248,7 +238,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="e">The mouse event responsible for deselection.</param>
         /// <returns>Whether a deselection was performed.</returns>
-        internal bool MouseUpSelectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
+        internal bool MouseUpSelectionRequested(SelectionBlueprint<T> blueprint, MouseButtonEvent e)
         {
             if (blueprint.IsSelected)
             {
@@ -259,15 +249,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return false;
         }
 
-        private void handleQuickDeletion(SelectionBlueprint blueprint)
+        private void handleQuickDeletion(SelectionBlueprint<T> blueprint)
         {
             if (blueprint.HandleQuickDeletion())
                 return;
 
             if (!blueprint.IsSelected)
-                EditorBeatmap.Remove(blueprint.HitObject);
+                DeleteItems(new[] { blueprint.Item });
             else
-                deleteSelected();
+                DeleteSelected();
+        }
+
+        protected virtual void DeleteItems(IEnumerable<T> items)
+        {
         }
 
         /// <summary>
@@ -275,7 +269,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         /// <param name="blueprint">The blueprint to select.</param>
         /// <returns>Whether selection state was changed.</returns>
-        private bool ensureSelected(SelectionBlueprint blueprint)
+        private bool ensureSelected(SelectionBlueprint<T> blueprint)
         {
             if (blueprint.IsSelected)
                 return false;
@@ -285,9 +279,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return true;
         }
 
-        private void deleteSelected()
+        protected void DeleteSelected()
         {
-            EditorBeatmap.RemoveRange(selectedBlueprints.Select(b => b.HitObject));
+            DeleteItems(selectedBlueprints.Select(b => b.Item));
         }
 
         #endregion
@@ -295,11 +289,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         #region Outline Display
 
         /// <summary>
-        /// Updates whether this <see cref="SelectionHandler"/> is visible.
+        /// Updates whether this <see cref="SelectionHandler{T}"/> is visible.
         /// </summary>
         private void updateVisibility()
         {
-            int count = EditorBeatmap.SelectedHitObjects.Count;
+            int count = SelectedItems.Count;
 
             selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
 
@@ -340,188 +334,5 @@ namespace osu.Game.Screens.Edit.Compose.Components
         }
 
         #endregion
-
-        #region Sample Changes
-
-        /// <summary>
-        /// Adds a hit sample to all selected <see cref="HitObject"/>s.
-        /// </summary>
-        /// <param name="sampleName">The name of the hit sample.</param>
-        public void AddHitSample(string sampleName)
-        {
-            EditorBeatmap.PerformOnSelection(h =>
-            {
-                // Make sure there isn't already an existing sample
-                if (h.Samples.Any(s => s.Name == sampleName))
-                    return;
-
-                h.Samples.Add(new HitSampleInfo(sampleName));
-            });
-        }
-
-        /// <summary>
-        /// Set the new combo state of all selected <see cref="HitObject"/>s.
-        /// </summary>
-        /// <param name="state">Whether to set or unset.</param>
-        /// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
-        public void SetNewCombo(bool state)
-        {
-            EditorBeatmap.PerformOnSelection(h =>
-            {
-                var comboInfo = h as IHasComboInformation;
-
-                if (comboInfo == null || comboInfo.NewCombo == state) return;
-
-                comboInfo.NewCombo = state;
-                EditorBeatmap.Update(h);
-            });
-        }
-
-        /// <summary>
-        /// Removes a hit sample from all selected <see cref="HitObject"/>s.
-        /// </summary>
-        /// <param name="sampleName">The name of the hit sample.</param>
-        public void RemoveHitSample(string sampleName)
-        {
-            EditorBeatmap.PerformOnSelection(h => h.SamplesBindable.RemoveAll(s => s.Name == sampleName));
-        }
-
-        #endregion
-
-        #region Selection State
-
-        /// <summary>
-        /// The state of "new combo" for all selected hitobjects.
-        /// </summary>
-        public readonly Bindable<TernaryState> SelectionNewComboState = new Bindable<TernaryState>();
-
-        /// <summary>
-        /// The state of each sample type for all selected hitobjects. Keys match with <see cref="HitSampleInfo"/> constant specifications.
-        /// </summary>
-        public readonly Dictionary<string, Bindable<TernaryState>> SelectionSampleStates = new Dictionary<string, Bindable<TernaryState>>();
-
-        /// <summary>
-        /// Set up ternary state bindables and bind them to selection/hitobject changes (in both directions)
-        /// </summary>
-        private void createStateBindables()
-        {
-            foreach (var sampleName in HitSampleInfo.AllAdditions)
-            {
-                var bindable = new Bindable<TernaryState>
-                {
-                    Description = sampleName.Replace("hit", string.Empty).Titleize()
-                };
-
-                bindable.ValueChanged += state =>
-                {
-                    switch (state.NewValue)
-                    {
-                        case TernaryState.False:
-                            RemoveHitSample(sampleName);
-                            break;
-
-                        case TernaryState.True:
-                            AddHitSample(sampleName);
-                            break;
-                    }
-                };
-
-                SelectionSampleStates[sampleName] = bindable;
-            }
-
-            // new combo
-            SelectionNewComboState.ValueChanged += state =>
-            {
-                switch (state.NewValue)
-                {
-                    case TernaryState.False:
-                        SetNewCombo(false);
-                        break;
-
-                    case TernaryState.True:
-                        SetNewCombo(true);
-                        break;
-                }
-            };
-
-            // bring in updates from selection changes
-            EditorBeatmap.HitObjectUpdated += _ => Scheduler.AddOnce(UpdateTernaryStates);
-            EditorBeatmap.SelectedHitObjects.CollectionChanged += (sender, args) =>
-            {
-                Scheduler.AddOnce(updateVisibility);
-                Scheduler.AddOnce(UpdateTernaryStates);
-            };
-        }
-
-        /// <summary>
-        /// Called when context menu ternary states may need to be recalculated (selection changed or hitobject updated).
-        /// </summary>
-        protected virtual void UpdateTernaryStates()
-        {
-            SelectionNewComboState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
-
-            foreach (var (sampleName, bindable) in SelectionSampleStates)
-            {
-                bindable.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName));
-            }
-        }
-
-        /// <summary>
-        /// Given a selection target and a function of truth, retrieve the correct ternary state for display.
-        /// </summary>
-        protected TernaryState GetStateFromSelection<T>(IEnumerable<T> selection, Func<T, bool> func)
-        {
-            if (selection.Any(func))
-                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
-
-            return TernaryState.False;
-        }
-
-        #endregion
-
-        #region Context Menu
-
-        public MenuItem[] ContextMenuItems
-        {
-            get
-            {
-                if (!selectedBlueprints.Any(b => b.IsHovered))
-                    return Array.Empty<MenuItem>();
-
-                var items = new List<MenuItem>();
-
-                items.AddRange(GetContextMenuItemsForSelection(selectedBlueprints));
-
-                if (selectedBlueprints.All(b => b.HitObject is IHasComboInformation))
-                {
-                    items.Add(new TernaryStateMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } });
-                }
-
-                if (selectedBlueprints.Count == 1)
-                    items.AddRange(selectedBlueprints[0].ContextMenuItems);
-
-                items.AddRange(new[]
-                {
-                    new OsuMenuItem("Sound")
-                    {
-                        Items = SelectionSampleStates.Select(kvp =>
-                            new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
-                    },
-                    new OsuMenuItem("Delete", MenuItemType.Destructive, deleteSelected),
-                });
-
-                return items.ToArray();
-            }
-        }
-
-        /// <summary>
-        /// Provide context menu items relevant to current selection. Calling base is not required.
-        /// </summary>
-        /// <param name="selection">The current selection.</param>
-        /// <returns>The relevant menu items.</returns>
-        protected virtual IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
-            => Enumerable.Empty<MenuItem>();
-
-        #endregion
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 3555bc2800..2bb80bc27b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -25,20 +25,17 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    internal class TimelineBlueprintContainer : BlueprintContainer
+    internal class TimelineBlueprintContainer : EditorBlueprintContainer
     {
         [Resolved(CanBeNull = true)]
         private Timeline timeline { get; set; }
 
-        [Resolved]
-        private EditorBeatmap beatmap { get; set; }
-
         [Resolved]
         private OsuColour colours { get; set; }
 
         private DragEvent lastDragEvent;
         private Bindable<HitObject> placement;
-        private SelectionBlueprint placementBlueprint;
+        private SelectionBlueprint<HitObject> placementBlueprint;
 
         private SelectableAreaBackground backgroundBox;
 
@@ -76,7 +73,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             base.LoadComplete();
             DragBox.Alpha = 0;
 
-            placement = beatmap.PlacementObject.GetBoundCopy();
+            placement = Beatmap.PlacementObject.GetBoundCopy();
             placement.ValueChanged += placementChanged;
         }
 
@@ -100,7 +97,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        protected override Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
+        protected override Container<SelectionBlueprint<HitObject>> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
 
         protected override bool OnHover(HoverEvent e)
         {
@@ -160,7 +157,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 // remove objects from the stack as long as their end time is in the past.
                 while (currentConcurrentObjects.TryPeek(out HitObject hitObject))
                 {
-                    if (Precision.AlmostBigger(hitObject.GetEndTime(), b.HitObject.StartTime, 1))
+                    if (Precision.AlmostBigger(hitObject.GetEndTime(), b.Item.StartTime, 1))
                         break;
 
                     currentConcurrentObjects.Pop();
@@ -168,7 +165,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 // if the stack gets too high, we should have space below it to display the next batch of objects.
                 // importantly, we only do this if time has incremented, else a stack of hitobjects all at the same time value would start to overlap themselves.
-                if (currentConcurrentObjects.TryPeek(out HitObject h) && !Precision.AlmostEquals(h.StartTime, b.HitObject.StartTime, 1))
+                if (currentConcurrentObjects.TryPeek(out HitObject h) && !Precision.AlmostEquals(h.StartTime, b.Item.StartTime, 1))
                 {
                     if (currentConcurrentObjects.Count >= stack_reset_count)
                         currentConcurrentObjects.Clear();
@@ -176,13 +173,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 b.Y = -(stack_offset * currentConcurrentObjects.Count);
 
-                currentConcurrentObjects.Push(b.HitObject);
+                currentConcurrentObjects.Push(b.Item);
             }
         }
 
-        protected override SelectionHandler CreateSelectionHandler() => new TimelineSelectionHandler();
+        protected override SelectionHandler<HitObject> CreateSelectionHandler() => new TimelineSelectionHandler();
 
-        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
+        protected override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject hitObject)
         {
             return new TimelineHitObjectBlueprint(hitObject)
             {
@@ -239,10 +236,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        internal class TimelineSelectionHandler : SelectionHandler, IKeyBindingHandler<GlobalAction>
+        internal class TimelineSelectionHandler : EditorSelectionHandler, IKeyBindingHandler<GlobalAction>
         {
             // for now we always allow movement. snapping is provided by the Timeline's "distance" snap implementation
-            public override bool HandleMovement(MoveSelectionEvent moveEvent) => true;
+            public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent) => true;
 
             public bool OnPressed(GlobalAction action)
             {
@@ -344,13 +341,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        protected class TimelineSelectionBlueprintContainer : Container<SelectionBlueprint>
+        protected class TimelineSelectionBlueprintContainer : Container<SelectionBlueprint<HitObject>>
         {
-            protected override Container<SelectionBlueprint> Content { get; }
+            protected override Container<SelectionBlueprint<HitObject>> Content { get; }
 
             public TimelineSelectionBlueprintContainer()
             {
-                AddInternal(new TimelinePart<SelectionBlueprint>(Content = new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
+                AddInternal(new TimelinePart<SelectionBlueprint<HitObject>>(Content = new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 0425370ae5..dbe689be2f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -26,7 +26,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    public class TimelineHitObjectBlueprint : SelectionBlueprint
+    public class TimelineHitObjectBlueprint : SelectionBlueprint<HitObject>
     {
         private const float circle_size = 38;
 
@@ -49,13 +49,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private ISkinSource skin { get; set; }
 
-        public TimelineHitObjectBlueprint(HitObject hitObject)
-            : base(hitObject)
+        public TimelineHitObjectBlueprint(HitObject item)
+            : base(item)
         {
             Anchor = Anchor.CentreLeft;
             Origin = Anchor.CentreLeft;
 
-            startTime = hitObject.StartTimeBindable.GetBoundCopy();
+            startTime = item.StartTimeBindable.GetBoundCopy();
             startTime.BindValueChanged(time => X = (float)time.NewValue, true);
 
             RelativePositionAxes = Axes.X;
@@ -95,9 +95,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 },
             });
 
-            if (hitObject is IHasDuration)
+            if (item is IHasDuration)
             {
-                colouredComponents.Add(new DragArea(hitObject)
+                colouredComponents.Add(new DragArea(item)
                 {
                     OnDragHandled = e => OnDragHandled?.Invoke(e)
                 });
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.LoadComplete();
 
-            if (HitObject is IHasComboInformation comboInfo)
+            if (Item is IHasComboInformation comboInfo)
             {
                 indexInCurrentComboBindable = comboInfo.IndexInCurrentComboBindable.GetBoundCopy();
                 indexInCurrentComboBindable.BindValueChanged(_ => updateComboIndex(), true);
@@ -136,7 +136,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void updateComboColour()
         {
-            if (!(HitObject is IHasComboInformation combo))
+            if (!(Item is IHasComboInformation combo))
                 return;
 
             var comboColours = skin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value ?? Array.Empty<Color4>();
@@ -152,7 +152,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 border.Hide();
             }
 
-            if (HitObject is IHasDuration duration && duration.Duration > 0)
+            if (Item is IHasDuration duration && duration.Duration > 0)
                 circle.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
             else
                 circle.Colour = comboColour;
@@ -166,14 +166,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             base.Update();
 
             // no bindable so we perform this every update
-            float duration = (float)(HitObject.GetEndTime() - HitObject.StartTime);
+            float duration = (float)(Item.GetEndTime() - Item.StartTime);
 
             if (Width != duration)
             {
                 Width = duration;
 
                 // kind of haphazard but yeah, no bindables.
-                if (HitObject is IHasRepeats repeats)
+                if (Item is IHasRepeats repeats)
                     updateRepeats(repeats);
             }
         }

From eac139ca0e0a1747199c3ac1110a434d25fa5429 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 17:41:46 +0900
Subject: [PATCH 09546/10326] Allow BlueprintContainer to perform movement
 without an `ISnapProvider`

---
 .../Compose/Components/BlueprintContainer.cs  | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index a0bb4feadc..bd22c7329a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -420,25 +420,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (movementBlueprints == null)
                 return false;
 
-            if (snapProvider == null)
-                return true;
-
             Debug.Assert(movementBlueprintOriginalPositions != null);
 
             Vector2 distanceTravelled = e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
 
-            // check for positional snap for every object in selection (for things like object-object snapping)
-            for (var i = 0; i < movementBlueprintOriginalPositions.Length; i++)
+            if (snapProvider != null)
             {
-                var testPosition = movementBlueprintOriginalPositions[i] + distanceTravelled;
+                // check for positional snap for every object in selection (for things like object-object snapping)
+                for (var i = 0; i < movementBlueprintOriginalPositions.Length; i++)
+                {
+                    var testPosition = movementBlueprintOriginalPositions[i] + distanceTravelled;
 
-                var positionalResult = snapProvider.SnapScreenSpacePositionToValidPosition(testPosition);
+                    var positionalResult = snapProvider.SnapScreenSpacePositionToValidPosition(testPosition);
 
-                if (positionalResult.ScreenSpacePosition == testPosition) continue;
+                    if (positionalResult.ScreenSpacePosition == testPosition) continue;
 
-                // attempt to move the objects, and abort any time based snapping if we can.
-                if (SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints[i], positionalResult.ScreenSpacePosition)))
-                    return true;
+                    // attempt to move the objects, and abort any time based snapping if we can.
+                    if (SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints[i], positionalResult.ScreenSpacePosition)))
+                        return true;
+                }
             }
 
             // if no positional snapping could be performed, try unrestricted snapping from the earliest
@@ -448,15 +448,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
             Vector2 movePosition = movementBlueprintOriginalPositions.First() + distanceTravelled;
 
             // Retrieve a snapped position.
-            var result = snapProvider.SnapScreenSpacePositionToValidTime(movePosition);
+            var result = snapProvider?.SnapScreenSpacePositionToValidTime(movePosition);
+
+            if (result == null)
+            {
+                return SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints.First(), movePosition));
+            }
 
             return ApplySnapResult(movementBlueprints, result);
         }
 
-        protected virtual bool ApplySnapResult(SelectionBlueprint<T>[] blueprints, SnapResult result)
-        {
-            return !SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(blueprints.First(), result.ScreenSpacePosition));
-        }
+        protected virtual bool ApplySnapResult(SelectionBlueprint<T>[] blueprints, SnapResult result) =>
+            SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(blueprints.First(), result.ScreenSpacePosition));
 
         /// <summary>
         /// Finishes the current movement of selected blueprints.

From 32416e4e313eb818464355124415d661e23b8b2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 17:42:10 +0900
Subject: [PATCH 09547/10326] Move model selection handling to base
 `SelectionHandler` class

---
 .../Compose/Components/EditorSelectionHandler.cs | 16 ----------------
 .../Edit/Compose/Components/SelectionHandler.cs  |  5 +++++
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index a117d42574..4c6833cc4a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -37,22 +37,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
         }
 
-        internal override void HandleSelected(SelectionBlueprint<HitObject> blueprint)
-        {
-            base.HandleSelected(blueprint);
-
-            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
-            if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.Item))
-                EditorBeatmap.SelectedHitObjects.Add(blueprint.Item);
-        }
-
-        internal override void HandleDeselected(SelectionBlueprint<HitObject> blueprint)
-        {
-            base.HandleDeselected(blueprint);
-
-            EditorBeatmap.SelectedHitObjects.Remove(blueprint.Item);
-        }
-
         protected override void DeleteItems(IEnumerable<HitObject> items) => EditorBeatmap.RemoveRange(items);
 
         #region Selection State
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 1ee1de7d43..59ade746a9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -196,6 +196,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal virtual void HandleSelected(SelectionBlueprint<T> blueprint)
         {
+            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
+            if (!SelectedItems.Contains(blueprint.Item))
+                SelectedItems.Add(blueprint.Item);
+
             selectedBlueprints.Add(blueprint);
         }
 
@@ -205,6 +209,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal virtual void HandleDeselected(SelectionBlueprint<T> blueprint)
         {
+            SelectedItems.Remove(blueprint.Item);
             selectedBlueprints.Remove(blueprint);
         }
 

From f586bc46e624257e8e8c8438c644d4dfdcb240d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:03:34 +0900
Subject: [PATCH 09548/10326] Avoid using `EditorBeatmap.SelectedHitObjects`

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 92f5254182..5164c7f204 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -374,8 +374,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// <summary>
         /// All osu! hitobjects which can be moved/rotated/scaled.
         /// </summary>
-        private OsuHitObject[] selectedMovableObjects => EditorBeatmap.SelectedHitObjects
-                                                                      .OfType<OsuHitObject>()
+        private OsuHitObject[] selectedMovableObjects => SelectedItems.OfType<OsuHitObject>()
                                                                       .Where(h => !(h is Spinner))
                                                                       .ToArray();
 

From dd3d8e5d0388974191d4907e449814ec25b1576c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:06:27 +0900
Subject: [PATCH 09549/10326] Make `SelectionHandler` abstract to ensure things
 get implemented

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs          |  3 +--
 .../Edit/Compose/Components/BlueprintContainer.cs    |  2 +-
 .../Compose/Components/EditorBlueprintContainer.cs   |  2 ++
 .../Compose/Components/EditorSelectionHandler.cs     |  4 ++--
 .../Edit/Compose/Components/SelectionHandler.cs      | 12 +++++++-----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 35896d4982..b47cf97a4d 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -182,8 +182,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
         /// </summary>
-        protected virtual ComposeBlueprintContainer CreateBlueprintContainer()
-            => new ComposeBlueprintContainer(this);
+        protected virtual ComposeBlueprintContainer CreateBlueprintContainer() => new ComposeBlueprintContainer(this);
 
         /// <summary>
         /// Construct a drawable ruleset for the provided ruleset.
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index bd22c7329a..7f81629f80 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Creates a <see cref="Components.SelectionHandler{T}"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
         /// </summary>
-        protected virtual SelectionHandler<T> CreateSelectionHandler() => new SelectionHandler<T>();
+        protected abstract SelectionHandler<T> CreateSelectionHandler();
 
         /// <summary>
         /// Creates a <see cref="SelectionBlueprint{T}"/> for a specific <see cref="DrawableHitObject"/>.
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index aef02d5ffd..0cb9cf930c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -135,6 +135,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override Container<SelectionBlueprint<HitObject>> CreateSelectionBlueprintContainer() => new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both };
 
+        protected override SelectionHandler<HitObject> CreateSelectionHandler() => new EditorSelectionHandler();
+
         protected override void SelectAll()
         {
             Composer.Playfield.KeepAllAlive();
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 4c6833cc4a..4b85b5cc0e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -101,11 +101,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         protected virtual void UpdateTernaryStates()
         {
-            SelectionNewComboState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
+            SelectionNewComboState.Value = GetStateFromSelection(SelectedItems.OfType<IHasComboInformation>(), h => h.NewCombo);
 
             foreach (var (sampleName, bindable) in SelectionSampleStates)
             {
-                bindable.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName));
+                bindable.Value = GetStateFromSelection(SelectedItems, h => h.Samples.Any(s => s.Name == sampleName));
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 59ade746a9..4b99aa5da7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// A component which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
     /// </summary>
-    public class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
+    public abstract class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
         /// <summary>
         /// The currently selected blueprints.
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved(CanBeNull = true)]
         protected IEditorChangeHandler ChangeHandler { get; private set; }
 
-        public SelectionHandler()
+        protected SelectionHandler()
         {
             selectedBlueprints = new List<SelectionBlueprint<T>>();
 
@@ -265,9 +265,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DeleteSelected();
         }
 
-        protected virtual void DeleteItems(IEnumerable<T> items)
-        {
-        }
+        /// <summary>
+        /// Called whenever the deletion of items has been requested.
+        /// </summary>
+        /// <param name="items">The items to be deleted.</param>
+        protected abstract void DeleteItems(IEnumerable<T> items);
 
         /// <summary>
         /// Ensure the blueprint is in a selected state.

From f97b14a20aeb786a03fe200e78a61376a5a23b56 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:15:24 +0900
Subject: [PATCH 09550/10326] Fix binding direction of selected items

---
 .../Screens/Edit/Compose/Components/EditorSelectionHandler.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 4b85b5cc0e..d26a2946c1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -29,8 +29,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // bring in updates from selection changes
             EditorBeatmap.HitObjectUpdated += _ => Scheduler.AddOnce(UpdateTernaryStates);
-            EditorBeatmap.SelectedHitObjects.BindTo(SelectedItems);
 
+            SelectedItems.BindTo(EditorBeatmap.SelectedHitObjects);
             SelectedItems.CollectionChanged += (sender, args) =>
             {
                 Scheduler.AddOnce(UpdateTernaryStates);

From ff06a27a1237bc71febd6b4027449346c7c07ccd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:33:39 +0900
Subject: [PATCH 09551/10326] Revert changes to `OnBlueprint` methods and
 handle select-on-addition locally

---
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs   | 2 +-
 .../Edit/Compose/Components/EditorBlueprintContainer.cs    | 7 -------
 .../Screens/Edit/Compose/Components/SelectionHandler.cs    | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 994e862946..f22404e77d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -251,7 +251,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public virtual OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
 
-        protected override void OnBlueprintAdded(SelectionBlueprint<HitObject> item)
+        protected override void OnBlueprintAdded(HitObject item)
         {
             base.OnBlueprintAdded(item);
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 0cb9cf930c..d17892d6ba 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -108,13 +108,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.AddBlueprintFor(item);
         }
 
-        protected override void OnBlueprintAdded(SelectionBlueprint<HitObject> blueprint)
-        {
-            base.OnBlueprintAdded(blueprint);
-            if (Beatmap.SelectedHitObjects.Contains(blueprint.Item))
-                blueprint.Select();
-        }
-
         protected override void UpdateSelection()
         {
             base.UpdateSelection();
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 4b99aa5da7..52c148f852 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         public IReadOnlyList<SelectionBlueprint<T>> SelectedBlueprints => selectedBlueprints;
 
-        protected BindableList<T> SelectedItems = new BindableList<T>();
+        public BindableList<T> SelectedItems = new BindableList<T>();
 
         private readonly List<SelectionBlueprint<T>> selectedBlueprints;
 

From 7ec5ea1eb5a761760da2133dc03a4b9bce1882aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:33:47 +0900
Subject: [PATCH 09552/10326] Remove hitobject terminology from base classes

---
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs  |  5 +-
 .../Compose/Components/BlueprintContainer.cs  | 46 +++++++++++--------
 .../Components/ComposeBlueprintContainer.cs   |  4 +-
 .../Compose/Components/SelectionHandler.cs    | 37 +++++++--------
 .../Timeline/TimelineBlueprintContainer.cs    |  4 +-
 5 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 905e433731..b176ecb148 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -8,13 +8,12 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Edit
 {
     /// <summary>
-    /// A blueprint placed above a <see cref="DrawableHitObject"/> adding editing functionality.
+    /// A blueprint placed above a displaying item adding editing functionality.
     /// </summary>
     public abstract class SelectionBlueprint<T> : CompositeDrawable, IStateful<SelectionState>
     {
@@ -86,7 +85,7 @@ namespace osu.Game.Rulesets.Edit
 
         protected virtual void OnDeselected()
         {
-            // selection blueprints are AlwaysPresent while the related DrawableHitObject is visible
+            // selection blueprints are AlwaysPresent while the related item is visible
             // set the body piece's alpha directly to avoid arbitrarily rendering frame buffers etc. of children.
             foreach (var d in InternalChildren)
                 d.Hide();
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7f81629f80..c2ba627df4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -14,15 +14,13 @@ using osu.Framework.Input.Bindings;
 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.Drawables;
 using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// A container which provides a "blueprint" display of hitobjects.
+    /// A container which provides a "blueprint" display of items.
     /// Includes selection and manipulation support via a <see cref="Components.SelectionHandler{T}"/>.
     /// </summary>
     public abstract class BlueprintContainer<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
@@ -65,15 +63,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected virtual Container<SelectionBlueprint<T>> CreateSelectionBlueprintContainer() => new Container<SelectionBlueprint<T>> { RelativeSizeAxes = Axes.Both };
 
         /// <summary>
-        /// Creates a <see cref="Components.SelectionHandler{T}"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
+        /// Creates a <see cref="Components.SelectionHandler{T}"/> which outlines items and handles movement of selections.
         /// </summary>
         protected abstract SelectionHandler<T> CreateSelectionHandler();
 
         /// <summary>
-        /// Creates a <see cref="SelectionBlueprint{T}"/> for a specific <see cref="DrawableHitObject"/>.
+        /// Creates a <see cref="SelectionBlueprint{T}"/> for a specific item.
         /// </summary>
-        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to create the overlay for.</param>
-        protected virtual SelectionBlueprint<T> CreateBlueprintFor(T hitObject) => null;
+        /// <param name="item">The item to create the overlay for.</param>
+        protected virtual SelectionBlueprint<T> CreateBlueprintFor(T item) => null;
 
         protected virtual DragBox CreateDragBox(Action<RectangleF> performSelect) => new DragBox(performSelect);
 
@@ -103,7 +101,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             ClickedBlueprint = SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered);
 
             // Deselection should only occur if no selected blueprints are hovered
-            // A special case for when a blueprint was selected via this click is added since OnClick() may occur outside the hitobject and should not trigger deselection
+            // A special case for when a blueprint was selected via this click is added since OnClick() may occur outside the item and should not trigger deselection
             if (endClickSelection(e) || ClickedBlueprint != null)
                 return true;
 
@@ -237,7 +235,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             SelectionBlueprints.Add(blueprint);
 
-            OnBlueprintAdded(blueprint);
+            if (SelectionHandler.SelectedItems.Contains(item))
+                blueprint.Select();
+
+            OnBlueprintAdded(blueprint.Item);
         }
 
         protected void RemoveBlueprintFor(T item)
@@ -254,22 +255,24 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (movementBlueprints?.Contains(blueprint) == true)
                 finishSelectionMovement();
 
-            OnBlueprintRemoved(blueprint);
+            OnBlueprintRemoved(blueprint.Item);
         }
 
         /// <summary>
-        /// Called after a <see cref="HitObject"/> blueprint has been added.
+        /// Called after an item's blueprint has been added.
         /// </summary>
-        /// <param name="blueprint">The <see cref="HitObject"/> for which the blueprint has been added.</param>
-        protected virtual void OnBlueprintAdded(SelectionBlueprint<T> blueprint)
+        /// <param name="item">The item for which the blueprint has been added.</param>
+        protected virtual void OnBlueprintAdded(T item)
         {
+            if (SelectionHandler.SelectedItems.Contains(item))
+                blueprintMap[item].Select();
         }
 
         /// <summary>
-        /// Called after a <see cref="HitObject"/> blueprint has been removed.
+        /// Called after an item's blueprint has been removed.
         /// </summary>
-        /// <param name="item">The <see cref="HitObject"/> for which the blueprint has been removed.</param>
-        protected virtual void OnBlueprintRemoved(SelectionBlueprint<T> item)
+        /// <param name="item">The item for which the blueprint has been removed.</param>
+        protected virtual void OnBlueprintRemoved(T item)
         {
         }
 
@@ -398,16 +401,21 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (!SelectionHandler.SelectedBlueprints.Any())
                 return;
 
-            // Any selected blueprint that is hovered can begin the movement of the group, however only the earliest hitobject is used for movement
+            // Any selected blueprint that is hovered can begin the movement of the group, however only the first item (according to SortForMovement) is used for movement.
             // A special case is added for when a click selection occurred before the drag
             if (!clickSelectionBegan && !SelectionHandler.SelectedBlueprints.Any(b => b.IsHovered))
                 return;
 
-            // Movement is tracked from the blueprint of the earliest hitobject, since it only makes sense to distance snap from that hitobject
+            // Movement is tracked from the blueprint of the earliest item, since it only makes sense to distance snap from that item
             movementBlueprints = SortForMovement(SelectionHandler.SelectedBlueprints).ToArray();
             movementBlueprintOriginalPositions = movementBlueprints.Select(m => m.ScreenSpaceSelectionPoint).ToArray();
         }
 
+        /// <summary>
+        /// Apply sorting of selected blueprints before performing movement. Generally used to surface the "main" item to the beginning of the collection.
+        /// </summary>
+        /// <param name="blueprints">The blueprints to be moved.</param>
+        /// <returns>Sorted blueprints.</returns>
         protected virtual IEnumerable<SelectionBlueprint<T>> SortForMovement(IReadOnlyList<SelectionBlueprint<T>> blueprints) => blueprints;
 
         /// <summary>
@@ -442,7 +450,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
 
             // if no positional snapping could be performed, try unrestricted snapping from the earliest
-            // hitobject in the selection.
+            // item in the selection.
 
             // The final movement position, relative to movementBlueprintOriginalPosition.
             Vector2 movePosition = movementBlueprintOriginalPositions.First() + distanceTravelled;
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index f22404e77d..f8ac0552ae 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -239,9 +239,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 updatePlacementPosition();
         }
 
-        protected sealed override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject hitObject)
+        protected sealed override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject item)
         {
-            var drawable = Composer.HitObjects.FirstOrDefault(d => d.HitObject == hitObject);
+            var drawable = Composer.HitObjects.FirstOrDefault(d => d.HitObject == item);
 
             if (drawable == null)
                 return null;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 52c148f852..8f2f1d65b8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -15,26 +15,27 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// A component which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
+    /// A component which outlines items and handles movement of selections.
     /// </summary>
     public abstract class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
         /// <summary>
         /// The currently selected blueprints.
         /// Should be used when operations are dealing directly with the visible blueprints.
-        /// For more general selection operations, use <see cref="osu.Game.Screens.Edit.EditorBeatmap.SelectedHitObjects"/> instead.
+        /// For more general selection operations, use <see cref="SelectedItems"/> instead.
         /// </summary>
         public IReadOnlyList<SelectionBlueprint<T>> SelectedBlueprints => selectedBlueprints;
 
-        public BindableList<T> SelectedItems = new BindableList<T>();
+        /// <summary>
+        /// The currently selected items.
+        /// </summary>
+        public readonly BindableList<T> SelectedItems = new BindableList<T>();
 
         private readonly List<SelectionBlueprint<T>> selectedBlueprints;
 
@@ -124,45 +125,45 @@ namespace osu.Game.Screens.Edit.Compose.Components
         #region User Input Handling
 
         /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being moved.
+        /// Handles the selected items being moved.
         /// </summary>
         /// <remarks>
-        /// Just returning true is enough to allow <see cref="HitObject.StartTime"/> updates to take place.
+        /// Just returning true is enough to allow default movement to take place.
         /// Custom implementation is only required if other attributes are to be considered, like changing columns.
         /// </remarks>
         /// <param name="moveEvent">The move event.</param>
         /// <returns>
-        /// Whether any <see cref="DrawableHitObject"/>s could be moved.
+        /// Whether any items could be moved.
         /// Returning true will also propagate StartTime changes provided by the closest <see cref="IPositionSnapProvider.SnapScreenSpacePositionToValidTime"/>.
         /// </returns>
         public virtual bool HandleMovement(MoveSelectionEvent<T> moveEvent) => false;
 
         /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being rotated.
+        /// Handles the selected items being rotated.
         /// </summary>
         /// <param name="angle">The delta angle to apply to the selection.</param>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be rotated.</returns>
+        /// <returns>Whether any items could be rotated.</returns>
         public virtual bool HandleRotation(float angle) => false;
 
         /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being scaled.
+        /// Handles the selected items being scaled.
         /// </summary>
         /// <param name="scale">The delta scale to apply, in playfield local coordinates.</param>
         /// <param name="anchor">The point of reference where the scale is originating from.</param>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be scaled.</returns>
+        /// <returns>Whether any items could be scaled.</returns>
         public virtual bool HandleScale(Vector2 scale, Anchor anchor) => false;
 
         /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being flipped.
+        /// Handles the selected items being flipped.
         /// </summary>
         /// <param name="direction">The direction to flip</param>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be flipped.</returns>
+        /// <returns>Whether any items could be flipped.</returns>
         public virtual bool HandleFlip(Direction direction) => false;
 
         /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being reversed pattern-wise.
+        /// Handles the selected items being reversed pattern-wise.
         /// </summary>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be reversed.</returns>
+        /// <returns>Whether any items could be reversed.</returns>
         public virtual bool HandleReverse() => false;
 
         public bool OnPressed(PlatformAction action)
@@ -196,7 +197,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal virtual void HandleSelected(SelectionBlueprint<T> blueprint)
         {
-            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
+            // there are potentially multiple SelectionHandlers active, but we only want to add items to the selected list once.
             if (!SelectedItems.Contains(blueprint.Item))
                 SelectedItems.Add(blueprint.Item);
 
@@ -323,7 +324,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (selectedBlueprints.Count == 0)
                 return;
 
-            // Move the rectangle to cover the hitobjects
+            // Move the rectangle to cover the items
             var topLeft = new Vector2(float.MaxValue, float.MaxValue);
             var bottomRight = new Vector2(float.MinValue, float.MinValue);
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 2bb80bc27b..7c1bbd65f9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -179,9 +179,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new TimelineSelectionHandler();
 
-        protected override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject hitObject)
+        protected override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject item)
         {
-            return new TimelineHitObjectBlueprint(hitObject)
+            return new TimelineHitObjectBlueprint(item)
             {
                 OnDragHandled = handleScrollViaDrag
             };

From 42255f8d3350673f085835da8eca68a6a3df382c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:57:51 +0900
Subject: [PATCH 09553/10326] Rename and xmldoc selection completed method

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs  | 7 +++++--
 .../Edit/Compose/Components/EditorBlueprintContainer.cs    | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index c2ba627df4..392b375d12 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (isDraggingBlueprint)
             {
-                UpdateSelection();
+                DragOperationCompleted();
 
                 changeHandler?.EndChange();
             }
@@ -182,7 +182,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DragBox.Hide();
         }
 
-        protected virtual void UpdateSelection()
+        /// <summary>
+        /// Called whenever a drag operation completes, before any change transaction is committed.
+        /// </summary>
+        protected virtual void DragOperationCompleted()
         {
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index d17892d6ba..9eee680bda 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -108,9 +108,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.AddBlueprintFor(item);
         }
 
-        protected override void UpdateSelection()
+        protected override void DragOperationCompleted()
         {
-            base.UpdateSelection();
+            base.DragOperationCompleted();
 
             // handle positional change etc.
             foreach (var blueprint in SelectionBlueprints)

From b87446a5778ee76c96f02cd163beebdc44476e24 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 19:37:01 +0900
Subject: [PATCH 09554/10326] Simplify HitObjectLifetimeEntry logic a bit

---
 .../Objects/HitObjectLifetimeEntry.cs         | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 0181d6241b..0d1eb68f07 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -45,23 +45,16 @@ namespace osu.Game.Rulesets.Objects
         // This method is called even if `start == LifetimeStart` when `KeepAlive` is true (necessary to update `realLifetimeStart`).
         protected override void SetLifetimeStart(double start)
         {
-            // This assignment cannot be done in `SetLifetime` because otherwise setting only `LifetimeStart` will make `realLifetimeEnd` to be lost.
             realLifetimeStart = start;
-            base.SetLifetimeStart(start);
+            if (!keepAlive)
+                base.SetLifetimeStart(start);
         }
 
         protected override void SetLifetimeEnd(double end)
         {
             realLifetimeEnd = end;
-            base.SetLifetimeEnd(end);
-        }
-
-        protected override void SetLifetime(double start, double end)
-        {
-            if (keepAlive)
-                base.SetLifetime(double.MinValue, double.MaxValue);
-            else
-                base.SetLifetime(start, end);
+            if (!keepAlive)
+                base.SetLifetimeEnd(end);
         }
 
         private bool keepAlive;
@@ -77,7 +70,10 @@ namespace osu.Game.Rulesets.Objects
                     return;
 
                 keepAlive = value;
-                SetLifetime(realLifetimeStart, realLifetimeEnd);
+                if (keepAlive)
+                    SetLifetime(double.MinValue, double.MaxValue);
+                else
+                    SetLifetime(realLifetimeStart, realLifetimeEnd);
             }
         }
 

From c4d28110d641c9d121d88e4559c783cfc2094218 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Tue, 27 Apr 2021 19:02:57 +0800
Subject: [PATCH 09555/10326] Add visual tests for timing based note coloring

---
 .../TestSceneTimingBasedNoteColouring.cs      | 88 +++++++++++++++++++
 .../Objects/Drawables/DrawableNote.cs         |  2 +-
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
new file mode 100644
index 0000000000..3a9ddb6a9d
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
@@ -0,0 +1,88 @@
+// Copyright (c) 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.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Tests.Visual;
+using osu.Framework.Timing;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Configuration;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class TestSceneTimingBasedNoteColouring : OsuTestScene
+    {
+        [Resolved]
+        private RulesetConfigCache configCache { get; set; }
+        private readonly Bindable<bool> configTimingBasedNoteColouring = new Bindable<bool>();
+
+        protected override void LoadComplete()
+        {
+            const int beatLength = 500;
+
+            var ruleset = new ManiaRuleset();
+
+            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 })
+            {
+                HitObjects = {
+                    new Note { StartTime = 0 },
+                    new Note { StartTime = beatLength / 16 },
+                    new Note { StartTime = beatLength / 12 },
+                    new Note { StartTime = beatLength / 8 },
+                    new Note { StartTime = beatLength / 6 },
+                    new Note { StartTime = beatLength / 4 },
+                    new Note { StartTime = beatLength / 3 },
+                    new Note { StartTime = beatLength / 2 },
+                    new Note { StartTime = beatLength }
+                },
+                ControlPointInfo = new ControlPointInfo(),
+                BeatmapInfo =
+                {
+                    BaseDifficulty = new BeatmapDifficulty
+                    {
+                        SliderTickRate = 4,
+                        OverallDifficulty = 10,
+                    },
+                    Ruleset = ruleset.RulesetInfo
+                },
+            };
+
+            foreach (var note in beatmap.HitObjects)
+            {
+                note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            }
+
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint()
+                {
+                    TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                    BeatLength = beatLength
+                }
+            );
+
+            Child = new Container
+            {
+                Clock = new FramedClock(new ManualClock()),
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new[]
+                {
+                    ruleset.CreateDrawableRulesetWith(beatmap)
+                }
+            };
+
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.TimingBasedNoteColouring, configTimingBasedNoteColouring);
+
+            AddStep("Enable", () => configTimingBasedNoteColouring.Value = true);
+            AddStep("Disable", () => configTimingBasedNoteColouring.Value = false);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 102cd485dc..942a32936c 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private OsuColour colours { get; set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private BeatDivisorFinder beatDivisorFinder { get; set; }
 
         private readonly Bindable<bool> configTimingBasedNoteColouring = new Bindable<bool>();

From 4752a0201ad2373c2bfefb9ae8328e5de8609298 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Tue, 27 Apr 2021 19:25:46 +0800
Subject: [PATCH 09556/10326] Fix cake errors

---
 .../TestSceneTimingBasedNoteColouring.cs      | 26 +++---
 osu.Game.Tests/NonVisual/BeatDivisorFinder.cs | 90 +++++++++----------
 2 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
index 3a9ddb6a9d..5cfd7ff389 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
@@ -21,26 +21,28 @@ namespace osu.Game.Rulesets.Mania.Tests
     {
         [Resolved]
         private RulesetConfigCache configCache { get; set; }
+
         private readonly Bindable<bool> configTimingBasedNoteColouring = new Bindable<bool>();
 
         protected override void LoadComplete()
         {
-            const int beatLength = 500;
+            const double beat_length = 500;
 
             var ruleset = new ManiaRuleset();
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 })
             {
-                HitObjects = {
+                HitObjects =
+                {
                     new Note { StartTime = 0 },
-                    new Note { StartTime = beatLength / 16 },
-                    new Note { StartTime = beatLength / 12 },
-                    new Note { StartTime = beatLength / 8 },
-                    new Note { StartTime = beatLength / 6 },
-                    new Note { StartTime = beatLength / 4 },
-                    new Note { StartTime = beatLength / 3 },
-                    new Note { StartTime = beatLength / 2 },
-                    new Note { StartTime = beatLength }
+                    new Note { StartTime = beat_length / 16 },
+                    new Note { StartTime = beat_length / 12 },
+                    new Note { StartTime = beat_length / 8 },
+                    new Note { StartTime = beat_length / 6 },
+                    new Note { StartTime = beat_length / 4 },
+                    new Note { StartTime = beat_length / 3 },
+                    new Note { StartTime = beat_length / 2 },
+                    new Note { StartTime = beat_length }
                 },
                 ControlPointInfo = new ControlPointInfo(),
                 BeatmapInfo =
@@ -59,10 +61,10 @@ namespace osu.Game.Rulesets.Mania.Tests
                 note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
             }
 
-            beatmap.ControlPointInfo.Add(0, new TimingControlPoint()
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint
                 {
                     TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                    BeatLength = beatLength
+                    BeatLength = beat_length
                 }
             );
 
diff --git a/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs b/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
index 742f5790d6..720d8e8ecd 100644
--- a/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
+++ b/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
@@ -14,32 +14,32 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestFindDivisor()
         {
-            const int beatLength = 1000;
+            const double beat_length = 1000;
 
             var beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
-                    new HitObject { StartTime = -beatLength / 3 },
+                    new HitObject { StartTime = -beat_length / 3 },
                     new HitObject { StartTime = 0 },
-                    new HitObject { StartTime = beatLength / 16 },
-                    new HitObject { StartTime = beatLength / 12 },
-                    new HitObject { StartTime = beatLength / 8 },
-                    new HitObject { StartTime = beatLength / 6 },
-                    new HitObject { StartTime = beatLength / 4 },
-                    new HitObject { StartTime = beatLength / 3 },
-                    new HitObject { StartTime = beatLength / 2 },
-                    new HitObject { StartTime = beatLength },
-                    new HitObject { StartTime = beatLength + beatLength / 7 }
+                    new HitObject { StartTime = beat_length / 16 },
+                    new HitObject { StartTime = beat_length / 12 },
+                    new HitObject { StartTime = beat_length / 8 },
+                    new HitObject { StartTime = beat_length / 6 },
+                    new HitObject { StartTime = beat_length / 4 },
+                    new HitObject { StartTime = beat_length / 3 },
+                    new HitObject { StartTime = beat_length / 2 },
+                    new HitObject { StartTime = beat_length },
+                    new HitObject { StartTime = beat_length + beat_length / 7 }
                 },
                 ControlPointInfo = new ControlPointInfo()
             };
 
-            beatmap.ControlPointInfo.Add(0, new TimingControlPoint()
-                {
-                    TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                    BeatLength = beatLength
-                });
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = beat_length
+            });
 
             var beatDivisorFinder = new BeatDivisorFinder(beatmap);
 
@@ -59,49 +59,49 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestFindDivisorWithTempoChanges()
         {
-            const int firstBeatLength = 1000;
-            const int secondBeatLength = 700;
-            const int thirdBeatLength = 200;
+            const double first_beat_length = 1000;
+            const double second_beat_length = 700;
+            const double third_beat_length = 200;
 
-            const int firstBeatLengthStart = 0;
-            const int secondBeatLengthStart = 1000;
-            const int thirdBeatLengthStart = 2000;
+            const double first_beat_length_start = 0;
+            const double second_beat_length_start = 1000;
+            const double third_beat_length_start = 2000;
 
             var beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
-                    new HitObject { StartTime = firstBeatLengthStart },
-                    new HitObject { StartTime = firstBeatLengthStart + firstBeatLength / 2 },
-                    new HitObject { StartTime = secondBeatLengthStart },
-                    new HitObject { StartTime = secondBeatLengthStart + secondBeatLength / 2 },
-                    new HitObject { StartTime = thirdBeatLengthStart },
-                    new HitObject { StartTime = thirdBeatLengthStart + thirdBeatLength / 2 },
+                    new HitObject { StartTime = first_beat_length_start },
+                    new HitObject { StartTime = first_beat_length_start + first_beat_length / 2 },
+                    new HitObject { StartTime = second_beat_length_start },
+                    new HitObject { StartTime = second_beat_length_start + second_beat_length / 2 },
+                    new HitObject { StartTime = third_beat_length_start },
+                    new HitObject { StartTime = third_beat_length_start + third_beat_length / 2 },
                 },
                 ControlPointInfo = new ControlPointInfo()
             };
 
-            var firstTimingControlPoint = new TimingControlPoint()
+            var firstTimingControlPoint = new TimingControlPoint
             {
                 TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = firstBeatLength
-            };
-            
-            var secondTimingControlPoint = new TimingControlPoint()
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = secondBeatLength
-            };
-            
-            var thirdTimingControlPoint = new TimingControlPoint()
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = thirdBeatLength
+                BeatLength = first_beat_length
             };
 
-            beatmap.ControlPointInfo.Add(firstBeatLengthStart, firstTimingControlPoint);
-            beatmap.ControlPointInfo.Add(secondBeatLengthStart, secondTimingControlPoint);
-            beatmap.ControlPointInfo.Add(thirdBeatLengthStart, thirdTimingControlPoint);
+            var secondTimingControlPoint = new TimingControlPoint
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = second_beat_length
+            };
+
+            var thirdTimingControlPoint = new TimingControlPoint
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = third_beat_length
+            };
+
+            beatmap.ControlPointInfo.Add(first_beat_length_start, firstTimingControlPoint);
+            beatmap.ControlPointInfo.Add(second_beat_length_start, secondTimingControlPoint);
+            beatmap.ControlPointInfo.Add(third_beat_length_start, thirdTimingControlPoint);
 
             var beatDivisorFinder = new BeatDivisorFinder(beatmap);
 

From 200352b7507cb234f6fce5f287e06492caf87606 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 13:56:05 +0200
Subject: [PATCH 09557/10326] Rename unsnap check templates

---
 .../Editing/Checks/CheckUnsnappedObjectsTest.cs  |  8 ++++----
 .../Edit/Checks/CheckUnsnappedObjects.cs         | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
index f8cac331bc..5e65b263f2 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
@@ -108,8 +108,8 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(2));
-            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate1MsOrMore));
-            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate2MsOrMore));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateLargeUnsnap));
         }
 
         private Mock<Slider> getSliderMock(double startTime, double endTime, int repeats = 0)
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
-            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate1MsOrMore));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
         }
 
         private void assert2Ms(List<HitObject> hitobjects, int count = 1)
@@ -140,7 +140,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
-            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate2MsOrMore));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateLargeUnsnap));
         }
 
         private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index 74a2ce2fd7..8b6bb7d461 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {
-            new IssueTemplate2MsOrMore(this),
-            new IssueTemplate1MsOrMore(this)
+            new IssueTemplateLargeUnsnap(this),
+            new IssueTemplateSmallUnsnap(this)
         };
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
@@ -55,9 +55,9 @@ namespace osu.Game.Rulesets.Edit.Checks
         private IEnumerable<Issue> getUnsnapIssues(HitObject hitobject, double unsnap, double time, string postfix = "")
         {
             if (Math.Abs(unsnap) >= UNSNAP_MS_THRESHOLD)
-                yield return new IssueTemplate2MsOrMore(this).Create(hitobject, unsnap, time, postfix);
+                yield return new IssueTemplateLargeUnsnap(this).Create(hitobject, unsnap, time, postfix);
             else if (Math.Abs(unsnap) >= 1)
-                yield return new IssueTemplate1MsOrMore(this).Create(hitobject, unsnap, time, postfix);
+                yield return new IssueTemplateSmallUnsnap(this).Create(hitobject, unsnap, time, postfix);
 
             // We don't care about unsnaps < 1 ms, as all object ends have these due to the way SV works.
         }
@@ -79,17 +79,17 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
         }
 
-        public class IssueTemplate2MsOrMore : IssueTemplateUnsnap
+        public class IssueTemplateLargeUnsnap : IssueTemplateUnsnap
         {
-            public IssueTemplate2MsOrMore(ICheck check)
+            public IssueTemplateLargeUnsnap(ICheck check)
                 : base(check, IssueType.Problem)
             {
             }
         }
 
-        public class IssueTemplate1MsOrMore : IssueTemplateUnsnap
+        public class IssueTemplateSmallUnsnap : IssueTemplateUnsnap
         {
-            public IssueTemplate1MsOrMore(ICheck check)
+            public IssueTemplateSmallUnsnap(ICheck check)
                 : base(check, IssueType.Negligible)
             {
             }

From 5dadfd04e7c11f0e69982401fe5647ba67621067 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 22:36:25 +0900
Subject: [PATCH 09558/10326] 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 e0b07549f4..5aee9e15cc 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.424.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.427.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9a43d5f031..986bd8e7ba 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.424.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 2c41b3ef26..c32109d6db 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.Framework.iOS" Version="2021.424.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.427.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.424.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3b04aed491abef2278c34f497ead995a839c6f52 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 27 Apr 2021 22:31:23 +0900
Subject: [PATCH 09559/10326] Add failing test

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 20fa0732b9..2c862fe8a8 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -287,6 +287,23 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.AreEqual(expectedReturnValue, hitResult.IsScorable());
         }
 
+        [TestCase(HitResult.Perfect, 1_000_000)]
+        [TestCase(HitResult.SmallTickHit, 1_000_000)]
+        [TestCase(HitResult.LargeTickHit, 1_000_000)]
+        [TestCase(HitResult.SmallBonus, 700_000 + Judgement.SMALL_BONUS_SCORE)]
+        [TestCase(HitResult.LargeBonus, 700_000 + Judgement.LARGE_BONUS_SCORE)]
+        public void TestGetScoreWithExternalStatistics(HitResult result, int expectedScore)
+        {
+            var statistic = new Dictionary<HitResult, int> { { result, 1 } };
+
+            scoreProcessor.ApplyBeatmap(new Beatmap
+            {
+                HitObjects = { new TestHitObject(result) }
+            });
+
+            Assert.That(scoreProcessor.GetImmediateScore(ScoringMode.Standardised, result.AffectsCombo() ? 1 : 0, statistic), Is.EqualTo(expectedScore).Within(0.5d));
+        }
+
         private class TestJudgement : Judgement
         {
             public override HitResult MaxResult { get; }

From 1281993f1f9b106c6e77c05cf59b96e85590feda Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 27 Apr 2021 22:35:31 +0900
Subject: [PATCH 09560/10326] Fix bonus score not calculated from the correct
 statistics

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 0fb5c2f4b5..a16a6a6c9b 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Scoring
                 computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
             }
 
-            return GetScore(mode, maxAchievableCombo, calculateAccuracyRatio(computedBaseScore), calculateComboRatio(maxCombo), scoreResultCounts);
+            return GetScore(mode, maxAchievableCombo, calculateAccuracyRatio(computedBaseScore), calculateComboRatio(maxCombo), statistics);
         }
 
         /// <summary>

From baa6e845aa812d91a15c655b459de4fbaa203c09 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 27 Apr 2021 22:38:37 +0900
Subject: [PATCH 09561/10326] Change to fluent assertions

---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 2c862fe8a8..ac26f4723e 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
@@ -51,7 +50,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
             };
             scoreProcessor.ApplyResult(judgementResult);
 
-            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(expectedScore).Within(0.5d));
         }
 
         /// <summary>
@@ -118,7 +117,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
                 scoreProcessor.ApplyResult(judgementResult);
             }
 
-            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value, 0.5));
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(expectedScore).Within(0.5d));
         }
 
         /// <remarks>
@@ -158,7 +157,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
             };
             scoreProcessor.ApplyResult(lastJudgementResult);
 
-            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value, 0.5));
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(expectedScore).Within(0.5d));
         }
 
         [Test]
@@ -169,7 +168,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
             scoreProcessor.Mode.Value = scoringMode;
             scoreProcessor.ApplyBeatmap(new TestBeatmap(new RulesetInfo()));
 
-            Assert.IsTrue(Precision.AlmostEquals(0, scoreProcessor.TotalScore.Value));
+            Assert.That(scoreProcessor.TotalScore.Value, Is.Zero);
         }
 
         [TestCase(HitResult.IgnoreHit, HitResult.IgnoreMiss)]

From b8b6d0e861bd0269b841ceacfaab3c361128bc3b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 16:54:47 +0200
Subject: [PATCH 09562/10326] Add tests for `ClosestBeatDivisor`

Used https://github.com/ppy/osu/pull/12558/files#diff-5c1f04c5b262ca3abbaf867aa91b62a60b66691323c286ad5aa0b75c153cc6ca as reference.
---
 .../NonVisual/ClosestBeatDivisorTest.cs       | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs

diff --git a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
new file mode 100644
index 0000000000..4d6986f5d2
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
@@ -0,0 +1,91 @@
+// Copyright (c) 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.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Tests.NonVisual
+{
+    public class ClosestBeatDivisorTest
+    {
+        [Test]
+        public void TestExactDivisors()
+        {
+            var cpi = new ControlPointInfo();
+            cpi.Add(-1000, new TimingControlPoint { BeatLength = 1000 });
+
+            double[] divisors = { 3, 1, 16, 12, 8, 6, 4, 3, 2, 1 };
+
+            assertClosestDivisors(divisors, divisors, cpi);
+        }
+
+        [Test]
+        public void TestExactDivisorWithTempoChanges()
+        {
+            int offset = 0;
+            int[] beatLengths = { 1000, 200, 100, 50 };
+
+            var cpi = new ControlPointInfo();
+
+            foreach (int beatLength in beatLengths)
+            {
+                cpi.Add(offset, new TimingControlPoint { BeatLength = beatLength });
+                offset += beatLength * 2;
+            }
+
+            double[] divisors = { 3, 1, 16, 12, 8, 6, 4, 3 };
+
+            assertClosestDivisors(divisors, divisors, cpi);
+        }
+
+        [Test]
+        public void TestExactDivisorsHighBPMStream()
+        {
+            var cpi = new ControlPointInfo();
+            cpi.Add(-50, new TimingControlPoint { BeatLength = 50 }); // 1200 BPM 1/4 (limit testing)
+
+            // A 1/4 stream should land on 1/1, 1/2 and 1/4 divisors.
+            double[] divisors = { 4, 4, 4, 4, 4, 4, 4, 4 };
+            double[] closestDivisors = { 4, 2, 4, 1, 4, 2, 4, 1 };
+
+            assertClosestDivisors(divisors, closestDivisors, cpi, step: 1 / 4d);
+        }
+
+        [Test]
+        public void TestApproximateDivisors()
+        {
+            var cpi = new ControlPointInfo();
+            cpi.Add(-1000, new TimingControlPoint { BeatLength = 1000 });
+
+            double[] divisors = { 3.03d, 0.97d, 14, 13, 7.94d, 6.08d, 3.93d, 2.96d, 2.02d, 64 };
+            double[] closestDivisors = { 3, 1, 16, 12, 8, 6, 4, 3, 2, 1 };
+
+            assertClosestDivisors(divisors, closestDivisors, cpi);
+        }
+
+        private void assertClosestDivisors(IReadOnlyList<double> divisors, IReadOnlyList<double> closestDivisors, ControlPointInfo cpi, double step = 1)
+        {
+            List<HitObject> hitobjects = new List<HitObject>();
+            double offset = cpi.TimingPoints[0].Time;
+
+            for (int i = 0; i < divisors.Count; ++i)
+            {
+                double beatLength = cpi.TimingPointAt(offset).BeatLength;
+                hitobjects.Add(new HitObject { StartTime = offset + beatLength / divisors[i] });
+                offset += beatLength * step;
+            }
+
+            var beatmap = new Beatmap
+            {
+                HitObjects = hitobjects,
+                ControlPointInfo = cpi
+            };
+
+            for (int i = 0; i < divisors.Count; ++i)
+                Assert.AreEqual(closestDivisors[i], beatmap.ClosestBeatDivisor(beatmap.HitObjects[i].StartTime), $"at index {i}");
+        }
+    }
+}

From 4e3ee773968e52788ccf73bca74fe883d72da113 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 28 Apr 2021 02:46:34 +0900
Subject: [PATCH 09563/10326] Add support for custom controls to
 SettingSourceAttribute

---
 .../Mods/SettingsSourceAttributeTest.cs       | 29 +++++++++++++++++++
 .../Configuration/SettingSourceAttribute.cs   | 29 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
index 883c9d1ac2..dd105787fa 100644
--- a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
+++ b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
@@ -4,7 +4,10 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Tests.Mods
 {
@@ -26,6 +29,16 @@ namespace osu.Game.Tests.Mods
             Assert.That(orderedSettings[3].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.UnorderedSetting)));
         }
 
+        [Test]
+        public void TestCustomControl()
+        {
+            var objectWithCustomSettingControl = new ClassWithCustomSettingControl();
+            var settings = objectWithCustomSettingControl.CreateSettingsControls().ToArray();
+
+            Assert.That(settings, Has.Length.EqualTo(1));
+            Assert.That(settings[0], Is.TypeOf<CustomSettingsControl>());
+        }
+
         private class ClassWithSettings
         {
             [SettingSource("Unordered setting", "Should be last")]
@@ -40,5 +53,21 @@ namespace osu.Game.Tests.Mods
             [SettingSource("Third setting", "Yet another description", 3)]
             public BindableInt ThirdSetting { get; set; } = new BindableInt();
         }
+
+        private class ClassWithCustomSettingControl
+        {
+            [SettingSource("Custom setting", "Should be a custom control", SettingControlType = typeof(CustomSettingsControl))]
+            public BindableInt UnorderedSetting { get; set; } = new BindableInt();
+        }
+
+        private class CustomSettingsControl : SettingsItem<int>
+        {
+            protected override Drawable CreateControl() => new CustomControl();
+
+            private class CustomControl : Drawable, IHasCurrentValue<int>
+            {
+                public Bindable<int> Current { get; set; } = new Bindable<int>();
+            }
+        }
     }
 }
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index cfce615130..13cf0a9f0c 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.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.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;
@@ -31,7 +34,15 @@ namespace osu.Game.Configuration
 
         public int? OrderPosition { get; }
 
-        public SettingSourceAttribute(string label, string description = null)
+        /// <summary>
+        /// The type of the settings control which handles this setting source.
+        /// </summary>
+        /// <remarks>
+        /// Must be a type deriving <see cref="SettingsItem{T}"/> with a public constructor.
+        /// </remarks>
+        public Type? SettingControlType { get; set; }
+
+        public SettingSourceAttribute(string? label, string? description = null)
         {
             Label = label ?? string.Empty;
             Description = description ?? string.Empty;
@@ -67,6 +78,22 @@ namespace osu.Game.Configuration
             {
                 object value = property.GetValue(obj);
 
+                if (attr.SettingControlType != null)
+                {
+                    var controlType = attr.SettingControlType;
+                    if (controlType.EnumerateBaseTypes().All(t => !t.IsGenericType || t.GetGenericTypeDefinition() != typeof(SettingsItem<>)))
+                        throw new InvalidOperationException($"{nameof(SettingSourceAttribute)} had an unsupported custom control type ({controlType.ReadableName()})");
+
+                    var control = (Drawable)Activator.CreateInstance(controlType);
+                    controlType.GetProperty(nameof(SettingsItem<object>.LabelText))?.SetValue(control, attr.Label);
+                    controlType.GetProperty(nameof(SettingsItem<object>.TooltipText))?.SetValue(control, attr.Description);
+                    controlType.GetProperty(nameof(SettingsItem<object>.Current))?.SetValue(control, value);
+
+                    yield return control;
+
+                    continue;
+                }
+
                 switch (value)
                 {
                     case BindableNumber<float> bNumber:

From 61b7dc1e0601feea555c2841249714a9bc684f68 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 28 Apr 2021 03:42:29 +0900
Subject: [PATCH 09564/10326] Fix bonus-only maps having 700K base score

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs           | 12 ++++++------
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs          |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index ac26f4723e..baa10663d5 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -83,8 +83,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 925_000)] // (3 * 10) / (4 * 10) * 300_000 + 700_000 (max combo 0)
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (3 * 0) / (4 * 30) * 300_000 + (0 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)] // (3 * 30) / (4 * 30) * 300_000 + (0 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 700_030)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 10 (bonus points)
-        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 700_150)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 50 (bonus points)
+        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 10 (bonus points)
+        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 50 (bonus points)
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 156)] // (((3 * 50) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 312)] // (((3 * 100) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
@@ -95,8 +95,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 225)] // (((3 * 10) / (4 * 10)) * 1 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)] // (((3 * 50) / (4 * 50)) * 4 * 300) * (1 + 1 / 25)
-        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 30)] // (0 * 1 * 300) * (1 + 0 / 25) + 3 * 10 (bonus points)
-        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 150)] // (0 * 1 * 300) * (1 + 0 / 25) * 3 * 50 (bonus points)
+        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 330)] // (0 * 1 * 300) * (1 + 0 / 25) + 3 * 10 (bonus points)
+        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 450)] // (1 * 1 * 300) * (1 + 0 / 25) * 3 * 50 (bonus points)
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
         {
             var minResult = new TestJudgement(hitResult).MinResult;
@@ -289,8 +289,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.Perfect, 1_000_000)]
         [TestCase(HitResult.SmallTickHit, 1_000_000)]
         [TestCase(HitResult.LargeTickHit, 1_000_000)]
-        [TestCase(HitResult.SmallBonus, 700_000 + Judgement.SMALL_BONUS_SCORE)]
-        [TestCase(HitResult.LargeBonus, 700_000 + Judgement.LARGE_BONUS_SCORE)]
+        [TestCase(HitResult.SmallBonus, 1_000_000 + Judgement.SMALL_BONUS_SCORE)]
+        [TestCase(HitResult.LargeBonus, 1_000_000 + Judgement.LARGE_BONUS_SCORE)]
         public void TestGetScoreWithExternalStatistics(HitResult result, int expectedScore)
         {
             var statistic = new Dictionary<HitResult, int> { { result, 1 } };
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index a16a6a6c9b..f32f70d4ba 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -266,7 +266,7 @@ namespace osu.Game.Rulesets.Scoring
             if (preferRolling && rollingMaxBaseScore != 0)
                 return baseScore / rollingMaxBaseScore;
 
-            return maxBaseScore > 0 ? baseScore / maxBaseScore : 0;
+            return maxBaseScore > 0 ? baseScore / maxBaseScore : 1;
         }
 
         private double calculateComboRatio(int maxCombo) => maxAchievableCombo > 0 ? (double)maxCombo / maxAchievableCombo : 1;

From 04454062b7dad5cd47b6bd066c23a018e5290f06 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 28 Apr 2021 03:52:59 +0900
Subject: [PATCH 09565/10326] Fix up xmldoc

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 13cf0a9f0c..a9436aac89 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Configuration
         /// The type of the settings control which handles this setting source.
         /// </summary>
         /// <remarks>
-        /// Must be a type deriving <see cref="SettingsItem{T}"/> with a public constructor.
+        /// Must be a type deriving <see cref="SettingsItem{T}"/>.
         /// </remarks>
         public Type? SettingControlType { get; set; }
 

From 05bd6ee50cc20a014c958c86752152ca80e3e553 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 28 Apr 2021 03:54:42 +0900
Subject: [PATCH 09566/10326] Add back ctor doc

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index a9436aac89..3e50613093 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Configuration
         /// The type of the settings control which handles this setting source.
         /// </summary>
         /// <remarks>
-        /// Must be a type deriving <see cref="SettingsItem{T}"/>.
+        /// Must be a type deriving <see cref="SettingsItem{T}"/> with a public parameterless constructor.
         /// </remarks>
         public Type? SettingControlType { get; set; }
 

From 6a921af08555a0b868cacc04a623f07b69e4211d Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 28 Apr 2021 09:23:05 +0700
Subject: [PATCH 09567/10326] add OsuMarkdownSeparator

Reference
https://github.com/ppy/osu-web/blob/d56352aeefc412507c3dab7c16e3e3118421b436/resources/assets/less/bem/osu-md.less#L19-L21
---
 .../TestSceneOsuMarkdownContainer.cs          | 13 ++++++++++
 .../Markdown/OsuMarkdownContainer.cs          |  2 ++
 .../Markdown/OsuMarkdownSeparator.cs          | 26 +++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 3d782ee184..966b5095f9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -62,5 +62,18 @@ This is markdown code block.
 ```";
             });
         }
+
+        [Test]
+        public void TestSeparator()
+        {
+            AddStep("Add Seperator", () =>
+            {
+                markdownContainer.Text = @"Line above
+
+---
+
+Line below";
+            });
+        }
     }
 }
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 95f538eab7..6885e3d60b 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override MarkdownFencedCodeBlock CreateFencedCodeBlock(FencedCodeBlock fencedCodeBlock) => new OsuMarkdownFencedCodeBlock(fencedCodeBlock);
 
+        protected override MarkdownSeparator CreateSeparator(ThematicBreakBlock thematicBlock) => new OsuMarkdownSeparator();
+
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
                                             .UseEmojiAndSmiley()
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs
new file mode 100644
index 0000000000..9b28200452
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Game.Overlays;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownSeparator : MarkdownSeparator
+    {
+        private Drawable separator;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            separator.Colour = colourProvider.Background3;
+        }
+
+        protected override Drawable CreateSeparator()
+        {
+            return separator = base.CreateSeparator();
+        }
+    }
+}

From aa1cb65eaad96ebdc07d1a5e626284b91957af33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 11:42:10 +0900
Subject: [PATCH 09568/10326] Rename region to be more inclusive

---
 .../Components/EditorSelectionHandler.cs      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index d26a2946c1..bb7abd8d8f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #endregion
 
-        #region Sample Changes
+        #region Ternary state changes
 
         /// <summary>
         /// Adds a hit sample to all selected <see cref="HitObject"/>s.
@@ -140,6 +140,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
             });
         }
 
+        /// <summary>
+        /// Removes a hit sample from all selected <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="sampleName">The name of the hit sample.</param>
+        public void RemoveHitSample(string sampleName)
+        {
+            EditorBeatmap.PerformOnSelection(h => h.SamplesBindable.RemoveAll(s => s.Name == sampleName));
+        }
+
         /// <summary>
         /// Set the new combo state of all selected <see cref="HitObject"/>s.
         /// </summary>
@@ -158,15 +167,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             });
         }
 
-        /// <summary>
-        /// Removes a hit sample from all selected <see cref="HitObject"/>s.
-        /// </summary>
-        /// <param name="sampleName">The name of the hit sample.</param>
-        public void RemoveHitSample(string sampleName)
-        {
-            EditorBeatmap.PerformOnSelection(h => h.SamplesBindable.RemoveAll(s => s.Name == sampleName));
-        }
-
         #endregion
 
         #region Context Menu

From 61d4eb177710e44f3e17586f01da6f23048b360c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 11:44:19 +0900
Subject: [PATCH 09569/10326] Remove unnecessary and out-of-place xmldoc

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 8f2f1d65b8..0a1f313407 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -134,7 +134,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="moveEvent">The move event.</param>
         /// <returns>
         /// Whether any items could be moved.
-        /// Returning true will also propagate StartTime changes provided by the closest <see cref="IPositionSnapProvider.SnapScreenSpacePositionToValidTime"/>.
         /// </returns>
         public virtual bool HandleMovement(MoveSelectionEvent<T> moveEvent) => false;
 

From bc455005a5ef1dcd739518ec4e1dec86f3838457 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 11:44:50 +0900
Subject: [PATCH 09570/10326] Fix incorrect coordinate space mention in xmldoc

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 0a1f313407..a19798ed9a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Handles the selected items being scaled.
         /// </summary>
-        /// <param name="scale">The delta scale to apply, in playfield local coordinates.</param>
+        /// <param name="scale">The delta scale to apply, in local coordinates.</param>
         /// <param name="anchor">The point of reference where the scale is originating from.</param>
         /// <returns>Whether any items could be scaled.</returns>
         public virtual bool HandleScale(Vector2 scale, Anchor anchor) => false;

From d0be8f9fb31e6794e68523f2be42c8cfe70223c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 11:45:36 +0900
Subject: [PATCH 09571/10326] Remove one more out-of-date comment

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 392b375d12..7c1b488163 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -354,7 +354,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         break;
 
                     case SelectionState.Selected:
-                        // if the editor is playing, we generally don't want to deselect objects even if outside the selection area.
                         if (AllowDeselection && !isValidForSelection())
                             blueprint.Deselect();
                         break;

From a9a5809e940f2f424958533d6f6e46e133b985f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 11:46:52 +0900
Subject: [PATCH 09572/10326] Fix incorrect xmldoc in `MoveSelectionEvent`

---
 .../Screens/Edit/Compose/Components/MoveSelectionEvent.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index a07b434011..a32c30b579 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -17,12 +17,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public readonly SelectionBlueprint<T> Blueprint;
 
         /// <summary>
-        /// The expected screen-space position of the hitobject at the current cursor position.
+        /// The expected screen-space position of the blueprint's item at the current cursor position.
         /// </summary>
         public readonly Vector2 ScreenSpacePosition;
 
         /// <summary>
-        /// The distance between <see cref="ScreenSpacePosition"/> and the hitobject's current position, in the coordinate-space of the hitobject's parent.
+        /// The distance between <see cref="ScreenSpacePosition"/> and the blueprint's current position, in the coordinate-space of the blueprint item's parent.
         /// </summary>
         public readonly Vector2 InstantDelta;
 

From e4f2e0131c94afbfb95f8b680dfb8c8d37144a8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 12:02:55 +0900
Subject: [PATCH 09573/10326] Rename `AllowDeselection` to better match use
 case

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs   | 6 +++---
 .../Edit/Compose/Components/EditorBlueprintContainer.cs     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7c1b488163..7f31afb9ba 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -76,9 +76,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected virtual DragBox CreateDragBox(Action<RectangleF> performSelect) => new DragBox(performSelect);
 
         /// <summary>
-        /// Whether this component is in a state where deselection should be allowed. If false, selection will only be added to.
+        /// Whether this component is in a state where items outside a drag selection should be deselected. If false, selection will only be added to.
         /// </summary>
-        protected virtual bool AllowDeselection => true;
+        protected virtual bool AllowDeselectionDuringDrag => true;
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
@@ -354,7 +354,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         break;
 
                     case SelectionState.Selected:
-                        if (AllowDeselection && !isValidForSelection())
+                        if (AllowDeselectionDuringDrag && !isValidForSelection())
                             blueprint.Deselect();
                         break;
                 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 9eee680bda..2a605f75d8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override IEnumerable<SelectionBlueprint<HitObject>> SortForMovement(IReadOnlyList<SelectionBlueprint<HitObject>> blueprints)
             => blueprints.OrderBy(b => b.Item.StartTime);
 
-        protected override bool AllowDeselection => !EditorClock.IsRunning;
+        protected override bool AllowDeselectionDuringDrag => !EditorClock.IsRunning;
 
         protected override bool ApplySnapResult(SelectionBlueprint<HitObject>[] blueprints, SnapResult result)
         {

From 43772f4303aedcec12b075899b09873db3f766f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 12:03:41 +0900
Subject: [PATCH 09574/10326] Remove duplicated call to initially select
 blueprint

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7f31afb9ba..a7076bf40e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -267,8 +267,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="item">The item for which the blueprint has been added.</param>
         protected virtual void OnBlueprintAdded(T item)
         {
-            if (SelectionHandler.SelectedItems.Contains(item))
-                blueprintMap[item].Select();
         }
 
         /// <summary>

From 532ec403951c0efdce9abdd4c29c085133079baf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 12:04:48 +0900
Subject: [PATCH 09575/10326] Remove unnecessary newline

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index a7076bf40e..1f9cd0258e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -174,7 +174,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (isDraggingBlueprint)
             {
                 DragOperationCompleted();
-
                 changeHandler?.EndChange();
             }
 

From 736eace00ac68dd56dd86103e7a62a0eb17d13ee Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 28 Apr 2021 10:11:29 +0700
Subject: [PATCH 09576/10326] add OsuMarkdownQuoteBlock

Reference:
https://github.com/ppy/osu-web/blob/d56352aeefc412507c3dab7c16e3e3118421b436/resources/assets/less/base.less#L7-L10
---
 .../TestSceneOsuMarkdownContainer.cs          | 10 +++++
 .../Markdown/OsuMarkdownContainer.cs          |  2 +
 .../Markdown/OsuMarkdownQuoteBlock.cs         | 45 +++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 966b5095f9..d78716bede 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -75,5 +75,15 @@ This is markdown code block.
 Line below";
             });
         }
+
+        [Test]
+        public void TestQuote()
+        {
+            AddStep("Add quote", () =>
+            {
+                markdownContainer.Text =
+                    @"> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.";
+            });
+        }
     }
 }
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 6885e3d60b..9f0000777d 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override MarkdownSeparator CreateSeparator(ThematicBreakBlock thematicBlock) => new OsuMarkdownSeparator();
 
+        protected override MarkdownQuoteBlock CreateQuoteBlock(QuoteBlock quoteBlock) => new OsuMarkdownQuoteBlock(quoteBlock);
+
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
                                             .UseEmojiAndSmiley()
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
new file mode 100644
index 0000000000..869cba82f2
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.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 Markdig.Syntax;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Game.Overlays;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownQuoteBlock : MarkdownQuoteBlock
+    {
+        private Drawable background;
+
+        public OsuMarkdownQuoteBlock(QuoteBlock quoteBlock)
+            : base(quoteBlock)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            background.Colour = colourProvider.Content2;
+        }
+
+        protected override Drawable CreateBackground()
+        {
+            return background = base.CreateBackground();
+        }
+
+        public override MarkdownTextFlowContainer CreateTextFlow()
+        {
+            var textFlow = base.CreateTextFlow();
+            textFlow.Margin = new MarginPadding
+            {
+                Top = 10,
+                Bottom = 10,
+                Left = 20,
+                Right = 20,
+            };
+            return textFlow;
+        }
+    }
+}

From 2252d308c8a67e82c81d6b76e116f00cf6f0ea95 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 28 Apr 2021 10:53:00 +0700
Subject: [PATCH 09577/10326] add OsuMarkdownTableCell

Reference :
https://github.com/ppy/osu-web/blob/d56352aeefc412507c3dab7c16e3e3118421b436/resources/assets/less/bem/osu-md.less#L254-L277
---
 .../Markdown/OsuMarkdownTableCell.cs          | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
new file mode 100644
index 0000000000..d8b9145228
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.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 Markdig.Extensions.Tables;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Overlays;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownTableCell : MarkdownTableCell
+    {
+        private readonly bool isHeading;
+
+        public OsuMarkdownTableCell(TableCell cell, TableColumnDefinition definition, bool isHeading)
+            : base(cell, definition)
+        {
+            this.isHeading = isHeading;
+            Masking = false;
+            BorderThickness = 0;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            var border = new Box
+            {
+                RelativeSizeAxes = Axes.X,
+            };
+
+            // TODO : Change font weight to 700 for heading
+            if (isHeading)
+            {
+                border.Colour = colourProvider.Background3;
+                border.Height = 2;
+                border.Anchor = Anchor.BottomLeft;
+                border.Origin = Anchor.BottomLeft;
+            }
+            else
+            {
+                border.Colour = colourProvider.Background4;
+                border.Height = 1;
+                border.Anchor = Anchor.TopLeft;
+                border.Origin = Anchor.TopLeft;
+            }
+
+            AddInternal(border);
+        }
+    }
+}

From c09067c3d558d5a45dade3efb0aebcbb0d7dcefc Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 28 Apr 2021 10:53:12 +0700
Subject: [PATCH 09578/10326] add OsuMarkdownTable

---
 .../TestSceneOsuMarkdownContainer.cs           | 14 ++++++++++++++
 .../Markdown/OsuMarkdownContainer.cs           |  3 +++
 .../Containers/Markdown/OsuMarkdownTable.cs    | 18 ++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index d78716bede..d80d2362b9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -85,5 +85,19 @@ Line below";
                     @"> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.";
             });
         }
+
+        [Test]
+        public void TestTable()
+        {
+            AddStep("Add Table", () =>
+            {
+                markdownContainer.Text =
+                    @"| Left Aligned  | Center Aligned | Right Aligned |
+| :------------------- | :--------------------: | ---------------------:|
+| Long Align Left Text | Long Align Center Text | Long Align Right Text |
+| Align Left           |      Align Center      |           Align Right |
+| Left                 |         Center         |                 Right |";
+            });
+        }
     }
 }
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 9f0000777d..56bf72656a 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -3,6 +3,7 @@
 
 using Markdig;
 using Markdig.Extensions.AutoIdentifiers;
+using Markdig.Extensions.Tables;
 using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
 using osu.Framework.Graphics.Containers;
@@ -34,6 +35,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override MarkdownQuoteBlock CreateQuoteBlock(QuoteBlock quoteBlock) => new OsuMarkdownQuoteBlock(quoteBlock);
 
+        protected override MarkdownTable CreateTable(Table table) => new OsuMarkdownTable(table);
+
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
                                             .UseEmojiAndSmiley()
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.cs
new file mode 100644
index 0000000000..e0a1ab1220
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.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 Markdig.Extensions.Tables;
+using osu.Framework.Graphics.Containers.Markdown;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownTable : MarkdownTable
+    {
+        public OsuMarkdownTable(Table table)
+            : base(table)
+        {
+        }
+
+        protected override MarkdownTableCell CreateTableCell(TableCell cell, TableColumnDefinition definition, bool isHeading) => new OsuMarkdownTableCell(cell, definition, isHeading);
+    }
+}

From 4e691ce4b06fb59a5a953a236a607cae2e53ebf7 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 28 Apr 2021 11:01:54 +0700
Subject: [PATCH 09579/10326] add test link with inline text markdown

---
 .../UserInterface/TestSceneOsuMarkdownContainer.cs       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index d80d2362b9..4add9f22a5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -50,6 +50,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
+        [Test]
+        public void TestLinkWithInlineText()
+        {
+            AddStep("Add Link with inline text", () =>
+            {
+                markdownContainer.Text = "Hey, [welcome to osu!](https://osu.ppy.sh) Please enjoy the game.";
+            });
+        }
+
         [Test]
         public void TestFencedCodeBlock()
         {

From 4c9e94da2b05b5c5679848258223767b7927b8a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 13:43:16 +0900
Subject: [PATCH 09580/10326] Move context menu logic to base class

---
 .../Edit/TaikoSelectionHandler.cs             |  3 ++
 .../Components/EditorSelectionHandler.cs      | 51 +++++--------------
 .../Compose/Components/SelectionHandler.cs    | 37 +++++++++++++-
 3 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index 20366e5b3a..48ee0d4cf4 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -80,6 +80,9 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
             if (selection.All(s => s.Item is TaikoHitObject))
                 yield return new TernaryStateMenuItem("Strong") { State = { BindTarget = selectionStrongState } };
+
+            foreach (var item in base.GetContextMenuItemsForSelection(selection))
+                yield return item;
         }
 
         public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent) => true;
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index bb7abd8d8f..0fc305dcc4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Audio;
 using osu.Game.Graphics.UserInterface;
@@ -17,7 +16,7 @@ using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
-    public class EditorSelectionHandler : SelectionHandler<HitObject>, IHasContextMenu
+    public class EditorSelectionHandler : SelectionHandler<HitObject>
     {
         [Resolved]
         protected EditorBeatmap EditorBeatmap { get; private set; }
@@ -171,46 +170,24 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #region Context Menu
 
-        public MenuItem[] ContextMenuItems
-        {
-            get
-            {
-                if (!SelectedBlueprints.Any(b => b.IsHovered))
-                    return Array.Empty<MenuItem>();
-
-                var items = new List<MenuItem>();
-
-                items.AddRange(GetContextMenuItemsForSelection(SelectedBlueprints));
-
-                if (SelectedBlueprints.All(b => b.Item is IHasComboInformation))
-                {
-                    items.Add(new TernaryStateMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } });
-                }
-
-                if (SelectedBlueprints.Count == 1)
-                    items.AddRange(SelectedBlueprints[0].ContextMenuItems);
-
-                items.AddRange(new[]
-                {
-                    new OsuMenuItem("Sound")
-                    {
-                        Items = SelectionSampleStates.Select(kvp =>
-                            new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
-                    },
-                    new OsuMenuItem("Delete", MenuItemType.Destructive, DeleteSelected),
-                });
-
-                return items.ToArray();
-            }
-        }
-
         /// <summary>
         /// Provide context menu items relevant to current selection. Calling base is not required.
         /// </summary>
         /// <param name="selection">The current selection.</param>
         /// <returns>The relevant menu items.</returns>
-        protected virtual IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)
-            => Enumerable.Empty<MenuItem>();
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)
+        {
+            if (SelectedBlueprints.All(b => b.Item is IHasComboInformation))
+            {
+                yield return new TernaryStateMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } };
+            }
+
+            yield return new OsuMenuItem("Sound")
+            {
+                Items = SelectionSampleStates.Select(kvp =>
+                    new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
+            };
+        }
 
         #endregion
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index a19798ed9a..02df004129 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -8,12 +8,15 @@ 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.Shapes;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osuTK;
 using osuTK.Input;
@@ -23,7 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// A component which outlines items and handles movement of selections.
     /// </summary>
-    public abstract class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
+    public abstract class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
     {
         /// <summary>
         /// The currently selected blueprints.
@@ -341,5 +344,37 @@ namespace osu.Game.Screens.Edit.Compose.Components
         }
 
         #endregion
+
+        #region Context Menu
+
+        public MenuItem[] ContextMenuItems
+        {
+            get
+            {
+                if (!SelectedBlueprints.Any(b => b.IsHovered))
+                    return Array.Empty<MenuItem>();
+
+                var items = new List<MenuItem>();
+
+                items.AddRange(GetContextMenuItemsForSelection(SelectedBlueprints));
+
+                if (SelectedBlueprints.Count == 1)
+                    items.AddRange(SelectedBlueprints[0].ContextMenuItems);
+
+                items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, DeleteSelected));
+
+                return items.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Provide context menu items relevant to current selection. Calling base is not required.
+        /// </summary>
+        /// <param name="selection">The current selection.</param>
+        /// <returns>The relevant menu items.</returns>
+        protected virtual IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<T>> selection)
+            => Enumerable.Empty<MenuItem>();
+
+        #endregion
     }
 }

From e0906daebf9f17dfca21fa87f776df29e9d568bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 13:49:41 +0900
Subject: [PATCH 09581/10326] Change one remaining instance of incorrect
 terminology in xmldoc

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 02df004129..cb3424a250 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -312,7 +312,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         }
 
         /// <summary>
-        /// Triggered whenever the set of selected objects changes.
+        /// Triggered whenever the set of selected items changes.
         /// Should update the selection box's state to match supported operations.
         /// </summary>
         protected virtual void OnSelectionChanged()

From ac1534cda2fb51afad43bcc4e4f4fe945a232cde Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 15:54:40 +0900
Subject: [PATCH 09582/10326] Add test covering existing button actually
 changing to `LocallyAvailable` state

---
 osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
index 0c199bfb62..3fc894da0d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
@@ -43,7 +43,10 @@ namespace osu.Game.Tests.Visual.Online
             createButtonWithBeatmap(createSoleily());
             AddAssert("button state not downloaded", () => downloadButton.DownloadState == DownloadState.NotDownloaded);
             AddStep("import soleily", () => beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()));
+
             AddUntilStep("wait for beatmap import", () => beatmaps.GetAllUsableBeatmapSets().Any(b => b.OnlineBeatmapSetID == 241526));
+            AddAssert("button state downloaded", () => downloadButton.DownloadState == DownloadState.LocallyAvailable);
+
             createButtonWithBeatmap(createSoleily());
             AddAssert("button state downloaded", () => downloadButton.DownloadState == DownloadState.LocallyAvailable);
             ensureSoleilyRemoved();

From 05e3a73a7d24acf00431405b96234498f830ddcb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 15:54:58 +0900
Subject: [PATCH 09583/10326] Fix import cancellation not correctly being
 forwarded to import notification

---
 osu.Game/Database/ArchiveModelManager.cs | 49 +++++++++++++++---------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 6719351530..dbeaebb1cd 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -156,33 +156,44 @@ namespace osu.Game.Database
 
             bool isLowPriorityImport = tasks.Length > low_priority_import_batch_size;
 
-            await Task.WhenAll(tasks.Select(async task =>
+            try
             {
-                notification.CancellationToken.ThrowIfCancellationRequested();
-
-                try
+                await Task.WhenAll(tasks.Select(async task =>
                 {
-                    var model = await Import(task, isLowPriorityImport, notification.CancellationToken).ConfigureAwait(false);
+                    notification.CancellationToken.ThrowIfCancellationRequested();
 
-                    lock (imported)
+                    try
                     {
-                        if (model != null)
-                            imported.Add(model);
-                        current++;
+                        var model = await Import(task, isLowPriorityImport, notification.CancellationToken).ConfigureAwait(false);
 
-                        notification.Text = $"Imported {current} of {tasks.Length} {HumanisedModelName}s";
-                        notification.Progress = (float)current / tasks.Length;
+                        lock (imported)
+                        {
+                            if (model != null)
+                                imported.Add(model);
+                            current++;
+
+                            notification.Text = $"Imported {current} of {tasks.Length} {HumanisedModelName}s";
+                            notification.Progress = (float)current / tasks.Length;
+                        }
                     }
-                }
-                catch (TaskCanceledException)
+                    catch (TaskCanceledException)
+                    {
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error(e, $@"Could not import ({task})", LoggingTarget.Database);
+                    }
+                })).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                if (imported.Count == 0)
                 {
-                    throw;
+                    notification.State = ProgressNotificationState.Cancelled;
+                    return imported;
                 }
-                catch (Exception e)
-                {
-                    Logger.Error(e, $@"Could not import ({task})", LoggingTarget.Database);
-                }
-            })).ConfigureAwait(false);
+            }
 
             if (imported.Count == 0)
             {

From 8598a0968f17c0733ec38e030abceeddc8dca37a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 16:29:23 +0900
Subject: [PATCH 09584/10326] Update calculations in comments to match new
 logic

Mostly look to be errors that existed before this PR.

Co-authored-by: Endrik <enduslittlecomputer@gmail.com>
---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index baa10663d5..41e16ebeaf 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -83,8 +83,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 925_000)] // (3 * 10) / (4 * 10) * 300_000 + 700_000 (max combo 0)
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (3 * 0) / (4 * 30) * 300_000 + (0 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)] // (3 * 30) / (4 * 30) * 300_000 + (0 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 10 (bonus points)
-        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 50 (bonus points)
+        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)] // 1 * 300_000 + 700_000 (max combo 0) + 3 * 10 (bonus points)
+        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)] // 1 * 300_000 + 700_000 (max combo 0) + 3 * 50 (bonus points)
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 156)] // (((3 * 50) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 312)] // (((3 * 100) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
@@ -95,8 +95,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 225)] // (((3 * 10) / (4 * 10)) * 1 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)] // (((3 * 50) / (4 * 50)) * 4 * 300) * (1 + 1 / 25)
-        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 330)] // (0 * 1 * 300) * (1 + 0 / 25) + 3 * 10 (bonus points)
-        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 450)] // (1 * 1 * 300) * (1 + 0 / 25) * 3 * 50 (bonus points)
+        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 330)] // (1 * 1 * 300) * (1 + 0 / 25) + 3 * 10 (bonus points)
+        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 450)] // (1 * 1 * 300) * (1 + 0 / 25) + 3 * 50 (bonus points)
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
         {
             var minResult = new TestJudgement(hitResult).MinResult;

From e71dbfd730df6a2909deb9b3b53ba027f9f45e29 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 16:37:48 +0900
Subject: [PATCH 09585/10326] Add inline comment regarding remaining issues
 with classic scoring

---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 41e16ebeaf..184a94912a 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -95,6 +95,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 225)] // (((3 * 10) / (4 * 10)) * 1 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)] // (((3 * 50) / (4 * 50)) * 4 * 300) * (1 + 1 / 25)
+        // TODO: The following two cases don't match expectations currently (a single hit is registered in acc portion when it shouldn't be). See https://github.com/ppy/osu/issues/12604.
         [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 330)] // (1 * 1 * 300) * (1 + 0 / 25) + 3 * 10 (bonus points)
         [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 450)] // (1 * 1 * 300) * (1 + 0 / 25) + 3 * 50 (bonus points)
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)

From 48d6c9ac4bee70169ac982611545c9d276126988 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 16:47:30 +0900
Subject: [PATCH 09586/10326] Move snap/divisor helper methods to inside
 `ControlPointInfo`

---
 .../NonVisual/ClosestBeatDivisorTest.cs       |  2 +-
 osu.Game/Beatmaps/Beatmap.cs                  | 26 ------------
 .../ControlPoints/ControlPointInfo.cs         | 42 +++++++++++++++++++
 osu.Game/Beatmaps/IBeatmap.cs                 | 22 ----------
 .../Edit/Checks/CheckUnsnappedObjects.cs      |  8 ++--
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 11 +----
 osu.Game/Screens/Play/GameplayBeatmap.cs      |  9 ----
 7 files changed, 49 insertions(+), 71 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
index 4d6986f5d2..5ac121f5bc 100644
--- a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
+++ b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Tests.NonVisual
             };
 
             for (int i = 0; i < divisors.Count; ++i)
-                Assert.AreEqual(closestDivisors[i], beatmap.ClosestBeatDivisor(beatmap.HitObjects[i].StartTime), $"at index {i}");
+                Assert.AreEqual(closestDivisors[i], beatmap.ControlPointInfo.ClosestBeatDivisor(beatmap.HitObjects[i].StartTime), $"at index {i}");
         }
     }
 }
diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 6515540527..e5b6a4bc44 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -9,7 +9,6 @@ using System.Linq;
 using osu.Game.Beatmaps.ControlPoints;
 using Newtonsoft.Json;
 using osu.Game.IO.Serialization.Converters;
-using osu.Game.Screens.Edit;
 
 namespace osu.Game.Beatmaps
 {
@@ -75,31 +74,6 @@ namespace osu.Game.Beatmaps
             return mostCommon.beatLength;
         }
 
-        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
-        {
-            var timingPoint = ControlPointInfo.TimingPointAt(referenceTime ?? time);
-            var beatLength = timingPoint.BeatLength / beatDivisor;
-            var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
-
-            // Casting to int matches stable.
-            return (int)(timingPoint.Time + beatLengths * beatLength);
-        }
-
-        public int ClosestSnapTime(double time, double? referenceTime = null)
-        {
-            return ClosestSnapTime(time, ClosestBeatDivisor(time, referenceTime), referenceTime);
-        }
-
-        public int ClosestBeatDivisor(double time, double? referenceTime = null)
-        {
-            double getUnsnap(int divisor) => Math.Abs(time - ClosestSnapTime(time, divisor, referenceTime));
-
-            int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
-            double smallestUnsnap = divisors.Min(getUnsnap);
-
-            return divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
-        }
-
         IBeatmap IBeatmap.Clone() => Clone();
 
         public Beatmap<T> Clone() => (Beatmap<T>)MemberwiseClone();
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 5cc60a5758..d1a04061b9 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Framework.Lists;
+using osu.Game.Screens.Edit;
 
 namespace osu.Game.Beatmaps.ControlPoints
 {
@@ -160,6 +161,47 @@ namespace osu.Game.Beatmaps.ControlPoints
             groups.Remove(group);
         }
 
+        /// <summary>
+        /// Returns the time on the given beat divisor closest to the given time.
+        /// </summary>
+        /// <param name="time">The time to find the closest snapped time to.</param>
+        /// <param name="beatDivisor">The beat divisor to snap to.</param>
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
+        {
+            var timingPoint = TimingPointAt(referenceTime ?? time);
+            var beatLength = timingPoint.BeatLength / beatDivisor;
+            var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
+
+            // Casting to int matches stable.
+            return (int)(timingPoint.Time + beatLengths * beatLength);
+        }
+
+        /// <summary>
+        /// Returns the time on any valid beat divisor closest to the given time.
+        /// </summary>
+        /// <param name="time">The time to find the closest snapped time to.</param>
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        public int ClosestSnapTime(double time, double? referenceTime = null)
+        {
+            return ClosestSnapTime(time, ClosestBeatDivisor(time, referenceTime), referenceTime);
+        }
+
+        /// <summary>
+        /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest is returned.
+        /// </summary>
+        /// <param name="time">The time to find the closest beat snap divisor to.</param>
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        public int ClosestBeatDivisor(double time, double? referenceTime = null)
+        {
+            double getUnsnap(int divisor) => Math.Abs(time - ClosestSnapTime(time, divisor, referenceTime));
+
+            int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
+            double smallestUnsnap = divisors.Min(getUnsnap);
+
+            return divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
+        }
+
         /// <summary>
         /// Binary searches one of the control point lists to find the active control point at <paramref name="time"/>.
         /// Includes logic for returning a specific point when no matching point is found.
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 679d639fd1..769b33009a 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -51,28 +51,6 @@ namespace osu.Game.Beatmaps
         /// </summary>
         double GetMostCommonBeatLength();
 
-        /// <summary>
-        /// Returns the time on the given beat divisor closest to the given time.
-        /// </summary>
-        /// <param name="time">The time to find the closest snapped time to.</param>
-        /// <param name="beatDivisor">The beat divisor to snap to.</param>
-        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null);
-
-        /// <summary>
-        /// Returns the time on any valid beat divisor closest to the given time.
-        /// </summary>
-        /// <param name="time">The time to find the closest snapped time to.</param>
-        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        int ClosestSnapTime(double time, double? referenceTime = null);
-
-        /// <summary>
-        /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest is returned.
-        /// </summary>
-        /// <param name="time">The time to find the closest beat snap divisor to.</param>
-        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        int ClosestBeatDivisor(double time, double? referenceTime = null);
-
         /// <summary>
         /// Creates a shallow-clone of this beatmap and returns it.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index 8b6bb7d461..cc5ea2a988 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -24,9 +24,11 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
+            var controlPointInfo = playableBeatmap.ControlPointInfo;
+
             foreach (var hitobject in playableBeatmap.HitObjects)
             {
-                double startUnsnap = hitobject.StartTime - playableBeatmap.ClosestSnapTime(hitobject.StartTime);
+                double startUnsnap = hitobject.StartTime - controlPointInfo.ClosestSnapTime(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
                 foreach (var issue in getUnsnapIssues(hitobject, startUnsnap, hitobject.StartTime, startPostfix))
                     yield return issue;
@@ -37,7 +39,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                     {
                         double spanDuration = hasRepeats.Duration / (hasRepeats.RepeatCount + 1);
                         double repeatTime = hitobject.StartTime + spanDuration * (repeatIndex + 1);
-                        double repeatUnsnap = repeatTime - playableBeatmap.ClosestSnapTime(repeatTime);
+                        double repeatUnsnap = repeatTime - controlPointInfo.ClosestSnapTime(repeatTime);
                         foreach (var issue in getUnsnapIssues(hitobject, repeatUnsnap, repeatTime, "repeat"))
                             yield return issue;
                     }
@@ -45,7 +47,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
                 if (hitobject is IHasDuration hasDuration)
                 {
-                    double endUnsnap = hasDuration.EndTime - playableBeatmap.ClosestSnapTime(hasDuration.EndTime);
+                    double endUnsnap = hasDuration.EndTime - controlPointInfo.ClosestSnapTime(hasDuration.EndTime);
                     foreach (var issue in getUnsnapIssues(hitobject, endUnsnap, hasDuration.EndTime, "end"))
                         yield return issue;
                 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 72fb0ac9e9..f1262daab3 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -301,16 +301,7 @@ namespace osu.Game.Screens.Edit
             return list.Count - 1;
         }
 
-        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
-        {
-            return PlayableBeatmap.ClosestSnapTime(time, beatDivisor, referenceTime);
-        }
-
-        public int ClosestSnapTime(double time, double? referenceTime = null) => PlayableBeatmap.ClosestSnapTime(time, referenceTime);
-
-        public int ClosestBeatDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatDivisor(time, referenceTime);
-
-        public double SnapTime(double time, double? referenceTime) => ClosestSnapTime(time, BeatDivisor, referenceTime);
+        public double SnapTime(double time, double? referenceTime) => ControlPointInfo.ClosestSnapTime(time, BeatDivisor, referenceTime);
 
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
 
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 92f58c8759..74fbe540fa 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -45,15 +45,6 @@ namespace osu.Game.Screens.Play
 
         public double GetMostCommonBeatLength() => PlayableBeatmap.GetMostCommonBeatLength();
 
-        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
-        {
-            return PlayableBeatmap.ClosestSnapTime(time, beatDivisor, referenceTime);
-        }
-
-        public int ClosestSnapTime(double time, double? referenceTime = null) => PlayableBeatmap.ClosestSnapTime(time, referenceTime);
-
-        public int ClosestBeatDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatDivisor(time, referenceTime);
-
         public IBeatmap Clone() => PlayableBeatmap.Clone();
 
         private readonly Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();

From f3c7694eeb8f78cd6368fd5701e22ed291e000ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 16:57:52 +0900
Subject: [PATCH 09587/10326] Rename methods to match generally how these
 find-methods are named elsewhere

---
 osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs     |  2 +-
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs    | 10 +++++-----
 osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs |  6 +++---
 osu.Game/Screens/Edit/EditorBeatmap.cs                 |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
index 5ac121f5bc..08cd80dcfa 100644
--- a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
+++ b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Tests.NonVisual
             };
 
             for (int i = 0; i < divisors.Count; ++i)
-                Assert.AreEqual(closestDivisors[i], beatmap.ControlPointInfo.ClosestBeatDivisor(beatmap.HitObjects[i].StartTime), $"at index {i}");
+                Assert.AreEqual(closestDivisors[i], beatmap.ControlPointInfo.GetClosestBeatDivisor(beatmap.HitObjects[i].StartTime), $"at index {i}");
         }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index d1a04061b9..60a8a40f06 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -167,7 +167,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="time">The time to find the closest snapped time to.</param>
         /// <param name="beatDivisor">The beat divisor to snap to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
+        public int GetClosestSnappedTime(double time, int beatDivisor, double? referenceTime = null)
         {
             var timingPoint = TimingPointAt(referenceTime ?? time);
             var beatLength = timingPoint.BeatLength / beatDivisor;
@@ -182,9 +182,9 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         /// <param name="time">The time to find the closest snapped time to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public int ClosestSnapTime(double time, double? referenceTime = null)
+        public int GetClosestSnappedTime(double time, double? referenceTime = null)
         {
-            return ClosestSnapTime(time, ClosestBeatDivisor(time, referenceTime), referenceTime);
+            return GetClosestSnappedTime(time, GetClosestBeatDivisor(time, referenceTime), referenceTime);
         }
 
         /// <summary>
@@ -192,9 +192,9 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         /// <param name="time">The time to find the closest beat snap divisor to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public int ClosestBeatDivisor(double time, double? referenceTime = null)
+        public int GetClosestBeatDivisor(double time, double? referenceTime = null)
         {
-            double getUnsnap(int divisor) => Math.Abs(time - ClosestSnapTime(time, divisor, referenceTime));
+            double getUnsnap(int divisor) => Math.Abs(time - GetClosestSnappedTime(time, divisor, referenceTime));
 
             int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
             double smallestUnsnap = divisors.Min(getUnsnap);
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index cc5ea2a988..cdf3f05465 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             foreach (var hitobject in playableBeatmap.HitObjects)
             {
-                double startUnsnap = hitobject.StartTime - controlPointInfo.ClosestSnapTime(hitobject.StartTime);
+                double startUnsnap = hitobject.StartTime - controlPointInfo.GetClosestSnappedTime(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
                 foreach (var issue in getUnsnapIssues(hitobject, startUnsnap, hitobject.StartTime, startPostfix))
                     yield return issue;
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                     {
                         double spanDuration = hasRepeats.Duration / (hasRepeats.RepeatCount + 1);
                         double repeatTime = hitobject.StartTime + spanDuration * (repeatIndex + 1);
-                        double repeatUnsnap = repeatTime - controlPointInfo.ClosestSnapTime(repeatTime);
+                        double repeatUnsnap = repeatTime - controlPointInfo.GetClosestSnappedTime(repeatTime);
                         foreach (var issue in getUnsnapIssues(hitobject, repeatUnsnap, repeatTime, "repeat"))
                             yield return issue;
                     }
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
                 if (hitobject is IHasDuration hasDuration)
                 {
-                    double endUnsnap = hasDuration.EndTime - controlPointInfo.ClosestSnapTime(hasDuration.EndTime);
+                    double endUnsnap = hasDuration.EndTime - controlPointInfo.GetClosestSnappedTime(hasDuration.EndTime);
                     foreach (var issue in getUnsnapIssues(hitobject, endUnsnap, hasDuration.EndTime, "end"))
                         yield return issue;
                 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index f1262daab3..be53abbd55 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -301,7 +301,7 @@ namespace osu.Game.Screens.Edit
             return list.Count - 1;
         }
 
-        public double SnapTime(double time, double? referenceTime) => ControlPointInfo.ClosestSnapTime(time, BeatDivisor, referenceTime);
+        public double SnapTime(double time, double? referenceTime) => ControlPointInfo.GetClosestSnappedTime(time, BeatDivisor, referenceTime);
 
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
 

From c5186b6a693e7ff3ff1b7737a5b4f81ba0cf1124 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 16:59:49 +0900
Subject: [PATCH 09588/10326] Revert return values to non-rounded doubles

---
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 60a8a40f06..fa1c59bb08 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -167,14 +167,13 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="time">The time to find the closest snapped time to.</param>
         /// <param name="beatDivisor">The beat divisor to snap to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public int GetClosestSnappedTime(double time, int beatDivisor, double? referenceTime = null)
+        public double GetClosestSnappedTime(double time, int beatDivisor, double? referenceTime = null)
         {
             var timingPoint = TimingPointAt(referenceTime ?? time);
             var beatLength = timingPoint.BeatLength / beatDivisor;
             var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
 
-            // Casting to int matches stable.
-            return (int)(timingPoint.Time + beatLengths * beatLength);
+            return timingPoint.Time + beatLengths * beatLength;
         }
 
         /// <summary>
@@ -182,7 +181,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         /// <param name="time">The time to find the closest snapped time to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public int GetClosestSnappedTime(double time, double? referenceTime = null)
+        public double GetClosestSnappedTime(double time, double? referenceTime = null)
         {
             return GetClosestSnappedTime(time, GetClosestBeatDivisor(time, referenceTime), referenceTime);
         }

From 859898d98f09b9f10e928eca51206be5519b3fbd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 17:16:05 +0900
Subject: [PATCH 09589/10326] Refactor lookup methods to avoid linq and reduce
 `TimingPointAt` calls

---
 .../ControlPoints/ControlPointInfo.cs         | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index fa1c59bb08..e47d48edcf 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -170,35 +170,47 @@ namespace osu.Game.Beatmaps.ControlPoints
         public double GetClosestSnappedTime(double time, int beatDivisor, double? referenceTime = null)
         {
             var timingPoint = TimingPointAt(referenceTime ?? time);
-            var beatLength = timingPoint.BeatLength / beatDivisor;
-            var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
-
-            return timingPoint.Time + beatLengths * beatLength;
+            return getClosestSnappedTime(timingPoint, time, beatDivisor);
         }
 
         /// <summary>
-        /// Returns the time on any valid beat divisor closest to the given time.
+        /// Returns the time on *ANY* valid beat divisor, favouring the divisor closest to the given time.
         /// </summary>
         /// <param name="time">The time to find the closest snapped time to.</param>
-        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public double GetClosestSnappedTime(double time, double? referenceTime = null)
-        {
-            return GetClosestSnappedTime(time, GetClosestBeatDivisor(time, referenceTime), referenceTime);
-        }
+        public double GetClosestSnappedTime(double time) => GetClosestSnappedTime(time, GetClosestBeatDivisor(time));
 
         /// <summary>
-        /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest is returned.
+        /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest divisor is returned.
         /// </summary>
         /// <param name="time">The time to find the closest beat snap divisor to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
         public int GetClosestBeatDivisor(double time, double? referenceTime = null)
         {
-            double getUnsnap(int divisor) => Math.Abs(time - GetClosestSnappedTime(time, divisor, referenceTime));
+            TimingControlPoint timingPoint = TimingPointAt(referenceTime ?? time);
 
-            int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
-            double smallestUnsnap = divisors.Min(getUnsnap);
+            int closestDivisor = 0;
+            double closestTime = double.MaxValue;
 
-            return divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
+            foreach (int divisor in BindableBeatDivisor.VALID_DIVISORS)
+            {
+                double distanceFromSnap = Math.Abs(time - getClosestSnappedTime(timingPoint, time, divisor));
+
+                if (distanceFromSnap < closestTime)
+                {
+                    closestDivisor = divisor;
+                    closestTime = distanceFromSnap;
+                }
+            }
+
+            return closestDivisor;
+        }
+
+        private static double getClosestSnappedTime(TimingControlPoint timingPoint, double time, int beatDivisor)
+        {
+            var beatLength = timingPoint.BeatLength / beatDivisor;
+            var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
+
+            return timingPoint.Time + beatLengths * beatLength;
         }
 
         /// <summary>

From 126056c43626cfbe5fcb9906ceb8d8e8425029a9 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Wed, 28 Apr 2021 19:27:18 +0800
Subject: [PATCH 09590/10326] Fix precision loss on exporting legacy replays

---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 56c4e75864..144aeeebce 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -95,8 +95,9 @@ namespace osu.Game.Scoring.Legacy
 
                     foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ToLegacy(beatmap)))
                     {
-                        replayData.Append(FormattableString.Invariant($"{(int)Math.Round(f.Time - lastF.Time)}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
+                        replayData.Append(FormattableString.Invariant($"{Math.Round(f.Time - lastF.Time)}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
                         lastF = f;
+                        lastF.Time = Math.Round(f.Time);
                     }
                 }
 

From 4fe1497f63ec6f65badc27505821a311690226db Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Wed, 28 Apr 2021 20:23:56 +0800
Subject: [PATCH 09591/10326] Add comment & remove lastF

---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 144aeeebce..13876f1648 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -91,13 +91,13 @@ namespace osu.Game.Scoring.Legacy
 
                 if (score.Replay != null)
                 {
-                    LegacyReplayFrame lastF = new LegacyReplayFrame(0, 0, 0, ReplayButtonState.None);
-
+                    int lastTimeRounded = 0;
                     foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ToLegacy(beatmap)))
                     {
-                        replayData.Append(FormattableString.Invariant($"{Math.Round(f.Time - lastF.Time)}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
-                        lastF = f;
-                        lastF.Time = Math.Round(f.Time);
+                        // Rounding because stable could only parse integral values
+                        int timeRounded = (int)Math.Round(f.Time);
+                        replayData.Append(FormattableString.Invariant($"{timeRounded - lastTimeRounded}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
+                        lastTimeRounded = timeRounded;
                     }
                 }
 

From 6d7eef3f5a437e1886908f3440138700e0dcd9e2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 28 Apr 2021 16:45:57 +0000
Subject: [PATCH 09592/10326] Upgrade to GitHub-native Dependabot

---
 .github/dependabot.yml | 46 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..9e9af23b27
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,46 @@
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "17:00"
+  open-pull-requests-limit: 99
+  ignore:
+  - dependency-name: Microsoft.EntityFrameworkCore.Design
+    versions:
+    - "> 2.2.6"
+  - dependency-name: Microsoft.EntityFrameworkCore.Sqlite
+    versions:
+    - "> 2.2.6"
+  - dependency-name: Microsoft.EntityFrameworkCore.Sqlite.Core
+    versions:
+    - "> 2.2.6"
+  - dependency-name: Microsoft.Extensions.DependencyInjection
+    versions:
+    - ">= 5.a, < 6"
+  - dependency-name: NUnit3TestAdapter
+    versions:
+    - ">= 3.16.a, < 3.17"
+  - dependency-name: Microsoft.NET.Test.Sdk
+    versions:
+    - 16.9.1
+  - dependency-name: Microsoft.Extensions.DependencyInjection
+    versions:
+    - 3.1.11
+    - 3.1.12
+  - dependency-name: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
+    versions:
+    - 3.1.11
+  - dependency-name: Microsoft.NETCore.Targets
+    versions:
+    - 5.0.0
+  - dependency-name: Microsoft.AspNetCore.SignalR.Protocols.MessagePack
+    versions:
+    - 5.0.2
+  - dependency-name: NUnit
+    versions:
+    - 3.13.1
+  - dependency-name: Microsoft.AspNetCore.SignalR.Client
+    versions:
+    - 3.1.11

From 243605728d5f167680caa5bbb0dee1225960075d Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 28 Apr 2021 11:44:05 -0700
Subject: [PATCH 09593/10326] Fix approved maps not displaying pp column on
 score table

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index b598b7d97f..3e95d125de 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -59,8 +59,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
                 var scoreInfos = value.Scores.Select(s => s.CreateScoreInfo(rulesets)).ToList();
                 var topScore = scoreInfos.First();
+                var status = topScore.Beatmap?.Status;
+                var showPerformanceColumn = status == BeatmapSetOnlineStatus.Ranked || status == BeatmapSetOnlineStatus.Approved;
 
-                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status == BeatmapSetOnlineStatus.Ranked);
+                scoreTable.DisplayScores(scoreInfos, showPerformanceColumn);
                 scoreTable.Show();
 
                 var userScore = value.UserScore;

From 921d4510478943f5b6c195044d30102f2a9f2fe2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:50:49 +0000
Subject: [PATCH 09594/10326] Bump Microsoft.AspNetCore.SignalR.Client from
 5.0.4 to 5.0.5

Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/dotnet/aspnetcore) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.4...v5.0.5)

Signed-off-by: dependabot[bot] <support@github.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 986bd8e7ba..c61c59e589 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="DiffPlex" Version="1.7.0" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />

From 5720e255c9b3ed3c1d466db57ca4eac65fae0a09 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:50:53 +0000
Subject: [PATCH 09595/10326] Bump Sentry from 3.2.0 to 3.3.4

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.2.0 to 3.3.4.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/3.2.0...3.3.4)

Signed-off-by: dependabot[bot] <support@github.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 986bd8e7ba..abb1e40b64 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="Sentry" Version="3.2.0" />
+    <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 6c51bf523ca0740feae42ade648b7bbffa49192d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:50:56 +0000
Subject: [PATCH 09596/10326] Bump SharpCompress from 0.28.1 to 0.28.2

Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.28.1 to 0.28.2.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.28.1...0.28.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 986bd8e7ba..189bc724fc 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -32,7 +32,7 @@
     <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
-    <PackageReference Include="SharpCompress" Version="0.28.1" />
+    <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index c32109d6db..1a9f945ec8 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -94,7 +94,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
-    <PackageReference Include="SharpCompress" Version="0.28.1" />
+    <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 437e9201ba844fb6d7baac65ea679647d439b370 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:51:00 +0000
Subject: [PATCH 09597/10326] Bump
 Microsoft.AspNetCore.SignalR.Protocols.MessagePack

Bumps [Microsoft.AspNetCore.SignalR.Protocols.MessagePack](https://github.com/dotnet/aspnetcore) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.4...v5.0.5)

Signed-off-by: dependabot[bot] <support@github.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 986bd8e7ba..e2c8e2cf1b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />

From 5b071c68e7ab85f7e7faab2e2ae79762140ba6ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:51:04 +0000
Subject: [PATCH 09598/10326] Bump
 Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson

Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/dotnet/aspnetcore) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.4...v5.0.5)

Signed-off-by: dependabot[bot] <support@github.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 986bd8e7ba..c9de4dd28a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />

From 1e7feff49d57fc2f0575a8a423083e0ff9a44d65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:51:08 +0000
Subject: [PATCH 09599/10326] Bump Humanizer from 2.8.26 to 2.9.9

Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.26 to 2.9.9.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/main/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.8.26...v2.9.9)

Signed-off-by: dependabot[bot] <support@github.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 986bd8e7ba..aa1599e69a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="DiffPlex" Version="1.7.0" />
-    <PackageReference Include="Humanizer" Version="2.8.26" />
+    <PackageReference Include="Humanizer" Version="2.9.9" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.4" />
diff --git a/osu.iOS.props b/osu.iOS.props
index c32109d6db..7061bb5e84 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -89,7 +89,7 @@
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
-    <PackageReference Include="Humanizer" Version="2.8.26" />
+    <PackageReference Include="Humanizer" Version="2.9.9" />
     <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" />

From 1b3b07d6a9f0ccb9e595a1c6ae69456254356b96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:51:12 +0000
Subject: [PATCH 09600/10326] Bump NUnit from 3.13.1 to 3.13.2

Bumps [NUnit](https://github.com/nunit/nunit) from 3.13.1 to 3.13.2.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/v3.13.2/CHANGES.md)
- [Commits](https://github.com/nunit/nunit/compare/v3.13.1...v3.13.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../osu.Game.Rulesets.EmptyFreeform.Tests.csproj                | 2 +-
 .../osu.Game.Rulesets.Pippidon.Tests.csproj                     | 2 +-
 .../osu.Game.Rulesets.EmptyScrolling.Tests.csproj               | 2 +-
 .../osu.Game.Rulesets.Pippidon.Tests.csproj                     | 2 +-
 osu.Game.Benchmarks/osu.Game.Benchmarks.csproj                  | 2 +-
 .../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 +-
 osu.Game/osu.Game.csproj                                        | 2 +-
 osu.iOS.props                                                   | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
index 98a32f9b3a..992f954a3a 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
index afa7b03536..7571d1827a 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
index c9f87a8551..1c8ed54440 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
index afa7b03536..7571d1827a 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index ea43d9a54c..bfcf4ef35e 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="nunit" Version="3.13.1" />
+    <PackageReference Include="nunit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
 
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 c2d9a923d9..77e9d672e3 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 64e934efd2..8f8b99b092 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 f743d65db3..e01e858873 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 eab144592f..2dfa1dfbb7 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index df6d17f615..895518e1b9 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index a4e52f8cd4..d5dda39aa5 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -6,7 +6,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 986bd8e7ba..b242811939 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -33,7 +33,7 @@
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.iOS.props b/osu.iOS.props
index c32109d6db..423f87923b 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -95,7 +95,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2021.115.0" ExcludeAssets="all" />

From d2629561469e4dfd0efba561b757d4da10aac481 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 28 Apr 2021 18:27:40 +0900
Subject: [PATCH 09601/10326] Always use LifetimeEntry to manage hit objects in
 HitObjectContainer

Previously, non-pooled DHOs were immediately added as children of the HOC when Add is called. Also, non-pooled DHOs were always attached to the HOC as children.
New behavior is that non-pooled DHOs are only added after CheckChildLifetime, and only attached to the HOC while the DHOs are alive.

- LifetimeManagementContainer inheritance of HOC is removed, as it is now all DHOs are "unmanaged" (previously `AddInternal(false)`).
- The signature of `Clear` is changed, and it is now always not disposing the children immediately.
---
 .../Edit/ManiaBeatSnapGrid.cs                 |  2 +-
 .../HitObjectApplicationTestScene.cs          |  2 +-
 .../Pooling/PoolableDrawableWithLifetime.cs   |  2 +-
 osu.Game/Rulesets/UI/HitObjectContainer.cs    | 66 +++++++++----------
 .../Scrolling/ScrollingHitObjectContainer.cs  |  4 +-
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index afc08dcc96..9d1f5429a1 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                 foreach (var line in grid.Objects.OfType<DrawableGridLine>())
                     availableLines.Push(line);
 
-                grid.Clear(false);
+                grid.Clear();
             }
 
             if (selectionTimeRange == null)
diff --git a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
index a1d000386f..ac01508081 100644
--- a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         [SetUpSteps]
         public void SetUp()
-            => AddStep("clear SHOC", () => hitObjectContainer.Clear(false));
+            => AddStep("clear SHOC", () => hitObjectContainer.Clear());
 
         protected void AddHitObject(DrawableHitObject hitObject)
             => AddStep("add to SHOC", () => hitObjectContainer.Add(hitObject));
diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 93e476be76..31f1768044 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// <summary>
         /// The entry holding essential state of this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
         /// </summary>
-        protected TEntry? Entry { get; private set; }
+        public TEntry? Entry { get; private set; }
 
         /// <summary>
         /// Whether <see cref="Entry"/> is applied to this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 11312a46df..3d74cdedd6 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -17,7 +17,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.UI
 {
-    public class HitObjectContainer : LifetimeManagementContainer, IHitObjectContainer
+    public class HitObjectContainer : CompositeDrawable, IHitObjectContainer
     {
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
@@ -62,6 +62,7 @@ namespace osu.Game.Rulesets.UI
         private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> drawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
+        private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> nonPooledDrawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
 
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
@@ -72,6 +73,7 @@ namespace osu.Game.Rulesets.UI
 
             lifetimeManager.EntryBecameAlive += entryBecameAlive;
             lifetimeManager.EntryBecameDead += entryBecameDead;
+            lifetimeManager.EntryCrossedBoundary += entryCrossedBoundary;
         }
 
         protected override void LoadAsyncComplete()
@@ -86,7 +88,13 @@ namespace osu.Game.Rulesets.UI
 
         public void Add(HitObjectLifetimeEntry entry) => lifetimeManager.AddEntry(entry);
 
-        public bool Remove(HitObjectLifetimeEntry entry) => lifetimeManager.RemoveEntry(entry);
+        public bool Remove(HitObjectLifetimeEntry entry)
+        {
+            if (!lifetimeManager.RemoveEntry(entry)) return false;
+            // It has to be done here because non-pooled entry may be removed by specifying its entry.
+            nonPooledDrawableMap.Remove(entry);
+            return true;
+        }
 
         private void entryBecameAlive(LifetimeEntry entry) => addDrawable((HitObjectLifetimeEntry)entry);
 
@@ -96,7 +104,8 @@ namespace osu.Game.Rulesets.UI
         {
             Debug.Assert(!drawableMap.ContainsKey(entry));
 
-            var drawable = pooledObjectProvider?.GetPooledDrawableRepresentation(entry.HitObject, null);
+            nonPooledDrawableMap.TryGetValue(entry, out var drawable);
+            drawable ??= pooledObjectProvider?.GetPooledDrawableRepresentation(entry.HitObject, null);
             if (drawable == null)
                 throw new InvalidOperationException($"A drawable representation could not be retrieved for hitobject type: {entry.HitObject.GetType().ReadableName()}.");
 
@@ -104,7 +113,7 @@ namespace osu.Game.Rulesets.UI
             drawable.OnRevertResult += onRevertResult;
 
             bindStartTime(drawable);
-            AddInternal(drawableMap[entry] = drawable, false);
+            AddInternal(drawableMap[entry] = drawable);
             OnAdd(drawable);
 
             HitObjectUsageBegan?.Invoke(entry.HitObject);
@@ -127,50 +136,42 @@ namespace osu.Game.Rulesets.UI
             unbindStartTime(drawable);
             RemoveInternal(drawable);
 
-            HitObjectUsageFinished?.Invoke(entry.HitObject);
+            // The hit object is not freed when the DHO was not pooled.
+            if (!nonPooledDrawableMap.ContainsKey(entry))
+                HitObjectUsageFinished?.Invoke(entry.HitObject);
         }
 
         #endregion
 
         #region Non-pooling support
 
-        public virtual void Add(DrawableHitObject hitObject)
+        public virtual void Add(DrawableHitObject drawable)
         {
-            bindStartTime(hitObject);
+            if (drawable.Entry == null)
+                throw new InvalidOperationException($"May not add a {nameof(DrawableHitObject)} without {nameof(HitObject)} associated");
 
-            hitObject.OnNewResult += onNewResult;
-            hitObject.OnRevertResult += onRevertResult;
-
-            AddInternal(hitObject);
-            OnAdd(hitObject);
+            nonPooledDrawableMap.Add(drawable.Entry, drawable);
+            Add(drawable.Entry);
         }
 
-        public virtual bool Remove(DrawableHitObject hitObject)
+        public virtual bool Remove(DrawableHitObject drawable)
         {
-            OnRemove(hitObject);
-            if (!RemoveInternal(hitObject))
+            if (drawable.Entry == null)
                 return false;
 
-            hitObject.OnNewResult -= onNewResult;
-            hitObject.OnRevertResult -= onRevertResult;
-
-            unbindStartTime(hitObject);
-
-            return true;
+            return Remove(drawable.Entry);
         }
 
         public int IndexOf(DrawableHitObject hitObject) => IndexOfInternal(hitObject);
 
-        protected override void OnChildLifetimeBoundaryCrossed(LifetimeBoundaryCrossedEvent e)
+        private void entryCrossedBoundary(LifetimeEntry entry, LifetimeBoundaryKind kind, LifetimeBoundaryCrossingDirection direction)
         {
-            if (!(e.Child is DrawableHitObject hitObject))
-                return;
+            if (nonPooledDrawableMap.TryGetValue((HitObjectLifetimeEntry)entry, out var drawable))
+                OnChildLifetimeBoundaryCrossed(new LifetimeBoundaryCrossedEvent(drawable, kind, direction));
+        }
 
-            if ((e.Kind == LifetimeBoundaryKind.End && e.Direction == LifetimeBoundaryCrossingDirection.Forward)
-                || (e.Kind == LifetimeBoundaryKind.Start && e.Direction == LifetimeBoundaryCrossingDirection.Backward))
-            {
-                hitObject.OnKilled();
-            }
+        protected virtual void OnChildLifetimeBoundaryCrossed(LifetimeBoundaryCrossedEvent e)
+        {
         }
 
         #endregion
@@ -195,12 +196,11 @@ namespace osu.Game.Rulesets.UI
         {
         }
 
-        public virtual void Clear(bool disposeChildren = true)
+        public virtual void Clear()
         {
             lifetimeManager.ClearEntries();
-
-            ClearInternal(disposeChildren);
-            unbindAllStartTimes();
+            nonPooledDrawableMap.Clear();
+            Debug.Assert(InternalChildren.Count == 0 && startTimeMap.Count == 0 && drawableMap.Count == 0, "All hit objects should have been removed");
         }
 
         protected override bool CheckChildrenLife()
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 289578f3d8..a9eaf3da68 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -50,9 +50,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
             timeRange.ValueChanged += _ => layoutCache.Invalidate();
         }
 
-        public override void Clear(bool disposeChildren = true)
+        public override void Clear()
         {
-            base.Clear(disposeChildren);
+            base.Clear();
 
             toComputeLifetime.Clear();
             layoutComputed.Clear();

From f55aa016bec4acd26e5525754a50661398da52b5 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 26 Apr 2021 15:53:07 +0900
Subject: [PATCH 09602/10326] Adopt HitObjectContainer change in a test

Non-pooled objects are attached as children only while alive
---
 osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
index f2bfccb6de..8f3d3f1276 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
@@ -4,6 +4,7 @@
 using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -19,7 +20,14 @@ namespace osu.Game.Tests.Gameplay
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Child = container = new HitObjectContainer();
+            Child = container = new HitObjectContainer
+            {
+                Clock = new FramedClock(new ManualClock
+                {
+                    // Make sure hit objects with `StartTime == 0` are alive
+                    CurrentTime = -1
+                })
+            };
         });
 
         [Test]

From 799d2a3300dce4b833a2ca7e9e176d1079aa6038 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 13:00:46 +0900
Subject: [PATCH 09603/10326] Replace failed mania test (pooling not accounted)
 with a more robust test

Also fix null reference in Playfield
---
 .../TestSceneDrawableNote.cs                  | 67 +++++++++++++++++++
 .../TestSceneHoldNoteInput.cs                 | 15 +----
 osu.Game/Rulesets/UI/Playfield.cs             |  7 +-
 3 files changed, 73 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.cs
new file mode 100644
index 0000000000..4a6c59e297
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public class TestSceneDrawableManiaHitObject : OsuTestScene
+    {
+        private readonly ManualClock clock = new ManualClock();
+
+        private Column column;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = new ScrollingTestContainer(ScrollingDirection.Down)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.X,
+                RelativeSizeAxes = Axes.Y,
+                TimeRange = 2000,
+                Clock = new FramedClock(clock),
+                Child = column = new Column(0)
+                {
+                    Action = { Value = ManiaAction.Key1 },
+                    Height = 0.85f,
+                    AccentColour = Color4.Gray
+                },
+            };
+        });
+
+        [Test]
+        public void TestHoldNoteHeadVisibility()
+        {
+            DrawableHoldNote note = null;
+            AddStep("Add hold note", () =>
+            {
+                var h = new HoldNote
+                {
+                    StartTime = 0,
+                    Duration = 1000
+                };
+                h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                column.Add(note = new DrawableHoldNote(h));
+            });
+            AddStep("Hold key", () =>
+            {
+                clock.CurrentTime = 0;
+                note.OnPressed(ManiaAction.Key1);
+            });
+            AddStep("progress time", () => clock.CurrentTime = 500);
+            AddAssert("head is visible", () => note.Head.Alpha == 1);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 668487f673..387c5f4195 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -4,14 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Screens;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Objects;
@@ -411,17 +408,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
-            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
-
-            AddUntilStep("wait for head", () => currentPlayer.GameplayClockContainer.GameplayClock.CurrentTime >= time_head);
-            AddAssert("head is visible",
-                () => currentPlayer.ChildrenOfType<DrawableHoldNote>()
-                                   .Single(note => note.HitObject == beatmap.HitObjects[0])
-                                   .Head
-                                   .Alpha == 1);
-
-            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor?.HasCompleted.Value == true);
         }
 
         private class ScoreAccessibleReplayPlayer : ReplayPlayer
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 17d3cf01a4..b154288dba 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -354,8 +354,11 @@ namespace osu.Game.Rulesets.UI
 
                     // If this is the first time this DHO is being used, then apply the DHO mods.
                     // This is done before Apply() so that the state is updated once when the hitobject is applied.
-                    foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
-                        m.ApplyToDrawableHitObjects(dho.Yield());
+                    if (mods != null)
+                    {
+                        foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
+                            m.ApplyToDrawableHitObjects(dho.Yield());
+                    }
                 }
 
                 if (!lifetimeEntryMap.TryGetValue(hitObject, out var entry))

From 971ca398260275c52fb16be82bfb38993777c504 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Sun, 18 Apr 2021 21:46:30 +0900
Subject: [PATCH 09604/10326] Fix failing taiko tests

Non-pooled DHO is now not eagerly loaded
---
 .../TestSceneFlyingHits.cs                    | 20 +++++++++----------
 .../TestSceneHits.cs                          |  8 ++++++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
index 63854e7ead..5738be05d7 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
@@ -20,20 +20,19 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [TestCase(HitType.Rim)]
         public void TestFlyingHits(HitType hitType)
         {
-            DrawableFlyingHit flyingHit = null;
-
             AddStep("add flying hit", () =>
             {
                 addFlyingHit(hitType);
-
-                // flying hits all land in one common scrolling container (and stay there for rewind purposes),
-                // so we need to manually get the latest one.
-                flyingHit = this.ChildrenOfType<DrawableFlyingHit>()
-                                .OrderByDescending(h => h.HitObject.StartTime)
-                                .FirstOrDefault();
             });
 
-            AddAssert("hit type is correct", () => flyingHit.HitObject.Type == hitType);
+            AddAssert("hit type is correct", () =>
+            {
+                // flying hits all land in one common scrolling container (and stay there for rewind purposes),
+                // so we need to manually get the latest one.
+                return this.ChildrenOfType<DrawableFlyingHit>()
+                           .OrderByDescending(h => h.HitObject.StartTime)
+                           .FirstOrDefault()?.HitObject.Type == hitType;
+            });
         }
 
         private void addFlyingHit(HitType hitType)
@@ -42,7 +41,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableDrumRollTick h;
             DrawableRuleset.Playfield.Add(h = new DrawableDrumRollTick(tick) { JudgementType = hitType });
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Great });
+            h.OnLoadComplete += _ =>
+                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Great });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 87c936d386..06acdad3d6 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -129,8 +129,12 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableRuleset.Playfield.Add(h);
 
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(), new JudgementResult(hit.NestedHitObjects.Single(), new TaikoStrongJudgement()) { Type = HitResult.Great });
+            h.OnLoadComplete += _ =>
+            {
+                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
+                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(),
+                    new JudgementResult(hit.NestedHitObjects.Single(), new TaikoStrongJudgement()) { Type = HitResult.Great });
+            };
         }
 
         private void addMissJudgement()

From b88e5a31ea838406b25dfb2e57e992fbb14f89f8 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 28 Apr 2021 12:55:04 +0900
Subject: [PATCH 09605/10326] Add failing test showing lifetime not recomputed
 with pooled objects

---
 .../Gameplay/TestSceneDrawableScrollingRuleset.cs  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 9931ee4a45..75a5eec6f7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -90,6 +90,20 @@ namespace osu.Game.Tests.Visual.Gameplay
             assertChildPosition(5);
         }
 
+        [TestCase("pooled")]
+        [TestCase("non-pooled")]
+        public void TestLifetimeRecomputedWhenTimeRangeChanges(string pooled)
+        {
+            var beatmap = createBeatmap(_ => pooled == "pooled" ? new TestPooledHitObject() : new TestHitObject());
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
+            createTest(beatmap);
+
+            assertDead(3);
+
+            AddStep("increase time range", () => drawableRuleset.TimeRange.Value = 3 * time_range);
+            assertPosition(3, 1);
+        }
+
         [Test]
         public void TestRelativeBeatLengthScaleSingleTimingPoint()
         {

From 5aa522b1c28cb500ac1985595234b8cd0acacb69 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 28 Apr 2021 20:23:52 +0900
Subject: [PATCH 09606/10326] Completely delegate DHO lifetime to Entry
 lifetime

A downside is lifetime update is not caught by LifetimeManagementContainer if used.
---
 .../Gameplay/TestSceneDrawableHitObject.cs    | 13 ++++----
 .../Pooling/PoolableDrawableWithLifetime.cs   | 32 ++++++-------------
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
index 2e3f192f1b..0bec02c488 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
@@ -45,15 +45,16 @@ namespace osu.Game.Tests.Gameplay
             AddStep("Create DHO", () =>
             {
                 dho = new TestDrawableHitObject(null);
-                dho.Apply(entry = new TestLifetimeEntry(new HitObject())
-                {
-                    LifetimeStart = 0,
-                    LifetimeEnd = 1000,
-                });
+                dho.Apply(entry = new TestLifetimeEntry(new HitObject()));
                 Child = dho;
             });
 
-            AddStep("KeepAlive = true", () => entry.KeepAlive = true);
+            AddStep("KeepAlive = true", () =>
+            {
+                entry.LifetimeStart = 0;
+                entry.LifetimeEnd = 1000;
+                entry.KeepAlive = true;
+            });
             AddAssert("Lifetime is overriden", () => entry.LifetimeStart == double.MinValue && entry.LifetimeEnd == double.MaxValue);
 
             AddStep("Set LifetimeStart", () => dho.LifetimeStart = 500);
diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 31f1768044..e94b6dca9d 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -28,14 +28,20 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
         public override double LifetimeStart
         {
-            get => base.LifetimeStart;
-            set => setLifetime(value, LifetimeEnd);
+            get => Entry?.LifetimeStart ?? double.MinValue;
+            set
+            {
+                if (Entry != null) Entry.LifetimeStart = value;
+            }
         }
 
         public override double LifetimeEnd
         {
-            get => base.LifetimeEnd;
-            set => setLifetime(LifetimeStart, value);
+            get => Entry?.LifetimeEnd ?? double.MaxValue;
+            set
+            {
+                if (Entry != null) Entry.LifetimeEnd = value;
+            }
         }
 
         public override bool RemoveWhenNotAlive => false;
@@ -64,11 +70,8 @@ namespace osu.Game.Rulesets.Objects.Pooling
             if (HasEntryApplied)
                 free();
 
-            setLifetime(entry.LifetimeStart, entry.LifetimeEnd);
             Entry = entry;
-
             OnApply(entry);
-
             HasEntryApplied = true;
         }
 
@@ -95,27 +98,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
         {
         }
 
-        private void setLifetime(double start, double end)
-        {
-            base.LifetimeStart = start;
-            base.LifetimeEnd = end;
-
-            if (Entry != null)
-            {
-                Entry.LifetimeStart = start;
-                Entry.LifetimeEnd = end;
-            }
-        }
-
         private void free()
         {
             Debug.Assert(Entry != null && HasEntryApplied);
 
             OnFree(Entry);
-
             Entry = null;
-            setLifetime(double.MaxValue, double.MaxValue);
-
             HasEntryApplied = false;
         }
     }

From 1d023dcedbb64fcac9d4956c73de22407e51b035 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 26 Apr 2021 19:53:38 +0900
Subject: [PATCH 09607/10326] Fix mania editor null reference

---
 .../Edit/Blueprints/ManiaSelectionBlueprint.cs                 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 384f49d9b2..8f8f45c0dd 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -18,6 +18,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
+        // Overriding the base because this method is called right after `Column` is changed and `DrawableObject` is not yet loaded and Parent is not set.
+        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Parent.ToLocalSpace(screenSpacePosition) - Position;
+
         protected ManiaSelectionBlueprint(DrawableHitObject drawableObject)
             : base(drawableObject)
         {

From 4cc94efb06258cc7cf5c445e6318f3ac5cf6d852 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 28 Apr 2021 20:38:44 +0900
Subject: [PATCH 09608/10326] Fix failing mania test

---
 .../Editor/TestSceneNotePlacementBlueprint.cs       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
index 36c34a8fb9..a162c5ec44 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
-using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Mania.Tests.Editor
@@ -35,7 +34,11 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Test]
         public void TestPlaceBeforeCurrentTimeDownwards()
         {
-            AddStep("move mouse before current time", () => InputManager.MoveMouseTo(this.ChildrenOfType<Column>().Single().ScreenSpaceDrawQuad.BottomLeft - new Vector2(0, 10)));
+            AddStep("move mouse before current time", () =>
+            {
+                var column = this.ChildrenOfType<Column>().Single();
+                InputManager.MoveMouseTo(column.ScreenSpacePositionAtTime(-100));
+            });
 
             AddStep("click", () => InputManager.Click(MouseButton.Left));
 
@@ -45,7 +48,11 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Test]
         public void TestPlaceAfterCurrentTimeDownwards()
         {
-            AddStep("move mouse after current time", () => InputManager.MoveMouseTo(this.ChildrenOfType<Column>().Single()));
+            AddStep("move mouse after current time", () =>
+            {
+                var column = this.ChildrenOfType<Column>().Single();
+                InputManager.MoveMouseTo(column.ScreenSpacePositionAtTime(100));
+            });
 
             AddStep("click", () => InputManager.Click(MouseButton.Left));
 

From c83c8040573ad0cdd3c650487b1aa9a28d756d71 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 29 Apr 2021 14:42:41 +0900
Subject: [PATCH 09609/10326] Expose lifetime entries from HOC

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 24 +++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 3d74cdedd6..1d32313f2b 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -19,6 +19,16 @@ namespace osu.Game.Rulesets.UI
 {
     public class HitObjectContainer : CompositeDrawable, IHitObjectContainer
     {
+        /// <summary>
+        /// All entries in this <see cref="HitObjectContainer"/> including dead entries.
+        /// </summary>
+        public IEnumerable<HitObjectLifetimeEntry> Entries => allEntries;
+
+        /// <summary>
+        /// All alive entries and <see cref="DrawableHitObject"/>s used by the entries.
+        /// </summary>
+        public IEnumerable<(HitObjectLifetimeEntry Entry, DrawableHitObject Drawable)> AliveEntries => drawableMap.Select(x => (x.Key, x.Value));
+
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
         public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
@@ -60,10 +70,13 @@ namespace osu.Game.Rulesets.UI
         internal double FutureLifetimeExtension { get; set; }
 
         private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
+
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> drawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
-        private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> nonPooledDrawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
 
+        private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
+        private readonly HashSet<HitObjectLifetimeEntry> allEntries = new HashSet<HitObjectLifetimeEntry>();
+
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
@@ -86,13 +99,18 @@ namespace osu.Game.Rulesets.UI
 
         #region Pooling support
 
-        public void Add(HitObjectLifetimeEntry entry) => lifetimeManager.AddEntry(entry);
+        public void Add(HitObjectLifetimeEntry entry)
+        {
+            allEntries.Add(entry);
+            lifetimeManager.AddEntry(entry);
+        }
 
         public bool Remove(HitObjectLifetimeEntry entry)
         {
             if (!lifetimeManager.RemoveEntry(entry)) return false;
-            // It has to be done here because non-pooled entry may be removed by specifying its entry.
+            // The entry has to be removed from the non-pooled map here because non-pooled entry may be removed by specifying its entry.
             nonPooledDrawableMap.Remove(entry);
+            allEntries.Remove(entry);
             return true;
         }
 

From 632bb70e0f7d051c1ee82502122ce5946227cd95 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 29 Apr 2021 15:04:32 +0900
Subject: [PATCH 09610/10326] Use entry to calculate lifetime in ScrollingHOC

DHOs cannot be used to calculate lifetime, it is not created before the entry became alive.
---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 60 ++++++++-----------
 1 file changed, 24 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index a9eaf3da68..915bab9a51 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -5,7 +5,9 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Layout;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -17,16 +19,18 @@ namespace osu.Game.Rulesets.UI.Scrolling
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-        /// <summary>
-        /// Hit objects which require lifetime computation in the next update call.
-        /// </summary>
-        private readonly HashSet<DrawableHitObject> toComputeLifetime = new HashSet<DrawableHitObject>();
-
         /// <summary>
         /// A set containing all <see cref="HitObjectContainer.AliveObjects"/> which have an up-to-date layout.
         /// </summary>
         private readonly HashSet<DrawableHitObject> layoutComputed = new HashSet<DrawableHitObject>();
 
+        /// <summary>
+        /// A conservative estimate of maximum bounding box of a <see cref="DrawableHitObject"/>
+        /// with respect to the start time position of the hit object.
+        /// It is used to calculate when the object appears inbound.
+        /// </summary>
+        protected virtual RectangleF GetDrawRectangle(HitObjectLifetimeEntry entry) => new RectangleF().Inflate(100);
+
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
@@ -54,7 +58,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             base.Clear();
 
-            toComputeLifetime.Clear();
             layoutComputed.Clear();
         }
 
@@ -166,7 +169,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         private void onRemoveRecursive(DrawableHitObject hitObject)
         {
-            toComputeLifetime.Remove(hitObject);
             layoutComputed.Remove(hitObject);
 
             hitObject.DefaultsApplied -= invalidateHitObject;
@@ -175,14 +177,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 onRemoveRecursive(nested);
         }
 
-        /// <summary>
-        /// Make this <see cref="DrawableHitObject"/> lifetime and layout computed in next update.
-        /// </summary>
         private void invalidateHitObject(DrawableHitObject hitObject)
         {
-            // Lifetime computation is delayed until next update because
-            // when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed.
-            toComputeLifetime.Add(hitObject);
+            if (hitObject.ParentHitObject == null)
+                updateLifetime(hitObject.Entry);
+
             layoutComputed.Remove(hitObject);
         }
 
@@ -194,13 +193,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (!layoutCache.IsValid)
             {
-                toComputeLifetime.Clear();
-
-                foreach (var hitObject in Objects)
-                {
-                    if (hitObject.HitObject != null)
-                        toComputeLifetime.Add(hitObject);
-                }
+                foreach (var entry in Entries)
+                    updateLifetime(entry);
 
                 layoutComputed.Clear();
 
@@ -220,11 +214,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
                 layoutCache.Validate();
             }
-
-            foreach (var hitObject in toComputeLifetime)
-                hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
-
-            toComputeLifetime.Clear();
         }
 
         protected override void UpdateAfterChildrenLife()
@@ -247,32 +236,31 @@ namespace osu.Game.Rulesets.UI.Scrolling
             }
         }
 
-        private double computeOriginAdjustedLifetimeStart(DrawableHitObject hitObject)
+        private void updateLifetime(HitObjectLifetimeEntry entry)
         {
-            float originAdjustment = 0.0f;
+            var rectangle = GetDrawRectangle(entry);
+            float startOffset = 0;
 
-            // calculate the dimension of the part of the hitobject that should already be visible
-            // when the hitobject origin first appears inside the scrolling container
             switch (direction.Value)
             {
-                case ScrollingDirection.Up:
-                    originAdjustment = hitObject.OriginPosition.Y;
+                case ScrollingDirection.Right:
+                    startOffset = rectangle.Right;
                     break;
 
                 case ScrollingDirection.Down:
-                    originAdjustment = hitObject.DrawHeight - hitObject.OriginPosition.Y;
+                    startOffset = rectangle.Bottom;
                     break;
 
                 case ScrollingDirection.Left:
-                    originAdjustment = hitObject.OriginPosition.X;
+                    startOffset = -rectangle.Left;
                     break;
 
-                case ScrollingDirection.Right:
-                    originAdjustment = hitObject.DrawWidth - hitObject.OriginPosition.X;
+                case ScrollingDirection.Up:
+                    startOffset = -rectangle.Top;
                     break;
             }
 
-            return scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
+            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
         }
 
         private void updateLayoutRecursive(DrawableHitObject hitObject)

From 73dfb04df8ba3b45ab9fbdd5bb1934d55f61defc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 29 Apr 2021 15:17:30 +0900
Subject: [PATCH 09611/10326] Fix uninitialized scrollLength value is used

---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 915bab9a51..538d4d1d11 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -185,8 +185,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
             layoutComputed.Remove(hitObject);
         }
 
-        private float scrollLength;
-
         protected override void Update()
         {
             base.Update();
@@ -199,29 +197,16 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 layoutComputed.Clear();
 
                 scrollingInfo.Algorithm.Reset();
-
-                switch (direction.Value)
-                {
-                    case ScrollingDirection.Up:
-                    case ScrollingDirection.Down:
-                        scrollLength = DrawSize.Y;
-                        break;
-
-                    default:
-                        scrollLength = DrawSize.X;
-                        break;
-                }
-
                 layoutCache.Validate();
             }
         }
 
+        // We need to calculate hit object positions (including nested hit objects) as soon as possible after lifetimes
+        // to prevent hit objects displayed in a wrong position for one frame.
         protected override void UpdateAfterChildrenLife()
         {
             base.UpdateAfterChildrenLife();
 
-            // We need to calculate hit object positions (including nested hit objects) as soon as possible after lifetimes
-            // to prevent hit objects displayed in a wrong position for one frame.
             // Only AliveObjects need to be considered for layout (reduces overhead in the case of scroll speed changes).
             foreach (var obj in AliveObjects)
             {
@@ -260,7 +245,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
 
-            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
+            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, getLength());
         }
 
         private void updateLayoutRecursive(DrawableHitObject hitObject)
@@ -271,12 +256,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 {
                     case ScrollingDirection.Up:
                     case ScrollingDirection.Down:
-                        hitObject.Height = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, scrollLength);
+                        hitObject.Height = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, getLength());
                         break;
 
                     case ScrollingDirection.Left:
                     case ScrollingDirection.Right:
-                        hitObject.Width = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, scrollLength);
+                        hitObject.Width = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, getLength());
                         break;
                 }
             }
@@ -295,19 +280,19 @@ namespace osu.Game.Rulesets.UI.Scrolling
             switch (direction.Value)
             {
                 case ScrollingDirection.Up:
-                    hitObject.Y = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
+                    hitObject.Y = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
                     break;
 
                 case ScrollingDirection.Down:
-                    hitObject.Y = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
+                    hitObject.Y = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
                     break;
 
                 case ScrollingDirection.Left:
-                    hitObject.X = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
+                    hitObject.X = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
                     break;
 
                 case ScrollingDirection.Right:
-                    hitObject.X = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
+                    hitObject.X = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
                     break;
             }
         }

From 171e954e89b7e378f599e30d8525850b4aece2ff Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 29 Apr 2021 13:48:00 +0700
Subject: [PATCH 09612/10326] add unordered list test

---
 .../TestSceneOsuMarkdownContainer.cs          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 4add9f22a5..11c06abee7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -108,5 +108,25 @@ Line below";
 | Left                 |         Center         |                 Right |";
             });
         }
+
+        [Test]
+        public void TestUnorderedList()
+        {
+            AddStep("Add Unordered List", () =>
+            {
+                markdownContainer.Text = @"- First item level 1
+- Second item level 1
+    - First item level 2
+        - First item level 3
+        - Second item level 3
+        - Third item level 3
+            - First item level 4
+            - Second item level 4
+            - Third item level 4
+    - Second item level 2
+    - Third item level 2
+- Third item level 1";
+            });
+        }
     }
 }

From 9c62c90cfc441a2688afbefb636f430aeea534b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 15:29:25 +0900
Subject: [PATCH 09613/10326] Refactor `SelectionBlueprint` and
 `MoveSelectionEvent` to work in screen-space coordinates

Until now, the implementation of the overrides in `SelectionBlueprint`
have been confusing to the point where I would just implement by
trial-and-error (or copying from an existing implementation). This was
due to a combination of using "object" space coordinates
(ie. the thing the `Blueprint` is operating on) and screen-space coordinates.

This change switches all event related coordinates to screen-space,
which is how we already handle rotation/scale operations. With the
introduction of other editor types where the related objects are
drawables, this also makes a lot more sense.
---
 .../Edit/ManiaSelectionHandler.cs                 |  2 +-
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs |  3 ++-
 osu.Game/Extensions/DrawableExtensions.cs         | 11 +++++++++++
 .../Rulesets/Edit/OverlaySelectionBlueprint.cs    |  2 --
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs      |  4 +---
 .../Edit/Compose/Components/BlueprintContainer.cs | 11 +++++++----
 .../Components/ComposeBlueprintContainer.cs       |  2 +-
 .../Edit/Compose/Components/MoveSelectionEvent.cs | 15 ++++-----------
 8 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index dd059c967c..7042110423 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
             var maniaPlayfield = ((ManiaHitObjectComposer)composer).Playfield;
 
-            var currentColumn = maniaPlayfield.GetColumnByPosition(moveEvent.ScreenSpacePosition);
+            var currentColumn = maniaPlayfield.GetColumnByPosition(moveEvent.Blueprint.ScreenSpaceSelectionPoint + moveEvent.ScreenSpaceDelta);
             if (currentColumn == null)
                 return;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 5164c7f204..c2c1f6d602 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Utils;
+using osu.Game.Extensions;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
@@ -42,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             // this will potentially move the selection out of bounds...
             foreach (var h in hitObjects)
-                h.Position += moveEvent.InstantDelta;
+                h.Position += this.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
 
             // but this will be corrected.
             moveSelectionInBounds();
diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 67b9e727a5..a8de3f6407 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -2,8 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
+using osuTK;
 
 namespace osu.Game.Extensions
 {
@@ -32,5 +34,14 @@ namespace osu.Game.Extensions
             scheduler.Add(repeatDelegate);
             return repeatDelegate;
         }
+
+        /// <summary>
+        /// Accepts a delta vector in screen-space coordinates and converts it to one which can be applied to this drawable's position.
+        /// </summary>
+        /// <param name="drawable">The drawable.</param>
+        /// <param name="delta">A delta in screen-space coordinates.</param>
+        /// <returns>The delta vector in Parent's coordinates.</returns>
+        public static Vector2 ScreenSpaceDeltaToParentSpace(this Drawable drawable, Vector2 delta) =>
+            drawable.Parent.ToLocalSpace(drawable.Parent.ToScreenSpace(Vector2.Zero) + delta);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
index 6369112d80..7911cf874b 100644
--- a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
@@ -34,7 +34,5 @@ namespace osu.Game.Rulesets.Edit
         public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
 
         public override Quad SelectionQuad => DrawableObject.ScreenSpaceDrawQuad;
-
-        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => DrawableObject.Parent.ToLocalSpace(screenSpacePosition) - DrawableObject.Position;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index b176ecb148..55703a2cd3 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Rulesets.Edit
         public virtual MenuItem[] ContextMenuItems => Array.Empty<MenuItem>();
 
         /// <summary>
-        /// The screen-space point that causes this <see cref="OverlaySelectionBlueprint"/> to be selected.
+        /// The screen-space point that causes this <see cref="OverlaySelectionBlueprint"/> to be selected via a drag.
         /// </summary>
         public virtual Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.Centre;
 
@@ -136,8 +136,6 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public virtual Quad SelectionQuad => ScreenSpaceDrawQuad;
 
-        public virtual Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Parent.ToLocalSpace(screenSpacePosition) - Position;
-
         /// <summary>
         /// Handle to perform a partial deletion when the user requests a quick delete (Shift+Right Click).
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 1f9cd0258e..361e98e0dd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -436,14 +436,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 // check for positional snap for every object in selection (for things like object-object snapping)
                 for (var i = 0; i < movementBlueprintOriginalPositions.Length; i++)
                 {
-                    var testPosition = movementBlueprintOriginalPositions[i] + distanceTravelled;
+                    Vector2 originalPosition = movementBlueprintOriginalPositions[i];
+                    var testPosition = originalPosition + distanceTravelled;
 
                     var positionalResult = snapProvider.SnapScreenSpacePositionToValidPosition(testPosition);
 
                     if (positionalResult.ScreenSpacePosition == testPosition) continue;
 
+                    var delta = positionalResult.ScreenSpacePosition - movementBlueprints[i].ScreenSpaceSelectionPoint;
+
                     // attempt to move the objects, and abort any time based snapping if we can.
-                    if (SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints[i], positionalResult.ScreenSpacePosition)))
+                    if (SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints[i], delta)))
                         return true;
                 }
             }
@@ -459,14 +462,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (result == null)
             {
-                return SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints.First(), movePosition));
+                return SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints.First(), movePosition - movementBlueprints.First().ScreenSpaceSelectionPoint));
             }
 
             return ApplySnapResult(movementBlueprints, result);
         }
 
         protected virtual bool ApplySnapResult(SelectionBlueprint<T>[] blueprints, SnapResult result) =>
-            SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(blueprints.First(), result.ScreenSpacePosition));
+            SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(blueprints.First(), result.ScreenSpacePosition - blueprints.First().ScreenSpaceSelectionPoint));
 
         /// <summary>
         /// Finishes the current movement of selected blueprints.
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index f8ac0552ae..6c174e563e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             // convert to game space coordinates
             delta = firstBlueprint.ToScreenSpace(delta) - firstBlueprint.ToScreenSpace(Vector2.Zero);
 
-            SelectionHandler.HandleMovement(new MoveSelectionEvent<HitObject>(firstBlueprint, firstBlueprint.ScreenSpaceSelectionPoint + delta));
+            SelectionHandler.HandleMovement(new MoveSelectionEvent<HitObject>(firstBlueprint, delta));
         }
 
         private void updatePlacementNewCombo()
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index a32c30b579..4d4f4b76c6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -17,21 +17,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public readonly SelectionBlueprint<T> Blueprint;
 
         /// <summary>
-        /// The expected screen-space position of the blueprint's item at the current cursor position.
+        /// The screen-space delta of this move event.
         /// </summary>
-        public readonly Vector2 ScreenSpacePosition;
+        public readonly Vector2 ScreenSpaceDelta;
 
-        /// <summary>
-        /// The distance between <see cref="ScreenSpacePosition"/> and the blueprint's current position, in the coordinate-space of the blueprint item's parent.
-        /// </summary>
-        public readonly Vector2 InstantDelta;
-
-        public MoveSelectionEvent(SelectionBlueprint<T> blueprint, Vector2 screenSpacePosition)
+        public MoveSelectionEvent(SelectionBlueprint<T> blueprint, Vector2 screenSpaceDelta)
         {
             Blueprint = blueprint;
-            ScreenSpacePosition = screenSpacePosition;
-
-            InstantDelta = Blueprint.GetInstantDelta(ScreenSpacePosition);
+            ScreenSpaceDelta = screenSpaceDelta;
         }
     }
 }

From 2d17219c8fa8dd28de771604a12fd618e3cab6e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 19:56:49 +0900
Subject: [PATCH 09614/10326] Setup basic test and classes for scale adjustment

---
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  | 42 +++++++++++++++++++
 .../Play/HUD/SkinnableAccuracyCounter.cs      |  2 +-
 .../Screens/Play/HUD/SkinnableHUDComponent.cs | 32 ++++++++++++++
 .../Screens/Play/HUD/SkinnableScoreCounter.cs |  2 +-
 4 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index fec1610160..029bf129c8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -4,17 +4,21 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
+using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -32,6 +36,32 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuConfigManager config { get; set; }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Add(new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Width = 0.3f,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = Color4.Black,
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0.7f,
+                    },
+                    new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Children = createSkinSourceComponents(),
+                    },
+                }
+            });
+        }
+
         [Test]
         public void TestComboCounterIncrementing()
         {
@@ -74,6 +104,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("key counter flow not affected", () => keyCounterFlow.IsPresent);
         }
 
+        private IReadOnlyList<Drawable> createSkinSourceComponents()
+        {
+            var hudComponents = typeof(SkinnableHUDComponent).Assembly.GetTypes().Where(t => typeof(SkinnableHUDComponent).IsAssignableFrom(t)).ToArray();
+
+            List<Drawable> drawables = new List<Drawable>();
+
+            foreach (var component in hudComponents)
+                drawables.AddRange(component.CreateSettingsControls());
+
+            return drawables;
+        }
+
         private void createNew(Action<HUDOverlay> action = null)
         {
             AddStep("create overlay", () =>
diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index 76c9c30813..ebb3bcd148 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
@@ -6,7 +6,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableAccuracyCounter : SkinnableDrawable, IAccuracyCounter
+    public class SkinnableAccuracyCounter : SkinnableHUDComponent, IAccuracyCounter
     {
         public Bindable<double> Current { get; } = new Bindable<double>();
 
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
new file mode 100644
index 0000000000..ea14a15348
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.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 System;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// A skinnable HUD component which can be scaled and repositioned at a skinner/user's will.
+    /// </summary>
+    public abstract class SkinnableHUDComponent : SkinnableDrawable
+    {
+        [SettingSource("Scale", "The scale at which this component should be displayed.")]
+        public BindableNumber<float> SkinScale { get; } = new BindableFloat(1)
+        {
+            Precision = 0.1f,
+            MinValue = 0.1f,
+            MaxValue = 10,
+            Default = 1,
+            Value = 1,
+        };
+
+        protected SkinnableHUDComponent(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
+            : base(component, defaultImplementation, allowFallback, confineMode)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
index b46f5684b1..9165b2c7f0 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
@@ -10,7 +10,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableScoreCounter : SkinnableDrawable, IScoreCounter
+    public class SkinnableScoreCounter : SkinnableHUDComponent, IScoreCounter
     {
         public Bindable<double> Current { get; } = new Bindable<double>();
 

From fca173225a2a8e8bf032f2e1019d197a64af1023 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 15:40:35 +0900
Subject: [PATCH 09615/10326] Refactor editor selection/blueprint components to
 be generic

---
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs    | 17 ++++++++++++++---
 .../Screens/Play/HUD/SkinnableComboCounter.cs   |  2 +-
 .../Screens/Play/HUD/SkinnableHealthDisplay.cs  |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 029bf129c8..4f8a78368e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -13,6 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         Colour = Color4.Black,
                         RelativeSizeAxes = Axes.Both,
-                        Alpha = 0.7f,
+                        Alpha = 0.9f,
                     },
                     new FillFlowContainer
                     {
@@ -106,12 +106,23 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private IReadOnlyList<Drawable> createSkinSourceComponents()
         {
-            var hudComponents = typeof(SkinnableHUDComponent).Assembly.GetTypes().Where(t => typeof(SkinnableHUDComponent).IsAssignableFrom(t)).ToArray();
+            Drawable[] hudComponents = typeof(SkinnableHUDComponent).Assembly
+                                                                    .GetTypes()
+                                                                    .Where(t => typeof(SkinnableHUDComponent).IsAssignableFrom(t))
+                                                                    .Where(t => !t.IsAbstract)
+                                                                    .Select(t => Activator.CreateInstance(t) as Drawable)
+                                                                    .ToArray();
 
             List<Drawable> drawables = new List<Drawable>();
 
             foreach (var component in hudComponents)
+            {
+                drawables.Add(new OsuSpriteText
+                {
+                    Text = component.GetType().Name
+                });
                 drawables.AddRange(component.CreateSettingsControls());
+            }
 
             return drawables;
         }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index c04c50141a..629bb467bc 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -6,7 +6,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableComboCounter : SkinnableDrawable, IComboCounter
+    public class SkinnableComboCounter : SkinnableHUDComponent, IComboCounter
     {
         public Bindable<int> Current { get; } = new Bindable<int>();
 
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index 1f91f5e50f..f8a8696dae 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
+    public class SkinnableHealthDisplay : SkinnableHUDComponent, IHealthDisplay
     {
         public Bindable<double> Current { get; } = new BindableDouble(1)
         {

From 99b428ee4b853033abfac1e0ee08a57c185d7a91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:03:49 +0900
Subject: [PATCH 09616/10326] Add very basic skin editor test

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 222 ++++++++++++++++++
 1 file changed, 222 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
new file mode 100644
index 0000000000..2391945b91
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -0,0 +1,222 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Logging;
+using osu.Framework.Testing;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSkinEditor : OsuTestScene
+    {
+        private HUDOverlay hudOverlay;
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create hud", () =>
+            {
+                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));
+
+                hudOverlay.ComboCounter.Current.Value = 1;
+            });
+
+            AddStep("create editor overlay", () => Add(new SkinEditor(hudOverlay)));
+        }
+
+        public class SkinEditor : CompositeDrawable
+        {
+            private readonly Drawable target;
+
+            public SkinEditor(Drawable target)
+            {
+                this.target = target;
+
+                RelativeSizeAxes = Axes.Both;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                InternalChildren = new[]
+                {
+                    target,
+                    new SkinBlueprintContainer(target),
+                };
+            }
+
+            public class SkinBlueprintContainer : BlueprintContainer<SkinnableHUDComponent>
+            {
+                private readonly Drawable target;
+
+                public SkinBlueprintContainer(Drawable target)
+                {
+                    this.target = target;
+                }
+
+                protected override void LoadComplete()
+                {
+                    base.LoadComplete();
+
+                    SkinnableHUDComponent[] components = target.ChildrenOfType<SkinnableHUDComponent>().ToArray();
+
+                    foreach (var c in components)
+                    {
+                        Logger.Log($"Adding blueprint for {c.GetType()}");
+                        AddBlueprintFor(c);
+                    }
+                }
+
+                protected override SelectionHandler<SkinnableHUDComponent> CreateSelectionHandler() => new SkinSelectionHandler();
+
+                public class SkinSelectionHandler : SelectionHandler<SkinnableHUDComponent>
+                {
+                    protected override void DeleteItems(IEnumerable<SkinnableHUDComponent> items)
+                    {
+                        foreach (var i in items)
+                            i.Drawable.Expire();
+                    }
+
+                    protected override void OnSelectionChanged()
+                    {
+                        base.OnSelectionChanged();
+
+                        SelectionBox.CanRotate = true;
+                        SelectionBox.CanScaleX = true;
+                        SelectionBox.CanScaleY = true;
+                        SelectionBox.CanReverse = false;
+                    }
+
+                    public override bool HandleRotation(float angle)
+                    {
+                        foreach (var c in SelectedBlueprints)
+                            c.Item.Rotation += angle;
+
+                        return base.HandleRotation(angle);
+                    }
+
+                    public override bool HandleScale(Vector2 scale, Anchor anchor)
+                    {
+                        adjustScaleFromAnchor(ref scale, anchor);
+
+                        foreach (var c in SelectedBlueprints)
+                            c.Item.Scale += scale * 0.01f;
+
+                        return true;
+                    }
+
+                    private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
+                    {
+                        // cancel out scale in axes we don't care about (based on which drag handle was used).
+                        if ((reference & Anchor.x1) > 0) scale.X = 0;
+                        if ((reference & Anchor.y1) > 0) scale.Y = 0;
+
+                        // reverse the scale direction if dragging from top or left.
+                        if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
+                        if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
+                    }
+
+                    public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
+                    {
+                        foreach (var c in SelectedBlueprints)
+                            c.Item.Position += moveEvent.InstantDelta;
+                        return true;
+                    }
+                }
+
+                protected override SelectionBlueprint<SkinnableHUDComponent> CreateBlueprintFor(SkinnableHUDComponent component)
+                    => new SkinBlueprint(component);
+
+                public class SkinBlueprint : SelectionBlueprint<SkinnableHUDComponent>
+                {
+                    /// <summary>
+                    /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
+                    /// </summary>
+                    public readonly SkinnableHUDComponent Component;
+
+                    private Container box;
+                    private Drawable drawable => Component.Drawable;
+
+                    /// <summary>
+                    /// Whether the blueprint should be shown even when the <see cref="Component"/> is not alive.
+                    /// </summary>
+                    protected virtual bool AlwaysShowWhenSelected => false;
+
+                    protected override bool ShouldBeAlive => (Component.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
+
+                    public SkinBlueprint(SkinnableHUDComponent component)
+                        : base(component)
+                    {
+                        Component = component;
+                    }
+
+                    [BackgroundDependencyLoader]
+                    private void load(OsuColour colours)
+                    {
+                        InternalChildren = new Drawable[]
+                        {
+                            box = new Container
+                            {
+                                Colour = colours.Yellow,
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Alpha = 0.2f,
+                                        AlwaysPresent = true,
+                                    },
+                                }
+                            },
+                        };
+                    }
+
+                    private Quad drawableQuad;
+
+                    public override Quad ScreenSpaceDrawQuad => drawableQuad;
+
+                    protected override void Update()
+                    {
+                        base.Update();
+
+                        drawableQuad = drawable.ScreenSpaceDrawQuad;
+                        var quad = ToLocalSpace(drawable.ScreenSpaceDrawQuad);
+
+                        box.Position = quad.TopLeft;
+                        box.Size = quad.Size;
+                        box.Rotation = Component.Rotation;
+                    }
+
+                    public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
+
+                    public override Vector2 ScreenSpaceSelectionPoint => Component.ToScreenSpace(Vector2.Zero);
+
+                    public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
+
+                    public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - Component.Position;
+                }
+            }
+        }
+    }
+}

From 74fb7cd180051a928cb714e291de09188beec55c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 14:21:07 +0900
Subject: [PATCH 09617/10326] Extract storable attributes to bindables

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 18 +++++-----
 .../Screens/Play/HUD/SkinnableHUDComponent.cs | 33 ++++++++++++++-----
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 2391945b91..4594db36ae 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     public override bool HandleRotation(float angle)
                     {
                         foreach (var c in SelectedBlueprints)
-                            c.Item.Rotation += angle;
+                            c.Item.SkinRotation.Value += angle;
 
                         return base.HandleRotation(angle);
                     }
@@ -121,11 +121,18 @@ namespace osu.Game.Tests.Visual.Gameplay
                         adjustScaleFromAnchor(ref scale, anchor);
 
                         foreach (var c in SelectedBlueprints)
-                            c.Item.Scale += scale * 0.01f;
+                            c.Item.SkinScale.Value += scale.X * 0.01f;
 
                         return true;
                     }
 
+                    public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
+                    {
+                        foreach (var c in SelectedBlueprints)
+                            c.Item.SkinPosition.Value += moveEvent.InstantDelta.X;
+                        return true;
+                    }
+
                     private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
                     {
                         // cancel out scale in axes we don't care about (based on which drag handle was used).
@@ -136,13 +143,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                         if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
                         if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
                     }
-
-                    public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
-                    {
-                        foreach (var c in SelectedBlueprints)
-                            c.Item.Position += moveEvent.InstantDelta;
-                        return true;
-                    }
                 }
 
                 protected override SelectionBlueprint<SkinnableHUDComponent> CreateBlueprintFor(SkinnableHUDComponent component)
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
index ea14a15348..5b8d313400 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
@@ -4,8 +4,10 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Layout;
 using osu.Game.Configuration;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -15,18 +17,33 @@ namespace osu.Game.Screens.Play.HUD
     public abstract class SkinnableHUDComponent : SkinnableDrawable
     {
         [SettingSource("Scale", "The scale at which this component should be displayed.")]
-        public BindableNumber<float> SkinScale { get; } = new BindableFloat(1)
-        {
-            Precision = 0.1f,
-            MinValue = 0.1f,
-            MaxValue = 10,
-            Default = 1,
-            Value = 1,
-        };
+        public BindableNumber<float> SkinScale { get; } = new BindableFloat(1);
+
+        [SettingSource("Position", "The position at which this component should be displayed.")]
+        public BindableNumber<float> SkinPosition { get; } = new BindableFloat();
+
+        [SettingSource("Rotation", "The rotation at which this component should be displayed.")]
+        public BindableNumber<float> SkinRotation { get; } = new BindableFloat();
+
+        [SettingSource("Anchor", "The screen edge this component should align to.")]
+        public Bindable<Anchor> SkinAnchor { get; } = new Bindable<Anchor>();
 
         protected SkinnableHUDComponent(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
             : base(component, defaultImplementation, allowFallback, confineMode)
         {
+            SkinScale.BindValueChanged(scale => Drawable.Scale = new Vector2(scale.NewValue));
+            SkinPosition.BindValueChanged(position => Position = new Vector2(position.NewValue));
+            SkinRotation.BindValueChanged(rotation => Drawable.Rotation = rotation.NewValue);
+            SkinAnchor.BindValueChanged(anchor => Anchor = anchor.NewValue);
+        }
+
+        protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
+        {
+            SkinScale.Value = Drawable.Scale.X;
+            SkinPosition.Value = Position.X;
+            SkinRotation.Value = Drawable.Rotation;
+            SkinAnchor.Value = Anchor;
+            return base.OnInvalidate(invalidation, source);
         }
     }
 }

From 1cb8fc9a241a2d07d43019c67f2b7312cc3aa69b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 15:14:48 +0900
Subject: [PATCH 09618/10326] Extract editor classes out of test namespace and
 add anchor support

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 213 ++----------------
 .../Screens/Play/HUD/SkinnableHUDComponent.cs |   5 +-
 osu.Game/Skinning/Editor/SkinBlueprint.cs     |  86 +++++++
 .../Skinning/Editor/SkinBlueprintContainer.cs |  36 +++
 osu.Game/Skinning/Editor/SkinEditor.cs        |  36 +++
 .../Skinning/Editor/SkinSelectionHandler.cs   | 139 ++++++++++++
 6 files changed, 315 insertions(+), 200 deletions(-)
 create mode 100644 osu.Game/Skinning/Editor/SkinBlueprint.cs
 create mode 100644 osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
 create mode 100644 osu.Game/Skinning/Editor/SkinEditor.cs
 create mode 100644 osu.Game/Skinning/Editor/SkinSelectionHandler.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 4594db36ae..e46cd70667 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -2,221 +2,36 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Logging;
 using osu.Framework.Testing;
-using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD;
-using osuTK;
+using osu.Game.Skinning.Editor;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSkinEditor : OsuTestScene
+    public class TestSceneSkinEditor : SkinnableTestScene
     {
-        private HUDOverlay hudOverlay;
-
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("create hud", () =>
+            AddStep("create editor overlay", () =>
             {
-                hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+                SetContents(() =>
+                {
+                    var 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));
+                    // Add any key just to display the key counter visually.
+                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
+                    hudOverlay.ComboCounter.Current.Value = 1;
 
-                hudOverlay.ComboCounter.Current.Value = 1;
+                    return new SkinEditor(hudOverlay);
+                });
             });
-
-            AddStep("create editor overlay", () => Add(new SkinEditor(hudOverlay)));
         }
 
-        public class SkinEditor : CompositeDrawable
-        {
-            private readonly Drawable target;
-
-            public SkinEditor(Drawable target)
-            {
-                this.target = target;
-
-                RelativeSizeAxes = Axes.Both;
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                InternalChildren = new[]
-                {
-                    target,
-                    new SkinBlueprintContainer(target),
-                };
-            }
-
-            public class SkinBlueprintContainer : BlueprintContainer<SkinnableHUDComponent>
-            {
-                private readonly Drawable target;
-
-                public SkinBlueprintContainer(Drawable target)
-                {
-                    this.target = target;
-                }
-
-                protected override void LoadComplete()
-                {
-                    base.LoadComplete();
-
-                    SkinnableHUDComponent[] components = target.ChildrenOfType<SkinnableHUDComponent>().ToArray();
-
-                    foreach (var c in components)
-                    {
-                        Logger.Log($"Adding blueprint for {c.GetType()}");
-                        AddBlueprintFor(c);
-                    }
-                }
-
-                protected override SelectionHandler<SkinnableHUDComponent> CreateSelectionHandler() => new SkinSelectionHandler();
-
-                public class SkinSelectionHandler : SelectionHandler<SkinnableHUDComponent>
-                {
-                    protected override void DeleteItems(IEnumerable<SkinnableHUDComponent> items)
-                    {
-                        foreach (var i in items)
-                            i.Drawable.Expire();
-                    }
-
-                    protected override void OnSelectionChanged()
-                    {
-                        base.OnSelectionChanged();
-
-                        SelectionBox.CanRotate = true;
-                        SelectionBox.CanScaleX = true;
-                        SelectionBox.CanScaleY = true;
-                        SelectionBox.CanReverse = false;
-                    }
-
-                    public override bool HandleRotation(float angle)
-                    {
-                        foreach (var c in SelectedBlueprints)
-                            c.Item.SkinRotation.Value += angle;
-
-                        return base.HandleRotation(angle);
-                    }
-
-                    public override bool HandleScale(Vector2 scale, Anchor anchor)
-                    {
-                        adjustScaleFromAnchor(ref scale, anchor);
-
-                        foreach (var c in SelectedBlueprints)
-                            c.Item.SkinScale.Value += scale.X * 0.01f;
-
-                        return true;
-                    }
-
-                    public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
-                    {
-                        foreach (var c in SelectedBlueprints)
-                            c.Item.SkinPosition.Value += moveEvent.InstantDelta.X;
-                        return true;
-                    }
-
-                    private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
-                    {
-                        // cancel out scale in axes we don't care about (based on which drag handle was used).
-                        if ((reference & Anchor.x1) > 0) scale.X = 0;
-                        if ((reference & Anchor.y1) > 0) scale.Y = 0;
-
-                        // reverse the scale direction if dragging from top or left.
-                        if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
-                        if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
-                    }
-                }
-
-                protected override SelectionBlueprint<SkinnableHUDComponent> CreateBlueprintFor(SkinnableHUDComponent component)
-                    => new SkinBlueprint(component);
-
-                public class SkinBlueprint : SelectionBlueprint<SkinnableHUDComponent>
-                {
-                    /// <summary>
-                    /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
-                    /// </summary>
-                    public readonly SkinnableHUDComponent Component;
-
-                    private Container box;
-                    private Drawable drawable => Component.Drawable;
-
-                    /// <summary>
-                    /// Whether the blueprint should be shown even when the <see cref="Component"/> is not alive.
-                    /// </summary>
-                    protected virtual bool AlwaysShowWhenSelected => false;
-
-                    protected override bool ShouldBeAlive => (Component.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
-
-                    public SkinBlueprint(SkinnableHUDComponent component)
-                        : base(component)
-                    {
-                        Component = component;
-                    }
-
-                    [BackgroundDependencyLoader]
-                    private void load(OsuColour colours)
-                    {
-                        InternalChildren = new Drawable[]
-                        {
-                            box = new Container
-                            {
-                                Colour = colours.Yellow,
-                                Children = new Drawable[]
-                                {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Alpha = 0.2f,
-                                        AlwaysPresent = true,
-                                    },
-                                }
-                            },
-                        };
-                    }
-
-                    private Quad drawableQuad;
-
-                    public override Quad ScreenSpaceDrawQuad => drawableQuad;
-
-                    protected override void Update()
-                    {
-                        base.Update();
-
-                        drawableQuad = drawable.ScreenSpaceDrawQuad;
-                        var quad = ToLocalSpace(drawable.ScreenSpaceDrawQuad);
-
-                        box.Position = quad.TopLeft;
-                        box.Size = quad.Size;
-                        box.Rotation = Component.Rotation;
-                    }
-
-                    public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
-
-                    public override Vector2 ScreenSpaceSelectionPoint => Component.ToScreenSpace(Vector2.Zero);
-
-                    public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
-
-                    public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - Component.Position;
-                }
-            }
-        }
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
index 5b8d313400..2064f8589d 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
@@ -34,7 +34,10 @@ namespace osu.Game.Screens.Play.HUD
             SkinScale.BindValueChanged(scale => Drawable.Scale = new Vector2(scale.NewValue));
             SkinPosition.BindValueChanged(position => Position = new Vector2(position.NewValue));
             SkinRotation.BindValueChanged(rotation => Drawable.Rotation = rotation.NewValue);
-            SkinAnchor.BindValueChanged(anchor => Anchor = anchor.NewValue);
+            SkinAnchor.BindValueChanged(anchor =>
+            {
+                Drawable.Anchor = anchor.NewValue;
+            });
         }
 
         protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
new file mode 100644
index 0000000000..f9fffab579
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+
+namespace osu.Game.Skinning.Editor
+{
+    public class SkinBlueprint : SelectionBlueprint<SkinnableHUDComponent>
+    {
+        /// <summary>
+        /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
+        /// </summary>
+        public readonly SkinnableHUDComponent Component;
+
+        private Container box;
+        private Drawable drawable => Component.Drawable;
+
+        /// <summary>
+        /// Whether the blueprint should be shown even when the <see cref="Component"/> is not alive.
+        /// </summary>
+        protected virtual bool AlwaysShowWhenSelected => false;
+
+        protected override bool ShouldBeAlive => (Component.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
+
+        public SkinBlueprint(SkinnableHUDComponent component)
+            : base(component)
+        {
+            Component = component;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            InternalChildren = new Drawable[]
+            {
+                box = new Container
+                {
+                    Colour = colours.Yellow,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0.2f,
+                            AlwaysPresent = true,
+                        },
+                    }
+                },
+            };
+        }
+
+        private Quad drawableQuad;
+
+        public override Quad ScreenSpaceDrawQuad => drawableQuad;
+
+        protected override void Update()
+        {
+            base.Update();
+
+            drawableQuad = drawable.ScreenSpaceDrawQuad;
+            var quad = ToLocalSpace(drawable.ScreenSpaceDrawQuad);
+
+            box.Position = quad.TopLeft;
+            box.Size = quad.Size;
+            box.Rotation = Component.Rotation;
+        }
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
+
+        public override Vector2 ScreenSpaceSelectionPoint => Component.ToScreenSpace(Vector2.Zero);
+
+        public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
+
+        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - Component.Position;
+    }
+}
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
new file mode 100644
index 0000000000..ddf3fd28a7
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -0,0 +1,36 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Skinning.Editor
+{
+    public class SkinBlueprintContainer : BlueprintContainer<SkinnableHUDComponent>
+    {
+        private readonly Drawable target;
+
+        public SkinBlueprintContainer(Drawable target)
+        {
+            this.target = target;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            SkinnableHUDComponent[] components = target.ChildrenOfType<SkinnableHUDComponent>().ToArray();
+
+            foreach (var c in components) AddBlueprintFor(c);
+        }
+
+        protected override SelectionHandler<SkinnableHUDComponent> CreateSelectionHandler() => new SkinSelectionHandler();
+
+        protected override SelectionBlueprint<SkinnableHUDComponent> CreateBlueprintFor(SkinnableHUDComponent component)
+            => new SkinBlueprint(component);
+    }
+}
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
new file mode 100644
index 0000000000..74d32bcb9f
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinEditor.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.Cursor;
+
+namespace osu.Game.Skinning.Editor
+{
+    public class SkinEditor : CompositeDrawable
+    {
+        private readonly Drawable target;
+
+        public SkinEditor(Drawable target)
+        {
+            this.target = target;
+
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            InternalChild = new OsuContextMenuContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new[]
+                {
+                    target,
+                    new SkinBlueprintContainer(target),
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
new file mode 100644
index 0000000000..4f28d4e0d2
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -0,0 +1,139 @@
+// Copyright (c) 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.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+
+namespace osu.Game.Skinning.Editor
+{
+    public class SkinSelectionHandler : SelectionHandler<SkinnableHUDComponent>
+    {
+        protected override void DeleteItems(IEnumerable<SkinnableHUDComponent> items)
+        {
+            foreach (var i in items)
+                i.Drawable.Expire();
+        }
+
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<SkinnableHUDComponent>> selection)
+        {
+            yield return new OsuMenuItem("Anchor")
+            {
+                Items = createAnchorItems().ToArray()
+            };
+
+            foreach (var item in base.GetContextMenuItemsForSelection(selection))
+                yield return item;
+
+            IEnumerable<AnchorMenuItem> createAnchorItems()
+            {
+                var displayableAnchors = new[]
+                {
+                    Anchor.TopLeft,
+                    Anchor.TopCentre,
+                    Anchor.TopRight,
+                    Anchor.CentreLeft,
+                    Anchor.Centre,
+                    Anchor.CentreRight,
+                    Anchor.BottomLeft,
+                    Anchor.BottomCentre,
+                    Anchor.BottomRight,
+                };
+
+                return displayableAnchors.Select(a =>
+                {
+                    var countExisting = selection.Count(b => b.Item.SkinAnchor.Value == a);
+                    var countTotal = selection.Count();
+
+                    TernaryState state;
+
+                    if (countExisting == countTotal)
+                        state = TernaryState.True;
+                    else if (countExisting > 0)
+                        state = TernaryState.Indeterminate;
+                    else
+                        state = TernaryState.False;
+
+                    return new AnchorMenuItem(a, selection, _ => applyAnchor(a))
+                    {
+                        State = { Value = state }
+                    };
+                });
+            }
+        }
+
+        private void applyAnchor(Anchor anchor)
+        {
+            foreach (var item in SelectedItems)
+                item.SkinAnchor.Value = anchor;
+        }
+
+        protected override void OnSelectionChanged()
+        {
+            base.OnSelectionChanged();
+
+            SelectionBox.CanRotate = true;
+            SelectionBox.CanScaleX = true;
+            SelectionBox.CanScaleY = true;
+            SelectionBox.CanReverse = false;
+        }
+
+        public override bool HandleRotation(float angle)
+        {
+            foreach (var c in SelectedBlueprints)
+                c.Item.SkinRotation.Value += angle;
+
+            return base.HandleRotation(angle);
+        }
+
+        public override bool HandleScale(Vector2 scale, Anchor anchor)
+        {
+            adjustScaleFromAnchor(ref scale, anchor);
+
+            foreach (var c in SelectedBlueprints)
+                c.Item.SkinScale.Value += scale.X * 0.01f;
+
+            return true;
+        }
+
+        public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
+        {
+            foreach (var c in SelectedBlueprints)
+                c.Item.SkinPosition.Value += moveEvent.InstantDelta.X;
+            return true;
+        }
+
+        private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
+        {
+            // cancel out scale in axes we don't care about (based on which drag handle was used).
+            if ((reference & Anchor.x1) > 0) scale.X = 0;
+            if ((reference & Anchor.y1) > 0) scale.Y = 0;
+
+            // reverse the scale direction if dragging from top or left.
+            if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
+            if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
+        }
+
+        public class AnchorMenuItem : TernaryStateMenuItem
+        {
+            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<SkinnableHUDComponent>> selection, Action<TernaryState> action)
+                : base(anchor.ToString(), getNextState, MenuItemType.Standard, action)
+            {
+            }
+
+            private void updateState(TernaryState obj)
+            {
+                throw new NotImplementedException();
+            }
+
+            private static TernaryState getNextState(TernaryState state) => TernaryState.True;
+        }
+    }
+}

From 59339aa4fd3e46485c83c0a1c73eec18e45bddf9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 15:28:32 +0900
Subject: [PATCH 09619/10326] Add support for x/y position and scale back in

---
 .../Screens/Play/HUD/SkinnableHUDComponent.cs | 28 +++++++++++++------
 .../Skinning/Editor/SkinSelectionHandler.cs   | 11 ++++++--
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
index 2064f8589d..533573efd2 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
@@ -16,11 +16,17 @@ namespace osu.Game.Screens.Play.HUD
     /// </summary>
     public abstract class SkinnableHUDComponent : SkinnableDrawable
     {
-        [SettingSource("Scale", "The scale at which this component should be displayed.")]
-        public BindableNumber<float> SkinScale { get; } = new BindableFloat(1);
+        [SettingSource("ScaleX", "The horizontal scale at which this component should be displayed.")]
+        public BindableNumber<float> SkinScaleX { get; } = new BindableFloat(1);
 
-        [SettingSource("Position", "The position at which this component should be displayed.")]
-        public BindableNumber<float> SkinPosition { get; } = new BindableFloat();
+        [SettingSource("ScaleY", "The vertical scale at which this component should be displayed.")]
+        public BindableNumber<float> SkinScaleY { get; } = new BindableFloat(1);
+
+        [SettingSource("PositionX", "The horizontal position at which this component should be displayed.")]
+        public BindableNumber<float> SkinPositionX { get; } = new BindableFloat();
+
+        [SettingSource("PositionY", "The vertical position at which this component should be displayed.")]
+        public BindableNumber<float> SkinPositionY { get; } = new BindableFloat();
 
         [SettingSource("Rotation", "The rotation at which this component should be displayed.")]
         public BindableNumber<float> SkinRotation { get; } = new BindableFloat();
@@ -31,8 +37,12 @@ namespace osu.Game.Screens.Play.HUD
         protected SkinnableHUDComponent(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
             : base(component, defaultImplementation, allowFallback, confineMode)
         {
-            SkinScale.BindValueChanged(scale => Drawable.Scale = new Vector2(scale.NewValue));
-            SkinPosition.BindValueChanged(position => Position = new Vector2(position.NewValue));
+            SkinScaleX.BindValueChanged(x => Drawable.Scale = new Vector2(x.NewValue, Drawable.Scale.Y));
+            SkinScaleY.BindValueChanged(y => Drawable.Scale = new Vector2(Drawable.Scale.X, y.NewValue));
+
+            SkinPositionX.BindValueChanged(x => Position = new Vector2(x.NewValue, Position.Y));
+            SkinPositionY.BindValueChanged(y => Position = new Vector2(Position.X, y.NewValue));
+
             SkinRotation.BindValueChanged(rotation => Drawable.Rotation = rotation.NewValue);
             SkinAnchor.BindValueChanged(anchor =>
             {
@@ -42,8 +52,10 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
         {
-            SkinScale.Value = Drawable.Scale.X;
-            SkinPosition.Value = Position.X;
+            SkinScaleX.Value = Drawable.Scale.X;
+            SkinScaleY.Value = Drawable.Scale.Y;
+            SkinPositionX.Value = Position.X;
+            SkinPositionY.Value = Position.Y;
             SkinRotation.Value = Drawable.Rotation;
             SkinAnchor.Value = Anchor;
             return base.OnInvalidate(invalidation, source);
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 4f28d4e0d2..55f36c73d6 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -98,7 +98,10 @@ namespace osu.Game.Skinning.Editor
             adjustScaleFromAnchor(ref scale, anchor);
 
             foreach (var c in SelectedBlueprints)
-                c.Item.SkinScale.Value += scale.X * 0.01f;
+            {
+                c.Item.SkinScaleX.Value += scale.X * 0.01f;
+                c.Item.SkinScaleY.Value += scale.Y * 0.01f;
+            }
 
             return true;
         }
@@ -106,7 +109,11 @@ namespace osu.Game.Skinning.Editor
         public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
         {
             foreach (var c in SelectedBlueprints)
-                c.Item.SkinPosition.Value += moveEvent.InstantDelta.X;
+            {
+                c.Item.SkinPositionX.Value += moveEvent.InstantDelta.X;
+                c.Item.SkinPositionY.Value += moveEvent.InstantDelta.Y;
+            }
+
             return true;
         }
 

From 2540d6029c4d804dd2e0378c35b58319349c8ebb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 17:47:28 +0900
Subject: [PATCH 09620/10326] Use AutoSize for SkinnableHudComponents

---
 .../Screens/Play/HUD/SkinnableHUDComponent.cs | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
index 533573efd2..f5333c940f 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
@@ -37,26 +37,26 @@ namespace osu.Game.Screens.Play.HUD
         protected SkinnableHUDComponent(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
             : base(component, defaultImplementation, allowFallback, confineMode)
         {
-            SkinScaleX.BindValueChanged(x => Drawable.Scale = new Vector2(x.NewValue, Drawable.Scale.Y));
-            SkinScaleY.BindValueChanged(y => Drawable.Scale = new Vector2(Drawable.Scale.X, y.NewValue));
+            SkinScaleX.BindValueChanged(x => Scale = new Vector2(x.NewValue, Scale.Y));
+            SkinScaleY.BindValueChanged(y => Scale = new Vector2(Scale.X, y.NewValue));
 
             SkinPositionX.BindValueChanged(x => Position = new Vector2(x.NewValue, Position.Y));
             SkinPositionY.BindValueChanged(y => Position = new Vector2(Position.X, y.NewValue));
 
-            SkinRotation.BindValueChanged(rotation => Drawable.Rotation = rotation.NewValue);
-            SkinAnchor.BindValueChanged(anchor =>
-            {
-                Drawable.Anchor = anchor.NewValue;
-            });
+            SkinRotation.BindValueChanged(rotation => Rotation = rotation.NewValue);
+            SkinAnchor.BindValueChanged(anchor => { Anchor = anchor.NewValue; });
+
+            RelativeSizeAxes = Axes.None;
+            AutoSizeAxes = Axes.Both;
         }
 
         protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
         {
-            SkinScaleX.Value = Drawable.Scale.X;
-            SkinScaleY.Value = Drawable.Scale.Y;
+            SkinScaleX.Value = Scale.X;
+            SkinScaleY.Value = Scale.Y;
             SkinPositionX.Value = Position.X;
             SkinPositionY.Value = Position.Y;
-            SkinRotation.Value = Drawable.Rotation;
+            SkinRotation.Value = Rotation;
             SkinAnchor.Value = Anchor;
             return base.OnInvalidate(invalidation, source);
         }

From defa350aa71cf07ffcee310fbfbde9dbc1c1c187 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 18:06:59 +0900
Subject: [PATCH 09621/10326] Set defaults on SkinnableHUDComponent to cancel
 out relative size default

Specifying locally on each HUD component looks to make more sense.
---
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  | 26 -------------------
 .../Play/HUD/SkinnableAccuracyCounter.cs      |  2 ++
 .../Screens/Play/HUD/SkinnableComboCounter.cs |  2 ++
 .../Screens/Play/HUD/SkinnableHUDComponent.cs |  6 ++++-
 .../Play/HUD/SkinnableHealthDisplay.cs        |  3 +++
 .../Screens/Play/HUD/SkinnableScoreCounter.cs |  2 ++
 6 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 4f8a78368e..5c3d3c03bf 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -36,32 +36,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuConfigManager config { get; set; }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Add(new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Width = 0.3f,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        Colour = Color4.Black,
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0.9f,
-                    },
-                    new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Direction = FillDirection.Vertical,
-                        Children = createSkinSourceComponents(),
-                    },
-                }
-            });
-        }
-
         [Test]
         public void TestComboCounterIncrementing()
         {
diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index ebb3bcd148..33132adf23 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
@@ -14,6 +15,7 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter), _ => new DefaultAccuracyCounter())
         {
             CentreComponent = false;
+            AutoSizeAxes = Axes.Both;
         }
 
         private IAccuracyCounter skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index 629bb467bc..8785eccfc3 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
@@ -14,6 +15,7 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), skinComponent => new DefaultComboCounter())
         {
             CentreComponent = false;
+            AutoSizeAxes = Axes.Both;
         }
 
         private IComboCounter skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
index f5333c940f..7d23611718 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
@@ -46,8 +46,11 @@ namespace osu.Game.Screens.Play.HUD
             SkinRotation.BindValueChanged(rotation => Rotation = rotation.NewValue);
             SkinAnchor.BindValueChanged(anchor => { Anchor = anchor.NewValue; });
 
+            // reset everything and require each component to specify what they want,
+            // as if they were just drawables. maybe we want to change SkinnableDrawable to not default
+            // to RelativeSizeAxes.Both...
             RelativeSizeAxes = Axes.None;
-            AutoSizeAxes = Axes.Both;
+            AutoSizeAxes = Axes.None;
         }
 
         protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
@@ -58,6 +61,7 @@ namespace osu.Game.Screens.Play.HUD
             SkinPositionY.Value = Position.Y;
             SkinRotation.Value = Rotation;
             SkinAnchor.Value = Anchor;
+
             return base.OnInvalidate(invalidation, source);
         }
     }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index f8a8696dae..ceac147b63 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
@@ -35,6 +36,8 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.HealthDisplay), _ => new DefaultHealthDisplay())
         {
             CentreComponent = false;
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
         }
 
         private IHealthDisplay skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
index 9165b2c7f0..c47baf95ff 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
@@ -22,6 +23,7 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.ScoreCounter), _ => new DefaultScoreCounter())
         {
             CentreComponent = false;
+            AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]

From fd587a82ffe2f73ac5302b528222b0d8f42ad78b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 18:34:34 +0900
Subject: [PATCH 09622/10326] Replace abstract class with interface, attached
 to the actual components (not skinnable wrapper)

---
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  | 27 --------
 .../Play/HUD/DefaultAccuracyCounter.cs        |  2 +-
 .../Screens/Play/HUD/DefaultComboCounter.cs   |  2 +-
 .../Screens/Play/HUD/DefaultHealthDisplay.cs  |  2 +-
 .../Screens/Play/HUD/DefaultScoreCounter.cs   |  2 +-
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    |  2 +-
 .../Screens/Play/HUD/ISkinnableComponent.cs   | 14 ++++
 .../Screens/Play/HUD/LegacyComboCounter.cs    |  2 +-
 .../Play/HUD/SkinnableAccuracyCounter.cs      |  4 +-
 .../Screens/Play/HUD/SkinnableComboCounter.cs |  4 +-
 .../Screens/Play/HUD/SkinnableHUDComponent.cs | 68 -------------------
 .../Play/HUD/SkinnableHealthDisplay.cs        |  5 +-
 .../Screens/Play/HUD/SkinnableScoreCounter.cs |  4 +-
 osu.Game/Skinning/Editor/SkinBlueprint.cs     | 17 ++---
 .../Skinning/Editor/SkinBlueprintContainer.cs |  8 +--
 .../Skinning/Editor/SkinSelectionHandler.cs   | 26 +++----
 osu.Game/Skinning/LegacyAccuracyCounter.cs    |  2 +-
 osu.Game/Skinning/LegacyHealthDisplay.cs      |  2 +-
 osu.Game/Skinning/LegacyScoreCounter.cs       |  3 +-
 19 files changed, 52 insertions(+), 144 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ISkinnableComponent.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 5c3d3c03bf..fec1610160 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -9,16 +9,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD;
-using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -78,29 +74,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("key counter flow not affected", () => keyCounterFlow.IsPresent);
         }
 
-        private IReadOnlyList<Drawable> createSkinSourceComponents()
-        {
-            Drawable[] hudComponents = typeof(SkinnableHUDComponent).Assembly
-                                                                    .GetTypes()
-                                                                    .Where(t => typeof(SkinnableHUDComponent).IsAssignableFrom(t))
-                                                                    .Where(t => !t.IsAbstract)
-                                                                    .Select(t => Activator.CreateInstance(t) as Drawable)
-                                                                    .ToArray();
-
-            List<Drawable> drawables = new List<Drawable>();
-
-            foreach (var component in hudComponents)
-            {
-                drawables.Add(new OsuSpriteText
-                {
-                    Text = component.GetType().Name
-                });
-                drawables.AddRange(component.CreateSettingsControls());
-            }
-
-            return drawables;
-        }
-
         private void createNew(Action<HUDOverlay> action = null)
         {
             AddStep("create overlay", () =>
diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index d5d8ec570a..b8a43708b4 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -9,7 +9,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultAccuracyCounter : PercentageCounter, IAccuracyCounter
+    public class DefaultAccuracyCounter : PercentageCounter, IAccuracyCounter, ISkinnableComponent
     {
         private readonly Vector2 offset = new Vector2(-20, 5);
 
diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 63e7a88550..959766ecd1 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultComboCounter : RollingCounter<int>, IComboCounter
+    public class DefaultComboCounter : RollingCounter<int>, IComboCounter, ISkinnableComponent
     {
         private readonly Vector2 offset = new Vector2(20, 5);
 
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index b550b469e9..e3cd71691d 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -16,7 +16,7 @@ using osu.Framework.Utils;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultHealthDisplay : HealthDisplay, IHasAccentColour
+    public class DefaultHealthDisplay : HealthDisplay, IHasAccentColour, ISkinnableComponent
     {
         /// <summary>
         /// The base opacity of the glow.
diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index 1dcfe2e067..dde5c18b38 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -8,7 +8,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultScoreCounter : ScoreCounter
+    public class DefaultScoreCounter : ScoreCounter, ISkinnableComponent
     {
         public DefaultScoreCounter()
             : base(6)
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 89f135de7f..3b24c8cc9e 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -18,7 +18,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
-    public class BarHitErrorMeter : HitErrorMeter
+    public class BarHitErrorMeter : HitErrorMeter, ISkinnableComponent
     {
         private readonly Anchor alignment;
 
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableComponent.cs b/osu.Game/Screens/Play/HUD/ISkinnableComponent.cs
new file mode 100644
index 0000000000..6d4558443f
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ISkinnableComponent.cs
@@ -0,0 +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;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// Denotes a drawable which, as a drawable, can be adjusted via skinning specifications.
+    /// </summary>
+    public interface ISkinnableComponent : IDrawable
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index b4604c0d01..4ae722e44c 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// Uses the 'x' symbol and has a pop-out effect while rolling over.
     /// </summary>
-    public class LegacyComboCounter : CompositeDrawable, IComboCounter
+    public class LegacyComboCounter : CompositeDrawable, IComboCounter, ISkinnableComponent
     {
         public Bindable<int> Current { get; } = new BindableInt { MinValue = 0, };
 
diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index 33132adf23..76c9c30813 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
@@ -2,12 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableAccuracyCounter : SkinnableHUDComponent, IAccuracyCounter
+    public class SkinnableAccuracyCounter : SkinnableDrawable, IAccuracyCounter
     {
         public Bindable<double> Current { get; } = new Bindable<double>();
 
@@ -15,7 +14,6 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter), _ => new DefaultAccuracyCounter())
         {
             CentreComponent = false;
-            AutoSizeAxes = Axes.Both;
         }
 
         private IAccuracyCounter skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index 8785eccfc3..c04c50141a 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -2,12 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableComboCounter : SkinnableHUDComponent, IComboCounter
+    public class SkinnableComboCounter : SkinnableDrawable, IComboCounter
     {
         public Bindable<int> Current { get; } = new Bindable<int>();
 
@@ -15,7 +14,6 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), skinComponent => new DefaultComboCounter())
         {
             CentreComponent = false;
-            AutoSizeAxes = Axes.Both;
         }
 
         private IComboCounter skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
deleted file mode 100644
index 7d23611718..0000000000
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Layout;
-using osu.Game.Configuration;
-using osu.Game.Skinning;
-using osuTK;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// A skinnable HUD component which can be scaled and repositioned at a skinner/user's will.
-    /// </summary>
-    public abstract class SkinnableHUDComponent : SkinnableDrawable
-    {
-        [SettingSource("ScaleX", "The horizontal scale at which this component should be displayed.")]
-        public BindableNumber<float> SkinScaleX { get; } = new BindableFloat(1);
-
-        [SettingSource("ScaleY", "The vertical scale at which this component should be displayed.")]
-        public BindableNumber<float> SkinScaleY { get; } = new BindableFloat(1);
-
-        [SettingSource("PositionX", "The horizontal position at which this component should be displayed.")]
-        public BindableNumber<float> SkinPositionX { get; } = new BindableFloat();
-
-        [SettingSource("PositionY", "The vertical position at which this component should be displayed.")]
-        public BindableNumber<float> SkinPositionY { get; } = new BindableFloat();
-
-        [SettingSource("Rotation", "The rotation at which this component should be displayed.")]
-        public BindableNumber<float> SkinRotation { get; } = new BindableFloat();
-
-        [SettingSource("Anchor", "The screen edge this component should align to.")]
-        public Bindable<Anchor> SkinAnchor { get; } = new Bindable<Anchor>();
-
-        protected SkinnableHUDComponent(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
-            : base(component, defaultImplementation, allowFallback, confineMode)
-        {
-            SkinScaleX.BindValueChanged(x => Scale = new Vector2(x.NewValue, Scale.Y));
-            SkinScaleY.BindValueChanged(y => Scale = new Vector2(Scale.X, y.NewValue));
-
-            SkinPositionX.BindValueChanged(x => Position = new Vector2(x.NewValue, Position.Y));
-            SkinPositionY.BindValueChanged(y => Position = new Vector2(Position.X, y.NewValue));
-
-            SkinRotation.BindValueChanged(rotation => Rotation = rotation.NewValue);
-            SkinAnchor.BindValueChanged(anchor => { Anchor = anchor.NewValue; });
-
-            // reset everything and require each component to specify what they want,
-            // as if they were just drawables. maybe we want to change SkinnableDrawable to not default
-            // to RelativeSizeAxes.Both...
-            RelativeSizeAxes = Axes.None;
-            AutoSizeAxes = Axes.None;
-        }
-
-        protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
-        {
-            SkinScaleX.Value = Scale.X;
-            SkinScaleY.Value = Scale.Y;
-            SkinPositionX.Value = Position.X;
-            SkinPositionY.Value = Position.Y;
-            SkinRotation.Value = Rotation;
-            SkinAnchor.Value = Anchor;
-
-            return base.OnInvalidate(invalidation, source);
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index ceac147b63..1f91f5e50f 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -3,14 +3,13 @@
 
 using System;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableHealthDisplay : SkinnableHUDComponent, IHealthDisplay
+    public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
     {
         public Bindable<double> Current { get; } = new BindableDouble(1)
         {
@@ -36,8 +35,6 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.HealthDisplay), _ => new DefaultHealthDisplay())
         {
             CentreComponent = false;
-            AutoSizeAxes = Axes.Y;
-            RelativeSizeAxes = Axes.X;
         }
 
         private IHealthDisplay skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
index c47baf95ff..b46f5684b1 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
@@ -4,14 +4,13 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableScoreCounter : SkinnableHUDComponent, IScoreCounter
+    public class SkinnableScoreCounter : SkinnableDrawable, IScoreCounter
     {
         public Bindable<double> Current { get; } = new Bindable<double>();
 
@@ -23,7 +22,6 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.ScoreCounter), _ => new DefaultScoreCounter())
         {
             CentreComponent = false;
-            AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index f9fffab579..674153cb26 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -15,24 +15,25 @@ using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinBlueprint : SelectionBlueprint<SkinnableHUDComponent>
+    public class SkinBlueprint : SelectionBlueprint<ISkinnableComponent>
     {
         /// <summary>
         /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
         /// </summary>
-        public readonly SkinnableHUDComponent Component;
+        public readonly ISkinnableComponent Component;
 
         private Container box;
-        private Drawable drawable => Component.Drawable;
+
+        private Drawable drawable => (Drawable)Component;
 
         /// <summary>
         /// Whether the blueprint should be shown even when the <see cref="Component"/> is not alive.
         /// </summary>
         protected virtual bool AlwaysShowWhenSelected => false;
 
-        protected override bool ShouldBeAlive => (Component.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
+        protected override bool ShouldBeAlive => (drawable.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
 
-        public SkinBlueprint(SkinnableHUDComponent component)
+        public SkinBlueprint(ISkinnableComponent component)
             : base(component)
         {
             Component = component;
@@ -72,15 +73,15 @@ namespace osu.Game.Skinning.Editor
 
             box.Position = quad.TopLeft;
             box.Size = quad.Size;
-            box.Rotation = Component.Rotation;
+            box.Rotation = drawable.Rotation;
         }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
 
-        public override Vector2 ScreenSpaceSelectionPoint => Component.ToScreenSpace(Vector2.Zero);
+        public override Vector2 ScreenSpaceSelectionPoint => drawable.ToScreenSpace(Vector2.Zero);
 
         public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
 
-        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - Component.Position;
+        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - drawable.Position;
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index ddf3fd28a7..f997e84355 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -10,7 +10,7 @@ using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinBlueprintContainer : BlueprintContainer<SkinnableHUDComponent>
+    public class SkinBlueprintContainer : BlueprintContainer<ISkinnableComponent>
     {
         private readonly Drawable target;
 
@@ -23,14 +23,14 @@ namespace osu.Game.Skinning.Editor
         {
             base.LoadComplete();
 
-            SkinnableHUDComponent[] components = target.ChildrenOfType<SkinnableHUDComponent>().ToArray();
+            ISkinnableComponent[] components = target.ChildrenOfType<ISkinnableComponent>().ToArray();
 
             foreach (var c in components) AddBlueprintFor(c);
         }
 
-        protected override SelectionHandler<SkinnableHUDComponent> CreateSelectionHandler() => new SkinSelectionHandler();
+        protected override SelectionHandler<ISkinnableComponent> CreateSelectionHandler() => new SkinSelectionHandler();
 
-        protected override SelectionBlueprint<SkinnableHUDComponent> CreateBlueprintFor(SkinnableHUDComponent component)
+        protected override SelectionBlueprint<ISkinnableComponent> CreateBlueprintFor(ISkinnableComponent component)
             => new SkinBlueprint(component);
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 55f36c73d6..38404efd0c 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -14,15 +14,15 @@ using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinSelectionHandler : SelectionHandler<SkinnableHUDComponent>
+    public class SkinSelectionHandler : SelectionHandler<ISkinnableComponent>
     {
-        protected override void DeleteItems(IEnumerable<SkinnableHUDComponent> items)
+        protected override void DeleteItems(IEnumerable<ISkinnableComponent> items)
         {
             foreach (var i in items)
-                i.Drawable.Expire();
+                i.Hide();
         }
 
-        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<SkinnableHUDComponent>> selection)
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableComponent>> selection)
         {
             yield return new OsuMenuItem("Anchor")
             {
@@ -49,7 +49,7 @@ namespace osu.Game.Skinning.Editor
 
                 return displayableAnchors.Select(a =>
                 {
-                    var countExisting = selection.Count(b => b.Item.SkinAnchor.Value == a);
+                    var countExisting = selection.Count(b => ((Drawable)b.Item).Anchor == a);
                     var countTotal = selection.Count();
 
                     TernaryState state;
@@ -72,7 +72,7 @@ namespace osu.Game.Skinning.Editor
         private void applyAnchor(Anchor anchor)
         {
             foreach (var item in SelectedItems)
-                item.SkinAnchor.Value = anchor;
+                ((Drawable)item).Anchor = anchor;
         }
 
         protected override void OnSelectionChanged()
@@ -88,7 +88,7 @@ namespace osu.Game.Skinning.Editor
         public override bool HandleRotation(float angle)
         {
             foreach (var c in SelectedBlueprints)
-                c.Item.SkinRotation.Value += angle;
+                ((Drawable)c.Item).Rotation += angle;
 
             return base.HandleRotation(angle);
         }
@@ -98,20 +98,16 @@ namespace osu.Game.Skinning.Editor
             adjustScaleFromAnchor(ref scale, anchor);
 
             foreach (var c in SelectedBlueprints)
-            {
-                c.Item.SkinScaleX.Value += scale.X * 0.01f;
-                c.Item.SkinScaleY.Value += scale.Y * 0.01f;
-            }
+                ((Drawable)c.Item).Scale += scale * 0.01f;
 
             return true;
         }
 
-        public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
+        public override bool HandleMovement(MoveSelectionEvent<ISkinnableComponent> moveEvent)
         {
             foreach (var c in SelectedBlueprints)
             {
-                c.Item.SkinPositionX.Value += moveEvent.InstantDelta.X;
-                c.Item.SkinPositionY.Value += moveEvent.InstantDelta.Y;
+                ((Drawable)c.Item).Position += moveEvent.InstantDelta;
             }
 
             return true;
@@ -130,7 +126,7 @@ namespace osu.Game.Skinning.Editor
 
         public class AnchorMenuItem : TernaryStateMenuItem
         {
-            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<SkinnableHUDComponent>> selection, Action<TernaryState> action)
+            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<ISkinnableComponent>> selection, Action<TernaryState> action)
                 : base(anchor.ToString(), getNextState, MenuItemType.Standard, action)
             {
             }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 7d6f1dc916..c592e06924 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyAccuracyCounter : PercentageCounter, IAccuracyCounter
+    public class LegacyAccuracyCounter : PercentageCounter, IAccuracyCounter, ISkinnableComponent
     {
         private readonly ISkin skin;
 
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 2921d46467..2e29abf453 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyHealthDisplay : CompositeDrawable, IHealthDisplay
+    public class LegacyHealthDisplay : CompositeDrawable, IHealthDisplay, ISkinnableComponent
     {
         private const double epic_cutoff = 0.5;
 
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 1d330ef495..cae8044242 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -5,11 +5,12 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyScoreCounter : ScoreCounter
+    public class LegacyScoreCounter : ScoreCounter, ISkinnableComponent
     {
         private readonly ISkin skin;
 

From 4f9e1e4945d002ea20a35855bd2bcdd160aa50eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 18:59:55 +0900
Subject: [PATCH 09623/10326] Check for new components every one second to
 handle late loaders

---
 osu.Game/Skinning/Editor/SkinBlueprintContainer.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index f997e84355..f2bc8ecddf 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -23,9 +23,14 @@ namespace osu.Game.Skinning.Editor
         {
             base.LoadComplete();
 
-            ISkinnableComponent[] components = target.ChildrenOfType<ISkinnableComponent>().ToArray();
+            checkForComponents();
+        }
 
-            foreach (var c in components) AddBlueprintFor(c);
+        private void checkForComponents()
+        {
+            foreach (var c in target.ChildrenOfType<ISkinnableComponent>().ToArray()) AddBlueprintFor(c);
+
+            Scheduler.AddDelayed(checkForComponents, 1000);
         }
 
         protected override SelectionHandler<ISkinnableComponent> CreateSelectionHandler() => new SkinSelectionHandler();

From 74c6fdc4b8e52611b8e51645e19f27b9e042e5e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 19:00:16 +0900
Subject: [PATCH 09624/10326] Add `DrawableRuleset` to the skin editor test to
 get a hit error meter to display

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index e46cd70667..eaa0c29616 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -2,10 +2,15 @@
 // 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.Testing;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning.Editor;
 using osuTK.Input;
@@ -21,13 +26,32 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 SetContents(() =>
                 {
-                    var hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+                    var ruleset = new OsuRuleset();
+                    var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
+                    var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
+
+                    ScoreProcessor scoreProcessor = new ScoreProcessor();
+
+                    var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
+
+                    var hudOverlay = new HUDOverlay(scoreProcessor, null, drawableRuleset, Array.Empty<Mod>());
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
                     hudOverlay.ComboCounter.Current.Value = 1;
 
-                    return new SkinEditor(hudOverlay);
+                    // Apply a miss judgement
+                    scoreProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Good });
+
+                    return new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            drawableRuleset,
+                            new SkinEditor(hudOverlay),
+                        }
+                    };
                 });
             });
         }

From de73ac7ceccfa3d518baa6ec93190efda3ea2d24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 13:53:01 +0900
Subject: [PATCH 09625/10326] Allow skin editor to be invoked from any context

This is kind of how I see things working going forward, where the editor
can be applied to anything in the game which supports it (ie. a results
screen, gameplay screen, etc.) and it will immediately allow changing
the interface.

This adds a test scene which shows this working with gameplay.
---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 59 +++++------------
 .../TestSceneSkinEditorMultipleSkins.cs       | 61 +++++++++++++++++
 osu.Game/Skinning/Editor/SkinEditor.cs        | 66 +++++++++++++++++--
 3 files changed, 138 insertions(+), 48 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index eaa0c29616..0c2c6ed454 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -1,61 +1,36 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play;
 using osu.Game.Skinning.Editor;
-using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSkinEditor : SkinnableTestScene
+    public class TestSceneSkinEditor : PlayerTestScene
     {
+        private SkinEditor skinEditor;
+
         [SetUpSteps]
-        public void SetUpSteps()
+        public override void SetUpSteps()
         {
-            AddStep("create editor overlay", () =>
+            base.SetUpSteps();
+
+            AddStep("add editor overlay", () =>
             {
-                SetContents(() =>
-                {
-                    var ruleset = new OsuRuleset();
-                    var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
-                    var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
-
-                    ScoreProcessor scoreProcessor = new ScoreProcessor();
-
-                    var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
-
-                    var hudOverlay = new HUDOverlay(scoreProcessor, null, drawableRuleset, Array.Empty<Mod>());
-
-                    // Add any key just to display the key counter visually.
-                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
-                    hudOverlay.ComboCounter.Current.Value = 1;
-
-                    // Apply a miss judgement
-                    scoreProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Good });
-
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            drawableRuleset,
-                            new SkinEditor(hudOverlay),
-                        }
-                    };
-                });
+                skinEditor?.Expire();
+                LoadComponentAsync(skinEditor = new SkinEditor(Player), Add);
             });
         }
 
-        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+        [Test]
+        public void TestToggleEditor()
+        {
+            AddToggleStep("toggle editor visibility", visible => skinEditor.ToggleVisibility());
+        }
+
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
new file mode 100644
index 0000000000..086bcb19c3
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -0,0 +1,61 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning.Editor;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSkinEditorMultipleSkins : SkinnableTestScene
+    {
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create editor overlay", () =>
+            {
+                SetContents(() =>
+                {
+                    var ruleset = new OsuRuleset();
+                    var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
+                    var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
+
+                    ScoreProcessor scoreProcessor = new ScoreProcessor();
+
+                    var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
+
+                    var hudOverlay = new HUDOverlay(scoreProcessor, null, drawableRuleset, Array.Empty<Mod>())
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    };
+
+                    // Add any key just to display the key counter visually.
+                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
+                    hudOverlay.ComboCounter.Current.Value = 1;
+
+                    return new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            drawableRuleset,
+                            hudOverlay,
+                            new SkinEditor(hudOverlay),
+                        }
+                    };
+                });
+            });
+        }
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+    }
+}
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 74d32bcb9f..4f81fad4ba 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -1,15 +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.Shapes;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinEditor : CompositeDrawable
+    public class SkinEditor : VisibilityContainer
     {
         private readonly Drawable target;
+        private Container border;
+
+        protected override bool StartHidden => true;
 
         public SkinEditor(Drawable target)
         {
@@ -18,19 +24,67 @@ namespace osu.Game.Skinning.Editor
             RelativeSizeAxes = Axes.Both;
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
         {
-            base.LoadComplete();
-
             InternalChild = new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Children = new[]
+                Children = new Drawable[]
                 {
-                    target,
+                    border = new Container
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        BorderColour = colours.Yellow,
+                        BorderThickness = 5,
+                        CornerRadius = 5,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                AlwaysPresent = true,
+                                Alpha = 0,
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                        }
+                    },
                     new SkinBlueprintContainer(target),
                 }
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Show();
+        }
+
+        private const double transition_duration = 500;
+        private const float visible_target_scale = 0.8f;
+
+        protected override void PopIn()
+        {
+            if (IsLoaded)
+            {
+                target.ScaleTo(visible_target_scale, transition_duration, Easing.OutQuint);
+                border.ScaleTo(visible_target_scale, transition_duration, Easing.OutQuint);
+            }
+
+            this.FadeIn(transition_duration);
+        }
+
+        protected override void PopOut()
+        {
+            if (IsLoaded)
+            {
+                target.ScaleTo(1, transition_duration, Easing.OutQuint);
+                border.ScaleTo(1, transition_duration, Easing.OutQuint);
+            }
+
+            this.FadeOut(transition_duration, Easing.OutQuint);
+        }
     }
 }

From 3c84b0d8c624db113873e8b53a4f1f6cf491ba0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 14:07:15 +0900
Subject: [PATCH 09626/10326] Fix selection screen point being wrong since
 recent refactors

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 674153cb26..2cee94b2c6 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -78,10 +78,10 @@ namespace osu.Game.Skinning.Editor
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
 
-        public override Vector2 ScreenSpaceSelectionPoint => drawable.ToScreenSpace(Vector2.Zero);
+        public override Vector2 ScreenSpaceSelectionPoint => drawable.Parent.ToScreenSpace(drawable.DrawPosition);
 
         public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
 
-        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - drawable.Position;
+        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - drawable.DrawPosition;
     }
 }

From 434e63d6297c9e6db9ed3a70562faa519c67ac8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 14:14:04 +0900
Subject: [PATCH 09627/10326] Add skin customisation support to song progress
 display

---
 osu.Game/Screens/Play/SongProgress.cs | 57 +++++++++++++++++----------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 6c7cb9376c..db81633aea 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -14,6 +14,7 @@ using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Screens.Play
 {
@@ -71,30 +72,38 @@ namespace osu.Game.Screens.Play
 
         public SongProgress()
         {
-            Masking = true;
-
             Children = new Drawable[]
             {
-                info = new SongProgressInfo
+                new SongProgressDisplay
                 {
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                    RelativeSizeAxes = Axes.X,
-                    Height = info_height,
-                },
-                graph = new SongProgressGraph
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                    Height = graph_height,
-                    Margin = new MarginPadding { Bottom = bottom_bar_height },
-                },
-                bar = new SongProgressBar(bottom_bar_height, graph_height, handle_size)
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    OnSeek = time => RequestSeek?.Invoke(time),
+                    Masking = true,
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Children = new Drawable[]
+                    {
+                        info = new SongProgressInfo
+                        {
+                            Origin = Anchor.BottomLeft,
+                            Anchor = Anchor.BottomLeft,
+                            RelativeSizeAxes = Axes.X,
+                            Height = info_height,
+                        },
+                        graph = new SongProgressGraph
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Origin = Anchor.BottomLeft,
+                            Anchor = Anchor.BottomLeft,
+                            Height = graph_height,
+                            Margin = new MarginPadding { Bottom = bottom_bar_height },
+                        },
+                        bar = new SongProgressBar(bottom_bar_height, graph_height, handle_size)
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            OnSeek = time => RequestSeek?.Invoke(time),
+                        },
+                    }
                 },
             };
         }
@@ -175,5 +184,11 @@ namespace osu.Game.Screens.Play
             float finalMargin = bottom_bar_height + (AllowSeeking.Value ? handle_size.Y : 0) + (ShowGraph.Value ? graph_height : 0);
             info.TransformTo(nameof(info.Margin), new MarginPadding { Bottom = finalMargin }, transition_duration, Easing.In);
         }
+
+        public class SongProgressDisplay : Container, ISkinnableComponent
+        {
+            // TODO: move actual implementation into this.
+            // exists for skin customisation purposes.
+        }
     }
 }

From 1516e2ffef7228cff1f7d3c70ba7224dd9345a47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 15:29:25 +0900
Subject: [PATCH 09628/10326] Update blueprint implementation in line with
 #12625.

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs        | 4 +---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 2cee94b2c6..491a403325 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -78,10 +78,8 @@ namespace osu.Game.Skinning.Editor
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
 
-        public override Vector2 ScreenSpaceSelectionPoint => drawable.Parent.ToScreenSpace(drawable.DrawPosition);
+        public override Vector2 ScreenSpaceSelectionPoint => drawable.ScreenSpaceDrawQuad.Centre;
 
         public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
-
-        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - drawable.DrawPosition;
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 38404efd0c..466136f0a8 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -107,7 +108,8 @@ namespace osu.Game.Skinning.Editor
         {
             foreach (var c in SelectedBlueprints)
             {
-                ((Drawable)c.Item).Position += moveEvent.InstantDelta;
+                Drawable drawable = (Drawable)c.Item;
+                drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
             }
 
             return true;

From b460181f15ea13569fdce9a557cda060b6775634 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 16:16:52 +0900
Subject: [PATCH 09629/10326] Add note about rotation not working as expected

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 466136f0a8..17b459a916 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -88,6 +88,7 @@ namespace osu.Game.Skinning.Editor
 
         public override bool HandleRotation(float angle)
         {
+            // TODO: this doesn't correctly account for origin/anchor specs being different in a multi-selection.
             foreach (var c in SelectedBlueprints)
                 ((Drawable)c.Item).Rotation += angle;
 

From 141d3af302e1443af684b8658e8eca180d9e746a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 17:19:47 +0900
Subject: [PATCH 09630/10326] Add the ability to temporarily disable user
 scaling on a `ScalingContainer`

---
 .../Graphics/Containers/ScalingContainer.cs   | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/ScalingContainer.cs b/osu.Game/Graphics/Containers/ScalingContainer.cs
index 8f07c3a656..b691e372c5 100644
--- a/osu.Game/Graphics/Containers/ScalingContainer.cs
+++ b/osu.Game/Graphics/Containers/ScalingContainer.cs
@@ -36,6 +36,24 @@ namespace osu.Game.Graphics.Containers
 
         private BackgroundScreenStack backgroundStack;
 
+        private bool allowScaling = true;
+
+        /// <summary>
+        /// Whether user scaling preferences should be applied. Enabled by default.
+        /// </summary>
+        public bool AllowScaling
+        {
+            get => allowScaling;
+            set
+            {
+                if (value == allowScaling)
+                    return;
+
+                allowScaling = value;
+                updateSize();
+            }
+        }
+
         /// <summary>
         /// Create a new instance.
         /// </summary>
@@ -139,7 +157,7 @@ namespace osu.Game.Graphics.Containers
                     backgroundStack?.FadeOut(fade_time);
             }
 
-            bool scaling = targetMode == null || scalingMode.Value == targetMode;
+            bool scaling = AllowScaling && (targetMode == null || scalingMode.Value == targetMode);
 
             var targetSize = scaling ? new Vector2(sizeX.Value, sizeY.Value) : Vector2.One;
             var targetPosition = scaling ? new Vector2(posX.Value, posY.Value) * (Vector2.One - targetSize) : Vector2.Zero;

From b93604395673af6dc74631f6601a241d06aac53f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 17:20:22 +0900
Subject: [PATCH 09631/10326] Add the skin editor to the game

---
 .../Input/Bindings/GlobalActionContainer.cs   |  6 +-
 osu.Game/OsuGame.cs                           |  8 ++
 osu.Game/Skinning/Editor/SkinEditor.cs        | 50 +++--------
 .../Skinning/Editor/SkinEditorContainer.cs    | 87 +++++++++++++++++++
 4 files changed, 110 insertions(+), 41 deletions(-)
 create mode 100644 osu.Game/Skinning/Editor/SkinEditorContainer.cs

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 6717de5658..ce945f3bf8 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -48,6 +48,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleBeatmapListing),
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
+            new KeyBinding(new[] { InputKey.Shift, InputKey.F2 }, GlobalAction.ToggleSkinEditor),
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
@@ -258,6 +259,9 @@ namespace osu.Game.Input.Bindings
         EditorNudgeLeft,
 
         [Description("Nudge selection right")]
-        EditorNudgeRight
+        EditorNudgeRight,
+
+        [Description("Toggle skin editor")]
+        ToggleSkinEditor,
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 28f32ba455..67e0e6a81c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -51,6 +51,7 @@ using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
 using osu.Game.Database;
 using osu.Game.IO;
+using osu.Game.Skinning.Editor;
 
 namespace osu.Game
 {
@@ -597,6 +598,8 @@ namespace osu.Game
                 screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays)
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Children = new Drawable[]
                     {
                         receptor = new BackButton.Receptor(),
@@ -616,6 +619,7 @@ namespace osu.Game
                         logoContainer = new Container { RelativeSizeAxes = Axes.Both },
                     }
                 },
+                skinEditor = new SkinEditorContainer(screenContainer),
                 overlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 rightFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 leftFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
@@ -942,6 +946,8 @@ namespace osu.Game
 
         private ScalingContainer screenContainer;
 
+        private SkinEditorContainer skinEditor;
+
         protected override bool OnExiting()
         {
             if (ScreenStack.CurrentScreen is Loader)
@@ -968,6 +974,8 @@ namespace osu.Game
 
         protected virtual void ScreenChanged(IScreen current, IScreen newScreen)
         {
+            skinEditor.Reset();
+
             switch (newScreen)
             {
                 case IntroScreen intro:
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 4f81fad4ba..fdef4d0fce 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -4,16 +4,16 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics.Cursor;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinEditor : VisibilityContainer
+    public class SkinEditor : FocusedOverlayContainer
     {
+        public const double TRANSITION_DURATION = 500;
+
         private readonly Drawable target;
-        private Container border;
 
         protected override bool StartHidden => true;
 
@@ -25,32 +25,13 @@ namespace osu.Game.Skinning.Editor
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             InternalChild = new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    border = new Container
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        BorderColour = colours.Yellow,
-                        BorderThickness = 5,
-                        CornerRadius = 5,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                AlwaysPresent = true,
-                                Alpha = 0,
-                                RelativeSizeAxes = Axes.Both,
-                            },
-                        }
-                    },
                     new SkinBlueprintContainer(target),
                 }
             };
@@ -62,29 +43,18 @@ namespace osu.Game.Skinning.Editor
             Show();
         }
 
-        private const double transition_duration = 500;
-        private const float visible_target_scale = 0.8f;
+        protected override bool OnHover(HoverEvent e) => true;
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
 
         protected override void PopIn()
         {
-            if (IsLoaded)
-            {
-                target.ScaleTo(visible_target_scale, transition_duration, Easing.OutQuint);
-                border.ScaleTo(visible_target_scale, transition_duration, Easing.OutQuint);
-            }
-
-            this.FadeIn(transition_duration);
+            this.FadeIn(TRANSITION_DURATION, Easing.OutQuint);
         }
 
         protected override void PopOut()
         {
-            if (IsLoaded)
-            {
-                target.ScaleTo(1, transition_duration, Easing.OutQuint);
-                border.ScaleTo(1, transition_duration, Easing.OutQuint);
-            }
-
-            this.FadeOut(transition_duration, Easing.OutQuint);
+            this.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
         }
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinEditorContainer.cs b/osu.Game/Skinning/Editor/SkinEditorContainer.cs
new file mode 100644
index 0000000000..f84b70d67a
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinEditorContainer.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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Input.Bindings;
+
+namespace osu.Game.Skinning.Editor
+{
+    /// <summary>
+    /// A container which handles loading a skin editor on user request.
+    /// </summary>
+    public class SkinEditorContainer : CompositeDrawable, IKeyBindingHandler<GlobalAction>
+    {
+        private readonly ScalingContainer target;
+        private SkinEditor skinEditor;
+
+        private const float visible_target_scale = 0.8f;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public SkinEditorContainer(ScalingContainer target)
+        {
+            this.target = target;
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.ToggleSkinEditor:
+                    if (skinEditor == null)
+                    {
+                        LoadComponentAsync(skinEditor = new SkinEditor(target), AddInternal);
+                        skinEditor.State.BindValueChanged(editorVisibilityChanged);
+                    }
+                    else
+                        skinEditor.ToggleVisibility();
+
+                    return true;
+            }
+
+            return false;
+        }
+
+        private void editorVisibilityChanged(ValueChangedEvent<Visibility> visibility)
+        {
+            if (visibility.NewValue == Visibility.Visible)
+            {
+                target.ScaleTo(visible_target_scale, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
+
+                target.Masking = true;
+                target.BorderThickness = 5;
+                target.BorderColour = colours.Yellow;
+                target.AllowScaling = false;
+            }
+            else
+            {
+                target.BorderThickness = 0;
+                target.AllowScaling = true;
+
+                target.ScaleTo(1, SkinEditor.TRANSITION_DURATION, Easing.OutQuint).OnComplete(_ => target.Masking = false);
+            }
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
+
+        /// <summary>
+        /// Exit any existing skin editor due to the game state changing.
+        /// </summary>
+        public void Reset()
+        {
+            skinEditor?.Hide();
+            skinEditor?.Expire();
+            skinEditor = null;
+        }
+    }
+}

From a7982787d446198a2aa95f18eab524fcd3a59d46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 17:26:55 +0900
Subject: [PATCH 09632/10326] Add basic header text

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index fdef4d0fce..532c3de7fb 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -5,6 +5,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 
 namespace osu.Game.Skinning.Editor
@@ -15,6 +17,8 @@ namespace osu.Game.Skinning.Editor
 
         private readonly Drawable target;
 
+        private OsuTextFlowContainer headerText;
+
         protected override bool StartHidden => true;
 
         public SkinEditor(Drawable target)
@@ -25,16 +29,31 @@ namespace osu.Game.Skinning.Editor
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
             InternalChild = new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
+                    headerText = new OsuTextFlowContainer()
+                    {
+                        TextAnchor = Anchor.TopCentre,
+                        Padding = new MarginPadding(20),
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        RelativeSizeAxes = Axes.X
+                    },
                     new SkinBlueprintContainer(target),
                 }
             };
+
+            headerText.AddParagraph("Skin editor (preview)", cp => cp.Font = OsuFont.Default.With(size: 24));
+            headerText.AddParagraph("This is a preview of what is to come. Changes are lost on changing screens.", cp =>
+            {
+                cp.Font = OsuFont.Default.With(size: 12);
+                cp.Colour = colours.Yellow;
+            });
         }
 
         protected override void LoadComplete()

From fb64f6faf205f8c3c5d46f52fabe016ac0782ea9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 17:40:58 +0900
Subject: [PATCH 09633/10326] Add ability to exit using game "back" binding

---
 osu.Game/Skinning/Editor/SkinEditorContainer.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinEditorContainer.cs b/osu.Game/Skinning/Editor/SkinEditorContainer.cs
index f84b70d67a..adb1abefd1 100644
--- a/osu.Game/Skinning/Editor/SkinEditorContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorContainer.cs
@@ -35,6 +35,15 @@ namespace osu.Game.Skinning.Editor
         {
             switch (action)
             {
+                case GlobalAction.Back:
+                    if (skinEditor?.State.Value == Visibility.Visible)
+                    {
+                        skinEditor.ToggleVisibility();
+                        return true;
+                    }
+
+                    break;
+
                 case GlobalAction.ToggleSkinEditor:
                     if (skinEditor == null)
                     {

From 63435ba5482b8c832ea5f1eab612054c5b9b1e6f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 17:41:07 +0900
Subject: [PATCH 09634/10326] Ensure toolbar doesn't overlap editor content

---
 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 67e0e6a81c..77fb9c3b63 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -619,7 +619,6 @@ namespace osu.Game
                         logoContainer = new Container { RelativeSizeAxes = Axes.Both },
                     }
                 },
-                skinEditor = new SkinEditorContainer(screenContainer),
                 overlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 rightFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 leftFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
@@ -689,6 +688,7 @@ namespace osu.Game
             var changelogOverlay = loadComponentSingleFile(new ChangelogOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(userProfile = new UserProfileOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(beatmapSetOverlay = new BeatmapSetOverlay(), overlayContent.Add, true);
+            loadComponentSingleFile(skinEditor = new SkinEditorContainer(screenContainer), overlayContent.Add);
 
             loadComponentSingleFile(new LoginOverlay
             {

From e716162ac242a5a36f2b435339a54472707e9ffd Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Wed, 28 Apr 2021 20:55:20 +0800
Subject: [PATCH 09635/10326] Fix formatting

---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 13876f1648..f8dd6953ad 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -8,7 +8,6 @@ using System.Text;
 using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.IO.Legacy;
-using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Replays.Types;
 using SharpCompress.Compressors.LZMA;
 
@@ -91,13 +90,14 @@ namespace osu.Game.Scoring.Legacy
 
                 if (score.Replay != null)
                 {
-                    int lastTimeRounded = 0;
+                    int lastTime = 0;
+
                     foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ToLegacy(beatmap)))
                     {
                         // Rounding because stable could only parse integral values
-                        int timeRounded = (int)Math.Round(f.Time);
-                        replayData.Append(FormattableString.Invariant($"{timeRounded - lastTimeRounded}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
-                        lastTimeRounded = timeRounded;
+                        int time = (int)Math.Round(f.Time);
+                        replayData.Append(FormattableString.Invariant($"{time - lastTime}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
+                        lastTime = time;
                     }
                 }
 

From 8d056ff38f6685ada5be49654838be7be4ad49d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 18:23:22 +0900
Subject: [PATCH 09636/10326] Remove redundant parenthesis

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 532c3de7fb..562dd23224 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Skinning.Editor
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    headerText = new OsuTextFlowContainer()
+                    headerText = new OsuTextFlowContainer
                     {
                         TextAnchor = Anchor.TopCentre,
                         Padding = new MarginPadding(20),

From fd8e552a8bb12d2aa854adef2ab0d66ed7d5ea9b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 29 Apr 2021 19:36:52 +0900
Subject: [PATCH 09637/10326] Fix filename not matching class name

---
 ...estSceneDrawableNote.cs => TestSceneDrawableManiaHitObject.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Mania.Tests/{TestSceneDrawableNote.cs => TestSceneDrawableManiaHitObject.cs} (100%)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.cs
rename to osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs

From cfbf95b4331c777a5dbd109fb57b3e5f76e2fc93 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 29 Apr 2021 14:11:35 -0700
Subject: [PATCH 09638/10326] Add HasPerformancePoints extension method

---
 ...tOnlineStatus.cs => BeatmapSetOnlineStatusExtensions.cs} | 6 ++++++
 osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs      | 4 +---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename osu.Game/Beatmaps/{BeatmapSetOnlineStatus.cs => BeatmapSetOnlineStatusExtensions.cs} (61%)

diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs b/osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs
similarity index 61%
rename from osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs
rename to osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs
index 5864975a2e..1de641f4f1 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs
@@ -3,6 +3,12 @@
 
 namespace osu.Game.Beatmaps
 {
+    public static class BeatmapSetOnlineStatusExtensions
+    {
+        public static bool HasPerformancePoints(this BeatmapSetOnlineStatus status)
+            => status == BeatmapSetOnlineStatus.Ranked || status == BeatmapSetOnlineStatus.Approved;
+    }
+
     public enum BeatmapSetOnlineStatus
     {
         None = -3,
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 3e95d125de..8786cf0e63 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -59,10 +59,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
                 var scoreInfos = value.Scores.Select(s => s.CreateScoreInfo(rulesets)).ToList();
                 var topScore = scoreInfos.First();
-                var status = topScore.Beatmap?.Status;
-                var showPerformanceColumn = status == BeatmapSetOnlineStatus.Ranked || status == BeatmapSetOnlineStatus.Approved;
 
-                scoreTable.DisplayScores(scoreInfos, showPerformanceColumn);
+                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status.HasPerformancePoints() ?? false);
                 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 5cb834b510..57df54d851 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -111,7 +111,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
-                ppColumn.Alpha = value.Beatmap?.Status == BeatmapSetOnlineStatus.Ranked ? 1 : 0;
+
+                ppColumn.Alpha = value.Beatmap?.Status.HasPerformancePoints() ?? false ? 1 : 0;
                 ppColumn.Text = $@"{value.PP:N0}";
 
                 statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(createStatisticsColumn);

From 9952a5bfdb25c5130d1fe1462b5578a860d1880c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 29 Apr 2021 14:24:29 -0700
Subject: [PATCH 09639/10326] Revert "Fix button being recreated on importing
 state"

This reverts commit c9967f7b7486d5744aba911a144110811b76ef04.
---
 osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
index 85ed3f8767..a61640a02e 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
@@ -268,13 +268,11 @@ namespace osu.Game.Overlays.BeatmapSet
                     break;
 
                 case DownloadState.Downloading:
+                case DownloadState.Importing:
                     // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
                     downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
                     break;
 
-                case DownloadState.Importing:
-                    break;
-
                 default:
                     downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
                     if (BeatmapSet.Value.OnlineInfo.HasVideo)

From 25e0fb1cf9de0e01d8225f97f737cadf43390572 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 30 Apr 2021 01:59:59 +0300
Subject: [PATCH 09640/10326] Refactor OsuModBarrelRoll to allow it's usage by
 other rulesets

---
 .../Mods/OsuModBarrelRoll.cs                  | 40 ++------------
 osu.Game/Rulesets/Mods/ModBarrelRoll.cs       | 52 +++++++++++++++++++
 2 files changed, 55 insertions(+), 37 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/ModBarrelRoll.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index 37ba401d42..f63edbd99f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -2,52 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Game.Configuration;
 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 osu.Game.Rulesets.Osu.UI;
-using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToDrawableHitObjects
+    public class OsuModBarrelRoll : ModBarrelRoll<OsuHitObject>, IApplicableToDrawableHitObjects
     {
-        private float currentRotation;
-
-        [SettingSource("Roll speed", "Rotations per minute")]
-        public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
-        {
-            MinValue = 0.02,
-            MaxValue = 12,
-            Precision = 0.01,
-        };
-
-        [SettingSource("Direction", "The direction of rotation")]
-        public Bindable<RotationDirection> Direction { get; } = new Bindable<RotationDirection>(RotationDirection.Clockwise);
-
-        public override string Name => "Barrel Roll";
-        public override string Acronym => "BR";
-        public override string Description => "The whole playfield is on a wheel!";
-        public override double ScoreMultiplier => 1;
-
-        public override string SettingDescription => $"{SpinSpeed.Value} rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
-
-        public void Update(Playfield playfield)
-        {
-            playfield.Rotation = currentRotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
-        }
-
-        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
-        {
-            // scale the playfield to allow all hitobjects to stay within the visible region.
-            drawableRuleset.Playfield.Scale = new Vector2(OsuPlayfield.BASE_SIZE.Y / OsuPlayfield.BASE_SIZE.X);
-        }
+        protected override Vector2 PlayfieldScale => new Vector2(OsuPlayfield.BASE_SIZE.Y / OsuPlayfield.BASE_SIZE.X);
 
         public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
@@ -58,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     switch (d)
                     {
                         case DrawableHitCircle circle:
-                            circle.CirclePiece.Rotation = -currentRotation;
+                            circle.CirclePiece.Rotation = -CurrentRotation;
                             break;
                     }
                 };
diff --git a/osu.Game/Rulesets/Mods/ModBarrelRoll.cs b/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
new file mode 100644
index 0000000000..d9424563c5
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModBarrelRoll<TObject> : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<TObject>
+        where TObject : HitObject
+    {
+        protected float CurrentRotation { get; private set; }
+
+        [SettingSource("Roll speed", "Rotations per minute")]
+        public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
+        {
+            MinValue = 0.02,
+            MaxValue = 12,
+            Precision = 0.01,
+        };
+
+        [SettingSource("Direction", "The direction of rotation")]
+        public Bindable<RotationDirection> Direction { get; } = new Bindable<RotationDirection>(RotationDirection.Clockwise);
+
+        public override string Name => "Barrel Roll";
+        public override string Acronym => "BR";
+        public override string Description => "The whole playfield is on a wheel!";
+        public override double ScoreMultiplier => 1;
+
+        public override string SettingDescription => $"{SpinSpeed.Value} rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
+
+        /// <summary>
+        /// Used to allow all hitobjects to stay within the visible region.
+        /// </summary>
+        protected abstract Vector2 PlayfieldScale { get; }
+
+        public void Update(Playfield playfield)
+        {
+            playfield.Rotation = CurrentRotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
+        }
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
+        {
+            drawableRuleset.Playfield.Scale = PlayfieldScale;
+        }
+    }
+}

From 7bf3498e2add11f5b3590b2d76df409efce1e06d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 30 Apr 2021 02:49:19 +0300
Subject: [PATCH 09641/10326] Calculate playfield scale locally

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs |  4 ----
 osu.Game/Rulesets/Mods/ModBarrelRoll.cs        | 13 +++++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index f63edbd99f..9ae9653e9b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -6,15 +6,11 @@ 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 osu.Game.Rulesets.Osu.UI;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModBarrelRoll : ModBarrelRoll<OsuHitObject>, IApplicableToDrawableHitObjects
     {
-        protected override Vector2 PlayfieldScale => new Vector2(OsuPlayfield.BASE_SIZE.Y / OsuPlayfield.BASE_SIZE.X);
-
         public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
             foreach (var d in drawables)
diff --git a/osu.Game/Rulesets/Mods/ModBarrelRoll.cs b/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
index d9424563c5..4c28c730ec 100644
--- a/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
+++ b/osu.Game/Rulesets/Mods/ModBarrelRoll.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.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
@@ -34,11 +35,6 @@ namespace osu.Game.Rulesets.Mods
 
         public override string SettingDescription => $"{SpinSpeed.Value} rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
 
-        /// <summary>
-        /// Used to allow all hitobjects to stay within the visible region.
-        /// </summary>
-        protected abstract Vector2 PlayfieldScale { get; }
-
         public void Update(Playfield playfield)
         {
             playfield.Rotation = CurrentRotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
@@ -46,7 +42,12 @@ namespace osu.Game.Rulesets.Mods
 
         public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
         {
-            drawableRuleset.Playfield.Scale = PlayfieldScale;
+            // scale the playfield to allow all hitobjects to stay within the visible region.
+
+            var playfieldSize = drawableRuleset.Playfield.DrawSize;
+            var minSide = MathF.Min(playfieldSize.X, playfieldSize.Y);
+            var maxSide = MathF.Max(playfieldSize.X, playfieldSize.Y);
+            drawableRuleset.Playfield.Scale = new Vector2(minSide / maxSide);
         }
     }
 }

From e69ec91c072c7f4edac21eb944307a1999c8c485 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 11:25:39 +0900
Subject: [PATCH 09642/10326] Add xmldoc for `CurrentRotation`

---
 osu.Game/Rulesets/Mods/ModBarrelRoll.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModBarrelRoll.cs b/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
index 4c28c730ec..0d344b5269 100644
--- a/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
+++ b/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
@@ -15,6 +15,10 @@ namespace osu.Game.Rulesets.Mods
     public abstract class ModBarrelRoll<TObject> : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<TObject>
         where TObject : HitObject
     {
+        /// <summary>
+        /// The current angle of rotation being applied by this mod.
+        /// Generally should be used to apply inverse rotation to elements which should not be rotated.
+        /// </summary>
         protected float CurrentRotation { get; private set; }
 
         [SettingSource("Roll speed", "Rotations per minute")]

From 820408757a736d3ff3c9dc59cd933bcb1874990a Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 09:43:05 +0700
Subject: [PATCH 09643/10326] add OsuMarkdownListItem

---
 .../Markdown/OsuMarkdownListItem.cs           | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
new file mode 100644
index 0000000000..7b92a2210d
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownListItem : FillFlowContainer
+    {
+        public OsuMarkdownListItem()
+        {
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+
+            Direction = FillDirection.Vertical;
+            Spacing = new Vector2(10, 10);
+        }
+    }
+}

From a24a27940408a6c6ddf082f9073b5b9db79c0eef Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 09:43:21 +0700
Subject: [PATCH 09644/10326] use OsuMarkdownListItem for ListItemBlock

---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 56bf72656a..c7e9f267bd 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -21,6 +21,13 @@ namespace osu.Game.Graphics.Containers.Markdown
                     // Don't parse YAML Frontmatter
                     break;
 
+                case ListItemBlock listItemBlock:
+                    var childContainer = CreateListItem(listItemBlock);
+                    container.Add(childContainer);
+                    foreach (var single in listItemBlock)
+                        base.AddMarkdownComponent(single, childContainer, level);
+                    break;
+
                 default:
                     base.AddMarkdownComponent(markdownObject, container, level);
                     break;
@@ -37,6 +44,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override MarkdownTable CreateTable(Table table) => new OsuMarkdownTable(table);
 
+        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock) => new OsuMarkdownListItem();
+
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
                                             .UseEmojiAndSmiley()

From 1e8b3f3a8c81ab996d4875f9ca55e65bce64fcb4 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 09:47:25 +0700
Subject: [PATCH 09645/10326] handle list padding in OsuMarkdownListItem

Reference : https://github.com/ppy/osu-web/blob/5b0e3ac3ffce6b1aff8c9a8794db56603e885ef8/resources/assets/less/bem/osu-md.less#L193-L194
---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs    | 6 ++++++
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs     | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index c7e9f267bd..0638767414 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -6,6 +6,7 @@ using Markdig.Extensions.AutoIdentifiers;
 using Markdig.Extensions.Tables;
 using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
 
@@ -44,6 +45,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override MarkdownTable CreateTable(Table table) => new OsuMarkdownTable(table);
 
+        protected override MarkdownList CreateList(ListBlock listBlock) => new MarkdownList
+        {
+            Padding = new MarginPadding(0)
+        };
+
         protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock) => new OsuMarkdownListItem();
 
         protected override MarkdownPipeline CreateBuilder()
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 7b92a2210d..732817a1d5 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownListItem : FillFlowContainer
     {
+        private const float default_left_padding = 20;
+
         public OsuMarkdownListItem()
         {
             AutoSizeAxes = Axes.Y;
@@ -16,6 +18,7 @@ namespace osu.Game.Graphics.Containers.Markdown
 
             Direction = FillDirection.Vertical;
             Spacing = new Vector2(10, 10);
+            Padding = new MarginPadding { Left = default_left_padding };
         }
     }
 }

From 010c51e6edea430569b1a15455880f9ec086f6af Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:12:43 +0700
Subject: [PATCH 09646/10326] change OsuMarkdownListItem to composite drawable

---
 .../Markdown/OsuMarkdownContainer.cs           |  2 +-
 .../Containers/Markdown/OsuMarkdownListItem.cs | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 0638767414..fc4eecf297 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Graphics.Containers.Markdown
                     var childContainer = CreateListItem(listItemBlock);
                     container.Add(childContainer);
                     foreach (var single in listItemBlock)
-                        base.AddMarkdownComponent(single, childContainer, level);
+                        base.AddMarkdownComponent(single, childContainer.Content, level);
                     break;
 
                 default:
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 732817a1d5..501da7721e 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -7,18 +7,28 @@ using osuTK;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
-    public class OsuMarkdownListItem : FillFlowContainer
+    public class OsuMarkdownListItem : CompositeDrawable
     {
         private const float default_left_padding = 20;
 
+        public FillFlowContainer Content { get; }
+
         public OsuMarkdownListItem()
         {
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
-
-            Direction = FillDirection.Vertical;
-            Spacing = new Vector2(10, 10);
             Padding = new MarginPadding { Left = default_left_padding };
+
+            InternalChildren = new Drawable[]
+            {
+                Content = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(10, 10),
+                }
+            };
         }
     }
 }

From e3cc4561abcc0b8a7ec9b0c53e36c3339cb8c6a9 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:35:40 +0700
Subject: [PATCH 09647/10326] add bullet marker in OsuMarkdownListItem

---
 .../Containers/Markdown/OsuMarkdownListItem.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 501da7721e..6b35321617 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.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.Framework.Graphics.Containers.Markdown;
 using osuTK;
 
 namespace osu.Game.Graphics.Containers.Markdown
@@ -11,6 +13,9 @@ namespace osu.Game.Graphics.Containers.Markdown
     {
         private const float default_left_padding = 20;
 
+        [Resolved]
+        private IMarkdownTextComponent parentTextComponent { get; set; }
+
         public FillFlowContainer Content { get; }
 
         public OsuMarkdownListItem()
@@ -30,5 +35,18 @@ namespace osu.Game.Graphics.Containers.Markdown
                 }
             };
         }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var marker = parentTextComponent.CreateSpriteText();
+            marker.Text = "●";
+            marker.Font = OsuFont.GetFont(size: marker.Font.Size / 2);
+            marker.Origin = Anchor.Centre;
+            marker.X = -default_left_padding / 2;
+            marker.Y = marker.Font.Size;
+
+            AddInternal(marker);
+        }
     }
 }

From f676526cf49c270698499983098ed0eca80c5a2d Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:39:48 +0700
Subject: [PATCH 09648/10326] add level in OsuMarkdownListItem

---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs     | 4 ++--
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index fc4eecf297..1db47d6978 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Graphics.Containers.Markdown
                     break;
 
                 case ListItemBlock listItemBlock:
-                    var childContainer = CreateListItem(listItemBlock);
+                    var childContainer = CreateListItem(listItemBlock, level);
                     container.Add(childContainer);
                     foreach (var single in listItemBlock)
                         base.AddMarkdownComponent(single, childContainer.Content, level);
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(0)
         };
 
-        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock) => new OsuMarkdownListItem();
+        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(level);
 
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 6b35321617..f9800d9262 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -11,6 +11,7 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownListItem : CompositeDrawable
     {
+        private readonly int level;
         private const float default_left_padding = 20;
 
         [Resolved]
@@ -18,8 +19,10 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         public FillFlowContainer Content { get; }
 
-        public OsuMarkdownListItem()
+        public OsuMarkdownListItem(int level)
         {
+            this.level = level;
+
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
             Padding = new MarginPadding { Left = default_left_padding };

From 781064ba9693c72adda2d84f8a81deba782f9888 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:40:06 +0700
Subject: [PATCH 09649/10326] create list marker based on its level

---
 .../Containers/Markdown/OsuMarkdownListItem.cs  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index f9800d9262..7b7cb5837c 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         private void load()
         {
             var marker = parentTextComponent.CreateSpriteText();
-            marker.Text = "●";
+            marker.Text = createTextMarker();
             marker.Font = OsuFont.GetFont(size: marker.Font.Size / 2);
             marker.Origin = Anchor.Centre;
             marker.X = -default_left_padding / 2;
@@ -51,5 +51,20 @@ namespace osu.Game.Graphics.Containers.Markdown
 
             AddInternal(marker);
         }
+
+        private string createTextMarker()
+        {
+            switch (level)
+            {
+                case 1:
+                    return "●";
+
+                case 2:
+                    return "○";
+
+                default:
+                    return "■";
+            }
+        }
     }
 }

From 1582b0da881a0d7b308ab6730766a8d9457902ee Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:43:19 +0700
Subject: [PATCH 09650/10326] add ordered list test

---
 .../TestSceneOsuMarkdownContainer.cs          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 11c06abee7..3367fccbf1 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -128,5 +128,25 @@ Line below";
 - Third item level 1";
             });
         }
+
+        [Test]
+        public void TestOrderedList()
+        {
+            AddStep("Add Ordered List", () =>
+            {
+                markdownContainer.Text = @"1. First item level 1
+2. Second item level 1
+    1. First item level 2
+        1. First item level 3
+        2. Second item level 3
+        3. Third item level 3
+            1. First item level 4
+            2. Second item level 4
+            3. Third item level 4
+    2. Second item level 2
+    3. Third item level 2
+3. Third item level 1";
+            });
+        }
     }
 }

From 2a3479f30d845c1294fe3214da9fd4938da7f3f4 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:47:51 +0700
Subject: [PATCH 09651/10326] add order in OsuMarkdownListItem for ordered list

---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs    | 2 +-
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 1db47d6978..b765378e4c 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(0)
         };
 
-        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(level);
+        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(level, listItemBlock.Order);
 
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 7b7cb5837c..361e503cd4 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Graphics.Containers.Markdown
     public class OsuMarkdownListItem : CompositeDrawable
     {
         private readonly int level;
+        private readonly int order;
+        private readonly bool isOrdered;
         private const float default_left_padding = 20;
 
         [Resolved]
@@ -19,9 +21,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         public FillFlowContainer Content { get; }
 
-        public OsuMarkdownListItem(int level)
+        public OsuMarkdownListItem(int level, int order)
         {
             this.level = level;
+            this.order = order;
+            isOrdered = order != 0;
 
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;

From c0d9f9f8c687062d444a44edd02916b9a2ef5c2b Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:48:12 +0700
Subject: [PATCH 09652/10326] use order number as marker for ordered list

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 361e503cd4..b091e9ac07 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -58,6 +58,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         private string createTextMarker()
         {
+            if (isOrdered)
+            {
+                return $"{order}.";
+            }
+
             switch (level)
             {
                 case 1:

From e6579352f9a3dda275d6fc5f7c313bec11837235 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:56:41 +0700
Subject: [PATCH 09653/10326] add left padding for ordered list

In osu-md.less, this rule style[1] removes padding left in ordered list.
But in this rule style[2], pseudo element `::before` is used as marker
or counter and has minimal width 30px. So we use this as left padding
size.

[1] https://github.com/ppy/osu-web/blob/5b0e3ac3ffce6b1aff8c9a8794db56603e885ef8/resources/assets/less/bem/osu-md.less#L196-L200
[2] https://github.com/ppy/osu-web/blob/5b0e3ac3ffce6b1aff8c9a8794db56603e885ef8/resources/assets/less/bem/osu-md.less#L210-L219
---
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index b091e9ac07..b448ea154f 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -14,7 +14,9 @@ namespace osu.Game.Graphics.Containers.Markdown
         private readonly int level;
         private readonly int order;
         private readonly bool isOrdered;
-        private const float default_left_padding = 20;
+
+        private const float ordered_left_padding = 30;
+        private const float unordered_left_padding = 20;
 
         [Resolved]
         private IMarkdownTextComponent parentTextComponent { get; set; }
@@ -29,7 +31,7 @@ namespace osu.Game.Graphics.Containers.Markdown
 
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
-            Padding = new MarginPadding { Left = default_left_padding };
+            Padding = new MarginPadding { Left = isOrdered ? ordered_left_padding : unordered_left_padding };
 
             InternalChildren = new Drawable[]
             {

From cf53a05dfdfef6eb3c6b9f73cb12c7b20c01a802 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:59:23 +0700
Subject: [PATCH 09654/10326] change marker size and position for ordered list

---
 .../Containers/Markdown/OsuMarkdownListItem.cs   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index b448ea154f..f020e3e2fc 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -50,10 +50,18 @@ namespace osu.Game.Graphics.Containers.Markdown
         {
             var marker = parentTextComponent.CreateSpriteText();
             marker.Text = createTextMarker();
-            marker.Font = OsuFont.GetFont(size: marker.Font.Size / 2);
-            marker.Origin = Anchor.Centre;
-            marker.X = -default_left_padding / 2;
-            marker.Y = marker.Font.Size;
+
+            if (isOrdered)
+            {
+                marker.X = -ordered_left_padding;
+            }
+            else
+            {
+                marker.Font = OsuFont.GetFont(size: marker.Font.Size / 2);
+                marker.Origin = Anchor.Centre;
+                marker.X = -unordered_left_padding / 2;
+                marker.Y = marker.Font.Size;
+            }
 
             AddInternal(marker);
         }

From cdef07b2eee4cb587fcda722febe81cd9b10366e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 13:09:57 +0900
Subject: [PATCH 09655/10326] Fix blueprints not hiding when deleting elements

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 17b459a916..0408ce74a6 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -20,7 +20,10 @@ namespace osu.Game.Skinning.Editor
         protected override void DeleteItems(IEnumerable<ISkinnableComponent> items)
         {
             foreach (var i in items)
-                i.Hide();
+            {
+                ((Drawable)i).Expire();
+                SelectedItems.Remove(i);
+            }
         }
 
         protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableComponent>> selection)

From 4770a64709e529479c69ad7a4ae024a9801f2fe0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 18:47:22 +0900
Subject: [PATCH 09656/10326] Add proof of concept components list

---
 .../TestSceneSkinEditorComponentsList.cs      | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
new file mode 100644
index 0000000000..4aec91a81f
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
@@ -0,0 +1,93 @@
+// Copyright (c) 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.Diagnostics;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSkinEditorComponentsList : SkinnableTestScene
+    {
+        [Test]
+        public void TestToggleEditor()
+        {
+            AddStep("show available components", () =>
+            {
+                SetContents(() =>
+                {
+                    FillFlowContainer fill;
+
+                    var scroll = new OsuScrollContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Child = fill = new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Width = 0.5f,
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(20)
+                        }
+                    };
+
+                    var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
+
+                    foreach (var type in skinnableTypes)
+                    {
+                        try
+                        {
+                            fill.Add(new OsuSpriteText { Text = type.Name });
+
+                            var instance = (Drawable)Activator.CreateInstance(type);
+
+                            Debug.Assert(instance != null);
+
+                            instance.Anchor = Anchor.TopCentre;
+                            instance.Origin = Anchor.TopCentre;
+
+                            var container = new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                Height = 100,
+                                Children = new[]
+                                {
+                                    instance
+                                }
+                            };
+
+                            switch (instance)
+                            {
+                                case IScoreCounter score:
+                                    score.Current.Value = 133773;
+                                    break;
+
+                                case IComboCounter combo:
+                                    combo.Current.Value = 727;
+                                    break;
+                            }
+
+                            fill.Add(container);
+                        }
+                        catch { }
+                    }
+
+                    return scroll;
+                });
+            });
+        }
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+    }
+}

From 6442fb819f61dfebd2733cf4033260f8e57b3646 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 12:09:58 +0900
Subject: [PATCH 09657/10326] Split out component from test scene and fix
 SongProgress

---
 .../TestSceneSkinEditorComponentsList.cs      |  77 +---------
 osu.Game/Screens/Play/SongProgress.cs         |  16 ++-
 .../Skinning/Editor/SkinComponentToolbox.cs   | 134 ++++++++++++++++++
 3 files changed, 149 insertions(+), 78 deletions(-)
 create mode 100644 osu.Game/Skinning/Editor/SkinComponentToolbox.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
index 4aec91a81f..2fd40f5d7c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
@@ -1,18 +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.Diagnostics;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Play.HUD;
-using osuTK;
+using osu.Game.Skinning.Editor;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -21,71 +14,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestToggleEditor()
         {
-            AddStep("show available components", () =>
+            AddStep("show available components", () => SetContents(() => new SkinComponentToolbox
             {
-                SetContents(() =>
-                {
-                    FillFlowContainer fill;
-
-                    var scroll = new OsuScrollContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Child = fill = new FillFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Width = 0.5f,
-                            Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(20)
-                        }
-                    };
-
-                    var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
-
-                    foreach (var type in skinnableTypes)
-                    {
-                        try
-                        {
-                            fill.Add(new OsuSpriteText { Text = type.Name });
-
-                            var instance = (Drawable)Activator.CreateInstance(type);
-
-                            Debug.Assert(instance != null);
-
-                            instance.Anchor = Anchor.TopCentre;
-                            instance.Origin = Anchor.TopCentre;
-
-                            var container = new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                Height = 100,
-                                Children = new[]
-                                {
-                                    instance
-                                }
-                            };
-
-                            switch (instance)
-                            {
-                                case IScoreCounter score:
-                                    score.Current.Value = 133773;
-                                    break;
-
-                                case IComboCounter combo:
-                                    combo.Current.Value = 727;
-                                    break;
-                            }
-
-                            fill.Add(container);
-                        }
-                        catch { }
-                    }
-
-                    return scroll;
-                });
-            });
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+            }));
         }
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index db81633aea..2e94421f36 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -76,10 +76,6 @@ namespace osu.Game.Screens.Play
             {
                 new SongProgressDisplay
                 {
-                    Masking = true,
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
                     Children = new Drawable[]
                     {
                         info = new SongProgressInfo
@@ -187,8 +183,16 @@ namespace osu.Game.Screens.Play
 
         public class SongProgressDisplay : Container, ISkinnableComponent
         {
-            // TODO: move actual implementation into this.
-            // exists for skin customisation purposes.
+            public SongProgressDisplay()
+            {
+                // TODO: move actual implementation into this.
+                // exists for skin customisation purposes.
+
+                Masking = true;
+                RelativeSizeAxes = Axes.Both;
+                Anchor = Anchor.BottomCentre;
+                Origin = Anchor.BottomCentre;
+            }
         }
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
new file mode 100644
index 0000000000..5b2b9a8608
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -0,0 +1,134 @@
+// Copyright (c) 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.Diagnostics;
+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.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Skinning.Editor
+{
+    public class SkinComponentToolbox : CompositeDrawable
+    {
+        public SkinComponentToolbox()
+        {
+            RelativeSizeAxes = Axes.Y;
+            Width = 500;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            FillFlowContainer fill;
+
+            InternalChild = new OsuScrollContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = fill = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    Width = 0.5f,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(20)
+                }
+            };
+
+            var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
+
+            foreach (var type in skinnableTypes)
+            {
+                var container = attemptAddComponent(type);
+                if (container != null)
+                    fill.Add(container);
+            }
+        }
+
+        private static Drawable attemptAddComponent(Type type)
+        {
+            try
+            {
+                var instance = (Drawable)Activator.CreateInstance(type);
+
+                Debug.Assert(instance != null);
+
+                return new ToolboxComponent(instance);
+            }
+            catch
+            {
+            }
+
+            return null;
+        }
+
+        private class ToolboxComponent : CompositeDrawable
+        {
+            public ToolboxComponent(Drawable instance)
+            {
+                Container innerContainer;
+
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+
+                InternalChild = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText { Text = instance.GetType().Name },
+                        innerContainer = new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Masking = true,
+                            CornerRadius = 10,
+                            Children = new[]
+                            {
+                                new Box
+                                {
+                                    Colour = Color4.Black,
+                                    Alpha = 0.5f,
+                                    RelativeSizeAxes = Axes.Both,
+                                },
+                                instance
+                            }
+                        },
+                    }
+                };
+
+                // adjust provided component to fit / display in a known state.
+
+                instance.Anchor = Anchor.Centre;
+                instance.Origin = Anchor.Centre;
+
+                if (instance.RelativeSizeAxes != Axes.None)
+                {
+                    innerContainer.AutoSizeAxes = Axes.None;
+                    innerContainer.Height = 100;
+                }
+
+                switch (instance)
+                {
+                    case IScoreCounter score:
+                        score.Current.Value = 133773;
+                        break;
+
+                    case IComboCounter combo:
+                        combo.Current.Value = 727;
+                        break;
+                }
+            }
+        }
+    }
+}

From ae9d1dc40b800708e7f0f904f18acc2c4ecbf757 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 12:35:58 +0900
Subject: [PATCH 09658/10326] Add component list to main editor interface and
 enable basic placement

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    |  2 +
 .../Skinning/Editor/SkinComponentToolbox.cs   | 67 ++++++++++++++-----
 osu.Game/Skinning/Editor/SkinEditor.cs        | 19 ++++++
 .../Skinning/Editor/SkinEditorContainer.cs    |  9 ++-
 4 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 0c2c6ed454..df481b0558 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
@@ -21,6 +22,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("add editor overlay", () =>
             {
                 skinEditor?.Expire();
+                Player.ScaleTo(SkinEditorContainer.VISIBLE_TARGET_SCALE);
                 LoadComponentAsync(skinEditor = new SkinEditor(Player), Add);
             });
         }
diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 5b2b9a8608..f616366336 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -8,6 +8,8 @@ using osu.Framework.Allocation;
 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.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
@@ -18,10 +20,12 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinComponentToolbox : CompositeDrawable
     {
+        public Action<Type> RequestPlacement;
+
         public SkinComponentToolbox()
         {
             RelativeSizeAxes = Axes.Y;
-            Width = 500;
+            Width = 200;
         }
 
         [BackgroundDependencyLoader]
@@ -36,9 +40,6 @@ namespace osu.Game.Skinning.Editor
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Width = 0.5f,
                     Direction = FillDirection.Vertical,
                     Spacing = new Vector2(20)
                 }
@@ -48,13 +49,17 @@ namespace osu.Game.Skinning.Editor
 
             foreach (var type in skinnableTypes)
             {
-                var container = attemptAddComponent(type);
-                if (container != null)
-                    fill.Add(container);
+                var component = attemptAddComponent(type);
+
+                if (component != null)
+                {
+                    component.RequestPlacement = t => RequestPlacement?.Invoke(t);
+                    fill.Add(component);
+                }
             }
         }
 
-        private static Drawable attemptAddComponent(Type type)
+        private static ToolboxComponent attemptAddComponent(Type type)
         {
             try
             {
@@ -66,15 +71,20 @@ namespace osu.Game.Skinning.Editor
             }
             catch
             {
+                return null;
             }
-
-            return null;
         }
 
         private class ToolboxComponent : CompositeDrawable
         {
-            public ToolboxComponent(Drawable instance)
+            private readonly Drawable component;
+            private readonly Box box;
+
+            public Action<Type> RequestPlacement;
+
+            public ToolboxComponent(Drawable component)
             {
+                this.component = component;
                 Container innerContainer;
 
                 RelativeSizeAxes = Axes.X;
@@ -86,7 +96,7 @@ namespace osu.Game.Skinning.Editor
                     AutoSizeAxes = Axes.Y,
                     Children = new Drawable[]
                     {
-                        new OsuSpriteText { Text = instance.GetType().Name },
+                        new OsuSpriteText { Text = component.GetType().Name },
                         innerContainer = new Container
                         {
                             RelativeSizeAxes = Axes.X,
@@ -95,13 +105,13 @@ namespace osu.Game.Skinning.Editor
                             CornerRadius = 10,
                             Children = new[]
                             {
-                                new Box
+                                box = new Box
                                 {
                                     Colour = Color4.Black,
                                     Alpha = 0.5f,
                                     RelativeSizeAxes = Axes.Both,
                                 },
-                                instance
+                                component
                             }
                         },
                     }
@@ -109,16 +119,16 @@ namespace osu.Game.Skinning.Editor
 
                 // adjust provided component to fit / display in a known state.
 
-                instance.Anchor = Anchor.Centre;
-                instance.Origin = Anchor.Centre;
+                component.Anchor = Anchor.Centre;
+                component.Origin = Anchor.Centre;
 
-                if (instance.RelativeSizeAxes != Axes.None)
+                if (component.RelativeSizeAxes != Axes.None)
                 {
                     innerContainer.AutoSizeAxes = Axes.None;
                     innerContainer.Height = 100;
                 }
 
-                switch (instance)
+                switch (component)
                 {
                     case IScoreCounter score:
                         score.Current.Value = 133773;
@@ -129,6 +139,27 @@ namespace osu.Game.Skinning.Editor
                         break;
                 }
             }
+
+            [Resolved]
+            private OsuColour colours { get; set; }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                RequestPlacement?.Invoke(component.GetType());
+                return true;
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                box.FadeColour(colours.Yellow, 100);
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                box.FadeColour(Color4.Black, 100);
+                base.OnHoverLost(e);
+            }
         }
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 562dd23224..885d41043c 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -1,13 +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 System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -45,6 +49,12 @@ namespace osu.Game.Skinning.Editor
                         RelativeSizeAxes = Axes.X
                     },
                     new SkinBlueprintContainer(target),
+                    new SkinComponentToolbox
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        RequestPlacement = placeComponent
+                    }
                 }
             };
 
@@ -56,6 +66,15 @@ namespace osu.Game.Skinning.Editor
             });
         }
 
+        private void placeComponent(Type type)
+        {
+            var instance = (Drawable)Activator.CreateInstance(type);
+
+            var targetContainer = target.ChildrenOfType<HUDOverlay>().FirstOrDefault();
+
+            targetContainer?.Add(instance);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Skinning/Editor/SkinEditorContainer.cs b/osu.Game/Skinning/Editor/SkinEditorContainer.cs
index adb1abefd1..06bf278010 100644
--- a/osu.Game/Skinning/Editor/SkinEditorContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorContainer.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Skinning.Editor
         private readonly ScalingContainer target;
         private SkinEditor skinEditor;
 
-        private const float visible_target_scale = 0.8f;
+        public const float VISIBLE_TARGET_SCALE = 0.8f;
 
         [Resolved]
         private OsuColour colours { get; set; }
@@ -63,12 +63,14 @@ namespace osu.Game.Skinning.Editor
         {
             if (visibility.NewValue == Visibility.Visible)
             {
-                target.ScaleTo(visible_target_scale, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
-
                 target.Masking = true;
                 target.BorderThickness = 5;
                 target.BorderColour = colours.Yellow;
                 target.AllowScaling = false;
+                target.RelativePositionAxes = Axes.Both;
+
+                target.ScaleTo(VISIBLE_TARGET_SCALE, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
+                target.MoveToX(0.1f, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
             }
             else
             {
@@ -76,6 +78,7 @@ namespace osu.Game.Skinning.Editor
                 target.AllowScaling = true;
 
                 target.ScaleTo(1, SkinEditor.TRANSITION_DURATION, Easing.OutQuint).OnComplete(_ => target.Masking = false);
+                target.MoveToX(0f, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
             }
         }
 

From 5585a7d4380cb6a7070f7f8dbaa6a9fe3c0caaad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 12:41:18 +0900
Subject: [PATCH 09659/10326] Add basic interfaces for skinnable target
 containers

---
 .../Screens/Play/HUD/IDefaultSkinnableTarget.cs   | 12 ++++++++++++
 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs     | 15 +++++++++++++++
 osu.Game/Screens/Play/HUDOverlay.cs               |  2 +-
 osu.Game/Skinning/Editor/SkinEditor.cs            |  4 ++--
 4 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs
 create mode 100644 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs

diff --git a/osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs b/osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs
new file mode 100644
index 0000000000..208d920dec
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.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.Screens.Play.HUD
+{
+    /// <summary>
+    /// The default placement location for new <see cref="ISkinnableComponent"/>s.
+    /// </summary>
+    public interface IDefaultSkinnableTarget : ISkinnableTarget
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs b/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
new file mode 100644
index 0000000000..61a173ed02
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ISkinnableTarget.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;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
+    /// </summary>
+    public interface ISkinnableTarget : IContainerCollection<Drawable>
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 669c920017..eb6e599a19 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -22,7 +22,7 @@ using osuTK;
 namespace osu.Game.Screens.Play
 {
     [Cached]
-    public class HUDOverlay : Container, IKeyBindingHandler<GlobalAction>
+    public class HUDOverlay : Container, IKeyBindingHandler<GlobalAction>, IDefaultSkinnableTarget
     {
         public const float FADE_DURATION = 300;
 
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 885d41043c..6d189dc027 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -11,7 +11,7 @@ using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
-using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -70,7 +70,7 @@ namespace osu.Game.Skinning.Editor
         {
             var instance = (Drawable)Activator.CreateInstance(type);
 
-            var targetContainer = target.ChildrenOfType<HUDOverlay>().FirstOrDefault();
+            var targetContainer = target.ChildrenOfType<IDefaultSkinnableTarget>().FirstOrDefault();
 
             targetContainer?.Add(instance);
         }

From 8b82a07914cfb531f01f2c75c8d0b27da83eb5c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 12:42:32 +0900
Subject: [PATCH 09660/10326] Move skin-related interfaces out of HUD namespace

---
 osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs             | 1 +
 osu.Game/Screens/Play/HUD/DefaultComboCounter.cs                | 1 +
 osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs               | 1 +
 osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs                | 1 +
 osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs    | 1 +
 osu.Game/Screens/Play/HUDOverlay.cs                             | 1 +
 osu.Game/Screens/Play/SongProgress.cs                           | 2 +-
 osu.Game/Skinning/Editor/SkinBlueprint.cs                       | 1 -
 osu.Game/Skinning/Editor/SkinBlueprintContainer.cs              | 1 -
 osu.Game/Skinning/Editor/SkinEditor.cs                          | 1 -
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs                | 1 -
 .../{Screens/Play/HUD => Skinning}/IDefaultSkinnableTarget.cs   | 2 +-
 osu.Game/{Screens/Play/HUD => Skinning}/ISkinnableComponent.cs  | 2 +-
 osu.Game/{Screens/Play/HUD => Skinning}/ISkinnableTarget.cs     | 2 +-
 osu.Game/Skinning/LegacyScoreCounter.cs                         | 1 -
 15 files changed, 10 insertions(+), 9 deletions(-)
 rename osu.Game/{Screens/Play/HUD => Skinning}/IDefaultSkinnableTarget.cs (90%)
 rename osu.Game/{Screens/Play/HUD => Skinning}/ISkinnableComponent.cs (91%)
 rename osu.Game/{Screens/Play/HUD => Skinning}/ISkinnableTarget.cs (92%)

diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index b8a43708b4..5db1e96dc9 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 959766ecd1..a6bd95b36c 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index e3cd71691d..f99428d07e 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -13,6 +13,7 @@ using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index dde5c18b38..1f154fe168 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 3b24c8cc9e..26d5e622f7 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index eb6e599a19..621d604278 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 2e94421f36..d85f3538e4 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -14,7 +14,7 @@ using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play
 {
diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 491a403325..b82b861e3e 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -10,7 +10,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning.Editor
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index f2bc8ecddf..9c0327df00 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -6,7 +6,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 6d189dc027..902cb389e6 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -11,7 +11,6 @@ using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 0408ce74a6..e95bd5f8a3 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -10,7 +10,6 @@ using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning.Editor
diff --git a/osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs b/osu.Game/Skinning/IDefaultSkinnableTarget.cs
similarity index 90%
rename from osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs
rename to osu.Game/Skinning/IDefaultSkinnableTarget.cs
index 208d920dec..24fb454af8 100644
--- a/osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs
+++ b/osu.Game/Skinning/IDefaultSkinnableTarget.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.
 
-namespace osu.Game.Screens.Play.HUD
+namespace osu.Game.Skinning
 {
     /// <summary>
     /// The default placement location for new <see cref="ISkinnableComponent"/>s.
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableComponent.cs b/osu.Game/Skinning/ISkinnableComponent.cs
similarity index 91%
rename from osu.Game/Screens/Play/HUD/ISkinnableComponent.cs
rename to osu.Game/Skinning/ISkinnableComponent.cs
index 6d4558443f..f6b0a182b4 100644
--- a/osu.Game/Screens/Play/HUD/ISkinnableComponent.cs
+++ b/osu.Game/Skinning/ISkinnableComponent.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Graphics;
 
-namespace osu.Game.Screens.Play.HUD
+namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a drawable which, as a drawable, can be adjusted via skinning specifications.
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
similarity index 92%
rename from osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
rename to osu.Game/Skinning/ISkinnableTarget.cs
index 61a173ed02..607e89fdec 100644
--- a/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
-namespace osu.Game.Screens.Play.HUD
+namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index cae8044242..c270ce7e69 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -5,7 +5,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning

From 20ff05c9ffacd5ebc129c1ffe4239a65c3a02bc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 13:03:54 +0900
Subject: [PATCH 09661/10326] Fix crosstalk between notification/setting
 overlay nudge padding and skin overlay position adjust

---
 osu.Game/OsuGame.cs | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 77fb9c3b63..b7824a01a4 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -595,28 +595,35 @@ namespace osu.Game
                     ActionRequested = action => volume.Adjust(action),
                     ScrollActionRequested = (action, amount, isPrecise) => volume.Adjust(action, amount, isPrecise),
                 },
-                screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays)
+                screenOffsetContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
                     Children = new Drawable[]
                     {
-                        receptor = new BackButton.Receptor(),
-                        ScreenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
-                        BackButton = new BackButton(receptor)
+                        screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays)
                         {
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            Action = () =>
+                            RelativeSizeAxes = Axes.Both,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Children = new Drawable[]
                             {
-                                var currentScreen = ScreenStack.CurrentScreen as IOsuScreen;
+                                receptor = new BackButton.Receptor(),
+                                ScreenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
+                                BackButton = new BackButton(receptor)
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Action = () =>
+                                    {
+                                        var currentScreen = ScreenStack.CurrentScreen as IOsuScreen;
 
-                                if (currentScreen?.AllowBackButton == true && !currentScreen.OnBackButton())
-                                    ScreenStack.Exit();
+                                        if (currentScreen?.AllowBackButton == true && !currentScreen.OnBackButton())
+                                            ScreenStack.Exit();
+                                    }
+                                },
+                                logoContainer = new Container { RelativeSizeAxes = Axes.Both },
                             }
                         },
-                        logoContainer = new Container { RelativeSizeAxes = Axes.Both },
                     }
                 },
                 overlayContent = new Container { RelativeSizeAxes = Axes.Both },
@@ -766,7 +773,7 @@ namespace osu.Game
                 if (notifications.State.Value == Visibility.Visible)
                     offset -= Toolbar.HEIGHT / 2;
 
-                screenContainer.MoveToX(offset, SettingsPanel.TRANSITION_LENGTH, Easing.OutQuint);
+                screenOffsetContainer.MoveToX(offset, SettingsPanel.TRANSITION_LENGTH, Easing.OutQuint);
             }
 
             Settings.State.ValueChanged += _ => updateScreenOffset();
@@ -946,6 +953,8 @@ namespace osu.Game
 
         private ScalingContainer screenContainer;
 
+        private Container screenOffsetContainer;
+
         private SkinEditorContainer skinEditor;
 
         protected override bool OnExiting()
@@ -966,7 +975,7 @@ namespace osu.Game
         {
             base.UpdateAfterChildren();
 
-            screenContainer.Padding = new MarginPadding { Top = ToolbarOffset };
+            screenOffsetContainer.Padding = new MarginPadding { Top = ToolbarOffset };
             overlayContent.Padding = new MarginPadding { Top = ToolbarOffset };
 
             MenuCursorContainer.CanShowCursor = (ScreenStack.CurrentScreen as IOsuScreen)?.CursorVisible ?? false;

From bde72faa7ccf81f74b9fbd16538f954ce9488edf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 13:04:10 +0900
Subject: [PATCH 09662/10326] Limit components list height to better align with
 actual viewport

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 902cb389e6..298976c39b 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Skinning.Editor
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
+                        Height = SkinEditorContainer.VISIBLE_TARGET_SCALE,
                         RequestPlacement = placeComponent
                     }
                 }

From 3681db491caa5e03210c159682f3b3a921569447 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 11:21:20 +0700
Subject: [PATCH 09663/10326] add long mixed list test

Copied from https://github.com/ppy/osu-wiki/blob/master/wiki/Tournaments/OWC/2020/en.md#tournament-rules
---
 .../TestSceneOsuMarkdownContainer.cs          | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 3367fccbf1..852a2e32e2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -148,5 +148,44 @@ Line below";
 3. Third item level 1";
             });
         }
+
+        [Test]
+        public void TestLongMixedList()
+        {
+            AddStep("Add long mixed list", () =>
+            {
+                markdownContainer.Text = @"1. The osu! World Cup is a country-based team tournament played on the osu! game mode.
+   - While this competition is planned as a 4 versus 4 setup, this may change depending on the number of incoming registrations.
+2. Beatmap scoring is based on Score V2.
+3. The beatmaps for each round will be announced by the map selectors in advance on the Sunday before the actual matches take place. Only these beatmaps will be used during the respective matches.
+   - One beatmap will be a tiebreaker beatmap. This beatmap will only be played in case of a tie. **The only exception to this is the Qualifiers pool.**
+4. The match schedule will be settled by the Tournament Management (see the [scheduling instructions](#scheduling-instructions)).
+5. If no staff or referee is available, the match will be postponed.
+6. Use of the Visual Settings to alter background dim or disable beatmap elements like storyboards and skins are allowed.
+7. If the beatmap ends in a draw, the map will be nullified and replayed.
+8. If a player disconnects, their scores will not be counted towards their team's total.
+   - Disconnects within 30 seconds or 25% of the beatmap length (whichever happens first) after beatmap begin can be aborted and/or rematched. This is up to the referee's discretion.
+9. Beatmaps cannot be reused in the same match unless the map was nullified.
+10. If less than the minimum required players attend, the maximum time the match can be postponed is 10 minutes.
+11. Exchanging players during a match is allowed without limitations.
+    - **If a map rematch is required, exchanging players is not allowed. With the referee's discretion, an exception can be made if the previous roster is unavailable to play.**
+12. Lag is not a valid reason to nullify a beatmap.
+13. All players are supposed to keep the match running fluently and without delays. Penalties can be issued to the players if they cause excessive match delays.
+14. If a player disconnects between maps and the team cannot provide a replacement, the match can be delayed 10 minutes at maximum.
+15. All players and referees must be treated with respect. Instructions of the referees and tournament Management are to be followed. Decisions labeled as final are not to be objected.
+16. Disrupting the match by foul play, insulting and provoking other players or referees, delaying the match or other deliberate inappropriate misbehavior is strictly prohibited.
+17. The multiplayer chatrooms are subject to the [osu! community rules](/wiki/Rules).
+    - Breaking the chat rules will result in a silence. Silenced players can not participate in multiplayer matches and must be exchanged for the time being.
+18. **The seeding method will be revealed after all the teams have played their Qualifier rounds.**
+19. Unexpected incidents are handled by the tournament management. Referees may allow higher tolerance depending on the circumstances. This is up to their discretion.
+20. Penalties for violating the tournament rules may include:
+    - Exclusion of specific players for one beatmap
+    - Exclusion of specific players for an entire match
+    - Declaring the match as Lost by Default
+    - Disqualification from the entire tournament
+    - Disqualification from the current and future official tournaments until appealed
+    - Any modification of these rules will be announced.";
+            });
+        }
     }
 }

From 11d0f12455b1534efbd8edaef2c810e4dd61f2a2 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 11:36:51 +0700
Subject: [PATCH 09664/10326] change create text marker to virtual

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index f020e3e2fc..dce032d626 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         private void load()
         {
             var marker = parentTextComponent.CreateSpriteText();
-            marker.Text = createTextMarker();
+            marker.Text = CreateTextMarker();
 
             if (isOrdered)
             {
@@ -66,7 +66,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             AddInternal(marker);
         }
 
-        private string createTextMarker()
+        protected virtual string CreateTextMarker()
         {
             if (isOrdered)
             {

From fc4fa4f696c3c8fcf168a819a902454a89232b36 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 11:48:37 +0700
Subject: [PATCH 09665/10326] use ListBlock IsOrdered to determine ordered or
 unordered list

---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs   | 2 +-
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index b765378e4c..02e674aaec 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(0)
         };
 
-        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(level, listItemBlock.Order);
+        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(listItemBlock, level);
 
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index dce032d626..98b1fd1381 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.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 Markdig.Syntax;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -23,11 +24,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         public FillFlowContainer Content { get; }
 
-        public OsuMarkdownListItem(int level, int order)
+        public OsuMarkdownListItem(ListItemBlock listItemBlock, int level)
         {
             this.level = level;
-            this.order = order;
-            isOrdered = order != 0;
+            this.order = listItemBlock.Order;
+            isOrdered = ((ListBlock)listItemBlock.Parent).IsOrdered;
 
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;

From a1e64f4e3cc9faae55d3891d6850e1fb17d0767f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 14:37:49 +0900
Subject: [PATCH 09666/10326] Use the existing toolbox design

---
 .../TestSceneSkinEditorComponentsList.cs      |  2 +-
 .../Rulesets/Edit/ScrollingToolboxGroup.cs    | 32 +++++++++++++++++++
 .../Skinning/Editor/SkinComponentToolbox.cs   | 23 ++++++-------
 osu.Game/Skinning/Editor/SkinEditor.cs        |  3 +-
 4 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/ScrollingToolboxGroup.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
index 2fd40f5d7c..14bd62b98a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestToggleEditor()
         {
-            AddStep("show available components", () => SetContents(() => new SkinComponentToolbox
+            AddStep("show available components", () => SetContents(() => new SkinComponentToolbox(300)
             {
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
diff --git a/osu.Game/Rulesets/Edit/ScrollingToolboxGroup.cs b/osu.Game/Rulesets/Edit/ScrollingToolboxGroup.cs
new file mode 100644
index 0000000000..a54f574bff
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/ScrollingToolboxGroup.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.Graphics.Containers;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public class ScrollingToolboxGroup : ToolboxGroup
+    {
+        protected readonly OsuScrollContainer Scroll;
+
+        protected override Container<Drawable> Content { get; }
+
+        public ScrollingToolboxGroup(string title, float scrollAreaHeight)
+            : base(title)
+        {
+            base.Content.Add(Scroll = new OsuScrollContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = scrollAreaHeight,
+                Child = Content = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                },
+            });
+        }
+    }
+}
diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index f616366336..6b7439c229 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -10,21 +10,22 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinComponentToolbox : CompositeDrawable
+    public class SkinComponentToolbox : ScrollingToolboxGroup
     {
         public Action<Type> RequestPlacement;
 
-        public SkinComponentToolbox()
+        public SkinComponentToolbox(float height)
+            : base("Components", height)
         {
-            RelativeSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.None;
             Width = 200;
         }
 
@@ -33,16 +34,12 @@ namespace osu.Game.Skinning.Editor
         {
             FillFlowContainer fill;
 
-            InternalChild = new OsuScrollContainer
+            Child = fill = new FillFlowContainer
             {
-                RelativeSizeAxes = Axes.Both,
-                Child = fill = new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(20)
-                }
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(20)
             };
 
             var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 298976c39b..18a8b220df 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -48,11 +48,10 @@ namespace osu.Game.Skinning.Editor
                         RelativeSizeAxes = Axes.X
                     },
                     new SkinBlueprintContainer(target),
-                    new SkinComponentToolbox
+                    new SkinComponentToolbox(600)
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Height = SkinEditorContainer.VISIBLE_TARGET_SCALE,
                         RequestPlacement = placeComponent
                     }
                 }

From e4f895b49046948816dc3f260ba399aad816f153 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 14:48:37 +0900
Subject: [PATCH 09667/10326] Fix editor buttons inheriting from
 `TriangleButton` when they have no need to

---
 .../Edit/Components/RadioButtons/DrawableRadioButton.cs       | 4 +---
 .../Edit/Components/TernaryButtons/DrawableTernaryButton.cs   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
index 0cf7b83f3b..1f608d28fd 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Components.RadioButtons
 {
-    public class DrawableRadioButton : TriangleButton
+    public class DrawableRadioButton : OsuButton
     {
         /// <summary>
         /// Invoked when this <see cref="DrawableRadioButton"/> has been selected.
@@ -49,8 +49,6 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
             selectedBackgroundColour = colours.BlueDark;
             selectedBubbleColour = selectedBackgroundColour.Lighten(0.5f);
 
-            Triangles.Alpha = 0;
-
             Content.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,
diff --git a/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs b/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
index c72fff5c91..c43561eaa7 100644
--- a/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
+++ b/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
@@ -15,7 +15,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Components.TernaryButtons
 {
-    internal class DrawableTernaryButton : TriangleButton
+    internal class DrawableTernaryButton : OsuButton
     {
         private Color4 defaultBackgroundColour;
         private Color4 defaultBubbleColour;
@@ -43,8 +43,6 @@ namespace osu.Game.Screens.Edit.Components.TernaryButtons
             selectedBackgroundColour = colours.BlueDark;
             selectedBubbleColour = selectedBackgroundColour.Lighten(0.5f);
 
-            Triangles.Alpha = 0;
-
             Content.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,

From e663629bc64ceedb95fda5adbf26c2a6c1be99cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 15:22:51 +0900
Subject: [PATCH 09668/10326] Match button appearance to that of the beatmap
 editor

---
 .../Skinning/Editor/SkinComponentToolbox.cs   | 107 +++++++++---------
 1 file changed, 54 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 6b7439c229..46b8d5d5ea 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -5,12 +5,14 @@ using System;
 using System.Diagnostics;
 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.Shapes;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
@@ -22,6 +24,8 @@ namespace osu.Game.Skinning.Editor
     {
         public Action<Type> RequestPlacement;
 
+        private const float component_display_scale = 0.8f;
+
         public SkinComponentToolbox(float height)
             : base("Components", height)
         {
@@ -56,7 +60,7 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
-        private static ToolboxComponent attemptAddComponent(Type type)
+        private static ToolboxComponentButton attemptAddComponent(Type type)
         {
             try
             {
@@ -64,7 +68,7 @@ namespace osu.Game.Skinning.Editor
 
                 Debug.Assert(instance != null);
 
-                return new ToolboxComponent(instance);
+                return new ToolboxComponentButton(instance);
             }
             catch
             {
@@ -72,59 +76,60 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
-        private class ToolboxComponent : CompositeDrawable
+        private class ToolboxComponentButton : OsuButton
         {
             private readonly Drawable component;
-            private readonly Box box;
 
             public Action<Type> RequestPlacement;
 
-            public ToolboxComponent(Drawable component)
+            private Container innerContainer;
+
+            public ToolboxComponentButton(Drawable component)
             {
                 this.component = component;
-                Container innerContainer;
+
+                Enabled.Value = true;
 
                 RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
+                Height = 70;
+            }
 
-                InternalChild = new FillFlowContainer
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = colours.Gray3;
+                Content.EdgeEffect = new EdgeEffectParameters
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText { Text = component.GetType().Name },
-                        innerContainer = new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Masking = true,
-                            CornerRadius = 10,
-                            Children = new[]
-                            {
-                                box = new Box
-                                {
-                                    Colour = Color4.Black,
-                                    Alpha = 0.5f,
-                                    RelativeSizeAxes = Axes.Both,
-                                },
-                                component
-                            }
-                        },
-                    }
+                    Type = EdgeEffectType.Shadow,
+                    Radius = 2,
+                    Offset = new Vector2(0, 1),
+                    Colour = Color4.Black.Opacity(0.5f)
                 };
 
-                // adjust provided component to fit / display in a known state.
+                AddRange(new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Text = component.GetType().Name,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                    },
+                    innerContainer = new Container
+                    {
+                        Y = 10,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Scale = new Vector2(component_display_scale),
+                        Masking = true,
+                        Child = component
+                    }
+                });
 
+                // adjust provided component to fit / display in a known state.
                 component.Anchor = Anchor.Centre;
                 component.Origin = Anchor.Centre;
 
-                if (component.RelativeSizeAxes != Axes.None)
-                {
-                    innerContainer.AutoSizeAxes = Axes.None;
-                    innerContainer.Height = 100;
-                }
-
                 switch (component)
                 {
                     case IScoreCounter score:
@@ -137,26 +142,22 @@ namespace osu.Game.Skinning.Editor
                 }
             }
 
-            [Resolved]
-            private OsuColour colours { get; set; }
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                if (component.RelativeSizeAxes != Axes.None)
+                {
+                    innerContainer.AutoSizeAxes = Axes.None;
+                    innerContainer.Height = 100;
+                }
+            }
 
             protected override bool OnClick(ClickEvent e)
             {
                 RequestPlacement?.Invoke(component.GetType());
                 return true;
             }
-
-            protected override bool OnHover(HoverEvent e)
-            {
-                box.FadeColour(colours.Yellow, 100);
-                return base.OnHover(e);
-            }
-
-            protected override void OnHoverLost(HoverLostEvent e)
-            {
-                box.FadeColour(Color4.Black, 100);
-                base.OnHoverLost(e);
-            }
         }
     }
 }

From 786ab163f622c0770c2b63a27e54db958881f499 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Fri, 30 Apr 2021 12:40:16 -0700
Subject: [PATCH 09669/10326] Rename extension and move to bottom of file

---
 ...StatusExtensions.cs => BeatmapSetOnlineStatus.cs} | 12 ++++++------
 .../Overlays/BeatmapSet/Scores/ScoresContainer.cs    |  2 +-
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game/Beatmaps/{BeatmapSetOnlineStatusExtensions.cs => BeatmapSetOnlineStatus.cs} (86%)

diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs b/osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs
similarity index 86%
rename from osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs
rename to osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs
index 1de641f4f1..ae5a44cfcd 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs
@@ -3,12 +3,6 @@
 
 namespace osu.Game.Beatmaps
 {
-    public static class BeatmapSetOnlineStatusExtensions
-    {
-        public static bool HasPerformancePoints(this BeatmapSetOnlineStatus status)
-            => status == BeatmapSetOnlineStatus.Ranked || status == BeatmapSetOnlineStatus.Approved;
-    }
-
     public enum BeatmapSetOnlineStatus
     {
         None = -3,
@@ -20,4 +14,10 @@ namespace osu.Game.Beatmaps
         Qualified = 3,
         Loved = 4,
     }
+
+    public static class BeatmapSetOnlineStatusExtensions
+    {
+        public static bool GrantsPerformancePoints(this BeatmapSetOnlineStatus status)
+            => status == BeatmapSetOnlineStatus.Ranked || status == BeatmapSetOnlineStatus.Approved;
+    }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 8786cf0e63..e9733bad20 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 var scoreInfos = value.Scores.Select(s => s.CreateScoreInfo(rulesets)).ToList();
                 var topScore = scoreInfos.First();
 
-                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status.HasPerformancePoints() ?? false);
+                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status.GrantsPerformancePoints() ?? false);
                 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 57df54d851..a4b58e74a6 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
 
-                ppColumn.Alpha = value.Beatmap?.Status.HasPerformancePoints() ?? false ? 1 : 0;
+                ppColumn.Alpha = value.Beatmap?.Status.GrantsPerformancePoints() ?? false ? 1 : 0;
                 ppColumn.Text = $@"{value.PP:N0}";
 
                 statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(createStatisticsColumn);

From fdf8c129474893b46e7e76b6cc1c19f835c82bcc Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 1 May 2021 11:57:47 +0800
Subject: [PATCH 09670/10326] Replace BeatDivisorFinder with
 GetClosestBeatDivisor

---
 .../Objects/Drawables/DrawableNote.cs         |  13 +-
 .../UI/DrawableManiaRuleset.cs                |   6 +-
 osu.Game.Tests/NonVisual/BeatDivisorFinder.cs | 116 ------------------
 .../Rulesets/Objects/BeatDivisorFinder.cs     |  55 ---------
 4 files changed, 12 insertions(+), 178 deletions(-)
 delete mode 100644 osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
 delete mode 100644 osu.Game/Rulesets/Objects/BeatDivisorFinder.cs

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 942a32936c..d67c360301 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -6,10 +6,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Skinning.Default;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private OsuColour colours { get; set; }
 
         [Resolved(canBeNull: true)]
-        private BeatDivisorFinder beatDivisorFinder { get; set; }
+        private IBeatmap beatmap { get; set; }
 
         private readonly Bindable<bool> configTimingBasedNoteColouring = new Bindable<bool>();
 
@@ -58,9 +58,14 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected override void LoadComplete()
         {
-            if (beatDivisorFinder != null)
+            if (beatmap != null)
             {
-                HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = beatDivisorFinder.FindDivisor(HitObject), true);
+                HitObject.StartTimeBindable.BindValueChanged(startTime =>
+                    {
+                        snap.Value = beatmap.ControlPointInfo.GetClosestBeatDivisor(startTime.NewValue);
+                    },
+                    true
+                );
             }
 
             snap.BindValueChanged(_ => updateSnapColour());
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 0177c01240..536d7b39b7 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -45,8 +45,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
 
-        [Cached]
-        private BeatDivisorFinder beatDivisorFinder { get; set; }
+        [Cached(typeof(IBeatmap))]
+        private ManiaBeatmap cachedBeatmap { get; set; }
 
         public IEnumerable<BarLine> BarLines;
 
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Mania.UI
             : base(ruleset, beatmap, mods)
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
-            beatDivisorFinder = new BeatDivisorFinder(Beatmap);
+            cachedBeatmap = Beatmap;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs b/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
deleted file mode 100644
index 720d8e8ecd..0000000000
--- a/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
+++ /dev/null
@@ -1,116 +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 NUnit.Framework;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Objects;
-
-namespace osu.Game.Tests.NonVisual
-{
-    public class BeatDivisorFinderTest
-    {
-        [Test]
-        public void TestFindDivisor()
-        {
-            const double beat_length = 1000;
-
-            var beatmap = new Beatmap
-            {
-                HitObjects = new List<HitObject>
-                {
-                    new HitObject { StartTime = -beat_length / 3 },
-                    new HitObject { StartTime = 0 },
-                    new HitObject { StartTime = beat_length / 16 },
-                    new HitObject { StartTime = beat_length / 12 },
-                    new HitObject { StartTime = beat_length / 8 },
-                    new HitObject { StartTime = beat_length / 6 },
-                    new HitObject { StartTime = beat_length / 4 },
-                    new HitObject { StartTime = beat_length / 3 },
-                    new HitObject { StartTime = beat_length / 2 },
-                    new HitObject { StartTime = beat_length },
-                    new HitObject { StartTime = beat_length + beat_length / 7 }
-                },
-                ControlPointInfo = new ControlPointInfo()
-            };
-
-            beatmap.ControlPointInfo.Add(0, new TimingControlPoint
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = beat_length
-            });
-
-            var beatDivisorFinder = new BeatDivisorFinder(beatmap);
-
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[0]), 3);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[1]), 1);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[2]), 16);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[3]), 12);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[4]), 8);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[5]), 6);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[6]), 4);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[7]), 3);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[8]), 2);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[9]), 1);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[10]), 0);
-        }
-
-        [Test]
-        public void TestFindDivisorWithTempoChanges()
-        {
-            const double first_beat_length = 1000;
-            const double second_beat_length = 700;
-            const double third_beat_length = 200;
-
-            const double first_beat_length_start = 0;
-            const double second_beat_length_start = 1000;
-            const double third_beat_length_start = 2000;
-
-            var beatmap = new Beatmap
-            {
-                HitObjects = new List<HitObject>
-                {
-                    new HitObject { StartTime = first_beat_length_start },
-                    new HitObject { StartTime = first_beat_length_start + first_beat_length / 2 },
-                    new HitObject { StartTime = second_beat_length_start },
-                    new HitObject { StartTime = second_beat_length_start + second_beat_length / 2 },
-                    new HitObject { StartTime = third_beat_length_start },
-                    new HitObject { StartTime = third_beat_length_start + third_beat_length / 2 },
-                },
-                ControlPointInfo = new ControlPointInfo()
-            };
-
-            var firstTimingControlPoint = new TimingControlPoint
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = first_beat_length
-            };
-
-            var secondTimingControlPoint = new TimingControlPoint
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = second_beat_length
-            };
-
-            var thirdTimingControlPoint = new TimingControlPoint
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = third_beat_length
-            };
-
-            beatmap.ControlPointInfo.Add(first_beat_length_start, firstTimingControlPoint);
-            beatmap.ControlPointInfo.Add(second_beat_length_start, secondTimingControlPoint);
-            beatmap.ControlPointInfo.Add(third_beat_length_start, thirdTimingControlPoint);
-
-            var beatDivisorFinder = new BeatDivisorFinder(beatmap);
-
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[0]), 1);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[1]), 2);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[2]), 1);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[3]), 2);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[4]), 1);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[5]), 2);
-        }
-    }
-}
diff --git a/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
deleted file mode 100644
index 1479b22942..0000000000
--- a/osu.Game/Rulesets/Objects/BeatDivisorFinder.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 osu.Framework.Utils;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Screens.Edit;
-
-namespace osu.Game.Rulesets.Objects
-{
-    /// <summary>
-    /// Used to find the lowest beat divisor that a <see cref="HitObject"/> aligns to in an <see cref="IBeatmap"/>.
-    /// </summary>
-    public class BeatDivisorFinder
-    {
-        private readonly IBeatmap beatmap;
-
-        /// <summary>
-        /// Creates a new <see cref="BeatDivisorFinder"/> instance.
-        /// </summary>
-        /// <param name="beatmap">The beatmap to use when calculating beat divisor alignment.</param>
-        public BeatDivisorFinder(IBeatmap beatmap)
-        {
-            this.beatmap = beatmap;
-        }
-
-        /// <summary>
-        /// Finds the lowest beat divisor that the given <see cref="HitObject"/> aligns to.
-        /// Returns 0 if it does not align to any divisor.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to evaluate.</param>
-        public int FindDivisor(HitObject hitObject)
-        {
-            TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
-            double snapResult = hitObject.StartTime - currentTimingPoint.Time;
-
-            foreach (var divisor in BindableBeatDivisor.VALID_DIVISORS)
-            {
-                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / divisor))
-                    return divisor;
-            }
-
-            return 0;
-        }
-
-        private const double leniency_ms = 1.0;
-
-        private static bool almostDivisibleBy(double dividend, double divisor)
-        {
-            double remainder = Math.Abs(dividend) % divisor;
-            return Precision.AlmostEquals(remainder, 0, leniency_ms) || Precision.AlmostEquals(remainder - divisor, 0, leniency_ms);
-        }
-    }
-}

From 0d077b7a5deb9a5ec4f44c5a8335cb063080062b Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 1 May 2021 14:13:42 +0800
Subject: [PATCH 09671/10326] Fix GetClosestBeatDivisor returning the wrong
 divisor

---
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index e47d48edcf..d3a4b635f5 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Framework.Lists;
+using osu.Framework.Utils;
 using osu.Game.Screens.Edit;
 
 namespace osu.Game.Beatmaps.ControlPoints
@@ -195,7 +196,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             {
                 double distanceFromSnap = Math.Abs(time - getClosestSnappedTime(timingPoint, time, divisor));
 
-                if (distanceFromSnap < closestTime)
+                if (Precision.DefinitelyBigger(closestTime, distanceFromSnap))
                 {
                     closestDivisor = divisor;
                     closestTime = distanceFromSnap;

From 0b06c5bcb198aec5a587fa45e035ef76d0665116 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 1 May 2021 15:00:18 +0800
Subject: [PATCH 09672/10326] Remove unneeded test data

---
 .../TestSceneTimingBasedNoteColouring.cs       | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
index 5cfd7ff389..e14ad92842 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
@@ -45,15 +45,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                     new Note { StartTime = beat_length }
                 },
                 ControlPointInfo = new ControlPointInfo(),
-                BeatmapInfo =
-                {
-                    BaseDifficulty = new BeatmapDifficulty
-                    {
-                        SliderTickRate = 4,
-                        OverallDifficulty = 10,
-                    },
-                    Ruleset = ruleset.RulesetInfo
-                },
+                BeatmapInfo = { Ruleset = ruleset.RulesetInfo },
             };
 
             foreach (var note in beatmap.HitObjects)
@@ -62,11 +54,9 @@ namespace osu.Game.Rulesets.Mania.Tests
             }
 
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint
-                {
-                    TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                    BeatLength = beat_length
-                }
-            );
+            {
+                BeatLength = beat_length
+            });
 
             Child = new Container
             {

From db815f793038ca0c0f58a7a70d831a4ff21d8b63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 May 2021 20:39:10 +0900
Subject: [PATCH 09673/10326] Tidy up implementation in `DrawableNote`

---
 .../Objects/Drawables/DrawableNote.cs         | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index d67c360301..36565e14aa 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -35,8 +35,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private readonly Drawable headPiece;
 
-        private readonly Bindable<int> snap = new Bindable<int>();
-
         public DrawableNote(Note hitObject)
             : base(hitObject)
         {
@@ -58,17 +56,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected override void LoadComplete()
         {
-            if (beatmap != null)
-            {
-                HitObject.StartTimeBindable.BindValueChanged(startTime =>
-                    {
-                        snap.Value = beatmap.ControlPointInfo.GetClosestBeatDivisor(startTime.NewValue);
-                    },
-                    true
-                );
-            }
-
-            snap.BindValueChanged(_ => updateSnapColour());
+            HitObject.StartTimeBindable.BindValueChanged(_ => updateSnapColour());
             configTimingBasedNoteColouring.BindValueChanged(_ => updateSnapColour(), true);
         }
 
@@ -114,9 +102,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private void updateSnapColour()
         {
-            Colour = configTimingBasedNoteColouring.Value
-                ? BindableBeatDivisor.GetColourFor(snap.Value, colours)
-                : Color4.White;
+            if (beatmap == null) return;
+
+            int snapDivisor = beatmap.ControlPointInfo.GetClosestBeatDivisor(HitObject.StartTime);
+
+            Colour = configTimingBasedNoteColouring.Value ? BindableBeatDivisor.GetColourFor(snapDivisor, colours) : Color4.White;
         }
     }
 }

From a551958eeb413e7e4a4b34b72cc8ed53b14f6d5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 May 2021 21:32:45 +0900
Subject: [PATCH 09674/10326] Move caching of `IBeatmap` to base
 `DrawableRuleset`

---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs | 4 ----
 osu.Game/Rulesets/UI/DrawableRuleset.cs            | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 536d7b39b7..4ee060e91e 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -45,9 +45,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
 
-        [Cached(typeof(IBeatmap))]
-        private ManiaBeatmap cachedBeatmap { get; set; }
-
         public IEnumerable<BarLine> BarLines;
 
         protected override bool RelativeScaleBeatLengths => true;
@@ -80,7 +77,6 @@ namespace osu.Game.Rulesets.Mania.UI
             : base(ruleset, beatmap, mods)
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
-            cachedBeatmap = Beatmap;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index ca27e6b21a..a2dade2627 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -85,6 +85,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// The beatmap.
         /// </summary>
+        [Cached(typeof(IBeatmap))]
         public readonly Beatmap<TObject> Beatmap;
 
         public override IEnumerable<HitObject> Objects => Beatmap.HitObjects;

From 137be5dc971b6f6fddc300ac9dafc0512a38295f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 1 May 2021 14:14:07 -0700
Subject: [PATCH 09675/10326] Use equality operator instead of null coalescing

Co-Authored-By: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs          | 2 +-
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index e9733bad20..aff48919b4 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 var scoreInfos = value.Scores.Select(s => s.CreateScoreInfo(rulesets)).ToList();
                 var topScore = scoreInfos.First();
 
-                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status.GrantsPerformancePoints() ?? false);
+                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status.GrantsPerformancePoints() == true);
                 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 a4b58e74a6..262f321598 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
 
-                ppColumn.Alpha = value.Beatmap?.Status.GrantsPerformancePoints() ?? false ? 1 : 0;
+                ppColumn.Alpha = value.Beatmap?.Status.GrantsPerformancePoints() == true ? 1 : 0;
                 ppColumn.Text = $@"{value.PP:N0}";
 
                 statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(createStatisticsColumn);

From 07fe99025f9e2493e86a91ac078c509675b010d2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 1 May 2021 15:05:12 +0300
Subject: [PATCH 09676/10326] Use bounding box of blueprint for computing
 selection box area

---
 .../Screens/Edit/Compose/Components/SelectionHandler.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index cb3424a250..c11c20df2a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
@@ -332,8 +333,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             foreach (var blueprint in selectedBlueprints)
             {
-                topLeft = Vector2.ComponentMin(topLeft, ToLocalSpace(blueprint.SelectionQuad.TopLeft));
-                bottomRight = Vector2.ComponentMax(bottomRight, ToLocalSpace(blueprint.SelectionQuad.BottomRight));
+                var blueprintRect = blueprint.SelectionQuad.AABBFloat;
+                topLeft = Vector2.ComponentMin(topLeft, ToLocalSpace(blueprintRect.TopLeft));
+                bottomRight = Vector2.ComponentMax(bottomRight, ToLocalSpace(blueprintRect.BottomRight));
             }
 
             topLeft -= new Vector2(5);

From 0aa17e7c955b93e4b0b2283279ebdd16fcf9e7c7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 2 May 2021 02:51:06 +0300
Subject: [PATCH 09677/10326] Rewrite selection box computation logic with
 `RectangleF`'s helper methods

---
 .../Compose/Components/SelectionHandler.cs     | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index c11c20df2a..8335ece236 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -328,21 +328,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return;
 
             // Move the rectangle to cover the items
-            var topLeft = new Vector2(float.MaxValue, float.MaxValue);
-            var bottomRight = new Vector2(float.MinValue, float.MinValue);
+            RectangleF selectionRect = ToLocalSpace(selectedBlueprints.First().SelectionQuad).AABBFloat;
 
-            foreach (var blueprint in selectedBlueprints)
-            {
-                var blueprintRect = blueprint.SelectionQuad.AABBFloat;
-                topLeft = Vector2.ComponentMin(topLeft, ToLocalSpace(blueprintRect.TopLeft));
-                bottomRight = Vector2.ComponentMax(bottomRight, ToLocalSpace(blueprintRect.BottomRight));
-            }
+            foreach (var blueprint in selectedBlueprints.Skip(1))
+                selectionRect = RectangleF.Union(selectionRect, ToLocalSpace(blueprint.SelectionQuad).AABBFloat);
 
-            topLeft -= new Vector2(5);
-            bottomRight += new Vector2(5);
+            selectionRect = selectionRect.Inflate(5f);
 
-            content.Size = bottomRight - topLeft;
-            content.Position = topLeft;
+            content.Position = selectionRect.Location;
+            content.Size = selectionRect.Size;
         }
 
         #endregion

From b83aa0bd76e59007e7e8063aefe34bc16ed58841 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 2 May 2021 06:21:14 +0300
Subject: [PATCH 09678/10326] Avoid LINQ in update

---
 .../Screens/Edit/Compose/Components/SelectionHandler.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 8335ece236..917cbca4e1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -328,10 +328,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return;
 
             // Move the rectangle to cover the items
-            RectangleF selectionRect = ToLocalSpace(selectedBlueprints.First().SelectionQuad).AABBFloat;
+            RectangleF selectionRect = ToLocalSpace(selectedBlueprints[0].SelectionQuad).AABBFloat;
 
-            foreach (var blueprint in selectedBlueprints.Skip(1))
-                selectionRect = RectangleF.Union(selectionRect, ToLocalSpace(blueprint.SelectionQuad).AABBFloat);
+            for (int i = 1; i < selectedBlueprints.Count; i++)
+                selectionRect = RectangleF.Union(selectionRect, ToLocalSpace(selectedBlueprints[i].SelectionQuad).AABBFloat);
 
             selectionRect = selectionRect.Inflate(5f);
 

From 3aa18e19c93272515a293946b4b468deea3fb1e8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 2 May 2021 11:30:44 +0300
Subject: [PATCH 09679/10326] Revert "Bump Humanizer from 2.8.26 to 2.9.9"

This reverts commit 1e7feff49d57fc2f0575a8a423083e0ff9a44d65.
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b25e462453..1e0eabfff7 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="DiffPlex" Version="1.7.0" />
-    <PackageReference Include="Humanizer" Version="2.9.9" />
+    <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.5" />
diff --git a/osu.iOS.props b/osu.iOS.props
index bbf0f6046c..e26e727e69 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -89,7 +89,7 @@
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
-    <PackageReference Include="Humanizer" Version="2.9.9" />
+    <PackageReference Include="Humanizer" Version="2.8.26" />
     <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" />

From 88aaa9b3320124203abbbef8169b82133956e5dd Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 2 May 2021 22:35:30 +0700
Subject: [PATCH 09680/10326] add inline code colour

Reference : https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L12-L17
---
 .../UserInterface/TestSceneOsuMarkdownContainer.cs       | 9 +++++++++
 .../Containers/Markdown/OsuMarkdownTextFlowContainer.cs  | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 852a2e32e2..99bbc22125 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -59,6 +59,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
+        [Test]
+        public void TestInlineCode()
+        {
+            AddStep("Add inline code", () =>
+            {
+                markdownContainer.Text = "This is `inline code` text";
+            });
+        }
+
         [Test]
         public void TestFencedCodeBlock()
         {
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
index 7a6818b4c2..535e1fb9a0 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -2,13 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Markdig.Syntax.Inlines;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownTextFlowContainer : MarkdownTextFlowContainer
     {
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
         protected override void AddLinkText(string text, LinkInline linkInline)
             => AddDrawable(new OsuMarkdownLinkText(text, linkInline));
+
+        // TODO : Add background (colour B6) and change font to monospace
+        protected override void AddCodeInLine(CodeInline codeInline)
+            => AddText(codeInline.Content, t => { t.Colour = colourProvider.Light1; });
     }
 }

From 18bfcd7b222d9e13d9b6c07fdd20fed2aa30d8d0 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 2 May 2021 22:41:11 +0700
Subject: [PATCH 09681/10326] add hover colour to OsuMarkdownLinkText

---
 .../Containers/Markdown/OsuMarkdownLinkText.cs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
index 39b35fd84b..2efb60d125 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
@@ -5,12 +5,16 @@ using Markdig.Syntax.Inlines;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownLinkText : MarkdownLinkText
     {
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
         private SpriteText spriteText;
 
         public OsuMarkdownLinkText(string text, LinkInline linkInline)
@@ -19,7 +23,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load()
         {
             spriteText.Colour = colourProvider.Light2;
         }
@@ -28,5 +32,17 @@ namespace osu.Game.Graphics.Containers.Markdown
         {
             return spriteText = base.CreateSpriteText();
         }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            spriteText.Colour = colourProvider.Light1;
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            spriteText.Colour = colourProvider.Light2;
+            base.OnHoverLost(e);
+        }
     }
 }

From 59cb5f4679aab9b861fa3ca0b2c6ed473b22d330 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 24 Apr 2021 09:26:43 -0700
Subject: [PATCH 09682/10326] Get recent count from api instead

---
 .../Profile/Sections/Ranks/PaginatedScoreContainer.cs       | 6 +++---
 osu.Game/Users/User.cs                                      | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 53f6d375ca..9ac9040a98 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                 case ScoreType.Firsts:
                     return user.ScoresFirstCount;
 
+                case ScoreType.Recent:
+                    return user.ScoresRecentCount;
+
                 default:
                     return 0;
             }
@@ -50,9 +53,6 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                 drawableItemIndex = 0;
 
             base.OnItemsReceived(items);
-
-            if (type == ScoreType.Recent)
-                SetCount(items.Count);
         }
 
         protected override APIRequest<List<APILegacyScoreInfo>> CreateRequest() =>
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 74ffb7c457..beb41c3b06 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -147,6 +147,9 @@ namespace osu.Game.Users
         [JsonProperty(@"scores_first_count")]
         public int ScoresFirstCount;
 
+        [JsonProperty(@"scores_recent_count")]
+        public int ScoresRecentCount;
+
         [JsonProperty(@"beatmap_playcounts_count")]
         public int BeatmapPlaycountsCount;
 

From 3e74d61dab44ea25341aebd79cd02fe6792c1a05 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 24 Apr 2021 09:27:32 -0700
Subject: [PATCH 09683/10326] Add best count from api

---
 .../Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs | 3 +++
 osu.Game/Users/User.cs                                         | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 9ac9040a98..d06e0c87fc 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         {
             switch (type)
             {
+                case ScoreType.Best:
+                    return user.ScoresBestCount;
+
                 case ScoreType.Firsts:
                     return user.ScoresFirstCount;
 
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index beb41c3b06..2e04693e82 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -144,6 +144,9 @@ namespace osu.Game.Users
         [JsonProperty(@"unranked_beatmapset_count")]
         public int UnrankedBeatmapsetCount;
 
+        [JsonProperty(@"scores_best_count")]
+        public int ScoresBestCount;
+
         [JsonProperty(@"scores_first_count")]
         public int ScoresFirstCount;
 

From cc056088bdf0cbf988f7b8185addbedd669ebb95 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 2 May 2021 14:31:06 -0700
Subject: [PATCH 09684/10326] Update profile subsections to use counters
 instead of missing text in line with web

---
 .../Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs    | 2 +-
 .../Historical/PaginatedMostPlayedBeatmapContainer.cs         | 2 +-
 osu.Game/Overlays/Profile/Sections/HistoricalSection.cs       | 2 +-
 .../Overlays/Profile/Sections/PaginatedProfileSubsection.cs   | 4 ++--
 .../Profile/Sections/Ranks/PaginatedScoreContainer.cs         | 4 ++--
 osu.Game/Overlays/Profile/Sections/RanksSection.cs            | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index 780d7ea986..fe9c710bcc 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
         private readonly BeatmapSetType type;
 
         public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<User> user, string headerText)
-            : base(user, headerText, "", CounterVisibilityState.AlwaysVisible)
+            : base(user, headerText)
         {
             this.type = type;
             ItemsPerPage = 6;
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index e5bb1f8008..eeb14e5e4f 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     public class PaginatedMostPlayedBeatmapContainer : PaginatedProfileSubsection<APIUserMostPlayedBeatmap>
     {
         public PaginatedMostPlayedBeatmapContainer(Bindable<User> user)
-            : base(user, "Most Played Beatmaps", "No records. :(", CounterVisibilityState.AlwaysVisible)
+            : base(user, "Most Played Beatmaps")
         {
             ItemsPerPage = 5;
         }
diff --git a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
index 6e2b9873cf..4fbb7fc7d7 100644
--- a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Sections
             {
                 new PlayHistorySubsection(User),
                 new PaginatedMostPlayedBeatmapContainer(User),
-                new PaginatedScoreContainer(ScoreType.Recent, User, "Recent Plays (24h)", CounterVisibilityState.VisibleWhenZero),
+                new PaginatedScoreContainer(ScoreType.Recent, User, "Recent Plays (24h)"),
                 new ReplaysSubsection(User)
             };
         }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
index 51e5622f68..e237b43b2e 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
@@ -38,8 +38,8 @@ namespace osu.Game.Overlays.Profile.Sections
         private OsuSpriteText missing;
         private readonly string missingText;
 
-        protected PaginatedProfileSubsection(Bindable<User> user, string headerText = "", string missingText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
-            : base(user, headerText, counterVisibilityState)
+        protected PaginatedProfileSubsection(Bindable<User> user, string headerText = "", string missingText = "")
+            : base(user, headerText, CounterVisibilityState.AlwaysVisible)
         {
             this.missingText = missingText;
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index d06e0c87fc..720cd4a3db 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
     {
         private readonly ScoreType type;
 
-        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string headerText, CounterVisibilityState counterVisibilityState, string missingText = "")
-            : base(user, headerText, missingText, counterVisibilityState)
+        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string headerText)
+            : base(user, headerText)
         {
             this.type = type;
 
diff --git a/osu.Game/Overlays/Profile/Sections/RanksSection.cs b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
index e41e414893..33f7c2f71a 100644
--- a/osu.Game/Overlays/Profile/Sections/RanksSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
@@ -16,8 +16,8 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new[]
             {
-                new PaginatedScoreContainer(ScoreType.Best, User, "Best Performance", CounterVisibilityState.AlwaysHidden, "No performance records. :("),
-                new PaginatedScoreContainer(ScoreType.Firsts, User, "First Place Ranks", CounterVisibilityState.AlwaysVisible)
+                new PaginatedScoreContainer(ScoreType.Best, User, "Best Performance"),
+                new PaginatedScoreContainer(ScoreType.Firsts, User, "First Place Ranks")
             };
         }
     }

From b2130fc600d8cff184ba6e51bc3ef7dbeed2f44c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 3 May 2021 01:56:32 +0300
Subject: [PATCH 09685/10326] Fix replay frames sort instability

---
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 0f25a45177..d6c9b9c6d9 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -4,7 +4,7 @@
 #nullable enable
 
 using System;
-using System.Collections.Generic;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Replays
         {
             // TODO: This replay frame ordering should be enforced on the Replay type.
             // Currently, the ordering can be broken if the frames are added after this construction.
-            replay.Frames.Sort((x, y) => x.Time.CompareTo(y.Time));
+            replay.Frames = replay.Frames.OrderBy(f => f.Time).ToList();
 
             this.replay = replay;
             currentFrameIndex = -1;

From 943c497397245fdf1924860b951c89940e3b235e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 3 May 2021 02:02:14 +0300
Subject: [PATCH 09686/10326] Return back removed using

---
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index d6c9b9c6d9..bc8994bbe5 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Input.Handlers;

From 8a2926c0b54e41f72cc1ba9c7110655dac392da6 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 3 May 2021 09:18:45 +0700
Subject: [PATCH 09687/10326] change default font size to 14

Reference :
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L9
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L161
---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs   | 7 +++++++
 .../Containers/Markdown/OsuMarkdownTextFlowContainer.cs    | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 02e674aaec..c4190d8c4f 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -9,6 +9,8 @@ using Markdig.Syntax;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
@@ -35,6 +37,11 @@ namespace osu.Game.Graphics.Containers.Markdown
             }
         }
 
+        public override SpriteText CreateSpriteText() => new OsuSpriteText
+        {
+            Font = OsuFont.GetFont(size: 14),
+        };
+
         public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
 
         protected override MarkdownFencedCodeBlock CreateFencedCodeBlock(FencedCodeBlock fencedCodeBlock) => new OsuMarkdownFencedCodeBlock(fencedCodeBlock);
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
index 535e1fb9a0..5165fe74a2 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -4,6 +4,8 @@
 using Markdig.Syntax.Inlines;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
@@ -13,6 +15,11 @@ namespace osu.Game.Graphics.Containers.Markdown
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
+        protected override SpriteText CreateSpriteText() => new OsuSpriteText
+        {
+            Font = OsuFont.GetFont(size: 14),
+        };
+
         protected override void AddLinkText(string text, LinkInline linkInline)
             => AddDrawable(new OsuMarkdownLinkText(text, linkInline));
 

From b97d3f2af1f64453a0ee0585d21e322b6dfc96fa Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 3 May 2021 09:35:26 +0700
Subject: [PATCH 09688/10326] add heading test scene

---
 .../UserInterface/TestSceneOsuMarkdownContainer.cs  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 99bbc22125..d64c243005 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -41,6 +41,19 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
         });
 
+        [Test]
+        public void TestHeading()
+        {
+            AddStep("Add Heading", () =>
+            {
+                markdownContainer.Text = @"# Header 1
+## Header 2
+### Header 3
+#### Header 4
+##### Header 5";
+            });
+        }
+
         [Test]
         public void TestLink()
         {

From b497785416df7d30523f11c37dd63f59766d370c Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 3 May 2021 09:35:55 +0700
Subject: [PATCH 09689/10326] add OsuMarkdownHeading

---
 .../Containers/Markdown/OsuMarkdownContainer.cs  |  2 ++
 .../Containers/Markdown/OsuMarkdownHeading.cs    | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index c4190d8c4f..3ad00e4df2 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
 
+        protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new OsuMarkdownHeading(headingBlock);
+
         protected override MarkdownFencedCodeBlock CreateFencedCodeBlock(FencedCodeBlock fencedCodeBlock) => new OsuMarkdownFencedCodeBlock(fencedCodeBlock);
 
         protected override MarkdownSeparator CreateSeparator(ThematicBreakBlock thematicBlock) => new OsuMarkdownSeparator();
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
new file mode 100644
index 0000000000..bff0413e56
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.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 Markdig.Syntax;
+using osu.Framework.Graphics.Containers.Markdown;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownHeading : MarkdownHeading
+    {
+        public OsuMarkdownHeading(HeadingBlock headingBlock)
+            : base(headingBlock)
+        {
+        }
+    }
+}

From 3e7df3bf026b205d2922192e16567ebb05bdb02b Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 3 May 2021 09:35:59 +0700
Subject: [PATCH 09690/10326] change heading font size

Heading 1 : 30px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/base.less#L12-L16

Heading 2 : 26px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L133-L134
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L169

Heading 3 : 20px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L147-L148
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L170
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L154

Heading 4 : 18px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L160-L161
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L171
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L153

Heading 5 : 16px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L174-L175
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L172
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L152

Heading 6 : 14px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L183-L184
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L173
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L150
---
 .../Containers/Markdown/OsuMarkdownHeading.cs | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
index bff0413e56..e7aa2b2512 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
@@ -12,5 +12,31 @@ namespace osu.Game.Graphics.Containers.Markdown
             : base(headingBlock)
         {
         }
+
+        protected override float GetFontSizeByLevel(int level)
+        {
+            const float base_font_size = 14;
+
+            switch (level)
+            {
+                case 1:
+                    return 30 / base_font_size;
+
+                case 2:
+                    return 26 / base_font_size;
+
+                case 3:
+                    return 20 / base_font_size;
+
+                case 4:
+                    return 18 / base_font_size;
+
+                case 5:
+                    return 16 / base_font_size;
+
+                default:
+                    return 1;
+            }
+        }
     }
 }

From 6da4105da6c4b2bcf53f5b2dbc61cfe5b22533c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 13:38:53 +0900
Subject: [PATCH 09691/10326] Remove Sync namespace (feels unnecessary)

---
 osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs        | 2 +-
 .../Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs         | 1 -
 .../Spectate/{Sync => }/CatchUpSpectatorPlayerClock.cs          | 2 +-
 .../Multiplayer/Spectate/{Sync => }/CatchUpSyncManager.cs       | 2 +-
 .../Multiplayer/Spectate/{Sync => }/ISpectatorPlayerClock.cs    | 2 +-
 .../OnlinePlay/Multiplayer/Spectate/{Sync => }/ISyncManager.cs  | 2 +-
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs     | 1 -
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs     | 1 -
 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs  | 1 -
 9 files changed, 5 insertions(+), 9 deletions(-)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{Sync => }/CatchUpSpectatorPlayerClock.cs (97%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{Sync => }/CatchUpSyncManager.cs (98%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{Sync => }/ISpectatorPlayerClock.cs (93%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{Sync => }/ISyncManager.cs (94%)

diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 75ba362146..d4e591cf09 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -6,7 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.OnlinePlay
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index a4856d1ee8..db431c0a82 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -17,7 +17,6 @@ using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Users;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSpectatorPlayerClock.cs
similarity index 97%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSpectatorPlayerClock.cs
index e2a6b7c9ae..9e1a020eca 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSpectatorPlayerClock.cs
@@ -7,7 +7,7 @@ using System;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     /// <summary>
     /// A <see cref="ISpectatorPlayerClock"/> which catches up using rate adjustment.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
similarity index 98%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
index 5912c0803b..6028bc84f7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     /// <summary>
     /// A <see cref="ISyncManager"/> which synchronises de-synced player clocks through catchup.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISpectatorPlayerClock.cs
similarity index 93%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISpectatorPlayerClock.cs
index 311969c92c..1a5231e602 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISpectatorPlayerClock.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     /// <summary>
     /// A clock which is used by <see cref="MultiSpectatorPlayer"/>s and managed by an <see cref="ISyncManager"/>.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISyncManager.cs
similarity index 94%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISyncManager.cs
index 1b83ea8cf3..bd698108f6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISyncManager.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     /// <summary>
     /// Manages the synchronisation between one or more <see cref="ISpectatorPlayerClock"/>s in relation to a master clock.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index a17519c3aa..0fe9e01d9d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index ef31a5a7f0..fd2c79f8e4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 89c69cc666..50b5fc2110 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -15,7 +15,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate

From 66ae6e58d18b8c1f5be9d73095c2ea9aac73791c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:01:10 +0900
Subject: [PATCH 09692/10326] Reword comment regarding LoadRequested special
 case to be easier to understand context

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index b8347d0537..e6ce135660 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -413,7 +413,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onLoadRequested()
         {
-            // If the user is spectating, the multi-spectator screen may still be the current screen.
+            // In the case of spectating, IMultiplayerClient.LoadRequested can be fired while the game is still spectating a previous session.
+            // For now, we want to game to switch to the new game so need to request exiting from the play screen.
             if (!ParentScreen.IsCurrentScreen())
             {
                 ParentScreen.MakeCurrent();

From dc5ee31d946918c2cbb2d0727e6039544b3a38d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:04:20 +0900
Subject: [PATCH 09693/10326] Use switch for screen construction

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs         | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index e6ce135660..ab22d40181 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -433,10 +433,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Debug.Assert(client.LocalUser != null);
 
-            if (client.LocalUser.State == MultiplayerUserState.Spectating)
-                return new MultiSpectatorScreen(client.CurrentMatchPlayingUserIds.ToArray());
+            int[] userIds = client.CurrentMatchPlayingUserIds.ToArray();
 
-            return new MultiplayerPlayer(SelectedItem.Value, client.CurrentMatchPlayingUserIds.ToArray());
+            switch (client.LocalUser.State)
+            {
+                case MultiplayerUserState.Spectating:
+                    return new MultiSpectatorScreen(userIds);
+
+                default:
+                    return new MultiplayerPlayer(SelectedItem.Value, userIds);
+            }
         }
 
         protected override void Dispose(bool isDisposing)

From c065092e72f67e41d02e6d3a75637f7722c26b4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:25:52 +0900
Subject: [PATCH 09694/10326] Fix weird access to userIds in
 `MultiplayerSpectatorScreen`

---
 .../Multiplayer/Spectate/MultiSpectatorScreen.cs | 16 ++++++----------
 osu.Game/Screens/Spectate/SpectatorScreen.cs     |  6 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index fd2c79f8e4..be4450787a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -27,8 +27,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// </summary>
         public bool AllPlayersLoaded => instances.All(p => p?.PlayerLoaded == true);
 
-        private readonly int[] userIds;
-
         [Resolved]
         private SpectatorStreamingClient spectatorClient { get; set; }
 
@@ -49,8 +47,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public MultiSpectatorScreen(int[] userIds)
             : base(userIds.Take(PlayerGrid.MAX_PLAYERS).ToArray())
         {
-            this.userIds = GetUserIds().ToArray();
-            instances = new PlayerArea[this.userIds.Length];
+            instances = new PlayerArea[UserIds.Count];
         }
 
         [BackgroundDependencyLoader]
@@ -84,9 +81,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 })
             };
 
-            for (int i = 0; i < userIds.Length; i++)
+            for (int i = 0; i < UserIds.Count; i++)
             {
-                grid.Add(instances[i] = new PlayerArea(userIds[i], masterClockContainer.GameplayClock));
+                grid.Add(instances[i] = new PlayerArea(UserIds[i], masterClockContainer.GameplayClock));
                 syncManager.AddPlayerClock(instances[i].GameplayClock);
             }
 
@@ -95,7 +92,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
             scoreProcessor.ApplyBeatmap(playableBeatmap);
 
-            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, userIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
+            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, UserIds.ToArray()) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
         protected override void LoadComplete()
@@ -130,7 +127,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         protected override void StartGameplay(int userId, GameplayState gameplayState)
         {
-            var instance = instances[getIndexForUser(userId)];
+            var instance = instances.Single(i => i.UserId == userId);
+
             instance.LoadScore(gameplayState.Score);
 
             syncManager.AddPlayerClock(instance.GameplayClock);
@@ -149,7 +147,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             multiplayerClient.ChangeState(MultiplayerUserState.Idle);
             return base.OnBackButton();
         }
-
-        private int getIndexForUser(int userId) => Array.IndexOf(userIds, userId);
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 4aca379ebe..bcebd51954 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using NuGet.Packaging;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -27,8 +26,9 @@ namespace osu.Game.Screens.Spectate
     /// </summary>
     public abstract class SpectatorScreen : OsuScreen
     {
-        protected IEnumerable<int> GetUserIds() => userIds;
-        private readonly HashSet<int> userIds = new HashSet<int>();
+        protected IReadOnlyList<int> UserIds => userIds;
+
+        private readonly List<int> userIds = new List<int>();
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }

From 8c9cfb63013df07e0942e07fdb10918299cc034d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:28:35 +0900
Subject: [PATCH 09695/10326] Remove unsafe access to Composer.HitObjects

---
 .../Edit/Compose/Components/EditorBlueprintContainer.cs    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 2a605f75d8..29dfff0e96 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -34,13 +34,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            // For non-pooled rulesets, hitobjects are already present in the playfield which allows the blueprints to be loaded in the async context.
-            if (Composer != null)
-            {
-                foreach (var obj in Composer.HitObjects)
-                    AddBlueprintFor(obj.HitObject);
-            }
-
             selectedHitObjects.BindTo(Beatmap.SelectedHitObjects);
             selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
             {

From 2aa21e2affb3f9993ec42b87228236e768aa7e05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:37:11 +0900
Subject: [PATCH 09696/10326] Adjust documentation in `CatchUpSyncManager`

---
 .../OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
index 6028bc84f7..efc12eaaa5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     public class CatchUpSyncManager : Component, ISyncManager
     {
         /// <summary>
-        /// The offset from the master clock to which player clocks should be synchronised to.
+        /// The offset from the master clock to which player clocks should remain within to be considered in-sync.
         /// </summary>
         public const double SYNC_TARGET = 16;
 
@@ -102,6 +102,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             for (int i = 0; i < playerClocks.Count; i++)
             {
                 var clock = playerClocks[i];
+
+                // How far this player's clock is out of sync, compared to the master clock.
+                // A negative value means the player is running fast (ahead); a positive value means the player is running behind (catching up).
                 double timeDelta = MasterClock.CurrentTime - clock.CurrentTime;
 
                 // Check that the player clock isn't too far ahead.

From b1a19b6dd6f6ea6782828fdd1cc23883bf9c947a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:41:55 +0900
Subject: [PATCH 09697/10326] Add xmldoc for `PlayerIsolationContainer`

---
 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 50b5fc2110..fe79e5db72 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -110,6 +110,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public override bool PropagatePositionalInputSubTree => false;
         public override bool PropagateNonPositionalInputSubTree => false;
 
+        /// <summary>
+        /// Isolates each player instance from the game-wide ruleset/beatmap/mods (to allow for different players having different settings).
+        /// </summary>
         private class PlayerIsolationContainer : Container
         {
             [Cached]

From 54abf8f6f685a31487579d5f5bde1db7d4d67479 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:48:04 +0900
Subject: [PATCH 09698/10326] Vertically centre leaderboard for now

---
 .../Multiplayer/Spectate/MultiSpectatorScreen.cs           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index be4450787a..8c7b7bab01 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -92,7 +92,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
             scoreProcessor.ApplyBeatmap(playableBeatmap);
 
-            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, UserIds.ToArray()) { Expanded = { Value = true } }, leaderboardContainer.Add);
+            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, UserIds.ToArray())
+            {
+                Expanded = { Value = true },
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+            }, leaderboardContainer.Add);
         }
 
         protected override void LoadComplete()

From f3b305bbe62f4501579cd36ca6e77c188fb344ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:58:23 +0900
Subject: [PATCH 09699/10326] Rename and improve xmldoc of `SkinEditorOverlay`

---
 osu.Game/OsuGame.cs                                        | 4 ++--
 .../{SkinEditorContainer.cs => SkinEditorOverlay.cs}       | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename osu.Game/Skinning/Editor/{SkinEditorContainer.cs => SkinEditorOverlay.cs} (91%)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 77fb9c3b63..d031a8e7fa 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -688,7 +688,7 @@ namespace osu.Game
             var changelogOverlay = loadComponentSingleFile(new ChangelogOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(userProfile = new UserProfileOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(beatmapSetOverlay = new BeatmapSetOverlay(), overlayContent.Add, true);
-            loadComponentSingleFile(skinEditor = new SkinEditorContainer(screenContainer), overlayContent.Add);
+            loadComponentSingleFile(skinEditor = new SkinEditorOverlay(screenContainer), overlayContent.Add);
 
             loadComponentSingleFile(new LoginOverlay
             {
@@ -946,7 +946,7 @@ namespace osu.Game
 
         private ScalingContainer screenContainer;
 
-        private SkinEditorContainer skinEditor;
+        private SkinEditorOverlay skinEditor;
 
         protected override bool OnExiting()
         {
diff --git a/osu.Game/Skinning/Editor/SkinEditorContainer.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
similarity index 91%
rename from osu.Game/Skinning/Editor/SkinEditorContainer.cs
rename to osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index adb1abefd1..06c6dffb60 100644
--- a/osu.Game/Skinning/Editor/SkinEditorContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -13,9 +13,10 @@ using osu.Game.Input.Bindings;
 namespace osu.Game.Skinning.Editor
 {
     /// <summary>
-    /// A container which handles loading a skin editor on user request.
+    /// A container which handles loading a skin editor on user request for a specified target.
+    /// This also handles the scaling / positioning adjustment of the target.
     /// </summary>
-    public class SkinEditorContainer : CompositeDrawable, IKeyBindingHandler<GlobalAction>
+    public class SkinEditorOverlay : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
         private readonly ScalingContainer target;
         private SkinEditor skinEditor;
@@ -25,7 +26,7 @@ namespace osu.Game.Skinning.Editor
         [Resolved]
         private OsuColour colours { get; set; }
 
-        public SkinEditorContainer(ScalingContainer target)
+        public SkinEditorOverlay(ScalingContainer target)
         {
             this.target = target;
             RelativeSizeAxes = Axes.Both;

From 3dd4b7b746ab72532ec0e5db0777edcce99afc6f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:08:34 +0900
Subject: [PATCH 09700/10326] Fix use of non-existent word in
 `OsuFocusedOverlayContainer` xmldoc

---
 osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index e168f265dd..c0518247a9 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Graphics.Containers
         protected override bool BlockNonPositionalInput => true;
 
         /// <summary>
-        /// Temporary to allow for overlays in the main screen content to not dim theirselves.
+        /// Temporary to allow for overlays in the main screen content to not dim themselves.
         /// Should be eventually replaced by dimming which is aware of the target dim container (traverse parent for certain interface type?).
         /// </summary>
         protected virtual bool DimMainContent => true;

From 01984de9c7ce603e063f914942775d55fe8793e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:13:32 +0900
Subject: [PATCH 09701/10326] Use existing `GetStateFromSelection` helper
 function

---
 .../Compose/Components/EditorSelectionHandler.cs   | 11 -----------
 .../Edit/Compose/Components/SelectionHandler.cs    | 11 +++++++++++
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs   | 14 +-------------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 0fc305dcc4..6ab4ca8267 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -108,17 +108,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        /// <summary>
-        /// Given a selection target and a function of truth, retrieve the correct ternary state for display.
-        /// </summary>
-        protected TernaryState GetStateFromSelection<T>(IEnumerable<T> selection, Func<T, bool> func)
-        {
-            if (selection.Any(func))
-                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
-
-            return TernaryState.False;
-        }
-
         #endregion
 
         #region Ternary state changes
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index cb3424a250..c0dbc5e7db 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -268,6 +268,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DeleteSelected();
         }
 
+        /// <summary>
+        /// Given a selection target and a function of truth, retrieve the correct ternary state for display.
+        /// </summary>
+        protected static TernaryState GetStateFromSelection<TObject>(IEnumerable<TObject> selection, Func<TObject, bool> func)
+        {
+            if (selection.Any(func))
+                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
+
+            return TernaryState.False;
+        }
+
         /// <summary>
         /// Called whenever the deletion of items has been requested.
         /// </summary>
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 0408ce74a6..044ad88333 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -53,21 +53,9 @@ namespace osu.Game.Skinning.Editor
 
                 return displayableAnchors.Select(a =>
                 {
-                    var countExisting = selection.Count(b => ((Drawable)b.Item).Anchor == a);
-                    var countTotal = selection.Count();
-
-                    TernaryState state;
-
-                    if (countExisting == countTotal)
-                        state = TernaryState.True;
-                    else if (countExisting > 0)
-                        state = TernaryState.Indeterminate;
-                    else
-                        state = TernaryState.False;
-
                     return new AnchorMenuItem(a, selection, _ => applyAnchor(a))
                     {
-                        State = { Value = state }
+                        State = { Value = GetStateFromSelection(selection, c => ((Drawable)c.Item).Anchor == a) }
                     };
                 });
             }

From a2faa0b74c5c10b89d5f06ded55abe6d68c9bfbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:13:53 +0900
Subject: [PATCH 09702/10326] Remove dead code

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 044ad88333..8792daef19 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -125,11 +125,6 @@ namespace osu.Game.Skinning.Editor
             {
             }
 
-            private void updateState(TernaryState obj)
-            {
-                throw new NotImplementedException();
-            }
-
             private static TernaryState getNextState(TernaryState state) => TernaryState.True;
         }
     }

From 51f4077b2714b61db68db48706546c86a1125238 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:15:00 +0900
Subject: [PATCH 09703/10326] Reorder methods in `SkinSelectionHandler` to
 follow standards

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 8792daef19..c7c0f45cc0 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -17,6 +17,46 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinSelectionHandler : SelectionHandler<ISkinnableComponent>
     {
+        public override bool HandleRotation(float angle)
+        {
+            // TODO: this doesn't correctly account for origin/anchor specs being different in a multi-selection.
+            foreach (var c in SelectedBlueprints)
+                ((Drawable)c.Item).Rotation += angle;
+
+            return base.HandleRotation(angle);
+        }
+
+        public override bool HandleScale(Vector2 scale, Anchor anchor)
+        {
+            adjustScaleFromAnchor(ref scale, anchor);
+
+            foreach (var c in SelectedBlueprints)
+                ((Drawable)c.Item).Scale += scale * 0.01f;
+
+            return true;
+        }
+
+        public override bool HandleMovement(MoveSelectionEvent<ISkinnableComponent> moveEvent)
+        {
+            foreach (var c in SelectedBlueprints)
+            {
+                Drawable drawable = (Drawable)c.Item;
+                drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
+            }
+
+            return true;
+        }
+
+        protected override void OnSelectionChanged()
+        {
+            base.OnSelectionChanged();
+
+            SelectionBox.CanRotate = true;
+            SelectionBox.CanScaleX = true;
+            SelectionBox.CanScaleY = true;
+            SelectionBox.CanReverse = false;
+        }
+
         protected override void DeleteItems(IEnumerable<ISkinnableComponent> items)
         {
             foreach (var i in items)
@@ -67,46 +107,6 @@ namespace osu.Game.Skinning.Editor
                 ((Drawable)item).Anchor = anchor;
         }
 
-        protected override void OnSelectionChanged()
-        {
-            base.OnSelectionChanged();
-
-            SelectionBox.CanRotate = true;
-            SelectionBox.CanScaleX = true;
-            SelectionBox.CanScaleY = true;
-            SelectionBox.CanReverse = false;
-        }
-
-        public override bool HandleRotation(float angle)
-        {
-            // TODO: this doesn't correctly account for origin/anchor specs being different in a multi-selection.
-            foreach (var c in SelectedBlueprints)
-                ((Drawable)c.Item).Rotation += angle;
-
-            return base.HandleRotation(angle);
-        }
-
-        public override bool HandleScale(Vector2 scale, Anchor anchor)
-        {
-            adjustScaleFromAnchor(ref scale, anchor);
-
-            foreach (var c in SelectedBlueprints)
-                ((Drawable)c.Item).Scale += scale * 0.01f;
-
-            return true;
-        }
-
-        public override bool HandleMovement(MoveSelectionEvent<ISkinnableComponent> moveEvent)
-        {
-            foreach (var c in SelectedBlueprints)
-            {
-                Drawable drawable = (Drawable)c.Item;
-                drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
-            }
-
-            return true;
-        }
-
         private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
         {
             // cancel out scale in axes we don't care about (based on which drag handle was used).

From f36684a070308f6068a709b68dba2d67906bb632 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:17:01 +0900
Subject: [PATCH 09704/10326] Guard against non-threadsafe transformation logic
 in `ScalingContainer`-

---
 osu.Game/Graphics/Containers/ScalingContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/ScalingContainer.cs b/osu.Game/Graphics/Containers/ScalingContainer.cs
index b691e372c5..2488fd14d0 100644
--- a/osu.Game/Graphics/Containers/ScalingContainer.cs
+++ b/osu.Game/Graphics/Containers/ScalingContainer.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers
                     return;
 
                 allowScaling = value;
-                updateSize();
+                if (IsLoaded) updateSize();
             }
         }
 

From df8609b3dc6307a7d9e91b5f6a2df13a2b5d824d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:15:50 +0900
Subject: [PATCH 09705/10326] Move private field for skin editor overlay to
 where others exist

---
 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 d031a8e7fa..b1173784b5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -80,6 +80,8 @@ namespace osu.Game
 
         private BeatmapSetOverlay beatmapSetOverlay;
 
+        private SkinEditorOverlay skinEditor;
+
         [Cached]
         private readonly DifficultyRecommender difficultyRecommender = new DifficultyRecommender();
 
@@ -946,8 +948,6 @@ namespace osu.Game
 
         private ScalingContainer screenContainer;
 
-        private SkinEditorOverlay skinEditor;
-
         protected override bool OnExiting()
         {
             if (ScreenStack.CurrentScreen is Loader)

From a298a930701b337248823aa901364786c4ef19d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:18:18 +0900
Subject: [PATCH 09706/10326] Remove redundant storage of blueprint's related
 item

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 491a403325..11409c46ab 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 
@@ -17,26 +16,20 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinBlueprint : SelectionBlueprint<ISkinnableComponent>
     {
-        /// <summary>
-        /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
-        /// </summary>
-        public readonly ISkinnableComponent Component;
-
         private Container box;
 
-        private Drawable drawable => (Drawable)Component;
+        private Drawable drawable => (Drawable)Item;
 
         /// <summary>
-        /// Whether the blueprint should be shown even when the <see cref="Component"/> is not alive.
+        /// Whether the blueprint should be shown even when the <see cref="SelectionBlueprint{T}.Item"/> is not alive.
         /// </summary>
         protected virtual bool AlwaysShowWhenSelected => false;
 
-        protected override bool ShouldBeAlive => (drawable.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
+        protected override bool ShouldBeAlive => (drawable.IsAlive && Item.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
 
         public SkinBlueprint(ISkinnableComponent component)
             : base(component)
         {
-            Component = component;
         }
 
         [BackgroundDependencyLoader]

From 7d8be8cd836dda2a401f4de40d70a680f7e6e958 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:20:00 +0900
Subject: [PATCH 09707/10326] Add comment about why we are running
 `checkForComponents` on a timer

---
 osu.Game/Skinning/Editor/SkinBlueprintContainer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index f2bc8ecddf..d9bfefe5f2 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Skinning.Editor
         {
             foreach (var c in target.ChildrenOfType<ISkinnableComponent>().ToArray()) AddBlueprintFor(c);
 
+            // We'd hope to eventually be running this in a more sensible way, but this handles situations where new drawables become present (ie. during ongoing gameplay)
+            // or when drawables in the target are loaded asynchronously and may not be immediately available when this BlueprintContainer is loaded.
             Scheduler.AddDelayed(checkForComponents, 1000);
         }
 

From 15603de6e946c4570cb3c9befc68114e162a0c11 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:24:51 +0900
Subject: [PATCH 09708/10326] Change scale multiplier to be closer to
 expectations

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index c7c0f45cc0..d09ba8af0e 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -31,7 +31,8 @@ namespace osu.Game.Skinning.Editor
             adjustScaleFromAnchor(ref scale, anchor);
 
             foreach (var c in SelectedBlueprints)
-                ((Drawable)c.Item).Scale += scale * 0.01f;
+                // TODO: this is temporary and will be fixed with a separate refactor of selection transform logic.
+                ((Drawable)c.Item).Scale += scale * 0.02f;
 
             return true;
         }

From 4cfa858dc4cd02cbf438ea9863d57a1c26568c63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:37:15 +0900
Subject: [PATCH 09709/10326] Fix tooltips displaying for hidden
 `SelectionHandler` content

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index c0dbc5e7db..053e532137 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -57,7 +57,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             RelativeSizeAxes = Axes.Both;
             AlwaysPresent = true;
-            Alpha = 0;
         }
 
         [BackgroundDependencyLoader]
@@ -318,7 +317,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
 
-            this.FadeTo(count > 0 ? 1 : 0);
+            content.FadeTo(count > 0 ? 1 : 0);
             OnSelectionChanged();
         }
 

From 839ac968a9623bbabaabf3ea1d5087ef78f0ad7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:37:15 +0900
Subject: [PATCH 09710/10326] Fix tooltips displaying for hidden
 `SelectionHandler` content

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 917cbca4e1..f207e27a5e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -58,7 +58,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             RelativeSizeAxes = Axes.Both;
             AlwaysPresent = true;
-            Alpha = 0;
         }
 
         [BackgroundDependencyLoader]
@@ -308,7 +307,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
 
-            this.FadeTo(count > 0 ? 1 : 0);
+            content.FadeTo(count > 0 ? 1 : 0);
             OnSelectionChanged();
         }
 

From 3268a75f05afc1515b3feb874a4aa72bfb1d0173 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 17:34:34 +0900
Subject: [PATCH 09711/10326] Remove intermediate container to fix tests

---
 .../Editing/TestSceneEditorClipboard.cs       |  4 +-
 .../Edit/Compose/Components/SelectionBox.cs   | 48 ++++++++++++++++---
 .../Compose/Components/SelectionHandler.cs    | 42 ++--------------
 3 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
index 3a063af843..3aff74a0a8 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -132,8 +132,8 @@ namespace osu.Game.Tests.Visual.Editing
             {
                 AddStep("deselect", () => EditorBeatmap.SelectedHitObjects.Clear());
 
-                AddUntilStep("timeline selection box is not visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha == 0);
-                AddUntilStep("composer selection box is not visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha == 0);
+                AddUntilStep("timeline selection box is not visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<SelectionBox>().First().Alpha == 0);
+                AddUntilStep("composer selection box is not visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<SelectionBox>().First().Alpha == 0);
             }
 
             AddStep("paste hitobject", () => Editor.Paste());
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 9d6b44e207..0d6cfc0689 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Input;
 
@@ -16,6 +17,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     public class SelectionBox : CompositeDrawable
     {
+        public const float BORDER_RADIUS = 3;
+
         public Func<float, bool> OnRotation;
         public Func<Vector2, Anchor, bool> OnScale;
         public Func<Direction, bool> OnFlip;
@@ -92,21 +95,32 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        private string text;
+
+        public string Text
+        {
+            get => text;
+            set
+            {
+                if (value == text)
+                    return;
+
+                text = value;
+                if (selectionDetailsText != null)
+                    selectionDetailsText.Text = value;
+            }
+        }
+
         private Container dragHandles;
         private FillFlowContainer buttons;
 
-        public const float BORDER_RADIUS = 3;
+        private OsuSpriteText selectionDetailsText;
 
         [Resolved]
         private OsuColour colours { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load()
-        {
-            RelativeSizeAxes = Axes.Both;
-
-            recreate();
-        }
+        private void load() => recreate();
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
@@ -144,6 +158,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             InternalChildren = new Drawable[]
             {
+                new Container
+                {
+                    Name = "info text",
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colours.YellowDark,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        selectionDetailsText = new OsuSpriteText
+                        {
+                            Padding = new MarginPadding(2),
+                            Colour = colours.Gray0,
+                            Font = OsuFont.Default.With(size: 11),
+                            Text = text,
+                        }
+                    }
+                },
                 new Container
                 {
                     Masking = true,
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index f207e27a5e..ce0a72a012 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -10,13 +10,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osuTK;
@@ -43,10 +41,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private readonly List<SelectionBlueprint<T>> selectedBlueprints;
 
-        private Drawable content;
-
-        private OsuSpriteText selectionDetailsText;
-
         protected SelectionBox SelectionBox { get; private set; }
 
         [Resolved(CanBeNull = true)]
@@ -63,33 +57,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            InternalChild = content = new Container
-            {
-                Children = new Drawable[]
-                {
-                    // todo: should maybe be inside the SelectionBox?
-                    new Container
-                    {
-                        Name = "info text",
-                        AutoSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                Colour = colours.YellowDark,
-                                RelativeSizeAxes = Axes.Both,
-                            },
-                            selectionDetailsText = new OsuSpriteText
-                            {
-                                Padding = new MarginPadding(2),
-                                Colour = colours.Gray0,
-                                Font = OsuFont.Default.With(size: 11)
-                            }
-                        }
-                    },
-                    SelectionBox = CreateSelectionBox(),
-                }
-            };
+            InternalChild = SelectionBox = CreateSelectionBox();
 
             SelectedItems.CollectionChanged += (sender, args) =>
             {
@@ -305,9 +273,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             int count = SelectedItems.Count;
 
-            selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
+            SelectionBox.Text = count > 0 ? count.ToString() : string.Empty;
 
-            content.FadeTo(count > 0 ? 1 : 0);
+            SelectionBox.FadeTo(count > 0 ? 1 : 0);
             OnSelectionChanged();
         }
 
@@ -334,8 +302,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             selectionRect = selectionRect.Inflate(5f);
 
-            content.Position = selectionRect.Location;
-            content.Size = selectionRect.Size;
+            SelectionBox.Position = selectionRect.Location;
+            SelectionBox.Size = selectionRect.Size;
         }
 
         #endregion

From 625890381f306823600468a8e590241ab88694d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 16:47:47 +0900
Subject: [PATCH 09712/10326] Update `ComboCounter` components to use DI to
 attach data source

---
 .../Visual/Gameplay/TestSceneComboCounter.cs  | 24 +++++++------------
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    | 12 ++++++----
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  | 20 ++++++----------
 .../Screens/Play/HUD/DefaultComboCounter.cs   |  7 +++++-
 .../Screens/Play/HUD/LegacyComboCounter.cs    |  6 +++--
 .../Screens/Play/HUD/SkinnableComboCounter.cs | 15 +-----------
 osu.Game/Screens/Play/HUDOverlay.cs           | 12 ++++------
 osu.Game/Screens/Play/Player.cs               |  2 ++
 8 files changed, 41 insertions(+), 57 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
index d0c2fb5064..b0a0b5189f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
@@ -4,9 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -17,31 +19,21 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create combo counters", () => SetContents(() =>
-            {
-                var comboCounter = new SkinnableComboCounter();
-                comboCounter.Current.Value = 1;
-                return comboCounter;
-            }));
+            AddStep("Create combo counters", () => SetContents(() => new SkinnableComboCounter()));
         }
 
         [Test]
         public void TestComboCounterIncrementing()
         {
-            AddRepeatStep("increase combo", () =>
-            {
-                foreach (var counter in comboCounters)
-                    counter.Current.Value++;
-            }, 10);
+            AddRepeatStep("increase combo", () => scoreProcessor.Combo.Value++, 10);
 
-            AddStep("reset combo", () =>
-            {
-                foreach (var counter in comboCounters)
-                    counter.Current.Value = 0;
-            });
+            AddStep("reset combo", () => scoreProcessor.Combo.Value = 0);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 3cefb8623f..55c681b605 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osuTK.Input;
 
@@ -19,6 +20,9 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private HUDOverlay hudOverlay;
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.KeyCounter;
         private FillFlowContainer<KeyCounter> keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().First();
@@ -31,9 +35,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             createNew();
 
-            AddRepeatStep("increase combo", () => { hudOverlay.ComboCounter.Current.Value++; }, 10);
+            AddRepeatStep("increase combo", () => { scoreProcessor.Combo.Value++; }, 10);
 
-            AddStep("reset combo", () => { hudOverlay.ComboCounter.Current.Value = 0; });
+            AddStep("reset combo", () => { scoreProcessor.Combo.Value = 0; });
         }
 
         [Test]
@@ -139,12 +143,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create overlay", () =>
             {
-                hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+                hudOverlay = new HUDOverlay(scoreProcessor, null, null, Array.Empty<Mod>());
 
                 // Add any key just to display the key counter visually.
                 hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
 
-                hudOverlay.ComboCounter.Current.Value = 1;
+                scoreProcessor.Combo.Value = 1;
 
                 action?.Invoke(hudOverlay);
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index fec1610160..8131c77b4b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -14,6 +14,7 @@ using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osuTK.Input;
 
@@ -23,6 +24,9 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private HUDOverlay hudOverlay;
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
 
         // best way to check without exposing.
@@ -37,17 +41,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             createNew();
 
-            AddRepeatStep("increase combo", () =>
-            {
-                foreach (var hud in hudOverlays)
-                    hud.ComboCounter.Current.Value++;
-            }, 10);
+            AddRepeatStep("increase combo", () => scoreProcessor.Combo.Value++, 10);
 
-            AddStep("reset combo", () =>
-            {
-                foreach (var hud in hudOverlays)
-                    hud.ComboCounter.Current.Value = 0;
-            });
+            AddStep("reset combo", () => scoreProcessor.Combo.Value = 0);
         }
 
         [Test]
@@ -80,13 +76,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 SetContents(() =>
                 {
-                    hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+                    hudOverlay = new HUDOverlay(scoreProcessor, null, null, Array.Empty<Mod>());
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
 
-                    hudOverlay.ComboCounter.Current.Value = 1;
-
                     action?.Invoke(hudOverlay);
 
                     return hudOverlay;
diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 63e7a88550..d0c26afe5e 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -24,7 +25,11 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours) => Colour = colours.BlueLighter;
+        private void load(OsuColour colours, ScoreProcessor scoreProcessor)
+        {
+            Colour = colours.BlueLighter;
+            Current.BindTo(scoreProcessor.Combo);
+        }
 
         protected override void Update()
         {
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index b4604c0d01..58a30aea94 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -79,7 +80,7 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(ScoreProcessor scoreProcessor)
         {
             InternalChildren = new[]
             {
@@ -95,7 +96,8 @@ namespace osu.Game.Screens.Play.HUD
                 },
             };
 
-            Current.ValueChanged += combo => updateCount(combo.NewValue == 0);
+            Current.BindTo(scoreProcessor.Combo);
+            Current.BindValueChanged(combo => updateCount(combo.NewValue == 0), true);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index c04c50141a..c62f1460c9 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -1,29 +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.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableComboCounter : SkinnableDrawable, IComboCounter
+    public class SkinnableComboCounter : SkinnableDrawable
     {
-        public Bindable<int> Current { get; } = new Bindable<int>();
-
         public SkinnableComboCounter()
             : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), skinComponent => new DefaultComboCounter())
         {
             CentreComponent = false;
         }
-
-        private IComboCounter skinnedCounter;
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            skinnedCounter = Drawable as IComboCounter;
-            skinnedCounter?.Current.BindTo(Current);
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 669c920017..83897c5167 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -34,7 +34,6 @@ namespace osu.Game.Screens.Play
         public float TopScoringElementsHeight { get; private set; }
 
         public readonly KeyCounterDisplay KeyCounter;
-        public readonly SkinnableComboCounter ComboCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
         public readonly SkinnableAccuracyCounter AccuracyCounter;
         public readonly SkinnableHealthDisplay HealthDisplay;
@@ -106,7 +105,7 @@ namespace osu.Game.Screens.Play
                                         HealthDisplay = CreateHealthDisplay(),
                                         AccuracyCounter = CreateAccuracyCounter(),
                                         ScoreCounter = CreateScoreCounter(),
-                                        ComboCounter = CreateComboCounter(),
+                                        CreateComboCounter(),
                                         HitErrorDisplay = CreateHitErrorDisplayOverlay(),
                                     }
                                 },
@@ -276,13 +275,13 @@ namespace osu.Game.Screens.Play
             Progress.BindDrawableRuleset(drawableRuleset);
         }
 
-        protected virtual SkinnableAccuracyCounter CreateAccuracyCounter() => new SkinnableAccuracyCounter();
+        protected SkinnableAccuracyCounter CreateAccuracyCounter() => new SkinnableAccuracyCounter();
 
-        protected virtual SkinnableScoreCounter CreateScoreCounter() => new SkinnableScoreCounter();
+        protected SkinnableScoreCounter CreateScoreCounter() => new SkinnableScoreCounter();
 
-        protected virtual SkinnableComboCounter CreateComboCounter() => new SkinnableComboCounter();
+        protected SkinnableComboCounter CreateComboCounter() => new SkinnableComboCounter();
 
-        protected virtual SkinnableHealthDisplay CreateHealthDisplay() => new SkinnableHealthDisplay();
+        protected SkinnableHealthDisplay CreateHealthDisplay() => new SkinnableHealthDisplay();
 
         protected virtual FailingLayer CreateFailingLayer() => new FailingLayer
         {
@@ -323,7 +322,6 @@ namespace osu.Game.Screens.Play
         {
             ScoreCounter?.Current.BindTo(processor.TotalScore);
             AccuracyCounter?.Current.BindTo(processor.Accuracy);
-            ComboCounter?.Current.BindTo(processor.Combo);
 
             if (HealthDisplay is IHealthDisplay shd)
             {
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 27a4fcc291..c9d7bbf4c1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -202,6 +202,8 @@ namespace osu.Game.Screens.Play
             ScoreProcessor.ApplyBeatmap(playableBeatmap);
             ScoreProcessor.Mods.BindTo(Mods);
 
+            dependencies.CacheAs(ScoreProcessor);
+
             HealthProcessor = ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
             HealthProcessor.ApplyBeatmap(playableBeatmap);
 

From 840c22a3b17bd01dea5b79c4a6bdd0e124b04241 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 3 May 2021 12:16:40 +0300
Subject: [PATCH 09713/10326] Add back mis-removed fade transform

---
 .../Compose/Components/SelectionBoxDragHandleContainer.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 151c169a33..7db2cdbbf5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (activeHandle?.InOperation == true || activeHandle?.IsHovered == true)
                 return;
 
-            displayedRotationHandle?.Hide();
+            displayedRotationHandle?.FadeOut(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
             displayedRotationHandle = null;
 
             activeHandle = allDragHandles.SingleOrDefault(h => h.InOperation);
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (activeHandle != null)
             {
                 displayedRotationHandle = getCorrespondingRotationHandle(activeHandle, rotationHandles);
-                displayedRotationHandle?.Show();
+                displayedRotationHandle?.FadeIn(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
             }
         }
 

From b28e1569caad7b6a1781dc32129f57a9d74cc92c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 20:09:48 +0900
Subject: [PATCH 09714/10326] Remove no-longer-relevant matching comment

---
 .../Screens/Edit/Compose/Components/EditorBlueprintContainer.cs  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 29dfff0e96..db322faf65 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -62,7 +62,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (Composer != null)
             {
-                // For pooled rulesets, blueprints must be added for hitobjects already "current" as they would've not been "current" during the async load addition process above.
                 foreach (var obj in Composer.HitObjects)
                     AddBlueprintFor(obj.HitObject);
 

From ca4b860920c2bd7f1efe518e65347904ab8fd7a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 20:11:24 +0900
Subject: [PATCH 09715/10326] Move `BindValueChanged` call to `LoadComplete`

---
 osu.Game/Screens/Play/HUD/LegacyComboCounter.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 58a30aea94..0bccbd0338 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -97,7 +97,6 @@ namespace osu.Game.Screens.Play.HUD
             };
 
             Current.BindTo(scoreProcessor.Combo);
-            Current.BindValueChanged(combo => updateCount(combo.NewValue == 0), true);
         }
 
         protected override void LoadComplete()
@@ -111,7 +110,7 @@ namespace osu.Game.Screens.Play.HUD
             popOutCount.Origin = Origin;
             popOutCount.Anchor = Anchor;
 
-            updateCount(false);
+            Current.BindValueChanged(combo => updateCount(combo.NewValue == 0), true);
         }
 
         private void updateCount(bool rolling)

From b9220d4dc728f681a16d6d4e664d4ae26a133951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 3 May 2021 15:57:57 +0200
Subject: [PATCH 09716/10326] Fix possible multiple enumeration

---
 .../UserInterface/TestSceneUpdateableBeatmapSetCover.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index ecb076d356..c928c0103f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -57,11 +57,13 @@ namespace osu.Game.Tests.Visual.UserInterface
                     }
                 };
 
-                var coverTypes = Enum.GetValues(typeof(BeatmapSetCoverType)).Cast<BeatmapSetCoverType>();
+                var coverTypes = Enum.GetValues(typeof(BeatmapSetCoverType))
+                                     .Cast<BeatmapSetCoverType>()
+                                     .ToList();
 
                 for (int i = 0; i < 25; i++)
                 {
-                    var coverType = coverTypes.ElementAt(i % coverTypes.Count());
+                    var coverType = coverTypes[i % coverTypes.Count];
 
                     var cover = new UpdateableBeatmapSetCover(coverType)
                     {

From 356b1e9a2dd3492039fd7f0bd1e1112856ca2e55 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 4 May 2021 05:43:59 +0700
Subject: [PATCH 09717/10326] add emphases test

---
 .../UserInterface/TestSceneOsuMarkdownContainer.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index d64c243005..9fb14efe4d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -41,6 +41,20 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
         });
 
+        [Test]
+        public void TestEmphases()
+        {
+            AddStep("Emphases", () =>
+            {
+                markdownContainer.Text = @"_italic with underscore_
+*italic with asterisk*
+__bold with underscore__
+**bold with asterisk**
+*__italic with asterisk, bold with underscore__*
+_**italic with underscore, bold with asterisk**_";
+            });
+        }
+
         [Test]
         public void TestHeading()
         {

From bfc328c5ab94eda41bfb5b81e84c66ca975373c0 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 4 May 2021 09:09:51 +0700
Subject: [PATCH 09718/10326] change font weight for bold text

---
 .../Containers/Markdown/OsuMarkdownTextFlowContainer.cs    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
index 5165fe74a2..517143c2db 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -26,5 +26,12 @@ namespace osu.Game.Graphics.Containers.Markdown
         // TODO : Add background (colour B6) and change font to monospace
         protected override void AddCodeInLine(CodeInline codeInline)
             => AddText(codeInline.Content, t => { t.Colour = colourProvider.Light1; });
+
+        protected override SpriteText CreateEmphasisedSpriteText(bool bold, bool italic)
+        {
+            var spriteText = CreateSpriteText();
+            spriteText.Font = spriteText.Font.With(weight: bold ? FontWeight.Bold : FontWeight.Regular, italics: italic);
+            return spriteText;
+        }
     }
 }

From 63381ff4f2a62335e851f266f84f8f422ec68e01 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 4 May 2021 09:34:21 +0700
Subject: [PATCH 09719/10326] change heading font weight

h1 and h2 : Semi Bold (600)
- https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L111
- https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L135

The rest of heading : Bold (700)
- https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L97
---
 .../Containers/Markdown/OsuMarkdownHeading.cs | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
index e7aa2b2512..f71c6753f4 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
@@ -3,16 +3,25 @@
 
 using Markdig.Syntax;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownHeading : MarkdownHeading
     {
+        private readonly int level;
+
         public OsuMarkdownHeading(HeadingBlock headingBlock)
             : base(headingBlock)
         {
+            level = headingBlock.Level;
         }
 
+        public override MarkdownTextFlowContainer CreateTextFlow() => new HeadingTextFlowContainer
+        {
+            Weight = GetFontWeightByLevel(level),
+        };
+
         protected override float GetFontSizeByLevel(int level)
         {
             const float base_font_size = 14;
@@ -38,5 +47,30 @@ namespace osu.Game.Graphics.Containers.Markdown
                     return 1;
             }
         }
+
+        protected virtual FontWeight GetFontWeightByLevel(int level)
+        {
+            switch (level)
+            {
+                case 1:
+                case 2:
+                    return FontWeight.SemiBold;
+
+                default:
+                    return FontWeight.Bold;
+            }
+        }
+
+        private class HeadingTextFlowContainer : OsuMarkdownTextFlowContainer
+        {
+            public FontWeight Weight { get; set; }
+
+            protected override SpriteText CreateSpriteText()
+            {
+                var spriteText = base.CreateSpriteText();
+                spriteText.Font = spriteText.Font.With(weight: Weight);
+                return spriteText;
+            }
+        }
     }
 }

From fd7a6b3a7c953c682154395abc517607dfff66bf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 3 May 2021 12:19:34 +0300
Subject: [PATCH 09720/10326] Finish transforms on controls load complete

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 38ed23fa13..9cba07e267 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -54,7 +54,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
             UpdateHoverState();
+            FinishTransforms(true);
         }
 
         protected override bool OnHover(HoverEvent e)

From 5f33c3514ec43a3df22ade1dc86e2a8b384c0c83 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 06:37:18 +0300
Subject: [PATCH 09721/10326] Move selection box control internal events to
 drag handles

---
 .../Compose/Components/SelectionBoxControl.cs |  7 -------
 .../Components/SelectionBoxDragHandle.cs      | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 9cba07e267..4406cc055d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -22,9 +22,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public event Action OperationStarted;
         public event Action OperationEnded;
 
-        internal event Action HoverGained;
-        internal event Action HoverLost;
-
         private Circle circle;
 
         /// <summary>
@@ -62,14 +59,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override bool OnHover(HoverEvent e)
         {
             UpdateHoverState();
-            HoverGained?.Invoke();
             return true;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            base.OnHoverLost(e);
-            HoverLost?.Invoke();
             UpdateHoverState();
         }
 
@@ -89,7 +83,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             HandlingMouse = false;
             UpdateHoverState();
-            base.OnMouseUp(e);
         }
 
         protected virtual void UpdateHoverState()
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
index d7e58df748..ed7c451b7e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -29,5 +29,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
             UpdateHoverState();
             base.OnDragEnd(e);
         }
+
+        #region Internal events for SelectionBoxDragHandleContainer
+
+        internal event Action HoverGained;
+        internal event Action HoverLost;
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            bool result = base.OnHover(e);
+            HoverGained?.Invoke();
+            return result;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            HoverLost?.Invoke();
+        }
+
+        #endregion
     }
 }

From b2a0c2b5631ac3a3e5d746909d141fafbf655ce3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 06:40:43 +0300
Subject: [PATCH 09722/10326] Consider drag handles active using mouse down
 instead of when dragged

---
 .../Compose/Components/SelectionBoxButton.cs  |  2 +-
 .../Compose/Components/SelectionBoxControl.cs | 29 +++++--------------
 .../Components/SelectionBoxDragHandle.cs      | 15 ++++++++++
 .../SelectionBoxDragHandleContainer.cs        |  8 ++---
 .../Components/SelectionBoxRotationHandle.cs  |  2 +-
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
index fbbebe3288..43cbbb617b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void UpdateHoverState()
         {
             base.UpdateHoverState();
-            icon.FadeColour(!HandlingMouse && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
+            icon.FadeColour(!IsHeld && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
         }
 
         public string TooltipText { get; }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 4406cc055d..159886648e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -25,9 +25,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private Circle circle;
 
         /// <summary>
-        /// Whether this control is currently being operated on by the user.
+        /// Whether the user is currently holding the control with mouse.
         /// </summary>
-        public bool InOperation { get; private set; }
+        public bool IsHeld { get; private set; }
 
         [Resolved]
         protected OsuColour Colours { get; private set; }
@@ -67,44 +67,31 @@ namespace osu.Game.Screens.Edit.Compose.Components
             UpdateHoverState();
         }
 
-        /// <summary>
-        /// Whether this control is currently handling mouse down input.
-        /// </summary>
-        protected bool HandlingMouse { get; private set; }
-
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            HandlingMouse = true;
+            IsHeld = true;
             UpdateHoverState();
             return true;
         }
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            HandlingMouse = false;
+            IsHeld = false;
             UpdateHoverState();
         }
 
         protected virtual void UpdateHoverState()
         {
-            if (HandlingMouse)
+            if (IsHeld)
                 circle.FadeColour(Colours.GrayF, TRANSFORM_DURATION, Easing.OutQuint);
             else
                 circle.FadeColour(IsHovered ? Colours.Red : Colours.YellowDark, TRANSFORM_DURATION, Easing.OutQuint);
 
-            this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, TRANSFORM_DURATION, Easing.OutQuint);
+            this.ScaleTo(IsHeld || IsHovered ? 1.5f : 1, TRANSFORM_DURATION, Easing.OutQuint);
         }
 
-        protected void OnOperationStarted()
-        {
-            InOperation = true;
-            OperationStarted?.Invoke();
-        }
+        protected void OnOperationStarted() => OperationStarted?.Invoke();
 
-        protected void OnOperationEnded()
-        {
-            InOperation = false;
-            OperationEnded?.Invoke();
-        }
+        protected void OnOperationEnded() => OperationEnded?.Invoke();
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
index ed7c451b7e..3c1741e24d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         internal event Action HoverGained;
         internal event Action HoverLost;
+        internal event Action MouseDown;
+        internal event Action MouseUp;
 
         protected override bool OnHover(HoverEvent e)
         {
@@ -48,6 +50,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
             HoverLost?.Invoke();
         }
 
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            bool result = base.OnMouseDown(e);
+            MouseDown?.Invoke();
+            return result;
+        }
+
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            base.OnMouseUp(e);
+            MouseUp?.Invoke();
+        }
+
         #endregion
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 7db2cdbbf5..c78514b7db 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -62,8 +62,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             handle.HoverGained += updateRotationHandlesVisibility;
             handle.HoverLost += updateRotationHandlesVisibility;
-            handle.OperationStarted += updateRotationHandlesVisibility;
-            handle.OperationEnded += updateRotationHandlesVisibility;
+            handle.MouseDown += updateRotationHandlesVisibility;
+            handle.MouseUp += updateRotationHandlesVisibility;
             allDragHandles.Add(handle);
         }
 
@@ -72,13 +72,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void updateRotationHandlesVisibility()
         {
-            if (activeHandle?.InOperation == true || activeHandle?.IsHovered == true)
+            if (activeHandle?.IsHeld == true || activeHandle?.IsHovered == true)
                 return;
 
             displayedRotationHandle?.FadeOut(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
             displayedRotationHandle = null;
 
-            activeHandle = allDragHandles.SingleOrDefault(h => h.InOperation);
+            activeHandle = allDragHandles.SingleOrDefault(h => h.IsHeld);
             activeHandle ??= allDragHandles.SingleOrDefault(h => h.IsHovered);
 
             if (activeHandle != null)
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index 6303caf9ed..65a54292ab 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void UpdateHoverState()
         {
             base.UpdateHoverState();
-            icon.FadeColour(!HandlingMouse && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
+            icon.FadeColour(!IsHeld && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
         }
     }
 }

From 8abff4881b731819535c9f603dc820c193abb010 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 07:31:52 +0300
Subject: [PATCH 09723/10326] Hide the corresponding rotation handle when
 holding scale handle

---
 .../Editing/TestSceneComposeSelectBox.cs      | 29 +++++++++++++++----
 .../SelectionBoxDragHandleContainer.cs        | 10 +++++--
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 914b8b6f27..efcd7864d7 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Threading;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 using osuTK.Input;
@@ -40,6 +41,7 @@ namespace osu.Game.Tests.Visual.Editing
             };
 
             InputManager.MoveMouseTo(selectionBox);
+            InputManager.ReleaseButton(MouseButton.Left);
         });
 
         private bool handleScale(Vector2 amount, Anchor reference)
@@ -127,26 +129,41 @@ namespace osu.Game.Tests.Visual.Editing
         }
 
         [Test]
-        public void TestDraggingScaleHandleKeepsCorrespondingRotationHandleShown()
+        public void TestHoldingScaleHandleHidesCorrespondingRotationHandle()
         {
             SelectionBoxRotationHandle rotationHandle = null;
 
             AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
 
             AddAssert("rotation handle hidden", () => rotationHandle.Alpha == 0);
-            AddStep("hover over and hold closest scale handle", () =>
+            AddStep("hover over closest scale handle", () =>
             {
                 InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == rotationHandle.Anchor));
-                InputManager.PressButton(MouseButton.Left);
             });
             AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
+            AddStep("hold scale handle", () => InputManager.PressButton(MouseButton.Left));
+            AddUntilStep("rotation handle hidden", () => rotationHandle.Alpha == 0);
 
-            AddStep("drag to centre", () => InputManager.MoveMouseTo(selectionBox));
-            AddAssert("rotation handle still shown", () => rotationHandle.Alpha > 0);
+            int i;
+            ScheduledDelegate mouseMove = null;
 
+            AddStep("start dragging", () =>
+            {
+                i = 0;
+
+                mouseMove = Scheduler.AddDelayed(() =>
+                {
+                    InputManager.MoveMouseTo(selectionBox.ScreenSpaceDrawQuad.TopLeft + Vector2.One * (5 * ++i));
+                }, 100, true);
+            });
+            AddAssert("rotation handle still hidden", () => rotationHandle.Alpha == 0);
+
+            AddStep("end dragging", () => mouseMove.Cancel());
+            AddAssert("rotation handle still hidden", () => rotationHandle.Alpha == 0);
             AddStep("unhold left", () => InputManager.ReleaseButton(MouseButton.Left));
+            AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
             AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox, new Vector2(20)));
-            AddUntilStep("handle hidden", () => rotationHandle.Alpha == 0);
+            AddUntilStep("rotation handle hidden", () => rotationHandle.Alpha == 0);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index c78514b7db..456f72878d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -72,13 +72,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void updateRotationHandlesVisibility()
         {
-            if (activeHandle?.IsHeld == true || activeHandle?.IsHovered == true)
+            // if the active handle is a rotation handle and is held or hovered,
+            // then no need to perform any updates to the rotation handles visibility.
+            if (activeHandle is SelectionBoxRotationHandle && (activeHandle?.IsHeld == true || activeHandle?.IsHovered == true))
                 return;
 
             displayedRotationHandle?.FadeOut(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
             displayedRotationHandle = null;
 
-            activeHandle = allDragHandles.SingleOrDefault(h => h.IsHeld);
+            // if the active handle is not a rotation handle but is held, then keep the rotation handle hidden.
+            if (activeHandle?.IsHeld == true)
+                return;
+
+            activeHandle = rotationHandles.SingleOrDefault(h => h.IsHeld || h.IsHovered);
             activeHandle ??= allDragHandles.SingleOrDefault(h => h.IsHovered);
 
             if (activeHandle != null)

From e00af3e71d2f2f754e641698dede05e3ac089b5b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 09:45:58 +0300
Subject: [PATCH 09724/10326] Add test coverage

---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index a42b7d54ee..2062c4b820 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
 
@@ -278,6 +280,38 @@ namespace osu.Game.Tests.NonVisual
             setTime(-100, -100);
         }
 
+        [Test]
+        public void TestReplayFrameSortStability()
+        {
+            const double repeating_time = 5000;
+
+            int data = 0;
+
+            // 1. add a range of frames in which some of them have the constant time 5000, all without any "data".
+            // 2. randomize the frames.
+            // 3. assign "data" to each frame in ascending order.
+            replay.Frames.AddRange(Enumerable.Range(1, 250).Select(i =>
+            {
+                if (RNG.NextBool())
+                    return new TestReplayFrame(repeating_time, true);
+                else
+                    return new TestReplayFrame(i * 1000, true);
+            }).OrderBy(_ => RNG.Next()).Select(f => new TestReplayFrame(f.Time, true, ++data)));
+
+            replay.HasReceivedAllFrames = true;
+
+            // create a new handler with the replay for the frames to be sorted.
+            handler = new TestInputHandler(replay);
+
+            // ensure sort stability by checking whether the "data" assigned to each time-repeated frame is in ascending order, as it was before sort.
+            var repeatingTimeFramesData = replay.Frames
+                                                .Cast<TestReplayFrame>()
+                                                .Where(f => f.Time == repeating_time)
+                                                .Select(f => f.Data);
+
+            Assert.That(repeatingTimeFramesData, Is.Ordered.Ascending);
+        }
+
         private void setReplayFrames()
         {
             replay.Frames = new List<ReplayFrame>
@@ -324,11 +358,13 @@ namespace osu.Game.Tests.NonVisual
         private class TestReplayFrame : ReplayFrame
         {
             public readonly bool IsImportant;
+            public readonly int Data;
 
-            public TestReplayFrame(double time, bool isImportant = false)
+            public TestReplayFrame(double time, bool isImportant = false, int data = 0)
                 : base(time)
             {
                 IsImportant = isImportant;
+                Data = data;
             }
         }
 

From 36438175a0f61efc7c990ad8cf0f127cd09078bc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:04:58 +0900
Subject: [PATCH 09725/10326] Throw an exception if try to modify lifetime of
 PoolableDrawableWithLifetime without lifetime

---
 .../Pooling/PoolableDrawableWithLifetime.cs       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index e94b6dca9d..d8565f4b30 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -3,6 +3,7 @@
 
 #nullable enable
 
+using System;
 using System.Diagnostics;
 using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Pooling;
@@ -31,7 +32,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
             get => Entry?.LifetimeStart ?? double.MinValue;
             set
             {
-                if (Entry != null) Entry.LifetimeStart = value;
+                if (LifetimeStart == value) return;
+
+                if (Entry == null)
+                    throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
+
+                Entry.LifetimeStart = value;
             }
         }
 
@@ -40,7 +46,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
             get => Entry?.LifetimeEnd ?? double.MaxValue;
             set
             {
-                if (Entry != null) Entry.LifetimeEnd = value;
+                if (LifetimeEnd == value) return;
+
+                if (Entry == null)
+                    throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
+
+                Entry.LifetimeEnd = value;
             }
         }
 

From ffc88db47aa7377e78a6db933723a314a937e933 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 May 2021 16:04:59 +0900
Subject: [PATCH 09726/10326] Implement Duration via the interface

---
 osu.Game/Storyboards/IStoryboardElementWithDuration.cs | 2 +-
 osu.Game/Storyboards/StoryboardSprite.cs               | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Storyboards/IStoryboardElementWithDuration.cs b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
index 02b438cb76..55f163ee07 100644
--- a/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Storyboards
         /// <summary>
         /// The duration of the StoryboardElement.
         /// </summary>
-        double Duration { get; }
+        double Duration => EndTime - StartTime;
     }
 }
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 0aaf264341..bf87e7d10e 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -65,8 +65,6 @@ namespace osu.Game.Storyboards
             }
         }
 
-        public double Duration => EndTime - StartTime;
-
         public bool HasCommands => TimelineGroup.HasCommands || loops.Any(l => l.HasCommands);
 
         private delegate void DrawablePropertyInitializer<in T>(Drawable drawable, T value);

From b30145de40646e893d3123133fd46d67e52c23b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 May 2021 16:35:50 +0900
Subject: [PATCH 09727/10326] Specify explicit primitive type

---
 osu.Game/Screens/Play/Player.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1a11adad30..d424f90079 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -640,7 +640,7 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
+            bool storyboardHasOutro = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
 
             if (storyboardHasOutro)
             {

From 4c7a4239f818662055b08f610b7ab588a3520042 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 May 2021 16:36:05 +0900
Subject: [PATCH 09728/10326] Fix `AllowGameplayOverlays` potentially not
 working for outro skip overlay

---
 osu.Game/Screens/Play/Player.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index d424f90079..6ed1a87d8a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -245,8 +245,6 @@ namespace osu.Game.Screens.Play
                 HUDOverlay.ShowHud.Value = false;
                 HUDOverlay.ShowHud.Disabled = true;
                 BreakOverlay.Hide();
-                skipIntroOverlay.Hide();
-                skipOutroOverlay.Hide();
             }
 
             DrawableRuleset.FrameStableClock.WaitingOnFrames.BindValueChanged(waiting =>
@@ -398,7 +396,7 @@ namespace osu.Game.Screens.Play
                 }
             };
 
-            if (!Configuration.AllowSkipping)
+            if (!Configuration.AllowSkipping || !DrawableRuleset.AllowGameplayOverlays)
             {
                 skipIntroOverlay.Expire();
                 skipOutroOverlay.Expire();

From b380be7169de5b4e2ca066d27fd5970a624e5cfb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 May 2021 16:43:51 +0900
Subject: [PATCH 09729/10326] Add xmldoc for `updateCompletionState`

---
 osu.Game/Screens/Play/Player.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 6ed1a87d8a..cf26bc479a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -582,6 +582,11 @@ namespace osu.Game.Screens.Play
         private ScheduledDelegate completionProgressDelegate;
         private Task<ScoreInfo> prepareScoreForDisplayTask;
 
+        /// <summary>
+        /// Handles changes in player state which may progress the completion of gameplay / this screen's lifetime.
+        /// </summary>
+        /// <param name="skipStoryboardOutro">If in a state where a storyboard outro is to be played, offers the choice of skipping beyond it.</param>
+        /// <exception cref="InvalidOperationException">Thrown if this method is called more than once without changing state.</exception>
         private void updateCompletionState(bool skipStoryboardOutro = false)
         {
             // screen may be in the exiting transition phase.

From 913fc8c3bc9eb4c37a0ff66bdccb5e90754dcf8a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:44:48 +0900
Subject: [PATCH 09730/10326] Revert the change of not adding non-pooled DHO to
 HOC until alive

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 78 +++++++++++++---------
 1 file changed, 48 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 1d32313f2b..dcf350cbd4 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// All alive entries and <see cref="DrawableHitObject"/>s used by the entries.
         /// </summary>
-        public IEnumerable<(HitObjectLifetimeEntry Entry, DrawableHitObject Drawable)> AliveEntries => drawableMap.Select(x => (x.Key, x.Value));
+        public IEnumerable<(HitObjectLifetimeEntry Entry, DrawableHitObject Drawable)> AliveEntries => aliveDrawableMap.Select(x => (x.Key, x.Value));
 
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.UI
 
         private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
 
-        private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> drawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
+        private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> aliveDrawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> nonPooledDrawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
 
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
@@ -108,55 +108,70 @@ namespace osu.Game.Rulesets.UI
         public bool Remove(HitObjectLifetimeEntry entry)
         {
             if (!lifetimeManager.RemoveEntry(entry)) return false;
-            // The entry has to be removed from the non-pooled map here because non-pooled entry may be removed by specifying its entry.
-            nonPooledDrawableMap.Remove(entry);
+
+            // This logic is not in `Remove(DrawableHitObject)` because a non-pooled drawable may be removed by specifying its entry.
+            if (nonPooledDrawableMap.Remove(entry, out var drawable))
+                removeDrawable(drawable);
+
             allEntries.Remove(entry);
             return true;
         }
 
-        private void entryBecameAlive(LifetimeEntry entry) => addDrawable((HitObjectLifetimeEntry)entry);
-
-        private void entryBecameDead(LifetimeEntry entry) => removeDrawable((HitObjectLifetimeEntry)entry);
-
-        private void addDrawable(HitObjectLifetimeEntry entry)
+        private void entryBecameAlive(LifetimeEntry lifetimeEntry)
         {
-            Debug.Assert(!drawableMap.ContainsKey(entry));
+            var entry = (HitObjectLifetimeEntry)lifetimeEntry;
+            Debug.Assert(!aliveDrawableMap.ContainsKey(entry));
 
-            nonPooledDrawableMap.TryGetValue(entry, out var drawable);
+            bool isNonPooled = nonPooledDrawableMap.TryGetValue(entry, out var drawable);
             drawable ??= pooledObjectProvider?.GetPooledDrawableRepresentation(entry.HitObject, null);
             if (drawable == null)
                 throw new InvalidOperationException($"A drawable representation could not be retrieved for hitobject type: {entry.HitObject.GetType().ReadableName()}.");
 
+            aliveDrawableMap[entry] = drawable;
+            OnAdd(drawable);
+
+            if (isNonPooled) return;
+
+            addDrawable(drawable);
+            HitObjectUsageBegan?.Invoke(entry.HitObject);
+        }
+
+        private void entryBecameDead(LifetimeEntry lifetimeEntry)
+        {
+            var entry = (HitObjectLifetimeEntry)lifetimeEntry;
+            Debug.Assert(aliveDrawableMap.ContainsKey(entry));
+
+            var drawable = aliveDrawableMap[entry];
+            bool isNonPooled = nonPooledDrawableMap.ContainsKey(entry);
+
+            drawable.OnKilled();
+            aliveDrawableMap.Remove(entry);
+            OnRemove(drawable);
+
+            if (isNonPooled) return;
+
+            removeDrawable(drawable);
+            // The hit object is not freed when the DHO was not pooled.
+            HitObjectUsageFinished?.Invoke(entry.HitObject);
+        }
+
+        private void addDrawable(DrawableHitObject drawable)
+        {
             drawable.OnNewResult += onNewResult;
             drawable.OnRevertResult += onRevertResult;
 
             bindStartTime(drawable);
-            AddInternal(drawableMap[entry] = drawable);
-            OnAdd(drawable);
-
-            HitObjectUsageBegan?.Invoke(entry.HitObject);
+            AddInternal(drawable);
         }
 
-        private void removeDrawable(HitObjectLifetimeEntry entry)
+        private void removeDrawable(DrawableHitObject drawable)
         {
-            Debug.Assert(drawableMap.ContainsKey(entry));
-
-            var drawable = drawableMap[entry];
-
-            // OnKilled can potentially change the hitobject's result, so it needs to run first before unbinding.
-            drawable.OnKilled();
             drawable.OnNewResult -= onNewResult;
             drawable.OnRevertResult -= onRevertResult;
 
-            drawableMap.Remove(entry);
-
-            OnRemove(drawable);
             unbindStartTime(drawable);
-            RemoveInternal(drawable);
 
-            // The hit object is not freed when the DHO was not pooled.
-            if (!nonPooledDrawableMap.ContainsKey(entry))
-                HitObjectUsageFinished?.Invoke(entry.HitObject);
+            RemoveInternal(drawable);
         }
 
         #endregion
@@ -169,6 +184,7 @@ namespace osu.Game.Rulesets.UI
                 throw new InvalidOperationException($"May not add a {nameof(DrawableHitObject)} without {nameof(HitObject)} associated");
 
             nonPooledDrawableMap.Add(drawable.Entry, drawable);
+            addDrawable(drawable);
             Add(drawable.Entry);
         }
 
@@ -217,8 +233,10 @@ namespace osu.Game.Rulesets.UI
         public virtual void Clear()
         {
             lifetimeManager.ClearEntries();
+            foreach (var drawable in nonPooledDrawableMap.Values)
+                removeDrawable(drawable);
             nonPooledDrawableMap.Clear();
-            Debug.Assert(InternalChildren.Count == 0 && startTimeMap.Count == 0 && drawableMap.Count == 0, "All hit objects should have been removed");
+            Debug.Assert(InternalChildren.Count == 0 && startTimeMap.Count == 0 && aliveDrawableMap.Count == 0, "All hit objects should have been removed");
         }
 
         protected override bool CheckChildrenLife()

From 39bccc50489cf502c367891dc0a4071cec4c1dfc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:45:24 +0900
Subject: [PATCH 09731/10326] Revert "Adopt HitObjectContainer change in a
 test"

This reverts commit f55aa016
---
 osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
index 8f3d3f1276..f2bfccb6de 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
@@ -4,7 +4,6 @@
 using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -20,14 +19,7 @@ namespace osu.Game.Tests.Gameplay
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Child = container = new HitObjectContainer
-            {
-                Clock = new FramedClock(new ManualClock
-                {
-                    // Make sure hit objects with `StartTime == 0` are alive
-                    CurrentTime = -1
-                })
-            };
+            Child = container = new HitObjectContainer();
         });
 
         [Test]

From 787bfd6bd08a4afaea8e937ab327445199572948 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:45:39 +0900
Subject: [PATCH 09732/10326] Revert "Fix failing taiko tests"

This reverts commit 971ca398
---
 .../TestSceneFlyingHits.cs                       | 16 ++++++++--------
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs   |  8 ++------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
index 5738be05d7..63854e7ead 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
@@ -20,19 +20,20 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [TestCase(HitType.Rim)]
         public void TestFlyingHits(HitType hitType)
         {
+            DrawableFlyingHit flyingHit = null;
+
             AddStep("add flying hit", () =>
             {
                 addFlyingHit(hitType);
-            });
 
-            AddAssert("hit type is correct", () =>
-            {
                 // flying hits all land in one common scrolling container (and stay there for rewind purposes),
                 // so we need to manually get the latest one.
-                return this.ChildrenOfType<DrawableFlyingHit>()
-                           .OrderByDescending(h => h.HitObject.StartTime)
-                           .FirstOrDefault()?.HitObject.Type == hitType;
+                flyingHit = this.ChildrenOfType<DrawableFlyingHit>()
+                                .OrderByDescending(h => h.HitObject.StartTime)
+                                .FirstOrDefault();
             });
+
+            AddAssert("hit type is correct", () => flyingHit.HitObject.Type == hitType);
         }
 
         private void addFlyingHit(HitType hitType)
@@ -41,8 +42,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableDrumRollTick h;
             DrawableRuleset.Playfield.Add(h = new DrawableDrumRollTick(tick) { JudgementType = hitType });
-            h.OnLoadComplete += _ =>
-                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Great });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Great });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 06acdad3d6..87c936d386 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -129,12 +129,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableRuleset.Playfield.Add(h);
 
-            h.OnLoadComplete += _ =>
-            {
-                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
-                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(),
-                    new JudgementResult(hit.NestedHitObjects.Single(), new TaikoStrongJudgement()) { Type = HitResult.Great });
-            };
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(), new JudgementResult(hit.NestedHitObjects.Single(), new TaikoStrongJudgement()) { Type = HitResult.Great });
         }
 
         private void addMissJudgement()

From 4a93e27e8394ed5d347ca06989951319afb6e6c4 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:46:30 +0900
Subject: [PATCH 09733/10326] Revert "Fix mania editor null reference"

This reverts commit 1d023dce
---
 .../Edit/Blueprints/ManiaSelectionBlueprint.cs                 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 8f8f45c0dd..384f49d9b2 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -18,9 +18,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        // Overriding the base because this method is called right after `Column` is changed and `DrawableObject` is not yet loaded and Parent is not set.
-        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Parent.ToLocalSpace(screenSpacePosition) - Position;
-
         protected ManiaSelectionBlueprint(DrawableHitObject drawableObject)
             : base(drawableObject)
         {

From 18779b1d1e8fa6d6b9fdb4e0d389b8b7f0d08d54 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 May 2021 16:48:13 +0900
Subject: [PATCH 09734/10326] Cache last event time value to avoid super
 expensive LINQ

---
 .../Drawables/DrawableStoryboard.cs           | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index a9a8b8a4ac..4c42823779 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -20,6 +20,13 @@ namespace osu.Game.Storyboards.Drawables
         [Cached]
         public Storyboard Storyboard { get; }
 
+        /// <summary>
+        /// Whether the storyboard is considered finished.
+        /// </summary>
+        public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
+
+        private readonly BindableBool hasStoryboardEnded = new BindableBool();
+
         protected override Container<DrawableStoryboardLayer> Content { get; }
 
         protected override Vector2 DrawScale => new Vector2(Parent.DrawHeight / 480);
@@ -40,6 +47,8 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveCompletedTransforms => false;
 
+        private double? lastEventEndTime;
+
         private DependencyContainer dependencies;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
@@ -74,6 +83,14 @@ namespace osu.Game.Storyboards.Drawables
 
                 Add(layer.CreateDrawable());
             }
+
+            lastEventEndTime = Storyboard.LatestEventTime;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            hasStoryboardEnded.Value = lastEventEndTime == null || Time.Current >= lastEventEndTime;
         }
 
         public DrawableStoryboardLayer OverlayLayer => Children.Single(layer => layer.Name == "Overlay");
@@ -83,25 +100,5 @@ namespace osu.Game.Storyboards.Drawables
             foreach (var layer in Children)
                 layer.Enabled = passing ? layer.Layer.VisibleWhenPassing : layer.Layer.VisibleWhenFailing;
         }
-
-        protected override void Update()
-        {
-            base.Update();
-            updateHasStoryboardEnded();
-        }
-
-        /// <summary>
-        /// Whether the storyboard is considered finished.
-        /// </summary>
-        public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
-
-        private readonly BindableBool hasStoryboardEnded = new BindableBool();
-
-        private void updateHasStoryboardEnded()
-        {
-            hasStoryboardEnded.Value =
-                Storyboard.LatestEventTime == null ||
-                Time.Current >= Storyboard.LatestEventTime;
-        }
     }
 }

From aa42cf2fc055eeee7a01188fbf61ef3735651dd3 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:56:48 +0900
Subject: [PATCH 09735/10326] Fix setting lifetime during KeepAlive is ignored

---
 .../Pooling/PoolableDrawableWithLifetime.cs        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index d8565f4b30..ed0430012a 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -32,12 +32,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             get => Entry?.LifetimeStart ?? double.MinValue;
             set
             {
-                if (LifetimeStart == value) return;
-
-                if (Entry == null)
+                if (Entry == null && LifetimeStart != value)
                     throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
 
-                Entry.LifetimeStart = value;
+                if (Entry != null)
+                    Entry.LifetimeStart = value;
             }
         }
 
@@ -46,12 +45,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             get => Entry?.LifetimeEnd ?? double.MaxValue;
             set
             {
-                if (LifetimeEnd == value) return;
-
-                if (Entry == null)
+                if (Entry == null && LifetimeEnd != value)
                     throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
 
-                Entry.LifetimeEnd = value;
+                if (Entry != null)
+                    Entry.LifetimeEnd = value;
             }
         }
 

From acc9258eb217dfd04dfdc71f32498df3884caba6 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 4 May 2021 00:59:22 -0700
Subject: [PATCH 09736/10326] Implement notes for settings

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 33 +++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 0bd9750b0b..1d6535c289 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -19,6 +19,7 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Settings
 {
@@ -36,6 +37,8 @@ namespace osu.Game.Overlays.Settings
 
         private SpriteText labelText;
 
+        private readonly OsuTextFlowContainer noteText;
+
         public bool ShowsDefaultIndicator = true;
 
         public string TooltipText { get; set; }
@@ -57,6 +60,19 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
+        /// <summary>
+        /// Text to be displayed at the bottom of this <see cref="SettingsItem{T}"/>.
+        /// Used for further explanation or indicating drawbacks of the current setting.
+        /// </summary>
+        public string NoteText
+        {
+            set
+            {
+                noteText.Alpha = 1;
+                noteText.Text = value;
+            }
+        }
+
         public virtual Bindable<T> Current
         {
             get => controlWithCurrent.Current;
@@ -92,7 +108,16 @@ namespace osu.Game.Overlays.Settings
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Padding = new MarginPadding { Left = SettingsPanel.CONTENT_MARGINS },
-                    Child = Control = CreateControl()
+                    Children = new[]
+                    {
+                        Control = CreateControl(),
+                        noteText = new OsuTextFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Alpha = 0,
+                        },
+                    },
                 },
             };
 
@@ -108,6 +133,12 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            noteText.Colour = colours.Yellow;
+        }
+
         private void updateDisabled()
         {
             if (labelText != null)

From 796bd8e47eab8b8268bcbecae9349539b99d85a3 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 4 May 2021 00:59:48 -0700
Subject: [PATCH 09737/10326] Add existing setting notes from stable

---
 .../Settings/Sections/Graphics/LayoutSettings.cs |  9 ++++++++-
 .../Sections/Graphics/RendererSettings.cs        | 16 +++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 4d5c2e06eb..a24dd1f64b 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -141,7 +141,14 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
 
-            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
+            windowModeDropdown.Current.BindValueChanged(mode =>
+            {
+                updateResolutionDropdown();
+
+                const string not_fullscreen_note = "Running without fullscreen mode will increase your input latency!";
+
+                windowModeDropdown.NoteText = mode.NewValue != WindowMode.Fullscreen ? not_fullscreen_note : string.Empty;
+            }, true);
 
             windowModes.BindCollectionChanged((sender, args) =>
             {
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index 8773e6763c..3ad201640d 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
     {
         protected override string Header => "Renderer";
 
+        private SettingsEnumDropdown<FrameSync> frameLimiterDropdown;
+
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager config, OsuConfigManager osuConfig)
         {
@@ -20,7 +22,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             Children = new Drawable[]
             {
                 // TODO: this needs to be a custom dropdown at some point
-                new SettingsEnumDropdown<FrameSync>
+                frameLimiterDropdown = new SettingsEnumDropdown<FrameSync>
                 {
                     LabelText = "Frame limiter",
                     Current = config.GetBindable<FrameSync>(FrameworkSetting.FrameSync)
@@ -37,5 +39,17 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 },
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            frameLimiterDropdown.Current.BindValueChanged(limit =>
+            {
+                const string unlimited_frames_note = "Using unlimited frame limiter can lead to stutters. \"2x refresh rate\" is recommended.";
+
+                frameLimiterDropdown.NoteText = limit.NewValue == FrameSync.Unlimited ? unlimited_frames_note : string.Empty;
+            }, true);
+        }
     }
 }

From 0a649227385b82fb95787e2fd8989fae1fca258a Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 4 May 2021 01:00:35 -0700
Subject: [PATCH 09738/10326] Add supporter note to background source setting

---
 .../UserInterface/MainMenuSettings.cs         | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 95e2e9da30..707f8cd314 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -2,8 +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.Game.Configuration;
+using osu.Game.Online.API;
+using osu.Game.Users;
 
 namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
@@ -11,9 +14,15 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
     {
         protected override string Header => "Main Menu";
 
+        private IBindable<User> user;
+
+        private SettingsEnumDropdown<BackgroundSource> backgroundSourceDropdown;
+
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, IAPIProvider api)
         {
+            user = api.LocalUser.GetBoundCopy();
+
             Children = new Drawable[]
             {
                 new SettingsCheckbox
@@ -31,7 +40,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
                     LabelText = "Intro sequence",
                     Current = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence),
                 },
-                new SettingsEnumDropdown<BackgroundSource>
+                backgroundSourceDropdown = new SettingsEnumDropdown<BackgroundSource>
                 {
                     LabelText = "Background source",
                     Current = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
@@ -43,5 +52,17 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
                 }
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            backgroundSourceDropdown.Current.BindValueChanged(source =>
+            {
+                const string not_supporter_note = "Changes to this setting will only apply with an active osu!supporter tag.";
+
+                backgroundSourceDropdown.NoteText = user.Value?.IsSupporter == false ? not_supporter_note : string.Empty;
+            }, true);
+        }
     }
 }

From a5842130027d8e9560c9311e997c4916ebc35ba7 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 4 May 2021 09:11:33 -0700
Subject: [PATCH 09739/10326] Use vertical padding instead of relative height
 for default button

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 1d6535c289..6405431f6b 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -18,7 +18,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osuTK;
 using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Settings
@@ -172,6 +171,7 @@ namespace osu.Game.Overlays.Settings
             {
                 RelativeSizeAxes = Axes.Y;
                 Width = SettingsPanel.CONTENT_MARGINS;
+                Padding = new MarginPadding { Vertical = 1.5f };
                 Alpha = 0f;
             }
 
@@ -194,7 +194,7 @@ namespace osu.Game.Overlays.Settings
                         Type = EdgeEffectType.Glow,
                         Radius = 2,
                     },
-                    Size = new Vector2(0.33f, 0.8f),
+                    Width = 0.33f,
                     Child = new Box { RelativeSizeAxes = Axes.Both },
                 };
             }

From 040d393dd462931068601879ba7fc0b09f597136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 May 2021 21:00:12 +0200
Subject: [PATCH 09740/10326] Add visual test case for crossfade behaviour

---
 .../TestSceneUpdateableBeatmapSetCover.cs     | 47 +++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index c928c0103f..4fef93e291 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -108,14 +108,52 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("no cover added", () => !updateableCover.ChildrenOfType<DelayedLoadUnloadWrapper>().Any());
         }
 
+        [Test]
+        public void TestCoverChangeOnNewBeatmap()
+        {
+            TestUpdateableBeatmapSetCover updateableCover = null;
+            BeatmapSetCover initialCover = null;
+
+            AddStep("setup cover", () => Child = updateableCover = new TestUpdateableBeatmapSetCover(0)
+            {
+                BeatmapSet = createBeatmapWithCover("https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg"),
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                Alpha = 0.4f
+            });
+
+            AddUntilStep("cover loaded", () => updateableCover.ChildrenOfType<BeatmapSetCover>().Any());
+            AddStep("store initial cover", () => initialCover = updateableCover.ChildrenOfType<BeatmapSetCover>().Single());
+            AddUntilStep("wait for fade complete", () => initialCover.Alpha == 1);
+
+            AddStep("switch beatmap",
+                () => updateableCover.BeatmapSet = createBeatmapWithCover("https://assets.ppy.sh/beatmaps/1079428/covers/cover.jpg"));
+            AddUntilStep("new cover loaded", () => updateableCover.ChildrenOfType<BeatmapSetCover>().Except(new[] { initialCover }).Any());
+        }
+
+        private static BeatmapSetInfo createBeatmapWithCover(string coverUrl) => new BeatmapSetInfo
+        {
+            OnlineInfo = new BeatmapSetOnlineInfo
+            {
+                Covers = new BeatmapSetOnlineCovers { Cover = coverUrl }
+            }
+        };
+
         private class TestUpdateableBeatmapSetCover : UpdateableBeatmapSetCover
         {
+            private readonly int loadDelay;
+
+            public TestUpdateableBeatmapSetCover(int loadDelay = 10000)
+            {
+                this.loadDelay = loadDelay;
+            }
+
             protected override Drawable CreateDrawable(BeatmapSetInfo model)
             {
                 if (model == null)
                     return null;
 
-                return new TestBeatmapSetCover(model)
+                return new TestBeatmapSetCover(model, loadDelay)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -127,15 +165,18 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestBeatmapSetCover : BeatmapSetCover
         {
-            public TestBeatmapSetCover(BeatmapSetInfo set)
+            private readonly int loadDelay;
+
+            public TestBeatmapSetCover(BeatmapSetInfo set, int loadDelay)
                 : base(set)
             {
+                this.loadDelay = loadDelay;
             }
 
             [BackgroundDependencyLoader]
             private void load()
             {
-                Thread.Sleep(10000);
+                Thread.Sleep(loadDelay);
             }
         }
     }

From 32b3ea70b966e4087d70d72f1306f55b4fa8b264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 May 2021 21:12:50 +0200
Subject: [PATCH 09741/10326] Fix both covers showing if cover is not fully
 opaque

---
 osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index 3a4423e42e..b376690436 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -41,6 +41,10 @@ namespace osu.Game.Beatmaps.Drawables
         protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
             => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad);
 
+        // by default, ModelBackedDrawable hides the old drawable only after the new one has been fully loaded.
+        // this can lead to weird appearance if the cover is not fully opaque, so fade out as soon as a new load is requested in this particular case.
+        protected override void OnLoadStarted() => ApplyHideTransforms(DisplayedDrawable);
+
         protected override Drawable CreateDrawable(BeatmapSetInfo model)
         {
             if (model == null)

From 4ceb9b1562e52475ba8da9652bd2d31501983ef3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 23:36:14 +0300
Subject: [PATCH 09742/10326] Avoid randomizing and overestimating logic with
 simple hardcoding

Not sure what was in my mind while I was pushing that..
---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index 2062c4b820..fe1186bf95 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
 
@@ -281,26 +280,39 @@ namespace osu.Game.Tests.NonVisual
         }
 
         [Test]
-        public void TestReplayFrameSortStability()
+        public void TestReplayFramesSortStability()
         {
             const double repeating_time = 5000;
 
-            int data = 0;
-
-            // 1. add a range of frames in which some of them have the constant time 5000, all without any "data".
-            // 2. randomize the frames.
-            // 3. assign "data" to each frame in ascending order.
-            replay.Frames.AddRange(Enumerable.Range(1, 250).Select(i =>
+            // add a range of frames randomized in time but have a "data" assigned to them in ascending order.
+            replay.Frames.AddRange(new[]
             {
-                if (RNG.NextBool())
-                    return new TestReplayFrame(repeating_time, true);
-                else
-                    return new TestReplayFrame(i * 1000, true);
-            }).OrderBy(_ => RNG.Next()).Select(f => new TestReplayFrame(f.Time, true, ++data)));
+                new TestReplayFrame(repeating_time, true, 0),
+                new TestReplayFrame(0, true, 1),
+                new TestReplayFrame(3000, true, 2),
+                new TestReplayFrame(repeating_time, true, 3),
+                new TestReplayFrame(repeating_time, true, 4),
+                new TestReplayFrame(6000, true, 5),
+                new TestReplayFrame(9000, true, 6),
+                new TestReplayFrame(repeating_time, true, 7),
+                new TestReplayFrame(repeating_time, true, 8),
+                new TestReplayFrame(1000, true, 9),
+                new TestReplayFrame(11000, true, 10),
+                new TestReplayFrame(21000, true, 11),
+                new TestReplayFrame(4000, true, 12),
+                new TestReplayFrame(repeating_time, true, 13),
+                new TestReplayFrame(repeating_time, true, 14),
+                new TestReplayFrame(8000, true, 15),
+                new TestReplayFrame(2000, true, 16),
+                new TestReplayFrame(7000, true, 17),
+                new TestReplayFrame(repeating_time, true, 18),
+                new TestReplayFrame(repeating_time, true, 19),
+                new TestReplayFrame(10000, true, 20),
+            });
 
             replay.HasReceivedAllFrames = true;
 
-            // create a new handler with the replay for the frames to be sorted.
+            // create a new handler with the replay for the sort to be performed.
             handler = new TestInputHandler(replay);
 
             // ensure sort stability by checking whether the "data" assigned to each time-repeated frame is in ascending order, as it was before sort.

From 45c0b74151c7f547838a98786c5859194ad3f442 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 23:41:46 +0300
Subject: [PATCH 09743/10326] Use LINQ select for data assigning for simplicity

To avoid having to read through all of frames and ensure nothing is failing there
---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index fe1186bf95..a9f9dfdc83 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -284,31 +284,33 @@ namespace osu.Game.Tests.NonVisual
         {
             const double repeating_time = 5000;
 
+            int incrementingData = 0;
+
             // add a range of frames randomized in time but have a "data" assigned to them in ascending order.
             replay.Frames.AddRange(new[]
             {
-                new TestReplayFrame(repeating_time, true, 0),
-                new TestReplayFrame(0, true, 1),
-                new TestReplayFrame(3000, true, 2),
-                new TestReplayFrame(repeating_time, true, 3),
-                new TestReplayFrame(repeating_time, true, 4),
-                new TestReplayFrame(6000, true, 5),
-                new TestReplayFrame(9000, true, 6),
-                new TestReplayFrame(repeating_time, true, 7),
-                new TestReplayFrame(repeating_time, true, 8),
-                new TestReplayFrame(1000, true, 9),
-                new TestReplayFrame(11000, true, 10),
-                new TestReplayFrame(21000, true, 11),
-                new TestReplayFrame(4000, true, 12),
-                new TestReplayFrame(repeating_time, true, 13),
-                new TestReplayFrame(repeating_time, true, 14),
-                new TestReplayFrame(8000, true, 15),
-                new TestReplayFrame(2000, true, 16),
-                new TestReplayFrame(7000, true, 17),
-                new TestReplayFrame(repeating_time, true, 18),
-                new TestReplayFrame(repeating_time, true, 19),
-                new TestReplayFrame(10000, true, 20),
-            });
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(0, true),
+                new TestReplayFrame(3000, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(6000, true),
+                new TestReplayFrame(9000, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(1000, true),
+                new TestReplayFrame(11000, true),
+                new TestReplayFrame(21000, true),
+                new TestReplayFrame(4000, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(8000, true),
+                new TestReplayFrame(2000, true),
+                new TestReplayFrame(7000, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(10000, true),
+            }.Select(f => new TestReplayFrame(f.Time, true, incrementingData++)));
 
             replay.HasReceivedAllFrames = true;
 

From 973475823735a94dce077f2b5e9005df9e689a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 May 2021 22:48:57 +0200
Subject: [PATCH 09744/10326] Simplify test case further

---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index a9f9dfdc83..a4fe2172e1 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -284,33 +284,31 @@ namespace osu.Game.Tests.NonVisual
         {
             const double repeating_time = 5000;
 
-            int incrementingData = 0;
-
             // add a range of frames randomized in time but have a "data" assigned to them in ascending order.
             replay.Frames.AddRange(new[]
             {
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(0, true),
-                new TestReplayFrame(3000, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(6000, true),
-                new TestReplayFrame(9000, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(1000, true),
-                new TestReplayFrame(11000, true),
-                new TestReplayFrame(21000, true),
-                new TestReplayFrame(4000, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(8000, true),
-                new TestReplayFrame(2000, true),
-                new TestReplayFrame(7000, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(10000, true),
-            }.Select(f => new TestReplayFrame(f.Time, true, incrementingData++)));
+                repeating_time,
+                0,
+                3000,
+                repeating_time,
+                repeating_time,
+                6000,
+                9000,
+                repeating_time,
+                repeating_time,
+                1000,
+                11000,
+                21000,
+                4000,
+                repeating_time,
+                repeating_time,
+                8000,
+                2000,
+                7000,
+                repeating_time,
+                repeating_time,
+                10000
+            }.Select((time, index) => new TestReplayFrame(time, true, index)));
 
             replay.HasReceivedAllFrames = true;
 
@@ -321,7 +319,7 @@ namespace osu.Game.Tests.NonVisual
             var repeatingTimeFramesData = replay.Frames
                                                 .Cast<TestReplayFrame>()
                                                 .Where(f => f.Time == repeating_time)
-                                                .Select(f => f.Data);
+                                                .Select(f => f.FrameIndex);
 
             Assert.That(repeatingTimeFramesData, Is.Ordered.Ascending);
         }
@@ -372,13 +370,13 @@ namespace osu.Game.Tests.NonVisual
         private class TestReplayFrame : ReplayFrame
         {
             public readonly bool IsImportant;
-            public readonly int Data;
+            public readonly int FrameIndex;
 
-            public TestReplayFrame(double time, bool isImportant = false, int data = 0)
+            public TestReplayFrame(double time, bool isImportant = false, int frameIndex = 0)
                 : base(time)
             {
                 IsImportant = isImportant;
-                Data = data;
+                FrameIndex = frameIndex;
             }
         }
 

From f7d9fb094e8d764e01948a6a8104e6a5f8adc2d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 May 2021 22:59:10 +0200
Subject: [PATCH 09745/10326] Reword & clarify comments

---
 osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index a4fe2172e1..407dec936b 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -284,7 +284,10 @@ namespace osu.Game.Tests.NonVisual
         {
             const double repeating_time = 5000;
 
-            // add a range of frames randomized in time but have a "data" assigned to them in ascending order.
+            // add a collection of frames in shuffled order time-wise; each frame also stores its original index to check stability later.
+            // data is hand-picked and breaks if the unstable List<T>.Sort() is used.
+            // in theory this can still return a false-positive with another unstable algorithm if extremely unlucky,
+            // but there is no conceivable fool-proof way to prevent that anyways.
             replay.Frames.AddRange(new[]
             {
                 repeating_time,
@@ -315,7 +318,7 @@ namespace osu.Game.Tests.NonVisual
             // create a new handler with the replay for the sort to be performed.
             handler = new TestInputHandler(replay);
 
-            // ensure sort stability by checking whether the "data" assigned to each time-repeated frame is in ascending order, as it was before sort.
+            // ensure sort stability by checking that the frames with time == repeating_time are sorted in ascending frame index order themselves.
             var repeatingTimeFramesData = replay.Frames
                                                 .Cast<TestReplayFrame>()
                                                 .Where(f => f.Time == repeating_time)

From 23b9d8c260058df9da31790b981ba50504b8aa5a Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 4 May 2021 14:02:12 -0700
Subject: [PATCH 09746/10326] Fix alpha not being zero when string is set to
 empty and use inequality on supporter condition
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>
---
 .../Settings/Sections/UserInterface/MainMenuSettings.cs         | 2 +-
 osu.Game/Overlays/Settings/SettingsItem.cs                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 707f8cd314..b5ab6d2f60 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
             {
                 const string not_supporter_note = "Changes to this setting will only apply with an active osu!supporter tag.";
 
-                backgroundSourceDropdown.NoteText = user.Value?.IsSupporter == false ? not_supporter_note : string.Empty;
+                backgroundSourceDropdown.NoteText = user.Value?.IsSupporter != true ? not_supporter_note : string.Empty;
             }, true);
         }
     }
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 6405431f6b..c6f17cfc23 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Overlays.Settings
         {
             set
             {
-                noteText.Alpha = 1;
+                noteText.Alpha = string.IsNullOrWhiteSpace(value) ? 0 : 1;
                 noteText.Text = value;
             }
         }

From 12c1ded7a8f3c6c6e76cee5125d15a57530e70f7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 5 May 2021 00:28:49 +0300
Subject: [PATCH 09747/10326] Fix test scene broken on master

---
 osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index efcd7864d7..e383aa8008 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Tests.Visual.Editing
                 {
                     selectionBox = new SelectionBox
                     {
+                        RelativeSizeAxes = Axes.Both,
+
                         CanRotate = true,
                         CanScaleX = true,
                         CanScaleY = true,

From 1472960319ecdd6f4627bdfd7aff9896b6bdcfe1 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Tue, 4 May 2021 21:35:36 -0400
Subject: [PATCH 09748/10326] Hide and disable skip outro overlay on rewind

---
 osu.Game/Screens/Play/Player.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index cf26bc479a..88e617245b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -598,6 +598,7 @@ namespace osu.Game.Screens.Play
                 completionProgressDelegate?.Cancel();
                 completionProgressDelegate = null;
                 ValidForResume = true;
+                skipOutroOverlay.Hide();
                 return;
             }
 

From 1d4a8bc0ae9df6ea3b796974953c6b903ddb1f5c Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Tue, 4 May 2021 22:23:36 -0400
Subject: [PATCH 09749/10326] Add visual test for rewinding

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 8326063f81..3229716b7e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -116,6 +116,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 
+        [Test]
+        public void TestStoryboardRewind()
+        {
+            CreateTest(null);
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddStep("rewind", () => Player.GameplayClockContainer.Seek(-1000));
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+        }
+
         protected override bool AllowFail => true;
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();

From 6178f38c95277c91e2a07cb0766d9a33318d24aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 16:15:06 +0900
Subject: [PATCH 09750/10326] Reword unlimited frame rate warning a bit

---
 .../Overlays/Settings/Sections/Graphics/RendererSettings.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index 3ad201640d..c42db1706f 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             frameLimiterDropdown.Current.BindValueChanged(limit =>
             {
-                const string unlimited_frames_note = "Using unlimited frame limiter can lead to stutters. \"2x refresh rate\" is recommended.";
+                const string unlimited_frames_note = "Using unlimited frame limiter can lead to stutters, bad performance and overheating. It will not improve perceived latency. \"2x refresh rate\" is recommended.";
 
                 frameLimiterDropdown.NoteText = limit.NewValue == FrameSync.Unlimited ? unlimited_frames_note : string.Empty;
             }, true);

From 1288f69fada2d8457b2e21bd9341ff517ab72c58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 16:16:02 +0900
Subject: [PATCH 09751/10326] Rename to `WarningText`

---
 .../Settings/Sections/Graphics/LayoutSettings.cs   |  2 +-
 .../Settings/Sections/Graphics/RendererSettings.cs |  2 +-
 .../Sections/UserInterface/MainMenuSettings.cs     |  2 +-
 osu.Game/Overlays/Settings/SettingsItem.cs         | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index a24dd1f64b..937bcc8abf 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
                 const string not_fullscreen_note = "Running without fullscreen mode will increase your input latency!";
 
-                windowModeDropdown.NoteText = mode.NewValue != WindowMode.Fullscreen ? not_fullscreen_note : string.Empty;
+                windowModeDropdown.WarningText = mode.NewValue != WindowMode.Fullscreen ? not_fullscreen_note : string.Empty;
             }, true);
 
             windowModes.BindCollectionChanged((sender, args) =>
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index c42db1706f..70225ff6b8 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             {
                 const string unlimited_frames_note = "Using unlimited frame limiter can lead to stutters, bad performance and overheating. It will not improve perceived latency. \"2x refresh rate\" is recommended.";
 
-                frameLimiterDropdown.NoteText = limit.NewValue == FrameSync.Unlimited ? unlimited_frames_note : string.Empty;
+                frameLimiterDropdown.WarningText = limit.NewValue == FrameSync.Unlimited ? unlimited_frames_note : string.Empty;
             }, true);
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index b5ab6d2f60..7c4c88f344 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
             {
                 const string not_supporter_note = "Changes to this setting will only apply with an active osu!supporter tag.";
 
-                backgroundSourceDropdown.NoteText = user.Value?.IsSupporter != true ? not_supporter_note : string.Empty;
+                backgroundSourceDropdown.WarningText = user.Value?.IsSupporter != true ? not_supporter_note : string.Empty;
             }, true);
         }
     }
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index c6f17cfc23..f4d7c72b7f 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Settings
 
         private SpriteText labelText;
 
-        private readonly OsuTextFlowContainer noteText;
+        private readonly OsuTextFlowContainer warningText;
 
         public bool ShowsDefaultIndicator = true;
 
@@ -61,14 +61,14 @@ namespace osu.Game.Overlays.Settings
 
         /// <summary>
         /// Text to be displayed at the bottom of this <see cref="SettingsItem{T}"/>.
-        /// Used for further explanation or indicating drawbacks of the current setting.
+        /// Generally used to recommend the user change their setting as the current one is considered sub-optimal.
         /// </summary>
-        public string NoteText
+        public string WarningText
         {
             set
             {
-                noteText.Alpha = string.IsNullOrWhiteSpace(value) ? 0 : 1;
-                noteText.Text = value;
+                warningText.Alpha = string.IsNullOrWhiteSpace(value) ? 0 : 1;
+                warningText.Text = value;
             }
         }
 
@@ -110,7 +110,7 @@ namespace osu.Game.Overlays.Settings
                     Children = new[]
                     {
                         Control = CreateControl(),
-                        noteText = new OsuTextFlowContainer
+                        warningText = new OsuTextFlowContainer
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
@@ -135,7 +135,7 @@ namespace osu.Game.Overlays.Settings
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            noteText.Colour = colours.Yellow;
+            warningText.Colour = colours.Yellow;
         }
 
         private void updateDisabled()

From 19ffcd00c27d04ce184f16cd55f141c803dfd011 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 16:19:06 +0900
Subject: [PATCH 09752/10326] Initialise warning text flow lazily as most items
 will not use it

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index f4d7c72b7f..09e458ad7e 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -36,12 +36,15 @@ namespace osu.Game.Overlays.Settings
 
         private SpriteText labelText;
 
-        private readonly OsuTextFlowContainer warningText;
+        private OsuTextFlowContainer warningText;
 
         public bool ShowsDefaultIndicator = true;
 
         public string TooltipText { get; set; }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         public virtual LocalisableString LabelText
         {
             get => labelText?.Text ?? string.Empty;
@@ -67,6 +70,18 @@ namespace osu.Game.Overlays.Settings
         {
             set
             {
+                if (warningText == null)
+                {
+                    // construct lazily for cases where the label is not needed (may be provided by the Control).
+                    FlowContent.Add(warningText = new OsuTextFlowContainer
+                    {
+                        Colour = colours.Yellow,
+                        Margin = new MarginPadding { Bottom = 5 },
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                    });
+                }
+
                 warningText.Alpha = string.IsNullOrWhiteSpace(value) ? 0 : 1;
                 warningText.Text = value;
             }
@@ -110,12 +125,6 @@ namespace osu.Game.Overlays.Settings
                     Children = new[]
                     {
                         Control = CreateControl(),
-                        warningText = new OsuTextFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Alpha = 0,
-                        },
                     },
                 },
             };
@@ -132,12 +141,6 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            warningText.Colour = colours.Yellow;
-        }
-
         private void updateDisabled()
         {
             if (labelText != null)

From 08a45e9fc29d37b686a8430db7c37aab39894c00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 16:26:34 +0900
Subject: [PATCH 09753/10326] Remove dead code

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 09e458ad7e..86a836d29b 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -230,12 +230,6 @@ namespace osu.Game.Overlays.Settings
                 UpdateState();
             }
 
-            public void SetButtonColour(Color4 buttonColour)
-            {
-                this.buttonColour = buttonColour;
-                UpdateState();
-            }
-
             public void UpdateState() => Scheduler.AddOnce(updateState);
 
             private void updateState()

From 3cc9bad97968f220fc475f657f0189eb524b3f8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 17:49:33 +0900
Subject: [PATCH 09754/10326] Actually check for correct state of fade content
 in rewind test

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 3229716b7e..4138a81ebd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Graphics;
@@ -119,9 +120,16 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardRewind()
         {
+            SkipOverlay.FadeContainer fadeContainer() => Player.ChildrenOfType<SkipOverlay.FadeContainer>().First();
+
             CreateTest(null);
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddUntilStep("skip overlay content becomes visible", () => fadeContainer().State == Visibility.Visible);
+
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-1000));
+            AddUntilStep("skip overlay content not visible", () => fadeContainer().State == Visibility.Hidden);
+
+            AddUntilStep("skip overlay content becomes visible", () => fadeContainer().State == Visibility.Visible);
             AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
         }
 

From 9ec3255c505e99a826b3eba40f86f80829502562 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 17:50:25 +0900
Subject: [PATCH 09755/10326] Fix `SkipOverlay`'s `FadeContent` not getting
 correct state from parent

---
 osu.Game/Screens/Play/SkipOverlay.cs | 30 +++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index ddb78dfb67..ed49fc40b2 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -8,19 +8,19 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 using osu.Game.Screens.Ranking;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Containers;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
-using osu.Framework.Utils;
-using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Play
 {
@@ -92,6 +92,18 @@ namespace osu.Game.Screens.Play
 
         private double fadeOutBeginTime => startTime - MasterGameplayClockContainer.MINIMUM_SKIP_TIME;
 
+        public override void Hide()
+        {
+            base.Hide();
+            fadeContainer.Hide();
+        }
+
+        public override void Show()
+        {
+            base.Show();
+            fadeContainer.Show();
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -147,7 +159,7 @@ namespace osu.Game.Screens.Play
         {
         }
 
-        private class FadeContainer : Container, IStateful<Visibility>
+        public class FadeContainer : Container, IStateful<Visibility>
         {
             public event Action<Visibility> StateChanged;
 
@@ -170,7 +182,7 @@ namespace osu.Game.Screens.Play
                     switch (state)
                     {
                         case Visibility.Visible:
-                            // we may be triggered to become visible mnultiple times but we only want to transform once.
+                            // we may be triggered to become visible multiple times but we only want to transform once.
                             if (stateChanged)
                                 this.FadeIn(500, Easing.OutExpo);
 

From 377af38d94541c48cab0d7083cae089b28916f20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 17:59:49 +0900
Subject: [PATCH 09756/10326] Remove unnecessary pixelSnapping parameter

This was only required because there was text being rendered to the
`BufferedContainer` content until now. Removing this should allow for
better resolution in the background display (due to using a better
minify scale mode).
---
 osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
index 566f49a799..0233112c69 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Select
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChild = new BufferedContainer(pixelSnapping: true)
+            InternalChild = new BufferedContainer()
             {
                 CacheDrawnFrameBuffer = true,
                 RelativeSizeAxes = Axes.Both,

From 1410b8f36dce587d91b030bfe5b4736828bb074b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 18:30:57 +0900
Subject: [PATCH 09757/10326] Fix follow points displaying at incorrect
 locations when dragging a slider out-of-bounds

---
 .../Objects/Drawables/Connections/FollowPointConnection.cs      | 2 +-
 1 file changed, 1 insertion(+), 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 5541d0e790..cda4715280 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             Entry = null;
         }
 
-        private void onEntryInvalidated() => refreshPoints();
+        private void onEntryInvalidated() => Scheduler.AddOnce(refreshPoints);
 
         private void refreshPoints()
         {

From cf6ed7a7cf5bac2d8d8d463a1672b7318bd0b3d1 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 13:13:37 +0200
Subject: [PATCH 09758/10326] Refactored out changes in StarRatingDisplay

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 145 +++++++-----------
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   |  68 ++++----
 .../Select/BeatmapInfoWedgeBackground.cs      |   2 +-
 3 files changed, 97 insertions(+), 118 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 748f58e430..f7e50fdc8a 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -22,22 +22,7 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// </summary>
     public class StarRatingDisplay : CompositeDrawable
     {
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        private CircularContainer colorContainer;
-        private StarDifficulty starDifficulty;
-        private FillFlowContainer foregroundContainer;
-
-        public StarDifficulty StarDifficulty
-        {
-            get => starDifficulty;
-            set
-            {
-                starDifficulty = value;
-                setDifficulty(starDifficulty);
-            }
-        }
+        private readonly StarDifficulty difficulty;
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
@@ -45,94 +30,78 @@ namespace osu.Game.Screens.Ranking.Expanded
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
         public StarRatingDisplay(StarDifficulty starDifficulty)
         {
-            this.starDifficulty = starDifficulty;
-        }
-
-        private void setDifficulty(StarDifficulty difficulty)
-        {
-            colorContainer.FadeColour(getDifficultyColour(difficulty), 250);
-
-            foregroundContainer.Expire();
-            foregroundContainer = null;
-            AddInternal(foregroundContainer = createForegroundContainer(difficulty));
+            difficulty = starDifficulty;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
         {
             AutoSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
-            {
-                colorContainer = new CircularContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Colour = getDifficultyColour(starDifficulty),
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                    }
-                },
-                foregroundContainer = createForegroundContainer(starDifficulty),
-            };
-        }
-
-        private ColourInfo getDifficultyColour(StarDifficulty difficulty)
-        {
-            return difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
-        }
-
-        private FillFlowContainer createForegroundContainer(StarDifficulty difficulty)
-        {
             var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
             string wholePart = starRatingParts[0];
             string fractionPart = starRatingParts[1];
             string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
 
-            return new FillFlowContainer
+            ColourInfo backgroundColour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
+                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+
+            InternalChildren = new Drawable[]
             {
-                AutoSizeAxes = Axes.Both,
-                Padding = new MarginPadding { Horizontal = 8, Vertical = 4 },
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(2, 0),
-                Children = new Drawable[]
+                new CircularContainer
                 {
-                    new SpriteIcon
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Children = new Drawable[]
                     {
-                        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 =>
+                        new Box
                         {
-                            s.Colour = Color4.Black;
-                            s.Font = s.Font.With(size: 14);
-                            s.UseFullGlyphHeight = false;
-                        });
-                        t.AddText($"{separator}{fractionPart}", s =>
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = backgroundColour
+                        },
+                    }
+                },
+                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
                         {
-                            s.Colour = Color4.Black;
-                            s.Font = s.Font.With(size: 7);
-                            s.UseFullGlyphHeight = false;
-                        });
-                    }),
+                            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/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index cb5a276a5d..04063d5819 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
-            private StarRatingDisplay starRatingDisplay;
+            private Container topRightMetadataContainer;
             private Container bpmLabelContainer;
             private ModSettingChangeTracker settingChangeTracker;
             private CancellationTokenSource cancellationTokenSource;
@@ -232,34 +232,15 @@ namespace osu.Game.Screens.Select
                             },
                         }
                     },
-                    new FillFlowContainer
+                    topRightMetadataContainer = new Container
                     {
                         Name = "Topright-aligned metadata",
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
-                        Direction = FillDirection.Vertical,
                         Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
                         AutoSizeAxes = Axes.Both,
                         Shear = wedged_container_shear,
-                        Children = new Drawable[]
-                        {
-                            starRatingDisplay = new StarRatingDisplay(starDifficulty.Value ?? new StarDifficulty())
-                            {
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Shear = -wedged_container_shear,
-                                Margin = new MarginPadding { Bottom = 5 }
-                            },
-                            StatusPill = new BeatmapSetOnlineStatusPill
-                            {
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Shear = -wedged_container_shear,
-                                TextSize = 11,
-                                TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
-                                Status = beatmapInfo.Status,
-                            }
-                        }
+                        Child = createTopRightMetadataContainer(beatmapInfo, starDifficulty.Value ?? new StarDifficulty())
                     },
                     new FillFlowContainer
                     {
@@ -306,21 +287,50 @@ namespace osu.Game.Screens.Select
 
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
-                starDifficulty.BindValueChanged(updateStarRatingDisplay, true);
+                starDifficulty.BindValueChanged(updateTopRightMetadata, true);
 
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
             }
 
-            private void updateStarRatingDisplay(ValueChangedEvent<StarDifficulty?> valueChanged)
+            private void updateTopRightMetadata(ValueChangedEvent<StarDifficulty?> valueChanged)
             {
-                if (valueChanged.NewValue.HasValue && valueChanged.NewValue.Value.Stars > 0)
-                    starRatingDisplay.Show();
-                else
-                    starRatingDisplay.Hide();
+                topRightMetadataContainer.Child.FadeOut(250);
+                topRightMetadataContainer.Child.Expire();
+                topRightMetadataContainer.Child = createTopRightMetadataContainer(beatmap.BeatmapInfo, valueChanged.NewValue ?? new StarDifficulty());
+            }
 
-                starRatingDisplay.StarDifficulty = valueChanged.NewValue ?? new StarDifficulty();
+            private FillFlowContainer createTopRightMetadataContainer(BeatmapInfo beatmapInfo, StarDifficulty difficulty)
+            {
+                var container = new FillFlowContainer
+                {
+                    Direction = FillDirection.Vertical,
+                    AutoSizeAxes = Axes.Both,
+                };
+
+                if (difficulty.Stars > 0)
+                {
+                    container.Add(new StarRatingDisplay(difficulty)
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Shear = -wedged_container_shear,
+                        Margin = new MarginPadding { Bottom = 5 }
+                    });
+                }
+
+                container.Add(StatusPill = new BeatmapSetOnlineStatusPill
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Shear = -wedged_container_shear,
+                    TextSize = 11,
+                    TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
+                    Status = beatmapInfo.Status,
+                });
+
+                return container;
             }
 
             private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
index 0233112c69..f50fb4dc8a 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Select
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChild = new BufferedContainer()
+            InternalChild = new BufferedContainer
             {
                 CacheDrawnFrameBuffer = true,
                 RelativeSizeAxes = Axes.Both,

From 4ef901d08d51e586e447f831821463150d14229c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 21:07:49 +0900
Subject: [PATCH 09759/10326] Remove unnecessary redirection property to
 `Container.Info`

---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs | 4 ++--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs                   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 688cc9a035..ec19f00087 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -193,9 +193,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
-            public new WedgeInfoText Info => base.Info;
-
             public new BeatmapInfoWedgeContainer Container => base.Container;
+
+            public WedgeInfoText Info => base.Container.Info;
         }
 
         private class TestHitObject : ConvertHitObject, IHasPosition
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 04063d5819..c86bdc99ff 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -41,7 +41,6 @@ namespace osu.Game.Screens.Select
         private IBindable<RulesetInfo> ruleset { get; set; }
 
         protected BeatmapInfoWedgeContainer Container;
-        protected WedgeInfoText Info => Container.Info;
 
         public BeatmapInfoWedge()
         {

From 5049e2fbf9bf709df1f4b2614ef80c11e8f5d31e Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 15:11:38 +0200
Subject: [PATCH 09760/10326] Refactored out changes in DifficultyColourBar

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 66 +++++++++------------
 1 file changed, 27 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index c86bdc99ff..448bf088dc 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -174,6 +174,7 @@ namespace osu.Game.Screens.Select
             private FillFlowContainer infoLabelContainer;
             private Container topRightMetadataContainer;
             private Container bpmLabelContainer;
+            private Container difficultyColourBarContainer;
             private ModSettingChangeTracker settingChangeTracker;
             private CancellationTokenSource cancellationTokenSource;
             private IBindable<StarDifficulty?> starDifficulty;
@@ -206,10 +207,11 @@ namespace osu.Game.Screens.Select
 
                 Children = new Drawable[]
                 {
-                    new DifficultyColourBar(beatmapInfo)
+                    difficultyColourBarContainer = new Container
                     {
                         RelativeSizeAxes = Axes.Y,
                         Width = 20,
+                        Child = createDifficultyColourBar(starDifficulty.Value ?? new StarDifficulty()),
                     },
                     new FillFlowContainer
                     {
@@ -286,20 +288,32 @@ namespace osu.Game.Screens.Select
 
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
-                starDifficulty.BindValueChanged(updateTopRightMetadata, true);
+                starDifficulty.BindValueChanged(updateDifficulty, true);
 
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
             }
 
-            private void updateTopRightMetadata(ValueChangedEvent<StarDifficulty?> valueChanged)
+            private void updateDifficulty(ValueChangedEvent<StarDifficulty?> valueChanged)
             {
+                var difficulty = valueChanged.NewValue ?? new StarDifficulty();
+
                 topRightMetadataContainer.Child.FadeOut(250);
                 topRightMetadataContainer.Child.Expire();
-                topRightMetadataContainer.Child = createTopRightMetadataContainer(beatmap.BeatmapInfo, valueChanged.NewValue ?? new StarDifficulty());
+                topRightMetadataContainer.Child = createTopRightMetadataContainer(beatmap.BeatmapInfo, difficulty);
+
+                difficultyColourBarContainer.Child.Expire();
+                difficultyColourBarContainer.Child = createDifficultyColourBar(difficulty);
             }
 
+            private DifficultyColourBar createDifficultyColourBar(StarDifficulty difficulty)
+                => new DifficultyColourBar(difficulty)
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 20,
+                };
+
             private FillFlowContainer createTopRightMetadataContainer(BeatmapInfo beatmapInfo, StarDifficulty difficulty)
             {
                 var container = new FillFlowContainer
@@ -515,64 +529,38 @@ namespace osu.Game.Screens.Select
 
             private class DifficultyColourBar : Container
             {
-                [Resolved]
-                private OsuColour colours { get; set; }
+                private readonly StarDifficulty difficulty;
 
-                private Box solidDifficultyBox;
-                private Box transparentDifficultyBox;
-                private CancellationTokenSource cancellationTokenSource;
-                private IBindable<StarDifficulty?> starDifficulty;
-
-                private readonly BeatmapInfo beatmapInfo;
-
-                public DifficultyColourBar(BeatmapInfo beatmapInfo)
+                public DifficultyColourBar(StarDifficulty difficulty)
                 {
-                    this.beatmapInfo = beatmapInfo;
+                    this.difficulty = difficulty;
                 }
 
                 [BackgroundDependencyLoader]
-                private void load(BeatmapDifficultyCache difficultyCache)
+                private void load(OsuColour colours)
                 {
                     const float full_opacity_ratio = 0.7f;
 
-                    cancellationTokenSource?.Cancel();
-                    cancellationTokenSource = new CancellationTokenSource();
-
-                    starDifficulty?.UnbindAll();
-                    starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
+                    var difficultyColour = colours.ForDifficultyRating(difficulty.DifficultyRating);
 
                     Children = new Drawable[]
                     {
-                        solidDifficultyBox = new Box
+                        new Box
                         {
                             RelativeSizeAxes = Axes.Both,
+                            Colour = difficultyColour,
                             Width = full_opacity_ratio,
                         },
-                        transparentDifficultyBox = new Box
+                        new Box
                         {
                             RelativeSizeAxes = Axes.Both,
                             RelativePositionAxes = Axes.Both,
+                            Colour = difficultyColour,
                             Alpha = 0.5f,
                             X = full_opacity_ratio,
                             Width = 1 - full_opacity_ratio,
                         }
                     };
-
-                    starDifficulty.BindValueChanged(setColour, true);
-                }
-
-                private void setColour(ValueChangedEvent<StarDifficulty?> valueChanged)
-                {
-                    var difficultyColour = colours.ForDifficultyRating(valueChanged.NewValue?.DifficultyRating ?? (new StarDifficulty()).DifficultyRating);
-
-                    solidDifficultyBox.Colour = difficultyColour;
-                    transparentDifficultyBox.Colour = difficultyColour;
-                }
-
-                protected override void Dispose(bool isDisposing)
-                {
-                    base.Dispose(isDisposing);
-                    cancellationTokenSource?.Cancel();
                 }
             }
         }

From 88506a51dd95ec070457889ad6c89b96ca777720 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 17:51:29 +0200
Subject: [PATCH 09761/10326] reduced complexity

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 75 ++++++++++-----------
 1 file changed, 34 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 448bf088dc..475a547c27 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -233,15 +233,35 @@ namespace osu.Game.Screens.Select
                             },
                         }
                     },
-                    topRightMetadataContainer = new Container
+                    new FillFlowContainer
                     {
                         Name = "Topright-aligned metadata",
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
+                        Direction = FillDirection.Vertical,
                         Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
                         AutoSizeAxes = Axes.Both,
                         Shear = wedged_container_shear,
-                        Child = createTopRightMetadataContainer(beatmapInfo, starDifficulty.Value ?? new StarDifficulty())
+                        Children = new Drawable[]
+                        {
+                            starRatingContainer = new Container
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                Margin = new MarginPadding { Bottom = 5 }
+                            },
+                            StatusPill = new BeatmapSetOnlineStatusPill
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                TextSize = 11,
+                                TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
+                                Status = beatmapInfo.Status,
+                            }
+                        }
                     },
                     new FillFlowContainer
                     {
@@ -299,51 +319,24 @@ namespace osu.Game.Screens.Select
             {
                 var difficulty = valueChanged.NewValue ?? new StarDifficulty();
 
-                topRightMetadataContainer.Child.FadeOut(250);
-                topRightMetadataContainer.Child.Expire();
-                topRightMetadataContainer.Child = createTopRightMetadataContainer(beatmap.BeatmapInfo, difficulty);
+                if (starRatingContainer.Children.Count > 0)
+                {
+                    starRatingContainer.Child.FadeOut(250);
+                    starRatingContainer.Child.Expire();
+                }
 
-                difficultyColourBarContainer.Child.Expire();
-                difficultyColourBarContainer.Child = createDifficultyColourBar(difficulty);
-            }
+                starRatingContainer.Child = difficulty.Stars > 0 ? new StarRatingDisplay(difficulty) : Empty();
 
-            private DifficultyColourBar createDifficultyColourBar(StarDifficulty difficulty)
-                => new DifficultyColourBar(difficulty)
+                if (difficultyColourBarContainer.Children.Count > 0)
+                {
+                    difficultyColourBarContainer.Child.Expire();
+                }
+
+                difficultyColourBarContainer.Child = new DifficultyColourBar(difficulty)
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = 20,
                 };
-
-            private FillFlowContainer createTopRightMetadataContainer(BeatmapInfo beatmapInfo, StarDifficulty difficulty)
-            {
-                var container = new FillFlowContainer
-                {
-                    Direction = FillDirection.Vertical,
-                    AutoSizeAxes = Axes.Both,
-                };
-
-                if (difficulty.Stars > 0)
-                {
-                    container.Add(new StarRatingDisplay(difficulty)
-                    {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        Shear = -wedged_container_shear,
-                        Margin = new MarginPadding { Bottom = 5 }
-                    });
-                }
-
-                container.Add(StatusPill = new BeatmapSetOnlineStatusPill
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    Shear = -wedged_container_shear,
-                    TextSize = 11,
-                    TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
-                    Status = beatmapInfo.Status,
-                });
-
-                return container;
             }
 
             private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)

From 279750775848a7f6536ecbff54e69773d01c2464 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 17:56:07 +0200
Subject: [PATCH 09762/10326] Reorganized elements for readability

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 128 ++++++++++----------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 475a547c27..15e484e24c 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -132,39 +132,13 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public class BeatmapInfoWedgeContainer : Container
-        {
-            private readonly WorkingBeatmap beatmap;
-            private readonly RulesetInfo ruleset;
-
-            internal WedgeInfoText Info;
-
-            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset)
-            {
-                this.beatmap = beatmap;
-                this.ruleset = ruleset;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                Children = new Drawable[]
-                {
-                    new BeatmapInfoWedgeBackground(beatmap),
-                    Info = new WedgeInfoText(beatmap, ruleset),
-                };
-            }
-        }
-
         public class WedgeInfoText : Container
         {
-            public FillFlowContainer MapperContainer { get; private set; }
+            public OsuSpriteText VersionLabel { get; private set; }
             public OsuSpriteText TitleLabel { get; private set; }
             public OsuSpriteText ArtistLabel { get; private set; }
-            public OsuSpriteText VersionLabel { get; private set; }
             public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
+            public FillFlowContainer MapperContainer { get; private set; }
 
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; }
@@ -172,16 +146,17 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
-            private Container topRightMetadataContainer;
+            private Container starRatingContainer;
             private Container bpmLabelContainer;
             private Container difficultyColourBarContainer;
-            private ModSettingChangeTracker settingChangeTracker;
             private CancellationTokenSource cancellationTokenSource;
             private IBindable<StarDifficulty?> starDifficulty;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
 
+            private ModSettingChangeTracker settingChangeTracker;
+
             public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset)
             {
                 this.beatmap = beatmap;
@@ -211,7 +186,6 @@ namespace osu.Game.Screens.Select
                     {
                         RelativeSizeAxes = Axes.Y,
                         Width = 20,
-                        Child = createDifficultyColourBar(starDifficulty.Value ?? new StarDifficulty()),
                     },
                     new FillFlowContainer
                     {
@@ -304,8 +278,6 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
-                addInfoLabels();
-
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
                 starDifficulty.BindValueChanged(updateDifficulty, true);
@@ -313,38 +285,8 @@ namespace osu.Game.Screens.Select
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
-            }
 
-            private void updateDifficulty(ValueChangedEvent<StarDifficulty?> valueChanged)
-            {
-                var difficulty = valueChanged.NewValue ?? new StarDifficulty();
-
-                if (starRatingContainer.Children.Count > 0)
-                {
-                    starRatingContainer.Child.FadeOut(250);
-                    starRatingContainer.Child.Expire();
-                }
-
-                starRatingContainer.Child = difficulty.Stars > 0 ? new StarRatingDisplay(difficulty) : Empty();
-
-                if (difficultyColourBarContainer.Children.Count > 0)
-                {
-                    difficultyColourBarContainer.Child.Expire();
-                }
-
-                difficultyColourBarContainer.Child = new DifficultyColourBar(difficulty)
-                {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 20,
-                };
-            }
-
-            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
-            {
-                settingChangeTracker?.Dispose();
-                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
-                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
-                refreshBPMLabel(modsChangedEvent.NewValue);
+                addInfoLabels();
             }
 
             private void setMetadata(string source)
@@ -455,6 +397,38 @@ namespace osu.Game.Screens.Select
                 };
             }
 
+            private void updateDifficulty(ValueChangedEvent<StarDifficulty?> valueChanged)
+            {
+                var difficulty = valueChanged.NewValue ?? new StarDifficulty();
+
+                if (starRatingContainer.Children.Count > 0)
+                {
+                    starRatingContainer.Child.FadeOut(250);
+                    starRatingContainer.Child.Expire();
+                }
+
+                starRatingContainer.Child = difficulty.Stars > 0 ? new StarRatingDisplay(difficulty) : Empty();
+
+                if (difficultyColourBarContainer.Children.Count > 0)
+                {
+                    difficultyColourBarContainer.Child.Expire();
+                }
+
+                difficultyColourBarContainer.Child = new DifficultyColourBar(difficulty)
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 20,
+                };
+            }
+
+            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
+            {
+                settingChangeTracker?.Dispose();
+                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
+                refreshBPMLabel(modsChangedEvent.NewValue);
+            }
+
             protected override void Dispose(bool isDisposing)
             {
                 base.Dispose(isDisposing);
@@ -557,5 +531,31 @@ namespace osu.Game.Screens.Select
                 }
             }
         }
+
+        public class BeatmapInfoWedgeContainer : Container
+        {
+            private readonly WorkingBeatmap beatmap;
+            private readonly RulesetInfo ruleset;
+
+            internal WedgeInfoText Info;
+
+            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset)
+            {
+                this.beatmap = beatmap;
+                this.ruleset = ruleset;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                Children = new Drawable[]
+                {
+                    new BeatmapInfoWedgeBackground(beatmap),
+                    Info = new WedgeInfoText(beatmap, ruleset),
+                };
+            }
+        }
     }
 }

From bb385f425531c1efdf37fd258df9057edaf10fc9 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 18:15:59 +0200
Subject: [PATCH 09763/10326] Reverted difficulty and mod updates

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 117 +++++++++-----------
 1 file changed, 55 insertions(+), 62 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 15e484e24c..4be7d3b0f4 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -40,6 +40,14 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
+        [Resolved]
+        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+
+        [Resolved]
+        private BeatmapDifficultyCache difficultyCache { get; set; }
+
+        private IBindable<StarDifficulty?> beatmapDifficulty;
+
         protected BeatmapInfoWedgeContainer Container;
 
         public BeatmapInfoWedge()
@@ -80,6 +88,8 @@ namespace osu.Game.Screens.Select
 
         private WorkingBeatmap beatmap;
 
+        private CancellationTokenSource cancellationSource;
+
         public WorkingBeatmap Beatmap
         {
             get => beatmap;
@@ -88,6 +98,13 @@ namespace osu.Game.Screens.Select
                 if (beatmap == value) return;
 
                 beatmap = value;
+                cancellationSource?.Cancel();
+                cancellationSource = new CancellationTokenSource();
+
+                beatmapDifficulty?.UnbindAll();
+                beatmapDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, cancellationSource.Token);
+                beatmapDifficulty.BindValueChanged(_ => updateDisplay());
+
                 updateDisplay();
             }
         }
@@ -117,7 +134,7 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value)
+                LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
                 {
                     Shear = -Shear,
                     Depth = Container?.Depth + 1 ?? 0,
@@ -132,6 +149,12 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            cancellationSource?.Cancel();
+        }
+
         public class WedgeInfoText : Container
         {
             public OsuSpriteText VersionLabel { get; private set; }
@@ -140,41 +163,32 @@ namespace osu.Game.Screens.Select
             public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
             public FillFlowContainer MapperContainer { get; private set; }
 
-            [Resolved]
-            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
-
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
-            private Container starRatingContainer;
             private Container bpmLabelContainer;
-            private Container difficultyColourBarContainer;
-            private CancellationTokenSource cancellationTokenSource;
-            private IBindable<StarDifficulty?> starDifficulty;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
+            private readonly IReadOnlyList<Mod> mods;
+            private readonly StarDifficulty starDifficulty;
 
             private ModSettingChangeTracker settingChangeTracker;
 
-            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
+                this.mods = mods;
+                starDifficulty = difficulty;
             }
 
             [BackgroundDependencyLoader]
-            private void load(LocalisationManager localisation, BeatmapDifficultyCache difficultyCache)
+            private void load(LocalisationManager localisation)
             {
                 var beatmapInfo = beatmap.BeatmapInfo;
                 var metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
-                cancellationTokenSource?.Cancel();
-                cancellationTokenSource = new CancellationTokenSource();
-
-                starDifficulty?.UnbindAll();
-                starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
-
                 RelativeSizeAxes = Axes.Both;
 
                 titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
@@ -182,7 +196,7 @@ namespace osu.Game.Screens.Select
 
                 Children = new Drawable[]
                 {
-                    difficultyColourBarContainer = new Container
+                    new DifficultyColourBar(starDifficulty)
                     {
                         RelativeSizeAxes = Axes.Y,
                         Width = 20,
@@ -216,16 +230,14 @@ namespace osu.Game.Screens.Select
                         Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
                         AutoSizeAxes = Axes.Both,
                         Shear = wedged_container_shear,
-                        Children = new Drawable[]
+                        Children = new[]
                         {
-                            starRatingContainer = new Container
+                            createStarRatingDisplay(starDifficulty).With(display =>
                             {
-                                AutoSizeAxes = Axes.Both,
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Shear = -wedged_container_shear,
-                                Margin = new MarginPadding { Bottom = 5 }
-                            },
+                                display.Anchor = Anchor.TopRight;
+                                display.Origin = Anchor.TopRight;
+                                display.Shear = -wedged_container_shear;
+                            }),
                             StatusPill = new BeatmapSetOnlineStatusPill
                             {
                                 Anchor = Anchor.TopRight,
@@ -280,7 +292,6 @@ namespace osu.Game.Screens.Select
 
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
-                starDifficulty.BindValueChanged(updateDifficulty, true);
 
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
@@ -289,6 +300,13 @@ namespace osu.Game.Screens.Select
                 addInfoLabels();
             }
 
+            private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
+                ? new StarRatingDisplay(difficulty)
+                {
+                    Margin = new MarginPadding { Bottom = 5 }
+                }
+                : Empty();
+
             private void setMetadata(string source)
             {
                 ArtistLabel.Text = artistBinding.Value;
@@ -320,7 +338,10 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
-                mods.BindValueChanged(refreshModInformation, true);
+                settingChangeTracker = new ModSettingChangeTracker(mods);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
+
+                refreshBPMLabel();
             }
 
             private InfoLabel[] getRulesetInfoLabels()
@@ -350,7 +371,7 @@ namespace osu.Game.Screens.Select
                 return Array.Empty<InfoLabel>();
             }
 
-            private void refreshBPMLabel(IReadOnlyList<Mod> mods)
+            private void refreshBPMLabel()
             {
                 var b = beatmap.Beatmap;
                 if (b == null)
@@ -397,38 +418,6 @@ namespace osu.Game.Screens.Select
                 };
             }
 
-            private void updateDifficulty(ValueChangedEvent<StarDifficulty?> valueChanged)
-            {
-                var difficulty = valueChanged.NewValue ?? new StarDifficulty();
-
-                if (starRatingContainer.Children.Count > 0)
-                {
-                    starRatingContainer.Child.FadeOut(250);
-                    starRatingContainer.Child.Expire();
-                }
-
-                starRatingContainer.Child = difficulty.Stars > 0 ? new StarRatingDisplay(difficulty) : Empty();
-
-                if (difficultyColourBarContainer.Children.Count > 0)
-                {
-                    difficultyColourBarContainer.Child.Expire();
-                }
-
-                difficultyColourBarContainer.Child = new DifficultyColourBar(difficulty)
-                {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 20,
-                };
-            }
-
-            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
-            {
-                settingChangeTracker?.Dispose();
-                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
-                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
-                refreshBPMLabel(modsChangedEvent.NewValue);
-            }
-
             protected override void Dispose(bool isDisposing)
             {
                 base.Dispose(isDisposing);
@@ -536,13 +525,17 @@ namespace osu.Game.Screens.Select
         {
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
+            private readonly StarDifficulty starDifficulty;
+            private readonly IReadOnlyList<Mod> mods;
 
             internal WedgeInfoText Info;
 
-            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset)
+            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
             {
                 this.beatmap = beatmap;
                 this.ruleset = ruleset;
+                this.mods = mods;
+                starDifficulty = difficulty;
             }
 
             [BackgroundDependencyLoader]
@@ -553,7 +546,7 @@ namespace osu.Game.Screens.Select
                 Children = new Drawable[]
                 {
                     new BeatmapInfoWedgeBackground(beatmap),
-                    Info = new WedgeInfoText(beatmap, ruleset),
+                    Info = new WedgeInfoText(beatmap, ruleset, mods, starDifficulty),
                 };
             }
         }

From b6b9a696017ca41dd9befb1ca5b63c2fa129f008 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 18:50:49 +0200
Subject: [PATCH 09764/10326] Removed unnecessary class for wrapping

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   |  7 +--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 43 +++++--------------
 2 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index ec19f00087..b9e92cba62 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -7,6 +7,7 @@ using JetBrains.Annotations;
 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.Sprites;
@@ -135,7 +136,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void selectBeatmap([CanBeNull] IBeatmap b)
         {
-            BeatmapInfoWedge.BeatmapInfoWedgeContainer containerBefore = null;
+            Container containerBefore = null;
 
             AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
             {
@@ -193,9 +194,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
-            public new BeatmapInfoWedgeContainer Container => base.Container;
+            public new Container Container => base.Container;
 
-            public WedgeInfoText Info => base.Container.Info;
+            public new WedgeInfoText Info => base.Info;
         }
 
         private class TestHitObject : ConvertHitObject, IHasPosition
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 4be7d3b0f4..53ac97cc7d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -48,7 +48,8 @@ namespace osu.Game.Screens.Select
 
         private IBindable<StarDifficulty?> beatmapDifficulty;
 
-        protected BeatmapInfoWedgeContainer Container;
+        protected Container Container;
+        protected WedgeInfoText Info;
 
         public BeatmapInfoWedge()
         {
@@ -111,7 +112,7 @@ namespace osu.Game.Screens.Select
 
         public override bool IsPresent => base.IsPresent || Container == null; // Visibility is updated in the LoadComponentAsync callback
 
-        private BeatmapInfoWedgeContainer loadingInfo;
+        private Container loadingInfo;
 
         private void updateDisplay()
         {
@@ -134,10 +135,16 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
+                LoadComponentAsync(loadingInfo = new Container
                 {
+                    RelativeSizeAxes = Axes.Both,
                     Shear = -Shear,
                     Depth = Container?.Depth + 1 ?? 0,
+                    Children = new Drawable[]
+                    {
+                        new BeatmapInfoWedgeBackground(beatmap),
+                        Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty()),
+                    }
                 }, loaded =>
                 {
                     // ensure we are the most recent loaded wedge.
@@ -520,35 +527,5 @@ namespace osu.Game.Screens.Select
                 }
             }
         }
-
-        public class BeatmapInfoWedgeContainer : Container
-        {
-            private readonly WorkingBeatmap beatmap;
-            private readonly RulesetInfo ruleset;
-            private readonly StarDifficulty starDifficulty;
-            private readonly IReadOnlyList<Mod> mods;
-
-            internal WedgeInfoText Info;
-
-            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
-            {
-                this.beatmap = beatmap;
-                this.ruleset = ruleset;
-                this.mods = mods;
-                starDifficulty = difficulty;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                Children = new Drawable[]
-                {
-                    new BeatmapInfoWedgeBackground(beatmap),
-                    Info = new WedgeInfoText(beatmap, ruleset, mods, starDifficulty),
-                };
-            }
-        }
     }
 }

From fe9ade6754360eb1e36c41f46c7d386d9b8565c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 02:14:04 +0900
Subject: [PATCH 09765/10326] Rename Container to DisplayedContent

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs       |  6 +++---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs       | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index b9e92cba62..67c85a1120 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -140,11 +140,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
             {
-                containerBefore = infoWedge.Container;
+                containerBefore = infoWedge.DisplayedContent;
                 infoWedge.Beatmap = Beatmap.Value = b == null ? Beatmap.Default : CreateWorkingBeatmap(b);
             });
 
-            AddUntilStep("wait for async load", () => infoWedge.Container != containerBefore);
+            AddUntilStep("wait for async load", () => infoWedge.DisplayedContent != containerBefore);
         }
 
         private IBeatmap createTestBeatmap(RulesetInfo ruleset)
@@ -194,7 +194,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
-            public new Container Container => base.Container;
+            public new Container DisplayedContent => base.DisplayedContent;
 
             public new WedgeInfoText Info => base.Info;
         }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 53ac97cc7d..d84052b94d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -48,7 +48,8 @@ namespace osu.Game.Screens.Select
 
         private IBindable<StarDifficulty?> beatmapDifficulty;
 
-        protected Container Container;
+        protected Container DisplayedContent;
+
         protected WedgeInfoText Info;
 
         public BeatmapInfoWedge()
@@ -110,7 +111,7 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public override bool IsPresent => base.IsPresent || Container == null; // Visibility is updated in the LoadComponentAsync callback
+        public override bool IsPresent => base.IsPresent || DisplayedContent == null; // Visibility is updated in the LoadComponentAsync callback
 
         private Container loadingInfo;
 
@@ -124,9 +125,9 @@ namespace osu.Game.Screens.Select
                 {
                     State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
 
-                    Container?.FadeOut(250);
-                    Container?.Expire();
-                    Container = null;
+                    DisplayedContent?.FadeOut(250);
+                    DisplayedContent?.Expire();
+                    DisplayedContent = null;
                 }
 
                 if (beatmap == null)
@@ -139,7 +140,7 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.Both,
                     Shear = -Shear,
-                    Depth = Container?.Depth + 1 ?? 0,
+                    Depth = DisplayedContent?.Depth + 1 ?? 0,
                     Children = new Drawable[]
                     {
                         new BeatmapInfoWedgeBackground(beatmap),
@@ -151,7 +152,7 @@ namespace osu.Game.Screens.Select
                     if (loaded != loadingInfo) return;
 
                     removeOldInfo();
-                    Add(Container = loaded);
+                    Add(DisplayedContent = loaded);
                 });
             }
         }

From cffeb8641f484a860580bbcce38f977563e68674 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 02:14:57 +0900
Subject: [PATCH 09766/10326] Make setters private for protected containers

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index d84052b94d..18615d9192 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -48,9 +48,9 @@ namespace osu.Game.Screens.Select
 
         private IBindable<StarDifficulty?> beatmapDifficulty;
 
-        protected Container DisplayedContent;
+        protected Container DisplayedContent { get; private set; }
 
-        protected WedgeInfoText Info;
+        protected WedgeInfoText Info { get; private set; }
 
         public BeatmapInfoWedge()
         {

From 2a67361dc01963e10e850ac5523858578c613f67 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 5 May 2021 21:50:11 +0300
Subject: [PATCH 09767/10326] OnOperation -> TriggerOperation

---
 .../Screens/Edit/Compose/Components/SelectionBoxButton.cs     | 4 ++--
 .../Screens/Edit/Compose/Components/SelectionBoxControl.cs    | 4 ++--
 .../Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
index 43cbbb617b..3b1dae6c3d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
@@ -46,9 +46,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnClick(ClickEvent e)
         {
-            OnOperationStarted();
+            TriggerOperationStarted();
             Action?.Invoke();
-            OnOperationEnded();
+            TriggerOperatoinEnded();
             return true;
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 159886648e..40d367bb80 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -90,8 +90,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             this.ScaleTo(IsHeld || IsHovered ? 1.5f : 1, TRANSFORM_DURATION, Easing.OutQuint);
         }
 
-        protected void OnOperationStarted() => OperationStarted?.Invoke();
+        protected void TriggerOperationStarted() => OperationStarted?.Invoke();
 
-        protected void OnOperationEnded() => OperationEnded?.Invoke();
+        protected void TriggerOperatoinEnded() => OperationEnded?.Invoke();
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
index 3c1741e24d..65a95951cf 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnDragStart(DragStartEvent e)
         {
-            OnOperationStarted();
+            TriggerOperationStarted();
             return true;
         }
 
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override void OnDragEnd(DragEndEvent e)
         {
-            OnOperationEnded();
+            TriggerOperatoinEnded();
 
             UpdateHoverState();
             base.OnDragEnd(e);

From 266d8d828297b9381520023a47bbe670ffce548e Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:13:39 +0700
Subject: [PATCH 09768/10326] move list item constant position

---
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 98b1fd1381..84565a577a 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -12,13 +12,13 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownListItem : CompositeDrawable
     {
+        private const float ordered_left_padding = 30;
+        private const float unordered_left_padding = 20;
+
         private readonly int level;
         private readonly int order;
         private readonly bool isOrdered;
 
-        private const float ordered_left_padding = 30;
-        private const float unordered_left_padding = 20;
-
         [Resolved]
         private IMarkdownTextComponent parentTextComponent { get; set; }
 

From 3ddf551b0360322fb15d9802949ed35997624b94 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:13:54 +0700
Subject: [PATCH 09769/10326] remove unused this

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 84565a577a..a6274de3da 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         public OsuMarkdownListItem(ListItemBlock listItemBlock, int level)
         {
             this.level = level;
-            this.order = listItemBlock.Order;
+            order = listItemBlock.Order;
             isOrdered = ((ListBlock)listItemBlock.Parent).IsOrdered;
 
             AutoSizeAxes = Axes.Y;

From 99e0cc9bbe4106362a854caae272c929a4ac6e88 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:15:32 +0700
Subject: [PATCH 09770/10326] rename CreateTextMarker to GetTextMarker

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index a6274de3da..a4941ef785 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         private void load()
         {
             var marker = parentTextComponent.CreateSpriteText();
-            marker.Text = CreateTextMarker();
+            marker.Text = GetTextMarker();
 
             if (isOrdered)
             {
@@ -67,7 +67,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             AddInternal(marker);
         }
 
-        protected virtual string CreateTextMarker()
+        protected virtual string GetTextMarker()
         {
             if (isOrdered)
             {

From 9bb80492c534bc162cb28085bb6631c07e9fc6bf Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:29:29 +0700
Subject: [PATCH 09771/10326] add level and isOrdered parameter

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index a4941ef785..a7582cb4b3 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         private void load()
         {
             var marker = parentTextComponent.CreateSpriteText();
-            marker.Text = GetTextMarker();
+            marker.Text = GetTextMarker(level, isOrdered);
 
             if (isOrdered)
             {
@@ -67,7 +67,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             AddInternal(marker);
         }
 
-        protected virtual string GetTextMarker()
+        protected virtual string GetTextMarker(int level, bool isOrdered)
         {
             if (isOrdered)
             {

From 4567abe3dbd39c1f26ce42003edd7b021a7c385d Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:32:07 +0700
Subject: [PATCH 09772/10326] add xmldoc for GetTextMarker

---
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index a7582cb4b3..b586bb7f30 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -67,6 +67,12 @@ namespace osu.Game.Graphics.Containers.Markdown
             AddInternal(marker);
         }
 
+        /// <summary>
+        /// Get text marker based on <paramref name="level"/> and <paramref name="isOrdered"/>.
+        /// </summary>
+        /// <param name="level">The markdown level of current list item.</param>
+        /// <param name="isOrdered">Is true if the list item is an ordered list.</param>
+        /// <returns></returns>
         protected virtual string GetTextMarker(int level, bool isOrdered)
         {
             if (isOrdered)

From cfd28c51bbbb827c0394282ec144ebdf3a9557f6 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:35:16 +0700
Subject: [PATCH 09773/10326] change block quote backgroudn width

Reference : https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/base.less#L7-L10
---
 .../Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
index 869cba82f2..d9b516892b 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
@@ -26,7 +26,9 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override Drawable CreateBackground()
         {
-            return background = base.CreateBackground();
+            background = base.CreateBackground();
+            background.Width = 2;
+            return background;
         }
 
         public override MarkdownTextFlowContainer CreateTextFlow()

From 550e6c0fbb5e670d77dcc384c5dfbe3aba07f99b Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:36:46 +0700
Subject: [PATCH 09774/10326] change quote block margin padding to use vertical
 and horizontal

---
 .../Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
index d9b516892b..07bb72c2e6 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
@@ -36,10 +36,8 @@ namespace osu.Game.Graphics.Containers.Markdown
             var textFlow = base.CreateTextFlow();
             textFlow.Margin = new MarginPadding
             {
-                Top = 10,
-                Bottom = 10,
-                Left = 20,
-                Right = 20,
+                Vertical = 10,
+                Horizontal = 20,
             };
             return textFlow;
         }

From 0d3ca8dde197428a2eef2ec2bc4d49d614ccea28 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 08:43:38 +0700
Subject: [PATCH 09775/10326] change font weight of table header

---
 .../Markdown/OsuMarkdownTableCell.cs          | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
index d8b9145228..fca85e02a8 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
@@ -30,7 +31,6 @@ namespace osu.Game.Graphics.Containers.Markdown
                 RelativeSizeAxes = Axes.X,
             };
 
-            // TODO : Change font weight to 700 for heading
             if (isHeading)
             {
                 border.Colour = colourProvider.Background3;
@@ -48,5 +48,23 @@ namespace osu.Game.Graphics.Containers.Markdown
 
             AddInternal(border);
         }
+
+        public override MarkdownTextFlowContainer CreateTextFlow() => new TableCellTextFlowContainer
+        {
+            Weight = isHeading ? FontWeight.Bold : FontWeight.Regular,
+            Padding = new MarginPadding(10),
+        };
+
+        private class TableCellTextFlowContainer : OsuMarkdownTextFlowContainer
+        {
+            public FontWeight Weight { get; set; }
+
+            protected override SpriteText CreateSpriteText()
+            {
+                var spriteText = base.CreateSpriteText();
+                spriteText.Font = spriteText.Font.With(weight: Weight);
+                return spriteText;
+            }
+        }
     }
 }

From d4658c609b61d3f15cccbe840023bb6003efc91c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 5 May 2021 22:43:16 -0700
Subject: [PATCH 09776/10326] Fix warning text of bg source setting not being
 updated when user with supporter signs in/out

---
 .../Settings/Sections/UserInterface/MainMenuSettings.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 7c4c88f344..5f703ed5a4 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -57,11 +57,11 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
         {
             base.LoadComplete();
 
-            backgroundSourceDropdown.Current.BindValueChanged(source =>
+            user.BindValueChanged(u =>
             {
                 const string not_supporter_note = "Changes to this setting will only apply with an active osu!supporter tag.";
 
-                backgroundSourceDropdown.WarningText = user.Value?.IsSupporter != true ? not_supporter_note : string.Empty;
+                backgroundSourceDropdown.WarningText = u.NewValue?.IsSupporter != true ? not_supporter_note : string.Empty;
             }, true);
         }
     }

From ee23124bb14409ac6c4833df20b1259ecca888d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 15:17:53 +0900
Subject: [PATCH 09777/10326] Remove no-longer-used interface

---
 .../Screens/Play/HUD/DefaultComboCounter.cs   |  2 +-
 osu.Game/Screens/Play/HUD/IComboCounter.cs    | 19 -------------------
 .../Screens/Play/HUD/LegacyComboCounter.cs    |  2 +-
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/IComboCounter.cs

diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index d0c26afe5e..5a975c1b80 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -12,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultComboCounter : RollingCounter<int>, IComboCounter
+    public class DefaultComboCounter : RollingCounter<int>
     {
         private readonly Vector2 offset = new Vector2(20, 5);
 
diff --git a/osu.Game/Screens/Play/HUD/IComboCounter.cs b/osu.Game/Screens/Play/HUD/IComboCounter.cs
deleted file mode 100644
index ff235bf04e..0000000000
--- a/osu.Game/Screens/Play/HUD/IComboCounter.cs
+++ /dev/null
@@ -1,19 +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;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// An interface providing a set of methods to update a combo counter.
-    /// </summary>
-    public interface IComboCounter : IDrawable
-    {
-        /// <summary>
-        /// The current combo to be displayed.
-        /// </summary>
-        Bindable<int> Current { get; }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 0bccbd0338..8ecd960de1 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// Uses the 'x' symbol and has a pop-out effect while rolling over.
     /// </summary>
-    public class LegacyComboCounter : CompositeDrawable, IComboCounter
+    public class LegacyComboCounter : CompositeDrawable
     {
         public Bindable<int> Current { get; } = new BindableInt { MinValue = 0, };
 

From af75c9ac82ab73f43188284eef35a67b7bf1dbfd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 16:08:28 +0900
Subject: [PATCH 09778/10326] 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 5aee9e15cc..99cda7693d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.427.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.506.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1e0eabfff7..e448972066 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.506.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index e26e727e69..43ed2d7dc8 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.Framework.iOS" Version="2021.427.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.506.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.427.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.506.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From b6560a616a22f07e248f2063cd0d78f1fbbac180 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 15:00:12 +0700
Subject: [PATCH 09779/10326] add comment for base font size heading

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
index f71c6753f4..a7fecc6e25 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override float GetFontSizeByLevel(int level)
         {
+            // Reference for this font size
+            // https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L9
+            // https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/variables.less#L161
             const float base_font_size = 14;
 
             switch (level)

From e7c563fb671f8c2eee44de363e6c04971dad6cd3 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 15:11:45 +0700
Subject: [PATCH 09780/10326] simplify `CreateTextFlow` in quote block

---
 .../Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
index 07bb72c2e6..f8b8a1c2a2 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
@@ -33,13 +33,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         public override MarkdownTextFlowContainer CreateTextFlow()
         {
-            var textFlow = base.CreateTextFlow();
-            textFlow.Margin = new MarginPadding
+            return base.CreateTextFlow().With(f => f.Margin = new MarginPadding
             {
                 Vertical = 10,
                 Horizontal = 20,
-            };
-            return textFlow;
+            });
         }
     }
 }

From 91283d41ceef2c9564d024b20d3ea893e38198e6 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 15:13:43 +0700
Subject: [PATCH 09781/10326] add paragraph test

---
 .../UserInterface/TestSceneOsuMarkdownContainer.cs  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 9fb14efe4d..dc41f184f2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -95,6 +95,19 @@ _**italic with underscore, bold with asterisk**_";
             });
         }
 
+        [Test]
+        public void TestParagraph()
+        {
+            AddStep("Add paragraph", () =>
+            {
+                markdownContainer.Text = @"first paragraph
+
+second paragraph
+
+third paragraph";
+            });
+        }
+
         [Test]
         public void TestFencedCodeBlock()
         {

From ba634cbf11174ad90003405b0ff4a3c49cad7016 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 15:13:59 +0700
Subject: [PATCH 09782/10326] change line spacing to 21

We use margin bottom in osu-web markdown paragraph[1] as reference for
this line spacing value.

The value from osu-web itself is 1.5em[2]. Because the base font size of
the paragraph is 14px[3][4], the actual value is 14 * 1.5 = 21px

[1] https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L230
[2] https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/variables.less#L58
[3] https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L9
[4] https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/variables.less#L161
---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 3ad00e4df2..c66f3fbca2 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -16,6 +16,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownContainer : MarkdownContainer
     {
+        public OsuMarkdownContainer()
+        {
+            LineSpacing = 21;
+        }
+
         protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)
         {
             switch (markdownObject)

From 39067e6926e0950303e137140dded1f2eb2f5dd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 17:19:18 +0900
Subject: [PATCH 09783/10326] Fix slider input handling potentially being
 offset after composer area resize

Closes https://github.com/ppy/osu/issues/12671.
---
 .../Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
index 1c3d270c95..6e22c35ab3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -26,6 +26,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             {
                 AccentColour = Color4.Transparent
             };
+
+            // SliderSelectionBlueprint relies on calling ReceivePositionalInputAt on this drawable to determine whether selection should occur.
+            // Without AlwaysPresent, a movement in a parent container (ie. the editor composer area resizing) could cause incorrect input handling.
+            AlwaysPresent = true;
         }
 
         [BackgroundDependencyLoader]

From 010f6258705e86c47ad208c519362daa80e6c346 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 17:05:41 +0700
Subject: [PATCH 09784/10326] use derived component in
 OsuMarkdownFencedCodeBlock

---
 .../Markdown/OsuMarkdownFencedCodeBlock.cs    | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
index ddd88dd915..0d67849060 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
@@ -12,33 +12,34 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownFencedCodeBlock : MarkdownFencedCodeBlock
     {
-        private Box background;
-        private MarkdownTextFlowContainer textFlow;
-
+        // TODO : change to monospace font for this component
         public OsuMarkdownFencedCodeBlock(FencedCodeBlock fencedCodeBlock)
             : base(fencedCodeBlock)
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            // TODO : Change to monospace font to match with osu-web
-            background.Colour = colourProvider.Background6;
-            textFlow.Colour = colourProvider.Light1;
-        }
+        protected override Drawable CreateBackground() => new CodeBlockBackground();
 
-        protected override Drawable CreateBackground()
+        public override MarkdownTextFlowContainer CreateTextFlow() => new CodeBlockTextFlowContainer();
+
+        private class CodeBlockBackground : Box
         {
-            return background = new Box
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
             {
-                RelativeSizeAxes = Axes.Both,
-            };
+                RelativeSizeAxes = Axes.Both;
+                Colour = colourProvider.Background6;
+            }
         }
 
-        public override MarkdownTextFlowContainer CreateTextFlow()
+        private class CodeBlockTextFlowContainer : OsuMarkdownTextFlowContainer
         {
-            return textFlow = base.CreateTextFlow();
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Light1;
+                Margin = new MarginPadding(10);
+            }
         }
     }
 }

From 7b43730fe61791017693d058a101487057d218a3 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 17:13:46 +0700
Subject: [PATCH 09785/10326] add QuoteBackground in OsuMarkdownQuoteBlock

---
 .../Markdown/OsuMarkdownQuoteBlock.cs         | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
index f8b8a1c2a2..9935c81537 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
@@ -5,31 +5,19 @@ using Markdig.Syntax;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownQuoteBlock : MarkdownQuoteBlock
     {
-        private Drawable background;
-
         public OsuMarkdownQuoteBlock(QuoteBlock quoteBlock)
             : base(quoteBlock)
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            background.Colour = colourProvider.Content2;
-        }
-
-        protected override Drawable CreateBackground()
-        {
-            background = base.CreateBackground();
-            background.Width = 2;
-            return background;
-        }
+        protected override Drawable CreateBackground() => new QuoteBackground();
 
         public override MarkdownTextFlowContainer CreateTextFlow()
         {
@@ -39,5 +27,18 @@ namespace osu.Game.Graphics.Containers.Markdown
                 Horizontal = 20,
             });
         }
+
+        private class QuoteBackground : Box
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Anchor = Anchor.CentreLeft;
+                Origin = Anchor.CentreLeft;
+                RelativeSizeAxes = Axes.Y;
+                Width = 2;
+                Colour = colourProvider.Content2;
+            }
+        }
     }
 }

From 92022f2cba0240a6fe25bc5607eeb2ff9e5e9225 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 17:17:14 +0700
Subject: [PATCH 09786/10326] add Separator component in OsuMarkdownSeparator

---
 .../Markdown/OsuMarkdownSeparator.cs          | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs
index 9b28200452..28a87c9f21 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs
@@ -4,23 +4,24 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownSeparator : MarkdownSeparator
     {
-        private Drawable separator;
+        protected override Drawable CreateSeparator() => new Separator();
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private class Separator : Box
         {
-            separator.Colour = colourProvider.Background3;
-        }
-
-        protected override Drawable CreateSeparator()
-        {
-            return separator = base.CreateSeparator();
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                RelativeSizeAxes = Axes.X;
+                Height = 1;
+                Colour = colourProvider.Background3;
+            }
         }
     }
 }

From 9be36230f9bd5825aafc5b5f664480d76bdf43fb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 6 May 2021 21:43:30 +0900
Subject: [PATCH 09787/10326] Introduce AutoGenerator subclass for frame based
 replay generation

---
 osu.Game/Rulesets/Replays/AutoGenerator.cs    | 27 +++++-------
 .../Rulesets/Replays/FramedAutoGenerator.cs   | 44 +++++++++++++++++++
 2 files changed, 54 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game/Rulesets/Replays/FramedAutoGenerator.cs

diff --git a/osu.Game/Rulesets/Replays/AutoGenerator.cs b/osu.Game/Rulesets/Replays/AutoGenerator.cs
index b3c609f2f4..4bdd5b094d 100644
--- a/osu.Game/Rulesets/Replays/AutoGenerator.cs
+++ b/osu.Game/Rulesets/Replays/AutoGenerator.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.Game.Beatmaps;
@@ -7,34 +7,27 @@ using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Replays
 {
-    public abstract class AutoGenerator : IAutoGenerator
+    public abstract class AutoGenerator
     {
         /// <summary>
-        /// Creates the auto replay and returns it.
-        /// Every subclass of OsuAutoGeneratorBase should implement this!
+        /// The default duration of a key press in milliseconds.
         /// </summary>
-        public abstract Replay Generate();
-
-        #region Parameters
+        public const double KEY_UP_DELAY = 50;
 
         /// <summary>
-        /// The beatmap we're making.
+        /// The beatmap the autoplay is generated for.
         /// </summary>
-        protected IBeatmap Beatmap;
-
-        #endregion
+        protected IBeatmap Beatmap { get; }
 
         protected AutoGenerator(IBeatmap beatmap)
         {
             Beatmap = beatmap;
         }
 
-        #region Constants
-
-        // Shared amongst all modes
-        public const double KEY_UP_DELAY = 50;
-
-        #endregion
+        /// <summary>
+        /// Generate the replay of the autoplay.
+        /// </summary>
+        public abstract Replay Generate();
 
         protected virtual HitObject GetNextObject(int currentIndex)
         {
diff --git a/osu.Game/Rulesets/Replays/FramedAutoGenerator.cs b/osu.Game/Rulesets/Replays/FramedAutoGenerator.cs
new file mode 100644
index 0000000000..091eb00232
--- /dev/null
+++ b/osu.Game/Rulesets/Replays/FramedAutoGenerator.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.
+
+#nullable enable
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Replays;
+
+namespace osu.Game.Rulesets.Replays
+{
+    public abstract class FramedAutoGenerator<TFrame> : AutoGenerator
+        where TFrame : ReplayFrame
+    {
+        /// <summary>
+        /// The replay frames of the autoplay.
+        /// </summary>
+        protected readonly List<TFrame> Frames = new List<TFrame>();
+
+        protected TFrame? LastFrame => Frames.Count == 0 ? null : Frames[^1];
+
+        protected FramedAutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+        }
+
+        public sealed override Replay Generate()
+        {
+            Frames.Clear();
+            GenerateFrames();
+
+            return new Replay
+            {
+                Frames = Frames.OrderBy(frame => frame.Time).Cast<ReplayFrame>().ToList()
+            };
+        }
+
+        /// <summary>
+        /// Generate the replay frames of the autoplay and populate <see cref="Frames"/>.
+        /// </summary>
+        protected abstract void GenerateFrames();
+    }
+}

From ea35b72436d6c38a477d3ae3e8dfb11b15653248 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 6 May 2021 22:56:21 +0900
Subject: [PATCH 09788/10326] Remove unused IAutoGenerator interface

---
 osu.Game/Rulesets/Replays/IAutoGenerator.cs | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Replays/IAutoGenerator.cs

diff --git a/osu.Game/Rulesets/Replays/IAutoGenerator.cs b/osu.Game/Rulesets/Replays/IAutoGenerator.cs
deleted file mode 100644
index b1905e2b6f..0000000000
--- a/osu.Game/Rulesets/Replays/IAutoGenerator.cs
+++ /dev/null
@@ -1,12 +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.Replays;
-
-namespace osu.Game.Rulesets.Replays
-{
-    public interface IAutoGenerator
-    {
-        Replay Generate();
-    }
-}

From cf39178099c9178e5ef9136bfdabc6dbcdf5cc02 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 6 May 2021 21:53:34 +0900
Subject: [PATCH 09789/10326] Use FramedAutoGenerator in Taiko, Catch, Mania

OsuAutoGenerator is not included in this change because it uses SortedList-like thing
---
 .../Replays/CatchAutoGenerator.cs             | 20 ++++---------------
 .../Replays/ManiaAutoGenerator.cs             | 15 ++++----------
 .../Replays/TaikoAutoGenerator.cs             | 14 +++----------
 3 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index 10230b6b78..2e1e4f7e77 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -5,7 +5,6 @@ using System;
 using System.Linq;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
@@ -13,26 +12,19 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Catch.Replays
 {
-    internal class CatchAutoGenerator : AutoGenerator
+    internal class CatchAutoGenerator : FramedAutoGenerator<CatchReplayFrame>
     {
-        public const double RELEASE_DELAY = 20;
-
         public new CatchBeatmap Beatmap => (CatchBeatmap)base.Beatmap;
 
         public CatchAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        protected Replay Replay;
-
-        private CatchReplayFrame currentFrame;
-
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             if (Beatmap.HitObjects.Count == 0)
-                return Replay;
+                return;
 
             // todo: add support for HT DT
             const double dash_speed = Catcher.BASE_SPEED;
@@ -119,15 +111,11 @@ namespace osu.Game.Rulesets.Catch.Replays
                     }
                 }
             }
-
-            return Replay;
         }
 
         private void addFrame(double time, float? position = null, bool dashing = false)
         {
-            var last = currentFrame;
-            currentFrame = new CatchReplayFrame(time, position, dashing, last);
-            Replay.Frames.Add(currentFrame);
+            Frames.Add(new CatchReplayFrame(time, position, dashing, LastFrame));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index ada84dfac2..4fd105025c 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
@@ -11,7 +10,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Mania.Replays
 {
-    internal class ManiaAutoGenerator : AutoGenerator
+    internal class ManiaAutoGenerator : FramedAutoGenerator<ManiaReplayFrame>
     {
         public const double RELEASE_DELAY = 20;
 
@@ -22,8 +21,6 @@ namespace osu.Game.Rulesets.Mania.Replays
         public ManiaAutoGenerator(ManiaBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
-
             columnActions = new ManiaAction[Beatmap.TotalColumns];
 
             var normalAction = ManiaAction.Key1;
@@ -43,12 +40,10 @@ namespace osu.Game.Rulesets.Mania.Replays
             }
         }
 
-        protected Replay Replay;
-
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             if (Beatmap.HitObjects.Count == 0)
-                return Replay;
+                return;
 
             var pointGroups = generateActionPoints().GroupBy(a => a.Time).OrderBy(g => g.First().Time);
 
@@ -70,10 +65,8 @@ namespace osu.Game.Rulesets.Mania.Replays
                     }
                 }
 
-                Replay.Frames.Add(new ManiaReplayFrame(group.First().Time, actions.ToArray()));
+                Frames.Add(new ManiaReplayFrame(group.First().Time, actions.ToArray()));
             }
-
-            return Replay;
         }
 
         private IEnumerable<IActionPoint> generateActionPoints()
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index fa0134aa94..bd2b7338de 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -2,10 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Taiko.Beatmaps;
@@ -13,7 +11,7 @@ using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Replays
 {
-    public class TaikoAutoGenerator : AutoGenerator
+    public class TaikoAutoGenerator : FramedAutoGenerator<TaikoReplayFrame>
     {
         public new TaikoBeatmap Beatmap => (TaikoBeatmap)base.Beatmap;
 
@@ -22,16 +20,12 @@ namespace osu.Game.Rulesets.Taiko.Replays
         public TaikoAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        protected Replay Replay;
-        protected List<ReplayFrame> Frames => Replay.Frames;
-
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             if (Beatmap.HitObjects.Count == 0)
-                return Replay;
+                return;
 
             bool hitButton = true;
 
@@ -128,8 +122,6 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
                 hitButton = !hitButton;
             }
-
-            return Replay;
         }
     }
 }

From 95c74c906a33084142a71bd16b58d4063f237bfb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 6 May 2021 21:57:03 +0900
Subject: [PATCH 09790/10326] Use FramedAutoGenerator in template projects

---
 .../Replays/EmptyFreeformAutoGenerator.cs            | 12 ++----------
 .../Replays/PippidonAutoGenerator.cs                 | 12 ++----------
 .../Replays/EmptyScrollingAutoGenerator.cs           | 12 ++----------
 .../Replays/PippidonAutoGenerator.cs                 | 12 ++----------
 4 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
index 6d8d4215a2..5d61136f54 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
@@ -1,28 +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 osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets.EmptyFreeform.Objects;
 using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.EmptyFreeform.Replays
 {
-    public class EmptyFreeformAutoGenerator : AutoGenerator
+    public class EmptyFreeformAutoGenerator : FramedAutoGenerator<EmptyFreeformReplayFrame>
     {
-        protected Replay Replay;
-        protected List<ReplayFrame> Frames => Replay.Frames;
-
         public new Beatmap<EmptyFreeformHitObject> Beatmap => (Beatmap<EmptyFreeformHitObject>)base.Beatmap;
 
         public EmptyFreeformAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             Frames.Add(new EmptyFreeformReplayFrame());
 
@@ -35,8 +29,6 @@ namespace osu.Game.Rulesets.EmptyFreeform.Replays
                     // todo: add required inputs and extra frames.
                 });
             }
-
-            return Replay;
         }
     }
 }
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
index 9c54b82e38..f795d7ef21 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
@@ -1,28 +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 osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Pippidon.Objects;
 using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {
-    public class PippidonAutoGenerator : AutoGenerator
+    public class PippidonAutoGenerator : FramedAutoGenerator<PippidonReplayFrame>
     {
-        protected Replay Replay;
-        protected List<ReplayFrame> Frames => Replay.Frames;
-
         public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
 
         public PippidonAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             Frames.Add(new PippidonReplayFrame());
 
@@ -34,8 +28,6 @@ namespace osu.Game.Rulesets.Pippidon.Replays
                     Position = hitObject.Position,
                 });
             }
-
-            return Replay;
         }
     }
 }
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
index 7923918842..ab27fd4dcd 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
@@ -1,28 +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 osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets.EmptyScrolling.Objects;
 using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.EmptyScrolling.Replays
 {
-    public class EmptyScrollingAutoGenerator : AutoGenerator
+    public class EmptyScrollingAutoGenerator : FramedAutoGenerator<EmptyScrollingReplayFrame>
     {
-        protected Replay Replay;
-        protected List<ReplayFrame> Frames => Replay.Frames;
-
         public new Beatmap<EmptyScrollingHitObject> Beatmap => (Beatmap<EmptyScrollingHitObject>)base.Beatmap;
 
         public EmptyScrollingAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             Frames.Add(new EmptyScrollingReplayFrame());
 
@@ -34,8 +28,6 @@ namespace osu.Game.Rulesets.EmptyScrolling.Replays
                     // todo: add required inputs and extra frames.
                 });
             }
-
-            return Replay;
         }
     }
 }
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
index bd99cdcdbd..df2cfb8731 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
@@ -2,29 +2,23 @@
 // 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.Replays;
 using osu.Game.Rulesets.Pippidon.Objects;
 using osu.Game.Rulesets.Pippidon.UI;
 using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {
-    public class PippidonAutoGenerator : AutoGenerator
+    public class PippidonAutoGenerator : FramedAutoGenerator<PippidonReplayFrame>
     {
-        protected Replay Replay;
-        protected List<ReplayFrame> Frames => Replay.Frames;
-
         public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
 
         public PippidonAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             int currentLane = 0;
 
@@ -55,8 +49,6 @@ namespace osu.Game.Rulesets.Pippidon.Replays
 
                 currentLane = hitObject.Lane;
             }
-
-            return Replay;
         }
 
         private void addFrame(double time, PippidonAction direction)

From 207f7f1e563ce252eb88affc19cdd09544d80212 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 7 May 2021 00:31:12 +0900
Subject: [PATCH 09791/10326] Rename FramedAutoGenerator<T> -> AutoGenerator<T>

---
 .../Replays/EmptyFreeformAutoGenerator.cs     |  2 +-
 .../Replays/PippidonAutoGenerator.cs          |  2 +-
 .../Replays/EmptyScrollingAutoGenerator.cs    |  2 +-
 .../Replays/PippidonAutoGenerator.cs          |  2 +-
 .../Replays/CatchAutoGenerator.cs             |  2 +-
 .../Replays/ManiaAutoGenerator.cs             |  2 +-
 .../Replays/TaikoAutoGenerator.cs             |  2 +-
 osu.Game/Rulesets/Replays/AutoGenerator.cs    | 36 +++++++++++++++
 .../Rulesets/Replays/FramedAutoGenerator.cs   | 44 -------------------
 9 files changed, 43 insertions(+), 51 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Replays/FramedAutoGenerator.cs

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
index 5d61136f54..62f394d1ce 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.EmptyFreeform.Replays
 {
-    public class EmptyFreeformAutoGenerator : FramedAutoGenerator<EmptyFreeformReplayFrame>
+    public class EmptyFreeformAutoGenerator : AutoGenerator<EmptyFreeformReplayFrame>
     {
         public new Beatmap<EmptyFreeformHitObject> Beatmap => (Beatmap<EmptyFreeformHitObject>)base.Beatmap;
 
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
index f795d7ef21..612288257d 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {
-    public class PippidonAutoGenerator : FramedAutoGenerator<PippidonReplayFrame>
+    public class PippidonAutoGenerator : AutoGenerator<PippidonReplayFrame>
     {
         public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
 
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
index ab27fd4dcd..1058f756f3 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.EmptyScrolling.Replays
 {
-    public class EmptyScrollingAutoGenerator : FramedAutoGenerator<EmptyScrollingReplayFrame>
+    public class EmptyScrollingAutoGenerator : AutoGenerator<EmptyScrollingReplayFrame>
     {
         public new Beatmap<EmptyScrollingHitObject> Beatmap => (Beatmap<EmptyScrollingHitObject>)base.Beatmap;
 
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
index df2cfb8731..724026273d 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {
-    public class PippidonAutoGenerator : FramedAutoGenerator<PippidonReplayFrame>
+    public class PippidonAutoGenerator : AutoGenerator<PippidonReplayFrame>
     {
         public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
 
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index 2e1e4f7e77..a81703119a 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -12,7 +12,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Catch.Replays
 {
-    internal class CatchAutoGenerator : FramedAutoGenerator<CatchReplayFrame>
+    internal class CatchAutoGenerator : AutoGenerator<CatchReplayFrame>
     {
         public new CatchBeatmap Beatmap => (CatchBeatmap)base.Beatmap;
 
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index 4fd105025c..517b708691 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Mania.Replays
 {
-    internal class ManiaAutoGenerator : FramedAutoGenerator<ManiaReplayFrame>
+    internal class ManiaAutoGenerator : AutoGenerator<ManiaReplayFrame>
     {
         public const double RELEASE_DELAY = 20;
 
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index bd2b7338de..5fd281f9fa 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Replays
 {
-    public class TaikoAutoGenerator : FramedAutoGenerator<TaikoReplayFrame>
+    public class TaikoAutoGenerator : AutoGenerator<TaikoReplayFrame>
     {
         public new TaikoBeatmap Beatmap => (TaikoBeatmap)base.Beatmap;
 
diff --git a/osu.Game/Rulesets/Replays/AutoGenerator.cs b/osu.Game/Rulesets/Replays/AutoGenerator.cs
index 4bdd5b094d..6ce857b14b 100644
--- a/osu.Game/Rulesets/Replays/AutoGenerator.cs
+++ b/osu.Game/Rulesets/Replays/AutoGenerator.cs
@@ -1,6 +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 JetBrains.Annotations;
 using osu.Game.Beatmaps;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Objects;
@@ -37,4 +40,37 @@ namespace osu.Game.Rulesets.Replays
             return Beatmap.HitObjects[currentIndex + 1];
         }
     }
+
+    public abstract class AutoGenerator<TFrame> : AutoGenerator
+        where TFrame : ReplayFrame
+    {
+        /// <summary>
+        /// The replay frames of the autoplay.
+        /// </summary>
+        protected readonly List<TFrame> Frames = new List<TFrame>();
+
+        [CanBeNull]
+        protected TFrame LastFrame => Frames.Count == 0 ? null : Frames[^1];
+
+        protected AutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+        }
+
+        public sealed override Replay Generate()
+        {
+            Frames.Clear();
+            GenerateFrames();
+
+            return new Replay
+            {
+                Frames = Frames.OrderBy(frame => frame.Time).Cast<ReplayFrame>().ToList()
+            };
+        }
+
+        /// <summary>
+        /// Generate the replay frames of the autoplay and populate <see cref="Frames"/>.
+        /// </summary>
+        protected abstract void GenerateFrames();
+    }
 }
diff --git a/osu.Game/Rulesets/Replays/FramedAutoGenerator.cs b/osu.Game/Rulesets/Replays/FramedAutoGenerator.cs
deleted file mode 100644
index 091eb00232..0000000000
--- a/osu.Game/Rulesets/Replays/FramedAutoGenerator.cs
+++ /dev/null
@@ -1,44 +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.
-
-#nullable enable
-
-using System.Collections.Generic;
-using System.Linq;
-using osu.Game.Beatmaps;
-using osu.Game.Replays;
-
-namespace osu.Game.Rulesets.Replays
-{
-    public abstract class FramedAutoGenerator<TFrame> : AutoGenerator
-        where TFrame : ReplayFrame
-    {
-        /// <summary>
-        /// The replay frames of the autoplay.
-        /// </summary>
-        protected readonly List<TFrame> Frames = new List<TFrame>();
-
-        protected TFrame? LastFrame => Frames.Count == 0 ? null : Frames[^1];
-
-        protected FramedAutoGenerator(IBeatmap beatmap)
-            : base(beatmap)
-        {
-        }
-
-        public sealed override Replay Generate()
-        {
-            Frames.Clear();
-            GenerateFrames();
-
-            return new Replay
-            {
-                Frames = Frames.OrderBy(frame => frame.Time).Cast<ReplayFrame>().ToList()
-            };
-        }
-
-        /// <summary>
-        /// Generate the replay frames of the autoplay and populate <see cref="Frames"/>.
-        /// </summary>
-        protected abstract void GenerateFrames();
-    }
-}

From 283488ea53f3c240ca1c856bb294ab8247a476d1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 03:36:30 +0300
Subject: [PATCH 09792/10326] Use `TransformImmediately` instead at beatmap
 listing search control

Applies two changes:
 - Use `TransformImmediately` which achieves the same wanted transition behaviour without any issues.
 - Move the transition behaviour override into `BeatmapListingSearchControl` in a nested subclass of `UpdateableBeatmapSetCover`.
---
 osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs   | 4 ----
 .../Overlays/BeatmapListing/BeatmapListingSearchControl.cs | 7 ++++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index b376690436..3a4423e42e 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -41,10 +41,6 @@ namespace osu.Game.Beatmaps.Drawables
         protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
             => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad);
 
-        // by default, ModelBackedDrawable hides the old drawable only after the new one has been fully loaded.
-        // this can lead to weird appearance if the cover is not fully opaque, so fade out as soon as a new load is requested in this particular case.
-        protected override void OnLoadStarted() => ApplyHideTransforms(DisplayedDrawable);
-
         protected override Drawable CreateDrawable(BeatmapSetInfo model)
         {
             if (model == null)
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 1576431d40..97ccb66599 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 {
                     RelativeSizeAxes = Axes.Both,
                     Masking = true,
-                    Child = beatmapCover = new UpdateableBeatmapSetCover
+                    Child = beatmapCover = new TopSearchBeatmapSetCover
                     {
                         RelativeSizeAxes = Axes.Both,
                         Alpha = 0,
@@ -184,5 +184,10 @@ namespace osu.Game.Overlays.BeatmapListing
                 return true;
             }
         }
+
+        private class TopSearchBeatmapSetCover : UpdateableBeatmapSetCover
+        {
+            protected override bool TransformImmediately => true;
+        }
     }
 }

From 54fe10c82a855a16c88f8781a9ae12dc42df7b0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 10:36:03 +0900
Subject: [PATCH 09793/10326] Refactor `SliderSelectionBlueprint` to not
 reference blueprint pieces for input handling

---
 .../Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs   | 6 ------
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs     | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
index 6e22c35ab3..ece9c7a757 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -26,10 +26,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             {
                 AccentColour = Color4.Transparent
             };
-
-            // SliderSelectionBlueprint relies on calling ReceivePositionalInputAt on this drawable to determine whether selection should occur.
-            // Without AlwaysPresent, a movement in a parent container (ie. the editor composer area resizing) could cause incorrect input handling.
-            AlwaysPresent = true;
         }
 
         [BackgroundDependencyLoader]
@@ -54,7 +50,5 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         }
 
         public void RecyclePath() => body.RecyclePath();
-
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => body.ReceivePositionalInputAt(screenSpacePos);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 88fcb1e715..32d2fba25e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -240,10 +240,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 ScreenSpaceSelectionPoint => BodyPiece.ToScreenSpace(BodyPiece.PathStartLocation);
+        public override Vector2 ScreenSpaceSelectionPoint => this.ToScreenSpace(slider.HitObject.StackedPosition);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
+            slider.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
 
         protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
     }

From 84da24700204724cde9a8b90506b078add49c964 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 05:32:55 +0300
Subject: [PATCH 09794/10326] Fix editor clock using the wrong beatmap track on
 creation

---
 osu.Game/Screens/Edit/Editor.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index da0e9ebbaf..138d8cfaff 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Screens.Edit
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             clock = new EditorClock(playableBeatmap, beatDivisor) { IsCoupled = false };
 
-            UpdateClockSource();
+            updateClockSource(loadableBeatmap);
 
             dependencies.CacheAs(clock);
             AddInternal(clock);
@@ -308,9 +308,11 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// If the beatmap's track has changed, this method must be called to keep the editor in a valid state.
         /// </summary>
-        public void UpdateClockSource()
+        public void UpdateClockSource() => updateClockSource(Beatmap.Value);
+
+        private void updateClockSource(WorkingBeatmap beatmap)
         {
-            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
+            var sourceClock = (IAdjustableClock)beatmap.Track ?? new StopwatchClock();
             clock.ChangeSource(sourceClock);
         }
 

From 539643c72b390b1c40b8fb8340b37f33ef91d7d5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 07:18:43 +0300
Subject: [PATCH 09795/10326] Set loadable beatmap track to clock immediately
 in BDL

This reverts commit 84da24700204724cde9a8b90506b078add49c964.

Use loadable beatmap track for clock directly in BDL
---
 osu.Game/Screens/Edit/Editor.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 138d8cfaff..a4c331c4e0 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -144,8 +144,7 @@ namespace osu.Game.Screens.Edit
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             clock = new EditorClock(playableBeatmap, beatDivisor) { IsCoupled = false };
-
-            updateClockSource(loadableBeatmap);
+            clock.ChangeSource(loadableBeatmap.Track);
 
             dependencies.CacheAs(clock);
             AddInternal(clock);
@@ -308,11 +307,9 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// If the beatmap's track has changed, this method must be called to keep the editor in a valid state.
         /// </summary>
-        public void UpdateClockSource() => updateClockSource(Beatmap.Value);
-
-        private void updateClockSource(WorkingBeatmap beatmap)
+        public void UpdateClockSource()
         {
-            var sourceClock = (IAdjustableClock)beatmap.Track ?? new StopwatchClock();
+            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
             clock.ChangeSource(sourceClock);
         }
 

From f9d99a98826525b58d8a076f772da6a9a77329ec Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 07:25:14 +0300
Subject: [PATCH 09796/10326] Mark `WorkingBeatmap.Track` as not null

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index e0eeaf6db0..bef258753e 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -298,6 +298,7 @@ namespace osu.Game.Beatmaps
         /// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called.
         /// This generally happens via MusicController when changing the global beatmap.
         /// </summary>
+        [NotNull]
         public Track Track
         {
             get

From 71547bece0dcd99cfbe6ba95bd2e42066b6eb686 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 07:43:06 +0300
Subject: [PATCH 09797/10326] Remove any null-coalescing/conditionals in
 `WorkingBeatmap.Track` usages

---
 osu.Game/Screens/Edit/Editor.cs               | 9 ++-------
 osu.Game/Tests/Visual/EditorClockTestScene.cs | 3 +--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index a4c331c4e0..434683a016 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -17,7 +17,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -307,11 +306,7 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// If the beatmap's track has changed, this method must be called to keep the editor in a valid state.
         /// </summary>
-        public void UpdateClockSource()
-        {
-            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
-            clock.ChangeSource(sourceClock);
-        }
+        public void UpdateClockSource() => clock.ChangeSource(Beatmap.Value.Track);
 
         protected void Save()
         {
@@ -582,7 +577,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            Beatmap.Value.Track?.Stop();
+            Beatmap.Value.Track.Stop();
 
             if (seekToStart)
             {
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 79cfee8518..34393fba7d 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit;
@@ -46,7 +45,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource((IAdjustableClock)e.NewValue.Track ?? new StopwatchClock());
+            Clock.ChangeSource(e.NewValue.Track);
             Clock.ProcessFrame();
         }
 

From c7325f0f775357a51f8d1c9963c825f8fc32cd2a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 08:07:12 +0300
Subject: [PATCH 09798/10326] Add missing load delay

That was a bad one... `ModelBackedDrawable` has a default of 0ms load delay, while previously the wrapper created for beatmap set cover used default 500ms, this change is bringing the load delay back, to avoid firing hundreds of web requests just when doing a quick long scroll on beatmap listing.
---
 osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index 3a4423e42e..7248c9213c 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -36,7 +36,9 @@ namespace osu.Game.Beatmaps.Drawables
             };
         }
 
-        protected override double TransformDuration => 400.0;
+        protected override double LoadDelay => 500;
+
+        protected override double TransformDuration => 400;
 
         protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
             => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad);

From 37f44d2e37602ec557ed7fda6ca7afced0bfec81 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 08:27:56 +0300
Subject: [PATCH 09799/10326] Revert wrong not-null track changes

This reverts commit f9d99a98826525b58d8a076f772da6a9a77329ec.
This reverts commit 71547bece0dcd99cfbe6ba95bd2e42066b6eb686.
---
 osu.Game/Beatmaps/WorkingBeatmap.cs           | 1 -
 osu.Game/Screens/Edit/Editor.cs               | 9 +++++++--
 osu.Game/Tests/Visual/EditorClockTestScene.cs | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index bef258753e..e0eeaf6db0 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -298,7 +298,6 @@ namespace osu.Game.Beatmaps
         /// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called.
         /// This generally happens via MusicController when changing the global beatmap.
         /// </summary>
-        [NotNull]
         public Track Track
         {
             get
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 434683a016..a4c331c4e0 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -17,6 +17,7 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -306,7 +307,11 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// If the beatmap's track has changed, this method must be called to keep the editor in a valid state.
         /// </summary>
-        public void UpdateClockSource() => clock.ChangeSource(Beatmap.Value.Track);
+        public void UpdateClockSource()
+        {
+            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
+            clock.ChangeSource(sourceClock);
+        }
 
         protected void Save()
         {
@@ -577,7 +582,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            Beatmap.Value.Track.Stop();
+            Beatmap.Value.Track?.Stop();
 
             if (seekToStart)
             {
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 34393fba7d..79cfee8518 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit;
@@ -45,7 +46,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource(e.NewValue.Track);
+            Clock.ChangeSource((IAdjustableClock)e.NewValue.Track ?? new StopwatchClock());
             Clock.ProcessFrame();
         }
 

From b1134c3857980e5f473dc3ba3f57d1ab7bdcabdb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 08:30:50 +0300
Subject: [PATCH 09800/10326] Guard against potentially null track if ever

---
 osu.Game/Screens/Edit/Editor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index a4c331c4e0..78d5c24108 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Screens.Edit
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             clock = new EditorClock(playableBeatmap, beatDivisor) { IsCoupled = false };
-            clock.ChangeSource(loadableBeatmap.Track);
+            clock.ChangeSource((IAdjustableClock)loadableBeatmap.Track ?? new StopwatchClock());
 
             dependencies.CacheAs(clock);
             AddInternal(clock);

From bdfe44ddca7235cd7a42bac8015f2e55b13bf905 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 13:19:30 +0700
Subject: [PATCH 09801/10326] change OsuMarkdownListItem to abstract class

---
 .../Markdown/OsuMarkdownListItem.cs           | 72 +++----------------
 1 file changed, 10 insertions(+), 62 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index b586bb7f30..8c4c3e1da2 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -1,41 +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 Markdig.Syntax;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
 using osuTK;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
-    public class OsuMarkdownListItem : CompositeDrawable
+    public abstract class OsuMarkdownListItem : CompositeDrawable
     {
-        private const float ordered_left_padding = 30;
-        private const float unordered_left_padding = 20;
-
-        private readonly int level;
-        private readonly int order;
-        private readonly bool isOrdered;
-
         [Resolved]
         private IMarkdownTextComponent parentTextComponent { get; set; }
 
-        public FillFlowContainer Content { get; }
+        public FillFlowContainer Content { get; private set; }
 
-        public OsuMarkdownListItem(ListItemBlock listItemBlock, int level)
+        protected OsuMarkdownListItem()
         {
-            this.level = level;
-            order = listItemBlock.Order;
-            isOrdered = ((ListBlock)listItemBlock.Parent).IsOrdered;
-
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
-            Padding = new MarginPadding { Left = isOrdered ? ordered_left_padding : unordered_left_padding };
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             InternalChildren = new Drawable[]
             {
+                CreateMarker(),
                 Content = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Y,
@@ -46,51 +39,6 @@ namespace osu.Game.Graphics.Containers.Markdown
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            var marker = parentTextComponent.CreateSpriteText();
-            marker.Text = GetTextMarker(level, isOrdered);
-
-            if (isOrdered)
-            {
-                marker.X = -ordered_left_padding;
-            }
-            else
-            {
-                marker.Font = OsuFont.GetFont(size: marker.Font.Size / 2);
-                marker.Origin = Anchor.Centre;
-                marker.X = -unordered_left_padding / 2;
-                marker.Y = marker.Font.Size;
-            }
-
-            AddInternal(marker);
-        }
-
-        /// <summary>
-        /// Get text marker based on <paramref name="level"/> and <paramref name="isOrdered"/>.
-        /// </summary>
-        /// <param name="level">The markdown level of current list item.</param>
-        /// <param name="isOrdered">Is true if the list item is an ordered list.</param>
-        /// <returns></returns>
-        protected virtual string GetTextMarker(int level, bool isOrdered)
-        {
-            if (isOrdered)
-            {
-                return $"{order}.";
-            }
-
-            switch (level)
-            {
-                case 1:
-                    return "●";
-
-                case 2:
-                    return "○";
-
-                default:
-                    return "■";
-            }
-        }
+        protected virtual SpriteText CreateMarker() => parentTextComponent.CreateSpriteText();
     }
 }

From dfcf760b7be0592eb4212e3fdc9bc21073eaaa59 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 13:20:06 +0700
Subject: [PATCH 09802/10326] add OsuMarkdownOrderedListItem

---
 .../Markdown/OsuMarkdownOrderedListItem.cs    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.cs
new file mode 100644
index 0000000000..8fedb189b2
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 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;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownOrderedListItem : OsuMarkdownListItem
+    {
+        private const float left_padding = 30;
+
+        private readonly int order;
+
+        public OsuMarkdownOrderedListItem(int order)
+        {
+            this.order = order;
+            Padding = new MarginPadding { Left = left_padding };
+        }
+
+        protected override SpriteText CreateMarker() => base.CreateMarker().With(t =>
+        {
+            t.X = -left_padding;
+            t.Text = $"{order}.";
+        });
+    }
+}

From 9233248a0ba84919802e8dbae203a5a95b2fceaa Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 13:20:20 +0700
Subject: [PATCH 09803/10326] add OsuMarkdownUnorderedListItem

---
 .../Markdown/OsuMarkdownUnorderedListItem.cs  | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
new file mode 100644
index 0000000000..8bfaf8ad21
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.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.Framework.Graphics.Sprites;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownUnorderedListItem : OsuMarkdownListItem
+    {
+        private const float left_padding = 20;
+
+        private readonly int level;
+
+        public OsuMarkdownUnorderedListItem(int level)
+        {
+            this.level = level;
+
+            Padding = new MarginPadding { Left = left_padding };
+        }
+
+        protected override SpriteText CreateMarker() => base.CreateMarker().With(t =>
+        {
+            t.Text = GetTextMarker(level);
+            t.Font = t.Font.With(size: t.Font.Size / 2);
+            t.Origin = Anchor.Centre;
+            t.X = -left_padding / 2;
+            t.Y = t.Font.Size;
+        });
+
+        /// <summary>
+        /// Get text marker based on <paramref name="level"/>
+        /// </summary>
+        /// <param name="level">The markdown level of current list item.</param>
+        /// <returns></returns>
+        protected virtual string GetTextMarker(int level)
+        {
+            switch (level)
+            {
+                case 1:
+                    return "●";
+
+                case 2:
+                    return "○";
+
+                default:
+                    return "■";
+            }
+        }
+    }
+}

From 5b003750f87044d16288b7b992023cc8011bf832 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 13:20:48 +0700
Subject: [PATCH 09804/10326] change CreateListItem method in
 OsuMarkdownContainer

---
 .../Containers/Markdown/OsuMarkdownContainer.cs       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index c66f3fbca2..6facf4e26c 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Graphics.Containers.Markdown
                     break;
 
                 case ListItemBlock listItemBlock:
-                    var childContainer = CreateListItem(listItemBlock, level);
+                    var isOrdered = ((ListBlock)listItemBlock.Parent).IsOrdered;
+                    var childContainer = CreateListItem(listItemBlock, level, isOrdered);
                     container.Add(childContainer);
                     foreach (var single in listItemBlock)
                         base.AddMarkdownComponent(single, childContainer.Content, level);
@@ -64,7 +65,13 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(0)
         };
 
-        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(listItemBlock, level);
+        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level, bool isOrdered)
+        {
+            if (isOrdered)
+                return new OsuMarkdownOrderedListItem(listItemBlock.Order);
+
+            return new OsuMarkdownUnorderedListItem(level);
+        }
 
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)

From 7c4e54a1d43990996e015affd03911514dc18952 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 09:53:54 +0300
Subject: [PATCH 09805/10326] Unrevert null-colaescing/conditionals removal

---
 osu.Game/Screens/Edit/Editor.cs               | 8 ++------
 osu.Game/Tests/Visual/EditorClockTestScene.cs | 3 +--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 78d5c24108..50dcb84235 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -307,11 +307,7 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// If the beatmap's track has changed, this method must be called to keep the editor in a valid state.
         /// </summary>
-        public void UpdateClockSource()
-        {
-            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
-            clock.ChangeSource(sourceClock);
-        }
+        public void UpdateClockSource() => clock.ChangeSource(Beatmap.Value.Track);
 
         protected void Save()
         {
@@ -582,7 +578,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            Beatmap.Value.Track?.Stop();
+            Beatmap.Value.Track.Stop();
 
             if (seekToStart)
             {
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 79cfee8518..34393fba7d 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit;
@@ -46,7 +45,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource((IAdjustableClock)e.NewValue.Track ?? new StopwatchClock());
+            Clock.ChangeSource(e.NewValue.Track);
             Clock.ProcessFrame();
         }
 

From fc2a527e9d419040697cd4e075c7ae04d1cd2c82 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 09:54:58 +0300
Subject: [PATCH 09806/10326] Revert "Guard against potentially null track if
 ever"

This reverts commit b1134c3857980e5f473dc3ba3f57d1ab7bdcabdb.
---
 osu.Game/Screens/Edit/Editor.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 50dcb84235..434683a016 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -17,7 +17,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -144,7 +143,7 @@ namespace osu.Game.Screens.Edit
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             clock = new EditorClock(playableBeatmap, beatDivisor) { IsCoupled = false };
-            clock.ChangeSource((IAdjustableClock)loadableBeatmap.Track ?? new StopwatchClock());
+            clock.ChangeSource(loadableBeatmap.Track);
 
             dependencies.CacheAs(clock);
             AddInternal(clock);

From a2e4fb5b6b0cc7cd97fa439a9e2e1b13dcb6f10e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 16:10:57 +0900
Subject: [PATCH 09807/10326] Update `ScoreCounter` components to bind outwards

---
 .../TestSceneSkinnableScoreCounter.cs         | 26 ++++------
 .../Graphics/UserInterface/ScoreCounter.cs    |  3 +-
 .../Screens/Play/HUD/DefaultScoreCounter.cs   |  3 +-
 .../Screens/Play/HUD/GameplayScoreCounter.cs  | 46 ++++++++++++++++++
 osu.Game/Screens/Play/HUD/IScoreCounter.cs    | 25 ----------
 .../Screens/Play/HUD/SkinnableScoreCounter.cs | 47 +------------------
 osu.Game/Screens/Play/HUDOverlay.cs           |  1 -
 osu.Game/Skinning/LegacyScoreCounter.cs       |  4 +-
 8 files changed, 60 insertions(+), 95 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/IScoreCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
index e212ceeba7..4f2183711e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
@@ -4,10 +4,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -18,37 +20,27 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create combo counters", () => SetContents(() =>
-            {
-                var comboCounter = new SkinnableScoreCounter();
-                comboCounter.Current.Value = 1;
-                return comboCounter;
-            }));
+            AddStep("Create score counters", () => SetContents(() => new SkinnableScoreCounter()));
         }
 
         [Test]
         public void TestScoreCounterIncrementing()
         {
-            AddStep(@"Reset all", delegate
-            {
-                foreach (var s in scoreCounters)
-                    s.Current.Value = 0;
-            });
+            AddStep(@"Reset all", () => scoreProcessor.TotalScore.Value = 0);
 
-            AddStep(@"Hit! :D", delegate
-            {
-                foreach (var s in scoreCounters)
-                    s.Current.Value += 300;
-            });
+            AddStep(@"Hit! :D", () => scoreProcessor.TotalScore.Value += 300);
         }
 
         [Test]
         public void TestVeryLargeScore()
         {
-            AddStep("set large score", () => scoreCounters.ForEach(counter => counter.Current.Value = 1_000_000_000));
+            AddStep("set large score", () => scoreCounters.ForEach(counter => scoreProcessor.TotalScore.Value = 1_000_000_000));
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index d75e49a4ce..5747c846eb 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
@@ -4,11 +4,10 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public abstract class ScoreCounter : RollingCounter<double>, IScoreCounter
+    public abstract class ScoreCounter : RollingCounter<double>
     {
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index 1dcfe2e067..84db605d53 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -4,11 +4,10 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultScoreCounter : ScoreCounter
+    public class DefaultScoreCounter : GameplayScoreCounter
     {
         public DefaultScoreCounter()
             : base(6)
diff --git a/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs b/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
new file mode 100644
index 0000000000..e09630d2c4
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/GameplayScoreCounter.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public abstract class GameplayScoreCounter : ScoreCounter
+    {
+        private Bindable<ScoringMode> scoreDisplayMode;
+
+        protected GameplayScoreCounter(int leading = 0, bool useCommaSeparator = false)
+            : base(leading, useCommaSeparator)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config, ScoreProcessor scoreProcessor)
+        {
+            scoreDisplayMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
+            scoreDisplayMode.BindValueChanged(scoreMode =>
+            {
+                switch (scoreMode.NewValue)
+                {
+                    case ScoringMode.Standardised:
+                        RequiredDisplayDigits.Value = 6;
+                        break;
+
+                    case ScoringMode.Classic:
+                        RequiredDisplayDigits.Value = 8;
+                        break;
+
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(scoreMode));
+                }
+            }, true);
+
+            Current.BindTo(scoreProcessor.TotalScore);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/IScoreCounter.cs b/osu.Game/Screens/Play/HUD/IScoreCounter.cs
deleted file mode 100644
index 7f5e81d5ef..0000000000
--- a/osu.Game/Screens/Play/HUD/IScoreCounter.cs
+++ /dev/null
@@ -1,25 +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;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// An interface providing a set of methods to update a score counter.
-    /// </summary>
-    public interface IScoreCounter : IDrawable
-    {
-        /// <summary>
-        /// The current score to be displayed.
-        /// </summary>
-        Bindable<double> Current { get; }
-
-        /// <summary>
-        /// The number of digits required to display most sane scores.
-        /// This may be exceeded in very rare cases, but is useful to pad or space the display to avoid it jumping around.
-        /// </summary>
-        Bindable<int> RequiredDisplayDigits { get; }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
index b46f5684b1..cc9a712e97 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
@@ -1,61 +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;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Game.Configuration;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableScoreCounter : SkinnableDrawable, IScoreCounter
+    public class SkinnableScoreCounter : SkinnableDrawable
     {
-        public Bindable<double> Current { get; } = new Bindable<double>();
-
-        private Bindable<ScoringMode> scoreDisplayMode;
-
-        public Bindable<int> RequiredDisplayDigits { get; } = new Bindable<int>();
-
         public SkinnableScoreCounter()
             : base(new HUDSkinComponent(HUDSkinComponents.ScoreCounter), _ => new DefaultScoreCounter())
         {
             CentreComponent = false;
         }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            scoreDisplayMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
-            scoreDisplayMode.BindValueChanged(scoreMode =>
-            {
-                switch (scoreMode.NewValue)
-                {
-                    case ScoringMode.Standardised:
-                        RequiredDisplayDigits.Value = 6;
-                        break;
-
-                    case ScoringMode.Classic:
-                        RequiredDisplayDigits.Value = 8;
-                        break;
-
-                    default:
-                        throw new ArgumentOutOfRangeException(nameof(scoreMode));
-                }
-            }, true);
-        }
-
-        private IScoreCounter skinnedCounter;
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            skinnedCounter = Drawable as IScoreCounter;
-
-            skinnedCounter?.Current.BindTo(Current);
-            skinnedCounter?.RequiredDisplayDigits.BindTo(RequiredDisplayDigits);
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 83897c5167..c887fb78e0 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -320,7 +320,6 @@ namespace osu.Game.Screens.Play
 
         protected virtual void BindScoreProcessor(ScoreProcessor processor)
         {
-            ScoreCounter?.Current.BindTo(processor.TotalScore);
             AccuracyCounter?.Current.BindTo(processor.Accuracy);
 
             if (HealthDisplay is IHealthDisplay shd)
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 1d330ef495..e385caf304 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -4,12 +4,12 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyScoreCounter : ScoreCounter
+    public class LegacyScoreCounter : GameplayScoreCounter
     {
         private readonly ISkin skin;
 

From ad398165a2d38870173df9b82034691d8c9c8d4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 16:26:54 +0900
Subject: [PATCH 09808/10326] Update `AccuracyCounter` components to use DI to
 attach data source

---
 .../TestSceneSkinnableAccuracyCounter.cs      | 26 ++++++-------------
 .../Play/HUD/DefaultAccuracyCounter.cs        |  3 +--
 .../Play/HUD/GameplayAccuracyCounter.cs       | 18 +++++++++++++
 osu.Game/Screens/Play/HUD/IAccuracyCounter.cs | 19 --------------
 .../Play/HUD/SkinnableAccuracyCounter.cs      | 12 +--------
 osu.Game/Skinning/LegacyAccuracyCounter.cs    |  3 +--
 6 files changed, 29 insertions(+), 52 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/IAccuracyCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
index 709929dcb0..34356184a2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
@@ -4,9 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -17,33 +19,21 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create combo counters", () => SetContents(() =>
-            {
-                var accuracyCounter = new SkinnableAccuracyCounter();
-
-                accuracyCounter.Current.Value = 1;
-
-                return accuracyCounter;
-            }));
+            AddStep("Create combo counters", () => SetContents(() => new SkinnableAccuracyCounter()));
         }
 
         [Test]
         public void TestChangingAccuracy()
         {
-            AddStep(@"Reset all", delegate
-            {
-                foreach (var s in accuracyCounters)
-                    s.Current.Value = 1;
-            });
+            AddStep(@"Reset all", () => scoreProcessor.Accuracy.Value = 1);
 
-            AddStep(@"Hit! :D", delegate
-            {
-                foreach (var s in accuracyCounters)
-                    s.Current.Value -= 0.023f;
-            });
+            AddStep(@"Hit! :D", () => scoreProcessor.Accuracy.Value -= 0.23);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index d5d8ec570a..be1a4ad6b3 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -4,12 +4,11 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultAccuracyCounter : PercentageCounter, IAccuracyCounter
+    public class DefaultAccuracyCounter : GameplayAccuracyCounter
     {
         private readonly Vector2 offset = new Vector2(-20, 5);
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs
new file mode 100644
index 0000000000..7a63084812
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.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.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public abstract class GameplayAccuracyCounter : PercentageCounter
+    {
+        [BackgroundDependencyLoader]
+        private void load(ScoreProcessor scoreProcessor)
+        {
+            Current.BindTo(scoreProcessor.Accuracy);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/IAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/IAccuracyCounter.cs
deleted file mode 100644
index 0199250a08..0000000000
--- a/osu.Game/Screens/Play/HUD/IAccuracyCounter.cs
+++ /dev/null
@@ -1,19 +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;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// An interface providing a set of methods to update a accuracy counter.
-    /// </summary>
-    public interface IAccuracyCounter : IDrawable
-    {
-        /// <summary>
-        /// The current accuracy to be displayed.
-        /// </summary>
-        Bindable<double> Current { get; }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index 76c9c30813..17c2493d2d 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
@@ -6,7 +6,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableAccuracyCounter : SkinnableDrawable, IAccuracyCounter
+    public class SkinnableAccuracyCounter : SkinnableDrawable
     {
         public Bindable<double> Current { get; } = new Bindable<double>();
 
@@ -15,15 +15,5 @@ namespace osu.Game.Screens.Play.HUD
         {
             CentreComponent = false;
         }
-
-        private IAccuracyCounter skinnedCounter;
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            skinnedCounter = Drawable as IAccuracyCounter;
-            skinnedCounter?.Current.BindTo(Current);
-        }
     }
 }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 7d6f1dc916..638faa8f2b 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -4,14 +4,13 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyAccuracyCounter : PercentageCounter, IAccuracyCounter
+    public class LegacyAccuracyCounter : GameplayAccuracyCounter
     {
         private readonly ISkin skin;
 

From 3524cb792444dd1f400a8e54bb0d4ce425d48b4f Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:36:35 +0700
Subject: [PATCH 09809/10326] simplify CreateSpriteText in markdown heading

---
 .../Graphics/Containers/Markdown/OsuMarkdownHeading.cs    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
index a7fecc6e25..40eb4cad15 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Markdig.Syntax;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Sprites;
 
@@ -68,12 +69,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         {
             public FontWeight Weight { get; set; }
 
-            protected override SpriteText CreateSpriteText()
-            {
-                var spriteText = base.CreateSpriteText();
-                spriteText.Font = spriteText.Font.With(weight: Weight);
-                return spriteText;
-            }
+            protected override SpriteText CreateSpriteText() => base.CreateSpriteText().With(t => t.Font = t.Font.With(weight: Weight));
         }
     }
 }

From 17b8963cf8db3f908359905bded8907f49398503 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:38:19 +0700
Subject: [PATCH 09810/10326] simplify CreateSpriteText in markdown table cell

---
 .../Graphics/Containers/Markdown/OsuMarkdownTableCell.cs   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
index fca85e02a8..763c9d7536 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
@@ -59,12 +59,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         {
             public FontWeight Weight { get; set; }
 
-            protected override SpriteText CreateSpriteText()
-            {
-                var spriteText = base.CreateSpriteText();
-                spriteText.Font = spriteText.Font.With(weight: Weight);
-                return spriteText;
-            }
+            protected override SpriteText CreateSpriteText() => base.CreateSpriteText().With(t => t.Font = t.Font.With(weight: Weight));
         }
     }
 }

From 79a1d7b2b39d018b231abc2508ab1c1494acd39d Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:40:01 +0700
Subject: [PATCH 09811/10326] simplify CreateEmphasisedSpriteText

---
 .../Containers/Markdown/OsuMarkdownTextFlowContainer.cs    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
index 517143c2db..1550b8401d 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -3,6 +3,7 @@
 
 using Markdig.Syntax.Inlines;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Sprites;
@@ -28,10 +29,6 @@ namespace osu.Game.Graphics.Containers.Markdown
             => AddText(codeInline.Content, t => { t.Colour = colourProvider.Light1; });
 
         protected override SpriteText CreateEmphasisedSpriteText(bool bold, bool italic)
-        {
-            var spriteText = CreateSpriteText();
-            spriteText.Font = spriteText.Font.With(weight: bold ? FontWeight.Bold : FontWeight.Regular, italics: italic);
-            return spriteText;
-        }
+            => CreateSpriteText().With(t => t.Font = t.Font.With(weight: bold ? FontWeight.Bold : FontWeight.Regular, italics: italic));
     }
 }

From 64e9c5e9ba50924903ec6e280b68552d878e00f5 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:41:27 +0700
Subject: [PATCH 09812/10326] add return xmldoc in markdown unordered list

---
 .../Containers/Markdown/OsuMarkdownUnorderedListItem.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
index 8bfaf8ad21..5d1e114781 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         /// Get text marker based on <paramref name="level"/>
         /// </summary>
         /// <param name="level">The markdown level of current list item.</param>
-        /// <returns></returns>
+        /// <returns>The marker string of this list item</returns>
         protected virtual string GetTextMarker(int level)
         {
             switch (level)

From d92e593ddddd425c4984e25346581af3d6da50f1 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:47:46 +0700
Subject: [PATCH 09813/10326] extract out table head and body border into
 separate component

---
 .../Markdown/OsuMarkdownTableCell.cs          | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
index 763c9d7536..5949bf074b 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
@@ -26,27 +26,10 @@ namespace osu.Game.Graphics.Containers.Markdown
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            var border = new Box
-            {
-                RelativeSizeAxes = Axes.X,
-            };
-
             if (isHeading)
-            {
-                border.Colour = colourProvider.Background3;
-                border.Height = 2;
-                border.Anchor = Anchor.BottomLeft;
-                border.Origin = Anchor.BottomLeft;
-            }
+                AddInternal(new TableHeadBorder());
             else
-            {
-                border.Colour = colourProvider.Background4;
-                border.Height = 1;
-                border.Anchor = Anchor.TopLeft;
-                border.Origin = Anchor.TopLeft;
-            }
-
-            AddInternal(border);
+                AddInternal(new TableBodyBorder());
         }
 
         public override MarkdownTextFlowContainer CreateTextFlow() => new TableCellTextFlowContainer
@@ -55,6 +38,30 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(10),
         };
 
+        private class TableHeadBorder : Box
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Background3;
+                RelativeSizeAxes = Axes.X;
+                Height = 2;
+                Anchor = Anchor.BottomLeft;
+                Origin = Anchor.BottomLeft;
+            }
+        }
+
+        private class TableBodyBorder : Box
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Background4;
+                RelativeSizeAxes = Axes.X;
+                Height = 1;
+            }
+        }
+
         private class TableCellTextFlowContainer : OsuMarkdownTextFlowContainer
         {
             public FontWeight Weight { get; set; }

From 22677cfeaf7aea4657a1040d80eecdf12b3b1746 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:54:46 +0700
Subject: [PATCH 09814/10326] add CreateBorder method in markdown table cell

---
 .../Containers/Markdown/OsuMarkdownTableCell.cs   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
index 5949bf074b..ac7d07e283 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
@@ -24,12 +24,9 @@ namespace osu.Game.Graphics.Containers.Markdown
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load()
         {
-            if (isHeading)
-                AddInternal(new TableHeadBorder());
-            else
-                AddInternal(new TableBodyBorder());
+            AddInternal(CreateBorder(isHeading));
         }
 
         public override MarkdownTextFlowContainer CreateTextFlow() => new TableCellTextFlowContainer
@@ -38,6 +35,14 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(10),
         };
 
+        protected virtual Box CreateBorder(bool isHeading)
+        {
+            if (isHeading)
+                return new TableHeadBorder();
+
+            return new TableBodyBorder();
+        }
+
         private class TableHeadBorder : Box
         {
             [BackgroundDependencyLoader]

From 9d27b11e499e634cf3276b1023bb8ac9db9cdf18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:10:31 +0900
Subject: [PATCH 09815/10326] Update skin editor test scene to cache a
 `ScoreProcessor`

---
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 086bcb19c3..2424d24bc6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -2,6 +2,7 @@
 // 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.Testing;
@@ -17,6 +18,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinEditorMultipleSkins : SkinnableTestScene
     {
+        [Cached]
+        private readonly ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
@@ -28,8 +32,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                     var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
                     var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
 
-                    ScoreProcessor scoreProcessor = new ScoreProcessor();
-
                     var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
 
                     var hudOverlay = new HUDOverlay(scoreProcessor, null, drawableRuleset, Array.Empty<Mod>())
@@ -40,7 +42,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
-                    hudOverlay.ComboCounter.Current.Value = 1;
+                    scoreProcessor.Combo.Value = 1;
 
                     return new Container
                     {

From 755588258e90883f22a89cee219d6e44373b5887 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 16:56:24 +0900
Subject: [PATCH 09816/10326] Update `HealthDisplay` components to use DI to
 attach data source

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs  | 35 ++++++++++++++++---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    |  5 ++-
 .../TestSceneSkinEditorMultipleSkins.cs       |  3 +-
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  |  2 +-
 .../TestSceneSkinnableHealthDisplay.cs        | 21 ++++++-----
 .../Screens/Play/HUD/DefaultHealthDisplay.cs  |  2 +-
 osu.Game/Screens/Play/HUD/FailingLayer.cs     | 11 +-----
 osu.Game/Screens/Play/HUD/HealthDisplay.cs    | 33 ++++++++++++-----
 osu.Game/Screens/Play/HUD/IHealthDisplay.cs   | 26 --------------
 .../Play/HUD/SkinnableHealthDisplay.cs        | 15 +-------
 osu.Game/Screens/Play/HUDOverlay.cs           | 22 +-----------
 osu.Game/Screens/Play/Player.cs               |  4 ++-
 osu.Game/Skinning/LegacyHealthDisplay.cs      | 12 ++-----
 13 files changed, 81 insertions(+), 110 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/IHealthDisplay.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 5a1a9d3d87..e426726def 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
@@ -22,22 +23,30 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         [SetUpSteps]
         public void SetUpSteps()
+        {
+        }
+
+        private void create(HealthProcessor healthProcessor)
         {
             AddStep("create layer", () =>
             {
-                Child = layer = new FailingLayer();
-                layer.BindHealthProcessor(new DrainingHealthProcessor(1));
+                Child = new HealthProcessorContainer(healthProcessor)
+                {
+                    Child = layer = new FailingLayer()
+                };
+
                 layer.ShowHealth.BindTo(showHealth);
             });
 
             AddStep("show health", () => showHealth.Value = true);
             AddStep("enable layer", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, true));
-            AddUntilStep("layer is visible", () => layer.IsPresent);
         }
 
         [Test]
         public void TestLayerFading()
         {
+            create(new DrainingHealthProcessor(1));
+
             AddSliderStep("current health", 0.0, 1.0, 1.0, val =>
             {
                 if (layer != null)
@@ -53,6 +62,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerDisabledViaConfig()
         {
+            create(new DrainingHealthProcessor(1));
+            AddUntilStep("layer is visible", () => layer.IsPresent);
             AddStep("disable layer", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddUntilStep("layer is not visible", () => !layer.IsPresent);
@@ -61,7 +72,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerVisibilityWithAccumulatingProcessor()
         {
-            AddStep("bind accumulating processor", () => layer.BindHealthProcessor(new AccumulatingHealthProcessor(1)));
+            create(new AccumulatingHealthProcessor(1));
+            AddUntilStep("layer is not visible", () => !layer.IsPresent);
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddUntilStep("layer is not visible", () => !layer.IsPresent);
         }
@@ -69,7 +81,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerVisibilityWithDrainingProcessor()
         {
-            AddStep("bind accumulating processor", () => layer.BindHealthProcessor(new DrainingHealthProcessor(1)));
+            create(new DrainingHealthProcessor(1));
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddWaitStep("wait for potential fade", 10);
             AddAssert("layer is still visible", () => layer.IsPresent);
@@ -78,6 +90,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerVisibilityWithDifferentOptions()
         {
+            create(new DrainingHealthProcessor(1));
+
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
 
             AddStep("don't show health", () => showHealth.Value = false);
@@ -96,5 +110,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("enable FadePlayfieldWhenHealthLow", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer fade is visible", () => layer.IsPresent);
         }
+
+        private class HealthProcessorContainer : Container
+        {
+            [Cached(typeof(HealthProcessor))]
+            private readonly HealthProcessor healthProcessor;
+
+            public HealthProcessorContainer(HealthProcessor healthProcessor)
+            {
+                this.healthProcessor = healthProcessor;
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 55c681b605..a451df026b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
+        [Cached]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(1);
+
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.KeyCounter;
         private FillFlowContainer<KeyCounter> keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().First();
@@ -143,7 +146,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create overlay", () =>
             {
-                hudOverlay = new HUDOverlay(scoreProcessor, null, null, Array.Empty<Mod>());
+                hudOverlay = new HUDOverlay(scoreProcessor, null, Array.Empty<Mod>());
 
                 // Add any key just to display the key counter visually.
                 hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 086bcb19c3..270216564f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                     var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
 
-                    var hudOverlay = new HUDOverlay(scoreProcessor, null, drawableRuleset, Array.Empty<Mod>())
+                    var hudOverlay = new HUDOverlay(scoreProcessor, drawableRuleset, Array.Empty<Mod>())
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -40,7 +40,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
-                    hudOverlay.ComboCounter.Current.Value = 1;
 
                     return new Container
                     {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 8131c77b4b..12ce20f58e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 SetContents(() =>
                 {
-                    hudOverlay = new HUDOverlay(scoreProcessor, null, null, Array.Empty<Mod>());
+                    hudOverlay = new HUDOverlay(scoreProcessor, null, Array.Empty<Mod>());
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index 5bac8582d7..f06236d0a8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -4,11 +4,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -19,6 +21,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
+        [Cached]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
+
         [SetUpSteps]
         public void SetUpSteps()
         {
@@ -28,8 +33,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
             AddStep(@"Reset all", delegate
             {
-                foreach (var s in healthDisplays)
-                    s.Current.Value = 1;
+                healthProcessor.Health.Value = 1;
             });
         }
 
@@ -38,23 +42,18 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddRepeatStep(@"decrease hp", delegate
             {
-                foreach (var healthDisplay in healthDisplays)
-                    healthDisplay.Current.Value -= 0.08f;
+                healthProcessor.Health.Value = 0.08f;
             }, 10);
 
             AddRepeatStep(@"increase hp without flash", delegate
             {
-                foreach (var healthDisplay in healthDisplays)
-                    healthDisplay.Current.Value += 0.1f;
+                healthProcessor.Health.Value = 0.1f;
             }, 3);
 
             AddRepeatStep(@"increase hp with flash", delegate
             {
-                foreach (var healthDisplay in healthDisplays)
-                {
-                    healthDisplay.Current.Value += 0.1f;
-                    healthDisplay.Flash(new JudgementResult(null, new OsuJudgement()));
-                }
+                healthProcessor.Health.Value = 0.1f;
+                healthProcessor.ApplyResult(new JudgementResult(null, new OsuJudgement()));
             }, 3);
         }
     }
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index e3cd71691d..27f81467cb 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Play.HUD
             GlowColour = colours.BlueDarker;
         }
 
-        public override void Flash(JudgementResult result) => Scheduler.AddOnce(flash);
+        protected override void Flash(JudgementResult result) => Scheduler.AddOnce(flash);
 
         private void flash()
         {
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 847b8a53cf..e071337f34 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -39,7 +39,6 @@ namespace osu.Game.Screens.Play.HUD
         private readonly Container boxes;
 
         private Bindable<bool> fadePlayfieldWhenHealthLow;
-        private HealthProcessor healthProcessor;
 
         public FailingLayer()
         {
@@ -88,18 +87,10 @@ namespace osu.Game.Screens.Play.HUD
             updateState();
         }
 
-        public override void BindHealthProcessor(HealthProcessor processor)
-        {
-            base.BindHealthProcessor(processor);
-
-            healthProcessor = processor;
-            updateState();
-        }
-
         private void updateState()
         {
             // Don't display ever if the ruleset is not using a draining health display.
-            var showLayer = healthProcessor is DrainingHealthProcessor && fadePlayfieldWhenHealthLow.Value && ShowHealth.Value;
+            var showLayer = HealthProcessor is DrainingHealthProcessor && fadePlayfieldWhenHealthLow.Value && ShowHealth.Value;
             this.FadeTo(showLayer ? 1 : 0, fade_time, Easing.OutQuint);
         }
 
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 5c43e00192..2292f64989 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.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.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
@@ -11,26 +12,42 @@ namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
     /// A container for components displaying the current player health.
-    /// Gets bound automatically to the <see cref="HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy.
+    /// Gets bound automatically to the <see cref="Rulesets.Scoring.HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy.
     /// </summary>
-    public abstract class HealthDisplay : Container, IHealthDisplay
+    public abstract class HealthDisplay : Container
     {
+        [Resolved]
+        protected HealthProcessor HealthProcessor { get; private set; }
+
         public Bindable<double> Current { get; } = new BindableDouble(1)
         {
             MinValue = 0,
             MaxValue = 1
         };
 
-        public virtual void Flash(JudgementResult result)
+        protected virtual void Flash(JudgementResult result)
         {
         }
 
-        /// <summary>
-        /// Bind the tracked fields of <see cref="HealthProcessor"/> to this health display.
-        /// </summary>
-        public virtual void BindHealthProcessor(HealthProcessor processor)
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            Current.BindTo(processor.Health);
+            Current.BindTo(HealthProcessor.Health);
+
+            HealthProcessor.NewJudgement += onNewJudgement;
+        }
+
+        private void onNewJudgement(JudgementResult judgement)
+        {
+            if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit) Flash(judgement);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (HealthProcessor != null)
+                HealthProcessor.NewJudgement -= onNewJudgement;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/IHealthDisplay.cs b/osu.Game/Screens/Play/HUD/IHealthDisplay.cs
deleted file mode 100644
index b1a64bd844..0000000000
--- a/osu.Game/Screens/Play/HUD/IHealthDisplay.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.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Game.Rulesets.Judgements;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// An interface providing a set of methods to update a health display.
-    /// </summary>
-    public interface IHealthDisplay : IDrawable
-    {
-        /// <summary>
-        /// The current health to be displayed.
-        /// </summary>
-        Bindable<double> Current { get; }
-
-        /// <summary>
-        /// Flash the display for a specified result type.
-        /// </summary>
-        /// <param name="result">The result type.</param>
-        void Flash(JudgementResult result);
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index 1f91f5e50f..ef0affa417 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -3,13 +3,12 @@
 
 using System;
 using osu.Framework.Bindables;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
+    public class SkinnableHealthDisplay : SkinnableDrawable
     {
         public Bindable<double> Current { get; } = new BindableDouble(1)
         {
@@ -17,8 +16,6 @@ namespace osu.Game.Screens.Play.HUD
             MaxValue = 1
         };
 
-        public void Flash(JudgementResult result) => skinnedCounter?.Flash(result);
-
         private HealthProcessor processor;
 
         public void BindHealthProcessor(HealthProcessor processor)
@@ -36,15 +33,5 @@ namespace osu.Game.Screens.Play.HUD
         {
             CentreComponent = false;
         }
-
-        private IHealthDisplay skinnedCounter;
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            skinnedCounter = Drawable as IHealthDisplay;
-            skinnedCounter?.Current.BindTo(Current);
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 83897c5167..31a6bc7678 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -47,7 +47,6 @@ namespace osu.Game.Screens.Play
         public Bindable<bool> ShowHealthbar = new Bindable<bool>(true);
 
         private readonly ScoreProcessor scoreProcessor;
-        private readonly HealthProcessor healthProcessor;
         private readonly DrawableRuleset drawableRuleset;
         private readonly IReadOnlyList<Mod> mods;
 
@@ -75,10 +74,9 @@ namespace osu.Game.Screens.Play
 
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter, topRightElements };
 
-        public HUDOverlay(ScoreProcessor scoreProcessor, HealthProcessor healthProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
+        public HUDOverlay(ScoreProcessor scoreProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
         {
             this.scoreProcessor = scoreProcessor;
-            this.healthProcessor = healthProcessor;
             this.drawableRuleset = drawableRuleset;
             this.mods = mods;
 
@@ -161,9 +159,6 @@ namespace osu.Game.Screens.Play
             if (scoreProcessor != null)
                 BindScoreProcessor(scoreProcessor);
 
-            if (healthProcessor != null)
-                BindHealthProcessor(healthProcessor);
-
             if (drawableRuleset != null)
             {
                 BindDrawableRuleset(drawableRuleset);
@@ -322,21 +317,6 @@ namespace osu.Game.Screens.Play
         {
             ScoreCounter?.Current.BindTo(processor.TotalScore);
             AccuracyCounter?.Current.BindTo(processor.Accuracy);
-
-            if (HealthDisplay is IHealthDisplay shd)
-            {
-                processor.NewJudgement += judgement =>
-                {
-                    if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
-                        shd.Flash(judgement);
-                };
-            }
-        }
-
-        protected virtual void BindHealthProcessor(HealthProcessor processor)
-        {
-            HealthDisplay?.BindHealthProcessor(processor);
-            FailingLayer?.BindHealthProcessor(processor);
         }
 
         public bool OnPressed(GlobalAction action)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 951ce334f6..1538899281 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -208,6 +208,8 @@ namespace osu.Game.Screens.Play
             HealthProcessor = ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
             HealthProcessor.ApplyBeatmap(playableBeatmap);
 
+            dependencies.CacheAs(HealthProcessor);
+
             if (!ScoreProcessor.Mode.Disabled)
                 config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
 
@@ -343,7 +345,7 @@ namespace osu.Game.Screens.Play
                     // display the cursor above some HUD elements.
                     DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
                     DrawableRuleset.ResumeOverlay?.CreateProxy() ?? new Container(),
-                    HUDOverlay = new HUDOverlay(ScoreProcessor, HealthProcessor, DrawableRuleset, Mods.Value)
+                    HUDOverlay = new HUDOverlay(ScoreProcessor, DrawableRuleset, Mods.Value)
                     {
                         HoldToQuit =
                         {
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 2e29abf453..c1979efbc2 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyHealthDisplay : CompositeDrawable, IHealthDisplay, ISkinnableComponent
+    public class LegacyHealthDisplay : HealthDisplay
     {
         private const double epic_cutoff = 0.5;
 
@@ -28,12 +28,6 @@ namespace osu.Game.Skinning
 
         private bool isNewStyle;
 
-        public Bindable<double> Current { get; } = new BindableDouble(1)
-        {
-            MinValue = 0,
-            MaxValue = 1
-        };
-
         public LegacyHealthDisplay(Skin skin)
         {
             this.skin = skin;
@@ -83,7 +77,7 @@ namespace osu.Game.Skinning
             marker.Position = fill.Position + new Vector2(fill.DrawWidth, isNewStyle ? fill.DrawHeight / 2 : 0);
         }
 
-        public void Flash(JudgementResult result) => marker.Flash(result);
+        protected override void Flash(JudgementResult result) => marker.Flash(result);
 
         private static Texture getTexture(Skin skin, string name) => skin.GetTexture($"scorebar-{name}");
 
@@ -254,7 +248,7 @@ namespace osu.Game.Skinning
                 Main.ScaleTo(1.4f).Then().ScaleTo(1, 200, Easing.Out);
         }
 
-        public class LegacyHealthPiece : CompositeDrawable, IHealthDisplay
+        public class LegacyHealthPiece : CompositeDrawable
         {
             public Bindable<double> Current { get; } = new Bindable<double>();
 

From 84a4ff333eec332a3c5dbd9b167f15b17fc6db7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:10:31 +0900
Subject: [PATCH 09817/10326] Update skin editor test scene to cache a
 `ScoreProcessor`

---
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 270216564f..d50d4aa920 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -2,6 +2,7 @@
 // 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.Testing;
@@ -17,6 +18,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinEditorMultipleSkins : SkinnableTestScene
     {
+        [Cached]
+        private readonly ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
@@ -28,8 +32,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                     var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
                     var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
 
-                    ScoreProcessor scoreProcessor = new ScoreProcessor();
-
                     var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
 
                     var hudOverlay = new HUDOverlay(scoreProcessor, drawableRuleset, Array.Empty<Mod>())
@@ -40,6 +42,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
+                    scoreProcessor.Combo.Value = 1;
 
                     return new Container
                     {

From 8e78cac05826b2e01959e3971a8043d0f53cf9df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:31:29 +0900
Subject: [PATCH 09818/10326] Fix `HealthProcessor` cached as derived type in
 test

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index a451df026b..accb2ba1d9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
-        [Cached]
+        [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(1);
 
         // best way to check without exposing.

From 6c255a05726faed8e6244ded666cee31966a5f72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:47:33 +0900
Subject: [PATCH 09819/10326] Fix drain start time being weirdly incorrect

---
 osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs | 8 ++++----
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index e426726def..99facb2731 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerFading()
         {
-            create(new DrainingHealthProcessor(1));
+            create(new DrainingHealthProcessor(0));
 
             AddSliderStep("current health", 0.0, 1.0, 1.0, val =>
             {
@@ -62,7 +62,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerDisabledViaConfig()
         {
-            create(new DrainingHealthProcessor(1));
+            create(new DrainingHealthProcessor(0));
             AddUntilStep("layer is visible", () => layer.IsPresent);
             AddStep("disable layer", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
@@ -81,7 +81,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerVisibilityWithDrainingProcessor()
         {
-            create(new DrainingHealthProcessor(1));
+            create(new DrainingHealthProcessor(0));
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddWaitStep("wait for potential fade", 10);
             AddAssert("layer is still visible", () => layer.IsPresent);
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerVisibilityWithDifferentOptions()
         {
-            create(new DrainingHealthProcessor(1));
+            create(new DrainingHealthProcessor(0));
 
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index accb2ba1d9..861d4a4f7f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
         [Cached(typeof(HealthProcessor))]
-        private HealthProcessor healthProcessor = new DrainingHealthProcessor(1);
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.KeyCounter;

From 3044b1c432621823fb9bd25b5190b38988ff8696 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:47:38 +0900
Subject: [PATCH 09820/10326] Add missing cache rules

---
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs      | 3 +++
 .../Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs          | 3 +++
 .../Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs       | 5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index d50d4aa920..ac5599cc27 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -21,6 +21,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private readonly ScoreProcessor scoreProcessor = new ScoreProcessor();
 
+        [Cached(typeof(HealthProcessor))]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
+
         [SetUpSteps]
         public void SetUpSteps()
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 12ce20f58e..7a960a09fc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -27,6 +27,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
+        [Cached(typeof(HealthProcessor))]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
+
         private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
 
         // best way to check without exposing.
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index f06236d0a8..2d6a6d95c7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
@@ -21,7 +22,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
-        [Cached]
+        [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
         [SetUpSteps]
@@ -53,7 +54,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddRepeatStep(@"increase hp with flash", delegate
             {
                 healthProcessor.Health.Value = 0.1f;
-                healthProcessor.ApplyResult(new JudgementResult(null, new OsuJudgement()));
+                healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement()));
             }, 3);
         }
     }

From 1cb10c2a2243bde4f0fcc85a5d6de338a34f28bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:27:34 +0900
Subject: [PATCH 09821/10326] Remove unnecessary binding logic from
 `HUDOverlay`

---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    |  2 +-
 .../TestSceneSkinEditorMultipleSkins.cs       |  2 +-
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  |  2 +-
 osu.Game/Screens/Play/HUD/HitErrorDisplay.cs  |  6 +++---
 osu.Game/Screens/Play/HUDOverlay.cs           | 21 ++++---------------
 osu.Game/Screens/Play/Player.cs               |  2 +-
 6 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 861d4a4f7f..b7e92a79a0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -146,7 +146,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create overlay", () =>
             {
-                hudOverlay = new HUDOverlay(scoreProcessor, null, Array.Empty<Mod>());
+                hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
 
                 // Add any key just to display the key counter visually.
                 hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index ac5599cc27..c7c93b8892 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                     var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
 
-                    var hudOverlay = new HUDOverlay(scoreProcessor, drawableRuleset, Array.Empty<Mod>())
+                    var hudOverlay = new HUDOverlay(drawableRuleset, Array.Empty<Mod>())
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 7a960a09fc..c92e9dcfd5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 SetContents(() =>
                 {
-                    hudOverlay = new HUDOverlay(scoreProcessor, null, Array.Empty<Mod>());
+                    hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
diff --git a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
index 37d10a5320..998a9fb7e7 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
@@ -22,11 +22,11 @@ namespace osu.Game.Screens.Play.HUD
 
         private readonly HitWindows hitWindows;
 
-        private readonly ScoreProcessor processor;
+        [Resolved]
+        private ScoreProcessor processor { get; set; }
 
-        public HitErrorDisplay(ScoreProcessor processor, HitWindows hitWindows)
+        public HitErrorDisplay(HitWindows hitWindows)
         {
-            this.processor = processor;
             this.hitWindows = hitWindows;
 
             RelativeSizeAxes = Axes.Both;
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index fd1aea016b..22812b779f 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -14,7 +14,6 @@ using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
@@ -39,14 +38,11 @@ namespace osu.Game.Screens.Play
         public readonly SkinnableHealthDisplay HealthDisplay;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
-        public readonly HitErrorDisplay HitErrorDisplay;
         public readonly HoldForMenuButton HoldToQuit;
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
-        public readonly FailingLayer FailingLayer;
 
         public Bindable<bool> ShowHealthbar = new Bindable<bool>(true);
 
-        private readonly ScoreProcessor scoreProcessor;
         private readonly DrawableRuleset drawableRuleset;
         private readonly IReadOnlyList<Mod> mods;
 
@@ -74,9 +70,8 @@ namespace osu.Game.Screens.Play
 
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter, topRightElements };
 
-        public HUDOverlay(ScoreProcessor scoreProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
+        public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
         {
-            this.scoreProcessor = scoreProcessor;
             this.drawableRuleset = drawableRuleset;
             this.mods = mods;
 
@@ -84,7 +79,7 @@ namespace osu.Game.Screens.Play
 
             Children = new Drawable[]
             {
-                FailingLayer = CreateFailingLayer(),
+                CreateFailingLayer(),
                 visibilityContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -104,7 +99,7 @@ namespace osu.Game.Screens.Play
                                         AccuracyCounter = CreateAccuracyCounter(),
                                         ScoreCounter = CreateScoreCounter(),
                                         CreateComboCounter(),
-                                        HitErrorDisplay = CreateHitErrorDisplayOverlay(),
+                                        CreateHitErrorDisplayOverlay(),
                                     }
                                 },
                             },
@@ -156,9 +151,6 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader(true)]
         private void load(OsuConfigManager config, NotificationOverlay notificationOverlay)
         {
-            if (scoreProcessor != null)
-                BindScoreProcessor(scoreProcessor);
-
             if (drawableRuleset != null)
             {
                 BindDrawableRuleset(drawableRuleset);
@@ -309,15 +301,10 @@ namespace osu.Game.Screens.Play
             AutoSizeAxes = Axes.Both,
         };
 
-        protected virtual HitErrorDisplay CreateHitErrorDisplayOverlay() => new HitErrorDisplay(scoreProcessor, drawableRuleset?.FirstAvailableHitWindows);
+        protected virtual HitErrorDisplay CreateHitErrorDisplayOverlay() => new HitErrorDisplay(drawableRuleset?.FirstAvailableHitWindows);
 
         protected virtual PlayerSettingsOverlay CreatePlayerSettingsOverlay() => new PlayerSettingsOverlay();
 
-        protected virtual void BindScoreProcessor(ScoreProcessor processor)
-        {
-            AccuracyCounter?.Current.BindTo(processor.Accuracy);
-        }
-
         public bool OnPressed(GlobalAction action)
         {
             switch (action)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1538899281..116cf3cc99 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -345,7 +345,7 @@ namespace osu.Game.Screens.Play
                     // display the cursor above some HUD elements.
                     DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
                     DrawableRuleset.ResumeOverlay?.CreateProxy() ?? new Container(),
-                    HUDOverlay = new HUDOverlay(ScoreProcessor, DrawableRuleset, Mods.Value)
+                    HUDOverlay = new HUDOverlay(DrawableRuleset, Mods.Value)
                     {
                         HoldToQuit =
                         {

From 111b501ced835f83a4001fc3948eb26816c08364 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 7 May 2021 18:04:38 +0900
Subject: [PATCH 09822/10326] Revert accidental removal of UTF-8 BOM

---
 osu.Game/Rulesets/Replays/AutoGenerator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Replays/AutoGenerator.cs b/osu.Game/Rulesets/Replays/AutoGenerator.cs
index 6ce857b14b..83e85146d4 100644
--- a/osu.Game/Rulesets/Replays/AutoGenerator.cs
+++ b/osu.Game/Rulesets/Replays/AutoGenerator.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.Collections.Generic;

From 9fe6e1096ab9d9264f97f52ba8ed7ae504983d0b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 18:11:08 +0900
Subject: [PATCH 09823/10326] Remove cruft from `SkinnableHealthDisplay`

---
 .../Play/HUD/SkinnableHealthDisplay.cs        | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index ef0affa417..3ba6a33276 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -1,33 +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 osu.Framework.Bindables;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableHealthDisplay : SkinnableDrawable
     {
-        public Bindable<double> Current { get; } = new BindableDouble(1)
-        {
-            MinValue = 0,
-            MaxValue = 1
-        };
-
-        private HealthProcessor processor;
-
-        public void BindHealthProcessor(HealthProcessor processor)
-        {
-            if (this.processor != null)
-                throw new InvalidOperationException("Can't bind to a processor more than once");
-
-            this.processor = processor;
-
-            Current.BindTo(processor.Health);
-        }
-
         public SkinnableHealthDisplay()
             : base(new HUDSkinComponent(HUDSkinComponents.HealthDisplay), _ => new DefaultHealthDisplay())
         {

From a1aeac567710b95f27b07daede58b9a1ad56ab45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 18:11:59 +0900
Subject: [PATCH 09824/10326] Remove remaining cruft from
 `SkinnableAccuracyCounter`

---
 osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index 17c2493d2d..fcb8fca35d 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.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.Framework.Bindables;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableAccuracyCounter : SkinnableDrawable
     {
-        public Bindable<double> Current { get; } = new Bindable<double>();
-
         public SkinnableAccuracyCounter()
             : base(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter), _ => new DefaultAccuracyCounter())
         {

From 5b2f786f971ef65100be176ebc828b87e87f8c3f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 19:16:00 +0900
Subject: [PATCH 09825/10326] 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 99cda7693d..80b1c5b52f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.506.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.507.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e448972066..29189781a7 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.506.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.507.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 43ed2d7dc8..c4eb7aefba 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.Framework.iOS" Version="2021.506.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.507.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.506.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.507.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 8c564a69ed1978e2e11be2d93806c57a759c5800 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Fri, 7 May 2021 20:59:20 -0400
Subject: [PATCH 09826/10326] Fix InvalidOperationException when exiting a map
 at the end

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs    | 10 ++++++++++
 osu.Game/Screens/Play/Player.cs                        |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 4138a81ebd..e1dc6e3b42 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -133,6 +133,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
         }
 
+        [Test]
+        public void TestPerformExitNoOutro()
+        {
+            CreateTest(null);
+            AddStep("disable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, false));
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddStep("exit via pause", () => Player.ExitViaPause());
+            AddAssert("score shown", () => Player.IsScoreShown);
+        }
+
         protected override bool AllowFail => true;
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 88e617245b..0a2f9f0d18 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -542,7 +542,11 @@ namespace osu.Game.Screens.Play
 
                 // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
                 if (prepareScoreForDisplayTask != null)
+                {
+                    completionProgressDelegate?.Cancel();
+                    completionProgressDelegate = null;
                     updateCompletionState(true);
+                }
             }
 
             this.Exit();

From 0f08c2a4799d3002861b199205c0e20e4498ff23 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 11:44:29 +0300
Subject: [PATCH 09827/10326] Add star rating display underneath the beatmap
 metadata

---
 .../Screens/Play/BeatmapMetadataDisplay.cs    | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index c56344a8fb..7ad634afed 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -12,8 +12,10 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Ranking.Expanded;
 using osuTK;
 
 namespace osu.Game.Screens.Play
@@ -30,6 +32,9 @@ namespace osu.Game.Screens.Play
 
         public IBindable<IReadOnlyList<Mod>> Mods => mods;
 
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
         public bool Loading
         {
             set
@@ -51,10 +56,12 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(BeatmapDifficultyCache difficultyCache)
         {
             var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
 
+            var starDifficulty = difficultyCache.GetDifficultyAsync(beatmap.BeatmapInfo, ruleset.Value, mods.Value).Result;
+
             AutoSizeAxes = Axes.Both;
             Children = new Drawable[]
             {
@@ -107,16 +114,29 @@ namespace osu.Game.Screens.Play
                                 loading = new LoadingLayer(true)
                             }
                         },
-                        new OsuSpriteText
+                        new FillFlowContainer
                         {
-                            Text = beatmap?.BeatmapInfo?.Version,
-                            Font = OsuFont.GetFont(size: 26, italics: true),
-                            Origin = Anchor.TopCentre,
+                            AutoSizeAxes = Axes.Both,
                             Anchor = Anchor.TopCentre,
-                            Margin = new MarginPadding
+                            Origin = Anchor.TopCentre,
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(5f),
+                            Margin = new MarginPadding { Bottom = 40 },
+                            Children = new Drawable[]
                             {
-                                Bottom = 40
-                            },
+                                new OsuSpriteText
+                                {
+                                    Text = beatmap?.BeatmapInfo?.Version,
+                                    Font = OsuFont.GetFont(size: 26, italics: true),
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                },
+                                new StarRatingDisplay(starDifficulty)
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                }
+                            }
                         },
                         new GridContainer
                         {

From 7b7e7a86bf70423464fa078b10b52301790ad5dc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 11:46:28 +0300
Subject: [PATCH 09828/10326] Allow null logo facade

---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 7ad634afed..8e760c38ba 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -27,7 +28,7 @@ namespace osu.Game.Screens.Play
     {
         private readonly WorkingBeatmap beatmap;
         private readonly Bindable<IReadOnlyList<Mod>> mods;
-        private readonly Drawable facade;
+        private readonly Drawable logoFacade;
         private LoadingSpinner loading;
 
         public IBindable<IReadOnlyList<Mod>> Mods => mods;
@@ -46,10 +47,10 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, Drawable facade)
+        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
         {
             this.beatmap = beatmap;
-            this.facade = facade;
+            this.logoFacade = logoFacade;
 
             this.mods = new Bindable<IReadOnlyList<Mod>>();
             this.mods.BindTo(mods);
@@ -73,11 +74,11 @@ namespace osu.Game.Screens.Play
                     Direction = FillDirection.Vertical,
                     Children = new[]
                     {
-                        facade.With(d =>
+                        logoFacade?.With(d =>
                         {
                             d.Anchor = Anchor.TopCentre;
                             d.Origin = Anchor.TopCentre;
-                        }),
+                        }) ?? Drawable.Empty(),
                         new OsuSpriteText
                         {
                             Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),

From 169a28340286aeca24e73f47ce76c190c3f7c87d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 11:46:42 +0300
Subject: [PATCH 09829/10326] Add visual test scene

---
 .../TestSceneBeatmapMetadataDisplay.cs        | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
new file mode 100644
index 0000000000..02c9c6b7a3
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -0,0 +1,78 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    [System.ComponentModel.Description("player loader beatmap metadata")]
+    public class TestSceneBeatmapMetadataDisplay : OsuTestScene
+    {
+        private BeatmapMetadataDisplay display;
+
+        [Resolved]
+        private BeatmapManager manager { get; set; }
+
+        private IReadOnlyList<Mod> randomMods => Ruleset.Value.CreateInstance()
+                                                        .GetAllMods()
+                                                        .OrderBy(_ => RNG.Next())
+                                                        .Take(5)
+                                                        .ToList();
+
+        private void createDisplay(Func<WorkingBeatmap> getBeatmap)
+        {
+            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), null)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(1.5f),
+            });
+
+            AddToggleStep("trigger loading", v => display.Loading = v);
+        }
+
+        [Test]
+        public void TestLocal([Values("Beatmap", "Some long title and stuff")]
+                              string title,
+                              [Values("Trial", "Some1's very hardest difficulty")]
+                              string version)
+        {
+            createDisplay(() => CreateWorkingBeatmap(new Beatmap
+            {
+                BeatmapInfo =
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = title,
+                    },
+                    Version = version,
+                    StarDifficulty = RNG.NextDouble(0, 10),
+                }
+            }));
+        }
+
+        [Test]
+        public void TestRandomFromDatabase()
+        {
+            createDisplay(() =>
+            {
+                var allBeatmapSets = manager.GetAllUsableBeatmapSets(IncludedDetails.Minimal);
+                var randomBeatmapSet = allBeatmapSets[RNG.Next(0, allBeatmapSets.Count - 1)];
+                var randomBeatmap = randomBeatmapSet.Beatmaps[RNG.Next(0, randomBeatmapSet.Beatmaps.Count - 1)];
+
+                return manager.GetWorkingBeatmap(randomBeatmap);
+            });
+        }
+    }
+}

From b4801faf32bed6a2bc279305d4237930f60a683d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 11:57:12 +0300
Subject: [PATCH 09830/10326] Pass ruleset info to constructor instead

Follows the way working beatmap is passed, not sure why mods are passed as a bindable though, don't wanna bother too much with that.
---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs | 2 +-
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs          | 9 ++++-----
 osu.Game/Screens/Play/PlayerLoader.cs                    | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 02c9c6b7a3..ee87877860 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void createDisplay(Func<WorkingBeatmap> getBeatmap)
         {
-            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), null)
+            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), Ruleset.Value, new Bindable<IReadOnlyList<Mod>>(randomMods), null)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 8e760c38ba..daaf3b73cb 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -27,15 +27,13 @@ namespace osu.Game.Screens.Play
     public class BeatmapMetadataDisplay : Container
     {
         private readonly WorkingBeatmap beatmap;
+        private readonly RulesetInfo ruleset;
         private readonly Bindable<IReadOnlyList<Mod>> mods;
         private readonly Drawable logoFacade;
         private LoadingSpinner loading;
 
         public IBindable<IReadOnlyList<Mod>> Mods => mods;
 
-        [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
-
         public bool Loading
         {
             set
@@ -47,9 +45,10 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
+        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, RulesetInfo ruleset, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
         {
             this.beatmap = beatmap;
+            this.ruleset = ruleset;
             this.logoFacade = logoFacade;
 
             this.mods = new Bindable<IReadOnlyList<Mod>>();
@@ -61,7 +60,7 @@ namespace osu.Game.Screens.Play
         {
             var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
 
-            var starDifficulty = difficultyCache.GetDifficultyAsync(beatmap.BeatmapInfo, ruleset.Value, mods.Value).Result;
+            var starDifficulty = difficultyCache.GetDifficultyAsync(beatmap.BeatmapInfo, ruleset, mods.Value).Result;
 
             AutoSizeAxes = Axes.Both;
             Children = new Drawable[]
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index ce580e2b53..066ca25790 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Play
                 RelativeSizeAxes = Axes.Both,
             }).WithChildren(new Drawable[]
             {
-                MetadataInfo = new BeatmapMetadataDisplay(Beatmap.Value, Mods, content.LogoFacade)
+                MetadataInfo = new BeatmapMetadataDisplay(Beatmap.Value, Ruleset.Value, Mods, content.LogoFacade)
                 {
                     Alpha = 0,
                     Anchor = Anchor.Centre,

From 0410edecaff273d81d023af07044bbd46a88b9a5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 12:55:07 +0300
Subject: [PATCH 09831/10326] Refactor `StarRatingDisplay` to be mutable with a
 current bindable

---
 .../Ranking/TestSceneStarRatingDisplay.cs     | 15 +++-
 .../Ranking/Expanded/StarRatingDisplay.cs     | 87 ++++++++++++-------
 2 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index d0067c3396..a043f506c1 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Ranking.Expanded;
 
@@ -10,8 +12,11 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneStarRatingDisplay : OsuTestScene
     {
-        public TestSceneStarRatingDisplay()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
+            StarRatingDisplay changingStarRating;
+
             Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
@@ -25,8 +30,14 @@ namespace osu.Game.Tests.Visual.Ranking
                     new StarRatingDisplay(new StarDifficulty(5.67, 0)),
                     new StarRatingDisplay(new StarDifficulty(6.78, 0)),
                     new StarRatingDisplay(new StarDifficulty(10.11, 0)),
+                    changingStarRating = new StarRatingDisplay(),
                 }
             };
-        }
+
+            Scheduler.AddDelayed(() =>
+            {
+                changingStarRating.Current.Value = new StarDifficulty(RNG.NextDouble(0, 10), RNG.Next());
+            }, 500, true);
+        });
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index f7e50fdc8a..a1f48fa811 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -3,12 +3,14 @@
 
 using System.Globalization;
 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.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -20,17 +22,29 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// <summary>
     /// A pill that displays the star rating of a <see cref="BeatmapInfo"/>.
     /// </summary>
-    public class StarRatingDisplay : CompositeDrawable
+    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
     {
-        private readonly StarDifficulty difficulty;
+        private Box background;
+        private OsuTextFlowContainer textFlow;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private readonly BindableWithCurrent<StarDifficulty> current = new BindableWithCurrent<StarDifficulty>();
+
+        public Bindable<StarDifficulty> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
         /// </summary>
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
-        public StarRatingDisplay(StarDifficulty starDifficulty)
+        public StarRatingDisplay(StarDifficulty starDifficulty = default)
         {
-            difficulty = starDifficulty;
+            Current.Value = starDifficulty;
         }
 
         [BackgroundDependencyLoader]
@@ -38,15 +52,6 @@ namespace osu.Game.Screens.Ranking.Expanded
         {
             AutoSizeAxes = Axes.Both;
 
-            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-            string wholePart = starRatingParts[0];
-            string fractionPart = starRatingParts[1];
-            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
-
-            ColourInfo backgroundColour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
-
             InternalChildren = new Drawable[]
             {
                 new CircularContainer
@@ -55,10 +60,9 @@ namespace osu.Game.Screens.Ranking.Expanded
                     Masking = true,
                     Children = new Drawable[]
                     {
-                        new Box
+                        background = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = backgroundColour
                         },
                     }
                 },
@@ -78,32 +82,51 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        textFlow = 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;
-                            });
-                        })
+                        }
                     }
                 }
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Current.BindValueChanged(difficulty => updateDisplay(difficulty.NewValue), true);
+        }
+
+        private void updateDisplay(StarDifficulty difficulty)
+        {
+            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            string wholePart = starRatingParts[0];
+            string fractionPart = starRatingParts[1];
+            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+
+            background.Colour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
+                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+
+            textFlow.Clear();
+
+            textFlow.AddText($"{wholePart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 14);
+                s.UseFullGlyphHeight = false;
+            });
+
+            textFlow.AddText($"{separator}{fractionPart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 7);
+                s.UseFullGlyphHeight = false;
+            });
+        }
     }
 }

From 43090067da8a199eca6e2d4202d0bef1eae7fe5c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 12:59:59 +0300
Subject: [PATCH 09832/10326] Use
 `BeatmapDifficultyCache.GetBindableDifficulty(...)` instead

---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index daaf3b73cb..54c739bd9f 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -55,12 +55,14 @@ namespace osu.Game.Screens.Play
             this.mods.BindTo(mods);
         }
 
+        private IBindable<StarDifficulty?> starDifficulty;
+
         [BackgroundDependencyLoader]
         private void load(BeatmapDifficultyCache difficultyCache)
         {
-            var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
+            StarRatingDisplay starRatingDisplay;
 
-            var starDifficulty = difficultyCache.GetDifficultyAsync(beatmap.BeatmapInfo, ruleset, mods.Value).Result;
+            var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
 
             AutoSizeAxes = Axes.Both;
             Children = new Drawable[]
@@ -131,7 +133,7 @@ namespace osu.Game.Screens.Play
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
                                 },
-                                new StarRatingDisplay(starDifficulty)
+                                starRatingDisplay = new StarRatingDisplay
                                 {
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
@@ -179,6 +181,13 @@ namespace osu.Game.Screens.Play
                 }
             };
 
+            starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo);
+            starDifficulty.BindValueChanged(difficulty =>
+            {
+                if (difficulty.NewValue is StarDifficulty diff)
+                    starRatingDisplay.Current.Value = diff;
+            }, true);
+
             Loading = true;
         }
 

From dca5efc59afc5876b794e6cb3610e4cb18f3a64d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 13:00:39 +0300
Subject: [PATCH 09833/10326] Remove no longer necessary ruleset info
 requirement

---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs     | 2 +-
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs              | 5 +----
 osu.Game/Screens/Play/PlayerLoader.cs                        | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index ee87877860..02c9c6b7a3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void createDisplay(Func<WorkingBeatmap> getBeatmap)
         {
-            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), Ruleset.Value, new Bindable<IReadOnlyList<Mod>>(randomMods), null)
+            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), null)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 54c739bd9f..670d99c462 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -13,7 +13,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking.Expanded;
@@ -27,7 +26,6 @@ namespace osu.Game.Screens.Play
     public class BeatmapMetadataDisplay : Container
     {
         private readonly WorkingBeatmap beatmap;
-        private readonly RulesetInfo ruleset;
         private readonly Bindable<IReadOnlyList<Mod>> mods;
         private readonly Drawable logoFacade;
         private LoadingSpinner loading;
@@ -45,10 +43,9 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, RulesetInfo ruleset, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
+        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
         {
             this.beatmap = beatmap;
-            this.ruleset = ruleset;
             this.logoFacade = logoFacade;
 
             this.mods = new Bindable<IReadOnlyList<Mod>>();
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 066ca25790..ce580e2b53 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Play
                 RelativeSizeAxes = Axes.Both,
             }).WithChildren(new Drawable[]
             {
-                MetadataInfo = new BeatmapMetadataDisplay(Beatmap.Value, Ruleset.Value, Mods, content.LogoFacade)
+                MetadataInfo = new BeatmapMetadataDisplay(Beatmap.Value, Mods, content.LogoFacade)
                 {
                     Alpha = 0,
                     Anchor = Anchor.Centre,

From 26c0010fe659915ebebb152be37032b6003b4ff3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 13:03:50 +0300
Subject: [PATCH 09834/10326] Fix test not handling 0 beatmap sets

---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 02c9c6b7a3..5ea7a0e83b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -68,6 +68,9 @@ namespace osu.Game.Tests.Visual.SongSelect
             createDisplay(() =>
             {
                 var allBeatmapSets = manager.GetAllUsableBeatmapSets(IncludedDetails.Minimal);
+                if (allBeatmapSets.Count == 0)
+                    return manager.DefaultBeatmap;
+
                 var randomBeatmapSet = allBeatmapSets[RNG.Next(0, allBeatmapSets.Count - 1)];
                 var randomBeatmap = randomBeatmapSet.Beatmaps[RNG.Next(0, randomBeatmapSet.Beatmaps.Count - 1)];
 

From df630d94282250064ba396d06b518b3ab369447d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 May 2021 14:53:19 +0200
Subject: [PATCH 09835/10326] Trim redundant `this` qualifier

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 32d2fba25e..d57acd005b 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -240,7 +240,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 ScreenSpaceSelectionPoint => this.ToScreenSpace(slider.HitObject.StackedPosition);
+        public override Vector2 ScreenSpaceSelectionPoint => ToScreenSpace(slider.HitObject.StackedPosition);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             slider.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;

From 63e267a3beefbb0c7344521af93d1a340a5a454c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 May 2021 23:32:52 +0900
Subject: [PATCH 09836/10326] Revert "Trim redundant `this` qualifier"

This reverts commit df630d94282250064ba396d06b518b3ab369447d.
---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index d57acd005b..32d2fba25e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -240,7 +240,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 ScreenSpaceSelectionPoint => ToScreenSpace(slider.HitObject.StackedPosition);
+        public override Vector2 ScreenSpaceSelectionPoint => this.ToScreenSpace(slider.HitObject.StackedPosition);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             slider.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;

From 01d732bb65202f66737d478457d62f1af1cd1884 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 May 2021 23:33:03 +0900
Subject: [PATCH 09837/10326] Revert "Refactor `SliderSelectionBlueprint` to
 not reference blueprint pieces for input handling"

This reverts commit 54fe10c82a855a16c88f8781a9ae12dc42df7b0e.
---
 .../Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs   | 6 ++++++
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs     | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
index ece9c7a757..6e22c35ab3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -26,6 +26,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             {
                 AccentColour = Color4.Transparent
             };
+
+            // SliderSelectionBlueprint relies on calling ReceivePositionalInputAt on this drawable to determine whether selection should occur.
+            // Without AlwaysPresent, a movement in a parent container (ie. the editor composer area resizing) could cause incorrect input handling.
+            AlwaysPresent = true;
         }
 
         [BackgroundDependencyLoader]
@@ -50,5 +54,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         }
 
         public void RecyclePath() => body.RecyclePath();
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => body.ReceivePositionalInputAt(screenSpacePos);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 32d2fba25e..88fcb1e715 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -240,10 +240,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 ScreenSpaceSelectionPoint => this.ToScreenSpace(slider.HitObject.StackedPosition);
+        public override Vector2 ScreenSpaceSelectionPoint => BodyPiece.ToScreenSpace(BodyPiece.PathStartLocation);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            slider.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
+            BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
 
         protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
     }

From fe86ee629ed8b7a7a36eb7048064192cf9584672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 May 2021 16:30:08 +0200
Subject: [PATCH 09838/10326] Fix temp files from beatmap listing imports not
 being cleaned up

As reported in #12718, it turns out that temporary files from beatmap
set downloads performed via the beatmap listing overlay could remain in
the user's filesystem even after the download has concluded.

The reason for the issue is a failure in component integration.
In the case of online downloads, files are first downloaded to a
temporary directory (`C:/Temp` or `/tmp`), with a randomly generated
filename, which ends in an extension of `.tmp`.

On the other side, `ArchiveModelManager`s have a `ShouldDeleteArchive()`
method, which determines whether a file should be deleted after
importing. At the time of writing, in the case of beatmap imports the
file is only automatically cleaned up if the extension of the file is
equal to `.osz`, which was not the case for temporary files.

As it turns out, `APIDownloadRequest` has a facility for adjusting the
file's extension, via the protected `FileExtension` property. Therefore,
use it in the case of `DownloadBeatmapSetRequest` to specify `.osz`,
which then will make sure that the `ShouldDeleteArchive()` check in
`BeatmapManager` picks it up for clean-up.
---
 osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs b/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
index e8871bef05..2898955de7 100644
--- a/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
+++ b/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Online.API.Requests
             return req;
         }
 
+        protected override string FileExtension => ".osz";
+
         protected override string Target => $@"beatmapsets/{Model.OnlineBeatmapSetID}/download{(noVideo ? "?noVideo=1" : "")}";
     }
 }

From d9605e807049ceabb9af5a53568738a1a424c341 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:18:23 +0300
Subject: [PATCH 09839/10326] Remove test scene description

---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 5ea7a0e83b..381ccd2dd3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -16,7 +16,6 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.SongSelect
 {
-    [System.ComponentModel.Description("player loader beatmap metadata")]
     public class TestSceneBeatmapMetadataDisplay : OsuTestScene
     {
         private BeatmapMetadataDisplay display;

From 3575d9847cd120941ad3737ff140c01184edd4e5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:21:29 +0300
Subject: [PATCH 09840/10326] Use regular test steps rather than one-time set
 up and scheduling

---
 .../Visual/Ranking/TestSceneStarRatingDisplay.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index a043f506c1..2ff664a0d9 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -12,12 +12,12 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneStarRatingDisplay : OsuTestScene
     {
-        [SetUp]
-        public void SetUp() => Schedule(() =>
+        [Test]
+        public void TestDisplay()
         {
-            StarRatingDisplay changingStarRating;
+            StarRatingDisplay changingStarRating = null;
 
-            Child = new FillFlowContainer
+            AddStep("load displays", () => Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -32,12 +32,12 @@ namespace osu.Game.Tests.Visual.Ranking
                     new StarRatingDisplay(new StarDifficulty(10.11, 0)),
                     changingStarRating = new StarRatingDisplay(),
                 }
-            };
+            });
 
-            Scheduler.AddDelayed(() =>
+            AddRepeatStep("change bottom rating", () =>
             {
                 changingStarRating.Current.Value = new StarDifficulty(RNG.NextDouble(0, 10), RNG.Next());
-            }, 500, true);
-        });
+            }, 10);
+        }
     }
 }

From a75347cb2a5dc933b9f2952d3449208379eee935 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:43:17 +0300
Subject: [PATCH 09841/10326] Remove nullable facade logic

---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 670d99c462..98829d079b 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -43,7 +42,7 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
+        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, Drawable logoFacade)
         {
             this.beatmap = beatmap;
             this.logoFacade = logoFacade;
@@ -72,11 +71,11 @@ namespace osu.Game.Screens.Play
                     Direction = FillDirection.Vertical,
                     Children = new[]
                     {
-                        logoFacade?.With(d =>
+                        logoFacade.With(d =>
                         {
                             d.Anchor = Anchor.TopCentre;
                             d.Origin = Anchor.TopCentre;
-                        }) ?? Drawable.Empty(),
+                        }),
                         new OsuSpriteText
                         {
                             Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),

From ca55287dd07a9d958e35c738d331dad21b8295ec Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:43:45 +0300
Subject: [PATCH 09842/10326] Pass empty facade and replace random property
 with method instead

---
 .../SongSelect/TestSceneBeatmapMetadataDisplay.cs  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 381ccd2dd3..552d19ac26 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -23,15 +23,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Resolved]
         private BeatmapManager manager { get; set; }
 
-        private IReadOnlyList<Mod> randomMods => Ruleset.Value.CreateInstance()
-                                                        .GetAllMods()
-                                                        .OrderBy(_ => RNG.Next())
-                                                        .Take(5)
-                                                        .ToList();
-
         private void createDisplay(Func<WorkingBeatmap> getBeatmap)
         {
-            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), null)
+            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(getRandomMods()), Empty())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -76,5 +70,11 @@ namespace osu.Game.Tests.Visual.SongSelect
                 return manager.GetWorkingBeatmap(randomBeatmap);
             });
         }
+
+        private IReadOnlyList<Mod> getRandomMods() => Ruleset.Value.CreateInstance()
+                                                             .GetAllMods()
+                                                             .OrderBy(_ => RNG.Next())
+                                                             .Take(5)
+                                                             .ToList();
     }
 }

From 655e8d3d867c5a2956caeea928e0704c98b580e6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:44:28 +0300
Subject: [PATCH 09843/10326] Remove pattern-matching on nullable with simple
 `.HasValue`/`.Value`

---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 98829d079b..d31033ef15 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -180,8 +180,8 @@ namespace osu.Game.Screens.Play
             starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo);
             starDifficulty.BindValueChanged(difficulty =>
             {
-                if (difficulty.NewValue is StarDifficulty diff)
-                    starRatingDisplay.Current.Value = diff;
+                if (difficulty.NewValue.HasValue)
+                    starRatingDisplay.Current.Value = difficulty.NewValue.Value;
             }, true);
 
             Loading = true;

From 25312b3e88d47b2cbc9ce327d2c6d05954b39d72 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 8 May 2021 11:45:31 -0400
Subject: [PATCH 09844/10326] Don't restart completion delegate on exit, revert
 exit behavior to lazer

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs           | 2 +-
 osu.Game/Screens/Play/Player.cs                               | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index e1dc6e3b42..70b1d3ef85 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("disable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, false));
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());
-            AddAssert("score shown", () => Player.IsScoreShown);
+            AddAssert("score not shown", () => !Player.IsScoreShown);
         }
 
         protected override bool AllowFail => true;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 0a2f9f0d18..557dd2a78a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -541,10 +541,8 @@ namespace osu.Game.Screens.Play
                 }
 
                 // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
-                if (prepareScoreForDisplayTask != null)
+                if (prepareScoreForDisplayTask != null && completionProgressDelegate == null)
                 {
-                    completionProgressDelegate?.Cancel();
-                    completionProgressDelegate = null;
                     updateCompletionState(true);
                 }
             }

From c52f1733be73b49af4f3dea4257fd0b9eaa5610a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 21:13:18 +0300
Subject: [PATCH 09845/10326] Apply further refactoring to star rating display
 UX-wise

---
 .../Screens/Play/BeatmapMetadataDisplay.cs    |   6 +-
 .../Ranking/Expanded/StarRatingDisplay.cs     | 106 +++++++++++++-----
 2 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index d31033ef15..0164fe9179 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -178,11 +178,7 @@ namespace osu.Game.Screens.Play
             };
 
             starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo);
-            starDifficulty.BindValueChanged(difficulty =>
-            {
-                if (difficulty.NewValue.HasValue)
-                    starRatingDisplay.Current.Value = difficulty.NewValue.Value;
-            }, true);
+            starDifficulty.BindValueChanged(d => starRatingDisplay.Current.Value = d.NewValue, true);
 
             Loading = true;
         }
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index a1f48fa811..77c43ad863 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -13,7 +13,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -22,27 +22,50 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// <summary>
     /// A pill that displays the star rating of a <see cref="BeatmapInfo"/>.
     /// </summary>
-    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
+    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty?>
     {
         private Box background;
-        private OsuTextFlowContainer textFlow;
+        private OsuSpriteText wholePart;
+        private OsuSpriteText fractionPart;
+
+        private double displayedStarRating;
+
+        protected double DisplayedStarRating
+        {
+            get => displayedStarRating;
+            set
+            {
+                displayedStarRating = value;
+
+                var starRatingParts = value.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+                wholePart.Text = starRatingParts[0];
+                fractionPart.Text = starRatingParts[1];
+            }
+        }
 
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private readonly BindableWithCurrent<StarDifficulty> current = new BindableWithCurrent<StarDifficulty>();
+        private readonly BindableWithCurrent<StarDifficulty?> current = new BindableWithCurrent<StarDifficulty?>();
 
-        public Bindable<StarDifficulty> Current
+        public Bindable<StarDifficulty?> Current
         {
             get => current.Current;
             set => current.Current = value;
         }
 
+        /// <summary>
+        /// Creates a new <see cref="StarRatingDisplay"/> without any <see cref="StarDifficulty"/> set, displaying a placeholder until <see cref="Current"/> is changed.
+        /// </summary>
+        public StarRatingDisplay()
+        {
+        }
+
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
         /// </summary>
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
-        public StarRatingDisplay(StarDifficulty starDifficulty = default)
+        public StarRatingDisplay(StarDifficulty starDifficulty)
         {
             Current.Value = starDifficulty;
         }
@@ -82,13 +105,40 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        new FillFlowContainer
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
-                            TextAnchor = Anchor.BottomLeft,
+                            Children = new[]
+                            {
+                                wholePart = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Font = OsuFont.Numeric.With(size: 14, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Text = NumberFormatInfo.CurrentInfo.NumberDecimalSeparator,
+                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                },
+                                fractionPart = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                }
+                            }
                         }
                     }
                 }
@@ -98,35 +148,31 @@ namespace osu.Game.Screens.Ranking.Expanded
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Current.BindValueChanged(difficulty => updateDisplay(difficulty.NewValue), true);
+
+            Current.BindValueChanged(_ => updateDisplay(), true);
+            FinishTransforms(true);
         }
 
-        private void updateDisplay(StarDifficulty difficulty)
+        private void updateDisplay()
         {
-            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-            string wholePart = starRatingParts[0];
-            string fractionPart = starRatingParts[1];
-            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+            const double duration = 400;
+            const Easing easing = Easing.OutQuint;
 
-            background.Colour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+            ColourInfo backgroundColour;
 
-            textFlow.Clear();
-
-            textFlow.AddText($"{wholePart}", s =>
+            if (Current.Value == null)
+                backgroundColour = Color4.SlateGray.Opacity(0.3f);
+            else
             {
-                s.Colour = Color4.Black;
-                s.Font = s.Font.With(size: 14);
-                s.UseFullGlyphHeight = false;
-            });
+                var rating = Current.Value.Value.DifficultyRating;
 
-            textFlow.AddText($"{separator}{fractionPart}", s =>
-            {
-                s.Colour = Color4.Black;
-                s.Font = s.Font.With(size: 7);
-                s.UseFullGlyphHeight = false;
-            });
+                backgroundColour = rating == DifficultyRating.ExpertPlus
+                    ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                    : (ColourInfo)colours.ForDifficultyRating(rating);
+            }
+
+            background.FadeColour(backgroundColour, duration, easing);
+            this.TransformTo(nameof(DisplayedStarRating), Current.Value?.Stars ?? 0.0f, duration, easing);
         }
     }
 }

From f701c331f285834f4814b4e070384a54637214f4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 21:15:15 +0300
Subject: [PATCH 09846/10326] Add initial fade in to the metadata display

Avoids first frame discrepancies from appearing in the test scene, those can be delt with later on, if needed.
---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 552d19ac26..f41180acf2 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -30,8 +30,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Scale = new Vector2(1.5f),
+                Alpha = 0f,
             });
 
+            AddStep("fade in", () => display.FadeIn(400, Easing.OutQuint));
             AddToggleStep("trigger loading", v => display.Loading = v);
         }
 

From c3bf6a0287c16682e71a750728c40cfc2a99b06f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 May 2021 21:01:37 +0200
Subject: [PATCH 09847/10326] Remove weird vestigial `Current` reimplementation

Has no functional purpose anymore since the changes in the HUD element
data binding flow.
---
 osu.Game/Skinning/LegacyScoreCounter.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 21112aa107..ecb907e601 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.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.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
@@ -16,8 +15,6 @@ namespace osu.Game.Skinning
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
 
-        public new Bindable<double> Current { get; } = new Bindable<double>();
-
         public LegacyScoreCounter(ISkin skin)
             : base(6)
         {
@@ -26,9 +23,6 @@ namespace osu.Game.Skinning
 
             this.skin = skin;
 
-            // base class uses int for display, but externally we bind to ScoreProcessor as a double for now.
-            Current.BindValueChanged(v => base.Current.Value = (int)v.NewValue);
-
             Scale = new Vector2(0.96f);
             Margin = new MarginPadding(10);
         }

From efb9164658a127093cf39672466bafbb89268e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 May 2021 21:35:12 +0200
Subject: [PATCH 09848/10326] Restore previous test scene logic

---
 .../Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
index 34356184a2..6a8a2187f9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.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.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
@@ -15,8 +13,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinnableAccuracyCounter : SkinnableTestScene
     {
-        private IEnumerable<SkinnableAccuracyCounter> accuracyCounters => CreatedDrawables.OfType<SkinnableAccuracyCounter>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
         [Cached]
@@ -25,7 +21,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create combo counters", () => SetContents(() => new SkinnableAccuracyCounter()));
+            AddStep("Set initial accuracy", () => scoreProcessor.Accuracy.Value = 1);
+            AddStep("Create accuracy counters", () => SetContents(() => new SkinnableAccuracyCounter()));
         }
 
         [Test]
@@ -33,7 +30,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep(@"Reset all", () => scoreProcessor.Accuracy.Value = 1);
 
-            AddStep(@"Hit! :D", () => scoreProcessor.Accuracy.Value -= 0.23);
+            AddStep(@"Miss :(", () => scoreProcessor.Accuracy.Value -= 0.023);
         }
     }
 }

From 67cea6e762f8dd2ff0e886bc2fc1ea6c79c56ce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 May 2021 21:38:03 +0200
Subject: [PATCH 09849/10326] Remove explicit binding to accuracy counter from
 overlay

---
 osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs | 3 ---
 osu.Game/Screens/Play/HUDOverlay.cs                   | 2 --
 2 files changed, 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index 17c2493d2d..fcb8fca35d 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.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.Framework.Bindables;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableAccuracyCounter : SkinnableDrawable
     {
-        public Bindable<double> Current { get; } = new Bindable<double>();
-
         public SkinnableAccuracyCounter()
             : base(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter), _ => new DefaultAccuracyCounter())
         {
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index c887fb78e0..e9b376c433 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -320,8 +320,6 @@ namespace osu.Game.Screens.Play
 
         protected virtual void BindScoreProcessor(ScoreProcessor processor)
         {
-            AccuracyCounter?.Current.BindTo(processor.Accuracy);
-
             if (HealthDisplay is IHealthDisplay shd)
             {
                 processor.NewJudgement += judgement =>

From 8fba655d2e9007449f19b67abf2876ce61656b67 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 21:20:17 +0300
Subject: [PATCH 09850/10326] Allow changing ruleset during test

---
 .../TestSceneBeatmapMetadataDisplay.cs         | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index f41180acf2..0fbf42da6f 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
 using osuTK;
@@ -23,7 +24,18 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Resolved]
         private BeatmapManager manager { get; set; }
 
-        private void createDisplay(Func<WorkingBeatmap> getBeatmap)
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            foreach (var ruleset in rulesets.AvailableRulesets)
+                AddStep($"switch to {ruleset.Name}", () => Ruleset.Value = ruleset);
+        }
+
+        private void createTest(Func<WorkingBeatmap> getBeatmap)
         {
             AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(getRandomMods()), Empty())
             {
@@ -43,7 +55,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                               [Values("Trial", "Some1's very hardest difficulty")]
                               string version)
         {
-            createDisplay(() => CreateWorkingBeatmap(new Beatmap
+            createTest(() => CreateWorkingBeatmap(new Beatmap
             {
                 BeatmapInfo =
                 {
@@ -60,7 +72,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestRandomFromDatabase()
         {
-            createDisplay(() =>
+            createTest(() =>
             {
                 var allBeatmapSets = manager.GetAllUsableBeatmapSets(IncludedDetails.Minimal);
                 if (allBeatmapSets.Count == 0)

From 342c5a5938253c961bfc97d2e1239f74ba20f4d9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 04:49:40 +0300
Subject: [PATCH 09851/10326] Add tests to indicate the issue

---
 .../Visual/Online/TestSceneNewsOverlay.cs     | 62 ++++++++++++++++---
 1 file changed, 55 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index 6ebe8fcc07..f10b385c61 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -2,7 +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.Testing;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -14,21 +17,34 @@ namespace osu.Game.Tests.Visual.Online
     {
         private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
 
-        private NewsOverlay news;
+        private NewsOverlay overlay;
 
         [SetUp]
-        public void SetUp() => Schedule(() => Child = news = new NewsOverlay());
+        public void SetUp() => Schedule(() => Child = overlay = new NewsOverlay());
 
         [Test]
         public void TestRequest()
         {
             setUpNewsResponse(responseExample);
-            AddStep("Show", () => news.Show());
-            AddStep("Show article", () => news.ShowArticle("article"));
+            AddStep("Show", () => overlay.Show());
+            AddStep("Show article", () => overlay.ShowArticle("article"));
         }
 
-        private void setUpNewsResponse(GetNewsResponse r)
-            => AddStep("set up response", () =>
+        [Test]
+        public void TestCursorRequest()
+        {
+            setUpNewsResponse(responseWithCursor, "Set up cursor response");
+            AddStep("Show", () => overlay.Show());
+            AddAssert("Show More button is visible", () => showMoreButton.Alpha == 1);
+            setUpNewsResponse(responseWithNoCursor, "Set up no cursor response");
+            AddStep("Click Show More", () => showMoreButton.Click());
+            AddAssert("Show More button is hidden", () => showMoreButton.Alpha == 0);
+        }
+
+        private ShowMoreButton showMoreButton => overlay.ChildrenOfType<ShowMoreButton>().First();
+
+        private void setUpNewsResponse(GetNewsResponse r, string testName = "Set up response")
+            => AddStep(testName, () =>
             {
                 dummyAPI.HandleRequest = request =>
                 {
@@ -40,7 +56,7 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-        private GetNewsResponse responseExample => new GetNewsResponse
+        private static GetNewsResponse responseExample => new GetNewsResponse
         {
             NewsPosts = new[]
             {
@@ -62,5 +78,37 @@ namespace osu.Game.Tests.Visual.Online
                 }
             }
         };
+
+        private static GetNewsResponse responseWithCursor => new GetNewsResponse
+        {
+            NewsPosts = new[]
+            {
+                new APINewsPost
+                {
+                    Title = "This post has an image which starts with \"/\" and has many authors!",
+                    Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+                    Author = "someone, someone1, someone2, someone3, someone4",
+                    FirstImage = "/help/wiki/shared/news/banners/monthly-beatmapping-contest.png",
+                    PublishedAt = DateTimeOffset.Now
+                }
+            },
+            Cursor = new Cursor()
+        };
+
+        private static GetNewsResponse responseWithNoCursor => new GetNewsResponse
+        {
+            NewsPosts = new[]
+            {
+                new APINewsPost
+                {
+                    Title = "This post has a full-url image! (HTML entity: &amp;)",
+                    Preview = "boom (HTML entity: &amp;)",
+                    Author = "user (HTML entity: &amp;)",
+                    FirstImage = "https://assets.ppy.sh/artists/88/header.jpg",
+                    PublishedAt = DateTimeOffset.Now
+                }
+            },
+            Cursor = null
+        };
     }
 }

From dde9fd28e6872e2afe41670861ffb7ec510b74b9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 04:57:24 +0300
Subject: [PATCH 09852/10326] Hide ShowMore button if there's nothing to load

---
 osu.Game/Overlays/News/Displays/FrontPageDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
index 0f177f151a..a1bc6c650b 100644
--- a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Overlays.News.Displays
             {
                 content.Add(loaded);
                 showMore.IsLoading = false;
-                showMore.Show();
+                showMore.Alpha = lastCursor == null ? 0 : 1;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 

From ae2b5a0806c3b0cad6dba614f1273d9d121cf0f6 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 8 May 2021 22:42:14 -0400
Subject: [PATCH 09853/10326] Actually test that player was exited

---
 osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 70b1d3ef85..0ac8e01482 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("disable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, false));
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());
-            AddAssert("score not shown", () => !Player.IsScoreShown);
+            AddAssert("player exited", () => Stack.CurrentScreen == null);
         }
 
         protected override bool AllowFail => true;

From 0818deac17110c65ae22005c5616c55e67913847 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 06:06:34 +0300
Subject: [PATCH 09854/10326] Fix potential test scene failure due to
 showMoreButton not being loaded in time

---
 osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index f10b385c61..46454879da 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             setUpNewsResponse(responseWithCursor, "Set up cursor response");
             AddStep("Show", () => overlay.Show());
+            AddUntilStep("Show more button is ready", () => showMoreButton != null);
             AddAssert("Show More button is visible", () => showMoreButton.Alpha == 1);
             setUpNewsResponse(responseWithNoCursor, "Set up no cursor response");
             AddStep("Click Show More", () => showMoreButton.Click());

From 8868439ce46b042b2eae1bd7fc48614ac30d9197 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 06:49:12 +0300
Subject: [PATCH 09855/10326] Another approach to fix test scene failure

---
 osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index 46454879da..0be09d1fcc 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -36,10 +36,10 @@ namespace osu.Game.Tests.Visual.Online
             setUpNewsResponse(responseWithCursor, "Set up cursor response");
             AddStep("Show", () => overlay.Show());
             AddUntilStep("Show more button is ready", () => showMoreButton != null);
-            AddAssert("Show More button is visible", () => showMoreButton.Alpha == 1);
+            AddAssert("Show More button is visible", () => showMoreButton?.Alpha == 1);
             setUpNewsResponse(responseWithNoCursor, "Set up no cursor response");
-            AddStep("Click Show More", () => showMoreButton.Click());
-            AddAssert("Show More button is hidden", () => showMoreButton.Alpha == 0);
+            AddStep("Click Show More", () => showMoreButton?.Click());
+            AddAssert("Show More button is hidden", () => showMoreButton?.Alpha == 0);
         }
 
         private ShowMoreButton showMoreButton => overlay.ChildrenOfType<ShowMoreButton>().First();

From f0c1784d05a56dea2082473ca02063c1721bdad1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 09:12:37 +0300
Subject: [PATCH 09856/10326] Use FirstOrDefault instead of First

---
 osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index 0be09d1fcc..ba692a7769 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("Show More button is hidden", () => showMoreButton?.Alpha == 0);
         }
 
-        private ShowMoreButton showMoreButton => overlay.ChildrenOfType<ShowMoreButton>().First();
+        private ShowMoreButton showMoreButton => overlay.ChildrenOfType<ShowMoreButton>().FirstOrDefault();
 
         private void setUpNewsResponse(GetNewsResponse r, string testName = "Set up response")
             => AddStep(testName, () =>

From 879c08e6667024694dde3b8bb095b00185a3f3c3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 10:06:36 +0300
Subject: [PATCH 09857/10326] Use UntilStep instead of Assert to check button
 visibility

---
 osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index ba692a7769..93a5b6fc59 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -35,11 +35,10 @@ namespace osu.Game.Tests.Visual.Online
         {
             setUpNewsResponse(responseWithCursor, "Set up cursor response");
             AddStep("Show", () => overlay.Show());
-            AddUntilStep("Show more button is ready", () => showMoreButton != null);
-            AddAssert("Show More button is visible", () => showMoreButton?.Alpha == 1);
+            AddUntilStep("Show More button is visible", () => showMoreButton?.Alpha == 1);
             setUpNewsResponse(responseWithNoCursor, "Set up no cursor response");
             AddStep("Click Show More", () => showMoreButton?.Click());
-            AddAssert("Show More button is hidden", () => showMoreButton?.Alpha == 0);
+            AddUntilStep("Show More button is hidden", () => showMoreButton?.Alpha == 0);
         }
 
         private ShowMoreButton showMoreButton => overlay.ChildrenOfType<ShowMoreButton>().FirstOrDefault();

From 8964d51de984f3089f5016d184e58b5ba222654e Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 9 May 2021 14:10:38 -0700
Subject: [PATCH 09858/10326] Add ability to sort by source in song select

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 1 +
 osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs      | 3 +++
 osu.Game/Screens/Select/Filter/SortMode.cs                  | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 5731b1ac2c..643f4131dc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -304,6 +304,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep(@"Sort by BPM", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.BPM));
             AddStep(@"Sort by Length", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Length));
             AddStep(@"Sort by Difficulty", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Difficulty));
+            AddStep(@"Sort by Source", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Source));
         }
 
         [Test]
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index bf045ed612..635f1d8e1e 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -82,6 +82,9 @@ namespace osu.Game.Screens.Select.Carousel
 
                 case SortMode.Difficulty:
                     return compareUsingAggregateMax(otherSet, b => b.StarDifficulty);
+
+                case SortMode.Source:
+                    return string.Compare(BeatmapSet.Metadata.Source, otherSet.BeatmapSet.Metadata.Source, StringComparison.OrdinalIgnoreCase);
             }
         }
 
diff --git a/osu.Game/Screens/Select/Filter/SortMode.cs b/osu.Game/Screens/Select/Filter/SortMode.cs
index be76fbc3ba..db0e6812b8 100644
--- a/osu.Game/Screens/Select/Filter/SortMode.cs
+++ b/osu.Game/Screens/Select/Filter/SortMode.cs
@@ -29,6 +29,9 @@ namespace osu.Game.Screens.Select.Filter
         RankAchieved,
 
         [Description("Title")]
-        Title
+        Title,
+
+        [Description("Source")]
+        Source,
     }
 }

From a21718f1cd89139f684835de8d2dd7d432da2de6 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 9 May 2021 14:26:45 -0700
Subject: [PATCH 09859/10326] Move source case to a better spot

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 635f1d8e1e..00c2c2cb4a 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -71,6 +71,9 @@ namespace osu.Game.Screens.Select.Carousel
                 case SortMode.Author:
                     return string.Compare(BeatmapSet.Metadata.Author.Username, otherSet.BeatmapSet.Metadata.Author.Username, StringComparison.OrdinalIgnoreCase);
 
+                case SortMode.Source:
+                    return string.Compare(BeatmapSet.Metadata.Source, otherSet.BeatmapSet.Metadata.Source, StringComparison.OrdinalIgnoreCase);
+
                 case SortMode.DateAdded:
                     return otherSet.BeatmapSet.DateAdded.CompareTo(BeatmapSet.DateAdded);
 
@@ -82,9 +85,6 @@ namespace osu.Game.Screens.Select.Carousel
 
                 case SortMode.Difficulty:
                     return compareUsingAggregateMax(otherSet, b => b.StarDifficulty);
-
-                case SortMode.Source:
-                    return string.Compare(BeatmapSet.Metadata.Source, otherSet.BeatmapSet.Metadata.Source, StringComparison.OrdinalIgnoreCase);
             }
         }
 

From a71e52da4caf53c88b772263d4b7fb89090a34ec Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 9 May 2021 15:39:59 -0700
Subject: [PATCH 09860/10326] Fix enum ordering after adding source

---
 osu.Game/Screens/Select/Filter/SortMode.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Filter/SortMode.cs b/osu.Game/Screens/Select/Filter/SortMode.cs
index db0e6812b8..18c5d713e1 100644
--- a/osu.Game/Screens/Select/Filter/SortMode.cs
+++ b/osu.Game/Screens/Select/Filter/SortMode.cs
@@ -28,10 +28,10 @@ namespace osu.Game.Screens.Select.Filter
         [Description("Rank Achieved")]
         RankAchieved,
 
-        [Description("Title")]
-        Title,
-
         [Description("Source")]
         Source,
+
+        [Description("Title")]
+        Title,
     }
 }

From ab6239fd5f4545077162a2adec8352c789426cf0 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Mon, 10 May 2021 00:51:58 +0200
Subject: [PATCH 09861/10326] change math for displaying volume "MAX"

---
 osu.Game/Overlays/Volume/VolumeMeter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index f1f21bec49..a15076581e 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -204,7 +204,7 @@ namespace osu.Game.Overlays.Volume
             {
                 displayVolume = value;
 
-                if (displayVolume > 0.99f)
+                if (displayVolume >= 0.995f)
                 {
                     text.Text = "MAX";
                     maxGlow.EffectColour = meterColour.Opacity(2f);

From 132bb7832d31e2c30719c65dd4da18d8fbbc2691 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:06:33 +0900
Subject: [PATCH 09862/10326] Fix some regressions when updating test scenes

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs          |  7 ++-----
 .../Gameplay/TestSceneSkinnableHealthDisplay.cs       | 11 +++++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 99facb2731..ebc431a78b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 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;
@@ -21,17 +22,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuConfigManager config { get; set; }
 
-        [SetUpSteps]
-        public void SetUpSteps()
-        {
-        }
-
         private void create(HealthProcessor healthProcessor)
         {
             AddStep("create layer", () =>
             {
                 Child = new HealthProcessorContainer(healthProcessor)
                 {
+                    RelativeSizeAxes = Axes.Both,
                     Child = layer = new FailingLayer()
                 };
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index 2d6a6d95c7..4f50613416 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -43,18 +43,21 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddRepeatStep(@"decrease hp", delegate
             {
-                healthProcessor.Health.Value = 0.08f;
+                healthProcessor.Health.Value -= 0.08f;
             }, 10);
 
             AddRepeatStep(@"increase hp without flash", delegate
             {
-                healthProcessor.Health.Value = 0.1f;
+                healthProcessor.Health.Value += 0.1f;
             }, 3);
 
             AddRepeatStep(@"increase hp with flash", delegate
             {
-                healthProcessor.Health.Value = 0.1f;
-                healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement()));
+                healthProcessor.Health.Value += 0.1f;
+                healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement())
+                {
+                    Type = HitResult.Perfect
+                });
             }, 3);
         }
     }

From 1bbbe8042099a5b1c3b659b1b899e2970651425c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:20:22 +0900
Subject: [PATCH 09863/10326] Fix missing instances of `HealthProcessor`
 caching

---
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs         | 1 +
 osu.Game/Screens/Play/Player.cs                                 | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 7c65601d50..ac5599cc27 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinEditorMultipleSkins : SkinnableTestScene
     {
+        [Cached]
         private readonly ScoreProcessor scoreProcessor = new ScoreProcessor();
 
         [Cached(typeof(HealthProcessor))]
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 396a9f841d..ba34ed4750 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -208,6 +208,8 @@ namespace osu.Game.Screens.Play
             HealthProcessor = ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
             HealthProcessor.ApplyBeatmap(playableBeatmap);
 
+            dependencies.CacheAs(HealthProcessor);
+
             if (!ScoreProcessor.Mode.Disabled)
                 config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
 

From 1d38fa29b5a853a2be449ff00e3732359b0fbe00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:23:04 +0900
Subject: [PATCH 09864/10326] Remove unused using statement

---
 osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index ebc431a78b..fb4c9d713a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -6,7 +6,6 @@ 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.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;

From 0c973feb53f1e76a593994340d522e1afb439e46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:34:21 +0900
Subject: [PATCH 09865/10326] Tidy up test scene

---
 .../TestSceneBeatmapMetadataDisplay.cs        | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 0fbf42da6f..e80c453da9 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -35,27 +35,13 @@ namespace osu.Game.Tests.Visual.SongSelect
                 AddStep($"switch to {ruleset.Name}", () => Ruleset.Value = ruleset);
         }
 
-        private void createTest(Func<WorkingBeatmap> getBeatmap)
-        {
-            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(getRandomMods()), Empty())
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Scale = new Vector2(1.5f),
-                Alpha = 0f,
-            });
-
-            AddStep("fade in", () => display.FadeIn(400, Easing.OutQuint));
-            AddToggleStep("trigger loading", v => display.Loading = v);
-        }
-
         [Test]
         public void TestLocal([Values("Beatmap", "Some long title and stuff")]
                               string title,
                               [Values("Trial", "Some1's very hardest difficulty")]
                               string version)
         {
-            createTest(() => CreateWorkingBeatmap(new Beatmap
+            showMetadataForBeatmap(() => CreateWorkingBeatmap(new Beatmap
             {
                 BeatmapInfo =
                 {
@@ -72,7 +58,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestRandomFromDatabase()
         {
-            createTest(() =>
+            showMetadataForBeatmap(() =>
             {
                 var allBeatmapSets = manager.GetAllUsableBeatmapSets(IncludedDetails.Minimal);
                 if (allBeatmapSets.Count == 0)
@@ -85,10 +71,23 @@ namespace osu.Game.Tests.Visual.SongSelect
             });
         }
 
-        private IReadOnlyList<Mod> getRandomMods() => Ruleset.Value.CreateInstance()
-                                                             .GetAllMods()
-                                                             .OrderBy(_ => RNG.Next())
-                                                             .Take(5)
-                                                             .ToList();
+        private void showMetadataForBeatmap(Func<WorkingBeatmap> getBeatmap)
+        {
+            AddStep("setup display", () =>
+            {
+                var randomMods = Ruleset.Value.CreateInstance().GetAllMods().OrderBy(_ => RNG.Next()).Take(5).ToList();
+
+                Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), Empty())
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(1.5f),
+                    Alpha = 0f,
+                };
+            });
+
+            AddStep("fade in", () => display.FadeIn(400, Easing.OutQuint));
+            AddToggleStep("trigger loading", v => display.Loading = v);
+        }
     }
 }

From 2b90bc4f1f85e35d1610e3e1e993e97dd5df643b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:35:23 +0900
Subject: [PATCH 09866/10326] Remove unnecessary ruleset switching steps

---
 .../SongSelect/TestSceneBeatmapMetadataDisplay.cs    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index e80c453da9..0fd9197ab4 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -10,7 +10,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
 using osuTK;
@@ -24,17 +23,6 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Resolved]
         private BeatmapManager manager { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            foreach (var ruleset in rulesets.AvailableRulesets)
-                AddStep($"switch to {ruleset.Name}", () => Ruleset.Value = ruleset);
-        }
-
         [Test]
         public void TestLocal([Values("Beatmap", "Some long title and stuff")]
                               string title,

From b7acf9de52606a8a3bc87983d5deb096a773e6ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:36:56 +0900
Subject: [PATCH 09867/10326] Make test work without manually clicking things

---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 0fd9197ab4..49aec02aa0 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -72,10 +72,13 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Scale = new Vector2(1.5f),
                     Alpha = 0f,
                 };
+
+                display.FadeIn(400, Easing.OutQuint);
             });
 
-            AddStep("fade in", () => display.FadeIn(400, Easing.OutQuint));
-            AddToggleStep("trigger loading", v => display.Loading = v);
+            AddWaitStep("wait a bit", 5);
+
+            AddStep("finish loading", () => display.Loading = false);
         }
     }
 }

From 9ba412d27e9fe2161530a133efe2d74d329cdb8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:41:22 +0900
Subject: [PATCH 09868/10326] Add the osu! logo to the test scene

Makes no sense to add a test intended to test visual behaviour with one
of the main elements missing. Not sure how you would be able to test the
flow with the logo's presence.
---
 .../SongSelect/TestSceneBeatmapMetadataDisplay.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 49aec02aa0..230822e070 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 using osuTK;
 
@@ -65,12 +66,16 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 var randomMods = Ruleset.Value.CreateInstance().GetAllMods().OrderBy(_ => RNG.Next()).Take(5).ToList();
 
-                Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), Empty())
+                OsuLogo logo = new OsuLogo { Scale = new Vector2(0.15f) };
+
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(1.5f),
-                    Alpha = 0f,
+                    display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), logo)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Alpha = 0f,
+                    }
                 };
 
                 display.FadeIn(400, Easing.OutQuint);

From 35a7226cd82120207014a652567a5e87febc25e2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 10 May 2021 13:41:04 +0900
Subject: [PATCH 09869/10326] Add newline

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 2292f64989..6c2571cc28 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -39,7 +39,8 @@ namespace osu.Game.Screens.Play.HUD
 
         private void onNewJudgement(JudgementResult judgement)
         {
-            if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit) Flash(judgement);
+            if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
+                Flash(judgement);
         }
 
         protected override void Dispose(bool isDisposing)

From 7ca3e13712b974ce4cee0b431602ddf2fa654eed Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 May 2021 07:43:01 +0300
Subject: [PATCH 09870/10326] Implement basic years panel

---
 .../Visual/Online/TestSceneNewsYearsPanel.cs  |  34 ++++++
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs  | 108 ++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
 create mode 100644 osu.Game/Overlays/News/Sidebar/YearsPanel.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
new file mode 100644
index 0000000000..75975f04f8
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.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.Graphics;
+using osu.Game.Overlays.News.Sidebar;
+using osu.Framework.Allocation;
+using osu.Game.Overlays;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsYearsPanel : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private readonly YearsPanel panel;
+
+        public TestSceneNewsYearsPanel()
+        {
+            Add(panel = new YearsPanel()
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            AddStep("Load years", () => panel.Years = new[] { 1000, 2000, 3000, 4000 });
+            AddStep("Load different years", () => panel.Years = new[] { 1001, 2001, 3001, 4001, 5001, 6001, 7001, 8001 });
+        }
+    }
+}
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
new file mode 100644
index 0000000000..d71c7ba48e
--- /dev/null
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.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 osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osuTK;
+using System.Linq;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using System.Collections.Generic;
+using osu.Game.Graphics;
+using osu.Framework.Bindables;
+using System.Collections.Specialized;
+
+namespace osu.Game.Overlays.News.Sidebar
+{
+    public class YearsPanel : CompositeDrawable
+    {
+        public int[] Years
+        {
+            set
+            {
+                years.Clear();
+                years.AddRange(value);
+            }
+        }
+
+        private readonly BindableList<int> years = new BindableList<int>();
+
+        private FillFlowContainer<YearButton> flow;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            Width = 160;
+            AutoSizeAxes = Axes.Y;
+            Masking = true;
+            CornerRadius = 6;
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background3
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding(5),
+                    Child = flow = new FillFlowContainer<YearButton>
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(5)
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            years.BindCollectionChanged((u, v) =>
+            {
+                switch (v.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        flow.Children = years.Select(y => new YearButton(y)).ToArray();
+                        break;
+                }
+            }, true);
+        }
+
+        private class YearButton : OsuHoverContainer
+        {
+            protected override IEnumerable<Drawable> EffectTargets => new[] { text };
+
+            private readonly int year;
+            private readonly OsuSpriteText text;
+
+            public YearButton(int year)
+            {
+                this.year = year;
+
+                Size = new Vector2(33.75f, 15);
+                Child = text = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Font = OsuFont.GetFont(size: 12),
+                    Text = year.ToString()
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                IdleColour = colourProvider.Light2;
+                HoverColour = colourProvider.Light1;
+                Action = () => { }; // TODO
+            }
+        }
+    }
+}

From 332cb74cad9f3adf3934432c344ce275be3405ee Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 10 May 2021 13:58:13 +0900
Subject: [PATCH 09871/10326] Fix toolbar queuing ruleset sounds

---
 osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
index eb235632e8..9ca105ee7f 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
@@ -69,13 +69,15 @@ namespace osu.Game.Overlays.Toolbar
             base.LoadComplete();
 
             Current.BindDisabledChanged(disabled => this.FadeColour(disabled ? Color4.Gray : Color4.White, 300), true);
-            Current.BindValueChanged(_ => moveLineToCurrent(), true);
+            Current.BindValueChanged(_ => moveLineToCurrent());
+
+            // Scheduled to allow the button flow layout to be computed before the line position is updated
+            ScheduleAfterChildren(moveLineToCurrent);
         }
 
         private bool hasInitialPosition;
 
-        // Scheduled to allow the flow layout to be computed before the line position is updated
-        private void moveLineToCurrent() => ScheduleAfterChildren(() =>
+        private void moveLineToCurrent()
         {
             if (SelectedTab != null)
             {
@@ -86,7 +88,7 @@ namespace osu.Game.Overlays.Toolbar
 
                 hasInitialPosition = true;
             }
-        });
+        }
 
         public override bool HandleNonPositionalInput => !Current.Disabled && base.HandleNonPositionalInput;
 

From 7971a2ef485bf8e80104a2032c378da069acdb7f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 May 2021 08:47:00 +0300
Subject: [PATCH 09872/10326] Implement MonthPanel component

---
 .../Visual/Online/TestSceneNewsMonthPanel.cs  |  80 +++++++++
 osu.Game/Overlays/News/Sidebar/MonthPanel.cs  | 155 ++++++++++++++++++
 2 files changed, 235 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
 create mode 100644 osu.Game/Overlays/News/Sidebar/MonthPanel.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
new file mode 100644
index 0000000000..75e02b66e1
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Overlays.News.Sidebar;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsMonthPanel : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        [Test]
+        public void CreateClosedMonthPanel()
+        {
+            AddStep("Create", () => Child = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.TopCentre,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background2,
+                    },
+                    new MonthPanel(DateTime.Now, posts),
+                }
+            });
+        }
+
+        [Test]
+        public void CreateOpenMonthPanel()
+        {
+            AddStep("Create", () => Child = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.TopCentre,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background2,
+                    },
+                    new MonthPanel(DateTime.Now, posts)
+                    {
+                        IsOpen = { Value = true }
+                    },
+                }
+            });
+        }
+
+        private static APINewsPost[] posts => new[]
+        {
+            new APINewsPost
+            {
+                Title = "Short title"
+            },
+            new APINewsPost
+            {
+                Title = "Oh boy that's a long post title I wonder if it will break anything"
+            },
+            new APINewsPost
+            {
+                Title = "Medium title, nothing to see here"
+            }
+        };
+    }
+}
diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
new file mode 100644
index 0000000000..1dd1c561ab
--- /dev/null
+++ b/osu.Game/Overlays/News/Sidebar/MonthPanel.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 osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Graphics.Containers;
+using osuTK;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics;
+using System.Linq;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Sprites;
+
+namespace osu.Game.Overlays.News.Sidebar
+{
+    public class MonthPanel : CompositeDrawable
+    {
+        public readonly BindableBool IsOpen = new BindableBool();
+
+        private readonly FillFlowContainer postsFlow;
+
+        public MonthPanel(DateTime date, APINewsPost[] posts)
+        {
+            Width = 160;
+            AutoSizeDuration = 250;
+            AutoSizeEasing = Easing.OutQuint;
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 5),
+                Children = new Drawable[]
+                {
+                    new DropdownButton(date)
+                    {
+                        IsOpen = { BindTarget = IsOpen }
+                    },
+                    postsFlow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 5),
+                        Children = posts.Select(p => new PostButton(p)).ToArray()
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            IsOpen.BindValueChanged(open =>
+            {
+                ClearTransforms();
+
+                if (open.NewValue)
+                {
+                    AutoSizeAxes = Axes.Y;
+                    postsFlow.FadeIn(250, Easing.OutQuint);
+                }
+                else
+                {
+                    AutoSizeAxes = Axes.None;
+                    this.ResizeHeightTo(15, 250, Easing.OutQuint);
+
+                    postsFlow.FadeOut(250, Easing.OutQuint);
+                }
+            }, true);
+
+            // First state change should be instant.
+            FinishTransforms();
+            postsFlow.FinishTransforms();
+        }
+
+        private class DropdownButton : OsuHoverContainer
+        {
+            public readonly BindableBool IsOpen = new BindableBool();
+
+            protected override IEnumerable<Drawable> EffectTargets => null;
+
+            private readonly SpriteIcon icon;
+
+            public DropdownButton(DateTime date)
+            {
+                Size = new Vector2(160, 15);
+                Action = IsOpen.Toggle;
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                        Text = date.ToString("MMM yyyy")
+                    },
+                    icon = new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Size = new Vector2(10),
+                        Icon = FontAwesome.Solid.ChevronDown
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                IsOpen.BindValueChanged(open =>
+                {
+                    icon.Scale = new Vector2(1, open.NewValue ? -1 : 1);
+                }, true);
+            }
+        }
+
+        private class PostButton : OsuHoverContainer
+        {
+            protected override IEnumerable<Drawable> EffectTargets => new[] { text };
+
+            private readonly APINewsPost post;
+            private readonly TextFlowContainer text;
+
+            public PostButton(APINewsPost post)
+            {
+                this.post = post;
+
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+
+                Child = text = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 12))
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Text = post.Title
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                IdleColour = colourProvider.Light2;
+                HoverColour = colourProvider.Light1;
+                Action = () => { }; // TODO
+            }
+        }
+    }
+}

From 301dab1ce8d8eb481a4180f63a7aa213919279c2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 12:55:07 +0300
Subject: [PATCH 09873/10326] Refactor `StarRatingDisplay` to be mutable with a
 current bindable

---
 .../Ranking/TestSceneStarRatingDisplay.cs     | 15 +++-
 .../Ranking/Expanded/StarRatingDisplay.cs     | 87 ++++++++++++-------
 2 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index d0067c3396..a043f506c1 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Ranking.Expanded;
 
@@ -10,8 +12,11 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneStarRatingDisplay : OsuTestScene
     {
-        public TestSceneStarRatingDisplay()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
+            StarRatingDisplay changingStarRating;
+
             Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
@@ -25,8 +30,14 @@ namespace osu.Game.Tests.Visual.Ranking
                     new StarRatingDisplay(new StarDifficulty(5.67, 0)),
                     new StarRatingDisplay(new StarDifficulty(6.78, 0)),
                     new StarRatingDisplay(new StarDifficulty(10.11, 0)),
+                    changingStarRating = new StarRatingDisplay(),
                 }
             };
-        }
+
+            Scheduler.AddDelayed(() =>
+            {
+                changingStarRating.Current.Value = new StarDifficulty(RNG.NextDouble(0, 10), RNG.Next());
+            }, 500, true);
+        });
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index f7e50fdc8a..a1f48fa811 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -3,12 +3,14 @@
 
 using System.Globalization;
 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.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -20,17 +22,29 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// <summary>
     /// A pill that displays the star rating of a <see cref="BeatmapInfo"/>.
     /// </summary>
-    public class StarRatingDisplay : CompositeDrawable
+    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
     {
-        private readonly StarDifficulty difficulty;
+        private Box background;
+        private OsuTextFlowContainer textFlow;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private readonly BindableWithCurrent<StarDifficulty> current = new BindableWithCurrent<StarDifficulty>();
+
+        public Bindable<StarDifficulty> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
         /// </summary>
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
-        public StarRatingDisplay(StarDifficulty starDifficulty)
+        public StarRatingDisplay(StarDifficulty starDifficulty = default)
         {
-            difficulty = starDifficulty;
+            Current.Value = starDifficulty;
         }
 
         [BackgroundDependencyLoader]
@@ -38,15 +52,6 @@ namespace osu.Game.Screens.Ranking.Expanded
         {
             AutoSizeAxes = Axes.Both;
 
-            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-            string wholePart = starRatingParts[0];
-            string fractionPart = starRatingParts[1];
-            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
-
-            ColourInfo backgroundColour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
-
             InternalChildren = new Drawable[]
             {
                 new CircularContainer
@@ -55,10 +60,9 @@ namespace osu.Game.Screens.Ranking.Expanded
                     Masking = true,
                     Children = new Drawable[]
                     {
-                        new Box
+                        background = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = backgroundColour
                         },
                     }
                 },
@@ -78,32 +82,51 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        textFlow = 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;
-                            });
-                        })
+                        }
                     }
                 }
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Current.BindValueChanged(difficulty => updateDisplay(difficulty.NewValue), true);
+        }
+
+        private void updateDisplay(StarDifficulty difficulty)
+        {
+            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            string wholePart = starRatingParts[0];
+            string fractionPart = starRatingParts[1];
+            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+
+            background.Colour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
+                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+
+            textFlow.Clear();
+
+            textFlow.AddText($"{wholePart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 14);
+                s.UseFullGlyphHeight = false;
+            });
+
+            textFlow.AddText($"{separator}{fractionPart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 7);
+                s.UseFullGlyphHeight = false;
+            });
+        }
     }
 }

From ca772b60b183e33d0c42896f5340088c5f3206b8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:21:29 +0300
Subject: [PATCH 09874/10326] Use regular test steps rather than one-time set
 up and scheduling

---
 .../Visual/Ranking/TestSceneStarRatingDisplay.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index a043f506c1..2ff664a0d9 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -12,12 +12,12 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneStarRatingDisplay : OsuTestScene
     {
-        [SetUp]
-        public void SetUp() => Schedule(() =>
+        [Test]
+        public void TestDisplay()
         {
-            StarRatingDisplay changingStarRating;
+            StarRatingDisplay changingStarRating = null;
 
-            Child = new FillFlowContainer
+            AddStep("load displays", () => Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -32,12 +32,12 @@ namespace osu.Game.Tests.Visual.Ranking
                     new StarRatingDisplay(new StarDifficulty(10.11, 0)),
                     changingStarRating = new StarRatingDisplay(),
                 }
-            };
+            });
 
-            Scheduler.AddDelayed(() =>
+            AddRepeatStep("change bottom rating", () =>
             {
                 changingStarRating.Current.Value = new StarDifficulty(RNG.NextDouble(0, 10), RNG.Next());
-            }, 500, true);
-        });
+            }, 10);
+        }
     }
 }

From 1c49590ba2e37ca79e03f7de0599e20f8be3a2f3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 21:13:18 +0300
Subject: [PATCH 09875/10326] Apply further refactoring to star rating display
 UX-wise

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 106 +++++++++++++-----
 1 file changed, 76 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index a1f48fa811..77c43ad863 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -13,7 +13,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -22,27 +22,50 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// <summary>
     /// A pill that displays the star rating of a <see cref="BeatmapInfo"/>.
     /// </summary>
-    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
+    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty?>
     {
         private Box background;
-        private OsuTextFlowContainer textFlow;
+        private OsuSpriteText wholePart;
+        private OsuSpriteText fractionPart;
+
+        private double displayedStarRating;
+
+        protected double DisplayedStarRating
+        {
+            get => displayedStarRating;
+            set
+            {
+                displayedStarRating = value;
+
+                var starRatingParts = value.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+                wholePart.Text = starRatingParts[0];
+                fractionPart.Text = starRatingParts[1];
+            }
+        }
 
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private readonly BindableWithCurrent<StarDifficulty> current = new BindableWithCurrent<StarDifficulty>();
+        private readonly BindableWithCurrent<StarDifficulty?> current = new BindableWithCurrent<StarDifficulty?>();
 
-        public Bindable<StarDifficulty> Current
+        public Bindable<StarDifficulty?> Current
         {
             get => current.Current;
             set => current.Current = value;
         }
 
+        /// <summary>
+        /// Creates a new <see cref="StarRatingDisplay"/> without any <see cref="StarDifficulty"/> set, displaying a placeholder until <see cref="Current"/> is changed.
+        /// </summary>
+        public StarRatingDisplay()
+        {
+        }
+
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
         /// </summary>
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
-        public StarRatingDisplay(StarDifficulty starDifficulty = default)
+        public StarRatingDisplay(StarDifficulty starDifficulty)
         {
             Current.Value = starDifficulty;
         }
@@ -82,13 +105,40 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        new FillFlowContainer
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
-                            TextAnchor = Anchor.BottomLeft,
+                            Children = new[]
+                            {
+                                wholePart = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Font = OsuFont.Numeric.With(size: 14, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Text = NumberFormatInfo.CurrentInfo.NumberDecimalSeparator,
+                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                },
+                                fractionPart = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                }
+                            }
                         }
                     }
                 }
@@ -98,35 +148,31 @@ namespace osu.Game.Screens.Ranking.Expanded
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Current.BindValueChanged(difficulty => updateDisplay(difficulty.NewValue), true);
+
+            Current.BindValueChanged(_ => updateDisplay(), true);
+            FinishTransforms(true);
         }
 
-        private void updateDisplay(StarDifficulty difficulty)
+        private void updateDisplay()
         {
-            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-            string wholePart = starRatingParts[0];
-            string fractionPart = starRatingParts[1];
-            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+            const double duration = 400;
+            const Easing easing = Easing.OutQuint;
 
-            background.Colour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+            ColourInfo backgroundColour;
 
-            textFlow.Clear();
-
-            textFlow.AddText($"{wholePart}", s =>
+            if (Current.Value == null)
+                backgroundColour = Color4.SlateGray.Opacity(0.3f);
+            else
             {
-                s.Colour = Color4.Black;
-                s.Font = s.Font.With(size: 14);
-                s.UseFullGlyphHeight = false;
-            });
+                var rating = Current.Value.Value.DifficultyRating;
 
-            textFlow.AddText($"{separator}{fractionPart}", s =>
-            {
-                s.Colour = Color4.Black;
-                s.Font = s.Font.With(size: 7);
-                s.UseFullGlyphHeight = false;
-            });
+                backgroundColour = rating == DifficultyRating.ExpertPlus
+                    ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                    : (ColourInfo)colours.ForDifficultyRating(rating);
+            }
+
+            background.FadeColour(backgroundColour, duration, easing);
+            this.TransformTo(nameof(DisplayedStarRating), Current.Value?.Stars ?? 0.0f, duration, easing);
         }
     }
 }

From 97e72849af46241de4acbe4e955c5e6a72db9434 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 15:19:27 +0900
Subject: [PATCH 09876/10326] Fix regressed `HitErrorDisplay` behaviour (and
 localise binding to meter implementations)

---
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs | 39 +++++++------------
 osu.Game/Screens/Play/HUD/HitErrorDisplay.cs  | 24 ------------
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    |  2 +-
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs |  2 +-
 .../Play/HUD/HitErrorMeters/HitErrorMeter.cs  | 29 +++++++++++++-
 5 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 1021ac3760..6cefd01aab 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -2,15 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Game.Rulesets.Judgements;
-using osu.Framework.Utils;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Catch.Scoring;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Scoring;
-using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Scoring;
@@ -20,14 +21,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneHitErrorMeter : OsuTestScene
     {
-        private BarHitErrorMeter barMeter;
-        private BarHitErrorMeter barMeter2;
-        private BarHitErrorMeter barMeter3;
-        private ColourHitErrorMeter colourMeter;
-        private ColourHitErrorMeter colourMeter2;
-        private ColourHitErrorMeter colourMeter3;
         private HitWindows hitWindows;
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         public TestSceneHitErrorMeter()
         {
             recreateDisplay(new OsuHitWindows(), 5);
@@ -105,40 +103,40 @@ namespace osu.Game.Tests.Visual.Gameplay
                 }
             });
 
-            Add(barMeter = new BarHitErrorMeter(hitWindows, true)
+            Add(new BarHitErrorMeter(hitWindows, true)
             {
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreRight,
             });
 
-            Add(barMeter2 = new BarHitErrorMeter(hitWindows, false)
+            Add(new BarHitErrorMeter(hitWindows, false)
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
             });
 
-            Add(barMeter3 = new BarHitErrorMeter(hitWindows, true)
+            Add(new BarHitErrorMeter(hitWindows, true)
             {
                 Anchor = Anchor.BottomCentre,
                 Origin = Anchor.CentreLeft,
                 Rotation = 270,
             });
 
-            Add(colourMeter = new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter(hitWindows)
             {
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreRight,
                 Margin = new MarginPadding { Right = 50 }
             });
 
-            Add(colourMeter2 = new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter(hitWindows)
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
                 Margin = new MarginPadding { Left = 50 }
             });
 
-            Add(colourMeter3 = new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter(hitWindows)
             {
                 Anchor = Anchor.BottomCentre,
                 Origin = Anchor.CentreLeft,
@@ -149,18 +147,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void newJudgement(double offset = 0)
         {
-            var judgement = new JudgementResult(new HitObject(), new Judgement())
+            scoreProcessor.ApplyResult(new JudgementResult(new HitCircle { HitWindows = hitWindows }, new Judgement())
             {
                 TimeOffset = offset == 0 ? RNG.Next(-150, 150) : offset,
                 Type = HitResult.Perfect,
-            };
-
-            barMeter.OnNewJudgement(judgement);
-            barMeter2.OnNewJudgement(judgement);
-            barMeter3.OnNewJudgement(judgement);
-            colourMeter.OnNewJudgement(judgement);
-            colourMeter2.OnNewJudgement(judgement);
-            colourMeter3.OnNewJudgement(judgement);
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
index 998a9fb7e7..a24d9c10cb 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
@@ -7,7 +7,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 
@@ -22,17 +21,11 @@ namespace osu.Game.Screens.Play.HUD
 
         private readonly HitWindows hitWindows;
 
-        [Resolved]
-        private ScoreProcessor processor { get; set; }
-
         public HitErrorDisplay(HitWindows hitWindows)
         {
             this.hitWindows = hitWindows;
 
             RelativeSizeAxes = Axes.Both;
-
-            if (processor != null)
-                processor.NewJudgement += onNewJudgement;
         }
 
         [BackgroundDependencyLoader]
@@ -47,15 +40,6 @@ namespace osu.Game.Screens.Play.HUD
             type.BindValueChanged(typeChanged, true);
         }
 
-        private void onNewJudgement(JudgementResult result)
-        {
-            if (result.HitObject.HitWindows.WindowFor(HitResult.Miss) == 0)
-                return;
-
-            foreach (var c in Children)
-                c.OnNewJudgement(result);
-        }
-
         private void typeChanged(ValueChangedEvent<ScoreMeterType> type)
         {
             Children.ForEach(c => c.FadeOut(fade_duration, Easing.OutQuint));
@@ -139,13 +123,5 @@ namespace osu.Game.Screens.Play.HUD
             Add(display);
             display.FadeInFromZero(fade_duration, Easing.OutQuint);
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (processor != null)
-                processor.NewJudgement -= onNewJudgement;
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 3b24c8cc9e..c5a21ade03 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -214,7 +214,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         private const int max_concurrent_judgements = 50;
 
-        public override void OnNewJudgement(JudgementResult judgement)
+        protected override void OnNewJudgement(JudgementResult judgement)
         {
             if (!judgement.IsHit)
                 return;
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 657235bfd4..465439cf19 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             InternalChild = judgementsFlow = new JudgementFlow();
         }
 
-        public override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
+        protected override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
 
         private class JudgementFlow : FillFlowContainer<HitErrorCircle>
         {
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index b3edfdedec..8b53a9676d 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
@@ -14,6 +14,9 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
     {
         protected readonly HitWindows HitWindows;
 
+        [Resolved]
+        private ScoreProcessor processor { get; set; }
+
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -22,7 +25,23 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             HitWindows = hitWindows;
         }
 
-        public abstract void OnNewJudgement(JudgementResult judgement);
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (processor != null)
+                processor.NewJudgement += onNewJudgement;
+        }
+
+        private void onNewJudgement(JudgementResult result)
+        {
+            if (result.HitObject.HitWindows?.WindowFor(HitResult.Miss) == 0)
+                return;
+
+            OnNewJudgement(result);
+        }
+
+        protected abstract void OnNewJudgement(JudgementResult judgement);
 
         protected Color4 GetColourForHitResult(HitResult result)
         {
@@ -47,5 +66,13 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                     return colours.BlueLight;
             }
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (processor != null)
+                processor.NewJudgement -= onNewJudgement;
+        }
     }
 }

From 4b972249320ad7832619a999679e1a6558a9e7bf Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 May 2021 09:53:52 +0300
Subject: [PATCH 09877/10326] Implement NewsSideBar component

---
 .../Visual/Online/TestSceneNewsSideBar.cs     | 114 ++++++++++++++++++
 .../Online/API/Requests/GetNewsResponse.cs    |   3 +
 .../API/Requests/Responses/APINewsSidebar.cs  |  20 +++
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 114 ++++++++++++++++++
 4 files changed, 251 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
 create mode 100644 osu.Game/Online/API/Requests/Responses/APINewsSidebar.cs
 create mode 100644 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
new file mode 100644
index 0000000000..931341f837
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.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 System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Overlays.News.Sidebar;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsSideBar : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private NewsSideBar sidebar;
+
+        [Test]
+        public void TestCreateEmpty()
+        {
+            createSidebar(null);
+        }
+
+        [Test]
+        public void TestCreateWithData()
+        {
+            createSidebar(metadata);
+        }
+
+        [Test]
+        public void TestDataChange()
+        {
+            createSidebar(null);
+            AddStep("Add data", () =>
+            {
+                if (sidebar != null)
+                    sidebar.Metadata.Value = metadata;
+            });
+        }
+
+        private void createSidebar(APINewsSidebar metadata) => AddStep("Create", () => Child = sidebar = new NewsSideBar
+        {
+            Metadata = { Value = metadata }
+        });
+
+        private static APINewsSidebar metadata = new APINewsSidebar
+        {
+            CurrentYear = 2021,
+            Years = new[]
+            {
+                2021,
+                2020,
+                2019,
+                2018,
+                2017,
+                2016,
+                2015,
+                2014,
+                2013
+            },
+            NewsPosts = new List<APINewsPost>
+            {
+                new APINewsPost
+                {
+                    Title = "(Mar) Short title",
+                    PublishedAt = new DateTime(2021, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Mar) Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(2021, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Mar) Medium title, nothing to see here",
+                    PublishedAt = new DateTime(2021, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Short title",
+                    PublishedAt = new DateTime(2021, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(2021, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Medium title, nothing to see here",
+                    PublishedAt = new DateTime(2021, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Short title",
+                    PublishedAt = new DateTime(2021, 1, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(2021, 1, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Medium title, nothing to see here",
+                    PublishedAt = new DateTime(2021, 1, 1)
+                }
+            }
+        };
+    }
+}
diff --git a/osu.Game/Online/API/Requests/GetNewsResponse.cs b/osu.Game/Online/API/Requests/GetNewsResponse.cs
index 835289a51d..98f76d105c 100644
--- a/osu.Game/Online/API/Requests/GetNewsResponse.cs
+++ b/osu.Game/Online/API/Requests/GetNewsResponse.cs
@@ -11,5 +11,8 @@ namespace osu.Game.Online.API.Requests
     {
         [JsonProperty("news_posts")]
         public IEnumerable<APINewsPost> NewsPosts;
+
+        [JsonProperty("news_sidebar")]
+        public APINewsSidebar SidebarMetadata;
     }
 }
diff --git a/osu.Game/Online/API/Requests/Responses/APINewsSidebar.cs b/osu.Game/Online/API/Requests/Responses/APINewsSidebar.cs
new file mode 100644
index 0000000000..b8d6469a1d
--- /dev/null
+++ b/osu.Game/Online/API/Requests/Responses/APINewsSidebar.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 Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace osu.Game.Online.API.Requests.Responses
+{
+    public class APINewsSidebar
+    {
+        [JsonProperty("current_year")]
+        public int CurrentYear { get; set; }
+
+        [JsonProperty("news_posts")]
+        public IEnumerable<APINewsPost> NewsPosts { get; set; }
+
+        [JsonProperty("years")]
+        public int[] Years { get; set; }
+    }
+}
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
new file mode 100644
index 0000000000..34c995cab6
--- /dev/null
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.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.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Framework.Graphics.Shapes;
+using osuTK;
+using System.Collections.Generic;
+using System;
+
+namespace osu.Game.Overlays.News.Sidebar
+{
+    public class NewsSideBar : CompositeDrawable
+    {
+        public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
+
+        private YearsPanel yearsPanel;
+        private FillFlowContainer<MonthPanel> monthsFlow;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            RelativeSizeAxes = Axes.Y;
+            Width = 250;
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background4
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding
+                    {
+                        Top = 20,
+                        Left = 50,
+                        Right = 30
+                    },
+                    Child = new FillFlowContainer
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Direction = FillDirection.Vertical,
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(0, 20),
+                        Children = new Drawable[]
+                        {
+                            yearsPanel = new YearsPanel(),
+                            monthsFlow = new FillFlowContainer<MonthPanel>
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Vertical,
+                                Spacing = new Vector2(0, 10)
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Metadata.BindValueChanged(metadata =>
+            {
+                monthsFlow.Clear();
+
+                if (metadata.NewValue == null)
+                {
+                    yearsPanel.Hide();
+                    return;
+                }
+
+                yearsPanel.Years = metadata.NewValue.Years;
+                yearsPanel.Show();
+
+                if (metadata.NewValue != null)
+                {
+                    var dict = new Dictionary<int, List<APINewsPost>>();
+
+                    foreach (var p in metadata.NewValue.NewsPosts)
+                    {
+                        var month = p.PublishedAt.Month;
+
+                        if (dict.ContainsKey(month))
+                            dict[month].Add(p);
+                        else
+                        {
+                            dict.Add(month, new List<APINewsPost>(new[] { p }));
+                        }
+                    }
+
+                    bool isFirst = true;
+
+                    foreach (var keyValuePair in dict)
+                    {
+                        monthsFlow.Add(new MonthPanel(new DateTime(metadata.NewValue.CurrentYear, keyValuePair.Key, 1), keyValuePair.Value.ToArray())
+                        {
+                            IsOpen = { Value = isFirst }
+                        });
+
+                        isFirst = false;
+                    }
+                }
+            }, true);
+        }
+    }
+}

From 0d243be457f514eab35edd8a3499f51fd0f573c7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 May 2021 10:07:43 +0300
Subject: [PATCH 09878/10326] CI fixes

---
 osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs    | 2 +-
 osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs | 2 +-
 osu.Game/Overlays/News/Sidebar/MonthPanel.cs            | 3 ---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs            | 3 ---
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index 931341f837..96161c28ed 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual.Online
             Metadata = { Value = metadata }
         });
 
-        private static APINewsSidebar metadata = new APINewsSidebar
+        private static readonly APINewsSidebar metadata = new APINewsSidebar
         {
             CurrentYear = 2021,
             Years = new[]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
index 75975f04f8..446cd06eea 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.Online
 
         public TestSceneNewsYearsPanel()
         {
-            Add(panel = new YearsPanel()
+            Add(panel = new YearsPanel
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre
diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
index 1dd1c561ab..8b405eae10 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
@@ -125,13 +125,10 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             protected override IEnumerable<Drawable> EffectTargets => new[] { text };
 
-            private readonly APINewsPost post;
             private readonly TextFlowContainer text;
 
             public PostButton(APINewsPost post)
             {
-                this.post = post;
-
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
 
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index d71c7ba48e..046e1804bd 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -79,13 +79,10 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             protected override IEnumerable<Drawable> EffectTargets => new[] { text };
 
-            private readonly int year;
             private readonly OsuSpriteText text;
 
             public YearButton(int year)
             {
-                this.year = year;
-
                 Size = new Vector2(33.75f, 15);
                 Child = text = new OsuSpriteText
                 {

From afc9a1bf235ef9c3026292254d788ce98072158d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 10 May 2021 10:16:52 +0300
Subject: [PATCH 09879/10326] Remove rolling support and apply few adjustments

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 81 +++++++------------
 1 file changed, 28 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 77c43ad863..422833555f 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -13,7 +13,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.Containers;
 using osuTK;
 using osuTK.Graphics;
 
@@ -25,23 +25,7 @@ namespace osu.Game.Screens.Ranking.Expanded
     public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty?>
     {
         private Box background;
-        private OsuSpriteText wholePart;
-        private OsuSpriteText fractionPart;
-
-        private double displayedStarRating;
-
-        protected double DisplayedStarRating
-        {
-            get => displayedStarRating;
-            set
-            {
-                displayedStarRating = value;
-
-                var starRatingParts = value.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-                wholePart.Text = starRatingParts[0];
-                fractionPart.Text = starRatingParts[1];
-            }
-        }
+        private OsuTextFlowContainer textFlow;
 
         [Resolved]
         private OsuColour colours { get; set; }
@@ -105,40 +89,13 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        new FillFlowContainer
+                        textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
-                            Children = new[]
-                            {
-                                wholePart = new OsuSpriteText
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    Colour = Color4.Black,
-                                    Font = OsuFont.Numeric.With(size: 14, weight: FontWeight.Black),
-                                    UseFullGlyphHeight = false,
-                                },
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    Colour = Color4.Black,
-                                    Text = NumberFormatInfo.CurrentInfo.NumberDecimalSeparator,
-                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
-                                    UseFullGlyphHeight = false,
-                                },
-                                fractionPart = new OsuSpriteText
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    Colour = Color4.Black,
-                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
-                                    UseFullGlyphHeight = false,
-                                }
-                            }
+                            TextAnchor = Anchor.BottomLeft,
                         }
                     }
                 }
@@ -158,21 +115,39 @@ namespace osu.Game.Screens.Ranking.Expanded
             const double duration = 400;
             const Easing easing = Easing.OutQuint;
 
-            ColourInfo backgroundColour;
+            double stars = Current.Value?.Stars ?? 0.00f;
+
+            var starRatingParts = stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            string wholePart = starRatingParts[0];
+            string fractionPart = starRatingParts[1];
+            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
 
             if (Current.Value == null)
-                backgroundColour = Color4.SlateGray.Opacity(0.3f);
+                background.FadeColour(Color4.SlateGray.Opacity(0.3f));
             else
             {
                 var rating = Current.Value.Value.DifficultyRating;
 
-                backgroundColour = rating == DifficultyRating.ExpertPlus
+                background.FadeColour(rating == DifficultyRating.ExpertPlus
                     ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                    : (ColourInfo)colours.ForDifficultyRating(rating);
+                    : (ColourInfo)colours.ForDifficultyRating(rating), duration, easing);
             }
 
-            background.FadeColour(backgroundColour, duration, easing);
-            this.TransformTo(nameof(DisplayedStarRating), Current.Value?.Stars ?? 0.0f, duration, easing);
+            textFlow.Clear();
+
+            textFlow.AddText($"{wholePart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 14);
+                s.UseFullGlyphHeight = false;
+            });
+
+            textFlow.AddText($"{separator}{fractionPart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 7);
+                s.UseFullGlyphHeight = false;
+            });
         }
     }
 }

From fa872858b592278b7672c16fbd840825d8ac7a24 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 10 May 2021 16:40:06 +0900
Subject: [PATCH 09880/10326] Remove unnecessary check

---
 osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index 8b53a9676d..37e9ea43c5 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
@@ -29,8 +29,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             base.LoadComplete();
 
-            if (processor != null)
-                processor.NewJudgement += onNewJudgement;
+            processor.NewJudgement += onNewJudgement;
         }
 
         private void onNewJudgement(JudgementResult result)

From 1b701adfef5a20c1cd008449fe4a4eed503f2be6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 18:15:39 +0900
Subject: [PATCH 09881/10326] Add score/health processors to fill in default
 values

---
 osu.Game/Skinning/Editor/SkinComponentToolbox.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 1953fdc8fe..a000204062 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -14,6 +14,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -25,6 +26,16 @@ namespace osu.Game.Skinning.Editor
 
         private const float component_display_scale = 0.8f;
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor
+        {
+            Combo = { Value = 727 },
+            TotalScore = { Value = 1337377 }
+        };
+
+        [Cached(typeof(HealthProcessor))]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
+
         public SkinComponentToolbox(float height)
             : base("Components", height)
         {

From bca5bee72eb22df8f9885c8962efe2a9125417fa Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 10 May 2021 19:28:32 +0700
Subject: [PATCH 09882/10326] remove duplicate CreateSpriteText in
 OsuMarkdownTextFlowContainer

---
 .../Containers/Markdown/OsuMarkdownTextFlowContainer.cs     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
index 1550b8401d..c3527fa99a 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
@@ -16,11 +15,6 @@ namespace osu.Game.Graphics.Containers.Markdown
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        protected override SpriteText CreateSpriteText() => new OsuSpriteText
-        {
-            Font = OsuFont.GetFont(size: 14),
-        };
-
         protected override void AddLinkText(string text, LinkInline linkInline)
             => AddDrawable(new OsuMarkdownLinkText(text, linkInline));
 

From 220eef035181e3d08b0fde4430b966b3f69c3cb7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 May 2021 17:00:18 +0300
Subject: [PATCH 09883/10326] Remove overcomplicated date logic in MonthPanel

---
 .../Visual/Online/TestSceneNewsMonthPanel.cs           | 10 ++++++----
 osu.Game/Overlays/News/Sidebar/MonthPanel.cs           |  6 +++---
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs          |  3 +--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
index 75e02b66e1..ee7fb8b407 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.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.Allocation;
 using osu.Framework.Graphics;
@@ -33,7 +34,7 @@ namespace osu.Game.Tests.Visual.Online
                         RelativeSizeAxes = Axes.Both,
                         Colour = colourProvider.Background2,
                     },
-                    new MonthPanel(DateTime.Now, posts),
+                    new MonthPanel(posts),
                 }
             });
         }
@@ -53,7 +54,7 @@ namespace osu.Game.Tests.Visual.Online
                         RelativeSizeAxes = Axes.Both,
                         Colour = colourProvider.Background2,
                     },
-                    new MonthPanel(DateTime.Now, posts)
+                    new MonthPanel(posts)
                     {
                         IsOpen = { Value = true }
                     },
@@ -61,11 +62,12 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
-        private static APINewsPost[] posts => new[]
+        private static List<APINewsPost> posts => new List<APINewsPost>
         {
             new APINewsPost
             {
-                Title = "Short title"
+                Title = "Short title",
+                PublishedAt = DateTimeOffset.Now
             },
             new APINewsPost
             {
diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
index 8b405eae10..5f2acd63d1 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private readonly FillFlowContainer postsFlow;
 
-        public MonthPanel(DateTime date, APINewsPost[] posts)
+        public MonthPanel(List<APINewsPost> posts)
         {
             Width = 160;
             AutoSizeDuration = 250;
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
-                    new DropdownButton(date)
+                    new DropdownButton(posts[0].PublishedAt)
                     {
                         IsOpen = { BindTarget = IsOpen }
                     },
@@ -87,7 +87,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
             private readonly SpriteIcon icon;
 
-            public DropdownButton(DateTime date)
+            public DropdownButton(DateTimeOffset date)
             {
                 Size = new Vector2(160, 15);
                 Action = IsOpen.Toggle;
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 34c995cab6..9a2fdf2d97 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -9,7 +9,6 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Graphics.Shapes;
 using osuTK;
 using System.Collections.Generic;
-using System;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -100,7 +99,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                     foreach (var keyValuePair in dict)
                     {
-                        monthsFlow.Add(new MonthPanel(new DateTime(metadata.NewValue.CurrentYear, keyValuePair.Key, 1), keyValuePair.Value.ToArray())
+                        monthsFlow.Add(new MonthPanel(keyValuePair.Value)
                         {
                             IsOpen = { Value = isFirst }
                         });

From f1aa47f6df50456892f2c7da4d4281f5e288714f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 23:15:38 +0900
Subject: [PATCH 09884/10326] 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 80b1c5b52f..8c24df5c2e 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.507.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.510.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 29189781a7..3eb5050e1a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.507.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.510.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index c4eb7aefba..f00e20a66e 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.Framework.iOS" Version="2021.507.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.510.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.507.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.510.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 7c8dd91674481b209d383cda463b423534f7722e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 09:29:15 +0900
Subject: [PATCH 09885/10326] Rename test to better match tested class

---
 ...apDifficultyManagerTest.cs => BeatmapDifficultyCacheTest.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Beatmaps/{BeatmapDifficultyManagerTest.cs => BeatmapDifficultyCacheTest.cs} (98%)

diff --git a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs b/osu.Game.Tests/Beatmaps/BeatmapDifficultyCacheTest.cs
similarity index 98%
rename from osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
rename to osu.Game.Tests/Beatmaps/BeatmapDifficultyCacheTest.cs
index 70503bec7a..d407c0663f 100644
--- a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
+++ b/osu.Game.Tests/Beatmaps/BeatmapDifficultyCacheTest.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Osu.Mods;
 namespace osu.Game.Tests.Beatmaps
 {
     [TestFixture]
-    public class BeatmapDifficultyManagerTest
+    public class BeatmapDifficultyCacheTest
     {
         [Test]
         public void TestKeyEqualsWithDifferentModInstances()

From 32f7691349dd449593a8664ac191dcb84d56a8b2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 11:24:35 +0900
Subject: [PATCH 09886/10326] Fix token failure preventing
 base.LoadAsyncComplete()

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index b64d835c58..79c1d1a274 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -33,9 +33,8 @@ namespace osu.Game.Screens.Play
 
         protected override void LoadAsyncComplete()
         {
-            if (!handleTokenRetrieval()) return;
-
             base.LoadAsyncComplete();
+            handleTokenRetrieval();
         }
 
         private bool handleTokenRetrieval()

From 6db9e26d48a490b6c3bf9912877bd8f22220b492 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 11:24:55 +0900
Subject: [PATCH 09887/10326] Fix score submission failures with autoplay

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 79c1d1a274..ece1a589cd 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -9,6 +10,7 @@ using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Play
@@ -42,6 +44,12 @@ namespace osu.Game.Screens.Play
             // Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
             var tcs = new TaskCompletionSource<bool>();
 
+            if (DrawableRuleset.HasReplayLoaded.Value || Mods.Value.Any(m => m is ModAutoplay))
+            {
+                handleTokenFailure(new InvalidOperationException("Replay loaded."));
+                return false;
+            }
+
             if (!api.IsLoggedIn)
             {
                 handleTokenFailure(new InvalidOperationException("API is not online."));

From 8c9390dc75fd819b65f164c141bbf02420efec29 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 11:33:21 +0900
Subject: [PATCH 09888/10326] Remove replay condition

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index ece1a589cd..68c6282fe0 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Play
             // Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
             var tcs = new TaskCompletionSource<bool>();
 
-            if (DrawableRuleset.HasReplayLoaded.Value || Mods.Value.Any(m => m is ModAutoplay))
+            if (Mods.Value.Any(m => m is ModAutoplay))
             {
                 handleTokenFailure(new InvalidOperationException("Replay loaded."));
                 return false;

From 0f00ee8640e332453bd0131824360b594fe685a0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 11:35:07 +0900
Subject: [PATCH 09889/10326] Change failure text

Although this is not visible anywhere.
---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 68c6282fe0..d5ad87c70c 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Play
 
             if (Mods.Value.Any(m => m is ModAutoplay))
             {
-                handleTokenFailure(new InvalidOperationException("Replay loaded."));
+                handleTokenFailure(new InvalidOperationException("Autoplay loaded."));
                 return false;
             }
 

From 4bee8c23f0f8b6d502d31d877cda12261790d881 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 10 May 2021 21:40:29 -0700
Subject: [PATCH 09890/10326] Fix idle tracker not accounting global actions

---
 osu.Game/Input/IdleTracker.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/IdleTracker.cs b/osu.Game/Input/IdleTracker.cs
index 2d6a21d1cf..f3d531cf6c 100644
--- a/osu.Game/Input/IdleTracker.cs
+++ b/osu.Game/Input/IdleTracker.cs
@@ -6,13 +6,14 @@ using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Input
 {
     /// <summary>
     /// Track whether the end-user is in an idle state, based on their last interaction with the game.
     /// </summary>
-    public class IdleTracker : Component, IKeyBindingHandler<PlatformAction>, IHandleGlobalKeyboardInput
+    public class IdleTracker : Component, IKeyBindingHandler<PlatformAction>, IKeyBindingHandler<GlobalAction>, IHandleGlobalKeyboardInput
     {
         private readonly double timeToIdle;
 
@@ -58,6 +59,10 @@ namespace osu.Game.Input
 
         public void OnReleased(PlatformAction action) => updateLastInteractionTime();
 
+        public bool OnPressed(GlobalAction action) => updateLastInteractionTime();
+
+        public void OnReleased(GlobalAction action) => updateLastInteractionTime();
+
         protected override bool Handle(UIEvent e)
         {
             switch (e)

From 713c169332dacbd7b63b0948ade3290c614004dd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 16:08:25 +0900
Subject: [PATCH 09891/10326] Fix mania crashing on playing samples after skin
 change

---
 .../Drawables/DrawableManiaHitObject.cs       |  6 +++++
 osu.Game.Rulesets.Mania/UI/Column.cs          | 27 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 1550faee50..003646d654 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -6,6 +6,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Mania.UI;
@@ -24,6 +25,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved(canBeNull: true)]
         private ManiaPlayfield playfield { get; set; }
 
+        /// <summary>
+        /// Gets the samples that are played by this object during gameplay.
+        /// </summary>
+        public ISampleInfo[] GetGameplaySamples() => Samples.Samples;
+
         protected override float SamplePlaybackPosition
         {
             get
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index d2a9b69b60..fcbbd8a01c 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -27,6 +27,15 @@ namespace osu.Game.Rulesets.Mania.UI
         public const float COLUMN_WIDTH = 80;
         public const float SPECIAL_COLUMN_WIDTH = 70;
 
+        /// <summary>
+        /// For hitsounds played by this <see cref="Column"/> (i.e. not as a result of hitting a hitobject),
+        /// a certain number of samples are allowed to be played concurrently so that it feels better when spam-pressing the key.
+        /// </summary>
+        /// <remarks>
+        ///
+        /// </remarks>
+        private const int max_concurrent_hitsounds = OsuGameBase.SAMPLE_CONCURRENCY;
+
         /// <summary>
         /// The index of this column as part of the whole playfield.
         /// </summary>
@@ -38,6 +47,7 @@ namespace osu.Game.Rulesets.Mania.UI
         internal readonly Container TopLevelContainer;
         private readonly DrawablePool<PoolableHitExplosion> hitExplosionPool;
         private readonly OrderedHitPolicy hitPolicy;
+        private readonly SkinnableSound[] hitSounds;
 
         public Container UnderlayElements => HitObjectArea.UnderlayElements;
 
@@ -64,6 +74,11 @@ namespace osu.Game.Rulesets.Mania.UI
                     RelativeSizeAxes = Axes.Both
                 },
                 background,
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    ChildrenEnumerable = hitSounds = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
+                },
                 TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
             };
 
@@ -120,6 +135,8 @@ namespace osu.Game.Rulesets.Mania.UI
             HitObjectArea.Explosions.Add(hitExplosionPool.Get(e => e.Apply(result)));
         }
 
+        private int nextHitSound;
+
         public bool OnPressed(ManiaAction action)
         {
             if (action != Action.Value)
@@ -131,7 +148,15 @@ namespace osu.Game.Rulesets.Mania.UI
                 HitObjectContainer.Objects.FirstOrDefault(h => h.HitObject.StartTime > Time.Current) ??
                 HitObjectContainer.Objects.LastOrDefault();
 
-            nextObject?.PlaySamples();
+            if (nextObject is DrawableManiaHitObject maniaObject)
+            {
+                var hitSound = hitSounds[nextHitSound];
+
+                hitSound.Samples = maniaObject.GetGameplaySamples();
+                hitSound.Play();
+
+                nextHitSound = (nextHitSound + 1) % max_concurrent_hitsounds;
+            }
 
             return true;
         }

From b9ab9342faeee26c54903beb326109698c8525b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 15:16:16 +0900
Subject: [PATCH 09892/10326] Setup basics to allow extracting serializable
 content from skinnable `Drawable`s

---
 osu.Game/Extensions/DrawableExtensions.cs     |  3 ++
 osu.Game/Screens/Play/HUD/ISkinnableInfo.cs   | 32 ++++++++++++++
 .../HUD/SkinnableElementTargetContainer.cs    | 11 +++++
 .../Screens/Play/HUD/StoredSkinnableInfo.cs   | 43 +++++++++++++++++++
 osu.Game/Screens/Play/HUDOverlay.cs           | 38 +++++++---------
 .../Skinning/Editor/SkinBlueprintContainer.cs | 13 +++++-
 osu.Game/Skinning/ISkin.cs                    |  2 +
 7 files changed, 119 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
 create mode 100644 osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
 create mode 100644 osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index a8de3f6407..3d2ffe0ea1 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Extensions
@@ -43,5 +44,7 @@ namespace osu.Game.Extensions
         /// <returns>The delta vector in Parent's coordinates.</returns>
         public static Vector2 ScreenSpaceDeltaToParentSpace(this Drawable drawable, Vector2 delta) =>
             drawable.Parent.ToLocalSpace(drawable.Parent.ToScreenSpace(Vector2.Zero) + delta);
+
+        public static StoredSkinnableInfo CreateSerialisedInformation(this Drawable component) => new StoredSkinnableInfo(component);
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs b/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
new file mode 100644
index 0000000000..0e571b5cb4
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ISkinnableInfo.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 System;
+using osu.Framework.Graphics;
+using osu.Game.IO.Serialization;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public interface ISkinnableInfo : IJsonSerializable
+    {
+        public Type Type { get; set; }
+
+        public Type Target { get; set; }
+
+        public Vector2 Position { get; set; }
+
+        public float Rotation { get; set; }
+
+        public Vector2 Scale { get; set; }
+
+        public Anchor Anchor { get; set; }
+    }
+
+    /// <summary>
+    /// A container which supports skinnable components being added to it.
+    /// </summary>
+    public interface ISkinnableTarget
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
new file mode 100644
index 0000000000..7ba32e2d46
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.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.
+
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class SkinnableElementTargetContainer : Container, ISkinnableTarget
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs b/osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs
new file mode 100644
index 0000000000..e4ec035e68
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/StoredSkinnableInfo.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.Graphics;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
+    /// </summary>
+    public class StoredSkinnableInfo : ISkinnableInfo
+    {
+        public StoredSkinnableInfo(Drawable component)
+        {
+            Type = component.GetType();
+
+            var target = component.Parent as ISkinnableTarget
+                         // todo: this is temporary until we serialise the default layouts out of SkinnableDrawables.
+                         ?? component.Parent?.Parent as ISkinnableTarget;
+
+            Target = target?.GetType();
+
+            Position = component.Position;
+            Rotation = component.Rotation;
+            Scale = component.Scale;
+            Anchor = component.Anchor;
+        }
+
+        public Type Type { get; set; }
+
+        public Type Target { get; set; }
+
+        public Vector2 Position { get; set; }
+
+        public float Rotation { get; set; }
+
+        public Vector2 Scale { get; set; }
+
+        public Anchor Anchor { get; set; }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 6ddaa338cc..13449e3a2b 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -91,16 +91,16 @@ namespace osu.Game.Screens.Play
                         {
                             new Drawable[]
                             {
-                                new Container
+                                new MainHUDElements
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        HealthDisplay = CreateHealthDisplay(),
-                                        AccuracyCounter = CreateAccuracyCounter(),
-                                        ScoreCounter = CreateScoreCounter(),
-                                        CreateComboCounter(),
-                                        CreateHitErrorDisplayOverlay(),
+                                        HealthDisplay = new SkinnableHealthDisplay(),
+                                        AccuracyCounter = new SkinnableAccuracyCounter(),
+                                        ScoreCounter = new SkinnableScoreCounter(),
+                                        new SkinnableComboCounter(),
+                                        new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
                                     }
                                 },
                             },
@@ -263,48 +263,38 @@ namespace osu.Game.Screens.Play
             Progress.BindDrawableRuleset(drawableRuleset);
         }
 
-        protected SkinnableAccuracyCounter CreateAccuracyCounter() => new SkinnableAccuracyCounter();
-
-        protected SkinnableScoreCounter CreateScoreCounter() => new SkinnableScoreCounter();
-
-        protected SkinnableComboCounter CreateComboCounter() => new SkinnableComboCounter();
-
-        protected SkinnableHealthDisplay CreateHealthDisplay() => new SkinnableHealthDisplay();
-
-        protected virtual FailingLayer CreateFailingLayer() => new FailingLayer
+        protected FailingLayer CreateFailingLayer() => new FailingLayer
         {
             ShowHealth = { BindTarget = ShowHealthbar }
         };
 
-        protected virtual KeyCounterDisplay CreateKeyCounter() => new KeyCounterDisplay
+        protected KeyCounterDisplay CreateKeyCounter() => new KeyCounterDisplay
         {
             Anchor = Anchor.BottomRight,
             Origin = Anchor.BottomRight,
         };
 
-        protected virtual SongProgress CreateProgress() => new SongProgress
+        protected SongProgress CreateProgress() => new SongProgress
         {
             Anchor = Anchor.BottomLeft,
             Origin = Anchor.BottomLeft,
             RelativeSizeAxes = Axes.X,
         };
 
-        protected virtual HoldForMenuButton CreateHoldForMenuButton() => new HoldForMenuButton
+        protected HoldForMenuButton CreateHoldForMenuButton() => new HoldForMenuButton
         {
             Anchor = Anchor.BottomRight,
             Origin = Anchor.BottomRight,
         };
 
-        protected virtual ModDisplay CreateModsContainer() => new ModDisplay
+        protected ModDisplay CreateModsContainer() => new ModDisplay
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
             AutoSizeAxes = Axes.Both,
         };
 
-        protected virtual HitErrorDisplay CreateHitErrorDisplayOverlay() => new HitErrorDisplay(drawableRuleset?.FirstAvailableHitWindows);
-
-        protected virtual PlayerSettingsOverlay CreatePlayerSettingsOverlay() => new PlayerSettingsOverlay();
+        protected PlayerSettingsOverlay CreatePlayerSettingsOverlay() => new PlayerSettingsOverlay();
 
         public bool OnPressed(GlobalAction action)
         {
@@ -347,5 +337,9 @@ namespace osu.Game.Screens.Play
                     break;
             }
         }
+
+        public class MainHUDElements : SkinnableElementTargetContainer
+        {
+        }
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index 35e93d9aff..a6f60afd90 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.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.IO;
 using System.Linq;
+using Newtonsoft.Json;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
+using osu.Game.Extensions;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -27,7 +30,15 @@ namespace osu.Game.Skinning.Editor
 
         private void checkForComponents()
         {
-            foreach (var c in target.ChildrenOfType<ISkinnableComponent>().ToArray()) AddBlueprintFor(c);
+            ISkinnableComponent[] skinnableComponents = target.ChildrenOfType<ISkinnableComponent>().ToArray();
+
+            // todo: the OfType() call can be removed with better IDrawable support.
+            string json = JsonConvert.SerializeObject(skinnableComponents.OfType<Drawable>().Select(d => d.CreateSerialisedInformation()), new JsonSerializerSettings { Formatting = Formatting.Indented });
+
+            File.WriteAllText("/Users/Dean/json-out.json", json);
+
+            foreach (var c in skinnableComponents)
+                AddBlueprintFor(c);
 
             // We'd hope to eventually be running this in a more sensible way, but this handles situations where new drawables become present (ie. during ongoing gameplay)
             // or when drawables in the target are loaded asynchronously and may not be immediately available when this BlueprintContainer is loaded.
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index 73f7cf6d39..9fa781fa5d 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -57,5 +57,7 @@ namespace osu.Game.Skinning
         /// <returns>A matching value boxed in an <see cref="IBindable{TValue}"/>, or null if unavailable.</returns>
         [CanBeNull]
         IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
+
+        // IEnumerable<ISkinnableInfo> ComponentInfo { get; }
     }
 }

From 67ea4a7e97bce85d0f5f861d021b7113809bc16b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 18:18:29 +0900
Subject: [PATCH 09893/10326] Read from skin config

---
 .../Play/HUD/SkinnableElementTargetContainer.cs | 17 +++++++++++++++--
 osu.Game/Skinning/ISkin.cs                      |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index 7ba32e2d46..8da7950c57 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
@@ -1,11 +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.Containers;
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableElementTargetContainer : Container, ISkinnableTarget
+    public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+
+            var loadable = skin.GetConfig<Type, IEnumerable<Drawable>>(this.GetType());
+
+            ClearInternal();
+            if (loadable != null)
+                LoadComponentsAsync(loadable.Value, AddRangeInternal);
+        }
     }
 }
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index 9fa781fa5d..5371893882 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.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 JetBrains.Annotations;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
@@ -57,7 +59,5 @@ namespace osu.Game.Skinning
         /// <returns>A matching value boxed in an <see cref="IBindable{TValue}"/>, or null if unavailable.</returns>
         [CanBeNull]
         IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
-
-        // IEnumerable<ISkinnableInfo> ComponentInfo { get; }
     }
 }

From 95a8f21ab26065f1bccc4d8cfa2ad83051da27a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 19:13:38 +0900
Subject: [PATCH 09894/10326] Add the concept of skinnable target containers
 and mark a basic one for HUD elements

---
 osu.Game/Extensions/DrawableExtensions.cs     | 11 +++++-
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    |  3 +-
 osu.Game/Screens/Play/HUD/ISkinnableInfo.cs   | 10 +----
 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs | 15 +++++++
 .../HUD/SkinnableElementTargetContainer.cs    | 14 ++++---
 ...toredSkinnableInfo.cs => SkinnableInfo.cs} | 32 +++++++++++----
 osu.Game/Screens/Play/HUDOverlay.cs           | 37 +++++++++++++-----
 osu.Game/Skinning/DefaultSkin.cs              | 39 ++++++++++++++++++-
 osu.Game/Skinning/ISkin.cs                    |  2 -
 osu.Game/Skinning/SkinnableTarget.cs          | 10 +++++
 osu.Game/Skinning/SkinnableTargetComponent.cs | 17 ++++++++
 11 files changed, 154 insertions(+), 36 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
 rename osu.Game/Screens/Play/HUD/{StoredSkinnableInfo.cs => SkinnableInfo.cs} (51%)
 create mode 100644 osu.Game/Skinning/SkinnableTarget.cs
 create mode 100644 osu.Game/Skinning/SkinnableTargetComponent.cs

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 3d2ffe0ea1..289b305c27 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -45,6 +45,15 @@ namespace osu.Game.Extensions
         public static Vector2 ScreenSpaceDeltaToParentSpace(this Drawable drawable, Vector2 delta) =>
             drawable.Parent.ToLocalSpace(drawable.Parent.ToScreenSpace(Vector2.Zero) + delta);
 
-        public static StoredSkinnableInfo CreateSerialisedInformation(this Drawable component) => new StoredSkinnableInfo(component);
+        public static SkinnableInfo CreateSerialisedInformation(this Drawable component) => new SkinnableInfo(component);
+
+        public static void ApplySerialisedInformation(this Drawable component, ISkinnableInfo info)
+        {
+            // todo: can probably make this better via deserialisation directly using a common interface.
+            component.Position = info.Position;
+            component.Rotation = info.Rotation;
+            component.Scale = info.Scale;
+            component.Anchor = info.Anchor;
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 2e84c9c97d..0e147f9238 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -13,13 +13,12 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
-    public class BarHitErrorMeter : HitErrorMeter, ISkinnableComponent
+    public class BarHitErrorMeter : HitErrorMeter
     {
         private readonly Anchor alignment;
 
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs b/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
index 0e571b5cb4..fc4e9680a8 100644
--- a/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Game.IO.Serialization;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -12,7 +13,7 @@ namespace osu.Game.Screens.Play.HUD
     {
         public Type Type { get; set; }
 
-        public Type Target { get; set; }
+        public SkinnableTarget? Target { get; set; }
 
         public Vector2 Position { get; set; }
 
@@ -22,11 +23,4 @@ namespace osu.Game.Screens.Play.HUD
 
         public Anchor Anchor { get; set; }
     }
-
-    /// <summary>
-    /// A container which supports skinnable components being added to it.
-    /// </summary>
-    public interface ISkinnableTarget
-    {
-    }
 }
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs b/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
new file mode 100644
index 0000000000..6cd269333a
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ISkinnableTarget.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.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// A container which supports skinnable components being added to it.
+    /// </summary>
+    public interface ISkinnableTarget
+    {
+        public SkinnableTarget Target { get; }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index 8da7950c57..bd82533823 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
@@ -1,24 +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.Framework.Graphics;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
+        public SkinnableTarget Target { get; }
+
+        public SkinnableElementTargetContainer(SkinnableTarget target)
+        {
+            Target = target;
+        }
+
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);
 
-            var loadable = skin.GetConfig<Type, IEnumerable<Drawable>>(this.GetType());
+            var loadable = skin.GetDrawableComponent(new SkinnableTargetComponent(Target));
 
             ClearInternal();
             if (loadable != null)
-                LoadComponentsAsync(loadable.Value, AddRangeInternal);
+                LoadComponentAsync(loadable, AddInternal);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
similarity index 51%
rename from osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs
rename to osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index e4ec035e68..5b1f840efd 100644
--- a/osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -2,7 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using osu.Framework.Graphics;
+using osu.Game.Extensions;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -10,17 +14,20 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
     /// </summary>
-    public class StoredSkinnableInfo : ISkinnableInfo
+    [Serializable]
+    public class SkinnableInfo : ISkinnableInfo
     {
-        public StoredSkinnableInfo(Drawable component)
+        public SkinnableInfo()
+        {
+        }
+
+        public SkinnableInfo(Drawable component)
         {
             Type = component.GetType();
 
-            var target = component.Parent as ISkinnableTarget
-                         // todo: this is temporary until we serialise the default layouts out of SkinnableDrawables.
-                         ?? component.Parent?.Parent as ISkinnableTarget;
+            ISkinnableTarget target = component.Parent as ISkinnableTarget;
 
-            Target = target?.GetType();
+            Target = target?.Target;
 
             Position = component.Position;
             Rotation = component.Rotation;
@@ -30,7 +37,8 @@ namespace osu.Game.Screens.Play.HUD
 
         public Type Type { get; set; }
 
-        public Type Target { get; set; }
+        [JsonConverter(typeof(StringEnumConverter))]
+        public SkinnableTarget? Target { get; set; }
 
         public Vector2 Position { get; set; }
 
@@ -40,4 +48,14 @@ namespace osu.Game.Screens.Play.HUD
 
         public Anchor Anchor { get; set; }
     }
+
+    public static class SkinnableInfoExtensions
+    {
+        public static Drawable CreateInstance(this ISkinnableInfo info)
+        {
+            Drawable d = (Drawable)Activator.CreateInstance(info.Type);
+            d.ApplySerialisedInformation(info);
+            return d;
+        }
+    }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 13449e3a2b..1a12ca4cbd 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -91,16 +91,37 @@ namespace osu.Game.Screens.Play
                         {
                             new Drawable[]
                             {
-                                new MainHUDElements
+                                new Container
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        HealthDisplay = new SkinnableHealthDisplay(),
-                                        AccuracyCounter = new SkinnableAccuracyCounter(),
-                                        ScoreCounter = new SkinnableScoreCounter(),
-                                        new SkinnableComboCounter(),
-                                        new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
+                                        new SkinnableElementTargetContainer(SkinnableTarget.MainHUDComponents)
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                        },
+                                        new Container
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Alpha = 0,
+                                            Children = new Drawable[]
+                                            {
+                                                // remaining cross-dependencies need tidying.
+                                                // kept to ensure non-null, but hidden for testing.
+                                                HealthDisplay = new SkinnableHealthDisplay(),
+                                                AccuracyCounter = new SkinnableAccuracyCounter(),
+                                                ScoreCounter = new SkinnableScoreCounter(),
+                                            }
+                                        },
+                                        new Container
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Children = new Drawable[]
+                                            {
+                                                // still need to be migrated; a bit more involved.
+                                                new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
+                                            }
+                                        },
                                     }
                                 },
                             },
@@ -337,9 +358,5 @@ namespace osu.Game.Screens.Play
                     break;
             }
         }
-
-        public class MainHUDElements : SkinnableElementTargetContainer
-        {
-        }
     }
 }
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 0b3f5f3cde..48da841c45 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -2,12 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osu.Game.Screens.Play.HUD;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -20,7 +25,29 @@ namespace osu.Game.Skinning
             Configuration = new DefaultSkinConfiguration();
         }
 
-        public override Drawable GetDrawableComponent(ISkinComponent component) => null;
+        public override Drawable GetDrawableComponent(ISkinComponent component)
+        {
+            switch (component)
+            {
+                case SkinnableTargetComponent target:
+                    switch (target.Target)
+                    {
+                        case SkinnableTarget.MainHUDComponents:
+                            var infos = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(File.ReadAllText("/Users/Dean/json-out.json")).Where(i => i.Target == SkinnableTarget.MainHUDComponents);
+
+                            var container = new SkinnableTargetWrapper(target.Target)
+                            {
+                                ChildrenEnumerable = infos.Select(i => i.CreateInstance())
+                            };
+
+                            return container;
+                    }
+
+                    break;
+            }
+
+            return null;
+        }
 
         public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
@@ -45,4 +72,14 @@ namespace osu.Game.Skinning
             return null;
         }
     }
+
+    public class SkinnableTargetWrapper : Container, ISkinnableTarget
+    {
+        public SkinnableTarget Target { get; }
+
+        public SkinnableTargetWrapper(SkinnableTarget target)
+        {
+            Target = target;
+        }
+    }
 }
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index 5371893882..73f7cf6d39 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.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 JetBrains.Annotations;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Skinning/SkinnableTarget.cs b/osu.Game/Skinning/SkinnableTarget.cs
new file mode 100644
index 0000000000..7b1eae126c
--- /dev/null
+++ b/osu.Game/Skinning/SkinnableTarget.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.Skinning
+{
+    public enum SkinnableTarget
+    {
+        MainHUDComponents
+    }
+}
diff --git a/osu.Game/Skinning/SkinnableTargetComponent.cs b/osu.Game/Skinning/SkinnableTargetComponent.cs
new file mode 100644
index 0000000000..a17aafe6e7
--- /dev/null
+++ b/osu.Game/Skinning/SkinnableTargetComponent.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Skinning
+{
+    public class SkinnableTargetComponent : ISkinComponent
+    {
+        public readonly SkinnableTarget Target;
+
+        public string LookupName => Target.ToString();
+
+        public SkinnableTargetComponent(SkinnableTarget target)
+        {
+            Target = target;
+        }
+    }
+}

From 95a497e9df7313ed1e6ae0513c1a623fba63c7cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 15:31:14 +0900
Subject: [PATCH 09895/10326] Remove unused interface class for simplicity

---
 osu.Game/Extensions/DrawableExtensions.cs   |  2 +-
 osu.Game/Screens/Play/HUD/ISkinnableInfo.cs | 26 ---------------------
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs  | 12 ++++------
 3 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/ISkinnableInfo.cs

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 289b305c27..e84c9e5a98 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Extensions
 
         public static SkinnableInfo CreateSerialisedInformation(this Drawable component) => new SkinnableInfo(component);
 
-        public static void ApplySerialisedInformation(this Drawable component, ISkinnableInfo info)
+        public static void ApplySerialisedInformation(this Drawable component, SkinnableInfo info)
         {
             // todo: can probably make this better via deserialisation directly using a common interface.
             component.Position = info.Position;
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs b/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
deleted file mode 100644
index fc4e9680a8..0000000000
--- a/osu.Game/Screens/Play/HUD/ISkinnableInfo.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;
-using osu.Framework.Graphics;
-using osu.Game.IO.Serialization;
-using osu.Game.Skinning;
-using osuTK;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public interface ISkinnableInfo : IJsonSerializable
-    {
-        public Type Type { get; set; }
-
-        public SkinnableTarget? Target { get; set; }
-
-        public Vector2 Position { get; set; }
-
-        public float Rotation { get; set; }
-
-        public Vector2 Scale { get; set; }
-
-        public Anchor Anchor { get; set; }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 5b1f840efd..2edc99781f 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -6,6 +6,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using osu.Framework.Graphics;
 using osu.Game.Extensions;
+using osu.Game.IO.Serialization;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -15,7 +16,7 @@ namespace osu.Game.Screens.Play.HUD
     /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
     /// </summary>
     [Serializable]
-    public class SkinnableInfo : ISkinnableInfo
+    public class SkinnableInfo : IJsonSerializable
     {
         public SkinnableInfo()
         {
@@ -47,14 +48,11 @@ namespace osu.Game.Screens.Play.HUD
         public Vector2 Scale { get; set; }
 
         public Anchor Anchor { get; set; }
-    }
 
-    public static class SkinnableInfoExtensions
-    {
-        public static Drawable CreateInstance(this ISkinnableInfo info)
+        public Drawable CreateInstance()
         {
-            Drawable d = (Drawable)Activator.CreateInstance(info.Type);
-            d.ApplySerialisedInformation(info);
+            Drawable d = (Drawable)Activator.CreateInstance(Type);
+            d.ApplySerialisedInformation(this);
             return d;
         }
     }

From df72656aa1238a337550ed1b114a45300c2455a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 15:40:33 +0900
Subject: [PATCH 09896/10326] Remove downwards dependency from `HUDOverlay` to
 `HealthDisplay`

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 13 +++++++++++--
 osu.Game/Screens/Play/HUDOverlay.cs        |  3 ---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 6c2571cc28..e0ddde026b 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
@@ -16,6 +17,8 @@ namespace osu.Game.Screens.Play.HUD
     /// </summary>
     public abstract class HealthDisplay : Container
     {
+        private Bindable<bool> showHealthbar;
+
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; }
 
@@ -29,12 +32,18 @@ namespace osu.Game.Screens.Play.HUD
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [BackgroundDependencyLoader(true)]
+        private void load(HUDOverlay hud)
         {
             Current.BindTo(HealthProcessor.Health);
 
             HealthProcessor.NewJudgement += onNewJudgement;
+
+            if (hud != null)
+            {
+                showHealthbar = hud.ShowHealthbar.GetBoundCopy();
+                showHealthbar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
+            }
         }
 
         private void onNewJudgement(JudgementResult judgement)
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 1a12ca4cbd..7220365673 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Screens.Play
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
         public readonly SkinnableAccuracyCounter AccuracyCounter;
-        public readonly SkinnableHealthDisplay HealthDisplay;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
@@ -108,7 +107,6 @@ namespace osu.Game.Screens.Play
                                             {
                                                 // remaining cross-dependencies need tidying.
                                                 // kept to ensure non-null, but hidden for testing.
-                                                HealthDisplay = new SkinnableHealthDisplay(),
                                                 AccuracyCounter = new SkinnableAccuracyCounter(),
                                                 ScoreCounter = new SkinnableScoreCounter(),
                                             }
@@ -206,7 +204,6 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            ShowHealthbar.BindValueChanged(healthBar => HealthDisplay.FadeTo(healthBar.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING), true);
             ShowHud.BindValueChanged(visible => hideTargets.ForEach(d => d.FadeTo(visible.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING)));
 
             IsBreakTime.BindValueChanged(_ => updateVisibility());

From 1742ee89e0680662cd5d12348ddceef4c5df2be9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 22:32:56 +0900
Subject: [PATCH 09897/10326] Fix incorrect xmldoc for `DeleteFile`

---
 osu.Game/Database/ArchiveModelManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index dbeaebb1cd..e0f80d2743 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -472,7 +472,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Delete new file.
+        /// Delete an existing file.
         /// </summary>
         /// <param name="model">The item to operate on.</param>
         /// <param name="file">The existing file to be deleted.</param>

From 6a88b8888b1be641d203ed598998b7f0e985c410 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 22:33:45 +0900
Subject: [PATCH 09898/10326] Add basic support for child serialisation

---
 osu.Game/Extensions/DrawableExtensions.cs  |  7 ++++
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs | 37 ++++++++++++++--------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index e84c9e5a98..6837a802f2 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
 using osu.Game.Screens.Play.HUD;
@@ -54,6 +55,12 @@ namespace osu.Game.Extensions
             component.Rotation = info.Rotation;
             component.Scale = info.Scale;
             component.Anchor = info.Anchor;
+
+            if (component is Container container)
+            {
+                foreach (var child in info.Children)
+                    container.Add(child.CreateInstance());
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 2edc99781f..ec4eaa0e59 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -2,9 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Extensions;
 using osu.Game.IO.Serialization;
 using osu.Game.Skinning;
@@ -18,6 +21,21 @@ namespace osu.Game.Screens.Play.HUD
     [Serializable]
     public class SkinnableInfo : IJsonSerializable
     {
+        public Type Type { get; set; }
+
+        [JsonConverter(typeof(StringEnumConverter))]
+        public SkinnableTarget? Target { get; set; }
+
+        public Vector2 Position { get; set; }
+
+        public float Rotation { get; set; }
+
+        public Vector2 Scale { get; set; }
+
+        public Anchor Anchor { get; set; }
+
+        public List<SkinnableInfo> Children { get; } = new List<SkinnableInfo>();
+
         public SkinnableInfo()
         {
         }
@@ -34,21 +52,14 @@ namespace osu.Game.Screens.Play.HUD
             Rotation = component.Rotation;
             Scale = component.Scale;
             Anchor = component.Anchor;
+
+            if (component is Container container)
+            {
+                foreach (var child in container.Children.OfType<ISkinnableComponent>().OfType<Drawable>())
+                    Children.Add(child.CreateSerialisedInformation());
+            }
         }
 
-        public Type Type { get; set; }
-
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SkinnableTarget? Target { get; set; }
-
-        public Vector2 Position { get; set; }
-
-        public float Rotation { get; set; }
-
-        public Vector2 Scale { get; set; }
-
-        public Anchor Anchor { get; set; }
-
         public Drawable CreateInstance()
         {
             Drawable d = (Drawable)Activator.CreateInstance(Type);

From b54eb56169e08757e85abe78b1113e7425108717 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 22:34:24 +0900
Subject: [PATCH 09899/10326] Move new judgement binding to `LoadComplete` to
 ensure containers are loaded

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index e0ddde026b..e18a28eded 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -37,8 +37,6 @@ namespace osu.Game.Screens.Play.HUD
         {
             Current.BindTo(HealthProcessor.Health);
 
-            HealthProcessor.NewJudgement += onNewJudgement;
-
             if (hud != null)
             {
                 showHealthbar = hud.ShowHealthbar.GetBoundCopy();
@@ -46,6 +44,13 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            HealthProcessor.NewJudgement += onNewJudgement;
+        }
+
         private void onNewJudgement(JudgementResult judgement)
         {
             if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)

From 004798d61d44d88114acfd7c2861378261eab107 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 22:36:20 +0900
Subject: [PATCH 09900/10326] Update Legacy components to not require skin in
 ctor

---
 .../Legacy/LegacyCatchComboCounter.cs         |  4 ++--
 .../Skinning/Legacy/LegacySpinner.cs          |  4 ++--
 .../Legacy/OsuLegacySkinTransformer.cs        |  2 +-
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 14 ++++++++++++-
 .../Screens/Play/HUD/LegacyComboCounter.cs    |  4 ++--
 .../HUD/SkinnableElementTargetContainer.cs    | 15 ++++++++++---
 osu.Game/Skinning/LegacyAccuracyCounter.cs    | 11 +++++-----
 osu.Game/Skinning/LegacyHealthDisplay.cs      | 21 ++++++++-----------
 osu.Game/Skinning/LegacyRollingCounter.cs     |  7 ++-----
 osu.Game/Skinning/LegacyScoreCounter.cs       | 12 +++++------
 osu.Game/Skinning/LegacySkin.cs               |  6 +++---
 osu.Game/Skinning/LegacySpriteText.cs         | 14 ++++++++++---
 12 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
index 28ee7bd813..33c3867f5a 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
             InternalChildren = new Drawable[]
             {
-                explosion = new LegacyRollingCounter(skin, LegacyFont.Combo)
+                explosion = new LegacyRollingCounter(LegacyFont.Combo)
                 {
                     Alpha = 0.65f,
                     Blending = BlendingParameters.Additive,
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                     Origin = Anchor.Centre,
                     Scale = new Vector2(1.5f),
                 },
-                counter = new LegacyRollingCounter(skin, LegacyFont.Combo)
+                counter = new LegacyRollingCounter(LegacyFont.Combo)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 7eb6898abc..959589620b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Scale = new Vector2(SPRITE_SCALE),
                         Y = SPINNER_TOP_OFFSET + 115,
                     },
-                    bonusCounter = new LegacySpriteText(source, LegacyFont.Score)
+                    bonusCounter = new LegacySpriteText(LegacyFont.Score)
                     {
                         Alpha = 0f,
                         Anchor = Anchor.TopCentre,
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Scale = new Vector2(SPRITE_SCALE),
                         Position = new Vector2(-87, 445 + spm_hide_offset),
                     },
-                    spmCounter = new LegacySpriteText(source, LegacyFont.Score)
+                    spmCounter = new LegacySpriteText(LegacyFont.Score)
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopRight,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index ffe238c507..88302ebc57 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     if (!this.HasFont(LegacyFont.HitCircle))
                         return null;
 
-                    return new LegacySpriteText(Source, LegacyFont.HitCircle)
+                    return new LegacySpriteText(LegacyFont.HitCircle)
                     {
                         // stable applies a blanket 0.8x scale to hitcircle fonts
                         Scale = new Vector2(0.8f),
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index c53ac42d12..b0edc0dd68 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Skinning;
 using osu.Game.Skinning.Editor;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -14,12 +16,22 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private SkinEditor skinEditor;
 
+        [Resolved]
+        private SkinManager skinManager { get; set; }
+
         [SetUpSteps]
         public override void SetUpSteps()
         {
+            AddStep("set empty legacy skin", () =>
+            {
+                var imported = skinManager.Import(new SkinInfo { Name = "test skin" }).Result;
+
+                skinManager.CurrentSkinInfo.Value = imported;
+            });
+
             base.SetUpSteps();
 
-            AddStep("add editor overlay", () =>
+            AddStep("reload skin editor", () =>
             {
                 skinEditor?.Expire();
                 Player.ScaleTo(SkinEditorOverlay.VISIBLE_TARGET_SCALE);
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 73305ac93e..2565faf423 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -84,13 +84,13 @@ namespace osu.Game.Screens.Play.HUD
         {
             InternalChildren = new[]
             {
-                popOutCount = new LegacySpriteText(skin, LegacyFont.Combo)
+                popOutCount = new LegacySpriteText(LegacyFont.Combo)
                 {
                     Alpha = 0,
                     Margin = new MarginPadding(0.05f),
                     Blending = BlendingParameters.Additive,
                 },
-                displayedCountSpriteText = new LegacySpriteText(skin, LegacyFont.Combo)
+                displayedCountSpriteText = new LegacySpriteText(LegacyFont.Combo)
                 {
                     Alpha = 0,
                 },
diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index bd82533823..f1b282119b 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
@@ -1,12 +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 System.Collections.Generic;
+using System.Linq;
+using osu.Game.Extensions;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
+        private SkinnableTargetWrapper content;
+
         public SkinnableTarget Target { get; }
 
         public SkinnableElementTargetContainer(SkinnableTarget target)
@@ -14,15 +19,19 @@ namespace osu.Game.Screens.Play.HUD
             Target = target;
         }
 
+        public IEnumerable<SkinnableInfo> CreateSerialisedChildren() =>
+            content.Select(d => d.CreateSerialisedInformation());
+
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);
 
-            var loadable = skin.GetDrawableComponent(new SkinnableTargetComponent(Target));
+            content = skin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
 
             ClearInternal();
-            if (loadable != null)
-                LoadComponentAsync(loadable, AddInternal);
+
+            if (content != null)
+                LoadComponentAsync(content, AddInternal);
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 3efcd5555e..e2fe01efe4 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -12,23 +12,22 @@ namespace osu.Game.Skinning
 {
     public class LegacyAccuracyCounter : GameplayAccuracyCounter, ISkinnableComponent
     {
-        private readonly ISkin skin;
+        [Resolved]
+        private ISkinSource skin { get; set; }
 
-        public LegacyAccuracyCounter(ISkin skin)
+        public LegacyAccuracyCounter()
         {
             Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
 
             Scale = new Vector2(0.6f);
             Margin = new MarginPadding(10);
-
-            this.skin = skin;
         }
 
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, LegacyFont.Score)
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(LegacyFont.Score)
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
@@ -38,7 +37,7 @@ namespace osu.Game.Skinning
         {
             base.Update();
 
-            if (hud?.ScoreCounter.Drawable is LegacyScoreCounter score)
+            if (hud?.ScoreCounter?.Drawable is LegacyScoreCounter score)
             {
                 // for now align with the score counter. eventually this will be user customisable.
                 Y = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight).Y;
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index c1979efbc2..717ca62da7 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -20,7 +20,9 @@ namespace osu.Game.Skinning
     {
         private const double epic_cutoff = 0.5;
 
-        private readonly Skin skin;
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
         private LegacyHealthPiece fill;
         private LegacyHealthPiece marker;
 
@@ -28,11 +30,6 @@ namespace osu.Game.Skinning
 
         private bool isNewStyle;
 
-        public LegacyHealthDisplay(Skin skin)
-        {
-            this.skin = skin;
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -79,7 +76,7 @@ namespace osu.Game.Skinning
 
         protected override void Flash(JudgementResult result) => marker.Flash(result);
 
-        private static Texture getTexture(Skin skin, string name) => skin.GetTexture($"scorebar-{name}");
+        private static Texture getTexture(ISkinSource skin, string name) => skin.GetTexture($"scorebar-{name}");
 
         private static Color4 getFillColour(double hp)
         {
@@ -98,7 +95,7 @@ namespace osu.Game.Skinning
             private readonly Texture dangerTexture;
             private readonly Texture superDangerTexture;
 
-            public LegacyOldStyleMarker(Skin skin)
+            public LegacyOldStyleMarker(ISkinSource skin)
             {
                 normalTexture = getTexture(skin, "ki");
                 dangerTexture = getTexture(skin, "kidanger");
@@ -129,9 +126,9 @@ namespace osu.Game.Skinning
 
         public class LegacyNewStyleMarker : LegacyMarker
         {
-            private readonly Skin skin;
+            private readonly ISkinSource skin;
 
-            public LegacyNewStyleMarker(Skin skin)
+            public LegacyNewStyleMarker(ISkinSource skin)
             {
                 this.skin = skin;
             }
@@ -153,7 +150,7 @@ namespace osu.Game.Skinning
 
         internal class LegacyOldStyleFill : LegacyHealthPiece
         {
-            public LegacyOldStyleFill(Skin skin)
+            public LegacyOldStyleFill(ISkinSource skin)
             {
                 // required for sizing correctly..
                 var firstFrame = getTexture(skin, "colour-0");
@@ -176,7 +173,7 @@ namespace osu.Game.Skinning
 
         internal class LegacyNewStyleFill : LegacyHealthPiece
         {
-            public LegacyNewStyleFill(Skin skin)
+            public LegacyNewStyleFill(ISkinSource skin)
             {
                 InternalChild = new Sprite
                 {
diff --git a/osu.Game/Skinning/LegacyRollingCounter.cs b/osu.Game/Skinning/LegacyRollingCounter.cs
index 0261db0e64..b531ae1e6f 100644
--- a/osu.Game/Skinning/LegacyRollingCounter.cs
+++ b/osu.Game/Skinning/LegacyRollingCounter.cs
@@ -12,7 +12,6 @@ namespace osu.Game.Skinning
     /// </summary>
     public class LegacyRollingCounter : RollingCounter<int>
     {
-        private readonly ISkin skin;
         private readonly LegacyFont font;
 
         protected override bool IsRollingProportional => true;
@@ -20,11 +19,9 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Creates a new <see cref="LegacyRollingCounter"/>.
         /// </summary>
-        /// <param name="skin">The <see cref="ISkin"/> from which to get counter number sprites.</param>
         /// <param name="font">The legacy font to use for the counter.</param>
-        public LegacyRollingCounter(ISkin skin, LegacyFont font)
+        public LegacyRollingCounter(LegacyFont font)
         {
-            this.skin = skin;
             this.font = font;
         }
 
@@ -33,6 +30,6 @@ namespace osu.Game.Skinning
             return Math.Abs(newValue - currentValue) * 75.0;
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, font);
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(font);
     }
 }
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index ecb907e601..0696d2bedd 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.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.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
@@ -10,24 +11,23 @@ namespace osu.Game.Skinning
 {
     public class LegacyScoreCounter : GameplayScoreCounter, ISkinnableComponent
     {
-        private readonly ISkin skin;
-
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
 
-        public LegacyScoreCounter(ISkin skin)
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
+        public LegacyScoreCounter()
             : base(6)
         {
             Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
 
-            this.skin = skin;
-
             Scale = new Vector2(0.96f);
             Margin = new MarginPadding(10);
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, LegacyFont.Score)
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(LegacyFont.Score)
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index eae3b69233..70f8d1d882 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -334,13 +334,13 @@ namespace osu.Game.Skinning
                             return new LegacyComboCounter();
 
                         case HUDSkinComponents.ScoreCounter:
-                            return new LegacyScoreCounter(this);
+                            return new LegacyScoreCounter();
 
                         case HUDSkinComponents.AccuracyCounter:
-                            return new LegacyAccuracyCounter(this);
+                            return new LegacyAccuracyCounter();
 
                         case HUDSkinComponents.HealthDisplay:
-                            return new LegacyHealthDisplay(this);
+                            return new LegacyHealthDisplay();
                     }
 
                     return null;
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index c55400e219..7895fcccca 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading.Tasks;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Text;
 using osu.Game.Graphics.Sprites;
@@ -9,19 +10,26 @@ using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacySpriteText : OsuSpriteText
+    public sealed class LegacySpriteText : OsuSpriteText
     {
-        private readonly LegacyGlyphStore glyphStore;
+        private readonly LegacyFont font;
+
+        private LegacyGlyphStore glyphStore;
 
         protected override char FixedWidthReferenceCharacter => '5';
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
-        public LegacySpriteText(ISkin skin, LegacyFont font)
+        public LegacySpriteText(LegacyFont font)
         {
+            this.font = font;
             Shadow = false;
             UseFullGlyphHeight = false;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
             Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
             Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
 

From b248b2e5e3bf8b62ea94b9e1d5eb85e3809d448e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 22:43:48 +0900
Subject: [PATCH 09901/10326] Hook up full save/load flow

---
 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs | 15 ----
 osu.Game/Screens/Play/HUDOverlay.cs           |  2 +-
 osu.Game/Skinning/DefaultSkin.cs              | 42 +---------
 .../Skinning/Editor/SkinBlueprintContainer.cs |  8 --
 osu.Game/Skinning/Editor/SkinEditor.cs        | 43 +++++++++-
 osu.Game/Skinning/ISkinnableTarget.cs         |  4 +-
 osu.Game/Skinning/LegacySkin.cs               | 26 +++++-
 osu.Game/Skinning/Skin.cs                     | 81 ++++++++++++++++++-
 osu.Game/Skinning/SkinManager.cs              | 32 ++++++++
 9 files changed, 181 insertions(+), 72 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs

diff --git a/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs b/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
deleted file mode 100644
index 6cd269333a..0000000000
--- a/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
+++ /dev/null
@@ -1,15 +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.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// A container which supports skinnable components being added to it.
-    /// </summary>
-    public interface ISkinnableTarget
-    {
-        public SkinnableTarget Target { get; }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 7220365673..30b735d28a 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -22,7 +22,7 @@ using osuTK;
 namespace osu.Game.Screens.Play
 {
     [Cached]
-    public class HUDOverlay : Container, IKeyBindingHandler<GlobalAction>, IDefaultSkinnableTarget
+    public class HUDOverlay : Container, IKeyBindingHandler<GlobalAction>
     {
         public const float FADE_DURATION = 300;
 
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 48da841c45..bfb5b8ef56 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -2,17 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osu.Game.Screens.Play.HUD;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -20,35 +14,11 @@ namespace osu.Game.Skinning
     public class DefaultSkin : Skin
     {
         public DefaultSkin()
-            : base(SkinInfo.Default)
+            : base(SkinInfo.Default, null)
         {
             Configuration = new DefaultSkinConfiguration();
         }
 
-        public override Drawable GetDrawableComponent(ISkinComponent component)
-        {
-            switch (component)
-            {
-                case SkinnableTargetComponent target:
-                    switch (target.Target)
-                    {
-                        case SkinnableTarget.MainHUDComponents:
-                            var infos = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(File.ReadAllText("/Users/Dean/json-out.json")).Where(i => i.Target == SkinnableTarget.MainHUDComponents);
-
-                            var container = new SkinnableTargetWrapper(target.Target)
-                            {
-                                ChildrenEnumerable = infos.Select(i => i.CreateInstance())
-                            };
-
-                            return container;
-                    }
-
-                    break;
-            }
-
-            return null;
-        }
-
         public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
         public override ISample GetSample(ISampleInfo sampleInfo) => null;
@@ -72,14 +42,4 @@ namespace osu.Game.Skinning
             return null;
         }
     }
-
-    public class SkinnableTargetWrapper : Container, ISkinnableTarget
-    {
-        public SkinnableTarget Target { get; }
-
-        public SkinnableTargetWrapper(SkinnableTarget target)
-        {
-            Target = target;
-        }
-    }
 }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index a6f60afd90..45e541abf0 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -1,12 +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.IO;
 using System.Linq;
-using Newtonsoft.Json;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Game.Extensions;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -32,11 +29,6 @@ namespace osu.Game.Skinning.Editor
         {
             ISkinnableComponent[] skinnableComponents = target.ChildrenOfType<ISkinnableComponent>().ToArray();
 
-            // todo: the OfType() call can be removed with better IDrawable support.
-            string json = JsonConvert.SerializeObject(skinnableComponents.OfType<Drawable>().Select(d => d.CreateSerialisedInformation()), new JsonSerializerSettings { Formatting = Formatting.Indented });
-
-            File.WriteAllText("/Users/Dean/json-out.json", json);
-
             foreach (var c in skinnableComponents)
                 AddBlueprintFor(c);
 
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 18a8b220df..30ee3097d2 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -11,6 +11,8 @@ using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -24,6 +26,9 @@ namespace osu.Game.Skinning.Editor
 
         protected override bool StartHidden => true;
 
+        [Resolved]
+        private SkinManager skins { get; set; }
+
         public SkinEditor(Drawable target)
         {
             this.target = target;
@@ -53,7 +58,24 @@ namespace osu.Game.Skinning.Editor
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                         RequestPlacement = placeComponent
-                    }
+                    },
+                    new TriangleButton
+                    {
+                        Text = "Save Changes",
+                        Width = 140,
+                        Height = 50,
+                        Padding = new MarginPadding
+                        {
+                            Top = 10,
+                            Left = 10,
+                        },
+                        Margin = new MarginPadding
+                        {
+                            Right = 10,
+                            Bottom = 10,
+                        },
+                        Action = save,
+                    },
                 }
             };
 
@@ -71,7 +93,7 @@ namespace osu.Game.Skinning.Editor
 
             var targetContainer = target.ChildrenOfType<IDefaultSkinnableTarget>().FirstOrDefault();
 
-            targetContainer?.Add(instance);
+            (targetContainer as Container)?.Add(instance);
         }
 
         protected override void LoadComplete()
@@ -80,6 +102,23 @@ namespace osu.Game.Skinning.Editor
             Show();
         }
 
+        private void save()
+        {
+            var currentSkin = skins.CurrentSkin.Value;
+
+            var legacySkin = currentSkin as LegacySkin;
+
+            if (legacySkin == null)
+                return;
+
+            SkinnableElementTargetContainer[] targetContainers = target.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+
+            foreach (var t in targetContainers)
+                legacySkin.UpdateDrawableTarget(t);
+
+            skins.Save(skins.CurrentSkin.Value);
+        }
+
         protected override bool OnHover(HoverEvent e) => true;
 
         protected override bool OnMouseDown(MouseDownEvent e) => true;
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 607e89fdec..90e48c8bba 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -2,14 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
     /// </summary>
-    public interface ISkinnableTarget : IContainerCollection<Drawable>
+    public interface ISkinnableTarget : IDrawable
     {
+        public SkinnableTarget Target { get; }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 70f8d1d882..fc03ce909c 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Skinning
         }
 
         protected LegacySkin(SkinInfo skin, [CanBeNull] IResourceStore<byte[]> storage, [CanBeNull] IStorageResourceProvider resources, string filename)
-            : base(skin)
+            : base(skin, resources)
         {
             using (var stream = storage?.GetStream(filename))
             {
@@ -321,8 +321,32 @@ namespace osu.Game.Skinning
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
+            if (base.GetDrawableComponent(component) is Drawable c)
+                return c;
+
             switch (component)
             {
+                case SkinnableTargetComponent target:
+
+                    switch (target.Target)
+                    {
+                        case SkinnableTarget.MainHUDComponents:
+                            return new SkinnableTargetWrapper(target.Target)
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new[]
+                                {
+                                    // TODO: these should fallback to the osu!classic skin.
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ComboCounter)) ?? new DefaultComboCounter(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreCounter)) ?? new DefaultScoreCounter(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)) ?? new DefaultAccuracyCounter(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)) ?? new DefaultHealthDisplay(),
+                                }
+                            };
+                    }
+
+                    return null;
+
                 case HUDSkinComponent hudComponent:
                 {
                     if (!this.HasFont(LegacyFont.Score))
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 6d1bce2cb1..03ecabc886 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -2,12 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osu.Game.IO;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning
 {
@@ -15,9 +22,13 @@ namespace osu.Game.Skinning
     {
         public readonly SkinInfo SkinInfo;
 
+        private readonly IStorageResourceProvider resources;
+
         public SkinConfiguration Configuration { get; protected set; }
 
-        public abstract Drawable GetDrawableComponent(ISkinComponent componentName);
+        public IDictionary<SkinnableTarget, SkinnableInfo[]> DrawableComponentInfo => drawableComponentInfo;
+
+        private readonly Dictionary<SkinnableTarget, SkinnableInfo[]> drawableComponentInfo = new Dictionary<SkinnableTarget, SkinnableInfo[]>();
 
         public abstract ISample GetSample(ISampleInfo sampleInfo);
 
@@ -27,9 +38,62 @@ namespace osu.Game.Skinning
 
         public abstract IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
 
-        protected Skin(SkinInfo skin)
+        protected Skin(SkinInfo skin, IStorageResourceProvider resources)
         {
             SkinInfo = skin;
+
+            // may be null for default skin.
+            this.resources = resources;
+        }
+
+        public void UpdateDrawableTarget(SkinnableElementTargetContainer targetContainer)
+        {
+            DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSerialisedChildren().ToArray();
+        }
+
+        public virtual Drawable GetDrawableComponent(ISkinComponent component)
+        {
+            switch (component)
+            {
+                case SkinnableTargetComponent target:
+
+                    var skinnableTarget = target.Target;
+
+                    if (!DrawableComponentInfo.TryGetValue(skinnableTarget, out var skinnableInfo))
+                    {
+                        switch (skinnableTarget)
+                        {
+                            case SkinnableTarget.MainHUDComponents:
+
+                                // skininfo files may be null for default skin.
+                                var fileInfo = SkinInfo.Files?.FirstOrDefault(f => f.Filename == $"{skinnableTarget}.json");
+
+                                if (fileInfo == null)
+                                    return null;
+
+                                var bytes = resources?.Files.Get(fileInfo.FileInfo.StoragePath);
+
+                                if (bytes == null)
+                                    return null;
+
+                                string jsonContent = Encoding.UTF8.GetString(bytes);
+
+                                DrawableComponentInfo[skinnableTarget] = skinnableInfo =
+                                    JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).Where(i => i.Target == SkinnableTarget.MainHUDComponents).ToArray();
+                                break;
+                        }
+                    }
+
+                    if (skinnableInfo == null)
+                        return null;
+
+                    return new SkinnableTargetWrapper(skinnableTarget)
+                    {
+                        ChildrenEnumerable = skinnableInfo.Select(i => i.CreateInstance())
+                    };
+            }
+
+            return null;
         }
 
         #region Disposal
@@ -58,4 +122,17 @@ namespace osu.Game.Skinning
 
         #endregion
     }
+
+    public class SkinnableTargetWrapper : Container, IDefaultSkinnableTarget
+    {
+        // this is just here to implement the interface and allow a silly parent lookup to work (where the target is not the direct parent for reasons).
+        // TODO: need to fix this.
+        public SkinnableTarget Target { get; }
+
+        public SkinnableTargetWrapper(SkinnableTarget target)
+        {
+            Target = target;
+            RelativeSizeAxes = Axes.Both;
+        }
+    }
 }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index ac4d63159a..f9e22c9c89 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -6,9 +6,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
@@ -17,6 +19,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
@@ -158,6 +161,35 @@ namespace osu.Game.Skinning
             return new LegacySkin(skinInfo, this);
         }
 
+        public void Save(Skin skin)
+        {
+            // some skins don't support saving just yet.
+            // eventually we will want to create a copy of the skin to allow for customisation.
+            if (skin.SkinInfo.Files == null)
+                return;
+
+            foreach (var drawableInfo in skin.DrawableComponentInfo)
+            {
+                // todo: the OfType() call can be removed with better IDrawable support.
+                string json = JsonConvert.SerializeObject(drawableInfo.Value, new JsonSerializerSettings { Formatting = Formatting.Indented });
+
+                using (var streamContent = new MemoryStream(Encoding.UTF8.GetBytes(json)))
+                {
+                    string filename = $"{drawableInfo.Key}.json";
+
+                    var oldFile = skin.SkinInfo.Files.FirstOrDefault(f => f.Filename == filename);
+
+                    if (oldFile != null)
+                        ReplaceFile(skin.SkinInfo, oldFile, streamContent, oldFile.Filename);
+                    else
+                        AddFile(skin.SkinInfo, streamContent, filename);
+
+                    Logger.Log($"Saving out {filename} with {json.Length} bytes");
+                    Logger.Log(json);
+                }
+            }
+        }
+
         /// <summary>
         /// Perform a lookup query on available <see cref="SkinInfo"/>s.
         /// </summary>

From 1bb3c609aeec1c773aac2a7a28f4c21d52674052 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 11:00:57 +0900
Subject: [PATCH 09902/10326] Centralise implementation of cancel button logic

---
 .../UserInterface/DangerousTriangleButton.cs   | 18 ++++++++++++++++++
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs  | 11 +----------
 .../KeyBinding/KeyBindingsSubsection.cs        |  9 ++-------
 3 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/DangerousTriangleButton.cs

diff --git a/osu.Game/Graphics/UserInterface/DangerousTriangleButton.cs b/osu.Game/Graphics/UserInterface/DangerousTriangleButton.cs
new file mode 100644
index 0000000000..89a4c28c8c
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/DangerousTriangleButton.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;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class DangerousTriangleButton : TriangleButton
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            BackgroundColour = colours.PinkDark;
+            Triangles.ColourDark = colours.PinkDarker;
+            Triangles.ColourLight = colours.Pink;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 300fce962a..43942d2d52 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -339,22 +339,13 @@ namespace osu.Game.Overlays.KeyBinding
             }
         }
 
-        public class ClearButton : TriangleButton
+        public class ClearButton : DangerousTriangleButton
         {
             public ClearButton()
             {
                 Text = "Clear";
                 Size = new Vector2(80, 20);
             }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                BackgroundColour = colours.Pink;
-
-                Triangles.ColourDark = colours.PinkDark;
-                Triangles.ColourLight = colours.PinkLight;
-            }
         }
 
         public class KeyButton : Container
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs b/osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs
index d784b7aec9..707176e63e 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs
@@ -11,7 +11,6 @@ using osu.Game.Input;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets;
 using osuTK;
-using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.KeyBinding
 {
@@ -55,10 +54,10 @@ namespace osu.Game.Overlays.KeyBinding
         }
     }
 
-    public class ResetButton : TriangleButton
+    public class ResetButton : DangerousTriangleButton
     {
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             Text = "Reset all bindings in section";
             RelativeSizeAxes = Axes.X;
@@ -66,10 +65,6 @@ namespace osu.Game.Overlays.KeyBinding
             Height = 20;
 
             Content.CornerRadius = 5;
-
-            BackgroundColour = colours.PinkDark;
-            Triangles.ColourDark = colours.PinkDarker;
-            Triangles.ColourLight = colours.Pink;
         }
     }
 }

From c957293ec3a580875f7961bcde4e47bfd20c2a27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 11:54:45 +0900
Subject: [PATCH 09903/10326] Load json from disk store at skin construction
 for now

This allows for easier mutation without worrying about changes being
re-read from disk unexpectedly.
---
 osu.Game/Skinning/Skin.cs | 62 ++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 03ecabc886..34571ec688 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -44,6 +44,32 @@ namespace osu.Game.Skinning
 
             // may be null for default skin.
             this.resources = resources;
+
+            // we may want to move this to some kind of async operation in the future.
+            foreach (SkinnableTarget skinnableTarget in Enum.GetValues(typeof(SkinnableTarget)))
+            {
+                string filename = $"{skinnableTarget}.json";
+
+                // skininfo files may be null for default skin.
+                var fileInfo = SkinInfo.Files?.FirstOrDefault(f => f.Filename == filename);
+
+                if (fileInfo == null)
+                    continue;
+
+                var bytes = resources?.Files.Get(fileInfo.FileInfo.StoragePath);
+
+                if (bytes == null)
+                    continue;
+
+                string jsonContent = Encoding.UTF8.GetString(bytes);
+
+                DrawableComponentInfo[skinnableTarget] = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).ToArray();
+            }
+        }
+
+        public void ResetDrawableTarget(SkinnableElementTargetContainer targetContainer)
+        {
+            DrawableComponentInfo.Remove(targetContainer.Target);
         }
 
         public void UpdateDrawableTarget(SkinnableElementTargetContainer targetContainer)
@@ -60,34 +86,9 @@ namespace osu.Game.Skinning
                     var skinnableTarget = target.Target;
 
                     if (!DrawableComponentInfo.TryGetValue(skinnableTarget, out var skinnableInfo))
-                    {
-                        switch (skinnableTarget)
-                        {
-                            case SkinnableTarget.MainHUDComponents:
-
-                                // skininfo files may be null for default skin.
-                                var fileInfo = SkinInfo.Files?.FirstOrDefault(f => f.Filename == $"{skinnableTarget}.json");
-
-                                if (fileInfo == null)
-                                    return null;
-
-                                var bytes = resources?.Files.Get(fileInfo.FileInfo.StoragePath);
-
-                                if (bytes == null)
-                                    return null;
-
-                                string jsonContent = Encoding.UTF8.GetString(bytes);
-
-                                DrawableComponentInfo[skinnableTarget] = skinnableInfo =
-                                    JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).Where(i => i.Target == SkinnableTarget.MainHUDComponents).ToArray();
-                                break;
-                        }
-                    }
-
-                    if (skinnableInfo == null)
                         return null;
 
-                    return new SkinnableTargetWrapper(skinnableTarget)
+                    return new SkinnableTargetWrapper
                     {
                         ChildrenEnumerable = skinnableInfo.Select(i => i.CreateInstance())
                     };
@@ -123,15 +124,10 @@ namespace osu.Game.Skinning
         #endregion
     }
 
-    public class SkinnableTargetWrapper : Container, IDefaultSkinnableTarget
+    public class SkinnableTargetWrapper : Container, ISkinnableComponent
     {
-        // this is just here to implement the interface and allow a silly parent lookup to work (where the target is not the direct parent for reasons).
-        // TODO: need to fix this.
-        public SkinnableTarget Target { get; }
-
-        public SkinnableTargetWrapper(SkinnableTarget target)
+        public SkinnableTargetWrapper()
         {
-            Target = target;
             RelativeSizeAxes = Axes.Both;
         }
     }

From 4769a95b4994b032f64e446272ffed0051230f43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 11:56:14 +0900
Subject: [PATCH 09904/10326] Fix encapsulation and remove target lookup
 overhead

---
 .../HUD/SkinnableElementTargetContainer.cs    | 23 ++++++++++++++-----
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs    |  9 --------
 osu.Game/Skinning/IDefaultSkinnableTarget.cs  | 12 ----------
 osu.Game/Skinning/ISkinnableTarget.cs         | 12 +++++++++-
 osu.Game/Skinning/LegacySkin.cs               |  3 +--
 5 files changed, 29 insertions(+), 30 deletions(-)
 delete mode 100644 osu.Game/Skinning/IDefaultSkinnableTarget.cs

diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index f1b282119b..79a0db1751 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics;
 using osu.Game.Extensions;
 using osu.Game.Skinning;
 
@@ -19,6 +20,21 @@ namespace osu.Game.Screens.Play.HUD
             Target = target;
         }
 
+        public void Reload()
+        {
+            content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
+
+            ClearInternal();
+
+            if (content != null)
+                LoadComponentAsync(content, AddInternal);
+        }
+
+        public void Add(Drawable drawable)
+        {
+            content.Add(drawable);
+        }
+
         public IEnumerable<SkinnableInfo> CreateSerialisedChildren() =>
             content.Select(d => d.CreateSerialisedInformation());
 
@@ -26,12 +42,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.SkinChanged(skin, allowFallback);
 
-            content = skin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
-
-            ClearInternal();
-
-            if (content != null)
-                LoadComponentAsync(content, AddInternal);
+            Reload();
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index ec4eaa0e59..abeb96f647 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -4,8 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Extensions;
@@ -23,9 +21,6 @@ namespace osu.Game.Screens.Play.HUD
     {
         public Type Type { get; set; }
 
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SkinnableTarget? Target { get; set; }
-
         public Vector2 Position { get; set; }
 
         public float Rotation { get; set; }
@@ -44,10 +39,6 @@ namespace osu.Game.Screens.Play.HUD
         {
             Type = component.GetType();
 
-            ISkinnableTarget target = component.Parent as ISkinnableTarget;
-
-            Target = target?.Target;
-
             Position = component.Position;
             Rotation = component.Rotation;
             Scale = component.Scale;
diff --git a/osu.Game/Skinning/IDefaultSkinnableTarget.cs b/osu.Game/Skinning/IDefaultSkinnableTarget.cs
deleted file mode 100644
index 24fb454af8..0000000000
--- a/osu.Game/Skinning/IDefaultSkinnableTarget.cs
+++ /dev/null
@@ -1,12 +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.Skinning
-{
-    /// <summary>
-    /// The default placement location for new <see cref="ISkinnableComponent"/>s.
-    /// </summary>
-    public interface IDefaultSkinnableTarget : ISkinnableTarget
-    {
-    }
-}
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 90e48c8bba..2379fd4247 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -8,8 +8,18 @@ namespace osu.Game.Skinning
     /// <summary>
     /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
     /// </summary>
-    public interface ISkinnableTarget : IDrawable
+    public interface ISkinnableTarget
     {
         public SkinnableTarget Target { get; }
+
+        /// <summary>
+        /// Reload this target from the current skin.
+        /// </summary>
+        public void Reload();
+
+        /// <summary>
+        /// Add the provided item to this target.
+        /// </summary>
+        public void Add(Drawable drawable);
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index fc03ce909c..3ffd2245c2 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -331,9 +331,8 @@ namespace osu.Game.Skinning
                     switch (target.Target)
                     {
                         case SkinnableTarget.MainHUDComponents:
-                            return new SkinnableTargetWrapper(target.Target)
+                            return new SkinnableTargetWrapper
                             {
-                                RelativeSizeAxes = Axes.Both,
                                 Children = new[]
                                 {
                                     // TODO: these should fallback to the osu!classic skin.

From 81902ad6a688f2e143d06234006027889d8808be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 11:57:12 +0900
Subject: [PATCH 09905/10326] Add the ability to revert all skin changes

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 66 +++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 30ee3097d2..6b7d289284 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play.HUD;
+using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -20,7 +21,7 @@ namespace osu.Game.Skinning.Editor
     {
         public const double TRANSITION_DURATION = 500;
 
-        private readonly Drawable target;
+        private readonly Drawable targetScreen;
 
         private OsuTextFlowContainer headerText;
 
@@ -29,9 +30,9 @@ namespace osu.Game.Skinning.Editor
         [Resolved]
         private SkinManager skins { get; set; }
 
-        public SkinEditor(Drawable target)
+        public SkinEditor(Drawable targetScreen)
         {
-            this.target = target;
+            this.targetScreen = targetScreen;
 
             RelativeSizeAxes = Axes.Both;
         }
@@ -52,18 +53,20 @@ namespace osu.Game.Skinning.Editor
                         Origin = Anchor.TopCentre,
                         RelativeSizeAxes = Axes.X
                     },
-                    new SkinBlueprintContainer(target),
+                    new SkinBlueprintContainer(targetScreen),
                     new SkinComponentToolbox(600)
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                         RequestPlacement = placeComponent
                     },
-                    new TriangleButton
+                    new FillFlowContainer
                     {
-                        Text = "Save Changes",
-                        Width = 140,
-                        Height = 50,
+                        Direction = FillDirection.Horizontal,
+                        AutoSizeAxes = Axes.Both,
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Spacing = new Vector2(5),
                         Padding = new MarginPadding
                         {
                             Top = 10,
@@ -74,7 +77,21 @@ namespace osu.Game.Skinning.Editor
                             Right = 10,
                             Bottom = 10,
                         },
-                        Action = save,
+                        Children = new Drawable[]
+                        {
+                            new TriangleButton
+                            {
+                                Text = "Save Changes",
+                                Width = 140,
+                                Action = save,
+                            },
+                            new DangerousTriangleButton
+                            {
+                                Text = "Revert to default",
+                                Width = 140,
+                                Action = revert,
+                            },
+                        }
                     },
                 }
             };
@@ -89,11 +106,14 @@ namespace osu.Game.Skinning.Editor
 
         private void placeComponent(Type type)
         {
-            var instance = (Drawable)Activator.CreateInstance(type);
+            Drawable instance = (Drawable)Activator.CreateInstance(type);
 
-            var targetContainer = target.ChildrenOfType<IDefaultSkinnableTarget>().FirstOrDefault();
+            getTarget(SkinnableTarget.MainHUDComponents)?.Add(instance);
+        }
 
-            (targetContainer as Container)?.Add(instance);
+        private ISkinnableTarget getTarget(SkinnableTarget target)
+        {
+            return targetScreen.ChildrenOfType<ISkinnableTarget>().FirstOrDefault(c => c.Target == target);
         }
 
         protected override void LoadComplete()
@@ -102,6 +122,26 @@ namespace osu.Game.Skinning.Editor
             Show();
         }
 
+        private void revert()
+        {
+            var currentSkin = skins.CurrentSkin.Value;
+
+            var legacySkin = currentSkin as LegacySkin;
+
+            if (legacySkin == null)
+                return;
+
+            SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+
+            foreach (var t in targetContainers)
+            {
+                legacySkin.ResetDrawableTarget(t);
+
+                // add back default components
+                getTarget(t.Target).Reload();
+            }
+        }
+
         private void save()
         {
             var currentSkin = skins.CurrentSkin.Value;
@@ -111,7 +151,7 @@ namespace osu.Game.Skinning.Editor
             if (legacySkin == null)
                 return;
 
-            SkinnableElementTargetContainer[] targetContainers = target.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+            SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
                 legacySkin.UpdateDrawableTarget(t);

From bf65547eec7419273bd106f30d4842dd19ea86fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 12:04:25 +0900
Subject: [PATCH 09906/10326] Allow some serialised components to not be
 mutable by the user

---
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs        |  4 ++--
 osu.Game/Skinning/IImmutableSkinnableComponent.cs | 15 +++++++++++++++
 osu.Game/Skinning/ISkinnableComponent.cs          |  4 +---
 osu.Game/Skinning/Skin.cs                         |  5 +----
 4 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game/Skinning/IImmutableSkinnableComponent.cs

diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index abeb96f647..988d73fed6 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -14,7 +14,7 @@ using osuTK;
 namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
-    /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
+    /// Serialised information governing custom changes to an <see cref="ISkinSerialisable"/>.
     /// </summary>
     [Serializable]
     public class SkinnableInfo : IJsonSerializable
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Play.HUD
 
             if (component is Container container)
             {
-                foreach (var child in container.Children.OfType<ISkinnableComponent>().OfType<Drawable>())
+                foreach (var child in container.Children.OfType<ISkinSerialisable>().OfType<Drawable>())
                     Children.Add(child.CreateSerialisedInformation());
             }
         }
diff --git a/osu.Game/Skinning/IImmutableSkinnableComponent.cs b/osu.Game/Skinning/IImmutableSkinnableComponent.cs
new file mode 100644
index 0000000000..d1777512af
--- /dev/null
+++ b/osu.Game/Skinning/IImmutableSkinnableComponent.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;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// Denotes a drawable component which should be serialised as part of a skin.
+    /// Use <see cref="ISkinnableComponent"/> for components which should be mutable by the user / editor.
+    /// </summary>
+    public interface ISkinSerialisable : IDrawable
+    {
+    }
+}
diff --git a/osu.Game/Skinning/ISkinnableComponent.cs b/osu.Game/Skinning/ISkinnableComponent.cs
index f6b0a182b4..e44c7be13d 100644
--- a/osu.Game/Skinning/ISkinnableComponent.cs
+++ b/osu.Game/Skinning/ISkinnableComponent.cs
@@ -1,14 +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.Framework.Graphics;
-
 namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a drawable which, as a drawable, can be adjusted via skinning specifications.
     /// </summary>
-    public interface ISkinnableComponent : IDrawable
+    public interface ISkinnableComponent : ISkinSerialisable
     {
     }
 }
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 34571ec688..cbbad4a607 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Skinning
     {
         public readonly SkinInfo SkinInfo;
 
-        private readonly IStorageResourceProvider resources;
-
         public SkinConfiguration Configuration { get; protected set; }
 
         public IDictionary<SkinnableTarget, SkinnableInfo[]> DrawableComponentInfo => drawableComponentInfo;
@@ -43,7 +41,6 @@ namespace osu.Game.Skinning
             SkinInfo = skin;
 
             // may be null for default skin.
-            this.resources = resources;
 
             // we may want to move this to some kind of async operation in the future.
             foreach (SkinnableTarget skinnableTarget in Enum.GetValues(typeof(SkinnableTarget)))
@@ -124,7 +121,7 @@ namespace osu.Game.Skinning
         #endregion
     }
 
-    public class SkinnableTargetWrapper : Container, ISkinnableComponent
+    public class SkinnableTargetWrapper : Container, ISkinSerialisable
     {
         public SkinnableTargetWrapper()
         {

From 2396ba42a6ec6c6e9f3e4b8d89513fec123706e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 12:21:31 +0900
Subject: [PATCH 09907/10326] Change `HealthDisplay` to be a
 `CompositeDrawable`

---
 osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs | 6 ++++--
 osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs       | 2 +-
 osu.Game/Screens/Play/HUD/FailingLayer.cs               | 2 +-
 osu.Game/Screens/Play/HUD/HealthDisplay.cs              | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index fb4c9d713a..c335f7c99e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.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.Linq;
 using NUnit.Framework;
 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.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
@@ -50,9 +52,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
-            AddUntilStep("layer fade is visible", () => layer.Child.Alpha > 0.1f);
+            AddUntilStep("layer fade is visible", () => layer.ChildrenOfType<Container>().First().Alpha > 0.1f);
             AddStep("set health to 1", () => layer.Current.Value = 1f);
-            AddUntilStep("layer fade is invisible", () => !layer.Child.IsPresent);
+            AddUntilStep("layer fade is invisible", () => !layer.ChildrenOfType<Container>().First().IsPresent);
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index 37bd289aee..241777244b 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Play.HUD
             RelativeSizeAxes = Axes.X;
             Margin = new MarginPadding { Top = 20 };
 
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new Box
                 {
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index e071337f34..424ee55766 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Play.HUD
         public FailingLayer()
         {
             RelativeSizeAxes = Axes.Both;
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 boxes = new Container
                 {
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index e18a28eded..5a2c764a1a 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Play.HUD
     /// A container for components displaying the current player health.
     /// Gets bound automatically to the <see cref="Rulesets.Scoring.HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy.
     /// </summary>
-    public abstract class HealthDisplay : Container
+    public abstract class HealthDisplay : CompositeDrawable
     {
         private Bindable<bool> showHealthbar;
 

From 4c4d75e6f9c341548b310a767cc15d6839559905 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 12:42:32 +0900
Subject: [PATCH 09908/10326] Remove `AccuracyCounter` sizing dependency in
 `HUDOverlay`

---
 .../HUD/SkinnableElementTargetContainer.cs    |  2 ++
 osu.Game/Screens/Play/HUDOverlay.cs           | 34 ++++++++++++++-----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index 79a0db1751..051ab9ad3c 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Screens.Play.HUD
             Target = target;
         }
 
+        public IReadOnlyList<Drawable> Children => content?.Children;
+
         public void Reload()
         {
             content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 30b735d28a..033a280da2 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -35,7 +36,6 @@ namespace osu.Game.Screens.Play
 
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
-        public readonly SkinnableAccuracyCounter AccuracyCounter;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
@@ -68,6 +68,8 @@ namespace osu.Game.Screens.Play
 
         private bool holdingForHUD;
 
+        private readonly SkinnableElementTargetContainer mainComponents;
+
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter, topRightElements };
 
         public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
@@ -95,7 +97,7 @@ namespace osu.Game.Screens.Play
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        new SkinnableElementTargetContainer(SkinnableTarget.MainHUDComponents)
+                                        mainComponents = new SkinnableElementTargetContainer(SkinnableTarget.MainHUDComponents)
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                         },
@@ -107,7 +109,6 @@ namespace osu.Game.Screens.Play
                                             {
                                                 // remaining cross-dependencies need tidying.
                                                 // kept to ensure non-null, but hidden for testing.
-                                                AccuracyCounter = new SkinnableAccuracyCounter(),
                                                 ScoreCounter = new SkinnableScoreCounter(),
                                             }
                                         },
@@ -216,12 +217,29 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            // HACK: for now align with the accuracy counter.
-            // this is done for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
-            // it only works with the default skin due to padding offsetting it *just enough* to coexist.
-            topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(AccuracyCounter.Drawable.ScreenSpaceDrawQuad.BottomRight).Y;
+            Vector2 lowestScreenSpace = Vector2.Zero;
 
-            bottomRightElements.Y = -Progress.Height;
+            // TODO: may be null during skin switching. not sure if there's a better way of exposing these children.
+            if (mainComponents.Children != null)
+            {
+                foreach (var element in mainComponents.Children)
+                {
+                    // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
+                    if (!element.Anchor.HasFlagFast(Anchor.TopRight))
+                        continue;
+
+                    // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
+                    if (element is HealthDisplay)
+                        continue;
+
+                    var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;
+                    if (bottomRight.Y > lowestScreenSpace.Y)
+                        lowestScreenSpace = bottomRight;
+                }
+
+                topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestScreenSpace).Y;
+                bottomRightElements.Y = -Progress.Height;
+            }
         }
 
         private void updateVisibility()

From 117d6d731d1a0f5de4648888cfd91f180b1cac2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 13:12:24 +0900
Subject: [PATCH 09909/10326] Move cross-component layout dependencies for
 legacy skin to `LegacySkin`

---
 osu.Game/Skinning/LegacyAccuracyCounter.cs  | 11 ------
 osu.Game/Skinning/LegacySkin.cs             | 15 +++++++-
 osu.Game/Skinning/Skin.cs                   |  9 -----
 osu.Game/Skinning/SkinnableTargetWrapper.cs | 41 +++++++++++++++++++++
 4 files changed, 54 insertions(+), 22 deletions(-)
 create mode 100644 osu.Game/Skinning/SkinnableTargetWrapper.cs

diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index e2fe01efe4..3eea5d22d5 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -32,16 +32,5 @@ namespace osu.Game.Skinning
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
         };
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (hud?.ScoreCounter?.Drawable is LegacyScoreCounter score)
-            {
-                // for now align with the score counter. eventually this will be user customisable.
-                Y = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight).Y;
-            }
-        }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 3ffd2245c2..85cfab8297 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -327,11 +327,20 @@ namespace osu.Game.Skinning
             switch (component)
             {
                 case SkinnableTargetComponent target:
-
                     switch (target.Target)
                     {
                         case SkinnableTarget.MainHUDComponents:
-                            return new SkinnableTargetWrapper
+
+                            var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
+                            {
+                                var score = container.OfType<LegacyScoreCounter>().FirstOrDefault();
+                                var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault();
+
+                                if (score != null && accuracy != null)
+                                {
+                                    accuracy.Y = container.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight).Y;
+                                }
+                            })
                             {
                                 Children = new[]
                                 {
@@ -342,6 +351,8 @@ namespace osu.Game.Skinning
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)) ?? new DefaultHealthDisplay(),
                                 }
                             };
+
+                            return skinnableTargetWrapper;
                     }
 
                     return null;
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index cbbad4a607..10481e4efd 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -9,7 +9,6 @@ using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
@@ -120,12 +119,4 @@ namespace osu.Game.Skinning
 
         #endregion
     }
-
-    public class SkinnableTargetWrapper : Container, ISkinSerialisable
-    {
-        public SkinnableTargetWrapper()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-    }
 }
diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
new file mode 100644
index 0000000000..a0df610488
--- /dev/null
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// A container which is serialised and can encapsulate multiple skinnable elements into a single return type.
+    /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
+    /// </summary>
+    public class SkinnableTargetWrapper : Container, ISkinSerialisable
+    {
+        private readonly Action<Container> applyDefaults;
+
+        /// <summary>
+        /// Construct a wrapper with defaults that should be applied once.
+        /// </summary>
+        /// <param name="applyDefaults">A function with default to apply after the initial layout (ie. consuming autosize)</param>
+        public SkinnableTargetWrapper(Action<Container> applyDefaults)
+            : this()
+        {
+            this.applyDefaults = applyDefaults;
+        }
+
+        public SkinnableTargetWrapper()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // schedule is required to allow children to run their LoadComplete and take on their correct sizes.
+            Schedule(() => applyDefaults?.Invoke(this));
+        }
+    }
+}

From f53ce951dc1ee6594d5a6cc4e975fa9e9a15dee6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 13:13:40 +0900
Subject: [PATCH 09910/10326] Remove `DefaultScoreCounter` animation for the
 time being

May add this back in the future, but for now it's causing issues as it
operates on `this`. The default skin may be changing quite a bit in the
near future, so we can decide what to do about animation at that point
in time.
---
 osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index 8e37797446..bd18050dfb 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -24,12 +24,6 @@ namespace osu.Game.Screens.Play.HUD
         private void load(OsuColour colours)
         {
             Colour = colours.BlueLighter;
-
-            // todo: check if default once health display is skinnable
-            hud?.ShowHealthbar.BindValueChanged(healthBar =>
-            {
-                this.MoveToY(healthBar.NewValue ? 30 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING);
-            }, true);
         }
     }
 }

From c94df672e5f30c4d87738ca37a019685773c4df2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 13:39:32 +0900
Subject: [PATCH 09911/10326] Also serialise `Origin` out

---
 osu.Game/Extensions/DrawableExtensions.cs  | 1 +
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 6837a802f2..0ec96a876e 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -55,6 +55,7 @@ namespace osu.Game.Extensions
             component.Rotation = info.Rotation;
             component.Scale = info.Scale;
             component.Anchor = info.Anchor;
+            component.Origin = info.Origin;
 
             if (component is Container container)
             {
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 988d73fed6..2de3f1b729 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Screens.Play.HUD
 
         public Anchor Anchor { get; set; }
 
+        public Anchor Origin { get; set; }
+
         public List<SkinnableInfo> Children { get; } = new List<SkinnableInfo>();
 
         public SkinnableInfo()
@@ -43,6 +45,7 @@ namespace osu.Game.Screens.Play.HUD
             Rotation = component.Rotation;
             Scale = component.Scale;
             Anchor = component.Anchor;
+            Origin = component.Origin;
 
             if (component is Container container)
             {

From 12684de66eb76365a3f10d4bee629eb9f0ada1d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 14:09:56 +0900
Subject: [PATCH 09912/10326] Add ability to adjust origin in skin editor

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index ad783a9c0e..cf5ece03e9 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -70,13 +70,18 @@ namespace osu.Game.Skinning.Editor
         {
             yield return new OsuMenuItem("Anchor")
             {
-                Items = createAnchorItems().ToArray()
+                Items = createAnchorItems(d => d.Anchor, applyAnchor).ToArray()
+            };
+
+            yield return new OsuMenuItem("Origin")
+            {
+                Items = createAnchorItems(d => d.Origin, applyOrigin).ToArray()
             };
 
             foreach (var item in base.GetContextMenuItemsForSelection(selection))
                 yield return item;
 
-            IEnumerable<AnchorMenuItem> createAnchorItems()
+            IEnumerable<AnchorMenuItem> createAnchorItems(Func<Drawable, Anchor> checkFunction, Action<Anchor> applyFunction)
             {
                 var displayableAnchors = new[]
                 {
@@ -93,14 +98,20 @@ namespace osu.Game.Skinning.Editor
 
                 return displayableAnchors.Select(a =>
                 {
-                    return new AnchorMenuItem(a, selection, _ => applyAnchor(a))
+                    return new AnchorMenuItem(a, selection, _ => applyFunction(a))
                     {
-                        State = { Value = GetStateFromSelection(selection, c => ((Drawable)c.Item).Anchor == a) }
+                        State = { Value = GetStateFromSelection(selection, c => checkFunction((Drawable)c.Item) == a) }
                     };
                 });
             }
         }
 
+        private void applyOrigin(Anchor anchor)
+        {
+            foreach (var item in SelectedItems)
+                ((Drawable)item).Origin = anchor;
+        }
+
         private void applyAnchor(Anchor anchor)
         {
             foreach (var item in SelectedItems)

From 944f09ec98e54f296ee6fe04a0b183ab31bd4550 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 14:12:28 +0900
Subject: [PATCH 09913/10326] Move default skin cross-component dependencies
 out to default specifications

---
 .../Play/HUD/DefaultAccuracyCounter.cs        | 22 -------
 .../Screens/Play/HUD/DefaultComboCounter.cs   | 14 ----
 osu.Game/Screens/Play/HUDOverlay.cs           | 12 ----
 osu.Game/Skinning/DefaultSkin.cs              | 64 +++++++++++++++++++
 4 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index e4c865803d..d8dff89b29 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -2,23 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class DefaultAccuracyCounter : GameplayAccuracyCounter, ISkinnableComponent
     {
-        private readonly Vector2 offset = new Vector2(-20, 5);
-
-        public DefaultAccuracyCounter()
-        {
-            Origin = Anchor.TopRight;
-            Anchor = Anchor.TopRight;
-        }
-
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
@@ -27,17 +17,5 @@ namespace osu.Game.Screens.Play.HUD
         {
             Colour = colours.BlueLighter;
         }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (hud?.ScoreCounter.Drawable is DefaultScoreCounter score)
-            {
-                // for now align with the score counter. eventually this will be user customisable.
-                Anchor = Anchor.TopLeft;
-                Position = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.TopLeft) + offset;
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 375ff293aa..13bd045fc0 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -9,14 +9,11 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class DefaultComboCounter : RollingCounter<int>, ISkinnableComponent
     {
-        private readonly Vector2 offset = new Vector2(20, 5);
-
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
@@ -32,17 +29,6 @@ namespace osu.Game.Screens.Play.HUD
             Current.BindTo(scoreProcessor.Combo);
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            if (hud?.ScoreCounter.Drawable is DefaultScoreCounter score)
-            {
-                // for now align with the score counter. eventually this will be user customisable.
-                Position = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.TopRight) + offset;
-            }
-        }
-
         protected override string FormatCount(int count)
         {
             return $@"{count}x";
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 033a280da2..88176e7ea2 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -35,7 +35,6 @@ namespace osu.Game.Screens.Play
         public float TopScoringElementsHeight { get; private set; }
 
         public readonly KeyCounterDisplay KeyCounter;
-        public readonly SkinnableScoreCounter ScoreCounter;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
@@ -102,17 +101,6 @@ namespace osu.Game.Screens.Play
                                             RelativeSizeAxes = Axes.Both,
                                         },
                                         new Container
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Alpha = 0,
-                                            Children = new Drawable[]
-                                            {
-                                                // remaining cross-dependencies need tidying.
-                                                // kept to ensure non-null, but hidden for testing.
-                                                ScoreCounter = new SkinnableScoreCounter(),
-                                            }
-                                        },
-                                        new Container
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                             Children = new Drawable[]
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index bfb5b8ef56..ef3dffe59c 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -2,11 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osu.Game.Extensions;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -23,6 +28,65 @@ namespace osu.Game.Skinning
 
         public override ISample GetSample(ISampleInfo sampleInfo) => null;
 
+        public override Drawable GetDrawableComponent(ISkinComponent component)
+        {
+            switch (component)
+            {
+                case SkinnableTargetComponent target:
+                    switch (target.Target)
+                    {
+                        case SkinnableTarget.MainHUDComponents:
+                            var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
+                            {
+                                var score = container.OfType<DefaultScoreCounter>().FirstOrDefault();
+                                var accuracy = container.OfType<DefaultAccuracyCounter>().FirstOrDefault();
+                                var combo = container.OfType<DefaultComboCounter>().FirstOrDefault();
+
+                                if (score != null)
+                                {
+                                    score.Anchor = Anchor.TopCentre;
+                                    score.Origin = Anchor.TopCentre;
+
+                                    // elements default to beneath the health bar
+                                    const float vertical_offset = 30;
+
+                                    const float horizontal_padding = 20;
+
+                                    score.Position = new Vector2(0, vertical_offset);
+
+                                    if (accuracy != null)
+                                    {
+                                        accuracy.Position = new Vector2(-accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 - horizontal_padding, vertical_offset + 5);
+                                        accuracy.Origin = Anchor.TopRight;
+                                        accuracy.Anchor = Anchor.TopCentre;
+                                    }
+
+                                    if (combo != null)
+                                    {
+                                        combo.Position = new Vector2(accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 + horizontal_padding, vertical_offset + 5);
+                                        combo.Anchor = Anchor.TopCentre;
+                                    }
+                                }
+                            })
+                            {
+                                Children = new Drawable[]
+                                {
+                                    new DefaultComboCounter(),
+                                    new DefaultScoreCounter(),
+                                    new DefaultAccuracyCounter(),
+                                    new DefaultHealthDisplay(),
+                                }
+                            };
+
+                            return skinnableTargetWrapper;
+                    }
+
+                    return null;
+            }
+
+            return base.GetDrawableComponent(component);
+        }
+
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             switch (lookup)

From 03d5f10744b91aa189d5bf1fe5a153a2117830b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 14:22:19 +0900
Subject: [PATCH 09914/10326] Fix default health bar not being considered for
 top-right flow layout

---
 osu.Game/Screens/Play/HUDOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 88176e7ea2..c4a8860bb6 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -213,11 +213,11 @@ namespace osu.Game.Screens.Play
                 foreach (var element in mainComponents.Children)
                 {
                     // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
-                    if (!element.Anchor.HasFlagFast(Anchor.TopRight))
+                    if (!element.Anchor.HasFlagFast(Anchor.TopRight) && !element.RelativeSizeAxes.HasFlagFast(Axes.X))
                         continue;
 
                     // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
-                    if (element is HealthDisplay)
+                    if (element is LegacyHealthDisplay)
                         continue;
 
                     var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;

From d5fe4f0f72e404f9527e2ccfe444dcd6645de0fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 14:34:49 +0900
Subject: [PATCH 09915/10326] Remove unused skin resolution in
 `LegacyScoreCounter`

---
 osu.Game/Skinning/LegacyScoreCounter.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 0696d2bedd..8aa48da453 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.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.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
@@ -14,9 +13,6 @@ namespace osu.Game.Skinning
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
 
-        [Resolved]
-        private ISkinSource skin { get; set; }
-
         public LegacyScoreCounter()
             : base(6)
         {

From 0cf3efa16b9c20dccd26722e599ffa75bc5b9b72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 16:56:23 +0900
Subject: [PATCH 09916/10326] Remove customisation support for
 `SongProgressDisplay`

---
 osu.Game/Screens/Play/SongProgress.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index d85f3538e4..4a0787bfae 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -14,7 +14,6 @@ using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
-using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play
 {
@@ -181,12 +180,12 @@ namespace osu.Game.Screens.Play
             info.TransformTo(nameof(info.Margin), new MarginPadding { Bottom = finalMargin }, transition_duration, Easing.In);
         }
 
-        public class SongProgressDisplay : Container, ISkinnableComponent
+        public class SongProgressDisplay : Container
         {
             public SongProgressDisplay()
             {
                 // TODO: move actual implementation into this.
-                // exists for skin customisation purposes.
+                // exists for skin customisation purposes (interface should be added to this container).
 
                 Masking = true;
                 RelativeSizeAxes = Axes.Both;

From f6f4b90d2bd71680a470d92c0aef5a98494e8580 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 16:56:55 +0900
Subject: [PATCH 09917/10326] Add customisation support for
 `LegacyHealthDisplay`

---
 osu.Game/Skinning/LegacyHealthDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 717ca62da7..dfb6ca1a64 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyHealthDisplay : HealthDisplay
+    public class LegacyHealthDisplay : HealthDisplay, ISkinnableComponent
     {
         private const double epic_cutoff = 0.5;
 

From a67cead0b3adfce14608060d51131145ff653c81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:00:24 +0900
Subject: [PATCH 09918/10326] Add `SkinInfo.InstantiationInfo` to allow
 creating different skin types

---
 .../TestSceneHitCircleArea.cs                 |   2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs           |   2 +-
 ...60743_AddSkinInstantiationInfo.Designer.cs | 508 ++++++++++++++++++
 ...20210511060743_AddSkinInstantiationInfo.cs |  22 +
 .../Migrations/OsuDbContextModelSnapshot.cs   |   6 +-
 osu.Game/Skinning/DefaultLegacySkin.cs        |  10 +-
 osu.Game/Skinning/DefaultSkin.cs              |  10 +-
 osu.Game/Skinning/SkinInfo.cs                 |  36 +-
 osu.Game/Skinning/SkinManager.cs              |  22 +-
 9 files changed, 597 insertions(+), 21 deletions(-)
 create mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
 create mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
index 0649989dc0..1fdcd73dde 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            Child = new SkinProvidingContainer(new DefaultSkin())
+            Child = new SkinProvidingContainer(new DefaultSkin(null))
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = drawableHitCircle = new DrawableHitCircle(hitCircle)
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index e0eeaf6db0..3576b149bf 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -324,7 +324,7 @@ namespace osu.Game.Beatmaps
         public bool SkinLoaded => skin.IsResultAvailable;
         public ISkin Skin => skin.Value;
 
-        protected virtual ISkin GetSkin() => new DefaultSkin();
+        protected virtual ISkin GetSkin() => new DefaultSkin(null);
         private readonly RecyclableLazy<ISkin> skin;
 
         public abstract Stream GetStream(string storagePath);
diff --git a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
new file mode 100644
index 0000000000..b808c648da
--- /dev/null
+++ b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
@@ -0,0 +1,508 @@
+// <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("20210511060743_AddSkinInstantiationInfo")]
+    partial class AddSkinInstantiationInfo
+    {
+        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<bool>("EpilepsyWarning");
+
+                    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.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<int?>("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>("InstantiationInfo");
+
+                    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/20210511060743_AddSkinInstantiationInfo.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
new file mode 100644
index 0000000000..1d5b0769a4
--- /dev/null
+++ b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace osu.Game.Migrations
+{
+    public partial class AddSkinInstantiationInfo : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "InstantiationInfo",
+                table: "SkinInfo",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "InstantiationInfo",
+                table: "SkinInfo");
+        }
+    }
+}
diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
index ec4461ca56..d4bde50b60 100644
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
@@ -141,8 +141,6 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("TitleUnicode");
 
-                    b.Property<string>("VideoFile");
-
                     b.HasKey("ID");
 
                     b.ToTable("BeatmapMetadata");
@@ -352,7 +350,7 @@ namespace osu.Game.Migrations
 
                     b.Property<long>("TotalScore");
 
-                    b.Property<long?>("UserID")
+                    b.Property<int?>("UserID")
                         .HasColumnName("UserID");
 
                     b.Property<string>("UserString")
@@ -402,6 +400,8 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("Hash");
 
+                    b.Property<string>("InstantiationInfo");
+
                     b.Property<string>("Name");
 
                     b.HasKey("ID");
diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 4027cc650d..564be8630e 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -10,7 +10,12 @@ namespace osu.Game.Skinning
     public class DefaultLegacySkin : LegacySkin
     {
         public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
-            : base(Info, storage, resources, string.Empty)
+            : this(Info, storage, resources)
+        {
+        }
+
+        public DefaultLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
+            : base(skin, storage, resources, string.Empty)
         {
             Configuration.CustomColours["SliderBall"] = new Color4(2, 170, 255, 255);
             Configuration.AddComboColours(
@@ -27,7 +32,8 @@ namespace osu.Game.Skinning
         {
             ID = SkinInfo.CLASSIC_SKIN, // this is temporary until database storage is decided upon.
             Name = "osu!classic",
-            Creator = "team osu!"
+            Creator = "team osu!",
+            InstantiationInfo = typeof(DefaultLegacySkin).AssemblyQualifiedName,
         };
     }
 }
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index ef3dffe59c..1c063b6ef2 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Extensions;
+using osu.Game.IO;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
@@ -18,8 +19,13 @@ namespace osu.Game.Skinning
 {
     public class DefaultSkin : Skin
     {
-        public DefaultSkin()
-            : base(SkinInfo.Default, null)
+        public DefaultSkin(IStorageResourceProvider resources)
+            : this(SkinInfo.Default, resources)
+        {
+        }
+
+        public DefaultSkin(SkinInfo skin, IStorageResourceProvider resources)
+            : base(skin, resources)
         {
             Configuration = new DefaultSkinConfiguration();
         }
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index aaccbefb3d..2e29808cb4 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.IO;
 
 namespace osu.Game.Skinning
 {
@@ -22,7 +25,35 @@ namespace osu.Game.Skinning
 
         public string Creator { get; set; }
 
-        public List<SkinFileInfo> Files { get; set; }
+        private string instantiationInfo;
+
+        public string InstantiationInfo
+        {
+            get => instantiationInfo;
+            set => instantiationInfo = abbreviateInstantiationInfo(value);
+        }
+
+        private string abbreviateInstantiationInfo(string value)
+        {
+            // exclude version onwards, matching only on namespace and type.
+            // this is mainly to allow for new versions of already loaded rulesets to "upgrade" from old.
+            return string.Join(',', value.Split(',').Take(2));
+        }
+
+        public virtual Skin CreateInstance(IResourceStore<byte[]> legacyDefaultResources, IStorageResourceProvider resources)
+        {
+            var type = string.IsNullOrEmpty(InstantiationInfo)
+                // handle the case of skins imported before InstantiationInfo was added.
+                ? typeof(LegacySkin)
+                : Type.GetType(InstantiationInfo);
+
+            if (type == typeof(DefaultLegacySkin))
+                return (Skin)Activator.CreateInstance(type, this, legacyDefaultResources, resources);
+
+            return (Skin)Activator.CreateInstance(type, this, resources);
+        }
+
+        public List<SkinFileInfo> Files { get; set; } = new List<SkinFileInfo>();
 
         public List<DatabasedSetting> Settings { get; set; }
 
@@ -32,7 +63,8 @@ namespace osu.Game.Skinning
         {
             ID = DEFAULT_SKIN,
             Name = "osu!lazer",
-            Creator = "team osu!"
+            Creator = "team osu!",
+            InstantiationInfo = typeof(DefaultSkin).AssemblyQualifiedName,
         };
 
         public bool Equals(SkinInfo other) => other != null && ID == other.ID;
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index f9e22c9c89..2ea236e44f 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
 
         private readonly IResourceStore<byte[]> legacyDefaultResources;
 
-        public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin());
+        public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin(null));
         public readonly Bindable<SkinInfo> CurrentSkinInfo = new Bindable<SkinInfo>(SkinInfo.Default) { Default = SkinInfo.Default };
 
         public override IEnumerable<string> HandledExtensions => new[] { ".osk" };
@@ -108,7 +108,7 @@ namespace osu.Game.Skinning
         {
             // we need to populate early to create a hash based off skin.ini contents
             if (item.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
-                populateMetadata(item);
+                populateMetadata(item, GetSkin(item));
 
             if (item.Creator != null && item.Creator != unknown_creator_string)
             {
@@ -125,18 +125,20 @@ namespace osu.Game.Skinning
         {
             await base.Populate(model, archive, cancellationToken).ConfigureAwait(false);
 
+            var instance = GetSkin(model);
+
+            model.InstantiationInfo ??= instance.GetType().AssemblyQualifiedName;
+
             if (model.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
-                populateMetadata(model);
+                populateMetadata(model, instance);
         }
 
-        private void populateMetadata(SkinInfo item)
+        private void populateMetadata(SkinInfo item, Skin instance)
         {
-            Skin reference = GetSkin(item);
-
-            if (!string.IsNullOrEmpty(reference.Configuration.SkinInfo.Name))
+            if (!string.IsNullOrEmpty(instance.Configuration.SkinInfo.Name))
             {
-                item.Name = reference.Configuration.SkinInfo.Name;
-                item.Creator = reference.Configuration.SkinInfo.Creator;
+                item.Name = instance.Configuration.SkinInfo.Name;
+                item.Creator = instance.Configuration.SkinInfo.Creator;
             }
             else
             {
@@ -150,7 +152,7 @@ namespace osu.Game.Skinning
         /// </summary>
         /// <param name="skinInfo">The skin to lookup.</param>
         /// <returns>A <see cref="Skin"/> instance correlating to the provided <see cref="SkinInfo"/>.</returns>
-        public Skin GetSkin(SkinInfo skinInfo)
+        public Skin GetSkin(SkinInfo skinInfo) => skinInfo.CreateInstance(legacyDefaultResources, this);
         {
             if (skinInfo == SkinInfo.Default)
                 return new DefaultSkin();

From a7e83aacfb2b01201f7f8d87f584fbc871c30b3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:00:56 +0900
Subject: [PATCH 09919/10326] Ensure default skins are copied before modifying

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 30 ++++++++++++--------------
 osu.Game/Skinning/SkinManager.cs       | 26 ++++++++++++++--------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 6b7d289284..90b003153b 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.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.Input.Events;
@@ -30,6 +31,8 @@ namespace osu.Game.Skinning.Editor
         [Resolved]
         private SkinManager skins { get; set; }
 
+        private Bindable<Skin> currentSkin;
+
         public SkinEditor(Drawable targetScreen)
         {
             this.targetScreen = targetScreen;
@@ -119,23 +122,25 @@ namespace osu.Game.Skinning.Editor
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
             Show();
+
+            // as long as the skin editor is loaded, let's make sure we can modify the current skin.
+            currentSkin = skins.CurrentSkin.GetBoundCopy();
+
+            // schedule ensures this only happens when the skin editor is visible.
+            // also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
+            // probably something which will be factored out in a future database refactor so not too concerning for now.
+            currentSkin.BindValueChanged(skin => Scheduler.AddOnce(skins.EnsureMutableSkin), true);
         }
 
         private void revert()
         {
-            var currentSkin = skins.CurrentSkin.Value;
-
-            var legacySkin = currentSkin as LegacySkin;
-
-            if (legacySkin == null)
-                return;
-
             SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
             {
-                legacySkin.ResetDrawableTarget(t);
+                currentSkin.Value.ResetDrawableTarget(t);
 
                 // add back default components
                 getTarget(t.Target).Reload();
@@ -144,17 +149,10 @@ namespace osu.Game.Skinning.Editor
 
         private void save()
         {
-            var currentSkin = skins.CurrentSkin.Value;
-
-            var legacySkin = currentSkin as LegacySkin;
-
-            if (legacySkin == null)
-                return;
-
             SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
-                legacySkin.UpdateDrawableTarget(t);
+                currentSkin.Value.UpdateDrawableTarget(t);
 
             skins.Save(skins.CurrentSkin.Value);
         }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 2ea236e44f..63d7e4f86f 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -153,22 +153,30 @@ namespace osu.Game.Skinning
         /// <param name="skinInfo">The skin to lookup.</param>
         /// <returns>A <see cref="Skin"/> instance correlating to the provided <see cref="SkinInfo"/>.</returns>
         public Skin GetSkin(SkinInfo skinInfo) => skinInfo.CreateInstance(legacyDefaultResources, this);
+
+        /// <summary>
+        /// Ensure that the current skin is in a state it can accept user modifications.
+        /// This will create a copy of any internal skin and being tracking in the database if not already.
+        /// </summary>
+        public void EnsureMutableSkin()
         {
-            if (skinInfo == SkinInfo.Default)
-                return new DefaultSkin();
+            if (CurrentSkinInfo.Value.ID >= 1) return;
 
-            if (skinInfo == DefaultLegacySkin.Info)
-                return new DefaultLegacySkin(legacyDefaultResources, this);
+            var skin = CurrentSkin.Value;
 
-            return new LegacySkin(skinInfo, this);
+            // if the user is attempting to save one of the default skin implementations, create a copy first.
+            CurrentSkinInfo.Value = Import(new SkinInfo
+            {
+                Name = skin.SkinInfo.Name + " (modified)",
+                Creator = skin.SkinInfo.Creator,
+                InstantiationInfo = skin.SkinInfo.InstantiationInfo,
+            }).Result;
         }
 
         public void Save(Skin skin)
         {
-            // some skins don't support saving just yet.
-            // eventually we will want to create a copy of the skin to allow for customisation.
-            if (skin.SkinInfo.Files == null)
-                return;
+            if (skin.SkinInfo.ID <= 0)
+                throw new InvalidOperationException($"Attempting to save a skin which is not yet tracked. Call {nameof(EnsureMutableSkin)} first.");
 
             foreach (var drawableInfo in skin.DrawableComponentInfo)
             {

From 61ea3f2e6410980341803eb2c4548e917229ee3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:08:32 +0900
Subject: [PATCH 09920/10326] Remove unnecessary test step creating needless
 skins

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index b0edc0dd68..73da76df78 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -22,13 +22,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public override void SetUpSteps()
         {
-            AddStep("set empty legacy skin", () =>
-            {
-                var imported = skinManager.Import(new SkinInfo { Name = "test skin" }).Result;
-
-                skinManager.CurrentSkinInfo.Value = imported;
-            });
-
             base.SetUpSteps();
 
             AddStep("reload skin editor", () =>

From a88a8b7d8d504cf981bbcd65c1d81ba9a69a6320 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:48:08 +0900
Subject: [PATCH 09921/10326] Use `ISkinnableComponent` wherever possible (and
 expose as `BindableList`)

---
 .../HUD/SkinnableElementTargetContainer.cs    | 32 +++++++++++++++----
 osu.Game/Screens/Play/HUDOverlay.cs           | 32 +++++++++----------
 osu.Game/Skinning/ISkinnableTarget.cs         |  4 +--
 osu.Game/Skinning/SkinnableTargetWrapper.cs   |  2 +-
 4 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index 051ab9ad3c..b2f6d32927 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.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 System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Extensions;
 using osu.Game.Skinning;
@@ -15,30 +17,46 @@ namespace osu.Game.Screens.Play.HUD
 
         public SkinnableTarget Target { get; }
 
+        public IBindableList<ISkinnableComponent> Components => components;
+
+        private readonly BindableList<ISkinnableComponent> components = new BindableList<ISkinnableComponent>();
+
         public SkinnableElementTargetContainer(SkinnableTarget target)
         {
             Target = target;
         }
 
-        public IReadOnlyList<Drawable> Children => content?.Children;
-
         public void Reload()
         {
+            ClearInternal();
+            components.Clear();
+
             content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
 
-            ClearInternal();
-
             if (content != null)
-                LoadComponentAsync(content, AddInternal);
+            {
+                LoadComponentAsync(content, wrapper =>
+                {
+                    AddInternal(wrapper);
+                    components.AddRange(wrapper.Children.OfType<ISkinnableComponent>());
+                });
+            }
         }
 
-        public void Add(Drawable drawable)
+        public void Add(ISkinnableComponent component)
         {
+            if (content == null)
+                throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
+
+            if (!(component is Drawable drawable))
+                throw new ArgumentException("Provided argument must be of type {nameof(ISkinnableComponent)}.", nameof(drawable));
+
             content.Add(drawable);
+            components.Add(component);
         }
 
         public IEnumerable<SkinnableInfo> CreateSerialisedChildren() =>
-            content.Select(d => d.CreateSerialisedInformation());
+            components.Select(d => ((Drawable)d).CreateSerialisedInformation());
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index c4a8860bb6..887346b5df 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
@@ -207,27 +208,24 @@ namespace osu.Game.Screens.Play
 
             Vector2 lowestScreenSpace = Vector2.Zero;
 
-            // TODO: may be null during skin switching. not sure if there's a better way of exposing these children.
-            if (mainComponents.Children != null)
+            // LINQ cast can be removed when IDrawable interface includes Anchor / RelativeSizeAxes.
+            foreach (var element in mainComponents.Components.Cast<Drawable>())
             {
-                foreach (var element in mainComponents.Children)
-                {
-                    // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
-                    if (!element.Anchor.HasFlagFast(Anchor.TopRight) && !element.RelativeSizeAxes.HasFlagFast(Axes.X))
-                        continue;
+                // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
+                if (!element.Anchor.HasFlagFast(Anchor.TopRight) && !element.RelativeSizeAxes.HasFlagFast(Axes.X))
+                    continue;
 
-                    // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
-                    if (element is LegacyHealthDisplay)
-                        continue;
+                // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
+                if (element is LegacyHealthDisplay)
+                    continue;
 
-                    var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;
-                    if (bottomRight.Y > lowestScreenSpace.Y)
-                        lowestScreenSpace = bottomRight;
-                }
-
-                topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestScreenSpace).Y;
-                bottomRightElements.Y = -Progress.Height;
+                var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;
+                if (bottomRight.Y > lowestScreenSpace.Y)
+                    lowestScreenSpace = bottomRight;
             }
+
+            topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestScreenSpace).Y;
+            bottomRightElements.Y = -Progress.Height;
         }
 
         private void updateVisibility()
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 2379fd4247..4d97b42e8e 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.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.Framework.Graphics;
-
 namespace osu.Game.Skinning
 {
     /// <summary>
@@ -20,6 +18,6 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Add the provided item to this target.
         /// </summary>
-        public void Add(Drawable drawable);
+        public void Add(ISkinnableComponent drawable);
     }
 }
diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index a0df610488..0d16775f51 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 namespace osu.Game.Skinning
 {
     /// <summary>
-    /// A container which is serialised and can encapsulate multiple skinnable elements into a single return type.
+    /// A container which is serialised and can encapsulate multiple skinnable elements into a single return type (for consumption via <see cref="ISkin.GetDrawableComponent"/>.
     /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
     /// </summary>
     public class SkinnableTargetWrapper : Container, ISkinSerialisable

From a4e052961770c3eb98408393ad198287ebcb0766 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:49:00 +0900
Subject: [PATCH 09922/10326] Replace polling logic with direct bindable
 reactions

---
 .../Compose/Components/BlueprintContainer.cs  | 23 +++++++++
 .../Components/EditorBlueprintContainer.cs    | 22 +--------
 .../Skinning/Editor/SkinBlueprintContainer.cs | 49 ++++++++++++++++---
 osu.Game/Skinning/Editor/SkinEditor.cs        | 15 +++++-
 4 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 361e98e0dd..edd1acbd6c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -3,9 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -24,6 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// Includes selection and manipulation support via a <see cref="Components.SelectionHandler{T}"/>.
     /// </summary>
     public abstract class BlueprintContainer<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
+        where T : class
     {
         protected DragBox DragBox { get; private set; }
 
@@ -39,6 +42,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }
 
+        protected readonly BindableList<T> SelectedItems = new BindableList<T>();
+
         protected BlueprintContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -47,6 +52,24 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
+            SelectedItems.CollectionChanged += (selectedObjects, args) =>
+            {
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (var o in args.NewItems)
+                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Select();
+
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (var o in args.OldItems)
+                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Deselect();
+
+                        break;
+                }
+            };
+
             SelectionHandler = CreateSelectionHandler();
             SelectionHandler.DeselectAll = deselectAll;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index db322faf65..31a191c80c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -2,10 +2,8 @@
 // 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;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
@@ -24,8 +22,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected readonly HitObjectComposer Composer;
 
-        private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
-
         protected EditorBlueprintContainer(HitObjectComposer composer)
         {
             Composer = composer;
@@ -34,23 +30,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            selectedHitObjects.BindTo(Beatmap.SelectedHitObjects);
-            selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
-            {
-                switch (args.Action)
-                {
-                    case NotifyCollectionChangedAction.Add:
-                        foreach (var o in args.NewItems)
-                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Select();
-                        break;
-
-                    case NotifyCollectionChangedAction.Remove:
-                        foreach (var o in args.OldItems)
-                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Deselect();
-
-                        break;
-                }
-            };
+            SelectedItems.BindTo(Beatmap.SelectedHitObjects);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index 45e541abf0..bc1ea02090 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -1,11 +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.Collections.Specialized;
 using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -18,23 +23,51 @@ namespace osu.Game.Skinning.Editor
             this.target = target;
         }
 
+        [BackgroundDependencyLoader(true)]
+        private void load(SkinEditor editor)
+        {
+            SelectedItems.BindTo(editor.SelectedComponents);
+        }
+
+        private readonly List<BindableList<ISkinnableComponent>> targetComponents = new List<BindableList<ISkinnableComponent>>();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            checkForComponents();
+            // track each target container on the current screen.
+            foreach (var targetContainer in target.ChildrenOfType<SkinnableElementTargetContainer>())
+            {
+                var bindableList = new BindableList<ISkinnableComponent> { BindTarget = targetContainer.Components };
+                bindableList.BindCollectionChanged(componentsChanged, true);
+
+                targetComponents.Add(bindableList);
+            }
         }
 
-        private void checkForComponents()
+        private void componentsChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            ISkinnableComponent[] skinnableComponents = target.ChildrenOfType<ISkinnableComponent>().ToArray();
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (var item in e.NewItems.Cast<ISkinnableComponent>())
+                        AddBlueprintFor(item);
+                    break;
 
-            foreach (var c in skinnableComponents)
-                AddBlueprintFor(c);
+                case NotifyCollectionChangedAction.Remove:
+                case NotifyCollectionChangedAction.Reset:
+                    foreach (var item in e.OldItems.Cast<ISkinnableComponent>())
+                        RemoveBlueprintFor(item);
+                    break;
 
-            // We'd hope to eventually be running this in a more sensible way, but this handles situations where new drawables become present (ie. during ongoing gameplay)
-            // or when drawables in the target are loaded asynchronously and may not be immediately available when this BlueprintContainer is loaded.
-            Scheduler.AddDelayed(checkForComponents, 1000);
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (var item in e.OldItems.Cast<ISkinnableComponent>())
+                        RemoveBlueprintFor(item);
+
+                    foreach (var item in e.NewItems.Cast<ISkinnableComponent>())
+                        AddBlueprintFor(item);
+                    break;
+            }
         }
 
         protected override SelectionHandler<ISkinnableComponent> CreateSelectionHandler() => new SkinSelectionHandler();
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 90b003153b..b098136eda 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -18,6 +18,7 @@ using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
+    [Cached(typeof(SkinEditor))]
     public class SkinEditor : FocusedOverlayContainer
     {
         public const double TRANSITION_DURATION = 500;
@@ -28,11 +29,15 @@ namespace osu.Game.Skinning.Editor
 
         protected override bool StartHidden => true;
 
+        public readonly BindableList<ISkinnableComponent> SelectedComponents = new BindableList<ISkinnableComponent>();
+
         [Resolved]
         private SkinManager skins { get; set; }
 
         private Bindable<Skin> currentSkin;
 
+        private SkinBlueprintContainer blueprintContainer;
+
         public SkinEditor(Drawable targetScreen)
         {
             this.targetScreen = targetScreen;
@@ -56,7 +61,7 @@ namespace osu.Game.Skinning.Editor
                         Origin = Anchor.TopCentre,
                         RelativeSizeAxes = Axes.X
                     },
-                    new SkinBlueprintContainer(targetScreen),
+                    blueprintContainer = new SkinBlueprintContainer(targetScreen),
                     new SkinComponentToolbox(600)
                     {
                         Anchor = Anchor.CentreLeft,
@@ -109,9 +114,15 @@ namespace osu.Game.Skinning.Editor
 
         private void placeComponent(Type type)
         {
-            Drawable instance = (Drawable)Activator.CreateInstance(type);
+            var instance = (Drawable)Activator.CreateInstance(type) as ISkinnableComponent;
+
+            if (instance == null)
+                throw new InvalidOperationException("Attempted to instantiate a component for placement which was not an {typeof(ISkinnableComponent)}.");
 
             getTarget(SkinnableTarget.MainHUDComponents)?.Add(instance);
+
+            SelectedComponents.Clear();
+            SelectedComponents.Add(instance);
         }
 
         private ISkinnableTarget getTarget(SkinnableTarget target)

From 1831f581aa15f14f4cd01bf73122dedc5a5d804b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 18:07:58 +0900
Subject: [PATCH 09923/10326] Add basic metadata display and remove outdated
 message about not saving

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 55 ++++++++++++++++----------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index b098136eda..0e243d1a02 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -36,7 +36,8 @@ namespace osu.Game.Skinning.Editor
 
         private Bindable<Skin> currentSkin;
 
-        private SkinBlueprintContainer blueprintContainer;
+        [Resolved]
+        private OsuColour colours { get; set; }
 
         public SkinEditor(Drawable targetScreen)
         {
@@ -46,7 +47,7 @@ namespace osu.Game.Skinning.Editor
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             InternalChild = new OsuContextMenuContainer
             {
@@ -61,7 +62,7 @@ namespace osu.Game.Skinning.Editor
                         Origin = Anchor.TopCentre,
                         RelativeSizeAxes = Axes.X
                     },
-                    blueprintContainer = new SkinBlueprintContainer(targetScreen),
+                    new SkinBlueprintContainer(targetScreen),
                     new SkinComponentToolbox(600)
                     {
                         Anchor = Anchor.CentreLeft,
@@ -103,13 +104,42 @@ namespace osu.Game.Skinning.Editor
                     },
                 }
             };
+        }
 
-            headerText.AddParagraph("Skin editor (preview)", cp => cp.Font = OsuFont.Default.With(size: 24));
-            headerText.AddParagraph("This is a preview of what is to come. Changes are lost on changing screens.", cp =>
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Show();
+
+            // as long as the skin editor is loaded, let's make sure we can modify the current skin.
+            currentSkin = skins.CurrentSkin.GetBoundCopy();
+
+            // schedule ensures this only happens when the skin editor is visible.
+            // also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
+            // probably something which will be factored out in a future database refactor so not too concerning for now.
+            currentSkin.BindValueChanged(skin => Scheduler.AddOnce(skinChanged), true);
+        }
+
+        private void skinChanged()
+        {
+            headerText.Clear();
+
+            headerText.AddParagraph("Skin editor", cp => cp.Font = OsuFont.Default.With(size: 24));
+            headerText.NewParagraph();
+            headerText.AddText("Currently editing ", cp =>
             {
                 cp.Font = OsuFont.Default.With(size: 12);
                 cp.Colour = colours.Yellow;
             });
+
+            headerText.AddText($"{currentSkin.Value.SkinInfo}", cp =>
+            {
+                cp.Font = OsuFont.Default.With(size: 12, weight: FontWeight.Bold);
+                cp.Colour = colours.Yellow;
+            });
+
+            skins.EnsureMutableSkin();
         }
 
         private void placeComponent(Type type)
@@ -130,21 +160,6 @@ namespace osu.Game.Skinning.Editor
             return targetScreen.ChildrenOfType<ISkinnableTarget>().FirstOrDefault(c => c.Target == target);
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Show();
-
-            // as long as the skin editor is loaded, let's make sure we can modify the current skin.
-            currentSkin = skins.CurrentSkin.GetBoundCopy();
-
-            // schedule ensures this only happens when the skin editor is visible.
-            // also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
-            // probably something which will be factored out in a future database refactor so not too concerning for now.
-            currentSkin.BindValueChanged(skin => Scheduler.AddOnce(skins.EnsureMutableSkin), true);
-        }
-
         private void revert()
         {
             SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();

From 6d587dc39229c8150e6f563ec5122b81115f5edc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 18:17:05 +0900
Subject: [PATCH 09924/10326] Adjust target size slightly to better align with
 the screen

---
 osu.Game/Skinning/Editor/SkinEditorOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index cc989bb459..cbed498a38 100644
--- a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Skinning.Editor
                 target.RelativePositionAxes = Axes.Both;
 
                 target.ScaleTo(VISIBLE_TARGET_SCALE, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
-                target.MoveToX(0.1f, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
+                target.MoveToX(0.095f, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
             }
             else
             {

From f55407f871a94a5846270f947b1326ecdb9de8bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 18:37:41 +0900
Subject: [PATCH 09925/10326] Show a message when attempting to customisse a
 screen which doesn't support it

---
 osu.Game/Screens/ScreenWhiteBox.cs            | 24 ++---
 .../Skinning/Editor/SkinBlueprintContainer.cs | 14 ++-
 osu.Game/Skinning/Editor/SkinEditor.cs        | 90 ++++++++++++-------
 3 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/osu.Game/Screens/ScreenWhiteBox.cs b/osu.Game/Screens/ScreenWhiteBox.cs
index 3d8fd5dad7..cf0c183766 100644
--- a/osu.Game/Screens/ScreenWhiteBox.cs
+++ b/osu.Game/Screens/ScreenWhiteBox.cs
@@ -87,9 +87,9 @@ namespace osu.Game.Screens
         private static Color4 getColourFor(object type)
         {
             int hash = type.GetHashCode();
-            byte r = (byte)Math.Clamp(((hash & 0xFF0000) >> 16) * 0.8f, 20, 255);
-            byte g = (byte)Math.Clamp(((hash & 0x00FF00) >> 8) * 0.8f, 20, 255);
-            byte b = (byte)Math.Clamp((hash & 0x0000FF) * 0.8f, 20, 255);
+            byte r = (byte)Math.Clamp(((hash & 0xFF0000) >> 16) * 2, 128, 255);
+            byte g = (byte)Math.Clamp(((hash & 0x00FF00) >> 8) * 2, 128, 255);
+            byte b = (byte)Math.Clamp((hash & 0x0000FF) * 2, 128, 255);
             return new Color4(r, g, b, 255);
         }
 
@@ -109,10 +109,10 @@ namespace osu.Game.Screens
 
             private readonly Container boxContainer;
 
-            public UnderConstructionMessage(string name)
+            public UnderConstructionMessage(string name, string description = "is not yet ready for use!")
             {
-                RelativeSizeAxes = Axes.Both;
-                Size = new Vector2(0.3f);
+                AutoSizeAxes = Axes.Both;
+
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
 
@@ -124,7 +124,7 @@ namespace osu.Game.Screens
                     {
                         CornerRadius = 20,
                         Masking = true,
-                        RelativeSizeAxes = Axes.Both,
+                        AutoSizeAxes = Axes.Both,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Children = new Drawable[]
@@ -133,15 +133,15 @@ namespace osu.Game.Screens
                             {
                                 RelativeSizeAxes = Axes.Both,
 
-                                Colour = colour,
-                                Alpha = 0.2f,
-                                Blending = BlendingParameters.Additive,
+                                Colour = colour.Darken(0.8f),
+                                Alpha = 0.8f,
                             },
                             TextContainer = new FillFlowContainer
                             {
                                 AutoSizeAxes = Axes.Both,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
+                                Padding = new MarginPadding(20),
                                 Direction = FillDirection.Vertical,
                                 Children = new Drawable[]
                                 {
@@ -157,14 +157,14 @@ namespace osu.Game.Screens
                                         Anchor = Anchor.TopCentre,
                                         Origin = Anchor.TopCentre,
                                         Text = name,
-                                        Colour = colour.Lighten(0.8f),
+                                        Colour = colour,
                                         Font = OsuFont.GetFont(size: 36),
                                     },
                                     new OsuSpriteText
                                     {
                                         Anchor = Anchor.TopCentre,
                                         Origin = Anchor.TopCentre,
-                                        Text = "is not yet ready for use!",
+                                        Text = description,
                                         Font = OsuFont.GetFont(size: 20),
                                     },
                                     new OsuSpriteText
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index bc1ea02090..ef189ed165 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -7,8 +7,10 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Screens;
 using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Play.HUD;
 
@@ -36,7 +38,17 @@ namespace osu.Game.Skinning.Editor
             base.LoadComplete();
 
             // track each target container on the current screen.
-            foreach (var targetContainer in target.ChildrenOfType<SkinnableElementTargetContainer>())
+            var targetContainers = target.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+
+            if (targetContainers.Length == 0)
+            {
+                var targetScreen = target.ChildrenOfType<Screen>().LastOrDefault()?.GetType().Name ?? "this screen";
+
+                AddInternal(new ScreenWhiteBox.UnderConstructionMessage(targetScreen, "doesn't support skin customisation just yet."));
+                return;
+            }
+
+            foreach (var targetContainer in targetContainers)
             {
                 var bindableList = new BindableList<ISkinnableComponent> { BindTarget = targetContainer.Components };
                 bindableList.BindCollectionChanged(componentsChanged, true);
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 0e243d1a02..08fc458b94 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -62,46 +62,68 @@ namespace osu.Game.Skinning.Editor
                         Origin = Anchor.TopCentre,
                         RelativeSizeAxes = Axes.X
                     },
-                    new SkinBlueprintContainer(targetScreen),
-                    new SkinComponentToolbox(600)
+                    new GridContainer
                     {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        RequestPlacement = placeComponent
-                    },
-                    new FillFlowContainer
-                    {
-                        Direction = FillDirection.Horizontal,
-                        AutoSizeAxes = Axes.Both,
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        Spacing = new Vector2(5),
-                        Padding = new MarginPadding
+                        RelativeSizeAxes = Axes.Both,
+                        ColumnDimensions = new[]
                         {
-                            Top = 10,
-                            Left = 10,
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension()
                         },
-                        Margin = new MarginPadding
+                        Content = new[]
                         {
-                            Right = 10,
-                            Bottom = 10,
-                        },
-                        Children = new Drawable[]
-                        {
-                            new TriangleButton
+                            new Drawable[]
                             {
-                                Text = "Save Changes",
-                                Width = 140,
-                                Action = save,
-                            },
-                            new DangerousTriangleButton
-                            {
-                                Text = "Revert to default",
-                                Width = 140,
-                                Action = revert,
-                            },
+                                new SkinComponentToolbox(600)
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    RequestPlacement = placeComponent
+                                },
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
+                                        new SkinBlueprintContainer(targetScreen),
+                                        new FillFlowContainer
+                                        {
+                                            Direction = FillDirection.Horizontal,
+                                            AutoSizeAxes = Axes.Both,
+                                            Anchor = Anchor.TopRight,
+                                            Origin = Anchor.TopRight,
+                                            Spacing = new Vector2(5),
+                                            Padding = new MarginPadding
+                                            {
+                                                Top = 10,
+                                                Left = 10,
+                                            },
+                                            Margin = new MarginPadding
+                                            {
+                                                Right = 10,
+                                                Bottom = 10,
+                                            },
+                                            Children = new Drawable[]
+                                            {
+                                                new TriangleButton
+                                                {
+                                                    Text = "Save Changes",
+                                                    Width = 140,
+                                                    Action = save,
+                                                },
+                                                new DangerousTriangleButton
+                                                {
+                                                    Text = "Revert to default",
+                                                    Width = 140,
+                                                    Action = revert,
+                                                },
+                                            }
+                                        },
+                                    }
+                                },
+                            }
                         }
-                    },
+                    }
                 }
             };
         }

From 4bb933e4b111439ac022ed82c713b0197845c469 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 18:55:45 +0900
Subject: [PATCH 09926/10326] Add missing base lookup call to `DefaultSkin`

---
 osu.Game/Skinning/DefaultSkin.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 1c063b6ef2..3de3dc7702 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Skinning
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
+            if (base.GetDrawableComponent(component) is Drawable c)
+                return c;
+
             switch (component)
             {
                 case SkinnableTargetComponent target:

From 1231c08a0791ec9b739303f29ce3bc2aa9a36906 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 18:58:26 +0900
Subject: [PATCH 09927/10326] Rename mismatching file

---
 .../{IImmutableSkinnableComponent.cs => ISkinSerialisable.cs}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Skinning/{IImmutableSkinnableComponent.cs => ISkinSerialisable.cs} (100%)

diff --git a/osu.Game/Skinning/IImmutableSkinnableComponent.cs b/osu.Game/Skinning/ISkinSerialisable.cs
similarity index 100%
rename from osu.Game/Skinning/IImmutableSkinnableComponent.cs
rename to osu.Game/Skinning/ISkinSerialisable.cs

From 811282a975ca48c91239599c0521dbe60a3811f8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 19:01:41 +0900
Subject: [PATCH 09928/10326] Add failing test

---
 .../Multiplayer/TestSceneMultiplayer.cs       | 93 +++++++++++++++++++
 .../Multiplayer/TestMultiplayerClient.cs      | 10 +-
 2 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 78bc51e47b..519d76fc93 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -1,9 +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 System.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Platform;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Resources;
+using osu.Game.Users;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -11,7 +26,85 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         private TestMultiplayer multiplayerScreen;
 
+        private BeatmapManager beatmaps;
+        private RulesetStore rulesets;
+        private BeatmapSetInfo importedSet;
+
+        private TestMultiplayerClient client => multiplayerScreen.Client;
+        private Room room => client.APIRoom;
+
         public TestSceneMultiplayer()
+        {
+            loadMultiplayer();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, AudioManager audio)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
+
+            importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+        }
+
+        [Test]
+        public void TestMatchStartWhileSpectatingWithNoBeatmap()
+        {
+            loadMultiplayer();
+
+            AddStep("open room", () =>
+            {
+                multiplayerScreen.OpenNewRoom(new Room
+                {
+                    Name = { Value = "Test Room" },
+                    Playlist =
+                    {
+                        new PlaylistItem
+                        {
+                            Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        }
+                    }
+                });
+            });
+
+            AddStep("create room", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("wait for join", () => client.Room != null);
+
+            AddStep("join other user (ready, host)", () =>
+            {
+                client.AddUser(new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Other" });
+                client.TransferHost(MultiplayerTestScene.PLAYER_1_ID);
+                client.ChangeUserState(MultiplayerTestScene.PLAYER_1_ID, MultiplayerUserState.Ready);
+            });
+
+            AddStep("change playlist", () =>
+            {
+                room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                });
+            });
+
+            AddStep("click spectate button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerSpectateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("start match externally", () => client.StartMatch());
+
+            AddAssert("screen not changed", () => multiplayerScreen.IsCurrentScreen());
+        }
+
+        private void loadMultiplayer()
         {
             AddStep("show", () =>
             {
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index de77a15da0..167cf705a7 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public override IBindable<bool> IsConnected => isConnected;
         private readonly Bindable<bool> isConnected = new Bindable<bool>(true);
 
+        public Room? APIRoom { get; private set; }
+
         public Action<MultiplayerRoom>? RoomSetupAction;
 
         [Resolved]
@@ -138,10 +140,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             RoomSetupAction?.Invoke(room);
             RoomSetupAction = null;
 
+            APIRoom = apiRoom;
+
             return Task.FromResult(room);
         }
 
-        protected override Task LeaveRoomInternal() => Task.CompletedTask;
+        protected override Task LeaveRoomInternal()
+        {
+            APIRoom = null;
+            return Task.CompletedTask;
+        }
 
         public override Task TransferHost(int userId) => ((IMultiplayerClient)this).HostChanged(userId);
 

From 7fe8737d9437073a6c6137483d6c9be48cf3c9c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 19:21:44 +0900
Subject: [PATCH 09929/10326] Add failing tests

---
 .../Multiplayer/TestSceneMultiplayer.cs       | 92 ++++++++++++++-----
 1 file changed, 67 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 519d76fc93..a81927bec2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -49,34 +49,23 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         [Test]
-        public void TestMatchStartWhileSpectatingWithNoBeatmap()
+        public void TestLocalPlayDoesNotStartWhileSpectatingWithNoBeatmap()
         {
             loadMultiplayer();
 
-            AddStep("open room", () =>
+            createRoom(new Room
             {
-                multiplayerScreen.OpenNewRoom(new Room
+                Name = { Value = "Test Room" },
+                Playlist =
                 {
-                    Name = { Value = "Test Room" },
-                    Playlist =
+                    new PlaylistItem
                     {
-                        new PlaylistItem
-                        {
-                            Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
-                        }
+                        Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.RulesetID == 0)).BeatmapInfo },
+                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
                     }
-                });
+                }
             });
 
-            AddStep("create room", () =>
-            {
-                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
-
-            AddUntilStep("wait for join", () => client.Room != null);
-
             AddStep("join other user (ready, host)", () =>
             {
                 client.AddUser(new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Other" });
@@ -84,13 +73,44 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 client.ChangeUserState(MultiplayerTestScene.PLAYER_1_ID, MultiplayerUserState.Ready);
             });
 
-            AddStep("change playlist", () =>
+            AddStep("delete beatmap", () => beatmaps.Delete(importedSet));
+
+            AddStep("click spectate button", () =>
             {
-                room.Playlist.Add(new PlaylistItem
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerSpectateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("start match externally", () => client.StartMatch());
+
+            AddAssert("play not started", () => multiplayerScreen.IsCurrentScreen());
+        }
+
+        [Test]
+        public void TestLocalPlayStartsWhileSpectatingWhenBeatmapBecomesAvailable()
+        {
+            loadMultiplayer();
+
+            createRoom(new Room
+            {
+                Name = { Value = "Test Room" },
+                Playlist =
                 {
-                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
-                });
+                    new PlaylistItem
+                    {
+                        Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.RulesetID == 0)).BeatmapInfo },
+                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                    }
+                }
+            });
+
+            AddStep("delete beatmap", () => beatmaps.Delete(importedSet));
+
+            AddStep("join other user (ready, host)", () =>
+            {
+                client.AddUser(new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Other" });
+                client.TransferHost(MultiplayerTestScene.PLAYER_1_ID);
+                client.ChangeUserState(MultiplayerTestScene.PLAYER_1_ID, MultiplayerUserState.Ready);
             });
 
             AddStep("click spectate button", () =>
@@ -101,7 +121,29 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("start match externally", () => client.StartMatch());
 
-            AddAssert("screen not changed", () => multiplayerScreen.IsCurrentScreen());
+            AddStep("restore beatmap", () =>
+            {
+                beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
+                importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+            });
+
+            AddUntilStep("play started", () => !multiplayerScreen.IsCurrentScreen());
+        }
+
+        private void createRoom(Room room)
+        {
+            AddStep("open room", () =>
+            {
+                multiplayerScreen.OpenNewRoom(room);
+            });
+
+            AddStep("create room", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("wait for join", () => client.Room != null);
         }
 
         private void loadMultiplayer()

From 9ad1e5067e0494730446a34bc01e0222010e438a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 19:22:09 +0900
Subject: [PATCH 09930/10326] Fix spectate being entered while not having the
 beatmap

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index ab22d40181..fa18b792c3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -14,6 +14,7 @@ using osu.Framework.Screens;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Online;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
@@ -354,10 +355,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             client.ChangeBeatmapAvailability(availability.NewValue);
 
-            // while this flow is handled server-side, this covers the edge case of the local user being in a ready state and then deleting the current beatmap.
-            if (availability.NewValue != Online.Rooms.BeatmapAvailability.LocallyAvailable()
-                && client.LocalUser?.State == MultiplayerUserState.Ready)
-                client.ChangeState(MultiplayerUserState.Idle);
+            if (availability.NewValue.State != DownloadState.LocallyAvailable)
+            {
+                // while this flow is handled server-side, this covers the edge case of the local user being in a ready state and then deleting the current beatmap.
+                if (client.LocalUser?.State == MultiplayerUserState.Ready)
+                    client.ChangeState(MultiplayerUserState.Idle);
+            }
+            else
+            {
+                if (client.LocalUser?.State == MultiplayerUserState.Spectating && (client.Room?.State == MultiplayerRoomState.WaitingForLoad || client.Room?.State == MultiplayerRoomState.Playing))
+                    onLoadRequested();
+            }
         }
 
         private void onReadyClick()
@@ -413,6 +421,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onLoadRequested()
         {
+            if (BeatmapAvailability.Value.State != DownloadState.LocallyAvailable)
+                return;
+
             // In the case of spectating, IMultiplayerClient.LoadRequested can be fired while the game is still spectating a previous session.
             // For now, we want to game to switch to the new game so need to request exiting from the play screen.
             if (!ParentScreen.IsCurrentScreen())

From bc4213eea1fd86a2184d1c0ba8d874025e9c3ce6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 19:26:58 +0900
Subject: [PATCH 09931/10326] Add test for changing back to idle on deletion

---
 .../Multiplayer/TestSceneMultiplayer.cs       | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index a81927bec2..f2331542c6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
-using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 using osuTK.Input;
@@ -43,9 +42,37 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
-            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
+        }
 
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
             importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+        });
+
+        [Test]
+        public void TestUserSetToIdleWhenBeatmapDeleted()
+        {
+            loadMultiplayer();
+
+            createRoom(new Room
+            {
+                Name = { Value = "Test Room" },
+                Playlist =
+                {
+                    new PlaylistItem
+                    {
+                        Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.RulesetID == 0)).BeatmapInfo },
+                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                    }
+                }
+            });
+
+            AddStep("set user ready", () => client.ChangeState(MultiplayerUserState.Ready));
+            AddStep("delete beatmap", () => beatmaps.Delete(importedSet));
+
+            AddAssert("user state is idle", () => client.LocalUser?.State == MultiplayerUserState.Idle);
         }
 
         [Test]

From f5bc389998283eca1a7e4d0363945f1800840aa7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 19:31:32 +0900
Subject: [PATCH 09932/10326] Fix flaky tests

---
 .../Visual/Multiplayer/TestSceneMultiplayer.cs    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index f2331542c6..69fbd56490 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -14,6 +15,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
@@ -56,7 +58,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             loadMultiplayer();
 
-            createRoom(new Room
+            createRoom(() => new Room
             {
                 Name = { Value = "Test Room" },
                 Playlist =
@@ -80,7 +82,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             loadMultiplayer();
 
-            createRoom(new Room
+            createRoom(() => new Room
             {
                 Name = { Value = "Test Room" },
                 Playlist =
@@ -118,7 +120,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             loadMultiplayer();
 
-            createRoom(new Room
+            createRoom(() => new Room
             {
                 Name = { Value = "Test Room" },
                 Playlist =
@@ -157,13 +159,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("play started", () => !multiplayerScreen.IsCurrentScreen());
         }
 
-        private void createRoom(Room room)
+        private void createRoom(Func<Room> room)
         {
             AddStep("open room", () =>
             {
-                multiplayerScreen.OpenNewRoom(room);
+                multiplayerScreen.OpenNewRoom(room());
             });
 
+            AddUntilStep("wait for room open", () => this.ChildrenOfType<MultiplayerMatchSubScreen>().FirstOrDefault()?.IsLoaded == true);
+            AddWaitStep("wait for transition", 2);
+
             AddStep("create room", () =>
             {
                 InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());

From 69f01e82db6cf14052f6fe05d063619042449b86 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 14:42:56 +0300
Subject: [PATCH 09933/10326] Add bottom padding for NewsSideBar content

---
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 9a2fdf2d97..4444cc79b8 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.News.Sidebar
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding
                     {
-                        Top = 20,
+                        Vertical = 20,
                         Left = 50,
                         Right = 30
                     },

From 711e7ba860cd0e3e2113fa09ed53b79c6e6a07e3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 14:43:23 +0300
Subject: [PATCH 09934/10326] Apply suggestions for MonthPanel

---
 osu.Game/Overlays/News/Sidebar/MonthPanel.cs | 37 ++++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
index 5f2acd63d1..4d7a5f18aa 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
@@ -19,6 +19,9 @@ namespace osu.Game.Overlays.News.Sidebar
 {
     public class MonthPanel : CompositeDrawable
     {
+        private const int header_height = 15;
+        private const int animation_duration = 250;
+
         public readonly BindableBool IsOpen = new BindableBool();
 
         private readonly FillFlowContainer postsFlow;
@@ -26,8 +29,7 @@ namespace osu.Game.Overlays.News.Sidebar
         public MonthPanel(List<APINewsPost> posts)
         {
             Width = 160;
-            AutoSizeDuration = 250;
-            AutoSizeEasing = Easing.OutQuint;
+            Masking = true;
             InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -63,33 +65,46 @@ namespace osu.Game.Overlays.News.Sidebar
                 if (open.NewValue)
                 {
                     AutoSizeAxes = Axes.Y;
-                    postsFlow.FadeIn(250, Easing.OutQuint);
+                    postsFlow.FadeIn(animation_duration, Easing.OutQuint);
                 }
                 else
                 {
                     AutoSizeAxes = Axes.None;
-                    this.ResizeHeightTo(15, 250, Easing.OutQuint);
+                    this.ResizeHeightTo(header_height, animation_duration, Easing.OutQuint);
 
-                    postsFlow.FadeOut(250, Easing.OutQuint);
+                    postsFlow.FadeOut(animation_duration, Easing.OutQuint);
                 }
             }, true);
 
             // First state change should be instant.
-            FinishTransforms();
-            postsFlow.FinishTransforms();
+            FinishTransforms(true);
         }
 
-        private class DropdownButton : OsuHoverContainer
+        private bool shouldUpdateAutosize = true;
+
+        // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutosizeDuration.
+        protected override void UpdateAfterAutoSize()
+        {
+            base.UpdateAfterAutoSize();
+
+            if (shouldUpdateAutosize)
+            {
+                AutoSizeDuration = animation_duration;
+                AutoSizeEasing = Easing.OutQuint;
+
+                shouldUpdateAutosize = false;
+            }
+        }
+
+        private class DropdownButton : OsuClickableContainer
         {
             public readonly BindableBool IsOpen = new BindableBool();
 
-            protected override IEnumerable<Drawable> EffectTargets => null;
-
             private readonly SpriteIcon icon;
 
             public DropdownButton(DateTimeOffset date)
             {
-                Size = new Vector2(160, 15);
+                Size = new Vector2(160, header_height);
                 Action = IsOpen.Toggle;
                 Children = new Drawable[]
                 {

From e736240a064020b4f7b767acfb278ca15d02f3c7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 15:12:04 +0300
Subject: [PATCH 09935/10326] Use lookup instead of dictionary to distribute
 posts

---
 osu.Game/Overlays/News/Sidebar/MonthPanel.cs  |  4 +--
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 29 +++++--------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
index 4d7a5f18aa..5460ccce16 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private readonly FillFlowContainer postsFlow;
 
-        public MonthPanel(List<APINewsPost> posts)
+        public MonthPanel(IEnumerable<APINewsPost> posts)
         {
             Width = 160;
             Masking = true;
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
-                    new DropdownButton(posts[0].PublishedAt)
+                    new DropdownButton(posts.ElementAt(0).PublishedAt)
                     {
                         IsOpen = { BindTarget = IsOpen }
                     },
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 4444cc79b8..4d2d3949bd 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Graphics.Shapes;
 using osuTK;
-using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -81,30 +81,17 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 if (metadata.NewValue != null)
                 {
-                    var dict = new Dictionary<int, List<APINewsPost>>();
+                    var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
 
-                    foreach (var p in metadata.NewValue.NewsPosts)
+                    var keys = lookup.Select(kvp => kvp.Key);
+                    var sortedKeys = keys.OrderByDescending(k => k).ToList();
+
+                    for (int i = 0; i < sortedKeys.Count; i++)
                     {
-                        var month = p.PublishedAt.Month;
-
-                        if (dict.ContainsKey(month))
-                            dict[month].Add(p);
-                        else
+                        monthsFlow.Add(new MonthPanel(lookup[sortedKeys[i]])
                         {
-                            dict.Add(month, new List<APINewsPost>(new[] { p }));
-                        }
-                    }
-
-                    bool isFirst = true;
-
-                    foreach (var keyValuePair in dict)
-                    {
-                        monthsFlow.Add(new MonthPanel(keyValuePair.Value)
-                        {
-                            IsOpen = { Value = isFirst }
+                            IsOpen = { Value = i == 0 }
                         });
-
-                        isFirst = false;
                     }
                 }
             }, true);

From 9603712aa1a21b930179533f788e36448c9ec8a1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 15:33:27 +0300
Subject: [PATCH 09936/10326] Cache metadata in NewsSideBar

---
 .../Visual/Online/TestSceneNewsYearsPanel.cs  | 32 ++++++++++++++-----
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 13 ++------
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs  | 29 +++++++----------
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
index 446cd06eea..031a98dd8b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
@@ -5,6 +5,9 @@ using osu.Framework.Graphics;
 using osu.Game.Overlays.News.Sidebar;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
+using osu.Framework.Bindables;
+using osu.Game.Online.API.Requests.Responses;
+using NUnit.Framework;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -13,22 +16,35 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private readonly YearsPanel panel;
+        [Cached]
+        private readonly Bindable<APINewsSidebar> metadataBindable = new Bindable<APINewsSidebar>();
 
-        public TestSceneNewsYearsPanel()
+        private YearsPanel panel;
+
+        [SetUp]
+        public void SetUp()
         {
-            Add(panel = new YearsPanel
+            Child = panel = new YearsPanel
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre
-            });
+            };
         }
 
-        protected override void LoadComplete()
+        [Test]
+        public void TestMetadata()
         {
-            base.LoadComplete();
-            AddStep("Load years", () => panel.Years = new[] { 1000, 2000, 3000, 4000 });
-            AddStep("Load different years", () => panel.Years = new[] { 1001, 2001, 3001, 4001, 5001, 6001, 7001, 8001 });
+            AddStep("Change metadata to null", () => metadataBindable.Value = null);
+            AddAssert("Panel is hidden", () => panel.IsPresent == false);
+            AddStep("Change metadata", () => metadataBindable.Value = metadata);
+            AddAssert("Panel is visible", () => panel.IsPresent == true);
+            AddStep("Change metadata to null", () => metadataBindable.Value = null);
+            AddAssert("Panel is hidden", () => panel.IsPresent == false);
         }
+
+        private static readonly APINewsSidebar metadata = new APINewsSidebar
+        {
+            Years = new[] { 1001, 2001, 3001, 4001, 5001, 6001, 7001, 8001, 9001 }
+        };
     }
 }
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 4d2d3949bd..75726c5fed 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -14,9 +14,9 @@ namespace osu.Game.Overlays.News.Sidebar
 {
     public class NewsSideBar : CompositeDrawable
     {
+        [Cached]
         public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
 
-        private YearsPanel yearsPanel;
         private FillFlowContainer<MonthPanel> monthsFlow;
 
         [BackgroundDependencyLoader]
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.News.Sidebar
                         Spacing = new Vector2(0, 20),
                         Children = new Drawable[]
                         {
-                            yearsPanel = new YearsPanel(),
+                            new YearsPanel(),
                             monthsFlow = new FillFlowContainer<MonthPanel>
                             {
                                 AutoSizeAxes = Axes.Both,
@@ -70,15 +70,6 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 monthsFlow.Clear();
 
-                if (metadata.NewValue == null)
-                {
-                    yearsPanel.Hide();
-                    return;
-                }
-
-                yearsPanel.Years = metadata.NewValue.Years;
-                yearsPanel.Show();
-
                 if (metadata.NewValue != null)
                 {
                     var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 046e1804bd..23dd8d8a5e 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -12,28 +12,21 @@ using osu.Game.Graphics.Sprites;
 using System.Collections.Generic;
 using osu.Game.Graphics;
 using osu.Framework.Bindables;
-using System.Collections.Specialized;
+using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
     public class YearsPanel : CompositeDrawable
     {
-        public int[] Years
-        {
-            set
-            {
-                years.Clear();
-                years.AddRange(value);
-            }
-        }
-
-        private readonly BindableList<int> years = new BindableList<int>();
+        private readonly Bindable<APINewsSidebar> metadata = new Bindable<APINewsSidebar>();
 
         private FillFlowContainer<YearButton> flow;
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider, Bindable<APINewsSidebar> metadata)
         {
+            this.metadata.BindTo(metadata);
+
             Width = 160;
             AutoSizeAxes = Axes.Y;
             Masking = true;
@@ -64,14 +57,16 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             base.LoadComplete();
 
-            years.BindCollectionChanged((u, v) =>
+            metadata.BindValueChanged(m =>
             {
-                switch (v.Action)
+                if (m.NewValue == null)
                 {
-                    case NotifyCollectionChangedAction.Add:
-                        flow.Children = years.Select(y => new YearButton(y)).ToArray();
-                        break;
+                    Hide();
+                    return;
                 }
+
+                flow.Children = m.NewValue.Years.Select(y => new YearButton(y)).ToArray();
+                Show();
             }, true);
         }
 

From 0a9c3c9413e89efaf183793fc781e3bcc7f4a5bc Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 15:39:50 +0300
Subject: [PATCH 09937/10326] Move metadata change logic to it's own method

---
 .../Visual/Online/TestSceneNewsYearsPanel.cs  |  2 +-
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 43 +++++++++++--------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
index 031a98dd8b..014a9ac7ed 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [Test]
-        public void TestMetadata()
+        public void TestVisibility()
         {
             AddStep("Change metadata to null", () => metadataBindable.Value = null);
             AddAssert("Panel is hidden", () => panel.IsPresent == false);
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 75726c5fed..d90b73aa82 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -66,26 +66,35 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             base.LoadComplete();
 
-            Metadata.BindValueChanged(metadata =>
+            Metadata.BindValueChanged(onMetadataChanged, true);
+        }
+
+        private void onMetadataChanged(ValueChangedEvent<APINewsSidebar> metadata)
+        {
+            monthsFlow.Clear();
+
+            if (metadata.NewValue == null)
+                return;
+
+            var allPosts = metadata.NewValue.NewsPosts;
+
+            if (!allPosts?.Any() ?? false)
+                return;
+
+            var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
+
+            var keys = lookup.Select(kvp => kvp.Key);
+            var sortedKeys = keys.OrderByDescending(k => k).ToList();
+
+            for (int i = 0; i < sortedKeys.Count; i++)
             {
-                monthsFlow.Clear();
+                var posts = lookup[sortedKeys[i]];
 
-                if (metadata.NewValue != null)
+                monthsFlow.Add(new MonthPanel(posts)
                 {
-                    var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
-
-                    var keys = lookup.Select(kvp => kvp.Key);
-                    var sortedKeys = keys.OrderByDescending(k => k).ToList();
-
-                    for (int i = 0; i < sortedKeys.Count; i++)
-                    {
-                        monthsFlow.Add(new MonthPanel(lookup[sortedKeys[i]])
-                        {
-                            IsOpen = { Value = i == 0 }
-                        });
-                    }
-                }
-            }, true);
+                    IsOpen = { Value = i == 0 }
+                });
+            }
         }
     }
 }

From 705aad262aa8c2e4ea798a79306d2df820693a61 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 15:42:40 +0300
Subject: [PATCH 09938/10326] Rename MonthPanel to MonthDropdown

---
 ...SceneNewsMonthPanel.cs => TestSceneNewsMonthDropdown.cs} | 6 +++---
 .../News/Sidebar/{MonthPanel.cs => MonthDropdown.cs}        | 4 ++--
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs               | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game.Tests/Visual/Online/{TestSceneNewsMonthPanel.cs => TestSceneNewsMonthDropdown.cs} (94%)
 rename osu.Game/Overlays/News/Sidebar/{MonthPanel.cs => MonthDropdown.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
similarity index 94%
rename from osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
rename to osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
index ee7fb8b407..c51e299f78 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
@@ -14,7 +14,7 @@ using osu.Game.Overlays.News.Sidebar;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneNewsMonthPanel : OsuTestScene
+    public class TestSceneNewsMonthDropdown : OsuTestScene
     {
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Online
                         RelativeSizeAxes = Axes.Both,
                         Colour = colourProvider.Background2,
                     },
-                    new MonthPanel(posts),
+                    new MonthDropdown(posts),
                 }
             });
         }
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Visual.Online
                         RelativeSizeAxes = Axes.Both,
                         Colour = colourProvider.Background2,
                     },
-                    new MonthPanel(posts)
+                    new MonthDropdown(posts)
                     {
                         IsOpen = { Value = true }
                     },
diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
similarity index 97%
rename from osu.Game/Overlays/News/Sidebar/MonthPanel.cs
rename to osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index 5460ccce16..87a72a3eaf 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -17,7 +17,7 @@ using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
-    public class MonthPanel : CompositeDrawable
+    public class MonthDropdown : CompositeDrawable
     {
         private const int header_height = 15;
         private const int animation_duration = 250;
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private readonly FillFlowContainer postsFlow;
 
-        public MonthPanel(IEnumerable<APINewsPost> posts)
+        public MonthDropdown(IEnumerable<APINewsPost> posts)
         {
             Width = 160;
             Masking = true;
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index d90b73aa82..1518d61d59 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.News.Sidebar
         [Cached]
         public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
 
-        private FillFlowContainer<MonthPanel> monthsFlow;
+        private FillFlowContainer<MonthDropdown> monthsFlow;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.News.Sidebar
                         Children = new Drawable[]
                         {
                             new YearsPanel(),
-                            monthsFlow = new FillFlowContainer<MonthPanel>
+                            monthsFlow = new FillFlowContainer<MonthDropdown>
                             {
                                 AutoSizeAxes = Axes.Both,
                                 Direction = FillDirection.Vertical,
@@ -90,7 +90,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 var posts = lookup[sortedKeys[i]];
 
-                monthsFlow.Add(new MonthPanel(posts)
+                monthsFlow.Add(new MonthDropdown(posts)
                 {
                     IsOpen = { Value = i == 0 }
                 });

From 01f5c77dac4b5705e78ba6ec10b2d864ea92073f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 15:56:50 +0300
Subject: [PATCH 09939/10326] Add better comments explaining empty actions

---
 osu.Game/Overlays/News/Sidebar/MonthDropdown.cs | 2 +-
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index 87a72a3eaf..ff50bfe4c2 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 IdleColour = colourProvider.Light2;
                 HoverColour = colourProvider.Light1;
-                Action = () => { }; // TODO
+                Action = () => { };  // Avoid button being disabled since there's no proper action assigned.
             }
         }
     }
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 23dd8d8a5e..c06a8424f6 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 IdleColour = colourProvider.Light2;
                 HoverColour = colourProvider.Light1;
-                Action = () => { }; // TODO
+                Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
     }

From 208224cc0deb0ae2d79c155f04073577332f322f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 16:08:09 +0300
Subject: [PATCH 09940/10326] CI fixes

---
 osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs | 6 +++---
 osu.Game/Overlays/News/Sidebar/MonthDropdown.cs         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
index 014a9ac7ed..39bb97fe98 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
@@ -35,11 +35,11 @@ namespace osu.Game.Tests.Visual.Online
         public void TestVisibility()
         {
             AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddAssert("Panel is hidden", () => panel.IsPresent == false);
+            AddAssert("Panel is hidden", () => !panel.IsPresent);
             AddStep("Change metadata", () => metadataBindable.Value = metadata);
-            AddAssert("Panel is visible", () => panel.IsPresent == true);
+            AddAssert("Panel is visible", () => panel.IsPresent);
             AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddAssert("Panel is hidden", () => panel.IsPresent == false);
+            AddAssert("Panel is hidden", () => !panel.IsPresent);
         }
 
         private static readonly APINewsSidebar metadata = new APINewsSidebar
diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index ff50bfe4c2..35092acdc1 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 IdleColour = colourProvider.Light2;
                 HoverColour = colourProvider.Light1;
-                Action = () => { };  // Avoid button being disabled since there's no proper action assigned.
+                Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
     }

From 1c0b0996cf43249e4127238f39965133d65c9d4f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 16:42:18 +0300
Subject: [PATCH 09941/10326] Rename DropdownButton to DropdownHeader

---
 osu.Game/Overlays/News/Sidebar/MonthDropdown.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index 35092acdc1..cc06f48544 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
-                    new DropdownButton(posts.ElementAt(0).PublishedAt)
+                    new DropdownHeader(posts.ElementAt(0).PublishedAt)
                     {
                         IsOpen = { BindTarget = IsOpen }
                     },
@@ -96,15 +96,16 @@ namespace osu.Game.Overlays.News.Sidebar
             }
         }
 
-        private class DropdownButton : OsuClickableContainer
+        private class DropdownHeader : OsuClickableContainer
         {
             public readonly BindableBool IsOpen = new BindableBool();
 
             private readonly SpriteIcon icon;
 
-            public DropdownButton(DateTimeOffset date)
+            public DropdownHeader(DateTimeOffset date)
             {
-                Size = new Vector2(160, header_height);
+                RelativeSizeAxes = Axes.X;
+                Height = header_height;
                 Action = IsOpen.Toggle;
                 Children = new Drawable[]
                 {

From c2ba16f977ba8e3fb04d72f56bb81cd647def6d2 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 16:51:59 +0300
Subject: [PATCH 09942/10326] Use relative sizing for MonthDropdown

---
 .../Online/TestSceneNewsMonthDropdown.cs      | 55 ++++++++-----------
 .../Overlays/News/Sidebar/MonthDropdown.cs    |  2 +-
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs |  8 +--
 3 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
index c51e299f78..f03b7d3f58 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
@@ -22,46 +22,35 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void CreateClosedMonthPanel()
         {
-            AddStep("Create", () => Child = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.TopCentre,
-                AutoSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colourProvider.Background2,
-                    },
-                    new MonthDropdown(posts),
-                }
-            });
+            create(false);
         }
 
         [Test]
         public void CreateOpenMonthPanel()
         {
-            AddStep("Create", () => Child = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.TopCentre,
-                AutoSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colourProvider.Background2,
-                    },
-                    new MonthDropdown(posts)
-                    {
-                        IsOpen = { Value = true }
-                    },
-                }
-            });
+            create(true);
         }
 
+        private void create(bool isOpen) => AddStep("Create", () => Child = new Container
+        {
+            Anchor = Anchor.Centre,
+            Origin = Anchor.TopCentre,
+            AutoSizeAxes = Axes.Y,
+            Width = 160,
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background2,
+                },
+                new MonthDropdown(posts)
+                {
+                    IsOpen = { Value = isOpen }
+                }
+            }
+        });
+
         private static List<APINewsPost> posts => new List<APINewsPost>
         {
             new APINewsPost
diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index cc06f48544..11c0ce863f 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         public MonthDropdown(IEnumerable<APINewsPost> posts)
         {
-            Width = 160;
+            RelativeSizeAxes = Axes.X;
             Masking = true;
             InternalChild = new FillFlowContainer
             {
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 1518d61d59..7de7e4dd71 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -42,17 +42,17 @@ namespace osu.Game.Overlays.News.Sidebar
                     },
                     Child = new FillFlowContainer
                     {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
                         Direction = FillDirection.Vertical,
-                        AutoSizeAxes = Axes.Both,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
                         Spacing = new Vector2(0, 20),
                         Children = new Drawable[]
                         {
                             new YearsPanel(),
                             monthsFlow = new FillFlowContainer<MonthDropdown>
                             {
-                                AutoSizeAxes = Axes.Both,
+                                AutoSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.X,
                                 Direction = FillDirection.Vertical,
                                 Spacing = new Vector2(0, 10)
                             }

From b79a0237a3b57104df4dfee944ad1d2033af49ce Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 16:54:19 +0300
Subject: [PATCH 09943/10326] Fix TestSceneNewsYearsPanel error

---
 .../Visual/Online/TestSceneNewsYearsPanel.cs    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
index 39bb97fe98..3199b83a7d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
@@ -22,24 +22,21 @@ namespace osu.Game.Tests.Visual.Online
         private YearsPanel panel;
 
         [SetUp]
-        public void SetUp()
+        public void SetUp() => Schedule(() => Child = panel = new YearsPanel
         {
-            Child = panel = new YearsPanel
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre
-            };
-        }
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre
+        });
 
         [Test]
         public void TestVisibility()
         {
             AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddAssert("Panel is hidden", () => !panel.IsPresent);
+            AddUntilStep("Panel is hidden", () => panel?.Alpha == 0);
             AddStep("Change metadata", () => metadataBindable.Value = metadata);
-            AddAssert("Panel is visible", () => panel.IsPresent);
+            AddUntilStep("Panel is visible", () => panel?.Alpha == 1);
             AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddAssert("Panel is hidden", () => !panel.IsPresent);
+            AddUntilStep("Panel is hidden", () => panel?.Alpha == 0);
         }
 
         private static readonly APINewsSidebar metadata = new APINewsSidebar

From 048677846bfd5cb7ef8a8e186b9821e03ebca5d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 12:21:31 +0900
Subject: [PATCH 09944/10326] Change `HealthDisplay` to be a
 `CompositeDrawable`

---
 osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs | 6 ++++--
 osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs       | 2 +-
 osu.Game/Screens/Play/HUD/FailingLayer.cs               | 2 +-
 osu.Game/Screens/Play/HUD/HealthDisplay.cs              | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index fb4c9d713a..c335f7c99e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.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.Linq;
 using NUnit.Framework;
 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.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
@@ -50,9 +52,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
-            AddUntilStep("layer fade is visible", () => layer.Child.Alpha > 0.1f);
+            AddUntilStep("layer fade is visible", () => layer.ChildrenOfType<Container>().First().Alpha > 0.1f);
             AddStep("set health to 1", () => layer.Current.Value = 1f);
-            AddUntilStep("layer fade is invisible", () => !layer.Child.IsPresent);
+            AddUntilStep("layer fade is invisible", () => !layer.ChildrenOfType<Container>().First().IsPresent);
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index 37bd289aee..241777244b 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Play.HUD
             RelativeSizeAxes = Axes.X;
             Margin = new MarginPadding { Top = 20 };
 
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new Box
                 {
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index e071337f34..424ee55766 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Play.HUD
         public FailingLayer()
         {
             RelativeSizeAxes = Axes.Both;
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 boxes = new Container
                 {
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 6c2571cc28..b970ecd1c7 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.HUD
     /// A container for components displaying the current player health.
     /// Gets bound automatically to the <see cref="Rulesets.Scoring.HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy.
     /// </summary>
-    public abstract class HealthDisplay : Container
+    public abstract class HealthDisplay : CompositeDrawable
     {
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; }

From 8e226319e2603b0fc8aae7c645c6709fcef19f85 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 15:40:33 +0900
Subject: [PATCH 09945/10326] Remove downwards dependency from `HUDOverlay` to
 `HealthDisplay`

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 13 +++++++++++--
 osu.Game/Screens/Play/HUDOverlay.cs        |  4 +---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 6c2571cc28..e0ddde026b 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
@@ -16,6 +17,8 @@ namespace osu.Game.Screens.Play.HUD
     /// </summary>
     public abstract class HealthDisplay : Container
     {
+        private Bindable<bool> showHealthbar;
+
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; }
 
@@ -29,12 +32,18 @@ namespace osu.Game.Screens.Play.HUD
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [BackgroundDependencyLoader(true)]
+        private void load(HUDOverlay hud)
         {
             Current.BindTo(HealthProcessor.Health);
 
             HealthProcessor.NewJudgement += onNewJudgement;
+
+            if (hud != null)
+            {
+                showHealthbar = hud.ShowHealthbar.GetBoundCopy();
+                showHealthbar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
+            }
         }
 
         private void onNewJudgement(JudgementResult judgement)
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 6ddaa338cc..c9b80be3dc 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Screens.Play
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
         public readonly SkinnableAccuracyCounter AccuracyCounter;
-        public readonly SkinnableHealthDisplay HealthDisplay;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
@@ -96,7 +95,7 @@ namespace osu.Game.Screens.Play
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        HealthDisplay = CreateHealthDisplay(),
+                                        CreateHealthDisplay(),
                                         AccuracyCounter = CreateAccuracyCounter(),
                                         ScoreCounter = CreateScoreCounter(),
                                         CreateComboCounter(),
@@ -185,7 +184,6 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            ShowHealthbar.BindValueChanged(healthBar => HealthDisplay.FadeTo(healthBar.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING), true);
             ShowHud.BindValueChanged(visible => hideTargets.ForEach(d => d.FadeTo(visible.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING)));
 
             IsBreakTime.BindValueChanged(_ => updateVisibility());

From 77e422409cdc9e6b216724f778c2b32617878ebf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:00:24 +0900
Subject: [PATCH 09946/10326] Add `SkinInfo.InstantiationInfo` to allow
 creating different skin types

---
 .../TestSceneHitCircleArea.cs                 |   2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs           |   2 +-
 ...60743_AddSkinInstantiationInfo.Designer.cs | 508 ++++++++++++++++++
 ...20210511060743_AddSkinInstantiationInfo.cs |  22 +
 .../Migrations/OsuDbContextModelSnapshot.cs   |   6 +-
 osu.Game/Skinning/DefaultLegacySkin.cs        |  10 +-
 osu.Game/Skinning/DefaultSkin.cs              |  10 +-
 osu.Game/Skinning/SkinInfo.cs                 |  36 +-
 osu.Game/Skinning/SkinManager.cs              |  31 +-
 9 files changed, 597 insertions(+), 30 deletions(-)
 create mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
 create mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
index 0649989dc0..1fdcd73dde 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            Child = new SkinProvidingContainer(new DefaultSkin())
+            Child = new SkinProvidingContainer(new DefaultSkin(null))
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = drawableHitCircle = new DrawableHitCircle(hitCircle)
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index e0eeaf6db0..3576b149bf 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -324,7 +324,7 @@ namespace osu.Game.Beatmaps
         public bool SkinLoaded => skin.IsResultAvailable;
         public ISkin Skin => skin.Value;
 
-        protected virtual ISkin GetSkin() => new DefaultSkin();
+        protected virtual ISkin GetSkin() => new DefaultSkin(null);
         private readonly RecyclableLazy<ISkin> skin;
 
         public abstract Stream GetStream(string storagePath);
diff --git a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
new file mode 100644
index 0000000000..b808c648da
--- /dev/null
+++ b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
@@ -0,0 +1,508 @@
+// <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("20210511060743_AddSkinInstantiationInfo")]
+    partial class AddSkinInstantiationInfo
+    {
+        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<bool>("EpilepsyWarning");
+
+                    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.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<int?>("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>("InstantiationInfo");
+
+                    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/20210511060743_AddSkinInstantiationInfo.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
new file mode 100644
index 0000000000..1d5b0769a4
--- /dev/null
+++ b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace osu.Game.Migrations
+{
+    public partial class AddSkinInstantiationInfo : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "InstantiationInfo",
+                table: "SkinInfo",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "InstantiationInfo",
+                table: "SkinInfo");
+        }
+    }
+}
diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
index ec4461ca56..d4bde50b60 100644
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
@@ -141,8 +141,6 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("TitleUnicode");
 
-                    b.Property<string>("VideoFile");
-
                     b.HasKey("ID");
 
                     b.ToTable("BeatmapMetadata");
@@ -352,7 +350,7 @@ namespace osu.Game.Migrations
 
                     b.Property<long>("TotalScore");
 
-                    b.Property<long?>("UserID")
+                    b.Property<int?>("UserID")
                         .HasColumnName("UserID");
 
                     b.Property<string>("UserString")
@@ -402,6 +400,8 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("Hash");
 
+                    b.Property<string>("InstantiationInfo");
+
                     b.Property<string>("Name");
 
                     b.HasKey("ID");
diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 4027cc650d..564be8630e 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -10,7 +10,12 @@ namespace osu.Game.Skinning
     public class DefaultLegacySkin : LegacySkin
     {
         public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
-            : base(Info, storage, resources, string.Empty)
+            : this(Info, storage, resources)
+        {
+        }
+
+        public DefaultLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
+            : base(skin, storage, resources, string.Empty)
         {
             Configuration.CustomColours["SliderBall"] = new Color4(2, 170, 255, 255);
             Configuration.AddComboColours(
@@ -27,7 +32,8 @@ namespace osu.Game.Skinning
         {
             ID = SkinInfo.CLASSIC_SKIN, // this is temporary until database storage is decided upon.
             Name = "osu!classic",
-            Creator = "team osu!"
+            Creator = "team osu!",
+            InstantiationInfo = typeof(DefaultLegacySkin).AssemblyQualifiedName,
         };
     }
 }
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 0b3f5f3cde..fcd874d6ca 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -8,14 +8,20 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osu.Game.IO;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
     public class DefaultSkin : Skin
     {
-        public DefaultSkin()
-            : base(SkinInfo.Default)
+        public DefaultSkin(IStorageResourceProvider resources)
+            : this(SkinInfo.Default, resources)
+        {
+        }
+
+        public DefaultSkin(SkinInfo skin, IStorageResourceProvider resources)
+            : base(skin)
         {
             Configuration = new DefaultSkinConfiguration();
         }
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index aaccbefb3d..2e29808cb4 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.IO;
 
 namespace osu.Game.Skinning
 {
@@ -22,7 +25,35 @@ namespace osu.Game.Skinning
 
         public string Creator { get; set; }
 
-        public List<SkinFileInfo> Files { get; set; }
+        private string instantiationInfo;
+
+        public string InstantiationInfo
+        {
+            get => instantiationInfo;
+            set => instantiationInfo = abbreviateInstantiationInfo(value);
+        }
+
+        private string abbreviateInstantiationInfo(string value)
+        {
+            // exclude version onwards, matching only on namespace and type.
+            // this is mainly to allow for new versions of already loaded rulesets to "upgrade" from old.
+            return string.Join(',', value.Split(',').Take(2));
+        }
+
+        public virtual Skin CreateInstance(IResourceStore<byte[]> legacyDefaultResources, IStorageResourceProvider resources)
+        {
+            var type = string.IsNullOrEmpty(InstantiationInfo)
+                // handle the case of skins imported before InstantiationInfo was added.
+                ? typeof(LegacySkin)
+                : Type.GetType(InstantiationInfo);
+
+            if (type == typeof(DefaultLegacySkin))
+                return (Skin)Activator.CreateInstance(type, this, legacyDefaultResources, resources);
+
+            return (Skin)Activator.CreateInstance(type, this, resources);
+        }
+
+        public List<SkinFileInfo> Files { get; set; } = new List<SkinFileInfo>();
 
         public List<DatabasedSetting> Settings { get; set; }
 
@@ -32,7 +63,8 @@ namespace osu.Game.Skinning
         {
             ID = DEFAULT_SKIN,
             Name = "osu!lazer",
-            Creator = "team osu!"
+            Creator = "team osu!",
+            InstantiationInfo = typeof(DefaultSkin).AssemblyQualifiedName,
         };
 
         public bool Equals(SkinInfo other) => other != null && ID == other.ID;
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index ac4d63159a..dbb9dcb7fc 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Skinning
 
         private readonly IResourceStore<byte[]> legacyDefaultResources;
 
-        public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin());
+        public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin(null));
         public readonly Bindable<SkinInfo> CurrentSkinInfo = new Bindable<SkinInfo>(SkinInfo.Default) { Default = SkinInfo.Default };
 
         public override IEnumerable<string> HandledExtensions => new[] { ".osk" };
@@ -105,7 +105,7 @@ namespace osu.Game.Skinning
         {
             // we need to populate early to create a hash based off skin.ini contents
             if (item.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
-                populateMetadata(item);
+                populateMetadata(item, GetSkin(item));
 
             if (item.Creator != null && item.Creator != unknown_creator_string)
             {
@@ -122,18 +122,20 @@ namespace osu.Game.Skinning
         {
             await base.Populate(model, archive, cancellationToken).ConfigureAwait(false);
 
+            var instance = GetSkin(model);
+
+            model.InstantiationInfo ??= instance.GetType().AssemblyQualifiedName;
+
             if (model.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
-                populateMetadata(model);
+                populateMetadata(model, instance);
         }
 
-        private void populateMetadata(SkinInfo item)
+        private void populateMetadata(SkinInfo item, Skin instance)
         {
-            Skin reference = GetSkin(item);
-
-            if (!string.IsNullOrEmpty(reference.Configuration.SkinInfo.Name))
+            if (!string.IsNullOrEmpty(instance.Configuration.SkinInfo.Name))
             {
-                item.Name = reference.Configuration.SkinInfo.Name;
-                item.Creator = reference.Configuration.SkinInfo.Creator;
+                item.Name = instance.Configuration.SkinInfo.Name;
+                item.Creator = instance.Configuration.SkinInfo.Creator;
             }
             else
             {
@@ -147,16 +149,7 @@ namespace osu.Game.Skinning
         /// </summary>
         /// <param name="skinInfo">The skin to lookup.</param>
         /// <returns>A <see cref="Skin"/> instance correlating to the provided <see cref="SkinInfo"/>.</returns>
-        public Skin GetSkin(SkinInfo skinInfo)
-        {
-            if (skinInfo == SkinInfo.Default)
-                return new DefaultSkin();
-
-            if (skinInfo == DefaultLegacySkin.Info)
-                return new DefaultLegacySkin(legacyDefaultResources, this);
-
-            return new LegacySkin(skinInfo, this);
-        }
+        public Skin GetSkin(SkinInfo skinInfo) => skinInfo.CreateInstance(legacyDefaultResources, this);
 
         /// <summary>
         /// Perform a lookup query on available <see cref="SkinInfo"/>s.

From 822d99e69f92f1ef07b04f242219210eaf0c9971 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 20:42:13 +0300
Subject: [PATCH 09947/10326] Remove pointless test scenes

---
 .../Online/TestSceneNewsMonthDropdown.cs      | 71 -------------------
 .../Visual/Online/TestSceneNewsSideBar.cs     | 31 +++-----
 .../Visual/Online/TestSceneNewsYearsPanel.cs  | 47 ------------
 3 files changed, 9 insertions(+), 140 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
deleted file mode 100644
index f03b7d3f58..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
+++ /dev/null
@@ -1,71 +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.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
-using osu.Game.Overlays.News.Sidebar;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneNewsMonthDropdown : OsuTestScene
-    {
-        [Cached]
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        [Test]
-        public void CreateClosedMonthPanel()
-        {
-            create(false);
-        }
-
-        [Test]
-        public void CreateOpenMonthPanel()
-        {
-            create(true);
-        }
-
-        private void create(bool isOpen) => AddStep("Create", () => Child = new Container
-        {
-            Anchor = Anchor.Centre,
-            Origin = Anchor.TopCentre,
-            AutoSizeAxes = Axes.Y,
-            Width = 160,
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background2,
-                },
-                new MonthDropdown(posts)
-                {
-                    IsOpen = { Value = isOpen }
-                }
-            }
-        });
-
-        private static List<APINewsPost> posts => new List<APINewsPost>
-        {
-            new APINewsPost
-            {
-                Title = "Short title",
-                PublishedAt = DateTimeOffset.Now
-            },
-            new APINewsPost
-            {
-                Title = "Oh boy that's a long post title I wonder if it will break anything"
-            },
-            new APINewsPost
-            {
-                Title = "Medium title, nothing to see here"
-            }
-        };
-    }
-}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index 96161c28ed..8b09a3d176 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -3,8 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Testing;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.News.Sidebar;
@@ -18,33 +20,18 @@ namespace osu.Game.Tests.Visual.Online
 
         private NewsSideBar sidebar;
 
-        [Test]
-        public void TestCreateEmpty()
-        {
-            createSidebar(null);
-        }
+        [SetUp]
+        public void SetUp() => Schedule(() => Child = sidebar = new NewsSideBar());
 
         [Test]
-        public void TestCreateWithData()
+        public void TestMetadataChange()
         {
-            createSidebar(metadata);
+            AddUntilStep("Years panel is hidden", () => yearsPanel?.Alpha == 0);
+            AddStep("Add data", () => sidebar.Metadata.Value = metadata);
+            AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
         }
 
-        [Test]
-        public void TestDataChange()
-        {
-            createSidebar(null);
-            AddStep("Add data", () =>
-            {
-                if (sidebar != null)
-                    sidebar.Metadata.Value = metadata;
-            });
-        }
-
-        private void createSidebar(APINewsSidebar metadata) => AddStep("Create", () => Child = sidebar = new NewsSideBar
-        {
-            Metadata = { Value = metadata }
-        });
+        private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
 
         private static readonly APINewsSidebar metadata = new APINewsSidebar
         {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
deleted file mode 100644
index 3199b83a7d..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.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.Graphics;
-using osu.Game.Overlays.News.Sidebar;
-using osu.Framework.Allocation;
-using osu.Game.Overlays;
-using osu.Framework.Bindables;
-using osu.Game.Online.API.Requests.Responses;
-using NUnit.Framework;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneNewsYearsPanel : OsuTestScene
-    {
-        [Cached]
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        [Cached]
-        private readonly Bindable<APINewsSidebar> metadataBindable = new Bindable<APINewsSidebar>();
-
-        private YearsPanel panel;
-
-        [SetUp]
-        public void SetUp() => Schedule(() => Child = panel = new YearsPanel
-        {
-            Anchor = Anchor.Centre,
-            Origin = Anchor.Centre
-        });
-
-        [Test]
-        public void TestVisibility()
-        {
-            AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddUntilStep("Panel is hidden", () => panel?.Alpha == 0);
-            AddStep("Change metadata", () => metadataBindable.Value = metadata);
-            AddUntilStep("Panel is visible", () => panel?.Alpha == 1);
-            AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddUntilStep("Panel is hidden", () => panel?.Alpha == 0);
-        }
-
-        private static readonly APINewsSidebar metadata = new APINewsSidebar
-        {
-            Years = new[] { 1001, 2001, 3001, 4001, 5001, 6001, 7001, 8001, 9001 }
-        };
-    }
-}

From b0297c6324cff8807952194154271261f4155b4a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 20:52:11 +0300
Subject: [PATCH 09948/10326] Fix incorrect no posts handling and add
 corresponding test

---
 .../Visual/Online/TestSceneNewsSideBar.cs     | 28 ++++++++++++++++++-
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs |  2 +-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index 8b09a3d176..b5405a979e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -24,13 +24,20 @@ namespace osu.Game.Tests.Visual.Online
         public void SetUp() => Schedule(() => Child = sidebar = new NewsSideBar());
 
         [Test]
-        public void TestMetadataChange()
+        public void TestYearsPanelVisibility()
         {
             AddUntilStep("Years panel is hidden", () => yearsPanel?.Alpha == 0);
             AddStep("Add data", () => sidebar.Metadata.Value = metadata);
             AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
         }
 
+        [Test]
+        public void TestMetadataWithNoPosts()
+        {
+            AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
+            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthDropdown>().Any());
+        }
+
         private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
 
         private static readonly APINewsSidebar metadata = new APINewsSidebar
@@ -97,5 +104,24 @@ namespace osu.Game.Tests.Visual.Online
                 }
             }
         };
+
+        private static readonly APINewsSidebar metadata_with_no_posts = new APINewsSidebar
+        {
+            CurrentYear = 2022,
+            Years = new[]
+            {
+                2022,
+                2021,
+                2020,
+                2019,
+                2018,
+                2017,
+                2016,
+                2015,
+                2014,
+                2013
+            },
+            NewsPosts = Array.Empty<APINewsPost>()
+        };
     }
 }
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 7de7e4dd71..baa1826185 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
             var allPosts = metadata.NewValue.NewsPosts;
 
-            if (!allPosts?.Any() ?? false)
+            if (!allPosts?.Any() ?? true)
                 return;
 
             var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);

From f4801c08ff9693c8e97a5252b96a38fe6f288760 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 22:34:01 +0300
Subject: [PATCH 09949/10326] Refactor MonthDropdown to ensure all the posts
 are within a given month

---
 osu.Game/Overlays/News/Sidebar/MonthDropdown.cs | 11 ++++++++---
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs   |  7 +++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index 11c0ce863f..91412d9527 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -14,6 +14,7 @@ using System.Linq;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using System.Diagnostics;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -26,8 +27,10 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private readonly FillFlowContainer postsFlow;
 
-        public MonthDropdown(IEnumerable<APINewsPost> posts)
+        public MonthDropdown(int month, int year, IEnumerable<APINewsPost> posts)
         {
+            Debug.Assert(posts.All(p => p.PublishedAt.Month == month && p.PublishedAt.Year == year));
+
             RelativeSizeAxes = Axes.X;
             Masking = true;
             InternalChild = new FillFlowContainer
@@ -38,7 +41,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
-                    new DropdownHeader(posts.ElementAt(0).PublishedAt)
+                    new DropdownHeader(month, year)
                     {
                         IsOpen = { BindTarget = IsOpen }
                     },
@@ -102,8 +105,10 @@ namespace osu.Game.Overlays.News.Sidebar
 
             private readonly SpriteIcon icon;
 
-            public DropdownHeader(DateTimeOffset date)
+            public DropdownHeader(int month, int year)
             {
+                var date = new DateTime(year, month, 1);
+
                 RelativeSizeAxes = Axes.X;
                 Height = header_height;
                 Action = IsOpen.Toggle;
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index baa1826185..3851dea83a 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -86,11 +86,14 @@ namespace osu.Game.Overlays.News.Sidebar
             var keys = lookup.Select(kvp => kvp.Key);
             var sortedKeys = keys.OrderByDescending(k => k).ToList();
 
+            var year = metadata.NewValue.CurrentYear;
+
             for (int i = 0; i < sortedKeys.Count; i++)
             {
-                var posts = lookup[sortedKeys[i]];
+                var month = sortedKeys[i];
+                var posts = lookup[month];
 
-                monthsFlow.Add(new MonthDropdown(posts)
+                monthsFlow.Add(new MonthDropdown(month, year, posts)
                 {
                     IsOpen = { Value = i == 0 }
                 });

From 20a6903a40e1a59a253714780718192e1f195837 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 23:43:01 +0300
Subject: [PATCH 09950/10326] Use GridContainer to distribute buttons in
 YearsPanel

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 93 +++++++++++++++++---
 1 file changed, 79 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index c06a8424f6..2a4e2024d2 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -5,14 +5,13 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
-using System.Linq;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using System.Collections.Generic;
 using osu.Game.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Online.API.Requests.Responses;
+using System;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -20,15 +19,15 @@ namespace osu.Game.Overlays.News.Sidebar
     {
         private readonly Bindable<APINewsSidebar> metadata = new Bindable<APINewsSidebar>();
 
-        private FillFlowContainer<YearButton> flow;
+        private Container gridPlaceholder;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider, Bindable<APINewsSidebar> metadata)
         {
             this.metadata.BindTo(metadata);
 
-            Width = 160;
             AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
             Masking = true;
             CornerRadius = 6;
             InternalChildren = new Drawable[]
@@ -38,17 +37,11 @@ namespace osu.Game.Overlays.News.Sidebar
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background3
                 },
-                new Container
+                gridPlaceholder = new Container
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding(5),
-                    Child = flow = new FillFlowContainer<YearButton>
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Spacing = new Vector2(5)
-                    }
+                    Padding = new MarginPadding(5)
                 }
             };
         }
@@ -65,7 +58,7 @@ namespace osu.Game.Overlays.News.Sidebar
                     return;
                 }
 
-                flow.Children = m.NewValue.Years.Select(y => new YearButton(y)).ToArray();
+                gridPlaceholder.Child = new YearsGridContainer(m.NewValue.Years);
                 Show();
             }, true);
         }
@@ -78,7 +71,8 @@ namespace osu.Game.Overlays.News.Sidebar
 
             public YearButton(int year)
             {
-                Size = new Vector2(33.75f, 15);
+                RelativeSizeAxes = Axes.X;
+                Height = 15;
                 Child = text = new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,
@@ -96,5 +90,76 @@ namespace osu.Game.Overlays.News.Sidebar
                 Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
+
+        private class YearsGridContainer : GridContainer
+        {
+            private const int column_count = 4;
+            private const float spacing = 5f;
+
+            private readonly int rowCount;
+            private readonly int[] years;
+
+            public YearsGridContainer(int[] years)
+            {
+                this.years = years;
+                rowCount = (int)Math.Ceiling((float)years.Length / column_count);
+
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                RowDimensions = getRowDimensions();
+                ColumnDimensions = getColumnDimensions();
+                Content = createContent();
+            }
+
+            private Dimension[] getRowDimensions()
+            {
+                var rowDimensions = new Dimension[rowCount];
+                for (int i = 0; i < rowCount; i++)
+                    rowDimensions[i] = new Dimension(GridSizeMode.AutoSize);
+
+                return rowDimensions;
+            }
+
+            private Dimension[] getColumnDimensions()
+            {
+                var columnDimensions = new Dimension[column_count];
+                for (int i = 0; i < column_count; i++)
+                    columnDimensions[i] = new Dimension(GridSizeMode.Relative, size: 1f / column_count);
+
+                return columnDimensions;
+            }
+
+            private Drawable[][] createContent()
+            {
+                var buttons = new Drawable[rowCount][];
+
+                for (int i = 0; i < rowCount; i++)
+                {
+                    buttons[i] = new Drawable[column_count];
+
+                    for (int j = 0; j < column_count; j++)
+                    {
+                        var index = i * column_count + j;
+                        buttons[i][j] = index >= years.Length
+                            ? Empty()
+                            : new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Padding = new MarginPadding
+                                {
+                                    Top = i == 0 ? 0 : spacing / 2,
+                                    Bottom = i == rowCount - 1 ? 0 : spacing / 2,
+                                    Left = j == 0 ? 0 : spacing / 2,
+                                    Right = j == column_count - 1 ? 0 : spacing / 2
+                                },
+                                Child = new YearButton(years[index])
+                            };
+                    }
+                }
+
+                return buttons;
+            }
+        }
     }
 }

From d706073e014c1849cabf2b252a292188b26f8173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 11 May 2021 23:08:50 +0200
Subject: [PATCH 09951/10326] Trim empty remarks xmldoc tag

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index fcbbd8a01c..88c3bd5dbf 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -31,9 +31,6 @@ namespace osu.Game.Rulesets.Mania.UI
         /// For hitsounds played by this <see cref="Column"/> (i.e. not as a result of hitting a hitobject),
         /// a certain number of samples are allowed to be played concurrently so that it feels better when spam-pressing the key.
         /// </summary>
-        /// <remarks>
-        ///
-        /// </remarks>
         private const int max_concurrent_hitsounds = OsuGameBase.SAMPLE_CONCURRENCY;
 
         /// <summary>

From 97bd482d4dae632548438ec05315ac37aec8c8fa Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:21:38 +0200
Subject: [PATCH 09952/10326] Factor out `load` from settings into new
 `Settings` class

---
 osu.Game/Screens/Edit/Settings.cs             | 44 +++++++++++++++++++
 .../Edit/Timing/ControlPointSettings.cs       | 35 +--------------
 osu.Game/Screens/Edit/Verify/IssueSettings.cs | 32 +-------------
 3 files changed, 48 insertions(+), 63 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Settings.cs

diff --git a/osu.Game/Screens/Edit/Settings.cs b/osu.Game/Screens/Edit/Settings.cs
new file mode 100644
index 0000000000..758414333d
--- /dev/null
+++ b/osu.Game/Screens/Edit/Settings.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 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.Containers;
+using osu.Game.Overlays;
+
+namespace osu.Game.Screens.Edit
+{
+    public abstract class Settings : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colours)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colours.Background4,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new OsuScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Children = CreateSections()
+                    },
+                }
+            };
+        }
+
+        protected abstract IReadOnlyList<Drawable> CreateSections();
+    }
+}
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
index 921fa675b3..36f31d4be4 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
@@ -2,44 +2,13 @@
 // 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;
-using osu.Game.Graphics.Containers;
-using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class ControlPointSettings : CompositeDrawable
+    public class ControlPointSettings : Settings
     {
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colours)
-        {
-            RelativeSizeAxes = Axes.Both;
-
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = colours.Background4,
-                    RelativeSizeAxes = Axes.Both,
-                },
-                new OsuScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = createSections()
-                    },
-                }
-            };
-        }
-
-        private IReadOnlyList<Drawable> createSections() => new Drawable[]
+        protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
             new GroupSection(),
             new TimingSection(),
diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 4519231cd2..15fc54d64f 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -2,44 +2,16 @@
 // 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;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class IssueSettings : CompositeDrawable
+    public class IssueSettings : Settings
     {
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            RelativeSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = colours.Gray3,
-                    RelativeSizeAxes = Axes.Both,
-                },
-                new OsuScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = createSections()
-                    },
-                }
-            };
         }
 
-        private IReadOnlyList<Drawable> createSections() => new Drawable[]
+        protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
         };
     }

From d3c1ec55eec7399ea8405d1f39ee92a6f9b2fca6 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:22:32 +0200
Subject: [PATCH 09953/10326] Take `IssueList` in `IssueSettings` constructor

We'll be using this for bindables later.
---
 osu.Game/Screens/Edit/Verify/IssueSettings.cs | 4 ++++
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 15fc54d64f..be06700b28 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -8,7 +8,11 @@ namespace osu.Game.Screens.Edit.Verify
 {
     public class IssueSettings : Settings
     {
+        private readonly IssueList issueList;
 
+        public IssueSettings(IssueList issueList)
+        {
+            this.issueList = issueList;
         }
 
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 9de1f04271..9fb81a6681 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load()
         {
+            IssueList issueList;
+
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
@@ -45,8 +47,8 @@ namespace osu.Game.Screens.Edit.Verify
                     {
                         new Drawable[]
                         {
-                            new IssueList(),
-                            new IssueSettings(),
+                            issueList = new IssueList(),
+                            new IssueSettings(issueList),
                         },
                     }
                 }

From 1de35f880b8b571e7aa89c597c69a8dcd1dd8dde Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:23:31 +0200
Subject: [PATCH 09954/10326] Separate `IssueList` into own class

---
 osu.Game/Screens/Edit/Verify/IssueList.cs    | 100 +++++++++++++++++++
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs |  88 ----------------
 2 files changed, 100 insertions(+), 88 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Verify/IssueList.cs

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
new file mode 100644
index 0000000000..6d319eb09e
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/IssueList.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 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.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks.Components;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public class IssueList : CompositeDrawable
+    {
+        private IssueTable table;
+
+        [Resolved]
+        private EditorClock clock { get; set; }
+
+        [Resolved]
+        private IBindable<WorkingBeatmap> workingBeatmap { get; set; }
+
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; }
+
+        [Resolved]
+        private Bindable<Issue> selectedIssue { get; set; }
+
+        private IBeatmapVerifier rulesetVerifier;
+        private BeatmapVerifier generalVerifier;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colours)
+        {
+            generalVerifier = new BeatmapVerifier();
+            rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
+
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colours.Background2,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new OsuScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = table = new IssueTable(),
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    Margin = new MarginPadding(20),
+                    Children = new Drawable[]
+                    {
+                        new TriangleButton
+                        {
+                            Text = "Refresh",
+                            Action = refresh,
+                            Size = new Vector2(120, 40),
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight,
+                        },
+                    }
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            refresh();
+        }
+
+        private void refresh()
+        {
+            var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
+
+            if (rulesetVerifier != null)
+                issues = issues.Concat(rulesetVerifier.Run(beatmap, workingBeatmap.Value));
+
+            table.Issues = issues
+                           .OrderBy(issue => issue.Template.Type)
+                           .ThenBy(issue => issue.Check.Metadata.Category);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 9fb81a6681..ed4658da8e 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -1,19 +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.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
-using osuTK;
 
 namespace osu.Game.Screens.Edit.Verify
 {
@@ -54,85 +46,5 @@ namespace osu.Game.Screens.Edit.Verify
                 }
             };
         }
-
-        public class IssueList : CompositeDrawable
-        {
-            private IssueTable table;
-
-            [Resolved]
-            private EditorClock clock { get; set; }
-
-            [Resolved]
-            private IBindable<WorkingBeatmap> workingBeatmap { get; set; }
-
-            [Resolved]
-            private EditorBeatmap beatmap { get; set; }
-
-            [Resolved]
-            private Bindable<Issue> selectedIssue { get; set; }
-
-            private IBeatmapVerifier rulesetVerifier;
-            private BeatmapVerifier generalVerifier;
-
-            [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colours)
-            {
-                generalVerifier = new BeatmapVerifier();
-                rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
-
-                RelativeSizeAxes = Axes.Both;
-
-                InternalChildren = new Drawable[]
-                {
-                    new Box
-                    {
-                        Colour = colours.Background2,
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new OsuScrollContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Child = table = new IssueTable(),
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Anchor = Anchor.BottomRight,
-                        Origin = Anchor.BottomRight,
-                        Margin = new MarginPadding(20),
-                        Children = new Drawable[]
-                        {
-                            new TriangleButton
-                            {
-                                Text = "Refresh",
-                                Action = refresh,
-                                Size = new Vector2(120, 40),
-                                Anchor = Anchor.BottomRight,
-                                Origin = Anchor.BottomRight,
-                            },
-                        }
-                    },
-                };
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                refresh();
-            }
-
-            private void refresh()
-            {
-                var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
-
-                if (rulesetVerifier != null)
-                    issues = issues.Concat(rulesetVerifier.Run(beatmap, workingBeatmap.Value));
-
-                table.Issues = issues
-                               .OrderBy(issue => issue.Template.Type)
-                               .ThenBy(issue => issue.Check.Metadata.Category);
-            }
-        }
     }
 }

From 01b87947579c417395458c2832ba730d331d6e6b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:26:12 +0200
Subject: [PATCH 09955/10326] Add abstract `Section` class

Similar to `Section` in the timing screen, but does not make use of checkboxes, nor specific to control points.

So there's a lot of things that differ, hence new class instead of factoring that out.
---
 osu.Game/Screens/Edit/Verify/Section.cs | 67 +++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Verify/Section.cs

diff --git a/osu.Game/Screens/Edit/Verify/Section.cs b/osu.Game/Screens/Edit/Verify/Section.cs
new file mode 100644
index 0000000000..f6815a05a1
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Section.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.Sprites;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public abstract class Section : CompositeDrawable
+    {
+        private const int header_height = 50;
+
+        protected readonly IssueList IssueList;
+
+        protected FillFlowContainer Flow;
+        protected abstract string Header { get; }
+
+        protected Section(IssueList issueList)
+        {
+            IssueList = issueList;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colours)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Masking = true;
+
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = header_height,
+                    Padding = new MarginPadding { Horizontal = 20 },
+                    Child = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Text = Header,
+                        Font = new FontUsage(size: 25, weight: "bold")
+                    }
+                },
+                new Container
+                {
+                    Y = header_height,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Child = Flow = new FillFlowContainer
+                    {
+                        Padding = new MarginPadding { Horizontal = 20 },
+                        Spacing = new Vector2(10),
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                    }
+                }
+            };
+        }
+    }
+}

From 2e4399f0c1f4bcb5cc66bf755f0e4954ab5c6b66 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:27:21 +0200
Subject: [PATCH 09956/10326] Add `VisibilitySection` and its bindables in
 `IssueList`

---
 osu.Game/Screens/Edit/Verify/IssueList.cs     | 10 +++++
 osu.Game/Screens/Edit/Verify/IssueSettings.cs |  1 +
 .../Screens/Edit/Verify/VisibilitySection.cs  | 38 +++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Verify/VisibilitySection.cs

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 6d319eb09e..dd1dffcb42 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -34,12 +34,22 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private Bindable<Issue> selectedIssue { get; set; }
 
+        public Dictionary<IssueType, Bindable<bool>> ShowType { get; set; }
+
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
+            // Reflects the user interface. Only types in this dictionary have configurable visibility.
+            ShowType = new Dictionary<IssueType, Bindable<bool>>
+            {
+                { IssueType.Warning, new Bindable<bool>(true) },
+                { IssueType.Error, new Bindable<bool>(true) },
+                { IssueType.Negligible, new Bindable<bool>(false) }
+            };
+
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index be06700b28..0df3ab0dcb 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
+            new VisibilitySection(issueList)
         };
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
new file mode 100644
index 0000000000..e9fa9b56ed
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    internal class VisibilitySection : Section
+    {
+        public VisibilitySection(IssueList issueList)
+            : base(issueList)
+        {
+        }
+
+        protected override string Header => "Visibility";
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colours)
+        {
+            foreach (IssueType issueType in IssueList.ShowType.Keys)
+            {
+                var checkbox = new SettingsCheckbox
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    LabelText = issueType.ToString()
+                };
+
+                checkbox.Current.BindTo(IssueList.ShowType[issueType]);
+                Flow.Add(checkbox);
+            }
+        }
+    }
+}

From 1bb7d412daf2ad534dcb3a09161f459fb698e535 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:29:46 +0200
Subject: [PATCH 09957/10326] Add `IssueList` filtering based on those
 bindables

---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index dd1dffcb42..7a2202c198 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -102,9 +102,22 @@ namespace osu.Game.Screens.Edit.Verify
             if (rulesetVerifier != null)
                 issues = issues.Concat(rulesetVerifier.Run(beatmap, workingBeatmap.Value));
 
+            issues = filter(issues);
+
             table.Issues = issues
                            .OrderBy(issue => issue.Template.Type)
                            .ThenBy(issue => issue.Check.Metadata.Category);
         }
+
+        private IEnumerable<Issue> filter(IEnumerable<Issue> issues)
+        {
+            foreach (IssueType issueType in ShowType.Keys)
+            {
+                if (!ShowType[issueType].Value)
+                    issues = issues.Where(issue => issue.Template.Type != issueType);
+            }
+
+            return issues;
+        }
     }
 }

From ad78aec1ef8380db80d9e57eb495fa3be2aa2c38 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:30:45 +0200
Subject: [PATCH 09958/10326] Refresh `IssueList` on changes in
 `VisibilitySection`

---
 osu.Game/Screens/Edit/Verify/IssueList.cs         | 6 +++---
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 7a2202c198..b7a6d769e3 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Edit.Verify
                         new TriangleButton
                         {
                             Text = "Refresh",
-                            Action = refresh,
+                            Action = Refresh,
                             Size = new Vector2(120, 40),
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight,
@@ -92,10 +92,10 @@ namespace osu.Game.Screens.Edit.Verify
         {
             base.LoadComplete();
 
-            refresh();
+            Refresh();
         }
 
-        private void refresh()
+        public void Refresh()
         {
             var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
 
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index e9fa9b56ed..f849426800 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Screens.Edit.Verify
                 };
 
                 checkbox.Current.BindTo(IssueList.ShowType[issueType]);
+                checkbox.Current.BindValueChanged(_ => IssueList.Refresh());
                 Flow.Add(checkbox);
             }
         }

From 75adec57ebfa8aaefcb124d3c802e2e8f69ee0a4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:31:16 +0200
Subject: [PATCH 09959/10326] Remove negligible default hidden TODO

---
 osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
index 1241e058ad..1f708209fe 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
@@ -18,7 +18,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary> An error occurred and a complete check could not be made. </summary>
         Error,
 
-        // TODO: Negligible issues should be hidden by default.
         /// <summary> A possible mistake so minor/unlikely that it can often be safely ignored. </summary>
         Negligible,
     }

From 4aeaec6ecc610e4c043881451ff6495edea6bcbe Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:32:18 +0200
Subject: [PATCH 09960/10326] Add `InterpretationSection` and its bindable in
 `IssueList`

We'll eventually connect that bindable so that checks can access it.
---
 .../Edit/Verify/InterpretationSection.cs      | 34 +++++++++++++++++++
 osu.Game/Screens/Edit/Verify/IssueList.cs     |  4 +++
 osu.Game/Screens/Edit/Verify/IssueSettings.cs |  1 +
 3 files changed, 39 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Verify/InterpretationSection.cs

diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
new file mode 100644
index 0000000000..fa0bde9ddc
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    internal class InterpretationSection : Section
+    {
+        public InterpretationSection(IssueList issueList)
+            : base(issueList)
+        {
+        }
+
+        protected override string Header => "Interpretation";
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var dropdown = new SettingsEnumDropdown<DifficultyRating>
+            {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                TooltipText = "Affects checks that depend on difficulty level"
+            };
+            dropdown.Current.BindTo(IssueList.InterpretedDifficulty);
+
+            Flow.Add(dropdown);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index b7a6d769e3..3e836c4010 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -36,6 +36,8 @@ namespace osu.Game.Screens.Edit.Verify
 
         public Dictionary<IssueType, Bindable<bool>> ShowType { get; set; }
 
+        public Bindable<DifficultyRating> InterpretedDifficulty { get; set; }
+
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
 
@@ -53,6 +55,8 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
+            InterpretedDifficulty = new Bindable<DifficultyRating>(beatmap.BeatmapInfo.DifficultyRating);
+
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 0df3ab0dcb..68ab51c3c8 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
+            new InterpretationSection(issueList),
             new VisibilitySection(issueList)
         };
     }

From c13b93e6f15254845e62046551b5e17802915826 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 02:29:18 +0200
Subject: [PATCH 09961/10326] Replace `IWorkingBeatmap` arg with
 `BeatmapVerifierContext` in checks

This simplifies passing of contextual information by enabling addition without needing to refactor lots of classes.

See next commit for example.
---
 .../Checks/CheckOffscreenObjectsTest.cs       | 10 +++++--
 .../Edit/Checks/CheckOffscreenObjects.cs      |  3 +-
 .../Edit/OsuBeatmapVerifier.cs                |  4 +--
 .../Editing/Checks/CheckAudioQualityTest.cs   | 28 ++++++++++-------
 .../Checks/CheckBackgroundQualityTest.cs      | 30 +++++++++++--------
 .../Editing/Checks/CheckFilePresenceTest.cs   | 10 +++++--
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  4 +--
 .../Rulesets/Edit/BeatmapVerifierContext.cs   | 25 ++++++++++++++++
 .../Rulesets/Edit/Checks/CheckAudioQuality.cs |  4 +--
 .../Edit/Checks/CheckBackgroundQuality.cs     |  6 ++--
 .../Edit/Checks/CheckConcurrentObjects.cs     |  2 +-
 .../Rulesets/Edit/Checks/CheckFilePresence.cs |  2 +-
 .../Edit/Checks/CheckUnsnappedObjects.cs      |  2 +-
 .../Rulesets/Edit/Checks/Components/ICheck.cs |  4 +--
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs    |  2 +-
 osu.Game/Screens/Edit/Verify/IssueList.cs     |  7 +++--
 16 files changed, 96 insertions(+), 47 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 6139b0e676..5545273af2 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;
@@ -224,12 +225,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOk(IBeatmap beatmap)
         {
-            Assert.That(check.Run(beatmap, new TestWorkingBeatmap(beatmap)), Is.Empty);
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            Assert.That(check.Run(beatmap, context), Is.Empty);
         }
 
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
-            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
@@ -237,7 +240,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
-            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 4b0a7531a1..c25539201e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
@@ -31,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             foreach (var hitobject in playableBeatmap.HitObjects)
             {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index dab6483179..18faeb4f9f 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -17,9 +17,9 @@ namespace osu.Game.Rulesets.Osu.Edit
             new CheckOffscreenObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(playableBeatmap, workingBeatmap));
+            return checks.SelectMany(check => check.Run(playableBeatmap, context));
         }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
index 7658ca728d..fbd02ea54e 100644
--- a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
@@ -6,6 +6,7 @@ using Moq;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 
@@ -40,23 +41,23 @@ namespace osu.Game.Tests.Editing.Checks
             mock.SetupGet(w => w.Beatmap).Returns(beatmap);
             mock.SetupGet(w => w.Track).Returns((Track)null);
 
-            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, new BeatmapVerifierContext(mock.Object)), Is.Empty);
         }
 
         [Test]
         public void TestAcceptable()
         {
-            var mock = getMockWorkingBeatmap(192);
+            var context = getContext(192);
 
-            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, context), Is.Empty);
         }
 
         [Test]
         public void TestNullBitrate()
         {
-            var mock = getMockWorkingBeatmap(null);
+            var context = getContext(null);
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
@@ -65,9 +66,9 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestZeroBitrate()
         {
-            var mock = getMockWorkingBeatmap(0);
+            var context = getContext(0);
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
@@ -76,9 +77,9 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestTooHighBitrate()
         {
-            var mock = getMockWorkingBeatmap(320);
+            var context = getContext(320);
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooHighBitrate);
@@ -87,14 +88,19 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestTooLowBitrate()
         {
-            var mock = getMockWorkingBeatmap(64);
+            var context = getContext(64);
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooLowBitrate);
         }
 
+        private BeatmapVerifierContext getContext(int? audioBitrate)
+        {
+            return new BeatmapVerifierContext(getMockWorkingBeatmap(audioBitrate).Object);
+        }
+
         /// <summary>
         /// Returns the mock of the working beatmap with the given audio properties.
         /// </summary>
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index f0f972d2fa..e96ec5485d 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -9,6 +9,7 @@ using Moq;
 using NUnit.Framework;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 using FileInfo = osu.Game.IO.FileInfo;
@@ -53,25 +54,25 @@ namespace osu.Game.Tests.Editing.Checks
         {
             // While this is a problem, it is out of scope for this check and is caught by a different one.
             beatmap.Metadata.BackgroundFile = null;
-            var mock = getMockWorkingBeatmap(null, System.Array.Empty<byte>());
+            var context = getContext(null, System.Array.Empty<byte>());
 
-            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, context), Is.Empty);
         }
 
         [Test]
         public void TestAcceptable()
         {
-            var mock = getMockWorkingBeatmap(new Texture(1920, 1080));
+            var context = getContext(new Texture(1920, 1080));
 
-            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, context), Is.Empty);
         }
 
         [Test]
         public void TestTooHighResolution()
         {
-            var mock = getMockWorkingBeatmap(new Texture(3840, 2160));
+            var context = getContext(new Texture(3840, 2160));
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooHighResolution);
@@ -80,9 +81,9 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestLowResolution()
         {
-            var mock = getMockWorkingBeatmap(new Texture(640, 480));
+            var context = getContext(new Texture(640, 480));
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateLowResolution);
@@ -91,9 +92,9 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestTooLowResolution()
         {
-            var mock = getMockWorkingBeatmap(new Texture(100, 100));
+            var context = getContext(new Texture(100, 100));
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooLowResolution);
@@ -102,14 +103,19 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestTooUncompressed()
         {
-            var mock = getMockWorkingBeatmap(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
+            var context = getContext(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooUncompressed);
         }
 
+        private BeatmapVerifierContext getContext(Texture background, [CanBeNull] byte[] fileBytes = null)
+        {
+            return new BeatmapVerifierContext(getMockWorkingBeatmap(background, fileBytes).Object);
+        }
+
         /// <summary>
         /// Returns the mock of the working beatmap with the given background and filesize.
         /// </summary>
diff --git a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
index f6e875a8fc..424dffcbc2 100644
--- a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.IO;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Tests.Beatmaps;
@@ -45,7 +46,8 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestBackgroundSetAndInFiles()
         {
-            Assert.That(check.Run(beatmap, new TestWorkingBeatmap(beatmap)), Is.Empty);
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            Assert.That(check.Run(beatmap, context), Is.Empty);
         }
 
         [Test]
@@ -53,7 +55,8 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
 
-            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateDoesNotExist);
@@ -64,7 +67,8 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.Metadata.BackgroundFile = null;
 
-            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateNoneSet);
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 2f7b7b0ab8..50902d3ff1 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -29,9 +29,9 @@ namespace osu.Game.Rulesets.Edit
             new CheckConcurrentObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(playableBeatmap, workingBeatmap));
+            return checks.SelectMany(check => check.Run(playableBeatmap, context));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
new file mode 100644
index 0000000000..86ca81491a
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.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.Bindables;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Rulesets.Edit
+{
+    /// <summary>
+    /// Represents the context provided by the beatmap verifier to the checks it runs.
+    /// Contains information about what is being checked and how it should be checked.
+    /// </summary>
+    public class BeatmapVerifierContext
+    {
+        /// <summary>
+        /// The working beatmap instance of the current beatmap.
+        /// </summary>
+        public readonly IWorkingBeatmap WorkingBeatmap;
+
+        public BeatmapVerifierContext(IWorkingBeatmap workingBeatmap)
+        {
+            WorkingBeatmap = workingBeatmap;
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
index c1074d7c74..82e572f0b3 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
@@ -26,13 +26,13 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateNoBitrate(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             var audioFile = playableBeatmap.Metadata?.AudioFile;
             if (audioFile == null)
                 yield break;
 
-            var track = workingBeatmap.Track;
+            var track = context.WorkingBeatmap.Track;
 
             if (track?.Bitrate == null || track.Bitrate.Value == 0)
                 yield return new IssueTemplateNoBitrate(this).Create();
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 59fee74023..2af1eca340 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -30,13 +30,13 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateTooUncompressed(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             var backgroundFile = playableBeatmap.Metadata?.BackgroundFile;
             if (backgroundFile == null)
                 yield break;
 
-            var texture = workingBeatmap.Background;
+            var texture = context.WorkingBeatmap.Background;
             if (texture == null)
                 yield break;
 
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
             string storagePath = playableBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
-            double filesizeMb = workingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
+            double filesizeMb = context.WorkingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
 
             if (filesizeMb > max_filesize_mb)
                 yield return new IssueTemplateTooUncompressed(this).Create(filesizeMb);
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index ddebe2923a..d6e779d147 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateConcurrentDifferent(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             for (int i = 0; i < playableBeatmap.HitObjects.Count - 1; ++i)
             {
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index 006fc57c04..cf990a2106 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             var filename = GetFilename(playableBeatmap);
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index cdf3f05465..f073915a39 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateSmallUnsnap(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             var controlPointInfo = playableBeatmap.ControlPointInfo;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index 31a7583941..f669e2161c 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
         /// <param name="playableBeatmap">The playable beatmap of the beatmap to run the check on.</param>
-        /// <param name="workingBeatmap">The working beatmap of the beatmap to run the check on.</param>
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap);
+        /// <param name="context">The beatmap verifier context associated with the beatmap.</param>
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index b598176a35..4e712351e0 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -12,6 +12,6 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public interface IBeatmapVerifier
     {
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap);
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context);
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 3e836c4010..96d056fba4 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
+        private BeatmapVerifierContext context;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
@@ -57,6 +58,8 @@ namespace osu.Game.Screens.Edit.Verify
 
             InterpretedDifficulty = new Bindable<DifficultyRating>(beatmap.BeatmapInfo.DifficultyRating);
 
+            context = new BeatmapVerifierContext(workingBeatmap.Value);
+
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
@@ -101,10 +104,10 @@ namespace osu.Game.Screens.Edit.Verify
 
         public void Refresh()
         {
-            var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
+            var issues = generalVerifier.Run(beatmap, context);
 
             if (rulesetVerifier != null)
-                issues = issues.Concat(rulesetVerifier.Run(beatmap, workingBeatmap.Value));
+                issues = issues.Concat(rulesetVerifier.Run(beatmap, context));
 
             issues = filter(issues);
 

From 64d96b06a66c9f35026b925573b9f3fc7ebfb72d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 02:30:21 +0200
Subject: [PATCH 09962/10326] Add interpreted difficulty info to
 `BeatmapVerifierContext`

Enables checks to make use of the difficulty level as shown in the settings UI.
---
 osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs | 8 +++++++-
 osu.Game/Screens/Edit/Verify/IssueList.cs        | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
index 86ca81491a..59d43ba3d6 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
@@ -17,9 +17,15 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public readonly IWorkingBeatmap WorkingBeatmap;
 
-        public BeatmapVerifierContext(IWorkingBeatmap workingBeatmap)
+        /// <summary>
+        /// The difficulty level which the current beatmap is considered to be.
+        /// </summary>
+        public readonly Bindable<DifficultyRating> InterpretedDifficulty;
+
+        public BeatmapVerifierContext(IWorkingBeatmap workingBeatmap, DifficultyRating difficultyRating = DifficultyRating.ExpertPlus)
         {
             WorkingBeatmap = workingBeatmap;
+            InterpretedDifficulty = new Bindable<DifficultyRating>(difficultyRating);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 96d056fba4..2ae86ed198 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -59,6 +59,7 @@ namespace osu.Game.Screens.Edit.Verify
             InterpretedDifficulty = new Bindable<DifficultyRating>(beatmap.BeatmapInfo.DifficultyRating);
 
             context = new BeatmapVerifierContext(workingBeatmap.Value);
+            context.InterpretedDifficulty.BindTo(InterpretedDifficulty);
 
             RelativeSizeAxes = Axes.Both;
 

From b7bc42e0d37db4f5d5bfc201d70e036e25bf9ce7 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 02:34:16 +0200
Subject: [PATCH 09963/10326] Rename "playableBeatmap" check arg to "beatmap"

The working beatmap is now in the context, so it's easier to distinguish beatmap type, hence no need for this prefix.
---
 .../Edit/Checks/CheckOffscreenObjects.cs               |  4 ++--
 osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs       |  4 ++--
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs              |  4 ++--
 osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs    |  2 +-
 osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs     |  4 ++--
 .../Rulesets/Edit/Checks/CheckBackgroundPresence.cs    |  2 +-
 .../Rulesets/Edit/Checks/CheckBackgroundQuality.cs     |  6 +++---
 .../Rulesets/Edit/Checks/CheckConcurrentObjects.cs     | 10 +++++-----
 osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs     |  8 ++++----
 osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs |  6 +++---
 osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs     |  4 ++--
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs             |  2 +-
 12 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index c25539201e..86bb7f203f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -32,9 +32,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            foreach (var hitobject in playableBeatmap.HitObjects)
+            foreach (var hitobject in beatmap.HitObjects)
             {
                 switch (hitobject)
                 {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 18faeb4f9f..c62f472d75 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -17,9 +17,9 @@ namespace osu.Game.Rulesets.Osu.Edit
             new CheckOffscreenObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(playableBeatmap, context));
+            return checks.SelectMany(check => check.Run(beatmap, context));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 50902d3ff1..1860d54b57 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -29,9 +29,9 @@ namespace osu.Game.Rulesets.Edit
             new CheckConcurrentObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(playableBeatmap, context));
+            return checks.SelectMany(check => check.Run(beatmap, context));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
index 2d572a521e..94c48c300a 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         protected override CheckCategory Category => CheckCategory.Audio;
         protected override string TypeOfFile => "audio";
-        protected override string GetFilename(IBeatmap playableBeatmap) => playableBeatmap.Metadata?.AudioFile;
+        protected override string GetFilename(IBeatmap beatmap) => beatmap.Metadata?.AudioFile;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
index 82e572f0b3..1015f267aa 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
@@ -26,9 +26,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateNoBitrate(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            var audioFile = playableBeatmap.Metadata?.AudioFile;
+            var audioFile = beatmap.Metadata?.AudioFile;
             if (audioFile == null)
                 yield break;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
index 233c708a25..067800b409 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         protected override CheckCategory Category => CheckCategory.Resources;
         protected override string TypeOfFile => "background";
-        protected override string GetFilename(IBeatmap playableBeatmap) => playableBeatmap.Metadata?.BackgroundFile;
+        protected override string GetFilename(IBeatmap beatmap) => beatmap.Metadata?.BackgroundFile;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 2af1eca340..87f5c80c89 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -30,9 +30,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateTooUncompressed(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            var backgroundFile = playableBeatmap.Metadata?.BackgroundFile;
+            var backgroundFile = beatmap.Metadata?.BackgroundFile;
             if (backgroundFile == null)
                 yield break;
 
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             else if (texture.Width < low_width || texture.Height < low_height)
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
-            string storagePath = playableBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
+            string storagePath = beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
             double filesizeMb = context.WorkingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
 
             if (filesizeMb > max_filesize_mb)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index d6e779d147..fd6ed664e6 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -22,15 +22,15 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateConcurrentDifferent(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            for (int i = 0; i < playableBeatmap.HitObjects.Count - 1; ++i)
+            for (int i = 0; i < beatmap.HitObjects.Count - 1; ++i)
             {
-                var hitobject = playableBeatmap.HitObjects[i];
+                var hitobject = beatmap.HitObjects[i];
 
-                for (int j = i + 1; j < playableBeatmap.HitObjects.Count; ++j)
+                for (int j = i + 1; j < beatmap.HitObjects.Count; ++j)
                 {
-                    var nextHitobject = playableBeatmap.HitObjects[j];
+                    var nextHitobject = beatmap.HitObjects[j];
 
                     // Accounts for rulesets with hitobjects separated by columns, such as Mania.
                     // In these cases we only care about concurrent objects within the same column.
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index cf990a2106..f04909d175 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         protected abstract CheckCategory Category { get; }
         protected abstract string TypeOfFile { get; }
-        protected abstract string GetFilename(IBeatmap playableBeatmap);
+        protected abstract string GetFilename(IBeatmap beatmap);
 
         public CheckMetadata Metadata => new CheckMetadata(Category, $"Missing {TypeOfFile}");
 
@@ -21,9 +21,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            var filename = GetFilename(playableBeatmap);
+            var filename = GetFilename(beatmap);
 
             if (filename == null)
             {
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
 
             // If the file is set, also make sure it still exists.
-            var storagePath = playableBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
+            var storagePath = beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
             if (storagePath != null)
                 yield break;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index f073915a39..aa19f3df07 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -22,11 +22,11 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateSmallUnsnap(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            var controlPointInfo = playableBeatmap.ControlPointInfo;
+            var controlPointInfo = beatmap.ControlPointInfo;
 
-            foreach (var hitobject in playableBeatmap.HitObjects)
+            foreach (var hitobject in beatmap.HitObjects)
             {
                 double startUnsnap = hitobject.StartTime - controlPointInfo.GetClosestSnappedTime(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index f669e2161c..511d6aaa0f 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -24,8 +24,8 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
-        /// <param name="playableBeatmap">The playable beatmap of the beatmap to run the check on.</param>
+        /// <param name="beatmap">The playable beatmap of the beatmap to run the check on.</param>
         /// <param name="context">The beatmap verifier context associated with the beatmap.</param>
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context);
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 4e712351e0..1dafc6938e 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -12,6 +12,6 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public interface IBeatmapVerifier
     {
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context);
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context);
     }
 }

From 9b09361cc9a5b3ef1fb9cecf34e28f6401ae9def Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 12:16:41 +0900
Subject: [PATCH 09964/10326] Add testable spectator streaming client

---
 .../Spectator/TestSpectatorStreamingClient.cs | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs

diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
new file mode 100644
index 0000000000..c177d3f399
--- /dev/null
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
@@ -0,0 +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 System.Collections.Generic;
+using osu.Framework.Bindables;
+using osu.Framework.Utils;
+using osu.Game.Online;
+using osu.Game.Online.Spectator;
+using osu.Game.Replays.Legacy;
+using osu.Game.Scoring;
+
+namespace osu.Game.Tests.Visual.Spectator
+{
+    public class TestSpectatorStreamingClient : SpectatorStreamingClient
+    {
+        public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
+        private readonly HashSet<int> watchingUsers = new HashSet<int>();
+
+        private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
+        private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
+
+        public TestSpectatorStreamingClient()
+            : base(new DevelopmentEndpointConfiguration())
+        {
+        }
+
+        public void StartPlay(int userId, int beatmapId)
+        {
+            userBeatmapDictionary[userId] = beatmapId;
+            sendState(userId, beatmapId);
+        }
+
+        public void EndPlay(int userId, int beatmapId)
+        {
+            ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
+            {
+                BeatmapID = beatmapId,
+                RulesetID = 0,
+            });
+
+            userSentStateDictionary[userId] = false;
+        }
+
+        public void SendFrames(int userId, int index, int count)
+        {
+            var frames = new List<LegacyReplayFrame>();
+
+            for (int i = index; i < index + count; i++)
+            {
+                var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
+
+                frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
+            }
+
+            var bundle = new FrameDataBundle(new ScoreInfo(), frames);
+            ((ISpectatorClient)this).UserSentFrames(userId, bundle);
+
+            if (!userSentStateDictionary[userId])
+                sendState(userId, userBeatmapDictionary[userId]);
+        }
+
+        public override void WatchUser(int userId)
+        {
+            // When newly watching a user, the server sends the playing state immediately.
+            if (!watchingUsers.Contains(userId) && PlayingUsers.Contains(userId))
+                sendState(userId, userBeatmapDictionary[userId]);
+
+            base.WatchUser(userId);
+
+            watchingUsers.Add(userId);
+        }
+
+        private void sendState(int userId, int beatmapId)
+        {
+            ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
+            {
+                BeatmapID = beatmapId,
+                RulesetID = 0,
+            });
+
+            userSentStateDictionary[userId] = true;
+        }
+    }
+}

From 184dbaf2029a4b123213b068c0c19484770e57d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 12:53:30 +0900
Subject: [PATCH 09965/10326] Improve safety of bindings in `HealthDisplay`

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index e0ddde026b..d6b4934731 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.HUD
     /// </summary>
     public abstract class HealthDisplay : Container
     {
-        private Bindable<bool> showHealthbar;
+        private readonly Bindable<bool> showHealthbar = new Bindable<bool>(true);
 
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; }
@@ -32,18 +32,21 @@ namespace osu.Game.Screens.Play.HUD
         {
         }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(HUDOverlay hud)
-        {
-            Current.BindTo(HealthProcessor.Health);
+        [Resolved(canBeNull: true)]
+        private HUDOverlay hudOverlay { get; set; }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindTo(HealthProcessor.Health);
             HealthProcessor.NewJudgement += onNewJudgement;
 
-            if (hud != null)
-            {
-                showHealthbar = hud.ShowHealthbar.GetBoundCopy();
-                showHealthbar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
-            }
+            if (hudOverlay != null)
+                showHealthbar.BindTo(hudOverlay.ShowHealthbar);
+
+            // this probably shouldn't be operating on `this.`
+            showHealthbar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
         }
 
         private void onNewJudgement(JudgementResult judgement)

From bf44c09a9142d567878a27e2a30fc1b311201023 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 12:59:46 +0900
Subject: [PATCH 09966/10326] Add name identifying container and rename index
 variable

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 88c3bd5dbf..827d8e2a0a 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -73,6 +73,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 background,
                 new Container
                 {
+                    Name = "Column samples pool",
                     RelativeSizeAxes = Axes.Both,
                     ChildrenEnumerable = hitSounds = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
                 },
@@ -132,7 +133,7 @@ namespace osu.Game.Rulesets.Mania.UI
             HitObjectArea.Explosions.Add(hitExplosionPool.Get(e => e.Apply(result)));
         }
 
-        private int nextHitSound;
+        private int nextHitSoundIndex;
 
         public bool OnPressed(ManiaAction action)
         {
@@ -147,12 +148,12 @@ namespace osu.Game.Rulesets.Mania.UI
 
             if (nextObject is DrawableManiaHitObject maniaObject)
             {
-                var hitSound = hitSounds[nextHitSound];
+                var hitSound = hitSounds[nextHitSoundIndex];
 
                 hitSound.Samples = maniaObject.GetGameplaySamples();
                 hitSound.Play();
 
-                nextHitSound = (nextHitSound + 1) % max_concurrent_hitsounds;
+                nextHitSoundIndex = (nextHitSoundIndex + 1) % max_concurrent_hitsounds;
             }
 
             return true;

From 3428056113d4c8a2cdfd391af9c9e81d32d42241 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 13:00:02 +0900
Subject: [PATCH 09967/10326] Remove unnecessary usage of `ChildrenEnumerable`
 for array assignment

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 827d8e2a0a..79a41ae19e 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 {
                     Name = "Column samples pool",
                     RelativeSizeAxes = Axes.Both,
-                    ChildrenEnumerable = hitSounds = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
+                    Children = hitSounds = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
                 },
                 TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
             };

From 21fc0ba43baea6e0cb115952ab21df06f1d1c003 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 12:17:42 +0900
Subject: [PATCH 09968/10326] Combine test spectator streaming client
 implementations

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 89 ++-----------------
 .../TestSceneMultiSpectatorLeaderboard.cs     | 70 +--------------
 .../TestSceneMultiSpectatorScreen.cs          | 75 +---------------
 .../TestSceneCurrentlyPlayingDisplay.cs       |  4 +-
 4 files changed, 11 insertions(+), 227 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 0777571d02..a7ed217b4d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -1,35 +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 System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
-using osu.Game.Online;
 using osu.Game.Online.Spectator;
-using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
-using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Tests.Visual.Multiplayer;
+using osu.Game.Tests.Visual.Spectator;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSpectator : ScreenTestScene
     {
+        private readonly User streamingUser = new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Test user" };
+
         [Cached(typeof(SpectatorStreamingClient))]
         private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
 
@@ -215,9 +212,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void waitForPlayer() => AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
 
-        private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(beatmapId ?? importedBeatmapId));
+        private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 
-        private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorStreamingClient.EndPlay(beatmapId ?? importedBeatmapId));
+        private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorStreamingClient.EndPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 
         private void checkPaused(bool state) =>
             AddUntilStep($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
@@ -226,89 +223,17 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("send frames", () =>
             {
-                testSpectatorStreamingClient.SendFrames(nextFrame, count);
+                testSpectatorStreamingClient.SendFrames(streamingUser.Id, nextFrame, count);
                 nextFrame += count;
             });
         }
 
         private void loadSpectatingScreen()
         {
-            AddStep("load screen", () => LoadScreen(spectatorScreen = new SoloSpectator(testSpectatorStreamingClient.StreamingUser)));
+            AddStep("load screen", () => LoadScreen(spectatorScreen = new SoloSpectator(streamingUser)));
             AddUntilStep("wait for screen load", () => spectatorScreen.LoadState == LoadState.Loaded);
         }
 
-        public class TestSpectatorStreamingClient : SpectatorStreamingClient
-        {
-            public readonly User StreamingUser = new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Test user" };
-
-            public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
-
-            private int beatmapId;
-
-            public TestSpectatorStreamingClient()
-                : base(new DevelopmentEndpointConfiguration())
-            {
-            }
-
-            public void StartPlay(int beatmapId)
-            {
-                this.beatmapId = beatmapId;
-                sendState(beatmapId);
-            }
-
-            public void EndPlay(int beatmapId)
-            {
-                ((ISpectatorClient)this).UserFinishedPlaying(StreamingUser.Id, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-
-                sentState = false;
-            }
-
-            private bool sentState;
-
-            public void SendFrames(int index, int count)
-            {
-                var frames = new List<LegacyReplayFrame>();
-
-                for (int i = index; i < index + count; i++)
-                {
-                    var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
-
-                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
-                }
-
-                var bundle = new FrameDataBundle(new ScoreInfo(), frames);
-                ((ISpectatorClient)this).UserSentFrames(StreamingUser.Id, bundle);
-
-                if (!sentState)
-                    sendState(beatmapId);
-            }
-
-            public override void WatchUser(int userId)
-            {
-                if (!PlayingUsers.Contains(userId) && sentState)
-                {
-                    // usually the server would do this.
-                    sendState(beatmapId);
-                }
-
-                base.WatchUser(userId);
-            }
-
-            private void sendState(int beatmapId)
-            {
-                sentState = true;
-                ((ISpectatorClient)this).UserBeganPlaying(StreamingUser.Id, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-            }
-        }
-
         internal class TestUserLookupCache : UserLookupCache
         {
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default) => Task.FromResult(new User
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index d3a5daeac6..263adc07e1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -11,15 +11,12 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
-using osu.Framework.Utils;
 using osu.Game.Database;
-using osu.Game.Online;
 using osu.Game.Online.Spectator;
-using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
-using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Tests.Visual.Spectator;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -149,71 +146,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private void assertCombo(int userId, int expectedCombo)
             => AddUntilStep($"player {userId} has {expectedCombo} combo", () => this.ChildrenOfType<GameplayLeaderboardScore>().Single(s => s.User?.Id == userId).Combo.Value == expectedCombo);
 
-        private class TestSpectatorStreamingClient : SpectatorStreamingClient
-        {
-            private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
-            private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
-
-            public TestSpectatorStreamingClient()
-                : base(new DevelopmentEndpointConfiguration())
-            {
-            }
-
-            public void StartPlay(int userId, int beatmapId)
-            {
-                userBeatmapDictionary[userId] = beatmapId;
-                userSentStateDictionary[userId] = false;
-                sendState(userId, beatmapId);
-            }
-
-            public void EndPlay(int userId, int beatmapId)
-            {
-                ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-                userSentStateDictionary[userId] = false;
-            }
-
-            public void SendFrames(int userId, int index, int count)
-            {
-                var frames = new List<LegacyReplayFrame>();
-
-                for (int i = index; i < index + count; i++)
-                {
-                    var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
-                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
-                }
-
-                var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
-                ((ISpectatorClient)this).UserSentFrames(userId, bundle);
-                if (!userSentStateDictionary[userId])
-                    sendState(userId, userBeatmapDictionary[userId]);
-            }
-
-            public override void WatchUser(int userId)
-            {
-                if (userSentStateDictionary[userId])
-                {
-                    // usually the server would do this.
-                    sendState(userId, userBeatmapDictionary[userId]);
-                }
-
-                base.WatchUser(userId);
-            }
-
-            private void sendState(int userId, int beatmapId)
-            {
-                ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-                userSentStateDictionary[userId] = true;
-            }
-        }
-
         private class TestUserLookupCache : UserLookupCache
         {
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index db431c0a82..689c249d05 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -9,16 +9,13 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
-using osu.Game.Online;
 using osu.Game.Online.Spectator;
-using osu.Game.Replays.Legacy;
-using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
+using osu.Game.Tests.Visual.Spectator;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -301,76 +298,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private PlayerArea getInstance(int userId) => spectatorScreen.ChildrenOfType<PlayerArea>().Single(p => p.UserId == userId);
 
-        public class TestSpectatorStreamingClient : SpectatorStreamingClient
-        {
-            private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
-            private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
-
-            public TestSpectatorStreamingClient()
-                : base(new DevelopmentEndpointConfiguration())
-            {
-            }
-
-            public void StartPlay(int userId, int beatmapId)
-            {
-                userBeatmapDictionary[userId] = beatmapId;
-                userSentStateDictionary[userId] = false;
-
-                sendState(userId, beatmapId);
-            }
-
-            public void EndPlay(int userId, int beatmapId)
-            {
-                ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-
-                userSentStateDictionary[userId] = false;
-            }
-
-            public void SendFrames(int userId, int index, int count)
-            {
-                var frames = new List<LegacyReplayFrame>();
-
-                for (int i = index; i < index + count; i++)
-                {
-                    var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
-
-                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
-                }
-
-                var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
-                ((ISpectatorClient)this).UserSentFrames(userId, bundle);
-
-                if (!userSentStateDictionary[userId])
-                    sendState(userId, userBeatmapDictionary[userId]);
-            }
-
-            public override void WatchUser(int userId)
-            {
-                if (!PlayingUsers.Contains(userId) && userSentStateDictionary.TryGetValue(userId, out var sent) && sent)
-                {
-                    // usually the server would do this.
-                    sendState(userId, userBeatmapDictionary[userId]);
-                }
-
-                base.WatchUser(userId);
-            }
-
-            private void sendState(int userId, int beatmapId)
-            {
-                ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-
-                userSentStateDictionary[userId] = true;
-            }
-        }
-
         internal class TestUserLookupCache : UserLookupCache
         {
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 1baa07f208..8ae6398003 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -12,7 +12,7 @@ using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays.Dashboard;
-using osu.Game.Tests.Visual.Gameplay;
+using osu.Game.Tests.Visual.Spectator;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Online
     public class TestSceneCurrentlyPlayingDisplay : OsuTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
-        private TestSceneSpectator.TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSceneSpectator.TestSpectatorStreamingClient();
+        private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
 
         private CurrentlyPlayingDisplay currentlyPlaying;
 

From ad11818868d50e704d98ec28ec12f7ee2a2df9b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 12:19:36 +0900
Subject: [PATCH 09969/10326] Remove watched users on stop watching

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs  |  2 +-
 .../Visual/Spectator/TestSpectatorStreamingClient.cs   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 378096c7fb..691ad5624a 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -230,7 +230,7 @@ namespace osu.Game.Online.Spectator
             connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
         }
 
-        public void StopWatchingUser(int userId)
+        public virtual void StopWatchingUser(int userId)
         {
             lock (userLock)
             {
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
index c177d3f399..806d9b45ab 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
@@ -38,7 +38,8 @@ namespace osu.Game.Tests.Visual.Spectator
                 RulesetID = 0,
             });
 
-            userSentStateDictionary[userId] = false;
+            userBeatmapDictionary.Remove(userId);
+            userSentStateDictionary.Remove(userId);
         }
 
         public void SendFrames(int userId, int index, int count)
@@ -66,10 +67,15 @@ namespace osu.Game.Tests.Visual.Spectator
                 sendState(userId, userBeatmapDictionary[userId]);
 
             base.WatchUser(userId);
-
             watchingUsers.Add(userId);
         }
 
+        public override void StopWatchingUser(int userId)
+        {
+            base.StopWatchingUser(userId);
+            watchingUsers.Remove(userId);
+        }
+
         private void sendState(int userId, int beatmapId)
         {
             ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState

From e0e8f5ab80700db4113b5df45a7d91046cbe57ad Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 13:06:28 +0900
Subject: [PATCH 09970/10326] Fix ordering + threading issues

---
 .../Spectator/TestSpectatorStreamingClient.cs      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
index 806d9b45ab..c2428ce415 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.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.Concurrent;
 using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Utils;
@@ -14,7 +15,7 @@ namespace osu.Game.Tests.Visual.Spectator
     public class TestSpectatorStreamingClient : SpectatorStreamingClient
     {
         public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
-        private readonly HashSet<int> watchingUsers = new HashSet<int>();
+        private readonly ConcurrentDictionary<int, byte> watchingUsers = new ConcurrentDictionary<int, byte>();
 
         private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
         private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
@@ -62,18 +63,17 @@ namespace osu.Game.Tests.Visual.Spectator
 
         public override void WatchUser(int userId)
         {
-            // When newly watching a user, the server sends the playing state immediately.
-            if (!watchingUsers.Contains(userId) && PlayingUsers.Contains(userId))
-                sendState(userId, userBeatmapDictionary[userId]);
-
             base.WatchUser(userId);
-            watchingUsers.Add(userId);
+
+            // When newly watching a user, the server sends the playing state immediately.
+            if (watchingUsers.TryAdd(userId, 0) && PlayingUsers.Contains(userId))
+                sendState(userId, userBeatmapDictionary[userId]);
         }
 
         public override void StopWatchingUser(int userId)
         {
             base.StopWatchingUser(userId);
-            watchingUsers.Remove(userId);
+            watchingUsers.TryRemove(userId, out _);
         }
 
         private void sendState(int userId, int beatmapId)

From f4c96b26750a9c1556a7c62b5f60e95b1a95e476 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 13:10:59 +0900
Subject: [PATCH 09971/10326] Only update playing user states when users are
 watched

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 691ad5624a..ec6d1bf9d8 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -142,7 +142,11 @@ namespace osu.Game.Online.Spectator
                 if (!playingUsers.Contains(userId))
                     playingUsers.Add(userId);
 
-                playingUserStates[userId] = state;
+                // UserBeganPlaying() is called by the server regardless of whether the local user is watching the remote user, and is called a further time when the remote user is watched.
+                // This may be a temporary thing (see: https://github.com/ppy/osu-server-spectator/blob/2273778e02cfdb4a9c6a934f2a46a8459cb5d29c/osu.Server.Spectator/Hubs/SpectatorHub.cs#L28-L29).
+                // We don't want the user states to update unless the player is being watched, otherwise calling BindUserBeganPlaying() can lead to double invocations.
+                if (watchingUsers.Contains(userId))
+                    playingUserStates[userId] = state;
             }
 
             OnUserBeganPlaying?.Invoke(userId, state);

From 672108edcf841b30d3f40a8bdb58695b206272c9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 13:27:12 +0900
Subject: [PATCH 09972/10326] Use container instead of array for field

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 79a41ae19e..0f02e2cd4b 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mania.UI
         internal readonly Container TopLevelContainer;
         private readonly DrawablePool<PoolableHitExplosion> hitExplosionPool;
         private readonly OrderedHitPolicy hitPolicy;
-        private readonly SkinnableSound[] hitSounds;
+        private readonly Container<SkinnableSound> hitSounds;
 
         public Container UnderlayElements => HitObjectArea.UnderlayElements;
 
@@ -71,11 +71,11 @@ namespace osu.Game.Rulesets.Mania.UI
                     RelativeSizeAxes = Axes.Both
                 },
                 background,
-                new Container
+                hitSounds = new Container<SkinnableSound>
                 {
                     Name = "Column samples pool",
                     RelativeSizeAxes = Axes.Both,
-                    Children = hitSounds = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
+                    Children = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
                 },
                 TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
             };

From 05c21fb5b39ba1f0b52db2df3f06aacee25f4e99 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 13:27:30 +0900
Subject: [PATCH 09973/10326] Increase mania HP lenience

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index b3889bc7d3..fbb9b3c466 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania
 
         public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
 
-        public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new DrainingHealthProcessor(drainStartTime, 0.2);
+        public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new DrainingHealthProcessor(drainStartTime, 0.5);
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new ManiaBeatmapConverter(beatmap, this);
 

From 1d383024e226f72001902bb3c5587e472aedec9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 13:51:29 +0900
Subject: [PATCH 09974/10326] Improve the visual appearance of skin editor
 blueprints

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 67 ++++++++++++++++++++---
 1 file changed, 58 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index b8dfdbad0a..23411f2b3d 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -2,14 +2,16 @@
 // 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.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Edit;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -17,14 +19,19 @@ namespace osu.Game.Skinning.Editor
     {
         private Container box;
 
+        private Container outlineBox;
+
         private Drawable drawable => (Drawable)Item;
 
         /// <summary>
         /// Whether the blueprint should be shown even when the <see cref="SelectionBlueprint{T}.Item"/> is not alive.
         /// </summary>
-        protected virtual bool AlwaysShowWhenSelected => false;
+        protected virtual bool AlwaysShowWhenSelected => true;
 
-        protected override bool ShouldBeAlive => (drawable.IsAlive && Item.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
+        protected override bool ShouldBeAlive => drawable.IsAlive && Item.IsPresent;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
 
         public SkinBlueprint(ISkinnableComponent component)
             : base(component)
@@ -32,26 +39,68 @@ namespace osu.Game.Skinning.Editor
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             InternalChildren = new Drawable[]
             {
                 box = new Container
                 {
-                    Colour = colours.Yellow,
                     Children = new Drawable[]
                     {
-                        new Box
+                        outlineBox = new Container
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Alpha = 0.2f,
-                            AlwaysPresent = true,
+                            Masking = true,
+                            BorderThickness = 3,
+                            BorderColour = Color4.White,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Alpha = 0f,
+                                    AlwaysPresent = true,
+                                },
+                            }
                         },
-                    }
+                        new OsuSpriteText
+                        {
+                            Text = Item.GetType().Name,
+                            Font = OsuFont.Default.With(size: 10, weight: FontWeight.Bold),
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.TopRight,
+                        }
+                    },
                 },
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            updateSelectedState();
+            box.FadeInFromZero(200, Easing.OutQuint);
+        }
+
+        protected override void OnSelected()
+        {
+            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            updateSelectedState();
+        }
+
+        protected override void OnDeselected()
+        {
+            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            updateSelectedState();
+        }
+
+        private void updateSelectedState()
+        {
+            outlineBox.FadeColour(colours.Pink.Opacity(IsSelected ? 1 : 0.5f), 200, Easing.OutQuint);
+            outlineBox.Child.FadeTo(IsSelected ? 0.2f : 0, 200, Easing.OutQuint);
+        }
+
         private Quad drawableQuad;
 
         public override Quad ScreenSpaceDrawQuad => drawableQuad;

From 96d4011de2927520121581413837f34e78657abe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 14:02:20 +0900
Subject: [PATCH 09975/10326] Use pattern matching to tidy up instance
 construction

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 08fc458b94..b32d117a92 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -166,15 +166,13 @@ namespace osu.Game.Skinning.Editor
 
         private void placeComponent(Type type)
         {
-            var instance = (Drawable)Activator.CreateInstance(type) as ISkinnableComponent;
-
-            if (instance == null)
+            if (!(Activator.CreateInstance(type) is ISkinnableComponent component))
                 throw new InvalidOperationException("Attempted to instantiate a component for placement which was not an {typeof(ISkinnableComponent)}.");
 
-            getTarget(SkinnableTarget.MainHUDComponents)?.Add(instance);
+            getTarget(SkinnableTarget.MainHUDComponents)?.Add(component);
 
             SelectedComponents.Clear();
-            SelectedComponents.Add(instance);
+            SelectedComponents.Add(component);
         }
 
         private ISkinnableTarget getTarget(SkinnableTarget target)

From 42e67952517e43eef66f688099bd5490efe6ea36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 14:11:40 +0900
Subject: [PATCH 09976/10326] Place new skin components at the centre of the
 screen by default

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 14 +++++++++++++-
 osu.Game/Skinning/ISkinnableTarget.cs  |  4 +++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index b32d117a92..4e38caa806 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -166,10 +166,22 @@ namespace osu.Game.Skinning.Editor
 
         private void placeComponent(Type type)
         {
+            var targetContainer = getTarget(SkinnableTarget.MainHUDComponents);
+
+            if (targetContainer == null)
+                return;
+
             if (!(Activator.CreateInstance(type) is ISkinnableComponent component))
                 throw new InvalidOperationException("Attempted to instantiate a component for placement which was not an {typeof(ISkinnableComponent)}.");
 
-            getTarget(SkinnableTarget.MainHUDComponents)?.Add(component);
+            var drawableComponent = (Drawable)component;
+
+            // give newly added components a sane starting location.
+            drawableComponent.Origin = Anchor.TopCentre;
+            drawableComponent.Anchor = Anchor.TopCentre;
+            drawableComponent.Y = targetContainer.DrawSize.Y / 2;
+
+            targetContainer.Add(component);
 
             SelectedComponents.Clear();
             SelectedComponents.Add(component);
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 4d97b42e8e..4f6e3e66c3 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -1,12 +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;
+
 namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
     /// </summary>
-    public interface ISkinnableTarget
+    public interface ISkinnableTarget : IDrawable
     {
         public SkinnableTarget Target { get; }
 

From 273cd18b8aac5d2b8593dac1e48bdd609957e7e1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 14:19:36 +0900
Subject: [PATCH 09977/10326] Use test streaming client in gameplay leaderboard
 test

---
 ...TestSceneMultiplayerGameplayLeaderboard.cs | 32 +++----------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index b6c06bb149..6813a6e7dd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -6,14 +6,12 @@ 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.Testing;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Database;
-using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
@@ -22,6 +20,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Tests.Visual.Online;
+using osu.Game.Tests.Visual.Spectator;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -30,7 +29,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private const int users = 16;
 
         [Cached(typeof(SpectatorStreamingClient))]
-        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(users);
+        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
@@ -71,7 +70,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
 
-                streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
+                for (int i = 0; i < users; i++)
+                    streamingClient.StartPlay(i, Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
 
                 Client.CurrentMatchPlayingUserIds.Clear();
                 Client.CurrentMatchPlayingUserIds.AddRange(streamingClient.PlayingUsers);
@@ -114,30 +114,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("change to standardised", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised));
         }
 
-        public class TestMultiplayerStreaming : SpectatorStreamingClient
+        public class TestMultiplayerStreaming : TestSpectatorStreamingClient
         {
-            public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
-
-            private readonly int totalUsers;
-
-            public TestMultiplayerStreaming(int totalUsers)
-                : base(new DevelopmentEndpointConfiguration())
-            {
-                this.totalUsers = totalUsers;
-            }
-
-            public void Start(int beatmapId)
-            {
-                for (int i = 0; i < totalUsers; i++)
-                {
-                    ((ISpectatorClient)this).UserBeganPlaying(i, new SpectatorState
-                    {
-                        BeatmapID = beatmapId,
-                        RulesetID = 0,
-                    });
-                }
-            }
-
             private readonly Dictionary<int, FrameHeader> lastHeaders = new Dictionary<int, FrameHeader>();
 
             public void RandomlyUpdateState()

From e1dacde31456e2366226c64398b0dab1a116d3ab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 14:22:15 +0900
Subject: [PATCH 09978/10326] Add combo to test streaming client

---
 osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
index c2428ce415..cc8437479d 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Visual.Spectator
                 frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
             }
 
-            var bundle = new FrameDataBundle(new ScoreInfo(), frames);
+            var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
             ((ISpectatorClient)this).UserSentFrames(userId, bundle);
 
             if (!userSentStateDictionary[userId])

From d55f42dc2eed23c66208bd906386c09ff0a8dcb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 15:05:53 +0900
Subject: [PATCH 09979/10326] Show anchor and origin in skin blueprints when
 selected

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 64 ++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 23411f2b3d..7db5bc7ead 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -21,6 +22,8 @@ namespace osu.Game.Skinning.Editor
 
         private Container outlineBox;
 
+        private AnchorOriginVisualiser anchorOriginVisualiser;
+
         private Drawable drawable => (Drawable)Item;
 
         /// <summary>
@@ -69,9 +72,13 @@ namespace osu.Game.Skinning.Editor
                             Font = OsuFont.Default.With(size: 10, weight: FontWeight.Bold),
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.TopRight,
-                        }
+                        },
                     },
                 },
+                anchorOriginVisualiser = new AnchorOriginVisualiser(drawable)
+                {
+                    Alpha = 0,
+                }
             };
         }
 
@@ -80,7 +87,7 @@ namespace osu.Game.Skinning.Editor
             base.LoadComplete();
 
             updateSelectedState();
-            box.FadeInFromZero(200, Easing.OutQuint);
+            this.FadeInFromZero(200, Easing.OutQuint);
         }
 
         protected override void OnSelected()
@@ -99,6 +106,8 @@ namespace osu.Game.Skinning.Editor
         {
             outlineBox.FadeColour(colours.Pink.Opacity(IsSelected ? 1 : 0.5f), 200, Easing.OutQuint);
             outlineBox.Child.FadeTo(IsSelected ? 0.2f : 0, 200, Easing.OutQuint);
+
+            anchorOriginVisualiser.FadeTo(IsSelected ? 1 : 0, 200, Easing.OutQuint);
         }
 
         private Quad drawableQuad;
@@ -123,4 +132,55 @@ namespace osu.Game.Skinning.Editor
 
         public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
     }
+
+    internal class AnchorOriginVisualiser : CompositeDrawable
+    {
+        private readonly Drawable drawable;
+
+        private readonly Box originBox;
+
+        private readonly Box anchorBox;
+        private readonly Box anchorLine;
+
+        public AnchorOriginVisualiser(Drawable drawable)
+        {
+            this.drawable = drawable;
+
+            InternalChildren = new Drawable[]
+            {
+                anchorLine = new Box
+                {
+                    Colour = Color4.Yellow,
+                    Height = 2,
+                },
+                originBox = new Box
+                {
+                    Colour = Color4.Red,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(5),
+                },
+                anchorBox = new Box
+                {
+                    Colour = Color4.Red,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(5),
+                },
+            };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            originBox.Position = drawable.ToSpaceOfOtherDrawable(drawable.OriginPosition, this);
+            anchorBox.Position = drawable.Parent.ToSpaceOfOtherDrawable(drawable.AnchorPosition, this);
+
+            var point1 = ToLocalSpace(anchorBox.ScreenSpaceDrawQuad.Centre);
+            var point2 = ToLocalSpace(originBox.ScreenSpaceDrawQuad.Centre);
+
+            anchorLine.Position = point1;
+            anchorLine.Width = (point2 - point1).Length;
+            anchorLine.Rotation = MathHelper.RadiansToDegrees(MathF.Atan2(point2.Y - point1.Y, point2.X - point1.X));
+        }
+    }
 }

From 05e0c57a6af3fd579abc9ea73fd4de33702f9284 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 15:30:52 +0900
Subject: [PATCH 09980/10326] Keep component positions stable when changing
 anchor/origin

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index cf5ece03e9..410ec7a272 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -109,13 +109,25 @@ namespace osu.Game.Skinning.Editor
         private void applyOrigin(Anchor anchor)
         {
             foreach (var item in SelectedItems)
-                ((Drawable)item).Origin = anchor;
+            {
+                var drawable = (Drawable)item;
+
+                var previousOrigin = drawable.OriginPosition;
+                drawable.Origin = anchor;
+                drawable.Position += drawable.OriginPosition - previousOrigin;
+            }
         }
 
         private void applyAnchor(Anchor anchor)
         {
             foreach (var item in SelectedItems)
-                ((Drawable)item).Anchor = anchor;
+            {
+                var drawable = (Drawable)item;
+
+                var previousAnchor = (drawable.AnchorPosition);
+                drawable.Anchor = anchor;
+                drawable.Position -= drawable.AnchorPosition - previousAnchor;
+            }
         }
 
         private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)

From 29e6f6b6b6cc1cc8931c13525da01f224ae8de89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 15:58:21 +0900
Subject: [PATCH 09981/10326] Remove `public` prefixes from interface type and
 add `Components` list for future use

---
 .../Skinning/Editor/SkinBlueprintContainer.cs    |  3 +--
 osu.Game/Skinning/ISkinnableTarget.cs            | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index ef189ed165..9890b8e8b6 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -12,7 +12,6 @@ using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens;
 using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -38,7 +37,7 @@ namespace osu.Game.Skinning.Editor
             base.LoadComplete();
 
             // track each target container on the current screen.
-            var targetContainers = target.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+            var targetContainers = target.ChildrenOfType<ISkinnableTarget>().ToArray();
 
             if (targetContainers.Length == 0)
             {
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 4d97b42e8e..ab3c24a1e2 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.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.Bindables;
+
 namespace osu.Game.Skinning
 {
     /// <summary>
@@ -8,16 +10,24 @@ namespace osu.Game.Skinning
     /// </summary>
     public interface ISkinnableTarget
     {
-        public SkinnableTarget Target { get; }
+        /// <summary>
+        /// The definition of this target.
+        /// </summary>
+        SkinnableTarget Target { get; }
+
+        /// <summary>
+        /// A bindable list of components which are being tracked by this skinnable target.
+        /// </summary>
+        IBindableList<ISkinnableComponent> Components { get; }
 
         /// <summary>
         /// Reload this target from the current skin.
         /// </summary>
-        public void Reload();
+        void Reload();
 
         /// <summary>
         /// Add the provided item to this target.
         /// </summary>
-        public void Add(ISkinnableComponent drawable);
+        void Add(ISkinnableComponent drawable);
     }
 }

From 494a1b01a536d6470b2700d4879cd0a05dc13e7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 15:59:33 +0900
Subject: [PATCH 09982/10326] Move `SkinnableElementTargetContainer` out of HUD
 namespace

---
 osu.Game/Skinning/Editor/SkinEditor.cs                        | 1 -
 .../Play/HUD => Skinning}/SkinnableElementTargetContainer.cs  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename osu.Game/{Screens/Play/HUD => Skinning}/SkinnableElementTargetContainer.cs (97%)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index b32d117a92..a00557ee4e 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -13,7 +13,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning.Editor
diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
similarity index 97%
rename from osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
rename to osu.Game/Skinning/SkinnableElementTargetContainer.cs
index b2f6d32927..b900fdf3e0 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
@@ -7,9 +7,9 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Extensions;
-using osu.Game.Skinning;
+using osu.Game.Screens.Play.HUD;
 
-namespace osu.Game.Screens.Play.HUD
+namespace osu.Game.Skinning
 {
     public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {

From 9df08560b69519f94779e22e2ce6c49433b1808b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 16:07:00 +0900
Subject: [PATCH 09983/10326] Save skin editor changes on forced exit

---
 osu.Game/Skinning/Editor/SkinEditor.cs        | 4 ++--
 osu.Game/Skinning/Editor/SkinEditorOverlay.cs | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index a00557ee4e..5deebe9800 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Skinning.Editor
                                                 {
                                                     Text = "Save Changes",
                                                     Width = 140,
-                                                    Action = save,
+                                                    Action = Save,
                                                 },
                                                 new DangerousTriangleButton
                                                 {
@@ -192,7 +192,7 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
-        private void save()
+        public void Save()
         {
             SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
 
diff --git a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index cbed498a38..2d7cae71ff 100644
--- a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -92,8 +92,10 @@ namespace osu.Game.Skinning.Editor
         /// </summary>
         public void Reset()
         {
+            skinEditor?.Save();
             skinEditor?.Hide();
             skinEditor?.Expire();
+
             skinEditor = null;
         }
     }

From 5692cecaa47e9e071fb6079d9f3847b8b1de0972 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 16:35:05 +0900
Subject: [PATCH 09984/10326] Initial implementation of DHO pooling

---
 .../Skinning/TestSceneColumnBackground.cs     |  4 +-
 .../Skinning/TestSceneKeyArea.cs              |  4 +-
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs | 10 +---
 .../Objects/Drawables/DrawableHoldNote.cs     | 55 +++++++++----------
 .../Objects/Drawables/DrawableHoldNoteHead.cs | 12 +++-
 .../Objects/Drawables/DrawableHoldNoteTail.cs | 17 ++++--
 .../Objects/Drawables/DrawableHoldNoteTick.cs | 47 +++++++++++++---
 .../Drawables/DrawableManiaHitObject.cs       | 20 ++++++-
 .../Objects/Drawables/DrawableNote.cs         | 26 +++++----
 osu.Game.Rulesets.Mania/Objects/HeadNote.cs   |  9 +++
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   |  4 +-
 osu.Game.Rulesets.Mania/UI/Column.cs          | 11 +++-
 .../UI/Components/ColumnHitObjectArea.cs      |  2 +-
 .../UI/PoolableHitExplosion.cs                |  2 +-
 14 files changed, 146 insertions(+), 77 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Objects/HeadNote.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
index bde323f187..ca323b5911 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, 0), _ => new DefaultColumnBackground())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
                         {
                             RelativeSizeAxes = Axes.Both
                         }
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, 1), _ => new DefaultColumnBackground())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
                         {
                             RelativeSizeAxes = Axes.Both
                         }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
index 7e80419944..c58c07c83b 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea, 0), _ => new DefaultKeyArea())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
                         {
                             RelativeSizeAxes = Axes.Both
                         },
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea, 1), _ => new DefaultKeyArea())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
                         {
                             RelativeSizeAxes = Axes.Both
                         },
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index f078345fc1..9aebf51576 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -9,12 +9,6 @@ namespace osu.Game.Rulesets.Mania
 {
     public class ManiaSkinComponent : GameplaySkinComponent<ManiaSkinComponents>
     {
-        /// <summary>
-        /// The intended <see cref="Column"/> index for this component.
-        /// May be null if the component does not exist in a <see cref="Column"/>.
-        /// </summary>
-        public readonly int? TargetColumn;
-
         /// <summary>
         /// The intended <see cref="StageDefinition"/> for this component.
         /// May be null if the component is not a direct member of a <see cref="Stage"/>.
@@ -25,12 +19,10 @@ namespace osu.Game.Rulesets.Mania
         /// Creates a new <see cref="ManiaSkinComponent"/>.
         /// </summary>
         /// <param name="component">The component.</param>
-        /// <param name="targetColumn">The intended <see cref="Column"/> index for this component. May be null if the component does not exist in a <see cref="Column"/>.</param>
         /// <param name="stageDefinition">The intended <see cref="StageDefinition"/> for this component. May be null if the component is not a direct member of a <see cref="Stage"/>.</param>
-        public ManiaSkinComponent(ManiaSkinComponents component, int? targetColumn = null, StageDefinition? stageDefinition = null)
+        public ManiaSkinComponent(ManiaSkinComponents component, StageDefinition? stageDefinition = null)
             : base(component)
         {
-            TargetColumn = targetColumn;
             StageDefinition = stageDefinition;
         }
 
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 02829d87bd..e1cf1851df 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -2,6 +2,7 @@
 // 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;
@@ -29,21 +30,21 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         public DrawableHoldNoteHead Head => headContainer.Child;
         public DrawableHoldNoteTail Tail => tailContainer.Child;
 
-        private readonly Container<DrawableHoldNoteHead> headContainer;
-        private readonly Container<DrawableHoldNoteTail> tailContainer;
-        private readonly Container<DrawableHoldNoteTick> tickContainer;
+        private Container<DrawableHoldNoteHead> headContainer;
+        private Container<DrawableHoldNoteTail> tailContainer;
+        private Container<DrawableHoldNoteTick> tickContainer;
 
         /// <summary>
         /// Contains the size of the hold note covering the whole head/tail bounds. The size of this container changes as the hold note is being pressed.
         /// </summary>
-        private readonly Container sizingContainer;
+        private Container sizingContainer;
 
         /// <summary>
         /// Contains the contents of the hold note that should be masked as the hold note is being pressed. Follows changes in the size of <see cref="sizingContainer"/>.
         /// </summary>
-        private readonly Container maskingContainer;
+        private Container maskingContainer;
 
-        private readonly SkinnableDrawable bodyPiece;
+        private SkinnableDrawable bodyPiece;
 
         /// <summary>
         /// Time at which the user started holding this hold note. Null if the user is not holding this hold note.
@@ -60,11 +61,19 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// </summary>
         private double? releaseTime;
 
+        public DrawableHoldNote()
+            : this(null)
+        {
+        }
+
         public DrawableHoldNote(HoldNote hitObject)
             : base(hitObject)
         {
-            RelativeSizeAxes = Axes.X;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             Container maskedContents;
 
             AddRangeInternal(new Drawable[]
@@ -86,7 +95,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                         headContainer = new Container<DrawableHoldNoteHead> { RelativeSizeAxes = Axes.Both }
                     }
                 },
-                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
+                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody), _ => new DefaultBodyPiece
                 {
                     RelativeSizeAxes = Axes.Both,
                 })
@@ -128,37 +137,23 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
-            headContainer.Clear();
-            tailContainer.Clear();
-            tickContainer.Clear();
+            headContainer.Clear(false);
+            tailContainer.Clear(false);
+            tickContainer.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
         {
             switch (hitObject)
             {
-                case TailNote _:
-                    return new DrawableHoldNoteTail(this)
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        AccentColour = { BindTarget = AccentColour }
-                    };
+                case TailNote tail:
+                    return new DrawableHoldNoteTail(tail);
 
-                case Note _:
-                    return new DrawableHoldNoteHead(this)
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        AccentColour = { BindTarget = AccentColour }
-                    };
+                case HeadNote head:
+                    return new DrawableHoldNoteHead(head);
 
                 case HoldNoteTick tick:
-                    return new DrawableHoldNoteTick(tick)
-                    {
-                        HoldStartTime = () => HoldStartTime,
-                        AccentColour = { BindTarget = AccentColour }
-                    };
+                    return new DrawableHoldNoteTick(tick);
             }
 
             return base.CreateNestedHitObject(hitObject);
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
index 35ba2465fa..be600f0d47 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.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.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
@@ -12,11 +13,18 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     {
         protected override ManiaSkinComponents Component => ManiaSkinComponents.HoldNoteHead;
 
-        public DrawableHoldNoteHead(DrawableHoldNote holdNote)
-            : base(holdNote.HitObject.Head)
+        public DrawableHoldNoteHead()
+            : this(null)
         {
         }
 
+        public DrawableHoldNoteHead(HeadNote headNote)
+            : base(headNote)
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+        }
+
         public void UpdateResult() => base.UpdateResult(true);
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index 3a00933e4d..18aa3f66d4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
@@ -20,12 +21,18 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected override ManiaSkinComponents Component => ManiaSkinComponents.HoldNoteTail;
 
-        private readonly DrawableHoldNote holdNote;
+        protected DrawableHoldNote HoldNote => (DrawableHoldNote)ParentHitObject;
 
-        public DrawableHoldNoteTail(DrawableHoldNote holdNote)
-            : base(holdNote.HitObject.Tail)
+        public DrawableHoldNoteTail()
+            : this(null)
         {
-            this.holdNote = holdNote;
+        }
+
+        public DrawableHoldNoteTail(TailNote tailNote)
+            : base(tailNote)
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
         }
 
         public void UpdateResult() => base.UpdateResult(true);
@@ -54,7 +61,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             ApplyResult(r =>
             {
                 // If the head wasn't hit or the hold note was broken, cap the max score to Meh.
-                if (result > HitResult.Meh && (!holdNote.Head.IsHit || holdNote.HoldBrokenTime != null))
+                if (result > HitResult.Meh && (!HoldNote.Head.IsHit || HoldNote.HoldBrokenTime != null))
                     result = HitResult.Meh;
 
                 r.Type = result;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
index 98931dceed..6a57849fb4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
@@ -2,7 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
+using System.Diagnostics;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -19,20 +20,28 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// <summary>
         /// References the time at which the user started holding the hold note.
         /// </summary>
-        public Func<double?> HoldStartTime;
+        private Func<double?> holdStartTime;
+
+        private Container glowContainer;
+
+        public DrawableHoldNoteTick()
+            : this(null)
+        {
+        }
 
         public DrawableHoldNoteTick(HoldNoteTick hitObject)
             : base(hitObject)
         {
-            Container glowContainer;
-
             Anchor = Anchor.TopCentre;
             Origin = Anchor.TopCentre;
 
             RelativeSizeAxes = Axes.X;
-            Size = new Vector2(1);
+        }
 
-            AddRangeInternal(new[]
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new[]
             {
                 glowContainer = new CircularContainer
                 {
@@ -50,7 +59,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                         }
                     }
                 }
-            });
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             AccentColour.BindValueChanged(colour =>
             {
@@ -64,12 +78,29 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             }, true);
         }
 
+        protected override void OnApply()
+        {
+            base.OnApply();
+
+            Debug.Assert(ParentHitObject != null);
+
+            var holdNote = (DrawableHoldNote)ParentHitObject;
+            holdStartTime = () => holdNote.HoldStartTime;
+        }
+
+        protected override void OnFree()
+        {
+            base.OnFree();
+
+            holdStartTime = null;
+        }
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (Time.Current < HitObject.StartTime)
                 return;
 
-            var startTime = HoldStartTime?.Invoke();
+            var startTime = holdStartTime?.Invoke();
 
             if (startTime == null || startTime > HitObject.StartTime)
                 ApplyResult(r => r.Type = r.Judgement.MinResult);
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 003646d654..7323ae9df1 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         protected DrawableManiaHitObject(ManiaHitObject hitObject)
             : base(hitObject)
         {
+            RelativeSizeAxes = Axes.X;
         }
 
         [BackgroundDependencyLoader(true)]
@@ -62,6 +63,22 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             Direction.BindValueChanged(OnDirectionChanged, true);
         }
 
+        protected override void OnApply()
+        {
+            base.OnApply();
+
+            if (ParentHitObject != null)
+                AccentColour.BindTo(ParentHitObject.AccentColour);
+        }
+
+        protected override void OnFree()
+        {
+            base.OnFree();
+
+            if (ParentHitObject != null)
+                AccentColour.UnbindFrom(ParentHitObject.AccentColour);
+        }
+
         private double computedLifetimeStart;
 
         public override double LifetimeStart
@@ -147,12 +164,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     public abstract class DrawableManiaHitObject<TObject> : DrawableManiaHitObject
         where TObject : ManiaHitObject
     {
-        public new readonly TObject HitObject;
+        public new TObject HitObject => (TObject)base.HitObject;
 
         protected DrawableManiaHitObject(TObject hitObject)
             : base(hitObject)
         {
-            HitObject = hitObject;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 36565e14aa..16feec6b3a 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -33,31 +33,35 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
-        private readonly Drawable headPiece;
+        private Drawable headPiece;
+
+        public DrawableNote()
+            : this(null)
+        {
+        }
 
         public DrawableNote(Note hitObject)
             : base(hitObject)
         {
-            RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-
-            AddInternal(headPiece = new SkinnableDrawable(new ManiaSkinComponent(Component, hitObject.Column), _ => new DefaultNotePiece())
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y
-            });
         }
 
         [BackgroundDependencyLoader(true)]
         private void load(ManiaRulesetConfigManager rulesetConfig)
         {
             rulesetConfig?.BindWith(ManiaRulesetSetting.TimingBasedNoteColouring, configTimingBasedNoteColouring);
+
+            InternalChild = headPiece = new SkinnableDrawable(new ManiaSkinComponent(Component), _ => new DefaultNotePiece())
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y
+            };
         }
 
         protected override void LoadComplete()
         {
-            HitObject.StartTimeBindable.BindValueChanged(_ => updateSnapColour());
-            configTimingBasedNoteColouring.BindValueChanged(_ => updateSnapColour(), true);
+            configTimingBasedNoteColouring.BindValueChanged(_ => updateSnapColour());
+            StartTimeBindable.BindValueChanged(_ => updateSnapColour(), true);
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
@@ -102,7 +106,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private void updateSnapColour()
         {
-            if (beatmap == null) return;
+            if (beatmap == null || HitObject == null) return;
 
             int snapDivisor = beatmap.ControlPointInfo.GetClosestBeatDivisor(HitObject.StartTime);
 
diff --git a/osu.Game.Rulesets.Mania/Objects/HeadNote.cs b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
new file mode 100644
index 0000000000..e69cc62aed
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
@@ -0,0 +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.
+
+namespace osu.Game.Rulesets.Mania.Objects
+{
+    public class HeadNote : Note
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 6cc7ff92d3..43e876b7aa 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Mania.Objects
         /// <summary>
         /// The head note of the hold.
         /// </summary>
-        public Note Head { get; private set; }
+        public HeadNote Head { get; private set; }
 
         /// <summary>
         /// The tail note of the hold.
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Mania.Objects
 
             createTicks(cancellationToken);
 
-            AddNested(Head = new Note
+            AddNested(Head = new HeadNote
             {
                 StartTime = StartTime,
                 Column = Column,
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 0f02e2cd4b..8247a37881 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.UI
@@ -55,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.UI
             RelativeSizeAxes = Axes.Y;
             Width = COLUMN_WIDTH;
 
-            Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, Index), _ => new DefaultColumnBackground())
+            Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
             {
                 RelativeSizeAxes = Axes.Both
             };
@@ -66,7 +67,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
                 background.CreateProxy(),
                 HitObjectArea = new ColumnHitObjectArea(Index, HitObjectContainer) { RelativeSizeAxes = Axes.Both },
-                new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea, Index), _ => new DefaultKeyArea())
+                new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
                 {
                     RelativeSizeAxes = Axes.Both
                 },
@@ -83,6 +84,12 @@ namespace osu.Game.Rulesets.Mania.UI
             hitPolicy = new OrderedHitPolicy(HitObjectContainer);
 
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
+
+            RegisterPool<Note, DrawableNote>(5, 20);
+            RegisterPool<HoldNote, DrawableHoldNote>(5, 20);
+            RegisterPool<HeadNote, DrawableHoldNoteHead>(5, 20);
+            RegisterPool<TailNote, DrawableHoldNoteTail>(5, 20);
+            RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 200);
         }
 
         public ColumnType ColumnType { get; set; }
diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
index b365ae45a9..f69d2aafdc 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                     RelativeSizeAxes = Axes.Both,
                     Depth = 2,
                 },
-                hitTarget = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitTarget, columnIndex), _ => new DefaultHitTarget())
+                hitTarget = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitTarget), _ => new DefaultHitTarget())
                 {
                     RelativeSizeAxes = Axes.X,
                     Depth = 1
diff --git a/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
index 64b7d7d550..90d3c6c4c7 100644
--- a/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = skinnableExplosion = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion, column.Index), _ => new DefaultHitExplosion())
+            InternalChild = skinnableExplosion = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion), _ => new DefaultHitExplosion())
             {
                 RelativeSizeAxes = Axes.Both
             };

From 17e376457610652e9cfac1470eb8748114441022 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 16:38:04 +0900
Subject: [PATCH 09985/10326] Rename `Settings` to have a more localised name

---
 .../Edit/{Settings.cs => RoundedContentEditorScreenSettings.cs} | 2 +-
 osu.Game/Screens/Edit/Timing/ControlPointSettings.cs            | 2 +-
 osu.Game/Screens/Edit/Verify/IssueSettings.cs                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename osu.Game/Screens/Edit/{Settings.cs => RoundedContentEditorScreenSettings.cs} (94%)

diff --git a/osu.Game/Screens/Edit/Settings.cs b/osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs
similarity index 94%
rename from osu.Game/Screens/Edit/Settings.cs
rename to osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs
index 758414333d..06293fbaac 100644
--- a/osu.Game/Screens/Edit/Settings.cs
+++ b/osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs
@@ -11,7 +11,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit
 {
-    public abstract class Settings : CompositeDrawable
+    public abstract class RoundedContentEditorScreenSettings : CompositeDrawable
     {
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
index 36f31d4be4..13f81c75da 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class ControlPointSettings : Settings
+    public class ControlPointSettings : RoundedContentEditorScreenSettings
     {
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 68ab51c3c8..506694aa46 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class IssueSettings : Settings
+    public class IssueSettings : RoundedContentEditorScreenSettings
     {
         private readonly IssueList issueList;
 

From 4e7551d50ef672362d11a9241b277617f47dac73 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 16:40:46 +0900
Subject: [PATCH 09986/10326] Fix crashes

---
 .../Objects/Drawables/DrawableHoldNoteTick.cs | 25 ++++++++-----------
 .../Drawables/DrawableManiaHitObject.cs       |  6 +++++
 .../Objects/Drawables/DrawableNote.cs         |  4 +--
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
index 6a57849fb4..f040dad135 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
@@ -41,25 +41,22 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new[]
+            AddInternal(glowContainer = new CircularContainer
             {
-                glowContainer = new CircularContainer
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                Children = new[]
                 {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Children = new[]
+                    new Box
                     {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            AlwaysPresent = true
-                        }
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        AlwaysPresent = true
                     }
                 }
-            };
+            });
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 7323ae9df1..380ab35339 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -60,6 +60,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 Action.BindTo(action);
 
             Direction.BindTo(scrollingInfo.Direction);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
             Direction.BindValueChanged(OnDirectionChanged, true);
         }
 
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 16feec6b3a..b711e67f25 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -51,11 +51,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             rulesetConfig?.BindWith(ManiaRulesetSetting.TimingBasedNoteColouring, configTimingBasedNoteColouring);
 
-            InternalChild = headPiece = new SkinnableDrawable(new ManiaSkinComponent(Component), _ => new DefaultNotePiece())
+            AddInternal(headPiece = new SkinnableDrawable(new ManiaSkinComponent(Component), _ => new DefaultNotePiece())
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y
-            };
+            });
         }
 
         protected override void LoadComplete()

From d2e0e8ad948aac6ef137abf81d50963ba8e55297 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 16:53:49 +0900
Subject: [PATCH 09987/10326] Reverse direction of binding to allow for better
 abstract class definitions

---
 ...tEditorScreen.cs => EditorRoundedScreen.cs} |  4 ++--
 ...tings.cs => EditorRoundedScreenSettings.cs} |  2 +-
 ...s => EditorRoundedScreenSettingsSection.cs} | 11 ++---------
 osu.Game/Screens/Edit/Setup/SetupScreen.cs     |  2 +-
 .../Screens/Edit/Setup/SetupScreenHeader.cs    |  2 +-
 osu.Game/Screens/Edit/Setup/SetupSection.cs    |  2 +-
 .../Edit/Timing/ControlPointSettings.cs        |  2 +-
 osu.Game/Screens/Edit/Timing/TimingScreen.cs   |  2 +-
 .../Edit/Verify/InterpretationSection.cs       | 11 +++++------
 osu.Game/Screens/Edit/Verify/IssueList.cs      |  5 +++--
 osu.Game/Screens/Edit/Verify/IssueSettings.cs  | 13 +++----------
 osu.Game/Screens/Edit/Verify/IssueTable.cs     |  5 ++++-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs   | 18 +++++++++++-------
 .../Screens/Edit/Verify/VisibilitySection.cs   | 14 ++++++--------
 14 files changed, 42 insertions(+), 51 deletions(-)
 rename osu.Game/Screens/Edit/{RoundedContentEditorScreen.cs => EditorRoundedScreen.cs} (93%)
 rename osu.Game/Screens/Edit/{RoundedContentEditorScreenSettings.cs => EditorRoundedScreenSettings.cs} (94%)
 rename osu.Game/Screens/Edit/{Verify/Section.cs => EditorRoundedScreenSettingsSection.cs} (88%)

diff --git a/osu.Game/Screens/Edit/RoundedContentEditorScreen.cs b/osu.Game/Screens/Edit/EditorRoundedScreen.cs
similarity index 93%
rename from osu.Game/Screens/Edit/RoundedContentEditorScreen.cs
rename to osu.Game/Screens/Edit/EditorRoundedScreen.cs
index a55ae3f635..c6ced02021 100644
--- a/osu.Game/Screens/Edit/RoundedContentEditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorRoundedScreen.cs
@@ -10,7 +10,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit
 {
-    public class RoundedContentEditorScreen : EditorScreen
+    public class EditorRoundedScreen : EditorScreen
     {
         public const int HORIZONTAL_PADDING = 100;
 
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit
 
         protected override Container<Drawable> Content => roundedContent;
 
-        public RoundedContentEditorScreen(EditorScreenMode mode)
+        public EditorRoundedScreen(EditorScreenMode mode)
             : base(mode)
         {
             ColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
diff --git a/osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs b/osu.Game/Screens/Edit/EditorRoundedScreenSettings.cs
similarity index 94%
rename from osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs
rename to osu.Game/Screens/Edit/EditorRoundedScreenSettings.cs
index 06293fbaac..cb17484d27 100644
--- a/osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs
+++ b/osu.Game/Screens/Edit/EditorRoundedScreenSettings.cs
@@ -11,7 +11,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit
 {
-    public abstract class RoundedContentEditorScreenSettings : CompositeDrawable
+    public abstract class EditorRoundedScreenSettings : CompositeDrawable
     {
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
diff --git a/osu.Game/Screens/Edit/Verify/Section.cs b/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
similarity index 88%
rename from osu.Game/Screens/Edit/Verify/Section.cs
rename to osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
index f6815a05a1..87ed98a439 100644
--- a/osu.Game/Screens/Edit/Verify/Section.cs
+++ b/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
@@ -9,22 +9,15 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osuTK;
 
-namespace osu.Game.Screens.Edit.Verify
+namespace osu.Game.Screens.Edit
 {
-    public abstract class Section : CompositeDrawable
+    public abstract class EditorRoundedScreenSettingsSection : CompositeDrawable
     {
         private const int header_height = 50;
 
-        protected readonly IssueList IssueList;
-
         protected FillFlowContainer Flow;
         protected abstract string Header { get; }
 
-        protected Section(IssueList issueList)
-        {
-            IssueList = issueList;
-        }
-
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 0af7cf095b..5bbec2574f 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -7,7 +7,7 @@ using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    public class SetupScreen : RoundedContentEditorScreen
+    public class SetupScreen : EditorRoundedScreen
     {
         [Cached]
         private SectionsContainer<SetupSection> sections = new SectionsContainer<SetupSection>();
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index 10daacc359..2d0afda001 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Edit.Setup
 
             public SetupScreenTabControl()
             {
-                TabContainer.Margin = new MarginPadding { Horizontal = RoundedContentEditorScreen.HORIZONTAL_PADDING };
+                TabContainer.Margin = new MarginPadding { Horizontal = EditorRoundedScreen.HORIZONTAL_PADDING };
 
                 AddInternal(background = new Box
                 {
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index b3ae15900f..8964e651df 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Edit.Setup
             Padding = new MarginPadding
             {
                 Vertical = 10,
-                Horizontal = RoundedContentEditorScreen.HORIZONTAL_PADDING
+                Horizontal = EditorRoundedScreen.HORIZONTAL_PADDING
             };
 
             InternalChild = new FillFlowContainer
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
index 13f81c75da..48639789af 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class ControlPointSettings : RoundedContentEditorScreenSettings
+    public class ControlPointSettings : EditorRoundedScreenSettings
     {
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 9f26dece08..a4193d5084 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class TimingScreen : RoundedContentEditorScreen
+    public class TimingScreen : EditorRoundedScreen
     {
         [Cached]
         private Bindable<ControlPointGroup> selectedGroup = new Bindable<ControlPointGroup>();
diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
index fa0bde9ddc..7991786542 100644
--- a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
@@ -8,12 +8,10 @@ using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    internal class InterpretationSection : Section
+    internal class InterpretationSection : EditorRoundedScreenSettingsSection
     {
-        public InterpretationSection(IssueList issueList)
-            : base(issueList)
-        {
-        }
+        [Resolved]
+        private VerifyScreen verify { get; set; }
 
         protected override string Header => "Interpretation";
 
@@ -26,7 +24,8 @@ namespace osu.Game.Screens.Edit.Verify
                 Origin = Anchor.CentreLeft,
                 TooltipText = "Affects checks that depend on difficulty level"
             };
-            dropdown.Current.BindTo(IssueList.InterpretedDifficulty);
+
+            dropdown.Current.BindTo(verify.InterpretedDifficulty);
 
             Flow.Add(dropdown);
         }
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 3e836c4010..befffdd9db 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -18,6 +18,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Edit.Verify
 {
+    [Cached]
     public class IssueList : CompositeDrawable
     {
         private IssueTable table;
@@ -32,7 +33,7 @@ namespace osu.Game.Screens.Edit.Verify
         private EditorBeatmap beatmap { get; set; }
 
         [Resolved]
-        private Bindable<Issue> selectedIssue { get; set; }
+        private VerifyScreen verify { get; set; }
 
         public Dictionary<IssueType, Bindable<bool>> ShowType { get; set; }
 
@@ -55,7 +56,7 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
-            InterpretedDifficulty = new Bindable<DifficultyRating>(beatmap.BeatmapInfo.DifficultyRating);
+            InterpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
 
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 506694aa46..ae3ef7e0b0 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -6,19 +6,12 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class IssueSettings : RoundedContentEditorScreenSettings
+    public class IssueSettings : EditorRoundedScreenSettings
     {
-        private readonly IssueList issueList;
-
-        public IssueSettings(IssueList issueList)
-        {
-            this.issueList = issueList;
-        }
-
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
-            new InterpretationSection(issueList),
-            new VisibilitySection(issueList)
+            new InterpretationSection(),
+            new VisibilitySection()
         };
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 44244028c9..05a8fdd26d 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -18,7 +18,9 @@ namespace osu.Game.Screens.Edit.Verify
     public class IssueTable : EditorTable
     {
         [Resolved]
-        private Bindable<Issue> selectedIssue { get; set; }
+        private VerifyScreen verify { get; set; }
+
+        private Bindable<Issue> selectedIssue;
 
         [Resolved]
         private EditorClock clock { get; set; }
@@ -71,6 +73,7 @@ namespace osu.Game.Screens.Edit.Verify
         {
             base.LoadComplete();
 
+            selectedIssue = verify.SelectedIssue.GetBoundCopy();
             selectedIssue.BindValueChanged(issue =>
             {
                 foreach (var b in BackgroundFlow) b.Selected = b.Item == issue.NewValue;
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index ed4658da8e..afd0c8760d 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -5,14 +5,19 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class VerifyScreen : RoundedContentEditorScreen
+    [Cached]
+    public class VerifyScreen : EditorRoundedScreen
     {
-        [Cached]
-        private Bindable<Issue> selectedIssue = new Bindable<Issue>();
+        public readonly Bindable<Issue> SelectedIssue = new Bindable<Issue>();
+
+        public readonly Bindable<DifficultyRating> InterpretedDifficulty = new Bindable<DifficultyRating>();
+
+        public IssueList IssueList { get; private set; }
 
         public VerifyScreen()
             : base(EditorScreenMode.Verify)
@@ -22,8 +27,7 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load()
         {
-            IssueList issueList;
-
+            IssueList = new IssueList();
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
@@ -39,8 +43,8 @@ namespace osu.Game.Screens.Edit.Verify
                     {
                         new Drawable[]
                         {
-                            issueList = new IssueList(),
-                            new IssueSettings(issueList),
+                            IssueList,
+                            new IssueSettings(),
                         },
                     }
                 }
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index f849426800..ce755bdcb4 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -9,19 +9,17 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    internal class VisibilitySection : Section
+    internal class VisibilitySection : EditorRoundedScreenSettingsSection
     {
-        public VisibilitySection(IssueList issueList)
-            : base(issueList)
-        {
-        }
+        [Resolved]
+        private VerifyScreen verify { get; set; }
 
         protected override string Header => "Visibility";
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
-            foreach (IssueType issueType in IssueList.ShowType.Keys)
+            foreach (IssueType issueType in verify.IssueList.ShowType.Keys)
             {
                 var checkbox = new SettingsCheckbox
                 {
@@ -30,8 +28,8 @@ namespace osu.Game.Screens.Edit.Verify
                     LabelText = issueType.ToString()
                 };
 
-                checkbox.Current.BindTo(IssueList.ShowType[issueType]);
-                checkbox.Current.BindValueChanged(_ => IssueList.Refresh());
+                checkbox.Current.BindTo(verify.IssueList.ShowType[issueType]);
+                checkbox.Current.BindValueChanged(_ => verify.IssueList.Refresh());
                 Flow.Add(checkbox);
             }
         }

From 789025a7cea6f3621301f011dd182954f61ff806 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 16:56:07 +0900
Subject: [PATCH 09988/10326] Update playfield/stage/column implementations for
 pooling

---
 osu.Game.Rulesets.Mania/UI/Column.cs         | 31 +++++++---------
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs |  5 +++
 osu.Game.Rulesets.Mania/UI/Stage.cs          | 37 ++++++++++++++++----
 3 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 8247a37881..1ee3f8c668 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -92,6 +92,13 @@ namespace osu.Game.Rulesets.Mania.UI
             RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 200);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            NewResult += OnNewResult;
+        }
+
         public ColumnType ColumnType { get; set; }
 
         public bool IsSpecial => ColumnType == ColumnType.Special;
@@ -105,28 +112,14 @@ namespace osu.Game.Rulesets.Mania.UI
             return dependencies;
         }
 
-        /// <summary>
-        /// Adds a DrawableHitObject to this Playfield.
-        /// </summary>
-        /// <param name="hitObject">The DrawableHitObject to add.</param>
-        public override void Add(DrawableHitObject hitObject)
+        protected override void OnNewDrawableHitObject(DrawableHitObject drawableHitObject)
         {
-            hitObject.AccentColour.Value = AccentColour;
-            hitObject.OnNewResult += OnNewResult;
+            base.OnNewDrawableHitObject(drawableHitObject);
 
-            DrawableManiaHitObject maniaObject = (DrawableManiaHitObject)hitObject;
+            drawableHitObject.AccentColour.Value = AccentColour;
+
+            DrawableManiaHitObject maniaObject = (DrawableManiaHitObject)drawableHitObject;
             maniaObject.CheckHittable = hitPolicy.IsHittable;
-
-            base.Add(hitObject);
-        }
-
-        public override bool Remove(DrawableHitObject h)
-        {
-            if (!base.Remove(h))
-                return false;
-
-            h.OnNewResult -= OnNewResult;
-            return true;
         }
 
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index 271e432e8d..8830c440c0 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
@@ -56,6 +57,10 @@ namespace osu.Game.Rulesets.Mania.UI
             }
         }
 
+        public override void Add(HitObject hitObject) => getStageByColumn(((ManiaHitObject)hitObject).Column).Add(hitObject);
+
+        public override bool Remove(HitObject hitObject) => getStageByColumn(((ManiaHitObject)hitObject).Column).Remove(hitObject);
+
         public override void Add(DrawableHitObject h) => getStageByColumn(((ManiaHitObject)h.HitObject).Column).Add(h);
 
         public override bool Remove(DrawableHitObject h) => getStageByColumn(((ManiaHitObject)h.HitObject).Column).Remove(h);
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index dc34bffab1..eee75f3200 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI.Components;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -132,10 +133,37 @@ namespace osu.Game.Rulesets.Mania.UI
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            NewResult += OnNewResult;
+        }
+
+        public override void Add(HitObject hitObject)
+        {
+            var maniaObject = (ManiaHitObject)hitObject;
+            int columnIndex = -1;
+
+            maniaObject.ColumnBindable.BindValueChanged(_ =>
+            {
+                if (columnIndex != -1)
+                    Columns.ElementAt(columnIndex).Remove(hitObject);
+
+                columnIndex = maniaObject.Column - firstColumnIndex;
+                Columns.ElementAt(columnIndex).Add(hitObject);
+            }, true);
+        }
+
+        public override bool Remove(HitObject hitObject)
+        {
+            var maniaObject = (ManiaHitObject)hitObject;
+            int columnIndex = maniaObject.Column - firstColumnIndex;
+            return Columns.ElementAt(columnIndex).Remove(hitObject);
+        }
+
         public override void Add(DrawableHitObject h)
         {
             var maniaObject = (ManiaHitObject)h.HitObject;
-
             int columnIndex = -1;
 
             maniaObject.ColumnBindable.BindValueChanged(_ =>
@@ -146,18 +174,13 @@ namespace osu.Game.Rulesets.Mania.UI
                 columnIndex = maniaObject.Column - firstColumnIndex;
                 Columns.ElementAt(columnIndex).Add(h);
             }, true);
-
-            h.OnNewResult += OnNewResult;
         }
 
         public override bool Remove(DrawableHitObject h)
         {
             var maniaObject = (ManiaHitObject)h.HitObject;
             int columnIndex = maniaObject.Column - firstColumnIndex;
-            Columns.ElementAt(columnIndex).Remove(h);
-
-            h.OnNewResult -= OnNewResult;
-            return true;
+            return Columns.ElementAt(columnIndex).Remove(h);
         }
 
         public void Add(BarLine barline) => base.Add(new DrawableBarLine(barline));

From 7913189aa911e814025e5083eddc7de5d74c5c51 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 16:56:23 +0900
Subject: [PATCH 09989/10326] Turn on pooling

---
 .../UI/DrawableManiaRuleset.cs                   | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 4ee060e91e..e497646a13 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -18,7 +18,6 @@ using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -134,20 +133,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected override PassThroughInputManager CreateInputManager() => new ManiaInputManager(Ruleset.RulesetInfo, Variant);
 
-        public override DrawableHitObject<ManiaHitObject> CreateDrawableRepresentation(ManiaHitObject h)
-        {
-            switch (h)
-            {
-                case HoldNote holdNote:
-                    return new DrawableHoldNote(holdNote);
-
-                case Note note:
-                    return new DrawableNote(note);
-
-                default:
-                    return null;
-            }
-        }
+        public override DrawableHitObject<ManiaHitObject> CreateDrawableRepresentation(ManiaHitObject h) => null;
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new ManiaFramedReplayInputHandler(replay);
 

From 1af3bbf400d7267feac4627ef5d8e1ab2b87b855 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 17:06:44 +0900
Subject: [PATCH 09990/10326] Fix base.OnLoadComplete() not being called

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index b711e67f25..33d872dfb6 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             configTimingBasedNoteColouring.BindValueChanged(_ => updateSnapColour());
             StartTimeBindable.BindValueChanged(_ => updateSnapColour(), true);
         }

From f992b59b4f9b3ef5b8460704f3f878e818fe7367 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 17:07:42 +0900
Subject: [PATCH 09991/10326] Fix DrawableHoldNote retaining hit states through
 applications

---
 .../Objects/Drawables/DrawableHoldNote.cs             | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index e1cf1851df..d1310d42eb 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -114,6 +115,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             });
         }
 
+        protected override void OnApply()
+        {
+            base.OnApply();
+
+            sizingContainer.Size = Vector2.One;
+            HoldStartTime = null;
+            HoldBrokenTime = null;
+            releaseTime = null;
+        }
+
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
         {
             base.AddNestedHitObject(hitObject);

From 0fa3027ab9eea096fc792a6a4bd9ff6a4944e130 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 17:36:26 +0900
Subject: [PATCH 09992/10326] Increase pool sizes a bit

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 1ee3f8c668..57d3f54716 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -85,11 +85,11 @@ namespace osu.Game.Rulesets.Mania.UI
 
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
 
-            RegisterPool<Note, DrawableNote>(5, 20);
-            RegisterPool<HoldNote, DrawableHoldNote>(5, 20);
-            RegisterPool<HeadNote, DrawableHoldNoteHead>(5, 20);
-            RegisterPool<TailNote, DrawableHoldNoteTail>(5, 20);
-            RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 200);
+            RegisterPool<Note, DrawableNote>(10, 50);
+            RegisterPool<HoldNote, DrawableHoldNote>(10, 50);
+            RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
+            RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);
+            RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 250);
         }
 
         protected override void LoadComplete()

From be187e8ebdd8d981b1c3c1620960e1aaca27d44b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 17:42:04 +0900
Subject: [PATCH 09993/10326] Avoid hard crash if `Save()` is called before
 preparing for mutation

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 5deebe9800..fcb1392ed5 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Skinning.Editor
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private bool hasBegunMutating;
+
         public SkinEditor(Drawable targetScreen)
         {
             this.targetScreen = targetScreen;
@@ -139,7 +141,11 @@ namespace osu.Game.Skinning.Editor
             // schedule ensures this only happens when the skin editor is visible.
             // also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
             // probably something which will be factored out in a future database refactor so not too concerning for now.
-            currentSkin.BindValueChanged(skin => Scheduler.AddOnce(skinChanged), true);
+            currentSkin.BindValueChanged(skin =>
+            {
+                hasBegunMutating = false;
+                Scheduler.AddOnce(skinChanged);
+            }, true);
         }
 
         private void skinChanged()
@@ -161,6 +167,7 @@ namespace osu.Game.Skinning.Editor
             });
 
             skins.EnsureMutableSkin();
+            hasBegunMutating = true;
         }
 
         private void placeComponent(Type type)
@@ -194,6 +201,9 @@ namespace osu.Game.Skinning.Editor
 
         public void Save()
         {
+            if (!hasBegunMutating)
+                return;
+
             SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)

From 2f55d1e5ab9c734bb07519849d6ca4c31f32b375 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 17:42:12 +0900
Subject: [PATCH 09994/10326] Also save on skin switch

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index fcb1392ed5..9e50aab829 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -143,6 +143,8 @@ namespace osu.Game.Skinning.Editor
             // probably something which will be factored out in a future database refactor so not too concerning for now.
             currentSkin.BindValueChanged(skin =>
             {
+                Save();
+
                 hasBegunMutating = false;
                 Scheduler.AddOnce(skinChanged);
             }, true);

From 80e231d90ad9a25444b7a2e2c1d43413cbaf327e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 12 May 2021 11:07:31 +0300
Subject: [PATCH 09995/10326] Add failing test case

---
 .../Visual/Editing/TestSceneComposeSelectBox.cs  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index e383aa8008..d5cfeb1878 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -167,5 +167,21 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox, new Vector2(20)));
             AddUntilStep("rotation handle hidden", () => rotationHandle.Alpha == 0);
         }
+
+        /// <summary>
+        /// Tests that hovering over two handles instantaneously from one to another does not crash or cause issues to the visibility state.
+        /// </summary>
+        [Test]
+        public void TestHoverOverTwoHandlesInstantaneously()
+        {
+            AddStep("hover over top-left scale handle", () =>
+                InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == Anchor.TopLeft)));
+            AddStep("hover over top-right scale handle", () =>
+                InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == Anchor.TopRight)));
+            AddUntilStep("top-left rotation handle hidden", () =>
+                this.ChildrenOfType<SelectionBoxRotationHandle>().Single(r => r.Anchor == Anchor.TopLeft).Alpha == 0);
+            AddUntilStep("top-right rotation handle shown", () =>
+                this.ChildrenOfType<SelectionBoxRotationHandle>().Single(r => r.Anchor == Anchor.TopRight).Alpha == 1);
+        }
     }
 }

From 96d3586294dbfef0f9af5b7a9e70e00a868d0600 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 12 May 2021 11:30:12 +0300
Subject: [PATCH 09996/10326] Fix rotation handle visibility logic not handling
 two handles hovered at once

---
 .../Compose/Components/SelectionBoxDragHandleContainer.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 456f72878d..397158b9f6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -84,8 +84,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (activeHandle?.IsHeld == true)
                 return;
 
-            activeHandle = rotationHandles.SingleOrDefault(h => h.IsHeld || h.IsHovered);
-            activeHandle ??= allDragHandles.SingleOrDefault(h => h.IsHovered);
+            activeHandle = rotationHandles.FirstOrDefault(h => h.IsHeld || h.IsHovered);
+            activeHandle ??= allDragHandles.FirstOrDefault(h => h.IsHovered);
 
             if (activeHandle != null)
             {

From 088335a0359f73ecb10625c5bcccbaefff9edbd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 17:45:51 +0900
Subject: [PATCH 09997/10326] Revert "Also save on skin switch"

This reverts commit 2f55d1e5ab9c734bb07519849d6ca4c31f32b375.
---
 osu.Game/Skinning/Editor/SkinEditor.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 9e50aab829..fcb1392ed5 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -143,8 +143,6 @@ namespace osu.Game.Skinning.Editor
             // probably something which will be factored out in a future database refactor so not too concerning for now.
             currentSkin.BindValueChanged(skin =>
             {
-                Save();
-
                 hasBegunMutating = false;
                 Scheduler.AddOnce(skinChanged);
             }, true);

From 0a895fff158ab57c8dc0e9a4ff9e6d9f5a7b218e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 18:53:25 +0900
Subject: [PATCH 09998/10326] Remove remaining test usage of `SkinnableXXX` HUD
 components

---
 .../Visual/Gameplay/TestSceneComboCounter.cs  |  8 ++------
 .../TestSceneSkinnableAccuracyCounter.cs      |  3 ++-
 .../TestSceneSkinnableHealthDisplay.cs        | 11 ++--------
 .../TestSceneSkinnableScoreCounter.cs         | 11 +++-------
 .../Play/HUD/SkinnableAccuracyCounter.cs      | 16 ---------------
 .../Screens/Play/HUD/SkinnableComboCounter.cs | 16 ---------------
 .../Play/HUD/SkinnableHealthDisplay.cs        | 16 ---------------
 .../Screens/Play/HUD/SkinnableScoreCounter.cs | 16 ---------------
 osu.Game/Skinning/DefaultSkin.cs              | 20 +++++++++++++++++++
 osu.Game/Skinning/SkinnableDrawable.cs        |  4 ++--
 10 files changed, 31 insertions(+), 90 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
index b0a0b5189f..b22af0f7ac 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
@@ -1,22 +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.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneComboCounter : SkinnableTestScene
     {
-        private IEnumerable<SkinnableComboCounter> comboCounters => CreatedDrawables.OfType<SkinnableComboCounter>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
         [Cached]
@@ -25,7 +21,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create combo counters", () => SetContents(() => new SkinnableComboCounter()));
+            AddStep("Create combo counters", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.ComboCounter))));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
index 6a8a2187f9..d9139299ea 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
@@ -8,6 +8,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -22,7 +23,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void SetUpSteps()
         {
             AddStep("Set initial accuracy", () => scoreProcessor.Accuracy.Value = 1);
-            AddStep("Create accuracy counters", () => SetContents(() => new SkinnableAccuracyCounter()));
+            AddStep("Create accuracy counters", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter))));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index 4f50613416..ead27bf017 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.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.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
@@ -12,14 +10,12 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinnableHealthDisplay : SkinnableTestScene
     {
-        private IEnumerable<SkinnableHealthDisplay> healthDisplays => CreatedDrawables.OfType<SkinnableHealthDisplay>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
         [Cached(typeof(HealthProcessor))]
@@ -28,10 +24,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create health displays", () =>
-            {
-                SetContents(() => new SkinnableHealthDisplay());
-            });
+            AddStep("Create health displays", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.HealthDisplay))));
             AddStep(@"Reset all", delegate
             {
                 healthProcessor.Health.Value = 1;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
index 4f2183711e..8d633c3ca2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
@@ -1,23 +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.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinnableScoreCounter : SkinnableTestScene
     {
-        private IEnumerable<SkinnableScoreCounter> scoreCounters => CreatedDrawables.OfType<SkinnableScoreCounter>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
         [Cached]
@@ -26,7 +21,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create score counters", () => SetContents(() => new SkinnableScoreCounter()));
+            AddStep("Create score counters", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.ScoreCounter))));
         }
 
         [Test]
@@ -40,7 +35,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestVeryLargeScore()
         {
-            AddStep("set large score", () => scoreCounters.ForEach(counter => scoreProcessor.TotalScore.Value = 1_000_000_000));
+            AddStep("set large score", () => scoreProcessor.TotalScore.Value = 1_000_000_000);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
deleted file mode 100644
index fcb8fca35d..0000000000
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.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.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public class SkinnableAccuracyCounter : SkinnableDrawable
-    {
-        public SkinnableAccuracyCounter()
-            : base(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter), _ => new DefaultAccuracyCounter())
-        {
-            CentreComponent = false;
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
deleted file mode 100644
index c62f1460c9..0000000000
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.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.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public class SkinnableComboCounter : SkinnableDrawable
-    {
-        public SkinnableComboCounter()
-            : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), skinComponent => new DefaultComboCounter())
-        {
-            CentreComponent = false;
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
deleted file mode 100644
index 3ba6a33276..0000000000
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.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.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public class SkinnableHealthDisplay : SkinnableDrawable
-    {
-        public SkinnableHealthDisplay()
-            : base(new HUDSkinComponent(HUDSkinComponents.HealthDisplay), _ => new DefaultHealthDisplay())
-        {
-            CentreComponent = false;
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
deleted file mode 100644
index cc9a712e97..0000000000
--- a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.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.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public class SkinnableScoreCounter : SkinnableDrawable
-    {
-        public SkinnableScoreCounter()
-            : base(new HUDSkinComponent(HUDSkinComponents.ScoreCounter), _ => new DefaultScoreCounter())
-        {
-            CentreComponent = false;
-        }
-    }
-}
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 3de3dc7702..a9ab4e53c8 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -91,6 +91,26 @@ namespace osu.Game.Skinning
                     }
 
                     return null;
+
+                case HUDSkinComponent hudComponent:
+                {
+                    switch (hudComponent.Component)
+                    {
+                        case HUDSkinComponents.ComboCounter:
+                            return new DefaultComboCounter();
+
+                        case HUDSkinComponents.ScoreCounter:
+                            return new DefaultScoreCounter();
+
+                        case HUDSkinComponents.AccuracyCounter:
+                            return new DefaultAccuracyCounter();
+
+                        case HUDSkinComponents.HealthDisplay:
+                            return new DefaultHealthDisplay();
+                    }
+
+                    return null;
+                }
             }
 
             return base.GetDrawableComponent(component);
diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index 5a48bc4baf..77f7cf5c3f 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Skinning
         /// <param name="defaultImplementation">A function to create the default skin implementation of this element.</param>
         /// <param name="allowFallback">A conditional to decide whether to allow fallback to the default implementation if a skinned element is not present.</param>
         /// <param name="confineMode">How (if at all) the <see cref="Drawable"/> should be resize to fit within our own bounds.</param>
-        public SkinnableDrawable(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
+        public SkinnableDrawable(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation = null, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
             : this(component, allowFallback, confineMode)
         {
             createDefault = defaultImplementation;
@@ -68,7 +68,7 @@ namespace osu.Game.Skinning
 
         private bool isDefault;
 
-        protected virtual Drawable CreateDefault(ISkinComponent component) => createDefault(component);
+        protected virtual Drawable CreateDefault(ISkinComponent component) => createDefault?.Invoke(component) ?? Empty();
 
         /// <summary>
         /// Whether to apply size restrictions (specified via <see cref="confineMode"/>) to the default implementation.

From 75227e5a70f21cb941e249c6e5d80b15b62e956a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 18:55:48 +0900
Subject: [PATCH 09999/10326] Change default skin to use component lookup for
 conformity

---
 osu.Game/Skinning/DefaultSkin.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index a9ab4e53c8..2715c9fce2 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -80,10 +80,10 @@ namespace osu.Game.Skinning
                             {
                                 Children = new Drawable[]
                                 {
-                                    new DefaultComboCounter(),
-                                    new DefaultScoreCounter(),
-                                    new DefaultAccuracyCounter(),
-                                    new DefaultHealthDisplay(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ComboCounter)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreCounter)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)),
                                 }
                             };
 

From 55e1f97f5947dc8e1d65c14935b4a51eaae7c4ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 19:06:28 +0900
Subject: [PATCH 10000/10326] Remove unused using statement

---
 .../Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs        | 1 -
 osu.Game/Skinning/DefaultSkin.cs                                | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
index d9139299ea..6f4e6a2420 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
@@ -7,7 +7,6 @@ using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 2715c9fce2..3dcfbcda13 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Skinning
                                 }
                             })
                             {
-                                Children = new Drawable[]
+                                Children = new[]
                                 {
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ComboCounter)),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreCounter)),

From 7bac81f39487c446d515e5454f49b402680e38ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 19:37:00 +0900
Subject: [PATCH 10001/10326] Fix incorrect inline comments

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 23411f2b3d..58fa255508 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -85,13 +85,13 @@ namespace osu.Game.Skinning.Editor
 
         protected override void OnSelected()
         {
-            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            // base logic hides selected blueprints when not selected, but skin blueprints don't do that.
             updateSelectedState();
         }
 
         protected override void OnDeselected()
         {
-            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            // base logic hides selected blueprints when not selected, but skin blueprints don't do that.
             updateSelectedState();
         }
 

From 315a2b8314a044689eb607dfdced7bc24fc1f4c9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 12 May 2021 20:50:20 +0300
Subject: [PATCH 10002/10326] Refactor MonthDropdown to decouple autosized
 logic

---
 .../Overlays/News/Sidebar/MonthDropdown.cs    | 122 ++++++++++--------
 1 file changed, 69 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index 91412d9527..d6d7527a6c 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -20,85 +20,37 @@ namespace osu.Game.Overlays.News.Sidebar
 {
     public class MonthDropdown : CompositeDrawable
     {
-        private const int header_height = 15;
         private const int animation_duration = 250;
 
         public readonly BindableBool IsOpen = new BindableBool();
 
-        private readonly FillFlowContainer postsFlow;
-
         public MonthDropdown(int month, int year, IEnumerable<APINewsPost> posts)
         {
             Debug.Assert(posts.All(p => p.PublishedAt.Month == month && p.PublishedAt.Year == year));
 
             RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
             Masking = true;
             InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
                     new DropdownHeader(month, year)
                     {
                         IsOpen = { BindTarget = IsOpen }
                     },
-                    postsFlow = new FillFlowContainer
+                    new PostsContainer
                     {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 5),
+                        IsOpen = { BindTarget = IsOpen },
                         Children = posts.Select(p => new PostButton(p)).ToArray()
                     }
                 }
             };
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            IsOpen.BindValueChanged(open =>
-            {
-                ClearTransforms();
-
-                if (open.NewValue)
-                {
-                    AutoSizeAxes = Axes.Y;
-                    postsFlow.FadeIn(animation_duration, Easing.OutQuint);
-                }
-                else
-                {
-                    AutoSizeAxes = Axes.None;
-                    this.ResizeHeightTo(header_height, animation_duration, Easing.OutQuint);
-
-                    postsFlow.FadeOut(animation_duration, Easing.OutQuint);
-                }
-            }, true);
-
-            // First state change should be instant.
-            FinishTransforms(true);
-        }
-
-        private bool shouldUpdateAutosize = true;
-
-        // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutosizeDuration.
-        protected override void UpdateAfterAutoSize()
-        {
-            base.UpdateAfterAutoSize();
-
-            if (shouldUpdateAutosize)
-            {
-                AutoSizeDuration = animation_duration;
-                AutoSizeEasing = Easing.OutQuint;
-
-                shouldUpdateAutosize = false;
-            }
-        }
-
         private class DropdownHeader : OsuClickableContainer
         {
             public readonly BindableBool IsOpen = new BindableBool();
@@ -110,7 +62,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 var date = new DateTime(year, month, 1);
 
                 RelativeSizeAxes = Axes.X;
-                Height = header_height;
+                Height = 15;
                 Action = IsOpen.Toggle;
                 Children = new Drawable[]
                 {
@@ -152,7 +104,6 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
-
                 Child = text = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 12))
                 {
                     RelativeSizeAxes = Axes.X,
@@ -169,5 +120,70 @@ namespace osu.Game.Overlays.News.Sidebar
                 Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
+
+        private class PostsContainer : Container
+        {
+            public readonly BindableBool IsOpen = new BindableBool();
+
+            protected override Container<Drawable> Content => content;
+
+            private readonly FillFlowContainer content;
+
+            public PostsContainer()
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                InternalChild = content = new FillFlowContainer
+                {
+                    Margin = new MarginPadding { Top = 5 },
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0, 5)
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                IsOpen.BindValueChanged(open =>
+                {
+                    ClearTransforms();
+
+                    if (open.NewValue)
+                    {
+                        AutoSizeAxes = Axes.Y;
+                        content.FadeIn(animation_duration, Easing.OutQuint);
+                    }
+                    else
+                    {
+                        AutoSizeAxes = Axes.None;
+                        this.ResizeHeightTo(0, animation_duration, Easing.OutQuint);
+
+                        content.FadeOut(animation_duration, Easing.OutQuint);
+                    }
+                }, true);
+
+                // First state change should be instant.
+                FinishTransforms(true);
+            }
+
+            private bool shouldUpdateAutosize = true;
+
+            // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutosizeDuration.
+            protected override void UpdateAfterAutoSize()
+            {
+                base.UpdateAfterAutoSize();
+
+                if (shouldUpdateAutosize)
+                {
+                    AutoSizeDuration = animation_duration;
+                    AutoSizeEasing = Easing.OutQuint;
+
+                    shouldUpdateAutosize = false;
+                }
+            }
+        }
     }
 }

From 4464204e336688bcfce0266c2014ec20a7978e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 May 2021 22:18:15 +0200
Subject: [PATCH 10003/10326] Mark all skin ctors used via reflection in
 `SkinInfo.CreateInstance()`

---
 osu.Game/Skinning/DefaultLegacySkin.cs | 2 ++
 osu.Game/Skinning/DefaultSkin.cs       | 2 ++
 osu.Game/Skinning/LegacySkin.cs        | 1 +
 3 files changed, 5 insertions(+)

diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 564be8630e..7adf53e5e7 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.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 JetBrains.Annotations;
 using osu.Framework.IO.Stores;
 using osu.Game.IO;
 using osuTK.Graphics;
@@ -9,6 +10,7 @@ namespace osu.Game.Skinning
 {
     public class DefaultLegacySkin : LegacySkin
     {
+        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
             : this(Info, storage, resources)
         {
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index fcd874d6ca..745bdf0bb2 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -20,6 +21,7 @@ namespace osu.Game.Skinning
         {
         }
 
+        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public DefaultSkin(SkinInfo skin, IStorageResourceProvider resources)
             : base(skin)
         {
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index eae3b69233..74250f9684 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Skinning
 
         private readonly Dictionary<int, LegacyManiaSkinConfiguration> maniaConfigurations = new Dictionary<int, LegacyManiaSkinConfiguration>();
 
+        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public LegacySkin(SkinInfo skin, IStorageResourceProvider resources)
             : this(skin, new LegacySkinResourceStore<SkinFileInfo>(skin, resources.Files), resources, "skin.ini")
         {

From 1b579dd83801849c33ce06a685eab48230cdd648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 May 2021 22:42:26 +0200
Subject: [PATCH 10004/10326] Extract invariant instantiation info extension
 method

---
 osu.Game/Extensions/TypeExtensions.cs | 31 +++++++++++++++++++++++++++
 osu.Game/Rulesets/Ruleset.cs          |  3 ++-
 osu.Game/Rulesets/RulesetInfo.cs      | 16 +-------------
 osu.Game/Skinning/SkinInfo.cs         | 16 +-------------
 osu.Game/Skinning/SkinManager.cs      |  3 ++-
 5 files changed, 37 insertions(+), 32 deletions(-)
 create mode 100644 osu.Game/Extensions/TypeExtensions.cs

diff --git a/osu.Game/Extensions/TypeExtensions.cs b/osu.Game/Extensions/TypeExtensions.cs
new file mode 100644
index 0000000000..2e93c81758
--- /dev/null
+++ b/osu.Game/Extensions/TypeExtensions.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 System;
+using System.Linq;
+
+namespace osu.Game.Extensions
+{
+    internal static class TypeExtensions
+    {
+        /// <summary>
+        /// Returns <paramref name="type"/>'s <see cref="Type.AssemblyQualifiedName"/>
+        /// with the assembly version, culture and public key token values removed.
+        /// </summary>
+        /// <remarks>
+        /// This method is usually used in extensibility scenarios (i.e. for custom rulesets or skins)
+        /// when a version-agnostic identifier associated with a C# class - potentially originating from
+        /// an external assembly - is needed.
+        /// Leaving only the type and assembly names in such a scenario allows to preserve compatibility
+        /// across assembly versions.
+        /// </remarks>
+        internal static string GetInvariantInstantiationInfo(this Type type)
+        {
+            string assemblyQualifiedName = type.AssemblyQualifiedName;
+            if (assemblyQualifiedName == null)
+                throw new ArgumentException($"{type}'s assembly-qualified name is null. Ensure that it is a concrete type and not a generic type parameter.", nameof(type));
+
+            return string.Join(',', assemblyQualifiedName.Split(',').Take(2));
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 7f0c27adfc..7bdf84ace4 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -26,6 +26,7 @@ using JetBrains.Annotations;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Testing;
+using osu.Game.Extensions;
 using osu.Game.Rulesets.Filter;
 using osu.Game.Screens.Ranking.Statistics;
 
@@ -135,7 +136,7 @@ namespace osu.Game.Rulesets
                 Name = Description,
                 ShortName = ShortName,
                 ID = (this as ILegacyRuleset)?.LegacyID,
-                InstantiationInfo = GetType().AssemblyQualifiedName,
+                InstantiationInfo = GetType().GetInvariantInstantiationInfo(),
                 Available = true,
             };
         }
diff --git a/osu.Game/Rulesets/RulesetInfo.cs b/osu.Game/Rulesets/RulesetInfo.cs
index d5aca8c650..702bf35fa8 100644
--- a/osu.Game/Rulesets/RulesetInfo.cs
+++ b/osu.Game/Rulesets/RulesetInfo.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Testing;
 
@@ -18,20 +17,7 @@ namespace osu.Game.Rulesets
 
         public string ShortName { get; set; }
 
-        private string instantiationInfo;
-
-        public string InstantiationInfo
-        {
-            get => instantiationInfo;
-            set => instantiationInfo = abbreviateInstantiationInfo(value);
-        }
-
-        private string abbreviateInstantiationInfo(string value)
-        {
-            // exclude version onwards, matching only on namespace and type.
-            // this is mainly to allow for new versions of already loaded rulesets to "upgrade" from old.
-            return string.Join(',', value.Split(',').Take(2));
-        }
+        public string InstantiationInfo { get; set; }
 
         [JsonIgnore]
         public bool Available { get; set; }
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index 2e29808cb4..a61a6dd1ce 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Database;
@@ -25,20 +24,7 @@ namespace osu.Game.Skinning
 
         public string Creator { get; set; }
 
-        private string instantiationInfo;
-
-        public string InstantiationInfo
-        {
-            get => instantiationInfo;
-            set => instantiationInfo = abbreviateInstantiationInfo(value);
-        }
-
-        private string abbreviateInstantiationInfo(string value)
-        {
-            // exclude version onwards, matching only on namespace and type.
-            // this is mainly to allow for new versions of already loaded rulesets to "upgrade" from old.
-            return string.Join(',', value.Split(',').Take(2));
-        }
+        public string InstantiationInfo { get; set; }
 
         public virtual Skin CreateInstance(IResourceStore<byte[]> legacyDefaultResources, IStorageResourceProvider resources)
         {
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index dbb9dcb7fc..b4051286aa 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -22,6 +22,7 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Database;
+using osu.Game.Extensions;
 using osu.Game.IO;
 using osu.Game.IO.Archives;
 
@@ -124,7 +125,7 @@ namespace osu.Game.Skinning
 
             var instance = GetSkin(model);
 
-            model.InstantiationInfo ??= instance.GetType().AssemblyQualifiedName;
+            model.InstantiationInfo ??= instance.GetType().GetInvariantInstantiationInfo();
 
             if (model.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
                 populateMetadata(model, instance);

From a6aec6e0074db91968c3526c4f9c556fba1c2329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 May 2021 23:34:25 +0200
Subject: [PATCH 10005/10326] Fix missed `InstantiationInfo` setter usages

---
 osu.Game/Skinning/DefaultLegacySkin.cs | 3 ++-
 osu.Game/Skinning/SkinInfo.cs          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 7adf53e5e7..b05c309e4e 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -3,6 +3,7 @@
 
 using JetBrains.Annotations;
 using osu.Framework.IO.Stores;
+using osu.Game.Extensions;
 using osu.Game.IO;
 using osuTK.Graphics;
 
@@ -35,7 +36,7 @@ namespace osu.Game.Skinning
             ID = SkinInfo.CLASSIC_SKIN, // this is temporary until database storage is decided upon.
             Name = "osu!classic",
             Creator = "team osu!",
-            InstantiationInfo = typeof(DefaultLegacySkin).AssemblyQualifiedName,
+            InstantiationInfo = typeof(DefaultLegacySkin).GetInvariantInstantiationInfo()
         };
     }
 }
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index a61a6dd1ce..bc57a8e71c 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.Extensions;
 using osu.Game.IO;
 
 namespace osu.Game.Skinning
@@ -50,7 +51,7 @@ namespace osu.Game.Skinning
             ID = DEFAULT_SKIN,
             Name = "osu!lazer",
             Creator = "team osu!",
-            InstantiationInfo = typeof(DefaultSkin).AssemblyQualifiedName,
+            InstantiationInfo = typeof(DefaultSkin).GetInvariantInstantiationInfo()
         };
 
         public bool Equals(SkinInfo other) => other != null && ID == other.ID;

From 27ca7d0f4fa24f8837607dab5f3009459e92b940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 May 2021 23:53:39 +0200
Subject: [PATCH 10006/10326] Actually annotate the correct ctor

---
 osu.Game/Skinning/DefaultLegacySkin.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index b05c309e4e..f30130b1fb 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -11,12 +11,12 @@ namespace osu.Game.Skinning
 {
     public class DefaultLegacySkin : LegacySkin
     {
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
             : this(Info, storage, resources)
         {
         }
 
+        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public DefaultLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
             : base(skin, storage, resources, string.Empty)
         {

From 56bd8976666ee49318ab22d4dcfa86f5f7b627ae Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 04:29:27 +0200
Subject: [PATCH 10007/10326] Move `ShowIssueTypes` to `VerifyScreen`

---
 osu.Game/Screens/Edit/Verify/IssueList.cs         | 14 ++------------
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs      |  8 ++++++++
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index befffdd9db..f2d3ef9dda 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -35,8 +35,6 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
-        public Dictionary<IssueType, Bindable<bool>> ShowType { get; set; }
-
         public Bindable<DifficultyRating> InterpretedDifficulty { get; set; }
 
         private IBeatmapVerifier rulesetVerifier;
@@ -45,14 +43,6 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
-            // Reflects the user interface. Only types in this dictionary have configurable visibility.
-            ShowType = new Dictionary<IssueType, Bindable<bool>>
-            {
-                { IssueType.Warning, new Bindable<bool>(true) },
-                { IssueType.Error, new Bindable<bool>(true) },
-                { IssueType.Negligible, new Bindable<bool>(false) }
-            };
-
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
@@ -116,9 +106,9 @@ namespace osu.Game.Screens.Edit.Verify
 
         private IEnumerable<Issue> filter(IEnumerable<Issue> issues)
         {
-            foreach (IssueType issueType in ShowType.Keys)
+            foreach (var issueType in verify.ShowIssueType.Keys)
             {
-                if (!ShowType[issueType].Value)
+                if (!verify.ShowIssueType[issueType].Value)
                     issues = issues.Where(issue => issue.Template.Type != issueType);
             }
 
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index afd0c8760d..cf1a471714 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.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.Bindables;
 using osu.Framework.Graphics;
@@ -17,6 +18,13 @@ namespace osu.Game.Screens.Edit.Verify
 
         public readonly Bindable<DifficultyRating> InterpretedDifficulty = new Bindable<DifficultyRating>();
 
+        public readonly Dictionary<IssueType, Bindable<bool>> ShowIssueType = new Dictionary<IssueType, Bindable<bool>>
+        {
+            { IssueType.Warning, new Bindable<bool>(true) },
+            { IssueType.Error, new Bindable<bool>(true) },
+            { IssueType.Negligible, new Bindable<bool>(false) }
+        };
+
         public IssueList IssueList { get; private set; }
 
         public VerifyScreen()
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index ce755bdcb4..71f3740d86 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
-            foreach (IssueType issueType in verify.IssueList.ShowType.Keys)
+            foreach (IssueType issueType in verify.ShowIssueType.Keys)
             {
                 var checkbox = new SettingsCheckbox
                 {
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Edit.Verify
                     LabelText = issueType.ToString()
                 };
 
-                checkbox.Current.BindTo(verify.IssueList.ShowType[issueType]);
+                checkbox.Current.BindTo(verify.ShowIssueType[issueType]);
                 checkbox.Current.BindValueChanged(_ => verify.IssueList.Refresh());
                 Flow.Add(checkbox);
             }

From 6806e40ad99b1bb6b561765d05858d11e6f5223a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 04:30:40 +0200
Subject: [PATCH 10008/10326] Remove unnecessary local variable

This now exists in `VerifyScreen`, which we can access from here.
---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index f2d3ef9dda..19536401e9 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -35,8 +35,6 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
-        public Bindable<DifficultyRating> InterpretedDifficulty { get; set; }
-
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
 
@@ -46,8 +44,6 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
-            InterpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
-
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]

From dd8423c4c4350b5db811c8338d80235b2fc8a432 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 04:36:20 +0200
Subject: [PATCH 10009/10326] Set interpreted difficulty to correct default

---
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index cf1a471714..963b77baa1 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -35,6 +35,9 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load()
         {
+            InterpretedDifficulty.Default = EditorBeatmap.BeatmapInfo.DifficultyRating;
+            InterpretedDifficulty.SetDefault();
+
             IssueList = new IssueList();
             Child = new Container
             {

From fbb76ba5989d10690411561dbec0d74b4c0151d6 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 04:50:32 +0200
Subject: [PATCH 10010/10326] Split `ShowIssueTypes` dict into hidden and
 configurable lists

This way `VerifyScreen` is decoupled from which options `VisibilitySection` provides.

Bindings are a bit less neat, though.
---
 osu.Game/Screens/Edit/Verify/IssueList.cs     |  8 +------
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  |  8 +------
 .../Screens/Edit/Verify/VisibilitySection.cs  | 23 ++++++++++++++++---
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 19536401e9..22d410592e 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -102,13 +102,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         private IEnumerable<Issue> filter(IEnumerable<Issue> issues)
         {
-            foreach (var issueType in verify.ShowIssueType.Keys)
-            {
-                if (!verify.ShowIssueType[issueType].Value)
-                    issues = issues.Where(issue => issue.Template.Type != issueType);
-            }
-
-            return issues;
+            return issues.Where(issue => !verify.HiddenIssueTypes.Contains(issue.Template.Type));
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 963b77baa1..6d7a4a72e2 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -18,12 +17,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         public readonly Bindable<DifficultyRating> InterpretedDifficulty = new Bindable<DifficultyRating>();
 
-        public readonly Dictionary<IssueType, Bindable<bool>> ShowIssueType = new Dictionary<IssueType, Bindable<bool>>
-        {
-            { IssueType.Warning, new Bindable<bool>(true) },
-            { IssueType.Error, new Bindable<bool>(true) },
-            { IssueType.Negligible, new Bindable<bool>(false) }
-        };
+        public readonly BindableList<IssueType> HiddenIssueTypes = new BindableList<IssueType> { IssueType.Negligible };
 
         public IssueList IssueList { get; private set; }
 
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index 71f3740d86..3698f51f66 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -14,12 +14,19 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
+        private readonly IssueType[] configurableIssueTypes =
+        {
+            IssueType.Warning,
+            IssueType.Error,
+            IssueType.Negligible
+        };
+
         protected override string Header => "Visibility";
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
-            foreach (IssueType issueType in verify.ShowIssueType.Keys)
+            foreach (IssueType issueType in configurableIssueTypes)
             {
                 var checkbox = new SettingsCheckbox
                 {
@@ -28,8 +35,18 @@ namespace osu.Game.Screens.Edit.Verify
                     LabelText = issueType.ToString()
                 };
 
-                checkbox.Current.BindTo(verify.ShowIssueType[issueType]);
-                checkbox.Current.BindValueChanged(_ => verify.IssueList.Refresh());
+                checkbox.Current.Default = !verify.HiddenIssueTypes.Contains(issueType);
+                checkbox.Current.SetDefault();
+                checkbox.Current.BindValueChanged(state =>
+                {
+                    if (!state.NewValue)
+                        verify.HiddenIssueTypes.Add(issueType);
+                    else
+                        verify.HiddenIssueTypes.Remove(issueType);
+
+                    verify.IssueList.Refresh();
+                });
+
                 Flow.Add(checkbox);
             }
         }

From 5b0309296812f93f50aef02444367f7698cddb8c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 11:53:50 +0900
Subject: [PATCH 10011/10326] Fix possible test failure

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 69fbd56490..bba7e2b391 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("set user ready", () => client.ChangeState(MultiplayerUserState.Ready));
             AddStep("delete beatmap", () => beatmaps.Delete(importedSet));
 
-            AddAssert("user state is idle", () => client.LocalUser?.State == MultiplayerUserState.Idle);
+            AddUntilStep("user state is idle", () => client.LocalUser?.State == MultiplayerUserState.Idle);
         }
 
         [Test]

From c8d21f2c3fe65f4c5add3e1429c907a370a61b6a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 05:25:02 +0200
Subject: [PATCH 10012/10326] Isolate refreshing to `IssueList`

---
 osu.Game/Screens/Edit/Verify/IssueList.cs         | 6 +++---
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 22d410592e..7eba50498c 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Edit.Verify
                         new TriangleButton
                         {
                             Text = "Refresh",
-                            Action = Refresh,
+                            Action = refresh,
                             Size = new Vector2(120, 40),
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight,
@@ -83,10 +83,10 @@ namespace osu.Game.Screens.Edit.Verify
         {
             base.LoadComplete();
 
-            Refresh();
+            verify.HiddenIssueTypes.BindCollectionChanged((o, s) => refresh(), runOnceImmediately: true);
         }
 
-        public void Refresh()
+        private void refresh()
         {
             var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
 
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index 3698f51f66..7ec3ecee07 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -43,8 +43,6 @@ namespace osu.Game.Screens.Edit.Verify
                         verify.HiddenIssueTypes.Add(issueType);
                     else
                         verify.HiddenIssueTypes.Remove(issueType);
-
-                    verify.IssueList.Refresh();
                 });
 
                 Flow.Add(checkbox);

From e86834b74060d5fc7e2e9314142316b74ccf821b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 05:25:20 +0200
Subject: [PATCH 10013/10326] Use local bound copy for `HiddenIssueTypes`

---
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index 7ec3ecee07..48bf0523b1 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
+            var hiddenIssueTypes = verify.HiddenIssueTypes.GetBoundCopy();
+
             foreach (IssueType issueType in configurableIssueTypes)
             {
                 var checkbox = new SettingsCheckbox
@@ -35,14 +37,14 @@ namespace osu.Game.Screens.Edit.Verify
                     LabelText = issueType.ToString()
                 };
 
-                checkbox.Current.Default = !verify.HiddenIssueTypes.Contains(issueType);
+                checkbox.Current.Default = !hiddenIssueTypes.Contains(issueType);
                 checkbox.Current.SetDefault();
                 checkbox.Current.BindValueChanged(state =>
                 {
                     if (!state.NewValue)
-                        verify.HiddenIssueTypes.Add(issueType);
+                        hiddenIssueTypes.Add(issueType);
                     else
-                        verify.HiddenIssueTypes.Remove(issueType);
+                        hiddenIssueTypes.Remove(issueType);
                 });
 
                 Flow.Add(checkbox);

From 04c1585eb24ef0fa07333bc354c7122dc728e8df Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 05:38:45 +0200
Subject: [PATCH 10014/10326] Use more consistent lambda discards

---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 7eba50498c..03cd22ad54 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.Edit.Verify
         {
             base.LoadComplete();
 
-            verify.HiddenIssueTypes.BindCollectionChanged((o, s) => refresh(), runOnceImmediately: true);
+            verify.HiddenIssueTypes.BindCollectionChanged((_, __) => refresh(), runOnceImmediately: true);
         }
 
         private void refresh()

From e80d8f69220509dc78a9fbdedd9eef797c27c7f1 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 05:46:47 +0200
Subject: [PATCH 10015/10326] Keep track of local bound copy

---
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index 48bf0523b1..cb7deb8566 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -2,6 +2,7 @@
 // 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.Overlays;
 using osu.Game.Overlays.Settings;
@@ -21,12 +22,14 @@ namespace osu.Game.Screens.Edit.Verify
             IssueType.Negligible
         };
 
+        private BindableList<IssueType> hiddenIssueTypes;
+
         protected override string Header => "Visibility";
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
-            var hiddenIssueTypes = verify.HiddenIssueTypes.GetBoundCopy();
+            hiddenIssueTypes = verify.HiddenIssueTypes.GetBoundCopy();
 
             foreach (IssueType issueType in configurableIssueTypes)
             {

From 6caf4e38790298f24837a0764fe5bfa778118674 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 12:57:28 +0900
Subject: [PATCH 10016/10326] Add xmldoc to `SkinnableInfo`

---
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 2de3f1b729..2e9235df97 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Extensions;
@@ -33,10 +34,15 @@ namespace osu.Game.Screens.Play.HUD
 
         public List<SkinnableInfo> Children { get; } = new List<SkinnableInfo>();
 
+        [JsonConstructor]
         public SkinnableInfo()
         {
         }
 
+        /// <summary>
+        /// Construct a new instance populating all attributes from the provided drawable.
+        /// </summary>
+        /// <param name="component">The drawable which attributes should be sourced from.</param>
         public SkinnableInfo(Drawable component)
         {
             Type = component.GetType();
@@ -47,13 +53,17 @@ namespace osu.Game.Screens.Play.HUD
             Anchor = component.Anchor;
             Origin = component.Origin;
 
-            if (component is Container container)
+            if (component is Container<Drawable> container)
             {
-                foreach (var child in container.Children.OfType<ISkinSerialisable>().OfType<Drawable>())
+                foreach (var child in container.OfType<ISkinSerialisable>().OfType<Drawable>())
                     Children.Add(child.CreateSerialisedInformation());
             }
         }
 
+        /// <summary>
+        /// Construct an instance of the drawable with all attributes applied.
+        /// </summary>
+        /// <returns>The new instance.</returns>
         public Drawable CreateInstance()
         {
             Drawable d = (Drawable)Activator.CreateInstance(Type);

From ee0a6ba93e25df5425480f0427826b182055f6c4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 05:59:49 +0200
Subject: [PATCH 10017/10326] Use local bound copy in `InterpretationSection`
 as well

Else we're relying on the `VerifyScreen`'s bindable instance, and by extension the `VerifyScreen` instance itself.
---
 osu.Game/Screens/Edit/Verify/InterpretationSection.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
index 7991786542..1bdb528473 100644
--- a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
@@ -2,6 +2,7 @@
 // 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.Beatmaps;
 using osu.Game.Overlays.Settings;
@@ -15,9 +16,13 @@ namespace osu.Game.Screens.Edit.Verify
 
         protected override string Header => "Interpretation";
 
+        private Bindable<DifficultyRating> interpretedDifficulty;
+
         [BackgroundDependencyLoader]
         private void load()
         {
+            interpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
+
             var dropdown = new SettingsEnumDropdown<DifficultyRating>
             {
                 Anchor = Anchor.CentreLeft,
@@ -25,7 +30,7 @@ namespace osu.Game.Screens.Edit.Verify
                 TooltipText = "Affects checks that depend on difficulty level"
             };
 
-            dropdown.Current.BindTo(verify.InterpretedDifficulty);
+            dropdown.Current.BindTo(interpretedDifficulty);
 
             Flow.Add(dropdown);
         }

From fb305130deb9ba12229f36bb436635a04ac646d5 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 06:00:21 +0200
Subject: [PATCH 10018/10326] Also refresh when interpreted difficulty changes

---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 03cd22ad54..407c1e3bc7 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -83,7 +83,10 @@ namespace osu.Game.Screens.Edit.Verify
         {
             base.LoadComplete();
 
-            verify.HiddenIssueTypes.BindCollectionChanged((_, __) => refresh(), runOnceImmediately: true);
+            verify.InterpretedDifficulty.BindValueChanged(_ => refresh());
+            verify.HiddenIssueTypes.BindCollectionChanged((_, __) => refresh());
+
+            refresh();
         }
 
         private void refresh()

From a38cb61b085329cf1712899674ace8c8de68a2d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:02:55 +0900
Subject: [PATCH 10019/10326] Remove duplicated call to
 `base.GetDrawableComponent`

---
 osu.Game/Skinning/DefaultSkin.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 55f34ba1c6..d6ca5e9009 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -92,10 +92,10 @@ namespace osu.Game.Skinning
                             return skinnableTargetWrapper;
                     }
 
-                    return null;
+                    break;
             }
 
-            return base.GetDrawableComponent(component);
+            return null;
         }
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)

From 2bf8635ffd5d44210b6d6638482c089bbd3f611a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:03:23 +0900
Subject: [PATCH 10020/10326] Move field upwards in class

---
 osu.Game/Skinning/Editor/SkinBlueprintContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index 9890b8e8b6..09bbf7ffd5 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Skinning.Editor
     {
         private readonly Drawable target;
 
+        private readonly List<BindableList<ISkinnableComponent>> targetComponents = new List<BindableList<ISkinnableComponent>>();
+
         public SkinBlueprintContainer(Drawable target)
         {
             this.target = target;
@@ -30,8 +32,6 @@ namespace osu.Game.Skinning.Editor
             SelectedItems.BindTo(editor.SelectedComponents);
         }
 
-        private readonly List<BindableList<ISkinnableComponent>> targetComponents = new List<BindableList<ISkinnableComponent>>();
-
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 469a7f5d2a07c434aface5cff1a1fdae987c5072 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:04:17 +0900
Subject: [PATCH 10021/10326] Reorder fields in `SkinEditor`

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index a00557ee4e..72dacad310 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -22,19 +22,19 @@ namespace osu.Game.Skinning.Editor
     {
         public const double TRANSITION_DURATION = 500;
 
+        public readonly BindableList<ISkinnableComponent> SelectedComponents = new BindableList<ISkinnableComponent>();
+
+        protected override bool StartHidden => true;
+
         private readonly Drawable targetScreen;
 
         private OsuTextFlowContainer headerText;
 
-        protected override bool StartHidden => true;
-
-        public readonly BindableList<ISkinnableComponent> SelectedComponents = new BindableList<ISkinnableComponent>();
+        private Bindable<Skin> currentSkin;
 
         [Resolved]
         private SkinManager skins { get; set; }
 
-        private Bindable<Skin> currentSkin;
-
         [Resolved]
         private OsuColour colours { get; set; }
 

From 992a052426da407f794bb3d241d30338d51a8ce8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:07:06 +0900
Subject: [PATCH 10022/10326] Remove stray comment

---
 osu.Game/Skinning/Skin.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 10481e4efd..1fb1e3b99f 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -39,8 +39,6 @@ namespace osu.Game.Skinning
         {
             SkinInfo = skin;
 
-            // may be null for default skin.
-
             // we may want to move this to some kind of async operation in the future.
             foreach (SkinnableTarget skinnableTarget in Enum.GetValues(typeof(SkinnableTarget)))
             {

From 47948d7b34c860e17d73579ac4ee6e91d69e3506 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 06:08:48 +0200
Subject: [PATCH 10023/10326] Set default for bindable in object initializer

Fixes the CI failure.
---
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index cb7deb8566..f942621d2a 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -37,10 +37,10 @@ namespace osu.Game.Screens.Edit.Verify
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    LabelText = issueType.ToString()
+                    LabelText = issueType.ToString(),
+                    Current = { Default = !hiddenIssueTypes.Contains(issueType) }
                 };
 
-                checkbox.Current.Default = !hiddenIssueTypes.Contains(issueType);
                 checkbox.Current.SetDefault();
                 checkbox.Current.BindValueChanged(state =>
                 {

From c93ed541f3571aa3d9991949d75f29b74fa46def Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:09:33 +0900
Subject: [PATCH 10024/10326] Add xmldoc and tidy up logic in `Skin`

---
 osu.Game/Skinning/Skin.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 1fb1e3b99f..64c848fbfa 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -61,11 +61,19 @@ namespace osu.Game.Skinning
             }
         }
 
+        /// <summary>
+        /// Remove all stored customisations for the provided target.
+        /// </summary>
+        /// <param name="targetContainer">The target container to reset.</param>
         public void ResetDrawableTarget(SkinnableElementTargetContainer targetContainer)
         {
             DrawableComponentInfo.Remove(targetContainer.Target);
         }
 
+        /// <summary>
+        /// Update serialised information for the provided target.
+        /// </summary>
+        /// <param name="targetContainer">The target container to serialise to this skin.</param>
         public void UpdateDrawableTarget(SkinnableElementTargetContainer targetContainer)
         {
             DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSerialisedChildren().ToArray();
@@ -76,10 +84,7 @@ namespace osu.Game.Skinning
             switch (component)
             {
                 case SkinnableTargetComponent target:
-
-                    var skinnableTarget = target.Target;
-
-                    if (!DrawableComponentInfo.TryGetValue(skinnableTarget, out var skinnableInfo))
+                    if (!DrawableComponentInfo.TryGetValue(target.Target, out var skinnableInfo))
                         return null;
 
                     return new SkinnableTargetWrapper

From 581e7940c7331ab89f45cc6234089417c1e5bdd6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:13:22 +0900
Subject: [PATCH 10025/10326] Add xmldoc to `SkinnableElementTargetContainer`

---
 osu.Game/Skinning/SkinnableElementTargetContainer.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Skinning/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
index b900fdf3e0..f447800a33 100644
--- a/osu.Game/Skinning/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Skinning
             Target = target;
         }
 
+        /// <summary>
+        /// Reload all components in this container from the current skin.
+        /// </summary>
         public void Reload()
         {
             ClearInternal();
@@ -43,6 +46,12 @@ namespace osu.Game.Skinning
             }
         }
 
+        /// <summary>
+        /// Add a new skinnable component to this target.
+        /// </summary>
+        /// <param name="component">The component to add.</param>
+        /// <exception cref="NotSupportedException">Thrown when attempting to add an element to a target which is not supported by the current skin.</exception>
+        /// <exception cref="ArgumentException">Thrown if the provided instance is not a <see cref="Drawable"/>.</exception>
         public void Add(ISkinnableComponent component)
         {
             if (content == null)

From 3b862798e985edc8ff51ba99b4d2961ccdede31b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:14:49 +0900
Subject: [PATCH 10026/10326] Standardise naming of methods related to
 SkinnableInfo

---
 osu.Game/Extensions/DrawableExtensions.cs            | 4 ++--
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs           | 4 ++--
 osu.Game/Skinning/Skin.cs                            | 2 +-
 osu.Game/Skinning/SkinnableElementTargetContainer.cs | 7 +++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 0ec96a876e..2ac6e6ff22 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -46,9 +46,9 @@ namespace osu.Game.Extensions
         public static Vector2 ScreenSpaceDeltaToParentSpace(this Drawable drawable, Vector2 delta) =>
             drawable.Parent.ToLocalSpace(drawable.Parent.ToScreenSpace(Vector2.Zero) + delta);
 
-        public static SkinnableInfo CreateSerialisedInformation(this Drawable component) => new SkinnableInfo(component);
+        public static SkinnableInfo CreateSkinnableInfo(this Drawable component) => new SkinnableInfo(component);
 
-        public static void ApplySerialisedInformation(this Drawable component, SkinnableInfo info)
+        public static void ApplySkinnableInfo(this Drawable component, SkinnableInfo info)
         {
             // todo: can probably make this better via deserialisation directly using a common interface.
             component.Position = info.Position;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 2e9235df97..678885d096 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Play.HUD
             if (component is Container<Drawable> container)
             {
                 foreach (var child in container.OfType<ISkinSerialisable>().OfType<Drawable>())
-                    Children.Add(child.CreateSerialisedInformation());
+                    Children.Add(child.CreateSkinnableInfo());
             }
         }
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Play.HUD
         public Drawable CreateInstance()
         {
             Drawable d = (Drawable)Activator.CreateInstance(Type);
-            d.ApplySerialisedInformation(this);
+            d.ApplySkinnableInfo(this);
             return d;
         }
     }
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 64c848fbfa..4890524b90 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Skinning
         /// <param name="targetContainer">The target container to serialise to this skin.</param>
         public void UpdateDrawableTarget(SkinnableElementTargetContainer targetContainer)
         {
-            DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSerialisedChildren().ToArray();
+            DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSkinnableInfo().ToArray();
         }
 
         public virtual Drawable GetDrawableComponent(ISkinComponent component)
diff --git a/osu.Game/Skinning/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
index f447800a33..2aea8c0281 100644
--- a/osu.Game/Skinning/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
@@ -64,8 +64,11 @@ namespace osu.Game.Skinning
             components.Add(component);
         }
 
-        public IEnumerable<SkinnableInfo> CreateSerialisedChildren() =>
-            components.Select(d => ((Drawable)d).CreateSerialisedInformation());
+        /// <summary>
+        /// Serialise all children as <see cref="SkinnableInfo"/>.
+        /// </summary>
+        /// <returns>The serialised content.</returns>
+        public IEnumerable<SkinnableInfo> CreateSkinnableInfo() => components.Select(d => ((Drawable)d).CreateSkinnableInfo());
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {

From db19617b8b69a9b9102b8594ed34d881f36d5ede Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:16:20 +0900
Subject: [PATCH 10027/10326] Add `JsonConstructor` attribute to
 `SkinnableTargetWrapper`

---
 osu.Game/Skinning/SkinnableTargetWrapper.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index 0d16775f51..2e2ce32a6f 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
@@ -11,6 +12,7 @@ namespace osu.Game.Skinning
     /// A container which is serialised and can encapsulate multiple skinnable elements into a single return type (for consumption via <see cref="ISkin.GetDrawableComponent"/>.
     /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
     /// </summary>
+    [Serializable]
     public class SkinnableTargetWrapper : Container, ISkinSerialisable
     {
         private readonly Action<Container> applyDefaults;
@@ -25,6 +27,7 @@ namespace osu.Game.Skinning
             this.applyDefaults = applyDefaults;
         }
 
+        [JsonConstructor]
         public SkinnableTargetWrapper()
         {
             RelativeSizeAxes = Axes.Both;

From 23e284b8b31cc59189382d16cb06a72cf16fb00d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:34:03 +0900
Subject: [PATCH 10028/10326] Change default skin editor shortcut to
 Ctrl+Shift+S

Avoids a conflict with song select's random rewind functionality. As
mentioned in #12776.
---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index ce945f3bf8..c8227c0887 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleBeatmapListing),
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
-            new KeyBinding(new[] { InputKey.Shift, InputKey.F2 }, GlobalAction.ToggleSkinEditor),
+            new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.S }, GlobalAction.ToggleSkinEditor),
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),

From cdcbaf4291e4bbf20b552a305244be92336dbe80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:45:10 +0900
Subject: [PATCH 10029/10326] Tidy up specification of `SettingsSection`

---
 .../Screens/Edit/EditorRoundedScreenSettingsSection.cs     | 7 ++++---
 osu.Game/Screens/Edit/Verify/InterpretationSection.cs      | 2 +-
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs          | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs b/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
index 87ed98a439..e17114ebcb 100644
--- a/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
+++ b/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
@@ -15,8 +15,9 @@ namespace osu.Game.Screens.Edit
     {
         private const int header_height = 50;
 
-        protected FillFlowContainer Flow;
-        protected abstract string Header { get; }
+        protected abstract string HeaderText { get; }
+
+        protected FillFlowContainer Flow { get; private set; }
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
@@ -36,7 +37,7 @@ namespace osu.Game.Screens.Edit
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Text = Header,
+                        Text = HeaderText,
                         Font = new FontUsage(size: 25, weight: "bold")
                     }
                 },
diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
index 1bdb528473..4dca94aacf 100644
--- a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
-        protected override string Header => "Interpretation";
+        protected override string HeaderText => "Interpretation";
 
         private Bindable<DifficultyRating> interpretedDifficulty;
 
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index f942621d2a..7ebfe586a7 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         private BindableList<IssueType> hiddenIssueTypes;
 
-        protected override string Header => "Visibility";
+        protected override string HeaderText => "Visibility";
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)

From c6648112e59f8a5c3429af35f72b99d8ceceb2c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:51:41 +0900
Subject: [PATCH 10030/10326] Simplify binding flow in `InterpretationSection`

---
 .../Screens/Edit/Verify/InterpretationSection.cs | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
index 4dca94aacf..7de87737f5 100644
--- a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
@@ -2,7 +2,6 @@
 // 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.Beatmaps;
 using osu.Game.Overlays.Settings;
@@ -16,23 +15,16 @@ namespace osu.Game.Screens.Edit.Verify
 
         protected override string HeaderText => "Interpretation";
 
-        private Bindable<DifficultyRating> interpretedDifficulty;
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            interpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
-
-            var dropdown = new SettingsEnumDropdown<DifficultyRating>
+            Flow.Add(new SettingsEnumDropdown<DifficultyRating>
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
-                TooltipText = "Affects checks that depend on difficulty level"
-            };
-
-            dropdown.Current.BindTo(interpretedDifficulty);
-
-            Flow.Add(dropdown);
+                TooltipText = "Affects checks that depend on difficulty level",
+                Current = verify.InterpretedDifficulty.GetBoundCopy()
+            });
         }
     }
 }

From b81f86bd4d9c088dce4a7c49fb16b768ccc3e669 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:53:27 +0900
Subject: [PATCH 10031/10326] Move DI resolution to inside BDL parameters

---
 osu.Game/Screens/Edit/Verify/InterpretationSection.cs | 5 +----
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs     | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
index 7de87737f5..9548f8aaa9 100644
--- a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
@@ -10,13 +10,10 @@ namespace osu.Game.Screens.Edit.Verify
 {
     internal class InterpretationSection : EditorRoundedScreenSettingsSection
     {
-        [Resolved]
-        private VerifyScreen verify { get; set; }
-
         protected override string HeaderText => "Interpretation";
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(VerifyScreen verify)
         {
             Flow.Add(new SettingsEnumDropdown<DifficultyRating>
             {
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index 7ebfe586a7..d049436376 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -12,9 +12,6 @@ namespace osu.Game.Screens.Edit.Verify
 {
     internal class VisibilitySection : EditorRoundedScreenSettingsSection
     {
-        [Resolved]
-        private VerifyScreen verify { get; set; }
-
         private readonly IssueType[] configurableIssueTypes =
         {
             IssueType.Warning,
@@ -27,7 +24,7 @@ namespace osu.Game.Screens.Edit.Verify
         protected override string HeaderText => "Visibility";
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colours)
+        private void load(OverlayColourProvider colours, VerifyScreen verify)
         {
             hiddenIssueTypes = verify.HiddenIssueTypes.GetBoundCopy();
 

From e0e9106921fc1b4c30c19c56645e19cd696f455f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 14:54:52 +0900
Subject: [PATCH 10032/10326] Enable autoplay in skin editor tests

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs    | 2 ++
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs  | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 73da76df78..a0b27755b7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private SkinManager skinManager { get; set; }
 
+        protected override bool Autoplay => true;
+
         [SetUpSteps]
         public override void SetUpSteps()
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index c7c93b8892..245e190b1f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
@@ -32,12 +30,13 @@ namespace osu.Game.Tests.Visual.Gameplay
                 SetContents(() =>
                 {
                     var ruleset = new OsuRuleset();
+                    var mods = new[] { ruleset.GetAutoplayMod() };
                     var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
-                    var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
+                    var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo, mods);
 
-                    var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
+                    var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap, mods);
 
-                    var hudOverlay = new HUDOverlay(drawableRuleset, Array.Empty<Mod>())
+                    var hudOverlay = new HUDOverlay(drawableRuleset, mods)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,

From 4eeeaf6a1aa9588932c2c096c40232d6bb5527d4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 07:57:32 +0200
Subject: [PATCH 10033/10326] Keep track of local bound copy

---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 2a90834537..f150f4175b 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -35,6 +35,8 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
+        private Bindable<DifficultyRating> interpretedDifficulty;
+
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
         private BeatmapVerifierContext context;
@@ -45,8 +47,10 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
+            interpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
+
             context = new BeatmapVerifierContext(workingBeatmap.Value);
-            context.InterpretedDifficulty.BindTo(verify.InterpretedDifficulty.GetBoundCopy());
+            context.InterpretedDifficulty.BindTo(interpretedDifficulty);
 
             RelativeSizeAxes = Axes.Both;
 

From b37cb3bdbeadefb2bba7a71575e8be9c535c54d3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 09:00:30 +0200
Subject: [PATCH 10034/10326] Change interpreted difficulty from bindable to
 regular value

There's no reason for why checks would need this to be bindable. A 1-directional binding is more appropriate.
---
 osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs |  5 ++---
 osu.Game/Screens/Edit/Verify/IssueList.cs        | 11 +++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
index 59d43ba3d6..76b74cb993 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.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.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Edit
@@ -20,12 +19,12 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// The difficulty level which the current beatmap is considered to be.
         /// </summary>
-        public readonly Bindable<DifficultyRating> InterpretedDifficulty;
+        public DifficultyRating InterpretedDifficulty;
 
         public BeatmapVerifierContext(IWorkingBeatmap workingBeatmap, DifficultyRating difficultyRating = DifficultyRating.ExpertPlus)
         {
             WorkingBeatmap = workingBeatmap;
-            InterpretedDifficulty = new Bindable<DifficultyRating>(difficultyRating);
+            InterpretedDifficulty = difficultyRating;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index f150f4175b..abf22ead10 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -35,8 +35,6 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
-        private Bindable<DifficultyRating> interpretedDifficulty;
-
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
         private BeatmapVerifierContext context;
@@ -47,10 +45,11 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
-            interpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
-
-            context = new BeatmapVerifierContext(workingBeatmap.Value);
-            context.InterpretedDifficulty.BindTo(interpretedDifficulty);
+            context = new BeatmapVerifierContext(workingBeatmap.Value, verify.InterpretedDifficulty.Value);
+            verify.InterpretedDifficulty.BindValueChanged(change =>
+            {
+                context.InterpretedDifficulty = change.NewValue;
+            });
 
             RelativeSizeAxes = Axes.Both;
 

From 5818ed4c8c66bb749a83e700c16fde831ba56b4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 16:41:36 +0900
Subject: [PATCH 10035/10326] Remove unused DI resolution

---
 osu.Game/Skinning/LegacyAccuracyCounter.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 3eea5d22d5..493107172f 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -12,9 +12,6 @@ namespace osu.Game.Skinning
 {
     public class LegacyAccuracyCounter : GameplayAccuracyCounter, ISkinnableComponent
     {
-        [Resolved]
-        private ISkinSource skin { get; set; }
-
         public LegacyAccuracyCounter()
         {
             Anchor = Anchor.TopRight;

From 19223ba01359b87ebb55b838d47fe6846fd58db4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 16:42:13 +0900
Subject: [PATCH 10036/10326] Remove left-over debug logging

---
 osu.Game/Skinning/SkinManager.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 91f3d0c7cf..fbe23482d7 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -194,9 +194,6 @@ namespace osu.Game.Skinning
                         ReplaceFile(skin.SkinInfo, oldFile, streamContent, oldFile.Filename);
                     else
                         AddFile(skin.SkinInfo, streamContent, filename);
-
-                    Logger.Log($"Saving out {filename} with {json.Length} bytes");
-                    Logger.Log(json);
                 }
             }
         }

From 9dfa48b22ed523f67bc4b29e7a497127b28d6280 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 16:42:43 +0900
Subject: [PATCH 10037/10326] Fix incorrect exception text

---
 osu.Game/Skinning/SkinnableElementTargetContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
index 2aea8c0281..c68dce4109 100644
--- a/osu.Game/Skinning/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Skinning
                 throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
 
             if (!(component is Drawable drawable))
-                throw new ArgumentException("Provided argument must be of type {nameof(ISkinnableComponent)}.", nameof(drawable));
+                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(drawable));
 
             content.Add(drawable);
             components.Add(component);

From dd6a06a302a7f38c3889829068589b1260cf944c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 16:43:42 +0900
Subject: [PATCH 10038/10326] Reword xmldoc to read better

---
 osu.Game/Skinning/SkinnableTargetWrapper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index 2e2ce32a6f..d8ad008448 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Construct a wrapper with defaults that should be applied once.
         /// </summary>
-        /// <param name="applyDefaults">A function with default to apply after the initial layout (ie. consuming autosize)</param>
+        /// <param name="applyDefaults">A function to apply the default layout.</param>
         public SkinnableTargetWrapper(Action<Container> applyDefaults)
             : this()
         {

From cdcd31b546ac41806c0f7559d65dd9b24e6323d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:03:17 +0900
Subject: [PATCH 10039/10326] Replace `ISkinSerialisable` with `IsEditable`
 property

---
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs        |  4 ++--
 .../Skinning/Editor/SkinBlueprintContainer.cs     |  8 ++++++++
 osu.Game/Skinning/Editor/SkinComponentToolbox.cs  |  3 +++
 osu.Game/Skinning/ISkinSerialisable.cs            | 15 ---------------
 osu.Game/Skinning/ISkinnableComponent.cs          |  8 +++++++-
 osu.Game/Skinning/SkinManager.cs                  |  1 -
 osu.Game/Skinning/SkinnableTargetWrapper.cs       |  4 +++-
 7 files changed, 23 insertions(+), 20 deletions(-)
 delete mode 100644 osu.Game/Skinning/ISkinSerialisable.cs

diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 678885d096..a7c5c33f7d 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -15,7 +15,7 @@ using osuTK;
 namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
-    /// Serialised information governing custom changes to an <see cref="ISkinSerialisable"/>.
+    /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
     /// </summary>
     [Serializable]
     public class SkinnableInfo : IJsonSerializable
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Play.HUD
 
             if (component is Container<Drawable> container)
             {
-                foreach (var child in container.OfType<ISkinSerialisable>().OfType<Drawable>())
+                foreach (var child in container.OfType<ISkinnableComponent>().OfType<Drawable>())
                     Children.Add(child.CreateSkinnableInfo());
             }
         }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index 09bbf7ffd5..31f89ad0c2 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -81,6 +81,14 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
+        protected override void AddBlueprintFor(ISkinnableComponent item)
+        {
+            if (!item.IsEditable)
+                return;
+
+            base.AddBlueprintFor(item);
+        }
+
         protected override SelectionHandler<ISkinnableComponent> CreateSelectionHandler() => new SkinSelectionHandler();
 
         protected override SelectionBlueprint<ISkinnableComponent> CreateBlueprintFor(ISkinnableComponent component)
diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index a000204062..068b2058a6 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -78,6 +78,9 @@ namespace osu.Game.Skinning.Editor
 
                 Debug.Assert(instance != null);
 
+                if (!((ISkinnableComponent)instance).IsEditable)
+                    return null;
+
                 return new ToolboxComponentButton(instance);
             }
             catch
diff --git a/osu.Game/Skinning/ISkinSerialisable.cs b/osu.Game/Skinning/ISkinSerialisable.cs
deleted file mode 100644
index d1777512af..0000000000
--- a/osu.Game/Skinning/ISkinSerialisable.cs
+++ /dev/null
@@ -1,15 +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;
-
-namespace osu.Game.Skinning
-{
-    /// <summary>
-    /// Denotes a drawable component which should be serialised as part of a skin.
-    /// Use <see cref="ISkinnableComponent"/> for components which should be mutable by the user / editor.
-    /// </summary>
-    public interface ISkinSerialisable : IDrawable
-    {
-    }
-}
diff --git a/osu.Game/Skinning/ISkinnableComponent.cs b/osu.Game/Skinning/ISkinnableComponent.cs
index e44c7be13d..65ac2d5849 100644
--- a/osu.Game/Skinning/ISkinnableComponent.cs
+++ b/osu.Game/Skinning/ISkinnableComponent.cs
@@ -1,12 +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.Graphics;
+
 namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a drawable which, as a drawable, can be adjusted via skinning specifications.
     /// </summary>
-    public interface ISkinnableComponent : ISkinSerialisable
+    public interface ISkinnableComponent : IDrawable
     {
+        /// <summary>
+        /// Whether this component should be editable by an end user.
+        /// </summary>
+        bool IsEditable => true;
     }
 }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index fbe23482d7..7b27a7a816 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -19,7 +19,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
-using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index d8ad008448..28e8d585fc 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -13,8 +13,10 @@ namespace osu.Game.Skinning
     /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
     /// </summary>
     [Serializable]
-    public class SkinnableTargetWrapper : Container, ISkinSerialisable
+    public class SkinnableTargetWrapper : Container, ISkinnableComponent
     {
+        public bool IsEditable => false;
+
         private readonly Action<Container> applyDefaults;
 
         /// <summary>

From 7921dc7ece64f04d37e8e96630a4d0f677d29fe9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:06:00 +0900
Subject: [PATCH 10040/10326] Rename `ISkinnableComponent` to
 `ISkinnableDrawable`

---
 .../Play/HUD/DefaultAccuracyCounter.cs        |  2 +-
 .../Screens/Play/HUD/DefaultComboCounter.cs   |  2 +-
 .../Screens/Play/HUD/DefaultHealthDisplay.cs  |  2 +-
 .../Screens/Play/HUD/DefaultScoreCounter.cs   |  2 +-
 .../Screens/Play/HUD/LegacyComboCounter.cs    |  2 +-
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs    |  4 ++--
 osu.Game/Skinning/Editor/SkinBlueprint.cs     |  4 ++--
 .../Skinning/Editor/SkinBlueprintContainer.cs | 20 +++++++++----------
 .../Skinning/Editor/SkinComponentToolbox.cs   |  4 ++--
 osu.Game/Skinning/Editor/SkinEditor.cs        |  4 ++--
 .../Skinning/Editor/SkinSelectionHandler.cs   | 10 +++++-----
 ...ableComponent.cs => ISkinnableDrawable.cs} |  2 +-
 osu.Game/Skinning/ISkinnableTarget.cs         |  6 +++---
 osu.Game/Skinning/LegacyAccuracyCounter.cs    |  2 +-
 osu.Game/Skinning/LegacyHealthDisplay.cs      |  2 +-
 osu.Game/Skinning/LegacyScoreCounter.cs       |  2 +-
 .../SkinnableElementTargetContainer.cs        |  8 ++++----
 osu.Game/Skinning/SkinnableTargetWrapper.cs   |  2 +-
 18 files changed, 40 insertions(+), 40 deletions(-)
 rename osu.Game/Skinning/{ISkinnableComponent.cs => ISkinnableDrawable.cs} (90%)

diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index d8dff89b29..45ba05e036 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -7,7 +7,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultAccuracyCounter : GameplayAccuracyCounter, ISkinnableComponent
+    public class DefaultAccuracyCounter : GameplayAccuracyCounter, ISkinnableDrawable
     {
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 13bd045fc0..c4575c5ad0 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -12,7 +12,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultComboCounter : RollingCounter<int>, ISkinnableComponent
+    public class DefaultComboCounter : RollingCounter<int>, ISkinnableDrawable
     {
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index 241777244b..ed297f0ffc 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -17,7 +17,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultHealthDisplay : HealthDisplay, IHasAccentColour, ISkinnableComponent
+    public class DefaultHealthDisplay : HealthDisplay, IHasAccentColour, ISkinnableDrawable
     {
         /// <summary>
         /// The base opacity of the glow.
diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index bd18050dfb..16e3642181 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -8,7 +8,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultScoreCounter : GameplayScoreCounter, ISkinnableComponent
+    public class DefaultScoreCounter : GameplayScoreCounter, ISkinnableDrawable
     {
         public DefaultScoreCounter()
             : base(6)
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 2565faf423..d64513d41e 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// Uses the 'x' symbol and has a pop-out effect while rolling over.
     /// </summary>
-    public class LegacyComboCounter : CompositeDrawable, ISkinnableComponent
+    public class LegacyComboCounter : CompositeDrawable, ISkinnableDrawable
     {
         public Bindable<int> Current { get; } = new BindableInt { MinValue = 0, };
 
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index a7c5c33f7d..e08044b14c 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -15,7 +15,7 @@ using osuTK;
 namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
-    /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
+    /// Serialised information governing custom changes to an <see cref="ISkinnableDrawable"/>.
     /// </summary>
     [Serializable]
     public class SkinnableInfo : IJsonSerializable
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Play.HUD
 
             if (component is Container<Drawable> container)
             {
-                foreach (var child in container.OfType<ISkinnableComponent>().OfType<Drawable>())
+                foreach (var child in container.OfType<ISkinnableDrawable>().OfType<Drawable>())
                     Children.Add(child.CreateSkinnableInfo());
             }
         }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index b8dfdbad0a..4be9299699 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinBlueprint : SelectionBlueprint<ISkinnableComponent>
+    public class SkinBlueprint : SelectionBlueprint<ISkinnableDrawable>
     {
         private Container box;
 
@@ -26,7 +26,7 @@ namespace osu.Game.Skinning.Editor
 
         protected override bool ShouldBeAlive => (drawable.IsAlive && Item.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
 
-        public SkinBlueprint(ISkinnableComponent component)
+        public SkinBlueprint(ISkinnableDrawable component)
             : base(component)
         {
         }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index 31f89ad0c2..c0cc2ab40e 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -15,11 +15,11 @@ using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinBlueprintContainer : BlueprintContainer<ISkinnableComponent>
+    public class SkinBlueprintContainer : BlueprintContainer<ISkinnableDrawable>
     {
         private readonly Drawable target;
 
-        private readonly List<BindableList<ISkinnableComponent>> targetComponents = new List<BindableList<ISkinnableComponent>>();
+        private readonly List<BindableList<ISkinnableDrawable>> targetComponents = new List<BindableList<ISkinnableDrawable>>();
 
         public SkinBlueprintContainer(Drawable target)
         {
@@ -49,7 +49,7 @@ namespace osu.Game.Skinning.Editor
 
             foreach (var targetContainer in targetContainers)
             {
-                var bindableList = new BindableList<ISkinnableComponent> { BindTarget = targetContainer.Components };
+                var bindableList = new BindableList<ISkinnableDrawable> { BindTarget = targetContainer.Components };
                 bindableList.BindCollectionChanged(componentsChanged, true);
 
                 targetComponents.Add(bindableList);
@@ -61,27 +61,27 @@ namespace osu.Game.Skinning.Editor
             switch (e.Action)
             {
                 case NotifyCollectionChangedAction.Add:
-                    foreach (var item in e.NewItems.Cast<ISkinnableComponent>())
+                    foreach (var item in e.NewItems.Cast<ISkinnableDrawable>())
                         AddBlueprintFor(item);
                     break;
 
                 case NotifyCollectionChangedAction.Remove:
                 case NotifyCollectionChangedAction.Reset:
-                    foreach (var item in e.OldItems.Cast<ISkinnableComponent>())
+                    foreach (var item in e.OldItems.Cast<ISkinnableDrawable>())
                         RemoveBlueprintFor(item);
                     break;
 
                 case NotifyCollectionChangedAction.Replace:
-                    foreach (var item in e.OldItems.Cast<ISkinnableComponent>())
+                    foreach (var item in e.OldItems.Cast<ISkinnableDrawable>())
                         RemoveBlueprintFor(item);
 
-                    foreach (var item in e.NewItems.Cast<ISkinnableComponent>())
+                    foreach (var item in e.NewItems.Cast<ISkinnableDrawable>())
                         AddBlueprintFor(item);
                     break;
             }
         }
 
-        protected override void AddBlueprintFor(ISkinnableComponent item)
+        protected override void AddBlueprintFor(ISkinnableDrawable item)
         {
             if (!item.IsEditable)
                 return;
@@ -89,9 +89,9 @@ namespace osu.Game.Skinning.Editor
             base.AddBlueprintFor(item);
         }
 
-        protected override SelectionHandler<ISkinnableComponent> CreateSelectionHandler() => new SkinSelectionHandler();
+        protected override SelectionHandler<ISkinnableDrawable> CreateSelectionHandler() => new SkinSelectionHandler();
 
-        protected override SelectionBlueprint<ISkinnableComponent> CreateBlueprintFor(ISkinnableComponent component)
+        protected override SelectionBlueprint<ISkinnableDrawable> CreateBlueprintFor(ISkinnableDrawable component)
             => new SkinBlueprint(component);
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 068b2058a6..8536cba139 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Skinning.Editor
                 Spacing = new Vector2(20)
             };
 
-            var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
+            var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableDrawable).IsAssignableFrom(t)).ToArray();
 
             foreach (var type in skinnableTypes)
             {
@@ -78,7 +78,7 @@ namespace osu.Game.Skinning.Editor
 
                 Debug.Assert(instance != null);
 
-                if (!((ISkinnableComponent)instance).IsEditable)
+                if (!((ISkinnableDrawable)instance).IsEditable)
                     return null;
 
                 return new ToolboxComponentButton(instance);
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 72dacad310..bf9a6464d0 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Skinning.Editor
     {
         public const double TRANSITION_DURATION = 500;
 
-        public readonly BindableList<ISkinnableComponent> SelectedComponents = new BindableList<ISkinnableComponent>();
+        public readonly BindableList<ISkinnableDrawable> SelectedComponents = new BindableList<ISkinnableDrawable>();
 
         protected override bool StartHidden => true;
 
@@ -165,7 +165,7 @@ namespace osu.Game.Skinning.Editor
 
         private void placeComponent(Type type)
         {
-            if (!(Activator.CreateInstance(type) is ISkinnableComponent component))
+            if (!(Activator.CreateInstance(type) is ISkinnableDrawable component))
                 throw new InvalidOperationException("Attempted to instantiate a component for placement which was not an {typeof(ISkinnableComponent)}.");
 
             getTarget(SkinnableTarget.MainHUDComponents)?.Add(component);
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index cf5ece03e9..8ca98c794f 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinSelectionHandler : SelectionHandler<ISkinnableComponent>
+    public class SkinSelectionHandler : SelectionHandler<ISkinnableDrawable>
     {
         public override bool HandleRotation(float angle)
         {
@@ -36,7 +36,7 @@ namespace osu.Game.Skinning.Editor
             return true;
         }
 
-        public override bool HandleMovement(MoveSelectionEvent<ISkinnableComponent> moveEvent)
+        public override bool HandleMovement(MoveSelectionEvent<ISkinnableDrawable> moveEvent)
         {
             foreach (var c in SelectedBlueprints)
             {
@@ -57,7 +57,7 @@ namespace osu.Game.Skinning.Editor
             SelectionBox.CanReverse = false;
         }
 
-        protected override void DeleteItems(IEnumerable<ISkinnableComponent> items)
+        protected override void DeleteItems(IEnumerable<ISkinnableDrawable> items)
         {
             foreach (var i in items)
             {
@@ -66,7 +66,7 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
-        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableComponent>> selection)
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableDrawable>> selection)
         {
             yield return new OsuMenuItem("Anchor")
             {
@@ -131,7 +131,7 @@ namespace osu.Game.Skinning.Editor
 
         public class AnchorMenuItem : TernaryStateMenuItem
         {
-            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<ISkinnableComponent>> selection, Action<TernaryState> action)
+            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<ISkinnableDrawable>> selection, Action<TernaryState> action)
                 : base(anchor.ToString(), getNextState, MenuItemType.Standard, action)
             {
             }
diff --git a/osu.Game/Skinning/ISkinnableComponent.cs b/osu.Game/Skinning/ISkinnableDrawable.cs
similarity index 90%
rename from osu.Game/Skinning/ISkinnableComponent.cs
rename to osu.Game/Skinning/ISkinnableDrawable.cs
index 65ac2d5849..d42b6f71b0 100644
--- a/osu.Game/Skinning/ISkinnableComponent.cs
+++ b/osu.Game/Skinning/ISkinnableDrawable.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Skinning
     /// <summary>
     /// Denotes a drawable which, as a drawable, can be adjusted via skinning specifications.
     /// </summary>
-    public interface ISkinnableComponent : IDrawable
+    public interface ISkinnableDrawable : IDrawable
     {
         /// <summary>
         /// Whether this component should be editable by an end user.
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index ab3c24a1e2..3773b5be24 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -6,7 +6,7 @@ using osu.Framework.Bindables;
 namespace osu.Game.Skinning
 {
     /// <summary>
-    /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
+    /// Denotes a container which can house <see cref="ISkinnableDrawable"/>s.
     /// </summary>
     public interface ISkinnableTarget
     {
@@ -18,7 +18,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// A bindable list of components which are being tracked by this skinnable target.
         /// </summary>
-        IBindableList<ISkinnableComponent> Components { get; }
+        IBindableList<ISkinnableDrawable> Components { get; }
 
         /// <summary>
         /// Reload this target from the current skin.
@@ -28,6 +28,6 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Add the provided item to this target.
         /// </summary>
-        void Add(ISkinnableComponent drawable);
+        void Add(ISkinnableDrawable drawable);
     }
 }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 493107172f..16562d9571 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -10,7 +10,7 @@ using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyAccuracyCounter : GameplayAccuracyCounter, ISkinnableComponent
+    public class LegacyAccuracyCounter : GameplayAccuracyCounter, ISkinnableDrawable
     {
         public LegacyAccuracyCounter()
         {
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index dfb6ca1a64..c601adc3a0 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyHealthDisplay : HealthDisplay, ISkinnableComponent
+    public class LegacyHealthDisplay : HealthDisplay, ISkinnableDrawable
     {
         private const double epic_cutoff = 0.5;
 
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 8aa48da453..64ea03d59c 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -8,7 +8,7 @@ using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyScoreCounter : GameplayScoreCounter, ISkinnableComponent
+    public class LegacyScoreCounter : GameplayScoreCounter, ISkinnableDrawable
     {
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
diff --git a/osu.Game/Skinning/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
index c68dce4109..2a76d3bf7c 100644
--- a/osu.Game/Skinning/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
@@ -17,9 +17,9 @@ namespace osu.Game.Skinning
 
         public SkinnableTarget Target { get; }
 
-        public IBindableList<ISkinnableComponent> Components => components;
+        public IBindableList<ISkinnableDrawable> Components => components;
 
-        private readonly BindableList<ISkinnableComponent> components = new BindableList<ISkinnableComponent>();
+        private readonly BindableList<ISkinnableDrawable> components = new BindableList<ISkinnableDrawable>();
 
         public SkinnableElementTargetContainer(SkinnableTarget target)
         {
@@ -41,7 +41,7 @@ namespace osu.Game.Skinning
                 LoadComponentAsync(content, wrapper =>
                 {
                     AddInternal(wrapper);
-                    components.AddRange(wrapper.Children.OfType<ISkinnableComponent>());
+                    components.AddRange(wrapper.Children.OfType<ISkinnableDrawable>());
                 });
             }
         }
@@ -52,7 +52,7 @@ namespace osu.Game.Skinning
         /// <param name="component">The component to add.</param>
         /// <exception cref="NotSupportedException">Thrown when attempting to add an element to a target which is not supported by the current skin.</exception>
         /// <exception cref="ArgumentException">Thrown if the provided instance is not a <see cref="Drawable"/>.</exception>
-        public void Add(ISkinnableComponent component)
+        public void Add(ISkinnableDrawable component)
         {
             if (content == null)
                 throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index 28e8d585fc..58ecac71ab 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Skinning
     /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
     /// </summary>
     [Serializable]
-    public class SkinnableTargetWrapper : Container, ISkinnableComponent
+    public class SkinnableTargetWrapper : Container, ISkinnableDrawable
     {
         public bool IsEditable => false;
 

From 106fa97a11080329a6097430590866d827dfe1a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:07:38 +0900
Subject: [PATCH 10041/10326] Rename `SkinnableElementTargetContainer` to
 `SkinnableTargetContainer`

---
 osu.Game/Screens/Play/HUDOverlay.cs                           | 4 ++--
 osu.Game/Skinning/Editor/SkinEditor.cs                        | 4 ++--
 osu.Game/Skinning/Skin.cs                                     | 4 ++--
 ...eElementTargetContainer.cs => SkinnableTargetContainer.cs} | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game/Skinning/{SkinnableElementTargetContainer.cs => SkinnableTargetContainer.cs} (94%)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 887346b5df..a10e91dae8 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
 
         private bool holdingForHUD;
 
-        private readonly SkinnableElementTargetContainer mainComponents;
+        private readonly SkinnableTargetContainer mainComponents;
 
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter, topRightElements };
 
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Play
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        mainComponents = new SkinnableElementTargetContainer(SkinnableTarget.MainHUDComponents)
+                                        mainComponents = new SkinnableTargetContainer(SkinnableTarget.MainHUDComponents)
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                         },
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index bf9a6464d0..67285987ef 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Skinning.Editor
 
         private void revert()
         {
-            SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
             {
@@ -194,7 +194,7 @@ namespace osu.Game.Skinning.Editor
 
         private void save()
         {
-            SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
                 currentSkin.Value.UpdateDrawableTarget(t);
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 4890524b90..3a16cb5818 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Skinning
         /// Remove all stored customisations for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to reset.</param>
-        public void ResetDrawableTarget(SkinnableElementTargetContainer targetContainer)
+        public void ResetDrawableTarget(SkinnableTargetContainer targetContainer)
         {
             DrawableComponentInfo.Remove(targetContainer.Target);
         }
@@ -74,7 +74,7 @@ namespace osu.Game.Skinning
         /// Update serialised information for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to serialise to this skin.</param>
-        public void UpdateDrawableTarget(SkinnableElementTargetContainer targetContainer)
+        public void UpdateDrawableTarget(SkinnableTargetContainer targetContainer)
         {
             DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSkinnableInfo().ToArray();
         }
diff --git a/osu.Game/Skinning/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
similarity index 94%
rename from osu.Game/Skinning/SkinnableElementTargetContainer.cs
rename to osu.Game/Skinning/SkinnableTargetContainer.cs
index 2a76d3bf7c..daf54277fd 100644
--- a/osu.Game/Skinning/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning
 {
-    public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
+    public class SkinnableTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
         private SkinnableTargetWrapper content;
 
@@ -21,7 +21,7 @@ namespace osu.Game.Skinning
 
         private readonly BindableList<ISkinnableDrawable> components = new BindableList<ISkinnableDrawable>();
 
-        public SkinnableElementTargetContainer(SkinnableTarget target)
+        public SkinnableTargetContainer(SkinnableTarget target)
         {
             Target = target;
         }

From 0959e7156a27a29b4a7a8fa041e418e4cc84f577 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:22:05 +0900
Subject: [PATCH 10042/10326] Remove outdated TODO

---
 osu.Game/Skinning/SkinManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 7b27a7a816..5793edda30 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -180,7 +180,6 @@ namespace osu.Game.Skinning
 
             foreach (var drawableInfo in skin.DrawableComponentInfo)
             {
-                // todo: the OfType() call can be removed with better IDrawable support.
                 string json = JsonConvert.SerializeObject(drawableInfo.Value, new JsonSerializerSettings { Formatting = Formatting.Indented });
 
                 using (var streamContent = new MemoryStream(Encoding.UTF8.GetBytes(json)))

From 3ea469813c8cc95396d020a1f145cf0d2c67040e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:25:51 +0900
Subject: [PATCH 10043/10326] Use interface in place of
 `SkinnableTargetContainer`

---
 osu.Game/Skinning/ISkinnableTarget.cs         | 11 +++++++++++
 osu.Game/Skinning/Skin.cs                     |  4 ++--
 osu.Game/Skinning/SkinnableTargetContainer.cs |  9 ---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 3773b5be24..ba3a9fe228 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -1,7 +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.Collections.Generic;
+using System.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Extensions;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning
 {
@@ -20,6 +25,12 @@ namespace osu.Game.Skinning
         /// </summary>
         IBindableList<ISkinnableDrawable> Components { get; }
 
+        /// <summary>
+        /// Serialise all children as <see cref="SkinnableInfo"/>.
+        /// </summary>
+        /// <returns>The serialised content.</returns>
+        IEnumerable<SkinnableInfo> CreateSkinnableInfo() => Components.Select(d => ((Drawable)d).CreateSkinnableInfo());
+
         /// <summary>
         /// Reload this target from the current skin.
         /// </summary>
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 3a16cb5818..0ceca3925e 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Skinning
         /// Remove all stored customisations for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to reset.</param>
-        public void ResetDrawableTarget(SkinnableTargetContainer targetContainer)
+        public void ResetDrawableTarget(ISkinnableTarget targetContainer)
         {
             DrawableComponentInfo.Remove(targetContainer.Target);
         }
@@ -74,7 +74,7 @@ namespace osu.Game.Skinning
         /// Update serialised information for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to serialise to this skin.</param>
-        public void UpdateDrawableTarget(SkinnableTargetContainer targetContainer)
+        public void UpdateDrawableTarget(ISkinnableTarget targetContainer)
         {
             DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSkinnableInfo().ToArray();
         }
diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index daf54277fd..52e86f5d86 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -2,12 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Extensions;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning
 {
@@ -64,12 +61,6 @@ namespace osu.Game.Skinning
             components.Add(component);
         }
 
-        /// <summary>
-        /// Serialise all children as <see cref="SkinnableInfo"/>.
-        /// </summary>
-        /// <returns>The serialised content.</returns>
-        public IEnumerable<SkinnableInfo> CreateSkinnableInfo() => components.Select(d => ((Drawable)d).CreateSkinnableInfo());
-
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);

From ebce3fd3c7d408541b39b2fa37df45d82d057a08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:29:11 +0900
Subject: [PATCH 10044/10326] Use `ScheduleAfterChildren` to better match
 comment

---
 osu.Game/Skinning/SkinnableTargetWrapper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index 58ecac71ab..664e8da480 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Skinning
             base.LoadComplete();
 
             // schedule is required to allow children to run their LoadComplete and take on their correct sizes.
-            Schedule(() => applyDefaults?.Invoke(this));
+            ScheduleAfterChildren(() => applyDefaults?.Invoke(this));
         }
     }
 }

From 1cda55393ed7b25874c8a3fe7bf77dc33b136035 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:51:57 +0900
Subject: [PATCH 10045/10326] Add aspect ratio locking and flip support to skin
 editor

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index ad783a9c0e..3dc0ca340b 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Extensions;
@@ -36,6 +37,20 @@ namespace osu.Game.Skinning.Editor
             return true;
         }
 
+        public override bool HandleFlip(Direction direction)
+        {
+            // TODO: this is temporary as well.
+            foreach (var c in SelectedBlueprints)
+            {
+                ((Drawable)c.Item).Scale *= new Vector2(
+                    direction == Direction.Horizontal ? -1 : 1,
+                    direction == Direction.Vertical ? -1 : 1
+                );
+            }
+
+            return true;
+        }
+
         public override bool HandleMovement(MoveSelectionEvent<ISkinnableComponent> moveEvent)
         {
             foreach (var c in SelectedBlueprints)
@@ -116,6 +131,15 @@ namespace osu.Game.Skinning.Editor
             // reverse the scale direction if dragging from top or left.
             if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
             if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
+
+            // for now aspect lock scale adjustments that occur at corners.
+            if (!reference.HasFlagFast(Anchor.x1) && !reference.HasFlagFast(Anchor.y1))
+            {
+                if (reference.HasFlagFast(Anchor.x0) || reference.HasFlagFast(Anchor.x2))
+                    scale.Y = scale.X;
+                else
+                    scale.X = scale.Y;
+            }
         }
 
         public class AnchorMenuItem : TernaryStateMenuItem

From 9f8e6979dd90e23bf5b7936bb536eeb312fbb3f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 18:00:25 +0900
Subject: [PATCH 10046/10326] Fix display of skin blueprints when flipped

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 58fa255508..1d029c39d6 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -112,8 +112,13 @@ namespace osu.Game.Skinning.Editor
             drawableQuad = drawable.ScreenSpaceDrawQuad;
             var quad = ToLocalSpace(drawable.ScreenSpaceDrawQuad);
 
-            box.Position = quad.TopLeft;
+            box.Position = new Vector2(
+                drawable.Scale.X < 0 ? quad.TopRight.X : quad.TopLeft.X,
+                drawable.Scale.Y < 0 ? quad.BottomLeft.Y : quad.TopLeft.Y
+            );
+
             box.Size = quad.Size;
+
             box.Rotation = drawable.Rotation;
         }
 

From 9a061ad80b38eea677eed6bb235951c8f035bb6b Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 5 May 2021 20:27:28 +0200
Subject: [PATCH 10047/10326] Extract directory selection logic of migration
 screen to DirectorySelectScreen.

---
 .../Maintenance/DirectorySelectScreen.cs      | 115 ++++++++++++++++++
 .../Maintenance/MigrationSelectScreen.cs      | 105 +++-------------
 2 files changed, 130 insertions(+), 90 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
new file mode 100644
index 0000000000..278c1ab20d
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -0,0 +1,115 @@
+// Copyright (c) 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.IO;
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Screens;
+using osuTK;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Framework.Screens;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public abstract class DirectorySelectScreen : OsuScreen
+    {
+        private TriangleButton selectionButton;
+
+        protected DirectorySelector DirectorySelector { get; private set; }
+
+        protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
+
+        protected abstract OsuSpriteText CreateHeader();
+
+        /// <summary>
+        /// Called upon selection of a directory by the user.
+        /// </summary>
+        /// <param name="directory">The selected directory</param>
+        protected abstract void OnSelection(DirectoryInfo directory);
+
+        protected virtual bool IsValidDirectory(DirectoryInfo info) => info != null;
+
+        public override bool AllowExternalScreenChange => false;
+
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            InternalChild = new Container
+            {
+                Masking = true,
+                CornerRadius = 10,
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(0.5f, 0.8f),
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colours.GreySeafoamDark
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
+                        {
+                            new Dimension(),
+                            new Dimension(GridSizeMode.Relative, 0.8f),
+                            new Dimension(),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                CreateHeader().With(header =>
+                                {
+                                    header.Origin = Anchor.Centre;
+                                    header.Anchor = Anchor.Centre;
+                                })
+                            },
+                            new Drawable[]
+                            {
+                                DirectorySelector = new DirectorySelector
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                }
+                            },
+                            new Drawable[]
+                            {
+                                selectionButton = new TriangleButton
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Width = 300,
+                                    Text = "Select directory",
+                                    Action = () => OnSelection(DirectorySelector.CurrentPath.Value)
+                                },
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            DirectorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = IsValidDirectory(e.NewValue), true);
+            base.LoadComplete();
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            base.OnSuspending(next);
+
+            this.FadeOut(250);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index ad540e3691..1f14d0991d 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -4,109 +4,28 @@
 using System;
 using System.IO;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.Screens;
-using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
-    public class MigrationSelectScreen : OsuScreen
+    public class MigrationSelectScreen : DirectorySelectScreen
     {
-        private DirectorySelector directorySelector;
+        [Resolved]
+        private Storage storage { get; set; }
 
-        public override bool AllowExternalScreenChange => false;
-
-        public override bool DisallowExternalBeatmapRulesetChanges => true;
-
-        public override bool HideOverlaysOnEnter => true;
-
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuGame game, Storage storage, OsuColour colours)
+        protected override OsuSpriteText CreateHeader() => new OsuSpriteText
         {
-            game?.Toolbar.Hide();
+            Text = "Please select a new location",
+            Font = OsuFont.Default.With(size: 40)
+        };
 
-            // begin selection in the parent directory of the current storage location
-            var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
-
-            InternalChild = new Container
-            {
-                Masking = true,
-                CornerRadius = 10,
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(0.5f, 0.8f),
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        Colour = colours.GreySeafoamDark,
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new GridContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        RowDimensions = new[]
-                        {
-                            new Dimension(),
-                            new Dimension(GridSizeMode.Relative, 0.8f),
-                            new Dimension(),
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
-                            {
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Text = "Please select a new location",
-                                    Font = OsuFont.Default.With(size: 40)
-                                },
-                            },
-                            new Drawable[]
-                            {
-                                directorySelector = new DirectorySelector(initialPath)
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                }
-                            },
-                            new Drawable[]
-                            {
-                                new TriangleButton
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Width = 300,
-                                    Text = "Begin folder migration",
-                                    Action = start
-                                },
-                            }
-                        }
-                    }
-                }
-            };
-        }
-
-        public override void OnSuspending(IScreen next)
+        protected override void OnSelection(DirectoryInfo directory)
         {
-            base.OnSuspending(next);
-
-            this.FadeOut(250);
-        }
-
-        private void start()
-        {
-            var target = directorySelector.CurrentPath.Value;
+            var target = directory;
 
             try
             {
@@ -123,6 +42,12 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             BeginMigration(target);
         }
 
+        protected override void LoadComplete()
+        {
+            DirectorySelector.CurrentPath.Value = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent;
+            base.LoadComplete();
+        }
+
         protected virtual void BeginMigration(DirectoryInfo target) => this.Push(new MigrationRunScreen(target));
     }
 }

From 4bb0e6b7d53bca6188470600b5ca3d6d1b007e65 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 5 May 2021 22:13:25 +0200
Subject: [PATCH 10048/10326] Create InitialPath property.

---
 .../Sections/Maintenance/DirectorySelectScreen.cs         | 5 +++++
 .../Sections/Maintenance/MigrationSelectScreen.cs         | 8 ++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index 278c1ab20d..a6ae3d6132 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected virtual bool IsValidDirectory(DirectoryInfo info) => info != null;
 
+        protected virtual DirectoryInfo InitialPath => null;
+
         public override bool AllowExternalScreenChange => false;
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
@@ -101,6 +103,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override void LoadComplete()
         {
+            if (InitialPath != null)
+                DirectorySelector.CurrentPath.Value = InitialPath;
+
             DirectorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = IsValidDirectory(e.NewValue), true);
             base.LoadComplete();
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index 1f14d0991d..cfbb7d6593 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         [Resolved]
         private Storage storage { get; set; }
 
+        protected override DirectoryInfo InitialPath => new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent;
+
         protected override OsuSpriteText CreateHeader() => new OsuSpriteText
         {
             Text = "Please select a new location",
@@ -42,12 +44,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             BeginMigration(target);
         }
 
-        protected override void LoadComplete()
-        {
-            DirectorySelector.CurrentPath.Value = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent;
-            base.LoadComplete();
-        }
-
         protected virtual void BeginMigration(DirectoryInfo target) => this.Push(new MigrationRunScreen(target));
     }
 }

From d3cc418961462f9961ba8551e18671c7046c92ed Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 6 May 2021 11:12:19 +0200
Subject: [PATCH 10049/10326] Privatize DirectorySelector.

---
 .../Sections/Maintenance/DirectorySelectScreen.cs      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index a6ae3d6132..c08323e67c 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
     {
         private TriangleButton selectionButton;
 
-        protected DirectorySelector DirectorySelector { get; private set; }
+        private DirectorySelector directorySelector;
 
         protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
 
@@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                             },
                             new Drawable[]
                             {
-                                DirectorySelector = new DirectorySelector
+                                directorySelector = new DirectorySelector
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                 }
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                                     Origin = Anchor.Centre,
                                     Width = 300,
                                     Text = "Select directory",
-                                    Action = () => OnSelection(DirectorySelector.CurrentPath.Value)
+                                    Action = () => OnSelection(directorySelector.CurrentPath.Value)
                                 },
                             }
                         }
@@ -104,9 +104,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         protected override void LoadComplete()
         {
             if (InitialPath != null)
-                DirectorySelector.CurrentPath.Value = InitialPath;
+                directorySelector.CurrentPath.Value = InitialPath;
 
-            DirectorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = IsValidDirectory(e.NewValue), true);
+            directorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = IsValidDirectory(e.NewValue), true);
             base.LoadComplete();
         }
 

From eee3cd7c5770c1e4e42383980ad9b8d65b6381e6 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 11:14:05 +0200
Subject: [PATCH 10050/10326] Disallow selecting storage root as a valid
 directory.

---
 .../Settings/Sections/Maintenance/DirectorySelectScreen.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index c08323e67c..582d14fbb6 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         /// <param name="directory">The selected directory</param>
         protected abstract void OnSelection(DirectoryInfo directory);
 
-        protected virtual bool IsValidDirectory(DirectoryInfo info) => info != null;
+        protected virtual bool IsValidDirectory(DirectoryInfo info) => true;
 
         protected virtual DirectoryInfo InitialPath => null;
 
@@ -106,7 +106,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             if (InitialPath != null)
                 directorySelector.CurrentPath.Value = InitialPath;
 
-            directorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = IsValidDirectory(e.NewValue), true);
+            directorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = e.NewValue != null ? IsValidDirectory(e.NewValue) : false, true);
             base.LoadComplete();
         }
 

From 19800f5f7f22d81bc0784796b78dc811e4a8458b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 11:24:22 +0200
Subject: [PATCH 10051/10326] Move `IBeatmap` arg into context

---
 .../Editor/Checks/CheckOffscreenObjectsTest.cs    | 12 ++++++------
 .../Edit/Checks/CheckOffscreenObjects.cs          |  5 ++---
 osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs  |  5 ++---
 .../Editing/Checks/CheckAudioQualityTest.cs       | 14 +++++++-------
 .../Editing/Checks/CheckBackgroundQualityTest.cs  | 14 +++++++-------
 .../Editing/Checks/CheckConcurrentObjectsTest.cs  | 15 ++++++++-------
 .../Editing/Checks/CheckFilePresenceTest.cs       | 12 ++++++------
 .../Editing/Checks/CheckUnsnappedObjectsTest.cs   | 15 ++++++++-------
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs         |  5 ++---
 osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs  |  8 +++++++-
 .../Rulesets/Edit/Checks/CheckAudioQuality.cs     |  5 ++---
 .../Edit/Checks/CheckBackgroundQuality.cs         |  7 +++----
 .../Edit/Checks/CheckConcurrentObjects.cs         | 11 +++++------
 .../Rulesets/Edit/Checks/CheckFilePresence.cs     |  6 +++---
 .../Rulesets/Edit/Checks/CheckUnsnappedObjects.cs |  7 +++----
 .../Rulesets/Edit/Checks/Components/ICheck.cs     |  4 +---
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs        |  3 +--
 osu.Game/Screens/Edit/Verify/IssueList.cs         |  6 +++---
 18 files changed, 76 insertions(+), 78 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 5545273af2..a6873c6de9 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -225,14 +225,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOk(IBeatmap beatmap)
         {
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            Assert.That(check.Run(beatmap, context), Is.Empty);
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+            Assert.That(check.Run(context), Is.Empty);
         }
 
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            var issues = check.Run(beatmap, context).ToList();
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
@@ -240,8 +240,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            var issues = check.Run(beatmap, context).ToList();
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 86bb7f203f..a342c2a821 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Osu.Objects;
@@ -32,9 +31,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            foreach (var hitobject in beatmap.HitObjects)
+            foreach (var hitobject in context.Beatmap.HitObjects)
             {
                 switch (hitobject)
                 {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index c62f472d75..04e881fbf3 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Osu.Edit.Checks;
@@ -17,9 +16,9 @@ namespace osu.Game.Rulesets.Osu.Edit
             new CheckOffscreenObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(beatmap, context));
+            return checks.SelectMany(check => check.Run(context));
         }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
index fbd02ea54e..1cbdc43140 100644
--- a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Editing.Checks
             mock.SetupGet(w => w.Beatmap).Returns(beatmap);
             mock.SetupGet(w => w.Track).Returns((Track)null);
 
-            Assert.That(check.Run(beatmap, new BeatmapVerifierContext(mock.Object)), Is.Empty);
+            Assert.That(check.Run(new BeatmapVerifierContext(beatmap, mock.Object)), Is.Empty);
         }
 
         [Test]
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(192);
 
-            Assert.That(check.Run(beatmap, context), Is.Empty);
+            Assert.That(check.Run(context), Is.Empty);
         }
 
         [Test]
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(null);
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
@@ -68,7 +68,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(0);
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(320);
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooHighBitrate);
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(64);
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run( context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooLowBitrate);
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Editing.Checks
 
         private BeatmapVerifierContext getContext(int? audioBitrate)
         {
-            return new BeatmapVerifierContext(getMockWorkingBeatmap(audioBitrate).Object);
+            return new BeatmapVerifierContext(beatmap, getMockWorkingBeatmap(audioBitrate).Object);
         }
 
         /// <summary>
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index e96ec5485d..3424cfe732 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.Metadata.BackgroundFile = null;
             var context = getContext(null, System.Array.Empty<byte>());
 
-            Assert.That(check.Run(beatmap, context), Is.Empty);
+            Assert.That(check.Run(context), Is.Empty);
         }
 
         [Test]
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(new Texture(1920, 1080));
 
-            Assert.That(check.Run(beatmap, context), Is.Empty);
+            Assert.That(check.Run(context), Is.Empty);
         }
 
         [Test]
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(new Texture(3840, 2160));
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooHighResolution);
@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(new Texture(640, 480));
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateLowResolution);
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(new Texture(100, 100));
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooLowResolution);
@@ -105,7 +105,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooUncompressed);
@@ -113,7 +113,7 @@ namespace osu.Game.Tests.Editing.Checks
 
         private BeatmapVerifierContext getContext(Texture background, [CanBeNull] byte[] fileBytes = null)
         {
-            return new BeatmapVerifierContext(getMockWorkingBeatmap(background, fileBytes).Object);
+            return new BeatmapVerifierContext(beatmap, getMockWorkingBeatmap(background, fileBytes).Object);
         }
 
         /// <summary>
diff --git a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
index ffe5d34e67..ba0a130a25 100644
--- a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using Moq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
@@ -105,7 +106,7 @@ namespace osu.Game.Tests.Editing.Checks
                 new HitCircle { StartTime = 300 }
             };
 
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(3));
             Assert.That(issues.Where(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentDifferent).ToList(), Has.Count.EqualTo(2));
@@ -164,12 +165,12 @@ namespace osu.Game.Tests.Editing.Checks
 
         private void assertOk(List<HitObject> hitobjects)
         {
-            Assert.That(check.Run(getPlayableBeatmap(hitobjects), null), Is.Empty);
+            Assert.That(check.Run(getContext(hitobjects)), Is.Empty);
         }
 
         private void assertConcurrentSame(List<HitObject> hitobjects, int count = 1)
         {
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentSame));
@@ -177,18 +178,18 @@ namespace osu.Game.Tests.Editing.Checks
 
         private void assertConcurrentDifferent(List<HitObject> hitobjects, int count = 1)
         {
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentDifferent));
         }
 
-        private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
+        private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
         {
-            return new Beatmap<HitObject>
+            return new BeatmapVerifierContext(new Beatmap<HitObject>
             {
                 HitObjects = hitobjects
-            };
+            }, null);
         }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
index 424dffcbc2..39a1d76d83 100644
--- a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
@@ -46,8 +46,8 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestBackgroundSetAndInFiles()
         {
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            Assert.That(check.Run(beatmap, context), Is.Empty);
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+            Assert.That(check.Run(context), Is.Empty);
         }
 
         [Test]
@@ -55,8 +55,8 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
 
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            var issues = check.Run(beatmap, context).ToList();
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateDoesNotExist);
@@ -67,8 +67,8 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.Metadata.BackgroundFile = null;
 
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            var issues = check.Run(beatmap, context).ToList();
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateNoneSet);
diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
index 5e65b263f2..02159fa57b 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
@@ -7,6 +7,7 @@ using Moq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -105,7 +106,7 @@ namespace osu.Game.Tests.Editing.Checks
                 getSliderMock(startTime: 98, endTime: 398.75d).Object
             };
 
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(2));
             Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
@@ -124,12 +125,12 @@ namespace osu.Game.Tests.Editing.Checks
 
         private void assertOk(List<HitObject> hitobjects)
         {
-            Assert.That(check.Run(getPlayableBeatmap(hitobjects), null), Is.Empty);
+            Assert.That(check.Run(getContext(hitobjects)), Is.Empty);
         }
 
         private void assert1Ms(List<HitObject> hitobjects, int count = 1)
         {
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
@@ -137,19 +138,19 @@ namespace osu.Game.Tests.Editing.Checks
 
         private void assert2Ms(List<HitObject> hitobjects, int count = 1)
         {
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateLargeUnsnap));
         }
 
-        private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
+        private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
         {
-            return new Beatmap<HitObject>
+            return new BeatmapVerifierContext(new Beatmap<HitObject>
             {
                 ControlPointInfo = cpi,
                 HitObjects = hitobjects
-            };
+            }, null);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 1860d54b57..d208c7fe07 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
@@ -29,9 +28,9 @@ namespace osu.Game.Rulesets.Edit
             new CheckConcurrentObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(beatmap, context));
+            return checks.SelectMany(check => check.Run(context));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
index 76b74cb993..53bdf3140c 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
@@ -11,6 +11,11 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public class BeatmapVerifierContext
     {
+        /// <summary>
+        /// The playable beatmap instance of the current beatmap.
+        /// </summary>
+        public readonly IBeatmap Beatmap;
+
         /// <summary>
         /// The working beatmap instance of the current beatmap.
         /// </summary>
@@ -21,8 +26,9 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public DifficultyRating InterpretedDifficulty;
 
-        public BeatmapVerifierContext(IWorkingBeatmap workingBeatmap, DifficultyRating difficultyRating = DifficultyRating.ExpertPlus)
+        public BeatmapVerifierContext(IBeatmap beatmap, IWorkingBeatmap workingBeatmap, DifficultyRating difficultyRating = DifficultyRating.ExpertPlus)
         {
+            Beatmap = beatmap;
             WorkingBeatmap = workingBeatmap;
             InterpretedDifficulty = difficultyRating;
         }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
index 1015f267aa..70d11883b7 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit.Checks
@@ -26,9 +25,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateNoBitrate(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            var audioFile = beatmap.Metadata?.AudioFile;
+            var audioFile = context.Beatmap.Metadata?.AudioFile;
             if (audioFile == null)
                 yield break;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 87f5c80c89..085c558eaf 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit.Checks
@@ -30,9 +29,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateTooUncompressed(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            var backgroundFile = beatmap.Metadata?.BackgroundFile;
+            var backgroundFile = context.Beatmap.Metadata?.BackgroundFile;
             if (backgroundFile == null)
                 yield break;
 
@@ -48,7 +47,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             else if (texture.Width < low_width || texture.Height < low_height)
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
-            string storagePath = beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
+            string storagePath = context.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
             double filesizeMb = context.WorkingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
 
             if (filesizeMb > max_filesize_mb)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index fd6ed664e6..51277298ab 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -22,15 +21,15 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateConcurrentDifferent(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            for (int i = 0; i < beatmap.HitObjects.Count - 1; ++i)
+            for (int i = 0; i < context.Beatmap.HitObjects.Count - 1; ++i)
             {
-                var hitobject = beatmap.HitObjects[i];
+                var hitobject = context.Beatmap.HitObjects[i];
 
-                for (int j = i + 1; j < beatmap.HitObjects.Count; ++j)
+                for (int j = i + 1; j < context.Beatmap.HitObjects.Count; ++j)
                 {
-                    var nextHitobject = beatmap.HitObjects[j];
+                    var nextHitobject = context.Beatmap.HitObjects[j];
 
                     // Accounts for rulesets with hitobjects separated by columns, such as Mania.
                     // In these cases we only care about concurrent objects within the same column.
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index f04909d175..36a0bf8c5d 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -21,9 +21,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            var filename = GetFilename(beatmap);
+            var filename = GetFilename(context.Beatmap);
 
             if (filename == null)
             {
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
 
             // If the file is set, also make sure it still exists.
-            var storagePath = beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
+            var storagePath = context.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
             if (storagePath != null)
                 yield break;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index aa19f3df07..ded1bb54ca 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -22,11 +21,11 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateSmallUnsnap(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            var controlPointInfo = beatmap.ControlPointInfo;
+            var controlPointInfo = context.Beatmap.ControlPointInfo;
 
-            foreach (var hitobject in beatmap.HitObjects)
+            foreach (var hitobject in context.Beatmap.HitObjects)
             {
                 double startUnsnap = hitobject.StartTime - controlPointInfo.GetClosestSnappedTime(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index 511d6aaa0f..141de55f1d 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Edit.Checks.Components
 {
@@ -24,8 +23,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
-        /// <param name="beatmap">The playable beatmap of the beatmap to run the check on.</param>
         /// <param name="context">The beatmap verifier context associated with the beatmap.</param>
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context);
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 1dafc6938e..06f0abedb0 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit
@@ -12,6 +11,6 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public interface IBeatmapVerifier
     {
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context);
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context);
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index abf22ead10..fc9d4c7526 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
-            context = new BeatmapVerifierContext(workingBeatmap.Value, verify.InterpretedDifficulty.Value);
+            context = new BeatmapVerifierContext(beatmap, workingBeatmap.Value, verify.InterpretedDifficulty.Value);
             verify.InterpretedDifficulty.BindValueChanged(change =>
             {
                 context.InterpretedDifficulty = change.NewValue;
@@ -98,10 +98,10 @@ namespace osu.Game.Screens.Edit.Verify
 
         private void refresh()
         {
-            var issues = generalVerifier.Run(beatmap, context);
+            var issues = generalVerifier.Run(context);
 
             if (rulesetVerifier != null)
-                issues = issues.Concat(rulesetVerifier.Run(beatmap, context));
+                issues = issues.Concat(rulesetVerifier.Run(context));
 
             issues = filter(issues);
 

From df77b28b48b8a58a92380c458251efcaf73773c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 18:39:21 +0900
Subject: [PATCH 10052/10326] Add a flimsy guard against null parent to avoid
 crashes on exit sequence

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 7db5bc7ead..b337aa53c4 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -172,6 +172,9 @@ namespace osu.Game.Skinning.Editor
         {
             base.Update();
 
+            if (drawable.Parent == null)
+                return;
+
             originBox.Position = drawable.ToSpaceOfOtherDrawable(drawable.OriginPosition, this);
             anchorBox.Position = drawable.Parent.ToSpaceOfOtherDrawable(drawable.AnchorPosition, this);
 

From 01bc71acd2a24c3fa5993aab6487f4fdee7d7062 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 18:40:28 +0900
Subject: [PATCH 10053/10326] Improve ability to parse xmldoc of
 `SkinnableTargetWrapper`

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Skinning/SkinnableTargetWrapper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index 664e8da480..395de590cf 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -9,8 +9,8 @@ using osu.Framework.Graphics.Containers;
 namespace osu.Game.Skinning
 {
     /// <summary>
-    /// A container which is serialised and can encapsulate multiple skinnable elements into a single return type (for consumption via <see cref="ISkin.GetDrawableComponent"/>.
-    /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
+    /// A container which groups the elements of a <see cref="SkinnableTargetContainer"/> into a single object.
+    /// Optionally also applies a default layout to the elements.
     /// </summary>
     [Serializable]
     public class SkinnableTargetWrapper : Container, ISkinnableDrawable

From 2f025f196723c0711e1573962515cabb892daae7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 18:51:23 +0900
Subject: [PATCH 10054/10326] SkinnableTargetWrapper ->
 SkinnableTargetComponentsContainer

---
 osu.Game/Skinning/DefaultSkin.cs                       |  2 +-
 osu.Game/Skinning/LegacySkin.cs                        |  2 +-
 osu.Game/Skinning/Skin.cs                              |  2 +-
 ...rapper.cs => SkinnableTargetComponentsContainer.cs} | 10 +++++-----
 osu.Game/Skinning/SkinnableTargetContainer.cs          |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename osu.Game/Skinning/{SkinnableTargetWrapper.cs => SkinnableTargetComponentsContainer.cs} (73%)

diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index d6ca5e9009..65e8fd1b82 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Skinning
                     switch (target.Target)
                     {
                         case SkinnableTarget.MainHUDComponents:
-                            var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
+                            var skinnableTargetWrapper = new SkinnableTargetComponentsContainer(container =>
                             {
                                 var score = container.OfType<DefaultScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<DefaultAccuracyCounter>().FirstOrDefault();
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 27f6fcdf97..a6f8f45c0f 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -332,7 +332,7 @@ namespace osu.Game.Skinning
                     {
                         case SkinnableTarget.MainHUDComponents:
 
-                            var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
+                            var skinnableTargetWrapper = new SkinnableTargetComponentsContainer(container =>
                             {
                                 var score = container.OfType<LegacyScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault();
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 0ceca3925e..2944c7a8ec 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Skinning
                     if (!DrawableComponentInfo.TryGetValue(target.Target, out var skinnableInfo))
                         return null;
 
-                    return new SkinnableTargetWrapper
+                    return new SkinnableTargetComponentsContainer
                     {
                         ChildrenEnumerable = skinnableInfo.Select(i => i.CreateInstance())
                     };
diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetComponentsContainer.cs
similarity index 73%
rename from osu.Game/Skinning/SkinnableTargetWrapper.cs
rename to osu.Game/Skinning/SkinnableTargetComponentsContainer.cs
index 395de590cf..2107ca7a8b 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetComponentsContainer.cs
@@ -9,11 +9,11 @@ using osu.Framework.Graphics.Containers;
 namespace osu.Game.Skinning
 {
     /// <summary>
-    /// A container which groups the elements of a <see cref="SkinnableTargetContainer"/> into a single object.
-    /// Optionally also applies a default layout to the elements.
+    /// A container which groups the components of a <see cref="SkinnableTargetContainer"/> into a single object.
+    /// Optionally also applies a default layout to the components.
     /// </summary>
     [Serializable]
-    public class SkinnableTargetWrapper : Container, ISkinnableDrawable
+    public class SkinnableTargetComponentsContainer : Container, ISkinnableDrawable
     {
         public bool IsEditable => false;
 
@@ -23,14 +23,14 @@ namespace osu.Game.Skinning
         /// Construct a wrapper with defaults that should be applied once.
         /// </summary>
         /// <param name="applyDefaults">A function to apply the default layout.</param>
-        public SkinnableTargetWrapper(Action<Container> applyDefaults)
+        public SkinnableTargetComponentsContainer(Action<Container> applyDefaults)
             : this()
         {
             this.applyDefaults = applyDefaults;
         }
 
         [JsonConstructor]
-        public SkinnableTargetWrapper()
+        public SkinnableTargetComponentsContainer()
         {
             RelativeSizeAxes = Axes.Both;
         }
diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index 52e86f5d86..a4d7f621eb 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Skinning
 {
     public class SkinnableTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
-        private SkinnableTargetWrapper content;
+        private SkinnableTargetComponentsContainer content;
 
         public SkinnableTarget Target { get; }
 
@@ -31,7 +31,7 @@ namespace osu.Game.Skinning
             ClearInternal();
             components.Clear();
 
-            content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
+            content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetComponentsContainer;
 
             if (content != null)
             {

From 07e475cd132cde77478a45ac976173bb4abfdf67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 18:54:40 +0900
Subject: [PATCH 10055/10326] Fix skin blueprint box drawing incorrectly when
 both scale and rotation are applied

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 1d029c39d6..b2a1b1c9d8 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -112,14 +113,10 @@ namespace osu.Game.Skinning.Editor
             drawableQuad = drawable.ScreenSpaceDrawQuad;
             var quad = ToLocalSpace(drawable.ScreenSpaceDrawQuad);
 
-            box.Position = new Vector2(
-                drawable.Scale.X < 0 ? quad.TopRight.X : quad.TopLeft.X,
-                drawable.Scale.Y < 0 ? quad.BottomLeft.Y : quad.TopLeft.Y
-            );
-
+            box.Position = drawable.ToSpaceOfOtherDrawable(Vector2.Zero, this);
             box.Size = quad.Size;
-
             box.Rotation = drawable.Rotation;
+            box.Scale = new Vector2(MathF.Sign(drawable.Scale.X), MathF.Sign(drawable.Scale.Y));
         }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);

From e5f765d1a8ef42e9a12fe94dbe23f3d464d1972d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 19:06:58 +0900
Subject: [PATCH 10056/10326] Fix broken exception message

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 67285987ef..cb27a84a75 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -166,7 +166,7 @@ namespace osu.Game.Skinning.Editor
         private void placeComponent(Type type)
         {
             if (!(Activator.CreateInstance(type) is ISkinnableDrawable component))
-                throw new InvalidOperationException("Attempted to instantiate a component for placement which was not an {typeof(ISkinnableComponent)}.");
+                throw new InvalidOperationException($"Attempted to instantiate a component for placement which was not an {typeof(ISkinnableDrawable)}.");
 
             getTarget(SkinnableTarget.MainHUDComponents)?.Add(component);
 

From ffb6135a1bd0dd531d86ff238c62ed0dfecda5b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 19:53:32 +0900
Subject: [PATCH 10057/10326] Rework hitobject blueprints to take in hitobject
 models

---
 .../TestSceneHoldNoteSelectionBlueprint.cs    |  2 +-
 .../Editor/TestSceneNoteSelectionBlueprint.cs |  2 +-
 .../HoldNoteNoteSelectionBlueprint.cs         |  5 +++--
 .../Blueprints/HoldNoteSelectionBlueprint.cs  |  9 ++++----
 .../Blueprints/ManiaSelectionBlueprint.cs     |  9 ++++----
 .../Edit/Blueprints/NoteSelectionBlueprint.cs |  6 ++---
 .../Edit/ManiaBlueprintContainer.cs           | 11 +++++-----
 .../Edit/ManiaSelectionHandler.cs             |  5 ++---
 .../TestSceneHitCircleSelectionBlueprint.cs   |  6 ++---
 .../TestSceneSliderControlPointPiece.cs       |  8 +++----
 .../TestSceneSliderSelectionBlueprint.cs      |  8 +++----
 .../TestSceneSpinnerSelectionBlueprint.cs     |  2 +-
 .../HitCircles/HitCircleSelectionBlueprint.cs |  4 ++--
 .../Edit/Blueprints/OsuSelectionBlueprint.cs  | 10 ++++-----
 .../Sliders/SliderCircleSelectionBlueprint.cs |  3 +--
 .../Sliders/SliderSelectionBlueprint.cs       | 16 +++++---------
 .../Spinners/SpinnerSelectionBlueprint.cs     |  3 +--
 .../Edit/OsuBlueprintContainer.cs             | 13 +++++------
 .../Blueprints/TaikoSelectionBlueprint.cs     |  6 ++---
 .../Edit/TaikoBlueprintContainer.cs           |  3 +--
 ...rint.cs => HitObjectSelectionBlueprint.cs} | 22 ++++++++++++++-----
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs  | 12 +++++-----
 .../Components/ComposeBlueprintContainer.cs   |  5 ++---
 .../Compose/Components/MoveSelectionEvent.cs  |  2 +-
 .../Visual/SelectionBlueprintTestScene.cs     |  4 +++-
 25 files changed, 90 insertions(+), 86 deletions(-)
 rename osu.Game/Rulesets/Edit/{OverlaySelectionBlueprint.cs => HitObjectSelectionBlueprint.cs} (68%)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
index 24f4c6858e..5e99264d7d 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
                 }
             };
 
-            AddBlueprint(new HoldNoteSelectionBlueprint(drawableObject));
+            AddBlueprint(new HoldNoteSelectionBlueprint(holdNote), drawableObject);
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
index 0e47a12a8e..9c3ad0b4ff 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
                 Child = drawableObject = new DrawableNote(note)
             };
 
-            AddBlueprint(new NoteSelectionBlueprint(drawableObject));
+            AddBlueprint(new NoteSelectionBlueprint(note), drawableObject);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs
index 4e73883de0..14c8d488a9 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs
@@ -3,17 +3,18 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public class HoldNoteNoteSelectionBlueprint : ManiaSelectionBlueprint
+    public class HoldNoteNoteSelectionBlueprint : ManiaSelectionBlueprint<HoldNote>
     {
         protected new DrawableHoldNote DrawableObject => (DrawableHoldNote)base.DrawableObject;
 
         private readonly HoldNotePosition position;
 
-        public HoldNoteNoteSelectionBlueprint(DrawableHoldNote holdNote, HoldNotePosition position)
+        public HoldNoteNoteSelectionBlueprint(HoldNote holdNote, HoldNotePosition position)
             : base(holdNote)
         {
             this.position = position;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
index 1737c4d2e5..c7ee6097c6 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
@@ -8,13 +8,14 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public class HoldNoteSelectionBlueprint : ManiaSelectionBlueprint
+    public class HoldNoteSelectionBlueprint : ManiaSelectionBlueprint<HoldNote>
     {
         public new DrawableHoldNote DrawableObject => (DrawableHoldNote)base.DrawableObject;
 
@@ -23,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private OsuColour colours { get; set; }
 
-        public HoldNoteSelectionBlueprint(DrawableHoldNote hold)
+        public HoldNoteSelectionBlueprint(HoldNote hold)
             : base(hold)
         {
         }
@@ -40,8 +41,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             InternalChildren = new Drawable[]
             {
-                new HoldNoteNoteSelectionBlueprint(DrawableObject, HoldNotePosition.Start),
-                new HoldNoteNoteSelectionBlueprint(DrawableObject, HoldNotePosition.End),
+                new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.Start),
+                new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.End),
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 384f49d9b2..e744bd3c83 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -4,22 +4,23 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public abstract class ManiaSelectionBlueprint : OverlaySelectionBlueprint
+    public abstract class ManiaSelectionBlueprint<T> : HitObjectSelectionBlueprint<T>
+        where T : ManiaHitObject
     {
         public new DrawableManiaHitObject DrawableObject => (DrawableManiaHitObject)base.DrawableObject;
 
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        protected ManiaSelectionBlueprint(DrawableHitObject drawableObject)
-            : base(drawableObject)
+        protected ManiaSelectionBlueprint(T hitObject)
+            : base(hitObject)
         {
             RelativeSizeAxes = Axes.None;
         }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs
index 2bff33c4cf..e2b6ee0048 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs
@@ -3,13 +3,13 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Objects;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public class NoteSelectionBlueprint : ManiaSelectionBlueprint
+    public class NoteSelectionBlueprint : ManiaSelectionBlueprint<Note>
     {
-        public NoteSelectionBlueprint(DrawableNote note)
+        public NoteSelectionBlueprint(Note note)
             : base(note)
         {
             AddInternal(new EditNotePiece { RelativeSizeAxes = Axes.X });
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
index c4429176d1..c5a109a6d1 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
@@ -3,9 +3,8 @@
 
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Mania.Edit
@@ -17,18 +16,18 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
-        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
+        public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject)
         {
             switch (hitObject)
             {
-                case DrawableNote note:
+                case Note note:
                     return new NoteSelectionBlueprint(note);
 
-                case DrawableHoldNote holdNote:
+                case HoldNote holdNote:
                     return new HoldNoteSelectionBlueprint(holdNote);
             }
 
-            return base.CreateBlueprintFor(hitObject);
+            return base.CreateHitObjectBlueprintFor(hitObject);
         }
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new ManiaSelectionHandler();
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 7042110423..8a1446db32 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -5,7 +5,6 @@ using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -23,8 +22,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent)
         {
-            var maniaBlueprint = (ManiaSelectionBlueprint)moveEvent.Blueprint;
-            int lastColumn = maniaBlueprint.DrawableObject.HitObject.Column;
+            var maniaBlueprint = (HitObjectSelectionBlueprint<ManiaHitObject>)moveEvent.Blueprint;
+            int lastColumn = maniaBlueprint.HitObject.Column;
 
             performColumnMovement(lastColumn, moveEvent);
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCircleSelectionBlueprint.cs
index 66cd405195..315493318d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCircleSelectionBlueprint.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
 
             Add(drawableObject = new DrawableHitCircle(hitCircle));
-            AddBlueprint(blueprint = new TestBlueprint(drawableObject));
+            AddBlueprint(blueprint = new TestBlueprint(hitCircle), drawableObject);
         });
 
         [Test]
@@ -63,8 +63,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             public new HitCirclePiece CirclePiece => base.CirclePiece;
 
-            public TestBlueprint(DrawableHitCircle drawableCircle)
-                : base(drawableCircle)
+            public TestBlueprint(HitCircle circle)
+                : base(circle)
             {
             }
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index d7dfc3bd42..fe0f2f8a87 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
 
             Add(drawableObject = new DrawableSlider(slider));
-            AddBlueprint(new TestSliderBlueprint(drawableObject));
+            AddBlueprint(new TestSliderBlueprint(slider), drawableObject);
         });
 
         [Test]
@@ -154,19 +154,19 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             public new TestSliderCircleBlueprint TailBlueprint => (TestSliderCircleBlueprint)base.TailBlueprint;
             public new PathControlPointVisualiser ControlPointVisualiser => base.ControlPointVisualiser;
 
-            public TestSliderBlueprint(DrawableSlider slider)
+            public TestSliderBlueprint(Slider slider)
                 : base(slider)
             {
             }
 
-            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
+            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
         }
 
         private class TestSliderCircleBlueprint : SliderCircleSelectionBlueprint
         {
             public new HitCirclePiece CirclePiece => base.CirclePiece;
 
-            public TestSliderCircleBlueprint(DrawableSlider slider, SliderPosition position)
+            public TestSliderCircleBlueprint(Slider slider, SliderPosition position)
                 : base(slider, position)
             {
             }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index f6e1be693b..721bb1985d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
 
             Add(drawableObject = new DrawableSlider(slider));
-            AddBlueprint(blueprint = new TestSliderBlueprint(drawableObject));
+            AddBlueprint(blueprint = new TestSliderBlueprint(slider), drawableObject);
         });
 
         [Test]
@@ -199,19 +199,19 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             public new TestSliderCircleBlueprint TailBlueprint => (TestSliderCircleBlueprint)base.TailBlueprint;
             public new PathControlPointVisualiser ControlPointVisualiser => base.ControlPointVisualiser;
 
-            public TestSliderBlueprint(DrawableSlider slider)
+            public TestSliderBlueprint(Slider slider)
                 : base(slider)
             {
             }
 
-            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
+            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
         }
 
         private class TestSliderCircleBlueprint : SliderCircleSelectionBlueprint
         {
             public new HitCirclePiece CirclePiece => base.CirclePiece;
 
-            public TestSliderCircleBlueprint(DrawableSlider slider, SliderPosition position)
+            public TestSliderCircleBlueprint(Slider slider, SliderPosition position)
                 : base(slider, position)
             {
             }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
index 4248f68a60..5007841805 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 Child = drawableSpinner = new DrawableSpinner(spinner)
             });
 
-            AddBlueprint(new SpinnerSelectionBlueprint(drawableSpinner) { Size = new Vector2(0.5f) });
+            AddBlueprint(new SpinnerSelectionBlueprint(spinner) { Size = new Vector2(0.5f) }, drawableSpinner);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
index abbb54e3c1..b21a3e038e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
@@ -15,8 +15,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
 
         protected readonly HitCirclePiece CirclePiece;
 
-        public HitCircleSelectionBlueprint(DrawableHitCircle drawableCircle)
-            : base(drawableCircle)
+        public HitCircleSelectionBlueprint(HitCircle circle)
+            : base(circle)
         {
             InternalChild = CirclePiece = new HitCirclePiece();
         }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
index 299f8fc43a..994c5cebeb 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
@@ -2,20 +2,20 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints
 {
-    public abstract class OsuSelectionBlueprint<T> : OverlaySelectionBlueprint
+    public abstract class OsuSelectionBlueprint<T> : HitObjectSelectionBlueprint<T>
         where T : OsuHitObject
     {
-        protected T HitObject => (T)DrawableObject.HitObject;
+        protected new DrawableOsuHitObject DrawableObject => (DrawableOsuHitObject)base.DrawableObject;
 
         protected override bool AlwaysShowWhenSelected => true;
 
-        protected OsuSelectionBlueprint(DrawableHitObject drawableObject)
-            : base(drawableObject)
+        protected OsuSelectionBlueprint(T hitObject)
+            : base(hitObject)
         {
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
index dec9cd8622..ff01c7a442 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
@@ -3,7 +3,6 @@
 
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
@@ -13,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private readonly SliderPosition position;
 
-        public SliderCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position)
+        public SliderCircleSelectionBlueprint(Slider slider, SliderPosition position)
             : base(slider)
         {
             this.position = position;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 88fcb1e715..939f4cdc3e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -16,7 +16,6 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
@@ -33,8 +32,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [CanBeNull]
         protected PathControlPointVisualiser ControlPointVisualiser { get; private set; }
 
-        private readonly DrawableSlider slider;
-
         [Resolved(CanBeNull = true)]
         private HitObjectComposer composer { get; set; }
 
@@ -52,10 +49,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private readonly BindableList<PathControlPoint> controlPoints = new BindableList<PathControlPoint>();
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
-        public SliderSelectionBlueprint(DrawableSlider slider)
+        public SliderSelectionBlueprint(Slider slider)
             : base(slider)
         {
-            this.slider = slider;
         }
 
         [BackgroundDependencyLoader]
@@ -64,8 +60,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             InternalChildren = new Drawable[]
             {
                 BodyPiece = new SliderBodyPiece(),
-                HeadBlueprint = CreateCircleSelectionBlueprint(slider, SliderPosition.Start),
-                TailBlueprint = CreateCircleSelectionBlueprint(slider, SliderPosition.End),
+                HeadBlueprint = CreateCircleSelectionBlueprint(HitObject, SliderPosition.Start),
+                TailBlueprint = CreateCircleSelectionBlueprint(HitObject, SliderPosition.End),
             };
         }
 
@@ -103,7 +99,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         protected override void OnSelected()
         {
-            AddInternal(ControlPointVisualiser = new PathControlPointVisualiser(slider.HitObject, true)
+            AddInternal(ControlPointVisualiser = new PathControlPointVisualiser(HitObject, true)
             {
                 RemoveControlPointsRequested = removeControlPoints
             });
@@ -215,7 +211,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             }
 
             // If there are 0 or 1 remaining control points, the slider is in a degenerate (single point) form and should be deleted
-            if (controlPoints.Count <= 1 || !slider.HitObject.Path.HasValidLength)
+            if (controlPoints.Count <= 1 || !HitObject.Path.HasValidLength)
             {
                 placementHandler?.Delete(HitObject);
                 return;
@@ -245,6 +241,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
 
-        protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
+        protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
index f05d4f8435..ee573d1a01 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
@@ -3,7 +3,6 @@
 
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
@@ -12,7 +11,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
     {
         private readonly SpinnerPiece piece;
 
-        public SpinnerSelectionBlueprint(DrawableSpinner spinner)
+        public SpinnerSelectionBlueprint(Spinner spinner)
             : base(spinner)
         {
             InternalChild = piece = new SpinnerPiece();
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
index abac5eb56e..dc8c3d6107 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
@@ -3,11 +3,10 @@
 
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Osu.Edit
@@ -21,21 +20,21 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new OsuSelectionHandler();
 
-        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
+        public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject)
         {
             switch (hitObject)
             {
-                case DrawableHitCircle circle:
+                case HitCircle circle:
                     return new HitCircleSelectionBlueprint(circle);
 
-                case DrawableSlider slider:
+                case Slider slider:
                     return new SliderSelectionBlueprint(slider);
 
-                case DrawableSpinner spinner:
+                case Spinner spinner:
                     return new SpinnerSelectionBlueprint(spinner);
             }
 
-            return base.CreateBlueprintFor(hitObject);
+            return base.CreateHitObjectBlueprintFor(hitObject);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
index 62f69122cc..01b90c4bca 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
@@ -3,14 +3,14 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects;
 using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
 {
-    public class TaikoSelectionBlueprint : OverlaySelectionBlueprint
+    public class TaikoSelectionBlueprint : HitObjectSelectionBlueprint
     {
-        public TaikoSelectionBlueprint(DrawableHitObject hitObject)
+        public TaikoSelectionBlueprint(HitObject hitObject)
             : base(hitObject)
         {
             RelativeSizeAxes = Axes.None;
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
index b1b08a9461..a465638779 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
@@ -3,7 +3,6 @@
 
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -18,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new TaikoSelectionHandler();
 
-        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) =>
+        public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject) =>
             new TaikoSelectionBlueprint(hitObject);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
similarity index 68%
rename from osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
rename to osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
index 7911cf874b..56434b1d82 100644
--- a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
@@ -9,12 +9,12 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public abstract class OverlaySelectionBlueprint : SelectionBlueprint<HitObject>
+    public abstract class HitObjectSelectionBlueprint : SelectionBlueprint<HitObject>
     {
         /// <summary>
-        /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
+        /// The <see cref="DrawableHitObject"/> which this <see cref="HitObjectSelectionBlueprint"/> applies to.
         /// </summary>
-        public readonly DrawableHitObject DrawableObject;
+        public DrawableHitObject DrawableObject { get; internal set; }
 
         /// <summary>
         /// Whether the blueprint should be shown even when the <see cref="DrawableObject"/> is not alive.
@@ -23,10 +23,9 @@ namespace osu.Game.Rulesets.Edit
 
         protected override bool ShouldBeAlive => (DrawableObject.IsAlive && DrawableObject.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
 
-        protected OverlaySelectionBlueprint(DrawableHitObject drawableObject)
-            : base(drawableObject.HitObject)
+        protected HitObjectSelectionBlueprint(HitObject hitObject)
+            : base(hitObject)
         {
-            DrawableObject = drawableObject;
         }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.ReceivePositionalInputAt(screenSpacePos);
@@ -35,4 +34,15 @@ namespace osu.Game.Rulesets.Edit
 
         public override Quad SelectionQuad => DrawableObject.ScreenSpaceDrawQuad;
     }
+
+    public abstract class HitObjectSelectionBlueprint<T> : HitObjectSelectionBlueprint
+        where T : HitObject
+    {
+        public T HitObject => (T)Item;
+
+        protected HitObjectSelectionBlueprint(T item)
+            : base(item)
+        {
+        }
+    }
 }
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 55703a2cd3..f59ad8bfa2 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -105,34 +105,34 @@ namespace osu.Game.Rulesets.Edit
         protected override bool ShouldBeConsideredForInput(Drawable child) => State == SelectionState.Selected;
 
         /// <summary>
-        /// Selects this <see cref="OverlaySelectionBlueprint"/>, causing it to become visible.
+        /// Selects this <see cref="HitObjectSelectionBlueprint"/>, causing it to become visible.
         /// </summary>
         public void Select() => State = SelectionState.Selected;
 
         /// <summary>
-        /// Deselects this <see cref="OverlaySelectionBlueprint"/>, causing it to become invisible.
+        /// Deselects this <see cref="HitObjectSelectionBlueprint"/>, causing it to become invisible.
         /// </summary>
         public void Deselect() => State = SelectionState.NotSelected;
 
         /// <summary>
-        /// Toggles the selection state of this <see cref="OverlaySelectionBlueprint"/>.
+        /// Toggles the selection state of this <see cref="HitObjectSelectionBlueprint"/>.
         /// </summary>
         public void ToggleSelection() => State = IsSelected ? SelectionState.NotSelected : SelectionState.Selected;
 
         public bool IsSelected => State == SelectionState.Selected;
 
         /// <summary>
-        /// The <see cref="MenuItem"/>s to be displayed in the context menu for this <see cref="OverlaySelectionBlueprint"/>.
+        /// The <see cref="MenuItem"/>s to be displayed in the context menu for this <see cref="HitObjectSelectionBlueprint"/>.
         /// </summary>
         public virtual MenuItem[] ContextMenuItems => Array.Empty<MenuItem>();
 
         /// <summary>
-        /// The screen-space point that causes this <see cref="OverlaySelectionBlueprint"/> to be selected via a drag.
+        /// The screen-space point that causes this <see cref="HitObjectSelectionBlueprint"/> to be selected via a drag.
         /// </summary>
         public virtual Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.Centre;
 
         /// <summary>
-        /// The screen-space quad that outlines this <see cref="OverlaySelectionBlueprint"/> for selections.
+        /// The screen-space quad that outlines this <see cref="HitObjectSelectionBlueprint"/> for selections.
         /// </summary>
         public virtual Quad SelectionQuad => ScreenSpaceDrawQuad;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 6c174e563e..95f4069edb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -16,7 +16,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osuTK;
@@ -246,10 +245,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (drawable == null)
                 return null;
 
-            return CreateBlueprintFor(drawable);
+            return CreateHitObjectBlueprintFor(item).With(b => b.DrawableObject = drawable);
         }
 
-        public virtual OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
+        public virtual HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject) => null;
 
         protected override void OnBlueprintAdded(HitObject item)
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index 4d4f4b76c6..e32dcc81ee 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -7,7 +7,7 @@ using osuTK;
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// An event which occurs when a <see cref="OverlaySelectionBlueprint"/> is moved.
+    /// An event which occurs when a <see cref="HitObjectSelectionBlueprint"/> is moved.
     /// </summary>
     public class MoveSelectionEvent<T>
     {
diff --git a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
index 1176361679..dc12a4999d 100644
--- a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
@@ -5,6 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Tests.Visual
 {
@@ -22,10 +23,11 @@ namespace osu.Game.Tests.Visual
             });
         }
 
-        protected void AddBlueprint(OverlaySelectionBlueprint blueprint)
+        protected void AddBlueprint(HitObjectSelectionBlueprint blueprint, DrawableHitObject drawableObject)
         {
             Add(blueprint.With(d =>
             {
+                d.DrawableObject = drawableObject;
                 d.Depth = float.MinValue;
                 d.Select();
             }));

From 94538b38429f5d7a2447c44e0617f7c868e44437 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 12:56:36 +0200
Subject: [PATCH 10058/10326] Remove accidental whitespace

---
 osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
index 1cbdc43140..39fbf11d51 100644
--- a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(64);
 
-            var issues = check.Run( context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooLowBitrate);

From 1ae57a6105b124bbfb39a8a2f9e980014385f6f0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 20:11:04 +0900
Subject: [PATCH 10059/10326] Fix hold note input test

Not sure why this was checking visibility. If it needs to be tested, it
does not belong in an "Input" test.
---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 668487f673..aa4eb77280 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -5,13 +5,11 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Screens;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Objects;
@@ -414,13 +412,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
 
-            AddUntilStep("wait for head", () => currentPlayer.GameplayClockContainer.GameplayClock.CurrentTime >= time_head);
-            AddAssert("head is visible",
-                () => currentPlayer.ChildrenOfType<DrawableHoldNote>()
-                                   .Single(note => note.HitObject == beatmap.HitObjects[0])
-                                   .Head
-                                   .Alpha == 1);
-
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 

From 98e77a30d39910c35593ac89ea7369787b6b3fb6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 20:13:50 +0900
Subject: [PATCH 10060/10326] Move column changing logic to
 ManiaSelectionHandler

---
 .../Edit/ManiaSelectionHandler.cs             |  5 ++-
 osu.Game.Rulesets.Mania/UI/Stage.cs           | 44 ++-----------------
 2 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 7042110423..83fafbc9d1 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -59,8 +59,9 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             EditorBeatmap.PerformOnSelection(h =>
             {
-                if (h is ManiaHitObject maniaObj)
-                    maniaObj.Column += columnDelta;
+                maniaPlayfield.Remove(h);
+                ((ManiaHitObject)h).Column += columnDelta;
+                maniaPlayfield.Add(h);
             });
         }
     }
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index eee75f3200..8c703e7a8a 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -139,49 +139,13 @@ namespace osu.Game.Rulesets.Mania.UI
             NewResult += OnNewResult;
         }
 
-        public override void Add(HitObject hitObject)
-        {
-            var maniaObject = (ManiaHitObject)hitObject;
-            int columnIndex = -1;
+        public override void Add(HitObject hitObject) => Columns.ElementAt(((ManiaHitObject)hitObject).Column - firstColumnIndex).Add(hitObject);
 
-            maniaObject.ColumnBindable.BindValueChanged(_ =>
-            {
-                if (columnIndex != -1)
-                    Columns.ElementAt(columnIndex).Remove(hitObject);
+        public override bool Remove(HitObject hitObject) => Columns.ElementAt(((ManiaHitObject)hitObject).Column - firstColumnIndex).Remove(hitObject);
 
-                columnIndex = maniaObject.Column - firstColumnIndex;
-                Columns.ElementAt(columnIndex).Add(hitObject);
-            }, true);
-        }
+        public override void Add(DrawableHitObject h) => Columns.ElementAt(((ManiaHitObject)h.HitObject).Column - firstColumnIndex).Add(h);
 
-        public override bool Remove(HitObject hitObject)
-        {
-            var maniaObject = (ManiaHitObject)hitObject;
-            int columnIndex = maniaObject.Column - firstColumnIndex;
-            return Columns.ElementAt(columnIndex).Remove(hitObject);
-        }
-
-        public override void Add(DrawableHitObject h)
-        {
-            var maniaObject = (ManiaHitObject)h.HitObject;
-            int columnIndex = -1;
-
-            maniaObject.ColumnBindable.BindValueChanged(_ =>
-            {
-                if (columnIndex != -1)
-                    Columns.ElementAt(columnIndex).Remove(h);
-
-                columnIndex = maniaObject.Column - firstColumnIndex;
-                Columns.ElementAt(columnIndex).Add(h);
-            }, true);
-        }
-
-        public override bool Remove(DrawableHitObject h)
-        {
-            var maniaObject = (ManiaHitObject)h.HitObject;
-            int columnIndex = maniaObject.Column - firstColumnIndex;
-            return Columns.ElementAt(columnIndex).Remove(h);
-        }
+        public override bool Remove(DrawableHitObject h) => Columns.ElementAt(((ManiaHitObject)h.HitObject).Column - firstColumnIndex).Remove(h);
 
         public void Add(BarLine barline) => base.Add(new DrawableBarLine(barline));
 

From 86042e176387aaf259d1ac4a378058af74f4c6cb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 20:56:38 +0900
Subject: [PATCH 10061/10326] Implement HitObjectContainerEventQueue

---
 .../Compose/HitObjectContainerEventQueue.cs   | 102 ++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs

diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
new file mode 100644
index 0000000000..b22d0a75e9
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
@@ -0,0 +1,102 @@
+// Copyright (c) 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.Diagnostics;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Screens.Edit.Compose
+{
+    /// <summary>
+    /// A queue which processes events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy.
+    /// </summary>
+    internal class HitObjectContainerEventQueue : Component
+    {
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If the ruleset uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
+        /// </remarks>
+        public event Action<HitObject, DrawableHitObject> HitObjectUsageBegan;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If the ruleset uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
+        /// </remarks>
+        public event Action<HitObject> HitObjectUsageFinished;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> has been transferred to another <see cref="DrawableHitObject"/>.
+        /// </summary>
+        public event Action<HitObject, DrawableHitObject> HitObjectUsageTransferred;
+
+        private readonly Playfield playfield;
+
+        /// <summary>
+        /// Creates a new <see cref="HitObjectContainerEventQueue"/>.
+        /// </summary>
+        /// <param name="playfield">The most top-level <see cref="Playfield"/>.</param>
+        public HitObjectContainerEventQueue(Playfield playfield)
+        {
+            this.playfield = playfield;
+
+            bindPlayfieldRecursive(playfield);
+        }
+
+        private void bindPlayfieldRecursive(Playfield p)
+        {
+            p.HitObjectContainer.HitObjectUsageBegan += onHitObjectUsageBegan;
+            p.HitObjectContainer.HitObjectUsageFinished += onHitObjectUsageFinished;
+
+            foreach (var nested in p.NestedPlayfields)
+                bindPlayfieldRecursive(nested);
+        }
+
+        private readonly Dictionary<HitObject, int> pendingUsagesBegan = new Dictionary<HitObject, int>();
+        private readonly Dictionary<HitObject, int> pendingUsagesFinished = new Dictionary<HitObject, int>();
+
+        private void onHitObjectUsageBegan(HitObject hitObject) => pendingUsagesBegan[hitObject] = pendingUsagesBegan.GetValueOrDefault(hitObject, 0) + 1;
+
+        private void onHitObjectUsageFinished(HitObject hitObject) => pendingUsagesFinished[hitObject] = pendingUsagesFinished.GetValueOrDefault(hitObject, 0) + 1;
+
+        protected override void Update()
+        {
+            base.Update();
+
+            foreach (var (hitObject, countBegan) in pendingUsagesBegan)
+            {
+                if (pendingUsagesFinished.TryGetValue(hitObject, out int countFinished))
+                {
+                    Debug.Assert(countFinished > 0);
+
+                    if (countBegan > countFinished)
+                    {
+                        // The hitobject is still in use, but transferred to a different HOC.
+                        HitObjectUsageTransferred?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
+                        pendingUsagesFinished.Remove(hitObject);
+                    }
+                }
+                else
+                {
+                    // This is a new usage of the hitobject.
+                    HitObjectUsageBegan?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
+                }
+            }
+
+            // Go through any remaining pending finished usages.
+            foreach (var (hitObject, _) in pendingUsagesFinished)
+                HitObjectUsageFinished?.Invoke(hitObject);
+
+            pendingUsagesBegan.Clear();
+            pendingUsagesFinished.Clear();
+        }
+    }
+}

From aaf31af32668d4fd9560c7645c6139a3e021b9c6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 21:16:19 +0900
Subject: [PATCH 10062/10326] Add blueprint transferral

---
 .../Compose/Components/BlueprintContainer.cs  |  7 +++++
 .../Components/ComposeBlueprintContainer.cs   |  9 +++++++
 .../Components/EditorBlueprintContainer.cs    | 18 +++++++------
 .../Compose/HitObjectContainerEventQueue.cs   | 27 ++++++++++---------
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 361e98e0dd..951cc99c85 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -276,6 +276,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
         }
 
+        /// <summary>
+        /// Retrieves an item's blueprint.
+        /// </summary>
+        /// <param name="item">The item to retrieve the blueprint of.</param>
+        /// <returns>The blueprint.</returns>
+        protected SelectionBlueprint<T> GetBlueprintFor(T item) => blueprintMap[item];
+
         #endregion
 
         #region Selection
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 95f4069edb..e231f7f648 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osuTK;
@@ -73,6 +74,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        protected override void TransferBlueprintFor(HitObject hitObject, DrawableHitObject drawableObject)
+        {
+            base.TransferBlueprintFor(hitObject, drawableObject);
+
+            var blueprint = (HitObjectSelectionBlueprint)GetBlueprintFor(hitObject);
+            blueprint.DrawableObject = drawableObject;
+        }
+
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (e.ControlPressed)
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index db322faf65..063023c849 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
@@ -65,8 +66,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 foreach (var obj in Composer.HitObjects)
                     AddBlueprintFor(obj.HitObject);
 
-                Composer.Playfield.HitObjectUsageBegan += AddBlueprintFor;
-                Composer.Playfield.HitObjectUsageFinished += RemoveBlueprintFor;
+                var eventQueue = new HitObjectContainerEventQueue(Composer.Playfield);
+                eventQueue.HitObjectUsageBegan += AddBlueprintFor;
+                eventQueue.HitObjectUsageFinished += RemoveBlueprintFor;
+                eventQueue.HitObjectUsageTransferred += TransferBlueprintFor;
+                AddInternal(eventQueue);
             }
         }
 
@@ -100,6 +104,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.AddBlueprintFor(item);
         }
 
+        protected virtual void TransferBlueprintFor(HitObject hitObject, DrawableHitObject drawableObject)
+        {
+        }
+
         protected override void DragOperationCompleted()
         {
             base.DragOperationCompleted();
@@ -152,12 +160,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 Beatmap.HitObjectAdded -= AddBlueprintFor;
                 Beatmap.HitObjectRemoved -= RemoveBlueprintFor;
             }
-
-            if (Composer != null)
-            {
-                Composer.Playfield.HitObjectUsageBegan -= AddBlueprintFor;
-                Composer.Playfield.HitObjectUsageFinished -= RemoveBlueprintFor;
-            }
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
index b22d0a75e9..26f5a28113 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -23,7 +24,7 @@ namespace osu.Game.Screens.Edit.Compose
         /// <remarks>
         /// If the ruleset uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
         /// </remarks>
-        public event Action<HitObject, DrawableHitObject> HitObjectUsageBegan;
+        public event Action<HitObject> HitObjectUsageBegan;
 
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
@@ -44,20 +45,12 @@ namespace osu.Game.Screens.Edit.Compose
         /// Creates a new <see cref="HitObjectContainerEventQueue"/>.
         /// </summary>
         /// <param name="playfield">The most top-level <see cref="Playfield"/>.</param>
-        public HitObjectContainerEventQueue(Playfield playfield)
+        public HitObjectContainerEventQueue([NotNull] Playfield playfield)
         {
             this.playfield = playfield;
 
-            bindPlayfieldRecursive(playfield);
-        }
-
-        private void bindPlayfieldRecursive(Playfield p)
-        {
-            p.HitObjectContainer.HitObjectUsageBegan += onHitObjectUsageBegan;
-            p.HitObjectContainer.HitObjectUsageFinished += onHitObjectUsageFinished;
-
-            foreach (var nested in p.NestedPlayfields)
-                bindPlayfieldRecursive(nested);
+            playfield.HitObjectUsageBegan += onHitObjectUsageBegan;
+            playfield.HitObjectUsageFinished += onHitObjectUsageFinished;
         }
 
         private readonly Dictionary<HitObject, int> pendingUsagesBegan = new Dictionary<HitObject, int>();
@@ -87,7 +80,7 @@ namespace osu.Game.Screens.Edit.Compose
                 else
                 {
                     // This is a new usage of the hitobject.
-                    HitObjectUsageBegan?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
+                    HitObjectUsageBegan?.Invoke(hitObject);
                 }
             }
 
@@ -98,5 +91,13 @@ namespace osu.Game.Screens.Edit.Compose
             pendingUsagesBegan.Clear();
             pendingUsagesFinished.Clear();
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            playfield.HitObjectUsageBegan -= onHitObjectUsageBegan;
+            playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
+        }
     }
 }

From 2307889bf81762d647718a17d0d4e326782dd4b5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 21:41:06 +0900
Subject: [PATCH 10063/10326] Fix incorrect cast

---
 osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 8a1446db32..a0a43ed6ca 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent)
         {
-            var maniaBlueprint = (HitObjectSelectionBlueprint<ManiaHitObject>)moveEvent.Blueprint;
-            int lastColumn = maniaBlueprint.HitObject.Column;
+            var hitObjectBlueprint = (HitObjectSelectionBlueprint)moveEvent.Blueprint;
+            int lastColumn = ((ManiaHitObject)hitObjectBlueprint.Item).Column;
 
             performColumnMovement(lastColumn, moveEvent);
 

From 362a09ca73d491890698e1f84c6de2239ee6b129 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 21:41:18 +0900
Subject: [PATCH 10064/10326] Fix up + reduce complexity of HOCEventQueue

---
 .../Compose/HitObjectContainerEventQueue.cs   | 70 ++++++++++++-------
 1 file changed, 46 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
index 26f5a28113..7c21573b18 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Graphics;
@@ -53,43 +52,59 @@ namespace osu.Game.Screens.Edit.Compose
             playfield.HitObjectUsageFinished += onHitObjectUsageFinished;
         }
 
-        private readonly Dictionary<HitObject, int> pendingUsagesBegan = new Dictionary<HitObject, int>();
-        private readonly Dictionary<HitObject, int> pendingUsagesFinished = new Dictionary<HitObject, int>();
+        private readonly Dictionary<HitObject, EventType> pendingEvents = new Dictionary<HitObject, EventType>();
 
-        private void onHitObjectUsageBegan(HitObject hitObject) => pendingUsagesBegan[hitObject] = pendingUsagesBegan.GetValueOrDefault(hitObject, 0) + 1;
+        private void onHitObjectUsageBegan(HitObject hitObject) => updateEvent(hitObject, EventType.Began);
 
-        private void onHitObjectUsageFinished(HitObject hitObject) => pendingUsagesFinished[hitObject] = pendingUsagesFinished.GetValueOrDefault(hitObject, 0) + 1;
+        private void onHitObjectUsageFinished(HitObject hitObject) => updateEvent(hitObject, EventType.Finished);
+
+        private void updateEvent(HitObject hitObject, EventType newEvent)
+        {
+            if (!pendingEvents.TryGetValue(hitObject, out EventType existingEvent))
+            {
+                pendingEvents[hitObject] = newEvent;
+                return;
+            }
+
+            switch (existingEvent, newEvent)
+            {
+                case (EventType.Transferred, EventType.Finished):
+                    pendingEvents[hitObject] = EventType.Finished;
+                    break;
+
+                case (EventType.Began, EventType.Finished):
+                case (EventType.Finished, EventType.Began):
+                    pendingEvents[hitObject] = EventType.Transferred;
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException($"Unexpected event update ({existingEvent} => {newEvent}).");
+            }
+        }
 
         protected override void Update()
         {
             base.Update();
 
-            foreach (var (hitObject, countBegan) in pendingUsagesBegan)
+            foreach (var (hitObject, e) in pendingEvents)
             {
-                if (pendingUsagesFinished.TryGetValue(hitObject, out int countFinished))
+                switch (e)
                 {
-                    Debug.Assert(countFinished > 0);
+                    case EventType.Began:
+                        HitObjectUsageBegan?.Invoke(hitObject);
+                        break;
 
-                    if (countBegan > countFinished)
-                    {
-                        // The hitobject is still in use, but transferred to a different HOC.
+                    case EventType.Transferred:
                         HitObjectUsageTransferred?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
-                        pendingUsagesFinished.Remove(hitObject);
-                    }
-                }
-                else
-                {
-                    // This is a new usage of the hitobject.
-                    HitObjectUsageBegan?.Invoke(hitObject);
+                        break;
+
+                    case EventType.Finished:
+                        HitObjectUsageFinished?.Invoke(hitObject);
+                        break;
                 }
             }
 
-            // Go through any remaining pending finished usages.
-            foreach (var (hitObject, _) in pendingUsagesFinished)
-                HitObjectUsageFinished?.Invoke(hitObject);
-
-            pendingUsagesBegan.Clear();
-            pendingUsagesFinished.Clear();
+            pendingEvents.Clear();
         }
 
         protected override void Dispose(bool isDisposing)
@@ -99,5 +114,12 @@ namespace osu.Game.Screens.Edit.Compose
             playfield.HitObjectUsageBegan -= onHitObjectUsageBegan;
             playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
         }
+
+        private enum EventType
+        {
+            Began,
+            Finished,
+            Transferred
+        }
     }
 }

From 1e23c535070102c326ca609f56b0d68765bcc25f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 21:59:38 +0900
Subject: [PATCH 10065/10326] Fix inspection

---
 osu.Game/Skinning/SkinnableDrawable.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index 77f7cf5c3f..fc2730ca44 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Skinning
         /// Whether the drawable component should be centered in available space.
         /// Defaults to true.
         /// </summary>
-        public bool CentreComponent { get; set; } = true;
+        public bool CentreComponent = true;
 
         public new Axes AutoSizeAxes
         {
@@ -42,7 +42,8 @@ namespace osu.Game.Skinning
         /// <param name="defaultImplementation">A function to create the default skin implementation of this element.</param>
         /// <param name="allowFallback">A conditional to decide whether to allow fallback to the default implementation if a skinned element is not present.</param>
         /// <param name="confineMode">How (if at all) the <see cref="Drawable"/> should be resize to fit within our own bounds.</param>
-        public SkinnableDrawable(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation = null, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
+        public SkinnableDrawable(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation = null, Func<ISkinSource, bool> allowFallback = null,
+                                 ConfineMode confineMode = ConfineMode.NoScaling)
             : this(component, allowFallback, confineMode)
         {
             createDefault = defaultImplementation;

From 4cf4817ad2abc61de9f754b7cd9e714bd19b74e0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 22:11:58 +0900
Subject: [PATCH 10066/10326] Remove redundant parens

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index f7eec4d661..79dd45c07c 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Skinning.Editor
             {
                 var drawable = (Drawable)item;
 
-                var previousAnchor = (drawable.AnchorPosition);
+                var previousAnchor = drawable.AnchorPosition;
                 drawable.Anchor = anchor;
                 drawable.Position -= drawable.AnchorPosition - previousAnchor;
             }

From 38c0ba2d1034b756f5d6e8b1f007afee44c9e648 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 May 2021 16:16:19 +0300
Subject: [PATCH 10067/10326] Implement current year highlight in YearsPanel

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 39 +++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 2a4e2024d2..2d405e832b 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Online.API.Requests.Responses;
 using System;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -58,7 +59,7 @@ namespace osu.Game.Overlays.News.Sidebar
                     return;
                 }
 
-                gridPlaceholder.Child = new YearsGridContainer(m.NewValue.Years);
+                gridPlaceholder.Child = new YearsGridContainer(m.NewValue.Years, m.NewValue.CurrentYear);
                 Show();
             }, true);
         }
@@ -68,16 +69,19 @@ namespace osu.Game.Overlays.News.Sidebar
             protected override IEnumerable<Drawable> EffectTargets => new[] { text };
 
             private readonly OsuSpriteText text;
+            private readonly bool isCurrent;
 
-            public YearButton(int year)
+            public YearButton(int year, bool isCurrent)
             {
+                this.isCurrent = isCurrent;
+
                 RelativeSizeAxes = Axes.X;
                 Height = 15;
                 Child = text = new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Font = OsuFont.GetFont(size: 12),
+                    Font = OsuFont.GetFont(size: 12, weight: isCurrent ? FontWeight.SemiBold : FontWeight.Medium),
                     Text = year.ToString()
                 };
             }
@@ -85,8 +89,8 @@ namespace osu.Game.Overlays.News.Sidebar
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colourProvider)
             {
-                IdleColour = colourProvider.Light2;
-                HoverColour = colourProvider.Light1;
+                IdleColour = isCurrent ? Color4.White : colourProvider.Light2;
+                HoverColour = isCurrent ? Color4.White : colourProvider.Light1;
                 Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
@@ -97,18 +101,16 @@ namespace osu.Game.Overlays.News.Sidebar
             private const float spacing = 5f;
 
             private readonly int rowCount;
-            private readonly int[] years;
 
-            public YearsGridContainer(int[] years)
+            public YearsGridContainer(int[] years, int currentYear)
             {
-                this.years = years;
                 rowCount = (int)Math.Ceiling((float)years.Length / column_count);
 
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
                 RowDimensions = getRowDimensions();
                 ColumnDimensions = getColumnDimensions();
-                Content = createContent();
+                Content = createContent(years, currentYear);
             }
 
             private Dimension[] getRowDimensions()
@@ -129,7 +131,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 return columnDimensions;
             }
 
-            private Drawable[][] createContent()
+            private Drawable[][] createContent(int[] years, int currentYear)
             {
                 var buttons = new Drawable[rowCount][];
 
@@ -140,9 +142,17 @@ namespace osu.Game.Overlays.News.Sidebar
                     for (int j = 0; j < column_count; j++)
                     {
                         var index = i * column_count + j;
-                        buttons[i][j] = index >= years.Length
-                            ? Empty()
-                            : new Container
+
+                        if (index >= years.Length)
+                        {
+                            buttons[i][j] = Empty();
+                        }
+                        else
+                        {
+                            var year = years[index];
+                            var isCurrent = year == currentYear;
+
+                            buttons[i][j] = new Container
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
@@ -153,8 +163,9 @@ namespace osu.Game.Overlays.News.Sidebar
                                     Left = j == 0 ? 0 : spacing / 2,
                                     Right = j == column_count - 1 ? 0 : spacing / 2
                                 },
-                                Child = new YearButton(years[index])
+                                Child = new YearButton(year, isCurrent)
                             };
+                        }
                     }
                 }
 

From 6c12cae105a98f0d313d16f00b2cdfa9c4960bfb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 22:25:11 +0900
Subject: [PATCH 10068/10326] Remove unnecessary property

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index f7509d7b8f..7a5547296b 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -23,11 +23,6 @@ namespace osu.Game.Skinning.Editor
 
         private Drawable drawable => (Drawable)Item;
 
-        /// <summary>
-        /// Whether the blueprint should be shown even when the <see cref="SelectionBlueprint{T}.Item"/> is not alive.
-        /// </summary>
-        protected virtual bool AlwaysShowWhenSelected => true;
-
         protected override bool ShouldBeAlive => drawable.IsAlive && Item.IsPresent;
 
         [Resolved]

From 09a5b9c872eaee74470f9e3cbe9c3e789715e882 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 16:28:03 +0200
Subject: [PATCH 10069/10326] Add XMLDoc to protected members.

---
 .../Sections/Maintenance/DirectorySelectScreen.cs         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index 582d14fbb6..c676e1391d 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -32,8 +32,16 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         /// <param name="directory">The selected directory</param>
         protected abstract void OnSelection(DirectoryInfo directory);
 
+        /// <summary>
+        /// Whether the current directory is considered to be valid and can be selected.
+        /// </summary>
+        /// <param name="info">The current directory.</param>
+        /// <returns>Whether the selected directory is considered valid.</returns>
         protected virtual bool IsValidDirectory(DirectoryInfo info) => true;
 
+        /// <summary>
+        /// The path at which to start selection from.
+        /// </summary>
         protected virtual DirectoryInfo InitialPath => null;
 
         public override bool AllowExternalScreenChange => false;

From 25b1443c5011fb7c5e3144e05159a92434206cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 May 2021 17:50:12 +0200
Subject: [PATCH 10070/10326] Remove dead branch and mark implementation as
 temporary

The previous implementation was checking if the `x0` or `x2` anchors
were selected to decide on which way to transfer the drawable's scale,
but that check actually ends up being always true for corner anchors. To
visualise, this is how the corner anchors correspond to `Anchor` flags:

    x0  x1  x2
    |   |   |
y0 -O---O---O-
    |   |   |
y1 -O---+---O-
    |   |   |
y2 -O---O---O-
    |   |   |

The Os indicate where the reference anchors are on a selection box.
The first conditional eliminates the middle ones, which makes sense.
But after excluding them from further deliberations (marking via X):

    x0  x1  x2
    |   |   |
y0 -O---X---O-
    |   |   |
y1 -X---+---X-
    |   |   |
y2 -O---X---O-
    |   |   |

The remaining anchors always have `x0` or `x2` set. So to avoid
confusion, just always transfer one way for now. At some point this
should be torn out in favour of an actual implementation of the desired
behaviour.
---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 485cd3fe93..9bcdc6e08b 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -158,10 +158,8 @@ namespace osu.Game.Skinning.Editor
             // for now aspect lock scale adjustments that occur at corners.
             if (!reference.HasFlagFast(Anchor.x1) && !reference.HasFlagFast(Anchor.y1))
             {
-                if (reference.HasFlagFast(Anchor.x0) || reference.HasFlagFast(Anchor.x2))
-                    scale.Y = scale.X;
-                else
-                    scale.X = scale.Y;
+                // TODO: temporary implementation - only dragging the corner handles across the X axis changes size.
+                scale.Y = scale.X;
             }
         }
 

From 0caba57945ba161274132260772580b8f747e9d2 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 19:28:23 +0200
Subject: [PATCH 10071/10326] Make screen properties local to
 MigrationSelectScreen.

---
 .../Settings/Sections/Maintenance/DirectorySelectScreen.cs  | 6 ------
 .../Settings/Sections/Maintenance/MigrationSelectScreen.cs  | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index c676e1391d..6e6df14a92 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         private DirectorySelector directorySelector;
 
-        protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
-
         protected abstract OsuSpriteText CreateHeader();
 
         /// <summary>
@@ -44,10 +42,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         /// </summary>
         protected virtual DirectoryInfo InitialPath => null;
 
-        public override bool AllowExternalScreenChange => false;
-
-        public override bool DisallowExternalBeatmapRulesetChanges => true;
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index cfbb7d6593..6334bffe94 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -19,6 +19,12 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override DirectoryInfo InitialPath => new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent;
 
+        public override bool AllowExternalScreenChange => false;
+
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        public override bool HideOverlaysOnEnter => true;
+
         protected override OsuSpriteText CreateHeader() => new OsuSpriteText
         {
             Text = "Please select a new location",

From 6f248db519146eace1face0eb55c96d4c6b3784c Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 19:31:10 +0200
Subject: [PATCH 10072/10326] Merge conditional expression.

---
 .../Settings/Sections/Maintenance/DirectorySelectScreen.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index 6e6df14a92..c2366ca209 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             if (InitialPath != null)
                 directorySelector.CurrentPath.Value = InitialPath;
 
-            directorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = e.NewValue != null ? IsValidDirectory(e.NewValue) : false, true);
+            directorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = e.NewValue != null && IsValidDirectory(e.NewValue), true);
             base.LoadComplete();
         }
 

From ddceafb1b041f0360446e251f9a4755f42f114d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 09:38:25 +0900
Subject: [PATCH 10073/10326] 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 8c24df5c2e..90d131b117 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.513.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3eb5050e1a..587bdaf622 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.513.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f00e20a66e..7ba7a554d6 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.Framework.iOS" Version="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.513.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.513.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 9e8c0a7e7037e6fa118f8d1b1c2c868ca25c286d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 04:25:29 +0300
Subject: [PATCH 10074/10326] Fix online play subscreens not pushing player
 loaders when starting gameplay

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs      | 3 ++-
 .../Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index fa18b792c3..783b8b4bf2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -27,6 +27,7 @@ using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
@@ -452,7 +453,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     return new MultiSpectatorScreen(userIds);
 
                 default:
-                    return new MultiplayerPlayer(SelectedItem.Value, userIds);
+                    return new PlayerLoader(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 11bc55823f..26ee21a2c3 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -13,6 +13,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
@@ -271,9 +272,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             }, true);
         }
 
-        protected override Screen CreateGameplayScreen() => new PlaylistsPlayer(SelectedItem.Value)
+        protected override Screen CreateGameplayScreen() => new PlayerLoader(() => new PlaylistsPlayer(SelectedItem.Value)
         {
             Exited = () => leaderboard.RefreshScores()
-        };
+        });
     }
 }

From 90e0b3374e2a975e2df4e99cffebb520653d12c9 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 14 May 2021 03:34:50 +0200
Subject: [PATCH 10075/10326] Add `#nullable enable`

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
index 53bdf3140c..13a892def4 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Beatmaps;
-
+ #nullable enable
 namespace osu.Game.Rulesets.Edit
 {
     /// <summary>

From a447f200958977b86129d5159edb9891fc6e2031 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 14 May 2021 03:38:35 +0200
Subject: [PATCH 10076/10326] Fix formatting of `#nullable enable`

---
 osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
index 13a892def4..6feee82bda 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
@@ -2,7 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Beatmaps;
- #nullable enable
+
+#nullable enable
+
 namespace osu.Game.Rulesets.Edit
 {
     /// <summary>

From 447371478ea6f4843b57a409ebbfab1db1d15e78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 12:03:06 +0900
Subject: [PATCH 10077/10326] Switch null assignment to non-nullable warnings
 on

---
 osu.sln.DotSettings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index aa8f8739c1..4ac796ccd0 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -18,7 +18,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentIsFullyDiscarded/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>

From b36c991ba1ca714d9b47e34e705fba071e477e22 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 12:04:38 +0900
Subject: [PATCH 10078/10326] Fix single case of incorrect usage

---
 osu.Game/Screens/Edit/Editor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 434683a016..5ac3401720 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -635,6 +635,9 @@ namespace osu.Game.Screens.Edit
                     case EditorScreenMode.Verify:
                         currentScreen = new VerifyScreen();
                         break;
+
+                    default:
+                        throw new InvalidOperationException("Editor menu bar switched to an unsupported mode");
                 }
 
                 LoadComponentAsync(currentScreen, newScreen =>

From 46e7d9e0edbc18a48e93db72e616a7af67482c75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 12:15:56 +0900
Subject: [PATCH 10079/10326] Randomise the values displayed in the skinning
 toolbox

To stop the spam of "WYSI" comments everywhere. I guess I underestimated
the negative effect this would have.
---
 osu.Game/Skinning/Editor/SkinComponentToolbox.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 8536cba139..59420bfc87 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -29,8 +30,8 @@ namespace osu.Game.Skinning.Editor
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor
         {
-            Combo = { Value = 727 },
-            TotalScore = { Value = 1337377 }
+            Combo = { Value = RNG.Next(1, 1000) },
+            TotalScore = { Value = RNG.Next(1000, 10000000) }
         };
 
         [Cached(typeof(HealthProcessor))]

From 9860e482afe591d5b68916fe594b77ff913ef85e Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 14 May 2021 05:32:52 +0200
Subject: [PATCH 10080/10326] Use `TestWorkingBeatmap` instead of null in tests

Fixes the warning that #12801 will give.
---
 .../Editing/Checks/CheckConcurrentObjectsTest.cs           | 7 +++----
 osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs | 7 +++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
index ba0a130a25..5adb91a22e 100644
--- a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Editing.Checks
 {
@@ -186,10 +187,8 @@ namespace osu.Game.Tests.Editing.Checks
 
         private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
         {
-            return new BeatmapVerifierContext(new Beatmap<HitObject>
-            {
-                HitObjects = hitobjects
-            }, null);
+            var beatmap = new Beatmap<HitObject> { HitObjects = hitobjects };
+            return new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
         }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
index 02159fa57b..639f5b5ab4 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Editing.Checks
 {
@@ -146,11 +147,13 @@ namespace osu.Game.Tests.Editing.Checks
 
         private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
         {
-            return new BeatmapVerifierContext(new Beatmap<HitObject>
+            var beatmap = new Beatmap<HitObject>
             {
                 ControlPointInfo = cpi,
                 HitObjects = hitobjects
-            }, null);
+            };
+
+            return new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
         }
     }
 }

From 48672f8afd156556f29628b3ae246013f72c297d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 15:02:36 +0900
Subject: [PATCH 10081/10326] Add very basic test logic to ensure
 `PlayerLoader` is present for playlists

---
 .../TestScenePlaylistsRoomSubScreen.cs        | 20 +++++++++++++++++--
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  6 +++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
index 319c2bc6fd..264004b6c3 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
@@ -11,11 +11,13 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Playlists;
+using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 using osuTK.Input;
@@ -24,8 +26,6 @@ namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsRoomSubScreen : RoomTestScene
     {
-        protected override bool UseOnlineAPI => true;
-
         [Cached(typeof(IRoomManager))]
         private readonly TestRoomManager roomManager = new TestRoomManager();
 
@@ -41,6 +41,18 @@ namespace osu.Game.Tests.Visual.Playlists
             Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
 
             manager.Import(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo.BeatmapSet).Wait();
+
+            ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case CreateRoomScoreRequest createRoomScoreRequest:
+                        createRoomScoreRequest.TriggerSuccess(new APIScoreToken { ID = 1 });
+                        return true;
+                }
+
+                return false;
+            };
         }
 
         [SetUpSteps]
@@ -59,12 +71,16 @@ namespace osu.Game.Tests.Visual.Playlists
                 Room.Name.Value = "my awesome room";
                 Room.Host.Value = new User { Id = 2, Username = "peppy" };
                 Room.RecentParticipants.Add(Room.Host.Value);
+                Room.EndDate.Value = DateTimeOffset.Now.AddMinutes(5);
                 Room.Playlist.Add(new PlaylistItem
                 {
                     Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
                     Ruleset = { Value = new OsuRuleset().RulesetInfo }
                 });
             });
+
+            AddStep("start match", () => match.ChildrenOfType<PlaylistsReadyButton>().First().Click());
+            AddUntilStep("player loader loaded", () => Stack.CurrentScreen is PlayerLoader);
         }
 
         [Test]
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 68bdd9160e..28156aecf3 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -150,7 +150,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         protected void StartPlay()
         {
             sampleStart?.Play();
-            ParentScreen?.Push(CreateGameplayScreen());
+
+            // fallback is to allow this class to operate when there is no parent OnlineScreen (testing purposes).
+            var targetScreen = (Screen)ParentScreen ?? this;
+
+            targetScreen?.Push(CreateGameplayScreen());
         }
 
         /// <summary>

From dc576c19b47fa64e74bfb9fd440dfccf345bd195 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 15:10:02 +0900
Subject: [PATCH 10082/10326] Fix a potential nullref when starting `Player`
 with autoplay enabled and beatmap fails to load

---
 osu.Game/Screens/Play/Player.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ac0c921ccf..15983d1d62 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -154,6 +154,10 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
+            // BDL load may have aborted early.
+            if (DrawableRuleset == null)
+                return;
+
             // replays should never be recorded or played back when autoplay is enabled
             if (!Mods.Value.Any(m => m is ModAutoplay))
                 PrepareReplay();

From 8338f702c3b260dbd01e8dac1b4c19ce01364fb6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 09:32:56 +0300
Subject: [PATCH 10083/10326] Remove not required null conditional

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 28156aecf3..375aac729d 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             // fallback is to allow this class to operate when there is no parent OnlineScreen (testing purposes).
             var targetScreen = (Screen)ParentScreen ?? this;
 
-            targetScreen?.Push(CreateGameplayScreen());
+            targetScreen.Push(CreateGameplayScreen());
         }
 
         /// <summary>

From 32ff40628973ff325c213cd51a32f2324b722df6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 15:40:29 +0900
Subject: [PATCH 10084/10326] Add database tracking of beatmap creator
 `user_id`s

---
 ...BeatmapManager_BeatmapOnlineLookupQueue.cs |  26 +-
 osu.Game/Beatmaps/BeatmapMetadata.cs          |  21 +-
 ...9_AddAuthorIdToBeatmapMetadata.Designer.cs | 511 ++++++++++++++++++
 ...0514062639_AddAuthorIdToBeatmapMetadata.cs |  23 +
 .../Migrations/OsuDbContextModelSnapshot.cs   |   3 +
 5 files changed, 570 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
 create mode 100644 osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs

diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index 7c4b344c9e..5dff4fe282 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -83,6 +82,12 @@ namespace osu.Game.Beatmaps
                         beatmap.BeatmapSet.OnlineBeatmapSetID = res.OnlineBeatmapSetID;
                         beatmap.OnlineBeatmapID = res.OnlineBeatmapID;
 
+                        if (beatmap.Metadata != null)
+                            beatmap.Metadata.AuthorID = res.AuthorID;
+
+                        if (beatmap.BeatmapSet.Metadata != null)
+                            beatmap.BeatmapSet.Metadata.AuthorID = res.AuthorID;
+
                         LogForModel(set, $"Online retrieval mapped {beatmap} to {res.OnlineBeatmapSetID} / {res.OnlineBeatmapID}.");
                     }
                 }
@@ -157,7 +162,7 @@ namespace osu.Game.Beatmaps
 
                         using (var cmd = db.CreateCommand())
                         {
-                            cmd.CommandText = "SELECT beatmapset_id, beatmap_id, approved FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path";
+                            cmd.CommandText = "SELECT beatmapset_id, beatmap_id, approved, user_id FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path";
 
                             cmd.Parameters.Add(new SqliteParameter("@MD5Hash", beatmap.MD5Hash));
                             cmd.Parameters.Add(new SqliteParameter("@OnlineBeatmapID", beatmap.OnlineBeatmapID ?? (object)DBNull.Value));
@@ -174,6 +179,12 @@ namespace osu.Game.Beatmaps
                                     beatmap.BeatmapSet.OnlineBeatmapSetID = reader.GetInt32(0);
                                     beatmap.OnlineBeatmapID = reader.GetInt32(1);
 
+                                    if (beatmap.Metadata != null)
+                                        beatmap.Metadata.AuthorID = reader.GetInt32(3);
+
+                                    if (beatmap.BeatmapSet.Metadata != null)
+                                        beatmap.BeatmapSet.Metadata.AuthorID = reader.GetInt32(3);
+
                                     LogForModel(set, $"Cached local retrieval for {beatmap}.");
                                     return true;
                                 }
@@ -194,17 +205,6 @@ namespace osu.Game.Beatmaps
                 cacheDownloadRequest?.Dispose();
                 updateScheduler?.Dispose();
             }
-
-            [Serializable]
-            [SuppressMessage("ReSharper", "InconsistentNaming")]
-            private class CachedOnlineBeatmapLookup
-            {
-                public int approved { get; set; }
-
-                public int? beatmapset_id { get; set; }
-
-                public int? beatmap_id { get; set; }
-            }
         }
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 858da8e602..9540a216fc 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -34,6 +34,21 @@ namespace osu.Game.Beatmaps
         [JsonIgnore]
         public List<BeatmapSetInfo> BeatmapSets { get; set; }
 
+        /// <summary>
+        /// Helper property to deserialize a username to <see cref="User"/>.
+        /// </summary>
+        [JsonProperty(@"user_id")]
+        [Column("AuthorID")]
+        public int AuthorID
+        {
+            get => Author?.Id ?? 1;
+            set
+            {
+                Author ??= new User();
+                Author.Id = value;
+            }
+        }
+
         /// <summary>
         /// Helper property to deserialize a username to <see cref="User"/>.
         /// </summary>
@@ -42,7 +57,11 @@ namespace osu.Game.Beatmaps
         public string AuthorString
         {
             get => Author?.Username;
-            set => Author = new User { Username = value };
+            set
+            {
+                Author ??= new User();
+                Author.Username = value;
+            }
         }
 
         /// <summary>
diff --git a/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
new file mode 100644
index 0000000000..89bab3a0fa
--- /dev/null
+++ b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
@@ -0,0 +1,511 @@
+// <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("20210514062639_AddAuthorIdToBeatmapMetadata")]
+    partial class AddAuthorIdToBeatmapMetadata
+    {
+        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<bool>("EpilepsyWarning");
+
+                    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<int>("AuthorID")
+                        .HasColumnName("AuthorID");
+
+                    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.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<int?>("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>("InstantiationInfo");
+
+                    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/20210514062639_AddAuthorIdToBeatmapMetadata.cs b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs
new file mode 100644
index 0000000000..98fe9b5e13
--- /dev/null
+++ b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace osu.Game.Migrations
+{
+    public partial class AddAuthorIdToBeatmapMetadata : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "AuthorID",
+                table: "BeatmapMetadata",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AuthorID",
+                table: "BeatmapMetadata");
+        }
+    }
+}
diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
index d4bde50b60..f518cfb42b 100644
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
@@ -126,6 +126,9 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("AudioFile");
 
+                    b.Property<int>("AuthorID")
+                        .HasColumnName("AuthorID");
+
                     b.Property<string>("AuthorString")
                         .HasColumnName("Author");
 

From d09da02673186d308e95da4482a06dade52a2a2f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 16:03:22 +0900
Subject: [PATCH 10085/10326] Fix deleting skin elements not saving out to skin

Closes https://github.com/ppy/osu/issues/12786.
---
 osu.Game/Skinning/Editor/SkinEditor.cs        | 15 +++++++++++---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 14 ++++++-------
 osu.Game/Skinning/ISkinnableTarget.cs         |  9 ++++++++-
 osu.Game/Skinning/SkinnableTargetContainer.cs | 20 +++++++++++++++----
 4 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 6427d6298b..c594f8d271 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -193,14 +194,16 @@ namespace osu.Game.Skinning.Editor
             SelectedComponents.Add(component);
         }
 
+        private IEnumerable<ISkinnableTarget> availableTargets => targetScreen.ChildrenOfType<ISkinnableTarget>();
+
         private ISkinnableTarget getTarget(SkinnableTarget target)
         {
-            return targetScreen.ChildrenOfType<ISkinnableTarget>().FirstOrDefault(c => c.Target == target);
+            return availableTargets.FirstOrDefault(c => c.Target == target);
         }
 
         private void revert()
         {
-            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
+            ISkinnableTarget[] targetContainers = availableTargets.ToArray();
 
             foreach (var t in targetContainers)
             {
@@ -216,7 +219,7 @@ namespace osu.Game.Skinning.Editor
             if (!hasBegunMutating)
                 return;
 
-            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
+            ISkinnableTarget[] targetContainers = availableTargets.ToArray();
 
             foreach (var t in targetContainers)
                 currentSkin.Value.UpdateDrawableTarget(t);
@@ -237,5 +240,11 @@ namespace osu.Game.Skinning.Editor
         {
             this.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
         }
+
+        public void DeleteItems(ISkinnableDrawable[] items)
+        {
+            foreach (var item in items.ToArray())
+                availableTargets.FirstOrDefault(t => t.Components.Contains(item))?.Remove(item);
+        }
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 9bcdc6e08b..7931a5ec41 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
@@ -17,6 +18,9 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinSelectionHandler : SelectionHandler<ISkinnableDrawable>
     {
+        [Resolved]
+        private SkinEditor skinEditor { get; set; }
+
         public override bool HandleRotation(float angle)
         {
             // TODO: this doesn't correctly account for origin/anchor specs being different in a multi-selection.
@@ -72,14 +76,8 @@ namespace osu.Game.Skinning.Editor
             SelectionBox.CanReverse = false;
         }
 
-        protected override void DeleteItems(IEnumerable<ISkinnableDrawable> items)
-        {
-            foreach (var i in items)
-            {
-                ((Drawable)i).Expire();
-                SelectedItems.Remove(i);
-            }
-        }
+        protected override void DeleteItems(IEnumerable<ISkinnableDrawable> items) =>
+            skinEditor.DeleteItems(items.ToArray());
 
         protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableDrawable>> selection)
         {
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 65b8ba7b17..15cad2c817 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -37,8 +37,15 @@ namespace osu.Game.Skinning
         void Reload();
 
         /// <summary>
-        /// Add the provided item to this target.
+        /// Add a new skinnable component to this target.
         /// </summary>
+        /// <param name="drawable">The component to add.</param>
         void Add(ISkinnableDrawable drawable);
+
+        /// <summary>
+        /// Remove an existing skinnable component to this target.
+        /// </summary>
+        /// <param name="component">The component to add.</param>
+        public void Remove(ISkinnableDrawable component);
     }
 }
diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index a4d7f621eb..f055fb2533 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -43,10 +43,7 @@ namespace osu.Game.Skinning
             }
         }
 
-        /// <summary>
-        /// Add a new skinnable component to this target.
-        /// </summary>
-        /// <param name="component">The component to add.</param>
+        /// <inheritdoc cref="ISkinnableTarget"/>
         /// <exception cref="NotSupportedException">Thrown when attempting to add an element to a target which is not supported by the current skin.</exception>
         /// <exception cref="ArgumentException">Thrown if the provided instance is not a <see cref="Drawable"/>.</exception>
         public void Add(ISkinnableDrawable component)
@@ -61,6 +58,21 @@ namespace osu.Game.Skinning
             components.Add(component);
         }
 
+        /// <inheritdoc cref="ISkinnableTarget"/>
+        /// <exception cref="NotSupportedException">Thrown when attempting to add an element to a target which is not supported by the current skin.</exception>
+        /// <exception cref="ArgumentException">Thrown if the provided instance is not a <see cref="Drawable"/>.</exception>
+        public void Remove(ISkinnableDrawable component)
+        {
+            if (content == null)
+                throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
+
+            if (!(component is Drawable drawable))
+                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(drawable));
+
+            content.Remove(drawable);
+            components.Remove(component);
+        }
+
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);

From 9069db07437154554fb6c1b55fa323dcac2c6c45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 16:22:19 +0900
Subject: [PATCH 10086/10326] Fix case of `hitObjects` variables

---
 .../Checks/CheckUnsnappedObjectsTest.cs       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
index 639f5b5ab4..882baba8fa 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
@@ -102,12 +102,12 @@ namespace osu.Game.Tests.Editing.Checks
             }, count: 2);
 
             // Start and end are 2 ms and 1.25 ms off respectively, hence two different issues in one object.
-            var hitobjects = new List<HitObject>
+            var hitObjects = new List<HitObject>
             {
                 getSliderMock(startTime: 98, endTime: 398.75d).Object
             };
 
-            var issues = check.Run(getContext(hitobjects)).ToList();
+            var issues = check.Run(getContext(hitObjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(2));
             Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
@@ -124,33 +124,33 @@ namespace osu.Game.Tests.Editing.Checks
             return mockSlider;
         }
 
-        private void assertOk(List<HitObject> hitobjects)
+        private void assertOk(List<HitObject> hitObjects)
         {
-            Assert.That(check.Run(getContext(hitobjects)), Is.Empty);
+            Assert.That(check.Run(getContext(hitObjects)), Is.Empty);
         }
 
-        private void assert1Ms(List<HitObject> hitobjects, int count = 1)
+        private void assert1Ms(List<HitObject> hitObjects, int count = 1)
         {
-            var issues = check.Run(getContext(hitobjects)).ToList();
+            var issues = check.Run(getContext(hitObjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
         }
 
-        private void assert2Ms(List<HitObject> hitobjects, int count = 1)
+        private void assert2Ms(List<HitObject> hitObjects, int count = 1)
         {
-            var issues = check.Run(getContext(hitobjects)).ToList();
+            var issues = check.Run(getContext(hitObjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateLargeUnsnap));
         }
 
-        private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
+        private BeatmapVerifierContext getContext(List<HitObject> hitObjects)
         {
             var beatmap = new Beatmap<HitObject>
             {
                 ControlPointInfo = cpi,
-                HitObjects = hitobjects
+                HitObjects = hitObjects
             };
 
             return new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));

From fcb226bd206ed17e01de4aa18e0ed2ece8416f80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 16:23:45 +0900
Subject: [PATCH 10087/10326] Add local variable for regular access to
 `HitObjects`

---
 .../Rulesets/Edit/Checks/CheckConcurrentObjects.cs   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index 51277298ab..ba5fbcf58d 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -23,13 +23,15 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            for (int i = 0; i < context.Beatmap.HitObjects.Count - 1; ++i)
-            {
-                var hitobject = context.Beatmap.HitObjects[i];
+            var hitObjects = context.Beatmap.HitObjects;
 
-                for (int j = i + 1; j < context.Beatmap.HitObjects.Count; ++j)
+            for (int i = 0; i < hitObjects.Count - 1; ++i)
+            {
+                var hitobject = hitObjects[i];
+
+                for (int j = i + 1; j < hitObjects.Count; ++j)
                 {
-                    var nextHitobject = context.Beatmap.HitObjects[j];
+                    var nextHitobject = hitObjects[j];
 
                     // Accounts for rulesets with hitobjects separated by columns, such as Mania.
                     // In these cases we only care about concurrent objects within the same column.

From 67a99c83a35ab4e4cf5281faddce1b4b689f1f42 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 16:24:52 +0900
Subject: [PATCH 10088/10326] Tidy bindable changed code up

---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index fc9d4c7526..0b1f988447 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -46,10 +46,7 @@ namespace osu.Game.Screens.Edit.Verify
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
             context = new BeatmapVerifierContext(beatmap, workingBeatmap.Value, verify.InterpretedDifficulty.Value);
-            verify.InterpretedDifficulty.BindValueChanged(change =>
-            {
-                context.InterpretedDifficulty = change.NewValue;
-            });
+            verify.InterpretedDifficulty.BindValueChanged(difficulty => context.InterpretedDifficulty = difficulty.NewValue);
 
             RelativeSizeAxes = Axes.Both;
 

From f5dd18f266a11ecc941b2ebd65c6ea40adb70cab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 16:53:51 +0900
Subject: [PATCH 10089/10326] Use existing `LoadedBeatmapSuccessfully` bool
 instead

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game/Screens/Play/Player.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 15983d1d62..06dfd2fdb7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -154,8 +154,7 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            // BDL load may have aborted early.
-            if (DrawableRuleset == null)
+            if (!LoadedBeatmapSuccessfully)
                 return;
 
             // replays should never be recorded or played back when autoplay is enabled

From 0655825057cf47520211f5ac99021eb2730cf5e2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 14:24:56 +0300
Subject: [PATCH 10090/10326] Separate changing star rating display to own test

---
 .../Ranking/TestSceneStarRatingDisplay.cs     | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index 2ff664a0d9..64f78b0802 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Ranking.Expanded;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
@@ -15,28 +16,38 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestDisplay()
         {
-            StarRatingDisplay changingStarRating = null;
-
             AddStep("load displays", () => Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Children = new Drawable[]
                 {
-                    new StarRatingDisplay(new StarDifficulty(1.23, 0)),
-                    new StarRatingDisplay(new StarDifficulty(2.34, 0)),
-                    new StarRatingDisplay(new StarDifficulty(3.45, 0)),
-                    new StarRatingDisplay(new StarDifficulty(4.56, 0)),
-                    new StarRatingDisplay(new StarDifficulty(5.67, 0)),
-                    new StarRatingDisplay(new StarDifficulty(6.78, 0)),
-                    new StarRatingDisplay(new StarDifficulty(10.11, 0)),
-                    changingStarRating = new StarRatingDisplay(),
+                    new StarRatingDisplay(new StarDifficulty(1.23, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(2.34, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(3.45, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(4.56, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(5.67, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(6.78, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(10.11, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
                 }
             });
+        }
 
-            AddRepeatStep("change bottom rating", () =>
+        [Test]
+        public void TestChangingStarRatingDisplay()
+        {
+            StarRatingDisplay starRating = null;
+
+            AddStep("load display", () => Child = starRating = new StarRatingDisplay
             {
-                changingStarRating.Current.Value = new StarDifficulty(RNG.NextDouble(0, 10), RNG.Next());
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(3f),
+            });
+
+            AddRepeatStep("change display value", () =>
+            {
+                starRating.Current.Value = new StarDifficulty(RNG.NextDouble(0.0, 11.0), RNG.Next(2000));
             }, 10);
         }
     }

From 34aab11ff3fc9e3f9c0370ff076bfd00e25d3cb8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 14:25:46 +0300
Subject: [PATCH 10091/10326] Add null star rating display test case

---
 .../Visual/Ranking/TestSceneStarRatingDisplay.cs      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index 64f78b0802..7730d6868d 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -33,6 +33,17 @@ namespace osu.Game.Tests.Visual.Ranking
             });
         }
 
+        [Test]
+        public void TestNullStarRatingDisplay()
+        {
+            AddStep("load null", () => Child = new StarRatingDisplay
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(3f),
+            });
+        }
+
         [Test]
         public void TestChangingStarRatingDisplay()
         {

From e0728a6e194297b55eb8f9f4502f919ba3907a0d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 15:52:36 +0300
Subject: [PATCH 10092/10326] Make `BeatmapDifficultyCache.GetDifficultyAsync`
 virtual

---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 53d82c385d..6ed623d0c0 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -103,8 +103,8 @@ namespace osu.Game.Beatmaps
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops computing the star difficulty.</param>
         /// <returns>The <see cref="StarDifficulty"/>.</returns>
-        public Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null,
-                                                       CancellationToken cancellationToken = default)
+        public virtual Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null,
+                                                               [CanBeNull] IEnumerable<Mod> mods = null, CancellationToken cancellationToken = default)
         {
             // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
             rulesetInfo ??= beatmapInfo.Ruleset;

From db361efecfacce01093783caa0031bee658cdd02 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 15:52:51 +0300
Subject: [PATCH 10093/10326] Add test beatmap difficulty cache with calc.
 blocking support

---
 .../TestSceneBeatmapMetadataDisplay.cs        | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 230822e070..271fbde5c3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -4,12 +4,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
@@ -24,6 +27,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Resolved]
         private BeatmapManager manager { get; set; }
 
+        [Cached(typeof(BeatmapDifficultyCache))]
+        private readonly TestBeatmapDifficultyCache testDifficultyCache = new TestBeatmapDifficultyCache();
+
         [Test]
         public void TestLocal([Values("Beatmap", "Some long title and stuff")]
                               string title,
@@ -44,6 +50,27 @@ namespace osu.Game.Tests.Visual.SongSelect
             }));
         }
 
+        [Test]
+        public void TestDelayedStarRating()
+        {
+            AddStep("block calculation", () => testDifficultyCache.BlockCalculation = true);
+
+            showMetadataForBeatmap(() => CreateWorkingBeatmap(new Beatmap
+            {
+                BeatmapInfo =
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = "Heavy beatmap",
+                    },
+                    Version = "10k objects",
+                    StarDifficulty = 99.99f,
+                }
+            }));
+
+            AddStep("allow calculation", () => testDifficultyCache.BlockCalculation = false);
+        }
+
         [Test]
         public void TestRandomFromDatabase()
         {
@@ -68,8 +95,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 OsuLogo logo = new OsuLogo { Scale = new Vector2(0.15f) };
 
+                Remove(testDifficultyCache);
+
                 Children = new Drawable[]
                 {
+                    testDifficultyCache,
                     display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), logo)
                     {
                         Anchor = Anchor.Centre,
@@ -85,5 +115,37 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("finish loading", () => display.Loading = false);
         }
+
+        private class TestBeatmapDifficultyCache : BeatmapDifficultyCache
+        {
+            private TaskCompletionSource<bool> calculationBlocker;
+
+            private bool blockCalculation;
+
+            public bool BlockCalculation
+            {
+                get => blockCalculation;
+                set
+                {
+                    if (value == blockCalculation)
+                        return;
+
+                    blockCalculation = value;
+
+                    if (value)
+                        calculationBlocker = new TaskCompletionSource<bool>();
+                    else
+                        calculationBlocker?.SetResult(false);
+                }
+            }
+
+            public override async Task<StarDifficulty> GetDifficultyAsync(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo = null, IEnumerable<Mod> mods = null, CancellationToken cancellationToken = default)
+            {
+                if (blockCalculation)
+                    await calculationBlocker.Task;
+
+                return await base.GetDifficultyAsync(beatmapInfo, rulesetInfo, mods, cancellationToken);
+            }
+        }
     }
 }

From 0dc3bfd0c11cc45f060ecb627cef78db1beb6f5c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 15:55:26 +0300
Subject: [PATCH 10094/10326] Apply simple transforms to star rating display
 when ready if not

---
 .../Screens/Play/BeatmapMetadataDisplay.cs    | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 0164fe9179..6dd9900d8c 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -53,11 +53,12 @@ namespace osu.Game.Screens.Play
 
         private IBindable<StarDifficulty?> starDifficulty;
 
+        private FillFlowContainer versionFlow;
+        private StarRatingDisplay starRatingDisplay;
+
         [BackgroundDependencyLoader]
         private void load(BeatmapDifficultyCache difficultyCache)
         {
-            StarRatingDisplay starRatingDisplay;
-
             var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
 
             AutoSizeAxes = Axes.Both;
@@ -112,7 +113,7 @@ namespace osu.Game.Screens.Play
                                 loading = new LoadingLayer(true)
                             }
                         },
-                        new FillFlowContainer
+                        versionFlow = new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
                             Anchor = Anchor.TopCentre,
@@ -178,11 +179,32 @@ namespace osu.Game.Screens.Play
             };
 
             starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo);
-            starDifficulty.BindValueChanged(d => starRatingDisplay.Current.Value = d.NewValue, true);
 
             Loading = true;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (starDifficulty.Value != null)
+                starRatingDisplay.Current.Value = starDifficulty.Value;
+            else
+            {
+                starRatingDisplay.Hide();
+
+                starDifficulty.ValueChanged += d =>
+                {
+                    starRatingDisplay.Current.Value = d.NewValue;
+
+                    versionFlow.AutoSizeDuration = 300;
+                    versionFlow.AutoSizeEasing = Easing.OutQuint;
+
+                    starRatingDisplay.FadeIn(300, Easing.InQuint);
+                };
+            }
+        }
+
         private class MetadataLineLabel : OsuSpriteText
         {
             public MetadataLineLabel(string text)

From 6cc678f497b1cdb1aa461ebd4749e145fdc5c80f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 16:01:25 +0300
Subject: [PATCH 10095/10326] Remove nullability and transition support from
 star rating display

---
 .../Ranking/TestSceneStarRatingDisplay.cs     | 23 +++++--------
 .../Ranking/Expanded/StarRatingDisplay.cs     | 33 +++++--------------
 2 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index 7730d6868d..ef077970d6 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -33,33 +33,28 @@ namespace osu.Game.Tests.Visual.Ranking
             });
         }
 
-        [Test]
-        public void TestNullStarRatingDisplay()
-        {
-            AddStep("load null", () => Child = new StarRatingDisplay
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Scale = new Vector2(3f),
-            });
-        }
-
         [Test]
         public void TestChangingStarRatingDisplay()
         {
             StarRatingDisplay starRating = null;
 
-            AddStep("load display", () => Child = starRating = new StarRatingDisplay
+            AddStep("load display", () => Child = starRating = new StarRatingDisplay(new StarDifficulty(5.55, 1))
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Scale = new Vector2(3f),
             });
 
-            AddRepeatStep("change display value", () =>
+            AddRepeatStep("set random value", () =>
             {
-                starRating.Current.Value = new StarDifficulty(RNG.NextDouble(0.0, 11.0), RNG.Next(2000));
+                starRating.Current.Value = new StarDifficulty(RNG.NextDouble(0.0, 11.0), 1);
             }, 10);
+
+            AddSliderStep("set exact stars", 0.0, 11.0, 5.55, d =>
+            {
+                if (starRating != null)
+                    starRating.Current.Value = new StarDifficulty(d, 1);
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 422833555f..625bdaf888 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// <summary>
     /// A pill that displays the star rating of a <see cref="BeatmapInfo"/>.
     /// </summary>
-    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty?>
+    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
     {
         private Box background;
         private OsuTextFlowContainer textFlow;
@@ -30,21 +30,14 @@ namespace osu.Game.Screens.Ranking.Expanded
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private readonly BindableWithCurrent<StarDifficulty?> current = new BindableWithCurrent<StarDifficulty?>();
+        private readonly BindableWithCurrent<StarDifficulty> current = new BindableWithCurrent<StarDifficulty>();
 
-        public Bindable<StarDifficulty?> Current
+        public Bindable<StarDifficulty> Current
         {
             get => current.Current;
             set => current.Current = value;
         }
 
-        /// <summary>
-        /// Creates a new <see cref="StarRatingDisplay"/> without any <see cref="StarDifficulty"/> set, displaying a placeholder until <see cref="Current"/> is changed.
-        /// </summary>
-        public StarRatingDisplay()
-        {
-        }
-
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
         /// </summary>
@@ -112,26 +105,16 @@ namespace osu.Game.Screens.Ranking.Expanded
 
         private void updateDisplay()
         {
-            const double duration = 400;
-            const Easing easing = Easing.OutQuint;
-
-            double stars = Current.Value?.Stars ?? 0.00f;
-
-            var starRatingParts = stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            var starRatingParts = Current.Value.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
             string wholePart = starRatingParts[0];
             string fractionPart = starRatingParts[1];
             string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
 
-            if (Current.Value == null)
-                background.FadeColour(Color4.SlateGray.Opacity(0.3f));
-            else
-            {
-                var rating = Current.Value.Value.DifficultyRating;
+            var rating = Current.Value.DifficultyRating;
 
-                background.FadeColour(rating == DifficultyRating.ExpertPlus
-                    ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                    : (ColourInfo)colours.ForDifficultyRating(rating), duration, easing);
-            }
+            background.Colour = rating == DifficultyRating.ExpertPlus
+                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                : (ColourInfo)colours.ForDifficultyRating(rating);
 
             textFlow.Clear();
 

From 7c2fc9b412e5e5835ea0b949de5814224d201de7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 16:12:25 +0300
Subject: [PATCH 10096/10326] Update usage due to nullability removal

---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 6dd9900d8c..e26dd24de7 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -130,8 +131,9 @@ namespace osu.Game.Screens.Play
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
                                 },
-                                starRatingDisplay = new StarRatingDisplay
+                                starRatingDisplay = new StarRatingDisplay(default)
                                 {
+                                    Alpha = 0f,
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
                                 }
@@ -188,14 +190,19 @@ namespace osu.Game.Screens.Play
             base.LoadComplete();
 
             if (starDifficulty.Value != null)
-                starRatingDisplay.Current.Value = starDifficulty.Value;
+            {
+                starRatingDisplay.Current.Value = starDifficulty.Value.Value;
+                starRatingDisplay.Show();
+            }
             else
             {
                 starRatingDisplay.Hide();
 
                 starDifficulty.ValueChanged += d =>
                 {
-                    starRatingDisplay.Current.Value = d.NewValue;
+                    Debug.Assert(d.NewValue != null);
+
+                    starRatingDisplay.Current.Value = d.NewValue.Value;
 
                     versionFlow.AutoSizeDuration = 300;
                     versionFlow.AutoSizeEasing = Easing.OutQuint;

From 67dfeeb1b77eaa009aff89aa666fdf3ad12ec365 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:23:56 +0800
Subject: [PATCH 10097/10326] Cleanup code in ModHidden

---
 .../Mods/CatchModHidden.cs                    |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs    | 14 ++++----
 osu.Game/Rulesets/Mods/ModHidden.cs           | 35 -------------------
 3 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index bba42dea97..ba3e8f9a8f 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Catch.Mods
             var offset = hitObject.TimePreempt * fade_out_offset_multiplier;
             var duration = offset - hitObject.TimePreempt * fade_out_duration_multiplier;
 
-            using (drawable.BeginAbsoluteSequence(hitObject.StartTime - offset, true))
+            using (drawable.BeginAbsoluteSequence(hitObject.StartTime - offset))
                 drawable.FadeOut(duration);
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 45f314af7b..b0f3f49939 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -65,13 +65,13 @@ namespace osu.Game.Rulesets.Osu.Mods
             switch (drawableObject)
             {
                 case DrawableSliderTail _:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
                         drawableObject.FadeOut(fadeOut.duration);
 
                     break;
 
                 case DrawableSliderRepeat sliderRepeat:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
                         // only apply to circle piece – reverse arrow is not affected by hidden.
                         sliderRepeat.CirclePiece.FadeOut(fadeOut.duration);
 
@@ -88,22 +88,22 @@ namespace osu.Game.Rulesets.Osu.Mods
                     else
                     {
                         // we don't want to see the approach circle
-                        using (circle.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimePreempt, true))
+                        using (circle.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimePreempt))
                             circle.ApproachCircle.Hide();
                     }
 
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
                         fadeTarget.FadeOut(fadeOut.duration);
                     break;
 
                 case DrawableSlider slider:
-                    using (slider.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (slider.BeginAbsoluteSequence(fadeOut.startTime))
                         slider.Body.FadeOut(fadeOut.duration, Easing.Out);
 
                     break;
 
                 case DrawableSliderTick sliderTick:
-                    using (sliderTick.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (sliderTick.BeginAbsoluteSequence(fadeOut.startTime))
                         sliderTick.FadeOut(fadeOut.duration);
 
                     break;
@@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // hide elements we don't care about.
                     // todo: hide background
 
-                    using (spinner.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (spinner.BeginAbsoluteSequence(fadeOut.startTime))
                         spinner.FadeOut(fadeOut.duration);
 
                     break;
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index df421adbe5..03932baca9 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.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.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
@@ -18,14 +17,6 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyIncrease;
         public override bool Ranked => true;
 
-        /// <summary>
-        /// Check whether the provided hitobject should be considered the "first" hideable object.
-        /// Can be used to skip spinners, for instance.
-        /// </summary>
-        /// <param name="hitObject">The hitobject to check.</param>
-        [Obsolete("Use IsFirstAdjustableObject() instead.")] // Can be removed 20210506
-        protected virtual bool IsFirstHideableObject(DrawableHitObject hitObject) => true;
-
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
         {
             // Default value of ScoreProcessor's Rank in Hidden Mod should be SS+
@@ -49,36 +40,10 @@ namespace osu.Game.Rulesets.Mods
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-#pragma warning disable 618
-            ApplyFirstObjectIncreaseVisibilityState(hitObject, state);
-#pragma warning restore 618
         }
 
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-#pragma warning disable 618
-            ApplyHiddenState(hitObject, state);
-#pragma warning restore 618
-        }
-
-        /// <summary>
-        /// Apply a special visibility state to the first object in a beatmap, if the user chooses to turn on the "increase first object visibility" setting.
-        /// </summary>
-        /// <param name="hitObject">The hit object to apply the state change to.</param>
-        /// <param name="state">The state of the hit object.</param>
-        [Obsolete("Use ApplyIncreasedVisibilityState() instead.")] // Can be removed 20210506
-        protected virtual void ApplyFirstObjectIncreaseVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
-
-        /// <summary>
-        /// Apply a hidden state to the provided object.
-        /// </summary>
-        /// <param name="hitObject">The hit object to apply the state change to.</param>
-        /// <param name="state">The state of the hit object.</param>
-        [Obsolete("Use ApplyNormalVisibilityState() instead.")] // Can be removed 20210506
-        protected virtual void ApplyHiddenState(DrawableHitObject hitObject, ArmedState state)
-        {
         }
     }
 }

From 393ac4fdd1d6ab2ea08b0658f9d907696f1937d1 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:30:58 +0800
Subject: [PATCH 10098/10326] Destruct declaration

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index b0f3f49939..4f1e91974a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -60,20 +60,20 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             OsuHitObject hitObject = drawableOsuObject.HitObject;
 
-            (double startTime, double duration) fadeOut = getFadeOutParameters(drawableOsuObject);
+            (double startTime, double fadeDuration) = getFadeOutParameters(drawableOsuObject);
 
             switch (drawableObject)
             {
                 case DrawableSliderTail _:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
-                        drawableObject.FadeOut(fadeOut.duration);
+                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                        drawableObject.FadeOut(fadeDuration);
 
                     break;
 
                 case DrawableSliderRepeat sliderRepeat:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
+                    using (drawableObject.BeginAbsoluteSequence(startTime))
                         // only apply to circle piece – reverse arrow is not affected by hidden.
-                        sliderRepeat.CirclePiece.FadeOut(fadeOut.duration);
+                        sliderRepeat.CirclePiece.FadeOut(fadeDuration);
 
                     break;
 
@@ -92,19 +92,19 @@ namespace osu.Game.Rulesets.Osu.Mods
                             circle.ApproachCircle.Hide();
                     }
 
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
-                        fadeTarget.FadeOut(fadeOut.duration);
+                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                        fadeTarget.FadeOut(fadeDuration);
                     break;
 
                 case DrawableSlider slider:
-                    using (slider.BeginAbsoluteSequence(fadeOut.startTime))
-                        slider.Body.FadeOut(fadeOut.duration, Easing.Out);
+                    using (slider.BeginAbsoluteSequence(startTime))
+                        slider.Body.FadeOut(fadeDuration, Easing.Out);
 
                     break;
 
                 case DrawableSliderTick sliderTick:
-                    using (sliderTick.BeginAbsoluteSequence(fadeOut.startTime))
-                        sliderTick.FadeOut(fadeOut.duration);
+                    using (sliderTick.BeginAbsoluteSequence(startTime))
+                        sliderTick.FadeOut(fadeDuration);
 
                     break;
 
@@ -112,14 +112,14 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // hide elements we don't care about.
                     // todo: hide background
 
-                    using (spinner.BeginAbsoluteSequence(fadeOut.startTime))
-                        spinner.FadeOut(fadeOut.duration);
+                    using (spinner.BeginAbsoluteSequence(startTime))
+                        spinner.FadeOut(fadeDuration);
 
                     break;
             }
         }
 
-        private (double startTime, double duration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
+        private (double startTime, double fadeDuration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
         {
             switch (drawableObject)
             {
@@ -137,7 +137,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     return getParameters(drawableObject.HitObject);
             }
 
-            static (double startTime, double duration) getParameters(OsuHitObject hitObject)
+            static (double startTime, double fadeDuration) getParameters(OsuHitObject hitObject)
             {
                 var fadeOutStartTime = hitObject.StartTime - hitObject.TimePreempt + hitObject.TimeFadeIn;
                 var fadeOutDuration = hitObject.TimePreempt * fade_out_duration_multiplier;

From a86a4bab9137ef6781404dc116101662c4c6d858 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:53:59 +0800
Subject: [PATCH 10099/10326] Remove empty override

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 2 --
 osu.Game/Rulesets/Mods/ModHidden.cs        | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 4f1e91974a..c2ddeb5fcc 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -43,13 +43,11 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyIncreasedVisibilityState(hitObject, state);
             applyState(hitObject, true);
         }
 
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyNormalVisibilityState(hitObject, state);
             applyState(hitObject, false);
         }
 
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 03932baca9..238612b3d2 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -37,13 +36,5 @@ namespace osu.Game.Rulesets.Mods
                     return rank;
             }
         }
-
-        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
-
-        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
     }
 }

From a4c1b9a1a7195dca0f4b5f5f078774f306c0c916 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:56:13 +0800
Subject: [PATCH 10100/10326] Rename startTime to fadeStartTime

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index c2ddeb5fcc..4168293749 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -58,18 +58,18 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             OsuHitObject hitObject = drawableOsuObject.HitObject;
 
-            (double startTime, double fadeDuration) = getFadeOutParameters(drawableOsuObject);
+            (double fadeStartTime, double fadeDuration) = getFadeOutParameters(drawableOsuObject);
 
             switch (drawableObject)
             {
                 case DrawableSliderTail _:
-                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                    using (drawableObject.BeginAbsoluteSequence(fadeStartTime))
                         drawableObject.FadeOut(fadeDuration);
 
                     break;
 
                 case DrawableSliderRepeat sliderRepeat:
-                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                    using (drawableObject.BeginAbsoluteSequence(fadeStartTime))
                         // only apply to circle piece – reverse arrow is not affected by hidden.
                         sliderRepeat.CirclePiece.FadeOut(fadeDuration);
 
@@ -90,18 +90,18 @@ namespace osu.Game.Rulesets.Osu.Mods
                             circle.ApproachCircle.Hide();
                     }
 
-                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                    using (drawableObject.BeginAbsoluteSequence(fadeStartTime))
                         fadeTarget.FadeOut(fadeDuration);
                     break;
 
                 case DrawableSlider slider:
-                    using (slider.BeginAbsoluteSequence(startTime))
+                    using (slider.BeginAbsoluteSequence(fadeStartTime))
                         slider.Body.FadeOut(fadeDuration, Easing.Out);
 
                     break;
 
                 case DrawableSliderTick sliderTick:
-                    using (sliderTick.BeginAbsoluteSequence(startTime))
+                    using (sliderTick.BeginAbsoluteSequence(fadeStartTime))
                         sliderTick.FadeOut(fadeDuration);
 
                     break;
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // hide elements we don't care about.
                     // todo: hide background
 
-                    using (spinner.BeginAbsoluteSequence(startTime))
+                    using (spinner.BeginAbsoluteSequence(fadeStartTime))
                         spinner.FadeOut(fadeDuration);
 
                     break;

From 8b4e6d29112db730e873dd5828bcb3cd6cda514c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 21:52:09 +0200
Subject: [PATCH 10101/10326] Remove no longer necessary
 `FinishTransforms(true)` call

As the component no longer has any transition transforms applied.
---
 osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 625bdaf888..7aba699216 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -100,7 +100,6 @@ namespace osu.Game.Screens.Ranking.Expanded
             base.LoadComplete();
 
             Current.BindValueChanged(_ => updateDisplay(), true);
-            FinishTransforms(true);
         }
 
         private void updateDisplay()

From 1c92b3a8f52af41f45d026c41a0d09ce890a7b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 21:58:04 +0200
Subject: [PATCH 10102/10326] De-duplicate star rating display creation in test

---
 .../Ranking/TestSceneStarRatingDisplay.cs     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index ef077970d6..566452249f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -20,16 +21,20 @@ namespace osu.Game.Tests.Visual.Ranking
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Children = new Drawable[]
+                ChildrenEnumerable = new[]
                 {
-                    new StarRatingDisplay(new StarDifficulty(1.23, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(2.34, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(3.45, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(4.56, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(5.67, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(6.78, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(10.11, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                }
+                    1.23,
+                    2.34,
+                    3.45,
+                    4.56,
+                    5.67,
+                    6.78,
+                    10.11,
+                }.Select(starRating => new StarRatingDisplay(new StarDifficulty(starRating, 0))
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                })
             });
         }
 

From 876f53bf3beb7c2f212b1634579326a5b2c7c6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 22:15:43 +0200
Subject: [PATCH 10103/10326] Fix copy-paste oversights in xmldoc & exception
 messages

---
 osu.Game/Skinning/ISkinnableTarget.cs         | 4 ++--
 osu.Game/Skinning/SkinnableTargetContainer.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 15cad2c817..8d4f4dd0c3 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -43,9 +43,9 @@ namespace osu.Game.Skinning
         void Add(ISkinnableDrawable drawable);
 
         /// <summary>
-        /// Remove an existing skinnable component to this target.
+        /// Remove an existing skinnable component from this target.
         /// </summary>
-        /// <param name="component">The component to add.</param>
+        /// <param name="component">The component to remove.</param>
         public void Remove(ISkinnableDrawable component);
     }
 }
diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index f055fb2533..c195a5516f 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Skinning
         public void Remove(ISkinnableDrawable component)
         {
             if (content == null)
-                throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
+                throw new NotSupportedException("Attempting to remove a new component from a target container which is not supported by the current skin.");
 
             if (!(component is Drawable drawable))
                 throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(drawable));

From 743b4fbff15bb8d506f4848b1c1ed9a803339253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 22:16:37 +0200
Subject: [PATCH 10104/10326] Pass correct member name to `ArgumentException`s

---
 osu.Game/Skinning/SkinnableTargetContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index c195a5516f..d454e199dc 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Skinning
                 throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
 
             if (!(component is Drawable drawable))
-                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(drawable));
+                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
 
             content.Add(drawable);
             components.Add(component);
@@ -67,7 +67,7 @@ namespace osu.Game.Skinning
                 throw new NotSupportedException("Attempting to remove a new component from a target container which is not supported by the current skin.");
 
             if (!(component is Drawable drawable))
-                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(drawable));
+                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
 
             content.Remove(drawable);
             components.Remove(component);

From 3d3c5028e6df652f53706e24d7b8ee0f58d09c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 22:33:26 +0200
Subject: [PATCH 10105/10326] Trim unnecessary array copy

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index c594f8d271..f24b0c71c0 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -243,7 +243,7 @@ namespace osu.Game.Skinning.Editor
 
         public void DeleteItems(ISkinnableDrawable[] items)
         {
-            foreach (var item in items.ToArray())
+            foreach (var item in items)
                 availableTargets.FirstOrDefault(t => t.Components.Contains(item))?.Remove(item);
         }
     }

From 044770f1a265f6a7f1b4d34858384dee6a43c4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:29:34 +0200
Subject: [PATCH 10106/10326] Locally suppress warning in `SerializationReader`

`SerializationReader` is not written in a form that would support
turning nullability checking on for the entire class. The biggest
problem there is the inner `DynamicDeserializer` static class, whose
members are initialised via an `initialize()` method, which the compiler
knows nothing about.

For this reason, just opt to suppress the single inspection about
returning a `null` from a method with a return type of `string` (rider
expects `string?`). It would have been also viable to enable nullability
checking for this one method, but that's pretty much the same thing and
adds no safety anyways, so just disable the warning to minimise
surprise.
---
 osu.Game/IO/Legacy/SerializationReader.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/IO/Legacy/SerializationReader.cs b/osu.Game/IO/Legacy/SerializationReader.cs
index 17cbd19838..00f90f78e3 100644
--- a/osu.Game/IO/Legacy/SerializationReader.cs
+++ b/osu.Game/IO/Legacy/SerializationReader.cs
@@ -38,6 +38,7 @@ namespace osu.Game.IO.Legacy
         /// <summary> Reads a string from the buffer.  Overrides the base implementation so it can cope with nulls. </summary>
         public override string ReadString()
         {
+            // ReSharper disable once AssignNullToNotNullAttribute
             if (ReadByte() == 0) return null;
 
             return base.ReadString();

From aaa7c7eb0593c9b04c728aee778ff1de5a08f6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:33:17 +0200
Subject: [PATCH 10107/10326] Handle null case explicitly in
 `SpectatorState.Equals()`

Uses the usual pattern of two `ReferenceEquals` checks against `this`
and `null` before proceeding to inspect field values. Doing this causes
the compiler to infer that at the point that field values are checked,
`other` can no longer viably be `null`.
---
 osu.Game/Online/Spectator/SpectatorState.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/SpectatorState.cs b/osu.Game/Online/Spectator/SpectatorState.cs
index 96a875bc14..ebb91e4dd2 100644
--- a/osu.Game/Online/Spectator/SpectatorState.cs
+++ b/osu.Game/Online/Spectator/SpectatorState.cs
@@ -24,7 +24,13 @@ namespace osu.Game.Online.Spectator
         [Key(2)]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        public bool Equals(SpectatorState other) => BeatmapID == other?.BeatmapID && Mods.SequenceEqual(other?.Mods) && RulesetID == other?.RulesetID;
+        public bool Equals(SpectatorState other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID;
+        }
 
         public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
     }

From c9facf70f9503bd3928b3ddad35807d21df633b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:35:06 +0200
Subject: [PATCH 10108/10326] Use conditional nullability attribute

As it turns out, C# 8 provides an attribute that allows annotating that
an `out` parameter's nullability depends on the method's return value,
which is exactly what is desired here.
---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 2 +-
 osu.Game/Utils/ModUtils.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index 7dcaabca3d..7384471c41 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -146,7 +146,7 @@ namespace osu.Game.Tests.Mods
             if (isValid)
                 Assert.IsNull(invalid);
             else
-                Assert.That(invalid?.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid));
+                Assert.That(invalid.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid));
         }
 
         public abstract class CustomMod1 : Mod
diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 596880f2e7..1c3558fc90 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Utils
         /// <param name="mods">The mods to check.</param>
         /// <param name="invalidMods">Invalid mods, if any were found. Can be null if all mods were valid.</param>
         /// <returns>Whether the input mods were all valid. If false, <paramref name="invalidMods"/> will contain all invalid entries.</returns>
-        public static bool CheckValidForGameplay(IEnumerable<Mod> mods, out List<Mod>? invalidMods)
+        public static bool CheckValidForGameplay(IEnumerable<Mod> mods, [NotNullWhen(false)] out List<Mod>? invalidMods)
         {
             mods = mods.ToArray();
 

From f716fb09686682f8b9061b2b532866848db0fdf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:38:44 +0200
Subject: [PATCH 10109/10326] Remove bogus `InternalChildren` null-check

`InternalChildren` can't viably be `null`, and if it were, we have
bigger problems. The removed null-check was triggering false-positive
inspections further down.
---
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs
index eb92097204..6fc59ea0e8 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             base.Update();
 
             // store X before checking wide enough so if we perform layout there is no positional discrepancy.
-            float currentX = (InternalChildren?.FirstOrDefault()?.X ?? 0) - (float)Clock.ElapsedFrameTime * 0.1f;
+            float currentX = (InternalChildren.FirstOrDefault()?.X ?? 0) - (float)Clock.ElapsedFrameTime * 0.1f;
 
             // ensure we have enough sprites
             if (!InternalChildren.Any()

From 483e0dd9431efe347f01ac38ef86e1190b8d8f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:39:36 +0200
Subject: [PATCH 10110/10326] Pass placeholder hitobject instead of `null`

---
 .../Skinning/TestSceneTaikoScroller.cs                         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
index 4ae3cbd418..14c3599fcd 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
@@ -5,6 +5,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Skinning.Legacy;
 using osu.Game.Skinning;
@@ -27,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 }));
 
             AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.LastResult.Value =
-                new JudgementResult(null, new Judgement()) { Type = passing ? HitResult.Great : HitResult.Miss }));
+                new JudgementResult(new HitObject(), new Judgement()) { Type = passing ? HitResult.Great : HitResult.Miss }));
 
             AddToggleStep("toggle playback direction", reversed => this.reversed = reversed);
         }

From f2d0f7db9928b60f84b23b14c07488751df86917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:40:17 +0200
Subject: [PATCH 10111/10326] Remove list null-checks in
 `LogoTrackingContainer` test

If the null-checks were tripped, the test would crash anyway. It is not
possible to call `.Any()` and get a valid result instead of an exception
on a null reference.
---
 .../Visual/UserInterface/TestSceneLogoTrackingContainer.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
index 5582cc6826..b46d35a84d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
@@ -264,7 +264,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void moveLogoFacade()
         {
-            if (!(logoFacade?.Transforms).Any() && !(transferContainer?.Transforms).Any())
+            if (!logoFacade.Transforms.Any() && !transferContainer.Transforms.Any())
             {
                 Random random = new Random();
                 trackingContainer.Delay(500).MoveTo(new Vector2(random.Next(0, (int)logo.Parent.DrawWidth), random.Next(0, (int)logo.Parent.DrawHeight)), 300);

From 43c73f9583e31d55cc384ca8fa445011c449ec6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:42:56 +0200
Subject: [PATCH 10112/10326] Mark access to exception if task faulted as safe

There are seemingly no C#-side compile-time guarantees that it is safe,
but if the task's state is `Faulted` (as is checked right before), the
exception cannot be null as per the documentation.
---
 osu.Game/Extensions/TaskExtensions.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index 76a76c0c52..17f1a491f8 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using osu.Framework.Extensions.ObjectExtensions;
 
 namespace osu.Game.Extensions
 {
@@ -50,7 +51,7 @@ namespace osu.Game.Extensions
                         }
                         else if (continuationTask.IsFaulted)
                         {
-                            tcs.TrySetException(continuationTask.Exception);
+                            tcs.TrySetException(continuationTask.Exception.AsNonNull());
                         }
                         else
                         {

From 628e7a71edc56fb2ff2f1aec5d44646b3b1a343f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:45:58 +0200
Subject: [PATCH 10113/10326] Ignore possible nulls in `Type.GetType()` calls

They're mostly used in extensibility scenarios, so everything happens in
runtime. There is no better resolution than to crash with a null
reference exception.
---
 osu.Game/IO/Serialization/Converters/TypedListConverter.cs | 3 ++-
 osu.Game/Rulesets/RulesetInfo.cs                           | 3 ++-
 osu.Game/Rulesets/RulesetStore.cs                          | 3 ++-
 osu.Game/Skinning/SkinInfo.cs                              | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
index 50b28ea74b..174fbf9983 100644
--- a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
+++ b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using osu.Framework.Extensions.ObjectExtensions;
 
 namespace osu.Game.IO.Serialization.Converters
 {
@@ -60,7 +61,7 @@ namespace osu.Game.IO.Serialization.Converters
                     throw new JsonException("Expected $type token.");
 
                 var typeName = lookupTable[(int)tok["$type"]];
-                var instance = (T)Activator.CreateInstance(Type.GetType(typeName));
+                var instance = (T)Activator.CreateInstance(Type.GetType(typeName).AsNonNull());
                 serializer.Populate(itemReader, instance);
 
                 list.Add(instance);
diff --git a/osu.Game/Rulesets/RulesetInfo.cs b/osu.Game/Rulesets/RulesetInfo.cs
index 702bf35fa8..59ec9cdd7e 100644
--- a/osu.Game/Rulesets/RulesetInfo.cs
+++ b/osu.Game/Rulesets/RulesetInfo.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Testing;
 
 namespace osu.Game.Rulesets
@@ -27,7 +28,7 @@ namespace osu.Game.Rulesets
         {
             if (!Available) return null;
 
-            var ruleset = (Ruleset)Activator.CreateInstance(Type.GetType(InstantiationInfo));
+            var ruleset = (Ruleset)Activator.CreateInstance(Type.GetType(InstantiationInfo).AsNonNull());
 
             // overwrite the pre-populated RulesetInfo with a potentially database attached copy.
             ruleset.RulesetInfo = this;
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 4261ee3d47..0a34ca9598 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using osu.Framework;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Database;
@@ -111,7 +112,7 @@ namespace osu.Game.Rulesets
                 {
                     try
                     {
-                        var instanceInfo = ((Ruleset)Activator.CreateInstance(Type.GetType(r.InstantiationInfo))).RulesetInfo;
+                        var instanceInfo = ((Ruleset)Activator.CreateInstance(Type.GetType(r.InstantiationInfo).AsNonNull())).RulesetInfo;
 
                         r.Name = instanceInfo.Name;
                         r.ShortName = instanceInfo.ShortName;
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index bc57a8e71c..55760876e3 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Database;
@@ -32,7 +33,7 @@ namespace osu.Game.Skinning
             var type = string.IsNullOrEmpty(InstantiationInfo)
                 // handle the case of skins imported before InstantiationInfo was added.
                 ? typeof(LegacySkin)
-                : Type.GetType(InstantiationInfo);
+                : Type.GetType(InstantiationInfo).AsNonNull();
 
             if (type == typeof(DefaultLegacySkin))
                 return (Skin)Activator.CreateInstance(type, this, legacyDefaultResources, resources);

From 5b2b701915f1c387856742d93a19a620a2ffb368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:47:35 +0200
Subject: [PATCH 10114/10326] Ignore possible null in `GetResponseString()`

A null there indicates a deserialisation error and therefore due to the
catch block immediately succeeding the changed line everything will
continue to work as intended.
---
 osu.Game/Online/API/APIAccess.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 944525c119..1686595512 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -270,7 +270,7 @@ namespace osu.Game.Online.API
             {
                 try
                 {
-                    return JObject.Parse(req.GetResponseString()).SelectToken("form_error", true).AsNonNull().ToObject<RegistrationRequest.RegistrationRequestErrors>();
+                    return JObject.Parse(req.GetResponseString().AsNonNull()).SelectToken("form_error", true).AsNonNull().ToObject<RegistrationRequest.RegistrationRequestErrors>();
                 }
                 catch
                 {

From fa6b5515b7752932c0ffb9f035659f3c2ab1aedb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:49:41 +0200
Subject: [PATCH 10115/10326] Ignore possible null from
 `JsonConvert.DeserializeObject()`

Nothing better can be done if a `null` is indeed returned.
---
 osu.Game/Skinning/Skin.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 2944c7a8ec..f43283f624 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -8,6 +8,7 @@ using System.Text;
 using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
@@ -57,7 +58,7 @@ namespace osu.Game.Skinning
 
                 string jsonContent = Encoding.UTF8.GetString(bytes);
 
-                DrawableComponentInfo[skinnableTarget] = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).ToArray();
+                DrawableComponentInfo[skinnableTarget] = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).AsNonNull().ToArray();
             }
         }
 

From b51d0380882c33bae1723af63036533f6ed2d8b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:50:25 +0200
Subject: [PATCH 10116/10326] Ignore possible path-related nulls

They're all in test code anyway, so any issue there will cause a test to
fail.
---
 osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs     | 3 ++-
 osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs    | 3 ++-
 osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 0c35e9471d..0d117f8755 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -12,6 +12,7 @@ using osu.Framework.Platform;
 using osu.Game.IPC;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
@@ -264,7 +265,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
                         // change filename
                         var firstFile = new FileInfo(Directory.GetFiles(extractedFolder).First());
-                        firstFile.MoveTo(Path.Combine(firstFile.DirectoryName, $"{firstFile.Name}-changed{firstFile.Extension}"));
+                        firstFile.MoveTo(Path.Combine(firstFile.DirectoryName.AsNonNull(), $"{firstFile.Name}-changed{firstFile.Extension}"));
 
                         using (var zip = ZipArchive.Create())
                         {
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index 1c5e551042..a97f6defe9 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -9,6 +9,7 @@ using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
@@ -164,7 +165,7 @@ namespace osu.Game.Tests.Beatmaps
 
         private Stream openResource(string name)
         {
-            var localPath = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path));
+            var localPath = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path)).AsNonNull();
             return Assembly.LoadFrom(Path.Combine(localPath, $"{ResourceAssembly}.dll")).GetManifestResourceStream($@"{ResourceAssembly}.Resources.{name}");
         }
 
diff --git a/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs b/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs
index 748a52d1c5..e10bf08da4 100644
--- a/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs
+++ b/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Reflection;
 using NUnit.Framework;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
@@ -41,7 +42,7 @@ namespace osu.Game.Tests.Beatmaps
 
         private Stream openResource(string name)
         {
-            var localPath = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path));
+            var localPath = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path)).AsNonNull();
             return Assembly.LoadFrom(Path.Combine(localPath, $"{ResourceAssembly}.dll")).GetManifestResourceStream($@"{ResourceAssembly}.Resources.{name}");
         }
 

From e62e473bb262f368988dcfdbd417ca272f8a748a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:51:06 +0200
Subject: [PATCH 10117/10326] Ignore possible null in multiplayer test

A null value will fail the test anyhow.
---
 .../NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
index 14589f8e6c..adc1d6aede 100644
--- a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using Humanizer;
 using NUnit.Framework;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Testing;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Tests.Visual.Multiplayer;
@@ -34,7 +35,7 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
             changeState(6, MultiplayerUserState.WaitingForLoad);
             checkPlayingUserCount(6);
 
-            AddStep("another user left", () => Client.RemoveUser(Client.Room?.Users.Last().User));
+            AddStep("another user left", () => Client.RemoveUser((Client.Room?.Users.Last().User).AsNonNull()));
             checkPlayingUserCount(5);
 
             AddStep("leave room", () => Client.LeaveRoom());

From d581e0a2524c6c584667d5017e9ab92e81a8de0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:52:16 +0200
Subject: [PATCH 10118/10326] Ignore possible nulls in
 `NotifyCollectionChangedArgs`

Safe to access by the virtue of the preceding case labels on
`args.Action`.  And they're in test code anyways.
---
 .../Visual/Online/TestSceneLeaderboardModSelector.cs         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
index 54e655d4ec..fc438ce6dd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -45,14 +46,14 @@ namespace osu.Game.Tests.Visual.Online
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
-                        args.NewItems.Cast<Mod>().ForEach(mod => selectedMods.Add(new OsuSpriteText
+                        args.NewItems.AsNonNull().Cast<Mod>().ForEach(mod => selectedMods.Add(new OsuSpriteText
                         {
                             Text = mod.Acronym,
                         }));
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
-                        args.OldItems.Cast<Mod>().ForEach(mod =>
+                        args.OldItems.AsNonNull().Cast<Mod>().ForEach(mod =>
                         {
                             foreach (var selected in selectedMods)
                             {

From ae71389ebe18bcd3f3c1ca3793088c13fe041fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:53:37 +0200
Subject: [PATCH 10119/10326] Ignore possible nulls from stream reader in IPC

Any failures will be caught. They're not logged, but they also weren't
before. Error handling can be improved at a future date, this series of
changes is primarily intending to unblock a new inspection.
---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 71417d1cc6..f538d4a7d9 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using JetBrains.Annotations;
 using Microsoft.Win32;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
@@ -77,8 +78,8 @@ namespace osu.Game.Tournament.IPC
                             using (var stream = IPCStorage.GetStream(file_ipc_filename))
                             using (var sr = new StreamReader(stream))
                             {
-                                var beatmapId = int.Parse(sr.ReadLine());
-                                var mods = int.Parse(sr.ReadLine());
+                                var beatmapId = int.Parse(sr.ReadLine().AsNonNull());
+                                var mods = int.Parse(sr.ReadLine().AsNonNull());
 
                                 if (lastBeatmapId != beatmapId)
                                 {
@@ -124,7 +125,7 @@ namespace osu.Game.Tournament.IPC
                             using (var stream = IPCStorage.GetStream(file_ipc_state_filename))
                             using (var sr = new StreamReader(stream))
                             {
-                                State.Value = (TourneyState)Enum.Parse(typeof(TourneyState), sr.ReadLine());
+                                State.Value = (TourneyState)Enum.Parse(typeof(TourneyState), sr.ReadLine().AsNonNull());
                             }
                         }
                         catch (Exception)

From 69fc072429bc31ad23a67a1dacf165cf341d6fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 15 May 2021 01:01:27 +0200
Subject: [PATCH 10120/10326] Ignore skin component json data if
 deserialisation fails instead

Crashing was not really the best thing to do there given the preceding
code that already allowed a few continues in case of a missing file.
---
 osu.Game/Skinning/Skin.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index f43283f624..b6cb8fc7a4 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -8,7 +8,6 @@ using System.Text;
 using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
@@ -57,8 +56,12 @@ namespace osu.Game.Skinning
                     continue;
 
                 string jsonContent = Encoding.UTF8.GetString(bytes);
+                var deserializedContent = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent);
 
-                DrawableComponentInfo[skinnableTarget] = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).AsNonNull().ToArray();
+                if (deserializedContent == null)
+                    continue;
+
+                DrawableComponentInfo[skinnableTarget] = deserializedContent.ToArray();
             }
         }
 

From 63ac430386a631ea683496527aa7f8cb47b5f065 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 15 May 2021 11:26:16 +0800
Subject: [PATCH 10121/10326] Rename startTime in parameters

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 4168293749..2752feb0a1 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
         }
 
-        private (double startTime, double fadeDuration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
+        private (double fadeStartTime, double fadeDuration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
         {
             switch (drawableObject)
             {
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     return getParameters(drawableObject.HitObject);
             }
 
-            static (double startTime, double fadeDuration) getParameters(OsuHitObject hitObject)
+            static (double fadeStartTime, double fadeDuration) getParameters(OsuHitObject hitObject)
             {
                 var fadeOutStartTime = hitObject.StartTime - hitObject.TimePreempt + hitObject.TimeFadeIn;
                 var fadeOutDuration = hitObject.TimePreempt * fade_out_duration_multiplier;

From 6e5c4ed7c6c3e4890c1480d7ccac1d52b131c8cf Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 15 May 2021 11:37:04 +0800
Subject: [PATCH 10122/10326] Revert "Remove empty override"

This reverts commit a86a4bab9137ef6781404dc116101662c4c6d858.
---
 osu.Game/Rulesets/Mods/ModHidden.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 238612b3d2..03932baca9 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -36,5 +37,13 @@ namespace osu.Game.Rulesets.Mods
                     return rank;
             }
         }
+
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
     }
 }

From 166974506ea25739eb3ad48c7e9206370a684b4b Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 15 May 2021 11:51:39 +0800
Subject: [PATCH 10123/10326] Duplicate implementions

---
 osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs         | 6 ++++--
 osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs | 9 +++++++++
 osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs         | 9 +++++++++
 osu.Game/Rulesets/Mods/ModHidden.cs                    | 9 ---------
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index ba3e8f9a8f..7bad4c79cb 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -28,10 +28,12 @@ namespace osu.Game.Rulesets.Catch.Mods
             catchPlayfield.CatcherArea.MovableCatcher.CatchFruitOnPlate = false;
         }
 
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyNormalVisibilityState(hitObject, state);
-
             if (!(hitObject is DrawableCatchHitObject catchDrawable))
                 return;
 
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
index 87501d07a5..3c24e91d54 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
@@ -39,5 +40,13 @@ namespace osu.Game.Rulesets.Mania.Mods
                 }));
             }
         }
+
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
index a6f902208c..7739ecaf5b 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
@@ -10,5 +11,13 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override string Description => @"Beats fade out before you hit them!";
         public override double ScoreMultiplier => 1.06;
         public override bool HasImplementation => false;
+
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 03932baca9..238612b3d2 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -37,13 +36,5 @@ namespace osu.Game.Rulesets.Mods
                     return rank;
             }
         }
-
-        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
-
-        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
     }
 }

From 34d14907548cef21ae02cd8bf3eb7d26a3d16a3b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 15 May 2021 10:00:04 +0300
Subject: [PATCH 10124/10326] Remove null conditional

Shouldn't guard against that here.
---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index e26dd24de7..fd1150650c 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load(BeatmapDifficultyCache difficultyCache)
         {
-            var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
+            var metadata = beatmap.BeatmapInfo.Metadata;
 
             AutoSizeAxes = Axes.Both;
             Children = new Drawable[]

From e479db91864dd9a097aa90407940fd9b3639004b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 15 May 2021 19:14:02 +0300
Subject: [PATCH 10125/10326] Clear transforms in PostsContainer for all
 children

---
 osu.Game/Overlays/News/Sidebar/MonthDropdown.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index d6d7527a6c..85a06c8227 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 IsOpen.BindValueChanged(open =>
                 {
-                    ClearTransforms();
+                    ClearTransforms(true);
 
                     if (open.NewValue)
                     {

From 3e1b1c6c3ebb539c8bc9d8cbb3b5c709aab2b0fc Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 15 May 2021 19:14:58 +0300
Subject: [PATCH 10126/10326] Improve statement readability

---
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 3851dea83a..837c661cbd 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
             var allPosts = metadata.NewValue.NewsPosts;
 
-            if (!allPosts?.Any() ?? true)
+            if (allPosts?.Any() != true)
                 return;
 
             var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);

From a91f2d3dbad5e4a41dec719fa57ba5279b64ccd2 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 10:17:04 +0800
Subject: [PATCH 10127/10326] Change "judgment" to "judgement"

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index ea3eb5eb5c..8993a9b18a 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
             var hitWindows = new OsuHitWindows();
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
-                poolDictionary.Add(result, new DrawableJudgementPool(result, onJudgmentLoaded));
+                poolDictionary.Add(result, new DrawableJudgementPool(result, onJudgementLoaded));
 
             AddRangeInternal(poolDictionary.Values);
 
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.UI
             }
         }
 
-        private void onJudgmentLoaded(DrawableOsuJudgement judgement)
+        private void onJudgementLoaded(DrawableOsuJudgement judgement)
         {
             judgementAboveHitObjectLayer.Add(judgement.GetProxyAboveHitObjectsContent());
         }

From 3519398a224ba44f2f2e91ba6dd3aa921741a6a9 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 11:16:12 +0800
Subject: [PATCH 10128/10326] Added "flip" mod for taiko

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs | 32 ++++++++++++++++++++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs      |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
new file mode 100644
index 0000000000..1f2f2c4784
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.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.Sprites;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Taiko.Beatmaps;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModFlip : Mod, IApplicableToBeatmap
+    {
+        public override string Name => "Flip";
+        public override string Acronym => "FP";
+        public override string Description => @"Dons become kats, kats become dons";
+        public override ModType Type => ModType.Conversion;
+        public override double ScoreMultiplier => 1;
+
+        public void ApplyToBeatmap(IBeatmap beatmap)
+        {
+            var taikoBeatmap = (TaikoBeatmap)beatmap;
+
+            foreach (var obj in taikoBeatmap.HitObjects)
+            {
+                if (obj is Hit hit)
+                    hit.Type = hit.Type == HitType.Centre ? HitType.Rim : HitType.Centre; 
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index f4e158ec32..26dc1bd416 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Rulesets.Taiko
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new TaikoModRandom(),
+                        new MultiMod(new TaikoModFlip(), new TaikoModRandom()),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
                     };

From da13be6dd0d9ec1dca90b46649e9a3e6a3f6c31d Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 11:28:11 +0800
Subject: [PATCH 10129/10326] Trimmed trailing white space

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index 1f2f2c4784..e2de6ccc3d 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
             foreach (var obj in taikoBeatmap.HitObjects)
             {
                 if (obj is Hit hit)
-                    hit.Type = hit.Type == HitType.Centre ? HitType.Rim : HitType.Centre; 
+                    hit.Type = hit.Type == HitType.Centre ? HitType.Rim : HitType.Centre;
             }
         }
     }

From 3d83741a23c6c0be53c71000148a3d7531e580c2 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 12:03:03 +0800
Subject: [PATCH 10130/10326] Separate Flip and Random

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs   | 3 +++
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs | 3 +++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs        | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index e2de6ccc3d..22e627ef06 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.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.Linq;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -17,6 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override string Description => @"Dons become kats, kats become dons";
         public override ModType Type => ModType.Conversion;
         public override double ScoreMultiplier => 1;
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModRandom)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index 1cf19ac18e..e203bbc431 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.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.Linq;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
@@ -12,6 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 26dc1bd416..52088b7ac4 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -133,7 +133,8 @@ namespace osu.Game.Rulesets.Taiko
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new MultiMod(new TaikoModFlip(), new TaikoModRandom()),
+                        new TaikoModFlip(),
+                        new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
                     };

From cbc2a38b590429ccf07d4aea7e8d4083899aba01 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 May 2021 13:21:06 +0900
Subject: [PATCH 10131/10326] Move new mod to end to avoid reordering

---
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 52088b7ac4..9232ea63ee 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -133,10 +133,10 @@ namespace osu.Game.Rulesets.Taiko
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new TaikoModFlip(),
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
+                        new TaikoModFlip(),
                     };
 
                 case ModType.Automation:

From 422a3b76b64532f69b1432ff01d2c0d39aa68f12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 May 2021 13:21:19 +0900
Subject: [PATCH 10132/10326] Remove unused using statements

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index 22e627ef06..bfab98fbf8 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Beatmaps;
 using osu.Game.Rulesets.Taiko.Objects;

From 5972e43bc2a038df5e8c2c8f97e17ae28fe79399 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 12:51:40 +0800
Subject: [PATCH 10133/10326] Renamed TaikoModFlip to TaikoModInvert

---
 osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs   | 12 +-----------
 .../Mods/{TaikoModFlip.cs => TaikoModInvert.cs}  |  6 +-----
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs   |  2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs          |  2 +-
 osu.Game/Rulesets/Mods/ModInvert.cs              | 16 ++++++++++++++++
 5 files changed, 20 insertions(+), 18 deletions(-)
 rename osu.Game.Rulesets.Taiko/Mods/{TaikoModFlip.cs => TaikoModInvert.cs} (77%)
 create mode 100644 osu.Game/Rulesets/Mods/ModInvert.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 1ea45c295c..0366c0f374 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -13,19 +12,10 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModInvert : Mod, IApplicableAfterBeatmapConversion
+    public class ManiaModInvert : ModInvert, IApplicableAfterBeatmapConversion
     {
-        public override string Name => "Invert";
-
-        public override string Acronym => "IN";
-        public override double ScoreMultiplier => 1;
-
         public override string Description => "Hold the keys. To the beat.";
 
-        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
-
-        public override ModType Type => ModType.Conversion;
-
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
             var maniaBeatmap = (ManiaBeatmap)beatmap;
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
similarity index 77%
rename from osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
rename to osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
index bfab98fbf8..a6ccebaa61 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
@@ -10,13 +10,9 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
-    public class TaikoModFlip : Mod, IApplicableToBeatmap
+    public class TaikoModInvert : ModInvert, IApplicableToBeatmap
     {
-        public override string Name => "Flip";
-        public override string Acronym => "FP";
         public override string Description => @"Dons become kats, kats become dons";
-        public override ModType Type => ModType.Conversion;
-        public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModRandom)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index e203bbc431..a5ab176176 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModInvert)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 9232ea63ee..8a716bf56e 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
-                        new TaikoModFlip(),
+                        new TaikoModInvert(),
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game/Rulesets/Mods/ModInvert.cs b/osu.Game/Rulesets/Mods/ModInvert.cs
new file mode 100644
index 0000000000..6c211d2173
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModInvert.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.Framework.Graphics.Sprites;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModInvert : Mod
+    {
+        public override string Name => "Invert";
+        public override string Acronym => "IN";
+        public override ModType Type => ModType.Conversion;
+        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
+        public override double ScoreMultiplier => 1;
+    }
+}

From c4ae70a82720a04a82502d8bacf158040ac412d9 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Mon, 17 May 2021 10:59:56 +0800
Subject: [PATCH 10134/10326] Revert "Renamed TaikoModFlip to TaikoModInvert"

This reverts commit 5972e43bc2a038df5e8c2c8f97e17ae28fe79399.
---
 osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs   | 12 +++++++++++-
 .../Mods/{TaikoModInvert.cs => TaikoModFlip.cs}  |  6 +++++-
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs   |  2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs          |  2 +-
 osu.Game/Rulesets/Mods/ModInvert.cs              | 16 ----------------
 5 files changed, 18 insertions(+), 20 deletions(-)
 rename osu.Game.Rulesets.Taiko/Mods/{TaikoModInvert.cs => TaikoModFlip.cs} (77%)
 delete mode 100644 osu.Game/Rulesets/Mods/ModInvert.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 0366c0f374..1ea45c295c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -12,10 +13,19 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModInvert : ModInvert, IApplicableAfterBeatmapConversion
+    public class ManiaModInvert : Mod, IApplicableAfterBeatmapConversion
     {
+        public override string Name => "Invert";
+
+        public override string Acronym => "IN";
+        public override double ScoreMultiplier => 1;
+
         public override string Description => "Hold the keys. To the beat.";
 
+        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
+
+        public override ModType Type => ModType.Conversion;
+
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
             var maniaBeatmap = (ManiaBeatmap)beatmap;
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
similarity index 77%
rename from osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
rename to osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index a6ccebaa61..bfab98fbf8 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
@@ -10,9 +10,13 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
-    public class TaikoModInvert : ModInvert, IApplicableToBeatmap
+    public class TaikoModFlip : Mod, IApplicableToBeatmap
     {
+        public override string Name => "Flip";
+        public override string Acronym => "FP";
         public override string Description => @"Dons become kats, kats become dons";
+        public override ModType Type => ModType.Conversion;
+        public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModRandom)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index a5ab176176..e203bbc431 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModInvert)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 8a716bf56e..9232ea63ee 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
-                        new TaikoModInvert(),
+                        new TaikoModFlip(),
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game/Rulesets/Mods/ModInvert.cs b/osu.Game/Rulesets/Mods/ModInvert.cs
deleted file mode 100644
index 6c211d2173..0000000000
--- a/osu.Game/Rulesets/Mods/ModInvert.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.Rulesets.Mods
-{
-    public abstract class ModInvert : Mod
-    {
-        public override string Name => "Invert";
-        public override string Acronym => "IN";
-        public override ModType Type => ModType.Conversion;
-        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
-        public override double ScoreMultiplier => 1;
-    }
-}

From f34637ea9c06a7e3a00b45f3fc762a025548dfe5 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Mon, 17 May 2021 11:04:01 +0800
Subject: [PATCH 10135/10326] Renamed TaikoModFlip to TaikoModSwap

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs              | 2 +-
 .../Mods/{TaikoModFlip.cs => TaikoModSwap.cs}               | 6 +++---
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs                     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game.Rulesets.Taiko/Mods/{TaikoModFlip.cs => TaikoModSwap.cs} (86%)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index e203bbc431..a22f189d5e 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModSwap)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModSwap.cs
similarity index 86%
rename from osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
rename to osu.Game.Rulesets.Taiko/Mods/TaikoModSwap.cs
index bfab98fbf8..3cb337c41d 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModSwap.cs
@@ -10,10 +10,10 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
-    public class TaikoModFlip : Mod, IApplicableToBeatmap
+    public class TaikoModSwap : Mod, IApplicableToBeatmap
     {
-        public override string Name => "Flip";
-        public override string Acronym => "FP";
+        public override string Name => "Swap";
+        public override string Acronym => "SW";
         public override string Description => @"Dons become kats, kats become dons";
         public override ModType Type => ModType.Conversion;
         public override double ScoreMultiplier => 1;
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 9232ea63ee..5854d4770c 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
-                        new TaikoModFlip(),
+                        new TaikoModSwap(),
                     };
 
                 case ModType.Automation:

From 50e2b5a32761768102975a76511d099bc51180d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:00:36 +0900
Subject: [PATCH 10136/10326] SideBar -> Sidebar

---
 osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs | 6 +++---
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index b5405a979e..e376d9b1ed 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -13,15 +13,15 @@ using osu.Game.Overlays.News.Sidebar;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneNewsSideBar : OsuTestScene
+    public class TestSceneNewsSidebar : OsuTestScene
     {
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private NewsSideBar sidebar;
+        private NewsSidebar sidebar;
 
         [SetUp]
-        public void SetUp() => Schedule(() => Child = sidebar = new NewsSideBar());
+        public void SetUp() => Schedule(() => Child = sidebar = new NewsSidebar());
 
         [Test]
         public void TestYearsPanelVisibility()
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 837c661cbd..bad334cb2f 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -12,7 +12,7 @@ using System.Linq;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
-    public class NewsSideBar : CompositeDrawable
+    public class NewsSidebar : CompositeDrawable
     {
         [Cached]
         public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();

From 22561cda1956e51f3747952f19fb1f59c9ebc9db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:02:21 +0900
Subject: [PATCH 10137/10326] MonthDropdown -> MonthSection

---
 osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs        | 2 +-
 .../News/Sidebar/{MonthDropdown.cs => MonthSection.cs}      | 4 ++--
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game/Overlays/News/Sidebar/{MonthDropdown.cs => MonthSection.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index e376d9b1ed..5e8cd397bc 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Online
         public void TestMetadataWithNoPosts()
         {
             AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
-            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthDropdown>().Any());
+            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
         }
 
         private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
similarity index 97%
rename from osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
rename to osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 85a06c8227..80c408bda5 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -18,13 +18,13 @@ using System.Diagnostics;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
-    public class MonthDropdown : CompositeDrawable
+    public class MonthSection : CompositeDrawable
     {
         private const int animation_duration = 250;
 
         public readonly BindableBool IsOpen = new BindableBool();
 
-        public MonthDropdown(int month, int year, IEnumerable<APINewsPost> posts)
+        public MonthSection(int month, int year, IEnumerable<APINewsPost> posts)
         {
             Debug.Assert(posts.All(p => p.PublishedAt.Month == month && p.PublishedAt.Year == year));
 
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index bad334cb2f..b8d283b7e2 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.News.Sidebar
         [Cached]
         public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
 
-        private FillFlowContainer<MonthDropdown> monthsFlow;
+        private FillFlowContainer<MonthSection> monthsFlow;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.News.Sidebar
                         Children = new Drawable[]
                         {
                             new YearsPanel(),
-                            monthsFlow = new FillFlowContainer<MonthDropdown>
+                            monthsFlow = new FillFlowContainer<MonthSection>
                             {
                                 AutoSizeAxes = Axes.Y,
                                 RelativeSizeAxes = Axes.X,
@@ -93,7 +93,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 var month = sortedKeys[i];
                 var posts = lookup[month];
 
-                monthsFlow.Add(new MonthDropdown(month, year, posts)
+                monthsFlow.Add(new MonthSection(month, year, posts)
                 {
                     IsOpen = { Value = i == 0 }
                 });

From 032f60819d0836fdd24a6fe715b08a3835e454c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:11:46 +0900
Subject: [PATCH 10138/10326] Rename content container

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 2d405e832b..932494f740 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.News.Sidebar
     {
         private readonly Bindable<APINewsSidebar> metadata = new Bindable<APINewsSidebar>();
 
-        private Container gridPlaceholder;
+        private Container gridContent;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider, Bindable<APINewsSidebar> metadata)
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.News.Sidebar
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background3
                 },
-                gridPlaceholder = new Container
+                gridContent = new Container
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.News.Sidebar
                     return;
                 }
 
-                gridPlaceholder.Child = new YearsGridContainer(m.NewValue.Years, m.NewValue.CurrentYear);
+                gridContent.Child = new YearsGridContainer(m.NewValue.Years, m.NewValue.CurrentYear);
                 Show();
             }, true);
         }
@@ -77,6 +77,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 RelativeSizeAxes = Axes.X;
                 Height = 15;
+
                 Child = text = new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,

From ae1e62288d57d1477155f439f4d2b094edd68447 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:16:50 +0900
Subject: [PATCH 10139/10326] Reorder tests to not have the first test show
 nothing

---
 .../Visual/Online/TestSceneNewsSideBar.cs          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index 5e8cd397bc..706de2b310 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -23,6 +23,13 @@ namespace osu.Game.Tests.Visual.Online
         [SetUp]
         public void SetUp() => Schedule(() => Child = sidebar = new NewsSidebar());
 
+        [Test]
+        public void TestMetadataWithNoPosts()
+        {
+            AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
+            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
+        }
+
         [Test]
         public void TestYearsPanelVisibility()
         {
@@ -31,13 +38,6 @@ namespace osu.Game.Tests.Visual.Online
             AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
         }
 
-        [Test]
-        public void TestMetadataWithNoPosts()
-        {
-            AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
-            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
-        }
-
         private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
 
         private static readonly APINewsSidebar metadata = new APINewsSidebar

From abeeda5d04ddb2922629fba6fea2812ca5335c27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:24:43 +0900
Subject: [PATCH 10140/10326] Rewrite `YearsPanel` to not be insanely long

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 49 ++++----------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 932494f740..4573ae530f 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.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 System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
+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.Graphics.Sprites;
-using System.Collections.Generic;
-using osu.Game.Graphics;
-using osu.Framework.Bindables;
 using osu.Game.Online.API.Requests.Responses;
-using System;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.News.Sidebar
@@ -77,6 +77,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 RelativeSizeAxes = Axes.X;
                 Height = 15;
+                Padding = new MarginPadding { Vertical = 2.5f };
 
                 Child = text = new OsuSpriteText
                 {
@@ -99,39 +100,19 @@ namespace osu.Game.Overlays.News.Sidebar
         private class YearsGridContainer : GridContainer
         {
             private const int column_count = 4;
-            private const float spacing = 5f;
 
             private readonly int rowCount;
 
             public YearsGridContainer(int[] years, int currentYear)
             {
-                rowCount = (int)Math.Ceiling((float)years.Length / column_count);
+                rowCount = (years.Length + column_count - 1) / column_count;
 
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
-                RowDimensions = getRowDimensions();
-                ColumnDimensions = getColumnDimensions();
+                RowDimensions = Enumerable.Range(0, rowCount).Select(_ => new Dimension(GridSizeMode.AutoSize)).ToArray();
                 Content = createContent(years, currentYear);
             }
 
-            private Dimension[] getRowDimensions()
-            {
-                var rowDimensions = new Dimension[rowCount];
-                for (int i = 0; i < rowCount; i++)
-                    rowDimensions[i] = new Dimension(GridSizeMode.AutoSize);
-
-                return rowDimensions;
-            }
-
-            private Dimension[] getColumnDimensions()
-            {
-                var columnDimensions = new Dimension[column_count];
-                for (int i = 0; i < column_count; i++)
-                    columnDimensions[i] = new Dimension(GridSizeMode.Relative, size: 1f / column_count);
-
-                return columnDimensions;
-            }
-
             private Drawable[][] createContent(int[] years, int currentYear)
             {
                 var buttons = new Drawable[rowCount][];
@@ -153,19 +134,7 @@ namespace osu.Game.Overlays.News.Sidebar
                             var year = years[index];
                             var isCurrent = year == currentYear;
 
-                            buttons[i][j] = new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Padding = new MarginPadding
-                                {
-                                    Top = i == 0 ? 0 : spacing / 2,
-                                    Bottom = i == rowCount - 1 ? 0 : spacing / 2,
-                                    Left = j == 0 ? 0 : spacing / 2,
-                                    Right = j == column_count - 1 ? 0 : spacing / 2
-                                },
-                                Child = new YearButton(year, isCurrent)
-                            };
+                            buttons[i][j] = new YearButton(year, isCurrent);
                         }
                     }
                 }

From baa4089364f46eb59c1209dd94d2f2a78a2e718a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:40:42 +0900
Subject: [PATCH 10141/10326] Expose method to adjust header text, not whole
 drawable

---
 .../Maintenance/DirectorySelectScreen.cs         | 16 +++++++++++-----
 .../Maintenance/MigrationSelectScreen.cs         |  9 ++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index c2366ca209..e7c69e89fe 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -10,6 +10,7 @@ using osu.Game.Screens;
 using osuTK;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Screens;
@@ -22,7 +23,10 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         private DirectorySelector directorySelector;
 
-        protected abstract OsuSpriteText CreateHeader();
+        /// <summary>
+        /// Text to display in the header to inform the user of what they are selecting.
+        /// </summary>
+        public abstract LocalisableString HeaderText { get; }
 
         /// <summary>
         /// Called upon selection of a directory by the user.
@@ -73,11 +77,13 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                         {
                             new Drawable[]
                             {
-                                CreateHeader().With(header =>
+                                new OsuSpriteText
                                 {
-                                    header.Origin = Anchor.Centre;
-                                    header.Anchor = Anchor.Centre;
-                                })
+                                    Text = HeaderText,
+                                    Font = OsuFont.Default.With(size: 40),
+                                    Origin = Anchor.Centre,
+                                    Anchor = Anchor.Centre,
+                                }
                             },
                             new Drawable[]
                             {
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index 6334bffe94..1a60ab0638 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -4,11 +4,10 @@
 using System;
 using System.IO;
 using osu.Framework.Allocation;
+using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -25,11 +24,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         public override bool HideOverlaysOnEnter => true;
 
-        protected override OsuSpriteText CreateHeader() => new OsuSpriteText
-        {
-            Text = "Please select a new location",
-            Font = OsuFont.Default.With(size: 40)
-        };
+        public override LocalisableString HeaderText => "Please select a new location";
 
         protected override void OnSelection(DirectoryInfo directory)
         {

From e754d2e59028940ff1a2e8b06cf66e88d1187299 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 10:54:45 +0300
Subject: [PATCH 10142/10326] Simplify YearButton

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 4573ae530f..2528d51331 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -66,9 +65,6 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private class YearButton : OsuHoverContainer
         {
-            protected override IEnumerable<Drawable> EffectTargets => new[] { text };
-
-            private readonly OsuSpriteText text;
             private readonly bool isCurrent;
 
             public YearButton(int year, bool isCurrent)
@@ -79,7 +75,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 Height = 15;
                 Padding = new MarginPadding { Vertical = 2.5f };
 
-                Child = text = new OsuSpriteText
+                Child = new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

From e3b8d8ee1875d357db0198894fb8c475969f090e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 17 May 2021 16:58:54 +0900
Subject: [PATCH 10143/10326] Add support for overlay-coloured links

---
 osu.Game/Online/Chat/DrawableLinkCompiler.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Chat/DrawableLinkCompiler.cs b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
index d27a3fbffe..e7f47833a2 100644
--- a/osu.Game/Online/Chat/DrawableLinkCompiler.cs
+++ b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
 using osuTK;
 
 namespace osu.Game.Online.Chat
@@ -20,7 +21,10 @@ namespace osu.Game.Online.Chat
         /// <summary>
         /// Each word part of a chat link (split for word-wrap support).
         /// </summary>
-        public List<Drawable> Parts;
+        public readonly List<Drawable> Parts;
+
+        [Resolved(CanBeNull = true)]
+        private OverlayColourProvider overlayColourProvider { get; set; }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parts.Any(d => d.ReceivePositionalInputAt(screenSpacePos));
 
@@ -34,7 +38,7 @@ namespace osu.Game.Online.Chat
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            IdleColour = colours.Blue;
+            IdleColour = overlayColourProvider?.Light2 ?? colours.Blue;
         }
 
         protected override IEnumerable<Drawable> EffectTargets => Parts;

From 5059bfaef99e987293d6b3f3d3f5b7629dcab9d9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 11:17:02 +0300
Subject: [PATCH 10144/10326] Use FillFlowContainer in YearsPanel

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 70 +++++---------------
 1 file changed, 18 insertions(+), 52 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 2528d51331..331a7e10e1 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -11,6 +10,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.News.Sidebar
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.News.Sidebar
     {
         private readonly Bindable<APINewsSidebar> metadata = new Bindable<APINewsSidebar>();
 
-        private Container gridContent;
+        private FillFlowContainer yearsFlow;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider, Bindable<APINewsSidebar> metadata)
@@ -37,11 +37,17 @@ namespace osu.Game.Overlays.News.Sidebar
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background3
                 },
-                gridContent = new Container
+                new Container
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding(5)
+                    Padding = new MarginPadding(5),
+                    Child = yearsFlow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(0, 5)
+                    }
                 }
             };
         }
@@ -52,13 +58,19 @@ namespace osu.Game.Overlays.News.Sidebar
 
             metadata.BindValueChanged(m =>
             {
+                yearsFlow.Clear();
+
                 if (m.NewValue == null)
                 {
                     Hide();
                     return;
                 }
 
-                gridContent.Child = new YearsGridContainer(m.NewValue.Years, m.NewValue.CurrentYear);
+                var currentYear = m.NewValue.CurrentYear;
+
+                foreach (var y in m.NewValue.Years)
+                    yearsFlow.Add(new YearButton(y, y == currentYear));
+
                 Show();
             }, true);
         }
@@ -72,8 +84,8 @@ namespace osu.Game.Overlays.News.Sidebar
                 this.isCurrent = isCurrent;
 
                 RelativeSizeAxes = Axes.X;
+                Width = 0.25f;
                 Height = 15;
-                Padding = new MarginPadding { Vertical = 2.5f };
 
                 Child = new OsuSpriteText
                 {
@@ -92,51 +104,5 @@ namespace osu.Game.Overlays.News.Sidebar
                 Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
-
-        private class YearsGridContainer : GridContainer
-        {
-            private const int column_count = 4;
-
-            private readonly int rowCount;
-
-            public YearsGridContainer(int[] years, int currentYear)
-            {
-                rowCount = (years.Length + column_count - 1) / column_count;
-
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
-                RowDimensions = Enumerable.Range(0, rowCount).Select(_ => new Dimension(GridSizeMode.AutoSize)).ToArray();
-                Content = createContent(years, currentYear);
-            }
-
-            private Drawable[][] createContent(int[] years, int currentYear)
-            {
-                var buttons = new Drawable[rowCount][];
-
-                for (int i = 0; i < rowCount; i++)
-                {
-                    buttons[i] = new Drawable[column_count];
-
-                    for (int j = 0; j < column_count; j++)
-                    {
-                        var index = i * column_count + j;
-
-                        if (index >= years.Length)
-                        {
-                            buttons[i][j] = Empty();
-                        }
-                        else
-                        {
-                            var year = years[index];
-                            var isCurrent = year == currentYear;
-
-                            buttons[i][j] = new YearButton(year, isCurrent);
-                        }
-                    }
-                }
-
-                return buttons;
-            }
-        }
     }
 }

From c0cfbd11ddabc1c4544b3b54872e4e4c3458ce14 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 11:20:31 +0300
Subject: [PATCH 10145/10326] Add tooltip and action for PostButton in
 MonthSection

---
 osu.Game/Overlays/News/Sidebar/MonthSection.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 80c408bda5..20c4d2e83e 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -15,6 +15,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using System.Diagnostics;
+using osu.Framework.Platform;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -99,9 +100,12 @@ namespace osu.Game.Overlays.News.Sidebar
             protected override IEnumerable<Drawable> EffectTargets => new[] { text };
 
             private readonly TextFlowContainer text;
+            private readonly APINewsPost post;
 
             public PostButton(APINewsPost post)
             {
+                this.post = post;
+
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
                 Child = text = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 12))
@@ -113,11 +117,13 @@ namespace osu.Game.Overlays.News.Sidebar
             }
 
             [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider)
+            private void load(OverlayColourProvider colourProvider, GameHost host)
             {
                 IdleColour = colourProvider.Light2;
                 HoverColour = colourProvider.Light1;
-                Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
+
+                TooltipText = "view in browser";
+                Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
             }
         }
 

From 586c5c7365b3d0d0291447fb57b316b1e01b098e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 11:36:53 +0300
Subject: [PATCH 10146/10326] Emulate year changes in the test scene

---
 .../Visual/Online/TestSceneNewsSideBar.cs     | 47 +++++++++++++------
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs  |  5 +-
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index 706de2b310..376c270689 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -10,6 +10,7 @@ using osu.Framework.Testing;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.News.Sidebar;
+using static osu.Game.Overlays.News.Sidebar.YearsPanel;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -18,10 +19,10 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private NewsSidebar sidebar;
+        private TestNewsSidebar sidebar;
 
         [SetUp]
-        public void SetUp() => Schedule(() => Child = sidebar = new NewsSidebar());
+        public void SetUp() => Schedule(() => Child = sidebar = new TestNewsSidebar { YearChanged = onYearChanged });
 
         [Test]
         public void TestMetadataWithNoPosts()
@@ -34,15 +35,17 @@ namespace osu.Game.Tests.Visual.Online
         public void TestYearsPanelVisibility()
         {
             AddUntilStep("Years panel is hidden", () => yearsPanel?.Alpha == 0);
-            AddStep("Add data", () => sidebar.Metadata.Value = metadata);
+            AddStep("Add data", () => sidebar.Metadata.Value = getMetadata(2021));
             AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
         }
 
+        private void onYearChanged(int year) => sidebar.Metadata.Value = getMetadata(year);
+
         private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
 
-        private static readonly APINewsSidebar metadata = new APINewsSidebar
+        private APINewsSidebar getMetadata(int year) => new APINewsSidebar
         {
-            CurrentYear = 2021,
+            CurrentYear = year,
             Years = new[]
             {
                 2021,
@@ -60,47 +63,47 @@ namespace osu.Game.Tests.Visual.Online
                 new APINewsPost
                 {
                     Title = "(Mar) Short title",
-                    PublishedAt = new DateTime(2021, 3, 1)
+                    PublishedAt = new DateTime(year, 3, 1)
                 },
                 new APINewsPost
                 {
                     Title = "(Mar) Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(2021, 3, 1)
+                    PublishedAt = new DateTime(year, 3, 1)
                 },
                 new APINewsPost
                 {
                     Title = "(Mar) Medium title, nothing to see here",
-                    PublishedAt = new DateTime(2021, 3, 1)
+                    PublishedAt = new DateTime(year, 3, 1)
                 },
                 new APINewsPost
                 {
                     Title = "(Feb) Short title",
-                    PublishedAt = new DateTime(2021, 2, 1)
+                    PublishedAt = new DateTime(year, 2, 1)
                 },
                 new APINewsPost
                 {
                     Title = "(Feb) Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(2021, 2, 1)
+                    PublishedAt = new DateTime(year, 2, 1)
                 },
                 new APINewsPost
                 {
                     Title = "(Feb) Medium title, nothing to see here",
-                    PublishedAt = new DateTime(2021, 2, 1)
+                    PublishedAt = new DateTime(year, 2, 1)
                 },
                 new APINewsPost
                 {
                     Title = "Short title",
-                    PublishedAt = new DateTime(2021, 1, 1)
+                    PublishedAt = new DateTime(year, 1, 1)
                 },
                 new APINewsPost
                 {
                     Title = "Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(2021, 1, 1)
+                    PublishedAt = new DateTime(year, 1, 1)
                 },
                 new APINewsPost
                 {
                     Title = "Medium title, nothing to see here",
-                    PublishedAt = new DateTime(2021, 1, 1)
+                    PublishedAt = new DateTime(year, 1, 1)
                 }
             }
         };
@@ -123,5 +126,21 @@ namespace osu.Game.Tests.Visual.Online
             },
             NewsPosts = Array.Empty<APINewsPost>()
         };
+
+        private class TestNewsSidebar : NewsSidebar
+        {
+            public Action<int> YearChanged;
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                Metadata.BindValueChanged(m =>
+                {
+                    foreach (var b in this.ChildrenOfType<YearButton>())
+                        b.Action = () => YearChanged?.Invoke(b.Year);
+                }, true);
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 331a7e10e1..ffdb5cf22e 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -75,12 +75,15 @@ namespace osu.Game.Overlays.News.Sidebar
             }, true);
         }
 
-        private class YearButton : OsuHoverContainer
+        public class YearButton : OsuHoverContainer
         {
+            public int Year { get; }
+
             private readonly bool isCurrent;
 
             public YearButton(int year, bool isCurrent)
             {
+                Year = year;
                 this.isCurrent = isCurrent;
 
                 RelativeSizeAxes = Axes.X;

From 01090de1fd45bfd0d1a1c1b743847d089b521e93 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 11:55:55 +0300
Subject: [PATCH 10147/10326] Fix filenames does not match contained type

---
 .../Visual/Online/TestSceneNewsSidebar.cs     | 146 ++++++++++++++++++
 osu.Game/Overlays/News/Sidebar/NewsSidebar.cs | 103 ++++++++++++
 2 files changed, 249 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
 create mode 100644 osu.Game/Overlays/News/Sidebar/NewsSidebar.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
new file mode 100644
index 0000000000..376c270689
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
@@ -0,0 +1,146 @@
+// Copyright (c) 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;
+using osu.Framework.Testing;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Overlays.News.Sidebar;
+using static osu.Game.Overlays.News.Sidebar.YearsPanel;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsSidebar : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private TestNewsSidebar sidebar;
+
+        [SetUp]
+        public void SetUp() => Schedule(() => Child = sidebar = new TestNewsSidebar { YearChanged = onYearChanged });
+
+        [Test]
+        public void TestMetadataWithNoPosts()
+        {
+            AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
+            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
+        }
+
+        [Test]
+        public void TestYearsPanelVisibility()
+        {
+            AddUntilStep("Years panel is hidden", () => yearsPanel?.Alpha == 0);
+            AddStep("Add data", () => sidebar.Metadata.Value = getMetadata(2021));
+            AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
+        }
+
+        private void onYearChanged(int year) => sidebar.Metadata.Value = getMetadata(year);
+
+        private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
+
+        private APINewsSidebar getMetadata(int year) => new APINewsSidebar
+        {
+            CurrentYear = year,
+            Years = new[]
+            {
+                2021,
+                2020,
+                2019,
+                2018,
+                2017,
+                2016,
+                2015,
+                2014,
+                2013
+            },
+            NewsPosts = new List<APINewsPost>
+            {
+                new APINewsPost
+                {
+                    Title = "(Mar) Short title",
+                    PublishedAt = new DateTime(year, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Mar) Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(year, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Mar) Medium title, nothing to see here",
+                    PublishedAt = new DateTime(year, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Short title",
+                    PublishedAt = new DateTime(year, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(year, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Medium title, nothing to see here",
+                    PublishedAt = new DateTime(year, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Short title",
+                    PublishedAt = new DateTime(year, 1, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(year, 1, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Medium title, nothing to see here",
+                    PublishedAt = new DateTime(year, 1, 1)
+                }
+            }
+        };
+
+        private static readonly APINewsSidebar metadata_with_no_posts = new APINewsSidebar
+        {
+            CurrentYear = 2022,
+            Years = new[]
+            {
+                2022,
+                2021,
+                2020,
+                2019,
+                2018,
+                2017,
+                2016,
+                2015,
+                2014,
+                2013
+            },
+            NewsPosts = Array.Empty<APINewsPost>()
+        };
+
+        private class TestNewsSidebar : NewsSidebar
+        {
+            public Action<int> YearChanged;
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                Metadata.BindValueChanged(m =>
+                {
+                    foreach (var b in this.ChildrenOfType<YearButton>())
+                        b.Action = () => YearChanged?.Invoke(b.Year);
+                }, true);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
new file mode 100644
index 0000000000..b8d283b7e2
--- /dev/null
+++ b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
@@ -0,0 +1,103 @@
+// Copyright (c) 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.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Framework.Graphics.Shapes;
+using osuTK;
+using System.Linq;
+
+namespace osu.Game.Overlays.News.Sidebar
+{
+    public class NewsSidebar : CompositeDrawable
+    {
+        [Cached]
+        public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
+
+        private FillFlowContainer<MonthSection> monthsFlow;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            RelativeSizeAxes = Axes.Y;
+            Width = 250;
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background4
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding
+                    {
+                        Vertical = 20,
+                        Left = 50,
+                        Right = 30
+                    },
+                    Child = new FillFlowContainer
+                    {
+                        Direction = FillDirection.Vertical,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(0, 20),
+                        Children = new Drawable[]
+                        {
+                            new YearsPanel(),
+                            monthsFlow = new FillFlowContainer<MonthSection>
+                            {
+                                AutoSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.X,
+                                Direction = FillDirection.Vertical,
+                                Spacing = new Vector2(0, 10)
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Metadata.BindValueChanged(onMetadataChanged, true);
+        }
+
+        private void onMetadataChanged(ValueChangedEvent<APINewsSidebar> metadata)
+        {
+            monthsFlow.Clear();
+
+            if (metadata.NewValue == null)
+                return;
+
+            var allPosts = metadata.NewValue.NewsPosts;
+
+            if (allPosts?.Any() != true)
+                return;
+
+            var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
+
+            var keys = lookup.Select(kvp => kvp.Key);
+            var sortedKeys = keys.OrderByDescending(k => k).ToList();
+
+            var year = metadata.NewValue.CurrentYear;
+
+            for (int i = 0; i < sortedKeys.Count; i++)
+            {
+                var month = sortedKeys[i];
+                var posts = lookup[month];
+
+                monthsFlow.Add(new MonthSection(month, year, posts)
+                {
+                    IsOpen = { Value = i == 0 }
+                });
+            }
+        }
+    }
+}

From fc6e65b7dbaf9826f3a8a2832fade1a8521fb645 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 12:02:06 +0300
Subject: [PATCH 10148/10326] Delete TestSceneNewsSideBar.cs

---
 .../Visual/Online/TestSceneNewsSideBar.cs     | 146 ------------------
 1 file changed, 146 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
deleted file mode 100644
index 376c270689..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ /dev/null
@@ -1,146 +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.Framework.Allocation;
-using osu.Framework.Testing;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
-using osu.Game.Overlays.News.Sidebar;
-using static osu.Game.Overlays.News.Sidebar.YearsPanel;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneNewsSidebar : OsuTestScene
-    {
-        [Cached]
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        private TestNewsSidebar sidebar;
-
-        [SetUp]
-        public void SetUp() => Schedule(() => Child = sidebar = new TestNewsSidebar { YearChanged = onYearChanged });
-
-        [Test]
-        public void TestMetadataWithNoPosts()
-        {
-            AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
-            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
-        }
-
-        [Test]
-        public void TestYearsPanelVisibility()
-        {
-            AddUntilStep("Years panel is hidden", () => yearsPanel?.Alpha == 0);
-            AddStep("Add data", () => sidebar.Metadata.Value = getMetadata(2021));
-            AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
-        }
-
-        private void onYearChanged(int year) => sidebar.Metadata.Value = getMetadata(year);
-
-        private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
-
-        private APINewsSidebar getMetadata(int year) => new APINewsSidebar
-        {
-            CurrentYear = year,
-            Years = new[]
-            {
-                2021,
-                2020,
-                2019,
-                2018,
-                2017,
-                2016,
-                2015,
-                2014,
-                2013
-            },
-            NewsPosts = new List<APINewsPost>
-            {
-                new APINewsPost
-                {
-                    Title = "(Mar) Short title",
-                    PublishedAt = new DateTime(year, 3, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "(Mar) Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(year, 3, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "(Mar) Medium title, nothing to see here",
-                    PublishedAt = new DateTime(year, 3, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "(Feb) Short title",
-                    PublishedAt = new DateTime(year, 2, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "(Feb) Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(year, 2, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "(Feb) Medium title, nothing to see here",
-                    PublishedAt = new DateTime(year, 2, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "Short title",
-                    PublishedAt = new DateTime(year, 1, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(year, 1, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "Medium title, nothing to see here",
-                    PublishedAt = new DateTime(year, 1, 1)
-                }
-            }
-        };
-
-        private static readonly APINewsSidebar metadata_with_no_posts = new APINewsSidebar
-        {
-            CurrentYear = 2022,
-            Years = new[]
-            {
-                2022,
-                2021,
-                2020,
-                2019,
-                2018,
-                2017,
-                2016,
-                2015,
-                2014,
-                2013
-            },
-            NewsPosts = Array.Empty<APINewsPost>()
-        };
-
-        private class TestNewsSidebar : NewsSidebar
-        {
-            public Action<int> YearChanged;
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                Metadata.BindValueChanged(m =>
-                {
-                    foreach (var b in this.ChildrenOfType<YearButton>())
-                        b.Action = () => YearChanged?.Invoke(b.Year);
-                }, true);
-            }
-        }
-    }
-}

From 555e3e2db30ac722b57a893799e7b8e63ab54550 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 12:02:33 +0300
Subject: [PATCH 10149/10326] Delete NewsSideBar.cs

---
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 103 ------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs

diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
deleted file mode 100644
index b8d283b7e2..0000000000
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Framework.Graphics.Shapes;
-using osuTK;
-using System.Linq;
-
-namespace osu.Game.Overlays.News.Sidebar
-{
-    public class NewsSidebar : CompositeDrawable
-    {
-        [Cached]
-        public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
-
-        private FillFlowContainer<MonthSection> monthsFlow;
-
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            RelativeSizeAxes = Axes.Y;
-            Width = 250;
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background4
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding
-                    {
-                        Vertical = 20,
-                        Left = 50,
-                        Right = 30
-                    },
-                    Child = new FillFlowContainer
-                    {
-                        Direction = FillDirection.Vertical,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Spacing = new Vector2(0, 20),
-                        Children = new Drawable[]
-                        {
-                            new YearsPanel(),
-                            monthsFlow = new FillFlowContainer<MonthSection>
-                            {
-                                AutoSizeAxes = Axes.Y,
-                                RelativeSizeAxes = Axes.X,
-                                Direction = FillDirection.Vertical,
-                                Spacing = new Vector2(0, 10)
-                            }
-                        }
-                    }
-                }
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Metadata.BindValueChanged(onMetadataChanged, true);
-        }
-
-        private void onMetadataChanged(ValueChangedEvent<APINewsSidebar> metadata)
-        {
-            monthsFlow.Clear();
-
-            if (metadata.NewValue == null)
-                return;
-
-            var allPosts = metadata.NewValue.NewsPosts;
-
-            if (allPosts?.Any() != true)
-                return;
-
-            var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
-
-            var keys = lookup.Select(kvp => kvp.Key);
-            var sortedKeys = keys.OrderByDescending(k => k).ToList();
-
-            var year = metadata.NewValue.CurrentYear;
-
-            for (int i = 0; i < sortedKeys.Count; i++)
-            {
-                var month = sortedKeys[i];
-                var posts = lookup[month];
-
-                monthsFlow.Add(new MonthSection(month, year, posts)
-                {
-                    IsOpen = { Value = i == 0 }
-                });
-            }
-        }
-    }
-}

From 0989aa336442e0bb15f8728ed517625320297d7a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 17 May 2021 18:07:50 +0900
Subject: [PATCH 10150/10326] Fix accuracy heatmap points changing colour

---
 osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 88c855d768..cb769c31b8 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -166,7 +166,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
                     var point = new HitPoint(pointType, this)
                     {
-                        Colour = pointType == HitPointType.Hit ? new Color4(102, 255, 204, 255) : new Color4(255, 102, 102, 255)
+                        BaseColour = pointType == HitPointType.Hit ? new Color4(102, 255, 204, 255) : new Color4(255, 102, 102, 255)
                     };
 
                     points[r][c] = point;
@@ -234,6 +234,11 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
         private class HitPoint : Circle
         {
+            /// <summary>
+            /// The base colour which will be lightened/darkened depending on the value of this <see cref="HitPoint"/>.
+            /// </summary>
+            public Color4 BaseColour;
+
             private readonly HitPointType pointType;
             private readonly AccuracyHeatmap heatmap;
 
@@ -284,7 +289,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
                 Alpha = Math.Min(amount / lighten_cutoff, 1);
                 if (pointType == HitPointType.Hit)
-                    Colour = ((Color4)Colour).Lighten(Math.Max(0, amount - lighten_cutoff));
+                    Colour = BaseColour.Lighten(Math.Max(0, amount - lighten_cutoff));
             }
         }
 

From 0d7a349500bfa123cf449b66b4b08f46b8a8963b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 17 May 2021 18:16:09 +0900
Subject: [PATCH 10151/10326] Exclude interfaces from skinnable types

---
 osu.Game/Skinning/Editor/SkinComponentToolbox.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 59420bfc87..4097624400 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -57,7 +57,10 @@ namespace osu.Game.Skinning.Editor
                 Spacing = new Vector2(20)
             };
 
-            var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableDrawable).IsAssignableFrom(t)).ToArray();
+            var skinnableTypes = typeof(OsuGame).Assembly.GetTypes()
+                                                .Where(t => !t.IsInterface)
+                                                .Where(t => typeof(ISkinnableDrawable).IsAssignableFrom(t))
+                                                .ToArray();
 
             foreach (var type in skinnableTypes)
             {

From 1f3ae901ce979247c717245dc204da822a9c431f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 18:22:24 +0900
Subject: [PATCH 10152/10326] Expose `DrawableRuleset` for consupmtion by HUD
 components

---
 osu.Game/Screens/Play/Player.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ac0c921ccf..7d3afe3043 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -198,6 +198,7 @@ namespace osu.Game.Screens.Play
                 LocalUserPlaying.BindTo(osuGame.LocalUserPlaying);
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
+            dependencies.CacheAs(DrawableRuleset);
 
             ScoreProcessor = ruleset.CreateScoreProcessor();
             ScoreProcessor.ApplyBeatmap(playableBeatmap);

From da0913ca2d6771049c6fc8118f82dad5d36e7142 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 18:26:15 +0900
Subject: [PATCH 10153/10326] Make `SongProgress` a skinnable component

---
 .../Visual/Gameplay/TestSceneAutoplay.cs      |  2 +-
 osu.Game/Screens/Play/Player.cs               |  5 ---
 osu.Game/Screens/Play/SongProgress.cs         | 42 ++++++++++++-------
 osu.Game/Skinning/DefaultSkin.cs              |  5 +++
 osu.Game/Skinning/HUDSkinComponents.cs        |  1 +
 osu.Game/Skinning/LegacySkin.cs               |  2 +
 6 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index e198a8504b..e47c782bca 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private void seekToBreak(int breakIndex)
         {
             AddStep($"seek to break {breakIndex}", () => Player.GameplayClockContainer.Seek(destBreak().StartTime));
-            AddUntilStep("wait for seek to complete", () => Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= destBreak().StartTime);
+            AddUntilStep("wait for seek to complete", () => Player.DrawableRuleset.FrameStableClock.CurrentTime >= destBreak().StartTime);
 
             BreakPeriod destBreak() => Beatmap.Value.Beatmap.Breaks.ElementAt(breakIndex);
         }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7d3afe3043..186e73ee4c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -358,11 +358,6 @@ namespace osu.Game.Screens.Play
                             AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded },
                             IsCounting = false
                         },
-                        RequestSeek = time =>
-                        {
-                            GameplayClockContainer.Seek(time);
-                            GameplayClockContainer.Start();
-                        },
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre
                     },
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 4a0787bfae..dc349ddcc6 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -14,10 +14,11 @@ using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play
 {
-    public class SongProgress : OverlayContainer
+    public class SongProgress : OverlayContainer, ISkinnableDrawable
     {
         private const int info_height = 20;
         private const int bottom_bar_height = 5;
@@ -39,9 +40,6 @@ namespace osu.Game.Screens.Play
 
         public readonly Bindable<bool> ShowGraph = new Bindable<bool>();
 
-        //TODO: this isn't always correct (consider mania where a non-last object may last for longer than the last in the list).
-        private double lastHitTime => objects.Last().GetEndTime() + 1;
-
         public override bool HandleNonPositionalInput => AllowSeeking.Value;
         public override bool HandlePositionalInput => AllowSeeking.Value;
 
@@ -49,6 +47,9 @@ namespace osu.Game.Screens.Play
 
         private double firstHitTime => objects.First().StartTime;
 
+        //TODO: this isn't always correct (consider mania where a non-last object may last for longer than the last in the list).
+        private double lastHitTime => objects.Last().GetEndTime() + 1;
+
         private IEnumerable<HitObject> objects;
 
         public IEnumerable<HitObject> Objects
@@ -67,10 +68,12 @@ namespace osu.Game.Screens.Play
 
         public IClock ReferenceClock;
 
-        private IClock gameplayClock;
-
         public SongProgress()
         {
+            RelativeSizeAxes = Axes.X;
+            Anchor = Anchor.BottomRight;
+            Origin = Anchor.BottomRight;
+
             Children = new Drawable[]
             {
                 new SongProgressDisplay
@@ -96,20 +99,34 @@ namespace osu.Game.Screens.Play
                         {
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft,
-                            OnSeek = time => RequestSeek?.Invoke(time),
+                            OnSeek = seek,
                         },
                     }
                 },
             };
         }
 
+        private void seek(double time)
+        {
+            if (gameplayClock == null)
+                return;
+
+            // TODO: implement
+        }
+
+        [Resolved(canBeNull: true)]
+        private GameplayClock gameplayClock { get; set; }
+
         [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, GameplayClock clock, OsuConfigManager config)
+        private void load(OsuColour colours, OsuConfigManager config, DrawableRuleset drawableRuleset)
         {
             base.LoadComplete();
 
-            if (clock != null)
-                gameplayClock = clock;
+            if (drawableRuleset != null)
+            {
+                AllowSeeking.BindTo(drawableRuleset.HasReplayLoaded);
+                Objects = drawableRuleset.Objects;
+            }
 
             config.BindWith(OsuSetting.ShowProgressGraph, ShowGraph);
 
@@ -124,11 +141,6 @@ namespace osu.Game.Screens.Play
             ShowGraph.BindValueChanged(_ => updateGraphVisibility(), true);
         }
 
-        public void BindDrawableRuleset(DrawableRuleset drawableRuleset)
-        {
-            AllowSeeking.BindTo(drawableRuleset.HasReplayLoaded);
-        }
-
         protected override void PopIn()
         {
             this.FadeIn(500, Easing.OutQuint);
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 9b4e32531a..d13ddcf22b 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Extensions;
 using osu.Game.IO;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
@@ -86,6 +87,7 @@ namespace osu.Game.Skinning
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreCounter)),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.SongProgress)),
                                 }
                             };
 
@@ -109,6 +111,9 @@ namespace osu.Game.Skinning
 
                         case HUDSkinComponents.HealthDisplay:
                             return new DefaultHealthDisplay();
+
+                        case HUDSkinComponents.SongProgress:
+                            return new SongProgress();
                     }
 
                     break;
diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index a345e060e5..2e6c3a9937 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -9,5 +9,6 @@ namespace osu.Game.Skinning
         ScoreCounter,
         AccuracyCounter,
         HealthDisplay,
+        SongProgress,
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index a6f8f45c0f..6c8d6ee45a 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -17,6 +17,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osuTK.Graphics;
 
@@ -350,6 +351,7 @@ namespace osu.Game.Skinning
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreCounter)) ?? new DefaultScoreCounter(),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)) ?? new DefaultAccuracyCounter(),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)) ?? new DefaultHealthDisplay(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.SongProgress)) ?? new SongProgress(),
                                 }
                             };
 

From 0c433cda861a09d3a7e6ebaeb7fa4a15645cd48a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 18:26:30 +0900
Subject: [PATCH 10154/10326] Update `HUDOverlay` logic to add automatic layout
 for bottom-aligned components

---
 osu.Game/Screens/Play/HUDOverlay.cs | 103 ++++++++++++----------------
 1 file changed, 43 insertions(+), 60 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index a10e91dae8..dcee64ff0d 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -35,8 +35,12 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public float TopScoringElementsHeight { get; private set; }
 
+        /// <summary>
+        /// The total height of all the bottom of screen scoring elements.
+        /// </summary>
+        public float BottomScoringElementsHeight { get; private set; }
+
         public readonly KeyCounterDisplay KeyCounter;
-        public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
@@ -59,8 +63,6 @@ namespace osu.Game.Screens.Play
 
         private static bool hasShownNotificationOnce;
 
-        public Action<double> RequestSeek;
-
         private readonly FillFlowContainer bottomRightElements;
         private readonly FillFlowContainer topRightElements;
 
@@ -85,45 +87,22 @@ namespace osu.Game.Screens.Play
                 visibilityContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = new GridContainer
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        Content = new[]
+                        mainComponents = new SkinnableTargetContainer(SkinnableTarget.MainHUDComponents)
                         {
-                            new Drawable[]
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
                             {
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Children = new Drawable[]
-                                    {
-                                        mainComponents = new SkinnableTargetContainer(SkinnableTarget.MainHUDComponents)
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                        },
-                                        new Container
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Children = new Drawable[]
-                                            {
-                                                // still need to be migrated; a bit more involved.
-                                                new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
-                                            }
-                                        },
-                                    }
-                                },
-                            },
-                            new Drawable[]
-                            {
-                                Progress = CreateProgress(),
+                                // still need to be migrated; a bit more involved.
+                                new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
                             }
                         },
-                        RowDimensions = new[]
-                        {
-                            new Dimension(),
-                            new Dimension(GridSizeMode.AutoSize)
-                        }
-                    },
+                    }
                 },
                 topRightElements = new FillFlowContainer
                 {
@@ -164,10 +143,6 @@ namespace osu.Game.Screens.Play
             if (drawableRuleset != null)
             {
                 BindDrawableRuleset(drawableRuleset);
-
-                Progress.Objects = drawableRuleset.Objects;
-                Progress.RequestSeek = time => RequestSeek(time);
-                Progress.ReferenceClock = drawableRuleset.FrameStableClock;
             }
 
             ModDisplay.Current.Value = mods;
@@ -206,26 +181,43 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            Vector2 lowestScreenSpace = Vector2.Zero;
+            Vector2? lowestTopScreenSpace = null;
+            Vector2? highestBottomScreenSpace = null;
 
             // LINQ cast can be removed when IDrawable interface includes Anchor / RelativeSizeAxes.
             foreach (var element in mainComponents.Components.Cast<Drawable>())
             {
                 // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
-                if (!element.Anchor.HasFlagFast(Anchor.TopRight) && !element.RelativeSizeAxes.HasFlagFast(Axes.X))
+                if (!element.RelativeSizeAxes.HasFlagFast(Axes.X))
                     continue;
 
-                // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
-                if (element is LegacyHealthDisplay)
-                    continue;
+                if (element.Anchor.HasFlagFast(Anchor.TopRight))
+                {
+                    // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
+                    if (element is LegacyHealthDisplay)
+                        continue;
 
-                var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;
-                if (bottomRight.Y > lowestScreenSpace.Y)
-                    lowestScreenSpace = bottomRight;
+                    var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;
+                    if (lowestTopScreenSpace == null || bottomRight.Y > lowestTopScreenSpace.Value.Y)
+                        lowestTopScreenSpace = bottomRight;
+                }
+                else if (element.Anchor.HasFlagFast(Anchor.y2))
+                {
+                    var topLeft = element.ScreenSpaceDrawQuad.TopLeft;
+                    if (highestBottomScreenSpace == null || topLeft.Y < highestBottomScreenSpace.Value.Y)
+                        highestBottomScreenSpace = topLeft;
+                }
             }
 
-            topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestScreenSpace).Y;
-            bottomRightElements.Y = -Progress.Height;
+            if (lowestTopScreenSpace.HasValue)
+                topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestTopScreenSpace.Value).Y;
+            else
+                topRightElements.Y = 0;
+
+            if (highestBottomScreenSpace.HasValue)
+                bottomRightElements.Y = BottomScoringElementsHeight = -(DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y);
+            else
+                bottomRightElements.Y = 0;
         }
 
         private void updateVisibility()
@@ -281,8 +273,6 @@ namespace osu.Game.Screens.Play
             (drawableRuleset as ICanAttachKeyCounter)?.Attach(KeyCounter);
 
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
-
-            Progress.BindDrawableRuleset(drawableRuleset);
         }
 
         protected FailingLayer CreateFailingLayer() => new FailingLayer
@@ -296,13 +286,6 @@ namespace osu.Game.Screens.Play
             Origin = Anchor.BottomRight,
         };
 
-        protected SongProgress CreateProgress() => new SongProgress
-        {
-            Anchor = Anchor.BottomLeft,
-            Origin = Anchor.BottomLeft,
-            RelativeSizeAxes = Axes.X,
-        };
-
         protected HoldForMenuButton CreateHoldForMenuButton() => new HoldForMenuButton
         {
             Anchor = Anchor.BottomRight,

From b80768b44afc84f0d4487afdbe308c62f5ccc3a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 18:41:56 +0900
Subject: [PATCH 10155/10326] Hook up seeking flow

---
 osu.Game/Screens/Play/Player.cs       |  6 ++++++
 osu.Game/Screens/Play/SongProgress.cs | 25 +++++++++++--------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 186e73ee4c..d5807f6e18 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -562,6 +562,12 @@ namespace osu.Game.Screens.Play
             updateSampleDisabledState();
         }
 
+        /// <summary>
+        /// Seek to a specific time in gameplay.
+        /// </summary>
+        /// <param name="time">The destination time to seek to.</param>
+        public void Seek(double time) => GameplayClockContainer.Seek(time);
+
         /// <summary>
         /// Restart gameplay via a parent <see cref="PlayerLoader"/>.
         /// <remarks>This can be called from a child screen in order to trigger the restart process.</remarks>
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index dc349ddcc6..f95e6520cc 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -66,7 +66,13 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public IClock ReferenceClock;
+        [Resolved(canBeNull: true)]
+        private Player player { get; set; }
+
+        [Resolved(canBeNull: true)]
+        private GameplayClock gameplayClock { get; set; }
+
+        private IClock referenceClock;
 
         public SongProgress()
         {
@@ -99,24 +105,13 @@ namespace osu.Game.Screens.Play
                         {
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft,
-                            OnSeek = seek,
+                            OnSeek = time => player?.Seek(time),
                         },
                     }
                 },
             };
         }
 
-        private void seek(double time)
-        {
-            if (gameplayClock == null)
-                return;
-
-            // TODO: implement
-        }
-
-        [Resolved(canBeNull: true)]
-        private GameplayClock gameplayClock { get; set; }
-
         [BackgroundDependencyLoader(true)]
         private void load(OsuColour colours, OsuConfigManager config, DrawableRuleset drawableRuleset)
         {
@@ -125,6 +120,8 @@ namespace osu.Game.Screens.Play
             if (drawableRuleset != null)
             {
                 AllowSeeking.BindTo(drawableRuleset.HasReplayLoaded);
+
+                referenceClock = drawableRuleset.FrameStableClock;
                 Objects = drawableRuleset.Objects;
             }
 
@@ -159,7 +156,7 @@ namespace osu.Game.Screens.Play
                 return;
 
             double gameplayTime = gameplayClock?.CurrentTime ?? Time.Current;
-            double frameStableTime = ReferenceClock?.CurrentTime ?? gameplayTime;
+            double frameStableTime = referenceClock?.CurrentTime ?? gameplayTime;
 
             double progress = Math.Min(1, (frameStableTime - firstHitTime) / (lastHitTime - firstHitTime));
 

From ecf70c1707b300d56c16e7cc171fa2b527284ff0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 18:55:18 +0900
Subject: [PATCH 10156/10326] Remove unnecessary container

---
 osu.Game/Screens/Play/SongProgress.cs | 58 +++++++++------------------
 1 file changed, 19 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index f95e6520cc..b7939b5e75 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -82,32 +82,26 @@ namespace osu.Game.Screens.Play
 
             Children = new Drawable[]
             {
-                new SongProgressDisplay
+                info = new SongProgressInfo
                 {
-                    Children = new Drawable[]
-                    {
-                        info = new SongProgressInfo
-                        {
-                            Origin = Anchor.BottomLeft,
-                            Anchor = Anchor.BottomLeft,
-                            RelativeSizeAxes = Axes.X,
-                            Height = info_height,
-                        },
-                        graph = new SongProgressGraph
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Origin = Anchor.BottomLeft,
-                            Anchor = Anchor.BottomLeft,
-                            Height = graph_height,
-                            Margin = new MarginPadding { Bottom = bottom_bar_height },
-                        },
-                        bar = new SongProgressBar(bottom_bar_height, graph_height, handle_size)
-                        {
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            OnSeek = time => player?.Seek(time),
-                        },
-                    }
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.X,
+                    Height = info_height,
+                },
+                graph = new SongProgressGraph
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    Height = graph_height,
+                    Margin = new MarginPadding { Bottom = bottom_bar_height },
+                },
+                bar = new SongProgressBar(bottom_bar_height, graph_height, handle_size)
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    OnSeek = time => player?.Seek(time),
                 },
             };
         }
@@ -188,19 +182,5 @@ namespace osu.Game.Screens.Play
             float finalMargin = bottom_bar_height + (AllowSeeking.Value ? handle_size.Y : 0) + (ShowGraph.Value ? graph_height : 0);
             info.TransformTo(nameof(info.Margin), new MarginPadding { Bottom = finalMargin }, transition_duration, Easing.In);
         }
-
-        public class SongProgressDisplay : Container
-        {
-            public SongProgressDisplay()
-            {
-                // TODO: move actual implementation into this.
-                // exists for skin customisation purposes (interface should be added to this container).
-
-                Masking = true;
-                RelativeSizeAxes = Axes.Both;
-                Anchor = Anchor.BottomCentre;
-                Origin = Anchor.BottomCentre;
-            }
-        }
     }
 }

From 60f3e628bcdfbf76602444f83ffa9577ef756f46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 19:05:22 +0900
Subject: [PATCH 10157/10326] Fix song progress being interactable inside
 toolbox button

---
 osu.Game/Skinning/Editor/SkinComponentToolbox.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 59420bfc87..acadaa3b74 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -92,6 +92,9 @@ namespace osu.Game.Skinning.Editor
 
         private class ToolboxComponentButton : OsuButton
         {
+            protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => false;
+            public override bool PropagateNonPositionalInputSubTree => false;
+
             private readonly Drawable component;
 
             public Action<Type> RequestPlacement;

From 42d2711dc6ca0e6cac28bd70c95d4d75272be9b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 19:29:59 +0900
Subject: [PATCH 10158/10326] Use `ShouldBeConsideredForInput` instead of
 `ReceivePositionalInputAtSubTree`

---
 osu.Game/Skinning/Editor/SkinComponentToolbox.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index acadaa3b74..471ed9c6ec 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -92,7 +92,8 @@ namespace osu.Game.Skinning.Editor
 
         private class ToolboxComponentButton : OsuButton
         {
-            protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => false;
+            protected override bool ShouldBeConsideredForInput(Drawable child) => false;
+
             public override bool PropagateNonPositionalInputSubTree => false;
 
             private readonly Drawable component;

From 7137315fa7612f02bbd963e55e6b2c6ac512b892 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 19:46:50 +0900
Subject: [PATCH 10159/10326] Remove `HitErrorDisplay` container and hook up
 data

---
 osu.Game/Screens/Play/HUD/HitErrorDisplay.cs  | 127 ------------------
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    |  15 ++-
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs |   4 +-
 .../Play/HUD/HitErrorMeters/HitErrorMeter.cs  |  11 +-
 osu.Game/Screens/Play/HUDOverlay.cs           |  18 +--
 5 files changed, 20 insertions(+), 155 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/HitErrorDisplay.cs

diff --git a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
deleted file mode 100644
index a24d9c10cb..0000000000
--- a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
+++ /dev/null
@@ -1,127 +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;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Configuration;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD.HitErrorMeters;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public class HitErrorDisplay : Container<HitErrorMeter>
-    {
-        private const int fade_duration = 200;
-        private const int margin = 10;
-
-        private readonly Bindable<ScoreMeterType> type = new Bindable<ScoreMeterType>();
-
-        private readonly HitWindows hitWindows;
-
-        public HitErrorDisplay(HitWindows hitWindows)
-        {
-            this.hitWindows = hitWindows;
-
-            RelativeSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            config.BindWith(OsuSetting.ScoreMeter, type);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            type.BindValueChanged(typeChanged, true);
-        }
-
-        private void typeChanged(ValueChangedEvent<ScoreMeterType> type)
-        {
-            Children.ForEach(c => c.FadeOut(fade_duration, Easing.OutQuint));
-
-            if (hitWindows == null)
-                return;
-
-            switch (type.NewValue)
-            {
-                case ScoreMeterType.HitErrorBoth:
-                    createBar(Anchor.CentreLeft);
-                    createBar(Anchor.CentreRight);
-                    break;
-
-                case ScoreMeterType.HitErrorLeft:
-                    createBar(Anchor.CentreLeft);
-                    break;
-
-                case ScoreMeterType.HitErrorRight:
-                    createBar(Anchor.CentreRight);
-                    break;
-
-                case ScoreMeterType.HitErrorBottom:
-                    createBar(Anchor.BottomCentre);
-                    break;
-
-                case ScoreMeterType.ColourBoth:
-                    createColour(Anchor.CentreLeft);
-                    createColour(Anchor.CentreRight);
-                    break;
-
-                case ScoreMeterType.ColourLeft:
-                    createColour(Anchor.CentreLeft);
-                    break;
-
-                case ScoreMeterType.ColourRight:
-                    createColour(Anchor.CentreRight);
-                    break;
-
-                case ScoreMeterType.ColourBottom:
-                    createColour(Anchor.BottomCentre);
-                    break;
-            }
-        }
-
-        private void createBar(Anchor anchor)
-        {
-            bool rightAligned = (anchor & Anchor.x2) > 0;
-            bool bottomAligned = (anchor & Anchor.y2) > 0;
-
-            var display = new BarHitErrorMeter(hitWindows, rightAligned)
-            {
-                Margin = new MarginPadding(margin),
-                Anchor = anchor,
-                Origin = bottomAligned ? Anchor.CentreLeft : anchor,
-                Alpha = 0,
-                Rotation = bottomAligned ? 270 : 0
-            };
-
-            completeDisplayLoading(display);
-        }
-
-        private void createColour(Anchor anchor)
-        {
-            bool bottomAligned = (anchor & Anchor.y2) > 0;
-
-            var display = new ColourHitErrorMeter(hitWindows)
-            {
-                Margin = new MarginPadding(margin),
-                Anchor = anchor,
-                Origin = bottomAligned ? Anchor.CentreLeft : anchor,
-                Alpha = 0,
-                Rotation = bottomAligned ? 270 : 0
-            };
-
-            completeDisplayLoading(display);
-        }
-
-        private void completeDisplayLoading(HitErrorMeter display)
-        {
-            Add(display);
-            display.FadeInFromZero(fade_duration, Easing.OutQuint);
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 0e147f9238..c303f3889d 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -43,10 +43,10 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         private double maxHitWindow;
 
-        public BarHitErrorMeter(HitWindows hitWindows, bool rightAligned = false)
-            : base(hitWindows)
+        public BarHitErrorMeter()
         {
-            alignment = rightAligned ? Anchor.x0 : Anchor.x2;
+            // todo: investigate.
+            alignment = false ? Anchor.x0 : Anchor.x2;
 
             AutoSizeAxes = Axes.Both;
         }
@@ -152,14 +152,17 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             var windows = HitWindows.GetAllAvailableWindows().ToArray();
 
-            maxHitWindow = windows.First().length;
+            // max to avoid div-by-zero.
+            maxHitWindow = Math.Max(1, windows.First().length);
 
             for (var i = 0; i < windows.Length; i++)
             {
                 var (result, length) = windows[i];
 
-                colourBarsEarly.Add(createColourBar(result, (float)(length / maxHitWindow), i == 0));
-                colourBarsLate.Add(createColourBar(result, (float)(length / maxHitWindow), i == 0));
+                var hitWindow = (float)(length / maxHitWindow);
+
+                colourBarsEarly.Add(createColourBar(result, hitWindow, i == 0));
+                colourBarsLate.Add(createColourBar(result, hitWindow, i == 0));
             }
 
             // a little nub to mark the centre point.
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 465439cf19..0eb2367f73 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -19,8 +18,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         private readonly JudgementFlow judgementsFlow;
 
-        public ColourHitErrorMeter(HitWindows hitWindows)
-            : base(hitWindows)
+        public ColourHitErrorMeter()
         {
             AutoSizeAxes = Axes.Both;
             InternalChild = judgementsFlow = new JudgementFlow();
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index 37e9ea43c5..b0f9928b13 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
@@ -6,13 +6,15 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
-    public abstract class HitErrorMeter : CompositeDrawable
+    public abstract class HitErrorMeter : CompositeDrawable, ISkinnableDrawable
     {
-        protected readonly HitWindows HitWindows;
+        protected HitWindows HitWindows { get; private set; }
 
         [Resolved]
         private ScoreProcessor processor { get; set; }
@@ -20,9 +22,10 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         [Resolved]
         private OsuColour colours { get; set; }
 
-        protected HitErrorMeter(HitWindows hitWindows)
+        [BackgroundDependencyLoader(true)]
+        private void load(DrawableRuleset drawableRuleset)
         {
-            HitWindows = hitWindows;
+            HitWindows = drawableRuleset?.FirstAvailableHitWindows ?? HitWindows.Empty;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index dcee64ff0d..ab5b01cab6 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -87,22 +87,10 @@ namespace osu.Game.Screens.Play
                 visibilityContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    Child = mainComponents = new SkinnableTargetContainer(SkinnableTarget.MainHUDComponents)
                     {
-                        mainComponents = new SkinnableTargetContainer(SkinnableTarget.MainHUDComponents)
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
-                            {
-                                // still need to be migrated; a bit more involved.
-                                new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
-                            }
-                        },
-                    }
+                        RelativeSizeAxes = Axes.Both,
+                    },
                 },
                 topRightElements = new FillFlowContainer
                 {

From 5d5b1e1f0e441de05c7c5fda27399d05a84415f9 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 8 May 2021 11:00:22 +0200
Subject: [PATCH 10160/10326] Add StableImportManager

---
 osu.Game/Database/StableImportManager.cs      | 92 +++++++++++++++++++
 .../StableDirectorySelectScreen.cs            | 42 +++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 osu.Game/Database/StableImportManager.cs
 create mode 100644 osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
new file mode 100644
index 0000000000..46c6aab2fe
--- /dev/null
+++ b/osu.Game/Database/StableImportManager.cs
@@ -0,0 +1,92 @@
+// Copyright (c) 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.Text;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Collections;
+using osu.Game.IO;
+using osu.Game.Overlays.Settings.Sections.Maintenance;
+using osu.Game.Scoring;
+using osu.Game.Skinning;
+
+namespace osu.Game.Database
+{
+    public class StableImportManager : Component
+    {
+        [Resolved]
+        private SkinManager skins { get; set; }
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Resolved]
+        private ScoreManager scores { get; set; }
+
+        [Resolved]
+        private CollectionManager collections { get; set; }
+
+        [Resolved]
+        private OsuGame game { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private DesktopGameHost desktopGameHost { get; set; }
+
+        private StableStorage cachedStorage;
+
+        public async Task ImportFromStableAsync(StableContent content)
+        {
+            //var stableStorage = await getStableStorage().ConfigureAwait(false);
+            var importTasks = new List<Task>();
+
+            if (content.HasFlagFast(StableContent.Beatmaps))
+                importTasks.Add(beatmaps.ImportFromStableAsync());
+
+            if (content.HasFlagFast(StableContent.Collections))
+                importTasks.Add(collections.ImportFromStableAsync());
+
+            if (content.HasFlagFast(StableContent.Scores))
+                importTasks.Add(scores.ImportFromStableAsync());
+
+            if (content.HasFlagFast(StableContent.Skins))
+                importTasks.Add(skins.ImportFromStableAsync());
+
+            await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
+        }
+
+        private async Task<StableStorage> getStableStorage()
+        {
+            var stableStorage = game.GetStorageForStableInstall();
+            if (stableStorage != null)
+                return stableStorage;
+
+            if (cachedStorage != null)
+                return cachedStorage;
+
+            var taskCompletionSource = new TaskCompletionSource<string>();
+            Schedule(() => game.PerformFromScreen(t => t.Push(new StableDirectorySelectScreen(taskCompletionSource))));
+            var stablePath = await taskCompletionSource.Task.ConfigureAwait(false);
+
+            return cachedStorage = new StableStorage(stablePath, desktopGameHost);
+        }
+
+    }
+
+    [Flags]
+    public enum StableContent
+    {
+        Beatmaps = 0x1,
+        Scores = 0x2,
+        Skins = 0x3,
+        Collections = 0x4,
+        All = Beatmaps | Scores | Skins | Collections
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
new file mode 100644
index 0000000000..d935bcf526
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.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.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using osu.Framework.Screens;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class StableDirectorySelectScreen : DirectorySelectScreen
+    {
+        private readonly TaskCompletionSource<string> taskCompletionSource;
+
+        protected override bool IsValidDirectory(DirectoryInfo info) => info?.GetFiles("osu!.*.cfg").Any() ?? false;
+
+        protected override OsuSpriteText CreateHeader() => new OsuSpriteText
+        {
+            Text = "Please select stable location",
+            Font = OsuFont.Default.With(size: 40)
+        };
+
+        public StableDirectorySelectScreen(TaskCompletionSource<string> taskCompletionSource)
+        {
+            this.taskCompletionSource = taskCompletionSource;
+        }
+
+        protected override void OnSelection(DirectoryInfo directory)
+        { 
+            taskCompletionSource.TrySetResult(directory.FullName);
+            this.Exit();
+        }
+
+        public override bool OnBackButton()
+        {
+            taskCompletionSource.TrySetCanceled();
+            return base.OnBackButton();
+        }
+    }
+}

From 851e33fd1542c21dea6717c4416db71ab1866f36 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 9 May 2021 17:12:58 +0200
Subject: [PATCH 10161/10326] Hook up  StableImportManager.

---
 osu.Game/Collections/CollectionManager.cs     | 12 ++++-----
 osu.Game/Database/ArchiveModelManager.cs      |  5 +---
 osu.Game/Database/StableImportManager.cs      | 25 ++++++++++---------
 osu.Game/OsuGame.cs                           |  4 +++
 .../Sections/Maintenance/GeneralSettings.cs   | 19 +++++++-------
 osu.Game/Screens/Select/SongSelect.cs         | 13 +++-------
 6 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 9723409c79..fbd12cf672 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
+using osu.Game.IO;
 using osu.Game.IO.Legacy;
 using osu.Game.Overlays.Notifications;
 
@@ -38,8 +39,6 @@ namespace osu.Game.Collections
 
         public readonly BindableList<BeatmapCollection> Collections = new BindableList<BeatmapCollection>();
 
-        public bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
-
         [Resolved]
         private GameHost host { get; set; }
 
@@ -104,17 +103,16 @@ namespace osu.Game.Collections
         /// <summary>
         /// This is a temporary method and will likely be replaced by a full-fledged (and more correctly placed) migration process in the future.
         /// </summary>
-        public Task ImportFromStableAsync()
+        public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-            var stable = GetStableStorage?.Invoke();
 
-            if (stable == null)
+            if (stableStorage == null)
             {
                 Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
                 return Task.CompletedTask;
             }
 
-            if (!stable.Exists(database_name))
+            if (!stableStorage.Exists(database_name))
             {
                 // This handles situations like when the user does not have a collections.db file
                 Logger.Log($"No {database_name} available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
@@ -123,7 +121,7 @@ namespace osu.Game.Collections
 
             return Task.Run(async () =>
             {
-                using (var stream = stable.GetStream(database_name))
+                using (var stream = stableStorage.GetStream(database_name))
                     await Import(stream).ConfigureAwait(false);
             });
         }
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index e0f80d2743..38a6af4654 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -81,8 +81,6 @@ namespace osu.Game.Database
 
         public virtual IEnumerable<string> HandledExtensions => new[] { ".zip" };
 
-        public virtual bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
-
         protected readonly FileStore Files;
 
         protected readonly IDatabaseContextFactory ContextFactory;
@@ -700,9 +698,8 @@ namespace osu.Game.Database
         /// <summary>
         /// This is a temporary method and will likely be replaced by a full-fledged (and more correctly placed) migration process in the future.
         /// </summary>
-        public Task ImportFromStableAsync()
+        public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-            var stableStorage = GetStableStorage?.Invoke();
 
             if (stableStorage == null)
             {
diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 46c6aab2fe..8baf03b7a3 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -3,9 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
@@ -19,7 +18,7 @@ using osu.Game.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Database
-{
+{    
     public class StableImportManager : Component
     {
         [Resolved]
@@ -42,22 +41,24 @@ namespace osu.Game.Database
 
         private StableStorage cachedStorage;
 
+        public bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
+
         public async Task ImportFromStableAsync(StableContent content)
         {
-            //var stableStorage = await getStableStorage().ConfigureAwait(false);
+            var stableStorage = await getStableStorage().ConfigureAwait(false);
             var importTasks = new List<Task>();
 
             if (content.HasFlagFast(StableContent.Beatmaps))
-                importTasks.Add(beatmaps.ImportFromStableAsync());
+                importTasks.Add(beatmaps.ImportFromStableAsync(stableStorage));
 
             if (content.HasFlagFast(StableContent.Collections))
-                importTasks.Add(collections.ImportFromStableAsync());
+                importTasks.Add(collections.ImportFromStableAsync(stableStorage));
 
             if (content.HasFlagFast(StableContent.Scores))
-                importTasks.Add(scores.ImportFromStableAsync());
+                importTasks.Add(scores.ImportFromStableAsync(stableStorage));
 
             if (content.HasFlagFast(StableContent.Skins))
-                importTasks.Add(skins.ImportFromStableAsync());
+                importTasks.Add(skins.ImportFromStableAsync(stableStorage));
 
             await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
         }
@@ -83,10 +84,10 @@ namespace osu.Game.Database
     [Flags]
     public enum StableContent
     {
-        Beatmaps = 0x1,
-        Scores = 0x2,
-        Skins = 0x3,
-        Collections = 0x4,
+        Beatmaps = 1,
+        Scores = 2,
+        Skins = 4,
+        Collections = 8,
         All = Beatmaps | Scores | Skins | Collections
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index f860cd8dd2..1cfe8ace43 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -100,6 +100,9 @@ namespace osu.Game
         [Cached]
         private readonly DifficultyRecommender difficultyRecommender = new DifficultyRecommender();
 
+        [Cached]
+        private readonly StableImportManager stableImportManager = new StableImportManager();
+
         [Cached]
         private readonly ScreenshotManager screenshotManager = new ScreenshotManager();
 
@@ -694,6 +697,7 @@ namespace osu.Game
             }, Add, true);
 
             loadComponentSingleFile(difficultyRecommender, Add);
+            loadComponentSingleFile(stableImportManager, Add);
 
             loadComponentSingleFile(screenshotManager, Add);
 
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 848ce381a9..9bd360679e 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
+using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
@@ -29,9 +30,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton undeleteButton;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, DialogOverlay dialogOverlay)
+        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, StableImportManager stableImportManager, DialogOverlay dialogOverlay)
         {
-            if (beatmaps.SupportsImportFromStable)
+            if (stableImportManager.SupportsImportFromStable)
             {
                 Add(importBeatmapsButton = new SettingsButton
                 {
@@ -39,7 +40,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     Action = () =>
                     {
                         importBeatmapsButton.Enabled.Value = false;
-                        beatmaps.ImportFromStableAsync().ContinueWith(t => Schedule(() => importBeatmapsButton.Enabled.Value = true));
+                        stableImportManager.ImportFromStableAsync(StableContent.Beatmaps).ContinueWith(t => Schedule(() => importBeatmapsButton.Enabled.Value = true));
                     }
                 });
             }
@@ -57,7 +58,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (scores.SupportsImportFromStable)
+            if (stableImportManager.SupportsImportFromStable)
             {
                 Add(importScoresButton = new SettingsButton
                 {
@@ -65,7 +66,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     Action = () =>
                     {
                         importScoresButton.Enabled.Value = false;
-                        scores.ImportFromStableAsync().ContinueWith(t => Schedule(() => importScoresButton.Enabled.Value = true));
+                        stableImportManager.ImportFromStableAsync(StableContent.Scores).ContinueWith(t => Schedule(() => importScoresButton.Enabled.Value = true));
                     }
                 });
             }
@@ -83,7 +84,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (skins.SupportsImportFromStable)
+            if (stableImportManager.SupportsImportFromStable)
             {
                 Add(importSkinsButton = new SettingsButton
                 {
@@ -91,7 +92,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     Action = () =>
                     {
                         importSkinsButton.Enabled.Value = false;
-                        skins.ImportFromStableAsync().ContinueWith(t => Schedule(() => importSkinsButton.Enabled.Value = true));
+                        stableImportManager.ImportFromStableAsync(StableContent.Skins).ContinueWith(t => Schedule(() => importSkinsButton.Enabled.Value = true));
                     }
                 });
             }
@@ -111,7 +112,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
             if (collectionManager != null)
             {
-                if (collectionManager.SupportsImportFromStable)
+                if (stableImportManager.SupportsImportFromStable)
                 {
                     Add(importCollectionsButton = new SettingsButton
                     {
@@ -119,7 +120,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                         Action = () =>
                         {
                             importCollectionsButton.Enabled.Value = false;
-                            collectionManager.ImportFromStableAsync().ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
+                            stableImportManager.ImportFromStableAsync(StableContent.Collections).ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
                         }
                     });
                 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 215700d87c..ff72f36c75 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -22,7 +22,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Select.Options;
-using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -35,9 +34,9 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Game.Collections;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Scoring;
 using System.Diagnostics;
 using osu.Game.Screens.Play;
+using osu.Game.Database;
 
 namespace osu.Game.Screens.Select
 {
@@ -101,7 +100,7 @@ namespace osu.Game.Screens.Select
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores, CollectionManager collections, ManageCollectionsDialog manageCollectionsDialog, DifficultyRecommender recommender)
+        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, StableImportManager stableImportManager, ManageCollectionsDialog manageCollectionsDialog, DifficultyRecommender recommender)
         {
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
@@ -287,13 +286,7 @@ namespace osu.Game.Screens.Select
                     {
                         dialogOverlay.Push(new ImportFromStablePopup(() =>
                         {
-                            Task.Run(beatmaps.ImportFromStableAsync)
-                                .ContinueWith(_ =>
-                                {
-                                    Task.Run(scores.ImportFromStableAsync);
-                                    Task.Run(collections.ImportFromStableAsync);
-                                }, TaskContinuationOptions.OnlyOnRanToCompletion);
-                            Task.Run(skins.ImportFromStableAsync);
+                            Task.Run(() => stableImportManager.ImportFromStableAsync(StableContent.All));
                         }));
                     }
                 });

From 325a689d6553b9988c7c4378103135d960600376 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 9 May 2021 18:15:21 +0200
Subject: [PATCH 10162/10326] Order imports depending on beatmap imports if any
 is running.

---
 osu.Game/Database/StableImportManager.cs | 25 +++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 8baf03b7a3..24b8aa9f6a 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -48,18 +48,29 @@ namespace osu.Game.Database
             var stableStorage = await getStableStorage().ConfigureAwait(false);
             var importTasks = new List<Task>();
 
+            Task beatmapImportTask = default;
             if (content.HasFlagFast(StableContent.Beatmaps))
-                importTasks.Add(beatmaps.ImportFromStableAsync(stableStorage));
-
-            if (content.HasFlagFast(StableContent.Collections))
-                importTasks.Add(collections.ImportFromStableAsync(stableStorage));
-
-            if (content.HasFlagFast(StableContent.Scores))
-                importTasks.Add(scores.ImportFromStableAsync(stableStorage));
+                importTasks.Add(beatmapImportTask = beatmaps.ImportFromStableAsync(stableStorage));
 
             if (content.HasFlagFast(StableContent.Skins))
                 importTasks.Add(skins.ImportFromStableAsync(stableStorage));
 
+            if (content.HasFlagFast(StableContent.Collections))
+            {
+                if (beatmapImportTask != null)
+                    importTasks.Add(beatmapImportTask.ContinueWith(_ => collections.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
+                else
+                    importTasks.Add(collections.ImportFromStableAsync(stableStorage));
+            }
+
+            if (content.HasFlagFast(StableContent.Scores))
+            {
+                if (beatmapImportTask != null)
+                    importTasks.Add(beatmapImportTask.ContinueWith(_ => scores.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
+                else
+                    importTasks.Add(scores.ImportFromStableAsync(stableStorage));
+            }
+
             await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
         }
 

From 481b0a0125c68f311d4678f910f3cbf47bb3fef1 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 9 May 2021 19:50:43 +0200
Subject: [PATCH 10163/10326] Add StableDirectoryLocationDialog

---
 osu.Game/Database/StableImportManager.cs      | 10 ++---
 .../StableDirectoryLocationDialog.cs          | 38 +++++++++++++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 24b8aa9f6a..09a08920dd 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -9,16 +9,16 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
-using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.IO;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Settings.Sections.Maintenance;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Database
-{    
+{
     public class StableImportManager : Component
     {
         [Resolved]
@@ -34,7 +34,7 @@ namespace osu.Game.Database
         private CollectionManager collections { get; set; }
 
         [Resolved]
-        private OsuGame game { get; set; }
+        private DialogOverlay dialogOverlay { get; set; }
 
         [Resolved(CanBeNull = true)]
         private DesktopGameHost desktopGameHost { get; set; }
@@ -83,8 +83,8 @@ namespace osu.Game.Database
             if (cachedStorage != null)
                 return cachedStorage;
 
-            var taskCompletionSource = new TaskCompletionSource<string>();
-            Schedule(() => game.PerformFromScreen(t => t.Push(new StableDirectorySelectScreen(taskCompletionSource))));
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
+            dialogOverlay.Push(new StableDirectoryLocationDialog(taskCompletionSource));
             var stablePath = await taskCompletionSource.Task.ConfigureAwait(false);
 
             return cachedStorage = new StableStorage(stablePath, desktopGameHost);
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
new file mode 100644
index 0000000000..273ee5dc89
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.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 System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Screens;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class StableDirectoryLocationDialog : PopupDialog
+    {
+        [Resolved]
+        private OsuGame game { get; set; }
+
+        public StableDirectoryLocationDialog(TaskCompletionSource<string> taskCompletionSource)
+        {
+            HeaderText = "Failed to automatically locate a stable installation.";
+            BodyText = "osu! failed to automatically locate a stable installation. Maybe you can tell osu! where it is located?";
+            Icon = FontAwesome.Solid.QuestionCircle;
+
+            Buttons = new PopupDialogButton[]
+            {
+                new PopupDialogOkButton
+                {
+                    Text = "Sure! I know where it is located!",
+                    Action = () => Schedule(() => game.PerformFromScreen(screen => screen.Push(new StableDirectorySelectScreen(taskCompletionSource))))
+                },
+                new PopupDialogCancelButton
+                {
+                    Text = "Actually I don't have osu!stable installed.",
+                    Action = () => taskCompletionSource.TrySetCanceled()
+                }
+            };
+        }
+    }
+}

From 8ba50b185445358419ed2b01508d4859e9273e8c Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 9 May 2021 19:52:26 +0200
Subject: [PATCH 10164/10326] Bring back injected dependency incorrectly marked
 as unused.

---
 osu.Game/Database/StableImportManager.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 09a08920dd..e4c89062f2 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -33,6 +33,9 @@ namespace osu.Game.Database
         [Resolved]
         private CollectionManager collections { get; set; }
 
+        [Resolved]
+        private OsuGame game { get; set; }
+
         [Resolved]
         private DialogOverlay dialogOverlay { get; set; }
 

From a7b740fd1de6cd6211c19d52697925f6b86e79fa Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 9 May 2021 21:29:41 +0200
Subject: [PATCH 10165/10326] Reword ImportFromStablePopup and display the
 popup regardless of whether a stable install is detected.

---
 osu.Game/Database/StableImportManager.cs         | 2 +-
 osu.Game/Screens/Select/ImportFromStablePopup.cs | 2 +-
 osu.Game/Screens/Select/SongSelect.cs            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index e4c89062f2..475077c54e 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Database
                 return cachedStorage;
 
             var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
-            dialogOverlay.Push(new StableDirectoryLocationDialog(taskCompletionSource));
+            Schedule(() => dialogOverlay.Push(new StableDirectoryLocationDialog(taskCompletionSource)));
             var stablePath = await taskCompletionSource.Task.ConfigureAwait(false);
 
             return cachedStorage = new StableStorage(stablePath, desktopGameHost);
diff --git a/osu.Game/Screens/Select/ImportFromStablePopup.cs b/osu.Game/Screens/Select/ImportFromStablePopup.cs
index 8dab83b24c..e3a1505518 100644
--- a/osu.Game/Screens/Select/ImportFromStablePopup.cs
+++ b/osu.Game/Screens/Select/ImportFromStablePopup.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Select
         public ImportFromStablePopup(Action importFromStable)
         {
             HeaderText = @"You have no beatmaps!";
-            BodyText = "An existing copy of osu! was found, though.\nWould you like to import your beatmaps, skins, collections and scores?\nThis will create a second copy of all files on disk.";
+            BodyText = "You can import files from over a stable install, though.\nWould you like to import your beatmaps, skins, collections and scores?\nThis will create a second copy of all files on disk.";
 
             Icon = FontAwesome.Solid.Plane;
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ff72f36c75..d8ad752151 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -281,8 +281,8 @@ namespace osu.Game.Screens.Select
             {
                 Schedule(() =>
                 {
-                    // if we have no beatmaps but osu-stable is found, let's prompt the user to import.
-                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && beatmaps.StableInstallationAvailable)
+                    // if we have no beatmaps, let's prompt the user to import from over a stable install if he has one.
+                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && stableImportManager.SupportsImportFromStable)
                     {
                         dialogOverlay.Push(new ImportFromStablePopup(() =>
                         {

From dabe8bd4c7f358e19edc3ac57130093c170d6d64 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 10 May 2021 12:21:51 +0200
Subject: [PATCH 10166/10326] Fix code inspections and remove now unused code.

---
 osu.Game/Collections/CollectionManager.cs           |  7 -------
 osu.Game/Database/ArchiveModelManager.cs            | 12 ------------
 osu.Game/Database/StableImportManager.cs            | 13 ++++---------
 osu.Game/OsuGame.cs                                 |  4 ----
 .../Maintenance/StableDirectorySelectScreen.cs      |  2 +-
 5 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index fbd12cf672..e707b463cb 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -8,7 +8,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -95,17 +94,11 @@ namespace osu.Game.Collections
         /// </summary>
         public Action<Notification> PostNotification { protected get; set; }
 
-        /// <summary>
-        /// Set a storage with access to an osu-stable install for import purposes.
-        /// </summary>
-        public Func<Storage> GetStableStorage { private get; set; }
-
         /// <summary>
         /// This is a temporary method and will likely be replaced by a full-fledged (and more correctly placed) migration process in the future.
         /// </summary>
         public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-
             if (stableStorage == null)
             {
                 Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 38a6af4654..93e2880ba0 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -10,7 +10,6 @@ using System.Threading.Tasks;
 using Humanizer;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
-using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -667,16 +666,6 @@ namespace osu.Game.Database
 
         #region osu-stable import
 
-        /// <summary>
-        /// Set a storage with access to an osu-stable install for import purposes.
-        /// </summary>
-        public Func<StableStorage> GetStableStorage { private get; set; }
-
-        /// <summary>
-        /// Denotes whether an osu-stable installation is present to perform automated imports from.
-        /// </summary>
-        public bool StableInstallationAvailable => GetStableStorage?.Invoke() != null;
-
         /// <summary>
         /// The relative path from osu-stable's data directory to import items from.
         /// </summary>
@@ -700,7 +689,6 @@ namespace osu.Game.Database
         /// </summary>
         public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-
             if (stableStorage == null)
             {
                 Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 475077c54e..6f8225519d 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -60,18 +60,14 @@ namespace osu.Game.Database
 
             if (content.HasFlagFast(StableContent.Collections))
             {
-                if (beatmapImportTask != null)
-                    importTasks.Add(beatmapImportTask.ContinueWith(_ => collections.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
-                else
-                    importTasks.Add(collections.ImportFromStableAsync(stableStorage));
+                importTasks.Add(beatmapImportTask?.ContinueWith(_ => collections.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion)
+                                ?? collections.ImportFromStableAsync(stableStorage));
             }
 
             if (content.HasFlagFast(StableContent.Scores))
             {
-                if (beatmapImportTask != null)
-                    importTasks.Add(beatmapImportTask.ContinueWith(_ => scores.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
-                else
-                    importTasks.Add(scores.ImportFromStableAsync(stableStorage));
+                importTasks.Add(beatmapImportTask?.ContinueWith(_ => scores.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion)
+                                ?? scores.ImportFromStableAsync(stableStorage));
             }
 
             await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
@@ -92,7 +88,6 @@ namespace osu.Game.Database
 
             return cachedStorage = new StableStorage(stablePath, desktopGameHost);
         }
-
     }
 
     [Flags]
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1cfe8ace43..06e0b6e9bf 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -569,14 +569,11 @@ namespace osu.Game
 
             // todo: all archive managers should be able to be looped here.
             SkinManager.PostNotification = n => notifications.Post(n);
-            SkinManager.GetStableStorage = GetStorageForStableInstall;
 
             BeatmapManager.PostNotification = n => notifications.Post(n);
-            BeatmapManager.GetStableStorage = GetStorageForStableInstall;
             BeatmapManager.PresentImport = items => PresentBeatmap(items.First());
 
             ScoreManager.PostNotification = n => notifications.Post(n);
-            ScoreManager.GetStableStorage = GetStorageForStableInstall;
             ScoreManager.PresentImport = items => PresentScore(items.First());
 
             // make config aware of how to lookup skins for on-screen display purposes.
@@ -693,7 +690,6 @@ namespace osu.Game
             loadComponentSingleFile(new CollectionManager(Storage)
             {
                 PostNotification = n => notifications.Post(n),
-                GetStableStorage = GetStorageForStableInstall
             }, Add, true);
 
             loadComponentSingleFile(difficultyRecommender, Add);
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index d935bcf526..6065122545 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         }
 
         protected override void OnSelection(DirectoryInfo directory)
-        { 
+        {
             taskCompletionSource.TrySetResult(directory.FullName);
             this.Exit();
         }

From e15e8068d3bd33170fd19497f2d2d3a4a73f8365 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 12:09:37 +0200
Subject: [PATCH 10167/10326] Reword StableDirectoryLocationDialog.

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 .../Sections/Maintenance/StableDirectoryLocationDialog.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
index 273ee5dc89..298f7d2433 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         public StableDirectoryLocationDialog(TaskCompletionSource<string> taskCompletionSource)
         {
-            HeaderText = "Failed to automatically locate a stable installation.";
+            HeaderText = "Failed to automatically locate an osu!stable installation.";
             BodyText = "osu! failed to automatically locate a stable installation. Maybe you can tell osu! where it is located?";
             Icon = FontAwesome.Solid.QuestionCircle;
 

From f60dbbfbbd2b53cb0d1207b82333b89bbb77ceef Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 12:10:26 +0200
Subject: [PATCH 10168/10326] Reword import dialogs.

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 .../Sections/Maintenance/StableDirectoryLocationDialog.cs       | 2 +-
 osu.Game/Screens/Select/ImportFromStablePopup.cs                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
index 298f7d2433..904c9deaae 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         public StableDirectoryLocationDialog(TaskCompletionSource<string> taskCompletionSource)
         {
             HeaderText = "Failed to automatically locate an osu!stable installation.";
-            BodyText = "osu! failed to automatically locate a stable installation. Maybe you can tell osu! where it is located?";
+            BodyText = "An existing install could not be located. If you know where it is, you can help locate it.";
             Icon = FontAwesome.Solid.QuestionCircle;
 
             Buttons = new PopupDialogButton[]
diff --git a/osu.Game/Screens/Select/ImportFromStablePopup.cs b/osu.Game/Screens/Select/ImportFromStablePopup.cs
index e3a1505518..d8137432bd 100644
--- a/osu.Game/Screens/Select/ImportFromStablePopup.cs
+++ b/osu.Game/Screens/Select/ImportFromStablePopup.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Select
         public ImportFromStablePopup(Action importFromStable)
         {
             HeaderText = @"You have no beatmaps!";
-            BodyText = "You can import files from over a stable install, though.\nWould you like to import your beatmaps, skins, collections and scores?\nThis will create a second copy of all files on disk.";
+            BodyText = "Would you like to import your beatmaps, skins, collections and scores from an existing osu!stable installation?\nThis will create a second copy of all files on disk.";
 
             Icon = FontAwesome.Solid.Plane;
 

From bec06cfac7827423bbea001dd9cd5fd039b8bb09 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 15:17:33 +0200
Subject: [PATCH 10169/10326] Reword `StableDirectoryLocationDialog` header

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 .../Sections/Maintenance/StableDirectorySelectScreen.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index 6065122545..f7c7934c63 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override OsuSpriteText CreateHeader() => new OsuSpriteText
         {
-            Text = "Please select stable location",
+            Text = "Please select your osu!stable install location",
             Font = OsuFont.Default.With(size: 40)
         };
 

From 41fafdf643f1a3858907559ff4bddbc5fa538f00 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 14 May 2021 17:24:36 +0200
Subject: [PATCH 10170/10326] Remove now unreachable code paths.

---
 osu.Game/Collections/CollectionManager.cs | 6 ------
 osu.Game/Database/ArchiveModelManager.cs  | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index e707b463cb..3a63587b30 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -99,12 +99,6 @@ namespace osu.Game.Collections
         /// </summary>
         public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-            if (stableStorage == null)
-            {
-                Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
-                return Task.CompletedTask;
-            }
-
             if (!stableStorage.Exists(database_name))
             {
                 // This handles situations like when the user does not have a collections.db file
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 93e2880ba0..550daf36b5 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -689,12 +689,6 @@ namespace osu.Game.Database
         /// </summary>
         public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-            if (stableStorage == null)
-            {
-                Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
-                return Task.CompletedTask;
-            }
-
             var storage = PrepareStableStorage(stableStorage);
 
             if (!storage.ExistsDirectory(ImportFromStablePath))

From fe11426238eaf2713414ddc63b0499df4c4b66ba Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 16 May 2021 15:35:44 +0200
Subject: [PATCH 10171/10326] Disable appearance of the stable import prompt
 waiting for user interaction in tests, which caused them to fail.

---
 .../Navigation/TestScenePerformFromScreen.cs  | 21 ++++++++++++-------
 osu.Game/Screens/Select/SongSelect.cs         |  4 +++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
index 2791952b66..078bb817f8 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
@@ -37,17 +37,17 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestPerformAtSongSelect()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
-            AddStep("perform immediately", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) }));
+            AddStep("perform immediately", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(TestPlaySongSelect) }));
             AddAssert("did perform", () => actionPerformed);
-            AddAssert("screen didn't change", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+            AddAssert("screen didn't change", () => Game.ScreenStack.CurrentScreen is TestPlaySongSelect);
         }
 
         [Test]
         public void TestPerformAtMenuFromSongSelect()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
             AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
             AddUntilStep("returned to menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
@@ -57,18 +57,18 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestPerformAtSongSelectFromPlayerLoader()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
             PushAndConfirm(() => new PlayerLoader(() => new SoloPlayer()));
 
-            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) }));
-            AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(TestPlaySongSelect) }));
+            AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is TestPlaySongSelect);
             AddAssert("did perform", () => actionPerformed);
         }
 
         [Test]
         public void TestPerformAtMenuFromPlayerLoader()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
             PushAndConfirm(() => new PlayerLoader(() => new SoloPlayer()));
 
             AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
@@ -187,5 +187,10 @@ namespace osu.Game.Tests.Visual.Navigation
                 return base.OnExiting(next);
             }
         }
+
+        public class TestPlaySongSelect : PlaySongSelect
+        {
+            protected override bool DisplayStableImportPrompt => false;
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d8ad752151..5a48ee7606 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -51,6 +51,8 @@ namespace osu.Game.Screens.Select
 
         protected virtual bool ShowFooter => true;
 
+        protected virtual bool DisplayStableImportPrompt => true;
+
         /// <summary>
         /// Can be null if <see cref="ShowFooter"/> is false.
         /// </summary>
@@ -282,7 +284,7 @@ namespace osu.Game.Screens.Select
                 Schedule(() =>
                 {
                     // if we have no beatmaps, let's prompt the user to import from over a stable install if he has one.
-                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && stableImportManager.SupportsImportFromStable)
+                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && stableImportManager.SupportsImportFromStable && DisplayStableImportPrompt)
                     {
                         dialogOverlay.Push(new ImportFromStablePopup(() =>
                         {

From ed4c025c7e79669b198eb331e8d6fcc20ec04a9e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 16 May 2021 17:14:23 +0200
Subject: [PATCH 10172/10326] Fix other tests and move TestPlaySongSelect class
 declaration.

---
 .../Navigation/TestScenePerformFromScreen.cs  |  7 +---
 .../Navigation/TestSceneScreenNavigation.cs   | 34 ++++++++++---------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
index 078bb817f8..3cedaf9d45 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
@@ -11,8 +11,8 @@ using osu.Game.Overlays;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Select;
 using osuTK.Input;
+using static osu.Game.Tests.Visual.Navigation.TestSceneScreenNavigation;
 
 namespace osu.Game.Tests.Visual.Navigation
 {
@@ -187,10 +187,5 @@ namespace osu.Game.Tests.Visual.Navigation
                 return base.OnExiting(next);
             }
         }
-
-        public class TestPlaySongSelect : PlaySongSelect
-        {
-            protected override bool DisplayStableImportPrompt => false;
-        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 859cefe3a9..253e448bb4 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -34,9 +34,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitSongSelectWithEscape()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
             AddStep("Show mods overlay", () => songSelect.ModSelectOverlay.Show());
             AddAssert("Overlay was shown", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
             pushEscape();
@@ -51,9 +51,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestOpenModSelectOverlayUsingAction()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
             AddStep("Show mods overlay", () => InputManager.Key(Key.F1));
             AddAssert("Overlay was shown", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
         }
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             Player player = null;
 
-            PushAndConfirm(() => new TestSongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
             AddStep("import beatmap", () => ImportBeatmapTest.LoadQuickOszIntoOsu(Game).Wait());
 
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             WorkingBeatmap beatmap() => Game.Beatmap.Value;
 
-            PushAndConfirm(() => new TestSongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
             AddStep("import beatmap", () => ImportBeatmapTest.LoadQuickOszIntoOsu(Game).Wait());
 
@@ -113,7 +113,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             WorkingBeatmap beatmap() => Game.Beatmap.Value;
 
-            PushAndConfirm(() => new TestSongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
             AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(Game, virtualTrack: true).Wait());
 
@@ -139,9 +139,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestMenuMakesMusic()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
 
             AddUntilStep("wait for no track", () => Game.MusicController.CurrentTrack.IsDummyDevice);
 
@@ -153,9 +153,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitSongSelectWithClick()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
             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));
@@ -213,9 +213,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestModSelectInput()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
 
             AddStep("Show mods overlay", () => songSelect.ModSelectOverlay.Show());
 
@@ -234,9 +234,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestBeatmapOptionsInput()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
 
             AddStep("Show options overlay", () => songSelect.BeatmapOptionsOverlay.Show());
 
@@ -312,11 +312,13 @@ namespace osu.Game.Tests.Visual.Navigation
             ConfirmAtMainMenu();
         }
 
-        private class TestSongSelect : PlaySongSelect
+        public class TestPlaySongSelect : PlaySongSelect
         {
             public ModSelectOverlay ModSelectOverlay => ModSelect;
 
             public BeatmapOptionsOverlay BeatmapOptionsOverlay => BeatmapOptions;
+
+            protected override bool DisplayStableImportPrompt => false;
         }
     }
 }

From db255e6814fa463c2a69893bde37cbcde0b58576 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 16 May 2021 17:49:49 +0200
Subject: [PATCH 10173/10326] Mark StableImportManager as potentially null in
 tests. (StableImportManager is added to the DI in OsuGame and not in the
 OsuGameBase)

---
 .../Settings/Sections/Maintenance/GeneralSettings.cs   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 9bd360679e..20fc0e962a 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -30,9 +30,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton undeleteButton;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, StableImportManager stableImportManager, DialogOverlay dialogOverlay)
+        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, [CanBeNull] StableImportManager stableImportManager, DialogOverlay dialogOverlay)
         {
-            if (stableImportManager.SupportsImportFromStable)
+            if (stableImportManager?.SupportsImportFromStable ?? false)
             {
                 Add(importBeatmapsButton = new SettingsButton
                 {
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (stableImportManager.SupportsImportFromStable)
+            if (stableImportManager?.SupportsImportFromStable ?? false)
             {
                 Add(importScoresButton = new SettingsButton
                 {
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (stableImportManager.SupportsImportFromStable)
+            if (stableImportManager?.SupportsImportFromStable ?? false)
             {
                 Add(importSkinsButton = new SettingsButton
                 {
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
             if (collectionManager != null)
             {
-                if (stableImportManager.SupportsImportFromStable)
+                if (stableImportManager?.SupportsImportFromStable ?? false)
                 {
                     Add(importCollectionsButton = new SettingsButton
                     {

From a38fc1a2e0bff4bcd36e34e926be4c98d3fcf7e3 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 13:04:49 +0200
Subject: [PATCH 10174/10326] Override text header.

---
 .../Sections/Maintenance/StableDirectorySelectScreen.cs  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index f7c7934c63..4ea53a3fc1 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -4,9 +4,8 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using osu.Framework.Localisation;
 using osu.Framework.Screens;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -16,11 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override bool IsValidDirectory(DirectoryInfo info) => info?.GetFiles("osu!.*.cfg").Any() ?? false;
 
-        protected override OsuSpriteText CreateHeader() => new OsuSpriteText
-        {
-            Text = "Please select your osu!stable install location",
-            Font = OsuFont.Default.With(size: 40)
-        };
+        public override LocalisableString HeaderText => "Please select your osu!stable install location";
 
         public StableDirectorySelectScreen(TaskCompletionSource<string> taskCompletionSource)
         {

From 5ca4fd5ab4f53c61f88a4900b97c6c4150fb43b0 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 13:28:59 +0200
Subject: [PATCH 10175/10326] Block overlays to prevent getting into a bad
 state.

---
 .../Sections/Maintenance/StableDirectorySelectScreen.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index 4ea53a3fc1..4aea05fb14 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
     {
         private readonly TaskCompletionSource<string> taskCompletionSource;
 
+        protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
+
         protected override bool IsValidDirectory(DirectoryInfo info) => info?.GetFiles("osu!.*.cfg").Any() ?? false;
 
         public override LocalisableString HeaderText => "Please select your osu!stable install location";
@@ -28,10 +30,10 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             this.Exit();
         }
 
-        public override bool OnBackButton()
+        public override bool OnExiting(IScreen next)
         {
             taskCompletionSource.TrySetCanceled();
-            return base.OnBackButton();
+            return base.OnExiting(next);
         }
     }
 }

From 6110a847aa82a2e0dd5c0bf90aa8c1db6bee1399 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 16:30:13 +0200
Subject: [PATCH 10176/10326] Simplify import ordering logic by making
 beatmapImportTask non-nullable.

---
 osu.Game/Database/StableImportManager.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 6f8225519d..67f91d3bdb 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Database
             var stableStorage = await getStableStorage().ConfigureAwait(false);
             var importTasks = new List<Task>();
 
-            Task beatmapImportTask = default;
+            Task beatmapImportTask = Task.CompletedTask;
             if (content.HasFlagFast(StableContent.Beatmaps))
                 importTasks.Add(beatmapImportTask = beatmaps.ImportFromStableAsync(stableStorage));
 
@@ -59,16 +59,10 @@ namespace osu.Game.Database
                 importTasks.Add(skins.ImportFromStableAsync(stableStorage));
 
             if (content.HasFlagFast(StableContent.Collections))
-            {
-                importTasks.Add(beatmapImportTask?.ContinueWith(_ => collections.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion)
-                                ?? collections.ImportFromStableAsync(stableStorage));
-            }
+                importTasks.Add(beatmapImportTask.ContinueWith(_ => collections.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
 
             if (content.HasFlagFast(StableContent.Scores))
-            {
-                importTasks.Add(beatmapImportTask?.ContinueWith(_ => scores.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion)
-                                ?? scores.ImportFromStableAsync(stableStorage));
-            }
+                importTasks.Add(beatmapImportTask.ContinueWith(_ => scores.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
 
             await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
         }

From 97952bc3f0fd105535999cd47a3f280640fa4c73 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 18:39:04 +0200
Subject: [PATCH 10177/10326] Fix backwards stable install resolution logic.

---
 osu.Game/Database/StableImportManager.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 67f91d3bdb..331764f274 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -69,13 +69,13 @@ namespace osu.Game.Database
 
         private async Task<StableStorage> getStableStorage()
         {
-            var stableStorage = game.GetStorageForStableInstall();
-            if (stableStorage != null)
-                return stableStorage;
-
             if (cachedStorage != null)
                 return cachedStorage;
 
+            var stableStorage = game.GetStorageForStableInstall();
+            if (stableStorage != null)
+                return cachedStorage = stableStorage;
+
             var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             Schedule(() => dialogOverlay.Push(new StableDirectoryLocationDialog(taskCompletionSource)));
             var stablePath = await taskCompletionSource.Task.ConfigureAwait(false);

From 7befcf74ffbb54fc4783d22f9235667db6c0e1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 17 May 2021 18:53:09 +0200
Subject: [PATCH 10178/10326] Split value change callbacks out to separate
 methods

---
 .../Overlays/News/Sidebar/MonthSection.cs     | 36 ++++++++++---------
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs  | 28 ++++++++-------
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 20c4d2e83e..77f09b750d 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -153,28 +153,30 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 base.LoadComplete();
 
-                IsOpen.BindValueChanged(open =>
-                {
-                    ClearTransforms(true);
-
-                    if (open.NewValue)
-                    {
-                        AutoSizeAxes = Axes.Y;
-                        content.FadeIn(animation_duration, Easing.OutQuint);
-                    }
-                    else
-                    {
-                        AutoSizeAxes = Axes.None;
-                        this.ResizeHeightTo(0, animation_duration, Easing.OutQuint);
-
-                        content.FadeOut(animation_duration, Easing.OutQuint);
-                    }
-                }, true);
+                IsOpen.BindValueChanged(_ => updateState(), true);
 
                 // First state change should be instant.
                 FinishTransforms(true);
             }
 
+            private void updateState()
+            {
+                ClearTransforms(true);
+
+                if (IsOpen.Value)
+                {
+                    AutoSizeAxes = Axes.Y;
+                    content.FadeIn(animation_duration, Easing.OutQuint);
+                }
+                else
+                {
+                    AutoSizeAxes = Axes.None;
+                    this.ResizeHeightTo(0, animation_duration, Easing.OutQuint);
+
+                    content.FadeOut(animation_duration, Easing.OutQuint);
+                }
+            }
+
             private bool shouldUpdateAutosize = true;
 
             // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutosizeDuration.
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index ffdb5cf22e..849cdbf659 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -56,23 +56,25 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             base.LoadComplete();
 
-            metadata.BindValueChanged(m =>
+            metadata.BindValueChanged(_ => recreateDrawables(), true);
+        }
+
+        private void recreateDrawables()
+        {
+            yearsFlow.Clear();
+
+            if (metadata.Value == null)
             {
-                yearsFlow.Clear();
+                Hide();
+                return;
+            }
 
-                if (m.NewValue == null)
-                {
-                    Hide();
-                    return;
-                }
+            var currentYear = metadata.Value.CurrentYear;
 
-                var currentYear = m.NewValue.CurrentYear;
+            foreach (var y in metadata.Value.Years)
+                yearsFlow.Add(new YearButton(y, y == currentYear));
 
-                foreach (var y in m.NewValue.Years)
-                    yearsFlow.Add(new YearButton(y, y == currentYear));
-
-                Show();
-            }, true);
+            Show();
         }
 
         public class YearButton : OsuHoverContainer

From d614a47614218d9a6bc1406736ced7e2937d41e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 17 May 2021 18:54:17 +0200
Subject: [PATCH 10179/10326] Rename variable to better explain purpose

---
 osu.Game/Overlays/News/Sidebar/MonthSection.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 77f09b750d..166da97f93 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -177,19 +177,19 @@ namespace osu.Game.Overlays.News.Sidebar
                 }
             }
 
-            private bool shouldUpdateAutosize = true;
+            private bool autoSizeTransitionApplied;
 
-            // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutosizeDuration.
+            // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutoSize{Duration,Easing}.
             protected override void UpdateAfterAutoSize()
             {
                 base.UpdateAfterAutoSize();
 
-                if (shouldUpdateAutosize)
+                if (!autoSizeTransitionApplied)
                 {
                     AutoSizeDuration = animation_duration;
                     AutoSizeEasing = Easing.OutQuint;
 
-                    shouldUpdateAutosize = false;
+                    autoSizeTransitionApplied = true;
                 }
             }
         }

From 400984457ca08221dbb99178fc6dcba920311a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 17 May 2021 19:16:30 +0200
Subject: [PATCH 10180/10326] Fix weird behaviour in test scene

Due to a callback set up in another place, clicking away from the 2022
year after launching the test scene would remove the 2022 button
(because the callback was returning metadata without it). For simplicity
just trim the 2022 year to make sure both test scenes use the same
consistent set of years.
---
 osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
index 376c270689..6cd3bd7d51 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
@@ -110,10 +110,9 @@ namespace osu.Game.Tests.Visual.Online
 
         private static readonly APINewsSidebar metadata_with_no_posts = new APINewsSidebar
         {
-            CurrentYear = 2022,
+            CurrentYear = 2021,
             Years = new[]
             {
-                2022,
                 2021,
                 2020,
                 2019,

From e2018f81f3c2f59d46e9261b0518d01677277625 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 19:54:21 +0200
Subject: [PATCH 10181/10326] Use equality check for nullable types.

---
 .../Settings/Sections/Maintenance/GeneralSettings.cs      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 20fc0e962a..a38ca81e23 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, [CanBeNull] StableImportManager stableImportManager, DialogOverlay dialogOverlay)
         {
-            if (stableImportManager?.SupportsImportFromStable ?? false)
+            if (stableImportManager?.SupportsImportFromStable == true)
             {
                 Add(importBeatmapsButton = new SettingsButton
                 {
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (stableImportManager?.SupportsImportFromStable ?? false)
+            if (stableImportManager?.SupportsImportFromStable == true)
             {
                 Add(importScoresButton = new SettingsButton
                 {
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (stableImportManager?.SupportsImportFromStable ?? false)
+            if (stableImportManager?.SupportsImportFromStable == true)
             {
                 Add(importSkinsButton = new SettingsButton
                 {
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
             if (collectionManager != null)
             {
-                if (stableImportManager?.SupportsImportFromStable ?? false)
+                if (stableImportManager?.SupportsImportFromStable == true)
                 {
                     Add(importCollectionsButton = new SettingsButton
                     {

From 8530b31e39ca3eb5d6e275cc5f88ae9d5baf8efa Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 21:02:45 +0200
Subject: [PATCH 10182/10326] Use bitshifts for enum values instead of literal
 values.

---
 osu.Game/Database/StableImportManager.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 331764f274..63a6db35c0 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -87,10 +87,10 @@ namespace osu.Game.Database
     [Flags]
     public enum StableContent
     {
-        Beatmaps = 1,
-        Scores = 2,
-        Skins = 4,
-        Collections = 8,
+        Beatmaps = 1 << 0,
+        Scores = 1 << 1,
+        Skins = 1 << 2,
+        Collections = 1 << 3,
         All = Beatmaps | Scores | Skins | Collections
     }
 }

From 79740dd2d8f70645becc7edf5134b3ee3a7041f2 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 22:01:05 +0200
Subject: [PATCH 10183/10326] Merge conditionnal expression.

---
 osu.Game/Screens/Select/SongSelect.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 5a48ee7606..729e25203f 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Select
 
         protected virtual bool ShowFooter => true;
 
-        protected virtual bool DisplayStableImportPrompt => true;
+        protected virtual bool DisplayStableImportPrompt => stableImportManager.SupportsImportFromStable;
 
         /// <summary>
         /// Can be null if <see cref="ShowFooter"/> is false.
@@ -85,6 +85,9 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
+        [Resolved]
+        private StableImportManager stableImportManager { get; set; }
+
         protected ModSelectOverlay ModSelect { get; private set; }
 
         protected Sample SampleConfirm { get; private set; }
@@ -102,7 +105,7 @@ namespace osu.Game.Screens.Select
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, StableImportManager stableImportManager, ManageCollectionsDialog manageCollectionsDialog, DifficultyRecommender recommender)
+        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, ManageCollectionsDialog manageCollectionsDialog, DifficultyRecommender recommender)
         {
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
@@ -284,7 +287,7 @@ namespace osu.Game.Screens.Select
                 Schedule(() =>
                 {
                     // if we have no beatmaps, let's prompt the user to import from over a stable install if he has one.
-                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && stableImportManager.SupportsImportFromStable && DisplayStableImportPrompt)
+                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && DisplayStableImportPrompt)
                     {
                         dialogOverlay.Push(new ImportFromStablePopup(() =>
                         {

From 9d423245d8b797f6adad68afd718bda103202d19 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 13:02:23 +0900
Subject: [PATCH 10184/10326] Fix up xmldocs
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/Rulesets/Edit/SelectionBlueprint.cs                   | 2 +-
 osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index f59ad8bfa2..c7df2d1a76 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Edit
         protected override bool ShouldBeConsideredForInput(Drawable child) => State == SelectionState.Selected;
 
         /// <summary>
-        /// Selects this <see cref="HitObjectSelectionBlueprint"/>, causing it to become visible.
+        /// Selects this <see cref="SelectionBlueprint"/>, causing it to become visible.
         /// </summary>
         public void Select() => State = SelectionState.Selected;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index e32dcc81ee..8a052299ce 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -7,7 +7,7 @@ using osuTK;
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// An event which occurs when a <see cref="HitObjectSelectionBlueprint"/> is moved.
+    /// An event which occurs when a <see cref="SelectionBlueprint"/> is moved.
     /// </summary>
     public class MoveSelectionEvent<T>
     {

From 06389c08dc19287fdece6019170de4257365e7d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 13:11:22 +0900
Subject: [PATCH 10185/10326] Add basic test to show data how one would expect
 it to be displayed

---
 osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
index 6cd3bd7d51..b000553a7b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
@@ -24,11 +24,18 @@ namespace osu.Game.Tests.Visual.Online
         [SetUp]
         public void SetUp() => Schedule(() => Child = sidebar = new TestNewsSidebar { YearChanged = onYearChanged });
 
+        [Test]
+        public void TestBasic()
+        {
+            AddStep("Add metadata", () => sidebar.Metadata.Value = getMetadata(2021));
+            AddUntilStep("Month sections exist", () => sidebar.ChildrenOfType<MonthSection>().Any());
+        }
+
         [Test]
         public void TestMetadataWithNoPosts()
         {
             AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
-            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
+            AddUntilStep("No month sections were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
         }
 
         [Test]
@@ -134,7 +141,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 base.LoadComplete();
 
-                Metadata.BindValueChanged(m =>
+                Metadata.BindValueChanged(metadata =>
                 {
                     foreach (var b in this.ChildrenOfType<YearButton>())
                         b.Action = () => YearChanged?.Invoke(b.Year);

From f1f3606fd0ce9e4fea87b72faa1b2697b226ab45 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 13:11:58 +0900
Subject: [PATCH 10186/10326] Fix unresolved xmldocs

---
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs                   | 2 +-
 osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index c7df2d1a76..12ab89f79e 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Edit
         protected override bool ShouldBeConsideredForInput(Drawable child) => State == SelectionState.Selected;
 
         /// <summary>
-        /// Selects this <see cref="SelectionBlueprint"/>, causing it to become visible.
+        /// Selects this <see cref="SelectionBlueprint{T}"/>, causing it to become visible.
         /// </summary>
         public void Select() => State = SelectionState.Selected;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index 8a052299ce..2b71bb2f16 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -7,7 +7,7 @@ using osuTK;
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// An event which occurs when a <see cref="SelectionBlueprint"/> is moved.
+    /// An event which occurs when a <see cref="SelectionBlueprint{T}"/> is moved.
     /// </summary>
     public class MoveSelectionEvent<T>
     {

From c71d53a0f9ce174dc65640879df256a55397b1c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 13:40:26 +0900
Subject: [PATCH 10187/10326] Fix text and button layout

---
 .../Maintenance/DirectorySelectScreen.cs      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index e7c69e89fe..349a112477 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -11,9 +11,9 @@ using osuTK;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Screens;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -69,20 +69,24 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                         RelativeSizeAxes = Axes.Both,
                         RowDimensions = new[]
                         {
+                            new Dimension(GridSizeMode.AutoSize),
                             new Dimension(),
-                            new Dimension(GridSizeMode.Relative, 0.8f),
-                            new Dimension(),
+                            new Dimension(GridSizeMode.AutoSize),
                         },
                         Content = new[]
                         {
                             new Drawable[]
                             {
-                                new OsuSpriteText
+                                new OsuTextFlowContainer(cp =>
                                 {
-                                    Text = HeaderText,
-                                    Font = OsuFont.Default.With(size: 40),
-                                    Origin = Anchor.Centre,
-                                    Anchor = Anchor.Centre,
+                                    cp.Font = OsuFont.Default.With(size: 24);
+                                })
+                                {
+                                    Text = HeaderText.ToString(),
+                                    TextAnchor = Anchor.TopCentre,
+                                    Margin = new MarginPadding(10),
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
                                 }
                             },
                             new Drawable[]
@@ -99,6 +103,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                                     Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
                                     Width = 300,
+                                    Margin = new MarginPadding(10),
                                     Text = "Select directory",
                                     Action = () => OnSelection(directorySelector.CurrentPath.Value)
                                 },

From e621cfc4ea6f3656ac47cca8ad61204e09cab8c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 14:14:10 +0900
Subject: [PATCH 10188/10326] Add Apply() method for applying new DHOs

---
 .../Blueprints/HoldNoteSelectionBlueprint.cs  | 21 ++++++++++++-------
 .../Sliders/SliderSelectionBlueprint.cs       |  9 ++++++++
 .../Edit/HitObjectSelectionBlueprint.cs       | 20 +++++++++++++++++-
 .../Components/ComposeBlueprintContainer.cs   |  2 +-
 .../Visual/SelectionBlueprintTestScene.cs     |  2 +-
 5 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
index c7ee6097c6..ac821e504c 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 
@@ -21,6 +22,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
+        private HoldNoteNoteSelectionBlueprint headBlueprint;
+        private HoldNoteNoteSelectionBlueprint tailBlueprint;
+
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -33,16 +37,11 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         private void load(IScrollingInfo scrollingInfo)
         {
             direction.BindTo(scrollingInfo.Direction);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
 
             InternalChildren = new Drawable[]
             {
-                new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.Start),
-                new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.End),
+                headBlueprint = new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.Start),
+                tailBlueprint = new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.End),
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -59,6 +58,14 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             };
         }
 
+        public override void Apply(DrawableHitObject drawableObject)
+        {
+            base.Apply(drawableObject);
+
+            headBlueprint?.Apply(drawableObject);
+            tailBlueprint?.Apply(drawableObject);
+        }
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 939f4cdc3e..21945853a8 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -14,6 +14,7 @@ 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.Drawables;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
@@ -77,6 +78,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             BodyPiece.UpdateFrom(HitObject);
         }
 
+        public override void Apply(DrawableHitObject drawableObject)
+        {
+            base.Apply(drawableObject);
+
+            HeadBlueprint?.Apply(drawableObject);
+            TailBlueprint?.Apply(drawableObject);
+        }
+
         public override bool HandleQuickDeletion()
         {
             var hoveredControlPoint = ControlPointVisualiser?.Pieces.FirstOrDefault(p => p.IsHovered);
diff --git a/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
index 56434b1d82..6e9172c822 100644
--- a/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// The <see cref="DrawableHitObject"/> which this <see cref="HitObjectSelectionBlueprint"/> applies to.
         /// </summary>
-        public DrawableHitObject DrawableObject { get; internal set; }
+        public virtual DrawableHitObject DrawableObject { get; private set; }
 
         /// <summary>
         /// Whether the blueprint should be shown even when the <see cref="DrawableObject"/> is not alive.
@@ -28,6 +28,24 @@ namespace osu.Game.Rulesets.Edit
         {
         }
 
+        protected override void LoadAsyncComplete()
+        {
+            // Must be done before base.LoadAsyncComplete() as this may affect children.
+            Apply(DrawableObject);
+
+            base.LoadAsyncComplete();
+        }
+
+        /// <summary>
+        /// Applies a <see cref="DrawableHitObject"/> to this <see cref="HitObjectSelectionBlueprint"/>.
+        /// The represented <see cref="HitObject"/> model does not change.
+        /// </summary>
+        /// <param name="drawableObject">The new <see cref="DrawableHitObject"/>.</param>
+        public virtual void Apply(DrawableHitObject drawableObject)
+        {
+            DrawableObject = drawableObject;
+        }
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.ReceivePositionalInputAt(screenSpacePos);
 
         public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 95f4069edb..b3773b9ec1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -245,7 +245,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (drawable == null)
                 return null;
 
-            return CreateHitObjectBlueprintFor(item).With(b => b.DrawableObject = drawable);
+            return CreateHitObjectBlueprintFor(item).With(b => b.Apply(drawable));
         }
 
         public virtual HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject) => null;
diff --git a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
index dc12a4999d..b518465c40 100644
--- a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual
         {
             Add(blueprint.With(d =>
             {
-                d.DrawableObject = drawableObject;
+                d.Apply(drawableObject);
                 d.Depth = float.MinValue;
                 d.Select();
             }));

From 532c41c82eb8f0640f6ac58f24f00623784c9371 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 14:19:11 +0900
Subject: [PATCH 10189/10326] Remove nested blueprints from sliders

---
 .../TestSceneSliderControlPointPiece.cs       | 10 +++++-----
 .../TestSceneSliderSelectionBlueprint.cs      | 14 +++++++-------
 ...ionBlueprint.cs => SliderCircleOverlay.cs} | 17 +++++++----------
 .../Sliders/SliderSelectionBlueprint.cs       | 19 +++++--------------
 4 files changed, 24 insertions(+), 36 deletions(-)
 rename osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/{SliderCircleSelectionBlueprint.cs => SliderCircleOverlay.cs} (53%)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index fe0f2f8a87..24b947c854 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -150,8 +150,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         private class TestSliderBlueprint : SliderSelectionBlueprint
         {
             public new SliderBodyPiece BodyPiece => base.BodyPiece;
-            public new TestSliderCircleBlueprint HeadBlueprint => (TestSliderCircleBlueprint)base.HeadBlueprint;
-            public new TestSliderCircleBlueprint TailBlueprint => (TestSliderCircleBlueprint)base.TailBlueprint;
+            public new TestSliderCircleOverlay HeadOverlay => (TestSliderCircleOverlay)base.HeadOverlay;
+            public new TestSliderCircleOverlay TailOverlay => (TestSliderCircleOverlay)base.TailOverlay;
             public new PathControlPointVisualiser ControlPointVisualiser => base.ControlPointVisualiser;
 
             public TestSliderBlueprint(Slider slider)
@@ -159,14 +159,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
             }
 
-            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
+            protected override SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new TestSliderCircleOverlay(slider, position);
         }
 
-        private class TestSliderCircleBlueprint : SliderCircleSelectionBlueprint
+        private class TestSliderCircleOverlay : SliderCircleOverlay
         {
             public new HitCirclePiece CirclePiece => base.CirclePiece;
 
-            public TestSliderCircleBlueprint(Slider slider, SliderPosition position)
+            public TestSliderCircleOverlay(Slider slider, SliderPosition position)
                 : base(slider, position)
             {
             }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index 721bb1985d..0d828a79c8 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -174,10 +174,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("body positioned correctly", () => blueprint.BodyPiece.Position == slider.StackedPosition);
 
             AddAssert("head positioned correctly",
-                () => Precision.AlmostEquals(blueprint.HeadBlueprint.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.HeadCircle.ScreenSpaceDrawQuad.Centre));
+                () => Precision.AlmostEquals(blueprint.HeadOverlay.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.HeadCircle.ScreenSpaceDrawQuad.Centre));
 
             AddAssert("tail positioned correctly",
-                () => Precision.AlmostEquals(blueprint.TailBlueprint.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.TailCircle.ScreenSpaceDrawQuad.Centre));
+                () => Precision.AlmostEquals(blueprint.TailOverlay.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.TailCircle.ScreenSpaceDrawQuad.Centre));
         }
 
         private void moveMouseToControlPoint(int index)
@@ -195,8 +195,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         private class TestSliderBlueprint : SliderSelectionBlueprint
         {
             public new SliderBodyPiece BodyPiece => base.BodyPiece;
-            public new TestSliderCircleBlueprint HeadBlueprint => (TestSliderCircleBlueprint)base.HeadBlueprint;
-            public new TestSliderCircleBlueprint TailBlueprint => (TestSliderCircleBlueprint)base.TailBlueprint;
+            public new TestSliderCircleOverlay HeadOverlay => (TestSliderCircleOverlay)base.HeadOverlay;
+            public new TestSliderCircleOverlay TailOverlay => (TestSliderCircleOverlay)base.TailOverlay;
             public new PathControlPointVisualiser ControlPointVisualiser => base.ControlPointVisualiser;
 
             public TestSliderBlueprint(Slider slider)
@@ -204,14 +204,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
             }
 
-            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
+            protected override SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new TestSliderCircleOverlay(slider, position);
         }
 
-        private class TestSliderCircleBlueprint : SliderCircleSelectionBlueprint
+        private class TestSliderCircleOverlay : SliderCircleOverlay
         {
             public new HitCirclePiece CirclePiece => base.CirclePiece;
 
-            public TestSliderCircleBlueprint(Slider slider, SliderPosition position)
+            public TestSliderCircleOverlay(Slider slider, SliderPosition position)
                 : base(slider, position)
             {
             }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
similarity index 53%
rename from osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
rename to osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
index ff01c7a442..241ff70a18 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
@@ -1,35 +1,32 @@
-// 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.Containers;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
-    public class SliderCircleSelectionBlueprint : OsuSelectionBlueprint<Slider>
+    public class SliderCircleOverlay : CompositeDrawable
     {
         protected readonly HitCirclePiece CirclePiece;
 
+        private readonly Slider slider;
         private readonly SliderPosition position;
 
-        public SliderCircleSelectionBlueprint(Slider slider, SliderPosition position)
-            : base(slider)
+        public SliderCircleOverlay(Slider slider, SliderPosition position)
         {
+            this.slider = slider;
             this.position = position;
 
             InternalChild = CirclePiece = new HitCirclePiece();
-
-            Select();
         }
 
         protected override void Update()
         {
             base.Update();
 
-            CirclePiece.UpdateFrom(position == SliderPosition.Start ? (HitCircle)HitObject.HeadCircle : HitObject.TailCircle);
+            CirclePiece.UpdateFrom(position == SliderPosition.Start ? (HitCircle)slider.HeadCircle : slider.TailCircle);
         }
-
-        // Todo: This is temporary, since the slider circle masks don't do anything special yet. In the future they will handle input.
-        public override bool HandlePositionalInput => false;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 21945853a8..ec97f1fd78 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -14,7 +14,6 @@ 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.Drawables;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
@@ -27,8 +26,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
     public class SliderSelectionBlueprint : OsuSelectionBlueprint<Slider>
     {
         protected SliderBodyPiece BodyPiece { get; private set; }
-        protected SliderCircleSelectionBlueprint HeadBlueprint { get; private set; }
-        protected SliderCircleSelectionBlueprint TailBlueprint { get; private set; }
+        protected SliderCircleOverlay HeadOverlay { get; private set; }
+        protected SliderCircleOverlay TailOverlay { get; private set; }
 
         [CanBeNull]
         protected PathControlPointVisualiser ControlPointVisualiser { get; private set; }
@@ -61,8 +60,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             InternalChildren = new Drawable[]
             {
                 BodyPiece = new SliderBodyPiece(),
-                HeadBlueprint = CreateCircleSelectionBlueprint(HitObject, SliderPosition.Start),
-                TailBlueprint = CreateCircleSelectionBlueprint(HitObject, SliderPosition.End),
+                HeadOverlay = CreateCircleOverlay(HitObject, SliderPosition.Start),
+                TailOverlay = CreateCircleOverlay(HitObject, SliderPosition.End),
             };
         }
 
@@ -78,14 +77,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             BodyPiece.UpdateFrom(HitObject);
         }
 
-        public override void Apply(DrawableHitObject drawableObject)
-        {
-            base.Apply(drawableObject);
-
-            HeadBlueprint?.Apply(drawableObject);
-            TailBlueprint?.Apply(drawableObject);
-        }
-
         public override bool HandleQuickDeletion()
         {
             var hoveredControlPoint = ControlPointVisualiser?.Pieces.FirstOrDefault(p => p.IsHovered);
@@ -250,6 +241,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
 
-        protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
+        protected virtual SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new SliderCircleOverlay(slider, position);
     }
 }

From 72beddaadc2799ab2a0c72f2b9a7aae81b195a82 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 14:25:07 +0900
Subject: [PATCH 10190/10326] Remove nested blueprints from hold notes

---
 .../Editor/TestSceneManiaHitObjectComposer.cs |  4 ++--
 ...ionBlueprint.cs => HoldNoteNoteOverlay.cs} | 23 ++++++++-----------
 .../Blueprints/HoldNoteSelectionBlueprint.cs  | 16 ++-----------
 3 files changed, 14 insertions(+), 29 deletions(-)
 rename osu.Game.Rulesets.Mania/Edit/Blueprints/{HoldNoteNoteSelectionBlueprint.cs => HoldNoteNoteOverlay.cs} (60%)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
index aaf96c63a6..8474279b01 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
@@ -184,8 +184,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             AddAssert("head note positioned correctly", () => Precision.AlmostEquals(holdNote.ScreenSpaceDrawQuad.BottomLeft, holdNote.Head.ScreenSpaceDrawQuad.BottomLeft));
             AddAssert("tail note positioned correctly", () => Precision.AlmostEquals(holdNote.ScreenSpaceDrawQuad.TopLeft, holdNote.Tail.ScreenSpaceDrawQuad.BottomLeft));
 
-            AddAssert("head blueprint positioned correctly", () => this.ChildrenOfType<HoldNoteNoteSelectionBlueprint>().ElementAt(0).DrawPosition == holdNote.Head.DrawPosition);
-            AddAssert("tail blueprint positioned correctly", () => this.ChildrenOfType<HoldNoteNoteSelectionBlueprint>().ElementAt(1).DrawPosition == holdNote.Tail.DrawPosition);
+            AddAssert("head blueprint positioned correctly", () => this.ChildrenOfType<HoldNoteNoteOverlay>().ElementAt(0).DrawPosition == holdNote.Head.DrawPosition);
+            AddAssert("tail blueprint positioned correctly", () => this.ChildrenOfType<HoldNoteNoteOverlay>().ElementAt(1).DrawPosition == holdNote.Tail.DrawPosition);
         }
 
         private void setScrollStep(ScrollingDirection direction)
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteOverlay.cs
similarity index 60%
rename from osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs
rename to osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteOverlay.cs
index 14c8d488a9..6933571be8 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteOverlay.cs
@@ -2,35 +2,35 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
-using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public class HoldNoteNoteSelectionBlueprint : ManiaSelectionBlueprint<HoldNote>
+    public class HoldNoteNoteOverlay : CompositeDrawable
     {
-        protected new DrawableHoldNote DrawableObject => (DrawableHoldNote)base.DrawableObject;
-
+        private readonly HoldNoteSelectionBlueprint holdNoteBlueprint;
         private readonly HoldNotePosition position;
 
-        public HoldNoteNoteSelectionBlueprint(HoldNote holdNote, HoldNotePosition position)
-            : base(holdNote)
+        public HoldNoteNoteOverlay(HoldNoteSelectionBlueprint holdNoteBlueprint, HoldNotePosition position)
         {
+            this.holdNoteBlueprint = holdNoteBlueprint;
             this.position = position;
-            InternalChild = new EditNotePiece { RelativeSizeAxes = Axes.X };
 
-            Select();
+            InternalChild = new EditNotePiece { RelativeSizeAxes = Axes.X };
         }
 
         protected override void Update()
         {
             base.Update();
 
+            var drawableObject = holdNoteBlueprint.DrawableObject;
+
             // Todo: This shouldn't exist, mania should not reference the drawable hitobject directly.
-            if (DrawableObject.IsLoaded)
+            if (drawableObject.IsLoaded)
             {
-                DrawableNote note = position == HoldNotePosition.Start ? (DrawableNote)DrawableObject.Head : DrawableObject.Tail;
+                DrawableNote note = position == HoldNotePosition.Start ? (DrawableNote)drawableObject.Head : drawableObject.Tail;
 
                 Anchor = note.Anchor;
                 Origin = note.Origin;
@@ -39,8 +39,5 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 Position = note.DrawPosition;
             }
         }
-
-        // Todo: This is temporary, since the note masks don't do anything special yet. In the future they will handle input.
-        public override bool HandlePositionalInput => false;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
index ac821e504c..d04c5cd4aa 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 
@@ -22,9 +21,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-        private HoldNoteNoteSelectionBlueprint headBlueprint;
-        private HoldNoteNoteSelectionBlueprint tailBlueprint;
-
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -40,8 +36,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             InternalChildren = new Drawable[]
             {
-                headBlueprint = new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.Start),
-                tailBlueprint = new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.End),
+                new HoldNoteNoteOverlay(this, HoldNotePosition.Start),
+                new HoldNoteNoteOverlay(this, HoldNotePosition.End),
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -58,14 +54,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             };
         }
 
-        public override void Apply(DrawableHitObject drawableObject)
-        {
-            base.Apply(drawableObject);
-
-            headBlueprint?.Apply(drawableObject);
-            tailBlueprint?.Apply(drawableObject);
-        }
-
         protected override void Update()
         {
             base.Update();

From 882d54a8f8692cdbd508614b7033cff898bd070d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 14:26:26 +0900
Subject: [PATCH 10191/10326] Remove now unnecessary Apply() method

---
 .../Edit/HitObjectSelectionBlueprint.cs       | 20 +------------------
 .../Components/ComposeBlueprintContainer.cs   |  2 +-
 .../Visual/SelectionBlueprintTestScene.cs     |  2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
index 6e9172c822..56434b1d82 100644
--- a/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// The <see cref="DrawableHitObject"/> which this <see cref="HitObjectSelectionBlueprint"/> applies to.
         /// </summary>
-        public virtual DrawableHitObject DrawableObject { get; private set; }
+        public DrawableHitObject DrawableObject { get; internal set; }
 
         /// <summary>
         /// Whether the blueprint should be shown even when the <see cref="DrawableObject"/> is not alive.
@@ -28,24 +28,6 @@ namespace osu.Game.Rulesets.Edit
         {
         }
 
-        protected override void LoadAsyncComplete()
-        {
-            // Must be done before base.LoadAsyncComplete() as this may affect children.
-            Apply(DrawableObject);
-
-            base.LoadAsyncComplete();
-        }
-
-        /// <summary>
-        /// Applies a <see cref="DrawableHitObject"/> to this <see cref="HitObjectSelectionBlueprint"/>.
-        /// The represented <see cref="HitObject"/> model does not change.
-        /// </summary>
-        /// <param name="drawableObject">The new <see cref="DrawableHitObject"/>.</param>
-        public virtual void Apply(DrawableHitObject drawableObject)
-        {
-            DrawableObject = drawableObject;
-        }
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.ReceivePositionalInputAt(screenSpacePos);
 
         public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index b3773b9ec1..95f4069edb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -245,7 +245,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (drawable == null)
                 return null;
 
-            return CreateHitObjectBlueprintFor(item).With(b => b.Apply(drawable));
+            return CreateHitObjectBlueprintFor(item).With(b => b.DrawableObject = drawable);
         }
 
         public virtual HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject) => null;
diff --git a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
index b518465c40..dc12a4999d 100644
--- a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual
         {
             Add(blueprint.With(d =>
             {
-                d.Apply(drawableObject);
+                d.DrawableObject = drawableObject;
                 d.Depth = float.MinValue;
                 d.Select();
             }));

From 829d326e36cdab8a4a1be3e9624a0003d4910d48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 14:50:10 +0900
Subject: [PATCH 10192/10326] Remove alignment logic completely for the time
 being

This was overly complex and does not play well with the new layout
customisation system. We can add it back as required.
---
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    | 56 +++++++++----------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index c303f3889d..32d7f3525f 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
     public class BarHitErrorMeter : HitErrorMeter
     {
-        private readonly Anchor alignment;
-
         private const int arrow_move_duration = 400;
 
         private const int judgement_line_width = 6;
@@ -45,9 +43,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         public BarHitErrorMeter()
         {
-            // todo: investigate.
-            alignment = false ? Anchor.x0 : Anchor.x2;
-
             AutoSizeAxes = Axes.Both;
         }
 
@@ -63,33 +58,42 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 Margin = new MarginPadding(2),
                 Children = new Drawable[]
                 {
-                    judgementsContainer = new Container
+                    new Container
                     {
-                        Anchor = Anchor.y1 | alignment,
-                        Origin = Anchor.y1 | alignment,
-                        Width = judgement_line_width,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Width = chevron_size,
                         RelativeSizeAxes = Axes.Y,
+                        Child = arrow = new SpriteIcon
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.Centre,
+                            RelativePositionAxes = Axes.Y,
+                            Y = 0.5f,
+                            Icon = FontAwesome.Solid.ChevronRight,
+                            Size = new Vector2(chevron_size),
+                        }
                     },
                     colourBars = new Container
                     {
                         Width = bar_width,
                         RelativeSizeAxes = Axes.Y,
-                        Anchor = Anchor.y1 | alignment,
-                        Origin = Anchor.y1 | alignment,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
                         Children = new Drawable[]
                         {
                             colourBarsEarly = new Container
                             {
-                                Anchor = Anchor.y1 | alignment,
-                                Origin = alignment,
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.x2,
                                 RelativeSizeAxes = Axes.Both,
                                 Height = 0.5f,
                                 Scale = new Vector2(1, -1),
                             },
                             colourBarsLate = new Container
                             {
-                                Anchor = Anchor.y1 | alignment,
-                                Origin = alignment,
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.x2,
                                 RelativeSizeAxes = Axes.Both,
                                 Height = 0.5f,
                             },
@@ -115,21 +119,12 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                             }
                         }
                     },
-                    new Container
+                    judgementsContainer = new Container
                     {
-                        Anchor = Anchor.y1 | alignment,
-                        Origin = Anchor.y1 | alignment,
-                        Width = chevron_size,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Width = judgement_line_width,
                         RelativeSizeAxes = Axes.Y,
-                        Child = arrow = new SpriteIcon
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.Centre,
-                            RelativePositionAxes = Axes.Y,
-                            Y = 0.5f,
-                            Icon = alignment == Anchor.x2 ? FontAwesome.Solid.ChevronRight : FontAwesome.Solid.ChevronLeft,
-                            Size = new Vector2(chevron_size),
-                        }
                     },
                 }
             };
@@ -167,7 +162,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
             // a little nub to mark the centre point.
             var centre = createColourBar(windows.Last().result, 0.01f);
-            centre.Anchor = centre.Origin = Anchor.y1 | (alignment == Anchor.x2 ? Anchor.x0 : Anchor.x2);
+            centre.Anchor = centre.Origin = Anchor.CentreLeft;
             centre.Width = 2.5f;
             colourBars.Add(centre);
 
@@ -239,8 +234,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             judgementsContainer.Add(new JudgementLine
             {
                 Y = getRelativeJudgementPosition(judgement.TimeOffset),
-                Anchor = alignment == Anchor.x2 ? Anchor.x0 : Anchor.x2,
-                Origin = Anchor.y1 | (alignment == Anchor.x2 ? Anchor.x0 : Anchor.x2),
+                Origin = Anchor.CentreLeft,
             });
 
             arrow.MoveToY(

From c885ad87d5884105319658e0e2c476a45e759d3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 15:12:29 +0900
Subject: [PATCH 10193/10326] Update `HitErrorDisplay` tests

---
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs | 71 +++++++++++++++----
 1 file changed, 58 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 6cefd01aab..2c5443fe08 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -1,6 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -11,29 +14,35 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Catch.Scoring;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Scoring;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Scoring;
+using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneHitErrorMeter : OsuTestScene
     {
-        private HitWindows hitWindows;
-
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
+        [Cached(typeof(DrawableRuleset))]
+        private TestDrawableRuleset drawableRuleset = new TestDrawableRuleset();
+
         public TestSceneHitErrorMeter()
         {
             recreateDisplay(new OsuHitWindows(), 5);
 
             AddRepeatStep("New random judgement", () => newJudgement(), 40);
 
-            AddRepeatStep("New max negative", () => newJudgement(-hitWindows.WindowFor(HitResult.Meh)), 20);
-            AddRepeatStep("New max positive", () => newJudgement(hitWindows.WindowFor(HitResult.Meh)), 20);
+            AddRepeatStep("New max negative", () => newJudgement(-drawableRuleset.HitWindows.WindowFor(HitResult.Meh)), 20);
+            AddRepeatStep("New max positive", () => newJudgement(drawableRuleset.HitWindows.WindowFor(HitResult.Meh)), 20);
             AddStep("New fixed judgement (50ms)", () => newJudgement(50));
 
             AddStep("Judgement barrage", () =>
@@ -83,10 +92,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void recreateDisplay(HitWindows hitWindows, float overallDifficulty)
         {
-            this.hitWindows = hitWindows;
-
             hitWindows?.SetDifficulty(overallDifficulty);
 
+            drawableRuleset.HitWindows = hitWindows;
+
             Clear();
 
             Add(new FillFlowContainer
@@ -103,40 +112,40 @@ namespace osu.Game.Tests.Visual.Gameplay
                 }
             });
 
-            Add(new BarHitErrorMeter(hitWindows, true)
+            Add(new BarHitErrorMeter
             {
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreRight,
             });
 
-            Add(new BarHitErrorMeter(hitWindows, false)
+            Add(new BarHitErrorMeter
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
             });
 
-            Add(new BarHitErrorMeter(hitWindows, true)
+            Add(new BarHitErrorMeter
             {
                 Anchor = Anchor.BottomCentre,
                 Origin = Anchor.CentreLeft,
                 Rotation = 270,
             });
 
-            Add(new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter
             {
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreRight,
                 Margin = new MarginPadding { Right = 50 }
             });
 
-            Add(new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
                 Margin = new MarginPadding { Left = 50 }
             });
 
-            Add(new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter
             {
                 Anchor = Anchor.BottomCentre,
                 Origin = Anchor.CentreLeft,
@@ -147,11 +156,47 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void newJudgement(double offset = 0)
         {
-            scoreProcessor.ApplyResult(new JudgementResult(new HitCircle { HitWindows = hitWindows }, new Judgement())
+            scoreProcessor.ApplyResult(new JudgementResult(new HitCircle { HitWindows = drawableRuleset.HitWindows }, new Judgement())
             {
                 TimeOffset = offset == 0 ? RNG.Next(-150, 150) : offset,
                 Type = HitResult.Perfect,
             });
         }
+
+        [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
+        private class TestDrawableRuleset : DrawableRuleset
+        {
+            public HitWindows HitWindows;
+
+            public override IEnumerable<HitObject> Objects => new[] { new HitCircle { HitWindows = HitWindows } };
+
+            public override event Action<JudgementResult> NewResult;
+            public override event Action<JudgementResult> RevertResult;
+
+            public override Playfield Playfield { get; }
+            public override Container Overlays { get; }
+            public override Container FrameStableComponents { get; }
+            public override IFrameStableClock FrameStableClock { get; }
+            public override IReadOnlyList<Mod> Mods { get; }
+
+            public override double GameplayStartTime { get; }
+            public override GameplayCursorContainer Cursor { get; }
+
+            public TestDrawableRuleset()
+                : base(new OsuRuleset())
+            {
+                // won't compile without this.
+                NewResult?.Invoke(null);
+                RevertResult?.Invoke(null);
+            }
+
+            public override void SetReplayScore(Score replayScore) => throw new NotImplementedException();
+
+            public override void SetRecordTarget(Score score) => throw new NotImplementedException();
+
+            public override void RequestResume(Action continueResume) => throw new NotImplementedException();
+
+            public override void CancelResume() => throw new NotImplementedException();
+        }
     }
 }

From 5acb708939776029f96e6ec7bca92cec86ca3a40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 15:50:14 +0900
Subject: [PATCH 10194/10326] Remove customisation of hit error via standard
 settings

---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 -
 osu.Game/Configuration/ScoreMeterType.cs      | 37 -------------------
 .../Sections/Gameplay/GeneralSettings.cs      |  5 ---
 3 files changed, 44 deletions(-)
 delete mode 100644 osu.Game/Configuration/ScoreMeterType.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 09412b1f1b..43bbd725c3 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -104,7 +104,6 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.KeyOverlay, false);
             SetDefault(OsuSetting.PositionalHitSounds, true);
             SetDefault(OsuSetting.AlwaysPlayFirstComboBreak, true);
-            SetDefault(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
             SetDefault(OsuSetting.FloatingComments, false);
 
@@ -213,7 +212,6 @@ namespace osu.Game.Configuration
         KeyOverlay,
         PositionalHitSounds,
         AlwaysPlayFirstComboBreak,
-        ScoreMeter,
         FloatingComments,
         HUDVisibilityMode,
         ShowProgressGraph,
diff --git a/osu.Game/Configuration/ScoreMeterType.cs b/osu.Game/Configuration/ScoreMeterType.cs
deleted file mode 100644
index ddbd2327c2..0000000000
--- a/osu.Game/Configuration/ScoreMeterType.cs
+++ /dev/null
@@ -1,37 +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.ComponentModel;
-
-namespace osu.Game.Configuration
-{
-    public enum ScoreMeterType
-    {
-        [Description("None")]
-        None,
-
-        [Description("Hit Error (left)")]
-        HitErrorLeft,
-
-        [Description("Hit Error (right)")]
-        HitErrorRight,
-
-        [Description("Hit Error (left+right)")]
-        HitErrorBoth,
-
-        [Description("Hit Error (bottom)")]
-        HitErrorBottom,
-
-        [Description("Colour (left)")]
-        ColourLeft,
-
-        [Description("Colour (right)")]
-        ColourRight,
-
-        [Description("Colour (left+right)")]
-        ColourBoth,
-
-        [Description("Colour (bottom)")]
-        ColourBottom,
-    }
-}
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index be464fa2b7..0b5ec4f338 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -73,11 +73,6 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Always play first combo break sound",
                     Current = config.GetBindable<bool>(OsuSetting.AlwaysPlayFirstComboBreak)
                 },
-                new SettingsEnumDropdown<ScoreMeterType>
-                {
-                    LabelText = "Score meter type",
-                    Current = config.GetBindable<ScoreMeterType>(OsuSetting.ScoreMeter)
-                },
                 new SettingsEnumDropdown<ScoringMode>
                 {
                     LabelText = "Score display mode",

From 10c730b37d569e13f0dc9c522b57911b6671d7b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 15:50:40 +0900
Subject: [PATCH 10195/10326] Add new default locations for hit bar error
 displays

---
 osu.Game/Screens/Play/SongProgress.cs  | 10 +++++++---
 osu.Game/Skinning/DefaultSkin.cs       | 26 ++++++++++++++++++++++++++
 osu.Game/Skinning/HUDSkinComponents.cs |  2 ++
 osu.Game/Skinning/LegacySkin.cs        | 16 ++++++++++++++++
 4 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index b7939b5e75..cab44c7473 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -20,10 +20,14 @@ namespace osu.Game.Screens.Play
 {
     public class SongProgress : OverlayContainer, ISkinnableDrawable
     {
-        private const int info_height = 20;
-        private const int bottom_bar_height = 5;
+        public const float MAX_HEIGHT = info_height + bottom_bar_height + graph_height + handle_height;
+
+        private const float info_height = 20;
+        private const float bottom_bar_height = 5;
         private const float graph_height = SquareGraph.Column.WIDTH * 6;
-        private static readonly Vector2 handle_size = new Vector2(10, 18);
+        private const float handle_height = 18;
+
+        private static readonly Vector2 handle_size = new Vector2(10, handle_height);
 
         private const float transition_duration = 200;
 
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index d13ddcf22b..84f40df0cf 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -14,6 +14,7 @@ using osu.Game.Extensions;
 using osu.Game.IO;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osuTK;
 using osuTK.Graphics;
 
@@ -78,6 +79,23 @@ namespace osu.Game.Skinning
                                         combo.Position = new Vector2(accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 + horizontal_padding, vertical_offset + 5);
                                         combo.Anchor = Anchor.TopCentre;
                                     }
+
+                                    var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
+
+                                    if (hitError != null)
+                                    {
+                                        hitError.Anchor = Anchor.CentreLeft;
+                                        hitError.Origin = Anchor.CentreLeft;
+                                    }
+
+                                    var hitError2 = container.OfType<HitErrorMeter>().LastOrDefault();
+
+                                    if (hitError2 != null)
+                                    {
+                                        hitError2.Anchor = Anchor.CentreRight;
+                                        hitError2.Origin = Anchor.CentreLeft;
+                                        hitError2.Scale = new Vector2(-1, 1);
+                                    }
                                 }
                             })
                             {
@@ -88,6 +106,8 @@ namespace osu.Game.Skinning
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.SongProgress)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.BarHitErrorMeter)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.BarHitErrorMeter)),
                                 }
                             };
 
@@ -114,6 +134,12 @@ namespace osu.Game.Skinning
 
                         case HUDSkinComponents.SongProgress:
                             return new SongProgress();
+
+                        case HUDSkinComponents.BarHitErrorMeter:
+                            return new BarHitErrorMeter();
+
+                        case HUDSkinComponents.ColourHitErrorMeter:
+                            return new ColourHitErrorMeter();
                     }
 
                     break;
diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index 2e6c3a9937..ea39c98635 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -10,5 +10,7 @@ namespace osu.Game.Skinning
         AccuracyCounter,
         HealthDisplay,
         SongProgress,
+        BarHitErrorMeter,
+        ColourHitErrorMeter,
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 6c8d6ee45a..7a64f38840 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -19,6 +19,7 @@ using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -342,6 +343,20 @@ namespace osu.Game.Skinning
                                 {
                                     accuracy.Y = container.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight).Y;
                                 }
+
+                                var songProgress = container.OfType<SongProgress>().FirstOrDefault();
+
+                                var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
+
+                                if (hitError != null)
+                                {
+                                    hitError.Anchor = Anchor.BottomCentre;
+                                    hitError.Origin = Anchor.CentreLeft;
+                                    hitError.Rotation = -90;
+
+                                    if (songProgress != null)
+                                        hitError.Y -= SongProgress.MAX_HEIGHT;
+                                }
                             })
                             {
                                 Children = new[]
@@ -352,6 +367,7 @@ namespace osu.Game.Skinning
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)) ?? new DefaultAccuracyCounter(),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)) ?? new DefaultHealthDisplay(),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.SongProgress)) ?? new SongProgress(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.BarHitErrorMeter)) ?? new BarHitErrorMeter(),
                                 }
                             };
 

From ed957df162bbbfafdecaacab836ba6394c94e3a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 16:40:56 +0900
Subject: [PATCH 10196/10326] Add simple xmldoc to `TransferBlueprintFor`
 method

---
 .../Edit/Compose/Components/EditorBlueprintContainer.cs      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 6825e0f6a0..c62ea43331 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -84,6 +84,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.AddBlueprintFor(item);
         }
 
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> has been transferred to another <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The hit object which has been assigned to a new drawable.</param>
+        /// <param name="drawableObject">The new drawable that is representing the hit object.</param>
         protected virtual void TransferBlueprintFor(HitObject hitObject, DrawableHitObject drawableObject)
         {
         }

From 61a41d97a4a61df9e95f47489b2ba69b23891f2d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 17:39:45 +0900
Subject: [PATCH 10197/10326] Add some xmldocs + comments

---
 .../Compose/HitObjectContainerEventQueue.cs   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
index 7c21573b18..363f08cb41 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
@@ -68,6 +68,9 @@ namespace osu.Game.Screens.Edit.Compose
 
             switch (existingEvent, newEvent)
             {
+                // This mostly exists as a safeguard to ensure that the sequence: Began -> { Finished -> Began } -> Finished, where { ... } indicates a transferral within a single frame,
+                // correctly leads into a final "Finished" state. It's unlikely for this to happen normally as it requires the hitobject usage to finish (for the final time)
+                // immediately after the HitObjectContainer updates lifetime, but it's not inconceivable to occur with the Editor's scheduling and execution order.
                 case (EventType.Transferred, EventType.Finished):
                     pendingEvents[hitObject] = EventType.Finished;
                     break;
@@ -117,8 +120,24 @@ namespace osu.Game.Screens.Edit.Compose
 
         private enum EventType
         {
+            /// <summary>
+            /// A <see cref="HitObject"/> has started being used by a <see cref="DrawableHitObject"/>.
+            /// </summary>
             Began,
+
+            /// <summary>
+            /// A <see cref="HitObject"/> has finished being used by a <see cref="DrawableHitObject"/>.
+            /// </summary>
             Finished,
+
+            /// <summary>
+            /// An internal intermediate state that occurs when a <see cref="HitObject"/> has finished being used by one <see cref="DrawableHitObject"/>
+            /// and started being used by another <see cref="DrawableHitObject"/> in the same frame. The <see cref="DrawableHitObject"/> may be the same instance in both cases.
+            /// </summary>
+            /// <remarks>
+            /// This usually occurs when a <see cref="HitObject"/> is transferred between <see cref="HitObjectContainer"/>s,
+            /// but also occurs if the <see cref="HitObject"/> dies and becomes alive again in the same frame within the same <see cref="HitObjectContainer"/>.
+            /// </remarks>
             Transferred
         }
     }

From c80e736712f396946fc755b700f89b3c72cf9863 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 18:31:57 +0900
Subject: [PATCH 10198/10326] Change `SkinBlueprint` to use the origin point as
 the selection point

Not sure how this feels, but it makes using the same point throughout
the editor possible, which I think is the correct way forward for now.
---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 37659093e5..0a4bd1d75f 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Skinning.Editor
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
 
-        public override Vector2 ScreenSpaceSelectionPoint => drawable.ScreenSpaceDrawQuad.Centre;
+        public override Vector2 ScreenSpaceSelectionPoint => drawable.ToScreenSpace(drawable.OriginPosition);
 
         public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
     }

From d661e98fa612e1297c8994418d9f82350edd1ed0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 18:34:06 +0900
Subject: [PATCH 10199/10326] Move common functionality out of
 `OsuSelectionHandler` and implement flip support

---
 .../Edit/OsuSelectionHandler.cs               | 68 ++++---------------
 .../Compose/Components/SelectionHandler.cs    | 50 ++++++++++++++
 .../Skinning/Editor/SkinSelectionHandler.cs   | 12 +++-
 3 files changed, 74 insertions(+), 56 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index c2c1f6d602..aaf3517c9c 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -12,12 +12,23 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
-using osuTK;
+using Vector2 = osuTK.Vector2;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuSelectionHandler : EditorSelectionHandler
     {
+        /// <summary>
+        /// During a transform, the initial origin is stored so it can be used throughout the operation.
+        /// </summary>
+        private Vector2? referenceOrigin;
+
+        /// <summary>
+        /// During a transform, the initial path types of a single selected slider are stored so they
+        /// can be maintained throughout the operation.
+        /// </summary>
+        private List<PathType?> referencePathTypes;
+
         protected override void OnSelectionChanged()
         {
             base.OnSelectionChanged();
@@ -50,17 +61,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             return true;
         }
 
-        /// <summary>
-        /// During a transform, the initial origin is stored so it can be used throughout the operation.
-        /// </summary>
-        private Vector2? referenceOrigin;
-
-        /// <summary>
-        /// During a transform, the initial path types of a single selected slider are stored so they
-        /// can be maintained throughout the operation.
-        /// </summary>
-        private List<PathType?> referencePathTypes;
-
         public override bool HandleReverse()
         {
             var hitObjects = EditorBeatmap.SelectedHitObjects;
@@ -114,24 +114,10 @@ namespace osu.Game.Rulesets.Osu.Edit
             var hitObjects = selectedMovableObjects;
 
             var selectedObjectsQuad = getSurroundingQuad(hitObjects);
-            var centre = selectedObjectsQuad.Centre;
 
             foreach (var h in hitObjects)
             {
-                var pos = h.Position;
-
-                switch (direction)
-                {
-                    case Direction.Horizontal:
-                        pos.X = centre.X - (pos.X - centre.X);
-                        break;
-
-                    case Direction.Vertical:
-                        pos.Y = centre.Y - (pos.Y - centre.Y);
-                        break;
-                }
-
-                h.Position = pos;
+                h.Position = GetFlippedPosition(direction, selectedObjectsQuad, h.Position);
 
                 if (h is Slider slider)
                 {
@@ -204,7 +190,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             referencePathTypes ??= slider.Path.ControlPoints.Select(p => p.Type.Value).ToList();
 
-            Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+            Quad sliderQuad = GetSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
 
             // Limit minimum distance between control points after scaling to almost 0. Less than 0 causes the slider to flip, exactly 0 causes a crash through division by 0.
             scale = Vector2.ComponentMax(new Vector2(Precision.FLOAT_EPSILON), sliderQuad.Size + scale) - sliderQuad.Size;
@@ -333,7 +319,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </summary>
         /// <param name="hitObjects">The hit objects to calculate a quad for.</param>
         private Quad getSurroundingQuad(OsuHitObject[] hitObjects) =>
-            getSurroundingQuad(hitObjects.SelectMany(h =>
+            GetSurroundingQuad(hitObjects.SelectMany(h =>
             {
                 if (h is IHasPath path)
                 {
@@ -348,30 +334,6 @@ namespace osu.Game.Rulesets.Osu.Edit
                 return new[] { h.Position };
             }));
 
-        /// <summary>
-        /// Returns a gamefield-space quad surrounding the provided points.
-        /// </summary>
-        /// <param name="points">The points to calculate a quad for.</param>
-        private Quad getSurroundingQuad(IEnumerable<Vector2> points)
-        {
-            if (!EditorBeatmap.SelectedHitObjects.Any())
-                return new Quad();
-
-            Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
-            Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
-
-            // Go through all hitobjects to make sure they would remain in the bounds of the editor after movement, before any movement is attempted
-            foreach (var p in points)
-            {
-                minPosition = Vector2.ComponentMin(minPosition, p);
-                maxPosition = Vector2.ComponentMax(maxPosition, p);
-            }
-
-            Vector2 size = maxPosition - minPosition;
-
-            return new Quad(minPosition.X, minPosition.Y, size.X, size.Y);
-        }
-
         /// <summary>
         /// All osu! hitobjects which can be moved/rotated/scaled.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 6d8ae69812..bfd5ab7afa 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -350,5 +350,55 @@ namespace osu.Game.Screens.Edit.Compose.Components
             => Enumerable.Empty<MenuItem>();
 
         #endregion
+
+        #region Helper Methods
+
+        /// <summary>
+        /// Given a flip direction, a surrounding quad for all selected objects, and a position,
+        /// will return the flipped position in screen space coordinates.
+        /// </summary>
+        protected static Vector2 GetFlippedPosition(Direction direction, Quad quad, Vector2 position)
+        {
+            var centre = quad.Centre;
+
+            switch (direction)
+            {
+                case Direction.Horizontal:
+                    position.X = centre.X - (position.X - centre.X);
+                    break;
+
+                case Direction.Vertical:
+                    position.Y = centre.Y - (position.Y - centre.Y);
+                    break;
+            }
+
+            return position;
+        }
+
+        /// <summary>
+        /// Returns a quad surrounding the provided points.
+        /// </summary>
+        /// <param name="points">The points to calculate a quad for.</param>
+        protected static Quad GetSurroundingQuad(IEnumerable<Vector2> points)
+        {
+            if (!points.Any())
+                return new Quad();
+
+            Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
+            Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
+
+            // Go through all hitobjects to make sure they would remain in the bounds of the editor after movement, before any movement is attempted
+            foreach (var p in points)
+            {
+                minPosition = Vector2.ComponentMin(minPosition, p);
+                maxPosition = Vector2.ComponentMax(maxPosition, p);
+            }
+
+            Vector2 size = maxPosition - minPosition;
+
+            return new Quad(minPosition.X, minPosition.Y, size.X, size.Y);
+        }
+
+        #endregion
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 7931a5ec41..2eb4ea107d 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -43,10 +43,16 @@ namespace osu.Game.Skinning.Editor
 
         public override bool HandleFlip(Direction direction)
         {
-            // TODO: this is temporary as well.
-            foreach (var c in SelectedBlueprints)
+            var selectionQuad = GetSurroundingQuad(SelectedBlueprints.Select(b => b.ScreenSpaceSelectionPoint));
+
+            foreach (var b in SelectedBlueprints)
             {
-                ((Drawable)c.Item).Scale *= new Vector2(
+                var drawableItem = (Drawable)b.Item;
+
+                drawableItem.Position =
+                    drawableItem.Parent.ToLocalSpace(GetFlippedPosition(direction, selectionQuad, b.ScreenSpaceSelectionPoint)) - drawableItem.AnchorPosition;
+
+                drawableItem.Scale *= new Vector2(
                     direction == Direction.Horizontal ? -1 : 1,
                     direction == Direction.Vertical ? -1 : 1
                 );

From a31a6947bb4771472686cfd195d69747d1106c0d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 18:49:05 +0900
Subject: [PATCH 10200/10326] Add test

---
 .../TestSceneHitObjectContainerEventQueue.cs  | 168 ++++++++++++++++++
 osu.Game/Rulesets/UI/Playfield.cs             |   7 +-
 2 files changed, 173 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
new file mode 100644
index 0000000000..3f4d1b835f
--- /dev/null
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
@@ -0,0 +1,168 @@
+// Copyright (c) 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.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Edit.Compose;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Editing
+{
+    public class TestSceneHitObjectContainerEventQueue : OsuTestScene
+    {
+        private readonly TestHitObject testObj = new TestHitObject();
+
+        private TestPlayfield playfield1;
+        private TestPlayfield playfield2;
+        private TestDrawable intermediateDrawable;
+        private HitObjectContainerEventQueue eventQueue;
+
+        private HitObject beganUsage;
+        private HitObject finishedUsage;
+        private HitObject transferredUsage;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            reset();
+
+            if (eventQueue != null)
+            {
+                eventQueue.HitObjectUsageBegan -= onHitObjectUsageBegan;
+                eventQueue.HitObjectUsageFinished -= onHitObjectUsageFinished;
+                eventQueue.HitObjectUsageTransferred -= onHitObjectUsageTransferred;
+            }
+
+            var topPlayfield = new TestPlayfield();
+            topPlayfield.AddNested(playfield1 = new TestPlayfield());
+            topPlayfield.AddNested(playfield2 = new TestPlayfield());
+
+            eventQueue = new HitObjectContainerEventQueue(topPlayfield);
+            eventQueue.HitObjectUsageBegan += onHitObjectUsageBegan;
+            eventQueue.HitObjectUsageFinished += onHitObjectUsageFinished;
+            eventQueue.HitObjectUsageTransferred += onHitObjectUsageTransferred;
+
+            Children = new Drawable[]
+            {
+                topPlayfield,
+                intermediateDrawable = new TestDrawable(),
+                eventQueue
+            };
+        });
+
+        private void onHitObjectUsageBegan(HitObject obj) => beganUsage = obj;
+
+        private void onHitObjectUsageFinished(HitObject obj) => finishedUsage = obj;
+
+        private void onHitObjectUsageTransferred(HitObject obj, DrawableHitObject drawableObj) => transferredUsage = obj;
+
+        [Test]
+        public void TestUsageBeganAfterAdd()
+        {
+            AddStep("add hitobject", () => playfield1.Add(testObj));
+            addCheckStep(began: true);
+        }
+
+        [Test]
+        public void TestUsageFinishedAfterRemove()
+        {
+            AddStep("add hitobject", () => playfield1.Add(testObj));
+            addResetStep();
+            AddStep("remove hitobject", () => playfield1.Remove(testObj));
+            addCheckStep(finished: true);
+        }
+
+        [Test]
+        public void TestUsageTransferredWhenMovedBetweenPlayfields()
+        {
+            AddStep("add hitobject", () => playfield1.Add(testObj));
+            addResetStep();
+            AddStep("transfer hitobject to other playfield", () =>
+            {
+                playfield1.Remove(testObj);
+                playfield2.Add(testObj);
+            });
+
+            addCheckStep(transferred: true);
+        }
+
+        [Test]
+        public void TestRemoveImmediatelyAfterUsageBegan()
+        {
+            AddStep("add hitobject and schedule removal", () =>
+            {
+                playfield1.Add(testObj);
+                intermediateDrawable.Schedule(() => playfield1.Remove(testObj));
+            });
+
+            addCheckStep();
+        }
+
+        [Test]
+        public void TestRemoveImmediatelyAfterTransferred()
+        {
+            AddStep("add hitobject", () => playfield1.Add(testObj));
+            addResetStep();
+            AddStep("transfer hitobject to other playfield and schedule removal", () =>
+            {
+                playfield1.Remove(testObj);
+                playfield2.Add(testObj);
+                intermediateDrawable.Schedule(() => playfield2.Remove(testObj));
+            });
+
+            addCheckStep(finished: true);
+        }
+
+        private void addResetStep() => AddStep("reset", reset);
+
+        private void reset()
+        {
+            beganUsage = null;
+            finishedUsage = null;
+            transferredUsage = null;
+        }
+
+        private void addCheckStep(bool began = false, bool finished = false, bool transferred = false)
+            => AddAssert($"began = {began}, finished = {finished}, transferred = {transferred}",
+                () => (beganUsage == testObj) == began && (finishedUsage == testObj) == finished && (transferredUsage == testObj) == transferred);
+
+        private class TestPlayfield : Playfield
+        {
+            public TestPlayfield()
+            {
+                RegisterPool<TestHitObject, TestDrawableHitObject>(1);
+            }
+
+            public new void AddNested(Playfield playfield)
+            {
+                AddInternal(playfield);
+                base.AddNested(playfield);
+            }
+
+            protected override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject)
+            {
+                var entry = base.CreateLifetimeEntry(hitObject);
+                entry.KeepAlive = true;
+                return entry;
+            }
+        }
+
+        private class TestHitObject : HitObject
+        {
+            public override string ToString() => "TestHitObject";
+        }
+
+        private class TestDrawableHitObject : DrawableHitObject
+        {
+        }
+
+        private class TestDrawable : Drawable
+        {
+            public new void Schedule(Action action) => base.Schedule(action);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 17d3cf01a4..b154288dba 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -354,8 +354,11 @@ namespace osu.Game.Rulesets.UI
 
                     // If this is the first time this DHO is being used, then apply the DHO mods.
                     // This is done before Apply() so that the state is updated once when the hitobject is applied.
-                    foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
-                        m.ApplyToDrawableHitObjects(dho.Yield());
+                    if (mods != null)
+                    {
+                        foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
+                            m.ApplyToDrawableHitObjects(dho.Yield());
+                    }
                 }
 
                 if (!lifetimeEntryMap.TryGetValue(hitObject, out var entry))

From bfc0205e9bf378039a87d6d67c05102a7aa4fed3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 18:49:11 +0900
Subject: [PATCH 10201/10326] Fix (began, finished) event

---
 .../Edit/Compose/HitObjectContainerEventQueue.cs   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
index 363f08cb41..6c1a3b06bb 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
@@ -68,14 +68,20 @@ namespace osu.Game.Screens.Edit.Compose
 
             switch (existingEvent, newEvent)
             {
-                // This mostly exists as a safeguard to ensure that the sequence: Began -> { Finished -> Began } -> Finished, where { ... } indicates a transferral within a single frame,
-                // correctly leads into a final "Finished" state. It's unlikely for this to happen normally as it requires the hitobject usage to finish (for the final time)
-                // immediately after the HitObjectContainer updates lifetime, but it's not inconceivable to occur with the Editor's scheduling and execution order.
+                // This exists as a safeguard to ensure that the sequence: { Began -> Finished }, where { ... } indicates a sequence within a single frame, does not trigger any events.
+                // This is unlikely to occur in practice as it requires the usage to finish immediately after the HitObjectContainer updates hitobject lifetimes,
+                // however, an Editor action scheduled somewhere between the lifetime update and this event queue's own Update() could cause this.
+                case (EventType.Began, EventType.Finished):
+                    pendingEvents.Remove(hitObject);
+                    break;
+
+                // This exists as a safeguard to ensure that the sequence: Began -> { Finished -> Began -> Finished }, where { ... } indicates a sequence within a single frame,
+                // correctly leads into a final "finished" state rather than remaining in the intermediate "transferred" state.
+                // As above, this is unlikely to occur in practice.
                 case (EventType.Transferred, EventType.Finished):
                     pendingEvents[hitObject] = EventType.Finished;
                     break;
 
-                case (EventType.Began, EventType.Finished):
                 case (EventType.Finished, EventType.Began):
                     pendingEvents[hitObject] = EventType.Transferred;
                     break;

From 633f841a0f691ecb89965cc4762c510e7f3cd4b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 18:57:02 +0900
Subject: [PATCH 10202/10326] Rename to HitObjectUsageEventBuffer

---
 .../TestSceneHitObjectContainerEventQueue.cs  | 20 +++++++++----------
 .../Components/EditorBlueprintContainer.cs    |  2 +-
 ...tQueue.cs => HitObjectUsageEventBuffer.cs} | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)
 rename osu.Game/Screens/Edit/Compose/{HitObjectContainerEventQueue.cs => HitObjectUsageEventBuffer.cs} (93%)

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
index 3f4d1b835f..ebf98c4c56 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Editing
         private TestPlayfield playfield1;
         private TestPlayfield playfield2;
         private TestDrawable intermediateDrawable;
-        private HitObjectContainerEventQueue eventQueue;
+        private HitObjectUsageEventBuffer eventBuffer;
 
         private HitObject beganUsage;
         private HitObject finishedUsage;
@@ -30,27 +30,27 @@ namespace osu.Game.Tests.Editing
         {
             reset();
 
-            if (eventQueue != null)
+            if (eventBuffer != null)
             {
-                eventQueue.HitObjectUsageBegan -= onHitObjectUsageBegan;
-                eventQueue.HitObjectUsageFinished -= onHitObjectUsageFinished;
-                eventQueue.HitObjectUsageTransferred -= onHitObjectUsageTransferred;
+                eventBuffer.HitObjectUsageBegan -= onHitObjectUsageBegan;
+                eventBuffer.HitObjectUsageFinished -= onHitObjectUsageFinished;
+                eventBuffer.HitObjectUsageTransferred -= onHitObjectUsageTransferred;
             }
 
             var topPlayfield = new TestPlayfield();
             topPlayfield.AddNested(playfield1 = new TestPlayfield());
             topPlayfield.AddNested(playfield2 = new TestPlayfield());
 
-            eventQueue = new HitObjectContainerEventQueue(topPlayfield);
-            eventQueue.HitObjectUsageBegan += onHitObjectUsageBegan;
-            eventQueue.HitObjectUsageFinished += onHitObjectUsageFinished;
-            eventQueue.HitObjectUsageTransferred += onHitObjectUsageTransferred;
+            eventBuffer = new HitObjectUsageEventBuffer(topPlayfield);
+            eventBuffer.HitObjectUsageBegan += onHitObjectUsageBegan;
+            eventBuffer.HitObjectUsageFinished += onHitObjectUsageFinished;
+            eventBuffer.HitObjectUsageTransferred += onHitObjectUsageTransferred;
 
             Children = new Drawable[]
             {
                 topPlayfield,
                 intermediateDrawable = new TestDrawable(),
-                eventQueue
+                eventBuffer
             };
         });
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index c62ea43331..fdea26d92b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 foreach (var obj in Composer.HitObjects)
                     AddBlueprintFor(obj.HitObject);
 
-                var eventQueue = new HitObjectContainerEventQueue(Composer.Playfield);
+                var eventQueue = new HitObjectUsageEventBuffer(Composer.Playfield);
                 eventQueue.HitObjectUsageBegan += AddBlueprintFor;
                 eventQueue.HitObjectUsageFinished += RemoveBlueprintFor;
                 eventQueue.HitObjectUsageTransferred += TransferBlueprintFor;
diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
similarity index 93%
rename from osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
rename to osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
index 6c1a3b06bb..8c69e9e707 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
@@ -13,9 +13,9 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Screens.Edit.Compose
 {
     /// <summary>
-    /// A queue which processes events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy.
+    /// Buffers events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy.
     /// </summary>
-    internal class HitObjectContainerEventQueue : Component
+    internal class HitObjectUsageEventBuffer : Component
     {
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
@@ -41,10 +41,10 @@ namespace osu.Game.Screens.Edit.Compose
         private readonly Playfield playfield;
 
         /// <summary>
-        /// Creates a new <see cref="HitObjectContainerEventQueue"/>.
+        /// Creates a new <see cref="HitObjectUsageEventBuffer"/>.
         /// </summary>
         /// <param name="playfield">The most top-level <see cref="Playfield"/>.</param>
-        public HitObjectContainerEventQueue([NotNull] Playfield playfield)
+        public HitObjectUsageEventBuffer([NotNull] Playfield playfield)
         {
             this.playfield = playfield;
 
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Edit.Compose
             {
                 // This exists as a safeguard to ensure that the sequence: { Began -> Finished }, where { ... } indicates a sequence within a single frame, does not trigger any events.
                 // This is unlikely to occur in practice as it requires the usage to finish immediately after the HitObjectContainer updates hitobject lifetimes,
-                // however, an Editor action scheduled somewhere between the lifetime update and this event queue's own Update() could cause this.
+                // however, an Editor action scheduled somewhere between the lifetime update and this buffer's own Update() could cause this.
                 case (EventType.Began, EventType.Finished):
                     pendingEvents.Remove(hitObject);
                     break;

From 97f4f7bbd1473b7664ab9d07cc8a38382b72391a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 18:59:45 +0900
Subject: [PATCH 10203/10326] Remove Component inheritance

---
 ...TestSceneHitObjectContainerEventBuffer.cs} |  9 +++++++--
 .../Components/EditorBlueprintContainer.cs    | 19 ++++++++++++++-----
 .../Edit/Compose/HitObjectUsageEventBuffer.cs | 18 ++++++++----------
 3 files changed, 29 insertions(+), 17 deletions(-)
 rename osu.Game.Tests/Editing/{TestSceneHitObjectContainerEventQueue.cs => TestSceneHitObjectContainerEventBuffer.cs} (96%)

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
similarity index 96%
rename from osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
rename to osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
index ebf98c4c56..30e72150f1 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
@@ -12,7 +12,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.Editing
 {
-    public class TestSceneHitObjectContainerEventQueue : OsuTestScene
+    public class TestSceneHitObjectContainerEventBuffer : OsuTestScene
     {
         private readonly TestHitObject testObj = new TestHitObject();
 
@@ -50,7 +50,6 @@ namespace osu.Game.Tests.Editing
             {
                 topPlayfield,
                 intermediateDrawable = new TestDrawable(),
-                eventBuffer
             };
         });
 
@@ -117,6 +116,12 @@ namespace osu.Game.Tests.Editing
             addCheckStep(finished: true);
         }
 
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+            eventBuffer.Update();
+        }
+
         private void addResetStep() => AddStep("reset", reset);
 
         private void reset()
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index fdea26d92b..5a6f98f504 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected readonly HitObjectComposer Composer;
 
+        private HitObjectUsageEventBuffer usageEventBuffer;
+
         protected EditorBlueprintContainer(HitObjectComposer composer)
         {
             Composer = composer;
@@ -46,14 +48,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 foreach (var obj in Composer.HitObjects)
                     AddBlueprintFor(obj.HitObject);
 
-                var eventQueue = new HitObjectUsageEventBuffer(Composer.Playfield);
-                eventQueue.HitObjectUsageBegan += AddBlueprintFor;
-                eventQueue.HitObjectUsageFinished += RemoveBlueprintFor;
-                eventQueue.HitObjectUsageTransferred += TransferBlueprintFor;
-                AddInternal(eventQueue);
+                usageEventBuffer = new HitObjectUsageEventBuffer(Composer.Playfield);
+                usageEventBuffer.HitObjectUsageBegan += AddBlueprintFor;
+                usageEventBuffer.HitObjectUsageFinished += RemoveBlueprintFor;
+                usageEventBuffer.HitObjectUsageTransferred += TransferBlueprintFor;
             }
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            usageEventBuffer?.Update();
+        }
+
         protected override IEnumerable<SelectionBlueprint<HitObject>> SortForMovement(IReadOnlyList<SelectionBlueprint<HitObject>> blueprints)
             => blueprints.OrderBy(b => b.Item.StartTime);
 
@@ -145,6 +152,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 Beatmap.HitObjectAdded -= AddBlueprintFor;
                 Beatmap.HitObjectRemoved -= RemoveBlueprintFor;
             }
+
+            usageEventBuffer?.Dispose();
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
index 8c69e9e707..cbaf9b4f26 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
-using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -15,7 +14,7 @@ namespace osu.Game.Screens.Edit.Compose
     /// <summary>
     /// Buffers events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy.
     /// </summary>
-    internal class HitObjectUsageEventBuffer : Component
+    internal class HitObjectUsageEventBuffer : IDisposable
     {
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
@@ -91,10 +90,8 @@ namespace osu.Game.Screens.Edit.Compose
             }
         }
 
-        protected override void Update()
+        public void Update()
         {
-            base.Update();
-
             foreach (var (hitObject, e) in pendingEvents)
             {
                 switch (e)
@@ -116,12 +113,13 @@ namespace osu.Game.Screens.Edit.Compose
             pendingEvents.Clear();
         }
 
-        protected override void Dispose(bool isDisposing)
+        public void Dispose()
         {
-            base.Dispose(isDisposing);
-
-            playfield.HitObjectUsageBegan -= onHitObjectUsageBegan;
-            playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
+            if (playfield != null)
+            {
+                playfield.HitObjectUsageBegan -= onHitObjectUsageBegan;
+                playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
+            }
         }
 
         private enum EventType

From ab6a79f84cccfe9b72f7dcb9966010366f4b0cda Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 19:10:45 +0900
Subject: [PATCH 10204/10326] Simplify

---
 .../TestSceneHitObjectContainerEventBuffer.cs |  4 +-
 .../Edit/Compose/HitObjectUsageEventBuffer.cs | 88 +++----------------
 2 files changed, 13 insertions(+), 79 deletions(-)

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
index 30e72150f1..5233cbc0be 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Editing
                 intermediateDrawable.Schedule(() => playfield1.Remove(testObj));
             });
 
-            addCheckStep();
+            addCheckStep(began: true, finished: true);
         }
 
         [Test]
@@ -113,7 +113,7 @@ namespace osu.Game.Tests.Editing
                 intermediateDrawable.Schedule(() => playfield2.Remove(testObj));
             });
 
-            addCheckStep(finished: true);
+            addCheckStep(transferred: true, finished: true);
         }
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
index cbaf9b4f26..fce5aa42ac 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
@@ -51,66 +51,23 @@ namespace osu.Game.Screens.Edit.Compose
             playfield.HitObjectUsageFinished += onHitObjectUsageFinished;
         }
 
-        private readonly Dictionary<HitObject, EventType> pendingEvents = new Dictionary<HitObject, EventType>();
+        private readonly List<HitObject> usageFinishedHitObjects = new List<HitObject>();
 
-        private void onHitObjectUsageBegan(HitObject hitObject) => updateEvent(hitObject, EventType.Began);
-
-        private void onHitObjectUsageFinished(HitObject hitObject) => updateEvent(hitObject, EventType.Finished);
-
-        private void updateEvent(HitObject hitObject, EventType newEvent)
+        private void onHitObjectUsageBegan(HitObject hitObject)
         {
-            if (!pendingEvents.TryGetValue(hitObject, out EventType existingEvent))
-            {
-                pendingEvents[hitObject] = newEvent;
-                return;
-            }
-
-            switch (existingEvent, newEvent)
-            {
-                // This exists as a safeguard to ensure that the sequence: { Began -> Finished }, where { ... } indicates a sequence within a single frame, does not trigger any events.
-                // This is unlikely to occur in practice as it requires the usage to finish immediately after the HitObjectContainer updates hitobject lifetimes,
-                // however, an Editor action scheduled somewhere between the lifetime update and this buffer's own Update() could cause this.
-                case (EventType.Began, EventType.Finished):
-                    pendingEvents.Remove(hitObject);
-                    break;
-
-                // This exists as a safeguard to ensure that the sequence: Began -> { Finished -> Began -> Finished }, where { ... } indicates a sequence within a single frame,
-                // correctly leads into a final "finished" state rather than remaining in the intermediate "transferred" state.
-                // As above, this is unlikely to occur in practice.
-                case (EventType.Transferred, EventType.Finished):
-                    pendingEvents[hitObject] = EventType.Finished;
-                    break;
-
-                case (EventType.Finished, EventType.Began):
-                    pendingEvents[hitObject] = EventType.Transferred;
-                    break;
-
-                default:
-                    throw new ArgumentOutOfRangeException($"Unexpected event update ({existingEvent} => {newEvent}).");
-            }
+            if (usageFinishedHitObjects.Remove(hitObject))
+                HitObjectUsageTransferred?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
+            else
+                HitObjectUsageBegan?.Invoke(hitObject);
         }
 
+        private void onHitObjectUsageFinished(HitObject hitObject) => usageFinishedHitObjects.Add(hitObject);
+
         public void Update()
         {
-            foreach (var (hitObject, e) in pendingEvents)
-            {
-                switch (e)
-                {
-                    case EventType.Began:
-                        HitObjectUsageBegan?.Invoke(hitObject);
-                        break;
-
-                    case EventType.Transferred:
-                        HitObjectUsageTransferred?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
-                        break;
-
-                    case EventType.Finished:
-                        HitObjectUsageFinished?.Invoke(hitObject);
-                        break;
-                }
-            }
-
-            pendingEvents.Clear();
+            foreach (var hitObject in usageFinishedHitObjects)
+                HitObjectUsageFinished?.Invoke(hitObject);
+            usageFinishedHitObjects.Clear();
         }
 
         public void Dispose()
@@ -121,28 +78,5 @@ namespace osu.Game.Screens.Edit.Compose
                 playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
             }
         }
-
-        private enum EventType
-        {
-            /// <summary>
-            /// A <see cref="HitObject"/> has started being used by a <see cref="DrawableHitObject"/>.
-            /// </summary>
-            Began,
-
-            /// <summary>
-            /// A <see cref="HitObject"/> has finished being used by a <see cref="DrawableHitObject"/>.
-            /// </summary>
-            Finished,
-
-            /// <summary>
-            /// An internal intermediate state that occurs when a <see cref="HitObject"/> has finished being used by one <see cref="DrawableHitObject"/>
-            /// and started being used by another <see cref="DrawableHitObject"/> in the same frame. The <see cref="DrawableHitObject"/> may be the same instance in both cases.
-            /// </summary>
-            /// <remarks>
-            /// This usually occurs when a <see cref="HitObject"/> is transferred between <see cref="HitObjectContainer"/>s,
-            /// but also occurs if the <see cref="HitObject"/> dies and becomes alive again in the same frame within the same <see cref="HitObjectContainer"/>.
-            /// </remarks>
-            Transferred
-        }
     }
 }

From d93ac7ac9842d08a0f0995779e1c179ed031870e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 19:13:13 +0900
Subject: [PATCH 10205/10326] Change class xmldoc a bit

---
 osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
index fce5aa42ac..621c901fb9 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
@@ -12,7 +12,8 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Screens.Edit.Compose
 {
     /// <summary>
-    /// Buffers events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy.
+    /// Buffers events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy
+    /// to ensure correct ordering of events.
     /// </summary>
     internal class HitObjectUsageEventBuffer : IDisposable
     {

From 2c65b8fa9366fded6ae5f3f2167b768a3017f3d5 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 18 May 2021 19:55:25 +0900
Subject: [PATCH 10206/10326] Revert "Fix uninitialized scrollLength value is
 used"

This reverts commit 73dfb04d
---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 538d4d1d11..915bab9a51 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -185,6 +185,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
             layoutComputed.Remove(hitObject);
         }
 
+        private float scrollLength;
+
         protected override void Update()
         {
             base.Update();
@@ -197,16 +199,29 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 layoutComputed.Clear();
 
                 scrollingInfo.Algorithm.Reset();
+
+                switch (direction.Value)
+                {
+                    case ScrollingDirection.Up:
+                    case ScrollingDirection.Down:
+                        scrollLength = DrawSize.Y;
+                        break;
+
+                    default:
+                        scrollLength = DrawSize.X;
+                        break;
+                }
+
                 layoutCache.Validate();
             }
         }
 
-        // We need to calculate hit object positions (including nested hit objects) as soon as possible after lifetimes
-        // to prevent hit objects displayed in a wrong position for one frame.
         protected override void UpdateAfterChildrenLife()
         {
             base.UpdateAfterChildrenLife();
 
+            // We need to calculate hit object positions (including nested hit objects) as soon as possible after lifetimes
+            // to prevent hit objects displayed in a wrong position for one frame.
             // Only AliveObjects need to be considered for layout (reduces overhead in the case of scroll speed changes).
             foreach (var obj in AliveObjects)
             {
@@ -245,7 +260,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
 
-            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, getLength());
+            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
         }
 
         private void updateLayoutRecursive(DrawableHitObject hitObject)
@@ -256,12 +271,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 {
                     case ScrollingDirection.Up:
                     case ScrollingDirection.Down:
-                        hitObject.Height = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, getLength());
+                        hitObject.Height = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, scrollLength);
                         break;
 
                     case ScrollingDirection.Left:
                     case ScrollingDirection.Right:
-                        hitObject.Width = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, getLength());
+                        hitObject.Width = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, scrollLength);
                         break;
                 }
             }
@@ -280,19 +295,19 @@ namespace osu.Game.Rulesets.UI.Scrolling
             switch (direction.Value)
             {
                 case ScrollingDirection.Up:
-                    hitObject.Y = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
+                    hitObject.Y = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
                     break;
 
                 case ScrollingDirection.Down:
-                    hitObject.Y = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
+                    hitObject.Y = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
                     break;
 
                 case ScrollingDirection.Left:
-                    hitObject.X = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
+                    hitObject.X = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
                     break;
 
                 case ScrollingDirection.Right:
-                    hitObject.X = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
+                    hitObject.X = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
                     break;
             }
         }

From 84a1a86c6329ff60021190f4c070c28707e736c3 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 18 May 2021 19:55:31 +0900
Subject: [PATCH 10207/10326] Revert "Use entry to calculate lifetime in
 ScrollingHOC"

This reverts commit 632bb70e
---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 60 +++++++++++--------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 915bab9a51..a9eaf3da68 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -5,9 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.Layout;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -19,18 +17,16 @@ namespace osu.Game.Rulesets.UI.Scrolling
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
+        /// <summary>
+        /// Hit objects which require lifetime computation in the next update call.
+        /// </summary>
+        private readonly HashSet<DrawableHitObject> toComputeLifetime = new HashSet<DrawableHitObject>();
+
         /// <summary>
         /// A set containing all <see cref="HitObjectContainer.AliveObjects"/> which have an up-to-date layout.
         /// </summary>
         private readonly HashSet<DrawableHitObject> layoutComputed = new HashSet<DrawableHitObject>();
 
-        /// <summary>
-        /// A conservative estimate of maximum bounding box of a <see cref="DrawableHitObject"/>
-        /// with respect to the start time position of the hit object.
-        /// It is used to calculate when the object appears inbound.
-        /// </summary>
-        protected virtual RectangleF GetDrawRectangle(HitObjectLifetimeEntry entry) => new RectangleF().Inflate(100);
-
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
@@ -58,6 +54,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             base.Clear();
 
+            toComputeLifetime.Clear();
             layoutComputed.Clear();
         }
 
@@ -169,6 +166,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         private void onRemoveRecursive(DrawableHitObject hitObject)
         {
+            toComputeLifetime.Remove(hitObject);
             layoutComputed.Remove(hitObject);
 
             hitObject.DefaultsApplied -= invalidateHitObject;
@@ -177,11 +175,14 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 onRemoveRecursive(nested);
         }
 
+        /// <summary>
+        /// Make this <see cref="DrawableHitObject"/> lifetime and layout computed in next update.
+        /// </summary>
         private void invalidateHitObject(DrawableHitObject hitObject)
         {
-            if (hitObject.ParentHitObject == null)
-                updateLifetime(hitObject.Entry);
-
+            // Lifetime computation is delayed until next update because
+            // when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed.
+            toComputeLifetime.Add(hitObject);
             layoutComputed.Remove(hitObject);
         }
 
@@ -193,8 +194,13 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (!layoutCache.IsValid)
             {
-                foreach (var entry in Entries)
-                    updateLifetime(entry);
+                toComputeLifetime.Clear();
+
+                foreach (var hitObject in Objects)
+                {
+                    if (hitObject.HitObject != null)
+                        toComputeLifetime.Add(hitObject);
+                }
 
                 layoutComputed.Clear();
 
@@ -214,6 +220,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
                 layoutCache.Validate();
             }
+
+            foreach (var hitObject in toComputeLifetime)
+                hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
+
+            toComputeLifetime.Clear();
         }
 
         protected override void UpdateAfterChildrenLife()
@@ -236,31 +247,32 @@ namespace osu.Game.Rulesets.UI.Scrolling
             }
         }
 
-        private void updateLifetime(HitObjectLifetimeEntry entry)
+        private double computeOriginAdjustedLifetimeStart(DrawableHitObject hitObject)
         {
-            var rectangle = GetDrawRectangle(entry);
-            float startOffset = 0;
+            float originAdjustment = 0.0f;
 
+            // calculate the dimension of the part of the hitobject that should already be visible
+            // when the hitobject origin first appears inside the scrolling container
             switch (direction.Value)
             {
-                case ScrollingDirection.Right:
-                    startOffset = rectangle.Right;
+                case ScrollingDirection.Up:
+                    originAdjustment = hitObject.OriginPosition.Y;
                     break;
 
                 case ScrollingDirection.Down:
-                    startOffset = rectangle.Bottom;
+                    originAdjustment = hitObject.DrawHeight - hitObject.OriginPosition.Y;
                     break;
 
                 case ScrollingDirection.Left:
-                    startOffset = -rectangle.Left;
+                    originAdjustment = hitObject.OriginPosition.X;
                     break;
 
-                case ScrollingDirection.Up:
-                    startOffset = -rectangle.Top;
+                case ScrollingDirection.Right:
+                    originAdjustment = hitObject.DrawWidth - hitObject.OriginPosition.X;
                     break;
             }
 
-            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
+            return scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
         }
 
         private void updateLayoutRecursive(DrawableHitObject hitObject)

From ee9fe3c4bef77f8c7e4c3d67882fa741e1d86932 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 18 May 2021 19:55:44 +0900
Subject: [PATCH 10208/10326] Revert "Add failing test showing lifetime not
 recomputed with pooled objects"

This reverts commit b88e5a31
---
 .../Gameplay/TestSceneDrawableScrollingRuleset.cs  | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 75a5eec6f7..9931ee4a45 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -90,20 +90,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             assertChildPosition(5);
         }
 
-        [TestCase("pooled")]
-        [TestCase("non-pooled")]
-        public void TestLifetimeRecomputedWhenTimeRangeChanges(string pooled)
-        {
-            var beatmap = createBeatmap(_ => pooled == "pooled" ? new TestPooledHitObject() : new TestHitObject());
-            beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
-            createTest(beatmap);
-
-            assertDead(3);
-
-            AddStep("increase time range", () => drawableRuleset.TimeRange.Value = 3 * time_range);
-            assertPosition(3, 1);
-        }
-
         [Test]
         public void TestRelativeBeatLengthScaleSingleTimingPoint()
         {

From 5f94b3bdacfcd6c7f4eb53e038767df905d234d1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 21:03:59 +0900
Subject: [PATCH 10209/10326] Remove legacy playlist item ID handling

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index c0706b082d..7fe48d54b1 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -92,10 +92,6 @@ namespace osu.Game.Online.Multiplayer
         [Resolved]
         private UserLookupCache userLookupCache { get; set; } = null!;
 
-        // Only exists for compatibility with old osu-server-spectator build.
-        // Todo: Can be removed on 2021/02/26.
-        private long defaultPlaylistItemId;
-
         private Room? apiRoom;
 
         [BackgroundDependencyLoader]
@@ -143,7 +139,6 @@ namespace osu.Game.Online.Multiplayer
                 {
                     Room = joinedRoom;
                     apiRoom = room;
-                    defaultPlaylistItemId = apiRoom.Playlist.FirstOrDefault()?.ID ?? 0;
                     foreach (var user in joinedRoom.Users)
                         updateUserPlayingState(user.UserID, user.State);
                 }, cancellationSource.Token).ConfigureAwait(false);
@@ -581,7 +576,7 @@ namespace osu.Game.Online.Multiplayer
 
             void updateItem(PlaylistItem item)
             {
-                item.ID = settings.PlaylistItemId == 0 ? defaultPlaylistItemId : settings.PlaylistItemId;
+                item.ID = settings.PlaylistItemId;
                 item.Beatmap.Value = beatmap;
                 item.Ruleset.Value = ruleset.RulesetInfo;
                 item.RequiredMods.Clear();

From c6160d53044b35abd0ee8168b0bb28344dd4d345 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 21:17:33 +0900
Subject: [PATCH 10210/10326] Only ignore online score id for database import

---
 osu.Game/Screens/Play/Player.cs           | 17 ++++++++++++++---
 osu.Game/Screens/Play/SubmittingPlayer.cs |  7 +------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 890883f0d2..6317a41bec 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -929,11 +929,11 @@ namespace osu.Game.Screens.Play
         /// </summary>
         /// <param name="score">The <see cref="Score"/> to import.</param>
         /// <returns>The imported score.</returns>
-        protected virtual Task ImportScore(Score score)
+        protected virtual async Task ImportScore(Score score)
         {
             // Replays are already populated and present in the game's database, so should not be re-imported.
             if (DrawableRuleset.ReplayScore != null)
-                return Task.CompletedTask;
+                return;
 
             LegacyByteArrayReader replayReader;
 
@@ -943,7 +943,18 @@ namespace osu.Game.Screens.Play
                 replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
             }
 
-            return scoreManager.Import(score.ScoreInfo, replayReader);
+            // For the time being, online ID responses are not really useful for anything.
+            // In addition, the IDs provided via new (lazer) endpoints are based on a different autoincrement from legacy (stable) scores.
+            //
+            // Until we better define the server-side logic behind this, let's not store the online ID to avoid potential unique constraint
+            // conflicts across various systems (ie. solo and multiplayer).
+            long? onlineScoreId = score.ScoreInfo.OnlineScoreID;
+            score.ScoreInfo.OnlineScoreID = null;
+
+            await scoreManager.Import(score.ScoreInfo, replayReader).ConfigureAwait(false);
+
+            // ... And restore the online ID for other processes to handle correctly (e.g. de-duplication for the results screen).
+            score.ScoreInfo.OnlineScoreID = onlineScoreId;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index d5ad87c70c..23b9037244 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -116,12 +116,7 @@ namespace osu.Game.Screens.Play
 
             request.Success += s =>
             {
-                // For the time being, online ID responses are not really useful for anything.
-                // In addition, the IDs provided via new (lazer) endpoints are based on a different autoincrement from legacy (stable) scores.
-                //
-                // Until we better define the server-side logic behind this, let's not store the online ID to avoid potential unique constraint
-                // conflicts across various systems (ie. solo and multiplayer).
-                // score.ScoreInfo.OnlineScoreID = s.ID;
+                score.ScoreInfo.OnlineScoreID = s.ID;
                 tcs.SetResult(true);
             };
 

From 775e0fbde5e6de0a7d20558e105b251ed994f8da Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 18 May 2021 15:27:20 +0200
Subject: [PATCH 10211/10326] Mark StableImportManager as nullable.

---
 osu.Game/Screens/Select/SongSelect.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 729e25203f..74e10037ab 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Select
 
         protected virtual bool ShowFooter => true;
 
-        protected virtual bool DisplayStableImportPrompt => stableImportManager.SupportsImportFromStable;
+        protected virtual bool DisplayStableImportPrompt => stableImportManager?.SupportsImportFromStable == true;
 
         /// <summary>
         /// Can be null if <see cref="ShowFooter"/> is false.
@@ -85,7 +85,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private StableImportManager stableImportManager { get; set; }
 
         protected ModSelectOverlay ModSelect { get; private set; }

From 76a377f3e09d88bde52e9309558633219f118e3f Mon Sep 17 00:00:00 2001
From: Vinicius Barbosa <vininew921@hotmail.com>
Date: Tue, 18 May 2021 15:30:45 +0200
Subject: [PATCH 10212/10326] Fixed applause sound stopping after switching
 scores

---
 .../Ranking/Expanded/Accuracy/AccuracyCircle.cs | 10 ----------
 osu.Game/Screens/Ranking/ResultsScreen.cs       | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index bca3a07fa6..28829c4ed8 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -83,8 +83,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         private Container<RankBadge> badges;
         private RankText rankText;
 
-        private SkinnableSound applauseSound;
-
         public AccuracyCircle(ScoreInfo score, bool withFlair)
         {
             this.score = score;
@@ -211,13 +209,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                 },
                 rankText = new RankText(score.Rank)
             };
-
-            if (withFlair)
-            {
-                AddInternal(applauseSound = score.Rank >= ScoreRank.A
-                    ? new SkinnableSound(new SampleInfo("Results/rankpass", "applause"))
-                    : new SkinnableSound(new SampleInfo("Results/rankfail")));
-            }
         }
 
         private ScoreRank getRank(ScoreRank rank)
@@ -256,7 +247,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
 
                 using (BeginDelayedSequence(TEXT_APPEAR_DELAY, true))
                 {
-                    this.Delay(-1440).Schedule(() => applauseSound?.Play());
                     rankText.Appear();
                 }
             }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index c1f5d92d17..20480c5367 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Screens;
+using osu.Game.Audio;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
@@ -19,7 +20,9 @@ using osu.Game.Online.API;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
 using osu.Game.Screens.Ranking.Statistics;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Ranking
@@ -56,6 +59,8 @@ namespace osu.Game.Screens.Ranking
         private readonly bool allowRetry;
         private readonly bool allowWatchingReplay;
 
+        private SkinnableSound applauseSound;
+
         protected ResultsScreen(ScoreInfo score, bool allowRetry, bool allowWatchingReplay = true)
         {
             Score = score;
@@ -146,6 +151,13 @@ namespace osu.Game.Screens.Ranking
                 bool shouldFlair = player != null && !Score.Mods.Any(m => m is ModAutoplay);
 
                 ScorePanelList.AddScore(Score, shouldFlair);
+
+                if (shouldFlair)
+                {
+                    AddInternal(applauseSound = Score.Rank >= ScoreRank.A
+                        ? new SkinnableSound(new SampleInfo("Results/rankpass", "applause"))
+                        : new SkinnableSound(new SampleInfo("Results/rankfail")));
+                }
             }
 
             if (allowWatchingReplay)
@@ -183,6 +195,11 @@ namespace osu.Game.Screens.Ranking
                 api.Queue(req);
 
             statisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
+
+            using(BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY, true))
+            {
+                this.Delay(-1000).Schedule(() => applauseSound?.Play());
+            }
         }
 
         protected override void Update()

From 06fffc499b3dd28759e44af39a5ca66176fbd193 Mon Sep 17 00:00:00 2001
From: Vinicius Barbosa <vininew921@hotmail.com>
Date: Tue, 18 May 2021 16:56:07 +0200
Subject: [PATCH 10213/10326] Removed unused variables and directives

---
 osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs | 5 -----
 osu.Game/Screens/Ranking/ResultsScreen.cs                    | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 28829c4ed8..ec48a6313b 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -10,11 +10,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
-using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded.Accuracy
@@ -76,8 +74,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
 
         private readonly ScoreInfo score;
 
-        private readonly bool withFlair;
-
         private SmoothCircularProgress accuracyCircle;
         private SmoothCircularProgress innerMask;
         private Container<RankBadge> badges;
@@ -86,7 +82,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         public AccuracyCircle(ScoreInfo score, bool withFlair)
         {
             this.score = score;
-            this.withFlair = withFlair;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 20480c5367..ab065f7dd4 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Screens.Ranking
 
             statisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
 
-            using(BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY, true))
+            using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY, true))
             {
                 this.Delay(-1000).Schedule(() => applauseSound?.Play());
             }

From ac5fe0c18cf50c2fa8b1bd112d0f9499b0516f18 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 18 May 2021 15:58:18 +0200
Subject: [PATCH 10214/10326] Change larger freemod selection overlay

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 375aac729d..fa30826ee9 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
                     Origin = Anchor.BottomLeft,
                     Depth = float.MinValue,
                     RelativeSizeAxes = Axes.Both,
-                    Height = 0.5f,
+                    Height = 1.0f,
                     Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
                     Child = userModsSelectOverlay = new UserModSelectOverlay
                     {

From d05ffdf120c0f13080f43d71b16884efb9d5da8c Mon Sep 17 00:00:00 2001
From: Vinicius Barbosa <vininew921@hotmail.com>
Date: Tue, 18 May 2021 20:19:18 +0200
Subject: [PATCH 10215/10326] Added constants for delay value

---
 .../Visual/Ranking/TestSceneAccuracyCircle.cs  |  2 +-
 .../Expanded/Accuracy/AccuracyCircle.cs        |  7 ++++++-
 .../Expanded/ExpandedPanelMiddleContent.cs     |  2 +-
 osu.Game/Screens/Ranking/ResultsScreen.cs      |  2 +-
 osu.Game/Screens/Ranking/ScorePanel.cs         | 18 +++++++++---------
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index 2af15923a0..1e87893f39 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Ranking
                         }
                     }
                 },
-                new AccuracyCircle(score, true)
+                new AccuracyCircle(score)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index ec48a6313b..4fca4759f2 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -37,6 +37,11 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         /// </summary>
         public const double ACCURACY_TRANSFORM_DURATION = 3000;
 
+        /// <summary>
+        /// Delay before the default applause sound is played to match the <see cref="rankText"/> timing
+        /// </summary>
+        public const double APPLAUSE_DELAY = 1440;
+
         /// <summary>
         /// Delay after <see cref="ACCURACY_TRANSFORM_DURATION"/> for the rank text (A/B/C/D/S/SS) to appear.
         /// </summary>
@@ -79,7 +84,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         private Container<RankBadge> badges;
         private RankText rankText;
 
-        public AccuracyCircle(ScoreInfo score, bool withFlair)
+        public AccuracyCircle(ScoreInfo score)
         {
             this.score = score;
         }
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 6a6b39b61c..4895240314 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     Margin = new MarginPadding { Top = 40 },
                                     RelativeSizeAxes = Axes.X,
                                     Height = 230,
-                                    Child = new AccuracyCircle(score, withFlair)
+                                    Child = new AccuracyCircle(score)
                                     {
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index ab065f7dd4..e25bbbe253 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -198,7 +198,7 @@ namespace osu.Game.Screens.Ranking
 
             using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY, true))
             {
-                this.Delay(-1000).Schedule(() => applauseSound?.Play());
+                this.Delay(ScorePanel.RESIZE_DURATION + ScorePanel.TOP_LAYER_EXPAND_DELAY - AccuracyCircle.APPLAUSE_DELAY).Schedule(() => applauseSound?.Play());
             }
         }
 
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index df710e4eb8..f66a998db6 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -54,12 +54,12 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Duration for the panel to resize into its expanded/contracted size.
         /// </summary>
-        private const double resize_duration = 200;
+        public const double RESIZE_DURATION = 200;
 
         /// <summary>
-        /// Delay after <see cref="resize_duration"/> before the top layer is expanded.
+        /// Delay after <see cref="RESIZE_DURATION"/> before the top layer is expanded.
         /// </summary>
-        private const double top_layer_expand_delay = 100;
+        public const double TOP_LAYER_EXPAND_DELAY = 100;
 
         /// <summary>
         /// Duration for the top layer expansion.
@@ -208,8 +208,8 @@ namespace osu.Game.Screens.Ranking
                 case PanelState.Expanded:
                     Size = new Vector2(EXPANDED_WIDTH, expanded_height);
 
-                    topLayerBackground.FadeColour(expanded_top_layer_colour, resize_duration, Easing.OutQuint);
-                    middleLayerBackground.FadeColour(expanded_middle_layer_colour, 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(topLayerContent = new ExpandedPanelTopContent(Score.User).With(d => d.Alpha = 0));
                     middleLayerContentContainer.Add(middleLayerContent = new ExpandedPanelMiddleContent(Score, displayWithFlair).With(d => d.Alpha = 0));
@@ -221,20 +221,20 @@ namespace osu.Game.Screens.Ranking
                 case PanelState.Contracted:
                     Size = new Vector2(CONTRACTED_WIDTH, contracted_height);
 
-                    topLayerBackground.FadeColour(contracted_top_layer_colour, resize_duration, Easing.OutQuint);
-                    middleLayerBackground.FadeColour(contracted_middle_layer_colour, resize_duration, Easing.OutQuint);
+                    topLayerBackground.FadeColour(contracted_top_layer_colour, RESIZE_DURATION, Easing.OutQuint);
+                    middleLayerBackground.FadeColour(contracted_middle_layer_colour, RESIZE_DURATION, Easing.OutQuint);
 
                     topLayerContentContainer.Add(topLayerContent = new ContractedPanelTopContent(Score).With(d => d.Alpha = 0));
                     middleLayerContentContainer.Add(middleLayerContent = new ContractedPanelMiddleContent(Score).With(d => d.Alpha = 0));
                     break;
             }
 
-            content.ResizeTo(Size, resize_duration, Easing.OutQuint);
+            content.ResizeTo(Size, RESIZE_DURATION, Easing.OutQuint);
 
             bool topLayerExpanded = topLayerContainer.Y < 0;
 
             // If the top layer was already expanded, then we don't need to wait for the resize and can instead transform immediately. This looks better when changing the panel state.
-            using (BeginDelayedSequence(topLayerExpanded ? 0 : resize_duration + top_layer_expand_delay, true))
+            using (BeginDelayedSequence(topLayerExpanded ? 0 : RESIZE_DURATION + TOP_LAYER_EXPAND_DELAY, true))
             {
                 topLayerContainer.FadeIn();
 

From d70d37b7f46ec340113e0e531ac38f0975eccf63 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 18 May 2021 22:30:36 +0300
Subject: [PATCH 10216/10326] Remove convoluted autosize logic in MonthSection

---
 .../Overlays/News/Sidebar/MonthSection.cs     | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 166da97f93..2fc88b3909 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -139,24 +139,23 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
+                AutoSizeDuration = animation_duration;
+                AutoSizeEasing = Easing.Out;
                 InternalChild = content = new FillFlowContainer
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(0, 5)
+                    Spacing = new Vector2(0, 5),
+                    Alpha = 0
                 };
             }
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-
                 IsOpen.BindValueChanged(_ => updateState(), true);
-
-                // First state change should be instant.
-                FinishTransforms(true);
             }
 
             private void updateState()
@@ -176,22 +175,6 @@ namespace osu.Game.Overlays.News.Sidebar
                     content.FadeOut(animation_duration, Easing.OutQuint);
                 }
             }
-
-            private bool autoSizeTransitionApplied;
-
-            // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutoSize{Duration,Easing}.
-            protected override void UpdateAfterAutoSize()
-            {
-                base.UpdateAfterAutoSize();
-
-                if (!autoSizeTransitionApplied)
-                {
-                    AutoSizeDuration = animation_duration;
-                    AutoSizeEasing = Easing.OutQuint;
-
-                    autoSizeTransitionApplied = true;
-                }
-            }
         }
     }
 }

From 1fd00d1313bd7ff8c5acf828843170b5f287b283 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 18 May 2021 21:52:28 +0200
Subject: [PATCH 10217/10326] Change from fullscreen to 0.7

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index fa30826ee9..7395b346a4 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
                     Origin = Anchor.BottomLeft,
                     Depth = float.MinValue,
                     RelativeSizeAxes = Axes.Both,
-                    Height = 1.0f,
+                    Height = 0.7f,
                     Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
                     Child = userModsSelectOverlay = new UserModSelectOverlay
                     {

From bde7f88eb3bbc69e0528cab118b698fa08600825 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 18 May 2021 14:23:22 -0700
Subject: [PATCH 10218/10326] Don't show warning screen when registering on dev
 server

---
 osu.Game/Overlays/AccountCreation/ScreenWarning.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index b2096968fe..ea5f1a6278 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -26,11 +26,14 @@ namespace osu.Game.Overlays.AccountCreation
         [Resolved(CanBeNull = true)]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
         private const string help_centre_url = "/help/wiki/Help_Centre#login";
 
         public override void OnEntering(IScreen last)
         {
-            if (string.IsNullOrEmpty(api?.ProvidedUsername))
+            if (string.IsNullOrEmpty(api?.ProvidedUsername) || game.UseDevelopmentServer)
             {
                 this.FadeOut();
                 this.Push(new ScreenEntry());

From 4cc573690e7d366cf801a235c156350fda7a0261 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 18 May 2021 14:32:56 -0700
Subject: [PATCH 10219/10326] Move OsuGame out of load method

---
 osu.Game/Overlays/AccountCreation/ScreenWarning.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index ea5f1a6278..2605a0a6d6 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -26,8 +26,8 @@ namespace osu.Game.Overlays.AccountCreation
         [Resolved(CanBeNull = true)]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
-        private OsuGameBase game { get; set; }
+        [Resolved(canBeNull: true)]
+        private OsuGame game { get; set; }
 
         private const string help_centre_url = "/help/wiki/Help_Centre#login";
 
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.AccountCreation
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, OsuGame game, TextureStore textures)
+        private void load(OsuColour colours, TextureStore textures)
         {
             if (string.IsNullOrEmpty(api?.ProvidedUsername))
                 return;

From e8bc2cac5bc058bdae888dcd0bc67e9d84b6fc47 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 May 2021 13:36:39 +0900
Subject: [PATCH 10220/10326] Fix test not being marked as headless

---
 .../Editing/TestSceneHitObjectContainerEventBuffer.cs           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
index 5233cbc0be..592971dbaf 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
@@ -4,6 +4,7 @@
 using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -12,6 +13,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.Editing
 {
+    [HeadlessTest]
     public class TestSceneHitObjectContainerEventBuffer : OsuTestScene
     {
         private readonly TestHitObject testObj = new TestHitObject();

From 539e5179fe8ef9d9cd148882a063595295872815 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 15:45:24 +0900
Subject: [PATCH 10221/10326] Tidy up content and bind event code

---
 .../Overlays/News/Sidebar/MonthSection.cs     | 22 +++++++++----------
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs  |  4 ++--
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 2fc88b3909..9fc4f49bd3 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -117,10 +117,10 @@ namespace osu.Game.Overlays.News.Sidebar
             }
 
             [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider, GameHost host)
+            private void load(OverlayColourProvider overlayColours, GameHost host)
             {
-                IdleColour = colourProvider.Light2;
-                HoverColour = colourProvider.Light1;
+                IdleColour = overlayColours.Light2;
+                HoverColour = overlayColours.Light1;
 
                 TooltipText = "view in browser";
                 Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
@@ -131,9 +131,7 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             public readonly BindableBool IsOpen = new BindableBool();
 
-            protected override Container<Drawable> Content => content;
-
-            private readonly FillFlowContainer content;
+            protected override Container<Drawable> Content { get; }
 
             public PostsContainer()
             {
@@ -141,7 +139,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 AutoSizeAxes = Axes.Y;
                 AutoSizeDuration = animation_duration;
                 AutoSizeEasing = Easing.Out;
-                InternalChild = content = new FillFlowContainer
+                InternalChild = Content = new FillFlowContainer
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
@@ -155,24 +153,24 @@ namespace osu.Game.Overlays.News.Sidebar
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                IsOpen.BindValueChanged(_ => updateState(), true);
+                IsOpen.BindValueChanged(updateState, true);
             }
 
-            private void updateState()
+            private void updateState(ValueChangedEvent<bool> isOpen)
             {
                 ClearTransforms(true);
 
-                if (IsOpen.Value)
+                if (isOpen.NewValue)
                 {
                     AutoSizeAxes = Axes.Y;
-                    content.FadeIn(animation_duration, Easing.OutQuint);
+                    Content.FadeIn(animation_duration, Easing.OutQuint);
                 }
                 else
                 {
                     AutoSizeAxes = Axes.None;
                     this.ResizeHeightTo(0, animation_duration, Easing.OutQuint);
 
-                    content.FadeOut(animation_duration, Easing.OutQuint);
+                    Content.FadeOut(animation_duration, Easing.OutQuint);
                 }
             }
         }
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 849cdbf659..b6bbdbb6d4 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.News.Sidebar
         private FillFlowContainer yearsFlow;
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider, Bindable<APINewsSidebar> metadata)
+        private void load(OverlayColourProvider overlayColours, Bindable<APINewsSidebar> metadata)
         {
             this.metadata.BindTo(metadata);
 
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background3
+                    Colour = overlayColours.Background3
                 },
                 new Container
                 {

From 19a07b01073f821f4c02131f7834474396ea8d49 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 15:48:31 +0900
Subject: [PATCH 10222/10326] IsOpen -> Expanded

---
 .../Overlays/News/Sidebar/MonthSection.cs     | 21 ++++++++++---------
 osu.Game/Overlays/News/Sidebar/NewsSidebar.cs |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 9fc4f49bd3..b300a755f9 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.News.Sidebar
     {
         private const int animation_duration = 250;
 
-        public readonly BindableBool IsOpen = new BindableBool();
+        public readonly BindableBool Expanded = new BindableBool();
 
         public MonthSection(int month, int year, IEnumerable<APINewsPost> posts)
         {
@@ -32,6 +32,7 @@ namespace osu.Game.Overlays.News.Sidebar
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Masking = true;
+
             InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -41,11 +42,11 @@ namespace osu.Game.Overlays.News.Sidebar
                 {
                     new DropdownHeader(month, year)
                     {
-                        IsOpen = { BindTarget = IsOpen }
+                        Expanded = { BindTarget = Expanded }
                     },
                     new PostsContainer
                     {
-                        IsOpen = { BindTarget = IsOpen },
+                        Expanded = { BindTarget = Expanded },
                         Children = posts.Select(p => new PostButton(p)).ToArray()
                     }
                 }
@@ -54,7 +55,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private class DropdownHeader : OsuClickableContainer
         {
-            public readonly BindableBool IsOpen = new BindableBool();
+            public readonly BindableBool Expanded = new BindableBool();
 
             private readonly SpriteIcon icon;
 
@@ -64,7 +65,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 RelativeSizeAxes = Axes.X;
                 Height = 15;
-                Action = IsOpen.Toggle;
+                Action = Expanded.Toggle;
                 Children = new Drawable[]
                 {
                     new OsuSpriteText
@@ -88,7 +89,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 base.LoadComplete();
 
-                IsOpen.BindValueChanged(open =>
+                Expanded.BindValueChanged(open =>
                 {
                     icon.Scale = new Vector2(1, open.NewValue ? -1 : 1);
                 }, true);
@@ -129,7 +130,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private class PostsContainer : Container
         {
-            public readonly BindableBool IsOpen = new BindableBool();
+            public readonly BindableBool Expanded = new BindableBool();
 
             protected override Container<Drawable> Content { get; }
 
@@ -153,14 +154,14 @@ namespace osu.Game.Overlays.News.Sidebar
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                IsOpen.BindValueChanged(updateState, true);
+                Expanded.BindValueChanged(updateState, true);
             }
 
-            private void updateState(ValueChangedEvent<bool> isOpen)
+            private void updateState(ValueChangedEvent<bool> expanded)
             {
                 ClearTransforms(true);
 
-                if (isOpen.NewValue)
+                if (expanded.NewValue)
                 {
                     AutoSizeAxes = Axes.Y;
                     Content.FadeIn(animation_duration, Easing.OutQuint);
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
index b8d283b7e2..d14ad90ef4 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 monthsFlow.Add(new MonthSection(month, year, posts)
                 {
-                    IsOpen = { Value = i == 0 }
+                    Expanded = { Value = i == 0 }
                 });
             }
         }

From cc5c702a92ddf6306e8b136699f299b1d1c7d484 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 17:31:47 +0900
Subject: [PATCH 10223/10326] Apply all properties after cast (looks cleaner)

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 57d3f54716..9b5893b268 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -116,9 +116,9 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             base.OnNewDrawableHitObject(drawableHitObject);
 
-            drawableHitObject.AccentColour.Value = AccentColour;
-
             DrawableManiaHitObject maniaObject = (DrawableManiaHitObject)drawableHitObject;
+
+            maniaObject.AccentColour.Value = AccentColour;
             maniaObject.CheckHittable = hitPolicy.IsHittable;
         }
 

From a0f67ef3bc1bab4ae0d07115d6df97ef23bb88d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 18:57:52 +0900
Subject: [PATCH 10224/10326] Move scaling logic out of `OsuSelectionHandler`
 for reuse

---
 .../Edit/OsuSelectionHandler.cs               | 18 +----------------
 .../Compose/Components/SelectionHandler.cs    | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index aaf3517c9c..8cb86bc108 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -225,26 +225,10 @@ namespace osu.Game.Rulesets.Osu.Edit
         private void scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
         {
             scale = getClampedScale(hitObjects, reference, scale);
-
-            // move the selection before scaling if dragging from top or left anchors.
-            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
-            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
-
             Quad selectionQuad = getSurroundingQuad(hitObjects);
 
             foreach (var h in hitObjects)
-            {
-                var newPosition = h.Position;
-
-                // guard against no-ops and NaN.
-                if (scale.X != 0 && selectionQuad.Width > 0)
-                    newPosition.X = selectionQuad.TopLeft.X + xOffset + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
-
-                if (scale.Y != 0 && selectionQuad.Height > 0)
-                    newPosition.Y = selectionQuad.TopLeft.Y + yOffset + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
-
-                h.Position = newPosition;
-            }
+                h.Position = GetScaledPosition(reference, scale, selectionQuad, h.Position);
         }
 
         private (bool X, bool Y) isQuadInBounds(Quad quad)
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index bfd5ab7afa..26328b4dc7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -375,6 +375,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return position;
         }
 
+        /// <summary>
+        /// Given a scale vector, a surrounding quad for all selected objects, and a position,
+        /// will return the scaled position in screen space coordinates.
+        /// </summary>
+        protected static Vector2 GetScaledPosition(Anchor reference, Vector2 scale, Quad selectionQuad, Vector2 position)
+        {
+            // adjust the direction of scale depending on which side the user is dragging.
+            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
+            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
+
+            // guard against no-ops and NaN.
+            if (scale.X != 0 && selectionQuad.Width > 0)
+                position.X = selectionQuad.TopLeft.X + xOffset + (position.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
+
+            if (scale.Y != 0 && selectionQuad.Height > 0)
+                position.Y = selectionQuad.TopLeft.Y + yOffset + (position.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
+
+            return position;
+        }
+
         /// <summary>
         /// Returns a quad surrounding the provided points.
         /// </summary>

From b2c736b42a52c91f8780ad00602a0dd18d1e6b83 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 18:09:46 +0900
Subject: [PATCH 10225/10326] Combine and move `const` closer to usage

---
 .../Ranking/Expanded/Accuracy/AccuracyCircle.cs       |  5 -----
 osu.Game/Screens/Ranking/ResultsScreen.cs             | 11 +++++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 4fca4759f2..c70b4dd35b 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -37,11 +37,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         /// </summary>
         public const double ACCURACY_TRANSFORM_DURATION = 3000;
 
-        /// <summary>
-        /// Delay before the default applause sound is played to match the <see cref="rankText"/> timing
-        /// </summary>
-        public const double APPLAUSE_DELAY = 1440;
-
         /// <summary>
         /// Delay after <see cref="ACCURACY_TRANSFORM_DURATION"/> for the rank text (A/B/C/D/S/SS) to appear.
         /// </summary>
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index e25bbbe253..a0ea27b640 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -29,6 +29,11 @@ namespace osu.Game.Screens.Ranking
 {
     public abstract class ResultsScreen : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>
     {
+        /// <summary>
+        /// Delay before the default applause sound should be played, in order to match the grade display timing in <see cref="AccuracyCircle"/>.
+        /// </summary>
+        public const double APPLAUSE_DELAY = AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY + ScorePanel.RESIZE_DURATION + ScorePanel.TOP_LAYER_EXPAND_DELAY - 1440;
+
         protected const float BACKGROUND_BLUR = 20;
         private static readonly float screen_height = 768 - TwoLayerButton.SIZE_EXTENDED.Y;
 
@@ -196,10 +201,8 @@ namespace osu.Game.Screens.Ranking
 
             statisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
 
-            using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY, true))
-            {
-                this.Delay(ScorePanel.RESIZE_DURATION + ScorePanel.TOP_LAYER_EXPAND_DELAY - AccuracyCircle.APPLAUSE_DELAY).Schedule(() => applauseSound?.Play());
-            }
+            using (BeginDelayedSequence(APPLAUSE_DELAY))
+                Schedule(() => applauseSound?.Play());
         }
 
         protected override void Update()

From 6c4709e7b4546faf39e7df98b4b143e461ebef9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 18:34:02 +0900
Subject: [PATCH 10226/10326] Fix `PlacementBlueprint` using the wrong beatmap
 when applying defaults

Closes #12855.
---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 4ad8c815fe..82e90399c9 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -36,7 +36,8 @@ namespace osu.Game.Rulesets.Edit
         [Resolved(canBeNull: true)]
         protected EditorClock EditorClock { get; private set; }
 
-        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; }
 
         private Bindable<double> startTimeBindable;
 
@@ -58,10 +59,8 @@ namespace osu.Game.Rulesets.Edit
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap)
+        private void load()
         {
-            this.beatmap.BindTo(beatmap);
-
             startTimeBindable = HitObject.StartTimeBindable.GetBoundCopy();
             startTimeBindable.BindValueChanged(_ => ApplyDefaultsToHitObject(), true);
         }
@@ -113,7 +112,7 @@ namespace osu.Game.Rulesets.Edit
         /// Invokes <see cref="Objects.HitObject.ApplyDefaults(ControlPointInfo,BeatmapDifficulty, CancellationToken)"/>,
         /// refreshing <see cref="Objects.HitObject.NestedHitObjects"/> and parameters for the <see cref="HitObject"/>.
         /// </summary>
-        protected void ApplyDefaultsToHitObject() => HitObject.ApplyDefaults(beatmap.Value.Beatmap.ControlPointInfo, beatmap.Value.Beatmap.BeatmapInfo.BaseDifficulty);
+        protected void ApplyDefaultsToHitObject() => HitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.BeatmapInfo.BaseDifficulty);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent?.ReceivePositionalInputAt(screenSpacePos) ?? false;
 

From 6a3c58b9adfc6184f23ae0eefa6c39c38bbfdc47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 19:58:55 +0900
Subject: [PATCH 10227/10326] Implement proper scaling algorithms

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 98 +++++++++++++++++--
 1 file changed, 88 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 2eb4ea107d..18c9341db9 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -34,9 +34,94 @@ namespace osu.Game.Skinning.Editor
         {
             adjustScaleFromAnchor(ref scale, anchor);
 
-            foreach (var c in SelectedBlueprints)
-                // TODO: this is temporary and will be fixed with a separate refactor of selection transform logic.
-                ((Drawable)c.Item).Scale += scale * 0.02f;
+            if (SelectedBlueprints.Count > 1)
+            {
+                var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
+                    b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+
+                // the selection quad is always upright, so use a rect to make mutating the values easier.
+                var adjustedRect = selectionQuad.AABBFloat;
+
+                // for now aspect lock scale adjustments that occur at corners.
+                if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
+                    scale.Y = scale.X / selectionQuad.Width * selectionQuad.Height;
+
+                if (anchor.HasFlagFast(Anchor.x0))
+                {
+                    adjustedRect.X -= scale.X;
+                    adjustedRect.Width += scale.X;
+                }
+                else if (anchor.HasFlagFast(Anchor.x2))
+                {
+                    adjustedRect.Width += scale.X;
+                }
+
+                if (anchor.HasFlagFast(Anchor.y0))
+                {
+                    adjustedRect.Y -= scale.Y;
+                    adjustedRect.Height += scale.Y;
+                }
+                else if (anchor.HasFlagFast(Anchor.y2))
+                {
+                    adjustedRect.Height += scale.Y;
+                }
+
+                // scale adjust should match that of the quad itself.
+                var scaledDelta = new Vector2(
+                    adjustedRect.Width / selectionQuad.Width - 1,
+                    adjustedRect.Height / selectionQuad.Height - 1
+                );
+
+                foreach (var b in SelectedBlueprints)
+                {
+                    var drawableItem = (Drawable)b.Item;
+
+                    if (SelectedBlueprints.Count > 1)
+                    {
+                        // each drawable's relative position should be maintained in the scaled quad.
+                        var screenPosition = b.ScreenSpaceSelectionPoint;
+
+                        var relativePositionInOriginal =
+                            new Vector2(
+                                (screenPosition.X - selectionQuad.TopLeft.X) / selectionQuad.Width,
+                                (screenPosition.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height
+                            );
+
+                        var newPositionInAdjusted = new Vector2(
+                            adjustedRect.TopLeft.X + adjustedRect.Width * relativePositionInOriginal.X,
+                            adjustedRect.TopLeft.Y + adjustedRect.Height * relativePositionInOriginal.Y
+                        );
+
+                        drawableItem.Position = drawableItem.Parent.ToLocalSpace(newPositionInAdjusted) - drawableItem.AnchorPosition;
+                        drawableItem.Scale += scaledDelta;
+                    }
+                }
+            }
+            else
+            {
+                var blueprint = SelectedBlueprints.First();
+                var drawableItem = (Drawable)blueprint.Item;
+
+                // the number of local "pixels" the drag operation resulted in.
+                // our goal is to increase the drawable's draw size by this amount.
+                var scaledDelta = drawableItem.ScreenSpaceDeltaToParentSpace(scale);
+
+                scaledDelta = new Vector2(
+                    scaledDelta.X / drawableItem.DrawWidth,
+                    scaledDelta.Y / drawableItem.DrawHeight
+                );
+
+                // handle the case where scaling with a centre origin needs double the adjustments to match
+                // user cursor movement.
+                if (drawableItem.Origin.HasFlagFast(Anchor.x1)) scaledDelta.X *= 2;
+                if (drawableItem.Origin.HasFlagFast(Anchor.y1)) scaledDelta.Y *= 2;
+
+                // for now aspect lock scale adjustments that occur at corners.
+                if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
+                    scaledDelta.Y = scaledDelta.X;
+
+                drawableItem.Scale += scaledDelta;
+            }
 
             return true;
         }
@@ -158,13 +243,6 @@ namespace osu.Game.Skinning.Editor
             // reverse the scale direction if dragging from top or left.
             if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
             if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
-
-            // for now aspect lock scale adjustments that occur at corners.
-            if (!reference.HasFlagFast(Anchor.x1) && !reference.HasFlagFast(Anchor.y1))
-            {
-                // TODO: temporary implementation - only dragging the corner handles across the X axis changes size.
-                scale.Y = scale.X;
-            }
         }
 
         public class AnchorMenuItem : TernaryStateMenuItem

From 16ffedde8a8ac640e61f98c0949324c699a5b05f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 May 2021 15:17:57 +0300
Subject: [PATCH 10228/10326] Add year parameter to GetNewsRequest

---
 osu.Game/Online/API/Requests/GetNewsRequest.cs      | 8 +++++++-
 osu.Game/Overlays/News/Displays/FrontPageDisplay.cs | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/Requests/GetNewsRequest.cs b/osu.Game/Online/API/Requests/GetNewsRequest.cs
index 36d9dc0652..3eb29f1292 100644
--- a/osu.Game/Online/API/Requests/GetNewsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetNewsRequest.cs
@@ -8,10 +8,12 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetNewsRequest : APIRequest<GetNewsResponse>
     {
+        private readonly int year;
         private readonly Cursor cursor;
 
-        public GetNewsRequest(Cursor cursor = null)
+        public GetNewsRequest(int year = 0, Cursor cursor = null)
         {
+            this.year = year;
             this.cursor = cursor;
         }
 
@@ -19,6 +21,10 @@ namespace osu.Game.Online.API.Requests
         {
             var req = base.CreateWebRequest();
             req.AddCursor(cursor);
+
+            if (year != 0)
+                req.AddParameter("year", year.ToString());
+
             return req;
         }
 
diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
index a1bc6c650b..45e11a6f15 100644
--- a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays.News.Displays
         {
             request?.Cancel();
 
-            request = new GetNewsRequest(lastCursor);
+            request = new GetNewsRequest(cursor: lastCursor);
             request.Success += response => Schedule(() => onSuccess(response));
             api.PerformAsync(request);
         }

From 150ed01c627e49e00a75f8c7b3a8a68e0bfea424 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 May 2021 15:22:55 +0300
Subject: [PATCH 10229/10326] Make NewsSidebar scrollable

---
 osu.Game/Overlays/News/Sidebar/NewsSidebar.cs | 60 +++++++++++++------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
index d14ad90ef4..9e397e78c8 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
@@ -9,6 +9,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Graphics.Shapes;
 using osuTK;
 using System.Linq;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -31,30 +32,55 @@ namespace osu.Game.Overlays.News.Sidebar
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background4
                 },
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = OsuScrollContainer.SCROLL_BAR_HEIGHT,
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Colour = colourProvider.Background3,
+                    Alpha = 0.5f
+                },
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding
+                    Padding = new MarginPadding { Right = -3 }, // Compensate for scrollbar margin
+                    Child = new OsuScrollContainer
                     {
-                        Vertical = 20,
-                        Left = 50,
-                        Right = 30
-                    },
-                    Child = new FillFlowContainer
-                    {
-                        Direction = FillDirection.Vertical,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Spacing = new Vector2(0, 20),
-                        Children = new Drawable[]
+                        RelativeSizeAxes = Axes.Both,
+                        Child = new Container
                         {
-                            new YearsPanel(),
-                            monthsFlow = new FillFlowContainer<MonthSection>
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Padding = new MarginPadding { Right = 3 }, // Addeded 3px back
+                            Child = new Container
                             {
-                                AutoSizeAxes = Axes.Y,
                                 RelativeSizeAxes = Axes.X,
-                                Direction = FillDirection.Vertical,
-                                Spacing = new Vector2(0, 10)
+                                AutoSizeAxes = Axes.Y,
+                                Padding = new MarginPadding
+                                {
+                                    Vertical = 20,
+                                    Left = 50,
+                                    Right = 30
+                                },
+                                Child = new FillFlowContainer
+                                {
+                                    Direction = FillDirection.Vertical,
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Spacing = new Vector2(0, 20),
+                                    Children = new Drawable[]
+                                    {
+                                        new YearsPanel(),
+                                        monthsFlow = new FillFlowContainer<MonthSection>
+                                        {
+                                            AutoSizeAxes = Axes.Y,
+                                            RelativeSizeAxes = Axes.X,
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 10)
+                                        }
+                                    }
+                                }
                             }
                         }
                     }

From 6cc4ffadabda1eb13d8b8d96a7a7d311f9314721 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 May 2021 15:28:12 +0300
Subject: [PATCH 10230/10326] Implement sticky container for sidebar in
 NewsOverlay

---
 osu.Game/Overlays/NewsOverlay.cs | 46 ++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 5beb285216..ddd328c860 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -1,11 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Threading;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.News;
 using osu.Game.Overlays.News.Displays;
+using osu.Game.Overlays.News.Sidebar;
 
 namespace osu.Game.Overlays
 {
@@ -13,9 +16,44 @@ namespace osu.Game.Overlays
     {
         private readonly Bindable<string> article = new Bindable<string>(null);
 
+        protected override Container<Drawable> Content => content;
+
+        private readonly Container content;
+        private readonly Container sidebarContainer;
+
         public NewsOverlay()
             : base(OverlayColourScheme.Purple, false)
         {
+            base.Content.Add(new GridContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                ColumnDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize),
+                    new Dimension()
+                },
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        sidebarContainer = new Container
+                        {
+                            AutoSizeAxes = Axes.X,
+                            Child = new NewsSidebar()
+                        },
+                        content = new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y
+                        }
+                    }
+                }
+            });
         }
 
         protected override void LoadComplete()
@@ -90,6 +128,14 @@ namespace osu.Game.Overlays
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            sidebarContainer.Height = DrawHeight;
+            sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             cancellationToken?.Cancel();

From e3ed9b8135b93c3b14685de298f1a6e25ec44f6b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 May 2021 15:36:05 +0300
Subject: [PATCH 10231/10326] Implement sidebar metadata handling in
 NewsOverlay

---
 .../News/Displays/FrontPageDisplay.cs         | 20 ++++++++-
 osu.Game/Overlays/NewsOverlay.cs              | 44 ++++++++++++++++---
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
index 45e11a6f15..7691e4a901 100644
--- a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontPageDisplay.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 System.Threading;
 using osu.Framework.Allocation;
@@ -15,6 +16,8 @@ namespace osu.Game.Overlays.News.Displays
 {
     public class FrontPageDisplay : CompositeDrawable
     {
+        public Action<GetNewsResponse> ResponseReceived;
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -24,6 +27,13 @@ namespace osu.Game.Overlays.News.Displays
         private GetNewsRequest request;
         private Cursor lastCursor;
 
+        private readonly int year;
+
+        public FrontPageDisplay(int year = 0)
+        {
+            this.year = year;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -74,13 +84,15 @@ namespace osu.Game.Overlays.News.Displays
         {
             request?.Cancel();
 
-            request = new GetNewsRequest(cursor: lastCursor);
+            request = new GetNewsRequest(year, lastCursor);
             request.Success += response => Schedule(() => onSuccess(response));
             api.PerformAsync(request);
         }
 
         private CancellationTokenSource cancellationToken;
 
+        private bool initialLoad = true;
+
         private void onSuccess(GetNewsResponse response)
         {
             cancellationToken?.Cancel();
@@ -101,6 +113,12 @@ namespace osu.Game.Overlays.News.Displays
                 content.Add(loaded);
                 showMore.IsLoading = false;
                 showMore.Alpha = lastCursor == null ? 0 : 1;
+
+                if (initialLoad)
+                {
+                    ResponseReceived?.Invoke(response);
+                    initialLoad = false;
+                }
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index ddd328c860..d3f407fc0f 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Overlays
 
         private readonly Container content;
         private readonly Container sidebarContainer;
+        private readonly NewsSidebar sidebar;
 
         public NewsOverlay()
             : base(OverlayColourScheme.Purple, false)
@@ -44,7 +45,7 @@ namespace osu.Game.Overlays
                         sidebarContainer = new Container
                         {
                             AutoSizeAxes = Axes.X,
-                            Child = new NewsSidebar()
+                            Child = sidebar = new NewsSidebar()
                         },
                         content = new Container
                         {
@@ -94,6 +95,12 @@ namespace osu.Game.Overlays
             Show();
         }
 
+        public void ShowYear(int year)
+        {
+            showYear(year);
+            Show();
+        }
+
         public void ShowArticle(string slug)
         {
             article.Value = slug;
@@ -102,6 +109,14 @@ namespace osu.Game.Overlays
 
         private CancellationTokenSource cancellationToken;
 
+        private void showYear(int year)
+        {
+            cancellationToken?.Cancel();
+            Loading.Show();
+
+            loadFrontPage(year);
+        }
+
         private void onArticleChanged(ValueChangedEvent<string> e)
         {
             cancellationToken?.Cancel();
@@ -109,13 +124,33 @@ namespace osu.Game.Overlays
 
             if (e.NewValue == null)
             {
-                Header.SetFrontPage();
-                LoadDisplay(new FrontPageDisplay());
+                loadFrontPage();
                 return;
             }
 
-            Header.SetArticle(e.NewValue);
+            loadArticle(e.NewValue);
+        }
+
+        private void loadFrontPage(int year = 0)
+        {
+            Header.SetFrontPage();
+
+            var page = new FrontPageDisplay(year);
+            page.ResponseReceived += r =>
+            {
+                sidebar.Metadata.Value = r.SidebarMetadata;
+                Loading.Hide();
+            };
+            LoadDisplay(page);
+        }
+
+        private void loadArticle(string article)
+        {
+            Header.SetArticle(article);
+
+            // Temporary, should be handled by ArticleDisplay later
             LoadDisplay(Empty());
+            Loading.Hide();
         }
 
         protected void LoadDisplay(Drawable display)
@@ -124,7 +159,6 @@ namespace osu.Game.Overlays
             LoadComponentAsync(display, loaded =>
             {
                 Child = loaded;
-                Loading.Hide();
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 

From d60478851f8bf9a63aa158b29b9a3a3d784451c8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 May 2021 15:38:53 +0300
Subject: [PATCH 10232/10326] Add proper action to YearButton

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index b6bbdbb6d4..232b995cd6 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -81,6 +81,9 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             public int Year { get; }
 
+            [Resolved(canBeNull: true)]
+            private NewsOverlay overlay { get; set; }
+
             private readonly bool isCurrent;
 
             public YearButton(int year, bool isCurrent)
@@ -106,7 +109,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 IdleColour = isCurrent ? Color4.White : colourProvider.Light2;
                 HoverColour = isCurrent ? Color4.White : colourProvider.Light1;
-                Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
+                Action = () => overlay?.ShowYear(Year);
             }
         }
     }

From 14af86d6c55ee8ccae7ae0b531b537eb0d9cbbb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 21:46:41 +0900
Subject: [PATCH 10233/10326] Use the same code path for all scaling

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 127 +++++++-----------
 1 file changed, 48 insertions(+), 79 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 18c9341db9..af013bfd52 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -34,92 +34,61 @@ namespace osu.Game.Skinning.Editor
         {
             adjustScaleFromAnchor(ref scale, anchor);
 
-            if (SelectedBlueprints.Count > 1)
+            var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
+                b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+
+            // the selection quad is always upright, so use a rect to make mutating the values easier.
+            var adjustedRect = selectionQuad.AABBFloat;
+
+            // for now aspect lock scale adjustments that occur at corners.
+            if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
+                scale.Y = scale.X / selectionQuad.Width * selectionQuad.Height;
+
+            if (anchor.HasFlagFast(Anchor.x0))
             {
-                var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
-                    b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
-
-                // the selection quad is always upright, so use a rect to make mutating the values easier.
-                var adjustedRect = selectionQuad.AABBFloat;
-
-                // for now aspect lock scale adjustments that occur at corners.
-                if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
-                    scale.Y = scale.X / selectionQuad.Width * selectionQuad.Height;
-
-                if (anchor.HasFlagFast(Anchor.x0))
-                {
-                    adjustedRect.X -= scale.X;
-                    adjustedRect.Width += scale.X;
-                }
-                else if (anchor.HasFlagFast(Anchor.x2))
-                {
-                    adjustedRect.Width += scale.X;
-                }
-
-                if (anchor.HasFlagFast(Anchor.y0))
-                {
-                    adjustedRect.Y -= scale.Y;
-                    adjustedRect.Height += scale.Y;
-                }
-                else if (anchor.HasFlagFast(Anchor.y2))
-                {
-                    adjustedRect.Height += scale.Y;
-                }
-
-                // scale adjust should match that of the quad itself.
-                var scaledDelta = new Vector2(
-                    adjustedRect.Width / selectionQuad.Width - 1,
-                    adjustedRect.Height / selectionQuad.Height - 1
-                );
-
-                foreach (var b in SelectedBlueprints)
-                {
-                    var drawableItem = (Drawable)b.Item;
-
-                    if (SelectedBlueprints.Count > 1)
-                    {
-                        // each drawable's relative position should be maintained in the scaled quad.
-                        var screenPosition = b.ScreenSpaceSelectionPoint;
-
-                        var relativePositionInOriginal =
-                            new Vector2(
-                                (screenPosition.X - selectionQuad.TopLeft.X) / selectionQuad.Width,
-                                (screenPosition.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height
-                            );
-
-                        var newPositionInAdjusted = new Vector2(
-                            adjustedRect.TopLeft.X + adjustedRect.Width * relativePositionInOriginal.X,
-                            adjustedRect.TopLeft.Y + adjustedRect.Height * relativePositionInOriginal.Y
-                        );
-
-                        drawableItem.Position = drawableItem.Parent.ToLocalSpace(newPositionInAdjusted) - drawableItem.AnchorPosition;
-                        drawableItem.Scale += scaledDelta;
-                    }
-                }
+                adjustedRect.X -= scale.X;
+                adjustedRect.Width += scale.X;
             }
-            else
+            else if (anchor.HasFlagFast(Anchor.x2))
             {
-                var blueprint = SelectedBlueprints.First();
-                var drawableItem = (Drawable)blueprint.Item;
+                adjustedRect.Width += scale.X;
+            }
 
-                // the number of local "pixels" the drag operation resulted in.
-                // our goal is to increase the drawable's draw size by this amount.
-                var scaledDelta = drawableItem.ScreenSpaceDeltaToParentSpace(scale);
+            if (anchor.HasFlagFast(Anchor.y0))
+            {
+                adjustedRect.Y -= scale.Y;
+                adjustedRect.Height += scale.Y;
+            }
+            else if (anchor.HasFlagFast(Anchor.y2))
+            {
+                adjustedRect.Height += scale.Y;
+            }
 
-                scaledDelta = new Vector2(
-                    scaledDelta.X / drawableItem.DrawWidth,
-                    scaledDelta.Y / drawableItem.DrawHeight
+            // scale adjust should match that of the quad itself.
+            var scaledDelta = new Vector2(
+                adjustedRect.Width / selectionQuad.Width - 1,
+                adjustedRect.Height / selectionQuad.Height - 1
+            );
+
+            foreach (var b in SelectedBlueprints)
+            {
+                var drawableItem = (Drawable)b.Item;
+
+                // each drawable's relative position should be maintained in the scaled quad.
+                var screenPosition = b.ScreenSpaceSelectionPoint;
+
+                var relativePositionInOriginal =
+                    new Vector2(
+                        (screenPosition.X - selectionQuad.TopLeft.X) / selectionQuad.Width,
+                        (screenPosition.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height
+                    );
+
+                var newPositionInAdjusted = new Vector2(
+                    adjustedRect.TopLeft.X + adjustedRect.Width * relativePositionInOriginal.X,
+                    adjustedRect.TopLeft.Y + adjustedRect.Height * relativePositionInOriginal.Y
                 );
 
-                // handle the case where scaling with a centre origin needs double the adjustments to match
-                // user cursor movement.
-                if (drawableItem.Origin.HasFlagFast(Anchor.x1)) scaledDelta.X *= 2;
-                if (drawableItem.Origin.HasFlagFast(Anchor.y1)) scaledDelta.Y *= 2;
-
-                // for now aspect lock scale adjustments that occur at corners.
-                if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
-                    scaledDelta.Y = scaledDelta.X;
-
+                drawableItem.Position = drawableItem.Parent.ToLocalSpace(newPositionInAdjusted) - drawableItem.AnchorPosition;
                 drawableItem.Scale += scaledDelta;
             }
 

From a55879e5115895c940411bc9d7000532e32d5219 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 01:47:31 +0900
Subject: [PATCH 10234/10326] Fix oversights in scale algorithm

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index af013bfd52..2f9611ba65 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -32,6 +32,9 @@ namespace osu.Game.Skinning.Editor
 
         public override bool HandleScale(Vector2 scale, Anchor anchor)
         {
+            // convert scale to screen space
+            scale = ToScreenSpace(scale) - ToScreenSpace(Vector2.Zero);
+
             adjustScaleFromAnchor(ref scale, anchor);
 
             var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
@@ -66,8 +69,8 @@ namespace osu.Game.Skinning.Editor
 
             // scale adjust should match that of the quad itself.
             var scaledDelta = new Vector2(
-                adjustedRect.Width / selectionQuad.Width - 1,
-                adjustedRect.Height / selectionQuad.Height - 1
+                adjustedRect.Width / selectionQuad.Width,
+                adjustedRect.Height / selectionQuad.Height
             );
 
             foreach (var b in SelectedBlueprints)
@@ -89,7 +92,7 @@ namespace osu.Game.Skinning.Editor
                 );
 
                 drawableItem.Position = drawableItem.Parent.ToLocalSpace(newPositionInAdjusted) - drawableItem.AnchorPosition;
-                drawableItem.Scale += scaledDelta;
+                drawableItem.Scale *= scaledDelta;
             }
 
             return true;

From 00ed6993400e35f6ba5c7416219932e90e63bd08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 01:53:24 +0900
Subject: [PATCH 10235/10326] Fix origin specifications using incorrect flags

---
 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 32d7f3525f..5d0263772d 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                             colourBarsEarly = new Container
                             {
                                 Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.x2,
+                                Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Both,
                                 Height = 0.5f,
                                 Scale = new Vector2(1, -1),
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                             colourBarsLate = new Container
                             {
                                 Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.x2,
+                                Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Both,
                                 Height = 0.5f,
                             },

From 22337e0fc79c6e45783eb5af137db8df93378244 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 01:59:30 +0900
Subject: [PATCH 10236/10326] Add comment explaining why origin is flipped

---
 osu.Game/Skinning/DefaultSkin.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 84f40df0cf..ba31816a07 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -93,8 +93,9 @@ namespace osu.Game.Skinning
                                     if (hitError2 != null)
                                     {
                                         hitError2.Anchor = Anchor.CentreRight;
-                                        hitError2.Origin = Anchor.CentreLeft;
                                         hitError2.Scale = new Vector2(-1, 1);
+                                        // origin flipped to match scale above.
+                                        hitError2.Origin = Anchor.CentreLeft;
                                     }
                                 }
                             })

From eb5db8ff0357a0814491437a59d8b427d84bf2fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 02:01:25 +0900
Subject: [PATCH 10237/10326] Disable border display on skin editor to avoid
 crashes

This wasn't being displayed correctly anyway, so rather than fixing
let's just remove it for now.

Closes #12868.
---
 osu.Game/Skinning/Editor/SkinEditorOverlay.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index 2d7cae71ff..88020896bb 100644
--- a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -65,8 +65,6 @@ namespace osu.Game.Skinning.Editor
             if (visibility.NewValue == Visibility.Visible)
             {
                 target.Masking = true;
-                target.BorderThickness = 5;
-                target.BorderColour = colours.Yellow;
                 target.AllowScaling = false;
                 target.RelativePositionAxes = Axes.Both;
 
@@ -75,7 +73,6 @@ namespace osu.Game.Skinning.Editor
             }
             else
             {
-                target.BorderThickness = 0;
                 target.AllowScaling = true;
 
                 target.ScaleTo(1, SkinEditor.TRANSITION_DURATION, Easing.OutQuint).OnComplete(_ => target.Masking = false);

From e9cab29134eec87685d6a343babcfb361b530b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 19 May 2021 20:48:06 +0200
Subject: [PATCH 10238/10326] Cache editor beatmap in placement blueprint test
 scene

---
 osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
index 78a6bcc3db..2dc77fa72a 100644
--- a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
@@ -33,8 +33,12 @@ namespace osu.Game.Tests.Visual
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
             dependencies.CacheAs(new EditorClock());
 
+            var playable = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
+            dependencies.CacheAs(new EditorBeatmap(playable));
+
             return dependencies;
         }
 

From 85a3027f1ba4107bee90ee3d2c7492d93b1546f4 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 19 May 2021 13:58:41 -0700
Subject: [PATCH 10239/10326] Add failing test

---
 .../Visual/Online/TestSceneAccountCreationOverlay.cs       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
index 3d65e7e4ba..b120a9b4db 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
@@ -1,12 +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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Overlays;
+using osu.Game.Overlays.AccountCreation;
+using osu.Game.Overlays.Settings;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
@@ -51,6 +55,9 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("show manually", () => accountCreation.Show());
             AddUntilStep("overlay is visible", () => accountCreation.State.Value == Visibility.Visible);
 
+            AddStep("click button", () => accountCreation.ChildrenOfType<SettingsButton>().Single().Click());
+            AddUntilStep("warning screen is present", () => accountCreation.ChildrenOfType<ScreenWarning>().Single().IsPresent);
+
             AddStep("log back in", () => API.Login("dummy", "password"));
             AddUntilStep("overlay is hidden", () => accountCreation.State.Value == Visibility.Hidden);
         }

From 3da2cdfd05314d975cf3a979709646729b4bca13 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 19 May 2021 14:06:21 -0700
Subject: [PATCH 10240/10326] Fix nullref in test

---
 osu.Game/Overlays/AccountCreation/ScreenWarning.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index 2605a0a6d6..6efbf8896f 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.AccountCreation
 
         public override void OnEntering(IScreen last)
         {
-            if (string.IsNullOrEmpty(api?.ProvidedUsername) || game.UseDevelopmentServer)
+            if (string.IsNullOrEmpty(api?.ProvidedUsername) || game?.UseDevelopmentServer == true)
             {
                 this.FadeOut();
                 this.Push(new ScreenEntry());

From f1fd40dcca30d348cbdad21ded8f6cef557a4fb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 13:19:00 +0900
Subject: [PATCH 10241/10326] Fix test not working for various reasons

---
 .../Visual/Online/TestSceneAccountCreationOverlay.cs        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
index b120a9b4db..437c5b07c9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
@@ -40,8 +40,6 @@ namespace osu.Game.Tests.Visual.Online
         [BackgroundDependencyLoader]
         private void load()
         {
-            API.Logout();
-
             localUser = API.LocalUser.GetBoundCopy();
             localUser.BindValueChanged(user => { userPanelArea.Child = new UserGridPanel(user.NewValue) { Width = 200 }; }, true);
         }
@@ -50,13 +48,13 @@ namespace osu.Game.Tests.Visual.Online
         public void TestOverlayVisibility()
         {
             AddStep("start hidden", () => accountCreation.Hide());
-            AddStep("log out", API.Logout);
+            AddStep("log out", () => API.Logout());
 
             AddStep("show manually", () => accountCreation.Show());
             AddUntilStep("overlay is visible", () => accountCreation.State.Value == Visibility.Visible);
 
             AddStep("click button", () => accountCreation.ChildrenOfType<SettingsButton>().Single().Click());
-            AddUntilStep("warning screen is present", () => accountCreation.ChildrenOfType<ScreenWarning>().Single().IsPresent);
+            AddUntilStep("warning screen is present", () => accountCreation.ChildrenOfType<ScreenWarning>().SingleOrDefault()?.IsPresent == true);
 
             AddStep("log back in", () => API.Login("dummy", "password"));
             AddUntilStep("overlay is hidden", () => accountCreation.State.Value == Visibility.Hidden);

From 3c201fb8e78a2c04e541b03cd9b7a1435c98468e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 13:20:35 +0900
Subject: [PATCH 10242/10326] Standardise `canBeNull` specification

---
 osu.Game/Overlays/AccountCreation/ScreenWarning.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index 6efbf8896f..3d46e9ed94 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(CanBeNull = true)]
+        [Resolved(canBeNull: true)]
         private IAPIProvider api { get; set; }
 
         [Resolved(canBeNull: true)]

From 8f5b28d26452211a913f7e2a2b67aece638367a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 13:51:08 +0900
Subject: [PATCH 10243/10326] Fix "folder missing" message showing incorrectly
 for beatmaps folder

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 2 +-
 osu.Game/Database/ArchiveModelManager.cs | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 5e975de77c..dcbfbf1332 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        protected override string ImportFromStablePath => ".";
+        protected override string ImportFromStablePath => string.Empty;
 
         protected override Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage.GetSongStorage();
 
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 550daf36b5..8efd451857 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -691,10 +691,12 @@ namespace osu.Game.Database
         {
             var storage = PrepareStableStorage(stableStorage);
 
+            // Handle situations like when the user does not have a Skins folder.
             if (!storage.ExistsDirectory(ImportFromStablePath))
             {
-                // This handles situations like when the user does not have a Skins folder
-                Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
+                string fullPath = storage.GetFullPath(ImportFromStablePath);
+
+                Logger.Log($"Folder \"{fullPath}\" not available in the target osu!stable installation to import {HumanisedModelName}s.", LoggingTarget.Information, LogLevel.Error);
                 return Task.CompletedTask;
             }
 

From 713f69ea5505d21359a34c3d9bb3c8980580709b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 14:11:42 +0900
Subject: [PATCH 10244/10326] Tidy up load process

---
 osu.Game/Overlays/NewsOverlay.cs | 34 ++++++++++++++------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index d3f407fc0f..f7294dd880 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Overlays
         private readonly Container sidebarContainer;
         private readonly NewsSidebar sidebar;
 
+        private CancellationTokenSource cancellationToken;
+
         public NewsOverlay()
             : base(OverlayColourScheme.Purple, false)
         {
@@ -97,7 +99,7 @@ namespace osu.Game.Overlays
 
         public void ShowYear(int year)
         {
-            showYear(year);
+            loadFrontPage(year);
             Show();
         }
 
@@ -107,32 +109,18 @@ namespace osu.Game.Overlays
             Show();
         }
 
-        private CancellationTokenSource cancellationToken;
-
-        private void showYear(int year)
-        {
-            cancellationToken?.Cancel();
-            Loading.Show();
-
-            loadFrontPage(year);
-        }
-
         private void onArticleChanged(ValueChangedEvent<string> e)
         {
-            cancellationToken?.Cancel();
-            Loading.Show();
-
             if (e.NewValue == null)
-            {
                 loadFrontPage();
-                return;
-            }
-
-            loadArticle(e.NewValue);
+            else
+                loadArticle(e.NewValue);
         }
 
         private void loadFrontPage(int year = 0)
         {
+            beginLoading();
+
             Header.SetFrontPage();
 
             var page = new FrontPageDisplay(year);
@@ -146,6 +134,8 @@ namespace osu.Game.Overlays
 
         private void loadArticle(string article)
         {
+            beginLoading();
+
             Header.SetArticle(article);
 
             // Temporary, should be handled by ArticleDisplay later
@@ -153,6 +143,12 @@ namespace osu.Game.Overlays
             Loading.Hide();
         }
 
+        private void beginLoading()
+        {
+            cancellationToken?.Cancel();
+            Loading.Show();
+        }
+
         protected void LoadDisplay(Drawable display)
         {
             ScrollFlow.ScrollToStart();

From ac8efdeabdceac44fd261febeae971bb2deaa087 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 14:12:34 +0900
Subject: [PATCH 10245/10326] Move private methods down

---
 osu.Game/Overlays/NewsOverlay.cs | 38 ++++++++++++++++----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index f7294dd880..280e224255 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Overlays
 
         private CancellationTokenSource cancellationToken;
 
+        private bool displayUpdateRequired = true;
+
         public NewsOverlay()
             : base(OverlayColourScheme.Purple, false)
         {
@@ -72,8 +74,6 @@ namespace osu.Game.Overlays
             ShowFrontPage = ShowFrontPage
         };
 
-        private bool displayUpdateRequired = true;
-
         protected override void PopIn()
         {
             base.PopIn();
@@ -109,6 +109,23 @@ namespace osu.Game.Overlays
             Show();
         }
 
+        protected void LoadDisplay(Drawable display)
+        {
+            ScrollFlow.ScrollToStart();
+            LoadComponentAsync(display, loaded =>
+            {
+                Child = loaded;
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            sidebarContainer.Height = DrawHeight;
+            sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
+        }
+
         private void onArticleChanged(ValueChangedEvent<string> e)
         {
             if (e.NewValue == null)
@@ -149,23 +166,6 @@ namespace osu.Game.Overlays
             Loading.Show();
         }
 
-        protected void LoadDisplay(Drawable display)
-        {
-            ScrollFlow.ScrollToStart();
-            LoadComponentAsync(display, loaded =>
-            {
-                Child = loaded;
-            }, (cancellationToken = new CancellationTokenSource()).Token);
-        }
-
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            sidebarContainer.Height = DrawHeight;
-            sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             cancellationToken?.Cancel();

From 673ca4c2a11252b24219222dd9f5f971fc523102 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 14:30:40 +0900
Subject: [PATCH 10246/10326] Tidy up content container specification

---
 osu.Game/Overlays/NewsOverlay.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 280e224255..b082614a6e 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -16,12 +16,11 @@ namespace osu.Game.Overlays
     {
         private readonly Bindable<string> article = new Bindable<string>(null);
 
-        protected override Container<Drawable> Content => content;
-
-        private readonly Container content;
         private readonly Container sidebarContainer;
         private readonly NewsSidebar sidebar;
 
+        private readonly Container content;
+
         private CancellationTokenSource cancellationToken;
 
         private bool displayUpdateRequired = true;
@@ -29,7 +28,7 @@ namespace osu.Game.Overlays
         public NewsOverlay()
             : base(OverlayColourScheme.Purple, false)
         {
-            base.Content.Add(new GridContainer
+            Child = new GridContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
@@ -58,7 +57,7 @@ namespace osu.Game.Overlays
                         }
                     }
                 }
-            });
+            };
         }
 
         protected override void LoadComplete()
@@ -112,16 +111,12 @@ namespace osu.Game.Overlays
         protected void LoadDisplay(Drawable display)
         {
             ScrollFlow.ScrollToStart();
-            LoadComponentAsync(display, loaded =>
-            {
-                Child = loaded;
-            }, (cancellationToken = new CancellationTokenSource()).Token);
+            LoadComponentAsync(display, loaded => content.Child = loaded, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
-
             sidebarContainer.Height = DrawHeight;
             sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
         }

From 0489ae719de8109fdf1dc3cc26ffe65ccf609b7e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 20 May 2021 14:53:33 +0900
Subject: [PATCH 10247/10326] Don't couple `PoolableDrawableWithLifetime`
 lifetime with its entry

It turns out the incompatibility with `LifetimeManagementContainer` causes more issues than anticipated.
---
 .../Pooling/PoolableDrawableWithLifetime.cs   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index ed0430012a..64e1ac16bd 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -3,7 +3,6 @@
 
 #nullable enable
 
-using System;
 using System.Diagnostics;
 using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Pooling;
@@ -27,13 +26,14 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </summary>
         protected bool HasEntryApplied { get; private set; }
 
+        // Drawable's lifetime gets out of sync with entry's lifetime if entry's lifetime is modified.
+        // We cannot delegate getter to `Entry.LifetimeStart` because it is incompatible with `LifetimeManagementContainer` due to how lifetime change is detected.
         public override double LifetimeStart
         {
-            get => Entry?.LifetimeStart ?? double.MinValue;
+            get => base.LifetimeStart;
             set
             {
-                if (Entry == null && LifetimeStart != value)
-                    throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
+                base.LifetimeStart = value;
 
                 if (Entry != null)
                     Entry.LifetimeStart = value;
@@ -42,11 +42,10 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
         public override double LifetimeEnd
         {
-            get => Entry?.LifetimeEnd ?? double.MaxValue;
+            get => base.LifetimeEnd;
             set
             {
-                if (Entry == null && LifetimeEnd != value)
-                    throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
+                base.LifetimeEnd = value;
 
                 if (Entry != null)
                     Entry.LifetimeEnd = value;
@@ -80,7 +79,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
                 free();
 
             Entry = entry;
+
+            base.LifetimeStart = entry.LifetimeStart;
+            base.LifetimeEnd = entry.LifetimeEnd;
+
             OnApply(entry);
+
             HasEntryApplied = true;
         }
 
@@ -112,7 +116,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             Debug.Assert(Entry != null && HasEntryApplied);
 
             OnFree(Entry);
+
             Entry = null;
+            base.LifetimeStart = double.MinValue;
+            base.LifetimeEnd = double.MaxValue;
+
             HasEntryApplied = false;
         }
     }

From 489caebf5996f1ca676e7d1700e44da8fd21110e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 15:15:19 +0900
Subject: [PATCH 10248/10326] Move bind `LoadComplete` code out of constructor

---
 osu.Game/Overlays/News/NewsHeader.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index 63174128e7..94bfd62c32 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -19,13 +19,18 @@ namespace osu.Game.Overlays.News
         {
             TabControl.AddItem(front_page_string);
 
+            article.BindValueChanged(onArticleChanged, true);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
             Current.BindValueChanged(e =>
             {
                 if (e.NewValue == front_page_string)
                     ShowFrontPage?.Invoke();
             });
-
-            article.BindValueChanged(onArticleChanged, true);
         }
 
         public void SetFrontPage() => article.Value = null;

From d4530313aa8605f9071d9a40f8e1d0bf192d7014 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 15:15:46 +0900
Subject: [PATCH 10249/10326] Tidy event parameter naming

---
 osu.Game/Overlays/NewsOverlay.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index b082614a6e..df564704fa 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -68,10 +68,7 @@ namespace osu.Game.Overlays
             article.BindValueChanged(onArticleChanged);
         }
 
-        protected override NewsHeader CreateHeader() => new NewsHeader
-        {
-            ShowFrontPage = ShowFrontPage
-        };
+        protected override NewsHeader CreateHeader() => new NewsHeader { ShowFrontPage = ShowFrontPage };
 
         protected override void PopIn()
         {
@@ -121,12 +118,12 @@ namespace osu.Game.Overlays
             sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
         }
 
-        private void onArticleChanged(ValueChangedEvent<string> e)
+        private void onArticleChanged(ValueChangedEvent<string> article)
         {
-            if (e.NewValue == null)
+            if (article.NewValue == null)
                 loadFrontPage();
             else
-                loadArticle(e.NewValue);
+                loadArticle(article.NewValue);
         }
 
         private void loadFrontPage(int year = 0)

From 9267d23dc282976abbacebd82281da2ba71cfd3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 15:23:49 +0900
Subject: [PATCH 10250/10326] Make year nullable rather than defaulting to zero

---
 osu.Game/Online/API/Requests/GetNewsRequest.cs            | 8 ++++----
 .../Displays/{FrontPageDisplay.cs => ArticleListing.cs}   | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Overlays/News/Displays/{FrontPageDisplay.cs => ArticleListing.cs} (100%)

diff --git a/osu.Game/Online/API/Requests/GetNewsRequest.cs b/osu.Game/Online/API/Requests/GetNewsRequest.cs
index 3eb29f1292..992ccc6d59 100644
--- a/osu.Game/Online/API/Requests/GetNewsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetNewsRequest.cs
@@ -8,10 +8,10 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetNewsRequest : APIRequest<GetNewsResponse>
     {
-        private readonly int year;
+        private readonly int? year;
         private readonly Cursor cursor;
 
-        public GetNewsRequest(int year = 0, Cursor cursor = null)
+        public GetNewsRequest(int? year = null, Cursor cursor = null)
         {
             this.year = year;
             this.cursor = cursor;
@@ -22,8 +22,8 @@ namespace osu.Game.Online.API.Requests
             var req = base.CreateWebRequest();
             req.AddCursor(cursor);
 
-            if (year != 0)
-                req.AddParameter("year", year.ToString());
+            if (year.HasValue)
+                req.AddParameter("year", year.Value.ToString());
 
             return req;
         }
diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/ArticleListing.cs
similarity index 100%
rename from osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
rename to osu.Game/Overlays/News/Displays/ArticleListing.cs

From 958d51141da905b123f6167a0a60d506862b5f86 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 15:24:01 +0900
Subject: [PATCH 10251/10326] Rename `FrontPageDisplay` to `ArticleListing`

---
 osu.Game/Overlays/News/Displays/ArticleListing.cs | 13 ++++++++++---
 osu.Game/Overlays/NewsOverlay.cs                  |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/ArticleListing.cs b/osu.Game/Overlays/News/Displays/ArticleListing.cs
index 7691e4a901..e713b3de84 100644
--- a/osu.Game/Overlays/News/Displays/ArticleListing.cs
+++ b/osu.Game/Overlays/News/Displays/ArticleListing.cs
@@ -14,7 +14,10 @@ using osuTK;
 
 namespace osu.Game.Overlays.News.Displays
 {
-    public class FrontPageDisplay : CompositeDrawable
+    /// <summary>
+    /// Lists articles in a vertical flow for a specified year.
+    /// </summary>
+    public class ArticleListing : CompositeDrawable
     {
         public Action<GetNewsResponse> ResponseReceived;
 
@@ -27,9 +30,13 @@ namespace osu.Game.Overlays.News.Displays
         private GetNewsRequest request;
         private Cursor lastCursor;
 
-        private readonly int year;
+        private readonly int? year;
 
-        public FrontPageDisplay(int year = 0)
+        /// <summary>
+        /// Instantiate a listing for the specified year.
+        /// </summary>
+        /// <param name="year">The year to load articles from. If null, will show the most recent articles.</param>
+        public ArticleListing(int? year = null)
         {
             this.year = year;
         }
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index df564704fa..510cdba020 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Overlays
 
             Header.SetFrontPage();
 
-            var page = new FrontPageDisplay(year);
+            var page = new ArticleListing(year);
             page.ResponseReceived += r =>
             {
                 sidebar.Metadata.Value = r.SidebarMetadata;

From abf96db54535e8e24a818db00ee6d19e921217ce Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 20 May 2021 15:27:08 +0900
Subject: [PATCH 10252/10326] Add regression test for the pattern of using DHO
 proxy in `LifetimeManagementContainer`

---
 .../Gameplay/TestSceneProxyContainer.cs       | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs

diff --git a/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs b/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs
new file mode 100644
index 0000000000..9975c65085
--- /dev/null
+++ b/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs
@@ -0,0 +1,85 @@
+// Copyright (c) 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.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Gameplay
+{
+    [HeadlessTest]
+    public class TestSceneProxyContainer : OsuTestScene
+    {
+        private HitObjectContainer hitObjectContainer;
+        private ProxyContainer proxyContainer;
+        private readonly ManualClock clock = new ManualClock();
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = new Container
+            {
+                Children = new Drawable[]
+                {
+                    hitObjectContainer = new HitObjectContainer(),
+                    proxyContainer = new ProxyContainer()
+                },
+                Clock = new FramedClock(clock)
+            };
+            clock.CurrentTime = 0;
+        });
+
+        [Test]
+        public void TestProxyLifetimeManagement()
+        {
+            AddStep("Add proxy drawables", () =>
+            {
+                addProxy(new TestDrawableHitObject(1000));
+                addProxy(new TestDrawableHitObject(3000));
+                addProxy(new TestDrawableHitObject(5000));
+            });
+
+            AddStep($"time = 1000", () => clock.CurrentTime = 1000);
+            AddAssert("One proxy is alive", () => proxyContainer.AliveChildren.Count == 1);
+            AddStep($"time = 5000", () => clock.CurrentTime = 5000);
+            AddAssert("One proxy is alive", () => proxyContainer.AliveChildren.Count == 1);
+            AddStep($"time = 6000", () => clock.CurrentTime = 6000);
+            AddAssert("No proxy is alive", () => proxyContainer.AliveChildren.Count == 0);
+        }
+
+        private void addProxy(DrawableHitObject drawableHitObject)
+        {
+            hitObjectContainer.Add(drawableHitObject);
+            proxyContainer.AddProxy(drawableHitObject);
+        }
+
+        private class ProxyContainer : LifetimeManagementContainer
+        {
+            public IReadOnlyList<Drawable> AliveChildren => AliveInternalChildren;
+
+            public void AddProxy(Drawable d) => AddInternal(d.CreateProxy());
+        }
+
+        private class TestDrawableHitObject : DrawableHitObject
+        {
+            protected override double InitialLifetimeOffset => 100;
+
+            public TestDrawableHitObject(double startTime)
+                : base(new HitObject { StartTime = startTime })
+            {
+            }
+
+            protected override void UpdateInitialTransforms()
+            {
+                LifetimeEnd = LifetimeStart + 500;
+            }
+        }
+    }
+}

From d197a7f6f5f539ec2e75f1bf2e7935bc8642d9a9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 15:39:45 +0900
Subject: [PATCH 10253/10326] Rename multiplayer client classes

---
 .../Multiplayer/TestSceneMultiplayer.cs       |   2 +-
 .../Online/Multiplayer/MultiplayerClient.cs   | 645 +++++++++++++++---
 .../Multiplayer/OnlineMultiplayerClient.cs    | 158 +++++
 .../Multiplayer/StatefulMultiplayerClient.cs  | 642 -----------------
 osu.Game/OsuGameBase.cs                       |   4 +-
 .../CreateMultiplayerMatchButton.cs           |   2 +-
 .../Match/MultiplayerMatchSettingsOverlay.cs  |   2 +-
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |   2 +-
 .../Multiplayer/MultiplayerLoungeSubScreen.cs |   2 +-
 .../Multiplayer/MultiplayerMatchSongSelect.cs |   2 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |   2 +-
 .../Multiplayer/MultiplayerPlayer.cs          |   2 +-
 .../Multiplayer/MultiplayerRoomComposite.cs   |   2 +-
 .../Multiplayer/MultiplayerRoomManager.cs     |   2 +-
 .../Participants/ParticipantsListHeader.cs    |   2 +-
 .../Spectate/MultiSpectatorScreen.cs          |   2 +-
 .../HUD/MultiplayerGameplayLeaderboard.cs     |   2 +-
 .../Multiplayer/MultiplayerTestScene.cs       |   2 +-
 .../Multiplayer/TestMultiplayerClient.cs      |   2 +-
 .../TestMultiplayerRoomContainer.cs           |   2 +-
 20 files changed, 742 insertions(+), 739 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
 delete mode 100644 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index bba7e2b391..424efb255b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -195,7 +195,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer
         {
-            [Cached(typeof(StatefulMultiplayerClient))]
+            [Cached(typeof(MultiplayerClient))]
             public readonly TestMultiplayerClient Client;
 
             public TestMultiplayer()
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 4529dfd0a7..2e65f7cf1c 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -3,132 +3,621 @@
 
 #nullable enable
 
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.RoomStatuses;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Users;
+using osu.Game.Utils;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public class MultiplayerClient : StatefulMultiplayerClient
+    public abstract class MultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
     {
-        private readonly string endpoint;
+        /// <summary>
+        /// Invoked when any change occurs to the multiplayer room.
+        /// </summary>
+        public event Action? RoomUpdated;
 
-        private IHubClientConnector? connector;
+        /// <summary>
+        /// Invoked when the multiplayer server requests the current beatmap to be loaded into play.
+        /// </summary>
+        public event Action? LoadRequested;
 
-        public override IBindable<bool> IsConnected { get; } = new BindableBool();
+        /// <summary>
+        /// Invoked when the multiplayer server requests gameplay to be started.
+        /// </summary>
+        public event Action? MatchStarted;
 
-        private HubConnection? connection => connector?.CurrentConnection;
+        /// <summary>
+        /// Invoked when the multiplayer server has finished collating results.
+        /// </summary>
+        public event Action? ResultsReady;
 
-        public MultiplayerClient(EndpointConfiguration endpoints)
+        /// <summary>
+        /// Whether the <see cref="MultiplayerClient"/> is currently connected.
+        /// This is NOT thread safe and usage should be scheduled.
+        /// </summary>
+        public abstract IBindable<bool> IsConnected { get; }
+
+        /// <summary>
+        /// The joined <see cref="MultiplayerRoom"/>.
+        /// </summary>
+        public MultiplayerRoom? Room { get; private set; }
+
+        /// <summary>
+        /// The users in the joined <see cref="Room"/> which are participating in the current gameplay loop.
+        /// </summary>
+        public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
+
+        public readonly Bindable<PlaylistItem?> CurrentMatchPlayingItem = new Bindable<PlaylistItem?>();
+
+        /// <summary>
+        /// The <see cref="MultiplayerRoomUser"/> corresponding to the local player, if available.
+        /// </summary>
+        public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == API.LocalUser.Value.Id);
+
+        /// <summary>
+        /// Whether the <see cref="LocalUser"/> is the host in <see cref="Room"/>.
+        /// </summary>
+        public bool IsHost
         {
-            endpoint = endpoints.MultiplayerEndpointUrl;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
-        {
-            connector = api.GetHubConnector(nameof(MultiplayerClient), endpoint);
-
-            if (connector != null)
+            get
             {
-                connector.ConfigureConnection = connection =>
-                {
-                    // this is kind of SILLY
-                    // https://github.com/dotnet/aspnetcore/issues/15198
-                    connection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
-                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
-                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
-                    connection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
-                    connection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
-                    connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
-                    connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
-                    connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
-                    connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
-                    connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
-                    connection.On<int, BeatmapAvailability>(nameof(IMultiplayerClient.UserBeatmapAvailabilityChanged), ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged);
-                };
-
-                IsConnected.BindTo(connector.IsConnected);
+                var localUser = LocalUser;
+                return localUser != null && Room?.Host != null && localUser.Equals(Room.Host);
             }
         }
 
-        protected override Task<MultiplayerRoom> JoinRoom(long roomId)
-        {
-            if (!IsConnected.Value)
-                return Task.FromCanceled<MultiplayerRoom>(new CancellationToken(true));
+        [Resolved]
+        protected IAPIProvider API { get; private set; } = null!;
 
-            return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
+        [Resolved]
+        protected RulesetStore Rulesets { get; private set; } = null!;
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; } = null!;
+
+        private Room? apiRoom;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            IsConnected.BindValueChanged(connected =>
+            {
+                // clean up local room state on server disconnect.
+                if (!connected.NewValue && Room != null)
+                {
+                    Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
+                    LeaveRoom();
+                }
+            });
         }
 
-        protected override Task LeaveRoomInternal()
-        {
-            if (!IsConnected.Value)
-                return Task.FromCanceled(new CancellationToken(true));
+        private readonly TaskChain joinOrLeaveTaskChain = new TaskChain();
+        private CancellationTokenSource? joinCancellationSource;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
+        /// <summary>
+        /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
+        /// </summary>
+        /// <param name="room">The API <see cref="Room"/>.</param>
+        public async Task JoinRoom(Room room)
+        {
+            var cancellationSource = joinCancellationSource = new CancellationTokenSource();
+
+            await joinOrLeaveTaskChain.Add(async () =>
+            {
+                if (Room != null)
+                    throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
+
+                Debug.Assert(room.RoomID.Value != null);
+
+                // Join the server-side room.
+                var joinedRoom = await JoinRoom(room.RoomID.Value.Value).ConfigureAwait(false);
+                Debug.Assert(joinedRoom != null);
+
+                // Populate users.
+                Debug.Assert(joinedRoom.Users != null);
+                await Task.WhenAll(joinedRoom.Users.Select(PopulateUser)).ConfigureAwait(false);
+
+                // Update the stored room (must be done on update thread for thread-safety).
+                await scheduleAsync(() =>
+                {
+                    Room = joinedRoom;
+                    apiRoom = room;
+                    foreach (var user in joinedRoom.Users)
+                        updateUserPlayingState(user.UserID, user.State);
+                }, cancellationSource.Token).ConfigureAwait(false);
+
+                // Update room settings.
+                await updateLocalRoomSettings(joinedRoom.Settings, cancellationSource.Token).ConfigureAwait(false);
+            }, cancellationSource.Token).ConfigureAwait(false);
         }
 
-        public override Task TransferHost(int userId)
+        /// <summary>
+        /// Joins the <see cref="MultiplayerRoom"/> with a given ID.
+        /// </summary>
+        /// <param name="roomId">The room ID.</param>
+        /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
+        protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
+
+        public Task LeaveRoom()
         {
-            if (!IsConnected.Value)
+            // The join may have not completed yet, so certain tasks that either update the room or reference the room should be cancelled.
+            // This includes the setting of Room itself along with the initial update of the room settings on join.
+            joinCancellationSource?.Cancel();
+
+            // Leaving rooms is expected to occur instantaneously whilst the operation is finalised in the background.
+            // However a few members need to be reset immediately to prevent other components from entering invalid states whilst the operation hasn't yet completed.
+            // For example, if a room was left and the user immediately pressed the "create room" button, then the user could be taken into the lobby if the value of Room is not reset in time.
+            var scheduledReset = scheduleAsync(() =>
+            {
+                apiRoom = null;
+                Room = null;
+                CurrentMatchPlayingUserIds.Clear();
+
+                RoomUpdated?.Invoke();
+            });
+
+            return joinOrLeaveTaskChain.Add(async () =>
+            {
+                await scheduledReset.ConfigureAwait(false);
+                await LeaveRoomInternal().ConfigureAwait(false);
+            });
+        }
+
+        protected abstract Task LeaveRoomInternal();
+
+        /// <summary>
+        /// Change the current <see cref="MultiplayerRoom"/> settings.
+        /// </summary>
+        /// <remarks>
+        /// A room must be joined for this to have any effect.
+        /// </remarks>
+        /// <param name="name">The new room name, if any.</param>
+        /// <param name="item">The new room playlist item, if any.</param>
+        public Task ChangeSettings(Optional<string> name = default, Optional<PlaylistItem> item = default)
+        {
+            if (Room == null)
+                throw new InvalidOperationException("Must be joined to a match to change settings.");
+
+            // A dummy playlist item filled with the current room settings (except mods).
+            var existingPlaylistItem = new PlaylistItem
+            {
+                Beatmap =
+                {
+                    Value = new BeatmapInfo
+                    {
+                        OnlineBeatmapID = Room.Settings.BeatmapID,
+                        MD5Hash = Room.Settings.BeatmapChecksum
+                    }
+                },
+                RulesetID = Room.Settings.RulesetID
+            };
+
+            return ChangeSettings(new MultiplayerRoomSettings
+            {
+                Name = name.GetOr(Room.Settings.Name),
+                BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
+                BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
+                RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
+                RequiredMods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.RequiredMods,
+                AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods,
+            });
+        }
+
+        /// <summary>
+        /// Toggles the <see cref="LocalUser"/>'s ready state.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">If a toggle of ready state is not valid at this time.</exception>
+        public async Task ToggleReady()
+        {
+            var localUser = LocalUser;
+
+            if (localUser == null)
+                return;
+
+            switch (localUser.State)
+            {
+                case MultiplayerUserState.Idle:
+                    await ChangeState(MultiplayerUserState.Ready).ConfigureAwait(false);
+                    return;
+
+                case MultiplayerUserState.Ready:
+                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
+                    return;
+
+                default:
+                    throw new InvalidOperationException($"Cannot toggle ready when in {localUser.State}");
+            }
+        }
+
+        /// <summary>
+        /// Toggles the <see cref="LocalUser"/>'s spectating state.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">If a toggle of the spectating state is not valid at this time.</exception>
+        public async Task ToggleSpectate()
+        {
+            var localUser = LocalUser;
+
+            if (localUser == null)
+                return;
+
+            switch (localUser.State)
+            {
+                case MultiplayerUserState.Idle:
+                case MultiplayerUserState.Ready:
+                    await ChangeState(MultiplayerUserState.Spectating).ConfigureAwait(false);
+                    return;
+
+                case MultiplayerUserState.Spectating:
+                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
+                    return;
+
+                default:
+                    throw new InvalidOperationException($"Cannot toggle spectate when in {localUser.State}");
+            }
+        }
+
+        public abstract Task TransferHost(int userId);
+
+        public abstract Task ChangeSettings(MultiplayerRoomSettings settings);
+
+        public abstract Task ChangeState(MultiplayerUserState newState);
+
+        public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
+
+        /// <summary>
+        /// Change the local user's mods in the currently joined room.
+        /// </summary>
+        /// <param name="newMods">The proposed new mods, excluding any required by the room itself.</param>
+        public Task ChangeUserMods(IEnumerable<Mod> newMods) => ChangeUserMods(newMods.Select(m => new APIMod(m)).ToList());
+
+        public abstract Task ChangeUserMods(IEnumerable<APIMod> newMods);
+
+        public abstract Task StartMatch();
+
+        Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
+        {
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.TransferHost), userId);
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Debug.Assert(apiRoom != null);
+
+                Room.State = state;
+
+                switch (state)
+                {
+                    case MultiplayerRoomState.Open:
+                        apiRoom.Status.Value = new RoomStatusOpen();
+                        break;
+
+                    case MultiplayerRoomState.Playing:
+                        apiRoom.Status.Value = new RoomStatusPlaying();
+                        break;
+
+                    case MultiplayerRoomState.Closed:
+                        apiRoom.Status.Value = new RoomStatusEnded();
+                        break;
+                }
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        public override Task ChangeSettings(MultiplayerRoomSettings settings)
+        async Task IMultiplayerClient.UserJoined(MultiplayerRoomUser user)
         {
-            if (!IsConnected.Value)
+            if (Room == null)
+                return;
+
+            await PopulateUser(user).ConfigureAwait(false);
+
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                // for sanity, ensure that there can be no duplicate users in the room user list.
+                if (Room.Users.Any(existing => existing.UserID == user.UserID))
+                    return;
+
+                Room.Users.Add(user);
+
+                RoomUpdated?.Invoke();
+            }, false);
+        }
+
+        Task IMultiplayerClient.UserLeft(MultiplayerRoomUser user)
+        {
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeSettings), settings);
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Remove(user);
+                CurrentMatchPlayingUserIds.Remove(user.UserID);
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        public override Task ChangeState(MultiplayerUserState newState)
+        Task IMultiplayerClient.HostChanged(int userId)
         {
-            if (!IsConnected.Value)
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Debug.Assert(apiRoom != null);
+
+                var user = Room.Users.FirstOrDefault(u => u.UserID == userId);
+
+                Room.Host = user;
+                apiRoom.Host.Value = user?.User;
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
+        Task IMultiplayerClient.SettingsChanged(MultiplayerRoomSettings newSettings)
         {
-            if (!IsConnected.Value)
+            updateLocalRoomSettings(newSettings);
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.UserStateChanged(int userId, MultiplayerUserState state)
+        {
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeBeatmapAvailability), newBeatmapAvailability);
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Single(u => u.UserID == userId).State = state;
+
+                updateUserPlayingState(userId, state);
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        public override Task ChangeUserMods(IEnumerable<APIMod> newMods)
+        Task IMultiplayerClient.UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability)
         {
-            if (!IsConnected.Value)
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeUserMods), newMods);
+            Scheduler.Add(() =>
+            {
+                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
+
+                // errors here are not critical - beatmap availability state is mostly for display.
+                if (user == null)
+                    return;
+
+                user.BeatmapAvailability = beatmapAvailability;
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        public override Task StartMatch()
+        public Task UserModsChanged(int userId, IEnumerable<APIMod> mods)
         {
-            if (!IsConnected.Value)
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
+            Scheduler.Add(() =>
+            {
+                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
+
+                // errors here are not critical - user mods are mostly for display.
+                if (user == null)
+                    return;
+
+                user.Mods = mods;
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        protected override Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
+        Task IMultiplayerClient.LoadRequested()
         {
-            var tcs = new TaskCompletionSource<BeatmapSetInfo>();
-            var req = new GetBeatmapSetRequest(beatmapId, BeatmapSetLookupType.BeatmapId);
+            if (Room == null)
+                return Task.CompletedTask;
 
-            req.Success += res =>
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                LoadRequested?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.MatchStarted()
+        {
+            if (Room == null)
+                return Task.CompletedTask;
+
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                MatchStarted?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.ResultsReady()
+        {
+            if (Room == null)
+                return Task.CompletedTask;
+
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                ResultsReady?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
+        }
+
+        /// <summary>
+        /// Populates the <see cref="User"/> for a given <see cref="MultiplayerRoomUser"/>.
+        /// </summary>
+        /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
+        protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID).ConfigureAwait(false);
+
+        /// <summary>
+        /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
+        /// </summary>
+        /// <remarks>
+        /// This updates both the joined <see cref="MultiplayerRoom"/> and the respective API <see cref="Room"/>.
+        /// </remarks>
+        /// <param name="settings">The new <see cref="MultiplayerRoomSettings"/> to update from.</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to cancel the update.</param>
+        private Task updateLocalRoomSettings(MultiplayerRoomSettings settings, CancellationToken cancellationToken = default) => scheduleAsync(() =>
+        {
+            if (Room == null)
+                return;
+
+            Debug.Assert(apiRoom != null);
+
+            // Update a few properties of the room instantaneously.
+            Room.Settings = settings;
+            apiRoom.Name.Value = Room.Settings.Name;
+
+            // The current item update is delayed until an online beatmap lookup (below) succeeds.
+            // In-order for the client to not display an outdated beatmap, the current item is forcefully cleared here.
+            CurrentMatchPlayingItem.Value = null;
+
+            RoomUpdated?.Invoke();
+
+            GetOnlineBeatmapSet(settings.BeatmapID, cancellationToken).ContinueWith(set => Schedule(() =>
+            {
+                if (cancellationToken.IsCancellationRequested)
+                    return;
+
+                updatePlaylist(settings, set.Result);
+            }), TaskContinuationOptions.OnlyOnRanToCompletion);
+        }, cancellationToken);
+
+        private void updatePlaylist(MultiplayerRoomSettings settings, BeatmapSetInfo beatmapSet)
+        {
+            if (Room == null || !Room.Settings.Equals(settings))
+                return;
+
+            Debug.Assert(apiRoom != null);
+
+            var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
+            beatmap.MD5Hash = settings.BeatmapChecksum;
+
+            var ruleset = Rulesets.GetRuleset(settings.RulesetID).CreateInstance();
+            var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
+            var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
+
+            // Try to retrieve the existing playlist item from the API room.
+            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId);
+
+            if (playlistItem != null)
+                updateItem(playlistItem);
+            else
+            {
+                // An existing playlist item does not exist, so append a new one.
+                updateItem(playlistItem = new PlaylistItem());
+                apiRoom.Playlist.Add(playlistItem);
+            }
+
+            CurrentMatchPlayingItem.Value = playlistItem;
+
+            void updateItem(PlaylistItem item)
+            {
+                item.ID = settings.PlaylistItemId;
+                item.Beatmap.Value = beatmap;
+                item.Ruleset.Value = ruleset.RulesetInfo;
+                item.RequiredMods.Clear();
+                item.RequiredMods.AddRange(mods);
+                item.AllowedMods.Clear();
+                item.AllowedMods.AddRange(allowedMods);
+            }
+        }
+
+        /// <summary>
+        /// Retrieves a <see cref="BeatmapSetInfo"/> from an online source.
+        /// </summary>
+        /// <param name="beatmapId">The beatmap set ID.</param>
+        /// <param name="cancellationToken">A token to cancel the request.</param>
+        /// <returns>The <see cref="BeatmapSetInfo"/> retrieval task.</returns>
+        protected abstract Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// For the provided user ID, update whether the user is included in <see cref="CurrentMatchPlayingUserIds"/>.
+        /// </summary>
+        /// <param name="userId">The user's ID.</param>
+        /// <param name="state">The new state of the user.</param>
+        private void updateUserPlayingState(int userId, MultiplayerUserState state)
+        {
+            bool wasPlaying = CurrentMatchPlayingUserIds.Contains(userId);
+            bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
+
+            if (isPlaying == wasPlaying)
+                return;
+
+            if (isPlaying)
+                CurrentMatchPlayingUserIds.Add(userId);
+            else
+                CurrentMatchPlayingUserIds.Remove(userId);
+        }
+
+        private Task scheduleAsync(Action action, CancellationToken cancellationToken = default)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+
+            Scheduler.Add(() =>
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
@@ -136,20 +625,18 @@ namespace osu.Game.Online.Multiplayer
                     return;
                 }
 
-                tcs.SetResult(res.ToBeatmapSet(Rulesets));
-            };
-
-            req.Failure += e => tcs.SetException(e);
-
-            API.Queue(req);
+                try
+                {
+                    action();
+                    tcs.SetResult(true);
+                }
+                catch (Exception ex)
+                {
+                    tcs.SetException(ex);
+                }
+            });
 
             return tcs.Task;
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            connector?.Dispose();
-        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
new file mode 100644
index 0000000000..cf1e18e059
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.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.
+
+#nullable enable
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Client;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Rooms;
+
+namespace osu.Game.Online.Multiplayer
+{
+    /// <summary>
+    /// A <see cref="MultiplayerClient"/> with online connectivity.
+    /// </summary>
+    public class OnlineMultiplayerClient : MultiplayerClient
+    {
+        private readonly string endpoint;
+
+        private IHubClientConnector? connector;
+
+        public override IBindable<bool> IsConnected { get; } = new BindableBool();
+
+        private HubConnection? connection => connector?.CurrentConnection;
+
+        public OnlineMultiplayerClient(EndpointConfiguration endpoints)
+        {
+            endpoint = endpoints.MultiplayerEndpointUrl;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            connector = api.GetHubConnector(nameof(OnlineMultiplayerClient), endpoint);
+
+            if (connector != null)
+            {
+                connector.ConfigureConnection = connection =>
+                {
+                    // this is kind of SILLY
+                    // https://github.com/dotnet/aspnetcore/issues/15198
+                    connection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
+                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
+                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
+                    connection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
+                    connection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
+                    connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
+                    connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
+                    connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
+                    connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+                    connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
+                    connection.On<int, BeatmapAvailability>(nameof(IMultiplayerClient.UserBeatmapAvailabilityChanged), ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged);
+                };
+
+                IsConnected.BindTo(connector.IsConnected);
+            }
+        }
+
+        protected override Task<MultiplayerRoom> JoinRoom(long roomId)
+        {
+            if (!IsConnected.Value)
+                return Task.FromCanceled<MultiplayerRoom>(new CancellationToken(true));
+
+            return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
+        }
+
+        protected override Task LeaveRoomInternal()
+        {
+            if (!IsConnected.Value)
+                return Task.FromCanceled(new CancellationToken(true));
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
+        }
+
+        public override Task TransferHost(int userId)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.TransferHost), userId);
+        }
+
+        public override Task ChangeSettings(MultiplayerRoomSettings settings)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeSettings), settings);
+        }
+
+        public override Task ChangeState(MultiplayerUserState newState)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
+        }
+
+        public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeBeatmapAvailability), newBeatmapAvailability);
+        }
+
+        public override Task ChangeUserMods(IEnumerable<APIMod> newMods)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeUserMods), newMods);
+        }
+
+        public override Task StartMatch()
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
+        }
+
+        protected override Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
+        {
+            var tcs = new TaskCompletionSource<BeatmapSetInfo>();
+            var req = new GetBeatmapSetRequest(beatmapId, BeatmapSetLookupType.BeatmapId);
+
+            req.Success += res =>
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    tcs.SetCanceled();
+                    return;
+                }
+
+                tcs.SetResult(res.ToBeatmapSet(Rulesets));
+            };
+
+            req.Failure += e => tcs.SetException(e);
+
+            API.Queue(req);
+
+            return tcs.Task;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            connector?.Dispose();
+        }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
deleted file mode 100644
index 7fe48d54b1..0000000000
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ /dev/null
@@ -1,642 +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.
-
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Logging;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-using osu.Game.Online.API;
-using osu.Game.Online.Rooms;
-using osu.Game.Online.Rooms.RoomStatuses;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Users;
-using osu.Game.Utils;
-
-namespace osu.Game.Online.Multiplayer
-{
-    public abstract class StatefulMultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
-    {
-        /// <summary>
-        /// Invoked when any change occurs to the multiplayer room.
-        /// </summary>
-        public event Action? RoomUpdated;
-
-        /// <summary>
-        /// Invoked when the multiplayer server requests the current beatmap to be loaded into play.
-        /// </summary>
-        public event Action? LoadRequested;
-
-        /// <summary>
-        /// Invoked when the multiplayer server requests gameplay to be started.
-        /// </summary>
-        public event Action? MatchStarted;
-
-        /// <summary>
-        /// Invoked when the multiplayer server has finished collating results.
-        /// </summary>
-        public event Action? ResultsReady;
-
-        /// <summary>
-        /// Whether the <see cref="StatefulMultiplayerClient"/> is currently connected.
-        /// This is NOT thread safe and usage should be scheduled.
-        /// </summary>
-        public abstract IBindable<bool> IsConnected { get; }
-
-        /// <summary>
-        /// The joined <see cref="MultiplayerRoom"/>.
-        /// </summary>
-        public MultiplayerRoom? Room { get; private set; }
-
-        /// <summary>
-        /// The users in the joined <see cref="Room"/> which are participating in the current gameplay loop.
-        /// </summary>
-        public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
-
-        public readonly Bindable<PlaylistItem?> CurrentMatchPlayingItem = new Bindable<PlaylistItem?>();
-
-        /// <summary>
-        /// The <see cref="MultiplayerRoomUser"/> corresponding to the local player, if available.
-        /// </summary>
-        public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == API.LocalUser.Value.Id);
-
-        /// <summary>
-        /// Whether the <see cref="LocalUser"/> is the host in <see cref="Room"/>.
-        /// </summary>
-        public bool IsHost
-        {
-            get
-            {
-                var localUser = LocalUser;
-                return localUser != null && Room?.Host != null && localUser.Equals(Room.Host);
-            }
-        }
-
-        [Resolved]
-        protected IAPIProvider API { get; private set; } = null!;
-
-        [Resolved]
-        protected RulesetStore Rulesets { get; private set; } = null!;
-
-        [Resolved]
-        private UserLookupCache userLookupCache { get; set; } = null!;
-
-        private Room? apiRoom;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            IsConnected.BindValueChanged(connected =>
-            {
-                // clean up local room state on server disconnect.
-                if (!connected.NewValue && Room != null)
-                {
-                    Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
-                    LeaveRoom();
-                }
-            });
-        }
-
-        private readonly TaskChain joinOrLeaveTaskChain = new TaskChain();
-        private CancellationTokenSource? joinCancellationSource;
-
-        /// <summary>
-        /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
-        /// </summary>
-        /// <param name="room">The API <see cref="Room"/>.</param>
-        public async Task JoinRoom(Room room)
-        {
-            var cancellationSource = joinCancellationSource = new CancellationTokenSource();
-
-            await joinOrLeaveTaskChain.Add(async () =>
-            {
-                if (Room != null)
-                    throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
-
-                Debug.Assert(room.RoomID.Value != null);
-
-                // Join the server-side room.
-                var joinedRoom = await JoinRoom(room.RoomID.Value.Value).ConfigureAwait(false);
-                Debug.Assert(joinedRoom != null);
-
-                // Populate users.
-                Debug.Assert(joinedRoom.Users != null);
-                await Task.WhenAll(joinedRoom.Users.Select(PopulateUser)).ConfigureAwait(false);
-
-                // Update the stored room (must be done on update thread for thread-safety).
-                await scheduleAsync(() =>
-                {
-                    Room = joinedRoom;
-                    apiRoom = room;
-                    foreach (var user in joinedRoom.Users)
-                        updateUserPlayingState(user.UserID, user.State);
-                }, cancellationSource.Token).ConfigureAwait(false);
-
-                // Update room settings.
-                await updateLocalRoomSettings(joinedRoom.Settings, cancellationSource.Token).ConfigureAwait(false);
-            }, cancellationSource.Token).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Joins the <see cref="MultiplayerRoom"/> with a given ID.
-        /// </summary>
-        /// <param name="roomId">The room ID.</param>
-        /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
-        protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
-
-        public Task LeaveRoom()
-        {
-            // The join may have not completed yet, so certain tasks that either update the room or reference the room should be cancelled.
-            // This includes the setting of Room itself along with the initial update of the room settings on join.
-            joinCancellationSource?.Cancel();
-
-            // Leaving rooms is expected to occur instantaneously whilst the operation is finalised in the background.
-            // However a few members need to be reset immediately to prevent other components from entering invalid states whilst the operation hasn't yet completed.
-            // For example, if a room was left and the user immediately pressed the "create room" button, then the user could be taken into the lobby if the value of Room is not reset in time.
-            var scheduledReset = scheduleAsync(() =>
-            {
-                apiRoom = null;
-                Room = null;
-                CurrentMatchPlayingUserIds.Clear();
-
-                RoomUpdated?.Invoke();
-            });
-
-            return joinOrLeaveTaskChain.Add(async () =>
-            {
-                await scheduledReset.ConfigureAwait(false);
-                await LeaveRoomInternal().ConfigureAwait(false);
-            });
-        }
-
-        protected abstract Task LeaveRoomInternal();
-
-        /// <summary>
-        /// Change the current <see cref="MultiplayerRoom"/> settings.
-        /// </summary>
-        /// <remarks>
-        /// A room must be joined for this to have any effect.
-        /// </remarks>
-        /// <param name="name">The new room name, if any.</param>
-        /// <param name="item">The new room playlist item, if any.</param>
-        public Task ChangeSettings(Optional<string> name = default, Optional<PlaylistItem> item = default)
-        {
-            if (Room == null)
-                throw new InvalidOperationException("Must be joined to a match to change settings.");
-
-            // A dummy playlist item filled with the current room settings (except mods).
-            var existingPlaylistItem = new PlaylistItem
-            {
-                Beatmap =
-                {
-                    Value = new BeatmapInfo
-                    {
-                        OnlineBeatmapID = Room.Settings.BeatmapID,
-                        MD5Hash = Room.Settings.BeatmapChecksum
-                    }
-                },
-                RulesetID = Room.Settings.RulesetID
-            };
-
-            return ChangeSettings(new MultiplayerRoomSettings
-            {
-                Name = name.GetOr(Room.Settings.Name),
-                BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
-                BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
-                RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
-                RequiredMods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.RequiredMods,
-                AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods,
-            });
-        }
-
-        /// <summary>
-        /// Toggles the <see cref="LocalUser"/>'s ready state.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">If a toggle of ready state is not valid at this time.</exception>
-        public async Task ToggleReady()
-        {
-            var localUser = LocalUser;
-
-            if (localUser == null)
-                return;
-
-            switch (localUser.State)
-            {
-                case MultiplayerUserState.Idle:
-                    await ChangeState(MultiplayerUserState.Ready).ConfigureAwait(false);
-                    return;
-
-                case MultiplayerUserState.Ready:
-                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
-                    return;
-
-                default:
-                    throw new InvalidOperationException($"Cannot toggle ready when in {localUser.State}");
-            }
-        }
-
-        /// <summary>
-        /// Toggles the <see cref="LocalUser"/>'s spectating state.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">If a toggle of the spectating state is not valid at this time.</exception>
-        public async Task ToggleSpectate()
-        {
-            var localUser = LocalUser;
-
-            if (localUser == null)
-                return;
-
-            switch (localUser.State)
-            {
-                case MultiplayerUserState.Idle:
-                case MultiplayerUserState.Ready:
-                    await ChangeState(MultiplayerUserState.Spectating).ConfigureAwait(false);
-                    return;
-
-                case MultiplayerUserState.Spectating:
-                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
-                    return;
-
-                default:
-                    throw new InvalidOperationException($"Cannot toggle spectate when in {localUser.State}");
-            }
-        }
-
-        public abstract Task TransferHost(int userId);
-
-        public abstract Task ChangeSettings(MultiplayerRoomSettings settings);
-
-        public abstract Task ChangeState(MultiplayerUserState newState);
-
-        public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
-
-        /// <summary>
-        /// Change the local user's mods in the currently joined room.
-        /// </summary>
-        /// <param name="newMods">The proposed new mods, excluding any required by the room itself.</param>
-        public Task ChangeUserMods(IEnumerable<Mod> newMods) => ChangeUserMods(newMods.Select(m => new APIMod(m)).ToList());
-
-        public abstract Task ChangeUserMods(IEnumerable<APIMod> newMods);
-
-        public abstract Task StartMatch();
-
-        Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                Debug.Assert(apiRoom != null);
-
-                Room.State = state;
-
-                switch (state)
-                {
-                    case MultiplayerRoomState.Open:
-                        apiRoom.Status.Value = new RoomStatusOpen();
-                        break;
-
-                    case MultiplayerRoomState.Playing:
-                        apiRoom.Status.Value = new RoomStatusPlaying();
-                        break;
-
-                    case MultiplayerRoomState.Closed:
-                        apiRoom.Status.Value = new RoomStatusEnded();
-                        break;
-                }
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        async Task IMultiplayerClient.UserJoined(MultiplayerRoomUser user)
-        {
-            if (Room == null)
-                return;
-
-            await PopulateUser(user).ConfigureAwait(false);
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                // for sanity, ensure that there can be no duplicate users in the room user list.
-                if (Room.Users.Any(existing => existing.UserID == user.UserID))
-                    return;
-
-                Room.Users.Add(user);
-
-                RoomUpdated?.Invoke();
-            }, false);
-        }
-
-        Task IMultiplayerClient.UserLeft(MultiplayerRoomUser user)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                Room.Users.Remove(user);
-                CurrentMatchPlayingUserIds.Remove(user.UserID);
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.HostChanged(int userId)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                Debug.Assert(apiRoom != null);
-
-                var user = Room.Users.FirstOrDefault(u => u.UserID == userId);
-
-                Room.Host = user;
-                apiRoom.Host.Value = user?.User;
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.SettingsChanged(MultiplayerRoomSettings newSettings)
-        {
-            updateLocalRoomSettings(newSettings);
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.UserStateChanged(int userId, MultiplayerUserState state)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                Room.Users.Single(u => u.UserID == userId).State = state;
-
-                updateUserPlayingState(userId, state);
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
-
-                // errors here are not critical - beatmap availability state is mostly for display.
-                if (user == null)
-                    return;
-
-                user.BeatmapAvailability = beatmapAvailability;
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        public Task UserModsChanged(int userId, IEnumerable<APIMod> mods)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
-
-                // errors here are not critical - user mods are mostly for display.
-                if (user == null)
-                    return;
-
-                user.Mods = mods;
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.LoadRequested()
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                LoadRequested?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.MatchStarted()
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                MatchStarted?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.ResultsReady()
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                ResultsReady?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// Populates the <see cref="User"/> for a given <see cref="MultiplayerRoomUser"/>.
-        /// </summary>
-        /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
-        protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID).ConfigureAwait(false);
-
-        /// <summary>
-        /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
-        /// </summary>
-        /// <remarks>
-        /// This updates both the joined <see cref="MultiplayerRoom"/> and the respective API <see cref="Room"/>.
-        /// </remarks>
-        /// <param name="settings">The new <see cref="MultiplayerRoomSettings"/> to update from.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to cancel the update.</param>
-        private Task updateLocalRoomSettings(MultiplayerRoomSettings settings, CancellationToken cancellationToken = default) => scheduleAsync(() =>
-        {
-            if (Room == null)
-                return;
-
-            Debug.Assert(apiRoom != null);
-
-            // Update a few properties of the room instantaneously.
-            Room.Settings = settings;
-            apiRoom.Name.Value = Room.Settings.Name;
-
-            // The current item update is delayed until an online beatmap lookup (below) succeeds.
-            // In-order for the client to not display an outdated beatmap, the current item is forcefully cleared here.
-            CurrentMatchPlayingItem.Value = null;
-
-            RoomUpdated?.Invoke();
-
-            GetOnlineBeatmapSet(settings.BeatmapID, cancellationToken).ContinueWith(set => Schedule(() =>
-            {
-                if (cancellationToken.IsCancellationRequested)
-                    return;
-
-                updatePlaylist(settings, set.Result);
-            }), TaskContinuationOptions.OnlyOnRanToCompletion);
-        }, cancellationToken);
-
-        private void updatePlaylist(MultiplayerRoomSettings settings, BeatmapSetInfo beatmapSet)
-        {
-            if (Room == null || !Room.Settings.Equals(settings))
-                return;
-
-            Debug.Assert(apiRoom != null);
-
-            var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
-            beatmap.MD5Hash = settings.BeatmapChecksum;
-
-            var ruleset = Rulesets.GetRuleset(settings.RulesetID).CreateInstance();
-            var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
-            var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
-
-            // Try to retrieve the existing playlist item from the API room.
-            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId);
-
-            if (playlistItem != null)
-                updateItem(playlistItem);
-            else
-            {
-                // An existing playlist item does not exist, so append a new one.
-                updateItem(playlistItem = new PlaylistItem());
-                apiRoom.Playlist.Add(playlistItem);
-            }
-
-            CurrentMatchPlayingItem.Value = playlistItem;
-
-            void updateItem(PlaylistItem item)
-            {
-                item.ID = settings.PlaylistItemId;
-                item.Beatmap.Value = beatmap;
-                item.Ruleset.Value = ruleset.RulesetInfo;
-                item.RequiredMods.Clear();
-                item.RequiredMods.AddRange(mods);
-                item.AllowedMods.Clear();
-                item.AllowedMods.AddRange(allowedMods);
-            }
-        }
-
-        /// <summary>
-        /// Retrieves a <see cref="BeatmapSetInfo"/> from an online source.
-        /// </summary>
-        /// <param name="beatmapId">The beatmap set ID.</param>
-        /// <param name="cancellationToken">A token to cancel the request.</param>
-        /// <returns>The <see cref="BeatmapSetInfo"/> retrieval task.</returns>
-        protected abstract Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// For the provided user ID, update whether the user is included in <see cref="CurrentMatchPlayingUserIds"/>.
-        /// </summary>
-        /// <param name="userId">The user's ID.</param>
-        /// <param name="state">The new state of the user.</param>
-        private void updateUserPlayingState(int userId, MultiplayerUserState state)
-        {
-            bool wasPlaying = CurrentMatchPlayingUserIds.Contains(userId);
-            bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
-
-            if (isPlaying == wasPlaying)
-                return;
-
-            if (isPlaying)
-                CurrentMatchPlayingUserIds.Add(userId);
-            else
-                CurrentMatchPlayingUserIds.Remove(userId);
-        }
-
-        private Task scheduleAsync(Action action, CancellationToken cancellationToken = default)
-        {
-            var tcs = new TaskCompletionSource<bool>();
-
-            Scheduler.Add(() =>
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    tcs.SetCanceled();
-                    return;
-                }
-
-                try
-                {
-                    action();
-                    tcs.SetResult(true);
-                }
-                catch (Exception ex)
-                {
-                    tcs.SetException(ex);
-                }
-            });
-
-            return tcs.Task;
-        }
-    }
-}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index fbe4022cc1..656d6319b4 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -86,7 +86,7 @@ namespace osu.Game
         protected IAPIProvider API;
 
         private SpectatorStreamingClient spectatorStreaming;
-        private StatefulMultiplayerClient multiplayerClient;
+        private MultiplayerClient multiplayerClient;
 
         protected MenuCursorContainer MenuCursorContainer;
 
@@ -241,7 +241,7 @@ namespace osu.Game
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
 
             dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));
-            dependencies.CacheAs(multiplayerClient = new MultiplayerClient(endpoints));
+            dependencies.CacheAs(multiplayerClient = new OnlineMultiplayerClient(endpoints));
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index a13d2cf540..cc51b5b691 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private IBindable<bool> operationInProgress;
 
         [Resolved]
-        private StatefulMultiplayerClient multiplayerClient { get; set; }
+        private MultiplayerClient multiplayerClient { get; set; }
 
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index 3199232f6f..fe9979b161 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             private IRoomManager manager { get; set; }
 
             [Resolved]
-            private StatefulMultiplayerClient client { get; set; }
+            private MultiplayerClient client { get; set; }
 
             [Resolved]
             private Bindable<Room> currentRoom { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 085c824bdc..a065d04f64 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     public class Multiplayer : OnlinePlayScreen
     {
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         public override void OnResuming(IScreen last)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
index 0a9a3f680f..4d20652465 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         protected override RoomSubScreen CreateRoomSubScreen(Room room) => new MultiplayerMatchSubScreen(room);
 
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         public override void Open(Room room)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index c9f0f6de90..3733b85a5e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     public class MultiplayerMatchSongSelect : OnlinePlaySongSelect
     {
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         private LoadingLayer loadingLayer;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 783b8b4bf2..62ef70ed68 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         public override string ShortTitle => "room";
 
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index ae2042fbe8..1bbe49a705 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         protected override bool CheckModsAllowFailure() => false;
 
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         private IBindable<bool> isConnected;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
index 8030107ad8..d334c618f5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         protected MultiplayerRoom Room => Client.Room;
 
         [Resolved]
-        protected StatefulMultiplayerClient Client { get; private set; }
+        protected MultiplayerClient Client { get; private set; }
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 1e57847f04..8526196902 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     public class MultiplayerRoomManager : RoomManager
     {
         [Resolved]
-        private StatefulMultiplayerClient multiplayerClient { get; set; }
+        private MultiplayerClient multiplayerClient { get; set; }
 
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
         public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
index 6c1a55a0eb..7e442c6568 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
     public class ParticipantsListHeader : OverlinedHeader
     {
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         public ParticipantsListHeader()
             : base("Participants")
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 8c7b7bab01..a0245a1e59 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private SpectatorStreamingClient spectatorClient { get; set; }
 
         [Resolved]
-        private StatefulMultiplayerClient multiplayerClient { get; set; }
+        private MultiplayerClient multiplayerClient { get; set; }
 
         private readonly PlayerArea[] instances;
         private MasterGameplayClockContainer masterClockContainer;
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 70de067784..bbb3c5ebb2 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Play.HUD
         private SpectatorStreamingClient streamingClient { get; set; }
 
         [Resolved]
-        private StatefulMultiplayerClient multiplayerClient { get; set; }
+        private MultiplayerClient multiplayerClient { get; set; }
 
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index db344b28dd..c76d1053b2 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public const int PLAYER_1_ID = 55;
         public const int PLAYER_2_ID = 56;
 
-        [Cached(typeof(StatefulMultiplayerClient))]
+        [Cached(typeof(MultiplayerClient))]
         public TestMultiplayerClient Client { get; }
 
         [Cached(typeof(IRoomManager))]
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 167cf705a7..b12bd8091d 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -20,7 +20,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestMultiplayerClient : StatefulMultiplayerClient
+    public class TestMultiplayerClient : MultiplayerClient
     {
         public override IBindable<bool> IsConnected => isConnected;
         private readonly Bindable<bool> isConnected = new Bindable<bool>(true);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
index e57411d04d..1abf4d8f5d 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        [Cached(typeof(StatefulMultiplayerClient))]
+        [Cached(typeof(MultiplayerClient))]
         public readonly TestMultiplayerClient Client;
 
         [Cached(typeof(IRoomManager))]

From 6beeb7f7c433d636e30cc46f56d03b585c71d647 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 15:55:07 +0900
Subject: [PATCH 10254/10326] Rename SpectatorStreamingClient ->
 SpectatorClient

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 14 ++++++-------
 .../Gameplay/TestSceneSpectatorPlayback.cs    | 14 ++++++-------
 .../TestSceneMultiSpectatorLeaderboard.cs     | 14 ++++++-------
 .../TestSceneMultiSpectatorScreen.cs          | 20 +++++++++----------
 ...TestSceneMultiplayerGameplayLeaderboard.cs | 18 ++++++++---------
 .../TestSceneCurrentlyPlayingDisplay.cs       | 14 ++++++-------
 ...rStreamingClient.cs => SpectatorClient.cs} |  6 +++---
 osu.Game/OsuGameBase.cs                       |  6 +++---
 .../Dashboard/CurrentlyPlayingDisplay.cs      |  4 ++--
 osu.Game/Rulesets/UI/ReplayRecorder.cs        |  8 ++++----
 .../Spectate/MultiSpectatorScreen.cs          |  2 +-
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 14 ++++++-------
 osu.Game/Screens/Play/SpectatorPlayer.cs      | 10 +++++-----
 .../Screens/Play/SpectatorResultsScreen.cs    |  8 ++++----
 osu.Game/Screens/Spectate/SpectatorScreen.cs  |  2 +-
 ...eamingClient.cs => TestSpectatorClient.cs} |  4 ++--
 16 files changed, 79 insertions(+), 79 deletions(-)
 rename osu.Game/Online/Spectator/{SpectatorStreamingClient.cs => SpectatorClient.cs} (97%)
 rename osu.Game/Tests/Visual/Spectator/{TestSpectatorStreamingClient.cs => TestSpectatorClient.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index a7ed217b4d..56a4ab8cba 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -27,8 +27,8 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private readonly User streamingUser = new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Test user" };
 
-        [Cached(typeof(SpectatorStreamingClient))]
-        private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
+        [Cached(typeof(SpectatorClient))]
+        private TestSpectatorClient testSpectatorClient = new TestSpectatorClient();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestUserLookupCache();
@@ -61,8 +61,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("add streaming client", () =>
             {
-                Remove(testSpectatorStreamingClient);
-                Add(testSpectatorStreamingClient);
+                Remove(testSpectatorClient);
+                Add(testSpectatorClient);
             });
 
             finish();
@@ -212,9 +212,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void waitForPlayer() => AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
 
-        private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
+        private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorClient.StartPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 
-        private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorStreamingClient.EndPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
+        private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorClient.EndPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 
         private void checkPaused(bool state) =>
             AddUntilStep($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
@@ -223,7 +223,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("send frames", () =>
             {
-                testSpectatorStreamingClient.SendFrames(streamingUser.Id, nextFrame, count);
+                testSpectatorClient.SendFrames(streamingUser.Id, nextFrame, count);
                 nextFrame += count;
             });
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 9c763814f3..469f594fdc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private IAPIProvider api { get; set; }
 
         [Resolved]
-        private SpectatorStreamingClient streamingClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [Cached]
         private GameplayBeatmap gameplayBeatmap = new GameplayBeatmap(new Beatmap());
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             replay = new Replay();
 
-            users.BindTo(streamingClient.PlayingUsers);
+            users.BindTo(spectatorClient.PlayingUsers);
             users.BindCollectionChanged((obj, args) =>
             {
                 switch (args.Action)
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         foreach (int user in args.NewItems)
                         {
                             if (user == api.LocalUser.Value.Id)
-                                streamingClient.WatchUser(user);
+                                spectatorClient.WatchUser(user);
                         }
 
                         break;
@@ -91,14 +91,14 @@ namespace osu.Game.Tests.Visual.Gameplay
                         foreach (int user in args.OldItems)
                         {
                             if (user == api.LocalUser.Value.Id)
-                                streamingClient.StopWatchingUser(user);
+                                spectatorClient.StopWatchingUser(user);
                         }
 
                         break;
                 }
             }, true);
 
-            streamingClient.OnNewFrames += onNewFrames;
+            spectatorClient.OnNewFrames += onNewFrames;
 
             Add(new GridContainer
             {
@@ -189,7 +189,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
         }
 
-        private double latency = SpectatorStreamingClient.TIME_BETWEEN_SENDS;
+        private double latency = SpectatorClient.TIME_BETWEEN_SENDS;
 
         protected override void Update()
         {
@@ -233,7 +233,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("stop recorder", () =>
             {
                 recorder.Expire();
-                streamingClient.OnNewFrames -= onNewFrames;
+                spectatorClient.OnNewFrames -= onNewFrames;
             });
         }
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index 263adc07e1..afd4401a63 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -23,8 +23,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiSpectatorLeaderboard : MultiplayerTestScene
     {
-        [Cached(typeof(SpectatorStreamingClient))]
-        private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();
+        [Cached(typeof(SpectatorClient))]
+        private TestSpectatorClient spectatorClient = new TestSpectatorClient();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestUserLookupCache();
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.Content.AddRange(new Drawable[]
             {
-                streamingClient,
+                spectatorClient,
                 lookupCache,
                 content = new Container { RelativeSizeAxes = Axes.Both }
             });
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 foreach (var (userId, clock) in clocks)
                 {
-                    streamingClient.EndPlay(userId, 0);
+                    spectatorClient.EndPlay(userId, 0);
                     clock.CurrentTime = 0;
                 }
             });
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("create leaderboard", () =>
             {
                 foreach (var (userId, _) in clocks)
-                    streamingClient.StartPlay(userId, 0);
+                    spectatorClient.StartPlay(userId, 0);
 
                 Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
 
@@ -96,10 +96,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 // For player 2, send frames in sets of 10.
                 for (int i = 0; i < 100; i++)
                 {
-                    streamingClient.SendFrames(PLAYER_1_ID, i, 1);
+                    spectatorClient.SendFrames(PLAYER_1_ID, i, 1);
 
                     if (i % 10 == 0)
-                        streamingClient.SendFrames(PLAYER_2_ID, i, 10);
+                        spectatorClient.SendFrames(PLAYER_2_ID, i, 10);
                 }
             });
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 689c249d05..23095a1ea8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiSpectatorScreen : MultiplayerTestScene
     {
-        [Cached(typeof(SpectatorStreamingClient))]
-        private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();
+        [Cached(typeof(SpectatorClient))]
+        private TestSpectatorClient spectatorClient = new TestSpectatorClient();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestUserLookupCache();
@@ -59,14 +59,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("add streaming client", () =>
             {
-                Remove(streamingClient);
-                Add(streamingClient);
+                Remove(spectatorClient);
+                Add(spectatorClient);
             });
 
             AddStep("finish previous gameplay", () =>
             {
                 foreach (var id in playingUserIds)
-                    streamingClient.EndPlay(id, importedBeatmapId);
+                    spectatorClient.EndPlay(id, importedBeatmapId);
                 playingUserIds.Clear();
             });
         }
@@ -87,11 +87,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             loadSpectateScreen(false);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player first_player_id", () => streamingClient.StartPlay(PLAYER_1_ID, importedBeatmapId));
+            AddStep("load player first_player_id", () => spectatorClient.StartPlay(PLAYER_1_ID, importedBeatmapId));
             AddUntilStep("one player added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 1);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player second_player_id", () => streamingClient.StartPlay(PLAYER_2_ID, importedBeatmapId));
+            AddStep("load player second_player_id", () => spectatorClient.StartPlay(PLAYER_2_ID, importedBeatmapId));
             AddUntilStep("two players added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 2);
         }
 
@@ -251,7 +251,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 foreach (int id in userIds)
                 {
                     Client.CurrentMatchPlayingUserIds.Add(id);
-                    streamingClient.StartPlay(id, beatmapId ?? importedBeatmapId);
+                    spectatorClient.StartPlay(id, beatmapId ?? importedBeatmapId);
                     playingUserIds.Add(id);
                     nextFrame[id] = 0;
                 }
@@ -262,7 +262,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("end play", () =>
             {
-                streamingClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
+                spectatorClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
                 playingUserIds.Remove(userId);
                 nextFrame.Remove(userId);
             });
@@ -276,7 +276,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 foreach (int id in userIds)
                 {
-                    streamingClient.SendFrames(id, nextFrame[id], count);
+                    spectatorClient.SendFrames(id, nextFrame[id], count);
                     nextFrame[id] += count;
                 }
             });
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 6813a6e7dd..80b9aa8228 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -28,8 +28,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         private const int users = 16;
 
-        [Cached(typeof(SpectatorStreamingClient))]
-        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming();
+        [Cached(typeof(SpectatorClient))]
+        private TestMultiplayerSpectatorClient spectatorClient = new TestMultiplayerSpectatorClient();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.Content.Children = new Drawable[]
             {
-                streamingClient,
+                spectatorClient,
                 lookupCache,
                 Content
             };
@@ -71,10 +71,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
 
                 for (int i = 0; i < users; i++)
-                    streamingClient.StartPlay(i, Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
+                    spectatorClient.StartPlay(i, Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
 
                 Client.CurrentMatchPlayingUserIds.Clear();
-                Client.CurrentMatchPlayingUserIds.AddRange(streamingClient.PlayingUsers);
+                Client.CurrentMatchPlayingUserIds.AddRange(spectatorClient.PlayingUsers);
 
                 Children = new Drawable[]
                 {
@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 scoreProcessor.ApplyBeatmap(playable);
 
-                LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(scoreProcessor, streamingClient.PlayingUsers.ToArray())
+                LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(scoreProcessor, spectatorClient.PlayingUsers.ToArray())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -96,7 +96,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestScoreUpdates()
         {
-            AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 100);
+            AddRepeatStep("update state", () => spectatorClient.RandomlyUpdateState(), 100);
             AddToggleStep("switch compact mode", expanded => leaderboard.Expanded.Value = expanded);
         }
 
@@ -109,12 +109,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestChangeScoringMode()
         {
-            AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 5);
+            AddRepeatStep("update state", () => spectatorClient.RandomlyUpdateState(), 5);
             AddStep("change to classic", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Classic));
             AddStep("change to standardised", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised));
         }
 
-        public class TestMultiplayerStreaming : TestSpectatorStreamingClient
+        public class TestMultiplayerSpectatorClient : TestSpectatorClient
         {
             private readonly Dictionary<int, FrameHeader> lastHeaders = new Dictionary<int, FrameHeader>();
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 8ae6398003..9bc0b32eee 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneCurrentlyPlayingDisplay : OsuTestScene
     {
-        [Cached(typeof(SpectatorStreamingClient))]
-        private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
+        [Cached(typeof(SpectatorClient))]
+        private TestSpectatorClient testSpectatorClient = new TestSpectatorClient();
 
         private CurrentlyPlayingDisplay currentlyPlaying;
 
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("add streaming client", () =>
             {
-                nestedContainer?.Remove(testSpectatorStreamingClient);
+                nestedContainer?.Remove(testSpectatorClient);
                 Remove(lookupCache);
 
                 Children = new Drawable[]
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Online
                         RelativeSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
-                            testSpectatorStreamingClient,
+                            testSpectatorClient,
                             currentlyPlaying = new CurrentlyPlayingDisplay
                             {
                                 RelativeSizeAxes = Axes.Both,
@@ -55,15 +55,15 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-            AddStep("Reset players", () => testSpectatorStreamingClient.PlayingUsers.Clear());
+            AddStep("Reset players", () => testSpectatorClient.PlayingUsers.Clear());
         }
 
         [Test]
         public void TestBasicDisplay()
         {
-            AddStep("Add playing user", () => testSpectatorStreamingClient.PlayingUsers.Add(2));
+            AddStep("Add playing user", () => testSpectatorClient.PlayingUsers.Add(2));
             AddUntilStep("Panel loaded", () => currentlyPlaying.ChildrenOfType<UserGridPanel>()?.FirstOrDefault()?.User.Id == 2);
-            AddStep("Remove playing user", () => testSpectatorStreamingClient.PlayingUsers.Remove(2));
+            AddStep("Remove playing user", () => testSpectatorClient.PlayingUsers.Remove(2));
             AddUntilStep("Panel no longer present", () => !currentlyPlaying.ChildrenOfType<UserGridPanel>().Any());
         }
 
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
similarity index 97%
rename from osu.Game/Online/Spectator/SpectatorStreamingClient.cs
rename to osu.Game/Online/Spectator/SpectatorClient.cs
index ec6d1bf9d8..43115d577c 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -23,7 +23,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Online.Spectator
 {
-    public class SpectatorStreamingClient : Component, ISpectatorClient
+    public class SpectatorClient : Component, ISpectatorClient
     {
         /// <summary>
         /// The maximum milliseconds between frame bundle sends.
@@ -80,7 +80,7 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, SpectatorState> OnUserFinishedPlaying;
 
-        public SpectatorStreamingClient(EndpointConfiguration endpoints)
+        public SpectatorClient(EndpointConfiguration endpoints)
         {
             endpoint = endpoints.SpectatorEndpointUrl;
         }
@@ -88,7 +88,7 @@ namespace osu.Game.Online.Spectator
         [BackgroundDependencyLoader]
         private void load(IAPIProvider api)
         {
-            connector = api.GetHubConnector(nameof(SpectatorStreamingClient), endpoint);
+            connector = api.GetHubConnector(nameof(SpectatorClient), endpoint);
 
             if (connector != null)
             {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index fbe4022cc1..3707e3b7be 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -85,7 +85,7 @@ namespace osu.Game
 
         protected IAPIProvider API;
 
-        private SpectatorStreamingClient spectatorStreaming;
+        private SpectatorClient spectatorClient;
         private StatefulMultiplayerClient multiplayerClient;
 
         protected MenuCursorContainer MenuCursorContainer;
@@ -240,7 +240,7 @@ namespace osu.Game
 
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
 
-            dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));
+            dependencies.CacheAs(spectatorClient = new SpectatorClient(endpoints));
             dependencies.CacheAs(multiplayerClient = new MultiplayerClient(endpoints));
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
@@ -313,7 +313,7 @@ namespace osu.Game
             // add api components to hierarchy.
             if (API is APIAccess apiAccess)
                 AddInternal(apiAccess);
-            AddInternal(spectatorStreaming);
+            AddInternal(spectatorClient);
             AddInternal(multiplayerClient);
 
             AddInternal(RulesetConfigCache);
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 336430fd9b..3051ca7dbe 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Dashboard
         private FillFlowContainer<PlayingUserPanel> userFlow;
 
         [Resolved]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -52,7 +52,7 @@ namespace osu.Game.Overlays.Dashboard
         {
             base.LoadComplete();
 
-            playingUsers.BindTo(spectatorStreaming.PlayingUsers);
+            playingUsers.BindTo(spectatorClient.PlayingUsers);
             playingUsers.BindCollectionChanged(onUsersChanged, true);
         }
 
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index 643ded4cad..d18e0f9541 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.UI
         public int RecordFrameRate = 60;
 
         [Resolved(canBeNull: true)]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [Resolved]
         private GameplayBeatmap gameplayBeatmap { get; set; }
@@ -49,13 +49,13 @@ namespace osu.Game.Rulesets.UI
 
             inputManager = GetContainingInputManager();
 
-            spectatorStreaming?.BeginPlaying(gameplayBeatmap, target);
+            spectatorClient?.BeginPlaying(gameplayBeatmap, target);
         }
 
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            spectatorStreaming?.EndPlaying();
+            spectatorClient?.EndPlaying();
         }
 
         protected override void Update()
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.UI
             {
                 target.Replay.Frames.Add(frame);
 
-                spectatorStreaming?.HandleFrame(frame);
+                spectatorClient?.HandleFrame(frame);
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 8c7b7bab01..3ffaeb772a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public bool AllPlayersLoaded => instances.All(p => p?.PlayerLoaded == true);
 
         [Resolved]
-        private SpectatorStreamingClient spectatorClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [Resolved]
         private StatefulMultiplayerClient multiplayerClient { get; set; }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 70de067784..7f59a836c2 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Play.HUD
         protected readonly Dictionary<int, TrackedUserData> UserScores = new Dictionary<int, TrackedUserData>();
 
         [Resolved]
-        private SpectatorStreamingClient streamingClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [Resolved]
         private StatefulMultiplayerClient multiplayerClient { get; set; }
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Play.HUD
 
             foreach (var userId in playingUsers)
             {
-                streamingClient.WatchUser(userId);
+                spectatorClient.WatchUser(userId);
 
                 // probably won't be required in the final implementation.
                 var resolvedUser = userLookupCache.GetUserAsync(userId).Result;
@@ -88,7 +88,7 @@ namespace osu.Game.Screens.Play.HUD
             playingUsers.BindCollectionChanged(usersChanged);
 
             // this leaderboard should be guaranteed to be completely loaded before the gameplay starts (is a prerequisite in MultiplayerPlayer).
-            streamingClient.OnNewFrames += handleIncomingFrames;
+            spectatorClient.OnNewFrames += handleIncomingFrames;
         }
 
         private void usersChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.Play.HUD
                 case NotifyCollectionChangedAction.Remove:
                     foreach (var userId in e.OldItems.OfType<int>())
                     {
-                        streamingClient.StopWatchingUser(userId);
+                        spectatorClient.StopWatchingUser(userId);
 
                         if (UserScores.TryGetValue(userId, out var trackedData))
                             trackedData.MarkUserQuit();
@@ -123,14 +123,14 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Dispose(isDisposing);
 
-            if (streamingClient != null)
+            if (spectatorClient != null)
             {
                 foreach (var user in playingUsers)
                 {
-                    streamingClient.StopWatchingUser(user);
+                    spectatorClient.StopWatchingUser(user);
                 }
 
-                streamingClient.OnNewFrames -= handleIncomingFrames;
+                spectatorClient.OnNewFrames -= handleIncomingFrames;
             }
         }
 
diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index 9822f62dd8..a8125dfded 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -31,12 +31,12 @@ namespace osu.Game.Screens.Play
         }
 
         [Resolved]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
+            spectatorClient.OnUserBeganPlaying += userBeganPlaying;
 
             AddInternal(new OsuSpriteText
             {
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Play
 
         public override bool OnExiting(IScreen next)
         {
-            spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
+            spectatorClient.OnUserBeganPlaying -= userBeganPlaying;
             return base.OnExiting(next);
         }
 
@@ -84,8 +84,8 @@ namespace osu.Game.Screens.Play
         {
             base.Dispose(isDisposing);
 
-            if (spectatorStreaming != null)
-                spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
+            if (spectatorClient != null)
+                spectatorClient.OnUserBeganPlaying -= userBeganPlaying;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/SpectatorResultsScreen.cs b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
index dabdf0a139..fd7af3af85 100644
--- a/osu.Game/Screens/Play/SpectatorResultsScreen.cs
+++ b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
@@ -17,12 +17,12 @@ namespace osu.Game.Screens.Play
         }
 
         [Resolved]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
+            spectatorClient.OnUserBeganPlaying += userBeganPlaying;
         }
 
         private void userBeganPlaying(int userId, SpectatorState state)
@@ -40,8 +40,8 @@ namespace osu.Game.Screens.Play
         {
             base.Dispose(isDisposing);
 
-            if (spectatorStreaming != null)
-                spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
+            if (spectatorClient != null)
+                spectatorClient.OnUserBeganPlaying -= userBeganPlaying;
         }
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index bcebd51954..1cf7bc30ee 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Spectate
         private RulesetStore rulesets { get; set; }
 
         [Resolved]
-        private SpectatorStreamingClient spectatorClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
similarity index 96%
rename from osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
rename to osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index cc8437479d..985e293981 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -12,7 +12,7 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Tests.Visual.Spectator
 {
-    public class TestSpectatorStreamingClient : SpectatorStreamingClient
+    public class TestSpectatorClient : SpectatorClient
     {
         public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
         private readonly ConcurrentDictionary<int, byte> watchingUsers = new ConcurrentDictionary<int, byte>();
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Spectator
         private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
         private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
 
-        public TestSpectatorStreamingClient()
+        public TestSpectatorClient()
             : base(new DevelopmentEndpointConfiguration())
         {
         }

From 3018a41ab5daf24a61671cc1684cc8f089049e8a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 20 May 2021 16:00:49 +0900
Subject: [PATCH 10255/10326] Remove redundant string interpolation

---
 osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs b/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs
index 9975c65085..1264d575a4 100644
--- a/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs
@@ -46,11 +46,11 @@ namespace osu.Game.Tests.Gameplay
                 addProxy(new TestDrawableHitObject(5000));
             });
 
-            AddStep($"time = 1000", () => clock.CurrentTime = 1000);
+            AddStep("time = 1000", () => clock.CurrentTime = 1000);
             AddAssert("One proxy is alive", () => proxyContainer.AliveChildren.Count == 1);
-            AddStep($"time = 5000", () => clock.CurrentTime = 5000);
+            AddStep("time = 5000", () => clock.CurrentTime = 5000);
             AddAssert("One proxy is alive", () => proxyContainer.AliveChildren.Count == 1);
-            AddStep($"time = 6000", () => clock.CurrentTime = 6000);
+            AddStep("time = 6000", () => clock.CurrentTime = 6000);
             AddAssert("No proxy is alive", () => proxyContainer.AliveChildren.Count == 0);
         }
 

From df80531a0a8d6a687b3875628732f67712c12682 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 16:30:56 +0900
Subject: [PATCH 10256/10326] Split online connectivity into
 OnlineSpectatorClient

---
 .../Online/Spectator/OnlineSpectatorClient.cs |  89 +++++++++++
 osu.Game/Online/Spectator/SpectatorClient.cs  | 140 +++++++-----------
 osu.Game/OsuGameBase.cs                       |   2 +-
 3 files changed, 142 insertions(+), 89 deletions(-)
 create mode 100644 osu.Game/Online/Spectator/OnlineSpectatorClient.cs

diff --git a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
new file mode 100644
index 0000000000..753796158e
--- /dev/null
+++ b/osu.Game/Online/Spectator/OnlineSpectatorClient.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.
+
+#nullable enable
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Client;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.API;
+
+namespace osu.Game.Online.Spectator
+{
+    public class OnlineSpectatorClient : SpectatorClient
+    {
+        private readonly string endpoint;
+
+        private IHubClientConnector? connector;
+
+        public override IBindable<bool> IsConnected { get; } = new BindableBool();
+
+        private HubConnection? connection => connector?.CurrentConnection;
+
+        public OnlineSpectatorClient(EndpointConfiguration endpoints)
+        {
+            endpoint = endpoints.SpectatorEndpointUrl;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            connector = api.GetHubConnector(nameof(SpectatorClient), endpoint);
+
+            if (connector != null)
+            {
+                connector.ConfigureConnection = connection =>
+                {
+                    // until strong typed client support is added, each method must be manually bound
+                    // (see https://github.com/dotnet/aspnetcore/issues/15198)
+                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
+                    connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
+                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+                };
+
+                IsConnected.BindTo(connector.IsConnected);
+            }
+        }
+
+        protected override Task BeginPlayingInternal(SpectatorState state)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), state);
+        }
+
+        protected override Task SendFramesInternal(FrameDataBundle data)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
+        }
+
+        protected override Task EndPlayingInternal(SpectatorState state)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), state);
+        }
+
+        protected override Task WatchUserInternal(int userId)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
+        }
+
+        protected override Task StopWatchingUserInternal(int userId)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.SendAsync(nameof(ISpectatorServer.EndWatchingUser), userId);
+        }
+    }
+}
diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 43115d577c..5ea31a49fb 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -23,21 +22,18 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Online.Spectator
 {
-    public class SpectatorClient : Component, ISpectatorClient
+    public abstract class SpectatorClient : Component, ISpectatorClient
     {
         /// <summary>
         /// The maximum milliseconds between frame bundle sends.
         /// </summary>
         public const double TIME_BETWEEN_SENDS = 200;
 
-        private readonly string endpoint;
-
-        [CanBeNull]
-        private IHubClientConnector connector;
-
-        private readonly IBindable<bool> isConnected = new BindableBool();
-
-        private HubConnection connection => connector?.CurrentConnection;
+        /// <summary>
+        /// Whether the <see cref="SpectatorClient"/> is currently connected.
+        /// This is NOT thread safe and usage should be scheduled.
+        /// </summary>
+        public abstract IBindable<bool> IsConnected { get; }
 
         private readonly List<int> watchingUsers = new List<int>();
 
@@ -63,7 +59,7 @@ namespace osu.Game.Online.Spectator
 
         private readonly SpectatorState currentState = new SpectatorState();
 
-        private bool isPlaying;
+        protected bool IsPlaying { get; private set; }
 
         /// <summary>
         /// Called whenever new frames arrive from the server.
@@ -80,59 +76,39 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, SpectatorState> OnUserFinishedPlaying;
 
-        public SpectatorClient(EndpointConfiguration endpoints)
-        {
-            endpoint = endpoints.SpectatorEndpointUrl;
-        }
-
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
+        private void load()
         {
-            connector = api.GetHubConnector(nameof(SpectatorClient), endpoint);
-
-            if (connector != null)
+            IsConnected.BindValueChanged(connected =>
             {
-                connector.ConfigureConnection = connection =>
+                if (connected.NewValue)
                 {
-                    // until strong typed client support is added, each method must be manually bound
-                    // (see https://github.com/dotnet/aspnetcore/issues/15198)
-                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
-                    connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
-                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
-                };
+                    // get all the users that were previously being watched
+                    int[] users;
 
-                isConnected.BindTo(connector.IsConnected);
-                isConnected.BindValueChanged(connected =>
+                    lock (userLock)
+                    {
+                        users = watchingUsers.ToArray();
+                        watchingUsers.Clear();
+                    }
+
+                    // resubscribe to watched users.
+                    foreach (var userId in users)
+                        WatchUser(userId);
+
+                    // re-send state in case it wasn't received
+                    if (IsPlaying)
+                        BeginPlayingInternal(currentState);
+                }
+                else
                 {
-                    if (connected.NewValue)
+                    lock (userLock)
                     {
-                        // get all the users that were previously being watched
-                        int[] users;
-
-                        lock (userLock)
-                        {
-                            users = watchingUsers.ToArray();
-                            watchingUsers.Clear();
-                        }
-
-                        // resubscribe to watched users.
-                        foreach (var userId in users)
-                            WatchUser(userId);
-
-                        // re-send state in case it wasn't received
-                        if (isPlaying)
-                            beginPlaying();
+                        playingUsers.Clear();
+                        playingUserStates.Clear();
                     }
-                    else
-                    {
-                        lock (userLock)
-                        {
-                            playingUsers.Clear();
-                            playingUserStates.Clear();
-                        }
-                    }
-                }, true);
-            }
+                }
+            }, true);
         }
 
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
@@ -176,10 +152,10 @@ namespace osu.Game.Online.Spectator
 
         public void BeginPlaying(GameplayBeatmap beatmap, Score score)
         {
-            if (isPlaying)
+            if (IsPlaying)
                 throw new InvalidOperationException($"Cannot invoke {nameof(BeginPlaying)} when already playing");
 
-            isPlaying = true;
+            IsPlaying = true;
 
             // transfer state at point of beginning play
             currentState.BeatmapID = beatmap.BeatmapInfo.OnlineBeatmapID;
@@ -189,36 +165,20 @@ namespace osu.Game.Online.Spectator
             currentBeatmap = beatmap.PlayableBeatmap;
             currentScore = score;
 
-            beginPlaying();
+            BeginPlayingInternal(currentState);
         }
 
-        private void beginPlaying()
-        {
-            Debug.Assert(isPlaying);
-
-            if (!isConnected.Value) return;
-
-            connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), currentState);
-        }
-
-        public void SendFrames(FrameDataBundle data)
-        {
-            if (!isConnected.Value) return;
-
-            lastSend = connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
-        }
+        public void SendFrames(FrameDataBundle data) => lastSend = SendFramesInternal(data);
 
         public void EndPlaying()
         {
-            isPlaying = false;
+            IsPlaying = false;
             currentBeatmap = null;
 
-            if (!isConnected.Value) return;
-
-            connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), currentState);
+            EndPlayingInternal(currentState);
         }
 
-        public virtual void WatchUser(int userId)
+        public void WatchUser(int userId)
         {
             lock (userLock)
             {
@@ -226,27 +186,31 @@ namespace osu.Game.Online.Spectator
                     return;
 
                 watchingUsers.Add(userId);
-
-                if (!isConnected.Value)
-                    return;
             }
 
-            connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
+            WatchUserInternal(userId);
         }
 
-        public virtual void StopWatchingUser(int userId)
+        public void StopWatchingUser(int userId)
         {
             lock (userLock)
             {
                 watchingUsers.Remove(userId);
-
-                if (!isConnected.Value)
-                    return;
             }
 
-            connection.SendAsync(nameof(ISpectatorServer.EndWatchingUser), userId);
+            StopWatchingUserInternal(userId);
         }
 
+        protected abstract Task BeginPlayingInternal(SpectatorState state);
+
+        protected abstract Task SendFramesInternal(FrameDataBundle data);
+
+        protected abstract Task EndPlayingInternal(SpectatorState state);
+
+        protected abstract Task WatchUserInternal(int userId);
+
+        protected abstract Task StopWatchingUserInternal(int userId);
+
         private readonly Queue<LegacyReplayFrame> pendingFrames = new Queue<LegacyReplayFrame>();
 
         private double lastSendTime;
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 3707e3b7be..41984839ab 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -240,7 +240,7 @@ namespace osu.Game
 
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
 
-            dependencies.CacheAs(spectatorClient = new SpectatorClient(endpoints));
+            dependencies.CacheAs(spectatorClient = new OnlineSpectatorClient(endpoints));
             dependencies.CacheAs(multiplayerClient = new MultiplayerClient(endpoints));
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);

From 750a5c3ea96530fae27195fd5afb0fe89ff4dd0c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 17:20:30 +0900
Subject: [PATCH 10257/10326] Fix test compilation error

---
 .../Visual/Spectator/TestSpectatorClient.cs   | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index 985e293981..6bd9f1a920 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -1,11 +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.
 
+#nullable enable
+
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Utils;
-using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Scoring;
@@ -14,16 +18,16 @@ namespace osu.Game.Tests.Visual.Spectator
 {
     public class TestSpectatorClient : SpectatorClient
     {
+        public override IBindable<bool> IsConnected { get; } = new Bindable<bool>(true);
+
         public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
         private readonly ConcurrentDictionary<int, byte> watchingUsers = new ConcurrentDictionary<int, byte>();
 
         private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
         private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
 
-        public TestSpectatorClient()
-            : base(new DevelopmentEndpointConfiguration())
-        {
-        }
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
 
         public void StartPlay(int userId, int beatmapId)
         {
@@ -61,19 +65,25 @@ namespace osu.Game.Tests.Visual.Spectator
                 sendState(userId, userBeatmapDictionary[userId]);
         }
 
-        public override void WatchUser(int userId)
-        {
-            base.WatchUser(userId);
+        protected override Task BeginPlayingInternal(SpectatorState state) => ((ISpectatorClient)this).UserBeganPlaying(api.LocalUser.Value.Id, state);
 
+        protected override Task SendFramesInternal(FrameDataBundle data) => ((ISpectatorClient)this).UserSentFrames(api.LocalUser.Value.Id, data);
+
+        protected override Task EndPlayingInternal(SpectatorState state) => ((ISpectatorClient)this).UserFinishedPlaying(api.LocalUser.Value.Id, state);
+
+        protected override Task WatchUserInternal(int userId)
+        {
             // When newly watching a user, the server sends the playing state immediately.
             if (watchingUsers.TryAdd(userId, 0) && PlayingUsers.Contains(userId))
                 sendState(userId, userBeatmapDictionary[userId]);
+
+            return Task.CompletedTask;
         }
 
-        public override void StopWatchingUser(int userId)
+        protected override Task StopWatchingUserInternal(int userId)
         {
-            base.StopWatchingUser(userId);
             watchingUsers.TryRemove(userId, out _);
+            return Task.CompletedTask;
         }
 
         private void sendState(int userId, int beatmapId)

From 9d07749959aa346be7106918e9411999e1cd21d9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 17:41:46 +0900
Subject: [PATCH 10258/10326] Improve implementation of TestSpectatorClient

There was a lot of weirdness here, such as storing the playing users,
clearing the playing users from test scenes (!!), and storing the users
being wathed.
This was all a thing because the previous implementation overrode the
base method implementations, which is no longer a thing.
---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  2 +-
 .../TestSceneMultiSpectatorLeaderboard.cs     |  2 +-
 .../TestSceneMultiSpectatorScreen.cs          |  6 +-
 .../TestSceneCurrentlyPlayingDisplay.cs       |  8 ++-
 .../Visual/Spectator/TestSpectatorClient.cs   | 62 +++++++++++--------
 5 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 56a4ab8cba..e9894ff469 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -214,7 +214,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorClient.StartPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 
-        private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorClient.EndPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
+        private void finish() => AddStep("end play", () => testSpectatorClient.EndPlay(streamingUser.Id));
 
         private void checkPaused(bool state) =>
             AddUntilStep($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index afd4401a63..5ad35be0ec 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 foreach (var (userId, clock) in clocks)
                 {
-                    spectatorClient.EndPlay(userId, 0);
+                    spectatorClient.EndPlay(userId);
                     clock.CurrentTime = 0;
                 }
             });
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 23095a1ea8..b91391c409 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("finish previous gameplay", () =>
             {
                 foreach (var id in playingUserIds)
-                    spectatorClient.EndPlay(id, importedBeatmapId);
+                    spectatorClient.EndPlay(id);
                 playingUserIds.Clear();
             });
         }
@@ -258,11 +258,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
         }
 
-        private void finish(int userId, int? beatmapId = null)
+        private void finish(int userId)
         {
             AddStep("end play", () =>
             {
-                spectatorClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
+                spectatorClient.EndPlay(userId);
                 playingUserIds.Remove(userId);
                 nextFrame.Remove(userId);
             });
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 9bc0b32eee..30785fd163 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneCurrentlyPlayingDisplay : OsuTestScene
     {
+        private readonly User streamingUser = new User { Id = 2, Username = "Test user" };
+
         [Cached(typeof(SpectatorClient))]
         private TestSpectatorClient testSpectatorClient = new TestSpectatorClient();
 
@@ -55,15 +57,15 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-            AddStep("Reset players", () => testSpectatorClient.PlayingUsers.Clear());
+            AddStep("Reset players", () => testSpectatorClient.EndPlay(streamingUser.Id));
         }
 
         [Test]
         public void TestBasicDisplay()
         {
-            AddStep("Add playing user", () => testSpectatorClient.PlayingUsers.Add(2));
+            AddStep("Add playing user", () => testSpectatorClient.StartPlay(streamingUser.Id, 0));
             AddUntilStep("Panel loaded", () => currentlyPlaying.ChildrenOfType<UserGridPanel>()?.FirstOrDefault()?.User.Id == 2);
-            AddStep("Remove playing user", () => testSpectatorClient.PlayingUsers.Remove(2));
+            AddStep("Remove playing user", () => testSpectatorClient.EndPlay(streamingUser.Id));
             AddUntilStep("Panel no longer present", () => !currentlyPlaying.ChildrenOfType<UserGridPanel>().Any());
         }
 
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index 6bd9f1a920..3a5ffa8770 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -3,8 +3,9 @@
 
 #nullable enable
 
-using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -20,33 +21,44 @@ namespace osu.Game.Tests.Visual.Spectator
     {
         public override IBindable<bool> IsConnected { get; } = new Bindable<bool>(true);
 
-        public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
-        private readonly ConcurrentDictionary<int, byte> watchingUsers = new ConcurrentDictionary<int, byte>();
-
         private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
-        private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
 
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
+        /// <summary>
+        /// Starts play for an arbitrary user.
+        /// </summary>
+        /// <param name="userId">The user to start play for.</param>
+        /// <param name="beatmapId">The playing beatmap id.</param>
         public void StartPlay(int userId, int beatmapId)
         {
             userBeatmapDictionary[userId] = beatmapId;
-            sendState(userId, beatmapId);
+            sendPlayingState(userId);
         }
 
-        public void EndPlay(int userId, int beatmapId)
+        /// <summary>
+        /// Ends play for an arbitrary user.
+        /// </summary>
+        /// <param name="userId">The user to end play for.</param>
+        public void EndPlay(int userId)
         {
+            if (!PlayingUsers.Contains(userId))
+                return;
+
             ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
             {
-                BeatmapID = beatmapId,
+                BeatmapID = userBeatmapDictionary[userId],
                 RulesetID = 0,
             });
-
-            userBeatmapDictionary.Remove(userId);
-            userSentStateDictionary.Remove(userId);
         }
 
+        /// <summary>
+        /// Sends frames for an arbitrary user.
+        /// </summary>
+        /// <param name="userId">The user to send frames for.</param>
+        /// <param name="index">The frame index.</param>
+        /// <param name="count">The number of frames to send.</param>
         public void SendFrames(int userId, int index, int count)
         {
             var frames = new List<LegacyReplayFrame>();
@@ -60,12 +72,16 @@ namespace osu.Game.Tests.Visual.Spectator
 
             var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
             ((ISpectatorClient)this).UserSentFrames(userId, bundle);
-
-            if (!userSentStateDictionary[userId])
-                sendState(userId, userBeatmapDictionary[userId]);
         }
 
-        protected override Task BeginPlayingInternal(SpectatorState state) => ((ISpectatorClient)this).UserBeganPlaying(api.LocalUser.Value.Id, state);
+        protected override Task BeginPlayingInternal(SpectatorState state)
+        {
+            // Track the local user's playing beatmap ID.
+            Debug.Assert(state.BeatmapID != null);
+            userBeatmapDictionary[api.LocalUser.Value.Id] = state.BeatmapID.Value;
+
+            return ((ISpectatorClient)this).UserBeganPlaying(api.LocalUser.Value.Id, state);
+        }
 
         protected override Task SendFramesInternal(FrameDataBundle data) => ((ISpectatorClient)this).UserSentFrames(api.LocalUser.Value.Id, data);
 
@@ -74,27 +90,21 @@ namespace osu.Game.Tests.Visual.Spectator
         protected override Task WatchUserInternal(int userId)
         {
             // When newly watching a user, the server sends the playing state immediately.
-            if (watchingUsers.TryAdd(userId, 0) && PlayingUsers.Contains(userId))
-                sendState(userId, userBeatmapDictionary[userId]);
+            if (PlayingUsers.Contains(userId))
+                sendPlayingState(userId);
 
             return Task.CompletedTask;
         }
 
-        protected override Task StopWatchingUserInternal(int userId)
-        {
-            watchingUsers.TryRemove(userId, out _);
-            return Task.CompletedTask;
-        }
+        protected override Task StopWatchingUserInternal(int userId) => Task.CompletedTask;
 
-        private void sendState(int userId, int beatmapId)
+        private void sendPlayingState(int userId)
         {
             ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
             {
-                BeatmapID = beatmapId,
+                BeatmapID = userBeatmapDictionary[userId],
                 RulesetID = 0,
             });
-
-            userSentStateDictionary[userId] = true;
         }
     }
 }

From 6eff8d513e6c34b3efd8c88bdf17ea698a977943 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 17:51:09 +0900
Subject: [PATCH 10259/10326] Annotate nullables

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 24 +++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 5ea31a49fb..cb98b01bed 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.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.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -45,36 +46,37 @@ namespace osu.Game.Online.Spectator
 
         private readonly Dictionary<int, SpectatorState> playingUserStates = new Dictionary<int, SpectatorState>();
 
-        [CanBeNull]
-        private IBeatmap currentBeatmap;
+        private IBeatmap? currentBeatmap;
 
-        [CanBeNull]
-        private Score currentScore;
+        private Score? currentScore;
 
         [Resolved]
-        private IBindable<RulesetInfo> currentRuleset { get; set; }
+        private IBindable<RulesetInfo> currentRuleset { get; set; } = null!;
 
         [Resolved]
-        private IBindable<IReadOnlyList<Mod>> currentMods { get; set; }
+        private IBindable<IReadOnlyList<Mod>> currentMods { get; set; } = null!;
 
         private readonly SpectatorState currentState = new SpectatorState();
 
+        /// <summary>
+        /// Whether the local user is playing.
+        /// </summary>
         protected bool IsPlaying { get; private set; }
 
         /// <summary>
         /// Called whenever new frames arrive from the server.
         /// </summary>
-        public event Action<int, FrameDataBundle> OnNewFrames;
+        public event Action<int, FrameDataBundle>? OnNewFrames;
 
         /// <summary>
         /// Called whenever a user starts a play session, or immediately if the user is being watched and currently in a play session.
         /// </summary>
-        public event Action<int, SpectatorState> OnUserBeganPlaying;
+        public event Action<int, SpectatorState>? OnUserBeganPlaying;
 
         /// <summary>
         /// Called whenever a user finishes a play session.
         /// </summary>
-        public event Action<int, SpectatorState> OnUserFinishedPlaying;
+        public event Action<int, SpectatorState>? OnUserFinishedPlaying;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -215,7 +217,7 @@ namespace osu.Game.Online.Spectator
 
         private double lastSendTime;
 
-        private Task lastSend;
+        private Task? lastSend;
 
         private const int max_pending_frames = 30;
 

From 27e81d6504aff75e4e0673496c878c8fb0698ac8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 18:21:16 +0900
Subject: [PATCH 10260/10326] Implement proper rotation algorithm for skin
 editor

---
 .../Edit/OsuSelectionHandler.cs               | 30 ++--------------
 .../Compose/Components/SelectionHandler.cs    | 24 +++++++++++++
 .../Skinning/Editor/SkinSelectionHandler.cs   | 34 ++++++++++++++++---
 3 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 8cb86bc108..57d0cd859d 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.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.Linq;
 using osu.Framework.Graphics;
@@ -12,7 +11,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
-using Vector2 = osuTK.Vector2;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
@@ -173,12 +172,12 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             foreach (var h in hitObjects)
             {
-                h.Position = rotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
+                h.Position = RotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
 
                 if (h is IHasPath path)
                 {
                     foreach (var point in path.Path.ControlPoints)
-                        point.Position.Value = rotatePointAroundOrigin(point.Position.Value, Vector2.Zero, delta);
+                        point.Position.Value = RotatePointAroundOrigin(point.Position.Value, Vector2.Zero, delta);
                 }
             }
 
@@ -324,28 +323,5 @@ namespace osu.Game.Rulesets.Osu.Edit
         private OsuHitObject[] selectedMovableObjects => SelectedItems.OfType<OsuHitObject>()
                                                                       .Where(h => !(h is Spinner))
                                                                       .ToArray();
-
-        /// <summary>
-        /// Rotate a point around an arbitrary origin.
-        /// </summary>
-        /// <param name="point">The point.</param>
-        /// <param name="origin">The centre origin to rotate around.</param>
-        /// <param name="angle">The angle to rotate (in degrees).</param>
-        private static Vector2 rotatePointAroundOrigin(Vector2 point, Vector2 origin, float angle)
-        {
-            angle = -angle;
-
-            point.X -= origin.X;
-            point.Y -= origin.Y;
-
-            Vector2 ret;
-            ret.X = point.X * MathF.Cos(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Sin(MathUtils.DegreesToRadians(angle));
-            ret.Y = point.X * -MathF.Sin(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Cos(MathUtils.DegreesToRadians(angle));
-
-            ret.X += origin.X;
-            ret.Y += origin.Y;
-
-            return ret;
-        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 26328b4dc7..8939be925a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
@@ -353,6 +354,29 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #region Helper Methods
 
+        /// <summary>
+        /// Rotate a point around an arbitrary origin.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <param name="origin">The centre origin to rotate around.</param>
+        /// <param name="angle">The angle to rotate (in degrees).</param>
+        protected static Vector2 RotatePointAroundOrigin(Vector2 point, Vector2 origin, float angle)
+        {
+            angle = -angle;
+
+            point.X -= origin.X;
+            point.Y -= origin.Y;
+
+            Vector2 ret;
+            ret.X = point.X * MathF.Cos(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Sin(MathUtils.DegreesToRadians(angle));
+            ret.Y = point.X * -MathF.Sin(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Cos(MathUtils.DegreesToRadians(angle));
+
+            ret.X += origin.X;
+            ret.Y += origin.Y;
+
+            return ret;
+        }
+
         /// <summary>
         /// Given a flip direction, a surrounding quad for all selected objects, and a position,
         /// will return the flipped position in screen space coordinates.
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 2f9611ba65..cc4c120e23 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -18,16 +18,42 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinSelectionHandler : SelectionHandler<ISkinnableDrawable>
     {
+        private Vector2? referenceOrigin;
+
         [Resolved]
         private SkinEditor skinEditor { get; set; }
 
+        protected override void OnOperationEnded()
+        {
+            base.OnOperationEnded();
+            referenceOrigin = null;
+        }
+
         public override bool HandleRotation(float angle)
         {
-            // TODO: this doesn't correctly account for origin/anchor specs being different in a multi-selection.
-            foreach (var c in SelectedBlueprints)
-                ((Drawable)c.Item).Rotation += angle;
+            if (SelectedBlueprints.Count == 1)
+            {
+                // for single items, rotate around the origin rather than the selection centre.
+                ((Drawable)SelectedBlueprints.First().Item).Rotation += angle;
+            }
+            else
+            {
+                var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
+                    b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
 
-            return base.HandleRotation(angle);
+                referenceOrigin ??= selectionQuad.Centre;
+
+                foreach (var b in SelectedBlueprints)
+                {
+                    var drawableItem = (Drawable)b.Item;
+
+                    drawableItem.Position = drawableItem.Parent.ToLocalSpace(RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, referenceOrigin.Value, angle)) - drawableItem.AnchorPosition;
+                    drawableItem.Rotation += angle;
+                }
+            }
+
+            // this isn't always the case but let's be lenient for now.
+            return true;
         }
 
         public override bool HandleScale(Vector2 scale, Anchor anchor)

From 95c78b918510e8c4ebbc68a95496e0956a676278 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 18:24:25 +0900
Subject: [PATCH 10261/10326] Split out common selection quad logic

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index cc4c120e23..ec45830f94 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
@@ -38,8 +39,7 @@ namespace osu.Game.Skinning.Editor
             }
             else
             {
-                var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
-                    b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+                var selectionQuad = getSelectionQuad();
 
                 referenceOrigin ??= selectionQuad.Centre;
 
@@ -63,8 +63,7 @@ namespace osu.Game.Skinning.Editor
 
             adjustScaleFromAnchor(ref scale, anchor);
 
-            var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
-                b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+            var selectionQuad = getSelectionQuad();
 
             // the selection quad is always upright, so use a rect to make mutating the values easier.
             var adjustedRect = selectionQuad.AABBFloat;
@@ -220,6 +219,13 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
+        /// <summary>
+        /// A screen-space quad surrounding all selected drawables, accounting for their full displayed size.
+        /// </summary>
+        /// <returns></returns>
+        private Quad getSelectionQuad() =>
+            GetSurroundingQuad(SelectedBlueprints.SelectMany(b => b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+
         private void applyAnchor(Anchor anchor)
         {
             foreach (var item in SelectedItems)

From 6f75c59760e3bca0110e772c4e48a65addd496a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 18:31:51 +0900
Subject: [PATCH 10262/10326] Fix flip logic not using the full selection quad

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index ec45830f94..88372e23a3 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Skinning.Editor
 
         public override bool HandleFlip(Direction direction)
         {
-            var selectionQuad = GetSurroundingQuad(SelectedBlueprints.Select(b => b.ScreenSpaceSelectionPoint));
+            var selectionQuad = getSelectionQuad();
 
             foreach (var b in SelectedBlueprints)
             {

From 20f1ef43180b20c8ee310c62a262f0f06bf3b5c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 18:35:13 +0900
Subject: [PATCH 10263/10326] Extract common implementation of updating
 drawable position from screen space pos

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 88372e23a3..bdb1d1c054 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -47,7 +47,8 @@ namespace osu.Game.Skinning.Editor
                 {
                     var drawableItem = (Drawable)b.Item;
 
-                    drawableItem.Position = drawableItem.Parent.ToLocalSpace(RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, referenceOrigin.Value, angle)) - drawableItem.AnchorPosition;
+                    var rotatedPosition = RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, referenceOrigin.Value, angle);
+                    updateDrawablePosition(drawableItem, rotatedPosition);
                     drawableItem.Rotation += angle;
                 }
             }
@@ -116,7 +117,7 @@ namespace osu.Game.Skinning.Editor
                     adjustedRect.TopLeft.Y + adjustedRect.Height * relativePositionInOriginal.Y
                 );
 
-                drawableItem.Position = drawableItem.Parent.ToLocalSpace(newPositionInAdjusted) - drawableItem.AnchorPosition;
+                updateDrawablePosition(drawableItem, newPositionInAdjusted);
                 drawableItem.Scale *= scaledDelta;
             }
 
@@ -131,8 +132,9 @@ namespace osu.Game.Skinning.Editor
             {
                 var drawableItem = (Drawable)b.Item;
 
-                drawableItem.Position =
-                    drawableItem.Parent.ToLocalSpace(GetFlippedPosition(direction, selectionQuad, b.ScreenSpaceSelectionPoint)) - drawableItem.AnchorPosition;
+                var flippedPosition = GetFlippedPosition(direction, selectionQuad, b.ScreenSpaceSelectionPoint);
+
+                updateDrawablePosition(drawableItem, flippedPosition);
 
                 drawableItem.Scale *= new Vector2(
                     direction == Direction.Horizontal ? -1 : 1,
@@ -207,6 +209,12 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
+        private static void updateDrawablePosition(Drawable drawable, Vector2 screenSpacePosition)
+        {
+            drawable.Position =
+                drawable.Parent.ToLocalSpace(screenSpacePosition) - drawable.AnchorPosition;
+        }
+
         private void applyOrigin(Anchor anchor)
         {
             foreach (var item in SelectedItems)

From 10597f7e6a508de8db6aade5faf6664c22f26d46 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 18:37:27 +0900
Subject: [PATCH 10264/10326] Remove locking from SpectatorClient

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 66 +++++++-------------
 1 file changed, 23 insertions(+), 43 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index cb98b01bed..f930328846 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -38,8 +38,6 @@ namespace osu.Game.Online.Spectator
 
         private readonly List<int> watchingUsers = new List<int>();
 
-        private readonly object userLock = new object();
-
         public IBindableList<int> PlayingUsers => playingUsers;
 
         private readonly BindableList<int> playingUsers = new BindableList<int>();
@@ -81,18 +79,13 @@ namespace osu.Game.Online.Spectator
         [BackgroundDependencyLoader]
         private void load()
         {
-            IsConnected.BindValueChanged(connected =>
+            IsConnected.BindValueChanged(connected => Schedule(() =>
             {
                 if (connected.NewValue)
                 {
                     // get all the users that were previously being watched
-                    int[] users;
-
-                    lock (userLock)
-                    {
-                        users = watchingUsers.ToArray();
-                        watchingUsers.Clear();
-                    }
+                    int[] users = watchingUsers.ToArray();
+                    watchingUsers.Clear();
 
                     // resubscribe to watched users.
                     foreach (var userId in users)
@@ -104,18 +97,15 @@ namespace osu.Game.Online.Spectator
                 }
                 else
                 {
-                    lock (userLock)
-                    {
-                        playingUsers.Clear();
-                        playingUserStates.Clear();
-                    }
+                    playingUsers.Clear();
+                    playingUserStates.Clear();
                 }
-            }, true);
+            }), true);
         }
 
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
         {
-            lock (userLock)
+            Schedule(() =>
             {
                 if (!playingUsers.Contains(userId))
                     playingUsers.Add(userId);
@@ -125,29 +115,29 @@ namespace osu.Game.Online.Spectator
                 // We don't want the user states to update unless the player is being watched, otherwise calling BindUserBeganPlaying() can lead to double invocations.
                 if (watchingUsers.Contains(userId))
                     playingUserStates[userId] = state;
-            }
 
-            OnUserBeganPlaying?.Invoke(userId, state);
+                OnUserBeganPlaying?.Invoke(userId, state);
+            });
 
             return Task.CompletedTask;
         }
 
         Task ISpectatorClient.UserFinishedPlaying(int userId, SpectatorState state)
         {
-            lock (userLock)
+            Schedule(() =>
             {
                 playingUsers.Remove(userId);
                 playingUserStates.Remove(userId);
-            }
 
-            OnUserFinishedPlaying?.Invoke(userId, state);
+                OnUserFinishedPlaying?.Invoke(userId, state);
+            });
 
             return Task.CompletedTask;
         }
 
         Task ISpectatorClient.UserSentFrames(int userId, FrameDataBundle data)
         {
-            OnNewFrames?.Invoke(userId, data);
+            Schedule(() => OnNewFrames?.Invoke(userId, data));
 
             return Task.CompletedTask;
         }
@@ -182,23 +172,17 @@ namespace osu.Game.Online.Spectator
 
         public void WatchUser(int userId)
         {
-            lock (userLock)
-            {
-                if (watchingUsers.Contains(userId))
-                    return;
+            if (watchingUsers.Contains(userId))
+                return;
 
-                watchingUsers.Add(userId);
-            }
+            watchingUsers.Add(userId);
 
             WatchUserInternal(userId);
         }
 
         public void StopWatchingUser(int userId)
         {
-            lock (userLock)
-            {
-                watchingUsers.Remove(userId);
-            }
+            watchingUsers.Remove(userId);
 
             StopWatchingUserInternal(userId);
         }
@@ -262,8 +246,7 @@ namespace osu.Game.Online.Spectator
         /// <returns><c>true</c> if successful (the user is playing), <c>false</c> otherwise.</returns>
         public bool TryGetPlayingUserState(int userId, out SpectatorState state)
         {
-            lock (userLock)
-                return playingUserStates.TryGetValue(userId, out state);
+            return playingUserStates.TryGetValue(userId, out state);
         }
 
         /// <summary>
@@ -274,16 +257,13 @@ namespace osu.Game.Online.Spectator
         public void BindUserBeganPlaying(Action<int, SpectatorState> callback, bool runOnceImmediately = false)
         {
             // The lock is taken before the event is subscribed to to prevent doubling of events.
-            lock (userLock)
-            {
-                OnUserBeganPlaying += callback;
+            OnUserBeganPlaying += callback;
 
-                if (!runOnceImmediately)
-                    return;
+            if (!runOnceImmediately)
+                return;
 
-                foreach (var (userId, state) in playingUserStates)
-                    callback(userId, state);
-            }
+            foreach (var (userId, state) in playingUserStates)
+                callback(userId, state);
         }
     }
 }

From f74dbb9e1f2abfafca3bfe4499c5488dc6198c49 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 18:52:20 +0900
Subject: [PATCH 10265/10326] Remove locking from SpectatorScreen

---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 181 ++++++++-----------
 1 file changed, 78 insertions(+), 103 deletions(-)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 1cf7bc30ee..e6c9a0acd4 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -42,9 +42,6 @@ namespace osu.Game.Screens.Spectate
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
 
-        // A lock is used to synchronise access to spectator/gameplay states, since this class is a screen which may become non-current and stop receiving updates at any point.
-        private readonly object stateLock = new object();
-
         private readonly Dictionary<int, User> userMap = new Dictionary<int, User>();
         private readonly Dictionary<int, GameplayState> gameplayStates = new Dictionary<int, GameplayState>();
 
@@ -63,8 +60,11 @@ namespace osu.Game.Screens.Spectate
         {
             base.LoadComplete();
 
-            populateAllUsers().ContinueWith(_ => Schedule(() =>
+            getAllUsers().ContinueWith(users => Schedule(() =>
             {
+                foreach (var u in users.Result)
+                    userMap[u.Id] = u;
+
                 spectatorClient.BindUserBeganPlaying(userBeganPlaying, true);
                 spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
                 spectatorClient.OnNewFrames += userSentFrames;
@@ -72,27 +72,23 @@ namespace osu.Game.Screens.Spectate
                 managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
                 managerUpdated.BindValueChanged(beatmapUpdated);
 
-                lock (stateLock)
-                {
-                    foreach (var (id, _) in userMap)
-                        spectatorClient.WatchUser(id);
-                }
+                foreach (var (id, _) in userMap)
+                    spectatorClient.WatchUser(id);
             }));
         }
 
-        private Task populateAllUsers()
+        private Task<User[]> getAllUsers()
         {
-            var userLookupTasks = new List<Task>();
+            var userLookupTasks = new List<Task<User>>();
 
             foreach (var u in userIds)
             {
                 userLookupTasks.Add(userLookupCache.GetUserAsync(u).ContinueWith(task =>
                 {
                     if (!task.IsCompletedSuccessfully)
-                        return;
+                        return null;
 
-                    lock (stateLock)
-                        userMap[u] = task.Result;
+                    return task.Result;
                 }));
             }
 
@@ -104,16 +100,13 @@ namespace osu.Game.Screens.Spectate
             if (!e.NewValue.TryGetTarget(out var beatmapSet))
                 return;
 
-            lock (stateLock)
+            foreach (var (userId, _) in userMap)
             {
-                foreach (var (userId, _) in userMap)
-                {
-                    if (!spectatorClient.TryGetPlayingUserState(userId, out var userState))
-                        continue;
+                if (!spectatorClient.TryGetPlayingUserState(userId, out var userState))
+                    continue;
 
-                    if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == userState.BeatmapID))
-                        updateGameplayState(userId);
-                }
+                if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == userState.BeatmapID))
+                    updateGameplayState(userId);
             }
         }
 
@@ -122,101 +115,89 @@ namespace osu.Game.Screens.Spectate
             if (state.RulesetID == null || state.BeatmapID == null)
                 return;
 
-            lock (stateLock)
-            {
-                if (!userMap.ContainsKey(userId))
-                    return;
+            if (!userMap.ContainsKey(userId))
+                return;
 
-                // The user may have stopped playing.
-                if (!spectatorClient.TryGetPlayingUserState(userId, out _))
-                    return;
+            // The user may have stopped playing.
+            if (!spectatorClient.TryGetPlayingUserState(userId, out _))
+                return;
 
-                Schedule(() => OnUserStateChanged(userId, state));
+            Schedule(() => OnUserStateChanged(userId, state));
 
-                updateGameplayState(userId);
-            }
+            updateGameplayState(userId);
         }
 
         private void updateGameplayState(int userId)
         {
-            lock (stateLock)
+            Debug.Assert(userMap.ContainsKey(userId));
+
+            // The user may have stopped playing.
+            if (!spectatorClient.TryGetPlayingUserState(userId, out var spectatorState))
+                return;
+
+            var user = userMap[userId];
+
+            var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == spectatorState.RulesetID)?.CreateInstance();
+            if (resolvedRuleset == null)
+                return;
+
+            var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == spectatorState.BeatmapID);
+            if (resolvedBeatmap == null)
+                return;
+
+            var score = new Score
             {
-                Debug.Assert(userMap.ContainsKey(userId));
-
-                // The user may have stopped playing.
-                if (!spectatorClient.TryGetPlayingUserState(userId, out var spectatorState))
-                    return;
-
-                var user = userMap[userId];
-
-                var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == spectatorState.RulesetID)?.CreateInstance();
-                if (resolvedRuleset == null)
-                    return;
-
-                var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == spectatorState.BeatmapID);
-                if (resolvedBeatmap == null)
-                    return;
-
-                var score = new Score
+                ScoreInfo = new ScoreInfo
                 {
-                    ScoreInfo = new ScoreInfo
-                    {
-                        Beatmap = resolvedBeatmap,
-                        User = user,
-                        Mods = spectatorState.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
-                        Ruleset = resolvedRuleset.RulesetInfo,
-                    },
-                    Replay = new Replay { HasReceivedAllFrames = false },
-                };
+                    Beatmap = resolvedBeatmap,
+                    User = user,
+                    Mods = spectatorState.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
+                    Ruleset = resolvedRuleset.RulesetInfo,
+                },
+                Replay = new Replay { HasReceivedAllFrames = false },
+            };
 
-                var gameplayState = new GameplayState(score, resolvedRuleset, beatmaps.GetWorkingBeatmap(resolvedBeatmap));
+            var gameplayState = new GameplayState(score, resolvedRuleset, beatmaps.GetWorkingBeatmap(resolvedBeatmap));
 
-                gameplayStates[userId] = gameplayState;
-                Schedule(() => StartGameplay(userId, gameplayState));
-            }
+            gameplayStates[userId] = gameplayState;
+            Schedule(() => StartGameplay(userId, gameplayState));
         }
 
         private void userSentFrames(int userId, FrameDataBundle bundle)
         {
-            lock (stateLock)
+            if (!userMap.ContainsKey(userId))
+                return;
+
+            if (!gameplayStates.TryGetValue(userId, out var gameplayState))
+                return;
+
+            // The ruleset instance should be guaranteed to be in sync with the score via ScoreLock.
+            Debug.Assert(gameplayState.Ruleset != null && gameplayState.Ruleset.RulesetInfo.Equals(gameplayState.Score.ScoreInfo.Ruleset));
+
+            foreach (var frame in bundle.Frames)
             {
-                if (!userMap.ContainsKey(userId))
-                    return;
+                IConvertibleReplayFrame convertibleFrame = gameplayState.Ruleset.CreateConvertibleReplayFrame();
+                convertibleFrame.FromLegacy(frame, gameplayState.Beatmap.Beatmap);
 
-                if (!gameplayStates.TryGetValue(userId, out var gameplayState))
-                    return;
+                var convertedFrame = (ReplayFrame)convertibleFrame;
+                convertedFrame.Time = frame.Time;
 
-                // The ruleset instance should be guaranteed to be in sync with the score via ScoreLock.
-                Debug.Assert(gameplayState.Ruleset != null && gameplayState.Ruleset.RulesetInfo.Equals(gameplayState.Score.ScoreInfo.Ruleset));
-
-                foreach (var frame in bundle.Frames)
-                {
-                    IConvertibleReplayFrame convertibleFrame = gameplayState.Ruleset.CreateConvertibleReplayFrame();
-                    convertibleFrame.FromLegacy(frame, gameplayState.Beatmap.Beatmap);
-
-                    var convertedFrame = (ReplayFrame)convertibleFrame;
-                    convertedFrame.Time = frame.Time;
-
-                    gameplayState.Score.Replay.Frames.Add(convertedFrame);
-                }
+                gameplayState.Score.Replay.Frames.Add(convertedFrame);
             }
         }
 
         private void userFinishedPlaying(int userId, SpectatorState state)
         {
-            lock (stateLock)
-            {
-                if (!userMap.ContainsKey(userId))
-                    return;
+            if (!userMap.ContainsKey(userId))
+                return;
 
-                if (!gameplayStates.TryGetValue(userId, out var gameplayState))
-                    return;
+            if (!gameplayStates.TryGetValue(userId, out var gameplayState))
+                return;
 
-                gameplayState.Score.Replay.HasReceivedAllFrames = true;
+            gameplayState.Score.Replay.HasReceivedAllFrames = true;
 
-                gameplayStates.Remove(userId);
-                Schedule(() => EndGameplay(userId));
-            }
+            gameplayStates.Remove(userId);
+            Schedule(() => EndGameplay(userId));
         }
 
         /// <summary>
@@ -245,15 +226,12 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userId">The user to stop spectating.</param>
         protected void RemoveUser(int userId)
         {
-            lock (stateLock)
-            {
-                userFinishedPlaying(userId, null);
+            userFinishedPlaying(userId, null);
 
-                userIds.Remove(userId);
-                userMap.Remove(userId);
+            userIds.Remove(userId);
+            userMap.Remove(userId);
 
-                spectatorClient.StopWatchingUser(userId);
-            }
+            spectatorClient.StopWatchingUser(userId);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -266,11 +244,8 @@ namespace osu.Game.Screens.Spectate
                 spectatorClient.OnUserFinishedPlaying -= userFinishedPlaying;
                 spectatorClient.OnNewFrames -= userSentFrames;
 
-                lock (stateLock)
-                {
-                    foreach (var (userId, _) in userMap)
-                        spectatorClient.StopWatchingUser(userId);
-                }
+                foreach (var (userId, _) in userMap)
+                    spectatorClient.StopWatchingUser(userId);
             }
 
             managerUpdated?.UnbindAll();

From 89b4f695884ca229193dc8e7bd2b5d009847a55b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:19:39 +0900
Subject: [PATCH 10266/10326] Expose playing user states as bindable dictionary

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index f930328846..810299e90d 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -39,10 +39,10 @@ namespace osu.Game.Online.Spectator
         private readonly List<int> watchingUsers = new List<int>();
 
         public IBindableList<int> PlayingUsers => playingUsers;
-
         private readonly BindableList<int> playingUsers = new BindableList<int>();
 
-        private readonly Dictionary<int, SpectatorState> playingUserStates = new Dictionary<int, SpectatorState>();
+        public IBindableDictionary<int, SpectatorState> PlayingUserStates => playingUserStates;
+        private readonly BindableDictionary<int, SpectatorState> playingUserStates = new BindableDictionary<int, SpectatorState>();
 
         private IBeatmap? currentBeatmap;
 

From b515fe3cb1f9ee8732bd427dfc842cbefca3a9b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:19:58 +0900
Subject: [PATCH 10267/10326] Fix playing user state not removed on stop
 watching

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 810299e90d..649af03bc4 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -183,6 +183,7 @@ namespace osu.Game.Online.Spectator
         public void StopWatchingUser(int userId)
         {
             watchingUsers.Remove(userId);
+            playingUserStates.Remove(userId);
 
             StopWatchingUserInternal(userId);
         }

From 7ee81669f7a304982bb88cccf5cf354a9cc72131 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:27:34 +0900
Subject: [PATCH 10268/10326] Remove bind helpers from SpectatorClient

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 28 --------
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 68 +++++++++++---------
 2 files changed, 39 insertions(+), 57 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 649af03bc4..04904f66ac 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -238,33 +238,5 @@ namespace osu.Game.Online.Spectator
 
             lastSendTime = Time.Current;
         }
-
-        /// <summary>
-        /// Attempts to retrieve the <see cref="SpectatorState"/> for a currently-playing user.
-        /// </summary>
-        /// <param name="userId">The user.</param>
-        /// <param name="state">The current <see cref="SpectatorState"/> for the user, if they're playing. <c>null</c> if the user is not playing.</param>
-        /// <returns><c>true</c> if successful (the user is playing), <c>false</c> otherwise.</returns>
-        public bool TryGetPlayingUserState(int userId, out SpectatorState state)
-        {
-            return playingUserStates.TryGetValue(userId, out state);
-        }
-
-        /// <summary>
-        /// Bind an action to <see cref="OnUserBeganPlaying"/> with the option of running the bound action once immediately.
-        /// </summary>
-        /// <param name="callback">The action to perform when a user begins playing.</param>
-        /// <param name="runOnceImmediately">Whether the action provided in <paramref name="callback"/> should be run once immediately for all users currently playing.</param>
-        public void BindUserBeganPlaying(Action<int, SpectatorState> callback, bool runOnceImmediately = false)
-        {
-            // The lock is taken before the event is subscribed to to prevent doubling of events.
-            OnUserBeganPlaying += callback;
-
-            if (!runOnceImmediately)
-                return;
-
-            foreach (var (userId, state) in playingUserStates)
-                callback(userId, state);
-        }
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index e6c9a0acd4..0adc5b863f 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Online.Spectator;
@@ -42,6 +43,8 @@ namespace osu.Game.Screens.Spectate
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
 
+        private readonly IBindableDictionary<int, SpectatorState> playingUserStates = new BindableDictionary<int, SpectatorState>();
+
         private readonly Dictionary<int, User> userMap = new Dictionary<int, User>();
         private readonly Dictionary<int, GameplayState> gameplayStates = new Dictionary<int, GameplayState>();
 
@@ -65,8 +68,9 @@ namespace osu.Game.Screens.Spectate
                 foreach (var u in users.Result)
                     userMap[u.Id] = u;
 
-                spectatorClient.BindUserBeganPlaying(userBeganPlaying, true);
-                spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
+                playingUserStates.BindTo(spectatorClient.PlayingUserStates);
+                playingUserStates.BindCollectionChanged(onPlayingUserStatesChanged, true);
+
                 spectatorClient.OnNewFrames += userSentFrames;
 
                 managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
@@ -102,7 +106,7 @@ namespace osu.Game.Screens.Spectate
 
             foreach (var (userId, _) in userMap)
             {
-                if (!spectatorClient.TryGetPlayingUserState(userId, out var userState))
+                if (!playingUserStates.TryGetValue(userId, out var userState))
                     continue;
 
                 if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == userState.BeatmapID))
@@ -110,7 +114,23 @@ namespace osu.Game.Screens.Spectate
             }
         }
 
-        private void userBeganPlaying(int userId, SpectatorState state)
+        private void onPlayingUserStatesChanged(object sender, NotifyDictionaryChangedEventArgs<int, SpectatorState> e)
+        {
+            switch (e.Action)
+            {
+                case NotifyDictionaryChangedAction.Add:
+                    foreach (var (userId, state) in e.NewItems.AsNonNull())
+                        onUserStateAdded(userId, state);
+                    break;
+
+                case NotifyDictionaryChangedAction.Remove:
+                    foreach (var (userId, _) in e.OldItems.AsNonNull())
+                        onUserStateRemoved(userId);
+                    break;
+            }
+        }
+
+        private void onUserStateAdded(int userId, SpectatorState state)
         {
             if (state.RulesetID == null || state.BeatmapID == null)
                 return;
@@ -118,24 +138,30 @@ namespace osu.Game.Screens.Spectate
             if (!userMap.ContainsKey(userId))
                 return;
 
-            // The user may have stopped playing.
-            if (!spectatorClient.TryGetPlayingUserState(userId, out _))
+            Schedule(() => OnUserStateChanged(userId, state));
+            updateGameplayState(userId);
+        }
+
+        private void onUserStateRemoved(int userId)
+        {
+            if (!userMap.ContainsKey(userId))
                 return;
 
-            Schedule(() => OnUserStateChanged(userId, state));
+            if (!gameplayStates.TryGetValue(userId, out var gameplayState))
+                return;
 
-            updateGameplayState(userId);
+            gameplayState.Score.Replay.HasReceivedAllFrames = true;
+
+            gameplayStates.Remove(userId);
+            Schedule(() => EndGameplay(userId));
         }
 
         private void updateGameplayState(int userId)
         {
             Debug.Assert(userMap.ContainsKey(userId));
 
-            // The user may have stopped playing.
-            if (!spectatorClient.TryGetPlayingUserState(userId, out var spectatorState))
-                return;
-
             var user = userMap[userId];
+            var spectatorState = playingUserStates[userId];
 
             var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == spectatorState.RulesetID)?.CreateInstance();
             if (resolvedRuleset == null)
@@ -186,20 +212,6 @@ namespace osu.Game.Screens.Spectate
             }
         }
 
-        private void userFinishedPlaying(int userId, SpectatorState state)
-        {
-            if (!userMap.ContainsKey(userId))
-                return;
-
-            if (!gameplayStates.TryGetValue(userId, out var gameplayState))
-                return;
-
-            gameplayState.Score.Replay.HasReceivedAllFrames = true;
-
-            gameplayStates.Remove(userId);
-            Schedule(() => EndGameplay(userId));
-        }
-
         /// <summary>
         /// Invoked when a spectated user's state has changed.
         /// </summary>
@@ -226,7 +238,7 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userId">The user to stop spectating.</param>
         protected void RemoveUser(int userId)
         {
-            userFinishedPlaying(userId, null);
+            onUserStateRemoved(userId);
 
             userIds.Remove(userId);
             userMap.Remove(userId);
@@ -240,8 +252,6 @@ namespace osu.Game.Screens.Spectate
 
             if (spectatorClient != null)
             {
-                spectatorClient.OnUserBeganPlaying -= userBeganPlaying;
-                spectatorClient.OnUserFinishedPlaying -= userFinishedPlaying;
                 spectatorClient.OnNewFrames -= userSentFrames;
 
                 foreach (var (userId, _) in userMap)

From df5970fab4585e6649a2cec85f7d38e5ee47b264 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 19:34:53 +0900
Subject: [PATCH 10269/10326] Create base implementations of the two most
 common `TernaryStateMenuItem`s

---
 .../Components/PathControlPointVisualiser.cs  | 12 +---
 .../Edit/TaikoSelectionHandler.cs             |  4 +-
 .../TestSceneStatefulMenuItem.cs              | 56 +++++++++++++++++--
 .../UserInterface/TernaryStateMenuItem.cs     | 37 ++----------
 .../TernaryStateRadioMenuItem.cs              | 23 ++++++++
 .../TernaryStateToggleMenuItem.cs             | 42 ++++++++++++++
 .../Components/EditorSelectionHandler.cs      |  4 +-
 .../Carousel/DrawableCarouselBeatmapSet.cs    |  2 +-
 .../Skinning/Editor/SkinSelectionHandler.cs   | 14 +----
 9 files changed, 129 insertions(+), 65 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs
 create mode 100644 osu.Game/Graphics/UserInterface/TernaryStateToggleMenuItem.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 44c3056910..c36768baba 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -243,7 +243,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             int totalCount = Pieces.Count(p => p.IsSelected.Value);
             int countOfState = Pieces.Where(p => p.IsSelected.Value).Count(p => p.ControlPoint.Type.Value == type);
 
-            var item = new PathTypeMenuItem(type, () =>
+            var item = new TernaryStateRadioMenuItem(type == null ? "Inherit" : type.ToString().Humanize(), MenuItemType.Standard, _ =>
             {
                 foreach (var p in Pieces.Where(p => p.IsSelected.Value))
                     updatePathType(p, type);
@@ -258,15 +258,5 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             return item;
         }
-
-        private class PathTypeMenuItem : TernaryStateMenuItem
-        {
-            public PathTypeMenuItem(PathType? type, Action action)
-                : base(type == null ? "Inherit" : type.ToString().Humanize(), changeState, MenuItemType.Standard, _ => action?.Invoke())
-            {
-            }
-
-            private static TernaryState changeState(TernaryState state) => TernaryState.True;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index 48ee0d4cf4..a24130d6ac 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -76,10 +76,10 @@ namespace osu.Game.Rulesets.Taiko.Edit
         protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)
         {
             if (selection.All(s => s.Item is Hit))
-                yield return new TernaryStateMenuItem("Rim") { State = { BindTarget = selectionRimState } };
+                yield return new TernaryStateToggleMenuItem("Rim") { State = { BindTarget = selectionRimState } };
 
             if (selection.All(s => s.Item is TaikoHitObject))
-                yield return new TernaryStateMenuItem("Strong") { State = { BindTarget = selectionStrongState } };
+                yield return new TernaryStateToggleMenuItem("Strong") { State = { BindTarget = selectionStrongState } };
 
             foreach (var item in base.GetContextMenuItemsForSelection(selection))
                 yield return item;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
index 29aeb6a4b2..18ec631f37 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual.UserInterface
     public class TestSceneStatefulMenuItem : OsuManualInputManagerTestScene
     {
         [Test]
-        public void TestTernaryMenuItem()
+        public void TestTernaryRadioMenuItem()
         {
             OsuMenu menu = null;
 
@@ -30,9 +30,57 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Origin = Anchor.Centre,
                     Items = new[]
                     {
-                        new TernaryStateMenuItem("First"),
-                        new TernaryStateMenuItem("Second") { State = { BindTarget = state } },
-                        new TernaryStateMenuItem("Third") { State = { Value = TernaryState.True } },
+                        new TernaryStateRadioMenuItem("First"),
+                        new TernaryStateRadioMenuItem("Second") { State = { BindTarget = state } },
+                        new TernaryStateRadioMenuItem("Third") { State = { Value = TernaryState.True } },
+                    }
+                };
+            });
+
+            checkState(TernaryState.Indeterminate);
+
+            click();
+            checkState(TernaryState.True);
+
+            click();
+            checkState(TernaryState.True);
+
+            click();
+            checkState(TernaryState.True);
+
+            AddStep("change state via bindable", () => state.Value = TernaryState.True);
+
+            void click() =>
+                AddStep("click", () =>
+                {
+                    InputManager.MoveMouseTo(menu.ScreenSpaceDrawQuad.Centre);
+                    InputManager.Click(MouseButton.Left);
+                });
+
+            void checkState(TernaryState expected)
+                => AddAssert($"state is {expected}", () => state.Value == expected);
+        }
+
+        [Test]
+        public void TestTernaryToggleMenuItem()
+        {
+            OsuMenu menu = null;
+
+            Bindable<TernaryState> state = new Bindable<TernaryState>(TernaryState.Indeterminate);
+
+            AddStep("create menu", () =>
+            {
+                state.Value = TernaryState.Indeterminate;
+
+                Child = menu = new OsuMenu(Direction.Vertical, true)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Items = new[]
+                    {
+                        new TernaryStateToggleMenuItem("First"),
+                        new TernaryStateToggleMenuItem("Second") { State = { BindTarget = state } },
+                        new TernaryStateToggleMenuItem("Third") { State = { Value = TernaryState.True } },
                     }
                 };
             });
diff --git a/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs b/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs
index acf4065f49..5c623150b7 100644
--- a/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs
@@ -9,28 +9,17 @@ namespace osu.Game.Graphics.UserInterface
     /// <summary>
     /// An <see cref="OsuMenuItem"/> with three possible states.
     /// </summary>
-    public class TernaryStateMenuItem : StatefulMenuItem<TernaryState>
+    public abstract class TernaryStateMenuItem : StatefulMenuItem<TernaryState>
     {
         /// <summary>
         /// Creates a new <see cref="TernaryStateMenuItem"/>.
         /// </summary>
         /// <param name="text">The text to display.</param>
+        /// <param name="nextStateFunction">A function to inform what the next state should be when this item is clicked.</param>
         /// <param name="type">The type of action which this <see cref="TernaryStateMenuItem"/> performs.</param>
         /// <param name="action">A delegate to be invoked when this <see cref="TernaryStateMenuItem"/> is pressed.</param>
-        public TernaryStateMenuItem(string text, MenuItemType type = MenuItemType.Standard, Action<TernaryState> action = null)
-            : this(text, getNextState, type, action)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="TernaryStateMenuItem"/>.
-        /// </summary>
-        /// <param name="text">The text to display.</param>
-        /// <param name="changeStateFunc">A function that mutates a state to another state after this <see cref="TernaryStateMenuItem"/> is pressed.</param>
-        /// <param name="type">The type of action which this <see cref="TernaryStateMenuItem"/> performs.</param>
-        /// <param name="action">A delegate to be invoked when this <see cref="TernaryStateMenuItem"/> is pressed.</param>
-        protected TernaryStateMenuItem(string text, Func<TernaryState, TernaryState> changeStateFunc, MenuItemType type, Action<TernaryState> action)
-            : base(text, changeStateFunc, type, action)
+        protected TernaryStateMenuItem(string text, Func<TernaryState, TernaryState> nextStateFunction, MenuItemType type = MenuItemType.Standard, Action<TernaryState> action = null)
+            : base(text, nextStateFunction, type, action)
         {
         }
 
@@ -47,23 +36,5 @@ namespace osu.Game.Graphics.UserInterface
 
             return null;
         }
-
-        private static TernaryState getNextState(TernaryState state)
-        {
-            switch (state)
-            {
-                case TernaryState.False:
-                    return TernaryState.True;
-
-                case TernaryState.Indeterminate:
-                    return TernaryState.True;
-
-                case TernaryState.True:
-                    return TernaryState.False;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(state), state, null);
-            }
-        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs b/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs
new file mode 100644
index 0000000000..aa83b0567b
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.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 System;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class TernaryStateRadioMenuItem : TernaryStateMenuItem
+    {
+        /// <summary>
+        /// Creates a new <see cref="TernaryStateMenuItem"/>.
+        /// </summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="type">The type of action which this <see cref="TernaryStateMenuItem"/> performs.</param>
+        /// <param name="action">A delegate to be invoked when this <see cref="TernaryStateMenuItem"/> is pressed.</param>
+        public TernaryStateRadioMenuItem(string text, MenuItemType type = MenuItemType.Standard, Action<TernaryState> action = null)
+            : base(text, getNextState, type, action)
+        {
+        }
+
+        private static TernaryState getNextState(TernaryState state) => TernaryState.True;
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/TernaryStateToggleMenuItem.cs b/osu.Game/Graphics/UserInterface/TernaryStateToggleMenuItem.cs
new file mode 100644
index 0000000000..ce951984fd
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/TernaryStateToggleMenuItem.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;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    /// <summary>
+    /// A ternary state menu item which toggles the state of this item <c>false</c> if clicked when <c>true</c>.
+    /// </summary>
+    public class TernaryStateToggleMenuItem : TernaryStateMenuItem
+    {
+        /// <summary>
+        /// Creates a new <see cref="TernaryStateToggleMenuItem"/>.
+        /// </summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="type">The type of action which this <see cref="TernaryStateMenuItem"/> performs.</param>
+        /// <param name="action">A delegate to be invoked when this <see cref="TernaryStateMenuItem"/> is pressed.</param>
+        public TernaryStateToggleMenuItem(string text, MenuItemType type = MenuItemType.Standard, Action<TernaryState> action = null)
+            : base(text, getNextState, type, action)
+        {
+        }
+
+        private static TernaryState getNextState(TernaryState state)
+        {
+            switch (state)
+            {
+                case TernaryState.False:
+                    return TernaryState.True;
+
+                case TernaryState.Indeterminate:
+                    return TernaryState.True;
+
+                case TernaryState.True:
+                    return TernaryState.False;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(state), state, null);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 6ab4ca8267..2141c490df 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -168,13 +168,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             if (SelectedBlueprints.All(b => b.Item is IHasComboInformation))
             {
-                yield return new TernaryStateMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } };
+                yield return new TernaryStateToggleMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } };
             }
 
             yield return new OsuMenuItem("Sound")
             {
                 Items = SelectionSampleStates.Select(kvp =>
-                    new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
+                    new TernaryStateToggleMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
             };
         }
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index d7e901b71e..a3fca3d4e1 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Screens.Select.Carousel
             else
                 state = TernaryState.False;
 
-            return new TernaryStateMenuItem(collection.Name.Value, MenuItemType.Standard, s =>
+            return new TernaryStateToggleMenuItem(collection.Name.Value, MenuItemType.Standard, s =>
             {
                 foreach (var b in beatmapSet.Beatmaps)
                 {
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 2eb4ea107d..2cfb9d0f96 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Skinning.Editor
             foreach (var item in base.GetContextMenuItemsForSelection(selection))
                 yield return item;
 
-            IEnumerable<AnchorMenuItem> createAnchorItems(Func<Drawable, Anchor> checkFunction, Action<Anchor> applyFunction)
+            IEnumerable<TernaryStateMenuItem> createAnchorItems(Func<Drawable, Anchor> checkFunction, Action<Anchor> applyFunction)
             {
                 var displayableAnchors = new[]
                 {
@@ -117,7 +117,7 @@ namespace osu.Game.Skinning.Editor
 
                 return displayableAnchors.Select(a =>
                 {
-                    return new AnchorMenuItem(a, selection, _ => applyFunction(a))
+                    return new TernaryStateRadioMenuItem(a.ToString(), MenuItemType.Standard, _ => applyFunction(a))
                     {
                         State = { Value = GetStateFromSelection(selection, c => checkFunction((Drawable)c.Item) == a) }
                     };
@@ -166,15 +166,5 @@ namespace osu.Game.Skinning.Editor
                 scale.Y = scale.X;
             }
         }
-
-        public class AnchorMenuItem : TernaryStateMenuItem
-        {
-            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<ISkinnableDrawable>> selection, Action<TernaryState> action)
-                : base(anchor.ToString(), getNextState, MenuItemType.Standard, action)
-            {
-            }
-
-            private static TernaryState getNextState(TernaryState state) => TernaryState.True;
-        }
     }
 }

From ee4bca9ed12d5f65cc55d3b24f1164851c89c746 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:37:43 +0900
Subject: [PATCH 10270/10326] Handle collection changed event

---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 0adc5b863f..9a20bb58b8 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -127,6 +127,14 @@ namespace osu.Game.Screens.Spectate
                     foreach (var (userId, _) in e.OldItems.AsNonNull())
                         onUserStateRemoved(userId);
                     break;
+
+                case NotifyDictionaryChangedAction.Replace:
+                    foreach (var (userId, _) in e.OldItems.AsNonNull())
+                        onUserStateRemoved(userId);
+
+                    foreach (var (userId, state) in e.NewItems.AsNonNull())
+                        onUserStateAdded(userId, state);
+                    break;
             }
         }
 

From 5a8b8782d34e76faaad394c42cdd597289acf633 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:44:43 +0900
Subject: [PATCH 10271/10326] Fix WatchUser being called asynchronously in BDL

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index ed83bbf693..c3bfe19b29 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -55,8 +55,6 @@ namespace osu.Game.Screens.Play.HUD
 
             foreach (var userId in playingUsers)
             {
-                spectatorClient.WatchUser(userId);
-
                 // probably won't be required in the final implementation.
                 var resolvedUser = userLookupCache.GetUserAsync(userId).Result;
 
@@ -80,6 +78,8 @@ namespace osu.Game.Screens.Play.HUD
             // BindableList handles binding in a really bad way (Clear then AddRange) so we need to do this manually..
             foreach (int userId in playingUsers)
             {
+                spectatorClient.WatchUser(userId);
+
                 if (!multiplayerClient.CurrentMatchPlayingUserIds.Contains(userId))
                     usersChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, new[] { userId }));
             }

From 06c99e8c7c259e8ffb712ff5320163b38e0f4aa3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:45:11 +0900
Subject: [PATCH 10272/10326] Fix race due to StopWatchingUser() being called
 asynchronously

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index f930328846..de5e57a1d0 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -182,9 +182,13 @@ namespace osu.Game.Online.Spectator
 
         public void StopWatchingUser(int userId)
         {
-            watchingUsers.Remove(userId);
-
-            StopWatchingUserInternal(userId);
+            // This method is most commonly called via Dispose(), which is asynchronous.
+            // Todo: This should not be a thing, but requires framework changes.
+            Schedule(() =>
+            {
+                watchingUsers.Remove(userId);
+                StopWatchingUserInternal(userId);
+            });
         }
 
         protected abstract Task BeginPlayingInternal(SpectatorState state);

From 1848bd902d11f5053237b8aa15636a96931f3867 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 19:51:07 +0900
Subject: [PATCH 10273/10326] Fix skin editor context menus not dismissing when
 clicking away

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index f24b0c71c0..07a94cac7a 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -19,7 +19,7 @@ using osuTK;
 namespace osu.Game.Skinning.Editor
 {
     [Cached(typeof(SkinEditor))]
-    public class SkinEditor : FocusedOverlayContainer
+    public class SkinEditor : VisibilityContainer
     {
         public const double TRANSITION_DURATION = 500;
 

From 0f4b502fdf8c1f9651d0b81dc6828f8358826d59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 20:09:22 +0900
Subject: [PATCH 10274/10326] Add missing xmldoc

---
 osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs b/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs
index aa83b0567b..46eda06294 100644
--- a/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs
@@ -5,6 +5,9 @@ using System;
 
 namespace osu.Game.Graphics.UserInterface
 {
+    /// <summary>
+    /// A ternary state menu item which will always set the item to <c>true</c> on click, even if already <c>true</c>.
+    /// </summary>
     public class TernaryStateRadioMenuItem : TernaryStateMenuItem
     {
         /// <summary>

From c48b5eebdd7346cbea7b37c727f925f12e173c37 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 20 May 2021 15:45:39 +0300
Subject: [PATCH 10275/10326] Don't reload the context when clicking selected
 year button

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 232b995cd6..b07c9924b9 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -109,7 +109,11 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 IdleColour = isCurrent ? Color4.White : colourProvider.Light2;
                 HoverColour = isCurrent ? Color4.White : colourProvider.Light1;
-                Action = () => overlay?.ShowYear(Year);
+                Action = () =>
+                {
+                    if (!isCurrent)
+                        overlay?.ShowYear(Year);
+                };
             }
         }
     }

From 40ca94cd7b9e16d32b81b199e7a24f22f191d6ce Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 20 May 2021 16:04:51 +0300
Subject: [PATCH 10276/10326] Fix incorrect year being passed on first load

---
 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 510cdba020..af3fa9c3b0 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Overlays
                 loadArticle(article.NewValue);
         }
 
-        private void loadFrontPage(int year = 0)
+        private void loadFrontPage(int? year = null)
         {
             beginLoading();
 

From 092d0f9b7678a075011029b3300a07b5d111f70f Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 21 May 2021 01:20:18 +0700
Subject: [PATCH 10277/10326] add breadcrumb header test scene

---
 .../TestSceneBreadcrumbControlHeader.cs       | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
new file mode 100644
index 0000000000..1439c65a14
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.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.Game.Overlays;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneBreadcrumbControlHeader : OsuTestScene
+    {
+        private static readonly string[] items = { "first", "second", "third", "fourth", "fifth" };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
+
+        private TestHeader header;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = header = new TestHeader
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
+        });
+
+        [Test]
+        public void TestAddAndRemoveItem()
+        {
+            foreach (var item in items.Skip(1))
+                AddStep($"Add {item} item", () => header.AddItem(item));
+
+            foreach (var item in items.Reverse().SkipLast(3))
+                AddStep($"Remove {item} item", () => header.RemoveItem(item));
+
+            AddStep($"Clear item", () => header.ClearItem());
+
+            foreach (var item in items)
+                AddStep($"Add {item} item", () => header.AddItem(item));
+
+            foreach (var item in items)
+                AddStep($"Remove {item} item", () => header.RemoveItem(item));
+        }
+
+        private class TestHeader : BreadcrumbControlOverlayHeader
+        {
+            public TestHeader()
+            {
+                TabControl.AddItem(items[0]);
+                Current.Value = items[0];
+            }
+
+            public void AddItem(string value)
+            {
+                TabControl.AddItem(value);
+                Current.Value = TabControl.Items.LastOrDefault();
+            }
+
+            public void RemoveItem(string value)
+            {
+                TabControl.RemoveItem(value);
+                Current.Value = TabControl.Items.LastOrDefault();
+            }
+
+            public void ClearItem()
+            {
+                TabControl.Clear();
+                Current.Value = null;
+            }
+
+            protected override OverlayTitle CreateTitle() => new TestTitle();
+        }
+
+        private class TestTitle : OverlayTitle
+        {
+            public TestTitle()
+            {
+                Title = "Test Title";
+            }
+        }
+    }
+}

From 236124496d208c9bcf554ee36ead97170f5705ce Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 21 May 2021 01:20:38 +0700
Subject: [PATCH 10278/10326] add missing accent colour in control tab item

---
 osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
index 81315f9638..443b3dcf01 100644
--- a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
+++ b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
@@ -26,7 +26,10 @@ namespace osu.Game.Overlays
                 AccentColour = colourProvider.Light2;
             }
 
-            protected override TabItem<string> CreateTabItem(string value) => new ControlTabItem(value);
+            protected override TabItem<string> CreateTabItem(string value) => new ControlTabItem(value)
+            {
+                AccentColour = AccentColour,
+            };
 
             private class ControlTabItem : BreadcrumbTabItem
             {

From b521405ec8f06393b2b1d841dd5ea4a7c148ae66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 May 2021 20:46:18 +0200
Subject: [PATCH 10279/10326] Trim redundant string interpolation

---
 .../Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
index 1439c65a14..45868b2872 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             foreach (var item in items.Reverse().SkipLast(3))
                 AddStep($"Remove {item} item", () => header.RemoveItem(item));
 
-            AddStep($"Clear item", () => header.ClearItem());
+            AddStep("Clear item", () => header.ClearItem());
 
             foreach (var item in items)
                 AddStep($"Add {item} item", () => header.AddItem(item));

From f35a07fee729586abf7723a742a146164c866fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 May 2021 20:47:50 +0200
Subject: [PATCH 10280/10326] Rename method for better comprehension

---
 .../Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
index 45868b2872..90c3e142df 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             foreach (var item in items.Reverse().SkipLast(3))
                 AddStep($"Remove {item} item", () => header.RemoveItem(item));
 
-            AddStep("Clear item", () => header.ClearItem());
+            AddStep("Clear items", () => header.ClearItems());
 
             foreach (var item in items)
                 AddStep($"Add {item} item", () => header.AddItem(item));
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Current.Value = TabControl.Items.LastOrDefault();
             }
 
-            public void ClearItem()
+            public void ClearItems()
             {
                 TabControl.Clear();
                 Current.Value = null;

From 895eb14c5ae222877b49cd322409f0ce3736f927 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 May 2021 14:09:30 +0900
Subject: [PATCH 10281/10326] Forcefully end playing to fix test failures

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 3 +++
 osu.Game/Screens/Play/Player.cs              | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index cb98b01bed..3a29e73b8f 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -174,6 +174,9 @@ namespace osu.Game.Online.Spectator
 
         public void EndPlaying()
         {
+            if (!IsPlaying)
+                return;
+
             IsPlaying = false;
             currentBeatmap = null;
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 6317a41bec..39f9e2d388 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -22,6 +22,7 @@ using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
+using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
@@ -93,6 +94,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private MusicController musicController { get; set; }
 
+        [Resolved]
+        private SpectatorClient spectatorClient { get; set; }
+
         private Sample sampleRestart;
 
         public BreakOverlay BreakOverlay;
@@ -882,6 +886,11 @@ namespace osu.Game.Screens.Play
                 return true;
             }
 
+            // EndPlaying() is typically called from ReplayRecorder.Dispose(). Disposal is currently asynchronous.
+            // To resolve test failures, forcefully end playing synchronously when this screen exits.
+            // Todo: Replace this with a more permanent solution once osu-framework has a synchronous cleanup method.
+            spectatorClient.EndPlaying();
+
             // GameplayClockContainer performs seeks / start / stop operations on the beatmap's track.
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             (GameplayClockContainer as MasterGameplayClockContainer)?.StopUsingBeatmapClock();

From c00e6e29a6f2c32da0ae882f98344afb94770812 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 14:21:56 +0900
Subject: [PATCH 10282/10326] Remove `static` usage

---
 .../Edit/Blueprints/HitPlacementBlueprint.cs              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
index 17e7fb81f6..0d0fd136a7 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
@@ -14,10 +14,10 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
     {
         private readonly HitPiece piece;
 
-        private static Hit hit;
+        public new Hit HitObject => (Hit)base.HitObject;
 
         public HitPlacementBlueprint()
-            : base(hit = new Hit())
+            : base(new Hit())
         {
             InternalChild = piece = new HitPiece
             {
@@ -30,12 +30,12 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
             switch (e.Button)
             {
                 case MouseButton.Left:
-                    hit.Type = HitType.Centre;
+                    HitObject.Type = HitType.Centre;
                     EndPlacement(true);
                     return true;
 
                 case MouseButton.Right:
-                    hit.Type = HitType.Rim;
+                    HitObject.Type = HitType.Rim;
                     EndPlacement(true);
                     return true;
             }

From 40c8378d81a67b944c63d54a86b413ab70af7cb7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 14:37:22 +0900
Subject: [PATCH 10283/10326] Fix type-to-sample mapping being applied too late

---
 .../Objects/Drawables/DrawableHit.cs          | 28 +----------------
 osu.Game.Rulesets.Taiko/Objects/Hit.cs        | 31 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 38cda69a46..948d2c2f69 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -55,16 +55,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             type.BindValueChanged(_ =>
             {
                 updateActionsFromType();
-
-                // will overwrite samples, should only be called on subsequent changes
-                // after the initial application.
-                updateSamplesFromTypeChange();
-
                 RecreatePieces();
-            });
-
-            // action update also has to happen immediately on application.
-            updateActionsFromType();
+            }, true);
 
             base.OnApply();
         }
@@ -92,24 +84,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             type.Value = getRimSamples().Any() ? HitType.Rim : HitType.Centre;
         }
 
-        private void updateSamplesFromTypeChange()
-        {
-            var rimSamples = getRimSamples();
-
-            bool isRimType = HitObject.Type == HitType.Rim;
-
-            if (isRimType != rimSamples.Any())
-            {
-                if (isRimType)
-                    HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_CLAP));
-                else
-                {
-                    foreach (var sample in rimSamples)
-                        HitObject.Samples.Remove(sample);
-                }
-            }
-        }
-
         private void updateActionsFromType()
         {
             HitActions =
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 1b51288605..f4a66c39a8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Bindables;
+using osu.Game.Audio;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
@@ -15,9 +17,36 @@ namespace osu.Game.Rulesets.Taiko.Objects
         public HitType Type
         {
             get => TypeBindable.Value;
-            set => TypeBindable.Value = value;
+            set
+            {
+                TypeBindable.Value = value;
+                updateSamplesFromType();
+            }
         }
 
+        private void updateSamplesFromType()
+        {
+            var rimSamples = getRimSamples();
+
+            bool isRimType = Type == HitType.Rim;
+
+            if (isRimType != rimSamples.Any())
+            {
+                if (isRimType)
+                    Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_CLAP));
+                else
+                {
+                    foreach (var sample in rimSamples)
+                        Samples.Remove(sample);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns an array of any samples which would cause this object to be a "rim" type hit.
+        /// </summary>
+        private HitSampleInfo[] getRimSamples() => Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
+
         protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
 
         public class StrongNestedHit : StrongNestedHitObject

From f9d51656b6dff672eab55e46eb1bad287d70b84e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 15:02:36 +0900
Subject: [PATCH 10284/10326] Fix scaling of rotated items not behaving in an
 understandable way

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 61 ++++++++++---------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 2f9611ba65..accb65483b 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Utils;
 using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
@@ -37,40 +38,44 @@ namespace osu.Game.Skinning.Editor
 
             adjustScaleFromAnchor(ref scale, anchor);
 
-            var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
-                b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+            // the selection quad is always upright, so use an AABB rect to make mutating the values easier.
+            var selectionRect = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
+                b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray())).AABBFloat;
 
-            // the selection quad is always upright, so use a rect to make mutating the values easier.
-            var adjustedRect = selectionQuad.AABBFloat;
+            // copy to mutate, as we will need to compare to the original later on.
+            var adjustedRect = selectionRect;
 
-            // for now aspect lock scale adjustments that occur at corners.
-            if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
-                scale.Y = scale.X / selectionQuad.Width * selectionQuad.Height;
+            // first, remove any scale axis we are not interested in.
+            if (anchor.HasFlagFast(Anchor.x1)) scale.X = 0;
+            if (anchor.HasFlagFast(Anchor.y1)) scale.Y = 0;
 
-            if (anchor.HasFlagFast(Anchor.x0))
+            bool shouldAspectLock =
+                // for now aspect lock scale adjustments that occur at corners..
+                (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
+                // ..or if any of the selection have been rotated.
+                // this is to avoid requiring skew logic (which would likely not be the user's expected transform anyway).
+                || SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation % 90, 0));
+
+            if (shouldAspectLock)
             {
-                adjustedRect.X -= scale.X;
-                adjustedRect.Width += scale.X;
-            }
-            else if (anchor.HasFlagFast(Anchor.x2))
-            {
-                adjustedRect.Width += scale.X;
+                if (anchor.HasFlagFast(Anchor.x1))
+                    // if dragging from the horizontal centre, only a vertical component is available.
+                    scale.X = scale.Y / selectionRect.Height * selectionRect.Width;
+                else
+                    // in all other cases (arbitrarily) use the horizontal component for aspect lock.
+                    scale.Y = scale.X / selectionRect.Width * selectionRect.Height;
             }
 
-            if (anchor.HasFlagFast(Anchor.y0))
-            {
-                adjustedRect.Y -= scale.Y;
-                adjustedRect.Height += scale.Y;
-            }
-            else if (anchor.HasFlagFast(Anchor.y2))
-            {
-                adjustedRect.Height += scale.Y;
-            }
+            if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
+            if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
 
-            // scale adjust should match that of the quad itself.
+            adjustedRect.Width += scale.X;
+            adjustedRect.Height += scale.Y;
+
+            // scale adjust applied to each individual item should match that of the quad itself.
             var scaledDelta = new Vector2(
-                adjustedRect.Width / selectionQuad.Width,
-                adjustedRect.Height / selectionQuad.Height
+                adjustedRect.Width / selectionRect.Width,
+                adjustedRect.Height / selectionRect.Height
             );
 
             foreach (var b in SelectedBlueprints)
@@ -82,8 +87,8 @@ namespace osu.Game.Skinning.Editor
 
                 var relativePositionInOriginal =
                     new Vector2(
-                        (screenPosition.X - selectionQuad.TopLeft.X) / selectionQuad.Width,
-                        (screenPosition.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height
+                        (screenPosition.X - selectionRect.TopLeft.X) / selectionRect.Width,
+                        (screenPosition.Y - selectionRect.TopLeft.Y) / selectionRect.Height
                     );
 
                 var newPositionInAdjusted = new Vector2(

From 0d575f572866e84421829b7002ef0b695ad4e59f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 15:06:53 +0900
Subject: [PATCH 10285/10326] Remove incorrect (and unintended) modulus logic

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index accb65483b..0b6d9222ce 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Skinning.Editor
                 (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
                 // ..or if any of the selection have been rotated.
                 // this is to avoid requiring skew logic (which would likely not be the user's expected transform anyway).
-                || SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation % 90, 0));
+                || SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation, 0));
 
             if (shouldAspectLock)
             {

From fbe4d7e03c2d9e8aca399adb1077f2bf2a47b8b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 15:41:31 +0900
Subject: [PATCH 10286/10326] Improve code quality around cursor and upwards
 passing of response data

---
 .../Overlays/News/Displays/ArticleListing.cs  | 30 +++++++------------
 osu.Game/Overlays/NewsOverlay.cs              |  6 ++--
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/ArticleListing.cs b/osu.Game/Overlays/News/Displays/ArticleListing.cs
index e713b3de84..b49326a1f1 100644
--- a/osu.Game/Overlays/News/Displays/ArticleListing.cs
+++ b/osu.Game/Overlays/News/Displays/ArticleListing.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 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;
 
 namespace osu.Game.Overlays.News.Displays
@@ -19,7 +20,7 @@ namespace osu.Game.Overlays.News.Displays
     /// </summary>
     public class ArticleListing : CompositeDrawable
     {
-        public Action<GetNewsResponse> ResponseReceived;
+        public Action<APINewsSidebar> SidebarMetadataUpdated;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -98,34 +99,23 @@ namespace osu.Game.Overlays.News.Displays
 
         private CancellationTokenSource cancellationToken;
 
-        private bool initialLoad = true;
-
         private void onSuccess(GetNewsResponse response)
         {
             cancellationToken?.Cancel();
 
+            // only needs to be updated on the initial load, as the content won't change during pagination.
+            if (lastCursor == null)
+                SidebarMetadataUpdated?.Invoke(response.SidebarMetadata);
+
+            // store cursor for next pagination request.
             lastCursor = response.Cursor;
 
-            var flow = new FillFlowContainer<NewsCard>
+            LoadComponentsAsync(response.NewsPosts.Select(p => new NewsCard(p)).ToList(), loaded =>
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 10),
-                Children = response.NewsPosts.Select(p => new NewsCard(p)).ToList()
-            };
+                content.AddRange(loaded);
 
-            LoadComponentAsync(flow, loaded =>
-            {
-                content.Add(loaded);
                 showMore.IsLoading = false;
-                showMore.Alpha = lastCursor == null ? 0 : 1;
-
-                if (initialLoad)
-                {
-                    ResponseReceived?.Invoke(response);
-                    initialLoad = false;
-                }
+                showMore.Alpha = response.Cursor != null ? 1 : 0;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index af3fa9c3b0..dd6de40ecb 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -133,11 +133,11 @@ namespace osu.Game.Overlays
             Header.SetFrontPage();
 
             var page = new ArticleListing(year);
-            page.ResponseReceived += r =>
+            page.SidebarMetadataUpdated += metadata => Schedule(() =>
             {
-                sidebar.Metadata.Value = r.SidebarMetadata;
+                sidebar.Metadata.Value = metadata;
                 Loading.Hide();
-            };
+            });
             LoadDisplay(page);
         }
 

From 2fdf8aa1aa49da528b1fb3d7811a957435b7be3d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 May 2021 15:57:31 +0900
Subject: [PATCH 10287/10326] Add update thread assertions

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index de5e57a1d0..b90fec09d6 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -10,6 +10,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Development;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
@@ -144,6 +145,8 @@ namespace osu.Game.Online.Spectator
 
         public void BeginPlaying(GameplayBeatmap beatmap, Score score)
         {
+            Debug.Assert(ThreadSafety.IsUpdateThread);
+
             if (IsPlaying)
                 throw new InvalidOperationException($"Cannot invoke {nameof(BeginPlaying)} when already playing");
 
@@ -172,6 +175,8 @@ namespace osu.Game.Online.Spectator
 
         public void WatchUser(int userId)
         {
+            Debug.Assert(ThreadSafety.IsUpdateThread);
+
             if (watchingUsers.Contains(userId))
                 return;
 
@@ -219,6 +224,8 @@ namespace osu.Game.Online.Spectator
 
         public void HandleFrame(ReplayFrame frame)
         {
+            Debug.Assert(ThreadSafety.IsUpdateThread);
+
             if (frame is IConvertibleReplayFrame convertible)
                 pendingFrames.Enqueue(convertible.ToLegacy(currentBeatmap));
 

From 7f712a4d04b64b4f9801208048f30f2a272b0a4e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 May 2021 15:57:39 +0900
Subject: [PATCH 10288/10326] Fix EndPlaying potentially doing cross-thread
 mutation

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index b90fec09d6..48e2528528 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -167,10 +167,15 @@ namespace osu.Game.Online.Spectator
 
         public void EndPlaying()
         {
-            IsPlaying = false;
-            currentBeatmap = null;
+            // This method is most commonly called via Dispose(), which is asynchronous.
+            // Todo: This should not be a thing, but requires framework changes.
+            Schedule(() =>
+            {
+                IsPlaying = false;
+                currentBeatmap = null;
 
-            EndPlayingInternal(currentState);
+                EndPlayingInternal(currentState);
+            });
         }
 
         public void WatchUser(int userId)

From 7c59fb37f10874db49102bf4e46e08406a385f60 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 May 2021 16:00:58 +0900
Subject: [PATCH 10289/10326] Move check into callback

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 9f270a8345..0067a55fd8 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -167,13 +167,13 @@ namespace osu.Game.Online.Spectator
 
         public void EndPlaying()
         {
-            if (!IsPlaying)
-                return;
-
             // This method is most commonly called via Dispose(), which is asynchronous.
             // Todo: This should not be a thing, but requires framework changes.
             Schedule(() =>
             {
+                if (!IsPlaying)
+                    return;
+
                 IsPlaying = false;
                 currentBeatmap = null;
 

From a5ca736e3729d7a57f414834634531d4c8372c28 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 16:10:48 +0900
Subject: [PATCH 10290/10326] Fix `RecreatePieces` being called more than once

---
 .../Objects/Drawables/DrawableHit.cs                | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 948d2c2f69..f2b1284a95 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -52,15 +52,18 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void OnApply()
         {
             type.BindTo(HitObject.TypeBindable);
-            type.BindValueChanged(_ =>
-            {
-                updateActionsFromType();
-                RecreatePieces();
-            }, true);
+            // this doesn't need to be run inline as RecreatePieces is called by the base call below.
+            type.BindValueChanged(_ => RecreatePieces());
 
             base.OnApply();
         }
 
+        protected override void RecreatePieces()
+        {
+            updateActionsFromType();
+            base.RecreatePieces();
+        }
+
         protected override void OnFree()
         {
             base.OnFree();

From 7bc8a4bb5fa9e65937340f06560d5ab27ad5ac80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 16:15:27 +0900
Subject: [PATCH 10291/10326] Apply same logic changes to `IsStrong` status

---
 .../Objects/Drawables/DrawableHit.cs          |  9 -----
 .../DrawableTaikoStrongableHitObject.cs       | 36 ++-----------------
 .../Objects/TaikoStrongableHitObject.cs       | 26 +++++++++++++-
 3 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index f2b1284a95..5cb2024bb7 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -78,15 +78,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             validActionPressed = pressHandledThisFrame = false;
         }
 
-        private HitSampleInfo[] getRimSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
-
-        protected override void LoadSamples()
-        {
-            base.LoadSamples();
-
-            type.Value = getRimSamples().Any() ? HitType.Rim : HitType.Centre;
-        }
-
         private void updateActionsFromType()
         {
             HitActions =
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
index 4f1523eb3f..b4acfa9968 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
@@ -1,11 +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.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Audio;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
@@ -29,14 +27,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void OnApply()
         {
             isStrong.BindTo(HitObject.IsStrongBindable);
-            isStrong.BindValueChanged(_ =>
-            {
-                // will overwrite samples, should only be called on subsequent changes
-                // after the initial application.
-                updateSamplesFromStrong();
-
-                RecreatePieces();
-            });
+            // this doesn't need to be run inline as RecreatePieces is called by the base call below.
+            isStrong.BindValueChanged(_ => RecreatePieces());
 
             base.OnApply();
         }
@@ -50,30 +42,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             isStrong.UnbindEvents();
         }
 
-        private HitSampleInfo[] getStrongSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
-
-        protected override void LoadSamples()
-        {
-            base.LoadSamples();
-            isStrong.Value = getStrongSamples().Any();
-        }
-
-        private void updateSamplesFromStrong()
-        {
-            var strongSamples = getStrongSamples();
-
-            if (isStrong.Value != strongSamples.Any())
-            {
-                if (isStrong.Value)
-                    HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
-                else
-                {
-                    foreach (var sample in strongSamples)
-                        HitObject.Samples.Remove(sample);
-                }
-            }
-        }
-
         protected override void RecreatePieces()
         {
             base.RecreatePieces();
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
index fcd055bcec..cac56d1269 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.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.Linq;
 using System.Threading;
 using osu.Framework.Bindables;
+using osu.Game.Audio;
 using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Objects
@@ -31,9 +33,31 @@ namespace osu.Game.Rulesets.Taiko.Objects
         public bool IsStrong
         {
             get => IsStrongBindable.Value;
-            set => IsStrongBindable.Value = value;
+            set
+            {
+                IsStrongBindable.Value = value;
+                updateSamplesFromStrong();
+            }
         }
 
+        private void updateSamplesFromStrong()
+        {
+            var strongSamples = getStrongSamples();
+
+            if (IsStrongBindable.Value != strongSamples.Any())
+            {
+                if (IsStrongBindable.Value)
+                    Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
+                else
+                {
+                    foreach (var sample in strongSamples)
+                        Samples.Remove(sample);
+                }
+            }
+        }
+
+        private HitSampleInfo[] getStrongSamples() => Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
+
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             base.CreateNestedHitObjects(cancellationToken);

From 0bcd0cda6b1ed7facd0264fae35b133bff7f2f5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 16:41:39 +0900
Subject: [PATCH 10292/10326] Fix taiko drawable hit content not correctly
 being removed on regeneration

---
 .../Objects/Drawables/DrawableTaikoHitObject.cs               | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 6041eccb51..6a8d8a611c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -137,7 +137,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             Size = BaseSize = new Vector2(TaikoHitObject.DEFAULT_SIZE);
 
-            MainPiece?.Expire();
+            if (MainPiece != null)
+                Content.Remove(MainPiece);
+
             Content.Add(MainPiece = CreateMainPiece());
         }
 

From 6471ce902d44fce94676f7a8a73ee4e960a07d40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 16:45:28 +0900
Subject: [PATCH 10293/10326] Run `RecreatePieces` using `AddOnce` to avoid
 multiple unnecessary calls

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs        | 2 +-
 .../Objects/Drawables/DrawableTaikoStrongableHitObject.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 5cb2024bb7..1e9fc187eb 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             type.BindTo(HitObject.TypeBindable);
             // this doesn't need to be run inline as RecreatePieces is called by the base call below.
-            type.BindValueChanged(_ => RecreatePieces());
+            type.BindValueChanged(_ => Scheduler.AddOnce(RecreatePieces));
 
             base.OnApply();
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
index b4acfa9968..70d4371e99 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             isStrong.BindTo(HitObject.IsStrongBindable);
             // this doesn't need to be run inline as RecreatePieces is called by the base call below.
-            isStrong.BindValueChanged(_ => RecreatePieces());
+            isStrong.BindValueChanged(_ => Scheduler.AddOnce(RecreatePieces));
 
             base.OnApply();
         }

From 0c504c3b7d0adad741bf4d6e0fe2f25538644e8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 17:24:22 +0900
Subject: [PATCH 10294/10326] 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 90d131b117..57550cfb93 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.513.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.521.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 587bdaf622..1e3b77cd70 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.513.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.521.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 7ba7a554d6..a2a9ac35fc 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.Framework.iOS" Version="2021.513.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.521.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.513.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.521.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 8085a5420580065222be24b465fefcd26b1f60ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 17:28:25 +0900
Subject: [PATCH 10295/10326] Add test coverage of different grade types to
 `TestSceneResultsScreen`

---
 .../Visual/Ranking/TestSceneAccuracyCircle.cs | 91 +++----------------
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 36 +++++---
 2 files changed, 35 insertions(+), 92 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index 1e87893f39..f305b7255e 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -22,82 +22,17 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneAccuracyCircle : OsuTestScene
     {
-        [Test]
-        public void TestLowDRank()
+        [TestCase(0.2, ScoreRank.D)]
+        [TestCase(0.5, ScoreRank.D)]
+        [TestCase(0.75, ScoreRank.C)]
+        [TestCase(0.85, ScoreRank.B)]
+        [TestCase(0.925, ScoreRank.A)]
+        [TestCase(0.975, ScoreRank.S)]
+        [TestCase(0.9999, ScoreRank.S)]
+        [TestCase(1, ScoreRank.X)]
+        public void TestRank(double accuracy, ScoreRank rank)
         {
-            var score = createScore();
-            score.Accuracy = 0.2;
-            score.Rank = ScoreRank.D;
-
-            addCircleStep(score);
-        }
-
-        [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;
+            var score = createScore(accuracy, rank);
 
             addCircleStep(score);
         }
@@ -129,7 +64,7 @@ namespace osu.Game.Tests.Visual.Ranking
             };
         });
 
-        private ScoreInfo createScore() => new ScoreInfo
+        private ScoreInfo createScore(double accuracy, ScoreRank rank) => new ScoreInfo
         {
             User = new User
             {
@@ -139,9 +74,9 @@ namespace osu.Game.Tests.Visual.Ranking
             Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
             Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
             TotalScore = 2845370,
-            Accuracy = 0.95,
+            Accuracy = accuracy,
             MaxCombo = 999,
-            Rank = ScoreRank.S,
+            Rank = rank,
             Date = DateTimeOffset.Now,
             Statistics =
             {
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index b2be7cdf88..ba6b6bd529 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -29,13 +29,8 @@ namespace osu.Game.Tests.Visual.Ranking
     [TestFixture]
     public class TestSceneResultsScreen : OsuManualInputManagerTestScene
     {
-        private BeatmapManager beatmaps;
-
-        [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmaps)
-        {
-            this.beatmaps = beatmaps;
-        }
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
 
         protected override void LoadComplete()
         {
@@ -46,10 +41,6 @@ namespace osu.Game.Tests.Visual.Ranking
                 Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
         }
 
-        private TestResultsScreen createResultsScreen() => new TestResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-
-        private UnrankedSoloResultsScreen createUnrankedSoloResultsScreen() => new UnrankedSoloResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-
         [Test]
         public void TestResultsWithoutPlayer()
         {
@@ -69,12 +60,25 @@ namespace osu.Game.Tests.Visual.Ranking
             AddAssert("retry overlay not present", () => screen.RetryOverlay == null);
         }
 
-        [Test]
-        public void TestResultsWithPlayer()
+        [TestCase(0.2, ScoreRank.D)]
+        [TestCase(0.5, ScoreRank.D)]
+        [TestCase(0.75, ScoreRank.C)]
+        [TestCase(0.85, ScoreRank.B)]
+        [TestCase(0.925, ScoreRank.A)]
+        [TestCase(0.975, ScoreRank.S)]
+        [TestCase(0.9999, ScoreRank.S)]
+        [TestCase(1, ScoreRank.X)]
+        public void TestResultsWithPlayer(double accuracy, ScoreRank rank)
         {
             TestResultsScreen screen = null;
 
-            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo)
+            {
+                Accuracy = accuracy,
+                Rank = rank
+            };
+
+            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen(score)));
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
             AddAssert("retry overlay present", () => screen.RetryOverlay != null);
         }
@@ -232,6 +236,10 @@ namespace osu.Game.Tests.Visual.Ranking
             AddAssert("download button is enabled", () => screen.ChildrenOfType<DownloadButton>().Last().Enabled.Value);
         }
 
+        private TestResultsScreen createResultsScreen(ScoreInfo score = null) => new TestResultsScreen(score ?? new TestScoreInfo(new OsuRuleset().RulesetInfo));
+
+        private UnrankedSoloResultsScreen createUnrankedSoloResultsScreen() => new UnrankedSoloResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+
         private class TestResultsContainer : Container
         {
             [Cached(typeof(Player))]

From 41c4afb3d592e05ff1ab62003736e3716c7be856 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 17:46:25 +0900
Subject: [PATCH 10296/10326] Restore path specification to `"."` for
 consistency

---
 osu.Game/Beatmaps/BeatmapManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index dcbfbf1332..5e975de77c 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        protected override string ImportFromStablePath => string.Empty;
+        protected override string ImportFromStablePath => ".";
 
         protected override Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage.GetSongStorage();
 

From abc96057b2cf50e02e0ec939645f6421684495d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 17:55:46 +0900
Subject: [PATCH 10297/10326] Remove relative height specification and use
 constant height

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs         | 3 ++-
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 754b260bf0..e31e307d4d 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -96,7 +96,8 @@ namespace osu.Game.Overlays.Mods
             Waves.ThirdWaveColour = Color4Extensions.FromHex(@"005774");
             Waves.FourthWaveColour = Color4Extensions.FromHex(@"003a4e");
 
-            RelativeSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.X;
+            Height = HEIGHT;
 
             Padding = new MarginPadding { Horizontal = -OsuScreen.HORIZONTAL_OVERFLOW_PADDING };
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 7395b346a4..a53e253581 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -72,8 +72,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     Depth = float.MinValue,
-                    RelativeSizeAxes = Axes.Both,
-                    Height = 0.7f,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
                     Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
                     Child = userModsSelectOverlay = new UserModSelectOverlay
                     {

From 0acf4cf85c861c7e144dee9ab1d0d3143dbb10f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 18:44:15 +0900
Subject: [PATCH 10298/10326] Translate remaining `ButtonSystem` strings and
 rename to match class name

---
 ...{MainMenu.ja.resx => ButtonSystem.ja.resx} |  0
 .../{MainMenu.resx => ButtonSystem.resx}      |  0
 osu.Game/Localisation/ButtonSystemStrings.cs  | 44 +++++++++++++++++++
 osu.Game/Localisation/MainMenuStrings.cs      | 24 ----------
 osu.Game/Screens/Menu/ButtonSystem.cs         | 14 +++---
 5 files changed, 51 insertions(+), 31 deletions(-)
 rename osu.Game/Localisation/{MainMenu.ja.resx => ButtonSystem.ja.resx} (100%)
 rename osu.Game/Localisation/{MainMenu.resx => ButtonSystem.resx} (100%)
 create mode 100644 osu.Game/Localisation/ButtonSystemStrings.cs
 delete mode 100644 osu.Game/Localisation/MainMenuStrings.cs

diff --git a/osu.Game/Localisation/MainMenu.ja.resx b/osu.Game/Localisation/ButtonSystem.ja.resx
similarity index 100%
rename from osu.Game/Localisation/MainMenu.ja.resx
rename to osu.Game/Localisation/ButtonSystem.ja.resx
diff --git a/osu.Game/Localisation/MainMenu.resx b/osu.Game/Localisation/ButtonSystem.resx
similarity index 100%
rename from osu.Game/Localisation/MainMenu.resx
rename to osu.Game/Localisation/ButtonSystem.resx
diff --git a/osu.Game/Localisation/ButtonSystemStrings.cs b/osu.Game/Localisation/ButtonSystemStrings.cs
new file mode 100644
index 0000000000..1d26a73360
--- /dev/null
+++ b/osu.Game/Localisation/ButtonSystemStrings.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.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class ButtonSystemStrings
+    {
+        private const string prefix = @"osu.Game.Localisation.ButtonSystem";
+
+        /// <summary>
+        /// "solo"
+        /// </summary>
+        public static LocalisableString Solo => new TranslatableString(getKey(@"solo"), @"solo");
+
+        /// <summary>
+        /// "multi"
+        /// </summary>
+        public static LocalisableString Multi => new TranslatableString(getKey(@"multi"), @"multi");
+
+        /// <summary>
+        /// "playlists"
+        /// </summary>
+        public static LocalisableString Playlists => new TranslatableString(getKey(@"playlists"), @"playlists");
+
+        /// <summary>
+        /// "play"
+        /// </summary>
+        public static LocalisableString Play => new TranslatableString(getKey(@"play"), @"play");
+
+        /// <summary>
+        /// "edit"
+        /// </summary>
+        public static LocalisableString Edit => new TranslatableString(getKey(@"edit"), @"edit");
+
+        /// <summary>
+        /// "browse"
+        /// </summary>
+        public static LocalisableString Browse => new TranslatableString(getKey(@"browse"), @"browse");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Localisation/MainMenuStrings.cs b/osu.Game/Localisation/MainMenuStrings.cs
deleted file mode 100644
index fd9647467a..0000000000
--- a/osu.Game/Localisation/MainMenuStrings.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.Framework.Localisation;
-
-namespace osu.Game.Localisation
-{
-    public static class MainMenuStrings
-    {
-        private const string prefix = "osu.Game.Localisation.MainMenu";
-
-        /// <summary>
-        /// "solo"
-        /// </summary>
-        public static LocalisableString Solo => new TranslatableString(getKey("solo"), "solo");
-
-        /// <summary>
-        /// "multi"
-        /// </summary>
-        public static LocalisableString Multi => new TranslatableString(getKey("multi"), "multi");
-
-        private static string getKey(string key) => $"{prefix}:{key}";
-    }
-}
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index ff5ad37b9d..c60d1bd4e0 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -125,17 +125,17 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio, IdleTracker idleTracker, GameHost host, LocalisationManager strings)
         {
-            buttonsPlay.Add(new Button(MainMenuStrings.Solo, @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(MainMenuStrings.Multi, @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
-            buttonsPlay.Add(new Button(@"playlists", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
+            buttonsPlay.Add(new Button(ButtonSystemStrings.Solo, @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
+            buttonsPlay.Add(new Button(ButtonSystemStrings.Multi, @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
+            buttonsPlay.Add(new Button(ButtonSystemStrings.Playlists, @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
-            buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
-            buttonsTopLevel.Add(new Button(@"edit", @"button-edit-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
-            buttonsTopLevel.Add(new Button(@"browse", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
+            buttonsTopLevel.Add(new Button(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
+            buttonsTopLevel.Add(new Button(ButtonSystemStrings.Edit, @"button-edit-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
+            buttonsTopLevel.Add(new Button(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
 
             if (host.CanExit)
-                buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
+                buttonsTopLevel.Add(new Button("exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
 
             buttonArea.AddRange(buttonsPlay);
             buttonArea.AddRange(buttonsTopLevel);

From bf4db60ef4b2ec73fdc114ad07716582027373dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 18:48:42 +0900
Subject: [PATCH 10299/10326] Remove placeholder translations

---
 osu.Game/Localisation/Common.ja.resx | 17 -----------------
 osu.Game/Localisation/Common.resx    | 17 -----------------
 2 files changed, 34 deletions(-)
 delete mode 100644 osu.Game/Localisation/Common.ja.resx
 delete mode 100644 osu.Game/Localisation/Common.resx

diff --git a/osu.Game/Localisation/Common.ja.resx b/osu.Game/Localisation/Common.ja.resx
deleted file mode 100644
index 174751c455..0000000000
--- a/osu.Game/Localisation/Common.ja.resx
+++ /dev/null
@@ -1,17 +0,0 @@
-<root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="cancel" xml:space="preserve">
-        <value>やめとくわ</value>
-    </data>
-</root>
diff --git a/osu.Game/Localisation/Common.resx b/osu.Game/Localisation/Common.resx
deleted file mode 100644
index f63fb90086..0000000000
--- a/osu.Game/Localisation/Common.resx
+++ /dev/null
@@ -1,17 +0,0 @@
-<root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="cancel" xml:space="preserve">
-        <value>Cancel</value>
-    </data>
-</root>

From cd3f5433942133703acaa0822b9d444efc9218ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 May 2021 02:32:55 +0900
Subject: [PATCH 10300/10326] Add LocalisationAnalyser package and tools

---
 .config/dotnet-tools.json | 8 +++++++-
 osu.Game/osu.Game.csproj  | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 58c24181d3..54d9ff3077 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -31,6 +31,12 @@
       "commands": [
         "CodeFileSanity"
       ]
+    },
+    "ppy.localisationanalyser.tools": {
+      "version": "2021.521.1",
+      "commands": [
+        "localisation"
+      ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 587bdaf622..385aa5c7e1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,6 +29,10 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="ppy.LocalisationAnalyser" Version="2021.521.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="ppy.osu.Framework" Version="2021.513.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />

From 2fc53017fc11c428a552a5af273487a8147810d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 May 2021 13:46:09 +0900
Subject: [PATCH 10301/10326] Generate initial resx files

---
 osu.Game/Localisation/ButtonSystem.resx  | 94 ++++++++++++++++++++----
 osu.Game/Localisation/Chat.resx          | 67 +++++++++++++++++
 osu.Game/Localisation/Common.resx        | 64 ++++++++++++++++
 osu.Game/Localisation/Notifications.resx | 67 +++++++++++++++++
 osu.Game/Localisation/NowPlaying.resx    | 67 +++++++++++++++++
 osu.Game/Localisation/Settings.resx      | 67 +++++++++++++++++
 6 files changed, 410 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Localisation/Chat.resx
 create mode 100644 osu.Game/Localisation/Common.resx
 create mode 100644 osu.Game/Localisation/Notifications.resx
 create mode 100644 osu.Game/Localisation/NowPlaying.resx
 create mode 100644 osu.Game/Localisation/Settings.resx

diff --git a/osu.Game/Localisation/ButtonSystem.resx b/osu.Game/Localisation/ButtonSystem.resx
index 845b412d88..1c6f614c46 100644
--- a/osu.Game/Localisation/ButtonSystem.resx
+++ b/osu.Game/Localisation/ButtonSystem.resx
@@ -1,17 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
 <root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="solo" xml:space="preserve">
-        <value>solo</value>
-    </data>
-</root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="solo" xml:space="preserve">
+    <value>solo</value>
+  </data>
+  <data name="multi" xml:space="preserve">
+    <value>multi</value>
+  </data>
+  <data name="playlists" xml:space="preserve">
+    <value>playlists</value>
+  </data>
+  <data name="play" xml:space="preserve">
+    <value>play</value>
+  </data>
+  <data name="edit" xml:space="preserve">
+    <value>edit</value>
+  </data>
+  <data name="browse" xml:space="preserve">
+    <value>browse</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/Chat.resx b/osu.Game/Localisation/Chat.resx
new file mode 100644
index 0000000000..3762f800c5
--- /dev/null
+++ b/osu.Game/Localisation/Chat.resx
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="header_title" xml:space="preserve">
+    <value>chat</value>
+  </data>
+  <data name="header_description" xml:space="preserve">
+    <value>join the real-time discussion</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/Common.resx b/osu.Game/Localisation/Common.resx
new file mode 100644
index 0000000000..8a3ae29c77
--- /dev/null
+++ b/osu.Game/Localisation/Common.resx
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/Notifications.resx b/osu.Game/Localisation/Notifications.resx
new file mode 100644
index 0000000000..d61e5744e4
--- /dev/null
+++ b/osu.Game/Localisation/Notifications.resx
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="header_title" xml:space="preserve">
+    <value>notifications</value>
+  </data>
+  <data name="header_description" xml:space="preserve">
+    <value>waiting for 'ya</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/NowPlaying.resx b/osu.Game/Localisation/NowPlaying.resx
new file mode 100644
index 0000000000..71df15e488
--- /dev/null
+++ b/osu.Game/Localisation/NowPlaying.resx
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="header_title" xml:space="preserve">
+    <value>now playing</value>
+  </data>
+  <data name="header_description" xml:space="preserve">
+    <value>manage the currently playing track</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/Settings.resx b/osu.Game/Localisation/Settings.resx
new file mode 100644
index 0000000000..1770147dd9
--- /dev/null
+++ b/osu.Game/Localisation/Settings.resx
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="header_title" xml:space="preserve">
+    <value>settings</value>
+  </data>
+  <data name="header_description" xml:space="preserve">
+    <value>change the way osu! behaves</value>
+  </data>
+</root>
\ No newline at end of file

From b6db9ef3346cf75a1b3c9fdaefebec7f76cd208e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 May 2021 13:54:52 +0900
Subject: [PATCH 10302/10326] Fill out Japanese localisation via resx

---
 osu.Game/Localisation/ButtonSystem.ja.resx | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Localisation/ButtonSystem.ja.resx b/osu.Game/Localisation/ButtonSystem.ja.resx
index 20c85110ad..54c956758c 100644
--- a/osu.Game/Localisation/ButtonSystem.ja.resx
+++ b/osu.Game/Localisation/ButtonSystem.ja.resx
@@ -14,4 +14,19 @@
     <data name="solo" xml:space="preserve">
         <value>ソロ</value>
     </data>
-</root>
\ No newline at end of file
+    <data name="playlists" xml:space="preserve">
+        <value>プレイリスト</value>
+    </data>
+    <data name="play" xml:space="preserve">
+        <value>遊ぶ</value>
+    </data>
+    <data name="multi" xml:space="preserve">
+        <value>マルチ</value>
+    </data>
+    <data name="edit" xml:space="preserve">
+        <value>エディット</value>
+    </data>
+    <data name="browse" xml:space="preserve">
+        <value>ブラウズ</value>
+    </data>
+</root>

From fb5672814d6e558881d0101fb5a68799aa047fd1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 May 2021 13:55:15 +0900
Subject: [PATCH 10303/10326] Add remaining strings for `ButtonSystem`

---
 osu.Game/Localisation/ButtonSystem.ja.resx   |  6 ++++++
 osu.Game/Localisation/ButtonSystem.resx      |  9 +++++++++
 osu.Game/Localisation/ButtonSystemStrings.cs | 17 ++++++++++++++++-
 osu.Game/Screens/Menu/ButtonSystem.cs        |  6 +++---
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Localisation/ButtonSystem.ja.resx b/osu.Game/Localisation/ButtonSystem.ja.resx
index 54c956758c..02f3e7ce2f 100644
--- a/osu.Game/Localisation/ButtonSystem.ja.resx
+++ b/osu.Game/Localisation/ButtonSystem.ja.resx
@@ -29,4 +29,10 @@
     <data name="browse" xml:space="preserve">
         <value>ブラウズ</value>
     </data>
+    <data name="exit" xml:space="preserve">
+        <value>閉じる</value>
+    </data>
+    <data name="settings" xml:space="preserve">
+        <value>設定</value>
+    </data>
 </root>
diff --git a/osu.Game/Localisation/ButtonSystem.resx b/osu.Game/Localisation/ButtonSystem.resx
index 1c6f614c46..e8f555b6c3 100644
--- a/osu.Game/Localisation/ButtonSystem.resx
+++ b/osu.Game/Localisation/ButtonSystem.resx
@@ -76,4 +76,13 @@
   <data name="browse" xml:space="preserve">
     <value>browse</value>
   </data>
+  <data name="settings" xml:space="preserve">
+    <value>settings</value>
+  </data>
+  <data name="back" xml:space="preserve">
+    <value>back</value>
+  </data>
+  <data name="exit" xml:space="preserve">
+    <value>exit</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/ButtonSystemStrings.cs b/osu.Game/Localisation/ButtonSystemStrings.cs
index 1d26a73360..8083f80782 100644
--- a/osu.Game/Localisation/ButtonSystemStrings.cs
+++ b/osu.Game/Localisation/ButtonSystemStrings.cs
@@ -39,6 +39,21 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString Browse => new TranslatableString(getKey(@"browse"), @"browse");
 
+        /// <summary>
+        /// "settings"
+        /// </summary>
+        public static LocalisableString Settings => new TranslatableString(getKey(@"settings"), @"settings");
+
+        /// <summary>
+        /// "back"
+        /// </summary>
+        public static LocalisableString Back => new TranslatableString(getKey(@"back"), @"back");
+
+        /// <summary>
+        /// "exit"
+        /// </summary>
+        public static LocalisableString Exit => new TranslatableString(getKey(@"exit"), @"exit");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
-}
+}
\ No newline at end of file
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index c60d1bd4e0..a836f7bf09 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -99,8 +99,8 @@ namespace osu.Game.Screens.Menu
 
             buttonArea.AddRange(new Drawable[]
             {
-                new Button(@"settings", string.Empty, FontAwesome.Solid.Cog, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
-                backButton = new Button(@"back", @"button-back-select", OsuIcon.LeftCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel, -WEDGE_WIDTH)
+                new Button(ButtonSystemStrings.Settings, string.Empty, FontAwesome.Solid.Cog, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
+                backButton = new Button(ButtonSystemStrings.Back, @"button-back-select", OsuIcon.LeftCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel, -WEDGE_WIDTH)
                 {
                     VisibleState = ButtonSystemState.Play,
                 },
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Menu
             buttonsTopLevel.Add(new Button(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
 
             if (host.CanExit)
-                buttonsTopLevel.Add(new Button("exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
+                buttonsTopLevel.Add(new Button(ButtonSystemStrings.Exit, string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
 
             buttonArea.AddRange(buttonsPlay);
             buttonArea.AddRange(buttonsTopLevel);

From 7d88a19d7f67bc540646eed0992ba909fd51990b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 May 2021 21:03:40 +0900
Subject: [PATCH 10304/10326] Remove unnecessary field storage of origin
 reference

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 7f04252c6b..7d9ed6b46c 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -20,17 +20,9 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinSelectionHandler : SelectionHandler<ISkinnableDrawable>
     {
-        private Vector2? referenceOrigin;
-
         [Resolved]
         private SkinEditor skinEditor { get; set; }
 
-        protected override void OnOperationEnded()
-        {
-            base.OnOperationEnded();
-            referenceOrigin = null;
-        }
-
         public override bool HandleRotation(float angle)
         {
             if (SelectedBlueprints.Count == 1)
@@ -42,13 +34,11 @@ namespace osu.Game.Skinning.Editor
             {
                 var selectionQuad = getSelectionQuad();
 
-                referenceOrigin ??= selectionQuad.Centre;
-
                 foreach (var b in SelectedBlueprints)
                 {
                     var drawableItem = (Drawable)b.Item;
 
-                    drawableItem.Position = drawableItem.Parent.ToLocalSpace(RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, referenceOrigin.Value, angle)) - drawableItem.AnchorPosition;
+                    drawableItem.Position = drawableItem.Parent.ToLocalSpace(RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, selectionQuad.Centre, angle)) - drawableItem.AnchorPosition;
                     drawableItem.Rotation += angle;
                 }
             }

From 2fd0038154082ec3d622aa3ddff0e25ee29684ad Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 22 May 2021 16:42:20 -0700
Subject: [PATCH 10305/10326] Fix checkmark being hidden after clicking current
 waveform opacity setting

---
 osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs b/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
index 053c2fa4b0..7e095f526e 100644
--- a/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
+++ b/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Edit
     {
         private readonly Bindable<float> waveformOpacity;
 
-        private readonly Dictionary<float, ToggleMenuItem> menuItemLookup = new Dictionary<float, ToggleMenuItem>();
+        private readonly Dictionary<float, TernaryStateRadioMenuItem> menuItemLookup = new Dictionary<float, TernaryStateRadioMenuItem>();
 
         public WaveformOpacityMenuItem(Bindable<float> waveformOpacity)
             : base("Waveform opacity")
@@ -29,13 +29,13 @@ namespace osu.Game.Screens.Edit
             waveformOpacity.BindValueChanged(opacity =>
             {
                 foreach (var kvp in menuItemLookup)
-                    kvp.Value.State.Value = kvp.Key == opacity.NewValue;
+                    kvp.Value.State.Value = kvp.Key == opacity.NewValue ? TernaryState.True : TernaryState.False;
             }, true);
         }
 
-        private ToggleMenuItem createMenuItem(float opacity)
+        private TernaryStateRadioMenuItem createMenuItem(float opacity)
         {
-            var item = new ToggleMenuItem($"{opacity * 100}%", MenuItemType.Standard, _ => updateOpacity(opacity));
+            var item = new TernaryStateRadioMenuItem($"{opacity * 100}%", MenuItemType.Standard, _ => updateOpacity(opacity));
             menuItemLookup[opacity] = item;
             return item;
         }

From caa2c5638e2695dae4719613edcdf49e00c57cb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 May 2021 16:46:32 +0900
Subject: [PATCH 10306/10326] Fix legacy combo counter not accounting for song
 progress bar

---
 osu.Game/Skinning/LegacySkin.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 7a64f38840..fb9cf47cb7 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -338,6 +338,7 @@ namespace osu.Game.Skinning
                             {
                                 var score = container.OfType<LegacyScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault();
+                                var combo = container.OfType<LegacyComboCounter>().FirstOrDefault();
 
                                 if (score != null && accuracy != null)
                                 {
@@ -353,9 +354,12 @@ namespace osu.Game.Skinning
                                     hitError.Anchor = Anchor.BottomCentre;
                                     hitError.Origin = Anchor.CentreLeft;
                                     hitError.Rotation = -90;
+                                }
 
-                                    if (songProgress != null)
-                                        hitError.Y -= SongProgress.MAX_HEIGHT;
+                                if (songProgress != null)
+                                {
+                                    if (hitError != null) hitError.Y -= SongProgress.MAX_HEIGHT;
+                                    if (combo != null) combo.Y -= SongProgress.MAX_HEIGHT;
                                 }
                             })
                             {

From bbfd7ea23f622f96bcec0f0d4713068bd1eda920 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 May 2021 21:20:08 +0900
Subject: [PATCH 10307/10326] Ensure `RegenerateAutoplay` is only run once per
 frame

---
 osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
index 62e2539c2a..8166e6b8ce 100644
--- a/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
+++ b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Edit
             }
         }
 
-        private void updateReplay() => drawableRuleset.RegenerateAutoplay();
+        private void updateReplay() => Scheduler.AddOnce(drawableRuleset.RegenerateAutoplay);
 
         private void addHitObject(HitObject hitObject)
         {

From 6751d79ce8ef94b465360384c7d8ffbaca84330c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 23 May 2021 16:21:27 +0300
Subject: [PATCH 10308/10326] Fix oversight in HUD overlay components top
 positioning logic

---
 osu.Game/Screens/Play/HUDOverlay.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index ab5b01cab6..16285ab035 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -176,10 +176,7 @@ namespace osu.Game.Screens.Play
             foreach (var element in mainComponents.Components.Cast<Drawable>())
             {
                 // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
-                if (!element.RelativeSizeAxes.HasFlagFast(Axes.X))
-                    continue;
-
-                if (element.Anchor.HasFlagFast(Anchor.TopRight))
+                if (element.Anchor.HasFlagFast(Anchor.TopRight) || (element.Anchor.HasFlagFast(Anchor.y0) && element.RelativeSizeAxes == Axes.X))
                 {
                     // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
                     if (element is LegacyHealthDisplay)

From d605b6bb8db010c73a59129d93185466a3ee3a8c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 23 May 2021 16:22:51 +0300
Subject: [PATCH 10309/10326] Fix HUD overlay components bottom positioning
 logic accounting for combo

---
 osu.Game/Screens/Play/HUDOverlay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 16285ab035..31bb640d17 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -186,7 +186,8 @@ namespace osu.Game.Screens.Play
                     if (lowestTopScreenSpace == null || bottomRight.Y > lowestTopScreenSpace.Value.Y)
                         lowestTopScreenSpace = bottomRight;
                 }
-                else if (element.Anchor.HasFlagFast(Anchor.y2))
+                // and align bottom-right components with the top-edge of the highest bottom-anchored hud element.
+                else if (element.Anchor.HasFlagFast(Anchor.BottomRight) || (element.Anchor.HasFlagFast(Anchor.y2) && element.RelativeSizeAxes == Axes.X))
                 {
                     var topLeft = element.ScreenSpaceDrawQuad.TopLeft;
                     if (highestBottomScreenSpace == null || topLeft.Y < highestBottomScreenSpace.Value.Y)

From 593fea0d5fe8ae8a9286a41b967833fab1443c2d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 13:14:18 +0900
Subject: [PATCH 10310/10326] Limit automatically calculated HUD offsets to
 keep menu items on screen

---
 osu.Game/Screens/Play/HUDOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 31bb640d17..676d7f10e1 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -196,12 +196,12 @@ namespace osu.Game.Screens.Play
             }
 
             if (lowestTopScreenSpace.HasValue)
-                topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestTopScreenSpace.Value).Y;
+                topRightElements.Y = TopScoringElementsHeight = Math.Max(0, ToLocalSpace(lowestTopScreenSpace.Value).Y);
             else
                 topRightElements.Y = 0;
 
             if (highestBottomScreenSpace.HasValue)
-                bottomRightElements.Y = BottomScoringElementsHeight = -(DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y);
+                bottomRightElements.Y = BottomScoringElementsHeight = -Math.Max(0, (DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y));
             else
                 bottomRightElements.Y = 0;
         }

From 83981b692eda95bf0ea97faedfc92381cf2fb370 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 13:44:13 +0900
Subject: [PATCH 10311/10326] Also handle items exiting bounds on the opposite
 side

---
 osu.Game/Screens/Play/HUDOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 676d7f10e1..ffe03815f5 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -196,12 +196,12 @@ namespace osu.Game.Screens.Play
             }
 
             if (lowestTopScreenSpace.HasValue)
-                topRightElements.Y = TopScoringElementsHeight = Math.Max(0, ToLocalSpace(lowestTopScreenSpace.Value).Y);
+                topRightElements.Y = TopScoringElementsHeight = MathHelper.Clamp(ToLocalSpace(lowestTopScreenSpace.Value).Y, 0, DrawHeight - topRightElements.DrawHeight);
             else
                 topRightElements.Y = 0;
 
             if (highestBottomScreenSpace.HasValue)
-                bottomRightElements.Y = BottomScoringElementsHeight = -Math.Max(0, (DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y));
+                bottomRightElements.Y = BottomScoringElementsHeight = -MathHelper.Clamp(DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y, 0, DrawHeight - bottomRightElements.DrawHeight);
             else
                 bottomRightElements.Y = 0;
         }

From 7494ddeef40293f989c412e51438e450dd93997b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 24 May 2021 14:07:40 +0900
Subject: [PATCH 10312/10326] Fix DHOs not receiving initial skin changed
 events

---
 .../Objects/Drawables/DrawableHitObject.cs       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 86c733c392..cc663c37af 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -172,7 +172,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
             base.AddInternal(Samples = new PausableSkinnableSound());
 
             CurrentSkin = skinSource;
-            CurrentSkin.SourceChanged += onSkinSourceChanged;
+            CurrentSkin.SourceChanged += skinSourceChanged;
+        }
+
+        protected override void LoadAsyncComplete()
+        {
+            base.LoadAsyncComplete();
+            skinChanged();
         }
 
         protected override void LoadComplete()
@@ -495,7 +501,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         protected ISkinSource CurrentSkin { get; private set; }
 
-        private void onSkinSourceChanged() => Scheduler.AddOnce(() =>
+        private void skinSourceChanged() => Scheduler.AddOnce(skinChanged);
+
+        private void skinChanged()
         {
             UpdateComboColour();
 
@@ -503,7 +511,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             if (IsLoaded)
                 updateState(State.Value, true);
-        });
+        }
 
         protected void UpdateComboColour()
         {
@@ -747,7 +755,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (HitObject != null)
                 HitObject.DefaultsApplied -= onDefaultsApplied;
 
-            CurrentSkin.SourceChanged -= onSkinSourceChanged;
+            CurrentSkin.SourceChanged -= skinSourceChanged;
         }
     }
 

From 83364285746b651bd8ccd27be11e0aaa127b493b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 15:10:33 +0900
Subject: [PATCH 10313/10326] Add regression test for spinner sample actually
 transforming its frequency

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs    | 14 +++++++++++++-
 .../Objects/Drawables/DrawableSpinner.cs           |  6 +++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index f697a77d94..0a7ef443b1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -5,12 +5,14 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -32,6 +34,16 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep($"{term} Small", () => SetContents(() => testSingle(7, autoplay)));
         }
 
+        [Test]
+        public void TestSpinningSamplePitchShift()
+        {
+            AddStep("Add spinner", () => SetContents(() => testSingle(5, true, 4000)));
+            AddUntilStep("Pitch starts low", () => getSpinningSample().Frequency.Value < 0.8);
+            AddUntilStep("Pitch increases", () => getSpinningSample().Frequency.Value > 0.8);
+
+            PausableSkinnableSound getSpinningSample() => drawableSpinner.ChildrenOfType<PausableSkinnableSound>().FirstOrDefault(s => s.Samples.Any(i => i.LookupNames.Any(l => l.Contains("spinnerspin"))));
+        }
+
         [TestCase(false)]
         [TestCase(true)]
         public void TestLongSpinner(bool autoplay)
@@ -93,7 +105,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 base.Update();
                 if (auto)
-                    RotationTracker.AddRotation((float)(Clock.ElapsedFrameTime * 3));
+                    RotationTracker.AddRotation((float)(Clock.ElapsedFrameTime * 2));
             }
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 3a4753761a..19cee61f26 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Bindable<bool> isSpinning;
         private bool spinnerFrequencyModulate;
 
+        private const float spinning_sample_initial_frequency = 1.0f;
+        private const float spinning_sample_modulated_base_frequency = 0.5f;
+
         /// <summary>
         /// The amount of bonus score gained from spinning after the required number of spins, for display purposes.
         /// </summary>
@@ -106,9 +109,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             isSpinning.BindValueChanged(updateSpinningSample);
         }
 
-        private const float spinning_sample_initial_frequency = 1.0f;
-        private const float spinning_sample_modulated_base_frequency = 0.5f;
-
         protected override void OnFree()
         {
             base.OnFree();

From e5f586f2a6940679a41b87ebe3f58d818226795e Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Mon, 24 May 2021 13:29:12 +0600
Subject: [PATCH 10314/10326] fix colour hit error meter not pushing misses
 when wrong colour note is hit in taiko

---
 .../Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 0eb2367f73..3a79183d34 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -24,7 +25,8 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             InternalChild = judgementsFlow = new JudgementFlow();
         }
 
-        protected override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
+        //Taiko-specific: hitting a wrong colour note should result in a miss being pushed.
+        protected override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(judgement.Type == HitResult.Miss ? GetColourForHitResult(HitResult.Miss) : GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
 
         private class JudgementFlow : FillFlowContainer<HitErrorCircle>
         {

From 4fc6ba50b7beaf51c9ca1c22a87cfa7334a65bda Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 17:03:54 +0900
Subject: [PATCH 10315/10326] Fix editor placement ending early if a blueprint
 becomes alive from a pool

Closes https://github.com/ppy/osu/issues/12630.
---
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index e231f7f648..3e97e15cca 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -61,6 +61,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             inputManager = GetContainingInputManager();
 
+            Beatmap.HitObjectAdded += hitObjectAdded;
+
             // updates to selected are handled for us by SelectionHandler.
             NewCombo.BindTo(SelectionHandler.SelectionNewComboState);
 
@@ -259,10 +261,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public virtual HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject) => null;
 
-        protected override void OnBlueprintAdded(HitObject item)
+        private void hitObjectAdded(HitObject obj)
         {
-            base.OnBlueprintAdded(item);
-
+            // refresh the tool to handle the case of placement completing.
             refreshTool();
 
             // on successful placement, the new combo button should be reset as this is the most common user interaction.

From f8c615049379316b8fce79ac55e34d4a745f140f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 17:11:01 +0900
Subject: [PATCH 10316/10326] 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 57550cfb93..b3842a528d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.521.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.524.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 87d1707420..ed033b3934 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -33,7 +33,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ppy.osu.Framework" Version="2021.521.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.524.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a2a9ac35fc..e35b1b5c42 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.Framework.iOS" Version="2021.521.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.524.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,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="2021.521.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.524.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3db995c7782c0f643239c97798c9bbc90aafd843 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 24 May 2021 17:15:57 +0900
Subject: [PATCH 10317/10326] Fix sliders jumping around the screen on movement

---
 .../Sliders/SliderSelectionBlueprint.cs         |  7 ++++++-
 .../Objects/Drawables/DrawableSlider.cs         | 17 +++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index ec97f1fd78..e810d2fe0c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
@@ -25,6 +26,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
     public class SliderSelectionBlueprint : OsuSelectionBlueprint<Slider>
     {
+        protected new DrawableSlider DrawableObject => (DrawableSlider)base.DrawableObject;
+
         protected SliderBodyPiece BodyPiece { get; private set; }
         protected SliderCircleOverlay HeadOverlay { get; private set; }
         protected SliderCircleOverlay TailOverlay { get; private set; }
@@ -236,7 +239,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 ScreenSpaceSelectionPoint => BodyPiece.ToScreenSpace(BodyPiece.PathStartLocation);
+        // Always refer to the drawable object's slider body so subsequent movement deltas are calculated with updated positions.
+        public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.SliderBody?.ToScreenSpace(DrawableObject.SliderBody.PathOffset)
+                                                             ?? BodyPiece.ToScreenSpace(BodyPiece.PathStartLocation);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 82b5492de6..0bec33bf77 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -34,7 +34,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => !HitObject.OnlyJudgeNestedObjects;
 
-        private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody;
+        [CanBeNull]
+        public PlaySliderBody SliderBody => Body.Drawable as PlaySliderBody;
 
         public IBindable<int> PathVersion => pathVersion;
         private readonly Bindable<int> pathVersion = new Bindable<int>();
@@ -215,16 +216,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             double completionProgress = Math.Clamp((Time.Current - HitObject.StartTime) / HitObject.Duration, 0, 1);
 
             Ball.UpdateProgress(completionProgress);
-            sliderBody?.UpdateProgress(completionProgress);
+            SliderBody?.UpdateProgress(completionProgress);
 
             foreach (DrawableHitObject hitObject in NestedHitObjects)
             {
-                if (hitObject is ITrackSnaking s) s.UpdateSnakingPosition(HitObject.Path.PositionAt(sliderBody?.SnakedStart ?? 0), HitObject.Path.PositionAt(sliderBody?.SnakedEnd ?? 0));
+                if (hitObject is ITrackSnaking s) s.UpdateSnakingPosition(HitObject.Path.PositionAt(SliderBody?.SnakedStart ?? 0), HitObject.Path.PositionAt(SliderBody?.SnakedEnd ?? 0));
                 if (hitObject is IRequireTracking t) t.Tracking = Ball.Tracking;
             }
 
-            Size = sliderBody?.Size ?? Vector2.Zero;
-            OriginPosition = sliderBody?.PathOffset ?? Vector2.Zero;
+            Size = SliderBody?.Size ?? Vector2.Zero;
+            OriginPosition = SliderBody?.PathOffset ?? Vector2.Zero;
 
             if (DrawSize != Vector2.Zero)
             {
@@ -238,7 +239,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public override void OnKilled()
         {
             base.OnKilled();
-            sliderBody?.RecyclePath();
+            SliderBody?.RecyclePath();
         }
 
         protected override void ApplySkin(ISkinSource skin, bool allowFallback)
@@ -324,7 +325,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 case ArmedState.Hit:
                     Ball.ScaleTo(HitObject.Scale * 1.4f, fade_out_time, Easing.Out);
-                    if (sliderBody?.SnakingOut.Value == true)
+                    if (SliderBody?.SnakingOut.Value == true)
                         Body.FadeOut(40); // short fade to allow for any body colour to smoothly disappear.
                     break;
             }
@@ -332,7 +333,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             this.FadeOut(fade_out_time, Easing.OutQuint).Expire();
         }
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => sliderBody?.ReceivePositionalInputAt(screenSpacePos) ?? base.ReceivePositionalInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => SliderBody?.ReceivePositionalInputAt(screenSpacePos) ?? base.ReceivePositionalInputAt(screenSpacePos);
 
         private class DefaultSliderBody : PlaySliderBody
         {

From 7961dba1d3dccd79e6bd79b60de5d21f8a396de6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 17:22:55 +0900
Subject: [PATCH 10318/10326] Reorder `OrderBy` for legibility

---
 osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index cd8b486f23..23b09e8fb1 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -73,10 +73,11 @@ namespace osu.Game.Input.Bindings
             else
             {
                 KeyBindings = store.Query(ruleset?.ID, variant)
+                                   .OrderBy(b => defaults.FindIndex(d => (int)d.Action == b.IntAction))
                                    // this ordering is important to ensure that we read entries from the database in the order
                                    // enforced by DefaultKeyBindings. allow for song select to handle actions that may otherwise
                                    // have been eaten by the music controller due to query order.
-                                   .OrderBy(b => defaults.FindIndex(d => (int)d.Action == b.IntAction)).ToList();
+                                   .ToList();
             }
         }
     }

From 57640810b5023025b3b4ac933d35495663de39bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 17:23:09 +0900
Subject: [PATCH 10319/10326] Ignore certain banned `InputKey`s for gameplay
 purposes

---
 osu.Game/Input/KeyBindingStore.cs           | 22 +++++++++++++++++++++
 osu.Game/Rulesets/UI/RulesetInputManager.cs |  8 ++++++++
 2 files changed, 30 insertions(+)

diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index 9d0cfedc03..1d20f0d2c3 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -16,6 +16,17 @@ namespace osu.Game.Input
     {
         public event Action KeyBindingChanged;
 
+        /// <summary>
+        /// Keys which should not be allowed for gameplay input purposes.
+        /// </summary>
+        private static readonly IEnumerable<InputKey> banned_keys = new[]
+        {
+            InputKey.MouseWheelDown,
+            InputKey.MouseWheelLeft,
+            InputKey.MouseWheelUp,
+            InputKey.MouseWheelRight
+        };
+
         public KeyBindingStore(DatabaseContextFactory contextFactory, RulesetStore rulesets, Storage storage = null)
             : base(contextFactory, storage)
         {
@@ -103,5 +114,16 @@ namespace osu.Game.Input
 
             KeyBindingChanged?.Invoke();
         }
+
+        public static bool CheckValidForGameplay(KeyCombination combination)
+        {
+            foreach (var key in banned_keys)
+            {
+                if (combination.Keys.Contains(key))
+                    return false;
+            }
+
+            return true;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index d6f002ea2c..75c3a4661c 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -13,6 +13,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges.Events;
 using osu.Framework.Input.States;
 using osu.Game.Configuration;
+using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Input.Handlers;
 using osu.Game.Screens.Play;
@@ -169,6 +170,13 @@ namespace osu.Game.Rulesets.UI
                 : base(ruleset, variant, unique)
             {
             }
+
+            protected override void ReloadMappings()
+            {
+                base.ReloadMappings();
+
+                KeyBindings = KeyBindings.Where(b => KeyBindingStore.CheckValidForGameplay(b.KeyCombination)).ToList();
+            }
         }
     }
 

From deabce7140fea2922a1916b63f35ce98cbb18f7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 18:40:56 +0900
Subject: [PATCH 10320/10326] Disallow updating the database to an invalid
 value

---
 osu.Game/Input/KeyBindingStore.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index 1d20f0d2c3..23b0e0c0d0 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -104,6 +104,10 @@ namespace osu.Game.Input
             using (ContextFactory.GetForWrite())
             {
                 var dbKeyBinding = (DatabasedKeyBinding)keyBinding;
+
+                if (dbKeyBinding.RulesetID != null && !CheckValidForGameplay(keyBinding.KeyCombination))
+                    return;
+
                 Refresh(ref dbKeyBinding);
 
                 if (dbKeyBinding.KeyCombination.Equals(keyBinding.KeyCombination))

From a00f226ab3566028bb2f0590d84caaeeeb32cb55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 18:41:39 +0900
Subject: [PATCH 10321/10326] Add assert on storing to database

---
 osu.Game/Input/KeyBindingStore.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index 23b0e0c0d0..3ef9923487 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Platform;
@@ -105,8 +106,7 @@ namespace osu.Game.Input
             {
                 var dbKeyBinding = (DatabasedKeyBinding)keyBinding;
 
-                if (dbKeyBinding.RulesetID != null && !CheckValidForGameplay(keyBinding.KeyCombination))
-                    return;
+                Debug.Assert(dbKeyBinding.RulesetID == null || CheckValidForGameplay(keyBinding.KeyCombination));
 
                 Refresh(ref dbKeyBinding);
 

From 471f17547aa12befa1fb5162be18c4a8d03afede Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Mon, 24 May 2021 16:49:58 +0600
Subject: [PATCH 10322/10326] switch determining the hit result by offset to
 getting it from the judgement directly

---
 .../Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 3a79183d34..e9ccbcdae2 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -25,8 +24,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             InternalChild = judgementsFlow = new JudgementFlow();
         }
 
-        //Taiko-specific: hitting a wrong colour note should result in a miss being pushed.
-        protected override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(judgement.Type == HitResult.Miss ? GetColourForHitResult(HitResult.Miss) : GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
+        protected override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(GetColourForHitResult(judgement.Type));
 
         private class JudgementFlow : FillFlowContainer<HitErrorCircle>
         {

From fe9abd5b8048b029b5c103cf5e35d1ec76bb318f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 24 May 2021 21:37:05 +0900
Subject: [PATCH 10323/10326] Upgrade packages and fix ResX files

---
 .config/dotnet-tools.json                | 4 ++--
 osu.Game/Localisation/ButtonSystem.resx  | 4 ++--
 osu.Game/Localisation/Chat.resx          | 4 ++--
 osu.Game/Localisation/Common.resx        | 4 ++--
 osu.Game/Localisation/Notifications.resx | 4 ++--
 osu.Game/Localisation/NowPlaying.resx    | 4 ++--
 osu.Game/Localisation/Settings.resx      | 4 ++--
 osu.Game/osu.Game.csproj                 | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 54d9ff3077..b51ecb4f7e 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -33,10 +33,10 @@
       ]
     },
     "ppy.localisationanalyser.tools": {
-      "version": "2021.521.1",
+      "version": "2021.524.0",
       "commands": [
         "localisation"
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/osu.Game/Localisation/ButtonSystem.resx b/osu.Game/Localisation/ButtonSystem.resx
index e8f555b6c3..d72ffff8be 100644
--- a/osu.Game/Localisation/ButtonSystem.resx
+++ b/osu.Game/Localisation/ButtonSystem.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="solo" xml:space="preserve">
     <value>solo</value>
diff --git a/osu.Game/Localisation/Chat.resx b/osu.Game/Localisation/Chat.resx
index 3762f800c5..055e351463 100644
--- a/osu.Game/Localisation/Chat.resx
+++ b/osu.Game/Localisation/Chat.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="header_title" xml:space="preserve">
     <value>chat</value>
diff --git a/osu.Game/Localisation/Common.resx b/osu.Game/Localisation/Common.resx
index 8a3ae29c77..59de16a037 100644
--- a/osu.Game/Localisation/Common.resx
+++ b/osu.Game/Localisation/Common.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="cancel" xml:space="preserve">
     <value>Cancel</value>
diff --git a/osu.Game/Localisation/Notifications.resx b/osu.Game/Localisation/Notifications.resx
index d61e5744e4..08db240ba2 100644
--- a/osu.Game/Localisation/Notifications.resx
+++ b/osu.Game/Localisation/Notifications.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="header_title" xml:space="preserve">
     <value>notifications</value>
diff --git a/osu.Game/Localisation/NowPlaying.resx b/osu.Game/Localisation/NowPlaying.resx
index 71df15e488..40fda3e25b 100644
--- a/osu.Game/Localisation/NowPlaying.resx
+++ b/osu.Game/Localisation/NowPlaying.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="header_title" xml:space="preserve">
     <value>now playing</value>
diff --git a/osu.Game/Localisation/Settings.resx b/osu.Game/Localisation/Settings.resx
index 1770147dd9..85c224cedf 100644
--- a/osu.Game/Localisation/Settings.resx
+++ b/osu.Game/Localisation/Settings.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="header_title" xml:space="preserve">
     <value>settings</value>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ed033b3934..fa2945db6a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.LocalisationAnalyser" Version="2021.521.1">
+    <PackageReference Include="ppy.LocalisationAnalyser" Version="2021.524.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From 6f155fbd08500f58ce3629a0b958b8d549546114 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 24 May 2021 21:54:55 +0900
Subject: [PATCH 10324/10326] Make inspection a hint

---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 4ac796ccd0..62751cebb1 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -120,6 +120,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleTypeMembersOnOneLine/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NestedStringInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotOverriddenInSpecificCulture/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=OutdentIsOffPrevLevel/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002EGlobal/@EntryIndexedValue">HINT</s:String>

From 62b6cadb64eefd23b8b1ffaaf37987bfbf4fd5cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 18:41:51 +0900
Subject: [PATCH 10325/10326] Ensure settings rows cannot set an invalid value
 in the first place

---
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 43942d2d52..9c09b6e7d0 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
+using osu.Game.Input.Bindings;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -445,6 +446,9 @@ namespace osu.Game.Overlays.KeyBinding
 
             public void UpdateKeyCombination(KeyCombination newCombination)
             {
+                if ((KeyBinding as DatabasedKeyBinding)?.RulesetID != null && !KeyBindingStore.CheckValidForGameplay(newCombination))
+                    return;
+
                 KeyBinding.KeyCombination = newCombination;
                 Text.Text = KeyBinding.KeyCombination.ReadableString();
             }

From 37f6ceef798eb47b5778884bc1d41187ee293e76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 21:56:47 +0900
Subject: [PATCH 10326/10326] Add test coverage

---
 .../Settings/TestSceneKeyBindingPanel.cs      | 66 +++++++++++++++++++
 osu.Game/Overlays/SettingsPanel.cs            |  2 +-
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index f495e0fb23..55c5b5b9c2 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.KeyBinding;
 using osuTK.Input;
@@ -28,6 +29,39 @@ namespace osu.Game.Tests.Visual.Settings
             panel.Show();
         }
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("Scroll to top", () => panel.ChildrenOfType<SettingsPanel.SettingsSectionsContainer>().First().ScrollToTop());
+            AddWaitStep("wait for scroll", 5);
+        }
+
+        [Test]
+        public void TestBindingMouseWheelToNonGameplay()
+        {
+            scrollToAndStartBinding("Increase volume");
+            AddStep("press k", () => InputManager.Key(Key.K));
+            checkBinding("Increase volume", "K");
+
+            AddStep("click again", () => InputManager.Click(MouseButton.Left));
+            AddStep("scroll mouse wheel", () => InputManager.ScrollVerticalBy(1));
+
+            checkBinding("Increase volume", "Wheel Up");
+        }
+
+        [Test]
+        public void TestBindingMouseWheelToGameplay()
+        {
+            scrollToAndStartBinding("Left button");
+            AddStep("press k", () => InputManager.Key(Key.Z));
+            checkBinding("Left button", "Z");
+
+            AddStep("click again", () => InputManager.Click(MouseButton.Left));
+            AddStep("scroll mouse wheel", () => InputManager.ScrollVerticalBy(1));
+
+            checkBinding("Left button", "Z");
+        }
+
         [Test]
         public void TestClickTwiceOnClearButton()
         {
@@ -135,5 +169,37 @@ namespace osu.Game.Tests.Visual.Settings
 
             AddAssert("first binding selected", () => multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().IsBinding);
         }
+
+        private void checkBinding(string name, string keyName)
+        {
+            AddAssert($"Check {name} is bound to {keyName}", () =>
+            {
+                var firstRow = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text == name));
+                var firstButton = firstRow.ChildrenOfType<KeyBindingRow.KeyButton>().First();
+
+                return firstButton.Text.Text == keyName;
+            });
+        }
+
+        private void scrollToAndStartBinding(string name)
+        {
+            KeyBindingRow.KeyButton firstButton = null;
+
+            AddStep($"Scroll to {name}", () =>
+            {
+                var firstRow = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text == name));
+                firstButton = firstRow.ChildrenOfType<KeyBindingRow.KeyButton>().First();
+
+                panel.ChildrenOfType<SettingsPanel.SettingsSectionsContainer>().First().ScrollTo(firstButton);
+            });
+
+            AddWaitStep("wait for scroll", 5);
+
+            AddStep("click to bind", () =>
+            {
+                InputManager.MoveMouseTo(firstButton);
+                InputManager.Click(MouseButton.Left);
+            });
+        }
     }
 }
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 8f3274b2b5..f0a11d67b7 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -191,7 +191,7 @@ namespace osu.Game.Overlays
             Padding = new MarginPadding { Top = GetToolbarHeight?.Invoke() ?? 0 };
         }
 
-        protected class SettingsSectionsContainer : SectionsContainer<SettingsSection>
+        public class SettingsSectionsContainer : SectionsContainer<SettingsSection>
         {
             public SearchContainer<SettingsSection> SearchContainer;